diff --git a/.gitignore b/.gitignore
index d0f4a919cde..9b639ce64a6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,4 @@ doxygen_warnings.log
 *.iml
 Thumbs.db
 # Vagrant generated files
-.vagrant
-/index.html
-/phpmyadmin
-/xhprof
+.vagrant
\ No newline at end of file
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 73b43e95f4b..1db2aa867ae 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -180,8 +180,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 9c7f18481f5..c97b547e499 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,7 @@ before_script:
  - echo Install phpcs then show installed rules
  - pyrus install pear/PHP_CodeSniffer
  - phpenv rehash
+ - phpcs --version
  - phpcs -i
  - echo Create dir $(pwd)/htdocs/documents
  - sudo mkdir -p $(pwd)/htdocs/documents/admin/temp;
@@ -53,12 +54,14 @@ before_script:
  - sh -c "if [ '$PHPV' = '5.3' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
  - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi"
  - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - echo Mysql version
+ - mysql --version
  - echo Init database
  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi"
  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE myapp_test;' -U postgres; fi"
  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'DROP DATABASE IF EXISTS myapp_test;'; fi"
  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS myapp_test;'; fi"
- - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.4.0.sql; fi"
+ - sh -c "if [ '$DB' = 'mysql' ]; then mysql -D myapp_test < $(pwd)/dev/initdata/mysqldump_dolibarr_3.5.0.sql; fi"
  - echo Create config file htdocs/conf/conf.php
  - echo '<?php ' > htdocs/conf/conf.php
  - sh -c "if [ '$DB' = 'pgsql' ]; then echo '$'dolibarr_main_db_type=\'pgsql\'';' >> htdocs/conf/conf.php; fi"
@@ -87,18 +90,22 @@ before_script:
 
 script: 
  - cd htdocs/install
- - php upgrade.php 3.4.0 3.5.0 > upgrade.log
- - php upgrade2.php 3.4.0 3.5.0 > upgrade2.log
+ - date
+# - php upgrade.php 3.4.0 3.5.0 > upgrade.log
+# - php upgrade2.php 3.4.0 3.5.0 > upgrade2.log
  - php upgrade.php 3.5.0 3.6.0 >> upgrade.log
  - php upgrade2.php 3.5.0 3.6.0 >> upgrade2.log
-# - cat upgrade.log
+ - 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
 # - cat upgrade2.log
  - cd ../..
  - 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
- - 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=/htdocs/conf/conf.php,/build/html/,/dev/vagrant/,/documents/,/includes/,/test/report/ . 2>&1
+ - date
 
 after_script:
 # - echo Output dolibarr log file; cat $(pwd)/htdocs/documents/dolibarr.log
diff --git a/.tx/config b/.tx/config
index fcd276390ee..e4d1fc65732 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,6 +2,12 @@
 host = https://www.transifex.com
 lang_map = uz: uz_UZ
 
+[dolibarr.accountancy]
+file_filter = htdocs/langs/<lang>/accountancy.lang
+source_file = htdocs/langs/en_US/accountancy.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.admin]
 file_filter = htdocs/langs/<lang>/admin.lang
 source_file = htdocs/langs/en_US/admin.lang
@@ -212,12 +218,6 @@ source_file = htdocs/langs/en_US/orders.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.oscommerce]
-file_filter = htdocs/langs/<lang>/oscommerce.lang
-source_file = htdocs/langs/en_US/oscommerce.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.other]
 file_filter = htdocs/langs/<lang>/other.lang
 source_file = htdocs/langs/en_US/other.lang
@@ -236,6 +236,18 @@ source_file = htdocs/langs/en_US/paypal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.printipp]
+file_filter = htdocs/langs/<lang>/printipp.lang
+source_file = htdocs/langs/en_US/printipp.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
+[dolibarr.productbatch]
+file_filter = htdocs/langs/<lang>/productbatch.lang
+source_file = htdocs/langs/en_US/productbatch.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.products]
 file_filter = htdocs/langs/<lang>/products.lang
 source_file = htdocs/langs/en_US/products.lang
@@ -254,6 +266,12 @@ source_file = htdocs/langs/en_US/propal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.resource]
+file_filter = htdocs/langs/<lang>/resource.lang
+source_file = htdocs/langs/en_US/resource.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.salaries]
 file_filter = htdocs/langs/<lang>/salaries.lang
 source_file = htdocs/langs/en_US/salaries.lang
@@ -266,12 +284,6 @@ source_file = htdocs/langs/en_US/sendings.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.shop]
-file_filter = htdocs/langs/<lang>/shop.lang
-source_file = htdocs/langs/en_US/shop.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.sms]
 file_filter = htdocs/langs/<lang>/sms.lang
 source_file = htdocs/langs/en_US/sms.lang
@@ -313,4 +325,3 @@ file_filter = htdocs/langs/<lang>/workflow.lang
 source_file = htdocs/langs/en_US/workflow.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
-
diff --git a/COPYRIGHT b/COPYRIGHT
index ed8a667acc8..2e1c6e921b9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -9,41 +9,41 @@ More information: http://www.gnu.org/licenses/gpl-3.0.txt
 
 Dolibarr uses some external libraries released under different licenses. This is compatibility summary:
 
-Component             Version       License                     GPL Compatible  Usage
+Component              Version       License                     GPL Compatible  Usage
 -------------------------------------------------------------------------------------
 PHP libraries:
-AdoDb-Date            0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
-CKEditor              4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
-FPDI                  1.4.2         Apache Software License 2.0 Yes             PDF templates management
-FPDF_TPL              1.2           Apache Software License 2.0 Yes             PDF templates management
-GeoIP                 1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
-NuSoap                0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
-odtPHP                1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
-PHPExcel              1.7.6         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-PHPPrintIPP           1.3           GPL-2+                      Yes             Library to send print IPP requests
-TCPDF                 6.0.093       LGPL-3+                     Yes             PDF generation
+AdoDb-Date             0.32          Modified BSD License        Yes             Date convertion (not into rpm package)
+CKEditor               4.3.3         LGPL-2.1+                   Yes             Editor WYSIWYG
+FPDI                   1.4.2         Apache Software License 2.0 Yes             PDF templates management
+FPDF_TPL               1.2           Apache Software License 2.0 Yes             PDF templates management
+GeoIP                  1.4           LGPL-2.1+                   Yes             Sample code to make geoip convert (not into deb package)
+NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
+odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
+PHPExcel               1.7.8         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
+PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
+TCPDF                  6.0.093       LGPL-3+                     Yes             PDF generation
 
 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 UI Multiselect ?             GPL and MIT 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
-jQuery FileUpload     5.0.3         GPL and MIT License         Yes             JS library to upload files
-jQuery Flot           0.7           MIT License                 Yes             JS library to build graph
-jQuery JCrop          0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
-jQuery Jeditable      1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
-jQuery jNotify        1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
-jQuery jPicker        1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jqueryFileTree 1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
-jQuery jquerytreeview 1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
-jQuery Layout         1.3.0rc30.74  GPL and MIT License         Yes             JS library plugin Layout (RC-29.15)
-jQuery Mobile         1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
-jQuery TableDnD       0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
-jQuery Timepicker     1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
-jQuery Tiptip         1.3           GPL and MIT License         Yes             JS library for tooltips
-jsGantt               1.2           BSD License                 Yes             JS library (to build Gantt reports)
+jQuery                 1.8.2         MIT License                 Yes             JS library
+jQuery UI              1.9.1         GPL and MIT License         Yes             JS library plugin UI
+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
+jQuery FileUpload      5.0.3         GPL and MIT License         Yes             JS library to upload files
+jQuery Flot            0.7           MIT License                 Yes             JS library to build graph
+jQuery JCrop           0.9.8         GPL and MIT License         Yes             JS library plugin Crop (to crop images)
+jQuery Jeditable       1.7.1         GPL and MIT License         Yes             JS library plugin jeditable (to edit in place)
+jQuery jNotify         1.1.00        Apache Software License 2.0 Yes             JS library plugin jNotify (to use ajax popups)
+jQuery jPicker         1.1.6         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jqueryFileTree  1.0.1         GPL and MIT License         Yes             JS library for color picker with not defined list of colors
+jQuery jquerytreeview  1.4.1         MIT License                 Yes             JS library for color picker with not defined list of colors
+jQuery Layout          1.3.0rc30.74  GPL and MIT License         Yes             JS library plugin Layout (RC-29.15)
+jQuery Mobile          1.3.0         GPL and MIT License         Yes             JS library for smartphone (not used)
+jQuery TableDnD        0.6           GPL and MIT License         Yes             JS library plugin TableDnD (to reorder table rows)
+jQuery Timepicker      1.1.0         GPL and MIT License         Yes             JS library Timepicker addon for Datepicker
+jQuery Tiptip          1.3           GPL and MIT License         Yes             JS library for tooltips
+jsGantt                1.2           BSD License                 Yes             JS library (to build Gantt reports)
 
 For licenses compatibility informations:
 http://www.fsf.org/licensing/licenses/index_html
diff --git a/ChangeLog b/ChangeLog
index 0a849cce895..a3b8e1193ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,174 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** 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.
+- New: statistics on supplier orders and invoices on home page.
+- New: Add permissions to read all trips and expenses.
+- New: Can filter on date into tab "Referring object" of a project.
+- New: Module notification has been enhanced:
+       EMail use now language of target contact.
+       Can also define a fixed email for notifications.
+- New: Feature to link manually an order to an invoice does not disappear once
+       link has been done.
+- New: Can set a color on user card (visible into agenda view).
+- New: extrafields for projects and tasks are exported to ODT documents.
+- New: Add number of active notification into tab title (like we do for notes and documents)
+- New: Can add product into category from category card.
+- New: PDF event report show project and status of event.
+- New: Can filter on status on interventions.
+- New: Add help info of field type into dictionary of payment types.
+- New: Add proposals into referer page of thirdparty.
+- New: On contact list can set filter on both active and not active (no more exclusive select). 
+- New: Intervention documents are now available in ECM module.
+- New: Can attach supplier order to a customer order.
+- New: Supervisor is now visible into user list. 
+- New: Add user of creation and validation on invoice export.
+- New: Add info page about browser.
+- New: Enable feature developed for 3.6 we forgot to enabled: Adding prefix
+       on uploaded file names. 
+- New: No more dependency between contract and service module.
+- New: [ task #867 ] Remove ESAEB external module code from core.
+- New: Can create proposal from an intervention.
+- New: An event can be assigned to several users.
+- New: Can filter events on a group of users.
+- New: Can filter events of a thirdparty.
+- New: Onto event summary of elements, end date and status are visible.
+- New: Split Agenda view (month, week, day) into different tabs.
+- New: Add a view "per user" of agenda events (with different colors according to type of event).
+- New: Each user can include its own external ics calendar into dolibarr agenda view.
+- New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to
+       create an automatic event into agenda.
+- New: Add new type of event (when type of events are used, not by default).
+- New: Can disable predefined type of events.
+- New: Form to add a photo is immediatly available on photo page if
+       permissions are ok (save one click per photo to add).
+- New: Add option PRODUCT_MAX_VISIBLE_PHOTO to limit number of photos
+       shown on main product card.
+- New: Add country into table of thirdparties type. This will allow to provide
+       a list of thirdparty types specific to a country (like argentina that
+       need type A or B).
+- New: Can force a specific bank account onto an invoice/order.
+- New: Home page of project area shows list of draft project (like other main page).
+- New: Can search on project ref or string from project main page (like other main page).
+- New: First change to match accessibility rules: http://www.w3.org/TR/WCAG10-HTML-TECHS/
+       Differentiate text and img.
+       Use label into quick search form.
+       Use accesskey on form search.
+- New: Intervention documents are now available in ECM module.
+- New: Add attachments on user card + in ECM module.
+- New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or content template.    
+- New: [ task #1204 ] add Numering contrat module free (like leopard in product module).
+- New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice.
+- New: Enable supplier price log table.
+- New: [ task #1204 ] add a supplier reference to contract.
+- New: [ task #1218 ] Can drag and drop an event from calendar to change its day.
+- New: Optimize size of image static resources.
+- New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card.
+- New: Content of predefined email come firstly from table llx_c_email_template, then translation key. 
+- New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture 
+       onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
+- New: Add more search field in list of cheque deposits.
+- New: Add feature to order to invoice on supplier part.
+- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export.
+- New: Direct invoice creation from predefined invoice.
+- 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 : 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
+- Fix: [ bug #1492, #1493 ] Member trigger problem
+- Fix: [ bug #1474, #1475 ] Contract trigger problem
+- Fix: [ bug #1496 ] ACTION_DELETE trigger does not show trigger error
+- Fix: [ bug #1494 ] CATEGORY_CREATE and CATEGORY_MODIFY triggers do not intercept trigger action
+- Fix: [ bug #1502 ] DON_CREATE trigger does not intercept trigger action
+- Fix: [ bug #1505, #1504] Project trigger problem
+- Fix: [ bug #1463, #1464 ] Proposal triggers problem
+- Fix: [ bug #1498, #1499 ] Shipment/Delivery triggers problem
+- Fix: [ bug #1465, #1466 ] Product triggers problem
+- Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message
+- 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
+		Special Thanks to developpers :
+			Olivier Geffroy
+			Alexandre Spangaro
+			Ari Elbaz
+			Florian Henry
+			Juanjo Menent
+		And to the contributors :
+			Jeff Info				2000 euros
+			Nord Anim		 		 120 euros
+			Hydroflex		 		 120 euros
+			Asysteo			 		 120 euros
+			Fournisseur médical		 120 euros
+- Removed: unmaintained OScommerce module
+
+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: Add a css style "cursorpointer".
+- New: Select list of users can return user into hierarchy.
+- New: getBrowserInfo can return type of layout of browser (classic/phone/tablet)
+- New: Add hook "searchAgendaFrom" and "beforePDFCreation".
+- New: Add trigger DON_UPDATE, DON_DELETE
+- New: Add country iso code on 3 chars into table of countries.
+- Qual: Removed hard coded rowid into data init of table llx_c_action_trigger.
+- LINEBILL_DELETE, LINK_DELETE, ORDER_SUPPLIER_DELETE, RESOURCE_DELETE trigger called before SQL delete
+- New: [ Task #1481 ] Add trigger BILL_SUPPLIER_UPDATE.
+- New: [ Task #1495 ] Add trigger LINECONTRACT_CREATE.
+- New: Added hook "formConfirm" and "doActions" for supplier invoice card.
+- New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card.
+- New: renamed table llx_c_pays to llx_c_country & libelle field to label.
+- New: Added hook "formConfirm" and "doActions" for fichinter card
+- New: Can search list of thirdparties from web service on part of name.
+- New: Function getCurrencyAmount is marked as deprecated. Use function price to output a price
+       including currency symbol.
+- Qual: Renamed table llx_c_civilite into llx_c_civility,
+		field civilite into label in the same table,
+		and field civilite into civility in other table.
+- Qual: Renamed all files & links "liste.php" into "list.php".
+- 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:
+
+- If you can't see trips and expenses records, check that you have the new permission "read all
+  trips and expenses".
+- Deprecated module "oscommerce" were removed.
+- Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php
+- Some field into database were renamed from "libelle" to "label".
+- Table llx_c_pays were renamed into llx_c_country.  
+- Triggers *_BUILDDOC are removed. Building a doc is not a business event. For action after 
+  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
 
@@ -19,6 +187,7 @@ English Dolibarr ChangeLog
 - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
 - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
 - Fix: [ bug #1749 ] Undefined $mailchimp
+- Fix: [ bug #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
@@ -113,6 +282,9 @@ For users:
 - Fix: Add actions events not implemented.
 - Fix: Price min of composition is not supplier price min by quantity.
 - Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers.
+- Fix: [ bug #1439 ] impossible to remove a a translation (multilanguage-feature) 
+- New: If multilangue is enabled, mail (from propal, invoice, etc...) message is pre-defaulted in Customer language
+- Fix: [ bug #1459 ] _ADD_CONTACT and _DEL_CONTACT triggers do not intercept insertion when reported an error
 - Fix: [ bug #1478 ] BILL_PAYED trigger action does not intercept failure under some circumstances
 - Fix: [ bug #1479 ] Several customer invoice triggers do not intercept trigger action
 - Fix: [ bug #1477 ] Several customer invoice triggers do not show trigger error messages
@@ -140,6 +312,8 @@ For developers:
 - New: A module can disable a standard ECM view.
 - New: Add multilang support into product webservice.
 - New: Add hooks on project card page.
+- New: Add call_trigger method on CommonObject class. So new trigger call within object is just : 
+$result = $this->call_trigger($trigger_name, $user) 
 
 WARNING: Following change may create regression for some external modules, but was necessary to make
 Dolibarr better:
@@ -147,11 +321,11 @@ Dolibarr better:
 - The deprecated way (with 4 parameters) to declare a new tab into a module descriptor file has been
 removed. You must now use the 6 parameters way. See file modMyModule.class.php for example. 
 - Remove the javascript function ac_delay() that is not used anymore by core code.
-- Properties "dictionnaries" into module descriptor files has been renamed into "dictionaries".
+- Properties "dictionnaries" into module descriptor files have been renamed into "dictionaries".
 - Method form->select_currency() has been removed. Use instead print form->selectCurrency().
 - Method form->select_methodes_commande() has been renamed into english name selectInputMethod().
 - The following hooks are now 'addreplace' hooks: "formCreateThirdpartyOptions" 
-  So check that return value is 0 to keep default standard behaviour after hook or 1 to disable
+  So check that return value is 0 to keep default standard behaviour after hook, or 1 to disable
   default standard behaviour.
 - Properties "civilite_id" were renamed into "civility_id".
 - Remove add_photo_web() that is ot used anymore by core code.
diff --git a/build.xml b/build.xml
index fc267bf196e..570821a7c7b 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="dolibarr" default="hudson" basedir=".">
-
+fdfds
 <!-- Exclude/ignore paths -->
  <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
  <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />
diff --git a/build/debian/README.howto b/build/debian/README.howto
index 6b6e71c4874..f9bb31c6fcf 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -153,6 +153,9 @@ from origin/upstream and origin/pristine.
 
 * Into root dir, launch:
 > debian/get-orig-source.sh
+If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
+
+* Some files are removed from archive by the get-orig-source.sh 
 
 * Staying into git root directory, run
 > git-import-orig -vv ../tcpdf_x.y.z+dfsg.orig.tar.xz
@@ -160,9 +163,9 @@ from origin/upstream and origin/pristine.
 Note: If there was errors solved manually, you may need to make a git commit
 
 * Add an entry into debian/changelog
-> dch -v x.y.z-dsfg-1 "My comment" will add entry.
-For example: dch -v x.y.z-dsfg-1 "New upstream release." for a new version
-Then modify changelog to replace "unstable" with "UNRELEASED".
+> dch -v x.y.z+dfsg-1 "My comment" will add entry.
+For example: dch -v x.y.z+dfsg-1 "New upstream release." for a new version
+Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
 
 Warning: Date must have format reported by "date -R"
 Warning: Name and email must match value into debian/control file (Entry added here is used by next step).
@@ -228,23 +231,29 @@ from origin/upstream and origin/pristine.
 
 * If new upstream is available onto sourceforge, launch:
 > debian/get-orig-source.sh
+If script fails with error Bad certificate, you can set "export PERL_LWP_SSL_VERIFY_HOSTNAME=0" to solve this.
 
-* Edit tgz file to remove ckeditor and phpexcel and rename file into 
-dolibarr-x.y.z+dsfgw.tgz
-(x.y.z = version, w start from 1 and is increased for each new import)
+* Edit tgz file to remove 
+- htdocs/includes/ckeditor
+- htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf
+- htdocs/includes/phpexcel
+- htdocs/includes/tcpdf
+And rename file into 
+dolibarr-x.y.z+dfsgw.tgz
+(x.y.z = version, w start from 1 and is increased for each new git-import-orig already done)
 
 * Staying into git root directory, run
-> git-import-orig -vv ../dolibarr-x.y.z+dsfgw.tgz
+> git-import-orig -vv ../dolibarr-x.y.z+dfsgw.tgz
 and enter version when requested with format
-x.y.z+dsfgw
+x.y.z+dfsgw
 (x.y.z = version, w start from 1 and is increased for each new import)
 
 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-w "My comment" will add entry.
-For example: dch -v x.y.z-w "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 "unstable" with "UNRELEASED".
+> dch -v x.y.z+dfsg-w "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:
 - Date must have format reported by "date -R"
 - Name and email must match value into debian/control file (Entry added here is used by next step).
diff --git a/build/debian/changelog b/build/debian/changelog
index 4a711c9868c..db3f1dc887b 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -1,20 +1,6 @@
-dolibarr (3.6.2-3) unstable; urgency=low
+dolibarr (3.7.0-3) UNRELEASED; urgency=low
 
   [ Laurent Destailleur (eldy) ]
   * New upstream release.
     
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Sat, 27 dec 2014 12:00:00 +0100      
-
-dolibarr (3.6.1-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 23 Sep 2014 12:00:00 +0100      
-
-dolibarr (3.6.0-3) unstable; urgency=low
-
-  [ Laurent Destailleur (eldy) ]
-  * New upstream release.
-    
- -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 15 July 2014 12:00:00 +0100      
+ -- Laurent Destailleur (eldy) <eldy@users.sourceforge.net>  Tue, 21 Oct 2014 12:00:00 +0100
diff --git a/build/debian/get-orig-source.sh b/build/debian/get-orig-source.sh
index 418bbbc2199..cc22a53c908 100755
--- a/build/debian/get-orig-source.sh
+++ b/build/debian/get-orig-source.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
-# Scan for new official sources and download file
-# run with debian/get-orig-source.sh [x.y.z]
 
 tmpdir=$(mktemp -d)
-echo "tmpdir = $tmpdir"
 
+
+# Download source file
 if [ -n "$1" ]; then
     uscan_opts="--download-version=$1"
 fi
diff --git a/build/launchpad/README b/build/launchpad/README
index 973509aa6d1..03ddc7fd4e6 100644
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -61,13 +61,17 @@ If you want to build/test package locally:
 
 - List of series are visible here: https://launchpad.net/dolibarr/+series
 
-# To update Dolibarr into launchpad (when repository for sources already exists)
+# To update Dolibarr into launchpad (when remote repository for sources already exists)
 #----------------------------------
+	# create local repository
 	cd bzr
-	bzr branch lp:~yourlogin/dolibarr/[dev|beta|stable]
+	bzr branch lp:~yourlogin/dolibarr/[develop|beta|stable] dolibarr-[dev|beta|stable]
     cd dolibarr-[dev|beta|stable]
+    # Update
+    bzr update
+	-- Update files here. Remove all and overwrite --
     bzr status
-	-- Update files here --
+	bzr add *
     bzr commit -m "Description of change"
     bzr push
 
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 8467d4140f3..6a7e584f817 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -63,19 +63,19 @@ $PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr";
 $PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/files";
 if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
-    print "Error: Missing environment variables.\n";
+	print "Error: Missing environment variables.\n";
 	print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
 	print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
 	print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 {
-    print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
+	print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 
@@ -85,31 +85,31 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
 elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
-    print "Error: Can't detect your OS.\n";
+	print "Error: Can't detect your OS.\n";
 	print "Can't continue.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
+	sleep 2;
 	exit 1;
 }
 
 # Define buildroot
 # ----------------
 if ($OS =~ /linux/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
 if ($OS =~ /macos/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"/tmp";
 }
 if ($OS =~ /windows/) {
-    $TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
-    $PROGPATH=$ENV{"ProgramFiles"};
+	$TEMP=$ENV{"TEMP"}||$ENV{"TMP"}||"c:/temp";
+	$PROGPATH=$ENV{"ProgramFiles"};
 }
 if (! $TEMP || ! -d $TEMP) {
-    print "Error: A temporary directory can not be find.\n";
-    print "Check that TEMP or TMP environment variable is set correctly.\n";
+	print "Error: A temporary directory can not be find.\n";
+	print "Check that TEMP or TMP environment variable is set correctly.\n";
 	print "$PROG.$Extension aborted.\n";
-    sleep 2;
-    exit 2;
+	sleep 2;
+	exit 2;
 } 
 $BUILDROOT="$TEMP/buildroot";
 
@@ -169,10 +169,10 @@ my $batch=0;
 for (0..@ARGV-1) {
 	if ($ARGV[$_] =~ /^-*target=(\w+)/i)   { $target=$1; $batch=1; }
 	if ($ARGV[$_] =~ /^-*desti=(.+)/i)     { $DESTI=$1; }
-    if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
-    	$PREFIX=$1; 
-    	$FILENAMESNAPSHOT.="-".$PREFIX; 
-    }
+	if ($ARGV[$_] =~ /^-*prefix=(.+)/i)    {
+		$PREFIX=$1; 
+		$FILENAMESNAPSHOT.="-".$PREFIX; 
+	}
 }
 if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i)   { $DESTI = $ENV{"DESTIBETARC"}; }	# Force output dir if env DESTIBETARC is defined
 if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; }	# Force output dir if env DESTISTABLE is defined
@@ -192,7 +192,7 @@ print "Target directory (DESTI) : $DESTI\n";
 if ($target) {
 	if ($target eq "ALL") { 
 		foreach my $key (@LISTETARGET) {
-	    	if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; }
+			if ($key ne 'SNAPSHOT' && $key ne 'SF' && $key ne 'ASSO') { $CHOOSEDTARGET{$key}=1; }
 		}
 	}
 	if ($target ne "ALL" && $target ne "SF" && $target ne "ASSO") { $CHOOSEDTARGET{uc($target)}=1; }
@@ -200,56 +200,56 @@ if ($target) {
 	if ($target eq "ASSO") { $CHOOSEDPUBLISH{"ASSO"}=1; }
 }
 else {
-    my $found=0;
-    my $NUM_SCRIPT;
-   	my $cpt=0;
-    while (! $found) {
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
-    	foreach my $target (@LISTETARGET) {
-    		$cpt++;
-    		printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
-    	}
-    	$cpt=98;
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
-    	$cpt=99;
-    	printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
-    
-    	# Ask which target to build
-    	print "Choose one package number or several separated with space (0 - ".$cpt."): ";
-    	$NUM_SCRIPT=<STDIN>; 
-    	chomp($NUM_SCRIPT);
-    	if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
-    	{
-    		print "This is not a valid package number list.\n";
-    		$found = 0;
-    	}
-    	else
-    	{
-    		$found = 1;
-    	}
-    }
-    print "\n";
-    if ($NUM_SCRIPT eq "98") {
-   		$CHOOSEDPUBLISH{"ASSO"}=1;
-    }
-    else 
-    {
-    	if ($NUM_SCRIPT eq "99") {
-	   		$CHOOSEDPUBLISH{"SF"}=1;
-	    }
-	    else {
-		    if ($NUM_SCRIPT eq "0") {
-		    	foreach my $key (@LISTETARGET) {
-		    		if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
-		        }
-		    }
-		    else {
-		   		foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
-		   			$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
-		   		}
-		    }
-	    }
-    }
+	my $found=0;
+	my $NUM_SCRIPT;
+	my $cpt=0;
+	while (! $found) {
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ALL (1..9)","Need ".join(",",values %REQUIREMENTTARGET));
+		foreach my $target (@LISTETARGET) {
+			$cpt++;
+			printf(" %2d - %-14s  (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target});
+		}
+		$cpt=98;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+		$cpt=99;
+		printf(" %2d - %-14s  (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH));
+	
+		# Ask which target to build
+		print "Choose one package number or several separated with space (0 - ".$cpt."): ";
+		$NUM_SCRIPT=<STDIN>; 
+		chomp($NUM_SCRIPT);
+		if ($NUM_SCRIPT !~ /^[0-9\s]+$/)
+		{
+			print "This is not a valid package number list.\n";
+			$found = 0;
+		}
+		else
+		{
+			$found = 1;
+		}
+	}
+	print "\n";
+	if ($NUM_SCRIPT eq "98") {
+		$CHOOSEDPUBLISH{"ASSO"}=1;
+	}
+	else 
+	{
+		if ($NUM_SCRIPT eq "99") {
+			$CHOOSEDPUBLISH{"SF"}=1;
+		}
+		else {
+			if ($NUM_SCRIPT eq "0") {
+				foreach my $key (@LISTETARGET) {
+					if ($key ne 'SNAPSHOT' && $key ne 'ASSO' && $key ne 'SF') { $CHOOSEDTARGET{$key}=1; }
+				}
+			}
+			else {
+				foreach my $num (split(/\s+/,$NUM_SCRIPT)) {
+					$CHOOSEDTARGET{$LISTETARGET[$num-1]}=1;
+				}
+			}
+		}
+	}
 }
 
 # Test if requirement is ok
@@ -265,34 +265,34 @@ foreach my $target (keys %CHOOSEDTARGET) {
 		}
 		$atleastonerpm=1;			
 	} 
-    foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) 
-    {
-        # Test    
-        print "Test requirement for target $target: Search '$req'... ";
-        $newreq=$req; $newparam='';
-        if ($newreq eq 'zip') { $newparam.='-h'; }
-        if ($newreq eq 'xz') { $newparam.='-h'; }
-        $cmd="\"$newreq\" $newparam 2>&1";
-        print "Test command ".$cmd."... ";
-        $ret=`$cmd`;
-        $coderetour=$?; $coderetour2=$coderetour>>8;
-        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
-            # Not found error, we try in PROGPATH
-            $ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-            $coderetour=$?; $coderetour2=$coderetour>>8;
-            $REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
-        } 
+	foreach my $req (split(/[,\s]/,$REQUIREMENTTARGET{$target})) 
+	{
+		# Test    
+		print "Test requirement for target $target: Search '$req'... ";
+		$newreq=$req; $newparam='';
+		if ($newreq eq 'zip') { $newparam.='-h'; }
+		if ($newreq eq 'xz') { $newparam.='-h'; }
+		$cmd="\"$newreq\" $newparam 2>&1";
+		print "Test command ".$cmd."... ";
+		$ret=`$cmd`;
+		$coderetour=$?; $coderetour2=$coderetour>>8;
+		if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/)) && $PROGPATH) { 
+			# Not found error, we try in PROGPATH
+			$ret=`"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
+			$coderetour=$?; $coderetour2=$coderetour>>8;
+			$REQUIREMENTTARGET{$target}="$PROGPATH/$ALTERNATEPATH{$req}/$req";
+		} 
 
-        if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
-            # Not found error
-            print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-            $CHOOSEDTARGET{$target}=-1;
-            last;
-        } else {
-            # Pas erreur ou erreur autre que programme absent
-            print " Found ".$req."\n";
-        }
-    }
+		if ($coderetour != 0 && (($coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i) || ($coderetour2 == 127 && $OS !~ /windows/))) {
+			# Not found error
+			print "Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
+			$CHOOSEDTARGET{$target}=-1;
+			last;
+		} else {
+			# Pas erreur ou erreur autre que programme absent
+			print " Found ".$req."\n";
+		}
+	}
 }
 
 print "\n";
@@ -303,7 +303,7 @@ $nboftargetok=0;
 $nboftargetneedbuildroot=0;
 $nbofpublishneedtag=0;
 foreach my $target (keys %CHOOSEDTARGET) {
-    if ($CHOOSEDTARGET{$target} < 0) { next; }
+	if ($CHOOSEDTARGET{$target} < 0) { next; }
 	if ($target ne 'EXE' && $target ne 'EXEDOLIWAMP') 
 	{
 		$nboftargetneedbuildroot++;
@@ -311,7 +311,7 @@ foreach my $target (keys %CHOOSEDTARGET) {
 	$nboftargetok++;
 }
 foreach my $target (keys %CHOOSEDPUBLISH) {
-    if ($CHOOSEDPUBLISH{$target} < 0) { next; }
+	if ($CHOOSEDPUBLISH{$target} < 0) { next; }
 	if ($target eq 'ASSO') { $nbofpublishneedtag++; }
 	if ($target eq 'SF') { $nbofpublishneedtag++; }
 	$nboftargetok++;
@@ -319,579 +319,583 @@ foreach my $target (keys %CHOOSEDPUBLISH) {
 
 if ($nboftargetok) {
 
-    # Update CVS if required
-    #-----------------------
-    if ($nbofpublishneedtag)
+	# Update CVS if required
+	#-----------------------
+	if ($nbofpublishneedtag)
 	{
-    	print "Go to directory $SOURCE\n";
-   		$olddir=getcwd();
-   		chdir("$SOURCE");
-    	print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-    	$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
-    	if ($ret =~ /already exists/)
-    	{
-    		print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
-	    	$QUESTIONOVERWRITETAG=<STDIN>; 
-	    	chomp($QUESTIONOVERWRITETAG);
-	    	if ($QUESTIONOVERWRITETAG =~ /(o|y)/)
-	    	{
-		    	print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
-		    	$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
-	    	}
-    	}
-    	print 'Run git push --tags'."\n";
-    	$ret=`git push --tags`;
-    	chdir("$olddir");
+		print "Go to directory $SOURCE\n";
+		$olddir=getcwd();
+		chdir("$SOURCE");
+		print 'Run git tag -a -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
+		$ret=`git tag -a -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD" 2>&1`;
+		if ($ret =~ /already exists/)
+		{
+			print "WARNING: Tag ".$MAJOR.'.'.$MINOR.'.'.$BUILD." already exists. Overwrite (y/N) ? ";
+			$QUESTIONOVERWRITETAG=<STDIN>; 
+			chomp($QUESTIONOVERWRITETAG);
+			if ($QUESTIONOVERWRITETAG =~ /(o|y)/)
+			{
+				print 'Run git tag -a -f -m "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'" "'.$MAJOR.'.'.$MINOR.'.'.$BUILD.'"'."\n";
+				$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
+			}
+		}
+		print 'Run git push --tags'."\n";
+		$ret=`git push --tags`;
+		chdir("$olddir");
 	}
 	
-    # Update buildroot if required
-    #-----------------------------
-    if ($nboftargetneedbuildroot)
+	# Update buildroot if required
+	#-----------------------------
+	if ($nboftargetneedbuildroot)
 	{
-	    if (! $copyalreadydone) {
-	    	print "Creation of a buildroot used for all packages\n";
+		if (! $copyalreadydone) {
+			print "Creation of a buildroot used for all packages\n";
 
-	    	print "Delete directory $BUILDROOT\n";
-	    	$ret=`rm -fr "$BUILDROOT"`;
-	    
-	    	mkdir "$BUILDROOT";
-	    	mkdir "$BUILDROOT/$PROJECT";
-	    	print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
-	    	$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
+			print "Delete directory $BUILDROOT\n";
+			$ret=`rm -fr "$BUILDROOT"`;
+		
+			mkdir "$BUILDROOT";
+			mkdir "$BUILDROOT/$PROJECT";
+			print "Copy $SOURCE into $BUILDROOT/$PROJECT\n";
+			$ret=`cp -pr "$SOURCE" "$BUILDROOT/$PROJECT"`;
 
-	    	#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
-	    	#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
-	    }
-	    print "Clean $BUILDROOT\n";
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
-	    $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`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
+			#print "Copy $SOURCE/build/debian/apache/.htaccess into $BUILDROOT/$PROJECT/build/debian/apache/.htaccess\n";
+			#$ret=`cp -pr "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT/build/debian/apache/.htaccess"`;
+		}
+		print "Clean $BUILDROOT\n";
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.buildpath`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.cache`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.externalToolBuilders`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.git*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.project`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.settings`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/.scrutinizer.yml`;
+		$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`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/Doli*-*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.xz`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
 
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
 
-        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
+		$ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/install/mssql`;
 
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/dev/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/codetemplates`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/dbmodel`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/initdata`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/iso-normes`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/ldap`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpcheckstyle`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/phpunit`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/dev/dolibarr_changes.txt`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/dev/README`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot2.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot3.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot4.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot5.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot6.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot7.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot8.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot9.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot10.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot11.png`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/test`;
-	    $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
-   	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
-        #$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball
-   	    
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/document`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/documents`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ancotec*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/bootstrap*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/nltechno*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/pos*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/eldy/*.new`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/test`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jqueryFileTree/connectors/jqueryFileTree.pl`;    # Avoid errors into rpmlint
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/template`;  # Package not valid for most linux distributions (errors reported into compile.js). Package should be embed by modules to avoid problems.
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpmailer`;                # Package not valid for most linux distributions (errors reported into file LICENSE). Package should be embed by modules to avoid problems.
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/adapters`;		# Keep this removal in case we embed libraries
+		#$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`;		# _source must be kept into tarball due to debian policies
+		
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/datatables/extras/TableTools/swf`;	# Source of this flash is not available
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
 	}
 
-    # Build package for each target
-    #------------------------------
-    foreach my $target (keys %CHOOSEDTARGET) 
-    {
-        if ($CHOOSEDTARGET{$target} < 0) { next; }
-    
-        print "\nBuild package for target $target\n";
+	# Build package for each target
+	#------------------------------
+	foreach my $target (keys %CHOOSEDTARGET) 
+	{
+		if ($CHOOSEDTARGET{$target} < 0) { next; }
+	
+		print "\nBuild package for target $target\n";
 
-    	if ($target eq 'SNAPSHOT') 
-    	{
-    		$NEWDESTI=$DESTI;
+		if ($target eq 'SNAPSHOT') 
+		{
+			$NEWDESTI=$DESTI;
 
-    		print "Remove target $FILENAMESNAPSHOT.tgz...\n";
-    		unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz");
+			print "Remove target $FILENAMESNAPSHOT.tgz...\n";
+			unlink("$NEWDESTI/$FILENAMESNAPSHOT.tgz");
 
-            #rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMESNAPSHOT";
+			$ret=`rm -fr $BUILDROOT/$FILENAMESNAPSHOT`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMESNAPSHOT\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMESNAPSHOT\"";
+			$ret=`$cmd`;
 
-    		print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
-   		    $cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
+			print "Compress $BUILDROOT into $FILENAMESNAPSHOT.tgz...\n";
+			$cmd="tar --exclude doli*.tgz --exclude doli*.deb --exclude doli*.exe --exclude doli*.xz --exclude doli*.zip --exclude doli*.rpm --exclude .cache --exclude .settings --exclude conf.php --exclude conf.php.mysql --exclude conf.php.old --exclude conf.php.postgres --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMESNAPSHOT.tgz\" $FILENAMESNAPSHOT";
 			print $cmd."\n";
 			$ret=`$cmd`;
 
-    		# Move to final dir
-       		print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n";
-       		$ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`;
-    		next;
-    	}
+			# Move to final dir
+			print "Move $FILENAMESNAPSHOT.tgz to $NEWDESTI/$FILENAMESNAPSHOT.tgz\n";
+			$ret=`mv "$FILENAMESNAPSHOT.tgz" "$NEWDESTI/$FILENAMESNAPSHOT.tgz"`;
+			next;
+		}
 
-    	if ($target eq 'TGZ') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+		if ($target eq 'TGZ') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMETGZ.tgz...\n";
-    		unlink("$NEWDESTI/$FILENAMETGZ.tgz");
+			print "Remove target $FILENAMETGZ.tgz...\n";
+			unlink("$NEWDESTI/$FILENAMETGZ.tgz");
 
-            #rmdir "$BUILDROOT/$FILENAMETGZ";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
-            print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMETGZ";
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ`;
+			print "Copy $BUILDROOT/$PROJECT/ to $BUILDROOT/$FILENAMETGZ\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT/\" \"$BUILDROOT/$FILENAMETGZ\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 			
-    		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
-   		    print "$cmd\n";
-   		    $ret=`$cmd`;
+			print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
+			$cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" $FILENAMETGZ";
+			print "$cmd\n";
+			$ret=`$cmd`;
 
-    		# Move to final dir
-       		print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
-       		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
-    		next;
-    	}
+			# Move to final dir
+			print "Move $BUILDROOT/$FILENAMETGZ.tgz to $NEWDESTI/$FILENAMETGZ.tgz\n";
+			$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$NEWDESTI/$FILENAMETGZ.tgz"`;
+			next;
+		}
 
-    	if ($target eq 'XZ') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+		if ($target eq 'XZ') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMEXZ.xz...\n";
-    		unlink("$NEWDESTI/$FILENAMEXZ.xz");
+			print "Remove target $FILENAMEXZ.xz...\n";
+			unlink("$NEWDESTI/$FILENAMEXZ.xz");
 
-            #rmdir "$BUILDROOT/$FILENAMEXZ";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMEXZ`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMEXZ";
+			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEXZ\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEXZ\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMEXZ/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 			
-    		print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
- 
-            print "Go to directory $BUILDROOT\n";
-     		$olddir=getcwd();
-     		chdir("$BUILDROOT");
-    		$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
+			print "Compress $FILENAMEXZ into $FILENAMEXZ.xz...\n";
+
+			print "Go to directory $BUILDROOT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT");
+			$cmd= "xz -9 -r $BUILDROOT/$FILENAMEAPS.xz \*";
 			print $cmd."\n";
 			$ret= `$cmd`;
-            chdir("$olddir");
+			chdir("$olddir");
 
-    		# Move to final dir
-            print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`;
-    		next;
-    	}
-    	
-    	if ($target eq 'ZIP') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/standard');
+			# Move to final dir
+			print "Move $FILENAMEXZ.xz to $NEWDESTI/$FILENAMEXZ.xz\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEXZ.xz" "$NEWDESTI/$FILENAMEXZ.xz"`;
+			next;
+		}
+		
+		if ($target eq 'ZIP') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/standard');
 			if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; } 
 
-    		print "Remove target $FILENAMEZIP.zip...\n";
-    		unlink("$NEWDESTI/$FILENAMEZIP.zip");
+			print "Remove target $FILENAMEZIP.zip...\n";
+			unlink("$NEWDESTI/$FILENAMEZIP.zip");
 
-            #rmdir "$BUILDROOT/$FILENAMEZIP";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
-    		$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
-            $ret=`$cmd`;
+			#rmdir "$BUILDROOT/$FILENAMEZIP";
+			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMEZIP\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMEZIP\"";
+			$ret=`$cmd`;
 
-		    $ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/build/exe`;
 			$ret=`rm -fr $BUILDROOT/$FILENAMEZIP/htdocs/includes/ckeditor/_source`;	# We can't remove it with exclude file, we need it for some tarball packages
 
-    		print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
- 
-            print "Go to directory $BUILDROOT\n";
-     		$olddir=getcwd();
-     		chdir("$BUILDROOT");
-    		$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*";
+			print "Compress $FILENAMEZIP into $FILENAMEZIP.zip...\n";
+
+			print "Go to directory $BUILDROOT\n";
+			$olddir=getcwd();
+			chdir("$BUILDROOT");
+			$cmd= "7z a -r -tzip -xr\@\"$BUILDROOT\/$FILENAMEZIP\/build\/zip\/zip_exclude.txt\" -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMEZIP\/*";
 			print $cmd."\n";
 			$ret= `$cmd`;
-            chdir("$olddir");
-            			
-    		# Move to final dir
-            print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
-            $ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
-    		next;
-    	}
-    
-    	if ($target =~ /RPM/)	                 # Linux only 
-    	{
-    		$NEWDESTI=$DESTI;
-    		$subdir="package_rpm_generic";
-    		if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
-    		if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
-    		if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
-    		mkdir($DESTI.'/'.$subdir);
+			chdir("$olddir");
+						
+			# Move to final dir
+			print "Move $FILENAMEZIP.zip to $NEWDESTI/$FILENAMEZIP.zip\n";
+			$ret=`mv "$BUILDROOT/$FILENAMEZIP.zip" "$NEWDESTI/$FILENAMEZIP.zip"`;
+			next;
+		}
+	
+		if ($target =~ /RPM/)	                 # Linux only 
+		{
+			$NEWDESTI=$DESTI;
+			$subdir="package_rpm_generic";
+			if ($target =~ /FEDO/i) { $subdir="package_rpm_redhat-fedora"; }
+			if ($target =~ /MAND/i) { $subdir="package_rpm_mandriva"; }
+			if ($target =~ /OPEN/i) { $subdir="package_rpm_opensuse"; }
+			mkdir($DESTI.'/'.$subdir);
 			if (-d $DESTI.'/'.$subdir) { $NEWDESTI=$DESTI.'/'.$subdir; } 
 
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
 
-            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
 
-    		print "Remove target ".$FILENAMERPM."...\n";
-    		unlink("$NEWDESTI/".$FILENAMERPM);
-    		print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
-    		unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
+			print "Remove target ".$FILENAMERPM."...\n";
+			unlink("$NEWDESTI/".$FILENAMERPM);
+			print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
+			unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm");
 
-    		print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
-    		$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
-    		
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
-    		$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
-            $ret=`$cmd`;
+			print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
+			
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
+			$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
+			$ret=`$cmd`;
 
-            # Removed files we don't need
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
 
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
+			print "Set permissions on files/dir\n";
+			$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
+			$cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
+			$ret=`$cmd`;
 
 			# Build tgz
-    		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
-    		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
+			print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
+			$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
 
-    		print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n";
-    		$cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz";
-            $ret=`$cmd`;
+			print "Move $BUILDROOT/$FILENAMETGZ2.tgz to $RPMDIR/SOURCES/$FILENAMETGZ2.tgz\n";
+			$cmd="mv $BUILDROOT/$FILENAMETGZ2.tgz $RPMDIR/SOURCES/$FILENAMETGZ2.tgz";
+			$ret=`$cmd`;
 
-    		$BUILDFIC="${FILENAME}.spec";
-    		$BUILDFICSRC="${FILENAME}_generic.spec";
-    		if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; }
-    		if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
-    		if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
-    		
- 			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
-            open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
-            open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
-            while (<SPECFROM>) {
-                $_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
-                $_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
-                $_ =~ s/__RELEASE__/$RPMSUBVERSION/;
-                print SPECTO $_;
-            }
-            close SPECFROM;
-            close SPECTO;
-    
-    		print "Copy patch file to $RPMDIR/SOURCES\n";
-    		$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
-		    $ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`;
+			$BUILDFIC="${FILENAME}.spec";
+			$BUILDFICSRC="${FILENAME}_generic.spec";
+			if ($target =~ /FEDO/i) { $BUILDFICSRC="${FILENAME}_fedora.spec"; }
+			if ($target =~ /MAND/i) { $BUILDFICSRC="${FILENAME}_mandriva.spec"; }
+			if ($target =~ /OPEN/i) { $BUILDFICSRC="${FILENAME}_opensuse.spec"; }
+			
+			print "Generate file $BUILDROOT/$BUILDFIC from $SOURCE/build/rpm/${BUILDFICSRC}\n";
+			open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFICSRC}") || die "Error";
+			open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error";
+			while (<SPECFROM>) {
+				$_ =~ s/__FILENAMETGZ__/$FILENAMETGZ/;
+				$_ =~ s/__VERSION__/$MAJOR.$MINOR.$REL1/;
+				$_ =~ s/__RELEASE__/$RPMSUBVERSION/;
+				print SPECTO $_;
+			}
+			close SPECFROM;
+			close SPECTO;
+	
+			print "Copy patch file to $RPMDIR/SOURCES\n";
+			$ret=`cp "$SOURCE/build/rpm/dolibarr-forrpm.patch" "$RPMDIR/SOURCES"`;
+			$ret=`chmod 644 $RPMDIR/SOURCES/dolibarr-forrpm.patch`;
 
-    		print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
-    		#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
-    		$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
+			print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
+			#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
+			$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
 
-    		# Move to final dir
-   		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
-   		    $cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\"";
-    		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n";
-   		    $cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\"";
-    		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
-   		    $cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
-    		$ret=`$cmd`;
-    		next;
-    	}
+			# Move to final dir
+			print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
+			$cmd="mv $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm \"$NEWDESTI/\"";
+			$ret=`$cmd`;
+			print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm\n";
+			$cmd="mv $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.src.rpm \"$NEWDESTI/\"";
+			$ret=`$cmd`;
+			print "Move $RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz into $NEWDESTI/".$FILENAMETGZ2.".tgz\n";
+			$cmd="mv \"$RPMDIR/SOURCES/".$FILENAMETGZ2.".tgz\" \"$NEWDESTI/".$FILENAMETGZ2.".tgz\"";
+			$ret=`$cmd`;
+			next;
+		}
 
-    	if ($target eq 'DEB') 
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_debian-ubuntu');
+		if ($target eq 'DEB') 
+		{
+			$NEWDESTI=$DESTI;
+			mkdir($DESTI.'/package_debian-ubuntu');
 			if (-d $DESTI.'/package_debian-ubuntu') { $NEWDESTI=$DESTI.'/package_debian-ubuntu'; } 
 
-            $olddir=getcwd();
+			$olddir=getcwd();
 
-    		print "Remove target ${FILENAMEDEB}_all.deb...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
-    		print "Remove target ${FILENAMEDEB}.dsc...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.dsc");
-    		print "Remove target ${FILENAMEDEB}.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
-    		print "Remove target ${FILENAMEDEB}.changes...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.changes");
-    		print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
-    		print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
-    		unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");
+			print "Remove target ${FILENAMEDEB}_all.deb...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}_all.deb");
+			print "Remove target ${FILENAMEDEB}.dsc...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.dsc");
+			print "Remove target ${FILENAMEDEB}.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.tar.gz");
+			print "Remove target ${FILENAMEDEB}.changes...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.changes");
+			print "Remove target ${FILENAMEDEB}.debian.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEB}.debian.tar.gz");
+			print "Remove target ${FILENAMEDEBNATIVE}.orig.tar.gz...\n";
+			unlink("$NEWDESTI/${FILENAMEDEBNATIVE}.orig.tar.gz");
 
-    		$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
-    		$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
-    		
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build`;
+			
 			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
 			$ret=`$cmd`;
 			$cmd="cp -pr \"$BUILDROOT/$PROJECT/build/debian/apache/.htaccess\" \"$BUILDROOT/$PROJECT.tmp/build/debian/apache/.htaccess\"";
 			$ret=`$cmd`;
 
- 			print "Remove other files\n";
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/tgz/README`;
-            #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/changelog`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/compat`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/control*`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
-            # Removed duplicate license files
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
-            # Removed files we don't need
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
-            
-            # Rename upstream changelog to match debian rules
+			print "Remove other files\n";
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/README-FR`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/README-FR`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/aps`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/dmg`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/pad/README`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/tgz/README`;
+			#$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/po`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/debian/source`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/changelog`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/compat`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/control*`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/copyright`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.config`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.desktop`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.docs`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.install`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.lintian-overrides`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postrm`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.postinst`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/dolibarr.templates.futur`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/rules`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.Debian`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/README.howto`;
+			$ret=`rm -f  $BUILDROOT/$PROJECT.tmp/build/debian/watch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/launchpad`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/perl`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
+			# Removed duplicate license files
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
+			# Removed files we don't need
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
+			
+			# Rename upstream changelog to match debian rules
 			$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;
 			
-            # Prepare source package (init debian dir)
-            print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
-            $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
-            print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
-            # Add files for dpkg-source
-            $ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.desktop"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.docs"        		"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.install" 	        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.lintian-overrides"  "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
-            $ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
-            # Add files also required to build binary package
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/dolibarr.templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/debian/install.forced.php.install"      "$BUILDROOT/$PROJECT.tmp/debian"`;
-            
+			# Prepare source package (init debian dir)
+			print "Create directory $BUILDROOT/$PROJECT.tmp/debian\n";
+			$ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
+			print "Copy $SOURCE/build/debian/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
+			# Add files for dpkg-source
+			$ret=`cp -f  "$SOURCE/build/debian/changelog"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/compat"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/control"        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/copyright"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.desktop"        	"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.docs"        		"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.install" 	        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.lintian-overrides"  "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.xpm"  		      	"$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/rules"          "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/watch"          "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/patches"        "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/po"             "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/source"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -fr "$SOURCE/build/debian/apache"         "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+			$ret=`cp -f  "$SOURCE/build/debian/apache/.htaccess" "$BUILDROOT/$PROJECT.tmp/debian/apache"`;
+			$ret=`cp -fr "$SOURCE/build/debian/lighttpd"       "$BUILDROOT/$PROJECT.tmp/debian/lighttpd"`;
+			# Add files also required to build binary package
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/dolibarr.templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			$ret=`cp -f  "$SOURCE/build/debian/install.forced.php.install"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+			
 			# Set owners and permissions
-            #print "Set owners on files/dir\n";
-		    #$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
+			#print "Set owners on files/dir\n";
+			#$ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
 
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
-		    $cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            
-          
-            print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
-            $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
-            $ret=`$cmd`;
+			print "Set permissions on files/dir\n";
+			$ret=`chmod -R 755 $BUILDROOT/$PROJECT.tmp`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp -type f -exec chmod 644 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.dpatch' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$ret=`chmod 755 $BUILDROOT/$PROJECT.tmp/debian/rules`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/translation/autotranslator.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/modMyModule.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_class.class.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_page.php`;
+			$ret=`chmod -R 644 $BUILDROOT/$PROJECT.tmp/dev/skeletons/skeleton_webservice_server.php`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			$cmd="find $BUILDROOT/$PROJECT.tmp/scripts -name '*.sh' -type f -exec chmod 755 {} \\; ";
+			$ret=`$cmd`;
+			
+		
+			print "Rename directory $BUILDROOT/$PROJECT.tmp into $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
+			$cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+			$ret=`$cmd`;
 
 
-     		print "Go into directory $BUILDROOT\n";
-            chdir("$BUILDROOT");
+			print "Go into directory $BUILDROOT\n";
+			chdir("$BUILDROOT");
 			
 			# We need a tarball to be able to build "quilt" debian package (not required for native but we need patch so it is not a native)
-    		print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n";
-   		    $cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build";
-   		    print $cmd."\n";
-   		    $ret=`$cmd`;
+			print "Compress $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build into $BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz...\n";
+			$cmd="tar --exclude-vcs --exclude-from \"$BUILDROOT/$PROJECT/build/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMEDEBNATIVE.orig.tar.gz\" $PROJECT-$MAJOR.$MINOR.$build";
+			print $cmd."\n";
+			$ret=`$cmd`;
 
 			# Creation of source package          
-     		print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
-            chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
-            #$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
-            $cmd="dpkg-buildpackage -us -uc";
-            print "Launch DEB build ($cmd)\n";
-            $ret=`$cmd 2>&1 3>&1`;
-            print $ret."\n";
+			print "Go into directory $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build\n";
+			chdir("$BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build");
+			#$cmd="dpkg-source -b $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
+			$cmd="dpkg-buildpackage -us -uc";
+			print "Launch DEB build ($cmd)\n";
+			$ret=`$cmd 2>&1 3>&1`;
+			print $ret."\n";
 
-            chdir("$olddir");
-    		
-    		print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
-    		print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
-    		
-    		# Move to final dir
-            print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
-            $ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
-            $ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
-        	next;
-        }
-        
-    	if ($target eq 'APS') 
-    	{
+			chdir("$olddir");
+			
+			print "You can check bin package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}_all.deb\"\n";
+			print "You can check src package with lintian --pedantic -E -I \"$NEWDESTI/${FILENAMEDEB}.dsc\"\n";
+			
+			# Move to final dir
+			print "Move *_all.deb *.dsc *.orig.tar.gz *.changes to $NEWDESTI\n";
+			$ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
+			$ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
+			next;
+		}
+		
+		if ($target eq 'APS') 
+		{
 			$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_aps');
+			mkdir($DESTI.'/package_aps');
 			if (-d $DESTI.'/package_aps') { $NEWDESTI=$DESTI.'/package_aps'; } 
 			
-            $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
-            $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
-            if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
-            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
-    		
-     		print "Remove target $FILENAMEAPS.zip...\n";
-    		unlink "$NEWDESTI/$FILENAMEAPS.zip";
- 
-            #rmdir "$BUILDROOT/$PROJECT.tmp";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
-            print "Create directory $BUILDROOT/$PROJECT.tmp\n";
-            $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
-            print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
-            $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
-            $ret=`$cmd`;
+			$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
+			$REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
+			if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
+			print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
+			
+			print "Remove target $FILENAMEAPS.zip...\n";
+			unlink "$NEWDESTI/$FILENAMEAPS.zip";
 
-            print "Remove other files\n";
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
+			#rmdir "$BUILDROOT/$PROJECT.tmp";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp`;
+			print "Create directory $BUILDROOT/$PROJECT.tmp\n";
+			$ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp"`;
+			print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$PROJECT.tmp\n";
+			$cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$PROJECT.tmp\"";
+			$ret=`$cmd`;
+
+			print "Remove other files\n";
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+			$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/rpm`;
+			$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";
@@ -938,12 +942,12 @@ if ($nboftargetok) {
             next;
     	}
 
-    	if ($target eq 'EXEDOLIWAMP')
-    	{
-    		$NEWDESTI=$DESTI;
-    		mkdir($DESTI.'/package_windows');
+		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";
  
@@ -959,7 +963,7 @@ if ($nboftargetok) {
 			$ret= `$cmd`;
 			#print "$ret\n";
 
-    		# Move to final dir
+			# 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";
@@ -971,67 +975,67 @@ if ($nboftargetok) {
     	}
     }
 
-    # Build package for each target
-    #------------------------------
-    foreach my $target (keys %CHOOSEDPUBLISH) 
-    {
-        if ($CHOOSEDPUBLISH{$target} < 0) { next; }
-    
+	# Publish package for each target
+	#--------------------------------
+	foreach my $target (keys %CHOOSEDPUBLISH) 
+	{
+		if ($CHOOSEDPUBLISH{$target} < 0) { next; }
+	
 		print "\nList of files to publish\n";
-    	%filestoscansf=(
-    		"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
-    		"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
-    		"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
-    		"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
-    		"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
-    	);
-    	use POSIX qw/strftime/;
-    	foreach my $file (sort keys %filestoscansf)
-    	{
-    		$found=0;
-    		my $filesize = -s $file;
-    		my $filedate = (stat $file)[9];
-    		print $file." ".($filesize?"(found)":"(not found)");
-    		print ($filesize?" - ".$filesize:"");
-    		print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
-    		print "\n";
-    	}
+		%filestoscansf=(
+			"$DESTI/package_rpm_generic/$FILENAMERPM"=>'Dolibarr installer for Fedora-Redhat-Mandriva-Opensuse (DoliRpm)',
+			"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
+			"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
+			"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
+			"$DESTI/standard/$FILENAMETGZ.zip"=>'Dolibarr ERP-CRM'
+		);
+		use POSIX qw/strftime/;
+		foreach my $file (sort keys %filestoscansf)
+		{
+			$found=0;
+			my $filesize = -s $file;
+			my $filedate = (stat $file)[9];
+			print $file." ".($filesize?"(found)":"(not found)");
+			print ($filesize?" - ".$filesize:"");
+			print ($filedate?" - ".strftime("%Y-%m-%d %H:%M:%S",localtime($filedate)):"");
+			print "\n";
+		}
 
-    	if ($target eq 'SF' || $target eq 'ASSO') 
-    	{
-    		print "\n";
-    		
-    		if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; }
+		if ($target eq 'SF' || $target eq 'ASSO') 
+		{
+			print "\n";
+			
+			if ($target eq 'SF') { $PUBLISH = $PUBLISHSTABLE; }
 			if ($target eq 'ASSO' && $BUILD =~ /[a-z]/i)   { $PUBLISH = $PUBLISHBETARC.'/lastbuild'; }
 			if ($target eq 'ASSO' && $BUILD =~ /^[0-9]+$/) { $PUBLISH = $PUBLISHBETARC.'/stable'; }
 			
-    		$NEWPUBLISH=$PUBLISH;
-    		print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";
+			$NEWPUBLISH=$PUBLISH;
+			print "Publish to target $NEWPUBLISH. Click enter or CTRL+C...\n";
 
-	    	# Ask which target to build
-	    	$NUM_SCRIPT=<STDIN>; 
-	    	chomp($NUM_SCRIPT);
+			# Ask which target to build
+			$NUM_SCRIPT=<STDIN>; 
+			chomp($NUM_SCRIPT);
 
 			print "Create empty dir /tmp/emptydir. We need it to create target dir using rsync.\n";
-            $ret=`mkdir -p "/tmp/emptydir/"`;
-            
-            %filestoscan=%filestoscansf;
-            
-	    	foreach my $file (sort keys %filestoscan)
-	    	{
-	    		$found=0;
-	    		my $filesize = -s $file;
-	    		if (! $filesize) { next; }
+			$ret=`mkdir -p "/tmp/emptydir/"`;
+			
+			%filestoscan=%filestoscansf;
+			
+			foreach my $file (sort keys %filestoscan)
+			{
+				$found=0;
+				my $filesize = -s $file;
+				if (! $filesize) { next; }
 
 				print "\n";
-	    		print "Publish file ".$file." to ".$filestoscan{$file}."\n";
-	    		
-	    		$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
+				print "Publish file ".$file." to ".$filestoscan{$file}."\n";
+				
+				$destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD;
 
 				# mkdir	   
 				#my $ssh = Net::SSH::Perl->new("frs.sourceforge.net");
 				#$ssh->login("$user","$pass"); 		
-	    		#use String::ShellQuote qw( shell_quote );
+				#use String::ShellQuote qw( shell_quote );
 				#$ssh->cmd('mkdir '.shell_quote($destFolder).' && exit');
 
 				#use Net::SFTP::Foreign;
@@ -1050,25 +1054,23 @@ if ($nboftargetok) {
 				print "$command\n";	
 				my $ret=`$command 2>&1`;
 				print "$ret\n";
-	    		
-	    	}
-
-    	}
-    }    
+			}
+		}
+	}    
 }
 
 print "\n----- Summary -----\n";
 foreach my $target (keys %CHOOSEDTARGET) {
-    if ($CHOOSEDTARGET{$target} < 0) {
-        print "Package $target not built (bad requirement).\n";
-    } else {
-        print "Package $target built successfully in $DESTI\n";
-    }
+	if ($CHOOSEDTARGET{$target} < 0) {
+		print "Package $target not built (bad requirement).\n";
+	} else {
+		print "Package $target built successfully in $DESTI\n";
+	}
 }
 
 if (! $batch) {
-    print "\nPress key to finish...";
-    my $WAITKEY=<STDIN>;
+	print "\nPress key to finish...";
+	my $WAITKEY=<STDIN>;
 }
 
 0;
diff --git a/build/makepack-dolibarrlang.pl b/build/makepack-dolibarrlang.pl
deleted file mode 100755
index 6066a678d7c..00000000000
--- a/build/makepack-dolibarrlang.pl
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/usr/bin/perl
-#----------------------------------------------------------------------------
-# \file         build/makepack-dolibarrlang.pl
-# \brief        Package builder (tgz, zip, rpm, deb, exe)
-# \author       (c)2005 Laurent Destailleur  <eldy@users.sourceforge.net>
-#----------------------------------------------------------------------------
-
-use Cwd;
-
-$PROJECT = "dolibarr";
-
-@LISTETARGET       = ("TGZ");    # Possible packages
-%REQUIREMENTTARGET = (           # Tool requirement for each package
-	"TGZ" => "tar",
-	"ZIP" => "7z",
-	"EXE" => "makensis.exe"
-);
-%ALTERNATEPATH = (
-	"7z"           => "7-ZIP",
-	"makensis.exe" => "NSIS"
-);
-
-use vars qw/ $REVISION $VERSION /;
-$REVISION = '1.10';
-$VERSION  = "1.0 (build $REVISION)";
-
-#------------------------------------------------------------------------------
-# MAIN
-#------------------------------------------------------------------------------
-( $DIR  = $0 ) =~ s/([^\/\\]+)$//;
-( $PROG = $1 ) =~ s/\.([^\.]*)$//;
-$Extension = $1;
-$DIR ||= '.';
-$DIR =~ s/([^\/\\])[\\\/]+$/$1/;
-
-# Detect OS type
-# --------------
-if ( "$^O" =~ /linux/i || ( -d "/etc" && -d "/var" && "$^O" !~ /cygwin/i ) ) {
-	$OS = 'linux';
-	$CR = '';
-}
-elsif ( -d "/etc" && -d "/Users" ) { $OS = 'macosx'; $CR = ''; }
-elsif ( "$^O" =~ /cygwin/i || "$^O" =~ /win32/i ) {
-	$OS = 'windows';
-	$CR = "\r";
-}
-if ( !$OS ) {
-	print "$PROG.$Extension was not able to detect your OS.\n";
-	print "Can't continue.\n";
-	print "$PROG.$Extension aborted.\n";
-	sleep 2;
-	exit 1;
-}
-
-# Define buildroot
-# ----------------
-if ( $OS =~ /linux/ ) {
-	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
-}
-if ( $OS =~ /macos/ ) {
-	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "/tmp";
-}
-if ( $OS =~ /windows/ ) {
-	$TEMP = $ENV{"TEMP"} || $ENV{"TMP"} || "c:/temp";
-	$PROGPATH = $ENV{"ProgramFiles"};
-}
-if ( !$TEMP || !-d $TEMP ) {
-	print "Error: A temporary directory can not be find.\n";
-	print "Check that TEMP or TMP environment variable is set correctly.\n";
-	print "makepack-dolibarrlang.pl aborted.\n";
-	sleep 2;
-	exit 2;
-}
-$BUILDROOT = "$TEMP/dolibarr-buildroot";
-
-my $copyalreadydone = 0;
-my $batch           = 0;
-
-print "Makepack langs version $VERSION\n";
-print "Enter language code to package (en_US, fr_FR, ...) : ";
-$PROJECT = <STDIN>;
-chomp($PROJECT);
-
-# Ask and set version $MAJOR and $MINOR
-print "Enter value for version: ";
-$PROJVERSION = <STDIN>;
-chomp($PROJVERSION);
-( $MAJOR, $MINOR ) = split( /\./, $PROJVERSION, 2 );
-if ( $MINOR eq '' ) {
-	print "Enter value for minor version: ";
-	$MINOR = <STDIN>;
-	chomp($MINOR);
-}
-
-$FILENAME    = "$PROJECT";
-$FILENAMETGZ = "lang_$PROJECT-$MAJOR.$MINOR";
-if ( -d "/usr/src/redhat" ) {
-
-	# redhat
-	$RPMDIR = "/usr/src/redhat";
-}
-if ( -d "/usr/src/RPM" ) {
-
-	# mandrake
-	$RPMDIR = "/usr/src/RPM";
-}
-
-$SOURCE = "$DIR/../../dolibarr";
-$DESTI  = "$SOURCE/build";
-
-# Choose package targets
-#-----------------------
-$target = "ZIP";    # Les langs sont au format zip
-if ($target) {
-	$CHOOSEDTARGET{ uc($target) } = 1;
-}
-else {
-	my $found = 0;
-	my $NUM_SCRIPT;
-	while ( !$found ) {
-		my $cpt = 0;
-		printf( " %d - %3s    (%s)\n",
-			$cpt, "All", "Need " . join( ",", values %REQUIREMENTTARGET ) );
-		foreach my $target (@LISTETARGET) {
-			$cpt++;
-			printf( " %d - %3s    (%s)\n",
-				$cpt, $target, "Need " . $REQUIREMENTTARGET{$target} );
-		}
-
-		# Are asked to select the file to move
-		print "Choose one package number or several separated with space: ";
-		$NUM_SCRIPT = <STDIN>;
-		chomp($NUM_SCRIPT);
-		if ( $NUM_SCRIPT =~ s/-//g ) {
-
-			# Do not do copy
-			$copyalreadydone = 1;
-		}
-		if ( $NUM_SCRIPT !~ /^[0-$cpt\s]+$/ ) {
-			print "This is not a valid package number list.\n";
-			$found = 0;
-		}
-		else {
-			$found = 1;
-		}
-	}
-	print "\n";
-	if ($NUM_SCRIPT) {
-		foreach my $num ( split( /\s+/, $NUM_SCRIPT ) ) {
-			$CHOOSEDTARGET{ $LISTETARGET[ $num - 1 ] } = 1;
-		}
-	}
-	else {
-		foreach my $key (@LISTETARGET) {
-			$CHOOSEDTARGET{$key} = 1;
-		}
-	}
-}
-
-# Test if requirement is ok
-#--------------------------
-foreach my $target ( keys %CHOOSEDTARGET ) {
-	foreach my $req ( split( /[,\s]/, $REQUIREMENTTARGET{$target} ) ) {
-
-		# Test
-		print "Test requirement for target $target: Search '$req'... ";
-		$ret         = `"$req" 2>&1`;
-		$coderetour  = $?;
-		$coderetour2 = $coderetour >> 8;
-		if (
-			$coderetour != 0
-			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
-				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
-			&& $PROGPATH
-		  )
-		{
-
-			# Not found error, we try in PROGPATH
-			$ret         = `"$PROGPATH/$ALTERNATEPATH{$req}/$req\" 2>&1`;
-			$coderetour  = $?;
-			$coderetour2 = $coderetour >> 8;
-			$REQUIREMENTTARGET{$target} = "$PROGPATH/$ALTERNATEPATH{$req}/$req";
-		}
-
-		if (
-			$coderetour != 0
-			&& (   ( $coderetour2 == 1 && $OS =~ /windows/ && $ret !~ /Usage/i )
-				|| ( $coderetour2 == 127 && $OS !~ /windows/ ) )
-		  )
-		{
-
-			# Not found error
-			print
-"Not found\nCan't build target $target. Requirement '$req' not found in PATH\n";
-			$CHOOSEDTARGET{$target} = -1;
-			last;
-		}
-		else {
-
-			# Pas erreur ou erreur autre que programme absent
-			print " Found " . $REQUIREMENTTARGET{$target} . "\n";
-		}
-	}
-}
-
-print "\n";
-
-# Check if there is at least on target to build
-#----------------------------------------------
-$nboftargetok = 0;
-foreach my $target ( keys %CHOOSEDTARGET ) {
-	if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
-	$nboftargetok++;
-}
-
-if ($nboftargetok) {
-
-	# Update buildroot
-	#-----------------
-	if ( !$copyalreadydone ) {
-		print "Delete directory $BUILDROOT\n";
-		$ret = `rm -fr "$BUILDROOT"`;
-		mkdir "$BUILDROOT";
-		mkdir "$BUILDROOT/htdocs";
-		mkdir "$BUILDROOT/htdocs/langs";
-		mkdir "$BUILDROOT/htdocs/langs/$PROJECT";
-
-		print "Copy $SOURCE into $BUILDROOT\n";
-		mkdir "$BUILDROOT";
-		$ret =
-		  `cp -pr "$SOURCE/htdocs/langs/$PROJECT" "$BUILDROOT/htdocs/langs"`;
-	}
-	print "Clean $BUILDROOT\n";
-	$ret =
-`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/Thumbs.db $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/Thumbs.db`;
-	$ret =
-`rm -fr $BUILDROOT/htdocs/langs/$PROJECT/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/CVS* $BUILDROOT/htdocs/langs/$PROJECT/*/*/*/*/*/CVS*`;
-
-	# Build package for each target
-	#------------------------------
-	foreach my $target ( keys %CHOOSEDTARGET ) 
-	{
-		if ( $CHOOSEDTARGET{$target} < 0 ) { next; }
-
-		print "\nBuild package for target $target\n";
-
-		if ( $target eq 'TGZ' ) 
-		{
-			unlink $FILENAMETGZ . tgz;
-
-			#    		unlink $BUILDROOT/$FILENAMETGZ.tgz;
-			print "Compress $BUILDROOT/htdocs into $FILENAMETGZ.tgz...\n";
-			$cmd =
-"tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" htdocs";
-			$ret = `$cmd`;
-
-#        	$cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar.exclude\" --directory \"$BUILDROOT\" --mode=go-w --group=500 --owner=500 -czvf \"$BUILDROOT/$FILENAMETGZ.tgz\" htdocs\n";
-#        	$ret=`$cmd`;
-			if ( $OS =~ /windows/i ) {
-				print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
-				$ret = `mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
-
-   #        		$ret=`mv "$BUILDROOT/$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
-			}
-			next;
-		}
-
-		if ( $target eq 'ZIP' ) 
-		{
-			unlink $FILENAMEZIP . zip;
-			print "Compress $FILENAMETGZ into $FILENAMEZIP.zip...\n";
-			chdir("$BUILDROOT");
-
-#print "cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*\n";
-#$ret=`cd $BUILDROOTNT & 7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
-			$ret =
-			  `7z a -r -tzip -mx $BUILDROOT/$FILENAMEZIP.zip $FILENAMETGZ\\*.*`;
-			print "Move $FILENAMEZIP.zip to $DESTI\n";
-			rename( "$BUILDROOT/$FILENAMEZIP.zip", "$DESTI/$FILENAMEZIP.zip" );
-			next;
-		}
-	}
-}
-
-print "\n----- Summary -----\n";
-foreach my $target ( keys %CHOOSEDTARGET ) {
-	if ( $CHOOSEDTARGET{$target} < 0 ) {
-		print "Package $target not built (bad requirement).\n";
-	}
-	else {
-		print "Package $target built succeessfully in $DESTI\n";
-	}
-}
-
-if ( !$btach ) {
-	print "\nPress key to finish...";
-	my $WAITKEY = <STDIN>;
-}
-
-0;
diff --git a/build/obs/README b/build/obs/README
index 8fc4c27d9b2..fefe6dbd91d 100644
--- a/build/obs/README
+++ b/build/obs/README
@@ -29,12 +29,18 @@ To submit a snapshot for building, we should have a service file with content
 </services>
 
 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/conf.php b/build/rpm/conf.php
index 2e8bd46cf0f..406ba3145c1 100755
--- a/build/rpm/conf.php
+++ b/build/rpm/conf.php
@@ -5,4 +5,3 @@
 //
 // This file will be filled by installer
 //
-?>
\ No newline at end of file
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 0904797b5a4..05de30b3d6d 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -162,7 +162,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
@@ -333,11 +332,5 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-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
+* Wed Oct 29 2014 Laurent Destailleur 3.7.0-0.3
 - Upstream release
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 44a5ea1d842..9ba38083e46 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -242,7 +242,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
@@ -569,12 +568,7 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+* 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
 
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index a06162bcf1a..ec5dbc3b4a8 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -159,7 +159,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
@@ -338,12 +337,7 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+* 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
 
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 1c939abae87..c770c25e2e6 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -170,7 +170,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/asterisk
 %_datadir/dolibarr/htdocs/barcode
 %_datadir/dolibarr/htdocs/bookmarks
-%_datadir/dolibarr/htdocs/boutique
 %_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/comm
@@ -349,12 +348,7 @@ fi
 
 # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
 %changelog
-* Sat Dec 27 2014 Laurent Destailleur 3.6.2-0.3
+* 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
 
diff --git a/composer.json b/composer.json
index 4463efcfc74..f0de86ce7ea 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,8 @@
         "ext-mcrypt": "*",
         "ext-openssl": "*",
         "ext-mbstring": "*",
-        "ext-soap": "*"
+        "ext-soap": "*",
+        "ext-zip": "*",
+        "ext-xml": "*"
     }
 }
diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 9cff30f457d..b121027ad10 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -12,10 +12,16 @@
 
 		<!-- List of all tests -->
 
+	
+	<!-- Rules from Internal Standard -->
+	
 	<rule ref="Internal.NoCodeFound">
 		<severity>0</severity>
 	</rule>
 
+	
+	<!-- Rules from Generic Standard -->
+		
 	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
 
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH">
@@ -41,9 +47,6 @@
 		<severity>0</severity>
 	</rule>
 
-    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
-    <!-- <rule ref="Zend.Files.ClosingTag"/> -->
-
     <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->
 
     <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
@@ -170,6 +173,10 @@
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
 
+
+
+	<!-- Rules from PEAR Standard -->
+
 	<rule ref="PEAR.Classes.ClassDeclaration" />
 
     <!-- Check for duplicate class names -->
@@ -247,6 +254,40 @@
     <rule ref="PEAR.Commenting.FunctionComment.Missing">
         <severity>0</severity>
     </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+    <!-- TODO Remove this and fix reported errors -->
+    <rule ref="PEAR.Commenting.ClassComment.Missing">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
         
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />
@@ -353,13 +394,13 @@
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
         <severity>0</severity>
 	</rule>
+
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps">
         <severity>0</severity>
 	</rule>
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
         <severity>0</severity>
 	</rule>
-
 	<rule ref="PEAR.NamingConventions.ValidVariableName" />
 
 	<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
@@ -377,4 +418,10 @@
     <!-- Already found as a Generic rule -->
 	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
 
+
+	<!-- Rules from Zend Standard-->
+
+    <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
+    <rule ref="Zend.Files.ClosingTag"/>
+
 </ruleset>
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
deleted file mode 100755
index 2fd2820cfd3..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-CREATE TABLE llx_osc_categories (
-  rowid integer unsigned NOT NULL auto_increment,
-  dolicatid integer NOT NULL default '0',
-  osccatid integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY dolicatid (dolicatid),
-  UNIQUE KEY osccatid (osccatid)
-) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
deleted file mode 100755
index 002509b4787..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.key.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-
-ALTER TABLE llx_osc_customer ADD CONSTRAINT fk_osc_customer_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
deleted file mode 100755
index 895e95e4935..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-CREATE TABLE llx_osc_customer (
-  rowid integer NOT NULL default '0',
-  datem datetime default NULL,
-  fk_soc integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY fk_soc (fk_soc)
-) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
deleted file mode 100755
index ea1bfbe2c14..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-CREATE TABLE llx_osc_order (
-  rowid integer NOT NULL default '0',
-  datem datetime default NULL,
-  fk_commande integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY fk_commande (fk_commande)
-) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
deleted file mode 100755
index f08db68358d..00000000000
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ /dev/null
@@ -1,27 +0,0 @@
--- ===================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-CREATE TABLE llx_osc_product (
-  rowid integer NOT NULL default '0',
-  datem datetime default NULL,
-  fk_product integer NOT NULL default '0',
-  PRIMARY KEY  (rowid),
-  UNIQUE KEY fk_product (fk_product)
-) ENGINE=InnoDB;
-
-
diff --git a/dev/detectduplicatelangkey.sh b/dev/detectduplicatelangkey.sh
deleted file mode 100755
index 06d9cd8a69e..00000000000
--- a/dev/detectduplicatelangkey.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Helps find duplicate translation keys in language files
-#
-# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
-
-for file in `find . -type f`
-do
-    dupes=$(
-    sed "s/^\s*//" "$file" | # Remove any leading whitespace
-    sed "s/\s*\=/=/" | # Remove any whitespace before =
-    grep -Po "(^.*?)=" | # Non greedeely match everything before =
-    sed "s/\=//" | # Remove trailing = so we get the key
-    sort | uniq -d # Find duplicates
-    )
-
-    if [ -n "$dupes" ]
-    then
-        echo "Duplicates found in $file"
-        echo "$dupes"
-    fi
-done
diff --git a/dev/detectnotabfiles.sh b/dev/detectnotabfiles.sh
new file mode 100755
index 00000000000..c89b999b03d
--- /dev/null
+++ b/dev/detectnotabfiles.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#------------------------------------------------------
+# Detect files that does not contains any tab inside
+#
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: fixnotabfiles.sh [list|fix]
+#------------------------------------------------------
+
+# Syntax
+if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
+then
+	echo "Usage: fixnotabfiles.sh [list|fix]"
+fi
+
+# To detec
+if [ "x$1" = "xlist" ]
+then
+	find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
+fi
+
+# To convert
+if [ "x$1" = "xfix" ]
+then
+	echo Feature not implemented. Please fix files manually.
+fi
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 7f3490da165..f63969ea170 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -44,6 +44,8 @@ In htdocs/includes/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
 
+* Renamed getmypid into dol_getmypid().
+
 
 JSGANTT:
 --------
diff --git a/dev/fixduplicatelangkey.sh b/dev/fixduplicatelangkey.sh
new file mode 100755
index 00000000000..2d9cb7f7a85
--- /dev/null
+++ b/dev/fixduplicatelangkey.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Helps find duplicate translation keys in language files
+#
+# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+
+
+# Syntax
+if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
+then
+	echo "Usage: detectduplicatelangkey.sh (list|fix)"
+fi
+
+
+if [ "x$1" = "xlist" ]
+then
+	for file in `find htdocs/langs/en_US -name *.lang -type f`
+	do
+	    dupes=$(
+	    sed "s/^\s*//" "$file" | # Remove any leading whitespace
+	    sed "s/\s*\=/=/" | # Remove any whitespace before =
+	    grep -Po "(^.*?)=" | # Non greedeely match everything before =
+	    sed "s/\=//" | # Remove trailing = so we get the key
+	    sort | uniq -d # Find duplicates
+	    )
+	
+	    if [ -n "$dupes" ]
+	    then
+	        echo "Duplicates found in $file"
+	        echo "$dupes"
+	    fi
+	done
+fi
+
+# To convert
+if [ "x$1" = "xfix" ]
+then
+	echo Feature not implemented. Please fix files manually.
+fi
diff --git a/dev/fixnotabfiles.sh b/dev/fixnotabfiles.sh
deleted file mode 100755
index 3e5d28966c9..00000000000
--- a/dev/fixnotabfiles.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------
-# Script to find files that are not Unix encoded
-#
-# Laurent Destailleur - eldy@users.sourceforge.net
-#------------------------------------------------------
-# Usage: fixnotabfiles.sh [list|fix]
-#------------------------------------------------------
-
-# Syntax
-if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
-then
-	echo "Usage: fixnotabfiles.sh [list|fix]"
-fi
-
-# To detec
-if [ "x$1" = "xlist" ]
-then
-	find build \( -iname "*.sh" -o -iname "*.spec" \) -exec grep -l -P '\t' {} \;
-fi
-
-# To convert
-if [ "x$1" = "xfix" ]
-then
-	echo Feature not implemented. Please fix files manually.
-fi
diff --git a/dev/fixperms.sh b/dev/fixperms.sh
index 731e45cf703..5844e8b2916 100755
--- a/dev/fixperms.sh
+++ b/dev/fixperms.sh
@@ -25,4 +25,6 @@ then
 	find ./htdocs -type f -iname "*.php" -exec chmod a-x {} \; 
 	chmod a+x ./scripts/*/*.php
 	chmod a+x ./scripts/*/*.sh
+	chmod g-w ./scripts/*/*.php
+	chmod g-w ./scripts/*/*.sh
 fi
diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php
index 0316671d62b..5c630454ba7 100755
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
@@ -94,7 +94,7 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 
 	print "Invoice ".$i." for socid ".$socid;
 
-	$facture = new Facture($db, $socids[$socid]);
+	$facture = new Facture($db);
 	$facture->date = time();
 	$facture->cond_reglement_id = 3;
 	$facture->mode_reglement_id = 3;
diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php
index a62df516481..2efd2af2f08 100755
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -122,7 +122,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 	$soc = new Societe($db);
 
 
-	$propal = new Propal($db, $socids[$socid]);
+	$propal = new Propal($db);
 
 	$obj = $conf->global->PROPALE_ADDON;
 	$modPropale = new $obj;
@@ -130,6 +130,7 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 
 	$propal->ref = $numpr;
 	$propal->contactid = $contids[$socids[$socid]][0];
+	$propal->socid = $socids[$socid];
 	$propal->datep = time();
 	$propal->cond_reglement_id = 3;
 	$propal->mode_reglement_id = 3;
diff --git a/dev/initdata/mysqldump_dolibarr_3.6.0.sql b/dev/initdata/mysqldump_dolibarr_3.6.0.sql
index 77cbbcc511f..b1b8d77aa3c 100644
--- a/dev/initdata/mysqldump_dolibarr_3.6.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_3.6.0.sql
@@ -4867,7 +4867,7 @@ CREATE TABLE `llx_opensurvey_sondage` (
   `mailsonde` tinyint(4) NOT NULL DEFAULT '0',
   `survey_link_visible` int(11) DEFAULT '1',
   `origin` varchar(64) DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id_sondage`),
   KEY `idx_id_sondage_admin` (`id_sondage_admin`),
   KEY `idx_date_fin` (`date_fin`)
diff --git a/dev/initdata/mysqldump_dolibarr_3.7.0.sql b/dev/initdata/mysqldump_dolibarr_3.7.0.sql
new file mode 100644
index 00000000000..97b066a80cf
--- /dev/null
+++ b/dev/initdata/mysqldump_dolibarr_3.7.0.sql
@@ -0,0 +1,7687 @@
+-- MySQL dump 10.13  Distrib 5.5.37, for debian-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: dolibarr_37
+-- ------------------------------------------------------
+-- Server version	5.5.37-0ubuntu0.12.04.1
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `llx_accounting_bookkeeping`
+--
+
+DROP TABLE IF EXISTS `llx_accounting_bookkeeping`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accounting_bookkeeping` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `doc_date` date NOT NULL,
+  `doc_type` varchar(30) NOT NULL,
+  `doc_ref` varchar(30) NOT NULL,
+  `fk_doc` int(11) NOT NULL,
+  `fk_docdet` int(11) NOT NULL,
+  `code_tiers` varchar(24) DEFAULT NULL,
+  `numero_compte` varchar(32) DEFAULT NULL,
+  `label_compte` varchar(128) NOT NULL,
+  `debit` double NOT NULL,
+  `credit` double NOT NULL,
+  `montant` double NOT NULL,
+  `sens` varchar(1) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `code_journal` varchar(10) DEFAULT NULL,
+  `piece_num` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accounting_bookkeeping`
+--
+
+LOCK TABLES `llx_accounting_bookkeeping` WRITE;
+/*!40000 ALTER TABLE `llx_accounting_bookkeeping` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accounting_bookkeeping` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accounting_fiscalyear`
+--
+
+DROP TABLE IF EXISTS `llx_accounting_fiscalyear`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accounting_fiscalyear` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(128) NOT NULL,
+  `date_start` date DEFAULT NULL,
+  `date_end` date DEFAULT NULL,
+  `statut` tinyint(4) NOT NULL DEFAULT '0',
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_author` 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_accounting_fiscalyear`
+--
+
+LOCK TABLES `llx_accounting_fiscalyear` WRITE;
+/*!40000 ALTER TABLE `llx_accounting_fiscalyear` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accounting_fiscalyear` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accounting_system`
+--
+
+DROP TABLE IF EXISTS `llx_accounting_system`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accounting_system` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `pcg_version` varchar(12) NOT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `label` varchar(128) NOT NULL,
+  `active` smallint(6) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_accounting_system_pcg_version` (`pcg_version`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accounting_system`
+--
+
+LOCK TABLES `llx_accounting_system` WRITE;
+/*!40000 ALTER TABLE `llx_accounting_system` DISABLE KEYS */;
+INSERT INTO `llx_accounting_system` VALUES (1,'PCG99-ABREGE',1,'The simple accountancy french plan',1),(2,'PCG99-BASE',1,'The base accountancy french plan',1),(3,'PCMN-BASE',2,'The base accountancy belgium plan',1),(4,'PCG08-PYME',4,'The PYME accountancy spanish plan',1);
+/*!40000 ALTER TABLE `llx_accounting_system` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accountingaccount`
+--
+
+DROP TABLE IF EXISTS `llx_accountingaccount`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accountingaccount` (
+  `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_pcg_version` varchar(12) NOT NULL,
+  `pcg_type` varchar(20) NOT NULL,
+  `pcg_subtype` varchar(20) NOT NULL,
+  `account_number` varchar(32) DEFAULT NULL,
+  `account_parent` varchar(32) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_accountingaccount_fk_pcg_version` (`fk_pcg_version`),
+  CONSTRAINT `fk_accountingaccount_fk_pcg_version` FOREIGN KEY (`fk_pcg_version`) REFERENCES `llx_accounting_system` (`pcg_version`)
+) ENGINE=InnoDB AUTO_INCREMENT=4785 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accountingaccount`
+--
+
+LOCK TABLES `llx_accountingaccount` WRITE;
+/*!40000 ALTER TABLE `llx_accountingaccount` DISABLE KEYS */;
+INSERT INTO `llx_accountingaccount` VALUES (1,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','CAPITAL','101','1401','Capital',NULL,NULL,1),(2,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','105','1401','Ecarts de réévaluation',NULL,NULL,1),(3,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1061','1401','Réserve légale',NULL,NULL,1),(4,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1063','1401','Réserves statutaires ou contractuelles',NULL,NULL,1),(5,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1064','1401','Réserves réglementées',NULL,NULL,1),(6,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1068','1401','Autres réserves',NULL,NULL,1),(7,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','108','1401','Compte de l\'exploitant',NULL,NULL,1),(8,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','12','1401','Résultat de l\'exercice',NULL,NULL,1),(9,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','145','1401','Amortissements dérogatoires',NULL,NULL,1),(10,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','146','1401','Provision spéciale de réévaluation',NULL,NULL,1),(11,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','147','1401','Plus-values réinvesties',NULL,NULL,1),(12,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','148','1401','Autres provisions réglementées',NULL,NULL,1),(13,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','15','1401','Provisions pour risques et charges',NULL,NULL,1),(14,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','16','1401','Emprunts et dettes assimilees',NULL,NULL,1),(15,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','20','1402','Immobilisations incorporelles',NULL,NULL,1),(16,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','201','15','Frais d\'établissement',NULL,NULL,1),(17,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','206','15','Droit au bail',NULL,NULL,1),(18,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','207','15','Fonds commercial',NULL,NULL,1),(19,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','208','15','Autres immobilisations incorporelles',NULL,NULL,1),(20,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','21','1402','Immobilisations corporelles',NULL,NULL,1),(21,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','23','1402','Immobilisations en cours',NULL,NULL,1),(22,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','27','1402','Autres immobilisations financieres',NULL,NULL,1),(23,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','280','1402','Amortissements des immobilisations incorporelles',NULL,NULL,1),(24,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','281','1402','Amortissements des immobilisations corporelles',NULL,NULL,1),(25,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','290','1402','Provisions pour dépréciation des immobilisations incorporelles',NULL,NULL,1),(26,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','291','1402','Provisions pour dépréciation des immobilisations corporelles',NULL,NULL,1),(27,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','297','1402','Provisions pour dépréciation des autres immobilisations financières',NULL,NULL,1),(28,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','31','1403','Matieres premières',NULL,NULL,1),(29,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','32','1403','Autres approvisionnements',NULL,NULL,1),(30,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','33','1403','En-cours de production de biens',NULL,NULL,1),(31,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','34','1403','En-cours de production de services',NULL,NULL,1),(32,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','35','1403','Stocks de produits',NULL,NULL,1),(33,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','37','1403','Stocks de marchandises',NULL,NULL,1),(34,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','391','1403','Provisions pour dépréciation des matières premières',NULL,NULL,1),(35,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','392','1403','Provisions pour dépréciation des autres approvisionnements',NULL,NULL,1),(36,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','393','1403','Provisions pour dépréciation des en-cours de production de biens',NULL,NULL,1),(37,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','394','1403','Provisions pour dépréciation des en-cours de production de services',NULL,NULL,1),(38,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','395','1403','Provisions pour dépréciation des stocks de produits',NULL,NULL,1),(39,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','397','1403','Provisions pour dépréciation des stocks de marchandises',NULL,NULL,1),(40,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','SUPPLIER','400','1404','Fournisseurs et Comptes rattachés',NULL,NULL,1),(41,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','409','1404','Fournisseurs débiteurs',NULL,NULL,1),(42,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','CUSTOMER','410','1404','Clients et Comptes rattachés',NULL,NULL,1),(43,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','419','1404','Clients créditeurs',NULL,NULL,1),(44,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','421','1404','Personnel',NULL,NULL,1),(45,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','428','1404','Personnel',NULL,NULL,1),(46,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','43','1404','Sécurité sociale et autres organismes sociaux',NULL,NULL,1),(47,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','444','1404','Etat - impôts sur bénéfice',NULL,NULL,1),(48,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','445','1404','Etat - Taxes sur chiffre affaires',NULL,NULL,1),(49,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','447','1404','Autres impôts, taxes et versements assimilés',NULL,NULL,1),(50,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','45','1404','Groupe et associes',NULL,NULL,1),(51,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','455','50','Associés',NULL,NULL,1),(52,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','46','1404','Débiteurs divers et créditeurs divers',NULL,NULL,1),(53,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','47','1404','Comptes transitoires ou d\'attente',NULL,NULL,1),(54,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','481','1404','Charges à répartir sur plusieurs exercices',NULL,NULL,1),(55,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','486','1404','Charges constatées d\'avance',NULL,NULL,1),(56,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','487','1404','Produits constatés d\'avance',NULL,NULL,1),(57,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','491','1404','Provisions pour dépréciation des comptes de clients',NULL,NULL,1),(58,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','496','1404','Provisions pour dépréciation des comptes de débiteurs divers',NULL,NULL,1),(59,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','50','1405','Valeurs mobilières de placement',NULL,NULL,1),(60,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','BANK','51','1405','Banques, établissements financiers et assimilés',NULL,NULL,1),(61,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','CASH','53','1405','Caisse',NULL,NULL,1),(62,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','54','1405','Régies d\'avance et accréditifs',NULL,NULL,1),(63,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','58','1405','Virements internes',NULL,NULL,1),(64,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','590','1405','Provisions pour dépréciation des valeurs mobilières de placement',NULL,NULL,1),(65,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','PRODUCT','60','1406','Achats',NULL,NULL,1),(66,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','603','65','Variations des stocks',NULL,NULL,1),(67,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','SERVICE','61','1406','Services extérieurs',NULL,NULL,1),(68,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','62','1406','Autres services extérieurs',NULL,NULL,1),(69,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','63','1406','Impôts, taxes et versements assimiles',NULL,NULL,1),(70,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','641','1406','Rémunérations du personnel',NULL,NULL,1),(71,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','644','1406','Rémunération du travail de l\'exploitant',NULL,NULL,1),(72,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','SOCIAL','645','1406','Charges de sécurité sociale et de prévoyance',NULL,NULL,1),(73,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','646','1406','Cotisations sociales personnelles de l\'exploitant',NULL,NULL,1),(74,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','65','1406','Autres charges de gestion courante',NULL,NULL,1),(75,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','66','1406','Charges financières',NULL,NULL,1),(76,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','67','1406','Charges exceptionnelles',NULL,NULL,1),(77,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','681','1406','Dotations aux amortissements et aux provisions',NULL,NULL,1),(78,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','686','1406','Dotations aux amortissements et aux provisions',NULL,NULL,1),(79,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','687','1406','Dotations aux amortissements et aux provisions',NULL,NULL,1),(80,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','691','1406','Participation des salariés aux résultats',NULL,NULL,1),(81,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','695','1406','Impôts sur les bénéfices',NULL,NULL,1),(82,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','697','1406','Imposition forfaitaire annuelle des sociétés',NULL,NULL,1),(83,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','699','1406','Produits',NULL,NULL,1),(84,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','PRODUCT','701','1407','Ventes de produits finis',NULL,NULL,1),(85,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','SERVICE','706','1407','Prestations de services',NULL,NULL,1),(86,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','PRODUCT','707','1407','Ventes de marchandises',NULL,NULL,1),(87,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','PRODUCT','708','1407','Produits des activités annexes',NULL,NULL,1),(88,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','709','1407','Rabais, remises et ristournes accordés par l\'entreprise',NULL,NULL,1),(89,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','713','1407','Variation des stocks',NULL,NULL,1),(90,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','72','1407','Production immobilisée',NULL,NULL,1),(91,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','73','1407','Produits nets partiels sur opérations à long terme',NULL,NULL,1),(92,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','74','1407','Subventions d\'exploitation',NULL,NULL,1),(93,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','75','1407','Autres produits de gestion courante',NULL,NULL,1),(94,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','753','93','Jetons de présence et rémunérations d\'administrateurs, gérants,...',NULL,NULL,1),(95,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','754','93','Ristournes perçues des coopératives',NULL,NULL,1),(96,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','755','93','Quotes-parts de résultat sur opérations faites en commun',NULL,NULL,1),(97,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','76','1407','Produits financiers',NULL,NULL,1),(98,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','77','1407','Produits exceptionnels',NULL,NULL,1),(99,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','781','1407','Reprises sur amortissements et provisions',NULL,NULL,1),(100,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','786','1407','Reprises sur provisions pour risques',NULL,NULL,1),(101,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','787','1407','Reprises sur provisions',NULL,NULL,1),(102,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','79','1407','Transferts de charges',NULL,NULL,1),(103,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','10','1501','Capital  et réserves',NULL,NULL,1),(104,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','CAPITAL','101','103','Capital',NULL,NULL,1),(105,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','104','103','Primes liées au capital social',NULL,NULL,1),(106,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','105','103','Ecarts de réévaluation',NULL,NULL,1),(107,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','106','103','Réserves',NULL,NULL,1),(108,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','107','103','Ecart d\'equivalence',NULL,NULL,1),(109,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','108','103','Compte de l\'exploitant',NULL,NULL,1),(110,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','109','103','Actionnaires : capital souscrit - non appelé',NULL,NULL,1),(111,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','11','1501','Report à nouveau (solde créditeur ou débiteur)',NULL,NULL,1),(112,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','110','111','Report à nouveau (solde créditeur)',NULL,NULL,1),(113,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','119','111','Report à nouveau (solde débiteur)',NULL,NULL,1),(114,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','12','1501','Résultat de l\'exercice (bénéfice ou perte)',NULL,NULL,1),(115,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','120','114','Résultat de l\'exercice (bénéfice)',NULL,NULL,1),(116,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','129','114','Résultat de l\'exercice (perte)',NULL,NULL,1),(117,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','13','1501','Subventions d\'investissement',NULL,NULL,1),(118,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','131','117','Subventions d\'équipement',NULL,NULL,1),(119,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','138','117','Autres subventions d\'investissement',NULL,NULL,1),(120,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','139','117','Subventions d\'investissement inscrites au compte de résultat',NULL,NULL,1),(121,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','14','1501','Provisions réglementées',NULL,NULL,1),(122,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','142','121','Provisions réglementées relatives aux immobilisations',NULL,NULL,1),(123,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','143','121','Provisions réglementées relatives aux stocks',NULL,NULL,1),(124,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','144','121','Provisions réglementées relatives aux autres éléments de l\'actif',NULL,NULL,1),(125,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','145','121','Amortissements dérogatoires',NULL,NULL,1),(126,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','146','121','Provision spéciale de réévaluation',NULL,NULL,1),(127,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','147','121','Plus-values réinvesties',NULL,NULL,1),(128,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','148','121','Autres provisions réglementées',NULL,NULL,1),(129,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','15','1501','Provisions pour risques et charges',NULL,NULL,1),(130,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','151','129','Provisions pour risques',NULL,NULL,1),(131,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','153','129','Provisions pour pensions et obligations similaires',NULL,NULL,1),(132,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','154','129','Provisions pour restructurations',NULL,NULL,1),(133,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','155','129','Provisions pour impôts',NULL,NULL,1),(134,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','156','129','Provisions pour renouvellement des immobilisations (entreprises concessionnaires)',NULL,NULL,1),(135,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','157','129','Provisions pour charges à répartir sur plusieurs exercices',NULL,NULL,1),(136,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','158','129','Autres provisions pour charges',NULL,NULL,1),(137,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','16','1501','Emprunts et dettes assimilees',NULL,NULL,1),(138,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','161','137','Emprunts obligataires convertibles',NULL,NULL,1),(139,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','163','137','Autres emprunts obligataires',NULL,NULL,1),(140,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','164','137','Emprunts auprès des établissements de crédit',NULL,NULL,1),(141,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','165','137','Dépôts et cautionnements reçus',NULL,NULL,1),(142,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','166','137','Participation des salariés aux résultats',NULL,NULL,1),(143,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','167','137','Emprunts et dettes assortis de conditions particulières',NULL,NULL,1),(144,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','168','137','Autres emprunts et dettes assimilées',NULL,NULL,1),(145,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','169','137','Primes de remboursement des obligations',NULL,NULL,1),(146,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','17','1501','Dettes rattachées à des participations',NULL,NULL,1),(147,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','171','146','Dettes rattachées à des participations (groupe)',NULL,NULL,1),(148,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','174','146','Dettes rattachées à des participations (hors groupe)',NULL,NULL,1),(149,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','178','146','Dettes rattachées à des sociétés en participation',NULL,NULL,1),(150,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','18','1501','Comptes de liaison des établissements et sociétés en participation',NULL,NULL,1),(151,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','181','150','Comptes de liaison des établissements',NULL,NULL,1),(152,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','186','150','Biens et prestations de services échangés entre établissements (charges)',NULL,NULL,1),(153,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','187','150','Biens et prestations de services échangés entre établissements (produits)',NULL,NULL,1),(154,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','188','150','Comptes de liaison des sociétés en participation',NULL,NULL,1),(155,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','20','1502','Immobilisations incorporelles',NULL,NULL,1),(156,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','201','155','Frais d\'établissement',NULL,NULL,1),(157,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','203','155','Frais de recherche et de développement',NULL,NULL,1),(158,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','205','155','Concessions et droits similaires, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires',NULL,NULL,1),(159,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','206','155','Droit au bail',NULL,NULL,1),(160,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','207','155','Fonds commercial',NULL,NULL,1),(161,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','208','155','Autres immobilisations incorporelles',NULL,NULL,1),(162,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','21','1502','Immobilisations corporelles',NULL,NULL,1),(163,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','211','162','Terrains',NULL,NULL,1),(164,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','212','162','Agencements et aménagements de terrains',NULL,NULL,1),(165,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','213','162','Constructions',NULL,NULL,1),(166,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','214','162','Constructions sur sol d\'autrui',NULL,NULL,1),(167,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','215','162','Installations techniques, matériels et outillage industriels',NULL,NULL,1),(168,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','218','162','Autres immobilisations corporelles',NULL,NULL,1),(169,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','22','1502','Immobilisations mises en concession',NULL,NULL,1),(170,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','23','1502','Immobilisations en cours',NULL,NULL,1),(171,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','231','170','Immobilisations corporelles en cours',NULL,NULL,1),(172,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','232','170','Immobilisations incorporelles en cours',NULL,NULL,1),(173,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','237','170','Avances et acomptes versés sur immobilisations incorporelles',NULL,NULL,1),(174,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','238','170','Avances et acomptes versés sur commandes d\'immobilisations corporelles',NULL,NULL,1),(175,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','25','1502','Parts dans des entreprises liées et créances sur des entreprises liées',NULL,NULL,1),(176,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','26','1502','Participations et créances rattachées à des participations',NULL,NULL,1),(177,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','261','176','Titres de participation',NULL,NULL,1),(178,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','266','176','Autres formes de participation',NULL,NULL,1),(179,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','267','176','Créances rattachées à des participations',NULL,NULL,1),(180,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','268','176','Créances rattachées à des sociétés en participation',NULL,NULL,1),(181,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','269','176','Versements restant à effectuer sur titres de participation non libérés',NULL,NULL,1),(182,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','27','1502','Autres immobilisations financieres',NULL,NULL,1),(183,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','271','183','Titres immobilisés autres que les titres immobilisés de l\'activité de portefeuille (droit de propriété)',NULL,NULL,1),(184,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','272','183','Titres immobilisés (droit de créance)',NULL,NULL,1),(185,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','273','183','Titres immobilisés de l\'activité de portefeuille',NULL,NULL,1),(186,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','274','183','Prêts',NULL,NULL,1),(187,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','275','183','Dépôts et cautionnements versés',NULL,NULL,1),(188,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','276','183','Autres créances immobilisées',NULL,NULL,1),(189,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','277','183','(Actions propres ou parts propres)',NULL,NULL,1),(190,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','279','183','Versements restant à effectuer sur titres immobilisés non libérés',NULL,NULL,1),(191,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','28','1502','Amortissements des immobilisations',NULL,NULL,1),(192,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','280','191','Amortissements des immobilisations incorporelles',NULL,NULL,1),(193,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','281','191','Amortissements des immobilisations corporelles',NULL,NULL,1),(194,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','282','191','Amortissements des immobilisations mises en concession',NULL,NULL,1),(195,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','29','1502','Dépréciations des immobilisations',NULL,NULL,1),(196,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','290','195','Dépréciations des immobilisations incorporelles',NULL,NULL,1),(197,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','291','195','Dépréciations des immobilisations corporelles',NULL,NULL,1),(198,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','292','195','Dépréciations des immobilisations mises en concession',NULL,NULL,1),(199,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','293','195','Dépréciations des immobilisations en cours',NULL,NULL,1),(200,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','296','195','Provisions pour dépréciation des participations et créances rattachées à des participations',NULL,NULL,1),(201,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','297','195','Provisions pour dépréciation des autres immobilisations financières',NULL,NULL,1),(202,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','31','1503','Matières premières (et fournitures)',NULL,NULL,1),(203,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','311','202','Matières (ou groupe) A',NULL,NULL,1),(204,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','312','202','Matières (ou groupe) B',NULL,NULL,1),(205,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','317','202','Fournitures A, B, C,',NULL,NULL,1),(206,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','32','1503','Autres approvisionnements',NULL,NULL,1),(207,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','321','206','Matières consommables',NULL,NULL,1),(208,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','322','206','Fournitures consommables',NULL,NULL,1),(209,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','326','206','Emballages',NULL,NULL,1),(210,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','33','1503','En-cours de production de biens',NULL,NULL,1),(211,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','331','210','Produits en cours',NULL,NULL,1),(212,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','335','210','Travaux en cours',NULL,NULL,1),(213,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','34','1503','En-cours de production de services',NULL,NULL,1),(214,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','341','213','Etudes en cours',NULL,NULL,1),(215,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','345','213','Prestations de services en cours',NULL,NULL,1),(216,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','35','1503','Stocks de produits',NULL,NULL,1),(217,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','351','216','Produits intermédiaires',NULL,NULL,1),(218,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','355','216','Produits finis',NULL,NULL,1),(219,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','358','216','Produits résiduels (ou matières de récupération)',NULL,NULL,1),(220,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','37','1503','Stocks de marchandises',NULL,NULL,1),(221,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','371','220','Marchandises (ou groupe) A',NULL,NULL,1),(222,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','372','220','Marchandises (ou groupe) B',NULL,NULL,1),(223,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','39','1503','Provisions pour dépréciation des stocks et en-cours',NULL,NULL,1),(224,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','391','223','Provisions pour dépréciation des matières premières',NULL,NULL,1),(225,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','392','223','Provisions pour dépréciation des autres approvisionnements',NULL,NULL,1),(226,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','393','223','Provisions pour dépréciation des en-cours de production de biens',NULL,NULL,1),(227,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','394','223','Provisions pour dépréciation des en-cours de production de services',NULL,NULL,1),(228,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','395','223','Provisions pour dépréciation des stocks de produits',NULL,NULL,1),(229,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','397','223','Provisions pour dépréciation des stocks de marchandises',NULL,NULL,1),(230,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','40','1504','Fournisseurs et Comptes rattachés',NULL,NULL,1),(231,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','400','230','Fournisseurs et Comptes rattachés',NULL,NULL,1),(232,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','SUPPLIER','401','230','Fournisseurs',NULL,NULL,1),(233,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','403','230','Fournisseurs - Effets à payer',NULL,NULL,1),(234,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','404','230','Fournisseurs d\'immobilisations',NULL,NULL,1),(235,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','405','230','Fournisseurs d\'immobilisations - Effets à payer',NULL,NULL,1),(236,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','408','230','Fournisseurs - Factures non parvenues',NULL,NULL,1),(237,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','409','230','Fournisseurs débiteurs',NULL,NULL,1),(238,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','41','1504','Clients et comptes rattachés',NULL,NULL,1),(239,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','410','238','Clients et Comptes rattachés',NULL,NULL,1),(240,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','CUSTOMER','411','238','Clients',NULL,NULL,1),(241,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','413','238','Clients - Effets à recevoir',NULL,NULL,1),(242,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','416','238','Clients douteux ou litigieux',NULL,NULL,1),(243,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','418','238','Clients - Produits non encore facturés',NULL,NULL,1),(244,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','419','238','Clients créditeurs',NULL,NULL,1),(245,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','42','1504','Personnel et comptes rattachés',NULL,NULL,1),(246,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','421','245','Personnel - Rémunérations dues',NULL,NULL,1),(247,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','422','245','Comités d\'entreprises, d\'établissement, ...',NULL,NULL,1),(248,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','424','245','Participation des salariés aux résultats',NULL,NULL,1),(249,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','425','245','Personnel - Avances et acomptes',NULL,NULL,1),(250,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','426','245','Personnel - Dépôts',NULL,NULL,1),(251,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','427','245','Personnel - Oppositions',NULL,NULL,1),(252,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','428','245','Personnel - Charges à payer et produits à recevoir',NULL,NULL,1),(253,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','43','1504','Sécurité sociale et autres organismes sociaux',NULL,NULL,1),(254,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','431','253','Sécurité sociale',NULL,NULL,1),(255,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','437','253','Autres organismes sociaux',NULL,NULL,1),(256,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','438','253','Organismes sociaux - Charges à payer et produits à recevoir',NULL,NULL,1),(257,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','44','1504','État et autres collectivités publiques',NULL,NULL,1),(258,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','441','257','État - Subventions à recevoir',NULL,NULL,1),(259,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','442','257','Etat - Impôts et taxes recouvrables sur des tiers',NULL,NULL,1),(260,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','443','257','Opérations particulières avec l\'Etat, les collectivités publiques, les organismes internationaux',NULL,NULL,1),(261,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','444','257','Etat - Impôts sur les bénéfices',NULL,NULL,1),(262,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','445','257','Etat - Taxes sur le chiffre d\'affaires',NULL,NULL,1),(263,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','446','257','Obligations cautionnées',NULL,NULL,1),(264,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','447','257','Autres impôts, taxes et versements assimilés',NULL,NULL,1),(265,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','448','257','Etat - Charges à payer et produits à recevoir',NULL,NULL,1),(266,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','449','257','Quotas d\'émission à restituer à l\'Etat',NULL,NULL,1),(267,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','45','1504','Groupe et associes',NULL,NULL,1),(268,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','451','267','Groupe',NULL,NULL,1),(269,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','455','267','Associés - Comptes courants',NULL,NULL,1),(270,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','456','267','Associés - Opérations sur le capital',NULL,NULL,1),(271,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','457','267','Associés - Dividendes à payer',NULL,NULL,1),(272,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','458','267','Associés - Opérations faites en commun et en G.I.E.',NULL,NULL,1),(273,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','46','1504','Débiteurs divers et créditeurs divers',NULL,NULL,1),(274,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','462','273','Créances sur cessions d\'immobilisations',NULL,NULL,1),(275,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','464','273','Dettes sur acquisitions de valeurs mobilières de placement',NULL,NULL,1),(276,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','465','273','Créances sur cessions de valeurs mobilières de placement',NULL,NULL,1),(277,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','467','273','Autres comptes débiteurs ou créditeurs',NULL,NULL,1),(278,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','468','273','Divers - Charges à payer et produits à recevoir',NULL,NULL,1),(279,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','47','1504','Comptes transitoires ou d\'attente',NULL,NULL,1),(280,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','471','279','Comptes d\'attente',NULL,NULL,1),(281,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','476','279','Différence de conversion - Actif',NULL,NULL,1),(282,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','477','279','Différences de conversion - Passif',NULL,NULL,1),(283,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','478','279','Autres comptes transitoires',NULL,NULL,1),(284,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','48','1504','Comptes de régularisation',NULL,NULL,1),(285,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','481','284','Charges à répartir sur plusieurs exercices',NULL,NULL,1),(286,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','486','284','Charges constatées d\'avance',NULL,NULL,1),(287,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','487','284','Produits constatés d\'avance',NULL,NULL,1),(288,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','488','284','Comptes de répartition périodique des charges et des produits',NULL,NULL,1),(289,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','489','284','Quotas d\'émission alloués par l\'Etat',NULL,NULL,1),(290,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','49','1504','Provisions pour dépréciation des comptes de tiers',NULL,NULL,1),(291,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','491','290','Provisions pour dépréciation des comptes de clients',NULL,NULL,1),(292,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','495','290','Provisions pour dépréciation des comptes du groupe et des associés',NULL,NULL,1),(293,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','496','290','Provisions pour dépréciation des comptes de débiteurs divers',NULL,NULL,1),(294,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','50','1505','Valeurs mobilières de placement',NULL,NULL,1),(295,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','501','294','Parts dans des entreprises liées',NULL,NULL,1),(296,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','502','294','Actions propres',NULL,NULL,1),(297,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','503','294','Actions',NULL,NULL,1),(298,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','504','294','Autres titres conférant un droit de propriété',NULL,NULL,1),(299,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','505','294','Obligations et bons émis par la société et rachetés par elle',NULL,NULL,1),(300,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','506','294','Obligations',NULL,NULL,1),(301,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','507','294','Bons du Trésor et bons de caisse à court terme',NULL,NULL,1),(302,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','508','294','Autres valeurs mobilières de placement et autres créances assimilées',NULL,NULL,1),(303,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','509','294','Versements restant à effectuer sur valeurs mobilières de placement non libérées',NULL,NULL,1),(304,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','51','1505','Banques, établissements financiers et assimilés',NULL,NULL,1),(305,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','511','304','Valeurs à l\'encaissement',NULL,NULL,1),(306,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','BANK','512','304','Banques',NULL,NULL,1),(307,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','514','304','Chèques postaux',NULL,NULL,1),(308,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','515','304','\"Caisses\" du Trésor et des établissements publics',NULL,NULL,1),(309,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','516','304','Sociétés de bourse',NULL,NULL,1),(310,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','517','304','Autres organismes financiers',NULL,NULL,1),(311,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','518','304','Intérêts courus',NULL,NULL,1),(312,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','519','304','Concours bancaires courants',NULL,NULL,1),(313,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','52','1505','Instruments de trésorerie',NULL,NULL,1),(314,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','CASH','53','1505','Caisse',NULL,NULL,1),(315,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','531','314','Caisse siège social',NULL,NULL,1),(316,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','532','314','Caisse succursale (ou usine) A',NULL,NULL,1),(317,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','533','314','Caisse succursale (ou usine) B',NULL,NULL,1),(318,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','54','1505','Régies d\'avance et accréditifs',NULL,NULL,1),(319,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','58','1505','Virements internes',NULL,NULL,1),(320,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','59','1505','Provisions pour dépréciation des comptes financiers',NULL,NULL,1),(321,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','590','320','Provisions pour dépréciation des valeurs mobilières de placement',NULL,NULL,1),(322,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','PRODUCT','60','1506','Achats',NULL,NULL,1),(323,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','601','322','Achats stockés - Matières premières (et fournitures)',NULL,NULL,1),(324,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','602','322','Achats stockés - Autres approvisionnements',NULL,NULL,1),(325,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','603','322','Variations des stocks (approvisionnements et marchandises)',NULL,NULL,1),(326,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','604','322','Achats stockés - Matières premières (et fournitures)',NULL,NULL,1),(327,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','605','322','Achats de matériel, équipements et travaux',NULL,NULL,1),(328,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','606','322','Achats non stockés de matière et fournitures',NULL,NULL,1),(329,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','607','322','Achats de marchandises',NULL,NULL,1),(330,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','608','322','(Compte réservé, le cas échéant, à la récapitulation des frais accessoires incorporés aux achats)',NULL,NULL,1),(331,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','609','322','Rabais, remises et ristournes obtenus sur achats',NULL,NULL,1),(332,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','SERVICE','61','1506','Services extérieurs',NULL,NULL,1),(333,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','611','332','Sous-traitance générale',NULL,NULL,1),(334,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','612','332','Redevances de crédit-bail',NULL,NULL,1),(335,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','613','332','Locations',NULL,NULL,1),(336,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','614','332','Charges locatives et de copropriété',NULL,NULL,1),(337,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','615','332','Entretien et réparations',NULL,NULL,1),(338,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','616','332','Primes d\'assurances',NULL,NULL,1),(339,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','617','332','Etudes et recherches',NULL,NULL,1),(340,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','618','332','Divers',NULL,NULL,1),(341,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','619','332','Rabais, remises et ristournes obtenus sur services extérieurs',NULL,NULL,1),(342,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','62','1506','Autres services extérieurs',NULL,NULL,1),(343,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','621','342','Personnel extérieur à l\'entreprise',NULL,NULL,1),(344,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','622','342','Rémunérations d\'intermédiaires et honoraires',NULL,NULL,1),(345,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','623','342','Publicité, publications, relations publiques',NULL,NULL,1),(346,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','624','342','Transports de biens et transports collectifs du personnel',NULL,NULL,1),(347,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','625','342','Déplacements, missions et réceptions',NULL,NULL,1),(348,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','626','342','Frais postaux et de télécommunications',NULL,NULL,1),(349,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','627','342','Services bancaires et assimilés',NULL,NULL,1),(350,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','628','342','Divers',NULL,NULL,1),(351,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','629','342','Rabais, remises et ristournes obtenus sur autres services extérieurs',NULL,NULL,1),(352,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','63','1506','Impôts, taxes et versements assimilés',NULL,NULL,1),(353,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','631','352','Impôts, taxes et versements assimilés sur rémunérations (administrations des impôts)',NULL,NULL,1),(354,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','633','352','Impôts, taxes et versements assimilés sur rémunérations (autres organismes)',NULL,NULL,1),(355,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','635','352','Autres impôts, taxes et versements assimilés (administrations des impôts)',NULL,NULL,1),(356,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','637','352','Autres impôts, taxes et versements assimilés (autres organismes)',NULL,NULL,1),(357,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','64','1506','Charges de personnel',NULL,NULL,1),(358,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','641','357','Rémunérations du personnel',NULL,NULL,1),(359,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','644','357','Rémunération du travail de l\'exploitant',NULL,NULL,1),(360,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','SOCIAL','645','357','Charges de sécurité sociale et de prévoyance',NULL,NULL,1),(361,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','646','357','Cotisations sociales personnelles de l\'exploitant',NULL,NULL,1),(362,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','647','357','Autres charges sociales',NULL,NULL,1),(363,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','648','357','Autres charges de personnel',NULL,NULL,1),(364,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','65','1506','Autres charges de gestion courante',NULL,NULL,1),(365,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','651','364','Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires',NULL,NULL,1),(366,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','653','364','Jetons de présence',NULL,NULL,1),(367,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','654','364','Pertes sur créances irrécouvrables',NULL,NULL,1),(368,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','655','364','Quote-part de résultat sur opérations faites en commun',NULL,NULL,1),(369,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','658','364','Charges diverses de gestion courante',NULL,NULL,1),(370,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','66','1506','Charges financières',NULL,NULL,1),(371,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','661','370','Charges d\'intérêts',NULL,NULL,1),(372,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','664','370','Pertes sur créances liées à des participations',NULL,NULL,1),(373,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','665','370','Escomptes accordés',NULL,NULL,1),(374,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','666','370','Pertes de change',NULL,NULL,1),(375,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','667','370','Charges nettes sur cessions de valeurs mobilières de placement',NULL,NULL,1),(376,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','668','370','Autres charges financières',NULL,NULL,1),(377,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','67','1506','Charges exceptionnelles',NULL,NULL,1),(378,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','671','377','Charges exceptionnelles sur opérations de gestion',NULL,NULL,1),(379,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','672','377','(Compte à la disposition des entités pour enregistrer, en cours d\'exercice, les charges sur exercices antérieurs)',NULL,NULL,1),(380,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','675','377','Valeurs comptables des éléments d\'actif cédés',NULL,NULL,1),(381,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','678','377','Autres charges exceptionnelles',NULL,NULL,1),(382,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','68','1506','Dotations aux amortissements et aux provisions',NULL,NULL,1),(383,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','681','382','Dotations aux amortissements et aux provisions - Charges d\'exploitation',NULL,NULL,1),(384,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','686','382','Dotations aux amortissements et aux provisions - Charges financières',NULL,NULL,1),(385,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','687','382','Dotations aux amortissements et aux provisions - Charges exceptionnelles',NULL,NULL,1),(386,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','69','1506','Participation des salariés - impôts sur les bénéfices et assimiles',NULL,NULL,1),(387,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','691','386','Participation des salariés aux résultats',NULL,NULL,1),(388,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','695','386','Impôts sur les bénéfices',NULL,NULL,1),(389,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','696','386','Suppléments d\'impôt sur les sociétés liés aux distributions',NULL,NULL,1),(390,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','697','386','Imposition forfaitaire annuelle des sociétés',NULL,NULL,1),(391,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','698','386','Intégration fiscale',NULL,NULL,1),(392,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','699','386','Produits - Reports en arrière des déficits',NULL,NULL,1),(393,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','70','1507','Ventes de produits fabriqués, prestations de services, marchandises',NULL,NULL,1),(394,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','PRODUCT','701','393','Ventes de produits finis',NULL,NULL,1),(395,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','702','393','Ventes de produits intermédiaires',NULL,NULL,1),(396,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','703','393','Ventes de produits résiduels',NULL,NULL,1),(397,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','704','393','Travaux',NULL,NULL,1),(398,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','705','393','Etudes',NULL,NULL,1),(399,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','SERVICE','706','393','Prestations de services',NULL,NULL,1),(400,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','PRODUCT','707','393','Ventes de marchandises',NULL,NULL,1),(401,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','PRODUCT','708','393','Produits des activités annexes',NULL,NULL,1),(402,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','709','393','Rabais, remises et ristournes accordés par l\'entreprise',NULL,NULL,1),(403,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','71','1507','Production stockée (ou déstockage)',NULL,NULL,1),(404,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','713','403','Variation des stocks (en-cours de production, produits)',NULL,NULL,1),(405,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','72','1507','Production immobilisée',NULL,NULL,1),(406,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','721','405','Immobilisations incorporelles',NULL,NULL,1),(407,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','722','405','Immobilisations corporelles',NULL,NULL,1),(408,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','74','1507','Subventions d\'exploitation',NULL,NULL,1),(409,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','75','1507','Autres produits de gestion courante',NULL,NULL,1),(410,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','751','409','Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires',NULL,NULL,1),(411,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','752','409','Revenus des immeubles non affectés à des activités professionnelles',NULL,NULL,1),(412,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','753','409','Jetons de présence et rémunérations d\'administrateurs, gérants,...',NULL,NULL,1),(413,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','754','409','Ristournes perçues des coopératives (provenant des excédents)',NULL,NULL,1),(414,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','755','409','Quotes-parts de résultat sur opérations faites en commun',NULL,NULL,1),(415,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','758','409','Produits divers de gestion courante',NULL,NULL,1),(416,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','76','1507','Produits financiers',NULL,NULL,1),(417,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','761','416','Produits de participations',NULL,NULL,1),(418,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','762','416','Produits des autres immobilisations financières',NULL,NULL,1),(419,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','763','416','Revenus des autres créances',NULL,NULL,1),(420,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','764','416','Revenus des valeurs mobilières de placement',NULL,NULL,1),(421,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','765','416','Escomptes obtenus',NULL,NULL,1),(422,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','766','416','Gains de change',NULL,NULL,1),(423,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','767','416','Produits nets sur cessions de valeurs mobilières de placement',NULL,NULL,1),(424,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','768','416','Autres produits financiers',NULL,NULL,1),(425,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','77','1507','Produits exceptionnels',NULL,NULL,1),(426,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','771','425','Produits exceptionnels sur opérations de gestion',NULL,NULL,1),(427,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','772','425','(Compte à la disposition des entités pour enregistrer, en cours d\'exercice, les produits sur exercices antérieurs)',NULL,NULL,1),(428,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','775','425','Produits des cessions d\'éléments d\'actif',NULL,NULL,1),(429,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','777','425','Quote-part des subventions d\'investissement virée au résultat de l\'exercice',NULL,NULL,1),(430,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','778','425','Autres produits exceptionnels',NULL,NULL,1),(431,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','78','1507','Reprises sur amortissements et provisions',NULL,NULL,1),(432,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','781','431','Reprises sur amortissements et provisions (à inscrire dans les produits d\'exploitation)',NULL,NULL,1),(433,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','786','431','Reprises sur provisions pour risques (à inscrire dans les produits financiers)',NULL,NULL,1),(434,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','787','431','Reprises sur provisions (à inscrire dans les produits exceptionnels)',NULL,NULL,1),(435,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','79','1507','Transferts de charges',NULL,NULL,1),(436,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','791','435','Transferts de charges d\'exploitation ',NULL,NULL,1),(437,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','796','435','Transferts de charges financières',NULL,NULL,1),(438,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','797','435','Transferts de charges exceptionnelles',NULL,NULL,1),(439,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','10','1351','Capital',NULL,NULL,1),(440,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','100','439','Capital souscrit ou capital personnel',NULL,NULL,1),(441,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1000','440','Capital non amorti',NULL,NULL,1),(442,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1001','440','Capital amorti',NULL,NULL,1),(443,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','101','439','Capital non appelé',NULL,NULL,1),(444,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','109','439','Compte de l\'exploitant',NULL,NULL,1),(445,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1090','444','Opérations courantes',NULL,NULL,1),(446,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1091','444','Impôts personnels',NULL,NULL,1),(447,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1092','444','Rémunérations et autres avantages',NULL,NULL,1),(448,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','11','1351','Primes d\'émission',NULL,NULL,1),(449,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','12','1351','Plus-values de réévaluation',NULL,NULL,1),(450,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','120','449','Plus-values de réévaluation sur immobilisations incorporelles',NULL,NULL,1),(451,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1200','450','Plus-values de réévaluation',NULL,NULL,1),(452,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1201','450','Reprises de réductions de valeur',NULL,NULL,1),(453,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','121','449','Plus-values de réévaluation sur immobilisations corporelles',NULL,NULL,1),(454,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1210','453','Plus-values de réévaluation',NULL,NULL,1),(455,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1211','453','Reprises de réductions de valeur',NULL,NULL,1),(456,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','122','449','Plus-values de réévaluation sur immobilisations financières',NULL,NULL,1),(457,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1220','456','Plus-values de réévaluation',NULL,NULL,1),(458,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1221','456','Reprises de réductions de valeur',NULL,NULL,1),(459,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','123','449','Plus-values de réévaluation sur stocks',NULL,NULL,1),(460,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','124','449','Reprises de réductions de valeur sur placements de trésorerie',NULL,NULL,1),(461,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','13','1351','Réserve',NULL,NULL,1),(462,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','130','461','Réserve légale',NULL,NULL,1),(463,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','131','461','Réserves indisponibles',NULL,NULL,1),(464,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1310','463','Réserve pour actions propres',NULL,NULL,1),(465,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1311','463','Autres réserves indisponibles',NULL,NULL,1),(466,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','132','461','Réserves immunisées',NULL,NULL,1),(467,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','133','461','Réserves disponibles',NULL,NULL,1),(468,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1330','467','Réserve pour régularisation de dividendes',NULL,NULL,1),(469,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1331','467','Réserve pour renouvellement des immobilisations',NULL,NULL,1),(470,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1332','467','Réserve pour installations en faveur du personnel 1333 Réserves libres',NULL,NULL,1),(471,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','14','1351','Bénéfice reporté (ou perte reportée)',NULL,NULL,1),(472,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','15','1351','Subsides en capital',NULL,NULL,1),(473,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','150','472','Montants obtenus',NULL,NULL,1),(474,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','151','472','Montants transférés aux résultats',NULL,NULL,1),(475,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','16','1351','Provisions pour risques et charges',NULL,NULL,1),(476,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','160','475','Provisions pour pensions et obligations similaires',NULL,NULL,1),(477,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','161','475','Provisions pour charges fiscales',NULL,NULL,1),(478,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','162','475','Provisions pour grosses réparations et gros entretiens',NULL,NULL,1),(479,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','163','475','à 169 Provisions pour autres risques et charges',NULL,NULL,1),(480,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','164','475','Provisions pour sûretés personnelles ou réelles constituées à l\'appui de dettes et d\'engagements de tiers',NULL,NULL,1),(481,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','165','475','Provisions pour engagements relatifs à l\'acquisition ou à la cession d\'immobilisations',NULL,NULL,1),(482,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','166','475','Provisions pour exécution de commandes passées ou reçues',NULL,NULL,1),(483,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','167','475','Provisions pour positions et marchés à terme en devises ou positions et marchés à terme en marchandises',NULL,NULL,1),(484,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','168','475','Provisions pour garanties techniques attachées aux ventes et prestations déjà effectuées par l\'entreprise',NULL,NULL,1),(485,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','169','475','Provisions pour autres risques et charges',NULL,NULL,1),(486,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1690','485','Pour litiges en cours',NULL,NULL,1),(487,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1691','485','Pour amendes, doubles droits et pénalités',NULL,NULL,1),(488,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1692','485','Pour propre assureur',NULL,NULL,1),(489,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1693','485','Pour risques inhérents aux opérations de crédits à moyen ou long terme',NULL,NULL,1),(490,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1695','485','Provision pour charge de liquidation',NULL,NULL,1),(491,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1696','485','Provision pour départ de personnel',NULL,NULL,1),(492,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1699','485','Pour risques divers',NULL,NULL,1),(493,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17','1351','Dettes à plus d\'un an',NULL,NULL,1),(494,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','170','493','Emprunts subordonnés',NULL,NULL,1),(495,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1700','494','Convertibles',NULL,NULL,1),(496,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1701','494','Non convertibles',NULL,NULL,1),(497,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','171','493','Emprunts obligataires non subordonnés',NULL,NULL,1),(498,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1710','498','Convertibles',NULL,NULL,1),(499,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1711','498','Non convertibles',NULL,NULL,1),(500,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','172','493','Dettes de location-financement et assimilés',NULL,NULL,1),(501,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1720','500','Dettes de location-financement de biens immobiliers',NULL,NULL,1),(502,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1721','500','Dettes de location-financement de biens mobiliers',NULL,NULL,1),(503,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1722','500','Dettes sur droits réels sur immeubles',NULL,NULL,1),(504,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','173','493','Etablissements de crédit',NULL,NULL,1),(505,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1730','504','Dettes en compte',NULL,NULL,1),(506,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17300','505','Banque A',NULL,NULL,1),(507,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17301','505','Banque B',NULL,NULL,1),(508,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17302','505','Banque C',NULL,NULL,1),(509,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17303','505','Banque D',NULL,NULL,1),(510,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1731','504','Promesses',NULL,NULL,1),(511,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17310','510','Banque A',NULL,NULL,1),(512,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17311','510','Banque B',NULL,NULL,1),(513,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17312','510','Banque C',NULL,NULL,1),(514,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17313','510','Banque D',NULL,NULL,1),(515,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1732','504','Crédits d\'acceptation',NULL,NULL,1),(516,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17320','515','Banque A',NULL,NULL,1),(517,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17321','515','Banque B',NULL,NULL,1),(518,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17322','515','Banque C',NULL,NULL,1),(519,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17323','515','Banque D',NULL,NULL,1),(520,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','174','493','Autres emprunts',NULL,NULL,1),(521,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175','493','Dettes commerciales',NULL,NULL,1),(522,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1750','521','Fournisseurs : dettes en compte',NULL,NULL,1),(523,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17500','522','Entreprises apparentées',NULL,NULL,1),(524,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175000','523','Entreprises liées',NULL,NULL,1),(525,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175001','523','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(526,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17501','522','Fournisseurs ordinaires',NULL,NULL,1),(527,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175010','526','Fournisseurs belges',NULL,NULL,1),(528,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175011','526','Fournisseurs C.E.E.',NULL,NULL,1),(529,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175012','526','Fournisseurs importation',NULL,NULL,1),(530,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1751','521','Effets à payer',NULL,NULL,1),(531,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17510','530','Entreprises apparentées',NULL,NULL,1),(532,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175100','531','Entreprises liées',NULL,NULL,1),(533,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175101','531','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(534,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','17511','530','Fournisseurs ordinaires',NULL,NULL,1),(535,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175110','534','Fournisseurs belges',NULL,NULL,1),(536,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175111','534','Fournisseurs C.E.E.',NULL,NULL,1),(537,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','175112','534','Fournisseurs importation',NULL,NULL,1),(538,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','176','493','Acomptes reçus sur commandes',NULL,NULL,1),(539,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','178','493','Cautionnements reçus en numéraires',NULL,NULL,1),(540,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','179','493','Dettes diverses',NULL,NULL,1),(541,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1790','540','Entreprises liées',NULL,NULL,1),(542,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1791','540','Autres entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(543,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1792','540','Administrateurs, gérants et associés',NULL,NULL,1),(544,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1794','540','Rentes viagères capitalisées',NULL,NULL,1),(545,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1798','540','Dettes envers les coparticipants des associations momentanées et en participation',NULL,NULL,1),(546,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1799','540','Autres dettes diverses',NULL,NULL,1),(547,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','18','1351','Comptes de liaison des établissements et succursales',NULL,NULL,1),(548,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','20','1352','Frais d\'établissement',NULL,NULL,1),(549,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','200','548','Frais de constitution et d\'augmentation de capital',NULL,NULL,1),(550,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2000','549','Frais de constitution et d\'augmentation de capital',NULL,NULL,1),(551,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2009','549','Amortissements sur frais de constitution et d\'augmentation de capital',NULL,NULL,1),(552,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','201','548','Frais d\'émission d\'emprunts et primes de remboursement',NULL,NULL,1),(553,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2010','552','Agios sur emprunts et frais d\'émission d\'emprunts',NULL,NULL,1),(554,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2019','552','Amortissements sur agios sur emprunts et frais d\'émission d\'emprunts',NULL,NULL,1),(555,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','202','548','Autres frais d\'établissement',NULL,NULL,1),(556,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2020','555','Autres frais d\'établissement',NULL,NULL,1),(557,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2029','555','Amortissements sur autres frais d\'établissement',NULL,NULL,1),(558,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','203','548','Intérêts intercalaires',NULL,NULL,1),(559,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2030','558','Intérêts intercalaires',NULL,NULL,1),(560,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2039','558','Amortissements sur intérêts intercalaires',NULL,NULL,1),(561,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','204','548','Frais de restructuration',NULL,NULL,1),(562,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2040','561','Coût des frais de restructuration',NULL,NULL,1),(563,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2049','561','Amortissements sur frais de restructuration',NULL,NULL,1),(564,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','21','1352','Immobilisations incorporelles',NULL,NULL,1),(565,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','210','564','Frais de recherche et de développement',NULL,NULL,1),(566,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2100','565','Frais de recherche et de mise au point',NULL,NULL,1),(567,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2108','565','Plus-values actées sur frais de recherche et de mise au point',NULL,NULL,1),(568,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2109','565','Amortissements sur frais de recherche et de mise au point',NULL,NULL,1),(569,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','211','564','Concessions, brevets, licences, savoir-faire, marque et droits similaires',NULL,NULL,1),(570,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2110','569','Concessions, brevets, licences, marques, etc',NULL,NULL,1),(571,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2118','569','Plus-values actées sur concessions, etc',NULL,NULL,1),(572,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2119','569','Amortissements sur concessions, etc',NULL,NULL,1),(573,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','212','564','Goodwill',NULL,NULL,1),(574,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2120','573','Coût d\'acquisition',NULL,NULL,1),(575,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2128','573','Plus-values actées',NULL,NULL,1),(576,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2129','573','Amortissements sur goodwill',NULL,NULL,1),(577,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','213','564','Acomptes versés',NULL,NULL,1),(578,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22','1352','Terrains et constructions',NULL,NULL,1),(579,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','220','578','Terrains',NULL,NULL,1),(580,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2200','579','Terrains',NULL,NULL,1),(581,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2201','579','Frais d\'acquisition sur terrains',NULL,NULL,1),(582,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2208','579','Plus-values actées sur terrains',NULL,NULL,1),(583,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2209','579','Amortissements et réductions de valeur',NULL,NULL,1),(584,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22090','583','Amortissements sur frais d\'acquisition',NULL,NULL,1),(585,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22091','583','Réductions de valeur sur terrains',NULL,NULL,1),(586,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','221','578','Constructions',NULL,NULL,1),(587,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2210','586','Bâtiments industriels',NULL,NULL,1),(588,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2211','586','Bâtiments administratifs et commerciaux',NULL,NULL,1),(589,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2212','586','Autres bâtiments d\'exploitation',NULL,NULL,1),(590,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2213','586','Voies de transport et ouvrages d\'art',NULL,NULL,1),(591,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2215','586','Constructions sur sol d\'autrui',NULL,NULL,1),(592,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2216','586','Frais d\'acquisition sur constructions',NULL,NULL,1),(593,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2218','586','Plus-values actées',NULL,NULL,1),(594,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22180','593','Sur bâtiments industriels',NULL,NULL,1),(595,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22181','593','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(596,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22182','593','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(597,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22184','593','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(598,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2219','586','Amortissements sur constructions',NULL,NULL,1),(599,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22190','598','Sur bâtiments industriels',NULL,NULL,1),(600,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22191','598','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(601,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22192','598','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(602,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22194','598','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(603,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22195','598','Sur constructions sur sol d\'autrui',NULL,NULL,1),(604,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22196','598','Sur frais d\'acquisition sur constructions',NULL,NULL,1),(605,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','222','578','Terrains bâtis',NULL,NULL,1),(606,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2220','605','Valeur d\'acquisition',NULL,NULL,1),(607,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22200','606','Bâtiments industriels',NULL,NULL,1),(608,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22201','606','Bâtiments administratifs et commerciaux',NULL,NULL,1),(609,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22202','606','Autres bâtiments d\'exploitation',NULL,NULL,1),(610,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22203','606','Voies de transport et ouvrages d\'art',NULL,NULL,1),(611,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22204','606','Frais d\'acquisition des terrains à bâtir',NULL,NULL,1),(612,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2228','605','Plus-values actées',NULL,NULL,1),(613,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22280','612','Sur bâtiments industriels',NULL,NULL,1),(614,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22281','612','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(615,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22282','612','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(616,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22283','612','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(617,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2229','605','Amortissements sur terrains bâtis',NULL,NULL,1),(618,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22290','617','Sur bâtiments industriels',NULL,NULL,1),(619,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22291','617','Sur bâtiments administratifs et commerciaux',NULL,NULL,1),(620,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22292','617','Sur autres bâtiments d\'exploitation',NULL,NULL,1),(621,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22293','617','Sur voies de transport et ouvrages d\'art',NULL,NULL,1),(622,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','22294','617','Sur frais d\'acquisition des terrains bâtis',NULL,NULL,1),(623,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','223','578','Autres droits réels sur des immeubles',NULL,NULL,1),(624,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2230','623','Valeur d\'acquisition',NULL,NULL,1),(625,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2238','623','Plus-values actées',NULL,NULL,1),(626,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2239','623','Amortissements',NULL,NULL,1),(627,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','23','1352','Installations, machines et outillages',NULL,NULL,1),(628,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','230','627','Installations',NULL,NULL,1),(629,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2300','628','Installations bâtiments industriels',NULL,NULL,1),(630,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2301','628','Installations bâtiments administratifs et commerciaux',NULL,NULL,1),(631,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2302','628','Installations bâtiments d\'exploitation',NULL,NULL,1),(632,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2303','628','Installations voies de transport et ouvrages d\'art',NULL,NULL,1),(633,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2300','628','Installation d\'eau',NULL,NULL,1),(634,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2301','628','Installation d\'électricité',NULL,NULL,1),(635,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2302','628','Installation de vapeur',NULL,NULL,1),(636,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2303','628','Installation de gaz',NULL,NULL,1),(637,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2304','628','Installation de chauffage',NULL,NULL,1),(638,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2305','628','Installation de conditionnement d\'air',NULL,NULL,1),(639,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2306','628','Installation de chargement',NULL,NULL,1),(640,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','231','627','Machines',NULL,NULL,1),(641,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2310','640','Division A',NULL,NULL,1),(642,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2311','640','Division B',NULL,NULL,1),(643,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2312','640','Division C',NULL,NULL,1),(644,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','237','627','Outillage',NULL,NULL,1),(645,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2370','644','Division A',NULL,NULL,1),(646,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2371','644','Division B',NULL,NULL,1),(647,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2372','644','Division C',NULL,NULL,1),(648,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','238','627','Plus-values actées',NULL,NULL,1),(649,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2380','648','Sur installations',NULL,NULL,1),(650,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2381','648','Sur machines',NULL,NULL,1),(651,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2382','648','Sur outillage',NULL,NULL,1),(652,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','239','627','Amortissements',NULL,NULL,1),(653,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2390','652','Sur installations',NULL,NULL,1),(654,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2391','652','Sur machines',NULL,NULL,1),(655,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2392','652','Sur outillage',NULL,NULL,1),(656,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24','1352','Mobilier et matériel roulant',NULL,NULL,1),(657,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','240','656','Mobilier',NULL,NULL,1),(658,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2400','656','Mobilier',NULL,NULL,1),(659,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24000','658','Mobilier des bâtiments industriels',NULL,NULL,1),(660,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24001','658','Mobilier des bâtiments administratifs et commerciaux',NULL,NULL,1),(661,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24002','658','Mobilier des autres bâtiments d\'exploitation',NULL,NULL,1),(662,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24003','658','Mobilier oeuvres sociales',NULL,NULL,1),(663,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2401','657','Matériel de bureau et de service social',NULL,NULL,1),(664,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24010','663','Des bâtiments industriels',NULL,NULL,1),(665,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24011','663','Des bâtiments administratifs et commerciaux',NULL,NULL,1),(666,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24012','663','Des autres bâtiments d\'exploitation',NULL,NULL,1),(667,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24013','663','Des oeuvres sociales',NULL,NULL,1),(668,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2408','657','Plus-values actées',NULL,NULL,1),(669,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24080','668','Plus-values actées sur mobilier',NULL,NULL,1),(670,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24081','668','Plus-values actées sur matériel de bureau et service social',NULL,NULL,1),(671,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2409','657','Amortissements',NULL,NULL,1),(672,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24090','671','Amortissements sur mobilier',NULL,NULL,1),(673,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24091','671','Amortissements sur matériel de bureau et service social',NULL,NULL,1),(674,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','241','656','Matériel roulant',NULL,NULL,1),(675,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2410','674','Matériel automobile',NULL,NULL,1),(676,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24100','675','Voitures',NULL,NULL,1),(677,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24105','675','Camions',NULL,NULL,1),(678,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2411','674','Matériel ferroviaire',NULL,NULL,1),(679,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2412','674','Matériel fluvial',NULL,NULL,1),(680,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2413','674','Matériel naval',NULL,NULL,1),(681,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2414','674','Matériel aérien',NULL,NULL,1),(682,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2418','674','Plus-values sur matériel roulant',NULL,NULL,1),(683,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24180','682','Plus-values sur matériel automobile',NULL,NULL,1),(684,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24181','682','Idem sur matériel ferroviaire',NULL,NULL,1),(685,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24182','682','Idem sur matériel fluvial',NULL,NULL,1),(686,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24183','682','Idem sur matériel naval',NULL,NULL,1),(687,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24184','682','Idem sur matériel aérien',NULL,NULL,1),(688,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2419','674','Amortissements sur matériel roulant',NULL,NULL,1),(689,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24190','688','Amortissements sur matériel automobile',NULL,NULL,1),(690,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24191','688','Idem sur matériel ferroviaire',NULL,NULL,1),(691,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24192','688','Idem sur matériel fluvial',NULL,NULL,1),(692,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24193','688','Idem sur matériel naval',NULL,NULL,1),(693,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','24194','688','Idem sur matériel aérien',NULL,NULL,1),(694,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','25','1352','Immobilisation détenues en location-financement et droits similaires',NULL,NULL,1),(695,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','250','694','Terrains et constructions',NULL,NULL,1),(696,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2500','695','Terrains',NULL,NULL,1),(697,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2501','695','Constructions',NULL,NULL,1),(698,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2508','695','Plus-values sur emphytéose,  leasing et droits similaires : terrains et constructions',NULL,NULL,1),(699,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2509','695','Amortissements et réductions de valeur sur terrains et constructions en leasing',NULL,NULL,1),(700,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','251','694','Installations,  machines et outillage',NULL,NULL,1),(701,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2510','700','Installations',NULL,NULL,1),(702,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2511','700','Machines',NULL,NULL,1),(703,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2512','700','Outillage',NULL,NULL,1),(704,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2518','700','Plus-values actées sur installations machines et outillage pris en leasing',NULL,NULL,1),(705,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2519','700','Amortissements sur installations machines et outillage pris en leasing',NULL,NULL,1),(706,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','252','694','Mobilier et matériel roulant',NULL,NULL,1),(707,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2520','706','Mobilier',NULL,NULL,1),(708,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2521','706','Matériel roulant',NULL,NULL,1),(709,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2528','706','Plus-values actées sur mobilier et matériel roulant en leasing',NULL,NULL,1),(710,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2529','706','Amortissements sur mobilier et matériel roulant en leasing',NULL,NULL,1),(711,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','26','1352','Autres immobilisations corporelles',NULL,NULL,1),(712,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','260','711','Frais d\'aménagements de locaux pris en location',NULL,NULL,1),(713,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','261','711','Maison d\'habitation',NULL,NULL,1),(714,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','262','711','Réserve immobilière',NULL,NULL,1),(715,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','263','711','Matériel d\'emballage',NULL,NULL,1),(716,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','264','711','Emballages récupérables',NULL,NULL,1),(717,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','268','711','Plus-values actées sur autres immobilisations corporelles',NULL,NULL,1),(718,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','269','711','Amortissements sur autres immobilisations corporelles',NULL,NULL,1),(719,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2690','718','Amortissements sur frais d\'aménagement des locaux pris en location',NULL,NULL,1),(720,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2691','718','Amortissements sur maison d\'habitation',NULL,NULL,1),(721,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2692','718','Amortissements sur réserve immobilière',NULL,NULL,1),(722,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2693','718','Amortissements sur matériel d\'emballage',NULL,NULL,1),(723,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2694','718','Amortissements sur emballages récupérables',NULL,NULL,1),(724,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','27','1352','Immobilisations corporelles en cours et acomptes versés',NULL,NULL,1),(725,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','270','724','Immobilisations en cours',NULL,NULL,1),(726,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2700','725','Constructions',NULL,NULL,1),(727,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2701','725','Installations machines et outillage',NULL,NULL,1),(728,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2702','725','Mobilier et matériel roulant',NULL,NULL,1),(729,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2703','725','Autres immobilisations corporelles',NULL,NULL,1),(730,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','271','724','Avances et acomptes versés sur immobilisations en cours',NULL,NULL,1),(731,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','28','1352','Immobilisations financières',NULL,NULL,1),(732,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','280','731','Participations dans des entreprises liées',NULL,NULL,1),(733,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2800','732','Valeur d\'acquisition (peut être subdivisé par participation)',NULL,NULL,1),(734,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2801','732','Montants non appelés (idem)',NULL,NULL,1),(735,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2808','732','Plus-values actées (idem)',NULL,NULL,1),(736,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2809','732','Réductions de valeurs actées (idem)',NULL,NULL,1),(737,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','281','731','Créances sur des entreprises liées',NULL,NULL,1),(738,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2810','737','Créances en compte',NULL,NULL,1),(739,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2811','737','Effets à recevoir',NULL,NULL,1),(740,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2812','737','Titres à revenu fixes',NULL,NULL,1),(741,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2817','737','Créances douteuses',NULL,NULL,1),(742,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2819','737','Réductions de valeurs actées',NULL,NULL,1),(743,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','282','731','Participations dans des entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(744,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2820','743','Valeur d\'acquisition (peut être subdivisé par participation)',NULL,NULL,1),(745,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2821','743','Montants non appelés (idem)',NULL,NULL,1),(746,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2828','743','Plus-values actées (idem)',NULL,NULL,1),(747,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2829','743','Réductions de valeurs actées (idem)',NULL,NULL,1),(748,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','283','731','Créances sur des entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(749,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2830','748','Créances en compte',NULL,NULL,1),(750,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2831','748','Effets à recevoir',NULL,NULL,1),(751,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2832','748','Titres à revenu fixe',NULL,NULL,1),(752,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2837','748','Créances douteuses',NULL,NULL,1),(753,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2839','748','Réductions de valeurs actées',NULL,NULL,1),(754,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','284','731','Autres actions et parts',NULL,NULL,1),(755,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2840','754','Valeur d\'acquisition',NULL,NULL,1),(756,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2841','754','Montants non appelés',NULL,NULL,1),(757,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2848','754','Plus-values actées',NULL,NULL,1),(758,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2849','754','Réductions de valeur actées',NULL,NULL,1),(759,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','285','731','Autres créances',NULL,NULL,1),(760,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2850','759','Créances en compte',NULL,NULL,1),(761,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2851','759','Effets à recevoir',NULL,NULL,1),(762,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2852','759','Titres à revenu fixe',NULL,NULL,1),(763,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2857','759','Créances douteuses',NULL,NULL,1),(764,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2859','759','Réductions de valeur actées',NULL,NULL,1),(765,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','288','731','Cautionnements versés en numéraires',NULL,NULL,1),(766,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2880','765','Téléphone, téléfax, télex',NULL,NULL,1),(767,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2881','765','Gaz',NULL,NULL,1),(768,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2882','765','Eau',NULL,NULL,1),(769,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2883','765','Electricité',NULL,NULL,1),(770,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2887','765','Autres cautionnements versés en numéraires',NULL,NULL,1),(771,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29','1352','Créances à plus d\'un an',NULL,NULL,1),(772,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','290','771','Créances commerciales',NULL,NULL,1),(773,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2900','772','Clients',NULL,NULL,1),(774,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29000','773','Créances en compte sur entreprises liées',NULL,NULL,1),(775,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29001','773','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(776,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29002','773','Sur clients Belgique',NULL,NULL,1),(777,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29003','773','Sur clients C.E.E.',NULL,NULL,1),(778,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29004','773','Sur clients exportation hors C.E.E.',NULL,NULL,1),(779,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29005','773','Créances sur les coparticipants (associations momentanées)',NULL,NULL,1),(780,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2901','772','Effets à recevoir',NULL,NULL,1),(781,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29010','780','Sur entreprises liées',NULL,NULL,1),(782,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29011','780','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(783,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29012','780','Sur clients Belgique',NULL,NULL,1),(784,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29013','780','Sur clients C.E.E.',NULL,NULL,1),(785,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29014','780','Sur clients exportation hors C.E.E.',NULL,NULL,1),(786,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2905','772','Retenues sur garanties',NULL,NULL,1),(787,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2906','772','Acomptes versés',NULL,NULL,1),(788,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2907','772','Créances douteuses (à ventiler comme clients 2900)',NULL,NULL,1),(789,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2909','772','Réductions de valeur actées (à ventiler comme clients 2900)',NULL,NULL,1),(790,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','291','771','Autres créances',NULL,NULL,1),(791,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2910','790','Créances en compte',NULL,NULL,1),(792,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29100','791','Sur entreprises liées',NULL,NULL,1),(793,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29101','791','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(794,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29102','791','Sur autres débiteurs',NULL,NULL,1),(795,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2911','790','Effets à recevoir',NULL,NULL,1),(796,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29110','795','Sur entreprises liées',NULL,NULL,1),(797,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29111','795','Sur entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(798,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','29112','795','Sur autres débiteurs',NULL,NULL,1),(799,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2912','790','Créances résultant de la cession d\'immobilisations données en leasing',NULL,NULL,1),(800,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2917','790','Créances douteuses',NULL,NULL,1),(801,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2919','790','Réductions de valeur actées',NULL,NULL,1),(802,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','30','1353','Approvisionnements - matières premières',NULL,NULL,1),(803,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','300','802','Valeur d\'acquisition',NULL,NULL,1),(804,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','309','802','Réductions de valeur actées',NULL,NULL,1),(805,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','31','1353','Approvsionnements et fournitures',NULL,NULL,1),(806,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','310','805','Valeur d\'acquisition',NULL,NULL,1),(807,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3100','806','Matières d\'approvisionnement',NULL,NULL,1),(808,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3101','806','Energie, charbon, coke, mazout, essence, propane',NULL,NULL,1),(809,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3102','806','Produits d\'entretien',NULL,NULL,1),(810,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3103','806','Fournitures diverses et petit outillage',NULL,NULL,1),(811,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3104','806','Imprimés et fournitures de bureau',NULL,NULL,1),(812,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3105','806','Fournitures de services sociaux',NULL,NULL,1),(813,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3106','806','Emballages commerciaux',NULL,NULL,1),(814,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','31060','813','Emballages perdus',NULL,NULL,1),(815,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','31061','813','Emballages récupérables',NULL,NULL,1),(816,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','319','805','Réductions de valeur actées',NULL,NULL,1),(817,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','32','1353','En cours de fabrication',NULL,NULL,1),(818,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','320','817','Valeur d\'acquisition',NULL,NULL,1),(819,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3200','818','Produits semi-ouvrés',NULL,NULL,1),(820,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3201','818','Produits en cours de fabrication',NULL,NULL,1),(821,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3202','818','Travaux en cours',NULL,NULL,1),(822,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3205','818','Déchets',NULL,NULL,1),(823,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3206','818','Rebuts',NULL,NULL,1),(824,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3209','818','Travaux en association momentanée',NULL,NULL,1),(825,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','329','817','Réductions de valeur actées',NULL,NULL,1),(826,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','33','1353','Produits finis',NULL,NULL,1),(827,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','330','826','Valeur d\'acquisition',NULL,NULL,1),(828,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3300','827','Produits finis',NULL,NULL,1),(829,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','339','826','Réductions de valeur actées',NULL,NULL,1),(830,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','34','1353','Marchandises',NULL,NULL,1),(831,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','340','830','Valeur d\'acquisition',NULL,NULL,1),(832,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3400','831','Groupe A',NULL,NULL,1),(833,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3401','831','Groupe B',NULL,NULL,1),(834,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3402','831','Groupe C',NULL,NULL,1),(835,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','349','830','Réductions de valeur actées',NULL,NULL,1),(836,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','35','1353','Immeubles destinés à la vente',NULL,NULL,1),(837,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','350','836','Valeur d\'acquisition',NULL,NULL,1),(838,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3500','837','Immeuble A',NULL,NULL,1),(839,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3501','837','Immeuble B',NULL,NULL,1),(840,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3502','837','Immeuble C',NULL,NULL,1),(841,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','351','836','Immeubles construits en vue de leur revente',NULL,NULL,1),(842,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3510','841','Immeuble A',NULL,NULL,1),(843,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3511','841','Immeuble B',NULL,NULL,1),(844,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3512','841','Immeuble C',NULL,NULL,1),(845,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','359','836','Réductions de valeurs actées',NULL,NULL,1),(846,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','36','1353','Acomptes versés sur achats pour stocks',NULL,NULL,1),(847,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','360','846','Acomptes versés (à ventiler éventuellement par catégorie)',NULL,NULL,1),(848,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','369','846','Réductions de valeur actées',NULL,NULL,1),(849,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','37','1353','Commandes en cours d\'exécution',NULL,NULL,1),(850,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','370','849','Valeur d\'acquisition',NULL,NULL,1),(851,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','371','849','Bénéfice pris en compte',NULL,NULL,1),(852,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','379','849','Réductions de valeur actées',NULL,NULL,1),(853,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','40','1354','Créances commerciales',NULL,NULL,1),(854,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','400','853','Clients',NULL,NULL,1),(855,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4007','854','Rabais, remises et  ristournes à accorder et autres notes de crédit à établir',NULL,NULL,1),(856,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4008','854','Créances résultant de livraisons de biens (associations momentanées)',NULL,NULL,1),(857,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','401','853','Effets à recevoir',NULL,NULL,1),(858,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4010','857','Effets à recevoir',NULL,NULL,1),(859,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4013','857','Effets à l\'encaissement',NULL,NULL,1),(860,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4015','857','Effets à l\'escompte',NULL,NULL,1),(861,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','402','853','Clients, créances courantes, entreprises apparentées, administrateurs et gérants',NULL,NULL,1),(862,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4020','861','Entreprises liées',NULL,NULL,1),(863,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4021','861','Autres entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(864,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4022','861','Administrateurs et gérants d\'entreprise',NULL,NULL,1),(865,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','403','853','Effets à recevoir sur entreprises apparentées et administrateurs et gérants',NULL,NULL,1),(866,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4030','865','Entreprises liées',NULL,NULL,1),(867,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4031','865','Autres entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(868,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4032','865','Administrateurs et gérants de l\'entreprise',NULL,NULL,1),(869,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','404','853','Produits à recevoir (factures à établir)',NULL,NULL,1),(870,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','405','853','Clients : retenues sur garanties',NULL,NULL,1),(871,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','406','853','Acomptes versés',NULL,NULL,1),(872,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','407','853','Créances douteuses',NULL,NULL,1),(873,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','408','853','Compensation clients',NULL,NULL,1),(874,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','409','853','Réductions de valeur actées',NULL,NULL,1),(875,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','41','1354','Autres créances',NULL,NULL,1),(876,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','410','875','Capital appelé, non versé',NULL,NULL,1),(877,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4100','876','Appels de fonds',NULL,NULL,1),(878,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4101','876','Actionnaires défaillants',NULL,NULL,1),(879,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','411','875','T.V.A. à récupérer',NULL,NULL,1),(880,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4110','879','T.V.A. due',NULL,NULL,1),(881,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4111','879','T.V.A. déductible',NULL,NULL,1),(882,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4112','879','Compte courant administration T.V.A.',NULL,NULL,1),(883,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4118','879','Taxe d\'égalisation due',NULL,NULL,1),(884,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','412','875','Impôts et versements fiscaux à récupérer',NULL,NULL,1),(885,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4120','884','Impôts belges sur le résultat',NULL,NULL,1),(886,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4125','884','Autres impôts belges',NULL,NULL,1),(887,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4128','884','Impôts étrangers',NULL,NULL,1),(888,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','414','875','Produits à recevoir',NULL,NULL,1),(889,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','416','875','Créances diverses',NULL,NULL,1),(890,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4160','889','Associés (compte d\'apport en société)',NULL,NULL,1),(891,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4161','889','Avances et prêts au personnel',NULL,NULL,1),(892,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4162','889','Compte courant des associés en S.P.R.L.',NULL,NULL,1),(893,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4163','889','Compte courant des administrateurs et gérants',NULL,NULL,1),(894,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4164','889','Créances sur sociétés apparentées',NULL,NULL,1),(895,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4166','889','Emballages et matériel à rendre',NULL,NULL,1),(896,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4167','889','Etat et établissements publics',NULL,NULL,1),(897,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','41670','896','Subsides à recevoir',NULL,NULL,1),(898,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','41671','896','Autres créances',NULL,NULL,1),(899,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4168','889','Rabais, ristournes et remises à obtenir et autres avoirs non encore reçus',NULL,NULL,1),(900,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','417','875','Créances douteuses',NULL,NULL,1),(901,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','418','875','Cautionnements versés en numéraires',NULL,NULL,1),(902,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','419','875','Réductions de valeur actées',NULL,NULL,1),(903,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','42','1354','Dettes à plus d\'un an échéant dans l\'année',NULL,NULL,1),(904,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','420','903','Emprunts subordonnés',NULL,NULL,1),(905,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4200','904','Convertibles',NULL,NULL,1),(906,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4201','904','Non convertibles',NULL,NULL,1),(907,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','421','903','Emprunts obligataires non subordonnés',NULL,NULL,1),(908,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4210','907','Convertibles',NULL,NULL,1),(909,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4211','907','Non convertibles',NULL,NULL,1),(910,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','422','903','Dettes de location-financement et assimilées',NULL,NULL,1),(911,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4220','910','Financement de biens immobiliers',NULL,NULL,1),(912,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4221','910','Financement de biens mobiliers',NULL,NULL,1),(913,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','423','903','Etablissements de crédit',NULL,NULL,1),(914,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4230','913','Dettes en compte',NULL,NULL,1),(915,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4231','913','Promesses',NULL,NULL,1),(916,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4232','913','Crédits d\'acceptation',NULL,NULL,1),(917,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','424','903','Autres emprunts',NULL,NULL,1),(918,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','425','903','Dettes commerciales',NULL,NULL,1),(919,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4250','918','Fournisseurs',NULL,NULL,1),(920,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4251','918','Effets à payer',NULL,NULL,1),(921,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','426','903','Cautionnements reçus en numéraires',NULL,NULL,1),(922,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','429','903','Dettes diverses',NULL,NULL,1),(923,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4290','922','Entreprises liées',NULL,NULL,1),(924,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4291','922','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(925,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4292','922','Administrateurs, gérants, associés',NULL,NULL,1),(926,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4299','922','Autres dettes',NULL,NULL,1),(927,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','43','1354','Dettes financières',NULL,NULL,1),(928,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','430','927','Etablissements de crédit. Emprunts en compte à terme fixe',NULL,NULL,1),(929,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','431','927','Etablissements de crédit. Promesses',NULL,NULL,1),(930,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','432','927','Etablissements de crédit. Crédits d\'acceptation',NULL,NULL,1),(931,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','433','927','Etablissements de crédit. Dettes en compte courant',NULL,NULL,1),(932,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','439','927','Autres emprunts',NULL,NULL,1),(933,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44','1354','Dettes commerciales',NULL,NULL,1),(934,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','440','933','Fournisseurs',NULL,NULL,1),(935,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4400','934','Entreprises apparentées',NULL,NULL,1),(936,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44000','935','Entreprises liées',NULL,NULL,1),(937,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44001','935','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(938,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4401','934','Fournisseurs ordinaires',NULL,NULL,1),(939,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44010','938','Fournisseurs belges',NULL,NULL,1),(940,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44011','938','Fournisseurs CEE',NULL,NULL,1),(941,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44012','938','Fournisseurs importation',NULL,NULL,1),(942,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4402','934','Dettes envers les coparticipants (associations momentanées)',NULL,NULL,1),(943,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4403','934','Fournisseurs - retenues de garanties',NULL,NULL,1),(944,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','441','933','Effets à payer',NULL,NULL,1),(945,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4410','944','Entreprises apparentées',NULL,NULL,1),(946,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44100','945','Entreprises liées',NULL,NULL,1),(947,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44101','945','Entreprises avec lesquelles il existe un lien de participation',NULL,NULL,1),(948,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4411','944','Fournisseurs ordinaires',NULL,NULL,1),(949,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44110','948','Fournisseurs belges',NULL,NULL,1),(950,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44111','948','Fournisseurs CEE',NULL,NULL,1),(951,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','44112','948','Fournisseurs importation',NULL,NULL,1),(952,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','444','933','Factures à recevoir',NULL,NULL,1),(953,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','446','933','Acomptes reçus',NULL,NULL,1),(954,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','448','933','Compensations fournisseurs',NULL,NULL,1),(955,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45','1354','Dettes fiscales, salariales et sociales',NULL,NULL,1),(956,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','450','955','Dettes fiscales estimées',NULL,NULL,1),(957,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4501','956','Impôts sur le résultat',NULL,NULL,1),(958,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4505','956','Autres impôts en Belgique',NULL,NULL,1),(959,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4508','956','Impôts à l\'étranger',NULL,NULL,1),(960,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','451','955','T.V.A. à payer',NULL,NULL,1),(961,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4510','960','T.V.A. due',NULL,NULL,1),(962,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4511','960','T.V.A. déductible',NULL,NULL,1),(963,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4512','960','Compte courant administration T.V.A.',NULL,NULL,1),(964,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4518','960','Taxe d\'égalisation due',NULL,NULL,1),(965,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','452','955','Impôts et taxes à payer',NULL,NULL,1),(966,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4520','965','Autres impôts sur le résultat',NULL,NULL,1),(967,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4525','965','Autres impôts et taxes en Belgique',NULL,NULL,1),(968,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45250','967','Précompte immobilier',NULL,NULL,1),(969,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45251','967','Impôts communaux à payer',NULL,NULL,1),(970,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45252','967','Impôts provinciaux à payer',NULL,NULL,1),(971,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45253','967','Autres impôts et taxes à payer',NULL,NULL,1),(972,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4528','965','Impôts et taxes à l\'étranger',NULL,NULL,1),(973,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','453','955','Précomptes retenus',NULL,NULL,1),(974,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4530','973','Précompte professionnel retenu sur rémunérations',NULL,NULL,1),(975,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4531','973','Précompte professionnel retenu sur tantièmes',NULL,NULL,1),(976,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4532','973','Précompte mobilier retenu sur dividendes attribués',NULL,NULL,1),(977,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4533','973','Précompte mobilier retenu sur intérêts payés',NULL,NULL,1),(978,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4538','973','Autres précomptes retenus',NULL,NULL,1),(979,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','454','955','Office National de la Sécurité Sociale',NULL,NULL,1),(980,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4540','979','Arriérés',NULL,NULL,1),(981,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4541','979','1er trimestre',NULL,NULL,1),(982,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4542','979','2ème trimestre',NULL,NULL,1),(983,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4543','979','3ème trimestre',NULL,NULL,1),(984,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4544','979','4ème trimestre',NULL,NULL,1),(985,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','455','955','Rémunérations',NULL,NULL,1),(986,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4550','985','Administrateurs,  gérants et commissaires (non réviseurs)',NULL,NULL,1),(987,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4551','985','Direction',NULL,NULL,1),(988,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4552','985','Employés',NULL,NULL,1),(989,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4553','985','Ouvriers',NULL,NULL,1),(990,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','456','955','Pécules de vacances',NULL,NULL,1),(991,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4560','990','Direction',NULL,NULL,1),(992,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4561','990','Employés',NULL,NULL,1),(993,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4562','990','Ouvriers',NULL,NULL,1),(994,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','459','955','Autres dettes sociales',NULL,NULL,1),(995,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4590','994','Provision pour gratifications de fin d\'année',NULL,NULL,1),(996,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4591','994','Départs de personnel',NULL,NULL,1),(997,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4592','994','Oppositions sur rémunérations',NULL,NULL,1),(998,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4593','994','Assurances relatives au personnel',NULL,NULL,1),(999,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45930','998','Assurance loi',NULL,NULL,1),(1000,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45931','998','Assurance salaire garanti',NULL,NULL,1),(1001,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45932','998','Assurance groupe',NULL,NULL,1),(1002,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','45933','998','Assurances individuelles',NULL,NULL,1),(1003,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4594','994','Caisse d\'assurances sociales pour travailleurs indépendants',NULL,NULL,1),(1004,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4597','994','Dettes et provisions sociales diverses',NULL,NULL,1),(1005,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','46','1354','Acomptes reçus sur commande',NULL,NULL,1),(1006,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','47','1354','Dettes découlant de l\'affectation des résultats',NULL,NULL,1),(1007,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','470','1006','Dividendes et tantièmes d\'exercices antérieurs',NULL,NULL,1),(1008,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','471','1006','Dividendes de l\'exercice',NULL,NULL,1),(1009,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','472','1006','Tantièmes de l\'exercice',NULL,NULL,1),(1010,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','473','1006','Autres allocataires',NULL,NULL,1),(1011,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','48','4','Dettes diverses',NULL,NULL,1),(1012,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','480','1011','Obligations et coupons échus',NULL,NULL,1),(1013,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','481','1011','Actionnaires - capital à rembourser',NULL,NULL,1),(1014,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','482','1011','Participation du personnel à payer',NULL,NULL,1),(1015,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','483','1011','Acomptes reçus d\'autres tiers à moins d\'un an',NULL,NULL,1),(1016,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','486','1011','Emballages et matériel consignés',NULL,NULL,1),(1017,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','488','1011','Cautionnements reçus en numéraires',NULL,NULL,1),(1018,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','489','1011','Autres dettes diverses',NULL,NULL,1),(1019,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49','1354','Comptes de régularisation et compte d\'attente',NULL,NULL,1),(1020,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','490','1019','Charges à reporter (à subdiviser par catégorie de charges)',NULL,NULL,1),(1021,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','491','1019','Produits acquis',NULL,NULL,1),(1022,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4910','1021','Produits d\'exploitation',NULL,NULL,1),(1023,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49100','1022','Ristournes et rabais à obtenir',NULL,NULL,1),(1024,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49101','1022','Commissions à obtenir',NULL,NULL,1),(1025,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49102','1022','Autres produits d\'exploitation (redevances par exemple)',NULL,NULL,1),(1026,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4911','1021','Produits financiers',NULL,NULL,1),(1027,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49110','1026','Intérêts courus et non échus sur prêts et débits',NULL,NULL,1),(1028,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','49111','1026','Autres produits financiers',NULL,NULL,1),(1029,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','492','1019','Charges à imputer (à subdiviser par catégorie de charges)',NULL,NULL,1),(1030,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','493','1019','Produits à reporter',NULL,NULL,1),(1031,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4930','1030','Produits d\'exploitation à reporter',NULL,NULL,1),(1032,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4931','1030','Produits financiers à reporter',NULL,NULL,1),(1033,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','499','1019','Comptes d\'attente',NULL,NULL,1),(1034,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4990','1033','Compte d\'attente',NULL,NULL,1),(1035,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4991','1033','Compte de répartition périodique des charges',NULL,NULL,1),(1036,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4999','1033','Transferts d\'exercice',NULL,NULL,1),(1037,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','50','1355','Actions propres',NULL,NULL,1),(1038,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','51','1355','Actions et parts',NULL,NULL,1),(1039,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','510','1038','Valeur d\'acquisition',NULL,NULL,1),(1040,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','511','1038','Montants non appelés',NULL,NULL,1),(1041,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','519','1038','Réductions de valeur actées',NULL,NULL,1),(1042,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','52','1355','Titres à revenus fixes',NULL,NULL,1),(1043,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','520','1042','Valeur d\'acquisition',NULL,NULL,1),(1044,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','529','1042','Réductions de valeur actées',NULL,NULL,1),(1045,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','53','1355','Dépots à terme',NULL,NULL,1),(1046,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','530','1045','De plus d\'un an',NULL,NULL,1),(1047,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','531','1045','De plus d\'un mois et à un an au plus',NULL,NULL,1),(1048,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','532','1045','d\'un mois au plus',NULL,NULL,1),(1049,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','539','1045','Réductions de valeur actées',NULL,NULL,1),(1050,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','54','1355','Valeurs échues à l\'encaissement',NULL,NULL,1),(1051,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','540','1050','Chèques à encaisser',NULL,NULL,1),(1052,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','541','1050','Coupons à encaisser',NULL,NULL,1),(1053,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','55','1355','Etablissements de crédit - Comptes ouverts auprès des divers établissements.',NULL,NULL,1),(1054,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','550','1053','Comptes courants',NULL,NULL,1),(1055,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','551','1053','Chèques émis',NULL,NULL,1),(1056,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','559','1053','Réductions de valeur actées',NULL,NULL,1),(1057,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','56','1355','Office des chèques postaux',NULL,NULL,1),(1058,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','560','1057','Compte courant',NULL,NULL,1),(1059,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','561','1057','Chèques émis',NULL,NULL,1),(1060,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','57','1355','Caisses',NULL,NULL,1),(1061,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','570','1060','à 577 Caisses - espèces ( 0 - centrale ; 7 - succursales et agences)',NULL,NULL,1),(1062,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','578','1060','Caisses - timbres ( 0 - fiscaux ; 1 - postaux)',NULL,NULL,1),(1063,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','58','1355','Virements internes',NULL,NULL,1),(1064,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','60','1356','Approvisionnements et marchandises',NULL,NULL,1),(1065,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','600','1064','Achats de matières premières',NULL,NULL,1),(1066,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','601','1064','Achats de fournitures',NULL,NULL,1),(1067,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','602','1064','Achats de services, travaux et études',NULL,NULL,1),(1068,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','603','1064','Sous-traitances générales',NULL,NULL,1),(1069,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','604','1064','Achats de marchandises',NULL,NULL,1),(1070,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','605','1064','Achats d\'immeubles destinés à la revente',NULL,NULL,1),(1071,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','608','1064','Remises , ristournes et rabais obtenus sur achats',NULL,NULL,1),(1072,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','609','1064','Variations de stocks',NULL,NULL,1),(1073,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6090','1072','De matières premières',NULL,NULL,1),(1074,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6091','1072','De fournitures',NULL,NULL,1),(1075,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6094','1072','De marchandises',NULL,NULL,1),(1076,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6095','1072','d\'immeubles destinés à la vente',NULL,NULL,1),(1077,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61','1356','Services et biens divers',NULL,NULL,1),(1078,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','610','1077','Loyers et charges locatives',NULL,NULL,1),(1079,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6100','1078','Loyers divers',NULL,NULL,1),(1080,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6101','1078','Charges locatives (assurances, frais de confort,etc)',NULL,NULL,1),(1081,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','611','1077','Entretien et réparation (fournitures et prestations)',NULL,NULL,1),(1082,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','612','1077','Fournitures faites à l\'entreprise',NULL,NULL,1),(1083,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6120','1082','Eau, gaz, électricité, vapeur',NULL,NULL,1),(1084,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61200','1083','Eau',NULL,NULL,1),(1085,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61201','1083','Gaz',NULL,NULL,1),(1086,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61202','1083','Electricité',NULL,NULL,1),(1087,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61203','1083','Vapeur',NULL,NULL,1),(1088,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6121','1082','Téléphone, télégrammes, télex, téléfax, frais postaux',NULL,NULL,1),(1089,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61210','1088','Téléphone',NULL,NULL,1),(1090,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61211','1088','Télégrammes',NULL,NULL,1),(1091,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61212','1088','Télex et téléfax',NULL,NULL,1),(1092,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61213','1088','Frais postaux',NULL,NULL,1),(1093,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6122','1082','Livres, bibliothèque',NULL,NULL,1),(1094,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6123','1082','Imprimés et fournitures de bureau (si non comptabilisé au 601)',NULL,NULL,1),(1095,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','613','1077','Rétributions de tiers',NULL,NULL,1),(1096,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6130','1095','Redevances et royalties',NULL,NULL,1),(1097,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61300','1096','Redevances pour brevets, licences, marques et accessoires',NULL,NULL,1),(1098,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61301','1096','Autres redevances (procédés de fabrication)',NULL,NULL,1),(1099,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6131','1095','Assurances non relatives au personnel',NULL,NULL,1),(1100,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61310','1099','Assurance incendie',NULL,NULL,1),(1101,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61311','1099','Assurance vol',NULL,NULL,1),(1102,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61312','1099','Assurance autos',NULL,NULL,1),(1103,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61313','1099','Assurance crédit',NULL,NULL,1),(1104,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61314','1099','Assurances frais généraux',NULL,NULL,1),(1105,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6132','1095','Divers',NULL,NULL,1),(1106,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61320','1105','Commissions aux tiers',NULL,NULL,1),(1107,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61321','1105','Honoraires d\'avocats, d\'experts, etc',NULL,NULL,1),(1108,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61322','1105','Cotisations aux groupements professionnels',NULL,NULL,1),(1109,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61323','1105','Dons, libéralités, etc',NULL,NULL,1),(1110,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61324','1105','Frais de contentieux',NULL,NULL,1),(1111,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61325','1105','Publications légales',NULL,NULL,1),(1112,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6133','1095','Transports et déplacements',NULL,NULL,1),(1113,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61330','1112','Transports de personnel',NULL,NULL,1),(1114,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','61331','1112','Voyages, déplacements et représentations',NULL,NULL,1),(1115,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6134','1095','Personnel intérimaire',NULL,NULL,1),(1116,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','614','1077','Annonces, publicité, propagande et documentation',NULL,NULL,1),(1117,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6140','1116','Annonces et insertions',NULL,NULL,1),(1118,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6141','1116','Catalogues et imprimés',NULL,NULL,1),(1119,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6142','1116','Echantillons',NULL,NULL,1),(1120,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6143','1116','Foires et expositions',NULL,NULL,1),(1121,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6144','1116','Primes',NULL,NULL,1),(1122,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6145','1116','Cadeaux à la clientèle',NULL,NULL,1),(1123,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6146','1116','Missions et réceptions',NULL,NULL,1),(1124,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6147','1116','Documentation',NULL,NULL,1),(1125,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','615','1077','Sous-traitants',NULL,NULL,1),(1126,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6150','1125','Sous-traitants pour activités propres',NULL,NULL,1),(1127,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6151','1125','Sous-traitants d\'associations momentanées (coparticipants)',NULL,NULL,1),(1128,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6152','1125','Quote-part bénéficiaire des coparticipants',NULL,NULL,1),(1129,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','617','1077','Personnel intérimaire et personnes mises à la disposition de l\'entreprise',NULL,NULL,1),(1130,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','618','1077','Rémunérations, primes pour assurances extralégales, pensions de retraite et de survie des administrateurs, gérants et associés actifs qui ne sont pas attribuées en vertu d\'un contrat de travail',NULL,NULL,1),(1131,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62','1356','Rémunérations, charges sociales et pensions',NULL,NULL,1),(1132,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','620','1131','Rémunérations et avantages sociaux directs',NULL,NULL,1),(1133,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6200','1132','Administrateurs ou gérants',NULL,NULL,1),(1134,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6201','1132','Personnel de direction',NULL,NULL,1),(1135,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6202','1132','Employés',NULL,NULL,1),(1136,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6203','1132','Ouvriers',NULL,NULL,1),(1137,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6204','1132','Autres membres du personnel',NULL,NULL,1),(1138,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','621','1131','Cotisations patronales d\'assurances sociales',NULL,NULL,1),(1139,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6210','1138','Sur salaires',NULL,NULL,1),(1140,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6211','1138','Sur appointements et commissions',NULL,NULL,1),(1141,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','622','1131','Primes patronales pour assurances extralégales',NULL,NULL,1),(1142,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','623','1131','Autres frais de personnel',NULL,NULL,1),(1143,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6230','1142','Assurances du personnel',NULL,NULL,1),(1144,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62300','1143','Assurances loi, responsabilité civile, chemin du travail',NULL,NULL,1),(1145,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62301','1143','Assurance salaire garanti',NULL,NULL,1),(1146,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62302','1143','Assurances individuelles',NULL,NULL,1),(1147,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6231','1142','Charges sociales diverses',NULL,NULL,1),(1148,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62310','1147','Jours fériés payés',NULL,NULL,1),(1149,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62311','1147','Salaire hebdomadaire garanti',NULL,NULL,1),(1150,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62312','1147','Allocations familiales complémentaires',NULL,NULL,1),(1151,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6232','1142','Charges sociales des administrateurs, gérants et commissaires',NULL,NULL,1),(1152,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62320','1151','Allocations familiales complémentaires pour non salariés',NULL,NULL,1),(1153,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62321','1151','Lois sociales pour indépendants',NULL,NULL,1),(1154,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','62322','1151','Divers',NULL,NULL,1),(1155,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','624','1131','Pensions de retraite et de survie',NULL,NULL,1),(1156,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6240','1155','Administrateurs et gérants',NULL,NULL,1),(1157,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6241','1155','Personnel',NULL,NULL,1),(1158,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','625','1131','Provision pour pécule de vacances',NULL,NULL,1),(1159,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6250','1158','Dotations',NULL,NULL,1),(1160,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6251','1158','Utilisations et reprises',NULL,NULL,1),(1161,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','63','1356','Amortissements, réductions de valeur et provisions pour risques et charges',NULL,NULL,1),(1162,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','630','1161','Dotations aux amortissements et aux réductions de valeur sur immobilisations',NULL,NULL,1),(1163,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6300','1162','Dotations aux amortissements sur frais d\'établissement',NULL,NULL,1),(1164,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6301','1162','Dotations aux amortissements sur immobilisations incorporelles',NULL,NULL,1),(1165,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6302','1162','Dotations aux amortissements sur immobilisations corporelles',NULL,NULL,1),(1166,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6308','1162','Dotations aux réductions de valeur sur immobilisations incorporelles',NULL,NULL,1),(1167,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6309','1162','Dotations aux réductions de valeur sur immobilisations corporelles',NULL,NULL,1),(1168,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','631','1161','Réductions de valeur sur stocks',NULL,NULL,1),(1169,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6310','1168','Dotations',NULL,NULL,1),(1170,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6311','1168','Reprises',NULL,NULL,1),(1171,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','632','1161','Réductions de valeur sur commandes en cours d\'exécution',NULL,NULL,1),(1172,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6320','1171','Dotations',NULL,NULL,1),(1173,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6321','1171','Reprises',NULL,NULL,1),(1174,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','633','1161','Réductions de valeur sur créances commerciales à plus d\'un an',NULL,NULL,1),(1175,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6330','1174','Dotations',NULL,NULL,1),(1176,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6331','1174','Reprises',NULL,NULL,1),(1177,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','634','1161','Réductions de valeur sur créances commerciales à un an au plus',NULL,NULL,1),(1178,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6340','1177','Dotations',NULL,NULL,1),(1179,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6341','1177','Reprises',NULL,NULL,1),(1180,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','635','1161','Provisions pour pensions et obligations similaires',NULL,NULL,1),(1181,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6350','1180','Dotations',NULL,NULL,1),(1182,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6351','1180','Utilisations et reprises',NULL,NULL,1),(1183,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','636','11613','Provisions pour grosses réparations et gros entretiens',NULL,NULL,1),(1184,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6360','1183','Dotations',NULL,NULL,1),(1185,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6361','1183','Utilisations et reprises',NULL,NULL,1),(1186,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','637','1161','Provisions pour autres risques et charges',NULL,NULL,1),(1187,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6370','1186','Dotations',NULL,NULL,1),(1188,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6371','1186','Utilisations et reprises',NULL,NULL,1),(1189,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64','1356','Autres charges d\'exploitation',NULL,NULL,1),(1190,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','640','1189','Charges fiscales d\'exploitation',NULL,NULL,1),(1191,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6400','1190','Taxes et impôts directs',NULL,NULL,1),(1192,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64000','1191','Taxes sur autos et camions',NULL,NULL,1),(1193,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6401','1190','Taxes et impôts indirects',NULL,NULL,1),(1194,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64010','1193','Timbres fiscaux pris en charge par la firme',NULL,NULL,1),(1195,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64011','1193','Droits d\'enregistrement',NULL,NULL,1),(1196,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64012','1193','T.V.A. non déductible',NULL,NULL,1),(1197,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6402','1190','Impôts provinciaux et communaux',NULL,NULL,1),(1198,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64020','1197','Taxe sur la force motrice',NULL,NULL,1),(1199,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','64021','1197','Taxe sur le personnel occupé',NULL,NULL,1),(1200,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6403','1190','Taxes diverses',NULL,NULL,1),(1201,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','641','1189','Moins-values sur réalisations courantes d\'immobilisations corporelles',NULL,NULL,1),(1202,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','642','1189','Moins-values sur réalisations de créances commerciales',NULL,NULL,1),(1203,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','643','1189','à 648 Charges d\'exploitations diverses',NULL,NULL,1),(1204,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','649','1189','Charges d\'exploitation portées à l\'actif au titre de restructuration',NULL,NULL,1),(1205,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','65','1356','Charges financières',NULL,NULL,1),(1206,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','650','1205','Charges des dettes',NULL,NULL,1),(1207,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6500','1206','Intérêts, commissions et frais afférents aux dettes',NULL,NULL,1),(1208,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6501','1206','Amortissements des agios et frais d\'émission d\'emprunts',NULL,NULL,1),(1209,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6502','1206','Autres charges de dettes',NULL,NULL,1),(1210,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6503','1206','Intérêts intercalaires portés à l\'actif',NULL,NULL,1),(1211,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','651','1205','Réductions de valeur sur actifs circulants',NULL,NULL,1),(1212,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6510','1211','Dotations',NULL,NULL,1),(1213,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6511','1211','Reprises',NULL,NULL,1),(1214,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','652','1205','Moins-values sur réalisation d\'actifs circulants',NULL,NULL,1),(1215,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','653','1205','Charges d\'escompte de créances',NULL,NULL,1),(1216,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','654','1205','Différences de change',NULL,NULL,1),(1217,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','655','1205','Ecarts de conversion des devises',NULL,NULL,1),(1218,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','656','1205','Frais de banques, de chèques postaux',NULL,NULL,1),(1219,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','657','1205','Commissions sur ouvertures de crédit, cautions et avals',NULL,NULL,1),(1220,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','658','1205','Frais de vente des titres',NULL,NULL,1),(1221,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','66','1356','Charges exceptionnelles',NULL,NULL,1),(1222,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','660','1221','Amortissements et réductions de valeur exceptionnels',NULL,NULL,1),(1223,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6600','1222','Sur frais d\'établissement',NULL,NULL,1),(1224,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6601','1222','Sur immobilisations incorporelles',NULL,NULL,1),(1225,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6602','1222','Sur immobilisations corporelles',NULL,NULL,1),(1226,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','661','1221','Réductions de valeur sur immobilisations financières',NULL,NULL,1),(1227,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','662','1221','Provisions pour risques et charges exceptionnels',NULL,NULL,1),(1228,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','663','1221','Moins-values sur réalisation d\'actifs immobilisés',NULL,NULL,1),(1229,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6630','1228','Sur immobilisations incorporelles',NULL,NULL,1),(1230,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6631','1228','Sur immobilisations corporelles',NULL,NULL,1),(1231,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6632','1228','Sur immobilisations détenues en location-financement et droits similaires',NULL,NULL,1),(1232,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6633','1228','Sur immobilisations financières',NULL,NULL,1),(1233,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6634','1228','Sur immeubles acquis ou construits en vue de la revente',NULL,NULL,1),(1234,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','664','1221','à 668 Autres charges exceptionnelles',NULL,NULL,1),(1235,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','664','1221','Pénalités et amendes diverses',NULL,NULL,1),(1236,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','665','1221','Différence de charge',NULL,NULL,1),(1237,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','669','1221','Charges exceptionnelles transférées à l\'actif en frais de restructuration',NULL,NULL,1),(1238,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','67','1356','Impôts sur le résultat',NULL,NULL,1),(1239,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','670','1238','Impôts belges sur le résultat de l\'exercice',NULL,NULL,1),(1240,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6700','1239','Impôts et précomptes dus ou versés',NULL,NULL,1),(1241,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6701','1239','Excédent de versements d\'impôts et précomptes porté à l\'actif',NULL,NULL,1),(1242,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6702','1239','Charges fiscales estimées',NULL,NULL,1),(1243,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','671','1238','Impôts belges sur le résultat d\'exercices antérieurs',NULL,NULL,1),(1244,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6710','1243','Suppléments d\'impôts dus ou versés',NULL,NULL,1),(1245,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6711','1243','Suppléments d\'impôts estimés',NULL,NULL,1),(1246,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6712','1243','Provisions fiscales constituées',NULL,NULL,1),(1247,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','672','1238','Impôts étrangers sur le résultat de l\'exercice',NULL,NULL,1),(1248,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','673','1238','Impôts étrangers sur le résultat d\'exercices antérieurs',NULL,NULL,1),(1249,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','68','1356','Transferts aux réserves immunisées',NULL,NULL,1),(1250,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','69','1356','Affectation des résultats',NULL,NULL,1),(1251,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','690','1250','Perte reportée de l\'exercice précédent',NULL,NULL,1),(1252,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','691','1250','Dotation à la réserve légale',NULL,NULL,1),(1253,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','692','1250','Dotation aux autres réserves',NULL,NULL,1),(1254,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','693','1250','Bénéfice à reporter',NULL,NULL,1),(1255,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','694','1250','Rémunération du capital',NULL,NULL,1),(1256,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','695','1250','Administrateurs ou gérants',NULL,NULL,1),(1257,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','696','1250','Autres allocataires',NULL,NULL,1),(1258,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','70','1357','Chiffre d\'affaires',NULL,NULL,1),(1260,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','700','1258','Ventes de marchandises',NULL,NULL,1),(1261,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7000','1260','Ventes en Belgique',NULL,NULL,1),(1262,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7001','1260','Ventes dans les pays membres de la C.E.E.',NULL,NULL,1),(1263,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7002','1260','Ventes à l\'exportation',NULL,NULL,1),(1264,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','701','1258','Ventes de produits finis',NULL,NULL,1),(1265,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7010','1264','Ventes en Belgique',NULL,NULL,1),(1266,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7011','1264','Ventes dans les pays membres de la C.E.E.',NULL,NULL,1),(1267,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7012','1264','Ventes à l\'exportation',NULL,NULL,1),(1268,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','702','1258','Ventes de déchets et rebuts',NULL,NULL,1),(1269,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7020','1268','Ventes en Belgique',NULL,NULL,1),(1270,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7021','1268','Ventes dans les pays membres de la C.E.E.',NULL,NULL,1),(1271,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7022','1268','Ventes à l\'exportation',NULL,NULL,1),(1272,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','703','1258','Ventes d\'emballages récupérables',NULL,NULL,1),(1273,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','704','1258','Facturations des travaux en cours (associations momentanées)',NULL,NULL,1),(1274,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','705','1258','Prestations de services',NULL,NULL,1),(1275,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7050','1274','Prestations de services en Belgique',NULL,NULL,1),(1276,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7051','1274','Prestations de services dans les pays membres de la C.E.E.',NULL,NULL,1),(1277,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7052','1274','Prestations de services en vue de l\'exportation',NULL,NULL,1),(1278,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','706','1258','Pénalités et dédits obtenus par l\'entreprise',NULL,NULL,1),(1279,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','708','1258','Remises, ristournes et rabais accordés',NULL,NULL,1),(1280,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7080','1279','Sur ventes de marchandises',NULL,NULL,1),(1281,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7081','1279','Sur ventes de produits finis',NULL,NULL,1),(1282,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7082','1279','Sur ventes de déchets et rebuts',NULL,NULL,1),(1283,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7083','1279','Sur prestations de services',NULL,NULL,1),(1284,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7084','1279','Mali sur travaux facturés aux associations momentanées',NULL,NULL,1),(1285,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71','1357','Variation des stocks et des commandes en cours d\'exécution',NULL,NULL,1),(1286,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','712','1285','Des en cours de fabrication',NULL,NULL,1),(1287,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','713','1285','Des produits finis',NULL,NULL,1),(1288,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','715','1285','Des immeubles construits destinés à la vente',NULL,NULL,1),(1289,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','717','1285','Des commandes en cours d\'exécution',NULL,NULL,1),(1290,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7170','1289','Commandes en cours - Coût de revient',NULL,NULL,1),(1291,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71700','1290','Coût des commandes en cours d\'exécution',NULL,NULL,1),(1292,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71701','1290','Coût des travaux en cours des associations momentanées',NULL,NULL,1),(1293,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7171','1289','Bénéfices portés en compte sur commandes en cours',NULL,NULL,1),(1294,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71710','1293','Sur commandes en cours d\'exécution',NULL,NULL,1),(1295,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','71711','1293','Sur travaux en cours des associations momentanées',NULL,NULL,1),(1296,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','72','1357','Production immobilisée',NULL,NULL,1),(1297,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','720','1296','En frais d\'établissement',NULL,NULL,1),(1298,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','721','1296','En immobilisations incorporelles',NULL,NULL,1),(1299,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','722','1296','En immobilisations corporelles',NULL,NULL,1),(1300,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','723','1296','En immobilisations en cours',NULL,NULL,1),(1301,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','74','1357','Autres produits d\'exploitation',NULL,NULL,1),(1302,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','740','1301','Subsides d\'exploitation et montants compensatoires',NULL,NULL,1),(1303,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','741','1301','Plus-values sur réalisations courantes d\'immobilisations corporelles',NULL,NULL,1),(1304,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','742','1301','Plus-values sur réalisations de créances commerciales',NULL,NULL,1),(1305,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','743','1301','à 749 Produits d\'exploitation divers',NULL,NULL,1),(1306,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','743','1301','Produits de services exploités dans l\'intérêt du personnel',NULL,NULL,1),(1307,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','744','1301','Commissions et courtages',NULL,NULL,1),(1308,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','745','1301','Redevances pour brevets et licences',NULL,NULL,1),(1309,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','746','1301','Prestations de services (transports, études, etc)',NULL,NULL,1),(1310,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','747','1301','Revenus des immeubles affectés aux activités non professionnelles',NULL,NULL,1),(1311,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','748','1301','Locations diverses à caractère professionnel',NULL,NULL,1),(1312,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','749','1301','Produits divers',NULL,NULL,1),(1313,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7490','1312','Bonis sur reprises d\'emballages consignés',NULL,NULL,1),(1314,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7491','1312','Bonis sur travaux en associations momentanées',NULL,NULL,1),(1315,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','75','1357','Produits financiers',NULL,NULL,1),(1316,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','750','1315','Produits des immobilisations financières',NULL,NULL,1),(1317,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7500','1316','Revenus des actions',NULL,NULL,1),(1318,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7501','1316','Revenus des obligations',NULL,NULL,1),(1319,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7502','1316','Revenus des créances à plus d\'un an',NULL,NULL,1),(1320,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','751','1315','Produits des actifs circulants',NULL,NULL,1),(1321,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','752','1315','Plus-values sur réalisations d\'actifs circulants',NULL,NULL,1),(1322,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','753','1315','Subsides en capital et en intérêts',NULL,NULL,1),(1323,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','754','1315','Différences de change',NULL,NULL,1),(1324,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','755','1315','Ecarts de conversion des devises',NULL,NULL,1),(1325,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','756','1315','à 759 Produits financiers divers',NULL,NULL,1),(1326,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','756','1315','Produits des autres créances',NULL,NULL,1),(1327,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','757','1315','Escomptes obtenus',NULL,NULL,1),(1328,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','76','1357','Produits exceptionnels',NULL,NULL,1),(1329,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','760','1328','Reprises d\'amortissements et de réductions de valeur',NULL,NULL,1),(1330,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7600','1329','Sur immobilisations incorporelles',NULL,NULL,1),(1331,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7601','1329','Sur immobilisations corporelles',NULL,NULL,1),(1332,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','761','1328','Reprises de réductions de valeur sur immobilisations financières',NULL,NULL,1),(1333,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','762','1328','Reprises de provisions pour risques et charges exceptionnelles',NULL,NULL,1),(1334,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','763','1328','Plus-values sur réalisation d\'actifs immobilisés',NULL,NULL,1),(1335,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7630','1334','Sur immobilisations incorporelles',NULL,NULL,1),(1336,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7631','1334','Sur immobilisations corporelles',NULL,NULL,1),(1337,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7632','1334','Sur immobilisations financières',NULL,NULL,1),(1338,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','764','1328','Autres produits exceptionnels',NULL,NULL,1),(1339,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','77','1357','Régularisations d\'impôts et reprises de provisions fiscales',NULL,NULL,1),(1340,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','771','1339','Impôts belges sur le résultat',NULL,NULL,1),(1341,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7710','1340','Régularisations d\'impôts dus ou versés',NULL,NULL,1),(1342,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7711','1340','Régularisations d\'impôts estimés',NULL,NULL,1),(1343,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7712','1340','Reprises de provisions fiscales',NULL,NULL,1),(1344,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','773','1339','Impôts étrangers sur le résultat',NULL,NULL,1),(1345,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','79','1357','Affectation aux résultats',NULL,NULL,1),(1346,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','790','1345','Bénéfice reporté de l\'exercice précédent',NULL,NULL,1),(1347,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','791','1345','Prélèvement sur le capital et les primes d\'émission',NULL,NULL,1),(1348,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','792','1345','Prélèvement sur les réserves',NULL,NULL,1),(1349,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','793','1345','Perte à reporter',NULL,NULL,1),(1350,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','794','1345','Intervention d\'associés (ou du propriétaire) dans la perte',NULL,NULL,1),(1351,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CAPIT','XXXXXX','1','','Fonds propres, provisions pour risques et charges et dettes à plus d\'un an',NULL,NULL,1),(1352,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','IMMO','XXXXXX','2','','Frais d\'établissement. Actifs immobilisés et créances à plus d\'un an',NULL,NULL,1),(1353,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','STOCK','XXXXXX','3','','Stock et commandes en cours d\'exécution',NULL,NULL,1),(1354,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','TIERS','XXXXXX','4','','Créances et dettes à un an au plus',NULL,NULL,1),(1355,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','FINAN','XXXXXX','5','','Placement de trésorerie et de valeurs disponibles',NULL,NULL,1),(1356,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','CHARGE','XXXXXX','6','','Charges',NULL,NULL,1),(1357,1,NULL,'0000-00-00 00:00:00','PCMN-BASE','PROD','XXXXXX','7','','Produits',NULL,NULL,1),(1401,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CAPIT','XXXXXX','1','','Fonds propres, provisions pour risques et charges et dettes à plus d\'un an',NULL,NULL,1),(1402,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','IMMO','XXXXXX','2','','Frais d\'établissement. Actifs immobilisés et créances à plus d\'un an',NULL,NULL,1),(1403,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','STOCK','XXXXXX','3','','Stock et commandes en cours d\'exécution',NULL,NULL,1),(1404,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','TIERS','XXXXXX','4','','Créances et dettes à un an au plus',NULL,NULL,1),(1405,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','FINAN','XXXXXX','5','','Placement de trésorerie et de valeurs disponibles',NULL,NULL,1),(1406,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','CHARGE','XXXXXX','6','','Charges',NULL,NULL,1),(1407,1,NULL,'0000-00-00 00:00:00','PCG99-ABREGE','PROD','XXXXXX','7','','Produits',NULL,NULL,1),(1501,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CAPIT','XXXXXX','1','','Fonds propres, provisions pour risques et charges et dettes à plus d\'un an',NULL,NULL,1),(1502,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','IMMO','XXXXXX','2','','Frais d\'établissement. Actifs immobilisés et créances à plus d\'un an',NULL,NULL,1),(1503,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','STOCK','XXXXXX','3','','Stock et commandes en cours d\'exécution',NULL,NULL,1),(1504,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','TIERS','XXXXXX','4','','Créances et dettes à un an au plus',NULL,NULL,1),(1505,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','FINAN','XXXXXX','5','','Placement de trésorerie et de valeurs disponibles',NULL,NULL,1),(1506,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','CHARGE','XXXXXX','6','','Charges',NULL,NULL,1),(1507,1,NULL,'0000-00-00 00:00:00','PCG99-BASE','PROD','XXXXXX','7','','Produits',NULL,NULL,1),(4001,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1','','Financiación básica',NULL,NULL,1),(4002,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','ACTIVO','XXXXXX','2','','Activo no corriente',NULL,NULL,1),(4003,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','EXISTENCIAS','XXXXXX','3','','Existencias',NULL,NULL,1),(4004,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4','','Acreedores y deudores por operaciones comerciales',NULL,NULL,1),(4005,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5','','Cuentas financieras',NULL,NULL,1),(4006,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6','','Compras y gastos',NULL,NULL,1),(4007,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7','','Ventas e ingresos',NULL,NULL,1),(4008,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','10','4001','CAPITAL',NULL,NULL,1),(4009,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','100','4008','Capital social',NULL,NULL,1),(4010,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','101','4008','Fondo social',NULL,NULL,1),(4011,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','CAPITAL','102','4008','Capital',NULL,NULL,1),(4012,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','103','4008','Socios por desembolsos no exigidos',NULL,NULL,1),(4013,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1030','4012','Socios por desembolsos no exigidos capital social',NULL,NULL,1),(4014,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1034','4012','Socios por desembolsos no exigidos capital pendiente de inscripción',NULL,NULL,1),(4015,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','104','4008','Socios por aportaciones no dineradas pendientes',NULL,NULL,1),(4016,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1040','4015','Socios por aportaciones no dineradas pendientes capital social',NULL,NULL,1),(4017,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1044','4015','Socios por aportaciones no dineradas pendientes capital pendiente de inscripción',NULL,NULL,1),(4018,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','108','4008','Acciones o participaciones propias en situaciones especiales',NULL,NULL,1),(4019,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','109','4008','Acciones o participaciones propias para reducción de capital',NULL,NULL,1),(4020,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','11','4001','Reservas y otros instrumentos de patrimonio',NULL,NULL,1),(4021,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','110','4020','Prima de emisión o asunción',NULL,NULL,1),(4022,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','111','4020','Otros instrumentos de patrimonio neto',NULL,NULL,1),(4023,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1110','4022','Patrimonio neto por emisión de instrumentos financieros compuestos',NULL,NULL,1),(4024,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1111','4022','Resto de instrumentos de patrimoio neto',NULL,NULL,1),(4025,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','112','4020','Reserva legal',NULL,NULL,1),(4026,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','113','4020','Reservas voluntarias',NULL,NULL,1),(4027,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','114','4020','Reservas especiales',NULL,NULL,1),(4028,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1140','4027','Reservas para acciones o participaciones de la sociedad dominante',NULL,NULL,1),(4029,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1141','4027','Reservas estatutarias',NULL,NULL,1),(4030,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1142','4027','Reservas por capital amortizado',NULL,NULL,1),(4031,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1143','4027','Reservas por fondo de comercio',NULL,NULL,1),(4032,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1144','4028','Reservas por acciones propias aceptadas en garantía',NULL,NULL,1),(4033,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','115','4020','Reservas por pérdidas y ganancias actuariales y otros ajustes',NULL,NULL,1),(4034,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','118','4020','Aportaciones de socios o propietarios',NULL,NULL,1),(4035,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','119','4020','Diferencias por ajuste del capital a euros',NULL,NULL,1),(4036,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','12','4001','Resultados pendientes de aplicación',NULL,NULL,1),(4037,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','120','4036','Remanente',NULL,NULL,1),(4038,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','121','4036','Resultados negativos de ejercicios anteriores',NULL,NULL,1),(4039,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','129','4036','Resultado del ejercicio',NULL,NULL,1),(4040,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','13','4001','Subvenciones, donaciones y ajustes por cambio de valor',NULL,NULL,1),(4041,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','130','4040','Subvenciones oficiales de capital',NULL,NULL,1),(4042,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','131','4040','Donaciones y legados de capital',NULL,NULL,1),(4043,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','132','4040','Otras subvenciones, donaciones y legados',NULL,NULL,1),(4044,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','133','4040','Ajustes por valoración en activos financieros disponibles para la venta',NULL,NULL,1),(4045,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','134','4040','Operaciones de cobertura',NULL,NULL,1),(4046,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1340','4045','Cobertura de flujos de efectivo',NULL,NULL,1),(4047,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1341','4045','Cobertura de una inversión neta en un negocio extranjero',NULL,NULL,1),(4048,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','135','4040','Diferencias de conversión',NULL,NULL,1),(4049,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','136','4040','Ajustes por valoración en activos no corrientes y grupos enajenables de elementos mantenidos para la venta',NULL,NULL,1),(4050,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','137','4040','Ingresos fiscales a distribuir en varios ejercicios',NULL,NULL,1),(4051,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1370','4050','Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios',NULL,NULL,1),(4052,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1371','4050','Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios',NULL,NULL,1),(4053,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','14','4001','Provisiones',NULL,NULL,1),(4054,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','141','4053','Provisión para impuestos',NULL,NULL,1),(4055,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','142','4053','Provisión para otras responsabilidades',NULL,NULL,1),(4056,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','143','4053','Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado',NULL,NULL,1),(4057,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','145','4053','Provisión para actuaciones medioambientales',NULL,NULL,1),(4058,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','15','4001','Deudas a largo plazo con características especiales',NULL,NULL,1),(4059,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','150','4058','Acciones o participaciones a largo plazo consideradas como pasivos financieros',NULL,NULL,1),(4060,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','153','4058','Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4061,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1533','4060','Desembolsos no exigidos empresas del grupo',NULL,NULL,1),(4062,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1534','4060','Desembolsos no exigidos empresas asociadas',NULL,NULL,1),(4063,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1535','4060','Desembolsos no exigidos otras partes vinculadas',NULL,NULL,1),(4064,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1536','4060','Otros desembolsos no exigidos',NULL,NULL,1),(4065,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','154','4058','Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4066,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1543','4065','Aportaciones no dinerarias pendientes empresas del grupo',NULL,NULL,1),(4067,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1544','4065','Aportaciones no dinerarias pendientes empresas asociadas',NULL,NULL,1),(4068,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1545','4065','Aportaciones no dinerarias pendientes otras partes vinculadas',NULL,NULL,1),(4069,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1546','4065','Otras aportaciones no dinerarias pendientes',NULL,NULL,1),(4070,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','16','4001','Deudas a largo plazo con partes vinculadas',NULL,NULL,1),(4071,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','160','4070','Deudas a largo plazo con entidades de crédito vinculadas',NULL,NULL,1),(4072,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1603','4071','Deudas a largo plazo con entidades de crédito empresas del grupo',NULL,NULL,1),(4073,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1604','4071','Deudas a largo plazo con entidades de crédito empresas asociadas',NULL,NULL,1),(4074,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1605','4071','Deudas a largo plazo con otras entidades de crédito vinculadas',NULL,NULL,1),(4075,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','161','4070','Proveedores de inmovilizado a largo plazo partes vinculadas',NULL,NULL,1),(4076,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1613','4075','Proveedores de inmovilizado a largo plazo empresas del grupo',NULL,NULL,1),(4077,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1614','4075','Proveedores de inmovilizado a largo plazo empresas asociadas',NULL,NULL,1),(4078,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1615','4075','Proveedores de inmovilizado a largo plazo otras partes vinculadas',NULL,NULL,1),(4079,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','162','4070','Acreedores por arrendamiento financiero a largo plazo partes vinculadas',NULL,NULL,1),(4080,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1623','4079','Acreedores por arrendamiento financiero a largo plazo empresas del grupo',NULL,NULL,1),(4081,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1624','4080','Acreedores por arrendamiento financiero a largo plazo empresas asociadas',NULL,NULL,1),(4082,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1625','4080','Acreedores por arrendamiento financiero a largo plazo otras partes vinculadas',NULL,NULL,1),(4083,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','163','4070','Otras deudas a largo plazo con partes vinculadas',NULL,NULL,1),(4084,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1633','4083','Otras deudas a largo plazo empresas del grupo',NULL,NULL,1),(4085,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1634','4083','Otras deudas a largo plazo empresas asociadas',NULL,NULL,1),(4086,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','1635','4083','Otras deudas a largo plazo otras partes vinculadas',NULL,NULL,1),(4087,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','17','4001','Deudas a largo plazo por préstamos recibidos empresitos y otros conceptos',NULL,NULL,1),(4088,1,NULL,'2014-12-21 12:51:05','PCG08-PYME','FINANCIACION','XXXXXX','170','4087','Deudas a largo plazo con entidades de crédito',NULL,NULL,1),(4089,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','171','4087','Deudas a largo plazo',NULL,NULL,1),(4090,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','172','4087','Deudas a largo plazo transformables en suvbenciones donaciones y legados',NULL,NULL,1),(4091,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','173','4087','Proveedores de inmovilizado a largo plazo',NULL,NULL,1),(4092,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','174','4087','Acreedores por arrendamiento financiero a largo plazo',NULL,NULL,1),(4093,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','175','4087','Efectos a pagar a largo plazo',NULL,NULL,1),(4094,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','176','4087','Pasivos por derivados financieros a largo plazo',NULL,NULL,1),(4095,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','177','4087','Obligaciones y bonos',NULL,NULL,1),(4096,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','179','4087','Deudas representadas en otros valores negociables',NULL,NULL,1),(4097,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','18','4001','Pasivos por fianzas garantias y otros conceptos a largo plazo',NULL,NULL,1),(4098,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','180','4097','Fianzas recibidas a largo plazo',NULL,NULL,1),(4099,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','181','4097','Anticipos recibidos por ventas o prestaciones de servicios a largo plazo',NULL,NULL,1),(4100,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','185','4097','Depositos recibidos a largo plazo',NULL,NULL,1),(4101,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','19','4001','Situaciones transitorias de financiación',NULL,NULL,1),(4102,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','190','4101','Acciones o participaciones emitidas',NULL,NULL,1),(4103,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','192','4101','Suscriptores de acciones',NULL,NULL,1),(4104,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','194','4101','Capital emitido pendiente de inscripción',NULL,NULL,1),(4105,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','195','4101','Acciones o participaciones emitidas consideradas como pasivos financieros',NULL,NULL,1),(4106,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','197','4101','Suscriptores de acciones consideradas como pasivos financieros',NULL,NULL,1),(4107,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','FINANCIACION','XXXXXX','199','4101','Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción',NULL,NULL,1),(4108,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','20','4002','Inmovilizaciones intangibles',NULL,NULL,1),(4109,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','200','4108','Investigación',NULL,NULL,1),(4110,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','201','4108','Desarrollo',NULL,NULL,1),(4111,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','202','4108','Concesiones administrativas',NULL,NULL,1),(4112,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','203','4108','Propiedad industrial',NULL,NULL,1),(4113,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','205','4108','Derechos de transpaso',NULL,NULL,1),(4114,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','206','4108','Aplicaciones informáticas',NULL,NULL,1),(4115,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','209','4108','Anticipos para inmovilizaciones intangibles',NULL,NULL,1),(4116,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','21','4002','Inmovilizaciones materiales',NULL,NULL,1),(4117,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','210','4116','Terrenos y bienes naturales',NULL,NULL,1),(4118,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','211','4116','Construcciones',NULL,NULL,1),(4119,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','212','4116','Instalaciones técnicas',NULL,NULL,1),(4120,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','213','4116','Maquinaria',NULL,NULL,1),(4121,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','214','4116','Utillaje',NULL,NULL,1),(4122,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','215','4116','Otras instalaciones',NULL,NULL,1),(4123,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','216','4116','Mobiliario',NULL,NULL,1),(4124,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','217','4116','Equipos para procesos de información',NULL,NULL,1),(4125,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','218','4116','Elementos de transporte',NULL,NULL,1),(4126,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','219','4116','Otro inmovilizado material',NULL,NULL,1),(4127,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','22','4002','Inversiones inmobiliarias',NULL,NULL,1),(4128,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','220','4127','Inversiones en terreons y bienes naturales',NULL,NULL,1),(4129,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','221','4127','Inversiones en construcciones',NULL,NULL,1),(4130,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','23','4002','Inmovilizaciones materiales en curso',NULL,NULL,1),(4131,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','230','4130','Adaptación de terrenos y bienes naturales',NULL,NULL,1),(4132,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','231','4130','Construcciones en curso',NULL,NULL,1),(4133,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','232','4130','Instalaciones técnicas en montaje',NULL,NULL,1),(4134,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','233','4130','Maquinaria en montaje',NULL,NULL,1),(4135,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','237','4130','Equipos para procesos de información en montaje',NULL,NULL,1),(4136,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','239','4130','Anticipos para inmovilizaciones materiales',NULL,NULL,1),(4137,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','24','4002','Inversiones financieras a largo plazo en partes vinculadas',NULL,NULL,1),(4138,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','240','4137','Participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4139,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2403','4138','Participaciones a largo plazo en empresas del grupo',NULL,NULL,1),(4140,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2404','4138','Participaciones a largo plazo en empresas asociadas',NULL,NULL,1),(4141,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2405','4138','Participaciones a largo plazo en otras partes vinculadas',NULL,NULL,1),(4142,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','241','4137','Valores representativos de deuda a largo plazo de partes vinculadas',NULL,NULL,1),(4143,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2413','4142','Valores representativos de deuda a largo plazo de empresas del grupo',NULL,NULL,1),(4144,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2414','4142','Valores representativos de deuda a largo plazo de empresas asociadas',NULL,NULL,1),(4145,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2415','4142','Valores representativos de deuda a largo plazo de otras partes vinculadas',NULL,NULL,1),(4146,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','242','4137','Créditos a largo plazo a partes vinculadas',NULL,NULL,1),(4147,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2423','4146','Créditos a largo plazo a empresas del grupo',NULL,NULL,1),(4148,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2424','4146','Créditos a largo plazo a empresas asociadas',NULL,NULL,1),(4149,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2425','4146','Créditos a largo plazo a otras partes vinculadas',NULL,NULL,1),(4150,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','249','4137','Desembolsos pendientes sobre participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4151,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2493','4150','Desembolsos pendientes sobre participaciones a largo plazo en empresas del grupo',NULL,NULL,1),(4152,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2494','4150','Desembolsos pendientes sobre participaciones a largo plazo en empresas asociadas',NULL,NULL,1),(4153,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2495','4150','Desembolsos pendientes sobre participaciones a largo plazo en otras partes vinculadas',NULL,NULL,1),(4154,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','25','4002','Otras inversiones financieras a largo plazo',NULL,NULL,1),(4155,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','250','4154','Inversiones financieras a largo plazo en instrumentos de patrimonio',NULL,NULL,1),(4156,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','251','4154','Valores representativos de deuda a largo plazo',NULL,NULL,1),(4157,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','252','4154','Créditos a largo plazo',NULL,NULL,1),(4158,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','253','4154','Créditos a largo plazo por enajenación de inmovilizado',NULL,NULL,1),(4159,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','254','4154','Créditos a largo plazo al personal',NULL,NULL,1),(4160,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','255','4154','Activos por derivados financieros a largo plazo',NULL,NULL,1),(4161,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','258','4154','Imposiciones a largo plazo',NULL,NULL,1),(4162,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','259','4154','Desembolsos pendientes sobre participaciones en el patrimonio neto a largo plazo',NULL,NULL,1),(4163,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','26','4002','Fianzas y depósitos constituidos a largo plazo',NULL,NULL,1),(4164,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','260','4163','Fianzas constituidas a largo plazo',NULL,NULL,1),(4165,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','261','4163','Depósitos constituidos a largo plazo',NULL,NULL,1),(4166,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','28','4002','Amortización acumulada del inmovilizado',NULL,NULL,1),(4167,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','280','4166','Amortización acumulado del inmovilizado intangible',NULL,NULL,1),(4168,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2800','4167','Amortización acumulada de investigación',NULL,NULL,1),(4169,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2801','4167','Amortización acumulada de desarrollo',NULL,NULL,1),(4170,1,NULL,'2014-12-21 12:51:06','PCG08-PYME','ACTIVO','XXXXXX','2802','4167','Amortización acumulada de concesiones administrativas',NULL,NULL,1),(4171,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2803','4167','Amortización acumulada de propiedad industrial',NULL,NULL,1),(4172,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2805','4167','Amortización acumulada de derechos de transpaso',NULL,NULL,1),(4173,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2806','4167','Amortización acumulada de aplicaciones informáticas',NULL,NULL,1),(4174,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','281','4166','Amortización acumulado del inmovilizado material',NULL,NULL,1),(4175,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2811','4174','Amortización acumulada de construcciones',NULL,NULL,1),(4176,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2812','4174','Amortización acumulada de instalaciones técnicas',NULL,NULL,1),(4177,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2813','4174','Amortización acumulada de maquinaria',NULL,NULL,1),(4178,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2814','4174','Amortización acumulada de utillaje',NULL,NULL,1),(4179,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2815','4174','Amortización acumulada de otras instalaciones',NULL,NULL,1),(4180,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2816','4174','Amortización acumulada de mobiliario',NULL,NULL,1),(4181,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2817','4174','Amortización acumulada de equipos para proceso de información',NULL,NULL,1),(4182,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2818','4174','Amortización acumulada de elementos de transporte',NULL,NULL,1),(4183,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2819','4175','Amortización acumulada de otro inmovilizado material',NULL,NULL,1),(4184,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','282','4166','Amortización acumulada de las inversiones inmobiliarias',NULL,NULL,1),(4185,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','29','4002','Deterioro de valor de activos no corrientes',NULL,NULL,1),(4186,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','290','4185','Deterioro de valor del inmovilizado intangible',NULL,NULL,1),(4187,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2900','4186','Deterioro de valor de investigación',NULL,NULL,1),(4188,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2901','4186','Deterioro de valor de desarrollo',NULL,NULL,1),(4189,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2902','4186','Deterioro de valor de concesiones administrativas',NULL,NULL,1),(4190,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2903','4186','Deterioro de valor de propiedad industrial',NULL,NULL,1),(4191,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2905','4186','Deterioro de valor de derechos de transpaso',NULL,NULL,1),(4192,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2906','4186','Deterioro de valor de aplicaciones informáticas',NULL,NULL,1),(4193,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','291','4185','Deterioro de valor del inmovilizado material',NULL,NULL,1),(4194,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2910','4193','Deterioro de valor de terrenos y bienes naturales',NULL,NULL,1),(4195,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2911','4193','Deterioro de valor de construcciones',NULL,NULL,1),(4196,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2912','4193','Deterioro de valor de instalaciones técnicas',NULL,NULL,1),(4197,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2913','4193','Deterioro de valor de maquinaria',NULL,NULL,1),(4198,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2914','4193','Deterioro de valor de utillajes',NULL,NULL,1),(4199,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2915','4194','Deterioro de valor de otras instalaciones',NULL,NULL,1),(4200,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2916','4194','Deterioro de valor de mobiliario',NULL,NULL,1),(4201,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2917','4194','Deterioro de valor de equipos para proceso de información',NULL,NULL,1),(4202,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2918','4194','Deterioro de valor de elementos de transporte',NULL,NULL,1),(4203,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2919','4194','Deterioro de valor de otro inmovilizado material',NULL,NULL,1),(4204,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','292','4185','Deterioro de valor de las inversiones inmobiliarias',NULL,NULL,1),(4205,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2920','4204','Deterioro de valor de terrenos y bienes naturales',NULL,NULL,1),(4206,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2921','4204','Deterioro de valor de construcciones',NULL,NULL,1),(4207,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','293','4185','Deterioro de valor de participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4208,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2933','4207','Deterioro de valor de participaciones a largo plazo en empresas del grupo',NULL,NULL,1),(4209,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2934','4207','Deterioro de valor de sobre participaciones a largo plazo en empresas asociadas',NULL,NULL,1),(4210,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2935','4207','Deterioro de valor de sobre participaciones a largo plazo en otras partes vinculadas',NULL,NULL,1),(4211,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','294','4185','Deterioro de valor de valores representativos de deuda a largo plazo en partes vinculadas',NULL,NULL,1),(4212,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2943','4211','Deterioro de valor de valores representativos de deuda a largo plazo en empresas del grupo',NULL,NULL,1),(4213,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2944','4211','Deterioro de valor de valores representativos de deuda a largo plazo en empresas asociadas',NULL,NULL,1),(4214,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2945','4211','Deterioro de valor de valores representativos de deuda a largo plazo en otras partes vinculadas',NULL,NULL,1),(4215,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','295','4185','Deterioro de valor de créditos a largo plazo a partes vinculadas',NULL,NULL,1),(4216,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2953','4215','Deterioro de valor de créditos a largo plazo a empresas del grupo',NULL,NULL,1),(4217,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2954','4215','Deterioro de valor de créditos a largo plazo a empresas asociadas',NULL,NULL,1),(4218,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','2955','4215','Deterioro de valor de créditos a largo plazo a otras partes vinculadas',NULL,NULL,1),(4219,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','296','4185','Deterioro de valor de participaciones en el patrimonio netoa largo plazo',NULL,NULL,1),(4220,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','297','4185','Deterioro de valor de valores representativos de deuda a largo plazo',NULL,NULL,1),(4221,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACTIVO','XXXXXX','298','4185','Deterioro de valor de créditos a largo plazo',NULL,NULL,1),(4222,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','30','4003','Comerciales',NULL,NULL,1),(4223,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','300','4222','Mercaderías A',NULL,NULL,1),(4224,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','301','4222','Mercaderías B',NULL,NULL,1),(4225,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','31','4003','Materias primas',NULL,NULL,1),(4226,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','310','4225','Materias primas A',NULL,NULL,1),(4227,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','311','4225','Materias primas B',NULL,NULL,1),(4228,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','32','4003','Otros aprovisionamientos',NULL,NULL,1),(4229,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','320','4228','Elementos y conjuntos incorporables',NULL,NULL,1),(4230,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','321','4228','Combustibles',NULL,NULL,1),(4231,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','322','4228','Repuestos',NULL,NULL,1),(4232,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','325','4228','Materiales diversos',NULL,NULL,1),(4233,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','326','4228','Embalajes',NULL,NULL,1),(4234,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','327','4228','Envases',NULL,NULL,1),(4235,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','328','4229','Material de oficina',NULL,NULL,1),(4236,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','33','4003','Productos en curso',NULL,NULL,1),(4237,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','330','4236','Productos en curos A',NULL,NULL,1),(4238,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','331','4236','Productos en curso B',NULL,NULL,1),(4239,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','34','4003','Productos semiterminados',NULL,NULL,1),(4240,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','340','4239','Productos semiterminados A',NULL,NULL,1),(4241,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','341','4239','Productos semiterminados B',NULL,NULL,1),(4242,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','35','4003','Productos terminados',NULL,NULL,1),(4243,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','350','4242','Productos terminados A',NULL,NULL,1),(4244,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','351','4242','Productos terminados B',NULL,NULL,1),(4245,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','36','4003','Subproductos, residuos y materiales recuperados',NULL,NULL,1),(4246,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','360','4245','Subproductos A',NULL,NULL,1),(4247,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','361','4245','Subproductos B',NULL,NULL,1),(4248,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','365','4245','Residuos A',NULL,NULL,1),(4249,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','366','4245','Residuos B',NULL,NULL,1),(4250,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','368','4245','Materiales recuperados A',NULL,NULL,1),(4251,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','369','4245','Materiales recuperados B',NULL,NULL,1),(4252,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','39','4003','Deterioro de valor de las existencias',NULL,NULL,1),(4253,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','390','4252','Deterioro de valor de las mercaderías',NULL,NULL,1),(4254,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','391','4252','Deterioro de valor de las materias primas',NULL,NULL,1),(4255,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','392','4252','Deterioro de valor de otros aprovisionamientos',NULL,NULL,1),(4256,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','393','4252','Deterioro de valor de los productos en curso',NULL,NULL,1),(4257,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','394','4252','Deterioro de valor de los productos semiterminados',NULL,NULL,1),(4258,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','395','4252','Deterioro de valor de los productos terminados',NULL,NULL,1),(4259,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','EXISTENCIAS','XXXXXX','396','4252','Deterioro de valor de los subproductos, residuos y materiales recuperados',NULL,NULL,1),(4260,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','PROVEEDORES','40','4004','Proveedores',NULL,NULL,1),(4261,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','PROVEEDORES','400','4260','Proveedores',NULL,NULL,1),(4262,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4000','4261','Proveedores euros',NULL,NULL,1),(4263,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4004','4261','Proveedores moneda extranjera',NULL,NULL,1),(4264,1,NULL,'2014-12-21 12:51:07','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4009','4261','Proveedores facturas pendientes de recibir o formalizar',NULL,NULL,1),(4265,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','401','4260','Proveedores efectos comerciales a pagar',NULL,NULL,1),(4266,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','403','4260','Proveedores empresas del grupo',NULL,NULL,1),(4267,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4030','4266','Proveedores empresas del grupo euros',NULL,NULL,1),(4268,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4031','4266','Efectos comerciales a pagar empresas del grupo',NULL,NULL,1),(4269,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4034','4266','Proveedores empresas del grupo moneda extranjera',NULL,NULL,1),(4270,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4036','4266','Envases y embalajes a devolver a proveedores empresas del grupo',NULL,NULL,1),(4271,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4039','4266','Proveedores empresas del grupo facturas pendientes de recibir o de formalizar',NULL,NULL,1),(4272,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','404','4260','Proveedores empresas asociadas',NULL,NULL,1),(4273,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','405','4260','Proveedores otras partes vinculadas',NULL,NULL,1),(4274,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','406','4260','Envases y embalajes a devolver a proveedores',NULL,NULL,1),(4275,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','407','4260','Anticipos a proveedores',NULL,NULL,1),(4276,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','41','4004','Acreedores varios',NULL,NULL,1),(4277,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','410','4276','Acreedores por prestaciones de servicios',NULL,NULL,1),(4278,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4100','4277','Acreedores por prestaciones de servicios euros',NULL,NULL,1),(4279,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4104','4277','Acreedores por prestaciones de servicios moneda extranjera',NULL,NULL,1),(4280,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4109','4277','Acreedores por prestaciones de servicios facturas pendientes de recibir o formalizar',NULL,NULL,1),(4281,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','411','4276','Acreedores efectos comerciales a pagar',NULL,NULL,1),(4282,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','419','4276','Acreedores por operaciones en común',NULL,NULL,1),(4283,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','CLIENTES','43','4004','Clientes',NULL,NULL,1),(4284,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','CLIENTES','430','4283','Clientes',NULL,NULL,1),(4285,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4300','4284','Clientes euros',NULL,NULL,1),(4286,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4304','4284','Clientes moneda extranjera',NULL,NULL,1),(4287,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4309','4284','Clientes facturas pendientes de formalizar',NULL,NULL,1),(4288,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','431','4283','Clientes efectos comerciales a cobrar',NULL,NULL,1),(4289,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4310','4288','Efectos comerciales en cartera',NULL,NULL,1),(4290,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4311','4288','Efectos comerciales descontados',NULL,NULL,1),(4291,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4312','4288','Efectos comerciales en gestión de cobro',NULL,NULL,1),(4292,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4315','4288','Efectos comerciales impagados',NULL,NULL,1),(4293,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','432','4283','Clientes operaciones de factoring',NULL,NULL,1),(4294,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','433','4283','Clientes empresas del grupo',NULL,NULL,1),(4295,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4330','4294','Clientes empresas del grupo euros',NULL,NULL,1),(4296,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4331','4294','Efectos comerciales a cobrar empresas del grupo',NULL,NULL,1),(4297,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4332','4294','Clientes empresas del grupo operaciones de factoring',NULL,NULL,1),(4298,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4334','4294','Clientes empresas del grupo moneda extranjera',NULL,NULL,1),(4299,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4336','4294','Clientes empresas del grupo dudoso cobro',NULL,NULL,1),(4300,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4337','4294','Envases y embalajes a devolver a clientes empresas del grupo',NULL,NULL,1),(4301,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4339','4294','Clientes empresas del grupo facturas pendientes de formalizar',NULL,NULL,1),(4302,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','434','4283','Clientes empresas asociadas',NULL,NULL,1),(4303,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','435','4283','Clientes otras partes vinculadas',NULL,NULL,1),(4304,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','436','4283','Clientes de dudoso cobro',NULL,NULL,1),(4305,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','437','4283','Envases y embalajes a devolver por clientes',NULL,NULL,1),(4306,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','438','4283','Anticipos de clientes',NULL,NULL,1),(4307,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','44','4004','Deudores varios',NULL,NULL,1),(4308,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','440','4307','Deudores',NULL,NULL,1),(4309,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4400','4308','Deudores euros',NULL,NULL,1),(4310,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4404','4308','Deudores moneda extranjera',NULL,NULL,1),(4311,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4409','4308','Deudores facturas pendientes de formalizar',NULL,NULL,1),(4312,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','441','4307','Deudores efectos comerciales a cobrar',NULL,NULL,1),(4313,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4410','4312','Deudores efectos comerciales en cartera',NULL,NULL,1),(4314,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4411','4312','Deudores efectos comerciales descontados',NULL,NULL,1),(4315,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4412','4312','Deudores efectos comerciales en gestión de cobro',NULL,NULL,1),(4316,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4415','4312','Deudores efectos comerciales impagados',NULL,NULL,1),(4317,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','446','4307','Deudores de dusoso cobro',NULL,NULL,1),(4318,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','449','4307','Deudores por operaciones en común',NULL,NULL,1),(4319,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','46','4004','Personal',NULL,NULL,1),(4320,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','460','4319','Anticipos de renumeraciones',NULL,NULL,1),(4321,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','465','4319','Renumeraciones pendientes de pago',NULL,NULL,1),(4322,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','47','4004','Administraciones Públicas',NULL,NULL,1),(4323,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','470','4322','Hacienda Pública deudora por diversos conceptos',NULL,NULL,1),(4324,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4700','4323','Hacienda Pública deudora por IVA',NULL,NULL,1),(4325,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4708','4323','Hacienda Pública deudora por subvenciones concedidas',NULL,NULL,1),(4326,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4709','4323','Hacienda Pública deudora por devolución de impuestos',NULL,NULL,1),(4327,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','471','4322','Organismos de la Seguridad Social deudores',NULL,NULL,1),(4328,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','472','4322','Hacienda Pública IVA soportado',NULL,NULL,1),(4329,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','473','4322','Hacienda Pública retenciones y pagos a cuenta',NULL,NULL,1),(4330,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','474','4322','Activos por impuesto diferido',NULL,NULL,1),(4331,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4740','4330','Activos por diferencias temporarias deducibles',NULL,NULL,1),(4332,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4742','4330','Derechos por deducciones y bonificaciones pendientes de aplicar',NULL,NULL,1),(4333,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4745','4330','Crédito por pérdidasa compensar del ejercicio',NULL,NULL,1),(4334,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','475','4322','Hacienda Pública acreedora por conceptos fiscales',NULL,NULL,1),(4335,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4750','4334','Hacienda Pública acreedora por IVA',NULL,NULL,1),(4336,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4751','4334','Hacienda Pública acreedora por retenciones practicadas',NULL,NULL,1),(4337,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4752','4334','Hacienda Pública acreedora por impuesto sobre sociedades',NULL,NULL,1),(4338,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4758','4334','Hacienda Pública acreedora por subvenciones a integrar',NULL,NULL,1),(4339,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','476','4322','Organismos de la Seguridad Social acreedores',NULL,NULL,1),(4340,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','477','4322','Hacienda Pública IVA repercutido',NULL,NULL,1),(4341,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','479','4322','Pasivos por diferencias temporarias imponibles',NULL,NULL,1),(4342,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','48','4004','Ajustes por periodificación',NULL,NULL,1),(4343,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','480','4342','Gastos anticipados',NULL,NULL,1),(4344,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','485','4342','Ingresos anticipados',NULL,NULL,1),(4345,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','49','4004','Deterioro de valor de créditos comerciales y provisiones a corto plazo',NULL,NULL,1),(4346,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','490','4345','Deterioro de valor de créditos por operaciones comerciales',NULL,NULL,1),(4347,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','493','4345','Deterioro de valor de créditos por operaciones comerciales con partes vinculadas',NULL,NULL,1),(4348,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4933','4347','Deterioro de valor de créditos por operaciones comerciales con empresas del grupo',NULL,NULL,1),(4349,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4934','4347','Deterioro de valor de créditos por operaciones comerciales con empresas asociadas',NULL,NULL,1),(4350,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4935','4347','Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas',NULL,NULL,1),(4351,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','499','4345','Provisiones por operaciones comerciales',NULL,NULL,1),(4352,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4994','4351','Provisión para contratos anerosos',NULL,NULL,1),(4353,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','ACREEDORES_DEUDORES','XXXXXX','4999','4351','Provisión para otras operaciones comerciales',NULL,NULL,1),(4354,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','50','4005','Emprésitos deudas con características especiales y otras emisiones análogas a corto plazo',NULL,NULL,1),(4355,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','500','4354','Obligaciones y bonos a corto plazo',NULL,NULL,1),(4356,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','502','4354','Acciones o participaciones a corto plazo consideradas como pasivos financieros',NULL,NULL,1),(4357,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','505','4354','Deudas representadas en otros valores negociables a corto plazo',NULL,NULL,1),(4358,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','506','4354','Intereses a corto plazo de emprésitos y otras emisiones analógicas',NULL,NULL,1),(4359,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','507','4354','Dividendos de acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4360,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','509','4354','Valores negociables amortizados',NULL,NULL,1),(4361,1,NULL,'2014-12-21 12:51:08','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5090','4360','Obligaciones y bonos amortizados',NULL,NULL,1),(4362,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5095','4360','Otros valores negociables amortizados',NULL,NULL,1),(4363,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','51','4005','Deudas a corto plazo con partes vinculadas',NULL,NULL,1),(4364,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','510','4363','Deudas a corto plazo con entidades de crédito vinculadas',NULL,NULL,1),(4365,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5103','4364','Deudas a corto plazo con entidades de crédito empresas del grupo',NULL,NULL,1),(4366,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5104','4364','Deudas a corto plazo con entidades de crédito empresas asociadas',NULL,NULL,1),(4367,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5105','4364','Deudas a corto plazo con otras entidades de crédito vinculadas',NULL,NULL,1),(4368,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','511','4363','Proveedores de inmovilizado a corto plazo partes vinculadas',NULL,NULL,1),(4369,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5113','4368','Proveedores de inmovilizado a corto plazo empresas del grupo',NULL,NULL,1),(4370,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5114','4368','Proveedores de inmovilizado a corto plazo empresas asociadas',NULL,NULL,1),(4371,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5115','4368','Proveedores de inmovilizado a corto plazo otras partes vinculadas',NULL,NULL,1),(4372,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','512','4363','Acreedores por arrendamiento financiero a corto plazo partes vinculadas',NULL,NULL,1),(4373,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5123','4372','Acreedores por arrendamiento financiero a corto plazo empresas del grupo',NULL,NULL,1),(4374,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5124','4372','Acreedores por arrendamiento financiero a corto plazo empresas asociadas',NULL,NULL,1),(4375,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5125','4372','Acreedores por arrendamiento financiero a corto plazo otras partes vinculadas',NULL,NULL,1),(4376,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','513','4363','Otras deudas a corto plazo con partes vinculadas',NULL,NULL,1),(4377,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5133','4376','Otras deudas a corto plazo con empresas del grupo',NULL,NULL,1),(4378,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5134','4376','Otras deudas a corto plazo con empresas asociadas',NULL,NULL,1),(4379,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5135','4376','Otras deudas a corto plazo con partes vinculadas',NULL,NULL,1),(4380,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','514','4363','Intereses a corto plazo con partes vinculadas',NULL,NULL,1),(4381,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5143','4380','Intereses a corto plazo empresas del grupo',NULL,NULL,1),(4382,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5144','4380','Intereses a corto plazo empresas asociadas',NULL,NULL,1),(4383,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5145','4380','Intereses deudas a corto plazo partes vinculadas',NULL,NULL,1),(4384,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','52','4005','Deudas a corto plazo por préstamos recibidos y otros conceptos',NULL,NULL,1),(4385,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','520','4384','Deudas a corto plazo con entidades de crédito',NULL,NULL,1),(4386,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5200','4385','Préstamos a corto plazo de entidades de crédito',NULL,NULL,1),(4387,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5201','4385','Deudas a corto plazo por crédito dispuesto',NULL,NULL,1),(4388,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5208','4385','Deudas por efectos descontados',NULL,NULL,1),(4389,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5209','4385','Deudas por operaciones de factoring',NULL,NULL,1),(4390,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','521','4384','Deudas a corto plazo',NULL,NULL,1),(4391,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','522','4384','Deudas a corto plazo transformables en subvenciones donaciones y legados',NULL,NULL,1),(4392,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','523','4384','Proveedores de inmovilizado a corto plazo',NULL,NULL,1),(4393,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','526','4384','Dividendo activo a pagar',NULL,NULL,1),(4394,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','527','4384','Intereses a corto plazo de deudas con entidades de crédito',NULL,NULL,1),(4395,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','528','4384','Intereses a corto plazo de deudas',NULL,NULL,1),(4396,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','529','4384','Provisiones a corto plazo',NULL,NULL,1),(4397,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5291','4396','Provisión a corto plazo para impuestos',NULL,NULL,1),(4398,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5292','4396','Provisión a corto plazo para otras responsabilidades',NULL,NULL,1),(4399,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5293','4396','Provisión a corto plazo por desmantelamiento retiro o rehabilitación del inmovilizado',NULL,NULL,1),(4400,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5295','4396','Provisión a corto plazo para actuaciones medioambientales',NULL,NULL,1),(4401,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','53','4005','Inversiones financieras a corto plazo en partes vinculadas',NULL,NULL,1),(4402,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','530','4401','Participaciones a corto plazo en partes vinculadas',NULL,NULL,1),(4403,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5303','4402','Participaciones a corto plazo en empresas del grupo',NULL,NULL,1),(4404,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5304','4402','Participaciones a corto plazo en empresas asociadas',NULL,NULL,1),(4405,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5305','4402','Participaciones a corto plazo en otras partes vinculadas',NULL,NULL,1),(4406,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','531','4401','Valores representativos de deuda a corto plazo de partes vinculadas',NULL,NULL,1),(4407,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5313','4406','Valores representativos de deuda a corto plazo de empresas del grupo',NULL,NULL,1),(4408,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5314','4406','Valores representativos de deuda a corto plazo de empresas asociadas',NULL,NULL,1),(4409,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5315','4406','Valores representativos de deuda a corto plazo de otras partes vinculadas',NULL,NULL,1),(4410,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','532','4401','Créditos a corto plazo a partes vinculadas',NULL,NULL,1),(4411,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5323','4410','Créditos a corto plazo a empresas del grupo',NULL,NULL,1),(4412,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5324','4410','Créditos a corto plazo a empresas asociadas',NULL,NULL,1),(4413,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5325','4410','Créditos a corto plazo a otras partes vinculadas',NULL,NULL,1),(4414,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','533','4401','Intereses a corto plazo de valores representativos de deuda de partes vinculadas',NULL,NULL,1),(4415,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5333','4414','Intereses a corto plazo de valores representativos de deuda en empresas del grupo',NULL,NULL,1),(4416,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5334','4414','Intereses a corto plazo de valores representativos de deuda en empresas asociadas',NULL,NULL,1),(4417,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5335','4414','Intereses a corto plazo de valores representativos de deuda en otras partes vinculadas',NULL,NULL,1),(4418,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','534','4401','Intereses a corto plazo de créditos a partes vinculadas',NULL,NULL,1),(4419,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5343','4418','Intereses a corto plazo de créditos a empresas del grupo',NULL,NULL,1),(4420,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5344','4418','Intereses a corto plazo de créditos a empresas asociadas',NULL,NULL,1),(4421,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5345','4418','Intereses a corto plazo de créditos a otras partes vinculadas',NULL,NULL,1),(4422,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','535','4401','Dividendo a cobrar de inversiones financieras en partes vinculadas',NULL,NULL,1),(4423,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5353','4422','Dividendo a cobrar de empresas del grupo',NULL,NULL,1),(4424,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5354','4422','Dividendo a cobrar de empresas asociadas',NULL,NULL,1),(4425,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5355','4422','Dividendo a cobrar de otras partes vinculadas',NULL,NULL,1),(4426,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','539','4401','Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas',NULL,NULL,1),(4427,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5393','4426','Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo',NULL,NULL,1),(4428,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5394','4426','Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas',NULL,NULL,1),(4429,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5395','4426','Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas',NULL,NULL,1),(4430,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','54','4005','Otras inversiones financieras a corto plazo',NULL,NULL,1),(4431,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','540','4430','Inversiones financieras a corto plazo en instrumentos de patrimonio',NULL,NULL,1),(4432,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','541','4430','Valores representativos de deuda a corto plazo',NULL,NULL,1),(4433,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','542','4430','Créditos a corto plazo',NULL,NULL,1),(4434,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','543','4430','Créditos a corto plazo por enejenación de inmovilizado',NULL,NULL,1),(4435,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','544','4430','Créditos a corto plazo al personal',NULL,NULL,1),(4436,1,NULL,'2014-12-21 12:51:09','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','545','4430','Dividendo a cobrar',NULL,NULL,1),(4437,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','546','4430','Intereses a corto plazo de valores reprsentativos de deuda',NULL,NULL,1),(4438,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','547','4430','Intereses a corto plazo de créditos',NULL,NULL,1),(4439,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','548','4430','Imposiciones a corto plazo',NULL,NULL,1),(4440,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','549','4430','Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo',NULL,NULL,1),(4441,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','55','4005','Otras cuentas no bancarias',NULL,NULL,1),(4442,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','550','4441','Titular de la explotación',NULL,NULL,1),(4443,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','551','4441','Cuenta corriente con socios y administradores',NULL,NULL,1),(4444,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','552','4441','Cuenta corriente otras personas y entidades vinculadas',NULL,NULL,1),(4445,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5523','4444','Cuenta corriente con empresas del grupo',NULL,NULL,1),(4446,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5524','4444','Cuenta corriente con empresas asociadas',NULL,NULL,1),(4447,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5525','4444','Cuenta corriente con otras partes vinculadas',NULL,NULL,1),(4448,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','554','4441','Cuenta corriente con uniones temporales de empresas y comunidades de bienes',NULL,NULL,1),(4449,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','555','4441','Partidas pendientes de aplicación',NULL,NULL,1),(4450,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','556','4441','Desembolsos exigidos sobre participaciones en el patrimonio neto',NULL,NULL,1),(4451,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5563','4450','Desembolsos exigidos sobre participaciones empresas del grupo',NULL,NULL,1),(4452,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5564','4450','Desembolsos exigidos sobre participaciones empresas asociadas',NULL,NULL,1),(4453,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5565','4450','Desembolsos exigidos sobre participaciones otras partes vinculadas',NULL,NULL,1),(4454,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5566','4450','Desembolsos exigidos sobre participaciones otras empresas',NULL,NULL,1),(4455,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','557','4441','Dividendo activo a cuenta',NULL,NULL,1),(4456,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','558','4441','Socios por desembolsos exigidos',NULL,NULL,1),(4457,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5580','4456','Socios por desembolsos exigidos sobre acciones o participaciones ordinarias',NULL,NULL,1),(4458,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5585','4456','Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4459,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','559','4441','Derivados financieros a corto plazo',NULL,NULL,1),(4460,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5590','4459','Activos por derivados financieros a corto plazo',NULL,NULL,1),(4461,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5595','4459','Pasivos por derivados financieros a corto plazo',NULL,NULL,1),(4462,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','56','4005','Finanzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación',NULL,NULL,1),(4463,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','560','4462','Finanzas recibidas a corto plazo',NULL,NULL,1),(4464,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','561','4462','Depósitos recibidos a corto plazo',NULL,NULL,1),(4465,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','565','4462','Finanzas constituidas a corto plazo',NULL,NULL,1),(4466,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','566','4462','Depósitos constituidos a corto plazo',NULL,NULL,1),(4467,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','567','4462','Intereses pagados por anticipado',NULL,NULL,1),(4468,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','568','4462','Intereses cobrados a corto plazo',NULL,NULL,1),(4469,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','57','4005','Tesorería',NULL,NULL,1),(4470,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','CAJA','570','4469','Caja euros',NULL,NULL,1),(4471,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','571','4469','Caja moneda extranjera',NULL,NULL,1),(4472,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','BANCOS','572','4469','Bancos e instituciones de crédito cc vista euros',NULL,NULL,1),(4473,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','573','4469','Bancos e instituciones de crédito cc vista moneda extranjera',NULL,NULL,1),(4474,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','574','4469','Bancos e instituciones de crédito cuentas de ahorro euros',NULL,NULL,1),(4475,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','575','4469','Bancos e instituciones de crédito cuentas de ahorro moneda extranjera',NULL,NULL,1),(4476,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','576','4469','Inversiones a corto plazo de gran liquidez',NULL,NULL,1),(4477,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','59','4005','Deterioro del valor de las inversiones financieras a corto plazo',NULL,NULL,1),(4478,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','593','4477','Deterioro del valor de participaciones a corto plazo en partes vinculadas',NULL,NULL,1),(4479,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5933','4478','Deterioro del valor de participaciones a corto plazo en empresas del grupo',NULL,NULL,1),(4480,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5934','4478','Deterioro del valor de participaciones a corto plazo en empresas asociadas',NULL,NULL,1),(4481,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5935','4478','Deterioro del valor de participaciones a corto plazo en otras partes vinculadas',NULL,NULL,1),(4482,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','594','4477','Deterioro del valor de valores representativos de deuda a corto plazo en partes vinculadas',NULL,NULL,1),(4483,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5943','4482','Deterioro del valor de valores representativos de deuda a corto plazo en empresas del grupo',NULL,NULL,1),(4484,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5944','4482','Deterioro del valor de valores representativos de deuda a corto plazo en empresas asociadas',NULL,NULL,1),(4485,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5945','4482','Deterioro del valor de valores representativos de deuda a corto plazo en otras partes vinculadas',NULL,NULL,1),(4486,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','595','4477','Deterioro del valor de créditos a corto plazo en partes vinculadas',NULL,NULL,1),(4487,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5953','4486','Deterioro del valor de créditos a corto plazo en empresas del grupo',NULL,NULL,1),(4488,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5954','4486','Deterioro del valor de créditos a corto plazo en empresas asociadas',NULL,NULL,1),(4489,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','5955','4486','Deterioro del valor de créditos a corto plazo en otras partes vinculadas',NULL,NULL,1),(4490,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','596','4477','Deterioro del valor de participaciones a corto plazo',NULL,NULL,1),(4491,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','597','4477','Deterioro del valor de valores representativos de deuda a corto plazo',NULL,NULL,1),(4492,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','CUENTAS_FINANCIERAS','XXXXXX','598','4477','Deterioro de valor de créditos a corto plazo',NULL,NULL,1),(4493,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','60','4006','Compras',NULL,NULL,1),(4494,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','COMPRAS','600','4493','Compras de mercaderías',NULL,NULL,1),(4495,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','COMPRAS','601','4493','Compras de materias primas',NULL,NULL,1),(4496,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','602','4493','Compras de otros aprovisionamientos',NULL,NULL,1),(4497,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','606','4493','Descuentos sobre compras por pronto pago',NULL,NULL,1),(4498,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6060','4497','Descuentos sobre compras por pronto pago de mercaderías',NULL,NULL,1),(4499,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6061','4497','Descuentos sobre compras por pronto pago de materias primas',NULL,NULL,1),(4500,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6062','4497','Descuentos sobre compras por pronto pago de otros aprovisionamientos',NULL,NULL,1),(4501,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','COMPRAS','607','4493','Trabajos realizados por otras empresas',NULL,NULL,1),(4502,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','608','4493','Devoluciones de compras y operaciones similares',NULL,NULL,1),(4503,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6080','4502','Devoluciones de compras de mercaderías',NULL,NULL,1),(4504,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6081','4502','Devoluciones de compras de materias primas',NULL,NULL,1),(4505,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6082','4502','Devoluciones de compras de otros aprovisionamientos',NULL,NULL,1),(4506,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','609','4493','Rappels por compras',NULL,NULL,1),(4507,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6090','4506','Rappels por compras de mercaderías',NULL,NULL,1),(4508,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6091','4506','Rappels por compras de materias primas',NULL,NULL,1),(4509,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6092','4506','Rappels por compras de otros aprovisionamientos',NULL,NULL,1),(4510,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','61','4006','Variación de existencias',NULL,NULL,1),(4511,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','610','4510','Variación de existencias de mercaderías',NULL,NULL,1),(4512,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','611','4510','Variación de existencias de materias primas',NULL,NULL,1),(4513,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','612','4510','Variación de existencias de otros aprovisionamientos',NULL,NULL,1),(4514,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','62','4006','Servicios exteriores',NULL,NULL,1),(4515,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','620','4514','Gastos en investigación y desarrollo del ejercicio',NULL,NULL,1),(4516,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','621','4514','Arrendamientos y cánones',NULL,NULL,1),(4517,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','622','4514','Reparaciones y conservación',NULL,NULL,1),(4518,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','623','4514','Servicios profesionales independientes',NULL,NULL,1),(4519,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','624','4514','Transportes',NULL,NULL,1),(4520,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','625','4514','Primas de seguros',NULL,NULL,1),(4521,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','626','4514','Servicios bancarios y similares',NULL,NULL,1),(4522,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','627','4514','Publicidad, propaganda y relaciones públicas',NULL,NULL,1),(4523,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','628','4514','Suministros',NULL,NULL,1),(4524,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','629','4514','Otros servicios',NULL,NULL,1),(4525,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','63','4006','Tributos',NULL,NULL,1),(4526,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','630','4525','Impuesto sobre benecifios',NULL,NULL,1),(4527,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6300','4526','Impuesto corriente',NULL,NULL,1),(4528,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6301','4526','Impuesto diferido',NULL,NULL,1),(4529,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','631','4525','Otros tributos',NULL,NULL,1),(4530,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','633','4525','Ajustes negativos en la imposición sobre beneficios',NULL,NULL,1),(4531,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','634','4525','Ajustes negativos en la imposición indirecta',NULL,NULL,1),(4532,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6341','4531','Ajustes negativos en IVA de activo corriente',NULL,NULL,1),(4533,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6342','4531','Ajustes negativos en IVA de inversiones',NULL,NULL,1),(4534,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','636','4525','Devolución de impuestos',NULL,NULL,1),(4535,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','638','4525','Ajustes positivos en la imposición sobre beneficios',NULL,NULL,1),(4536,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','639','4525','Ajustes positivos en la imposición directa',NULL,NULL,1),(4537,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6391','4536','Ajustes positivos en IVA de activo corriente',NULL,NULL,1),(4538,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6392','4536','Ajustes positivos en IVA de inversiones',NULL,NULL,1),(4539,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','64','4006','Gastos de personal',NULL,NULL,1),(4540,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','640','4539','Sueldos y salarios',NULL,NULL,1),(4541,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','641','4539','Indemnizaciones',NULL,NULL,1),(4542,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','642','4539','Seguridad social a cargo de la empresa',NULL,NULL,1),(4543,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','649','4539','Otros gastos sociales',NULL,NULL,1),(4544,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','65','4006','Otros gastos de gestión',NULL,NULL,1),(4545,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','650','4544','Pérdidas de créditos comerciales incobrables',NULL,NULL,1),(4546,1,NULL,'2014-12-21 12:51:10','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','651','4544','Resultados de operaciones en común',NULL,NULL,1),(4547,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6510','4546','Beneficio transferido gestor',NULL,NULL,1),(4548,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6511','4546','Pérdida soportada participe o asociado no gestor',NULL,NULL,1),(4549,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','659','4544','Otras pérdidas en gestión corriente',NULL,NULL,1),(4550,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','66','4006','Gastos financieros',NULL,NULL,1),(4551,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','660','4550','Gastos financieros por actualización de provisiones',NULL,NULL,1),(4552,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','661','4550','Intereses de obligaciones y bonos',NULL,NULL,1),(4553,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6610','4452','Intereses de obligaciones y bonos a largo plazo empresas del grupo',NULL,NULL,1),(4554,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6611','4452','Intereses de obligaciones y bonos a largo plazo empresas asociadas',NULL,NULL,1),(4555,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6612','4452','Intereses de obligaciones y bonos a largo plazo otras partes vinculadas',NULL,NULL,1),(4556,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6613','4452','Intereses de obligaciones y bonos a largo plazo otras empresas',NULL,NULL,1),(4557,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6615','4452','Intereses de obligaciones y bonos a corto plazo empresas del grupo',NULL,NULL,1),(4558,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6616','4452','Intereses de obligaciones y bonos a corto plazo empresas asociadas',NULL,NULL,1),(4559,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6617','4452','Intereses de obligaciones y bonos a corto plazo otras partes vinculadas',NULL,NULL,1),(4560,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6618','4452','Intereses de obligaciones y bonos a corto plazo otras empresas',NULL,NULL,1),(4561,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','662','4550','Intereses de deudas',NULL,NULL,1),(4562,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6620','4561','Intereses de deudas empresas del grupo',NULL,NULL,1),(4563,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6621','4561','Intereses de deudas empresas asociadas',NULL,NULL,1),(4564,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6622','4561','Intereses de deudas otras partes vinculadas',NULL,NULL,1),(4565,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6623','4561','Intereses de deudas con entidades de crédito',NULL,NULL,1),(4566,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6624','4561','Intereses de deudas otras empresas',NULL,NULL,1),(4567,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','663','4550','Pérdidas por valorización de activos y pasivos financieros por su valor razonable',NULL,NULL,1),(4568,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','664','4550','Gastos por dividendos de acciones o participaciones consideradas como pasivos financieros',NULL,NULL,1),(4569,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6640','4568','Dividendos de pasivos empresas del grupo',NULL,NULL,1),(4570,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6641','4568','Dividendos de pasivos empresas asociadas',NULL,NULL,1),(4571,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6642','4568','Dividendos de pasivos otras partes vinculadas',NULL,NULL,1),(4572,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6643','4568','Dividendos de pasivos otras empresas',NULL,NULL,1),(4573,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','665','4550','Intereses por descuento de efectos y operaciones de factoring',NULL,NULL,1),(4574,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6650','4573','Intereses por descuento de efectos en entidades de crédito del grupo',NULL,NULL,1),(4575,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6651','4573','Intereses por descuento de efectos en entidades de crédito asociadas',NULL,NULL,1),(4576,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6652','4573','Intereses por descuento de efectos en entidades de crédito vinculadas',NULL,NULL,1),(4577,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6653','4573','Intereses por descuento de efectos en otras entidades de crédito',NULL,NULL,1),(4578,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6654','4573','Intereses por operaciones de factoring con entidades de crédito del grupo',NULL,NULL,1),(4579,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6655','4573','Intereses por operaciones de factoring con entidades de crédito asociadas',NULL,NULL,1),(4580,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6656','4573','Intereses por operaciones de factoring con otras entidades de crédito vinculadas',NULL,NULL,1),(4581,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6657','4573','Intereses por operaciones de factoring con otras entidades de crédito',NULL,NULL,1),(4582,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','666','4550','Pérdidas en participaciones y valores representativos de deuda',NULL,NULL,1),(4583,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6660','4582','Pérdidas en valores representativos de deuda a largo plazo empresas del grupo',NULL,NULL,1),(4584,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6661','4582','Pérdidas en valores representativos de deuda a largo plazo empresas asociadas',NULL,NULL,1),(4585,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6662','4582','Pérdidas en valores representativos de deuda a largo plazo otras partes vinculadas',NULL,NULL,1),(4586,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6663','4582','Pérdidas en participaciones y valores representativos de deuda a largo plazo otras empresas',NULL,NULL,1),(4587,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6665','4582','Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4588,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6666','4582','Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4589,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6667','4582','Pérdidas en valores representativos de deuda a corto plazo otras partes vinculadas',NULL,NULL,1),(4590,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6668','4582','Pérdidas en valores representativos de deuda a corto plazo otras empresas',NULL,NULL,1),(4591,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','667','4550','Pérdidas de créditos no comerciales',NULL,NULL,1),(4592,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6670','4591','Pérdidas de créditos a largo plazo empresas del grupo',NULL,NULL,1),(4593,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6671','4591','Pérdidas de créditos a largo plazo empresas asociadas',NULL,NULL,1),(4594,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6672','4591','Pérdidas de créditos a largo plazo otras partes vinculadas',NULL,NULL,1),(4595,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6673','4591','Pérdidas de créditos a largo plazo otras empresas',NULL,NULL,1),(4596,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6675','4591','Pérdidas de créditos a corto plazo empresas del grupo',NULL,NULL,1),(4597,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6676','4591','Pérdidas de créditos a corto plazo empresas asociadas',NULL,NULL,1),(4598,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6677','4591','Pérdidas de créditos a corto plazo otras partes vinculadas',NULL,NULL,1),(4599,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6678','4591','Pérdidas de créditos a corto plazo otras empresas',NULL,NULL,1),(4600,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','668','4550','Diferencias negativas de cambio',NULL,NULL,1),(4601,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','669','4550','Otros gastos financieros',NULL,NULL,1),(4602,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','67','4006','Pérdidas procedentes de activos no corrientes y gastos excepcionales',NULL,NULL,1),(4603,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','670','4602','Pérdidas procedentes del inmovilizado intangible',NULL,NULL,1),(4604,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','671','4602','Pérdidas procedentes del inmovilizado material',NULL,NULL,1),(4605,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','672','4602','Pérdidas procedentes de las inversiones inmobiliarias',NULL,NULL,1),(4607,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','673','4602','Pérdidas procedentes de participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4608,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6733','4607','Pérdidas procedentes de participaciones a largo plazo empresas del grupo',NULL,NULL,1),(4609,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6734','4607','Pérdidas procedentes de participaciones a largo plazo empresas asociadas',NULL,NULL,1),(4610,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6735','4607','Pérdidas procedentes de participaciones a largo plazo otras partes vinculadas',NULL,NULL,1),(4611,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','675','4602','Pérdidas por operaciones con obligaciones propias',NULL,NULL,1),(4612,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','678','4602','Gastos excepcionales',NULL,NULL,1),(4613,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','68','4006','Dotaciones para amortizaciones',NULL,NULL,1),(4614,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','680','4613','Amortización del inmovilizado intangible',NULL,NULL,1),(4615,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','681','4613','Amortización del inmovilizado material',NULL,NULL,1),(4616,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','682','4613','Amortización de las inversiones inmobiliarias',NULL,NULL,1),(4617,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','69','4006','Pérdidas por deterioro y otras dotaciones',NULL,NULL,1),(4618,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','690','4617','Pérdidas por deterioro del inmovilizado intangible',NULL,NULL,1),(4619,1,NULL,'2014-12-21 12:51:11','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','691','4617','Pérdidas por deterioro del inmovilizado material',NULL,NULL,1),(4620,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','692','4617','Pérdidas por deterioro de las inversiones inmobiliarias',NULL,NULL,1),(4621,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','693','4617','Pérdidas por deterioro de existencias',NULL,NULL,1),(4622,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6930','4621','Pérdidas por deterioro de productos terminados y en curso de fabricación',NULL,NULL,1),(4623,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6931','4621','Pérdidas por deterioro de mercaderías',NULL,NULL,1),(4624,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6932','4621','Pérdidas por deterioro de materias primas',NULL,NULL,1),(4625,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6933','4621','Pérdidas por deterioro de otros aprovisionamientos',NULL,NULL,1),(4626,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','694','4617','Pérdidas por deterioro de créditos por operaciones comerciales',NULL,NULL,1),(4627,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','695','4617','Dotación a la provisión por operaciones comerciales',NULL,NULL,1),(4628,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6954','4627','Dotación a la provisión por contratos onerosos',NULL,NULL,1),(4629,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6959','4628','Dotación a la provisión para otras operaciones comerciales',NULL,NULL,1),(4630,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','696','4617','Pérdidas por deterioro de participaciones y valores representativos de deuda a largo plazo',NULL,NULL,1),(4631,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6960','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo',NULL,NULL,1),(4632,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6961','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas',NULL,NULL,1),(4633,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6962','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas',NULL,NULL,1),(4634,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6963','4630','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas',NULL,NULL,1),(4635,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6965','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas del grupo',NULL,NULL,1),(4636,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6966','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas asociadas',NULL,NULL,1),(4637,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6967','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo otras partes vinculadas',NULL,NULL,1),(4638,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6968','4630','Pérdidas por deterioro en valores representativos de deuda a largo plazo otras empresas',NULL,NULL,1),(4639,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','697','4617','Pérdidas por deterioro de créditos a largo plazo',NULL,NULL,1),(4640,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6970','4639','Pérdidas por deterioro de créditos a largo plazo empresas del grupo',NULL,NULL,1),(4641,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6971','4639','Pérdidas por deterioro de créditos a largo plazo empresas asociadas',NULL,NULL,1),(4642,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6972','4639','Pérdidas por deterioro de créditos a largo plazo otras partes vinculadas',NULL,NULL,1),(4643,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6973','4639','Pérdidas por deterioro de créditos a largo plazo otras empresas',NULL,NULL,1),(4644,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','698','4617','Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo',NULL,NULL,1),(4645,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6980','4644','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo',NULL,NULL,1),(4646,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6981','4644','Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas',NULL,NULL,1),(4647,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6985','4644','Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4648,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6986','4644','Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4649,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6988','4644','Pérdidas por deterioro en valores representativos de deuda a corto plazo de otras empresas',NULL,NULL,1),(4650,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','699','4617','Pérdidas por deterioro de crédito a corto plazo',NULL,NULL,1),(4651,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6990','4650','Pérdidas por deterioro de crédito a corto plazo empresas del grupo',NULL,NULL,1),(4652,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6991','4650','Pérdidas por deterioro de crédito a corto plazo empresas asociadas',NULL,NULL,1),(4653,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6992','4650','Pérdidas por deterioro de crédito a corto plazo otras partes vinculadas',NULL,NULL,1),(4654,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX','6993','4650','Pérdidas por deterioro de crédito a corto plazo otras empresas',NULL,NULL,1),(4655,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','70','4007','Ventas',NULL,NULL,1),(4656,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','VENTAS','700','4655','Ventas de mercaderías',NULL,NULL,1),(4657,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','VENTAS','701','4655','Ventas de productos terminados',NULL,NULL,1),(4658,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','702','4655','Ventas de productos semiterminados',NULL,NULL,1),(4659,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','703','4655','Ventas de subproductos y residuos',NULL,NULL,1),(4660,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','704','4655','Ventas de envases y embalajes',NULL,NULL,1),(4661,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','VENTAS','705','4655','Prestaciones de servicios',NULL,NULL,1),(4662,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','706','4655','Descuentos sobre ventas por pronto pago',NULL,NULL,1),(4663,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7060','4662','Descuentos sobre ventas por pronto pago de mercaderías',NULL,NULL,1),(4664,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7061','4662','Descuentos sobre ventas por pronto pago de productos terminados',NULL,NULL,1),(4665,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7062','4662','Descuentos sobre ventas por pronto pago de productos semiterminados',NULL,NULL,1),(4666,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7063','4662','Descuentos sobre ventas por pronto pago de subproductos y residuos',NULL,NULL,1),(4667,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','708','4655','Devoluciones de ventas y operacioes similares',NULL,NULL,1),(4668,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7080','4667','Devoluciones de ventas de mercaderías',NULL,NULL,1),(4669,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7081','4667','Devoluciones de ventas de productos terminados',NULL,NULL,1),(4670,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7082','4667','Devoluciones de ventas de productos semiterminados',NULL,NULL,1),(4671,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7083','4667','Devoluciones de ventas de subproductos y residuos',NULL,NULL,1),(4672,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7084','4667','Devoluciones de ventas de envases y embalajes',NULL,NULL,1),(4673,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','71','4007','Variación de existencias',NULL,NULL,1),(4674,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','710','4673','Variación de existencias de productos en curso',NULL,NULL,1),(4675,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','711','4673','Variación de existencias de productos semiterminados',NULL,NULL,1),(4676,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','712','4673','Variación de existencias de productos terminados',NULL,NULL,1),(4677,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','713','4673','Variación de existencias de subproductos, residuos y materiales recuperados',NULL,NULL,1),(4678,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','73','4007','Trabajos realizados para la empresa',NULL,NULL,1),(4679,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','730','4678','Trabajos realizados para el inmovilizado intangible',NULL,NULL,1),(4680,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','731','4678','Trabajos realizados para el inmovilizado tangible',NULL,NULL,1),(4681,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','732','4678','Trabajos realizados en inversiones inmobiliarias',NULL,NULL,1),(4682,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','733','4678','Trabajos realizados para el inmovilizado material en curso',NULL,NULL,1),(4683,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','74','4007','Subvenciones, donaciones y legados',NULL,NULL,1),(4684,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','740','4683','Subvenciones, donaciones y legados a la explotación',NULL,NULL,1),(4685,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','746','4683','Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio',NULL,NULL,1),(4686,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','747','4683','Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio',NULL,NULL,1),(4687,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','75','4007','Otros ingresos de gestión',NULL,NULL,1),(4688,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','751','4687','Resultados de operaciones en común',NULL,NULL,1),(4689,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7510','4688','Pérdida transferida gestor',NULL,NULL,1),(4690,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7511','4688','Beneficio atribuido participe o asociado no gestor',NULL,NULL,1),(4691,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','752','4687','Ingreso por arrendamiento',NULL,NULL,1),(4692,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','753','4687','Ingresos de propiedad industrial cedida en explotación',NULL,NULL,1),(4693,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','754','4687','Ingresos por comisiones',NULL,NULL,1),(4694,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','755','4687','Ingresos por servicios al personal',NULL,NULL,1),(4695,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','759','4687','Ingresos por servicios diversos',NULL,NULL,1),(4696,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76','4007','Ingresos financieros',NULL,NULL,1),(4697,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','760','4696','Ingresos de participaciones en instrumentos de patrimonio',NULL,NULL,1),(4698,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7600','4697','Ingresos de participaciones en instrumentos de patrimonio empresas del grupo',NULL,NULL,1),(4699,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7601','4697','Ingresos de participaciones en instrumentos de patrimonio empresas asociadas',NULL,NULL,1),(4700,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7602','4697','Ingresos de participaciones en instrumentos de patrimonio otras partes asociadas',NULL,NULL,1),(4701,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7603','4697','Ingresos de participaciones en instrumentos de patrimonio otras empresas',NULL,NULL,1),(4702,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','761','4696','Ingresos de valores representativos de deuda',NULL,NULL,1),(4703,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7610','4702','Ingresos de valores representativos de deuda empresas del grupo',NULL,NULL,1),(4704,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7611','4702','Ingresos de valores representativos de deuda empresas asociadas',NULL,NULL,1),(4705,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7612','4702','Ingresos de valores representativos de deuda otras partes asociadas',NULL,NULL,1),(4706,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7613','4702','Ingresos de valores representativos de deuda otras empresas',NULL,NULL,1),(4707,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','762','4696','Ingresos de créditos',NULL,NULL,1),(4708,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7620','4707','Ingresos de créditos a largo plazo',NULL,NULL,1),(4709,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76200','4708','Ingresos de crédito a largo plazo empresas del grupo',NULL,NULL,1),(4710,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76201','4708','Ingresos de crédito a largo plazo empresas asociadas',NULL,NULL,1),(4711,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76202','4708','Ingresos de crédito a largo plazo otras partes asociadas',NULL,NULL,1),(4712,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76203','4708','Ingresos de crédito a largo plazo otras empresas',NULL,NULL,1),(4713,1,NULL,'2014-12-21 12:51:12','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7621','4707','Ingresos de créditos a corto plazo',NULL,NULL,1),(4714,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76210','4713','Ingresos de crédito a corto plazo empresas del grupo',NULL,NULL,1),(4715,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76211','4713','Ingresos de crédito a corto plazo empresas asociadas',NULL,NULL,1),(4716,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76212','4713','Ingresos de crédito a corto plazo otras partes asociadas',NULL,NULL,1),(4717,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','76213','4713','Ingresos de crédito a corto plazo otras empresas',NULL,NULL,1),(4718,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','763','4696','Beneficios por valorización de activos y pasivos financieros por su valor razonable',NULL,NULL,1),(4719,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','766','4696','Beneficios en participaciones y valores representativos de deuda',NULL,NULL,1),(4720,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7660','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo empresas del grupo',NULL,NULL,1),(4721,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7661','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo empresas asociadas',NULL,NULL,1),(4722,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7662','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo otras partes asociadas',NULL,NULL,1),(4723,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7663','4719','Beneficios en participaciones y valores representativos de deuda a largo plazo otras empresas',NULL,NULL,1),(4724,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7665','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4725,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7666','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4726,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7667','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo otras partes asociadas',NULL,NULL,1),(4727,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7668','4719','Beneficios en participaciones y valores representativos de deuda a corto plazo otras empresas',NULL,NULL,1),(4728,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','768','4696','Diferencias positivas de cambio',NULL,NULL,1),(4729,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','769','4696','Otros ingresos financieros',NULL,NULL,1),(4730,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','77','4007','Beneficios procedentes de activos no corrientes e ingresos excepcionales',NULL,NULL,1),(4731,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','770','4730','Beneficios procedentes del inmovilizado intangible',NULL,NULL,1),(4732,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','771','4730','Beneficios procedentes del inmovilizado material',NULL,NULL,1),(4733,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','772','4730','Beneficios procedentes de las inversiones inmobiliarias',NULL,NULL,1),(4734,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','773','4730','Beneficios procedentes de participaciones a largo plazo en partes vinculadas',NULL,NULL,1),(4735,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7733','4734','Beneficios procedentes de participaciones a largo plazo empresas del grupo',NULL,NULL,1),(4736,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7734','4734','Beneficios procedentes de participaciones a largo plazo empresas asociadas',NULL,NULL,1),(4737,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7735','4734','Beneficios procedentes de participaciones a largo plazo otras partes vinculadas',NULL,NULL,1),(4738,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','775','4730','Beneficios por operaciones con obligaciones propias',NULL,NULL,1),(4739,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','778','4730','Ingresos excepcionales',NULL,NULL,1),(4741,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','79','4007','Excesos y aplicaciones de provisiones y pérdidas por deterioro',NULL,NULL,1),(4742,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','790','4741','Revisión del deterioro del inmovilizado intangible',NULL,NULL,1),(4743,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','791','4741','Revisión del deterioro del inmovilizado material',NULL,NULL,1),(4744,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','792','4741','Revisión del deterioro de las inversiones inmobiliarias',NULL,NULL,1),(4745,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','793','4741','Revisión del deterioro de las existencias',NULL,NULL,1),(4746,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7930','4745','Revisión del deterioro de productos terminados y en curso de fabricación',NULL,NULL,1),(4747,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7931','4745','Revisión del deterioro de mercaderías',NULL,NULL,1),(4748,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7932','4745','Revisión del deterioro de materias primas',NULL,NULL,1),(4749,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7933','4745','Revisión del deterioro de otros aprovisionamientos',NULL,NULL,1),(4750,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','794','4741','Revisión del deterioro de créditos por operaciones comerciales',NULL,NULL,1),(4751,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','795','4741','Exceso de provisiones',NULL,NULL,1),(4752,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7951','4751','Exceso de provisión para impuestos',NULL,NULL,1),(4753,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7952','4751','Exceso de provisión para otras responsabilidades',NULL,NULL,1),(4755,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7954','4751','Exceso de provisión para operaciones comerciales',NULL,NULL,1),(4756,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','79544','4755','Exceso de provisión por contratos onerosos',NULL,NULL,1),(4757,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','79549','4755','Exceso de provisión para otras operaciones comerciales',NULL,NULL,1),(4758,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7955','4751','Exceso de provisión para actuaciones medioambienteales',NULL,NULL,1),(4759,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','796','4741','Revisión del deterioro de participaciones y valores representativos de deuda a largo plazo',NULL,NULL,1),(4760,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7960','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo',NULL,NULL,1),(4761,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7961','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas',NULL,NULL,1),(4762,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7962','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas',NULL,NULL,1),(4763,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7963','4759','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas',NULL,NULL,1),(4764,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7965','4759','Revisión del deterioro de valores representativos a largo plazo empresas del grupo',NULL,NULL,1),(4765,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7966','4759','Revisión del deterioro de valores representativos a largo plazo empresas asociadas',NULL,NULL,1),(4766,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7967','4759','Revisión del deterioro de valores representativos a largo otras partes vinculadas',NULL,NULL,1),(4767,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7968','4759','Revisión del deterioro de valores representativos a largo plazo otras empresas',NULL,NULL,1),(4768,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','797','4741','Revisión del deterioro de créditos a largo plazo',NULL,NULL,1),(4769,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7970','4768','Revisión del deterioro de créditos a largo plazo empresas del grupo',NULL,NULL,1),(4770,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7971','4768','Revisión del deterioro de créditos a largo plazo empresas asociadas',NULL,NULL,1),(4771,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7972','4768','Revisión del deterioro de créditos a largo plazo otras partes vinculadas',NULL,NULL,1),(4772,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7973','4768','Revisión del deterioro de créditos a largo plazo otras empresas',NULL,NULL,1),(4773,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','798','4741','Revisión del deterioro de participaciones y valores representativos de deuda a corto plazo',NULL,NULL,1),(4774,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7980','4773','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo',NULL,NULL,1),(4775,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7981','4773','Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas',NULL,NULL,1),(4776,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7985','4773','Revisión del deterioro de valores representativos de deuda a corto plazo empresas del grupo',NULL,NULL,1),(4777,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7986','4773','Revisión del deterioro de valores representativos de deuda a corto plazo empresas asociadas',NULL,NULL,1),(4778,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7987','4773','Revisión del deterioro de valores representativos de deuda a corto plazo otras partes vinculadas',NULL,NULL,1),(4779,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7988','4773','Revisión del deterioro de valores representativos de deuda a corto plazo otras empresas',NULL,NULL,1),(4780,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','799','4741','Revisión del deterioro de créditos a corto plazo',NULL,NULL,1),(4781,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7990','4780','Revisión del deterioro de créditos a corto plazo empresas del grupo',NULL,NULL,1),(4782,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7991','4780','Revisión del deterioro de créditos a corto plazo empresas asociadas',NULL,NULL,1),(4783,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7992','4780','Revisión del deterioro de créditos a corto plazo otras partes vinculadas',NULL,NULL,1),(4784,1,NULL,'2014-12-21 12:51:13','PCG08-PYME','VENTAS_E_INGRESOS','XXXXXX','7993','4780','Revisión del deterioro de créditos a corto plazo otras empresas',NULL,NULL,1);
+/*!40000 ALTER TABLE `llx_accountingaccount` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accountingdebcred`
+--
+
+DROP TABLE IF EXISTS `llx_accountingdebcred`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accountingdebcred` (
+  `fk_transaction` int(11) NOT NULL,
+  `fk_account` int(11) NOT NULL,
+  `amount` double NOT NULL,
+  `direction` varchar(1) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_accountingdebcred`
+--
+
+LOCK TABLES `llx_accountingdebcred` WRITE;
+/*!40000 ALTER TABLE `llx_accountingdebcred` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accountingdebcred` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_accountingtransaction`
+--
+
+DROP TABLE IF EXISTS `llx_accountingtransaction`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_accountingtransaction` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(128) NOT NULL,
+  `datec` date NOT NULL,
+  `fk_author` varchar(20) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_facture` int(11) DEFAULT NULL,
+  `fk_facture_fourn` int(11) DEFAULT NULL,
+  `fk_paiement` int(11) DEFAULT NULL,
+  `fk_paiement_fourn` 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_accountingtransaction`
+--
+
+LOCK TABLES `llx_accountingtransaction` WRITE;
+/*!40000 ALTER TABLE `llx_accountingtransaction` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_accountingtransaction` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_actioncomm`
+--
+
+DROP TABLE IF EXISTS `llx_actioncomm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_actioncomm` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ref_ext` varchar(128) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datep` datetime DEFAULT NULL,
+  `datep2` datetime DEFAULT NULL,
+  `datea` datetime DEFAULT NULL,
+  `datea2` datetime DEFAULT NULL,
+  `fk_action` int(11) DEFAULT NULL,
+  `code` varchar(32) DEFAULT NULL,
+  `label` varchar(128) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_mod` int(11) DEFAULT NULL,
+  `fk_project` int(11) DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_contact` int(11) DEFAULT NULL,
+  `fk_parent` int(11) NOT NULL DEFAULT '0',
+  `fk_user_action` int(11) DEFAULT NULL,
+  `transparency` int(11) DEFAULT NULL,
+  `fk_user_done` int(11) DEFAULT NULL,
+  `priority` smallint(6) DEFAULT NULL,
+  `fulldayevent` smallint(6) NOT NULL DEFAULT '0',
+  `punctual` smallint(6) NOT NULL DEFAULT '1',
+  `percent` smallint(6) NOT NULL DEFAULT '0',
+  `location` varchar(128) DEFAULT NULL,
+  `durationp` double DEFAULT NULL,
+  `durationa` double DEFAULT NULL,
+  `note` text,
+  `fk_element` int(11) DEFAULT NULL,
+  `elementtype` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_actioncomm_datea` (`datea`),
+  KEY `idx_actioncomm_fk_soc` (`fk_soc`),
+  KEY `idx_actioncomm_fk_contact` (`fk_contact`),
+  KEY `idx_actioncomm_fk_element` (`fk_element`)
+) ENGINE=InnoDB AUTO_INCREMENT=232 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_actioncomm`
+--
+
+LOCK TABLES `llx_actioncomm` WRITE;
+/*!40000 ALTER TABLE `llx_actioncomm` DISABLE KEYS */;
+INSERT INTO `llx_actioncomm` VALUES (1,NULL,1,'2010-07-08 14:21:44','2010-07-08 14:21:44',NULL,NULL,50,NULL,'Company AAA and Co added into Dolibarr','2010-07-08 14:21:44','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL),(2,NULL,1,'2010-07-08 14:23:48','2010-07-08 14:23:48',NULL,NULL,50,NULL,'Company Belin SARL added into Dolibarr','2010-07-08 14:23:48','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL),(3,NULL,1,'2010-07-08 22:42:12','2010-07-08 22:42:12',NULL,NULL,50,NULL,'Company Spanish Comp added into Dolibarr','2010-07-08 22:42:12','2014-12-21 12:50:33',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL),(4,NULL,1,'2010-07-08 22:48:18','2010-07-08 22:48:18',NULL,NULL,50,NULL,'Company Prospector Vaalen added into Dolibarr','2010-07-08 22:48:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL),(5,NULL,1,'2010-07-08 23:22:57','2010-07-08 23:22:57',NULL,NULL,50,NULL,'Company NoCountry Co added into Dolibarr','2010-07-08 23:22:57','2014-12-21 12:50:33',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL),(6,NULL,1,'2010-07-09 00:15:09','2010-07-09 00:15:09',NULL,NULL,50,NULL,'Company Swiss customer added into Dolibarr','2010-07-09 00:15:09','2014-12-21 12:50:33',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL),(7,NULL,1,'2010-07-09 01:24:26','2010-07-09 01:24:26',NULL,NULL,50,NULL,'Company Generic customer added into Dolibarr','2010-07-09 01:24:26','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL),(8,NULL,1,'2010-07-10 14:54:27','2010-07-10 14:54:27',NULL,NULL,50,NULL,'Société Client salon ajoutée dans Dolibarr','2010-07-10 14:54:27','2014-12-21 12:50:33',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(9,NULL,1,'2010-07-10 14:54:44','2010-07-10 14:54:44',NULL,NULL,50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2010-07-10 14:54:44','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(10,NULL,1,'2010-07-10 14:56:10','2010-07-10 14:56:10',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:56:10','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(11,NULL,1,'2010-07-10 14:58:53','2010-07-10 14:58:53',NULL,NULL,50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2010-07-10 14:58:53','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice'),(12,NULL,1,'2010-07-10 15:00:55','2010-07-10 15:00:55',NULL,NULL,50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2010-07-10 15:00:55','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice'),(13,NULL,1,'2010-07-10 15:13:08','2010-07-10 15:13:08',NULL,NULL,50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2010-07-10 15:13:08','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(14,NULL,1,'2010-07-10 15:21:00','2010-07-10 16:21:00',NULL,NULL,5,NULL,'RDV avec mon chef','2010-07-10 15:21:48','2010-07-10 13:21:48',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'',3600,NULL,'',NULL,NULL),(15,NULL,1,'2010-07-10 18:18:16','2010-07-10 18:18:16',NULL,NULL,50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2010-07-10 18:18:16','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL),(16,NULL,1,'2010-07-10 18:35:57','2010-07-10 18:35:57',NULL,NULL,50,NULL,'Société Mon client ajoutée dans Dolibarr','2010-07-10 18:35:57','2014-12-21 12:50:33',1,NULL,NULL,11,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(17,NULL,1,'2010-07-11 16:18:08','2010-07-11 16:18:08',NULL,NULL,50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2010-07-11 16:18:08','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(18,NULL,1,'2010-07-11 17:11:00','2010-07-11 17:17:00',NULL,NULL,5,NULL,'Rendez-vous','2010-07-11 17:11:22','2010-07-11 15:11:22',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,1,0,'gfgdfgdf',360,NULL,'',NULL,NULL),(19,NULL,1,'2010-07-11 17:13:20','2010-07-11 17:13:20',NULL,NULL,50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2010-07-11 17:13:20','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL),(20,NULL,1,'2010-07-11 17:15:42','2010-07-11 17:15:42',NULL,NULL,50,NULL,'Commande CF1007-0001 validée','2010-07-11 17:15:42','2014-12-21 12:50:33',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL),(21,NULL,1,'2010-07-11 18:47:33','2010-07-11 18:47:33',NULL,NULL,50,NULL,'Commande CF1007-0002 validée','2010-07-11 18:47:33','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL),(22,NULL,1,'2010-07-18 11:36:18','2010-07-18 11:36:18',NULL,NULL,50,NULL,'Proposition PR1007-0003 validée','2010-07-18 11:36:18','2014-12-21 12:50:33',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,1,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal'),(23,NULL,1,'2011-07-18 20:49:58','2011-07-18 20:49:58',NULL,NULL,50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2011-07-18 20:49:58','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice'),(24,NULL,1,'2011-07-28 01:37:00',NULL,NULL,NULL,1,NULL,'Phone call','2011-07-28 01:37:48','2011-07-27 23:37:48',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(25,NULL,1,'2011-08-01 02:31:24','2011-08-01 02:31:24',NULL,NULL,50,NULL,'Company mmm added into Dolibarr','2011-08-01 02:31:24','2014-12-21 12:50:33',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe'),(26,NULL,1,'2011-08-01 02:31:43','2011-08-01 02:31:43',NULL,NULL,50,NULL,'Company ppp added into Dolibarr','2011-08-01 02:31:43','2014-12-21 12:50:33',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe'),(27,NULL,1,'2011-08-01 02:41:26','2011-08-01 02:41:26',NULL,NULL,50,NULL,'Company aaa added into Dolibarr','2011-08-01 02:41:26','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe'),(28,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice'),(29,NULL,1,'2011-08-01 03:34:11','2011-08-01 03:34:11',NULL,NULL,50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2011-08-01 03:34:11','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice'),(30,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice'),(31,NULL,1,'2011-08-06 20:33:54','2011-08-06 20:33:54',NULL,NULL,50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2011-08-06 20:33:54','2014-12-21 12:50:33',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice'),(38,NULL,1,'2011-08-08 02:41:55','2011-08-08 02:41:55',NULL,NULL,50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2011-08-08 02:41:55','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice'),(40,NULL,1,'2011-08-08 02:53:40','2011-08-08 02:53:40',NULL,NULL,50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2011-08-08 02:53:40','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice'),(41,NULL,1,'2011-08-08 02:54:05','2011-08-08 02:54:05',NULL,NULL,50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2011-08-08 02:54:05','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice'),(42,NULL,1,'2011-08-08 02:55:04','2011-08-08 02:55:04',NULL,NULL,50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2011-08-08 02:55:04','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice'),(43,NULL,1,'2011-08-08 02:55:26','2011-08-08 02:55:26',NULL,NULL,50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2011-08-08 02:55:26','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice'),(44,NULL,1,'2011-08-08 02:55:58','2011-08-08 02:55:58',NULL,NULL,50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2011-08-08 02:55:58','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice'),(45,NULL,1,'2011-08-08 03:04:22','2011-08-08 03:04:22',NULL,NULL,50,NULL,'Order CO1108-0001 validated','2011-08-08 03:04:22','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order'),(46,NULL,1,'2011-08-08 13:59:09','2011-08-08 13:59:09',NULL,NULL,50,NULL,'Order CO1107-0002 validated','2011-08-08 13:59:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order'),(47,NULL,1,'2011-08-08 14:24:18','2011-08-08 14:24:18',NULL,NULL,50,NULL,'Proposal PR1007-0001 validated','2011-08-08 14:24:18','2014-12-21 12:50:33',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal'),(48,NULL,1,'2011-08-08 14:24:24','2011-08-08 14:24:24',NULL,NULL,50,NULL,'Proposal PR1108-0004 validated','2011-08-08 14:24:24','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal'),(49,NULL,1,'2011-08-08 15:04:37','2011-08-08 15:04:37',NULL,NULL,50,NULL,'Order CF1108-0003 validated','2011-08-08 15:04:37','2014-12-21 12:50:33',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier'),(50,NULL,1,'2012-12-08 17:56:47','2012-12-08 17:56:47',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:56:47','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(51,NULL,1,'2012-12-08 17:57:11','2012-12-08 17:57:11',NULL,NULL,40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2012-12-08 17:57:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice'),(52,NULL,1,'2012-12-08 17:58:27','2012-12-08 17:58:27',NULL,NULL,40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2012-12-08 17:58:27','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice'),(53,NULL,1,'2012-12-08 18:20:49','2012-12-08 18:20:49',NULL,NULL,40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2012-12-08 18:20:49','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice'),(54,NULL,1,'2012-12-09 18:35:07','2012-12-09 18:35:07',NULL,NULL,40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2012-12-09 18:35:07','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice'),(55,NULL,1,'2012-12-09 20:14:42','2012-12-09 20:14:42',NULL,NULL,40,NULL,'Société doe john ajoutée dans Dolibarr','2012-12-09 20:14:42','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe'),(56,NULL,1,'2012-12-12 18:54:19','2012-12-12 18:54:19',NULL,NULL,40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2012-12-12 18:54:19','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice'),(121,NULL,1,'2012-12-06 10:00:00',NULL,NULL,NULL,50,NULL,'aaab','2012-12-21 17:48:08','2012-12-21 16:54:07',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(122,NULL,1,'2012-12-21 18:09:52','2012-12-21 18:09:52',NULL,NULL,40,NULL,'Facture client FA1007-0001 envoyée par EMail','2012-12-21 18:09:52','2014-12-21 12:50:33',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@destailleur.fr> à laurent@destailleur.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice'),(123,NULL,1,'2013-01-06 13:13:57','2013-01-06 13:13:57',NULL,NULL,40,NULL,'Facture 16 validée dans Dolibarr','2013-01-06 13:13:57','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier'),(124,NULL,1,'2013-01-12 12:23:05','2013-01-12 12:23:05',NULL,NULL,40,NULL,'Patient aaa ajouté','2013-01-12 12:23:05','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe'),(125,NULL,1,'2013-01-12 12:52:20','2013-01-12 12:52:20',NULL,NULL,40,NULL,'Patient pppoo ajouté','2013-01-12 12:52:20','2014-12-21 12:50:33',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe'),(127,NULL,1,'2013-01-19 18:22:48','2013-01-19 18:22:48',NULL,NULL,40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2013-01-19 18:22:48','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice'),(128,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice'),(129,NULL,1,'2013-01-19 18:31:10','2013-01-19 18:31:10',NULL,NULL,40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2013-01-19 18:31:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice'),(130,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice'),(131,NULL,1,'2013-01-19 18:31:58','2013-01-19 18:31:58',NULL,NULL,40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2013-01-19 18:31:58','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice'),(132,NULL,1,'2013-01-23 15:07:54','2013-01-23 15:07:54',NULL,NULL,50,NULL,'Consultation 24 saisie (aaa)','2013-01-23 15:07:54','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons'),(133,NULL,1,'2013-01-23 16:56:58','2013-01-23 16:56:58',NULL,NULL,40,NULL,'Patient pa ajouté','2013-01-23 16:56:58','2014-12-21 12:50:33',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe'),(134,NULL,1,'2013-01-23 17:34:00',NULL,NULL,NULL,50,NULL,'bbcv','2013-01-23 17:35:21','2013-01-23 16:35:21',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,1,-1,'',NULL,NULL,'',NULL,NULL),(135,NULL,1,'2013-02-12 15:54:00','2013-02-12 15:54:00',NULL,NULL,40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2013-02-12 15:54:37','2014-12-21 12:50:33',1,1,NULL,7,NULL,0,1,NULL,1,0,0,1,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice'),(136,NULL,1,'2013-02-12 17:06:51','2013-02-12 17:06:51',NULL,NULL,40,NULL,'Commande CO1107-0003 validée','2013-02-12 17:06:51','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order'),(137,NULL,1,'2013-02-17 16:22:10','2013-02-17 16:22:10',NULL,NULL,40,NULL,'Proposition PR1302-0009 validée','2013-02-17 16:22:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal'),(138,NULL,1,'2013-02-17 16:27:00','2013-02-17 16:27:00',NULL,NULL,40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2013-02-17 16:27:00','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice'),(139,NULL,1,'2013-02-17 16:27:29','2013-02-17 16:27:29',NULL,NULL,40,NULL,'Proposition PR1302-0010 validée','2013-02-17 16:27:29','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal'),(140,NULL,1,'2013-02-17 18:27:56','2013-02-17 18:27:56',NULL,NULL,40,NULL,'Commande CO1107-0004 validée','2013-02-17 18:27:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order'),(141,NULL,1,'2013-02-17 18:38:14','2013-02-17 18:38:14',NULL,NULL,40,NULL,'Commande CO1302-0005 validée','2013-02-17 18:38:14','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order'),(142,NULL,1,'2013-02-26 22:57:50','2013-02-26 22:57:50',NULL,NULL,40,NULL,'Company pppp added into Dolibarr','2013-02-26 22:57:50','2014-12-21 12:50:33',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe'),(143,NULL,1,'2013-02-26 22:58:13','2013-02-26 22:58:13',NULL,NULL,40,NULL,'Company ttttt added into Dolibarr','2013-02-26 22:58:13','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe'),(144,NULL,1,'2013-02-27 10:00:00','2013-02-27 19:20:00',NULL,NULL,5,NULL,'Rendez-vous','2013-02-27 19:20:53','2013-02-27 18:20:53',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,'',33600,NULL,'',NULL,NULL),(145,NULL,1,'2013-02-27 19:28:00',NULL,NULL,NULL,2,NULL,'fdsfsd','2013-02-27 19:28:48','2013-02-27 18:29:53',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,1,-1,NULL,NULL,NULL,NULL,NULL,NULL),(146,NULL,1,'2013-03-06 10:05:07','2013-03-06 10:05:07',NULL,NULL,40,NULL,'Contrat (PROV3) validé dans Dolibarr','2013-03-06 10:05:07','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract'),(147,NULL,1,'2013-03-06 16:43:37','2013-03-06 16:43:37',NULL,NULL,40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2013-03-06 16:43:37','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice'),(148,NULL,1,'2013-03-06 16:44:12','2013-03-06 16:44:12',NULL,NULL,40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2013-03-06 16:44:12','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice'),(149,NULL,1,'2013-03-06 16:47:48','2013-03-06 16:47:48',NULL,NULL,40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2013-03-06 16:47:48','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice'),(150,NULL,1,'2013-03-06 16:48:16','2013-03-06 16:48:16',NULL,NULL,40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2013-03-06 16:48:16','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice'),(151,NULL,1,'2013-03-06 17:13:59','2013-03-06 17:13:59',NULL,NULL,40,NULL,'Société smith smith ajoutée dans Dolibarr','2013-03-06 17:13:59','2014-12-21 12:50:33',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe'),(152,NULL,1,'2013-03-08 10:02:22','2013-03-08 10:02:22',NULL,NULL,40,NULL,'Proposition (PROV12) validée dans Dolibarr','2013-03-08 10:02:22','2014-12-21 12:50:33',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal'),(203,NULL,1,'2013-03-09 19:39:27','2013-03-09 19:39:27',NULL,NULL,40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2013-03-09 19:39:27','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier'),(204,NULL,1,'2013-03-10 15:47:37','2013-03-10 15:47:37',NULL,NULL,40,'AC_COMPANY_CREATE','Patient créé','2013-03-10 15:47:37','2014-12-21 12:50:33',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe'),(205,NULL,1,'2013-03-10 15:57:32','2013-03-10 15:57:32',NULL,NULL,40,'AC_COMPANY_CREATE','Tiers créé','2013-03-10 15:57:32','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe'),(206,NULL,1,'2013-03-10 15:58:28','2013-03-10 15:58:28',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2013-03-10 15:58:28','2014-12-21 12:50:33',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice'),(207,NULL,1,'2013-03-19 09:38:10','2013-03-19 09:38:10',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2013-03-19 09:38:10','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice'),(208,NULL,1,'2013-03-20 14:30:11','2013-03-20 14:30:11',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2013-03-20 14:30:11','2014-12-21 12:50:33',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice'),(209,NULL,1,'2013-03-22 09:40:25','2013-03-22 09:40:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-22 09:40:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(210,NULL,1,'2013-03-23 17:16:25','2013-03-23 17:16:25',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2013-03-23 17:16:25','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice'),(211,NULL,1,'2013-03-23 18:08:27','2013-03-23 18:08:27',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2013-03-23 18:08:27','2014-12-21 12:50:33',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice'),(212,NULL,1,'2013-03-24 15:54:00','2013-03-24 15:54:00',NULL,NULL,40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2013-03-24 15:54:00','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,1,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice'),(213,NULL,1,'2013-11-07 01:02:39','2013-11-07 01:02:39',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:02:39','2014-12-21 12:50:33',1,NULL,NULL,27,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe'),(214,NULL,1,'2013-11-07 01:05:22','2013-11-07 01:05:22',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:05:22','2014-12-21 12:50:33',1,NULL,NULL,28,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe'),(215,NULL,1,'2013-11-07 01:07:07','2013-11-07 01:07:07',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:07','2014-12-21 12:50:33',1,NULL,NULL,29,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe'),(216,NULL,1,'2013-11-07 01:07:58','2013-11-07 01:07:58',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:07:58','2014-12-21 12:50:33',1,NULL,NULL,30,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe'),(217,NULL,1,'2013-11-07 01:10:09','2013-11-07 01:10:09',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:10:09','2014-12-21 12:50:33',1,NULL,NULL,31,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe'),(218,NULL,1,'2013-11-07 01:15:57','2013-11-07 01:15:57',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:15:57','2014-12-21 12:50:33',1,NULL,NULL,32,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe'),(219,NULL,1,'2013-11-07 01:16:51','2013-11-07 01:16:51',NULL,NULL,40,'AC_COMPANY_CREATE','Third party created','2013-11-07 01:16:51','2014-12-21 12:50:33',1,NULL,NULL,33,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe'),(220,NULL,1,'2014-03-02 17:24:04','2014-03-02 17:24:04',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2014-03-02 17:24:04','2014-12-21 12:50:33',1,NULL,NULL,18,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice'),(221,NULL,1,'2014-03-02 17:24:28','2014-03-02 17:24:28',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 17:24:28','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice'),(222,NULL,1,'2014-03-05 10:00:00','2014-03-05 10:00:00',NULL,NULL,5,NULL,'RDV John','2014-03-02 19:54:48','2014-03-02 18:55:29',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL),(223,NULL,1,'2014-03-13 10:00:00','2014-03-17 00:00:00',NULL,NULL,50,NULL,'Congress','2014-03-02 19:55:11','2014-03-02 18:55:11',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,-1,'',309600,NULL,'',NULL,NULL),(224,NULL,1,'2014-03-14 10:00:00',NULL,NULL,NULL,1,NULL,'Call john','2014-03-02 19:55:56','2014-03-02 18:55:56',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,1,0,'',NULL,NULL,'tttt',NULL,NULL),(225,NULL,1,'2014-03-02 20:11:31','2014-03-02 20:11:31',NULL,NULL,40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2014-03-02 20:11:31','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice'),(226,NULL,1,'2014-03-02 20:13:39','2014-03-02 20:13:39',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2014-03-02 20:13:39','2014-12-21 12:50:33',1,NULL,NULL,19,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice'),(227,NULL,1,'2014-03-03 19:20:10','2014-03-03 19:20:10',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2014-03-03 19:20:10','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice'),(228,NULL,1,'2014-03-03 19:20:25','2014-03-03 19:20:25',NULL,NULL,40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2014-03-03 19:20:25','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice'),(229,NULL,1,'2014-03-03 19:20:56','2014-03-03 19:20:56',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2014-03-03 19:20:56','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice'),(230,NULL,1,'2014-03-03 19:21:29','2014-03-03 19:21:29',NULL,NULL,40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2014-03-03 19:21:29','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice'),(231,NULL,1,'2014-03-03 19:22:16','2014-03-03 19:22:16',NULL,NULL,40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2014-03-03 19:22:16','2014-12-21 12:50:33',1,NULL,NULL,1,NULL,0,1,0,1,0,0,1,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice');
+/*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_actioncomm_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_actioncomm_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_actioncomm_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_actioncomm_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_actioncomm_extrafields`
+--
+
+LOCK TABLES `llx_actioncomm_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_actioncomm_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_actioncomm_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_actioncomm_resources`
+--
+
+DROP TABLE IF EXISTS `llx_actioncomm_resources`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_actioncomm_resources` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_actioncomm` int(11) NOT NULL,
+  `element_type` varchar(50) NOT NULL,
+  `fk_element` int(11) NOT NULL,
+  `answer_status` varchar(50) DEFAULT NULL,
+  `mandatory` smallint(6) DEFAULT NULL,
+  `transparency` smallint(6) DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_actioncomm_resources_idx1` (`fk_actioncomm`,`element_type`,`fk_element`),
+  KEY `idx_actioncomm_resources_fk_element` (`fk_element`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_actioncomm_resources`
+--
+
+LOCK TABLES `llx_actioncomm_resources` WRITE;
+/*!40000 ALTER TABLE `llx_actioncomm_resources` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_actioncomm_resources` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent`
+--
+
+DROP TABLE IF EXISTS `llx_adherent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `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,
+  `login` varchar(50) DEFAULT NULL,
+  `pass` varchar(50) DEFAULT NULL,
+  `fk_adherent_type` int(11) NOT NULL,
+  `morphy` varchar(3) NOT NULL,
+  `societe` varchar(128) DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `address` text,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `state_id` varchar(50) DEFAULT NULL,
+  `country` varchar(50) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `skype` varchar(255) DEFAULT NULL,
+  `phone` varchar(30) DEFAULT NULL,
+  `phone_perso` varchar(30) DEFAULT NULL,
+  `phone_mobile` varchar(30) DEFAULT NULL,
+  `birth` date DEFAULT NULL,
+  `photo` varchar(255) DEFAULT NULL,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `public` smallint(6) NOT NULL DEFAULT '0',
+  `datefin` datetime DEFAULT NULL,
+  `note` text,
+  `datevalid` datetime DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_mod` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `canvas` varchar(32) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_adherent_login` (`login`,`entity`),
+  UNIQUE KEY `uk_adherent_fk_soc` (`fk_soc`),
+  KEY `idx_adherent_fk_adherent_type` (`fk_adherent_type`),
+  CONSTRAINT `adherent_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_adherent_adherent_type` FOREIGN KEY (`fk_adherent_type`) REFERENCES `llx_adherent_type` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_adherent`
+--
+
+LOCK TABLES `llx_adherent` WRITE;
+/*!40000 ALTER TABLE `llx_adherent` DISABLE KEYS */;
+INSERT INTO `llx_adherent` VALUES (1,1,NULL,NULL,'Smith','Vick','vsmith','vsx1n8tf',2,'phy',NULL,10,NULL,NULL,NULL,NULL,'102','vsmith@email.com',NULL,NULL,NULL,NULL,'1960-07-07',NULL,1,0,'2012-07-09 00:00:00',NULL,'2010-07-10 15:12:56','2010-07-08 23:50:00','2013-03-20 13:30:11',1,1,1,NULL,NULL),(2,1,NULL,NULL,'Dupont','Alain','adupont','adupont',2,'phy',NULL,12,NULL,NULL,NULL,NULL,'1','toto@aa.com',NULL,NULL,NULL,NULL,'1972-07-08',NULL,1,1,'2017-07-17 00:00:00',NULL,'2010-07-10 15:03:32','2010-07-10 15:03:09','2013-03-06 15:48:16',1,1,1,NULL,NULL),(3,1,NULL,NULL,'john','doe','john','8bs6gty5',2,'phy',NULL,18,NULL,NULL,NULL,NULL,'1','johndoe@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,'2011-07-18 21:28:00','2011-07-18 21:10:09','2012-12-09 19:14:42',1,1,1,NULL,NULL),(4,1,NULL,NULL,'smith','smith','Smith','s6hjp10f',2,'phy',NULL,24,NULL,NULL,NULL,NULL,'11','smith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,'2011-07-18 21:27:52','2011-07-18 21:27:44','2013-03-06 16:13:59',1,1,1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_adherent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_adherent_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent_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,
+  `zzz` varchar(125) DEFAULT NULL,
+  `aaa` varchar(255) DEFAULT NULL,
+  `sssss` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_adherent_options` (`fk_object`),
+  KEY `idx_adherent_extrafields` (`fk_object`)
+) ENGINE=InnoDB AUTO_INCREMENT=64 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_adherent_extrafields`
+--
+
+LOCK TABLES `llx_adherent_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_adherent_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_adherent_extrafields` VALUES (2,'2011-06-19 12:03:23',12,'aaa',NULL,NULL,NULL),(3,'2011-06-19 14:19:32',13,NULL,NULL,NULL,NULL),(8,'2011-06-19 18:08:09',7,'zzz',NULL,NULL,NULL),(34,'2011-06-22 10:06:51',14,'moo',NULL,NULL,NULL),(37,'2011-06-22 10:43:55',16,'z',NULL,NULL,NULL),(40,'2011-06-22 10:55:37',17,NULL,NULL,NULL,NULL),(41,'2011-06-22 10:56:07',18,'l',NULL,NULL,NULL),(43,'2011-06-23 07:40:56',19,NULL,NULL,NULL,NULL),(44,'2011-06-26 18:13:20',20,'gdfgdf',NULL,NULL,NULL),(46,'2011-06-26 19:29:23',22,'gdfgdf',NULL,NULL,NULL),(47,'2011-07-03 16:17:56',23,NULL,NULL,NULL,NULL),(48,'2011-07-03 16:21:05',24,NULL,NULL,NULL,NULL),(49,'2011-07-03 16:30:54',25,NULL,NULL,NULL,NULL),(50,'2011-07-03 16:48:13',26,NULL,NULL,NULL,NULL),(51,'2011-07-03 16:51:36',27,NULL,NULL,NULL,NULL),(52,'2011-07-03 16:53:37',28,NULL,NULL,NULL,NULL),(53,'2011-07-03 16:54:24',29,NULL,NULL,NULL,NULL),(54,'2011-07-05 08:21:35',30,NULL,NULL,NULL,NULL),(55,'2011-07-05 08:26:15',31,NULL,NULL,NULL,NULL),(59,'2011-07-13 11:18:55',46,NULL,NULL,NULL,NULL),(61,'2011-07-13 11:50:36',47,NULL,NULL,NULL,NULL),(62,'2011-07-18 19:10:09',3,NULL,NULL,NULL,NULL),(63,'2011-07-18 19:27:44',4,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_adherent_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent_type`
+--
+
+DROP TABLE IF EXISTS `llx_adherent_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent_type` (
+  `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,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `libelle` varchar(50) NOT NULL,
+  `cotisation` varchar(3) NOT NULL DEFAULT 'yes',
+  `vote` varchar(3) NOT NULL DEFAULT 'yes',
+  `note` text,
+  `mail_valid` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_adherent_type_libelle` (`libelle`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_adherent_type`
+--
+
+LOCK TABLES `llx_adherent_type` WRITE;
+/*!40000 ALTER TABLE `llx_adherent_type` DISABLE KEYS */;
+INSERT INTO `llx_adherent_type` VALUES (1,1,'2010-07-08 21:41:55',1,'Board members','1','1','','<br />'),(2,1,'2010-07-08 21:41:43',1,'Standard members','1','0','','<br />');
+/*!40000 ALTER TABLE `llx_adherent_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_adherent_type_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_adherent_type_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_adherent_type_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_adherent_type_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_adherent_type_extrafields`
+--
+
+LOCK TABLES `llx_adherent_type_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_adherent_type_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_adherent_type_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanced_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_advanced_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanced_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `elementtype` varchar(64) NOT NULL,
+  `name` varchar(64) NOT NULL,
+  `label` varchar(64) NOT NULL,
+  `format` varchar(8) NOT NULL,
+  `fieldsize` int(11) DEFAULT NULL,
+  `maxlength` int(11) DEFAULT NULL,
+  `options` varchar(255) DEFAULT NULL,
+  `rang` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_advanced_extrafields_name` (`elementtype`,`entity`,`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanced_extrafields`
+--
+
+LOCK TABLES `llx_advanced_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_advanced_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanced_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanced_extrafields_options`
+--
+
+DROP TABLE IF EXISTS `llx_advanced_extrafields_options`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanced_extrafields_options` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_extrafields` int(11) NOT NULL,
+  `value` varchar(255) NOT NULL,
+  `rang` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanced_extrafields_options_fk_advanced_extrafields` (`fk_extrafields`),
+  CONSTRAINT `fk_advanced_extrafields_options_fk_advanced_extrafields` FOREIGN KEY (`fk_extrafields`) REFERENCES `llx_advanced_extrafields` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanced_extrafields_options`
+--
+
+LOCK TABLES `llx_advanced_extrafields_options` WRITE;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_options` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_options` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_advanced_extrafields_values`
+--
+
+DROP TABLE IF EXISTS `llx_advanced_extrafields_values`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_advanced_extrafields_values` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime DEFAULT NULL,
+  `datem` datetime DEFAULT NULL,
+  `fk_element` int(11) NOT NULL,
+  `fk_extrafields` int(11) NOT NULL,
+  `value` varchar(255) DEFAULT NULL,
+  `fk_user_create` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_advanced_extrafields_values_fk_advanced_extrafields` (`fk_extrafields`,`entity`),
+  CONSTRAINT `fk_advanced_extrafields_values_fk_advanced_extrafields` FOREIGN KEY (`fk_extrafields`) REFERENCES `llx_advanced_extrafields` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_advanced_extrafields_values`
+--
+
+LOCK TABLES `llx_advanced_extrafields_values` WRITE;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_values` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_advanced_extrafields_values` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank`
+--
+
+DROP TABLE IF EXISTS `llx_bank`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datev` date DEFAULT NULL,
+  `dateo` date DEFAULT NULL,
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `label` varchar(255) DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_rappro` int(11) DEFAULT NULL,
+  `fk_type` varchar(6) DEFAULT NULL,
+  `num_releve` varchar(50) DEFAULT NULL,
+  `num_chq` varchar(50) DEFAULT NULL,
+  `rappro` tinyint(4) DEFAULT '0',
+  `note` text,
+  `fk_bordereau` int(11) DEFAULT '0',
+  `banque` varchar(255) DEFAULT NULL,
+  `emetteur` varchar(255) DEFAULT NULL,
+  `author` varchar(40) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_bank_datev` (`datev`),
+  KEY `idx_bank_dateo` (`dateo`),
+  KEY `idx_bank_fk_account` (`fk_account`),
+  KEY `idx_bank_rappro` (`rappro`)
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank`
+--
+
+LOCK TABLES `llx_bank` WRITE;
+/*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
+INSERT INTO `llx_bank` VALUES (1,'2010-07-08 23:56:14','2013-03-07 21:28:51','2010-07-08','2010-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL),(2,'2010-07-09 00:00:24','0000-00-00 00:00:00','2010-07-09','2010-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(3,'2010-07-10 13:33:42','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(4,'2010-07-10 14:59:41','0000-00-00 00:00:00','2010-07-10','2010-07-10',0.02000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,'Client salon invidivdu',NULL),(5,'2011-07-18 20:50:24','0000-00-00 00:00:00','2011-07-08','2011-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL),(6,'2011-07-18 20:50:47','0000-00-00 00:00:00','2011-07-08','2011-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(8,'2011-08-01 03:34:11','2013-03-07 21:28:51','2011-08-01','2011-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL),(12,'2011-08-05 23:11:37','2013-03-07 21:33:57','2011-08-05','2011-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL),(13,'2011-08-06 20:33:54','0000-00-00 00:00:00','2011-08-06','2011-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(14,'2011-08-08 02:53:40','0000-00-00 00:00:00','2011-08-08','2011-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(15,'2011-08-08 02:55:58','2013-03-07 21:39:20','2011-08-08','2011-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL),(16,'2012-12-09 15:28:44','2012-12-09 14:28:44','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(17,'2012-12-09 15:28:53','2012-12-09 14:33:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(18,'2012-12-09 17:35:55','2012-12-09 16:35:55','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(19,'2012-12-09 17:37:02','2012-12-09 16:37:02','2012-12-09','2012-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(20,'2012-12-09 18:35:07','2012-12-09 17:35:07','2012-12-09','2012-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(21,'2012-12-12 18:54:33','2013-03-07 21:28:51','2012-12-12','2012-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL),(22,'2013-03-06 16:48:16','2013-03-06 15:48:16','2013-03-06','2013-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(23,'2013-03-20 14:30:11','2013-03-20 13:30:11','2013-03-20','2013-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(24,'2014-03-02 19:57:58','2014-03-02 18:57:58','2013-07-09','2013-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL),(25,'2014-03-02 19:59:48','2014-03-02 18:59:48','2013-03-22','2013-03-22',30.00000000,'(CustomerInvoicePayment)',1,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(26,'2014-03-02 20:01:39','2014-03-02 19:01:39','2013-03-19','2013-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(27,'2014-03-02 20:02:06','2014-03-02 19:02:06','2013-03-21','2013-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL),(28,'2014-03-03 19:22:32','2014-03-03 18:22:32','2013-10-03','2013-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL),(29,'2014-03-03 19:23:16','2014-03-03 18:23:16','2013-03-10','2013-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_account`
+--
+
+DROP TABLE IF EXISTS `llx_bank_account`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_account` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ref` varchar(12) NOT NULL,
+  `label` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `bank` varchar(60) DEFAULT NULL,
+  `code_banque` varchar(8) DEFAULT NULL,
+  `code_guichet` varchar(6) DEFAULT NULL,
+  `number` varchar(255) DEFAULT NULL,
+  `cle_rib` varchar(5) DEFAULT NULL,
+  `bic` varchar(11) DEFAULT NULL,
+  `iban_prefix` varchar(34) DEFAULT NULL,
+  `country_iban` varchar(2) DEFAULT NULL,
+  `cle_iban` varchar(2) DEFAULT NULL,
+  `domiciliation` varchar(255) DEFAULT NULL,
+  `state_id` varchar(50) DEFAULT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `proprio` varchar(60) DEFAULT NULL,
+  `owner_address` text,
+  `courant` smallint(6) NOT NULL DEFAULT '0',
+  `clos` smallint(6) NOT NULL DEFAULT '0',
+  `rappro` smallint(6) DEFAULT '1',
+  `url` varchar(128) DEFAULT NULL,
+  `account_number` varchar(32) DEFAULT NULL,
+  `accountancy_journal` varchar(3) DEFAULT NULL,
+  `currency_code` varchar(3) NOT NULL,
+  `min_allowed` int(11) DEFAULT '0',
+  `min_desired` int(11) DEFAULT '0',
+  `comment` text,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bank_account_label` (`label`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_account`
+--
+
+LOCK TABLES `llx_bank_account` WRITE;
+/*!40000 ALTER TABLE `llx_bank_account` DISABLE KEYS */;
+INSERT INTO `llx_bank_account` VALUES (1,'2010-07-08 23:56:14','2014-03-02 15:39:52','SWIBAC','Swiss bank account',1,'TresorGold Bank','','','123456789','','','',NULL,NULL,'21 jum street',NULL,169,'Mac Golder','11 big road,\r\nSan Francisco',1,0,1,NULL,'',NULL,'EUR',1500,1500,'',NULL,NULL),(2,'2010-07-09 00:00:24','2013-03-24 14:50:40','SWIBAC2','Swiss bank account 2',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,169,NULL,NULL,1,1,1,NULL,'',NULL,'EUR',200,400,'',NULL,NULL),(3,'2010-07-10 13:33:42','2010-07-10 11:33:42','ACCOUNTCASH','Account for cash',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'3',1,NULL,NULL,2,0,1,NULL,'',NULL,'EUR',0,0,'<br />',NULL,NULL);
+/*!40000 ALTER TABLE `llx_bank_account` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_categ`
+--
+
+DROP TABLE IF EXISTS `llx_bank_categ`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_categ` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_categ`
+--
+
+LOCK TABLES `llx_bank_categ` WRITE;
+/*!40000 ALTER TABLE `llx_bank_categ` DISABLE KEYS */;
+INSERT INTO `llx_bank_categ` VALUES (1,'Bank category one',1),(2,'Bank category two',1);
+/*!40000 ALTER TABLE `llx_bank_categ` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_class`
+--
+
+DROP TABLE IF EXISTS `llx_bank_class`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_class` (
+  `lineid` int(11) NOT NULL,
+  `fk_categ` int(11) NOT NULL,
+  UNIQUE KEY `uk_bank_class_lineid` (`lineid`,`fk_categ`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_class`
+--
+
+LOCK TABLES `llx_bank_class` WRITE;
+/*!40000 ALTER TABLE `llx_bank_class` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_bank_class` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bank_url`
+--
+
+DROP TABLE IF EXISTS `llx_bank_url`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bank_url` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_bank` int(11) DEFAULT NULL,
+  `url_id` int(11) DEFAULT NULL,
+  `url` varchar(255) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `type` varchar(20) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bank_url` (`fk_bank`,`type`)
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bank_url`
+--
+
+LOCK TABLES `llx_bank_url` WRITE;
+/*!40000 ALTER TABLE `llx_bank_url` DISABLE KEYS */;
+INSERT INTO `llx_bank_url` VALUES (1,4,1,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(2,4,9,'/dolibarrnew/compta/fiche.php?socid=','Client salon invidivdu','company'),(3,5,2,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(4,5,2,'/comm/fiche.php?socid=','Belin SARL','company'),(5,6,3,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(6,6,2,'/comm/fiche.php?socid=','Belin SARL','company'),(9,8,5,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(10,8,7,'/comm/fiche.php?socid=','Generic customer','company'),(17,12,4,'/compta/payment_sc/fiche.php?id=','(paiement)','payment_sc'),(18,12,4,'/compta/charges.php?id=','Assurance Chomage (fff)','sc'),(19,13,6,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(20,13,7,'/dolibarrnew/comm/fiche.php?socid=','Generic customer','company'),(21,14,8,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(22,14,2,'/comm/fiche.php?socid=','Belin SARL','company'),(23,15,9,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(24,15,10,'/comm/fiche.php?socid=','Smith Vick','company'),(25,16,17,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(26,16,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(27,17,18,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(28,17,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(29,18,19,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(30,18,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(31,19,20,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(32,19,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(33,20,21,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(34,20,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(35,21,23,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(36,21,1,'/comm/fiche.php?socid=','ABC and Co','company'),(37,22,24,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(38,22,12,'/dolibarrnew/comm/fiche.php?socid=','Dupont Alain','company'),(39,23,25,'/dolibarrnew/compta/paiement/fiche.php?id=','(paiement)','payment'),(40,23,10,'/dolibarrnew/comm/fiche.php?socid=','Smith Vick','company'),(41,24,26,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(42,24,1,'/comm/fiche.php?socid=','ABC and Co','company'),(43,25,27,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(44,25,18,'/comm/fiche.php?socid=','doe john','company'),(45,26,29,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(46,26,1,'/comm/fiche.php?socid=','ABC and Co','company'),(47,27,30,'/compta/paiement/fiche.php?id=','(paiement)','payment'),(48,27,1,'/comm/fiche.php?socid=','ABC and Co','company'),(49,28,32,'/dolibarr_new/compta/paiement/fiche.php?id=','(paiement)','payment'),(50,28,1,'/dolibarr_new/comm/fiche.php?socid=','ABC and Co','company'),(51,29,33,'/dolibarr_new/compta/paiement/fiche.php?id=','(paiement)','payment'),(52,29,1,'/dolibarr_new/comm/fiche.php?socid=','ABC and Co','company');
+/*!40000 ALTER TABLE `llx_bank_url` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bookkeeping`
+--
+
+DROP TABLE IF EXISTS `llx_bookkeeping`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bookkeeping` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `doc_date` date NOT NULL,
+  `doc_type` varchar(30) NOT NULL,
+  `doc_ref` varchar(30) NOT NULL,
+  `fk_doc` int(11) NOT NULL,
+  `fk_docdet` int(11) NOT NULL,
+  `code_tiers` varchar(24) DEFAULT NULL,
+  `numero_compte` varchar(50) DEFAULT NULL,
+  `label_compte` varchar(128) NOT NULL,
+  `debit` double NOT NULL,
+  `credit` double NOT NULL,
+  `montant` double NOT NULL,
+  `sens` varchar(1) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `code_journal` varchar(10) DEFAULT NULL,
+  `piece_num` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bookkeeping`
+--
+
+LOCK TABLES `llx_bookkeeping` WRITE;
+/*!40000 ALTER TABLE `llx_bookkeeping` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_bookkeeping` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bookmark`
+--
+
+DROP TABLE IF EXISTS `llx_bookmark`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bookmark` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_user` int(11) NOT NULL,
+  `dateb` datetime DEFAULT NULL,
+  `url` varchar(255) NOT NULL,
+  `target` varchar(16) DEFAULT NULL,
+  `title` varchar(64) DEFAULT NULL,
+  `favicon` varchar(24) DEFAULT NULL,
+  `position` int(11) DEFAULT '0',
+  `entity` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bookmark_url` (`fk_user`,`url`),
+  UNIQUE KEY `uk_bookmark_title` (`fk_user`,`title`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bookmark`
+--
+
+LOCK TABLES `llx_bookmark` WRITE;
+/*!40000 ALTER TABLE `llx_bookmark` DISABLE KEYS */;
+INSERT INTO `llx_bookmark` VALUES (1,NULL,0,'2010-07-09 01:29:03','http://wiki.dolibarr.org','1','Online documentation','none',1,1),(2,NULL,0,'2010-07-09 01:30:15','http://www.dolibarr.org','1','Official portal','none',2,1),(3,NULL,0,'2010-07-09 01:30:53','http://www.dolistore.com','1','DoliStore','none',10,1),(4,NULL,0,'2010-07-09 01:31:35','http://asso.dolibarr.org/index.php/Main_Page','1','The foundation','none',0,1),(5,NULL,0,'2014-03-02 16:40:41','http://www.facebook.com/dolibarr','1','Facebook page','none',50,1),(6,NULL,0,'2014-03-02 16:41:12','http://www.twitter.com/dolibarr','1','Twitter channel','none',60,1),(7,NULL,0,'2014-03-02 16:42:08','http://plus.google.com/+DolibarrOrg','1','Google+ page','none',55,1);
+/*!40000 ALTER TABLE `llx_bookmark` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_bordereau_cheque`
+--
+
+DROP TABLE IF EXISTS `llx_bordereau_cheque`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_bordereau_cheque` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime NOT NULL,
+  `date_bordereau` date DEFAULT NULL,
+  `number` varchar(16) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `amount` double(24,8) NOT NULL,
+  `nbcheque` smallint(6) NOT NULL,
+  `fk_bank_account` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `note` text,
+  `statut` smallint(6) NOT NULL DEFAULT '0',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_bordereau_cheque` (`number`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_bordereau_cheque`
+--
+
+LOCK TABLES `llx_bordereau_cheque` WRITE;
+/*!40000 ALTER TABLE `llx_bordereau_cheque` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_bordereau_cheque` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_boxes`
+--
+
+DROP TABLE IF EXISTS `llx_boxes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_boxes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `box_id` int(11) NOT NULL,
+  `position` smallint(6) NOT NULL,
+  `box_order` varchar(3) NOT NULL,
+  `fk_user` int(11) NOT NULL DEFAULT '0',
+  `maxline` int(11) DEFAULT NULL,
+  `params` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_boxes` (`entity`,`box_id`,`position`,`fk_user`),
+  KEY `idx_boxes_boxid` (`box_id`),
+  KEY `idx_boxes_fk_user` (`fk_user`),
+  CONSTRAINT `fk_boxes_box_id` FOREIGN KEY (`box_id`) REFERENCES `llx_boxes_def` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=787 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_boxes`
+--
+
+LOCK TABLES `llx_boxes` WRITE;
+/*!40000 ALTER TABLE `llx_boxes` DISABLE KEYS */;
+INSERT INTO `llx_boxes` VALUES (12,1,20,0,'A09',0,NULL,NULL),(73,1,21,0,'B16',0,NULL,NULL),(153,1,288,0,'A21',0,NULL,NULL),(154,1,289,0,'A07',0,NULL,NULL),(155,1,290,0,'A17',0,NULL,NULL),(160,1,295,0,'A13',0,NULL,NULL),(161,1,296,0,'A15',0,NULL,NULL),(162,1,297,0,'B12',0,NULL,NULL),(163,1,298,0,'B20',0,NULL,NULL),(164,1,299,0,'B10',0,NULL,NULL),(177,1,309,0,'B18',0,NULL,NULL),(240,1,316,0,'A05',0,NULL,NULL),(241,1,317,0,'B04',0,NULL,NULL),(253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(372,1,334,0,'0',0,NULL,NULL),(373,1,335,0,'0',0,NULL,NULL),(374,1,336,0,'0',0,NULL,NULL),(439,1,337,0,'0',0,NULL,NULL),(440,1,338,0,'0',0,NULL,NULL),(441,1,339,0,'0',0,NULL,NULL),(442,1,340,0,'0',0,NULL,NULL),(531,1,341,0,'0',0,NULL,NULL),(532,1,342,0,'0',0,NULL,NULL),(533,1,343,0,'0',0,NULL,NULL),(534,1,344,0,'0',0,NULL,NULL),(535,1,345,0,'0',0,NULL,NULL),(772,1,343,0,'A01',1,NULL,NULL),(773,1,342,0,'A02',1,NULL,NULL),(774,1,335,0,'A03',1,NULL,NULL),(775,1,339,0,'A04',1,NULL,NULL),(776,1,317,0,'A05',1,NULL,NULL),(777,1,299,0,'A06',1,NULL,NULL),(778,1,289,0,'A07',1,NULL,NULL),(779,1,336,0,'B01',1,NULL,NULL),(780,1,341,0,'B02',1,NULL,NULL),(781,1,340,0,'B03',1,NULL,NULL),(782,1,298,0,'B04',1,NULL,NULL),(783,1,295,0,'B05',1,NULL,NULL),(784,1,290,0,'B06',1,NULL,NULL),(785,1,297,0,'B07',1,NULL,NULL),(786,1,20,0,'B08',1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_boxes_def`
+--
+
+DROP TABLE IF EXISTS `llx_boxes_def`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_boxes_def` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `file` varchar(200) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `note` varchar(130) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_boxes_def` (`file`,`entity`,`note`)
+) ENGINE=InnoDB AUTO_INCREMENT=347 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_boxes_def`
+--
+
+LOCK TABLES `llx_boxes_def` WRITE;
+/*!40000 ALTER TABLE `llx_boxes_def` DISABLE KEYS */;
+INSERT INTO `llx_boxes_def` VALUES (20,'box_actions.php',1,'2010-07-08 11:29:29',NULL),(21,'box_bookmarks.php',1,'2010-07-08 11:30:03',NULL),(188,'box_services_vendus.php',1,'2011-08-05 20:40:27',NULL),(288,'box_clients.php',1,'2012-12-21 17:08:59',NULL),(289,'box_prospect.php',1,'2012-12-21 17:08:59',NULL),(290,'box_contacts.php',1,'2012-12-21 17:08:59',NULL),(295,'box_propales.php',1,'2013-01-02 20:33:16',NULL),(296,'box_contracts.php',1,'2013-01-02 20:33:17',NULL),(297,'box_services_expired.php',1,'2013-01-02 20:33:17',NULL),(298,'box_services_contracts.php',1,'2013-01-02 20:33:17',NULL),(299,'box_commandes.php',1,'2013-01-02 20:33:19',NULL),(309,'box_activity.php',1,'2013-01-16 15:37:16','(WarningUsingThisBoxSlowDown)'),(316,'box_produits.php',1,'2013-01-19 17:16:10',NULL),(317,'box_produits_alerte_stock.php',1,'2013-01-19 17:16:10',NULL),(323,'box_actions.php',2,'2013-03-13 15:29:19',NULL),(324,'box_clients.php',2,'2013-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2013-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2013-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2013-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2013-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2013-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2013-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2013-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2013-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2013-03-13 20:33:09',NULL),(334,'box_factures_imp.php',1,'2013-03-20 20:04:28',NULL),(335,'box_factures.php',1,'2013-03-20 20:04:28',NULL),(336,'box_comptes.php',1,'2013-03-20 20:04:28',NULL),(337,'box_fournisseurs.php',1,'2013-03-22 09:24:29',NULL),(338,'box_factures_fourn_imp.php',1,'2013-03-22 09:24:29',NULL),(339,'box_factures_fourn.php',1,'2013-03-22 09:24:29',NULL),(340,'box_supplier_orders.php',1,'2013-03-22 09:24:29',NULL),(341,'box_graph_product_distribution.php',1,'2013-11-06 23:35:12',NULL),(342,'box_graph_orders_permonth.php',1,'2013-11-06 23:35:12',NULL),(343,'box_graph_invoices_permonth.php',1,'2013-11-06 23:35:12',NULL),(344,'box_graph_invoices_supplier_permonth.php',1,'2013-11-06 23:35:12',NULL),(345,'box_graph_orders_supplier_permonth.php',1,'2013-11-06 23:35:12',NULL),(346,'box_googlemaps@google',1,'2013-11-07 00:01:39',NULL);
+/*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_action_trigger`
+--
+
+DROP TABLE IF EXISTS `llx_c_action_trigger`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_action_trigger` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(32) NOT NULL,
+  `label` varchar(128) NOT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  `elementtype` varchar(16) NOT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_action_trigger_code` (`code`),
+  KEY `idx_action_trigger_rang` (`rang`)
+) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_action_trigger`
+--
+
+LOCK TABLES `llx_c_action_trigger` WRITE;
+/*!40000 ALTER TABLE `llx_c_action_trigger` DISABLE KEYS */;
+INSERT INTO `llx_c_action_trigger` VALUES (1,'FICHINTER_VALIDATE','Validation fiche intervention','Executed when a intervention is validated','ficheinter',18),(2,'BILL_VALIDATE','Validation facture client','Executed when a customer invoice is approved','facture',6),(3,'ORDER_SUPPLIER_APPROVE','Approbation commande fournisseur','Executed when a supplier order is approved','order_supplier',11),(4,'ORDER_SUPPLIER_REFUSE','Refus commande fournisseur','Executed when a supplier order is refused','order_supplier',12),(5,'ORDER_VALIDATE','Validation commande client','Executed when a customer order is validated','commande',4),(6,'PROPAL_VALIDATE','Validation proposition client','Executed when a commercial proposal is validated','propal',2),(9,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1),(10,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(11,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',17),(12,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(13,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(14,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(15,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(16,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(17,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',10),(18,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',13),(19,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',14),(20,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',15),(21,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',16),(22,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',19),(23,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',20),(24,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',21),(25,'MEMBER_SUBSCRIPTION','Member subscribed','Executed when a member is subscribed','member',22),(26,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',23),(27,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',24),(28,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29),(30,'PROJECT_CREATE','Project creation','Executed when a project is created','project',30),(31,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',31),(32,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',32),(33,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',33),(34,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',34),(35,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(36,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(37,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(38,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(39,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(41,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(42,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2);
+/*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_actioncomm`
+--
+
+DROP TABLE IF EXISTS `llx_c_actioncomm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_actioncomm` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `type` varchar(10) NOT NULL DEFAULT 'system',
+  `libelle` varchar(48) NOT NULL,
+  `module` varchar(16) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `todo` tinyint(4) DEFAULT NULL,
+  `position` int(11) NOT NULL DEFAULT '0',
+  `color` varchar(9) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_actioncomm` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_actioncomm`
+--
+
+LOCK TABLES `llx_c_actioncomm` WRITE;
+/*!40000 ALTER TABLE `llx_c_actioncomm` DISABLE KEYS */;
+INSERT INTO `llx_c_actioncomm` VALUES (1,'AC_TEL','system','Phone call',NULL,1,NULL,2,NULL),(2,'AC_FAX','system','Send Fax',NULL,1,NULL,3,NULL),(3,'AC_PROP','systemauto','Send commercial proposal by email','propal',0,NULL,10,NULL),(4,'AC_EMAIL','system','Send Email',NULL,1,NULL,4,NULL),(5,'AC_RDV','system','Rendez-vous',NULL,1,NULL,1,NULL),(8,'AC_COM','systemauto','Send customer order by email','order',0,NULL,8,NULL),(9,'AC_FAC','systemauto','Send customer invoice by email','invoice',0,NULL,6,NULL),(10,'AC_SHIP','systemauto','Send shipping by email','shipping',0,NULL,11,NULL),(11,'AC_INT','system','Intervention on site',NULL,1,NULL,4,NULL),(30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,NULL,9,NULL),(31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,NULL,7,NULL),(40,'AC_OTH_AUTO','systemauto','Other (automatically inserted events)',NULL,1,NULL,20,NULL),(50,'AC_OTH','system','Other (manually inserted events)',NULL,1,NULL,5,NULL),(100700,'AC_CABMED','module','Send document by email','cabinetmed',0,NULL,100,NULL);
+/*!40000 ALTER TABLE `llx_c_actioncomm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_availability`
+--
+
+DROP TABLE IF EXISTS `llx_c_availability`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_availability` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(60) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_availability` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_availability`
+--
+
+LOCK TABLES `llx_c_availability` WRITE;
+/*!40000 ALTER TABLE `llx_c_availability` DISABLE KEYS */;
+INSERT INTO `llx_c_availability` VALUES (1,'AV_NOW','Immediate',1),(2,'AV_1W','1 week',1),(3,'AV_2W','2 weeks',1),(4,'AV_3W','3 weeks',1);
+/*!40000 ALTER TABLE `llx_c_availability` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_barcode_type`
+--
+
+DROP TABLE IF EXISTS `llx_c_barcode_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_barcode_type` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(16) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `libelle` varchar(50) NOT NULL,
+  `coder` varchar(16) NOT NULL,
+  `example` varchar(16) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_barcode_type`
+--
+
+LOCK TABLES `llx_c_barcode_type` WRITE;
+/*!40000 ALTER TABLE `llx_c_barcode_type` DISABLE KEYS */;
+INSERT INTO `llx_c_barcode_type` VALUES (1,'EAN8',1,'EAN8','0','1234567'),(2,'EAN13',1,'EAN13','0','123456789012'),(3,'UPC',1,'UPC','0','123456789012'),(4,'ISBN',1,'ISBN','0','123456789'),(5,'C39',1,'Code 39','0','1234567890'),(6,'C128',1,'Code 128','0','ABCD1234567890');
+/*!40000 ALTER TABLE `llx_c_barcode_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_chargesociales`
+--
+
+DROP TABLE IF EXISTS `llx_c_chargesociales`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_chargesociales` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `libelle` varchar(80) DEFAULT NULL,
+  `deductible` smallint(6) NOT NULL DEFAULT '0',
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `code` varchar(12) NOT NULL,
+  `fk_pays` int(11) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  `accountancy_code` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=231 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_chargesociales`
+--
+
+LOCK TABLES `llx_c_chargesociales` WRITE;
+/*!40000 ALTER TABLE `llx_c_chargesociales` DISABLE KEYS */;
+INSERT INTO `llx_c_chargesociales` VALUES (1,'Allocations familiales',1,1,'TAXFAM',1,NULL,NULL),(2,'CSG Deductible',1,1,'TAXCSGD',1,NULL,NULL),(3,'CSG/CRDS NON Deductible',0,1,'TAXCSGND',1,NULL,NULL),(10,'Taxe apprentissage',0,1,'TAXAPP',1,NULL,NULL),(11,'Taxe professionnelle',0,1,'TAXPRO',1,NULL,NULL),(12,'Cotisation foncière des entreprises',0,1,'TAXCFE',1,NULL,NULL),(13,'Cotisation sur la valeur ajoutée des entreprises',0,1,'TAXCVAE',1,NULL,NULL),(20,'Impots locaux/fonciers',0,1,'TAXFON',1,NULL,NULL),(25,'Impots revenus',0,1,'TAXREV',1,NULL,NULL),(30,'Assurance Sante',0,1,'TAXSECU',1,NULL,NULL),(40,'Mutuelle',0,1,'TAXMUT',1,NULL,NULL),(50,'Assurance vieillesse',0,1,'TAXRET',1,NULL,NULL),(60,'Assurance Chomage',0,1,'TAXCHOM',1,NULL,NULL),(201,'ONSS',1,1,'TAXBEONSS',2,NULL,NULL),(210,'Precompte professionnel',1,1,'TAXBEPREPRO',2,NULL,NULL),(220,'Prime d\'existence',1,1,'TAXBEPRIEXI',2,NULL,NULL),(230,'Precompte immobilier',1,1,'TAXBEPREIMMO',2,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_chargesociales` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_civilite`
+--
+
+DROP TABLE IF EXISTS `llx_c_civilite`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_civilite` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(6) NOT NULL,
+  `civilite` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_civilite`
+--
+
+LOCK TABLES `llx_c_civilite` WRITE;
+/*!40000 ALTER TABLE `llx_c_civilite` DISABLE KEYS */;
+INSERT INTO `llx_c_civilite` VALUES (1,'MME','Madame',1,NULL),(3,'MR','Monsieur',1,NULL),(5,'MLE','Mademoiselle',1,NULL),(7,'MTRE','Maître',1,NULL),(8,'DR','Docteur',1,NULL);
+/*!40000 ALTER TABLE `llx_c_civilite` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_civility`
+--
+
+DROP TABLE IF EXISTS `llx_c_civility`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_civility` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(6) NOT NULL,
+  `label` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_civility` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_civility`
+--
+
+LOCK TABLES `llx_c_civility` WRITE;
+/*!40000 ALTER TABLE `llx_c_civility` DISABLE KEYS */;
+INSERT INTO `llx_c_civility` VALUES (1,'MME','Madame',1,NULL),(3,'MR','Monsieur',1,NULL),(5,'MLE','Mademoiselle',1,NULL),(7,'MTRE','Maître',1,NULL),(8,'DR','Docteur',1,NULL);
+/*!40000 ALTER TABLE `llx_c_civility` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_country`
+--
+
+DROP TABLE IF EXISTS `llx_c_country`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_country` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(2) NOT NULL,
+  `code_iso` varchar(3) DEFAULT NULL,
+  `label` varchar(50) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `favorite` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_c_country_code` (`code`),
+  UNIQUE KEY `idx_c_country_label` (`label`),
+  UNIQUE KEY `idx_c_country_code_iso` (`code_iso`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_country`
+--
+
+LOCK TABLES `llx_c_country` WRITE;
+/*!40000 ALTER TABLE `llx_c_country` DISABLE KEYS */;
+INSERT INTO `llx_c_country` VALUES (0,'',NULL,'-',1,1),(1,'FR','FRA','France',1,0),(2,'BE','BEL','Belgium',1,0),(3,'IT','ITA','Italy',1,0),(4,'ES','ESP','Spain',1,0),(5,'DE','DEU','Germany',1,0),(6,'CH','CHE','Switzerland',1,0),(7,'GB','GBR','United Kingdom',1,0),(8,'IE','IRL','Irland',1,0),(9,'CN','CHN','China',1,0),(10,'TN','TUN','Tunisia',1,0),(11,'US','USA','United States',1,0),(12,'MA','MAR','Maroc',1,0),(13,'DZ','DZA','Algeria',1,0),(14,'CA','CAN','Canada',1,0),(15,'TG','TGO','Togo',1,0),(16,'GA','GAB','Gabon',1,0),(17,'NL','NLD','Nerderland',1,0),(18,'HU','HUN','Hongrie',1,0),(19,'RU','RUS','Russia',1,0),(20,'SE','SWE','Sweden',1,0),(21,'CI','CIV','Côte d\'Ivoire',1,0),(22,'SN','SEN','Senegal',1,0),(23,'AR','ARG','Argentine',1,0),(24,'CM','CMR','Cameroun',1,0),(25,'PT','PRT','Portugal',1,0),(26,'SA','SAU','Saudi Arabia',1,0),(27,'MC','MCO','Monaco',1,0),(28,'AU','AUS','Australia',1,0),(29,'SG','SGP','Singapour',1,0),(30,'AF','AFG','Afghanistan',1,0),(31,'AX','ALA','Iles Aland',1,0),(32,'AL','ALB','Albanie',1,0),(33,'AS','ASM','Samoa américaines',1,0),(34,'AD','AND','Andorre',1,0),(35,'AO','AGO','Angola',1,0),(36,'AI','AIA','Anguilla',1,0),(37,'AQ','ATA','Antarctique',1,0),(38,'AG','ATG','Antigua-et-Barbuda',1,0),(39,'AM','ARM','Arménie',1,0),(40,'AW','ABW','Aruba',1,0),(41,'AT','AUT','Autriche',1,0),(42,'AZ','AZE','Azerbaïdjan',1,0),(43,'BS','BHS','Bahamas',1,0),(44,'BH','BHR','Bahreïn',1,0),(45,'BD','BGD','Bangladesh',1,0),(46,'BB','BRB','Barbade',1,0),(47,'BY','BLR','Biélorussie',1,0),(48,'BZ','BLZ','Belize',1,0),(49,'BJ','BEN','Bénin',1,0),(50,'BM','BMU','Bermudes',1,0),(51,'BT','BTN','Bhoutan',1,0),(52,'BO','BOL','Bolivie',1,0),(53,'BA','BIH','Bosnie-Herzégovine',1,0),(54,'BW','BWA','Botswana',1,0),(55,'BV','BVT','Ile Bouvet',1,0),(56,'BR','BRA','Brazil',1,0),(57,'IO','IOT','Territoire britannique de l\'Océan Indien',1,0),(58,'BN','BRN','Brunei',1,0),(59,'BG','BGR','Bulgarie',1,0),(60,'BF','BFA','Burkina Faso',1,0),(61,'BI','BDI','Burundi',1,0),(62,'KH','KHM','Cambodge',1,0),(63,'CV','CPV','Cap-Vert',1,0),(64,'KY','CYM','Iles Cayman',1,0),(65,'CF','CAF','République centrafricaine',1,0),(66,'TD','TCD','Tchad',1,0),(67,'CL','CHL','Chili',1,0),(68,'CX','CXR','Ile Christmas',1,0),(69,'CC','CCK','Iles des Cocos (Keeling)',1,0),(70,'CO','COL','Colombie',1,0),(71,'KM','COM','Comores',1,0),(72,'CG','COG','Congo',1,0),(73,'CD','COD','République démocratique du Congo',1,0),(74,'CK','COK','Iles Cook',1,0),(75,'CR','CRI','Costa Rica',1,0),(76,'HR','HRV','Croatie',1,0),(77,'CU','CUB','Cuba',1,0),(78,'CY','CYP','Chypre',1,0),(79,'CZ','CZE','République Tchèque',1,0),(80,'DK','DNK','Danemark',1,0),(81,'DJ','DJI','Djibouti',1,0),(82,'DM','DMA','Dominique',1,0),(83,'DO','DOM','République Dominicaine',1,0),(84,'EC','ECU','Equateur',1,0),(85,'EG','EGY','Egypte',1,0),(86,'SV','SLV','Salvador',1,0),(87,'GQ','GNQ','Guinée Equatoriale',1,0),(88,'ER','ERI','Erythrée',1,0),(89,'EE','EST','Estonia',1,0),(90,'ET','ETH','Ethiopie',1,0),(91,'FK','FLK','Iles Falkland',1,0),(92,'FO','FRO','Iles Féroé',1,0),(93,'FJ','FJI','Iles Fidji',1,0),(94,'FI','FIN','Finlande',1,0),(95,'GF','GUF','Guyane française',1,0),(96,'PF','PYF','Polynésie française',1,0),(97,'TF','ATF','Terres australes françaises',1,0),(98,'GM','GMB','Gambie',1,0),(99,'GE','GEO','Georgia',1,0),(100,'GH','GHA','Ghana',1,0),(101,'GI','GIB','Gibraltar',1,0),(102,'GR','GRC','Greece',1,0),(103,'GL','GRL','Groenland',1,0),(104,'GD','GRD','Grenade',1,0),(106,'GU','GUM','Guam',1,0),(107,'GT','GTM','Guatemala',1,0),(108,'GN','GIN','Guinea',1,0),(109,'GW','GNB','Guinea-Bissao',1,0),(111,'HT','HTI','Haiti',1,0),(112,'HM','HMD','Iles Heard et McDonald',1,0),(113,'VA','VAT','Saint-Siège (Vatican)',1,0),(114,'HN','HND','Honduras',1,0),(115,'HK','HKG','Hong Kong',1,0),(116,'IS','ISL','Islande',1,0),(117,'IN','IND','India',1,0),(118,'ID','IDN','Indonésie',1,0),(119,'IR','IRN','Iran',1,0),(120,'IQ','IRQ','Iraq',1,0),(121,'IL','ISR','Israel',1,0),(122,'JM','JAM','Jamaïque',1,0),(123,'JP','JPN','Japon',1,0),(124,'JO','JOR','Jordanie',1,0),(125,'KZ','KAZ','Kazakhstan',1,0),(126,'KE','KEN','Kenya',1,0),(127,'KI','KIR','Kiribati',1,0),(128,'KP','PRK','North Corea',1,0),(129,'KR','KOR','South Corea',1,0),(130,'KW','KWT','Koweït',1,0),(131,'KG','KGZ','Kirghizistan',1,0),(132,'LA','LAO','Laos',1,0),(133,'LV','LVA','Lettonie',1,0),(134,'LB','LBN','Liban',1,0),(135,'LS','LSO','Lesotho',1,0),(136,'LR','LBR','Liberia',1,0),(137,'LY','LBY','Libye',1,0),(138,'LI','LIE','Liechtenstein',1,0),(139,'LT','LTU','Lituanie',1,0),(140,'LU','LUX','Luxembourg',1,0),(141,'MO','MAC','Macao',1,0),(142,'MK','MKD','ex-République yougoslave de Macédoine',1,0),(143,'MG','MDG','Madagascar',1,0),(144,'MW','MWI','Malawi',1,0),(145,'MY','MYS','Malaisie',1,0),(146,'MV','MDV','Maldives',1,0),(147,'ML','MLI','Mali',1,0),(148,'MT','MLT','Malte',1,0),(149,'MH','MHL','Iles Marshall',1,0),(151,'MR','MRT','Mauritanie',1,0),(152,'MU','MUS','Maurice',1,0),(153,'YT','MYT','Mayotte',1,0),(154,'MX','MEX','Mexique',1,0),(155,'FM','FSM','Micronésie',1,0),(156,'MD','MDA','Moldavie',1,0),(157,'MN','MNG','Mongolie',1,0),(158,'MS','MSR','Monserrat',1,0),(159,'MZ','MOZ','Mozambique',1,0),(160,'MM','MMR','Birmanie (Myanmar)',1,0),(161,'NA','NAM','Namibie',1,0),(162,'NR','NRU','Nauru',1,0),(163,'NP','NPL','Népal',1,0),(164,'AN',NULL,'Antilles néerlandaises',1,0),(165,'NC','NCL','Nouvelle-Calédonie',1,0),(166,'NZ','NZL','Nouvelle-Zélande',1,0),(167,'NI','NIC','Nicaragua',1,0),(168,'NE','NER','Niger',1,0),(169,'NG','NGA','Nigeria',1,0),(170,'NU','NIU','Nioué',1,0),(171,'NF','NFK','Ile Norfolk',1,0),(172,'MP','MNP','Mariannes du Nord',1,0),(173,'NO','NOR','Norvège',1,0),(174,'OM','OMN','Oman',1,0),(175,'PK','PAK','Pakistan',1,0),(176,'PW','PLW','Palaos',1,0),(177,'PS','PSE','Territoire Palestinien Occupé',1,0),(178,'PA','PAN','Panama',1,0),(179,'PG','PNG','Papouasie-Nouvelle-Guinée',1,0),(180,'PY','PRY','Paraguay',1,0),(181,'PE','PER','Peru',1,0),(182,'PH','PHL','Philippines',1,0),(183,'PN','PCN','Iles Pitcairn',1,0),(184,'PL','POL','Pologne',1,0),(185,'PR','PRI','Porto Rico',1,0),(186,'QA','QAT','Qatar',1,0),(188,'RO','ROU','Roumanie',1,0),(189,'RW','RWA','Rwanda',1,0),(190,'SH','SHN','Sainte-Hélène',1,0),(191,'KN','KNA','Saint-Christophe-et-Niévès',1,0),(192,'LC','LCA','Sainte-Lucie',1,0),(193,'PM','SPM','Saint-Pierre-et-Miquelon',1,0),(194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1,0),(195,'WS','WSM','Samoa',1,0),(196,'SM','SMR','Saint-Marin',1,0),(197,'ST','STP','Sao Tomé-et-Principe',1,0),(198,'RS','SRB','Serbie',1,0),(199,'SC','SYC','Seychelles',1,0),(200,'SL','SLE','Sierra Leone',1,0),(201,'SK','SVK','Slovaquie',1,0),(202,'SI','SVN','Slovénie',1,0),(203,'SB','SLB','Iles Salomon',1,0),(204,'SO','SOM','Somalie',1,0),(205,'ZA','ZAF','Afrique du Sud',1,0),(206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1,0),(207,'LK','LKA','Sri Lanka',1,0),(208,'SD','SDN','Soudan',1,0),(209,'SR','SUR','Suriname',1,0),(210,'SJ','SJM','Iles Svalbard et Jan Mayen',1,0),(211,'SZ','SWZ','Swaziland',1,0),(212,'SY','SYR','Syrie',1,0),(213,'TW','TWN','Taïwan',1,0),(214,'TJ','TJK','Tadjikistan',1,0),(215,'TZ','TZA','Tanzanie',1,0),(216,'TH','THA','Thaïlande',1,0),(217,'TL','TLS','Timor Oriental',1,0),(218,'TK','TKL','Tokélaou',1,0),(219,'TO','TON','Tonga',1,0),(220,'TT','TTO','Trinité-et-Tobago',1,0),(221,'TR','TUR','Turquie',1,0),(222,'TM','TKM','Turkménistan',1,0),(223,'TC','TCA','Iles Turks-et-Caicos',1,0),(224,'TV','TUV','Tuvalu',1,0),(225,'UG','UGA','Ouganda',1,0),(226,'UA','UKR','Ukraine',1,0),(227,'xx','ARE','Émirats arabes unishh',1,0),(228,'UM','UMI','Iles mineures éloignées des États-Unis',1,0),(229,'UY','URY','Uruguay',1,0),(230,'UZ','UZB','Ouzbékistan',1,0),(231,'VU','VUT','Vanuatu',1,0),(232,'VE','VEN','Vénézuela',1,0),(233,'VN','VNM','Viêt Nam',1,0),(234,'VG','VGB','Iles Vierges britanniques',1,0),(235,'VI','VIR','Iles Vierges américaines',1,0),(236,'WF','WLF','Wallis-et-Futuna',1,0),(237,'EH','ESH','Sahara occidental',1,0),(238,'YE','YEM','Yémen',1,0),(239,'ZM','ZMB','Zambie',1,0),(240,'ZW','ZWE','Zimbabwe',1,0),(241,'GG','GGY','Guernesey',1,0),(242,'IM','IMN','Ile de Man',1,0),(243,'JE','JEY','Jersey',1,0),(244,'ME','MNE','Monténégro',1,0),(245,'BL','BLM','Saint-Barthélemy',1,0),(246,'MF','MAF','Saint-Martin',1,0),(247,'hh',NULL,'hhh',1,0);
+/*!40000 ALTER TABLE `llx_c_country` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_currencies`
+--
+
+DROP TABLE IF EXISTS `llx_c_currencies`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_currencies` (
+  `code_iso` varchar(3) NOT NULL,
+  `label` varchar(64) NOT NULL,
+  `unicode` varchar(32) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`code_iso`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_currencies`
+--
+
+LOCK TABLES `llx_c_currencies` WRITE;
+/*!40000 ALTER TABLE `llx_c_currencies` DISABLE KEYS */;
+INSERT INTO `llx_c_currencies` VALUES ('AED','United Arab Emirates Dirham',NULL,1),('AFN','Afghanistan Afghani','[1547]',1),('ALL','Albania Leklll','[76,101,107]',1),('ANG','Netherlands Antilles Guilder','[402]',1),('ARP','Pesos argentins',NULL,0),('ARS','Argentino Peso','[36]',1),('ATS','Shiliing autrichiens',NULL,0),('AUD','Australia Dollar','[36]',1),('AWG','Aruba Guilder','[402]',1),('AZN','Azerbaijan New Manat','[1084,1072,1085]',1),('BAM','Bosnia and Herzegovina Convertible Marka','[75,77]',1),('BBD','Barbados Dollar','[36]',1),('BEF','Francs belges',NULL,0),('BGN','Bulgaria Lev','[1083,1074]',1),('BMD','Bermuda Dollar','[36]',1),('BND','Brunei Darussalam Dollar','[36]',1),('BOB','Bolivia Boliviano','[36,98]',1),('BRL','Brazil Real','[82,36]',1),('BSD','Bahamas Dollar','[36]',1),('BWP','Botswana Pula','[80]',1),('BYR','Belarus Ruble','[112,46]',1),('BZD','Belize Dollar','[66,90,36]',1),('CAD','Canada Dollar','[36]',1),('CHF','Switzerland Franc','[67,72,70]',1),('CLP','Chile Peso','[36]',1),('CNY','China Yuan Renminbi','[165]',1),('COP','Colombia Peso','[36]',1),('CRC','Costa Rica Colon','[8353]',1),('CUP','Cuba Peso','[8369]',1),('CZK','Czech Republic Koruna','[75,269]',1),('DEM','Deutsch mark',NULL,0),('DKK','Denmark Krone','[107,114]',1),('DOP','Dominican Republic Peso','[82,68,36]',1),('DZD','Algeria Dinar',NULL,1),('EEK','Estonia Kroon','[107,114]',1),('EGP','Egypt Pound','[163]',1),('ESP','Pesete',NULL,0),('EUR','Euro Member Countries','[8364]',1),('FIM','Mark finlandais',NULL,0),('FJD','Fiji Dollar','[36]',1),('FKP','Falkland Islands (Malvinas) Pound','[163]',1),('FRF','Francs francais',NULL,0),('GBP','United Kingdom Pound','[163]',1),('GGP','Guernsey Pound','[163]',1),('GHC','Ghana Cedis','[162]',1),('GIP','Gibraltar Pound','[163]',1),('GRD','Drachme (grece)',NULL,0),('GTQ','Guatemala Quetzal','[81]',1),('GYD','Guyana Dollar','[36]',1),('hhh','ddd','[]',1),('HKD','Hong Kong Dollar','[36]',1),('HNL','Honduras Lempira','[76]',1),('HRK','Croatia Kuna','[107,110]',1),('HUF','Hungary Forint','[70,116]',1),('IDR','Indonesia Rupiah','[82,112]',1),('IEP','Livres irlandaises',NULL,0),('ILS','Israel Shekel','[8362]',1),('IMP','Isle of Man Pound','[163]',1),('INR','India Rupee',NULL,1),('IRR','Iran Rial','[65020]',1),('ISK','Iceland Krona','[107,114]',1),('ITL','Lires',NULL,0),('JEP','Jersey Pound','[163]',1),('JMD','Jamaica Dollar','[74,36]',1),('JPY','Japan Yen','[165]',1),('KGS','Kyrgyzstan Som','[1083,1074]',1),('KHR','Cambodia Riel','[6107]',1),('KPW','Korea (North) Won','[8361]',1),('KRW','Korea (South) Won','[8361]',1),('KYD','Cayman Islands Dollar','[36]',1),('KZT','Kazakhstan Tenge','[1083,1074]',1),('LAK','Laos Kip','[8365]',1),('LBP','Lebanon Pound','[163]',1),('LKR','Sri Lanka Rupee','[8360]',1),('LRD','Liberia Dollar','[36]',1),('LTL','Lithuania Litas','[76,116]',1),('LUF','Francs luxembourgeois',NULL,0),('LVL','Latvia Lat','[76,115]',1),('MAD','Morocco Dirham',NULL,1),('MKD','Macedonia Denar','[1076,1077,1085]',1),('MNT','Mongolia Tughrik','[8366]',1),('MRO','Mauritania Ouguiya',NULL,1),('MUR','Mauritius Rupee','[8360]',1),('MXN','Mexico Peso','[36]',1),('MXP','Pesos Mexicans',NULL,0),('MYR','Malaysia Ringgit','[82,77]',1),('MZN','Mozambique Metical','[77,84]',1),('NAD','Namibia Dollar','[36]',1),('NGN','Nigeria Naira','[8358]',1),('NIO','Nicaragua Cordoba','[67,36]',1),('NLG','Florins',NULL,0),('NOK','Norway Krone','[107,114]',1),('NPR','Nepal Rupee','[8360]',1),('NZD','New Zealand Dollar','[36]',1),('OMR','Oman Rial','[65020]',1),('PAB','Panama Balboa','[66,47,46]',1),('PEN','Peru Nuevo Sol','[83,47,46]',1),('PHP','Philippines Peso','[8369]',1),('PKR','Pakistan Rupee','[8360]',1),('PLN','Poland Zloty','[122,322]',1),('PTE','Escudos',NULL,0),('PYG','Paraguay Guarani','[71,115]',1),('QAR','Qatar Riyal','[65020]',1),('RON','Romania New Leu','[108,101,105]',1),('RSD','Serbia Dinar','[1044,1080,1085,46]',1),('RUB','Russia Ruble','[1088,1091,1073]',1),('SAR','Saudi Arabia Riyal','[65020]',1),('SBD','Solomon Islands Dollar','[36]',1),('SCR','Seychelles Rupee','[8360]',1),('SEK','Sweden Krona','[107,114]',1),('SGD','Singapore Dollar','[36]',1),('SHP','Saint Helena Pound','[163]',1),('SKK','Couronnes slovaques',NULL,0),('SOS','Somalia Shilling','[83]',1),('SRD','Suriname Dollar','[36]',1),('SUR','Rouble',NULL,0),('SVC','El Salvador Colon','[36]',1),('SYP','Syria Pound','[163]',1),('THB','Thailand Baht','[3647]',1),('TND','Tunisia Dinar',NULL,1),('TRL','Turkey Lira','[84,76]',1),('TRY','Turkey Lira','[8356]',1),('TTD','Trinidad and Tobago Dollar','[84,84,36]',1),('TVD','Tuvalu Dollar','[36]',1),('TWD','Taiwan New Dollar','[78,84,36]',1),('UAH','Ukraine Hryvna','[8372]',1),('USD','United States Dollar','[36]',1),('UYU','Uruguay Peso','[36,85]',1),('UZS','Uzbekistan Som','[1083,1074]',1),('VEF','Venezuela Bolivar Fuerte','[66,115]',1),('VND','Viet Nam Dong','[8363]',1),('XAF','Communaute Financiere Africaine (BEAC) CFA Franc',NULL,1),('XCD','East Caribbean Dollar','[36]',1),('XEU','Ecus',NULL,0),('XOF','Communaute Financiere Africaine (BCEAO) Franc',NULL,1),('YER','Yemen Rial','[65020]',1),('ZAR','South Africa Rand','[82]',1),('ZWD','Zimbabwe Dollar','[90,36]',1);
+/*!40000 ALTER TABLE `llx_c_currencies` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_departements`
+--
+
+DROP TABLE IF EXISTS `llx_c_departements`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_departements` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code_departement` varchar(6) NOT NULL,
+  `fk_region` int(11) DEFAULT NULL,
+  `cheflieu` varchar(50) DEFAULT NULL,
+  `tncc` int(11) DEFAULT NULL,
+  `ncc` varchar(50) DEFAULT NULL,
+  `nom` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_departements` (`code_departement`,`fk_region`),
+  KEY `idx_departements_fk_region` (`fk_region`),
+  CONSTRAINT `fk_departements_code_region` FOREIGN KEY (`fk_region`) REFERENCES `llx_c_regions` (`code_region`)
+) ENGINE=InnoDB AUTO_INCREMENT=1282 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_departements`
+--
+
+LOCK TABLES `llx_c_departements` WRITE;
+/*!40000 ALTER TABLE `llx_c_departements` DISABLE KEYS */;
+INSERT INTO `llx_c_departements` VALUES (1,'0',0,'0',0,'-','-',1),(2,'01',82,'01053',5,'AIN','Ain',1),(3,'02',22,'02408',5,'AISNE','Aisne',1),(4,'03',83,'03190',5,'ALLIER','Allier',1),(5,'04',93,'04070',4,'ALPES-DE-HAUTE-PROVENCE','Alpes-de-Haute-Provence',1),(6,'05',93,'05061',4,'HAUTES-ALPES','Hautes-Alpes',1),(7,'06',93,'06088',4,'ALPES-MARITIMES','Alpes-Maritimes',1),(8,'07',82,'07186',5,'ARDECHE','Ardèche',1),(9,'08',21,'08105',4,'ARDENNES','Ardennes',1),(10,'09',73,'09122',5,'ARIEGE','Ariège',1),(11,'10',21,'10387',5,'AUBE','Aube',1),(12,'11',91,'11069',5,'AUDE','Aude',1),(13,'12',73,'12202',5,'AVEYRON','Aveyron',1),(14,'13',93,'13055',4,'BOUCHES-DU-RHONE','Bouches-du-Rhône',1),(15,'14',25,'14118',2,'CALVADOS','Calvados',1),(16,'15',83,'15014',2,'CANTAL','Cantal',1),(17,'16',54,'16015',3,'CHARENTE','Charente',1),(18,'17',54,'17300',3,'CHARENTE-MARITIME','Charente-Maritime',1),(19,'18',24,'18033',2,'CHER','Cher',1),(20,'19',74,'19272',3,'CORREZE','Corrèze',1),(21,'2A',94,'2A004',3,'CORSE-DU-SUD','Corse-du-Sud',1),(22,'2B',94,'2B033',3,'HAUTE-CORSE','Haute-Corse',1),(23,'21',26,'21231',3,'COTE-D\'OR','Côte-d\'Or',1),(24,'22',53,'22278',4,'COTES-D\'ARMOR','Côtes-d\'Armor',1),(25,'23',74,'23096',3,'CREUSE','Creuse',1),(26,'24',72,'24322',3,'DORDOGNE','Dordogne',1),(27,'25',43,'25056',2,'DOUBS','Doubs',1),(28,'26',82,'26362',3,'DROME','Drôme',1),(29,'27',23,'27229',5,'EURE','Eure',1),(30,'28',24,'28085',1,'EURE-ET-LOIR','Eure-et-Loir',1),(31,'29',53,'29232',2,'FINISTERE','Finistère',1),(32,'30',91,'30189',2,'GARD','Gard',1),(33,'31',73,'31555',3,'HAUTE-GARONNE','Haute-Garonne',1),(34,'32',73,'32013',2,'GERS','Gers',1),(35,'33',72,'33063',3,'GIRONDE','Gironde',1),(36,'34',91,'34172',5,'HERAULT','Hérault',1),(37,'35',53,'35238',1,'ILLE-ET-VILAINE','Ille-et-Vilaine',1),(38,'36',24,'36044',5,'INDRE','Indre',1),(39,'37',24,'37261',1,'INDRE-ET-LOIRE','Indre-et-Loire',1),(40,'38',82,'38185',5,'ISERE','Isère',1),(41,'39',43,'39300',2,'JURA','Jura',1),(42,'40',72,'40192',4,'LANDES','Landes',1),(43,'41',24,'41018',0,'LOIR-ET-CHER','Loir-et-Cher',1),(44,'42',82,'42218',3,'LOIRE','Loire',1),(45,'43',83,'43157',3,'HAUTE-LOIRE','Haute-Loire',1),(46,'44',52,'44109',3,'LOIRE-ATLANTIQUE','Loire-Atlantique',1),(47,'45',24,'45234',2,'LOIRET','Loiret',1),(48,'46',73,'46042',2,'LOT','Lot',1),(49,'47',72,'47001',0,'LOT-ET-GARONNE','Lot-et-Garonne',1),(50,'48',91,'48095',3,'LOZERE','Lozère',1),(51,'49',52,'49007',0,'MAINE-ET-LOIRE','Maine-et-Loire',1),(52,'50',25,'50502',3,'MANCHE','Manche',1),(53,'51',21,'51108',3,'MARNE','Marne',1),(54,'52',21,'52121',3,'HAUTE-MARNE','Haute-Marne',1),(55,'53',52,'53130',3,'MAYENNE','Mayenne',1),(56,'54',41,'54395',0,'MEURTHE-ET-MOSELLE','Meurthe-et-Moselle',1),(57,'55',41,'55029',3,'MEUSE','Meuse',1),(58,'56',53,'56260',2,'MORBIHAN','Morbihan',1),(59,'57',41,'57463',3,'MOSELLE','Moselle',1),(60,'58',26,'58194',3,'NIEVRE','Nièvre',1),(61,'59',31,'59350',2,'NORD','Nord',1),(62,'60',22,'60057',5,'OISE','Oise',1),(63,'61',25,'61001',5,'ORNE','Orne',1),(64,'62',31,'62041',2,'PAS-DE-CALAIS','Pas-de-Calais',1),(65,'63',83,'63113',2,'PUY-DE-DOME','Puy-de-Dôme',1),(66,'64',72,'64445',4,'PYRENEES-ATLANTIQUES','Pyrénées-Atlantiques',1),(67,'65',73,'65440',4,'HAUTES-PYRENEES','Hautes-Pyrénées',1),(68,'66',91,'66136',4,'PYRENEES-ORIENTALES','Pyrénées-Orientales',1),(69,'67',42,'67482',2,'BAS-RHIN','Bas-Rhin',1),(70,'68',42,'68066',2,'HAUT-RHIN','Haut-Rhin',1),(71,'69',82,'69123',2,'RHONE','Rhône',1),(72,'70',43,'70550',3,'HAUTE-SAONE','Haute-Saône',1),(73,'71',26,'71270',0,'SAONE-ET-LOIRE','Saône-et-Loire',1),(74,'72',52,'72181',3,'SARTHE','Sarthe',1),(75,'73',82,'73065',3,'SAVOIE','Savoie',1),(76,'74',82,'74010',3,'HAUTE-SAVOIE','Haute-Savoie',1),(77,'75',11,'75056',0,'PARIS','Paris',1),(78,'76',23,'76540',3,'SEINE-MARITIME','Seine-Maritime',1),(79,'77',11,'77288',0,'SEINE-ET-MARNE','Seine-et-Marne',1),(80,'78',11,'78646',4,'YVELINES','Yvelines',1),(81,'79',54,'79191',4,'DEUX-SEVRES','Deux-Sèvres',1),(82,'80',22,'80021',3,'SOMME','Somme',1),(83,'81',73,'81004',2,'TARN','Tarn',1),(84,'82',73,'82121',0,'TARN-ET-GARONNE','Tarn-et-Garonne',1),(85,'83',93,'83137',2,'VAR','Var',1),(86,'84',93,'84007',0,'VAUCLUSE','Vaucluse',1),(87,'85',52,'85191',3,'VENDEE','Vendée',1),(88,'86',54,'86194',3,'VIENNE','Vienne',1),(89,'87',74,'87085',3,'HAUTE-VIENNE','Haute-Vienne',1),(90,'88',41,'88160',4,'VOSGES','Vosges',1),(91,'89',26,'89024',5,'YONNE','Yonne',1),(92,'90',43,'90010',0,'TERRITOIRE DE BELFORT','Territoire de Belfort',1),(93,'91',11,'91228',5,'ESSONNE','Essonne',1),(94,'92',11,'92050',4,'HAUTS-DE-SEINE','Hauts-de-Seine',1),(95,'93',11,'93008',3,'SEINE-SAINT-DENIS','Seine-Saint-Denis',1),(96,'94',11,'94028',2,'VAL-DE-MARNE','Val-de-Marne',1),(97,'95',11,'95500',2,'VAL-D\'OISE','Val-d\'Oise',1),(98,'971',1,'97105',3,'GUADELOUPE','Guadeloupe',1),(99,'972',2,'97209',3,'MARTINIQUE','Martinique',1),(100,'973',3,'97302',3,'GUYANE','Guyane',1),(101,'974',4,'97411',3,'REUNION','Réunion',1),(102,'01',201,'',1,'ANVERS','Anvers',1),(103,'02',203,'',3,'BRUXELLES-CAPITALE','Bruxelles-Capitale',1),(104,'03',202,'',2,'BRABANT-WALLON','Brabant-Wallon',1),(105,'04',201,'',1,'BRABANT-FLAMAND','Brabant-Flamand',1),(106,'05',201,'',1,'FLANDRE-OCCIDENTALE','Flandre-Occidentale',1),(107,'06',201,'',1,'FLANDRE-ORIENTALE','Flandre-Orientale',1),(108,'07',202,'',2,'HAINAUT','Hainaut',1),(109,'08',201,'',2,'LIEGE','Liège',1),(110,'09',202,'',1,'LIMBOURG','Limbourg',1),(111,'10',202,'',2,'LUXEMBOURG','Luxembourg',1),(112,'11',201,'',2,'NAMUR','Namur',1),(113,'NSW',2801,'',1,'','New South Wales',1),(114,'VIC',2801,'',1,'','Victoria',1),(115,'QLD',2801,'',1,'','Queensland',1),(116,'SA',2801,'',1,'','South Australia',1),(117,'ACT',2801,'',1,'','Australia Capital Territory',1),(118,'TAS',2801,'',1,'','Tasmania',1),(119,'WA',2801,'',1,'','Western Australia',1),(120,'NT',2801,'',1,'','Northern Territory',1),(121,'01',419,'',19,'ALAVA','Álava',1),(122,'02',404,'',4,'ALBACETE','Albacete',1),(123,'03',411,'',11,'ALICANTE','Alicante',1),(124,'04',401,'',1,'ALMERIA','Almería',1),(125,'05',403,'',3,'AVILA','Avila',1),(126,'06',412,'',12,'BADAJOZ','Badajoz',1),(127,'07',414,'',14,'ISLAS BALEARES','Islas Baleares',1),(128,'08',406,'',6,'BARCELONA','Barcelona',1),(129,'09',403,'',8,'BURGOS','Burgos',1),(130,'10',412,'',12,'CACERES','Cáceres',1),(131,'11',401,'',1,'CADIz','Cádiz',1),(132,'12',411,'',11,'CASTELLON','Castellón',1),(133,'13',404,'',4,'CIUDAD REAL','Ciudad Real',1),(134,'14',401,'',1,'CORDOBA','Córdoba',1),(135,'15',413,'',13,'LA CORUÑA','La Coruña',1),(136,'16',404,'',4,'CUENCA','Cuenca',1),(137,'17',406,'',6,'GERONA','Gerona',1),(138,'18',401,'',1,'GRANADA','Granada',1),(139,'19',404,'',4,'GUADALAJARA','Guadalajara',1),(140,'20',419,'',19,'GUIPUZCOA','Guipúzcoa',1),(141,'21',401,'',1,'HUELVA','Huelva',1),(142,'22',402,'',2,'HUESCA','Huesca',1),(143,'23',401,'',1,'JAEN','Jaén',1),(144,'24',403,'',3,'LEON','León',1),(145,'25',406,'',6,'LERIDA','Lérida',1),(146,'26',415,'',15,'LA RIOJA','La Rioja',1),(147,'27',413,'',13,'LUGO','Lugo',1),(148,'28',416,'',16,'MADRID','Madrid',1),(149,'29',401,'',1,'MALAGA','Málaga',1),(150,'30',417,'',17,'MURCIA','Murcia',1),(151,'31',408,'',8,'NAVARRA','Navarra',1),(152,'32',413,'',13,'ORENSE','Orense',1),(153,'33',418,'',18,'ASTURIAS','Asturias',1),(154,'34',403,'',3,'PALENCIA','Palencia',1),(155,'35',405,'',5,'LAS PALMAS','Las Palmas',1),(156,'36',413,'',13,'PONTEVEDRA','Pontevedra',1),(157,'37',403,'',3,'SALAMANCA','Salamanca',1),(158,'38',405,'',5,'STA. CRUZ DE TENERIFE','Sta. Cruz de Tenerife',1),(159,'39',410,'',10,'CANTABRIA','Cantabria',1),(160,'40',403,'',3,'SEGOVIA','Segovia',1),(161,'41',401,'',1,'SEVILLA','Sevilla',1),(162,'42',403,'',3,'SORIA','Soria',1),(163,'43',406,'',6,'TARRAGONA','Tarragona',1),(164,'44',402,'',2,'TERUEL','Teruel',1),(165,'45',404,'',5,'TOLEDO','Toledo',1),(166,'46',411,'',11,'VALENCIA','Valencia',1),(167,'47',403,'',3,'VALLADOLID','Valladolid',1),(168,'48',419,'',19,'VIZCAYA','Vizcaya',1),(169,'49',403,'',3,'ZAMORA','Zamora',1),(170,'50',402,'',1,'ZARAGOZA','Zaragoza',1),(171,'51',407,'',7,'CEUTA','Ceuta',1),(172,'52',409,'',9,'MELILLA','Melilla',1),(173,'53',420,'',20,'OTROS','Otros',1),(174,'AG',601,NULL,NULL,'ARGOVIE','Argovie',1),(175,'AI',601,NULL,NULL,'APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures',1),(176,'AR',601,NULL,NULL,'APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures',1),(177,'BE',601,NULL,NULL,'BERNE','Berne',1),(178,'BL',601,NULL,NULL,'BALE CAMPAGNE','Bâle Campagne',1),(179,'BS',601,NULL,NULL,'BALE VILLE','Bâle Ville',1),(180,'FR',601,NULL,NULL,'FRIBOURG','Fribourg',1),(181,'GE',601,NULL,NULL,'GENEVE','Genève',1),(182,'GL',601,NULL,NULL,'GLARIS','Glaris',1),(183,'GR',601,NULL,NULL,'GRISONS','Grisons',1),(184,'JU',601,NULL,NULL,'JURA','Jura',1),(185,'LU',601,NULL,NULL,'LUCERNE','Lucerne',1),(186,'NE',601,NULL,NULL,'NEUCHATEL','Neuchâtel',1),(187,'NW',601,NULL,NULL,'NIDWALD','Nidwald',1),(188,'OW',601,NULL,NULL,'OBWALD','Obwald',1),(189,'SG',601,NULL,NULL,'SAINT-GALL','Saint-Gall',1),(190,'SH',601,NULL,NULL,'SCHAFFHOUSE','Schaffhouse',1),(191,'SO',601,NULL,NULL,'SOLEURE','Soleure',1),(192,'SZ',601,NULL,NULL,'SCHWYZ','Schwyz',1),(193,'TG',601,NULL,NULL,'THURGOVIE','Thurgovie',1),(194,'TI',601,NULL,NULL,'TESSIN','Tessin',1),(195,'UR',601,NULL,NULL,'URI','Uri',1),(196,'VD',601,NULL,NULL,'VAUD','Vaud',1),(197,'VS',601,NULL,NULL,'VALAIS','Valais',1),(198,'ZG',601,NULL,NULL,'ZUG','Zug',1),(199,'ZH',601,NULL,NULL,'ZURICH','Zürich',1),(200,'AL',1101,'',0,'ALABAMA','Alabama',1),(201,'AK',1101,'',0,'ALASKA','Alaska',1),(202,'AZ',1101,'',0,'ARIZONA','Arizona',1),(203,'AR',1101,'',0,'ARKANSAS','Arkansas',1),(204,'CA',1101,'',0,'CALIFORNIA','California',1),(205,'CO',1101,'',0,'COLORADO','Colorado',1),(206,'CT',1101,'',0,'CONNECTICUT','Connecticut',1),(207,'DE',1101,'',0,'DELAWARE','Delaware',1),(208,'FL',1101,'',0,'FLORIDA','Florida',1),(209,'GA',1101,'',0,'GEORGIA','Georgia',1),(210,'HI',1101,'',0,'HAWAII','Hawaii',1),(211,'ID',1101,'',0,'IDAHO','Idaho',1),(212,'IL',1101,'',0,'ILLINOIS','Illinois',1),(213,'IN',1101,'',0,'INDIANA','Indiana',1),(214,'IA',1101,'',0,'IOWA','Iowa',1),(215,'KS',1101,'',0,'KANSAS','Kansas',1),(216,'KY',1101,'',0,'KENTUCKY','Kentucky',1),(217,'LA',1101,'',0,'LOUISIANA','Louisiana',1),(218,'ME',1101,'',0,'MAINE','Maine',1),(219,'MD',1101,'',0,'MARYLAND','Maryland',1),(220,'MA',1101,'',0,'MASSACHUSSETTS','Massachusetts',1),(221,'MI',1101,'',0,'MICHIGAN','Michigan',1),(222,'MN',1101,'',0,'MINNESOTA','Minnesota',1),(223,'MS',1101,'',0,'MISSISSIPPI','Mississippi',1),(224,'MO',1101,'',0,'MISSOURI','Missouri',1),(225,'MT',1101,'',0,'MONTANA','Montana',1),(226,'NE',1101,'',0,'NEBRASKA','Nebraska',1),(227,'NV',1101,'',0,'NEVADA','Nevada',1),(228,'NH',1101,'',0,'NEW HAMPSHIRE','New Hampshire',1),(229,'NJ',1101,'',0,'NEW JERSEY','New Jersey',1),(230,'NM',1101,'',0,'NEW MEXICO','New Mexico',1),(231,'NY',1101,'',0,'NEW YORK','New York',1),(232,'NC',1101,'',0,'NORTH CAROLINA','North Carolina',1),(233,'ND',1101,'',0,'NORTH DAKOTA','North Dakota',1),(234,'OH',1101,'',0,'OHIO','Ohio',1),(235,'OK',1101,'',0,'OKLAHOMA','Oklahoma',1),(236,'OR',1101,'',0,'OREGON','Oregon',1),(237,'PA',1101,'',0,'PENNSYLVANIA','Pennsylvania',1),(238,'RI',1101,'',0,'RHODE ISLAND','Rhode Island',1),(239,'SC',1101,'',0,'SOUTH CAROLINA','South Carolina',1),(240,'SD',1101,'',0,'SOUTH DAKOTA','South Dakota',1),(241,'TN',1101,'',0,'TENNESSEE','Tennessee',1),(242,'TX',1101,'',0,'TEXAS','Texas',1),(243,'UT',1101,'',0,'UTAH','Utah',1),(244,'VT',1101,'',0,'VERMONT','Vermont',1),(245,'VA',1101,'',0,'VIRGINIA','Virginia',1),(246,'WA',1101,'',0,'WASHINGTON','Washington',1),(247,'WV',1101,'',0,'WEST VIRGINIA','West Virginia',1),(248,'WI',1101,'',0,'WISCONSIN','Wisconsin',1),(249,'WY',1101,'',0,'WYOMING','Wyoming',1),(250,'SS',8601,NULL,NULL,NULL,'San Salvador',1),(251,'SA',8603,NULL,NULL,NULL,'Santa Ana',1),(252,'AH',8603,NULL,NULL,NULL,'Ahuachapan',1),(253,'SO',8603,NULL,NULL,NULL,'Sonsonate',1),(254,'US',8602,NULL,NULL,NULL,'Usulutan',1),(255,'SM',8602,NULL,NULL,NULL,'San Miguel',1),(256,'MO',8602,NULL,NULL,NULL,'Morazan',1),(257,'LU',8602,NULL,NULL,NULL,'La Union',1),(258,'LL',8601,NULL,NULL,NULL,'La Libertad',1),(259,'CH',8601,NULL,NULL,NULL,'Chalatenango',1),(260,'CA',8601,NULL,NULL,NULL,'Cabañas',1),(261,'LP',8601,NULL,NULL,NULL,'La Paz',1),(262,'SV',8601,NULL,NULL,NULL,'San Vicente',1),(263,'CU',8601,NULL,NULL,NULL,'Cuscatlan',1),(264,'2301',2301,'',0,'CATAMARCA','Catamarca',1),(265,'2302',2301,'',0,'JUJUY','Jujuy',1),(266,'2303',2301,'',0,'TUCAMAN','Tucamán',1),(267,'2304',2301,'',0,'SANTIAGO DEL ESTERO','Santiago del Estero',1),(268,'2305',2301,'',0,'SALTA','Salta',1),(269,'2306',2302,'',0,'CHACO','Chaco',1),(270,'2307',2302,'',0,'CORRIENTES','Corrientes',1),(271,'2308',2302,'',0,'ENTRE RIOS','Entre Ríos',1),(272,'2309',2302,'',0,'FORMOSA MISIONES','Formosa Misiones',1),(273,'2310',2302,'',0,'SANTA FE','Santa Fe',1),(274,'2311',2303,'',0,'LA RIOJA','La Rioja',1),(275,'2312',2303,'',0,'MENDOZA','Mendoza',1),(276,'2313',2303,'',0,'SAN JUAN','San Juan',1),(277,'2314',2303,'',0,'SAN LUIS','San Luis',1),(278,'2315',2304,'',0,'CORDOBA','Córdoba',1),(279,'2316',2304,'',0,'BUENOS AIRES','Buenos Aires',1),(280,'2317',2304,'',0,'CABA','Caba',1),(281,'2318',2305,'',0,'LA PAMPA','La Pampa',1),(282,'2319',2305,'',0,'NEUQUEN','Neuquén',1),(283,'2320',2305,'',0,'RIO NEGRO','Río Negro',1),(284,'2321',2305,'',0,'CHUBUT','Chubut',1),(285,'2322',2305,'',0,'SANTA CRUZ','Santa Cruz',1),(286,'2323',2305,'',0,'TIERRA DEL FUEGO','Tierra del Fuego',1),(287,'2324',2305,'',0,'ISLAS MALVINAS','Islas Malvinas',1),(288,'2325',2305,'',0,'ANTARTIDA','Antártida',1),(289,'AN',11701,NULL,0,'AN','Andaman & Nicobar',1),(290,'AP',11701,NULL,0,'AP','Andhra Pradesh',1),(291,'AR',11701,NULL,0,'AR','Arunachal Pradesh',1),(292,'AS',11701,NULL,0,'AS','Assam',1),(293,'BR',11701,NULL,0,'BR','Bihar',1),(294,'CG',11701,NULL,0,'CG','Chattisgarh',1),(295,'CH',11701,NULL,0,'CH','Chandigarh',1),(296,'DD',11701,NULL,0,'DD','Daman & Diu',1),(297,'DL',11701,NULL,0,'DL','Delhi',1),(298,'DN',11701,NULL,0,'DN','Dadra and Nagar Haveli',1),(299,'GA',11701,NULL,0,'GA','Goa',1),(300,'GJ',11701,NULL,0,'GJ','Gujarat',1),(301,'HP',11701,NULL,0,'HP','Himachal Pradesh',1),(302,'HR',11701,NULL,0,'HR','Haryana',1),(303,'JH',11701,NULL,0,'JH','Jharkhand',1),(304,'JK',11701,NULL,0,'JK','Jammu & Kashmir',1),(305,'KA',11701,NULL,0,'KA','Karnataka',1),(306,'KL',11701,NULL,0,'KL','Kerala',1),(307,'LD',11701,NULL,0,'LD','Lakshadweep',1),(308,'MH',11701,NULL,0,'MH','Maharashtra',1),(309,'ML',11701,NULL,0,'ML','Meghalaya',1),(310,'MN',11701,NULL,0,'MN','Manipur',1),(311,'MP',11701,NULL,0,'MP','Madhya Pradesh',1),(312,'MZ',11701,NULL,0,'MZ','Mizoram',1),(313,'NL',11701,NULL,0,'NL','Nagaland',1),(314,'OR',11701,NULL,0,'OR','Orissa',1),(315,'PB',11701,NULL,0,'PB','Punjab',1),(316,'PY',11701,NULL,0,'PY','Puducherry',1),(317,'RJ',11701,NULL,0,'RJ','Rajasthan',1),(318,'SK',11701,NULL,0,'SK','Sikkim',1),(319,'TN',11701,NULL,0,'TN','Tamil Nadu',1),(320,'TR',11701,NULL,0,'TR','Tripura',1),(321,'UL',11701,NULL,0,'UL','Uttarakhand',1),(322,'UP',11701,NULL,0,'UP','Uttar Pradesh',1),(323,'WB',11701,NULL,0,'WB','West Bengal',1),(374,'151',6715,'',0,'151','Arica',1),(375,'152',6715,'',0,'152','Parinacota',1),(376,'011',6701,'',0,'011','Iquique',1),(377,'014',6701,'',0,'014','Tamarugal',1),(378,'021',6702,'',0,'021','Antofagasa',1),(379,'022',6702,'',0,'022','El Loa',1),(380,'023',6702,'',0,'023','Tocopilla',1),(381,'031',6703,'',0,'031','Copiapó',1),(382,'032',6703,'',0,'032','Chañaral',1),(383,'033',6703,'',0,'033','Huasco',1),(384,'041',6704,'',0,'041','Elqui',1),(385,'042',6704,'',0,'042','Choapa',1),(386,'043',6704,'',0,'043','Limarí',1),(387,'051',6705,'',0,'051','Valparaíso',1),(388,'052',6705,'',0,'052','Isla de Pascua',1),(389,'053',6705,'',0,'053','Los Andes',1),(390,'054',6705,'',0,'054','Petorca',1),(391,'055',6705,'',0,'055','Quillota',1),(392,'056',6705,'',0,'056','San Antonio',1),(393,'057',6705,'',0,'057','San Felipe de Aconcagua',1),(394,'058',6705,'',0,'058','Marga Marga',1),(395,'061',6706,'',0,'061','Cachapoal',1),(396,'062',6706,'',0,'062','Cardenal Caro',1),(397,'063',6706,'',0,'063','Colchagua',1),(398,'071',6707,'',0,'071','Talca',1),(399,'072',6707,'',0,'072','Cauquenes',1),(400,'073',6707,'',0,'073','Curicó',1),(401,'074',6707,'',0,'074','Linares',1),(402,'081',6708,'',0,'081','Concepción',1),(403,'082',6708,'',0,'082','Arauco',1),(404,'083',6708,'',0,'083','Biobío',1),(405,'084',6708,'',0,'084','Ñuble',1),(406,'091',6709,'',0,'091','Cautín',1),(407,'092',6709,'',0,'092','Malleco',1),(408,'141',6714,'',0,'141','Valdivia',1),(409,'142',6714,'',0,'142','Ranco',1),(410,'101',6710,'',0,'101','Llanquihue',1),(411,'102',6710,'',0,'102','Chiloé',1),(412,'103',6710,'',0,'103','Osorno',1),(413,'104',6710,'',0,'104','Palena',1),(414,'111',6711,'',0,'111','Coihaique',1),(415,'112',6711,'',0,'112','Aisén',1),(416,'113',6711,'',0,'113','Capitán Prat',1),(417,'114',6711,'',0,'114','General Carrera',1),(418,'121',6712,'',0,'121','Magallanes',1),(419,'122',6712,'',0,'122','Antártica Chilena',1),(420,'123',6712,'',0,'123','Tierra del Fuego',1),(421,'124',6712,'',0,'124','Última Esperanza',1),(422,'131',6713,'',0,'131','Santiago',1),(423,'132',6713,'',0,'132','Cordillera',1),(424,'133',6713,'',0,'133','Chacabuco',1),(425,'134',6713,'',0,'134','Maipo',1),(426,'135',6713,'',0,'135','Melipilla',1),(427,'136',6713,'',0,'136','Talagante',1),(428,'DIF',15401,'',0,'DIF','Distrito Federal',1),(429,'AGS',15401,'',0,'AGS','Aguascalientes',1),(430,'BCN',15401,'',0,'BCN','Baja California Norte',1),(431,'BCS',15401,'',0,'BCS','Baja California Sur',1),(432,'CAM',15401,'',0,'CAM','Campeche',1),(433,'CHP',15401,'',0,'CHP','Chiapas',1),(434,'CHI',15401,'',0,'CHI','Chihuahua',1),(435,'COA',15401,'',0,'COA','Coahuila',1),(436,'COL',15401,'',0,'COL','Colima',1),(437,'DUR',15401,'',0,'DUR','Durango',1),(438,'GTO',15401,'',0,'GTO','Guanajuato',1),(439,'GRO',15401,'',0,'GRO','Guerrero',1),(440,'HGO',15401,'',0,'HGO','Hidalgo',1),(441,'JAL',15401,'',0,'JAL','Jalisco',1),(442,'MEX',15401,'',0,'MEX','México',1),(443,'MIC',15401,'',0,'MIC','Michoacán de Ocampo',1),(444,'MOR',15401,'',0,'MOR','Morelos',1),(445,'NAY',15401,'',0,'NAY','Nayarit',1),(446,'NLE',15401,'',0,'NLE','Nuevo León',1),(447,'OAX',15401,'',0,'OAX','Oaxaca',1),(448,'PUE',15401,'',0,'PUE','Puebla',1),(449,'QRO',15401,'',0,'QRO','Querétaro',1),(451,'ROO',15401,'',0,'ROO','Quintana Roo',1),(452,'SLP',15401,'',0,'SLP','San Luis Potosí',1),(453,'SIN',15401,'',0,'SIN','Sinaloa',1),(454,'SON',15401,'',0,'SON','Sonora',1),(455,'TAB',15401,'',0,'TAB','Tabasco',1),(456,'TAM',15401,'',0,'TAM','Tamaulipas',1),(457,'TLX',15401,'',0,'TLX','Tlaxcala',1),(458,'VER',15401,'',0,'VER','Veracruz',1),(459,'YUC',15401,'',0,'YUC','Yucatán',1),(460,'ZAC',15401,'',0,'ZAC','Zacatecas',1),(461,'ANT',7001,'',0,'ANT','Antioquia',1),(462,'BOL',7001,'',0,'BOL','Bolívar',1),(463,'BOY',7001,'',0,'BOY','Boyacá',1),(464,'CAL',7001,'',0,'CAL','Caldas',1),(465,'CAU',7001,'',0,'CAU','Cauca',1),(466,'CUN',7001,'',0,'CUN','Cundinamarca',1),(467,'HUI',7001,'',0,'HUI','Huila',1),(468,'LAG',7001,'',0,'LAG','La Guajira',1),(469,'MET',7001,'',0,'MET','Meta',1),(470,'NAR',7001,'',0,'NAR','Nariño',1),(471,'NDS',7001,'',0,'NDS','Norte de Santander',1),(472,'SAN',7001,'',0,'SAN','Santander',1),(473,'SUC',7001,'',0,'SUC','Sucre',1),(474,'TOL',7001,'',0,'TOL','Tolima',1),(475,'VAC',7001,'',0,'VAC','Valle del Cauca',1),(476,'RIS',7001,'',0,'RIS','Risalda',1),(477,'ATL',7001,'',0,'ATL','Atlántico',1),(478,'COR',7001,'',0,'COR','Córdoba',1),(479,'SAP',7001,'',0,'SAP','San Andrés, Providencia y Santa Catalina',1),(480,'ARA',7001,'',0,'ARA','Arauca',1),(481,'CAS',7001,'',0,'CAS','Casanare',1),(482,'AMA',7001,'',0,'AMA','Amazonas',1),(483,'CAQ',7001,'',0,'CAQ','Caquetá',1),(484,'CHO',7001,'',0,'CHO','Chocó',1),(485,'GUA',7001,'',0,'GUA','Guainía',1),(486,'GUV',7001,'',0,'GUV','Guaviare',1),(487,'PUT',7001,'',0,'PUT','Putumayo',1),(488,'QUI',7001,'',0,'QUI','Quindío',1),(489,'VAU',7001,'',0,'VAU','Vaupés',1),(490,'BOG',7001,'',0,'BOG','Bogotá',1),(491,'VID',7001,'',0,'VID','Vichada',1),(492,'CES',7001,'',0,'CES','Cesar',1),(493,'MAG',7001,'',0,'MAG','Magdalena',1),(494,'AT',11401,'',0,'AT','Atlántida',1),(495,'CH',11401,'',0,'CH','Choluteca',1),(496,'CL',11401,'',0,'CL','Colón',1),(497,'CM',11401,'',0,'CM','Comayagua',1),(498,'CO',11401,'',0,'CO','Copán',1),(499,'CR',11401,'',0,'CR','Cortés',1),(500,'EP',11401,'',0,'EP','El Paraíso',1),(501,'FM',11401,'',0,'FM','Francisco Morazán',1),(502,'GD',11401,'',0,'GD','Gracias a Dios',1),(503,'IN',11401,'',0,'IN','Intibucá',1),(504,'IB',11401,'',0,'IB','Islas de la Bahía',1),(505,'LP',11401,'',0,'LP','La Paz',1),(506,'LM',11401,'',0,'LM','Lempira',1),(507,'OC',11401,'',0,'OC','Ocotepeque',1),(508,'OL',11401,'',0,'OL','Olancho',1),(509,'SB',11401,'',0,'SB','Santa Bárbara',1),(510,'VL',11401,'',0,'VL','Valle',1),(511,'YO',11401,'',0,'YO','Yoro',1),(512,'DC',11401,'',0,'DC','Distrito Central',1),(652,'CC',4601,'Oistins',0,'CC','Christ Church',1),(655,'SA',4601,'Greenland',0,'SA','Saint Andrew',1),(656,'SG',4601,'Bulkeley',0,'SG','Saint George',1),(657,'JA',4601,'Holetown',0,'JA','Saint James',1),(658,'SJ',4601,'Four Roads',0,'SJ','Saint John',1),(659,'SB',4601,'Bathsheba',0,'SB','Saint Joseph',1),(660,'SL',4601,'Crab Hill',0,'SL','Saint Lucy',1),(661,'SM',4601,'Bridgetown',0,'SM','Saint Michael',1),(662,'SP',4601,'Speightstown',0,'SP','Saint Peter',1),(663,'SC',4601,'Crane',0,'SC','Saint Philip',1),(664,'ST',4601,'Hillaby',0,'ST','Saint Thomas',1),(777,'AG',315,NULL,NULL,NULL,'AGRIGENTO',1),(778,'AL',312,NULL,NULL,NULL,'ALESSANDRIA',1),(779,'AN',310,NULL,NULL,NULL,'ANCONA',1),(780,'AO',319,NULL,NULL,NULL,'AOSTA',1),(781,'AR',316,NULL,NULL,NULL,'AREZZO',1),(782,'AP',310,NULL,NULL,NULL,'ASCOLI PICENO',1),(783,'AT',312,NULL,NULL,NULL,'ASTI',1),(784,'AV',304,NULL,NULL,NULL,'AVELLINO',1),(785,'BA',313,NULL,NULL,NULL,'BARI',1),(786,'BT',313,NULL,NULL,NULL,'BARLETTA-ANDRIA-TRANI',1),(787,'BL',320,NULL,NULL,NULL,'BELLUNO',1),(788,'BN',304,NULL,NULL,NULL,'BENEVENTO',1),(789,'BG',309,NULL,NULL,NULL,'BERGAMO',1),(790,'BI',312,NULL,NULL,NULL,'BIELLA',1),(791,'BO',305,NULL,NULL,NULL,'BOLOGNA',1),(792,'BZ',317,NULL,NULL,NULL,'BOLZANO',1),(793,'BS',309,NULL,NULL,NULL,'BRESCIA',1),(794,'BR',313,NULL,NULL,NULL,'BRINDISI',1),(795,'CA',314,NULL,NULL,NULL,'CAGLIARI',1),(796,'CL',315,NULL,NULL,NULL,'CALTANISSETTA',1),(797,'CB',311,NULL,NULL,NULL,'CAMPOBASSO',1),(798,'CI',314,NULL,NULL,NULL,'CARBONIA-IGLESIAS',1),(799,'CE',304,NULL,NULL,NULL,'CASERTA',1),(800,'CT',315,NULL,NULL,NULL,'CATANIA',1),(801,'CZ',303,NULL,NULL,NULL,'CATANZARO',1),(802,'CH',301,NULL,NULL,NULL,'CHIETI',1),(803,'CO',309,NULL,NULL,NULL,'COMO',1),(804,'CS',303,NULL,NULL,NULL,'COSENZA',1),(805,'CR',309,NULL,NULL,NULL,'CREMONA',1),(806,'KR',303,NULL,NULL,NULL,'CROTONE',1),(807,'CN',312,NULL,NULL,NULL,'CUNEO',1),(808,'EN',315,NULL,NULL,NULL,'ENNA',1),(809,'FM',310,NULL,NULL,NULL,'FERMO',1),(810,'FE',305,NULL,NULL,NULL,'FERRARA',1),(811,'FI',316,NULL,NULL,NULL,'FIRENZE',1),(812,'FG',313,NULL,NULL,NULL,'FOGGIA',1),(813,'FC',305,NULL,NULL,NULL,'FORLI-CESENA',1),(814,'FR',307,NULL,NULL,NULL,'FROSINONE',1),(815,'GE',308,NULL,NULL,NULL,'GENOVA',1),(816,'GO',306,NULL,NULL,NULL,'GORIZIA',1),(817,'GR',316,NULL,NULL,NULL,'GROSSETO',1),(818,'IM',308,NULL,NULL,NULL,'IMPERIA',1),(819,'IS',311,NULL,NULL,NULL,'ISERNIA',1),(820,'SP',308,NULL,NULL,NULL,'LA SPEZIA',1),(821,'AQ',301,NULL,NULL,NULL,'L AQUILA',1),(822,'LT',307,NULL,NULL,NULL,'LATINA',1),(823,'LE',313,NULL,NULL,NULL,'LECCE',1),(824,'LC',309,NULL,NULL,NULL,'LECCO',1),(825,'LI',314,NULL,NULL,NULL,'LIVORNO',1),(826,'LO',309,NULL,NULL,NULL,'LODI',1),(827,'LU',316,NULL,NULL,NULL,'LUCCA',1),(828,'MC',310,NULL,NULL,NULL,'MACERATA',1),(829,'MN',309,NULL,NULL,NULL,'MANTOVA',1),(830,'MS',316,NULL,NULL,NULL,'MASSA-CARRARA',1),(831,'MT',302,NULL,NULL,NULL,'MATERA',1),(832,'VS',314,NULL,NULL,NULL,'MEDIO CAMPIDANO',1),(833,'ME',315,NULL,NULL,NULL,'MESSINA',1),(834,'MI',309,NULL,NULL,NULL,'MILANO',1),(835,'MB',309,NULL,NULL,NULL,'MONZA e BRIANZA',1),(836,'MO',305,NULL,NULL,NULL,'MODENA',1),(837,'NA',304,NULL,NULL,NULL,'NAPOLI',1),(838,'NO',312,NULL,NULL,NULL,'NOVARA',1),(839,'NU',314,NULL,NULL,NULL,'NUORO',1),(840,'OG',314,NULL,NULL,NULL,'OGLIASTRA',1),(841,'OT',314,NULL,NULL,NULL,'OLBIA-TEMPIO',1),(842,'OR',314,NULL,NULL,NULL,'ORISTANO',1),(843,'PD',320,NULL,NULL,NULL,'PADOVA',1),(844,'PA',315,NULL,NULL,NULL,'PALERMO',1),(845,'PR',305,NULL,NULL,NULL,'PARMA',1),(846,'PV',309,NULL,NULL,NULL,'PAVIA',1),(847,'PG',318,NULL,NULL,NULL,'PERUGIA',1),(848,'PU',310,NULL,NULL,NULL,'PESARO e URBINO',1),(849,'PE',301,NULL,NULL,NULL,'PESCARA',1),(850,'PC',305,NULL,NULL,NULL,'PIACENZA',1),(851,'PI',316,NULL,NULL,NULL,'PISA',1),(852,'PT',316,NULL,NULL,NULL,'PISTOIA',1),(853,'PN',306,NULL,NULL,NULL,'PORDENONE',1),(854,'PZ',302,NULL,NULL,NULL,'POTENZA',1),(855,'PO',316,NULL,NULL,NULL,'PRATO',1),(856,'RG',315,NULL,NULL,NULL,'RAGUSA',1),(857,'RA',305,NULL,NULL,NULL,'RAVENNA',1),(858,'RC',303,NULL,NULL,NULL,'REGGIO CALABRIA',1),(859,'RE',305,NULL,NULL,NULL,'REGGIO NELL EMILIA',1),(860,'RI',307,NULL,NULL,NULL,'RIETI',1),(861,'RN',305,NULL,NULL,NULL,'RIMINI',1),(862,'RM',307,NULL,NULL,NULL,'ROMA',1),(863,'RO',320,NULL,NULL,NULL,'ROVIGO',1),(864,'SA',304,NULL,NULL,NULL,'SALERNO',1),(865,'SS',314,NULL,NULL,NULL,'SASSARI',1),(866,'SV',308,NULL,NULL,NULL,'SAVONA',1),(867,'SI',316,NULL,NULL,NULL,'SIENA',1),(868,'SR',315,NULL,NULL,NULL,'SIRACUSA',1),(869,'SO',309,NULL,NULL,NULL,'SONDRIO',1),(870,'TA',313,NULL,NULL,NULL,'TARANTO',1),(871,'TE',301,NULL,NULL,NULL,'TERAMO',1),(872,'TR',318,NULL,NULL,NULL,'TERNI',1),(873,'TO',312,NULL,NULL,NULL,'TORINO',1),(874,'TP',315,NULL,NULL,NULL,'TRAPANI',1),(875,'TN',317,NULL,NULL,NULL,'TRENTO',1),(876,'TV',320,NULL,NULL,NULL,'TREVISO',1),(877,'TS',306,NULL,NULL,NULL,'TRIESTE',1),(878,'UD',306,NULL,NULL,NULL,'UDINE',1),(879,'VA',309,NULL,NULL,NULL,'VARESE',1),(880,'VE',320,NULL,NULL,NULL,'VENEZIA',1),(881,'VB',312,NULL,NULL,NULL,'VERBANO-CUSIO-OSSOLA',1),(882,'VC',312,NULL,NULL,NULL,'VERCELLI',1),(883,'VR',320,NULL,NULL,NULL,'VERONA',1),(884,'VV',303,NULL,NULL,NULL,'VIBO VALENTIA',1),(885,'VI',320,NULL,NULL,NULL,'VICENZA',1),(886,'VT',307,NULL,NULL,NULL,'VITERBO',1),(1036,'VE-L',23201,'',0,'VE-L','Mérida',1),(1037,'VE-T',23201,'',0,'VE-T','Trujillo',1),(1038,'VE-E',23201,'',0,'VE-E','Barinas',1),(1039,'VE-M',23202,'',0,'VE-M','Miranda',1),(1040,'VE-W',23202,'',0,'VE-W','Vargas',1),(1041,'VE-A',23202,'',0,'VE-A','Distrito Capital',1),(1042,'VE-D',23203,'',0,'VE-D','Aragua',1),(1043,'VE-G',23203,'',0,'VE-G','Carabobo',1),(1044,'VE-I',23204,'',0,'VE-I','Falcón',1),(1045,'VE-K',23204,'',0,'VE-K','Lara',1),(1046,'VE-U',23204,'',0,'VE-U','Yaracuy',1),(1047,'VE-F',23205,'',0,'VE-F','Bolívar',1),(1048,'VE-X',23205,'',0,'VE-X','Amazonas',1),(1049,'VE-Y',23205,'',0,'VE-Y','Delta Amacuro',1),(1050,'VE-O',23206,'',0,'VE-O','Nueva Esparta',1),(1051,'VE-Z',23206,'',0,'VE-Z','Dependencias Federales',1),(1052,'VE-C',23207,'',0,'VE-C','Apure',1),(1053,'VE-J',23207,'',0,'VE-J','Guárico',1),(1054,'VE-H',23207,'',0,'VE-H','Cojedes',1),(1055,'VE-P',23207,'',0,'VE-P','Portuguesa',1),(1056,'VE-B',23208,'',0,'VE-B','Anzoátegui',1),(1057,'VE-N',23208,'',0,'VE-N','Monagas',1),(1058,'VE-R',23208,'',0,'VE-R','Sucre',1),(1059,'VE-V',23209,'',0,'VE-V','Zulia',1),(1060,'VE-S',23209,'',0,'VE-S','Táchira',1),(1061,'66',10201,NULL,NULL,NULL,'?????',1),(1062,'00',10205,NULL,NULL,NULL,'?????',1),(1063,'01',10205,NULL,NULL,NULL,'?????',1),(1064,'02',10205,NULL,NULL,NULL,'?????',1),(1065,'03',10205,NULL,NULL,NULL,'??????',1),(1066,'04',10205,NULL,NULL,NULL,'?????',1),(1067,'05',10205,NULL,NULL,NULL,'??????',1),(1068,'06',10203,NULL,NULL,NULL,'??????',1),(1069,'07',10203,NULL,NULL,NULL,'???????????',1),(1070,'08',10203,NULL,NULL,NULL,'??????',1),(1071,'09',10203,NULL,NULL,NULL,'?????',1),(1072,'10',10203,NULL,NULL,NULL,'??????',1),(1073,'11',10203,NULL,NULL,NULL,'??????',1),(1074,'12',10203,NULL,NULL,NULL,'?????????',1),(1075,'13',10206,NULL,NULL,NULL,'????',1),(1076,'14',10206,NULL,NULL,NULL,'?????????',1),(1077,'15',10206,NULL,NULL,NULL,'????????',1),(1078,'16',10206,NULL,NULL,NULL,'???????',1),(1079,'17',10213,NULL,NULL,NULL,'???????',1),(1080,'18',10213,NULL,NULL,NULL,'????????',1),(1081,'19',10213,NULL,NULL,NULL,'??????',1),(1082,'20',10213,NULL,NULL,NULL,'???????',1),(1083,'21',10212,NULL,NULL,NULL,'????????',1),(1084,'22',10212,NULL,NULL,NULL,'??????',1),(1085,'23',10212,NULL,NULL,NULL,'????????',1),(1086,'24',10212,NULL,NULL,NULL,'???????',1),(1087,'25',10212,NULL,NULL,NULL,'????????',1),(1088,'26',10212,NULL,NULL,NULL,'???????',1),(1089,'27',10202,NULL,NULL,NULL,'??????',1),(1090,'28',10202,NULL,NULL,NULL,'?????????',1),(1091,'29',10202,NULL,NULL,NULL,'????????',1),(1092,'30',10202,NULL,NULL,NULL,'??????',1),(1093,'31',10209,NULL,NULL,NULL,'????????',1),(1094,'32',10209,NULL,NULL,NULL,'???????',1),(1095,'33',10209,NULL,NULL,NULL,'????????',1),(1096,'34',10209,NULL,NULL,NULL,'???????',1),(1097,'35',10209,NULL,NULL,NULL,'????????',1),(1098,'36',10211,NULL,NULL,NULL,'???????????????',1),(1099,'37',10211,NULL,NULL,NULL,'?????',1),(1100,'38',10211,NULL,NULL,NULL,'?????',1),(1101,'39',10207,NULL,NULL,NULL,'????????',1),(1102,'40',10207,NULL,NULL,NULL,'???????',1),(1103,'41',10207,NULL,NULL,NULL,'??????????',1),(1104,'42',10207,NULL,NULL,NULL,'?????',1),(1105,'43',10207,NULL,NULL,NULL,'???????',1),(1106,'44',10208,NULL,NULL,NULL,'??????',1),(1107,'45',10208,NULL,NULL,NULL,'??????',1),(1108,'46',10208,NULL,NULL,NULL,'??????',1),(1109,'47',10208,NULL,NULL,NULL,'?????',1),(1110,'48',10208,NULL,NULL,NULL,'????',1),(1111,'49',10210,NULL,NULL,NULL,'??????',1),(1112,'50',10210,NULL,NULL,NULL,'????',1),(1113,'51',10210,NULL,NULL,NULL,'????????',1),(1114,'52',10210,NULL,NULL,NULL,'????????',1),(1115,'53',10210,NULL,NULL,NULL,'???-??????',1),(1116,'54',10210,NULL,NULL,NULL,'??',1),(1117,'55',10210,NULL,NULL,NULL,'?????',1),(1118,'56',10210,NULL,NULL,NULL,'???????',1),(1119,'57',10210,NULL,NULL,NULL,'?????',1),(1120,'58',10210,NULL,NULL,NULL,'?????',1),(1121,'59',10210,NULL,NULL,NULL,'?????',1),(1122,'60',10210,NULL,NULL,NULL,'?????',1),(1123,'61',10210,NULL,NULL,NULL,'?????',1),(1124,'62',10204,NULL,NULL,NULL,'????????',1),(1125,'63',10204,NULL,NULL,NULL,'??????',1),(1126,'64',10204,NULL,NULL,NULL,'???????',1),(1127,'65',10204,NULL,NULL,NULL,'?????',1),(1128,'AL01',1301,'',0,'','Wilaya d\'Adrar',1),(1129,'AL02',1301,'',0,'','Wilaya de Chlef',1),(1130,'AL03',1301,'',0,'','Wilaya de Laghouat',1),(1131,'AL04',1301,'',0,'','Wilaya d\'Oum El Bouaghi',1),(1132,'AL05',1301,'',0,'','Wilaya de Batna',1),(1133,'AL06',1301,'',0,'','Wilaya de Béjaïa',1),(1134,'AL07',1301,'',0,'','Wilaya de Biskra',1),(1135,'AL08',1301,'',0,'','Wilaya de Béchar',1),(1136,'AL09',1301,'',0,'','Wilaya de Blida',1),(1137,'AL11',1301,'',0,'','Wilaya de Bouira',1),(1138,'AL12',1301,'',0,'','Wilaya de Tamanrasset',1),(1139,'AL13',1301,'',0,'','Wilaya de Tébessa',1),(1140,'AL14',1301,'',0,'','Wilaya de Tlemcen',1),(1141,'AL15',1301,'',0,'','Wilaya de Tiaret',1),(1142,'AL16',1301,'',0,'','Wilaya de Tizi Ouzou',1),(1143,'AL17',1301,'',0,'','Wilaya d\'Alger',1),(1144,'AL18',1301,'',0,'','Wilaya de Djelfa',1),(1145,'AL19',1301,'',0,'','Wilaya de Jijel',1),(1146,'AL20',1301,'',0,'','Wilaya de Sétif	',1),(1147,'AL21',1301,'',0,'','Wilaya de Saïda',1),(1148,'AL22',1301,'',0,'','Wilaya de Skikda',1),(1149,'AL23',1301,'',0,'','Wilaya de Sidi Bel Abbès',1),(1150,'AL24',1301,'',0,'','Wilaya d\'Annaba',1),(1151,'AL25',1301,'',0,'','Wilaya de Guelma',1),(1152,'AL26',1301,'',0,'','Wilaya de Constantine',1),(1153,'AL27',1301,'',0,'','Wilaya de Médéa',1),(1154,'AL28',1301,'',0,'','Wilaya de Mostaganem',1),(1155,'AL29',1301,'',0,'','Wilaya de M\'Sila',1),(1156,'AL30',1301,'',0,'','Wilaya de Mascara',1),(1157,'AL31',1301,'',0,'','Wilaya d\'Ouargla',1),(1158,'AL32',1301,'',0,'','Wilaya d\'Oran',1),(1159,'AL33',1301,'',0,'','Wilaya d\'El Bayadh',1),(1160,'AL34',1301,'',0,'','Wilaya d\'Illizi',1),(1161,'AL35',1301,'',0,'','Wilaya de Bordj Bou Arreridj',1),(1162,'AL36',1301,'',0,'','Wilaya de Boumerdès',1),(1163,'AL37',1301,'',0,'','Wilaya d\'El Tarf',1),(1164,'AL38',1301,'',0,'','Wilaya de Tindouf',1),(1165,'AL39',1301,'',0,'','Wilaya de Tissemsilt',1),(1166,'AL40',1301,'',0,'','Wilaya d\'El Oued',1),(1167,'AL41',1301,'',0,'','Wilaya de Khenchela',1),(1168,'AL42',1301,'',0,'','Wilaya de Souk Ahras',1),(1169,'AL43',1301,'',0,'','Wilaya de Tipaza',1),(1170,'AL44',1301,'',0,'','Wilaya de Mila',1),(1171,'AL45',1301,'',0,'','Wilaya d\'Aïn Defla',1),(1172,'AL46',1301,'',0,'','Wilaya de Naâma',1),(1173,'AL47',1301,'',0,'','Wilaya d\'Aïn Témouchent',1),(1174,'AL48',1301,'',0,'','Wilaya de Ghardaia',1),(1175,'AL49',1301,'',0,'','Wilaya de Relizane',1),(1176,'MA',1209,'',0,'','Province de Benslimane',1),(1177,'MA1',1209,'',0,'','Province de Berrechid',1),(1178,'MA2',1209,'',0,'','Province de Khouribga',1),(1179,'MA3',1209,'',0,'','Province de Settat',1),(1180,'MA4',1210,'',0,'','Province d\'El Jadida',1),(1181,'MA5',1210,'',0,'','Province de Safi',1),(1182,'MA6',1210,'',0,'','Province de Sidi Bennour',1),(1183,'MA7',1210,'',0,'','Province de Youssoufia',1),(1184,'MA6B',1205,'',0,'','Préfecture de Fès',1),(1185,'MA7B',1205,'',0,'','Province de Boulemane',1),(1186,'MA8',1205,'',0,'','Province de Moulay Yacoub',1),(1187,'MA9',1205,'',0,'','Province de Sefrou',1),(1188,'MA8A',1202,'',0,'','Province de Kénitra',1),(1189,'MA9A',1202,'',0,'','Province de Sidi Kacem',1),(1190,'MA10',1202,'',0,'','Province de Sidi Slimane',1),(1191,'MA11',1208,'',0,'','Préfecture de Casablanca',1),(1192,'MA12',1208,'',0,'','Préfecture de Mohammédia',1),(1193,'MA13',1208,'',0,'','Province de Médiouna',1),(1194,'MA14',1208,'',0,'','Province de Nouaceur',1),(1195,'MA15',1214,'',0,'','Province d\'Assa-Zag',1),(1196,'MA16',1214,'',0,'','Province d\'Es-Semara',1),(1197,'MA17A',1214,'',0,'','Province de Guelmim',1),(1198,'MA18',1214,'',0,'','Province de Tata',1),(1199,'MA19',1214,'',0,'','Province de Tan-Tan',1),(1200,'MA15',1215,'',0,'','Province de Boujdour',1),(1201,'MA16',1215,'',0,'','Province de Lâayoune',1),(1202,'MA17',1215,'',0,'','Province de Tarfaya',1),(1203,'MA18',1211,'',0,'','Préfecture de Marrakech',1),(1204,'MA19',1211,'',0,'','Province d\'Al Haouz',1),(1205,'MA20',1211,'',0,'','Province de Chichaoua',1),(1206,'MA21',1211,'',0,'','Province d\'El Kelâa des Sraghna',1),(1207,'MA22',1211,'',0,'','Province d\'Essaouira',1),(1208,'MA23',1211,'',0,'','Province de Rehamna',1),(1209,'MA24',1206,'',0,'','Préfecture de Meknès',1),(1210,'MA25',1206,'',0,'','Province d’El Hajeb',1),(1211,'MA26',1206,'',0,'','Province d\'Errachidia',1),(1212,'MA27',1206,'',0,'','Province d’Ifrane',1),(1213,'MA28',1206,'',0,'','Province de Khénifra',1),(1214,'MA29',1206,'',0,'','Province de Midelt',1),(1215,'MA30',1204,'',0,'','Préfecture d\'Oujda-Angad',1),(1216,'MA31',1204,'',0,'','Province de Berkane',1),(1217,'MA32',1204,'',0,'','Province de Driouch',1),(1218,'MA33',1204,'',0,'','Province de Figuig',1),(1219,'MA34',1204,'',0,'','Province de Jerada',1),(1220,'MA35',1204,'',0,'','Province de Nadorgg',1),(1221,'MA36',1204,'',0,'','Province de Taourirt',1),(1222,'MA37',1216,'',0,'','Province d\'Aousserd',1),(1223,'MA38',1216,'',0,'','Province d\'Oued Ed-Dahab',1),(1224,'MA39',1207,'',0,'','Préfecture de Rabat',1),(1225,'MA40',1207,'',0,'','Préfecture de Skhirat-Témara',1),(1226,'MA41',1207,'',0,'','Préfecture de Salé',1),(1227,'MA42',1207,'',0,'','Province de Khémisset',1),(1228,'MA43',1213,'',0,'','Préfecture d\'Agadir Ida-Outanane',1),(1229,'MA44',1213,'',0,'','Préfecture d\'Inezgane-Aït Melloul',1),(1230,'MA45',1213,'',0,'','Province de Chtouka-Aït Baha',1),(1231,'MA46',1213,'',0,'','Province d\'Ouarzazate',1),(1232,'MA47',1213,'',0,'','Province de Sidi Ifni',1),(1233,'MA48',1213,'',0,'','Province de Taroudant',1),(1234,'MA49',1213,'',0,'','Province de Tinghir',1),(1235,'MA50',1213,'',0,'','Province de Tiznit',1),(1236,'MA51',1213,'',0,'','Province de Zagora',1),(1237,'MA52',1212,'',0,'','Province d\'Azilal',1),(1238,'MA53',1212,'',0,'','Province de Beni Mellal',1),(1239,'MA54',1212,'',0,'','Province de Fquih Ben Salah',1),(1240,'MA55',1201,'',0,'','Préfecture de M\'diq-Fnideq',1),(1241,'MA56',1201,'',0,'','Préfecture de Tanger-Asilah',1),(1242,'MA57',1201,'',0,'','Province de Chefchaouen',1),(1243,'MA58',1201,'',0,'','Province de Fahs-Anjra',1),(1244,'MA59',1201,'',0,'','Province de Larache',1),(1245,'MA60',1201,'',0,'','Province d\'Ouezzane',1),(1246,'MA61',1201,'',0,'','Province de Tétouan',1),(1247,'MA62',1203,'',0,'','Province de Guercif',1),(1248,'MA63',1203,'',0,'','Province d\'Al Hoceïma',1),(1249,'MA64',1203,'',0,'','Province de Taounate',1),(1250,'MA65',1203,'',0,'','Province de Taza',1),(1251,'MA6A',1205,'',0,'','Préfecture de Fès',1),(1252,'MA7A',1205,'',0,'','Province de Boulemane',1),(1253,'MA15A',1214,'',0,'','Province d\'Assa-Zag',1),(1254,'MA16A',1214,'',0,'','Province d\'Es-Semara',1),(1255,'MA18A',1211,'',0,'','Préfecture de Marrakech',1),(1256,'MA19A',1214,'',0,'','Province de Tan-Tan',1),(1257,'MA19B',1214,'',0,'','Province de Tan-Tan',1),(1258,'TN01',1001,'',0,'','Ariana',1),(1259,'TN02',1001,'',0,'','Béja',1),(1260,'TN03',1001,'',0,'','Ben Arous',1),(1261,'TN04',1001,'',0,'','Bizerte',1),(1262,'TN05',1001,'',0,'','Gabès',1),(1263,'TN06',1001,'',0,'','Gafsa',1),(1264,'TN07',1001,'',0,'','Jendouba',1),(1265,'TN08',1001,'',0,'','Kairouan',1),(1266,'TN09',1001,'',0,'','Kasserine',1),(1267,'TN10',1001,'',0,'','Kébili',1),(1268,'TN11',1001,'',0,'','La Manouba',1),(1269,'TN12',1001,'',0,'','Le Kef',1),(1270,'TN13',1001,'',0,'','Mahdia',1),(1271,'TN14',1001,'',0,'','Médenine',1),(1272,'TN15',1001,'',0,'','Monastir',1),(1273,'TN16',1001,'',0,'','Nabeul',1),(1274,'TN17',1001,'',0,'','Sfax',1),(1275,'TN18',1001,'',0,'','Sidi Bouzid',1),(1276,'TN19',1001,'',0,'','Siliana',1),(1277,'TN20',1001,'',0,'','Sousse',1),(1278,'TN21',1001,'',0,'','Tataouine',1),(1279,'TN22',1001,'',0,'','Tozeur',1),(1280,'TN23',1001,'',0,'','Tunis',1),(1281,'TN24',1001,'',0,'','Zaghouan',1);
+/*!40000 ALTER TABLE `llx_c_departements` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_ecotaxe`
+--
+
+DROP TABLE IF EXISTS `llx_c_ecotaxe`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ecotaxe` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(64) NOT NULL,
+  `libelle` varchar(255) DEFAULT NULL,
+  `price` double(24,8) DEFAULT NULL,
+  `organization` varchar(255) DEFAULT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_ecotaxe` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ecotaxe`
+--
+
+LOCK TABLES `llx_c_ecotaxe` WRITE;
+/*!40000 ALTER TABLE `llx_c_ecotaxe` DISABLE KEYS */;
+INSERT INTO `llx_c_ecotaxe` VALUES (1,'ER-A-A','Materiels electriques < 0,2kg',0.01000000,'ERP',1,1),(2,'ER-A-B','Materiels electriques >= 0,2 kg et < 0,5 kg',0.03000000,'ERP',1,1),(3,'ER-A-C','Materiels electriques >= 0,5 kg et < 1 kg',0.04000000,'ERP',1,1),(4,'ER-A-D','Materiels electriques >= 1 kg et < 2 kg',0.13000000,'ERP',1,1),(5,'ER-A-E','Materiels electriques >= 2 kg et < 4kg',0.21000000,'ERP',1,1),(6,'ER-A-F','Materiels electriques >= 4 kg et < 8 kg',0.42000000,'ERP',1,1),(7,'ER-A-G','Materiels electriques >= 8 kg et < 15 kg',0.84000000,'ERP',1,1),(8,'ER-A-H','Materiels electriques >= 15 kg et < 20 kg',1.25000000,'ERP',1,1),(9,'ER-A-I','Materiels electriques >= 20 kg et < 30 kg',1.88000000,'ERP',1,1),(10,'ER-A-J','Materiels electriques >= 30 kg',3.34000000,'ERP',1,1),(11,'ER-M-1','TV, Moniteurs < 9kg',0.84000000,'ERP',1,1),(12,'ER-M-2','TV, Moniteurs >= 9kg et < 15kg',1.67000000,'ERP',1,1),(13,'ER-M-3','TV, Moniteurs >= 15kg et < 30kg',3.34000000,'ERP',1,1),(14,'ER-M-4','TV, Moniteurs >= 30 kg',6.69000000,'ERP',1,1),(15,'EC-A-A','Materiels electriques  0,2 kg max',0.00840000,'Ecologic',1,1),(16,'EC-A-B','Materiels electriques 0,21 kg min - 0,50 kg max',0.02500000,'Ecologic',1,1),(17,'EC-A-C','Materiels electriques  0,51 kg min - 1 kg max',0.04000000,'Ecologic',1,1),(18,'EC-A-D','Materiels electriques  1,01 kg min - 2,5 kg max',0.13000000,'Ecologic',1,1),(19,'EC-A-E','Materiels electriques  2,51 kg min - 4 kg max',0.21000000,'Ecologic',1,1),(20,'EC-A-F','Materiels electriques 4,01 kg min - 8 kg max',0.42000000,'Ecologic',1,1),(21,'EC-A-G','Materiels electriques  8,01 kg min - 12 kg max',0.63000000,'Ecologic',1,1),(22,'EC-A-H','Materiels electriques 12,01 kg min - 20 kg max',1.05000000,'Ecologic',1,1),(23,'EC-A-I','Materiels electriques  20,01 kg min',1.88000000,'Ecologic',1,1),(24,'EC-M-1','TV, Moniteurs 9 kg max',0.84000000,'Ecologic',1,1),(25,'EC-M-2','TV, Moniteurs 9,01 kg min - 18 kg max',1.67000000,'Ecologic',1,1),(26,'EC-M-3','TV, Moniteurs 18,01 kg min - 36 kg max',3.34000000,'Ecologic',1,1),(27,'EC-M-4','TV, Moniteurs 36,01 kg min',6.69000000,'Ecologic',1,1),(28,'ES-M-1','TV, Moniteurs <= 20 pouces',0.84000000,'Eco-systemes',1,1),(29,'ES-M-2','TV, Moniteurs > 20 pouces et <= 32 pouces',3.34000000,'Eco-systemes',1,1),(30,'ES-M-3','TV, Moniteurs > 32 pouces et autres grands ecrans',6.69000000,'Eco-systemes',1,1),(31,'ES-A-A','Ordinateur fixe, Audio home systems (HIFI), elements hifi separes',0.84000000,'Eco-systemes',1,1),(32,'ES-A-B','Ordinateur portable, CD-RCR, VCR, lecteurs et enregistreurs DVD, instruments de musique et caisses de resonance, haut parleurs...',0.25000000,'Eco-systemes',1,1),(33,'ES-A-C','Imprimante, photocopieur, telecopieur',0.42000000,'Eco-systemes',1,1),(34,'ES-A-D','Accessoires, clavier, souris, PDA, imprimante photo, appareil photo, gps, telephone, repondeur, telephone sans fil, modem, telecommande, casque, camescope, baladeur mp3, radio portable, radio K7 et CD portable, radio reveil',0.08400000,'Eco-systemes',1,1),(35,'ES-A-E','GSM',0.00840000,'Eco-systemes',1,1),(36,'ES-A-F','Jouets et equipements de loisirs et de sports < 0,5 kg',0.04200000,'Eco-systemes',1,1),(37,'ES-A-G','Jouets et equipements de loisirs et de sports > 0,5 kg',0.17000000,'Eco-systemes',1,1),(38,'ES-A-H','Jouets et equipements de loisirs et de sports > 10 kg',1.25000000,'Eco-systemes',1,1);
+/*!40000 ALTER TABLE `llx_c_ecotaxe` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_effectif`
+--
+
+DROP TABLE IF EXISTS `llx_c_effectif`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_effectif` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_effectif` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_effectif`
+--
+
+LOCK TABLES `llx_c_effectif` WRITE;
+/*!40000 ALTER TABLE `llx_c_effectif` DISABLE KEYS */;
+INSERT INTO `llx_c_effectif` VALUES (0,'EF0','-',1,NULL),(1,'EF1-5','1 - 5',1,NULL),(2,'EF6-10','6 - 10',1,NULL),(3,'EF11-50','11 - 50',1,NULL),(4,'EF51-100','51 - 100',1,NULL),(5,'EF100-500','100 - 500',1,NULL),(6,'EF500-','> 500',1,NULL);
+/*!40000 ALTER TABLE `llx_c_effectif` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_email_templates`
+--
+
+DROP TABLE IF EXISTS `llx_c_email_templates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_email_templates` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  `type_template` varchar(32) DEFAULT NULL,
+  `lang` varchar(6) DEFAULT NULL,
+  `private` smallint(6) NOT NULL DEFAULT '0',
+  `fk_user` int(11) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) DEFAULT NULL,
+  `position` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `topic` text,
+  `content` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_email_templates` (`entity`,`label`,`lang`),
+  KEY `idx_type` (`type_template`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_email_templates`
+--
+
+LOCK TABLES `llx_c_email_templates` WRITE;
+/*!40000 ALTER TABLE `llx_c_email_templates` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_email_templates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_field_list`
+--
+
+DROP TABLE IF EXISTS `llx_c_field_list`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_field_list` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `element` varchar(64) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `name` varchar(32) NOT NULL,
+  `alias` varchar(32) NOT NULL,
+  `title` varchar(32) NOT NULL,
+  `align` varchar(6) DEFAULT 'left',
+  `sort` tinyint(4) NOT NULL DEFAULT '1',
+  `search` tinyint(4) NOT NULL DEFAULT '0',
+  `enabled` varchar(255) DEFAULT '1',
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_field_list`
+--
+
+LOCK TABLES `llx_c_field_list` WRITE;
+/*!40000 ALTER TABLE `llx_c_field_list` DISABLE KEYS */;
+INSERT INTO `llx_c_field_list` VALUES (1,'2011-02-06 11:18:30','product_default',1,'p.ref','ref','Ref','left',1,1,'1',1),(2,'2011-02-06 11:18:30','product_default',1,'p.label','label','Label','left',1,1,'1',2),(3,'2011-02-06 11:18:30','product_default',1,'p.barcode','barcode','BarCode','center',1,1,'$conf->barcode->enabled',3),(4,'2011-02-06 11:18:30','product_default',1,'p.tms','datem','DateModification','center',1,0,'1',4),(5,'2011-02-06 11:18:30','product_default',1,'p.price','price','SellingPriceHT','right',1,0,'1',5),(6,'2011-02-06 11:18:30','product_default',1,'p.price_ttc','price_ttc','SellingPriceTTC','right',1,0,'1',6),(7,'2011-02-06 11:18:30','product_default',1,'p.stock','stock','Stock','right',0,0,'$conf->stock->enabled',7),(8,'2011-02-06 11:18:30','product_default',1,'p.envente','status','Status','right',1,0,'1',8);
+/*!40000 ALTER TABLE `llx_c_field_list` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_forme_juridique`
+--
+
+DROP TABLE IF EXISTS `llx_c_forme_juridique`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_forme_juridique` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` int(11) NOT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `libelle` varchar(255) DEFAULT NULL,
+  `isvatexempted` tinyint(4) NOT NULL DEFAULT '0',
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_forme_juridique` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=100009 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_forme_juridique`
+--
+
+LOCK TABLES `llx_c_forme_juridique` WRITE;
+/*!40000 ALTER TABLE `llx_c_forme_juridique` DISABLE KEYS */;
+INSERT INTO `llx_c_forme_juridique` VALUES (399,0,0,'-',0,1,NULL),(400,2301,23,'Monotributista',0,1,NULL),(401,2302,23,'Sociedad Civil',0,1,NULL),(402,2303,23,'Sociedades Comerciales',0,1,NULL),(403,2304,23,'Sociedades de Hecho',0,1,NULL),(404,2305,23,'Sociedades Irregulares',0,1,NULL),(405,2306,23,'Sociedad Colectiva',0,1,NULL),(406,2307,23,'Sociedad en Comandita Simple',0,1,NULL),(407,2308,23,'Sociedad de Capital e Industria',0,1,NULL),(408,2309,23,'Sociedad Accidental o en participación',0,1,NULL),(409,2310,23,'Sociedad de Responsabilidad Limitada',0,1,NULL),(410,2311,23,'Sociedad Anónima',0,1,NULL),(411,2312,23,'Sociedad Anónima con Participación Estatal Mayoritaria',0,1,NULL),(412,2313,23,'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)',0,1,NULL),(413,11,1,'Artisan Commerçant (EI)',0,1,NULL),(414,12,1,'Commerçant (EI)',0,1,NULL),(415,13,1,'Artisan (EI)',0,1,NULL),(416,14,1,'Officier public ou ministériel',0,1,NULL),(417,15,1,'Profession libérale (EI)',0,1,NULL),(418,16,1,'Exploitant agricole',0,1,NULL),(419,17,1,'Agent commercial',0,1,NULL),(420,18,1,'Associé Gérant de société',0,1,NULL),(421,19,1,'Personne physique',0,1,NULL),(422,21,1,'Indivision',0,1,NULL),(423,22,1,'Société créée de fait',0,1,NULL),(424,23,1,'Société en participation',0,1,NULL),(425,27,1,'Paroisse hors zone concordataire',0,1,NULL),(426,29,1,'Groupement de droit privé non doté de la personnalité morale',0,1,NULL),(427,31,1,'Personne morale de droit étranger, immatriculée au RCS',0,1,NULL),(428,32,1,'Personne morale de droit étranger, non immatriculée au RCS',0,1,NULL),(429,35,1,'Régime auto-entrepreneur',0,1,NULL),(430,41,1,'Établissement public ou régie à caractère industriel ou commercial',0,1,NULL),(431,51,1,'Société coopérative commerciale particulière',0,1,NULL),(432,52,1,'Société en nom collectif',0,1,NULL),(433,53,1,'Société en commandite',0,1,NULL),(434,54,1,'Société à responsabilité limitée (SARL)',0,1,NULL),(435,55,1,'Société anonyme à conseil d administration',0,1,NULL),(436,56,1,'Société anonyme à directoire',0,1,NULL),(437,57,1,'Société par actions simplifiée',0,1,NULL),(438,58,1,'Entreprise Unipersonnelle à Responsabilité Limitée (EURL)',0,1,NULL),(439,61,1,'Caisse d\'épargne et de prévoyance',0,1,NULL),(440,62,1,'Groupement d\'intérêt économique (GIE)',0,1,NULL),(441,63,1,'Société coopérative agricole',0,1,NULL),(442,64,1,'Société non commerciale d assurances',0,1,NULL),(443,65,1,'Société civile',0,1,NULL),(444,69,1,'Personnes de droit privé inscrites au RCS',0,1,NULL),(445,71,1,'Administration de l état',0,1,NULL),(446,72,1,'Collectivité territoriale',0,1,NULL),(447,73,1,'Établissement public administratif',0,1,NULL),(448,74,1,'Personne morale de droit public administratif',0,1,NULL),(449,81,1,'Organisme gérant régime de protection social à adhésion obligatoire',0,1,NULL),(450,82,1,'Organisme mutualiste',0,1,NULL),(451,83,1,'Comité d entreprise',0,1,NULL),(452,84,1,'Organisme professionnel',0,1,NULL),(453,85,1,'Organisme de retraite à adhésion non obligatoire',0,1,NULL),(454,91,1,'Syndicat de propriétaires',0,1,NULL),(455,92,1,'Association loi 1901 ou assimilé',0,1,NULL),(456,93,1,'Fondation',0,1,NULL),(457,99,1,'Personne morale de droit privé',0,1,NULL),(458,200,2,'Indépendant',0,1,NULL),(459,201,2,'SPRL - Société à responsabilité limitée',0,1,NULL),(460,202,2,'SA   - Société Anonyme',0,1,NULL),(461,203,2,'SCRL - Société coopérative à responsabilité limitée',0,1,NULL),(462,204,2,'ASBL - Association sans but Lucratif',0,1,NULL),(463,205,2,'SCRI - Société coopérative à responsabilité illimitée',0,1,NULL),(464,206,2,'SCS  - Société en commandite simple',0,1,NULL),(465,207,2,'SCA  - Société en commandite par action',0,1,NULL),(466,208,2,'SNC  - Société en nom collectif',0,1,NULL),(467,209,2,'GIE  - Groupement d intérêt économique',0,1,NULL),(468,210,2,'GEIE - Groupement européen d intérêt économique',0,1,NULL),(469,500,5,'Limited liability corporation (GmbH)',0,1,NULL),(470,501,5,'Stock corporation (AG)',0,1,NULL),(471,502,5,'Partnerships general or limited (GmbH & CO. KG)',0,1,NULL),(472,503,5,'Sole proprietor / Private business',0,1,NULL),(473,301,3,'Società semplice',0,1,NULL),(474,302,3,'Società in nome collettivo s.n.c.',0,1,NULL),(475,303,3,'Società in accomandita semplice s.a.s.',0,1,NULL),(476,304,3,'Società per azioni s.p.a.',0,1,NULL),(477,305,3,'Società a responsabilità limitata s.r.l.',0,1,NULL),(478,306,3,'Società in accomandita per azioni s.a.p.a.',0,1,NULL),(479,307,3,'Società cooperativa',0,1,NULL),(480,308,3,'Società consortile',0,1,NULL),(481,309,3,'Società europea',0,1,NULL),(482,310,3,'Società cooperativa europea',0,1,NULL),(483,311,3,'Società unipersonale',0,1,NULL),(484,312,3,'Società di professionisti',0,1,NULL),(485,313,3,'Società di fatto',0,1,NULL),(486,314,3,'Società occulta',0,1,NULL),(487,315,3,'Società apparente',0,1,NULL),(488,316,3,'Impresa individuale ',0,1,NULL),(489,317,3,'Impresa coniugale',0,1,NULL),(490,318,3,'Impresa familiare',0,1,NULL),(491,600,6,'Raison Individuelle',0,1,NULL),(492,601,6,'Société Simple',0,1,NULL),(493,602,6,'Société en nom collectif',0,1,NULL),(494,603,6,'Société en commandite',0,1,NULL),(495,604,6,'Société anonyme (SA)',0,1,NULL),(496,605,6,'Société en commandite par actions',0,1,NULL),(497,606,6,'Société à responsabilité limitée (SARL)',0,1,NULL),(498,607,6,'Société coopérative',0,1,NULL),(499,608,6,'Association',0,1,NULL),(500,609,6,'Fondation',0,1,NULL),(501,700,7,'Sole Trader',0,1,NULL),(502,701,7,'Partnership',0,1,NULL),(503,702,7,'Private Limited Company by shares (LTD)',0,1,NULL),(504,703,7,'Public Limited Company',0,1,NULL),(505,704,7,'Workers Cooperative',0,1,NULL),(506,705,7,'Limited Liability Partnership',0,1,NULL),(507,706,7,'Franchise',0,1,NULL),(508,1000,10,'Société à responsabilité limitée (SARL)',0,1,NULL),(509,1001,10,'Société en Nom Collectif (SNC)',0,1,NULL),(510,1002,10,'Société en Commandite Simple (SCS)',0,1,NULL),(511,1003,10,'société en participation',0,1,NULL),(512,1004,10,'Société Anonyme (SA)',0,1,NULL),(513,1005,10,'Société Unipersonnelle à Responsabilité Limitée (SUARL)',0,1,NULL),(514,1006,10,'Groupement d\'intérêt économique (GEI)',0,1,NULL),(515,1007,10,'Groupe de sociétés',0,1,NULL),(516,401,4,'Empresario Individual',0,1,NULL),(517,402,4,'Comunidad de Bienes',0,1,NULL),(518,403,4,'Sociedad Civil',0,1,NULL),(519,404,4,'Sociedad Colectiva',0,1,NULL),(520,405,4,'Sociedad Limitada',0,1,NULL),(521,406,4,'Sociedad Anónima',0,1,NULL),(522,407,4,'Sociedad Comandataria por Acciones',0,1,NULL),(523,408,4,'Sociedad Comandataria Simple',0,1,NULL),(524,409,4,'Sociedad Laboral',0,1,NULL),(525,410,4,'Sociedad Cooperativa',0,1,NULL),(526,411,4,'Sociedad de Garantía Recíproca',0,1,NULL),(527,412,4,'Entidad de Capital-Riesgo',0,1,NULL),(528,413,4,'Agrupación de Interés Económico',0,1,NULL),(529,414,4,'Sociedad de Inversión Mobiliaria',0,1,NULL),(530,415,4,'Agrupación sin Ánimo de Lucro',0,1,NULL),(531,15201,152,'Mauritius Private Company Limited By Shares',0,1,NULL),(532,15202,152,'Mauritius Company Limited By Guarantee',0,1,NULL),(533,15203,152,'Mauritius Public Company Limited By Shares',0,1,NULL),(534,15204,152,'Mauritius Foreign Company',0,1,NULL),(535,15205,152,'Mauritius GBC1 (Offshore Company)',0,1,NULL),(536,15206,152,'Mauritius GBC2 (International Company)',0,1,NULL),(537,15207,152,'Mauritius General Partnership',0,1,NULL),(538,15208,152,'Mauritius Limited Partnership',0,1,NULL),(539,15209,152,'Mauritius Sole Proprietorship',0,1,NULL),(540,15210,152,'Mauritius Trusts',0,1,NULL),(541,15401,154,'Sociedad en nombre colectivo',0,1,NULL),(542,15402,154,'Sociedad en comandita simple',0,1,NULL),(543,15403,154,'Sociedad de responsabilidad limitada',0,1,NULL),(544,15404,154,'Sociedad anónima',0,1,NULL),(545,15405,154,'Sociedad en comandita por acciones',0,1,NULL),(546,15406,154,'Sociedad cooperativa',0,1,NULL),(100001,100001,1,'Etudiant',0,0,'cabinetmed'),(100002,100002,1,'Retraité',0,0,'cabinetmed'),(100003,100003,1,'Artisan',0,0,'cabinetmed'),(100004,100004,1,'Femme de ménage',0,0,'cabinetmed'),(100005,100005,1,'Professeur',0,0,'cabinetmed'),(100006,100006,1,'Profession libérale',0,0,'cabinetmed'),(100007,100007,1,'Informaticien',0,0,'cabinetmed'),(100008,60,1,'Entreprise Individuelle à Responsabilité Limitée (EIRL)',0,1,NULL);
+/*!40000 ALTER TABLE `llx_c_forme_juridique` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_input_method`
+--
+
+DROP TABLE IF EXISTS `llx_c_input_method`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_input_method` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) DEFAULT NULL,
+  `libelle` varchar(60) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_methode_commande_fournisseur` (`code`),
+  UNIQUE KEY `uk_c_input_method` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_input_method`
+--
+
+LOCK TABLES `llx_c_input_method` WRITE;
+/*!40000 ALTER TABLE `llx_c_input_method` DISABLE KEYS */;
+INSERT INTO `llx_c_input_method` VALUES (1,'OrderByMail','Courrier',1,NULL),(2,'OrderByFax','Fax',1,NULL),(3,'OrderByEMail','EMail',1,NULL),(4,'OrderByPhone','Téléphone',1,NULL),(5,'OrderByWWW','En ligne',1,NULL);
+/*!40000 ALTER TABLE `llx_c_input_method` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_input_reason`
+--
+
+DROP TABLE IF EXISTS `llx_c_input_reason`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_input_reason` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(60) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_input_reason` (`code`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_input_reason`
+--
+
+LOCK TABLES `llx_c_input_reason` WRITE;
+/*!40000 ALTER TABLE `llx_c_input_reason` DISABLE KEYS */;
+INSERT INTO `llx_c_input_reason` VALUES (1,'SRC_INTE','Web site',1,NULL),(2,'SRC_CAMP_MAIL','Mailing campaign',1,NULL),(3,'SRC_CAMP_PHO','Phone campaign',1,NULL),(4,'SRC_CAMP_FAX','Fax campaign',1,NULL),(5,'SRC_COMM','Commercial contact',1,NULL),(6,'SRC_SHOP','Shop contact',1,NULL),(7,'SRC_CAMP_EMAIL','EMailing campaign',1,NULL),(8,'SRC_WOM','Word of mouth',1,NULL),(9,'SRC_PARTNER','Partner',1,NULL),(10,'SRC_EMPLOYEE','Employee',1,NULL),(11,'SRC_SPONSORING','Sponsoring',1,NULL);
+/*!40000 ALTER TABLE `llx_c_input_reason` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_methode_commande_fournisseur`
+--
+
+DROP TABLE IF EXISTS `llx_c_methode_commande_fournisseur`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_methode_commande_fournisseur` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) DEFAULT NULL,
+  `libelle` varchar(60) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_methode_commande_fournisseur` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_methode_commande_fournisseur`
+--
+
+LOCK TABLES `llx_c_methode_commande_fournisseur` WRITE;
+/*!40000 ALTER TABLE `llx_c_methode_commande_fournisseur` DISABLE KEYS */;
+INSERT INTO `llx_c_methode_commande_fournisseur` VALUES (1,'OrderByMail','Courrier',1),(2,'OrderByFax','Fax',1),(3,'OrderByEMail','EMail',1),(4,'OrderByPhone','Téléphone',1),(5,'OrderByWWW','En ligne',1);
+/*!40000 ALTER TABLE `llx_c_methode_commande_fournisseur` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_paiement`
+--
+
+DROP TABLE IF EXISTS `llx_c_paiement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_paiement` (
+  `id` int(11) NOT NULL,
+  `code` varchar(6) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `type` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `accountancy_code` varchar(32) DEFAULT NULL,
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_paiement` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_paiement`
+--
+
+LOCK TABLES `llx_c_paiement` WRITE;
+/*!40000 ALTER TABLE `llx_c_paiement` DISABLE KEYS */;
+INSERT INTO `llx_c_paiement` VALUES (0,'','-',3,1,NULL,NULL),(1,'TIP','TIP',2,1,NULL,NULL),(2,'VIR','Virement',2,1,NULL,NULL),(3,'PRE','Prélèvement',2,1,NULL,NULL),(4,'LIQ','Espèces',2,1,NULL,NULL),(6,'CB','Carte Bancaire',2,1,NULL,NULL),(7,'CHQ','Chèque',2,1,NULL,NULL),(50,'VAD','Paiement en ligne',2,0,NULL,NULL),(51,'TRA','Traite',2,0,NULL,NULL),(52,'LCR','LCR',2,0,NULL,NULL),(53,'FAC','Factor',2,0,NULL,NULL),(54,'PRO','Proforma',2,0,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_paiement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_paper_format`
+--
+
+DROP TABLE IF EXISTS `llx_c_paper_format`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_paper_format` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(16) NOT NULL,
+  `label` varchar(50) NOT NULL,
+  `width` float(6,2) DEFAULT '0.00',
+  `height` float(6,2) DEFAULT '0.00',
+  `unit` varchar(5) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=226 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_paper_format`
+--
+
+LOCK TABLES `llx_c_paper_format` WRITE;
+/*!40000 ALTER TABLE `llx_c_paper_format` DISABLE KEYS */;
+INSERT INTO `llx_c_paper_format` VALUES (1,'EU4A0','Format 4A0',1682.00,2378.00,'mm',1,NULL),(2,'EU2A0','Format 2A0',1189.00,1682.00,'mm',1,NULL),(3,'EUA0','Format A0',840.00,1189.00,'mm',1,NULL),(4,'EUA1','Format A1',594.00,840.00,'mm',1,NULL),(5,'EUA2','Format A2',420.00,594.00,'mm',1,NULL),(6,'EUA3','Format A3',297.00,420.00,'mm',1,NULL),(7,'EUA4','Format A4',210.00,297.00,'mm',1,NULL),(8,'EUA5','Format A5',148.00,210.00,'mm',1,NULL),(9,'EUA6','Format A6',105.00,148.00,'mm',1,NULL),(100,'USLetter','Format Letter (A)',216.00,279.00,'mm',1,NULL),(105,'USLegal','Format Legal',216.00,356.00,'mm',1,NULL),(110,'USExecutive','Format Executive',190.00,254.00,'mm',1,NULL),(115,'USLedger','Format Ledger/Tabloid (B)',279.00,432.00,'mm',1,NULL),(200,'CAP1','Format Canadian P1',560.00,860.00,'mm',1,NULL),(205,'CAP2','Format Canadian P2',430.00,560.00,'mm',1,NULL),(210,'CAP3','Format Canadian P3',280.00,430.00,'mm',1,NULL),(215,'CAP4','Format Canadian P4',215.00,280.00,'mm',1,NULL),(220,'CAP5','Format Canadian P5',140.00,215.00,'mm',1,NULL),(225,'CAP6','Format Canadian P6',107.00,140.00,'mm',1,NULL);
+/*!40000 ALTER TABLE `llx_c_paper_format` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_payment_term`
+--
+
+DROP TABLE IF EXISTS `llx_c_payment_term`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_payment_term` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(16) DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) DEFAULT '1',
+  `libelle` varchar(255) DEFAULT NULL,
+  `libelle_facture` text,
+  `fdm` tinyint(4) DEFAULT NULL,
+  `nbjour` smallint(6) DEFAULT NULL,
+  `decalage` smallint(6) DEFAULT NULL,
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_payment_term`
+--
+
+LOCK TABLES `llx_c_payment_term` WRITE;
+/*!40000 ALTER TABLE `llx_c_payment_term` DISABLE KEYS */;
+INSERT INTO `llx_c_payment_term` VALUES (1,'RECEP',1,1,'A réception','Réception de facture',0,0,NULL,NULL),(2,'30D',2,1,'30 jours','Réglement à 30 jours',0,30,NULL,NULL),(3,'30DENDMONTH',3,1,'30 jours fin de mois','Réglement à 30 jours fin de mois',1,30,NULL,NULL),(4,'60D',4,1,'60 jours','Réglement à 60 jours',0,60,NULL,NULL),(5,'60DENDMONTH',5,1,'60 jours fin de mois','Réglement à 60 jours fin de mois',1,60,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_payment_term` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_pays`
+--
+
+DROP TABLE IF EXISTS `llx_c_pays`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_pays` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(2) NOT NULL,
+  `code_iso` varchar(3) DEFAULT NULL,
+  `libelle` varchar(50) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_c_pays_code` (`code`),
+  UNIQUE KEY `idx_c_pays_libelle` (`libelle`),
+  UNIQUE KEY `idx_c_pays_code_iso` (`code_iso`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_pays`
+--
+
+LOCK TABLES `llx_c_pays` WRITE;
+/*!40000 ALTER TABLE `llx_c_pays` DISABLE KEYS */;
+INSERT INTO `llx_c_pays` VALUES (0,'',NULL,'-',1),(1,'FR',NULL,'France',1),(2,'BE',NULL,'Belgium',1),(3,'IT',NULL,'Italy',1),(4,'ES',NULL,'Spain',1),(5,'DE',NULL,'Germany',1),(6,'CH',NULL,'Suisse',1),(7,'GB',NULL,'United Kingdow',1),(8,'IE',NULL,'Irland',1),(9,'CN',NULL,'China',1),(10,'TN',NULL,'Tunisie',1),(11,'US',NULL,'United States',1),(12,'MA',NULL,'Maroc',1),(13,'DZ',NULL,'Algérie',1),(14,'CA',NULL,'Canada',1),(15,'TG',NULL,'Togo',1),(16,'GA',NULL,'Gabon',1),(17,'NL',NULL,'Nerderland',1),(18,'HU',NULL,'Hongrie',1),(19,'RU',NULL,'Russia',1),(20,'SE',NULL,'Sweden',1),(21,'CI',NULL,'Côte d\'Ivoire',1),(22,'SN',NULL,'Sénégal',1),(23,'AR',NULL,'Argentine',1),(24,'CM',NULL,'Cameroun',1),(25,'PT',NULL,'Portugal',1),(26,'SA',NULL,'Arabie Saoudite',1),(27,'MC',NULL,'Monaco',1),(28,'AU',NULL,'Australia',1),(29,'SG',NULL,'Singapour',1),(30,'AF',NULL,'Afghanistan',1),(31,'AX',NULL,'Iles Aland',1),(32,'AL',NULL,'Albanie',1),(33,'AS',NULL,'Samoa américaines',1),(34,'AD',NULL,'Andorre',1),(35,'AO',NULL,'Angola',1),(36,'AI',NULL,'Anguilla',1),(37,'AQ',NULL,'Antarctique',1),(38,'AG',NULL,'Antigua-et-Barbuda',1),(39,'AM',NULL,'Arménie',1),(40,'AW',NULL,'Aruba',1),(41,'AT',NULL,'Autriche',1),(42,'AZ',NULL,'Azerbaïdjan',1),(43,'BS',NULL,'Bahamas',1),(44,'BH',NULL,'Bahreïn',1),(45,'BD',NULL,'Bangladesh',1),(46,'BB',NULL,'Barbade',1),(47,'BY',NULL,'Biélorussie',1),(48,'BZ',NULL,'Belize',1),(49,'BJ',NULL,'Bénin',1),(50,'BM',NULL,'Bermudes',1),(51,'BT',NULL,'Bhoutan',1),(52,'BO',NULL,'Bolivie',1),(53,'BA',NULL,'Bosnie-Herzégovine',1),(54,'BW',NULL,'Botswana',1),(55,'BV',NULL,'Ile Bouvet',1),(56,'BR',NULL,'Brésil',1),(57,'IO',NULL,'Territoire britannique de l\'Océan Indien',1),(58,'BN',NULL,'Brunei',1),(59,'BG',NULL,'Bulgarie',1),(60,'BF',NULL,'Burkina Faso',1),(61,'BI',NULL,'Burundi',1),(62,'KH',NULL,'Cambodge',1),(63,'CV',NULL,'Cap-Vert',1),(64,'KY',NULL,'Iles Cayman',1),(65,'CF',NULL,'République centrafricaine',1),(66,'TD',NULL,'Tchad',1),(67,'CL',NULL,'Chili',1),(68,'CX',NULL,'Ile Christmas',1),(69,'CC',NULL,'Iles des Cocos (Keeling)',1),(70,'CO',NULL,'Colombie',1),(71,'KM',NULL,'Comores',1),(72,'CG',NULL,'Congo',1),(73,'CD',NULL,'République démocratique du Congo',1),(74,'CK',NULL,'Iles Cook',1),(75,'CR',NULL,'Costa Rica',1),(76,'HR',NULL,'Croatie',1),(77,'CU',NULL,'Cuba',1),(78,'CY',NULL,'Chypre',1),(79,'CZ',NULL,'République Tchèque',1),(80,'DK',NULL,'Danemark',1),(81,'DJ',NULL,'Djibouti',1),(82,'DM',NULL,'Dominique',1),(83,'DO',NULL,'République Dominicaine',1),(84,'EC',NULL,'Equateur',1),(85,'EG',NULL,'Egypte',1),(86,'SV',NULL,'Salvador',1),(87,'GQ',NULL,'Guinée Equatoriale',1),(88,'ER',NULL,'Erythrée',1),(89,'EE',NULL,'Estonie',1),(90,'ET',NULL,'Ethiopie',1),(91,'FK',NULL,'Iles Falkland',1),(92,'FO',NULL,'Iles Féroé',1),(93,'FJ',NULL,'Iles Fidji',1),(94,'FI',NULL,'Finlande',1),(95,'GF',NULL,'Guyane française',1),(96,'PF',NULL,'Polynésie française',1),(97,'TF',NULL,'Terres australes françaises',1),(98,'GM',NULL,'Gambie',1),(99,'GE',NULL,'Géorgie',1),(100,'GH',NULL,'Ghana',1),(101,'GI',NULL,'Gibraltar',1),(102,'GR',NULL,'Grèce',1),(103,'GL',NULL,'Groenland',1),(104,'GD',NULL,'Grenade',1),(105,'GP',NULL,'Guadeloupe',1),(106,'GU',NULL,'Guam',1),(107,'GT',NULL,'Guatemala',1),(108,'GN',NULL,'Guinée',1),(109,'GW',NULL,'Guinée-Bissao',1),(110,'GY',NULL,'Guyana',1),(111,'HT',NULL,'Haiti',1),(112,'HM',NULL,'Iles Heard et McDonald',1),(113,'VA',NULL,'Saint-Siège (Vatican)',1),(114,'HN',NULL,'Honduras',1),(115,'HK',NULL,'Hong Kong',1),(116,'IS',NULL,'Islande',1),(117,'IN',NULL,'India',1),(118,'ID',NULL,'Indonésie',1),(119,'IR',NULL,'Iran',1),(120,'IQ',NULL,'Iraq',1),(121,'IL',NULL,'Israel',1),(122,'JM',NULL,'Jamaïque',1),(123,'JP',NULL,'Japon',1),(124,'JO',NULL,'Jordanie',1),(125,'KZ',NULL,'Kazakhstan',1),(126,'KE',NULL,'Kenya',1),(127,'KI',NULL,'Kiribati',1),(128,'KP',NULL,'Corée du Nord',1),(129,'KR',NULL,'Corée du Sud',1),(130,'KW',NULL,'Koweït',1),(131,'KG',NULL,'Kirghizistan',1),(132,'LA',NULL,'Laos',1),(133,'LV',NULL,'Lettonie',1),(134,'LB',NULL,'Liban',1),(135,'LS',NULL,'Lesotho',1),(136,'LR',NULL,'Liberia',1),(137,'LY',NULL,'Libye',1),(138,'LI',NULL,'Liechtenstein',1),(139,'LT',NULL,'Lituanie',1),(140,'LU',NULL,'Luxembourg',1),(141,'MO',NULL,'Macao',1),(142,'MK',NULL,'ex-République yougoslave de Macédoine',1),(143,'MG',NULL,'Madagascar',1),(144,'MW',NULL,'Malawi',1),(145,'MY',NULL,'Malaisie',1),(146,'MV',NULL,'Maldives',1),(147,'ML',NULL,'Mali',1),(148,'MT',NULL,'Malte',1),(149,'MH',NULL,'Iles Marshall',1),(150,'MQ',NULL,'Martinique',1),(151,'MR',NULL,'Mauritanie',1),(152,'MU',NULL,'Maurice',1),(153,'YT',NULL,'Mayotte',1),(154,'MX',NULL,'Mexique',1),(155,'FM',NULL,'Micronésie',1),(156,'MD',NULL,'Moldavie',1),(157,'MN',NULL,'Mongolie',1),(158,'MS',NULL,'Monserrat',1),(159,'MZ',NULL,'Mozambique',1),(160,'MM',NULL,'Birmanie (Myanmar)',1),(161,'NA',NULL,'Namibie',1),(162,'NR',NULL,'Nauru',1),(163,'NP',NULL,'Népal',1),(164,'AN',NULL,'Antilles néerlandaises',1),(165,'NC',NULL,'Nouvelle-Calédonie',1),(166,'NZ',NULL,'Nouvelle-Zélande',1),(167,'NI',NULL,'Nicaragua',1),(168,'NE',NULL,'Niger',1),(169,'NG',NULL,'Nigeria',1),(170,'NU',NULL,'Nioué',1),(171,'NF',NULL,'Ile Norfolk',1),(172,'MP',NULL,'Mariannes du Nord',1),(173,'NO',NULL,'Norvège',1),(174,'OM',NULL,'Oman',1),(175,'PK',NULL,'Pakistan',1),(176,'PW',NULL,'Palaos',1),(177,'PS',NULL,'territoire Palestinien Occupé',1),(178,'PA',NULL,'Panama',1),(179,'PG',NULL,'Papouasie-Nouvelle-Guinée',1),(180,'PY',NULL,'Paraguay',1),(181,'PE',NULL,'Pérou',1),(182,'PH',NULL,'Philippines',1),(183,'PN',NULL,'Iles Pitcairn',1),(184,'PL',NULL,'Pologne',1),(185,'PR',NULL,'Porto Rico',1),(186,'QA',NULL,'Qatar',1),(187,'RE',NULL,'Réunion',1),(188,'RO',NULL,'Roumanie',1),(189,'RW',NULL,'Rwanda',1),(190,'SH',NULL,'Sainte-Hélène',1),(191,'KN',NULL,'Saint-Christophe-et-Niévès',1),(192,'LC',NULL,'Sainte-Lucie',1),(193,'PM',NULL,'Saint-Pierre-et-Miquelon',1),(194,'VC',NULL,'Saint-Vincent-et-les-Grenadines',1),(195,'WS',NULL,'Samoa',1),(196,'SM',NULL,'Saint-Marin',1),(197,'ST',NULL,'Sao Tomé-et-Principe',1),(198,'RS',NULL,'Serbie',1),(199,'SC',NULL,'Seychelles',1),(200,'SL',NULL,'Sierra Leone',1),(201,'SK',NULL,'Slovaquie',1),(202,'SI',NULL,'Slovénie',1),(203,'SB',NULL,'Iles Salomon',1),(204,'SO',NULL,'Somalie',1),(205,'ZA',NULL,'Afrique du Sud',1),(206,'GS',NULL,'Iles Géorgie du Sud et Sandwich du Sud',1),(207,'LK',NULL,'Sri Lanka',1),(208,'SD',NULL,'Soudan',1),(209,'SR',NULL,'Suriname',1),(210,'SJ',NULL,'Iles Svalbard et Jan Mayen',1),(211,'SZ',NULL,'Swaziland',1),(212,'SY',NULL,'Syrie',1),(213,'TW',NULL,'Taïwan',1),(214,'TJ',NULL,'Tadjikistan',1),(215,'TZ',NULL,'Tanzanie',1),(216,'TH',NULL,'Thaïlande',1),(217,'TL',NULL,'Timor Oriental',1),(218,'TK',NULL,'Tokélaou',1),(219,'TO',NULL,'Tonga',1),(220,'TT',NULL,'Trinité-et-Tobago',1),(221,'TR',NULL,'Turquie',1),(222,'TM',NULL,'Turkménistan',1),(223,'TC',NULL,'Iles Turks-et-Caicos',1),(224,'TV',NULL,'Tuvalu',1),(225,'UG',NULL,'Ouganda',1),(226,'UA',NULL,'Ukraine',1),(227,'AE',NULL,'Émirats arabes unis',1),(228,'UM',NULL,'Iles mineures éloignées des États-Unis',1),(229,'UY',NULL,'Uruguay',1),(230,'UZ',NULL,'Ouzbékistan',1),(231,'VU',NULL,'Vanuatu',1),(232,'VE',NULL,'Vénézuela',1),(233,'VN',NULL,'Viêt Nam',1),(234,'VG',NULL,'Iles Vierges britanniques',1),(235,'VI',NULL,'Iles Vierges américaines',1),(236,'WF',NULL,'Wallis-et-Futuna',1),(237,'EH',NULL,'Sahara occidental',1),(238,'YE',NULL,'Yémen',1),(239,'ZM',NULL,'Zambie',1),(240,'ZW',NULL,'Zimbabwe',1),(241,'GG',NULL,'Guernesey',1),(242,'IM',NULL,'Ile de Man',1),(243,'JE',NULL,'Jersey',1),(244,'ME',NULL,'Monténégro',1),(245,'BL',NULL,'Saint-Barthélemy',1),(246,'MF',NULL,'Saint-Martin',1);
+/*!40000 ALTER TABLE `llx_c_pays` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_propalst`
+--
+
+DROP TABLE IF EXISTS `llx_c_propalst`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_propalst` (
+  `id` smallint(6) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `label` varchar(30) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_propalst` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_propalst`
+--
+
+LOCK TABLES `llx_c_propalst` WRITE;
+/*!40000 ALTER TABLE `llx_c_propalst` DISABLE KEYS */;
+INSERT INTO `llx_c_propalst` VALUES (0,'PR_DRAFT','Brouillon',1),(1,'PR_OPEN','Ouverte',1),(2,'PR_SIGNED','Signée',1),(3,'PR_NOTSIGNED','Non Signée',1),(4,'PR_FAC','Facturée',1);
+/*!40000 ALTER TABLE `llx_c_propalst` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_prospectlevel`
+--
+
+DROP TABLE IF EXISTS `llx_c_prospectlevel`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_prospectlevel` (
+  `code` varchar(12) NOT NULL,
+  `label` varchar(30) DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` smallint(6) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_prospectlevel`
+--
+
+LOCK TABLES `llx_c_prospectlevel` WRITE;
+/*!40000 ALTER TABLE `llx_c_prospectlevel` DISABLE KEYS */;
+INSERT INTO `llx_c_prospectlevel` VALUES ('PL_HIGH','High',4,1,NULL),('PL_LOW','Low',2,1,NULL),('PL_MEDIUM','Medium',3,1,NULL),('PL_NONE','None',1,1,NULL);
+/*!40000 ALTER TABLE `llx_c_prospectlevel` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_regions`
+--
+
+DROP TABLE IF EXISTS `llx_c_regions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_regions` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code_region` int(11) NOT NULL,
+  `fk_pays` int(11) NOT NULL,
+  `cheflieu` varchar(50) DEFAULT NULL,
+  `tncc` int(11) DEFAULT NULL,
+  `nom` varchar(50) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `code_region` (`code_region`),
+  UNIQUE KEY `uk_code_region` (`code_region`),
+  KEY `idx_c_regions_fk_pays` (`fk_pays`),
+  CONSTRAINT `fk_c_regions_fk_pays` FOREIGN KEY (`fk_pays`) REFERENCES `llx_c_pays` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=23210 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_regions`
+--
+
+LOCK TABLES `llx_c_regions` WRITE;
+/*!40000 ALTER TABLE `llx_c_regions` DISABLE KEYS */;
+INSERT INTO `llx_c_regions` VALUES (1,0,0,'0',0,'-',1),(101,1,1,'97105',3,'Guadeloupe',1),(102,2,1,'97209',3,'Martinique',1),(103,3,1,'97302',3,'Guyane',1),(104,4,1,'97411',3,'Réunion',1),(105,11,1,'75056',1,'Île-de-France',1),(106,21,1,'51108',0,'Champagne-Ardenne',1),(107,22,1,'80021',0,'Picardie',1),(108,23,1,'76540',0,'Haute-Normandie',1),(109,24,1,'45234',2,'Centre',1),(110,25,1,'14118',0,'Basse-Normandie',1),(111,26,1,'21231',0,'Bourgogne',1),(112,31,1,'59350',2,'Nord-Pas-de-Calais',1),(113,41,1,'57463',0,'Lorraine',1),(114,42,1,'67482',1,'Alsace',1),(115,43,1,'25056',0,'Franche-Comté',1),(116,52,1,'44109',4,'Pays de la Loire',1),(117,53,1,'35238',0,'Bretagne',1),(118,54,1,'86194',2,'Poitou-Charentes',1),(119,72,1,'33063',1,'Aquitaine',1),(120,73,1,'31555',0,'Midi-Pyrénées',1),(121,74,1,'87085',2,'Limousin',1),(122,82,1,'69123',2,'Rhône-Alpes',1),(123,83,1,'63113',1,'Auvergne',1),(124,91,1,'34172',2,'Languedoc-Roussillon',1),(125,93,1,'13055',0,'Provence-Alpes-Côte d\'Azur',1),(126,94,1,'2A004',0,'Corse',1),(201,201,2,'',1,'Flandre',1),(202,202,2,'',2,'Wallonie',1),(203,203,2,'',3,'Bruxelles-Capitale',1),(301,301,3,NULL,1,'Abruzzo',1),(302,302,3,NULL,1,'Basilicata',1),(303,303,3,NULL,1,'Calabria',1),(304,304,3,NULL,1,'Campania',1),(305,305,3,NULL,1,'Emilia-Romagna',1),(306,306,3,NULL,1,'Friuli-Venezia Giulia',1),(307,307,3,NULL,1,'Lazio',1),(308,308,3,NULL,1,'Liguria',1),(309,309,3,NULL,1,'Lombardia',1),(310,310,3,NULL,1,'Marche',1),(311,311,3,NULL,1,'Molise',1),(312,312,3,NULL,1,'Piemonte',1),(313,313,3,NULL,1,'Puglia',1),(314,314,3,NULL,1,'Sardegna',1),(315,315,3,NULL,1,'Sicilia',1),(316,316,3,NULL,1,'Toscana',1),(317,317,3,NULL,1,'Trentino-Alto Adige',1),(318,318,3,NULL,1,'Umbria',1),(319,319,3,NULL,1,'Valle d Aosta',1),(320,320,3,NULL,1,'Veneto',1),(401,401,4,'',0,'Andalucia',1),(402,402,4,'',0,'Aragón',1),(403,403,4,'',0,'Castilla y León',1),(404,404,4,'',0,'Castilla la Mancha',1),(405,405,4,'',0,'Canarias',1),(406,406,4,'',0,'Cataluña',1),(407,407,4,'',0,'Comunidad de Ceuta',1),(408,408,4,'',0,'Comunidad Foral de Navarra',1),(409,409,4,'',0,'Comunidad de Melilla',1),(410,410,4,'',0,'Cantabria',1),(411,411,4,'',0,'Comunidad Valenciana',1),(412,412,4,'',0,'Extemadura',1),(413,413,4,'',0,'Galicia',1),(414,414,4,'',0,'Islas Baleares',1),(415,415,4,'',0,'La Rioja',1),(416,416,4,'',0,'Comunidad de Madrid',1),(417,417,4,'',0,'Región de Murcia',1),(418,418,4,'',0,'Principado de Asturias',1),(419,419,4,'',0,'Pais Vasco',1),(420,420,4,'',0,'Otros',1),(601,601,6,'',1,'Cantons',1),(1001,1001,10,'',0,'Ariana',1),(1002,1002,10,'',0,'Béja',1),(1003,1003,10,'',0,'Ben Arous',1),(1004,1004,10,'',0,'Bizerte',1),(1005,1005,10,'',0,'Gabès',1),(1006,1006,10,'',0,'Gafsa',1),(1007,1007,10,'',0,'Jendouba',1),(1008,1008,10,'',0,'Kairouan',1),(1009,1009,10,'',0,'Kasserine',1),(1010,1010,10,'',0,'Kébili',1),(1011,1011,10,'',0,'La Manouba',1),(1012,1012,10,'',0,'Le Kef',1),(1013,1013,10,'',0,'Mahdia',1),(1014,1014,10,'',0,'Médenine',1),(1015,1015,10,'',0,'Monastir',1),(1016,1016,10,'',0,'Nabeul',1),(1017,1017,10,'',0,'Sfax',1),(1018,1018,10,'',0,'Sidi Bouzid',1),(1019,1019,10,'',0,'Siliana',1),(1020,1020,10,'',0,'Sousse',1),(1021,1021,10,'',0,'Tataouine',1),(1022,1022,10,'',0,'Tozeur',1),(1023,1023,10,'',0,'Tunis',1),(1024,1024,10,'',0,'Zaghouan',1),(1101,1101,11,'',0,'United-States',1),(1201,1201,12,'',0,'Tanger-Tétouan',1),(1202,1202,12,'',0,'Gharb-Chrarda-Beni Hssen',1),(1203,1203,12,'',0,'Taza-Al Hoceima-Taounate',1),(1204,1204,12,'',0,'L\'Oriental',1),(1205,1205,12,'',0,'Fès-Boulemane',1),(1206,1206,12,'',0,'Meknès-Tafialet',1),(1207,1207,12,'',0,'Rabat-Salé-Zemour-Zaër',1),(1208,1208,12,'',0,'Grand Cassablanca',1),(1209,1209,12,'',0,'Chaouia-Ouardigha',1),(1210,1210,12,'',0,'Doukahla-Adba',1),(1211,1211,12,'',0,'Marrakech-Tensift-Al Haouz',1),(1212,1212,12,'',0,'Tadla-Azilal',1),(1213,1213,12,'',0,'Sous-Massa-Drâa',1),(1214,1214,12,'',0,'Guelmim-Es Smara',1),(1215,1215,12,'',0,'Laâyoune-Boujdour-Sakia el Hamra',1),(1216,1216,12,'',0,'Oued Ed-Dahab Lagouira',1),(1301,1301,13,'',0,'Algerie',1),(2301,2301,23,'',0,'Norte',1),(2302,2302,23,'',0,'Litoral',1),(2303,2303,23,'',0,'Cuyana',1),(2304,2304,23,'',0,'Central',1),(2305,2305,23,'',0,'Patagonia',1),(2801,2801,28,'',0,'Australia',1),(4601,4601,46,'',0,'Barbados',1),(6701,6701,67,NULL,NULL,'Tarapacá',1),(6702,6702,67,NULL,NULL,'Antofagasta',1),(6703,6703,67,NULL,NULL,'Atacama',1),(6704,6704,67,NULL,NULL,'Coquimbo',1),(6705,6705,67,NULL,NULL,'Valparaíso',1),(6706,6706,67,NULL,NULL,'General Bernardo O Higgins',1),(6707,6707,67,NULL,NULL,'Maule',1),(6708,6708,67,NULL,NULL,'Biobío',1),(6709,6709,67,NULL,NULL,'Raucanía',1),(6710,6710,67,NULL,NULL,'Los Lagos',1),(6711,6711,67,NULL,NULL,'Aysén General Carlos Ibáñez del Campo',1),(6712,6712,67,NULL,NULL,'Magallanes y Antártica Chilena',1),(6713,6713,67,NULL,NULL,'Santiago',1),(6714,6714,67,NULL,NULL,'Los Ríos',1),(6715,6715,67,NULL,NULL,'Arica y Parinacota',1),(7001,7001,70,'',0,'Colombie',1),(8601,8601,86,NULL,NULL,'Central',1),(8602,8602,86,NULL,NULL,'Oriental',1),(8603,8603,86,NULL,NULL,'Occidental',1),(10201,10201,102,NULL,NULL,'??????',1),(10202,10202,102,NULL,NULL,'?????? ??????',1),(10203,10203,102,NULL,NULL,'???????? ?????????',1),(10204,10204,102,NULL,NULL,'?????',1),(10205,10205,102,NULL,NULL,'????????? ????????? ??? ?????',1),(10206,10206,102,NULL,NULL,'???????',1),(10207,10207,102,NULL,NULL,'????? ?????',1),(10208,10208,102,NULL,NULL,'?????? ??????',1),(10209,10209,102,NULL,NULL,'????????????',1),(10210,10210,102,NULL,NULL,'????? ??????',1),(10211,10211,102,NULL,NULL,'?????? ??????',1),(10212,10212,102,NULL,NULL,'????????',1),(10213,10213,102,NULL,NULL,'?????? ?????????',1),(11401,11401,114,'',0,'Honduras',1),(11701,11701,117,'',0,'India',1),(15201,15201,152,'',0,'Rivière Noire',1),(15202,15202,152,'',0,'Flacq',1),(15203,15203,152,'',0,'Grand Port',1),(15204,15204,152,'',0,'Moka',1),(15205,15205,152,'',0,'Pamplemousses',1),(15206,15206,152,'',0,'Plaines Wilhems',1),(15207,15207,152,'',0,'Port-Louis',1),(15208,15208,152,'',0,'Rivière du Rempart',1),(15209,15209,152,'',0,'Savanne',1),(15210,15210,152,'',0,'Rodrigues',1),(15211,15211,152,'',0,'Les îles Agaléga',1),(15212,15212,152,'',0,'Les écueils des Cargados Carajos',1),(15401,15401,154,'',0,'Mexique',1),(23201,23201,232,'',0,'Los Andes',1),(23202,23202,232,'',0,'Capital',1),(23203,23203,232,'',0,'Central',1),(23204,23204,232,'',0,'Cento Occidental',1),(23205,23205,232,'',0,'Guayana',1),(23206,23206,232,'',0,'Insular',1),(23207,23207,232,'',0,'Los Llanos',1),(23208,23208,232,'',0,'Nor-Oriental',1),(23209,23209,232,'',0,'Zuliana',1);
+/*!40000 ALTER TABLE `llx_c_regions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_revenuestamp`
+--
+
+DROP TABLE IF EXISTS `llx_c_revenuestamp`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_revenuestamp` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_pays` int(11) NOT NULL,
+  `taux` double NOT NULL,
+  `note` varchar(128) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `accountancy_code_sell` varchar(32) DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=105 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_revenuestamp`
+--
+
+LOCK TABLES `llx_c_revenuestamp` WRITE;
+/*!40000 ALTER TABLE `llx_c_revenuestamp` DISABLE KEYS */;
+INSERT INTO `llx_c_revenuestamp` VALUES (101,10,0.6,'Timbre fiscal1',1,'aa','bb'),(103,30,10,'111',1,'1111','1111'),(104,10,5,'fdsf',1,'dfd',NULL);
+/*!40000 ALTER TABLE `llx_c_revenuestamp` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_shipment_mode`
+--
+
+DROP TABLE IF EXISTS `llx_c_shipment_mode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_shipment_mode` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `code` varchar(30) NOT NULL,
+  `libelle` varchar(50) NOT NULL,
+  `description` text,
+  `tracking` varchar(256) NOT NULL,
+  `active` tinyint(4) DEFAULT '0',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_shipment_mode`
+--
+
+LOCK TABLES `llx_c_shipment_mode` WRITE;
+/*!40000 ALTER TABLE `llx_c_shipment_mode` DISABLE KEYS */;
+INSERT INTO `llx_c_shipment_mode` VALUES (1,'2010-10-09 23:43:16','CATCH','Catch','Catch by client','',1,NULL),(2,'2010-10-09 23:43:16','TRANS','Transporter','Generic transporter','',1,NULL),(3,'2010-10-09 23:43:16','COLSUI','Colissimo Suivi','Colissimo Suivi','',0,NULL),(4,'2011-07-18 17:28:27','LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max','',0,NULL),(5,'2013-02-24 01:48:17','UPS','UPS','United Parcel Service','',0,NULL),(6,'2013-02-24 01:48:17','KIALA','KIALA','Relais Kiala','',0,NULL),(7,'2013-02-24 01:48:17','GLS','GLS','General Logistics Systems','',0,NULL),(8,'2013-02-24 01:48:17','CHRONO','Chronopost','Chronopost','',0,NULL),(9,'2013-02-24 01:48:18','UPS','UPS','United Parcel Service','http://wwwapps.ups.com/etracking/tracking.cgi?InquiryNumber2=&InquiryNumber3=&tracknums_displayed=3&loc=fr_FR&TypeOfInquiryNumber=T&HTMLVersion=4.0&InquiryNumber22=&InquiryNumber32=&track=Track&Suivi.x=64&Suivi.y=7&Suivi=Valider&InquiryNumber1={TRACKID}',0,NULL),(10,'2013-02-24 01:48:18','KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}',0,NULL),(11,'2013-02-24 01:48:18','GLS','GLS','General Logistics Systems','http://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/FR01/FR/5004.htm?txtAction=71000&txtRefNo={TRACKID}',0,NULL),(12,'2013-02-24 01:48:18','CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}',0,NULL);
+/*!40000 ALTER TABLE `llx_c_shipment_mode` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_source`
+--
+
+DROP TABLE IF EXISTS `llx_c_source`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_source` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(30) NOT NULL,
+  `label` varchar(60) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_source`
+--
+
+LOCK TABLES `llx_c_source` WRITE;
+/*!40000 ALTER TABLE `llx_c_source` DISABLE KEYS */;
+INSERT INTO `llx_c_source` VALUES (1,'SRC_00','Proposition commerciale',1),(2,'SRC_01','Internet',1),(3,'SRC_02','Campagne courrier',1),(4,'SRC_03','Campagne téléphone',1),(5,'SRC_04','Campagne fax',1),(6,'SRC_05','Commercial',1),(7,'SRC_06','Magasin',1);
+/*!40000 ALTER TABLE `llx_c_source` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_stcomm`
+--
+
+DROP TABLE IF EXISTS `llx_c_stcomm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_stcomm` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_stcomm` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_stcomm`
+--
+
+LOCK TABLES `llx_c_stcomm` WRITE;
+/*!40000 ALTER TABLE `llx_c_stcomm` DISABLE KEYS */;
+INSERT INTO `llx_c_stcomm` VALUES (-1,'ST_NO','Ne pas contacter',1),(0,'ST_NEVER','Jamais contacté',1),(1,'ST_TODO','A contacter',1),(2,'ST_PEND','Contact en cours',1),(3,'ST_DONE','Contactée',1);
+/*!40000 ALTER TABLE `llx_c_stcomm` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_tva`
+--
+
+DROP TABLE IF EXISTS `llx_c_tva`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_tva` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_pays` int(11) NOT NULL,
+  `taux` double NOT NULL,
+  `localtax1` varchar(10) DEFAULT NULL,
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2` varchar(10) DEFAULT NULL,
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `recuperableonly` int(11) NOT NULL DEFAULT '0',
+  `note` varchar(128) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `accountancy_code_sell` varchar(32) DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_tva_id` (`fk_pays`,`taux`,`recuperableonly`)
+) ENGINE=InnoDB AUTO_INCREMENT=2463 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_tva`
+--
+
+LOCK TABLES `llx_c_tva` WRITE;
+/*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */;
+INSERT INTO `llx_c_tva` VALUES (11,1,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,'5.2','3','-21','1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,'1.4','3','-21','1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,'0.5','3','-21','1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,'0','3','-21','1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,'0','0','0','0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,'0','0','0','0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,'0','0','0','0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,'0','0','0','0',0,'VAT 6%',1,NULL,NULL),(102,10,12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL),(103,10,18,'0','0','0','0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,'0','0','0','0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,'0','0','0','0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,'0','0','0','0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,'9.975','1','0','0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,'0','0','0','0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,'0','0','0','0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(462,46,15,'0','0','0','0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,'0','0','0','0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,'0','0','0','0',0,'IVA 13',1,NULL,NULL),(862,86,0,'0','0','0','0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,'0','0','0','0',0,'No ISV',1,NULL,NULL),(1142,114,12,'0','0','0','0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,'0','0','0','0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,'0','0','0','0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,'0','0','0','0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(1542,154,16,'0','0','0','0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,'0','0','0','0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,'0','0','0','0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(2322,232,12,'0','0','0','0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,'0','0','0','0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,'0','0','0','0',0,'aaaa',1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_type_contact`
+--
+
+DROP TABLE IF EXISTS `llx_c_type_contact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_type_contact` (
+  `rowid` int(11) NOT NULL,
+  `element` varchar(30) NOT NULL,
+  `source` varchar(8) NOT NULL DEFAULT 'external',
+  `code` varchar(32) NOT NULL,
+  `libelle` varchar(64) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_type_contact_id` (`element`,`source`,`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_type_contact`
+--
+
+LOCK TABLES `llx_c_type_contact` WRITE;
+/*!40000 ALTER TABLE `llx_c_type_contact` DISABLE KEYS */;
+INSERT INTO `llx_c_type_contact` VALUES (10,'contrat','internal','SALESREPSIGN','Commercial signataire du contrat',1,NULL),(11,'contrat','internal','SALESREPFOLL','Commercial suivi du contrat',1,NULL),(20,'contrat','external','BILLING','Contact client facturation contrat',1,NULL),(21,'contrat','external','CUSTOMER','Contact client suivi contrat',1,NULL),(22,'contrat','external','SALESREPSIGN','Contact client signataire contrat',1,NULL),(31,'propal','internal','SALESREPFOLL','Commercial à l\'origine de la propale',1,NULL),(40,'propal','external','BILLING','Contact client facturation propale',1,NULL),(41,'propal','external','CUSTOMER','Contact client suivi propale',1,NULL),(50,'facture','internal','SALESREPFOLL','Responsable suivi du paiement',1,NULL),(60,'facture','external','BILLING','Contact client facturation',1,NULL),(61,'facture','external','SHIPPING','Contact client livraison',1,NULL),(62,'facture','external','SERVICE','Contact client prestation',1,NULL),(70,'invoice_supplier','internal','SALESREPFOLL','Responsable suivi du paiement',1,NULL),(71,'invoice_supplier','external','BILLING','Contact fournisseur facturation',1,NULL),(72,'invoice_supplier','external','SHIPPING','Contact fournisseur livraison',1,NULL),(73,'invoice_supplier','external','SERVICE','Contact fournisseur prestation',1,NULL),(80,'agenda','internal','ACTOR','Responsable',1,NULL),(81,'agenda','internal','GUEST','Guest',1,NULL),(85,'agenda','external','ACTOR','Responsable',1,NULL),(86,'agenda','external','GUEST','Guest',1,NULL),(91,'commande','internal','SALESREPFOLL','Responsable suivi de la commande',1,NULL),(100,'commande','external','BILLING','Contact client facturation commande',1,NULL),(101,'commande','external','CUSTOMER','Contact client suivi commande',1,NULL),(102,'commande','external','SHIPPING','Contact client livraison commande',1,NULL),(120,'fichinter','internal','INTERREPFOLL','Responsable suivi de l\'intervention',1,NULL),(121,'fichinter','internal','INTERVENING','Intervenant',1,NULL),(130,'fichinter','external','BILLING','Contact client facturation intervention',1,NULL),(131,'fichinter','external','CUSTOMER','Contact client suivi de l\'intervention',1,NULL),(140,'order_supplier','internal','SALESREPFOLL','Responsable suivi de la commande',1,NULL),(141,'order_supplier','internal','SHIPPING','Responsable réception de la commande',1,NULL),(142,'order_supplier','external','BILLING','Contact fournisseur facturation commande',1,NULL),(143,'order_supplier','external','CUSTOMER','Contact fournisseur suivi commande',1,NULL),(145,'order_supplier','external','SHIPPING','Contact fournisseur livraison commande',1,NULL),(160,'project','internal','PROJECTLEADER','Chef de Projet',1,NULL),(161,'project','internal','PROJECTCONTRIBUTOR','Intervenant',1,NULL),(170,'project','external','PROJECTLEADER','Chef de Projet',1,NULL),(171,'project','external','PROJECTCONTRIBUTOR','Intervenant',1,NULL),(180,'project_task','internal','TASKEXECUTIVE','Responsable',1,NULL),(181,'project_task','internal','TASKCONTRIBUTOR','Intervenant',1,NULL),(190,'project_task','external','TASKEXECUTIVE','Responsable',1,NULL),(191,'project_task','external','TASKCONTRIBUTOR','Intervenant',1,NULL),(200,'societe','external','GENERALREF','Généraliste (référent)',0,'cabinetmed'),(201,'societe','external','GENERALISTE','Généraliste',0,'cabinetmed'),(210,'societe','external','SPECCHIROR','Chirurgien ortho',0,'cabinetmed'),(211,'societe','external','SPECCHIROT','Chirurgien autre',0,'cabinetmed'),(220,'societe','external','SPECDERMA','Dermatologue',0,'cabinetmed'),(225,'societe','external','SPECENDOC','Endocrinologue',0,'cabinetmed'),(230,'societe','external','SPECGYNECO','Gynécologue',0,'cabinetmed'),(240,'societe','external','SPECGASTRO','Gastroantérologue',0,'cabinetmed'),(245,'societe','external','SPECINTERNE','Interniste',0,'cabinetmed'),(250,'societe','external','SPECCARDIO','Cardiologue',0,'cabinetmed'),(260,'societe','external','SPECNEPHRO','Néphrologue',0,'cabinetmed'),(263,'societe','external','SPECPNEUMO','Pneumologue',0,'cabinetmed'),(265,'societe','external','SPECNEURO','Neurologue',0,'cabinetmed'),(270,'societe','external','SPECRHUMATO','Rhumatologue',0,'cabinetmed'),(280,'societe','external','KINE','Kinésithérapeute',0,'cabinetmed');
+/*!40000 ALTER TABLE `llx_c_type_contact` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_type_fees`
+--
+
+DROP TABLE IF EXISTS `llx_c_type_fees`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_type_fees` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(12) NOT NULL,
+  `label` varchar(30) DEFAULT NULL,
+  `accountancy_code` varchar(32) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_type_fees` (`code`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_type_fees`
+--
+
+LOCK TABLES `llx_c_type_fees` WRITE;
+/*!40000 ALTER TABLE `llx_c_type_fees` DISABLE KEYS */;
+INSERT INTO `llx_c_type_fees` VALUES (1,'TF_OTHER','Other',NULL,1,NULL),(2,'TF_TRIP','Trip',NULL,1,NULL),(3,'TF_LUNCH','Lunch',NULL,1,NULL);
+/*!40000 ALTER TABLE `llx_c_type_fees` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_type_resource`
+--
+
+DROP TABLE IF EXISTS `llx_c_type_resource`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_type_resource` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(32) NOT NULL,
+  `label` varchar(64) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_type_resource_id` (`label`,`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_type_resource`
+--
+
+LOCK TABLES `llx_c_type_resource` WRITE;
+/*!40000 ALTER TABLE `llx_c_type_resource` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_type_resource` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_typent`
+--
+
+DROP TABLE IF EXISTS `llx_c_typent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_typent` (
+  `id` int(11) NOT NULL,
+  `code` varchar(12) NOT NULL,
+  `libelle` varchar(30) DEFAULT NULL,
+  `fk_country` int(11) DEFAULT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  `module` varchar(32) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_c_typent` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_typent`
+--
+
+LOCK TABLES `llx_c_typent` WRITE;
+/*!40000 ALTER TABLE `llx_c_typent` DISABLE KEYS */;
+INSERT INTO `llx_c_typent` VALUES (0,'TE_UNKNOWN','-',NULL,1,NULL),(1,'TE_STARTUP','Start-up',NULL,1,NULL),(2,'TE_GROUP','Grand groupe',NULL,1,NULL),(3,'TE_MEDIUM','PME/PMI',NULL,1,NULL),(4,'TE_SMALL','TPE',NULL,1,NULL),(5,'TE_ADMIN','Administration',NULL,1,NULL),(6,'TE_WHOLE','Grossiste',NULL,1,NULL),(7,'TE_RETAIL','Revendeur',NULL,1,NULL),(8,'TE_PRIVATE','Particulier',NULL,1,NULL),(100,'TE_OTHER','Autres',NULL,1,NULL),(101,'TE_HOMME','Homme',NULL,0,'cabinetmed'),(102,'TE_FEMME','Femme',NULL,0,'cabinetmed');
+/*!40000 ALTER TABLE `llx_c_typent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_c_ziptown`
+--
+
+DROP TABLE IF EXISTS `llx_c_ziptown`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_ziptown` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(5) DEFAULT NULL,
+  `fk_county` int(11) DEFAULT NULL,
+  `fk_pays` int(11) NOT NULL DEFAULT '0',
+  `zip` varchar(10) NOT NULL,
+  `town` varchar(255) NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_ziptown_fk_pays` (`zip`,`town`,`fk_pays`),
+  KEY `idx_c_ziptown_fk_county` (`fk_county`),
+  KEY `idx_c_ziptown_fk_pays` (`fk_pays`),
+  KEY `idx_c_ziptown_zip` (`zip`),
+  CONSTRAINT `fk_c_ziptown_fk_county` FOREIGN KEY (`fk_county`) REFERENCES `llx_c_departements` (`rowid`),
+  CONSTRAINT `fk_c_ziptown_fk_pays` FOREIGN KEY (`fk_pays`) REFERENCES `llx_c_pays` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_ziptown`
+--
+
+LOCK TABLES `llx_c_ziptown` WRITE;
+/*!40000 ALTER TABLE `llx_c_ziptown` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_ziptown` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie`
+--
+
+DROP TABLE IF EXISTS `llx_categorie`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_parent` int(11) NOT NULL DEFAULT '0',
+  `label` varchar(255) NOT NULL,
+  `type` tinyint(4) NOT NULL DEFAULT '1',
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `description` text,
+  `fk_soc` int(11) DEFAULT NULL,
+  `visible` tinyint(4) NOT NULL DEFAULT '1',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_categorie_ref` (`entity`,`fk_parent`,`label`,`type`),
+  KEY `idx_categorie_type` (`type`),
+  KEY `idx_categorie_label` (`label`)
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie`
+--
+
+LOCK TABLES `llx_categorie` WRITE;
+/*!40000 ALTER TABLE `llx_categorie` DISABLE KEYS */;
+INSERT INTO `llx_categorie` VALUES (1,0,'MySupplierCategory',1,1,'This is description of category MyCategory for suppliers<br />',NULL,0,NULL),(2,0,'MyCategory',1,1,'This is description of MyCategory for customer and prospects<br />',NULL,0,NULL),(3,7,'Hot products',1,1,'This is description of hot products<br />',NULL,0,NULL),(4,0,'Cold products',1,1,'This is a description of cold products<br />',NULL,0,NULL),(5,7,'ChildChild 2a x',0,1,'<br />',NULL,0,NULL),(6,7,'ChildChild 2a',0,1,'<br />',NULL,0,NULL),(7,9,'Child 2',0,1,'<br />',NULL,0,NULL),(8,7,'ChildChild 2b',0,1,'<br />',NULL,0,NULL),(9,0,'Parent',0,1,'<br />',NULL,0,NULL),(10,0,'XL Cutomers',0,1,'<br />',NULL,0,NULL),(11,9,'Child 1',0,1,'',NULL,0,NULL),(12,0,'cccc',2,1,'',NULL,0,NULL),(13,0,'ccc2',2,1,'gdfgdfgdf',NULL,0,NULL),(14,0,'ccc3',2,1,'',NULL,0,NULL),(15,13,'ccc2a',2,1,'',NULL,0,NULL),(16,15,'ccc2a1',2,1,'desc,b,nb,fhgfg hf',NULL,0,NULL);
+/*!40000 ALTER TABLE `llx_categorie` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_association`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_association`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_association` (
+  `fk_categorie_mere` int(11) NOT NULL,
+  `fk_categorie_fille` int(11) NOT NULL,
+  UNIQUE KEY `uk_categorie_association` (`fk_categorie_mere`,`fk_categorie_fille`),
+  UNIQUE KEY `uk_categorie_association_fk_categorie_fille` (`fk_categorie_fille`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_association`
+--
+
+LOCK TABLES `llx_categorie_association` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_association` DISABLE KEYS */;
+INSERT INTO `llx_categorie_association` VALUES (3,5),(9,11);
+/*!40000 ALTER TABLE `llx_categorie_association` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_contact`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_contact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_contact` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_socpeople` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_socpeople`),
+  KEY `idx_categorie_contact_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_contact_fk_socpeople` (`fk_socpeople`),
+  CONSTRAINT `fk_categorie_contact_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_contact_fk_socpeople` FOREIGN KEY (`fk_socpeople`) REFERENCES `llx_socpeople` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_contact`
+--
+
+LOCK TABLES `llx_categorie_contact` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_contact` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categorie_contact` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_fournisseur`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_fournisseur`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_fournisseur` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_societe` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_societe`),
+  KEY `idx_categorie_fournisseur_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_fournisseur_fk_societe` (`fk_societe`),
+  CONSTRAINT `fk_categorie_fournisseur_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_fournisseur_fk_soc` FOREIGN KEY (`fk_societe`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_fournisseur`
+--
+
+LOCK TABLES `llx_categorie_fournisseur` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_fournisseur` DISABLE KEYS */;
+INSERT INTO `llx_categorie_fournisseur` VALUES (1,2,NULL),(9,2,NULL);
+/*!40000 ALTER TABLE `llx_categorie_fournisseur` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_lang`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_lang`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_lang` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_category` int(11) NOT NULL DEFAULT '0',
+  `lang` varchar(5) NOT NULL DEFAULT '0',
+  `label` varchar(255) NOT NULL,
+  `description` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_category_lang` (`fk_category`,`lang`),
+  CONSTRAINT `fk_category_lang_fk_category` FOREIGN KEY (`fk_category`) REFERENCES `llx_categorie` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_lang`
+--
+
+LOCK TABLES `llx_categorie_lang` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_lang` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categorie_lang` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_member`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_member`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_member` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_member` int(11) NOT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_member`),
+  KEY `idx_categorie_member_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_member_fk_member` (`fk_member`),
+  CONSTRAINT `fk_categorie_member_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_member_member_rowid` FOREIGN KEY (`fk_member`) REFERENCES `llx_adherent` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_member`
+--
+
+LOCK TABLES `llx_categorie_member` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_member` DISABLE KEYS */;
+INSERT INTO `llx_categorie_member` VALUES (7,2),(8,1);
+/*!40000 ALTER TABLE `llx_categorie_member` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_product`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_product`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_product` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_product` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_product`),
+  KEY `idx_categorie_product_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_product_fk_product` (`fk_product`),
+  CONSTRAINT `fk_categorie_product_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_product_product_rowid` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_product`
+--
+
+LOCK TABLES `llx_categorie_product` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_product` DISABLE KEYS */;
+INSERT INTO `llx_categorie_product` VALUES (5,1,NULL),(5,2,NULL),(5,3,NULL),(6,2,NULL),(6,3,NULL);
+/*!40000 ALTER TABLE `llx_categorie_product` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categorie_societe`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_societe`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_societe` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_societe` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_societe`),
+  KEY `idx_categorie_societe_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_societe_fk_societe` (`fk_societe`),
+  CONSTRAINT `fk_categorie_societe_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_societe_fk_soc` FOREIGN KEY (`fk_societe`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_societe`
+--
+
+LOCK TABLES `llx_categorie_societe` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_societe` DISABLE KEYS */;
+INSERT INTO `llx_categorie_societe` VALUES (2,2,NULL),(2,19,NULL),(10,4,NULL);
+/*!40000 ALTER TABLE `llx_categorie_societe` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_categories_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_categories_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categories_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_categories_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categories_extrafields`
+--
+
+LOCK TABLES `llx_categories_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_categories_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categories_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_chargesociales`
+--
+
+DROP TABLE IF EXISTS `llx_chargesociales`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_chargesociales` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_ech` datetime NOT NULL,
+  `libelle` varchar(80) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_type` int(11) NOT NULL,
+  `amount` double NOT NULL DEFAULT '0',
+  `paye` smallint(6) NOT NULL DEFAULT '0',
+  `periode` date DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `date_creation` datetime DEFAULT NULL,
+  `date_valid` datetime 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_chargesociales`
+--
+
+LOCK TABLES `llx_chargesociales` WRITE;
+/*!40000 ALTER TABLE `llx_chargesociales` DISABLE KEYS */;
+INSERT INTO `llx_chargesociales` VALUES (4,'2011-08-09 00:00:00','fff',1,60,10,1,'2011-08-01','2012-12-08 13:11:10',NULL,NULL);
+/*!40000 ALTER TABLE `llx_chargesociales` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande`
+--
+
+DROP TABLE IF EXISTS `llx_commande`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_soc` int(11) NOT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `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,
+  `date_creation` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `date_cloture` datetime DEFAULT NULL,
+  `date_commande` date 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,
+  `source` smallint(6) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `amount_ht` double DEFAULT '0',
+  `remise_percent` double DEFAULT '0',
+  `remise_absolue` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `facture` tinyint(4) DEFAULT '0',
+  `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,
+  `date_livraison` date DEFAULT NULL,
+  `fk_shipping_method` int(11) DEFAULT NULL,
+  `fk_availability` int(11) DEFAULT NULL,
+  `fk_input_reason` int(11) DEFAULT NULL,
+  `fk_delivery_address` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_commande_ref` (`ref`,`entity`),
+  KEY `idx_commande_fk_soc` (`fk_soc`),
+  KEY `idx_commande_fk_user_author` (`fk_user_author`),
+  KEY `idx_commande_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_commande_fk_user_cloture` (`fk_user_cloture`),
+  KEY `idx_commande_fk_projet` (`fk_projet`),
+  KEY `idx_commande_fk_account` (`fk_account`),
+  KEY `idx_commande_fk_currency` (`fk_currency`),
+  CONSTRAINT `fk_commande_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_commande_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_commande_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_commande_fk_user_cloture` FOREIGN KEY (`fk_user_cloture`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_commande_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande`
+--
+
+LOCK TABLES `llx_commande` WRITE;
+/*!40000 ALTER TABLE `llx_commande` DISABLE KEYS */;
+INSERT INTO `llx_commande` VALUES (1,'2012-12-08 13:11:07',1,NULL,'CO1107-0002',1,NULL,NULL,'','2011-07-20 15:23:12','2011-08-08 13:59:09',NULL,'2011-07-20',1,NULL,1,NULL,NULL,1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','',0,NULL,NULL,1,1,NULL,NULL,0,NULL,NULL,NULL,NULL),(2,'2013-02-12 16:06:51',1,NULL,'CO1107-0003',1,NULL,NULL,'','2011-07-20 23:20:12','2013-02-12 17:06:51',NULL,'2011-07-21',1,NULL,1,NULL,NULL,1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(3,'2013-02-17 17:27:56',1,NULL,'CO1107-0004',1,NULL,NULL,'','2011-07-20 23:22:53','2013-02-17 18:27:56',NULL,'2011-07-21',1,NULL,1,NULL,NULL,1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2012-12-08 13:11:07',1,NULL,'CO1108-0001',1,NULL,NULL,'','2011-08-08 03:04:11','2011-08-08 03:04:21',NULL,'2011-08-08',1,NULL,1,NULL,NULL,2,0,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-02-17 15:22:14',19,NULL,'(PROV6)',1,NULL,NULL,'','2013-02-17 16:22:14',NULL,NULL,'2013-02-17',1,NULL,NULL,NULL,NULL,0,0,0,NULL,0,11.76000000,0.00000000,0.00000000,60.00000000,71.76000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,'2013-02-17 17:38:37',18,NULL,'CO1302-0005',1,NULL,NULL,'gfdf','2013-02-17 16:28:22','2013-02-17 18:38:14',NULL,'2013-02-17',1,NULL,1,NULL,NULL,2,0,0,NULL,0,3.22000000,0.00000000,0.00000000,20.00000000,23.22000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-03-08 09:02:31',23,NULL,'(PROV8)',1,NULL,NULL,'fdfs','2013-03-08 10:02:31',NULL,NULL,'2013-03-08',1,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0.00000000,0.00000000,0.00000000,5.00000000,5.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_commande_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_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_commande_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_extrafields`
+--
+
+LOCK TABLES `llx_commande_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_commande_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commande_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_soc` int(11) NOT NULL,
+  `ref` varchar(255) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `ref_supplier` varchar(255) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT '0',
+  `date_creation` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `date_approve` datetime DEFAULT NULL,
+  `date_commande` date 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_approve` int(11) DEFAULT NULL,
+  `source` smallint(6) NOT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `amount_ht` double DEFAULT '0',
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `fk_input_method` int(11) DEFAULT '0',
+  `fk_cond_reglement` int(11) DEFAULT '0',
+  `fk_mode_reglement` int(11) DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  `date_livraison` date DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_commande_fournisseur_ref` (`ref`,`fk_soc`,`entity`),
+  KEY `idx_commande_fournisseur_fk_soc` (`fk_soc`),
+  CONSTRAINT `fk_commande_fournisseur_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur`
+--
+
+LOCK TABLES `llx_commande_fournisseur` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseur` VALUES (1,'2012-12-08 13:11:07',13,'CF1007-0001',1,NULL,NULL,NULL,'2010-07-11 17:13:40','2010-07-11 17:15:42',NULL,'2010-07-11',1,NULL,1,NULL,0,5,0,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL),(2,'2012-12-08 13:11:07',1,'CF1007-0002',1,NULL,NULL,NULL,'2010-07-11 18:46:28','2010-07-11 18:47:33',NULL,'2010-07-11',1,NULL,1,NULL,0,3,0,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL),(3,'2012-12-08 13:11:07',17,'(PROV3)',1,NULL,NULL,NULL,'2011-08-04 23:00:52',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(4,'2012-12-08 13:11:07',17,'(PROV4)',1,NULL,NULL,NULL,'2011-08-04 23:19:32',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(5,'2012-12-08 13:11:07',17,'(PROV5)',1,NULL,NULL,NULL,'2011-08-04 23:22:16',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(6,'2012-12-08 13:11:07',17,'CF1108-0003',1,NULL,NULL,NULL,'2011-08-04 23:22:54','2011-08-08 15:04:37',NULL,NULL,1,NULL,1,NULL,0,2,0,0,0,0.98000000,0.00000000,0.00000000,5.00000000,5.98000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(7,'2012-12-08 13:11:07',17,'(PROV7)',1,NULL,NULL,NULL,'2011-08-04 23:23:29',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(8,'2012-12-08 13:11:07',17,'(PROV8)',1,NULL,NULL,NULL,'2011-08-04 23:36:10',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL),(13,'2013-03-09 18:39:41',1,'CF1303-0004',1,NULL,NULL,0,'2013-03-09 19:39:18','2013-03-09 19:39:27','2013-03-09 19:39:32','2013-03-09',1,NULL,1,1,0,3,0,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL),(14,'2013-03-22 09:26:43',16,'(PROV14)',1,NULL,'gdfg',0,'2013-03-22 10:26:38',NULL,NULL,NULL,1,NULL,NULL,NULL,0,0,0,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','muscadet',0,0,0,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_commande_fournisseur` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur_dispatch`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur_dispatch`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur_dispatch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_commande` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `qty` float DEFAULT NULL,
+  `fk_entrepot` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `datec` datetime DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_commande_fournisseur_dispatch_fk_commande` (`fk_commande`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur_dispatch`
+--
+
+LOCK TABLES `llx_commande_fournisseur_dispatch` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_dispatch` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseur_dispatch` VALUES (1,2,4,2,1,1,'2010-07-11 18:49:44');
+/*!40000 ALTER TABLE `llx_commande_fournisseur_dispatch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur_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_commande_fournisseur_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur_extrafields`
+--
+
+LOCK TABLES `llx_commande_fournisseur_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseur_log`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseur_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseur_log` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datelog` datetime NOT NULL,
+  `fk_commande` int(11) NOT NULL,
+  `fk_statut` smallint(6) NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `comment` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseur_log`
+--
+
+LOCK TABLES `llx_commande_fournisseur_log` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseur_log` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseur_log` VALUES (1,'2010-07-11 15:13:40','2010-07-11 17:13:40',1,0,1,NULL),(2,'2010-07-11 15:15:42','2010-07-11 17:15:42',1,1,1,NULL),(3,'2010-07-11 15:16:28','2010-07-11 17:16:28',1,2,1,NULL),(4,'2010-07-11 15:19:14','2010-07-11 00:00:00',1,3,1,NULL),(5,'2010-07-11 15:19:36','2010-07-11 00:00:00',1,5,1,NULL),(6,'2010-07-11 16:46:28','2010-07-11 18:46:28',2,0,1,NULL),(7,'2010-07-11 16:47:33','2010-07-11 18:47:33',2,1,1,NULL),(8,'2010-07-11 16:47:41','2010-07-11 18:47:41',2,2,1,NULL),(9,'2010-07-11 16:48:00','2010-07-11 00:00:00',2,3,1,NULL),(10,'2011-08-04 21:00:52','2011-08-04 23:00:52',3,0,1,NULL),(11,'2011-08-04 21:19:32','2011-08-04 23:19:32',4,0,1,NULL),(12,'2011-08-04 21:22:16','2011-08-04 23:22:16',5,0,1,NULL),(13,'2011-08-04 21:22:54','2011-08-04 23:22:54',6,0,1,NULL),(14,'2011-08-04 21:23:29','2011-08-04 23:23:29',7,0,1,NULL),(15,'2011-08-04 21:36:10','2011-08-04 23:36:10',8,0,1,NULL),(19,'2011-08-08 13:04:37','2011-08-08 15:04:37',6,1,1,NULL),(20,'2011-08-08 13:04:38','2011-08-08 15:04:38',6,2,1,NULL),(29,'2013-03-09 18:39:18','2013-03-09 19:39:18',13,0,1,NULL),(30,'2013-03-09 18:39:27','2013-03-09 19:39:27',13,1,1,NULL),(31,'2013-03-09 18:39:32','2013-03-09 19:39:32',13,2,1,NULL),(32,'2013-03-09 18:39:41','2013-03-09 00:00:00',13,3,1,'hf'),(33,'2013-03-22 09:26:38','2013-03-22 10:26:38',14,0,1,NULL);
+/*!40000 ALTER TABLE `llx_commande_fournisseur_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commande_fournisseurdet`
+--
+
+DROP TABLE IF EXISTS `llx_commande_fournisseurdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commande_fournisseurdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_commande` int(11) NOT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `ref` varchar(50) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `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',
+  `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',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commande_fournisseurdet`
+--
+
+LOCK TABLES `llx_commande_fournisseurdet` WRITE;
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet` DISABLE KEYS */;
+INSERT INTO `llx_commande_fournisseurdet` VALUES (1,1,NULL,'','','Chips',19.600,0.000,'',0.000,'',10,0,0,20.00000000,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL),(2,2,4,'ABCD','Decapsuleur','',0.000,0.000,'',0.000,'',20,0,0,10.00000000,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL),(3,6,NULL,'','','ljkljl',19.600,0.000,'',0.000,'',1,0,0,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL),(6,13,NULL,'','','dfgdf',0.000,0.000,'0',0.000,'0',1,0,0,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL),(7,14,NULL,'','','gfdgd',0.000,0.000,'0',0.000,'0',1,0,0,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL);
+/*!40000 ALTER TABLE `llx_commande_fournisseurdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commandedet`
+--
+
+DROP TABLE IF EXISTS `llx_commandedet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commandedet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_commande` int(11) DEFAULT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `localtax1_tx` double(6,3) DEFAULT NULL,
+  `localtax1_type` varchar(10) NOT NULL DEFAULT '0',
+  `localtax2_tx` double(6,3) DEFAULT NULL,
+  `localtax2_type` varchar(10) NOT NULL DEFAULT '0',
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `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',
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_commandedet_fk_commande` (`fk_commande`),
+  KEY `idx_commandedet_fk_product` (`fk_product`),
+  CONSTRAINT `fk_commandedet_fk_commande` FOREIGN KEY (`fk_commande`) REFERENCES `llx_commande` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commandedet`
+--
+
+LOCK TABLES `llx_commandedet` WRITE;
+/*!40000 ALTER TABLE `llx_commandedet` DISABLE KEYS */;
+INSERT INTO `llx_commandedet` VALUES (1,1,NULL,NULL,NULL,'Product 1',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(2,1,NULL,2,NULL,'',0.000,0.000,'',0.000,'',1,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(3,1,NULL,5,NULL,'cccc',0.000,0.000,'',0.000,'',1,0,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL),(4,2,NULL,NULL,NULL,'hgf',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(10,5,NULL,NULL,NULL,'gfdgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(11,6,NULL,NULL,NULL,'gdfg',19.600,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(12,6,NULL,NULL,NULL,'gfdgd',19.600,0.000,'',0.000,'',1,0,0,NULL,50,50.00000000,50.00000000,9.80000000,0.00000000,0.00000000,59.80000000,1,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(13,7,NULL,NULL,NULL,'gfdg',19.600,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(14,3,NULL,NULL,NULL,'gdfgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(15,3,NULL,NULL,NULL,'fghfgh',0.000,0.000,'',0.000,'',1,0,0,NULL,20,20.00000000,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(16,7,NULL,4,NULL,'',12.500,0.000,'',0.000,'',1,0,0,NULL,5,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL),(17,7,NULL,4,NULL,'eeee',12.500,0.000,'',0.000,'',1,0,0,NULL,5,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,3,NULL),(18,8,NULL,NULL,NULL,'fdsfs',0.000,0.000,'',0.000,'',1,0,0,NULL,10,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,1,NULL),(19,8,NULL,NULL,NULL,'fsdfsf',0.000,0.000,'',0.000,'',1,0,0,NULL,-5,-5.00000000,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,2,NULL);
+/*!40000 ALTER TABLE `llx_commandedet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_commandedet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_commandedet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_commandedet_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_commandedet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_commandedet_extrafields`
+--
+
+LOCK TABLES `llx_commandedet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_commandedet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_commandedet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cond_reglement`
+--
+
+DROP TABLE IF EXISTS `llx_cond_reglement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cond_reglement` (
+  `rowid` int(11) NOT NULL,
+  `code` varchar(16) DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `active` tinyint(4) DEFAULT '1',
+  `libelle` varchar(255) DEFAULT NULL,
+  `libelle_facture` text,
+  `fdm` tinyint(4) DEFAULT NULL,
+  `nbjour` smallint(6) DEFAULT NULL,
+  `decalage` smallint(6) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cond_reglement`
+--
+
+LOCK TABLES `llx_cond_reglement` WRITE;
+/*!40000 ALTER TABLE `llx_cond_reglement` DISABLE KEYS */;
+INSERT INTO `llx_cond_reglement` VALUES (1,'RECEP',1,1,'A réception','Réception de facture',0,0,NULL),(2,'30D',2,1,'30 jours','Réglement à 30 jours',0,30,NULL),(3,'30DENDMONTH',3,1,'30 jours fin de mois','Réglement à 30 jours fin de mois',1,30,NULL),(4,'60D',4,1,'60 jours','Réglement à 60 jours',0,60,NULL),(5,'60DENDMONTH',5,1,'60 jours fin de mois','Réglement à 60 jours fin de mois',1,60,NULL);
+/*!40000 ALTER TABLE `llx_cond_reglement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL,
+  `date_create` datetime NOT NULL,
+  `description` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `date_debut` date NOT NULL,
+  `date_fin` date NOT NULL,
+  `statut` int(11) NOT NULL DEFAULT '1',
+  `fk_validator` int(11) NOT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_refuse` datetime DEFAULT NULL,
+  `fk_user_refuse` int(11) DEFAULT NULL,
+  `date_cancel` datetime DEFAULT NULL,
+  `fk_user_cancel` int(11) DEFAULT NULL,
+  `detail_refuse` varchar(250) COLLATE latin1_german2_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes`
+--
+
+LOCK TABLES `llx_congespayes` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_congespayes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_config`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_config`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_config` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `value` text COLLATE latin1_german2_ci,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_config`
+--
+
+LOCK TABLES `llx_congespayes_config` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_config` DISABLE KEYS */;
+INSERT INTO `llx_congespayes_config` VALUES (1,'userGroup','2'),(2,'lastUpdate','1331893531'),(3,'nbUser','9'),(4,'delayForRequest','30'),(5,'AlertValidatorDelay','1'),(6,'AlertValidatorSolde','1'),(7,'nbCongesDeducted','1.20'),(8,'nbCongesEveryMonth','2.50');
+/*!40000 ALTER TABLE `llx_congespayes_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_events`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_events`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_events` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `value` text COLLATE latin1_german2_ci NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_events`
+--
+
+LOCK TABLES `llx_congespayes_events` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_events` DISABLE KEYS */;
+INSERT INTO `llx_congespayes_events` VALUES (1,'Mariage','3.00');
+/*!40000 ALTER TABLE `llx_congespayes_events` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_logs`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_logs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_logs` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_action` datetime NOT NULL,
+  `fk_user_action` int(11) NOT NULL,
+  `fk_user_update` int(11) NOT NULL,
+  `type_action` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `prev_solde` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `new_solde` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_logs`
+--
+
+LOCK TABLES `llx_congespayes_logs` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_logs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_congespayes_logs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_congespayes_users`
+--
+
+DROP TABLE IF EXISTS `llx_congespayes_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_congespayes_users` (
+  `fk_user` int(11) NOT NULL,
+  `nb_conges` float NOT NULL DEFAULT '0',
+  PRIMARY KEY (`fk_user`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_congespayes_users`
+--
+
+LOCK TABLES `llx_congespayes_users` WRITE;
+/*!40000 ALTER TABLE `llx_congespayes_users` DISABLE KEYS */;
+INSERT INTO `llx_congespayes_users` VALUES (1,0),(2,0),(3,0),(4,0),(5,0),(6,0),(7,0),(8,0),(9,0);
+/*!40000 ALTER TABLE `llx_congespayes_users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_const`
+--
+
+DROP TABLE IF EXISTS `llx_const`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_const` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `value` text NOT NULL,
+  `type` varchar(6) DEFAULT NULL,
+  `visible` tinyint(4) NOT NULL DEFAULT '1',
+  `note` text,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_const` (`name`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=5278 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_const`
+--
+
+LOCK TABLES `llx_const` WRITE;
+/*!40000 ALTER TABLE `llx_const` DISABLE KEYS */;
+INSERT INTO `llx_const` VALUES (5,'SYSLOG_LEVEL',0,'7','chaine',0,'Level of debug info to show','2010-07-08 11:17:57'),(8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2010-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2010-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2010-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2010-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2010-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2010-07-08 11:17:58'),(17,'MAIN_SHOW_WORKBOARD',0,'1','yesno',0,'Affichage tableau de bord de travail Dolibarr','2010-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2010-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2010-07-08 11:17:58'),(35,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_panicum','yesno',0,'Module to control third parties codes','2010-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2010-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2010-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','texte',0,'Mail resiliation','2010-07-08 11:17:58'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte',0,'Mail de validation','2010-07-08 11:17:59'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte',0,'Mail de validation de cotisation','2010-07-08 11:17:59'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2010-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2010-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2010-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2010-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2010-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2010-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2010-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2010-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2010-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2010-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2010-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2010-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2010-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2010-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2010-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2010-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2010-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2010-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2010-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2010-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2010-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2010-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2010-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2010-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2010-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2010-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2010-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2010-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2010-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2010-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2010-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2010-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2010-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2010-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2010-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2010-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2010-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2010-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2013-03-20 13:17:36'),(242,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2010-07-08 11:26:34'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2010-07-08 11:28:53'),(249,'DON_FORM',1,'fsfe.fr.php','chaine',0,'Nom du gestionnaire de formulaire de dons','2010-07-08 11:29:00'),(252,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,NULL,'2010-07-08 11:29:05'),(253,'ADHERENT_BANK_USE_AUTO',1,'','yesno',0,'Insertion automatique des cotisation dans le compte banquaire','2010-07-08 11:29:05'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2010-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2010-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2010-07-08 11:29:05'),(260,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2010-07-08 11:29:18'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2010-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2010-07-08 11:29:33'),(271,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2010-07-08 11:29:37'),(272,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:41'),(273,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:45'),(274,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2010-07-08 11:29:59'),(275,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,NULL,'2010-07-08 11:30:03'),(276,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2010-07-08 11:30:30'),(278,'MAIN_MODULE_GEOIPMAXMIND',1,'1',NULL,0,NULL,'2010-07-08 11:30:36'),(279,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2010-07-08 11:30:38'),(292,'MAIN_MODULE_FCKEDITOR',1,'1',NULL,0,NULL,'2010-07-08 11:56:27'),(368,'STOCK_USERSTOCK_AUTOCREATE',1,'1','chaine',0,'','2010-07-08 22:44:59'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2010-07-08 22:58:07'),(370,'MAIN_SUBMODULE_LIVRAISON',1,'1','chaine',0,'','2010-07-08 23:00:29'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2010-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2010-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2010-07-08 23:14:55'),(384,'PRODUIT_SOUSPRODUITS',1,'1','chaine',0,'','2010-07-08 23:22:12'),(385,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2010-07-08 23:22:19'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2010-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2010-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2010-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2010-07-08 23:27:50'),(523,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(524,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(525,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(526,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(527,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(528,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(529,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(530,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2010-07-10 12:48:49'),(531,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(532,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(533,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(534,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(602,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2010-07-11 13:26:54'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2010-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2010-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2010-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2010-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2010-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2010-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2010-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2010-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2010-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2010-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2010-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2010-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2010-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2010-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2010-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2010-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2010-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2010-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(807,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(808,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(834,'MAIN_MODULE_CASHDESK',1,'1',NULL,0,NULL,'2011-07-18 17:30:24'),(969,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2011-07-18 18:01:59'),(973,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2011-07-18 18:02:20'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2011-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2011-07-18 18:02:24'),(978,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2011-07-18 18:03:06'),(979,'PRELEVEMENT_USER',1,'1','chaine',0,'','2011-07-18 18:05:50'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2011-07-18 18:05:50'),(981,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2011-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2011-07-18 21:40:20'),(1018,'MAIN_MODULE_SYSLOG',0,'1',NULL,0,NULL,'2011-07-20 11:36:47'),(1138,'MAIN_VERSION_LAST_INSTALL',0,'3.1.0-beta','chaine',0,'Dolibarr version when install','2011-07-28 23:05:02'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2011-07-29 20:50:02'),(1231,'MAIN_UPLOAD_DOC',1,'2048','chaine',0,'','2011-07-29 21:04:00'),(1234,'MAIN_UMASK',1,'0664','chaine',0,'','2011-07-29 21:04:11'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2011-07-29 21:05:42'),(1379,'CABINETMED_RHEUMATOLOGY_ON',1,'1','chaine',1,'Enable features for rheumatology','2011-08-01 21:47:53'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2011-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2011-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2012-12-08 13:11:02'),(1698,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_leopard','yesno',0,'Module to control product codes','2012-12-08 13:11:25'),(1718,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2012-12-08 13:12:41'),(1719,'ACCOUNTING_USEDICTTOEDIT',1,'1','chaine',1,'','2012-12-08 13:15:00'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2012-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2012-12-08 13:22:47'),(1737,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1738,'MAIN_INFO_SOCIETE_NOM',2,'aaa','chaine',0,'','2012-12-08 14:08:14'),(1739,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2013-02-27 14:20:27'),(1740,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2012-12-08 14:08:14'),(1741,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2012-12-08 14:08:14'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2012-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2012-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2013-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2012-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2012-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2012-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2012-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2012-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2012-12-08 14:35:40'),(1806,'MAIN_MODULE_SKINCOLOREDITOR_TABS_0',3,'user:+tabskincoloreditors:ColorEditor:skincoloreditor@skincoloreditor:/skincoloreditor/usercolors.php?id=__ID__','chaine',0,NULL,'2012-12-08 14:35:40'),(1867,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2012-12-11 22:53:56'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.nltechno.com','chaine',0,'','2012-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2012-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'AXqqdsWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2012-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2012-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2012-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2012-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2012-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1990,'MAIN_SMS_SENDMODE',1,'ovh','chaine',0,'This is to enable OVH SMS engine','2012-12-17 21:19:01'),(2040,'MAIN_MAIL_SMTP_PORT',0,'465','chaine',0,'','2012-12-19 12:58:10'),(2041,'MAIN_MAIL_SMTP_SERVER',0,'smtp.mail.com','chaine',0,'','2012-12-19 12:58:10'),(2044,'MAIN_MAIL_EMAIL_TLS',0,'1','chaine',0,'','2012-12-19 12:58:10'),(2251,'FCKEDITOR_TEST',1,'Test<br />\r\n<img alt=\"\" src=\"/dolibarrnew/viewimage.php?modulepart=fckeditor&amp;file=image/Julien-Lavergne_reference_medium.jpg\" style=\"width: 200px; height: 172px;\" />fdfs','chaine',0,'','2012-12-19 19:12:24'),(2293,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2012-12-27 02:02:00'),(2305,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2013-01-02 20:33:16'),(2307,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2013-01-02 20:33:17'),(2310,'MAIN_MODULE_EXPEDITION',1,'1',NULL,0,NULL,'2013-01-02 20:33:18'),(2315,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2013-01-02 20:33:21'),(2321,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2013-01-02 20:33:24'),(2322,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-01-02 20:33:24'),(2786,'MAIN_SOAP_DEBUG',1,'1','chaine',1,'','2013-01-13 12:37:21'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2013-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2013-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2013-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2013-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2013-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2013-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2013-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2013-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2013-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2013-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2013-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2013-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2013-01-19 17:01:53'),(2862,'TICKET_ADDON',1,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-01-19 17:16:10'),(2866,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2013-01-19 17:16:10'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2013-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2013-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2013-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2013-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2013-02-01 08:52:34'),(3191,'MAIN_MODULE_HOLIDAY_TABS_0',2,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2013-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2013-02-12 16:22:55'),(3217,'MAIN_PDF_TITLE_BACKGROUND_COLOR',1,'240,240,240','chaine',1,'','2013-02-13 15:18:02'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2013-02-13 16:20:18'),(3241,'COMPANY_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2013-02-17 14:33:39'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2013-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2013-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2013-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2013-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2013-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2013-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2013-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2013-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2013-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2013-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2013-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2013-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2013-03-10 15:57:21'),(4555,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2013-03-13 10:19:31'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2013-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4595,'MAIN_MODULE_GOOGLE',2,'1',NULL,0,NULL,'2013-03-13 15:29:47'),(4596,'MAIN_MODULE_GOOGLE_TABS_0',2,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-03-13 15:29:47'),(4597,'MAIN_MODULE_GOOGLE_TABS_1',2,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-03-13 15:29:47'),(4598,'MAIN_MODULE_GOOGLE_TRIGGERS',2,'1','chaine',0,NULL,'2013-03-13 15:29:47'),(4599,'MAIN_MODULE_GOOGLE_HOOKS',2,'[\"toprightmenu\"]','chaine',0,NULL,'2013-03-13 15:29:47'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2013-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2013-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2013-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2013-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2013-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2013-03-13 15:36:29'),(4698,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2013-03-13 17:22:24'),(4699,'MAIN_MAIL_SENDMODE',0,'mail','chaine',0,'','2013-03-13 17:22:24'),(4700,'MAIN_MAIL_SMTPS_ID',0,'eldy10@mail.com','chaine',0,'','2013-03-13 17:22:24'),(4701,'MAIN_MAIL_SMTPS_PW',0,'bidonge','chaine',0,'','2013-03-13 17:22:24'),(4711,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2013-03-13 19:37:38'),(4712,'GOOGLE_AGENDA_NAME1',1,'asso master','chaine',0,'','2013-03-13 19:37:38'),(4713,'GOOGLE_AGENDA_SRC1',1,'assodolibarr@mail.com','chaine',0,'','2013-03-13 19:37:38'),(4714,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2013-03-13 19:37:38'),(4715,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4716,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4717,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4718,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4719,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2013-03-13 19:37:38'),(4720,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2013-03-13 19:37:38'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2013-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2013-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2013-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2013-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2013-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2013-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2013-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2013-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2013-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2013-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2013-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2013-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2013-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2013-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2013-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2013-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2013-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2013-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2013-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2013-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2013-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2013-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2013-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2013-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2013-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2013-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2013-03-13 22:03:40'),(4919,'MAIN_MODULE_COMPTABILITE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4922,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2013-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2013-03-22 09:24:29'),(4986,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2013-03-23 17:24:25'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2013-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2013-03-23 18:06:24'),(5075,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5076,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5077,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5078,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5119,'MAIN_LANG_DEFAULT',1,'en_US','chaine',0,'','2013-03-24 18:35:07'),(5120,'MAIN_MULTILANGS',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5121,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2013-03-24 18:35:07'),(5122,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5123,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5124,'MAIN_START_WEEK',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5125,'MAIN_SHOW_LOGO',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5126,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5127,'MAIN_THEME',1,'eldy','chaine',0,'','2013-03-24 18:35:07'),(5128,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5129,'MAIN_SEARCHFORM_SOCIETE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5130,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5131,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5132,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2013-03-24 18:35:07'),(5133,'MAIN_HOME',1,'<span style=\"font-size:11px;\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2013-03-24 18:35:07'),(5134,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2013-03-24 18:35:07'),(5135,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5137,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,NULL,'2013-09-08 23:06:08'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2013-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2013-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2013-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2013-09-08 23:06:14'),(5164,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,NULL,'2013-11-06 23:35:12'),(5195,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2013-11-07 00:02:34'),(5196,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5197,'GOOGLE_DUPLICATE_INTO_MEMBERS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5198,'GOOGLE_CONTACT_LOGIN',1,'eldy10@mail.com','chaine',0,'','2013-11-07 00:02:34'),(5199,'GOOGLE_CONTACT_PASSWORD',1,'bidonge','chaine',0,'','2013-11-07 00:02:34'),(5200,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2013-11-07 00:02:34'),(5201,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2013-11-07 00:02:34'),(5202,'GOOGLE_TAG_PREFIX_MEMBERS',1,'Dolibarr (Members)','chaine',0,'','2013-11-07 00:02:34'),(5203,'MODULE_GOOGLE_DEBUG',1,'1','chaine',1,'','2013-11-07 00:16:31'),(5235,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2014-03-02 15:22:27'),(5236,'MAIN_MODULE_BARCODE',1,'1',NULL,0,NULL,'2014-03-02 15:37:26'),(5237,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2014-03-02 15:37:37'),(5238,'MAIN_MODULE_LDAP',1,'1',NULL,0,NULL,'2014-03-02 15:38:03'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2014-03-02 15:42:26'),(5240,'MAIN_INFO_SOCIETE_COUNTRY',1,'1:FR:France','chaine',0,'','2014-03-02 19:05:06'),(5241,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2014-03-02 19:05:06'),(5242,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2014-03-02 19:05:06'),(5243,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2014-03-02 19:05:06'),(5244,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2014-03-02 19:05:06'),(5245,'MAIN_INFO_SOCIETE_STATE',1,'0','chaine',0,'','2014-03-02 19:05:06'),(5246,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2014-03-02 19:05:06'),(5247,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2014-03-02 19:05:06'),(5248,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2014-03-02 19:05:06'),(5249,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2014-03-02 19:05:06'),(5250,'MAIN_INFO_SOCIETE_WEB',1,'http://www.dolibarr.org','chaine',0,'','2014-03-02 19:05:06'),(5251,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2014-03-02 19:05:06'),(5252,'MAIN_INFO_SOCIETE_LOGO',1,'logo_nltechno.gif','chaine',0,'','2014-03-02 19:05:06'),(5253,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'logo_nltechno_small.gif','chaine',0,'','2014-03-02 19:05:06'),(5254,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'logo_nltechno_mini.gif','chaine',0,'','2014-03-02 19:05:06'),(5255,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2014-03-02 19:05:06'),(5256,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2014-03-02 19:05:06'),(5257,'MAIN_INFO_TVAINTRA',1,'IN1234567','chaine',0,'','2014-03-02 19:05:06'),(5258,'SOCIETE_FISCAL_MONTH_START',1,'0','chaine',0,'','2014-03-02 19:05:06'),(5259,'FACTURE_TVAOPTION',1,'reel','chaine',0,'','2014-03-02 19:05:06'),(5262,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2014-12-21 12:51:26'),(5263,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2014-12-21 12:51:26'),(5264,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5265,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5266,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5267,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5268,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5269,'MAIN_MODULE_DEPLACEMENT',1,'1',NULL,0,NULL,'2014-12-21 12:51:27'),(5270,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2014-12-21 12:51:28'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2014-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2014-12-21 12:51:28'),(5273,'DONATION_ART885',1,'','yesno',0,'Option Française - Eligibilité Art885-0 V bis du CGI','2014-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2014-12-21 12:51:28'),(5275,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2014-12-21 12:51:28'),(5276,'MAIN_VERSION_LAST_UPGRADE',0,'3.7.0-beta','chaine',0,'Dolibarr version for last upgrade','2014-12-21 12:51:32'),(5277,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2014-12-21 19:52:31');
+/*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contrat`
+--
+
+DROP TABLE IF EXISTS `llx_contrat`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contrat` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) DEFAULT NULL,
+  `ref_ext` varchar(30) DEFAULT NULL,
+  `ref_supplier` varchar(30) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `date_contrat` datetime DEFAULT NULL,
+  `statut` smallint(6) DEFAULT '0',
+  `mise_en_service` datetime DEFAULT NULL,
+  `fin_validite` datetime DEFAULT NULL,
+  `date_cloture` datetime DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_commercial_signature` int(11) DEFAULT NULL,
+  `fk_commercial_suivi` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL DEFAULT '0',
+  `fk_user_mise_en_service` int(11) DEFAULT NULL,
+  `fk_user_cloture` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_contrat_ref` (`ref`,`entity`),
+  KEY `idx_contrat_fk_soc` (`fk_soc`),
+  KEY `idx_contrat_fk_user_author` (`fk_user_author`),
+  CONSTRAINT `fk_contrat_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_contrat_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contrat`
+--
+
+LOCK TABLES `llx_contrat` WRITE;
+/*!40000 ALTER TABLE `llx_contrat` DISABLE KEYS */;
+INSERT INTO `llx_contrat` VALUES (1,'CONTRACT1',NULL,NULL,1,'2010-07-08 23:53:55','2010-07-09 01:53:25','2010-07-09 00:00:00',1,NULL,NULL,NULL,3,NULL,2,2,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'CONTRAT1',NULL,NULL,1,'2010-07-10 16:18:16','2010-07-10 18:13:37','2010-07-10 00:00:00',1,NULL,NULL,NULL,2,NULL,2,2,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'CT1303-0001',NULL,NULL,1,'2013-03-06 09:05:07','2013-03-06 10:04:57','2013-03-06 00:00:00',1,NULL,NULL,NULL,19,NULL,1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_contrat` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contrat_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_contrat_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contrat_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`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contrat_extrafields`
+--
+
+LOCK TABLES `llx_contrat_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_contrat_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_contrat_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contratdet`
+--
+
+DROP TABLE IF EXISTS `llx_contratdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contratdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_contrat` int(11) NOT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `statut` smallint(6) DEFAULT '0',
+  `label` text,
+  `description` text,
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `date_commande` datetime DEFAULT NULL,
+  `date_ouverture_prevue` datetime DEFAULT NULL,
+  `date_ouverture` datetime DEFAULT NULL,
+  `date_fin_validite` datetime DEFAULT NULL,
+  `date_cloture` datetime 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 NOT NULL,
+  `remise_percent` double DEFAULT '0',
+  `subprice` double(24,8) DEFAULT '0.00000000',
+  `price_ht` double DEFAULT NULL,
+  `remise` double DEFAULT '0',
+  `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 '1',
+  `info_bits` int(11) DEFAULT '0',
+  `fk_product_fournisseur_price` int(11) DEFAULT NULL,
+  `buy_price_ht` double(24,8) DEFAULT '0.00000000',
+  `fk_user_author` int(11) NOT NULL DEFAULT '0',
+  `fk_user_ouverture` int(11) DEFAULT NULL,
+  `fk_user_cloture` int(11) DEFAULT NULL,
+  `commentaire` text,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_contratdet_fk_contrat` (`fk_contrat`),
+  KEY `idx_contratdet_fk_product` (`fk_product`),
+  KEY `idx_contratdet_date_ouverture_prevue` (`date_ouverture_prevue`),
+  KEY `idx_contratdet_date_ouverture` (`date_ouverture`),
+  KEY `idx_contratdet_date_fin_validite` (`date_fin_validite`),
+  CONSTRAINT `fk_contratdet_fk_contrat` FOREIGN KEY (`fk_contrat`) REFERENCES `llx_contrat` (`rowid`),
+  CONSTRAINT `fk_contratdet_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contratdet`
+--
+
+LOCK TABLES `llx_contratdet` WRITE;
+/*!40000 ALTER TABLE `llx_contratdet` DISABLE KEYS */;
+INSERT INTO `llx_contratdet` VALUES (1,'2013-03-06 09:00:00',1,3,4,'','',NULL,NULL,'2010-07-09 00:00:00','2010-07-09 12:00:00','2013-03-15 00:00:00',NULL,0.000,0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,''),(2,'2010-07-10 16:14:14',2,NULL,0,'','Abonnement annuel assurance',NULL,NULL,'2010-07-10 00:00:00',NULL,'2011-07-10 00:00:00',NULL,1.000,0.000,'',0.000,'',1,0,10.00000000,10,0,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,1,0,NULL,0.00000000,0,NULL,NULL,NULL),(3,'2013-03-05 10:20:58',2,3,5,'','gdfg',NULL,NULL,'2010-07-10 00:00:00','2010-07-10 12:00:00','2011-07-09 00:00:00','2013-03-06 12:00:00',4.000,0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,''),(4,'2012-12-08 13:11:17',2,3,0,'','',NULL,NULL,'2010-07-10 00:00:00',NULL,NULL,NULL,0.000,0.000,'',0.000,'',1,10,40.00000000,40,NULL,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,0,NULL,0.00000000,0,NULL,1,''),(5,'2013-03-06 09:05:40',3,NULL,4,'','gfdg',NULL,NULL,NULL,'2013-03-06 12:00:00','2013-03-07 12:00:00',NULL,0.000,0.000,'',0.000,'',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,0,0.00000000,0,1,1,'');
+/*!40000 ALTER TABLE `llx_contratdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_contratdet_log`
+--
+
+DROP TABLE IF EXISTS `llx_contratdet_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_contratdet_log` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_contratdet` int(11) NOT NULL,
+  `date` datetime NOT NULL,
+  `statut` smallint(6) NOT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `commentaire` text,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_contratdet_log_fk_contratdet` (`fk_contratdet`),
+  KEY `idx_contratdet_log_date` (`date`),
+  CONSTRAINT `fk_contratdet_log_fk_contratdet` FOREIGN KEY (`fk_contratdet`) REFERENCES `llx_contratdet` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_contratdet_log`
+--
+
+LOCK TABLES `llx_contratdet_log` WRITE;
+/*!40000 ALTER TABLE `llx_contratdet_log` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_contratdet_log` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cotisation`
+--
+
+DROP TABLE IF EXISTS `llx_cotisation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cotisation` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `fk_adherent` int(11) DEFAULT NULL,
+  `dateadh` datetime DEFAULT NULL,
+  `datef` date DEFAULT NULL,
+  `cotisation` double DEFAULT NULL,
+  `fk_bank` int(11) DEFAULT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_cotisation` (`fk_adherent`,`dateadh`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_cotisation`
+--
+
+LOCK TABLES `llx_cotisation` WRITE;
+/*!40000 ALTER TABLE `llx_cotisation` DISABLE KEYS */;
+INSERT INTO `llx_cotisation` VALUES (1,'2010-07-10 13:05:30','2010-07-10 15:05:30',2,'2010-07-10 00:00:00','2011-07-10',20,NULL,'Adhésion/cotisation 2010'),(2,'2010-07-11 14:20:00','2010-07-11 16:20:00',2,'2011-07-11 00:00:00','2012-07-10',10,NULL,'Adhésion/cotisation 2011'),(3,'2010-07-18 10:20:33','2010-07-18 12:20:33',2,'2012-07-11 00:00:00','2013-07-17',10,NULL,'Adhésion/cotisation 2012'),(4,'2013-03-06 15:43:37','2013-03-06 16:43:37',2,'2013-07-18 00:00:00','2014-07-17',10,NULL,'Adhésion/cotisation 2013'),(5,'2013-03-06 15:44:12','2013-03-06 16:44:12',2,'2014-07-18 00:00:00','2015-07-17',11,NULL,'Adhésion/cotisation 2014'),(6,'2013-03-06 15:47:48','2013-03-06 16:47:48',2,'2015-07-18 00:00:00','2016-07-17',10,NULL,'Adhésion/cotisation 2015'),(7,'2013-03-06 15:48:16','2013-03-06 16:48:16',2,'2016-07-18 00:00:00','2017-07-17',20,22,'Adhésion/cotisation 2016'),(8,'2013-03-20 13:17:57','2013-03-20 14:17:57',1,'2010-07-10 00:00:00','2011-07-09',10,NULL,'Adhésion/cotisation 2010'),(10,'2013-03-20 13:30:11','2013-03-20 14:30:11',1,'2011-07-10 00:00:00','2012-07-09',10,23,'Adhésion/cotisation 2011');
+/*!40000 ALTER TABLE `llx_cotisation` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_cronjob`
+--
+
+DROP TABLE IF EXISTS `llx_cronjob`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_cronjob` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `jobtype` varchar(10) NOT NULL,
+  `label` text NOT NULL,
+  `command` varchar(255) DEFAULT NULL,
+  `classesname` varchar(255) DEFAULT NULL,
+  `objectname` varchar(255) DEFAULT NULL,
+  `methodename` varchar(255) DEFAULT NULL,
+  `params` text NOT NULL,
+  `md5params` varchar(32) DEFAULT NULL,
+  `module_name` varchar(255) DEFAULT NULL,
+  `priority` int(11) DEFAULT '0',
+  `datelastrun` datetime DEFAULT NULL,
+  `datenextrun` datetime DEFAULT NULL,
+  `datestart` datetime DEFAULT NULL,
+  `dateend` datetime DEFAULT NULL,
+  `datelastresult` datetime DEFAULT NULL,
+  `lastresult` text,
+  `lastoutput` text,
+  `unitfrequency` int(11) NOT NULL DEFAULT '0',
+  `frequency` int(11) NOT NULL DEFAULT '0',
+  `nbrun` int(11) DEFAULT NULL,
+  `status` int(11) NOT NULL DEFAULT '1',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_mod` int(11) DEFAULT NULL,
+  `note` text,
+  `libname` varchar(255) 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_cronjob`
+--
+
+LOCK TABLES `llx_cronjob` WRITE;
+/*!40000 ALTER TABLE `llx_cronjob` DISABLE KEYS */;
+INSERT INTO `llx_cronjob` VALUES (1,'2013-03-23 18:18:39','2013-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2013-03-23 19:18:00',NULL,NULL,NULL,NULL,3600,3600,0,0,1,1,'',NULL);
+/*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_deplacement`
+--
+
+DROP TABLE IF EXISTS `llx_deplacement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_deplacement` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datec` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `dated` datetime DEFAULT NULL,
+  `fk_user` int(11) NOT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `type` varchar(12) NOT NULL,
+  `fk_statut` int(11) NOT NULL DEFAULT '1',
+  `km` double DEFAULT NULL,
+  `fk_soc` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT '0',
+  `note_private` text,
+  `note_public` text,
+  `extraparams` varchar(255) 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_deplacement`
+--
+
+LOCK TABLES `llx_deplacement` WRITE;
+/*!40000 ALTER TABLE `llx_deplacement` DISABLE KEYS */;
+INSERT INTO `llx_deplacement` VALUES (1,NULL,1,'2010-07-09 01:58:04','2010-07-08 23:58:18','2010-07-09 12:00:00',2,1,NULL,'TF_LUNCH',1,10,2,1,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_deplacement` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_document_generator`
+--
+
+DROP TABLE IF EXISTS `llx_document_generator`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_document_generator` (
+  `rowid` int(10) unsigned NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `classfile` varchar(255) NOT NULL,
+  `class` varchar(255) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_document_generator`
+--
+
+LOCK TABLES `llx_document_generator` WRITE;
+/*!40000 ALTER TABLE `llx_document_generator` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_document_generator` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_document_model`
+--
+
+DROP TABLE IF EXISTS `llx_document_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_document_model` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `nom` varchar(50) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `type` varchar(20) NOT NULL,
+  `libelle` varchar(255) DEFAULT NULL,
+  `description` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=228 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_document_model`
+--
+
+LOCK TABLES `llx_document_model` WRITE;
+/*!40000 ALTER TABLE `llx_document_model` DISABLE KEYS */;
+INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(15,'fsfe.fr.php',1,'donation',NULL,NULL),(21,'baleine',1,'project',NULL,NULL),(174,'azur',1,'propal',NULL,NULL),(175,'rouget',1,'shipping',NULL,NULL),(176,'typhon',1,'delivery',NULL,NULL),(178,'soleil',1,'ficheinter',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(224,'einstein',1,'order',NULL,NULL),(225,'crabe',1,'invoice',NULL,NULL),(226,'muscadet',1,'order_supplier',NULL,NULL),(227,'html_cerfafr',1,'donation',NULL,NULL);
+/*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_dolicloud_emailstemplates`
+--
+
+DROP TABLE IF EXISTS `llx_dolicloud_emailstemplates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_dolicloud_emailstemplates` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `emailtype` varchar(128) NOT NULL,
+  `lang` varchar(12) NOT NULL,
+  `topic` varchar(256) NOT NULL,
+  `content` text NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_dolicloud_emailstemplates` (`emailtype`,`lang`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_dolicloud_emailstemplates`
+--
+
+LOCK TABLES `llx_dolicloud_emailstemplates` WRITE;
+/*!40000 ALTER TABLE `llx_dolicloud_emailstemplates` DISABLE KEYS */;
+INSERT INTO `llx_dolicloud_emailstemplates` VALUES (1,'PasswordAssistance','en_US','DoliCloud (online Dolibarr ERP & CRM) - Password assistance: how to reset your password','<body>\n                <p>Dear ${person.firstName},</p>\n                <p>\n                    To continue the password reset process for the account ${person.email}\n                    click on the link below.<br />\n                </p>\n                <p><a href=\"${resetPasswordLink}\">${resetPasswordLink}</a></p>\n                <p>Note that this process is to reset the password for your dashboard, not for your application login. You may find more information on all different user/password reset process onto <a href=\"http://dolicloud.com/en/faq/139-i-forgot-my-login-or-password\">the following page</a>.\n                </p>\n                <p>If clicking doesn\'t seem to work, you can copy and paste the link into your browser\'s\n                   address window, or retype it there. Once you have returned to our site, we will give instructions for resetting your password.</p>\n                <p>If you did not request to have your password reset you can safely ignore this email.\n                   It is likely another user entered your email address by mistake while trying to reset a password. Rest assured your customer account is safe.</p>\n                <p>We will never e-mail you and ask you to disclose or verify your password, credit card, or banking account number. \n                   If you receive a suspicious e-mail with a link to update your account information,\n                   do not click on the link - instead, report the e-mail to us for investigation.</p>\n                <p>\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n                </p>\n              </body>'),(2,'InstanceDeployed','en_US','Welcome to DoliCloud (online Dolibarr ERP & CRM) - Your instance is ready','               <body>\n                <p>Hello ${person.firstName},</p>\n                <p>\n                   We are delighted to welcome you as a user of DoliCloud, the Ondemand service of Dolibarr ERP & CRM.\n                </p>\n                <p>\n                   Your ${appPackage.name} is installed, setup and ready for you.\n                   Here are the details you need to get started:\n                </p>\n                <br /><strong>Your Dolibarr ERP & CRM :</strong>\n                <ul>\n                    <li>URL: <a href=\"${appInstance.url}?username=${appPackage.defaultUser}\">${appInstance.url}</a></li>\n                    <li>Login: ${appPackage.defaultUser}</li>\n                    <li>Password: ${appInstance.defaultPassword}</li>\n                </ul>\n                <br /><strong>Your Dolicloud dashboard :</strong>\n                <ul>\n                    <li>URL: <a href=\"https://www.on.dolicloud.com/\">https://www.on.dolicloud.com/</a></li>\n                    <li>Login: ${person.email}</li>\n                    <li>Password: ${appInstance.defaultPassword}</li>\n                </ul>                \n            \n            <br />\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n            </body>\n            '),(3,'InvoiceFailure','en_US','DoliCloud (online Dolibarr ERP & CRM) - Invoice Payment Failure','            <body>\n              <p>Dear DoliCloud Customer,</p>\n              <p>\n                An attempt to take payment for invoice(s) owed has failed. Please update your payment method, or contact your bank or payment method provider.<br />\n                Should failure to take this payment continue, access to our service will be discontinued, and any data you have with us maybe lost.<br />\n<br />\nPlease login to your <a href=\"https://www.on.dolicloud.com/\">Dolicloud dashboard</a> to update and fix your credit card or paypal information as soon as possible to prevent any interuptions in service.<br />\nRemind: Your DoliCloud dashboard login is ${person.email}<br />\n              </p>\n              <p>\n                The error we received from your bank was: <br />\n                ${invoice.notes.collect{ it }.join(\' \')}\n              </p><br />\n\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n            </body>\n          '),(4,'CustomerInstanceClosed','en_US','DoliCloud (online Dolibarr ERP & CRM) - Account Closure','            <body>\n              <p>Dear Customer,</p>\n              <p>\n                 We wish to inform you your account has now been closed. We are sorry to see you got, but thank you for your custom.\n                 We hope you will a customer of ours in the future.<br />\nIf you think this is an error, please contact us at support@dolicloud.com\n              </p><br />\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n            </body>\n          '),(5,'CustomerInstanceClosureRequested','en_US','DoliCloud (online Dolibarr ERP & CRM) - Customer Account Closure Requested Confirmation','            <body>               <p>Dear Customer,</p>               <p>                 We are sorry to see you go, and appreciate the custom you have given us.               </p>               <p>                The closure of your account will be executed at the end of your current trialing or                 billing period <span class=\"highlight\">(${customerAccount.nextBillingDate.format(\'dd MMM yyyy\')})</span>.                Once the closure is complete your instance and its                related data will be <span class=\"emphasis\">destroyed and unretrievable</span>.<br />                 If you change your mind before that date you can halt the closure process,                and continue being our customer. For this, go to your <a href=\"https://www.on.dolicloud.com/\">Dolicloud dashboard</a>.<br />                Remind: Your DoliCloud dashboard login is ${person.email}<br />                </p><br />             Sincerly, <br />             The DoliCloud Team <br />             ----------------------------------------- <br />             EMail: support@dolicloud.com <br />             Web: http://www.dolicloud.com             </body>           '),(6,'CreditCardExpiring','en_US','DoliCloud (online Dolibarr ERP & CRM) - Urgent: Your credit card is expiring','          <body>\n            <p>Dear Customer,</p>\n            <p>\n              We wish to inform you that your payment method will soon expire.<br />\n              \n              Please login to your <a href=\"https://www.on.dolicloud.com/\">Dolicloud dashboard</a> to update your credit card information as soon as possible to prevent any interuptions in service.<br />\nRemind: Your DoliCloud dashboard login is ${person.email}<br />\n            </p>\n            <p>If you have any questions relating to the above please do not hesitate get in touch.</p>\n<br />\n\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n          </body>\n        '),(7,'GentleTrialExpiringReminder','en_US','DoliCloud (online Dolibarr ERP & CRM) - Your Trial will soon expire','         <body>\n          <p>Hello ${person.firstName},</p>\n          <p>\n            Just a quick reminder that trial of your online Dolibarr ERP & CRM will expire soon. If you wish to continue using this service, please login to your DoliCloud console to add a payment method (credit card or paypal accepted).\n          </p>\n          <p>\nFor this, click to go on your DoliCloud dashboard: <a href=\"https://www.on.dolicloud.com/\">https://www.on.dolicloud.com/</a><br />\nRemind: Your DoliCloud dashboard login is ${person.email}<br />\n</p>\n          <br />\n            Sincerly, <br />\n            The DoliCloud Team <br />\n            ----------------------------------------- <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n        </body>\n       '),(8,'ChannelPartnerCreated','en_US','Channel Partner Created','         <body>\n          <p>Hello ${person.firstName},</p>\n          <p>\n             We are delighted to welcome you as a Channel Partner of ${appProvider.name}.\n          </p>\n          <p>\n             Your account has been setup for you.\n             Here are the details you need to get started:\n          </p>\n          <ul>\n              <li>Login link: ${serverURL}</li>\n              <li>Username: ${person.email}</li>\n              <li>Temporary Password: ${person.tmpPassword}</li>\n          </ul>                \n          <p>\n              Sincerly, <br />\n              The ${appProvider.name} Team\n          </p>\n        </body>\n        '),(9,'CustomerAccountSuspended','en_US','DoliCloud (online Dolibarr ERP & CRM) - Account Suspension','<body>\n <p>Dear Customer,</p> \n <p>We wish to inform you your account has been suspended. This is likely due to a payment problem. If you wish to engage with us in addressing this send an email to support@dolicloud.com </p><br />\n Sincerly, <br /> \n The DoliCloud Team <br />\n ========================================== <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n        </body>\n       '),(10,'CustomerInstanceUpdated','en_US','DoliCloud (online Dolibarr ERP & CRM) - Instance upgrade','<body>\n <p>Dear Customer,</p> \n <p>We wish to inform you your instance has been upgraded to last stable version. If you experience problem after this upgrade, you can contact us at support@dolicloud.com </p><br />\n Sincerly, <br /> \n The DoliCloud Team <br />\n ========================================== <br />\n            EMail: support@dolicloud.com <br />\n            Web: http://www.dolicloud.com\n        </body>\n       ');
+/*!40000 ALTER TABLE `llx_dolicloud_emailstemplates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_domain`
+--
+
+DROP TABLE IF EXISTS `llx_domain`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_domain` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_domain`
+--
+
+LOCK TABLES `llx_domain` WRITE;
+/*!40000 ALTER TABLE `llx_domain` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_domain` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_don`
+--
+
+DROP TABLE IF EXISTS `llx_don`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_don` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(30) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `datec` datetime DEFAULT NULL,
+  `datedon` datetime DEFAULT NULL,
+  `amount` double DEFAULT '0',
+  `fk_paiement` int(11) DEFAULT NULL,
+  `firstname` varchar(50) DEFAULT NULL,
+  `lastname` varchar(50) DEFAULT NULL,
+  `societe` varchar(50) DEFAULT NULL,
+  `address` text,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `country` varchar(50) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `phone` varchar(24) DEFAULT NULL,
+  `phone_mobile` varchar(24) DEFAULT NULL,
+  `public` smallint(6) NOT NULL DEFAULT '1',
+  `fk_don_projet` int(11) DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) 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_don`
+--
+
+LOCK TABLES `llx_don` WRITE;
+/*!40000 ALTER TABLE `llx_don` DISABLE KEYS */;
+INSERT INTO `llx_don` VALUES (1,NULL,1,'2010-07-08 23:57:17',1,'2010-07-09 01:55:33','2010-07-09 12:00:00',10,1,'Donator','','Guest company','','','','France','',NULL,NULL,1,1,1,1,'',NULL,'html_cerfafr',NULL);
+/*!40000 ALTER TABLE `llx_don` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_ecm_directories`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_directories`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_directories` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(64) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_parent` int(11) DEFAULT NULL,
+  `description` varchar(255) NOT NULL,
+  `cachenbofdoc` int(11) NOT NULL DEFAULT '0',
+  `fullpath` varchar(255) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  `date_c` datetime DEFAULT NULL,
+  `date_m` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_user_c` int(11) DEFAULT NULL,
+  `fk_user_m` int(11) DEFAULT NULL,
+  `acl` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_ecm_directories` (`label`,`fk_parent`,`entity`),
+  KEY `idx_ecm_directories_fk_user_c` (`fk_user_c`),
+  KEY `idx_ecm_directories_fk_user_m` (`fk_user_m`),
+  CONSTRAINT `fk_ecm_directories_fk_user_c` FOREIGN KEY (`fk_user_c`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_ecm_directories_fk_user_m` FOREIGN KEY (`fk_user_m`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_directories`
+--
+
+LOCK TABLES `llx_ecm_directories` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_directories` DISABLE KEYS */;
+INSERT INTO `llx_ecm_directories` VALUES (1,'Répertoire_1',1,0,'',1,NULL,NULL,'2010-07-11 16:27:26','2010-07-11 14:27:44',1,NULL,NULL),(2,'dddd',1,0,'',3,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL),(3,'bbb',1,2,'',0,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:06',1,NULL,NULL),(4,'aaa',1,2,'',1,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:06',1,NULL,NULL),(5,'gggggg',1,0,'',2,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL),(6,'mmm',1,0,'',0,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL),(7,'aaa',1,0,'',1,NULL,NULL,'2013-02-20 19:11:05','2013-02-20 18:11:05',1,NULL,NULL);
+/*!40000 ALTER TABLE `llx_ecm_directories` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_ecm_documents`
+--
+
+DROP TABLE IF EXISTS `llx_ecm_documents`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_ecm_documents` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(16) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `filename` varchar(255) NOT NULL,
+  `filesize` int(11) NOT NULL,
+  `filemime` varchar(32) NOT NULL,
+  `fullpath_dol` varchar(255) NOT NULL,
+  `fullpath_orig` varchar(255) NOT NULL,
+  `description` text,
+  `manualkeyword` text,
+  `fk_create` int(11) NOT NULL,
+  `fk_update` int(11) DEFAULT NULL,
+  `date_c` datetime NOT NULL,
+  `date_u` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `fk_directory` int(11) DEFAULT NULL,
+  `fk_status` smallint(6) DEFAULT '0',
+  `private` smallint(6) DEFAULT '0',
+  `crc` varchar(32) NOT NULL DEFAULT '',
+  `cryptkey` varchar(50) NOT NULL DEFAULT '',
+  `cipher` varchar(50) NOT NULL DEFAULT 'twofish',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_ecm_documents` (`fullpath_dol`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_ecm_documents`
+--
+
+LOCK TABLES `llx_ecm_documents` WRITE;
+/*!40000 ALTER TABLE `llx_ecm_documents` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_ecm_documents` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_contact`
+--
+
+DROP TABLE IF EXISTS `llx_element_contact`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_contact` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datecreate` datetime DEFAULT NULL,
+  `statut` smallint(6) DEFAULT '5',
+  `element_id` int(11) NOT NULL,
+  `fk_c_type_contact` int(11) NOT NULL,
+  `fk_socpeople` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_contact_idx1` (`element_id`,`fk_c_type_contact`,`fk_socpeople`),
+  KEY `fk_element_contact_fk_c_type_contact` (`fk_c_type_contact`),
+  KEY `idx_element_contact_fk_socpeople` (`fk_socpeople`),
+  CONSTRAINT `fk_element_contact_fk_c_type_contact` FOREIGN KEY (`fk_c_type_contact`) REFERENCES `llx_c_type_contact` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_contact`
+--
+
+LOCK TABLES `llx_element_contact` WRITE;
+/*!40000 ALTER TABLE `llx_element_contact` DISABLE KEYS */;
+INSERT INTO `llx_element_contact` VALUES (1,'2010-07-09 00:49:43',4,1,160,1),(2,'2010-07-09 00:49:56',4,2,160,1),(3,'2010-07-09 00:50:19',4,3,160,1),(4,'2010-07-09 00:50:42',4,4,160,1),(5,'2010-07-09 01:52:36',4,1,120,1),(6,'2010-07-09 01:53:25',4,1,10,2),(7,'2010-07-09 01:53:25',4,1,11,2),(8,'2010-07-10 18:13:37',4,2,10,2),(9,'2010-07-10 18:13:37',4,2,11,2),(10,'2010-07-11 15:15:55',4,1,180,1),(11,'2010-07-11 16:22:36',4,5,160,1),(12,'2010-07-11 16:23:53',4,2,180,1),(13,'2013-01-23 15:04:27',4,19,200,5),(14,'2013-01-23 16:06:37',4,19,210,2),(15,'2013-01-23 16:12:43',4,19,220,2),(16,'2013-03-06 10:04:57',4,3,10,1),(17,'2013-03-06 10:04:57',4,3,11,1),(18,'2014-12-21 13:52:41',4,3,180,1),(19,'2014-12-21 13:55:39',4,4,180,1),(20,'2014-12-21 14:16:58',4,5,180,1);
+/*!40000 ALTER TABLE `llx_element_contact` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_element`
+--
+
+DROP TABLE IF EXISTS `llx_element_element`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_element` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_source` int(11) NOT NULL,
+  `sourcetype` varchar(32) NOT NULL,
+  `fk_target` int(11) NOT NULL,
+  `targettype` varchar(32) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_element_idx1` (`fk_source`,`sourcetype`,`fk_target`,`targettype`),
+  KEY `idx_element_element_fk_target` (`fk_target`)
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_element`
+--
+
+LOCK TABLES `llx_element_element` WRITE;
+/*!40000 ALTER TABLE `llx_element_element` DISABLE KEYS */;
+INSERT INTO `llx_element_element` VALUES (7,1,'shipping',154,'facture'),(8,1,'shipping',155,'facture'),(9,1,'shipping',156,'facture'),(1,2,'contrat',2,'facture'),(2,2,'propal',1,'commande'),(11,2,'shipping',157,'facture'),(3,5,'commande',1,'shipping'),(6,5,'commande',153,'facture'),(10,7,'commande',2,'shipping'),(4,9,'propal',6,'commande'),(5,11,'propal',7,'commande'),(12,12,'propal',8,'commande'),(13,12,'propal',162,'facture');
+/*!40000 ALTER TABLE `llx_element_element` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_lock`
+--
+
+DROP TABLE IF EXISTS `llx_element_lock`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_lock` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_element` int(11) NOT NULL,
+  `elementtype` varchar(32) NOT NULL,
+  `datel` datetime DEFAULT NULL,
+  `datem` datetime DEFAULT NULL,
+  `sessionid` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_lock`
+--
+
+LOCK TABLES `llx_element_lock` WRITE;
+/*!40000 ALTER TABLE `llx_element_lock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_lock` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_rang`
+--
+
+DROP TABLE IF EXISTS `llx_element_rang`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_rang` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_parent` int(11) NOT NULL,
+  `parenttype` varchar(16) NOT NULL,
+  `fk_child` int(11) NOT NULL,
+  `childtype` varchar(16) NOT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_rang_idx1` (`fk_parent`,`parenttype`,`fk_child`,`childtype`),
+  KEY `idx_element_rang_fk_parent` (`fk_parent`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_rang`
+--
+
+LOCK TABLES `llx_element_rang` WRITE;
+/*!40000 ALTER TABLE `llx_element_rang` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_rang` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_resources`
+--
+
+DROP TABLE IF EXISTS `llx_element_resources`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_resources` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `element_id` int(11) DEFAULT NULL,
+  `element_type` varchar(64) DEFAULT NULL,
+  `resource_id` int(11) DEFAULT NULL,
+  `resource_type` varchar(64) DEFAULT NULL,
+  `busy` int(11) DEFAULT NULL,
+  `mandatory` int(11) DEFAULT NULL,
+  `fk_user_create` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_element_resources_idx1` (`resource_id`,`resource_type`,`element_id`,`element_type`),
+  KEY `idx_element_element_element_id` (`element_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_resources`
+--
+
+LOCK TABLES `llx_element_resources` WRITE;
+/*!40000 ALTER TABLE `llx_element_resources` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_resources` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_element_tag`
+--
+
+DROP TABLE IF EXISTS `llx_element_tag`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_element_tag` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `lang` varchar(5) NOT NULL,
+  `tag` varchar(255) NOT NULL,
+  `fk_element` int(11) NOT NULL,
+  `element` varchar(64) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_element_tag` (`entity`,`lang`,`tag`,`fk_element`,`element`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_element_tag`
+--
+
+LOCK TABLES `llx_element_tag` WRITE;
+/*!40000 ALTER TABLE `llx_element_tag` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_element_tag` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_entity`
+--
+
+DROP TABLE IF EXISTS `llx_entity`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_entity` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) NOT NULL,
+  `description` text,
+  `datec` datetime DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `options` text,
+  `visible` tinyint(4) NOT NULL DEFAULT '1',
+  `active` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_entity_fk_user_creat` (`fk_user_creat`),
+  CONSTRAINT `fk_entity_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_entity`
+--
+
+LOCK TABLES `llx_entity` WRITE;
+/*!40000 ALTER TABLE `llx_entity` DISABLE KEYS */;
+INSERT INTO `llx_entity` VALUES (1,'2012-12-08 14:07:29','Master entity','Master entity, can not be deleted','2012-12-08 15:07:29',1,NULL,1,1),(2,'2012-12-08 14:08:27','aaa','','2012-12-08 15:08:14',1,'{\"referent\":null,\"sharings\":{\"product\":null,\"societe\":null,\"category\":null}}',1,1),(3,'2012-12-08 14:08:26','bbb','','2012-12-08 15:08:20',1,'{\"referent\":null,\"sharings\":{\"product\":null,\"societe\":null,\"category\":null}}',1,1);
+/*!40000 ALTER TABLE `llx_entity` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_entrepot`
+--
+
+DROP TABLE IF EXISTS `llx_entrepot`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_entrepot` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `description` text,
+  `lieu` varchar(64) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `zip` varchar(10) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `fk_departement` int(11) DEFAULT NULL,
+  `fk_pays` int(11) DEFAULT '0',
+  `statut` tinyint(4) DEFAULT '1',
+  `valo_pmp` float(12,4) DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_entrepot_label` (`label`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_entrepot`
+--
+
+LOCK TABLES `llx_entrepot` WRITE;
+/*!40000 ALTER TABLE `llx_entrepot` DISABLE KEYS */;
+INSERT INTO `llx_entrepot` VALUES (1,'2010-07-09 00:31:22','2010-07-08 22:40:36','WAREHOUSEHOUSTON',1,'Warehouse located at Houston','Warehouse houston','','','Houston',NULL,11,1,NULL,1,NULL),(2,'2010-07-09 00:41:03','2010-07-08 22:41:03','WAREHOUSEPARIS',1,'<br />','Warehouse Paris','','75000','Paris',NULL,1,1,NULL,1,NULL),(3,'2010-07-11 16:18:59','2010-07-11 14:18:59','Stock personnel Dupont',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de Alain Dupont','','','','',NULL,0,1,NULL,1,NULL),(4,'2013-01-23 17:52:27','2013-01-23 16:52:27','Stock personnel aaa',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de aaa','','','','',NULL,81,1,NULL,1,NULL),(5,'2013-01-23 17:52:37','2013-01-23 16:52:37','Stock personnel bbb',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de bbb','','','','',NULL,81,1,NULL,1,NULL),(6,'2013-02-16 20:22:40','2013-02-16 19:22:40','Stock personnel aaab',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de aaab','','','','',NULL,1,1,NULL,1,NULL),(7,'2013-02-16 20:48:15','2013-02-16 19:48:15','Stock personnel zzz',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de zzz','','','','',NULL,1,1,NULL,1,NULL),(8,'2013-02-16 20:50:07','2013-02-16 19:50:07','Stock personnel zzzg',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de zzzg','','','','',NULL,1,1,NULL,1,NULL);
+/*!40000 ALTER TABLE `llx_entrepot` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_event_element`
+--
+
+DROP TABLE IF EXISTS `llx_event_element`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_event_element` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_source` int(11) NOT NULL,
+  `fk_target` int(11) NOT NULL,
+  `targettype` varchar(32) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_event_element`
+--
+
+LOCK TABLES `llx_event_element` WRITE;
+/*!40000 ALTER TABLE `llx_event_element` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_event_element` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_events`
+--
+
+DROP TABLE IF EXISTS `llx_events`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_events` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `type` varchar(32) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `dateevent` datetime DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `description` varchar(250) NOT NULL,
+  `ip` varchar(32) NOT NULL,
+  `user_agent` varchar(255) DEFAULT NULL,
+  `fk_object` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_events_dateevent` (`dateevent`)
+) ENGINE=InnoDB AUTO_INCREMENT=564 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_events`
+--
+
+LOCK TABLES `llx_events` WRITE;
+/*!40000 ALTER TABLE `llx_events` DISABLE KEYS */;
+INSERT INTO `llx_events` VALUES (30,'2011-07-18 18:23:06','USER_LOGOUT',1,'2011-07-18 20:23:06',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(31,'2011-07-18 18:23:12','USER_LOGIN_FAILED',1,'2011-07-18 20:23:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(32,'2011-07-18 18:23:17','USER_LOGIN',1,'2011-07-18 20:23:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(33,'2011-07-18 20:10:51','USER_LOGIN_FAILED',1,'2011-07-18 22:10:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(34,'2011-07-18 20:10:55','USER_LOGIN',1,'2011-07-18 22:10:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(35,'2011-07-18 21:18:57','USER_LOGIN',1,'2011-07-18 23:18:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(36,'2011-07-20 10:34:10','USER_LOGIN',1,'2011-07-20 12:34:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(37,'2011-07-20 12:36:44','USER_LOGIN',1,'2011-07-20 14:36:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(38,'2011-07-20 13:20:51','USER_LOGIN_FAILED',1,'2011-07-20 15:20:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(39,'2011-07-20 13:20:54','USER_LOGIN',1,'2011-07-20 15:20:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(40,'2011-07-20 15:03:46','USER_LOGIN_FAILED',1,'2011-07-20 17:03:46',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(41,'2011-07-20 15:03:55','USER_LOGIN',1,'2011-07-20 17:03:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(42,'2011-07-20 18:05:05','USER_LOGIN_FAILED',1,'2011-07-20 20:05:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(43,'2011-07-20 18:05:08','USER_LOGIN',1,'2011-07-20 20:05:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(44,'2011-07-20 21:08:53','USER_LOGIN_FAILED',1,'2011-07-20 23:08:53',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(45,'2011-07-20 21:08:56','USER_LOGIN',1,'2011-07-20 23:08:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(46,'2011-07-21 01:26:12','USER_LOGIN',1,'2011-07-21 03:26:12',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(47,'2011-07-21 22:35:45','USER_LOGIN_FAILED',1,'2011-07-22 00:35:45',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(48,'2011-07-21 22:35:49','USER_LOGIN',1,'2011-07-22 00:35:49',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(49,'2011-07-26 23:09:47','USER_LOGIN_FAILED',1,'2011-07-27 01:09:47',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(50,'2011-07-26 23:09:50','USER_LOGIN',1,'2011-07-27 01:09:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(51,'2011-07-27 17:02:27','USER_LOGIN_FAILED',1,'2011-07-27 19:02:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(52,'2011-07-27 17:02:32','USER_LOGIN',1,'2011-07-27 19:02:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(53,'2011-07-27 23:33:37','USER_LOGIN_FAILED',1,'2011-07-28 01:33:37',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(54,'2011-07-27 23:33:41','USER_LOGIN',1,'2011-07-28 01:33:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(55,'2011-07-28 18:20:36','USER_LOGIN_FAILED',1,'2011-07-28 20:20:36',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(56,'2011-07-28 18:20:38','USER_LOGIN',1,'2011-07-28 20:20:38',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(57,'2011-07-28 20:13:30','USER_LOGIN_FAILED',1,'2011-07-28 22:13:30',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(58,'2011-07-28 20:13:34','USER_LOGIN',1,'2011-07-28 22:13:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(59,'2011-07-28 20:22:51','USER_LOGIN',1,'2011-07-28 22:22:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(60,'2011-07-28 23:05:06','USER_LOGIN',1,'2011-07-29 01:05:06',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(61,'2011-07-29 20:15:50','USER_LOGIN_FAILED',1,'2011-07-29 22:15:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(62,'2011-07-29 20:15:53','USER_LOGIN',1,'2011-07-29 22:15:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(68,'2011-07-29 20:51:01','USER_LOGOUT',1,'2011-07-29 22:51:01',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(69,'2011-07-29 20:51:05','USER_LOGIN',1,'2011-07-29 22:51:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(70,'2011-07-30 08:46:20','USER_LOGIN_FAILED',1,'2011-07-30 10:46:20',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(71,'2011-07-30 08:46:38','USER_LOGIN_FAILED',1,'2011-07-30 10:46:38',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(72,'2011-07-30 08:46:42','USER_LOGIN',1,'2011-07-30 10:46:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(73,'2011-07-30 10:05:12','USER_LOGIN_FAILED',1,'2011-07-30 12:05:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(74,'2011-07-30 10:05:15','USER_LOGIN',1,'2011-07-30 12:05:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(75,'2011-07-30 12:15:46','USER_LOGIN',1,'2011-07-30 14:15:46',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(76,'2011-07-31 22:19:30','USER_LOGIN',1,'2011-08-01 00:19:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(77,'2011-07-31 23:32:52','USER_LOGIN',1,'2011-08-01 01:32:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(78,'2011-08-01 01:24:50','USER_LOGIN_FAILED',1,'2011-08-01 03:24:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(79,'2011-08-01 01:24:54','USER_LOGIN',1,'2011-08-01 03:24:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(80,'2011-08-01 19:31:36','USER_LOGIN_FAILED',1,'2011-08-01 21:31:35',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(81,'2011-08-01 19:31:39','USER_LOGIN',1,'2011-08-01 21:31:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(82,'2011-08-01 20:01:36','USER_LOGIN',1,'2011-08-01 22:01:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(83,'2011-08-01 20:52:54','USER_LOGIN_FAILED',1,'2011-08-01 22:52:54',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(84,'2011-08-01 20:52:58','USER_LOGIN',1,'2011-08-01 22:52:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(85,'2011-08-01 21:17:28','USER_LOGIN_FAILED',1,'2011-08-01 23:17:28',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(86,'2011-08-01 21:17:31','USER_LOGIN',1,'2011-08-01 23:17:31',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(87,'2011-08-04 11:55:17','USER_LOGIN',1,'2011-08-04 13:55:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(88,'2011-08-04 20:19:03','USER_LOGIN_FAILED',1,'2011-08-04 22:19:03',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(89,'2011-08-04 20:19:07','USER_LOGIN',1,'2011-08-04 22:19:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(90,'2011-08-05 17:51:42','USER_LOGIN_FAILED',1,'2011-08-05 19:51:42',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(91,'2011-08-05 17:51:47','USER_LOGIN',1,'2011-08-05 19:51:47',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(92,'2011-08-05 17:56:03','USER_LOGIN',1,'2011-08-05 19:56:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(93,'2011-08-05 17:59:10','USER_LOGIN',1,'2011-08-05 19:59:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(94,'2011-08-05 18:01:58','USER_LOGIN',1,'2011-08-05 20:01:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(95,'2011-08-05 19:59:56','USER_LOGIN',1,'2011-08-05 21:59:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(96,'2011-08-06 18:33:22','USER_LOGIN',1,'2011-08-06 20:33:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(97,'2011-08-07 00:56:59','USER_LOGIN',1,'2011-08-07 02:56:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(98,'2011-08-07 22:49:14','USER_LOGIN',1,'2011-08-08 00:49:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(99,'2011-08-07 23:05:18','USER_LOGOUT',1,'2011-08-08 01:05:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(105,'2011-08-08 00:41:09','USER_LOGIN',1,'2011-08-08 02:41:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(106,'2011-08-08 11:58:55','USER_LOGIN',1,'2011-08-08 13:58:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(107,'2011-08-08 14:35:48','USER_LOGIN',1,'2011-08-08 16:35:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(108,'2011-08-08 14:36:31','USER_LOGOUT',1,'2011-08-08 16:36:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(109,'2011-08-08 14:38:28','USER_LOGIN',1,'2011-08-08 16:38:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(110,'2011-08-08 14:39:02','USER_LOGOUT',1,'2011-08-08 16:39:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(111,'2011-08-08 14:39:10','USER_LOGIN',1,'2011-08-08 16:39:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(112,'2011-08-08 14:39:28','USER_LOGOUT',1,'2011-08-08 16:39:28',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(113,'2011-08-08 14:39:37','USER_LOGIN',1,'2011-08-08 16:39:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(114,'2011-08-08 14:50:02','USER_LOGOUT',1,'2011-08-08 16:50:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(115,'2011-08-08 14:51:45','USER_LOGIN_FAILED',1,'2011-08-08 16:51:45',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(116,'2011-08-08 14:51:52','USER_LOGIN',1,'2011-08-08 16:51:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(117,'2011-08-08 15:09:54','USER_LOGOUT',1,'2011-08-08 17:09:54',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(118,'2011-08-08 15:10:19','USER_LOGIN_FAILED',1,'2011-08-08 17:10:19',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(119,'2011-08-08 15:10:28','USER_LOGIN',1,'2011-08-08 17:10:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(121,'2011-08-08 15:14:58','USER_LOGOUT',1,'2011-08-08 17:14:58',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(122,'2011-08-08 15:15:00','USER_LOGIN_FAILED',1,'2011-08-08 17:15:00',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(123,'2011-08-08 15:17:57','USER_LOGIN',1,'2011-08-08 17:17:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(124,'2011-08-08 15:35:56','USER_LOGOUT',1,'2011-08-08 17:35:56',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(125,'2011-08-08 15:36:05','USER_LOGIN',1,'2011-08-08 17:36:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(126,'2011-08-08 17:32:42','USER_LOGIN',1,'2011-08-08 19:32:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(127,'2012-12-08 13:49:37','USER_LOGOUT',1,'2012-12-08 14:49:37',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(128,'2012-12-08 13:49:42','USER_LOGIN',1,'2012-12-08 14:49:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(129,'2012-12-08 13:50:12','USER_LOGOUT',1,'2012-12-08 14:50:12',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(130,'2012-12-08 13:50:14','USER_LOGIN',1,'2012-12-08 14:50:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(131,'2012-12-08 13:50:17','USER_LOGOUT',1,'2012-12-08 14:50:17',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(132,'2012-12-08 13:52:47','USER_LOGIN',1,'2012-12-08 14:52:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(133,'2012-12-08 13:53:08','USER_MODIFY',1,'2012-12-08 14:53:08',1,'User admin modified','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(134,'2012-12-08 14:08:45','USER_LOGOUT',1,'2012-12-08 15:08:45',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(135,'2012-12-08 14:09:09','USER_LOGIN',1,'2012-12-08 15:09:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(136,'2012-12-08 14:11:43','USER_LOGOUT',1,'2012-12-08 15:11:43',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(137,'2012-12-08 14:11:45','USER_LOGIN',1,'2012-12-08 15:11:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(138,'2012-12-08 14:22:53','USER_LOGOUT',1,'2012-12-08 15:22:53',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(139,'2012-12-08 14:22:54','USER_LOGIN',1,'2012-12-08 15:22:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(140,'2012-12-08 14:23:10','USER_LOGOUT',1,'2012-12-08 15:23:10',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(141,'2012-12-08 14:23:11','USER_LOGIN',1,'2012-12-08 15:23:11',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(142,'2012-12-08 14:23:49','USER_LOGOUT',1,'2012-12-08 15:23:49',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(143,'2012-12-08 14:23:50','USER_LOGIN',1,'2012-12-08 15:23:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(144,'2012-12-08 14:28:08','USER_LOGOUT',1,'2012-12-08 15:28:08',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(145,'2012-12-08 14:35:15','USER_LOGIN',1,'2012-12-08 15:35:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(146,'2012-12-08 14:35:18','USER_LOGOUT',1,'2012-12-08 15:35:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(147,'2012-12-08 14:36:07','USER_LOGIN',1,'2012-12-08 15:36:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(148,'2012-12-08 14:36:09','USER_LOGOUT',1,'2012-12-08 15:36:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(149,'2012-12-08 14:36:41','USER_LOGIN',1,'2012-12-08 15:36:41',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(150,'2012-12-08 15:59:13','USER_LOGIN',1,'2012-12-08 16:59:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(151,'2012-12-09 11:49:52','USER_LOGIN',1,'2012-12-09 12:49:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(152,'2012-12-09 13:46:31','USER_LOGIN',1,'2012-12-09 14:46:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(153,'2012-12-09 19:03:14','USER_LOGIN',1,'2012-12-09 20:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(154,'2012-12-10 00:16:31','USER_LOGIN',1,'2012-12-10 01:16:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(170,'2012-12-11 22:03:31','USER_LOGIN',1,'2012-12-11 23:03:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(171,'2012-12-12 00:32:39','USER_LOGIN',1,'2012-12-12 01:32:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(172,'2012-12-12 10:49:59','USER_LOGIN',1,'2012-12-12 11:49:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(175,'2012-12-12 10:57:40','USER_MODIFY',1,'2012-12-12 11:57:40',1,'Modification utilisateur admin','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(176,'2012-12-12 13:29:15','USER_LOGIN',1,'2012-12-12 14:29:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(177,'2012-12-12 13:30:15','USER_LOGIN',1,'2012-12-12 14:30:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(178,'2012-12-12 13:40:08','USER_LOGOUT',1,'2012-12-12 14:40:08',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(179,'2012-12-12 13:40:10','USER_LOGIN',1,'2012-12-12 14:40:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(180,'2012-12-12 13:40:26','USER_MODIFY',1,'2012-12-12 14:40:26',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(181,'2012-12-12 13:40:34','USER_LOGOUT',1,'2012-12-12 14:40:34',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(182,'2012-12-12 13:42:23','USER_LOGIN',1,'2012-12-12 14:42:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(183,'2012-12-12 13:43:02','USER_NEW_PASSWORD',1,'2012-12-12 14:43:02',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(184,'2012-12-12 13:43:25','USER_LOGOUT',1,'2012-12-12 14:43:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(185,'2012-12-12 13:43:27','USER_LOGIN_FAILED',1,'2012-12-12 14:43:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(186,'2012-12-12 13:43:30','USER_LOGIN',1,'2012-12-12 14:43:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(187,'2012-12-12 14:52:11','USER_LOGIN',1,'2012-12-12 15:52:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(188,'2012-12-12 17:53:00','USER_LOGIN_FAILED',1,'2012-12-12 18:53:00',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(189,'2012-12-12 17:53:07','USER_LOGIN_FAILED',1,'2012-12-12 18:53:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(190,'2012-12-12 17:53:51','USER_NEW_PASSWORD',1,'2012-12-12 18:53:51',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(191,'2012-12-12 17:54:00','USER_LOGIN',1,'2012-12-12 18:54:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(192,'2012-12-12 17:54:10','USER_NEW_PASSWORD',1,'2012-12-12 18:54:10',1,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(193,'2012-12-12 17:54:10','USER_MODIFY',1,'2012-12-12 18:54:10',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(194,'2012-12-12 18:57:09','USER_LOGIN',1,'2012-12-12 19:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(195,'2012-12-12 23:04:08','USER_LOGIN',1,'2012-12-13 00:04:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(196,'2012-12-17 20:03:14','USER_LOGIN',1,'2012-12-17 21:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(197,'2012-12-17 21:18:45','USER_LOGIN',1,'2012-12-17 22:18:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(198,'2012-12-17 22:30:08','USER_LOGIN',1,'2012-12-17 23:30:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(199,'2012-12-18 23:32:03','USER_LOGIN',1,'2012-12-19 00:32:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(200,'2012-12-19 09:38:03','USER_LOGIN',1,'2012-12-19 10:38:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(201,'2012-12-19 11:23:35','USER_LOGIN',1,'2012-12-19 12:23:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(202,'2012-12-19 12:46:22','USER_LOGIN',1,'2012-12-19 13:46:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(214,'2012-12-19 19:11:31','USER_LOGIN',1,'2012-12-19 20:11:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(215,'2012-12-21 16:36:57','USER_LOGIN',1,'2012-12-21 17:36:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(216,'2012-12-21 16:38:43','USER_NEW_PASSWORD',1,'2012-12-21 17:38:43',1,'Changement mot de passe de adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(217,'2012-12-21 16:38:43','USER_MODIFY',1,'2012-12-21 17:38:43',1,'Modification utilisateur adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(218,'2012-12-21 16:38:51','USER_LOGOUT',1,'2012-12-21 17:38:51',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(219,'2012-12-21 16:38:55','USER_LOGIN',1,'2012-12-21 17:38:55',3,'(UserLogged,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(220,'2012-12-21 16:48:18','USER_LOGOUT',1,'2012-12-21 17:48:18',3,'(UserLogoff,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(221,'2012-12-21 16:48:20','USER_LOGIN',1,'2012-12-21 17:48:20',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(222,'2012-12-26 18:28:18','USER_LOGIN',1,'2012-12-26 19:28:18',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(223,'2012-12-26 20:00:24','USER_LOGIN',1,'2012-12-26 21:00:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(224,'2012-12-27 01:10:27','USER_LOGIN',1,'2012-12-27 02:10:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(225,'2012-12-28 19:12:08','USER_LOGIN',1,'2012-12-28 20:12:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(226,'2012-12-28 20:16:58','USER_LOGIN',1,'2012-12-28 21:16:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(227,'2012-12-29 14:35:46','USER_LOGIN',1,'2012-12-29 15:35:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(228,'2012-12-29 14:37:59','USER_LOGOUT',1,'2012-12-29 15:37:59',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(229,'2012-12-29 14:38:00','USER_LOGIN',1,'2012-12-29 15:38:00',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(230,'2012-12-29 17:16:48','USER_LOGIN',1,'2012-12-29 18:16:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(231,'2012-12-31 12:02:59','USER_LOGIN',1,'2012-12-31 13:02:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(232,'2013-01-02 20:32:51','USER_LOGIN',1,'2013-01-02 21:32:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0) Gecko/20100101 Firefox/17.0',NULL),(233,'2013-01-02 20:58:59','USER_LOGIN',1,'2013-01-02 21:58:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(234,'2013-01-03 09:25:07','USER_LOGIN',1,'2013-01-03 10:25:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(235,'2013-01-03 19:39:31','USER_LOGIN',1,'2013-01-03 20:39:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(236,'2013-01-04 22:40:19','USER_LOGIN',1,'2013-01-04 23:40:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(237,'2013-01-05 12:59:59','USER_LOGIN',1,'2013-01-05 13:59:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(238,'2013-01-05 15:28:52','USER_LOGIN',1,'2013-01-05 16:28:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(239,'2013-01-05 17:02:08','USER_LOGIN',1,'2013-01-05 18:02:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(240,'2013-01-06 12:13:33','USER_LOGIN',1,'2013-01-06 13:13:33',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(241,'2013-01-07 01:21:15','USER_LOGIN',1,'2013-01-07 02:21:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(242,'2013-01-07 01:46:31','USER_LOGOUT',1,'2013-01-07 02:46:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(243,'2013-01-07 19:54:50','USER_LOGIN',1,'2013-01-07 20:54:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(244,'2013-01-08 21:55:01','USER_LOGIN',1,'2013-01-08 22:55:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(245,'2013-01-09 11:13:28','USER_LOGIN',1,'2013-01-09 12:13:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(246,'2013-01-10 18:30:46','USER_LOGIN',1,'2013-01-10 19:30:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(247,'2013-01-11 18:03:26','USER_LOGIN',1,'2013-01-11 19:03:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(248,'2013-01-12 11:15:04','USER_LOGIN',1,'2013-01-12 12:15:04',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(249,'2013-01-12 14:42:44','USER_LOGIN',1,'2013-01-12 15:42:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(250,'2013-01-13 12:07:17','USER_LOGIN',1,'2013-01-13 13:07:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(251,'2013-01-13 17:37:58','USER_LOGIN',1,'2013-01-13 18:37:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(252,'2013-01-13 19:24:21','USER_LOGIN',1,'2013-01-13 20:24:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(253,'2013-01-13 19:29:19','USER_LOGOUT',1,'2013-01-13 20:29:19',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(254,'2013-01-13 21:39:39','USER_LOGIN',1,'2013-01-13 22:39:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(255,'2013-01-14 00:52:21','USER_LOGIN',1,'2013-01-14 01:52:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(256,'2013-01-16 11:34:31','USER_LOGIN',1,'2013-01-16 12:34:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(257,'2013-01-16 15:36:21','USER_LOGIN',1,'2013-01-16 16:36:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(258,'2013-01-16 19:17:36','USER_LOGIN',1,'2013-01-16 20:17:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(259,'2013-01-16 19:48:08','GROUP_CREATE',1,'2013-01-16 20:48:08',1,'Création groupe ggg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(260,'2013-01-16 21:48:53','USER_LOGIN',1,'2013-01-16 22:48:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(261,'2013-01-17 19:55:53','USER_LOGIN',1,'2013-01-17 20:55:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(262,'2013-01-18 09:48:01','USER_LOGIN',1,'2013-01-18 10:48:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(263,'2013-01-18 13:22:36','USER_LOGIN',1,'2013-01-18 14:22:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(264,'2013-01-18 16:10:23','USER_LOGIN',1,'2013-01-18 17:10:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(265,'2013-01-18 17:41:40','USER_LOGIN',1,'2013-01-18 18:41:40',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(266,'2013-01-19 14:33:48','USER_LOGIN',1,'2013-01-19 15:33:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(267,'2013-01-19 16:47:43','USER_LOGIN',1,'2013-01-19 17:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(268,'2013-01-19 16:59:43','USER_LOGIN',1,'2013-01-19 17:59:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(269,'2013-01-19 17:00:22','USER_LOGIN',1,'2013-01-19 18:00:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(270,'2013-01-19 17:04:16','USER_LOGOUT',1,'2013-01-19 18:04:16',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(271,'2013-01-19 17:04:18','USER_LOGIN',1,'2013-01-19 18:04:18',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(272,'2013-01-20 00:34:19','USER_LOGIN',1,'2013-01-20 01:34:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(273,'2013-01-21 11:54:17','USER_LOGIN',1,'2013-01-21 12:54:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(274,'2013-01-21 13:48:15','USER_LOGIN',1,'2013-01-21 14:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(275,'2013-01-21 14:30:22','USER_LOGIN',1,'2013-01-21 15:30:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(276,'2013-01-21 15:10:46','USER_LOGIN',1,'2013-01-21 16:10:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(277,'2013-01-21 17:27:43','USER_LOGIN',1,'2013-01-21 18:27:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(278,'2013-01-21 21:48:15','USER_LOGIN',1,'2013-01-21 22:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(279,'2013-01-21 21:50:42','USER_LOGIN',1,'2013-01-21 22:50:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(280,'2013-01-23 09:28:26','USER_LOGIN',1,'2013-01-23 10:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(281,'2013-01-23 13:21:57','USER_LOGIN',1,'2013-01-23 14:21:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(282,'2013-01-23 16:52:00','USER_LOGOUT',1,'2013-01-23 17:52:00',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(283,'2013-01-23 16:52:05','USER_LOGIN_FAILED',1,'2013-01-23 17:52:05',NULL,'Bad value for login or password - login=bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(284,'2013-01-23 16:52:09','USER_LOGIN',1,'2013-01-23 17:52:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(285,'2013-01-23 16:52:27','USER_CREATE',1,'2013-01-23 17:52:27',1,'Création utilisateur aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(286,'2013-01-23 16:52:27','USER_NEW_PASSWORD',1,'2013-01-23 17:52:27',1,'Changement mot de passe de aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(287,'2013-01-23 16:52:37','USER_CREATE',1,'2013-01-23 17:52:37',1,'Création utilisateur bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(288,'2013-01-23 16:52:37','USER_NEW_PASSWORD',1,'2013-01-23 17:52:37',1,'Changement mot de passe de bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(289,'2013-01-23 16:53:15','USER_LOGOUT',1,'2013-01-23 17:53:15',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(290,'2013-01-23 16:53:20','USER_LOGIN',1,'2013-01-23 17:53:20',4,'(UserLogged,aaa)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(291,'2013-01-23 19:16:58','USER_LOGIN',1,'2013-01-23 20:16:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(292,'2013-01-26 10:54:07','USER_LOGIN',1,'2013-01-26 11:54:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(293,'2013-01-29 10:15:36','USER_LOGIN',1,'2013-01-29 11:15:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(294,'2013-01-30 17:42:50','USER_LOGIN',1,'2013-01-30 18:42:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(295,'2013-02-01 08:49:55','USER_LOGIN',1,'2013-02-01 09:49:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(296,'2013-02-01 08:51:57','USER_LOGOUT',1,'2013-02-01 09:51:57',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(297,'2013-02-01 08:52:39','USER_LOGIN',1,'2013-02-01 09:52:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(298,'2013-02-01 21:03:01','USER_LOGIN',1,'2013-02-01 22:03:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(299,'2013-02-10 19:48:39','USER_LOGIN',1,'2013-02-10 20:48:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(300,'2013-02-10 20:46:48','USER_LOGIN',1,'2013-02-10 21:46:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(301,'2013-02-10 21:39:23','USER_LOGIN',1,'2013-02-10 22:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(302,'2013-02-11 19:00:13','USER_LOGIN',1,'2013-02-11 20:00:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(303,'2013-02-11 19:43:44','USER_LOGIN_FAILED',1,'2013-02-11 20:43:44',NULL,'Unknown column \'u.fk_user\' in \'field list\'','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(304,'2013-02-11 19:44:01','USER_LOGIN',1,'2013-02-11 20:44:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(305,'2013-02-12 00:27:35','USER_LOGIN',1,'2013-02-12 01:27:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(306,'2013-02-12 00:27:38','USER_LOGOUT',1,'2013-02-12 01:27:38',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(307,'2013-02-12 00:28:07','USER_LOGIN',1,'2013-02-12 01:28:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(308,'2013-02-12 00:28:09','USER_LOGOUT',1,'2013-02-12 01:28:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(309,'2013-02-12 00:28:26','USER_LOGIN',1,'2013-02-12 01:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(310,'2013-02-12 00:28:30','USER_LOGOUT',1,'2013-02-12 01:28:30',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(311,'2013-02-12 12:42:15','USER_LOGIN',1,'2013-02-12 13:42:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(312,'2013-02-12 13:46:16','USER_LOGIN',1,'2013-02-12 14:46:16',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(313,'2013-02-12 14:54:28','USER_LOGIN',1,'2013-02-12 15:54:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(314,'2013-02-12 16:04:46','USER_LOGIN',1,'2013-02-12 17:04:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(315,'2013-02-13 14:02:43','USER_LOGIN',1,'2013-02-13 15:02:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(316,'2013-02-13 14:48:30','USER_LOGIN',1,'2013-02-13 15:48:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(317,'2013-02-13 17:44:53','USER_LOGIN',1,'2013-02-13 18:44:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(318,'2013-02-15 08:44:36','USER_LOGIN',1,'2013-02-15 09:44:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(319,'2013-02-15 08:53:20','USER_LOGIN',1,'2013-02-15 09:53:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(320,'2013-02-16 19:10:28','USER_LOGIN',1,'2013-02-16 20:10:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(321,'2013-02-16 19:22:40','USER_CREATE',1,'2013-02-16 20:22:40',1,'Création utilisateur aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(322,'2013-02-16 19:22:40','USER_NEW_PASSWORD',1,'2013-02-16 20:22:40',1,'Changement mot de passe de aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(323,'2013-02-16 19:48:15','USER_CREATE',1,'2013-02-16 20:48:15',1,'Création utilisateur zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(324,'2013-02-16 19:48:15','USER_NEW_PASSWORD',1,'2013-02-16 20:48:15',1,'Changement mot de passe de zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(325,'2013-02-16 19:50:08','USER_CREATE',1,'2013-02-16 20:50:08',1,'Création utilisateur zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(326,'2013-02-16 19:50:08','USER_NEW_PASSWORD',1,'2013-02-16 20:50:08',1,'Changement mot de passe de zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(327,'2013-02-16 21:20:03','USER_LOGIN',1,'2013-02-16 22:20:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(328,'2013-02-17 14:30:51','USER_LOGIN',1,'2013-02-17 15:30:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(329,'2013-02-17 17:21:22','USER_LOGIN',1,'2013-02-17 18:21:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(330,'2013-02-17 17:48:43','USER_MODIFY',1,'2013-02-17 18:48:43',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(331,'2013-02-17 17:48:47','USER_MODIFY',1,'2013-02-17 18:48:47',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(332,'2013-02-17 17:48:51','USER_MODIFY',1,'2013-02-17 18:48:51',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(333,'2013-02-17 17:48:56','USER_MODIFY',1,'2013-02-17 18:48:56',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(334,'2013-02-18 22:00:01','USER_LOGIN',1,'2013-02-18 23:00:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(335,'2013-02-19 08:19:52','USER_LOGIN',1,'2013-02-19 09:19:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(336,'2013-02-19 22:00:52','USER_LOGIN',1,'2013-02-19 23:00:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(337,'2013-02-20 09:34:52','USER_LOGIN',1,'2013-02-20 10:34:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(338,'2013-02-20 13:12:28','USER_LOGIN',1,'2013-02-20 14:12:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(339,'2013-02-20 17:19:44','USER_LOGIN',1,'2013-02-20 18:19:44',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(340,'2013-02-20 19:07:21','USER_MODIFY',1,'2013-02-20 20:07:21',1,'Modification utilisateur adupont','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(341,'2013-02-20 19:47:17','USER_LOGIN',1,'2013-02-20 20:47:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(342,'2013-02-20 19:48:01','USER_MODIFY',1,'2013-02-20 20:48:01',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(343,'2013-02-21 08:27:07','USER_LOGIN',1,'2013-02-21 09:27:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(344,'2013-02-23 13:34:13','USER_LOGIN',1,'2013-02-23 14:34:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(345,'2013-02-24 01:06:41','USER_LOGIN_FAILED',1,'2013-02-24 02:06:41',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(346,'2013-02-24 01:06:45','USER_LOGIN_FAILED',1,'2013-02-24 02:06:45',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(347,'2013-02-24 01:06:55','USER_LOGIN_FAILED',1,'2013-02-24 02:06:55',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(348,'2013-02-24 01:07:03','USER_LOGIN_FAILED',1,'2013-02-24 02:07:03',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(349,'2013-02-24 01:07:21','USER_LOGIN_FAILED',1,'2013-02-24 02:07:21',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(350,'2013-02-24 01:08:12','USER_LOGIN_FAILED',1,'2013-02-24 02:08:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(351,'2013-02-24 01:08:42','USER_LOGIN_FAILED',1,'2013-02-24 02:08:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(352,'2013-02-24 01:08:50','USER_LOGIN_FAILED',1,'2013-02-24 02:08:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(353,'2013-02-24 01:09:08','USER_LOGIN_FAILED',1,'2013-02-24 02:09:08',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(354,'2013-02-24 01:09:42','USER_LOGIN_FAILED',1,'2013-02-24 02:09:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(355,'2013-02-24 01:09:50','USER_LOGIN_FAILED',1,'2013-02-24 02:09:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(356,'2013-02-24 01:10:05','USER_LOGIN_FAILED',1,'2013-02-24 02:10:05',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(357,'2013-02-24 01:10:22','USER_LOGIN_FAILED',1,'2013-02-24 02:10:22',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(358,'2013-02-24 01:10:30','USER_LOGIN_FAILED',1,'2013-02-24 02:10:30',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(359,'2013-02-24 01:10:56','USER_LOGIN_FAILED',1,'2013-02-24 02:10:56',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(360,'2013-02-24 01:11:26','USER_LOGIN_FAILED',1,'2013-02-24 02:11:26',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(361,'2013-02-24 01:12:06','USER_LOGIN_FAILED',1,'2013-02-24 02:12:06',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(362,'2013-02-24 01:21:14','USER_LOGIN_FAILED',1,'2013-02-24 02:21:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(363,'2013-02-24 01:21:25','USER_LOGIN_FAILED',1,'2013-02-24 02:21:25',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(364,'2013-02-24 01:21:54','USER_LOGIN_FAILED',1,'2013-02-24 02:21:54',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(365,'2013-02-24 01:22:14','USER_LOGIN_FAILED',1,'2013-02-24 02:22:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(366,'2013-02-24 01:22:37','USER_LOGIN_FAILED',1,'2013-02-24 02:22:37',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(367,'2013-02-24 01:23:01','USER_LOGIN_FAILED',1,'2013-02-24 02:23:01',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(368,'2013-02-24 01:23:39','USER_LOGIN_FAILED',1,'2013-02-24 02:23:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(369,'2013-02-24 01:24:04','USER_LOGIN_FAILED',1,'2013-02-24 02:24:04',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(370,'2013-02-24 01:24:39','USER_LOGIN_FAILED',1,'2013-02-24 02:24:39',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(371,'2013-02-24 01:25:01','USER_LOGIN_FAILED',1,'2013-02-24 02:25:01',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(372,'2013-02-24 01:25:12','USER_LOGIN_FAILED',1,'2013-02-24 02:25:12',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(373,'2013-02-24 01:27:30','USER_LOGIN_FAILED',1,'2013-02-24 02:27:30',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(374,'2013-02-24 01:28:00','USER_LOGIN_FAILED',1,'2013-02-24 02:28:00',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(375,'2013-02-24 01:28:35','USER_LOGIN_FAILED',1,'2013-02-24 02:28:35',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(376,'2013-02-24 01:29:03','USER_LOGIN_FAILED',1,'2013-02-24 02:29:03',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(377,'2013-02-24 01:29:55','USER_LOGIN_FAILED',1,'2013-02-24 02:29:55',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(378,'2013-02-24 01:32:40','USER_LOGIN_FAILED',1,'2013-02-24 02:32:40',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(379,'2013-02-24 01:39:33','USER_LOGIN_FAILED',1,'2013-02-24 02:39:33',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(380,'2013-02-24 01:39:38','USER_LOGIN_FAILED',1,'2013-02-24 02:39:38',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(381,'2013-02-24 01:39:47','USER_LOGIN_FAILED',1,'2013-02-24 02:39:47',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(382,'2013-02-24 01:40:54','USER_LOGIN_FAILED',1,'2013-02-24 02:40:54',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(383,'2013-02-24 01:47:57','USER_LOGIN_FAILED',1,'2013-02-24 02:47:57',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(384,'2013-02-24 01:48:05','USER_LOGIN_FAILED',1,'2013-02-24 02:48:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(385,'2013-02-24 01:48:07','USER_LOGIN_FAILED',1,'2013-02-24 02:48:07',NULL,'Unknown column \'u.lastname\' in \'field list\'','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(386,'2013-02-24 01:48:35','USER_LOGIN',1,'2013-02-24 02:48:35',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(387,'2013-02-24 01:56:32','USER_LOGIN',1,'2013-02-24 02:56:32',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(388,'2013-02-24 02:05:55','USER_LOGOUT',1,'2013-02-24 03:05:55',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(389,'2013-02-24 02:39:52','USER_LOGIN',1,'2013-02-24 03:39:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(390,'2013-02-24 02:51:10','USER_LOGOUT',1,'2013-02-24 03:51:10',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(391,'2013-02-24 12:46:41','USER_LOGIN',1,'2013-02-24 13:46:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(392,'2013-02-24 12:46:52','USER_LOGOUT',1,'2013-02-24 13:46:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(393,'2013-02-24 12:46:56','USER_LOGIN',1,'2013-02-24 13:46:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(394,'2013-02-24 12:47:56','USER_LOGOUT',1,'2013-02-24 13:47:56',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(395,'2013-02-24 12:48:00','USER_LOGIN',1,'2013-02-24 13:48:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(396,'2013-02-24 12:48:11','USER_LOGOUT',1,'2013-02-24 13:48:11',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(397,'2013-02-24 12:48:32','USER_LOGIN',1,'2013-02-24 13:48:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(398,'2013-02-24 12:52:22','USER_LOGOUT',1,'2013-02-24 13:52:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(399,'2013-02-24 12:52:27','USER_LOGIN',1,'2013-02-24 13:52:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(400,'2013-02-24 12:52:54','USER_LOGOUT',1,'2013-02-24 13:52:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(401,'2013-02-24 12:52:59','USER_LOGIN',1,'2013-02-24 13:52:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(402,'2013-02-24 12:55:39','USER_LOGOUT',1,'2013-02-24 13:55:39',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(403,'2013-02-24 12:55:59','USER_LOGIN',1,'2013-02-24 13:55:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(404,'2013-02-24 12:56:07','USER_LOGOUT',1,'2013-02-24 13:56:07',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(405,'2013-02-24 12:56:23','USER_LOGIN',1,'2013-02-24 13:56:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(406,'2013-02-24 12:56:46','USER_LOGOUT',1,'2013-02-24 13:56:46',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(407,'2013-02-24 12:58:30','USER_LOGIN',1,'2013-02-24 13:58:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(408,'2013-02-24 12:58:33','USER_LOGOUT',1,'2013-02-24 13:58:33',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(409,'2013-02-24 12:58:51','USER_LOGIN',1,'2013-02-24 13:58:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(410,'2013-02-24 12:58:58','USER_LOGOUT',1,'2013-02-24 13:58:58',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(411,'2013-02-24 13:18:53','USER_LOGIN',1,'2013-02-24 14:18:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(412,'2013-02-24 13:19:52','USER_LOGOUT',1,'2013-02-24 14:19:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(413,'2013-02-24 15:39:31','USER_LOGIN_FAILED',1,'2013-02-24 16:39:31',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1',NULL,NULL),(414,'2013-02-24 15:42:07','USER_LOGIN',1,'2013-02-24 16:42:07',1,'(UserLogged,admin)','127.0.0.1',NULL,NULL),(415,'2013-02-24 15:42:52','USER_LOGOUT',1,'2013-02-24 16:42:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(416,'2013-02-24 16:04:21','USER_LOGIN',1,'2013-02-24 17:04:21',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(417,'2013-02-24 16:11:28','USER_LOGIN_FAILED',1,'2013-02-24 17:11:28',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(418,'2013-02-24 16:11:37','USER_LOGIN',1,'2013-02-24 17:11:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(419,'2013-02-24 16:36:52','USER_LOGOUT',1,'2013-02-24 17:36:52',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(420,'2013-02-24 16:40:37','USER_LOGIN',1,'2013-02-24 17:40:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(421,'2013-02-24 16:57:16','USER_LOGIN',1,'2013-02-24 17:57:16',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(422,'2013-02-24 17:01:30','USER_LOGOUT',1,'2013-02-24 18:01:30',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(423,'2013-02-24 17:02:33','USER_LOGIN',1,'2013-02-24 18:02:33',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(424,'2013-02-24 17:14:22','USER_LOGOUT',1,'2013-02-24 18:14:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(425,'2013-02-24 17:15:07','USER_LOGIN_FAILED',1,'2013-02-24 18:15:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(426,'2013-02-24 17:15:20','USER_LOGIN',1,'2013-02-24 18:15:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(427,'2013-02-24 17:20:14','USER_LOGIN',1,'2013-02-24 18:20:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(428,'2013-02-24 17:20:51','USER_LOGIN',1,'2013-02-24 18:20:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(429,'2013-02-24 17:20:54','USER_LOGOUT',1,'2013-02-24 18:20:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(430,'2013-02-24 17:21:19','USER_LOGIN',1,'2013-02-24 18:21:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(431,'2013-02-24 17:32:35','USER_LOGIN',1,'2013-02-24 18:32:35',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(432,'2013-02-24 18:28:48','USER_LOGIN',1,'2013-02-24 19:28:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(433,'2013-02-24 18:29:27','USER_LOGOUT',1,'2013-02-24 19:29:27',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(434,'2013-02-24 18:29:32','USER_LOGIN',1,'2013-02-24 19:29:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(435,'2013-02-24 20:13:13','USER_LOGOUT',1,'2013-02-24 21:13:13',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(436,'2013-02-24 20:13:17','USER_LOGIN',1,'2013-02-24 21:13:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(437,'2013-02-25 08:57:16','USER_LOGIN',1,'2013-02-25 09:57:16',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(438,'2013-02-25 08:57:59','USER_LOGOUT',1,'2013-02-25 09:57:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(439,'2013-02-25 09:15:02','USER_LOGIN',1,'2013-02-25 10:15:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(440,'2013-02-25 09:15:50','USER_LOGOUT',1,'2013-02-25 10:15:50',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(441,'2013-02-25 09:15:57','USER_LOGIN',1,'2013-02-25 10:15:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(442,'2013-02-25 09:16:12','USER_LOGOUT',1,'2013-02-25 10:16:12',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(443,'2013-02-25 09:16:19','USER_LOGIN',1,'2013-02-25 10:16:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(444,'2013-02-25 09:16:25','USER_LOGOUT',1,'2013-02-25 10:16:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(445,'2013-02-25 09:16:39','USER_LOGIN_FAILED',1,'2013-02-25 10:16:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(446,'2013-02-25 09:16:42','USER_LOGIN_FAILED',1,'2013-02-25 10:16:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(447,'2013-02-25 09:16:54','USER_LOGIN_FAILED',1,'2013-02-25 10:16:54',NULL,'Identificadors d&#039;usuari o contrasenya incorrectes - login=gfdg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(448,'2013-02-25 09:17:53','USER_LOGIN',1,'2013-02-25 10:17:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(449,'2013-02-25 09:18:37','USER_LOGOUT',1,'2013-02-25 10:18:37',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(450,'2013-02-25 09:18:41','USER_LOGIN',1,'2013-02-25 10:18:41',4,'(UserLogged,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(451,'2013-02-25 09:18:47','USER_LOGOUT',1,'2013-02-25 10:18:47',4,'(UserLogoff,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(452,'2013-02-25 10:05:34','USER_LOGIN',1,'2013-02-25 11:05:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(453,'2013-02-26 21:51:40','USER_LOGIN',1,'2013-02-26 22:51:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(454,'2013-02-26 23:30:06','USER_LOGIN',1,'2013-02-27 00:30:06',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(455,'2013-02-27 14:13:11','USER_LOGIN',1,'2013-02-27 15:13:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(456,'2013-02-27 18:12:06','USER_LOGIN_FAILED',1,'2013-02-27 19:12:06',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(457,'2013-02-27 18:12:10','USER_LOGIN',1,'2013-02-27 19:12:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(458,'2013-02-27 20:20:08','USER_LOGIN',1,'2013-02-27 21:20:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(459,'2013-03-01 22:12:03','USER_LOGIN',1,'2013-03-01 23:12:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(460,'2013-03-02 11:45:50','USER_LOGIN',1,'2013-03-02 12:45:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(461,'2013-03-02 15:53:51','USER_LOGIN_FAILED',1,'2013-03-02 16:53:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(462,'2013-03-02 15:53:53','USER_LOGIN',1,'2013-03-02 16:53:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(463,'2013-03-02 18:32:32','USER_LOGIN',1,'2013-03-02 19:32:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(464,'2013-03-02 22:59:36','USER_LOGIN',1,'2013-03-02 23:59:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(465,'2013-03-03 16:26:26','USER_LOGIN',1,'2013-03-03 17:26:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(466,'2013-03-03 22:50:27','USER_LOGIN',1,'2013-03-03 23:50:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(467,'2013-03-04 08:29:27','USER_LOGIN',1,'2013-03-04 09:29:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(468,'2013-03-04 18:27:28','USER_LOGIN',1,'2013-03-04 19:27:28',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; NP06)',NULL),(469,'2013-03-04 19:27:23','USER_LOGIN',1,'2013-03-04 20:27:23',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',NULL),(470,'2013-03-04 19:35:14','USER_LOGIN',1,'2013-03-04 20:35:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(471,'2013-03-04 19:55:49','USER_LOGIN',1,'2013-03-04 20:55:49',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',NULL),(472,'2013-03-04 21:16:13','USER_LOGIN',1,'2013-03-04 22:16:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(473,'2013-03-05 10:17:30','USER_LOGIN',1,'2013-03-05 11:17:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(474,'2013-03-05 11:02:43','USER_LOGIN',1,'2013-03-05 12:02:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(475,'2013-03-05 23:14:39','USER_LOGIN',1,'2013-03-06 00:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(476,'2013-03-06 08:58:57','USER_LOGIN',1,'2013-03-06 09:58:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(477,'2013-03-06 14:29:40','USER_LOGIN',1,'2013-03-06 15:29:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(478,'2013-03-06 21:53:02','USER_LOGIN',1,'2013-03-06 22:53:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(479,'2013-03-07 21:14:39','USER_LOGIN',1,'2013-03-07 22:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(480,'2013-03-08 00:06:05','USER_LOGIN',1,'2013-03-08 01:06:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(481,'2013-03-08 01:38:13','USER_LOGIN',1,'2013-03-08 02:38:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(482,'2013-03-08 08:59:50','USER_LOGIN',1,'2013-03-08 09:59:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(483,'2013-03-09 12:08:51','USER_LOGIN',1,'2013-03-09 13:08:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(484,'2013-03-09 15:19:53','USER_LOGIN',1,'2013-03-09 16:19:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(495,'2013-03-09 18:06:21','USER_LOGIN',1,'2013-03-09 19:06:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(496,'2013-03-09 20:01:24','USER_LOGIN',1,'2013-03-09 21:01:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(497,'2013-03-09 23:36:45','USER_LOGIN',1,'2013-03-10 00:36:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(498,'2013-03-10 14:37:13','USER_LOGIN',1,'2013-03-10 15:37:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(499,'2013-03-10 17:54:12','USER_LOGIN',1,'2013-03-10 18:54:12',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(500,'2013-03-11 08:57:09','USER_LOGIN',1,'2013-03-11 09:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(501,'2013-03-11 22:05:13','USER_LOGIN',1,'2013-03-11 23:05:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(502,'2013-03-12 08:34:27','USER_LOGIN',1,'2013-03-12 09:34:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(503,'2013-03-13 09:11:02','USER_LOGIN',1,'2013-03-13 10:11:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(504,'2013-03-13 10:02:11','USER_LOGIN',1,'2013-03-13 11:02:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(505,'2013-03-13 13:20:58','USER_LOGIN',1,'2013-03-13 14:20:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(506,'2013-03-13 16:19:28','USER_LOGIN',1,'2013-03-13 17:19:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(507,'2013-03-13 18:34:30','USER_LOGIN',1,'2013-03-13 19:34:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(508,'2013-03-14 08:25:02','USER_LOGIN',1,'2013-03-14 09:25:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(509,'2013-03-14 19:15:22','USER_LOGIN',1,'2013-03-14 20:15:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(510,'2013-03-14 21:58:53','USER_LOGIN',1,'2013-03-14 22:58:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(511,'2013-03-14 21:58:59','USER_LOGOUT',1,'2013-03-14 22:58:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(512,'2013-03-14 21:59:07','USER_LOGIN',1,'2013-03-14 22:59:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(513,'2013-03-14 22:58:22','USER_LOGOUT',1,'2013-03-14 23:58:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(514,'2013-03-14 23:00:25','USER_LOGIN',1,'2013-03-15 00:00:25',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(515,'2013-03-16 12:14:28','USER_LOGIN',1,'2013-03-16 13:14:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(516,'2013-03-16 16:09:01','USER_LOGIN',1,'2013-03-16 17:09:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(517,'2013-03-16 16:57:11','USER_LOGIN',1,'2013-03-16 17:57:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(518,'2013-03-16 19:31:31','USER_LOGIN',1,'2013-03-16 20:31:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(519,'2013-03-17 17:44:39','USER_LOGIN',1,'2013-03-17 18:44:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(520,'2013-03-17 20:40:57','USER_LOGIN',1,'2013-03-17 21:40:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(521,'2013-03-17 23:14:05','USER_LOGIN',1,'2013-03-18 00:14:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(522,'2013-03-17 23:28:47','USER_LOGOUT',1,'2013-03-18 00:28:47',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(523,'2013-03-17 23:28:54','USER_LOGIN',1,'2013-03-18 00:28:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(524,'2013-03-18 17:37:30','USER_LOGIN',1,'2013-03-18 18:37:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(525,'2013-03-18 18:11:37','USER_LOGIN',1,'2013-03-18 19:11:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(526,'2013-03-19 08:35:08','USER_LOGIN',1,'2013-03-19 09:35:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(527,'2013-03-19 09:20:23','USER_LOGIN',1,'2013-03-19 10:20:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(528,'2013-03-20 13:17:13','USER_LOGIN',1,'2013-03-20 14:17:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(529,'2013-03-20 14:44:31','USER_LOGIN',1,'2013-03-20 15:44:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(530,'2013-03-20 18:24:25','USER_LOGIN',1,'2013-03-20 19:24:25',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(531,'2013-03-20 19:15:54','USER_LOGIN',1,'2013-03-20 20:15:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(532,'2013-03-21 18:40:47','USER_LOGIN',1,'2013-03-21 19:40:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(533,'2013-03-21 21:42:24','USER_LOGIN',1,'2013-03-21 22:42:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(534,'2013-03-22 08:39:23','USER_LOGIN',1,'2013-03-22 09:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(535,'2013-03-23 13:04:55','USER_LOGIN',1,'2013-03-23 14:04:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(536,'2013-03-23 15:47:43','USER_LOGIN',1,'2013-03-23 16:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(537,'2013-03-23 22:56:36','USER_LOGIN',1,'2013-03-23 23:56:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(538,'2013-03-24 01:22:32','USER_LOGIN',1,'2013-03-24 02:22:32',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(539,'2013-03-24 14:40:42','USER_LOGIN',1,'2013-03-24 15:40:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(540,'2013-03-24 15:30:26','USER_LOGOUT',1,'2013-03-24 16:30:26',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(541,'2013-03-24 15:30:29','USER_LOGIN',1,'2013-03-24 16:30:29',2,'(UserLogged,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(542,'2013-03-24 15:49:40','USER_LOGOUT',1,'2013-03-24 16:49:40',2,'(UserLogoff,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(543,'2013-03-24 15:49:48','USER_LOGIN',1,'2013-03-24 16:49:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(544,'2013-03-24 15:52:35','USER_MODIFY',1,'2013-03-24 16:52:35',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(545,'2013-03-24 15:52:52','USER_MODIFY',1,'2013-03-24 16:52:52',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(546,'2013-03-24 15:53:09','USER_MODIFY',1,'2013-03-24 16:53:09',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(547,'2013-03-24 15:53:23','USER_MODIFY',1,'2013-03-24 16:53:23',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(548,'2013-03-24 16:00:04','USER_MODIFY',1,'2013-03-24 17:00:04',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(549,'2013-03-24 16:01:50','USER_MODIFY',1,'2013-03-24 17:01:50',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(550,'2013-03-24 16:10:14','USER_MODIFY',1,'2013-03-24 17:10:14',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(551,'2013-03-24 16:55:13','USER_LOGIN',1,'2013-03-24 17:55:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(552,'2013-03-24 17:44:29','USER_LOGIN',1,'2013-03-24 18:44:29',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(553,'2013-09-08 23:06:26','USER_LOGIN',1,'2013-09-09 01:06:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36',NULL),(554,'2013-10-21 22:32:28','USER_LOGIN',1,'2013-10-22 00:32:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(555,'2013-10-21 22:32:48','USER_LOGIN',1,'2013-10-22 00:32:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(556,'2013-11-07 00:01:51','USER_LOGIN',1,'2013-11-07 01:01:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.114 Safari/537.36',NULL),(557,'2014-03-02 15:21:07','USER_LOGIN',1,'2014-03-02 16:21:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(558,'2014-03-02 15:36:53','USER_LOGIN',1,'2014-03-02 16:36:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(559,'2014-03-02 18:54:23','USER_LOGIN',1,'2014-03-02 19:54:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(560,'2014-03-02 19:11:17','USER_LOGIN',1,'2014-03-02 20:11:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(561,'2014-03-03 18:19:24','USER_LOGIN',1,'2014-03-03 19:19:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(562,'2014-12-21 12:51:38','USER_LOGIN',1,'2014-12-21 13:51:38',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(563,'2014-12-21 19:52:09','USER_LOGIN',1,'2014-12-21 20:52:09',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL);
+/*!40000 ALTER TABLE `llx_events` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expedition`
+--
+
+DROP TABLE IF EXISTS `llx_expedition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expedition` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_customer` varchar(30) DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `ref_ext` varchar(30) DEFAULT NULL,
+  `ref_int` varchar(30) DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_expedition` datetime DEFAULT NULL,
+  `date_delivery` datetime DEFAULT NULL,
+  `fk_address` int(11) DEFAULT NULL,
+  `fk_shipping_method` int(11) DEFAULT NULL,
+  `tracking_number` varchar(50) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `height` float DEFAULT NULL,
+  `height_unit` int(11) DEFAULT NULL,
+  `width` float DEFAULT NULL,
+  `size_units` int(11) DEFAULT NULL,
+  `size` float DEFAULT NULL,
+  `weight_units` int(11) DEFAULT NULL,
+  `weight` float DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_expedition_uk_ref` (`ref`,`entity`),
+  KEY `idx_expedition_fk_soc` (`fk_soc`),
+  KEY `idx_expedition_fk_user_author` (`fk_user_author`),
+  KEY `idx_expedition_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_expedition_fk_shipping_method` (`fk_shipping_method`),
+  CONSTRAINT `fk_expedition_fk_shipping_method` FOREIGN KEY (`fk_shipping_method`) REFERENCES `llx_c_shipment_mode` (`rowid`),
+  CONSTRAINT `fk_expedition_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_expedition_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_expedition_fk_user_valid` FOREIGN KEY (`fk_user_valid`) 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_expedition`
+--
+
+LOCK TABLES `llx_expedition` WRITE;
+/*!40000 ALTER TABLE `llx_expedition` DISABLE KEYS */;
+INSERT INTO `llx_expedition` VALUES (1,'2013-02-17 17:22:51','SH1302-0001',1,NULL,1,NULL,NULL,'2011-08-08 03:05:34',1,'2013-02-17 18:22:51',1,NULL,'2011-08-09 00:00:00',NULL,NULL,'',1,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL),(2,'2013-02-17 17:38:47','SH1302-0002',1,'gfdf',18,NULL,NULL,'2013-02-17 18:38:37',1,'2013-02-17 18:38:47',1,NULL,NULL,NULL,NULL,'',1,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_expedition` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expedition_methode`
+--
+
+DROP TABLE IF EXISTS `llx_expedition_methode`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expedition_methode` (
+  `rowid` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `code` varchar(30) NOT NULL,
+  `libelle` varchar(50) NOT NULL,
+  `description` text,
+  `active` tinyint(4) DEFAULT '0',
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expedition_methode`
+--
+
+LOCK TABLES `llx_expedition_methode` WRITE;
+/*!40000 ALTER TABLE `llx_expedition_methode` DISABLE KEYS */;
+INSERT INTO `llx_expedition_methode` VALUES (1,'2010-07-08 11:18:00','CATCH','Catch','Catch by client',1),(2,'2010-07-08 11:18:00','TRANS','Transporter','Generic transporter',1),(3,'2010-07-08 11:18:01','COLSUI','Colissimo Suivi','Colissimo Suivi',0);
+/*!40000 ALTER TABLE `llx_expedition_methode` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expeditiondet`
+--
+
+DROP TABLE IF EXISTS `llx_expeditiondet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expeditiondet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_expedition` int(11) NOT NULL,
+  `fk_origin_line` int(11) DEFAULT NULL,
+  `fk_entrepot` int(11) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_expeditiondet_fk_expedition` (`fk_expedition`),
+  CONSTRAINT `fk_expeditiondet_fk_expedition` FOREIGN KEY (`fk_expedition`) REFERENCES `llx_expedition` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expeditiondet`
+--
+
+LOCK TABLES `llx_expeditiondet` WRITE;
+/*!40000 ALTER TABLE `llx_expeditiondet` DISABLE KEYS */;
+INSERT INTO `llx_expeditiondet` VALUES (1,1,10,3,1,0),(2,2,13,NULL,1,0),(3,2,16,NULL,1,0),(4,2,17,NULL,1,0);
+/*!40000 ALTER TABLE `llx_expeditiondet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_expeditiondet_batch`
+--
+
+DROP TABLE IF EXISTS `llx_expeditiondet_batch`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_expeditiondet_batch` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_expeditiondet` int(11) NOT NULL,
+  `eatby` date DEFAULT NULL,
+  `sellby` date DEFAULT NULL,
+  `batch` varchar(30) DEFAULT NULL,
+  `qty` double NOT NULL DEFAULT '0',
+  `fk_origin_stock` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fk_expeditiondet` (`fk_expeditiondet`),
+  CONSTRAINT `fk_expeditiondet_batch_fk_expeditiondet` FOREIGN KEY (`fk_expeditiondet`) REFERENCES `llx_expeditiondet` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_expeditiondet_batch`
+--
+
+LOCK TABLES `llx_expeditiondet_batch` WRITE;
+/*!40000 ALTER TABLE `llx_expeditiondet_batch` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_expeditiondet_batch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_export_compta`
+--
+
+DROP TABLE IF EXISTS `llx_export_compta`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_export_compta` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(12) NOT NULL,
+  `date_export` datetime NOT NULL,
+  `fk_user` int(11) NOT NULL,
+  `note` text,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_export_compta`
+--
+
+LOCK TABLES `llx_export_compta` WRITE;
+/*!40000 ALTER TABLE `llx_export_compta` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_export_compta` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_export_model`
+--
+
+DROP TABLE IF EXISTS `llx_export_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_export_model` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL DEFAULT '0',
+  `label` varchar(50) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `field` text NOT NULL,
+  `filter` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_export_model` (`label`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_export_model`
+--
+
+LOCK TABLES `llx_export_model` WRITE;
+/*!40000 ALTER TABLE `llx_export_model` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_export_model` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `elementtype` varchar(64) NOT NULL DEFAULT 'member',
+  `name` varchar(64) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `label` varchar(255) NOT NULL,
+  `type` varchar(8) DEFAULT NULL,
+  `size` varchar(8) DEFAULT NULL,
+  `pos` int(11) DEFAULT '0',
+  `alwayseditable` int(11) DEFAULT '0',
+  `param` text,
+  `fieldunique` int(11) DEFAULT '0',
+  `fieldrequired` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_extrafields_name` (`name`,`entity`,`elementtype`)
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_extrafields`
+--
+
+LOCK TABLES `llx_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_extrafields` DISABLE KEYS */;
+INSERT INTO `llx_extrafields` VALUES (2,'adherent','zzz',1,'2013-09-08 23:04:20','zzz','varchar','255',0,0,NULL,0,0),(22,'societe','jjjj',1,'2013-09-08 23:04:20','jjj','varchar','255',0,0,NULL,0,0);
+/*!40000 ALTER TABLE `llx_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture`
+--
+
+DROP TABLE IF EXISTS `llx_facture`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `facnumber` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `ref_int` varchar(255) DEFAULT NULL,
+  `type` smallint(6) NOT NULL DEFAULT '0',
+  `ref_client` varchar(255) DEFAULT NULL,
+  `increment` varchar(10) DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `datef` date DEFAULT NULL,
+  `date_valid` date DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `paye` smallint(6) NOT NULL DEFAULT '0',
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `remise_percent` double DEFAULT '0',
+  `remise_absolue` double DEFAULT '0',
+  `remise` double DEFAULT '0',
+  `close_code` varchar(16) DEFAULT NULL,
+  `close_note` varchar(128) DEFAULT NULL,
+  `tva` double(24,8) DEFAULT '0.00000000',
+  `localtax1` double(24,8) DEFAULT '0.00000000',
+  `localtax2` double(24,8) DEFAULT '0.00000000',
+  `revenuestamp` double(24,8) DEFAULT '0.00000000',
+  `total` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_facture_source` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_currency` varchar(3) DEFAULT NULL,
+  `fk_cond_reglement` int(11) NOT NULL DEFAULT '1',
+  `fk_mode_reglement` int(11) DEFAULT NULL,
+  `date_lim_reglement` date DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_facture_uk_facnumber` (`facnumber`,`entity`),
+  KEY `idx_facture_fk_soc` (`fk_soc`),
+  KEY `idx_facture_fk_user_author` (`fk_user_author`),
+  KEY `idx_facture_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_facture_fk_facture_source` (`fk_facture_source`),
+  KEY `idx_facture_fk_projet` (`fk_projet`),
+  KEY `idx_facture_fk_account` (`fk_account`),
+  KEY `idx_facture_fk_currency` (`fk_currency`),
+  CONSTRAINT `fk_facture_fk_facture_source` FOREIGN KEY (`fk_facture_source`) REFERENCES `llx_facture` (`rowid`),
+  CONSTRAINT `fk_facture_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_facture_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_facture_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_facture_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=214 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture`
+--
+
+LOCK TABLES `llx_facture` WRITE;
+/*!40000 ALTER TABLE `llx_facture` DISABLE KEYS */;
+INSERT INTO `llx_facture` VALUES (1,'FA1007-0001',1,NULL,NULL,0,NULL,NULL,9,'2010-07-10 14:55:26','2010-07-10',NULL,'2011-07-20 11:18:39',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.02000000,0.02000000,1,1,NULL,1,NULL,1,NULL,NULL,1,0,'2010-07-10',NULL,NULL,'crabe',NULL,NULL),(2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2010-07-10 18:20:13','2010-07-10',NULL,'2011-08-08 00:54:05',1,10.00000000,NULL,NULL,0,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2010-07-10',NULL,NULL,'crabe',NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2011-07-18 20:33:35','2011-07-18',NULL,'2012-12-08 16:39:01',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,1,NULL,NULL,1,0,'2011-07-18',NULL,NULL,'crabe',NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2011-08-01 03:34:11','2011-08-01',NULL,'2011-08-01 01:34:11',1,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,6,'2011-08-01',NULL,NULL,'',NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2011-08-06 20:33:53','2011-08-06',NULL,'2011-08-06 18:35:13',1,0.00000000,NULL,NULL,0,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,4,'2011-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2011-08-08 02:41:44','2011-08-08',NULL,'2011-08-08 00:53:40',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2011-08-08',NULL,NULL,'crabe',NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2011-08-08 02:55:14','2011-08-08',NULL,'2011-08-08 00:55:26',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2011-08-08',NULL,NULL,'crabe',NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2012-12-08 17:45:20','2012-12-08','2012-12-08','2012-12-08 16:57:11',0,0.00000000,NULL,NULL,0,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,3,NULL,NULL,NULL,0,0,'2012-12-08',NULL,NULL,'crabe',NULL,NULL),(11,'FA1212-0008',1,NULL,NULL,0,NULL,NULL,10,'2012-12-08 17:58:13','2012-12-08','2012-12-08','2012-12-08 16:58:27',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-08',NULL,NULL,'crabe',NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2012-12-08 18:20:14','2012-12-08','2012-12-08','2012-12-09 17:35:07',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,3,NULL,NULL,NULL,0,0,'2012-12-08',NULL,NULL,'crabe',NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2012-12-09 20:04:19','2012-12-09','2013-02-12','2013-02-12 14:54:37',0,0.00000000,NULL,NULL,0,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-09',NULL,NULL,'crabe',NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:34:23','2012-12-11','2013-03-24','2013-03-24 14:54:00',0,0.00000000,NULL,NULL,0,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:34:23','2012-12-11','2014-03-03','2014-03-03 18:20:25',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:35:51','2012-12-11','2012-12-12','2012-12-12 17:54:19',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(56,'(PROV56)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:35:52','2012-12-11',NULL,'2012-12-11 08:35:52',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(78,'(PROV78)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:36:41','2012-12-11',NULL,'2012-12-11 08:36:41',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(79,'(PROV79)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-11 09:36:41','2012-12-11',NULL,'2012-12-19 16:56:16',0,0.00000000,NULL,NULL,0,NULL,NULL,7.60000000,0.66000000,-3.00000000,0.00000000,50.00000000,55.26000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-11','This is a comment (private)','This is a comment (public)','',NULL,NULL),(121,'(PROV121)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:39:38','2012-12-19',NULL,'2012-12-19 17:39:38',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','',NULL,NULL),(122,'(PROV122)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:39:38','2012-12-19',NULL,'2012-12-19 17:39:38',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','',NULL,NULL),(146,'(PROV146)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:48:41','2012-12-19',NULL,'2013-01-18 14:51:01',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL),(147,'(PROV147)',1,NULL,NULL,0,NULL,NULL,1,'2012-12-19 18:48:42','2012-12-19',NULL,'2012-12-19 17:48:42',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2012-12-19','This is a comment (private)','This is a comment (public)','',NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:22:48','2013-01-19','2013-01-19','2013-01-19 17:22:48',0,0.00000000,NULL,NULL,0,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,0,1,'2013-01-19',NULL,NULL,'',NULL,NULL),(149,'(PROV149)',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:30:05','2013-01-19',NULL,'2013-02-13 14:02:53',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2013-01-19',NULL,NULL,'crabe',NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:31:10','2013-01-19','2013-01-19','2013-01-19 17:31:10',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,1,'2013-01-19',NULL,NULL,'',NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2013-01-19 18:31:58','2013-01-19','2013-01-19','2013-01-19 17:31:58',1,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,0,1,'2013-01-19',NULL,NULL,'',NULL,NULL),(152,'FA1302-0012',1,NULL,NULL,0,NULL,NULL,18,'2013-02-17 16:26:53','2013-02-17','2013-02-17','2013-02-17 15:27:00',0,0.00000000,NULL,NULL,0,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(153,'(PROV153)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:22:24','2013-02-17',NULL,'2013-02-17 17:22:24',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(154,'(PROV154)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:24:21','2013-02-17',NULL,'2013-02-17 17:24:21',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(155,'(PROV155)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:30:30','2013-02-17',NULL,'2013-02-17 17:30:30',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(156,'(PROV156)',1,NULL,NULL,0,NULL,NULL,1,'2013-02-17 18:37:01','2013-02-17',NULL,'2013-02-17 17:37:01',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(157,'FA1302-0022',1,NULL,NULL,0,NULL,NULL,18,'2013-02-17 18:39:23','2013-02-17','2014-03-02','2014-03-02 16:24:04',0,0.00000000,NULL,NULL,0,NULL,NULL,3.22000000,0.00000000,0.00000000,0.00000000,20.00000000,23.22000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-02-17',NULL,NULL,'crabe',NULL,NULL),(158,'FA1307-0013',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:43:37','2013-07-18','2013-03-23','2013-03-23 17:23:03',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-07-18',NULL,NULL,'crabe',NULL,NULL),(159,'FA1407-0014',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:44:12','2014-07-18','2013-03-06','2013-03-06 15:44:12',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,11.00000000,11.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2014-07-18',NULL,NULL,'',NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:47:48','2015-07-18','2013-03-06','2013-03-06 15:47:48',0,0.00000000,NULL,NULL,0,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2015-07-18',NULL,NULL,'',NULL,NULL),(161,'FA1607-0016',1,NULL,NULL,0,NULL,NULL,12,'2013-03-06 16:48:16','2016-07-18','2013-03-06','2013-03-06 15:48:16',0,0.00000000,NULL,NULL,0,NULL,NULL,2.22000000,0.00000000,0.00000000,0.00000000,17.78000000,20.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2016-07-18',NULL,NULL,'',NULL,NULL),(162,'(PROV162)',1,NULL,NULL,0,'fdfs',NULL,23,'2013-03-08 10:02:54','2013-03-08',NULL,'2013-03-08 09:02:54',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,5.00000000,5.00000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-08',NULL,NULL,'crabe',NULL,NULL),(184,'(PROV184)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:19:36','2013-03-09',NULL,'2013-03-09 17:19:36',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(185,'(PROV185)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:19:36','2013-03-09',NULL,'2013-03-09 17:19:36',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(186,'(PROV186)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:26:56','2013-03-09',NULL,'2013-03-09 17:26:56',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(187,'(PROV187)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:26:56','2013-03-09',NULL,'2013-03-09 17:26:56',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(206,'(PROV206)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:34:05','2013-03-09',NULL,'2013-03-09 17:34:05',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','',NULL,NULL),(207,'(PROV207)',1,NULL,NULL,0,NULL,NULL,1,'2013-03-09 18:34:05','2013-03-09',NULL,'2013-03-10 14:45:36',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2013-03-09','This is a comment (private)','This is a comment (public)','generic_invoice_odt:/var/www/dolibarrnew/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL),(208,'FA1303-0017',1,NULL,NULL,0,NULL,NULL,26,'2013-03-10 15:58:11','2013-03-10','2013-03-10','2013-03-10 14:58:34',0,0.00000000,NULL,NULL,0,NULL,NULL,1.25000000,0.00000000,0.00000000,0.00000000,10.00000000,11.25000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-03-10',NULL,NULL,'generic_invoice_odt:/var/www/dolibarrnew/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL),(209,'FA1303-0018',1,NULL,NULL,0,NULL,NULL,19,'2013-03-19 09:37:51','2013-03-19','2013-03-19','2013-03-19 08:38:10',0,0.00000000,NULL,NULL,0,NULL,NULL,-1.25000000,0.00000000,0.00000000,0.00000000,10.00000000,8.75000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-03-19',NULL,NULL,'crabe',NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2013-03-20 14:30:11','2011-07-10','2013-03-20','2013-03-20 13:30:11',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2011-07-10',NULL,NULL,'',NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2013-03-22 09:40:10','2013-03-22','2014-03-02','2014-03-02 19:13:39',0,0.00000000,NULL,NULL,0,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,1,0,'2013-03-22',NULL,NULL,'crabe',NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2014-03-03 19:22:03','2013-03-03','2014-03-03','2014-03-03 18:22:16',0,0.00000000,NULL,NULL,0,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,32,NULL,NULL,NULL,0,0,'2013-03-03',NULL,NULL,'crabe',NULL,NULL);
+/*!40000 ALTER TABLE `llx_facture` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facture_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_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_facture_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_extrafields`
+--
+
+LOCK TABLES `llx_facture_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facture_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(255) DEFAULT NULL,
+  `ref_supplier` varchar(255) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `type` smallint(6) NOT NULL DEFAULT '0',
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `datef` date DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `libelle` varchar(255) DEFAULT NULL,
+  `paye` smallint(6) NOT NULL DEFAULT '0',
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `remise` double(24,8) DEFAULT '0.00000000',
+  `close_code` varchar(16) DEFAULT NULL,
+  `close_note` varchar(128) DEFAULT NULL,
+  `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',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `total_tva` double(24,8) DEFAULT '0.00000000',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `fk_statut` smallint(6) NOT NULL DEFAULT '0',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_facture_source` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_cond_reglement` int(11) DEFAULT NULL,
+  `fk_mode_reglement` int(11) DEFAULT NULL,
+  `date_lim_reglement` date DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_facture_fourn_ref_supplier` (`ref_supplier`,`fk_soc`,`entity`),
+  UNIQUE KEY `uk_facture_fourn_ref` (`ref`,`entity`),
+  KEY `idx_facture_fourn_date_lim_reglement` (`date_lim_reglement`),
+  KEY `idx_facture_fourn_fk_soc` (`fk_soc`),
+  KEY `idx_facture_fourn_fk_user_author` (`fk_user_author`),
+  KEY `idx_facture_fourn_fk_user_valid` (`fk_user_valid`),
+  KEY `idx_facture_fourn_fk_projet` (`fk_projet`),
+  CONSTRAINT `fk_facture_fourn_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn`
+--
+
+LOCK TABLES `llx_facture_fourn` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn` DISABLE KEYS */;
+INSERT INTO `llx_facture_fourn` VALUES (1,NULL,'aaa',1,NULL,0,17,'2011-08-04 22:21:18','2011-08-04','2012-12-09 19:03:52','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,16.00000000,3.14000000,19.14000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL),(16,NULL,'FR70813',1,NULL,0,1,'2012-12-19 15:24:11','2003-04-11','2013-02-10 20:55:42','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,1,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL),(17,NULL,'FR81385',1,NULL,0,1,'2013-02-13 17:19:35','2003-06-04','2013-02-13 16:19:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL),(18,NULL,'FR81385',1,NULL,0,2,'2013-02-13 17:20:25','2003-06-04','2013-02-13 16:20:25','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL),(19,NULL,'FR813852',1,NULL,0,2,'2013-03-16 17:59:02','2013-03-16','2013-03-16 16:59:11','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_facture_fourn` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn_det`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_det`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_det` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture_fourn` int(11) NOT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `ref` varchar(50) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `pu_ht` double(24,8) DEFAULT NULL,
+  `pu_ttc` double(24,8) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT '0',
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `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',
+  `total_ht` double(24,8) DEFAULT NULL,
+  `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) NOT NULL DEFAULT '0',
+  `import_key` varchar(14) DEFAULT NULL,
+  `fk_code_ventilation` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_facture_fourn_det_fk_facture` (`fk_facture_fourn`),
+  CONSTRAINT `fk_facture_fourn_det_fk_facture` FOREIGN KEY (`fk_facture_fourn`) REFERENCES `llx_facture_fourn` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn_det`
+--
+
+LOCK TABLES `llx_facture_fourn_det` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_det` DISABLE KEYS */;
+INSERT INTO `llx_facture_fourn_det` VALUES (1,1,NULL,NULL,NULL,'aaa',10.00000000,11.96000000,1.6,0,19.600,0.000,'',0.000,'',16.00000000,3.14000000,0.00000000,0.00000000,19.14000000,0,NULL,NULL,0,NULL,0),(44,16,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/04/2003 &agrave; 11/10/2003',414.00000000,495.14400000,1,0,19.600,0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,0),(45,16,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/10/2003 &agrave; 11/04/2004',414.00000000,495.14400000,1,0,19.600,0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,0),(46,16,NULL,NULL,NULL,'<strong>ref :sd.installation.annuel</strong><br>Frais de mise en service d\'un serveur dédié pour un paiement annuel<br>',1.00000000,1.19600000,1,0,19.600,0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(47,17,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(48,17,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0),(49,18,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(50,18,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0),(51,19,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,19.600,0.000,'0',0.000,'0',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0),(52,19,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,19.600,0.000,'0',0.000,'0',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0);
+/*!40000 ALTER TABLE `llx_facture_fourn_det` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_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_facture_fourn_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn_extrafields`
+--
+
+LOCK TABLES `llx_facture_fourn_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_fourn_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_rec`
+--
+
+DROP TABLE IF EXISTS `llx_facture_rec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_rec` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `titre` varchar(50) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `amount` double(24,8) NOT NULL DEFAULT '0.00000000',
+  `remise` double DEFAULT '0',
+  `remise_percent` double DEFAULT '0',
+  `remise_absolue` double DEFAULT '0',
+  `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',
+  `total_ttc` double(24,8) DEFAULT '0.00000000',
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_cond_reglement` int(11) DEFAULT '0',
+  `fk_mode_reglement` int(11) DEFAULT '0',
+  `date_lim_reglement` date DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `last_gen` varchar(7) DEFAULT NULL,
+  `unit_frequency` varchar(2) DEFAULT 'd',
+  `date_when` datetime DEFAULT NULL,
+  `date_last_gen` datetime DEFAULT NULL,
+  `nb_gen_done` int(11) DEFAULT NULL,
+  `nb_gen_max` int(11) DEFAULT NULL,
+  `frequency` int(11) DEFAULT NULL,
+  `usenewprice` int(11) DEFAULT '0',
+  `revenuestamp` double(24,8) DEFAULT '0.00000000',
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_facture_rec_uk_titre` (`titre`,`entity`),
+  KEY `idx_facture_rec_fk_soc` (`fk_soc`),
+  KEY `idx_facture_rec_fk_user_author` (`fk_user_author`),
+  KEY `idx_facture_rec_fk_projet` (`fk_projet`),
+  CONSTRAINT `fk_facture_rec_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_facture_rec_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_facture_rec_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_rec`
+--
+
+LOCK TABLES `llx_facture_rec` WRITE;
+/*!40000 ALTER TABLE `llx_facture_rec` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_rec` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturedet`
+--
+
+DROP TABLE IF EXISTS `llx_facturedet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturedet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture` int(11) NOT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `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',
+  `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_product_fournisseur_price` int(11) DEFAULT NULL,
+  `buy_price_ht` double(24,8) DEFAULT '0.00000000',
+  `fk_code_ventilation` int(11) NOT NULL DEFAULT '0',
+  `special_code` int(10) unsigned 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_facture`),
+  KEY `idx_facturedet_fk_facture` (`fk_facture`),
+  KEY `idx_facturedet_fk_product` (`fk_product`),
+  CONSTRAINT `fk_facturedet_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1027 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturedet`
+--
+
+LOCK TABLES `llx_facturedet` WRITE;
+/*!40000 ALTER TABLE `llx_facturedet` DISABLE KEYS */;
+INSERT INTO `llx_facturedet` VALUES (1,1,NULL,4,NULL,'',0.000,0.000,'',0.000,'',2,0,0,NULL,0.01000000,0.01000000,0.02000000,0.00000000,0.00000000,0.00000000,0.02000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(3,2,NULL,3,NULL,'Service S1',0.000,0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2010-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2010-07-10 00:00:00','2011-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(12,3,NULL,NULL,NULL,'dfdfd',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(13,5,NULL,4,NULL,'Decapsuleur',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(14,6,NULL,4,NULL,'Decapsuleur',19.600,0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(21,8,NULL,NULL,NULL,'dddd',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(22,9,NULL,NULL,NULL,'ggg',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(23,10,NULL,4,NULL,'',12.500,0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,0,0,1,NULL),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL),(25,11,NULL,4,NULL,'jljk',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(137,33,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(138,33,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(256,55,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(257,55,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(258,56,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(259,56,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(377,78,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(378,78,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(385,79,NULL,NULL,NULL,'hfghfg',10.000,1.400,'',-15.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.00000000,0.14000000,-1.50000000,9.64000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(386,79,NULL,NULL,NULL,'gdfg',15.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.50000000,0.00000000,0.00000000,11.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(387,79,NULL,NULL,NULL,'fdsf',21.000,5.200,'',-15.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,2.10000000,0.52000000,-1.50000000,11.12000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL),(388,79,NULL,NULL,NULL,'ghfgh',15.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.50000000,0.00000000,0.00000000,11.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL),(389,79,NULL,NULL,NULL,'ghfgh',15.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.50000000,0.00000000,0.00000000,11.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL),(618,121,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(619,121,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(620,122,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(621,122,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(749,146,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(750,146,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(751,147,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(752,147,NULL,NULL,NULL,'Desc',10.000,0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL),(754,148,NULL,11,NULL,'hfghf',0.000,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(755,148,NULL,4,NULL,'Decapsuleur',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(756,149,NULL,5,NULL,'aaaa',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(757,150,NULL,2,NULL,'Product P1',12.500,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(758,151,NULL,2,NULL,'Product P1',12.500,0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(759,152,NULL,NULL,NULL,'gdfgfd',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(760,153,NULL,NULL,NULL,'gfdgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(761,154,NULL,NULL,NULL,'',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(762,155,NULL,NULL,NULL,'',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(763,156,NULL,NULL,NULL,'gfdgdf',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(764,157,NULL,NULL,NULL,'gfdg',19.600,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(765,157,NULL,4,NULL,'Decapsuleur',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(766,157,NULL,4,NULL,'eeee',12.500,0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(768,32,NULL,NULL,NULL,'mlml',18.000,0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL),(769,32,NULL,NULL,NULL,'mlkml',18.000,0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL),(770,158,NULL,NULL,NULL,'Adhésion/cotisation 2013',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-18 00:00:00','2014-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(771,159,NULL,NULL,NULL,'Adhésion/cotisation 2014',0.000,0.000,'',0.000,'',1,0,0,NULL,11.00000000,NULL,11.00000000,0.00000000,0.00000000,0.00000000,11.00000000,1,'2014-07-18 00:00:00','2015-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2015-07-18 00:00:00','2016-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(773,161,NULL,NULL,NULL,'Adhésion/cotisation 2016',12.500,0.000,'',0.000,'',1,0,0,NULL,17.77778000,NULL,17.78000000,2.22000000,0.00000000,0.00000000,20.00000000,1,'2016-07-18 00:00:00','2017-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(774,162,NULL,NULL,NULL,'fdsfs',0.000,0.000,'',0.000,'',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL),(775,162,NULL,NULL,NULL,'fsdfsf',0.000,0.000,'',0.000,'',1,0,0,1,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,2,NULL,0.00000000,0,0,1,NULL),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL),(779,32,NULL,NULL,NULL,'fsdfds',0.000,0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL),(780,32,NULL,NULL,NULL,'ffsdf',0.000,0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL),(781,162,NULL,NULL,NULL,'hh',0.000,0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,2,NULL),(899,184,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(900,184,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(901,185,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(902,185,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(903,186,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(904,186,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(905,187,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(906,187,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1014,206,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1015,206,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1016,207,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1017,207,NULL,NULL,NULL,'Desc',10.000,0.000,'0',0.000,'0',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1018,208,NULL,NULL,NULL,'ggdfg',12.500,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.25000000,0.00000000,0.00000000,11.25000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1019,209,NULL,NULL,NULL,'hfghgf',12.500,0.000,'0',0.000,'0',1,0,0,2,-10.00000000,NULL,-10.00000000,-1.25000000,0.00000000,0.00000000,-11.25000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL),(1020,209,NULL,NULL,NULL,'fsdfsd',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL),(1021,209,NULL,NULL,NULL,'hfg',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2011-07-10 00:00:00','2012-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL);
+/*!40000 ALTER TABLE `llx_facturedet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturedet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facturedet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturedet_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_facturedet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facturedet_extrafields`
+--
+
+LOCK TABLES `llx_facturedet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facturedet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturedet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facturedet_rec`
+--
+
+DROP TABLE IF EXISTS `llx_facturedet_rec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facturedet_rec` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture` int(11) NOT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `product_type` int(11) DEFAULT '0',
+  `label` varchar(255) DEFAULT NULL,
+  `description` text,
+  `tva_tx` double(6,3) DEFAULT NULL,
+  `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',
+  `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,
+  `info_bits` int(11) DEFAULT '0',
+  `special_code` int(10) unsigned DEFAULT '0',
+  `rang` int(11) DEFAULT '0',
+  `fk_contract_line` 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_facturedet_rec`
+--
+
+LOCK TABLES `llx_facturedet_rec` WRITE;
+/*!40000 ALTER TABLE `llx_facturedet_rec` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facturedet_rec` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinter`
+--
+
+DROP TABLE IF EXISTS `llx_fichinter`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinter` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_soc` int(11) NOT NULL,
+  `fk_projet` int(11) DEFAULT '0',
+  `fk_contrat` int(11) DEFAULT '0',
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `datec` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `datei` date DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `duree` double DEFAULT NULL,
+  `description` text,
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
+  `ref_ext` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_fichinter_ref` (`ref`,`entity`),
+  KEY `idx_fichinter_fk_soc` (`fk_soc`),
+  CONSTRAINT `fk_fichinter_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinter`
+--
+
+LOCK TABLES `llx_fichinter` WRITE;
+/*!40000 ALTER TABLE `llx_fichinter` DISABLE KEYS */;
+INSERT INTO `llx_fichinter` VALUES (1,2,1,0,'FI1007-0001',1,'2010-07-08 23:51:54','2010-07-09 01:42:41','2010-07-09 01:51:54',NULL,1,NULL,1,1,51000,NULL,NULL,NULL,'soleil',NULL,NULL),(2,1,NULL,0,'FI1007-0002',1,'2012-12-08 13:11:07','2010-07-11 16:07:51',NULL,NULL,1,NULL,NULL,0,3600,'ferfrefeferf',NULL,NULL,'soleil',NULL,NULL);
+/*!40000 ALTER TABLE `llx_fichinter` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinter_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_fichinter_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinter_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_ficheinter_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinter_extrafields`
+--
+
+LOCK TABLES `llx_fichinter_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_fichinter_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_fichinter_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinterdet`
+--
+
+DROP TABLE IF EXISTS `llx_fichinterdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinterdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_fichinter` int(11) DEFAULT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `date` datetime DEFAULT NULL,
+  `description` text,
+  `duree` int(11) DEFAULT NULL,
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_fichinterdet_fk_fichinter` (`fk_fichinter`),
+  CONSTRAINT `fk_fichinterdet_fk_fichinter` FOREIGN KEY (`fk_fichinter`) REFERENCES `llx_fichinter` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinterdet`
+--
+
+LOCK TABLES `llx_fichinterdet` WRITE;
+/*!40000 ALTER TABLE `llx_fichinterdet` DISABLE KEYS */;
+INSERT INTO `llx_fichinterdet` VALUES (1,1,NULL,'2010-07-07 04:00:00','Intervention sur site',3600,0),(2,1,NULL,'2010-07-08 11:00:00','Autre',47400,0),(3,2,NULL,'2010-07-11 05:00:00','Pres',3600,0);
+/*!40000 ALTER TABLE `llx_fichinterdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_fichinterdet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_fichinterdet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_fichinterdet_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_ficheinterdet_extrafields` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_fichinterdet_extrafields`
+--
+
+LOCK TABLES `llx_fichinterdet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_fichinterdet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_fichinterdet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_filemanager_roots`
+--
+
+DROP TABLE IF EXISTS `llx_filemanager_roots`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_filemanager_roots` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `datec` datetime DEFAULT NULL,
+  `rootlabel` varchar(64) DEFAULT NULL,
+  `rootpath` text,
+  `note` text,
+  `position` int(11) DEFAULT NULL,
+  `entity` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_filemanager_root` (`rootlabel`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_filemanager_roots`
+--
+
+LOCK TABLES `llx_filemanager_roots` WRITE;
+/*!40000 ALTER TABLE `llx_filemanager_roots` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_filemanager_roots` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday`
+--
+
+DROP TABLE IF EXISTS `llx_holiday`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL,
+  `date_create` datetime NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `date_debut` date NOT NULL,
+  `date_fin` date NOT NULL,
+  `halfday` int(11) DEFAULT '0',
+  `statut` int(11) NOT NULL DEFAULT '1',
+  `fk_validator` int(11) NOT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_refuse` datetime DEFAULT NULL,
+  `fk_user_refuse` int(11) DEFAULT NULL,
+  `date_cancel` datetime DEFAULT NULL,
+  `fk_user_cancel` int(11) DEFAULT NULL,
+  `detail_refuse` varchar(250) DEFAULT NULL,
+  `note_private` text,
+  `note_public` text,
+  `note` text,
+  `fk_user_create` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_holiday_fk_user` (`fk_user`),
+  KEY `idx_holiday_date_debut` (`date_debut`),
+  KEY `idx_holiday_date_fin` (`date_fin`),
+  KEY `idx_holiday_fk_user_create` (`fk_user_create`),
+  KEY `idx_holiday_date_create` (`date_create`),
+  KEY `idx_holiday_fk_validator` (`fk_validator`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday`
+--
+
+LOCK TABLES `llx_holiday` WRITE;
+/*!40000 ALTER TABLE `llx_holiday` DISABLE KEYS */;
+INSERT INTO `llx_holiday` VALUES (1,1,'2013-02-17 19:06:35','gdf','2013-02-10','2013-02-11',0,3,1,'2013-02-17 19:06:57',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+/*!40000 ALTER TABLE `llx_holiday` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_config`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_config`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_config` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL,
+  `value` text,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_config`
+--
+
+LOCK TABLES `llx_holiday_config` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_config` DISABLE KEYS */;
+INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20130301231231'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
+/*!40000 ALTER TABLE `llx_holiday_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_events`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_events`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_events` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `name` varchar(255) NOT NULL,
+  `value` text NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_holiday_name` (`name`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_events`
+--
+
+LOCK TABLES `llx_holiday_events` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_events` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_holiday_events` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_logs`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_logs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_logs` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_action` datetime NOT NULL,
+  `fk_user_action` int(11) NOT NULL,
+  `fk_user_update` int(11) NOT NULL,
+  `type_action` varchar(255) NOT NULL,
+  `prev_solde` varchar(255) NOT NULL,
+  `new_solde` varchar(255) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=145 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_logs`
+--
+
+LOCK TABLES `llx_holiday_logs` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_logs` DISABLE KEYS */;
+INSERT INTO `llx_holiday_logs` VALUES (1,'2013-01-17 21:03:15',1,1,'Event : Mise à jour mensuelle','0.00','2.08'),(2,'2013-01-17 21:03:15',1,2,'Event : Mise à jour mensuelle','0.00','2.08'),(3,'2013-01-17 21:03:15',1,3,'Event : Mise à jour mensuelle','0.00','2.08'),(4,'2013-02-01 09:53:26',1,1,'Event : Mise à jour mensuelle','2.08','4.16'),(5,'2013-02-01 09:53:26',1,2,'Event : Mise à jour mensuelle','2.08','4.16'),(6,'2013-02-01 09:53:26',1,3,'Event : Mise à jour mensuelle','2.08','4.16'),(7,'2013-02-01 09:53:26',1,1,'Event : Mise à jour mensuelle','4.17','6.25'),(8,'2013-02-01 09:53:26',1,2,'Event : Mise à jour mensuelle','4.17','6.25'),(9,'2013-02-01 09:53:26',1,3,'Event : Mise à jour mensuelle','4.17','6.25'),(10,'2013-02-01 09:53:26',1,4,'Event : Mise à jour mensuelle','0.00','2.08'),(11,'2013-02-01 09:53:31',1,1,'Event : Mise à jour mensuelle','6.25','8.33'),(12,'2013-02-01 09:53:31',1,2,'Event : Mise à jour mensuelle','6.25','8.33'),(13,'2013-02-01 09:53:31',1,3,'Event : Mise à jour mensuelle','6.25','8.33'),(14,'2013-02-01 09:53:31',1,4,'Event : Mise à jour mensuelle','2.08','4.16'),(15,'2013-02-01 09:53:31',1,1,'Event : Mise à jour mensuelle','8.33','10.41'),(16,'2013-02-01 09:53:31',1,2,'Event : Mise à jour mensuelle','8.33','10.41'),(17,'2013-02-01 09:53:31',1,3,'Event : Mise à jour mensuelle','8.33','10.41'),(18,'2013-02-01 09:53:31',1,4,'Event : Mise à jour mensuelle','4.17','6.25'),(19,'2013-02-01 09:53:33',1,1,'Event : Mise à jour mensuelle','10.42','12.50'),(20,'2013-02-01 09:53:33',1,2,'Event : Mise à jour mensuelle','10.42','12.50'),(21,'2013-02-01 09:53:33',1,3,'Event : Mise à jour mensuelle','10.42','12.50'),(22,'2013-02-01 09:53:33',1,4,'Event : Mise à jour mensuelle','6.25','8.33'),(23,'2013-02-01 09:53:34',1,1,'Event : Mise à jour mensuelle','12.50','14.58'),(24,'2013-02-01 09:53:34',1,2,'Event : Mise à jour mensuelle','12.50','14.58'),(25,'2013-02-01 09:53:34',1,3,'Event : Mise à jour mensuelle','12.50','14.58'),(26,'2013-02-01 09:53:34',1,4,'Event : Mise à jour mensuelle','8.33','10.41'),(27,'2013-02-01 09:53:34',1,1,'Event : Mise à jour mensuelle','14.58','16.66'),(28,'2013-02-01 09:53:34',1,2,'Event : Mise à jour mensuelle','14.58','16.66'),(29,'2013-02-01 09:53:34',1,3,'Event : Mise à jour mensuelle','14.58','16.66'),(30,'2013-02-01 09:53:34',1,4,'Event : Mise à jour mensuelle','10.42','12.50'),(31,'2013-02-01 09:53:36',1,1,'Event : Mise à jour mensuelle','16.67','18.75'),(32,'2013-02-01 09:53:36',1,2,'Event : Mise à jour mensuelle','16.67','18.75'),(33,'2013-02-01 09:53:36',1,3,'Event : Mise à jour mensuelle','16.67','18.75'),(34,'2013-02-01 09:53:36',1,4,'Event : Mise à jour mensuelle','12.50','14.58'),(35,'2013-02-01 09:53:36',1,1,'Event : Mise à jour mensuelle','18.75','20.83'),(36,'2013-02-01 09:53:36',1,2,'Event : Mise à jour mensuelle','18.75','20.83'),(37,'2013-02-01 09:53:36',1,3,'Event : Mise à jour mensuelle','18.75','20.83'),(38,'2013-02-01 09:53:36',1,4,'Event : Mise à jour mensuelle','14.58','16.66'),(39,'2013-02-01 09:53:37',1,1,'Event : Mise à jour mensuelle','20.83','22.91'),(40,'2013-02-01 09:53:37',1,2,'Event : Mise à jour mensuelle','20.83','22.91'),(41,'2013-02-01 09:53:37',1,3,'Event : Mise à jour mensuelle','20.83','22.91'),(42,'2013-02-01 09:53:37',1,4,'Event : Mise à jour mensuelle','16.67','18.75'),(43,'2013-02-01 09:53:37',1,1,'Event : Mise à jour mensuelle','22.92','25.00'),(44,'2013-02-01 09:53:37',1,2,'Event : Mise à jour mensuelle','22.92','25.00'),(45,'2013-02-01 09:53:37',1,3,'Event : Mise à jour mensuelle','22.92','25.00'),(46,'2013-02-01 09:53:37',1,4,'Event : Mise à jour mensuelle','18.75','20.83'),(47,'2013-02-01 09:53:44',1,1,'Event : Mise à jour mensuelle','25.00','27.08'),(48,'2013-02-01 09:53:44',1,2,'Event : Mise à jour mensuelle','25.00','27.08'),(49,'2013-02-01 09:53:44',1,3,'Event : Mise à jour mensuelle','25.00','27.08'),(50,'2013-02-01 09:53:44',1,4,'Event : Mise à jour mensuelle','20.83','22.91'),(51,'2013-02-01 09:53:47',1,1,'Event : Mise à jour mensuelle','27.08','29.16'),(52,'2013-02-01 09:53:47',1,2,'Event : Mise à jour mensuelle','27.08','29.16'),(53,'2013-02-01 09:53:47',1,3,'Event : Mise à jour mensuelle','27.08','29.16'),(54,'2013-02-01 09:53:47',1,4,'Event : Mise à jour mensuelle','22.92','25.00'),(55,'2013-02-01 09:53:47',1,1,'Event : Mise à jour mensuelle','29.17','31.25'),(56,'2013-02-01 09:53:47',1,2,'Event : Mise à jour mensuelle','29.17','31.25'),(57,'2013-02-01 09:53:47',1,3,'Event : Mise à jour mensuelle','29.17','31.25'),(58,'2013-02-01 09:53:47',1,4,'Event : Mise à jour mensuelle','25.00','27.08'),(59,'2013-02-01 09:53:49',1,1,'Event : Mise à jour mensuelle','31.25','33.33'),(60,'2013-02-01 09:53:49',1,2,'Event : Mise à jour mensuelle','31.25','33.33'),(61,'2013-02-01 09:53:49',1,3,'Event : Mise à jour mensuelle','31.25','33.33'),(62,'2013-02-01 09:53:49',1,4,'Event : Mise à jour mensuelle','27.08','29.16'),(63,'2013-02-01 09:53:52',1,1,'Event : Mise à jour mensuelle','33.33','35.41'),(64,'2013-02-01 09:53:52',1,2,'Event : Mise à jour mensuelle','33.33','35.41'),(65,'2013-02-01 09:53:52',1,3,'Event : Mise à jour mensuelle','33.33','35.41'),(66,'2013-02-01 09:53:52',1,4,'Event : Mise à jour mensuelle','29.17','31.25'),(67,'2013-02-01 09:53:52',1,1,'Event : Mise à jour mensuelle','35.42','37.50'),(68,'2013-02-01 09:53:52',1,2,'Event : Mise à jour mensuelle','35.42','37.50'),(69,'2013-02-01 09:53:52',1,3,'Event : Mise à jour mensuelle','35.42','37.50'),(70,'2013-02-01 09:53:52',1,4,'Event : Mise à jour mensuelle','31.25','33.33'),(71,'2013-02-01 09:53:53',1,1,'Event : Mise à jour mensuelle','37.50','39.58'),(72,'2013-02-01 09:53:53',1,2,'Event : Mise à jour mensuelle','37.50','39.58'),(73,'2013-02-01 09:53:53',1,3,'Event : Mise à jour mensuelle','37.50','39.58'),(74,'2013-02-01 09:53:53',1,4,'Event : Mise à jour mensuelle','33.33','35.41'),(75,'2013-02-01 09:53:54',1,1,'Event : Mise à jour mensuelle','39.58','41.66'),(76,'2013-02-01 09:53:54',1,2,'Event : Mise à jour mensuelle','39.58','41.66'),(77,'2013-02-01 09:53:54',1,3,'Event : Mise à jour mensuelle','39.58','41.66'),(78,'2013-02-01 09:53:54',1,4,'Event : Mise à jour mensuelle','35.42','37.50'),(79,'2013-02-01 09:53:54',1,1,'Event : Mise à jour mensuelle','41.67','43.75'),(80,'2013-02-01 09:53:54',1,2,'Event : Mise à jour mensuelle','41.67','43.75'),(81,'2013-02-01 09:53:54',1,3,'Event : Mise à jour mensuelle','41.67','43.75'),(82,'2013-02-01 09:53:54',1,4,'Event : Mise à jour mensuelle','37.50','39.58'),(83,'2013-02-01 09:55:49',1,1,'Event : Mise à jour mensuelle','43.75','45.83'),(84,'2013-02-01 09:55:49',1,2,'Event : Mise à jour mensuelle','43.75','45.83'),(85,'2013-02-01 09:55:49',1,3,'Event : Mise à jour mensuelle','43.75','45.83'),(86,'2013-02-01 09:55:49',1,4,'Event : Mise à jour mensuelle','39.58','41.66'),(87,'2013-02-01 09:55:56',1,1,'Event : Mise à jour mensuelle','45.83','47.91'),(88,'2013-02-01 09:55:56',1,2,'Event : Mise à jour mensuelle','45.83','47.91'),(89,'2013-02-01 09:55:56',1,3,'Event : Mise à jour mensuelle','45.83','47.91'),(90,'2013-02-01 09:55:56',1,4,'Event : Mise à jour mensuelle','41.67','43.75'),(91,'2013-02-01 09:56:01',1,1,'Event : Mise à jour mensuelle','47.92','50.00'),(92,'2013-02-01 09:56:01',1,2,'Event : Mise à jour mensuelle','47.92','50.00'),(93,'2013-02-01 09:56:01',1,3,'Event : Mise à jour mensuelle','47.92','50.00'),(94,'2013-02-01 09:56:01',1,4,'Event : Mise à jour mensuelle','43.75','45.83'),(95,'2013-02-01 09:56:01',1,1,'Event : Mise à jour mensuelle','50.00','52.08'),(96,'2013-02-01 09:56:01',1,2,'Event : Mise à jour mensuelle','50.00','52.08'),(97,'2013-02-01 09:56:01',1,3,'Event : Mise à jour mensuelle','50.00','52.08'),(98,'2013-02-01 09:56:01',1,4,'Event : Mise à jour mensuelle','45.83','47.91'),(99,'2013-02-01 09:56:03',1,1,'Event : Mise à jour mensuelle','52.08','54.16'),(100,'2013-02-01 09:56:03',1,2,'Event : Mise à jour mensuelle','52.08','54.16'),(101,'2013-02-01 09:56:03',1,3,'Event : Mise à jour mensuelle','52.08','54.16'),(102,'2013-02-01 09:56:03',1,4,'Event : Mise à jour mensuelle','47.92','50.00'),(103,'2013-02-01 09:56:03',1,1,'Event : Mise à jour mensuelle','54.17','56.25'),(104,'2013-02-01 09:56:03',1,2,'Event : Mise à jour mensuelle','54.17','56.25'),(105,'2013-02-01 09:56:03',1,3,'Event : Mise à jour mensuelle','54.17','56.25'),(106,'2013-02-01 09:56:03',1,4,'Event : Mise à jour mensuelle','50.00','52.08'),(107,'2013-02-01 09:56:05',1,1,'Event : Mise à jour mensuelle','56.25','58.33'),(108,'2013-02-01 09:56:05',1,2,'Event : Mise à jour mensuelle','56.25','58.33'),(109,'2013-02-01 09:56:05',1,3,'Event : Mise à jour mensuelle','56.25','58.33'),(110,'2013-02-01 09:56:05',1,4,'Event : Mise à jour mensuelle','52.08','54.16'),(111,'2013-02-01 09:56:06',1,1,'Event : Mise à jour mensuelle','58.33','60.41'),(112,'2013-02-01 09:56:06',1,2,'Event : Mise à jour mensuelle','58.33','60.41'),(113,'2013-02-01 09:56:06',1,3,'Event : Mise à jour mensuelle','58.33','60.41'),(114,'2013-02-01 09:56:06',1,4,'Event : Mise à jour mensuelle','54.17','56.25'),(115,'2013-02-01 09:56:06',1,1,'Event : Mise à jour mensuelle','60.42','62.50'),(116,'2013-02-01 09:56:06',1,2,'Event : Mise à jour mensuelle','60.42','62.50'),(117,'2013-02-01 09:56:06',1,3,'Event : Mise à jour mensuelle','60.42','62.50'),(118,'2013-02-01 09:56:06',1,4,'Event : Mise à jour mensuelle','56.25','58.33'),(119,'2013-02-01 09:56:07',1,1,'Event : Mise à jour mensuelle','62.50','64.58'),(120,'2013-02-01 09:56:07',1,2,'Event : Mise à jour mensuelle','62.50','64.58'),(121,'2013-02-01 09:56:07',1,3,'Event : Mise à jour mensuelle','62.50','64.58'),(122,'2013-02-01 09:56:07',1,4,'Event : Mise à jour mensuelle','58.33','60.41'),(123,'2013-02-01 09:56:07',1,1,'Event : Mise à jour mensuelle','64.58','66.66'),(124,'2013-02-01 09:56:07',1,2,'Event : Mise à jour mensuelle','64.58','66.66'),(125,'2013-02-01 09:56:07',1,3,'Event : Mise à jour mensuelle','64.58','66.66'),(126,'2013-02-01 09:56:07',1,4,'Event : Mise à jour mensuelle','60.42','62.50'),(127,'2013-02-01 09:56:50',1,1,'Event : Mise à jour mensuelle','66.67','68.75'),(128,'2013-02-01 09:56:50',1,2,'Event : Mise à jour mensuelle','66.67','68.75'),(129,'2013-02-01 09:56:50',1,3,'Event : Mise à jour mensuelle','66.67','68.75'),(130,'2013-02-01 09:56:50',1,4,'Event : Mise à jour mensuelle','62.50','64.58'),(131,'2013-02-01 09:56:50',1,1,'Event : Mise à jour mensuelle','68.75','70.83'),(132,'2013-02-01 09:56:50',1,2,'Event : Mise à jour mensuelle','68.75','70.83'),(133,'2013-02-01 09:56:50',1,3,'Event : Mise à jour mensuelle','68.75','70.83'),(134,'2013-02-01 09:56:50',1,4,'Event : Mise à jour mensuelle','64.58','66.66'),(135,'2013-02-17 18:49:21',1,1,'Event : Mise à jour mensuelle','70.83','72.91'),(136,'2013-02-17 18:49:21',1,2,'Event : Mise à jour mensuelle','70.83','72.91'),(137,'2013-02-17 18:49:21',1,3,'Event : Mise à jour mensuelle','70.83','72.91'),(138,'2013-02-17 18:49:21',1,4,'Event : Mise à jour mensuelle','66.67','68.75'),(139,'2013-02-17 19:06:57',1,1,'Event : Holiday','72.92','71.92'),(140,'2013-03-01 23:12:31',1,1,'Event : Mise à jour mensuelle','71.92','74.00'),(141,'2013-03-01 23:12:31',1,2,'Event : Mise à jour mensuelle','72.92','75.00'),(142,'2013-03-01 23:12:31',1,3,'Event : Mise à jour mensuelle','72.92','75.00'),(143,'2013-03-01 23:12:31',1,4,'Event : Mise à jour mensuelle','68.75','70.83'),(144,'2013-03-01 23:12:31',1,5,'Event : Mise à jour mensuelle','0.00','2.08');
+/*!40000 ALTER TABLE `llx_holiday_logs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_types`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_types` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(45) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `affect` int(11) NOT NULL,
+  `delay` int(11) NOT NULL,
+  `insertAt` datetime NOT NULL,
+  `updateAt` datetime DEFAULT NULL,
+  `deleteAt` datetime DEFAULT NULL,
+  `nbCongesDeducted` varchar(255) NOT NULL,
+  `nbCongesEveryMonth` varchar(255) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_types`
+--
+
+LOCK TABLES `llx_holiday_types` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_types` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_holiday_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_holiday_users`
+--
+
+DROP TABLE IF EXISTS `llx_holiday_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_holiday_users` (
+  `fk_user` int(11) NOT NULL,
+  `nb_holiday` double NOT NULL DEFAULT '0',
+  PRIMARY KEY (`fk_user`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_holiday_users`
+--
+
+LOCK TABLES `llx_holiday_users` WRITE;
+/*!40000 ALTER TABLE `llx_holiday_users` DISABLE KEYS */;
+INSERT INTO `llx_holiday_users` VALUES (0,0),(1,74.00334000000001),(2,75.00024000000003),(3,75.00024000000003),(4,70.83356000000002),(5,2.08334),(6,0);
+/*!40000 ALTER TABLE `llx_holiday_users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_import_model`
+--
+
+DROP TABLE IF EXISTS `llx_import_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_import_model` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_user` int(11) NOT NULL DEFAULT '0',
+  `label` varchar(50) NOT NULL,
+  `type` varchar(20) NOT NULL,
+  `field` text NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_import_model` (`label`,`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_import_model`
+--
+
+LOCK TABLES `llx_import_model` WRITE;
+/*!40000 ALTER TABLE `llx_import_model` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_import_model` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_links`
+--
+
+DROP TABLE IF EXISTS `llx_links`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_links` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `datea` datetime NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `label` varchar(255) NOT NULL,
+  `objecttype` varchar(255) NOT NULL,
+  `objectid` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_links`
+--
+
+LOCK TABLES `llx_links` WRITE;
+/*!40000 ALTER TABLE `llx_links` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_links` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_livraison`
+--
+
+DROP TABLE IF EXISTS `llx_livraison`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_livraison` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ref` varchar(30) NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `ref_customer` varchar(30) DEFAULT NULL,
+  `fk_soc` int(11) NOT NULL,
+  `ref_ext` varchar(30) DEFAULT NULL,
+  `ref_int` varchar(30) DEFAULT NULL,
+  `date_creation` datetime DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `date_delivery` date DEFAULT NULL,
+  `fk_address` int(11) DEFAULT NULL,
+  `fk_statut` smallint(6) DEFAULT '0',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `note_private` text,
+  `note_public` text,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `idx_livraison_uk_ref` (`ref`,`entity`),
+  KEY `idx_livraison_fk_soc` (`fk_soc`),
+  KEY `idx_livraison_fk_user_author` (`fk_user_author`),
+  KEY `idx_livraison_fk_user_valid` (`fk_user_valid`),
+  CONSTRAINT `fk_livraison_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_livraison_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_livraison_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_livraison`
+--
+
+LOCK TABLES `llx_livraison` WRITE;
+/*!40000 ALTER TABLE `llx_livraison` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_livraison` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_livraisondet`
+--
+
+DROP TABLE IF EXISTS `llx_livraisondet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_livraisondet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_livraison` int(11) DEFAULT NULL,
+  `fk_origin_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `description` text,
+  `qty` double DEFAULT NULL,
+  `subprice` double(24,8) DEFAULT '0.00000000',
+  `total_ht` double(24,8) DEFAULT '0.00000000',
+  `rang` int(11) DEFAULT '0',
+  PRIMARY KEY (`rowid`),
+  KEY `idx_livraisondet_fk_expedition` (`fk_livraison`),
+  CONSTRAINT `fk_livraisondet_fk_livraison` FOREIGN KEY (`fk_livraison`) REFERENCES `llx_livraison` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_livraisondet`
+--
+
+LOCK TABLES `llx_livraisondet` WRITE;
+/*!40000 ALTER TABLE `llx_livraisondet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_livraisondet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_localtax`
+--
+
+DROP TABLE IF EXISTS `llx_localtax`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_localtax` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `localtaxtype` tinyint(4) DEFAULT NULL,
+  `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,
+  `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_localtax`
+--
+
+LOCK TABLES `llx_localtax` WRITE;
+/*!40000 ALTER TABLE `llx_localtax` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_localtax` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_mailing`
+--
+
+DROP TABLE IF EXISTS `llx_mailing`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_mailing` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `statut` smallint(6) DEFAULT '0',
+  `titre` varchar(60) DEFAULT NULL,
+  `entity` int(11) NOT NULL DEFAULT '1',
+  `sujet` varchar(60) DEFAULT NULL,
+  `body` mediumtext,
+  `bgcolor` varchar(8) DEFAULT NULL,
+  `bgimage` varchar(255) DEFAULT NULL,
+  `cible` varchar(60) DEFAULT NULL,
+  `nbemail` int(11) DEFAULT NULL,
+  `email_from` varchar(160) DEFAULT NULL,
+  `email_replyto` varchar(160) DEFAULT NULL,
+  `email_errorsto` varchar(160) DEFAULT NULL,
+  `tag` varchar(128) DEFAULT NULL,
+  `date_creat` datetime DEFAULT NULL,
+  `date_valid` datetime DEFAULT NULL,
+  `date_appro` datetime DEFAULT NULL,
+  `date_envoi` datetime DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_valid` int(11) DEFAULT NULL,
+  `fk_user_appro` int(11) DEFAULT NULL,
+  `joined_file1` varchar(255) DEFAULT NULL,
+  `joined_file2` varchar(255) DEFAULT NULL,
+  `joined_file3` varchar(255) DEFAULT NULL,
+  `joined_file4` varchar(255) DEFAULT NULL,
+  `extraparams` varchar(255) 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_mailing`
+--
+
+LOCK TABLES `llx_mailing` WRITE;
+/*!40000 ALTER TABLE `llx_mailing` DISABLE KEYS */;
+INSERT INTO `llx_mailing` VALUES (3,1,'My commercial emailing',1,'Buy my product','Please buy my product','','',NULL,2,'dolibarr@domain.com','','',NULL,'2010-07-11 13:15:59','2010-07-11 13:46:20',NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL),(4,0,'Copy of My commercial emailing',1,'Buy my product','This is a new &eacute;E&eacute;&eacute;&quot;Mailing content<br />\r\n<br />\r\n<style type=\"text/css\">\r\n<!--\r\na:link {\r\n	color: #E2017A;\r\n}\r\n--></style>\r\n<span style=\"color:#800080;\"><strong>You can adit it with the WYSIWYG editor.</strong></span><br />\r\nIt is\r\n<ul>\r\n	<li>\r\n		Fast</li>\r\n	<li>\r\n		Easy to use</li>\r\n	<li>\r\n		Pretty</li>\r\n</ul>','','',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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;action=create&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;sortorder=desc&amp;begin=&amp;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&amp;sortorder=desc&amp;begin=&amp;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&amp;sortorder=desc&amp;begin=&amp;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&amp;sortorder=desc&amp;begin=&amp;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&amp;sortorder=desc&amp;begin=&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;mode=4&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;mainmenu=accountancy&amp;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&amp;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&amp;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&amp;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&amp;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&amp;mainmenu=accountancy&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;leftmenu=accountancy&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;leftmenu=agenda&amp;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&amp;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&amp;leftmenu=agenda&amp;status=todo&amp;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&amp;leftmenu=agenda&amp;status=done&amp;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&amp;leftmenu=agenda&amp;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&amp;leftmenu=agenda&amp;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&amp;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&amp;leftmenu=agenda&amp;status=todo&amp;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&amp;leftmenu=agenda&amp;status=done&amp;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&amp;leftmenu=agenda&amp;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&amp;leftmenu=agenda&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;action=create&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;mode=4&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;mainmenu=accountancy&amp;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&amp;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&amp;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&amp;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&amp;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&amp;mainmenu=accountancy&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;action=create&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;statut=1&amp;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&amp;statut=1&amp;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&amp;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&amp;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&amp;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&amp;leftmenu=accountancy&amp;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&amp;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&amp;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&amp;mainmenu=members&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;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&amp;leftmenu=agenda&amp;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&amp;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&amp;leftmenu=agenda&amp;status=todo&amp;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&amp;leftmenu=agenda&amp;status=done&amp;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&amp;leftmenu=agenda&amp;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&amp;leftmenu=agenda&amp;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&amp;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&amp;leftmenu=agenda&amp;status=todo&amp;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&amp;leftmenu=agenda&amp;status=done&amp;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&amp;leftmenu=agenda&amp;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&amp;leftmenu=agenda&amp;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&amp;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&eacute;solution 1,r&eacute;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.<br />',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&eacute;&eacute;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&eacute;&eacute;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&eacute;&eacute;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&eacute;&eacute;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&eacute;&eacute;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<br />\r\nfsdfsd<br />\r\n<strong>fsdfs</strong>',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
+<?php
+/* Copyright (C) 2012 Laurent Destailleur	<eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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
new file mode 100755
index 00000000000..0d532d054ad
--- /dev/null
+++ b/dev/optimize_images.sh
@@ -0,0 +1,233 @@
+#!/bin/bash
+# Borrowed from https://gist.github.com/lgiraudel/6065155
+# Inplace mode added by Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+
+PROGNAME=${0##*/}
+INPUT=''
+QUIET='0'
+NOSTATS='0'
+INPLACE='0'
+max_input_size=0
+max_output_size=0
+
+
+usage()
+{
+  cat <<EO
+Usage: $PROGNAME [options]
+
+Script to optimize JPG and PNG images in a directory.
+
+Options:
+EO
+cat <<EO | column -s\& -t
+	-h, --help  	   & shows this help
+	-q, --quiet 	   & disables output
+	-i, --input [dir]  & specify input directory (current directory by default)
+	-o, --output [dir] & specify output directory ("output" by default)
+	-ns, --no-stats	& no stats at the end
+	-p, --inplace	  & optimizes files inplace
+EO
+}
+
+# $1: input image
+# $2: output image
+optimize_image()
+{
+	input_file_size=$(stat -c%s "$1")
+	max_input_size=$(expr $max_input_size + $input_file_size)
+
+	if [ "${1##*.}" = "png" ]; then
+		#optipng -o1 -clobber -quiet $1 -out $2.firstpass
+		optipng -o1 -quiet $1 -out $2.firstpass
+		pngcrush -q -rem alla -reduce $2.firstpass $2 >/dev/null
+		rm -fr $2.firstpass
+	fi
+	if [ "${1##*.}" = "jpg" -o "${1##*.}" = "jpeg" ]; then
+		jpegtran -copy none -progressive $1 > $2
+	fi
+
+	output_file_size=$(stat -c%s "$2")
+	max_output_size=$(expr $max_output_size + $output_file_size)
+}
+
+get_max_file_length()
+{
+	local maxlength=0
+
+	IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT)
+
+	for CURRENT_IMAGE in $IMAGES; do
+		filename=$(basename "$CURRENT_IMAGE")
+		if [[ ${#filename} -gt $maxlength ]]; then
+			maxlength=${#filename}
+		fi
+	done
+
+	echo "$maxlength"
+}
+
+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)
+	fi
+
+	# If $OUTPUT is empty, then we use the directory "output" in the current directory
+	if [[ "$OUTPUT" == "" ]]; then
+		OUTPUT=$(pwd)/output
+	fi
+	# If inplace, we use /tmp for output
+	if [[ "$INPLACE" == "1" ]]; then
+		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
+
+	# To avoid some troubles with filename with spaces, we store the current IFS (Internal File Separator)...
+	SAVEIFS=$IFS
+	# ...and we set a new one
+	IFS=$(echo -en "\n\b")
+
+	max_filelength=`get_max_file_length`
+	pad=$(printf '%0.1s' "."{1..600})
+	sDone=' [ DONE ]'
+	linelength=$(expr $max_filelength + ${#sDone} + 5)
+
+	# 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
+		echo --- Optimizing $INPUT ---
+		echo
+	fi
+	for CURRENT_IMAGE in $IMAGES; do
+		echo "Process $CURRENT_IMAGE"
+		filename=$(basename $CURRENT_IMAGE)
+		if [ "$QUIET" == "0" ]; then
+			printf '%s ' "$filename"
+			printf '%*.*s' 0 $((linelength - ${#filename} - ${#sDone} )) "$pad"
+		fi
+
+		optimize_image $CURRENT_IMAGE $OUTPUT/$filename
+
+		# Replace file
+		if [[ "$INPLACE" == "1" ]]; then
+			mv $OUTPUT/$filename $CURRENT_IMAGE
+		fi
+
+		if [ "$QUIET" == "0" ]; then
+			printf '%s\n' "$sDone"
+		fi
+	done
+
+	# Cleanup
+	if [[ "$INPLACE" == "1" ]]; then
+		rm -rf $OUTPUT
+	fi
+
+	# we restore the saved IFS
+	IFS=$SAVEIFS
+
+	if [ "$NOSTATS" == "0" -a "$QUIET" == "0" ]; then
+		echo
+		echo "Input: " $(human_readable_filesize $max_input_size)
+		echo "Output: " $(human_readable_filesize $max_output_size)
+		space_saved=$(expr $max_input_size - $max_output_size)
+		echo "Space save: " $(human_readable_filesize $space_saved)
+	fi
+}
+
+human_readable_filesize()
+{
+echo -n $1 | awk 'function human(x) {
+	 s=" b  Kb Mb Gb Tb"
+	 while (x>=1024 && length(s)>1)
+		   {x/=1024; s=substr(s,4)}
+	 s=substr(s,1,4)
+	 xf=(s==" b ")?"%5d   ":"%.2f"
+	 return sprintf( xf"%s", x, s)
+  }
+  {gsub(/^[0-9]+/, human($1)); print}'
+}
+
+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
+		-h|--help)
+			usage
+			exit 0
+			;;
+		-i|--input)
+			shift
+			INPUT=$1
+			;;
+		-o|--output)
+			shift
+			OUTPUT=$1
+			;;
+		-q|--quiet)
+			QUIET='1'
+			;;
+		-s|--no-stats)
+			NOSTATS='1'
+			;;
+		-p|--inplace)
+			INPLACE='1'
+			;;
+		--)
+			shift
+			break
+			;;
+		*)
+			shift
+			break
+			;;
+	esac
+	shift
+done
+
+# To convert
+if [ "x$1" = "xlist" ]
+then
+	INPLACE=0
+fi
+
+main
+
diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 6acbc1feb35..0b2e96daaac 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -254,11 +254,11 @@ foreach($property as $key => $prop)
 		$varprop.="\t\t\$sql.= \" ";
 		if ($prop['istime'])
 		{
-			$varprop.='".(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':$this->db->idate(';
+			$varprop.='".(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate(';
 			$varprop.="\$this->".$prop['field']."";
-			$varprop.='))."';
+			$varprop.=')."\'")."';
 			if ($i < count($property)) $varprop.=",";
-			$varprop.="\";";
+			$varprop.='";';
 		}
 		elseif ($prop['ischar'])
 		{
diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index bdeb61a7821..4c09e379d9b 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -173,7 +173,7 @@ class modMyModule extends DolibarrModules
 
 		// Add here list of permission defined by an id, a label, a boolean and two constant strings.
 		// Example:
-		// $this->rights[$r][0] = 2000; 				// Permission id (must not be already used)
+		// $this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
 		// $this->rights[$r][1] = 'Permision label';	// Permission label
 		// $this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
 		// $this->rights[$r][4] = 'level1';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index c36dad4b4b5..4dddc5a8c80 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * 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 sql=".$sql, 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)
 			{
@@ -105,10 +106,8 @@ class Skeleton_Class extends CommonObject
 	            // want this action calls a trigger.
 
 	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //$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
 			}
         }
@@ -118,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();
@@ -135,10 +134,11 @@ class Skeleton_Class extends CommonObject
     /**
      *  Load object in memory from the database
      *
-     *  @param	int		$id    Id object
+     *  @param	int		$id    	Id object
+     *  @param	string	$ref	Ref
      *  @return int          	<0 if KO, >0 if OK
      */
-    function fetch($id)
+    function fetch($id,$ref='')
     {
     	global $langs;
         $sql = "SELECT";
@@ -146,10 +146,11 @@ class Skeleton_Class extends CommonObject
 		$sql.= " t.field1,";
 		$sql.= " t.field2";
 		//...
-        $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+        if ($ref) $sql.= " WHERE t.ref = '".$ref."'";
+        else $sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch");
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -169,7 +170,6 @@ class Skeleton_Class extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -182,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;
@@ -196,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")."";
 		//...
@@ -204,7 +204,7 @@ class Skeleton_Class extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(__METHOD__);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -216,12 +216,10 @@ class Skeleton_Class extends CommonObject
 	            // want this action calls a trigger.
 
 	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //$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
@@ -229,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();
@@ -264,21 +262,19 @@ class Skeleton_Class extends CommonObject
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action calls a trigger.
 
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
+	            //// 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."mytable";
+    		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
     		$sql.= " WHERE rowid=".$this->id;
 
-    		dol_syslog(get_class($this)."::delete sql=".$sql);
+    		dol_syslog(__METHOD__);
     		$resql = $this->db->query($sql);
         	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
@@ -288,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 bf63a769af7..deaecd95526 100644
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -43,6 +43,7 @@ if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@includ
 if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php';   // Used on dev env only
 if (! $res) die("Include of main fails");
 // Change this following line to use the correct relative path from htdocs
+include_once(DOL_DOCUMENT_ROOT.'/core/class/formcompany.class.php');
 dol_include_once('/module/class/skeleton_class.class.php');
 
 // Load traductions files requiredby by page
@@ -52,6 +53,7 @@ $langs->load("other");
 // Get parameters
 $id			= GETPOST('id','int');
 $action		= GETPOST('action','alpha');
+$backtopage = GETPOST('backtopage');
 $myparam	= GETPOST('myparam','alpha');
 
 // Protection if external user
@@ -60,6 +62,16 @@ if ($user->societe_id > 0)
 	//accessforbidden();
 }
 
+if (empty($action) && empty($id) && empty($ref)) $action='create';
+
+// Load object if id or ref is provided as parameter
+$object=new Skeleton_Class($db);
+if (($id > 0 || ! empty($ref)) && $action != 'add')
+{
+	$result=$object->fetch($id,$ref);
+	if ($result < 0) dol_print_error($db);
+}
+
 
 
 /*******************************************************************
@@ -68,19 +80,104 @@ if ($user->societe_id > 0)
 * Put here all code to do according to value of "action" parameter
 ********************************************************************/
 
+// Action to add record
 if ($action == 'add')
 {
-	$object=new Skeleton_Class($db);
-	$object->prop1=$_POST["field1"];
-	$object->prop2=$_POST["field2"];
-	$result=$object->create($user);
+	if (GETPOST('cancel'))
+	{
+		$urltogo=$backtopage?$backtopage:dol_buildpath('/buildingmanagement/list.php',1);
+		header("Location: ".$urltogo);
+		exit;
+	}
+
+	$error=0;
+
+	/* object_prop_getpost_prop */
+	$object->prop1=GETPOST("field1");
+	$object->prop2=GETPOST("field2");
+
+	if (empty($object->ref))
+	{
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'errors');
+	}
+
+	if (! $error)
+	{
+		$result=$object->create($user);
+		if ($result > 0)
+		{
+			// Creation OK
+			$urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1);
+			header("Location: ".$urltogo);
+			exit;
+		}
+		{
+			// Creation KO
+			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			else  setEventMessages($object->error, null, 'errors');
+			$action='create';
+		}
+	}
+	else
+	{
+		$action='create';
+	}
+}
+
+// Cancel
+if ($action == 'update' && GETPOST('cancel')) $action='view';
+
+// Action to update record
+if ($action == 'update' && ! GETPOST('cancel'))
+{
+	$error=0;
+
+	$object->prop1=GETPOST("field1");
+	$object->prop2=GETPOST("field2");
+
+	if (empty($object->ref))
+	{
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),null,'errors');
+	}
+
+	if (! $error)
+	{
+		$result=$object->update($user);
+		if ($result > 0)
+		{
+			$action='view';
+		}
+		else
+		{
+			// Creation KO
+			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			else setEventMessages($object->error, null, 'errors');
+			$action='edit';
+		}
+	}
+	else
+	{
+		$action='edit';
+	}
+}
+
+// Action to delete
+if ($action == 'confirm_delete')
+{
+	$result=$object->delete($user);
 	if ($result > 0)
 	{
-		// Creation OK
+		// Delete OK
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		header("Location: ".dol_buildpath('/buildingmanagement/list.php',1));
+		exit;
 	}
+	else
 	{
-		// Creation KO
-		$mesg=$object->error;
+		if (! empty($object->errors)) setEventMessages(null,$object->errors,'errors');
+		else setEventMessages($object->error,null,'errors');
 	}
 }
 
@@ -101,7 +198,7 @@ $form=new Form($db);
 
 // Put here content of your page
 
-// Example 1 : Adding jquery code
+// Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
 	function init_myfunc()
@@ -117,13 +214,8 @@ jQuery(document).ready(function() {
 </script>';
 
 
-// Example 2 : Adding links to objects
-// The class must extends CommonObject class to have this method available
-//$somethingshown=$object->showLinkedObjectBlock();
-
-
-// Example 3 : List of data
-if ($action == 'list')
+// Part to show a list
+if ($action == 'list' || empty($id))
 {
     $sql = "SELECT";
     $sql.= " t.rowid,";
@@ -139,27 +231,24 @@ if ($action == 'list')
     print_liste_field_titre($langs->trans('field2'),$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
     print '</tr>';
 
-    dol_syslog($script_file." sql=".$sql, LOG_DEBUG);
+    dol_syslog($script_file, LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        if ($num)
+        while ($i < $num)
         {
-            while ($i < $num)
+            $obj = $db->fetch_object($resql);
+            if ($obj)
             {
-                $obj = $db->fetch_object($resql);
-                if ($obj)
-                {
-                    // You can use here results
-                    print '<tr><td>';
-                    print $obj->field1;
-                    print $obj->field2;
-                    print '</td></tr>';
-                }
-                $i++;
+                // You can use here results
+                print '<tr><td>';
+                print $obj->field1;
+                print $obj->field2;
+                print '</td></tr>';
             }
+            $i++;
         }
     }
     else
@@ -173,6 +262,102 @@ if ($action == 'list')
 
 
 
+// Part to create
+if ($action == 'create')
+{
+	print_fiche_titre($langs->trans("NewResidence"));
+
+	dol_fiche_head();
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	print '<table class="border centpercent">'."\n";
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
+	print '<input class="flat" type="text" size="36" name="label" value="'.$label.'">';
+	print '</td></tr>';
+
+	print '</table>'."\n";
+
+	print '<br>';
+
+	print '<center><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+
+	print '</form>';
+
+	dol_fiche_end();
+}
+
+
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	dol_fiche_head();
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+
+	print '<br>';
+
+	print '<center><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"></center>';
+
+	print '</form>';
+
+	dol_fiche_end();
+}
+
+
+
+// Part to show record
+if ($id && (empty($action) || $action == 'view'))
+{
+	dol_fiche_head();
+
+
+
+	dol_fiche_end();
+
+
+	// Buttons
+	print '<div class="tabsAction">'."\n";
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	if (empty($reshook))
+	{
+		if ($user->rights->mymodule->write)
+		{
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+		}
+
+		if ($user->rights->mymodule->delete)
+		{
+			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+			{
+				print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+			}
+		}
+	}
+	print '</div>'."\n";
+
+
+	// Example 2 : Adding links to objects
+	// The class must extends CommonObject class to have this method available
+	//$somethingshown=$object->showLinkedObjectBlock();
+
+}
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/dev/skeletons/skeleton_script.php b/dev/skeletons/skeleton_script.php
index b10b57a730a..35904c9bfd3 100644
--- a/dev/skeletons/skeleton_script.php
+++ b/dev/skeletons/skeleton_script.php
@@ -57,7 +57,7 @@ if (! $result > 0) { dol_print_error('',$user->error); exit; }
 $user->getrights();
 
 
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 if (! isset($argv[1])) {	// Check parameters
     print "Usage: ".$script_file." param1 param2 ...\n";
 	exit(-1);
@@ -119,7 +119,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."skeleton";
 $sql.= " WHERE field3 = 'xxx'";
 $sql.= " ORDER BY field1 ASC";
 
-dol_syslog($script_file." sql=".$sql, LOG_DEBUG);
+dol_syslog($script_file, LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/dev/skeletons/skeleton_webservice_server.php b/dev/skeletons/skeleton_webservice_server.php
index 278057fd4f6..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='')
@@ -269,5 +269,4 @@ function createSkeleton($authentication,$skeleton)
 }
 
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
-
+$server->service(file_get_contents("php://input"));
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index fc778770bb9..42a70c8c1a6 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -1,9 +1,22 @@
 #!/usr/bin/php
 <?php
-/*
- * strip_language_file.php
+/* Copyright (C) 2014 by FromDual GmbH, licensed under GPL v2
+ * Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
- * (c) 2014 by FromDual GmbH, licensed under GPL v2
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * -----
  *
  * Compares a secondary language translation file with its primary
  * language file and strips redundant translations.
@@ -12,11 +25,10 @@
  *
  * Usage:
  * cd htdocs/langs
- * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> <languagefile.lang>
+ * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> [file.lang|all]
  *
- * Parameters:
- * 1 - Primary Language
- * 2 - Secondary Language
+ * To rename all .delta files, you can do
+ * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
  *
  * Rules:
  * secondary string == primary string -> strip
@@ -24,9 +36,6 @@
  * secondary string not in primary -> strip and warning
  * secondary string has no value -> strip and warning
  * secondary string != primary string -> secondary.lang.delta
- *
- * To rename all .delta fils, you can do
- * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
  */
 
 /**
@@ -260,6 +269,9 @@ foreach($filesToProcess as $fileToProcess)
 	}
 
 	print "Output can be found at $output.\n";
+
+	print "To rename all .delta files, you can do\n";
+	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }
 
 
diff --git a/dev/vagrant/README.md b/dev/vagrant/README.md
deleted file mode 100644
index 8056643520e..00000000000
--- a/dev/vagrant/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Vagrant development box for Dolibarr
-====================================
-
-Introduction
-------------
-
-[Vagrant](http://vagrantup.com) is a tool to make development easier using [VirtualBox](http://virtualbox.org) virtual machines.
-
-These machines have been created with [PuPHEt](http://puphpet.com) and combine the power of Vagrant with [Puppet](http://puppetlabs.com) to automate the development machine provisionning.
-
-What you need
--------------
-
-Latest versions of:
-
-- [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-- [Vagrant](http://downloads.vagrantup.com/)
-
-Usage
------
-
-### VM startup
-
-`cd` into the vagrant box directory and simply type `vagrant up`.
-
-That's all you need to do. It will build a brand new VirtalBox machine for you with everything you need to develop on Dolibarr.
-
-### Name resolution
-For easy access to the VM you need to setup name resolution to the machines IP.
-
-Edit the [hosts](https://en.wikipedia.org/wiki/Hosts_(file)) file on the machine you run Vagrant on to map the virtual machine's IP to it's Vhost name.
-
-Example syntax:
-
-    192.168.42.101  dev.dolibarr.org
-
-Once this is done, you will be able to access your VM's service at <http://dev.dolibarr.org>
-
-Available boxes
----------------
-
-### dolibardev
-
-Somewhat bleeding edge vagrant box for develop branch related work.
-
-- IP: 192.168.42.101
-- Vhost: dev.dolibarr.org
-- OS: Debian Wheezy 7.5
-- Webserver: Apache 2.2.22
-- PHP: mod_php 5.5.13-1~dotdeb.1
-- Database: MySQL 5.5
-    - Root user: root
-    - Root password: root
-    - Database name: dolibarr
-    - Database user: user
-    - Database password: user
-    - Initial data: dev/initdata/mysqldump_dolibarr-3.5.0.sql
-- Debugger: XDebug
-- Profiler: Xhprof
-
-You can access MailCatcher to read all outgoing emails at http://192.168.42.101:1080
diff --git a/dev/vagrant/dolibarrdev/Vagrantfile b/dev/vagrant/dolibarrdev/Vagrantfile
deleted file mode 100644
index f73476207d0..00000000000
--- a/dev/vagrant/dolibarrdev/Vagrantfile
+++ /dev/null
@@ -1,170 +0,0 @@
-require 'yaml'
-
-dir = File.dirname(File.expand_path(__FILE__))
-
-configValues = YAML.load_file("#{dir}/puphpet/config.yaml")
-data = configValues['vagrantfile-local']
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "#{data['vm']['box']}"
-  config.vm.box_url = "#{data['vm']['box_url']}"
-
-  if data['vm']['hostname'].to_s.strip.length != 0
-    config.vm.hostname = "#{data['vm']['hostname']}"
-  end
-
-  if data['vm']['network']['private_network'].to_s != ''
-    config.vm.network "private_network", ip: "#{data['vm']['network']['private_network']}"
-  end
-
-  data['vm']['network']['forwarded_port'].each do |i, port|
-    if port['guest'] != '' && port['host'] != ''
-      config.vm.network :forwarded_port, guest: port['guest'].to_i, host: port['host'].to_i
-    end
-  end
-
-  data['vm']['synced_folder'].each do |i, folder|
-    if folder['source'] != '' && folder['target'] != ''
-      nfs = (folder['nfs'] == "true") ? "nfs" : nil
-      if nfs == "nfs"
-        config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: nfs
-      else
-        config.vm.synced_folder "#{folder['source']}", "#{folder['target']}", id: "#{i}", type: nfs,
-          group: 'www-data', owner: 'www-data', mount_options: ["dmode=775", "fmode=764"]
-      end
-    end
-  end
-
-  config.vm.usable_port_range = (10200..10500)
-
-  if data['vm']['chosen_provider'].empty? || data['vm']['chosen_provider'] == "virtualbox"
-    ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
-
-    config.vm.provider :virtualbox do |virtualbox|
-      data['vm']['provider']['virtualbox']['modifyvm'].each do |key, value|
-        if key == "memory"
-          next
-        end
-
-        if key == "natdnshostresolver1"
-          value = value ? "on" : "off"
-        end
-
-        virtualbox.customize ["modifyvm", :id, "--#{key}", "#{value}"]
-      end
-
-      virtualbox.customize ["modifyvm", :id, "--memory", "#{data['vm']['memory']}"]
-
-      if data['vm']['hostname'].to_s.strip.length != 0
-        virtualbox.customize ["modifyvm", :id, "--name", config.vm.hostname]
-      end
-    end
-  end
-
-  if data['vm']['chosen_provider'] == "vmware_fusion" || data['vm']['chosen_provider'] == "vmware_workstation"
-    ENV['VAGRANT_DEFAULT_PROVIDER'] = (data['vm']['chosen_provider'] == "vmware_fusion") ? "vmware_fusion" : "vmware_workstation"
-
-    config.vm.provider "vmware_fusion" do |v|
-      data['vm']['provider']['vmware'].each do |key, value|
-        if key == "memsize"
-          next
-        end
-
-        v.vmx["#{key}"] = "#{value}"
-      end
-
-      v.vmx["memsize"] = "#{data['vm']['memory']}"
-
-      if data['vm']['hostname'].to_s.strip.length != 0
-        v.vmx["displayName"] = config.vm.hostname
-      end
-    end
-  end
-
-  if data['vm']['chosen_provider'] == "parallels"
-    ENV['VAGRANT_DEFAULT_PROVIDER'] = "parallels"
-
-    config.vm.provider "parallels" do |v|
-      data['vm']['provider']['parallels'].each do |key, value|
-        if key == "memsize"
-          next
-        end
-
-        v.customize ["set", :id, "--#{key}", "#{value}"]
-      end
-
-      v.memory = "#{data['vm']['memory']}"
-
-      if data['vm']['hostname'].to_s.strip.length != 0
-        v.name = config.vm.hostname
-      end
-    end
-  end
-
-  ssh_username = !data['ssh']['username'].nil? ? data['ssh']['username'] : "vagrant"
-
-  config.vm.provision "shell" do |s|
-    s.path = "puphpet/shell/initial-setup.sh"
-    s.args = "/vagrant/puphpet"
-  end
-  config.vm.provision "shell" do |kg|
-    kg.path = "puphpet/shell/ssh-keygen.sh"
-    kg.args = "#{ssh_username}"
-  end
-  config.vm.provision :shell, :path => "puphpet/shell/update-puppet.sh"
-
-  config.vm.provision :puppet do |puppet|
-    puppet.facter = {
-      "ssh_username"     => "#{ssh_username}",
-      "provisioner_type" => ENV['VAGRANT_DEFAULT_PROVIDER'],
-      "vm_target_key"    => 'vagrantfile-local',
-    }
-    puppet.manifests_path = "#{data['vm']['provision']['puppet']['manifests_path']}"
-    puppet.manifest_file = "#{data['vm']['provision']['puppet']['manifest_file']}"
-    puppet.module_path = "#{data['vm']['provision']['puppet']['module_path']}"
-
-    if !data['vm']['provision']['puppet']['options'].empty?
-      puppet.options = data['vm']['provision']['puppet']['options']
-    end
-  end
-
-  config.vm.provision :shell, :path => "puphpet/shell/execute-files.sh"
-  config.vm.provision :shell, :path => "puphpet/shell/important-notices.sh"
-
-  if File.file?("#{dir}/puphpet/files/dot/ssh/id_rsa")
-    config.ssh.private_key_path = [
-      "#{dir}/puphpet/files/dot/ssh/id_rsa",
-      "#{dir}/puphpet/files/dot/ssh/insecure_private_key"
-    ]
-  end
-
-  if !data['ssh']['host'].nil?
-    config.ssh.host = "#{data['ssh']['host']}"
-  end
-  if !data['ssh']['port'].nil?
-    config.ssh.port = "#{data['ssh']['port']}"
-  end
-  if !data['ssh']['username'].nil?
-    config.ssh.username = "#{data['ssh']['username']}"
-  end
-  if !data['ssh']['guest_port'].nil?
-    config.ssh.guest_port = data['ssh']['guest_port']
-  end
-  if !data['ssh']['shell'].nil?
-    config.ssh.shell = "#{data['ssh']['shell']}"
-  end
-  if !data['ssh']['keep_alive'].nil?
-    config.ssh.keep_alive = data['ssh']['keep_alive']
-  end
-  if !data['ssh']['forward_agent'].nil?
-    config.ssh.forward_agent = data['ssh']['forward_agent']
-  end
-  if !data['ssh']['forward_x11'].nil?
-    config.ssh.forward_x11 = data['ssh']['forward_x11']
-  end
-  if !data['vagrant']['host'].nil?
-    config.vagrant.host = data['vagrant']['host'].gsub(":", "").intern
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/.gitattributes b/dev/vagrant/dolibarrdev/puphpet/.gitattributes
deleted file mode 100644
index 93f9975f88e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autodetect text files
-* text=auto
-
-# Force the following filetypes to have unix eols, so Windows does not break them
-*.pp text eol=lf
-*.sh text eol=lf
-*.yaml text eol=lf
-Puppetfile text eol=lf
-.bash_aliases text eol=lf
-.vimrc text eol=lf
diff --git a/dev/vagrant/dolibarrdev/puphpet/config.yaml b/dev/vagrant/dolibarrdev/puphpet/config.yaml
deleted file mode 100644
index 5cfb2601f21..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/config.yaml
+++ /dev/null
@@ -1,211 +0,0 @@
----
-vagrantfile-local:
-    vm:
-        box: puphpet/debian75-x64
-        box_url: puphpet/debian75-x64
-        hostname: null
-        memory: '512'
-        chosen_provider: virtualbox
-        network:
-            private_network: 192.168.42.101
-            forwarded_port: {  }
-        provider:
-            virtualbox:
-                modifyvm:
-                    natdnshostresolver1: on
-                setextradata:
-                    VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root: 1
-            vmware:
-                numvcpus: 1
-            parallels:
-                cpus: 1
-        provision:
-            puppet:
-                manifests_path: puphpet/puppet
-                manifest_file: manifest.pp
-                module_path: puphpet/puppet/modules
-                options:
-                    - '--verbose'
-                    - '--hiera_config /vagrant/puphpet/puppet/hiera.yaml'
-                    - '--parser future'
-        synced_folder:
-            PL1BkioqqvGY:
-                source: ../../../
-                target: /var/www
-                nfs: 'false'
-        usable_port_range: 2200..2250
-    ssh:
-        host: null
-        port: null
-        private_key_path: null
-        username: vagrant
-        guest_port: null
-        keep_alive: true
-        forward_agent: false
-        forward_x11: false
-        shell: 'bash -l'
-    vagrant:
-        host: detect
-server:
-    packages:
-        - nano
-        - ack-grep
-    dot_files:
-        -
-            bash_aliases: null
-    _prevent_empty: ''
-mailcatcher:
-    install: '1'
-    settings:
-        smtp_ip: 0.0.0.0
-        smtp_port: 1025
-        http_ip: 0.0.0.0
-        http_port: '1080'
-        mailcatcher_path: /usr/local/bin
-        log_path: /var/log/mailcatcher/mailcatcher.log
-firewall:
-    install: '1'
-    rules: null
-apache:
-    install: '1'
-    settings:
-        user: www-data
-        group: www-data
-        default_vhost: false
-        manage_user: false
-        manage_group: false
-        sendfile: 0
-    modules:
-        - php
-        - rewrite
-    vhosts:
-        CGyWQB0fx4x0:
-            servername: dev.dolibarr.org
-            docroot: /var/www/htdocs
-            port: '80'
-            setenv:
-                - 'APP_ENV dev'
-            override:
-                - All
-            custom_fragment: ''
-            ssl_cert: ''
-            ssl_key: ''
-            ssl_chain: ''
-            ssl_certs_dir: ''
-    mod_pagespeed: 0
-    mod_spdy: 0
-nginx:
-    install: 0
-    vhosts:
-        jeF1sybIJ3V2:
-            server_name: awesome.dev
-            server_aliases:
-                - www.awesome.dev
-            www_root: /var/www/awesome.dev
-            listen_port: '80'
-            index_files:
-                - index.html
-                - index.htm
-                - index.php
-            envvars:
-                - 'APP_ENV dev'
-            ssl_cert: ''
-            ssl_key: ''
-php:
-    install: '1'
-    version: '55'
-    composer: '1'
-    composer_home: ''
-    modules:
-        php:
-            - cli
-            - curl
-            - gd
-            - imagick
-            - intl
-            - mcrypt
-        pear: {  }
-        pecl: {  }
-    ini:
-        display_errors: On
-        error_reporting: '-1'
-        session.save_path: /var/lib/php/session
-        sendmail_path: '"/usr/bin/env catchmail"'
-    timezone: UTC
-xdebug:
-    install: '1'
-    settings:
-        xdebug.default_enable: '1'
-        xdebug.remote_autostart: '0'
-        xdebug.remote_connect_back: '1'
-        xdebug.remote_enable: '1'
-        xdebug.remote_handler: dbgp
-        xdebug.remote_port: '9000'
-xhprof:
-    install: '1'
-drush:
-    install: 0
-    settings:
-        drush.tag_branch: 6.x
-mysql:
-    install: '1'
-    root_password: root
-    adminer: 0
-    databases:
-        2OfuuapoIqsl:
-            grant:
-                - ALTER
-                - CREATE
-                - DELETE
-                - DROP
-                - INDEX
-                - INSERT
-                - SELECT
-                - UPDATE
-            name: dolibarr
-            host: localhost
-            user: user
-            password: user
-            sql_file: /var/www/dev/initdata/mysqldump_dolibarr_3.5.0.sql
-postgresql:
-    install: 0
-    settings:
-        root_password: '123'
-        user_group: postgres
-        encoding: UTF8
-        version: '9.3'
-    databases: {  }
-    adminer: 0
-mariadb:
-    install: 0
-    root_password: '123'
-    adminer: 0
-    databases: {  }
-    version: '10.0'
-mongodb:
-    install: 0
-    settings:
-        auth: 1
-        port: '27017'
-    databases: {  }
-redis:
-    install: 0
-    settings:
-        conf_port: '6379'
-beanstalkd:
-    install: 0
-    settings:
-        listenaddress: 0.0.0.0
-        listenport: '13000'
-        maxjobsize: '65535'
-        maxconnections: '1024'
-        binlogdir: /var/lib/beanstalkd/binlog
-        binlogfsync: null
-        binlogsize: '10485760'
-    beanstalk_console: 0
-    binlogdir: /var/lib/beanstalkd/binlog
-rabbitmq:
-    install: 0
-    settings:
-        port: '5672'
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_aliases b/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_aliases
deleted file mode 100644
index b1ab498e1cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_aliases
+++ /dev/null
@@ -1,52 +0,0 @@
-if [ -f /etc/bash_completion ]; then
-    source /etc/bash_completion
-fi
-
-__has_parent_dir () {
-    # Utility function so we can test for things like .git/.hg without firing up a
-    # separate process
-    test -d "$1" && return 0;
-
-    current="."
-    while [ ! "$current" -ef "$current/.." ]; do
-        if [ -d "$current/$1" ]; then
-            return 0;
-        fi
-        current="$current/..";
-    done
-
-    return 1;
-}
-
-__vcs_name() {
-    if [ -d .svn ]; then
-        echo "-[svn]";
-    elif __has_parent_dir ".git"; then
-        echo "-[$(__git_ps1 'git %s')]";
-    elif __has_parent_dir ".hg"; then
-        echo "-[hg $(hg branch)]"
-    fi
-}
-
-black=$(tput -Txterm setaf 0)
-red=$(tput -Txterm setaf 1)
-green=$(tput -Txterm setaf 2)
-yellow=$(tput -Txterm setaf 3)
-dk_blue=$(tput -Txterm setaf 4)
-pink=$(tput -Txterm setaf 5)
-lt_blue=$(tput -Txterm setaf 6)
-
-bold=$(tput -Txterm bold)
-reset=$(tput -Txterm sgr0)
-
-# Nicely formatted terminal prompt
-export PS1='\n\[$bold\]\[$black\][\[$dk_blue\]\@\[$black\]]-[\[$green\]\u\[$yellow\]@\[$green\]\h\[$black\]]-[\[$pink\]\w\[$black\]]\[\033[0;33m\]$(__vcs_name) \[\033[00m\]\[$reset\]\n\[$reset\]\$ '
-
-alias ls='ls -F --color=always'
-alias dir='dir -F --color=always'
-alias ll='ls -l'
-alias cp='cp -iv'
-alias rm='rm -i'
-alias mv='mv -iv'
-alias grep='grep --color=auto -in'
-alias ..='cd ..'
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git b/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git
deleted file mode 100644
index 853425d005c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.bash_git
+++ /dev/null
@@ -1,491 +0,0 @@
-# bash/zsh git prompt support
-#
-# Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
-# Distributed under the GNU General Public License, version 2.0.
-#
-# This script allows you to see repository status in your prompt.
-#
-# To enable:
-#
-#    1) Copy this file to somewhere (e.g. ~/.git-prompt.sh).
-#    2) Add the following line to your .bashrc/.zshrc:
-#        source ~/.git-prompt.sh
-#    3a) Change your PS1 to call __git_ps1 as
-#        command-substitution:
-#        Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
-#        ZSH:  setopt PROMPT_SUBST ; PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ '
-#        the optional argument will be used as format string.
-#    3b) Alternatively, for a slightly faster prompt, __git_ps1 can
-#        be used for PROMPT_COMMAND in Bash or for precmd() in Zsh
-#        with two parameters, <pre> and <post>, which are strings
-#        you would put in $PS1 before and after the status string
-#        generated by the git-prompt machinery.  e.g.
-#        Bash: PROMPT_COMMAND='__git_ps1 "\u@\h:\w" "\\\$ "'
-#          will show username, at-sign, host, colon, cwd, then
-#          various status string, followed by dollar and SP, as
-#          your prompt.
-#        ZSH:  precmd () { __git_ps1 "%n" ":%~$ " "|%s" }
-#          will show username, pipe, then various status string,
-#          followed by colon, cwd, dollar and SP, as your prompt.
-#        Optionally, you can supply a third argument with a printf
-#        format string to finetune the output of the branch status
-#
-# The repository status will be displayed only if you are currently in a
-# git repository. The %s token is the placeholder for the shown status.
-#
-# The prompt status always includes the current branch name.
-#
-# In addition, if you set GIT_PS1_SHOWDIRTYSTATE to a nonempty value,
-# unstaged (*) and staged (+) changes will be shown next to the branch
-# name.  You can configure this per-repository with the
-# bash.showDirtyState variable, which defaults to true once
-# GIT_PS1_SHOWDIRTYSTATE is enabled.
-#
-# You can also see if currently something is stashed, by setting
-# GIT_PS1_SHOWSTASHSTATE to a nonempty value. If something is stashed,
-# then a '$' will be shown next to the branch name.
-#
-# If you would like to see if there're untracked files, then you can set
-# GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're untracked
-# files, then a '%' will be shown next to the branch name.  You can
-# configure this per-repository with the bash.showUntrackedFiles
-# variable, which defaults to true once GIT_PS1_SHOWUNTRACKEDFILES is
-# enabled.
-#
-# If you would like to see the difference between HEAD and its upstream,
-# set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates you are behind, ">"
-# indicates you are ahead, "<>" indicates you have diverged and "="
-# indicates that there is no difference. You can further control
-# behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated list
-# of values:
-#
-#     verbose       show number of commits ahead/behind (+/-) upstream
-#     name          if verbose, then also show the upstream abbrev name
-#     legacy        don't use the '--count' option available in recent
-#                   versions of git-rev-list
-#     git           always compare HEAD to @{upstream}
-#     svn           always compare HEAD to your SVN upstream
-#
-# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
-# find one, or @{upstream} otherwise.  Once you have set
-# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
-# setting the bash.showUpstream config variable.
-#
-# If you would like to see more information about the identity of
-# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
-# to one of these values:
-#
-#     contains      relative to newer annotated tag (v1.6.3.2~35)
-#     branch        relative to newer tag or branch (master~4)
-#     describe      relative to older annotated tag (v1.6.3.1-13-gdd42c2f)
-#     default       exactly matching tag
-#
-# If you would like a colored hint about the current dirty state, set
-# GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
-# the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd.
-
-# check whether printf supports -v
-__git_printf_supports_v=
-printf -v __git_printf_supports_v -- '%s' yes >/dev/null 2>&1
-
-# stores the divergence from upstream in $p
-# used by GIT_PS1_SHOWUPSTREAM
-__git_ps1_show_upstream ()
-{
-	local key value
-	local svn_remote svn_url_pattern count n
-	local upstream=git legacy="" verbose="" name=""
-
-	svn_remote=()
-	# get some config options from git-config
-	local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')"
-	while read -r key value; do
-		case "$key" in
-		bash.showupstream)
-			GIT_PS1_SHOWUPSTREAM="$value"
-			if [[ -z "${GIT_PS1_SHOWUPSTREAM}" ]]; then
-				p=""
-				return
-			fi
-			;;
-		svn-remote.*.url)
-			svn_remote[$((${#svn_remote[@]} + 1))]="$value"
-			svn_url_pattern="$svn_url_pattern\\|$value"
-			upstream=svn+git # default upstream is SVN if available, else git
-			;;
-		esac
-	done <<< "$output"
-
-	# parse configuration values
-	for option in ${GIT_PS1_SHOWUPSTREAM}; do
-		case "$option" in
-		git|svn) upstream="$option" ;;
-		verbose) verbose=1 ;;
-		legacy)  legacy=1  ;;
-		name)    name=1 ;;
-		esac
-	done
-
-	# Find our upstream
-	case "$upstream" in
-	git)    upstream="@{upstream}" ;;
-	svn*)
-		# get the upstream from the "git-svn-id: ..." in a commit message
-		# (git-svn uses essentially the same procedure internally)
-		local -a svn_upstream
-		svn_upstream=($(git log --first-parent -1 \
-					--grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null))
-		if [[ 0 -ne ${#svn_upstream[@]} ]]; then
-			svn_upstream=${svn_upstream[${#svn_upstream[@]} - 2]}
-			svn_upstream=${svn_upstream%@*}
-			local n_stop="${#svn_remote[@]}"
-			for ((n=1; n <= n_stop; n++)); do
-				svn_upstream=${svn_upstream#${svn_remote[$n]}}
-			done
-
-			if [[ -z "$svn_upstream" ]]; then
-				# default branch name for checkouts with no layout:
-				upstream=${GIT_SVN_ID:-git-svn}
-			else
-				upstream=${svn_upstream#/}
-			fi
-		elif [[ "svn+git" = "$upstream" ]]; then
-			upstream="@{upstream}"
-		fi
-		;;
-	esac
-
-	# Find how many commits we are ahead/behind our upstream
-	if [[ -z "$legacy" ]]; then
-		count="$(git rev-list --count --left-right \
-				"$upstream"...HEAD 2>/dev/null)"
-	else
-		# produce equivalent output to --count for older versions of git
-		local commits
-		if commits="$(git rev-list --left-right "$upstream"...HEAD 2>/dev/null)"
-		then
-			local commit behind=0 ahead=0
-			for commit in $commits
-			do
-				case "$commit" in
-				"<"*) ((behind++)) ;;
-				*)    ((ahead++))  ;;
-				esac
-			done
-			count="$behind	$ahead"
-		else
-			count=""
-		fi
-	fi
-
-	# calculate the result
-	if [[ -z "$verbose" ]]; then
-		case "$count" in
-		"") # no upstream
-			p="" ;;
-		"0	0") # equal to upstream
-			p="=" ;;
-		"0	"*) # ahead of upstream
-			p=">" ;;
-		*"	0") # behind upstream
-			p="<" ;;
-		*)	    # diverged from upstream
-			p="<>" ;;
-		esac
-	else
-		case "$count" in
-		"") # no upstream
-			p="" ;;
-		"0	0") # equal to upstream
-			p=" u=" ;;
-		"0	"*) # ahead of upstream
-			p=" u+${count#0	}" ;;
-		*"	0") # behind upstream
-			p=" u-${count%	0}" ;;
-		*)	    # diverged from upstream
-			p=" u+${count#*	}-${count%	*}" ;;
-		esac
-		if [[ -n "$count" && -n "$name" ]]; then
-			__git_ps1_upstream_name=$(git rev-parse \
-				--abbrev-ref "$upstream" 2>/dev/null)
-			if [ $pcmode = yes ]; then
-				# see the comments around the
-				# __git_ps1_branch_name variable below
-				p="$p \${__git_ps1_upstream_name}"
-			else
-				p="$p ${__git_ps1_upstream_name}"
-				# not needed anymore; keep user's
-				# environment clean
-				unset __git_ps1_upstream_name
-			fi
-		fi
-	fi
-
-}
-
-# Helper function that is meant to be called from __git_ps1.  It
-# injects color codes into the appropriate gitstring variables used
-# to build a gitstring.
-__git_ps1_colorize_gitstring ()
-{
-	if [[ -n ${ZSH_VERSION-} ]]; then
-		local c_red='%F{red}'
-		local c_green='%F{green}'
-		local c_lblue='%F{blue}'
-		local c_clear='%f'
-	else
-		# Using \[ and \] around colors is necessary to prevent
-		# issues with command line editing/browsing/completion!
-		local c_red='\[\e[31m\]'
-		local c_green='\[\e[32m\]'
-		local c_lblue='\[\e[1;34m\]'
-		local c_clear='\[\e[0m\]'
-	fi
-	local bad_color=$c_red
-	local ok_color=$c_green
-	local flags_color="$c_lblue"
-
-	local branch_color=""
-	if [ $detached = no ]; then
-		branch_color="$ok_color"
-	else
-		branch_color="$bad_color"
-	fi
-	c="$branch_color$c"
-
-	z="$c_clear$z"
-	if [ "$w" = "*" ]; then
-		w="$bad_color$w"
-	fi
-	if [ -n "$i" ]; then
-		i="$ok_color$i"
-	fi
-	if [ -n "$s" ]; then
-		s="$flags_color$s"
-	fi
-	if [ -n "$u" ]; then
-		u="$bad_color$u"
-	fi
-	r="$c_clear$r"
-}
-
-__git_eread ()
-{
-	f="$1"
-	shift
-	test -r "$f" && read "$@" <"$f"
-}
-
-# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
-# when called from PS1 using command substitution
-# in this mode it prints text to add to bash PS1 prompt (includes branch name)
-#
-# __git_ps1 requires 2 or 3 arguments when called from PROMPT_COMMAND (pc)
-# in that case it _sets_ PS1. The arguments are parts of a PS1 string.
-# when two arguments are given, the first is prepended and the second appended
-# to the state string when assigned to PS1.
-# The optional third parameter will be used as printf format string to further
-# customize the output of the git-status string.
-# In this mode you can request colored hints using GIT_PS1_SHOWCOLORHINTS=true
-__git_ps1 ()
-{
-	local pcmode=no
-	local detached=no
-	local ps1pc_start='\u@\h:\w '
-	local ps1pc_end='\$ '
-	local printf_format=' (%s)'
-
-	case "$#" in
-		2|3)	pcmode=yes
-			ps1pc_start="$1"
-			ps1pc_end="$2"
-			printf_format="${3:-$printf_format}"
-		;;
-		0|1)	printf_format="${1:-$printf_format}"
-		;;
-		*)	return
-		;;
-	esac
-
-	local repo_info rev_parse_exit_code
-	repo_info="$(git rev-parse --git-dir --is-inside-git-dir \
-		--is-bare-repository --is-inside-work-tree \
-		--short HEAD 2>/dev/null)"
-	rev_parse_exit_code="$?"
-
-	if [ -z "$repo_info" ]; then
-		if [ $pcmode = yes ]; then
-			#In PC mode PS1 always needs to be set
-			PS1="$ps1pc_start$ps1pc_end"
-		fi
-		return
-	fi
-
-	local short_sha
-	if [ "$rev_parse_exit_code" = "0" ]; then
-		short_sha="${repo_info##*$'\n'}"
-		repo_info="${repo_info%$'\n'*}"
-	fi
-	local inside_worktree="${repo_info##*$'\n'}"
-	repo_info="${repo_info%$'\n'*}"
-	local bare_repo="${repo_info##*$'\n'}"
-	repo_info="${repo_info%$'\n'*}"
-	local inside_gitdir="${repo_info##*$'\n'}"
-	local g="${repo_info%$'\n'*}"
-
-	local r=""
-	local b=""
-	local step=""
-	local total=""
-	if [ -d "$g/rebase-merge" ]; then
-		__git_eread "$g/rebase-merge/head-name" b
-		__git_eread "$g/rebase-merge/msgnum" step
-		__git_eread "$g/rebase-merge/end" total
-		if [ -f "$g/rebase-merge/interactive" ]; then
-			r="|REBASE-i"
-		else
-			r="|REBASE-m"
-		fi
-	else
-		if [ -d "$g/rebase-apply" ]; then
-			__git_eread "$g/rebase-apply/next" step
-			__git_eread "$g/rebase-apply/last" total
-			if [ -f "$g/rebase-apply/rebasing" ]; then
-				__git_eread "$g/rebase-apply/head-name" b
-				r="|REBASE"
-			elif [ -f "$g/rebase-apply/applying" ]; then
-				r="|AM"
-			else
-				r="|AM/REBASE"
-			fi
-		elif [ -f "$g/MERGE_HEAD" ]; then
-			r="|MERGING"
-		elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
-			r="|CHERRY-PICKING"
-		elif [ -f "$g/REVERT_HEAD" ]; then
-			r="|REVERTING"
-		elif [ -f "$g/BISECT_LOG" ]; then
-			r="|BISECTING"
-		fi
-
-		if [ -n "$b" ]; then
-			:
-		elif [ -h "$g/HEAD" ]; then
-			# symlink symbolic ref
-			b="$(git symbolic-ref HEAD 2>/dev/null)"
-		else
-			local head=""
-			if ! __git_eread "$g/HEAD" head; then
-				if [ $pcmode = yes ]; then
-					PS1="$ps1pc_start$ps1pc_end"
-				fi
-				return
-			fi
-			# is it a symbolic ref?
-			b="${head#ref: }"
-			if [ "$head" = "$b" ]; then
-				detached=yes
-				b="$(
-				case "${GIT_PS1_DESCRIBE_STYLE-}" in
-				(contains)
-					git describe --contains HEAD ;;
-				(branch)
-					git describe --contains --all HEAD ;;
-				(describe)
-					git describe HEAD ;;
-				(* | default)
-					git describe --tags --exact-match HEAD ;;
-				esac 2>/dev/null)" ||
-
-				b="$short_sha..."
-				b="($b)"
-			fi
-		fi
-	fi
-
-	if [ -n "$step" ] && [ -n "$total" ]; then
-		r="$r $step/$total"
-	fi
-
-	local w=""
-	local i=""
-	local s=""
-	local u=""
-	local c=""
-	local p=""
-
-	if [ "true" = "$inside_gitdir" ]; then
-		if [ "true" = "$bare_repo" ]; then
-			c="BARE:"
-		else
-			b="GIT_DIR!"
-		fi
-	elif [ "true" = "$inside_worktree" ]; then
-		if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] &&
-		   [ "$(git config --bool bash.showDirtyState)" != "false" ]
-		then
-			git diff --no-ext-diff --quiet --exit-code || w="*"
-			if [ -n "$short_sha" ]; then
-				git diff-index --cached --quiet HEAD -- || i="+"
-			else
-				i="#"
-			fi
-		fi
-		if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
-		   [ -r "$g/refs/stash" ]; then
-			s="$"
-		fi
-
-		if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] &&
-		   [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
-		   git ls-files --others --exclude-standard --error-unmatch -- '*' >/dev/null 2>/dev/null
-		then
-			u="%${ZSH_VERSION+%}"
-		fi
-
-		if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
-			__git_ps1_show_upstream
-		fi
-	fi
-
-	local z="${GIT_PS1_STATESEPARATOR-" "}"
-
-	# NO color option unless in PROMPT_COMMAND mode
-	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-		__git_ps1_colorize_gitstring
-	fi
-
-	b=${b##refs/heads/}
-	if [ $pcmode = yes ]; then
-		# In pcmode (and only pcmode) the contents of
-		# $gitstring are subject to expansion by the shell.
-		# Avoid putting the raw ref name in the prompt to
-		# protect the user from arbitrary code execution via
-		# specially crafted ref names (e.g., a ref named
-		# '$(IFS=_;cmd=sudo_rm_-rf_/;$cmd)' would execute
-		# 'sudo rm -rf /' when the prompt is drawn).  Instead,
-		# put the ref name in a new global variable (in the
-		# __git_ps1_* namespace to avoid colliding with the
-		# user's environment) and reference that variable from
-		# PS1.
-		__git_ps1_branch_name=$b
-		# note that the $ is escaped -- the variable will be
-		# expanded later (when it's time to draw the prompt)
-		b="\${__git_ps1_branch_name}"
-	fi
-
-	local f="$w$i$s$u"
-	local gitstring="$c$b${f:+$z$f}$r$p"
-
-	if [ $pcmode = yes ]; then
-		if [ "${__git_printf_supports_v-}" != yes ]; then
-			gitstring=$(printf -- "$printf_format" "$gitstring")
-		else
-			printf -v gitstring -- "$printf_format" "$gitstring"
-		fi
-		PS1="$ps1pc_start$gitstring$ps1pc_end"
-	else
-		printf -- "$printf_format" "$gitstring"
-	fi
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore b/dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore
deleted file mode 100644
index dcf60545594..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-ssh/id_rsa
-ssh/id_rsa.pub
-ssh/insecure_private_key
-ssh/id_rsa.ppk
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/.vimrc b/dev/vagrant/dolibarrdev/puphpet/files/dot/.vimrc
deleted file mode 100644
index 2ff1aa60801..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/.vimrc
+++ /dev/null
@@ -1,414 +0,0 @@
-set rtp+=$GOROOT/misc/vim
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Maintainer:
-"       Amir Salihefendic
-"       http://amix.dk - amix@amix.dk
-"
-" Version:
-"       5.0 - 29/05/12 15:43:36
-"
-" Blog_post:
-"       http://amix.dk/blog/post/19691#The-ultimate-Vim-configuration-on-Github
-"
-" Awesome_version:
-"       Get this config, nice color schemes and lots of plugins!
-"
-"       Install the awesome version from:
-"
-"           https://github.com/amix/vimrc
-"
-" Syntax_highlighted:
-"       http://amix.dk/vim/vimrc.html
-"
-" Raw_version:
-"       http://amix.dk/vim/vimrc.txt
-"
-" Sections:
-"    -> General
-"    -> VIM user interface
-"    -> Colors and Fonts
-"    -> Files and backups
-"    -> Text, tab and indent related
-"    -> Visual mode related
-"    -> Moving around, tabs and buffers
-"    -> Status line
-"    -> Editing mappings
-"    -> vimgrep searching and cope displaying
-"    -> Spell checking
-"    -> Misc
-"    -> Helper functions
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => General
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Sets how many lines of history VIM has to remember
-set history=700
-
-" Enable filetype plugins
-filetype plugin on
-filetype indent on
-
-" Set to auto read when a file is changed from the outside
-set autoread
-
-" With a map leader it's possible to do extra key combinations
-" like <leader>w saves the current file
-let mapleader = ","
-let g:mapleader = ","
-
-" Fast saving
-nmap <leader>w :w!<cr>
-
-" :W sudo saves the file
-" (useful for handling the permission-denied error)
-command W w !sudo tee % > /dev/null
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => VIM user interface
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Set 7 lines to the cursor - when moving vertically using j/k
-set so=7
-
-" Turn on the WiLd menu
-set wildmenu
-
-" Ignore compiled files
-set wildignore=*.o,*~,*.pyc
-if has("win16") || has("win32")
-    set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store
-else
-    set wildignore+=.git\*,.hg\*,.svn\*
-endif
-
-"Always show current position
-set ruler
-
-" Height of the command bar
-set cmdheight=2
-
-" A buffer becomes hidden when it is abandoned
-set hid
-
-" Configure backspace so it acts as it should act
-set backspace=eol,start,indent
-set whichwrap+=<,>,h,l
-
-" Ignore case when searching
-set ignorecase
-
-" When searching try to be smart about cases
-set smartcase
-
-" Highlight search results
-set hlsearch
-
-" Makes search act like search in modern browsers
-set incsearch
-
-" Don't redraw while executing macros (good performance config)
-set lazyredraw
-
-" For regular expressions turn magic on
-set magic
-
-" Show matching brackets when text indicator is over them
-set showmatch
-" How many tenths of a second to blink when matching brackets
-set mat=2
-
-" No annoying sound on errors
-set noerrorbells
-set novisualbell
-set t_vb=
-set tm=500
-
-" Add a bit extra margin to the left
-set foldcolumn=1
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Colors and Fonts
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Enable syntax highlighting
-syntax enable
-
-try
-    colorscheme desert
-catch
-endtry
-
-set background=dark
-
-" Set extra options when running in GUI mode
-if has("gui_running")
-    set guioptions-=T
-    set guioptions-=e
-    set t_Co=256
-    set guitablabel=%M\ %t
-endif
-
-" Set utf8 as standard encoding and en_US as the standard language
-set encoding=utf8
-
-" Use Unix as the standard file type
-set ffs=unix,dos,mac
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Files, backups and undo
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Turn backup off, since most stuff is in SVN, git et.c anyway...
-set nobackup
-set nowb
-set noswapfile
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Text, tab and indent related
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Use spaces instead of tabs
-set expandtab
-
-" Be smart when using tabs ;)
-set smarttab
-
-" 1 tab == 4 spaces
-set shiftwidth=4
-set tabstop=4
-
-" Linebreak on 500 characters
-set lbr
-set tw=500
-
-set ai "Auto indent
-set si "Smart indent
-set wrap "Wrap lines
-
-
-""""""""""""""""""""""""""""""
-" => Visual mode related
-""""""""""""""""""""""""""""""
-" Visual mode pressing * or # searches for the current selection
-" Super useful! From an idea by Michael Naumann
-vnoremap <silent> * :call VisualSelection('f', '')<CR>
-vnoremap <silent> # :call VisualSelection('b', '')<CR>
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Moving around, tabs, windows and buffers
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Treat long lines as break lines (useful when moving around in them)
-map j gj
-map k gk
-
-" Map <Space> to / (search) and Ctrl-<Space> to ? (backwards search)
-map <space> /
-map <c-space> ?
-
-" Disable highlight when <leader><cr> is pressed
-map <silent> <leader><cr> :noh<cr>
-
-" Smart way to move between windows
-map <C-j> <C-W>j
-map <C-k> <C-W>k
-map <C-h> <C-W>h
-map <C-l> <C-W>l
-
-" Close the current buffer
-map <leader>bd :Bclose<cr>
-
-" Close all the buffers
-map <leader>ba :1,1000 bd!<cr>
-
-" Useful mappings for managing tabs
-map <leader>tn :tabnew<cr>
-map <leader>to :tabonly<cr>
-map <leader>tc :tabclose<cr>
-map <leader>tm :tabmove
-map <leader>t<leader> :tabnext
-
-" Opens a new tab with the current buffer's path
-" Super useful when editing files in the same directory
-map <leader>te :tabedit <c-r>=expand("%:p:h")<cr>/
-
-" Switch CWD to the directory of the open buffer
-map <leader>cd :cd %:p:h<cr>:pwd<cr>
-
-" Specify the behavior when switching between buffers
-try
-  set switchbuf=useopen,usetab,newtab
-  set stal=2
-catch
-endtry
-
-" Return to last edit position when opening files (You want this!)
-autocmd BufReadPost *
-     \ if line("'\"") > 0 && line("'\"") <= line("$") |
-     \   exe "normal! g`\"" |
-     \ endif
-" Remember info about open buffers on close
-set viminfo^=%
-
-
-""""""""""""""""""""""""""""""
-" => Status line
-""""""""""""""""""""""""""""""
-" Always show the status line
-set laststatus=2
-
-" Format the status line
-set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Editing mappings
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Remap VIM 0 to first non-blank character
-map 0 ^
-
-" Move a line of text using ALT+[jk] or Comamnd+[jk] on mac
-nmap <M-j> mz:m+<cr>`z
-nmap <M-k> mz:m-2<cr>`z
-vmap <M-j> :m'>+<cr>`<my`>mzgv`yo`z
-vmap <M-k> :m'<-2<cr>`>my`<mzgv`yo`z
-
-if has("mac") || has("macunix")
-  nmap <D-j> <M-j>
-  nmap <D-k> <M-k>
-  vmap <D-j> <M-j>
-  vmap <D-k> <M-k>
-endif
-
-" Delete trailing white space on save, useful for Python and CoffeeScript ;)
-func! DeleteTrailingWS()
-  exe "normal mz"
-  %s/\s\+$//ge
-  exe "normal `z"
-endfunc
-autocmd BufWrite *.py :call DeleteTrailingWS()
-autocmd BufWrite *.coffee :call DeleteTrailingWS()
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => vimgrep searching and cope displaying
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" When you press gv you vimgrep after the selected text
-vnoremap <silent> gv :call VisualSelection('gv', '')<CR>
-
-" Open vimgrep and put the cursor in the right position
-map <leader>g :vimgrep // **/*.<left><left><left><left><left><left><left>
-
-" Vimgreps in the current file
-map <leader><space> :vimgrep // <C-R>%<C-A><right><right><right><right><right><right><right><right><right>
-
-" When you press <leader>r you can search and replace the selected text
-vnoremap <silent> <leader>r :call VisualSelection('replace', '')<CR>
-
-" Do :help cope if you are unsure what cope is. It's super useful!
-"
-" When you search with vimgrep, display your results in cope by doing:
-"   <leader>cc
-"
-" To go to the next search result do:
-"   <leader>n
-"
-" To go to the previous search results do:
-"   <leader>p
-"
-map <leader>cc :botright cope<cr>
-map <leader>co ggVGy:tabnew<cr>:set syntax=qf<cr>pgg
-map <leader>n :cn<cr>
-map <leader>p :cp<cr>
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Spell checking
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Pressing ,ss will toggle and untoggle spell checking
-map <leader>ss :setlocal spell!<cr>
-
-" Shortcuts using <leader>
-map <leader>sn ]s
-map <leader>sp [s
-map <leader>sa zg
-map <leader>s? z=
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Misc
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Remove the Windows ^M - when the encodings gets messed up
-noremap <Leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
-
-" Quickly open a buffer for scripbble
-map <leader>q :e ~/buffer<cr>
-
-" Toggle paste mode on and off
-map <leader>pp :setlocal paste!<cr>
-
-
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" => Helper functions
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-function! CmdLine(str)
-    exe "menu Foo.Bar :" . a:str
-    emenu Foo.Bar
-    unmenu Foo
-endfunction
-
-function! VisualSelection(direction, extra_filter) range
-    let l:saved_reg = @"
-    execute "normal! vgvy"
-
-    let l:pattern = escape(@", '\\/.*$^~[]')
-    let l:pattern = substitute(l:pattern, "\n$", "", "")
-
-    if a:direction == 'b'
-        execute "normal ?" . l:pattern . "^M"
-    elseif a:direction == 'gv'
-        call CmdLine("vimgrep " . '/'. l:pattern . '/' . ' **/*.' . a:extra_filter)
-    elseif a:direction == 'replace'
-        call CmdLine("%s" . '/'. l:pattern . '/')
-    elseif a:direction == 'f'
-        execute "normal /" . l:pattern . "^M"
-    endif
-
-    let @/ = l:pattern
-    let @" = l:saved_reg
-endfunction
-
-
-" Returns true if paste mode is enabled
-function! HasPaste()
-    if &paste
-        return 'PASTE MODE  '
-    en
-    return ''
-endfunction
-
-" Don't close window, when deleting a buffer
-command! Bclose call <SID>BufcloseCloseIt()
-function! <SID>BufcloseCloseIt()
-   let l:currentBufNum = bufnr("%")
-   let l:alternateBufNum = bufnr("#")
-
-   if buflisted(l:alternateBufNum)
-     buffer #
-   else
-     bnext
-   endif
-
-   if bufnr("%") == l:currentBufNum
-     new
-   endif
-
-   if buflisted(l:currentBufNum)
-     execute("bdelete! ".l:currentBufNum)
-   endif
-endfunction
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key b/dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key
deleted file mode 100644
index 7d6a083909e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/files/dot/ssh/insecure_private_key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
-w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
-kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
-hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
-Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
-yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
-ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
-Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
-TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
-iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
-sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
-4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
-cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
-EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
-CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
-3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
-YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
-3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
-dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
-6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
-P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
-llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
-kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
-+vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
-NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
------END RSA PRIVATE KEY-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile b/dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile
deleted file mode 100644
index ee7a39186bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/Puppetfile
+++ /dev/null
@@ -1,25 +0,0 @@
-forge "http://forge.puppetlabs.com"
-mod 'stdlib', :git => 'https://github.com/puphpet/puppetlabs-stdlib.git'
-mod 'concat', :git => 'https://github.com/puphpet/puppetlabs-concat.git'
-mod 'apt', :git => 'https://github.com/puphpet/puppetlabs-apt.git'
-mod 'yum', :git => 'https://github.com/puphpet/puppet-yum.git'
-mod 'vcsrepo', :git => 'https://github.com/puphpet/puppetlabs-vcsrepo.git'
-mod 'ntp', :git => 'https://github.com/puphpet/puppetlabs-ntp.git'
-mod 'firewall', :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
-mod 'git', :git => 'https://github.com/puphpet/puppetlabs-git.git'
-mod 'mailcatcher', :git => 'https://github.com/puphpet/puppet-mailcatcher.git'
-mod 'supervisord', :git => 'https://github.com/puphpet/puppet-supervisord.git'
-mod 'apache', :git => 'https://github.com/puphpet/puppetlabs-apache.git'
-mod 'nginx', :git => 'https://github.com/puphpet/puppet-nginx.git'
-mod 'php', :git => 'https://github.com/puphpet/puppet-php.git'
-mod 'composer', :git => 'https://github.com/puphpet/puppet-composer.git'
-mod 'puphpet', :git => 'https://github.com/puphpet/puppet-puphpet.git'
-mod 'puppi', :git => 'https://github.com/puphpet/puppi.git'
-mod 'drush', :git => 'https://github.com/puphpet/puppet-drush.git'
-mod 'mysql', :git => 'https://github.com/puphpet/puppetlabs-mysql.git'
-mod 'postgresql', :git => 'https://github.com/puphpet/puppetlabs-postgresql.git'
-mod 'mongodb', :git => 'https://github.com/puphpet/puppetlabs-mongodb.git'
-mod 'redis', :git => 'https://github.com/puphpet/puppet-redis.git'
-mod 'beanstalkd', :git => 'https://github.com/puphpet/puppet-beanstalkd.git'
-mod 'rabbitmq', :git => 'https://github.com/puphpet/puppetlabs-rabbitmq.git'
-mod 'staging', :git => 'https://github.com/puphpet/puppet-staging.git'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/hiera.yaml b/dev/vagrant/dolibarrdev/puphpet/puppet/hiera.yaml
deleted file mode 100644
index 0cde1f6a6a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/hiera.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-:backends: yaml
-:yaml:
-    :datadir: '/vagrant/puphpet'
-:hierarchy:
-    - config
-:logger: console
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp
deleted file mode 100644
index 57f759e5531..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/manifest.pp
+++ /dev/null
@@ -1,1745 +0,0 @@
-## Begin Server manifest
-
-if $server_values == undef {
-  $server_values = hiera('server', false)
-} if $vm_values == undef {
-  $vm_values = hiera($::vm_target_key, false)
-}
-# Ensure the time is accurate, reducing the possibilities of apt repositories
-# failing for invalid certificates
-class { 'ntp': }
-
-include 'puphpet'
-include 'puphpet::params'
-
-Exec { path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ] }
-group { 'puppet':   ensure => present }
-group { 'www-data': ensure => present }
-group { 'www-user': ensure => present }
-
-user { $::ssh_username:
-  shell   => '/bin/bash',
-  home    => "/home/${::ssh_username}",
-  ensure  => present,
-  groups  => ['www-data', 'www-user'],
-  require => [Group['www-data'], Group['www-user']]
-}
-
-user { ['apache', 'nginx', 'httpd', 'www-data']:
-  shell  => '/bin/bash',
-  ensure => present,
-  groups => 'www-data',
-  require => Group['www-data']
-}
-
-file { "/home/${::ssh_username}":
-  ensure => directory,
-  owner  => $::ssh_username,
-}
-
-# copy dot files to ssh user's home directory
-exec { 'dotfiles':
-  cwd     => "/home/${::ssh_username}",
-  command => "cp -r /vagrant/puphpet/files/dot/.[a-zA-Z0-9]* /home/${::ssh_username}/ \
-              && chown -R ${::ssh_username} /home/${::ssh_username}/.[a-zA-Z0-9]* \
-              && cp -r /vagrant/puphpet/files/dot/.[a-zA-Z0-9]* /root/",
-  onlyif  => 'test -d /vagrant/puphpet/files/dot',
-  returns => [0, 1],
-  require => User[$::ssh_username]
-}
-
-case $::osfamily {
-  # debian, ubuntu
-  'debian': {
-    class { 'apt': }
-
-    Class['::apt::update'] -> Package <|
-        title != 'python-software-properties'
-    and title != 'software-properties-common'
-    |>
-
-    if ! defined(Package['augeas-tools']) {
-      package { 'augeas-tools':
-        ensure => present,
-      }
-    }
-  }
-  # redhat, centos
-  'redhat': {
-    class { 'yum': extrarepo => ['epel'] }
-
-    class { 'yum::repo::rpmforge': }
-    class { 'yum::repo::repoforgeextras': }
-
-    Class['::yum'] -> Yum::Managed_yumrepo <| |> -> Package <| |>
-
-    if ! defined(Package['git']) {
-      package { 'git':
-        ensure  => latest,
-        require => Class['yum::repo::repoforgeextras']
-      }
-    }
-
-    file_line { 'link ~/.bash_git':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_git ] ; then source ~/.bash_git; fi',
-      path    => "/home/${::ssh_username}/.bash_profile",
-      require => Exec['dotfiles'],
-    }
-
-    file_line { 'link ~/.bash_git for root':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_git ] ; then source ~/.bash_git; fi',
-      path    => '/root/.bashrc',
-      require => Exec['dotfiles'],
-    }
-
-    file_line { 'link ~/.bash_aliases':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_aliases ] ; then source ~/.bash_aliases; fi',
-      path    => "/home/${::ssh_username}/.bash_profile",
-      require => Exec['dotfiles'],
-    }
-
-    file_line { 'link ~/.bash_aliases for root':
-      ensure  => present,
-      line    => 'if [ -f ~/.bash_aliases ] ; then source ~/.bash_aliases; fi',
-      path    => '/root/.bashrc',
-      require => Exec['dotfiles'],
-    }
-
-    ensure_packages( ['augeas'] )
-  }
-}
-
-if $php_values == undef {
-  $php_values = hiera('php', false)
-}
-
-case $::operatingsystem {
-  'debian': {
-    include apt::backports
-
-    add_dotdeb { 'packages.dotdeb.org': release => $lsbdistcodename }
-
-   if hash_key_equals($php_values, 'install', 1) {
-      # Debian Squeeze 6.0 can do PHP 5.3 (default) and 5.4
-      if $lsbdistcodename == 'squeeze' and $php_values['version'] == '54' {
-        add_dotdeb { 'packages.dotdeb.org-php54': release => 'squeeze-php54' }
-      }
-      # Debian Wheezy 7.0 can do PHP 5.4 (default) and 5.5
-      elsif $lsbdistcodename == 'wheezy' and $php_values['version'] == '55' {
-        add_dotdeb { 'packages.dotdeb.org-php55': release => 'wheezy-php55' }
-      }
-    }
-
-    $server_lsbdistcodename = downcase($lsbdistcodename)
-
-    apt::force { 'git':
-      release => "${server_lsbdistcodename}-backports",
-      timeout => 60
-    }
-  }
-  'ubuntu': {
-    apt::key { '4F4EA0AAE5267A6C':
-      key_server => 'hkp://keyserver.ubuntu.com:80'
-    }
-    apt::key { '4CBEDD5A':
-      key_server => 'hkp://keyserver.ubuntu.com:80'
-    }
-
-    if $lsbdistcodename in ['lucid', 'precise'] {
-      apt::ppa { 'ppa:pdoes/ppa': require => Apt::Key['4CBEDD5A'], options => '' }
-    } else {
-      apt::ppa { 'ppa:pdoes/ppa': require => Apt::Key['4CBEDD5A'] }
-    }
-
-    if hash_key_equals($php_values, 'install', 1) {
-      # Ubuntu Lucid 10.04, Precise 12.04, Quantal 12.10 and Raring 13.04 can do PHP 5.3 (default <= 12.10) and 5.4 (default <= 13.04)
-      if $lsbdistcodename in ['lucid', 'precise', 'quantal', 'raring', 'trusty'] and $php_values['version'] == '54' {
-        if $lsbdistcodename == 'lucid' {
-          apt::ppa { 'ppa:ondrej/php5-oldstable': require => Apt::Key['4F4EA0AAE5267A6C'], options => '' }
-        } else {
-          apt::ppa { 'ppa:ondrej/php5-oldstable': require => Apt::Key['4F4EA0AAE5267A6C'] }
-        }
-      }
-      # Ubuntu 12.04/10, 13.04/10, 14.04 can do PHP 5.5
-      elsif $lsbdistcodename in ['precise', 'quantal', 'raring', 'saucy', 'trusty'] and $php_values['version'] == '55' {
-        apt::ppa { 'ppa:ondrej/php5': require => Apt::Key['4F4EA0AAE5267A6C'] }
-      }
-      elsif $lsbdistcodename in ['lucid'] and $php_values['version'] == '55' {
-        err('You have chosen to install PHP 5.5 on Ubuntu 10.04 Lucid. This will probably not work!')
-      }
-    }
-  }
-  'redhat', 'centos': {
-    if hash_key_equals($php_values, 'install', 1) {
-      if $php_values['version'] == '54' {
-        class { 'yum::repo::remi': }
-      }
-      # remi_php55 requires the remi repo as well
-      elsif $php_values['version'] == '55' {
-        class { 'yum::repo::remi': }
-        class { 'yum::repo::remi_php55': }
-      }
-    }
-  }
-}
-
-if is_array($server_values['packages']) and count($server_values['packages']) > 0 {
-  each( $server_values['packages'] ) |$package| {
-    if ! defined(Package[$package]) {
-      package { $package:
-        ensure => present,
-      }
-    }
-  }
-}
-
-define add_dotdeb ($release){
-   apt::source { $name:
-    location          => 'http://packages.dotdeb.org',
-    release           => $release,
-    repos             => 'all',
-    required_packages => 'debian-keyring debian-archive-keyring',
-    key               => '89DF5277',
-    key_server        => 'keys.gnupg.net',
-    include_src       => true
-  }
-}
-
-# Begin open ports for iptables
-if has_key($vm_values, 'vm')
-  and has_key($vm_values['vm'], 'network')
-  and has_key($vm_values['vm']['network'], 'forwarded_port')
-{
-  create_resources( iptables_port, $vm_values['vm']['network']['forwarded_port'] )
-}
-
-if has_key($vm_values, 'ssh') and has_key($vm_values['ssh'], 'port') {
-  $vm_values_ssh_port = $vm_values['ssh']['port'] ? {
-    ''      => 22,
-    undef   => 22,
-    0       => 22,
-    default => $vm_values['ssh']['port']
-  }
-
-  if ! defined(Firewall["100 tcp/${vm_values_ssh_port}"]) {
-    firewall { "100 tcp/${vm_values_ssh_port}":
-      port   => $vm_values_ssh_port,
-      proto  => tcp,
-      action => 'accept',
-      before => Class['my_fw::post']
-    }
-  }
-}
-
-define iptables_port (
-  $host,
-  $guest,
-) {
-  if ! defined(Firewall["100 tcp/${guest}"]) {
-    firewall { "100 tcp/${guest}":
-      port   => $guest,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-}
-
-## Begin MailCatcher manifest
-
-if $mailcatcher_values == undef {
-  $mailcatcher_values = hiera('mailcatcher', false)
-}
-
-if hash_key_equals($mailcatcher_values, 'install', 1) {
-  if ! defined(Package['tilt']) {
-    package { 'tilt':
-      ensure   => '1.3',
-      provider => 'gem',
-      before   => Class['mailcatcher']
-    }
-  }
-
-  if $::operatingsystem == 'ubuntu' and $lsbdistcodename == 'trusty' {
-    package { 'rubygems':
-      ensure => absent,
-    }
-  }
-
-  create_resources('class', { 'mailcatcher' => $mailcatcher_values['settings'] })
-
-  if ! defined(Firewall["100 tcp/${mailcatcher_values['settings']['smtp_port']},${mailcatcher_values['settings']['http_port']}"]) {
-    firewall { "100 tcp/${mailcatcher_values['settings']['smtp_port']}, ${mailcatcher_values['settings']['http_port']}":
-      port   => [$mailcatcher_values['settings']['smtp_port'], $mailcatcher_values['settings']['http_port']],
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-
-  if ! defined(Class['supervisord']) {
-    class { 'supervisord':
-      install_pip => true,
-    }
-  }
-
-  $supervisord_mailcatcher_options = sort(join_keys_to_values({
-    ' --smtp-ip'   => $mailcatcher_values['settings']['smtp_ip'],
-    ' --smtp-port' => $mailcatcher_values['settings']['smtp_port'],
-    ' --http-ip'   => $mailcatcher_values['settings']['http_ip'],
-    ' --http-port' => $mailcatcher_values['settings']['http_port']
-  }, ' '))
-
-  $supervisord_mailcatcher_cmd = "mailcatcher ${supervisord_mailcatcher_options} -f  >> ${mailcatcher_values['settings']['log']}"
-
-  supervisord::program { 'mailcatcher':
-    command     => $supervisord_mailcatcher_cmd,
-    priority    => '100',
-    user        => 'mailcatcher',
-    autostart   => true,
-    autorestart => 'true',
-    environment => {
-      'PATH' => "/bin:/sbin:/usr/bin:/usr/sbin:${mailcatcher_values['settings']['path']}"
-    },
-    require => Package['mailcatcher']
-  }
-}
-
-## Begin Firewall manifest
-
-if $firewall_values == undef {
-  $firewall_values = hiera('firewall', false)
-}
-
-resources { 'firewall':
-  purge => true
-}
-
-Firewall {
-  before  => Class['my_fw::post'],
-  require => Class['my_fw::pre'],
-}
-
-class { ['my_fw::pre', 'my_fw::post']: }
-
-class { 'firewall': }
-
-class my_fw::pre {
-  Firewall {
-    require => undef,
-  }
-
-  # Default firewall rules
-  firewall { '000 accept all icmp':
-    proto  => 'icmp',
-    action => 'accept',
-  }->
-  firewall { '001 accept all to lo interface':
-    proto   => 'all',
-    iniface => 'lo',
-    action  => 'accept',
-  }->
-  firewall { '002 accept related established rules':
-    proto  => 'all',
-    state  => ['RELATED', 'ESTABLISHED'],
-    action => 'accept',
-  }
-}
-
-class my_fw::post {
-  firewall { '999 drop all':
-    proto   => 'all',
-    action  => 'drop',
-    before  => undef,
-  }
-}
-
-if is_hash($firewall_values['rules']) and count($firewall_values['rules']) > 0 {
-  each( $firewall_values['rules'] ) |$key, $rule| {
-    if ! defined(Firewall["${rule['priority']} ${rule['proto']}/${rule['port']}"]) {
-      firewall { "${rule['priority']} ${rule['proto']}/${rule['port']}":
-        port   => $rule['port'],
-        proto  => $rule['proto'],
-        action => $rule['action'],
-      }
-    }
-  }
-}
-
-## Begin Apache manifest
-
-if $yaml_values == undef {
-  $yaml_values = loadyaml('/vagrant/puphpet/config.yaml')
-} if $apache_values == undef {
-  $apache_values = $yaml_values['apache']
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1) {
-  include puphpet::params
-  include apache::params
-
-  $webroot_location = $puphpet::params::apache_webroot_location
-
-  exec { "exec mkdir -p ${webroot_location}":
-    command => "mkdir -p ${webroot_location}",
-    creates => $webroot_location,
-  }
-
-  if (downcase($::provisioner_type) in ['virtualbox', 'vmware_fusion'])
-    and ! defined(File[$webroot_location])
-  {
-    file { $webroot_location:
-      ensure  => directory,
-      mode    => 0775,
-      require => [
-        Exec["exec mkdir -p ${webroot_location}"],
-        Group['www-data']
-      ]
-    }
-  }
-
-  if !(downcase($::provisioner_type) in ['virtualbox', 'vmware_fusion'])
-    and ! defined(File[$webroot_location])
-  {
-    file { $webroot_location:
-      ensure  => directory,
-      group   => 'www-data',
-      mode    => 0775,
-      require => [
-        Exec["exec mkdir -p ${webroot_location}"],
-        Group['www-data']
-      ]
-    }
-  }
-
-  if hash_key_equals($hhvm_values, 'install', 1) {
-    $mpm_module           = 'worker'
-    $disallowed_modules   = ['php']
-    $apache_conf_template = 'puphpet/apache/hhvm-httpd.conf.erb'
-    $apache_php_package   = 'hhvm'
-  } elsif hash_key_equals($php_values, 'install', 1) {
-    $mpm_module           = 'prefork'
-    $disallowed_modules   = []
-    $apache_conf_template = $apache::params::conf_template
-    $apache_php_package   = 'php'
-  } else {
-    $mpm_module           = 'prefork'
-    $disallowed_modules   = []
-    $apache_conf_template = $apache::params::conf_template
-    $apache_php_package   = ''
-  }
-
-  if $::operatingsystem == 'ubuntu'
-  and hash_key_equals($php_values, 'install', 1)
-  and hash_key_equals($php_values, 'version', 55)
-  {
-    $apache_version = '2.4'
-  } else {
-    $apache_version = $apache::version::default
-  }
-
-  $apache_settings = merge($apache_values['settings'], {
-    'default_vhost'  => false,
-    'mpm_module'     => $mpm_module,
-    'conf_template'  => $apache_conf_template,
-    'sendfile'       => $apache_values['settings']['sendfile'] ? { 1 => 'On', default => 'Off' },
-    'apache_version' => $apache_version
-  })
-
-  create_resources('class', { 'apache' => $apache_settings })
-
-  if hash_key_equals($apache_values, 'mod_pagespeed', 1) {
-    class { 'puphpet::apache::modpagespeed': }
-  }
-
-  if hash_key_equals($apache_values, 'mod_spdy', 1) {
-    class { 'puphpet::apache::modspdy':
-      php_package => $apache_php_package
-    }
-  }
-
-  if $apache_values['settings']['default_vhost'] == true {
-    $apache_vhosts = merge($apache_values['vhosts'], {
-      'default_vhost_80'  => {
-        'servername'    => 'default',
-        'serveraliases' => ['*'],
-        'docroot'       => '/var/www/default',
-        'port'          => 80,
-      },
-      'default_vhost_443' => {
-        'servername'    => 'default',
-        'serveraliases' => ['*'],
-        'docroot'       => '/var/www/default',
-        'port'          => 443,
-      },
-    })
-  } else {
-    $apache_vhosts = $apache_values['vhosts']
-  }
-
-  if count($apache_vhosts) > 0 {
-    each( $apache_vhosts ) |$key, $vhost| {
-      exec { "exec mkdir -p ${vhost['docroot']} @ key ${key}":
-        command => "mkdir -p ${vhost['docroot']}",
-        creates => $vhost['docroot'],
-      }
-
-      if (downcase($::provisioner_type) in ['virtualbox', 'vmware_fusion'])
-        and ! defined(File[$vhost['docroot']])
-      {
-        file { $vhost['docroot']:
-          ensure  => directory,
-          mode    => 0765,
-          require => Exec["exec mkdir -p ${vhost['docroot']} @ key ${key}"]
-        }
-      }
-
-      if !(downcase($::provisioner_type) in ['virtualbox', 'vmware_fusion'])
-        and ! defined(File[$vhost['docroot']])
-      {
-        file { $vhost['docroot']:
-          ensure  => directory,
-          group   => 'www-user',
-          mode    => 0765,
-          require => [
-            Exec["exec mkdir -p ${vhost['docroot']} @ key ${key}"],
-            Group['www-user']
-          ]
-        }
-      }
-
-      create_resources(apache::vhost, { "${key}" => merge($vhost, {
-          'custom_fragment' => template('puphpet/apache/custom_fragment.erb'),
-          'ssl'             => 'ssl'           in $vhost and str2bool($vhost['ssl']) ? { true => true, default => false },
-          'ssl_cert'        => 'ssl_cert'      in $vhost and $vhost['ssl_cert']      ? { undef => undef, '' => undef, default => $vhost['ssl_cert'] },
-          'ssl_key'         => 'ssl_key'       in $vhost and $vhost['ssl_key']       ? { undef => undef, '' => undef, default => $vhost['ssl_key'] },
-          'ssl_chain'       => 'ssl_chain'     in $vhost and $vhost['ssl_chain']     ? { undef => undef, '' => undef, default => $vhost['ssl_chain'] },
-          'ssl_certs_dir'   => 'ssl_certs_dir' in $vhost and $vhost['ssl_certs_dir'] ? { undef => undef, '' => undef, default => $vhost['ssl_certs_dir'] }
-        })
-      })
-
-      if ! defined(Firewall["100 tcp/${vhost['port']}"]) {
-        firewall { "100 tcp/${vhost['port']}":
-          port   => $vhost['port'],
-          proto  => tcp,
-          action => 'accept',
-        }
-      }
-    }
-  }
-
-  if ! defined(Firewall['100 tcp/443']) {
-    firewall { '100 tcp/443':
-      port   => 443,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-
-  if count($apache_values['modules']) > 0 {
-    apache_mod { $apache_values['modules']: }
-  }
-}
-
-define apache_mod {
-  if ! defined(Class["apache::mod::${name}"]) and !($name in $disallowed_modules) {
-    class { "apache::mod::${name}": }
-  }
-}
-
-## Begin Nginx manifest
-
-if $nginx_values == undef {
-   $nginx_values = hiera('nginx', false)
-} if $php_values == undef {
-   $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-}
-
-if hash_key_equals($nginx_values, 'install', 1) {
-  include nginx::params
-  include puphpet::params
-
-  Class['puphpet::ssl_cert'] -> Nginx::Resource::Vhost <| |>
-
-  class { 'puphpet::ssl_cert': }
-
-  if $lsbdistcodename == 'lucid' and hash_key_equals($php_values, 'version', '53') {
-    apt::key { '67E15F46': key_server => 'hkp://keyserver.ubuntu.com:80' }
-    apt::ppa { 'ppa:l-mierzwa/lucid-php5':
-      options => '',
-      require => Apt::Key['67E15F46']
-    }
-  }
-
-  $webroot_location = $puphpet::params::nginx_webroot_location
-
-  exec { "exec mkdir -p ${webroot_location}":
-    command => "mkdir -p ${webroot_location}",
-    creates => $webroot_location,
-  }
-
-  if (downcase($::provisioner_type) in ['virtualbox', 'vmware_fusion'])
-    and ! defined(File[$webroot_location])
-  {
-    file { $webroot_location:
-      ensure  => directory,
-      mode    => 0775,
-      require => [
-        Exec["exec mkdir -p ${webroot_location}"],
-        Group['www-data']
-      ]
-    }
-  }
-
-  if !(downcase($::provisioner_type) in ['virtualbox', 'vmware_fusion'])
-    and ! defined(File[$webroot_location])
-  {
-    file { $webroot_location:
-      ensure  => directory,
-      group   => 'www-data',
-      mode    => 0775,
-      require => [
-        Exec["exec mkdir -p ${webroot_location}"],
-        Group['www-data']
-      ]
-    }
-  }
-
-  if $::osfamily == 'redhat' {
-      file { '/usr/share/nginx':
-        ensure  => directory,
-        mode    => 0775,
-        owner   => 'www-data',
-        group   => 'www-data',
-        require => Group['www-data'],
-        before  => Package['nginx']
-      }
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $php5_fpm_sock = '/var/run/php5-fpm.sock'
-
-    if $php_values['version'] == undef {
-      $fastcgi_pass = null
-    } elsif $php_values['version'] == '53' {
-      $fastcgi_pass = '127.0.0.1:9000'
-    } else {
-      $fastcgi_pass = "unix:${php5_fpm_sock}"
-    }
-
-    if $::osfamily == 'redhat' and $fastcgi_pass == "unix:${php5_fpm_sock}" {
-      exec { "create ${php5_fpm_sock} file":
-        command => "touch ${php5_fpm_sock}",
-        onlyif  => ["test ! -f ${php5_fpm_sock}", "test ! -f ${php5_fpm_sock}="],
-        require => Package['nginx'],
-      }
-
-      exec { "listen = 127.0.0.1:9000 => listen = ${php5_fpm_sock}":
-        command => "perl -p -i -e 's#listen = 127.0.0.1:9000#listen = ${php5_fpm_sock}#gi' /etc/php-fpm.d/www.conf",
-        unless  => "grep -c 'listen = 127.0.0.1:9000' '${php5_fpm_sock}'",
-        notify  => [
-          Class['nginx::service'],
-          Service['php-fpm']
-        ],
-        require => Exec["create ${php5_fpm_sock} file"]
-      }
-
-      set_php5_fpm_sock_group_and_user { 'php_rhel':
-        require => Exec["create ${php5_fpm_sock} file"],
-      }
-    } else {
-      set_php5_fpm_sock_group_and_user { 'php':
-        require   => Package['nginx'],
-        subscribe => Service['php5-fpm'],
-      }
-    }
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $fastcgi_pass        = '127.0.0.1:9000'
-
-    set_php5_fpm_sock_group_and_user { 'hhvm':
-      require => Package['nginx'],
-    }
-  } else {
-    $fastcgi_pass        = ''
-  }
-
-  class { 'nginx': }
-
-  if count($nginx_values['vhosts']) > 0 {
-    each( $nginx_values['vhosts'] ) |$key, $vhost| {
-      exec { "exec mkdir -p ${vhost['www_root']} @ key ${key}":
-        command => "mkdir -p ${vhost['www_root']}",
-        creates => $vhost['www_root'],
-      }
-
-      if ! defined(File[$vhost['www_root']]) {
-        file { $vhost['www_root']:
-          ensure  => directory,
-          require => Exec["exec mkdir -p ${vhost['www_root']} @ key ${key}"]
-        }
-      }
-
-      if ! defined(Firewall["100 tcp/${vhost['listen_port']}"]) {
-        firewall { "100 tcp/${vhost['listen_port']}":
-          port   => $vhost['listen_port'],
-          proto  => tcp,
-          action => 'accept',
-        }
-      }
-    }
-
-    create_resources(nginx_vhost, $nginx_values['vhosts'])
-  }
-
-  if ! defined(Firewall['100 tcp/443']) {
-    firewall { '100 tcp/443':
-      port   => 443,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-}
-
-define nginx_vhost (
-  $server_name,
-  $server_aliases = [],
-  $www_root,
-  $listen_port,
-  $index_files,
-  $envvars = [],
-  $ssl = false,
-  $ssl_cert = $puphpet::params::ssl_cert_location,
-  $ssl_key = $puphpet::params::ssl_key_location,
-  $ssl_port = '443',
-  $rewrite_to_https = false,
-  $spdy = $nginx::params::nx_spdy,
-){
-  $merged_server_name = concat([$server_name], $server_aliases)
-
-  if is_array($index_files) and count($index_files) > 0 {
-    $try_files = $index_files[count($index_files) - 1]
-  } else {
-    $try_files = 'index.php'
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $fastcgi_param_parts = [
-      'PATH_INFO $fastcgi_path_info',
-      'PATH_TRANSLATED $document_root$fastcgi_path_info',
-      'SCRIPT_FILENAME $document_root$fastcgi_script_name'
-    ]
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $fastcgi_param_parts = [
-      'SCRIPT_FILENAME $document_root$fastcgi_script_name'
-    ]
-  } else {
-    $fastcgi_param_parts = []
-  }
-
-  if $ssl == 0 or $ssl == false or $ssl == '' {
-    $ssl_set = false
-  } else {
-    $ssl_set = true
-  }
-
-  if $ssl_cert == 0 or $ssl_cert == false or $ssl_cert == '' {
-    $ssl_cert_set = $puphpet::params::ssl_cert_location
-  } else {
-    $ssl_cert_set = $ssl_cert
-  }
-
-  if $ssl_key == 0 or $ssl_key == false or $ssl_key == '' {
-    $ssl_key_set = $puphpet::params::ssl_key_location
-  } else {
-    $ssl_key_set = $ssl_key
-  }
-
-  if $ssl_port == 0 or $ssl_port == false or $ssl_port == '' {
-    $ssl_port_set = '443'
-  } else {
-    $ssl_port_set = $ssl_port
-  }
-
-  if $rewrite_to_https == 0 or $rewrite_to_https == false or $rewrite_to_https == '' {
-    $rewrite_to_https_set = false
-  } else {
-    $rewrite_to_https_set = true
-  }
-
-  if $spdy == off or $spdy == 0 or $spdy == false or $spdy == '' {
-    $spdy_set = off
-  } else {
-    $spdy_set = on
-  }
-
-  nginx::resource::vhost { $server_name:
-    server_name      => $merged_server_name,
-    www_root         => $www_root,
-    listen_port      => $listen_port,
-    index_files      => $index_files,
-    try_files        => ['$uri', '$uri/', "/${try_files}?\$args"],
-    ssl              => $ssl_set,
-    ssl_cert         => $ssl_cert_set,
-    ssl_key          => $ssl_key_set,
-    ssl_port         => $ssl_port_set,
-    rewrite_to_https => $rewrite_to_https_set,
-    spdy             => $spdy_set,
-    vhost_cfg_append => {
-       sendfile => 'off'
-    }
-  }
-
-  $fastcgi_param = concat($fastcgi_param_parts, $envvars)
-
-  nginx::resource::location { "${server_name}-php":
-    ensure              => present,
-    vhost               => $server_name,
-    location            => '~ \.php$',
-    proxy               => undef,
-    try_files           => ['$uri', '$uri/', "/${try_files}?\$args"],
-    ssl                 => $ssl_set,
-    www_root            => $www_root,
-    location_cfg_append => {
-      'fastcgi_split_path_info' => '^(.+\.php)(/.+)$',
-      'fastcgi_param'           => $fastcgi_param,
-      'fastcgi_pass'            => $fastcgi_pass,
-      'fastcgi_index'           => 'index.php',
-      'include'                 => 'fastcgi_params'
-    },
-    notify              => Class['nginx::service'],
-  }
-}
-
-define set_php5_fpm_sock_group_and_user (){
-  exec { 'set php5_fpm_sock group and user':
-    command => "chmod 660 ${php5_fpm_sock} && chown www-data ${php5_fpm_sock} && chgrp www-data ${php5_fpm_sock} && touch /.puphpet-stuff/php5_fpm_sock",
-    creates => '/.puphpet-stuff/php5_fpm_sock',
-  }
-}
-
-## Begin PHP manifest
-
-if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-} if $mailcatcher_values == undef {
-  $mailcatcher_values = hiera('mailcatcher', false)
-}
-
-if hash_key_equals($php_values, 'install', 1) {
-  Class['Php'] -> Class['Php::Devel'] -> Php::Module <| |> -> Php::Pear::Module <| |> -> Php::Pecl::Module <| |>
-
-  if $php_prefix == undef {
-    $php_prefix = $::operatingsystem ? {
-      /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => 'php5-',
-      default                                 => 'php-',
-    }
-  }
-
-  if $php_fpm_ini == undef {
-    $php_fpm_ini = $::operatingsystem ? {
-      /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => '/etc/php5/fpm/php.ini',
-      default                                 => '/etc/php.ini',
-    }
-  }
-
-  if hash_key_equals($apache_values, 'install', 1) {
-    include apache::params
-
-    if has_key($apache_values, 'mod_spdy') and $apache_values['mod_spdy'] == 1 {
-      $php_webserver_service_ini = 'cgi'
-    } else {
-      $php_webserver_service_ini = 'httpd'
-    }
-
-    $php_webserver_service = 'httpd'
-    $php_webserver_user    = $apache::params::user
-    $php_webserver_restart = true
-
-    class { 'php':
-      service => $php_webserver_service
-    }
-  } elsif hash_key_equals($nginx_values, 'install', 1) {
-    include nginx::params
-
-    $php_webserver_service     = "${php_prefix}fpm"
-    $php_webserver_service_ini = $php_webserver_service
-    $php_webserver_user        = $nginx::params::nx_daemon_user
-    $php_webserver_restart     = true
-
-    class { 'php':
-      package             => $php_webserver_service,
-      service             => $php_webserver_service,
-      service_autorestart => false,
-      config_file         => $php_fpm_ini,
-    }
-
-    service { $php_webserver_service:
-      ensure     => running,
-      enable     => true,
-      hasrestart => true,
-      hasstatus  => true,
-      require    => Package[$php_webserver_service]
-    }
-  } else {
-    $php_webserver_service     = undef
-    $php_webserver_service_ini = undef
-    $php_webserver_restart     = false
-
-    class { 'php':
-      package             => "${php_prefix}cli",
-      service             => $php_webserver_service,
-      service_autorestart => false,
-    }
-  }
-
-  class { 'php::devel': }
-
-  if count($php_values['modules']['php']) > 0 {
-    php_mod { $php_values['modules']['php']:; }
-  }
-  if count($php_values['modules']['pear']) > 0 {
-    php_pear_mod { $php_values['modules']['pear']:; }
-  }
-  if count($php_values['modules']['pecl']) > 0 {
-    php_pecl_mod { $php_values['modules']['pecl']:; }
-  }
-  if count($php_values['ini']) > 0 {
-    each( $php_values['ini'] ) |$key, $value| {
-      if is_array($value) {
-        each( $php_values['ini'][$key] ) |$innerkey, $innervalue| {
-          puphpet::ini { "${key}_${innerkey}":
-            entry       => "CUSTOM_${innerkey}/${key}",
-            value       => $innervalue,
-            php_version => $php_values['version'],
-            webserver   => $php_webserver_service_ini
-          }
-        }
-      } else {
-        puphpet::ini { $key:
-          entry       => "CUSTOM/${key}",
-          value       => $value,
-          php_version => $php_values['version'],
-          webserver   => $php_webserver_service_ini
-        }
-      }
-    }
-
-    if $php_values['ini']['session.save_path'] != undef {
-      $php_sess_save_path = $php_values['ini']['session.save_path']
-
-      exec {"mkdir -p ${php_sess_save_path}":
-        onlyif => "test ! -d ${php_sess_save_path}",
-        before => Class['php']
-      }
-      exec {"chmod 775 ${php_sess_save_path} && chown www-data ${php_sess_save_path} && chgrp www-data ${php_sess_save_path}":
-        require => Class['php']
-      }
-    }
-  }
-
-  puphpet::ini { $key:
-    entry       => 'CUSTOM/date.timezone',
-    value       => $php_values['timezone'],
-    php_version => $php_values['version'],
-    webserver   => $php_webserver_service_ini
-  }
-
-  if hash_key_equals($php_values, 'composer', 1) {
-    $php_composer_home = $php_values['composer_home'] ? {
-      false   => false,
-      undef   => false,
-      ''      => false,
-      default => $php_values['composer_home'],
-    }
-
-    if $php_composer_home {
-      file { $php_composer_home:
-        ensure  => directory,
-        owner   => 'www-data',
-        group   => 'www-data',
-        mode    => 0775,
-        require => [Group['www-data'], Group['www-user']]
-      }
-
-      file_line { "COMPOSER_HOME=${php_composer_home}":
-        path => '/etc/environment',
-        line => "COMPOSER_HOME=${php_composer_home}",
-      }
-    }
-
-    class { 'composer':
-      target_dir      => '/usr/local/bin',
-      composer_file   => 'composer',
-      download_method => 'curl',
-      logoutput       => false,
-      tmp_path        => '/tmp',
-      php_package     => "${php::params::module_prefix}cli",
-      curl_package    => 'curl',
-      suhosin_enabled => false,
-    }
-  }
-
-  # Usually this would go within the library that needs in (Mailcatcher)
-  # but the values required are sufficiently complex that it's easier to
-  # add here
-  if hash_key_equals($mailcatcher_values, 'install', 1)
-    and ! defined(Puphpet::Ini['sendmail_path'])
-  {
-    puphpet::ini { 'sendmail_path':
-      entry       => 'CUSTOM/sendmail_path',
-      value       => '/usr/bin/env catchmail',
-      php_version => $php_values['version'],
-      webserver   => $php_webserver_service_ini
-    }
-  }
-}
-
-define php_mod {
-  if ! defined(Puphpet::Php::Module[$name]) {
-    puphpet::php::module { $name:
-      service_autorestart => $php_webserver_restart,
-    }
-  }
-}
-define php_pear_mod {
-  if ! defined(Puphpet::Php::Pear[$name]) {
-    puphpet::php::pear { $name:
-      service_autorestart => $php_webserver_restart,
-    }
-  }
-}
-define php_pecl_mod {
-  if ! defined(Puphpet::Php::Extra_repos[$name]) {
-    puphpet::php::extra_repos { $name:
-      before => Puphpet::Php::Pecl[$name],
-    }
-  }
-
-  if ! defined(Puphpet::Php::Pecl[$name]) {
-    puphpet::php::pecl { $name:
-      service_autorestart => $php_webserver_restart,
-    }
-  }
-}
-
-## Begin Xdebug manifest
-
-if $xdebug_values == undef {
-  $xdebug_values = hiera('xdebug', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1) {
-  $xdebug_webserver_service = 'httpd'
-} elsif hash_key_equals($nginx_values, 'install', 1) {
-  $xdebug_webserver_service = 'nginx'
-} else {
-  $xdebug_webserver_service = undef
-}
-
-if hash_key_equals($xdebug_values, 'install', 1)
-  and hash_key_equals($php_values, 'install', 1)
-{
-  class { 'puphpet::xdebug':
-    webserver => $xdebug_webserver_service
-  }
-
-  if is_hash($xdebug_values['settings']) and count($xdebug_values['settings']) > 0 {
-    each( $xdebug_values['settings'] ) |$key, $value| {
-      puphpet::ini { $key:
-        entry       => "XDEBUG/${key}",
-        value       => $value,
-        php_version => $php_values['version'],
-        webserver   => $xdebug_webserver_service
-      }
-    }
-  }
-}
-
-## Begin Xhprof manifest
-
-if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $xhprof_values == undef {
-  $xhprof_values = hiera('xhprof', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($xhprof_values, 'install', 1)
-  and hash_key_equals($php_values, 'install', 1)
-{
-  if $::operatingsystem == 'ubuntu' and $lsbdistcodename in ['lucid', 'maverick', 'natty', 'oneiric', 'precise'] {
-    apt::key { '8D0DC64F':
-      key_server => 'hkp://keyserver.ubuntu.com:80'
-    }
-
-    apt::ppa { 'ppa:brianmercer/php5-xhprof': require => Apt::Key['8D0DC64F'] }
-  }
-
-  if hash_key_equals($apache_values, 'install', 1) {
-    $xhprof_webroot_location = $puphpet::params::apache_webroot_location
-    $xhprof_webserver_service = 'httpd'
-  } elsif hash_key_equals($nginx_values, 'install', 1) {
-    $xhprof_webroot_location = $puphpet::params::nginx_webroot_location
-    $xhprof_webserver_service = 'nginx'
-  } else {
-    $xhprof_webroot_location = $xhprof_values['location']
-    $xhprof_webserver_service = undef
-  }
-
-  if ! defined(Package['graphviz']) {
-    package { 'graphviz':
-      ensure  => present,
-    }
-  }
-
-  class { 'puphpet::xhprof':
-    php_version       => $php_values['version'],
-    webroot_location  => $xhprof_webroot_location,
-    webserver_service => $xhprof_webserver_service
-  }
-}
-
-## Begin Drush manifest
-
-if $drush_values == undef {
-  $drush_values = hiera('drush', false)
-}
-
-if hash_key_equals($drush_values, 'install', 1) {
-  if ($drush_values['settings']['drush.tag_branch'] != undef) {
-    $drush_tag_branch = $drush_values['settings']['drush.tag_branch']
-  } else {
-    $drush_tag_branch = ''
-  }
-
-  include drush::git::drush
-}
-
-## Begin MySQL manifest
-
-if $mysql_values == undef {
-  $mysql_values = hiera('mysql', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-include 'mysql::params'
-
-if hash_key_equals($mysql_values, 'install', 1) {
-  if hash_key_equals($apache_values, 'install', 1) or hash_key_equals($nginx_values, 'install', 1) {
-    $mysql_webserver_restart = true
-  } else {
-    $mysql_webserver_restart = false
-  }
-
-  if $::osfamily == 'redhat' {
-    exec { 'mysql-community-repo':
-      command => 'yum -y --nogpgcheck install "http://dev.mysql.com/get/mysql-community-release-el6-5.noarch.rpm" && touch /.puphpet-stuff/mysql-community-release',
-      creates => '/.puphpet-stuff/mysql-community-release'
-    }
-
-    $mysql_server_require             = Exec['mysql-community-repo']
-    $mysql_server_server_package_name = 'mysql-community-server'
-    $mysql_server_client_package_name = 'mysql-community-client'
-  } else {
-    $mysql_server_require             = []
-    $mysql_server_server_package_name = $mysql::params::server_package_name
-    $mysql_server_client_package_name = $mysql::params::client_package_name
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $mysql_php_installed = true
-    $mysql_php_package   = 'php'
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $mysql_php_installed = true
-    $mysql_php_package   = 'hhvm'
-  } else {
-    $mysql_php_installed = false
-  }
-
-  if $mysql_values['root_password'] {
-    class { 'mysql::server':
-      package_name  => $mysql_server_server_package_name,
-      root_password => $mysql_values['root_password'],
-      require       => $mysql_server_require
-    }
-
-    class { 'mysql::client':
-      package_name => $mysql_server_client_package_name,
-      require      => $mysql_server_require
-    }
-
-    if is_hash($mysql_values['databases']) and count($mysql_values['databases']) > 0 {
-      create_resources(mysql_db, $mysql_values['databases'])
-    }
-
-    if $mysql_php_installed and $mysql_php_package == 'php' {
-      if $::osfamily == 'redhat' and $php_values['version'] == '53' {
-        $mysql_php_module = 'mysql'
-      } elsif $lsbdistcodename == 'lucid' or $lsbdistcodename == 'squeeze' {
-        $mysql_php_module = 'mysql'
-      } else {
-        $mysql_php_module = 'mysqlnd'
-      }
-
-      if ! defined(Php::Module[$mysql_php_module]) {
-        php::module { $mysql_php_module:
-          service_autorestart => $mysql_webserver_restart,
-        }
-      }
-    }
-  }
-
-  if hash_key_equals($mysql_values, 'adminer', 1) and $mysql_php_installed {
-    if hash_key_equals($apache_values, 'install', 1) {
-      $mysql_adminer_webroot_location = $puphpet::params::apache_webroot_location
-    } elsif hash_key_equals($nginx_values, 'install', 1) {
-      $mysql_adminer_webroot_location = $puphpet::params::nginx_webroot_location
-    } else {
-      $mysql_adminer_webroot_location = $puphpet::params::apache_webroot_location
-    }
-
-    class { 'puphpet::adminer':
-      location    => "${mysql_adminer_webroot_location}/adminer",
-      owner       => 'www-data',
-      php_package => $mysql_php_package
-    }
-  }
-}
-
-define mysql_db (
-  $user,
-  $password,
-  $host,
-  $grant    = [],
-  $sql_file = false
-) {
-  if $name == '' or $password == '' or $host == '' {
-    fail( 'MySQL DB requires that name, password and host be set. Please check your settings!' )
-  }
-
-  mysql::db { $name:
-    user     => $user,
-    password => $password,
-    host     => $host,
-    grant    => $grant,
-    sql      => $sql_file,
-  }
-}
-
-# @todo update this
-define mysql_nginx_default_conf (
-  $webroot
-) {
-  if $php5_fpm_sock == undef {
-    $php5_fpm_sock = '/var/run/php5-fpm.sock'
-  }
-
-  if $fastcgi_pass == undef {
-    $fastcgi_pass = $php_values['version'] ? {
-      undef   => null,
-      '53'    => '127.0.0.1:9000',
-      default => "unix:${php5_fpm_sock}"
-    }
-  }
-
-  class { 'puphpet::nginx':
-    fastcgi_pass => $fastcgi_pass,
-    notify       => Class['nginx::service'],
-  }
-}
-
-## Begin PostgreSQL manifest
-
-if $postgresql_values == undef {
-  $postgresql_values = hiera('postgresql', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-}
-
-if hash_key_equals($postgresql_values, 'install', 1) {
-  if hash_key_equals($apache_values, 'install', 1) or hash_key_equals($nginx_values, 'install', 1) {
-    $postgresql_webserver_restart = true
-  } else {
-    $postgresql_webserver_restart = false
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $postgresql_php_installed = true
-    $postgresql_php_package   = 'php'
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $postgresql_php_installed = true
-    $postgresql_php_package   = 'hhvm'
-  } else {
-    $postgresql_php_installed = false
-  }
-
-  if $postgresql_values['settings']['root_password'] {
-    group { $postgresql_values['settings']['user_group']:
-      ensure => present
-    }
-
-    class { 'postgresql::globals':
-      manage_package_repo => true,
-      encoding            => $postgresql_values['settings']['encoding'],
-      version             => $postgresql_values['settings']['version']
-    }->
-    class { 'postgresql::server':
-      postgres_password => $postgresql_values['settings']['root_password'],
-      version           => $postgresql_values['settings']['version'],
-      require           => Group[$postgresql_values['settings']['user_group']]
-    }
-
-    if is_hash($postgresql_values['databases']) and count($postgresql_values['databases']) > 0 {
-      create_resources(postgresql_db, $postgresql_values['databases'])
-    }
-
-    if $postgresql_php_installed and $postgresql_php_package == 'php' and ! defined(Php::Module['pgsql']) {
-      php::module { 'pgsql':
-        service_autorestart => $postgresql_webserver_restart,
-      }
-    }
-  }
-
-  if hash_key_equals($postgresql_values, 'adminer', 1) and $postgresql_php_installed {
-    if hash_key_equals($apache_values, 'install', 1) {
-      $postgresql_adminer_webroot_location = $puphpet::params::apache_webroot_location
-    } elsif hash_key_equals($nginx_values, 'install', 1) {
-      $postgresql_adminer_webroot_location = $puphpet::params::nginx_webroot_location
-    } else {
-      $postgresql_adminer_webroot_location = $puphpet::params::apache_webroot_location
-    }
-
-    class { 'puphpet::adminer':
-      location    => "${postgresql_adminer_webroot_location}/adminer",
-      owner       => 'www-data',
-      php_package => $postgresql_php_package
-    }
-  }
-}
-
-define postgresql_db (
-  $user,
-  $password,
-  $grant,
-  $sql_file = false
-) {
-  if $name == '' or $user == '' or $password == '' or $grant == '' {
-    fail( 'PostgreSQL DB requires that name, user, password and grant be set. Please check your settings!' )
-  }
-
-  postgresql::server::db { $name:
-    user     => $user,
-    password => $password,
-    grant    => $grant
-  }
-
-  if $sql_file {
-    $table = "${name}.*"
-
-    exec{ "${name}-import":
-      command     => "psql ${name} < ${sql_file}",
-      logoutput   => true,
-      refreshonly => $refresh,
-      require     => Postgresql::Server::Db[$name],
-      onlyif      => "test -f ${sql_file}"
-    }
-  }
-}
-
-## Begin MariaDb manifest
-
-if $mariadb_values == undef {
-  $mariadb_values = hiera('mariadb', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($mariadb_values, 'install', 1) {
-  if hash_key_equals($apache_values, 'install', 1) or hash_key_equals($nginx_values, 'install', 1) {
-    $mariadb_webserver_restart = true
-  } else {
-    $mariadb_webserver_restart = false
-  }
-
-  if hash_key_equals($php_values, 'install', 1) {
-    $mariadb_php_installed = true
-    $mariadb_php_package   = 'php'
-  } elsif hash_key_equals($hhvm_values, 'install', 1) {
-    $mariadb_php_installed = true
-    $mariadb_php_package   = 'hhvm'
-  } else {
-    $mariadb_php_installed = false
-  }
-
-  if has_key($mariadb_values, 'root_password') and $mariadb_values['root_password'] {
-    include 'mysql::params'
-
-    if (! defined(File[$mysql::params::datadir])) {
-      file { $mysql::params::datadir :
-        ensure => directory,
-        group  => $mysql::params::root_group,
-        before => Class['mysql::server']
-      }
-    }
-
-    if ! defined(Group['mysql']) {
-      group { 'mysql':
-        ensure => present
-      }
-    }
-
-    if ! defined(User['mysql']) {
-      user { 'mysql':
-        ensure => present,
-      }
-    }
-
-    if (! defined(File['/var/run/mysqld'])) {
-      file { '/var/run/mysqld' :
-        ensure  => directory,
-        group   => 'mysql',
-        owner   => 'mysql',
-        before  => Class['mysql::server'],
-        require => [User['mysql'], Group['mysql']],
-        notify  => Service['mysql'],
-      }
-    }
-
-    if ! defined(File[$mysql::params::socket]) {
-      file { $mysql::params::socket :
-        ensure  => file,
-        group   => $mysql::params::root_group,
-        before  => Class['mysql::server'],
-        require => File[$mysql::params::datadir]
-      }
-    }
-
-    if ! defined(Package['mysql-libs']) {
-      package { 'mysql-libs':
-        ensure => purged,
-        before => Class['mysql::server'],
-      }
-    }
-
-    class { 'puphpet::mariadb':
-      version => $mariadb_values['version']
-    }
-
-    class { 'mysql::server':
-      package_name  => $puphpet::params::mariadb_package_server_name,
-      root_password => $mariadb_values['root_password'],
-      service_name  => 'mysql',
-    }
-
-    class { 'mysql::client':
-      package_name => $puphpet::params::mariadb_package_client_name
-    }
-
-    if is_hash($mariadb_values['databases']) and count($mariadb_values['databases']) > 0 {
-      create_resources(mariadb_db, $mariadb_values['databases'])
-    }
-
-    if $mariadb_php_installed and $mariadb_php_package == 'php' {
-      if $::osfamily == 'redhat' and $php_values['version'] == '53' {
-        $mariadb_php_module = 'mysql'
-      } elsif $lsbdistcodename == 'lucid' or $lsbdistcodename == 'squeeze' {
-        $mariadb_php_module = 'mysql'
-      } else {
-        $mariadb_php_module = 'mysqlnd'
-      }
-
-      if ! defined(Php::Module[$mariadb_php_module]) {
-        php::module { $mariadb_php_module:
-          service_autorestart => $mariadb_webserver_restart,
-        }
-      }
-    }
-  }
-
-  if hash_key_equals($mariadb_values, 'adminer', 1) and $mariadb_php_installed {
-    if hash_key_equals($apache_values, 'install', 1) {
-      $mariadb_adminer_webroot_location = $puphpet::params::apache_webroot_location
-    } elsif hash_key_equals($nginx_values, 'install', 1) {
-      $mariadb_adminer_webroot_location = $puphpet::params::nginx_webroot_location
-    } else {
-      $mariadb_adminer_webroot_location = $puphpet::params::apache_webroot_location
-    }
-
-    class { 'puphpet::adminer':
-      location    => "${mariadb_adminer_webroot_location}/adminer",
-      owner       => 'www-data',
-      php_package => $mariadb_php_package
-    }
-  }
-}
-
-define mariadb_db (
-  $user,
-  $password,
-  $host,
-  $grant    = [],
-  $sql_file = false
-) {
-  if $name == '' or $password == '' or $host == '' {
-    fail( 'MariaDB requires that name, password and host be set. Please check your settings!' )
-  }
-
-  mysql::db { $name:
-    user     => $user,
-    password => $password,
-    host     => $host,
-    grant    => $grant,
-    sql      => $sql_file,
-  }
-}
-
-# @todo update this!
-define mariadb_nginx_default_conf (
-  $webroot
-) {
-  if $php5_fpm_sock == undef {
-    $php5_fpm_sock = '/var/run/php5-fpm.sock'
-  }
-
-  if $fastcgi_pass == undef {
-    $fastcgi_pass = $php_values['version'] ? {
-      undef   => null,
-      '53'    => '127.0.0.1:9000',
-      default => "unix:${php5_fpm_sock}"
-    }
-  }
-
-  class { 'puphpet::nginx':
-    fastcgi_pass => $fastcgi_pass,
-    notify       => Class['nginx::service'],
-  }
-}
-
-## Begin MongoDb manifest
-
-if $mongodb_values == undef {
-  $mongodb_values = hiera('mongodb', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1)
-  or hash_key_equals($nginx_values, 'install', 1)
-{
-  $mongodb_webserver_restart = true
-} else {
-  $mongodb_webserver_restart = false
-}
-
-if hash_key_equals($mongodb_values, 'install', 1) {
-  file { ['/data', '/data/db']:
-    ensure  => directory,
-    mode    => 0775,
-    before  => Class['Mongodb::Globals'],
-  }
-
-  Class['Mongodb::Globals'] -> Class['Mongodb::Server']
-
-  class { 'mongodb::globals':
-    manage_package_repo => true,
-  }
-
-  create_resources('class', { 'mongodb::server' => $mongodb_values['settings'] })
-
-  if $::osfamily == 'redhat' {
-    class { '::mongodb::client':
-      require => Class['::Mongodb::Server']
-    }
-  }
-
-  if is_hash($mongodb_values['databases']) and count($mongodb_values['databases']) > 0 {
-    create_resources(mongodb_db, $mongodb_values['databases'])
-  }
-
-  if hash_key_equals($php_values, 'install', 1) and ! defined(Puphpet::Php::Pecl['mongo']) {
-    puphpet::php::pecl { 'mongo':
-      service_autorestart => $mongodb_webserver_restart,
-      require             => Class['mongodb::server']
-    }
-  }
-}
-
-define mongodb_db (
-  $user,
-  $password
-) {
-  if $name == '' or $password == '' {
-    fail( 'MongoDB requires that name and password be set. Please check your settings!' )
-  }
-
-  mongodb::db { $name:
-    user     => $user,
-    password => $password
-  }
-}
-
-# Begin redis
-
-if $redis_values == undef {
-  $redis_values = hiera('redis', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1)
-  or hash_key_equals($nginx_values, 'install', 1)
-{
-  $redis_webserver_restart = true
-} else {
-  $redis_webserver_restart = false
-}
-
-if hash_key_equals($redis_values, 'install', 1) {
-  create_resources('class', { 'redis' => $redis_values['settings'] })
-
-  if hash_key_equals($php_values, 'install', 1) and ! defined(Php::Pecl::Module['redis']) {
-    php::pecl::module { 'redis':
-      use_package         => false,
-      service_autorestart => $redis_webserver_restart,
-      require             => Class['redis']
-    }
-  }
-}
-
-# Begin beanstalkd
-
-if $beanstalkd_values == undef {
-  $beanstalkd_values = hiera('beanstalkd', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $hhvm_values == undef {
-  $hhvm_values = hiera('hhvm', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1) {
-  $beanstalk_console_webroot_location = "${puphpet::params::apache_webroot_location}/beanstalk_console"
-} elsif hash_key_equals($nginx_values, 'install', 1) {
-  $beanstalk_console_webroot_location = "${puphpet::params::nginx_webroot_location}/beanstalk_console"
-} else {
-  $beanstalk_console_webroot_location = undef
-}
-
-if hash_key_equals($php_values, 'install', 1) or hash_key_equals($hhvm_values, 'install', 1) {
-  $beanstalkd_php_installed = true
-} else {
-  $beanstalkd_php_installed = false
-}
-
-if hash_key_equals($beanstalkd_values, 'install', 1) {
-  create_resources(beanstalkd::config, { 'beanstalkd' => $beanstalkd_values['settings'] })
-
-  if hash_key_equals($beanstalkd_values, 'beanstalk_console', 1)
-    and $beanstalk_console_webroot_location != undef
-    and $beanstalkd_php_installed
-  {
-    exec { 'delete-beanstalk_console-path-if-not-git-repo':
-      command => "rm -rf ${beanstalk_console_webroot_location}",
-      onlyif  => "test ! -d ${beanstalk_console_webroot_location}/.git"
-    }
-
-    vcsrepo { $beanstalk_console_webroot_location:
-      ensure   => present,
-      provider => git,
-      source   => 'https://github.com/ptrofimov/beanstalk_console.git',
-      require  => Exec['delete-beanstalk_console-path-if-not-git-repo']
-    }
-
-    file { "${beanstalk_console_webroot_location}/storage.json":
-      ensure  => present,
-      group   => 'www-data',
-      mode    => 0775,
-      require => Vcsrepo[$beanstalk_console_webroot_location]
-    }
-  }
-}
-
-# Begin rabbitmq
-
-if $rabbitmq_values == undef {
-  $rabbitmq_values = hiera('rabbitmq', false)
-} if $php_values == undef {
-  $php_values = hiera('php', false)
-} if $apache_values == undef {
-  $apache_values = hiera('apache', false)
-} if $nginx_values == undef {
-  $nginx_values = hiera('nginx', false)
-}
-
-if hash_key_equals($apache_values, 'install', 1)
-  or hash_key_equals($nginx_values, 'install', 1)
-{
-  $rabbitmq_webserver_restart = true
-} else {
-  $rabbitmq_webserver_restart = false
-}
-
-if hash_key_equals($rabbitmq_values, 'install', 1) {
-  create_resources('class', { 'rabbitmq' => $rabbitmq_values['settings'] })
-
-  if hash_key_equals($php_values, 'install', 1) and ! defined(Php::Pecl::Module['amqp']) {
-    php::pecl::module { 'amqp':
-      use_package         => false,
-      service_autorestart => $rabbitmq_webserver_restart,
-      require             => Class['rabbitmq']
-    }
-  }
-
-  if ! defined(Firewall['100 tcp/15672']) {
-    firewall { '100 tcp/15672':
-      port   => 15672,
-      proto  => tcp,
-      action => 'accept',
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml
deleted file mode 100644
index b5f76c03ac5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.fixtures.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
-  symlinks:
-    apache: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc
deleted file mode 100644
index df733ca8119..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.puppet-lint.rc
+++ /dev/null
@@ -1,5 +0,0 @@
---no-single_quote_string_with_variables-check
---no-80chars-check
---no-class_inherits_from_params_class-check
---no-class_parameter_defaults-check
---no-documentation-check
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml
deleted file mode 100644
index 1d00b8eb041..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md
deleted file mode 100644
index 26e8d75d4db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CHANGELOG.md
+++ /dev/null
@@ -1,246 +0,0 @@
-## 2014-03-04 Supported Release 1.0.1
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
- 
-## 2014-03-04 Supported Release 1.0.0
-###Summary
-
-This is a supported release. This release introduces Apache 2.4 support for
-Debian and RHEL based osfamilies.
-
-####Features
-
-- Add apache24 support
-- Add rewrite_base functionality to rewrites
-- Updated README documentation
-- Add WSGIApplicationGroup and WSGIImportScript directives
-
-####Bugfixes
-
-- Replace mutating hashes with merge() for Puppet 3.5
-- Fix WSGI import_script and mod_ssl issues on Lucid
-
-####Known Bugs
-* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
-* SLES is unsupported.
-
----
-
-## 2014-01-31 Release 0.11.0
-### Summary:
-
-This release adds preliminary support for Windows compatibility and multiple rewrite support.
-
-#### Backwards-incompatible Changes:
-
-- The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
-  and will be removed in a future release.
-
-#### Features:
-
-- add Match directive
-- quote paths for windows compatibility
-- add auth_group_file option to README.md
-- allow AuthGroupFile directive for vhosts
-- Support Header directives in vhost context
-- Don't purge mods-available dir when separate enable dir is used
-- Fix the servername used in log file name
-- Added support for mod_include
-- Remove index parameters.
-- Support environment variable control for CustomLog
-- added redirectmatch support
-- Setting up the ability to do multiple rewrites and conditions.
-- Convert spec tests to beaker.
-- Support php_admin_(flag|value)s
-
-#### Bugfixes:
-
-- directories are either a Hash or an Array of Hashes
-- Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
-- (docs) Update list of `apache::mod::[name]` classes
-- (docs) Fix apache::namevirtualhost example call style
-- Fix $ports_file reference in apache::listen.
-- Fix $ports_file reference in Namevirtualhost.
-
-
-## 2013-12-05 Release 0.10.0
-### Summary:
-
-This release adds FreeBSD osfamily support and various other improvements to some mods.
-
-#### Features:
-
-- Add suPHP_UserGroup directive to directory context
-- Add support for ScriptAliasMatch directives
-- Set SSLOptions StdEnvVars in server context
-- No implicit <Directory> entry for ScriptAlias path
-- Add support for overriding ErrorDocument
-- Add support for AliasMatch directives
-- Disable default "allow from all" in vhost-directories
-- Add WSGIPythonPath as an optional parameter to mod_wsgi. 
-- Add mod_rpaf support
-- Add directives: IndexOptions, IndexOrderDefault
-- Add ability to include additional external configurations in vhost
-- need to use the provider variable not the provider key value from the directory hash for matches
-- Support for FreeBSD and few other features
-- Add new params to apache::mod::mime class
-- Allow apache::mod to specify module id and path
-- added $server_root parameter
-- Add Allow and ExtendedStatus support to mod_status
-- Expand vhost/_directories.pp directive support
-- Add initial support for nss module (no directives in vhost template yet)
-- added peruser and event mpms
-- added $service_name parameter
-- add parameter for TraceEnable
-- Make LogLevel configurable for server and vhost
-- Add documentation about $ip
-- Add ability to pass ip (instead of wildcard) in default vhost files
-
-#### Bugfixes:
-
-- Don't listen on port or set NameVirtualHost for non-existent vhost
-- only apply Directory defaults when provider is a directory
-- Working mod_authnz_ldap support on Debian/Ubuntu
-
-## 2013-09-06 Release 0.9.0
-### Summary:
-This release adds more parameters to the base apache class and apache defined
-resource to make the module more flexible. It also adds or enhances SuPHP,
-WSGI, and Passenger mod support, and support for the ITK mpm module.
-
-#### Backwards-incompatible Changes:
-- Remove many default mods that are not normally needed.
-- Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
-- Specify dependencies on stdlib >=2.4.0 (this was already the case, but
-making explicit)
-- Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
-defined resource.
-
-#### Features:
-- `apache` class
-  - Add `httpd_dir` parameter to change the location of the configuration
-  files.
-  - Add `logroot` parameter to change the logroot
-  - Add `ports_file` parameter to changes the `ports.conf` file location
-  - Add `keepalive` parameter to enable persistent connections
-  - Add `keepalive_timeout` parameter to change the timeout
-  - Update `default_mods` to be able to take an array of mods to enable.
-- `apache::vhost`
-  - Add `wsgi_daemon_process`, `wsgi_daemon_process_options`,
-  `wsgi_process_group`, and `wsgi_script_aliases` parameters for per-vhost
-  WSGI configuration.
-  - Add `access_log_syslog` parameter to enable syslogging.
-  - Add `error_log_syslog` parameter to enable syslogging of errors.
-  - Add `directories` hash parameter. Please see README for documentation.
-  - Add `sslproxyengine` parameter to enable SSLProxyEngine
-  - Add `suphp_addhandler`, `suphp_engine`, and `suphp_configpath` for
-  configuring SuPHP.
-  - Add `custom_fragment` parameter to allow for arbitrary apache
-  configuration injection. (Feature pull requests are prefered over using
-  this, but it is available in a pinch.)
-- Add `apache::mod::suphp` class for configuring SuPHP.
-- Add `apache::mod::itk` class for configuring ITK mpm module.
-- Update `apache::mod::wsgi` class for global WSGI configuration with
-`wsgi_socket_prefix` and `wsgi_python_home` parameters.
-- Add README.passenger.md to document the `apache::mod::passenger` usage.
-Added `passenger_high_performance`, `passenger_pool_idle_time`,
-`passenger_max_requests`, `passenger_stat_throttle_rate`, `rack_autodetect`,
-and `rails_autodetect` parameters.
-- Separate the httpd service resource into a new `apache::service` class for
-dependency chaining of `Class['apache'] -> <resource> ~>
-Class['apache::service']`
-- Added `apache::mod::proxy_balancer` class for `apache::balancer`
-
-#### Bugfixes:
-- Change dependency to puppetlabs-concat
-- Fix ruby 1.9 bug for `a2mod`
-- Change servername to be `$::hostname` if there is no `$::fqdn`
-- Make `/etc/ssl/certs` the default ssl certs directory for RedHat non-5.
-- Make `php` the default php package for RedHat non-5.
-- Made `aliases` able to take a single alias hash instead of requiring an
-array.
-
-## 2013-07-26 Release 0.8.1
-#### Bugfixes:
-- Update `apache::mpm_module` detection for worker/prefork
-- Update `apache::mod::cgi` and `apache::mod::cgid` detection for
-worker/prefork
-
-## 2013-07-16 Release 0.8.0
-#### Features:
-- Add `servername` parameter to `apache` class
-- Add `proxy_set` parameter to `apache::balancer` define
-
-#### Bugfixes:
-- Fix ordering for multiple `apache::balancer` clusters
-- Fix symlinking for sites-available on Debian-based OSs
-- Fix dependency ordering for recursive confdir management
-- Fix `apache::mod::*` to notify the service on config change
-- Documentation updates
-
-## 2013-07-09 Release 0.7.0
-#### Changes:
-- Essentially rewrite the module -- too many to list
-- `apache::vhost` has many abilities -- see README.md for details
-- `apache::mod::*` classes provide httpd mod-loading capabilities
-- `apache` base class is much more configurable
-
-#### Bugfixes:
-- Many. And many more to come
-
-## 2013-03-2 Release 0.6.0
-- update travis tests (add more supported versions)
-- add access log_parameter
-- make purging of vhost dir configurable
-
-## 2012-08-24 Release 0.4.0
-#### Changes:
-- `include apache` is now required when using `apache::mod::*`
-
-#### Bugfixes:
-- Fix syntax for validate_re
-- Fix formatting in vhost template
-- Fix spec tests such that they pass
-
-##2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
-* e62e362 Fix broken tests for ssl, vhost, vhost::*
-* 42c6363 Changes to match style guide and pass puppet-lint without error
-* 42bc8ba changed name => path for file resources in order to name namevar by it's name
-* 72e13de One end too much
-* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
-* 273f94d fix tests
-* a35ede5 (#13860) Make a2enmod/a2dismo commands optional
-* 98d774e (#13860) Autorequire Package['httpd']
-* 05fcec5 (#13073) Add missing puppet spec tests
-* 541afda (#6899) Remove virtual a2mod definition
-* 976cb69 (#13072) Move mod python and wsgi package names to params
-* 323915a (#13060) Add .gitignore to repo
-* fdf40af (#13060) Remove pkg directory from source tree
-* fd90015 Add LICENSE file and update the ModuleFile
-* d3d0d23 Re-enable local php class
-* d7516c7 Make management of firewalls configurable for vhosts
-* 60f83ba Explicitly lookup scope of apache_name in templates.
-* f4d287f (#12581) Add explicit ordering for vdir directory
-* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
-* a776a8b (#11071) Fix to work with latest firewall module
-* 2b79e8b (#11070) Add support for Scientific Linux
-* 405b3e9 Fix for a2mod
-* 57b9048 Commit apache::vhost::redirect Manifest
-* 8862d01 Commit apache::vhost::proxy Manifest
-* d5c1fd0 Commit apache::mod::wsgi Manifest
-* a825ac7 Commit apache::mod::python Manifest
-* b77062f Commit Templates
-* 9a51b4a Vhost File Declarations
-* 6cf7312 Defaults for Parameters
-* 6a5b11a Ensure installed
-* f672e46 a2mod fix
-* 8a56ee9 add pthon support to apache
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md
deleted file mode 100644
index e1288478a24..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/CONTRIBUTING.md
+++ /dev/null
@@ -1,234 +0,0 @@
-Checklist (and a short version for the impatient)
-=================================================
-
-  * Commits:
-
-    - Make commits of logical units.
-
-    - Check for unnecessary whitespace with "git diff --check" before
-      committing.
-
-    - Commit using Unix line endings (check the settings around "crlf" in
-      git-config(1)).
-
-    - Do not check in commented out code or unneeded files.
-
-    - The first line of the commit message should be a short
-      description (50 characters is the soft limit, excluding ticket
-      number(s)), and should skip the full stop.
-
-    - Associate the issue in the message. The first line should include
-      the issue number in the form "(#XXXX) Rest of message".
-
-    - The body should provide a meaningful commit message, which:
-
-      - uses the imperative, present tense: "change", not "changed" or
-        "changes".
-
-      - includes motivation for the change, and contrasts its
-        implementation with the previous behavior.
-
-    - Make sure that you have tests for the bug you are fixing, or
-      feature you are adding.
-
-    - Make sure the test suites passes after your commit:
-      `bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
-
-    - When introducing a new feature, make sure it is properly
-      documented in the README.md
-
-  * Submission:
-
-    * Pre-requisites:
-
-      - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
-
-      - Make sure you have a [GitHub account](https://github.com/join)
-
-      - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
-
-    * Preferred method:
-
-      - Fork the repository on GitHub.
-
-      - Push your changes to a topic branch in your fork of the
-        repository. (the format ticket/1234-short_description_of_change is
-        usually preferred for this project).
-
-      - Submit a pull request to the repository in the puppetlabs
-        organization.
-
-The long version
-================
-
-  1.  Make separate commits for logically separate changes.
-
-      Please break your commits down into logically consistent units
-      which include new or changed tests relevant to the rest of the
-      change.  The goal of doing this is to make the diff easier to
-      read for whoever is reviewing your code.  In general, the easier
-      your diff is to read, the more likely someone will be happy to
-      review it and get it into the code base.
-
-      If you are going to refactor a piece of code, please do so as a
-      separate commit from your feature or bug fix changes.
-
-      We also really appreciate changes that include tests to make
-      sure the bug is not re-introduced, and that the feature is not
-      accidentally broken.
-
-      Describe the technical detail of the change(s).  If your
-      description starts to get too long, that is a good sign that you
-      probably need to split up your commit into more finely grained
-      pieces.
-
-      Commits which plainly describe the things which help
-      reviewers check the patch and future developers understand the
-      code are much more likely to be merged in with a minimum of
-      bike-shedding or requested changes.  Ideally, the commit message
-      would include information, and be in a form suitable for
-      inclusion in the release notes for the version of Puppet that
-      includes them.
-
-      Please also check that you are not introducing any trailing
-      whitespace or other "whitespace errors".  You can do this by
-      running "git diff --check" on your changes before you commit.
-
-  2.  Sign the Contributor License Agreement
-
-      Before we can accept your changes, we do need a signed Puppet
-      Labs Contributor License Agreement (CLA).
-
-      You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
-
-      If you have any questions about the CLA, please feel free to
-      contact Puppet Labs via email at cla-submissions@puppetlabs.com.
-
-  3.  Sending your patches
-
-      To submit your changes via a GitHub pull request, we _highly_
-      recommend that you have them on a topic branch, instead of
-      directly on "master".
-      It makes things much easier to keep track of, especially if
-      you decide to work on another thing before your first change
-      is merged in.
-
-      GitHub has some pretty good
-      [general documentation](http://help.github.com/) on using
-      their site.  They also have documentation on
-      [creating pull requests](http://help.github.com/send-pull-requests/).
-
-      In general, after pushing your topic branch up to your
-      repository on GitHub, you can switch to the branch in the
-      GitHub UI and click "Pull Request" towards the top of the page
-      in order to open a pull request.
-
-
-  4.  Update the related GitHub issue.
-
-      If there is a GitHub issue associated with the change you
-      submitted, then you should update the ticket to include the
-      location of your branch, along with any other commentary you
-      may wish to make.
-
-Testing
-=======
-
-Getting Started
----------------
-
-Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
-package manager such as [bundler](http://bundler.io/) what Ruby packages,
-or Gems, are required to build, develop, and test this software.
-
-Please make sure you have [bundler installed](http://bundler.io/#getting-started)
-on your system, then use it to install all dependencies needed for this project,
-by running
-
-```shell
-% bundle install
-Fetching gem metadata from https://rubygems.org/........
-Fetching gem metadata from https://rubygems.org/..
-Using rake (10.1.0)
-Using builder (3.2.2)
--- 8><-- many more --><8 --
-Using rspec-system-puppet (2.2.0)
-Using serverspec (0.6.3)
-Using rspec-system-serverspec (1.0.0)
-Using bundler (1.3.5)
-Your bundle is complete!
-Use `bundle show [gemname]` to see where a bundled gem is installed.
-```
-
-NOTE some systems may require you to run this command with sudo.
-
-If you already have those gems installed, make sure they are up-to-date:
-
-```shell
-% bundle update
-```
-
-With all dependencies in place and up-to-date we can now run the tests:
-
-```shell
-% rake spec
-```
-
-This will execute all the [rspec tests](http://rspec-puppet.com/) tests
-under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
-and so on. rspec tests may have the same kind of dependencies as the
-module they are testing. While the module defines in its [Modulefile](./Modulefile),
-rspec tests define them in [.fixtures.yml](./fixtures.yml).
-
-Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
-tests. These tests spin up a virtual machine under
-[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
-[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
-scenarios. In order to run these, you will need both of those tools
-installed on your system.
-
-You can run them by issuing the following command
-
-```shell
-% rake spec_clean
-% rspec spec/acceptance
-```
-
-This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
-install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
-and then run all the tests under [spec/acceptance](./spec/acceptance).
-
-Writing Tests
--------------
-
-XXX getting started writing tests.
-
-If you have commit access to the repository
-===========================================
-
-Even if you have commit access to the repository, you will still need to
-go through the process above, and have someone else review and merge
-in your changes.  The rule is that all changes must be reviewed by a
-developer on the project (that did not write the code) to ensure that
-all changes go through a code review process.
-
-Having someone other than the author of the topic branch recorded as
-performing the merge is the record that they performed the code
-review.
-
-
-Additional Resources
-====================
-
-* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
-
-* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
-
-* [Patchwork](https://patchwork.puppetlabs.com)
-
-* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
-
-* [General GitHub documentation](http://help.github.com/)
-
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile
deleted file mode 100644
index fc45295a102..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Gemfile
+++ /dev/null
@@ -1,26 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake', '10.1.1',          :require => false
-  gem 'rspec-puppet', '>=1.0.0', :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'rspec', '~> 2.11',        :require => false
-end  
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE
deleted file mode 100644
index 8961ce8a6d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright (C) 2012 Puppet Labs Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile
deleted file mode 100644
index 227947cbba4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name 'puppetlabs-apache'
-version '1.0.1'
-source 'git://github.com/puppetlabs/puppetlabs-apache.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet module for Apache'
-description 'Module for Apache configuration'
-project_page 'https://github.com/puppetlabs/puppetlabs-apache'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 2.4.0'
-dependency 'puppetlabs/concat', '>= 1.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md
deleted file mode 100644
index 385130df31f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.md
+++ /dev/null
@@ -1,1958 +0,0 @@
-#apache
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-apache.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-apache)
-
-####Table of Contents
-
-1. [Overview - What is the apache module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with apache](#setup)
-    * [Beginning with apache - Installation](#beginning-with-apache)
-    * [Configure a virtual host - Basic options for getting started](#configure-a-virtual-host)
-4. [Usage - The classes and defined types available for configuration](#usage)
-    * [Classes and Defined Types](#classes-and-defined-types)
-        * [Class: apache](#class-apache)
-        * [Class: apache::default_mods](#class-apachedefault_mods)
-        * [Defined Type: apache::mod](#defined-type-apachemod)
-        * [Classes: apache::mod::*](#classes-apachemodname)
-        * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
-        * [Class: apache::mod::php](#class-apachemodphp)
-        * [Class: apache::mod::ssl](#class-apachemodssl)
-        * [Class: apache::mod::wsgi](#class-apachemodwsgi)
-        * [Class: apache::mod::fcgid](#class-apachemodfcgid)
-        * [Defined Type: apache::vhost](#defined-type-apachevhost)
-        * [Parameter: `directories` for apache::vhost](#parameter-directories-for-apachevhost)
-        * [SSL parameters for apache::vhost](#ssl-parameters-for-apachevhost)
-    * [Virtual Host Examples - Demonstrations of some configuration options](#virtual-host-examples)
-    * [Load Balancing](#load-balancing)
-        * [Defined Type: apache::balancer](#defined-type-apachebalancer)
-        * [Defined Type: apache::balancermember](#defined-type-apachebalancermember)
-        * [Examples - Load balancing with exported and non-exported resources](#examples)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-    * [Classes](#classes)
-        * [Public Classes](#public-classes)
-        * [Private Classes](#private-classes)
-    * [Defined Types](#defined-types)
-        * [Public Defined Types](#public-defined-types)
-        * [Private Defined Types](#private-defined-types)
-    * [Templates](#templates)
-6. [Limitations - OS compatibility, etc.](#limitations)
-7. [Development - Guide for contributing to the module](#development)
-    * [Contributing to the apache module](#contributing)
-    * [Running tests - A quick guide](#running-tests)
-
-##Overview
-
-The apache module allows you to set up virtual hosts and manage web services with minimal effort.
-
-##Module Description
-
-Apache is a widely-used web server, and this module provides a simplified way of creating configurations to manage your infrastructure. This includes the ability to configure and manage a range of different virtual host setups, as well as a streamlined way to install and configure Apache modules.
-
-##Setup
-
-**What apache affects:**
-
-* configuration files and directories (created and written to)
-    * **WARNING**: Configurations that are *not* managed by Puppet will be purged.
-* package/service/configuration files for Apache
-* Apache modules
-* virtual hosts
-* listened-to ports
-* `/etc/make.conf` on FreeBSD 
-
-###Beginning with Apache
-
-To install Apache with the default parameters
-
-```puppet
-    class { 'apache':  }
-```
-
-The defaults are determined by your operating system (e.g. Debian systems have one set of defaults, and RedHat systems have another, as do FreeBSD systems). These defaults will work well in a testing environment, but are not suggested for production. To establish customized parameters
-
-```puppet
-    class { 'apache':
-      default_mods        => false,
-      default_confd_files => false,
-    }
-```
-
-###Configure a virtual host
-
-Declaring the `apache` class will create a default virtual host by setting up a vhost on port 80, listening on all interfaces and serving `$apache::docroot`.
-
-```puppet
-    class { 'apache': }
-```
-
-To configure a very basic, name-based virtual host
-
-```puppet
-    apache::vhost { 'first.example.com':
-      port    => '80',
-      docroot => '/var/www/first',
-    }
-```
-
-*Note:* The default priority is 15. If nothing matches this priority, the alphabetically first name-based vhost will be used. This is also true if you pass a higher priority and no names match anything else.
-
-A slightly more complicated example, changes the docroot owner/group from the default 'root'
-
-```puppet
-    apache::vhost { 'second.example.com':
-      port          => '80',
-      docroot       => '/var/www/second',
-      docroot_owner => 'third',
-      docroot_group => 'third',
-    }
-```
-
-To set up a virtual host with SSL and default SSL certificates
-
-```puppet
-    apache::vhost { 'ssl.example.com':
-      port    => '443',
-      docroot => '/var/www/ssl',
-      ssl     => true,
-    }
-```
-
-To set up a virtual host with SSL and specific SSL certificates
-
-```puppet
-    apache::vhost { 'fourth.example.com':
-      port     => '443',
-      docroot  => '/var/www/fourth',
-      ssl      => true,
-      ssl_cert => '/etc/ssl/fourth.example.com.cert',
-      ssl_key  => '/etc/ssl/fourth.example.com.key',
-    }
-```
-
-Virtual hosts listen on '*' by default. To listen on a specific IP address
-
-```puppet
-    apache::vhost { 'subdomain.example.com':
-      ip      => '127.0.0.1',
-      port    => '80',
-      docroot => '/var/www/subdomain',
-    }
-```
-
-To set up a virtual host with a wildcard alias for the subdomain mapped to a same-named directory, for example: `http://example.com.loc` to `/var/www/example.com`
-
-```puppet
-    apache::vhost { 'subdomain.loc':
-      vhost_name       => '*',
-      port             => '80',
-      virtual_docroot' => '/var/www/%-2+',
-      docroot          => '/var/www',
-      serveraliases    => ['*.loc',],
-    }
-```
-
-To set up a virtual host with suPHP
-
-```puppet
-    apache::vhost { 'suphp.example.com':
-      port                => '80',
-      docroot             => '/home/appuser/myphpapp',
-      suphp_addhandler    => 'x-httpd-php',
-      suphp_engine        => 'on',
-      suphp_configpath    => '/etc/php5/apache2',
-      directories         => { path => '/home/appuser/myphpapp',
-        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
-      }
-    }
-```
-
-To set up a virtual host with WSGI
-
-```puppet
-    apache::vhost { 'wsgi.example.com':
-      port                        => '80',
-      docroot                     => '/var/www/pythonapp',
-      wsgi_application_group      => '%{GLOBAL}',
-      wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options => { 
-        processes    => '2', 
-        threads      => '15', 
-        display-name => '%{GROUP}',
-       },
-      wsgi_import_script          => '/var/www/demo.wsgi',
-      wsgi_import_script_options  =>
-        { process-group => 'wsgi', application-group => '%{GLOBAL}' },
-      wsgi_process_group          => 'wsgi',
-      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-    }
-```
-
-Starting in Apache 2.2.16, HTTPD supports [FallbackResource](https://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource), a simple replacement for common RewriteRules.
-
-```puppet
-    apache::vhost { 'wordpress.example.com':
-      port                => '80',
-      docroot             => '/var/www/wordpress',
-      fallbackresource    => '/index.php',
-    }
-```
-
-Please note that the 'disabled' argument to FallbackResource is only supported since Apache 2.2.24.
-
-See a list of all [virtual host parameters](#defined-type-apachevhost). See an extensive list of [virtual host examples](#virtual-host-examples).
-
-##Usage
-
-###Classes and Defined Types
-
-This module modifies Apache configuration files and directories, and will purge any configuration not managed by Puppet. Configuration of Apache should be managed by Puppet, as non-Puppet configuration files can cause unexpected failures.
-
-It is possible to temporarily disable full Puppet management by setting the [`purge_configs`](#purge_configs) parameter within the base `apache` class to 'false'. This option should only be used as a temporary means of saving and relocating customized configurations. See the [`purge_configs` parameter](#purge_configs) for more information.
-
-####Class: `apache`
-
-The apache module's primary class, `apache`, guides the basic setup of Apache on your system.
-
-You may establish a default vhost in this class, the `vhost` class, or both. You may add additional vhost configurations for specific virtual hosts using a declaration of the `vhost` type.
-
-**Parameters within `apache`:**
-
-#####`apache_version`
-
-Configures the behavior of the module templates, package names, and default mods by setting the Apache version. Default is determined by the class `apache::version` using the OS family and release. It should not be configured manually without special reason.
-
-#####`confd_dir`
-
-Changes the location of the configuration directory your custom configuration files are placed in. Defaults to '/etc/httpd/conf' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
-
-#####`conf_template`
-
-Overrides the template used for the main apache configuration file. Defaults to 'apache/httpd.conf.erb'.
-
-*Note:* Using this parameter is potentially risky, as the module has been built for a minimal configuration file with the configuration primarily coming from conf.d/ entries.
-
-#####`default_confd_files`
-
-Generates default set of include-able Apache configuration files under  `${apache::confd_dir}` directory. These configuration files correspond to what is usually installed with the Apache package on a given platform.
-
-#####`default_mods`
-
-Sets up Apache with default settings based on your OS. Valid values are 'true', 'false', or an array of mod names. 
-
-Defaults to 'true', which will include the default [HTTPD mods](https://github.com/puppetlabs/puppetlabs-apache/blob/master/manifests/default_mods.pp).
-
-If false, it will only include the mods required to make HTTPD work, and any other mods can be declared on their own.
-
-If an array, the apache module will include the array of mods listed.
-
-#####`default_ssl_ca`
-
-The default certificate authority, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_cert`
-
-The default SSL certification, which is automatically set based on your operating system  ('/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_chain`
-
-The default SSL chain, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_crl`
-
-The default certificate revocation list to use, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_crl_path`
-
-The default certificate revocation list path, which is automatically set to 'undef'. This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_key`
-
-The default SSL key, which is automatically set based on your operating system ('/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD). This default will work out of the box but must be updated with your specific certificate information before being used in production.
-
-#####`default_ssl_vhost`
-
-Sets up a default SSL virtual host. Defaults to 'false'. If set to 'true', will set up the following vhost:
-
-```puppet
-    apache::vhost { 'default-ssl':
-      port            => 443,
-      ssl             => true,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => "ssl_${access_log_file}",
-      }
-```
-
-SSL vhosts only respond to HTTPS queries.
-
-#####`default_vhost`
-
-Sets up a default virtual host. Defaults to 'true', set to 'false' to set up [customized virtual hosts](#configure-a-virtual-host).
-
-#####`error_documents`
-
-Enables custom error documents. Defaults to 'false'.
-
-#####`httpd_dir`
-
-Changes the base location of the configuration directories used for the apache service. This is useful for specially repackaged HTTPD builds, but may have unintended consequences when used in combination with the default distribution packages. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local/etc/apache22' on FreeBSD.
-
-#####`keepalive`
-
-Enables persistent connections.
-
-#####`keepalive_timeout`
-
-Sets the amount of time the server will wait for subsequent requests on a persistent connection. Defaults to '15'.
-
-#####`max_keepalive_requests`
-
-Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.
-
-#####`loadfile_name`
-
-Sets the file name for the module loadfile. Should be in the format *.load.  This can be used to set the module load order.
-
-#####`log_level`
-
-Changes the verbosity level of the error log. Defaults to 'warn'. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info', or 'debug'.
-
-#####`log_formats`
-
-Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log_config.html#logformat). This is done in a Hash:
-
-```puppet
-  $log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
-```
-
-#####`logroot`
-
-Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, and '/var/log/apache22' on FreeBSD.
-
-#####`manage_group`
-
-Setting this to 'false' will stop the group resource from being created. This is for when you have a group, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established group would result in a duplicate resource error.
-
-#####`manage_user`
-
-Setting this to 'false' will stop the user resource from being created. This is for instances when you have a user, created from another Puppet module, you want to use to run Apache. Without this parameter, attempting to use a previously established user would result in a duplicate resource error.
-
-#####`mod_dir`
-
-Changes the location of the configuration directory your Apache modules configuration files are placed in. Defaults to '/etc/httpd/conf.d' for RedHat, '/etc/apache2/mods-available' for Debian, and '/usr/local/etc/apache22/Modules' for FreeBSD.
-
-#####`mpm_module`
-
-Determines which MPM is loaded and configured for the HTTPD process. Valid values are 'event', 'itk', 'peruser', 'prefork', 'worker', or 'false'. Defaults to 'prefork' on RedHat and FreeBSD, and 'worker' on Debian. Must be set to 'false' to explicitly declare the following classes with custom parameters:
-
-* `apache::mod::event`
-* `apache::mod::itk`
-* `apache::mod::peruser`
-* `apache::mod::prefork`
-* `apache::mod::worker` 
-
-*Note:* Switching between different MPMs on FreeBSD is possible but quite difficult. Before changing `$mpm_module` you must uninstall all packages that depend on your currently-installed Apache. 
-
-#####`package_ensure`
-
-Allows control over the package ensure attribute. Can be 'present','absent', or a version string.
-
-#####`ports_file`
-
-Changes the name of the file containing Apache ports configuration. Default is `${conf_dir}/ports.conf`.
-
-#####`purge_configs`
-
-Removes all other Apache configs and vhosts, defaults to 'true'. Setting this to 'false' is a stopgap measure to allow the apache module to coexist with existing or otherwise-managed configuration. It is recommended that you move your configuration entirely to resources within this module.
-
-#####`sendfile`
-
-Makes Apache use the Linux kernel sendfile to serve static files. Defaults to 'On'.
-
-#####`serveradmin`
-
-Sets the server administrator. Defaults to 'root@localhost'.
-
-#####`servername`
-
-Sets the server name. Defaults to `fqdn` provided by Facter.
-
-#####`server_root`
-
-Sets the root directory in which the server resides. Defaults to '/etc/httpd' on RedHat, '/etc/apache2' on Debian, and '/usr/local' on FreeBSD.
-
-#####`server_signature`
-
-Configures a trailing footer line under server-generated documents. More information about [ServerSignature](http://httpd.apache.org/docs/current/mod/core.html#serversignature). Defaults to 'On'.
-
-#####`server_tokens`
-
-Controls how much information Apache sends to the browser about itself and the operating system. More information about [ServerTokens](http://httpd.apache.org/docs/current/mod/core.html#servertokens). Defaults to 'OS'.
-
-#####`service_enable`
-
-Determines whether the HTTPD service is enabled when the machine is booted. Defaults to 'true'.
-
-#####`service_ensure`
-
-Determines whether the service should be running. Valid values are true, false, 'running' or 'stopped' when Puppet should manage the service. Any other value will set ensure to false for the Apache service, which is useful when you want to let the service be managed by some other application like Pacemaker. Defaults to 'running'.
-
-#####`service_name`
-
-Name of the Apache service to run. Defaults to: 'httpd' on RedHat, 'apache2' on Debian, and 'apache22' on FreeBSD.
-
-#####`trace_enable`
-
-Controls how TRACE requests per RFC 2616 are handled. More information about [TraceEnable](http://httpd.apache.org/docs/current/mod/core.html#traceenable). Defaults to 'On'.
-
-#####`vhost_dir`
-
-Changes the location of the configuration directory your virtual host configuration files are placed in. Defaults to 'etc/httpd/conf.d' on RedHat, '/etc/apache2/sites-available' on Debian, and '/usr/local/etc/apache22/Vhosts' on FreeBSD.
-
-####Class: `apache::default_mods`
-
-Installs default Apache modules based on what OS you are running.
-
-```puppet
-    class { 'apache::default_mods': }
-```
-
-####Defined Type: `apache::mod`
-
-Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class. The `apache::mod` defined type will also install the required packages to enable the module, if any.
-
-```puppet
-    apache::mod { 'rewrite': }
-    apache::mod { 'ldap': }
-```
-
-####Classes: `apache::mod::[name]`
-
-There are many `apache::mod::[name]` classes within this module that can be declared using `include`:
-
-* `actions`
-* `alias`
-* `auth_basic`
-* `auth_kerb`
-* `authnz_ldap`*
-* `autoindex`
-* `cache`
-* `cgi`
-* `cgid`
-* `dav`
-* `dav_fs`
-* `dav_svn`*
-* `deflate`
-* `dev`
-* `dir`*
-* `disk_cache`
-* `event`
-* `expires`
-* `fastcgi`
-* `fcgid`
-* `headers`
-* `include`
-* `info`
-* `itk`
-* `ldap`
-* `mime`
-* `mime_magic`*
-* `negotiation`
-* `nss`*
-* `pagespeed` (see [`apache::mod::pagespeed`](#class-apachemodpagespeed) below)
-* `passenger`*
-* `perl`
-* `peruser`
-* `php` (requires [`mpm_module`](#mpm_module) set to `prefork`)
-* `prefork`*
-* `proxy`*
-* `proxy_ajp`
-* `proxy_balancer`
-* `proxy_html`
-* `proxy_http`
-* `python`
-* `reqtimeout`
-* `rewrite`
-* `rpaf`*
-* `setenvif`
-* `speling`
-* `ssl`* (see [`apache::mod::ssl`](#class-apachemodssl) below)
-* `status`*
-* `suphp`
-* `userdir`*
-* `vhost_alias`
-* `worker`*
-* `wsgi` (see [`apache::mod::wsgi`](#class-apachemodwsgi) below)
-* `xsendfile`
-
-Modules noted with a * indicate that the module has settings and, thus, a template that includes parameters. These parameters control the module's configuration. Most of the time, these parameters will not require any configuration or attention.
-
-The modules mentioned above, and other Apache modules that have templates, will cause template files to be dropped along with the mod install and the module will not work without the template. Any module without a template will install the package but drop no files.
-
-####Class: `apache::mod::pagespeed`
-
-Installs and manages mod_pagespeed, which is a Google module that rewrites web pages to reduce latency and bandwidth.
-
-This module does *not* manage the software repositories needed to automatically install the
-mod-pagespeed-stable package. The module does however require that the package be installed,
-or be installable using the system's default package provider.  You should ensure that this
-pre-requisite is met or declaring `apache::mod::pagespeed` will cause the puppet run to fail.
-
-These are the defaults:
-
-```puppet
-    class { 'apache::mod::pagespeed':
-      inherit_vhost_config          => 'on',
-      filter_xhtml                  => false,
-      cache_path                    => '/var/cache/mod_pagespeed/',
-      log_dir                       => '/var/log/pagespeed',
-      memache_servers               => [],
-      rewrite_level                 => 'CoreFilters',
-      disable_filters               => [],
-      enable_filters                => [],
-      forbid_filters                => [],
-      rewrite_deadline_per_flush_ms => 10,
-      additional_domains            => undef,
-      file_cache_size_kb            => 102400,
-      file_cache_clean_interval_ms  => 3600000,
-      lru_cache_per_process         => 1024,
-      lru_cache_byte_limit          => 16384,
-      css_flatten_max_bytes         => 2048,
-      css_inline_max_bytes          => 2048,
-      css_image_inline_max_bytes    => 2048,
-      image_inline_max_bytes        => 2048,
-      js_inline_max_bytes           => 2048,
-      css_outline_min_bytes         => 3000,
-      js_outline_min_bytes          => 3000,
-      inode_limit                   => 500000,
-      image_max_rewrites_at_once    => 8,
-      num_rewrite_threads           => 4,
-      num_expensive_rewrite_threads => 4,
-      collect_statistics            => 'on',
-      statistics_logging            => 'on',
-      allow_view_stats              => [],
-      allow_pagespeed_console       => [],
-      allow_pagespeed_message       => [],
-      message_buffer_size           => 100000,
-      additional_configuration      => { }
-    }
-```
-
-Full documentation for mod_pagespeed is available from [Google](http://modpagespeed.com).
-
-####Class: `apache::mod::php`
-
-Installs and configures mod_php. The defaults are OS-dependant.
-
-Overriding the package name:
-```
-  class {'::apache::mod::php':
-    package_name => "php54-php",
-    path         => "${::apache::params::lib_path}/libphp54-php5.so",
-  }
-```
-
-Overriding the default configuartion:
-```puppet
-  class {'::apache::mod::php':
-    source => 'puppet:///modules/apache/my_php.conf',
-  }
-```
-
-or 
-```puppet
-  class {'::apache::mod::php':
-    template => 'apache/php.conf.erb',
-  }
-```
-
-or
-
-```puppet
-  class {'::apache::mod::php':
-    content => '
-AddHandler php5-script .php
-AddType text/html .php',
-  }
-```
-####Class: `apache::mod::ssl`
-
-Installs Apache SSL capabilities and uses the ssl.conf.erb template. These are the defaults:
-
-```puppet
-    class { 'apache::mod::ssl':
-      ssl_compression => false,
-      ssl_options     => [ 'StdEnvVars' ],
-  }
-```
-
-To *use* SSL with a virtual host, you must either set the`default_ssl_vhost` parameter in `::apache` to 'true' or set the `ssl` parameter in `apache::vhost` to 'true'.
-
-####Class: `apache::mod::wsgi`
-
-Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`. 
-
-For customized parameters, which tell Apache how Python is currently configured on the operating system,
-
-```puppet
-    class { 'apache::mod::wsgi':
-      wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
-      wsgi_python_home   => '/path/to/venv',
-      wsgi_python_path   => '/path/to/venv/site-packages',
-    }
-```
-
-More information about [WSGI](http://modwsgi.readthedocs.org/en/latest/).
-
-####Class: `apache::mod::fcgid`
-
-Installs and configures mod_fcgid.
-
-The class makes no effort to list all available options, but rather uses an options hash to allow for ultimate flexibility:
-
-```puppet
-    class { 'apache::mod::fcgid':
-      options => {
-        'FcgidIPCDir'  => '/var/run/fcgidsock',
-        'SharememPath' => '/var/run/fcgid_shm',
-        'AddHandler'   => 'fcgid-script .fcgi',
-      },
-    }
-```
-
-For a full list op options, see the [official mod_fcgid documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html).
-
-It is also possible to set the FcgidWrapper per directory per vhost. You must ensure the fcgid module is loaded because there is no auto loading.
-
-```puppet
-    include apache::mod::fcgid
-    apache::vhost { 'example.org':
-      docroot     => '/var/www/html',
-      directories => {
-        path        => '/var/www/html',
-        fcgiwrapper => {
-          command => '/usr/local/bin/fcgiwrapper',
-        }
-      },
-    }
-```
-
-See [FcgidWrapper documentation](https://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html#fcgidwrapper) for more information.
-
-####Defined Type: `apache::vhost`
-
-The Apache module allows a lot of flexibility in the setup and configuration of virtual hosts. This flexibility is due, in part, to `vhost`'s being a defined resource type, which allows it to be evaluated multiple times with different parameters.
-
-The `vhost` defined type allows you to have specialized configurations for virtual hosts that have requirements outside the defaults. You can set up a default vhost within the base `::apache` class, as well as set a customized vhost as default. Your customized vhost (priority 10) will be privileged over the base class vhost (15).
-
-If you have a series of specific configurations and do not want a base `::apache` class default vhost, make sure to set the base class `default_vhost` to 'false'.
-
-```puppet
-    class { 'apache':
-      default_vhost => false,
-    }
-```
-
-**Parameters within `apache::vhost`:**
-
-#####`access_log`
-
-Specifies whether `*_access.log` directives (`*_file`,`*_pipe`, or `*_syslog`) should be configured. Setting the value to 'false' will choose none. Defaults to 'true'. 
-
-#####`access_log_file`
-
-Sets the `*_access.log` filename that is placed in `$logroot`. Given a vhost, example.com, it defaults to 'example.com_ssl.log' for SSL vhosts and 'example.com_access.log' for non-SSL vhosts.
-
-#####`access_log_pipe`
-
-Specifies a pipe to send access log messages to. Defaults to 'undef'.
-
-#####`access_log_syslog`
-
-Sends all access log messages to syslog. Defaults to 'undef'.
-
-#####`access_log_format`
-
-Specifies the use of either a LogFormat nickname or a custom format string for the access log. Defaults to 'combined'. See [these examples](http://httpd.apache.org/docs/current/mod/mod_log_config.html).
-
-#####`access_log_env_var`
-
-Specifies that only requests with particular environment variables be logged. Defaults to 'undef'.
-
-#####`add_listen`
-
-Determines whether the vhost creates a Listen statement. The default value is 'true'.
-
-Setting `add_listen` to 'false' stops the vhost from creating a Listen statement, and this is important when you combine vhosts that are not passed an `ip` parameter with vhosts that *are* passed the `ip` parameter.
-
-#####`additional_includes`
-
-Specifies paths to additional static, vhost-specific Apache configuration files. Useful for implementing a unique, custom configuration not supported by this module. Can be an array. Defaults to '[]'.
-
-#####`aliases`
-
-Passes a list of hashes to the vhost to create Alias or AliasMatch directives as per the [mod_alias documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
-
-```puppet
-aliases => [
-  { aliasmatch => '^/image/(.*)\.jpg$', 
-    path       => '/files/jpg.images/$1.jpg',
-  }
-  { alias      => '/image',
-    path       => '/ftp/pub/image', 
-  },
-],
-```
-
-For `alias` and `aliasmatch` to work, each will need a corresponding context, such as '< Directory /path/to/directory>' or '<Location /path/to/directory>'. The Alias and AliasMatch directives are created in the order specified in the `aliases` parameter. As described in the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html), more specific `alias` or `aliasmatch` parameters should come before the more general ones to avoid shadowing.
-
-*Note:* If `apache::mod::passenger` is loaded and `PassengerHighPerformance => true` is set, then Alias may have issues honoring the `PassengerEnabled => off` statement. See [this article](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) for details.
-
-#####`block`
-
-Specifies the list of things Apache will block access to. The default is an empty set, '[]'. Currently, the only option is 'scm', which blocks web access to .svn, .git and .bzr directories.
-
-#####`custom_fragment`
-
-Passes a string of custom configuration directives to be placed at the end of the vhost configuration. Defaults to 'undef'.
-
-#####`default_vhost`
-
-Sets a given `apache::vhost` as the default to serve requests that do not match any other `apache::vhost` definitions. The default value is 'false'.
-
-#####`directories`
-
-See the [`directories` section](#parameter-directories-for-apachevhost).
-
-#####`directoryindex`
-
-Sets the list of resources to look for when a client requests an index of the directory by specifying a '/' at the end of the directory name. [DirectoryIndex](http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex) has more information. Defaults to 'undef'.
-
-#####`docroot`
-
-Provides the [DocumentRoot](http://httpd.apache.org/docs/current/mod/core.html#documentroot) directive, which identifies the directory Apache serves files from. Required. 
-
-#####`docroot_group`
-
-Sets group access to the docroot directory. Defaults to 'root'.
-
-#####`docroot_owner`
-
-Sets individual user access to the docroot directory. Defaults to 'root'.
-
-#####`docroot_mode`
-
-Sets access permissions of the docroot directory. Defaults to 'undef'.
-
-#####`error_log`
-
-Specifies whether `*_error.log` directives should be configured. Defaults to 'true'.
-
-#####`error_log_file`
-
-Points to the `*_error.log` file. Given a vhost, example.com, it defaults to 'example.com_ssl_error.log' for SSL vhosts and 'example.com_access_error.log' for non-SSL vhosts.
-
-#####`error_log_pipe`
-
-Specifies a pipe to send error log messages to. Defaults to 'undef'.
-
-#####`error_log_syslog`
-
-Sends all error log messages to syslog. Defaults to 'undef'.
-
-#####`error_documents`
-
-A list of hashes which can be used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for this vhost. Defaults to '[]'. Example:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      error_documents => [
-        { 'error_code' => '503', 'document' => '/service-unavail' },
-        { 'error_code' => '407', 'document' => 'https://example.com/proxy/login' },
-      ],
-    }
-```
-
-#####`ensure`
-
-Specifies if the vhost file is present or absent. Defaults to 'present'.
-
-#####`fallbackresource`
-
-Sets the [FallbackResource](http://httpd.apache.org/docs/current/mod/mod_dir.html#fallbackresource) directive, which specifies an action to take for any URL that doesn't map to anything in your filesystem and would otherwise return 'HTTP 404 (Not Found)'. Valid values must either begin with a / or be 'disabled'. Defaults to 'undef'.
-
-#####`headers`
-
-Adds lines to replace, merge, or remove response headers. See [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) for more information. Can be an array. Defaults to 'undef'.
-
-#####`ip`
-
-Sets the IP address the vhost listens on. Defaults to listen on all IPs.
-
-#####`ip_based`
-
-Enables an [IP-based](http://httpd.apache.org/docs/current/vhosts/ip-based.html) vhost. This parameter inhibits the creation of a NameVirtualHost directive, since those are used to funnel requests to name-based vhosts. Defaults to 'false'.
-
-#####`itk`
-
-Configures [ITK](http://mpm-itk.sesse.net/) in a hash. Keys may be:
-
-* user + group
-* `assignuseridexpr`
-* `assigngroupidexpr`
-* `maxclientvhost`
-* `nice`
-* `limituidrange` (Linux 3.5.0 or newer)
-* `limitgidrange` (Linux 3.5.0 or newer)
-
-Usage will typically look like:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot => '/path/to/directory',
-      itk     => {
-        user  => 'someuser',
-        group => 'somegroup',
-      },
-    }
-```
-
-#####`logroot`
-
-Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
-
-#####`log_level`
-
-Specifies the verbosity of the error log. Defaults to 'warn' for the global server configuration and can be overridden on a per-vhost basis. Valid values are 'emerg', 'alert', 'crit', 'error', 'warn', 'notice', 'info' or 'debug'.
-
-#####`no_proxy_uris`
-
-Specifies URLs you do not want to proxy. This parameter is meant to be used in combination with [`proxy_dest`](#proxy_dest).
-
-#####`proxy_preserve_host`
-
-Sets the [ProxyPreserveHost Directive](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost).  true Enables the Host: line from an incoming request to be proxied to the host instead of hostname .  false sets this option to off (default).
-
-#####`options`
-
-Sets the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the specified virtual host. Defaults to '['Indexes','FollowSymLinks','MultiViews']', as demonstrated below:
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      options => ['Indexes','FollowSymLinks','MultiViews'],
-    }
-```
-
-*Note:* If you use [`directories`](#parameter-directories-for-apachevhost), 'Options', 'Override', and 'DirectoryIndex' are ignored because they are parameters within `directories`.
-
-#####`override`
-
-Sets the overrides for the specified virtual host. Accepts an array of [AllowOverride](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) arguments. Defaults to '[none]'.
-
-#####`php_admin_flags & values`
-
-Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '[]'.
-
-#####`port`
-
-Sets the port the host is configured on. The module's defaults ensure the host listens on port 80 for non-SSL vhosts and port 443 for SSL vhosts. The host will only listen on the port set in this parameter. 
-
-#####`priority`
-
-Sets the relative load-order for Apache HTTPD VirtualHost configuration files. Defaults to '25'.
-
-If nothing matches the priority, the first name-based vhost will be used. Likewise, passing a higher priority will cause the alphabetically first name-based vhost to be used if no other names match.
-
-*Note:* You should not need to use this parameter. However, if you do use it, be aware that the `default_vhost` parameter for `apache::vhost` passes a priority of '15'.
-
-#####`proxy_dest`
-
-Specifies the destination address of a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
-
-#####`proxy_pass`
-
-Specifies an array of `path => URI` for a [ProxyPass](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxypass) configuration. Defaults to 'undef'.
-
-```puppet
-apache::vhost { 'site.name.fdqn':
-  … 
-  proxy_pass => [
-    { 'path' => '/a', 'url' => 'http://backend-a/' },
-    { 'path' => '/b', 'url' => 'http://backend-b/' },
-    { 'path' => '/c', 'url' => 'http://backend-a/c' },
-  ],
-}
-```
-
-#####`rack_base_uris`
-
-Specifies the resource identifiers for a rack configuration. The file paths specified will be listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
-
-#####`redirect_dest`
-
-Specifies the address to redirect to. Defaults to 'undef'.
-
-#####`redirect_source`
-
-Specifies the source URIs that will redirect to the destination specified in `redirect_dest`. If more than one item for redirect is supplied, the source and destination must be the same length and the items will be order-dependent. 
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_source => ['/images','/downloads'],
-      redirect_dest   => ['http://img.example.com/','http://downloads.example.com/'],
-    }
-```
-
-#####`redirect_status`
-
-Specifies the status to append to the redirect. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirect_status => ['temp','permanent'],
-    }
-```
-
-#####`redirectmatch_regexp` & `redirectmatch_status`
-
-Determines which server status should be raised for a given regular expression. Entered as an array. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      redirectmatch_status => ['404','404'],
-      redirectmatch_regexp => ['\.git(/.*|$)/','\.svn(/.*|$)'],
-    }
-```
-
-#####`request_headers`
-
-Modifies collected [request headers](http://httpd.apache.org/docs/current/mod/mod_headers.html#requestheader) in various ways, including adding additional request headers, removing request headers, etc. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      request_headers => [
-        'append MirrorID "mirror 12"',
-        'unset MirrorID',
-      ],
-    }
-```
-
-#####`rewrites`
-
-Creates URL rewrite rules. Expects an array of hashes, and the hash keys can be any of 'comment', 'rewrite_base', 'rewrite_cond', or 'rewrite_rule'. Defaults to 'undef'. 
-
-For example, you can specify that anyone trying to access index.html will be served welcome.html
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [ { rewrite_rule => ['^index\.html$ welcome.html'] } ]
-    }
-```
-
-The parameter allows rewrite conditions that, when true, will execute the associated rule. For instance, if you wanted to rewrite URLs only if the visitor is using IE
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'redirect IE',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
-```
-
-You can also apply multiple conditions. For instance, rewrite index.html to welcome.html only when the browser is Lynx or Mozilla (version 1 or 2)
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-      ],
-    }
-```
-
-Multiple rewrites and conditions are also possible
-
-```puppet
-    apache::vhost { 'site.name.fdqn':
-      …
-      rewrites => [
-        {
-          comment      => 'Lynx or Mozilla v1/2',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-          rewrite_rule => ['^index\.html$ welcome.html'],
-        },
-        {
-          comment      => 'Internet Explorer',
-          rewrite_cond => ['%{HTTP_USER_AGENT} ^MSIE'],
-          rewrite_rule => ['^index\.html$ /index.IE.html [L]'],
-        },
-        {
-          rewrite_base => /apps/,
-          rewrite_rule => ['^index\.cgi$ index.php', '^index\.html$ index.php', '^index\.asp$ index.html'],
-        },
-     ], 
-    }
-```
-
-Refer to the [`mod_rewrite` documentation](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) for more details on what is possible with rewrite rules and conditions.
-
-#####`scriptalias`
-
-Defines a directory of CGI scripts to be aliased to the path '/cgi-bin', for example: '/usr/scripts'. Defaults to 'undef'.
-
-#####`scriptaliases`
-
-Passes an array of hashes to the vhost to create either ScriptAlias or ScriptAliasMatch statements as per the [`mod_alias` documentation](http://httpd.apache.org/docs/current/mod/mod_alias.html). These hashes are formatted as follows:
-
-```puppet
-    scriptaliases => [
-      {
-        alias => '/myscript',
-        path  => '/usr/share/myscript',
-      },
-      {
-        aliasmatch => '^/foo(.*)',
-        path       => '/usr/share/fooscripts$1',
-      },
-      {
-        aliasmatch => '^/bar/(.*)',
-        path       => '/usr/share/bar/wrapper.sh/$1',
-      },
-      {
-        alias => '/neatscript',
-        path  => '/usr/share/neatscript',
-      },
-    ]
-```
-
-The ScriptAlias and ScriptAliasMatch directives are created in the order specified. As with [Alias and AliasMatch](#aliases) directives, more specific aliases should come before more general ones to avoid shadowing.
-
-#####`serveradmin`
-
-Specifies the email address Apache will display when it renders one of its error pages. Defaults to 'undef'.
-
-#####`serveraliases`
-
-Sets the [ServerAliases](http://httpd.apache.org/docs/current/mod/core.html#serveralias) of the site. Defaults to '[]'.
-
-#####`servername`
-
-Sets the servername corresponding to the hostname you connect to the virtual host at. Defaults to the title of the resource.
-
-#####`setenv`
-
-Used by HTTPD to set environment variables for vhosts. Defaults to '[]'.
-
-#####`setenvif`
-
-Used by HTTPD to conditionally set environment variables for vhosts. Defaults to '[]'.
-
-#####`suphp_addhandler`, `suphp_configpath`, & `suphp_engine`
-
-Set up a virtual host with [suPHP](http://suphp.org/DocumentationView.html?file=apache/CONFIG). 
-
-`suphp_addhandler` defaults to 'php5-script' on RedHat and FreeBSD, and 'x-httpd-php' on Debian.
-
-`suphp_configpath` defaults to 'undef' on RedHat and FreeBSD, and '/etc/php5/apache2' on Debian.
-
-`suphp_engine` allows values 'on' or 'off'. Defaults to 'off'
-
-To set up a virtual host with suPHP
-
-```puppet
-    apache::vhost { 'suphp.example.com':
-      port                => '80',
-      docroot             => '/home/appuser/myphpapp',
-      suphp_addhandler    => 'x-httpd-php',
-      suphp_engine        => 'on',
-      suphp_configpath    => '/etc/php5/apache2',
-      directories         => { path => '/home/appuser/myphpapp',
-        'suphp'           => { user => 'myappuser', group => 'myappgroup' },
-      }
-    }
-```
-
-#####`vhost_name`
-
-Enables name-based virtual hosting. If no IP is passed to the virtual host but the vhost is assigned a port, then the vhost name will be 'vhost_name:port'. If the virtual host has no assigned IP or port, the vhost name will be set to the title of the resource. Defaults to '*'.
-
-#####`virtual_docroot` 
-
-Sets up a virtual host with a wildcard alias subdomain mapped to a directory with the same name. For example, 'http://example.com' would map to '/var/www/example.com'. Defaults to 'false'. 
-
-```puppet
-    apache::vhost { 'subdomain.loc':
-      vhost_name       => '*',
-      port             => '80',
-      virtual_docroot' => '/var/www/%-2+',
-      docroot          => '/var/www',
-      serveraliases    => ['*.loc',],
-    }
-```
-
-#####`wsgi_daemon_process`, `wsgi_daemon_process_options`, `wsgi_process_group`, `wsgi_script_aliases`, & `wsgi_pass_authorization`
-
-Set up a virtual host with [WSGI](https://code.google.com/p/modwsgi/).
-
-`wsgi_daemon_process` sets the name of the WSGI daemon. It is a hash, accepting [these keys](http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIDaemonProcess.html), and it defaults to 'undef'.
-
-`wsgi_daemon_process_options` is optional and defaults to 'undef'.
-
-`wsgi_process_group` sets the group ID the virtual host will run under. Defaults to 'undef'.
-
-`wsgi_script_aliases` requires a hash of web paths to filesystem .wsgi paths. Defaults to 'undef'.
-
-`wsgi_pass_authorization` the WSGI application handles authorisation instead of Apache when set to 'On'. For more information see [here] (http://modwsgi.readthedocs.org/en/latest/configuration-directives/WSGIPassAuthorization.html).  Defaults to 'undef' where apache will set the defaults setting to 'Off'.
-
-To set up a virtual host with WSGI
-
-```puppet
-    apache::vhost { 'wsgi.example.com':
-      port                        => '80',
-      docroot                     => '/var/www/pythonapp',
-      wsgi_daemon_process         => 'wsgi',
-      wsgi_daemon_process_options =>
-        { processes    => '2', 
-          threads      => '15', 
-          display-name => '%{GROUP}',
-         },
-      wsgi_process_group          => 'wsgi',
-      wsgi_script_aliases         => { '/' => '/var/www/demo.wsgi' },
-    }
-```
-
-####Parameter `directories` for `apache::vhost`
-
-The `directories` parameter within the `apache::vhost` class passes an array of hashes to the vhost to create [Directory](http://httpd.apache.org/docs/current/mod/core.html#directory), [File](http://httpd.apache.org/docs/current/mod/core.html#files), and [Location](http://httpd.apache.org/docs/current/mod/core.html#location) directive blocks. These blocks take the form, '< Directory /path/to/directory>...< /Directory>'.
-
-Each hash passed to `directories` must contain `path` as one of the keys.  You may also pass in `provider` which, if missing, defaults to 'directory'. (A full list of acceptable keys is below.) General usage will look something like
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path => '/path/to/directory', <key> => <value> },
-        { path => '/path/to/another/directory', <key> => <value> },
-      ],
-    }
-```
-
-*Note:* At least one directory should match the `docroot` parameter. Once you start declaring directories, `apache::vhost` assumes that all required Directory blocks will be declared. If not defined, a single default Directory block will be created that matches the `docroot` parameter.
-
-The `provider` key can be set to 'directory', 'files', or 'location'. If the path starts with a [~](https://httpd.apache.org/docs/current/mod/core.html#files), HTTPD will interpret this as the equivalent of DirectoryMatch, FilesMatch, or LocationMatch.
-
-```puppet
-    apache::vhost { 'files.example.net':
-      docroot     => '/var/www/files',
-      directories => [
-        { 'path'     => '/var/www/files', 
-          'provider' => 'files', 
-          'deny'     => 'from all' 
-         },
-      ],
-    }
-```
-
-Available handlers, represented as keys, should be placed within the  `directory`,`'files`, or `location` hashes.  This looks like
-
-```puppet
-  apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ { path => '/path/to/directory', handler => value } ],
-}
-```
-
-Any handlers you do not set in these hashes will be considered 'undefined' within Puppet and will not be added to the virtual host, resulting in the module using their default values. Currently this is the list of supported handlers:
-
-######`addhandlers`
-
-Sets [AddHandler](http://httpd.apache.org/docs/current/mod/mod_mime.html#addhandler) directives, which map filename extensions to the specified handler. Accepts a list of hashes, with `extensions` serving to list the extensions being managed by the handler, and takes the form: `{ handler => 'handler-name', extensions => ['extension']}`. 
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path        => '/path/to/directory',
-          addhandlers => [{ handler => 'cgi-script', extensions => ['.cgi']}],
-        }, 
-      ],
-    }
-```
-
-######`allow`
-
-Sets an [Allow](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#allow) directive, which groups authorizations based on hostnames or IPs. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. You can use it as a single string for one rule or as an array for more than one.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          allow => 'from example.org', 
-        }, 
-      ],
-    }
-```
-
-######`allow_override`
-
-Sets the types of directives allowed in [.htaccess](http://httpd.apache.org/docs/current/mod/core.html#allowoverride) files. Accepts an array.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot      => '/path/to/directory',
-      directories  => [ 
-        { path           => '/path/to/directory', 
-          allow_override => ['AuthConfig', 'Indexes'], 
-        }, 
-      ],
-    }
-```
-
-######`auth_basic_authoritative`
-
-Sets the value for [AuthBasicAuthoritative](https://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicauthoritative), which determines whether authorization and authentication are passed to lower level Apache modules.
-
-######`auth_basic_fake`
-
-Sets the value for [AuthBasicFake](http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicfake), which statically configures authorization credentials for a given directive block.
-
-######`auth_basic_provider`
-
-Sets the value for [AuthBasicProvider] (http://httpd.apache.org/docs/current/mod/mod_auth_basic.html#authbasicprovider), which sets the authentication provider for a given location.
-
-######`auth_digest_algorithm`
-
-Sets the value for [AuthDigestAlgorithm](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestalgorithm), which selects the algorithm used to calculate the challenge and response hashes.
-
-######`auth_digest_domain`
-
-Sets the value for [AuthDigestDomain](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestdomain), which allows you to specify one or more URIs in the same protection space for digest authentication.
-
-######`auth_digest_nonce_lifetime`
-
-Sets the value for [AuthDigestNonceLifetime](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestnoncelifetime), which controls how long the server nonce is valid.
-
-######`auth_digest_provider`
-
-Sets the value for [AuthDigestProvider](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestprovider), which sets the authentication provider for a given location.
-
-######`auth_digest_qop`
-
-Sets the value for [AuthDigestQop](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestqop), which determines the quality-of-protection to use in digest authentication.
-
-######`auth_digest_shmem_size`
-
-Sets the value for [AuthAuthDigestShmemSize](http://httpd.apache.org/docs/current/mod/mod_auth_digest.html#authdigestshmemsize), which defines the amount of shared memory allocated to the server for keeping track of clients.
-
-######`auth_group_file`
-
-Sets the value for [AuthGroupFile](https://httpd.apache.org/docs/current/mod/mod_authz_groupfile.html#authgroupfile), which sets the name of the text file containing the list of user groups for authorization.
-
-######`auth_name`
-
-Sets the value for [AuthName](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authname), which sets the name of the authorization realm.
-
-######`auth_require`
-
-Sets the entity name you're requiring to allow access. Read more about [Require](http://httpd.apache.org/docs/current/mod/mod_authz_host.html#requiredirectives).
-
-######`auth_type`
-
-Sets the value for [AuthType](http://httpd.apache.org/docs/current/mod/mod_authn_core.html#authtype), which guides the type of user authentication.
-
-######`auth_user_file`
-
-Sets the value for [AuthUserFile](http://httpd.apache.org/docs/current/mod/mod_authn_file.html#authuserfile), which sets the name of the text file containing the users/passwords for authentication.
-
-######`custom_fragment`
-
-Pass a string of custom configuration directives to be placed at the end of the directory configuration.
-
-```puppet
-  apache::vhost { 'monitor':
-    … 
-    custom_fragment => '
-  <Location /balancer-manager>
-    SetHandler balancer-manager
-    Order allow,deny
-    Allow from all
-  </Location>
-  <Location /server-status>
-    SetHandler server-status
-    Order allow,deny
-    Allow from all
-  </Location>
-  ProxyStatus On',
-}
-```
-
-######`deny`
-
-Sets a [Deny](http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html#deny) directive, specifying which hosts are denied access to the server. **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower. 
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path => '/path/to/directory', 
-          deny => 'from example.org', 
-        }, 
-      ],
-    }
-```
-
-######`error_documents`
-
-An array of hashes used to override the [ErrorDocument](https://httpd.apache.org/docs/current/mod/core.html#errordocument) settings for the directory. 
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      directories => [ 
-        { path            => '/srv/www',
-          error_documents => [
-            { 'error_code' => '503', 
-              'document'   => '/service-unavail',
-            },
-          ],
-        },
-      ],
-    }
-```
-
-######`headers`
-
-Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => {
-        path    => '/path/to/directory',
-        headers => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-      },
-    }
-```
-
-######`index_options`
-
-Allows configuration settings for [directory indexing](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexoptions).
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path          => '/path/to/directory', 
-          options       => ['Indexes','FollowSymLinks','MultiViews'], 
-          index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
-        },
-      ],
-    }
-```
-
-######`index_order_default`
-
-Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexorderdefault) of the directory index.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path                => '/path/to/directory', 
-          order               => 'Allow,Deny', 
-          index_order_default => ['Descending', 'Date'],
-        }, 
-      ],
-    }
-```
-
-######`options`
-
-Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path    => '/path/to/directory', 
-          options => ['Indexes','FollowSymLinks','MultiViews'], 
-        },
-      ],
-    }
-```
-
-######`order`
-
-Sets the order of processing Allow and Deny statements as per [Apache core documentation](httpd.apache.org/docs/2.2/mod/mod_authz_host.html#order). **Deprecated:** This parameter is being deprecated due to a change in Apache. It will only work with Apache 2.2 and lower.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path  => '/path/to/directory', 
-          order => 'Allow,Deny', 
-        },
-      ],
-    }
-```
-
-######`sethandler`
-
-Sets a `SetHandler` directive as per the [Apache Core documentation](http://httpd.apache.org/docs/2.2/mod/core.html#sethandler). An example:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path       => '/path/to/directory', 
-          sethandler => 'None', 
-        }
-      ],
-    }
-```
-
-######`passenger_enabled`
-
-Sets the value for the [PassengerEnabled](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerEnabled) directory to 'on' or 'off'. Requires `apache::mod::passenger` to be included.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      docroot     => '/path/to/directory',
-      directories => [ 
-        { path              => '/path/to/directory', 
-          passenger_enabled => 'on',
-        }, 
-      ],
-    }
-```
-
-*Note:* Be aware that there is an [issue](http://www.conandalton.net/2010/06/passengerenabled-off-not-working.html) using the PassengerEnabled directive with the PassengerHighPerformance directive.
-
-######`php_admin_value` and `php_admin_flag`
-
-`php_admin_value` sets the value of the directory, and `php_admin_flag` uses a boolean to configure the directory. Further information can be found [here](http://php.net/manual/en/configuration.changes.php).
-
-######`ssl_options`
-
-String or list of [SSLOptions](https://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions), which configure SSL engine run-time options. This handler takes precedence over SSLOptions set in the parent block of the vhost.
-
-```puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path        => '/path/to/directory', 
-          ssl_options => '+ExportCertData', 
-        },
-        { path        => '/path/to/different/dir', 
-          ssl_options => [ '-StdEnvVars', '+ExportCertData'],
-        },
-      ],
-    }
-```
-
-######`suphp`
-
-A hash containing the 'user' and 'group' keys for the [suPHP_UserGroup](http://www.suphp.org/DocumentationView.html?file=apache/CONFIG) setting. It must be used with `suphp_engine => on` in the vhost declaration, and may only be passed within `directories`.
-
-```puppet
-    apache::vhost { 'secure.example.net':
-      docroot     => '/path/to/directory',
-      directories => [
-        { path  => '/path/to/directory', 
-          suphp => 
-            { user  =>  'myappuser', 
-              group => 'myappgroup', 
-            },
-        },
-      ],
-    }
-```
-
-####SSL parameters for `apache::vhost`
-
-All of the SSL parameters for `::vhost` will default to whatever is set in the base `apache` class. Use the below parameters to tweak individual SSL settings for specific vhosts.
-
-#####`ssl`
-
-Enables SSL for the virtual host. SSL vhosts only respond to HTTPS queries. Valid values are 'true' or 'false'. Defaults to 'false'. 
-
-#####`ssl_ca`
-
-Specifies the SSL certificate authority. Defaults to 'undef'.
-
-#####`ssl_cert`
-
-Specifies the SSL certification. Defaults are based on your OS: '/etc/pki/tls/certs/localhost.crt' for RedHat, '/etc/ssl/certs/ssl-cert-snakeoil.pem' for Debian, and '/usr/local/etc/apache22/server.crt' for FreeBSD.
-
-#####`ssl_protocol`
-
-Specifies [SSLProtocol](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslprotocol). Defaults to 'undef'. 
-
-If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'all -SSLv2'.
-
-#####`ssl_cipher`
-
-Specifies [SSLCipherSuite](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslciphersuite). Defaults to 'undef'.
-
-If you do not use this parameter, it will use the HTTPD default from ssl.conf.erb, 'HIGH:MEDIUM:!aNULL:!MD5'.
-
-#####`ssl_honorcipherorder`
-
-Sets [SSLHonorCipherOrder](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslhonorcipherorder), which is used to prefer the server's cipher preference order. Defaults to 'On' in the base `apache` config.
-
-#####`ssl_certs_dir`
-
-Specifies the location of the SSL certification directory. Defaults to '/etc/ssl/certs' on Debian, '/etc/pki/tls/certs' on RedHat, and '/usr/local/etc/apache22' on FreeBSD.
-
-#####`ssl_chain`
-
-Specifies the SSL chain. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_crl`
-
-Specifies the certificate revocation list to use. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_crl_path`
-
-Specifies the location of the certificate revocation list. Defaults to 'undef'. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_key`
-
-Specifies the SSL key. Defaults are based on your operating system: '/etc/pki/tls/private/localhost.key' for RedHat, '/etc/ssl/private/ssl-cert-snakeoil.key' for Debian, and '/usr/local/etc/apache22/server.key' for FreeBSD. (This default will work out of the box but must be updated in the base `apache` class with your specific certificate information before being used in production.)
-
-#####`ssl_verify_client`
-
-Sets the [SSLVerifyClient](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifyclient) directive, which sets the certificate verification level for client authentication. Valid values are: 'none', 'optional', 'require', and 'optional_no_ca'. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_verify_client => 'optional',
-    }
-```
-
-#####`ssl_verify_depth`
-
-Sets the [SSLVerifyDepth](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslverifydepth) directive, which specifies the maximum depth of CA certificates in client certificate verification. Defaults to 'undef'.
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_verify_depth => 1,
-    }
-```
-
-#####`ssl_options`
-
-Sets the [SSLOptions](http://httpd.apache.org/docs/current/mod/mod_ssl.html#ssloptions) directive, which configures various SSL engine run-time options. This is the global setting for the given vhost and can be a string or an array. Defaults to 'undef'. 
-
-A string:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_options => '+ExportCertData',
-    }
-```
-
-An array:
-
-```puppet
-    apache::vhost { 'sample.example.net':
-      …
-      ssl_options => [ '+StrictRequire', '+ExportCertData' ],
-    }
-```
-
-#####`ssl_proxyengine`
-
-Specifies whether or not to use [SSLProxyEngine](http://httpd.apache.org/docs/current/mod/mod_ssl.html#sslproxyengine). Valid values are 'true' and 'false'. Defaults to 'false'.
-
-
-###Virtual Host Examples
-
-The apache module allows you to set up pretty much any configuration of virtual host you might need. This section will address some common configurations, but look at the [Tests section](https://github.com/puppetlabs/puppetlabs-apache/tree/master/tests) for even more examples.
-
-Configure a vhost with a server administrator
-
-```puppet
-    apache::vhost { 'third.example.com':
-      port        => '80',
-      docroot     => '/var/www/third',
-      serveradmin => 'admin@example.com',
-    }
-```
-
-- - -
-
-Set up a vhost with aliased servers
-
-```puppet
-    apache::vhost { 'sixth.example.com':
-      serveraliases => [
-        'sixth.example.org',
-        'sixth.example.net',
-      ],
-      port          => '80',
-      docroot       => '/var/www/fifth',
-    }
-```
-
-- - -
-
-Configure a vhost with a cgi-bin
-
-```puppet
-    apache::vhost { 'eleventh.example.com':
-      port        => '80',
-      docroot     => '/var/www/eleventh',
-      scriptalias => '/usr/lib/cgi-bin',
-    }
-```
-
-- - -
-
-Set up a vhost with a rack configuration
-
-```puppet
-    apache::vhost { 'fifteenth.example.com':
-      port           => '80',
-      docroot        => '/var/www/fifteenth',
-      rack_base_uris => ['/rackapp1', '/rackapp2'],
-    }
-```
-
-- - -
-
-Set up a mix of SSL and non-SSL vhosts at the same domain
-
-```puppet
-    #The non-ssl vhost
-    apache::vhost { 'first.example.com non-ssl':
-      servername => 'first.example.com',
-      port       => '80',
-      docroot    => '/var/www/first',
-    }
-
-    #The SSL vhost at the same domain
-    apache::vhost { 'first.example.com ssl':
-      servername => 'first.example.com',
-      port       => '443',
-      docroot    => '/var/www/first',
-      ssl        => true,
-    }
-```
-
-- - -
-
-Configure a vhost to redirect non-SSL connections to SSL
-
-```puppet
-    apache::vhost { 'sixteenth.example.com non-ssl':
-      servername      => 'sixteenth.example.com',
-      port            => '80',
-      docroot         => '/var/www/sixteenth',
-      redirect_status => 'permanent',
-      redirect_dest   => 'https://sixteenth.example.com/'
-    }
-    apache::vhost { 'sixteenth.example.com ssl':
-      servername => 'sixteenth.example.com',
-      port       => '443',
-      docroot    => '/var/www/sixteenth',
-      ssl        => true,
-    }
-```
-
-- - -
-
-Set up IP-based vhosts on any listen port and have them respond to requests on specific IP addresses. In this example, we will set listening on ports 80 and 81. This is required because the example vhosts are not declared with a port parameter.
-
-```puppet
-    apache::listen { '80': }
-    apache::listen { '81': }
-```
-
-Then we will set up the IP-based vhosts
-
-```puppet
-    apache::vhost { 'first.example.com':
-      ip       => '10.0.0.10',
-      docroot  => '/var/www/first',
-      ip_based => true,
-    }
-    apache::vhost { 'second.example.com':
-      ip       => '10.0.0.11',
-      docroot  => '/var/www/second',
-      ip_based => true,
-    }
-```
-
-- - -
-
-Configure a mix of name-based and IP-based vhosts. First, we will add two IP-based vhosts on 10.0.0.10, one SSL and one non-SSL
-
-```puppet
-    apache::vhost { 'The first IP-based vhost, non-ssl':
-      servername => 'first.example.com',
-      ip         => '10.0.0.10',
-      port       => '80',
-      ip_based   => true,
-      docroot    => '/var/www/first',
-    }
-    apache::vhost { 'The first IP-based vhost, ssl':
-      servername => 'first.example.com',
-      ip         => '10.0.0.10',
-      port       => '443',
-      ip_based   => true,
-      docroot    => '/var/www/first-ssl',
-      ssl        => true,
-    }
-```
-
-Then, we will add two name-based vhosts listening on 10.0.0.20
-
-```puppet
-    apache::vhost { 'second.example.com':
-      ip      => '10.0.0.20',
-      port    => '80',
-      docroot => '/var/www/second',
-    }
-    apache::vhost { 'third.example.com':
-      ip      => '10.0.0.20',
-      port    => '80',
-      docroot => '/var/www/third',
-    }
-```
-
-If you want to add two name-based vhosts so that they will answer on either 10.0.0.10 or 10.0.0.20, you **MUST** declare `add_listen => 'false'` to disable the otherwise automatic 'Listen 80', as it will conflict with the preceding IP-based vhosts.
-
-```puppet
-    apache::vhost { 'fourth.example.com':
-      port       => '80',
-      docroot    => '/var/www/fourth',
-      add_listen => false,
-    }
-    apache::vhost { 'fifth.example.com':
-      port       => '80',
-      docroot    => '/var/www/fifth',
-      add_listen => false,
-    }
-```
-
-###Load Balancing
-
-####Defined Type: `apache::balancer`
-
-`apache::balancer` creates an Apache balancer cluster. Each balancer cluster needs one or more balancer members, which are declared with [`apache::balancermember`](#defined-type-apachebalancermember). 
-
-One `apache::balancer` defined resource should be defined for each Apache load balanced set of servers. The `apache::balancermember` resources for all balancer members can be exported and collected on a single Apache load balancer server using exported resources.
-
-**Parameters within `apache::balancer`:**
-
-#####`name`
-
-Sets the balancer cluster's title. This parameter will also set the title of the conf.d file.
-
-#####`proxy_set`
-
-Configures key-value pairs as [ProxySet](http://httpd.apache.org/docs/current/mod/mod_proxy.html#proxyset) lines. Accepts a hash, and defaults to '{}'.
-
-#####`collect_exported`
-
-Determines whether or not to use exported resources. Valid values 'true' and 'false', defaults to 'true'. 
-
-If you statically declare all of your backend servers, you should set this to 'false' to rely on existing declared balancer member resources. Also make sure to use `apache::balancermember` with array arguments.
-
-If you wish to dynamically declare your backend servers via [exported resources](http://docs.puppetlabs.com/guides/exported_resources.html) collected on a central node, you must set this parameter to 'true' in order to collect the exported balancer member resources that were exported by the balancer member nodes.
-
-If you choose not to use exported resources, all balancer members will be configured in a single puppet run. If you are using exported resources, Puppet has to run on the balanced nodes, then run on the balancer.
-
-####Defined Type: `apache::balancermember`
-
-Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html), which will set up a balancer member inside a listening service configuration block in etc/apache/apache.cfg on the load balancer.
-
-**Parameters within `apache::balancermember`:**
-
-#####`name`
-
-Sets the title of the resource. This name will also set the name of the concat fragment.
-
-#####`balancer_cluster`
-
-Sets the Apache service's instance name. This must match the name of a declared `apache::balancer` resource. Required.
-
-#####`url`
-
-Specifies the URL used to contact the balancer member server. Defaults to 'http://${::fqdn}/'.
-
-#####`options`
-
-An array of [options](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#balancermember) to be specified after the URL. Accepts any key-value pairs available to [ProxyPass](http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypass).
-
-####Examples
-
-To load balance with exported resources, export the `balancermember` from the balancer member
-
-```puppet
-      @@apache::balancermember { "${::fqdn}-puppet00":
-        balancer_cluster => 'puppet00',
-        url              => "ajp://${::fqdn}:8009"
-        options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-      }
-```
-
-Then, on the proxy server, create the balancer cluster
-
-```puppet
-      apache::balancer { 'puppet00': }
-```
-
-To load balance without exported resources, declare the following on the proxy
-
-```puppet
-    apache::balancer { 'puppet00': }
-    apache::balancermember { "${::fqdn}-puppet00":
-        balancer_cluster => 'puppet00',
-        url              => "ajp://${::fqdn}:8009"
-        options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-      }
-```
-
-Then declare `apache::balancer` and `apache::balancermember` on the proxy server.
-
-If you need to use ProxySet in the balancer config
-
-```puppet
-      apache::balancer { 'puppet01':
-        proxy_set => {'stickysession' => 'JSESSIONID'},
-      }
-```
-
-##Reference
-
-###Classes
-
-####Public Classes
-
-* [`apache`](#class-apache): Guides the basic setup of Apache.
-* `apache::dev`: Installs Apache development libraries. (*Note:* On FreeBSD, you must declare `apache::package` or `apache` before `apache::dev`.)
-* [`apache::mod::[name]`](#classes-apachemodname): Enables specific Apache HTTPD modules.
- 
-####Private Classes
-
-* `apache::confd::no_accf`: Creates the no-accf.conf configuration file in conf.d, required by FreeBSD's Apache 2.4.
-* `apache::default_confd_files`: Includes conf.d files for FreeBSD.
-* `apache::default_mods`: Installs the Apache modules required to run the default configuration.
-* `apache::package`: Installs and configures basic Apache packages.
-* `apache::params`: Manages Apache parameters.
-* `apache::service`: Manages the Apache daemon.
-
-###Defined Types
-
-####Public Defined Types
-
-* `apache::balancer`: Creates an Apache balancer cluster.
-* `apache::balancermember`: Defines members of [mod_proxy_balancer](http://httpd.apache.org/docs/current/mod/mod_proxy_balancer.html).
-* `apache::listen`: Based on the title, controls which ports Apache binds to for listening. Adds [Listen](http://httpd.apache.org/docs/current/bind.html) directives to ports.conf in the Apache HTTPD configuration directory. Titles take the form '<port>', '<ipv4>:<port>', or '<ipv6>:<port>'.
-* `apache::mod`: Used to enable arbitrary Apache HTTPD modules for which there is no specific `apache::mod::[name]` class.
-* `apache::namevirtualhost`: Enables name-based hosting of a virtual host. Adds all [NameVirtualHost](http://httpd.apache.org/docs/current/vhosts/name-based.html) directives to the `ports.conf` file in the Apache HTTPD configuration directory. Titles take the form '\*', '*:<port>', '\_default_:<port>, '<ip>', or '<ip>:<port>'.
-* `apache::vhost`: Allows specialized configurations for virtual hosts that have requirements outside the defaults. 
-
-####Private Defined Types
-
-* `apache::peruser::multiplexer`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
-* `apache::peruser::processor`: Enables the [Peruser](http://www.freebsd.org/cgi/url.cgi?ports/www/apache22-peruser-mpm/pkg-descr) module for FreeBSD only.
-
-###Templates
-
-The Apache module relies heavily on templates to enable the `vhost` and `apache::mod` defined types. These templates are built based on Facter facts around your operating system. Unless explicitly called out, most templates are not meant for configuration.
-
-##Limitations
-
-###Ubuntu 10.04
-
-The `apache::vhost::WSGIImportScript` parameter creates a statement inside the VirtualHost which is unsupported on older versions of Apache, causing this to fail.  This will be remedied in a future refactoring.
-
-###RHEL/CentOS 5
-
-The `apache::mod::passenger` and `apache::mod::proxy_html` classes are untested since repositories are missing compatible packages.   
-
-###RHEL/CentOS 7
-
-The `apache::mod::passenger` class is untested as the repository does not have packages for EL7 yet.  The fact that passenger packages aren't available also makes us unable to test the `rack_base_uri` parameter in `apache::vhost`.
-
-###General
-
-This module is CI tested on Centos 5 & 6, Ubuntu 12.04 & 14.04, Debian 7, and RHEL 5, 6 & 7 platforms against both the OSS and Enterprise version of Puppet. 
-
-The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions may occur.
-
-###SELinux and Custom Paths
-
-If you are running with SELinux in enforcing mode and want to use custom paths for your `logroot`, `mod_dir`, `vhost_dir`, and `docroot`, you will need to manage the context for the files yourself.
-
-Something along the lines of:
-
-```puppet
-        exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/custom/path(/.*)?"',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package['policycoreutils-python'],
-        }
-        package { 'policycoreutils-python': ensure => installed }
-        exec { 'restorecon_apache':
-          command => 'restorecon -Rv /apache_spec',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
-          require => Class['apache'],
-        }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        file { '/custom/path': ensure => directory, }
-        file { '/custom/path/include': ensure => present, content => '#additional_includes' }
-        apache::vhost { 'test.server':
-          docroot             => '/custom/path',
-          additional_includes => '/custom/path/include',
-        }
-```
-
-You need to set the contexts using `semanage fcontext` not `chcon` because `file {...}` resources will reset the context to the values in the database if the resource isn't specifying the context.
-
-##Development
-
-###Contributing
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-###Running tests
-
-This project contains tests for both [rspec-puppet](http://rspec-puppet.com/) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec) to verify functionality. For in-depth information please see their respective documentation.
-
-Quickstart:
-
-    gem install bundler
-    bundle install
-    bundle exec rake spec
-    bundle exec rspec spec/acceptance
-    RS_DEBUG=yes bundle exec rspec spec/acceptance
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md
deleted file mode 100644
index 4b4caa8c09f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/README.passenger.md
+++ /dev/null
@@ -1,278 +0,0 @@
-# Passenger
-
-Just enabling the Passenger module is insufficient for the use of Passenger in
-production. Passenger should be tunable to better fit the environment in which
-it is run while being aware of the resources it required.
-
-To this end the Apache passenger module has been modified to apply system wide
-Passenger tuning declarations to `passenger.conf`. Declarations specific to a
-virtual host should be passed through when defining a `vhost` (e.g.
-`rack_base_uris` parameter on the `apache::vhost` type, check `README.md`).
-
-Also, general apache module loading parameters can be supplied to enable using
-a customized passenger module in place of a default-package-based version of
-the module.
-
-# Operating system support and Passenger versions
-
-The most important configuration directive for the Apache Passenger module is
-`PassengerRoot`. Its value depends on the Passenger version used (2.x, 3.x or
-4.x) and on the operating system package from which the Apache Passenger module
-is installed.
-
-The following table summarises the current *default versions* and
-`PassengerRoot` settings for the operating systems supported by
-puppetlabs-apache:
-
-OS               | Passenger version  | `PassengerRoot` 
----------------- | ------------------ | ----------------
-Debian 7         | 3.0.13             | /usr
-Ubuntu 12.04     | 2.2.11             | /usr
-Ubuntu 14.04     | 4.0.37             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini 
-RHEL with EPEL6  | 3.0.21             | /usr/lib/ruby/gems/1.8/gems/passenger-3.0.21 
-
-As mentioned in `README.md` there are no compatible packages available for
-RHEL/CentOS 5 or RHEL/CentOS 7.
-
-## Configuration files and locations on RHEL/CentOS
-
-Notice two important points:
-
-1. The Passenger version packaged in the EPEL repositories may change over time.
-2. The value of `PassengerRoot` depends on the Passenger version installed.
-
-To prevent the puppetlabs-apache module from having to keep up with these
-package versions the Passenger configuration files installed by the
-packages are left untouched by this module. All configuration is placed in an
-extra configuration file managed by puppetlabs-apache.
-
-This means '/etc/httpd/conf.d/passenger.conf' is installed by the
-`mod_passenger` package and contains correct values for `PassengerRoot` and
-`PassengerRuby`. Puppet will ignore this file. Additional configuration
-directives as described in the remainder of this document are placed in
-'/etc/httpd/conf.d/passenger_extra.conf', managed by Puppet.
-
-This pertains *only* to RHEL/CentOS, *not* Debian and Ubuntu.
-
-## Third-party and custom Passenger packages and versions
-
-The Passenger version distributed by the default OS packages may be too old to
-be useful. Newer versions may be installed via Gems, from source or from
-third-party OS packages.
-
-Most notably the Passenger developers officially provide Debian packages for a
-variety of Debian and Ubuntu releases in the [Passenger APT
-repository](https://oss-binaries.phusionpassenger.com/apt/passenger). Read more
-about [installing these packages in the offical user
-guide](http://www.modrails.com/documentation/Users%20guide%20Apache.html#install_on_debian_ubuntu).
-
-If you install custom Passenger packages and newer version make sure to set the
-directives `PassengerRoot`, `PassengerRuby` and/or `PassengerDefaultRuby`
-correctly, or Passenger and Apache will fail to function properly.
-
-For Passenger 4.x packages on Debian and Ubuntu the `PassengerRoot` directive
-should almost universally be set to
-`/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini`.
-
-# Parameters for `apache::mod::passenger`
-
-The following class parameters configure Passenger in a global, server-wide
-context.
-
-Example:
-
-```puppet
-class { 'apache::mod::passenger':
-  passenger_root             => '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',
-  passenger_default_ruby     => '/usr/bin/ruby1.9.3',
-  passenger_high_performance => 'on',
-  rails_autodetect           => 'off',
-  mod_lib_path               => '/usr/lib/apache2/custom_modules',
-}
-```
-
-The general form is using the all lower-case version of the configuration
-directive, with underscores instead of CamelCase.
-
-## Parameters used with passenger.conf
-
-If you pass a default value to `apache::mod::passenger` it will be ignored and
-not passed through to the configuration file. 
-
-### passenger_root
-
-The location to the Phusion Passenger root directory. This configuration option
-is essential to Phusion Passenger, and allows Phusion Passenger to locate its
-own data files. 
-
-The default depends on the Passenger version and the means of installation. See
-the above section on operating system support, versions and packages for more
-information.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerroot_lt_directory_gt
-
-### passenger_default_ruby
-
-This option specifies the default Ruby interpreter to use for web apps as well
-as for all sorts of internal Phusion Passenger helper scripts, e.g. the one
-used by PassengerPreStart.
-
-This directive was introduced in Passenger 4.0.0 and will not work in versions
-< 4.x. Do not set this parameter if your Passenger version is older than 4.0.0.
-
-Defaults to `undef` for all operating systems except Ubuntu 14.04, where it is
-set to '/usr/bin/ruby'.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerDefaultRuby
-
-### passenger_ruby
-
-This directive is the same as `passenger_default_ruby` for Passenger versions
-< 4.x and must be used instead of `passenger_default_ruby` for such versions.
-
-It makes no sense to set `PassengerRuby` for Passenger >= 4.x. That
-directive should only be used to override the value of `PassengerDefaultRuby`
-on a non-global context, i.e. in `<VirtualHost>`, `<Directory>`, `<Location>`
-and so on.
-
-Defaults to `/usr/bin/ruby` for all supported operating systems except Ubuntu
-14.04, where it is set to `undef`.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerRuby
-
-### passenger_high_performance
-
-Default is `off`. When turned `on` Passenger runs in a higher performance mode
-that can be less compatible with other Apache modules.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
-
-### passenger_max_pool_size
-
-Sets the maximum number of Passenger application processes that may
-simultaneously run. The default value is 6.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
-
-### passenger_pool_idle_time
-
-The maximum number of seconds a Passenger Application process will be allowed
-to remain idle before being shut down. The default value is 300.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
-
-### passenger_max_requests
-
-The maximum number of request a Passenger application will process before being
-restarted. The default value is 0, which indicates that a process will only
-shut down if the Pool Idle Time (see above) expires.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
-
-### passenger_stat_throttle_rate
-
-Sets how often Passenger performs file system checks, at most once every _x_
-seconds. Default is 0, which means the checks are performed with every request.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
-
-### rack_autodetect
-
-Should Passenger automatically detect if the document root of a virtual host is
-a Rack application. Not set by default (`undef`). Note that this directive has
-been removed in Passenger 4.0.0 and `PassengerEnabled` should be used instead.
-Use this directive only on Passenger < 4.x.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
-
-### rails_autodetect
-
-Should Passenger automatically detect if the document root of a virtual host is
-a Rails application.  Not set by default (`undef`). Note that this directive
-has been removed in Passenger 4.0.0 and `PassengerEnabled` should be used
-instead. Use this directive only on Passenger < 4.x.
-
-http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
-
-### passenger_use_global_queue
-
-Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is
-the default in Passenger 4.x and the versions >= 4.x have disabled this
-configuration option altogether.  Use with caution.
-
-## Parameters used to load the module
-
-Unlike the tuning parameters specified above, the following parameters are only
-used when loading customized passenger modules.
-
-### mod_package
-
-Allows overriding the default package name used for the passenger module
-package.
-
-### mod_package_ensure
-
-Allows overriding the package installation setting used by puppet when
-installing the passenger module. The default is 'present'.
-
-### mod_id
-
-Allows overriding the value used by apache to identify the passenger module.
-The default is 'passenger_module'.
-
-### mod_lib_path
-
-Allows overriding the directory path used by apache when loading the passenger
-module. The default is the value of `$apache::params::lib_path`.
-
-### mod_lib
-
-Allows overriding the library file name used by apache when loading the
-passenger module. The default is 'mod_passenger.so'.
-
-### mod_path
-
-Allows overriding the full path to the library file used by apache when loading
-the passenger module. The default is the concatenation of the `mod_lib_path`
-and `mod_lib` parameters.
-
-# Dependencies
-
-RedHat-based systems will need to configure additional package repositories in
-order to install Passenger, specifically:
-
-* [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL)
-* [Phusion Passenger](http://passenger.stealthymonkeys.com)
-
-Configuration of these repositories is beyond the scope of this module and is
-left to the user.
-
-# Attribution
-
-The Passenger tuning parameters for the `apache::mod::passenger` Puppet class
-was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the
-NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the
-PuppetLabs Apache module on GitHub.
-
-* https://github.com/puppetlabs/puppetlabs-apache
-* https://github.com/nesi/puppetlabs-apache
-* http://www.nesi.org.nz//
-* https://tuakiri.ac.nz/confluence/display/Tuakiri/Home
-
-# Copyright and License
-
-Copyright (C) 2012 [Puppet Labs](https://www.puppetlabs.com/) Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile
deleted file mode 100644
index 5868545f200..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.fail_on_warnings
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd
deleted file mode 100644
index d65a8d445c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/files/httpd
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configuration file for the httpd service.
-
-#
-# The default processing model (MPM) is the process-based
-# 'prefork' model.  A thread-based model, 'worker', is also
-# available, but does not work with some modules (such as PHP).
-# The service must be stopped before changing this variable.
-#
-#HTTPD=/usr/sbin/httpd.worker
-
-#
-# To pass additional options (for instance, -D definitions) to the
-# httpd binary at startup, set OPTIONS here.
-#
-#OPTIONS=
-#OPTIONS=-DDOWN
-
-#
-# By default, the httpd process is started in the C locale; to 
-# change the locale in which the server runs, the HTTPD_LANG
-# variable can be set.
-#
-#HTTPD_LANG=C
-export SHORTHOST=`hostname -s`
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb
deleted file mode 100644
index 670aca3d03b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-class Puppet::Provider::A2mod < Puppet::Provider
-  def self.prefetch(mods)
-    instances.each do |prov|
-      if mod = mods[prov.name]
-        mod.provider = prov
-      end
-    end
-  end
-
-  def flush
-    @property_hash.clear
-  end
-
-  def properties
-    if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
-      @property_hash[:ensure] = :absent if @property_hash.empty?
-    end
-    @property_hash.dup
-  end
-
-  def query
-    self.class.instances.each do |mod|
-      if mod.name == self.name or mod.name.downcase == self.name
-        return mod.properties
-      end
-    end
-    nil
-  end
-
-  def exists?
-    properties[:ensure] != :absent
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
deleted file mode 100644
index e257a579e89..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/a2mod.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'puppet/provider/a2mod'
-
-Puppet::Type.type(:a2mod).provide(:a2mod, :parent => Puppet::Provider::A2mod) do
-    desc "Manage Apache 2 modules on Debian and Ubuntu"
-
-    optional_commands :encmd => "a2enmod"
-    optional_commands :discmd => "a2dismod"
-    commands :apache2ctl => "apache2ctl"
-
-    confine :osfamily => :debian
-    defaultfor :operatingsystem => [:debian, :ubuntu]
-
-    def self.instances
-      modules = apache2ctl("-M").lines.collect { |line|
-        m = line.match(/(\w+)_module \(shared\)$/)
-        m[1] if m
-      }.compact
-
-      modules.map do |mod|
-        new(
-          :name     => mod,
-          :ensure   => :present,
-          :provider => :a2mod
-        )
-      end
-    end
-
-    def create
-        encmd resource[:name]
-    end
-
-    def destroy
-        discmd resource[:name]
-    end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
deleted file mode 100644
index 07319dfdc8f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/gentoo.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'puppet/util/filetype'
-Puppet::Type.type(:a2mod).provide(:gentoo, :parent => Puppet::Provider) do
-  desc "Manage Apache 2 modules on Gentoo"
-
-  confine :operatingsystem => :gentoo
-  defaultfor :operatingsystem => :gentoo
-
-  attr_accessor :property_hash
-
-  def create
-    @property_hash[:ensure] = :present
-  end
-
-  def exists?
-    (!(@property_hash[:ensure].nil?) and @property_hash[:ensure] == :present)
-  end
-
-  def destroy
-    @property_hash[:ensure] = :absent
-  end
-
-  def flush
-    self.class.flush
-  end
-
-  class << self
-    attr_reader :conf_file
-  end
-
-  def self.clear
-    @mod_resources = []
-    @modules       = []
-    @other_args    = ""
-  end
-
-  def self.initvars
-    @conf_file     = "/etc/conf.d/apache2"
-    @filetype      = Puppet::Util::FileType.filetype(:flat).new(conf_file)
-    @mod_resources = []
-    @modules       = []
-    @other_args    = ""
-  end
-
-  self.initvars
-
-  # Retrieve an array of all existing modules
-  def self.modules
-    if @modules.length <= 0
-      # Locate the APACHE_OPTS variable
-      records = filetype.read.split(/\n/)
-      apache2_opts = records.grep(/^\s*APACHE2_OPTS=/).first
-
-      # Extract all defines
-      while apache2_opts.sub!(/-D\s+(\w+)/, '')
-        @modules << $1.downcase
-      end
-
-      # Hang on to any remaining options.
-      if apache2_opts.match(/APACHE2_OPTS="(.+)"/)
-        @other_args = $1.strip
-      end
-
-      @modules.sort!.uniq!
-    end
-
-    @modules
-  end
-
-  def self.prefetch(resources={})
-    # Match resources with existing providers
-    instances.each do |provider|
-      if resource = resources[provider.name]
-        resource.provider = provider
-      end
-    end
-
-    # Store all resources using this provider for flushing
-    resources.each do |name, resource|
-      @mod_resources << resource
-    end
-  end
-
-  def self.instances
-    modules.map {|mod| new(:name => mod, :provider => :gentoo, :ensure => :present)}
-  end
-
-  def self.flush
-
-    mod_list       = modules
-    mods_to_remove = @mod_resources.select {|mod| mod.should(:ensure) == :absent}.map {|mod| mod[:name]}
-    mods_to_add    = @mod_resources.select {|mod| mod.should(:ensure) == :present}.map {|mod| mod[:name]}
-
-    mod_list -= mods_to_remove
-    mod_list += mods_to_add
-    mod_list.sort!.uniq!
-
-    if modules != mod_list
-      opts = @other_args + " "
-      opts << mod_list.map {|mod| "-D #{mod.upcase}"}.join(" ")
-      opts.strip!
-      opts.gsub!(/\s+/, ' ')
-
-      apache2_opts = %Q{APACHE2_OPTS="#{opts}"}
-      Puppet.debug("Writing back \"#{apache2_opts}\" to #{conf_file}")
-
-      records = filetype.read.split(/\n/)
-
-      opts_index = records.find_index {|i| i.match(/^\s*APACHE2_OPTS/)}
-      records[opts_index] = apache2_opts
-
-      filetype.backup
-      filetype.write(records.join("\n"))
-      @modules = mod_list
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
deleted file mode 100644
index 8f35b2e4a15..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/modfix.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-Puppet::Type.type(:a2mod).provide :modfix do
-    desc "Dummy provider for A2mod.
-
-    Fake nil resources when there is no crontab binary available. Allows
-    puppetd to run on a bootstrapped machine before a Cron package has been
-    installed. Workaround for: http://projects.puppetlabs.com/issues/2384
-    "
-
-    def self.instances
-        []
-    end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
deleted file mode 100644
index ea5494cb481..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/provider/a2mod/redhat.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-require 'puppet/provider/a2mod'
-
-Puppet::Type.type(:a2mod).provide(:redhat, :parent => Puppet::Provider::A2mod) do
-  desc "Manage Apache 2 modules on RedHat family OSs"
-
-  commands :apachectl => "apachectl"
-
-  confine :osfamily => :redhat
-  defaultfor :osfamily => :redhat
-
-  require 'pathname'
-
-  # modpath: Path to default apache modules directory /etc/httpd/mod.d
-  # modfile: Path to module load configuration file; Default: resides under modpath directory
-  # libfile: Path to actual apache module library. Added in modfile LoadModule
-
-  attr_accessor :modfile, :libfile
-  class << self
-    attr_accessor :modpath
-    def preinit
-      @modpath = "/etc/httpd/mod.d"
-    end
-  end
-
-  self.preinit
-
-  def create
-    File.open(modfile,'w') do |f|
-      f.puts "LoadModule #{resource[:identifier]} #{libfile}"
-    end
-  end
-
-  def destroy
-    File.delete(modfile)
-  end
-
-  def self.instances
-    modules = apachectl("-M").lines.collect { |line|
-      m = line.match(/(\w+)_module \(shared\)$/)
-      m[1] if m
-    }.compact
-
-    modules.map do |mod|
-      new(
-        :name     => mod,
-        :ensure   => :present,
-        :provider => :redhat
-      )
-    end
-  end
-
-  def modfile
-    modfile ||= "#{self.class.modpath}/#{resource[:name]}.load"
-  end
-
-  # Set libfile path: If absolute path is passed, then maintain it. Else, make it default from 'modules' dir.
-  def libfile
-    libfile = Pathname.new(resource[:lib]).absolute? ? resource[:lib] : "modules/#{resource[:lib]}"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb
deleted file mode 100644
index 07a911e5ee1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/lib/puppet/type/a2mod.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-Puppet::Type.newtype(:a2mod) do
-    @doc = "Manage Apache 2 modules"
-
-    ensurable
-
-    newparam(:name) do
-       Puppet.warning "The a2mod provider is deprecated, please use apache::mod instead"
-       desc "The name of the module to be managed"
-
-       isnamevar
-
-    end
-
-    newparam(:lib) do
-      desc "The name of the .so library to be loaded"
-
-      defaultto { "mod_#{@resource[:name]}.so" }
-    end
- 
-    newparam(:identifier) do
-      desc "Module identifier string used by LoadModule. Default: module-name_module"
-
-      # http://httpd.apache.org/docs/2.2/mod/module-dict.html#ModuleIdentifier
-
-      defaultto { "#{resource[:name]}_module" }
-    end
-
-    autorequire(:package) { catalog.resource(:package, 'httpd')}
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp
deleted file mode 100644
index 173aaec2dd4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancer.pp
+++ /dev/null
@@ -1,83 +0,0 @@
-# == Define Resource Type: apache::balancer
-#
-# This type will create an apache balancer cluster file inside the conf.d
-# directory. Each balancer cluster needs one or more balancer members (that can
-# be declared with the apache::balancermember defined resource type). Using
-# storeconfigs, you can export the apache::balancermember resources on all
-# balancer members, and then collect them on a single apache load balancer
-# server.
-#
-# === Requirement/Dependencies:
-#
-# Currently requires the puppetlabs/concat module on the Puppet Forge and uses
-# storeconfigs on the Puppet Master to export/collect resources from all
-# balancer members.
-#
-# === Parameters
-#
-# [*name*]
-# The namevar of the defined resource type is the balancer clusters name.
-# This name is also used in the name of the conf.d file
-#
-# [*proxy_set*]
-# Hash, default empty. If given, each key-value pair will be used as a ProxySet
-# line in the configuration.
-#
-# [*collect_exported*]
-# Boolean, default 'true'. True means 'collect exported @@balancermember
-# resources' (for the case when every balancermember node exports itself),
-# false means 'rely on the existing declared balancermember resources' (for the
-# case when you know the full set of balancermembers in advance and use
-# apache::balancermember with array arguments, which allows you to deploy
-# everything in 1 run)
-#
-#
-# === Examples
-#
-# Exporting the resource for a balancer member:
-#
-# apache::balancer { 'puppet00': }
-#
-define apache::balancer (
-  $proxy_set = {},
-  $collect_exported = true,
-) {
-  include concat::setup
-  include ::apache::mod::proxy_balancer
-
-  $target = "${::apache::params::confd_dir}/balancer_${name}.conf"
-
-  concat { $target:
-    owner  => '0',
-    group  => '0',
-    mode   => '0644',
-    notify => Service['httpd'],
-  }
-
-  concat::fragment { "00-${name}-header":
-    ensure  => present,
-    target  => $target,
-    order   => '01',
-    content => "<Proxy balancer://${name}>\n",
-  }
-
-  if $collect_exported {
-    Apache::Balancermember <<| balancer_cluster == $name |>>
-  }
-  # else: the resources have been created and they introduced their
-  # concat fragments. We don't have to do anything about them.
-
-  concat::fragment { "01-${name}-proxyset":
-    ensure  => present,
-    target  => $target,
-    order   => '19',
-    content => inline_template("<% proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= proxy_set[key] %>\n<% end %>"),
-  }
-
-  concat::fragment { "01-${name}-footer":
-    ensure  => present,
-    target  => $target,
-    order   => '20',
-    content => "</Proxy>\n",
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp
deleted file mode 100644
index 121e2c55331..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/balancermember.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-# == Define Resource Type: apache::balancermember
-#
-# This type will setup a balancer member inside a listening service
-# configuration block in /etc/apache/apache.cfg on the load balancer.
-# currently it only has the ability to specify the instance name, url and an
-# array of options. More features can be added as needed. The best way to
-# implement this is to export this resource for all apache balancer member
-# servers, and then collect them on the main apache load balancer.
-#
-# === Requirement/Dependencies:
-#
-# Currently requires the puppetlabs/concat module on the Puppet Forge and
-# uses storeconfigs on the Puppet Master to export/collect resources
-# from all balancer members.
-#
-# === Parameters
-#
-# [*name*]
-# The title of the resource is arbitrary and only utilized in the concat
-# fragment name.
-#
-# [*balancer_cluster*]
-# The apache service's instance name (or, the title of the apache::balancer
-# resource). This must match up with a declared apache::balancer resource.
-#
-# [*url*]
-# The url used to contact the balancer member server.
-#
-# [*options*]
-# An array of options to be specified after the url.
-#
-# === Examples
-#
-# Exporting the resource for a balancer member:
-#
-# @@apache::balancermember { 'apache':
-#   balancer_cluster => 'puppet00',
-#   url              => "ajp://${::fqdn}:8009"
-#   options          => ['ping=5', 'disablereuse=on', 'retry=5', 'ttl=120'],
-# }
-#
-define apache::balancermember(
-  $balancer_cluster,
-  $url = "http://${::fqdn}/",
-  $options = [],
-) {
-
-  concat::fragment { "BalancerMember ${url}":
-    ensure  => present,
-    target  => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
-    content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp
deleted file mode 100644
index f35c0c8b9d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/confd/no_accf.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class apache::confd::no_accf {
-  # Template uses no variables
-  file { 'no-accf.conf':
-    ensure  => 'file',
-    path    => "${::apache::confd_dir}/no-accf.conf",
-    content => template('apache/confd/no-accf.conf.erb'),
-    require => Exec["mkdir ${::apache::confd_dir}"],
-    before  => File[$::apache::confd_dir],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp
deleted file mode 100644
index c06b30c83b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_confd_files.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-class apache::default_confd_files (
-  $all = true,
-) {
-  # The rest of the conf.d/* files only get loaded if we want them
-  if $all {
-    case $::osfamily {
-      'freebsd': {
-        include ::apache::confd::no_accf
-      }
-      default: {
-        # do nothing
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp
deleted file mode 100644
index f665d7383e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods.pp
+++ /dev/null
@@ -1,158 +0,0 @@
-class apache::default_mods (
-  $all            = true,
-  $mods           = undef,
-  $apache_version = $::apache::apache_version
-) {
-  # These are modules required to run the default configuration.
-  # They are not configurable at this time, so we just include
-  # them to make sure it works.
-  case $::osfamily {
-    'redhat', 'freebsd': {
-      ::apache::mod { 'log_config': }
-      if versioncmp($apache_version, '2.4') >= 0 {
-        # Lets fork it
-        ::apache::mod { 'systemd': }
-        ::apache::mod { 'unixd': }
-      }
-    }
-    default: {}
-  }
-  ::apache::mod { 'authz_host': }
-
-  # The rest of the modules only get loaded if we want all modules enabled
-  if $all {
-    case $::osfamily {
-      'debian': {
-        include ::apache::mod::reqtimeout
-      }
-      'redhat': {
-        include ::apache::mod::actions
-        include ::apache::mod::cache
-        include ::apache::mod::mime
-        include ::apache::mod::mime_magic
-        include ::apache::mod::vhost_alias
-        include ::apache::mod::suexec
-        include ::apache::mod::rewrite
-        include ::apache::mod::speling
-        ::apache::mod { 'auth_digest': }
-        ::apache::mod { 'authn_anon': }
-        ::apache::mod { 'authn_dbm': }
-        ::apache::mod { 'authz_dbm': }
-        ::apache::mod { 'authz_owner': }
-        ::apache::mod { 'expires': }
-        ::apache::mod { 'ext_filter': }
-        ::apache::mod { 'include': }
-        ::apache::mod { 'logio': }
-        ::apache::mod { 'substitute': }
-        ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
-
-        if versioncmp($apache_version, '2.4') >= 0 {
-          ::apache::mod { 'authn_core': }
-        }
-        else {
-          ::apache::mod { 'authn_alias': }
-          ::apache::mod { 'authn_default': }
-        }
-      }
-      'freebsd': {
-        include ::apache::mod::actions
-        include ::apache::mod::cache
-        include ::apache::mod::disk_cache
-        include ::apache::mod::headers
-        include ::apache::mod::info
-        include ::apache::mod::mime_magic
-        include ::apache::mod::reqtimeout
-        include ::apache::mod::rewrite
-        include ::apache::mod::userdir
-        include ::apache::mod::vhost_alias
-        include ::apache::mod::speling
-
-        ::apache::mod { 'asis': }
-        ::apache::mod { 'auth_digest': }
-        ::apache::mod { 'authn_alias': }
-        ::apache::mod { 'authn_anon': }
-        ::apache::mod { 'authn_dbm': }
-        ::apache::mod { 'authn_default': }
-        ::apache::mod { 'authz_dbm': }
-        ::apache::mod { 'authz_owner': }
-        ::apache::mod { 'cern_meta': }
-        ::apache::mod { 'charset_lite': }
-        ::apache::mod { 'dumpio': }
-        ::apache::mod { 'expires': }
-        ::apache::mod { 'file_cache': }
-        ::apache::mod { 'filter':}
-        ::apache::mod { 'imagemap':}
-        ::apache::mod { 'include': }
-        ::apache::mod { 'logio': }
-        ::apache::mod { 'unique_id': }
-        ::apache::mod { 'usertrack': }
-        ::apache::mod { 'version': }
-      }
-      default: {}
-    }
-    case $::apache::mpm_module {
-      'prefork': {
-        include ::apache::mod::cgi
-      }
-      'worker': {
-        include ::apache::mod::cgid
-      }
-      default: {
-        # do nothing
-      }
-    }
-    include ::apache::mod::alias
-    include ::apache::mod::autoindex
-    include ::apache::mod::dav
-    include ::apache::mod::dav_fs
-    include ::apache::mod::deflate
-    include ::apache::mod::dir
-    include ::apache::mod::mime
-    include ::apache::mod::negotiation
-    include ::apache::mod::setenvif
-    ::apache::mod { 'auth_basic': }
-    ::apache::mod { 'authn_file': }
-
-      if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
-
-      # lots of stuff seems to break without access_compat
-      ::apache::mod { 'access_compat': }
-    } else {
-      ::apache::mod { 'authz_default': }
-    }
-
-    ::apache::mod { 'authz_groupfile': }
-    ::apache::mod { 'authz_user': }
-    ::apache::mod { 'env': }
-  } elsif $mods {
-    ::apache::default_mods::load { $mods: }
-
-    if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
-    }
-  } else {
-    if versioncmp($apache_version, '2.4') >= 0 {
-      # authz_core is needed for 'Require' directive
-      ::apache::mod { 'authz_core':
-        id => 'authz_core_module',
-      }
-
-      # filter is needed by mod_deflate
-      ::apache::mod { 'filter': }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp
deleted file mode 100644
index 356e9fa00ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/default_mods/load.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# private define
-define apache::default_mods::load ($module = $title) {
-  if defined("apache::mod::${module}") {
-    include "::apache::mod::${module}"
-  } else {
-    ::apache::mod { $module: }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp
deleted file mode 100644
index 4eaeb557829..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/dev.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class apache::dev {
-  if $::osfamily == 'FreeBSD' and !defined(Class['apache::package']) {
-    fail('apache::dev requires apache::package; please include apache or apache::package class first')
-  }
-  include ::apache::params
-  $packages = $::apache::params::dev_packages
-  package { $packages:
-    ensure  => present,
-    require => Package['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp
deleted file mode 100644
index 9f77d5b4e7e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/init.pp
+++ /dev/null
@@ -1,340 +0,0 @@
-# Class: apache
-#
-# This class installs Apache
-#
-# Parameters:
-#
-# Actions:
-#   - Install Apache
-#   - Manage Apache service
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache (
-  $service_name         = $::apache::params::service_name,
-  $default_mods         = true,
-  $default_vhost        = true,
-  $default_confd_files  = true,
-  $default_ssl_vhost    = false,
-  $default_ssl_cert     = $::apache::params::default_ssl_cert,
-  $default_ssl_key      = $::apache::params::default_ssl_key,
-  $default_ssl_chain    = undef,
-  $default_ssl_ca       = undef,
-  $default_ssl_crl_path = undef,
-  $default_ssl_crl      = undef,
-  $ip                   = undef,
-  $service_enable       = true,
-  $service_ensure       = 'running',
-  $purge_configs        = true,
-  $purge_vdir           = false,
-  $serveradmin          = 'root@localhost',
-  $sendfile             = 'On',
-  $error_documents      = false,
-  $timeout              = '120',
-  $httpd_dir            = $::apache::params::httpd_dir,
-  $server_root          = $::apache::params::server_root,
-  $confd_dir            = $::apache::params::confd_dir,
-  $vhost_dir            = $::apache::params::vhost_dir,
-  $vhost_enable_dir     = $::apache::params::vhost_enable_dir,
-  $mod_dir              = $::apache::params::mod_dir,
-  $mod_enable_dir       = $::apache::params::mod_enable_dir,
-  $mpm_module           = $::apache::params::mpm_module,
-  $conf_template        = $::apache::params::conf_template,
-  $servername           = $::apache::params::servername,
-  $manage_user          = true,
-  $manage_group         = true,
-  $user                 = $::apache::params::user,
-  $group                = $::apache::params::group,
-  $keepalive            = $::apache::params::keepalive,
-  $keepalive_timeout    = $::apache::params::keepalive_timeout,
-  $max_keepalive_requests = $apache::params::max_keepalive_requests,
-  $logroot              = $::apache::params::logroot,
-  $log_level            = $::apache::params::log_level,
-  $log_formats          = {},
-  $ports_file           = $::apache::params::ports_file,
-  $apache_version       = $::apache::version::default,
-  $server_tokens        = 'OS',
-  $server_signature     = 'On',
-  $trace_enable         = 'On',
-  $package_ensure       = 'installed',
-) inherits ::apache::params {
-  validate_bool($default_vhost)
-  validate_bool($default_ssl_vhost)
-  validate_bool($default_confd_files)
-  # true/false is sufficient for both ensure and enable
-  validate_bool($service_enable)
-
-  $valid_mpms_re = $apache_version ? {
-    '2.4'   => '(event|itk|peruser|prefork|worker)',
-    default => '(event|itk|prefork|worker)'
-  }
-
-  if $mpm_module {
-    validate_re($mpm_module, $valid_mpms_re)
-  }
-
-  # NOTE: on FreeBSD it's mpm module's responsibility to install httpd package.
-  # NOTE: the same strategy may be introduced for other OSes. For this, you
-  # should delete the 'if' block below and modify all MPM modules' manifests
-  # such that they include apache::package class (currently event.pp, itk.pp,
-  # peruser.pp, prefork.pp, worker.pp).
-  if $::osfamily != 'FreeBSD' {
-    package { 'httpd':
-      ensure => $package_ensure,
-      name   => $::apache::params::apache_name,
-      notify => Class['Apache::Service'],
-    }
-  }
-  validate_re($sendfile, [ '^[oO]n$' , '^[oO]ff$' ])
-
-  # declare the web server user and group
-  # Note: requiring the package means the package ought to create them and not puppet
-  validate_bool($manage_user)
-  if $manage_user {
-    user { $user:
-      ensure  => present,
-      gid     => $group,
-      require => Package['httpd'],
-    }
-  }
-  validate_bool($manage_group)
-  if $manage_group {
-    group { $group:
-      ensure  => present,
-      require => Package['httpd']
-    }
-  }
-
-  $valid_log_level_re = '(emerg|alert|crit|error|warn|notice|info|debug)'
-
-  validate_re($log_level, $valid_log_level_re,
-  "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
-
-  class { '::apache::service':
-    service_name   => $service_name,
-    service_enable => $service_enable,
-    service_ensure => $service_ensure,
-  }
-
-  # Deprecated backwards-compatibility
-  if $purge_vdir {
-    warning('Class[\'apache\'] parameter purge_vdir is deprecated in favor of purge_configs')
-    $purge_confd = $purge_vdir
-  } else {
-    $purge_confd = $purge_configs
-  }
-
-  Exec {
-    path => '/bin:/sbin:/usr/bin:/usr/sbin',
-  }
-
-  exec { "mkdir ${confd_dir}":
-    creates => $confd_dir,
-    require => Package['httpd'],
-  }
-  file { $confd_dir:
-    ensure  => directory,
-    recurse => true,
-    purge   => $purge_confd,
-    notify  => Class['Apache::Service'],
-    require => Package['httpd'],
-  }
-
-  if ! defined(File[$mod_dir]) {
-    exec { "mkdir ${mod_dir}":
-      creates => $mod_dir,
-      require => Package['httpd'],
-    }
-    # Don't purge available modules if an enable dir is used
-    $purge_mod_dir = $purge_configs and !$mod_enable_dir
-    file { $mod_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_mod_dir,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  }
-
-  if $mod_enable_dir and ! defined(File[$mod_enable_dir]) {
-    $mod_load_dir = $mod_enable_dir
-    exec { "mkdir ${mod_enable_dir}":
-      creates => $mod_enable_dir,
-      require => Package['httpd'],
-    }
-    file { $mod_enable_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_configs,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  } else {
-    $mod_load_dir = $mod_dir
-  }
-
-  if ! defined(File[$vhost_dir]) {
-    exec { "mkdir ${vhost_dir}":
-      creates => $vhost_dir,
-      require => Package['httpd'],
-    }
-    file { $vhost_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_configs,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  }
-
-  if $vhost_enable_dir and ! defined(File[$vhost_enable_dir]) {
-    $vhost_load_dir = $vhost_enable_dir
-    exec { "mkdir ${vhost_load_dir}":
-      creates => $vhost_load_dir,
-      require => Package['httpd'],
-    }
-    file { $vhost_enable_dir:
-      ensure  => directory,
-      recurse => true,
-      purge   => $purge_configs,
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-  } else {
-    $vhost_load_dir = $vhost_dir
-  }
-
-  concat { $ports_file:
-    owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => '0644',
-    notify  => Class['Apache::Service'],
-    require => Package['httpd'],
-  }
-  concat::fragment { 'Apache ports header':
-    ensure  => present,
-    target  => $ports_file,
-    content => template('apache/ports_header.erb')
-  }
-
-  if $::apache::params::conf_dir and $::apache::params::conf_file {
-    case $::osfamily {
-      'debian': {
-        $docroot              = '/var/www'
-        $pidfile              = '${APACHE_PID_FILE}'
-        $error_log            = 'error.log'
-        $error_documents_path = '/usr/share/apache2/error'
-        $scriptalias          = '/usr/lib/cgi-bin'
-        $access_log_file      = 'access.log'
-      }
-      'redhat': {
-        $docroot              = '/var/www/html'
-        $pidfile              = 'run/httpd.pid'
-        $error_log            = 'error_log'
-        $error_documents_path = '/var/www/error'
-        $scriptalias          = '/var/www/cgi-bin'
-        $access_log_file      = 'access_log'
-      }
-      'freebsd': {
-        $docroot              = '/usr/local/www/apache22/data'
-        $pidfile              = '/var/run/httpd.pid'
-        $error_log            = 'httpd-error.log'
-        $error_documents_path = '/usr/local/www/apache22/error'
-        $scriptalias          = '/usr/local/www/apache22/cgi-bin'
-        $access_log_file      = 'httpd-access.log'
-      }
-      default: {
-        fail("Unsupported osfamily ${::osfamily}")
-      }
-    }
-
-    $apxs_workaround = $::osfamily ? {
-      'freebsd' => true,
-      default   => false
-    }
-
-    # Template uses:
-    # - $pidfile
-    # - $user
-    # - $group
-    # - $logroot
-    # - $error_log
-    # - $sendfile
-    # - $mod_dir
-    # - $ports_file
-    # - $confd_dir
-    # - $vhost_dir
-    # - $error_documents
-    # - $error_documents_path
-    # - $apxs_workaround
-    # - $keepalive
-    # - $keepalive_timeout
-    # - $max_keepalive_requests
-    # - $server_root
-    # - $server_tokens
-    # - $server_signature
-    # - $trace_enable
-    file { "${::apache::params::conf_dir}/${::apache::params::conf_file}":
-      ensure  => file,
-      content => template($conf_template),
-      notify  => Class['Apache::Service'],
-      require => Package['httpd'],
-    }
-
-    # preserve back-wards compatibility to the times when default_mods was
-    # only a boolean value. Now it can be an array (too)
-    if is_array($default_mods) {
-      class { '::apache::default_mods':
-        all  => false,
-        mods => $default_mods,
-      }
-    } else {
-      class { '::apache::default_mods':
-        all => $default_mods,
-      }
-    }
-    class { '::apache::default_confd_files':
-      all => $default_confd_files
-    }
-    if $mpm_module {
-      class { "::apache::mod::${mpm_module}": }
-    }
-
-    $default_vhost_ensure = $default_vhost ? {
-      true  => 'present',
-      false => 'absent'
-    }
-    $default_ssl_vhost_ensure = $default_ssl_vhost ? {
-      true  => 'present',
-      false => 'absent'
-    }
-
-    ::apache::vhost { 'default':
-      ensure          => $default_vhost_ensure,
-      port            => 80,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => $access_log_file,
-      priority        => '15',
-      ip              => $ip,
-    }
-    $ssl_access_log_file = $::osfamily ? {
-      'freebsd' => $access_log_file,
-      default   => "ssl_${access_log_file}",
-    }
-    ::apache::vhost { 'default-ssl':
-      ensure          => $default_ssl_vhost_ensure,
-      port            => 443,
-      ssl             => true,
-      docroot         => $docroot,
-      scriptalias     => $scriptalias,
-      serveradmin     => $serveradmin,
-      access_log_file => $ssl_access_log_file,
-      priority        => '15',
-      ip              => $ip,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp
deleted file mode 100644
index e6a8a3c767c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/listen.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-define apache::listen {
-  $listen_addr_port = $name
-
-  # Template uses: $listen_addr_port
-  concat::fragment { "Listen ${listen_addr_port}":
-    ensure  => present,
-    target  => $::apache::ports_file,
-    content => template('apache/listen.erb'),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp
deleted file mode 100644
index aa5ea3f3bd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod.pp
+++ /dev/null
@@ -1,130 +0,0 @@
-define apache::mod (
-  $package        = undef,
-  $package_ensure = 'present',
-  $lib            = undef,
-  $lib_path       = $::apache::params::lib_path,
-  $id             = undef,
-  $path           = undef,
-  $loadfile_name  = undef,
-  $loadfiles      = undef,
-) {
-  if ! defined(Class['apache']) {
-    fail('You must include the apache base class before using any apache defined resources')
-  }
-
-  $mod = $name
-  #include apache #This creates duplicate resources in rspec-puppet
-  $mod_dir = $::apache::mod_dir
-
-  # Determine if we have special lib
-  $mod_libs = $::apache::params::mod_libs
-  $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
-  if $lib {
-    $_lib = $lib
-  } elsif $mod_lib {
-    $_lib = $mod_lib
-  } else {
-    $_lib = "mod_${mod}.so"
-  }
-
-  # Determine if declaration specified a path to the module
-  if $path {
-    $_path = $path
-  } else {
-    $_path = "${lib_path}/${_lib}"
-  }
-
-  if $id {
-    $_id = $id
-  } else {
-    $_id = "${mod}_module"
-  }
-
-  if $loadfile_name {
-    $_loadfile_name = $loadfile_name
-  } else {
-    $_loadfile_name = "${mod}.load"
-  }
-
-  # Determine if we have a package
-  $mod_packages = $::apache::params::mod_packages
-  $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
-  if $package {
-    $_package = $package
-  } elsif $mod_package {
-    $_package = $mod_package
-  } else {
-    $_package = undef
-  }
-  if $_package and ! defined(Package[$_package]) {
-    # note: FreeBSD/ports uses apxs tool to activate modules; apxs clutters
-    # httpd.conf with 'LoadModule' directives; here, by proper resource
-    # ordering, we ensure that our version of httpd.conf is reverted after
-    # the module gets installed.
-    $package_before = $::osfamily ? {
-      'freebsd' => [
-        File[$_loadfile_name],
-        File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
-      ],
-      default => File[$_loadfile_name],
-    }
-    # $_package may be an array
-    package { $_package:
-      ensure  => $package_ensure,
-      require => Package['httpd'],
-      before  => $package_before,
-    }
-  }
-
-  file { "${_loadfile_name}":
-    ensure  => file,
-    path    => "${mod_dir}/${_loadfile_name}",
-    owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => '0644',
-    content => template('apache/mod/load.erb'),
-    require => [
-      Package['httpd'],
-      Exec["mkdir ${mod_dir}"],
-    ],
-    before  => File[$mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  if $::osfamily == 'Debian' {
-    $enable_dir = $::apache::mod_enable_dir
-    file{ "${_loadfile_name} symlink":
-      ensure  => link,
-      path    => "${enable_dir}/${_loadfile_name}",
-      target  => "${mod_dir}/${_loadfile_name}",
-      owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => '0644',
-      require => [
-        File[$_loadfile_name],
-        Exec["mkdir ${enable_dir}"],
-      ],
-      before  => File[$enable_dir],
-      notify  => Service['httpd'],
-    }
-    # Each module may have a .conf file as well, which should be
-    # defined in the class apache::mod::module
-    # Some modules do not require this file.
-    if defined(File["${mod}.conf"]) {
-      file{ "${mod}.conf symlink":
-        ensure  => link,
-        path    => "${enable_dir}/${mod}.conf",
-        target  => "${mod_dir}/${mod}.conf",
-        owner   => 'root',
-        group   => $::apache::params::root_group,
-        mode    => '0644',
-        require => [
-          File["${mod}.conf"],
-          Exec["mkdir ${enable_dir}"],
-        ],
-        before  => File[$enable_dir],
-        notify  => Service['httpd'],
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp
deleted file mode 100644
index 3b60f297fdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/actions.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::actions {
-  apache::mod { 'actions': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp
deleted file mode 100644
index ee017b490f8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/alias.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class apache::mod::alias(
-  $apache_version = $apache::apache_version
-) {
-  $icons_path = $::osfamily ? {
-    'debian'  => '/usr/share/apache2/icons',
-    'redhat'  => '/var/www/icons',
-    'freebsd' => '/usr/local/www/apache22/icons',
-  }
-  apache::mod { 'alias': }
-  # Template uses $icons_path
-  file { 'alias.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/alias.conf",
-    content => template('apache/mod/alias.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp
deleted file mode 100644
index cacfafa4d3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_basic.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::auth_basic {
-  ::apache::mod { 'auth_basic': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp
deleted file mode 100644
index 6b53262a1bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/auth_kerb.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class apache::mod::auth_kerb {
-  ::apache::mod { 'auth_kerb': }
-}
-
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp
deleted file mode 100644
index 800e656e892..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/authnz_ldap.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class apache::mod::authnz_ldap (
-  $verifyServerCert = true,
-) {
-  include '::apache::mod::ldap'
-  ::apache::mod { 'authnz_ldap': }
-
-  validate_bool($verifyServerCert)
-
-  # Template uses:
-  # - $verifyServerCert
-  file { 'authnz_ldap.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/authnz_ldap.conf",
-    content => template('apache/mod/authnz_ldap.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp
deleted file mode 100644
index f5f0f07458b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/autoindex.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::autoindex {
-  ::apache::mod { 'autoindex': }
-  # Template uses no variables
-  file { 'autoindex.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/autoindex.conf",
-    content => template('apache/mod/autoindex.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp
deleted file mode 100644
index 4ab9f44bae0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cache.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::cache {
-  ::apache::mod { 'cache': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp
deleted file mode 100644
index 6c3c6aec8d4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgi.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::cgi {
-  Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
-  ::apache::mod { 'cgi': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp
deleted file mode 100644
index 5c89251a1c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/cgid.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class apache::mod::cgid {
-  Class['::apache::mod::worker'] -> Class['::apache::mod::cgid']
-
-  # Debian specifies it's cgid sock path, but RedHat uses the default value
-  # with no config file
-  $cgisock_path = $::osfamily ? {
-    'debian'  => '${APACHE_RUN_DIR}/cgisock',
-    'freebsd' => 'cgisock',
-    default   => undef,
-  }
-  ::apache::mod { 'cgid': }
-  if $cgisock_path {
-    # Template uses $cgisock_path
-    file { 'cgid.conf':
-      ensure  => file,
-      path    => "${::apache::mod_dir}/cgid.conf",
-      content => template('apache/mod/cgid.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp
deleted file mode 100644
index ade9c0809ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::dav {
-  ::apache::mod { 'dav': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp
deleted file mode 100644
index 482f316171e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_fs.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class apache::mod::dav_fs {
-  $dav_lock = $::osfamily ? {
-    'debian'  => '${APACHE_LOCK_DIR}/DAVLock',
-    'freebsd' => '/usr/local/var/DavLock',
-    default   => '/var/lib/dav/lockdb',
-  }
-
-  Class['::apache::mod::dav'] -> Class['::apache::mod::dav_fs']
-  ::apache::mod { 'dav_fs': }
-
-  # Template uses: $dav_lock
-  file { 'dav_fs.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/dav_fs.conf",
-    content => template('apache/mod/dav_fs.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp
deleted file mode 100644
index 0fd667bc3f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dav_svn.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::dav_svn (
-  $authz_svn_enabled = false,
-) {
-    Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
-    include ::apache::mod::dav
-    ::apache::mod { 'dav_svn': } 
-    
-    if $authz_svn_enabled {
-      ::apache::mod { 'authz_svn':
-        loadfile_name => 'dav_svn_authz_svn.load',
-        require       => Apache::Mod['dav_svn'],
-      }
-    }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp
deleted file mode 100644
index 9b597d94664..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/deflate.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::deflate {
-  ::apache::mod { 'deflate': }
-  # Template uses no variables
-  file { 'deflate.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/deflate.conf",
-    content => template('apache/mod/deflate.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp
deleted file mode 100644
index 5abdedd3618..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dev.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class apache::mod::dev {
-  # Development packages are not apache modules
-  warning('apache::mod::dev is deprecated; please use apache::dev')
-  include ::apache::dev
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp
deleted file mode 100644
index 11631305a44..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/dir.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Note: this sets the global DirectoryIndex directive, it may be necessary to consider being able to modify the apache::vhost to declare DirectoryIndex statements in a vhost configuration
-# Parameters:
-# - $indexes provides a string for the DirectoryIndex directive http://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
-class apache::mod::dir (
-  $dir     = 'public_html',
-  $indexes = ['index.html','index.html.var','index.cgi','index.pl','index.php','index.xhtml'],
-) {
-  validate_array($indexes)
-  ::apache::mod { 'dir': }
-
-  # Template uses
-  # - $indexes
-  file { 'dir.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/dir.conf",
-    content => template('apache/mod/dir.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp
deleted file mode 100644
index 13c9c783523..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/disk_cache.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-class apache::mod::disk_cache {
-  $cache_root = $::osfamily ? {
-    'debian'  => '/var/cache/apache2/mod_disk_cache',
-    'redhat'  => '/var/cache/mod_proxy',
-    'freebsd' => '/var/cache/mod_disk_cache',
-  }
-  if $::osfamily != 'FreeBSD' {
-    # FIXME: investigate why disk_cache was dependent on proxy
-    # NOTE: on FreeBSD disk_cache is compiled by default but proxy is not
-    Class['::apache::mod::proxy'] -> Class['::apache::mod::disk_cache']
-  }
-  Class['::apache::mod::cache'] -> Class['::apache::mod::disk_cache']
-
-  apache::mod { 'disk_cache': }
-  # Template uses $cache_proxy
-  file { 'disk_cache.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/disk_cache.conf",
-    content => template('apache/mod/disk_cache.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp
deleted file mode 100644
index cb7ed96cd61..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/event.pp
+++ /dev/null
@@ -1,62 +0,0 @@
-class apache::mod::event (
-  $startservers        = '2',
-  $maxclients          = '150',
-  $minsparethreads     = '25',
-  $maxsparethreads     = '75',
-  $threadsperchild     = '25',
-  $maxrequestsperchild = '0',
-  $serverlimit         = '25',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::event and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::event and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::event and apache::mod::prefork on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::event and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $maxclients
-  # - $minsparethreads
-  # - $maxsparethreads
-  # - $threadsperchild
-  # - $maxrequestsperchild
-  # - $serverlimit
-  file { "${::apache::mod_dir}/event.conf":
-    ensure  => file,
-    content => template('apache/mod/event.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        apache::mpm{ 'event':
-          apache_version => $apache_version,
-        }
-      }
-    }
-    'debian','freebsd' : {
-      apache::mpm{ 'event':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp
deleted file mode 100644
index aae4c59d98a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/expires.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::expires {
-  ::apache::mod { 'expires': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp
deleted file mode 100644
index a185bb31fa1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fastcgi.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-class apache::mod::fastcgi {
-
-  # Debian specifies it's fastcgi lib path, but RedHat uses the default value
-  # with no config file
-  $fastcgi_lib_path = $::apache::params::fastcgi_lib_path
-
-  ::apache::mod { 'fastcgi': }
-
-  if $fastcgi_lib_path {
-    # Template uses:
-    # - $fastcgi_server
-    # - $fastcgi_socket
-    # - $fastcgi_dir
-    file { 'fastcgi.conf':
-      ensure  => file,
-      path    => "${::apache::mod_dir}/fastcgi.conf",
-      content => template('apache/mod/fastcgi.conf.erb'),
-      require => Exec["mkdir ${::apache::mod_dir}"],
-      before  => File[$::apache::mod_dir],
-      notify  => Service['httpd'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp
deleted file mode 100644
index 70997768bc0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/fcgid.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class apache::mod::fcgid(
-  $options = {},
-) {
-  ::apache::mod { 'fcgid': }
-
-  # Template uses:
-  # - $options
-  file { 'fcgid.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/fcgid.conf",
-    content => template('apache/mod/fcgid.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp
deleted file mode 100644
index d18c5e2793e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/headers.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::headers {
-  ::apache::mod { 'headers': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp
deleted file mode 100644
index edbe81f3241..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/include.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::include {
-  ::apache::mod { 'include': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp
deleted file mode 100644
index 18f9ea1dfe5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/info.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class apache::mod::info (
-  $allow_from = ['127.0.0.1','::1'],
-  $apache_version = $::apache::apache_version,
-){
-  apache::mod { 'info': }
-  # Template uses
-  # $allow_from
-  # $apache_version
-  file { 'info.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/info.conf",
-    content => template('apache/mod/info.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp
deleted file mode 100644
index 1083e5ed244..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/itk.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-class apache::mod::itk (
-  $startservers        = '8',
-  $minspareservers     = '5',
-  $maxspareservers     = '20',
-  $serverlimit         = '256',
-  $maxclients          = '256',
-  $maxrequestsperchild = '4000',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::itk and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::itk and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::itk and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $minspareservers
-  # - $maxspareservers
-  # - $serverlimit
-  # - $maxclients
-  # - $maxrequestsperchild
-  file { "${::apache::mod_dir}/itk.conf":
-    ensure  => file,
-    content => template('apache/mod/itk.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'debian', 'freebsd': {
-      apache::mpm{ 'itk':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp
deleted file mode 100644
index d3b17ff5b85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ldap.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::ldap (
-  $apache_version = $::apache::apache_version,
-){
-  ::apache::mod { 'ldap': }
-  # Template uses $apache_version
-  file { 'ldap.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/ldap.conf",
-    content => template('apache/mod/ldap.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp
deleted file mode 100644
index ccdb5d4b3c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class apache::mod::mime (
-  $mime_support_package = $::apache::params::mime_support_package,
-  $mime_types_config    = $::apache::params::mime_types_config,
-) {
-  apache::mod { 'mime': }
-  # Template uses $mime_types_config
-  file { 'mime.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/mime.conf",
-    content => template('apache/mod/mime.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-  if $mime_support_package {
-    package { $mime_support_package:
-      ensure => 'installed',
-      before => File['mime.conf'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp
deleted file mode 100644
index 9de8bc4bc6f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/mime_magic.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::mime_magic (
-  $magic_file = "${::apache::params::conf_dir}/magic"
-) {
-  apache::mod { 'mime_magic': }
-  # Template uses $magic_file
-  file { 'mime_magic.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/mime_magic.conf",
-    content => template('apache/mod/mime_magic.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp
deleted file mode 100644
index eff685b15c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/negotiation.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::negotiation {
-  ::apache::mod { 'negotiation': }
-  # Template uses no variables
-  file { 'negotiation.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/negotiation.conf",
-    content => template('apache/mod/negotiation.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp
deleted file mode 100644
index f0eff1cdf73..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/nss.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-class apache::mod::nss (
-  $transfer_log = "${::apache::params::logroot}/access.log",
-  $error_log    = "${::apache::params::logroot}/error.log",
-  $passwd_file  = undef
-) {
-  include ::apache::mod::mime
-
-  apache::mod { 'nss': }
-
-  $httpd_dir = $::apache::httpd_dir
-
-  # Template uses:
-  # $transfer_log
-  # $error_log
-  # $http_dir
-  # passwd_file
-  file { 'nss.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/nss.conf",
-    content => template('apache/mod/nss.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp
deleted file mode 100644
index 8c1c03bd5d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/pagespeed.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-class apache::mod::pagespeed (
-  $inherit_vhost_config          = 'on',
-  $filter_xhtml                  = false,
-  $cache_path                    = '/var/cache/mod_pagespeed/',
-  $log_dir                       = '/var/log/pagespeed',
-  $memache_servers               = [],
-  $rewrite_level                 = 'CoreFilters',
-  $disable_filters               = [],
-  $enable_filters                = [],
-  $forbid_filters                = [],
-  $rewrite_deadline_per_flush_ms = 10,
-  $additional_domains            = undef,
-  $file_cache_size_kb            = 102400,
-  $file_cache_clean_interval_ms  = 3600000,
-  $lru_cache_per_process         = 1024,
-  $lru_cache_byte_limit          = 16384,
-  $css_flatten_max_bytes         = 2048,
-  $css_inline_max_bytes          = 2048,
-  $css_image_inline_max_bytes    = 2048,
-  $image_inline_max_bytes        = 2048,
-  $js_inline_max_bytes           = 2048,
-  $css_outline_min_bytes         = 3000,
-  $js_outline_min_bytes          = 3000,
-  $inode_limit                   = 500000,
-  $image_max_rewrites_at_once    = 8,
-  $num_rewrite_threads           = 4,
-  $num_expensive_rewrite_threads = 4,
-  $collect_statistics            = 'on',
-  $statistics_logging            = 'on',
-  $allow_view_stats              = [],
-  $allow_pagespeed_console       = [],
-  $allow_pagespeed_message       = [],
-  $message_buffer_size           = 100000,
-  $additional_configuration      = {},
-  $apache_version                = $::apache::apache_version,
-){
-
-  $_lib = $::apache::apache_version ? {
-    '2.4'   => 'mod_pagespeed_ap24.so',
-    default => undef
-  }
-
-  apache::mod { 'pagespeed':
-    lib => $_lib,
-  }
-
-  file { 'pagespeed.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/pagespeed.conf",
-    content => template('apache/mod/pagespeed.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp
deleted file mode 100644
index 12139cb2b49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/passenger.pp
+++ /dev/null
@@ -1,86 +0,0 @@
-class apache::mod::passenger (
-  $passenger_conf_file            = $::apache::params::passenger_conf_file,
-  $passenger_conf_package_file    = $::apache::params::passenger_conf_package_file,
-  $passenger_high_performance     = undef,
-  $passenger_pool_idle_time       = undef,
-  $passenger_max_requests         = undef,
-  $passenger_stat_throttle_rate   = undef,
-  $rack_autodetect                = undef,
-  $rails_autodetect               = undef,
-  $passenger_root                 = $::apache::params::passenger_root,
-  $passenger_ruby                 = $::apache::params::passenger_ruby,
-  $passenger_default_ruby         = $::apache::params::passenger_default_ruby,
-  $passenger_max_pool_size        = undef,
-  $passenger_use_global_queue     = undef,
-  $mod_package                    = undef,
-  $mod_package_ensure             = undef,
-  $mod_lib                        = undef,
-  $mod_lib_path                   = undef,
-  $mod_id                         = undef,
-  $mod_path                       = undef,
-) {
-  # Managed by the package, but declare it to avoid purging
-  if $passenger_conf_package_file {
-    file { 'passenger_package.conf':
-      path => "${::apache::mod_dir}/${passenger_conf_package_file}",
-    }
-  } else {
-    # Remove passenger_extra.conf left over from before Passenger support was
-    # reworked for Debian. This is a temporary fix for users running this
-    # module from master after release 1.0.1 It will be removed in two
-    # releases from now.
-    $passenger_package_conf_ensure = $::osfamily ? {
-      'Debian' => 'absent',
-      default  => undef,
-    }
-
-    file { 'passenger_package.conf':
-      ensure => $passenger_package_conf_ensure,
-      path   => "${::apache::mod_dir}/passenger_extra.conf",
-    }
-  }
-
-  $_package = $mod_package
-  $_package_ensure = $mod_package_ensure
-  $_lib = $mod_lib
-  if $::osfamily == 'FreeBSD' {
-    if $mod_lib_path {
-      $_lib_path = $mod_lib_path
-    } else {
-      $_lib_path = "${passenger_root}/buildout/apache2"
-    }
-  } else {
-    $_lib_path = $mod_lib_path
-  }
-
-  $_id = $mod_id
-  $_path = $mod_path
-  ::apache::mod { 'passenger':
-    package        => $_package,
-    package_ensure => $_package_ensure,
-    lib            => $_lib,
-    lib_path       => $_lib_path,
-    id             => $_id,
-    path           => $_path,
-  }
-
-  # Template uses:
-  # - $passenger_root
-  # - $passenger_ruby
-  # - $passenger_default_ruby
-  # - $passenger_max_pool_size
-  # - $passenger_high_performance
-  # - $passenger_max_requests
-  # - $passenger_stat_throttle_rate
-  # - $passenger_use_global_queue
-  # - $rack_autodetect
-  # - $rails_autodetect
-  file { 'passenger.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/${passenger_conf_file}",
-    content => template('apache/mod/passenger.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp
deleted file mode 100644
index b57f25fd5fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/perl.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::perl {
-  ::apache::mod { 'perl': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp
deleted file mode 100644
index 518655a1d43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/peruser.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-class apache::mod::peruser (
-  $minspareprocessors = '2',
-  $minprocessors = '2',
-  $maxprocessors = '10',
-  $maxclients = '150',
-  $maxrequestsperchild = '1000',
-  $idletimeout = '120',
-  $expiretimeout = '120',
-  $keepalive = 'Off',
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::peruser and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::peruser and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::peruser and apache::mod::prefork on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::peruser and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  $mod_dir = $::apache::mod_dir
-
-  # Template uses:
-  # - $minspareprocessors
-  # - $minprocessors
-  # - $maxprocessors
-  # - $maxclients
-  # - $maxrequestsperchild
-  # - $idletimeout
-  # - $expiretimeout
-  # - $keepalive
-  # - $mod_dir
-  file { "${::apache::mod_dir}/peruser.conf":
-    ensure  => file,
-    content => template('apache/mod/peruser.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-  file { "${::apache::mod_dir}/peruser":
-    ensure  => directory,
-    require => File[$::apache::mod_dir],
-  }
-  file { "${::apache::mod_dir}/peruser/multiplexers":
-    ensure  => directory,
-    require => File["${::apache::mod_dir}/peruser"],
-  }
-  file { "${::apache::mod_dir}/peruser/processors":
-    ensure  => directory,
-    require => File["${::apache::mod_dir}/peruser"],
-  }
-
-  ::apache::peruser::multiplexer { '01-default': }
-
-  case $::osfamily {
-    'freebsd' : {
-      class { '::apache::package':
-        mpm_module => 'peruser'
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp
deleted file mode 100644
index a94bfe50bd0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/php.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-class apache::mod::php (
-  $package_name   = undef,
-  $package_ensure = 'present',
-  $path           = undef,
-  $extensions     = ['.php'],
-  $content        = undef,
-  $template       = 'apache/mod/php5.conf.erb',
-  $source         = undef,
-) {
-  if ! defined(Class['apache::mod::prefork']) {
-    fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
-  }
-  validate_array($extensions)
-
-  if $source and ($content or $template != 'apache/mod/php5.conf.erb') {
-    warning('source and content or template parameters are provided. source parameter will be used')
-  } elsif $content and $template != 'apache/mod/php5.conf.erb' {
-    warning('content and template parameters are provided. content parameter will be used')
-  }
-
-  $manage_content = $source ? {
-    undef   => $content ? {
-      undef   => template($template),
-      default => $content,
-    },
-    default => undef,
-  }
-
-  ::apache::mod { 'php5':
-    package        => $package_name,
-    package_ensure => $package_ensure,
-    path           => $path,
-  }
-
-  include ::apache::mod::mime
-  include ::apache::mod::dir
-  Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
-
-  # Template uses $extensions
-  file { 'php5.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/php5.conf",
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => $manage_content,
-    source  => $source,
-    require => [
-      Class['::apache::mod::prefork'],
-      Exec["mkdir ${::apache::mod_dir}"],
-    ],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp
deleted file mode 100644
index b3adeae8c88..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/prefork.pp
+++ /dev/null
@@ -1,70 +0,0 @@
-class apache::mod::prefork (
-  $startservers        = '8',
-  $minspareservers     = '5',
-  $maxspareservers     = '20',
-  $serverlimit         = '256',
-  $maxclients          = '256',
-  $maxrequestsperchild = '4000',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::prefork and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::worker']) {
-    fail('May not include both apache::mod::prefork and apache::mod::worker on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $minspareservers
-  # - $maxspareservers
-  # - $serverlimit
-  # - $maxclients
-  # - $maxrequestsperchild
-  file { "${::apache::mod_dir}/prefork.conf":
-    ensure  => file,
-    content => template('apache/mod/prefork.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'prefork':
-          apache_version => $apache_version,
-        }
-      }
-      else {
-        file_line { '/etc/sysconfig/httpd prefork enable':
-          ensure  => present,
-          path    => '/etc/sysconfig/httpd',
-          line    => '#HTTPD=/usr/sbin/httpd.worker',
-          match   => '#?HTTPD=/usr/sbin/httpd.worker',
-          require => Package['httpd'],
-          notify  => Service['httpd'],
-        }
-      }
-    }
-    'debian', 'freebsd' : {
-      ::apache::mpm{ 'prefork':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp
deleted file mode 100644
index 03c1e78c95f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class apache::mod::proxy (
-  $proxy_requests = 'Off',
-  $allow_from = undef,
-  $apache_version = $::apache::apache_version,
-) {
-  ::apache::mod { 'proxy': }
-  # Template uses $proxy_requests, $apache_version
-  file { 'proxy.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/proxy.conf",
-    content => template('apache/mod/proxy.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp
deleted file mode 100644
index a011a178957..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_ajp.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::proxy_ajp {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_ajp']
-  ::apache::mod { 'proxy_ajp': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp
deleted file mode 100644
index 5a0768d8d01..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_balancer.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class apache::mod::proxy_balancer {
-
-  include ::apache::mod::proxy
-  include ::apache::mod::proxy_http
-
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_balancer']
-  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_balancer']
-  ::apache::mod { 'proxy_balancer': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp
deleted file mode 100644
index 549eb117faa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_html.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-class apache::mod::proxy_html {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_html']
-  Class['::apache::mod::proxy_http'] -> Class['::apache::mod::proxy_html']
-
-  # Add libxml2
-  case $::osfamily {
-    /RedHat|FreeBSD/: {
-      ::apache::mod { 'xml2enc': }
-      $loadfiles = undef
-    }
-    'Debian': {
-      $gnu_path = $::hardwaremodel ? {
-        'i686'  => 'i386',
-        default => $::hardwaremodel,
-      }
-      $loadfiles = $::apache::params::distrelease ? {
-        '6'     => ['/usr/lib/libxml2.so.2'],
-        '10'    => ['/usr/lib/libxml2.so.2'],
-        default => ["/usr/lib/${gnu_path}-linux-gnu/libxml2.so.2"],
-      }
-    }
-  }
-
-  ::apache::mod { 'proxy_html':
-    loadfiles => $loadfiles,
-  }
-
-  # Template uses $icons_path
-  file { 'proxy_html.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/proxy_html.conf",
-    content => template('apache/mod/proxy_html.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp
deleted file mode 100644
index 1579e68ee20..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/proxy_http.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::proxy_http {
-  Class['::apache::mod::proxy'] -> Class['::apache::mod::proxy_http']
-  ::apache::mod { 'proxy_http': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp
deleted file mode 100644
index e326c8d757d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/python.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class apache::mod::python {
-  ::apache::mod { 'python': }
-}
-
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp
deleted file mode 100644
index 80b30183062..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/reqtimeout.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::reqtimeout {
-  ::apache::mod { 'reqtimeout': }
-  # Template uses no variables
-  file { 'reqtimeout.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/reqtimeout.conf",
-    content => template('apache/mod/reqtimeout.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp
deleted file mode 100644
index 694f0b6f5c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rewrite.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::rewrite {
-  include ::apache::params
-  ::apache::mod { 'rewrite': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp
deleted file mode 100644
index 6fbc1d4e04e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/rpaf.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class apache::mod::rpaf (
-  $sethostname = true,
-  $proxy_ips   = [ '127.0.0.1' ],
-  $header      = 'X-Forwarded-For'
-) {
-  ::apache::mod { 'rpaf': }
-
-  # Template uses:
-  # - $sethostname
-  # - $proxy_ips
-  # - $header
-  file { 'rpaf.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/rpaf.conf",
-    content => template('apache/mod/rpaf.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp
deleted file mode 100644
index 15b1441d838..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/setenvif.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class apache::mod::setenvif {
-  ::apache::mod { 'setenvif': }
-  # Template uses no variables
-  file { 'setenvif.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/setenvif.conf",
-    content => template('apache/mod/setenvif.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp
deleted file mode 100644
index eb46d78f044..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/speling.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::speling {
-  ::apache::mod { 'speling': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp
deleted file mode 100644
index dd178150c9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/ssl.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-class apache::mod::ssl (
-  $ssl_compression = false,
-  $ssl_options     = [ 'StdEnvVars' ],
-  $ssl_cipher      = 'HIGH:MEDIUM:!aNULL:!MD5',
-  $apache_version  = $::apache::apache_version,
-) {
-  $session_cache = $::osfamily ? {
-    'debian'  => '${APACHE_RUN_DIR}/ssl_scache(512000)',
-    'redhat'  => '/var/cache/mod_ssl/scache(512000)',
-    'freebsd' => '/var/run/ssl_scache(512000)',
-  }
-
-  case $::osfamily {
-    'debian': {
-      if versioncmp($apache_version, '2.4') >= 0 and $::operatingsystem == 'Ubuntu' {
-        $ssl_mutex = 'default'
-      } elsif $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '10.04' {
-        $ssl_mutex = 'file:/var/run/apache2/ssl_mutex'
-      } else {
-        $ssl_mutex = 'file:${APACHE_RUN_DIR}/ssl_mutex'
-      }
-    }
-    'redhat': {
-      $ssl_mutex = 'default'
-    }
-    'freebsd': {
-      $ssl_mutex = 'default'
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-
-  ::apache::mod { 'ssl': }
-
-  if versioncmp($apache_version, '2.4') >= 0 {
-    ::apache::mod { 'socache_shmcb': }
-  }
-
-  # Template uses
-  #
-  # $ssl_compression
-  # $ssl_options
-  # $session_cache,
-  # $ssl_mutex
-  # $apache_version
-  #
-  file { 'ssl.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/ssl.conf",
-    content => template('apache/mod/ssl.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp
deleted file mode 100644
index cfab5d58eab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/status.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Class: apache::mod::status
-#
-# This class enables and configures Apache mod_status
-# See: http://httpd.apache.org/docs/current/mod/mod_status.html
-#
-# Parameters:
-# - $allow_from is an array of hosts, ip addresses, partial network numbers
-#   or networks in CIDR notation specifying what hosts can view the special
-#   /server-status URL.  Defaults to ['127.0.0.1', '::1'].
-# - $extended_status track and display extended status information. Valid
-#   values are 'On' or 'Off'.  Defaults to 'On'.
-#
-# Actions:
-# - Enable and configure Apache mod_status
-#
-# Requires:
-# - The apache class
-#
-# Sample Usage:
-#
-#  # Simple usage allowing access from localhost and a private subnet
-#  class { 'apache::mod::status':
-#    $allow_from => ['127.0.0.1', '10.10.10.10/24'],
-#  }
-#
-class apache::mod::status (
-  $allow_from      = ['127.0.0.1','::1'],
-  $extended_status = 'On',
-  $apache_version = $::apache::apache_version,
-){
-  validate_array($allow_from)
-  validate_re(downcase($extended_status), '^(on|off)$', "${extended_status} is not supported for extended_status.  Allowed values are 'On' and 'Off'.")
-  ::apache::mod { 'status': }
-  # Template uses $allow_from, $extended_status, $apache_version
-  file { 'status.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/status.conf",
-    content => template('apache/mod/status.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp
deleted file mode 100644
index ded013d4990..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suexec.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::suexec {
-  ::apache::mod { 'suexec': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp
deleted file mode 100644
index f9a572f4635..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/suphp.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class apache::mod::suphp (
-){
-  ::apache::mod { 'suphp': }
-
-  file {'suphp.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/suphp.conf",
-    content => template('apache/mod/suphp.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp
deleted file mode 100644
index accfe64a794..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/userdir.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-class apache::mod::userdir (
-  $home = '/home',
-  $dir = 'public_html',
-  $disable_root = true,
-  $apache_version = $::apache::apache_version,
-) {
-  ::apache::mod { 'userdir': }
-
-  # Template uses $home, $dir, $disable_root, $apache_version
-  file { 'userdir.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/userdir.conf",
-    content => template('apache/mod/userdir.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp
deleted file mode 100644
index 30ae122e15e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/vhost_alias.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class apache::mod::vhost_alias {
-  ::apache::mod { 'vhost_alias': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp
deleted file mode 100644
index 0d2815964bc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/worker.pp
+++ /dev/null
@@ -1,74 +0,0 @@
-class apache::mod::worker (
-  $startservers        = '2',
-  $maxclients          = '150',
-  $minsparethreads     = '25',
-  $maxsparethreads     = '75',
-  $threadsperchild     = '25',
-  $maxrequestsperchild = '0',
-  $serverlimit         = '25',
-  $threadlimit         = '64',
-  $apache_version      = $::apache::apache_version,
-) {
-  if defined(Class['apache::mod::event']) {
-    fail('May not include both apache::mod::worker and apache::mod::event on the same node')
-  }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::worker and apache::mod::itk on the same node')
-  }
-  if defined(Class['apache::mod::peruser']) {
-    fail('May not include both apache::mod::worker and apache::mod::peruser on the same node')
-  }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::worker and apache::mod::prefork on the same node')
-  }
-  File {
-    owner => 'root',
-    group => $::apache::params::root_group,
-    mode  => '0644',
-  }
-
-  # Template uses:
-  # - $startservers
-  # - $maxclients
-  # - $minsparethreads
-  # - $maxsparethreads
-  # - $threadsperchild
-  # - $maxrequestsperchild
-  # - $serverlimit
-  # - $threadLimit
-  file { "${::apache::mod_dir}/worker.conf":
-    ensure  => file,
-    content => template('apache/mod/worker.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd'],
-  }
-
-  case $::osfamily {
-    'redhat': {
-      if versioncmp($apache_version, '2.4') >= 0 {
-        ::apache::mpm{ 'worker':
-          apache_version => $apache_version,
-        }
-      }
-      else {
-        file_line { '/etc/sysconfig/httpd worker enable':
-          ensure  => present,
-          path    => '/etc/sysconfig/httpd',
-          line    => 'HTTPD=/usr/sbin/httpd.worker',
-          match   => '#?HTTPD=/usr/sbin/httpd.worker',
-          require => Package['httpd'],
-          notify  => Service['httpd'],
-        }
-      }
-    }
-    'debian', 'freebsd': {
-      ::apache::mpm{ 'worker':
-        apache_version => $apache_version,
-      }
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp
deleted file mode 100644
index 244a3458b43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/wsgi.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class apache::mod::wsgi (
-  $wsgi_socket_prefix = undef,
-  $wsgi_python_path   = undef,
-  $wsgi_python_home   = undef,
-){
-  ::apache::mod { 'wsgi': }
-
-  # Template uses:
-  # - $wsgi_socket_prefix
-  # - $wsgi_python_path
-  # - $wsgi_python_home
-  file {'wsgi.conf':
-    ensure  => file,
-    path    => "${::apache::mod_dir}/wsgi.conf",
-    content => template('apache/mod/wsgi.conf.erb'),
-    require => Exec["mkdir ${::apache::mod_dir}"],
-    before  => File[$::apache::mod_dir],
-    notify  => Service['httpd']
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp
deleted file mode 100644
index 7c5e88437a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mod/xsendfile.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class apache::mod::xsendfile {
-  include ::apache::params
-  ::apache::mod { 'xsendfile': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp
deleted file mode 100644
index 6437016ba7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/mpm.pp
+++ /dev/null
@@ -1,68 +0,0 @@
-define apache::mpm (
-  $lib_path       = $::apache::params::lib_path,
-  $apache_version = $::apache::apache_version,
-) {
-  if ! defined(Class['apache']) {
-    fail('You must include the apache base class before using any apache defined resources')
-  }
-
-  $mpm     = $name
-  $mod_dir = $::apache::mod_dir
-
-  $_lib  = "mod_mpm_${mpm}.so"
-  $_path = "${lib_path}/${_lib}"
-  $_id   = "mpm_${mpm}_module"
-
-  if versioncmp($apache_version, '2.4') >= 0 {
-    file { "${mod_dir}/${mpm}.load":
-      ensure  => file,
-      path    => "${mod_dir}/${mpm}.load",
-      content => "LoadModule ${_id} ${_path}\n",
-      require => [
-        Package['httpd'],
-        Exec["mkdir ${mod_dir}"],
-      ],
-      before  => File[$mod_dir],
-      notify  => Service['httpd'],
-    }
-  }
-
-  case $::osfamily {
-    'debian': {
-      file { "${::apache::mod_enable_dir}/${mpm}.conf":
-        ensure  => link,
-        target  => "${::apache::mod_dir}/${mpm}.conf",
-        require => Exec["mkdir ${::apache::mod_enable_dir}"],
-        before  => File[$::apache::mod_enable_dir],
-        notify  => Service['httpd'],
-      }
-
-      if versioncmp($apache_version, '2.4') >= 0 {
-        file { "${::apache::mod_enable_dir}/${mpm}.load":
-          ensure  => link,
-          target  => "${::apache::mod_dir}/${mpm}.load",
-          require => Exec["mkdir ${::apache::mod_enable_dir}"],
-          before  => File[$::apache::mod_enable_dir],
-          notify  => Service['httpd'],
-        }
-      }
-
-      if versioncmp($apache_version, '2.4') < 0 {
-        package { "apache2-mpm-${mpm}":
-          ensure => present,
-        }
-      }
-    }
-    'freebsd': {
-      class { '::apache::package':
-        mpm_module => $mpm
-      }
-    }
-    'redhat': {
-      # so we don't fail
-    }
-    default: {
-      fail("Unsupported osfamily ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp
deleted file mode 100644
index f8c3a80d859..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/namevirtualhost.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-define apache::namevirtualhost {
-  $addr_port = $name
-
-  # Template uses: $addr_port
-  concat::fragment { "NameVirtualHost ${addr_port}":
-    ensure  => present,
-    target  => $::apache::ports_file,
-    content => template('apache/namevirtualhost.erb'),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp
deleted file mode 100644
index a4e4015c527..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/package.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-class apache::package (
-  $ensure     = 'present',
-  $mpm_module = $::apache::params::mpm_module,
-) inherits ::apache::params {
-  case $::osfamily {
-    'freebsd' : {
-      $all_mpms = [
-        'www/apache22',
-        'www/apache22-worker-mpm',
-        'www/apache22-event-mpm',
-        'www/apache22-itk-mpm',
-        'www/apache22-peruser-mpm',
-      ]
-      if $mpm_module {
-        $apache_package = $mpm_module ? {
-          'prefork' => 'www/apache22',
-          default   => "www/apache22-${mpm_module}-mpm"
-        }
-      } else {
-        $apache_package = 'www/apache22'
-      }
-      $other_mpms = delete($all_mpms, $apache_package)
-      # Configure ports to have apache module packages dependent on correct
-      # version of apache package (apache22, apache22-worker-mpm, ...)
-      file_line { 'APACHE_PORT in /etc/make.conf':
-        ensure => $ensure,
-        path   => '/etc/make.conf',
-        line   => "APACHE_PORT=${apache_package}",
-        match  => '^\s*#?\s*APACHE_PORT\s*=\s*',
-        before => Package['httpd'],
-      }
-      # remove other packages
-      ensure_resource('package', $other_mpms, {
-        ensure  => absent,
-        before  => Package['httpd'],
-        require => File_line['APACHE_PORT in /etc/make.conf'],
-      })
-    }
-    default: {
-      $apache_package = $::apache::params::apache_name
-    }
-  }
-  package { 'httpd':
-    ensure => $ensure,
-    name   => $apache_package,
-    notify => Class['Apache::Service'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp
deleted file mode 100644
index d272afb319c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/params.pp
+++ /dev/null
@@ -1,258 +0,0 @@
-# Class: apache::params
-#
-# This class manages Apache parameters
-#
-# Parameters:
-# - The $user that Apache runs as
-# - The $group that Apache runs as
-# - The $apache_name is the name of the package and service on the relevant
-#   distribution
-# - The $php_package is the name of the package that provided PHP
-# - The $ssl_package is the name of the Apache SSL package
-# - The $apache_dev is the name of the Apache development libraries package
-# - The $conf_contents is the contents of the Apache configuration file
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::params inherits ::apache::version {
-  if($::fqdn) {
-    $servername = $::fqdn
-  } else {
-    $servername = $::hostname
-  }
-
-  # The default error log level
-  $log_level = 'warn'
-
-  if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' {
-    $user                 = 'apache'
-    $group                = 'apache'
-    $root_group           = 'root'
-    $apache_name          = 'httpd'
-    $service_name         = 'httpd'
-    $httpd_dir            = '/etc/httpd'
-    $server_root          = '/etc/httpd'
-    $conf_dir             = "${httpd_dir}/conf"
-    $confd_dir            = "${httpd_dir}/conf.d"
-    $mod_dir              = "${httpd_dir}/conf.d"
-    $mod_enable_dir       = undef
-    $vhost_dir            = "${httpd_dir}/conf.d"
-    $vhost_enable_dir     = undef
-    $conf_file            = 'httpd.conf'
-    $ports_file           = "${conf_dir}/ports.conf"
-    $logroot              = '/var/log/httpd'
-    $lib_path             = 'modules'
-    $mpm_module           = 'prefork'
-    $dev_packages         = 'httpd-devel'
-    $default_ssl_cert     = '/etc/pki/tls/certs/localhost.crt'
-    $default_ssl_key      = '/etc/pki/tls/private/localhost.key'
-    $ssl_certs_dir        = '/etc/pki/tls/certs'
-    $passenger_conf_file  = 'passenger_extra.conf'
-    $passenger_conf_package_file = 'passenger.conf'
-    $passenger_root       = undef
-    $passenger_ruby       = undef
-    $passenger_default_ruby = undef
-    $suphp_addhandler     = 'php5-script'
-    $suphp_engine         = 'off'
-    $suphp_configpath     = undef
-    $mod_packages         = {
-      'auth_kerb'   => 'mod_auth_kerb',
-      'authnz_ldap' => 'mod_authz_ldap',
-      'fastcgi'     => 'mod_fastcgi',
-      'fcgid'       => 'mod_fcgid',
-      'pagespeed'   => 'mod-pagespeed-stable',
-      'passenger'   => 'mod_passenger',
-      'perl'        => 'mod_perl',
-      'php5'        => $::apache::version::distrelease ? {
-        '5'     => 'php53',
-        default => 'php',
-      },
-      'proxy_html'  => 'mod_proxy_html',
-      'python'      => 'mod_python',
-      'shibboleth'  => 'shibboleth',
-      'ssl'         => 'mod_ssl',
-      'wsgi'        => 'mod_wsgi',
-      'dav_svn'     => 'mod_dav_svn',
-      'suphp'       => 'mod_suphp',
-      'xsendfile'   => 'mod_xsendfile',
-      'nss'         => 'mod_nss',
-    }
-    $mod_libs             = {
-      'php5' => 'libphp5.so',
-      'nss'  => 'libmodnss.so',
-    }
-    $conf_template        = 'apache/httpd.conf.erb'
-    $keepalive            = 'Off'
-    $keepalive_timeout    = 15
-    $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef
-    $mime_support_package = 'mailcap'
-    $mime_types_config    = '/etc/mime.types'
-  } elsif $::osfamily == 'Debian' {
-    $user                = 'www-data'
-    $group               = 'www-data'
-    $root_group          = 'root'
-    $apache_name         = 'apache2'
-    $service_name        = 'apache2'
-    $httpd_dir           = '/etc/apache2'
-    $server_root         = '/etc/apache2'
-    $conf_dir            = $httpd_dir
-    $confd_dir           = "${httpd_dir}/conf.d"
-    $mod_dir             = "${httpd_dir}/mods-available"
-    $mod_enable_dir      = "${httpd_dir}/mods-enabled"
-    $vhost_dir           = "${httpd_dir}/sites-available"
-    $vhost_enable_dir    = "${httpd_dir}/sites-enabled"
-    $conf_file           = 'apache2.conf'
-    $ports_file          = "${conf_dir}/ports.conf"
-    $logroot             = '/var/log/apache2'
-    $lib_path            = '/usr/lib/apache2/modules'
-    $mpm_module          = 'worker'
-    $dev_packages        = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
-    $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-    $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
-    $ssl_certs_dir       = '/etc/ssl/certs'
-    $suphp_addhandler    = 'x-httpd-php'
-    $suphp_engine        = 'off'
-    $suphp_configpath    = '/etc/php5/apache2'
-    $mod_packages        = {
-      'auth_kerb'   => 'libapache2-mod-auth-kerb',
-      'dav_svn'     => 'libapache2-svn',
-      'fastcgi'     => 'libapache2-mod-fastcgi',
-      'fcgid'       => 'libapache2-mod-fcgid',
-      'nss'         => 'libapache2-mod-nss',
-      'pagespeed'   => 'mod-pagespeed-stable',
-      'passenger'   => 'libapache2-mod-passenger',
-      'perl'        => 'libapache2-mod-perl2',
-      'php5'        => 'libapache2-mod-php5',
-      'proxy_html'  => 'libapache2-mod-proxy-html',
-      'python'      => 'libapache2-mod-python',
-      'rpaf'        => 'libapache2-mod-rpaf',
-      'suphp'       => 'libapache2-mod-suphp',
-      'wsgi'        => 'libapache2-mod-wsgi',
-      'xsendfile'   => 'libapache2-mod-xsendfile',
-    }
-    $mod_libs             = {
-      'php5' => 'libphp5.so',
-    }
-    $conf_template          = 'apache/httpd.conf.erb'
-    $keepalive              = 'Off'
-    $keepalive_timeout      = 15
-    $max_keepalive_requests = 100
-    $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
-    $mime_support_package = 'mime-support'
-    $mime_types_config    = '/etc/mime.types'
-
-    #
-    # Passenger-specific settings
-    #
-
-    $passenger_conf_file         = 'passenger.conf'
-    $passenger_conf_package_file = undef
-
-    case $::operatingsystem {
-      'Ubuntu': {
-        case $::lsbdistrelease {
-          '12.04': {
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-          '14.04': {
-            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-            $passenger_ruby         = undef
-            $passenger_default_ruby = '/usr/bin/ruby'
-          }
-          default: {
-            # The following settings may or may not work on Ubuntu releases not
-            # supported by this module.
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-        }
-      }
-      'Debian': {
-        case $::lsbdistcodename {
-          'wheezy': {
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-          default: {
-            # The following settings may or may not work on Debian releases not
-            # supported by this module.
-            $passenger_root         = '/usr'
-            $passenger_ruby         = '/usr/bin/ruby'
-            $passenger_default_ruby = undef
-          }
-        }
-      }
-    }
-  } elsif $::osfamily == 'FreeBSD' {
-    $user             = 'www'
-    $group            = 'www'
-    $root_group       = 'wheel'
-    $apache_name      = 'apache22'
-    $service_name     = 'apache22'
-    $httpd_dir        = '/usr/local/etc/apache22'
-    $server_root      = '/usr/local'
-    $conf_dir         = $httpd_dir
-    $confd_dir        = "${httpd_dir}/Includes"
-    $mod_dir          = "${httpd_dir}/Modules"
-    $mod_enable_dir   = undef
-    $vhost_dir        = "${httpd_dir}/Vhosts"
-    $vhost_enable_dir = undef
-    $conf_file        = 'httpd.conf'
-    $ports_file       = "${conf_dir}/ports.conf"
-    $logroot          = '/var/log/apache22'
-    $lib_path         = '/usr/local/libexec/apache22'
-    $mpm_module       = 'prefork'
-    $dev_packages     = undef
-    $default_ssl_cert = '/usr/local/etc/apache22/server.crt'
-    $default_ssl_key  = '/usr/local/etc/apache22/server.key'
-    $ssl_certs_dir    = '/usr/local/etc/apache22'
-    $passenger_conf_file = 'passenger.conf'
-    $passenger_conf_package_file = undef
-    $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
-    $passenger_ruby   = '/usr/bin/ruby'
-    $passenger_default_ruby = undef
-    $suphp_addhandler = 'php5-script'
-    $suphp_engine     = 'off'
-    $suphp_configpath = undef
-    $mod_packages     = {
-      # NOTE: I list here only modules that are not included in www/apache22
-      # NOTE: 'passenger' needs to enable APACHE_SUPPORT in make config
-      # NOTE: 'php' needs to enable APACHE option in make config
-      # NOTE: 'dav_svn' needs to enable MOD_DAV_SVN make config
-      # NOTE: not sure where the shibboleth should come from
-      # NOTE: don't know where the shibboleth module should come from
-      'auth_kerb'  => 'www/mod_auth_kerb2',
-      'fcgid'      => 'www/mod_fcgid',
-      'passenger'  => 'www/rubygem-passenger',
-      'perl'       => 'www/mod_perl2',
-      'php5'       => 'lang/php5',
-      'proxy_html' => 'www/mod_proxy_html',
-      'python'     => 'www/mod_python3',
-      'wsgi'       => 'www/mod_wsgi',
-      'dav_svn'    => 'devel/subversion',
-      'xsendfile'  => 'www/mod_xsendfile',
-      'rpaf'       => 'www/mod_rpaf2'
-    }
-    $mod_libs         = {
-      'php5' => 'libphp5.so',
-    }
-    $conf_template        = 'apache/httpd.conf.erb'
-    $keepalive            = 'Off'
-    $keepalive_timeout    = 15
-    $max_keepalive_requests = 100
-    $fastcgi_lib_path     = undef # TODO: revisit
-    $mime_support_package = 'misc/mime-support'
-    $mime_types_config    = '/usr/local/etc/mime.types'
-  } else {
-    fail("Class['apache::params']: Unsupported osfamily: ${::osfamily}")
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp
deleted file mode 100644
index 9e57ac30b2e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/multiplexer.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-define apache::peruser::multiplexer (
-  $user = $::apache::user,
-  $group = $::apache::group,
-  $file = undef,
-) {
-  if ! $file {
-    $filename = "${name}.conf"
-  } else {
-    $filename = $file
-  }
-  file { "${::apache::mod_dir}/peruser/multiplexers/${filename}":
-    ensure  => file,
-    content => "Multiplexer ${user} ${group}\n",
-    require => File["${::apache::mod_dir}/peruser/multiplexers"],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp
deleted file mode 100644
index 1d68934657e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/peruser/processor.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-define apache::peruser::processor (
-  $user,
-  $group,
-  $file = undef,
-) {
-  if ! $file {
-    $filename = "${name}.conf"
-  } else {
-    $filename = $file
-  }
-  file { "${::apache::mod_dir}/peruser/processors/${filename}":
-    ensure  => file,
-    content => "Processor ${user} ${group}\n",
-    require => File["${::apache::mod_dir}/peruser/processors"],
-    notify  => Service['httpd'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp
deleted file mode 100644
index 9fa9c682e23..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/php.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: apache::php
-#
-# This class installs PHP for Apache
-#
-# Parameters:
-# - $php_package
-#
-# Actions:
-#   - Install Apache PHP package
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::php {
-  warning('apache::php is deprecated; please use apache::mod::php')
-  include ::apache::mod::php
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp
deleted file mode 100644
index 050f36c278a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/proxy.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# Class: apache::proxy
-#
-# This class enabled the proxy module for Apache
-#
-# Actions:
-#   - Enables Apache Proxy module
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::proxy {
-  warning('apache::proxy is deprecated; please use apache::mod::proxy')
-  include ::apache::mod::proxy
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp
deleted file mode 100644
index 723a753f82c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/python.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: apache::python
-#
-# This class installs Python for Apache
-#
-# Parameters:
-# - $php_package
-#
-# Actions:
-#   - Install Apache Python package
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::python {
-  warning('apache::python is deprecated; please use apache::mod::python')
-  include ::apache::mod::python
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp
deleted file mode 100644
index 0c1f7b96aa2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/service.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Class: apache::service
-#
-# Manages the Apache daemon
-#
-# Parameters:
-#
-# Actions:
-#   - Manage Apache service
-#
-# Requires:
-#
-# Sample Usage:
-#
-#    sometype { 'foo':
-#      notify => Class['apache::service'],
-#    }
-#
-#
-class apache::service (
-  $service_name   = $::apache::params::service_name,
-  $service_enable = true,
-  $service_ensure = 'running',
-) {
-  # The base class must be included first because parameter defaults depend on it
-  if ! defined(Class['apache::params']) {
-    fail('You must include the apache::params class before using any apache defined resources')
-  }
-  validate_bool($service_enable)
-
-  case $service_ensure {
-    true, false, 'running', 'stopped': {
-      $_service_ensure = $service_ensure
-    }
-    default: {
-      $_service_ensure = undef
-    }
-  }
-
-  service { 'httpd':
-    ensure => $_service_ensure,
-    name   => $service_name,
-    enable => $service_enable,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp
deleted file mode 100644
index d0b36593d63..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/ssl.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Class: apache::ssl
-#
-# This class installs Apache SSL capabilities
-#
-# Parameters:
-# - The $ssl_package name from the apache::params class
-#
-# Actions:
-#   - Install Apache SSL capabilities
-#
-# Requires:
-#
-# Sample Usage:
-#
-class apache::ssl {
-  warning('apache::ssl is deprecated; please use apache::mod::ssl')
-  include ::apache::mod::ssl
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp
deleted file mode 100644
index a8592d5e958..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/version.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Class: apache::version
-#
-# Try to automatically detect the version by OS
-#
-class apache::version {
-  # This will be 5 or 6 on RedHat, 6 or wheezy on Debian, 12 or quantal on Ubuntu, 3 on Amazon, etc.
-  $osr_array = split($::operatingsystemrelease,'[\/\.]')
-  $distrelease = $osr_array[0]
-  if ! $distrelease {
-    fail("Class['apache::params']: Unparsable \$::operatingsystemrelease: ${::operatingsystemrelease}")
-  }
-
-  case $::osfamily {
-    'RedHat': {
-      if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
-        $default = '2.4'
-      } else {
-        $default = '2.2'
-      }
-    }
-    'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
-        $default = '2.4'
-      } else {
-        $default = '2.2'
-      }
-    }
-    'FreeBSD': {
-      $default = '2.2'
-    }
-    default: {
-      fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp
deleted file mode 100644
index 40edad7e21d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/manifests/vhost.pp
+++ /dev/null
@@ -1,560 +0,0 @@
-# Definition: apache::vhost
-#
-# This class installs Apache Virtual Hosts
-#
-# Parameters:
-# - The $port to configure the host on
-# - The $docroot provides the DocumentRoot variable
-# - The $virtual_docroot provides VirtualDocumentationRoot variable
-# - The $serveradmin will specify an email address for Apache that it will
-#   display when it renders one of it's error pages
-# - The $ssl option is set true or false to enable SSL for this Virtual Host
-# - The $priority of the site
-# - The $servername is the primary name of the virtual host
-# - The $serveraliases of the site
-# - The $ip to configure the host on, defaulting to *
-# - The $options for the given vhost
-# - The $override for the given vhost (list of AllowOverride arguments)
-# - The $vhost_name for name based virtualhosting, defaulting to *
-# - The $logroot specifies the location of the virtual hosts logfiles, default
-#   to /var/log/<apache log location>/
-# - The $log_level specifies the verbosity of the error log for this vhost. Not
-#   set by default for the vhost, instead the global server configuration default
-#   of 'warn' is used.
-# - The $access_log specifies if *_access.log directives should be configured.
-# - The $ensure specifies if vhost file is present or absent.
-# - The $headers is a list of Header statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
-# - The $request_headers is a list of RequestHeader statement strings as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-# - $aliases is a list of Alias hashes for mod_alias as per http://httpd.apache.org/docs/current/mod/mod_alias.html
-#   each statement is a hash in the form of { alias => '/alias', path => '/real/path/to/directory' }
-# - $directories is a lost of hashes for creating <Directory> statements as per http://httpd.apache.org/docs/2.2/mod/core.html#directory
-#   each statement is a hash in the form of { path => '/path/to/directory', <directive> => <value>}
-#   see README.md for list of supported directives.
-#
-# Actions:
-# - Install Apache Virtual Hosts
-#
-# Requires:
-# - The apache class
-#
-# Sample Usage:
-#
-#  # Simple vhost definition:
-#  apache::vhost { 'site.name.fqdn':
-#    port => '80',
-#    docroot => '/path/to/docroot',
-#  }
-#
-#  # Multiple Mod Rewrites:
-#  apache::vhost { 'site.name.fqdn':
-#    port => '80',
-#    docroot => '/path/to/docroot',
-#    rewrites => [
-#      {
-#        comment       => 'force www domain',
-#        rewrite_cond => ['%{HTTP_HOST} ^([a-z.]+)?example.com$ [NC]', '%{HTTP_HOST} !^www. [NC]'],
-#        rewrite_rule => ['.? http://www.%1example.com%{REQUEST_URI} [R=301,L]']
-#      },
-#      {
-#        comment       => 'prevent image hotlinking',
-#        rewrite_cond => ['%{HTTP_REFERER} !^$', '%{HTTP_REFERER} !^http://(www.)?example.com/ [NC]'],
-#        rewrite_rule => ['.(gif|jpg|png)$ - [F]']
-#      },
-#    ]
-#  }
-#
-#  # SSL vhost with non-SSL rewrite:
-#  apache::vhost { 'site.name.fqdn':
-#    port    => '443',
-#    ssl     => true,
-#    docroot => '/path/to/docroot',
-#  }
-#  apache::vhost { 'site.name.fqdn':
-#    port            => '80',
-#    docroot         => '/path/to/other_docroot',
-#    custom_fragment => template("${module_name}/my_fragment.erb"),
-#  }
-#
-define apache::vhost(
-    $docroot,
-    $virtual_docroot             = false,
-    $port                        = undef,
-    $ip                          = undef,
-    $ip_based                    = false,
-    $add_listen                  = true,
-    $docroot_owner               = 'root',
-    $docroot_group               = $::apache::params::root_group,
-    $docroot_mode                = undef,
-    $serveradmin                 = undef,
-    $ssl                         = false,
-    $ssl_cert                    = $::apache::default_ssl_cert,
-    $ssl_key                     = $::apache::default_ssl_key,
-    $ssl_chain                   = $::apache::default_ssl_chain,
-    $ssl_ca                      = $::apache::default_ssl_ca,
-    $ssl_crl_path                = $::apache::default_ssl_crl_path,
-    $ssl_crl                     = $::apache::default_ssl_crl,
-    $ssl_certs_dir               = $::apache::params::ssl_certs_dir,
-    $ssl_protocol                = undef,
-    $ssl_cipher                  = undef,
-    $ssl_honorcipherorder        = undef,
-    $ssl_verify_client           = undef,
-    $ssl_verify_depth            = undef,
-    $ssl_options                 = undef,
-    $ssl_proxyengine             = false,
-    $priority                    = undef,
-    $default_vhost               = false,
-    $servername                  = $name,
-    $serveraliases               = [],
-    $options                     = ['Indexes','FollowSymLinks','MultiViews'],
-    $override                    = ['None'],
-    $directoryindex              = '',
-    $vhost_name                  = '*',
-    $logroot                     = $::apache::logroot,
-    $log_level                   = undef,
-    $access_log                  = true,
-    $access_log_file             = undef,
-    $access_log_pipe             = undef,
-    $access_log_syslog           = undef,
-    $access_log_format           = undef,
-    $access_log_env_var          = undef,
-    $aliases                     = undef,
-    $directories                 = undef,
-    $error_log                   = true,
-    $error_log_file              = undef,
-    $error_log_pipe              = undef,
-    $error_log_syslog            = undef,
-    $error_documents             = [],
-    $fallbackresource            = undef,
-    $scriptalias                 = undef,
-    $scriptaliases               = [],
-    $proxy_dest                  = undef,
-    $proxy_pass                  = undef,
-    $suphp_addhandler            = $::apache::params::suphp_addhandler,
-    $suphp_engine                = $::apache::params::suphp_engine,
-    $suphp_configpath            = $::apache::params::suphp_configpath,
-    $php_admin_flags             = [],
-    $php_admin_values            = [],
-    $no_proxy_uris               = [],
-    $proxy_preserve_host         = false,
-    $redirect_source             = '/',
-    $redirect_dest               = undef,
-    $redirect_status             = undef,
-    $redirectmatch_status        = undef,
-    $redirectmatch_regexp        = undef,
-    $rack_base_uris              = undef,
-    $headers                     = undef,
-    $request_headers             = undef,
-    $rewrites                    = undef,
-    $rewrite_base                = undef,
-    $rewrite_rule                = undef,
-    $rewrite_cond                = undef,
-    $setenv                      = [],
-    $setenvif                    = [],
-    $block                       = [],
-    $ensure                      = 'present',
-    $wsgi_application_group      = undef,
-    $wsgi_daemon_process         = undef,
-    $wsgi_daemon_process_options = undef,
-    $wsgi_import_script          = undef,
-    $wsgi_import_script_options  = undef,
-    $wsgi_process_group          = undef,
-    $wsgi_script_aliases         = undef,
-    $wsgi_pass_authorization     = undef,
-    $custom_fragment             = undef,
-    $itk                         = undef,
-    $action                      = undef,
-    $fastcgi_server              = undef,
-    $fastcgi_socket              = undef,
-    $fastcgi_dir                 = undef,
-    $additional_includes         = [],
-    $apache_version              = $::apache::apache_version,
-    $suexec_user_group           = undef,
-  ) {
-  # The base class must be included first because it is used by parameter defaults
-  if ! defined(Class['apache']) {
-    fail('You must include the apache base class before using any apache defined resources')
-  }
-
-  $apache_name = $::apache::params::apache_name
-
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure.
-  Allowed values are 'present' and 'absent'.")
-  validate_re($suphp_engine, '^(on|off)$',
-  "${suphp_engine} is not supported for suphp_engine.
-  Allowed values are 'on' and 'off'.")
-  validate_bool($ip_based)
-  validate_bool($access_log)
-  validate_bool($error_log)
-  validate_bool($ssl)
-  validate_bool($default_vhost)
-  validate_bool($ssl_proxyengine)
-  if $rewrites {
-    validate_array($rewrites)
-    validate_hash($rewrites[0])
-  }
-
-  if $suexec_user_group {
-    validate_re($suexec_user_group, '^\w+ \w+$',
-    "${suexec_user_group} is not supported for suexec_user_group.  Must be 'user group'.")
-  }
-
-  # Deprecated backwards-compatibility
-  if $rewrite_base {
-    warning('Apache::Vhost: parameter rewrite_base is deprecated in favor of rewrites')
-  }
-  if $rewrite_rule {
-    warning('Apache::Vhost: parameter rewrite_rule is deprecated in favor of rewrites')
-  }
-  if $rewrite_cond {
-    warning('Apache::Vhost parameter rewrite_cond is deprecated in favor of rewrites')
-  }
-
-  if $wsgi_script_aliases {
-    validate_hash($wsgi_script_aliases)
-  }
-  if $wsgi_daemon_process_options {
-    validate_hash($wsgi_daemon_process_options)
-  }
-  if $wsgi_import_script_options {
-    validate_hash($wsgi_import_script_options)
-  }
-  if $itk {
-    validate_hash($itk)
-  }
-
-  if $log_level {
-    validate_re($log_level, '^(emerg|alert|crit|error|warn|notice|info|debug)$',
-    "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
-  }
-
-  if $access_log_file and $access_log_pipe {
-    fail("Apache::Vhost[${name}]: 'access_log_file' and 'access_log_pipe' cannot be defined at the same time")
-  }
-
-  if $error_log_file and $error_log_pipe {
-    fail("Apache::Vhost[${name}]: 'error_log_file' and 'error_log_pipe' cannot be defined at the same time")
-  }
-
-  if $fallbackresource {
-    validate_re($fallbackresource, '^/|disabled', 'Please make sure fallbackresource starts with a / (or is "disabled")')
-  }
-
-  if $ssl and $ensure == 'present' {
-    include ::apache::mod::ssl
-    # Required for the AddType lines.
-    include ::apache::mod::mime
-  }
-
-  if $virtual_docroot {
-    include ::apache::mod::vhost_alias
-  }
-
-  if $wsgi_daemon_process {
-    include ::apache::mod::wsgi
-  }
-
-  if $suexec_user_group {
-    include ::apache::mod::suexec
-  }
-
-  # This ensures that the docroot exists
-  # But enables it to be specified across multiple vhost resources
-  if ! defined(File[$docroot]) {
-    file { $docroot:
-      ensure  => directory,
-      owner   => $docroot_owner,
-      group   => $docroot_group,
-      mode    => $docroot_mode,
-      require => Package['httpd'],
-    }
-  }
-
-  # Same as above, but for logroot
-  if ! defined(File[$logroot]) {
-    file { $logroot:
-      ensure  => directory,
-      require => Package['httpd'],
-    }
-  }
-
-
-  # Is apache::mod::passenger enabled (or apache::mod['passenger'])
-  $passenger_enabled = defined(Apache::Mod['passenger'])
-
-  # Define log file names
-  if $access_log_file {
-    $access_log_destination = "${logroot}/${access_log_file}"
-  } elsif $access_log_pipe {
-    $access_log_destination = $access_log_pipe
-  } elsif $access_log_syslog {
-    $access_log_destination = $access_log_syslog
-  } else {
-    if $ssl {
-      $access_log_destination = "${logroot}/${name}_access_ssl.log"
-    } else {
-      $access_log_destination = "${logroot}/${name}_access.log"
-    }
-  }
-
-  if $error_log_file {
-    $error_log_destination = "${logroot}/${error_log_file}"
-  } elsif $error_log_pipe {
-    $error_log_destination = $error_log_pipe
-  } elsif $error_log_syslog {
-    $error_log_destination = $error_log_syslog
-  } else {
-    if $ssl {
-      $error_log_destination = "${logroot}/${name}_error_ssl.log"
-    } else {
-      $error_log_destination = "${logroot}/${name}_error.log"
-    }
-  }
-
-  # Set access log format
-  if $access_log_format {
-    $_access_log_format = "\"${access_log_format}\""
-  } else {
-    $_access_log_format = 'combined'
-  }
-
-  if $access_log_env_var {
-    $_access_log_env_var = "env=${access_log_env_var}"
-  }
-
-  if $ip {
-    if $port {
-      $listen_addr_port = "${ip}:${port}"
-      $nvh_addr_port = "${ip}:${port}"
-    } else {
-      $listen_addr_port = undef
-      $nvh_addr_port = $ip
-      if ! $servername and ! $ip_based {
-        fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters for name-based vhosts")
-      }
-    }
-  } else {
-    if $port {
-      $listen_addr_port = $port
-      $nvh_addr_port = "${vhost_name}:${port}"
-    } else {
-      $listen_addr_port = undef
-      $nvh_addr_port = $name
-      if ! $servername {
-        fail("Apache::Vhost[${name}]: must pass 'ip' and/or 'port' parameters, and/or 'servername' parameter")
-      }
-    }
-  }
-  if $add_listen {
-    if $ip and defined(Apache::Listen[$port]) {
-      fail("Apache::Vhost[${name}]: Mixing IP and non-IP Listen directives is not possible; check the add_listen parameter of the apache::vhost define to disable this")
-    }
-    if ! defined(Apache::Listen[$listen_addr_port]) and $listen_addr_port and $ensure == 'present' {
-      ::apache::listen { $listen_addr_port: }
-    }
-  }
-  if ! $ip_based {
-    if ! defined(Apache::Namevirtualhost[$nvh_addr_port]) and $ensure == 'present' and (versioncmp($apache_version, '2.4') < 0) {
-      ::apache::namevirtualhost { $nvh_addr_port: }
-    }
-  }
-
-  # Load mod_rewrite if needed and not yet loaded
-  if $rewrites or $rewrite_cond {
-    if ! defined(Class['apache::mod::rewrite']) {
-      include ::apache::mod::rewrite
-    }
-  }
-
-  # Load mod_alias if needed and not yet loaded
-  if ($scriptalias or $scriptaliases != []) or ($redirect_source and $redirect_dest) {
-    if ! defined(Class['apache::mod::alias']) {
-      include ::apache::mod::alias
-    }
-  }
-
-  # Load mod_proxy if needed and not yet loaded
-  if ($proxy_dest or $proxy_pass) {
-    if ! defined(Class['apache::mod::proxy']) {
-      include ::apache::mod::proxy
-    }
-    if ! defined(Class['apache::mod::proxy_http']) {
-      include ::apache::mod::proxy_http
-    }
-  }
-
-  # Load mod_passenger if needed and not yet loaded
-  if $rack_base_uris {
-    if ! defined(Class['apache::mod::passenger']) {
-      include ::apache::mod::passenger
-    }
-  }
-
-  # Load mod_fastci if needed and not yet loaded
-  if $fastcgi_server and $fastcgi_socket {
-    if ! defined(Class['apache::mod::fastcgi']) {
-      include ::apache::mod::fastcgi
-    }
-  }
-
-  # Configure the defaultness of a vhost
-  if $priority {
-    $priority_real = $priority
-  } elsif $default_vhost {
-    $priority_real = '10'
-  } else {
-    $priority_real = '25'
-  }
-
-  # Check if mod_headers is required to process $headers/$request_headers
-  if $headers or $request_headers {
-    if ! defined(Class['apache::mod::headers']) {
-      include ::apache::mod::headers
-    }
-  }
-
-  ## Apache include does not always work with spaces in the filename
-  $filename = regsubst($name, ' ', '_', 'G')
-
-  ## Create a default directory list if none defined
-  if $directories {
-    if !is_hash($directories) and !(is_array($directories) and is_hash($directories[0])) {
-      fail("Apache::Vhost[${name}]: 'directories' must be either a Hash or an Array of Hashes")
-    }
-    $_directories = $directories
-  } else {
-    $_directory = {
-      provider       => 'directory',
-      path           => $docroot,
-      options        => $options,
-      allow_override => $override,
-      directoryindex => $directoryindex,
-    }
-
-    if versioncmp($apache_version, '2.4') >= 0 {
-      $_directory_version = {
-        require => 'all granted',
-      }
-    } else {
-      $_directory_version = {
-        order => 'allow,deny',
-        allow => 'from all',
-      }
-    }
-
-    $_directories = [ merge($_directory, $_directory_version) ]
-  }
-
-  # Template uses:
-  # - $nvh_addr_port
-  # - $servername
-  # - $serveradmin
-  # - $docroot
-  # - $virtual_docroot
-  # - $options
-  # - $override
-  # - $logroot
-  # - $name
-  # - $aliases
-  # - $_directories
-  # - $log_level
-  # - $access_log
-  # - $access_log_destination
-  # - $_access_log_format
-  # - $_access_log_env_var
-  # - $error_log
-  # - $error_log_destination
-  # - $error_documents
-  # - $fallbackresource
-  # - $custom_fragment
-  # - $additional_includes
-  # block fragment:
-  #   - $block
-  # directories fragment:
-  #   - $passenger_enabled
-  #   - $php_admin_flags
-  #   - $php_admin_values
-  #   - $directories (a list of key-value hashes is expected)
-  # fastcgi fragment:
-  #   - $fastcgi_server
-  #   - $fastcgi_socket
-  #   - $fastcgi_dir
-  # proxy fragment:
-  #   - $proxy_dest
-  #   - $no_proxy_uris
-  #   - $proxy_preserve_host (true to set ProxyPreserveHost to on and false to off
-  # rack fragment:
-  #   - $rack_base_uris
-  # redirect fragment:
-  #   - $redirect_source
-  #   - $redirect_dest
-  #   - $redirect_status
-  # header fragment
-  #   - $headers
-  # requestheader fragment:
-  #   - $request_headers
-  # rewrite fragment:
-  #   - $rewrites
-  # scriptalias fragment:
-  #   - $scriptalias
-  #   - $scriptaliases
-  #   - $ssl
-  # serveralias fragment:
-  #   - $serveraliases
-  # setenv fragment:
-  #   - $setenv
-  #   - $setenvif
-  # ssl fragment:
-  #   - $ssl
-  #   - $ssl_cert
-  #   - $ssl_key
-  #   - $ssl_chain
-  #   - $ssl_certs_dir
-  #   - $ssl_ca
-  #   - $ssl_crl
-  #   - $ssl_crl_path
-  #   - $ssl_verify_client
-  #   - $ssl_verify_depth
-  #   - $ssl_options
-  # suphp fragment:
-  #   - $suphp_addhandler
-  #   - $suphp_engine
-  #   - $suphp_configpath
-  # wsgi fragment:
-  #   - $wsgi_application_group
-  #   - $wsgi_daemon_process
-  #   - $wsgi_import_script
-  #   - $wsgi_process_group
-  #   - $wsgi_script_aliases
-  file { "${priority_real}-${filename}.conf":
-    ensure  => $ensure,
-    path    => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
-    content => template('apache/vhost.conf.erb'),
-    owner   => 'root',
-    group   => $::apache::params::root_group,
-    mode    => '0644',
-    require => [
-      Package['httpd'],
-      File[$docroot],
-      File[$logroot],
-    ],
-    notify  => Service['httpd'],
-  }
-  if $::osfamily == 'Debian' {
-    $vhost_enable_dir = $::apache::vhost_enable_dir
-    $vhost_symlink_ensure = $ensure ? {
-      present => link,
-      default => $ensure,
-    }
-    file{ "${priority_real}-${filename}.conf symlink":
-      ensure  => $vhost_symlink_ensure,
-      path    => "${vhost_enable_dir}/${priority_real}-${filename}.conf",
-      target  => "${::apache::vhost_dir}/${priority_real}-${filename}.conf",
-      owner   => 'root',
-      group   => $::apache::params::root_group,
-      mode    => '0644',
-      require => File["${priority_real}-${filename}.conf"],
-      notify  => Service['httpd'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json
deleted file mode 100644
index 92663a43c49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/metadata.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-    "name": "puppetlabs-apache",
-    "version": "1.0.1",
-    "source": "https://github.com/puppetlabs/puppetlabs-apache",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
-    "summary": "Puppet module for Apache",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "RedHat",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "CentOS",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "OracleLinux",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Scientific",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04",
-          "14.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
deleted file mode 100644
index 4fa3bf6ec6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_parameters_spec.rb
+++ /dev/null
@@ -1,446 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache parameters', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  # Currently this test only does something on FreeBSD.
-  describe 'default_confd_files => false' do
-    it 'doesnt do anything' do
-      pp = "class { 'apache': default_confd_files => false }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    if fact('osfamily') == 'FreeBSD'
-      describe file("#{confd_dir}/no-accf.conf.erb") do
-        it { should_not be_file }
-      end
-    end
-  end
-  describe 'default_confd_files => true' do
-    it 'copies conf.d files' do
-      pp = "class { 'apache': default_confd_files => true }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    if fact('osfamily') == 'FreeBSD'
-      describe file("#{$confd_dir}/no-accf.conf.erb") do
-        it { should be_file }
-      end
-    end
-  end
-
-  describe 'when set adds a listen statement' do
-    it 'applys cleanly' do
-      pp = "class { 'apache': ip => '10.1.1.1', service_ensure => stopped }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      it { should contain 'Listen 10.1.1.1' }
-    end
-  end
-
-  describe 'service tests => true' do
-    it 'starts the service' do
-      pp = <<-EOS
-        class { 'apache':
-          service_enable => true,
-          service_ensure => running,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'service tests => false' do
-    it 'stops the service' do
-      pp = <<-EOS
-        class { 'apache':
-          service_enable => false,
-          service_ensure => stopped,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should_not be_running }
-      it { should_not be_enabled }
-    end
-  end
-
-  describe 'purge parameters => false' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          purge_configs => false,
-          purge_vdir    => false,
-        }
-      EOS
-      shell("touch #{$confd_dir}/test.conf")
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    # Ensure the file didn't disappear.
-    describe file("#{$confd_dir}/test.conf") do
-      it { should be_file }
-    end
-  end
-
-  if fact('osfamily') != 'Debian'
-    describe 'purge parameters => true' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache':
-            purge_configs => true,
-            purge_vdir    => true,
-          }
-        EOS
-        shell("touch #{$confd_dir}/test.conf")
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      # File should be gone
-      describe file("#{$confd_dir}/test.conf") do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  describe 'serveradmin' do
-    it 'applies cleanly' do
-      pp = "class { 'apache': serveradmin => 'test@example.com' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($vhost) do
-      it { should be_file }
-      it { should contain 'ServerAdmin test@example.com' }
-    end
-  end
-
-  describe 'sendfile' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': sendfile => 'On' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'EnableSendfile On' }
-    end
-
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': sendfile => 'Off' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Sendfile Off' }
-    end
-  end
-
-  describe 'error_documents' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': error_documents => true }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Alias /error/' }
-    end
-  end
-
-  describe 'timeout' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': timeout => '1234' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'Timeout 1234' }
-    end
-  end
-
-  describe 'httpd_dir' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': httpd_dir => '/tmp', service_ensure => stopped }
-          include 'apache::mod::mime'
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file("#{$confd_dir}/mime.conf") do
-      it { should be_file }
-      it { should contain 'AddLanguage eo .eo' }
-    end
-  end
-
-  describe 'server_root' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': server_root => '/tmp/root', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerRoot "/tmp/root"' }
-    end
-  end
-
-  describe 'confd_dir' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': confd_dir => '/tmp/root', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    if $apache_version == '2.4'
-      describe file($conf_file) do
-        it { should be_file }
-        it { should contain 'IncludeOptional "/tmp/root/*.conf"' }
-      end
-    else
-      describe file($conf_file) do
-        it { should be_file }
-        it { should contain 'Include "/tmp/root/*.conf"' }
-      end
-    end
-  end
-
-  describe 'conf_template' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': conf_template => 'another/test.conf.erb', service_ensure => stopped }"
-        shell("mkdir -p #{default['distmoduledir']}/another/templates")
-        shell("echo 'testcontent' >> #{default['distmoduledir']}/another/templates/test.conf.erb")
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'testcontent' }
-    end
-  end
-
-  describe 'servername' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': servername => 'test.server', service_ensure => stopped }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerName "test.server"' }
-    end
-  end
-
-  describe 'user' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache':
-            manage_user  => true,
-            manage_group => true,
-            user         => 'testweb',
-            group        => 'testweb',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe user('testweb') do
-      it { should exist }
-      it { should belong_to_group 'testweb' }
-    end
-
-    describe group('testweb') do
-      it { should exist }
-    end
-  end
-
-  describe 'logformats' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache':
-            log_formats => {
-              'vhost_common'   => '%v %h %l %u %t \\\"%r\\\" %>s %b',
-              'vhost_combined' => '%v %h %l %u %t \\\"%r\\\" %>s %b \\\"%{Referer}i\\\" \\\"%{User-agent}i\\\"',
-            }
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common' }
-      it { should contain 'LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined' }
-    end
-  end
-
-
-  describe 'keepalive' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = "class { 'apache': keepalive => 'On', keepalive_timeout => '30', max_keepalive_requests => '200' }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'KeepAlive On' }
-      it { should contain 'KeepAliveTimeout 30' }
-      it { should contain 'MaxKeepAliveRequests 200' }
-    end
-  end
-
-  describe 'logging' do
-    describe 'setup' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          if $::osfamily == 'RedHat' and $::selinux == 'true' {
-            $semanage_package = $::operatingsystemmajrelease ? {
-              '5'       => 'policycoreutils',
-              'default' => 'policycoreutils-python',
-            }
-
-            package { $semanage_package: ensure => installed }
-            exec { 'set_apache_defaults':
-              command => 'semanage fcontext -a -t httpd_log_t "/apache_spec(/.*)?"',
-              path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-              require => Package[$semanage_package],
-            }
-            exec { 'restorecon_apache':
-              command => 'restorecon -Rv /apache_spec',
-              path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-              before  => Service['httpd'],
-              require => Class['apache'],
-            }
-          }
-          file { '/apache_spec': ensure => directory, }
-          class { 'apache': logroot => '/apache_spec' }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    describe file("/apache_spec/#{$error_log}") do
-      it { should be_file }
-    end
-  end
-
-  describe 'ports_file' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        file { '/apache_spec': ensure => directory, }
-        class { 'apache':
-          ports_file     => '/apache_spec/ports_file',
-          ip             => '10.1.1.1',
-          service_ensure => stopped
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/apache_spec/ports_file') do
-      it { should be_file }
-      it { should contain 'Listen 10.1.1.1' }
-    end
-  end
-
-  describe 'server_tokens' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          server_tokens  => 'Minor',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerTokens Minor' }
-    end
-  end
-
-  describe 'server_signature' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          server_signature  => 'testsig',
-          service_ensure    => stopped,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'ServerSignature testsig' }
-    end
-  end
-
-  describe 'trace_enable' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          trace_enable  => 'Off',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($conf_file) do
-      it { should be_file }
-      it { should contain 'TraceEnable Off' }
-    end
-  end
-
-  describe 'package_ensure' do
-    it 'applys cleanly' do
-      pp = <<-EOS
-        class { 'apache':
-          package_ensure  => present,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package($package_name) do
-      it { should be_installed }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
deleted file mode 100644
index 649c02d8412..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/apache_ssl_spec.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  vhostd = '/etc/httpd/conf.d'
-when 'Debian'
-  vhostd = '/etc/apache2/sites-available'
-end
-
-describe 'apache ssl', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  describe 'ssl parameters' do
-    it 'runs without error' do
-      pp = <<-EOS
-        class { 'apache':
-          service_ensure       => stopped,
-          default_ssl_vhost    => true,
-          default_ssl_cert     => '/tmp/ssl_cert',
-          default_ssl_key      => '/tmp/ssl_key',
-          default_ssl_chain    => '/tmp/ssl_chain',
-          default_ssl_ca       => '/tmp/ssl_ca',
-          default_ssl_crl_path => '/tmp/ssl_crl_path',
-          default_ssl_crl      => '/tmp/ssl_crl',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{vhostd}/15-default-ssl.conf") do
-      it { should be_file }
-      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
-      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
-      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
-    end
-  end
-
-  describe 'vhost ssl parameters' do
-    it 'runs without error' do
-      pp = <<-EOS
-        class { 'apache':
-          service_ensure       => stopped,
-        }
-
-        apache::vhost { 'test_ssl':
-          docroot              => '/tmp/test',
-          ssl                  => true,
-          ssl_cert             => '/tmp/ssl_cert',
-          ssl_key              => '/tmp/ssl_key',
-          ssl_chain            => '/tmp/ssl_chain',
-          ssl_ca               => '/tmp/ssl_ca',
-          ssl_crl_path         => '/tmp/ssl_crl_path',
-          ssl_crl              => '/tmp/ssl_crl',
-          ssl_certs_dir        => '/tmp',
-          ssl_protocol         => 'test',
-          ssl_cipher           => 'test',
-          ssl_honorcipherorder => 'test',
-          ssl_verify_client    => 'test',
-          ssl_verify_depth     => 'test',
-          ssl_options          => ['test', 'test1'],
-          ssl_proxyengine      => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{vhostd}/25-test_ssl.conf") do
-      it { should be_file }
-      it { should contain 'SSLCertificateFile      "/tmp/ssl_cert"' }
-      it { should contain 'SSLCertificateKeyFile   "/tmp/ssl_key"' }
-      it { should contain 'SSLCertificateChainFile "/tmp/ssl_chain"' }
-      it { should contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
-      it { should contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
-      it { should contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
-      it { should contain 'SSLProxyEngine On' }
-      it { should contain 'SSLProtocol             test' }
-      it { should contain 'SSLCipherSuite          test' }
-      it { should contain 'SSLHonorCipherOrder     test' }
-      it { should contain 'SSLVerifyClient         test' }
-      it { should contain 'SSLVerifyDepth          test' }
-      it { should contain 'SSLOptions test test1' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb
deleted file mode 100644
index 6c2b3f462fc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/basic_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'disable selinux:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it "because otherwise apache won't work" do
-    apply_manifest(%{
-      exec { "setenforce 0":
-        path   => "/bin:/sbin:/usr/bin:/usr/sbin",
-        onlyif => "which setenforce && getenforce | grep Enforcing",
-      }
-    }, :catch_failures => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb
deleted file mode 100644
index 830e3ed5b6c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'httpd'
-    service_name = 'httpd'
-  when 'Debian'
-    package_name = 'apache2'
-    service_name = 'apache2'
-  when 'FreeBSD'
-    package_name = 'apache22'
-    service_name = 'apache22'
-  end
-
-  context 'default parameters' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apache': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  context 'custom site/mod dir parameters' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-      if $::osfamily == 'RedHat' and $::selinux == 'true' {
-        $semanage_package = $::operatingsystemmajrelease ? {
-          '5'       => 'policycoreutils',
-          'default' => 'policycoreutils-python',
-        }
-
-        package { $semanage_package: ensure => installed }
-        exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package[$semanage_package],
-        }
-        exec { 'restorecon_apache':
-          command => 'restorecon -Rv /apache_spec',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
-          require => Class['apache'],
-        }
-      }
-      file { '/apache_spec': ensure => directory, }
-      file { '/apache_spec/apache_custom': ensure => directory, }
-      class { 'apache':
-        mod_dir   => '/apache_spec/apache_custom/mods',
-        vhost_dir => '/apache_spec/apache_custom/vhosts',
-      }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
deleted file mode 100644
index c7f87556051..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/default_mods_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  mod_dir     = '/etc/httpd/conf.d'
-  servicename = 'httpd'
-when 'Debian'
-  mod_dir     = '/etc/apache2/mods-available'
-  servicename = 'apache2'
-when 'FreeBSD'
-  mod_dir     = '/usr/local/etc/apache22/Modules'
-  servicename = 'apache22'
-end
-
-describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'no default mods' do
-    # Using puppet_apply as a helper
-    it 'should apply with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          default_mods => false,
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-    end
-  end
-
-  describe 'no default mods and failing' do
-    # Using puppet_apply as a helper
-    it 'should apply with errors' do
-      pp = <<-EOS
-        class { 'apache':
-          default_mods => false,
-        }
-        apache::vhost { 'defaults.example.com':
-          docroot => '/var/www/defaults',
-          aliases => {
-            alias => '/css',
-            path  => '/var/www/css',
-          },
-          setenv  => 'TEST1 one',
-        }
-      EOS
-
-      apply_manifest(pp, { :expect_failures => true })
-    end
-
-    # Are these the same?
-    describe service(servicename) do
-      it { should_not be_running }
-    end
-    describe "service #{servicename}" do
-      it 'should not be running' do
-        shell("pidof #{servicename}", {:acceptable_exit_codes => 1})
-      end
-    end
-  end
-
-  describe 'alternative default mods' do
-    # Using puppet_apply as a helper
-    it 'should apply with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          default_mods => [
-            'info',
-            'alias',
-            'mime',
-            'env',
-            'expires',
-          ],
-        }
-        apache::vhost { 'defaults.example.com':
-          docroot => '/var/www/defaults',
-          aliases => {
-            alias => '/css',
-            path  => '/var/www/css',
-          },
-          setenv  => 'TEST1 one',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      shell('sleep 10')
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-    end
-  end
-
-  describe 'change loadfile name' do
-    it 'should apply with no errors' do
-      pp = <<-EOS
-        class { 'apache': default_mods => false }
-        ::apache::mod { 'auth_basic': 
-          loadfile_name => 'zz_auth_basic.load',
-        }
-      EOS
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/zz_auth_basic.load") do
-      it { should be_file }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb
deleted file mode 100644
index 86fc2c01ce5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/itk_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'Debian'
-  service_name = 'apache2'
-when 'FreeBSD'
-  service_name = 'apache22'
-else
-  # Not implemented yet
-  service_name = :skip
-end
-
-describe 'apache::mod::itk class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) or service_name.equal? :skip do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'itk',
-          }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe service(service_name) do
-    it { should be_running }
-    it { should be_enabled }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
deleted file mode 100644
index 412b794540b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_dav_svn_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::dav_svn class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default dav_svn config" do
-    it 'succeeds in puppeting dav_svn' do
-      pp= <<-EOS
-        class { 'apache': }
-        include apache::mod::dav_svn
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/dav_svn.load") do
-      it { should contain "LoadModule dav_svn_module" }
-    end
-  end
-
-  context "dav_svn with enabled authz_svn config" do
-    it 'succeeds in puppeting dav_svn' do
-      pp= <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::dav_svn':
-            authz_svn_enabled => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/dav_svn_authz_svn.load") do
-      it { should contain "LoadModule authz_svn_module" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
deleted file mode 100644
index b2ffc1436a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_deflate_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::deflate class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default deflate config" do
-    it 'succeeds in puppeting deflate' do
-      pp= <<-EOS
-        class { 'apache': }
-        include apache::mod::deflate
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/deflate.conf") do
-      it { should contain "AddOutputFilterByType DEFLATE text/html text/plain text/xml" }
-      it { should contain "AddOutputFilterByType DEFLATE text/css" }
-      it { should contain "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript" }
-      it { should contain "AddOutputFilterByType DEFLATE application/rss+xml" }
-      it { should contain "DeflateFilterNote Input instream" }
-      it { should contain "DeflateFilterNote Output outstream" }
-      it { should contain "DeflateFilterNote Ratio ratio" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
deleted file mode 100644
index 52f793be06d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_fcgid_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::fcgid class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    # Not implemented
-  when 'RedHat'
-    context "default fcgid config" do
-      it 'succeeds in puppeting fcgid' do
-        pp = <<-EOS
-          class { 'epel': } # mod_fcgid lives in epel
-          class { 'apache': }
-          class { 'apache::mod::php': } # For /usr/bin/php-cgi
-          class { 'apache::mod::fcgid':
-            options => {
-              'FcgidIPCDir'  => '/var/run/fcgidsock',
-            },
-          }
-          apache::vhost { 'fcgid.example.com':
-            port        => '80',
-            docroot     => '/var/www/fcgid',
-            directories => {
-              path        => '/var/www/fcgid',
-              options     => '+ExecCGI',
-              addhandlers => {
-                handler    => 'fcgid-script',
-                extensions => '.php',
-              },
-              fcgiwrapper => {
-                command => '/usr/bin/php-cgi',
-                suffix  => '.php',
-              }
-            },
-          }
-          file { '/var/www/fcgid/index.php':
-            ensure  => file,
-            owner   => 'root',
-            group   => 'root',
-            content => "<?php echo 'Hello world'; ?>\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service('httpd') do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to fcgid.example.com' do
-        shell("/usr/bin/curl -H 'Host: fcgid.example.com' 127.0.0.1:80") do |r|
-          r.stdout.should =~ /^Hello world$/
-          r.exit_code.should == 0
-        end
-      end
-
-      it 'should run a php-cgi process' do
-        shell("pgrep -u apache php-cgi", :acceptable_exit_codes => [0])
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
deleted file mode 100644
index 71a7037a623..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_mime_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::mime class' do
-  case fact('osfamily')
-  when 'Debian'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default mime config" do
-    it 'succeeds in puppeting mime' do
-      pp= <<-EOS
-        class { 'apache': }
-        include apache::mod::mime
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/mime.conf") do
-      it { should contain "AddType application/x-compress .Z" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
deleted file mode 100644
index de59a347c11..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_pagespeed_spec.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::pagespeed class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default pagespeed config" do
-    it 'succeeds in puppeting pagespeed' do
-      pp= <<-EOS
-        if $::osfamily == 'Debian' {
-          class { 'apt': }
-
-          apt::source { 'mod-pagespeed':
-            key         => '7FAC5991',
-            key_server  => 'pgp.mit.edu',
-            location    => 'http://dl.google.com/linux/mod-pagespeed/deb/',
-            release     => 'stable',
-            repos       => 'main',
-            include_src => false,
-            before      => Class['apache'],
-          } 
-        } elsif $::osfamily == 'RedHat' {
-         yumrepo { 'mod-pagespeed':
-          baseurl  => 'http://dl.google.com/linux/mod-pagespeed/rpm/stable/x86_64',
-            enabled  => 1,
-            gpgcheck => 1,
-            gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',
-            before   => Class['apache'],
-          }
-        }
-
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::pagespeed':
-          enable_filters  => ['remove_comments'],
-          disable_filters => ['extend_cache'],
-          forbid_filters  => ['rewrite_javascript'],
-        }
-        apache::vhost { 'pagespeed.example.com':
-          port    => '80',
-          docroot => '/var/www/pagespeed',
-        }
-        host { 'pagespeed.example.com': ip => '127.0.0.1', }
-        file { '/var/www/pagespeed/index.html':
-          ensure  => file,
-          content => "<html>\n<!-- comment -->\n<body>\n<p>Hello World!</p>\n</body>\n</html>",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/pagespeed.conf") do
-      it { should contain "AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html" }
-      it { should contain "ModPagespeedEnableFilters remove_comments" }
-      it { should contain "ModPagespeedDisableFilters extend_cache" }
-      it { should contain "ModPagespeedForbidFilters rewrite_javascript" }
-    end
-
-    it 'should answer to pagespeed.example.com and include <head/> and be stripped of comments by mod_pagespeed' do
-      shell("/usr/bin/curl pagespeed.example.com:80") do |r|
-        r.stdout.should =~ /<head\/>/
-        r.stdout.should_not =~ /<!-- comment -->/
-        r.exit_code.should == 0
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
deleted file mode 100644
index fbfac1672a1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_passenger_spec.rb
+++ /dev/null
@@ -1,294 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::passenger class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    service_name = 'apache2'
-    mod_dir = '/etc/apache2/mods-available/'
-    conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
-
-    case fact('operatingsystem')
-    when 'Ubuntu'
-      case fact('lsbdistrelease')
-      when '10.04'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      when '12.04'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      when '14.04'
-        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
-        passenger_ruby         = '/usr/bin/ruby'
-        passenger_default_ruby = '/usr/bin/ruby'
-      else
-        # This may or may not work on Ubuntu releases other than the above
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      end
-    when 'Debian'
-      case fact('lsbdistcodename')
-      when 'wheezy'
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      else
-        # This may or may not work on Debian releases other than the above
-        passenger_root = '/usr'
-        passenger_ruby = '/usr/bin/ruby'
-      end
-    end
-
-    passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
-    rackapp_user = 'www-data'
-    rackapp_group = 'www-data'
-  when 'RedHat'
-    service_name = 'httpd'
-    mod_dir = '/etc/httpd/conf.d/'
-    conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
-    # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
-    passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.1'
-    passenger_ruby = '/usr/bin/ruby'
-    passenger_tempdir = '/var/run/rubygem-passenger'
-    passenger_module_path = 'modules/mod_passenger.so'
-    rackapp_user = 'apache'
-    rackapp_group = 'apache'
-  end
-
-  pp_rackapp = <<-EOS
-          /* a simple ruby rack 'hellow world' app */
-          file { '/var/www/passenger':
-            ensure  => directory,
-            owner   => '#{rackapp_user}',
-            group   => '#{rackapp_group}',
-            require => Class['apache::mod::passenger'],
-          }
-          file { '/var/www/passenger/config.ru':
-            ensure  => file,
-            owner   => '#{rackapp_user}',
-            group   => '#{rackapp_group}',
-            content => "app = proc { |env| [200, { \\"Content-Type\\" => \\"text/html\\" }, [\\"hello <b>world</b>\\"]] }\\nrun app",
-            require => File['/var/www/passenger'] ,
-          }
-          apache::vhost { 'passenger.example.com':
-            port    => '80',
-            docroot => '/var/www/passenger/public',
-            docroot_group => '#{rackapp_group}' ,
-            docroot_owner => '#{rackapp_user}' ,
-            custom_fragment => "PassengerRuby  #{passenger_ruby}\\nRailsEnv  development" ,
-            require => File['/var/www/passenger/config.ru'] ,
-          }
-          host { 'passenger.example.com': ip => '127.0.0.1', }
-  EOS
-
-  case fact('osfamily')
-  when 'Debian'
-    context "default passenger config" do
-      it 'succeeds in puppeting passenger' do
-        pp = <<-EOS
-          /* stock apache and mod_passenger */
-          class { 'apache': }
-          class { 'apache::mod::passenger': }
-          #{pp_rackapp}
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service(service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      describe file(conf_file) do
-        it { should contain "PassengerRoot \"#{passenger_root}\"" }
-
-        case fact('operatingsystem')
-        when 'Ubuntu'
-          case fact('lsbdistrelease')
-          when '10.04'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          when '12.04'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          when '14.04'
-            it { should contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerRuby/" }
-          else
-            # This may or may not work on Ubuntu releases other than the above
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          end
-        when 'Debian'
-          case fact('lsbdistcodename')
-          when 'wheezy'
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          else
-            # This may or may not work on Debian releases other than the above
-            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
-            it { should_not contain "/PassengerDefaultRuby/" }
-          end
-        end
-      end
-
-      describe file(load_file) do
-        it { should contain "LoadModule passenger_module #{passenger_module_path}" }
-      end
-
-      it 'should output status via passenger-memory-stats' do
-        shell("sudo /usr/sbin/passenger-memory-stats") do |r|
-          r.stdout.should =~ /Apache processes/
-          r.stdout.should =~ /Nginx processes/
-          r.stdout.should =~ /Passenger processes/
-
-          # passenger-memory-stats output on Ubuntu 14.04 does not contain
-          # these two lines
-          unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
-            r.stdout.should =~ /### Processes: [0-9]+/
-            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
-          end
-
-          r.exit_code.should == 0
-        end
-      end
-
-      # passenger-status fails under stock ubuntu-server-12042-x64 + mod_passenger,
-      # even when the passenger process is successfully installed and running
-      unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '12.04'
-        it 'should output status via passenger-status' do
-          # xml output not available on ubunutu <= 10.04, so sticking with default pool output
-          shell("sudo /usr/sbin/passenger-status") do |r|
-            # spacing may vary
-            r.stdout.should =~ /[\-]+ General information [\-]+/
-            if fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
-              r.stdout.should =~ /Max pool size[ ]+: [0-9]+/
-              r.stdout.should =~ /Processes[ ]+: [0-9]+/
-              r.stdout.should =~ /Requests in top-level queue[ ]+: [0-9]+/
-            else
-              r.stdout.should =~ /max[ ]+= [0-9]+/
-              r.stdout.should =~ /count[ ]+= [0-9]+/
-              r.stdout.should =~ /active[ ]+= [0-9]+/
-              r.stdout.should =~ /inactive[ ]+= [0-9]+/
-              r.stdout.should =~ /Waiting on global queue: [0-9]+/
-            end
-
-            r.exit_code.should == 0
-          end
-        end
-      end
-
-      it 'should answer to passenger.example.com' do
-        shell("/usr/bin/curl passenger.example.com:80") do |r|
-          r.stdout.should =~ /^hello <b>world<\/b>$/
-          r.exit_code.should == 0
-        end
-      end
-
-    end
-
-  when 'RedHat'
-    # no fedora 18 passenger package yet, and rhel5 packages only exist for ruby 1.8.5
-    unless (fact('operatingsystem') == 'Fedora' and fact('operatingsystemrelease').to_f >= 18) or (fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '5' and fact('rubyversion') != '1.8.5')
-
-      context "default passenger config" do
-        it 'succeeds in puppeting passenger' do
-          pp = <<-EOS
-            /* EPEL and passenger repositories */
-            class { 'epel': }
-            exec { 'passenger.repo GPG key':
-              command => '/usr/bin/sudo /usr/bin/curl -o /etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-              creates => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-            }
-            file { 'passenger.repo GPG key':
-              ensure  => file,
-              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              require => Exec['passenger.repo GPG key'],
-            }
-            epel::rpm_gpg_key { 'passenger.stealthymonkeys.com':
-              path    => '/etc/yum.repos.d/RPM-GPG-KEY-stealthymonkeys.asc',
-              require => [
-                Class['epel'],
-                File['passenger.repo GPG key'],
-              ]
-            }
-            yumrepo { 'passenger':
-              baseurl         => 'http://passenger.stealthymonkeys.com/rhel/$releasever/$basearch' ,
-              descr           => 'Red Hat Enterprise $releasever - Phusion Passenger',
-              enabled         => 1,
-              gpgcheck        => 1,
-              gpgkey          => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-              mirrorlist      => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
-              require => [
-                Epel::Rpm_gpg_key['passenger.stealthymonkeys.com'],
-              ],
-            }
-            /* apache and mod_passenger */
-            class { 'apache':
-                require => [
-                  Class['epel'],
-              ],
-            }
-            class { 'apache::mod::passenger':
-              require => [
-                Yumrepo['passenger']
-              ],
-            }
-            #{pp_rackapp}
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe service(service_name) do
-          it { should be_enabled }
-          it { should be_running }
-        end
-
-        describe file(conf_file) do
-          it { should contain "PassengerRoot #{passenger_root}" }
-          it { should contain "PassengerRuby #{passenger_ruby}" }
-          it { should contain "PassengerTempDir #{passenger_tempdir}" }
-        end
-
-        describe file(load_file) do
-          it { should contain "LoadModule passenger_module #{passenger_module_path}" }
-        end
-
-        it 'should output status via passenger-memory-stats' do
-          shell("sudo /usr/bin/passenger-memory-stats") do |r|
-            r.stdout.should =~ /Apache processes/
-            r.stdout.should =~ /Nginx processes/
-            r.stdout.should =~ /Passenger processes/
-            r.stdout.should =~ /### Processes: [0-9]+/
-            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
-
-            r.exit_code.should == 0
-          end
-        end
-
-        it 'should output status via passenger-status' do
-          shell("sudo PASSENGER_TMPDIR=/var/run/rubygem-passenger /usr/bin/passenger-status") do |r|
-            # spacing may vary
-            r.stdout.should =~ /[\-]+ General information [\-]+/
-            r.stdout.should =~ /max[ ]+= [0-9]+/
-            r.stdout.should =~ /count[ ]+= [0-9]+/
-            r.stdout.should =~ /active[ ]+= [0-9]+/
-            r.stdout.should =~ /inactive[ ]+= [0-9]+/
-            r.stdout.should =~ /Waiting on global queue: [0-9]+/
-
-            r.exit_code.should == 0
-          end
-        end
-
-        it 'should answer to passenger.example.com' do
-          shell("/usr/bin/curl passenger.example.com:80") do |r|
-            r.stdout.should =~ /^hello <b>world<\/b>$/
-            r.exit_code.should == 0
-          end
-        end
-      end
-
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
deleted file mode 100644
index ca21fbcd7e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_php_spec.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::php class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    vhost_dir    = '/etc/apache2/sites-enabled'
-    mod_dir      = '/etc/apache2/mods-available'
-    service_name = 'apache2'
-  when 'RedHat'
-    vhost_dir    = '/etc/httpd/conf.d'
-    mod_dir      = '/etc/httpd/conf.d'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    vhost_dir    = '/usr/local/etc/apache22/Vhosts'
-    mod_dir      = '/usr/local/etc/apache22/Modules'
-    service_name = 'apache22'
-  end
-
-  context "default php config" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::php': }
-        apache::vhost { 'php.example.com':
-          port    => '80',
-          docroot => '/var/www/php',
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "DirectoryIndex index.php" }
-    end
-
-    it 'should answer to php.example.com' do
-      shell("/usr/bin/curl php.example.com:80") do |r|
-        r.stdout.should =~ /PHP Version/
-        r.exit_code.should == 0
-      end
-    end
-  end
-
-  context "custom extensions, php_admin_flag, and php_admin_value" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-        class { 'apache::mod::php':
-          extensions => ['.php','.php5'],
-        }
-        apache::vhost { 'php.example.com':
-          port             => '80',
-          docroot          => '/var/www/php',
-          php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
-          php_admin_flags  => { 'engine' => 'on', },
-        }
-        host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php5':
-          ensure  => file,
-          content => "<?php phpinfo(); ?>\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file("#{vhost_dir}/25-php.example.com.conf") do
-      it { should contain "  php_admin_flag engine on" }
-      it { should contain "  php_admin_value open_basedir /var/www/php/:/usr/share/pear/" }
-    end
-
-    it 'should answer to php.example.com' do
-      shell("/usr/bin/curl php.example.com:80") do |r|
-        r.stdout.should =~ /\/usr\/share\/pear\//
-        r.exit_code.should == 0
-      end
-    end
-  end
-
-  context "provide custom config file" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content => '# somecontent',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# somecontent" }
-    end
-  end
-
-  context "provide content and template config file" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content  => '# somecontent',
-          template => 'apache/mod/php5.conf.erb',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# somecontent" }
-    end
-  end
-
-  context "provide source has priority over content" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          content => '# somecontent',
-          source  => 'puppet:///modules/apache/spec',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# This is a file only for spec testing" }
-    end
-  end
-
-  context "provide source has priority over template" do
-    it 'succeeds in puppeting php' do
-      pp= <<-EOS
-        class {'apache':
-          mpm_module => 'prefork',
-        }
-        class {'apache::mod::php':
-          template => 'apache/mod/php5.conf.erb',
-          source   => 'puppet:///modules/apache/spec',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{mod_dir}/php5.conf") do
-      it { should contain "# This is a file only for spec testing" }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
deleted file mode 100644
index f015f999416..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_proxy_html_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::proxy_html class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    service_name = 'apache2'
-  when 'RedHat'
-    service_name = 'httpd'
-  when 'FreeBSD'
-    service_name = 'apache22'
-  end
-
-  context "default proxy_html config" do
-    if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') =~ /(5|6)/
-      it 'adds epel' do
-        pp = "class { 'epel': }"
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    it 'succeeds in puppeting proxy_html' do
-      pp= <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::proxy': }
-        class { 'apache::mod::proxy_http': }
-        # mod_proxy_html doesn't exist in RHEL5
-        if $::osfamily == 'RedHat' and $::operatingsystemmajrelease != '5' {
-          class { 'apache::mod::proxy_html': }
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
deleted file mode 100644
index 9e26731d618..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/mod_suphp_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::mod::suphp class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  case fact('osfamily')
-  when 'Debian'
-    context "default suphp config" do
-      it 'succeeds in puppeting suphp' do
-        pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'prefork',
-          }
-          class { 'apache::mod::php': }
-          class { 'apache::mod::suphp': }
-          apache::vhost { 'suphp.example.com':
-            port    => '80',
-            docroot => '/var/www/suphp',
-          }
-          host { 'suphp.example.com': ip => '127.0.0.1', }
-          file { '/var/www/suphp/index.php':
-            ensure  => file,
-            owner   => 'daemon',
-            group   => 'daemon',
-            content => "<?php echo get_current_user(); ?>\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service('apache2') do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to suphp.example.com' do
-        shell("/usr/bin/curl suphp.example.com:80") do |r|
-          r.stdout.should =~ /^daemon$/
-          r.exit_code.should == 0
-        end
-      end
-    end
-  when 'RedHat'
-    # Not implemented yet
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index cde1fe5a85b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index e408d1be779..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index ce47212a8c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index ac763497368..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index e642e099254..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index cbbbfb2cc62..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
deleted file mode 100644
index a38902d8971..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-i386.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-i386:
-    roles:
-      - master
-    platform: debian-7-i386
-    box : debian-73-i386-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-i386-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index f9cf0c9b8a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index ce47212a8c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 086cae995c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml
deleted file mode 100644
index a9f01d5f423..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index c1b8bdf8fa9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index f7df2ccce12..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
deleted file mode 100644
index f4b2366f3bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1310-x64:
-    roles:
-      - master
-    platform: ubuntu-13.10-amd64
-    box : ubuntu-server-1310-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-1310-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index cba1cd04c25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : puppetlabs/ubuntu-14.04-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
deleted file mode 100644
index beffe0a014b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/prefork_worker_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat'
-  servicename = 'httpd'
-when 'Debian'
-  servicename = 'apache2'
-when 'FreeBSD'
-  servicename = 'apache22'
-end
-
-case fact('osfamily')
-when 'FreeBSD'
-  describe 'apache::mod::event class' do
-    describe 'running puppet code' do
-      # Using puppet_apply as a helper
-      it 'should work with no errors' do
-        pp = <<-EOS
-          class { 'apache':
-            mpm_module => 'event',
-          }
-        EOS
-
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-      end
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-end
-
-describe 'apache::mod::worker class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          mpm_module => 'worker',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe service(servicename) do
-    it { should be_running }
-    it { should be_enabled }
-  end
-end
-
-describe 'apache::mod::prefork class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'apache':
-          mpm_module => 'prefork',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe service(servicename) do
-    it { should be_running }
-    it { should be_enabled }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb
deleted file mode 100644
index b51ca386f0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/service_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apache::service class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'adding dependencies in between the base class and service class' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apache': }
-      file { '/tmp/test':
-        require => Class['apache'],
-        notify  => Class['apache::service'],
-      }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 085845dbfc0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should fail' do
-    pp = <<-EOS
-      class { 'apache': }
-      apache::vhost { 'test.lan':
-        docroot => '/var/www',
-      }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb
deleted file mode 100644
index 27498354b48..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/version.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-_osfamily               = fact('osfamily')
-_operatingsystem        = fact('operatingsystem')
-_operatingsystemrelease = fact('operatingsystemrelease').to_f
-
-case _osfamily
-when 'RedHat'
-  $confd_dir        = '/etc/httpd/conf.d'
-  $conf_file        = '/etc/httpd/conf/httpd.conf'
-  $ports_file       = '/etc/httpd/conf/ports.conf'
-  $vhost_dir        = '/etc/httpd/conf.d'
-  $vhost            = '/etc/httpd/conf.d/15-default.conf'
-  $run_dir          = '/var/run/httpd'
-  $service_name     = 'httpd'
-  $package_name     = 'httpd'
-  $error_log        = 'error_log'
-  $suphp_handler    = 'php5-script'
-  $suphp_configpath = 'undef'
-
-  if (_operatingsystem == 'Fedora' and _operatingsystemrelease >= 18) or (_operatingsystem != 'Fedora' and _operatingsystemrelease >= 7)
-    $apache_version = '2.4'
-  else
-    $apache_version = '2.2'
-  end
-when 'Debian'
-  $confd_dir        = '/etc/apache2/mods-available'
-  $conf_file        = '/etc/apache2/apache2.conf'
-  $ports_file       = '/etc/apache2/ports.conf'
-  $vhost            = '/etc/apache2/sites-available/15-default.conf'
-  $vhost_dir        = '/etc/apache2/sites-enabled'
-  $run_dir          = '/var/run/apache2'
-  $service_name     = 'apache2'
-  $package_name     = 'apache2'
-  $error_log        = 'error.log'
-  $suphp_handler    = 'x-httpd-php'
-  $suphp_configpath = '/etc/php5/apache2'
-
-  if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
-    $apache_version = '2.4'
-  else
-    $apache_version = '2.2'
-  end
-when 'FreeBSD'
-  $confd_dir        = '/usr/local/etc/apache22/Includes'
-  $conf_file        = '/usr/local/etc/apache22/httpd.conf'
-  $ports_file       = '/usr/local/etc/apache22/Includes/ports.conf'
-  $vhost            = '/usr/local/etc/apache22/Vhosts/15-default.conf'
-  $vhost_dir        = '/usr/local/etc/apache22/Vhosts'
-  $run_dir          = '/var/run/apache22'
-  $service_name     = 'apache22'
-  $package_name     = 'apache22'
-  $error_log        = 'http-error.log'
-
-  $apache_version = '2.2'
-else
-  $apache_version = '0'
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb
deleted file mode 100644
index c43d3f9e9e7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/acceptance/vhost_spec.rb
+++ /dev/null
@@ -1,1097 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative './version.rb'
-
-describe 'apache::vhost define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'no default vhosts' do
-    it 'should create no default vhosts' do
-      pp = <<-EOS
-        class { 'apache':
-          default_vhost => false,
-          default_ssl_vhost => false,
-          service_ensure => stopped
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/15-default.conf") do
-      it { should_not be_file }
-    end
-
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should_not be_file }
-    end
-  end
-
-  context "default vhost without ssl" do
-    it 'should create a default vhost config' do
-      pp = <<-EOS
-        class { 'apache': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/15-default.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-    end
-
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should_not be_file }
-    end
-  end
-
-  context 'default vhost with ssl' do
-    it 'should create default vhost configs' do
-      pp = <<-EOS
-        file { '#{$run_dir}':
-          ensure  => 'directory',
-          recurse => true,
-        }
-
-        class { 'apache':
-          default_ssl_vhost => true,
-          require => File['#{$run_dir}'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/15-default.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-    end
-
-    describe file("#{$vhost_dir}/15-default-ssl.conf") do
-      it { should contain '<VirtualHost \*:443>' }
-      it { should contain "SSLEngine on" }
-    end
-  end
-
-  context 'new vhost on port 80' do
-    it 'should configure an apache vhost' do
-      pp = <<-EOS
-        class { 'apache': }
-        file { '#{$run_dir}':
-          ensure  => 'directory',
-          recurse => true,
-        }
-
-        apache::vhost { 'first.example.com':
-          port    => '80',
-          docroot => '/var/www/first',
-          require => File['#{$run_dir}'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-first.example.com.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-      it { should contain "ServerName first.example.com" }
-    end
-  end
-
-  context 'new proxy vhost on port 80' do
-    it 'should configure an apache proxy vhost' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'proxy.example.com':
-          port    => '80',
-          docroot => '/var/www/proxy',
-          proxy_pass => [
-            { 'path' => '/foo', 'url' => 'http://backend-foo/'},
-          ],
-    	  proxy_preserve_host   => true, 
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-proxy.example.com.conf") do
-      it { should contain '<VirtualHost \*:80>' }
-      it { should contain "ServerName proxy.example.com" }
-      it { should contain "ProxyPass" }
-      it { should contain "ProxyPreserveHost On" }
-      it { should_not contain "<Proxy \*>" }
-    end
-  end
-
-  context 'new vhost on port 80' do
-    it 'should configure two apache vhosts' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'first.example.com':
-          port    => '80',
-          docroot => '/var/www/first',
-        }
-        host { 'first.example.com': ip => '127.0.0.1', }
-        file { '/var/www/first/index.html':
-          ensure  => file,
-          content => "Hello from first\\n",
-        }
-        apache::vhost { 'second.example.com':
-          port    => '80',
-          docroot => '/var/www/second',
-        }
-        host { 'second.example.com': ip => '127.0.0.1', }
-        file { '/var/www/second/index.html':
-          ensure  => file,
-          content => "Hello from second\\n",
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    it 'should answer to first.example.com' do
-      shell("/usr/bin/curl first.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from first\n"
-      end
-    end
-
-    it 'should answer to second.example.com' do
-      shell("/usr/bin/curl second.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from second\n"
-      end
-    end
-  end
-
-  context 'apache_directories' do
-    describe 'readme example, adapted' do
-      it 'should configure a vhost with Files' do
-        pp = <<-EOS
-          class { 'apache': }
-
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
-            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
-          } else {
-            $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
-          }
-
-          $_directories = [
-            { 'path' => '/var/www/files', },
-            $_files_match_directory,
-          ]
-
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => $_directories,
-          }
-          file { '/var/www/files/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/index.html.bak':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          host { 'files.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html.bak", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
-      end
-    end
-
-    describe 'other Directory options' do
-      it 'should configure a vhost with multiple Directory sections' do
-        pp = <<-EOS
-          class { 'apache': }
-
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
-            $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
-          } else {
-            $_files_match_directory = [ 
-              { 'path' => 'private.html$', 'provider' => 'filesmatch', 'deny' => 'from all' },
-              { 'path' => '/bar/bar.html', 'provider' => 'location', allow => [ 'from 127.0.0.1', ] },
-            ]
-          }
-
-          $_directories = [
-            { 'path' => '/var/www/files', },
-            { 'path' => '/foo/', 'provider' => 'location', 'directoryindex' => 'notindex.html', },
-            $_files_match_directory,
-          ]
-
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => $_directories,
-          }
-          file { '/var/www/files/foo':
-            ensure => directory,
-          }
-          file { '/var/www/files/foo/notindex.html':
-            ensure  => file,
-            content => "Hello Foo\\n",
-          }
-          file { '/var/www/files/private.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-          file { '/var/www/files/bar':
-            ensure => directory,
-          }
-          file { '/var/www/files/bar/bar.html':
-            ensure  => file,
-            content => "Hello Bar\\n",
-          }
-          host { 'files.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/foo/").stdout.should eq("Hello Foo\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/private.html", {:acceptable_exit_codes => 22}).stderr.should match(/curl: \(22\) The requested URL returned error: 403/)
-        shell("/usr/bin/curl -sSf files.example.net:80/bar/bar.html").stdout.should eq("Hello Bar\n")
-      end
-    end
-
-    describe 'SetHandler directive' do
-      it 'should configure a vhost with a SetHandler directive' do
-        pp = <<-EOS
-          class { 'apache': }
-          apache::mod { 'status': }
-          host { 'files.example.net': ip => '127.0.0.1', }
-          apache::vhost { 'files.example.net':
-            docroot     => '/var/www/files',
-            directories => [
-              { path => '/var/www/files', },
-              { path => '/server-status', provider => 'location', sethandler => 'server-status', },
-            ],
-          }
-          file { '/var/www/files/index.html':
-            ensure  => file,
-            content => "Hello World\\n",
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to files.example.net' do
-        shell("/usr/bin/curl -sSf files.example.net:80/index.html").stdout.should eq("Hello World\n")
-        shell("/usr/bin/curl -sSf files.example.net:80/server-status?auto").stdout.should match(/Scoreboard: /)
-      end
-    end
-  end
-
-  case fact('lsbdistcodename')
-  when 'precise', 'wheezy'
-    context 'vhost fallbackresouce example' do
-      it 'should configure a vhost with Fallbackresource' do
-        pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'fallback.example.net':
-          docroot         => '/var/www/fallback',
-          fallbackresource => '/index.html'
-        }
-        file { '/var/www/fallback/index.html':
-          ensure  => file,
-          content => "Hello World\\n",
-        }
-        host { 'fallback.example.net': ip => '127.0.0.1', }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe service($service_name) do
-        it { should be_enabled }
-        it { should be_running }
-      end
-
-      it 'should answer to fallback.example.net' do
-        shell("/usr/bin/curl fallback.example.net:80/Does/Not/Exist") do |r|
-          r.stdout.should == "Hello World\n"
-        end
-      end
-
-    end
-  else
-    # The current stable RHEL release (6.4) comes with Apache httpd 2.2.15
-    # That was released March 6, 2010.
-    # FallbackResource was backported to 2.2.16, and released July 25, 2010.
-    # Ubuntu Lucid (10.04) comes with apache2 2.2.14, released October 3, 2009.
-    # https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x/STATUS
-  end
-
-  context 'virtual_docroot hosting separate sites' do
-    it 'should configure a vhost with VirtualDocumentRoot' do
-      pp = <<-EOS
-        class { 'apache': }
-        apache::vhost { 'virt.example.com':
-          vhost_name      => '*',
-          serveraliases   => '*virt.example.com',
-          port            => '80',
-          docroot         => '/var/www/virt',
-          virtual_docroot => '/var/www/virt/%1',
-        }
-        host { 'virt.example.com': ip => '127.0.0.1', }
-        host { 'a.virt.example.com': ip => '127.0.0.1', }
-        host { 'b.virt.example.com': ip => '127.0.0.1', }
-        file { [ '/var/www/virt/a', '/var/www/virt/b', ]: ensure => directory, }
-        file { '/var/www/virt/a/index.html': ensure  => file, content => "Hello from a.virt\\n", }
-        file { '/var/www/virt/b/index.html': ensure  => file, content => "Hello from b.virt\\n", }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    it 'should answer to a.virt.example.com' do
-      shell("/usr/bin/curl a.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from a.virt\n"
-      end
-    end
-
-    it 'should answer to b.virt.example.com' do
-      shell("/usr/bin/curl b.virt.example.com:80", {:acceptable_exit_codes => 0}) do |r|
-        r.stdout.should == "Hello from b.virt\n"
-      end
-    end
-  end
-
-  context 'proxy_pass for alternative vhost' do
-    it 'should configure a local vhost and a proxy vhost' do
-      apply_manifest(%{
-        class { 'apache': default_vhost => false, }
-        apache::vhost { 'localhost':
-          docroot => '/var/www/local',
-          ip      => '127.0.0.1',
-          port    => '8888',
-        }
-        apache::listen { '*:80': }
-        apache::vhost { 'proxy.example.com':
-          docroot    => '/var/www',
-          port       => '80',
-          add_listen => false,
-          proxy_pass => {
-            'path' => '/',
-            'url'  => 'http://localhost:8888/subdir/',
-          },
-        }
-        host { 'proxy.example.com': ip => '127.0.0.1', }
-        file { ['/var/www/local', '/var/www/local/subdir']: ensure => directory, }
-        file { '/var/www/local/subdir/index.html':
-          ensure  => file,
-          content => "Hello from localhost\\n",
-        }
-      }, :catch_failures => true)
-    end
-
-    describe service($service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    it 'should get a response from the back end' do
-      shell("/usr/bin/curl --max-redirs 0 proxy.example.com:80") do |r|
-        r.stdout.should == "Hello from localhost\n"
-        r.exit_code.should == 0
-      end
-    end
-  end
-
-  describe 'ip_based' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          ip_based   => true,
-          servername => 'test.server',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      it { should_not contain 'NameVirtualHost test.server' }
-    end
-  end
-
-  describe 'add_listen' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': default_vhost => false }
-        host { 'testlisten.server': ip => '127.0.0.1' }
-        apache::listen { '81': }
-        apache::vhost { 'testlisten.server':
-          docroot    => '/tmp',
-          port       => '80',
-          add_listen => false,
-          servername => 'testlisten.server',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      it { should_not contain 'Listen 80' }
-      it { should contain 'Listen 81' }
-    end
-  end
-
-  describe 'docroot' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        user { 'test_owner': ensure => present, }
-        group { 'test_group': ensure => present, }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot       => '/tmp/test',
-          docroot_owner => 'test_owner',
-          docroot_group => 'test_group',
-          docroot_mode  => '0750',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/tmp/test') do
-      it { should be_directory }
-      it { should be_owned_by 'test_owner' }
-      it { should be_grouped_into 'test_group' }
-      it { should be_mode 750 }
-    end
-  end
-
-  describe 'default_vhost' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          default_vhost => true,
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file($ports_file) do
-      it { should be_file }
-      if fact('osfamily') == 'RedHat' and fact('operatingsystemmajrelease') == '7'
-        it { should_not contain 'NameVirtualHost test.server' }
-      elsif fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease') =~ /(14\.04|13\.10)/
-        it { should_not contain 'NameVirtualHost test.server' }
-      else
-        it { should contain 'NameVirtualHost test.server' }
-      end
-    end
-
-    describe file("#{$vhost_dir}/10-test.server.conf") do
-      it { should be_file }
-    end
-  end
-
-  describe 'options' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          options    => ['Indexes','FollowSymLinks', 'ExecCGI'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Options Indexes FollowSymLinks ExecCGI' }
-    end
-  end
-
-  describe 'override' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          override   => ['All'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'AllowOverride All' }
-    end
-  end
-
-  describe 'logroot' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          logroot    => '/tmp',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '  CustomLog "/tmp' }
-    end
-  end
-
-  ['access', 'error'].each do |logtype|
-    case logtype
-    when 'access'
-      logname = 'CustomLog'
-    when 'error'
-      logname = 'ErrorLog'
-    end
-
-    describe "#{logtype}_log" do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-            #{logtype}_log => false,
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should_not contain "  #{logname} \"/tmp" }
-      end
-    end
-
-    describe "#{logtype}_log_pipe" do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-            #{logtype}_log_pipe => '|/bin/sh',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain "  #{logname} \"|/bin/sh" }
-      end
-    end
-
-    describe "#{logtype}_log_syslog" do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot    => '/tmp',
-            logroot    => '/tmp',
-            #{logtype}_log_syslog => 'syslog',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain "  #{logname} \"syslog\"" }
-      end
-    end
-  end
-
-  describe 'access_log_format' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          logroot    => '/tmp',
-          access_log_syslog => 'syslog',
-          access_log_format => '%h %l',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'CustomLog "syslog" "%h %l"' }
-    end
-  end
-
-  describe 'access_log_env_var' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot            => '/tmp',
-          logroot            => '/tmp',
-          access_log_syslog  => 'syslog',
-          access_log_env_var => 'admin',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'CustomLog "syslog" combined env=admin' }
-    end
-  end
-
-  describe 'aliases' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          aliases => [{ alias => '/image', path => '/ftp/pub/image' }],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Alias /image "/ftp/pub/image"' }
-    end
-  end
-
-  describe 'scriptaliases' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          scriptaliases => [{ alias => '/myscript', path  => '/usr/share/myscript', }],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ScriptAlias /myscript "/usr/share/myscript"' }
-    end
-  end
-
-  describe 'proxy' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot    => '/tmp',
-          proxy_dest => 'test2',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ProxyPass          / test2/' }
-    end
-  end
-
-  describe 'actions' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot => '/tmp',
-          action  => 'php-fastcgi',
-        }
-      EOS
-      pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian'
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Action php-fastcgi /cgi-bin virtual' }
-    end
-  end
-
-  describe 'suphp' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          suphp_addhandler => '#{$suphp_handler}',
-          suphp_engine     => 'on',
-          suphp_configpath => '#{$suphp_configpath}',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain "suPHP_AddHandler #{$suphp_handler}" }
-      it { should contain 'suPHP_Engine on' }
-      it { should contain "suPHP_ConfigPath \"#{$suphp_configpath}\"" }
-    end
-  end
-
-  describe 'no_proxy_uris' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': service_ensure => stopped, }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          proxy_dest       => 'http://test2',
-          no_proxy_uris    => [ 'http://test2/test' ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'ProxyPass          / http://test2/' }
-      it { should contain 'ProxyPass        http://test2/test !' }
-    end
-  end
-
-  describe 'redirect' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          redirect_source  => ['/images'],
-          redirect_dest    => ['http://test.server/'],
-          redirect_status  => ['permanent'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Redirect permanent /images http://test.server/' }
-    end
-  end
-
-  # Passenger isn't even in EPEL on el-5
-  if default['platform'] !~ /^el-5/
-    describe 'rack_base_uris' do
-      if fact('osfamily') == 'RedHat'
-        it 'adds epel' do
-          pp = "class { 'epel': }"
-          apply_manifest(pp, :catch_failures => true)
-        end
-      end
-
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot          => '/tmp',
-            rack_base_uris  => ['/test'],
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain 'RackBaseURI /test' }
-      end
-    end
-  end
-
-
-  describe 'request_headers' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          request_headers  => ['append MirrorID "mirror 12"'],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'append MirrorID "mirror 12"' }
-    end
-  end
-
-  describe 'rewrite rules' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot          => '/tmp',
-          rewrites => [
-            { comment => 'test',
-              rewrite_cond => '%{HTTP_USER_AGENT} ^Lynx/ [OR]',
-              rewrite_rule => ['^index\.html$ welcome.html'],
-            }
-          ],
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '#test' }
-      it { should contain 'RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]' }
-      it { should contain 'RewriteRule ^index.html$ welcome.html' }
-    end
-  end
-
-  describe 'setenv/setenvif' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          setenv   => ['TEST /test'],
-          setenvif => ['Request_URI "\.gif$" object_is_image=gif']
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'SetEnv TEST /test' }
-      it { should contain 'SetEnvIf Request_URI "\.gif$" object_is_image=gif' }
-    end
-  end
-
-  describe 'block' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          block    => 'scm',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '<DirectoryMatch .*\.(svn|git|bzr)/.*>' }
-    end
-  end
-
-  describe 'wsgi' do
-    it 'import_script applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-	  wsgi_pass_authorization     => 'On',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'import_script applies cleanly', :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-      pp = <<-EOS
-        class { 'apache': }
-        class { 'apache::mod::wsgi': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot                     => '/tmp',
-          wsgi_application_group      => '%{GLOBAL}',
-          wsgi_daemon_process         => 'wsgi',
-          wsgi_daemon_process_options => {processes => '2'},
-          wsgi_import_script          => '/test1',
-          wsgi_import_script_options  => { application-group => '%{GLOBAL}', process-group => 'wsgi' },
-          wsgi_process_group          => 'nobody',
-          wsgi_script_aliases         => { '/test' => '/test1' },
-	  wsgi_pass_authorization     => 'On',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
-      it { should be_file }
-      it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
-      it { should contain 'WSGIDaemonProcess wsgi processes=2' }
-      it { should contain 'WSGIImportScript /test1 application-group=%{GLOBAL} process-group=wsgi' }
-      it { should contain 'WSGIProcessGroup nobody' }
-      it { should contain 'WSGIScriptAlias /test "/test1"' }
-      it { should contain 'WSGIPassAuthorization On' }
-    end
-  end
-
-  describe 'custom_fragment' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          custom_fragment => inline_template('#weird test string'),
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain '#weird test string' }
-    end
-  end
-
-  describe 'itk' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        apache::vhost { 'test.server':
-          docroot  => '/tmp',
-          itk      => { user => 'nobody', group => 'nobody' }
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'AssignUserId nobody nobody' }
-    end
-  end
-
-  # So what does this work on?
-  if default['platform'] !~ /^(debian-(6|7)|el-(5|6|7))/
-    describe 'fastcgi' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { 'apache': }
-          class { 'apache::mod::fastcgi': }
-          host { 'test.server': ip => '127.0.0.1' }
-          apache::vhost { 'test.server':
-            docroot        => '/tmp',
-            fastcgi_server => 'localhost',
-            fastcgi_socket => '/tmp/fast/1234',
-            fastcgi_dir    => '/tmp/fast',
-          }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file("#{$vhost_dir}/25-test.server.conf") do
-        it { should be_file }
-        it { should contain 'FastCgiExternalServer localhost -socket /tmp/fast/1234' }
-        it { should contain '<Directory "/tmp/fast">' }
-      end
-    end
-  end
-
-  describe 'additional_includes' do
-    it 'applies cleanly' do
-      pp = <<-EOS
-        if $::osfamily == 'RedHat' and $::selinux == 'true' {
-          exec { 'set_apache_defaults':
-            command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            require => Package[$semanage_package],
-          }
-          $semanage_package = $::operatingsystemmajrelease ? {
-            '5'       => 'policycoreutils',
-            'default' => 'policycoreutils-python',
-          }
-
-          package { $semanage_package: ensure => installed }
-          exec { 'restorecon_apache':
-            command => 'restorecon -Rv /apache_spec',
-            path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-            before  => Service['httpd'],
-            require => Class['apache'],
-          }
-        }
-        class { 'apache': }
-        host { 'test.server': ip => '127.0.0.1' }
-        file { '/apache_spec': ensure => directory, }
-        file { '/apache_spec/include': ensure => present, content => '#additional_includes' }
-        apache::vhost { 'test.server':
-          docroot             => '/apache_spec',
-          additional_includes => '/apache_spec/include',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file("#{$vhost_dir}/25-test.server.conf") do
-      it { should be_file }
-      it { should contain 'Include "/apache_spec/include"' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb
deleted file mode 100644
index f32fec80886..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/apache_spec.rb
+++ /dev/null
@@ -1,563 +0,0 @@
-require 'spec_helper'
-
-describe 'apache', :type => :class do
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd").with(
-      'notify' => 'Class[Apache::Service]',
-      'ensure' => 'installed'
-      )
-    }
-    it { should contain_user("www-data") }
-    it { should contain_group("www-data") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/etc/apache2/sites-enabled").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_file("/etc/apache2/mods-enabled").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_file("/etc/apache2/mods-available").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'false',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_concat("/etc/apache2/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'root',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-      )
-    }
-    # Assert that load files are placed and symlinked for these mods, but no conf file.
-    [
-      'auth_basic',
-      'authn_file',
-      'authz_default',
-      'authz_groupfile',
-      'authz_host',
-      'authz_user',
-      'dav',
-      'env'
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.load symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.load"
-      ) }
-      it { should_not contain_file("#{modname}.conf") }
-      it { should_not contain_file("#{modname}.conf symlink") }
-    end
-
-    context "with Apache version < 2.4" do
-      let :params do
-        { :apache_version => '2.2' }
-      end
-
-      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Include "/etc/apache2/conf\.d/\*\.conf"$} }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        { :apache_version => '2.4' }
-      end
-
-      it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^IncludeOptional "/etc/apache2/conf\.d/\*\.conf"$} }
-    end
-
-    # Assert that both load files and conf files are placed and symlinked for these mods
-    [
-      'alias',
-      'autoindex',
-      'dav_fs',
-      'deflate',
-      'dir',
-      'mime',
-      'negotiation',
-      'setenvif',
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.load symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.load",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.load"
-      ) }
-      it { should contain_file("#{modname}.conf").with(
-        'path'   => "/etc/apache2/mods-available/#{modname}.conf",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.conf symlink").with(
-        'path'   => "/etc/apache2/mods-enabled/#{modname}.conf",
-        'ensure' => 'link',
-        'target' => "/etc/apache2/mods-available/#{modname}.conf"
-      ) }
-    end
-
-    describe "Don't create user resource" do
-      context "when parameter manage_user is false" do
-        let :params do
-          { :manage_user => false }
-        end
-
-        it { should_not contain_user('www-data') }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^User www-data\n} }
-      end
-    end
-    describe "Don't create group resource" do
-      context "when parameter manage_group is false" do
-        let :params do
-          { :manage_group => false }
-        end
-
-        it { should_not contain_group('www-data') }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} }
-      end
-    end
-
-    describe "Add extra LogFormats" do
-      context "When parameter log_formats is a hash" do
-        let :params do
-          { :log_formats => {
-            'vhost_common'   => "%v %h %l %u %t \"%r\" %>s %b",
-            'vhost_combined' => "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
-          } }
-        end
-
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common\n} }
-        it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined\n} }
-      end
-    end
-
-    context "on Ubuntu" do
-      let :facts do
-        super().merge({
-          :operatingsystem => 'Ubuntu'
-        })
-      end
-
-      context "13.10" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '13.10',
-            :operatingsystemrelease => '13.10'
-          })
-        end
-        it { should contain_class('apache').with_apache_version('2.4') }
-      end
-      context "12.04" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '12.04',
-            :operatingsystemrelease => '12.04'
-          })
-        end
-        it { should contain_class('apache').with_apache_version('2.2') }
-      end
-      context "13.04" do
-        let :facts do
-          super().merge({
-            :lsbdistrelease         => '13.04',
-            :operatingsystemrelease => '13.04'
-          })
-        end
-        it { should contain_class('apache').with_apache_version('2.2') }
-      end
-    end
-  end
-  context "on a RedHat 5 OS" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '5',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd").with(
-      'notify' => 'Class[Apache::Service]',
-      'ensure' => 'installed'
-      )
-    }
-    it { should contain_user("apache") }
-    it { should contain_group("apache") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/etc/httpd/conf.d").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-      )
-    }
-    it { should contain_concat("/etc/httpd/conf/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'root',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-      )
-    }
-    describe "Alternate confd/mod/vhosts directory" do
-      let :params do
-        {
-          :vhost_dir => '/etc/httpd/site.d',
-          :confd_dir => '/etc/httpd/conf.d',
-          :mod_dir   => '/etc/httpd/mod.d',
-        }
-      end
-
-      ['mod.d','site.d','conf.d'].each do |dir|
-        it { should contain_file("/etc/httpd/#{dir}").with(
-          'ensure'  => 'directory',
-          'recurse' => 'true',
-          'purge'   => 'true',
-          'notify'  => 'Class[Apache::Service]',
-          'require' => 'Package[httpd]'
-        ) }
-      end
-
-      # Assert that load files are placed for these mods, but no conf file.
-      [
-        'auth_basic',
-        'authn_file',
-        'authz_default',
-        'authz_groupfile',
-        'authz_host',
-        'authz_user',
-        'dav',
-        'env',
-      ].each do |modname|
-        it { should contain_file("#{modname}.load").with_path(
-          "/etc/httpd/mod.d/#{modname}.load"
-        ) }
-        it { should_not contain_file("#{modname}.conf").with_path(
-          "/etc/httpd/mod.d/#{modname}.conf"
-        ) }
-      end
-
-      # Assert that both load files and conf files are placed for these mods
-      [
-        'alias',
-        'autoindex',
-        'dav_fs',
-        'deflate',
-        'dir',
-        'mime',
-        'negotiation',
-        'setenvif',
-      ].each do |modname|
-        it { should contain_file("#{modname}.load").with_path(
-          "/etc/httpd/mod.d/#{modname}.load"
-        ) }
-        it { should contain_file("#{modname}.conf").with_path(
-          "/etc/httpd/mod.d/#{modname}.conf"
-        ) }
-      end
-
-      context "with Apache version < 2.4" do
-        let :params do
-          { :apache_version => '2.2' }
-        end
-
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/conf\.d/\*\.conf"$} }
-      end
-
-      context "with Apache version >= 2.4" do
-        let :params do
-          { :apache_version => '2.4' }
-        end
-
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^IncludeOptional "/etc/httpd/conf\.d/\*\.conf"$} }
-      end
-
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/site\.d/\*"$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.conf"$} }
-      it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Include "/etc/httpd/mod\.d/\*\.load"$} }
-    end
-
-    describe "Alternate conf.d directory" do
-      let :params do
-        { :confd_dir => '/etc/httpd/special_conf.d' }
-      end
-
-      it { should contain_file("/etc/httpd/special_conf.d").with(
-        'ensure'  => 'directory',
-        'recurse' => 'true',
-        'purge'   => 'true',
-        'notify'  => 'Class[Apache::Service]',
-        'require' => 'Package[httpd]'
-      ) }
-    end
-
-    describe "Alternate mpm_modules" do
-      context "when declaring mpm_module is false" do
-        let :params do
-          { :mpm_module => false }
-        end
-        it 'should not declare mpm modules' do
-          should_not contain_class('apache::mod::event')
-          should_not contain_class('apache::mod::itk')
-          should_not contain_class('apache::mod::peruser')
-          should_not contain_class('apache::mod::prefork')
-          should_not contain_class('apache::mod::worker')
-        end
-      end
-      context "when declaring mpm_module => prefork" do
-        let :params do
-          { :mpm_module => 'prefork' }
-        end
-        it { should contain_class('apache::mod::prefork') }
-        it { should_not contain_class('apache::mod::event') }
-        it { should_not contain_class('apache::mod::itk') }
-        it { should_not contain_class('apache::mod::peruser') }
-        it { should_not contain_class('apache::mod::worker') }
-      end
-      context "when declaring mpm_module => worker" do
-        let :params do
-          { :mpm_module => 'worker' }
-        end
-        it { should contain_class('apache::mod::worker') }
-        it { should_not contain_class('apache::mod::event') }
-        it { should_not contain_class('apache::mod::itk') }
-        it { should_not contain_class('apache::mod::peruser') }
-        it { should_not contain_class('apache::mod::prefork') }
-      end
-      context "when declaring mpm_module => breakme" do
-        let :params do
-          { :mpm_module => 'breakme' }
-        end
-        it { expect { subject }.to raise_error Puppet::Error, /does not match/ }
-      end
-    end
-
-    describe "different templates for httpd.conf" do
-      context "with default" do
-        let :params do
-          { :conf_template => 'apache/httpd.conf.erb' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^# Security\n} }
-      end
-      context "with non-default" do
-        let :params do
-          { :conf_template => 'site_apache/fake.conf.erb' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Fake template for rspec.$} }
-      end
-    end
-
-    describe "default mods" do
-      context "without" do
-        let :params do
-          { :default_mods => false }
-        end
-
-        it { should contain_apache__mod('authz_host') }
-        it { should_not contain_apache__mod('env') }
-      end
-      context "custom" do
-        let :params do
-          { :default_mods => [
-            'info',
-            'alias',
-            'mime',
-            'env',
-            'setenv',
-            'expires',
-          ]}
-        end
-
-        it { should contain_apache__mod('authz_host') }
-        it { should contain_apache__mod('env') }
-        it { should contain_class('apache::mod::info') }
-        it { should contain_class('apache::mod::mime') }
-      end
-    end
-    describe "Don't create user resource" do
-      context "when parameter manage_user is false" do
-        let :params do
-          { :manage_user => false }
-        end
-
-        it { should_not contain_user('apache') }
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^User apache\n} }
-      end
-    end
-    describe "Don't create group resource" do
-      context "when parameter manage_group is false" do
-        let :params do
-          { :manage_group => false }
-        end
-
-        it { should_not contain_group('apache') }
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^Group apache\n} }
-
-      end
-    end
-    describe "sendfile" do
-      context "with invalid value" do
-        let :params do
-          { :sendfile => 'foo' }
-        end
-        it "should fail" do
-          expect do
-            subject
-          end.to raise_error(Puppet::Error, /"foo" does not match/)
-        end
-      end
-      context "On" do
-        let :params do
-          { :sendfile => 'On' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile On\n} }
-      end
-      context "Off" do
-        let :params do
-          { :sendfile => 'Off' }
-        end
-        it { should contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} }
-      end
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::package").with({'ensure' => 'present'}) }
-    it { should contain_user("www") }
-    it { should contain_group("www") }
-    it { should contain_class("apache::service") }
-    it { should contain_file("/usr/local/etc/apache22/Vhosts").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { should contain_file("/usr/local/etc/apache22/Modules").with(
-      'ensure'  => 'directory',
-      'recurse' => 'true',
-      'purge'   => 'true',
-      'notify'  => 'Class[Apache::Service]',
-      'require' => 'Package[httpd]'
-    ) }
-    it { should contain_concat("/usr/local/etc/apache22/ports.conf").with(
-      'owner'   => 'root',
-      'group'   => 'wheel',
-      'mode'    => '0644',
-      'notify'  => 'Class[Apache::Service]'
-    ) }
-    # Assert that load files are placed for these mods, but no conf file.
-    [
-      'auth_basic',
-      'authn_file',
-      'authz_default',
-      'authz_groupfile',
-      'authz_host',
-      'authz_user',
-      'dav',
-      'env'
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should_not contain_file("#{modname}.conf") }
-    end
-
-    # Assert that both load files and conf files are placed for these mods
-    [
-      'alias',
-      'autoindex',
-      'dav_fs',
-      'deflate',
-      'dir',
-      'mime',
-      'negotiation',
-      'setenvif',
-    ].each do |modname|
-      it { should contain_file("#{modname}.load").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.load",
-        'ensure' => 'file'
-      ) }
-      it { should contain_file("#{modname}.conf").with(
-        'path'   => "/usr/local/etc/apache22/Modules/#{modname}.conf",
-        'ensure' => 'file'
-      ) }
-    end
-  end
-  context 'on all OSes' do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context 'default vhost defaults' do
-      it { should contain_apache__vhost('default').with_ensure('present') }
-      it { should contain_apache__vhost('default-ssl').with_ensure('absent') }
-    end
-    context 'without default non-ssl vhost' do
-      let :params do {
-        :default_vhost  => false
-      }
-      end
-      it { should contain_apache__vhost('default').with_ensure('absent') }
-    end
-    context 'with default ssl vhost' do
-      let :params do {
-          :default_ssl_vhost  => true
-        }
-      end
-      it { should contain_apache__vhost('default-ssl').with_ensure('present') }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb
deleted file mode 100644
index eceadca4a72..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/dev_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::dev', :type => :class do
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("libaprutil1-dev") }
-    it { should contain_package("libapr1-dev") }
-    it { should contain_package("apache2-prefork-dev") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("httpd-devel") }
-  end
-  context "on a FreeBSD OS" do
-    let :pre_condition do
-      'include apache::package'
-    end
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-      }
-    end
-    it { should contain_class("apache::params") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
deleted file mode 100644
index 6e2c16b7e9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/auth_kerb_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::auth_kerb', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("libapache2-mod-auth-kerb") }
-  end
-  context "on a RedHat OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("mod_auth_kerb") }
-  end
-  context "on a FreeBSD OS", :compile do
-    let :facts do
-      {
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("auth_kerb") }
-    it { should contain_package("www/mod_auth_kerb2") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
deleted file mode 100644
index d9ca5398b15..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/authnz_ldap_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::authnz_ldap', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'Debian',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::mod::ldap") }
-    it { should contain_apache__mod('authnz_ldap') }
-
-    context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-    end
-
-    context 'verifyServerCert = false' do
-      let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
-    end
-
-    context 'verifyServerCert = wrong' do
-      let(:params) { { :verifyServerCert => 'wrong' } }
-      it 'should raise an error' do
-        expect { should raise_error Puppet::Error }
-      end
-    end
-  end #Debian
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :operatingsystem        => 'RedHat',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_class("apache::mod::ldap") }
-    it { should contain_apache__mod('authnz_ldap') }
-
-    context 'default verifyServerCert' do
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert On$/) }
-    end
-
-    context 'verifyServerCert = false' do
-      let(:params) { { :verifyServerCert => false } }
-      it { should contain_file('authnz_ldap.conf').with_content(/^LDAPVerifyServerCert Off$/) }
-    end
-
-    context 'verifyServerCert = wrong' do
-      let(:params) { { :verifyServerCert => 'wrong' } }
-      it 'should raise an error' do
-        expect { should raise_error Puppet::Error }
-      end
-    end
-  end # Redhat
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
deleted file mode 100644
index 4898cdece1c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dav_svn_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::dav_svn', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("libapache2-svn") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("mod_dav_svn") }
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('dav_svn') }
-    it { should contain_package("devel/subversion") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
deleted file mode 100644
index f8eb8810131..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/deflate_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific contexts
-def general_deflate_specs
-  it { should contain_apache__mod("deflate") }
-
-  it do
-    should contain_file("deflate.conf").with_content(
-      "AddOutputFilterByType DEFLATE text/html text/plain text/xml\n"\
-      "AddOutputFilterByType DEFLATE text/css\n"\
-      "AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript\n"\
-      "AddOutputFilterByType DEFLATE application/rss+xml\n"\
-      "\n"\
-      "DeflateFilterNote Input instream\n"\
-      "DeflateFilterNote Output outstream\n"\
-      "DeflateFilterNote Ratio ratio\n"
-    )
-  end
-end
-
-describe 'apache::mod::deflate', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystem        => 'Debian',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_deflate_specs()
-
-    it { should contain_file("deflate.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/deflate.conf',
-    } ) }
-    it { should contain_file("deflate.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/deflate.conf',
-    } ) }
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :osfamily               => 'RedHat',
-        :operatingsystem        => 'RedHat',
-        :operatingsystemrelease => '6',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_deflate_specs()
-
-    it { should contain_file("deflate.conf").with_path("/etc/httpd/conf.d/deflate.conf") }
-  end
-
-  context "On a FreeBSD OS with default params" do
-    let :facts do
-      {
-        :id                     => 'root',
-        :osfamily               => 'FreeBSD',
-        :operatingsystem        => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_deflate_specs()
-
-    it { should contain_file("deflate.conf").with({
-      :ensure => 'file',
-      :path   => '/usr/local/etc/apache22/Modules/deflate.conf',
-    } ) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb
deleted file mode 100644
index 0de62afcb53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dev_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::dev', :type => :class do
-  [
-    ['RedHat',  '6', 'Santiago'],
-    ['Debian',  '6', 'squeeze'],
-    ['FreeBSD', '9', 'FreeBSD'],
-  ].each do |osfamily, operatingsystemrelease, lsbdistcodename|
-    if osfamily == 'FreeBSD'
-      let :pre_condition do
-        'include apache::package'
-      end
-    end
-    context "on a #{osfamily} OS" do
-      let :facts do
-        {
-          :lsbdistcodename        => lsbdistcodename,
-          :osfamily               => osfamily,
-          :operatingsystem        => osfamily,
-          :operatingsystemrelease => operatingsystemrelease,
-        }
-      end
-      it { should contain_class('apache::dev') }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb
deleted file mode 100644
index 8bcdc0b6bea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/dir_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::dir', :type => :class do
-  let :pre_condition do
-    'class { "apache":
-      default_mods => false,
-    }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :lsbdistcodename        => 'squeeze',
-      }
-    end
-    context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
-      end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Redhat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
-      end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "passing no parameters" do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('dir') }
-      it { should contain_file('dir.conf').with_content(/^DirectoryIndex /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html /) }
-      it { should contain_file('dir.conf').with_content(/ index\.html\.var /) }
-      it { should contain_file('dir.conf').with_content(/ index\.cgi /) }
-      it { should contain_file('dir.conf').with_content(/ index\.pl /) }
-      it { should contain_file('dir.conf').with_content(/ index\.php /) }
-      it { should contain_file('dir.conf').with_content(/ index\.xhtml$/) }
-    end
-    context "passing indexes => ['example.txt','fearsome.aspx']" do
-      let :params do
-        {:indexes => ['example.txt','fearsome.aspx']}
-      end
-      it { should contain_file('dir.conf').with_content(/ example\.txt /) }
-      it { should contain_file('dir.conf').with_content(/ fearsome\.aspx$/) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb
deleted file mode 100644
index 850bd5c55b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/event_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::event', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('event') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/event.conf").with_ensure('file') }
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :lsbdistcodename        => 'squeeze',
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('event') }
-    it { should contain_file("/etc/apache2/mods-available/event.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/event.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/event.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/event.load") }
-
-      it { should contain_package("apache2-mpm-event") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/event.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/event.load").with_ensure('link') }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_class("apache::params") }
-      it { should_not contain_apache__mod('worker') }
-      it { should_not contain_apache__mod('prefork') }
-
-      it { should contain_file("/etc/httpd/conf.d/event.conf").with_ensure('file') }
-
-      it { should contain_file("/etc/httpd/conf.d/event.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_event_module modules/mod_mpm_event.so\n",
-        })
-      }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
deleted file mode 100644
index 98ad2e87060..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fastcgi_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::fastcgi', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fastcgi') }
-    it { should contain_package("libapache2-mod-fastcgi") }
-    it { should contain_file('fastcgi.conf') }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fastcgi') }
-    it { should contain_package("mod_fastcgi") }
-    it { should_not contain_file('fastcgi.conf') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
deleted file mode 100644
index 16719415d56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/fcgid_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::fcgid', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fcgid') }
-    it { should contain_package("libapache2-mod-fcgid") }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe 'without parameters' do
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('fcgid') }
-      it { should contain_package("mod_fcgid") }
-    end
-
-    describe 'with parameters' do
-      let :params do {
-        :options                     => {
-          'FcgidIPCDir'               => '/var/run/fcgidsock',
-          'SharememPath'              => '/var/run/fcgid_shm',
-          'FcgidMinProcessesPerClass' => '0',
-          'AddHandler'                => 'fcgid-script .fcgi',
-        }
-      } end
-
-      it 'should contain the correct config' do
-        content = subject.resource('file', 'fcgid.conf').send(:parameters)[:content]
-        content.split("\n").reject { |c| c =~ /(^#|^$)/ }.should == [
-          '<IfModule mod_fcgid.c>',
-          '  AddHandler fcgid-script .fcgi',
-          '  FcgidIPCDir /var/run/fcgidsock',
-          '  FcgidMinProcessesPerClass 0',
-          '  SharememPath /var/run/fcgid_shm',
-          '</IfModule>',
-        ]
-      end
-    end
-  end
-
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('fcgid') }
-    it { should contain_package("www/mod_fcgid") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb
deleted file mode 100644
index ed078c519fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/info_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific contexts
-def general_info_specs
-  it { should contain_apache__mod("info") }
-
-  it do
-    should contain_file("info.conf").with_content(
-      "<Location /server-info>\n"\
-      "    SetHandler server-info\n"\
-      "    Order deny,allow\n"\
-      "    Deny from all\n"\
-      "    Allow from 127.0.0.1 ::1\n"\
-      "</Location>\n"
-    )
-  end
-end
-
-describe 'apache::mod::info', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_info_specs()
-
-    it { should contain_file("info.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/info.conf',
-    } ) }
-    it { should contain_file("info.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/info.conf',
-    } ) }
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_info_specs()
-
-    it { should contain_file("info.conf").with_path("/etc/httpd/conf.d/info.conf") }
-  end
-
-  context "On a FreeBSD OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    # Load the more generic tests for this context
-    general_info_specs()
-
-    it { should contain_file("info.conf").with({
-      :ensure => 'file',
-      :path   => '/usr/local/etc/apache22/Modules/info.conf',
-    } ) }
-  end
-
-  context "with $allow_from => ['10.10.10.10','11.11.11.11']" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      { :allow_from => ['10.10.10.10','11.11.11.11'] }
-    end
-    it do
-      should contain_file("info.conf").with_content(
-        "<Location /server-info>\n"\
-        "    SetHandler server-info\n"\
-        "    Order deny,allow\n"\
-        "    Deny from all\n"\
-        "    Allow from 10.10.10.10 11.11.11.11\n"\
-        "</Location>\n"
-      )
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb
deleted file mode 100644
index d9fe2e3d128..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/itk_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::itk', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('itk') }
-    it { should contain_file("/etc/apache2/mods-available/itk.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/itk.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/itk.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/itk.load") }
-
-      it { should contain_package("apache2-mpm-itk") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/itk.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_itk_module /usr/lib/apache2/modules/mod_mpm_itk.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/itk.load").with_ensure('link') }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('itk') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
deleted file mode 100644
index e9984ecbaf5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_magic_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific contexts
-def general_mime_magic_specs
-  it { should contain_apache__mod("mime_magic") }
-end
-
-describe 'apache::mod::mime_magic', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_magic_specs()
-
-    it do
-      should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/etc/apache2/magic\"\n"
-      )
-    end
-
-    it { should contain_file("mime_magic.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/mime_magic.conf',
-    } ) }
-    it { should contain_file("mime_magic.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/mime_magic.conf',
-    } ) }
-
-    context "with magic_file => /tmp/Debian_magic" do
-      let :params do
-        { :magic_file => "/tmp/Debian_magic" }
-      end
-
-      it do
-        should contain_file("mime_magic.conf").with_content(
-          "MIMEMagicFile \"/tmp/Debian_magic\"\n"
-        )
-      end
-    end
-
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_magic_specs()
-
-    it do
-      should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/etc/httpd/conf/magic\"\n"
-      )
-    end
-
-    it { should contain_file("mime_magic.conf").with_path("/etc/httpd/conf.d/mime_magic.conf") }
-
-  end
-
-  context "with magic_file => /tmp/magic" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    let :params do
-      { :magic_file => "/tmp/magic" }
-    end
-
-    it do
-      should contain_file("mime_magic.conf").with_content(
-        "MIMEMagicFile \"/tmp/magic\"\n"
-      )
-    end
-  end
-
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb
deleted file mode 100644
index 2b6154fb813..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/mime_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-# This function is called inside the OS specific conte, :compilexts
-def general_mime_specs
-  it { should contain_apache__mod("mime") }
-end
-
-describe 'apache::mod::mime', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "On a Debian OS with default params", :compile do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_specs()
-
-    it { should contain_file("mime.conf").with_path('/etc/apache2/mods-available/mime.conf') }
-
-  end
-
-  context "on a RedHat OS with default params", :compile do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    general_mime_specs()
-
-    it { should contain_file("mime.conf").with_path("/etc/httpd/conf.d/mime.conf") }
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
deleted file mode 100644
index 9439f719e65..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/pagespeed_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::pagespeed', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('pagespeed') }
-    it { should contain_package("mod-pagespeed-stable") }
-    it { should contain_file('pagespeed.conf') }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('pagespeed') }
-    it { should contain_package("mod-pagespeed-stable") }
-    it { should contain_file('pagespeed.conf') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
deleted file mode 100644
index 3bf7d299520..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/passenger_spec.rb
+++ /dev/null
@@ -1,230 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::passenger', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("libapache2-mod-passenger") }
-    it { should contain_file('passenger.load').with({
-      'path' => '/etc/apache2/mods-available/passenger.load',
-    }) }
-    it { should contain_file('passenger.conf').with({
-      'path' => '/etc/apache2/mods-available/passenger.conf',
-    }) }
-    it { should contain_file('passenger_package.conf').with_ensure('absent') }
-    describe "with passenger_root => '/usr/lib/example'" do
-      let :params do
-        { :passenger_root => '/usr/lib/example' }
-      end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/example"}) }
-    end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
-      end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
-    end
-    describe "with passenger_default_ruby => /usr/lib/example/ruby1.9.3" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby1.9.3' }
-      end
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
-    end
-    describe "with passenger_high_performance => on" do
-      let :params do
-        { :passenger_high_performance => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerHighPerformance on$/) }
-    end
-    describe "with passenger_pool_idle_time => 1200" do
-      let :params do
-        { :passenger_pool_idle_time => 1200 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerPoolIdleTime 1200$/) }
-    end
-    describe "with passenger_max_requests => 20" do
-      let :params do
-        { :passenger_max_requests => 20 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerMaxRequests 20$/) }
-    end
-    describe "with passenger_stat_throttle_rate => 10" do
-      let :params do
-        { :passenger_stat_throttle_rate => 10 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerStatThrottleRate 10$/) }
-    end
-    describe "with passenger_max_pool_size => 16" do
-      let :params do
-        { :passenger_max_pool_size => 16 }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
-    end
-    describe "with rack_autodetect => on" do
-      let :params do
-        { :rack_autodetect => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  RackAutoDetect on$/) }
-    end
-    describe "with rails_autodetect => on" do
-      let :params do
-        { :rails_autodetect => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  RailsAutoDetect on$/) }
-    end
-    describe "with passenger_use_global_queue => on" do
-      let :params do
-        { :passenger_use_global_queue => 'on' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
-    end
-    describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
-      let :params do
-        { :mod_path => '/usr/lib/foo/mod_foo.so' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
-    end
-    describe "with mod_lib_path => '/usr/lib/foo'" do
-      let :params do
-        { :mod_lib_path => '/usr/lib/foo' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
-    end
-    describe "with mod_lib => 'mod_foo.so'" do
-      let :params do
-        { :mod_lib => 'mod_foo.so' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
-    end
-    describe "with mod_id => 'mod_foo'" do
-      let :params do
-        { :mod_id => 'mod_foo' }
-      end
-      it { should contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
-    end
-
-    context "with Ubuntu 12.04 defaults" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '12.04',
-          :operatingsystem        => 'Ubuntu',
-          :lsbdistrelease         => '12.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
-    end
-
-    context "with Ubuntu 14.04 defaults" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '14.04',
-          :operatingsystem        => 'Ubuntu',
-          :lsbdistrelease         => '14.04',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
-    end
-
-    context "with Debian 7 defaults" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '7.3',
-          :operatingsystem        => 'Debian',
-          :lsbdistcodename        => 'wheezy',
-          :concat_basedir         => '/dne',
-          :id                     => 'root',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
-      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
-      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
-    end
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("mod_passenger") }
-    it { should contain_file('passenger_package.conf').with({
-      'path' => '/etc/httpd/conf.d/passenger.conf',
-    }) }
-    it { should contain_file('passenger_package.conf').without_content }
-    it { should contain_file('passenger_package.conf').without_source }
-    it { should contain_file('passenger.load').with({
-      'path' => '/etc/httpd/conf.d/passenger.load',
-    }) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
-    describe "with passenger_root => '/usr/lib/example'" do
-      let :params do
-        { :passenger_root => '/usr/lib/example' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
-    end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('passenger') }
-    it { should contain_package("www/rubygem-passenger") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb
deleted file mode 100644
index f674318e285..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/perl_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::perl', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("libapache2-mod-perl2") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("mod_perl") }
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('perl') }
-    it { should contain_package("www/mod_perl2") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
deleted file mode 100644
index e1ee004e93a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/peruser_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::peruser', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('peruser') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/peruser.conf").with_ensure('file') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb
deleted file mode 100644
index e42f4fcfe4b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/php_spec.rb
+++ /dev/null
@@ -1,224 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::php', :type => :class do
-  describe "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "with mpm_module => prefork" do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("libapache2-mod-php5") }
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module /usr/lib/apache2/modules/libphp5.so\n"
-      ) }
-    end
-    context 'with mpm_module => worker' do
-      let :pre_condition do
-        'class { "apache": mpm_module => worker, }'
-      end
-      it 'should raise an error' do
-        expect { subject }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
-      end
-    end
-  end
-  describe "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "with default params" do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("php") }
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module modules/libphp5.so\n"
-      ) }
-    end
-    context "with alternative package name" do let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :package_name => 'php54'}
-      end
-      it { should contain_package("php54") }
-    end
-    context "with alternative path" do let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :path => 'alternative-path'}
-      end
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module alternative-path\n"
-      ) }
-    end
-    context "with alternative extensions" do let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :extensions => ['.php','.php5']}
-      end
-      it { should contain_file("php5.conf").with_content(/AddHandler php5-script .php .php5\n/) }
-    end
-    context "with specific version" do
-      let :pre_condition do
-        'class { "apache": }'
-      end
-      let :params do
-        { :package_ensure => '5.3.13'}
-      end
-      it { should contain_package("php").with(
-        :ensure => '5.3.13'
-      ) }
-    end
-    context "with mpm_module => prefork" do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("php") }
-      it { should contain_file("php5.load").with(
-        :content => "LoadModule php5_module modules/libphp5.so\n"
-      ) }
-    end
-  end
-  describe "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    context "with mpm_module => prefork" do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      it { should contain_class('apache::params') }
-      it { should contain_apache__mod('php5') }
-      it { should contain_package("lang/php5") }
-      it { should contain_file('php5.load') }
-    end
-    # FIXME: not sure about the following context
-    context 'with mpm_module => worker' do
-      let :pre_condition do
-        'class { "apache": mpm_module => worker, }'
-      end
-      it 'should raise an error' do
-        expect { subject.should contain_apache__mod('php5') }.to raise_error Puppet::Error, /mpm_module => 'prefork'/
-      end
-    end
-  end
-  describe "OS independent tests" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-      }
-    end
-    context 'with content param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { :content => 'somecontent' }
-      end
-      it { should contain_file('php5.conf').with(
-        :content => 'somecontent'
-      ) }
-    end
-    context 'with template param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { :template => 'apache/mod/php5.conf.erb' }
-      end
-      it { should contain_file('php5.conf').with(
-        :content => /^# PHP is an HTML-embedded scripting language which attempts to make it/
-      ) }
-    end
-    context 'with source param' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        { :source => 'some-path' }
-      end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
-    end
-    context 'content has priority over template' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          :template => 'apache/mod/php5.conf.erb',
-          :content  => 'somecontent'
-        }
-      end
-      it { should contain_file('php5.conf').with(
-        :content => 'somecontent'
-      ) }
-    end
-    context 'source has priority over template' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          :template => 'apache/mod/php5.conf.erb',
-          :source   => 'some-path'
-        }
-      end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
-    end
-    context 'source has priority over content' do
-      let :pre_condition do
-        'class { "apache": mpm_module => prefork, }'
-      end
-      let :params do
-        {
-          :content => 'somecontent',
-          :source  => 'some-path'
-        }
-      end
-      it { should contain_file('php5.conf').with(
-        :source => 'some-path'
-      ) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
deleted file mode 100644
index 847aecf9c70..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/prefork_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::prefork', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/etc/apache2/mods-available/prefork.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/prefork.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/prefork.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/prefork.load") }
-
-      it { should contain_package("apache2-mpm-prefork") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/prefork.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/prefork.load").with_ensure('link') }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/etc/httpd/conf.d/prefork.conf").with_ensure('file') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should contain_file_line("/etc/sysconfig/httpd prefork enable").with({
-        'require' => 'Package[httpd]',
-        })
-      }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should_not contain_apache__mod('event') }
-
-      it { should contain_file("/etc/httpd/conf.d/prefork.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so\n",
-        })
-      }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('prefork') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/prefork.conf").with_ensure('file') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
deleted file mode 100644
index 77e1ab15de8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/proxy_html_spec.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::proxy_html', :type => :class do
-  let :pre_condition do
-    [
-      'include apache',
-      'include apache::mod::proxy',
-      'include apache::mod::proxy_http',
-    ]
-  end
-  context "on a Debian OS" do
-    shared_examples "debian" do |loadfiles|
-      it { should contain_class("apache::params") }
-      it { should contain_apache__mod('proxy_html').with(:loadfiles => loadfiles) }
-      it { should contain_package("libapache2-mod-proxy-html") }
-    end
-    let :facts do
-      {
-        :osfamily        => 'Debian',
-        :concat_basedir  => '/dne',
-        :architecture    => 'i386',
-        :lsbdistcodename => 'squeeze',
-        :operatingsystem => 'Debian',
-        :id              => 'root',
-        :kernel          => 'Linux',
-        :path            => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        :hardwaremodel   => 'i386',
-      }
-    end
-
-    context "on squeeze" do
-      let(:facts) { super().merge({ :operatingsystemrelease => '6' }) }
-      it_behaves_like "debian", ['/usr/lib/libxml2.so.2']
-    end
-    context "on wheezy" do
-      let(:facts) { super().merge({ :operatingsystemrelease => '7' }) }
-      context "i386" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'i686',
-          :architecture  => 'i386'
-        })}
-        it_behaves_like "debian", ["/usr/lib/i386-linux-gnu/libxml2.so.2"]
-      end
-      context "x64" do
-        let(:facts) { super().merge({
-          :hardwaremodel => 'x86_64',
-          :architecture  => 'amd64'
-        })}
-        it_behaves_like "debian", ["/usr/lib/x86_64-linux-gnu/libxml2.so.2"]
-      end
-    end
-  end
-  context "on a RedHat OS", :compile do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { should contain_package("mod_proxy_html") }
-  end
-  context "on a FreeBSD OS", :compile do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('proxy_html').with(:loadfiles => nil) }
-    it { should contain_package("www/mod_proxy_html") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb
deleted file mode 100644
index d2d1fca7b93..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/python_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::python', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("libapache2-mod-python") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("mod_python") }
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod("python") }
-    it { should contain_package("www/mod_python3") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
deleted file mode 100644
index 949dd5702b4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/rpaf_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::rpaf', :type => :class do
-  let :pre_condition do
-    [
-      'include apache',
-    ]
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('rpaf') }
-    it { should contain_package("libapache2-mod-rpaf") }
-    it { should contain_file('rpaf.conf').with({
-      'path' => '/etc/apache2/mods-available/rpaf.conf',
-    }) }
-    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
-
-    describe "with sethostname => true" do
-      let :params do
-        { :sethostname => 'true' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
-    end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
-      let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
-    end
-    describe "with header => X-Real-IP" do
-      let :params do
-        { :header => 'X-Real-IP' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('rpaf') }
-    it { should contain_package("www/mod_rpaf2") }
-    it { should contain_file('rpaf.conf').with({
-      'path' => '/usr/local/etc/apache22/Modules/rpaf.conf',
-    }) }
-    it { should contain_file('rpaf.conf').with_content(/^RPAFenable On$/) }
-
-    describe "with sethostname => true" do
-      let :params do
-        { :sethostname => 'true' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFsethostname On$/) }
-    end
-    describe "with proxy_ips => [ 10.42.17.8, 10.42.18.99 ]" do
-      let :params do
-        { :proxy_ips => [ '10.42.17.8', '10.42.18.99' ] }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFproxy_ips 10.42.17.8 10.42.18.99$/) }
-    end
-    describe "with header => X-Real-IP" do
-      let :params do
-        { :header => 'X-Real-IP' }
-      end
-      it { should contain_file('rpaf.conf').with_content(/^RPAFheader X-Real-IP$/) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb
deleted file mode 100644
index e7e6e1d6401..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/speling_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::speling', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_apache__mod('speling') }
-  end
-
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_apache__mod('speling') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
deleted file mode 100644
index 11e7964dedb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/ssl_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::ssl', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context 'on an unsupported OS' do
-    let :facts do
-      {
-        :osfamily               => 'Magic',
-        :operatingsystemrelease => '0',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Magic',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { expect { subject }.to raise_error(Puppet::Error, /Unsupported osfamily:/) }
-  end
-
-  context 'on a RedHat OS' do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-    it { should contain_package('mod_ssl') }
-  end
-
-  context 'on a Debian OS' do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-    it { should_not contain_package('libapache2-mod-ssl') }
-  end
-
-  context 'on a FreeBSD OS' do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class('apache::params') }
-    it { should contain_apache__mod('ssl') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb
deleted file mode 100644
index 5023bc7bf17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/status_spec.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-require 'spec_helper'
-
-# Helper function for testing the contents of `status.conf`
-def status_conf_spec(allow_from, extended_status)
-  it do
-    should contain_file("status.conf").with_content(
-      "<Location /server-status>\n"\
-      "    SetHandler server-status\n"\
-      "    Order deny,allow\n"\
-      "    Deny from all\n"\
-      "    Allow from #{Array(allow_from).join(' ')}\n"\
-      "</Location>\n"\
-      "ExtendedStatus #{extended_status}\n"\
-      "\n"\
-      "<IfModule mod_proxy.c>\n"\
-      "    # Show Proxy LoadBalancer status in mod_status\n"\
-      "    ProxyStatus On\n"\
-      "</IfModule>\n"
-    )
-  end
-end
-
-describe 'apache::mod::status', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-
-  context "on a Debian OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_apache__mod("status") }
-
-    status_conf_spec(["127.0.0.1", "::1"], "On")
-
-    it { should contain_file("status.conf").with({
-      :ensure => 'file',
-      :path   => '/etc/apache2/mods-available/status.conf',
-    } ) }
-
-    it { should contain_file("status.conf symlink").with({
-      :ensure => 'link',
-      :path   => '/etc/apache2/mods-enabled/status.conf',
-    } ) }
-
-  end
-
-  context "on a RedHat OS with default params" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    it { should contain_apache__mod("status") }
-
-    status_conf_spec(["127.0.0.1", "::1"], "On")
-
-    it { should contain_file("status.conf").with_path("/etc/httpd/conf.d/status.conf") }
-
-  end
-
-  context "with custom parameters $allow_from => ['10.10.10.10','11.11.11.11'], $extended_status => 'Off'" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      {
-        :allow_from => ['10.10.10.10','11.11.11.11'],
-        :extended_status => 'Off',
-      }
-    end
-
-    status_conf_spec(["10.10.10.10", "11.11.11.11"], "Off")
-
-  end
-
-  context "with valid parameter type $allow_from => ['10.10.10.10']" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      { :allow_from => ['10.10.10.10'] }
-    end
-    it 'should expect to succeed array validation' do
-      expect {
-        should contain_file("status.conf")
-      }.not_to raise_error()
-    end
-  end
-
-  context "with invalid parameter type $allow_from => '10.10.10.10'" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    let :params do
-      { :allow_from => '10.10.10.10' }
-    end
-    it 'should expect to fail array validation' do
-      expect {
-        should contain_file("status.conf")
-      }.to raise_error(Puppet::Error)
-    end
-  end
-
-  # Only On or Off are valid options
-  ['On', 'Off'].each do |valid_param|
-    context "with valid value $extended_status => '#{valid_param}'" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do
-        { :extended_status => valid_param }
-      end
-      it 'should expect to succeed regular expression validation' do
-        expect {
-          should contain_file("status.conf")
-        }.not_to raise_error()
-      end
-    end
-  end
-
-  ['Yes', 'No'].each do |invalid_param|
-    context "with invalid value $extended_status => '#{invalid_param}'" do
-      let :facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do
-        { :extended_status => invalid_param }
-      end
-      it 'should expect to fail regular expression validation' do
-        expect {
-          should contain_file("status.conf")
-        }.to raise_error(Puppet::Error)
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
deleted file mode 100644
index cb91997ac16..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/suphp_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::suphp', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("libapache2-mod-suphp") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_package("mod_suphp") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb
deleted file mode 100644
index 4843a26e65a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/worker_spec.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::worker', :type => :class do
-  let :pre_condition do
-    'class { "apache": mpm_module => false, }'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/etc/apache2/mods-available/worker.conf").with_ensure('file') }
-    it { should contain_file("/etc/apache2/mods-enabled/worker.conf").with_ensure('link') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should_not contain_file("/etc/apache2/mods-available/worker.load") }
-      it { should_not contain_file("/etc/apache2/mods-enabled/worker.load") }
-
-      it { should contain_package("apache2-mpm-worker") }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should contain_file("/etc/apache2/mods-available/worker.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so\n"
-        })
-      }
-      it { should contain_file("/etc/apache2/mods-enabled/worker.load").with_ensure('link') }
-    end
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/etc/httpd/conf.d/worker.conf").with_ensure('file') }
-
-    context "with Apache version < 2.4" do
-      let :params do
-        {
-          :apache_version => '2.2',
-        }
-      end
-
-      it { should contain_file_line("/etc/sysconfig/httpd worker enable").with({
-        'require' => 'Package[httpd]',
-        })
-      }
-    end
-
-    context "with Apache version >= 2.4" do
-      let :params do
-        {
-          :apache_version => '2.4',
-        }
-      end
-
-      it { should_not contain_apache__mod('event') }
-
-      it { should contain_file("/etc/httpd/conf.d/worker.load").with({
-        'ensure'  => 'file',
-        'content' => "LoadModule mpm_worker_module modules/mod_mpm_worker.so\n",
-        })
-      }
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should_not contain_apache__mod('worker') }
-    it { should contain_file("/usr/local/etc/apache22/Modules/worker.conf").with_ensure('file') }
-  end
-
-  # Template config doesn't vary by distro
-  context "on all distros" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-      }
-    end
-
-    context 'defaults' do
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+2$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+150$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+75$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+25$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+0$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+64$/) }
-    end
-
-    context 'setting params' do
-      let :params do
-        {
-          :serverlimit          => 10,
-          :startservers         => 11,
-          :maxclients           => 12,
-          :minsparethreads      => 13,
-          :maxsparethreads      => 14,
-          :threadsperchild      => 15,
-          :maxrequestsperchild  => 16,
-          :threadlimit          => 17
-        }
-      end
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^<IfModule mpm_worker_module>$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ServerLimit\s+10$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+StartServers\s+11$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxClients\s+12$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MinSpareThreads\s+13$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxSpareThreads\s+14$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadsPerChild\s+15$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+MaxRequestsPerChild\s+16$/) }
-      it { should contain_file('/etc/httpd/conf.d/worker.conf').with(:content => /^\s+ThreadLimit\s+17$/) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
deleted file mode 100644
index d4c391a2911..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/mod/wsgi_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod::wsgi', :type => :class do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("libapache2-mod-wsgi") }
-  end
-  context "on a RedHat OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("mod_wsgi") }
-
-    describe "with custom WSGISocketPrefix" do
-      let :params do
-        { :wsgi_socket_prefix => 'run/wsgi' }
-      end
-      it {should contain_file('wsgi.conf').with_content(/^  WSGISocketPrefix run\/wsgi$/)}
-    end
-    describe "with custom WSGIPythonHome" do
-      let :params do
-        { :wsgi_python_home => '/path/to/virtenv' }
-      end
-      it {should contain_file('wsgi.conf').with_content(/^  WSGIPythonHome "\/path\/to\/virtenv"$/)}
-    end
-  end
-  context "on a FreeBSD OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_class("apache::params") }
-    it { should contain_apache__mod('wsgi') }
-    it { should contain_package("www/mod_wsgi") }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb
deleted file mode 100644
index eaa178c41d3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/params_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::params', :type => :class do
-  context "On a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_apache__params }
-
-    # There are 4 resources in this class currently
-    # there should not be any more resources because it is a params class
-    # The resources are class[apache::version], class[apache::params], class[main], class[settings], stage[main]
-    it "Should not contain any resources" do
-      subject.resources.size.should == 5
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb
deleted file mode 100644
index 2cd075357d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/classes/service_spec.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::service', :type => :class do
-  let :pre_condition do
-    'include apache::params'
-  end
-  context "on a Debian OS" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_service("httpd").with(
-      'name'      => 'apache2',
-      'ensure'    => 'running',
-      'enable'    => 'true'
-      )
-    }
-
-    context "with $service_name => 'foo'" do
-      let (:params) {{ :service_name => 'foo' }}
-      it { should contain_service("httpd").with(
-        'name'      => 'foo'
-        )
-      }
-    end
-
-    context "with $service_enable => true" do
-      let (:params) {{ :service_enable => true }}
-      it { should contain_service("httpd").with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'true'
-        )
-      }
-    end
-
-    context "with $service_enable => false" do
-      let (:params) {{ :service_enable => false }}
-      it { should contain_service("httpd").with(
-        'name'      => 'apache2',
-        'ensure'    => 'running',
-        'enable'    => 'false'
-        )
-      }
-    end
-
-    context "$service_enable must be a bool" do
-      let (:params) {{ :service_enable => 'not-a-boolean' }}
-
-      it 'should fail' do
-        expect { subject }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-
-    context "with $service_ensure => 'running'" do
-      let (:params) {{ :service_ensure => 'running', }}
-      it { should contain_service("httpd").with(
-        'ensure'    => 'running',
-        'enable'    => 'true'
-        )
-      }
-    end
-
-    context "with $service_ensure => 'stopped'" do
-      let (:params) {{ :service_ensure => 'stopped', }}
-      it { should contain_service("httpd").with(
-        'ensure'    => 'stopped',
-        'enable'    => 'true'
-        )
-      }
-    end
-
-    context "with $service_ensure => 'UNDEF'" do
-      let (:params) {{ :service_ensure => 'UNDEF' }}
-      it { should contain_service("httpd").without_ensure }
-    end
-  end
-
-
-  context "on a RedHat 5 OS" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '5',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_service("httpd").with(
-      'name'      => 'httpd',
-      'ensure'    => 'running',
-      'enable'    => 'true'
-      )
-    }
-  end
-
-  context "on a FreeBSD 5 OS" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    it { should contain_service("httpd").with(
-      'name'      => 'apache22',
-      'ensure'    => 'running',
-      'enable'    => 'true'
-      )
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb
deleted file mode 100644
index e6d5214097d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/mod_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::mod', :type => :define do
-  let :pre_condition do
-    'include apache'
-  end
-  context "on a RedHat osfamily" do
-    let :facts do
-      {
-        :osfamily               => 'RedHat',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'RedHat',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe "for non-special modules" do
-      let :title do
-        'spec_m'
-      end
-      it { should contain_class("apache::params") }
-      it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
-          :path    => '/etc/httpd/conf.d/spec_m.load',
-          :content => "LoadModule spec_m_module modules/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
-      end
-    end
-
-    describe "with shibboleth module and package param passed" do
-      # name/title for the apache::mod define
-      let :title do
-        'xsendfile'
-      end
-      # parameters
-      let(:params) { {:package => 'mod_xsendfile'} }
-
-      it { should contain_class("apache::params") }
-      it { should contain_package('mod_xsendfile') }
-    end
-  end
-
-  context "on a Debian osfamily" do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe "for non-special modules" do
-      let :title do
-        'spec_m'
-      end
-      it { should contain_class("apache::params") }
-      it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
-          :path    => '/etc/apache2/mods-available/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/lib/apache2/modules/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
-      end
-      it "should link the module load file" do
-        should contain_file('spec_m.load symlink').with({
-          :path   => '/etc/apache2/mods-enabled/spec_m.load',
-          :target => '/etc/apache2/mods-available/spec_m.load',
-          :owner   => 'root',
-          :group   => 'root',
-          :mode    => '0644',
-        } )
-      end
-    end
-  end
-
-  context "on a FreeBSD osfamily" do
-    let :facts do
-      {
-        :osfamily               => 'FreeBSD',
-        :operatingsystemrelease => '9',
-        :concat_basedir         => '/dne',
-        :operatingsystem        => 'FreeBSD',
-        :id                     => 'root',
-        :kernel                 => 'FreeBSD',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-
-    describe "for non-special modules" do
-      let :title do
-        'spec_m'
-      end
-      it { should contain_class("apache::params") }
-      it "should manage the module load file" do
-        should contain_file('spec_m.load').with({
-          :path    => '/usr/local/etc/apache22/Modules/spec_m.load',
-          :content => "LoadModule spec_m_module /usr/local/libexec/apache22/mod_spec_m.so\n",
-          :owner   => 'root',
-          :group   => 'wheel',
-          :mode    => '0644',
-        } )
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb
deleted file mode 100644
index 4037b3011c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/defines/vhost_spec.rb
+++ /dev/null
@@ -1,1469 +0,0 @@
-require 'spec_helper'
-
-describe 'apache::vhost', :type => :define do
-  let :pre_condition do
-    'class { "apache": default_vhost => false, }'
-  end
-  let :title do
-    'rspec.example.com'
-  end
-  let :default_params do
-    {
-      :docroot => '/rspec/docroot',
-      :port    => '84',
-    }
-  end
-  describe 'os-dependent items' do
-    context "on RedHat based systems" do
-      let :default_facts do
-        {
-          :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'RedHat',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-    end
-    context "on Debian based systems" do
-      let :default_facts do
-        {
-          :osfamily               => 'Debian',
-          :operatingsystemrelease => '6',
-          :concat_basedir         => '/dne',
-          :lsbdistcodename        => 'squeeze',
-          :operatingsystem        => 'Debian',
-          :id                     => 'root',
-          :kernel                 => 'Linux',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_file("25-rspec.example.com.conf").with(
-        :ensure => 'present',
-        :path   => '/etc/apache2/sites-available/25-rspec.example.com.conf'
-      ) }
-      it { should contain_file("25-rspec.example.com.conf symlink").with(
-        :ensure => 'link',
-        :path   => '/etc/apache2/sites-enabled/25-rspec.example.com.conf',
-        :target => '/etc/apache2/sites-available/25-rspec.example.com.conf'
-      ) }
-    end
-    context "on FreeBSD systems" do
-      let :default_facts do
-        {
-          :osfamily               => 'FreeBSD',
-          :operatingsystemrelease => '9',
-          :concat_basedir         => '/dne',
-          :operatingsystem        => 'FreeBSD',
-          :id                     => 'root',
-          :kernel                 => 'FreeBSD',
-          :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        }
-      end
-      let :params do default_params end
-      let :facts do default_facts end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_file("25-rspec.example.com.conf").with(
-        :ensure => 'present',
-        :path   => '/usr/local/etc/apache22/Vhosts/25-rspec.example.com.conf'
-      ) }
-    end
-  end
-  describe 'os-independent items' do
-    let :facts do
-      {
-        :osfamily               => 'Debian',
-        :operatingsystemrelease => '6',
-        :concat_basedir         => '/dne',
-        :lsbdistcodename        => 'squeeze',
-        :operatingsystem        => 'Debian',
-        :id                     => 'root',
-        :kernel                 => 'Linux',
-        :path                   => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-      }
-    end
-    describe 'basic assumptions' do
-      let :params do default_params end
-      it { should contain_class("apache") }
-      it { should contain_class("apache::params") }
-      it { should contain_apache__listen(params[:port]) }
-      it { should contain_apache__namevirtualhost("*:#{params[:port]}") }
-    end
-
-    # All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content" do
-      [
-        {
-          :title => 'should contain docroot',
-          :attr  => 'docroot',
-          :value => '/not/default',
-          :match => [/^  DocumentRoot "\/not\/default"$/,/  <Directory "\/not\/default">/],
-        },
-        {
-          :title => 'should set a port',
-          :attr  => 'port',
-          :value => '8080',
-          :match => [/^<VirtualHost \*:8080>$/],
-        },
-        {
-          :title => 'should set an ip',
-          :attr  => 'ip',
-          :value => '10.0.0.1',
-          :match => [/^<VirtualHost 10\.0\.0\.1:84>$/],
-        },
-        {
-          :title => 'should set a serveradmin',
-          :attr  => 'serveradmin',
-          :value => 'test@test.com',
-          :match => [/^  ServerAdmin test@test.com$/],
-        },
-        {
-          :title => 'should enable ssl',
-          :attr  => 'ssl',
-          :value => true,
-          :match => [/^  SSLEngine on$/],
-        },
-        {
-          :title => 'should set a servername',
-          :attr  => 'servername',
-          :value => 'param.test',
-          :match => [/^  ServerName param.test$/],
-        },
-        {
-          :title => 'should accept server aliases',
-          :attr  => 'serveraliases',
-          :value => ['one.com','two.com'],
-          :match => [
-            /^  ServerAlias one\.com$/,
-            /^  ServerAlias two\.com$/
-          ],
-        },
-        {
-          :title => 'should accept setenv',
-          :attr  => 'setenv',
-          :value => ['TEST1 one','TEST2 two'],
-          :match => [
-            /^  SetEnv TEST1 one$/,
-            /^  SetEnv TEST2 two$/
-          ],
-        },
-        {
-          :title => 'should accept setenvif',
-          :attr  => 'setenvif',
-          ## These are bugged in rspec-puppet; the $1 is droped
-          #:value => ['Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
-          #:match => ['  SetEnvIf Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1'],
-          :value => ['Host "^test\.com$" VHOST_ACCESS=test'],
-          :match => [/^  SetEnvIf Host "\^test\\.com\$" VHOST_ACCESS=test$/],
-        },
-        {
-          :title => 'should accept options',
-          :attr  => 'options',
-          :value => ['Fake','Options'],
-          :match => [/^    Options Fake Options$/],
-        },
-        {
-          :title => 'should accept overrides',
-          :attr  => 'override',
-          :value => ['Fake', 'Override'],
-          :match => [/^    AllowOverride Fake Override$/],
-        },
-        {
-          :title => 'should accept logroot',
-          :attr  => 'logroot',
-          :value => '/fake/log',
-          :match => [/CustomLog "\/fake\/log\//,/ErrorLog "\/fake\/log\//],
-        },
-        {
-          :title => 'should accept log_level',
-          :attr  => 'log_level',
-          :value => 'info',
-          :match => [/LogLevel info/],
-        },
-        {
-          :title => 'should accept pipe destination for access log',
-          :attr  => 'access_log_pipe',
-          :value => '| /bin/fake/logging',
-          :match => [/CustomLog "| \/bin\/fake\/logging" combined$/],
-        },
-        {
-          :title => 'should accept pipe destination for error log',
-          :attr  => 'error_log_pipe',
-          :value => '| /bin/fake/logging',
-          :match => [/ErrorLog "| \/bin\/fake\/logging" combined$/],
-        },
-        {
-          :title => 'should accept syslog destination for access log',
-          :attr  => 'access_log_syslog',
-          :value => 'syslog:local1',
-          :match => [/CustomLog "syslog:local1" combined$/],
-        },
-        {
-          :title => 'should accept syslog destination for error log',
-          :attr  => 'error_log_syslog',
-          :value => 'syslog',
-          :match => [/ErrorLog "syslog"$/],
-        },
-        {
-          :title => 'should accept custom format for access logs',
-          :attr  => 'access_log_format',
-          :value => '%h %{X-Forwarded-For}i %l %u %t \"%r\" %s %b  \"%{Referer}i\" \"%{User-agent}i\" \"Host: %{Host}i\" %T %D',
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" "%h %\{X-Forwarded-For\}i %l %u %t \\"%r\\" %s %b  \\"%\{Referer\}i\\" \\"%\{User-agent\}i\\" \\"Host: %\{Host\}i\\" %T %D"$/],
-        },
-        {
-          :title => 'should contain access logs',
-          :attr  => 'access_log',
-          :value => true,
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
-        },
-        {
-          :title    => 'should not contain access logs',
-          :attr     => 'access_log',
-          :value    => false,
-          :notmatch => [/CustomLog "\/var\/log\/.+_access\.log" combined$/],
-        },
-        {
-          :title => 'should contain error logs',
-          :attr  => 'error_log',
-          :value => true,
-          :match => [/ErrorLog.+$/],
-        },
-        {
-          :title    => 'should not contain error logs',
-          :attr     => 'error_log',
-          :value    => false,
-          :notmatch => [/ErrorLog.+$/],
-        },
-        {
-          :title    => 'should set ErrorDocument 503',
-          :attr     => 'error_documents',
-          :value    => [ { 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}],
-          :match => [/^  ErrorDocument 503 "Go away, the backend is broken."$/],
-        },
-        {
-          :title    => 'should set ErrorDocuments 503 407',
-          :attr     => 'error_documents',
-          :value    => [
-            { 'error_code' => '503', 'document' => '/service-unavail'},
-            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
-          ],
-          :match => [
-            /^  ErrorDocument 503 \/service-unavail$/,
-            /^  ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
-          ],
-        },
-        {
-          :title    => 'should set ErrorDocument 503 in directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/srv/www', 'error_documents' => [{ 'error_code' => '503', 'document' => '"Go away, the backend is broken."'}] },
-          :match => [/^    ErrorDocument 503 "Go away, the backend is broken."$/],
-        },
-        {
-          :title    => 'should set ErrorDocuments 503 407 in directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/srv/www', 'error_documents' =>
-          [
-            { 'error_code' => '503', 'document' => '/service-unavail'},
-            { 'error_code' => '407', 'document' => 'https://example.com/proxy/login'},
-          ]},
-          :match => [
-            /^    ErrorDocument 503 \/service-unavail$/,
-            /^    ErrorDocument 407 https:\/\/example\.com\/proxy\/login$/,
-          ],
-        },
-        {
-          :title => 'should accept a scriptalias',
-          :attr  => 'scriptalias',
-          :value => '/usr/scripts',
-          :match => [
-            /^  ScriptAlias \/cgi-bin "\/usr\/scripts"$/,
-          ],
-        },
-        {
-          :title    => 'should accept a single scriptaliases',
-          :attr     => 'scriptaliases',
-          :value    => { 'alias' => '/blah/', 'path' => '/usr/scripts' },
-          :match    => [
-            /^  ScriptAlias \/blah\/ "\/usr\/scripts"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept multiple scriptaliases',
-          :attr     => 'scriptaliases',
-          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2', 'path' => '/usr/scripts' } ],
-          :match    => [
-            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
-            /^  ScriptAlias \/blah2 "\/usr\/scripts"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept multiple scriptaliases with and without trailing slashes',
-          :attr     => 'scriptaliases',
-          :value    => [ { 'alias' => '/blah', 'path' => '/usr/scripts' }, { 'alias' => '/blah2/', 'path' => '/usr/scripts2/' } ],
-          :match    => [
-            /^  ScriptAlias \/blah "\/usr\/scripts"$/,
-            /^  ScriptAlias \/blah2\/ "\/usr\/scripts2\/"$/,
-          ],
-          :nomatch  => [/ScriptAlias \/cgi\-bin\//],
-        },
-        {
-          :title    => 'should accept a ScriptAliasMatch directive',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [ { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' } ],
-          :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/
-          ],
-        },
-        {
-          :title    => 'should accept multiple ScriptAliasMatch directives',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [
-            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
-            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
-          ],
-          :match    => [
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
-          ],
-        },
-        {
-          :title    => 'should accept mixed ScriptAlias and ScriptAliasMatch directives',
-          :attr     => 'scriptaliases',
-          ## XXX As mentioned above, rspec-puppet drops constructs like $1.
-          ## Thus, these tests don't work as they should. As a workaround we
-          ## use FOO instead of $1 here.
-          :value    => [
-            { 'aliasmatch' => '"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))|git-(upload|receive)-pack))"', 'path' => '/var/www/bin/gitolite-suexec-wrapper/FOO' },
-            { 'alias' => '/git', 'path' => '/var/www/gitweb/index.cgi' },
-            { 'aliasmatch' => '^/cgi-bin(.*)', 'path' => '/usr/local/apache/cgi-binFOO' },
-            { 'alias' => '/trac', 'path' => '/etc/apache2/trac.fcgi' },
-          ],
-          :match    => [
-            /^  ScriptAliasMatch "\(\?x\)\^\/git\/\(\.\*\/\(HEAD\|info\/refs\|objects\/\(info\/\[\^\/\]\+\|\[0-9a-f\]\{2\}\/\[0-9a-f\]\{38\}\|pack\/pack-\[0-9a-f\]\{40\}\\\.\(pack\|idx\)\)\|git-\(upload\|receive\)-pack\)\)" "\/var\/www\/bin\/gitolite-suexec-wrapper\/FOO"$/,
-            /^  ScriptAlias \/git "\/var\/www\/gitweb\/index\.cgi"$/,
-            /^  ScriptAliasMatch \^\/cgi-bin\(\.\*\) "\/usr\/local\/apache\/cgi-binFOO"$/,
-            /^  ScriptAlias \/trac "\/etc\/apache2\/trac.fcgi"$/,
-          ],
-        },
-        {
-          :title    => 'should accept proxy destinations',
-          :attr     => 'proxy_dest',
-          :value    => 'http://fake.com',
-          :match    => [
-            /^  ProxyPass          \/ http:\/\/fake.com\/$/,
-            /^  <Location          \/>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/$/,
-            /^  <\/Location>$/,
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title    => 'should accept proxy_pass hash',
-          :attr     => 'proxy_pass',
-          :value    => { 'path' => '/path-a', 'url' => 'http://fake.com/a' },
-          :match    => [
-            /^  ProxyPass \/path-a http:\/\/fake.com\/a$/,
-            /^  <Location \/path-a>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/a$/,
-            /^  <\/Location>$/,
-
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title    => 'should accept proxy_pass array of hash',
-          :attr     => 'proxy_pass',
-          :value    => [
-            { 'path' => '/path-a/', 'url' => 'http://fake.com/a/' },
-            { 'path' => '/path-b', 'url' => 'http://fake.com/b' },
-          ],
-          :match    => [
-            /^  ProxyPass \/path-a\/ http:\/\/fake.com\/a\/$/,
-            /^  <Location \/path-a\/>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/a\/$/,
-            /^  <\/Location>$/,
-            /^  ProxyPass \/path-b http:\/\/fake.com\/b$/,
-            /^  <Location \/path-b>$/,
-            /^    ProxyPassReverse http:\/\/fake.com\/b$/,
-            /^  <\/Location>$/,
-          ],
-          :notmatch => [/ProxyPass .+!$/],
-        },
-        {
-          :title => 'should enable rack',
-          :attr  => 'rack_base_uris',
-          :value => ['/rack1','/rack2'],
-          :match => [
-            /^  RackBaseURI \/rack1$/,
-            /^  RackBaseURI \/rack2$/,
-          ],
-        },
-        {
-          :title => 'should accept headers',
-          :attr  => 'headers',
-          :value => ['add something', 'merge something_else'],
-          :match => [
-            /^  Header add something$/,
-            /^  Header merge something_else$/,
-          ],
-        },
-        {
-          :title => 'should accept request headers',
-          :attr  => 'request_headers',
-          :value => ['append something', 'unset something_else'],
-          :match => [
-            /^  RequestHeader append something$/,
-            /^  RequestHeader unset something_else$/,
-          ],
-        },
-        {
-          :title => 'should accept rewrite rules',
-          :attr  => 'rewrite_rule',
-          :value => 'not a real rule',
-          :match => [/^  RewriteRule not a real rule$/],
-        },
-        {
-          :title => 'should accept rewrite rules',
-          :attr  => 'rewrites',
-          :value => [{'rewrite_rule' => ['not a real rule']}],
-          :match => [/^  RewriteRule not a real rule$/],
-        },
-        {
-          :title => 'should accept rewrite comment',
-          :attr  => 'rewrites',
-          :value => [{'comment' => 'rewrite comment', 'rewrite_rule' => ['not a real rule']}],
-          :match => [/^  #rewrite comment/],
-        },
-        {
-          :title => 'should accept rewrite conditions',
-          :attr  => 'rewrites',
-          :value => [{'comment' => 'redirect IE', 'rewrite_cond' => ['%{HTTP_USER_AGENT} ^MSIE'], 'rewrite_rule' => ['^index\.html$ welcome.html'],}],
-          :match => [
-            /^  #redirect IE$/,
-            /^  RewriteCond %{HTTP_USER_AGENT} \^MSIE$/,
-            /^  RewriteRule \^index\\\.html\$ welcome.html$/,
-          ],
-        },
-        {
-          :title => 'should accept multiple rewrites',
-          :attr  => 'rewrites',
-          :value => [
-            {'rewrite_rule' => ['not a real rule']},
-            {'rewrite_rule' => ['not a real rule two']},
-          ],
-          :match => [
-            /^  RewriteRule not a real rule$/,
-            /^  RewriteRule not a real rule two$/,
-          ],
-        },
-        {
-          :title => 'should block scm',
-          :attr  => 'block',
-          :value => 'scm',
-          :match => [/^  <DirectoryMatch \.\*\\\.\(svn\|git\|bzr\)\/\.\*>$/],
-        },
-        {
-          :title => 'should accept a custom fragment',
-          :attr  => 'custom_fragment',
-          :value => "  Some custom fragment line\n  That spans multiple lines",
-          :match => [
-            /^  Some custom fragment line$/,
-            /^  That spans multiple lines$/,
-            /^<\/VirtualHost>$/,
-          ],
-        },
-        {
-          :title => 'should accept an array of alias hashes',
-          :attr  => 'aliases',
-          :value => [ { 'alias' => '/', 'path' => '/var/www'} ],
-          :match => [/^  Alias \/ "\/var\/www"$/],
-        },
-        {
-          :title => 'should accept an alias hash',
-          :attr  => 'aliases',
-          :value => { 'alias' => '/', 'path' => '/var/www'},
-          :match => [/^  Alias \/ "\/var\/www"$/],
-        },
-        {
-          :title => 'should accept multiple aliases',
-          :attr  => 'aliases',
-          :value => [
-            { 'alias' => '/', 'path' => '/var/www'},
-            { 'alias' => '/cgi-bin', 'path' => '/var/www/cgi-bin'},
-            { 'alias' => '/css', 'path' => '/opt/someapp/css'},
-          ],
-          :match => [
-            /^  Alias \/ "\/var\/www"$/,
-            /^  Alias \/cgi-bin "\/var\/www\/cgi-bin"$/,
-            /^  Alias \/css "\/opt\/someapp\/css"$/,
-          ],
-        },
-        {
-          :title => 'should accept an aliasmatch hash',
-          :attr  => 'aliases',
-          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
-          # tests don't work.
-          #:value => { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
-          #:match => [/^  AliasMatch \^\/image\/\(\.\*\)\.gif \/files\/gifs\/\$1\.gif$/],
-        },
-        {
-          :title => 'should accept a array of alias and aliasmatch hashes mixed',
-          :attr  => 'aliases',
-          ## XXX As mentioned above, rspec-puppet drops the $1. Thus, these
-          # tests don't work.
-          #:value => [
-          #  { 'alias' => '/css', 'path' => '/files/css' },
-          #  { 'aliasmatch' => '^/image/(.*).gif', 'path' => '/files/gifs/$1.gif' },
-          #  { 'aliasmatch' => '^/image/(.*).jpg', 'path' => '/files/jpgs/$1.jpg' },
-          #  { 'alias' => '/image', 'path' => '/files/images' },
-          #],
-          #:match => [
-          #  /^  Alias \/css \/files\/css$/,
-          #  /^  AliasMatch \^\/image\/\(.\*\)\.gif \/files\/gifs\/\$1\.gif$/,
-          #  /^  AliasMatch \^\/image\/\(.\*\)\.jpg \/files\/jpgs\/\$1\.jpg$/,
-          #  /^  Alias \/image \/files\/images$/
-          #],
-        },
-        {
-          :title => 'should accept multiple additional includes',
-          :attr  => 'additional_includes',
-          :value => [
-            '/tmp/proxy_group_a',
-            '/tmp/proxy_group_b',
-            '/tmp/proxy_group_c',
-          ],
-          :match => [
-            /^  Include "\/tmp\/proxy_group_a"$/,
-            /^  Include "\/tmp\/proxy_group_b"$/,
-            /^  Include "\/tmp\/proxy_group_c"$/,
-          ],
-        },
-        {
-          :title => 'should accept a suPHP_Engine',
-          :attr  => 'suphp_engine',
-          :value => 'on',
-          :match => [/^  suPHP_Engine on$/],
-        },
-        {
-          :title => 'should accept a php_admin_flags',
-          :attr  => 'php_admin_flags',
-          :value => { 'engine' => 'on' },
-          :match => [/^  php_admin_flag engine on$/],
-        },
-        {
-          :title => 'should accept php_admin_values',
-          :attr  => 'php_admin_values',
-          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
-          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept php_admin_flags in directories',
-          :attr  => 'directories',
-          :value => {
-						'path'            => '/srv/www',
-						'php_admin_flags' => { 'php_engine' => 'on' }
-					},
-          :match => [/^    php_admin_flag php_engine on$/],
-        },
-        {
-          :title => 'should accept php_admin_values',
-          :attr  => 'php_admin_values',
-          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
-          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept php_admin_values in directories',
-          :attr  => 'directories',
-          :value => {
-            'path'             => '/srv/www',
-            'php_admin_values' => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' }
-          },
-          :match => [/^    php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
-        },
-        {
-          :title => 'should accept a wsgi script alias',
-          :attr  => 'wsgi_script_aliases',
-          :value => { '/' => '/var/www/myapp.wsgi'},
-          :match => [/^  WSGIScriptAlias \/ "\/var\/www\/myapp.wsgi"$/],
-        },
-        {
-          :title => 'should accept multiple wsgi aliases',
-          :attr  => 'wsgi_script_aliases',
-          :value => {
-            '/wiki' => '/usr/local/wsgi/scripts/mywiki.wsgi',
-            '/blog' => '/usr/local/wsgi/scripts/myblog.wsgi',
-            '/'     => '/usr/local/wsgi/scripts/myapp.wsgi',
-          },
-          :match => [
-            /^  WSGIScriptAlias \/wiki "\/usr\/local\/wsgi\/scripts\/mywiki.wsgi"$/,
-            /^  WSGIScriptAlias \/blog "\/usr\/local\/wsgi\/scripts\/myblog.wsgi"$/,
-            /^  WSGIScriptAlias \/ "\/usr\/local\/wsgi\/scripts\/myapp.wsgi"$/,
-          ],
-        },
-        {
-          :title => 'should accept a wsgi application group',
-          :attr  => 'wsgi_application_group',
-          :value => '%{GLOBAL}',
-          :match => [/^  WSGIApplicationGroup %{GLOBAL}$/],
-        },
-        {
-          :title => 'should set wsgi pass authorization',
-          :attr  => 'wsgi_pass_authorization',
-          :value => 'On',
-          :match => [/^  WSGIPassAuthorization On$/],
-        },
-        {
-          :title => 'should set wsgi pass authorization false',
-          :attr  => 'wsgi_pass_authorization',
-          :value => 'Off',
-          :match => [/^  WSGIPassAuthorization Off$/],
-        },
-        {
-          :title => 'should contain environment variables',
-          :attr  => 'access_log_env_var',
-          :value => 'admin',
-          :match => [/CustomLog "\/var\/log\/.+_access\.log" combined env=admin$/]
-        },
-        {
-          :title => 'should contain virtual_docroot',
-          :attr  => 'virtual_docroot',
-          :value => '/not/default',
-          :match => [
-            /^  VirtualDocumentRoot "\/not\/default"$/,
-          ],
-        },
-        {
-          :title    => 'should accept multiple directories',
-          :attr     => 'directories',
-          :value    => [
-            { 'path' => '/opt/app' },
-            { 'path' => '/var/www' },
-            { 'path' => '/rspec/docroot'}
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^  <Directory "\/var\/www">$/,
-            /^  <Directory "\/rspec\/docroot">$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Apache below 2.4 (Default Version). All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with $apache_version < 2.4" do
-      [
-        {
-          :title    => 'should accept a directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/opt/app' },
-          :notmatch => ['  <Directory /rspec/docroot>'],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    AllowOverride None$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives hash',
-          :attr     => 'directories',
-          :value    => {
-            'path'              => '/opt/app',
-            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow'             => 'from rspec.org',
-            'allow_override'    => 'Lol',
-            'deny'              => 'from google.com',
-            'options'           => '-MultiViews',
-            'order'             => 'deny,yned',
-            'passenger_enabled' => 'onf',
-            'sethandler'        => 'None',
-          },
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
-            /^    Allow from rspec.org$/,
-            /^    AllowOverride Lol$/,
-            /^    Deny from google.com$/,
-            /^    Options -MultiViews$/,
-            /^    Order deny,yned$/,
-            /^    SetHandler None$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives with arrays and hashes',
-          :attr     => 'directories',
-          :value    => [
-            {
-              'path'              => '/opt/app1',
-              'allow'             => 'from rspec.org',
-              'allow_override'    => ['AuthConfig','Indexes'],
-              'deny'              => 'from google.com',
-              'options'           => ['-MultiViews','+MultiViews'],
-              'order'             => ['deny','yned'],
-              'passenger_enabled' => 'onf',
-            },
-            {
-              'path'        => '/opt/app2',
-              'addhandlers' => {
-                'handler'    => 'cgi-script',
-                'extensions' => '.cgi',
-              },
-            },
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app1">$/,
-            /^    Allow from rspec.org$/,
-            /^    AllowOverride AuthConfig Indexes$/,
-            /^    Deny from google.com$/,
-            /^    Options -MultiViews \+MultiViews$/,
-            /^    Order deny,yned$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-            /^  <Directory "\/opt\/app2">$/,
-            /^    AllowOverride None$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^    AddHandler cgi-script .cgi$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title => 'should accept location for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => '/',
-            'provider' => 'location',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Location "\/">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Location>$/,
-          ],
-        },
-        {
-          :title => 'should accept files for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'files',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Files "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/Files>$/,
-          ],
-        },
-        {
-          :title => 'should accept files match for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'filesmatch',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <FilesMatch "index.html">$/,
-            /^    Order allow,deny$/,
-            /^    Allow from all$/,
-            /^  <\/FilesMatch>$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :apache_version => '2.2',
-          }) end
-
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # Apache equals or above 2.4. All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with $apache_version >= 2.4" do
-      [
-        {
-          :title    => 'should accept a directory',
-          :attr     => 'directories',
-          :value    => { 'path' => '/opt/app' },
-          :notmatch => ['  <Directory /rspec/docroot>'],
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    AllowOverride None$/,
-            /^    Require all granted$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives hash',
-          :attr     => 'directories',
-          :value    => {
-            'path'              => '/opt/app',
-            'headers'           => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
-            'allow_override'    => 'Lol',
-            'options'           => '-MultiViews',
-            'require'           => 'something denied',
-            'passenger_enabled' => 'onf',
-          },
-          :match    => [
-            /^  <Directory "\/opt\/app">$/,
-            /^    Header Set X-Robots-Tag "noindex, noarchive, nosnippet"$/,
-            /^    AllowOverride Lol$/,
-            /^    Options -MultiViews$/,
-            /^    Require something denied$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title    => 'should accept directory directives with arrays and hashes',
-          :attr     => 'directories',
-          :value    => [
-            {
-              'path'              => '/opt/app1',
-              'allow_override'    => ['AuthConfig','Indexes'],
-              'options'           => ['-MultiViews','+MultiViews'],
-              'require'           => ['host','example.org'],
-              'passenger_enabled' => 'onf',
-            },
-            {
-              'path'        => '/opt/app2',
-              'addhandlers' => {
-                'handler'    => 'cgi-script',
-                'extensions' => '.cgi',
-              },
-            },
-          ],
-          :match    => [
-            /^  <Directory "\/opt\/app1">$/,
-            /^    AllowOverride AuthConfig Indexes$/,
-            /^    Options -MultiViews \+MultiViews$/,
-            /^    Require host example.org$/,
-            /^    PassengerEnabled onf$/,
-            /^  <\/Directory>$/,
-            /^  <Directory "\/opt\/app2">$/,
-            /^    AllowOverride None$/,
-            /^    Require all granted$/,
-            /^    AddHandler cgi-script .cgi$/,
-            /^  <\/Directory>$/,
-          ],
-        },
-        {
-          :title => 'should accept location for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => '/',
-            'provider' => 'location',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Location "\/">$/,
-            /^    Require all granted$/,
-            /^  <\/Location>$/,
-          ],
-        },
-        {
-          :title => 'should accept files for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'files',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <Files "index.html">$/,
-            /^    Require all granted$/,
-            /^  <\/Files>$/,
-          ],
-        },
-        {
-          :title => 'should accept files match for provider',
-          :attr  => 'directories',
-          :value => {
-            'path'     => 'index.html',
-            'provider' => 'filesmatch',
-          },
-          :notmatch => ['    AllowOverride None'],
-          :match => [
-            /^  <FilesMatch "index.html">$/,
-            /^    Require all granted$/,
-            /^  <\/FilesMatch>$/,
-          ],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :apache_version => '2.4',
-          }) end
-
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    # All match and notmatch should be a list of regexs and exact match strings
-    context ".conf content with SSL" do
-      [
-        {
-            :title => 'should accept setting SSLCertificateFile',
-            :attr  => 'ssl_cert',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateFile      "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateKeyFile',
-            :attr  => 'ssl_key',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateKeyFile   "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateChainFile',
-            :attr  => 'ssl_chain',
-            :value => '/path/to/cert.pem',
-            :match => [/^  SSLCertificateChainFile "\/path\/to\/cert\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificatePath',
-            :attr  => 'ssl_certs_dir',
-            :value => '/path/to/certs',
-            :match => [/^  SSLCACertificatePath    "\/path\/to\/certs"$/],
-        },
-        {
-            :title => 'should accept setting SSLCertificateFile',
-            :attr  => 'ssl_ca',
-            :value => '/path/to/ca.pem',
-            :match => [/^  SSLCACertificateFile    "\/path\/to\/ca\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLRevocationPath',
-            :attr  => 'ssl_crl_path',
-            :value => '/path/to/crl',
-            :match => [/^  SSLCARevocationPath     "\/path\/to\/crl"$/],
-        },
-        {
-            :title => 'should accept setting SSLRevocationFile',
-            :attr  => 'ssl_crl',
-            :value => '/path/to/crl.pem',
-            :match => [/^  SSLCARevocationFile     "\/path\/to\/crl\.pem"$/],
-        },
-        {
-            :title => 'should accept setting SSLProxyEngine',
-            :attr  => 'ssl_proxyengine',
-            :value => true,
-            :match => [/^  SSLProxyEngine On$/],
-        },
-        {
-            :title => 'should accept setting SSLProtocol',
-            :attr  => 'ssl_protocol',
-            :value => 'all -SSLv2',
-            :match => [/^  SSLProtocol             all -SSLv2$/],
-        },
-        {
-            :title => 'should accept setting SSLCipherSuite',
-            :attr  => 'ssl_cipher',
-            :value => 'RC4-SHA:HIGH:!ADH:!SSLv2',
-            :match => [/^  SSLCipherSuite          RC4-SHA:HIGH:!ADH:!SSLv2$/],
-        },
-        {
-            :title => 'should accept setting SSLHonorCipherOrder',
-            :attr  => 'ssl_honorcipherorder',
-            :value => 'On',
-            :match => [/^  SSLHonorCipherOrder     On$/],
-        },
-        {
-            :title => 'should accept setting SSLVerifyClient',
-            :attr  => 'ssl_verify_client',
-            :value => 'optional',
-            :match => [/^  SSLVerifyClient         optional$/],
-        },
-        {
-            :title => 'should accept setting SSLVerifyDepth',
-            :attr  => 'ssl_verify_depth',
-            :value => '1',
-            :match => [/^  SSLVerifyDepth          1$/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with a string',
-            :attr  => 'ssl_options',
-            :value => '+ExportCertData',
-            :match => [/^  SSLOptions \+ExportCertData$/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with an array',
-            :attr  => 'ssl_options',
-            :value => ['+StrictRequire','+ExportCertData'],
-            :match => [/^  SSLOptions \+StrictRequire \+ExportCertData/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with a string in directories',
-            :attr  => 'directories',
-            :value => { 'path' => '/srv/www', 'ssl_options' => '+ExportCertData'},
-            :match => [/^    SSLOptions \+ExportCertData$/],
-        },
-        {
-            :title => 'should accept setting SSLOptions with an array in directories',
-            :attr  => 'directories',
-            :value => { 'path' => '/srv/www', 'ssl_options' => ['-StdEnvVars','+ExportCertData']},
-            :match => [/^    SSLOptions -StdEnvVars \+ExportCertData/],
-        },
-      ].each do |param|
-        describe "when #{param[:attr]} is #{param[:value]} with SSL" do
-          let :params do
-            default_params.merge( {
-              param[:attr].to_sym => param[:value],
-              :ssl                => true,
-            } )
-          end
-          it { should contain_file("25-#{title}.conf").with_mode('0644') }
-          if param[:match]
-            it "#{param[:title]}: matches" do
-              param[:match].each do |match|
-                should contain_file("25-#{title}.conf").with_content( match )
-              end
-            end
-          end
-          if param[:notmatch]
-            it "#{param[:title]}: notmatches" do
-              param[:notmatch].each do |notmatch|
-                should_not contain_file("25-#{title}.conf").with_content( notmatch )
-              end
-            end
-          end
-        end
-      end
-    end
-
-    context 'attribute resources' do
-      describe 'when access_log_file and access_log_pipe are specified' do
-        let :params do default_params.merge({
-          :access_log_file => 'fake.log',
-          :access_log_pipe => '| /bin/fake',
-        }) end
-        it 'should cause a failure' do
-          expect { subject }.to raise_error(Puppet::Error, /'access_log_file' and 'access_log_pipe' cannot be defined at the same time/)
-        end
-      end
-      describe 'when error_log_file and error_log_pipe are specified' do
-        let :params do default_params.merge({
-          :error_log_file => 'fake.log',
-          :error_log_pipe => '| /bin/fake',
-        }) end
-        it 'should cause a failure' do
-          expect { subject }.to raise_error(Puppet::Error, /'error_log_file' and 'error_log_pipe' cannot be defined at the same time/)
-        end
-      end
-      describe 'when docroot owner and mode is specified' do
-        let :params do default_params.merge({
-          :docroot_owner => 'testuser',
-          :docroot_group => 'testgroup',
-          :docroot_mode  => '0750',
-        }) end
-        it 'should set vhost ownership and permissions' do
-          should contain_file(params[:docroot]).with({
-            :ensure => :directory,
-            :owner  => 'testuser',
-            :group  => 'testgroup',
-            :mode   => '0750',
-          })
-        end
-      end
-
-      describe 'when wsgi_daemon_process and wsgi_daemon_process_options are specified' do
-        let :params do default_params.merge({
-          :wsgi_daemon_process         => 'example.org',
-          :wsgi_daemon_process_options => { 'processes' => '2', 'threads' => '15' },
-        }) end
-        it 'should set wsgi_daemon_process_options' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  WSGIDaemonProcess example.org processes=2 threads=15$/
-          )
-        end
-      end
-
-      describe 'when wsgi_import_script and wsgi_import_script_options are specified' do
-        let :params do default_params.merge({
-          :wsgi_import_script         => '/var/www/demo.wsgi',
-          :wsgi_import_script_options => { 'application-group' => '%{GLOBAL}', 'process-group' => 'wsgi' },
-        }) end
-        it 'should set wsgi_import_script_options' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  WSGIImportScript \/var\/www\/demo.wsgi application-group=%{GLOBAL} process-group=wsgi$/
-          )
-        end
-      end
-
-      describe 'when rewrites are specified' do
-        let :params do default_params.merge({
-          :rewrites => [
-            {
-              'comment'      => 'test rewrites',
-              'rewrite_base' => '/mytestpath/',
-              'rewrite_cond' => ['%{HTTP_USER_AGENT} ^Lynx/ [OR]', '%{HTTP_USER_AGENT} ^Mozilla/[12]'],
-              'rewrite_rule' => ['^index\.html$ welcome.html', '^index\.cgi$ index.php'],
-            }
-          ]
-        }) end
-        it 'should set RewriteConds and RewriteRules' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  #test rewrites$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Lynx\/ \[OR\]$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteBase \/mytestpath\/$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTP_USER_AGENT\} \^Mozilla\/\[12\]$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteRule \^index\\.html\$ welcome.html$/
-          )
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteRule \^index\\.cgi\$ index.php$/
-          )
-        end
-      end
-
-      describe 'when rewrite_rule and rewrite_cond are specified' do
-        let :params do default_params.merge({
-          :rewrite_cond => '%{HTTPS} off',
-          :rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
-        }) end
-        it 'should set RewriteCond' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  RewriteCond %\{HTTPS\} off$/
-          )
-        end
-      end
-
-      describe 'when action is specified specified' do
-        let :params do default_params.merge({
-          :action => 'php-fastcgi',
-        }) end
-        it 'should set Action' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  Action php-fastcgi \/cgi-bin virtual$/
-          )
-        end
-      end
-
-      describe 'when suphp_engine is on and suphp_configpath is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :suphp_configpath => '/etc/php5/apache2',
-        }) end
-        it 'should set suphp_configpath' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  suPHP_ConfigPath "\/etc\/php5\/apache2"$/
-          )
-        end
-      end
-
-      describe 'when suphp_engine is on and suphp_addhandler is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :suphp_addhandler => 'x-httpd-php',
-        }) end
-        it 'should set suphp_addhandler' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^  suPHP_AddHandler x-httpd-php/
-          )
-        end
-      end
-
-      describe 'when suphp_engine is on and suphp { user & group } is specified' do
-        let :params do default_params.merge({
-          :suphp_engine     => 'on',
-          :directories      => { 'path' => '/srv/www',
-            'suphp' => { 'user' => 'myappuser', 'group' => 'myappgroup' },
-          }
-        }) end
-        it 'should set suphp_UserGroup' do
-          should contain_file("25-#{title}.conf").with_content(
-            /^    suPHP_UserGroup myappuser myappgroup/
-          )
-        end
-      end
-
-      describe 'priority/default settings' do
-        describe 'when neither priority/default is specified' do
-          let :params do default_params end
-          it { should contain_file("25-#{title}.conf").with_path(
-            /25-#{title}.conf/
-          ) }
-        end
-        describe 'when both priority/default_vhost is specified' do
-          let :params do
-            default_params.merge({
-              :priority      => 15,
-              :default_vhost => true,
-            })
-          end
-          it { should contain_file("15-#{title}.conf").with_path(
-            /15-#{title}.conf/
-          ) }
-        end
-        describe 'when only priority is specified' do
-          let :params do
-            default_params.merge({ :priority => 14, })
-          end
-          it { should contain_file("14-#{title}.conf").with_path(
-            /14-#{title}.conf/
-          ) }
-        end
-        describe 'when only default is specified' do
-          let :params do
-            default_params.merge({ :default_vhost => true, })
-          end
-          it { should contain_file("10-#{title}.conf").with_path(
-            /10-#{title}.conf/
-          ) }
-        end
-      end
-
-      describe 'fcgid directory options' do
-        describe 'No fcgiwrapper' do
-          let :params do
-            default_params.merge({
-              :directories      => { 'path' => '/srv/www' },
-            })
-          end
-
-          it { should_not contain_file("25-#{title}.conf").with_content(%r{FcgidWrapper}) }
-        end
-
-        describe 'Only a command' do
-          let :params do
-            default_params.merge({
-              :directories      => { 'path' => '/srv/www',
-                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper' },
-              }
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper  $}) }
-        end
-
-        describe 'All parameters' do
-          let :params do
-            default_params.merge({
-              :directories    => { 'path' => '/srv/www',
-                'fcgiwrapper' => { 'command' => '/usr/local/bin/fcgiwrapper', 'suffix' => '.php', 'virtual' => 'virtual' },
-              }
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content(%r{^    FcgidWrapper /usr/local/bin/fcgiwrapper .php virtual$}) }
-        end
-      end
-
-      describe 'various ip/port combos' do
-        describe 'when ip_based is true' do
-          let :params do default_params.merge({ :ip_based => true }) end
-          it 'should not specify a NameVirtualHost' do
-            should contain_apache__listen(params[:port])
-            should_not contain_apache__namevirtualhost("*:#{params[:port]}")
-          end
-        end
-
-        describe 'when ip_based is default' do
-          let :params do default_params end
-          it 'should specify a NameVirtualHost' do
-            should contain_apache__listen(params[:port])
-            should contain_apache__namevirtualhost("*:#{params[:port]}")
-          end
-        end
-
-        describe 'when an ip is set' do
-          let :params do default_params.merge({ :ip => '10.0.0.1' }) end
-          it 'should specify a NameVirtualHost for the ip' do
-            should_not contain_apache__listen(params[:port])
-            should contain_apache__listen("10.0.0.1:#{params[:port]}")
-            should contain_apache__namevirtualhost("10.0.0.1:#{params[:port]}")
-          end
-        end
-
-        describe 'an ip_based vhost without a port' do
-          let :params do
-            {
-              :docroot  => '/fake',
-              :ip       => '10.0.0.1',
-              :ip_based => true,
-            }
-          end
-          it 'should specify a NameVirtualHost for the ip' do
-            should_not contain_apache__listen(params[:ip])
-            should_not contain_apache__namevirtualhost(params[:ip])
-            should contain_file("25-#{title}.conf").with_content %r{<VirtualHost 10\.0\.0\.1>}
-          end
-        end
-      end
-
-      describe 'when suexec_user_group is specified' do
-        let :params do
-          default_params.merge({
-            :suexec_user_group => 'nobody nogroup',
-          })
-        end
-
-        it { should contain_file("25-#{title}.conf").with_content %r{^  SuexecUserGroup nobody nogroup$} }
-      end
-
-      describe 'redirect rules' do
-        describe 'without lockstep arrays' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => [
-                'http://10.0.0.10/login',
-                'http://10.0.0.10/logout',
-              ],
-              :redirect_status   => [
-                'permanent',
-                '',
-              ],
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/login} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
-        end
-        describe 'redirect match rules' do
-          let :params do
-            default_params.merge({
-              :redirectmatch_status => [
-                '404',
-              ],
-              :redirectmatch_regexp   => [
-                '/\.git(/.*|$)',
-              ],
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  RedirectMatch 404 } }
-        end
-        describe 'without a status' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => [
-                'http://10.0.0.10/login',
-                'http://10.0.0.10/logout',
-              ],
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /login http://10\.0\.0\.10/login} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect  /logout http://10\.0\.0\.10/logout} }
-        end
-        describe 'with a single status and dest' do
-          let :params do
-            default_params.merge({
-              :redirect_source => [
-                '/login',
-                '/logout',
-              ],
-              :redirect_dest   => 'http://10.0.0.10/test',
-              :redirect_status => 'permanent',
-            })
-          end
-
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /login http://10\.0\.0\.10/test} }
-          it { should contain_file("25-#{title}.conf").with_content %r{  Redirect permanent /logout http://10\.0\.0\.10/test} }
-        end
-
-        describe 'with a directoryindex specified' do
-          let :params do
-            default_params.merge({
-              :directoryindex => 'index.php'
-            })
-          end
-          it { should contain_file("25-#{title}.conf").with_content %r{DirectoryIndex index.php} }
-	end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec
deleted file mode 100644
index 76e9a144667..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/files/spec
+++ /dev/null
@@ -1 +0,0 @@
-# This is a file only for spec testing
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb
deleted file mode 100644
index 019debfe481..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/fixtures/modules/site_apache/templates/fake.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-Fake template for rspec.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts
deleted file mode 100644
index de653df4b3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---format s
---colour
---loadby mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb
deleted file mode 100644
index 65379ee38a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-
-  c.before :each do
-    # Ensure that we don't accidentally cache facts and environment
-    # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-
-    # Store any environment variables away to be restored later
-    @old_env = {}
-    ENV.each_key {|k| @old_env[k] = ENV[k]}
-
-    if ENV['STRICT_VARIABLES'] == 'yes'
-      Puppet.settings[:strict_variables]=true
-    end
-  end
-end
-
-shared_examples :compile, :compile => true do
-  it { should compile.with_all_deps }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 370de46c0d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
-
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    if host['platform'] =~ /debian/
-      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-    end
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-UNSUPPORTED_PLATFORMS = ['Suse','windows','AIX','Solaris']
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apache')
-    hosts.each do |host|
-      # Required for mod_passenger tests.
-      if fact('osfamily') == 'RedHat'
-        on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
-      end
-      # Required for manifest to make mod_pagespeed repository available
-      if fact('osfamily') == 'Debian'
-        on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
-      end
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
deleted file mode 100644
index ddb9dddda4b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/spec/unit/provider/a2mod/gentoo_spec.rb
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:a2mod).provider(:gentoo)
-
-describe provider_class do
-  before :each do
-    provider_class.clear
-  end
-
-  [:conf_file, :instances, :modules, :initvars, :conf_file, :clear].each do |method|
-    it "should respond to the class method #{method}" do
-      provider_class.should respond_to(method)
-    end
-  end
-
-  describe "when fetching modules" do
-    before do
-      @filetype = mock()
-    end
-
-    it "should return a sorted array of the defined parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).returns(@filetype)
-
-      provider_class.modules.should == %w{bar baz foo}
-    end
-
-    it "should cache the module list" do
-      @filetype.expects(:read).once.returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAZ"\n})
-      provider_class.expects(:filetype).once.returns(@filetype)
-
-      2.times { provider_class.modules.should == %w{bar baz foo} }
-    end
-
-    it "should normalize parameters" do
-      @filetype.expects(:read).returns(%Q{APACHE2_OPTS="-D FOO -D BAR -D BAR"\n})
-      provider_class.expects(:filetype).returns(@filetype)
-
-      provider_class.modules.should == %w{bar foo}
-    end
-  end
-
-  describe "when prefetching" do
-    it "should match providers to resources" do
-      provider = mock("ssl_provider", :name => "ssl")
-      resource = mock("ssl_resource")
-      resource.expects(:provider=).with(provider)
-
-      provider_class.expects(:instances).returns([provider])
-      provider_class.prefetch("ssl" => resource)
-    end
-  end
-
-  describe "when flushing" do
-    before :each do
-      @filetype = mock()
-      @filetype.stubs(:backup)
-      provider_class.expects(:filetype).at_least_once.returns(@filetype)
-
-      @info = mock()
-      @info.stubs(:[]).with(:name).returns("info")
-      @info.stubs(:provider=)
-
-      @mpm = mock()
-      @mpm.stubs(:[]).with(:name).returns("mpm")
-      @mpm.stubs(:provider=)
-
-      @ssl = mock()
-      @ssl.stubs(:[]).with(:name).returns("ssl")
-      @ssl.stubs(:provider=)
-    end
-
-    it "should add modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      provider_class.flush
-    end
-
-    it "should remove modules whose ensure is present" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS=""})
-
-      @info.stubs(:should).with(:ensure).returns(:absent)
-      @info.stubs(:provider=)
-      provider_class.prefetch("info" => @info)
-
-      provider_class.flush
-    end
-
-    it "should not modify providers without resources" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-D INFO -D MPM"})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D MPM -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:absent)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should write the modules in sorted order" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).with(%Q{APACHE2_OPTS="-D INFO -D MPM -D SSL"})
-
-      @mpm.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("mpm" => @mpm)
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should write the records back once" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      provider_class.flush
-    end
-
-    it "should only modify the line containing APACHE2_OPTS" do
-      @filetype.expects(:read).at_least_once.returns(%Q{# Comment\nAPACHE2_OPTS=""\n# Another comment})
-      @filetype.expects(:write).once.with(%Q{# Comment\nAPACHE2_OPTS="-D INFO"\n# Another comment})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      provider_class.flush
-    end
-
-    it "should restore any arbitrary arguments" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-Y -D MPM -X"})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-Y -X -D INFO -D MPM"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-      provider_class.flush
-    end
-
-    it "should backup the file once if changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS=""})
-      @filetype.expects(:write).once.with(%Q{APACHE2_OPTS="-D INFO -D SSL"})
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup)
-      provider_class.flush
-    end
-
-    it "should not write the file or run backups if no changes were made" do
-      @filetype.expects(:read).at_least_once.returns(%Q{APACHE2_OPTS="-X -D INFO -D SSL -Y"})
-      @filetype.expects(:write).never
-
-      @info.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("info" => @info)
-
-      @ssl.stubs(:should).with(:ensure).returns(:present)
-      provider_class.prefetch("ssl" => @ssl)
-
-      @filetype.unstub(:backup)
-      @filetype.expects(:backup).never
-      provider_class.flush
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb
deleted file mode 100644
index 10e51644ce8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/confd/no-accf.conf.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<IfDefine NOHTTPACCEPT>
-   AcceptFilter http none
-   AcceptFilter https none
-</IfDefine>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb
deleted file mode 100644
index cac3aaf1025..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/httpd.conf.erb
+++ /dev/null
@@ -1,109 +0,0 @@
-# Security
-ServerTokens <%= @server_tokens %>
-ServerSignature <%= @server_signature %>
-TraceEnable <%= @trace_enable %>
-
-ServerName "<%= @servername %>"
-ServerRoot "<%= @server_root %>"
-PidFile <%= @pidfile %>
-Timeout <%= @timeout %>
-KeepAlive <%= @keepalive %>
-MaxKeepAliveRequests <%= @max_keepalive_requests %>
-KeepAliveTimeout <%= @keepalive_timeout %>
-
-User <%= @user %>
-Group <%= @group %>
-
-AccessFileName .htaccess
-<FilesMatch "^\.ht">
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all denied
-<%- else -%>
-     Order allow,deny
-     Deny from all
-     Satisfy all
-<%- end -%>
-</FilesMatch>
-
-<Directory />
-  Options FollowSymLinks
-  AllowOverride None
-</Directory>
-
-DefaultType none
-HostnameLookups Off
-ErrorLog "<%= @logroot %>/<%= @error_log %>"
-LogLevel <%= @log_level %>
-EnableSendfile <%= @sendfile %>
-
-#Listen 80
-
-<% if @apxs_workaround -%>
-# Workaround: without this hack apxs would be confused about where to put
-# LoadModule directives and fail entire procedure of apache package
-# installation/reinstallation. This problem was observed on FreeBSD (apache22).
-#LoadModule fake_module libexec/apache22/mod_fake.so
-<% end -%>
-
-Include "<%= @mod_load_dir %>/*.load"
-<% if @mod_load_dir != @confd_dir and @mod_load_dir != @vhost_load_dir -%>
-Include "<%= @mod_load_dir %>/*.conf"
-<% end -%>
-Include "<%= @ports_file %>"
-
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-<% if @log_formats and !@log_formats.empty? -%>
-  <%- @log_formats.each do |nickname,format| -%>
-LogFormat "<%= format -%>" <%= nickname %>
-  <%- end -%>
-<% end -%>
-
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-IncludeOptional "<%= @confd_dir %>/*.conf"
-<%- else -%>
-Include "<%= @confd_dir %>/*.conf"
-<%- end -%>
-<% if @vhost_load_dir != @confd_dir -%>
-Include "<%= @vhost_load_dir %>/*"
-<% end -%>
-
-<% if @error_documents -%>
-# /usr/share/apache2/error on debian
-Alias /error/ "<%= @error_documents_path %>/"
-
-<Directory "<%= @error_documents_path %>">
-  AllowOverride None
-  Options IncludesNoExec
-  AddOutputFilter Includes html
-  AddHandler type-map var
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  Require all granted
-<%- else -%>
-  Order allow,deny
-  Allow from all
-<%- end -%>
-  LanguagePriority en cs de es fr it nl sv pt-br ro
-  ForceLanguagePriority Prefer Fallback
-</Directory>
-
-ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-ErrorDocument 410 /error/HTTP_GONE.html.var
-ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb
deleted file mode 100644
index 8fc871b0ad7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/listen.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%# Listen should always be one of:
-  - <port>
-  - <ipv4>:<port>
-  - [<ipv6]:<port>
--%>
-Listen <%= @listen_addr_port %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb
deleted file mode 100644
index 151a806c9f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/alias.conf.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<IfModule alias_module>
-Alias /icons/ "<%= @icons_path %>/"
-<Directory "<%= @icons_path %>">
-    Options Indexes MultiViews
-    AllowOverride None
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all granted
-<%- else -%>
-     Order allow,deny
-     Allow from all
-<%- end -%>
-</Directory>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
deleted file mode 100644
index 565fcf0df90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/authnz_ldap.conf.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if @verifyServerCert == true -%>
-LDAPVerifyServerCert On
-<% else -%>
-LDAPVerifyServerCert Off
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb
deleted file mode 100644
index ef6bbebea60..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/autoindex.conf.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=* Charset=UTF-8
-AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip x-bzip2
-
-AddIconByType (TXT,/icons/text.gif) text/*
-AddIconByType (IMG,/icons/image2.gif) image/*
-AddIconByType (SND,/icons/sound2.gif) audio/*
-AddIconByType (VID,/icons/movie.gif) video/*
-
-AddIcon /icons/binary.gif .bin .exe
-AddIcon /icons/binhex.gif .hqx
-AddIcon /icons/tar.gif .tar
-AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
-AddIcon /icons/a.gif .ps .ai .eps
-AddIcon /icons/layout.gif .html .shtml .htm .pdf
-AddIcon /icons/text.gif .txt
-AddIcon /icons/c.gif .c
-AddIcon /icons/p.gif .pl .py
-AddIcon /icons/f.gif .for
-AddIcon /icons/dvi.gif .dvi
-AddIcon /icons/uuencoded.gif .uu
-AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-AddIcon /icons/tex.gif .tex
-AddIcon /icons/bomb.gif /core
-AddIcon (SND,/icons/sound2.gif) .ogg
-AddIcon (VID,/icons/movie.gif) .ogm
-
-AddIcon /icons/back.gif ..
-AddIcon /icons/hand.right.gif README
-AddIcon /icons/folder.gif ^^DIRECTORY^^
-AddIcon /icons/blank.gif ^^BLANKICON^^
-
-AddIcon /icons/odf6odt-20x22.png .odt
-AddIcon /icons/odf6ods-20x22.png .ods
-AddIcon /icons/odf6odp-20x22.png .odp
-AddIcon /icons/odf6odg-20x22.png .odg
-AddIcon /icons/odf6odc-20x22.png .odc
-AddIcon /icons/odf6odf-20x22.png .odf
-AddIcon /icons/odf6odb-20x22.png .odb
-AddIcon /icons/odf6odi-20x22.png .odi
-AddIcon /icons/odf6odm-20x22.png .odm
-
-AddIcon /icons/odf6ott-20x22.png .ott
-AddIcon /icons/odf6ots-20x22.png .ots
-AddIcon /icons/odf6otp-20x22.png .otp
-AddIcon /icons/odf6otg-20x22.png .otg
-AddIcon /icons/odf6otc-20x22.png .otc
-AddIcon /icons/odf6otf-20x22.png .otf
-AddIcon /icons/odf6oti-20x22.png .oti
-AddIcon /icons/odf6oth-20x22.png .oth
-
-DefaultIcon /icons/unknown.gif
-ReadmeName README.html
-HeaderName HEADER.html
-
-IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb
deleted file mode 100644
index 5f82d7424c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/cgid.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-ScriptSock "<%= @cgisock_path %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb
deleted file mode 100644
index 3c53e9e14b2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dav_fs.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-DAVLockDB "<%= @dav_lock %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb
deleted file mode 100644
index a3cdf0552e4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/deflate.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-AddOutputFilterByType DEFLATE text/html text/plain text/xml
-AddOutputFilterByType DEFLATE text/css
-AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript
-AddOutputFilterByType DEFLATE application/rss+xml
-
-DeflateFilterNote Input instream
-DeflateFilterNote Output outstream
-DeflateFilterNote Ratio ratio
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb
deleted file mode 100644
index 741f6ae034a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/dir.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-DirectoryIndex <%= @indexes.join(' ') %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb
deleted file mode 100644
index 0c7e2c4b73e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/disk_cache.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule mod_proxy.c>
-  <IfModule mod_disk_cache.c>
-     CacheEnable disk /
-     CacheRoot "<%= @cache_root %>"
-     CacheDirLevels 2
-     CacheDirLength 1
-  </IfModule>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb
deleted file mode 100644
index 40099543d5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/event.conf.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfModule mpm_event_module>
-  ServerLimit         <%= @serverlimit %>
-  StartServers        <%= @startservers %>
-  MaxClients          <%= @maxclients %>
-  MinSpareThreads     <%= @minsparethreads %>
-  MaxSpareThreads     <%= @maxsparethreads %>
-  ThreadsPerChild     <%= @threadsperchild %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb
deleted file mode 100644
index 8d94a236141..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fastcgi.conf.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-# The Fastcgi Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-<IfModule mod_fastcgi.c>
-  AddHandler fastcgi-script .fcgi
-  FastCgiIpcDir "<%= @fastcgi_lib_path %>"
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb
deleted file mode 100644
index a82bc30df90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/fcgid.conf.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfModule mod_fcgid.c>
-<% @options.sort_by {|key, value| key}.each do |key, value| -%>
-  <%= key %> <%= value %>
-<% end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb
deleted file mode 100644
index d5288fb8c92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/info.conf.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<Location /server-info>
-    SetHandler server-info
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
-</Location>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb
deleted file mode 100644
index f45f2b35dd4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/itk.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule mpm_itk_module>
-  StartServers        <%= @startservers %>
-  MinSpareServers     <%= @minspareservers %>
-  MaxSpareServers     <%= @maxspareservers %>
-  ServerLimit         <%= @serverlimit %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb
deleted file mode 100644
index 00197761753..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ldap.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<Location /ldap-status>
-    SetHandler ldap-status
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 ::1
-    Satisfy all
-    <%- end -%>
-</Location>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb
deleted file mode 100644
index 51f45edb21a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/load.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @loadfiles -%>
-<% Array(@loadfiles).each do |loadfile| -%>
-LoadFile <%= loadfile %>
-<% end -%>
-
-<% end -%>
-LoadModule <%= @_id %> <%= @_path %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb
deleted file mode 100644
index a69a424a6a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime.conf.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-TypesConfig <%= @mime_types_config %>
-
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-AddType application/x-bzip2 .bz2
-
-AddLanguage ca .ca
-AddLanguage cs .cz .cs
-AddLanguage da .dk
-AddLanguage de .de
-AddLanguage el .el
-AddLanguage en .en
-AddLanguage eo .eo
-AddLanguage es .es
-AddLanguage et .et
-AddLanguage fr .fr
-AddLanguage he .he
-AddLanguage hr .hr
-AddLanguage it .it
-AddLanguage ja .ja
-AddLanguage ko .ko
-AddLanguage ltz .ltz
-AddLanguage nl .nl
-AddLanguage nn .nn
-AddLanguage no .no
-AddLanguage pl .po
-AddLanguage pt .pt
-AddLanguage pt-BR .pt-br
-AddLanguage ru .ru
-AddLanguage sv .sv
-AddLanguage zh-CN .zh-cn
-AddLanguage zh-TW .zh-tw
-
-AddHandler type-map var
-AddType text/html .shtml
-AddOutputFilter INCLUDES .shtml
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb
deleted file mode 100644
index 1ce1bc3c169..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mime_magic.conf.erb
+++ /dev/null
@@ -1 +0,0 @@
-MIMEMagicFile "<%= @magic_file %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb
deleted file mode 100644
index eb6f1ff5f51..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/mpm_event.conf.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<IfModule mpm_event_module>
-  StartServers          2
-  MinSpareThreads      25
-  MaxSpareThreads      75
-  ThreadLimit          64
-  ThreadsPerChild      25
-  MaxClients          150
-  MaxRequestsPerChild   0
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb
deleted file mode 100644
index 50921019bcf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/negotiation.conf.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
-ForceLanguagePriority Prefer Fallback
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb
deleted file mode 100644
index a5c81752f3e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/nss.conf.erb
+++ /dev/null
@@ -1,228 +0,0 @@
-#
-# This is the Apache server configuration file providing SSL support using.
-# the mod_nss plugin.  It contains the configuration directives to instruct
-# the server how to serve pages over an https connection.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.
-#
-
-#LoadModule nss_module modules/libmodnss.so
-
-#
-# When we also provide SSL we have to listen to the
-# standard HTTP port (see above) and to the HTTPS port
-#
-# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
-#       Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:443"
-#
-Listen 8443
-
-##
-##  SSL Global Context
-##
-##  All SSL configuration in this context applies both to
-##  the main server and all SSL-enabled virtual hosts.
-##
-
-#
-#   Some MIME-types for downloading Certificates and CRLs
-#
-AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
-
-#   Pass Phrase Dialog:
-#   Configure the pass phrase gathering process.
-#   The filtering dialog program (`builtin' is a internal
-#   terminal dialog) has to provide the pass phrase on stdout.
-<% if @passwd_file -%>
-NSSPassPhraseDialog  "file:<%= @passwd_file %>"
-<% else -%>
-NSSPassPhraseDialog  builtin
-<% end -%>
-
-#   Pass Phrase Helper:
-#   This helper program stores the token password pins between
-#   restarts of Apache.
-NSSPassPhraseHelper /usr/sbin/nss_pcache
-
-#   Configure the SSL Session Cache.
-#   NSSSessionCacheSize is the number of entries in the cache.
-#   NSSSessionCacheTimeout is the SSL2 session timeout (in seconds).
-#   NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds).
-NSSSessionCacheSize 10000
-NSSSessionCacheTimeout 100
-NSSSession3CacheTimeout 86400
-
-#
-# Pseudo Random Number Generator (PRNG):
-# Configure one or more sources to seed the PRNG of the SSL library.
-# The seed data should be of good random quality.
-# WARNING! On some platforms /dev/random blocks if not enough entropy
-# is available. Those platforms usually also provide a non-blocking
-# device, /dev/urandom, which may be used instead.
-#
-# This does not support seeding the RNG with each connection.
-
-NSSRandomSeed startup builtin
-#NSSRandomSeed startup file:/dev/random  512
-#NSSRandomSeed startup file:/dev/urandom 512
-
-#
-# TLS Negotiation configuration under RFC 5746
-#
-# Only renegotiate if the peer's hello bears the TLS renegotiation_info
-# extension. Default off.
-NSSRenegotiation off
-
-# Peer must send Signaling Cipher Suite Value (SCSV) or
-# Renegotiation Info (RI) extension in ALL handshakes.  Default: off
-NSSRequireSafeNegotiation off
-
-##
-## SSL Virtual Host Context
-##
-
-<VirtualHost _default_:8443>
-
-#   General setup for the virtual host
-#DocumentRoot "/etc/httpd/htdocs"
-#ServerName www.example.com:8443
-#ServerAdmin you@example.com
-
-# mod_nss can log to separate log files, you can choose to do that if you'd like
-# LogLevel is not inherited from httpd.conf.
-ErrorLog "<%= @error_log %>"
-TransferLog "<%= @transfer_log %>"
-LogLevel warn
-
-#   SSL Engine Switch:
-#   Enable/Disable SSL for this virtual host.
-NSSEngine on
-
-#   SSL Cipher Suite:
-#   List the ciphers that the client is permitted to negotiate.
-#   See the mod_nss documentation for a complete list.
-
-# SSL 3 ciphers. SSL 2 is disabled by default.
-NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha
-
-# SSL 3 ciphers + ECC ciphers. SSL 2 is disabled by default.
-#
-# Comment out the NSSCipherSuite line above and use the one below if you have
-# ECC enabled NSS and mod_nss and want to use Elliptical Curve Cryptography
-#NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha,-ecdh_ecdsa_null_sha,+ecdh_ecdsa_rc4_128_sha,+ecdh_ecdsa_3des_sha,+ecdh_ecdsa_aes_128_sha,+ecdh_ecdsa_aes_256_sha,-ecdhe_ecdsa_null_sha,+ecdhe_ecdsa_rc4_128_sha,+ecdhe_ecdsa_3des_sha,+ecdhe_ecdsa_aes_128_sha,+ecdhe_ecdsa_aes_256_sha,-ecdh_rsa_null_sha,+ecdh_rsa_128_sha,+ecdh_rsa_3des_sha,+ecdh_rsa_aes_128_sha,+ecdh_rsa_aes_256_sha,-echde_rsa_null,+ecdhe_rsa_rc4_128_sha,+ecdhe_rsa_3des_sha,+ecdhe_rsa_aes_128_sha,+ecdhe_rsa_aes_256_sha
-
-#   SSL Protocol:
-#   Cryptographic protocols that provide communication security.
-#   NSS handles the specified protocols as "ranges", and automatically
-#   negotiates the use of the strongest protocol for a connection starting
-#   with the maximum specified protocol and downgrading as necessary to the
-#   minimum specified protocol that can be used between two processes.
-#   Since all protocol ranges are completely inclusive, and no protocol in the
-#   middle of a range may be excluded, the entry "NSSProtocol SSLv3,TLSv1.1"
-#   is identical to the entry "NSSProtocol SSLv3,TLSv1.0,TLSv1.1".
-NSSProtocol SSLv3,TLSv1.0,TLSv1.1
-
-#   SSL Certificate Nickname:
-#   The nickname of the RSA server certificate you are going to use.
-NSSNickname Server-Cert
-
-#   SSL Certificate Nickname:
-#   The nickname of the ECC server certificate you are going to use, if you
-#   have an ECC-enabled version of NSS and mod_nss
-#NSSECCNickname Server-Cert-ecc
-
-#   Server Certificate Database:
-#   The NSS security database directory that holds the certificates and
-#   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
-#   Provide the directory that these files exist.
-NSSCertificateDatabase "<%= @httpd_dir -%>/alias"
-
-#   Database Prefix:
-#   In order to be able to store multiple NSS databases in one directory
-#   they need unique names. This option sets the database prefix used for
-#   cert8.db and key3.db.
-#NSSDBPrefix my-prefix-
-
-#   Client Authentication (Type):
-#   Client certificate verification type.  Types are none, optional and
-#   require.
-#NSSVerifyClient none
-
-#
-#   Online Certificate Status Protocol (OCSP).
-#   Verify that certificates have not been revoked before accepting them.
-#NSSOCSP off
-
-#
-#   Use a default OCSP responder. If enabled this will be used regardless
-#   of whether one is included in a client certificate. Note that the
-#   server certificate is verified during startup.
-#
-#   NSSOCSPDefaultURL defines the service URL of the OCSP responder
-#   NSSOCSPDefaultName is the nickname of the certificate to trust to
-#       sign the OCSP responses.
-#NSSOCSPDefaultResponder on
-#NSSOCSPDefaultURL http://example.com/ocsp/status
-#NSSOCSPDefaultName ocsp-nickname
-
-#   Access Control:
-#   With SSLRequire you can do per-directory access control based
-#   on arbitrary complex boolean expressions containing server
-#   variable checks and other lookup directives.  The syntax is a
-#   mixture between C and Perl.  See the mod_nss documentation
-#   for more details.
-#<Location />
-#NSSRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
-#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
-#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
-#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
-#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
-#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
-#</Location>
-
-#   SSL Engine Options:
-#   Set various options for the SSL engine.
-#   o FakeBasicAuth:
-#     Translate the client X.509 into a Basic Authorisation.  This means that
-#     the standard Auth/DBMAuth methods can be used for access control.  The
-#     user name is the `one line' version of the client's X.509 certificate.
-#     Note that no password is obtained from the user. Every entry in the user
-#     file needs this password: `xxj31ZMTZzkVA'.
-#   o ExportCertData:
-#     This exports two additional environment variables: SSL_CLIENT_CERT and
-#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
-#     server (always existing) and the client (only existing when client
-#     authentication is used). This can be used to import the certificates
-#     into CGI scripts.
-#   o StdEnvVars:
-#     This exports the standard SSL/TLS related `SSL_*' environment variables.
-#     Per default this exportation is switched off for performance reasons,
-#     because the extraction step is an expensive operation and is usually
-#     useless for serving static content. So one usually enables the
-#     exportation for CGI and SSI requests only.
-#   o StrictRequire:
-#     This denies access when "NSSRequireSSL" or "NSSRequire" applied even
-#     under a "Satisfy any" situation, i.e. when it applies access is denied
-#     and no other module can change it.
-#   o OptRenegotiate:
-#     This enables optimized SSL connection renegotiation handling when SSL
-#     directives are used in per-directory context.
-#NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
-<FilesMatch "\.(cgi|shtml|phtml|php3?)$">
-    NSSOptions +StdEnvVars
-</FilesMatch>
-<Directory "/var/www/cgi-bin">
-    NSSOptions +StdEnvVars
-</Directory>
-
-#   Per-Server Logging:
-#   The home of a custom SSL log file. Use this when you want a
-#   compact non-error SSL logfile on a virtual host basis.
-#CustomLog /home/rcrit/redhat/apache/logs/ssl_request_log \
-#          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-
-</VirtualHost>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb
deleted file mode 100644
index a4d8a7220e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/pagespeed.conf.erb
+++ /dev/null
@@ -1,98 +0,0 @@
-ModPagespeed on
-
-ModPagespeedInheritVHostConfig <%= @inherit_vhost_config %>
-AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
-<% if @filter_xhtml -%>
-AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER application/xhtml+xml
-<% end -%>
-ModPagespeedFileCachePath "<%= @cache_path %>"
-ModPagespeedLogDir "<%= @log_dir %>"
-    
-<% @memache_servers.each do |server| -%>
-ModPagespeedMemcachedServers <%= server -%>
-<% end -%>
-
-ModPagespeedRewriteLevel <%= @rewrite_level -%>
-
-<% @disable_filters.each do |filter| -%>
-ModPagespeedDisableFilters <%= filter -%>
-<% end -%>
-    
-<% @enable_filters.each do |filter| -%>
-ModPagespeedEnableFilters <%= filter -%>
-<% end -%>
-
-<% @forbid_filters.each do |filter| -%>
-ModPagespeedForbidFilters <%= filter -%>
-<% end -%>
-
-ModPagespeedRewriteDeadlinePerFlushMs <%= @rewrite_deadline_per_flush_ms %>
-
-<% if @additional_domains -%>
-ModPagespeedDomain <%= @additional_domains -%>
-<% end -%>
-
-ModPagespeedFileCacheSizeKb          <%= @file_cache_size_kb %>
-ModPagespeedFileCacheCleanIntervalMs <%= @file_cache_clean_interval_ms %>
-ModPagespeedLRUCacheKbPerProcess     <%= @lru_cache_per_process %>
-ModPagespeedLRUCacheByteLimit        <%= @lru_cache_byte_limit %>
-ModPagespeedCssFlattenMaxBytes       <%= @css_flatten_max_bytes %>
-ModPagespeedCssInlineMaxBytes        <%= @css_inline_max_bytes %>
-ModPagespeedCssImageInlineMaxBytes   <%= @css_image_inline_max_bytes %>
-ModPagespeedImageInlineMaxBytes      <%= @image_inline_max_bytes %>
-ModPagespeedJsInlineMaxBytes         <%= @js_inline_max_bytes %>
-ModPagespeedCssOutlineMinBytes       <%= @css_outline_min_bytes %>
-ModPagespeedJsOutlineMinBytes        <%= @js_outline_min_bytes %>
-
-
-ModPagespeedFileCacheInodeLimit <%= @inode_limit %>
-ModPagespeedImageMaxRewritesAtOnce <%= @image_max_rewrites_at_once %>
-
-ModPagespeedNumRewriteThreads <%= @num_rewrite_threads %>
-ModPagespeedNumExpensiveRewriteThreads <%= @num_expensive_rewrite_threads %>
-
-ModPagespeedStatistics <%= @collect_statistics %>
-
-<Location /mod_pagespeed_statistics>
-    # You may insert other "Allow from" lines to add hosts you want to
-    # allow to look at generated statistics.  Another possibility is
-    # to comment out the "Order" and "Allow" options from the config
-    # file, to allow any client that can reach your server to examine
-    # statistics.  This might be appropriate in an experimental setup or
-    # if the Apache server is protected by a reverse proxy that will
-    # filter URLs in some fashion.
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_view_stats).join(" ") %>
-    <%- end -%>
-    SetHandler mod_pagespeed_statistics
-</Location>
-
-ModPagespeedStatisticsLogging <%= @statistics_logging %>
-<Location /pagespeed_console>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_console).join(" ") %>
-    <%- end -%>
-    SetHandler pagespeed_console
-</Location>
-
-ModPagespeedMessageBufferSize <%= @message_buffer_size %>
-
-<Location /mod_pagespeed_message>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
-    <%- else -%>
-    Order allow,deny
-    Allow from 127.0.0.1 ::1 <%= Array(@allow_pagespeed_message).join(" ") %>
-    <%- end -%>
-    SetHandler mod_pagespeed_message
-</Location>
-
-<% @additional_configuration.each_pair do |key, value| -%>
-<%= key %> <%= value %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb
deleted file mode 100644
index dd9eee3b134..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/passenger.conf.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-# The Passanger Apache module configuration file is being
-# managed by Puppet and changes will be overwritten.
-<IfModule mod_passenger.c>
-  <%- if @passenger_root -%>
-  PassengerRoot "<%= @passenger_root %>"
-  <%- end -%>
-  <%- if @passenger_ruby -%>
-  PassengerRuby "<%= @passenger_ruby %>"
-  <%- end -%>
-  <%- if @passenger_default_ruby -%>
-  PassengerDefaultRuby "<%= @passenger_default_ruby %>"
-  <%- end -%>
-  <%- if @passenger_high_performance -%>
-  PassengerHighPerformance <%= @passenger_high_performance %>
-  <%- end -%>
-  <%- if @passenger_max_pool_size -%>
-  PassengerMaxPoolSize <%= @passenger_max_pool_size %>
-  <%- end -%>
-  <%- if @passenger_pool_idle_time -%>
-  PassengerPoolIdleTime <%= @passenger_pool_idle_time %>
-  <%- end -%>
-  <%- if @passenger_max_requests -%>
-  PassengerMaxRequests <%= @passenger_max_requests %>
-  <%- end -%>
-  <%- if @passenger_stat_throttle_rate -%>
-  PassengerStatThrottleRate <%= @passenger_stat_throttle_rate %>
-  <%- end -%>
-  <%- if @rack_autodetect -%>
-  RackAutoDetect <%= @rack_autodetect %>
-  <%- end -%>
-  <%- if @rails_autodetect -%>
-  RailsAutoDetect <%= @rails_autodetect %>
-  <%- end -%>
-  <%- if @passenger_use_global_queue -%>
-  PassengerUseGlobalQueue <%= @passenger_use_global_queue %>
-  <%- end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb
deleted file mode 100644
index 13c8d708db4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/peruser.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<IfModule mpm_peruser_module>
-  MinSpareProcessors  <%= @minspareprocessors %>
-  MinProcessors       <%= @minprocessors %>
-  MaxProcessors       <%= @maxprocessors %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  IdleTimeout         <%= @idletimeout %>
-  ExpireTimeout       <%= @expiretimeout %>
-  KeepAlive           <%= @keepalive %>
-  Include             "<%= @mod_dir %>/peruser/multiplexers/*.conf"
-  Include             "<%= @mod_dir %>/peruser/processors/*.conf"
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb
deleted file mode 100644
index 44df2ae066d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/php5.conf.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# PHP is an HTML-embedded scripting language which attempts to make it
-# easy for developers to write dynamically generated webpages.
-#
-#<IfModule prefork.c>
-#  LoadModule php5_module modules/libphp5.so
-#</IfModule>
-#<IfModule worker.c>
-#  # Use of the "ZTS" build with worker is experimental, and no shared
-#  # modules are supported.
-#  LoadModule php5_module modules/libphp5-zts.so
-#</IfModule>
-
-#
-# Cause the PHP interpreter to handle files with a .php extension.
-#
-AddHandler php5-script <%= @extensions.flatten.compact.join(' ') %>
-AddType text/html .php
-
-#
-# Add index.php to the list of files that will be served as directory
-# indexes.
-#
-DirectoryIndex index.php
-
-#
-# Uncomment the following line to allow PHP to pretty-print .phps
-# files as PHP source code:
-#
-#AddType application/x-httpd-php-source .phps
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb
deleted file mode 100644
index aabfdf7b22a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/prefork.conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule mpm_prefork_module>
-  StartServers        <%= @startservers %>
-  MinSpareServers     <%= @minspareservers %>
-  MaxSpareServers     <%= @maxspareservers %>
-  ServerLimit         <%= @serverlimit %>
-  MaxClients          <%= @maxclients %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb
deleted file mode 100644
index 5ea829eeb3a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy.conf.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-<IfModule mod_proxy.c>
-  # Do not enable proxying with ProxyRequests until you have secured your
-  # server.  Open proxy servers are dangerous both to your network and to the
-  # Internet at large.
-  ProxyRequests <%= @proxy_requests %>
-
-  <% if @proxy_requests != 'Off' or ( @allow_from and ! @allow_from.empty? ) -%>
-  <Proxy *>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
-  </Proxy>
-  <% end -%>
-
-  # Enable/disable the handling of HTTP/1.1 "Via:" headers.
-  # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
-  # Set to one of: Off | On | Full | Block
-  ProxyVia On
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb
deleted file mode 100644
index fea15f393f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/proxy_html.conf.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-ProxyHTMLLinks  a               href
-ProxyHTMLLinks  area            href
-ProxyHTMLLinks  link            href
-ProxyHTMLLinks  img             src longdesc usemap
-ProxyHTMLLinks  object          classid codebase data usemap
-ProxyHTMLLinks  q               cite
-ProxyHTMLLinks  blockquote      cite
-ProxyHTMLLinks  ins             cite
-ProxyHTMLLinks  del             cite
-ProxyHTMLLinks  form            action
-ProxyHTMLLinks  input           src usemap
-ProxyHTMLLinks  head            profileProxyHTMLLinks  base            href
-ProxyHTMLLinks  script          src for
-
-ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
-                onmouseover onmousemove onmouseout onkeypress \
-                onkeydown onkeyup onfocus onblur onload \
-                onunload onsubmit onreset onselect onchange
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
deleted file mode 100644
index 9a18800da5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/reqtimeout.conf.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-RequestReadTimeout header=20-40,minrate=500
-RequestReadTimeout body=10,minrate=500
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb
deleted file mode 100644
index 56e2398b55b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/rpaf.conf.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Enable reverse proxy add forward
-RPAFenable On
-# RPAFsethostname will, when enabled, take the incoming X-Host header and
-# update the virtual host settings accordingly. This allows to have the same
-# hostnames as in the "real" configuration for the forwarding proxy.
-<% if @sethostname -%>
-RPAFsethostname On
-<% else -%>
-RPAFsethostname Off
-<% end -%>
-# Which IPs are forwarding requests to us
-RPAFproxy_ips <%= Array(@proxy_ips).join(" ") %>
-# Setting RPAFheader allows you to change the header name to parse from the
-# default X-Forwarded-For to something of your choice.
-RPAFheader <%= @header %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb
deleted file mode 100644
index d31c79fe5d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/setenvif.conf.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# The following directives modify normal HTTP response behavior to
-# handle known problems with browser implementations.
-#
-BrowserMatch "Mozilla/2" nokeepalive
-BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-BrowserMatch "RealPlayer 4\.0" force-response-1.0
-BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0
-
-#
-# The following directive disables redirects on non-GET requests for
-# a directory that does not include the trailing slash.  This fixes a 
-# problem with Microsoft WebFolders which does not appropriately handle 
-# redirects for folders with DAV methods.
-# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
-#
-BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
-BrowserMatch "MS FrontPage" redirect-carefully
-BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
-BrowserMatch "^gnome-vfs/1.0" redirect-carefully
-BrowserMatch "^gvfs/1" redirect-carefully
-BrowserMatch "^XML Spy" redirect-carefully
-BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
-BrowserMatch " Konqueror/4" redirect-carefully
-
-<IfModule mod_ssl.c>
-  BrowserMatch "MSIE [2-6]" \
-    nokeepalive ssl-unclean-shutdown \
-    downgrade-1.0 force-response-1.0
-  # MSIE 7 and newer should be able to use keepalive
-  BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb
deleted file mode 100644
index 24274050c28..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/ssl.conf.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<IfModule mod_ssl.c>
-  SSLRandomSeed startup builtin
-  SSLRandomSeed startup file:/dev/urandom 512
-  SSLRandomSeed connect builtin
-  SSLRandomSeed connect file:/dev/urandom 512
-
-  AddType application/x-x509-ca-cert .crt
-  AddType application/x-pkcs7-crl    .crl
-
-  SSLPassPhraseDialog  builtin
-  SSLSessionCache "shmcb:<%= @session_cache %>"
-  SSLSessionCacheTimeout 300
-<% if @ssl_compression -%>
-  SSLCompression On
-<% end -%>
-  <% if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-  Mutex <%= @ssl_mutex %>
-  <% else -%>
-  SSLMutex <%= @ssl_mutex %>
-  <% end -%>
-  SSLCryptoDevice builtin
-  SSLHonorCipherOrder On
-  SSLCipherSuite <%= @ssl_cipher %>
-  SSLProtocol all -SSLv2
-<% if @ssl_options -%>
-  SSLOptions <%= @ssl_options.compact.join(' ') %>
-<% end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb
deleted file mode 100644
index 84f2e034309..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/status.conf.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<Location /server-status>
-    SetHandler server-status
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require ip <%= Array(@allow_from).join(" ") %>
-    <%- else -%>
-    Order deny,allow
-    Deny from all
-    Allow from <%= Array(@allow_from).join(" ") %>
-    <%- end -%>
-</Location>
-ExtendedStatus <%= @extended_status %>
-
-<IfModule mod_proxy.c>
-    # Show Proxy LoadBalancer status in mod_status
-    ProxyStatus On
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb
deleted file mode 100644
index 95fbf97c782..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/suphp.conf.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<IfModule mod_suphp.c>
-    AddType application/x-httpd-suphp .php .php3 .php4 .php5 .phtml
-    suPHP_AddHandler application/x-httpd-suphp
-
-    <Directory />
-        suPHP_Engine on
-    </Directory>
-
-    # By default, disable suPHP for debian packaged web applications as files
-    # are owned by root and cannot be executed by suPHP because of min_uid.
-    <Directory /usr/share>
-        suPHP_Engine off
-    </Directory>
-
-# # Use a specific php config file (a dir which contains a php.ini file)
-#       suPHP_ConfigPath /etc/php4/cgi/suphp/
-# # Tells mod_suphp NOT to handle requests with the type <mime-type>.
-#       suPHP_RemoveHandler <mime-type>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb
deleted file mode 100644
index add525d5eac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/userdir.conf.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<IfModule mod_userdir.c>
-<% if @disable_root -%>
-  UserDir disabled root
-<% end -%>
-  UserDir <%= @dir %>
-
-  <Directory "<%= @home %>/*/<%= @dir %>">
-    AllowOverride FileInfo AuthConfig Limit Indexes
-    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-    <Limit GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      Require all denied
-      <%- else -%>
-      Order allow,deny
-      Allow from all
-      <%- end -%>
-    </Limit>
-    <LimitExcept GET POST OPTIONS>
-      <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      Require all denied
-      <%- else -%>
-      Order allow,deny
-      Allow from all
-      <%- end -%>
-    </LimitExcept>
-  </Directory>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb
deleted file mode 100644
index 597e05f8d55..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/worker.conf.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<IfModule mpm_worker_module>
-  ServerLimit         <%= @serverlimit %>
-  StartServers        <%= @startservers %>
-  MaxClients          <%= @maxclients %>
-  MinSpareThreads     <%= @minsparethreads %>
-  MaxSpareThreads     <%= @maxsparethreads %>
-  ThreadsPerChild     <%= @threadsperchild %>
-  MaxRequestsPerChild <%= @maxrequestsperchild %>
-  ThreadLimit         <%= @threadlimit %>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb
deleted file mode 100644
index 18752d2c4a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/mod/wsgi.conf.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-# The WSGI Apache module configuration file is being
-# managed by Puppet an changes will be overwritten.
-<IfModule mod_wsgi.c>
-  <%- if @wsgi_socket_prefix -%>
-  WSGISocketPrefix <%= @wsgi_socket_prefix %>
-  <%- end -%>
-  <%- if @wsgi_python_home -%>
-  WSGIPythonHome "<%= @wsgi_python_home %>"
-  <%- end -%>
-  <%- if @wsgi_python_path -%>
-  WSGIPythonPath "<%= @wsgi_python_path %>"
-  <%- end -%>
-</IfModule>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb
deleted file mode 100644
index cf767680fc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/namevirtualhost.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%# NameVirtualHost should always be one of:
-  - *
-  - *:<port>
-  - _default_:<port>
-  - <ip>
-  - <ip>:<port>
--%>
-NameVirtualHost <%= @addr_port %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb
deleted file mode 100644
index 4908db4ad35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/ports_header.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-# ************************************
-# Listen & NameVirtualHost resources in module puppetlabs-apache
-# Managed by Puppet
-# ************************************
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb
deleted file mode 100644
index 64024cfef3d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost.conf.erb
+++ /dev/null
@@ -1,66 +0,0 @@
-# ************************************
-# Vhost template in module puppetlabs-apache
-# Managed by Puppet
-# ************************************
-
-<VirtualHost <%= @nvh_addr_port %>>
-  ServerName <%= @servername %>
-<% if @serveradmin -%>
-  ServerAdmin <%= @serveradmin %>
-<% end -%>
-
-  ## Vhost docroot
-<% if @virtual_docroot -%>
-  VirtualDocumentRoot "<%= @virtual_docroot %>"
-<% else -%>
-  DocumentRoot "<%= @docroot %>"
-<% end -%>
-<%= scope.function_template(['apache/vhost/_aliases.erb']) -%>
-
-<%= scope.function_template(['apache/vhost/_itk.erb']) -%>
-
-<% if @fallbackresource -%>
-  FallbackResource <%= @fallbackresource %>
-<% end -%>
-
-  ## Directories, there should at least be a declaration for <%= @docroot %>
-<%= scope.function_template(['apache/vhost/_directories.erb']) -%>
-
-  ## Load additional static includes
-<% Array(@additional_includes).each do |include| %>
-  Include "<%= include %>"
-<% end %>
-
-  ## Logging
-<% if @error_log -%>
-  ErrorLog "<%= @error_log_destination %>"
-<% end -%>
-<% if @log_level -%>
-  LogLevel <%= @log_level %>
-<% end -%>
-  ServerSignature Off
-<% if @access_log and @_access_log_env_var -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %> <%= @_access_log_env_var %>
-<% elsif @access_log -%>
-  CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
-<% end -%>
-<%= scope.function_template(['apache/vhost/_action.erb']) -%>
-<%= scope.function_template(['apache/vhost/_block.erb']) -%>
-<%= scope.function_template(['apache/vhost/_error_document.erb']) -%>
-<%= scope.function_template(['apache/vhost/_proxy.erb']) -%>
-<%= scope.function_template(['apache/vhost/_rack.erb']) -%>
-<%= scope.function_template(['apache/vhost/_redirect.erb']) -%>
-<%= scope.function_template(['apache/vhost/_rewrite.erb']) -%>
-<%= scope.function_template(['apache/vhost/_scriptalias.erb']) -%>
-<%= scope.function_template(['apache/vhost/_serveralias.erb']) -%>
-<%= scope.function_template(['apache/vhost/_setenv.erb']) -%>
-<%= scope.function_template(['apache/vhost/_ssl.erb']) -%>
-<%= scope.function_template(['apache/vhost/_suphp.erb']) -%>
-<%= scope.function_template(['apache/vhost/_php_admin.erb']) -%>
-<%= scope.function_template(['apache/vhost/_header.erb']) -%>
-<%= scope.function_template(['apache/vhost/_requestheader.erb']) -%>
-<%= scope.function_template(['apache/vhost/_wsgi.erb']) -%>
-<%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>
-<%= scope.function_template(['apache/vhost/_fastcgi.erb']) -%>
-<%= scope.function_template(['apache/vhost/_suexec.erb']) -%>
-</VirtualHost>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb
deleted file mode 100644
index 8a022905950..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_action.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @action -%>
-
-  Action <%= @action %> /cgi-bin virtual
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb
deleted file mode 100644
index 5fdd76ba240..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_aliases.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if @aliases and ! @aliases.empty? -%>
-  ## Alias declarations for resources outside the DocumentRoot
-  <%- [@aliases].flatten.compact.each do |alias_statement| -%>
-    <%- if alias_statement["path"] != '' -%>
-      <%- if alias_statement["alias"] and alias_statement["alias"] != '' -%>
-  Alias <%= alias_statement["alias"] %> "<%= alias_statement["path"] %>"
-      <%- elsif alias_statement["aliasmatch"] and alias_statement["aliasmatch"] != '' -%>
-  AliasMatch <%= alias_statement["aliasmatch"] %> "<%= alias_statement["path"] %>"
-      <%- end -%>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb
deleted file mode 100644
index d0776829da3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_block.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% if @block and ! @block.empty? -%>
-
-  ## Block access statements
-<% if @block.include? 'scm' -%>
-  # Block access to SCM directories.
-  <DirectoryMatch .*\.(svn|git|bzr)/.*>
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all denied
-  <%- else -%>
-    Deny From All
-  <%- end -%>
-  </DirectoryMatch>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb
deleted file mode 100644
index 973964655ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_custom_fragment.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if @custom_fragment -%>
-
-  ## Custom fragment
-<%= @custom_fragment %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb
deleted file mode 100644
index f4307c76187..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_directories.erb
+++ /dev/null
@@ -1,171 +0,0 @@
-<% if @_directories and ! @_directories.empty? -%>
-  <%- [@_directories].flatten.compact.each do |directory| -%>
-    <%- if directory['path'] and directory['path'] != '' -%>
-  <%- if directory['provider'] and directory['provider'].match('(directory|location|files)') -%>
-    <%- if /^(.*)match$/ =~ directory['provider'] -%>
-      <%- provider = $1.capitalize + 'Match' -%>
-    <%- else -%>
-      <%- provider = directory['provider'].capitalize -%>
-    <%- end -%>
-  <%- else -%>
-    <%- provider = 'Directory' -%>
-  <%- end -%>
-  <%- path = directory['path'] -%>
-
-  <<%= provider %> "<%= path %>">
-    <%- if directory['headers'] -%>
-      <%- Array(directory['headers']).each do |header| -%>
-    Header <%= header %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['options'] -%>
-    Options <%= Array(directory['options']).join(' ') %>
-    <%- end -%>
-    <%- if provider == 'Directory' -%>
-      <%- if directory['index_options'] -%>
-    IndexOptions <%= Array(directory['index_options']).join(' ') %>
-      <%- end -%>
-      <%- if directory['index_order_default'] -%>
-    IndexOrderDefault <%= Array(directory['index_order_default']).join(' ') %>
-      <%- end -%>
-      <%- if directory['allow_override'] -%>
-    AllowOverride <%= Array(directory['allow_override']).join(' ') %>
-      <%- elsif provider == 'Directory' -%>
-    AllowOverride None
-      <%- end -%>
-    <%- end -%>
-    <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-      <%- if directory['require'] and directory['require'] != '' -%>
-    Require <%= Array(directory['require']).join(' ') %>
-      <%- else -%>
-    Require all granted
-      <%- end -%>
-    <%- else -%>
-      <%- if directory['order'] and directory['order'] != '' -%>
-    Order <%= Array(directory['order']).join(',') %>
-      <%- else -%>
-    Order allow,deny
-      <%- end -%>
-      <%- if directory['deny'] and directory['deny'] != '' -%>
-    Deny <%= directory['deny'] %>
-      <%- end -%>
-      <%- if directory['allow'] and ! [ false, 'false', '' ].include?(directory['allow']) -%>
-        <%- if directory['allow'].kind_of?(Array) -%>
-          <%- Array(directory['allow']).each do |access| -%>
-    Allow <%=  access %>
-        <%- end -%>
-      <%- else -%>
-    Allow <%= directory['allow'] %>
-      <%- end -%>
-      <%- elsif [ 'from all', 'from All' ].include?(directory['deny']) -%>
-      <%- elsif ! directory['deny'] and [ false, 'false', '' ].include?(directory['allow']) -%>
-    Deny from all
-      <%- else -%>
-    Allow from all
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['addhandlers'] and ! directory['addhandlers'].empty? -%>
-      <%- [directory['addhandlers']].flatten.compact.each do |addhandler| -%>
-    AddHandler <%= addhandler['handler'] %> <%= Array(addhandler['extensions']).join(' ') %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['sethandler'] and directory['sethandler'] != '' -%>
-    SetHandler <%= directory['sethandler'] %>
-    <%- end -%>
-    <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%>
-    PassengerEnabled <%= directory['passenger_enabled'] %>
-    <%- end -%>
-    <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%>
-      <%- directory['php_admin_flags'].each do |flag,value| -%>
-      <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
-    php_admin_flag <%= "#{flag} #{value}" %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['php_admin_values'] and ! directory['php_admin_values'].empty? -%>
-      <%- directory['php_admin_values'].each do |key,value| -%>
-    php_admin_value <%= "#{key} #{value}" %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['directoryindex'] and directory['directoryindex'] != '' -%>
-    DirectoryIndex <%= directory['directoryindex'] %>
-    <%- end -%>
-    <%- if directory['error_documents'] and ! directory['error_documents'].empty? -%>
-      <%- [directory['error_documents']].flatten.compact.each do |error_document| -%>
-    ErrorDocument <%= error_document['error_code'] %> <%= error_document['document'] %>
-      <%- end -%>
-    <%- end -%>
-    <%- if directory['auth_type'] -%>
-    AuthType <%= directory['auth_type'] %>
-    <%- end -%>
-    <%- if directory['auth_name'] -%>
-    AuthName "<%= directory['auth_name'] %>"
-    <%- end -%>
-    <%- if directory['auth_digest_algorithm'] -%>
-    AuthDigestAlgorithm <%= directory['auth_digest_algorithm'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_domain'] -%>
-    AuthDigestDomain <%= Array(directory['auth_digest_domain']).join(' ') %>
-    <%- end -%>
-    <%- if directory['auth_digest_nonce_lifetime'] -%>
-    AuthDigestNonceLifetime <%= directory['auth_digest_nonce_lifetime'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_provider'] -%>
-    AuthDigestProvider <%= directory['auth_digest_provider'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_qop'] -%>
-    AuthDigestQop <%= directory['auth_digest_qop'] %>
-    <%- end -%>
-    <%- if directory['auth_digest_shmem_size'] -%>
-    AuthDigestShmemSize <%= directory['auth_digest_shmem_size'] %>
-    <%- end -%>
-    <%- if directory['auth_basic_authoritative'] -%>
-    AuthBasicAuthoritative <%= directory['auth_basic_authoritative'] %>
-    <%- end -%>
-    <%- if directory['auth_basic_fake'] -%>
-    AuthBasicFake <%= directory['auth_basic_fake'] %>
-    <%- end -%>
-    <%- if directory['auth_basic_provider'] -%>
-    AuthBasicProvider <%= directory['auth_basic_provider'] %>
-    <%- end -%>
-    <%- if directory['auth_user_file'] -%>
-    AuthUserFile <%= directory['auth_user_file'] %>
-    <%- end -%>
-    <%- if directory['auth_group_file'] -%>
-    AuthGroupFile <%= directory['auth_group_file'] %>
-    <%- end -%>
-    <%- if directory['auth_require'] -%>
-    Require <%= directory['auth_require'] %>
-    <%- end -%>
-    <%- if directory['fallbackresource'] -%>
-    FallbackResource <%= directory['fallbackresource'] %>
-    <%- end -%>
-    <%- if directory['expires_active'] -%>
-    ExpiresActive <%= directory['expires_active'] %>
-    <%- end -%>
-    <%- if directory['expires_default'] -%>
-    ExpiresDefault <%= directory['expires_default'] %>
-    <%- end -%>
-    <%- if directory['expires_by_type'] -%>
-    <%- Array(directory['expires_by_type']).each do |rule| -%>
-    ExpiresByType <%= rule %>
-    <%- end -%>
-    <%- end -%>
-    <%- if directory['force_type'] -%>
-    ForceType <%= directory['force_type'] %>
-    <%- end -%>
-    <%- if directory['ssl_options'] -%>
-    SSLOptions <%= Array(directory['ssl_options']).join(' ') %>
-    <%- end -%>
-    <%- if directory['suphp'] and @suphp_engine == 'on' -%>
-    suPHP_UserGroup <%= directory['suphp']['user'] %> <%= directory['suphp']['group'] %>
-    <%- end -%>
-    <%- if directory['fcgiwrapper'] -%>
-    FcgidWrapper <%= directory['fcgiwrapper']['command'] %> <%= directory['fcgiwrapper']['suffix'] %> <%= directory['fcgiwrapper']['virtual'] %>
-    <%- end -%>
-    <%- if directory['custom_fragment'] -%>
-    <%= directory['custom_fragment'] %>
-    <%- end -%>
-  </<%= provider %>>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb
deleted file mode 100644
index 654e72c6760..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_error_document.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @error_documents and ! @error_documents.empty? -%>
-  <%- [@error_documents].flatten.compact.each do |error_document| -%>
-    <%- if error_document["error_code"] != '' and error_document["document"] != '' -%>
-  ErrorDocument <%= error_document["error_code"] %> <%= error_document["document"] %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb
deleted file mode 100644
index 3a2baa5596a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_fastcgi.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<% if @fastcgi_server -%>
-
-  FastCgiExternalServer <%= @fastcgi_server %> -socket <%= @fastcgi_socket %>
-<% end -%>
-<% if @fastcgi_dir -%>
-
-  <Directory "<%= @fastcgi_dir %>">
-    Options +ExecCGI
-    AllowOverride All
-    SetHandler fastcgi-script
-  <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all granted
-  <%- else -%>
-    Order allow,deny
-    Allow From All
-  <%- end -%>
-    AuthBasicAuthoritative Off
-  </Directory>
-
-  AllowEncodedSlashes On
-  ServerSignature Off
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb
deleted file mode 100644
index c0f68c82573..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_header.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if @headers and ! @headers.empty? -%>
-
-  ## Header rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#header
-  <%- Array(@headers).each do |header_statement| -%>
-    <%- if header_statement != '' -%>
-  Header <%= header_statement %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb
deleted file mode 100644
index 2971c7a7d04..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_itk.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<% if @itk and ! @itk.empty? -%>
-  ## ITK statement
-  <IfModule mpm_itk_module>
-     <%- if @itk["user"] and @itk["group"] -%>
-     AssignUserId <%= @itk["user"] %> <%= @itk["group"] %>
-     <%- end -%>
-     <%- if @itk["assignuseridexpr"] -%>
-     AssignUserIdExpr <%= @itk["assignuseridexpr"] %>
-     <%- end -%>
-     <%- if @itk["assigngroupidexpr"] -%>
-     AssignGroupIdExpr <%= @itk["assigngroupidexpr"] %>
-     <%- end -%>
-     <%- if @itk["maxclientvhost"] -%>
-     MaxClientsVHost <%= @itk["maxclientvhost"] %>
-     <%- end -%>
-     <%- if @itk["nice"] -%>
-     NiceValue <%= @itk["nice"] %>
-     <%- end -%>
-     <%- if @kernelversion >= '3.5.0' -%>
-       <%- if @itk["limituidrange"] -%>
-     LimitUIDRange <%= @itk["limituidrange"] %>
-       <%- end -%>
-       <%- if @itk["limitgidrange"] -%>
-     LimitGIDRange <%= @itk["limitgidrange"] %>
-       <%- end -%>
-     <%- end -%>
-  </IfModule>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb
deleted file mode 100644
index 59536cbc990..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_php_admin.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if @php_admin_values and not @php_admin_values.empty? -%>
-<% @php_admin_values.each do |key,value| -%>
-  php_admin_value <%= key %> <%= value %>
-<% end -%>
-<% end -%>
-<% if @php_admin_flags and not @php_admin_flags.empty? -%>
-<% @php_admin_flags.each do |key,flag| -%>
-<%# normalize flag -%>
-<% if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
-  php_admin_flag <%= key %> <%= flag %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb
deleted file mode 100644
index a1d2e52923e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_proxy.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<% if @proxy_dest or @proxy_pass -%>
-
-  ## Proxy rules
-  ProxyRequests Off
-<%- end -%>
-<% if @proxy_preserve_host %>
-  ProxyPreserveHost On
-<%- end -%>
-<%- [@proxy_pass].flatten.compact.each do |proxy| -%>
-  ProxyPass <%= proxy['path'] %> <%= proxy['url'] %>
-  <Location <%= proxy['path']%>>
-    ProxyPassReverse <%= proxy['url'] %>
-  </Location>
-<% end %>
-<% if @proxy_dest -%>
-<%- Array(@no_proxy_uris).each do |uri| -%>
-  ProxyPass        <%= uri %> !
-<% end %>
-  ProxyPass          / <%= @proxy_dest %>/
-  <Location          />
-    ProxyPassReverse <%= @proxy_dest %>/
-  </Location>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb
deleted file mode 100644
index 4a5b5f1cdcd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rack.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @rack_base_uris -%>
-
-  ## Enable rack
-<% Array(@rack_base_uris).each do |uri| -%>
-  RackBaseURI <%= uri %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb
deleted file mode 100644
index e865bd9afaf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_redirect.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% if @redirect_source and @redirect_dest -%>
-<% @redirect_dest_a   = Array(@redirect_dest) -%>
-<% @redirect_source_a = Array(@redirect_source) -%>
-<% @redirect_status_a = Array(@redirect_status) -%>
-
-  ## Redirect rules
-<% @redirect_source_a.each_with_index do |source, i| -%>
-<% @redirect_dest_a[i] ||= @redirect_dest_a[0] -%>
-<% @redirect_status_a[i] ||= @redirect_status_a[0] -%>
-  Redirect <%= "#{@redirect_status_a[i]} " %><%= source %> <%= @redirect_dest_a[i] %>
-<% end -%>
-<% end -%>
-
-<%- if @redirectmatch_status and @redirectmatch_regexp -%>
-<% @redirectmatch_status_a = Array(@redirectmatch_status) -%>
-<% @redirectmatch_regexp_a = Array(@redirectmatch_regexp) -%>
-
-  ## RedirectMatch rules
-<% @redirectmatch_status_a.each_with_index do |status, i| -%>
-<% @redirectmatch_status_a[i] ||= @redirectmatch_status_a[0] -%>
-<% @redirectmatch_regexp_a[i] ||= @redirectmatch_regexp_a[0] -%>
-  RedirectMatch <%= "#{@redirectmatch_status_a[i]} " %> <%= @redirectmatch_regexp_a[i] %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb
deleted file mode 100644
index 9f175052b59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_requestheader.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if @request_headers and ! @request_headers.empty? -%>
-
-  ## Request header rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-  <%- Array(@request_headers).each do |request_statement| -%>
-    <%- if request_statement != '' -%>
-  RequestHeader <%= request_statement %>
-    <%- end -%>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb
deleted file mode 100644
index af8b45001e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_rewrite.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<%- if @rewrites -%>
-  ## Rewrite rules
-  RewriteEngine On
-  <%- if @rewrite_base -%>
-  RewriteBase <%= @rewrite_base %>
-  <%- end -%>
-
-  <%- [@rewrites].flatten.compact.each do |rewrite_details| -%>
-    <%- if rewrite_details['comment'] -%>
-  #<%= rewrite_details['comment'] %>
-    <%- end -%>
-    <%- if rewrite_details['rewrite_base'] -%>
-  RewriteBase <%= rewrite_details['rewrite_base'] %>
-    <%- end -%>
-    <%- if rewrite_details['rewrite_cond'] -%>
-      <%- Array(rewrite_details['rewrite_cond']).each do |commands| -%>
-        <%- Array(commands).each do |command| -%>
-  RewriteCond <%= command %>
-        <%- end -%>
-      <%- end -%>
-    <%- end -%>
-    <%- Array(rewrite_details['rewrite_rule']).each do |commands| -%>
-      <%- Array(commands).each do |command| -%>
-  RewriteRule <%= command %>
-      <%- end -%>
-
-    <%- end -%>
-  <%- end -%>
-<%- end -%>
-<%# reverse compatibility %>
-<% if @rewrite_rule and !@rewrites -%>
-  ## Rewrite rules
-  RewriteEngine On
-<% if @rewrite_base -%>
-  RewriteBase <%= @rewrite_base %>
-<% end -%>
-<% if @rewrite_cond -%>
-<% Array(@rewrite_cond).each do |cond| -%>
-  RewriteCond <%= cond %>
-<% end -%>
-<% end -%>
-  RewriteRule <%= @rewrite_rule %>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb
deleted file mode 100644
index bb4f6b316ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_scriptalias.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<%- if @scriptaliases.is_a?(Array) -%>
-<%-  aliases = @scriptaliases -%>
-<%- elsif @scriptaliases.is_a?(Hash) -%>
-<%-  aliases = [@scriptaliases] -%>
-<%- else -%>
-<%-  # Nothing to do with any other data type -%>
-<%-  aliases = [] -%>
-<%- end -%>
-<%- if @scriptalias or !aliases.empty? -%>
-  ## Script alias directives
-<%# Combine scriptalais and scriptaliases into a single data structure -%>
-<%# for backward compatibility and ease of implementation -%>
-<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%>
-<%- aliases.flatten.compact! -%>
-<%- aliases.each do |salias| -%>
-  <%- if salias["path"] != '' -%>
-    <%- if salias["alias"] and salias["alias"] != '' -%>
-  ScriptAlias <%= salias['alias'] %> "<%= salias['path'] %>"
-    <%- elsif salias["aliasmatch"] and salias["aliasmatch"] != '' -%>
-  ScriptAliasMatch <%= salias['aliasmatch'] %> "<%= salias['path'] %>"
-    <%- end -%>
-  <%- end -%>
-<%- end -%>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb
deleted file mode 100644
index 278b6ddc538..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_serveralias.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% if @serveraliases and ! @serveraliases.empty? -%>
-
-  ## Server aliases
-<% Array(@serveraliases).each do |serveralias| -%>
-  ServerAlias <%= serveralias %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb
deleted file mode 100644
index d5f9ea84501..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_setenv.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% if @setenv and ! @setenv.empty? -%>
-
-  ## SetEnv/SetEnvIf for environment variables
-<% Array(@setenv).each do |envvar| -%>
-  SetEnv <%= envvar %>
-<% end -%>
-<% end -%>
-<% if @setenvif and ! @setenvif.empty? -%>
-<% Array(@setenvif).each do |envifvar| -%>
-  SetEnvIf <%= envifvar %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb
deleted file mode 100644
index 03c78ef427b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_ssl.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<% if @ssl -%>
-
-  ## SSL directives
-  SSLEngine on
-  SSLCertificateFile      "<%= @ssl_cert %>"
-  SSLCertificateKeyFile   "<%= @ssl_key %>"
-<% if @ssl_chain -%>
-  SSLCertificateChainFile "<%= @ssl_chain %>"
-<% end -%>
-  SSLCACertificatePath    "<%= @ssl_certs_dir %>"
-<% if @ssl_ca -%>
-  SSLCACertificateFile    "<%= @ssl_ca %>"
-<% end -%>
-<% if @ssl_crl_path -%>
-  SSLCARevocationPath     "<%= @ssl_crl_path %>"
-<% end -%>
-<% if @ssl_crl -%>
-  SSLCARevocationFile     "<%= @ssl_crl %>"
-<% end -%>
-<% if @ssl_proxyengine -%>
-  SSLProxyEngine On
-<% end -%>
-<% if @ssl_protocol -%>
-  SSLProtocol             <%= @ssl_protocol %>
-<% end -%>
-<% if @ssl_cipher -%>
-  SSLCipherSuite          <%= @ssl_cipher %>
-<% end -%>
-<% if @ssl_honorcipherorder -%>
-  SSLHonorCipherOrder     <%= @ssl_honorcipherorder %>
-<% end -%>
-<% if @ssl_verify_client -%>
-  SSLVerifyClient         <%= @ssl_verify_client %>
-<% end -%>
-<% if @ssl_verify_depth -%>
-  SSLVerifyDepth          <%= @ssl_verify_depth %>
-<% end -%>
-<% if @ssl_options -%>
-  SSLOptions <%= Array(@ssl_options).join(' ') %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb
deleted file mode 100644
index 8a7ae0f17fb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suexec.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<% if @suexec_user_group -%>
-
-  SuexecUserGroup <%= @suexec_user_group %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb
deleted file mode 100644
index 9389581805a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_suphp.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if @suphp_engine == 'on' -%>
-<% if @suphp_addhandler -%>
-  suPHP_AddHandler <%= @suphp_addhandler %>
-<% end -%>
-<% if @suphp_engine -%>
-  suPHP_Engine <%= @suphp_engine %>
-<% end -%>
-<% if @suphp_configpath -%>
-  suPHP_ConfigPath "<%= @suphp_configpath %>"
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb
deleted file mode 100644
index 473b223ab6d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/templates/vhost/_wsgi.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% if @wsgi_application_group -%>
-  WSGIApplicationGroup <%= @wsgi_application_group %>
-<% end -%>
-<% if @wsgi_daemon_process and @wsgi_daemon_process_options -%>
-  WSGIDaemonProcess <%= @wsgi_daemon_process %> <%= @wsgi_daemon_process_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% elsif @wsgi_daemon_process and !@wsgi_daemon_process_options -%>
-  WSGIDaemonProcess <%= @wsgi_daemon_process %>
-<% end -%>
-<% if @wsgi_import_script and @wsgi_import_script_options -%>
-  WSGIImportScript <%= @wsgi_import_script %> <%= @wsgi_import_script_options.collect { |k,v| "#{k}=#{v}"}.sort.join(' ') %>
-<% end -%>
-<% if @wsgi_process_group -%>
-  WSGIProcessGroup <%= @wsgi_process_group %>
-<% end -%>
-<% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
-  <%- @wsgi_script_aliases.each do |a, p| -%>
-    <%- if a != '' and p != ''-%>
-  WSGIScriptAlias <%= a %> "<%= p %>"
-    <%- end -%>
-  <%- end -%>
-<% end -%>
-<% if @wsgi_pass_authorization -%>
-  WSGIPassAuthorization <%= @wsgi_pass_authorization %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp
deleted file mode 100644
index 0d4543564c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/apache.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-include apache
-include apache::mod::php
-include apache::mod::cgi
-include apache::mod::userdir
-include apache::mod::disk_cache
-include apache::mod::proxy_http
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp
deleted file mode 100644
index 805ad7e373a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/dev.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apache::dev
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp
deleted file mode 100644
index b3f9f13aac1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apache
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp
deleted file mode 100644
index 0e84c5efbf5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mod_load_params.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tests the path and identifier parameters for the apache::mod class
-
-# Base class for clarity:
-class { 'apache': }
-
-
-# Exaple parameter usage:
-apache::mod { 'testmod':
-  path => '/usr/some/path/mod_testmod.so',
-  id   => 'testmod_custom_name',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp
deleted file mode 100644
index 59362bd9a00..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-## Default mods
-
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot, and declaring our default set of modules.
-class { 'apache':
-  default_mods => true,
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp
deleted file mode 100644
index 0ae699c73d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/mods_custom.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-## custom mods
-
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot, and declaring a custom set of modules.
-class { 'apache':
-  default_mods => [
-    'info',
-    'alias',
-    'mime',
-    'env',
-    'setenv',
-    'expires',
-  ],
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp
deleted file mode 100644
index 1d926bfb466..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/php.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'apache':
-  mpm_module => 'prefork',
-}
-include apache::mod::php
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp
deleted file mode 100644
index a6c61360a75..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost.pp
+++ /dev/null
@@ -1,238 +0,0 @@
-## Default vhosts, and custom vhosts
-# NB: Please see the other vhost_*.pp example files for further
-# examples.
-
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot
-class { 'apache': }
-
-# Most basic vhost
-apache::vhost { 'first.example.com':
-  port    => '80',
-  docroot => '/var/www/first',
-}
-
-# Vhost with different docroot owner/group/mode
-apache::vhost { 'second.example.com':
-  port          => '80',
-  docroot       => '/var/www/second',
-  docroot_owner => 'third',
-  docroot_group => 'third',
-  docroot_mode  => '0770',
-}
-
-# Vhost with serveradmin
-apache::vhost { 'third.example.com':
-  port        => '80',
-  docroot     => '/var/www/third',
-  serveradmin => 'admin@example.com',
-}
-
-# Vhost with ssl (uses default ssl certs)
-apache::vhost { 'ssl.example.com':
-  port    => '443',
-  docroot => '/var/www/ssl',
-  ssl     => true,
-}
-
-# Vhost with ssl and specific ssl certs
-apache::vhost { 'fourth.example.com':
-  port     => '443',
-  docroot  => '/var/www/fourth',
-  ssl      => true,
-  ssl_cert => '/etc/ssl/fourth.example.com.cert',
-  ssl_key  => '/etc/ssl/fourth.example.com.key',
-}
-
-# Vhost with english title and servername parameter
-apache::vhost { 'The fifth vhost':
-  servername => 'fifth.example.com',
-  port       => '80',
-  docroot    => '/var/www/fifth',
-}
-
-# Vhost with server aliases
-apache::vhost { 'sixth.example.com':
-  serveraliases => [
-    'sixth.example.org',
-    'sixth.example.net',
-  ],
-  port          => '80',
-  docroot       => '/var/www/fifth',
-}
-
-# Vhost with alternate options
-apache::vhost { 'seventh.example.com':
-  port    => '80',
-  docroot => '/var/www/seventh',
-  options => [
-    'Indexes',
-    'MultiViews',
-  ],
-}
-
-# Vhost with AllowOverride for .htaccess
-apache::vhost { 'eighth.example.com':
-  port     => '80',
-  docroot  => '/var/www/eighth',
-  override => 'All',
-}
-
-# Vhost with access and error logs disabled
-apache::vhost { 'ninth.example.com':
-  port       => '80',
-  docroot    => '/var/www/ninth',
-  access_log => false,
-  error_log  => false,
-}
-
-# Vhost with custom access and error logs and logroot
-apache::vhost { 'tenth.example.com':
-  port            => '80',
-  docroot         => '/var/www/tenth',
-  access_log_file => 'tenth_vhost.log',
-  error_log_file  => 'tenth_vhost_error.log',
-  logroot         => '/var/log',
-}
-
-# Vhost with a cgi-bin
-apache::vhost { 'eleventh.example.com':
-  port        => '80',
-  docroot     => '/var/www/eleventh',
-  scriptalias => '/usr/lib/cgi-bin',
-}
-
-# Vhost with a proxypass configuration
-apache::vhost { 'twelfth.example.com':
-  port          => '80',
-  docroot       => '/var/www/twelfth',
-  proxy_dest    => 'http://internal.example.com:8080/twelfth',
-  no_proxy_uris => ['/login','/logout'],
-}
-
-# Vhost to redirect /login and /logout
-apache::vhost { 'thirteenth.example.com':
-  port            => '80',
-  docroot         => '/var/www/thirteenth',
-  redirect_source => [
-    '/login',
-    '/logout',
-  ],
-  redirect_dest   => [
-    'http://10.0.0.10/login',
-    'http://10.0.0.10/logout',
-  ],
-}
-
-# Vhost to permamently redirect
-apache::vhost { 'fourteenth.example.com':
-  port            => '80',
-  docroot         => '/var/www/fourteenth',
-  redirect_source => '/blog',
-  redirect_dest   => 'http://blog.example.com',
-  redirect_status => 'permanent',
-}
-
-# Vhost with a rack configuration
-apache::vhost { 'fifteenth.example.com':
-  port           => '80',
-  docroot        => '/var/www/fifteenth',
-  rack_base_uris => ['/rackapp1', '/rackapp2'],
-}
-
-# Vhost to redirect non-ssl to ssl
-apache::vhost { 'sixteenth.example.com non-ssl':
-  servername   => 'sixteenth.example.com',
-  port         => '80',
-  docroot      => '/var/www/sixteenth',
-  rewrites     => [
-    {
-      comment       => 'redirect non-SSL traffic to SSL site',
-      rewrite_cond  => ['%{HTTPS} off'],
-      rewrite_rule  => ['(.*) https://%{HTTPS_HOST}%{REQUEST_URI}'],
-    }
-  ]
-}
-apache::vhost { 'sixteenth.example.com ssl':
-  servername => 'sixteenth.example.com',
-  port       => '443',
-  docroot    => '/var/www/sixteenth',
-  ssl        => true,
-}
-
-# Vhost to redirect non-ssl to ssl using old rewrite method
-apache::vhost { 'sixteenth.example.com non-ssl old rewrite':
-  servername   => 'sixteenth.example.com',
-  port         => '80',
-  docroot      => '/var/www/sixteenth',
-  rewrite_cond => '%{HTTPS} off',
-  rewrite_rule => '(.*) https://%{HTTPS_HOST}%{REQUEST_URI}',
-}
-apache::vhost { 'sixteenth.example.com ssl old rewrite':
-  servername => 'sixteenth.example.com',
-  port       => '443',
-  docroot    => '/var/www/sixteenth',
-  ssl        => true,
-}
-
-# Vhost to block repository files
-apache::vhost { 'seventeenth.example.com':
-  port    => '80',
-  docroot => '/var/www/seventeenth',
-  block   => 'scm',
-}
-
-# Vhost with special environment variables
-apache::vhost { 'eighteenth.example.com':
-  port    => '80',
-  docroot => '/var/www/eighteenth',
-  setenv  => ['SPECIAL_PATH /foo/bin','KILROY was_here'],
-}
-
-apache::vhost { 'nineteenth.example.com':
-  port     => '80',
-  docroot  => '/var/www/nineteenth',
-  setenvif => 'Host "^([^\.]*)\.website\.com$" CLIENT_NAME=$1',
-}
-
-# Vhost with additional include files
-apache::vhost { 'twentyieth.example.com':
-  port                => '80',
-  docroot             => '/var/www/twelfth',
-  additional_includes => ['/tmp/proxy_group_a','/tmp/proxy_group_b'],
-}
-
-# Vhost with alias for subdomain mapped to same named directory
-# http://example.com.loc => /var/www/example.com
-apache::vhost { 'subdomain.loc':
-  vhost_name      => '*',
-  port            => '80',
-  virtual_docroot => '/var/www/%-2+',
-  docroot         => '/var/www',
-  serveraliases   => ['*.loc',],
-}
-
-# Vhost with SSLProtocol,SSLCipherSuite, SSLHonorCipherOrder
-apache::vhost { 'securedomain.com':
-        priority              => '10',
-        vhost_name            => 'www.securedomain.com',
-        port                  => '443',
-        docroot               => '/var/www/secure',
-        ssl                   => true,
-        ssl_cert              => '/etc/ssl/securedomain.cert',
-        ssl_key               => '/etc/ssl/securedomain.key',
-        ssl_chain             => '/etc/ssl/securedomain.crt',
-        ssl_protocol          => '-ALL +SSLv3 +TLSv1',
-        ssl_cipher            => 'ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM',
-        ssl_honorcipherorder  => 'On',
-        add_listen            => false,
-}
-
-# Vhost with access log environment variables writing control
-apache::vhost { 'twentyfirst.example.com':
-  port               => '80',
-  docroot            => '/var/www/twentyfirst',
-  access_log_env_var => 'admin',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp
deleted file mode 100644
index b8953ee3217..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_directories.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Base class. Declares default vhost on port 80 and default ssl
-# vhost on port 443 listening on all interfaces and serving
-# $apache::docroot
-class { 'apache': }
-
-# Example from README adapted.
-apache::vhost { 'readme.example.net':
-  docroot     => '/var/www/readme',
-  directories => [
-    {
-      'path'         => '/var/www/readme',
-      'ServerTokens' => 'prod' ,
-    },
-    {
-      'path'  => '/usr/share/empty',
-      'allow' => 'from all',
-    },
-  ],
-}
-
-# location test
-apache::vhost { 'location.example.net':
-  docroot     => '/var/www/location',
-  directories => [
-    {
-      'path'         => '/location',
-      'provider'     => 'location',
-      'ServerTokens' => 'prod'
-    },
-  ],
-}
-
-# files test, curedly disable access to accidental backup files.
-apache::vhost { 'files.example.net':
-  docroot     => '/var/www/files',
-  directories => [
-    {
-      'path'     => '(\.swp|\.bak|~)$',
-      'provider' => 'filesmatch',
-      'deny'     => 'from all'
-    },
-  ],
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp
deleted file mode 100644
index dc0fa4f33ba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ip_based.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-## IP-based vhosts on any listen port
-# IP-based vhosts respond to requests on specific IP addresses.
-
-# Base class. Turn off the default vhosts; we will be declaring
-# all vhosts below.
-class { 'apache':
-  default_vhost => false,
-}
-
-# Listen on port 80 and 81; required because the following vhosts
-# are not declared with a port parameter.
-apache::listen { '80': }
-apache::listen { '81': }
-
-# IP-based vhosts
-apache::vhost { 'first.example.com':
-  ip       => '10.0.0.10',
-  docroot  => '/var/www/first',
-  ip_based => true,
-}
-apache::vhost { 'second.example.com':
-  ip       => '10.0.0.11',
-  docroot  => '/var/www/second',
-  ip_based => true,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp
deleted file mode 100644
index 8e7a2b279ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhost_ssl.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-## SSL-enabled vhosts
-# SSL-enabled vhosts respond only to HTTPS queries.
-
-# Base class. Turn off the default vhosts; we will be declaring
-# all vhosts below.
-class { 'apache':
-  default_vhost => false,
-}
-
-# Non-ssl vhost
-apache::vhost { 'first.example.com non-ssl':
-  servername => 'first.example.com',
-  port       => '80',
-  docroot    => '/var/www/first',
-}
-
-# SSL vhost at the same domain
-apache::vhost { 'first.example.com ssl':
-  servername => 'first.example.com',
-  port       => '443',
-  docroot    => '/var/www/first',
-  ssl        => true,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp
deleted file mode 100644
index e7d6cc036c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apache/tests/vhosts_without_listen.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-## Declare ip-based and name-based vhosts
-# Mixing Name-based vhost with IP-specific vhosts requires `add_listen =>
-# 'false'` on the non-IP vhosts
-
-# Base class. Turn off the default vhosts; we will be declaring
-# all vhosts below.
-class { 'apache':
-  default_vhost => false,
-}
-
-
-# Add two an IP-based vhost on 10.0.0.10, ssl and non-ssl
-apache::vhost { 'The first IP-based vhost, non-ssl':
-  servername => 'first.example.com',
-  ip         => '10.0.0.10',
-  port       => '80',
-  ip_based   => true,
-  docroot    => '/var/www/first',
-}
-apache::vhost { 'The first IP-based vhost, ssl':
-  servername => 'first.example.com',
-  ip         => '10.0.0.10',
-  port       => '443',
-  ip_based   => true,
-  docroot    => '/var/www/first-ssl',
-  ssl        => true,
-}
-
-# Two name-based vhost listening on 10.0.0.20
-apache::vhost { 'second.example.com':
-  ip      => '10.0.0.20',
-  port    => '80',
-  docroot => '/var/www/second',
-}
-apache::vhost { 'third.example.com':
-  ip      => '10.0.0.20',
-  port    => '80',
-  docroot => '/var/www/third',
-}
-
-# Two name-based vhosts without IPs specified, so that they will answer on either 10.0.0.10 or 10.0.0.20 . It is requried to declare
-# `add_listen => 'false'` to disable declaring "Listen 80" which will conflict
-# with the IP-based preceeding vhosts.
-apache::vhost { 'fourth.example.com':
-  port       => '80',
-  docroot    => '/var/www/fourth',
-  add_listen => false,
-}
-apache::vhost { 'fifth.example.com':
-  port       => '80',
-  docroot    => '/var/www/fifth',
-  add_listen => false,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml
deleted file mode 100644
index 2bb941de237..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.fixtures.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib":
-      "repo": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-      "ref": "v2.2.1"
-  symlinks:
-    "apt": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project
deleted file mode 100644
index 6523c6dafad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>apt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc
deleted file mode 100644
index f4abb47dc59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.puppet-lint.rc
+++ /dev/null
@@ -1 +0,0 @@
---no-single_quote_string_with_variables-check
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml
deleted file mode 100644
index 582efdf70ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-  global:
-  - PUBLISHER_LOGIN=puppetlabs
-  - secure: |-
-      ipB/CV1rVSTXU9ZDuzrFOlzJrRmJob36tKns2xszuH4r9s5P9qivNAngRGdV
-      msb69xvOlzQykM0WRF+4kJ6TZ7AbMiDI+VZ8GDtsRaU5/q3BpsvFe8aato+6
-      QeyFtBG62OsosTEhGws4mqiFsPDu3dHlakuJc9zevlTuhNwbKSs=
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md
deleted file mode 100644
index 10503c9144c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/CHANGELOG.md
+++ /dev/null
@@ -1,222 +0,0 @@
-##2014-03-04 - Supported Release 1.4.2
-###Summary
-
-This is a supported release. This release tidies up 1.4.1 and re-enables
-support for Ubuntu 10.04
-
-####Features
-
-####Bugfixes
-- Fix apt:ppa to include the -y Ubuntu 10.04 requires.
-- Documentation changes.
-- Test fixups.
-
-####Known Bugs
-
-* No known issues.
-
-
-
-##2014-02-13 1.4.1
-###Summary
-This is a bugfix release.
-
-####Bugfixes
-- Fix apt::force unable to upgrade packages from releases other than its original
-- Removed a few refeneces to aptitude instead of apt-get for portability
-- Removed call to getparam() due to stdlib dependency
-- Correct apt::source template when architecture is provided
-- Retry package installs if apt is locked
-- Use root to exec in apt::ppa
-- Updated tests and converted acceptance tests to beaker
-
-##2013-10-08 - Release 1.4.0
-
-###Summary
-
-Minor bugfix and allow the timeout to be adjusted.
-
-####Features
-- Add an `updates_timeout` to apt::params
-
-####Bugfixes
-- Ensure apt::ppa can read a ppa removed by hand.
-
-
-##2013-10-08 - Release 1.3.0
-###Summary
-
-This major feature in this release is the new apt::unattended_upgrades class,
-allowing you to handle Ubuntu's unattended feature.  This allows you to select
-specific packages to automatically upgrade without any further user
-involvement.
-
-In addition we extend our Wheezy support, add proxy support to apt:ppa and do
-various cleanups and tweaks.
-
-####Features
-- Add apt::unattended_upgrades support for Ubuntu.
-- Add wheezy backports support.
-- Use the geoDNS http.debian.net instead of the main debian ftp server.
-- Add `options` parameter to apt::ppa in order to pass options to apt-add-repository command.
-- Add proxy support for apt::ppa (uses proxy_host and proxy_port from apt).
-
-####Bugfixes
-- Fix regsubst() calls to quote single letters (for future parser).
-- Fix lint warnings and other misc cleanup.
-
-
-##2013-07-03 - Release 1.2.0
-
-####Features
-- Add geppetto `.project` natures
-- Add GH auto-release
-- Add `apt::key::key_options` parameter
-- Add complex pin support using distribution properties for `apt::pin` via new properties:
-  - `apt::pin::codename`
-  - `apt::pin::release_version`
-  - `apt::pin::component`
-  - `apt::pin::originator`
-  - `apt::pin::label`
-- Add source architecture support to `apt::source::architecture`
-
-####Bugfixes
-- Use apt-get instead of aptitude in apt::force
-- Update default backports location
-- Add dependency for required packages before apt-get update
-
-
-##2013-06-02 - Release 1.1.1
-###Summary
-
-This is a bug fix release that resolves a number of issues:
-
-* By changing template variable usage, we remove the deprecation warnings
-  for Puppet 3.2.x
-* Fixed proxy file removal, when proxy absent
-
-Some documentation, style and whitespaces changes were also merged. This
-release also introduced proper rspec-puppet unit testing on Travis-CI to help
-reduce regression.
-
-Thanks to all the community contributors below that made this patch possible.
-
-#### Detail Changes
-
-* fix minor comment type (Chris Rutter)
-* whitespace fixes (Michael Moll)
-* Update travis config file (William Van Hevelingen)
-* Build all branches on travis (William Van Hevelingen)
-* Standardize travis.yml on pattern introduced in stdlib (William Van Hevelingen)
-* Updated content to conform to README best practices template (Lauren Rother)
-* Fix apt::release example in readme (Brian Galey)
-* add @ to variables in template (Peter Hoeg)
-* Remove deprecation warnings for pin.pref.erb as well (Ken Barber)
-* Update travis.yml to latest versions of puppet (Ken Barber)
-* Fix proxy file removal (Scott Barber)
-* Add spec test for removing proxy configuration (Dean Reilly)
-* Fix apt::key listing longer than 8 chars (Benjamin Knofe)
-
-
-
-
-## Release 1.1.0
-###Summary
-
-This release includes Ubuntu 12.10 (Quantal) support for PPAs.
-
----
-
-##2012-05-25 - Puppet Labs <info@puppetlabs.com> - Release 0.0.4
-###Summary
-
- * Fix ppa list filename when there is a period in the PPA name
- * Add .pref extension to apt preferences files
- * Allow preferences to be purged
- * Extend pin support
-
-
-##2012-05-04 - Puppet Labs <info@puppetlabs.com> - Release 0.0.3
-###Summary
- 
- * only invoke apt-get update once
- * only install python-software-properties if a ppa is added
- * support 'ensure => absent' for all defined types
- * add apt::conf
- * add apt::backports
- * fixed Modulefile for module tool dependency resolution
- * configure proxy before doing apt-get update
- * use apt-get update instead of aptitude for apt::ppa
- * add support to pin release
-
-
-##2012-03-26 - Puppet Labs <info@puppetlabs.com> - Release 0.0.2
-###Summary
-
-* 41cedbb (#13261) Add real examples to smoke tests.
-* d159a78 (#13261) Add key.pp smoke test
-* 7116c7a (#13261) Replace foo source with puppetlabs source
-* 1ead0bf Ignore pkg directory.
-* 9c13872 (#13289) Fix some more style violations
-* 0ea4ffa (#13289) Change test scaffolding to use a module & manifest dir fixture path
-* a758247 (#13289) Clean up style violations and fix corresponding tests
-* 99c3fd3 (#13289) Add puppet lint tests to Rakefile
-* 5148cbf (#13125) Apt keys should be case insensitive
-* b9607a4 Convert apt::key to use anchors
-
-
-##2012-03-07 - Puppet Labs <info@puppetlabs.com> - Release 0.0.1
-###Summary
-
-* d4fec56 Modify apt::source release parameter test
-* 1132a07 (#12917) Add contributors to README
-* 8cdaf85 (#12823) Add apt::key defined type and modify apt::source to use it
-* 7c0d10b (#12809) $release should use $lsbdistcodename and fall back to manual input
-* be2cc3e (#12522) Adjust spec test for splitting purge
-* 7dc60ae (#12522) Split purge option to spare sources.list
-* 9059c4e Fix source specs to test all key permutations
-* 8acb202 Add test for python-software-properties package
-* a4af11f Check if python-software-properties is defined before attempting to define it.
-* 1dcbf3d Add tests for required_packages change
-* f3735d2 Allow duplicate $required_packages
-* 74c8371 (#12430) Add tests for changes to apt module
-* 97ebb2d Test two sources with the same key
-* 1160bcd (#12526) Add ability to reverse apt { disable_keys => true }
-* 2842d73 Add Modulefile to puppet-apt
-* c657742 Allow the use of the same key in multiple sources
-* 8c27963 (#12522) Adding purge option to apt class
-* 997c9fd (#12529) Add unit test for apt proxy settings
-* 50f3cca (#12529) Add parameter to support setting a proxy for apt
-* d522877 (#12094) Replace chained .with_* with a hash
-* 8cf1bd0 (#12094) Remove deprecated spec.opts file
-* 2d688f4 (#12094) Add rspec-puppet tests for apt
-* 0fb5f78 (#12094) Replace name with path in file resources
-* f759bc0 (#11953) Apt::force passes $version to aptitude
-* f71db53 (#11413) Add spec test for apt::force to verify changes to unless
-* 2f5d317 (#11413) Update dpkg query used by apt::force
-* cf6caa1 (#10451) Add test coverage to apt::ppa
-* 0dd697d include_src parameter in example; Whitespace cleanup
-* b662eb8 fix typos in "repositories"
-* 1be7457 Fix (#10451) - apt::ppa fails to "apt-get update" when new PPA source is added
-* 864302a Set the pin priority before adding the source (Fix #10449)
-* 1de4e0a Refactored as per mlitteken
-* 1af9a13 Added some crazy bash madness to check if the ppa is installed already. Otherwise the manifest tries to add it on every run!
-* 52ca73e (#8720) Replace Apt::Ppa with Apt::Builddep
-* 5c05fa0 added builddep command.
-* a11af50 added the ability to specify the content of a key
-* c42db0f Fixes ppa test.
-* 77d2b0d reformatted whitespace to match recommended style of 2 space indentation.
-* 27ebdfc ignore swap files.
-* 377d58a added smoke tests for module.
-* 18f614b reformatted apt::ppa according to recommended style.
-* d8a1e4e Created a params class to hold global data.
-* 636ae85 Added two params for apt class
-* 148fc73 Update LICENSE.
-* ed2d19e Support ability to add more than one PPA
-* 420d537 Add call to apt-update after add-apt-repository in apt::ppa
-* 945be77 Add package definition for python-software-properties
-* 71fc425 Abs paths for all commands
-* 9d51cd1 Adding LICENSE
-* 71796e3 Heading fix in README
-* 87777d8 Typo in README
-* f848bac First commit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile
deleted file mode 100644
index 1e359d07b56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Gemfile
+++ /dev/null
@@ -1,18 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'pry',                     :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE
deleted file mode 100644
index 30ce036d5e0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/LICENSE
+++ /dev/null
@@ -1,34 +0,0 @@
-Copyright (c) 2011 Evolving Web Inc.
-
-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.
-
-
-Copyright 2014 Puppet Labs
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile
deleted file mode 100644
index 40a87f4ef39..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Modulefile
+++ /dev/null
@@ -1,14 +0,0 @@
-name    'puppetlabs-apt'
-version '1.4.2'
-source  'https://github.com/puppetlabs/puppetlabs-apt'
-author  'Evolving Web / Puppet Labs'
-license 'Apache License 2.0'
-summary 'Puppet Labs Apt Module'
-description 'APT Module for Puppet'
-project_page 'https://github.com/puppetlabs/puppetlabs-apt'
-
-## Add dependencies, if any:
-#dependency 'puppetlabs/stdlib', '2.x'
-# The dependency should be written as above but librarian-puppet
-# does not support the expression as the PMT does.
-dependency 'puppetlabs/stdlib', '>= 2.2.1'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md
deleted file mode 100644
index ec8b4c5e49b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/README.md
+++ /dev/null
@@ -1,236 +0,0 @@
-apt
-===
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-apt.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-apt)
-
-## Description
-
-Provides helpful definitions for dealing with Apt.
-
-=======
-
-Overview
---------
-
-The APT module provides a simple interface for managing APT source, key, and definitions with Puppet.
-
-Module Description
-------------------
-
-APT automates obtaining and installing software packages on \*nix systems.
-
-Setup
------
-
-**What APT affects:**
-
-* package/service/configuration files for APT
-* your system's `sources.list` file and `sources.list.d` directory
-    * NOTE: Setting the `purge_sources_list` and `purge_sources_list_d` parameters to 'true' will destroy any existing content that was not declared with Puppet. The default for these parameters is 'false'.
-* system repositories
-* authentication keys
-* wget (optional)
-
-### Beginning with APT
-
-To begin using the APT module with default parameters, declare the class
-
-    include apt
-
-Puppet code that uses anything from the APT module requires that the core apt class be declared/\s\+$//e
-
-Usage
------
-
-Using the APT module consists predominantly in declaring classes that provide desired functionality and features.
-
-### apt
-
-`apt` provides a number of common resources and options that are shared by the various defined types in this module, so you MUST always include this class in your manifests.
-
-The parameters for `apt` are not required in general and are predominantly for development environment use-cases.
-
-    class { 'apt':
-      always_apt_update    => false,
-      disable_keys         => undef,
-      proxy_host           => false,
-      proxy_port           => '8080',
-      purge_sources_list   => false,
-      purge_sources_list_d => false,
-      purge_preferences_d  => false,
-      update_timeout       => undef
-    }
-
-Puppet will manage your system's `sources.list` file and `sources.list.d` directory but will do its best to respect existing content.
-
-If you declare your apt class with `purge_sources_list` and `purge_sources_list_d` set to 'true', Puppet will unapologetically purge any existing content it finds that wasn't declared with Puppet.
-
-### apt::builddep
-
-Installs the build depends of a specified package.
-
-    apt::builddep { 'glusterfs-server': }
-
-### apt::force
-
-Forces a package to be installed from a specific release.  This class is particularly useful when using repositories, like Debian, that are unstable in Ubuntu.
-
-    apt::force { 'glusterfs-server':
-      release => 'unstable',
-      version => '3.0.3',
-      require => Apt::Source['debian_unstable'],
-    }
-
-### apt::key
-
-Adds a key to the list of keys used by APT to authenticate packages.
-
-    apt::key { 'puppetlabs':
-      key        => '4BD6EC30',
-      key_server => 'pgp.mit.edu',
-    }
-
-    apt::key { 'jenkins':
-      key        => 'D50582E6',
-      key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key',
-    }
-
-Note that use of `key_source` requires wget to be installed and working.
-
-### apt::pin
-
-Adds an apt pin for a certain release.
-
-    apt::pin { 'karmic': priority => 700 }
-    apt::pin { 'karmic-updates': priority => 700 }
-    apt::pin { 'karmic-security': priority => 700 }
-
-Note you can also specifying more complex pins using distribution properties.
-
-    apt::pin { 'stable':
-      priority        => -10,
-      originator      => 'Debian',
-      release_version => '3.0',
-      component       => 'main',
-      label           => 'Debian'
-    }
-
-### apt::ppa
-
-Adds a ppa repository using `add-apt-repository`.
-
-    apt::ppa { 'ppa:drizzle-developers/ppa': }
-
-### apt::release
-
-Sets the default apt release. This class is particularly useful when using repositories, like Debian, that are unstable in Ubuntu.
-
-    class { 'apt::release':
-      release_id => 'precise',
-    }
-
-### apt::source
-
-Adds an apt source to `/etc/apt/sources.list.d/`.
-
-    apt::source { 'debian_unstable':
-      location          => 'http://debian.mirror.iweb.ca/debian/',
-      release           => 'unstable',
-      repos             => 'main contrib non-free',
-      required_packages => 'debian-keyring debian-archive-keyring',
-      key               => '46925553',
-      key_server        => 'subkeys.pgp.net',
-      pin               => '-10',
-      include_src       => true
-    }
-
-If you would like to configure your system so the source is the Puppet Labs APT repository
-
-    apt::source { 'puppetlabs':
-      location   => 'http://apt.puppetlabs.com',
-      repos      => 'main',
-      key        => '4BD6EC30',
-      key_server => 'pgp.mit.edu',
-    }
-
-### Testing
-
-The APT module is mostly a collection of defined resource types, which provide reusable logic that can be leveraged to manage APT. It does provide smoke tests for testing functionality on a target system, as well as spec tests for checking a compiled catalog against an expected set of resources.
-
-#### Example Test
-
-This test will set up a Puppet Labs apt repository. Start by creating a new smoke test in the apt module's test folder. Call it puppetlabs-apt.pp. Inside, declare a single resource representing the Puppet Labs APT source and gpg key
-
-    apt::source { 'puppetlabs':
-      location   => 'http://apt.puppetlabs.com',
-      repos      => 'main',
-      key        => '4BD6EC30',
-      key_server => 'pgp.mit.edu',
-    }
-
-This resource creates an apt source named puppetlabs and gives Puppet information about the repository's location and key used to sign its packages. Puppet leverages Facter to determine the appropriate release, but you can set it directly by adding the release type.
-
-Check your smoke test for syntax errors
-
-    $ puppet parser validate tests/puppetlabs-apt.pp
-
-If you receive no output from that command, it means nothing is wrong. Then apply the code
-
-    $ puppet apply --verbose tests/puppetlabs-apt.pp
-    notice: /Stage[main]//Apt::Source[puppetlabs]/File[puppetlabs.list]/ensure: defined content as '{md5}3be1da4923fb910f1102a233b77e982e'
-    info: /Stage[main]//Apt::Source[puppetlabs]/File[puppetlabs.list]: Scheduling refresh of Exec[puppetlabs apt update]
-    notice: /Stage[main]//Apt::Source[puppetlabs]/Exec[puppetlabs apt update]: Triggered 'refresh' from 1 events>
-
-The above example used a smoke test to easily lay out a resource declaration and apply it on your system. In production, you may want to declare your APT sources inside the classes where they’re needed.
-
-Implementation
---------------
-
-### apt::backports
-
-Adds the necessary components to get backports for Ubuntu and Debian. The release name defaults to `$lsbdistcodename`. Setting this manually can cause undefined behavior (read: universe exploding).
-
-Limitations
------------
-
-This module should work across all versions of Debian/Ubuntu and support all major APT repository management features.
-
-Development
-------------
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-License
--------
-
-The original code for this module comes from Evolving Web and was licensed under the MIT license. Code added since the fork of this module is licensed under the Apache 2.0 License like the rest of the Puppet Labs products.
-
-The LICENSE contains both licenses.
-
-Contributors
-------------
-
-A lot of great people have contributed to this module. A somewhat current list follows:
-
-* Ben Godfrey <ben.godfrey@wonga.com>
-* Branan Purvine-Riley <branan@puppetlabs.com>
-* Christian G. Warden <cwarden@xerus.org>
-* Dan Bode <bodepd@gmail.com> <dan@puppetlabs.com>
-* Garrett Honeycutt <github@garretthoneycutt.com>
-* Jeff Wallace <jeff@evolvingweb.ca> <jeff@tjwallace.ca>
-* Ken Barber <ken@bob.sh>
-* Matthaus Litteken <matthaus@puppetlabs.com> <mlitteken@gmail.com>
-* Matthias Pigulla <mp@webfactory.de>
-* Monty Taylor <mordred@inaugust.com>
-* Peter Drake <pdrake@allplayers.com>
-* Reid Vandewiele <marut@cat.pdx.edu>
-* Robert Navarro <rnavarro@phiivo.com>
-* Ryan Coleman <ryan@puppetlabs.com>
-* Scott McLeod <scott.mcleod@theice.com>
-* Spencer Krum <spencer@puppetlabs.com>
-* William Van Hevelingen <blkperl@cat.pdx.edu> <wvan13@gmail.com>
-* Zach Leslie <zach@puppetlabs.com>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile
deleted file mode 100644
index 6d067dc56c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/Rakefile
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp
deleted file mode 100644
index 9cfa1c01130..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/backports.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-# This adds the necessary components to get backports for ubuntu and debian
-#
-# == Parameters
-#
-# [*release*]
-#   The ubuntu/debian release name. Defaults to $lsbdistcodename. Setting this
-#   manually can cause undefined behavior. (Read: universe exploding)
-#
-# == Examples
-#
-#   include apt::backports
-#
-#   class { 'apt::backports':
-#     release => 'natty',
-#   }
-#
-# == Authors
-#
-# Ben Hughes, I think. At least blame him if this goes wrong.
-# I just added puppet doc.
-#
-# == Copyright
-#
-# Copyright 2011 Puppet Labs Inc, unless otherwise noted.
-class apt::backports(
-  $release  = $::lsbdistcodename,
-  $location = $apt::params::backports_location
-) inherits apt::params {
-
-  $release_real = downcase($release)
-  $key = $::lsbdistid ? {
-    'debian' => '46925553',
-    'ubuntu' => '437D05B5',
-  }
-  $repos = $::lsbdistid ? {
-    'debian' => 'main contrib non-free',
-    'ubuntu' => 'main universe multiverse restricted',
-  }
-
-  apt::source { 'backports':
-    location   => $location,
-    release    => "${release_real}-backports",
-    repos      => $repos,
-    key        => $key,
-    key_server => 'pgp.mit.edu',
-    pin        => '200',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp
deleted file mode 100644
index 3294f713391..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/builddep.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# builddep.pp
-
-define apt::builddep() {
-  include apt::update
-
-  exec { "apt-builddep-${name}":
-    command   => "/usr/bin/apt-get -y --force-yes build-dep ${name}",
-    logoutput => 'on_failure',
-    notify    => Exec['apt_update'],
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::builddep::${name}":
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp
deleted file mode 100644
index 3c4cb1975cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/conf.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-define apt::conf (
-  $content,
-  $ensure   = present,
-  $priority = '50'
-) {
-
-  include apt::params
-
-  $apt_conf_d = $apt::params::apt_conf_d
-
-  file { "${apt_conf_d}/${priority}${name}":
-    ensure  => $ensure,
-    content => $content,
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp
deleted file mode 100644
index 3a82b4f7fd9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/testing.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# testing.pp
-
-class apt::debian::testing {
-  include apt
-
-  # deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
-  # deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free
-  # Key: 46925553  Server: subkeys.pgp.net
-  # debian-keyring
-  # debian-archive-keyring
-
-  apt::source { 'debian_testing':
-    location          => 'http://debian.mirror.iweb.ca/debian/',
-    release           => 'testing',
-    repos             => 'main contrib non-free',
-    required_packages => 'debian-keyring debian-archive-keyring',
-    key               => '46925553',
-    key_server        => 'subkeys.pgp.net',
-    pin               => '-10',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp
deleted file mode 100644
index 77df94b0af5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/debian/unstable.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# unstable.pp
-
-class apt::debian::unstable {
-  include apt
-
-  # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
-  # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
-  # Key: 46925553  Server: subkeys.pgp.net
-  # debian-keyring
-  # debian-archive-keyring
-
-  apt::source { 'debian_unstable':
-    location          => 'http://debian.mirror.iweb.ca/debian/',
-    release           => 'unstable',
-    repos             => 'main contrib non-free',
-    required_packages => 'debian-keyring debian-archive-keyring',
-    key               => '46925553',
-    key_server        => 'subkeys.pgp.net',
-    pin               => '-10',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp
deleted file mode 100644
index 70b7d47239b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/force.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# force.pp
-# force a package from a specific release
-
-define apt::force(
-  $release = 'testing',
-  $version = false,
-  $timeout = 300
-) {
-
-  $provider = $apt::params::provider
-
-  $version_string = $version ? {
-    false   => undef,
-    default => "=${version}",
-  }
-
-  $release_string = $release ? {
-    false   => undef,
-    default => "-t ${release}",
-  }
-
-  if $version == false {
-    if $release == false {
-      $install_check = "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'"
-    } else {
-      # If installed version and candidate version differ, this check returns 1 (false).
-      $install_check = "/usr/bin/test \$(/usr/bin/apt-cache policy -t ${release} ${name} | /bin/grep -E 'Installed|Candidate' | /usr/bin/uniq -s 14 | /usr/bin/wc -l) -eq 1"
-    }
-  } else {
-    if $release == false {
-      $install_check = "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'"
-    } else {
-      $install_check = "/usr/bin/apt-cache policy -t ${release} ${name} | /bin/grep -q 'Installed: ${version}'"
-    }
-  }
-
-  exec { "${provider} -y ${release_string} install ${name}${version_string}":
-    unless    => $install_check,
-    logoutput => 'on_failure',
-    timeout   => $timeout,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp
deleted file mode 100644
index 364ce8cb4e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/init.pp
+++ /dev/null
@@ -1,121 +0,0 @@
-# Class: apt
-#
-# This module manages the initial configuration of apt.
-#
-# Parameters:
-#   The parameters listed here are not required in general and were
-#     added for use cases related to development environments.
-#   disable_keys - disables the requirement for all packages to be signed
-#   always_apt_update - rather apt should be updated on every run (intended
-#     for development environments where package updates are frequent)
-#   purge_sources_list - Accepts true or false. Defaults to false If set to
-#     true, Puppet will purge all unmanaged entries from sources.list
-#   purge_sources_list_d - Accepts true or false. Defaults to false. If set
-#     to true, Puppet will purge all unmanaged entries from sources.list.d
-#   update_timeout - Overrides the exec timeout in seconds for apt-get update.
-#     If not set defaults to Exec's default (300)
-#
-# Actions:
-#
-# Requires:
-#   puppetlabs/stdlib
-# Sample Usage:
-#  class { 'apt': }
-
-class apt(
-  $always_apt_update    = false,
-  $disable_keys         = undef,
-  $proxy_host           = undef,
-  $proxy_port           = '8080',
-  $purge_sources_list   = false,
-  $purge_sources_list_d = false,
-  $purge_preferences_d  = false,
-  $update_timeout       = undef
-) {
-
-  include apt::params
-  include apt::update
-
-  validate_bool($purge_sources_list, $purge_sources_list_d, $purge_preferences_d)
-
-  $sources_list_content = $purge_sources_list ? {
-    false => undef,
-    true  => "# Repos managed by puppet.\n",
-  }
-
-  if $always_apt_update == true {
-    Exec <| title=='apt_update' |> {
-      refreshonly => false,
-    }
-  }
-
-  $root           = $apt::params::root
-  $apt_conf_d     = $apt::params::apt_conf_d
-  $sources_list_d = $apt::params::sources_list_d
-  $preferences_d  = $apt::params::preferences_d
-  $provider       = $apt::params::provider
-
-  file { 'sources.list':
-    ensure  => present,
-    path    => "${root}/sources.list",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => $sources_list_content,
-    notify  => Exec['apt_update'],
-  }
-
-  file { 'sources.list.d':
-    ensure  => directory,
-    path    => $sources_list_d,
-    owner   => root,
-    group   => root,
-    purge   => $purge_sources_list_d,
-    recurse => $purge_sources_list_d,
-    notify  => Exec['apt_update'],
-  }
-
-  file { 'preferences.d':
-    ensure  => directory,
-    path    => $preferences_d,
-    owner   => root,
-    group   => root,
-    purge   => $purge_preferences_d,
-    recurse => $purge_preferences_d,
-  }
-
-  case $disable_keys {
-    true: {
-      file { '99unauth':
-        ensure  => present,
-        content => "APT::Get::AllowUnauthenticated 1;\n",
-        path    => "${apt_conf_d}/99unauth",
-      }
-    }
-    false: {
-      file { '99unauth':
-        ensure => absent,
-        path   => "${apt_conf_d}/99unauth",
-      }
-    }
-    undef:   { } # do nothing
-    default: { fail('Valid values for disable_keys are true or false') }
-  }
-
-  $proxy_set = $proxy_host ? {
-    undef   => absent,
-    default => present
-  }
-
-  file { 'configure-apt-proxy':
-    ensure  => $proxy_set,
-    path    => "${apt_conf_d}/proxy",
-    content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";",
-    notify  => Exec['apt_update'],
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { 'apt::update':
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp
deleted file mode 100644
index c78bf658ce9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/key.pp
+++ /dev/null
@@ -1,90 +0,0 @@
-define apt::key (
-  $key = $title,
-  $ensure = present,
-  $key_content = false,
-  $key_source = false,
-  $key_server = 'keyserver.ubuntu.com',
-  $key_options = false
-) {
-
-  include apt::params
-
-  $upkey = upcase($key)
-  # trim the key to the last 8 chars so we can match longer keys with apt-key list too
-  $trimmedkey = regsubst($upkey, '^.*(.{8})$', '\1')
-
-  if $key_content {
-    $method = 'content'
-  } elsif $key_source {
-    $method = 'source'
-  } elsif $key_server {
-    $method = 'server'
-  }
-
-  # This is a hash of the parts of the key definition that we care about.
-  # It is used as a unique identifier for this instance of apt::key. It gets
-  # hashed to ensure that the resource name doesn't end up being pages and
-  # pages (e.g. in the situation where key_content is specified).
-  $digest = sha1("${upkey}/${key_content}/${key_source}/${key_server}/")
-
-  # Allow multiple ensure => present for the same key to account for many
-  # apt::source resources that all reference the same key.
-  case $ensure {
-    present: {
-
-      anchor { "apt::key/${title}": }
-
-      if defined(Exec["apt::key ${upkey} absent"]) {
-        fail("Cannot ensure Apt::Key[${upkey}] present; ${upkey} already ensured absent")
-      }
-
-      if !defined(Anchor["apt::key ${upkey} present"]) {
-        anchor { "apt::key ${upkey} present": }
-      }
-
-      if $key_options{
-        $options_string = "--keyserver-options ${key_options}"
-      }
-      else{
-        $options_string = ''
-      }
-
-      if !defined(Exec[$digest]) {
-        $digest_command = $method ? {
-          'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
-          'source'  => "wget -q '${key_source}' -O- | apt-key add -",
-          'server'  => "apt-key adv --keyserver '${key_server}' ${options_string} --recv-keys '${upkey}'",
-        }
-        exec { $digest:
-          command   => $digest_command,
-          path      => '/bin:/usr/bin',
-          unless    => "/usr/bin/apt-key list | /bin/grep '${trimmedkey}'",
-          logoutput => 'on_failure',
-          before    => Anchor["apt::key ${upkey} present"],
-        }
-      }
-
-      Anchor["apt::key ${upkey} present"] -> Anchor["apt::key/${title}"]
-
-    }
-    absent: {
-
-      if defined(Anchor["apt::key ${upkey} present"]) {
-        fail("Cannot ensure Apt::Key[${upkey}] absent; ${upkey} already ensured present")
-      }
-
-      exec { "apt::key ${upkey} absent":
-        command   => "apt-key del '${upkey}'",
-        path      => '/bin:/usr/bin',
-        onlyif    => "apt-key list | grep '${trimmedkey}'",
-        user      => 'root',
-        group     => 'root',
-        logoutput => 'on_failure',
-      }
-    }
-
-    default: {
-      fail "Invalid 'ensure' value '${ensure}' for aptkey"
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp
deleted file mode 100644
index b35bb1c8d91..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/params.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-class apt::params {
-  $root           = '/etc/apt'
-  $provider       = '/usr/bin/apt-get'
-  $sources_list_d = "${root}/sources.list.d"
-  $apt_conf_d     = "${root}/apt.conf.d"
-  $preferences_d  = "${root}/preferences.d"
-
-  case $::lsbdistid {
-    'debian': {
-      case $::lsbdistcodename {
-        'squeeze': {
-          $backports_location = 'http://backports.debian.org/debian-backports'
-        }
-        'wheezy': {
-          $backports_location = 'http://ftp.debian.org/debian/'
-        }
-        default: {
-          $backports_location = 'http://http.debian.net/debian/'
-        }
-      }
-    }
-    'ubuntu': {
-      case $::lsbdistcodename {
-        'hardy','maverick','natty','oneiric','precise': {
-          $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
-          $ppa_options = '-y'
-        }
-        'lucid': {
-          $backports_location = 'http://us.archive.ubuntu.com/ubuntu'
-          $ppa_options = undef
-        }
-        default: {
-          $backports_location = 'http://old-releases.ubuntu.com/ubuntu'
-          $ppa_options = '-y'
-        }
-      }
-    }
-    default: {
-      fail("Unsupported osfamily (${::osfamily}) or lsbdistid (${::lsbdistid})")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp
deleted file mode 100644
index 402e79ede7a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/pin.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# pin.pp
-# pin a release in apt, useful for unstable repositories
-
-define apt::pin(
-  $ensure          = present,
-  $explanation     = "${::caller_module_name}: ${name}",
-  $order           = '',
-  $packages        = '*',
-  $priority        = 0,
-  $release         = '', # a=
-  $origin          = '',
-  $version         = '',
-  $codename        = '', # n=
-  $release_version = '', # v=
-  $component       = '', # c=
-  $originator      = '', # o=
-  $label           = ''  # l=
-) {
-
-  include apt::params
-
-  $preferences_d = $apt::params::preferences_d
-
-  if $order != '' and !is_integer($order) {
-    fail('Only integers are allowed in the apt::pin order param')
-  }
-
-  $pin_release_array = [
-    $release,
-    $codename,
-    $release_version,
-    $component,
-    $originator,
-    $label]
-  $pin_release = join($pin_release_array, '')
-
-  # Read the manpage 'apt_preferences(5)', especially the chapter
-  # 'Thea Effect of APT Preferences' to understand the following logic
-  # and the difference between specific and general form
-  if $packages != '*' { # specific form
-
-    if ( $pin_release != '' and ( $origin != '' or $version != '' )) or
-      ( $origin != '' and ( $pin_release != '' or $version != '' )) or
-      ( $version != '' and ( $pin_release != '' or $origin != '' )) {
-      fail('parameters release, origin, and version are mutually exclusive')
-    }
-
-  } else { # general form
-
-    if $version != '' {
-      fail('parameter version cannot be used in general form')
-    }
-
-    if ( $pin_release != '' and $origin != '' ) or
-      ( $origin != '' and $pin_release != '' ) {
-      fail('parmeters release and origin are mutually exclusive')
-    }
-
-  }
-
-  $path = $order ? {
-    ''      => "${preferences_d}/${name}.pref",
-    default => "${preferences_d}/${order}-${name}.pref",
-  }
-  file { "${name}.pref":
-    ensure  => $ensure,
-    path    => $path,
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => template('apt/pin.pref.erb'),
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp
deleted file mode 100644
index f2629809e0c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/ppa.pp
+++ /dev/null
@@ -1,81 +0,0 @@
-# ppa.pp
-
-define apt::ppa(
-  $release = $::lsbdistcodename,
-  $options = $apt::params::ppa_options,
-) {
-  $ensure  = 'present'
-  include apt::params
-  include apt::update
-
-  $sources_list_d = $apt::params::sources_list_d
-
-  if ! $release {
-    fail('lsbdistcodename fact not available: release parameter required')
-  }
-
-  if $::operatingsystem != 'Ubuntu' {
-    fail("apt::ppa is currently supported on Ubuntu only.")
-  }
-
-  $filename_without_slashes = regsubst($name, '/', '-', 'G')
-  $filename_without_dots    = regsubst($filename_without_slashes, '\.', '_', 'G')
-  $filename_without_ppa     = regsubst($filename_without_dots, '^ppa:', '', 'G')
-  $sources_list_d_filename  = "${filename_without_ppa}-${release}.list"
-
-  if $ensure == 'present' {
-    $package = $::lsbdistrelease ? {
-        /^[1-9]\..*|1[01]\..*|12.04$/ => 'python-software-properties',
-        default  => 'software-properties-common',
-    }
-
-    if ! defined(Package[$package]) {
-        package { $package: }
-    }
-
-    if defined(Class[apt]) {
-        $proxy_host = $apt::proxy_host
-        $proxy_port = $apt::proxy_port
-        case  $proxy_host {
-        false, '': {
-            $proxy_env = []
-        }
-        default: {$proxy_env = ["http_proxy=http://${proxy_host}:${proxy_port}", "https_proxy=http://${proxy_host}:${proxy_port}"]}
-        }
-    } else {
-        $proxy_env = []
-    }
-    exec { "add-apt-repository-${name}":
-        environment  => $proxy_env,
-        command      => "/usr/bin/add-apt-repository ${options} ${name}",
-        unless       => "/usr/bin/test -s ${sources_list_d}/${sources_list_d_filename}",
-        user         => 'root',
-        logoutput    => 'on_failure',
-        notify       => Exec['apt_update'],
-        require      => [
-        File['sources.list.d'],
-        Package[$package],
-        ],
-    }
-
-    file { "${sources_list_d}/${sources_list_d_filename}":
-        ensure  => file,
-        require => Exec["add-apt-repository-${name}"],
-    }
-  }
-  else {
-
-    file { "${sources_list_d}/${sources_list_d_filename}":
-        ensure => 'absent',
-        mode   => '0644',
-        owner  => 'root',
-        gruop  => 'root',
-        notify => Exec['apt_update'],
-    }
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::ppa::${name}":
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp
deleted file mode 100644
index 6e0a38f73f7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/release.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# release.pp
-
-class apt::release (
-  $release_id
-) {
-
-  include apt::params
-
-  $root = $apt::params::root
-
-  file { "${root}/apt.conf.d/01release":
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => "APT::Default-Release \"${release_id}\";"
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp
deleted file mode 100644
index bc93ad9d571..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/source.pp
+++ /dev/null
@@ -1,87 +0,0 @@
-# source.pp
-# add an apt source
-
-define apt::source(
-  $ensure            = present,
-  $location          = '',
-  $release           = 'UNDEF',
-  $repos             = 'main',
-  $include_src       = true,
-  $required_packages = false,
-  $key               = false,
-  $key_server        = 'keyserver.ubuntu.com',
-  $key_content       = false,
-  $key_source        = false,
-  $pin               = false,
-  $architecture      = undef
-) {
-
-  include apt::params
-  include apt::update
-
-  $sources_list_d = $apt::params::sources_list_d
-  $provider       = $apt::params::provider
-
-  if $release == 'UNDEF' {
-    if $::lsbdistcodename == undef {
-      fail('lsbdistcodename fact not available: release parameter required')
-    } else {
-      $release_real = $::lsbdistcodename
-    }
-  } else {
-    $release_real = $release
-  }
-
-  file { "${name}.list":
-    ensure  => $ensure,
-    path    => "${sources_list_d}/${name}.list",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => template("${module_name}/source.list.erb"),
-    notify  => Exec['apt_update'],
-  }
-
-
-  if ($pin != false) {
-    # Get the host portion out of the url so we can pin to origin
-    $url_split = split($location, '/')
-    $host      = $url_split[2]
-
-    apt::pin { $name:
-      ensure   => $ensure,
-      priority => $pin,
-      before   => File["${name}.list"],
-      origin   => $host,
-    }
-  }
-
-  if ($required_packages != false) and ($ensure == 'present') {
-    exec { "Required packages: '${required_packages}' for ${name}":
-      command     => "${provider} -y install ${required_packages}",
-      logoutput   => 'on_failure',
-      refreshonly => true,
-      tries       => 3,
-      try_sleep   => 1,
-      subscribe   => File["${name}.list"],
-      before      => Exec['apt_update'],
-    }
-  }
-
-  # We do not want to remove keys when the source is absent.
-  if ($key != false) and ($ensure == 'present') {
-    apt::key { "Add key: ${key} from Apt::Source ${title}":
-      ensure      => present,
-      key         => $key,
-      key_server  => $key_server,
-      key_content => $key_content,
-      key_source  => $key_source,
-      before      => File["${name}.list"],
-    }
-  }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::source::${name}":
-    require => Class['apt::update'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp
deleted file mode 100644
index b0bd8ab1e09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/unattended_upgrades.pp
+++ /dev/null
@@ -1,69 +0,0 @@
-# Class: apt::unattended_upgrades
-#
-# This class manages the unattended-upgrades package and related configuration
-# files for ubuntu
-#
-# origins are the repositories to automatically upgrade included packages
-# blacklist is a list of packages to not automatically upgrade
-# update is how often to run "apt-get update" in days
-# download is how often to run "apt-get upgrade --download-only" in days
-# upgrade is how often to upgrade packages included in the origins list in days
-# autoclean is how often to run "apt-get autoclean" in days
-#
-# information on the other options can be found in the 50unattended-upgrades
-# file and in /etc/cron.daily/apt
-#
-class apt::unattended_upgrades (
-  $origins = ['${distro_id}:${distro_codename}-security'],
-  $blacklist = [],
-  $update = "1",
-  $download = "1",
-  $upgrade = "1",
-  $autoclean = "7",
-  $auto_fix = true,
-  $minimal_steps = false,
-  $install_on_shutdown = false,
-  $mail_to = "NONE",
-  $mail_only_on_error = false,
-  $remove_unused = true,
-  $auto_reboot = false,
-  $dl_limit = "NONE",
-  $enable = "1",
-  $backup_interval = "0",
-  $backup_level = "3",
-  $max_age = "0",
-  $min_age = "0",
-  $max_size = "0",
-  $download_delta = "0",
-  $verbose = "0",
-) {
-  include apt::params
-
-  validate_bool(
-    $auto_fix,
-    $minimal_steps,
-    $install_on_shutdown,
-    $mail_only_on_error,
-    $remove_unused,
-    $auto_reboot
-  )
-
-  package { 'unattended-upgrades':
-    ensure => present,
-  }
-
-  File {
-    ensure  => file,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    require => Package['unattended-upgrades'],
-  }
-
-  file {
-    '/etc/apt/apt.conf.d/50unattended-upgrades':
-      content => template('apt/50unattended-upgrades.erb');
-    '/etc/apt/apt.conf.d/10periodic':
-      content => template('apt/10periodic.erb');
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp
deleted file mode 100644
index ce0b78fbddb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/manifests/update.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class apt::update {
-  include apt::params
-
-  exec { 'apt_update':
-    command     => "${apt::params::provider} update",
-    logoutput   => 'on_failure',
-    refreshonly => true,
-    timeout     => $apt::update_timeout,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json
deleted file mode 100644
index f1e8663059b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/metadata.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "puppetlabs-apt",
-    "version": "1.4.1",
-    "source": "https://github.com/puppetlabs/puppetlabs-apt",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-apt",
-    "summary": "Puppet Labs Apt Module",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "pe", "version_requirement": "3.2.x" },
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb
deleted file mode 100644
index 1e35e4aa68d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_builddep_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::builddep', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'reset' do
-    it 'removes packages' do
-      shell('apt-get -y remove znc')
-      shell('apt-get -y remove g++')
-    end
-  end
-
-  context 'apt::builddep' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include '::apt'
-      apt::builddep { 'znc': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe 'should install g++ as a dependency' do
-      describe package('g++') do
-        it { should be_installed }
-      end
-    end
-  end
-
-  context 'reset' do
-    it 'removes packages' do
-      shell('apt-get -y remove znc')
-      shell('apt-get -y remove g++')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb
deleted file mode 100644
index 9f2ba395ad5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_key_spec.rb
+++ /dev/null
@@ -1,200 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::key', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'apt::key' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include '::apt'
-      apt::key { 'puppetlabs':
-        key        => '4BD6EC30',
-        key_server => 'pgp.mit.edu',
-      }
-
-      apt::key { 'jenkins':
-        key        => 'D50582E6',
-        key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key',
-      }
-      EOS
-
-      shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-      shell('apt-key del D50582E6', :acceptable_exit_codes => [0,1,2])
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe 'keys should exist' do
-      it 'finds puppetlabs key' do
-        shell('apt-key list | grep 4BD6EC30')
-      end
-      it 'finds jenkins key' do
-        shell('apt-key list | grep D50582E6')
-      end
-    end
-  end
-  context 'ensure' do
-    context 'absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          ensure     => absent,
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-        }
-
-        apt::key { 'jenkins':
-          ensure     => absent,
-          key        => 'D50582E6',
-          key_source => 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'keys shouldnt exist' do
-        it 'fails' do
-          shell('apt-key list | grep 4BD6EC30', :acceptable_exit_codes => [1])
-        end
-        it 'fails' do
-          shell('apt-key list | grep D50582E6', :acceptable_exit_codes => [1])
-        end
-      end
-    end
-  end
-
-  context 'reset' do
-    it 'clean up keys' do
-      shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-      shell('apt-key del D50582E6', :acceptable_exit_codes => [0,1,2])
-    end
-  end
-
-  context 'key options' do
-    context 'key_content' do
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          key         => '4BD6EC30',
-          key_content => '-----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: GnuPG v1.4.12 (GNU/Linux)
-          Comment: GPGTools - http://gpgtools.org
-
-          mQINBEw3u0ABEAC1+aJQpU59fwZ4mxFjqNCgfZgDhONDSYQFMRnYC1dzBpJHzI6b
-          fUBQeaZ8rh6N4kZ+wq1eL86YDXkCt4sCvNTP0eF2XaOLbmxtV9bdpTIBep9bQiKg
-          5iZaz+brUZlFk/MyJ0Yz//VQ68N1uvXccmD6uxQsVO+gx7rnarg/BGuCNaVtGwy+
-            S98g8Begwxs9JmGa8pMCcSxtC7fAfAEZ02cYyrw5KfBvFI3cHDdBqrEJQKwKeLKY
-          GHK3+H1TM4ZMxPsLuR/XKCbvTyl+OCPxU2OxPjufAxLlr8BWUzgJv6ztPe9imqpH
-          Ppp3KuLFNorjPqWY5jSgKl94W/CO2x591e++a1PhwUn7iVUwVVe+mOEWnK5+Fd0v
-          VMQebYCXS+3dNf6gxSvhz8etpw20T9Ytg4EdhLvCJRV/pYlqhcq+E9le1jFOHOc0
-          Nc5FQweUtHGaNVyn8S1hvnvWJBMxpXq+Bezfk3X8PhPT/l9O2lLFOOO08jo0OYiI
-          wrjhMQQOOSZOb3vBRvBZNnnxPrcdjUUm/9cVB8VcgI5KFhG7hmMCwH70tpUWcZCN
-          NlI1wj/PJ7Tlxjy44f1o4CQ5FxuozkiITJvh9CTg+k3wEmiaGz65w9jRl9ny2gEl
-          f4CR5+ba+w2dpuDeMwiHJIs5JsGyJjmA5/0xytB7QvgMs2q25vWhygsmUQARAQAB
-          tEdQdXBwZXQgTGFicyBSZWxlYXNlIEtleSAoUHVwcGV0IExhYnMgUmVsZWFzZSBL
-          ZXkpIDxpbmZvQHB1cHBldGxhYnMuY29tPokCPgQTAQIAKAUCTDe7QAIbAwUJA8Jn
-          AAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQEFS3okvW7DAZaw//aLmE/eob
-          pXpIUVyCUWQxEvPtM/h/SAJsG3KoHN9u216ews+UHsL/7F91ceVXQQdD2e8CtYWF
-          eLNM0RSM9i/KM60g4CvIQlmNqdqhi1HsgGqInZ72/XLAXun0gabfC36rLww2kel+
-            aMpRf58SrSuskY321NnMEJl4OsHV2hfNtAIgw2e/zm9RhoMpGKxoHZCvFhnP7u2M
-          2wMq7iNDDWb6dVsLpzdlVf242zCbubPCxxQXOpA56rzkUPuJ85mdVw4i19oPIFIZ
-          VL5owit1SxCOxBg4b8oaMS36hEl3qtZG834rtLfcqAmqjhx6aJuJLOAYN84QjDEU
-          3NI5IfNRMvluIeTcD4Dt5FCYahN045tW1Rc6s5GAR8RW45GYwQDzG+kkkeeGxwEh
-          qCW7nOHuwZIoVJufNhd28UFn83KGJHCQt4NBBr3K5TcY6bDQEIrpSplWSDBbd3p1
-          IaoZY1WSDdP9OTVOSbsz0JiglWmUWGWCdd/CMSW/D7/3VUOJOYRDwptvtSYcjJc8
-          1UV+1zB+rt5La/OWe4UOORD+jU1ATijQEaFYxBbqBBkFboAEXq9btRQyegqk+eVp
-          HhzacP5NYFTMThvHuTapNytcCso5au/cMywqCgY1DfcMJyjocu4bCtrAd6w4kGKN
-          MUdwNDYQulHZDI+UjJInhramyngdzZLjdeGJARwEEAECAAYFAkw3wEYACgkQIVr+
-            UOQUcDKvEwgAoBuOPnPioBwYp8oHVPTo/69cJn1225kfraUYGebCcrRwuoKd8Iyh
-          R165nXYJmD8yrAFBk8ScUVKsQ/pSnqNrBCrlzQD6NQvuIWVFegIdjdasrWX6Szj+
-            N1OllbzIJbkE5eo0WjCMEKJVI/GTY2AnTWUAm36PLQC5HnSATykqwxeZDsJ/s8Rc
-          kd7+QN5sBVytG3qb45Q7jLJpLcJO6KYH4rz9ZgN7LzyyGbu9DypPrulADG9OrL7e
-          lUnsGDG4E1M8Pkgk9Xv9MRKao1KjYLD5zxOoVtdeoKEQdnM+lWMJin1XvoqJY7FT
-          DJk6o+cVqqHkdKL+sgsscFVQljgCEd0EgIkCHAQQAQgABgUCTPlA6QAKCRBcE9bb
-          kwUuAxdYD/40FxAeNCYByxkr/XRT0gFT+NCjPuqPWCM5tf2NIhSapXtb2+32WbAf
-          DzVfqWjC0G0RnQBve+vcjpY4/rJu4VKIDGIT8CtnKOIyEcXTNFOehi65xO4ypaei
-          BPSb3ip3P0of1iZZDQrNHMW5VcyL1c+PWT/6exXSGsePtO/89tc6mupqZtC05f5Z
-          XG4jswMF0U6Q5s3S0tG7Y+oQhKNFJS4sH4rHe1o5CxKwNRSzqccA0hptKy3MHUZ2
-          +zeHzuRdRWGjb2rUiVxnIvPPBGxF2JHhB4ERhGgbTxRZ6wZbdW06BOE8r7pGrUpU
-          fCw/WRT3gGXJHpGPOzFAvr3Xl7VcDUKTVmIajnpd3SoyD1t2XsvJlSQBOWbViucH
-          dvE4SIKQ77vBLRlZIoXXVb6Wu7Vq+eQs1ybjwGOhnnKjz8llXcMnLzzN86STpjN4
-          qGTXQy/E9+dyUP1sXn3RRwb+ZkdI77m1YY95QRNgG/hqh77IuWWg1MtTSgQnP+F2
-          7mfo0/522hObhdAe73VO3ttEPiriWy7tw3bS9daP2TAVbYyFqkvptkBb1OXRUSzq
-          UuWjBmZ35UlXjKQsGeUHlOiEh84aondF90A7gx0X/ktNIPRrfCGkHJcDu+HVnR7x
-          Kk+F0qb9+/pGLiT3rqeQTr8fYsb4xLHT7uEg1gVFB1g0kd+RQHzV74kCPgQTAQIA
-          KAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAk/x5PoFCQtIMjoACgkQEFS3
-          okvW7DAIKQ/9HvZyf+LHVSkCk92Kb6gckniin3+5ooz67hSr8miGBfK4eocqQ0H7
-          bdtWjAILzR/IBY0xj6OHKhYP2k8TLc7QhQjt0dRpNkX+Iton2AZryV7vUADreYz4
-          4B0bPmhiE+LL46ET5IThLKu/KfihzkEEBa9/t178+dO9zCM2xsXaiDhMOxVE32gX
-          vSZKP3hmvnK/FdylUY3nWtPedr+lHpBLoHGaPH7cjI+MEEugU3oAJ0jpq3V8n4w0
-          jIq2V77wfmbD9byIV7dXcxApzciK+ekwpQNQMSaceuxLlTZKcdSqo0/qmS2A863Y
-          ZQ0ZBe+Xyf5OI33+y+Mry+vl6Lre2VfPm3udgR10E4tWXJ9Q2CmG+zNPWt73U1FD
-          7xBI7PPvOlyzCX4QJhy2Fn/fvzaNjHp4/FSiCw0HvX01epcersyun3xxPkRIjwwR
-          M9m5MJ0o4hhPfa97zibXSh8XXBnosBQxeg6nEnb26eorVQbqGx0ruu/W2m5/JpUf
-          REsFmNOBUbi8xlKNS5CZypH3Zh88EZiTFolOMEh+hT6s0l6znBAGGZ4m/Unacm5y
-          DHmg7unCk4JyVopQ2KHMoqG886elu+rm0ASkhyqBAk9sWKptMl3NHiYTRE/m9VAk
-          ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
-            =a34C
-          -----END PGP PUBLIC KEY BLOCK-----
-          ',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-    describe 'keys should exist' do
-      it 'finds puppetlabs key' do
-        shell('apt-key list | grep 4BD6EC30')
-      end
-    end
-
-    context 'key_source' do
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          key        => '4BD6EC30',
-          key_source => 'http://apt.puppetlabs.com/pubkey.gpg',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-
-    context 'key_options' do
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::key { 'puppetlabs':
-          key        => '4BD6EC30',
-          key_source => 'http://apt.puppetlabs.com/pubkey.gpg',
-          key_options => 'debug'
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb
deleted file mode 100644
index c11da9123be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_ppa_spec.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'spec_helper_acceptance'
-
-if fact('operatingsystem') == 'Ubuntu'
-  describe 'apt::ppa', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-    context 'reset' do
-      it 'removes ppa' do
-        shell('rm /etc/apt/sources.list.d/canonical-kernel-team-ppa-*', :acceptable_exit_codes => [0,1,2])
-        shell('rm /etc/apt/sources.list.d/raravena80-collectd5-*', :acceptable_exit_codes => [0,1,2])
-      end
-    end
-
-    context 'adding a ppa that doesnt exist' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::ppa { 'ppa:canonical-kernel-team/ppa': }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'contains the source file' do
-        it 'contains a kernel ppa source' do
-          shell('ls /etc/apt/sources.list.d/canonical-kernel-team-ppa-*', :acceptable_exit_codes => [0])
-        end
-      end
-    end
-
-    context 'reading a removed ppa.' do
-      it 'setup' do
-        # This leaves a blank file
-        shell('echo > /etc/apt/sources.list.d/raravena80-collectd5-$(lsb_release -c -s).list')
-      end
-
-      it 'should read it successfully' do
-        pp = <<-EOS
-        include '::apt'
-        apt::ppa { 'ppa:raravena80/collectd5': }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-
-    context 'reset' do
-      it 'removes added ppas' do
-        shell('rm /etc/apt/sources.list.d/canonical-kernel-team-ppa-*')
-        shell('rm /etc/apt/sources.list.d/raravena80-collectd5-*')
-      end
-    end
-
-    context 'release' do
-      context 'precise' do
-        it 'works without failure' do
-          pp = <<-EOS
-          include '::apt'
-          apt::ppa { 'ppa:canonical-kernel-team/ppa':
-            release => precise,
-          }
-          EOS
-
-          shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2])
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do
-          it { should be_file }
-        end
-      end
-    end
-
-    context 'options' do
-      context '-y', :unless => default[:platform].match(/10\.04/) do
-        it 'works without failure' do
-          pp = <<-EOS
-          include '::apt'
-          apt::ppa { 'ppa:canonical-kernel-team/ppa':
-            release => precise,
-            options => '-y',
-          }
-          EOS
-
-          shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2])
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        describe file('/etc/apt/sources.list.d/canonical-kernel-team-ppa-precise.list') do
-          it { should be_file }
-        end
-      end
-    end
-
-    context 'reset' do
-      it { shell('rm -rf /etc/apt/sources.list.d/canonical-kernel-team-ppa*', :acceptable_exit_codes => [0,1,2]) }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb
deleted file mode 100644
index c2d076cbff4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_source_spec.rb
+++ /dev/null
@@ -1,326 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::source', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'apt::source' do
-    context 'ensure => present' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        shell('rm /etc/apt/sources.list.d/puppetlabs.list', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe 'key should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30', :acceptable_exit_codes => [0])
-        end
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-      end
-    end
-
-    context 'ensure => absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => absent,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      # The key should remain -we don't delete those when deleting a source.
-      describe 'key should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30', :acceptable_exit_codes => [0])
-        end
-      end
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should_not be_file }
-      end
-    end
-
-  end
-
-  context 'release' do
-    context 'test' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-          release    => 'precise',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should contain 'deb http://apt.puppetlabs.com precise main' }
-      end
-    end
-  end
-
-  context 'include_src' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure      => present,
-          location    => 'http://apt.puppetlabs.com',
-          repos       => 'main',
-          key         => '4BD6EC30',
-          key_server  => 'pgp.mit.edu',
-          include_src => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should contain 'deb-src http://apt.puppetlabs.com' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure      => present,
-          location    => 'http://apt.puppetlabs.com',
-          repos       => 'main',
-          key         => '4BD6EC30',
-          key_server  => 'pgp.mit.edu',
-          include_src => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should_not contain 'deb-src http://apt.puppetlabs.com' }
-      end
-    end
-  end
-
-  context 'required_packages' do
-    context 'vim' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure             => present,
-          location           => 'http://apt.puppetlabs.com',
-          repos              => 'main',
-          key                => '4BD6EC30',
-          key_server         => 'pgp.mit.edu',
-          required_packages  => 'vim',
-        }
-        EOS
-
-        shell('apt-get -y remove vim')
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe package('vim') do
-        it { should be_installed }
-      end
-    end
-  end
-
-  context 'key content' do
-    context 'giant key' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure      => present,
-          location    => 'http://apt.puppetlabs.com',
-          repos       => 'main',
-          key         => '4BD6EC30',
-          key_content => '-----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: GnuPG v1.4.12 (GNU/Linux)
-          Comment: GPGTools - http://gpgtools.org
-
-          mQINBEw3u0ABEAC1+aJQpU59fwZ4mxFjqNCgfZgDhONDSYQFMRnYC1dzBpJHzI6b
-          fUBQeaZ8rh6N4kZ+wq1eL86YDXkCt4sCvNTP0eF2XaOLbmxtV9bdpTIBep9bQiKg
-          5iZaz+brUZlFk/MyJ0Yz//VQ68N1uvXccmD6uxQsVO+gx7rnarg/BGuCNaVtGwy+
-          S98g8Begwxs9JmGa8pMCcSxtC7fAfAEZ02cYyrw5KfBvFI3cHDdBqrEJQKwKeLKY
-          GHK3+H1TM4ZMxPsLuR/XKCbvTyl+OCPxU2OxPjufAxLlr8BWUzgJv6ztPe9imqpH
-          Ppp3KuLFNorjPqWY5jSgKl94W/CO2x591e++a1PhwUn7iVUwVVe+mOEWnK5+Fd0v
-          VMQebYCXS+3dNf6gxSvhz8etpw20T9Ytg4EdhLvCJRV/pYlqhcq+E9le1jFOHOc0
-          Nc5FQweUtHGaNVyn8S1hvnvWJBMxpXq+Bezfk3X8PhPT/l9O2lLFOOO08jo0OYiI
-          wrjhMQQOOSZOb3vBRvBZNnnxPrcdjUUm/9cVB8VcgI5KFhG7hmMCwH70tpUWcZCN
-          NlI1wj/PJ7Tlxjy44f1o4CQ5FxuozkiITJvh9CTg+k3wEmiaGz65w9jRl9ny2gEl
-          f4CR5+ba+w2dpuDeMwiHJIs5JsGyJjmA5/0xytB7QvgMs2q25vWhygsmUQARAQAB
-          tEdQdXBwZXQgTGFicyBSZWxlYXNlIEtleSAoUHVwcGV0IExhYnMgUmVsZWFzZSBL
-          ZXkpIDxpbmZvQHB1cHBldGxhYnMuY29tPokCPgQTAQIAKAUCTDe7QAIbAwUJA8Jn
-          AAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQEFS3okvW7DAZaw//aLmE/eob
-          pXpIUVyCUWQxEvPtM/h/SAJsG3KoHN9u216ews+UHsL/7F91ceVXQQdD2e8CtYWF
-          eLNM0RSM9i/KM60g4CvIQlmNqdqhi1HsgGqInZ72/XLAXun0gabfC36rLww2kel+
-          aMpRf58SrSuskY321NnMEJl4OsHV2hfNtAIgw2e/zm9RhoMpGKxoHZCvFhnP7u2M
-          2wMq7iNDDWb6dVsLpzdlVf242zCbubPCxxQXOpA56rzkUPuJ85mdVw4i19oPIFIZ
-          VL5owit1SxCOxBg4b8oaMS36hEl3qtZG834rtLfcqAmqjhx6aJuJLOAYN84QjDEU
-          3NI5IfNRMvluIeTcD4Dt5FCYahN045tW1Rc6s5GAR8RW45GYwQDzG+kkkeeGxwEh
-          qCW7nOHuwZIoVJufNhd28UFn83KGJHCQt4NBBr3K5TcY6bDQEIrpSplWSDBbd3p1
-          IaoZY1WSDdP9OTVOSbsz0JiglWmUWGWCdd/CMSW/D7/3VUOJOYRDwptvtSYcjJc8
-          1UV+1zB+rt5La/OWe4UOORD+jU1ATijQEaFYxBbqBBkFboAEXq9btRQyegqk+eVp
-          HhzacP5NYFTMThvHuTapNytcCso5au/cMywqCgY1DfcMJyjocu4bCtrAd6w4kGKN
-          MUdwNDYQulHZDI+UjJInhramyngdzZLjdeGJARwEEAECAAYFAkw3wEYACgkQIVr+
-          UOQUcDKvEwgAoBuOPnPioBwYp8oHVPTo/69cJn1225kfraUYGebCcrRwuoKd8Iyh
-          R165nXYJmD8yrAFBk8ScUVKsQ/pSnqNrBCrlzQD6NQvuIWVFegIdjdasrWX6Szj+
-          N1OllbzIJbkE5eo0WjCMEKJVI/GTY2AnTWUAm36PLQC5HnSATykqwxeZDsJ/s8Rc
-          kd7+QN5sBVytG3qb45Q7jLJpLcJO6KYH4rz9ZgN7LzyyGbu9DypPrulADG9OrL7e
-          lUnsGDG4E1M8Pkgk9Xv9MRKao1KjYLD5zxOoVtdeoKEQdnM+lWMJin1XvoqJY7FT
-          DJk6o+cVqqHkdKL+sgsscFVQljgCEd0EgIkCHAQQAQgABgUCTPlA6QAKCRBcE9bb
-          kwUuAxdYD/40FxAeNCYByxkr/XRT0gFT+NCjPuqPWCM5tf2NIhSapXtb2+32WbAf
-          DzVfqWjC0G0RnQBve+vcjpY4/rJu4VKIDGIT8CtnKOIyEcXTNFOehi65xO4ypaei
-          BPSb3ip3P0of1iZZDQrNHMW5VcyL1c+PWT/6exXSGsePtO/89tc6mupqZtC05f5Z
-          XG4jswMF0U6Q5s3S0tG7Y+oQhKNFJS4sH4rHe1o5CxKwNRSzqccA0hptKy3MHUZ2
-          +zeHzuRdRWGjb2rUiVxnIvPPBGxF2JHhB4ERhGgbTxRZ6wZbdW06BOE8r7pGrUpU
-          fCw/WRT3gGXJHpGPOzFAvr3Xl7VcDUKTVmIajnpd3SoyD1t2XsvJlSQBOWbViucH
-          dvE4SIKQ77vBLRlZIoXXVb6Wu7Vq+eQs1ybjwGOhnnKjz8llXcMnLzzN86STpjN4
-          qGTXQy/E9+dyUP1sXn3RRwb+ZkdI77m1YY95QRNgG/hqh77IuWWg1MtTSgQnP+F2
-          7mfo0/522hObhdAe73VO3ttEPiriWy7tw3bS9daP2TAVbYyFqkvptkBb1OXRUSzq
-          UuWjBmZ35UlXjKQsGeUHlOiEh84aondF90A7gx0X/ktNIPRrfCGkHJcDu+HVnR7x
-          Kk+F0qb9+/pGLiT3rqeQTr8fYsb4xLHT7uEg1gVFB1g0kd+RQHzV74kCPgQTAQIA
-          KAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAk/x5PoFCQtIMjoACgkQEFS3
-          okvW7DAIKQ/9HvZyf+LHVSkCk92Kb6gckniin3+5ooz67hSr8miGBfK4eocqQ0H7
-          bdtWjAILzR/IBY0xj6OHKhYP2k8TLc7QhQjt0dRpNkX+Iton2AZryV7vUADreYz4
-          4B0bPmhiE+LL46ET5IThLKu/KfihzkEEBa9/t178+dO9zCM2xsXaiDhMOxVE32gX
-          vSZKP3hmvnK/FdylUY3nWtPedr+lHpBLoHGaPH7cjI+MEEugU3oAJ0jpq3V8n4w0
-          jIq2V77wfmbD9byIV7dXcxApzciK+ekwpQNQMSaceuxLlTZKcdSqo0/qmS2A863Y
-          ZQ0ZBe+Xyf5OI33+y+Mry+vl6Lre2VfPm3udgR10E4tWXJ9Q2CmG+zNPWt73U1FD
-          7xBI7PPvOlyzCX4QJhy2Fn/fvzaNjHp4/FSiCw0HvX01epcersyun3xxPkRIjwwR
-          M9m5MJ0o4hhPfa97zibXSh8XXBnosBQxeg6nEnb26eorVQbqGx0ruu/W2m5/JpUf
-          REsFmNOBUbi8xlKNS5CZypH3Zh88EZiTFolOMEh+hT6s0l6znBAGGZ4m/Unacm5y
-          DHmg7unCk4JyVopQ2KHMoqG886elu+rm0ASkhyqBAk9sWKptMl3NHiYTRE/m9VAk
-          ugVIB2pi+8u84f+an4Hml4xlyijgYu05pqNvnLRyJDLd61hviLC8GYU=
-          =a34C
-          -----END PGP PUBLIC KEY BLOCK-----',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-      end
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-  end
-
-  context 'key_source' do
-    context 'http://apt.puppetlabs.com/pubkey.gpg' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          release    => 'precise',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_source  => 'http://apt.puppetlabs.com/pubkey.gpg',
-        }
-        EOS
-
-        shell('apt-key del 4BD6EC30', :acceptable_exit_codes => [0,1,2])
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list.d/puppetlabs.list') do
-        it { should be_file }
-        it { should contain 'deb http://apt.puppetlabs.com precise main' }
-      end
-      describe 'keys should exist' do
-        it 'finds puppetlabs key' do
-          shell('apt-key list | grep 4BD6EC30')
-        end
-      end
-    end
-  end
-
-  context 'pin' do
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-          pin        => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/puppetlabs.pref') do
-        it { should_not be_file }
-      end
-    end
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include '::apt'
-        apt::source { 'puppetlabs':
-          ensure     => present,
-          location   => 'http://apt.puppetlabs.com',
-          repos      => 'main',
-          key        => '4BD6EC30',
-          key_server => 'pgp.mit.edu',
-          pin        => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/puppetlabs.pref') do
-        it { should be_file }
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb
deleted file mode 100644
index 775139145ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/apt_spec.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'reset' do
-    it 'fixes the sources.list' do
-      shell('cp /etc/apt/sources.list /tmp')
-    end
-  end
-
-  context 'always_apt_update => true' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': always_apt_update => true }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/apt_update/)
-      end
-    end
-  end
-  context 'always_apt_update => false' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': always_apt_update => false }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to_not match(/apt_update/)
-      end
-    end
-  end
-
-  # disable_keys drops in a 99unauth file to ignore keys in
-  # other files.
-  context 'disable_keys => true' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': disable_keys => true }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/99unauth') do
-      it { should be_file }
-      it { should contain 'APT::Get::AllowUnauthenticated 1;' }
-    end
-  end
-  context 'disable_keys => false' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': disable_keys => false }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/99unauth') do
-      it { should_not be_file }
-    end
-  end
-
-  # proxy_host sets the proxy to use for transfers.
-  # proxy_port sets the proxy port to use.
-  context 'proxy settings' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': 
-        proxy_host => 'localhost',
-        proxy_port => '7042',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/proxy') do
-      it { should be_file }
-      it { should contain 'Acquire::http::Proxy "http://localhost:7042\";' }
-    end
-  end
-
-  context 'purge_sources' do
-    it 'creates a fake apt file' do
-      shell('touch /etc/apt/sources.list.d/fake.list')
-      shell('echo "deb fake" >> /etc/apt/sources.list')
-    end
-    it 'purge_sources_list and purge_sources_list_d => true' do
-      pp = <<-EOS
-      class { 'apt':
-        purge_sources_list   => true,
-        purge_sources_list_d => true,
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/sources.list') do
-      it { should_not contain 'deb fake' }
-    end
-
-    describe file('/etc/apt/sources.list.d/fake.list') do
-      it { should_not be_file }
-    end
-  end
-  context 'proxy settings' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': 
-        proxy_host => 'localhost',
-        proxy_port => '7042',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/proxy') do
-      it { should be_file }
-      it { should contain 'Acquire::http::Proxy "http://localhost:7042\";' }
-    end
-  end
-
-  context 'purge_sources' do
-    context 'false' do
-      it 'creates a fake apt file' do
-        shell('touch /etc/apt/sources.list.d/fake.list')
-        shell('echo "deb fake" >> /etc/apt/sources.list')
-      end
-      it 'purge_sources_list and purge_sources_list_d => false' do
-        pp = <<-EOS
-        class { 'apt':
-          purge_sources_list   => false,
-          purge_sources_list_d => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => false)
-      end
-
-      describe file('/etc/apt/sources.list') do
-        it { should contain 'deb fake' }
-      end
-
-      describe file('/etc/apt/sources.list.d/fake.list') do
-        it { should be_file }
-      end
-    end
-
-    context 'true' do
-      it 'creates a fake apt file' do
-        shell('touch /etc/apt/sources.list.d/fake.list')
-        shell('echo "deb fake" >> /etc/apt/sources.list')
-      end
-      it 'purge_sources_list and purge_sources_list_d => true' do
-        pp = <<-EOS
-        class { 'apt':
-          purge_sources_list   => true,
-          purge_sources_list_d => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/sources.list') do
-        it { should_not contain 'deb fake' }
-      end
-
-      describe file('/etc/apt/sources.list.d/fake.list') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'purge_preferences_d' do
-    context 'false' do
-      it 'creates a preferences file' do
-        shell('touch /etc/apt/preferences.d/test')
-      end
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        class { 'apt': purge_preferences_d => false }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/test') do
-        it { should be_file }
-      end
-    end
-    context 'true' do
-      it 'creates a preferences file' do
-        shell('touch /etc/apt/preferences.d/test')
-      end
-
-      it 'should work with no errors' do
-        pp = <<-EOS
-        class { 'apt': purge_preferences_d => true }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/test') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'update_timeout' do
-    context '5000' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        class { 'apt': update_timeout => '5000' }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-  end
-
-  context 'reset' do
-    it 'fixes the sources.list' do
-      shell('cp /tmp/sources.list /etc/apt')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb
deleted file mode 100644
index 6d3f7f0e687..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/backports_spec.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'spec_helper_acceptance'
-
-codename = fact('lsbdistcodename')
-case fact('operatingsystem')
-when 'Ubuntu'
-  repos = 'main universe multiverse restricted'
-when 'Debian'
-  repos = 'main contrib non-free'
-end
-
-describe 'apt::backports class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt::backports': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  context 'release' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt::backports': release => '#{codename}' }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/sources.list.d/backports.list') do
-      it { should be_file }
-      it { should contain "#{codename}-backports #{repos}" }
-    end
-  end
-
-  context 'location' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt::backports': release => 'precise', location => 'http://localhost/ubuntu' }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/sources.list.d/backports.list') do
-      it { should be_file }
-      it { should contain "deb http://localhost/ubuntu precise-backports #{repos}" }
-    end
-  end
-
-  context 'reset' do
-    it 'deletes backport files' do
-      shell('rm -rf /etc/apt/sources.list.d/backports.list')
-      shell('rm -rf /etc/apt/preferences.d/backports.pref')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb
deleted file mode 100644
index e5994498b90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-
-  context 'default parameters' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-      class { 'apt': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb
deleted file mode 100644
index 8a8ed63db4d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/conf_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::conf define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      apt::conf { 'test':
-        content => 'test',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50test') do
-      it { should be_file }
-      it { should contain 'test' }
-    end
-  end
-
-  context 'ensure' do
-    context 'absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        apt::conf { 'test':
-          ensure  => absent,
-          content => 'test',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50test') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'priority' do
-    context '99' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        apt::conf { 'test':
-          ensure   => present,
-          content  => 'test',
-          priority => '99',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/99test') do
-        it { should be_file }
-        it { should contain 'test' }
-      end
-    end
-  end
-
-  context 'cleanup' do
-    it 'deletes 99test' do
-      shell ('rm -rf /etc/apt/apt.conf.d/99test')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb
deleted file mode 100644
index 00572eae37d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/force_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require 'spec_helper_acceptance'
-
-codename = fact('lsbdistcodename')
-
-describe 'apt::force define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': release => false, }
-      EOS
-
-      shell('apt-get remove -y vim')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package('vim') do
-      it { should be_installed }
-    end
-  end
-
-  context 'release' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': release => '#{codename}' }
-      EOS
-
-      shell('apt-get remove -y vim')
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/apt-get -y -t #{codename} install vim/)
-      end
-    end
-
-    describe package('vim') do
-      it { should be_installed }
-    end
-  end
-
-  context 'version' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': version => '1.1.1', release => false, }
-      EOS
-
-      shell('apt-get remove -y vim')
-      apply_manifest(pp, :catch_failures => false) do |r|
-        expect(r.stdout).to match(/apt-get -y  install vim=1.1.1/)
-      end
-    end
-
-    describe package('vim') do
-      it { should_not be_installed }
-    end
-  end
-
-  context 'timeout' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::force { 'vim': release => false, timeout => '1' }
-      EOS
-
-      shell('apt-get clean')
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/Error: Command exceeded timeout/)
-      end
-    end
-
-    describe package('vim') do
-      it { should_not be_installed }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index 4b55677f4c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-70rc1-x64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index a5f38f784c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-server-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index c1b8bdf8fa9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index a5f38f784c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-server-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb
deleted file mode 100644
index 6de11748d0e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/pin_spec.rb
+++ /dev/null
@@ -1,266 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::pin define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      apt::pin { 'vim-puppet': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-      it { should be_file }
-      it { should contain 'Pin: release a=vim-puppet' }
-    end
-  end
-
-  context 'ensure' do
-    context 'present' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet': ensure => present }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release a=vim-puppet' }
-      end
-    end
-
-    context 'absent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet': ensure => absent }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should_not be_file }
-      end
-    end
-  end
-
-  context 'order' do
-    context '99' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure => present,
-          order  => '99',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/99-vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release a=vim-puppet' }
-      end
-    end
-  end
-
-  context 'packages' do
-    context 'test' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure   => present,
-          packages => 'test',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Package: test' }
-        it { should contain 'Pin: release a=vim-puppet' }
-      end
-    end
-  end
-
-  context 'release' do
-    context 'testrelease' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure  => present,
-          release => 'testrelease',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release a=testrelease' }
-      end
-    end
-  end
-
-  context 'origin' do
-    context 'testrelease' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure  => present,
-          origin  => 'testrelease',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: origin testrelease' }
-      end
-    end
-  end
-
-  context 'version' do
-    context '1.0.0' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure   => present,
-          packages => 'test',
-          version  => '1.0.0',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Package: test' }
-        it { should contain 'Pin: version 1.0.0' }
-      end
-    end
-  end
-
-  context 'codename' do
-    context 'testname' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure   => present,
-          codename => 'testname',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release n=testname' }
-      end
-    end
-  end
-
-  context 'release_version' do
-    context '1.1.1' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure          => present,
-          release_version => '1.1.1',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release v=1.1.1' }
-      end
-    end
-  end
-
-  context 'component' do
-    context 'testcomponent' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure    => present,
-          component => 'testcomponent',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release c=testcomponent' }
-      end
-    end
-  end
-
-  context 'originator' do
-    context 'testorigin' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure     => present,
-          originator => 'testorigin',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release o=testorigin' }
-      end
-    end
-  end
-
-  context 'label' do
-    context 'testlabel' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        apt::pin { 'vim-puppet':
-          ensure => present,
-          label  => 'testlabel',
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/preferences.d/vim-puppet.pref') do
-        it { should be_file }
-        it { should contain 'Pin: release l=testlabel' }
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb
deleted file mode 100644
index e7467bf62de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/release_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::release class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'release_id' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::release': release_id => 'precise', }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/01release') do
-      it { should be_file }
-      it { should contain 'APT::Default-Release "precise";' }
-    end
-  end
-
-  context 'reset' do
-    it 'cleans up' do
-      shell('rm -rf /etc/apt/apt.conf.d/01release')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb
deleted file mode 100644
index 6a19f4e74e0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unattended_upgrade_spec.rb
+++ /dev/null
@@ -1,562 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'apt::unattended_upgrades class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'defaults' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      include apt::unattended_upgrades
-      EOS
-
-      # Attempted workaround for problems seen on debian with
-      # something holding the package database open.
-      #shell('killall -9 apt-get')
-      #shell('killall -9 dpkg')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-    end
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-    end
-  end
-
-  context 'origins' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        origins => ['${distro_id}:${distro_codename}-test'],
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain '${distro_id}:${distro_codename}-test' }
-    end
-  end
-
-  context 'blacklist' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        blacklist => ['puppet']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain 'puppet' }
-    end
-  end
-
-  context 'update' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        update => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Update-Package-Lists "99";' }
-    end
-  end
-
-  context 'download' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        download => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Download-Upgradeable-Packages "99";' }
-    end
-  end
-
-  context 'upgrade' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        upgrade => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Unattended-Upgrade "99";' }
-    end
-  end
-
-  context 'autoclean' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        autoclean => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::AutocleanInterval "99";' }
-    end
-  end
-
-  context 'auto_fix' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_fix => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::AutoFixInterruptedDpkg "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_fix => false
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::AutoFixInterruptedDpkg "false";' }
-      end
-    end
-  end
-
-  context 'minimal_steps' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          minimal_steps => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MinimalSteps "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          minimal_steps => false
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MinimalSteps "false";' }
-      end
-    end
-  end
-
-  context 'install_on_shutdown' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          install_on_shutdown => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::InstallOnShutdown "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          install_on_shutdown => false
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::InstallOnShutdown "false";' }
-      end
-    end
-  end
-
-  context 'mail_to' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        mail_to => 'test@example.com'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain 'Unattended-Upgrade::Mail "test@example.com";' }
-    end
-  end
-
-  context 'mail_only_on_error' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          mail_to            => 'test@example.com',
-          mail_only_on_error => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MailOnlyOnError "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          mail_to            => 'test@example.com',
-          mail_only_on_error => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::MailOnlyOnError "false";' }
-      end
-    end
-
-    context 'mail_to missing' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          mail_only_on_error => true,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should_not contain 'Unattended-Upgrade::MailOnlyOnError "true";' }
-      end
-    end
-  end
-
-  context 'remove_unused' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          remove_unused => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Remove-Unused-Dependencies "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          remove_unused => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Remove-Unused-Dependencies "false";' }
-      end
-    end
-  end
-
-  context 'auto_reboot' do
-    context 'true' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_reboot => true
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Automatic-Reboot "true";' }
-      end
-    end
-
-    context 'false' do
-      it 'should work with no errors' do
-        pp = <<-EOS
-        include apt
-        class { 'apt::unattended_upgrades':
-          auto_reboot => false,
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-        it { should be_file }
-        it { should contain 'Unattended-Upgrade::Automatic-Reboot "false";' }
-      end
-    end
-  end
-
-  context 'dl_limit' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        dl_limit => '99'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/50unattended-upgrades') do
-      it { should be_file }
-      it { should contain 'Acquire::http::Dl-Limit "99"' }
-    end
-  end
-
-  context 'enable' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        enable => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Enable "2"' }
-    end
-  end
-
-  context 'backup_interval' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        backup_interval => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::BackUpArchiveInterval "2";' }
-    end
-  end
-
-  context 'backup_level' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        backup_level => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::BackUpLevel "2";' }
-    end
-  end
-
-  context 'max_age' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        max_age => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::MaxAge "2";' }
-    end
-  end
-
-  context 'min_age' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        min_age => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::MinAge "2";' }
-    end
-  end
-
-  context 'max_size' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        max_size => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::MaxSize "2";' }
-    end
-  end
-
-  context 'download_delta' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        download_delta => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Download-Upgradeable-Packages-Debdelta "2";' }
-    end
-  end
-
-  context 'verbose' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-      include apt
-      class { 'apt::unattended_upgrades':
-        verbose => '2'
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/apt/apt.conf.d/10periodic') do
-      it { should be_file }
-      it { should contain 'APT::Periodic::Verbose "2";' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 08dca76b845..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'class apt fails' do
-    pp = <<-EOS
-      class { 'apt': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb
deleted file mode 100644
index 080bc817602..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/apt_spec.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'spec_helper'
-describe 'apt', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :default_params do
-    {
-      :disable_keys => :undef,
-      :always_apt_update => false,
-      :purge_sources_list => false,
-      :purge_sources_list_d => false,
-    }
-  end
-
-  [{},
-    {
-      :disable_keys => true,
-      :always_apt_update => true,
-      :proxy_host => true,
-      :proxy_port => '3128',
-      :purge_sources_list => true,
-      :purge_sources_list_d => true,
-    },
-    {
-      :disable_keys => false
-    }
-  ].each do |param_set|
-    describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
-      let :param_hash do
-        default_params.merge(param_set)
-      end
-
-      let :params do
-        param_set
-      end
-
-      let :refresh_only_apt_update do
-        if param_hash[:always_apt_update]
-          false
-        else
-          true
-        end
-      end
-
-      it { should contain_class("apt::params") }
-
-      it {
-        if param_hash[:purge_sources_list]
-        should contain_file("sources.list").with({
-            'path'    => "/etc/apt/sources.list",
-            'ensure'  => "present",
-            'owner'   => "root",
-            'group'   => "root",
-            'mode'    => "0644",
-            "content" => "# Repos managed by puppet.\n"
-          })
-        else
-        should contain_file("sources.list").with({
-            'path'    => "/etc/apt/sources.list",
-            'ensure'  => "present",
-            'owner'   => "root",
-            'group'   => "root",
-            'mode'    => "0644",
-            'content' => nil
-          })
-        end
-      }
-      it {
-        if param_hash[:purge_sources_list_d]
-          should create_file("sources.list.d").with({
-            'path'    => "/etc/apt/sources.list.d",
-            'ensure'  => "directory",
-            'owner'   => "root",
-            'group'   => "root",
-            'purge'   => true,
-            'recurse' => true,
-            'notify'  => 'Exec[apt_update]'
-          })
-        else
-          should create_file("sources.list.d").with({
-            'path'    => "/etc/apt/sources.list.d",
-            'ensure'  => "directory",
-            'owner'   => "root",
-            'group'   => "root",
-            'purge'   => false,
-            'recurse' => false,
-            'notify'  => 'Exec[apt_update]'
-          })
-        end
-      }
-
-      it {
-        should contain_exec("apt_update").with({
-          'command'     => "/usr/bin/apt-get update",
-          'refreshonly' => refresh_only_apt_update
-        })
-      }
-
-      it {
-        if param_hash[:disable_keys] == true
-          should create_file("99unauth").with({
-            'content' => "APT::Get::AllowUnauthenticated 1;\n",
-            'ensure'  => "present",
-            'path'    => "/etc/apt/apt.conf.d/99unauth"
-          })
-        elsif param_hash[:disable_keys] == false
-          should create_file("99unauth").with({
-            'ensure' => "absent",
-            'path'   => "/etc/apt/apt.conf.d/99unauth"
-          })
-        elsif param_hash[:disable_keys] != :undef
-          should_not create_file("99unauth").with({
-            'path'   => "/etc/apt/apt.conf.d/99unauth"
-          })
-        end
-      }
-      describe 'when setting a proxy' do
-        it {
-          if param_hash[:proxy_host]
-            should contain_file('configure-apt-proxy').with(
-              'path'    => '/etc/apt/apt.conf.d/proxy',
-              'content' => "Acquire::http::Proxy \"http://#{param_hash[:proxy_host]}:#{param_hash[:proxy_port]}\";",
-              'notify'  => "Exec[apt_update]"
-            )
-          else
-            should contain_file('configure-apt-proxy').with(
-              'path'    => '/etc/apt/apt.conf.d/proxy',
-              'notify'  => 'Exec[apt_update]',
-              'ensure'  => 'absent'
-            )
-          end
-        }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb
deleted file mode 100644
index 98ad873af54..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/backports_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'spec_helper'
-describe 'apt::backports', :type => :class do
-
-  describe 'when turning on backports for ubuntu karmic' do
-
-    let :facts do
-      {
-        'lsbdistcodename' => 'Karmic',
-        'lsbdistid'       => 'Ubuntu'
-      }
-    end
-
-    it { should contain_apt__source('backports').with({
-        'location'   => 'http://old-releases.ubuntu.com/ubuntu',
-        'release'    => 'karmic-backports',
-        'repos'      => 'main universe multiverse restricted',
-        'key'        => '437D05B5',
-        'key_server' => 'pgp.mit.edu',
-        'pin'        => '200',
-      })
-    }
-  end
-
-  describe "when turning on backports for debian squeeze" do
-
-    let :facts do
-      {
-        'lsbdistcodename' => 'Squeeze',
-        'lsbdistid'       => 'Debian',
-      }
-    end
-
-    it { should contain_apt__source('backports').with({
-        'location'   => 'http://backports.debian.org/debian-backports',
-        'release'    => 'squeeze-backports',
-        'repos'      => 'main contrib non-free',
-        'key'        => '46925553',
-        'key_server' => 'pgp.mit.edu',
-        'pin'        => '200',
-      })
-    }
-  end
-
-  describe "when turning on backports for debian squeeze but using your own mirror" do
-
-    let :facts do
-      {
-        'lsbdistcodename' => 'Squeeze',
-        'lsbdistid'       => 'Debian'
-      }
-    end
-
-    let :location do
-      'http://mirrors.example.com/debian-backports'
-    end
-
-    let :params do
-      { 'location' => location }
-    end
-
-    it { should contain_apt__source('backports').with({
-        'location'   => location,
-        'release'    => 'squeeze-backports',
-        'repos'      => 'main contrib non-free',
-        'key'        => '46925553',
-        'key_server' => 'pgp.mit.edu',
-        'pin'        => '200',
-      })
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb
deleted file mode 100644
index 20487333f67..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_testing_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-describe 'apt::debian::testing', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  it {
-    should contain_apt__source("debian_testing").with({
-      "location"            => "http://debian.mirror.iweb.ca/debian/",
-      "release"             => "testing",
-      "repos"               => "main contrib non-free",
-      "required_packages"   => "debian-keyring debian-archive-keyring",
-      "key"                 => "46925553",
-      "key_server"          => "subkeys.pgp.net",
-      "pin"                 => "-10"
-    })
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb
deleted file mode 100644
index 70724f90bd0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/debian_unstable_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-describe 'apt::debian::unstable', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  it {
-    should contain_apt__source("debian_unstable").with({
-      "location"          => "http://debian.mirror.iweb.ca/debian/",
-      "release"           => "unstable",
-      "repos"             => "main contrib non-free",
-      "required_packages" => "debian-keyring debian-archive-keyring",
-      "key"               => "46925553",
-      "key_server"        => "subkeys.pgp.net",
-      "pin"               => "-10"
-    })
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/params_spec.rb
deleted file mode 100644
index 2d3ec3c71aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/params_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-describe 'apt::params', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let (:title) { 'my_package' }
-
-  it { should contain_apt__params }
-
-  # There are 4 resources in this class currently
-  # there should not be any more resources because it is a params class
-  # The resources are class[apt::params], class[main], class[settings], stage[main]
-  it "Should not contain any resources" do
-    subject.resources.size.should == 4
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/release_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/release_spec.rb
deleted file mode 100644
index e43f449d626..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/release_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-describe 'apt::release', :type => :class do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let (:title) { 'my_package' }
-
-  let :param_set do
-    { :release_id => 'precise' }
-  end
-
-  let (:params) { param_set }
-
-  it { should contain_class("apt::params") }
-
-  it {
-    should contain_file("/etc/apt/apt.conf.d/01release").with({
-      "mode"    => "0644",
-      "owner"   => "root",
-      "group"   => "root",
-      "content" => "APT::Default-Release \"#{param_set[:release_id]}\";"
-    })
-  }
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb
deleted file mode 100644
index f5cad53a5b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/classes/unattended_upgrades_spec.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-require 'spec_helper'
-describe 'apt::unattended_upgrades', :type => :class do
-  let(:file_unattended) { '/etc/apt/apt.conf.d/50unattended-upgrades' }
-  let(:file_periodic) { '/etc/apt/apt.conf.d/10periodic' }
-  let(:facts) { { :lsbdistid => 'Debian' } }
-
-  it { should contain_package("unattended-upgrades") }
-
-  it {
-    should create_file("/etc/apt/apt.conf.d/50unattended-upgrades").with({
-      "owner"   => "root",
-      "group"   => "root",
-      "mode"    => "0644",
-      "require" => "Package[unattended-upgrades]",
-    })
-  }
-
-  it {
-    should create_file("/etc/apt/apt.conf.d/10periodic").with({
-      "owner"   => "root",
-      "group"   => "root",
-      "mode"    => "0644",
-      "require" => "Package[unattended-upgrades]",
-    })
-  }
-
-  describe "origins" do
-    describe "with param defaults" do
-      let(:params) {{ }}
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Allowed-Origins \{\n\t"\$\{distro_id\}:\$\{distro_codename\}-security";\n\};$/) }
-    end
-
-    describe "with origins => ['ubuntu:precise-security']" do
-      let :params do
-        { :origins => ['ubuntu:precise-security'] }
-      end
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Allowed-Origins \{\n\t"ubuntu:precise-security";\n\};$/) }
-    end
-  end
-
-  describe "blacklist" do
-    describe "with param defaults" do
-      let(:params) {{ }}
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Package-Blacklist \{\n\};$/) }
-    end
-
-    describe "with blacklist => []" do
-      let :params do
-        { :blacklist => ['libc6', 'libc6-dev'] }
-      end
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Package-Blacklist \{\n\t"libc6";\n\t"libc6-dev";\n\};$/) }
-    end
-  end
-
-  describe "with update => 2" do
-    let :params do
-      { :update => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Update-Package-Lists "2";$/) }
-  end
-
-  describe "with download => 2" do
-    let :params do
-      { :download => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Download-Upgradeable-Packages "2";$/) }
-  end
-
-  describe "with upgrade => 2" do
-    let :params do
-      { :upgrade => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Unattended-Upgrade "2";$/) }
-  end
-
-  describe "with autoclean => 2" do
-    let :params do
-      { :autoclean => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::AutocleanInterval "2";$/) }
-  end
-
-  describe "with auto_fix => false" do
-    let :params do
-      { :auto_fix => false }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::AutoFixInterruptedDpkg "false";$/) }
-  end
-
-  describe "with minimal_steps => true" do
-    let :params do
-      { :minimal_steps => true }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::MinimalSteps "true";$/) }
-  end
-
-  describe "with install_on_shutdown => true" do
-    let :params do
-      { :install_on_shutdown => true }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::InstallOnShutdown "true";$/) }
-  end
-
-  describe "mail_to" do
-    describe "param defaults" do
-      let(:params) {{ }}
-      it { should_not contain_file(file_unattended).with_content(/^Unattended-Upgrade::Mail /) }
-      it { should_not contain_file(file_unattended).with_content(/^Unattended-Upgrade::MailOnlyOnError /) }
-    end
-
-    describe "with mail_to => user@website, mail_only_on_error => true" do
-      let :params do
-        { :mail_to => "user@website",
-          :mail_only_on_error => true }
-      end
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Mail "user@website";$/) }
-      it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::MailOnlyOnError "true";$/) }
-    end
-  end
-
-  describe "with remove_unused => false" do
-    let :params do
-      { :remove_unused => false }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Remove-Unused-Dependencies "false";$/) }
-  end
-
-  describe "with auto_reboot => true" do
-    let :params do
-      { :auto_reboot => true }
-    end
-    it { should contain_file(file_unattended).with_content(/^Unattended-Upgrade::Automatic-Reboot "true";$/) }
-  end
-
-  describe "dl_limit" do
-    describe "param defaults" do
-      let(:params) {{ }}
-      it { should_not contain_file(file_unattended).with_content(/^Acquire::http::Dl-Limit /) }
-    end
-
-    describe "with dl_limit => 70" do
-      let :params do
-        { :dl_limit => "70" }
-      end
-      it { should contain_file(file_unattended).with_content(/^Acquire::http::Dl-Limit "70";$/) }
-    end
-  end
-
-  describe "with enable => 0" do
-    let :params do
-      { :enable => "0" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Enable "0";$/) }
-  end
-
-  describe "with backup_interval => 1" do
-    let :params do
-      { :backup_interval => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::BackUpArchiveInterval "1";$/) }
-  end
-
-  describe "with backup_level => 0" do
-    let :params do
-      { :backup_level => "0" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::BackUpLevel "0";$/) }
-  end
-
-  describe "with max_age => 1" do
-    let :params do
-      { :max_age => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::MaxAge "1";$/) }
-  end
-
-  describe "with min_age => 1" do
-    let :params do
-      { :min_age => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::MinAge "1";$/) }
-  end
-
-  describe "with max_size => 1" do
-    let :params do
-      { :max_size => "1" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::MaxSize "1";$/) }
-  end
-
-  describe "with download_delta => 2" do
-    let :params do
-      { :download_delta => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Download-Upgradeable-Packages-Debdelta "2";$/) }
-  end
-
-  describe "with verbose => 2" do
-    let :params do
-      { :verbose => "2" }
-    end
-    it { should contain_file(file_periodic).with_content(/^APT::Periodic::Verbose "2";$/) }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb
deleted file mode 100644
index a0cbaa4cc09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/builddep_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-describe 'apt::builddep', :type => :define do
-
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let(:title) { 'my_package' }
-
-  describe "should require apt-get update" do
-    it { should contain_exec("apt_update").with({
-        'command' => "/usr/bin/apt-get update",
-        'refreshonly' => true
-      })
-    }
-    it { should contain_anchor("apt::builddep::my_package").with({
-        'require' => 'Class[Apt::Update]',
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb
deleted file mode 100644
index cda5900c035..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/conf_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-describe 'apt::conf', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :title do
-    'norecommends'
-  end
-
-  describe "when creating an apt preference" do
-    let :params do
-      {
-        :priority => '00',
-        :content  => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
-      }
-    end
-
-    let :filename do
-      "/etc/apt/apt.conf.d/00norecommends"
-    end
-
-    it { should contain_apt__conf('norecommends').with({
-         'priority' => '00',
-         'content'  => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
-      })
-    }
-
-    it { should contain_file(filename).with({
-          'ensure'    => 'present',
-          'content'   => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
-          'owner'     => 'root',
-          'group'     => 'root',
-          'mode'      => '0644',
-        })
-      }
-  end
-
-  describe "when removing an apt preference" do
-    let :params do
-      {
-        :ensure   => 'absent',
-        :priority => '00',
-        :content  => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n"
-      }
-    end
-
-    let :filename do
-      "/etc/apt/apt.conf.d/00norecommends"
-    end
-
-    it { should contain_file(filename).with({
-        'ensure'    => 'absent',
-        'content'   => "Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;\n",
-        'owner'     => 'root',
-        'group'     => 'root',
-        'mode'      => '0644',
-      })
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/force_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/force_spec.rb
deleted file mode 100644
index b8665e6dabe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/force_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-describe 'apt::force', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :pre_condition do
-    'include apt::params'
-  end
-
-  let :title do
-    'my_package'
-  end
-
-  let :default_params do
-    {
-      :release => 'testing',
-      :version => false
-    }
-  end
-
-  describe "when using default parameters" do
-    let :params do
-      default_params
-    end
-    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}").with(
-      :unless => "/usr/bin/test \$(/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -E 'Installed|Candidate' | /usr/bin/uniq -s 14 | /usr/bin/wc -l) -eq 1",
-      :timeout => '300'
-    ) }
-  end
-
-  describe "when specifying false release parameter" do
-    let :params do
-      default_params.merge(:release => false)
-    end
-    it { should contain_exec("/usr/bin/apt-get -y  install #{title}").with(
-      :unless  => "/usr/bin/dpkg -s #{title} | grep -q 'Status: install'"
-    ) }
-  end
-
-  describe "when specifying version parameter" do
-    let :params do
-      default_params.merge(:version => '1')
-    end
-    it { should contain_exec("/usr/bin/apt-get -y -t #{params[:release]} install #{title}=#{params[:version]}").with(
-      :unless => "/usr/bin/apt-cache policy -t #{params[:release]} #{title} | /bin/grep -q 'Installed: #{params[:version]}'"
-    ) }
-  end
-
-  describe "when specifying false release and version parameters" do
-    let :params do
-      default_params.merge(
-        :release => false,
-        :version => '1'
-      )
-    end
-    it { should contain_exec("/usr/bin/apt-get -y  install #{title}=1").with(
-      :unless => "/usr/bin/dpkg -s #{title} | grep -q 'Version: #{params[:version]}'"
-    ) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/key_spec.rb
deleted file mode 100644
index 4ba7b87eae6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/key_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'spec_helper'
-describe 'apt::key', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :title do
-    '8347A27F'
-  end
-
-  let :default_params do
-    {
-      :key         => title,
-      :ensure      => 'present',
-      :key_server  => "keyserver.ubuntu.com",
-      :key_source  => false,
-      :key_content => false
-    }
-  end
-
-  [{},
-    {
-      :ensure  => 'absent'
-    },
-    {
-      :ensure  => 'random'
-    },
-    {
-      :key_source => 'ftp://ftp.example.org/key',
-    },
-    {
-      :key_content => 'deadbeef',
-    }
-  ].each do |param_set|
-
-    let :param_hash do
-      param_hash = default_params.merge(param_set)
-      param_hash[:key].upcase! if param_hash[:key]
-      param_hash
-    end
-
-    let :params do
-      param_set
-    end
-
-    let :digest do
-      str = String.new
-      str << param_hash[:key].to_s         << '/'
-      str << param_hash[:key_content].to_s << '/'
-      str << param_hash[:key_source].to_s  << '/'
-      str << param_hash[:key_server].to_s  << '/'
-      Digest::SHA1.hexdigest(str)
-    end
-
-    describe "when #{param_set == {} ? "using default" : "specifying"} define parameters" do
-
-      it {
-        if [:present, 'present', :absent, 'absent'].include? param_hash[:ensure]
-          should contain_apt__params
-        end
-      }
-
-      it {
-        if [:present, 'present'].include? param_hash[:ensure]
-          should_not contain_exec("apt::key #{param_hash[:key]} absent")
-          should contain_anchor("apt::key #{param_hash[:key]} present")
-          should contain_exec(digest).with({
-            "path"    => "/bin:/usr/bin",
-            "unless"  => "/usr/bin/apt-key list | /bin/grep '#{param_hash[:key]}'"
-          })
-        elsif [:absent, 'absent'].include? param_hash[:ensure]
-          should_not contain_anchor("apt::key #{param_hash[:key]} present")
-          should contain_exec("apt::key #{param_hash[:key]} absent").with({
-            "path"    => "/bin:/usr/bin",
-            "onlyif"  => "apt-key list | grep '#{param_hash[:key]}'",
-            "command" => "apt-key del '#{param_hash[:key]}'"
-          })
-        else
-          expect { should raise_error(Puppet::Error) }
-        end
-      }
-
-      it {
-        if [:present, 'present'].include? param_hash[:ensure]
-          if param_hash[:key_content]
-            should contain_exec(digest).with({
-              "command" => "echo '#{param_hash[:key_content]}' | /usr/bin/apt-key add -"
-            })
-          elsif param_hash[:key_source]
-            should contain_exec(digest).with({
-              "command" => "wget -q '#{param_hash[:key_source]}' -O- | apt-key add -"
-            })
-          elsif param_hash[:key_server]
-            should contain_exec(digest).with({
-              "command" => "apt-key adv --keyserver '#{param_hash[:key_server]}' --recv-keys '#{param_hash[:key]}'"
-            })
-          end
-        end
-      }
-
-    end
-  end
-
-  [{ :ensure => 'present' }, { :ensure => 'absent' }].each do |param_set|
-    describe "should correctly handle duplicate definitions" do
-
-      let :pre_condition do
-        "apt::key { 'duplicate': key => '#{title}'; }"
-      end
-
-      let(:params) { param_set }
-
-      it {
-        if param_set[:ensure] == 'present'
-          should contain_anchor("apt::key #{title} present")
-          should contain_apt__key(title)
-          should contain_apt__key("duplicate")
-        elsif param_set[:ensure] == 'absent'
-          expect { should raise_error(Puppet::Error) }
-        end
-      }
-
-    end
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb
deleted file mode 100644
index 78a9b12690b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/pin_spec.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-require 'spec_helper'
-describe 'apt::pin', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let(:title) { 'my_pin' }
-
-  let :default_params do
-    {
-      :ensure   => 'present',
-      :order    => '',
-      :packages => '*',
-      :priority => '0',
-      :release  => nil
-    }
-  end
-
-  [
-    { :params  => {},
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: *\nPin: release a=my_pin\nPin-Priority: 0\n"
-    },
-    {
-      :params => {
-        :packages => 'apache',
-        :priority => '1'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_pin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :order    => 50,
-        :packages => 'apache',
-        :priority => '1'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_pin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :ensure   => 'absent',
-        :packages => 'apache',
-        :priority => '1'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_pin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :packages => 'apache',
-        :priority => '1',
-        :release  => 'my_newpin'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=my_newpin\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :packages => 'apache',
-        :priority => '1',
-        :version  => '2.2.16*'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: version 2.2.16*\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :priority => '1',
-        :origin   => 'ftp.de.debian.org'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: *\nPin: origin ftp.de.debian.org\nPin-Priority: 1\n"
-    },
-    {
-      :params => {
-        :packages        => 'apache',
-        :priority        => '1',  
-        :release         => 'stable',
-        :codename        => 'wheezy',
-        :release_version => '3.0',
-        :component       => 'main',
-        :originator      => 'Debian',
-        :label           => 'Debian'
-      },
-      :content => "# my_pin\nExplanation: : my_pin\nPackage: apache\nPin: release a=stable, n=wheezy, v=3.0, c=main, o=Debian, l=Debian\nPin-Priority: 1\n"
-    },
-  ].each do |param_set|
-    describe "when #{param_set == {} ? "using default" : "specifying"} define parameters" do
-      let :param_hash do
-        default_params.merge(param_set[:params])
-      end
-
-      let :params do
-        param_set[:params]
-      end
-
-      it { should contain_class("apt::params") }
-
-      it { should contain_file("#{title}.pref").with({
-          'ensure'  => param_hash[:ensure],
-          'path'    => "/etc/apt/preferences.d/#{param_hash[:order] == '' ? "" : "#{param_hash[:order]}-"}#{title}.pref",
-          'owner'   => 'root',
-          'group'   => 'root',
-          'mode'    => '0644',
-          'content' => param_set[:content],
-        })
-      }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb
deleted file mode 100644
index 0c3bd75ed77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/ppa_spec.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-require 'spec_helper'
-describe 'apt::ppa', :type => :define do
-  [
-    {
-      :lsbdistrelease  => '11.04',
-      :lsbdistcodename => 'natty',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistid       => 'Ubuntu',
-      :package         => 'python-software-properties'
-    },
-    {
-      :lsbdistrelease  => '12.10',
-      :lsbdistcodename => 'quantal',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistid       => 'Ubuntu',
-      :package         => 'software-properties-common'
-    },
-  ].each do |platform|
-    context "on #{platform[:lsbdistcodename]}" do
-      let :facts do
-        {
-          :lsbdistrelease  => platform[:lsbdistrelease],
-          :lsbdistcodename => platform[:lsbdistcodename],
-          :operatingsystem => platform[:operatingsystem],
-          :lsbdistid       => platform[:lsbdistid],
-        }
-      end
-      let :release do
-        "#{platform[:lsbdistcodename]}"
-      end
-      let :package do
-        "#{platform[:package]}"
-      end
-      let :options do
-        "-y"
-      end
-      ['ppa:dans_ppa', 'dans_ppa','ppa:dans-daily/ubuntu'].each do |t|
-        describe "with title #{t}" do
-          let :pre_condition do
-            'class { "apt": }'
-          end
-          let :title do
-            t
-          end
-          let :filename do
-            t.sub(/^ppa:/,'').gsub('/','-') << "-" << "#{release}.list"
-          end
-
-          it { should contain_package("#{package}") }
-
-          it { should contain_exec("apt_update").with(
-            'command'     => '/usr/bin/apt-get update',
-            'refreshonly' => true
-            )
-          }
-
-          it { should contain_exec("add-apt-repository-#{t}").with(
-            'command' => "/usr/bin/add-apt-repository #{options} #{t}",
-            'unless'  => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-            'require' => ["File[sources.list.d]", "Package[#{package}]"],
-            'notify'  => "Exec[apt_update]"
-            )
-          }
-
-          it { should create_file("/etc/apt/sources.list.d/#{filename}").with(
-            'ensure'  => 'file',
-            'require' => "Exec[add-apt-repository-#{t}]"
-            )
-          }
-        end
-      end
-      describe 'without a proxy defined' do
-        let :title do
-          'rspec_ppa'
-        end
-        let :pre_condition do
-          'class { "apt":
-             proxy_host => false
-          }'
-        end
-        let :filename do
-          "#{title}-#{release}.list"
-        end
-
-        it { should contain_exec("add-apt-repository-#{title}").with(
-          'environment' => [],
-          'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
-          'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
-          'notify'      => "Exec[apt_update]"
-          )
-        }
-      end
-
-      describe 'behind a proxy' do
-        let :title do
-          'rspec_ppa'
-        end
-        let :pre_condition do
-          'class { "apt":
-            proxy_host => "user:pass@proxy",
-          }'
-        end
-          let :filename do
-            "#{title}-#{release}.list"
-          end
-
-        it { should contain_exec("add-apt-repository-#{title}").with(
-          'environment' => [
-            "http_proxy=http://user:pass@proxy:8080",
-            "https_proxy=http://user:pass@proxy:8080",
-          ],
-          'command'     => "/usr/bin/add-apt-repository #{options} #{title}",
-          'unless'      => "/usr/bin/test -s /etc/apt/sources.list.d/#{filename}",
-          'require'     => ["File[sources.list.d]", "Package[#{package}]"],
-          'notify'      => "Exec[apt_update]"
-          )
-        }
-      end
-    end
-  end
-
-  [ { :lsbdistcodename => 'natty',
-      :package => 'python-software-properties' },
-    { :lsbdistcodename => 'quantal',
-      :package => 'software-properties-common'},
-  ].each do |platform|
-    context "on #{platform[:lsbdistcodename]}" do
-      describe "it should not error if package['#{platform[:package]}'] is already defined" do
-        let :pre_condition do
-           'class {"apt": }' +
-           'package { "#{platform[:package]}": }->Apt::Ppa["ppa"]'
-        end
-        let :facts do
-          {:lsbdistcodename => '#{platform[:lsbdistcodename]}',
-           :operatingsystem => 'Ubuntu',
-           :lsbdistid => 'Ubuntu'}
-        end
-        let(:title) { "ppa" }
-        let(:release) { "#{platform[:lsbdistcodename]}" }
-        it { should contain_package('#{platform[:package]}') }
-      end
-    end
-  end
-
-  describe "without Class[apt] should raise a Puppet::Error" do
-    let(:release) { "natty" }
-    let(:title) { "ppa" }
-    it { expect { should contain_apt__ppa(title) }.to raise_error(Puppet::Error) }
-  end
-
-  describe "without release should raise a Puppet::Error" do
-    let(:title) { "ppa:" }
-    it { expect { should contain_apt__ppa(:release) }.to raise_error(Puppet::Error) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/source_spec.rb
deleted file mode 100644
index 9da8b235fef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/defines/source_spec.rb
+++ /dev/null
@@ -1,167 +0,0 @@
-require 'spec_helper'
-describe 'apt::source', :type => :define do
-  let(:facts) { { :lsbdistid => 'Debian' } }
-  let :title do
-    'my_source'
-  end
-
-  let :default_params do
-    {
-      :ensure             => 'present',
-      :location           => '',
-      :release            => 'karmic',
-      :repos              => 'main',
-      :include_src        => true,
-      :required_packages  => false,
-      :key                => false,
-      :key_server         => 'keyserver.ubuntu.com',
-      :key_content        => false,
-      :key_source         => false,
-      :pin                => false
-    }
-  end
-
-  [{},
-   {
-      :location           => 'http://example.com',
-      :release            => 'precise',
-      :repos              => 'security',
-      :include_src        => false,
-      :required_packages  => 'apache',
-      :key                => 'key_name',
-      :key_server         => 'keyserver.debian.com',
-      :pin                => '600',
-      :key_content        => 'ABCD1234'
-    },
-    {
-      :key                => 'key_name',
-      :key_server         => 'keyserver.debian.com',
-      :key_content        => false,
-    },
-    {
-      :ensure             => 'absent',
-      :location           => 'http://example.com',
-      :release            => 'precise',
-      :repos              => 'security',
-    },
-    {
-      :release            => '',
-    },
-    {
-      :release            => 'custom',
-    },
-    {
-      :architecture       => 'amd64',
-    }
-  ].each do |param_set|
-    describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
-      let :param_hash do
-        default_params.merge(param_set)
-      end
-
-      let :facts do
-        {:lsbdistcodename => 'karmic', :lsbdistid => 'Ubuntu'}
-      end
-
-      let :params do
-        param_set
-      end
-
-      let :filename do
-        "/etc/apt/sources.list.d/#{title}.list"
-      end
-
-      let :content do
-        content = "# #{title}"
-        if param_hash[:architecture]
-          arch = "[arch=#{param_hash[:architecture]}] "
-        end
-        content << "\ndeb #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
-
-        if param_hash[:include_src]
-          content << "deb-src #{arch}#{param_hash[:location]} #{param_hash[:release]} #{param_hash[:repos]}\n"
-        end
-        content
-      end
-
-      it { should contain_apt__params }
-
-      it { should contain_file("#{title}.list").with({
-          'ensure'    => param_hash[:ensure],
-          'path'      => filename,
-          'owner'     => 'root',
-          'group'     => 'root',
-          'mode'      => '0644',
-          'content'   => content,
-        })
-      }
-
-      it {
-        if param_hash[:pin]
-          should contain_apt__pin(title).with({
-            "priority"  => param_hash[:pin],
-            "before"    => "File[#{title}.list]"
-          })
-        else
-          should_not contain_apt__pin(title).with({
-            "priority"  => param_hash[:pin],
-            "before"    => "File[#{title}.list]"
-          })
-        end
-      }
-
-      it {
-        should contain_exec("apt_update").with({
-          "command"     => "/usr/bin/apt-get update",
-          "refreshonly" => true
-        })
-      }
-
-      it {
-        if param_hash[:required_packages]
-          should contain_exec("Required packages: '#{param_hash[:required_packages]}' for #{title}").with({
-            "command" => "/usr/bin/apt-get -y install #{param_hash[:required_packages]}",
-            "subscribe"   => "File[#{title}.list]",
-            "refreshonly" => true,
-            "before"      => 'Exec[apt_update]',
-          })
-        else
-          should_not contain_exec("Required packages: '#{param_hash[:required_packages]}' for #{title}").with({
-            "command"     => "/usr/bin/apt-get -y install #{param_hash[:required_packages]}",
-            "subscribe"   => "File[#{title}.list]",
-            "refreshonly" => true
-          })
-        end
-      }
-
-      it {
-        if param_hash[:key]
-          should contain_apt__key("Add key: #{param_hash[:key]} from Apt::Source #{title}").with({
-            "key"         => param_hash[:key],
-            "ensure"      => :present,
-            "key_server"  => param_hash[:key_server],
-            "key_content" => param_hash[:key_content],
-            "key_source"  => param_hash[:key_source],
-            "before"      => "File[#{title}.list]"
-          })
-        else
-          should_not contain_apt__key("Add key: #{param_hash[:key]} from Apt::Source #{title}").with({
-            "key"         => param_hash[:key],
-            "ensure"      => :present,
-            "key_server"  => param_hash[:key_server],
-            "key_content" => param_hash[:key_content],
-            "key_source"  => param_hash[:key_source],
-            "before"      => "File[#{title}.list]"
-          })
-        end
-      }
-    end
-  end
-  describe "without release should raise a Puppet::Error" do
-    let(:default_params) { Hash.new }
-    let(:facts) { Hash.new }
-    it { expect { should raise_error(Puppet::Error) } }
-    let(:facts) { { :lsbdistcodename => 'lucid', :lsbdistid => 'Ubuntu' } }
-    it { should contain_apt__source(title) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 3352564ce7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'beaker-rspec'
-
-# Install Puppet
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-UNSUPPORTED_PLATFORMS = ['RedHat','Suse','windows','AIX','Solaris']
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apt')
-    hosts.each do |host|
-      shell('/bin/touch /etc/puppet/hiera.yaml')
-      shell('puppet module install puppetlabs-stdlib --version 2.2.1', { :acceptable_exit_codes => [0,1] })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/10periodic.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/10periodic.erb
deleted file mode 100644
index 5737c9ac29f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/10periodic.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-APT::Periodic::Enable "<%= @enable %>";
-APT::Periodic::BackUpArchiveInterval "<%= @backup_interval %>";
-APT::Periodic::BackUpLevel "<%= @backup_level %>";
-APT::Periodic::MaxAge "<%= @max_age %>";
-APT::Periodic::MinAge "<%= @min_age %>";
-APT::Periodic::MaxSize "<%= @max_size %>";
-APT::Periodic::Update-Package-Lists "<%= @update %>";
-APT::Periodic::Download-Upgradeable-Packages "<%= @download %>";
-APT::Periodic::Download-Upgradeable-Packages-Debdelta "<%= @download_delta %>";
-APT::Periodic::Unattended-Upgrade "<%= @upgrade %>";
-APT::Periodic::AutocleanInterval "<%= @autoclean %>";
-APT::Periodic::Verbose "<%= @verbose %>";
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb
deleted file mode 100644
index 4df0f74401f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/50unattended-upgrades.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-// Automatically upgrade packages from these (origin:archive) pairs
-Unattended-Upgrade::Allowed-Origins {
-<% @origins.each do |origin| -%>
-	"<%= origin %>";
-<% end -%>
-};
-
-// List of packages to not update
-Unattended-Upgrade::Package-Blacklist {
-<% @blacklist.each do |package| -%>
-	"<%= package %>";
-<% end -%>
-};
-
-// This option allows you to control if on a unclean dpkg exit
-// unattended-upgrades will automatically run 
-//   dpkg --force-confold --configure -a
-// The default is true, to ensure updates keep getting installed
-Unattended-Upgrade::AutoFixInterruptedDpkg "<%= @auto_fix %>";
-
-// Split the upgrade into the smallest possible chunks so that
-// they can be interrupted with SIGUSR1. This makes the upgrade
-// a bit slower but it has the benefit that shutdown while a upgrade
-// is running is possible (with a small delay)
-Unattended-Upgrade::MinimalSteps "<%= @minimal_steps %>";
-
-// Install all unattended-upgrades when the machine is shuting down
-// instead of doing it in the background while the machine is running
-// This will (obviously) make shutdown slower
-Unattended-Upgrade::InstallOnShutdown "<%= @install_on_shutdown %>";
-
-// Send email to this address for problems or packages upgrades
-// If empty or unset then no email is sent, make sure that you
-// have a working mail setup on your system. A package that provides
-// 'mailx' must be installed.
-<% if @mail_to != "NONE" %>Unattended-Upgrade::Mail "<%= @mail_to %>";<% end %>
-
-// Set this value to "true" to get emails only on errors. Default
-// is to always send a mail if Unattended-Upgrade::Mail is set
-<% if @mail_to != "NONE" %>Unattended-Upgrade::MailOnlyOnError "<%= @mail_only_on_error %>";<% end %>
-
-// Do automatic removal of new unused dependencies after the upgrade
-// (equivalent to apt-get autoremove)
-Unattended-Upgrade::Remove-Unused-Dependencies "<%= @remove_unused %>";
-
-// Automatically reboot *WITHOUT CONFIRMATION* if a 
-// the file /var/run/reboot-required is found after the upgrade 
-Unattended-Upgrade::Automatic-Reboot "<%= @auto_reboot %>";
-
-
-// Use apt bandwidth limit feature, this example limits the download
-// speed to 70kb/sec
-<% if @dl_limit != "NONE" %>Acquire::http::Dl-Limit "<%= @dl_limit %>";<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/pin.pref.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/pin.pref.erb
deleted file mode 100644
index eed0c10db67..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/pin.pref.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<%-
-@pin = "release a=#{@name}" # default value
-if @pin_release.length > 0
-  options = []
-  options.push("a=#{@release}") if @release.length > 0
-  options.push("n=#{@codename}") if @codename.length > 0
-  options.push("v=#{@release_version}") if @release_version.length > 0
-  options.push("c=#{@component}") if @component.length > 0
-  options.push("o=#{@originator}") if @originator.length > 0
-  options.push("l=#{@label}") if @label.length > 0
-  @pin = "release #{options.join(', ')}"
-elsif @version.length > 0
-  @pin = "version #{@version}"
-elsif @origin.length > 0
-  @pin = "origin #{@origin}"
-end
--%>
-# <%= @name %>
-Explanation: <%= @explanation %>
-Package: <%= @packages %>
-Pin: <%= @pin %>
-Pin-Priority: <%= @priority %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/source.list.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/source.list.erb
deleted file mode 100644
index 9946966ee53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/templates/source.list.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-# <%= @name %>
-deb <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @location %> <%= @release_real %> <%= @repos %>
-<%- if @include_src then -%>
-deb-src <% if @architecture %>[arch=<%= @architecture %>] <% end %><%= @location %> <%= @release_real %> <%= @repos %>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/builddep.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/builddep.pp
deleted file mode 100644
index 8b4f7964081..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/builddep.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'apt': }
-apt::builddep{ 'glusterfs-server': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/testing.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/testing.pp
deleted file mode 100644
index 8245b3a337b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/testing.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'apt': }
-class { 'apt::debian::testing': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/unstable.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/unstable.pp
deleted file mode 100644
index 86051792951..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/debian/unstable.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'apt': }
-class { 'apt::debian::unstable': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/force.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/force.pp
deleted file mode 100644
index 59ad8f1b573..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/force.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# force.pp
-
-# force a package from a specific release
-apt::force { 'package1':
-  release => 'backports',
-}
-
-# force a package to be a specific version
-apt::force { 'package2':
-  version => '1.0.0-1',
-}
-
-# force a package from a specific release to be a specific version
-apt::force { 'package3':
-  release => 'sid',
-  version => '2.0.0-1',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/init.pp
deleted file mode 100644
index abc75afa25a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'apt': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/key.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/key.pp
deleted file mode 100644
index 79e0e1b749a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/key.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# Declare Apt key for apt.puppetlabs.com source
-apt::key { 'puppetlabs':
-  key         => '4BD6EC30',
-  key_server  => 'pgp.mit.edu',
-  key_options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/params.pp
deleted file mode 100644
index 5ddf3c65512..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/params.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apt::params
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/pin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/pin.pp
deleted file mode 100644
index 6a9024c2343..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/pin.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# pin a release in apt, useful for unstable repositories
-apt::pin { 'foo':
-  packages => '*',
-  priority => 0,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/ppa.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/ppa.pp
deleted file mode 100644
index e728f6f10f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/ppa.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'apt': }
-
-# Example declaration of an Apt PPA
-apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/release.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/release.pp
deleted file mode 100644
index 823f5861fa1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/release.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'apt': }
-class { 'apt::release':
-  release_id => 'karmic'
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/source.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/source.pp
deleted file mode 100644
index c20b59662a0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/source.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Declare the apt class to manage /etc/apt/sources.list and /etc/sources.list.d
-class { 'apt': }
-
-# Install the puppetlabs apt source
-# Release is automatically obtained from lsbdistcodename fact if available.
-apt::source { 'puppetlabs':
-  location   => 'http://apt.puppetlabs.com',
-  repos      => 'main',
-  key        => '4BD6EC30',
-  key_server => 'pgp.mit.edu',
-}
-
-# test two sources with the same key
-apt::source { 'debian_testing':
-  location   => 'http://debian.mirror.iweb.ca/debian/',
-  release    => 'testing',
-  repos      => 'main contrib non-free',
-  key        => '46925553',
-  key_server => 'subkeys.pgp.net',
-  pin        => '-10',
-}
-apt::source { 'debian_unstable':
-  location   => 'http://debian.mirror.iweb.ca/debian/',
-  release    => 'unstable',
-  repos      => 'main contrib non-free',
-  key        => '46925553',
-  key_server => 'subkeys.pgp.net',
-  pin        => '-10',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp
deleted file mode 100644
index 3b9b49eb72a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/apt/tests/unattended_upgrades.pp
+++ /dev/null
@@ -1 +0,0 @@
-include apt::unattended_upgrades
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/.travis.yml
deleted file mode 100644
index 788946406c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: ruby
-rvm:
-  - "1.8.7"
-# life with later versions of ruby gets interesting with 2.6..so lets
-# ignore them for now
-#  - "1.9.2"
-#  - "1.9.3"
-#  - ruby-head ..that doesnt work. would be nice to do "current"
-
-env:
-#find versions here https://rubygems.org/gems/puppet/versions
-# spec_helper pretty much fails on these earlier versions.
-#  - PUPPET_VERSION=0.24.5
-#  - PUPPET_VERSION=0.25.5 
-  - PUPPET_VERSION=2.6.18
-  - PUPPET_VERSION=2.7.21
-  - PUPPET_VERSION=3.1.1
- 
-
-before_script: 
- - cd beanstalkd
- - bundle install
- - bundle show
-
-script: 
- - bundle exec rake
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Gemfile
deleted file mode 100644
index c9aabd4b8ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-
-
-gem 'rake'
-gem 'rspec-expectations'
-gem 'rspec'
-gem 'facter'
-gem 'puppet', puppetversion
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/README.md
deleted file mode 100644
index 6abbcb7fb2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-puppet-beanstalkd
-=================
-[![Build Status](https://travis-ci.org/keen99/puppet-beanstalkd.png?branch=master)](https://travis-ci.org/keen99/puppet-beanstalkd)
-
-puppet module for managing beanstalkd, a simple and fast work queue - https://github.com/kr/beanstalkd
-
-
-## Supported OSes
-
-redhat/centos and debian/ubuntu currently.  Please PR updates for others!  
-
-Requires packages (rpm, etc) with traditional init scripts supported by service{} for your OS.
-
-
-## Basic Usage
-
-Drop the beanstalkd directory into your modules tree and realize the define:
-
-	beanstalkd::config{"my beanstalk install": }
-
-## Optional parameters
-	
-	listenaddress => '0.0.0.0',
-	listenport => '13000',
-	maxjobsize => '65535',
-	maxconnections => '1024',
-	binlogdir => '/var/lib/beanstalkd/binlog',	# set empty ( '' ) to disable binlog
-	binlogfsync => undef,							
-	binlogsize => '10485760',
-	ensure => 'running',		# running, stopped, absent
-	packageversion => 'latest',	# latest, present, or specific version
-	packagename => undef,		# override package name						
-	servicename => undef		# override service name
-
-
-
-
-
-## Tests
-
-To run unit tests, cd into beanstalkd and execute "run-tests.sh"
-
-Requires ruby and bundler, everything else should get installed by the test.
-
-```
-$$ puppet-beanstalkd/beanstalkd# ./run-tests.sh 
-Using rake (10.0.4) 
-Using diff-lcs (1.2.4) 
-Using facter (1.7.0) 
-Using json_pure (1.7.7) 
-Using hiera (1.2.1) 
-Using metaclass (0.0.1) 
-Using mocha (0.13.3) 
-Using puppet (3.1.1) 
-Using rspec-core (2.13.1) 
-Using rspec-expectations (2.13.0) 
-Using rspec-mocks (2.13.1) 
-Using rspec (2.13.0) 
-Using rspec-puppet (0.1.6) 
-Using puppetlabs_spec_helper (0.4.1) 
-Using bundler (1.1.4) 
-Your bundle is complete! Use `bundle show [gemname]` to see where a bundled gem is installed.
-/usr/bin/ruby1.9.1 -S rspec spec/defines/config_spec.rb
-...................
-
-Finished in 0.84772 seconds
-19 examples, 0 failures
-```
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Rakefile
deleted file mode 100644
index f6d5a0c4636..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'rake'
-
-require 'rspec/core/rake_task'
-
-task :default => [:spec]
-
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/*/*_spec.rb'
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/manifests/init.pp
deleted file mode 100644
index fc57ab851a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/manifests/init.pp
+++ /dev/null
@@ -1,124 +0,0 @@
-
-# usage:
-#
-#  beanstalkd::config { name:
-#    listenaddress => '0.0.0.0',
-#    listenport => '13000',
-#    maxjobsize => '65535',
-#    maxconnections => '1024',
-#    binlogdir => '/var/lib/beanstalkd/binlog',
-#    binlogfsync => undef,              
-#    binlogsize => '10485760',
-#    ensure => 'running',         # running, stopped, absent
-#    packageversion => 'latest',  # latest, present, or specific version
-#    packagename => undef,        # override package name
-#    servicename => undef         # override service name
-#  }
-
-
-define beanstalkd::config ( # name
-  $listenaddress  = '0.0.0.0',
-  $listenport     = '13000',
-  $maxjobsize     = '65535',
-  $maxconnections = '1024',                       # results in open file limit
-  $binlogdir      = '/var/lib/beanstalkd/binlog', # set empty ( '' ) to disable binlog
-  $binlogfsync    = undef,                        # unset = no explicit fsync
-  $binlogsize     = '10485760',
-  #
-  $ensure         = 'running',  # running, stopped, absent
-  $packageversion = 'latest',   # latest, present, or specific version
-  $packagename    = undef,      # got your own custom package?  override the default name/service here.
-  $servicename    = undef
-) {
-
-  case $::operatingsystem {
-    ubuntu, debian: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/default/beanstalkd'
-      $configtemplate     = "${module_name}/debian/beanstalkd_default.erb"  # please create me!
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    centos, redhat: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/sysconfig/beanstalkd'
-      $configtemplate     = "${module_name}/redhat/beanstalkd_sysconfig.erb"
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    # TODO: add more OS support!
-    default: {   
-      fail("ERROR [${module_name}]: I don't know how to manage this OS: ${::operatingsystem}")
-    }
-  }
-
-  # simply the users experience for running/stopped/absent, and use ensure to cover those bases
-  case $ensure {
-    absent: {
-      $ourpackageversion  = 'absent'
-      $serviceenable      = 'false'
-      $serviceensure      = 'stopped'
-      $fileensure         = 'absent'
-    }
-    running: {
-      $serviceenable  = 'true'
-      $serviceensure  = 'running'
-      $fileensure     = 'present'
-    }
-    stopped: {
-      $serviceenable  = 'false'
-      $serviceensure  = 'stopped'
-      $fileensure     = 'present'
-    }
-    default: {
-      fail("ERROR [${module_name}]: enable must be one of: running stopped absent")
-    }
-  }
-  
-  # for packageversion, use what's configured unless we're set (which should only be in the absent case..)
-  if ! $ourpackageversion { 
-    $ourpackageversion = $packageversion
-  }
-  
-  # for service and package name - if we've specified one, use it. else use the default
-  if $packagename == undef {
-    $ourpackagename = $defaultpackagename
-  } else {
-    $ourpackagename = $packagename
-  }
-
-  if $servicename == undef {
-    $ourservicename = $defaultservicename
-  } else {
-    $ourservicename = $servicename
-  }
-
-  package { $ourpackagename:
-    ensure => $ourpackageversion
-  }
-
-  service { $ourservicename:
-    enable    => $serviceenable,
-    ensure    => $serviceensure,
-    hasstatus => $hasstatus,
-    restart   => $restart,
-    subscribe => [
-      Package[$ourpackagename],
-      File[$configfile]
-    ],
-  }
-
-  file { $configfile:
-    content => template($configtemplate),
-    owner   => 'root',
-    group   => 'root',
-    mode    => 0644,
-    ensure  => $fileensure,
-    require => Package[$ourpackagename],
-  } 
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/run-tests.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/run-tests.sh
deleted file mode 100755
index 89896b94fba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/run-tests.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env sh
-
-bundle="bundle"
-gotbundle=0
-for i in $(echo "$PATH" | tr ":" " ")
- do
-        if [ -e $i/$bundle ]
-         then
-                gotbundle=1
-                break
-        fi
-done
-if [ $gotbundle = 0 ]
- then
-        echo "ERROR: please install 'bundler' for ruby from http://gembundler.com/ and make sure '$bundle' is in your path"
-        exit 1
-fi
-
-$bundle install || exit $?
-$bundle exec rake || exit $?
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb
deleted file mode 100644
index e70c3fe40f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/defines/config_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'spec_helper'
-
-
-describe 'beanstalkd::config' do
-  let (:title) {'a title is required'}
-
-  #basic OS support testing
-  context "on Debian" do
-    let (:facts) { { :operatingsystem => 'debian' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on redhat" do
-    let (:facts) { { :operatingsystem => 'debian' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on ubuntu" do
-    let (:facts) { { :operatingsystem => 'ubuntu' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on centos" do
-    let (:facts) { { :operatingsystem => 'centos' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on unsupported OS" do
-    let (:facts) { { :operatingsystem => 'unsupported' } }
-    it { expect { raise_error(Puppet::Error) } }
-  end  
-
-  #now lets test our various parameters - for the most part this shouldn't care what OS it is
-  #if your OS support needs more specific testing, do it!
-
-  #ensure testing - remember this does both service and packages, so test both
-  context "on redhat, ensure absent" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'absent' } }
-    it { should contain_package('beanstalkd').with_ensure('absent') }
-    it { should contain_service('beanstalkd').with_ensure('stopped') }
-  end  
-  context "on redhat, ensure running" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'running' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('running') }
-  end  
-  context "on redhat, ensure stopped" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'stopped' } }
-    it { should contain_package('beanstalkd').with_ensure('latest') }
-    it { should contain_service('beanstalkd').with_ensure('stopped') }
-  end  
-  context "on redhat, ensure broken" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :ensure => 'broken' } }
-    it { expect { raise_error(Puppet::Error) } }
-  end  
-
-  #custom package/service names
-  context "on redhat, servicename testbeans" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :servicename => 'testbeans' } }
-    it { should contain_service('testbeans').with_ensure('running') }
-  end  
-  context "on redhat, packagename testbeans" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :packagename => 'testbeans' } }
-    it { should contain_package('testbeans').with_ensure('latest') }
-  end  
-  #and custom version
-  context "on redhat, package version" do
-    let (:facts) { { :operatingsystem => 'redhat' } }
-    let(:params) { { :packageversion => 'testversion' } }
-    it { should contain_package('beanstalkd').with_ensure('testversion') }
-  end  
-
-   
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp
deleted file mode 100644
index fc57ab851a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/manifests/init.pp
+++ /dev/null
@@ -1,124 +0,0 @@
-
-# usage:
-#
-#  beanstalkd::config { name:
-#    listenaddress => '0.0.0.0',
-#    listenport => '13000',
-#    maxjobsize => '65535',
-#    maxconnections => '1024',
-#    binlogdir => '/var/lib/beanstalkd/binlog',
-#    binlogfsync => undef,              
-#    binlogsize => '10485760',
-#    ensure => 'running',         # running, stopped, absent
-#    packageversion => 'latest',  # latest, present, or specific version
-#    packagename => undef,        # override package name
-#    servicename => undef         # override service name
-#  }
-
-
-define beanstalkd::config ( # name
-  $listenaddress  = '0.0.0.0',
-  $listenport     = '13000',
-  $maxjobsize     = '65535',
-  $maxconnections = '1024',                       # results in open file limit
-  $binlogdir      = '/var/lib/beanstalkd/binlog', # set empty ( '' ) to disable binlog
-  $binlogfsync    = undef,                        # unset = no explicit fsync
-  $binlogsize     = '10485760',
-  #
-  $ensure         = 'running',  # running, stopped, absent
-  $packageversion = 'latest',   # latest, present, or specific version
-  $packagename    = undef,      # got your own custom package?  override the default name/service here.
-  $servicename    = undef
-) {
-
-  case $::operatingsystem {
-    ubuntu, debian: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/default/beanstalkd'
-      $configtemplate     = "${module_name}/debian/beanstalkd_default.erb"  # please create me!
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    centos, redhat: {
-      $defaultpackagename = 'beanstalkd'
-      $defaultservicename = 'beanstalkd'
-      $user               = 'beanstalkd'
-      $configfile         = '/etc/sysconfig/beanstalkd'
-      $configtemplate     = "${module_name}/redhat/beanstalkd_sysconfig.erb"
-      $hasstatus          = 'true'
-      $restart            = '/etc/init.d/beanstalkd restart'
-    }
-    # TODO: add more OS support!
-    default: {   
-      fail("ERROR [${module_name}]: I don't know how to manage this OS: ${::operatingsystem}")
-    }
-  }
-
-  # simply the users experience for running/stopped/absent, and use ensure to cover those bases
-  case $ensure {
-    absent: {
-      $ourpackageversion  = 'absent'
-      $serviceenable      = 'false'
-      $serviceensure      = 'stopped'
-      $fileensure         = 'absent'
-    }
-    running: {
-      $serviceenable  = 'true'
-      $serviceensure  = 'running'
-      $fileensure     = 'present'
-    }
-    stopped: {
-      $serviceenable  = 'false'
-      $serviceensure  = 'stopped'
-      $fileensure     = 'present'
-    }
-    default: {
-      fail("ERROR [${module_name}]: enable must be one of: running stopped absent")
-    }
-  }
-  
-  # for packageversion, use what's configured unless we're set (which should only be in the absent case..)
-  if ! $ourpackageversion { 
-    $ourpackageversion = $packageversion
-  }
-  
-  # for service and package name - if we've specified one, use it. else use the default
-  if $packagename == undef {
-    $ourpackagename = $defaultpackagename
-  } else {
-    $ourpackagename = $packagename
-  }
-
-  if $servicename == undef {
-    $ourservicename = $defaultservicename
-  } else {
-    $ourservicename = $servicename
-  }
-
-  package { $ourpackagename:
-    ensure => $ourpackageversion
-  }
-
-  service { $ourservicename:
-    enable    => $serviceenable,
-    ensure    => $serviceensure,
-    hasstatus => $hasstatus,
-    restart   => $restart,
-    subscribe => [
-      Package[$ourpackagename],
-      File[$configfile]
-    ],
-  }
-
-  file { $configfile:
-    content => template($configtemplate),
-    owner   => 'root',
-    group   => 'root',
-    mode    => 0644,
-    ensure  => $fileensure,
-    require => Package[$ourpackagename],
-  } 
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb
deleted file mode 100644
index c532f47bd80..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/debian/beanstalkd_default.erb
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-##based loosely on my sysconfig and initd scripts from centos, but tweaked to work without having to
-##hack up the debian init script.  -keen99 4/2013
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
-
-
-
-##the debian init script leaves everything to be desired.  so lets put our setup logic here.
-
-case "$1" in
-	start|restart|force-reload|reload)
-		exec=$DAEMON
-		[ -x $exec ] || exit 5
-		
-		# if not running, start it up here, usually something like "daemon $exec"
-		options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-		if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
-			options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
-		fi
-		
-		if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
-			if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
-				echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
-				mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
-			fi
-			options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
-			if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
-				options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
-			else
-				options="${options} -F"
-			fi
-			if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
-				options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
-			fi
-		
-			##1.4.6 at least is prone to leave a lock file around after shutting down
-			##this breaks startup after upgrade to 1.5, so work around this
-			##unknown if this happens w/o binlog enabled...
-			#check for stale lock file in binlog
-			if [ -e "${BEANSTALKD_BINLOG_DIR}/lock" ]
-			 then
-				if ! ps xa| grep -v grep | grep -q $exec
-				 then
-					echo "found old lock file and beanstalk isn't running - deleting it"
-					rm -f ${BEANSTALKD_BINLOG_DIR}/lock
-				fi
-			fi
-		fi
-	
-		if [ -n "${BEANSTALKD_MAXCONNECTIONS}" ]; then
-			#increase open files ulimit to support higher concurrent connections
-			echo "increasing open file limit to $BEANSTALKD_MAXCONNECTIONS"
-			ulimit -n $BEANSTALKD_MAXCONNECTIONS
-		fi
-
-		DAEMON_OPTS="-l $BEANSTALKD_LISTEN_ADDR -p $BEANSTALKD_LISTEN_PORT"
-		DAEMON_OPTS="$options"
-
-	;;
-	*)
-		#nothing, please keep moving
-	;;
-esac
-
-
-
-DAEMONUSER=$BEANSTALKD_USER
-
-
-## Uncomment to enable startup during boot.
-START=yes
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
deleted file mode 100644
index 6e3bb422ec6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-# System configuration for the beanstalkd daemon
-
-# Available options correspond to the options to the
-# beanstalkd commandline.
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb
deleted file mode 100644
index d3923f8306f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/spec_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'rspec-puppet'
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |c|
-  c.module_path = File.join(fixture_path, 'modules')
-  c.manifest_dir = File.join(fixture_path, 'manifests')
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb
deleted file mode 100644
index c532f47bd80..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/debian/beanstalkd_default.erb
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-##based loosely on my sysconfig and initd scripts from centos, but tweaked to work without having to
-##hack up the debian init script.  -keen99 4/2013
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
-
-
-
-##the debian init script leaves everything to be desired.  so lets put our setup logic here.
-
-case "$1" in
-	start|restart|force-reload|reload)
-		exec=$DAEMON
-		[ -x $exec ] || exit 5
-		
-		# if not running, start it up here, usually something like "daemon $exec"
-		options="-l ${BEANSTALKD_ADDR} -p ${BEANSTALKD_PORT} -u ${BEANSTALKD_USER}"
-		if [ "${BEANSTALKD_MAX_JOB_SIZE}" != ""  ]; then
-			options="${options} -z ${BEANSTALKD_MAX_JOB_SIZE}"
-		fi
-		
-		if [ "${BEANSTALKD_BINLOG_DIR}" != "" ]; then
-			if [ ! -d "${BEANSTALKD_BINLOG_DIR}" ]; then
-				echo "Creating binlog directory (${BEANSTALKD_BINLOG_DIR})"
-				mkdir -p ${BEANSTALKD_BINLOG_DIR} && chown ${BEANSTALKD_USER}:${BEANSTALKD_USER} ${BEANSTALKD_BINLOG_DIR}
-			fi
-			options="${options} -b ${BEANSTALKD_BINLOG_DIR}"
-			if [ "${BEANSTALKD_BINLOG_FSYNC_PERIOD}" != "" ]; then
-				options="${options} -f ${BEANSTALKD_BINLOG_FSYNC_PERIOD}"
-			else
-				options="${options} -F"
-			fi
-			if [ "${BEANSTALKD_BINLOG_SIZE}" != "" ]; then
-				options="${options} -s ${BEANSTALKD_BINLOG_SIZE}"
-			fi
-		
-			##1.4.6 at least is prone to leave a lock file around after shutting down
-			##this breaks startup after upgrade to 1.5, so work around this
-			##unknown if this happens w/o binlog enabled...
-			#check for stale lock file in binlog
-			if [ -e "${BEANSTALKD_BINLOG_DIR}/lock" ]
-			 then
-				if ! ps xa| grep -v grep | grep -q $exec
-				 then
-					echo "found old lock file and beanstalk isn't running - deleting it"
-					rm -f ${BEANSTALKD_BINLOG_DIR}/lock
-				fi
-			fi
-		fi
-	
-		if [ -n "${BEANSTALKD_MAXCONNECTIONS}" ]; then
-			#increase open files ulimit to support higher concurrent connections
-			echo "increasing open file limit to $BEANSTALKD_MAXCONNECTIONS"
-			ulimit -n $BEANSTALKD_MAXCONNECTIONS
-		fi
-
-		DAEMON_OPTS="-l $BEANSTALKD_LISTEN_ADDR -p $BEANSTALKD_LISTEN_PORT"
-		DAEMON_OPTS="$options"
-
-	;;
-	*)
-		#nothing, please keep moving
-	;;
-esac
-
-
-
-DAEMONUSER=$BEANSTALKD_USER
-
-
-## Uncomment to enable startup during boot.
-START=yes
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
deleted file mode 100644
index 6e3bb422ec6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/templates/redhat/beanstalkd_sysconfig.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-# System configuration for the beanstalkd daemon
-
-# Available options correspond to the options to the
-# beanstalkd commandline.
-
-<% if @maxconnections -%>
-BEANSTALKD_MAXCONNECTIONS=<%= @maxconnections %>
-<% else -%>
-#use default ulimit
-#BEANSTALKD_MAXCONNECTIONS=1024
-<% end -%>
-
-
-BEANSTALKD_ADDR=<%= @listenaddress %>
-BEANSTALKD_PORT=<%= @listenport %>
-BEANSTALKD_USER=<%= @user %>
-
-# Job size is left to the default. Uncomment and set it
-# to a value to have it take affect.
-<% if @maxjobsize -%>
-BEANSTALKD_MAX_JOB_SIZE=<%= @maxjobsize %>
-<% else -%>
-#use default
-#BEANSTALKD_MAX_JOB_SIZE=65535
-<% end -%>
-
-# Using the binlog is off by default.
-#
-# The direcory to house the binlog.
-<% if @binlogdir -%>
-BEANSTALKD_BINLOG_DIR=<%= @binlogdir %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_DIR=/var/lib/beanstalkd/binlog
-<% end -%>
-
-# fsync the binlog at most once every N milliseconds.
-# setting this to 0 means 'always fsync'. If this is unset,
-# and the binlog is used, then no explicit fsync is ever
-# performed.  That is, the -F option is used.
-<% if @binlogfsync -%>
-BEANSTALKD_BINLOG_FSYNC_PERIOD=<%= @bbinlogfsync %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_FSYNC_PERIOD=
-<% end -%>
-
-# The size of each binlog file.  This is rounded
-# up to the nearest 512 byte boundary.
-<% if @binlogsize -%>
-BEANSTALKD_BINLOG_SIZE=<%= @binlogsize %>
-<% else -%>
-#use default
-#BEANSTALKD_BINLOG_SIZE=10485760
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.fixtures.yml
deleted file mode 100644
index c0123415c78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    git: "git://github.com/puppetlabs/puppetlabs-git"
-  symlinks:
-    composer: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.travis.yml
deleted file mode 100644
index 033f11dd3da..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-before_script:
-after_script:
-script: "bundle exec rake spec"
-env:
-  - PUPPET_VERSION=2.7.23
-  - PUPPET_VERSION=3.0.2
-  - PUPPET_VERSION=3.2.4
-  - PUPPET_VERSION=3.3.0
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/CHANGELOG.md
deleted file mode 100644
index bd8105b1274..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/CHANGELOG.md
+++ /dev/null
@@ -1,133 +0,0 @@
-v1.2.1
-======
-f44b7e5 Now also supports Amazon Linux (RedHat)
-
-9341805 Now `suhosin_enabled` parameter is correctly documented.
-
-v1.2.0
-======
-66b071a (HEAD, tag: 1.2.0, master) Bumping version to 1.2.0
-
-166ec87 Updated README.md
-
-626ee43 (origin/master, origin/HEAD) Updated CHANGELOG format
-
-1364058 Moved CHANGELOG to markdown format
-
-6f21dcb Updated LICENSE file
-
-6209eb8 Added CHANGELOG file
-
-6307d5a Add parameter 'php_bin' to override name or path of php binary
-
-9e484e9 (origin/rspec_head_fixes, rspec_head_fixes) just match on errorname, not specific exception
-
-db4176e update specs for latest rspec-puppet 1.0.1+
-
-v1.1.1
-======
-17b2309 (tag: 1.1.1) Update Modulefile
-
-d848038 Used puppetlabs/git >= 0.0.2
-
-0d75cff doc updates for 1.1.0 release
-
-v1.1.0
-======
-3b46e4d (tag: 1.1.0) bumping version to 1.1.0 for refreshonly and user features
-
-5290e8e support setting exec user for project and exec
-
-6af1e25 ignore puppet module package folder
-
-c2106ec Add refreshonly parameter to exec
-
-v1.0.1
-======
-fb1fd04 (tag: 1.0.1) Bumped version to 1.0.1
-
-bf43913 (origin/deprecated_erb_variables) fix deprecated variables in the exec erb template
-
-342b898 (origin/documentation_refactor) document refactor, add spec test information
-
-3677acc adding tests for new suhosin_enable param and Debian family
-
-de86c0d Only run augeas commands if suhosin is enabled
-
-v1.0.0
-======
-f5d214a (tag: 1.0.0) Bumping version to 1.0.0
-
-12589bf fixes for travis-ci building
-
-5279b92 spec testing using rspec-puppet
-
-3069608 documentation updates for composer_home and previous PRs
-
-b5faa45 add a composer_home fact and use it to set up environment
-
-v0.1.1
-======
-dbc0c74 Bumping version to 0.1.1
-
-b4833d6 no-custom-installers is deprecated in favor of no-plugins
-
-acdc73c dry up the composer binary download code
-
-41f3a7b CentOS isn't actually an $::osfamily value
-
-d54c0db PHP binary is provided by php-cli on RHEL systems
-
-v0.1.0
-======
-1e8f9f1 (tag: 0.1.0) Adding License file.
-
-523c28f (igalic/option-names, igalic-option-names) update readme with the new options
-
-3d2ddda double-negating option names is confusing
-
-be518cf (igalic/style, igalic-style) Fix puppet lint complaints
-
-4050077 There's no need for these files to be executable
-
-522e93c Updated temp path.
-
-bf0f9e7 Support centos/redhat
-
-f45e9de Support redhat/centos
-
-920d1ca Support redhat/centos
-
-v0.0.6
-======
-78643ef (tag: 0.0.6) Bumping version to 0.0.6
-
-0fbfb53 Fixing bug where global path is overwritten by local scope.
-
-v0.0.5
-======
-ee4e49b (tag: 0.0.5) Bumping version to 0.0.5
-
-17ca5ee Added varaible composer path to exec calls.
-
-v0.0.4
-======
-e94be5e (tag: 0.0.4) Bumping version to 0.0.4
-
-a27e45f Fixed dry_run parameter
-
-28cfee8 Adding version parameter to project task README
-
-v0.0.3
-======
-4787b24 Bumping version to 0.0.3
-
-4ee9547 (tag: 0.0.3) Fixing type in exec manifest.
-
-v0.0.2
-======
-974d2ad (tag: 0.0.2) Bumping version to 0.0.2
-
-667eb18 Fixed README
-
-925aa97 Fixed Modulefile.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Gemfile
deleted file mode 100644
index 992fecaab8c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-#ruby=1.9.3@puppet-composer
-
-if ENV.key?('PUPPET_VERSION')
-  puppetversion = "= #{ENV['PUPPET_VERSION']}"
-else
-  puppetversion = ['>= 2.7']
-end
-
-source 'https://rubygems.org'
-
-ruby '1.9.3'
-
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper'
-gem 'rspec-puppet', :github => 'rodjek/rspec-puppet', :ref => '03e94422fb9bbdd950d5a0bec6ead5d76e06616b'
-gem 'mocha'
-gem 'puppet-lint'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/LICENSE
deleted file mode 100644
index 3cff4803690..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 - 2014 Thomas Ploch
-
-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.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Modulefile
deleted file mode 100644
index b1a9c8c49d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'tPl0ch-composer'
-version '1.2.1'
-dependency 'puppetlabs/git', '>= 0.0.2'
-summary "This module provides the 'Composer' PHP dependency manager."
-description "This module installs the 'Composer' PHP dependency manager and provides some custom types to create, update
-    and install projects. Until now the Debian and Redhat OS families are supported."
-project_page "https://github.com/tPl0ch/puppet-composer"
-author "tPl0ch - Thomas Ploch <profiploch@gmail.com>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/README.md
deleted file mode 100644
index c142e258f0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/README.md
+++ /dev/null
@@ -1,155 +0,0 @@
-# Composer Puppet Module
-
-[![Build Status](https://travis-ci.org/tPl0ch/puppet-composer.png?branch=master)](https://travis-ci.org/tPl0ch/puppet-composer)
-
-## Description
-
-The `puppet-composer` module installs the latest version of Composer from http://getcomposer.org. Composer is a dependency manager for PHP.
-
-## Supported Platforms
-
-* `Debian`
-* `Redhat`
-* `Centos`
-* `Amazon Linux`
-
-## Installation
-
-#### Puppet Forge
-We recommend installing using the Puppet Forge as it automatically satisfies dependencies.
-
-    puppet module install --target-dir=/your/path/to/modules tPl0ch-composer
-
-#### Installation via git submodule
-You can also install as a git submodule and handle the dependencies manually. See the [Dependencies](#dependencies) section below.
-
-    git submodule add git://github.com/tPl0ch/puppet-composer.git modules/composer
-
-## Dependencies
-
-This module requires the following Puppet modules:
-
-* [`puppetlabs-git`](https://github.com/puppetlabs/puppetlabs-git/)
-
-And additional (for puppet version lower than 3.0.0) you need:
-
-* [`libaugeas`](http://augeas.net/) (For automatically updating php.ini settings for suhosin patch)
-
-## Usage
-To install the `composer` binary globally in `/usr/local/bin` you only need to declare the `composer` class. We try to set some sane defaults. There are also a number of parameters you can tweak should the defaults not be sufficient.
-
-### Simple Include
-To install the binary with the defaults you just need to include the following in your manifests:
-
-    include composer
-
-### Full Include
-Alternatively, you can set a number of options by declaring the class with parameters:
-
-```puppet
-class { 'composer':
-    target_dir      => '/usr/local/bin',
-    composer_file   => 'composer', # could also be 'composer.phar'
-    download_method => 'curl',     # or 'wget'
-    logoutput       => false,
-    tmp_path        => '/tmp',
-    php_package     => 'php5-cli',
-    curl_package    => 'curl',
-    wget_package    => 'wget',
-    composer_home   => '/root',
-    php_bin         => 'php', # could also i.e. be 'php -d "apc.enable_cli=0"' for more fine grained control
-    suhosin_enabled => true,
-}
-```
-
-### Creating Projects
-
-The `composer::project` definition provides a way to create projects in a target directory.
-
-```puppet
-composer::project { 'silex':
-    project_name   => 'fabpot/silex-skeleton',  # REQUIRED
-    target_dir     => '/vagrant/silex', # REQUIRED
-    version        => '2.1.x-dev', # Some valid version string
-    prefer_source  => true,
-    stability      => 'dev', # Minimum stability setting
-    keep_vcs       => false, # Keep the VCS information
-    dev            => true, # Install dev dependencies
-    repository_url => 'http://repo.example.com', # Custom repository URL
-    user           => undef, # Set the user to run as
-}
-```
-
-#### Updating Packages
-
-The `composer::exec` definition provides a more generic wrapper arround composer `update` and `install` commands. The following example will update the `silex/silex` and `symfony/browser-kit` packages in the `/vagrant/silex` directory. You can omit `packages` to update the entire project.
-
-```puppet
-composer::exec { 'silex-update':
-    cmd                  => 'update',  # REQUIRED
-    cwd                  => '/vagrant/silex', # REQUIRED
-    packages             => ['silex/silex', 'symfony/browser-kit'], # leave empty or omit to update whole project
-    prefer_source        => false, # Only one of prefer_source or prefer_dist can be true
-    prefer_dist          => false, # Only one of prefer_source or prefer_dist can be true
-    dry_run              => false, # Just simulate actions
-    custom_installers    => false, # No custom installers
-    scripts              => false, # No script execution
-    interaction          => false, # No interactive questions
-    optimize             => false, # Optimize autoloader
-    dev                  => false, # Install dev dependencies
-    user                 => undef, # Set the user to run as
-    refreshonly          => false, # Only run on refresh
-}
-```
-
-#### Installing Packages
-
-We support the `install` command in addition to `update`. The install command will ignore the `packages` parameter and the following example is the equivalent to running `composer install` in the `/vagrant/silex` directory.
-
-```puppet
-composer::exec { 'silex-install':
-    cmd                  => 'install',  # REQUIRED
-    cwd                  => '/vagrant/silex', # REQUIRED
-    prefer_source        => false,
-    prefer_dist          => false,
-    dry_run              => false, # Just simulate actions
-    custom_installers    => false, # No custom installers
-    scripts              => false, # No script execution
-    interaction          => false, # No interactive questions
-    optimize             => false, # Optimize autoloader
-    dev                  => false, # Install dev dependencies
-}
-```
-
-## Development
-
-We have `rspec-puppet` and Travis CI setup for the project. To run the spec tests locally you need `bundler` installed:
-
-```
-gem install bundler
-```
-
-Then you can install the required gems:
-
-```
-bundle install
-```
-
-Finally, the tests can be run:
-
-```
-rake spec
-```
-
-## Contributing
-
-We welcome everyone to help develop this module. To contribute:
-
-* Fork this repository
-* Add features and spec tests for them
-* Commit to feature named branch
-* Open a pull request outlining your changes and the reasoning for them
-
-## Todo
-
-* Add a `composer::require` type
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Rakefile
deleted file mode 100644
index 1a388518f2e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/Rakefile
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'puppet-lint/tasks/puppet-lint'
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/lib/facter/composer_home.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/lib/facter/composer_home.rb
deleted file mode 100644
index b815cfa404f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/lib/facter/composer_home.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Facter.add(:composer_home) do
-  setcode do
-    ENV['HOME']
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/exec.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/exec.pp
deleted file mode 100644
index 82039e85575..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/exec.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-# == Type: composer::exec
-#
-# Either installs from composer.json or updates project or specific packages
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-#
-# === Copyright
-#
-# Copyright 2013 Thomas Ploch
-#
-define composer::exec (
-  $cmd,
-  $cwd,
-  $packages          = [],
-  $prefer_source     = false,
-  $prefer_dist       = false,
-  $dry_run           = false,
-  $custom_installers = false,
-  $scripts           = false,
-  $optimize          = false,
-  $interaction       = false,
-  $dev               = false,
-  $logoutput         = false,
-  $verbose           = false,
-  $refreshonly       = false,
-  $user              = undef,
-) {
-  require composer
-  require git
-
-  Exec {
-    path        => "/bin:/usr/bin/:/sbin:/usr/sbin:${composer::target_dir}",
-    environment => "COMPOSER_HOME=${composer::composer_home}",
-    user        => $user,
-  }
-
-  if $cmd != 'install' and $cmd != 'update' {
-    fail("Only types 'install' and 'update' are allowed, ${cmd} given")
-  }
-
-  if $prefer_source and $prefer_dist {
-    fail('Only one of \$prefer_source or \$prefer_dist can be true.')
-  }
-
-  $command = "${composer::php_bin} ${composer::target_dir}/${composer::composer_file} ${cmd}"
-
-  exec { "composer_update_${title}":
-    command     => template('composer/exec.erb'),
-    cwd         => $cwd,
-    logoutput   => $logoutput,
-    refreshonly => $refreshonly
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/init.pp
deleted file mode 100644
index 5b3a431921c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/init.pp
+++ /dev/null
@@ -1,156 +0,0 @@
-# == Class: composer
-#
-# The parameters for the composer class and corresponding definitions
-#
-# === Parameters
-#
-# Document parameters here.
-#
-# [*target_dir*]
-#   The target dir that composer should be installed to.
-#   Defaults to ```/usr/local/bin```.
-#
-# [*composer_file*]
-#   The name of the composer binary, which will reside in ```target_dir```.
-#
-# [*download_method*]
-#   Either ```curl``` or ```wget```.
-#
-# [*logoutput*]
-#   If the output should be logged. Defaults to FALSE.
-#
-# [*tmp_path*]
-#   Where the composer.phar file should be temporarily put.
-#
-# [*php_package*]
-#   The Package name of tht PHP CLI package.
-#
-# [*curl_package*]
-#   The name of the curl package to override the default set in the
-#   composer::params class.
-#
-# [*wget_package*]
-#   The name of the wget package to override the default set in the
-#   composer::params class.
-#
-# [*composer_home*]
-#   Folder to use as the COMPOSER_HOME environment variable. Default comes
-#   from our composer::params class which derives from our own $composer_home
-#   fact. The fact returns the current users $HOME environment variable.
-#
-# [*php_bin*]
-#   The name or path of the php binary to override the default set in the
-#   composer::params class.
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-#
-class composer(
-  $target_dir      = $composer::params::target_dir,
-  $composer_file   = $composer::params::composer_file,
-  $download_method = $composer::params::download_method,
-  $logoutput       = $composer::params::logoutput,
-  $tmp_path        = $composer::params::tmp_path,
-  $php_package     = $composer::params::php_package,
-  $curl_package    = $composer::params::curl_package,
-  $wget_package    = $composer::params::wget_package,
-  $composer_home   = $composer::params::composer_home,
-  $php_bin         = $composer::params::php_bin,
-  $suhosin_enabled = $composer::params::suhosin_enabled
-) inherits composer::params {
-
-  Exec { path => "/bin:/usr/bin/:/sbin:/usr/sbin:${target_dir}" }
-
-  if defined(Package[$php_package]) == false {
-    package { $php_package: ensure => present, }
-  }
-
-  # download composer
-  case $download_method {
-    'curl': {
-      $download_command = "curl -s http://getcomposer.org/installer | ${composer::php_bin}"
-      $download_require = $suhosin_enabled ? {
-        true  => [ Package['curl', $php_package], Augeas['allow_url_fopen', 'whitelist_phar'] ],
-        false => [ Package['curl', $php_package] ]
-      }
-      $method_package = $curl_package
-    }
-    'wget': {
-      $download_command = 'wget http://getcomposer.org/composer.phar -O composer.phar'
-      $download_require = $suhosin_enabled ? {
-        true  => [ Package['wget', $php_package], Augeas['allow_url_fopen', 'whitelist_phar'] ],
-        false => [ Package['wget', $php_package] ]
-      }
-      $method_package = $wget_package
-    }
-    default: {
-      fail("The param download_method ${download_method} is not valid. Please set download_method to curl or wget.")
-    }
-  }
-
-  if defined(Package[$method_package]) == false {
-    package { $method_package: ensure => present, }
-  }
-
-  exec { 'download_composer':
-    command   => $download_command,
-    cwd       => $tmp_path,
-    require   => $download_require,
-    creates   => "${tmp_path}/composer.phar",
-    logoutput => $logoutput,
-  }
-
-  # check if directory exists
-  file { $target_dir:
-    ensure => directory,
-  }
-
-  # move file to target_dir
-  file { "${target_dir}/${composer_file}":
-    ensure  => present,
-    source  => "${tmp_path}/composer.phar",
-    require => [ Exec['download_composer'], File[$target_dir] ],
-    mode    => 0755,
-  }
-
-  if $suhosin_enabled {
-    case $family {
-
-      'Redhat','Centos': {
-
-        # set /etc/php5/cli/php.ini/suhosin.executor.include.whitelist = phar
-        augeas { 'whitelist_phar':
-          context     => '/files/etc/suhosin.ini/suhosin',
-          changes     => 'set suhosin.executor.include.whitelist phar',
-          require     => Package[$php_package],
-        }
-
-        # set /etc/cli/php.ini/PHP/allow_url_fopen = On
-        augeas{ 'allow_url_fopen':
-          context     => '/files/etc/php.ini/PHP',
-          changes     => 'set allow_url_fopen On',
-          require     => Package[$php_package],
-        }
-
-      }
-     'Debian': {
-
-        # set /etc/php5/cli/php.ini/suhosin.executor.include.whitelist = phar
-        augeas { 'whitelist_phar':
-          context     => '/files/etc/php5/conf.d/suhosin.ini/suhosin',
-          changes     => 'set suhosin.executor.include.whitelist phar',
-          require     => Package[$php_package],
-        }
-
-        # set /etc/php5/cli/php.ini/PHP/allow_url_fopen = On
-        augeas{ 'allow_url_fopen':
-          context     => '/files/etc/php5/cli/php.ini/PHP',
-          changes     => 'set allow_url_fopen On',
-          require     => Package[$php_package],
-        }
-
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/params.pp
deleted file mode 100644
index 54f752a43fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/params.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-# == Class: composer::params
-#
-# The parameters for the composer class and corresponding definitions
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-# Andrew Johnstone <andrew@ajohnstone.com>
-#
-# === Copyright
-#
-# Copyright 2013 Thomas Ploch
-#
-class composer::params {
-  $composer_home = $::composer_home
-
-  # Support Amazon Linux which is supported by RedHat family
-  if $::osfamily == 'Linux' and $::operatingsystem == 'Amazon' {
-    $family = 'RedHat'
-  } else {
-    $family = $::osfamily
-  }
-
-  case $family {
-    'Debian': {
-      $target_dir      = '/usr/local/bin'
-      $composer_file   = 'composer'
-      $download_method = 'curl'
-      $logoutput       = false
-      $tmp_path        = '/tmp'
-      $php_package     = 'php5-cli'
-      $curl_package    = 'curl'
-      $wget_package    = 'wget'
-      $php_bin         = 'php'
-      $suhosin_enabled = true
-    }
-    'RedHat', 'Centos': {
-      $target_dir      = '/usr/local/bin'
-      $composer_file   = 'composer'
-      $download_method = 'curl'
-      $logoutput       = false
-      $tmp_path        = '/tmp'
-      $php_package     = 'php-cli'
-      $curl_package    = 'curl'
-      $wget_package    = 'wget'
-      $php_bin         = 'php'
-      $suhosin_enabled = true
-    }
-    default: {
-      fail("Unsupported platform: ${family}")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/project.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/project.pp
deleted file mode 100644
index 594f67f1ba1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/manifests/project.pp
+++ /dev/null
@@ -1,96 +0,0 @@
-# == Type: composer::project
-#
-# Installs a given project with composer create-project
-#
-# === Parameters
-#
-# Document parameters here.
-#
-# [*target_dir*]
-#   The target dir that composer should be installed to.
-#   Defaults to ```/usr/local/bin```.
-#
-# [*composer_file*]
-#   The name of the composer binary, which will reside in ```target_dir```.
-#
-# [*download_method*]
-#   Either ```curl``` or ```wget```.
-#
-# [*logoutput*]
-#   If the output should be logged. Defaults to FALSE.
-#
-# [*tmp_path*]
-#   Where the composer.phar file should be temporarily put.
-#
-# [*php_package*]
-#   The Package name of the PHP CLI package.
-#
-# [*user*]
-#   The user name to exec the composer commands as. Default is undefined.
-#
-# === Authors
-#
-# Thomas Ploch <profiploch@gmail.com>
-#
-# === Copyright
-#
-# Copyright 2013 Thomas Ploch
-#
-define composer::project(
-  $project_name,
-  $target_dir,
-  $version        = undef,
-  $dev            = false,
-  $prefer_source  = false,
-  $stability      = 'dev',
-  $repository_url = undef,
-  $keep_vcs       = false,
-  $tries          = 3,
-  $timeout        = 1200,
-  $user           = undef,
-) {
-  require git
-  require composer
-
-  Exec {
-    path        => "/bin:/usr/bin/:/sbin:/usr/sbin:${composer::target_dir}",
-    environment => "COMPOSER_HOME=${composer::composer_home}",
-    user        => $user,
-  }
-
-  $exec_name    = "composer_create_project_${title}"
-  $base_command = "${composer::php_bin} ${composer::target_dir}/${composer::composer_file} --stability=${stability}"
-  $end_command  = "${project_name} ${target_dir}"
-
-  $dev_arg = $dev ? {
-    true    => ' --dev',
-    default => '',
-  }
-
-  $vcs = $keep_vcs? {
-    true    => ' --keep-vcs',
-    default => '',
-  }
-
-  $repo = $repository_url? {
-    undef   => '',
-    default => " --repository-url=${repository_url}",
-  }
-
-  $pref_src = $prefer_source? {
-    true  => ' --prefer-source',
-    false => ''
-  }
-
-  $v = $version? {
-    undef   => '',
-    default => " ${version}",
-  }
-
-  exec { $exec_name:
-    command => "${base_command}${dev_arg}${repo}${pref_src}${vcs} create-project ${end_command}${v}",
-    tries   => $tries,
-    timeout => $timeout,
-    creates => $target_dir,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb
deleted file mode 100644
index 914de7111fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_params_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe 'composer::params' do
-  ['RedHat', 'Debian', 'Linux'].each do |osfamily|
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-        :osfamily        => osfamily,
-        :operatingsystem => 'Amazon',
-      } }
-
-      it { should compile }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb
deleted file mode 100644
index a34e335e7a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/classes/composer_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'spec_helper'
-
-describe 'composer' do
-  ['RedHat', 'Debian', 'Linux'].each do |osfamily|
-    case osfamily
-    when 'RedHat'
-      php_package = 'php-cli'
-      php_context = '/files/etc/php.ini/PHP'
-      suhosin_context = '/files/etc/suhosin.ini/suhosin'
-    when 'Linux'
-      php_package = 'php-cli'
-      php_context = '/files/etc/php.ini/PHP'
-      suhosin_context = '/files/etc/suhosin.ini/suhosin'
-    when 'Debian'
-      php_package = 'php5-cli'
-      php_context = '/files/etc/php5/cli/php.ini/PHP'
-      suhosin_context = '/files/etc/php5/conf.d/suhosin.ini/suhosin'
-    else
-      php_package = 'php-cli'
-      php_context = '/files/etc/php.ini/PHP'
-      suhosin_context = '/files/etc/suhosin.ini/suhosin'
-    end
-
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-          :osfamily        => osfamily,
-          :operatingsystem => 'Amazon'
-      } }
-
-      it { should contain_class('composer::params') }
-
-      it {
-        should contain_exec('download_composer').with({
-          :command     => 'curl -s http://getcomposer.org/installer | php',
-          :cwd         => '/tmp',
-          :creates     => '/tmp/composer.phar',
-          :logoutput   => false,
-        })
-      }
-
-      it {
-        should contain_augeas('whitelist_phar').with({
-          :context     => suhosin_context,
-          :changes     => 'set suhosin.executor.include.whitelist phar',
-        })
-      }
-
-      it {
-        should contain_augeas('allow_url_fopen').with({
-          :context    => php_context,
-          :changes    => 'set allow_url_fopen On',
-        })
-      }
-
-      context 'with default parameters' do
-        it 'should compile' do
-          compile
-        end
-
-        it { should contain_package(php_package).with_ensure('present') }
-        it { should contain_package('curl').with_ensure('present') }
-        it { should contain_file('/usr/local/bin').with_ensure('directory') }
-
-        it {
-          should contain_file('/usr/local/bin/composer').with({
-            :source => 'present',
-            :source => '/tmp/composer.phar',
-            :mode   => '0755',
-          })
-        }
-      end
-
-      context "on invalid operating system family" do
-        let(:facts) { {
-          :osfamily        => 'Invalid',
-          :operatingsystem => 'Amazon'
-        } }
-
-        it 'should not compile' do
-          expect { should compile }.to raise_error(/Unsupported platform: Invalid/)
-        end
-      end
-
-      context 'with custom parameters' do
-        let(:params) { {
-          :target_dir      => '/you_sir/lowcal/been',
-          :php_package     => 'php8-cli',
-          :composer_file   => 'compozah',
-          :curl_package    => 'kerl',
-          :php_bin         => 'pehpe',
-          :suhosin_enabled => false,
-        } }
-
-        it 'should compile' do
-          compile
-        end
-
-        it { should contain_package('php8-cli').with_ensure('present') }
-        it { should contain_package('kerl').with_ensure('present') }
-        it { should contain_file('/you_sir/lowcal/been').with_ensure('directory') }
-
-        it {
-          should contain_file('/you_sir/lowcal/been/compozah').with({
-            :source => 'present',
-            :source => '/tmp/composer.phar',
-            :mode   => '0755',
-          })
-        }
-
-        it { should_not contain_augeas('whitelist_phar') }
-        it { should_not contain_augeas('allow_url_fopen') }
-
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb
deleted file mode 100644
index 36a062f4069..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_exec_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'spec_helper'
-
-describe 'composer::exec' do
-  ['RedHat', 'Debian'].each do |osfamily|
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-          :osfamily => osfamily,
-      } }
-
-      context 'using install command' do
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        let(:title) { 'myproject' }
-        let(:params) { {
-          :cmd  => 'install',
-          :cwd  => '/my/awesome/project',
-          :user => 'linus',
-        } }
-
-        it {
-          should contain_exec('composer_update_myproject').with({
-            :command       => %r{php /usr/local/bin/composer install --no-plugins --no-scripts --no-interaction},
-            :cwd       => '/my/awesome/project',
-            :user      => 'linus',
-            :logoutput => false,
-          })
-        }
-      end
-
-      context 'using update command' do
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        let(:title) { 'yourpr0ject' }
-        let(:params) { {
-          :cmd       => 'update',
-          :cwd       => '/just/in/time',
-          :packages  => ['package1', 'packageinf'],
-          :logoutput => true,
-        } }
-
-        it {
-          should contain_exec('composer_update_yourpr0ject').without_user.with({
-            :command   => %r{php /usr/local/bin/composer update --no-plugins --no-scripts --no-interaction             package1             packageinf},
-            :cwd       => '/just/in/time',
-            :logoutput => true,
-          })
-        }
-      end
-    end
-  end
-
-  context 'on unsupported operating system family' do
-    let(:facts) { {
-      :osfamily => 'Darwin',
-    } }
-
-    let(:title) { 'someproject' }
-
-    it 'should not compile' do
-      expect { should compile }.to raise_error(/Unsupported platform: Darwin/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb
deleted file mode 100644
index 624f9111566..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/defines/composer_project_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe 'composer::project' do
-  ['RedHat', 'Debian'].each do |osfamily|
-    context "on #{osfamily} operating system family" do
-      let(:facts) { {
-            :osfamily => osfamily,
-        } }
-
-      context 'with default params' do
-        let(:title) { 'myproject' }
-        let(:params) { {
-          :project_name => 'projectzzz',
-          :target_dir   => '/my/subpar/project',
-        } }
-
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        it {
-          should contain_exec('composer_create_project_myproject').without_user.with({
-            :command => "php /usr/local/bin/composer --stability=dev create-project projectzzz /my/subpar/project",
-            :tries   => 3,
-            :timeout => 1200,
-            :creates => '/my/subpar/project',
-          })
-        }
-      end
-
-      context 'with all custom params' do
-        let(:title) { 'whoadawg' }
-        let(:params) { {
-          :project_name   => 'whoadawg99',
-          :target_dir     => '/my/mediocre/project',
-          :version        => '0.0.8',
-          :dev            => true,
-          :prefer_source  => true,
-          :stability      => 'dev',
-          :repository_url => 'git@github.com:trollface/whoadawg.git',
-          :keep_vcs       => true,
-          :tries          => 2,
-          :timeout        => 600,
-          :user           => 'mrploch',
-        } }
-
-        it { should contain_class('git') }
-        it { should contain_class('composer') }
-
-        it {
-          should contain_exec('composer_create_project_whoadawg').with({
-            :command => %r{php /usr/local/bin/composer --stability=dev --dev --repository-url=git@github.com:trollface/whoadawg.git --prefer-source --keep-vcs create-project whoadawg99 /my/mediocre/project 0.0.8},
-            :tries   => 2,
-            :timeout => 600,
-            :creates => '/my/mediocre/project',
-            :user    => 'mrploch',
-          })
-        }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp
deleted file mode 100644
index d669ee3889c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/fixtures/manifests/site.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-node default {
-  include composer
-
-  composer::exec {'ohai':
-    cmd => 'install',
-    cwd => '/some/cool/dir',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec.opts
deleted file mode 100644
index 22420e39c64..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/templates/exec.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/templates/exec.erb
deleted file mode 100644
index 960002f94c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/templates/exec.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= @command -%>
-<% if @prefer_source %> --prefer-source<% end -%>
-<% if @prefer_dist %> --prefer-dist<% end -%>
-<% unless @custom_installers %> --no-plugins<% end -%>
-<% unless @scripts %> --no-scripts<% end -%>
-<% unless @interaction %> --no-interaction<% end -%>
-<% if @dev %> --dev<% end -%>
-<% if @verbose %> -v<% end -%>
-<% if @dry_run %> --dry-run<% end -%>
-<% if @cmd == 'update' -%>
-    <%- if @packages -%>
-        <%- @packages.each do |package| -%>
-            <%= ' ' + package -%>
-        <%- end -%>
-    <%- end -%>
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/init.pp
deleted file mode 100644
index 36afe85fa20..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/init.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# The baseline for module testing used by Puppet Labs is that each manifest
-# should have a corresponding test manifest that declares that class or defined
-# type.
-#
-# Tests are then run by using puppet apply --noop (to check for compilation errors
-# and view a log of events) or by fully applying the test in a virtual environment
-# (to compare the resulting system state to the desired state).
-#
-# Learn more about module testing here: http://docs.puppetlabs.com/guides/tests_smoke.html
-#
-include composer
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/project.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/project.pp
deleted file mode 100644
index 6208a5eeded..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/composer/tests/project.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# The baseline for module testing used by Puppet Labs is that each manifest
-# should have a corresponding test manifest that declares that class or defined
-# type.
-#
-# Tests are then run by using puppet apply --noop (to check for compilation errors
-# and view a log of events) or by fully applying the test in a virtual environment
-# (to compare the resulting system state to the desired state).
-#
-# Learn more about module testing here: http://docs.puppetlabs.com/guides/tests_smoke.html
-#
-
-composer::project { 'my_first_test':
-  project_name => 'fabpot/silex-skeleton',
-  target_dir   => '/tmp/first_test',
-}
-
-composer::project { 'my_second_test':
-  project_name  => 'fabpot/silex-skeleton',
-  target_dir    => '/tmp/second_test',
-  prefer_source => true,
-  stability     => 'dev',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.fixtures.yml
deleted file mode 100644
index dc6b41f836c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.fixtures.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-fixtures:
-  repositories:
-    'stdlib':
-      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-      ref: '4.0.0'
-  symlinks:
-    'concat': '#{source_dir}'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.gitattributes b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.gitattributes
deleted file mode 100644
index 2e05fd47ded..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.sh  eol=lf
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.travis.yml
deleted file mode 100644
index 4e72cd4cf9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-# work around RubyGems 2.2.0 breaking ruby 1.8.7
-# https://github.com/rubygems/rubygems/pull/763
-# https://github.com/freerange/mocha/commit/66bab2a8f4e7cd8734bf88e6f32157c0d5153125
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="2.7.3" FACTER_GEM_VERSION="1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="2.7.3" FACTER_GEM_VERSION="1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="2.7.3" FACTER_GEM_VERSION="1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/CHANGELOG
deleted file mode 100644
index c66b922d44c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/CHANGELOG
+++ /dev/null
@@ -1,127 +0,0 @@
-2014-05-14 1.1.0
-
-Summary
-
-This release is primarily a bugfix release since 1.1.0-rc1.
-
-Features:
-- Improved testing, with tests moved to beaker
-
-Bugfixes:
-- No longer attempts to set fragment owner and mode on Windows
-- Fix numeric sorting
-- Fix incorrect quoting
-- Fix newlines
-
-2014-01-03 1.1.0-rc1
-
-Summary:
-
-This release of concat was 90% written by Joshua Hoblitt, and the module team
-would like to thank him for the huge amount of work he put into this release.
-
-This module deprecates a bunch of old parameters and usage patterns, modernizes
-much of the manifest code, simplifies a whole bunch of logic and makes
-improvements to almost all parts of the module.
-
-The other major feature is windows support, courtesy of luisfdez, with an
-alternative version of the concat bash script in ruby.  We've attempted to
-ensure that there are no backwards incompatible changes, all users of 1.0.0
-should be able to use 1.1.0 without any failures, but you may find deprecation
-warnings and we'll be aggressively moving for a 2.0 to remove those too.
-
-For further information on deprecations, please read:
-https://github.com/puppetlabs/puppetlabs-concat/blob/master/README.md#api-deprecations
-
-Removed:
-- Puppet 0.24 support.
-- Filebucket backup of all file resources except the target concatenated file.
-- Default owner/user/group values.
-- Purging of long unused /usr/local/bin/concatfragments.sh
-
-Features:
-- Windows support via a ruby version of the concat bash script.
-- Huge amount of acceptance testing work added.
-- Documentation (README) completely rewritten.
-- New parameters in concat:
- - `ensure`: Controls if the file should be present/absent at all.
-- Remove requirement to include concat::setup in manifests.
-- Made `gnu` parameter deprecated.
-- Added parameter validation.
-
-Bugfixes:
-- Ensure concat::setup runs before concat::fragment in all cases.
-- Pluginsync references updated for modern Puppet.
-- Fix incorrect group parameter.
-- Use $owner instead of $id to avoid confusion with $::id
-- Compatibility fixes for Puppet 2.7/ruby 1.8.7
-- Use LC_ALL=C instead of LANG=C
-- Always exec the concatfragments script as root when running as root.
-- Syntax and other cleanup changes.
-
-2013-08-09 1.0.0
-
-Summary:
-
-Many new features and bugfixes in this release, and if you're a heavy concat
-user you should test carefully before upgrading.  The features should all be
-backwards compatible but only light testing has been done from our side before
-this release.
-
-Features:
-- New parameters in concat:
- - `replace`: specify if concat should replace existing files.
- - `ensure_newline`: controls if fragments should contain a newline at the end.
-- Improved README documentation.
-- Add rspec:system tests (rake spec:system to test concat)
-
-Bugfixes
-- Gracefully handle \n in a fragment resource name.
-- Adding more helpful message for 'pluginsync = true'
-- Allow passing `source` and `content` directly to file resource, rather than
-defining resource defaults.
-- Added -r flag to read so that filenames with \ will be read correctly.
-- sort always uses LANG=C.
-- Allow WARNMSG to contain/start with '#'.
-- Replace while-read pattern with for-do in order to support Solaris.
-
-CHANGELOG:
-- 2010/02/19 - initial release
-- 2010/03/12 - add support for 0.24.8 and newer
-             - make the location of sort configurable
-             - add the ability to add shell comment based warnings to
-               top of files
-             - add the ablity to create empty files
-- 2010/04/05 - fix parsing of WARN and change code style to match rest
-               of the code
-             - Better and safer boolean handling for warn and force
-             - Don't use hard coded paths in the shell script, set PATH
-               top of the script
-             - Use file{} to copy the result and make all fragments owned
-               by root.  This means we can chnage the ownership/group of the
-               resulting file at any time.
-             - You can specify ensure => "/some/other/file" in concat::fragment
-               to include the contents of a symlink into the final file.
-- 2010/04/16 - Add more cleaning of the fragment name - removing / from the $name
-- 2010/05/22 - Improve documentation and show the use of ensure =>
-- 2010/07/14 - Add support for setting the filebucket behavior of files
-- 2010/10/04 - Make the warning message configurable
-- 2010/12/03 - Add flags to make concat work better on Solaris - thanks Jonathan Boyett
-- 2011/02/03 - Make the shell script more portable and add a config option for root group
-- 2011/06/21 - Make base dir root readable only for security
-- 2011/06/23 - Set base directory using a fact instead of hardcoding it
-- 2011/06/23 - Support operating as non privileged user
-- 2011/06/23 - Support dash instead of bash or sh
-- 2011/07/11 - Better solaris support
-- 2011/12/05 - Use fully qualified variables
-- 2011/12/13 - Improve Nexenta support
-- 2012/04/11 - Do not use any GNU specific extensions in the shell script
-- 2012/03/24 - Comply to community style guides
-- 2012/05/23 - Better errors when basedir isnt set
-- 2012/05/31 - Add spec tests
-- 2012/07/11 - Include concat::setup in concat improving UX
-- 2012/08/14 - Puppet Lint improvements
-- 2012/08/30 - The target path can be different from the $name
-- 2012/08/30 - More Puppet Lint cleanup
-- 2012/09/04 - RELEASE 0.2.0
-- 2012/12/12 - Added (file) $replace parameter to concat
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Gemfile
deleted file mode 100644
index 56b977598c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Gemfile
+++ /dev/null
@@ -1,20 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'serverspec',              :require => false
-  gem 'pry',                     :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/LICENSE
deleted file mode 100644
index 6a9e9a194b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/LICENSE
+++ /dev/null
@@ -1,14 +0,0 @@
-   Copyright 2012 R.I.Pienaar
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Modulefile
deleted file mode 100644
index ea9ef2c3e30..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name 'puppetlabs-concat'
-version '1.1.0'
-source 'git://github.com/puppetlabs/puppetlabs-concat.git'
-author 'Puppetlabs'
-license 'Apache 2.0'
-summary 'Concat module'
-description 'Concat module'
-project_page 'http://github.com/puppetlabs/puppetlabs-concat'
-dependency 'puppetlabs/stdlib', '>= 4.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/README.md
deleted file mode 100644
index 60eca383002..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/README.md
+++ /dev/null
@@ -1,441 +0,0 @@
-#Concat
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-concat.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-concat)
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with concat](#setup)
-    * [What concat affects](#what-concat-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with concat](#beginning-with-concat)
-4. [Usage - Configuration options and additional functionality](#usage)
-    * [API _deprecations_](#api-deprecations)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-This module constructs files from multiple fragments in an ordered way.
-
-##Module Description
-
-This module lets you use many concat::fragment{} resources throughout
-your modules to construct a single file at the end.  It does this through
-a shell (or ruby) script and a temporary holding space for the fragments.
-
-##Setup
-
-###What concat affects
-
-* Installs concatfragments.[sh|rb] based on platform.
-* Adds a concat/ directory into Puppets `vardir`.
-
-###Beginning with concat
-
-To start using concat you need to create:
-
-* A concat{} resource for the final file.
-* One or more concat::fragment{}'s. 
-
-A minimal example might be:
-
-```puppet
-concat { '/tmp/file':
-  ensure => present,
-}
-
-concat::fragment { 'tmpfile':
-  target  => '/tmp/file'
-  content => 'test contents',
-  order   => '01'
-}
-```
-
-##Usage
-
-Please be aware that there have been a number of [API
-_deprecations_](#api-deprecations).
-
-If you wanted a /etc/motd file that listed all the major modules
-on the machine.  And that would be maintained automatically even
-if you just remove the include lines for other modules you could
-use code like below, a sample /etc/motd would be:
-
-<pre>
-Puppet modules on this server:
-
-    -- Apache
-    -- MySQL
-</pre>
-
-Local sysadmins can also append to the file by just editing /etc/motd.local
-their changes will be incorporated into the puppet managed motd.
-
-```puppet
-class motd {
-  $motd = '/etc/motd'
-
-  concat { $motd:
-    owner => 'root',
-    group => 'root',
-    mode  => '0644'
-  }
-
-  concat::fragment{ 'motd_header':
-    target  => $motd,
-    content => "\nPuppet modules on this server:\n\n",
-    order   => '01'
-  }
-
-  # local users on the machine can append to motd by just creating
-  # /etc/motd.local
-  concat::fragment{ 'motd_local':
-    target => $motd,
-    source => '/etc/motd.local',
-    order  => '15'
-  }
-}
-
-# used by other modules to register themselves in the motd
-define motd::register($content="", $order=10) {
-  if $content == "" {
-    $body = $name
-  } else {
-    $body = $content
-  }
-
-  concat::fragment{ "motd_fragment_$name":
-    target  => '/etc/motd',
-    order   => $order,
-    content => "    -- $body\n"
-  }
-}
-```
-
-To use this you'd then do something like:
-
-```puppet
-class apache {
-  include apache::install, apache::config, apache::service
-
-  motd::register{ 'Apache': }
-}
-```
-
-##Reference
-
-###Classes
-
-####Public classes
-
-####Private classes
-* `concat::setup`: Sets up the concat script/directories.
-
-###Parameters
-
-###Defines
-
-####concat
-
-#####`ensure`
-Controls if the combined file is present or absent.
-
-######Example
-- ensure => present
-- ensure => absent
-
-#####`path`
-Controls the destination of the file to create.
-
-######Example
-- path => '/tmp/filename'
-
-#####`owner`
-Set the owner of the combined file.
-
-######Example
-- owner => 'root'
-
-#####`group`
-Set the group of the combined file.
-
-######Example
-- group => 'root'
-
-#####`mode`
-Set the mode of the combined file.
-
-######Example
-- mode => '0644'
-
-#####`warn`
-Determine if a warning message should be added at the top of the file to let
-users know it was autogenerated by Puppet.
-
-######Example
-- warn => true
-- warn => false
-
-#####`warn_message`
-Set the contents of the warning message.
-
-######Example
-- warn_message => 'This file is autogenerated!'
-
-#####`force`
-Determine if empty files are allowed when no fragments were added.
-
-######Example
-- force => true
-- force => false
-
-#####`backup`
-Controls the filebucket behavior used for the file.
-
-######Example
-- backup => 'puppet'
-
-#####`replace`
-Controls if Puppet should replace the destination file if it already exists.
-
-######Example
-- replace => true
-- replace => false
-
-#####`order`
-Controls the way in which the shell script chooses to sort the files.  It's
-rare you'll need to adjust this.
-
-######Allowed Values
-- order => 'alpha'
-- order => 'numeric'
-
-#####`ensure_newline`
-Ensure there's a newline at the end of the fragments.
-
-######Example
-- ensure_newline => true
-- ensure_newline => false
-
-####concat::fragment
-
-#####`target`
-Choose the destination file of the fragment.
-
-######Example
-- target => '/tmp/testfile'
-
-#####`content`
-Create the content of the fragment.
-
-######Example
-- content => 'test file contents'
-
-#####`source`
-Find the sources within Puppet of the fragment.
-
-######Example
-- source => 'puppet:///modules/test/testfile'
-- source => ['puppet:///modules/test/1', 'puppet:///modules/test/2']
-
-#####`order`
-Order the fragments.
-
-######Example
-- order => '01'
-
-#####`ensure`
-Control the file of fragment created.
-
-######Example
-- ensure => 'present'
-- ensure => 'absent'
-- ensure => 'file'
-- ensure => 'directory'
-
-#####`mode`
-Set the mode of the fragment.
-
-######Example
-- mode => '0644'
-
-#####`owner`
-Set the owner of the fragment.
-
-######Example
-- owner => 'root'
-
-#####`group`
-Set the group of the fragment.
-
-######Example
-- group => 'root'
-
-#####`backup`
-Control the filebucket behavior for the fragment.
-
-######Example
-- backup => 'puppet'
-
-### API _deprecations_
-
-#### Since version `1.0.0`
-
-##### `concat{}` `warn` parameter
-
-```puppet
-concat { '/tmp/file':
-  ensure => present,
-  warn   => 'true',  # generates stringified boolean value warning
-}
-```
-
-Using stringified Boolean values as the `warn` parameter to `concat` is
-deprecated, generates a catalog compile time warning, and will be silently
-treated as the concatenated file header/warning message in a future release.
-
-The following strings are considered a stringified Boolean value:
-
- * `'true'`
- * `'yes'`
- * `'on'`
- * `'false'`
- * `'no'`
- * `'off'`
-
-Please migrate to using the Puppet DSL's native [Boolean data
-type](http://docs.puppetlabs.com/puppet/3/reference/lang_datatypes.html#booleans).
-
-##### `concat{}` `gnu` parameter
-
-```puppet
-concat { '/tmp/file':
-  ensure => present,
-  gnu    => $foo,    # generates deprecation warning
-}
-```
-
-The `gnu` parameter to `concat` is deprecated, generates a catalog compile time
-warning, and has no effect.  This parameter will be removed in a future
-release.
-
-Note that this parameter was silently ignored in the `1.0.0` release.
-
-##### `concat::fragment{}` `ensure` parameter
-
-```puppet
-concat::fragment { 'cpuinfo':
-  ensure => '/proc/cpuinfo', # generates deprecation warning
-  target => '/tmp/file',
-}
-```
-
-Passing a value other than `'present'` or `'absent'` as the `ensure` parameter
-to `concat::fragment` is deprecated and generates a catalog compile time
-warning.  The warning will become a catalog compilation failure in a future
-release.
-
-This type emulates the Puppet core `file` type's disfavored [`ensure`
-semantics](http://docs.puppetlabs.com/references/latest/type.html#file-attribute-ensure)
-of treating a file path as a directive to create a symlink.  This feature is
-problematic in several ways.  It copies an API semantic of another type that is
-both frowned upon and not generally well known.  It's behavior may be
-surprising in that the target concatenated file will not be a symlink nor is
-there any common file system that has a concept of a section of a plain file
-being symbolically linked to another file.  Additionally, the behavior is
-generally inconsistent with most Puppet types in that a missing source file
-will be silently ignored.
-
-If you want to use the content of a file as a fragment please use the `source`
-parameter.
-
-##### `concat::fragment{}` `mode/owner/group` parameters
-
-```puppet
-concat::fragment { 'foo':
-  target  => '/tmp/file',
-  content => 'foo',
-  mode    => $mode,       # generates deprecation warning
-  owner   => $owner,      # generates deprecation warning
-  group   => $group,      # generates deprecation warning
-}
-```
-
-The `mode` parameter to `concat::fragment` is deprecated, generates a catalog compile time warning, and has no effect.
-
-The `owner` parameter to `concat::fragment` is deprecated, generates a catalog
-compile time warning, and has no effect.
-
-The `group` parameter to `concat::fragment` is deprecated, generates a catalog
-compile time warning, and has no effect.
-
-These parameters had no user visible effect in version `1.0.0` and will be
-removed in a future release.
-
-##### `concat::fragment{}` `backup` parameter
-
-```puppet
-concat::fragment { 'foo':
-  target  => '/tmp/file',
-  content => 'foo',
-  backup  => 'bar',       # generates deprecation warning
-}
-```
-
-The `backup` parameter to `concat::fragment` is deprecated, generates a catalog
-compile time warning, and has no effect.  It will be removed in a future
-release.
-
-In the `1.0.0` release this parameter controlled file bucketing of the file
-fragment.  Bucketting the fragment(s) is redundant with bucketting the final
-concatenated file and this feature has been removed.
-
-##### `class { 'concat::setup': }`
-
-```puppet
-include concat::setup     # generates deprecation warning
-
-class { 'concat::setup: } # generates deprecation warning
-```
-
-The `concat::setup` class is deprecated as a public API of this module and
-should no longer be directly included in the manifest.  This class may be
-removed in a future release.
-
-##### Parameter validation
-
-While not an API depreciation, users should be aware that all public parameters
-in this module are now validated for at least variable type.  This may cause
-validation errors in a manifest that was previously silently misbehaving.
-
-##Limitations
-
-This module has been tested on:
-
-* RedHat Enterprise Linux (and Centos) 5/6
-* Debian 6/7
-* Ubuntu 12.04
-
-Testing on other platforms has been light and cannot be guaranteed.
-
-#Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-###Contributors
-
-The list of contributors can be found at:
-
-https://github.com/puppetlabs/puppetlabs-concat/graphs/contributors
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Rakefile
deleted file mode 100644
index 23aea87de25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/Rakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_quoted_booleans')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.rb
deleted file mode 100755
index 73fd7f9b2d4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-# Script to concat files to a config file.
-#
-# Given a directory like this:
-# /path/to/conf.d
-# |-- fragments
-# |   |-- 00_named.conf
-# |   |-- 10_domain.net
-# |   `-- zz_footer
-#
-# The script supports a test option that will build the concat file to a temp location and
-# use /usr/bin/cmp to verify if it should be run or not.  This would result in the concat happening
-# twice on each run but gives you the option to have an unless option in your execs to inhibit rebuilds.
-#
-# Without the test option and the unless combo your services that depend on the final file would end up
-# restarting on each run, or in other manifest models some changes might get missed.
-#
-# OPTIONS:
-#  -o	The file to create from the sources
-#  -d	The directory where the fragments are kept
-#  -t	Test to find out if a build is needed, basically concats the files to a temp
-#       location and compare with what's in the final location, return codes are designed
-#       for use with unless on an exec resource
-#  -w   Add a shell style comment at the top of the created file to warn users that it
-#       is generated by puppet
-#  -f   Enables the creation of empty output files when no fragments are found
-#  -n	Sort the output numerically rather than the default alpha sort
-#
-# the command:
-#
-#   concatfragments.rb -o /path/to/conffile.cfg -d /path/to/conf.d
-#
-# creates /path/to/conf.d/fragments.concat and copies the resulting
-# file to /path/to/conffile.cfg.  The files will be sorted alphabetically
-# pass the -n switch to sort numerically.
-#
-# The script does error checking on the various dirs and files to make
-# sure things don't fail.
-require 'optparse'
-require 'fileutils'
-
-settings = {
-  :outfile => "",
-  :workdir => "",
-  :test    => false,
-  :force   => false,
-  :warn    => "",
-  :sortarg => ""
-}
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [options]"
-  opts.separator "Specific options:"
-
-  opts.on("-o", "--outfile OUTFILE", String, "The file to create from the sources") do |o|
-    settings[:outfile] = o
-  end
-
-  opts.on("-d", "--workdir WORKDIR", String, "The directory where the fragments are kept") do |d|
-    settings[:workdir] = d
-  end
-
-  opts.on("-t", "--test", "Test to find out if a build is needed") do
-    settings[:test] = true
-  end
-
-  opts.separator "Other options:"
-  opts.on("-w", "--warn WARNMSG", String,
-          "Add a shell style comment at the top of the created file to warn users that it is generated by puppet") do |w|
-    settings[:warn] = w
-  end
-
-  opts.on("-f", "--force", "Enables the creation of empty output files when no fragments are found") do
-    settings[:force] = true
-  end
-
-  opts.on("-n", "--sort", "Sort the output numerically rather than the default alpha sort") do
-    settings[:sortarg] = "-n"
-  end
-end.parse!
-
-# do we have -o?
-raise 'Please specify an output file with -o' unless !settings[:outfile].empty?
-
-# do we have -d?
-raise 'Please specify fragments directory with -d' unless !settings[:workdir].empty?
-
-# can we write to -o?
-if File.file?(settings[:outfile])
-  if !File.writable?(settings[:outfile])
-    raise "Cannot write to #{settings[:outfile]}"
-  end
-else
-  if !File.writable?(File.dirname(settings[:outfile]))
-    raise "Cannot write to dirname #{File.dirname(settings[:outfile])} to create #{settings[:outfile]}"
-  end
-end
-
-# do we have a fragments subdir inside the work dir?
-if !File.directory?(File.join(settings[:workdir], "fragments")) && !File.executable?(File.join(settings[:workdir], "fragments"))
-  raise "Cannot access the fragments directory"
-end
-
-# are there actually any fragments?
-if (Dir.entries(File.join(settings[:workdir], "fragments")) - %w{ . .. }).empty?
-  if !settings[:force]
-    raise "The fragments directory is empty, cowardly refusing to make empty config files"
-  end
-end
-
-Dir.chdir(settings[:workdir])
-
-if settings[:warn].empty?
-  File.open("fragments.concat", 'w') {|f| f.write("") }
-else
-  File.open("fragments.concat", 'w') {|f| f.write("#{settings[:warn]}\n") }
-end
-
-# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir
-open('fragments.concat', 'a') do |f|
-  Dir.entries("fragments").sort.each{ |entry|
-    if File.file?(File.join("fragments", entry))
-	  f << File.read(File.join("fragments", entry))
-    end
-  }
-end
-
-if !settings[:test]
-  # This is a real run, copy the file to outfile
-  FileUtils.cp 'fragments.concat', settings[:outfile]
-else
-  # Just compare the result to outfile to help the exec decide
-  if FileUtils.cmp 'fragments.concat', settings[:outfile]
-    exit 0
-  else
-    exit 1
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.sh
deleted file mode 100755
index 7e6b0f5c565..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/files/concatfragments.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-# Script to concat files to a config file.
-#
-# Given a directory like this:
-# /path/to/conf.d
-# |-- fragments
-# |   |-- 00_named.conf
-# |   |-- 10_domain.net
-# |   `-- zz_footer
-#
-# The script supports a test option that will build the concat file to a temp location and 
-# use /usr/bin/cmp to verify if it should be run or not.  This would result in the concat happening
-# twice on each run but gives you the option to have an unless option in your execs to inhibit rebuilds.
-# 
-# Without the test option and the unless combo your services that depend on the final file would end up 
-# restarting on each run, or in other manifest models some changes might get missed.
-#
-# OPTIONS:
-#  -o	The file to create from the sources
-#  -d	The directory where the fragments are kept
-#  -t	Test to find out if a build is needed, basically concats the files to a temp
-#       location and compare with what's in the final location, return codes are designed
-#       for use with unless on an exec resource
-#  -w   Add a shell style comment at the top of the created file to warn users that it 
-#       is generated by puppet
-#  -f   Enables the creation of empty output files when no fragments are found
-#  -n	Sort the output numerically rather than the default alpha sort
-#
-# the command: 
-#
-#   concatfragments.sh -o /path/to/conffile.cfg -d /path/to/conf.d
-#
-# creates /path/to/conf.d/fragments.concat and copies the resulting 
-# file to /path/to/conffile.cfg.  The files will be sorted alphabetically
-# pass the -n switch to sort numerically.
-# 
-# The script does error checking on the various dirs and files to make
-# sure things don't fail.
-
-OUTFILE=""
-WORKDIR=""
-TEST=""
-FORCE=""
-WARN=""
-SORTARG=""
-ENSURE_NEWLINE=""
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-## Well, if there's ever a bad way to do things, Nexenta has it.
-## http://nexenta.org/projects/site/wiki/Personalities
-unset SUN_PERSONALITY
-
-while getopts "o:s:d:tnw:fl" options; do
-	case $options in
-		o ) OUTFILE=$OPTARG;;
-		d ) WORKDIR=$OPTARG;;
-		n ) SORTARG="-n";;
-		w ) WARNMSG="$OPTARG";;
-		f ) FORCE="true";;
-		t ) TEST="true";;
-		l ) ENSURE_NEWLINE="true";;
-		* ) echo "Specify output file with -o and fragments directory with -d"
-		    exit 1;;
-	esac
-done
-
-# do we have -o?
-if [ "x${OUTFILE}" = "x" ]; then
-	echo "Please specify an output file with -o"
-	exit 1
-fi
-
-# do we have -d?
-if [ "x${WORKDIR}" = "x" ]; then
-	echo "Please fragments directory with -d"
-	exit 1
-fi
-
-# can we write to -o?
-if [ -f "${OUTFILE}" ]; then
-	if [ ! -w "${OUTFILE}" ]; then
-		echo "Cannot write to ${OUTFILE}"
-		exit 1
-	fi
-else
-	if [ ! -w `dirname "${OUTFILE}"` ]; then
-		echo "Cannot write to `dirname \"${OUTFILE}\"` to create ${OUTFILE}"
-		exit 1
-	fi
-fi
-
-# do we have a fragments subdir inside the work dir?
-if [ ! -d "${WORKDIR}/fragments" ]  && [ ! -x "${WORKDIR}/fragments" ]; then
-	echo "Cannot access the fragments directory"
-	exit 1
-fi
-
-# are there actually any fragments?
-if [ ! "$(ls -A """${WORKDIR}/fragments""")" ]; then
-	if [ "x${FORCE}" = "x" ]; then
-		echo "The fragments directory is empty, cowardly refusing to make empty config files"
-		exit 1
-	fi
-fi
-
-cd "${WORKDIR}"
-
-if [ "x${WARNMSG}" = "x" ]; then
-	: > "fragments.concat"
-else
-	printf '%s\n' "$WARNMSG" > "fragments.concat"
-fi
-
-# find all the files in the fragments directory, sort them numerically and concat to fragments.concat in the working dir
-IFS_BACKUP=$IFS
-IFS='
-'
-for fragfile in `find fragments/ -type f -follow -print0 | xargs -0 -n1 basename | LC_ALL=C sort ${SORTARG}`
-do
-    cat "fragments/$fragfile" >> "fragments.concat"
-    # Handle newlines.
-    if [ "x${ENSURE_NEWLINE}" != "x" ]; then
-      echo >> "fragments.concat"
-    fi
-done
-IFS=$IFS_BACKUP
-
-if [ "x${TEST}" = "x" ]; then
-	# This is a real run, copy the file to outfile
-	cp fragments.concat "${OUTFILE}"
-	RETVAL=$?
-else
-	# Just compare the result to outfile to help the exec decide
-	cmp "${OUTFILE}" fragments.concat
-	RETVAL=$?
-fi
-
-exit $RETVAL
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb
deleted file mode 100644
index bfac07102de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/lib/facter/concat_basedir.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# == Fact: concat_basedir
-#
-# A custom fact that sets the default location for fragments
-#
-# "${::vardir}/concat/"
-#
-Facter.add("concat_basedir") do
-  setcode do
-    File.join(Puppet[:vardir],"concat")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/fragment.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/fragment.pp
deleted file mode 100644
index 40baadd2348..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/fragment.pp
+++ /dev/null
@@ -1,121 +0,0 @@
-# == Define: concat::fragment
-#
-# Puts a file fragment into a directory previous setup using concat
-#
-# === Options:
-#
-# [*target*]
-#   The file that these fragments belong to
-# [*content*]
-#   If present puts the content into the file
-# [*source*]
-#   If content was not specified, use the source
-# [*order*]
-#   By default all files gets a 10_ prefix in the directory you can set it to
-#   anything else using this to influence the order of the content in the file
-# [*ensure*]
-#   Present/Absent or destination to a file to include another file
-# [*mode*]
-#   Deprecated
-# [*owner*]
-#   Deprecated
-# [*group*]
-#   Deprecated
-# [*backup*]
-#   Deprecated
-#
-define concat::fragment(
-    $target,
-    $content = undef,
-    $source  = undef,
-    $order   = 10,
-    $ensure  = undef,
-    $mode    = undef,
-    $owner   = undef,
-    $group   = undef,
-    $backup  = undef
-) {
-  validate_string($target)
-  validate_string($content)
-  if !(is_string($source) or is_array($source)) {
-    fail('$source is not a string or an Array.')
-  }
-  validate_string($order)
-  if $mode {
-    warning('The $mode parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $owner {
-    warning('The $owner parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $group {
-    warning('The $group parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $backup {
-    warning('The $backup parameter to concat::fragment is deprecated and has no effect')
-  }
-  if $ensure == undef {
-    $_ensure = getparam(Concat[$target], 'ensure')
-  } else {
-    if ! ($ensure in [ 'present', 'absent' ]) {
-      warning('Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.')
-    }
-    $_ensure = $ensure
-  }
-
-  include concat::setup
-
-  $safe_name        = regsubst($name, '[/:\n]', '_', 'GM')
-  $safe_target_name = regsubst($target, '[/:\n]', '_', 'GM')
-  $concatdir        = $concat::setup::concatdir
-  $fragdir          = "${concatdir}/${safe_target_name}"
-  $fragowner            = $concat::setup::fragment_owner
-  $fragmode             = $concat::setup::fragment_mode
-
-  # The file type's semantics are problematic in that ensure => present will
-  # not over write a pre-existing symlink.  We are attempting to provide
-  # backwards compatiblity with previous concat::fragment versions that
-  # supported the file type's ensure => /target syntax
-
-  # be paranoid and only allow the fragment's file resource's ensure param to
-  # be file, absent, or a file target
-  $safe_ensure = $_ensure ? {
-    ''        => 'file',
-    undef     => 'file',
-    'file'    => 'file',
-    'present' => 'file',
-    'absent'  => 'absent',
-    default   => $_ensure,
-  }
-
-  # if it looks line ensure => /target syntax was used, fish that out
-  if ! ($_ensure in ['', 'present', 'absent', 'file' ]) {
-    $ensure_target = $_ensure
-  } else {
-    $ensure_target = undef
-  }
-
-  # the file type's semantics only allows one of: ensure => /target, content,
-  # or source
-  if ($ensure_target and $source) or
-    ($ensure_target and $content) or
-    ($source and $content) {
-    fail('You cannot specify more than one of $content, $source, $ensure => /target')
-  }
-
-  if ! ($content or $source or $ensure_target) {
-    crit('No content, source or symlink specified')
-  }
-
-  # punt on group ownership until some point in the distant future when $::gid
-  # can be relied on to be present
-  file { "${fragdir}/fragments/${order}_${safe_name}":
-    ensure  => $safe_ensure,
-    owner   => $fragowner,
-    mode    => $fragmode,
-    source  => $source,
-    content => $content,
-    backup  => false,
-    alias   => "concat_fragment_${name}",
-    notify  => Exec["concat_${target}"]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/init.pp
deleted file mode 100644
index 91d82ebd3e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/init.pp
+++ /dev/null
@@ -1,232 +0,0 @@
-# == Define: concat
-#
-# Sets up so that you can use fragments to build a final config file,
-#
-# === Options:
-#
-# [*ensure*]
-#   Present/Absent
-# [*path*]
-#   The path to the final file. Use this in case you want to differentiate
-#   between the name of a resource and the file path.  Note: Use the name you
-#   provided in the target of your fragments.
-# [*owner*]
-#   Who will own the file
-# [*group*]
-#   Who will own the file
-# [*mode*]
-#   The mode of the final file
-# [*force*]
-#   Enables creating empty files if no fragments are present
-# [*warn*]
-#   Adds a normal shell style comment top of the file indicating that it is
-#   built by puppet
-# [*force*]
-# [*backup*]
-#   Controls the filebucketing behavior of the final file and see File type
-#   reference for its use.  Defaults to 'puppet'
-# [*replace*]
-#   Whether to replace a file that already exists on the local system
-# [*order*]
-# [*ensure_newline*]
-# [*gnu*]
-#   Deprecated
-#
-# === Actions:
-# * Creates fragment directories if it didn't exist already
-# * Executes the concatfragments.sh script to build the final file, this
-#   script will create directory/fragments.concat.   Execution happens only
-#   when:
-#   * The directory changes
-#   * fragments.concat != final destination, this means rebuilds will happen
-#     whenever someone changes or deletes the final file.  Checking is done
-#     using /usr/bin/cmp.
-#   * The Exec gets notified by something else - like the concat::fragment
-#     define
-# * Copies the file over to the final destination using a file resource
-#
-# === Aliases:
-#
-# * The exec can notified using Exec["concat_/path/to/file"] or
-#   Exec["concat_/path/to/directory"]
-# * The final file can be referenced as File["/path/to/file"] or
-#   File["concat_/path/to/file"]
-#
-define concat(
-  $ensure         = 'present',
-  $path           = $name,
-  $owner          = undef,
-  $group          = undef,
-  $mode           = '0644',
-  $warn           = false,
-  $force          = false,
-  $backup         = 'puppet',
-  $replace        = true,
-  $order          = 'alpha',
-  $ensure_newline = false,
-  $gnu            = undef
-) {
-  validate_re($ensure, '^present$|^absent$')
-  validate_absolute_path($path)
-  validate_string($owner)
-  validate_string($group)
-  validate_string($mode)
-  if ! (is_string($warn) or $warn == true or $warn == false) {
-    fail('$warn is not a string or boolean')
-  }
-  validate_bool($force)
-  validate_string($backup)
-  validate_bool($replace)
-  validate_re($order, '^alpha$|^numeric$')
-  validate_bool($ensure_newline)
-  if $gnu {
-    warning('The $gnu parameter to concat is deprecated and has no effect')
-  }
-
-  include concat::setup
-
-  $safe_name            = regsubst($name, '[/:]', '_', 'G')
-  $concatdir            = $concat::setup::concatdir
-  $fragdir              = "${concatdir}/${safe_name}"
-  $concat_name          = 'fragments.concat.out'
-  $script_command       = $concat::setup::script_command
-  $default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'
-  $bool_warn_message    = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
-
-  case $warn {
-    true: {
-      $warn_message = $default_warn_message
-    }
-    'true', 'yes', 'on': {
-      warning($bool_warn_message)
-      $warn_message = $default_warn_message
-    }
-    false: {
-      $warn_message = ''
-    }
-    'false', 'no', 'off': {
-      warning($bool_warn_message)
-      $warn_message = ''
-    }
-    default: {
-      $warn_message = $warn
-    }
-  }
-
-  $warnmsg_escaped = regsubst($warn_message, '\'', '\'\\\'\'', 'G')
-  $warnflag = $warnmsg_escaped ? {
-    ''      => '',
-    default => "-w '${warnmsg_escaped}'"
-  }
-
-  $forceflag = $force ? {
-    true  => '-f',
-    false => '',
-  }
-
-  $orderflag = $order ? {
-    'numeric' => '-n',
-    'alpha'   => '',
-  }
-
-  $newlineflag = $ensure_newline ? {
-    true  => '-l',
-    false => '',
-  }
-
-  File {
-    backup  => false,
-  }
-
-  if $ensure == 'present' {
-    file { $fragdir:
-      ensure => directory,
-      mode   => '0750',
-    }
-
-    file { "${fragdir}/fragments":
-      ensure  => directory,
-      mode    => '0750',
-      force   => true,
-      ignore  => ['.svn', '.git', '.gitignore'],
-      notify  => Exec["concat_${name}"],
-      purge   => true,
-      recurse => true,
-    }
-
-    file { "${fragdir}/fragments.concat":
-      ensure => present,
-      mode   => '0640',
-    }
-
-    file { "${fragdir}/${concat_name}":
-      ensure => present,
-      mode   => '0640',
-    }
-
-    file { $name:
-      ensure  => present,
-      owner   => $owner,
-      group   => $group,
-      mode    => $mode,
-      replace => $replace,
-      path    => $path,
-      alias   => "concat_${name}",
-      source  => "${fragdir}/${concat_name}",
-      backup  => $backup,
-    }
-
-    # remove extra whitespace from string interpolation to make testing easier
-    $command = strip(regsubst("${script_command} -o \"${fragdir}/${concat_name}\" -d \"${fragdir}\" ${warnflag} ${forceflag} ${orderflag} ${newlineflag}", '\s+', ' ', 'G'))
-
-    # if puppet is running as root, this exec should also run as root to allow
-    # the concatfragments.sh script to potentially be installed in path that
-    # may not be accessible by a target non-root owner.
-    exec { "concat_${name}":
-      alias     => "concat_${fragdir}",
-      command   => $command,
-      notify    => File[$name],
-      subscribe => File[$fragdir],
-      unless    => "${command} -t",
-      path      => $::path,
-      require   => [
-        File[$fragdir],
-        File["${fragdir}/fragments"],
-        File["${fragdir}/fragments.concat"],
-      ],
-    }
-  } else {
-    file { [
-      $fragdir,
-      "${fragdir}/fragments",
-      "${fragdir}/fragments.concat",
-      "${fragdir}/${concat_name}"
-    ]:
-      ensure => absent,
-      force  => true,
-    }
-
-    file { $path:
-      ensure => absent,
-      backup => $backup,
-    }
-
-    $absent_exec_command = $::kernel ? {
-      'windows' => 'cmd.exe /c exit 0',
-      default   => 'true',
-    }
-
-    $absent_exec_path = $::kernel ? {
-      'windows' => $::path,
-      default   => '/bin:/usr/bin',
-    }
-
-    exec { "concat_${name}":
-      alias   => "concat_${fragdir}",
-      command => $absent_exec_command,
-      path    => $absent_exec_path
-    }
-  }
-}
-
-# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/setup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/setup.pp
deleted file mode 100644
index 17674003cef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/manifests/setup.pp
+++ /dev/null
@@ -1,58 +0,0 @@
-# === Class: concat::setup
-#
-# Sets up the concat system. This is a private class.
-#
-# [$concatdir]
-#   is where the fragments live and is set on the fact concat_basedir.
-#   Since puppet should always manage files in $concatdir and they should
-#   not be deleted ever, /tmp is not an option.
-#
-# It also copies out the concatfragments.sh file to ${concatdir}/bin
-#
-class concat::setup {
-  if $caller_module_name != $module_name {
-    warning("${name} is deprecated as a public API of the ${module_name} module and should no longer be directly included in the manifest.")
-  }
-
-  if $::concat_basedir {
-    $concatdir = $::concat_basedir
-  } else {
-    fail ('$concat_basedir not defined. Try running again with pluginsync=true on the [master] and/or [main] section of your node\'s \'/etc/puppet/puppet.conf\'.')
-  }
-  
-  # owner and mode of fragment files (on windows owner and access rights should be inherited from concatdir and not explicitly set to avoid problems)
-  $fragment_owner = $osfamily ? { 'windows' => undef, default => $::id }
-  $fragment_mode  = $osfamily ? { 'windows' => undef, default => '0640' }
-
-  $script_name = $::kernel ? {
-    'windows' => 'concatfragments.rb',
-    default   => 'concatfragments.sh'
-  }
-
-  $script_path = "${concatdir}/bin/${script_name}"
-
-  $script_owner = $osfamily ? { 'windows' => undef, default => $::id }
-
-  $script_mode = $osfamily ? { 'windows' => undef, default => '0755' }
-
-  $script_command   = $::kernel ? {
-    'windows' => "ruby.exe ${script_path}",
-    default   => $script_path
-  }
-
-  File {
-    backup => false,
-  }
-
-  file { $script_path:
-    ensure => file,
-    owner  => $script_owner,
-    mode   => $script_mode,
-    source => "puppet:///modules/concat/${script_name}",
-  }
-
-  file { [ $concatdir, "${concatdir}/bin" ]:
-    ensure => directory,
-    mode   => '0755',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb
deleted file mode 100644
index 7b2858d8e90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/backup_spec.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat backup parameter' do
-  context '=> puppet' do
-    before :all do
-      shell('rm -rf /tmp/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'old contents' > /tmp/concat/file")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        backup => 'puppet',
-      }
-      concat::fragment { 'new file':
-        target  => '/tmp/concat/file',
-        content => 'new contents',
-      }
-    EOS
-
-    it 'applies the manifest twice with "Filebucketed" stdout and no stderr' do
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-        expect(r.stdout).to match(/Filebucketed \/tmp\/concat\/file to puppet with sum 0140c31db86293a1a1e080ce9b91305f/) # sum is for file contents of 'old contents'
-      end
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain 'new contents' }
-    end
-  end
-
-  context '=> .backup' do
-    before :all do
-      shell('rm -rf /tmp/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'old contents' > /tmp/concat/file")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        backup => '.backup',
-      }
-      concat::fragment { 'new file':
-        target  => '/tmp/concat/file',
-        content => 'new contents',
-      }
-    EOS
-
-    # XXX Puppet doesn't mention anything about filebucketing with a given
-    # extension like .backup
-    it 'applies the manifest twice  no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain 'new contents' }
-    end
-    describe file('/tmp/concat/file.backup') do
-      it { should be_file }
-      it { should contain 'old contents' }
-    end
-  end
-
-  # XXX The backup parameter uses validate_string() and thus can't be the
-  # boolean false value, but the string 'false' has the same effect in Puppet 3
-  context "=> 'false'" do
-    before :all do
-      shell('rm -rf /tmp/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'old contents' > /tmp/concat/file")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        backup => '.backup',
-      }
-      concat::fragment { 'new file':
-        target  => '/tmp/concat/file',
-        content => 'new contents',
-      }
-    EOS
-
-    it 'applies the manifest twice with no "Filebucketed" stdout and no stderr' do
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-        expect(r.stdout).to_not match(/Filebucketed/)
-      end
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain 'new contents' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb
deleted file mode 100644
index 89919cc53b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/concat_spec.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'basic concat test' do
-
-  shared_examples 'successfully_applied' do |pp|
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file("#{default['puppetvardir']}/concat") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 755 }
-    end
-    describe file("#{default['puppetvardir']}/concat/bin") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 755 }
-    end
-    describe file("#{default['puppetvardir']}/concat/bin/concatfragments.sh") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      #it { should be_grouped_into 'root' }
-      it { should be_mode 755 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 750 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments") do
-      it { should be_directory }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 750 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments.concat") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments.concat.out") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-  end
-
-  context 'owner/group root' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        owner => 'root',
-        group => 'root',
-        mode  => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it_behaves_like 'successfully_applied', pp
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 644 }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/01_1") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/02_2") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-    end
-  end
-
-  context 'owner/group non-root' do
-    before(:all) do
-      shell "groupadd -g 64444 bob"
-      shell "useradd -u 42 -g 64444 bob"
-    end
-    after(:all) do
-      shell "userdel bob"
-    end
-
-    pp="
-      concat { '/tmp/concat/file':
-        owner => 'bob',
-        group => 'bob',
-        mode  => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    "
-
-    it_behaves_like 'successfully_applied', pp
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should be_owned_by 'bob' }
-      it { should be_grouped_into 'bob' }
-      it { should be_mode 644 }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/01_1") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-      it { should contain '1' }
-    end
-    describe file("#{default['puppetvardir']}/concat/_tmp_concat_file/fragments/02_2") do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'root' }
-      it { should be_mode 640 }
-      it { should contain '2' }
-    end
-  end
-
-  context 'ensure' do
-    context 'works when set to present with path set' do
-      pp="
-        concat { 'file':
-          ensure => present,
-          path   => '/tmp/concat/file',
-          mode   => '0644',
-        }
-        concat::fragment { '1':
-          target  => 'file',
-          content => '1',
-          order   => '01',
-        }
-      "
-
-      it_behaves_like 'successfully_applied', pp
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should be_mode 644 }
-        it { should contain '1' }
-      end
-    end
-    context 'works when set to absent with path set' do
-      pp="
-        concat { 'file':
-          ensure => absent,
-          path   => '/tmp/concat/file',
-          mode   => '0644',
-        }
-        concat::fragment { '1':
-          target  => 'file',
-          content => '1',
-          order   => '01',
-        }
-      "
-
-      # Can't used shared examples as this will always trigger the exec when
-      # absent is set.
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should_not be_file }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb
deleted file mode 100644
index f139d818c6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/deprecation_warnings_spec.rb
+++ /dev/null
@@ -1,230 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'deprecation warnings' do
-
-  shared_examples 'has_warning'do |pp, w|
-    it 'applies the manifest twice with a stderr regex' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/#{Regexp.escape(w)}/m)
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to match(/#{Regexp.escape(w)}/m)
-    end
-  end
-
-  context 'concat gnu parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        gnu => 'foo',
-      }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-      }
-    EOS
-    w = 'The $gnu parameter to concat is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat warn parameter =>' do
-    ['true', 'yes', 'on'].each do |warn|
-      context warn do
-        pp = <<-EOS
-          concat { '/tmp/concat/file':
-            warn => '#{warn}',
-          }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'bar',
-          }
-        EOS
-        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
-
-        it_behaves_like 'has_warning', pp, w
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should contain '# This file is managed by Puppet. DO NOT EDIT.' }
-          it { should contain 'bar' }
-        end
-      end
-    end
-
-    ['false', 'no', 'off'].each do |warn|
-      context warn do
-        pp = <<-EOS
-          concat { '/tmp/concat/file':
-            warn => '#{warn}',
-          }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'bar',
-          }
-        EOS
-        w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
-
-        it_behaves_like 'has_warning', pp, w
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should_not contain '# This file is managed by Puppet. DO NOT EDIT.' }
-          it { should contain 'bar' }
-        end
-      end
-    end
-  end
-
-  context 'concat::fragment ensure parameter' do
-    context 'target file exists' do
-      before(:all) do
-        shell("/bin/echo 'file1 contents' > /tmp/concat/file1")
-      end
-      after(:all) do
-        # XXX this test may leave behind a symlink in the fragment directory
-        # which could cause warnings and/or breakage from the subsequent tests
-        # unless we clean it up. 
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-        shell('mkdir -p /tmp/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file': }
-        concat::fragment { 'foo':
-          target => '/tmp/concat/file',
-          ensure => '/tmp/concat/file1',
-        }
-      EOS
-      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
-
-      it_behaves_like 'has_warning', pp, w
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain 'file1 contents' }
-      end
-
-      describe 'the fragment can be changed from a symlink to a plain file' do
-        pp = <<-EOS
-          concat { '/tmp/concat/file': }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'new content',
-          }
-        EOS
-
-        it 'applies the manifest twice with no stderr' do
-          expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-          expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-        end
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should contain 'new content' }
-          it { should_not contain 'file1 contents' }
-        end
-      end
-    end # target file exists
-
-    context 'target does not exist' do
-      pp = <<-EOS
-        concat { '/tmp/concat/file': }
-        concat::fragment { 'foo':
-          target => '/tmp/concat/file',
-          ensure => '/tmp/concat/file1',
-        }
-      EOS
-      w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
-
-      it_behaves_like 'has_warning', pp, w
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-      end
-
-      describe 'the fragment can be changed from a symlink to a plain file' do
-        pp = <<-EOS
-          concat { '/tmp/concat/file': }
-          concat::fragment { 'foo':
-            target  => '/tmp/concat/file',
-            content => 'new content',
-          }
-        EOS
-
-        it 'applies the manifest twice with no stderr' do
-          expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-          expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-        end
-
-        describe file('/tmp/concat/file') do
-          it { should be_file }
-          it { should contain 'new content' }
-        end
-      end
-    end # target file exists
-
-  end # concat::fragment ensure parameter
-
-  context 'concat::fragment mode parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        mode    => 'bar',
-      }
-    EOS
-    w = 'The $mode parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat::fragment owner parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        owner   => 'bar',
-      }
-    EOS
-    w = 'The $owner parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat::fragment group parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        group   => 'bar',
-      }
-    EOS
-    w = 'The $group parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'concat::fragment backup parameter' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file': }
-      concat::fragment { 'foo':
-        target  => '/tmp/concat/file',
-        content => 'bar',
-        backup  => 'bar',
-      }
-    EOS
-    w = 'The $backup parameter to concat::fragment is deprecated and has no effect'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-  context 'include concat::setup' do
-    pp = <<-EOS
-      include concat::setup
-    EOS
-    w = 'concat::setup is deprecated as a public API of the concat module and should no longer be directly included in the manifest.'
-
-    it_behaves_like 'has_warning', pp, w
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb
deleted file mode 100644
index 09995282a33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/empty_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat force empty parameter' do
-  context 'should run successfully' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        owner => root,
-        group => root,
-        mode  => '0644',
-        force => true,
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should_not contain '1\n2' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb
deleted file mode 100644
index 3afd53430db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/fragment_source_spec.rb
+++ /dev/null
@@ -1,134 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat::fragment source' do
-  context 'should read file fragments from local system' do
-    before(:all) do
-      shell("/bin/echo 'file1 contents' > /tmp/concat/file1")
-      shell("/bin/echo 'file2 contents' > /tmp/concat/file2")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/foo': }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        source  => '/tmp/concat/file1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string1 contents',
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/foo',
-        source  => '/tmp/concat/file2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain 'file1 contents' }
-      it { should contain 'string1 contents' }
-      it { should contain 'file2 contents' }
-    end
-  end # should read file fragments from local system
-
-  context 'should create files containing first match only.' do
-    before(:all) do
-      shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      shell('mkdir -p /tmp/concat')
-      shell("/bin/echo 'file1 contents' > /tmp/concat/file1")
-      shell("/bin/echo 'file2 contents' > /tmp/concat/file2")
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/result_file1':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-      concat { '/tmp/concat/result_file2':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-      concat { '/tmp/concat/result_file3':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/result_file1',
-        source => [ '/tmp/concat/file1', '/tmp/concat/file2' ],
-        order   => '01',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/result_file2',
-        source => [ '/tmp/concat/file2', '/tmp/concat/file1' ],
-        order   => '01',
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/result_file3',
-        source => [ '/tmp/concat/file1', '/tmp/concat/file2' ],
-        order   => '01',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-    describe file('/tmp/concat/result_file1') do
-      it { should be_file }
-      it { should contain 'file1 contents' }
-      it { should_not contain 'file2 contents' }
-    end
-    describe file('/tmp/concat/result_file2') do
-      it { should be_file }
-      it { should contain 'file2 contents' }
-      it { should_not contain 'file1 contents' }
-    end
-    describe file('/tmp/concat/result_file3') do
-      it { should be_file }
-      it { should contain 'file1 contents' }
-      it { should_not contain 'file2 contents' }
-    end
-  end
-
-  context 'should fail if no match on source.' do
-    before(:all) do
-      shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      shell('mkdir -p /tmp/concat')
-      shell('/bin/rm -rf /tmp/concat/fail_no_source /tmp/concat/nofilehere /tmp/concat/nothereeither')
-    end
-
-    pp = <<-EOS
-      concat { '/tmp/concat/fail_no_source':
-        owner   => root,
-        group   => root,
-        mode    => '0644',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/fail_no_source',
-        source => [ '/tmp/concat/nofilehere', '/tmp/concat/nothereeither' ],
-        order   => '01',
-      }
-    EOS
-
-    it 'applies the manifest with resource failures' do
-      apply_manifest(pp, :expect_failures => true)
-    end
-    describe file('/tmp/concat/fail_no_source') do
-      #FIXME: Serverspec::Type::File doesn't support exists? for some reason. so... hack.
-      it { should_not be_file }
-      it { should_not be_directory }
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb
deleted file mode 100644
index 1e989df2ab1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/newline_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat ensure_newline parameter' do
-  context '=> false' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        ensure_newline => false,
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain '12' }
-    end
-  end
-
-  context '=> true' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        ensure_newline => true,
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes  => true).stderr).to eq("")
-      #XXX ensure_newline => true causes changes on every run because the files
-      #are modified in place.
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain "1\n2\n" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml
deleted file mode 100644
index f0ae87a5c82..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/aix-71-vcloud.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-HOSTS:
-  pe-aix-71-acceptance:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-      - default
-    platform: aix-7.1-power
-    hypervisor: aix
-    ip: pe-aix-71-acceptance.delivery.puppetlabs.net
-CONFIG:
-  type: pe
-  nfs_server: NONE
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index 2ad90b86aab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index 4c8be42d033..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index 19181c123d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index 3e6a3a9dddf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  debian-73-x64.localhost:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index ae812b0aef9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64.localdomain:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml
deleted file mode 100644
index 554c37a505c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index cba1cd04c25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : puppetlabs/ubuntu-14.04-64-nocm
-    box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb
deleted file mode 100644
index 8bcb7131ce8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/order_spec.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat order' do
-  before(:all) do
-    shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-    shell('mkdir -p /tmp/concat')
-  end
-
-  context '=> alpha' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo':
-        order => 'alpha'
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-      }
-      concat::fragment { '10':
-        target  => '/tmp/concat/foo',
-        content => 'string10',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string10\nstring1\nsring2" }
-    end
-  end
-
-  context '=> numeric' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo':
-        order => 'numeric'
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-      }
-      concat::fragment { '10':
-        target  => '/tmp/concat/foo',
-        content => 'string10',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string1\nstring2\nsring10" }
-    end
-  end
-end # concat order
-
-describe 'concat::fragment order' do
-  before(:all) do
-    shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-    shell('mkdir -p /tmp/concat')
-  end
-
-  context '=> reverse order' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo': }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-        order   => '15',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-        # default order 10
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/foo',
-        content => 'string3',
-        order   => '1',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string3\nstring2\nsring1" }
-    end
-  end
-
-  context '=> normal order' do
-    pp = <<-EOS
-      concat { '/tmp/concat/foo': }
-      concat::fragment { '1':
-        target  => '/tmp/concat/foo',
-        content => 'string1',
-        order   => '01',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat/foo',
-        content => 'string2',
-        order   => '02'
-      }
-      concat::fragment { '3':
-        target  => '/tmp/concat/foo',
-        content => 'string3',
-        order   => '03',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/foo') do
-      it { should be_file }
-      it { should contain "string1\nstring2\nsring3" }
-    end
-  end
-end # concat::fragment order
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb
deleted file mode 100644
index af352efce83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/quoted_paths_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'quoted paths' do
-  before(:all) do
-    shell('rm -rf "/tmp/concat test" /var/lib/puppet/concat')
-    shell('mkdir -p "/tmp/concat test"')
-  end
-
-  context 'path with blanks' do
-    pp = <<-EOS
-      concat { '/tmp/concat test/foo':
-      }
-      concat::fragment { '1':
-        target  => '/tmp/concat test/foo',
-        content => 'string1',
-      }
-      concat::fragment { '2':
-        target  => '/tmp/concat test/foo',
-        content => 'string2',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat test/foo') do
-      it { should be_file }
-      it { should contain "string1\nsring2" }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb
deleted file mode 100644
index 7b31e09c440..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/replace_spec.rb
+++ /dev/null
@@ -1,241 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'replacement of' do
-  context 'file' do
-    context 'should not succeed' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('echo "file exists" > /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => false,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain 'file exists' }
-        it { should_not contain '1' }
-        it { should_not contain '2' }
-      end
-    end
-
-    context 'should succeed' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('echo "file exists" > /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => true,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should_not contain 'file exists' }
-        it { should contain '1' }
-        it { should contain '2' }
-      end
-    end
-  end # file
-
-  context 'symlink' do
-    context 'should not succeed' do
-      # XXX the core puppet file type will replace a symlink with a plain file
-      # when using ensure => present and source => ... but it will not when using
-      # ensure => present and content => ...; this is somewhat confusing behavior
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('ln -s /tmp/concat/dangling /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => false,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_linked_to '/tmp/concat/dangling' }
-      end
-
-      describe file('/tmp/concat/dangling') do
-        # XXX serverspec does not have a matcher for 'exists'
-        it { should_not be_file }
-        it { should_not be_directory }
-      end
-    end
-
-    context 'should succeed' do
-      # XXX the core puppet file type will replace a symlink with a plain file
-      # when using ensure => present and source => ... but it will not when using
-      # ensure => present and content => ...; this is somewhat confusing behavior
-      before(:all) do
-        shell('mkdir -p /tmp/concat')
-        shell('ln -s /tmp/concat/dangling /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          replace => true,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain '1' }
-        it { should contain '2' }
-      end
-    end
-  end # symlink
-
-  context 'directory' do
-    context 'should not succeed' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file': }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with stderr for changing to file' do
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_directory }
-      end
-    end
-
-    # XXX concat's force param currently enables the creation of empty files
-    # when there are no fragments, and the replace param will only replace
-    # files and symlinks, not directories.  The semantics either need to be
-    # changed, extended, or a new param introduced to control directory
-    # replacement.
-    context 'should succeed', :pending => 'not yet implemented' do
-      before(:all) do
-        shell('mkdir -p /tmp/concat/file')
-      end
-      after(:all) do
-        shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-      end
-
-      pp = <<-EOS
-        concat { '/tmp/concat/file':
-          force => true,
-        }
-
-        concat::fragment { '1':
-          target  => '/tmp/concat/file',
-          content => '1',
-        }
-
-        concat::fragment { '2':
-          target  => '/tmp/concat/file',
-          content => '2',
-        }
-      EOS
-
-      it 'applies the manifest twice with no stderr' do
-        expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-        expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-      end
-
-      describe file('/tmp/concat/file') do
-        it { should be_file }
-        it { should contain '1' }
-      end
-    end
-  end # directory
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb
deleted file mode 100644
index 7267f5e6b43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/symbolic_name_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'symbolic name' do
-  pp = <<-EOS
-    concat { 'not_abs_path':
-      path => '/tmp/concat/file',
-    }
-
-    concat::fragment { '1':
-      target  => 'not_abs_path',
-      content => '1',
-      order   => '01',
-    }
-
-    concat::fragment { '2':
-      target  => 'not_abs_path',
-      content => '2',
-      order   => '02',
-    }
-  EOS
-
-  it 'applies the manifest twice with no stderr' do
-    expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-    expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-  end
-
-  describe file('/tmp/concat/file') do
-    it { should be_file }
-    it { should contain '1' }
-    it { should contain '2' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb
deleted file mode 100644
index cb0b7430dc8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/acceptance/warn_spec.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'concat warn =>' do
-  context 'true should enable default warning message' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        warn  => true,
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain '# This file is managed by Puppet. DO NOT EDIT.' }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-  end
-  context 'false should not enable default warning message' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        warn  => false,
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should_not contain '# This file is managed by Puppet. DO NOT EDIT.' }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-  end
-  context '# foo should overide default warning message' do
-    pp = <<-EOS
-      concat { '/tmp/concat/file':
-        warn  => '# foo',
-      }
-
-      concat::fragment { '1':
-        target  => '/tmp/concat/file',
-        content => '1',
-        order   => '01',
-      }
-
-      concat::fragment { '2':
-        target  => '/tmp/concat/file',
-        content => '2',
-        order   => '02',
-      }
-    EOS
-
-    it 'applies the manifest twice with no stderr' do
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq("")
-      expect(apply_manifest(pp, :catch_changes => true).stderr).to eq("")
-    end
-
-    describe file('/tmp/concat/file') do
-      it { should be_file }
-      it { should contain '# foo' }
-      it { should contain '1' }
-      it { should contain '2' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 22bd72f06a5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
-  hosts.each do |host|
-    on hosts, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'concat')
-    hosts.each do |host|
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-
-  c.before(:all) do
-    shell('mkdir -p /tmp/concat')
-  end
-  c.after(:all) do
-    shell('rm -rf /tmp/concat /var/lib/puppet/concat')
-  end
-
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb
deleted file mode 100644
index bba455ab91d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/classes/concat_setup_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe 'concat::setup', :type => :class do
-
-  shared_examples 'setup' do |concatdir|
-    concatdir = '/foo' if concatdir.nil?
-
-    let(:facts) {{ :concat_basedir => concatdir }}
-
-    it do
-      should contain_file("#{concatdir}/bin/concatfragments.sh").with({
-        :mode   => '0755',
-        :source => 'puppet:///modules/concat/concatfragments.sh',
-        :backup => false,
-      })
-    end
-
-    [concatdir, "#{concatdir}/bin"].each do |file|
-      it do
-        should contain_file(file).with({
-          :ensure => 'directory',
-          :mode   => '0755',
-          :backup => false,
-        })
-      end
-    end
-  end
-
-  context 'facts' do
-    context 'concat_basedir =>' do
-      context '/foo' do
-        it_behaves_like 'setup', '/foo'
-      end
-    end
-  end # facts
-
-  context 'deprecated as a public class' do
-    it 'should create a warning' do
-      pending('rspec-puppet support for testing warning()')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb
deleted file mode 100644
index 3b5269e8d56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_fragment_spec.rb
+++ /dev/null
@@ -1,267 +0,0 @@
-require 'spec_helper'
-
-describe 'concat::fragment', :type => :define do
-
-  shared_examples 'fragment' do |title, params|
-    params = {} if params.nil?
-
-    p = {
-      :content => nil,
-      :source  => nil,
-      :order   => 10,
-      :ensure  => 'present',
-    }.merge(params)
-
-    safe_name        = title.gsub(/[\/\n]/, '_')
-    safe_target_name = p[:target].gsub(/[\/\n]/, '_')
-    concatdir        = '/var/lib/puppet/concat'
-    fragdir          = "#{concatdir}/#{safe_target_name}"
-    id               = 'root'
-    if p[:ensure] == 'absent'
-      safe_ensure = p[:ensure] 
-    else
-      safe_ensure = 'file'
-    end
-
-    let(:title) { title }
-    let(:facts) {{ :concat_basedir => concatdir, :id => id }}
-    let(:params) { params }
-    let(:pre_condition) do
-      "concat{ '#{p[:target]}': }"
-    end
-
-    it do
-      should contain_class('concat::setup')
-      should contain_concat(p[:target])
-      should contain_file("#{fragdir}/fragments/#{p[:order]}_#{safe_name}").with({
-        :ensure  => safe_ensure,
-        :owner   => id,
-        :mode    => '0640',
-        :source  => p[:source],
-        :content => p[:content],
-        :alias   => "concat_fragment_#{title}",
-        :backup  => false,
-      })
-    end
-  end
-
-  context 'title' do
-    ['0', '1', 'a', 'z'].each do |title|
-      it_behaves_like 'fragment', title, {
-        :target  => '/etc/motd',
-      }
-    end
-  end # title
-
-  context 'target =>' do
-    ['./etc/motd', 'etc/motd', 'motd_header'].each do |target|
-      context target do
-        it_behaves_like 'fragment', target, {
-          :target  => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :target => false }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # target =>
-
-  context 'ensure =>' do
-    ['present', 'absent'].each do |ens|
-      context ens do
-        it_behaves_like 'fragment', 'motd_header', {
-          :ensure => ens,
-          :target => '/etc/motd',
-        }
-      end
-    end
-
-    context 'any value other than \'present\' or \'absent\'' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :ensure => 'invalid', :target => '/etc/motd' }}
-
-      it 'should create a warning' do
-        pending('rspec-puppet support for testing warning()')
-      end
-    end
-  end # ensure =>
-
-  context 'content =>' do
-    ['', 'ashp is our hero'].each do |content|
-      context content do
-        it_behaves_like 'fragment', 'motd_header', {
-          :content => content,
-          :target  => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :content => false, :target => '/etc/motd' }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # content =>
-
-  context 'source =>' do
-    ['', '/foo/bar', ['/foo/bar', '/foo/baz']].each do |source|
-      context source do
-        it_behaves_like 'fragment', 'motd_header', {
-          :source => source,
-          :target => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :source => false, :target => '/etc/motd' }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string or an Array/)
-      end
-    end
-  end # source =>
-
-  context 'order =>' do
-    ['', '42', 'a', 'z'].each do |order|
-      context '\'\'' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :order  => order,
-          :target => '/etc/motd',
-        }
-      end
-    end
-
-    context 'false' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) {{ :order => false, :target => '/etc/motd' }}
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # order =>
-
-  context 'more than one content source' do
-    error_msg = 'You cannot specify more than one of $content, $source, $ensure => /target'
-
-    context 'ensure => target and source' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) do
-        {
-          :target  => '/etc/motd',
-          :ensure  => '/foo',
-          :source  => '/bar',
-        }
-      end
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
-      end
-    end
-
-    context 'ensure => target and content' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) do
-        {
-          :target  => '/etc/motd',
-          :ensure  => '/foo',
-          :content => 'bar',
-        }
-      end
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
-      end
-    end
-
-    context 'source and content' do
-      let(:title) { 'motd_header' }
-      let(:facts) {{ :concat_basedir => '/tmp' }}
-      let(:params) do
-        {
-          :target => '/etc/motd',
-          :source => '/foo',
-          :content => 'bar',
-        }
-      end
-
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape(error_msg)}/m)
-      end
-    end
-
-  end # more than one content source
-
-  describe 'deprecated parameter' do
-    context 'mode =>' do
-      context '1755' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :mode   => '1755',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # mode =>
-
-    context 'owner =>' do
-      context 'apenny' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :owner  => 'apenny',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # owner =>
-
-    context 'group =>' do
-      context 'apenny' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :group  => 'apenny',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # group =>
-
-    context 'backup =>' do
-      context 'foo' do
-        it_behaves_like 'fragment', 'motd_header', {
-          :backup => 'foo',
-          :target => '/etc/motd',
-        }
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end # backup =>
-  end # deprecated params
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb
deleted file mode 100644
index 9fdd7b26f12..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/defines/concat_spec.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-require 'spec_helper'
-
-describe 'concat', :type => :define do
-
-  shared_examples 'concat' do |title, params, id| 
-    params = {} if params.nil?
-    id = 'root' if id.nil?
-
-    # default param values
-    p = {
-      :ensure         => 'present',
-      :path           => title,
-      :owner          => nil,
-      :group          => nil,
-      :mode           => '0644',
-      :warn           => false,
-      :force          => false,
-      :backup         => 'puppet',
-      :replace        => true,
-      :order          => 'alpha',
-      :ensure_newline => false,
-    }.merge(params)
-
-    safe_name            = title.gsub('/', '_')
-    concatdir            = '/var/lib/puppet/concat'
-    fragdir              = "#{concatdir}/#{safe_name}"
-    concat_name          = 'fragments.concat.out'
-    default_warn_message = '# This file is managed by Puppet. DO NOT EDIT.'
-
-    file_defaults = {
-      :backup  => false,
-    }
-
-    let(:title) { title }
-    let(:params) { params }
-    let(:facts) {{ :concat_basedir => concatdir, :id => id }}
-
-    if p[:ensure] == 'present'
-      it do
-        should contain_file(fragdir).with(file_defaults.merge({
-          :ensure => 'directory',
-          :mode   => '0750',
-        }))
-      end
-
-      it do
-        should contain_file("#{fragdir}/fragments").with(file_defaults.merge({
-          :ensure  => 'directory',
-          :mode    => '0750',
-          :force   => true,
-          :ignore  => ['.svn', '.git', '.gitignore'],
-          :purge   => true,
-          :recurse => true,
-        }))
-      end
-
-      [
-        "#{fragdir}/fragments.concat",
-        "#{fragdir}/#{concat_name}",
-      ].each do |file|
-        it do
-          should contain_file(file).with(file_defaults.merge({
-            :ensure => 'present',
-            :mode   => '0640',
-          }))
-        end
-      end
-
-      it do
-        should contain_file(title).with(file_defaults.merge({
-          :ensure  => 'present',
-          :owner   => p[:owner],
-          :group   => p[:group],
-          :mode    => p[:mode],
-          :replace => p[:replace],
-          :path    => p[:path],
-          :alias   => "concat_#{title}",
-          :source  => "#{fragdir}/#{concat_name}",
-          :backup  => p[:backup],
-        }))
-      end
-
-      cmd = "#{concatdir}/bin/concatfragments.sh " +
-            "-o \"#{concatdir}/#{safe_name}/fragments.concat.out\" " +
-            "-d \"#{concatdir}/#{safe_name}\""
-
-      # flag order: fragdir, warnflag, forceflag, orderflag, newlineflag 
-      if p.has_key?(:warn)
-        case p[:warn]
-        when TrueClass
-          message = default_warn_message
-        when 'true', 'yes', 'on'
-          # should generate a stringified boolean warning
-          message = default_warn_message
-        when FalseClass
-          message = nil
-        when 'false', 'no', 'off'
-          # should generate a stringified boolean warning
-          message = nil
-        else
-          message = p[:warn]
-        end
-
-        unless message.nil?
-          cmd += " -w \'#{message}\'"
-        end
-      end
-
-      cmd += " -f" if p[:force]
-      cmd += " -n" if p[:order] == 'numeric'
-      cmd += " -l" if p[:ensure_newline] == true
-
-      it do
-        should contain_exec("concat_#{title}").with({
-          :alias   => "concat_#{fragdir}",
-          :command => cmd,
-          :unless  => "#{cmd} -t",
-        })
-      end
-    else
-      [
-        fragdir,
-        "#{fragdir}/fragments",
-        "#{fragdir}/fragments.concat",
-        "#{fragdir}/#{concat_name}",
-      ].each do |file|
-        it do
-          should contain_file(file).with(file_defaults.merge({
-            :ensure => 'absent',
-            :backup => false,
-            :force  => true,
-          }))
-        end
-      end
-
-      it do
-        should contain_file(title).with(file_defaults.merge({
-          :ensure => 'absent',
-          :backup => p[:backup],
-        }))
-      end
-
-      it do
-        should contain_exec("concat_#{title}").with({
-          :alias   => "concat_#{fragdir}",
-          :command => 'true',
-          :path    => '/bin:/usr/bin',
-        })
-      end
-    end
-  end
-
-  context 'title' do
-    context 'without path param' do
-      # title/name is the default value for the path param. therefore, the
-      # title must be an absolute path unless path is specified
-      ['/foo', '/foo/bar', '/foo/bar/baz'].each do |title|
-        context title do
-          it_behaves_like 'concat', '/etc/foo.bar'
-        end
-      end
-
-      ['./foo', 'foo', 'foo/bar'].each do |title|
-        context title do
-          let(:title) { title }
-          it 'should fail' do
-            expect { should }.to raise_error(Puppet::Error, /is not an absolute path/)
-          end
-        end
-      end
-    end
-
-    context 'with path param' do
-      ['./foo', 'foo', 'foo/bar'].each do |title|
-        context title do
-          it_behaves_like 'concat', title, { :path => '/etc/foo.bar' }
-        end
-      end
-    end
-  end # title =>
-
-  context 'as non-root user' do
-    it_behaves_like 'concat', '/etc/foo.bar', {}, 'bob'
-  end
-
-  context 'ensure =>' do
-    ['present', 'absent'].each do |ens|
-      context ens do
-        it_behaves_like 'concat', '/etc/foo.bar', { :ensure => ens }
-      end
-    end
-
-    context 'invalid' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :ensure => 'invalid' }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape('does not match "^present$|^absent$"')}/)
-      end
-    end
-  end # ensure =>
-
-  context 'path =>' do
-    context '/foo' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :path => '/foo' }
-    end
-
-    ['./foo', 'foo', 'foo/bar', false].each do |path|
-      context path do
-        let(:title) { '/etc/foo.bar' }
-        let(:params) {{ :path => path }}
-        it 'should fail' do
-          expect { should }.to raise_error(Puppet::Error, /is not an absolute path/)
-        end
-      end
-    end
-  end # path =>
-
-  context 'owner =>' do
-    context 'apenney' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :owner => 'apenny' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :owner => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # owner =>
-
-  context 'group =>' do
-    context 'apenney' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :group => 'apenny' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :group => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # group =>
-
-  context 'mode =>' do
-    context '1755' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :mode => '1755' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :mode => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # mode =>
-
-  context 'warn =>' do
-    [true, false, '# foo'].each do |warn|
-      context warn do
-        it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn }
-      end
-    end
-
-    context '(stringified boolean)' do
-      ['true', 'yes', 'on', 'false', 'no', 'off'].each do |warn|
-        context warn do
-          it_behaves_like 'concat', '/etc/foo.bar', { :warn => warn }
-
-          it 'should create a warning' do
-            pending('rspec-puppet support for testing warning()')
-          end
-        end
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :warn => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string or boolean/)
-      end
-    end
-  end # warn =>
-
-  context 'force =>' do
-    [true, false].each do |force|
-      context force do
-        it_behaves_like 'concat', '/etc/foo.bar', { :force => force }
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :force => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-  end # force =>
-
-  context 'backup =>' do
-    context 'reverse' do
-      it_behaves_like 'concat', '/etc/foo.bar', { :backup => 'reverse' }
-    end
-
-    context 'false' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :backup => false }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a string/)
-      end
-    end
-  end # backup =>
-
-  context 'replace =>' do
-    [true, false].each do |replace|
-      context replace do
-        it_behaves_like 'concat', '/etc/foo.bar', { :replace => replace }
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :replace => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-  end # replace =>
-
-  context 'order =>' do
-    ['alpha', 'numeric'].each do |order|
-      context order do
-        it_behaves_like 'concat', '/etc/foo.bar', { :order => order }
-      end
-    end
-
-    context 'invalid' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :order => 'invalid' }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /#{Regexp.escape('does not match "^alpha$|^numeric$"')}/)
-      end
-    end
-  end # order =>
-
-  context 'ensure_newline =>' do
-    [true, false].each do |ensure_newline|
-      context 'true' do
-        it_behaves_like 'concat', '/etc/foo.bar', { :ensure_newline => ensure_newline}
-      end
-    end
-
-    context '123' do
-      let(:title) { '/etc/foo.bar' }
-      let(:params) {{ :ensure_newline => 123 }}
-      it 'should fail' do
-        expect { should }.to raise_error(Puppet::Error, /is not a boolean/)
-      end
-    end
-  end # ensure_newline =>
-
-  describe 'deprecated parameter' do
-    context 'gnu =>' do
-      context 'foo' do
-        it_behaves_like 'concat', '/etc/foo.bar', { :gnu => 'foo'}
-
-        it 'should create a warning' do
-          pending('rspec-puppet support for testing warning()')
-        end
-      end
-    end
-  end
-
-end
-
-# vim:sw=2:ts=2:expandtab:textwidth=79
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb
deleted file mode 100644
index 41bc90f1594..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/spec/unit/facts/concat_basedir_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'concat_basedir', :type => :fact do
-  before(:each) { Facter.clear }
-
-  context 'Puppet[:vardir] ==' do
-    it '/var/lib/puppet' do
-      Puppet.stubs(:[]).with(:vardir).returns('/var/lib/puppet')
-      Facter.fact(:concat_basedir).value.should == '/var/lib/puppet/concat'
-    end
-
-    it '/home/apenny/.puppet/var' do
-      Puppet.stubs(:[]).with(:vardir).returns('/home/apenny/.puppet/var')
-      Facter.fact(:concat_basedir).value.should == '/home/apenny/.puppet/var/concat'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/fragment.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/fragment.pp
deleted file mode 100644
index a2dfaca2905..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/fragment.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-concat { 'testconcat':
-  ensure => present,
-  path   => '/tmp/concat',
-  owner  => 'root',
-  group  => 'root',
-  mode   => '0664',
-}
-
-concat::fragment { '1':
-  target  => 'testconcat',
-  content => '1',
-  order   => '01',
-}
-
-concat::fragment { '2':
-  target  => 'testconcat',
-  content => '2',
-  order   => '02',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/init.pp
deleted file mode 100644
index fd21427180f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/concat/tests/init.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-concat { '/tmp/concat':
-  ensure => present,
-  force  => true,
-  owner  => 'root',
-  group  => 'root',
-  mode   => '0644',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/Puppetfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/Puppetfile
deleted file mode 100644
index 42968dff1bf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/Puppetfile
+++ /dev/null
@@ -1,6 +0,0 @@
-forge "http://forge.puppetlabs.com"
-
-mod 'php', :git => 'https://github.com/puphpet/puppet-php.git'
-mod 'composer', :git => 'https://github.com/puphpet/puppet-composer.git'
-mod 'puphpet', :git => 'https://github.com/puphpet/puppet-puphpet.git'
-mod 'puppi', :git => 'https://github.com/puphpet/puppi.git'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/README b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/README
deleted file mode 100644
index d546e570ab3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/README
+++ /dev/null
@@ -1,226 +0,0 @@
-DRUSH PUPPET MODULE
-===================
-
-This module manages Drush, a command line shell and scripting interface for
-Drupal.
-
-It can install and upgrade Drush from Debian packages or source, as well as
-download, enable and disable Drupal modules and themes, build codebases from
-Drush makefiles, run arbitrary Drush commands and optionally log its output.
-
-
-DEPENDENCIES
-------------
-
-None.
-
-
-REQUIREMENTS
-------------
-
-The Drush Puppet module is designed to work on Debian GNU/Linux systems and
-derivatives. It provides rudimentary support for apt-get, but defaults to
-letting the OS's default packaging system handle installation. As such, it
-should work with other *nix systems, assuming Drush is available for install
-in the OS's packaging system, or Drush is installed from source using the
-provided 'drush::git' class.
-
-
-INSTALLATION
-------------
-
-To use this module, follow these directions:
-
-1. Your modules directory will need all the files included in this
-   repository placed under a directory called "drush".
-
-2. To install Drush, add one of these entries to your manifests (such as in
-   manifests/nodes.pp):
-
-       include drush
-
-   or
-
-       class {'drush':
-         ensure => latest,
-       }
-
-  The following parameters are available:
-
-    api: The major version of Drush to install. Currently supports '4' or '5'.
-    dist: The Debian distribution from which to install via apt-get. Defaults
-        to 'stable'. Set to false to suppres adding custom sources for install
-        via apt-get.
-    ensure: What state the package should be in. Valid values are 'present'
-        (also called 'installed'), 'absent', 'purged', 'held', of 'latest'.
-
-2a. To install Drush from source, add one of these entries to your manifests:
-
-       include drush::git::drush
-
-   or
-
-       class {'drush::git::drush':
-         git_branch => '8.x-6.x',
-         update     => true,
-       }
-
-
-  The following parameters are available:
-
-    git_branch: The git branch to track.
-    git_tag: The git tag to check out.
-    git_url: The git URL from which to clone the repository.
-    update: Whether to update to the latest code with each Puppet run.
-        Defaults to false.
-
-
-USAGE
------
-
-1. To run a Drush command, use the drush::run defined type like so:
-
-       drush::run { '@dev uli --uid=42': }
-
-  The following parameters are all optional:
-
-    command: The command to run. Defaults to the name of the resource.
-    site_alias: The alias against which to run the command.
-    options: Options to pass to Drush.
-    arguments: Arguments to pass to the command.
-    site_path: The path to the site or code-base in which to run the command.
-    drush_user: The user under which to execute the command.
-    drush_home: Set the drush_user's home directory, for alias search paths.
-    log: Path to the logfile in which to log all Drush output.
-    creates, unless, onlyif, refreshonly: Control whether the command is
-        executed at each Puppet run. Identical to these paramaters on the
-        built-in 'exec' resource.
-    timeout: The maximum time the command should take, specified in seconds.
-        Defaults to 300 seconds. Disable the timeout by setting to 0.
-    paths: provide alternative paths to search for your Drush executable.
-
-2. To download projects from drupal.org to a site, add lines such as the
-   following to your manifests:
-
-       drush::dl {'token':
-         site_path => '/var/aegir/platforms/drupal/sites/example.com',
-         log       => '/var/aegir/drush.log',
-       }
-
-  The following parameters are all optional:
-
-    type: The type of package to download. Defaults to 'module'.
-    version: The version of the package to download.
-    site_path: Operates the same as for drush::run. Set this parameter to avoid
-        having a package downloaded repeatedly, as it will allow Puppet to see
-        whether it already exists. Alternatively, do not set this parameter to
-        have the package continuously updated.
-    site_alias, options, arguments, drush_user, drush_home, log: All operate
-        the same as for drush::run.
-
-3. To enable or disable projects on a Drupal site, add lines such as the following to your
-   manifests:
-
-       drush::en {'token':
-         site_alias => '@www.example.com',
-       }
-
-       drush::dis {'@prod devel, devel-generate':}
-
-  The following parameters are all optional:
-
-    site_alias, options, arguments, site_path, drush_user, drush_home, log: All
-        operate the same as for drush::run.
-
-4. To display the status of a site in your Puppet log, add lines such as the
-   following to your manifests:
-
-       drush::dis {'@prod status':
-         options => '--full',
-       }
-
-  The following parameters are all optional:
-
-    site_alias, options, arguments, site_path, drush_user, drush_home, log: All
-        operate the same as for drush::run.
-
-
-5. To build a Drupal code-base using Drush Make, add lines such as the following to your
-   manifests:
-
-       drush::make {'/var/aegir/platform/Drupal7':
-         makefile => '/var/aegir/makefiles/drupal7.make',
-       }
-
-  There is one required parameter:
-
-    makefile: The path to the makefile to use in building the code-base.
-
-  The following parameters are all optional:
-
-    make_path: The path to build the code-base. Defaults to the name of the
-        resource.
-    options, drush_user, drush_home, log: All operate the same as for
-        drush::run.
-
-
-6. The module also provides a simple way to clone git repos and keep them up-
-   to-date:
-
-       drush::git { 'git://git.drupal.org:project/provision':
-         path => '/var/aegir/.drush',
-       }
-
-  There is one required parameter:
-
-    path: Where to clone the git repo.
-
-  The following parameters are all optional:
-
-    git_branch: The git branch to checkout. 
-    git_tag: The git tag to check out. Overrides 'branch' if also specified.
-    git_repo: The git repository to clone. Defaults to the resource name.
-    dir_name: The name of the directory in which to clone the git repo.
-    update: Run 'git pull -r' in this repo on every Puppet run.
-    paths: Alternative search paths for your git binary.
-
-
-DEVELOPING
-----------
-
-The drush::run defined type provides a basis on which to build pretty much any
-Drush command imagineable. The other provided commands build upon it to provide
-convenience resources for common use-cases. While quite simple, they should
-form a good basis for creating your own custom defined types.
-
-For more complex examples, take a look at the puppet-aegir module, which
-extends this API further in the context of the Aegir Hosting System. It can be
-found at:
-
-    https://drupal.org/project/puppet-aegir
-
-Along similar lines, Skynet takes this way too far:
-
-    https://drupal.org/project/skynet
-
-The drush::git resource is a minimalist general-purpose function to allow
-cloning and updating git repositories. It is not intended to be a full-featured
-git class/resource. It will not attempt to install git for you either, but this
-should be sufficient:
-
-    package {'git':}
-
-This Puppet module is published under the GNU GPLv2 (General Public License,
-Version 2), and as such is, and will always remain, Free Software. Engagement
-in the development process by users and other developers is very much appreci-
-ated. So, please feel free to post to the issue queue, submit bug reports and
-feature requests, and ask questions about how to use or extend it.
-
-
--------------------------------------------------------------------------------
-Current maintainers: Christopher Gervais (mailto:chris@praxis.coop)
-                     Guillaume Boudrias (mailto:gboudrias@praxis.coop)
-Original authors: Christopher Gervais (mailto:chris@koumbit.org)
-                  Antoine Beaupré (mailto:anarcat@koumbit.org)
-Copyright:: Copyright (c) 2011-2013 Réseau Koumbit Networks
-License::   GPLv2 or later
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/apt.pp
deleted file mode 100644
index 8d7ff585614..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/apt.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-class drush::apt ( $dist = false, $backports = false) {
-
-  if $backports {
-    file { "/etc/apt/preferences.d/drush-${backports}.pref":
-      ensure  => 'present',
-      content => "Package: drush\nPin: release a=${backports}-backports\nPin-Priority: 1001\n",
-      owner   => root, group => root, mode => '0644',
-      notify  => Exec['drush_update_apt'],
-    }
-    file { "/etc/apt/sources.list.d/drush-${backports}-backports.list" :
-      ensure  => 'present',
-      content => "deb http://backports.debian.org/debian-backports ${backports}-backports main",
-      owner   => root, group => root, mode => '0644',
-      notify  => Exec['drush_update_apt'],
-    }
-  }
-  else {
-    file { [
-      "/etc/apt/preferences.d/drush-${backports}.pref",
-      "/etc/apt/sources.list.d/drush-${backports}-backports.list",
-    ]:
-      ensure => 'absent',
-      notify  => Exec['drush_update_apt'],
-    }
-  }
-
-  if $dist {
-    file { "/etc/apt/sources.list.d/drush-${dist}.list" :
-      ensure  => 'present',
-      content => "deb http://ftp.debian.org/debian ${dist} main",
-      owner   => root, group => root, mode => '0644',
-      notify  => Exec['drush_update_apt'],
-      before  => Exec['drush_apt_update'],
-    }
-  }
-
-  exec { 'drush_update_apt':
-    command     => 'apt-get update & sleep 1',
-    path        => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
-    refreshonly => true,
-  }
-
-  exec { 'drush_apt_update':
-    command  => 'apt-get update && /usr/bin/apt-get autoclean',
-    path     => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ],
-    schedule => daily,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dis.pp
deleted file mode 100644
index 9cbf1bcaabc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dis.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-define drush::dis (
-  $site_alias = $drush::params::site_alias,
-  $options    = $drush::params::options,
-  $arguments  = $drush::params::arguments,
-  $site_path  = $drush::params::site_path,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  if $arguments { $real_args = $arguments }
-  else { $real_args = $name }
-
-  drush::run {"drush-dis:${name}":
-    command    => 'pm-disable',
-    site_alias => $site_alias,
-    options    => $options,
-    arguments  => $real_args,
-    site_path  => $site_path,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dl.pp
deleted file mode 100644
index 89a9a290599..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/dl.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-define drush::dl (
-  $type       = 'module',
-  $site_alias = $drush::params::site_alias,
-  $options    = $drush::params::options,
-  $arguments  = $drush::params::arguments,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  if $arguments { $real_args = $arguments }
-  else { $real_args = "${name}" }
-
-  # Always download drush extensions without a site alias.
-  if $type == 'extension' { $real_alias = '@none' }
-  else { $real_alias = "${site_alias}" }
-
-  drush::run {"drush-dl:${name}":
-    command    => 'pm-download',
-    site_alias => $real_alias,
-    options    => $options,
-    arguments  => $real_args,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-  }
-
-  # Add an 'unless' argument depending on the project type.
-  case $type {
-    'module', 'theme': {
-      Drush::Run["drush-dl:${name}"] {
-        unless => "drush ${site_alias} pm-list | grep ${name}",
-      }
-    }
-    'extension': {
-      Drush::Run["drush-dl:${name}"] {
-        unless => "[ -d '${drush_home}/.drush/${name}' ]",
-      }
-    }
-  }
-
-  if defined(Drush::Run["drush-en:${name}"]) {
-    Drush::Run["drush-dl:${name}"] {
-      before +> Exec["drush-en:${name}"],
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/en.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/en.pp
deleted file mode 100644
index 036074968f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/en.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-define drush::en (
-  $site_alias  = $drush::params::site_alias,
-  $options     = $drush::params::options,
-  $arguments   = $drush::params::arguments,
-  $drush_user  = $drush::params::drush_user,
-  $drush_home  = $drush::params::drush_home,
-  $log         = $drush::params::log,
-  $refreshonly = false
-  ) {
-
-  if $arguments { $real_args = $arguments }
-  else { $real_args = $name }
-
-  drush::run {"drush-en:${name}":
-    command     => 'pm-enable',
-    site_alias  => $site_alias,
-    options     => $options,
-    arguments   => $real_args,
-    drush_user  => $drush_user,
-    drush_home  => $drush_home,
-    refreshonly => $refreshonly,
-    log         => $log,
-    unless      => "drush ${site_alias} pm-list --status=enabled | grep ${name}",
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git.pp
deleted file mode 100644
index dc0598121bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-define drush::git (
-  $path,
-  $git_branch = '',
-  $git_tag    = '',
-  $git_repo   = false,
-  $dir_name   = false,
-  $update     = false,
-  $paths      = $drush::params::paths,
-  $user       = 'root',
-  ) {
-
-  # Default to the resource name if no explicit git repo is provided.
-  if $git_repo { $real_git_repo = $git_repo }
-  else         { $real_git_repo = $name }
-
-  # Figure out the path and directory name.
-  if $dir_name {
-    $real_path = "${path}/${dir_name}"
-    $real_dir  = $dir_name
-  }
-  else {
-    # Figure out the name of the cloned into directory from the git repo.
-    $repo_array   = split($real_git_repo, '[/]')
-    $last_element = $repo_array[-1]
-    $real_dir     = regsubst($last_element, '\.git$', '')
-    $real_path    = "${path}/${real_dir}"
-  }
-
-  exec {"drush-clone-repo:${name}":
-    command => "git clone ${real_git_repo} ${real_dir}",
-    creates => $real_path,
-    cwd     => $path,
-    user    => $user,
-    path    => $paths,
-    timeout => 0,
-  }
-
-  # The specific (tag) overrides the general (branch).
-  if $git_tag { $git_ref = $git_tag }
-  else        { $git_ref = $git_branch }
-
-  if $git_ref {
-    exec {"drush-checkout-ref:${name}":
-      command => "git checkout ${git_ref}",
-      cwd     => $real_path,
-      path    => $paths,
-      require => Exec["drush-clone-repo:${name}"],
-    }
-  }
-
-  if $update {
-    exec {"drush-update-repo:${name}":
-      command => 'git pull -r',
-      cwd     => $real_path,
-      path    => $paths,
-      require => Exec["drush-clone-repo:${name}"],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git/drush.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git/drush.pp
deleted file mode 100644
index 36680c63f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/git/drush.pp
+++ /dev/null
@@ -1,61 +0,0 @@
-class drush::git::drush (
-  $git_branch = '',
-  $git_tag    = '',
-  $git_repo   = 'https://github.com/drush-ops/drush.git',
-  $update     = false
-  ) inherits drush::params {
-
-  include php::params
-
-  Exec { path => ['/bin', '/usr/bin', '/usr/local/bin', '/usr/share'], }
-
-  if ! defined(Package['git']) {
-    package { 'git':
-      ensure => present,
-      before => Drush::Git[$git_repo]
-    }
-  }
-
-  if ! defined(Class['composer']) {
-    class { 'composer':
-      target_dir      => '/usr/local/bin',
-      composer_file   => 'composer',
-      download_method => 'curl',
-      logoutput       => false,
-      tmp_path        => '/tmp',
-      php_package     => "${php::params::module_prefix}cli",
-      curl_package    => 'curl',
-      suhosin_enabled => false,
-    }
-  }
-
-  drush::git { $git_repo :
-    path       => '/usr/share',
-    git_branch => $git_branch,
-    git_tag    => $git_tag,
-    update     => $update,
-  }
-
-  composer::exec { 'drush':
-    cmd     => 'install',
-    cwd     => '/usr/share/drush',
-    require => Drush::Git[$git_repo],
-    notify  => File['symlink drush'],
-  }
-
-  file { 'symlink drush':
-    ensure  => link,
-    path    => '/usr/bin/drush',
-    target  => '/usr/share/drush/drush',
-    require => Composer::Exec['drush'],
-    notify  => Exec['first drush run'],
-  }
-
-  # Needed to download a Pear library
-  exec { 'first drush run':
-    command     => 'drush cache-clear drush',
-    refreshonly => true,
-    require     => File['symlink drush'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/init.pp
deleted file mode 100644
index 53325d537a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/init.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-class drush (
-  $api    = $drush::params::api,
-  $dist   = $drush::params::dist,
-  $ensure = $drush::params::ensure
-  ) inherits drush::params {
-
-  include drush::params
-
-  package { 'drush':
-    ensure  => $ensure,
-  }
-
-  case $operatingsystem {
-    /^(Debian|Ubuntu)$/: {
-      include drush::apt
-      Package['drush'] { require => Exec['drush_update_apt'] }
-    }
-  }
-
-  if $dist {
-
-    Package['drush'] { require => Class['drush::apt'] }
-
-    if $api == 4 { $backports = 'squeeze' }
-    else { $backports = '' }
-
-    class {'drush::apt':
-      dist => $dist,
-      backports => $backports,
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/make.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/make.pp
deleted file mode 100644
index e09efdfbb57..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/make.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-define drush::make (
-  $makefile,
-  $make_path  = false,
-  $options    = $drush::params::options,
-  $site_path  = $drush::params::site_path,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  if $make_path { $real_make_path = $make_path }
-  else { $real_make_path = $name }
-  $arguments = "${makefile} ${real_make_path}"
-
-  drush::run {"drush-make:${name}":
-    command    => 'make',
-    creates    => $make_path,
-    options    => $options,
-    arguments  => $arguments,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-    timeout    => 0,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/params.pp
deleted file mode 100644
index 1af2e4ae7cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/params.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-class drush::params {
-
-  case $::operatingsystem {
-    'centos', 'redhat': {
-      $php_cli_package = 'php-cli'
-    }
-    'ubuntu', 'debian': {
-      $php_cli_package = 'php5-cli'
-    }
-    default: {
-      fail('The puppet-drush module only supports RHEL and Debian systems')
-    }
-  }
-
-  $drush_user = 'root'
-  $drush_home = '/root'
-  $site_alias = '@none'
-  $options    = ''
-  $arguments  = ''
-  $api        = 5
-  $dist       = false
-  $ensure     = 'present'
-  $site_path  = false
-  $log        = false
-  $creates    = false
-  $paths      = [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ]
-
-  if defined(Class['drush::git::drush']) {
-    $installed = Class['drush::git::drush']
-  }
-  else {
-    $installed = Class['drush']
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/run.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/run.pp
deleted file mode 100644
index 2b6c1d255ed..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/run.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-define drush::run (
-  $command     = false,
-  $site_alias  = $drush::params::site_alias,
-  $options     = $drush::params::options,
-  $arguments   = $drush::params::arguments,
-  $site_path   = $drush::params::site_path,
-  $drush_user  = $drush::params::drush_user,
-  $drush_home  = $drush::params::drush_home,
-  $log         = $drush::params::log,
-  $installed   = $drush::params::installed,
-  $creates     = $drush::params::creates,
-  $paths       = $drush::params::paths,
-  $timeout     = false,
-  $unless      = false,
-  $onlyif      = false,
-  $refreshonly = false
-  ) {
-
-  if $log { $log_output = " >> ${log} 2>&1" }
-
-  if $command { $real_command = $command }
-  else { $real_command = $name}
-
-  exec {"drush-run:${name}":
-    command     => "drush ${site_alias} --yes ${options} ${real_command} ${arguments} ${log_output}",
-    user        => $drush_user,
-    group       => $drush_user,
-    path        => $paths,
-    environment => "HOME=${drush_home}",
-    require     => $installed,
-  }
-
-  if $site_path {
-    Exec["drush-run:${name}"] { cwd => $site_path }
-  }
-
-  if $creates {
-    Exec["drush-run:${name}"] { creates => $creates }
-  }
-
-  if $timeout {
-    Exec["drush-run:${name}"] { timeout => $timeout }
-  }
-
-  if $unless {
-    Exec["drush-run:${name}"] { unless => $unless }
-  }
-
-  if $onlyif {
-    Exec["drush-run:${name}"] { onlyif => $onlyif }
-  }
-
-  if $refreshonly {
-    Exec["drush-run:${name}"] { refreshonly => $refreshonly }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/status.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/status.pp
deleted file mode 100644
index 3f7784bd4b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/manifests/status.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-define drush::status (
-  $site_alias = $drush::params::site_alias,
-  $options    = $drush::params::options,
-  $arguments  = $drush::params::arguments,
-  $site_path  = $drush::params::site_path,
-  $drush_user = $drush::params::drush_user,
-  $drush_home = $drush::params::drush_home,
-  $log        = $drush::params::log
-  ) {
-
-  drush::run {"drush-status:${name}":
-    command    => 'core-status',
-    site_alias => $site_alias,
-    options    => $options,
-    arguments  => $arguments,
-    site_path  => $site_path,
-    drush_user => $drush_user,
-    drush_home => $drush_home,
-    log        => $log,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/.module b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/.module
deleted file mode 100644
index e430fc6c1d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/.module
+++ /dev/null
@@ -1 +0,0 @@
-drush
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile
deleted file mode 100644
index 6bb52efe911..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/Vagrantfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant::Config.run do |config|
-  config.vm.box = "Debian 6.0.7 x64"
-  config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210.box"
-
-  config.vm.provision :shell,
-    :path => "./tests/.ci/vagrant_test.sh"
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/test.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/test.sh
deleted file mode 100644
index 55ab628039f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/test.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-echo "Creating test environment..."
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e $SCRIPT_DIR/.module ]
-then
-  MODULE=`cat $SCRIPT_DIR/.module`
-else
-  echo "ERROR: The test script expects the name of the module to be in a file"
-  echo "       called '.module', in the same directory as the test script."
-  echo $SCRIPT_DIR
-  exit 1
-fi
-cd $SCRIPT_DIR
-cd ../..
-if [ -e manifests/init.pp ]
-then
-  MODULE_DIR=`pwd`
-else
-  echo "ERROR: The test script expects to be in <module_dir>/tests/.ci/, but"
-  echo "       cannot find the module's 'init.pp', from its current location."
-  echo $SCRIPT_DIR
-  exit 1
-fi
-rm -rf /tmp/$MODULE
-cp $MODULE_DIR /tmp/$MODULE -r
-cd /tmp/$MODULE
-wget http://ansi-color.googlecode.com/svn/tags/0.6/ansi-color/color >> /dev/null 2>&1
-mv ./color /usr/local/bin
-chmod a+x /usr/local/bin/color
-
-echo "Scanning for tests in '$MODULE' module..."
-FILES=`find /tmp/$MODULE/tests -name *.pp`
-COUNT=${#FILES[@]}
-PASSED=0
-FAILED=0
-TOTAL=0
-
-echo "Running tests..."
-for f in $FILES
-do
-  NAME=`basename $f`
-  echo "Running '$NAME' test..."
-  OUTPUT=`puppet apply --noop --modulepath=/tmp/ --color=ansi $f 2>&1`
-  STATUS=$?
-  if [ $STATUS -ne 0 ]
-  then
-    color red
-    echo "///////////////////////////////////////////////////////"
-    echo
-    echo "    ERROR in '$NAME' test."
-    echo "    Output from failed test:"
-    echo
-    echo $OUTPUT
-    echo
-    echo "///////////////////////////////////////////////////////"
-    color off
-    let FAILED++
-    let TOTAL++
-  else
-    color green
-    echo "'$NAME' test passed."
-    color off
-    let PASSED++
-    let TOTAL++
-  fi
-done
-
-echo "Total tests run: $TOTAL"
-color green
-echo "Tests passed: $PASSED"
-color red
-echo "Tests failed: $FAILED"
-color off
-
-rm -rf /tmp/$MODULE
-rm /usr/local/bin/color
-exit $FAILED
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh
deleted file mode 100644
index 162b7041737..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/.ci/vagrant_test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd /vagrant
-chmod a+x tests/.ci/test.sh
-./tests/.ci/test.sh
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/apt.pp
deleted file mode 100644
index 4e5fa184044..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/apt.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'drush::apt' : 
-  dist      => 'squeeze',
-  backports => 'squeeze',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/defaults.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/defaults.pp
deleted file mode 100644
index da0c41ab8bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/defaults.pp
+++ /dev/null
@@ -1 +0,0 @@
-include drush::defaults
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dis.pp
deleted file mode 100644
index 8b6519724dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dis.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-include drush
-
-drush::dis { 'devel': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dl.pp
deleted file mode 100644
index 4a7d19897aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/dl.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::dl { 'token': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/en.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/en.pp
deleted file mode 100644
index c43afe3826f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/en.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::en { 'views': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git.pp
deleted file mode 100644
index d33d4a68940..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-include drush
-drush::git { 'git://git.drupal.org:project/provision.git' :
-  path => '/var/aegir/.drush',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git/drush.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git/drush.pp
deleted file mode 100644
index 6acc7e34d3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/git/drush.pp
+++ /dev/null
@@ -1 +0,0 @@
-include drush::git::drush
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/init.pp
deleted file mode 100644
index 86f0b12cf02..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include drush
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/make.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/make.pp
deleted file mode 100644
index 8df88a52532..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/make.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-include drush
-drush::make { '/var/aegir/platforms/drupal7' :
-  makefile => '/var/aegir/makefiles/drupal7.make',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/run.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/run.pp
deleted file mode 100644
index b6f37a633d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/run.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::run { '@hostmaster hosting-dispatch' : }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/status.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/status.pp
deleted file mode 100644
index 9e562fa6bbe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/drush/tests/status.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include drush
-drush::status { '@none' : }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.fixtures.yml
deleted file mode 100644
index e16c4080a12..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: git://github.com/puppetlabs/puppetlabs-stdlib.git
-  symlinks:
-    elasticsearch: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.travis.yml
deleted file mode 100644
index c4a322e03f4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-script:
-  - "rake lint"
-  - "rake parser_validate"
-  - "rake template_verify"
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-  - PUPPET_VERSION="~> 3.2.0"
-  - PUPPET_VERSION="~> 3.3.0"
-matrix:
-  allow_failures:
-    - rvm: 2.0.0
-gemfile: Gemfile
-notifications:
-  email:
-    recipients:
-      - richard.pijnenburg@elasticsearch.com
-    on_success: change
-    on_failure: always
-  hipchat:
-    rooms:
-      secure: "gFaED3lu9MRrmoojO2iagrfOaKAbCeQSqVZ9TsIo+qkqem8hwOsMuxsYQ9evPbPbanXQoVNALXTd4fgQW16+hfg/ClqI3nDtVZZJSy0W+U0yVZtz9TXFpi9Q/Z4TwK5TMdNMjemt0l2idY2SE3leHBZEeaIAGfLf0v38tCsNI84="
-    template:
-       - '@electrical %{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} %{build_url}'
-    on_success: change
-    on_failure: always
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CHANGELOG
deleted file mode 100644
index 90a59fc9308..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CHANGELOG
+++ /dev/null
@@ -1,91 +0,0 @@
-0.2.2 ( Jan 23, 2014 )
-  Ensure exec names are unique. This caused issues when using our logstash module
-  Add spec tests for plugin define
-
-0.2.1 ( Jan 22, 2014 )
-  Simplify the management of the defaults file ( PR #64 )
-  Doc improvements for the plugin define ( PR #66 )
-  Allow creation of data directory ( PR #68 )
-  Fail early when package version and package_url are defined
-
-0.2.0 ( Nov 19, 2013 )
-  Large rewrite of the entire module described below
-  Make the core more dynamic for different service providers and multi instance capable
-  Add better testing and devided into different files
-  Fix template function. Replace of template is now only done when the file is changed
-  Add different ways to install the package except from the repository ( puppet/http/https/ftp/file )
-  Update java class to install openjdk 1.7
-  Add tests for python function
-  Update config file template to fix scoping issue ( from PR #57 )
-  Add validation of templates
-  Small changes for preperation for system tests
-  Update readme for new functionality
-  Added more test scenario's
-  Added puppet parser validate task for added checking
-  Ensure we don't add stuff when removing the module
-  Update python client define
-  Add ruby client define
-  Add tests for ruby clients and update python client tests
-
-0.1.3 ( Sep 06, 2013 )
-  Exec path settings has been updated to fix warnings ( PR #37, #47 )
-  Adding define to install python bindings ( PR #43 )
-  Scope deprecation fixes ( PR #41 )
-  feature to install plugins ( PR #40 )
-
-0.1.2 ( Jun 21, 2013 )
-  Update rake file to ignore the param inherit
-  Added missing documentation to the template define
-  Fix for template define to allow multiple templates ( PR #36 by Bruce Morrison )
-
-0.1.1 ( Jun 14, 2013 )
-  Add Oracle Linux to the OS list ( PR #25 by Stas Alekseev )
-  Respect the restart_on_change on the defaults ( PR #29 by Simon Effenberg )
-  Make sure the config can be empty as advertised in the readme
-  Remove dependency cycle when the defaults file is updated ( PR #31 by Bruce Morrison )
-  Enable retry on the template insert in case ES isn't started yet ( PR #32 by Bruce Morrison )
-  Update templates to avoid deprecation notice with Puppet 3.2.x
-  Update template define to avoid auto insert issue with ES
-  Update spec tests to reflect changes to template define
-
-0.1.0 ( May 09, 2013 )
-  Populate .gitignore ( PR #19 by Igor Galić )
-  Add ability to install initfile ( PR #20 by Justin Lambert )
-  Add ability to manage default file* service parameters ( PR #21 by Mathieu Bornoz )
-  Providing complete containment of the module ( PR #24 by Brian Lalor )
-  Add ability to specify package version ( PR #25 by Justin Lambert )
-  Adding license file
-
-0.0.7 ( Mar 23, 2013 )
-  Ensure config directory is created and managed ( PR #13 by Martin Seener )
-  Dont backup package if it changes
-  Create explicit dependency on template directory ( PR #16 by Igor Galić )
-  Make the config directory variable ( PR #17 by Igor Galić and PR #18 by Vincent Janelle )
-  Fixing template define
-
-0.0.6 ( Mar 05, 2013 )
-  Fixing issue with configuration not printing out arrays
-  New feature to write the config hash shorter
-  Updated readme to reflect the new feature
-  Adding spec tests for config file generation
-
-0.0.5 ( Mar 03, 2013 )
-  Option to disable restart on config file change ( PR #10 by Chris Boulton )
-
-0.0.4 ( Mar 02, 2013 )
-  Fixed a major issue with the config template ( Issue #9 )
-
-0.0.3 ( Mar 02, 2013 )
-  Adding spec tests
-  Fixed init issue on Ubuntu ( Issue #6 by Marcus Furlong )
-  Fixed config template problem ( Issue #8 by surfchris )
-  New feature to manage templates
-
-0.0.2 ( Feb 16, 2013 )
-  Feature to supply a package instead of being dependent on the repository
-  Feature to install java in case one doesn't manage it externally
-  Adding RedHat and Amazon as Operating systems
-  fixed a typo - its a shard not a shared :) ( PR #5 by Martin Seener )
-
-0.0.1 ( Jan 13, 2013 )
-  Initial release of the module
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md
deleted file mode 100644
index 13f29e3307b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTING.md
+++ /dev/null
@@ -1,18 +0,0 @@
-If you have a bugfix or new feature that you would like to contribute to this puppet module, please find or open an issue about it first. Talk about what you would like to do. It may be that somebody is already working on it, or that there are particular issues that you should know about before implementing the change.
-
-We enjoy working with contributors to get their code accepted. There are many approaches to fixing a problem and it is important to find the best approach before writing too much code.
-
-The process for contributing to any of the Elasticsearch repositories is similar.
-
-1. Sign the contributor license agreement  
-Please make sure you have signed the [Contributor License Agreement](http://www.elasticsearch.org/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once.
-
-2. Run the rspec tests and ensure it completes without errors with your changes.
-
-3. Rebase your changes
-Update your local repository with the most recent code from the main this puppet module repository, and rebase your branch on top of the latest master branch. We prefer your changes to be squashed into a single commit.
-
-4. Submit a pull request
-Push your local changes to your forked copy of the repository and submit a pull request. In the pull request, describe what your changes do and mention the number of the issue where discussion has taken place, eg “Closes #123″.
-
-Then sit back and wait. There will probably be discussion about the pull request and, if any changes are needed, we would love to work with you to get your pull request merged into this puppet module.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS
deleted file mode 100644
index ad0eb76c4d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/CONTRIBUTORS
+++ /dev/null
@@ -1,20 +0,0 @@
-The following is a list of people who have contributed ideas, code, bug
-reports, or in general have helped this puppet module along its way.
-
-Project Owner
-* Richard Pijnenburg (electrical)
-
-Contributors:
-Martin Seener (martinseener)
-Marcus Furlong (furlongm)
-Chris Boulton (chrisboulton)
-Igor Galić (igalic)
-Vincent Janelle (vjanelle)
-Mathieu Bornoz (mbornoz)
-Justin Lambert (jlambert121)
-Brian Lalor (blalor)
-Stas Alekseev (salekseev)
-Simon Effenberg (Savar)
-Bruce Morrison (brucem)
-deanmalmgren
-Matteo Sessa (msessa-cotd)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Gemfile
deleted file mode 100644
index 95b8d66d8f4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/LICENSE
deleted file mode 100644
index f8b711d55df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2012-2014 Elasticsearch <http://www.elasticsearch.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Modulefile
deleted file mode 100644
index 44aae1c8bda..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name    'elasticsearch-elasticsearch'
-version '0.2.2'
-source 'https://github.com/elasticsearch/puppet-elasticsearch'
-author 'elasticsearch'
-license 'Apache License, Version 2.0'
-summary 'Module for managing and configuring Elasticsearch nodes'
-description 'Module for managing and configuring Elasticsearch nodes'
-project_page 'https://github.com/elasticsearch/puppet-elasticsearch'
-dependency 'puppetlabs/stdlib', '>= 3.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/README.md
deleted file mode 100644
index 12a12759d94..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/README.md
+++ /dev/null
@@ -1,203 +0,0 @@
-# puppet-elasticsearch
-
-A puppet module for managing elasticsearch nodes
-
-http://www.elasticsearch.org/
-
-[![Build Status](https://travis-ci.org/elasticsearch/puppet-elasticsearch.png?branch=master)](https://travis-ci.org/elasticsearch/puppet-elasticsearch)
-
-## Usage
-
-Installation, make sure service is running and will be started at boot time:
-
-     class { 'elasticsearch': }
-
-Install a certain version:
-
-     class { 'elasticsearch':
-       version => '0.90.3'
-     }
-
-This assumes an elasticsearch package is already available to your distribution's package manager. To install it in a different way:
-
-To download from http/https/ftp source:
-
-     class { 'elasticsearch':
-       package_url => 'https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.7.deb'
-     }
-
-To download from a puppet:// source:
-
-     class { 'elasticsearch':
-       package_url => 'puppet:///path/to/elasticsearch-0.90.7.deb'
-     }
-
-Or use a local file source:
-
-     class { 'elasticsearch':
-       package_url => 'file:/path/to/elasticsearch-0.90.7.deb'
-     }
-
-Automatic upgrade of the software ( default set to false ):
-
-     class { 'elasticsearch':
-       autoupgrade => true
-     }
-
-Removal/decommissioning:
-
-     class { 'elasticsearch':
-       ensure => 'absent'
-     }
-
-Install everything but disable service(s) afterwards:
-
-     class { 'elasticsearch':
-       status => 'disabled'
-     }
-
-Disable automated restart of Elasticsearch on config file change:
-
-     class { 'elasticsearch':
-       restart_on_change => false
-     }
-
-For the config variable a hash needs to be passed:
-
-     class { 'elasticsearch':
-       config                   => {
-         'node'                 => {
-           'name'               => 'elasticsearch001'
-         },
-         'index'                => {
-           'number_of_replicas' => '0',
-           'number_of_shards'   => '5'
-         },
-         'network'              => {
-           'host'               => $::ipaddress
-         }
-       }
-     }
-
-Short write up of the config hash is also possible.
-
-Instead of writing the full hash representation:
-
-     class { 'elasticsearch':
-       config                 => {
-         'cluster'            => {
-           'name'             => 'ClusterName',
-           'routing'          => {
-             'allocation'     => {
-               'awareness'    => {
-                 'attributes' => 'rack'
-               }
-             }
-           }
-         }
-       }
-     }
-
-You can write the dotted key naming:
-
-     class { 'elasticsearch':
-       config => {
-         'cluster' => {
-           'name' => 'ClusterName',
-           'routing.allocation.awareness.attributes' => 'rack'
-         }
-       }
-     }
-
-
-## Manage templates
-
-### Add a new template
-
-This will install and/or replace the template in Elasticearch
-
-     elasticsearch::template { 'templatename':
-       file => 'puppet:///path/to/template.json'
-     }
-
-### Delete a template
-
-     elasticsearch::template { 'templatename':
-       ensure => 'absent'
-     }
-
-### Host
-
-  Default it uses localhost:9200 as host. you can change this with the 'host' and 'port' variables
-
-     elasticsearch::template { 'templatename':
-       host => $::ipaddress,
-       port => 9200
-     }
-
-## Bindings / clients
-
-Install a variety of [clients/bindings](http://www.elasticsearch.org/guide/clients/):
-
-### Python
-
-     elasticsearch::python { 'rawes': }
-
-### Ruby
-
-     elasticsearch::ruby { 'elasticsearch': }
-
-## Plugins
-
-Install [a variety of plugins](http://www.elasticsearch.org/guide/clients/):
-
-### From official repository:
-
-     elasticsearch::plugin{'mobz/elasticsearch-head':
-       module_dir => 'head'
-     }
-
-### From custom url:
-
-     elasticsearch::plugin{ 'elasticsearch-jetty':
-       module_dir => 'jetty',
-       url        => 'https://oss-es-plugins.s3.amazonaws.com/elasticsearch-jetty/elasticsearch-jetty-0.90.0.zip'
-     }
-
-## Java install
-
-For those that have no separate module for installation of java:
-
-     class { 'elasticsearch':
-       java_install => true
-     }
-
-If you want a specific java package/version:
-
-     class { 'elasticsearch':
-       java_install => true,
-       java_package => 'packagename'
-     }
-
-## Service providers
-
-Currently only the 'init' service provider is supported but others can be implemented quite easy.
-
-### init
-
-#### Defaults file
-
-You can populate the defaults file ( /etc/defaults/elasticsearch or /etc/sysconfig/elasticsearch )
-
-##### hash representation
-
-     class { 'elasticsearch':
-       init_defaults => { 'ES_USER' => 'elasticsearch', 'ES_GROUP' => 'elasticsearch' }
-     }
-
-##### file source
-
-     class { 'elasticsearch':
-       init_defaults_file => 'puppet:///path/to/defaults'
-     }
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Rakefile
deleted file mode 100644
index 425e032920f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/Rakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint'
-require './spec/lib/template_check_task.rb'
-require './spec/lib/parser_validate_task.rb'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send("disable_class_inherits_from_params_class")
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/config.pp
deleted file mode 100644
index a26886d4f00..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/config.pp
+++ /dev/null
@@ -1,90 +0,0 @@
-# == Class: elasticsearch::config
-#
-# This class exists to coordinate all configuration related actions,
-# functionality and logical units in a central place.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::config': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::config {
-
-  #### Configuration
-
-  File {
-    owner => $elasticsearch::elasticsearch_user,
-    group => $elasticsearch::elasticsearch_group
-  }
-
-  Exec {
-    path => [ '/bin', '/usr/bin', '/usr/local/bin' ],
-    cwd  => '/',
-  }
-
-  if ( $elasticsearch::ensure == 'present' ) {
-
-    $notify_service = $elasticsearch::restart_on_change ? {
-      true  => Class['elasticsearch::service'],
-      false => undef,
-    }
-
-    file { $elasticsearch::confdir:
-      ensure => directory,
-      mode   => '0644',
-      purge  => $elasticsearch::purge_confdir,
-      force  => $elasticsearch::purge_confdir
-    }
-
-    file { "${elasticsearch::confdir}/elasticsearch.yml":
-      ensure  => file,
-      content => template("${module_name}/etc/elasticsearch/elasticsearch.yml.erb"),
-      mode    => '0644',
-      notify  => $notify_service
-    }
-
-    exec { 'mkdir_templates_elasticsearch':
-      command => "mkdir -p ${elasticsearch::confdir}/templates_import",
-      creates => "${elasticsearch::confdir}/templates_import"
-    }
-
-    file { "${elasticsearch::confdir}/templates_import":
-      ensure  => 'directory',
-      mode    => '0644',
-      require => Exec['mkdir_templates_elasticsearch']
-    }
-
-    if ( $elasticsearch::datadir != undef ) {
-      file { $elasticsearch::datadir:
-        ensure  => 'directory',
-        owner   => $elasticsearch::elasticsearch_user,
-        group   => $elasticsearch::elasticsearch_group,
-        mode    => '0770',
-      }
-    }
-
-  } elsif ( $elasticsearch::ensure == 'absent' ) {
-
-    file { $elasticsearch::confdir:
-      ensure  => 'absent',
-      recurse => true,
-      force   => true
-    }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/init.pp
deleted file mode 100644
index fabfd78867e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/init.pp
+++ /dev/null
@@ -1,208 +0,0 @@
-# == Class: elasticsearch
-#
-# This class is able to install or remove elasticsearch on a node.
-# It manages the status of the related service.
-#
-# === Parameters
-#
-# [*ensure*]
-#   String. Controls if the managed resources shall be <tt>present</tt> or
-#   <tt>absent</tt>. If set to <tt>absent</tt>:
-#   * The managed software packages are being uninstalled.
-#   * Any traces of the packages will be purged as good as possible. This may
-#     include existing configuration files. The exact behavior is provider
-#     dependent. Q.v.:
-#     * Puppet type reference: {package, "purgeable"}[http://j.mp/xbxmNP]
-#     * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   * System modifications (if any) will be reverted as good as possible
-#     (e.g. removal of created users, services, changed log settings, ...).
-#   * This is thus destructive and should be used with care.
-#   Defaults to <tt>present</tt>.
-#
-# [*autoupgrade*]
-#   Boolean. If set to <tt>true</tt>, any managed package gets upgraded
-#   on each Puppet run when the package provider is able to find a newer
-#   version than the present one. The exact behavior is provider dependent.
-#   Q.v.:
-#   * Puppet type reference: {package, "upgradeable"}[http://j.mp/xbxmNP]
-#   * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   Defaults to <tt>false</tt>.
-#
-# [*status*]
-#   String to define the status of the service. Possible values:
-#   * <tt>enabled</tt>: Service is running and will be started at boot time.
-#   * <tt>disabled</tt>: Service is stopped and will not be started at boot
-#     time.
-#   * <tt>running</tt>: Service is running but will not be started at boot time.
-#     You can use this to start a service on the first Puppet run instead of
-#     the system startup.
-#   * <tt>unmanaged</tt>: Service will not be started at boot time and Puppet
-#     does not care whether the service is running or not. For example, this may
-#     be useful if a cluster management software is used to decide when to start
-#     the service plus assuring it is running on the desired node.
-#   Defaults to <tt>enabled</tt>. The singular form ("service") is used for the
-#   sake of convenience. Of course, the defined status affects all services if
-#   more than one is managed (see <tt>service.pp</tt> to check if this is the
-#   case).
-#
-# [*version*]
-#   String to set the specific version you want to install.
-#   Defaults to <tt>false</tt>.
-#
-# [*restart_on_change*]
-#   Boolean that determines if the application should be automatically restarted
-#   whenever the configuration changes. Disabling automatic restarts on config
-#   changes may be desired in an environment where you need to ensure restarts
-#   occur in a controlled/rolling manner rather than during a Puppet run.
-#
-#   Defaults to <tt>true</tt>, which will restart the application on any config
-#   change. Setting to <tt>false</tt> disables the automatic restart.
-#
-# [*confdir*]
-#   Path to directory containing the elasticsearch configuration.
-#   Use this setting if your packages deviate from the norm (/etc/elasticsearch)
-#
-# [*plugindir*]
-#   Path to directory containing the elasticsearch plugins
-#   Use this setting if your packages deviate from the norm (/usr/share/elasticsearch/plugins)
-#
-# [*plugintool*]
-#   Path to directory containing the elasticsearch plugin installation script
-#   Use this setting if your packages deviate from the norm (/usr/share/elasticsearch/bin/plugin)
-#
-# The default values for the parameters are set in elasticsearch::params. Have
-# a look at the corresponding <tt>params.pp</tt> manifest file if you need more
-# technical information about them.
-#
-# === Examples
-#
-# * Installation, make sure service is running and will be started at boot time:
-#     class { 'elasticsearch': }
-#
-# * Removal/decommissioning:
-#     class { 'elasticsearch':
-#       ensure => 'absent',
-#     }
-#
-# * Install everything but disable service(s) afterwards
-#     class { 'elasticsearch':
-#       status => 'disabled',
-#     }
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch(
-  $ensure              = $elasticsearch::params::ensure,
-  $status              = $elasticsearch::params::status,
-  $restart_on_change   = $elasticsearch::params::restart_on_change,
-  $autoupgrade         = $elasticsearch::params::autoupgrade,
-  $version             = false,
-  $package_provider    = 'package',
-  $package_url         = undef,
-  $package_dir         = $elasticsearch::params::package_dir,
-  $purge_package_dir   = $elasticsearch::params::purge_package_dir,
-  $elasticsearch_user  = $elasticsearch::params::elasticsearch_user,
-  $elasticsearch_group = $elasticsearch::params::elasticsearch_group,
-  $purge_confdir       = $elasticsearch::params::purge_confdir,
-  $service_provider    = 'init',
-  $init_defaults       = undef,
-  $init_defaults_file  = undef,
-  $init_template       = undef,
-  $config              = {},
-  $confdir             = $elasticsearch::params::confdir,
-  $datadir             = undef,
-  $plugindir           = $elasticsearch::params::plugindir,
-  $plugintool          = $elasticsearch::params::plugintool,
-  $java_install        = false,
-  $java_package        = undef
-) inherits elasticsearch::params {
-
-  anchor {'elasticsearch::begin': }
-  anchor {'elasticsearch::end': }
-
-
-  #### Validate parameters
-
-  # ensure
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  # autoupgrade
-  validate_bool($autoupgrade)
-
-  # service status
-  if ! ($status in [ 'enabled', 'disabled', 'running', 'unmanaged' ]) {
-    fail("\"${status}\" is not a valid status parameter value")
-  }
-
-  # restart on change
-  validate_bool($restart_on_change)
-
-  # purge conf dir
-  validate_bool($purge_confdir)
-
-  if ! ($service_provider in $elasticsearch::params::service_providers) {
-    fail("\"${service_provider}\" is not a valid provider for \"${::operatingsystem}\"")
-  }
-
-  if ($package_url != undef and $version != false) {
-    fail('Unable to set the version number when using package_url option.')
-  }
-
-  # validate config hash
-  validate_hash($config)
-
-  # java install validation
-  validate_bool($java_install)
-
-  #### Manage actions
-
-  # package(s)
-  class { 'elasticsearch::package': }
-
-  # configuration
-  class { 'elasticsearch::config': }
-
-  # service(s)
-  class { 'elasticsearch::service': }
-
-  if $java_install == true {
-    # Install java
-    class { 'elasticsearch::java': }
-
-    # ensure we first java java and then manage the service
-    Anchor['elasticsearch::begin']
-    -> Class['elasticsearch::java']
-    -> Class['elasticsearch::service']
-  }
-
-  #### Manage relationships
-
-  if $ensure == 'present' {
-
-    # we need the software before configuring it
-    Anchor['elasticsearch::begin']
-    -> Class['elasticsearch::package']
-    -> Class['elasticsearch::config']
-
-    # we need the software and a working configuration before running a service
-    Class['elasticsearch::package'] -> Class['elasticsearch::service']
-    Class['elasticsearch::config']  -> Class['elasticsearch::service']
-
-    Class['elasticsearch::service'] -> Anchor['elasticsearch::end']
-
-  } else {
-
-    # make sure all services are getting stopped before software removal
-    Anchor['elasticsearch::begin']
-    -> Class['elasticsearch::service']
-    -> Class['elasticsearch::package']
-    -> Anchor['elasticsearch::end']
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/java.pp
deleted file mode 100644
index 8d5149d381b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/java.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# == Class: elasticsearch::java
-#
-# This class exists to install java if its not managed from an other module
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::java': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::java {
-
-  if $elasticsearch::java_package == undef {
-    # Default Java package
-    case $::operatingsystem {
-      'CentOS', 'Fedora', 'Scientific', 'RedHat', 'Amazon', 'OracleLinux': {
-        $package = 'java-1.7.0-openjdk'
-      }
-      'Debian', 'Ubuntu': {
-        $package = 'openjdk-7-jre-headless'
-      }
-      default: {
-        fail("\"${module_name}\" provides no java package
-              for \"${::operatingsystem}\"")
-      }
-    }
-  } else {
-    $package = $elasticsearch::java_package
-  }
-
-  ## Install the java package unless already specified somewhere else
-  if !defined(Package[$package]) {
-    package { $package:
-      ensure => present
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/package.pp
deleted file mode 100644
index 1cb5295d47c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/package.pp
+++ /dev/null
@@ -1,145 +0,0 @@
-# == Class: elasticsearch::package
-#
-# This class exists to coordinate all software package management related
-# actions, functionality and logical units in a central place.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::package': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::package {
-
-
-  #### Package management
-
-  # set params: in operation
-  if $elasticsearch::ensure == 'present' {
-
-    # Check if we want to install a specific version or not
-    if $elasticsearch::version == false {
-
-      $package_ensure = $elasticsearch::autoupgrade ? {
-        true  => 'latest',
-        false => 'present',
-      }
-
-    } else {
-
-      # install specific version
-      $package_ensure = $elasticsearch::version
-
-    }
-
-    # action
-    if ($elasticsearch::package_url != undef) {
-
-      $package_dir = $elasticsearch::package_dir
-
-      # Create directory to place the package file
-      exec { 'create_package_dir_elasticsearch':
-        cwd     => '/',
-        path    => ['/usr/bin', '/bin'],
-        command => "mkdir -p ${elasticsearch::package_dir}",
-        creates => $elasticsearch::package_dir;
-      }
-
-      file { $package_dir:
-        ensure  => 'directory',
-        purge   => $elasticsearch::purge_package_dir,
-        force   => $elasticsearch::purge_package_dir,
-        require => Exec['create_package_dir_elasticsearch'],
-      }
-
-      $filenameArray = split($elasticsearch::package_url, '/')
-      $basefilename = $filenameArray[-1]
-
-      $sourceArray = split($elasticsearch::package_url, ':')
-      $protocol_type = $sourceArray[0]
-
-      $extArray = split($basefilename, '\.')
-      $ext = $extArray[-1]
-
-      case $protocol_type {
-
-        puppet: {
-
-          file { "${package_dir}/${basefilename}":
-            ensure  => present,
-            source  => $elasticsearch::package_url,
-            require => File[$package_dir],
-            backup  => false,
-            before  => Package[$elasticsearch::params::package]
-          }
-
-        }
-        ftp, https, http: {
-
-          exec { 'download_package_elasticsearch':
-            command => "${elasticsearch::params::dlcmd} ${package_dir}/${basefilename} ${elasticsearch::package_url} 2> /dev/null",
-            path    => ['/usr/bin', '/bin'],
-            creates => "${package_dir}/${basefilename}",
-            require => File[$package_dir],
-            before  => Package[$elasticsearch::params::package]
-          }
-
-        }
-        file: {
-
-          $source_path = $sourceArray[1]
-          file { "${package_dir}/${basefilename}":
-            ensure  => present,
-            source  => $source_path,
-            require => File[$package_dir],
-            backup  => false,
-            before  => Package[$elasticsearch::params::package]
-          }
-
-        }
-        default: {
-          fail("Protocol must be puppet, file, http, https, or ftp. You have given \"${protocol_type}\"")
-        }
-      }
-
-      case $ext {
-        'deb':   { $pkg_provider = 'dpkg' }
-        'rpm':   { $pkg_provider = 'rpm'  }
-        default: { fail("Unknown file extention \"${ext}\".") }
-      }
-
-      $pkg_source = "${package_dir}/${basefilename}"
-
-    } else {
-      $pkg_source = undef
-      $pkg_provider = undef
-    }
-
-  # Package removal
-  } else {
-
-    $pkg_source = undef
-    $pkg_provider = undef
-    $package_ensure = 'purged'
-  }
-
-  package { $elasticsearch::params::package:
-    ensure   => $package_ensure,
-    source   => $pkg_source,
-    provider => $pkg_provider
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/params.pp
deleted file mode 100644
index aea527f1b6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/params.pp
+++ /dev/null
@@ -1,122 +0,0 @@
-# == Class: elasticsearch::params
-#
-# This class exists to
-# 1. Declutter the default value assignment for class parameters.
-# 2. Manage internally used module variables in a central place.
-#
-# Therefore, many operating system dependent differences (names, paths, ...)
-# are addressed in here.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class is not intended to be used directly.
-#
-#
-# === Links
-#
-# * {Puppet Docs: Using Parameterized Classes}[http://j.mp/nVpyWY]
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::params {
-
-  #### Default values for the parameters of the main module class, init.pp
-
-  # ensure
-  $ensure = 'present'
-
-  # autoupgrade
-  $autoupgrade = false
-
-  # service status
-  $status = 'enabled'
-
-  # restart on configuration change?
-  $restart_on_change = true
-
-  # Package dir. Temporary place to download the package to for installation
-  $package_dir = '/var/lib/elasticsearch'
-
-  # User and Group for the files and user to run the service as.
-  $elasticsearch_user  = 'elasticsearch'
-  $elasticsearch_group = 'elasticsearch'
-
-  # Purge configuration directory
-  $purge_confdir = true
-
-  ## init service provider
-
-  # configuration directory
-  $confdir = '/etc/elasticsearch'
-
-  # plugins directory
-  $plugindir = '/usr/share/elasticsearch/plugins'
-
-  # plugins helper binary
-  $plugintool = '/usr/share/elasticsearch/bin/plugin'
-
-  # Download tool
-  $dlcmd = 'wget -O'
-
-  $purge_package_dir = false
-
-  #### Internal module values
-
-  # packages
-  case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
-      # main application
-      $package = [ 'elasticsearch' ]
-    }
-    'Debian', 'Ubuntu': {
-      # main application
-      $package = [ 'elasticsearch' ]
-    }
-    default: {
-      fail("\"${module_name}\" provides no package default value
-            for \"${::operatingsystem}\"")
-    }
-  }
-
-  # service parameters
-  case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
-      $service_name       = 'elasticsearch'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'init' ]
-      $defaults_location  = '/etc/sysconfig'
-    }
-    'Debian', 'Ubuntu': {
-      $service_name       = 'elasticsearch'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'init' ]
-      $defaults_location  = '/etc/default'
-    }
-    'Darwin': {
-      $service_name       = 'FIXME/TODO'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'launchd' ]
-      $defaults_location  = false
-    }
-    default: {
-      fail("\"${module_name}\" provides no service parameters
-            for \"${::operatingsystem}\"")
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp
deleted file mode 100644
index 025c3023324..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/plugin.pp
+++ /dev/null
@@ -1,96 +0,0 @@
-# == Define: elasticsearch::plugin
-#
-# This define allows you to install arbitrary Elasticsearch plugins
-# either by using the default repositories or by specifying an URL
-#
-# All default values are defined in the elasticsearch::params class.
-#
-#
-# === Parameters
-#
-# [*module_dir*]
-#   Directory name where the module will be installed
-#   Value type is string
-#   Default value: None
-#   This variable is required
-#
-# [*ensure*]
-#   Whether the plugin will be installed or removed.
-#   Set to 'absent' to ensure a plugin is not installed
-#   Value type is string
-#   Default value: present
-#   This variable is optional
-#
-# [*url*]
-#   Specify an URL where to download the plugin from.
-#   Value type is string
-#   Default value: None
-#   This variable is optional
-#
-#
-# === Examples
-#
-# # From official repository
-# elasticsearch::plugin{'mobz/elasticsearch-head': module_dir => 'head'}
-#
-# # From custom url
-# elasticsearch::plugin{ 'elasticsearch-jetty':
-#  module_dir => 'elasticsearch-jetty',
-#  url        => 'https://oss-es-plugins.s3.amazonaws.com/elasticsearch-jetty/elasticsearch-jetty-0.90.0.zip',
-# }
-#
-# === Authors
-#
-# * Matteo Sessa <mailto:matteo.sessa@catchoftheday.com.au>
-# * Dennis Konert <mailto:dkonert@gmail.com>
-#
-define elasticsearch::plugin(
-    $module_dir,
-    $ensure      = 'present',
-    $url         = ''
-) {
-
-  Exec {
-    path => [ '/bin', '/usr/bin', '/usr/local/bin' ],
-    cwd  => '/',
-  }
-
-  $notify_service = $elasticsearch::restart_on_change ? {
-    false   => undef,
-    default => Service['elasticsearch'],
-  }
-
-  if ($module_dir != '') {
-      validate_string($module_dir)
-  } else {
-      fail("module_dir undefined for plugin ${name}")
-  }
-
-  if ($url != '') {
-    validate_string($url)
-    $install_cmd = "${elasticsearch::plugintool} -install ${name} -url ${url}"
-    $exec_rets = [0,1]
-  } else {
-    $install_cmd = "${elasticsearch::plugintool} -install ${name}"
-    $exec_rets = [0,]
-  }
-
-  case $ensure {
-    'installed', 'present': {
-      exec {"install_plugin_${name}":
-        command  => $install_cmd,
-        creates  => "${elasticsearch::plugindir}/${module_dir}",
-        returns  => $exec_rets,
-        notify   => $notify_service,
-        require  => Class['elasticsearch::package']
-      }
-    }
-    default: {
-      exec {"remove_plugin_${name}":
-        command => "${elasticsearch::plugintool} --remove ${module_dir}",
-        onlyif  => "test -d ${elasticsearch::plugindir}/${module_dir}",
-        notify  => $notify_service,
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/python.pp
deleted file mode 100644
index e1d91a9aba6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/python.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# == Define: elasticsearch::python
-#
-# there are many python bindings for elasticsearch. This provides all
-# the ones we know about http://www.elasticsearch.org/guide/clients/
-#
-#
-# === Parameters
-#
-# [*ensure*]
-#   String. Controls if the managed resources shall be <tt>present</tt> or
-#   <tt>absent</tt>. If set to <tt>absent</tt>:
-#   * The managed software packages are being uninstalled.
-#   * Any traces of the packages will be purged as good as possible. This may
-#     include existing configuration files. The exact behavior is provider
-#     dependent. Q.v.:
-#     * Puppet type reference: {package, "purgeable"}[http://j.mp/xbxmNP]
-#     * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   * System modifications (if any) will be reverted as good as possible
-#     (e.g. removal of created users, services, changed log settings, ...).
-#   * This is thus destructive and should be used with care.
-#   Defaults to <tt>present</tt>.
-
-#
-#
-# === Examples
-#
-# elasticsearch::python { 'pyes':; }
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::python (
-  $ensure = 'present'
-) {
-
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  # make sure the package name is valid and setup the provider as
-  # necessary
-  case $name {
-    'pyes': {
-      $provider = 'pip'
-    }
-    'rawes': {
-      $provider = 'pip'
-    }
-    'pyelasticsearch': {
-      $provider = 'pip'
-    }
-    'ESClient': {
-      $provider = 'pip'
-    }
-    'elasticutils': {
-      $provider = 'pip'
-    }
-    'elasticsearch': {
-      $provider = 'pip'
-    }
-    default: {
-      fail("unknown python binding package '${name}'")
-    }
-  }
-
-  package { $name:
-    ensure   => $ensure,
-    provider => $provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp
deleted file mode 100644
index 3e35f416f24..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/ruby.pp
+++ /dev/null
@@ -1,67 +0,0 @@
-# == Define: elasticsearch::ruby
-#
-# there are many ruby bindings for elasticsearch. This provides all
-# the ones we know about http://www.elasticsearch.org/guide/clients/
-#
-#
-# === Parameters
-#
-# [*ensure*]
-#   String. Controls if the managed resources shall be <tt>present</tt> or
-#   <tt>absent</tt>. If set to <tt>absent</tt>:
-#   * The managed software packages are being uninstalled.
-#   * Any traces of the packages will be purged as good as possible. This may
-#     include existing configuration files. The exact behavior is provider
-#     dependent. Q.v.:
-#     * Puppet type reference: {package, "purgeable"}[http://j.mp/xbxmNP]
-#     * {Puppet's package provider source code}[http://j.mp/wtVCaL]
-#   * System modifications (if any) will be reverted as good as possible
-#     (e.g. removal of created users, services, changed log settings, ...).
-#   * This is thus destructive and should be used with care.
-#   Defaults to <tt>present</tt>.
-
-#
-#
-# === Examples
-#
-# elasticsearch::ruby { 'elasticsearch':; }
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::ruby (
-  $ensure = 'present'
-) {
-
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  # make sure the package name is valid and setup the provider as
-  # necessary
-  case $name {
-    'tire': {
-      $provider = 'gem'
-    }
-    'stretcher': {
-      $provider = 'gem'
-    }
-    'elastic_searchable': {
-      $provider = 'gem'
-    }
-    'elasticsearch': {
-      $provider = 'gem'
-    }
-    default: {
-      fail("unknown ruby client package '${name}'")
-    }
-  }
-
-  package { $name:
-    ensure   => $ensure,
-    provider => $provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service.pp
deleted file mode 100644
index 891f5597994..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# == Class: elasticsearch::service
-#
-# This class exists to coordinate all service management related actions,
-# functionality and logical units in a central place.
-#
-# <b>Note:</b> "service" is the Puppet term and type for background processes
-# in general and is used in a platform-independent way. E.g. "service" means
-# "daemon" in relation to Unix-like systems.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# This class may be imported by other classes to use its functionality:
-#   class { 'elasticsearch::service': }
-#
-# It is not intended to be used directly by external resources like node
-# definitions or other modules.
-#
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-class elasticsearch::service {
-
-  case $elasticsearch::service_provider {
-
-    init: {
-      elasticsearch::service::init { 'elasticsearch': }
-    }
-
-    default: {
-      fail("Unknown service provider ${elasticsearch::service_provider}")
-    }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp
deleted file mode 100644
index 2db645c8de7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/service/init.pp
+++ /dev/null
@@ -1,132 +0,0 @@
-# == Define: elasticsearch::service::init
-#
-# This class exists to coordinate all service management related actions,
-# functionality and logical units in a central place.
-#
-# <b>Note:</b> "service" is the Puppet term and type for background processes
-# in general and is used in a platform-independent way. E.g. "service" means
-# "daemon" in relation to Unix-like systems.
-#
-#
-# === Parameters
-#
-# This class does not provide any parameters.
-#
-#
-# === Examples
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::service::init{
-
-  #### Service management
-
-  # set params: in operation
-  if $elasticsearch::ensure == 'present' {
-
-    case $elasticsearch::status {
-      # make sure service is currently running, start it on boot
-      'enabled': {
-        $service_ensure = 'running'
-        $service_enable = true
-      }
-      # make sure service is currently stopped, do not start it on boot
-      'disabled': {
-        $service_ensure = 'stopped'
-        $service_enable = false
-      }
-      # make sure service is currently running, do not start it on boot
-      'running': {
-        $service_ensure = 'running'
-        $service_enable = false
-      }
-      # do not start service on boot, do not care whether currently running
-      # or not
-      'unmanaged': {
-        $service_ensure = undef
-        $service_enable = false
-      }
-      # unknown status
-      # note: don't forget to update the parameter check in init.pp if you
-      #       add a new or change an existing status.
-      default: {
-        fail("\"${elasticsearch::status}\" is an unknown service status value")
-      }
-    }
-
-  # set params: removal
-  } else {
-
-    # make sure the service is stopped and disabled (the removal itself will be
-    # done by package.pp)
-    $service_ensure = 'stopped'
-    $service_enable = false
-
-  }
-
-  $notify_service = $elasticsearch::restart_on_change ? {
-    true  => Service[$name],
-    false => undef,
-  }
-
-
-  if ( $elasticsearch::status != 'unmanaged' ) {
-
-    # defaults file content. Either from a hash or file
-    if ($elasticsearch::init_defaults_file != undef) {
-      $defaults_content = undef
-      $defaults_source  = $elasticsearch::init_defaults_file
-    } elsif ($elasticsearch::init_defaults != undef and is_hash($elasticsearch::init_defaults) ) {
-      $defaults_content = template("${module_name}/etc/sysconfig/defaults.erb")
-      $defaults_source  = undef
-    } else {
-      $defaults_content = undef
-      $defaults_source  = undef
-    }
-
-    # Check if we are going to manage the defaults file.
-    if ( $defaults_content != undef or $defaults_source != undef ) {
-
-      file { "${elasticsearch::params::defaults_location}/${name}":
-        ensure  => $elasticsearch::ensure,
-        source  => $defaults_source,
-        content => $defaults_content,
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0644',
-        before  => Service[$name],
-        notify  => $notify_service
-      }
-
-    }
-
-    # init file from template
-    if ($elasticsearch::init_template != undef) {
-
-      file { "/etc/init.d/${name}":
-        ensure  => $elasticsearch::ensure,
-        content => template($elasticsearch::init_template),
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0755',
-        before  => Service[$name],
-        notify  => $notify_service
-      }
-
-    }
-
-  }
-
-  # action
-  service { $name:
-    ensure     => $service_ensure,
-    enable     => $service_enable,
-    name       => $elasticsearch::params::service_name,
-    hasstatus  => $elasticsearch::params::service_hasstatus,
-    hasrestart => $elasticsearch::params::service_hasrestart,
-    pattern    => $elasticsearch::params::service_pattern,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/template.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/template.pp
deleted file mode 100644
index b8ab2a61512..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/manifests/template.pp
+++ /dev/null
@@ -1,114 +0,0 @@
-# == Define: elasticsearch::template
-#
-#  This define allows you to insert, update or delete templates that are used within Elasticsearch for the indexes
-#
-# === Parameters
-#
-# [*file*]
-#   File path of the template ( json file )
-#   Value type is string
-#   Default value: undef
-#   This variable is optional
-#
-# [*replace*]
-#   Set to 'true' if you intend to replace the existing template
-#   Value type is boolean
-#   Default value: false
-#   This variable is optional
-#
-# [*delete*]
-#   Set to 'true' if you intend to delete the existing template
-#   Value type is boolean
-#   Default value: false
-#   This variable is optional
-#
-# [*host*]
-#   Host name or IP address of the ES instance to connect to
-#   Value type is string
-#   Default value: localhost
-#   This variable is optional
-#
-# [*port*]
-#   Port number of the ES instance to connect to
-#   Value type is number
-#   Default value: 9200
-#   This variable is optional
-#
-# === Authors
-#
-# * Richard Pijnenburg <mailto:richard@ispavailability.com>
-#
-define elasticsearch::template(
-  $ensure  = 'present',
-  $file    = undef,
-  $host    = 'localhost',
-  $port    = 9200
-) {
-
-  require elasticsearch
-
-  # ensure
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail("\"${ensure}\" is not a valid ensure parameter value")
-  }
-
-  if ! is_integer($port) {
-    fail("\"${port}\" is not an integer")
-  }
-
-  Exec {
-    path      => [ '/bin', '/usr/bin', '/usr/local/bin' ],
-    cwd       => '/',
-    tries     => 3,
-    try_sleep => 10
-  }
-
-  # Build up the url
-  $es_url = "http://${host}:${port}/_template/${name}"
-
-  # Can't do a replace and delete at the same time
-
-  if ($ensure == 'present') {
-
-    # Fail when no file is supplied
-    if $file == undef {
-      fail('The variable "file" cannot be empty when inserting or updating a template')
-
-    } else { # we are good to go. notify to insert in case we deleted
-      $insert_notify = Exec[ "insert_template_${name}" ]
-    }
-
-  } else {
-
-    $insert_notify = undef
-
-  }
-
-  # Delete the existing template
-  # First check if it exists of course
-  exec { "delete_template_${name}":
-    command     => "curl -s -XDELETE ${es_url}",
-    onlyif      => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
-    notify      => $insert_notify,
-    refreshonly => true
-  }
-
-  if ($ensure == 'present') {
-
-    # place the template file
-    file { "${elasticsearch::confdir}/templates_import/elasticsearch-template-${name}.json":
-      ensure  => 'present',
-      source  => $file,
-      notify  => Exec[ "delete_template_${name}" ],
-      require => Exec[ 'mkdir_templates' ],
-    }
-
-    exec { "insert_template_${name}":
-      command     => "curl -s -XPUT ${es_url} -d @${elasticsearch::confdir}/templates_import/elasticsearch-template-${name}.json",
-      unless      => "test $(curl -s '${es_url}?pretty=true' | wc -l) -gt 1",
-      refreshonly => true
-    }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb
deleted file mode 100644
index dd4b5c1d206..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/001_elasticsearch_init_debian_spec.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  [ 'Debian', 'Ubuntu'].each do |distro|
-
-    context "on #{distro} OS" do
-
-      let :facts do {
-        :operatingsystem => distro
-      } end
-
-      context 'main class tests' do
-
-        # init.pp
-        it { should contain_class('elasticsearch::package') }
-        it { should contain_class('elasticsearch::config') }
-        it { should contain_class('elasticsearch::service') }
-
-      end
-
-      context 'package installation' do
-        
-        context 'via repository' do
-
-          context 'with default settings' do
-            
-           it { should contain_package('elasticsearch').with(:ensure => 'present') }
-
-          end
-
-          context 'with specified version' do
-
-            let :params do {
-              :version => '1.0'
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => '1.0') }
-          end
-
-          context 'with auto upgrade enabled' do
-
-            let :params do {
-              :autoupgrade => true
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => 'latest') }
-          end
-
-        end
-
-        context 'when setting package version and package_url' do
-
-          let :params do {
-            :version     => '0.90.10',
-            :package_url => 'puppet:///path/to/some/elasticsearch-0.90.10.deb'
-          } end
-
-          it { expect { should raise_error(Puppet::Error) } }
-
-        end
-
-        context 'via package_url setting' do
-
-          context 'using puppet:/// schema' do
-
-            let :params do {
-              :package_url => 'puppet:///path/to/package.deb'
-            } end
-
-            it { should contain_file('/var/lib/elasticsearch/package.deb').with(:source => 'puppet:///path/to/package.deb', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using http:// schema' do
-
-            let :params do {
-              :package_url => 'http://www.domain.com/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => "Exec[create_package_dir_elasticsearch]") }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.deb http://www.domain.com/path/to/package.deb 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using https:// schema' do
-
-            let :params do {
-              :package_url => 'https://www.domain.com/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.deb https://www.domain.com/path/to/package.deb 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using ftp:// schema' do
-
-            let :params do {
-              :package_url => 'ftp://www.domain.com/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.deb ftp://www.domain.com/path/to/package.deb 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-          context 'using file:// schema' do
-
-            let :params do {
-              :package_url => 'file:/path/to/package.deb'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_file('/var/lib/elasticsearch/package.deb').with(:source => '/path/to/package.deb', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.deb', :provider => 'dpkg') }
-          end
-
-        end
-
-      end # package
-
-      context 'service setup' do
-
-        context 'with provider \'init\'' do
-
-          context 'and default settings' do
-
-            it { should contain_service('elasticsearch').with(:ensure => 'running') }
-
-          end
-
-          context 'and set defaults via hash param' do
-
-            let :params do {
-              :init_defaults => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' }
-            } end
-
-            it { should contain_file('/etc/default/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n", :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'and set defaults via file param' do
-
-            let :params do {
-              :init_defaults_file => 'puppet:///path/to/elasticsearch.defaults'
-            } end
-
-            it { should contain_file('/etc/default/elasticsearch').with(:source => 'puppet:///path/to/elasticsearch.defaults', :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'no service restart when defaults change' do
-
-           let :params do {
-              :init_defaults     => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' },
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/default/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n").without_notify }
-
-          end 
-
-          context 'and set init file via template' do
-
-            let :params do {
-              :init_template => "elasticsearch/etc/init.d/elasticsearch.Debian.erb"
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').with(:notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'No service restart when restart_on_change is false' do
-
-            let :params do {
-              :init_template     => "elasticsearch/etc/init.d/elasticsearch.Debian.erb",
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').without_notify }
-
-          end
-
-          context 'when its unmanaged do nothing with it' do
-
-            let :params do {
-              :status => 'unmanaged'
-            } end
-
-            it { should contain_service('elasticsearch').with(:ensure => nil, :enable => false) }
-
-          end
-
-        end # provider init
-
-      end # Services
-
-      context 'when setting the module to absent' do
-
-         let :params do {
-           :ensure => 'absent'
-         } end
-
-         it { should contain_file('/etc/elasticsearch').with(:ensure => 'absent', :force => true, :recurse => true) }
-         it { should contain_package('elasticsearch').with(:ensure => 'purged') }
-         it { should contain_service('elasticsearch').with(:ensure => 'stopped', :enable => false) }
-
-      end
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb
deleted file mode 100644
index 9151b20e6ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/002_elasticsearch_init_redhat_spec.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  [ 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux' ].each do |distro|
-
-    context "on #{distro} OS" do
-
-      let :facts do {
-        :operatingsystem => distro
-      } end
-
-      context 'Main class' do
-
-        # init.pp
-        it { should contain_class('elasticsearch::package') }
-        it { should contain_class('elasticsearch::config') }
-        it { should contain_class('elasticsearch::service') }
-
-      end
-
-      context 'package installation' do
-        
-        context 'via repository' do
-
-          context 'with default settings' do
-            
-           it { should contain_package('elasticsearch').with(:ensure => 'present') }
-
-          end
-
-          context 'with specified version' do
-
-            let :params do {
-              :version => '1.0'
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => '1.0') }
-          end
-
-          context 'with auto upgrade enabled' do
-
-            let :params do {
-              :autoupgrade => true
-            } end
-
-            it { should contain_package('elasticsearch').with(:ensure => 'latest') }
-          end
-
-        end
-
-        context 'when setting package version and package_url' do
-
-          let :params do {
-            :version     => '0.90.10',
-            :package_url => 'puppet:///path/to/some/elasticsearch-0.90.10.rpm'
-          } end
-
-          it { expect { should raise_error(Puppet::Error) } }
-
-        end
-
-        context 'via package_url setting' do
-
-          context 'using puppet:/// schema' do
-
-            let :params do {
-              :package_url => 'puppet:///path/to/package.rpm'
-            } end
-
-            it { should contain_file('/var/lib/elasticsearch/package.rpm').with(:source => 'puppet:///path/to/package.rpm', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using http:// schema' do
-
-            let :params do {
-              :package_url => 'http://www.domain.com/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => "Exec[create_package_dir_elasticsearch]") }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.rpm http://www.domain.com/path/to/package.rpm 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using https:// schema' do
-
-            let :params do {
-              :package_url => 'https://www.domain.com/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.rpm https://www.domain.com/path/to/package.rpm 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using ftp:// schema' do
-
-            let :params do {
-              :package_url => 'ftp://www.domain.com/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_exec('download_package_elasticsearch').with(:command => 'wget -O /var/lib/elasticsearch/package.rpm ftp://www.domain.com/path/to/package.rpm 2> /dev/null', :require => 'File[/var/lib/elasticsearch]') }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-          context 'using file:// schema' do
-
-            let :params do {
-              :package_url => 'file:/path/to/package.rpm'
-            } end
-
-            it { should contain_exec('create_package_dir_elasticsearch').with(:command => 'mkdir -p /var/lib/elasticsearch') }
-            it { should contain_file('/var/lib/elasticsearch').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_elasticsearch]') }
-            it { should contain_file('/var/lib/elasticsearch/package.rpm').with(:source => '/path/to/package.rpm', :backup => false) }
-            it { should contain_package('elasticsearch').with(:ensure => 'present', :source => '/var/lib/elasticsearch/package.rpm', :provider => 'rpm') }
-          end
-
-        end
-
-      end # package
-
-      context 'service setup' do
-
-        context 'with provider \'init\'' do
-
-          context 'and default settings' do
-
-            it { should contain_service('elasticsearch').with(:ensure => 'running') }
-
-          end
-
-          context 'and set defaults via hash param' do
-
-            let :params do {
-              :init_defaults => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' }
-            } end
-
-            it { should contain_file('/etc/sysconfig/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n", :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'and set defaults via file param' do
-
-            let :params do {
-              :init_defaults_file => 'puppet:///path/to/elasticsearch.defaults'
-            } end
-
-            it { should contain_file('/etc/sysconfig/elasticsearch').with(:source => 'puppet:///path/to/elasticsearch.defaults', :notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'no service restart when defaults change' do
-
-            let :params do {
-              :init_defaults     => { 'SERVICE_USER' => 'root', 'SERVICE_GROUP' => 'root' },
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/sysconfig/elasticsearch').with(:content => "### MANAGED BY PUPPET ###\n\nSERVICE_GROUP=root\nSERVICE_USER=root\n").without_notify }
-
-          end
-
-          context 'and set init file via template' do
-
-            let :params do {
-              :init_template => "elasticsearch/etc/init.d/elasticsearch.RedHat.erb"
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').with(:notify => 'Service[elasticsearch]') }
-
-          end
-
-          context 'No service restart when restart_on_change is false' do
-
-            let :params do {
-              :init_template     => "elasticsearch/etc/init.d/elasticsearch.RedHat.erb",
-              :restart_on_change => false
-            } end
-
-            it { should contain_file('/etc/init.d/elasticsearch').without_notify }
-
-          end
-
-          context 'when its unmanaged do nothing with it' do
-
-            let :params do {
-              :status => 'unmanaged'
-            } end
-
-            it { should contain_service('elasticsearch').with(:ensure => nil, :enable => false) }
-
-          end
-
-        end
-
-      end # Services
-
-      context 'when setting the module to absent' do
-
-         let :params do {
-           :ensure => 'absent'
-         } end
-
-         it { should contain_file('/etc/elasticsearch').with(:ensure => 'absent', :force => true, :recurse => true) }
-         it { should contain_package('elasticsearch').with(:ensure => 'purged') }
-         it { should contain_service('elasticsearch').with(:ensure => 'stopped', :enable => false) }
-
-      end
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb
deleted file mode 100644
index 12bce8fef8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/003_elasticsearch_init_unknown_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  context "on an unknown OS" do
-
-    context "it should fail" do
-      let :facts do {
-        :operatingsystem => 'Windows'
-      } end
- 
-      it { expect { should raise_error(Puppet::Error) } }
-
-    end
-
-  end
- 
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb
deleted file mode 100644
index 2f01fb5b29d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/004_elasticsearch_init_config_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  let :facts do {
-    :operatingsystem => 'CentOS'
-  } end
-
-  context "config file content" do
-
-    context "with nothing set" do
-
-      let :params do {
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n") }
-
-    end
-
-    context "set a value" do
-
-      let :params do {
-        :config => { 'node' => { 'name' => 'test' }  }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nnode: \n  name: test\n") }
-
-    end
-
-    context "set a value to true" do
-
-      let :params do {
-        :config => { 'node' => { 'master' => true }  }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nnode: \n  master: true\n") }
-
-    end
-
-    context "set a value to false" do
-
-      let :params do {
-        :config => { 'node' => { 'data' => false }  }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nnode: \n  data: false\n") }
-
-    end
-
-    context "deeper hash and multiple keys" do
-
-      let :params do {
-        :config => { 'index' => { 'routing' => { 'allocation' => { 'include' => 'tag1', 'exclude' => [ 'tag2', 'tag3' ] } } }, 'node' => { 'name' => 'somename' } }
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nindex: \n  routing: \n    allocation: \n      exclude: \n             - tag2\n             - tag3\n      include: tag1\nnode: \n  name: somename\n") }
-
-    end
-
-    context "Combination of full hash and shorted write up keys" do
-
-      let :params do {
-        :config => { 'node' => { 'name' => 'NodeName', 'rack' => 46 }, 'boostrap.mlockall' => true, 'cluster' => { 'name' => 'ClusterName', 'routing.allocation.awareness.attributes' => 'rack' }, 'discovery.zen' => { 'ping.unicast.hosts'=> [ "host1", "host2" ], 'minimum_master_nodes' => 3, 'ping.multicast.enabled' => false }, 'gateway' => { 'expected_nodes' => 4, 'recover_after_nodes' => 3 }, 'network.host' => '123.123.123.123' }
-       } end
-
-       it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:content => "### MANAGED BY PUPPET ###\n---\nboostrap: \n  mlockall: true\ncluster: \n  name: ClusterName\n  routing: \n    allocation: \n      awareness: \n        attributes: rack\ndiscovery: \n  zen: \n    minimum_master_nodes: 3\n    ping: \n      multicast: \n        enabled: false\n      unicast: \n        hosts: \n             - host1\n             - host2\ngateway: \n  expected_nodes: 4\n  recover_after_nodes: 3\nnetwork: \n  host: 123.123.123.123\nnode: \n  name: NodeName\n  rack: 46\n") }
-
-     end
-
-  end
-
-  context "service restarts" do
-
-   let :facts do {
-     :operatingsystem => 'CentOS'
-    } end
-
-    context "does not restart when restart_on_change is false" do
-      let :params do {
-        :config            => { 'node' => { 'name' => 'test' }  },
-        :restart_on_change => false,
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').without_notify }
-    end
-
-    context "should happen restart_on_change is true (default)" do
-      let :params do {
-        :config            => { 'node' => { 'name' => 'test' }  },
-        :restart_on_change => true,
-      } end
-
-      it { should contain_file('/etc/elasticsearch/elasticsearch.yml').with(:notify => "Class[Elasticsearch::Service]") }
-    end
-
-  end
-
-  context 'data directory' do
-    let(:facts) do {
-      :operatingsystem => 'CentOS'
-    } end
-
-    context 'should allow creating datadir' do
-      let(:params) do {
-        :datadir => '/foo'
-      } end
-
-      it { should contain_file('/foo').with(:ensure => 'directory') }
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb
deleted file mode 100644
index d51108746d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/classes/005_elasticsearch_java_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch', :type => 'class' do
-
-  context "install java" do
-
-    let :params do {
-      :java_install => true,
-      :config => { 'node' => { 'name' => 'test' }  }
-    } end
-
-    context "On Debian OS" do
-
-      let :facts do {
-        :operatingsystem => 'Debian'
-      } end
-
-      it { should contain_package('openjdk-7-jre-headless') }
-
-    end
-
-    context "On Ubuntu OS" do
-
-      let :facts do {
-        :operatingsystem => 'Ubuntu'
-      } end
-
-      it { should contain_package('openjdk-7-jre-headless') }
-
-    end
-
-    context "On CentOS OS " do
-
-      let :facts do {
-        :operatingsystem => 'CentOS'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On RedHat OS " do
-
-      let :facts do {
-        :operatingsystem => 'Redhat'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On Fedora OS " do
-
-      let :facts do {
-        :operatingsystem => 'Fedora'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On Scientific OS " do
-
-      let :facts do {
-        :operatingsystem => 'Scientific'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On Amazon OS " do
-
-      let :facts do {
-        :operatingsystem => 'Amazon'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On OracleLinux OS " do
-
-      let :facts do {
-        :operatingsystem => 'OracleLinux'
-      } end
-
-      it { should contain_package('java-1.7.0-openjdk') }
-
-    end
-
-    context "On an unknown OS" do
-
-      let :facts do {
-        :operatingsystem => 'Windows'
-      } end
-
-      it { expect { should raise_error(Puppet::Error) } }
-
-    end
-
-    context "Custom java package" do
-
-      let :facts do {
-        :operatingsystem => 'CentOS'
-      } end
-
-      let :params do {
-        :java_install => true,
-        :java_package => 'java-1.6.0-openjdk',
-        :config => { 'node' => { 'name' => 'test' }  }
-      } end
-
-      it { should contain_package('java-1.6.0-openjdk') }
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb
deleted file mode 100644
index 56d0428067a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/001_elasticsearch_python_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::python', :type => 'define' do
-
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-
-  [ 'pyes', 'rawes', 'pyelasticsearch', 'ESClient', 'elasticutils', 'elasticsearch' ].each do |pythonlib|
-
-    context "installation of library #{pythonlib}" do
-
-      let(:title) { pythonlib }
-
-      it { should contain_package(pythonlib).with(:provider => 'pip') }
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb
deleted file mode 100644
index 6de94f76b2c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/002_elasticsearch_ruby_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::ruby', :type => 'define' do
-
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-
-  [ 'tire', 'stretcher', 'elastic_searchable', 'elasticsearch'].each do |rubylib|
-
-    context "installation of library #{rubylib}" do
-
-      let(:title) { rubylib }
-
-      it { should contain_package(rubylib).with(:provider => 'gem') }
-
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb
deleted file mode 100644
index 527fb118f0b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/003_elasticsearch_template_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::template', :type => 'define' do
-
-  let(:title) { 'foo' }
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-  let(:pre_condition) { 'class {"elasticsearch": config => { "node" => {"name" => "test" }}}'}
-
-  context "Add a template" do
-
-    let :params do {
-      :ensure => 'present',
-      :file   => 'puppet:///path/to/foo.json',
-    } end
-
-    it { should contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json', :notify => "Exec[delete_template_foo]", :require => "Exec[mkdir_templates]") }
-    it { should contain_exec('insert_template_foo').with(:command => 'curl -s -XPUT http://localhost:9200/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1') }
-  end
-
-  context "Delete a template" do
-
-    let :params do {
-      :ensure => 'absent'
-    } end
-
-    it { should_not contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should_not contain_exec('insert_template_foo') }
-    it { should contain_exec('delete_template_foo').with(:command => 'curl -s -XDELETE http://localhost:9200/_template/foo', :notify => nil, :onlyif => 'test $(curl -s \'http://localhost:9200/_template/foo?pretty=true\' | wc -l) -gt 1' ) }
-  end
-
-  context "Add template with alternative host and port" do
-
-    let :params do {
-      :file => 'puppet:///path/to/foo.json',
-      :host => 'otherhost',
-      :port => '9201'
-    } end
-
-    it { should contain_file('/etc/elasticsearch/templates_import/elasticsearch-template-foo.json').with(:source => 'puppet:///path/to/foo.json') }
-    it { should contain_exec('insert_template_foo').with(:command => 'curl -s -XPUT http://otherhost:9201/_template/foo -d @/etc/elasticsearch/templates_import/elasticsearch-template-foo.json', :unless => 'test $(curl -s \'http://otherhost:9201/_template/foo?pretty=true\' | wc -l) -gt 1') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb
deleted file mode 100644
index dcf2170ea70..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/defines/004_elasticsearch_plugin_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'elasticsearch::plugin', :type => 'define' do
-
-  let(:title) { 'mobz/elasticsearch-head' }
-  let(:facts) { {:operatingsystem => 'CentOS' }}
-  let(:pre_condition) { 'class {"elasticsearch": config => { "node" => {"name" => "test" }}}'}
-
-  context "Add a plugin" do
-
-    let :params do {
-      :ensure     => 'present',
-      :module_dir => 'head',
-    } end
-
-    it { should contain_exec('install_plugin_mobz/elasticsearch-head').with(:command => '/usr/share/elasticsearch/bin/plugin -install mobz/elasticsearch-head', :creates => '/usr/share/elasticsearch/plugins/head') }
-  end
-
-  context "Remove a plugin" do
-
-    let :params do {
-      :ensure     => 'absent',
-      :module_dir => 'head'
-    } end
-
-    it { should contain_exec('remove_plugin_mobz/elasticsearch-head').with(:command => '/usr/share/elasticsearch/bin/plugin --remove head', :onlyif => 'test -d /usr/share/elasticsearch/plugins/head') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb
deleted file mode 100644
index 27ab76450a5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/parser_validate_task.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'find'
-require 'pathname'
-require 'rake'
-require 'rspec/core/rake_task'
-
-desc "run Puppet parser validate"
-task :parser_validate do
-
-  pwd = ENV["PWD"]
-  puppet_file_paths = []
-  Find.find(pwd) do |path|
-    puppet_file_paths << path if path =~ /.*\.pp$/
-  end
-
-  exit_code = 0
-  puppet_file_paths.each do |puppetfile|
-
-    pwdpath = Pathname.new(pwd)
-    pn = Pathname.new(puppetfile)
-    rel_path = pn.relative_path_from(pwdpath)
-
-    print "Validating #{rel_path}....  "
-    $stdout.flush
-
-    result = `puppet parser validate #{puppetfile}`
-    if $?.exitstatus == 0
-      res = 'OK'
-    else
-      res = 'ERR'
-    end
-
-    puts "#{res}"
-
-    if $?.exitstatus != 0
-      exit_code = 1
-    end
-  end
-  exit exit_code
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb
deleted file mode 100644
index f4748236fba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/lib/template_check_task.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'find'
-require 'pathname'
-require 'rake'
-require 'rspec/core/rake_task'
-
-desc "Verify puppet templates"
-task :template_verify do
-
-  pwd = ENV["PWD"]
-  erb_file_paths = []
-  Find.find(pwd) do |path|
-    erb_file_paths << path if path =~ /.*\.erb$/
-  end
-
-  exit_code = 0
-  erb_file_paths.each do |erbfile|
-
-    pwdpath = Pathname.new(pwd)
-    pn = Pathname.new(erbfile)
-    rel_path = pn.relative_path_from(pwdpath)
-
-    result = `erb -P -x -T '-' #{erbfile} | ruby -c`
-    puts "Verifying #{rel_path}.... #{result}"
-
-    if $?.exitstatus != 0
-      exit_code = 1
-    end
-  end
-  exit exit_code
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb
deleted file mode 100644
index dc7e9f4a0ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/spec/spec_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb
deleted file mode 100644
index b93ccdcb219..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/elasticsearch/elasticsearch.yml.erb
+++ /dev/null
@@ -1,93 +0,0 @@
-<%-
-
-  # Function to make a structured and sorted yaml representation out of a hash
-  def recursive_hash_to_yml_string(hash, depth=0)
-    spacer = ""
-    depth.times { spacer += "  "}
-    hash.keys.sort.each do |sorted_key|
-      @yml_string += spacer + sorted_key + ": "
-      if hash[sorted_key].is_a?(Array)
-         keyspacer = ""
-         sorted_key.length.times { keyspacer += " " }
-         @yml_string += "\n"
-         hash[sorted_key].each do |item|
-           @yml_string += spacer + keyspacer + "- " + item +"\n"
-         end
-      elsif hash[sorted_key].is_a?(Hash)
-        @yml_string += "\n"
-        recursive_hash_to_yml_string(hash[sorted_key], depth+1)
-      else
-        @yml_string += "#{hash[sorted_key].to_s}\n"
-      end
-    end
-  end
-
-  # Function to transform shorted write up of the keys into full hash representation
-  def transform(hash)
-  return_vals = []
-
-  hash.each do |key,val|
-    if m = /^([^.]+)\.(.*)$/.match(key)
-      temp = { m[1] => { m[2] => val } }
-      transform(temp).each do |stuff|
-        return_vals << stuff
-      end
-    else
-      if val.is_a?(Hash)
-        transform(val).each do |stuff|
-          return_vals << { key => stuff }
-        end
-      else
-        return_vals << { key => val }
-      end
-    end
-  end
-
-  return_vals
-  end
-
-  # Function to deep merge hashes with same keys
-  class ::Hash
-    def deep_merge_with_array_values_concatenated(hash)
-    target = dup
-
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        target[key] = target[key].deep_merge_with_array_values_concatenated(hash[key])
-        next
-      end
-
-      if hash[key].is_a?(Array) && target[key].is_a?(Array)
-        target[key] = target[key] + hash[key]
-      else
-        target[key] = hash[key]
-      end
-    end
-
-    target
-    end
-  end
-
-  # initial string
-  @yml_string = "### MANAGED BY PUPPET ###\n"
-
-  if !scope.lookupvar('elasticsearch::config').empty?
-
-    @yml_string += "---\n"
-
-    ## Transform shorted keys into full write up
-    transformed_config = transform(scope.lookupvar('elasticsearch::config'))
-
-    # Merge it back into a hash
-    tmphash = { }
-    transformed_config.each do |subhash|
-      tmphash = tmphash.deep_merge_with_array_values_concatenated(subhash)
-    end
-
-    # Transform it into yaml
-    recursive_hash_to_yml_string(tmphash)
-
-  end
-
--%>
-<%= @yml_string -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb
deleted file mode 100644
index 220c2f80b7d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.Debian.erb
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/bin/sh
-#
-# /etc/init.d/elasticsearch -- startup script for Elasticsearch
-#
-# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-# Modified for Debian GNU/Linux	by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-# Modified for Tomcat by Stefan Gybas <sgybas@debian.org>.
-# Modified for Tomcat6 by Thierry Carrez <thierry.carrez@ubuntu.com>.
-# Additional improvements by Jason Brittain <jason.brittain@mulesoft.com>.
-# Modified by Nicolas Huray for ElasticSearch <nicolas.huray@gmail.com>.
-#
-### BEGIN INIT INFO
-# Provides:          elasticsearch
-# Required-Start:    $network $remote_fs $named
-# Required-Stop:     $network $remote_fs $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts elasticsearch
-# Description:       Starts elasticsearch using start-stop-daemon
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=elasticsearch
-DESC="ElasticSearch Server"
-DEFAULT=/etc/default/$NAME
-
-if [ `id -u` -ne 0 ]; then
-	echo "You need root privileges to run this script"
-	exit 1
-fi
-
-
-. /lib/lsb/init-functions
-
-if [ -r /etc/default/rcS ]; then
-	. /etc/default/rcS
-fi
-
-
-# The following variables can be overwritten in $DEFAULT
-
-# Run ElasticSearch as this user ID and group ID
-ES_USER=elasticsearch
-ES_GROUP=elasticsearch
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-openjdk-amd64/ /usr/lib/jvm/java-7-openjdk-armhf /usr/lib/jvm/java-7-openjdk-i386/ /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-openjdk-armhf /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/default-java"
-
-# Look for the right JVM to use
-for jdir in $JDK_DIRS; do
-    if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
-        JAVA_HOME="$jdir"
-    fi
-done
-export JAVA_HOME
-
-# Directory where the ElasticSearch binary distribution resides
-ES_HOME=/usr/share/$NAME
-
-# Heap Size (defaults to 256m min, 1g max)
-#ES_HEAP_SIZE=2g
-
-# Heap new generation
-#ES_HEAP_NEWSIZE=
-
-# max direct memory
-#ES_DIRECT_SIZE=
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-# Maximum number of open files
-MAX_OPEN_FILES=65535
-
-# Maximum amount of locked memory
-#MAX_LOCKED_MEMORY=
-
-# ElasticSearch log directory
-LOG_DIR=/var/log/$NAME
-
-# ElasticSearch data directory
-DATA_DIR=/var/lib/$NAME
-
-# ElasticSearch work directory
-WORK_DIR=/tmp/$NAME
-
-# ElasticSearch configuration directory
-CONF_DIR=/etc/$NAME
-
-# ElasticSearch configuration file (elasticsearch.yml)
-CONF_FILE=$CONF_DIR/elasticsearch.yml
-
-# End of variables that can be overwritten in $DEFAULT
-
-# overwrite settings from default file
-if [ -f "$DEFAULT" ]; then
-	. "$DEFAULT"
-fi
-
-# Define other required variables
-PID_FILE=/var/run/$NAME.pid
-DAEMON=$ES_HOME/bin/elasticsearch
-DAEMON_OPTS="-p $PID_FILE -Des.default.config=$CONF_FILE -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR"
-
-export ES_HEAP_SIZE
-export ES_HEAP_NEWSIZE
-export ES_DIRECT_SIZE
-export ES_JAVA_OPTS
-
-# Check DAEMON exists
-test -x $DAEMON || exit 0
-
-checkJava() {
-	if [ -x "$JAVA_HOME/bin/java" ]; then
-		JAVA="$JAVA_HOME/bin/java"
-	else
-		JAVA=`which java`
-	fi
-
-	if [ ! -x "$JAVA" ]; then
-		echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME"
-		exit 1
-	fi
-}
-
-case "$1" in
-  start)
-	checkJava
-
-	if [ -n "$MAX_LOCKED_MEMORY" -a -z "$ES_HEAP_SIZE" ]; then
-		log_failure_msg "MAX_LOCKED_MEMORY is set - ES_HEAP_SIZE must also be set"
-		exit 1
-	fi
-
-	log_daemon_msg "Starting $DESC"
-
-	pid=`pidofproc -p $PID_FILE elasticsearch`
-	if [ -n "$pid" ] ; then
-		log_begin_msg "Already running."
-		log_end_msg 0
-		exit 0
-	fi
-
-	# Prepare environment
-	mkdir -p "$LOG_DIR" "$DATA_DIR" "$WORK_DIR" && chown "$ES_USER":"$ES_GROUP" "$LOG_DIR" "$DATA_DIR" "$WORK_DIR"
-	touch "$PID_FILE" && chown "$ES_USER":"$ES_GROUP" "$PID_FILE"
-
-	if [ -n "$MAX_OPEN_FILES" ]; then
-		ulimit -n $MAX_OPEN_FILES
-	fi
-
-	if [ -n "$MAX_LOCKED_MEMORY" ]; then
-		ulimit -l $MAX_LOCKED_MEMORY
-	fi
-
-	# Start Daemon
-	start-stop-daemon --start -b --user "$ES_USER" -c "$ES_USER" --pidfile "$PID_FILE" --exec $DAEMON -- $DAEMON_OPTS
-	log_end_msg $?
-	;;		
-  stop)
-	log_daemon_msg "Stopping $DESC"
-
-	if [ -f "$PID_FILE" ]; then 
-		start-stop-daemon --stop --pidfile "$PID_FILE" \
-			--user "$ES_USER" \
-			--retry=TERM/20/KILL/5 >/dev/null
-		if [ $? -eq 1 ]; then
-			log_progress_msg "$DESC is not running but pid file exists, cleaning up"
-		elif [ $? -eq 3 ]; then
-			PID="`cat $PID_FILE`"
-			log_failure_msg "Failed to stop $DESC (pid $PID)"
-			exit 1
-		fi
-		rm -f "$PID_FILE"
-	else
-		log_progress_msg "(not running)"
-	fi
-	log_end_msg 0
-	;;
-  status)
-	status_of_proc -p $PID_FILE elasticsearch elasticsearch && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-	if [ -f "$PID_FILE" ]; then
-		$0 stop
-		sleep 1
-	fi
-	$0 start
-	;;
-  *)
-	log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb
deleted file mode 100644
index 8d611514a11..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/init.d/elasticsearch.RedHat.erb
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-#
-# elasticsearch <summary>
-#
-# chkconfig:   2345 80 20
-# description: Starts and stops a single elasticsearch instance on this system 
-#
-
-### BEGIN INIT INFO
-# Provides: Elasticsearch
-# Required-Start: $network $named
-# Required-Stop: $network $named
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: This service manages the elasticsearch daemon
-# Description: Elasticsearch is a very scalable, schema-free and high-performance search solution supporting multi-tenancy and near realtime search.
-### END INIT INFO
-
-#
-# init.d / servicectl compatibility (openSUSE)
-#
-if [ -f /etc/rc.status ]; then
-    . /etc/rc.status
-    rc_reset
-fi
-
-#
-# Source function library.
-#
-if [ -f /etc/rc.d/init.d/functions ]; then
-    . /etc/rc.d/init.d/functions
-fi
-
-exec="/usr/share/elasticsearch/bin/elasticsearch"
-prog="elasticsearch"
-pidfile=/var/run/elasticsearch/${prog}.pid
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-export ES_HEAP_SIZE
-export ES_HEAP_NEWSIZE
-export ES_DIRECT_SIZE
-export ES_JAVA_OPTS
-
-lockfile=/var/lock/subsys/$prog
-
-# backwards compatibility for old config sysconfig files, pre 0.90.1
-if [ -n $USER ] && [ -z $ES_USER ] ; then 
-   ES_USER=$USER
-fi
-
-checkJava() {
-    if [ -x "$JAVA_HOME/bin/java" ]; then
-        JAVA="$JAVA_HOME/bin/java"
-    else
-        JAVA=$(which java)
-    fi
-
-    if [ ! -x "$JAVA" ]; then
-        echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME"
-        exit 1
-    fi
-}
-
-start() {
-    checkJava
-    [ -x $exec ] || exit 5
-    [ -f $CONF_FILE ] || exit 6
-    if [ -n "$MAX_LOCKED_MEMORY" -a -z "$ES_HEAP_SIZE" ]; then
-        echo "MAX_LOCKED_MEMORY is set - ES_HEAP_SIZE must also be set"
-        return 7
-    fi
-    if [ -n "$MAX_OPEN_FILES" ]; then
-        ulimit -n $MAX_OPEN_FILES
-    fi
-    if [ -n "$MAX_LOCKED_MEMORY" ]; then
-        ulimit -l $MAX_LOCKED_MEMORY
-    fi
-    if [ -n "$WORK_DIR" ]; then
-        mkdir -p "$WORK_DIR"
-        chown "$ES_USER":"$ES_GROUP" "$WORK_DIR"
-    fi
-    echo -n $"Starting $prog: "
-    # if not running, start it up here, usually something like "daemon $exec"
-    daemon --user $ES_USER --pidfile $pidfile $exec -p $pidfile -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    # stop it here, often "killproc $prog"
-    killproc -p $pidfile $prog
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status -p $pidfile $prog
-}
-
-rh_status_q() {
-    rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb
deleted file mode 100644
index b4e8af62dce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/elasticsearch/templates/etc/sysconfig/defaults.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-### MANAGED BY PUPPET ###
-
-<% scope.lookupvar('elasticsearch::init_defaults').sort.map do |key, value| -%>
-<%= key %>=<%= value %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.fixtures.yml
deleted file mode 100644
index 0d10d5cec14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.fixtures.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-fixtures:
-  symlinks:
-    "firewall": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.travis.yml
deleted file mode 100644
index 0e94c2876c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake ci SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0.0"
-  - PUPPET_GEM_VERSION="~> 3.1.0"
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION="~> 3.4.0"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CHANGELOG.md
deleted file mode 100644
index daf390e98d3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CHANGELOG.md
+++ /dev/null
@@ -1,432 +0,0 @@
-## 2014-05-16 Release 1.1.1
-###Summary
-
-This release reverts the alphabetical ordering of 1.1.0.  We found this caused
-a regression in the Openstack modules so in the interest of safety we have
-removed this for now.
-
-## 2014-05-13 Release 1.1.0
-###Summary
-
-This release has a significant change from previous releases; we now apply the
-firewall resources alphabetically by default, removing the need to create pre
-and post classes just to enforce ordering.  It only effects default ordering
-and further information can be found in the README about this.  Please test
-this in development before rolling into production out of an abundance of
-caution.
-
-We've also added `mask` which is required for --recent in recent (no pun
-intended) versions of iptables, as well as connlimit and connmark.  This
-release has been validated against Ubuntu 14.04 and RHEL7 and should be fully
-working on those platforms.
-
-####Features
-
-- Apply firewall resources alphabetically. 
-- Add support for connlimit and connmark.
-- Add `mask` as a parameter. (Used exclusively with the recent parameter).
-
-####Bugfixes
-
-- Add systemd support for RHEL7.
-- Replace &&'s with the correct and in manifests.
-- Fix tests on Trusty and RHEL7
-- Fix for Fedora Rawhide.
-- Fix boolean flag tests.
-- Fix DNAT->SNAT typo in an error message.
-
-####Known Bugs
-
-* For Oracle, the `owner` and `socket` parameters require a workaround to function. Please see the Limitations section of the README.
-
-
-## 2014-03-04 Supported Release 1.0.2
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-
-* For Oracle, the `owner` and `socket` parameters require a workaround to function. Please see the Limitations section of the README.
-
-### Supported release - 2014-03-04 1.0.1
-
-####Summary
-
-An important bugfix was made to the offset calculation for unmanaged rules
-to handle rules with 9000+ in the name.
-
-####Features
-
-####Bugfixes
-- Offset calculations assumed unmanaged rules were numbered 9000+.
-- Gracefully fail to manage ip6tables on iptables 1.3.x
-
-####Known Bugs
-
-* For Oracle, the `owner` and `socket` parameters require a workaround to function. Please see the Limitations section of the README.
-
----
-### 1.0.0 - 2014-02-11
-
-No changes, just renumbering to 1.0.0.
-
----
-### 0.5.0 - 2014-02-10
-
-##### Summary:
-This is a bigger release that brings in "recent" connection limiting (think
-"port knocking"), firewall chain purging on a per-chain/per-table basis, and
-support for a few other use cases. This release also fixes a major bug which
-could cause modifications to the wrong rules when unmanaged rules are present.
-
-##### New Features:
-* Add "recent" limiting via parameters `rdest`, `reap`, `recent`, `rhitcount`,
-  `rname`, `rseconds`, `rsource`, and `rttl`
-* Add negation support for source and destination
-* Add per-chain/table purging support to `firewallchain`
-* IPv4 specific
-  * Add random port forwarding support
-  * Add ipsec policy matching via `ipsec_dir` and `ipsec_policy`
-* IPv6 specific
-  * Add support for hop limiting via `hop_limit` parameter
-  * Add fragmentation matchers via `ishasmorefrags`, `islastfrag`, and `isfirstfrag`
-  * Add support for conntrack stateful firewall matching via `ctstate`
-
-##### Bugfixes:
-- Boolean fixups allowing false values
-- Better detection of unmanaged rules
-- Fix multiport rule detection
-- Fix sport/dport rule detection
-- Make INPUT, OUTPUT, and FORWARD not autorequired for firewall chain filter
-- Allow INPUT with the nat table
-- Fix `src_range` & `dst_range` order detection
-- Documentation clarifications
-- Fixes to spec tests
-
----------------------------------------
-
-### 0.4.2 - 2013-09-10
-
-Another attempt to fix the packaging issue.  We think we understand exactly
-what is failing and this should work properly for the first time.
-
----------------------------------------
-
-### 0.4.1 - 2013-08-09
-
-Bugfix release to fix a packaging issue that may have caused puppet module
-install commands to fail.
-
----------------------------------------
-
-### 0.4.0 - 2013-07-11
-
-This release adds support for address type, src/dest ip ranges, and adds
-additional testing and bugfixes.
-
-#### Features
-* Add `src_type` and `dst_type` attributes (Nick Stenning)
-* Add `src_range` and `dst_range` attributes (Lei Zhang)
-* Add SL and SLC operatingsystems as supported (Steve Traylen)
-
-#### Bugfixes
-* Fix parser for bursts other than 5 (Chris Rutter)
-* Fix parser for -f in --comment (Georg Koester)
-* Add doc headers to class files (Dan Carley)
-* Fix lint warnings/errors (Wolf Noble)
-
----------------------------------------
-
-### 0.3.1 - 2013/6/10
-
-This minor release provides some bugfixes and additional tests.
-
-#### Changes
-
-* Update tests for rspec-system-puppet 2 (Ken Barber)
-* Update rspec-system tests for rspec-system-puppet 1.5 (Ken Barber)
-* Ensure all services have 'hasstatus => true' for Puppet 2.6 (Ken Barber)
-* Accept pre-existing rule with invalid name (Joe Julian)
-* Swap log_prefix and log_level order to match the way it's saved (Ken Barber)
-* Fix log test to replicate bug #182 (Ken Barber)
-* Split argments while maintaining quoted strings (Joe Julian)
-* Add more log param tests (Ken Barber)
-* Add extra tests for logging parameters (Ken Barber)
-* Clarify OS support (Ken Barber)
-
----------------------------------------
-
-### 0.3.0 - 2013/4/25
-
-This release introduces support for Arch Linux and extends support for Fedora 15 and up. There are also lots of bugs fixed and improved testing to prevent regressions.
-
-##### Changes
-
-* Fix error reporting for insane hostnames (Tomas Doran)
-* Support systemd on Fedora 15 and up (Eduardo Gutierrez)
-* Move examples to docs (Ken Barber)
-* Add support for Arch Linux platform (Ingmar Steen)
-* Add match rule for fragments (Georg Koester)
-* Fix boolean rules being recognized as changed (Georg Koester)
-* Same rules now get deleted (Anastasis Andronidis)
-* Socket params test (Ken Barber)
-* Ensure parameter can disable firewall (Marc Tardif)
-
----------------------------------------
-
-### 0.2.1 - 2012/3/13
-
-This maintenance release introduces the new README layout, and fixes a bug with iptables_persistent_version.
-
-##### Changes
-
-* (GH-139) Throw away STDERR from dpkg-query in Fact
-* Update README to be consistent with module documentation template
-* Fix failing spec tests due to dpkg change in iptables_persistent_version
-
----------------------------------------
-
-### 0.2.0 - 2012/3/3
-
-This release introduces automatic persistence, removing the need for the previous manual dependency requirement for persistent the running rules to the OS persistence file.
-
-Previously you would have required the following in your site.pp (or some other global location):
-
-    # Always persist firewall rules
-    exec { 'persist-firewall':
-      command     => $operatingsystem ? {
-        'debian'          => '/sbin/iptables-save > /etc/iptables/rules.v4',
-        /(RedHat|CentOS)/ => '/sbin/iptables-save > /etc/sysconfig/iptables',
-      },
-      refreshonly => true,
-    }
-    Firewall {
-      notify  => Exec['persist-firewall'],
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-    Firewallchain {
-      notify  => Exec['persist-firewall'],
-    }
-    resources { "firewall":
-      purge => true
-    }
-
-You only need:
-
-    class { 'firewall': }
-    Firewall {
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-
-To install pre-requisites and to create dependencies on your pre & post rules. Consult the README for more information.
-
-##### Changes
-
-* Firewall class manifests (Dan Carley)
-* Firewall and firewallchain persistence (Dan Carley)
-* (GH-134) Autorequire iptables related packages (Dan Carley)
-* Typo in #persist_iptables OS normalisation (Dan Carley)
-* Tests for #persist_iptables (Dan Carley)
-* (GH-129) Replace errant return in autoreq block (Dan Carley)
-
----------------------------------------
-
-### 0.1.1 - 2012/2/28
-
-This release primarily fixes changing parameters in 3.x
-
-##### Changes
-
-* (GH-128) Change method_missing usage to define_method for 3.x compatibility
-* Update travis.yml gem specifications to actually test 2.6
-* Change source in Gemfile to use a specific URL for Ruby 2.0.0 compatibility
-
----------------------------------------
-
-### 0.1.0 - 2012/2/24
-
-This release is somewhat belated, so no summary as there are far too many changes this time around. Hopefully we won't fall this far behind again :-).
-
-##### Changes
-
-* Add support for MARK target and set-mark property (Johan Huysmans)
-* Fix broken call to super for ruby-1.9.2 in munge (Ken Barber)
-* simple fix of the error message for allowed values of the jump property (Daniel Black)
-* Adding OSPF(v3) protocol to puppetlabs-firewall (Arnoud Vermeer)
-* Display multi-value: port, sport, dport and state command seperated (Daniel Black)
-* Require jump=>LOG for log params (Daniel Black)
-* Reject and document icmp => "any" (Dan Carley)
-* add firewallchain type and iptables_chain provider (Daniel Black)
-* Various fixes for firewallchain resource (Ken Barber)
-* Modify firewallchain name to be chain:table:protocol (Ken Barber)
-* Fix allvalidchain iteration (Ken Barber)
-* Firewall autorequire Firewallchains (Dan Carley)
-* Tests and docstring for chain autorequire (Dan Carley)
-* Fix README so setup instructions actually work (Ken Barber)
-* Support vlan interfaces (interface containing ".") (Johan Huysmans)
-* Add tests for VLAN support for iniface/outiface (Ken Barber)
-* Add the table when deleting rules (Johan Huysmans)
-* Fix tests since we are now prefixing -t)
-* Changed 'jump' to 'action', commands to lower case (Jason Short)
-* Support interface names containing "+" (Simon Deziel)
-* Fix for when iptables-save spews out "FATAL" errors (Sharif Nassar)
-* Fix for incorrect limit command arguments for ip6tables provider (Michael Hsu)
-* Document Util::Firewall.host_to_ip (Dan Carley)
-* Nullify addresses with zero prefixlen (Dan Carley)
-* Add support for --tcp-flags (Thomas Vander Stichele)
-* Make tcp_flags support a feature (Ken Barber)
-* OUTPUT is a valid chain for the mangle table (Adam Gibbins)
-* Enable travis-ci support (Ken Barber)
-* Convert an existing test to CIDR (Dan Carley)
-* Normalise iptables-save to CIDR (Dan Carley)
-* be clearer about what distributions we support (Ken Barber)
-* add gre protocol to list of acceptable protocols (Jason Hancock)
-* Added pkttype property (Ashley Penney)
-* Fix mark to not repeat rules with iptables 1.4.1+ (Sharif Nassar)
-* Stub iptables_version for now so tests run on non-Linux hosts (Ken Barber)
-* Stub iptables facts for set_mark tests (Dan Carley)
-* Update formatting of README to meet Puppet Labs best practices (Will Hopper)
-* Support for ICMP6 type code resolutions (Dan Carley)
-* Insert order hash included chains from different tables (Ken Barber)
-* rspec 2.11 compatibility (Jonathan Boyett)
-* Add missing class declaration in README (sfozz)
-* array_matching is contraindicated (Sharif Nassar)
-* Convert port Fixnum into strings (Sharif Nassar)
-* Update test framework to the modern age (Ken Barber)
-* working with ip6tables support (wuwx)
-* Remove gemfile.lock and add to gitignore (William Van Hevelingen)
-* Update travis and gemfile to be like stdlib travis files (William Van Hevelingen)
-* Add support for -m socket option (Ken Barber)
-* Add support for single --sport and --dport parsing (Ken Barber)
-* Fix tests for Ruby 1.9.3 from 3e13bf3 (Dan Carley)
-* Mock Resolv.getaddress in #host_to_ip (Dan Carley)
-* Update docs for source and dest - they are not arrays (Ken Barber)
-
----------------------------------------
-
-### 0.0.4 - 2011/12/05
-
-This release adds two new parameters, 'uid' and 'gid'. As a part of the owner module, these params allow you to specify a uid, username, gid, or group got a match:
-
-    firewall { '497 match uid':
-      port => '123',
-      proto => 'mangle',
-      chain => 'OUTPUT',
-      action => 'drop'
-      uid => '123'
-    }
-
-This release also adds value munging for the 'log_level', 'source', and 'destination' parameters. The 'source' and 'destination' now support hostnames:
-
-    firewall { '498 accept from puppetlabs.com':
-      port => '123',
-      proto => 'tcp',
-      source => 'puppetlabs.com',
-      action => 'accept'
-    }
-
-
-The 'log_level' parameter now supports using log level names, such as 'warn', 'debug', and 'panic':
-
-    firewall { '499 logging':
-      port => '123',
-      proto => 'udp',
-      log_level => 'debug',
-      action => 'drop'
-    }
-
-Additional changes include iptables and ip6tables version facts, general whitespace cleanup, and adding additional unit tests.
-
-##### Changes
-
-* (#10957) add iptables_version and ip6tables_version facts
-* (#11093) Improve log_level property so it converts names to numbers
-* (#10723) Munge hostnames and IPs to IPs with CIDR
-* (#10718) Add owner-match support
-* (#10997) Add fixtures for ipencap
-* (#11034) Whitespace cleanup
-* (#10690) add port property support to ip6tables
-
----------------------------------------
-
-### 0.0.3 - 2011/11/12
-
-This release introduces a new parameter 'port' which allows you to set both
-source and destination ports for a match:
-
-    firewall { "500 allow NTP requests":
-      port => "123",
-      proto => "udp",
-      action => "accept",
-    }
-
-We also have the limit parameter finally working:
-
-    firewall { "500 limit HTTP requests":
-      dport => 80,
-      proto => tcp,
-      limit => "60/sec",
-      burst => 30,
-      action => accept,
-    }
-
-State ordering has been fixed now, and more characters are allowed in the
-namevar:
-
-* Alphabetical
-* Numbers
-* Punctuation
-* Whitespace
-
-##### Changes
-
-* (#10693) Ensure -m limit is added for iptables when using 'limit' param
-* (#10690) Create new port property
-* (#10700) allow additional characters in comment string
-* (#9082) Sort iptables --state option values internally to keep it consistent across runs
-* (#10324) Remove extraneous whitespace from iptables rule line in spec tests
-
----------------------------------------
-
-### 0.0.2 - 2011/10/26
-
-This is largely a maintanence and cleanup release, but includes the ability to
-specify ranges of ports in the sport/dport parameter:
-
-    firewall { "500 allow port range":
-      dport => ["3000-3030","5000-5050"],
-      sport => ["1024-65535"],
-      action => "accept",
-    }
-
-##### Changes
-
-* (#10295) Work around bug #4248 whereby the puppet/util paths are not being loaded correctly on the puppetmaster
-* (#10002) Change to dport and sport to handle ranges, and fix handling of name to name to port
-* (#10263) Fix tests on Puppet 2.6.x
-* (#10163) Cleanup some of the inline documentation and README file to align with general forge usage
-
----------------------------------------
-
-### 0.0.1 - 2011/10/18
-
-Initial release.
-
-##### Changes
-
-* (#9362) Create action property and perform transformation for accept, drop, reject value for iptables jump parameter
-* (#10088) Provide a customised version of CONTRIBUTING.md
-* (#10026) Re-arrange provider and type spec files to align with Puppet
-* (#10026) Add aliases for test,specs,tests to Rakefile and provide -T as default
-* (#9439) fix parsing and deleting existing rules
-* (#9583) Fix provider detection for gentoo and unsupported linuxes for the iptables provider
-* (#9576) Stub provider so it works properly outside of Linux
-* (#9576) Align spec framework with Puppet core
-* and lots of other earlier development tasks ...
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CONTRIBUTING.md
deleted file mode 100644
index 630ba8581eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/CONTRIBUTING.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# How to contribute
-
-Third-party patches are essential for keeping puppet great. We simply can't
-access the huge number of platforms and myriad configurations for running
-puppet. We want to keep it as easy as possible to contribute changes that
-get things working in your environment. There are a few guidelines that we
-need contributors to follow so that we can have a chance of keeping on
-top of things.
-
-## Getting Started
-
-* Make sure you have a [Jira account](http://tickets.puppetlabs.com)
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub
-
-## Making Changes
-
-* Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * Only target release branches if you are certain your fix must be on that
-    branch.
-  * To quickly create a topic branch based on master; `git branch
-    fix/master/my_contribution master` then checkout the new branch with `git
-    checkout fix/master/my_contribution`.  Please avoid working directly on the
-    `master` branch.
-* Make commits of logical units.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-
-````
-    (MODULES-1234) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    from our issue tracker.  The body describes the behavior without the patch,
-    why this is a problem, and how the patch fixes the problem when applied.
-````
-
-* Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken.
-
-## Making Trivial Changes
-
-### Documentation
-
-For changes of a trivial nature to comments and documentation, it is not
-always necessary to create a new ticket in Jira. In this case, it is
-appropriate to start the first line of a commit with '(doc)' instead of
-a ticket number. 
-
-````
-    (doc) Add documentation commit example to CONTRIBUTING
-
-    There is no example for contributing a documentation commit
-    to the Puppet repository. This is a problem because the contributor
-    is left to assume how a commit of this nature may appear.
-
-    The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a 
-    non-documentation related commit. The body describes the nature of
-    the new documentation or comments added.
-````
-
-## Submitting Changes
-
-* Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla).
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository in the puppetlabs organization.
-* Update your Jira ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Merge).
-  * Include a link to the pull request in the ticket.
-
-# Additional Resources
-
-* [More information on contributing](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-* [Bug tracker (Jira)](http://tickets.puppetlabs.com)
-* [Contributor License Agreement](http://links.puppetlabs.com/cla)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #puppet-dev IRC channel on freenode.org
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Gemfile
deleted file mode 100644
index 9e6eaa54163..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Gemfile
+++ /dev/null
@@ -1,18 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet',           :require => false
-  gem 'serverspec',             :require => false
-  gem 'beaker-rspec',           :require => false
-  gem 'puppet-lint',            :require => false
-  gem 'pry',                    :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/LICENSE
deleted file mode 100644
index 1d196fc30c9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Puppet Firewall Module - Puppet module for managing Firewalls
-
-Copyright (C) 2011-2013 Puppet Labs, Inc.
-Copyright (C) 2011 Jonathan Boyett
-Copyright (C) 2011 Media Temple, Inc.
-
-Some of the iptables code was taken from puppet-iptables which was:
-
-Copyright (C) 2011 Bob.sh Limited
-Copyright (C) 2008 Camptocamp Association
-Copyright (C) 2007 Dmitri Priimak
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Modulefile
deleted file mode 100644
index 975614762f8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'puppetlabs-firewall'
-version '1.1.1'
-source 'git://github.com/puppetlabs/puppetlabs-firewall.git'
-author 'puppetlabs'
-license 'ASL 2.0'
-summary 'Firewall Module'
-description 'Manages Firewalls such as iptables'
-project_page 'http://forge.puppetlabs.com/puppetlabs/firewall'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/README.markdown
deleted file mode 100644
index 24705149e78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/README.markdown
+++ /dev/null
@@ -1,429 +0,0 @@
-#firewall
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-firewall.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-firewall)
-
-####Table of Contents
-
-1. [Overview - What is the Firewall module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with Firewall](#setup)
-    * [What Firewall affects](#what-firewall-affects)
-    * [Setup Requirements](#setup-requirements)
-    * [Beginning with Firewall](#beginning-with-firewall)
-    * [Upgrading](#upgrading)
-4. [Usage - Configuration and customization options](#usage)
-    * [Default rules - Setting up general configurations for all firewalls](#default-rules)
-    * [Application-specific rules - Options for configuring and managing firewalls across applications](#application-specific-rules)
-    * [Other Rules](#other-rules)
-5. [Reference - An under-the-hood peek at what the module is doing](#reference)
-6. [Limitations - OS compatibility, etc.](#limitations)
-7. [Development - Guide for contributing to the module](#development)
-    * [Tests - Testing your configuration](#tests)
-
-##Overview
-
-The Firewall module lets you manage firewall rules with Puppet.
-
-##Module Description
-
-PuppetLabs' Firewall introduces the resource `firewall`, which is used to manage and configure firewall rules from within the Puppet DSL. This module offers support for iptables, ip6tables, and ebtables.
-
-The module also introduces the resource `firewallchain`, which allows you to manage chains or firewall lists. At the moment, only iptables and ip6tables chains are supported.
-
-##Setup
-
-###What Firewall affects:
-
-* every node running a firewall
-* system's firewall settings
-* connection settings for managed nodes
-* unmanaged resources (get purged)
-* site.pp
-
-###Setup Requirements
-
-Firewall uses Ruby-based providers, so you must have [pluginsync enabled](http://docs.puppetlabs.com/guides/plugins_in_modules.html#enabling-pluginsync).
-
-###Beginning with Firewall
-
-To begin, you need to provide some initial top-scope configuration to ensure your firewall configurations are ordered properly and you do not lock yourself out of your box or lose any configuration.
-
-Persistence of rules between reboots is handled automatically, although there are known issues with ip6tables on older Debian/Ubuntu, as well as known issues with ebtables.
-
-In your `site.pp` (or some similarly top-scope file), set up a metatype to purge unmanaged firewall resources. This will clear any existing rules and make sure that only rules defined in Puppet exist on the machine.
-
-    resources { "firewall":
-      purge => true
-    }
-
-Next, set up the default parameters for all of the firewall rules you will be establishing later. These defaults will ensure that the pre and post classes (you will be setting up in just a moment) are run in the correct order to avoid locking you out of your box during the first puppet run.
-
-    Firewall {
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-
-You also need to declare the `my_fw::pre` & `my_fw::post` classes so that dependencies are satisfied. This can be achieved using an External Node Classifier or the following
-
-    class { ['my_fw::pre', 'my_fw::post']: }
-
-Finally, you should include the `firewall` class to ensure the correct packages are installed.
-
-    class { 'firewall': }
-
-Now to create the `my_fw::pre` and `my_fw::post` classes. Firewall acts on your running firewall, making immediate changes as the catalog executes. Defining default pre and post rules allows you provide global defaults for your hosts before and after any custom rules; it is also required to avoid locking yourself out of your own boxes when Puppet runs. This approach employs a whitelist setup, so you can define what rules you want and everything else is ignored rather than removed.
-
-The `pre` class should be located in `my_fw/manifests/pre.pp` and should contain any default rules to be applied first.
-
-    class my_fw::pre {
-      Firewall {
-        require => undef,
-      }
-
-      # Default firewall rules
-      firewall { '000 accept all icmp':
-        proto   => 'icmp',
-        action  => 'accept',
-      }->
-      firewall { '001 accept all to lo interface':
-        proto   => 'all',
-        iniface => 'lo',
-        action  => 'accept',
-      }->
-      firewall { '002 accept related established rules':
-        proto   => 'all',
-        state => ['RELATED', 'ESTABLISHED'],
-        action  => 'accept',
-      }
-    }
-
-The rules in `pre` should allow basic networking (such as ICMP and TCP), as well as ensure that existing connections are not closed.
-
-The `post` class should be located in `my_fw/manifests/post.pp` and include any default rules to be applied last.
-
-    class my_fw::post {
-      firewall { '999 drop all':
-        proto   => 'all',
-        action  => 'drop',
-        before  => undef,
-      }
-    }
-
-To put it all together: the `require` parameter in `Firewall {}` ensures `my_fw::pre` is run before any other rules and the `before` parameter ensures `my_fw::post` is run after any other rules. So the run order is:
-
-* run the rules in `my_fw::pre`
-* run your rules (defined in code)
-* run the rules in `my_fw::post`
-
-###Upgrading
-
-####Upgrading from version 0.2.0 and newer
-
-Upgrade the module with the puppet module tool as normal:
-
-    puppet module upgrade puppetlabs/firewall
-
-####Upgrading from version 0.1.1 and older
-
-Start by upgrading the module using the puppet module tool:
-
-    puppet module upgrade puppetlabs/firewall
-
-Previously, you would have required the following in your `site.pp` (or some other global location):
-
-    # Always persist firewall rules
-    exec { 'persist-firewall':
-      command     => $operatingsystem ? {
-        'debian'          => '/sbin/iptables-save > /etc/iptables/rules.v4',
-        /(RedHat|CentOS)/ => '/sbin/iptables-save > /etc/sysconfig/iptables',
-      },
-      refreshonly => true,
-    }
-    Firewall {
-      notify  => Exec['persist-firewall'],
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-    Firewallchain {
-      notify  => Exec['persist-firewall'],
-    }
-    resources { "firewall":
-      purge => true
-    }
-
-With the latest version, we now have in-built persistence, so this is no longer needed. However, you will still need some basic setup to define pre & post rules.
-
-    resources { "firewall":
-      purge => true
-    }
-    Firewall {
-      before  => Class['my_fw::post'],
-      require => Class['my_fw::pre'],
-    }
-    class { ['my_fw::pre', 'my_fw::post']: }
-    class { 'firewall': }
-
-Consult the the documentation below for more details around the classes `my_fw::pre` and `my_fw::post`.
-
-##Usage
-
-There are two kinds of firewall rules you can use with Firewall: default rules and application-specific rules. Default rules apply to general firewall settings, whereas application-specific rules manage firewall settings of a specific application, node, etc.
-
-All rules employ a numbering system in the resource's title that is used for ordering. When titling your rules, make sure you prefix the rule with a number.
-
-      000 this runs first
-      999 this runs last
-
-###Default rules
-
-You can place default rules in either `my_fw::pre` or `my_fw::post`, depending on when you would like them to run. Rules placed in the `pre` class will run first, rules in the `post` class, last.
-
-Depending on the provider, the title of the rule can be stored using the comment feature of the underlying firewall subsystem. Values can match `/^\d+[[:alpha:][:digit:][:punct:][:space:]]+$/`.
-
-####Examples of default rules
-
-Basic accept ICMP request example:
-
-    firewall { "000 accept all icmp requests":
-      proto  => "icmp",
-      action => "accept",
-    }
-
-Drop all:
-
-    firewall { "999 drop all other requests":
-      action => "drop",
-    }
-
-###Application-specific rules
-
-Puppet doesn't care where you define rules, and this means that you can place
-your firewall resources as close to the applications and services that you
-manage as you wish.  If you use the [roles and profiles
-pattern](https://puppetlabs.com/learn/roles-profiles-introduction) then it
-would make sense to create your firewall rules in the profiles, so that they
-remain close to the services managed by the profile.
-
-An example of this might be:
-
-```puppet
-class profile::apache {
-  include apache
-  apache::vhost { 'mysite': ensure => present }
-
-  firewall { '100 allow http and https access':
-    port   => [80, 443],
-    proto  => tcp,
-    action => accept,
-  }
-}
-```
-
-
-However, if you're not using that pattern then you can place them directly into
-the individual module that manages a service, such as:
-
-```puppet
-class apache {
-  firewall { '100 allow http and https access':
-    port   => [80, 443],
-    proto  => tcp,
-    action => accept,
-  }
-  # ... the rest of your code ...
-}
-```
-
-This means if someone includes either the profile:
-
-```puppet
-include profile::apache
-```
-
-Or the module, if you're not using roles and profiles:
-
-```puppet
-  include ::apache
-```
-
-Then they would automatically get appropriate firewall rules.
-
-###Other rules
-
-You can also apply firewall rules to specific nodes. Usually, you will want to put the firewall rule in another class and apply that class to a node. But you can apply a rule to a node.
-
-    node 'foo.bar.com' {
-      firewall { '111 open port 111':
-        dport => 111
-      }
-    }
-
-You can also do more complex things with the `firewall` resource. Here we are doing some NAT configuration.
-
-    firewall { '100 snat for network foo2':
-      chain    => 'POSTROUTING',
-      jump     => 'MASQUERADE',
-      proto    => 'all',
-      outiface => "eth0",
-      source   => '10.1.2.0/24',
-      table    => 'nat',
-    }
-
-In the below example, we are creating a new chain and forwarding any port 5000 access to it.
-
-    firewall { '100 forward to MY_CHAIN':
-      chain   => 'INPUT',
-      jump    => 'MY_CHAIN',
-    }
-    # The namevar here is in the format chain_name:table:protocol
-    firewallchain { 'MY_CHAIN:filter:IPv4':
-      ensure  => present,
-    }
-    firewall { '100 my rule':
-      chain   => 'MY_CHAIN',
-      action  => 'accept',
-      proto   => 'tcp',
-      dport   => 5000,
-    }
-
-###Additional Information
-
-You can access the inline documentation:
-
-    puppet describe firewall
-
-Or
-
-    puppet doc -r type
-    (and search for firewall)
-
-##Reference
-
-Classes:
-
-* [firewall](#class-firewall)
-
-Types:
-
-* [firewall](#type-firewall)
-* [firewallchain](#type-firewallchain)
-
-Facts:
-
-* [ip6tables_version](#fact-ip6tablesversion)
-* [iptables_version](#fact-iptablesversion)
-* [iptables_persistent_version](#fact-iptablespersistentversion)
-
-###Class: firewall
-
-This class is provided to do the basic setup tasks required for using the firewall resources.
-
-At the moment this takes care of:
-
-* iptables-persistent package installation
-
-You should include the class for nodes that need to use the resources in this module. For example
-
-    class { 'firewall': }
-
-####`ensure`
-
-Indicates the state of `iptables` on your system, allowing you to disable `iptables` if desired.
-
-Can either be `running` or `stopped`. Default to `running`.
-
-###Type: firewall
-
-This type provides the capability to manage firewall rules within puppet.
-
-For more documentation on the type, access the 'Types' tab on the Puppet Labs Forge:
-
-<http://forge.puppetlabs.com/puppetlabs/firewall#types>
-
-###Type:: firewallchain
-
-This type provides the capability to manage rule chains for firewalls.
-
-For more documentation on the type, access the 'Types' tab on the Puppet Labs Forge:
-
-<http://forge.puppetlabs.com/puppetlabs/firewall#types>
-
-###Fact: ip6tables_version
-
-The module provides a Facter fact that can be used to determine what the default version of ip6tables is for your operating system/distribution.
-
-###Fact: iptables_version
-
-The module provides a Facter fact that can be used to determine what the default version of iptables is for your operating system/distribution.
-
-###Fact: iptables_persistent_version
-
-Retrieves the version of iptables-persistent from your OS. This is a Debian/Ubuntu specific fact.
-
-##Limitations
-
-###SLES
-
-The `socket` parameter is not supported on SLES.  In this release it will cause
-the catalog to fail with iptables failures, rather than correctly warn you that
-the features are unusable.
-
-###Oracle Enterprise Linux
-
-The `socket` and `owner` parameters are unsupported on Oracle Enterprise Linux
-when the "Unbreakable" kernel is used. These may function correctly when using
-the stock RedHat kernel instead. Declaring either of these parameters on an
-unsupported system will result in iptable rules failing to apply.
-
-###Other
-
-Bugs can be reported using JIRA issues
-
-<http://tickets.puppetlabs.com>
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-For this particular module, please also read CONTRIBUTING.md before contributing.
-
-Currently we support:
-
-* iptables
-* ip6tables
-* ebtables (chains only)
-
-But plans are to support lots of other firewall implementations:
-
-* FreeBSD (ipf)
-* Mac OS X (ipfw)
-* OpenBSD (pf)
-* Cisco (ASA and basic access lists)
-
-If you have knowledge in these technologies, know how to code, and wish to contribute to this project, we would welcome the help.
-
-###Testing
-
-Make sure you have:
-
-* rake
-* bundler
-
-Install the necessary gems:
-
-    bundle install
-
-And run the tests from the root of the source code:
-
-    rake test
-
-If you have a copy of Vagrant 1.1.0 you can also run the system tests:
-
-    RSPEC_SET=debian-606-x64 rake spec:system
-    RSPEC_SET=centos-58-x64 rake spec:system
-
-*Note:* system testing is fairly alpha at this point, your mileage may vary.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Rakefile
deleted file mode 100644
index 8b12070304c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/Rakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.ignore_paths = ['vendor/**/*.pp']
-
-task :default do
-  sh %{rake -T}
-end
-
-desc 'Run reasonably quick tests for CI'
-task :ci => [
-  :lint,
-  :spec,
-]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb
deleted file mode 100644
index 3dce27f70cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/ip6tables_version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Facter.add(:ip6tables_version) do
-  confine :kernel => :linux
-  setcode do
-    version = Facter::Util::Resolution.exec('ip6tables --version')
-    if version
-      version.match(/\d+\.\d+\.\d+/).to_s
-    else
-      nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb
deleted file mode 100644
index 80bf9dea1a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_persistent_version.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-Facter.add(:iptables_persistent_version) do
-  confine :operatingsystem => %w{Debian Ubuntu}
-  setcode do
-    # Throw away STDERR because dpkg >= 1.16.7 will make some noise if the
-    # package isn't currently installed.
-    cmd = "dpkg-query -Wf '${Version}' iptables-persistent 2>/dev/null"
-    version = Facter::Util::Resolution.exec(cmd)
-
-    if version.nil? or !version.match(/\d+\.\d+/)
-      nil
-    else
-      version
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb
deleted file mode 100644
index 6f7ae564740..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/facter/iptables_version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Facter.add(:iptables_version) do
-  confine :kernel => :linux
-  setcode do
-    version = Facter::Util::Resolution.exec('iptables --version')
-    if version
-      version.match(/\d+\.\d+\.\d+/).to_s
-    else
-      nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb
deleted file mode 100644
index c6b0b10bb13..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-class Puppet::Provider::Firewall < Puppet::Provider
-
-  # Prefetch our rule list. This is ran once every time before any other
-  # action (besides initialization of each object).
-  def self.prefetch(resources)
-    debug("[prefetch(resources)]")
-    instances.each do |prov|
-      if resource = resources[prov.name] || resources[prov.name.downcase]
-        resource.provider = prov
-      end
-    end
-  end
-
-  # Look up the current status. This allows us to conventiently look up
-  # existing status with properties[:foo].
-  def properties
-    if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
-      @property_hash[:ensure] = :absent if @property_hash.empty?
-    end
-    @property_hash.dup
-  end
-
-  # Pull the current state of the list from the full list.  We're
-  # getting some double entendre here....
-  def query
-    self.class.instances.each do |instance|
-      if instance.name == self.name or instance.name.downcase == self.name
-        return instance.properties
-      end
-    end
-    nil
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb
deleted file mode 100644
index e1ce01af6ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/ip6tables.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source => :iptables do
-  @doc = "Ip6tables type provider"
-
-  has_feature :iptables
-  has_feature :connection_limiting
-  has_feature :hop_limiting
-  has_feature :rate_limiting
-  has_feature :recent_limiting
-  has_feature :snat
-  has_feature :dnat
-  has_feature :interface_match
-  has_feature :icmp_match
-  has_feature :owner
-  has_feature :state_match
-  has_feature :reject_type
-  has_feature :log_level
-  has_feature :log_prefix
-  has_feature :mark
-  has_feature :tcp_flags
-  has_feature :pkttype
-  has_feature :ishasmorefrags
-  has_feature :islastfrag
-  has_feature :isfirstfrag
-
-  optional_commands({
-    :ip6tables      => 'ip6tables',
-    :ip6tables_save => 'ip6tables-save',
-  })
-
-  def initialize(*args)
-    if Facter.fact('ip6tables_version').value.match /1\.3\.\d/
-      raise ArgumentError, 'The ip6tables provider is not supported on version 1.3 of iptables'
-    else
-      super
-    end
-  end
-
-  def self.iptables(*args)
-    ip6tables(*args)
-  end
-
-  def self.iptables_save(*args)
-    ip6tables_save(*args)
-  end
-
-  @protocol = "IPv6"
-
-  @resource_map = {
-    :burst => "--limit-burst",
-    :connlimit_above => "-m connlimit --connlimit-above",
-    :connlimit_mask => "--connlimit-mask",
-    :connmark => "-m connmark --mark",
-    :ctstate => "-m conntrack --ctstate",
-    :destination => "-d",
-    :dport => "-m multiport --dports",
-    :gid => "-m owner --gid-owner",
-    :icmp => "-m icmp6 --icmpv6-type",
-    :iniface => "-i",
-    :jump => "-j",
-    :hop_limit => "-m hl --hl-eq",
-    :limit => "-m limit --limit",
-    :log_level => "--log-level",
-    :log_prefix => "--log-prefix",
-    :name => "-m comment --comment",
-    :outiface => "-o",
-    :port => '-m multiport --ports',
-    :proto => "-p",
-    :rdest => "--rdest",
-    :reap => "--reap",
-    :recent => "-m recent",
-    :reject => "--reject-with",
-    :rhitcount => "--hitcount",
-    :rname => "--name",
-    :rseconds => "--seconds",
-    :rsource => "--rsource",
-    :rttl => "--rttl",
-    :source => "-s",
-    :state => "-m state --state",
-    :sport => "-m multiport --sports",
-    :table => "-t",
-    :todest => "--to-destination",
-    :toports => "--to-ports",
-    :tosource => "--to-source",
-    :uid => "-m owner --uid-owner",
-    :pkttype => "-m pkttype --pkt-type",
-    :ishasmorefrags => "-m frag --fragid 0 --fragmore",
-    :islastfrag => "-m frag --fragid 0 --fraglast",
-    :isfirstfrag => "-m frag --fragid 0 --fragfirst",
-  }
-
-  # These are known booleans that do not take a value, but we want to munge
-  # to true if they exist.
-  @known_booleans = [:ishasmorefrags, :islastfrag, :isfirstfrag, :rsource, :rdest, :reap, :rttl]
-
-  # Create property methods dynamically
-  (@resource_map.keys << :chain << :table << :action).each do |property|
-    if @known_booleans.include?(property) then
-      # The boolean properties default to '' which should be read as false
-      define_method "#{property}" do
-        @property_hash[property] = :false if @property_hash[property] == nil
-        @property_hash[property.to_sym]
-      end
-    else
-      define_method "#{property}" do
-        @property_hash[property.to_sym]
-      end
-    end
-
-    if property == :chain
-      define_method "#{property}=" do |value|
-        if @property_hash[:chain] != value
-          raise ArgumentError, "Modifying the chain for existing rules is not supported."
-        end
-      end
-    else
-      define_method "#{property}=" do |value|
-        @property_hash[:needs_change] = true
-      end
-    end
-  end
-
-  # This is the order of resources as they appear in iptables-save output,
-  # we need it to properly parse and apply rules, if the order of resource
-  # changes between puppet runs, the changed rules will be re-applied again.
-  # This order can be determined by going through iptables source code or just tweaking and trying manually
-  # (Note: on my CentOS 6.4 ip6tables-save returns -m frag on the place
-  # I put it when calling the command. So compability with manual changes
-  # not provided with current parser [georg.koester])
-  @resource_list = [:table, :source, :destination, :iniface, :outiface,
-    :proto, :ishasmorefrags, :islastfrag, :isfirstfrag, :gid, :uid, :sport, :dport,
-    :port, :pkttype, :name, :state, :ctstate, :icmp, :hop_limit, :limit, :burst,
-    :recent, :rseconds, :reap, :rhitcount, :rttl, :rname, :rsource, :rdest,
-    :jump, :todest, :tosource, :toports, :log_level, :log_prefix, :reject,
-    :connlimit_above, :connlimit_mask, :connmark]
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb
deleted file mode 100644
index 5ad10125d7a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewall/iptables.rb
+++ /dev/null
@@ -1,501 +0,0 @@
-require 'puppet/provider/firewall'
-require 'digest/md5'
-
-Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Firewall do
-  include Puppet::Util::Firewall
-
-  @doc = "Iptables type provider"
-
-  has_feature :iptables
-  has_feature :connection_limiting
-  has_feature :rate_limiting
-  has_feature :recent_limiting
-  has_feature :snat
-  has_feature :dnat
-  has_feature :interface_match
-  has_feature :icmp_match
-  has_feature :owner
-  has_feature :state_match
-  has_feature :reject_type
-  has_feature :log_level
-  has_feature :log_prefix
-  has_feature :mark
-  has_feature :tcp_flags
-  has_feature :pkttype
-  has_feature :isfragment
-  has_feature :socket
-  has_feature :address_type
-  has_feature :iprange
-  has_feature :ipsec_dir
-  has_feature :ipsec_policy
-  has_feature :mask
-
-  optional_commands({
-    :iptables => 'iptables',
-    :iptables_save => 'iptables-save',
-  })
-
-  defaultfor :kernel => :linux
-
-  iptables_version = Facter.fact('iptables_version').value
-  if (iptables_version and Puppet::Util::Package.versioncmp(iptables_version, '1.4.1') < 0)
-    mark_flag = '--set-mark'
-  else
-    mark_flag = '--set-xmark'
-  end
-
-  @protocol = "IPv4"
-
-  @resource_map = {
-    :burst           => "--limit-burst",
-    :connlimit_above => "-m connlimit --connlimit-above",
-    :connlimit_mask  => "--connlimit-mask",
-    :connmark        => "-m connmark --mark",
-    :ctstate         => "-m conntrack --ctstate",
-    :destination     => "-d",
-    :dst_type        => "-m addrtype --dst-type",
-    :dst_range       => "-m iprange --dst-range",
-    :dport           => ["-m multiport --dports", "--dport"],
-    :gid             => "-m owner --gid-owner",
-    :icmp            => "-m icmp --icmp-type",
-    :iniface         => "-i",
-    :jump            => "-j",
-    :limit           => "-m limit --limit",
-    :log_level       => "--log-level",
-    :log_prefix      => "--log-prefix",
-    :name            => "-m comment --comment",
-    :outiface        => "-o",
-    :port            => '-m multiport --ports',
-    :proto           => "-p",
-    :random          => "--random",
-    :rdest           => "--rdest",
-    :reap            => "--reap",
-    :recent          => "-m recent",
-    :reject          => "--reject-with",
-    :rhitcount       => "--hitcount",
-    :rname           => "--name",
-    :rseconds        => "--seconds",
-    :rsource         => "--rsource",
-    :rttl            => "--rttl",
-    :set_mark        => mark_flag,
-    :socket          => "-m socket",
-    :source          => "-s",
-    :src_type        => "-m addrtype --src-type",
-    :src_range       => "-m iprange --src-range",
-    :sport           => ["-m multiport --sports", "--sport"],
-    :state           => "-m state --state",
-    :table           => "-t",
-    :tcp_flags       => "-m tcp --tcp-flags",
-    :todest          => "--to-destination",
-    :toports         => "--to-ports",
-    :tosource        => "--to-source",
-    :uid             => "-m owner --uid-owner",
-    :pkttype         => "-m pkttype --pkt-type",
-    :isfragment      => "-f",
-    :ipsec_dir       => "-m policy --dir",
-    :ipsec_policy    => "--pol",
-    :mask            => '--mask',
-  }
-
-  # These are known booleans that do not take a value, but we want to munge
-  # to true if they exist.
-  @known_booleans = [
-    :isfragment,
-    :random,
-    :rdest,
-    :reap,
-    :rsource,
-    :rttl,
-    :socket
-  ]
-
-
-  # Create property methods dynamically
-  (@resource_map.keys << :chain << :table << :action).each do |property|
-    if @known_booleans.include?(property) then
-      # The boolean properties default to '' which should be read as false
-      define_method "#{property}" do
-        @property_hash[property] = :false if @property_hash[property] == nil
-        @property_hash[property.to_sym]
-      end
-    else
-      define_method "#{property}" do
-        @property_hash[property.to_sym]
-      end
-    end
-
-    if property == :chain
-      define_method "#{property}=" do |value|
-        if @property_hash[:chain] != value
-          raise ArgumentError, "Modifying the chain for existing rules is not supported."
-        end
-      end
-    else
-      define_method "#{property}=" do |value|
-        @property_hash[:needs_change] = true
-      end
-    end
-  end
-
-  # This is the order of resources as they appear in iptables-save output,
-  # we need it to properly parse and apply rules, if the order of resource
-  # changes between puppet runs, the changed rules will be re-applied again.
-  # This order can be determined by going through iptables source code or just tweaking and trying manually
-  @resource_list = [
-    :table, :source, :destination, :iniface, :outiface, :proto, :isfragment,
-    :src_range, :dst_range, :tcp_flags, :gid, :uid, :sport, :dport, :port,
-    :dst_type, :src_type, :socket, :pkttype, :name, :ipsec_dir, :ipsec_policy,
-    :state, :ctstate, :icmp, :limit, :burst, :recent, :rseconds, :reap,
-    :rhitcount, :rttl, :rname, :mask, :rsource, :rdest, :jump, :todest,
-    :tosource, :toports, :random, :log_prefix, :log_level, :reject, :set_mark,
-    :connlimit_above, :connlimit_mask, :connmark
-  ]
-
-  def insert
-    debug 'Inserting rule %s' % resource[:name]
-    iptables insert_args
-  end
-
-  def update
-    debug 'Updating rule %s' % resource[:name]
-    iptables update_args
-  end
-
-  def delete
-    debug 'Deleting rule %s' % resource[:name]
-    iptables delete_args
-  end
-
-  def exists?
-    properties[:ensure] != :absent
-  end
-
-  # Flush the property hash once done.
-  def flush
-    debug("[flush]")
-    if @property_hash.delete(:needs_change)
-      notice("Properties changed - updating rule")
-      update
-    end
-    persist_iptables(self.class.instance_variable_get(:@protocol))
-    @property_hash.clear
-  end
-
-  def self.instances
-    debug "[instances]"
-    table = nil
-    rules = []
-    counter = 1
-
-    # String#lines would be nice, but we need to support Ruby 1.8.5
-    iptables_save.split("\n").each do |line|
-      unless line =~ /^\#\s+|^\:\S+|^COMMIT|^FATAL/
-        if line =~ /^\*/
-          table = line.sub(/\*/, "")
-        else
-          if hash = rule_to_hash(line, table, counter)
-            rules << new(hash)
-            counter += 1
-          end
-        end
-      end
-    end
-    rules
-  end
-
-  def self.rule_to_hash(line, table, counter)
-    hash = {}
-    keys = []
-    values = line.dup
-
-    ####################
-    # PRE-PARSE CLUDGING
-    ####################
-
-    # --tcp-flags takes two values; we cheat by adding " around it
-    # so it behaves like --comment
-    values = values.sub(/--tcp-flags (\S*) (\S*)/, '--tcp-flags "\1 \2"')
-    # we do a similar thing for negated address masks (source and destination).
-    values = values.sub(/(-\S+) (!)\s?(\S*)/,'\1 "\2 \3"')
-    # the actual rule will have the ! mark before the option.
-    values = values.sub(/(!)\s*(-\S+)\s*(\S*)/, '\2 "\1 \3"')
-    # The match extension for tcp & udp are optional and throws off the @resource_map.
-    values = values.sub(/-m (tcp|udp) (--(s|d)port|-m multiport)/, '\2')
-
-    # Trick the system for booleans
-    @known_booleans.each do |bool|
-      # append "true" because all params are expected to have values
-      if bool == :isfragment then
-        # -f requires special matching:
-        # only replace those -f that are not followed by an l to
-        # distinguish between -f and the '-f' inside of --tcp-flags.
-        values = values.sub(/-f(?!l)(?=.*--comment)/, '-f true')
-      else
-        values = values.sub(/#{@resource_map[bool]}/, "#{@resource_map[bool]} true")
-      end
-    end
-
-    ############
-    # Populate parser_list with used value, in the correct order
-    ############
-    map_index={}
-    @resource_map.each_pair do |map_k,map_v|
-      [map_v].flatten.each do |v|
-        ind=values.index(/\s#{v}/)
-        next unless ind
-        map_index[map_k]=ind
-     end
-    end
-    # Generate parser_list based on the index of the found option
-    parser_list=[]
-    map_index.sort_by{|k,v| v}.each{|mapi| parser_list << mapi.first }
-
-    ############
-    # MAIN PARSE
-    ############
-
-    # Here we iterate across our values to generate an array of keys
-    parser_list.reverse.each do |k|
-      resource_map_key = @resource_map[k]
-      [resource_map_key].flatten.each do |opt|
-        if values.slice!(/\s#{opt}/)
-          keys << k
-          break
-        end
-      end
-    end
-
-    # Manually remove chain
-    values.slice!('-A')
-    keys << :chain
-
-    # Here we generate the main hash
-    keys.zip(values.scan(/"[^"]*"|\S+/).reverse) { |f, v| hash[f] = v.gsub(/"/, '') }
-
-    #####################
-    # POST PARSE CLUDGING
-    #####################
-
-    # Normalise all rules to CIDR notation.
-    [:source, :destination].each do |prop|
-      next if hash[prop].nil?
-      m = hash[prop].match(/(!?)\s?(.*)/)
-      neg = "! " if m[1] == "!"
-      hash[prop] = "#{neg}#{Puppet::Util::IPCidr.new(m[2]).cidr}"
-    end
-
-    [:dport, :sport, :port, :state, :ctstate].each do |prop|
-      hash[prop] = hash[prop].split(',') if ! hash[prop].nil?
-    end
-
-    # Convert booleans removing the previous cludge we did
-    @known_booleans.each do |bool|
-      if hash[bool] != nil then
-        if hash[bool] != "true" then
-          raise "Parser error: #{bool} was meant to be a boolean but received value: #{hash[bool]}."
-        end
-      end
-    end
-
-    # Our type prefers hyphens over colons for ranges so ...
-    # Iterate across all ports replacing colons with hyphens so that ranges match
-    # the types expectations.
-    [:dport, :sport, :port].each do |prop|
-      next unless hash[prop]
-      hash[prop] = hash[prop].collect do |elem|
-        elem.gsub(/:/,'-')
-      end
-    end
-
-    # States should always be sorted. This ensures that the output from
-    # iptables-save and user supplied resources is consistent.
-    hash[:state]   = hash[:state].sort   unless hash[:state].nil?
-    hash[:ctstate] = hash[:ctstate].sort unless hash[:ctstate].nil?
-
-    # This forces all existing, commentless rules or rules with invalid comments to be moved 
-    # to the bottom of the stack.
-    # Puppet-firewall requires that all rules have comments (resource names) and match this 
-    # regex and will fail if a rule in iptables does not have a comment. We get around this 
-    # by appending a high level
-    if ! hash[:name]
-      num = 9000 + counter
-      hash[:name] = "#{num} #{Digest::MD5.hexdigest(line)}"
-    elsif not /^\d+[[:alpha:][:digit:][:punct:][:space:]]+$/ =~ hash[:name]
-      num = 9000 + counter
-      hash[:name] = "#{num} #{/([[:alpha:][:digit:][:punct:][:space:]]+)/.match(hash[:name])[1]}"
-    end
-
-    # Iptables defaults to log_level '4', so it is omitted from the output of iptables-save.
-    # If the :jump value is LOG and you don't have a log-level set, we assume it to be '4'.
-    if hash[:jump] == 'LOG' && ! hash[:log_level]
-      hash[:log_level] = '4'
-    end
-
-    # Iptables defaults to burst '5', so it is ommitted from the output of iptables-save.
-    # If the :limit value is set and you don't have a burst set, we assume it to be '5'.
-    if hash[:limit] && ! hash[:burst]
-      hash[:burst] = '5'
-    end
-
-    hash[:line] = line
-    hash[:provider] = self.name.to_s
-    hash[:table] = table
-    hash[:ensure] = :present
-
-    # Munge some vars here ...
-
-    # Proto should equal 'all' if undefined
-    hash[:proto] = "all" if !hash.include?(:proto)
-
-    # If the jump parameter is set to one of: ACCEPT, REJECT or DROP then
-    # we should set the action parameter instead.
-    if ['ACCEPT','REJECT','DROP'].include?(hash[:jump]) then
-      hash[:action] = hash[:jump].downcase
-      hash.delete(:jump)
-    end
-
-    hash
-  end
-
-  def insert_args
-    args = []
-    args << ["-I", resource[:chain], insert_order]
-    args << general_args
-    args
-  end
-
-  def update_args
-    args = []
-    args << ["-R", resource[:chain], insert_order]
-    args << general_args
-    args
-  end
-
-  def delete_args
-    # Split into arguments
-    line = properties[:line].gsub(/\-A/, '-D').split(/\s(?=(?:[^"]|"[^"]*")*$)/).map{|v| v.gsub(/"/, '')}
-    line.unshift("-t", properties[:table])
-  end
-
-  # This method takes the resource, and attempts to generate the command line
-  # arguments for iptables.
-  def general_args
-    debug "Current resource: %s" % resource.class
-
-    args = []
-    resource_list = self.class.instance_variable_get('@resource_list')
-    resource_map = self.class.instance_variable_get('@resource_map')
-    known_booleans = self.class.instance_variable_get('@known_booleans')
-
-    resource_list.each do |res|
-      resource_value = nil
-      if (resource[res]) then
-        resource_value = resource[res]
-        # If socket is true then do not add the value as -m socket is standalone
-        if known_booleans.include?(res) then
-          if resource[res] == :true then
-            resource_value = nil
-          else
-            # If the property is not :true then we don't want to add the value
-            # to the args list
-            next
-          end
-        end
-      elsif res == :jump and resource[:action] then
-        # In this case, we are substituting jump for action
-        resource_value = resource[:action].to_s.upcase
-      else
-        next
-      end
-
-      args << [resource_map[res]].flatten.first.split(' ')
-
-      # On negations, the '!' has to be before the option (eg: "! -d 1.2.3.4")
-      if resource_value.is_a?(String) and resource_value.sub!(/^!\s*/, '') then
-        # we do this after adding the 'dash' argument because of ones like "-m multiport --dports", where we want it before the "--dports" but after "-m multiport".
-        # so we insert before whatever the last argument is
-        args.insert(-2, '!')
-      end
-
-
-      # For sport and dport, convert hyphens to colons since the type
-      # expects hyphens for ranges of ports.
-      if [:sport, :dport, :port].include?(res) then
-        resource_value = resource_value.collect do |elem|
-          elem.gsub(/-/, ':')
-        end
-      end
-
-      # our tcp_flags takes a single string with comma lists separated
-      # by space
-      # --tcp-flags expects two arguments
-      if res == :tcp_flags
-        one, two = resource_value.split(' ')
-        args << one
-        args << two
-      elsif resource_value.is_a?(Array)
-        args << resource_value.join(',')
-      elsif !resource_value.nil?
-        args << resource_value
-      end
-    end
-
-    args
-  end
-
-  def insert_order
-    debug("[insert_order]")
-    rules = []
-
-    # Find list of current rules based on chain and table
-    self.class.instances.each do |rule|
-      if rule.chain == resource[:chain].to_s and rule.table == resource[:table].to_s
-        rules << rule.name
-      end
-    end
-
-    # No rules at all? Just bail now.
-    return 1 if rules.empty?
-
-    # Add our rule to the end of the array of known rules
-    my_rule = resource[:name].to_s
-    rules << my_rule
-
-    unmanaged_rule_regex = /^9[0-9]{3}\s[a-f0-9]{32}$/
-    # Find if this is a new rule or an existing rule, then find how many
-    # unmanaged rules preceed it.
-    if rules.length == rules.uniq.length
-      # This is a new rule so find its ordered location.
-      new_rule_location = rules.sort.uniq.index(my_rule)
-      if new_rule_location == 0
-        # The rule will be the first rule in the chain because nothing came
-        # before it.
-        offset_rule = rules[0]
-      else
-        # This rule will come after other managed rules, so find the rule
-        # immediately preceeding it.
-        offset_rule = rules.sort.uniq[new_rule_location - 1]
-      end
-    else
-      # This is a pre-existing rule, so find the offset from the original
-      # ordering.
-      offset_rule = my_rule
-    end
-    # Count how many unmanaged rules are ahead of the target rule so we know
-    # how much to add to the insert order
-    unnamed_offset = rules[0..rules.index(offset_rule)].inject(0) do |sum,rule|
-      # This regex matches the names given to unmanaged rules (a number
-      # 9000-9999 followed by an MD5 hash).
-      sum + (rule.match(unmanaged_rule_regex) ? 1 : 0)
-    end
-
-    # We want our rule to come before unmanaged rules if it's not a 9-rule
-    if offset_rule.match(unmanaged_rule_regex) and ! my_rule.match(/^9/)
-      unnamed_offset -= 1
-    end
-
-    # Insert our new or updated rule in the correct order of named rules, but
-    # offset for unnamed rules.
-    rules.reject{|r|r.match(unmanaged_rule_regex)}.sort.index(my_rule) + 1 + unnamed_offset
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb
deleted file mode 100644
index 29fbc1f6b89..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-Puppet::Type.type(:firewallchain).provide :iptables_chain do
-  include Puppet::Util::Firewall
-
-  @doc = "Iptables chain provider"
-
-  has_feature :iptables_chain
-  has_feature :policy
-
-  optional_commands({
-    :iptables       => 'iptables',
-    :iptables_save  => 'iptables-save',
-    :ip6tables      => 'ip6tables',
-    :ip6tables_save => 'ip6tables-save',
-    :ebtables       => 'ebtables',
-    :ebtables_save  => 'ebtables-save',
-  })
-
-  defaultfor :kernel => :linux
-
-  # chain name is greedy so we anchor from the end.
-  # [\d+:\d+] doesn't exist on ebtables
-  Mapping = {
-    :IPv4 => {
-      :tables => method(:iptables),
-      :save   => method(:iptables_save),
-      :re     => /^:(.+)\s(\S+)\s\[\d+:\d+\]$/,
-    },
-    :IPv6 => {
-      :tables => method(:ip6tables),
-      :save   => method(:ip6tables_save),
-      :re     => /^:(.+)\s(\S+)\s\[\d+:\d+\]$/,
-    },
-    :ethernet => {
-      :tables => method(:ebtables),
-      :save   => method(:ebtables_save),
-      :re     => /^:(.+)\s(\S+)$/,
-    }
-  }
-  InternalChains = /^(PREROUTING|POSTROUTING|BROUTING|INPUT|FORWARD|OUTPUT)$/
-  Tables = 'nat|mangle|filter|raw|rawpost|broute'
-  Nameformat = /^(.+):(#{Tables}):(IP(v[46])?|ethernet)$/
-
-  def create
-    allvalidchains do |t, chain, table, protocol|
-      if chain =~ InternalChains
-        # can't create internal chains
-        warning "Attempting to create internal chain #{@resource[:name]}"
-      end
-      if properties[:ensure] == protocol
-        debug "Skipping Inserting chain #{chain} on table #{table} (#{protocol}) already exists"
-      else
-        debug "Inserting chain #{chain} on table #{table} (#{protocol}) using #{t}"
-        t.call ['-t',table,'-N',chain]
-        unless @resource[:policy].nil?
-          t.call ['-t',table,'-P',chain,@resource[:policy].to_s.upcase]
-        end
-      end
-    end
-  end
-
-  def destroy
-    allvalidchains do |t, chain, table|
-      if chain =~ InternalChains
-        # can't delete internal chains
-        warning "Attempting to destroy internal chain #{@resource[:name]}"
-      end
-      debug "Deleting chain #{chain} on table #{table}"
-      t.call ['-t',table,'-X',chain]
-    end
-  end
-
-  def exists?
-    allvalidchains do |t, chain|
-      if chain =~ InternalChains
-        # If the chain isn't present, it's likely because the module isn't loaded.
-        # If this is true, then we fall into 2 cases
-        # 1) It'll be loaded on demand
-        # 2) It won't be loaded on demand, and we throw an error
-        #    This is the intended behavior as it's not the provider's job to load kernel modules
-        # So we pretend it exists...
-        return true
-      end
-    end
-    properties[:ensure] == :present
-  end
-
-  def policy=(value)
-    return if value == :empty
-    allvalidchains do |t, chain, table|
-      p = ['-t',table,'-P',chain,value.to_s.upcase]
-      debug "[set policy] #{t} #{p}"
-      t.call p
-    end
-  end
-
-  def policy
-    debug "[get policy] #{@resource[:name]} =#{@property_hash[:policy].to_s.downcase}"
-    return @property_hash[:policy].to_s.downcase
-  end
-
-  def self.prefetch(resources)
-    debug("[prefetch(resources)]")
-    instances.each do |prov|
-      if resource = resources[prov.name]
-        resource.provider = prov
-      end
-    end
-  end
-
-  def flush
-    debug("[flush]")
-    persist_iptables(@resource[:name].match(Nameformat)[3])
-    # Clear the property hash so we re-initialize with updated values
-    @property_hash.clear
-  end
-
-  # Look up the current status. This allows us to conventiently look up
-  # existing status with properties[:foo].
-  def properties
-    if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
-    end
-    @property_hash.dup
-  end
-
-  # Pull the current state of the list from the full list.
-  def query
-    self.class.instances.each do |instance|
-      if instance.name == self.name
-        debug "query found #{self.name}" % instance.properties.inspect
-        return instance.properties
-      end
-    end
-    nil
-  end
-
-  def self.instances
-    debug "[instances]"
-    table = nil
-    chains = []
-
-    Mapping.each { |p, c|
-      begin
-        c[:save].call.each_line do |line|
-          if line =~ c[:re] then
-            name = $1 + ':' + (table == 'filter' ? 'filter' : table) + ':' + p.to_s
-            policy = $2 == '-' ? nil : $2.downcase.to_sym
-
-            chains << new({
-              :name   => name,
-              :policy => policy,
-              :ensure => :present,
-            })
-
-            debug "[instance] '#{name}' #{policy}"
-          elsif line =~ /^\*(\S+)/
-            table = $1
-          else
-            next
-          end
-        end
-      rescue Puppet::Error
-        # ignore command not found for ebtables or anything that doesn't exist
-      end
-    }
-
-    chains
-  end
-
-  def allvalidchains
-    @resource[:name].match(Nameformat)
-    chain = $1
-    table = $2
-    protocol = $3
-    yield Mapping[protocol.to_sym][:tables],chain,table,protocol.to_sym
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb
deleted file mode 100644
index 22afbd21e2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewall.rb
+++ /dev/null
@@ -1,1077 +0,0 @@
-# See: #10295 for more details.
-#
-# This is a workaround for bug: #4248 whereby ruby files outside of the normal
-# provider/type path do not load until pluginsync has occured on the puppetmaster
-#
-# In this case I'm trying the relative path first, then falling back to normal
-# mechanisms. This should be fixed in future versions of puppet but it looks
-# like we'll need to maintain this for some time perhaps.
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..",".."))
-require 'puppet/util/firewall'
-
-Puppet::Type.newtype(:firewall) do
-  include Puppet::Util::Firewall
-
-  @doc = <<-EOS
-    This type provides the capability to manage firewall rules within
-    puppet.
-
-    **Autorequires:**
-
-    If Puppet is managing the iptables or ip6tables chains specified in the
-    `chain` or `jump` parameters, the firewall resource will autorequire
-    those firewallchain resources.
-
-    If Puppet is managing the iptables or iptables-persistent packages, and
-    the provider is iptables or ip6tables, the firewall resource will
-    autorequire those packages to ensure that any required binaries are
-    installed.
-  EOS
-
-  feature :connection_limiting, "Connection limiting features."
-  feature :hop_limiting, "Hop limiting features."
-  feature :rate_limiting, "Rate limiting features."
-  feature :recent_limiting, "The netfilter recent module"
-  feature :snat, "Source NATing"
-  feature :dnat, "Destination NATing"
-  feature :interface_match, "Interface matching"
-  feature :icmp_match, "Matching ICMP types"
-  feature :owner, "Matching owners"
-  feature :state_match, "Matching stateful firewall states"
-  feature :reject_type, "The ability to control reject messages"
-  feature :log_level, "The ability to control the log level"
-  feature :log_prefix, "The ability to add prefixes to log messages"
-  feature :mark, "Match or Set the netfilter mark value associated with the packet"
-  feature :tcp_flags, "The ability to match on particular TCP flag settings"
-  feature :pkttype, "Match a packet type"
-  feature :socket, "Match open sockets"
-  feature :isfragment, "Match fragments"
-  feature :address_type, "The ability match on source or destination address type"
-  feature :iprange, "The ability match on source or destination IP range "
-  feature :ishasmorefrags, "Match a non-last fragment of a fragmented ipv6 packet - might be first"
-  feature :islastfrag, "Match the last fragment of an ipv6 packet"
-  feature :isfirstfrag, "Match the first fragment of a fragmented ipv6 packet"
-  feature :ipsec_policy, "Match IPsec policy"
-  feature :ipsec_dir, "Match IPsec policy direction"
-
-  # provider specific features
-  feature :iptables, "The provider provides iptables features."
-
-  ensurable do
-    desc <<-EOS
-      Manage the state of this rule. The default action is *present*.
-    EOS
-
-    newvalue(:present) do
-      provider.insert
-    end
-
-    newvalue(:absent) do
-      provider.delete
-    end
-
-    defaultto :present
-  end
-
-  newparam(:name) do
-    desc <<-EOS
-      The canonical name of the rule. This name is also used for ordering
-      so make sure you prefix the rule with a number:
-
-          000 this runs first
-          999 this runs last
-
-      Depending on the provider, the name of the rule can be stored using
-      the comment feature of the underlying firewall subsystem.
-    EOS
-    isnamevar
-
-    # Keep rule names simple - they must start with a number
-    newvalues(/^\d+[[:alpha:][:digit:][:punct:][:space:]]+$/)
-  end
-
-  newproperty(:action) do
-    desc <<-EOS
-      This is the action to perform on a match. Can be one of:
-
-      * accept - the packet is accepted
-      * reject - the packet is rejected with a suitable ICMP response
-      * drop - the packet is dropped
-
-      If you specify no value it will simply match the rule but perform no
-      action unless you provide a provider specific parameter (such as *jump*).
-    EOS
-    newvalues(:accept, :reject, :drop)
-  end
-
-  # Generic matching properties
-  newproperty(:source) do
-    desc <<-EOS
-      The source address. For example:
-
-          source => '192.168.2.0/24'
-
-      You can also negate a mask by putting ! in front. For example:
-
-          source => '! 192.168.2.0/24'
-
-      The source can also be an IPv6 address if your provider supports it.
-    EOS
-
-    munge do |value|
-      begin
-        @resource.host_to_mask(value)
-      rescue Exception => e
-        self.fail("host_to_ip failed for #{value}, exception #{e}")
-      end
-    end
-  end
-
-  # Source IP range
-  newproperty(:src_range, :required_features => :iprange) do
-    desc <<-EOS
-      The source IP range. For example:
-
-          src_range => '192.168.1.1-192.168.1.10'
-
-      The source IP range is must in 'IP1-IP2' format.
-    EOS
-
-    newvalues(/^((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)-((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)/)
-  end
-
-  newproperty(:destination) do
-    desc <<-EOS
-      The destination address to match. For example:
-
-          destination => '192.168.1.0/24'
-
-      You can also negate a mask by putting ! in front. For example:
-
-          destination  => '! 192.168.2.0/24'
-
-      The destination can also be an IPv6 address if your provider supports it.
-    EOS
-
-    munge do |value|
-      begin
-        @resource.host_to_mask(value)
-      rescue Exception => e
-        self.fail("host_to_ip failed for #{value}, exception #{e}")
-      end
-    end
-  end
-
-  # Destination IP range
-  newproperty(:dst_range, :required_features => :iprange) do
-    desc <<-EOS
-      The destination IP range. For example:
-
-          dst_range => '192.168.1.1-192.168.1.10'
-
-      The destination IP range is must in 'IP1-IP2' format.
-    EOS
-
-    newvalues(/^((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)-((25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)\.){3}(25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)/)
-  end
-
-  newproperty(:sport, :array_matching => :all) do
-    desc <<-EOS
-      The source port to match for this filter (if the protocol supports
-      ports). Will accept a single element or an array.
-
-      For some firewall providers you can pass a range of ports in the format:
-
-          <start_number>-<ending_number>
-
-      For example:
-
-          1-1024
-
-      This would cover ports 1 to 1024.
-    EOS
-
-    munge do |value|
-      @resource.string_to_port(value, :proto)
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:dport, :array_matching => :all) do
-    desc <<-EOS
-      The destination port to match for this filter (if the protocol supports
-      ports). Will accept a single element or an array.
-
-      For some firewall providers you can pass a range of ports in the format:
-
-          <start_number>-<ending_number>
-
-      For example:
-
-          1-1024
-
-      This would cover ports 1 to 1024.
-    EOS
-
-    munge do |value|
-      @resource.string_to_port(value, :proto)
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:port, :array_matching => :all) do
-    desc <<-EOS
-      The destination or source port to match for this filter (if the protocol
-      supports ports). Will accept a single element or an array.
-
-      For some firewall providers you can pass a range of ports in the format:
-
-          <start_number>-<ending_number>
-
-      For example:
-
-          1-1024
-
-      This would cover ports 1 to 1024.
-    EOS
-
-    munge do |value|
-      @resource.string_to_port(value, :proto)
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:dst_type, :required_features => :address_type) do
-    desc <<-EOS
-      The destination address type. For example:
-
-          dst_type => 'LOCAL'
-
-      Can be one of:
-
-      * UNSPEC - an unspecified address
-      * UNICAST - a unicast address
-      * LOCAL - a local address
-      * BROADCAST - a broadcast address
-      * ANYCAST - an anycast packet
-      * MULTICAST - a multicast address
-      * BLACKHOLE - a blackhole address
-      * UNREACHABLE - an unreachable address
-      * PROHIBIT - a prohibited address
-      * THROW - undocumented
-      * NAT - undocumented
-      * XRESOLVE - undocumented
-    EOS
-
-    newvalues(:UNSPEC, :UNICAST, :LOCAL, :BROADCAST, :ANYCAST, :MULTICAST,
-              :BLACKHOLE, :UNREACHABLE, :PROHIBIT, :THROW, :NAT, :XRESOLVE)
-  end
-
-  newproperty(:src_type, :required_features => :address_type) do
-    desc <<-EOS
-      The source address type. For example:
-
-          src_type => 'LOCAL'
-
-      Can be one of:
-
-      * UNSPEC - an unspecified address
-      * UNICAST - a unicast address
-      * LOCAL - a local address
-      * BROADCAST - a broadcast address
-      * ANYCAST - an anycast packet
-      * MULTICAST - a multicast address
-      * BLACKHOLE - a blackhole address
-      * UNREACHABLE - an unreachable address
-      * PROHIBIT - a prohibited address
-      * THROW - undocumented
-      * NAT - undocumented
-      * XRESOLVE - undocumented
-    EOS
-
-    newvalues(:UNSPEC, :UNICAST, :LOCAL, :BROADCAST, :ANYCAST, :MULTICAST,
-              :BLACKHOLE, :UNREACHABLE, :PROHIBIT, :THROW, :NAT, :XRESOLVE)
-  end
-
-  newproperty(:proto) do
-    desc <<-EOS
-      The specific protocol to match for this rule. By default this is
-      *tcp*.
-    EOS
-
-    newvalues(:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :all)
-    defaultto "tcp"
-  end
-
-  # tcp-specific
-  newproperty(:tcp_flags, :required_features => :tcp_flags) do
-    desc <<-EOS
-      Match when the TCP flags are as specified.
-      Is a string with a list of comma-separated flag names for the mask,
-      then a space, then a comma-separated list of flags that should be set.
-      The flags are: SYN ACK FIN RST URG PSH ALL NONE
-      Note that you specify them in the order that iptables --list-rules
-      would list them to avoid having puppet think you changed the flags.
-      Example: FIN,SYN,RST,ACK SYN matches packets with the SYN bit set and the
-	       ACK,RST and FIN bits cleared.  Such packets are used to request
-               TCP  connection initiation.
-    EOS
-  end
-
-
-  # Iptables specific
-  newproperty(:chain, :required_features => :iptables) do
-    desc <<-EOS
-      Name of the chain to use. Can be one of the built-ins:
-
-      * INPUT
-      * FORWARD
-      * OUTPUT
-      * PREROUTING
-      * POSTROUTING
-
-      Or you can provide a user-based chain.
-
-      The default value is 'INPUT'.
-    EOS
-
-    defaultto "INPUT"
-    newvalue(/^[a-zA-Z0-9\-_]+$/)
-  end
-
-  newproperty(:table, :required_features => :iptables) do
-    desc <<-EOS
-      Table to use. Can be one of:
-
-      * nat
-      * mangle
-      * filter
-      * raw
-      * rawpost
-
-      By default the setting is 'filter'.
-    EOS
-
-    newvalues(:nat, :mangle, :filter, :raw, :rawpost)
-    defaultto "filter"
-  end
-
-  newproperty(:jump, :required_features => :iptables) do
-    desc <<-EOS
-      The value for the iptables --jump parameter. Normal values are:
-
-      * QUEUE
-      * RETURN
-      * DNAT
-      * SNAT
-      * LOG
-      * MASQUERADE
-      * REDIRECT
-      * MARK
-
-      But any valid chain name is allowed.
-
-      For the values ACCEPT, DROP and REJECT you must use the generic
-      'action' parameter. This is to enfore the use of generic parameters where
-      possible for maximum cross-platform modelling.
-
-      If you set both 'accept' and 'jump' parameters, you will get an error as
-      only one of the options should be set.
-    EOS
-
-    validate do |value|
-      unless value =~ /^[a-zA-Z0-9\-_]+$/
-        raise ArgumentError, <<-EOS
-          Jump destination must consist of alphanumeric characters, an
-          underscore or a yphen.
-        EOS
-      end
-
-      if ["accept","reject","drop"].include?(value.downcase)
-        raise ArgumentError, <<-EOS
-          Jump destination should not be one of ACCEPT, REJECT or DROP. Use
-          the action property instead.
-        EOS
-      end
-
-    end
-  end
-
-  # Interface specific matching properties
-  newproperty(:iniface, :required_features => :interface_match) do
-    desc <<-EOS
-      Input interface to filter on.
-    EOS
-    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
-  end
-
-  newproperty(:outiface, :required_features => :interface_match) do
-    desc <<-EOS
-      Output interface to filter on.
-    EOS
-    newvalues(/^[a-zA-Z0-9\-\._\+]+$/)
-  end
-
-  # NAT specific properties
-  newproperty(:tosource, :required_features => :snat) do
-    desc <<-EOS
-      When using jump => "SNAT" you can specify the new source address using
-      this parameter.
-    EOS
-  end
-
-  newproperty(:todest, :required_features => :dnat) do
-    desc <<-EOS
-      When using jump => "DNAT" you can specify the new destination address
-      using this paramter.
-    EOS
-  end
-
-  newproperty(:toports, :required_features => :dnat) do
-    desc <<-EOS
-      For DNAT this is the port that will replace the destination port.
-    EOS
-  end
-
-  newproperty(:random, :required_features => :dnat) do
-    desc <<-EOS
-      When using a jump value of "MASQUERADE", "DNAT", "REDIRECT", or "SNAT"
-      this boolean will enable randomized port mapping.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  # Reject ICMP type
-  newproperty(:reject, :required_features => :reject_type) do
-    desc <<-EOS
-      When combined with jump => "REJECT" you can specify a different icmp
-      response to be sent back to the packet sender.
-    EOS
-  end
-
-  # Logging properties
-  newproperty(:log_level, :required_features => :log_level) do
-    desc <<-EOS
-      When combined with jump => "LOG" specifies the system log level to log
-      to.
-    EOS
-
-    munge do |value|
-      if value.kind_of?(String)
-        value = @resource.log_level_name_to_number(value)
-      else
-        value
-      end
-
-      if value == nil && value != ""
-        self.fail("Unable to determine log level")
-      end
-      value
-    end
-  end
-
-  newproperty(:log_prefix, :required_features => :log_prefix) do
-    desc <<-EOS
-      When combined with jump => "LOG" specifies the log prefix to use when
-      logging.
-    EOS
-  end
-
-  # ICMP matching property
-  newproperty(:icmp, :required_features => :icmp_match) do
-    desc <<-EOS
-      When matching ICMP packets, this is the type of ICMP packet to match.
-
-      A value of "any" is not supported. To achieve this behaviour the
-      parameter should simply be omitted or undefined.
-    EOS
-
-    validate do |value|
-      if value == "any"
-        raise ArgumentError,
-          "Value 'any' is not valid. This behaviour should be achieved " \
-          "by omitting or undefining the ICMP parameter."
-      end
-    end
-
-    munge do |value|
-      if value.kind_of?(String)
-        # ICMP codes differ between IPv4 and IPv6.
-        case @resource[:provider]
-        when :iptables
-          protocol = 'inet'
-        when :ip6tables
-          protocol = 'inet6'
-        else
-          self.fail("cannot work out protocol family")
-        end
-
-        value = @resource.icmp_name_to_number(value, protocol)
-      else
-        value
-      end
-
-      if value == nil && value != ""
-        self.fail("cannot work out icmp type")
-      end
-      value
-    end
-  end
-
-  newproperty(:state, :array_matching => :all, :required_features =>
-    :state_match) do
-
-    desc <<-EOS
-      Matches a packet based on its state in the firewall stateful inspection
-      table. Values can be:
-
-      * INVALID
-      * ESTABLISHED
-      * NEW
-      * RELATED
-    EOS
-
-    newvalues(:INVALID,:ESTABLISHED,:NEW,:RELATED)
-
-    # States should always be sorted. This normalizes the resource states to
-    # keep it consistent with the sorted result from iptables-save.
-    def should=(values)
-      @should = super(values).sort_by {|sym| sym.to_s}
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-  newproperty(:ctstate, :array_matching => :all, :required_features =>
-    :state_match) do
-
-    desc <<-EOS
-      Matches a packet based on its state in the firewall stateful inspection
-      table, using the conntrack module. Values can be:
-
-      * INVALID
-      * ESTABLISHED
-      * NEW
-      * RELATED
-    EOS
-
-    newvalues(:INVALID,:ESTABLISHED,:NEW,:RELATED)
-
-    # States should always be sorted. This normalizes the resource states to
-    # keep it consistent with the sorted result from iptables-save.
-    def should=(values)
-      @should = super(values).sort_by {|sym| sym.to_s}
-    end
-
-    def is_to_s(value)
-      should_to_s(value)
-    end
-
-    def should_to_s(value)
-      value = [value] unless value.is_a?(Array)
-      value.join(',')
-    end
-  end
-
-
-  # Connection mark
-  newproperty(:connmark, :required_features => :mark) do
-    desc <<-EOS
-      Match the Netfilter mark value associated with the packet.  Accepts either of:
-      mark/mask or mark.  These will be converted to hex if they are not already.
-    EOS
-    munge do |value|
-      int_or_hex = '[a-fA-F0-9x]'
-      match = value.to_s.match("(#{int_or_hex}+)(/)?(#{int_or_hex}+)?")
-      mark = @resource.to_hex32(match[1])
-
-      # Values that can't be converted to hex.
-      # Or contain a trailing slash with no mask.
-      if mark.nil? or (mark and match[2] and match[3].nil?)
-        raise ArgumentError, "MARK value must be integer or hex between 0 and 0xffffffff"
-      end
-
-      # There should not be a mask on connmark
-      unless match[3].nil?
-        raise ArgumentError, "iptables does not support masks on MARK match rules"
-      end
-      value = mark
-
-      value
-    end
-  end
-
-  # Connection limiting properties
-  newproperty(:connlimit_above, :required_features => :connection_limiting) do
-    desc <<-EOS
-      Connection limiting value for matched connections above n.
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  newproperty(:connlimit_mask, :required_features => :connection_limiting) do
-    desc <<-EOS
-      Connection limiting by subnet mask for matched connections.
-      IPv4: 0-32
-      IPv6: 0-128
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  # Hop limiting properties
-  newproperty(:hop_limit, :required_features => :hop_limiting) do
-    desc <<-EOS
-      Hop limiting value for matched packets.
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  # Rate limiting properties
-  newproperty(:limit, :required_features => :rate_limiting) do
-    desc <<-EOS
-      Rate limiting value for matched packets. The format is:
-      rate/[/second/|/minute|/hour|/day].
-
-      Example values are: '50/sec', '40/min', '30/hour', '10/day'."
-    EOS
-  end
-
-  newproperty(:burst, :required_features => :rate_limiting) do
-    desc <<-EOS
-      Rate limiting burst value (per second) before limit checks apply.
-    EOS
-    newvalue(/^\d+$/)
-  end
-
-  newproperty(:uid, :required_features => :owner) do
-    desc <<-EOS
-      UID or Username owner matching rule.  Accepts a string argument
-      only, as iptables does not accept multiple uid in a single
-      statement.
-    EOS
-  end
-
-  newproperty(:gid, :required_features => :owner) do
-    desc <<-EOS
-      GID or Group owner matching rule.  Accepts a string argument
-      only, as iptables does not accept multiple gid in a single
-      statement.
-    EOS
-  end
-
-  newproperty(:set_mark, :required_features => :mark) do
-    desc <<-EOS
-      Set the Netfilter mark value associated with the packet.  Accepts either of:
-      mark/mask or mark.  These will be converted to hex if they are not already.
-    EOS
-
-    munge do |value|
-      int_or_hex = '[a-fA-F0-9x]'
-      match = value.to_s.match("(#{int_or_hex}+)(/)?(#{int_or_hex}+)?")
-      mark = @resource.to_hex32(match[1])
-
-      # Values that can't be converted to hex.
-      # Or contain a trailing slash with no mask.
-      if mark.nil? or (mark and match[2] and match[3].nil?)
-        raise ArgumentError, "MARK value must be integer or hex between 0 and 0xffffffff"
-      end
-
-      # Old iptables does not support a mask. New iptables will expect one.
-      iptables_version = Facter.fact('iptables_version').value
-      mask_required = (iptables_version and Puppet::Util::Package.versioncmp(iptables_version, '1.4.1') >= 0)
-
-      if mask_required
-        if match[3].nil?
-          value = "#{mark}/0xffffffff"
-        else
-          mask = @resource.to_hex32(match[3])
-          if mask.nil?
-            raise ArgumentError, "MARK mask must be integer or hex between 0 and 0xffffffff"
-          end
-          value = "#{mark}/#{mask}"
-        end
-      else
-        unless match[3].nil?
-          raise ArgumentError, "iptables version #{iptables_version} does not support masks on MARK rules"
-        end
-        value = mark
-      end
-
-      value
-    end
-  end
-
-  newproperty(:pkttype, :required_features => :pkttype) do
-    desc <<-EOS
-      Sets the packet type to match.
-    EOS
-
-    newvalues(:unicast, :broadcast, :multicast)
-  end
-
-  newproperty(:isfragment, :required_features => :isfragment) do
-    desc <<-EOS
-      Set to true to match tcp fragments (requires type to be set to tcp)
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:recent, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Enable the recent module. Takes as an argument one of set, update,
-      rcheck or remove. For example:
-
-        # If anyone's appeared on the 'badguy' blacklist within
-        # the last 60 seconds, drop their traffic, and update the timestamp.
-        firewall { '100 Drop badguy traffic':
-          recent   => 'update',
-          rseconds => 60,
-          rsource  => true,
-          rname    => 'badguy',
-          action   => 'DROP',
-          chain    => 'FORWARD',
-        }
-        # No-one should be sending us traffic on eth0 from localhost
-        # Blacklist them
-        firewall { '101 blacklist strange traffic':
-          recent      => 'set',
-          rsource     => true,
-          rname       => 'badguy',
-          destination => '127.0.0.0/8',
-          iniface     => 'eth0',
-          action      => 'DROP',
-          chain       => 'FORWARD',
-        }
-    EOS
-
-    newvalues(:set, :update, :rcheck, :remove)
-    munge do |value|
-       value = "--" + value
-    end
-  end
-
-  newproperty(:rdest, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; add the destination IP address to the list.
-      Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:rsource, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; add the source IP address to the list.
-      Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:rname, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; The name of the list. Takes a string argument.
-    EOS
-  end
-
-  newproperty(:rseconds, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; used in conjunction with one of `recent => 'rcheck'` or
-      `recent => 'update'`. When used, this will narrow the match to only
-      happen when the address is in the list and was seen within the last given
-      number of seconds.
-    EOS
-  end
-
-  newproperty(:reap, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; can only be used in conjunction with the `rseconds`
-      attribute. When used, this will cause entries older than 'seconds' to be
-      purged.  Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:rhitcount, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; used in conjunction with `recent => 'update'` or `recent
-      => 'rcheck'. When used, this will narrow the match to only happen when
-      the address is in the list and packets had been received greater than or
-      equal to the given value.
-    EOS
-  end
-
-  newproperty(:rttl, :required_features => :recent_limiting) do
-    desc <<-EOS
-      Recent module; may only be used in conjunction with one of `recent =>
-      'rcheck'` or `recent => 'update'`. When used, this will narrow the match
-      to only happen when the address is in the list and the TTL of the current
-      packet matches that of the packet which hit the `recent => 'set'` rule.
-      This may be useful if you have problems with people faking their source
-      address in order to DoS you via this module by disallowing others access
-      to your site by sending bogus packets to you.  Must be boolean true.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:socket, :required_features => :socket) do
-    desc <<-EOS
-      If true, matches if an open socket can be found by doing a coket lookup
-      on the packet.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:ishasmorefrags, :required_features => :ishasmorefrags) do
-    desc <<-EOS
-      If true, matches if the packet has it's 'more fragments' bit set. ipv6.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:islastfrag, :required_features => :islastfrag) do
-    desc <<-EOS
-      If true, matches if the packet is the last fragment. ipv6.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:isfirstfrag, :required_features => :isfirstfrag) do
-    desc <<-EOS
-      If true, matches if the packet is the first fragment. 
-      Sadly cannot be negated. ipv6.
-    EOS
-
-    newvalues(:true, :false)
-  end
-
-  newproperty(:ipsec_policy, :required_features => :ipsec_policy) do
-	  desc <<-EOS
-	  	 Sets the ipsec policy type
-	  EOS
-
-	  newvalues(:none, :ipsec)
-  end
-
-  newproperty(:ipsec_dir, :required_features => :ipsec_dir) do
-	  desc <<-EOS
-	  	 Sets the ipsec policy direction
-	  EOS
-
-	  newvalues(:in, :out)
-  end
-
-  newproperty(:mask, :required_features => :mask) do
-    desc <<-EOS
-      Sets the mask to use when `recent` is enabled.
-    EOS
-  end
-
-  newparam(:line) do
-    desc <<-EOS
-      Read-only property for caching the rule line.
-    EOS
-  end
-
-  autorequire(:firewallchain) do
-    reqs = []
-    protocol = nil
-
-    case value(:provider)
-    when :iptables
-      protocol = "IPv4"
-    when :ip6tables
-      protocol = "IPv6"
-    end
-
-    unless protocol.nil?
-      table = value(:table)
-      [value(:chain), value(:jump)].each do |chain|
-        reqs << "#{chain}:#{table}:#{protocol}" unless ( chain.nil? || (['INPUT', 'OUTPUT', 'FORWARD'].include?(chain) && table == :filter) )
-      end
-    end
-
-    reqs
-  end
-
-  # Classes would be a better abstraction, pending:
-  # http://projects.puppetlabs.com/issues/19001
-  autorequire(:package) do
-    case value(:provider)
-    when :iptables, :ip6tables
-      %w{iptables iptables-persistent}
-    else
-      []
-    end
-  end
-
-  validate do
-    debug("[validate]")
-
-    # TODO: this is put here to skip validation if ensure is not set. This
-    # is because there is a revalidation stage called later where the values
-    # are not set correctly. I tried tracing it - but have put in this
-    # workaround instead to skip. Must get to the bottom of this.
-    if ! value(:ensure)
-      return
-    end
-
-    # First we make sure the chains and tables are valid combinations
-    if value(:table).to_s == "filter" &&
-      value(:chain) =~ /PREROUTING|POSTROUTING/
-
-      self.fail "PREROUTING and POSTROUTING cannot be used in table 'filter'"
-    end
-
-    if value(:table).to_s == "nat" && value(:chain) =~ /INPUT|FORWARD/
-      self.fail "INPUT and FORWARD cannot be used in table 'nat'"
-    end
-
-    if value(:table).to_s == "raw" &&
-      value(:chain) =~ /INPUT|FORWARD|POSTROUTING/
-
-      self.fail "INPUT, FORWARD and POSTROUTING cannot be used in table raw"
-    end
-
-    # Now we analyse the individual properties to make sure they apply to
-    # the correct combinations.
-    if value(:iniface)
-      unless value(:chain).to_s =~ /INPUT|FORWARD|PREROUTING/
-        self.fail "Parameter iniface only applies to chains " \
-          "INPUT,FORWARD,PREROUTING"
-      end
-    end
-
-    if value(:outiface)
-      unless value(:chain).to_s =~ /OUTPUT|FORWARD|POSTROUTING/
-        self.fail "Parameter outiface only applies to chains " \
-          "OUTPUT,FORWARD,POSTROUTING"
-      end
-    end
-
-    if value(:uid)
-      unless value(:chain).to_s =~ /OUTPUT|POSTROUTING/
-        self.fail "Parameter uid only applies to chains " \
-          "OUTPUT,POSTROUTING"
-      end
-    end
-
-    if value(:gid)
-      unless value(:chain).to_s =~ /OUTPUT|POSTROUTING/
-        self.fail "Parameter gid only applies to chains " \
-          "OUTPUT,POSTROUTING"
-      end
-    end
-
-    if value(:set_mark)
-      unless value(:jump).to_s  =~ /MARK/ &&
-             value(:chain).to_s =~ /PREROUTING|OUTPUT/ &&
-             value(:table).to_s =~ /mangle/
-        self.fail "Parameter set_mark only applies to " \
-          "the PREROUTING or OUTPUT chain of the mangle table and when jump => MARK"
-      end
-    end
-
-    if value(:dport)
-      unless value(:proto).to_s =~ /tcp|udp|sctp/
-        self.fail "[%s] Parameter dport only applies to sctp, tcp and udp " \
-          "protocols. Current protocol is [%s] and dport is [%s]" %
-          [value(:name), should(:proto), should(:dport)]
-      end
-    end
-
-    if value(:jump).to_s == "DNAT"
-      unless value(:table).to_s =~ /nat/
-        self.fail "Parameter jump => DNAT only applies to table => nat"
-      end
-
-      unless value(:todest)
-        self.fail "Parameter jump => DNAT must have todest parameter"
-      end
-    end
-
-    if value(:jump).to_s == "SNAT"
-      unless value(:table).to_s =~ /nat/
-        self.fail "Parameter jump => SNAT only applies to table => nat"
-      end
-
-      unless value(:tosource)
-        self.fail "Parameter jump => SNAT must have tosource parameter"
-      end
-    end
-
-    if value(:jump).to_s == "REDIRECT"
-      unless value(:toports)
-        self.fail "Parameter jump => REDIRECT missing mandatory toports " \
-          "parameter"
-      end
-    end
-
-    if value(:jump).to_s == "MASQUERADE"
-      unless value(:table).to_s =~ /nat/
-        self.fail "Parameter jump => MASQUERADE only applies to table => nat"
-      end
-    end
-
-    if value(:log_prefix) || value(:log_level)
-      unless value(:jump).to_s == "LOG"
-        self.fail "Parameter log_prefix and log_level require jump => LOG"
-      end
-    end
-
-    if value(:burst) && ! value(:limit)
-      self.fail "burst makes no sense without limit"
-    end
-
-    if value(:action) && value(:jump)
-      self.fail "Only one of the parameters 'action' and 'jump' can be set"
-    end
-
-    if value(:connlimit_mask) && ! value(:connlimit_above)
-      self.fail "Parameter 'connlimit_mask' requires 'connlimit_above'"
-    end
-
-    if value(:mask) && ! value(:recent)
-      self.fail "Mask can only be set if recent is enabled."
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb
deleted file mode 100644
index 3e3c5d13706..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/type/firewallchain.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-# This is a workaround for bug: #4248 whereby ruby files outside of the normal
-# provider/type path do not load until pluginsync has occured on the puppetmaster
-#
-# In this case I'm trying the relative path first, then falling back to normal
-# mechanisms. This should be fixed in future versions of puppet but it looks
-# like we'll need to maintain this for some time perhaps.
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..",".."))
-require 'puppet/util/firewall'
-
-Puppet::Type.newtype(:firewallchain) do
-  include Puppet::Util::Firewall
-
-  @doc = <<-EOS
-    This type provides the capability to manage rule chains for firewalls.
-
-    Currently this supports only iptables, ip6tables and ebtables on Linux. And
-    provides support for setting the default policy on chains and tables that
-    allow it.
-
-    **Autorequires:**
-    If Puppet is managing the iptables or iptables-persistent packages, and
-    the provider is iptables_chain, the firewall resource will autorequire
-    those packages to ensure that any required binaries are installed.
-  EOS
-
-  feature :iptables_chain, "The provider provides iptables chain features."
-  feature :policy, "Default policy (inbuilt chains only)"
-
-  ensurable do
-    defaultvalues
-    defaultto :present
-  end
-
-  newparam(:name) do
-    desc <<-EOS
-      The canonical name of the chain.
-
-      For iptables the format must be {chain}:{table}:{protocol}.
-    EOS
-    isnamevar
-
-    validate do |value|
-      if value !~ Nameformat then
-        raise ArgumentError, "Inbuilt chains must be in the form {chain}:{table}:{protocol} where {table} is one of FILTER, NAT, MANGLE, RAW, RAWPOST, BROUTE or empty (alias for filter), chain can be anything without colons or one of PREROUTING, POSTROUTING, BROUTING, INPUT, FORWARD, OUTPUT for the inbuilt chains, and {protocol} being IPv4, IPv6, ethernet (ethernet bridging) got '#{value}' table:'#{$1}' chain:'#{$2}' protocol:'#{$3}'"
-      else
-        chain = $1
-        table = $2
-        protocol = $3
-        case table
-        when 'filter'
-          if chain =~ /^(PREROUTING|POSTROUTING|BROUTING)$/
-            raise ArgumentError, "INPUT, OUTPUT and FORWARD are the only inbuilt chains that can be used in table 'filter'"
-          end
-        when 'mangle'
-          if chain =~ InternalChains && chain == 'BROUTING'
-            raise ArgumentError, "PREROUTING, POSTROUTING, INPUT, FORWARD and OUTPUT are the only inbuilt chains that can be used in table 'mangle'"
-          end
-        when 'nat'
-          if chain =~ /^(BROUTING|FORWARD)$/
-            raise ArgumentError, "PREROUTING, POSTROUTING, INPUT, and OUTPUT are the only inbuilt chains that can be used in table 'nat'"
-          end
-          if protocol =~/^(IP(v6)?)?$/
-            raise ArgumentError, "table nat isn't valid in IPv6. You must specify ':IPv4' as the name suffix"
-          end
-        when 'raw'
-          if chain =~ /^(POSTROUTING|BROUTING|INPUT|FORWARD)$/
-            raise ArgumentError,'PREROUTING and OUTPUT are the only inbuilt chains in the table \'raw\''
-          end
-        when 'broute'
-          if protocol != 'ethernet'
-            raise ArgumentError,'BROUTE is only valid with protocol \'ethernet\''
-          end
-          if chain =~ /^PREROUTING|POSTROUTING|INPUT|FORWARD|OUTPUT$/
-            raise ArgumentError,'BROUTING is the only inbuilt chain allowed on on table \'broute\''
-          end
-        end
-        if chain == 'BROUTING' && ( protocol != 'ethernet' || table!='broute')
-          raise ArgumentError,'BROUTING is the only inbuilt chain allowed on on table \'BROUTE\' with protocol \'ethernet\' i.e. \'broute:BROUTING:enternet\''
-        end
-      end
-    end
-  end
-
-  newproperty(:policy) do
-    desc <<-EOS
-      This is the action to when the end of the chain is reached.
-      It can only be set on inbuilt chains (INPUT, FORWARD, OUTPUT,
-      PREROUTING, POSTROUTING) and can be one of:
-
-      * accept - the packet is accepted
-      * drop - the packet is dropped
-      * queue - the packet is passed userspace
-      * return - the packet is returned to calling (jump) queue
-                 or the default of inbuilt chains
-    EOS
-    newvalues(:accept, :drop, :queue, :return)
-    defaultto do
-      # ethernet chain have an ACCEPT default while other haven't got an
-      # allowed value
-      if @resource[:name] =~ /:ethernet$/
-        :accept
-      else
-        nil
-      end
-    end
-  end
-
-  newparam(:purge, :boolean => true) do
-    desc <<-EOS
-      Purge unmanaged firewall rules in this chain
-    EOS
-    newvalues(:false, :true)
-    defaultto :false
-  end
-
-  newparam(:ignore) do
-    desc <<-EOS
-      Regex to perform on firewall rules to exempt unmanaged rules from purging (when enabled).
-      This is matched against the output of `iptables-save`.
-
-      This can be a single regex, or an array of them.
-      To support flags, use the ruby inline flag mechanism.
-      Meaning a regex such as
-        /foo/i
-      can be written as
-        '(?i)foo' or '(?i:foo)'
-
-      Full example:
-      firewallchain { 'INPUT:filter:IPv4':
-        purge => true,
-        ignore => [
-          '-j fail2ban-ssh', # ignore the fail2ban jump rule
-          '--comment "[^"]*(?i:ignore)[^"]*"', # ignore any rules with "ignore" (case insensitive) in the comment in the rule
-        ],
-      }
-    EOS
-
-    validate do |value|
-      unless value.is_a?(Array) or value.is_a?(String) or value == false
-        self.devfail "Ignore must be a string or an Array"
-      end
-    end
-    munge do |patterns| # convert into an array of {Regex}es
-      patterns = [patterns] if patterns.is_a?(String)
-      patterns.map{|p| Regexp.new(p)}
-    end
-  end
-
-  # Classes would be a better abstraction, pending:
-  # http://projects.puppetlabs.com/issues/19001
-  autorequire(:package) do
-    case value(:provider)
-    when :iptables_chain
-      %w{iptables iptables-persistent}
-    else
-      []
-    end
-  end
-
-  validate do
-    debug("[validate]")
-
-    value(:name).match(Nameformat)
-    chain = $1
-    table = $2
-    protocol = $3
-
-    # Check that we're not removing an internal chain
-    if chain =~ InternalChains && value(:ensure) == :absent
-      self.fail "Cannot remove in-built chains"
-    end
-
-    if value(:policy).nil? && protocol == 'ethernet'
-      self.fail "you must set a non-empty policy on all ethernet table chains"
-    end
-
-    # Check that we're not setting a policy on a user chain
-    if chain !~ InternalChains &&
-      !value(:policy).nil? &&
-      protocol != 'ethernet'
-
-      self.fail "policy can only be set on in-built chains (with the exception of ethernet chains) (table:#{table} chain:#{chain} protocol:#{protocol})"
-    end
-
-    # no DROP policy on nat table
-    if table == 'nat' &&
-      value(:policy) == :drop
-
-      self.fail 'The "nat" table is not intended for filtering, the use of DROP is therefore inhibited'
-    end
-  end
-
-  def generate
-    return [] unless self.purge?
-
-    value(:name).match(Nameformat)
-    chain = $1
-    table = $2
-    protocol = $3
-
-    provider = case protocol
-               when 'IPv4'
-                 :iptables
-               when 'IPv6'
-                 :ip6tables
-               end
-
-    # gather a list of all rules present on the system
-    rules_resources = Puppet::Type.type(:firewall).instances
-
-    # Keep only rules in this chain
-    rules_resources.delete_if { |res| (res[:provider] != provider or res.provider.properties[:table].to_s != table or res.provider.properties[:chain] != chain) }
-
-    # Remove rules which match our ignore filter
-    rules_resources.delete_if {|res| value(:ignore).find_index{|f| res.provider.properties[:line].match(f)}} if value(:ignore)
-
-    # We mark all remaining rules for deletion, and then let the catalog override us on rules which should be present
-    rules_resources.each {|res| res[:ensure] = :absent}
-
-    rules_resources
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb
deleted file mode 100644
index aa26d3bc700..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/firewall.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-require 'socket'
-require 'resolv'
-require 'puppet/util/ipcidr'
-
-# Util module for puppetlabs-firewall
-module Puppet::Util::Firewall
-  # Translate the symbolic names for icmp packet types to integers
-  def icmp_name_to_number(value_icmp, protocol)
-    if value_icmp =~ /\d{1,2}$/
-      value_icmp
-    elsif protocol == 'inet'
-      case value_icmp
-        when "echo-reply" then "0"
-        when "destination-unreachable" then "3"
-        when "source-quench" then "4"
-        when "redirect" then "6"
-        when "echo-request" then "8"
-        when "router-advertisement" then "9"
-        when "router-solicitation" then "10"
-        when "time-exceeded" then "11"
-        when "parameter-problem" then "12"
-        when "timestamp-request" then "13"
-        when "timestamp-reply" then "14"
-        when "address-mask-request" then "17"
-        when "address-mask-reply" then "18"
-        else nil
-      end
-    elsif protocol == 'inet6'
-      case value_icmp
-        when "destination-unreachable" then "1"
-        when "time-exceeded" then "3"
-        when "parameter-problem" then "4"
-        when "echo-request" then "128"
-        when "echo-reply" then "129"
-        when "router-solicitation" then "133"
-        when "router-advertisement" then "134"
-        when "redirect" then "137"
-        else nil
-      end
-    else
-      raise ArgumentError, "unsupported protocol family '#{protocol}'"
-    end
-  end
-
-  # Convert log_level names to their respective numbers
-  def log_level_name_to_number(value)
-    #TODO make this 0-7 only
-    if value =~ /\d/
-      value
-    else
-      case value
-        when "panic" then "0"
-        when "alert" then "1"
-        when "crit" then "2"
-        when "err" then "3"
-        when "error" then "3"
-        when "warn" then "4"
-        when "warning" then "4"
-        when "not" then "5"
-        when "notice" then "5"
-        when "info" then "6"
-        when "debug" then "7"
-        else nil
-      end
-    end
-  end
-
-  # This method takes a string and a protocol and attempts to convert
-  # it to a port number if valid.
-  #
-  # If the string already contains a port number or perhaps a range of ports
-  # in the format 22:1000 for example, it simply returns the string and does
-  # nothing.
-  def string_to_port(value, proto)
-    proto = proto.to_s
-    unless proto =~ /^(tcp|udp)$/
-      proto = 'tcp'
-    end
-
-    if value.kind_of?(String)
-      if value.match(/^\d+(-\d+)?$/)
-        return value
-      else
-        return Socket.getservbyname(value, proto).to_s
-      end
-    else
-      Socket.getservbyname(value.to_s, proto).to_s
-    end
-  end
-
-  # Takes an address and returns it in CIDR notation.
-  #
-  # If the address is:
-  #
-  #   - A hostname:
-  #     It will be resolved
-  #   - An IPv4 address:
-  #     It will be qualified with a /32 CIDR notation
-  #   - An IPv6 address:
-  #     It will be qualified with a /128 CIDR notation
-  #   - An IP address with a CIDR notation:
-  #     It will be normalised
-  #   - An IP address with a dotted-quad netmask:
-  #     It will be converted to CIDR notation
-  #   - Any address with a resulting prefix length of zero:
-  #     It will return nil which is equivilent to not specifying an address
-  #
-  def host_to_ip(value)
-    begin
-      value = Puppet::Util::IPCidr.new(value)
-    rescue
-      value = Puppet::Util::IPCidr.new(Resolv.getaddress(value))
-    end
-
-    return nil if value.prefixlen == 0
-    value.cidr
-  end
-
-  # Takes an address mask and converts the host portion to CIDR notation.
-  #
-  # This takes into account you can negate a mask but follows all rules
-  # defined in host_to_ip for the host/address part.
-  #
-  def host_to_mask(value)
-    match = value.match /(!)\s?(.*)$/
-    return host_to_ip(value) unless match
-
-    cidr = host_to_ip(match[2])
-    return nil if cidr == nil
-    "#{match[1]} #{cidr}"
-  end
-
-  # Validates the argument is int or hex, and returns valid hex
-  # conversion of the value or nil otherwise.
-  def to_hex32(value)
-      begin
-        value = Integer(value)
-        if value.between?(0, 0xffffffff)
-            return '0x' + value.to_s(16)
-        end
-      rescue ArgumentError
-        # pass
-      end
-    return nil
-  end
-
-  def persist_iptables(proto)
-    debug("[persist_iptables]")
-
-    # Basic normalisation for older Facter
-    os_key = Facter.value(:osfamily)
-    os_key ||= case Facter.value(:operatingsystem)
-    when 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer'
-      'RedHat'
-    when 'Debian', 'Ubuntu'
-      'Debian'
-    else
-      Facter.value(:operatingsystem)
-    end
-
-    # Older iptables-persistent doesn't provide save action.
-    if os_key == 'Debian'
-      persist_ver = Facter.value(:iptables_persistent_version)
-      if (persist_ver and Puppet::Util::Package.versioncmp(persist_ver, '0.5.0') < 0)
-        os_key = 'Debian_manual'
-      end
-    end
-
-    # Fedora 15 and newer use systemd to persist iptable rules
-    if os_key == 'RedHat' && Facter.value(:operatingsystem) == 'Fedora' && Facter.value(:operatingsystemrelease).to_i >= 15
-      os_key = 'Fedora'
-    end
-
-    # RHEL 7 and newer also use systemd to persist iptable rules
-    if os_key == 'RedHat' && Facter.value(:operatingsystem) == 'RedHat' && Facter.value(:operatingsystemrelease).to_i >= 7
-      os_key = 'Fedora'
-    end
-
-    cmd = case os_key.to_sym
-    when :RedHat
-      case proto.to_sym
-      when :IPv4
-        %w{/sbin/service iptables save}
-      when :IPv6
-        %w{/sbin/service ip6tables save}
-      end
-    when :Fedora
-      case proto.to_sym
-      when :IPv4
-        %w{/usr/libexec/iptables/iptables.init save}
-      when :IPv6
-        %w{/usr/libexec/iptables/ip6tables.init save}
-      end
-    when :Debian
-      case proto.to_sym
-      when :IPv4, :IPv6
-        %w{/usr/sbin/service iptables-persistent save}
-      end
-    when :Debian_manual
-      case proto.to_sym
-      when :IPv4
-        ["/bin/sh", "-c", "/sbin/iptables-save > /etc/iptables/rules"]
-      end
-    when :Archlinux
-      case proto.to_sym
-      when :IPv4
-        ["/bin/sh", "-c", "/usr/sbin/iptables-save > /etc/iptables/iptables.rules"]
-      when :IPv6
-        ["/bin/sh", "-c", "/usr/sbin/ip6tables-save > /etc/iptables/ip6tables.rules"]
-      end
-    end
-
-    # Catch unsupported OSs from the case statement above.
-    if cmd.nil?
-      debug('firewall: Rule persistence is not supported for this type/OS')
-      return
-    end
-
-    begin
-      execute(cmd)
-    rescue Puppet::ExecutionFailure => detail
-      warning("Unable to persist firewall rules: #{detail}")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb
deleted file mode 100644
index 87e8d5e3720..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/lib/puppet/util/ipcidr.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'ipaddr'
-
-# IPCidr object wrapper for IPAddr
-module Puppet
-  module Util
-    class IPCidr < IPAddr
-      def initialize(ipaddr)
-        begin
-          super(ipaddr)
-        rescue ArgumentError => e
-          if e.message =~ /invalid address/
-            raise ArgumentError, "Invalid address from IPAddr.new: #{ipaddr}"
-          else
-            raise e
-          end
-        end
-      end
-
-      def netmask
-        _to_string(@mask_addr)
-      end
-
-      def prefixlen
-        m = case @family
-            when Socket::AF_INET
-              IN4MASK
-            when Socket::AF_INET6
-              IN6MASK
-            else
-              raise "unsupported address family"
-            end
-        return $1.length if /\A(1*)(0*)\z/ =~ (@mask_addr & m).to_s(2)
-        raise "bad addr_mask format"
-      end
-
-      def cidr
-        cidr = sprintf("%s/%s", self.to_s, self.prefixlen)
-        cidr
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/init.pp
deleted file mode 100644
index 759f3282351..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/init.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# = Class: firewall
-#
-# Manages packages and services required by the firewall type/provider.
-#
-# This class includes the appropriate sub-class for your operating system,
-# where supported.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-class firewall (
-  $ensure = running
-) {
-  case $ensure {
-    /^(running|stopped)$/: {
-      # Do nothing.
-    }
-    default: {
-      fail("${title}: Ensure value '${ensure}' is not supported")
-    }
-  }
-
-  case $::kernel {
-    'Linux': {
-      class { "${title}::linux":
-        ensure => $ensure,
-      }
-    }
-    default: {
-      fail("${title}: Kernel '${::kernel}' is not currently supported")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux.pp
deleted file mode 100644
index 7c4f3a80b5b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux.pp
+++ /dev/null
@@ -1,51 +0,0 @@
-# = Class: firewall::linux
-#
-# Installs the `iptables` package for Linux operating systems and includes
-# the appropriate sub-class for any distribution specific services and
-# additional packages.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources. When `running` the
-#   service will be started on boot, and when `stopped` it will not.
-#   Default: running
-#
-class firewall::linux (
-  $ensure = running
-) {
-  $enable = $ensure ? {
-    running => true,
-    stopped => false,
-  }
-
-  package { 'iptables':
-    ensure => present,
-  }
-
-  case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'SL', 'SLC', 'Ascendos',
-    'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'XenServer': {
-      class { "${title}::redhat":
-        ensure  => $ensure,
-        enable  => $enable,
-        require => Package['iptables'],
-      }
-    }
-    'Debian', 'Ubuntu': {
-      class { "${title}::debian":
-        ensure  => $ensure,
-        enable  => $enable,
-        require => Package['iptables'],
-      }
-    }
-    'Archlinux': {
-      class { "${title}::archlinux":
-        ensure  => $ensure,
-        enable  => $enable,
-        require => Package['iptables'],
-      }
-    }
-    default: {}
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp
deleted file mode 100644
index 546a5a80fe2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/archlinux.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# = Class: firewall::linux::archlinux
-#
-# Manages `iptables` and `ip6tables` services, and creates files used for
-# persistence, on Arch Linux systems.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-# [*enable*]
-#   Enable parameter passed onto Service[] resources.
-#   Default: true
-#
-class firewall::linux::archlinux (
-  $ensure = 'running',
-  $enable = true
-) {
-  service { 'iptables':
-    ensure    => $ensure,
-    enable    => $enable,
-    hasstatus => true,
-  }
-
-  service { 'ip6tables':
-    ensure    => $ensure,
-    enable    => $enable,
-    hasstatus => true,
-  }
-
-  file { '/etc/iptables/iptables.rules':
-    ensure => present,
-    before => Service['iptables'],
-  }
-
-  file { '/etc/iptables/ip6tables.rules':
-    ensure => present,
-    before => Service['ip6tables'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/debian.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/debian.pp
deleted file mode 100644
index 4d28bc482e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/debian.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# = Class: firewall::linux::debian
-#
-# Installs the `iptables-persistent` package for Debian-alike systems. This
-# allows rules to be stored to file and restored on boot.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-# [*enable*]
-#   Enable parameter passed onto Service[] resources.
-#   Default: true
-#
-class firewall::linux::debian (
-  $ensure = running,
-  $enable = true
-) {
-  package { 'iptables-persistent':
-    ensure => present,
-  }
-
-  if($::operatingsystemrelease =~ /^6\./ and $enable == true
-  and versioncmp($::iptables_persistent_version, '0.5.0') < 0 ) {
-    # This fixes a bug in the iptables-persistent LSB headers in 6.x, without it
-    # we lose idempotency
-    exec { 'iptables-persistent-enable':
-      logoutput => on_failure,
-      command   => '/usr/sbin/update-rc.d iptables-persistent enable',
-      unless    => '/usr/bin/test -f /etc/rcS.d/S*iptables-persistent',
-      require   => Package['iptables-persistent'],
-    }
-  } else {
-    # This isn't a real service/daemon. The start action loads rules, so just
-    # needs to be called on system boot.
-    service { 'iptables-persistent':
-      ensure    => undef,
-      enable    => $enable,
-      hasstatus => true,
-      require   => Package['iptables-persistent'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp
deleted file mode 100644
index f697d211b9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/manifests/linux/redhat.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# = Class: firewall::linux::redhat
-#
-# Manages the `iptables` service on RedHat-alike systems.
-#
-# == Parameters:
-#
-# [*ensure*]
-#   Ensure parameter passed onto Service[] resources.
-#   Default: running
-#
-# [*enable*]
-#   Enable parameter passed onto Service[] resources.
-#   Default: true
-#
-class firewall::linux::redhat (
-  $ensure = running,
-  $enable = true
-) {
-
-  # RHEL 7 and later and Fedora 15 and later require the iptables-services
-  # package, which provides the /usr/libexec/iptables/iptables.init used by
-  # lib/puppet/util/firewall.rb.
-  if $::operatingsystem == RedHat and $::operatingsystemrelease >= 7 {
-    package { 'iptables-services':
-      ensure => present,
-    }
-  }
-
-  if ($::operatingsystem == 'Fedora' and (( $::operatingsystemrelease =~ /^\d+/ and $::operatingsystemrelease >= 15 ) or $::operatingsystemrelease == "Rawhide")) {
-    package { 'iptables-services':
-      ensure => present,
-    }
-  }
-
-  service { 'iptables':
-    ensure    => $ensure,
-    enable    => $enable,
-    hasstatus => true,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/metadata.json
deleted file mode 100644
index 40fb8612bda..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/metadata.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "name": "puppetlabs-firewall",
-    "version": "1.1.1",
-    "source": "https://github.com/puppetlabs/puppetlabs-firewall",
-    "author": "Puppet Labs",
-    "license": "Apache-2.0",
-    "project_page": "https://github.com/puppetlabs/puppetlabs-firewall",
-    "summary": "Manages Firewalls such as iptable",
-    "operatingsystem_support": [
-      {
-        "operatingsystem": "RedHat",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "CentOS",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "OracleLinux",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "Scientific",
-        "operatingsystemrelease": [
-          "5",
-          "6"
-        ]
-      },
-      {
-        "operatingsystem": "SLES",
-        "operatingsystemrelease": [
-          "11 SP1"
-        ]
-      },
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "pe", "version_requirement": "3.2.x" },
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb
deleted file mode 100644
index cdb4eab3543..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/change_source_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-  describe 'reset' do
-    it 'deletes all rules' do
-      shell('iptables --flush; iptables -t nat --flush; iptables -t mangle --flush')
-    end
-  end
-
-  describe 'when unmanaged rules exist' do
-    it 'applies with 8.0.0.1 first' do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '101 test source changes':
-            proto  => tcp,
-            port   => '101',
-            action => accept,
-            source => '8.0.0.1',
-          }
-          firewall { '100 test source static':
-            proto  => tcp,
-            port   => '100',
-            action => accept,
-            source => '8.0.0.2',
-          }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'adds a unmanaged rule without a comment' do
-      shell('iptables -A INPUT -t filter -s 8.0.0.3/32 -p tcp -m multiport --ports 102 -j ACCEPT')
-      expect(shell('iptables-save').stdout).to match(/-A INPUT -s 8\.0\.0\.3(\/32)? -p tcp -m multiport --ports 102 -j ACCEPT/)
-    end
-
-    it 'contains the changable 8.0.0.1 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.1(\/32)? -p tcp -m multiport --ports 101 -m comment --comment "101 test source changes" -j ACCEPT/)
-      end
-    end
-    it 'contains the static 8.0.0.2 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.2(\/32)? -p tcp -m multiport --ports 100 -m comment --comment "100 test source static" -j ACCEPT/)
-      end
-    end
-
-    it 'changes to 8.0.0.4 second' do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '101 test source changes':
-            proto  => tcp,
-            port   => '101',
-            action => accept,
-            source => '8.0.0.4',
-          }
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/Notice: \/Stage\[main\]\/Main\/Firewall\[101 test source changes\]\/source: source changed '8\.0\.0\.1\/32' to '8\.0\.0\.4\/32'/)
-    end
-
-    it 'does not contain the old changing 8.0.0.1 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to_not match(/8\.0\.0\.1/)
-      end
-    end
-    it 'contains the staic 8.0.0.2 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.2(\/32)? -p tcp -m multiport --ports 100 -m comment --comment "100 test source static" -j ACCEPT/)
-      end
-    end
-    it 'contains the changing new 8.0.0.4 rule' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/-A INPUT -s 8\.0\.0\.4(\/32)? -p tcp -m multiport --ports 101 -m comment --comment "101 test source changes" -j ACCEPT/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb
deleted file mode 100644
index aaf05a1f53f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "firewall class:" do
-  it 'should run successfully' do
-    pp = "class { 'firewall': }"
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'ensure => stopped:' do
-    pp = "class { 'firewall': ensure => stopped }"
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'ensure => running:' do
-    pp = "class { 'firewall': ensure => running }"
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb
deleted file mode 100644
index ce6cab4ed72..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connlimit_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-
-  describe 'connlimit_above' do
-    context '10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '500 - test':
-            proto           => tcp,
-	    dport           => '22',
-	    connlimit_above => '10',
-            action          => reject,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          #connlimit-saddr is added in Ubuntu 14.04.
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "500 - test" -m connlimit --connlimit-above 10 --connlimit-mask 32 (--connlimit-saddr )?-j REJECT --reject-with icmp-port-unreachable/)
-        end
-      end
-    end
-  end
-
-  describe 'connlimit_mask' do
-    context '24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '501 - test':
-            proto           => tcp,
-            dport           => '22',
-            connlimit_above => '10',
-            connlimit_mask  => '24',
-            action          => reject,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          #connlimit-saddr is added in Ubuntu 14.04.
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "501 - test" -m connlimit --connlimit-above 10 --connlimit-mask 24 (--connlimit-saddr )?-j REJECT --reject-with icmp-port-unreachable/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb
deleted file mode 100644
index 959efbdfa7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/connmark_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-
-  describe 'connmark' do
-    context '50' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '502 - test':
-            proto    => 'all',
-	    connmark => '0x1',
-            action   => reject,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -m comment --comment "502 - test" -m connmark --mark 0x1 -j REJECT --reject-with icmp-port-unreachable/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb
deleted file mode 100644
index 5353e104d59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewall_spec.rb
+++ /dev/null
@@ -1,1618 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall type' do
-
-  describe 'reset' do
-    it 'deletes all rules' do
-      shell('iptables --flush; iptables -t nat --flush; iptables -t mangle --flush')
-    end
-  end
-
-  describe 'name' do
-    context 'valid' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '001 - test': ensure => present }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-    end
-
-    context 'invalid' do
-      it 'fails' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { 'test': ensure => present }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "test"./)
-        end
-      end
-    end
-  end
-
-  describe 'ensure' do
-    context 'default' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '555 - test':
-            proto  => tcp,
-            port   => '555',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 555 -m comment --comment "555 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'present' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '555 - test':
-            ensure => present,
-            proto  => tcp,
-            port   => '555',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 555 -m comment --comment "555 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'absent' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '555 - test':
-            ensure => absent,
-            proto  => tcp,
-            port   => '555',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 555 -m comment --comment "555 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'source' do
-    context '192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '556 - test':
-            proto  => tcp,
-            port   => '556',
-            action => accept,
-            source => '192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -s 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 556 -m comment --comment "556 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context '! 192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '556 - test':
-            proto  => tcp,
-            port   => '556',
-            action => accept,
-            source => '! 192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT (! -s|-s !) 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 556 -m comment --comment "556 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid address
-    context '256.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '556 - test':
-            proto  => tcp,
-            port   => '556',
-            action => accept,
-            source => '256.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/host_to_ip failed for 256.168.2.0\/(24|255\.255\.255\.0)/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -s 256.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 556 -m comment --comment "556 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'src_range' do
-    context '192.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '557 - test':
-            proto  => tcp,
-            port   => '557',
-            action => accept,
-            src_range => '192.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m iprange --src-range 192.168.1.1-192.168.1.10 -m multiport --ports 557 -m comment --comment "557 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid IP
-    context '392.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '557 - test':
-            proto  => tcp,
-            port   => '557',
-            action => accept,
-            src_range => '392.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "392.168.1.1-192.168.1.10"/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m iprange --src-range 392.168.1.1-192.168.1.10 -m multiport --ports 557 -m comment --comment "557 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'destination' do
-    context '192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '558 - test':
-            proto  => tcp,
-            port   => '558',
-            action => accept,
-            destination => '192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -d 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 558 -m comment --comment "558 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context '! 192.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '558 - test':
-            proto  => tcp,
-            port   => '558',
-            action => accept,
-            destination => '! 192.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT (! -d|-d !) 192.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 558 -m comment --comment "558 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid address
-    context '256.168.2.0/24' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '558 - test':
-            proto  => tcp,
-            port   => '558',
-            action => accept,
-            destination => '256.168.2.0/24',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/host_to_ip failed for 256.168.2.0\/(24|255\.255\.255\.0)/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -d 256.168.2.0\/(24|255\.255\.255\.0) -p tcp -m multiport --ports 558 -m comment --comment "558 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'dst_range' do
-    context '192.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '559 - test':
-            proto  => tcp,
-            port   => '559',
-            action => accept,
-            dst_range => '192.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m iprange --dst-range 192.168.1.1-192.168.1.10 -m multiport --ports 559 -m comment --comment "559 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    # Invalid IP
-    context '392.168.1.1-192.168.1.10' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '559 - test':
-            proto  => tcp,
-            port   => '559',
-            action => accept,
-            dst_range => '392.168.1.1-192.168.1.10',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "392.168.1.1-192.168.1.10"/)
-        end
-      end
-
-      it 'should not contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m iprange --dst-range 392.168.1.1-192.168.1.10 -m multiport --ports 559 -m comment --comment "559 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'sport' do
-    context 'single port' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '560 - test':
-            proto  => tcp,
-            sport  => '560',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --sports 560 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'multiple ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '560 - test':
-            proto  => tcp,
-            sport  => '560-561',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --sports 560:561 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'invalid ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '560 - test':
-            proto  => tcp,
-            sport  => '9999560-561',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/invalid port\/service `9999560' specified/)
-        end
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --sports 9999560-561 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'dport' do
-    context 'single port' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '561 - test':
-            proto  => tcp,
-            dport  => '561',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 561 -m comment --comment "561 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'multiple ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '561 - test':
-            proto  => tcp,
-            dport  => '561-562',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --dports 561:562 -m comment --comment "561 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'invalid ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '561 - test':
-            proto  => tcp,
-            dport  => '9999561-562',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/invalid port\/service `9999561' specified/)
-        end
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --dports 9999561-562 -m comment --comment "560 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  describe 'port' do
-    context 'single port' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '562 - test':
-            proto  => tcp,
-            port  => '562',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 562 -m comment --comment "562 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'multiple ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '562 - test':
-            proto  => tcp,
-            port  => '562-563',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 562:563 -m comment --comment "562 - test" -j ACCEPT/)
-         end
-      end
-    end
-
-    context 'invalid ports' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '562 - test':
-            proto  => tcp,
-            port  => '9999562-563',
-            action => accept,
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/invalid port\/service `9999562' specified/)
-        end
-      end
-
-      it 'should contain the rule' do
-         shell('iptables-save') do |r|
-           expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 9999562-563 -m comment --comment "562 - test" -j ACCEPT/)
-         end
-      end
-    end
-  end
-
-  ['dst_type', 'src_type'].each do |type|
-    describe "#{type}" do
-      context 'MULTICAST' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '563 - test':
-              proto  => tcp,
-              action => accept,
-              #{type} => 'MULTICAST',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('iptables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m addrtype\s.*\sMULTICAST -m comment --comment "563 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'BROKEN' do
-        it 'fails' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '563 - test':
-              proto  => tcp,
-              action => accept,
-              #{type} => 'BROKEN',
-            }
-          EOS
-
-          apply_manifest(pp, :expect_failures => true) do |r|
-            expect(r.stderr).to match(/Invalid value "BROKEN"./)
-          end
-        end
-
-        it 'should not contain the rule' do
-          shell('iptables-save') do |r|
-            expect(r.stdout).to_not match(/-A INPUT -p tcp -m addrtype\s.*\sBROKEN -m comment --comment "563 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'tcp_flags' do
-    context 'FIN,SYN ACK' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '564 - test':
-            proto  => tcp,
-            action => accept,
-            tcp_flags => 'FIN,SYN ACK',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m tcp --tcp-flags FIN,SYN ACK -m comment --comment "564 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'chain' do
-    context 'INPUT' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '565 - test':
-            proto  => tcp,
-            action => accept,
-            chain  => 'FORWARD',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A FORWARD -p tcp -m comment --comment "565 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'table' do
-    context 'mangle' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '566 - test':
-            proto  => tcp,
-            action => accept,
-            table  => 'mangle',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t mangle') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m comment --comment "566 - test" -j ACCEPT/)
-        end
-      end
-    end
-    context 'nat' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '566 - test2':
-            proto  => tcp,
-            action => accept,
-            table  => 'nat',
-            chain  => 'OUTPUT',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -p tcp -m comment --comment "566 - test2" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'jump' do
-    after :all do
-      iptables_flush_all_tables
-      expect(shell('iptables -t filter -X TEST').stderr).to eq("")
-    end
-
-    context 'MARK' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewallchain { 'TEST:filter:IPv4':
-            ensure => present,
-          }
-          firewall { '567 - test':
-            proto  => tcp,
-            chain  => 'INPUT',
-            jump  => 'TEST',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m comment --comment "567 - test" -j TEST/)
-        end
-      end
-    end
-
-    context 'jump and apply' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewallchain { 'TEST:filter:IPv4':
-            ensure => present,
-          }
-          firewall { '568 - test':
-            proto  => tcp,
-            chain  => 'INPUT',
-            action => 'accept',
-            jump  => 'TEST',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Only one of the parameters 'action' and 'jump' can be set/)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p tcp -m comment --comment "568 - test" -j TEST/)
-        end
-      end
-    end
-  end
-
-  describe 'tosource' do
-    context '192.168.1.1' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '568 - test':
-            proto  => tcp,
-            table  => 'nat',
-            chain  => 'POSTROUTING',
-            jump  => 'SNAT',
-            tosource => '192.168.1.1',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/A POSTROUTING -p tcp -m comment --comment "568 - test" -j SNAT --to-source 192.168.1.1/)
-        end
-      end
-    end
-  end
-
-  describe 'todest' do
-    context '192.168.1.1' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '569 - test':
-            proto  => tcp,
-            table  => 'nat',
-            chain  => 'PREROUTING',
-            jump   => 'DNAT',
-            source => '200.200.200.200',
-            todest => '192.168.1.1',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -s 200.200.200.200(\/32)? -p tcp -m comment --comment "569 - test" -j DNAT --to-destination 192.168.1.1/)
-        end
-      end
-    end
-  end
-
-  describe 'toports' do
-    context '192.168.1.1' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '570 - test':
-            proto  => icmp,
-            table  => 'nat',
-            chain  => 'PREROUTING',
-            jump  => 'REDIRECT',
-            toports => '2222',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -p icmp -m comment --comment "570 - test" -j REDIRECT --to-ports 2222/)
-        end
-      end
-    end
-  end
-
-  # RHEL5 does not support --random
-  if default['platform'] !~ /el-5/
-    describe 'random' do
-      context '192.168.1.1' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '570 - test 2':
-              proto  => all,
-              table  => 'nat',
-              chain  => 'POSTROUTING',
-              jump   => 'MASQUERADE',
-              source => '172.30.0.0/16',
-              random => true
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-          apply_manifest(pp, :catch_changes => true)
-        end
-
-        it 'should contain the rule' do
-          shell('iptables-save -t nat') do |r|
-            expect(r.stdout).to match(/-A POSTROUTING -s 172\.30\.0\.0\/16 -m comment --comment "570 - test 2" -j MASQUERADE --random/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'icmp' do
-    context 'any' do
-      it 'fails' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '571 - test':
-            proto  => icmp,
-            icmp   => 'any',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/This behaviour should be achieved by omitting or undefining the ICMP parameter/)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p icmp -m comment --comment "570 - test" -m icmp --icmp-type 11/)
-        end
-      end
-    end
-  end
-
-  #iptables version 1.3.5 is not suppored by the ip6tables provider
-  if default['platform'] !~ /el-5/
-    describe 'hop_limit' do
-      context '5' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '571 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '571',
-              action => accept,
-              hop_limit => '5',
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 571 -m comment --comment "571 - test" -m hl --hl-eq 5 -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'invalid' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '571 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '571',
-              action => accept,
-              hop_limit => 'invalid',
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :expect_failures => true) do |r|
-            expect(r.stderr).to match(/Invalid value "invalid"./)
-          end
-        end
-
-        it 'should not contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 571 -m comment --comment "571 - test" -m hl --hl-eq invalid -j ACCEPT/)
-          end
-        end
-      end
-    end
-
-    describe 'ishasmorefrags' do
-      context 'true' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '587 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '587',
-              action => accept,
-              ishasmorefrags => true,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/A INPUT -p tcp -m frag --fragid 0 --fragmore -m multiport --ports 587 -m comment --comment "587 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'false' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '588 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '588',
-              action => accept,
-              ishasmorefrags => false,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 588 -m comment --comment "588 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-
-    describe 'islastfrag' do
-      context 'true' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '589 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '589',
-              action => accept,
-              islastfrag => true,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m frag --fragid 0 --fraglast -m multiport --ports 589 -m comment --comment "589 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'false' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '590 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '590',
-              action => accept,
-              islastfrag => false,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 590 -m comment --comment "590 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-
-    describe 'isfirstfrag' do
-      context 'true' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '591 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '591',
-              action => accept,
-              isfirstfrag => true,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m frag --fragid 0 --fragfirst -m multiport --ports 591 -m comment --comment "591 - test" -j ACCEPT/)
-          end
-        end
-      end
-
-      context 'false' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '592 - test':
-              ensure => present,
-              proto => tcp,
-              port   => '592',
-              action => accept,
-              isfirstfrag => false,
-              provider => 'ip6tables',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('ip6tables-save') do |r|
-            expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 592 -m comment --comment "592 - test" -j ACCEPT/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'limit' do
-    context '500/sec' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '572 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '572',
-            action => accept,
-            limit => '500/sec',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 572 -m comment --comment "572 - test" -m limit --limit 500\/sec -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'burst' do
-    context '500' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '573 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '573',
-            action => accept,
-            limit => '500/sec',
-            burst => '1500',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 573 -m comment --comment "573 - test" -m limit --limit 500\/sec --limit-burst 1500 -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'invalid' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '571 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '571',
-            action => accept,
-            limit => '500/sec',
-            burst => '1500/sec',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "1500\/sec"./)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 573 -m comment --comment "573 - test" -m limit --limit 500\/sec --limit-burst 1500\/sec -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'uid' do
-    context 'nobody' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '574 - test':
-            ensure => present,
-            proto => tcp,
-            chain => 'OUTPUT',
-            port   => '574',
-            action => accept,
-            uid => 'nobody',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -p tcp -m owner --uid-owner (nobody|\d+) -m multiport --ports 574 -m comment --comment "574 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'gid' do
-    context 'root' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '575 - test':
-            ensure => present,
-            proto => tcp,
-            chain => 'OUTPUT',
-            port   => '575',
-            action => accept,
-            gid => 'root',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -p tcp -m owner --gid-owner (root|\d+) -m multiport --ports 575 -m comment --comment "575 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  #iptables version 1.3.5 does not support masks on MARK rules
-  if default['platform'] !~ /el-5/
-    describe 'set_mark' do
-      context '0x3e8/0xffffffff' do
-        it 'applies' do
-          pp = <<-EOS
-            class { '::firewall': }
-            firewall { '580 - test':
-              ensure => present,
-              chain => 'OUTPUT',
-              proto => tcp,
-              port   => '580',
-              jump => 'MARK',
-              table => 'mangle',
-              set_mark => '0x3e8/0xffffffff',
-            }
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-
-        it 'should contain the rule' do
-          shell('iptables-save -t mangle') do |r|
-            expect(r.stdout).to match(/-A OUTPUT -p tcp -m multiport --ports 580 -m comment --comment "580 - test" -j MARK --set-xmark 0x3e8\/0xffffffff/)
-          end
-        end
-      end
-    end
-  end
-
-  describe 'pkttype' do
-    context 'multicast' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '581 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '581',
-            action => accept,
-            pkttype => 'multicast',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 581 -m pkttype --pkt-type multicast -m comment --comment "581 - test" -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'test' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '582 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '582',
-            action => accept,
-            pkttype => 'test',
-          }
-        EOS
-
-        apply_manifest(pp, :expect_failures => true) do |r|
-          expect(r.stderr).to match(/Invalid value "test"./)
-        end
-      end
-
-      it 'should not contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/-A INPUT -p tcp -m multiport --ports 582 -m pkttype --pkt-type multicast -m comment --comment "582 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'isfragment' do
-    context 'true' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '583 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '583',
-            action => accept,
-            isfragment => true,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -f -m multiport --ports 583 -m comment --comment "583 - test" -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'false' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '584 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '584',
-            action => accept,
-            isfragment => false,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -p tcp -m multiport --ports 584 -m comment --comment "584 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  # RHEL5/SLES does not support -m socket
-  describe 'socket', :unless => (default['platform'] =~ /el-5/ or fact('operatingsystem') == 'SLES') do
-    context 'true' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '585 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '585',
-            action => accept,
-            chain  => 'PREROUTING',
-            table  => 'nat',
-            socket => true,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -p tcp -m multiport --ports 585 -m socket -m comment --comment "585 - test" -j ACCEPT/)
-        end
-      end
-    end
-
-    context 'false' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '586 - test':
-            ensure => present,
-            proto => tcp,
-            port   => '586',
-            action => accept,
-            chain  => 'PREROUTING',
-            table  => 'nat',
-            socket => false,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save -t nat') do |r|
-          expect(r.stdout).to match(/-A PREROUTING -p tcp -m multiport --ports 586 -m comment --comment "586 - test" -j ACCEPT/)
-        end
-      end
-    end
-  end
-
-  describe 'ipsec_policy' do
-    context 'ipsec' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '593 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'OUTPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'out',
-            ipsec_policy => 'ipsec',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "593 - test" -m policy --dir out --pol ipsec -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-
-    context 'none' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '594 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'OUTPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'out',
-            ipsec_policy => 'none',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "594 - test" -m policy --dir out --pol none -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-  end
-
-  describe 'ipsec_dir' do
-    context 'out' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '595 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'OUTPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'out',
-            ipsec_policy => 'ipsec',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A OUTPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "595 - test" -m policy --dir out --pol ipsec -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-
-    context 'in' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '596 - test':
-            ensure       => 'present',
-            action       => 'reject',
-            chain        => 'INPUT',
-            destination  => '20.0.0.0/8',
-            ipsec_dir    => 'in',
-            ipsec_policy => 'none',
-            proto        => 'all',
-            reject       => 'icmp-net-unreachable',
-            table        => 'filter',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 20.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "596 - test" -m policy --dir in --pol none -j REJECT --reject-with icmp-net-unreachable/)
-        end
-      end
-    end
-  end
-
-  describe 'recent' do
-    context 'set' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '597 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'set',
-            rdest        => true,
-            rname        => 'list1',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          # Mask added as of Ubuntu 14.04.
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "597 - test" -m recent --set --name list1 (--mask 255.255.255.255 )?--rdest/)
-        end
-      end
-    end
-
-    context 'rcheck' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '598 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'rcheck',
-            rsource      => true,
-            rname        => 'list1',
-            rseconds     => 60,
-            rhitcount    => 5,
-            rttl         => true,
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "598 - test" -m recent --rcheck --seconds 60 --hitcount 5 --rttl --name list1 (--mask 255.255.255.255 )?--rsource/)
-        end
-      end
-    end
-
-    context 'update' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '599 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'update',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "599 - test" -m recent --update/)
-        end
-      end
-    end
-
-    context 'remove' do
-      it 'applies' do
-        pp = <<-EOS
-          class { '::firewall': }
-          firewall { '600 - test':
-            ensure       => 'present',
-            chain        => 'INPUT',
-            destination  => '30.0.0.0/8',
-            proto        => 'all',
-            table        => 'filter',
-            recent       => 'remove',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-
-      it 'should contain the rule' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/-A INPUT -d 30.0.0.0\/(8|255\.0\.0\.0) -m comment --comment "600 - test" -m recent --remove/)
-        end
-      end
-    end
-  end
-
-  describe 'reset' do
-    it 'deletes all rules' do
-      shell('ip6tables --flush')
-      shell('iptables --flush; iptables -t nat --flush; iptables -t mangle --flush')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb
deleted file mode 100644
index 757336a75c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/firewallchain_spec.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'puppet resource firewallchain command:' do
-  before :all do
-    iptables_flush_all_tables
-  end
-  describe 'ensure' do
-    context 'present' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          firewallchain { 'MY_CHAIN:filter:IPv4':
-            ensure  => present,
-          }
-        EOS
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'finds the chain' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/MY_CHAIN/)
-        end
-      end
-    end
-
-    context 'absent' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          firewallchain { 'MY_CHAIN:filter:IPv4':
-            ensure  => absent,
-          }
-        EOS
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'fails to find the chain' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to_not match(/MY_CHAIN/)
-        end
-      end
-    end
-  end
-
-  # XXX purge => false is not yet implemented
-  #context 'adding a firewall rule to a chain:' do
-  #  it 'applies cleanly' do
-  #    pp = <<-EOS
-  #      firewallchain { 'MY_CHAIN:filter:IPv4':
-  #        ensure  => present,
-  #      }
-  #      firewall { '100 my rule':
-  #        chain   => 'MY_CHAIN',
-  #        action  => 'accept',
-  #        proto   => 'tcp',
-  #        dport   => 5000,
-  #      }
-  #    EOS
-  #    # Run it twice and test for idempotency
-  #    apply_manifest(pp, :catch_failures => true)
-  #    apply_manifest(pp, :catch_changes => true)
-  #  end
-  #end
-
-  #context 'not purge firewallchain chains:' do
-  #  it 'does not purge the rule' do
-  #    pp = <<-EOS
-  #      firewallchain { 'MY_CHAIN:filter:IPv4':
-  #        ensure  => present,
-  #        purge   => false,
-  #        before  => Resources['firewall'],
-  #      }
-  #      resources { 'firewall':
-  #        purge => true,
-  #      }
-  #    EOS
-  #    # Run it twice and test for idempotency
-  #    apply_manifest(pp, :catch_failures => true) do |r|
-  #      expect(r.stdout).to_not match(/removed/)
-  #      expect(r.stderr).to eq('')
-  #    end
-  #    apply_manifest(pp, :catch_changes => true)
-  #  end
-
-  #  it 'still has the rule' do
-  #    pp = <<-EOS
-  #      firewall { '100 my rule':
-  #        chain   => 'MY_CHAIN',
-  #        action  => 'accept',
-  #        proto   => 'tcp',
-  #        dport   => 5000,
-  #      }
-  #    EOS
-  #    # Run it twice and test for idempotency
-  #    apply_manifest(pp, :catch_changes => true)
-  #  end
-  #end
-
-  describe 'policy' do
-    after :all do
-      shell('iptables -t filter -P FORWARD ACCEPT')
-    end
-
-    context 'DROP' do
-      it 'applies cleanly' do
-        pp = <<-EOS
-          firewallchain { 'FORWARD:filter:IPv4':
-            policy  => 'drop',
-          }
-        EOS
-        # Run it twice and test for idempotency
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-      end
-
-      it 'finds the chain' do
-        shell('iptables-save') do |r|
-          expect(r.stdout).to match(/FORWARD DROP/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb
deleted file mode 100644
index bfce0e607fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/ip6_fragment_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'spec_helper_acceptance'
-
-if default['platform'] =~ /el-5/
-  describe "firewall ip6tables doesn't work on 1.3.5 because --comment is missing" do
-    before :all do
-      ip6tables_flush_all_tables
-    end
-
-    it "can't use ip6tables" do
-      pp = <<-EOS
-        class { '::firewall': }
-        firewall { '599 - test':
-          ensure   => present,
-          proto    => 'tcp',
-          provider => 'ip6tables',
-        }
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/ip6tables provider is not supported/)
-    end
-  end
-else
-  describe 'firewall ishasmorefrags/islastfrag/isfirstfrag properties' do
-    before :all do
-      ip6tables_flush_all_tables
-    end
-
-    shared_examples "is idempotent" do |values, line_match|
-      it "changes the values to #{values}" do
-        pp = <<-EOS
-            class { '::firewall': }
-            firewall { '599 - test':
-              ensure   => present,
-              proto    => 'tcp',
-              provider => 'ip6tables',
-              #{values}
-            }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-
-        shell('ip6tables-save') do |r|
-          expect(r.stdout).to match(/#{line_match}/)
-        end
-      end
-    end
-    shared_examples "doesn't change" do |values, line_match|
-      it "doesn't change the values to #{values}" do
-        pp = <<-EOS
-            class { '::firewall': }
-            firewall { '599 - test':
-              ensure   => present,
-              proto    => 'tcp',
-              provider => 'ip6tables',
-              #{values}
-            }
-        EOS
-
-        apply_manifest(pp, :catch_changes => true)
-
-        shell('ip6tables-save') do |r|
-          expect(r.stdout).to match(/#{line_match}/)
-        end
-      end
-    end
-
-    describe 'adding a rule' do
-      context 'when unset' do
-        before :all do
-          ip6tables_flush_all_tables
-        end
-        it_behaves_like 'is idempotent', '', /-A INPUT -p tcp -m comment --comment "599 - test"/
-      end
-      context 'when set to true' do
-        before :all do
-          ip6tables_flush_all_tables
-        end
-        it_behaves_like "is idempotent", 'ishasmorefrags => true, islastfrag => true, isfirstfrag => true', /-A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"/
-      end
-      context 'when set to false' do
-        before :all do
-          ip6tables_flush_all_tables
-        end
-        it_behaves_like "is idempotent", 'ishasmorefrags => false, islastfrag => false, isfirstfrag => false', /-A INPUT -p tcp -m comment --comment "599 - test"/
-      end
-    end
-    describe 'editing a rule' do
-      context 'when unset or false' do
-        before :each do
-          ip6tables_flush_all_tables
-          shell('ip6tables -A INPUT -p tcp -m comment --comment "599 - test"')
-        end
-        context 'and current value is false' do
-          it_behaves_like "doesn't change", 'ishasmorefrags => false, islastfrag => false, isfirstfrag => false', /-A INPUT -p tcp -m comment --comment "599 - test"/
-        end
-        context 'and current value is true' do
-          it_behaves_like "is idempotent", 'ishasmorefrags => true, islastfrag => true, isfirstfrag => true', /-A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"/
-        end
-      end
-      context 'when set to true' do
-        before :each do
-          ip6tables_flush_all_tables
-          shell('ip6tables -A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"')
-        end
-        context 'and current value is false' do
-          it_behaves_like "is idempotent", 'ishasmorefrags => false, islastfrag => false, isfirstfrag => false', /-A INPUT -p tcp -m comment --comment "599 - test"/
-        end
-        context 'and current value is true' do
-          it_behaves_like "doesn't change", 'ishasmorefrags => true, islastfrag => true, isfirstfrag => true', /-A INPUT -p tcp -m frag --fragid 0 --fragmore -m frag --fragid 0 --fraglast -m frag --fragid 0 --fragfirst -m comment --comment "599 - test"/
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb
deleted file mode 100644
index 7fdedc28732..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/isfragment_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'firewall isfragment property' do
-  before :all do
-    iptables_flush_all_tables
-  end
-
-  shared_examples "is idempotent" do |value, line_match|
-    it "changes the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '597 - test':
-            ensure => present,
-            proto  => 'tcp',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-  shared_examples "doesn't change" do |value, line_match|
-    it "doesn't change the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '597 - test':
-            ensure => present,
-            proto  => 'tcp',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-
-  describe 'adding a rule' do
-    context 'when unset' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', '', /-A INPUT -p tcp -m comment --comment "597 - test"/
-    end
-    context 'when set to true' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', 'isfragment => true,', /-A INPUT -p tcp -f -m comment --comment "597 - test"/
-    end
-    context 'when set to false' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like "is idempotent", 'isfragment => false,', /-A INPUT -p tcp -m comment --comment "597 - test"/
-    end
-  end
-  describe 'editing a rule' do
-    context 'when unset or false' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -A INPUT -p tcp -m comment --comment "597 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "doesn't change", 'isfragment => false,', /-A INPUT -p tcp -m comment --comment "597 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "is idempotent", 'isfragment => true,', /-A INPUT -p tcp -f -m comment --comment "597 - test"/
-      end
-    end
-    context 'when set to true' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -A INPUT -p tcp -f -m comment --comment "597 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "is idempotent", 'isfragment => false,', /-A INPUT -p tcp -m comment --comment "597 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "doesn't change", 'isfragment => true,', /-A INPUT -p tcp -f -m comment --comment "597 - test"/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml
deleted file mode 100644
index 3a6470beae2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-      - database
-      - console
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index b41a947169a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml
deleted file mode 100644
index d5166735ec1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-fusion.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-fusion503-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box
-    hypervisor : fusion
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index 4c8be42d033..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml
deleted file mode 100644
index 19181c123d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/debian-70rc1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-70rc1-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-70rc1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 624b53716b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml
deleted file mode 100644
index 554c37a505c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/sles-11sp1-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11sp1-x64:
-    roles:
-      - master
-    platform: sles-11-x86_64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5047017e623..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index 7e789c8d8df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-64
-    box: puppetlabs/ubuntu-14.04-64-nocm
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb
deleted file mode 100644
index c0f93ad21f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/params_spec.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "param based tests:" do
-  # Takes a hash and converts it into a firewall resource
-  def pp(params)
-    name = params.delete('name') || '100 test'
-    pm = <<-EOS
-firewall { '#{name}':
-    EOS
-
-    params.each do |k,v|
-      pm += <<-EOS
-  #{k} => #{v},
-      EOS
-    end
-
-    pm += <<-EOS
-}
-    EOS
-    pm
-  end
-
-  it 'test various params', :unless => (default['platform'].match(/el-5/) || fact('operatingsystem') == 'SLES') do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'table' => "'raw'",
-      'socket' => 'true',
-      'chain' => "'PREROUTING'",
-      'jump' => 'LOG',
-      'log_level' => 'debug',
-    })
-
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test log rule' do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'name' => '998 log all',
-      'proto' => 'all',
-      'jump' => 'LOG',
-      'log_level' => 'debug',
-    })
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test log rule - changing names' do
-    iptables_flush_all_tables
-
-    ppm1 = pp({
-      'name' => '004 log all INVALID packets',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-      'ctstate' => 'INVALID',
-      'jump' => 'LOG',
-      'log_level' => '3',
-      'log_prefix' => '"IPTABLES dropped invalid: "',
-    })
-
-    ppm2 = pp({
-      'name' => '003 log all INVALID packets',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-      'ctstate' => 'INVALID',
-      'jump' => 'LOG',
-      'log_level' => '3',
-      'log_prefix' => '"IPTABLES dropped invalid: "',
-    })
-
-    expect(apply_manifest(ppm1, :catch_failures => true).exit_code).to eq(2)
-
-    ppm = <<-EOS + "\n" + ppm2
-      resources { 'firewall':
-        purge => true,
-      }
-    EOS
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-  end
-
-  it 'test chain - changing names' do
-    iptables_flush_all_tables
-
-    ppm1 = pp({
-      'name'  => '004 with a chain',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-    })
-
-    ppm2 = pp({
-      'name'  => '004 with a chain',
-      'chain' => 'OUTPUT',
-      'proto' => 'all',
-    })
-
-    apply_manifest(ppm1, :expect_changes => true)
-
-    ppm = <<-EOS + "\n" + ppm2
-      resources { 'firewall':
-        purge => true,
-      }
-    EOS
-    expect(apply_manifest(ppm2, :expect_failures => true).stderr).to match(/is not supported/)
-  end
-
-  it 'test log rule - idempotent' do
-    iptables_flush_all_tables
-
-    ppm1 = pp({
-      'name' => '004 log all INVALID packets',
-      'chain' => 'INPUT',
-      'proto' => 'all',
-      'ctstate' => 'INVALID',
-      'jump' => 'LOG',
-      'log_level' => '3',
-      'log_prefix' => '"IPTABLES dropped invalid: "',
-    })
-
-    expect(apply_manifest(ppm1, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm1, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test src_range rule' do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'name'      => '997 block src ip range',
-      'chain'     => 'INPUT',
-      'proto'     => 'all',
-      'action'    => 'drop',
-      'src_range' => '"10.0.0.1-10.0.0.10"',
-    })
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'test dst_range rule' do
-    iptables_flush_all_tables
-
-    ppm = pp({
-      'name'      => '998 block dst ip range',
-      'chain'     => 'INPUT',
-      'proto'     => 'all',
-      'action'    => 'drop',
-      'dst_range' => '"10.0.0.2-10.0.0.20"',
-    })
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to eq(2)
-    expect(apply_manifest(ppm, :catch_failures => true).exit_code).to be_zero
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb
deleted file mode 100644
index f62b14f936e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/purge_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "purge tests:" do
-  context('resources purge') do
-    before(:all) do
-      iptables_flush_all_tables
-
-      shell('iptables -A INPUT -s 1.2.1.2')
-      shell('iptables -A INPUT -s 1.2.1.2')
-    end
-
-    it 'make sure duplicate existing rules get purged' do
-
-      pp = <<-EOS
-        class { 'firewall': }
-        resources { 'firewall':
-          purge => true,
-        }
-      EOS
-
-      apply_manifest(pp, :expect_changes => true)
-    end
-
-    it 'saves' do
-      shell('iptables-save') do |r|
-        expect(r.stdout).to_not match(/1\.2\.1\.2/)
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-
-  context('chain purge') do
-    before(:each) do
-      iptables_flush_all_tables
-
-      shell('iptables -A INPUT -p tcp -s 1.2.1.1')
-      shell('iptables -A INPUT -p udp -s 1.2.1.1')
-      shell('iptables -A OUTPUT -s 1.2.1.2 -m comment --comment "010 output-1.2.1.2"')
-    end
-
-    it 'purges only the specified chain' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'INPUT:filter:IPv4':
-          purge => true,
-        }
-      EOS
-
-      apply_manifest(pp, :expect_changes => true)
-
-      shell('iptables-save') do |r|
-        expect(r.stdout).to match(/010 output-1\.2\.1\.2/)
-        expect(r.stdout).to_not match(/1\.2\.1\.1/)
-        expect(r.stderr).to eq("")
-      end
-    end
-
-    it 'ignores managed rules' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'OUTPUT:filter:IPv4':
-          purge => true,
-        }
-        firewall { '010 output-1.2.1.2':
-          chain  => 'OUTPUT',
-          proto  => 'all',
-          source => '1.2.1.2',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'ignores specified rules' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'INPUT:filter:IPv4':
-          purge => true,
-          ignore => [
-            '-s 1\.2\.1\.1',
-          ],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'adds managed rules with ignored rules' do
-      pp = <<-EOS
-        class { 'firewall': }
-        firewallchain { 'INPUT:filter:IPv4':
-          purge => true,
-          ignore => [
-            '-s 1\.2\.1\.1',
-          ],
-        }
-        firewall { '014 input-1.2.1.6':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.6',
-        }
-        -> firewall { '013 input-1.2.1.5':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.5',
-        }
-        -> firewall { '012 input-1.2.1.4':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.4',
-        }
-        -> firewall { '011 input-1.2.1.3':
-          chain  => 'INPUT',
-          proto  => 'all',
-          source => '1.2.1.3',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-
-      expect(shell('iptables-save').stdout).to match(/-A INPUT -s 1\.2\.1\.1(\/32)? -p tcp\s?\n-A INPUT -s 1\.2\.1\.1(\/32)? -p udp/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb
deleted file mode 100644
index c9a852d8264..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/resource_cmd_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'spec_helper_acceptance'
-
-# Here we want to test the the resource commands ability to work with different
-# existing ruleset scenarios. This will give the parsing capabilities of the
-# code a good work out.
-describe 'puppet resource firewall command:' do
-  context 'make sure it returns no errors when executed on a clean machine' do
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, some boxes come with rules, that is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'flush iptables and make sure it returns nothing afterwards' do
-    before(:all) do
-      iptables_flush_all_tables
-    end
-
-    # No rules, means no output thanks. And no errors as well.
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        r.stderr.should be_empty
-        r.stdout.should == "\n"
-      end
-    end
-  end
-
-  context 'accepts rules without comments' do
-    before(:all) do
-      iptables_flush_all_tables
-      shell('iptables -A INPUT -j ACCEPT -p tcp --dport 80')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'accepts rules with invalid comments' do
-    before(:all) do
-      iptables_flush_all_tables
-      shell('iptables -A INPUT -j ACCEPT -p tcp --dport 80 -m comment --comment "http"')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'accepts rules with negation' do
-    before :all do
-      iptables_flush_all_tables
-      shell('iptables -t nat -A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -p tcp -j MASQUERADE --to-ports 1024-65535')
-      shell('iptables -t nat -A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -p udp -j MASQUERADE --to-ports 1024-65535')
-      shell('iptables -t nat -A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -j MASQUERADE')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-
-  context 'accepts rules with match extension tcp flag' do
-    before :all do
-      iptables_flush_all_tables
-      shell('iptables -t mangle -A PREROUTING -d 1.2.3.4 -p tcp -m tcp -m multiport --dports 80,443,8140 -j MARK --set-mark 42')
-    end
-
-    it do
-      shell('puppet resource firewall') do |r|
-        r.exit_code.should be_zero
-        # don't check stdout, testing preexisting rules, output is normal
-        r.stderr.should be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb
deleted file mode 100644
index b0e66ae5bc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/rules_spec.rb
+++ /dev/null
@@ -1,252 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'complex ruleset 1' do
-  before :all do
-    iptables_flush_all_tables
-  end
-
-  after :all do
-    shell('iptables -t filter -P INPUT ACCEPT')
-    shell('iptables -t filter -P FORWARD ACCEPT')
-    shell('iptables -t filter -P OUTPUT ACCEPT')
-    shell('iptables -t filter --flush')
-  end
-
-  it 'applies cleanly' do
-    pp = <<-EOS
-      firewall { '090 forward allow local':
-        chain       => 'FORWARD',
-        proto       => 'all',
-        source      => '10.0.0.0/8',
-        destination => '10.0.0.0/8',
-        action      => 'accept',
-      }
-      firewall { '100 forward standard allow tcp':
-        chain       => 'FORWARD',
-        source      => '10.0.0.0/8',
-        destination => '!10.0.0.0/8',
-        proto       => 'tcp',
-        state       => 'NEW',
-        port        => [80,443,21,20,22,53,123,43,873,25,465],
-        action      => 'accept',
-      }
-      firewall { '100 forward standard allow udp':
-        chain       => 'FORWARD',
-        source      => '10.0.0.0/8',
-        destination => '!10.0.0.0/8',
-        proto       => 'udp',
-        port        => [53,123],
-        action      => 'accept',
-      }
-      firewall { '100 forward standard allow icmp':
-        chain       => 'FORWARD',
-        source      => '10.0.0.0/8',
-        destination => '!10.0.0.0/8',
-        proto       => 'icmp',
-        action      => 'accept',
-      }
-
-      firewall { '090 ignore ipsec':
-        table        => 'nat',
-        chain        => 'POSTROUTING',
-        outiface     => 'eth0',
-        ipsec_policy => 'ipsec',
-        ipsec_dir    => 'out',
-        action       => 'accept',
-      }
-      firewall { '093 ignore 10.0.0.0/8':
-        table       => 'nat',
-        chain       => 'POSTROUTING',
-        outiface    => 'eth0',
-        destination => '10.0.0.0/8',
-        action      => 'accept',
-      }
-      firewall { '093 ignore 172.16.0.0/12':
-        table       => 'nat',
-        chain       => 'POSTROUTING',
-        outiface    => 'eth0',
-        destination => '172.16.0.0/12',
-        action      => 'accept',
-      }
-      firewall { '093 ignore 192.168.0.0/16':
-        table       => 'nat',
-        chain       => 'POSTROUTING',
-        outiface    => 'eth0',
-        destination => '192.168.0.0/16',
-        action      => 'accept',
-      }
-      firewall { '100 masq outbound':
-        table    => 'nat',
-        chain    => 'POSTROUTING',
-        outiface => 'eth0',
-        jump     => 'MASQUERADE',
-      }
-      firewall { '101 redirect port 1':
-        table   => 'nat',
-        chain   => 'PREROUTING',
-        iniface => 'eth0',
-        proto   => 'tcp',
-        dport   => '1',
-        toports => '22',
-        jump    => 'REDIRECT',
-      }
-    EOS
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'contains appropriate rules' do
-    shell('iptables-save') do |r|
-      [
-        /INPUT ACCEPT/,
-        /FORWARD ACCEPT/,
-        /OUTPUT ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) -d 10.0.0.0\/(8|255\.0\.0\.0) -m comment --comment \"090 forward allow local\" -j ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) (! -d|-d !) 10.0.0.0\/(8|255\.0\.0\.0) -p icmp -m comment --comment \"100 forward standard allow icmp\" -j ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) (! -d|-d !) 10.0.0.0\/(8|255\.0\.0\.0) -p tcp -m multiport --ports 80,443,21,20,22,53,123,43,873,25,465 -m comment --comment \"100 forward standard allow tcp\" -m state --state NEW -j ACCEPT/,
-        /-A FORWARD -s 10.0.0.0\/(8|255\.0\.0\.0) (! -d|-d !) 10.0.0.0\/(8|255\.0\.0\.0) -p udp -m multiport --ports 53,123 -m comment --comment \"100 forward standard allow udp\" -j ACCEPT/
-      ].each do |line|
-        expect(r.stdout).to match(line)
-      end
-    end
-  end
-end
-
-describe 'complex ruleset 2' do
-  after :all do
-    shell('iptables -t filter -P INPUT ACCEPT')
-    shell('iptables -t filter -P FORWARD ACCEPT')
-    shell('iptables -t filter -P OUTPUT ACCEPT')
-    shell('iptables -t filter --flush')
-    expect(shell('iptables -t filter -X LOCAL_INPUT').stderr).to eq("")
-    expect(shell('iptables -t filter -X LOCAL_INPUT_PRE').stderr).to eq("")
-  end
-
-  it 'applies cleanly' do
-    pp = <<-EOS
-      class { '::firewall': }
-      
-      Firewall {
-        proto => 'all',
-        stage => 'pre',
-      }
-      Firewallchain {
-        stage  => 'pre',
-        purge  => 'true',
-        ignore => [
-          '--comment "[^"]*(?i:ignore)[^"]*"',
-        ],
-      }
-
-      firewall { '010 INPUT allow established and related':
-        proto  => 'all',
-        state  => ['ESTABLISHED', 'RELATED'],
-        action => 'accept',
-        before => Firewallchain['INPUT:filter:IPv4'],
-      }
-      firewall { '012 accept loopback':
-        iniface => 'lo',
-        action  => 'accept',
-        before => Firewallchain['INPUT:filter:IPv4'],
-      }
-      firewall { '020 ssh':
-        proto  => 'tcp',
-        dport  => '22',
-        state  => 'NEW',
-        action => 'accept',
-        before => Firewallchain['INPUT:filter:IPv4'],
-      }
-
-      firewall { '013 icmp echo-request':
-        proto  => 'icmp',
-        icmp   => 'echo-request',
-        action => 'accept',
-        source => '10.0.0.0/8',
-      }
-      firewall { '013 icmp destination-unreachable':
-        proto  => 'icmp',
-        icmp   => 'destination-unreachable',
-        action => 'accept',
-      }
-      firewall { '013 icmp time-exceeded':
-        proto  => 'icmp',
-        icmp   => 'time-exceeded',
-        action => 'accept',
-      }
-      firewall { '999 reject':
-        action => 'reject',
-        reject => 'icmp-host-prohibited',
-      }
-
-
-      firewallchain { 'LOCAL_INPUT_PRE:filter:IPv4': }
-      firewall { '001 LOCAL_INPUT_PRE':
-        jump    => 'LOCAL_INPUT_PRE',
-        require => Firewallchain['LOCAL_INPUT_PRE:filter:IPv4'],
-      }
-      firewallchain { 'LOCAL_INPUT:filter:IPv4': }
-      firewall { '900 LOCAL_INPUT':
-        jump    => 'LOCAL_INPUT',
-        require => Firewallchain['LOCAL_INPUT:filter:IPv4'],
-      }
-      firewallchain { 'INPUT:filter:IPv4':
-        policy => 'drop',
-        ignore => [
-          '-j fail2ban-ssh',
-          '--comment "[^"]*(?i:ignore)[^"]*"',
-        ],
-      }
-
-
-      firewall { '010 allow established and related':
-        chain  => 'FORWARD',
-        proto  => 'all',
-        state  => ['ESTABLISHED','RELATED'],
-        action => 'accept',
-        before => Firewallchain['FORWARD:filter:IPv4'],
-      }
-      firewallchain { 'FORWARD:filter:IPv4':
-        policy => 'drop',
-      }
-
-      firewallchain { 'OUTPUT:filter:IPv4': }
-
-
-      # purge unknown rules from mangle table
-      firewallchain { ['PREROUTING:mangle:IPv4', 'INPUT:mangle:IPv4', 'FORWARD:mangle:IPv4', 'OUTPUT:mangle:IPv4', 'POSTROUTING:mangle:IPv4']: }
-
-      # and the nat table
-      firewallchain { ['PREROUTING:nat:IPv4', 'INPUT:nat:IPv4', 'OUTPUT:nat:IPv4', 'POSTROUTING:nat:IPv4']: }
-    EOS
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-
-  it 'contains appropriate rules' do
-    shell('iptables-save') do |r|
-      [
-        /INPUT DROP/,
-        /FORWARD DROP/,
-        /OUTPUT ACCEPT/,
-        /LOCAL_INPUT/,
-        /LOCAL_INPUT_PRE/,
-        /-A INPUT -m comment --comment \"001 LOCAL_INPUT_PRE\" -j LOCAL_INPUT_PRE/,
-        /-A INPUT -m comment --comment \"010 INPUT allow established and related\" -m state --state RELATED,ESTABLISHED -j ACCEPT/,
-        /-A INPUT -i lo -m comment --comment \"012 accept loopback\" -j ACCEPT/,
-        /-A INPUT -p icmp -m comment --comment \"013 icmp destination-unreachable\" -m icmp --icmp-type 3 -j ACCEPT/,
-        /-A INPUT -s 10.0.0.0\/(8|255\.0\.0\.0) -p icmp -m comment --comment \"013 icmp echo-request\" -m icmp --icmp-type 8 -j ACCEPT/,
-        /-A INPUT -p icmp -m comment --comment \"013 icmp time-exceeded\" -m icmp --icmp-type 11 -j ACCEPT/,
-        /-A INPUT -p tcp -m multiport --dports 22 -m comment --comment \"020 ssh\" -m state --state NEW -j ACCEPT/,
-        /-A INPUT -m comment --comment \"900 LOCAL_INPUT\" -j LOCAL_INPUT/,
-        /-A INPUT -m comment --comment \"999 reject\" -j REJECT --reject-with icmp-host-prohibited/,
-        /-A FORWARD -m comment --comment \"010 allow established and related\" -m state --state RELATED,ESTABLISHED -j ACCEPT/
-      ].each do |line|
-        expect(r.stdout).to match(line)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb
deleted file mode 100644
index c4a05348cf3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/socket_spec.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require 'spec_helper_acceptance'
-
-# RHEL5 does not support -m socket
-describe 'firewall socket property', :unless => (default['platform'] =~ /el-5/ || fact('operatingsystem') == 'SLES') do
-  before :all do
-    iptables_flush_all_tables
-  end
-
-  shared_examples "is idempotent" do |value, line_match|
-    it "changes the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '598 - test':
-            ensure => present,
-            proto  => 'tcp',
-            chain  => 'PREROUTING',
-            table  => 'raw',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save -t raw') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-  shared_examples "doesn't change" do |value, line_match|
-    it "doesn't change the value to #{value}" do
-      pp = <<-EOS
-          class { '::firewall': }
-          firewall { '598 - test':
-            ensure => present,
-            proto  => 'tcp',
-            chain  => 'PREROUTING',
-            table  => 'raw',
-            #{value}
-          }
-      EOS
-
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('iptables-save -t raw') do |r|
-        expect(r.stdout).to match(/#{line_match}/)
-      end
-    end
-  end
-
-  describe 'adding a rule' do
-    context 'when unset' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', '', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-    end
-    context 'when set to true' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like 'is idempotent', 'socket => true,', /-A PREROUTING -p tcp -m socket -m comment --comment "598 - test"/
-    end
-    context 'when set to false' do
-      before :all do
-        iptables_flush_all_tables
-      end
-      it_behaves_like "is idempotent", 'socket => false,', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-    end
-  end
-  describe 'editing a rule' do
-    context 'when unset or false' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -t raw -A PREROUTING -p tcp -m comment --comment "598 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "doesn't change", 'socket => false,', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "is idempotent", 'socket => true,', /-A PREROUTING -p tcp -m socket -m comment --comment "598 - test"/
-      end
-    end
-    context 'when set to true' do
-      before :each do
-        iptables_flush_all_tables
-        shell('iptables -t raw -A PREROUTING -p tcp -m socket -m comment --comment "598 - test"')
-      end
-      context 'and current value is false' do
-        it_behaves_like "is idempotent", 'socket => false,', /-A PREROUTING -p tcp -m comment --comment "598 - test"/
-      end
-      context 'and current value is true' do
-        it_behaves_like "doesn't change", 'socket => true,', /-A PREROUTING -p tcp -m socket -m comment --comment "598 - test"/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb
deleted file mode 100644
index f29278b97f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/acceptance/standard_usage_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper_acceptance'
-
-# Some tests for the standard recommended usage
-describe 'standard usage tests:' do
-  it 'applies twice' do
-    pp = <<-EOS
-      class my_fw::pre {
-        Firewall {
-          require => undef,
-        }
-
-        # Default firewall rules
-        firewall { '000 accept all icmp':
-          proto   => 'icmp',
-          action  => 'accept',
-        }->
-        firewall { '001 accept all to lo interface':
-          proto   => 'all',
-          iniface => 'lo',
-          action  => 'accept',
-        }->
-        firewall { '002 accept related established rules':
-          proto   => 'all',
-          ctstate => ['RELATED', 'ESTABLISHED'],
-          action  => 'accept',
-        }
-      }
-      class my_fw::post {
-        firewall { '999 drop all':
-          proto   => 'all',
-          action  => 'drop',
-          before  => undef,
-        }
-      }
-      resources { "firewall":
-        purge => true
-      }
-      Firewall {
-        before  => Class['my_fw::post'],
-        require => Class['my_fw::pre'],
-      }
-      class { ['my_fw::pre', 'my_fw::post']: }
-      class { 'firewall': }
-      firewall { '500 open up port 22':
-        action => 'accept',
-        proto => 'tcp',
-        dport => 22,
-      }
-    EOS
-
-    # Run it twice and test for idempotency
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb
deleted file mode 100644
index 7c507d78bdf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/ip6tables/conversion_hash.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-# These hashes allow us to iterate across a series of test data
-# creating rspec examples for each parameter to ensure the input :line
-# extrapolates to the desired value for the parameter in question. And
-# vice-versa
-
-# This hash is for testing a line conversion to a hash of parameters
-# which will be used to create a resource.
-ARGS_TO_HASH6 = {
-  'source_destination_ipv6_no_cidr' => {
-    :line => '-A INPUT -s 2001:db8:85a3::8a2e:370:7334 -d 2001:db8:85a3::8a2e:370:7334 -m comment --comment "000 source destination ipv6 no cidr"',
-    :table => 'filter',
-    :provider => 'ip6tables',
-    :params => {
-      :source => '2001:db8:85a3::8a2e:370:7334/128',
-      :destination => '2001:db8:85a3::8a2e:370:7334/128',
-    },
-  },
-  'source_destination_ipv6_netmask' => {
-    :line => '-A INPUT -s 2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -d 2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -m comment --comment "000 source destination ipv6 netmask"',
-    :table => 'filter',
-    :provider => 'ip6tables',
-    :params => {
-      :source => '2001:db8:1234::/48',
-      :destination => '2001:db8:4321::/48',
-    },
-  },
-}
-
-# This hash is for testing converting a hash to an argument line.
-HASH_TO_ARGS6 = {
-  'zero_prefixlen_ipv6' => {
-    :params => {
-      :name => '100 zero prefix length ipv6',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '::/0',
-      :destination => '::/0',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '100 zero prefix length ipv6'],
-  },
-  'source_destination_ipv4_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv4 no cidr',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '1.1.1.1',
-      :destination => '2.2.2.2',
-    },
-    :args => ['-t', :filter, '-s', '1.1.1.1/32', '-d', '2.2.2.2/32', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv4 no cidr'],
-  },
- 'source_destination_ipv6_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv6 no cidr',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '2001:db8:1234::',
-      :destination => '2001:db8:4321::',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/128', '-d', '2001:db8:4321::/128', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 no cidr'],
-  },
- 'source_destination_ipv6_netmask' => {
-    :params => {
-      :name => '000 source destination ipv6 netmask',
-      :table => 'filter',
-      :provider => 'ip6tables',
-      :source => '2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-      :destination => '2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/48', '-d', '2001:db8:4321::/48', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 netmask'],
-  },
-  'frag_ishasmorefrags' => {
-    :params => {
-      :name => "100 has more fragments",
-      :ishasmorefrags => true,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "frag", "--fragid", "0", "--fragmore", "-m", "comment", "--comment", "100 has more fragments"],
-  },
-  'frag_islastfrag' => {
-    :params => {
-      :name => "100 last fragment",
-      :islastfrag => true,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "frag", "--fragid", "0", "--fraglast", "-m", "comment", "--comment", "100 last fragment"],
-  },
-  'frag_isfirstfrags' => {
-    :params => {
-      :name => "100 first fragment",
-      :isfirstfrag => true,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "frag", "--fragid", "0", "--fragfirst", "-m", "comment", "--comment", "100 first fragment"],
-  },
-  'hop_limit' => {
-    :params => {
-      :name => "100 hop limit",
-      :hop_limit => 255,
-      :provider => 'ip6tables',
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment", "100 hop limit", "-m", "hl", "--hl-eq", 255],
-  },
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb
deleted file mode 100644
index 105d27fb6b2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/fixtures/iptables/conversion_hash.rb
+++ /dev/null
@@ -1,934 +0,0 @@
-# These hashes allow us to iterate across a series of test data
-# creating rspec examples for each parameter to ensure the input :line
-# extrapolates to the desired value for the parameter in question. And
-# vice-versa
-
-# This hash is for testing a line conversion to a hash of parameters
-# which will be used to create a resource.
-ARGS_TO_HASH = {
-  'dport_and_sport' => {
-    :line => '-A nova-compute-FORWARD -s 0.0.0.0/32 -d 255.255.255.255/32 -p udp -m udp --sport 68 --dport 67 -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :chain => 'nova-compute-FORWARD',
-      :source => '0.0.0.0/32',
-      :destination => '255.255.255.255/32',
-      :sport => ['68'],
-      :dport => ['67'],
-      :proto => 'udp',
-    },
-  },
-  'long_rule_1' => {
-    :line => '-A INPUT -s 1.1.1.1/32 -d 1.1.1.1/32 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -m comment --comment "000 allow foo" -j ACCEPT',
-    :table => 'filter',
-    :compare_all => true,
-    :params => {
-      :action => "accept",
-      :chain => "INPUT",
-      :destination => "1.1.1.1/32",
-      :dport => ["7061","7062"],
-      :ensure => :present,
-      :line => '-A INPUT -s 1.1.1.1/32 -d 1.1.1.1/32 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -m comment --comment "000 allow foo" -j ACCEPT',
-      :name => "000 allow foo",
-      :proto => "tcp",
-      :provider => "iptables",
-      :source => "1.1.1.1/32",
-      :sport => ["7061","7062"],
-      :table => "filter",
-    },
-  },
-  'action_drop_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo" -j DROP',
-    :table => 'filter',
-    :params => {
-      :jump => nil,
-      :action => "drop",
-    },
-  },
-  'action_reject_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo" -j REJECT',
-    :table => 'filter',
-    :params => {
-      :jump => nil,
-      :action => "reject",
-    },
-  },
-  'action_nil_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :jump => nil,
-      :action => nil,
-    },
-  },
-  'jump_custom_chain_1' => {
-    :line => '-A INPUT -m comment --comment "000 allow foo" -j custom_chain',
-    :table => 'filter',
-    :params => {
-      :jump => "custom_chain",
-      :action => nil,
-    },
-  },
-  'source_destination_ipv4_no_cidr' => {
-    :line => '-A INPUT -s 1.1.1.1 -d 2.2.2.2 -m comment --comment "000 source destination ipv4 no cidr"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.1/32',
-      :destination => '2.2.2.2/32',
-    },
-  },
-  'source_destination_ipv6_no_cidr' => {
-    :line => '-A INPUT -s 2001:db8:85a3::8a2e:370:7334 -d 2001:db8:85a3::8a2e:370:7334 -m comment --comment "000 source destination ipv6 no cidr"',
-    :table => 'filter',
-    :params => {
-      :source => '2001:db8:85a3::8a2e:370:7334/128',
-      :destination => '2001:db8:85a3::8a2e:370:7334/128',
-    },
-  },
-  'source_destination_ipv4_netmask' => {
-    :line => '-A INPUT -s 1.1.1.0/255.255.255.0 -d 2.2.0.0/255.255.0.0 -m comment --comment "000 source destination ipv4 netmask"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.0/24',
-      :destination => '2.2.0.0/16',
-    },
-  },
-  'source_destination_ipv6_netmask' => {
-    :line => '-A INPUT -s 2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -d 2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000 -m comment --comment "000 source destination ipv6 netmask"',
-    :table => 'filter',
-    :params => {
-      :source => '2001:db8:1234::/48',
-      :destination => '2001:db8:4321::/48',
-    },
-  },
-  'source_destination_negate_source' => {
-    :line => '-A INPUT ! -s 1.1.1.1 -d 2.2.2.2 -m comment --comment "000 negated source address"',
-    :table => 'filter',
-    :params => {
-      :source => '! 1.1.1.1/32',
-      :destination => '2.2.2.2/32',
-    },
-  },
-  'source_destination_negate_destination' => {
-    :line => '-A INPUT -s 1.1.1.1 ! -d 2.2.2.2 -m comment --comment "000 negated destination address"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.1/32',
-      :destination => '! 2.2.2.2/32',
-    },
-  },
-  'source_destination_negate_destination_alternative' => {
-    :line => '-A INPUT -s 1.1.1.1 -d ! 2.2.2.2 -m comment --comment "000 negated destination address alternative"',
-    :table => 'filter',
-    :params => {
-      :source => '1.1.1.1/32',
-      :destination => '! 2.2.2.2/32',
-    },
-  },
-  'dport_range_1' => {
-    :line => '-A INPUT -m multiport --dports 1:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :dport => ["1-1024"],
-    },
-  },
-  'dport_range_2' => {
-    :line => '-A INPUT -m multiport --dports 15,512:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :dport => ["15","512-1024"],
-    },
-  },
-  'sport_range_1' => {
-    :line => '-A INPUT -m multiport --sports 1:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :sport => ["1-1024"],
-    },
-  },
-  'sport_range_2' => {
-    :line => '-A INPUT -m multiport --sports 15,512:1024 -m comment --comment "000 allow foo"',
-    :table => 'filter',
-    :params => {
-      :sport => ["15","512-1024"],
-    },
-  },
-  'dst_type_1' => {
-    :line => '-A INPUT -m addrtype --dst-type LOCAL',
-    :table => 'filter',
-    :params => {
-      :dst_type => 'LOCAL',
-    },
-  },
-  'src_type_1' => {
-    :line => '-A INPUT -m addrtype --src-type LOCAL',
-    :table => 'filter',
-    :params => {
-      :src_type => 'LOCAL',
-    },
-  },
-  'dst_range_1' => {
-    :line => '-A INPUT -m iprange --dst-range 10.0.0.2-10.0.0.20',
-    :table => 'filter',
-    :params => {
-      :dst_range => '10.0.0.2-10.0.0.20',
-    },
-  },
-  'src_range_1' => {
-    :line => '-A INPUT -m iprange --src-range 10.0.0.2-10.0.0.20',
-    :table => 'filter',
-    :params => {
-      :src_range => '10.0.0.2-10.0.0.20',
-    },
-  },
-  'tcp_flags_1' => {
-    :line => '-A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK,FIN SYN -m comment --comment "000 initiation"',
-    :table => 'filter',
-    :compare_all => true,
-    :chain => 'INPUT',
-    :proto => 'tcp',
-    :params => {
-      :chain => "INPUT",
-      :ensure => :present,
-      :line => '-A INPUT -p tcp -m tcp --tcp-flags SYN,RST,ACK,FIN SYN -m comment --comment "000 initiation"',
-      :name => "000 initiation",
-      :proto => "tcp",
-      :provider => "iptables",
-      :table => "filter",
-      :tcp_flags => "SYN,RST,ACK,FIN SYN",
-    },
-  },
-  'state_returns_sorted_values' => {
-    :line => '-A INPUT -m state --state INVALID,RELATED,ESTABLISHED',
-    :table => 'filter',
-    :params => {
-      :state => ['ESTABLISHED', 'INVALID', 'RELATED'],
-      :action => nil,
-    },
-  },
-  'ctstate_returns_sorted_values' => {
-    :line => '-A INPUT -m conntrack --ctstate INVALID,RELATED,ESTABLISHED',
-    :table => 'filter',
-    :params => {
-      :ctstate => ['ESTABLISHED', 'INVALID', 'RELATED'],
-      :action => nil,
-    },
-  },
-  'comment_string_character_validation' => {
-    :line => '-A INPUT -s 192.168.0.1/32 -m comment --comment "000 allow from 192.168.0.1, please"',
-    :table => 'filter',
-    :params => {
-      :source => '192.168.0.1/32',
-    },
-  },
-  'log_level_debug' => {
-    :line => '-A INPUT -m comment --comment "956 INPUT log-level" -m state --state NEW -j LOG --log-level 7',
-    :table => 'filter',
-    :params => {
-      :state => ['NEW'],
-      :log_level => '7',
-      :jump => 'LOG'
-    },
-  },
-  'log_level_warn' => {
-    :line => '-A INPUT -m comment --comment "956 INPUT log-level" -m state --state NEW -j LOG',
-    :table => 'filter',
-    :params => {
-      :state => ['NEW'],
-      :log_level => '4',
-      :jump => 'LOG'
-    },
-  },
-  'load_limit_module_and_implicit_burst' => {
-    :line => '-A INPUT -m multiport --dports 123 -m comment --comment "057 INPUT limit NTP" -m limit --limit 15/hour',
-    :table => 'filter',
-    :params => {
-      :dport => ['123'],
-      :limit => '15/hour',
-      :burst => '5'
-    },
-  },
-  'limit_with_explicit_burst' => {
-    :line => '-A INPUT -m multiport --dports 123 -m comment --comment "057 INPUT limit NTP" -m limit --limit 30/hour --limit-burst 10',
-    :table => 'filter',
-    :params => {
-      :dport => ['123'],
-      :limit => '30/hour',
-      :burst => '10'
-    },
-  },
-  'proto_ipencap' => {
-    :line => '-A INPUT -p ipencap -m comment --comment "0100 INPUT accept ipencap"',
-    :table => 'filter',
-    :params => {
-      :proto => 'ipencap',
-    }
-  },
-  'load_uid_owner_filter_module' => {
-    :line => '-A OUTPUT -m owner --uid-owner root -m comment --comment "057 OUTPUT uid root only" -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :uid => 'root',
-      :chain => 'OUTPUT',
-    },
-  },
-  'load_uid_owner_postrouting_module' => {
-    :line => '-t mangle -A POSTROUTING -m owner --uid-owner root -m comment --comment "057 POSTROUTING uid root only" -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :uid => 'root',
-    },
-  },
-  'load_gid_owner_filter_module' => {
-    :line => '-A OUTPUT -m owner --gid-owner root -m comment --comment "057 OUTPUT gid root only" -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :gid => 'root',
-    },
-  },
-  'load_gid_owner_postrouting_module' => {
-    :line => '-t mangle -A POSTROUTING -m owner --gid-owner root -m comment --comment "057 POSTROUTING gid root only" -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :gid => 'root',
-    },
-  },
-  'mark_set-mark' => {
-    :line => '-t mangle -A PREROUTING -j MARK --set-xmark 0x3e8/0xffffffff',
-    :table => 'mangle',
-    :params => {
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x3e8/0xffffffff',
-    }
-  },
-  'iniface_1' => {
-    :line => '-A INPUT -i eth0 -m comment --comment "060 iniface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0',
-    },
-  },
-  'iniface_with_vlans_1' => {
-    :line => '-A INPUT -i eth0.234 -m comment --comment "060 iniface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0.234',
-    },
-  },
-  'iniface_with_plus_1' => {
-    :line => '-A INPUT -i eth+ -m comment --comment "060 iniface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth+',
-    },
-  },
-  'outiface_1' => {
-    :line => '-A OUTPUT -o eth0 -m comment --comment "060 outiface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0',
-    },
-  },
-  'outiface_with_vlans_1' => {
-    :line => '-A OUTPUT -o eth0.234 -m comment --comment "060 outiface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0.234',
-    },
-  },
-  'outiface_with_plus_1' => {
-    :line => '-A OUTPUT -o eth+ -m comment --comment "060 outiface" -j DROP',
-    :table => 'filter',
-    :params => {
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth+',
-    },
-  },
-  'pkttype multicast' => {
-    :line => '-A INPUT -m pkttype --pkt-type multicast -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :action => 'accept',
-      :pkttype => 'multicast',
-    },
-  },
-  'socket_option' => {
-    :line => '-A PREROUTING -m socket -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'PREROUTING',
-      :socket => true,
-    },
-  },
-  'isfragment_option' => {
-    :line => '-A INPUT -f -m comment --comment "010 a-f comment with dashf" -j ACCEPT',
-    :table => 'filter',
-    :params => {
-      :name => '010 a-f comment with dashf',
-      :action => 'accept',
-      :isfragment => true,
-    },
-  },
-  'single_tcp_sport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p tcp -m tcp --sport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "tcp",
-      :sport => ["20443"],
-    },
-  },
-  'single_udp_sport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p udp -m udp --sport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "udp",
-      :sport => ["20443"],
-    },
-  },
-  'single_tcp_dport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p tcp -m tcp --dport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "tcp",
-      :dport => ["20443"],
-    },
-  },
-  'single_udp_dport' => {
-    :line => '-A OUTPUT -s 10.94.100.46/32 -p udp -m udp --dport 20443 -j ACCEPT',
-    :table => 'mangle',
-    :params => {
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :source => "10.94.100.46/32",
-      :proto => "udp",
-      :dport => ["20443"],
-    },
-  },
-  'connlimit_above' => {
-    :line => '-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "061 REJECT connlimit_above 10" -m connlimit --connlimit-above 10 --connlimit-mask 32 -j REJECT --reject-with icmp-port-unreachable',
-    :table => 'filter',
-    :params => {
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :action => 'reject',
-    },
-  },
-  'connlimit_above_with_connlimit_mask' => {
-    :line => '-A INPUT -p tcp -m multiport --dports 22 -m comment --comment "061 REJECT connlimit_above 10 with mask 24" -m connlimit --connlimit-above 10 --connlimit-mask 24 -j REJECT --reject-with icmp-port-unreachable',
-    :table => 'filter',
-    :params => {
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :connlimit_mask => '24',
-      :action => 'reject',
-    },
-  },
-  'connmark' => {
-    :line => '-A INPUT -m comment --comment "062 REJECT connmark" -m connmark --mark 0x1 -j REJECT --reject-with icmp-port-unreachable',
-    :table => 'filter',
-    :params => {
-      :proto => 'all',
-      :connmark => '0x1',
-      :action => 'reject',
-    },
-  },
-}
-
-# This hash is for testing converting a hash to an argument line.
-HASH_TO_ARGS = {
-  'long_rule_1' => {
-    :params => {
-      :action => "accept",
-      :chain => "INPUT",
-      :destination => "1.1.1.1",
-      :dport => ["7061","7062"],
-      :ensure => :present,
-      :name => "000 allow foo",
-      :proto => "tcp",
-      :source => "1.1.1.1",
-      :sport => ["7061","7062"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-s", "1.1.1.1/32", "-d", "1.1.1.1/32", "-p", :tcp, "-m", "multiport", "--sports", "7061,7062", "-m", "multiport", "--dports", "7061,7062", "-m", "comment", "--comment", "000 allow foo", "-j", "ACCEPT"],
-  },
-  'long_rule_2' => {
-    :params => {
-      :chain => "INPUT",
-      :destination => "2.10.13.3/24",
-      :dport => ["7061"],
-      :ensure => :present,
-      :jump => "my_custom_chain",
-      :name => "700 allow bar",
-      :proto => "udp",
-      :source => "1.1.1.1",
-      :sport => ["7061","7062"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-s", "1.1.1.1/32", "-d", "2.10.13.0/24", "-p", :udp, "-m", "multiport", "--sports", "7061,7062", "-m", "multiport", "--dports", "7061", "-m", "comment", "--comment", "700 allow bar", "-j", "my_custom_chain"],
-  },
-  'no_action' => {
-    :params => {
-      :name => "100 no action",
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment",
-      "100 no action"],
-  },
-  'zero_prefixlen_ipv4' => {
-    :params => {
-      :name => '100 zero prefix length ipv4',
-      :table => 'filter',
-      :source => '0.0.0.0/0',
-      :destination => '0.0.0.0/0',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '100 zero prefix length ipv4'],
-  },
-  'zero_prefixlen_ipv6' => {
-    :params => {
-      :name => '100 zero prefix length ipv6',
-      :table => 'filter',
-      :source => '::/0',
-      :destination => '::/0',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '100 zero prefix length ipv6'],
-  },
-  'source_destination_ipv4_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv4 no cidr',
-      :table => 'filter',
-      :source => '1.1.1.1',
-      :destination => '2.2.2.2',
-    },
-    :args => ['-t', :filter, '-s', '1.1.1.1/32', '-d', '2.2.2.2/32', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv4 no cidr'],
-  },
- 'source_destination_ipv6_no_cidr' => {
-    :params => {
-      :name => '000 source destination ipv6 no cidr',
-      :table => 'filter',
-      :source => '2001:db8:1234::',
-      :destination => '2001:db8:4321::',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/128', '-d', '2001:db8:4321::/128', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 no cidr'],
-  },
-  'source_destination_ipv4_netmask' => {
-    :params => {
-      :name => '000 source destination ipv4 netmask',
-      :table => 'filter',
-      :source => '1.1.1.0/255.255.255.0',
-      :destination => '2.2.0.0/255.255.0.0',
-    },
-    :args => ['-t', :filter, '-s', '1.1.1.0/24', '-d', '2.2.0.0/16', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv4 netmask'],
-  },
- 'source_destination_ipv6_netmask' => {
-    :params => {
-      :name => '000 source destination ipv6 netmask',
-      :table => 'filter',
-      :source => '2001:db8:1234::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-      :destination => '2001:db8:4321::/ffff:ffff:ffff:0000:0000:0000:0000:0000',
-    },
-    :args => ['-t', :filter, '-s', '2001:db8:1234::/48', '-d', '2001:db8:4321::/48', '-p', :tcp, '-m', 'comment', '--comment', '000 source destination ipv6 netmask'],
-  },
-  'sport_range_1' => {
-    :params => {
-      :name => "100 sport range",
-      :sport => ["1-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--sports", "1:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'sport_range_2' => {
-    :params => {
-      :name => "100 sport range",
-      :sport => ["15","512-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--sports", "15,512:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'dport_range_1' => {
-    :params => {
-      :name => "100 sport range",
-      :dport => ["1-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "1:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'dport_range_2' => {
-    :params => {
-      :name => "100 sport range",
-      :dport => ["15","512-1024"],
-      :table => "filter",
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "15,512:1024", "-m", "comment", "--comment", "100 sport range"],
-  },
-  'dst_type_1' => {
-    :params => {
-      :name => '000 dst_type',
-      :table => 'filter',
-      :dst_type => 'LOCAL',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'addrtype', '--dst-type', :LOCAL, '-m', 'comment', '--comment', '000 dst_type'],
-  },
-  'src_type_1' => {
-    :params => {
-      :name => '000 src_type',
-      :table => 'filter',
-      :src_type => 'LOCAL',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'addrtype', '--src-type', :LOCAL, '-m', 'comment', '--comment', '000 src_type'],
-  },
-  'dst_range_1' => {
-    :params => {
-      :name => '000 dst_range',
-      :table => 'filter',
-      :dst_range => '10.0.0.1-10.0.0.10',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'iprange', '--dst-range', '10.0.0.1-10.0.0.10', '-m', 'comment', '--comment', '000 dst_range'],
-  },
-  'src_range_1' => {
-    :params => {
-      :name => '000 src_range',
-      :table => 'filter',
-      :dst_range => '10.0.0.1-10.0.0.10',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'iprange', '--dst-range', '10.0.0.1-10.0.0.10', '-m', 'comment', '--comment', '000 src_range'],
-  },
-  'tcp_flags_1' => {
-    :params => {
-      :name => "000 initiation",
-      :tcp_flags => "SYN,RST,ACK,FIN SYN",
-      :table => "filter",
-    },
-
-    :args => ["-t", :filter, "-p", :tcp, "-m", "tcp", "--tcp-flags", "SYN,RST,ACK,FIN", "SYN", "-m", "comment", "--comment", "000 initiation",]
-  },
-  'states_set_from_array' => {
-    :params => {
-      :name => "100 states_set_from_array",
-      :table => "filter",
-      :state => ['ESTABLISHED', 'INVALID']
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment", "100 states_set_from_array",
-      "-m", "state", "--state", "ESTABLISHED,INVALID"],
-  },
-  'ctstates_set_from_array' => {
-    :params => {
-      :name => "100 ctstates_set_from_array",
-      :table => "filter",
-      :ctstate => ['ESTABLISHED', 'INVALID']
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "comment", "--comment", "100 ctstates_set_from_array",
-      "-m", "conntrack", "--ctstate", "ESTABLISHED,INVALID"],
-  },
-  'comment_string_character_validation' => {
-    :params => {
-      :name => "000 allow from 192.168.0.1, please",
-      :table => 'filter',
-      :source => '192.168.0.1'
-    },
-    :args => ['-t', :filter, '-s', '192.168.0.1/32', '-p', :tcp, '-m', 'comment', '--comment', '000 allow from 192.168.0.1, please'],
-  },
-  'port_property' => {
-    :params => {
-      :name => '001 port property',
-      :table => 'filter',
-      :port => '80',
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'multiport', '--ports', '80', '-m', 'comment', '--comment', '001 port property'],
-  },
-  'log_level_debug' => {
-    :params => {
-      :name => '956 INPUT log-level',
-      :table => 'filter',
-      :state => 'NEW',
-      :jump => 'LOG',
-      :log_level => 'debug'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '956 INPUT log-level', '-m', 'state', '--state', 'NEW', '-j', 'LOG', '--log-level', '7'],
-  },
-  'log_level_warn' => {
-    :params => {
-      :name => '956 INPUT log-level',
-      :table => 'filter',
-      :state => 'NEW',
-      :jump => 'LOG',
-      :log_level => 'warn'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'comment', '--comment', '956 INPUT log-level', '-m', 'state', '--state', 'NEW', '-j', 'LOG', '--log-level', '4'],
-  },
-  'load_limit_module_and_implicit_burst' => {
-    :params => {
-      :name => '057 INPUT limit NTP',
-      :table => 'filter',
-      :dport => '123',
-      :limit => '15/hour'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'multiport', '--dports', '123', '-m', 'comment', '--comment', '057 INPUT limit NTP', '-m', 'limit', '--limit', '15/hour'],
-  },
-  'limit_with_explicit_burst' => {
-    :params => {
-      :name => '057 INPUT limit NTP',
-      :table => 'filter',
-      :dport => '123',
-      :limit => '30/hour',
-      :burst => '10'
-    },
-    :args => ['-t', :filter, '-p', :tcp, '-m', 'multiport', '--dports', '123', '-m', 'comment', '--comment', '057 INPUT limit NTP', '-m', 'limit', '--limit', '30/hour', '--limit-burst', '10'],
-  },
-  'proto_ipencap' => {
-    :params => {
-      :name => '0100 INPUT accept ipencap',
-      :table => 'filter',
-      :proto => 'ipencap',
-    },
-    :args => ['-t', :filter, '-p', :ipencap, '-m', 'comment', '--comment', '0100 INPUT accept ipencap'],
-  },
-  'load_uid_owner_filter_module' => {
-    :params => {
-      :name => '057 OUTPUT uid root only',
-      :table => 'filter',
-      :uid => 'root',
-      :action => 'accept',
-      :chain => 'OUTPUT',
-      :proto => 'all',
-    },
-    :args => ['-t', :filter, '-p', :all, '-m', 'owner', '--uid-owner', 'root', '-m', 'comment', '--comment', '057 OUTPUT uid root only', '-j', 'ACCEPT'],
-  },
-  'load_uid_owner_postrouting_module' => {
-    :params => {
-      :name => '057 POSTROUTING uid root only',
-      :table => 'mangle',
-      :uid => 'root',
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :proto => 'all',
-    },
-    :args => ['-t', :mangle, '-p', :all, '-m', 'owner', '--uid-owner', 'root', '-m', 'comment', '--comment', '057 POSTROUTING uid root only', '-j', 'ACCEPT'],
-  },
-  'load_gid_owner_filter_module' => {
-    :params => {
-      :name => '057 OUTPUT gid root only',
-      :table => 'filter',
-      :chain => 'OUTPUT',
-      :gid => 'root',
-      :action => 'accept',
-      :proto => 'all',
-    },
-    :args => ['-t', :filter, '-p', :all, '-m', 'owner', '--gid-owner', 'root', '-m', 'comment', '--comment', '057 OUTPUT gid root only', '-j', 'ACCEPT'],
-  },
-  'load_gid_owner_postrouting_module' => {
-    :params => {
-      :name => '057 POSTROUTING gid root only',
-      :table => 'mangle',
-      :gid => 'root',
-      :action => 'accept',
-      :chain => 'POSTROUTING',
-      :proto => 'all',
-    },
-    :args => ['-t', :mangle, '-p', :all, '-m', 'owner', '--gid-owner', 'root', '-m', 'comment', '--comment', '057 POSTROUTING gid root only', '-j', 'ACCEPT'],
-  },
-  'mark_set-mark_int' => {
-    :params => {
-      :name     => '058 set-mark 1000',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '1000',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 1000', '-j', 'MARK', '--set-xmark', '0x3e8/0xffffffff'],
-  },
-  'mark_set-mark_hex' => {
-    :params => {
-      :name     => '058 set-mark 0x32',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x32',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 0x32', '-j', 'MARK', '--set-xmark', '0x32/0xffffffff'],
-  },
-  'mark_set-mark_hex_with_hex_mask' => {
-    :params => {
-      :name     => '058 set-mark 0x32/0xffffffff',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x32/0xffffffff',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 0x32/0xffffffff', '-j', 'MARK', '--set-xmark', '0x32/0xffffffff'],
-    },
-  'mark_set-mark_hex_with_mask' => {
-    :params => {
-      :name     => '058 set-mark 0x32/4',
-      :table    => 'mangle',
-      :jump     => 'MARK',
-      :chain    => 'PREROUTING',
-      :set_mark => '0x32/4',
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'comment', '--comment', '058 set-mark 0x32/4', '-j', 'MARK', '--set-xmark', '0x32/0x4'],
-    },
-    'iniface_1' => {
-    :params => {
-      :name => '060 iniface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0',
-    },
-    :args => ["-t", :filter, "-i", "eth0", "-p", :tcp, "-m", "comment", "--comment", "060 iniface", "-j", "DROP"],
-  },
-  'iniface_with_vlans_1' => {
-    :params => {
-      :name => '060 iniface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth0.234',
-    },
-    :args => ["-t", :filter, "-i", "eth0.234", "-p", :tcp, "-m", "comment", "--comment", "060 iniface", "-j", "DROP"],
-  },
-  'iniface_with_plus_1' => {
-    :params => {
-      :name => '060 iniface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'INPUT',
-      :iniface => 'eth+',
-    },
-    :args => ["-t", :filter, "-i", "eth+", "-p", :tcp, "-m", "comment", "--comment", "060 iniface", "-j", "DROP"],
-  },
-  'outiface_1' => {
-    :params => {
-      :name => '060 outiface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0',
-    },
-    :args => ["-t", :filter, "-o", "eth0", "-p", :tcp, "-m", "comment", "--comment", "060 outiface", "-j", "DROP"],
-  },
-  'outiface_with_vlans_1' => {
-    :params => {
-      :name => '060 outiface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth0.234',
-    },
-    :args => ["-t", :filter, "-o", "eth0.234", "-p", :tcp, "-m", "comment", "--comment", "060 outiface", "-j", "DROP"],
-  },
-  'outiface_with_plus_1' => {
-    :params => {
-      :name => '060 outiface',
-      :table => 'filter',
-      :action => 'drop',
-      :chain => 'OUTPUT',
-      :outiface => 'eth+',
-    },
-    :args => ["-t", :filter, "-o", "eth+", "-p", :tcp, "-m", "comment", "--comment", "060 outiface", "-j", "DROP"],
-  },
-  'pkttype multicast' => {
-    :params => {
-      :name => '062 pkttype multicast',
-      :table => "filter",
-      :action => 'accept',
-      :chain => 'INPUT',
-      :iniface => 'eth0',
-      :pkttype => 'multicast',
-    },
-    :args => ["-t", :filter, "-i", "eth0", "-p", :tcp, "-m", "pkttype", "--pkt-type", :multicast, "-m", "comment", "--comment", "062 pkttype multicast", "-j", "ACCEPT"],
-  },
-  'socket_option' => {
-    :params => {
-      :name => '050 socket option',
-      :table => 'mangle',
-      :action => 'accept',
-      :chain => 'PREROUTING',
-      :socket => true,
-    },
-    :args => ['-t', :mangle, '-p', :tcp, '-m', 'socket', '-m', 'comment', '--comment', '050 socket option', '-j', 'ACCEPT'],
-  },
-  'isfragment_option' => {
-    :params => {
-      :name => '050 isfragment option',
-      :table => 'filter',
-      :proto => :all,
-      :action => 'accept',
-      :isfragment => true,
-    },
-    :args => ['-t', :filter, '-p', :all, '-f', '-m', 'comment', '--comment', '050 isfragment option', '-j', 'ACCEPT'],
-  },
-  'isfragment_option not changing -f in comment' => {
-    :params => {
-      :name => '050 testcomment-with-fdashf',
-      :table => 'filter',
-      :proto => :all,
-      :action => 'accept',
-    },
-    :args => ['-t', :filter, '-p', :all, '-m', 'comment', '--comment', '050 testcomment-with-fdashf', '-j', 'ACCEPT'],
-  },
-  'connlimit_above' => {
-    :params => {
-      :name => '061 REJECT connlimit_above 10',
-      :table => 'filter',
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :action => 'reject',
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "22", "-m", "comment", "--comment", "061 REJECT connlimit_above 10", "-j", "REJECT", "-m", "connlimit", "--connlimit-above", "10"],
-  },
-  'connlimit_above_with_connlimit_mask' => {
-    :params => {
-      :name => '061 REJECT connlimit_above 10 with mask 24',
-      :table => 'filter',
-      :proto => 'tcp',
-      :dport => ["22"],
-      :connlimit_above => '10',
-      :connlimit_mask => '24',
-      :action => 'reject',
-    },
-    :args => ["-t", :filter, "-p", :tcp, "-m", "multiport", "--dports", "22", "-m", "comment", "--comment", "061 REJECT connlimit_above 10 with mask 24", "-j", "REJECT", "-m", "connlimit", "--connlimit-above", "10", "--connlimit-mask", "24"],
-  },
-  'connmark' => {
-    :params => {
-      :name => '062 REJECT connmark',
-      :table => 'filter',
-      :proto => 'all',
-      :connmark => '0x1',
-      :action => 'reject',
-    },
-    :args => ["-t", :filter, "-p", :all, "-m", "comment", "--comment", "062 REJECT connmark", "-j", "REJECT", "-m", "connmark", "--mark", "0x1"],
-  },
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper.rb
deleted file mode 100644
index dc8bc39cb48..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-# Don't want puppet getting the command line arguments for rake or autotest
-ARGV.clear
-
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec-puppet'
-
-Bundler.require :default, :test
-
-require 'pathname'
-require 'tmpdir'
-
-Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
-  require behaviour.relative_path_from(Pathname.new(dir))
-end
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |config|
-  config.tty = true
-  config.mock_with :rspec do |c|
-    c.syntax = :expect
-  end
-  config.module_path = File.join(fixture_path, 'modules')
-  config.manifest_dir = File.join(fixture_path, 'manifests')
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 13d056fa934..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'beaker-rspec'
-
-def iptables_flush_all_tables
-  ['filter', 'nat', 'mangle', 'raw'].each do |t|
-    expect(shell("iptables -t #{t} -F").stderr).to eq("")
-  end
-end
-
-def ip6tables_flush_all_tables
-  ['filter'].each do |t|
-    expect(shell("ip6tables -t #{t} -F").stderr).to eq("")
-  end
-end
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'firewall')
-    hosts.each do |host|
-      shell('/bin/touch /etc/puppet/hiera.yaml')
-      shell('puppet module install puppetlabs-stdlib --version 3.2.0', { :acceptable_exit_codes => [0,1] })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb
deleted file mode 100644
index 954d9ee10d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux::archlinux', :type => :class do
-  it { should contain_service('iptables').with(
-    :ensure   => 'running',
-    :enable   => 'true'
-  )}
-  it { should contain_service('ip6tables').with(
-    :ensure   => 'running',
-    :enable   => 'true'
-  )}
-
-  context 'ensure => stopped' do
-    let(:params) {{ :ensure => 'stopped' }}
-    it { should contain_service('iptables').with(
-      :ensure   => 'stopped'
-    )}
-    it { should contain_service('ip6tables').with(
-      :ensure   => 'stopped'
-    )}
-  end
-
-  context 'enable => false' do
-    let(:params) {{ :enable => 'false' }}
-    it { should contain_service('iptables').with(
-      :enable   => 'false'
-    )}
-    it { should contain_service('ip6tables').with(
-      :enable   => 'false'
-    )}
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb
deleted file mode 100644
index 98285b642ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_debian_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux::debian', :type => :class do
-  it { should contain_package('iptables-persistent').with(
-    :ensure => 'present'
-  )}
-  it { should contain_service('iptables-persistent').with(
-    :ensure   => nil,
-    :enable   => 'true',
-    :require  => 'Package[iptables-persistent]'
-  )}
-
-  context 'enable => false' do
-    let(:params) {{ :enable => 'false' }}
-    it { should contain_service('iptables-persistent').with(
-      :enable   => 'false'
-    )}
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
deleted file mode 100644
index ea49d2b83b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux::redhat', :type => :class do
-  it { should contain_service('iptables').with(
-    :ensure => 'running',
-    :enable => 'true'
-  )}
-
-  context 'ensure => stopped' do
-    let(:params) {{ :ensure => 'stopped' }}
-    it { should contain_service('iptables').with(
-      :ensure => 'stopped'
-    )}
-  end
-
-  context 'enable => false' do
-    let(:params) {{ :enable => 'false' }}
-    it { should contain_service('iptables').with(
-      :enable => 'false'
-    )}
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb
deleted file mode 100644
index 42056c1b1af..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_linux_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall::linux', :type => :class do
-  let(:facts_default) {{ :kernel => 'Linux' }}
-  it { should contain_package('iptables').with_ensure('present') }
-
-  context 'RedHat like' do
-    %w{RedHat CentOS Fedora}.each do |os|
-      context "operatingsystem => #{os}" do
-        releases = (os == 'Fedora' ? [14,15,'Rawhide'] : [6,7])
-        releases.each do |osrel|
-          context "operatingsystemrelease => #{osrel}" do
-            let(:facts) { facts_default.merge({ :operatingsystem => os,
-                                                :operatingsystemrelease => osrel}) }
-            it { should contain_class('firewall::linux::redhat').with_require('Package[iptables]') }
-          end
-        end
-      end
-    end
-  end
-
-  context 'Debian like' do
-    %w{Debian Ubuntu}.each do |os|
-      context "operatingsystem => #{os}" do
-        let(:facts) { facts_default.merge({ :operatingsystem => os }) }
-        it { should contain_class('firewall::linux::debian').with_require('Package[iptables]') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb
deleted file mode 100644
index efc153ab2e4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/classes/firewall_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe 'firewall', :type => :class do
-  context 'kernel => Linux' do
-    let(:facts) {{ :kernel => 'Linux' }}
-    it { should contain_class('firewall::linux').with_ensure('running') }
-  end
-
-  context 'kernel => Windows' do
-    let(:facts) {{ :kernel => 'Windows' }}
-    it { expect { should contain_class('firewall::linux') }.to raise_error(Puppet::Error) }
-  end
-
-  context 'ensure => stopped' do
-    let(:facts) {{ :kernel => 'Linux' }}
-    let(:params) {{ :ensure => 'stopped' }}
-    it { should contain_class('firewall::linux').with_ensure('stopped') }
-  end
-
-  context 'ensure => test' do
-    let(:facts) {{ :kernel => 'Linux' }}
-    let(:params) {{ :ensure => 'test' }}
-    it { expect { should contain_class('firewall::linux') }.to raise_error(Puppet::Error) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb
deleted file mode 100644
index 13a23a5c299..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_persistent_version_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe "Facter::Util::Fact iptables_persistent_version" do
-  before { Facter.clear }
-  let(:dpkg_cmd) { "dpkg-query -Wf '${Version}' iptables-persistent 2>/dev/null" }
-
-  {
-    "Debian" => "0.0.20090701",
-    "Ubuntu" => "0.5.3ubuntu2",
-  }.each do |os, ver|
-    describe "#{os} package installed" do
-      before {
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return(os)
-        allow(Facter::Util::Resolution).to receive(:exec).with(dpkg_cmd).
-          and_return(ver)
-      }
-      it { Facter.fact(:iptables_persistent_version).value.should == ver }
-    end
-  end
-
-  describe 'Ubuntu package not installed' do
-    before {
-      allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
-      allow(Facter::Util::Resolution).to receive(:exec).with(dpkg_cmd).
-        and_return(nil)
-    }
-    it { Facter.fact(:iptables_persistent_version).value.should be_nil }
-  end
-
-  describe 'CentOS not supported' do
-    before { allow(Facter.fact(:operatingsystem)).to receive(:value).
-               and_return("CentOS") }
-    it { Facter.fact(:iptables_persistent_version).value.should be_nil }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb
deleted file mode 100644
index 5773fdce569..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/facter/iptables_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe "Facter::Util::Fact" do
-  before {
-    Facter.clear
-    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-    allow(Facter.fact(:kernelrelease)).to receive(:value).and_return('2.6')
-  }
-
-  describe 'iptables_version' do
-    it {
-      allow(Facter::Util::Resolution).to receive(:exec).with('iptables --version').
-      and_return('iptables v1.4.7')
-      Facter.fact(:iptables_version).value.should == '1.4.7'
-    }
-  end
-
-  describe 'ip6tables_version' do
-    before { allow(Facter::Util::Resolution).to receive(:exec).
-             with('ip6tables --version').and_return('ip6tables v1.4.7') }
-    it { Facter.fact(:ip6tables_version).value.should == '1.4.7' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb
deleted file mode 100755
index f350c2e3c58..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-if Puppet.version < '3.4.0'
-  require 'puppet/provider/confine/exists'
-else
-  require 'puppet/confine/exists'
-end
-
-describe 'iptables chain provider detection' do
-  if Puppet.version < '3.4.0'
-    let(:exists) {
-      Puppet::Provider::Confine::Exists
-    }
-  else
-    let(:exists) {
-      Puppet::Confine::Exists
-    }
-  end
-
-  before :each do
-    # Reset the default provider
-    Puppet::Type.type(:firewallchain).defaultprovider = nil
-  end
-
-  it "should default to iptables provider if /sbin/(eb|ip|ip6)tables[-save] exists" do
-    # Stub lookup for /sbin/iptables & /sbin/iptables-save
-    allow(exists).to receive(:which).with("ebtables").
-      and_return "/sbin/ebtables"
-    allow(exists).to receive(:which).with("ebtables-save").
-      and_return "/sbin/ebtables-save"
-
-    allow(exists).to receive(:which).with("iptables").
-      and_return "/sbin/iptables"
-    allow(exists).to receive(:which).with("iptables-save").
-      and_return "/sbin/iptables-save"
-
-    allow(exists).to receive(:which).with("ip6tables").
-      and_return "/sbin/ip6tables"
-    allow(exists).to receive(:which).with("ip6tables-save").
-      and_return "/sbin/ip6tables-save"
-
-    # Every other command should return false so we don't pick up any
-    # other providers
-    allow(exists).to receive(:which).with() { |value|
-      value !~ /(eb|ip|ip6)tables(-save)?$/
-    }.and_return false
-
-    # Create a resource instance and make sure the provider is iptables
-    resource = Puppet::Type.type(:firewallchain).new({
-      :name => 'test:filter:IPv4',
-    })
-    expect(resource.provider.class.to_s).to eq("Puppet::Type::Firewallchain::ProviderIptables_chain")
-  end
-end
-
-describe 'iptables chain provider' do
-  let(:provider) { Puppet::Type.type(:firewallchain).provider(:iptables_chain) }
-  let(:resource) {
-    Puppet::Type.type(:firewallchain).new({
-      :name  => ':test:',
-    })
-  }
-
-  before :each do
-    allow(Puppet::Type::Firewallchain).to receive(:defaultprovider).and_return provider
-    allow(provider).to receive(:command).with(:ebtables_save).and_return "/sbin/ebtables-save"
-    allow(provider).to receive(:command).with(:iptables_save).and_return "/sbin/iptables-save"
-    allow(provider).to receive(:command).with(:ip6tables_save).and_return "/sbin/ip6tables-save"
-  end
-
-  it 'should be able to get a list of existing rules' do
-    # Pretend to return nil from iptables
-    allow(provider).to receive(:execute).with(['/sbin/ip6tables-save']).and_return("")
-    allow(provider).to receive(:execute).with(['/sbin/ebtables-save']).and_return("")
-    allow(provider).to receive(:execute).with(['/sbin/iptables-save']).and_return("")
-
-    provider.instances.each do |chain|
-      expect(chain).to be_instance_of(provider)
-      expect(chain.properties[:provider].to_s).to eq(provider.name.to_s)
-    end
-  end
-
-end
-
-describe 'iptables chain resource parsing' do
-  let(:provider) { Puppet::Type.type(:firewallchain).provider(:iptables_chain) }
-
-  before :each do
-    ebtables = ['BROUTE:BROUTING:ethernet',
-                'BROUTE:broute:ethernet',
-                ':INPUT:ethernet',
-                ':FORWARD:ethernet',
-                ':OUTPUT:ethernet',
-                ':filter:ethernet',
-                ':filterdrop:ethernet',
-                ':filterreturn:ethernet',
-                'NAT:PREROUTING:ethernet',
-                'NAT:OUTPUT:ethernet',
-                'NAT:POSTROUTING:ethernet',
-               ]
-    allow(provider).to receive(:execute).with(['/sbin/ebtables-save']).and_return('
-*broute
-:BROUTING ACCEPT
-:broute ACCEPT
-
-*filter
-:INPUT ACCEPT
-:FORWARD ACCEPT
-:OUTPUT ACCEPT
-:filter ACCEPT
-:filterdrop DROP
-:filterreturn RETURN
-
-*nat
-:PREROUTING ACCEPT
-:OUTPUT ACCEPT
-:POSTROUTING ACCEPT
-')
-
-    iptables = [
-     'raw:PREROUTING:IPv4',
-     'raw:OUTPUT:IPv4',
-     'raw:raw:IPv4',
-     'mangle:PREROUTING:IPv4',
-     'mangle:INPUT:IPv4',
-     'mangle:FORWARD:IPv4',
-     'mangle:OUTPUT:IPv4',
-     'mangle:POSTROUTING:IPv4',
-     'mangle:mangle:IPv4',
-     'NAT:PREROUTING:IPv4',
-     'NAT:OUTPUT:IPv4',
-     'NAT:POSTROUTING:IPv4',
-     'NAT:mangle:IPv4',
-     'NAT:mangle:IPv4',
-     'NAT:mangle:IPv4',
-     ':$5()*&%\'"^$): :IPv4',
-    ]
-    allow(provider).to receive(:execute).with(['/sbin/iptables-save']).and_return('
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*raw
-:PREROUTING ACCEPT [12:1780]
-:OUTPUT ACCEPT [19:1159]
-:raw - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*mangle
-:PREROUTING ACCEPT [12:1780]
-:INPUT ACCEPT [12:1780]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [19:1159]
-:POSTROUTING ACCEPT [19:1159]
-:mangle - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*nat
-:PREROUTING ACCEPT [2242:639750]
-:OUTPUT ACCEPT [5176:326206]
-:POSTROUTING ACCEPT [5162:325382]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-# Generated by iptables-save v1.4.9 on Mon Jan  2 01:20:06 2012
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [5673:420879]
-:$5()*&%\'"^$):  - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:20:06 2012
-')
-    ip6tables = [
-      'raw:PREROUTING:IPv6',
-      'raw:OUTPUT:IPv6',
-      'raw:ff:IPv6',
-      'mangle:PREROUTING:IPv6',
-      'mangle:INPUT:IPv6',
-      'mangle:FORWARD:IPv6',
-      'mangle:OUTPUT:IPv6',
-      'mangle:POSTROUTING:IPv6',
-      'mangle:ff:IPv6',
-      ':INPUT:IPv6',
-      ':FORWARD:IPv6',
-      ':OUTPUT:IPv6',
-      ':test:IPv6',
-    ]
-    allow(provider).to receive(:execute).with(['/sbin/ip6tables-save']).and_return('
-# Generated by ip6tables-save v1.4.9 on Mon Jan  2 01:31:39 2012
-*raw
-:PREROUTING ACCEPT [2173:489241]
-:OUTPUT ACCEPT [0:0]
-:ff - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:31:39 2012
-# Generated by ip6tables-save v1.4.9 on Mon Jan  2 01:31:39 2012
-*mangle
-:PREROUTING ACCEPT [2301:518373]
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-:ff - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:31:39 2012
-# Generated by ip6tables-save v1.4.9 on Mon Jan  2 01:31:39 2012
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [20:1292]
-:test - [0:0]
-COMMIT
-# Completed on Mon Jan  2 01:31:39 2012
-')
-    @all = ebtables + iptables + ip6tables
-    # IPv4 and IPv6 names also exist as resources {table}:{chain}:IP and {table}:{chain}:
-    iptables.each { |name| @all += [ name[0..-3], name[0..-5] ] }
-    ip6tables.each { |name| @all += [ name[0..-3], name[0..-5] ] }
-  end
-
-  it 'should have all in parsed resources' do
-    provider.instances.each do |resource|
-      @all.include?(resource.name)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb
deleted file mode 100644
index d6f5b64cfea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/provider/iptables_spec.rb
+++ /dev/null
@@ -1,410 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-if Puppet.version < '3.4.0'
-  require 'puppet/provider/confine/exists'
-else
-  require 'puppet/confine/exists'
-end
-
-describe 'iptables provider detection' do
-  if Puppet.version < '3.4.0'
-    let(:exists) {
-      Puppet::Provider::Confine::Exists
-    }
-  else
-    let(:exists) {
-      Puppet::Confine::Exists
-    }
-  end
-
-  before :each do
-    # Reset the default provider
-    Puppet::Type.type(:firewall).defaultprovider = nil
-  end
-
-  it "should default to iptables provider if /sbin/iptables[-save] exists" do
-    # Stub lookup for /sbin/iptables & /sbin/iptables-save
-    allow(exists).to receive(:which).with("iptables").
-      and_return "/sbin/iptables"
-    allow(exists).to receive(:which).with("iptables-save").
-      and_return "/sbin/iptables-save"
-
-    # Every other command should return false so we don't pick up any
-    # other providers
-    allow(exists).to receive(:which).with() { |value|
-      ! ["iptables","iptables-save"].include?(value)
-    }.and_return false
-
-    # Create a resource instance and make sure the provider is iptables
-    resource = Puppet::Type.type(:firewall).new({
-      :name => '000 test foo',
-    })
-    expect(resource.provider.class.to_s).to eq("Puppet::Type::Firewall::ProviderIptables")
-  end
-end
-
-describe 'iptables provider' do
-  let(:provider) { Puppet::Type.type(:firewall).provider(:iptables) }
-  let(:resource) {
-    Puppet::Type.type(:firewall).new({
-      :name  => '000 test foo',
-      :action  => 'accept',
-    })
-  }
-
-  before :each do
-    allow(Puppet::Type::Firewall).to receive(:defaultprovider).and_return provider
-    allow(provider).to receive(:command).with(:iptables_save).and_return "/sbin/iptables-save"
-
-    # Stub iptables version
-    allow(Facter.fact(:iptables_version)).to receive(:value).and_return("1.4.2")
-
-    allow(Puppet::Util::Execution).to receive(:execute).and_return ""
-    allow(Puppet::Util).to receive(:which).with("iptables-save").
-      and_return "/sbin/iptables-save"
-  end
-
-  it 'should be able to get a list of existing rules' do
-    provider.instances.each do |rule|
-      expect(rule).to be_instance_of(provider)
-      expect(rule.properties[:provider].to_s).to eq(provider.name.to_s)
-    end
-  end
-
-  it 'should ignore lines with fatal errors' do
-    allow(Puppet::Util::Execution).to receive(:execute).with(['/sbin/iptables-save']).
-      and_return("FATAL: Could not load /lib/modules/2.6.18-028stab095.1/modules.dep: No such file or directory")
-
-    expect(provider.instances.length).to be_zero
-  end
-
-  describe '#insert_order' do
-    let(:iptables_save_output) { [
-      '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 100 -m comment --comment "100 test" -j ACCEPT',
-      '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 200 -m comment --comment "200 test" -j ACCEPT',
-      '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 300 -m comment --comment "300 test" -j ACCEPT'
-    ] }
-    let(:resources) do
-      iptables_save_output.each_with_index.collect { |l,index| provider.rule_to_hash(l, 'filter', index) }
-    end
-    let(:providers) do
-      resources.collect { |r| provider.new(r) }
-    end
-    it 'understands offsets for adding rules to the beginning' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '001 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(1) # 1-indexed
-    end
-    it 'understands offsets for editing rules at the beginning' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '100 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(1)
-    end
-    it 'understands offsets for adding rules to the middle' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '101 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(2)
-    end
-    it 'understands offsets for editing rules at the middle' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '200 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(2)
-    end
-    it 'understands offsets for adding rules to the end' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '301 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(4)
-    end
-    it 'understands offsets for editing rules at the end' do
-      resource = Puppet::Type.type(:firewall).new({ :name => '300 test', })
-      allow(resource.provider.class).to receive(:instances).and_return(providers)
-      expect(resource.provider.insert_order).to eq(3)
-    end
-
-    context 'with unname rules between' do
-      let(:iptables_save_output) { [
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 100 -m comment --comment "100 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 150 -m comment --comment "150 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 200 -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 250 -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 300 -m comment --comment "300 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 350 -m comment --comment "350 test" -j ACCEPT',
-      ] }
-      it 'understands offsets for adding rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '001 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(1)
-      end
-      it 'understands offsets for editing rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '100 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(1)
-      end
-      it 'understands offsets for adding rules between managed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '120 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(2)
-      end
-      it 'understands offsets for adding rules between unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '151 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(3)
-      end
-      it 'understands offsets for adding rules after unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '351 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(7)
-      end
-    end
-
-    context 'with unname rules before and after' do
-      let(:iptables_save_output) { [
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 050 -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 090 -j ACCEPT',
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 100 -m comment --comment "100 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.2/32 -p tcp -m multiport --ports 150 -m comment --comment "150 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 200 -j ACCEPT',
-        '-A INPUT -s 8.0.0.3/32 -p tcp -m multiport --ports 250 -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 300 -m comment --comment "300 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.4/32 -p tcp -m multiport --ports 350 -m comment --comment "350 test" -j ACCEPT',
-        '-A INPUT -s 8.0.0.5/32 -p tcp -m multiport --ports 400 -j ACCEPT',
-        '-A INPUT -s 8.0.0.5/32 -p tcp -m multiport --ports 450 -j ACCEPT',
-      ] }
-      it 'understands offsets for adding rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '001 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(1)
-      end
-      it 'understands offsets for editing rules before unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '100 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(3)
-      end
-      it 'understands offsets for adding rules between managed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '120 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(4)
-      end
-      it 'understands offsets for adding rules between unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '151 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(5)
-      end
-      it 'understands offsets for adding rules after unnamed rules' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '351 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(9)
-      end
-      it 'understands offsets for adding rules at the end' do
-        resource = Puppet::Type.type(:firewall).new({ :name => '950 test', })
-        allow(resource.provider.class).to receive(:instances).and_return(providers)
-        expect(resource.provider.insert_order).to eq(11)
-      end
-    end
-  end
-
-  # Load in ruby hash for test fixtures.
-  load 'spec/fixtures/iptables/conversion_hash.rb'
-
-  describe 'when converting rules to resources' do
-    ARGS_TO_HASH.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { provider.rule_to_hash(data[:line], data[:table], 0) }
-
-        # If this option is enabled, make sure the parameters exactly match
-        if data[:compare_all] then
-          it "the parameter hash keys should be the same as returned by rules_to_hash" do
-            expect(resource.keys).to match_array(data[:params].keys)
-          end
-        end
-
-        # Iterate across each parameter, creating an example for comparison
-        data[:params].each do |param_name, param_value|
-          it "the parameter '#{param_name.to_s}' should match #{param_value.inspect}" do
-            # booleans get cludged to string "true"
-            if param_value == true then
-              expect(resource[param_name]).to be_true
-            else
-              expect(resource[param_name]).to eq(data[:params][param_name])
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when working out general_args' do
-    HASH_TO_ARGS.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { Puppet::Type.type(:firewall).new(data[:params]) }
-        let(:provider) { Puppet::Type.type(:firewall).provider(:iptables) }
-        let(:instance) { provider.new(resource) }
-
-        it 'general_args should be valid' do
-          expect(instance.general_args.flatten).to eq(data[:args])
-        end
-      end
-    end
-  end
-
-  describe 'when converting rules without comments to resources' do
-    let(:sample_rule) {
-      '-A INPUT -s 1.1.1.1 -d 1.1.1.1 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -j ACCEPT'
-    }
-    let(:resource) { provider.rule_to_hash(sample_rule, 'filter', 0) }
-    let(:instance) { provider.new(resource) }
-
-    it 'rule name contains a MD5 sum of the line' do
-      expect(resource[:name]).to eq("9000 #{Digest::MD5.hexdigest(resource[:line])}")
-    end
-
-    it 'parsed the rule arguments correctly' do
-      expect(resource[:chain]).to eq('INPUT')
-      expect(resource[:source]).to eq('1.1.1.1/32')
-      expect(resource[:destination]).to eq('1.1.1.1/32')
-      expect(resource[:proto]).to eq('tcp')
-      expect(resource[:dport]).to eq(['7061', '7062'])
-      expect(resource[:sport]).to eq(['7061', '7062'])
-      expect(resource[:action]).to eq('accept')
-    end
-  end
-
-  describe 'when converting existing rules generates by system-config-firewall-tui to resources' do
-    let(:sample_rule) {
-      # as generated by iptables-save from rules created with system-config-firewall-tui
-      '-A INPUT -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT'
-    }
-    let(:resource) { provider.rule_to_hash(sample_rule, 'filter', 0) }
-    let(:instance) { provider.new(resource) }
-
-    it 'rule name contains a MD5 sum of the line' do
-      expect(resource[:name]).to eq("9000 #{Digest::MD5.hexdigest(resource[:line])}")
-    end
-
-    it 'parse arguments' do
-      expect(resource[:chain]).to eq('INPUT')
-      expect(resource[:proto]).to eq('tcp')
-      expect(resource[:dport]).to eq(['22'])
-      expect(resource[:state]).to eq(['NEW'])
-      expect(resource[:action]).to eq('accept')
-    end
-  end
-
-  describe 'when creating resources' do
-    let(:instance) { provider.new(resource) }
-
-    it 'insert_args should be an array' do
-      expect(instance.insert_args.class).to eq(Array)
-    end
-  end
-
-  describe 'when modifying resources' do
-    let(:instance) { provider.new(resource) }
-
-    it 'update_args should be an array' do
-      expect(instance.update_args.class).to eq(Array)
-    end
-
-    it 'fails when modifying the chain' do
-      expect { instance.chain = "OUTPUT" }.to raise_error(/is not supported/)
-    end
-  end
-
-  describe 'when deleting resources' do
-    let(:sample_rule) {
-      '-A INPUT -s 1.1.1.1 -d 1.1.1.1 -p tcp -m multiport --dports 7061,7062 -m multiport --sports 7061,7062 -j ACCEPT'
-    }
-    let(:resource) { provider.rule_to_hash(sample_rule, 'filter', 0) }
-    let(:instance) { provider.new(resource) }
-
-    it 'resource[:line] looks like the original rule' do
-      resource[:line] == sample_rule
-    end
-
-    it 'delete_args is an array' do
-      expect(instance.delete_args.class).to eq(Array)
-    end
-
-    it 'delete_args is the same as the rule string when joined' do
-      expect(instance.delete_args.join(' ')).to eq(sample_rule.gsub(/\-A/,
-        '-t filter -D'))
-    end
-  end
-end
-
-describe 'ip6tables provider' do
-  let(:provider6) { Puppet::Type.type(:firewall).provider(:ip6tables) }
-  let(:resource) {
-    Puppet::Type.type(:firewall).new({
-      :name  => '000 test foo',
-      :action  => 'accept',
-      :provider => "ip6tables",
-    })
-  }
-
-  before :each do
-    allow(Puppet::Type::Firewall).to receive(:ip6tables).and_return provider6
-    allow(provider6).to receive(:command).with(:ip6tables_save).and_return "/sbin/ip6tables-save"
-
-    # Stub iptables version
-    allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return '1.4.7'
-
-    allow(Puppet::Util::Execution).to receive(:execute).and_return ''
-    allow(Puppet::Util).to receive(:which).with("ip6tables-save").
-      and_return "/sbin/ip6tables-save"
-  end
-
-  it 'should be able to get a list of existing rules' do
-    provider6.instances.each do |rule|
-      rule.should be_instance_of(provider6)
-      rule.properties[:provider6].to_s.should == provider6.name.to_s
-    end
-  end
-
-  it 'should ignore lines with fatal errors' do
-    allow(Puppet::Util::Execution).to receive(:execute).with(['/sbin/ip6tables-save']).
-      and_return("FATAL: Could not load /lib/modules/2.6.18-028stab095.1/modules.dep: No such file or directory")
-    provider6.instances.length.should == 0
-  end
-
-  # Load in ruby hash for test fixtures.
-  load 'spec/fixtures/ip6tables/conversion_hash.rb'
-
-  describe 'when converting rules to resources' do
-    ARGS_TO_HASH6.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { provider6.rule_to_hash(data[:line], data[:table], 0) }
-
-        # If this option is enabled, make sure the parameters exactly match
-        if data[:compare_all] then
-          it "the parameter hash keys should be the same as returned by rules_to_hash" do
-            resource.keys.should =~ data[:params].keys
-          end
-        end
-
-        # Iterate across each parameter, creating an example for comparison
-        data[:params].each do |param_name, param_value|
-          it "the parameter '#{param_name.to_s}' should match #{param_value.inspect}" do
-            resource[param_name].should == data[:params][param_name]
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when working out general_args' do
-    HASH_TO_ARGS6.each do |test_name,data|
-      describe "for test data '#{test_name}'" do
-        let(:resource) { Puppet::Type.type(:firewall).new(data[:params]) }
-        let(:provider6) { Puppet::Type.type(:firewall).provider(:ip6tables) }
-        let(:instance) { provider6.new(resource) }
-
-        it 'general_args should be valid' do
-          instance.general_args.flatten.should == data[:args]
-        end
-      end
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb
deleted file mode 100755
index afb61662b60..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewall_spec.rb
+++ /dev/null
@@ -1,650 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-firewall = Puppet::Type.type(:firewall)
-
-describe firewall do
-  before :each do
-    @class = firewall
-    @provider = double 'provider'
-    allow(@provider).to receive(:name).and_return(:iptables)
-    allow(Puppet::Type::Firewall).to receive(:defaultprovider).and_return @provider
-
-    @resource = @class.new({:name  => '000 test foo'})
-
-    # Stub iptables version
-    allow(Facter.fact(:iptables_version)).to receive(:value).and_return('1.4.2')
-    allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return('1.4.2')
-
-    # Stub confine facts
-    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-    allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Debian')
-  end
-
-  it 'should have :name be its namevar' do
-    @class.key_attributes.should == [:name]
-  end
-
-  describe ':name' do
-    it 'should accept a name' do
-      @resource[:name] = '000-test-foo'
-      @resource[:name].should == '000-test-foo'
-    end
-
-    it 'should not accept a name with non-ASCII chars' do
-      lambda { @resource[:name] = '%*#^(#$' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':action' do
-    it "should have no default" do
-      res = @class.new(:name => "000 test")
-      res.parameters[:action].should == nil
-    end
-
-    [:accept, :drop, :reject].each do |action|
-      it "should accept value #{action}" do
-        @resource[:action] = action
-        @resource[:action].should == action
-      end
-    end
-
-    it 'should fail when value is not recognized' do
-      lambda { @resource[:action] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':chain' do
-    [:INPUT, :FORWARD, :OUTPUT, :PREROUTING, :POSTROUTING].each do |chain|
-      it "should accept chain value #{chain}" do
-        @resource[:chain] = chain
-        @resource[:chain].should == chain
-      end
-    end
-
-    it 'should fail when the chain value is not recognized' do
-      lambda { @resource[:chain] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':table' do
-    [:nat, :mangle, :filter, :raw].each do |table|
-      it "should accept table value #{table}" do
-        @resource[:table] = table
-        @resource[:table].should == table
-      end
-    end
-
-    it "should fail when table value is not recognized" do
-      lambda { @resource[:table] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':proto' do
-    [:tcp, :udp, :icmp, :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :all].each do |proto|
-      it "should accept proto value #{proto}" do
-        @resource[:proto] = proto
-        @resource[:proto].should == proto
-      end
-    end
-
-    it "should fail when proto value is not recognized" do
-      lambda { @resource[:proto] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':jump' do
-    it "should have no default" do
-      res = @class.new(:name => "000 test")
-      res.parameters[:jump].should == nil
-    end
-
-    ['QUEUE', 'RETURN', 'DNAT', 'SNAT', 'LOG', 'MASQUERADE', 'REDIRECT', 'MARK'].each do |jump|
-      it "should accept jump value #{jump}" do
-        @resource[:jump] = jump
-        @resource[:jump].should == jump
-      end
-    end
-
-    ['ACCEPT', 'DROP', 'REJECT'].each do |jump|
-      it "should now fail when value #{jump}" do
-        lambda { @resource[:jump] = jump }.should raise_error(Puppet::Error)
-      end
-    end
-
-    it "should fail when jump value is not recognized" do
-      lambda { @resource[:jump] = '%^&*' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  [:source, :destination].each do |addr|
-    describe addr do
-      it "should accept a #{addr} as a string" do
-        @resource[addr] = '127.0.0.1'
-        @resource[addr].should == '127.0.0.1/32'
-      end
-      ['0.0.0.0/0', '::/0'].each do |prefix|
-        it "should be nil for zero prefix length address #{prefix}" do
-          @resource[addr] = prefix
-          @resource[addr].should == nil
-        end
-      end
-      it "should accept a negated #{addr} as a string" do
-        @resource[addr] = '! 127.0.0.1'
-        @resource[addr].should == '! 127.0.0.1/32'
-      end
-    end
-  end
-
-  [:dport, :sport].each do |port|
-    describe port do
-      it "should accept a #{port} as string" do
-        @resource[port] = '22'
-        @resource[port].should == ['22']
-      end
-
-      it "should accept a #{port} as an array" do
-        @resource[port] = ['22','23']
-        @resource[port].should == ['22','23']
-      end
-
-      it "should accept a #{port} as a number" do
-        @resource[port] = 22
-        @resource[port].should == ['22']
-      end
-
-      it "should accept a #{port} as a hyphen separated range" do
-        @resource[port] = ['22-1000']
-        @resource[port].should == ['22-1000']
-      end
-
-      it "should accept a #{port} as a combination of arrays of single and " \
-        "hyphen separated ranges" do
-
-        @resource[port] = ['22-1000','33','3000-4000']
-        @resource[port].should == ['22-1000','33','3000-4000']
-      end
-
-      it "should convert a port name for #{port} to its number" do
-        @resource[port] = 'ssh'
-        @resource[port].should == ['22']
-      end
-
-      it "should not accept something invalid for #{port}" do
-        expect { @resource[port] = 'something odd' }.to raise_error(Puppet::Error, /^Parameter .+ failed.+Munging failed for value ".+" in class .+: no such service/)
-      end
-
-      it "should not accept something invalid in an array for #{port}" do
-        expect { @resource[port] = ['something odd','something even odder'] }.to raise_error(Puppet::Error, /^Parameter .+ failed.+Munging failed for value ".+" in class .+: no such service/)
-      end
-    end
-  end
-
-  [:dst_type, :src_type].each do |addrtype|
-    describe addrtype do
-      it "should have no default" do
-        res = @class.new(:name => "000 test")
-        res.parameters[addrtype].should == nil
-      end
-    end
-
-    [:UNSPEC, :UNICAST, :LOCAL, :BROADCAST, :ANYCAST, :MULTICAST, :BLACKHOLE,
-     :UNREACHABLE, :PROHIBIT, :THROW, :NAT, :XRESOLVE].each do |type|
-      it "should accept #{addrtype} value #{type}" do
-        @resource[addrtype] = type
-        @resource[addrtype].should == type
-      end
-    end
-
-    it "should fail when #{addrtype} value is not recognized" do
-      lambda { @resource[addrtype] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  [:iniface, :outiface].each do |iface|
-    describe iface do
-      it "should accept #{iface} value as a string" do
-        @resource[iface] = 'eth1'
-        @resource[iface].should == 'eth1'
-      end
-    end
-  end
-
-  [:tosource, :todest].each do |addr|
-    describe addr do
-      it "should accept #{addr} value as a string" do
-        @resource[addr] = '127.0.0.1'
-      end
-    end
-  end
-
-  describe ':log_level' do
-    values = {
-      'panic' => '0',
-      'alert' => '1',
-      'crit'  => '2',
-      'err'   => '3',
-      'warn'  => '4',
-      'warning' => '4',
-      'not'  => '5',
-      'notice' => '5',
-      'info' => '6',
-      'debug' => '7'
-    }
-
-    values.each do |k,v|
-      it {
-        @resource[:log_level] = k
-        @resource[:log_level].should == v
-      }
-
-      it {
-        @resource[:log_level] = 3
-        @resource[:log_level].should == 3
-      }
-
-      it { lambda { @resource[:log_level] = 'foo' }.should raise_error(Puppet::Error) }
-    end
-  end
-
-  describe ':icmp' do
-    icmp_codes = {
-      :iptables => {
-        '0' => 'echo-reply',
-        '3' => 'destination-unreachable',
-        '4' => 'source-quench',
-        '6' => 'redirect',
-        '8' => 'echo-request',
-        '9' => 'router-advertisement',
-        '10' => 'router-solicitation',
-        '11' => 'time-exceeded',
-        '12' => 'parameter-problem',
-        '13' => 'timestamp-request',
-        '14' => 'timestamp-reply',
-        '17' => 'address-mask-request',
-        '18' => 'address-mask-reply'
-      },
-      :ip6tables => {
-        '1' => 'destination-unreachable',
-        '3' => 'time-exceeded',
-        '4' => 'parameter-problem',
-        '128' => 'echo-request',
-        '129' => 'echo-reply',
-        '133' => 'router-solicitation',
-        '134' => 'router-advertisement',
-        '137' => 'redirect'
-      }
-    }
-    icmp_codes.each do |provider, values|
-      describe provider do
-        values.each do |k,v|
-          it 'should convert icmp string to number' do
-            @resource[:provider] = provider
-            @resource[:provider].should == provider
-            @resource[:icmp] = v
-            @resource[:icmp].should == k
-          end
-        end
-      end
-    end
-
-    it 'should accept values as integers' do
-      @resource[:icmp] = 9
-      @resource[:icmp].should == 9
-    end
-
-    it 'should fail if icmp type is "any"' do
-      lambda { @resource[:icmp] = 'any' }.should raise_error(Puppet::Error)
-    end
-
-    it 'should fail if icmp type cannot be mapped to a numeric' do
-      lambda { @resource[:icmp] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':state' do
-    it 'should accept value as a string' do
-      @resource[:state] = :INVALID
-      @resource[:state].should == [:INVALID]
-    end
-
-    it 'should accept value as an array' do
-      @resource[:state] = [:INVALID, :NEW]
-      @resource[:state].should == [:INVALID, :NEW]
-    end
-
-    it 'should sort values alphabetically' do
-      @resource[:state] = [:NEW, :ESTABLISHED]
-      @resource[:state].should == [:ESTABLISHED, :NEW]
-    end
-  end
-
-  describe ':ctstate' do
-    it 'should accept value as a string' do
-      @resource[:ctstate] = :INVALID
-      @resource[:ctstate].should == [:INVALID]
-    end
-
-    it 'should accept value as an array' do
-      @resource[:ctstate] = [:INVALID, :NEW]
-      @resource[:ctstate].should == [:INVALID, :NEW]
-    end
-
-    it 'should sort values alphabetically' do
-      @resource[:ctstate] = [:NEW, :ESTABLISHED]
-      @resource[:ctstate].should == [:ESTABLISHED, :NEW]
-    end
-  end
-
-  describe ':burst' do
-    it 'should accept numeric values' do
-      @resource[:burst] = 12
-      @resource[:burst].should == 12
-    end
-
-    it 'should fail if value is not numeric' do
-      lambda { @resource[:burst] = 'foo' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe ':recent' do
-    ['set', 'update', 'rcheck', 'remove'].each do |recent|
-      it "should accept recent value #{recent}" do
-        @resource[:recent] = recent
-        @resource[:recent].should == "--#{recent}"
-      end
-    end
-  end
-
-  describe ':action and :jump' do
-    it 'should allow only 1 to be set at a time' do
-      expect {
-        @class.new(
-          :name => "001-test",
-          :action => "accept",
-          :jump => "custom_chain"
-        )
-      }.to raise_error(Puppet::Error, /Only one of the parameters 'action' and 'jump' can be set$/)
-    end
-  end
-  describe ':gid and :uid' do
-    it 'should allow me to set uid' do
-      @resource[:uid] = 'root'
-      @resource[:uid].should == 'root'
-    end
-    it 'should allow me to set uid as an array, and silently hide my error' do
-      @resource[:uid] = ['root', 'bobby']
-      @resource[:uid].should == 'root'
-    end
-    it 'should allow me to set gid' do
-      @resource[:gid] = 'root'
-      @resource[:gid].should == 'root'
-    end
-    it 'should allow me to set gid as an array, and silently hide my error' do
-      @resource[:gid] = ['root', 'bobby']
-      @resource[:gid].should == 'root'
-    end
-  end
-
-  describe ':set_mark' do
-    ['1.3.2', '1.4.2'].each do |iptables_version|
-      describe "with iptables #{iptables_version}" do
-        before {
-          Facter.clear
-          allow(Facter.fact(:iptables_version)).to receive(:value).and_return iptables_version
-          allow(Facter.fact(:ip6tables_version)).to receive(:value).and_return iptables_version
-        }
-
-        if iptables_version == '1.3.2'
-          it 'should allow me to set set-mark without mask' do
-            @resource[:set_mark] = '0x3e8'
-            @resource[:set_mark].should == '0x3e8'
-          end
-          it 'should convert int to hex without mask' do
-            @resource[:set_mark] = '1000'
-            @resource[:set_mark].should == '0x3e8'
-          end
-          it 'should fail if mask is present' do
-            lambda { @resource[:set_mark] = '0x3e8/0xffffffff'}.should raise_error(
-              Puppet::Error, /iptables version #{iptables_version} does not support masks on MARK rules$/
-            )
-          end
-        end
-
-        if iptables_version == '1.4.2'
-          it 'should allow me to set set-mark with mask' do
-            @resource[:set_mark] = '0x3e8/0xffffffff'
-            @resource[:set_mark].should == '0x3e8/0xffffffff'
-          end
-          it 'should convert int to hex and add a 32 bit mask' do
-            @resource[:set_mark] = '1000'
-            @resource[:set_mark].should == '0x3e8/0xffffffff'
-          end
-          it 'should add a 32 bit mask' do
-            @resource[:set_mark] = '0x32'
-            @resource[:set_mark].should == '0x32/0xffffffff'
-          end
-          it 'should use the mask provided' do
-            @resource[:set_mark] = '0x32/0x4'
-            @resource[:set_mark].should == '0x32/0x4'
-          end
-          it 'should use the mask provided and convert int to hex' do
-            @resource[:set_mark] = '1000/0x4'
-            @resource[:set_mark].should == '0x3e8/0x4'
-          end
-          it 'should fail if mask value is more than 32 bits' do
-            lambda { @resource[:set_mark] = '1/4294967296'}.should raise_error(
-              Puppet::Error, /MARK mask must be integer or hex between 0 and 0xffffffff$/
-            )
-          end
-          it 'should fail if mask is malformed' do
-            lambda { @resource[:set_mark] = '1000/0xq4'}.should raise_error(
-              Puppet::Error, /MARK mask must be integer or hex between 0 and 0xffffffff$/
-            )
-          end
-        end
-
-        ['/', '1000/', 'pwnie'].each do |bad_mark|
-          it "should fail with malformed mark '#{bad_mark}'" do
-            lambda { @resource[:set_mark] = bad_mark}.should raise_error(Puppet::Error)
-          end
-        end
-        it 'should fail if mark value is more than 32 bits' do
-          lambda { @resource[:set_mark] = '4294967296'}.should raise_error(
-            Puppet::Error, /MARK value must be integer or hex between 0 and 0xffffffff$/
-          )
-        end
-      end
-    end
-  end
-
-  [:chain, :jump].each do |param|
-    describe param do
-      it 'should autorequire fwchain when table and provider are undefined' do
-        @resource[param] = 'FOO'
-        @resource[:table].should == :filter
-        @resource[:provider].should == :iptables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:filter:IPv4')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it 'should autorequire fwchain when table is undefined and provider is ip6tables' do
-        @resource[param] = 'FOO'
-        @resource[:table].should == :filter
-        @resource[:provider] = :ip6tables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:filter:IPv6')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it 'should autorequire fwchain when table is raw and provider is undefined' do
-        @resource[param] = 'FOO'
-        @resource[:table] = :raw
-        @resource[:provider].should == :iptables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:raw:IPv4')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it 'should autorequire fwchain when table is raw and provider is ip6tables' do
-        @resource[param] = 'FOO'
-        @resource[:table] = :raw
-        @resource[:provider] = :ip6tables
-
-        chain = Puppet::Type.type(:firewallchain).new(:name => 'FOO:raw:IPv6')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource chain
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == chain.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      # test where autorequire is still needed (table != filter)
-      ['INPUT', 'OUTPUT', 'FORWARD'].each do |test_chain|
-        it "should autorequire fwchain #{test_chain} when table is mangle and provider is undefined" do
-          @resource[param] = test_chain
-          @resource[:table] = :mangle
-          @resource[:provider].should == :iptables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:mangle:IPv4")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.source.ref.should == chain.ref
-          rel.target.ref.should == @resource.ref
-        end
-
-        it "should autorequire fwchain #{test_chain} when table is mangle and provider is ip6tables" do
-          @resource[param] = test_chain
-          @resource[:table] = :mangle
-          @resource[:provider] = :ip6tables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:mangle:IPv6")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.source.ref.should == chain.ref
-          rel.target.ref.should == @resource.ref
-        end
-      end
-
-      # test of case where autorequire should not happen
-      ['INPUT', 'OUTPUT', 'FORWARD'].each do |test_chain|
-
-        it "should not autorequire fwchain #{test_chain} when table and provider are undefined" do
-          @resource[param] = test_chain
-          @resource[:table].should == :filter
-          @resource[:provider].should == :iptables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:filter:IPv4")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.should == nil
-        end
-
-        it "should not autorequire fwchain #{test_chain} when table is undefined and provider is ip6tables" do
-          @resource[param] = test_chain
-          @resource[:table].should == :filter
-          @resource[:provider] = :ip6tables
-
-          chain = Puppet::Type.type(:firewallchain).new(:name => "#{test_chain}:filter:IPv6")
-          catalog = Puppet::Resource::Catalog.new
-          catalog.add_resource @resource
-          catalog.add_resource chain
-          rel = @resource.autorequire[0]
-          rel.should == nil
-        end
-      end
-    end
-  end
-
-  describe ":chain and :jump" do
-    it 'should autorequire independent fwchains' do
-      @resource[:chain] = 'FOO'
-      @resource[:jump] = 'BAR'
-      @resource[:table].should == :filter
-      @resource[:provider].should == :iptables
-
-      chain_foo = Puppet::Type.type(:firewallchain).new(:name => 'FOO:filter:IPv4')
-      chain_bar = Puppet::Type.type(:firewallchain).new(:name => 'BAR:filter:IPv4')
-      catalog = Puppet::Resource::Catalog.new
-      catalog.add_resource @resource
-      catalog.add_resource chain_foo
-      catalog.add_resource chain_bar
-      rel = @resource.autorequire
-      rel[0].source.ref.should == chain_foo.ref
-      rel[0].target.ref.should == @resource.ref
-      rel[1].source.ref.should == chain_bar.ref
-      rel[1].target.ref.should == @resource.ref
-    end
-  end
-
-  describe ':pkttype' do
-    [:multicast, :broadcast, :unicast].each do |pkttype|
-      it "should accept pkttype value #{pkttype}" do
-        @resource[:pkttype] = pkttype
-        @resource[:pkttype].should == pkttype
-      end
-    end
-
-    it 'should fail when the pkttype value is not recognized' do
-      lambda { @resource[:pkttype] = 'not valid' }.should raise_error(Puppet::Error)
-    end
-  end
-
-  describe 'autorequire packages' do
-    [:iptables, :ip6tables].each do |provider|
-      it "provider #{provider} should autorequire package iptables" do
-        @resource[:provider] = provider
-        @resource[:provider].should == provider
-        package = Puppet::Type.type(:package).new(:name => 'iptables')
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        catalog.add_resource package
-        rel = @resource.autorequire[0]
-        rel.source.ref.should == package.ref
-        rel.target.ref.should == @resource.ref
-      end
-
-      it "provider #{provider} should autorequire packages iptables and iptables-persistent" do
-        @resource[:provider] = provider
-        @resource[:provider].should == provider
-        packages = [
-          Puppet::Type.type(:package).new(:name => 'iptables'),
-          Puppet::Type.type(:package).new(:name => 'iptables-persistent')
-        ]
-        catalog = Puppet::Resource::Catalog.new
-        catalog.add_resource @resource
-        packages.each do |package|
-          catalog.add_resource package
-        end
-        packages.zip(@resource.autorequire) do |package, rel|
-          rel.source.ref.should == package.ref
-          rel.target.ref.should == @resource.ref
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb
deleted file mode 100755
index 88ca99dc598..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-firewallchain = Puppet::Type.type(:firewallchain)
-
-describe firewallchain do
-  before(:each) do
-    # Stub confine facts
-    allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
-    allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Debian')
-  end
-  let(:klass) { firewallchain }
-  let(:provider) {
-    prov = double 'provider'
-    allow(prov).to receive(:name).and_return(:iptables_chain)
-    prov
-  }
-  let(:resource) {
-    allow(Puppet::Type::Firewallchain).to receive(:defaultprovider).and_return provider
-    klass.new({:name => 'INPUT:filter:IPv4', :policy => :accept })
-  }
-
-  it 'should have :name be its namevar' do
-    klass.key_attributes.should == [:name]
-  end
-
-  describe ':name' do
-    {'nat' => ['PREROUTING', 'POSTROUTING', 'INPUT', 'OUTPUT'],
-     'mangle' => [ 'PREROUTING', 'POSTROUTING', 'INPUT', 'FORWARD', 'OUTPUT' ],
-     'filter' => ['INPUT','OUTPUT','FORWARD'],
-     'raw' => [ 'PREROUTING', 'OUTPUT'],
-     'broute' => ['BROUTING']
-    }.each_pair do |table, allowedinternalchains|
-      ['IPv4', 'IPv6', 'ethernet'].each do |protocol|
-        [ 'test', '$5()*&%\'"^$09):' ].each do |chainname|
-          name = "#{chainname}:#{table}:#{protocol}"
-          if table == 'nat' && protocol == 'IPv6'
-            it "should fail #{name}" do
-              expect { resource[:name] = name }.to raise_error(Puppet::Error)
-            end
-          elsif protocol != 'ethernet' && table == 'broute'
-            it "should fail #{name}" do
-              expect { resource[:name] = name }.to raise_error(Puppet::Error)
-            end
-          else
-            it "should accept name #{name}" do
-              resource[:name] = name
-              resource[:name].should == name
-            end
-          end
-        end # chainname
-      end # protocol
-
-      [ 'PREROUTING', 'POSTROUTING', 'BROUTING', 'INPUT', 'FORWARD', 'OUTPUT' ].each do |internalchain|
-        name = internalchain + ':' + table + ':'
-        if internalchain == 'BROUTING'
-          name += 'ethernet'
-        elsif table == 'nat'
-          name += 'IPv4'
-        else
-          name += 'IPv4'
-        end
-        if allowedinternalchains.include? internalchain
-          it "should allow #{name}" do
-            resource[:name] = name
-            resource[:name].should == name
-          end
-        else
-          it "should fail #{name}" do
-            expect { resource[:name] = name }.to raise_error(Puppet::Error)
-          end
-        end
-      end # internalchain
-
-    end # table, allowedinternalchainnames
-
-    it 'should fail with invalid table names' do
-      expect { resource[:name] = 'wrongtablename:test:IPv4' }.to raise_error(Puppet::Error)
-    end
-
-    it 'should fail with invalid protocols names' do
-      expect { resource[:name] = 'test:filter:IPv5' }.to raise_error(Puppet::Error)
-    end
-
-  end
-
-  describe ':policy' do
-
-    [:accept, :drop, :queue, :return].each do |policy|
-      it "should accept policy #{policy}" do
-        resource[:policy] = policy
-        resource[:policy].should == policy
-      end
-    end
-
-    it 'should fail when value is not recognized' do
-      expect { resource[:policy] = 'not valid' }.to raise_error(Puppet::Error)
-    end
-
-    [:accept, :drop, :queue, :return].each do |policy|
-      it "non-inbuilt chains should not accept policy #{policy}" do
-        expect { klass.new({:name => 'testchain:filter:IPv4', :policy => policy }) }.to raise_error(Puppet::Error)
-      end
-      it "non-inbuilt chains can accept policies on protocol = ethernet (policy #{policy})" do
-        klass.new({:name => 'testchain:filter:ethernet', :policy => policy })
-      end
-    end
-
-  end
-
-  describe 'autorequire packages' do
-    it "provider iptables_chain should autorequire package iptables" do
-      resource[:provider].should == :iptables_chain
-      package = Puppet::Type.type(:package).new(:name => 'iptables')
-      catalog = Puppet::Resource::Catalog.new
-      catalog.add_resource resource
-      catalog.add_resource package
-      rel = resource.autorequire[0]
-      rel.source.ref.should == package.ref
-      rel.target.ref.should == resource.ref
-    end
-
-    it "provider iptables_chain should autorequire packages iptables and iptables-persistent" do
-      resource[:provider].should == :iptables_chain
-      packages = [
-        Puppet::Type.type(:package).new(:name => 'iptables'),
-        Puppet::Type.type(:package).new(:name => 'iptables-persistent')
-      ]
-      catalog = Puppet::Resource::Catalog.new
-      catalog.add_resource resource
-      packages.each do |package|
-        catalog.add_resource package
-      end
-      packages.zip(resource.autorequire) do |package, rel|
-        rel.source.ref.should == package.ref
-        rel.target.ref.should == resource.ref
-      end
-    end
-  end
-
-  describe 'purge iptables rules' do
-    before(:each) do
-      allow(Puppet::Type.type(:firewall).provider(:iptables)).to receive(:iptables_save).and_return(<<EOS
-# Completed on Sun Jan  5 19:30:21 2014
-# Generated by iptables-save v1.4.12 on Sun Jan  5 19:30:21 2014
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
-:LOCAL_FORWARD - [0:0]
-:LOCAL_FORWARD_PRE - [0:0]
-:LOCAL_INPUT - [0:0]
-:LOCAL_INPUT_PRE - [0:0]
-:fail2ban-ssh - [0:0]
--A INPUT -p tcp -m multiport --dports 22 -j fail2ban-ssh
--A INPUT -i lo -m comment --comment "012 accept loopback" -j ACCEPT
--A INPUT -p tcp -m multiport --dports 22 -m comment --comment "020 ssh" -j ACCEPT
--A OUTPUT -d 1.2.1.2 -j DROP
--A fail2ban-ssh -j RETURN
-COMMIT
-# Completed on Sun Jan  5 19:30:21 2014
-EOS
-)
-    end
-
-    it 'should generate iptables resources' do
-      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4', :purge => true)
-
-      expect(resource.generate.size).to eq(3)
-    end
-
-    it 'should not generate ignored iptables rules' do
-      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4', :purge => true, :ignore => ['-j fail2ban-ssh'])
-
-      expect(resource.generate.size).to eq(2)
-    end
-
-    it 'should not generate iptables resources when not enabled' do
-      resource = Puppet::Type::Firewallchain.new(:name => 'INPUT:filter:IPv4')
-
-      expect(resource.generate.size).to eq(0)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb
deleted file mode 100644
index e5864879c32..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/firewall_spec.rb
+++ /dev/null
@@ -1,197 +0,0 @@
-require 'spec_helper'
-
-describe 'Puppet::Util::Firewall' do
-  let(:resource) {
-    type = Puppet::Type.type(:firewall)
-    provider = double 'provider'
-    allow(provider).to receive(:name).and_return(:iptables)
-    allow(Puppet::Type::Firewall).to receive(:defaultprovider).and_return(provider)
-    type.new({:name => '000 test foo'})
-  }
-
-  before(:each) { resource }
-
-  describe '#host_to_ip' do
-    subject { resource }
-    specify {
-      expect(Resolv).to receive(:getaddress).with('puppetlabs.com').and_return('96.126.112.51')
-      subject.host_to_ip('puppetlabs.com').should == '96.126.112.51/32'
-    }
-    specify { subject.host_to_ip('96.126.112.51').should == '96.126.112.51/32' }
-    specify { subject.host_to_ip('96.126.112.51/32').should == '96.126.112.51/32' }
-    specify { subject.host_to_ip('2001:db8:85a3:0:0:8a2e:370:7334').should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.host_to_ip('2001:db8:1234::/48').should == '2001:db8:1234::/48' }
-    specify { subject.host_to_ip('0.0.0.0/0').should == nil }
-    specify { subject.host_to_ip('::/0').should == nil }
-  end
-
-  describe '#host_to_mask' do
-    subject { resource }
-    specify {
-      expect(Resolv).to receive(:getaddress).at_least(:once).with('puppetlabs.com').and_return('96.126.112.51')
-      subject.host_to_mask('puppetlabs.com').should == '96.126.112.51/32'
-      subject.host_to_mask('!puppetlabs.com').should == '! 96.126.112.51/32'
-    }
-    specify { subject.host_to_mask('96.126.112.51').should == '96.126.112.51/32' }
-    specify { subject.host_to_mask('!96.126.112.51').should == '! 96.126.112.51/32' }
-    specify { subject.host_to_mask('96.126.112.51/32').should == '96.126.112.51/32' }
-    specify { subject.host_to_mask('! 96.126.112.51/32').should == '! 96.126.112.51/32' }
-    specify { subject.host_to_mask('2001:db8:85a3:0:0:8a2e:370:7334').should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.host_to_mask('!2001:db8:85a3:0:0:8a2e:370:7334').should == '! 2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.host_to_mask('2001:db8:1234::/48').should == '2001:db8:1234::/48' }
-    specify { subject.host_to_mask('! 2001:db8:1234::/48').should == '! 2001:db8:1234::/48' }
-    specify { subject.host_to_mask('0.0.0.0/0').should == nil }
-    specify { subject.host_to_mask('!0.0.0.0/0').should == nil }
-    specify { subject.host_to_mask('::/0').should == nil }
-    specify { subject.host_to_mask('! ::/0').should == nil }
-  end
-
-  describe '#icmp_name_to_number' do
-    describe 'proto unsupported' do
-      subject { resource }
-
-      %w{inet5 inet8 foo}.each do |proto|
-        it "should reject invalid proto #{proto}" do
-          expect { subject.icmp_name_to_number('echo-reply', proto) }.
-            to raise_error(ArgumentError, "unsupported protocol family '#{proto}'")
-        end
-      end
-    end
-
-    describe 'proto IPv4' do
-      proto = 'inet'
-      subject { resource }
-      specify { subject.icmp_name_to_number('echo-reply', proto).should == '0' }
-      specify { subject.icmp_name_to_number('destination-unreachable', proto).should == '3' }
-      specify { subject.icmp_name_to_number('source-quench', proto).should == '4' }
-      specify { subject.icmp_name_to_number('redirect', proto).should == '6' }
-      specify { subject.icmp_name_to_number('echo-request', proto).should == '8' }
-      specify { subject.icmp_name_to_number('router-advertisement', proto).should == '9' }
-      specify { subject.icmp_name_to_number('router-solicitation', proto).should == '10' }
-      specify { subject.icmp_name_to_number('time-exceeded', proto).should == '11' }
-      specify { subject.icmp_name_to_number('parameter-problem', proto).should == '12' }
-      specify { subject.icmp_name_to_number('timestamp-request', proto).should == '13' }
-      specify { subject.icmp_name_to_number('timestamp-reply', proto).should == '14' }
-      specify { subject.icmp_name_to_number('address-mask-request', proto).should == '17' }
-      specify { subject.icmp_name_to_number('address-mask-reply', proto).should == '18' }
-    end
-
-    describe 'proto IPv6' do
-      proto = 'inet6'
-      subject { resource }
-      specify { subject.icmp_name_to_number('destination-unreachable', proto).should == '1' }
-      specify { subject.icmp_name_to_number('time-exceeded', proto).should == '3' }
-      specify { subject.icmp_name_to_number('parameter-problem', proto).should == '4' }
-      specify { subject.icmp_name_to_number('echo-request', proto).should == '128' }
-      specify { subject.icmp_name_to_number('echo-reply', proto).should == '129' }
-      specify { subject.icmp_name_to_number('router-solicitation', proto).should == '133' }
-      specify { subject.icmp_name_to_number('router-advertisement', proto).should == '134' }
-      specify { subject.icmp_name_to_number('redirect', proto).should == '137' }
-    end
-  end
-
-  describe '#string_to_port' do
-    subject { resource }
-    specify { subject.string_to_port('80','tcp').should == '80' }
-    specify { subject.string_to_port(80,'tcp').should == '80' }
-    specify { subject.string_to_port('http','tcp').should == '80' }
-    specify { subject.string_to_port('domain','udp').should == '53' }
-  end
-
-  describe '#to_hex32' do
-    subject { resource }
-    specify { subject.to_hex32('0').should == '0x0' }
-    specify { subject.to_hex32('0x32').should == '0x32' }
-    specify { subject.to_hex32('42').should == '0x2a' }
-    specify { subject.to_hex32('4294967295').should == '0xffffffff' }
-    specify { subject.to_hex32('4294967296').should == nil }
-    specify { subject.to_hex32('-1').should == nil }
-    specify { subject.to_hex32('bananas').should == nil }
-  end
-
-  describe '#persist_iptables' do
-    before { Facter.clear }
-    subject { resource }
-
-    describe 'when proto is IPv4' do
-      let(:proto) { 'IPv4' }
-
-      it 'should exec /sbin/service if running RHEL 6 or earlier' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')
-
-        expect(subject).to receive(:execute).with(%w{/sbin/service iptables save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for systemd if running RHEL 7 or greater' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('7')
-
-        expect(subject).to receive(:execute).with(%w{/usr/libexec/iptables/iptables.init save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for systemd if running Fedora 15 or greater' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Fedora')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('15')
-
-        expect(subject).to receive(:execute).with(%w{/usr/libexec/iptables/iptables.init save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for CentOS identified from operatingsystem' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('CentOS')
-        expect(subject).to receive(:execute).with(%w{/sbin/service iptables save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should exec for Archlinux identified from osfamily' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('Archlinux')
-        expect(subject).to receive(:execute).with(['/bin/sh', '-c', '/usr/sbin/iptables-save > /etc/iptables/iptables.rules'])
-        subject.persist_iptables(proto)
-      end
-
-      it 'should raise a warning when exec fails' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('RedHat')
-        allow(Facter.fact(:operatingsystemrelease)).to receive(:value).and_return('6')
-
-        expect(subject).to receive(:execute).with(%w{/sbin/service iptables save}).
-          and_raise(Puppet::ExecutionFailure, 'some error')
-        expect(subject).to receive(:warning).with('Unable to persist firewall rules: some error')
-        subject.persist_iptables(proto)
-      end
-    end
-
-    describe 'when proto is IPv6' do
-      let(:proto) { 'IPv6' }
-
-      it 'should exec for newer Ubuntu' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
-        allow(Facter.fact(:iptables_persistent_version)).to receive(:value).and_return('0.5.3ubuntu2')
-        expect(subject).to receive(:execute).with(%w{/usr/sbin/service iptables-persistent save})
-        subject.persist_iptables(proto)
-      end
-
-      it 'should not exec for older Ubuntu which does not support IPv6' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return(nil)
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Ubuntu')
-        allow(Facter.fact(:iptables_persistent_version)).to receive(:value).and_return('0.0.20090701')
-        expect(subject).to receive(:execute).never
-        subject.persist_iptables(proto)
-      end
-
-      it 'should not exec for Suse which is not supported' do
-        allow(Facter.fact(:osfamily)).to receive(:value).and_return('Suse')
-        expect(subject).to receive(:execute).never
-        subject.persist_iptables(proto)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb
deleted file mode 100644
index 916f74a350a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe 'Puppet::Util::IPCidr' do
-  describe 'ipv4 address' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('96.126.112.51') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '96.126.112.51/32' }
-    specify { subject.prefixlen.should == 32 }
-    specify { subject.netmask.should == '255.255.255.255' }
-  end
-
-  describe 'single ipv4 address with cidr' do
-    before { @ipcidr = Puppet::Util::IPCidr.new('96.126.112.51/32') }
-    subject { @ipcidr }
-    specify { subject.cidr.should == '96.126.112.51/32' }
-    specify { subject.prefixlen.should == 32 }
-    specify { subject.netmask.should == '255.255.255.255' }
-  end
-
-  describe 'ipv4 address range with cidr' do
-    before { @ipcidr = Puppet::Util::IPCidr.new('96.126.112.0/24') }
-    subject { @ipcidr }
-    specify { subject.cidr.should == '96.126.112.0/24' }
-    specify { subject.prefixlen.should == 24 }
-    specify { subject.netmask.should == '255.255.255.0' }
-  end
-
-  describe 'ipv4 open range with cidr' do
-    before { @ipcidr = Puppet::Util::IPCidr.new('0.0.0.0/0') }
-    subject { @ipcidr }
-    specify { subject.cidr.should == '0.0.0.0/0' }
-    specify { subject.prefixlen.should == 0 }
-    specify { subject.netmask.should == '0.0.0.0' }
-  end
-
-  describe 'ipv6 address' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('2001:db8:85a3:0:0:8a2e:370:7334') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.prefixlen.should == 128 }
-    specify { subject.netmask.should == 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
-  end
-
-  describe 'single ipv6 addr with cidr' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('2001:db8:85a3:0:0:8a2e:370:7334/128') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '2001:db8:85a3::8a2e:370:7334/128' }
-    specify { subject.prefixlen.should == 128 }
-    specify { subject.netmask.should == 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' }
-  end
-
-  describe 'ipv6 addr range with cidr' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('2001:db8:1234::/48') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '2001:db8:1234::/48' }
-    specify { subject.prefixlen.should == 48 }
-    specify { subject.netmask.should == 'ffff:ffff:ffff:0000:0000:0000:0000:0000' }
-  end
-
-  describe 'ipv6 open range with cidr' do
-    before { @ipaddr = Puppet::Util::IPCidr.new('::/0') }
-    subject { @ipaddr }
-    specify { subject.cidr.should == '::/0' }
-    specify { subject.prefixlen.should == 0 }
-    specify { subject.netmask.should == '0000:0000:0000:0000:0000:0000:0000:0000' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/.fixtures.yml
deleted file mode 100644
index 2aa9e3d77a7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    vcsrepo: git://github.com/puppetlabs/puppetlabs-vcsrepo.git
-  symlinks:
-    git: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/CHANGELOG
deleted file mode 100644
index 670358b6896..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/CHANGELOG
+++ /dev/null
@@ -1,2 +0,0 @@
-2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1
-* initial commit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/LICENSE
deleted file mode 100644
index 297f85cfa86..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!) The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Modulefile
deleted file mode 100644
index 9403b43a06a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Modulefile
+++ /dev/null
@@ -1,10 +0,0 @@
-name 'puppetlabs-git'
-version '0.0.3'
-source 'git://github.com/puppetlabs/puppetlabs-git.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'module for installing git'
-description 'module for installing git'
-project_page 'https://github.com/puppetlabs/puppetlabs-git/'
-dependency 'puppetlabs/vcsrepo'
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/README.md
deleted file mode 100644
index 49e51f48178..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-#git
-
-####Table of Contents
-
-1. [Overview - What is the [Modulename] module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with [Modulename]](#setup)
-    * [What [Modulename] affects](#what-registry-affects)
-4. [Usage - Configuration options and additional functionality](#usage)
-6. [Limitations - OS compatibility, etc.](#limitations)
-7. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-Simple module that can install git or gitosis
-
-##Module Description
-
-This module installs the git revision control system on a target node. It does not manage a git server or any associated services; it simply ensures a bare minimum set of features (e.g. just a package) to use git.
-
-##Setup
-
-###What git affects
-
-* Package['git']
-
-The specifics managed by the module may vary depending on the platform.
-
-##Usage
-
-###I just want `git` installed
-Simply include the `git` class.
-
-```puppet
-include git
-```
-
-###I want to use `git subtree` with bash completion
-
-```puppet
-include git::subtree
-```
-
-##Reference
-
-###Classes
-
-* `git`: Installs the git client package.
-* `gitosis`: Installs the gitosis package. No configuration
-* `subtree`: Installs and configures git-subtree for git 1.7 and up.
-
-###Facts
-
-* `git_exec_path`: Path to the directory containing all `git-*` commands.
-* `git_version`: Version of git that is installed. Undefined if not installed.
-
-##Limitations
-
-This module is known to work with the following operating system families:
-
- - RedHat 5, 6
- - Debian 6.0.7 or newer
- - Ubuntu 12.04 or newer
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can’t access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/files/subtree/bash_completion.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/files/subtree/bash_completion.sh
deleted file mode 100644
index f2683e44946..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/files/subtree/bash_completion.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!bash
-#
-# bash completion support for Git subtree.
-#
-# To use this routine:
-#
-#    1) Make sure you have installed and configured the core Git completion script, which is required to make this script work;
-#    2) Copy this file to somewhere (e.g. ~/.git-subtree-completion.sh);
-#    3) Added the following line to your .bashrc:
-#        source ~/.git-subtree-completion.sh
-#
-
-_git_subtree ()
-{
-        local cur="${COMP_WORDS[COMP_CWORD]}"
-
-        if [ $COMP_CWORD -eq 2 ]; then
-                __gitcomp "add merge pull push split"
-                return
-        elif [ $COMP_CWORD -eq 3 ]; then
-                __gitcomp "--prefix="
-                return
-        fi
-        __gitcomp "$(__git_remotes)"
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb
deleted file mode 100644
index 23d06e0b0d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_exec_path.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# git_exec_path.rb
-Facter.add('git_exec_path') do
-  setcode 'git --exec-path 2>/dev/null'
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_version.rb
deleted file mode 100644
index 4cb71d2ccee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/lib/facter/git_version.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# git_version
-Facter.add('git_version') do
-  setcode 'git --version 2>/dev/null'.sub(/git version /, '')
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/gitosis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/gitosis.pp
deleted file mode 100644
index 64b7b2df3d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/gitosis.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Class: gitosis
-#
-# This installs and configures gitosis 
-#
-# Requires:
-#  - Class[git]
-#
-class git::gitosis {
-  include ::git
-  package {'gitosis':
-    ensure => present
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/init.pp
deleted file mode 100644
index 7e57fa23cb8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# Class: git
-#
-# This class installs git
-#
-# Actions:
-#   - Install the git package
-#
-# Sample Usage:
-#  class { 'git': }
-#
-class git {
-  if ! defined(Package['git']) {
-    package { 'git':
-      ensure => present
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/subtree.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/subtree.pp
deleted file mode 100644
index 6c47ca8b4de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/manifests/subtree.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# == Class: git::subtree
-#
-# Installs and configure git-subtree
-#
-class git::subtree {
-
-  include ::git
-
-  Package['git'] -> Class['git::subtree']
-
-  if (versioncmp('1.7.0', $::git_version) > 0) {
-    fail 'git-subtree requires git 1.7 or later!'
-  }
-
-  if (versioncmp('1.7.11', $::git_version) > 0) {
-    $source_dir = '/usr/src/git-subtree'
-    vcsrepo { $source_dir:
-      ensure   => present,
-      source   => 'http://github.com/apenwarr/git-subtree.git',
-      provider => 'git',
-      revision => '2793ee6ba',
-    }
-  } else {
-    $source_dir = '/usr/share/doc/git-core/contrib/subtree'
-  }
-
-  exec { "/usr/bin/make prefix=/usr libexecdir=${::git_exec_path}":
-    creates => "${source_dir}/git-subtree",
-    cwd     => $source_dir,
-  }
-  ->
-  exec { "/usr/bin/make prefix=/usr libexecdir=${::git_exec_path} install":
-    creates => "${::git_exec_path}/git-subtree",
-    cwd     => $source_dir,
-  }
-
-  file { '/etc/bash_completion.d/git-subtree':
-    ensure => file,
-    source => 'puppet:///modules/git/subtree/bash_completion.sh',
-    mode   => '0644',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb
deleted file mode 100644
index e7a6e325395..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/classes/git_subtree_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-require 'spec_helper'
-
-describe 'git::subtree' do
-
-  context 'when git version < 1.7.0' do
-    let(:facts) { { :git_version => '1.6.0' } }
-
-    it 'should fail' do
-      expect { should create_class('git::subtree') }.to raise_error(Puppet::Error, /git-subtree requires git 1.7 or later!/)
-    end
-  end
-
-  context 'when git version > 1.7.0 and < 1.7.11' do
-    let(:facts) { {
-      :git_version   => '1.7.0',
-      :git_exec_path => '/usr/lib/git-core',
-    } }
-
-    it { should create_class('git') }
-
-    it { should create_vcsrepo('/usr/src/git-subtree').with({
-      :ensure   => 'present',
-      :source   => 'http://github.com/apenwarr/git-subtree.git',
-      :provider => 'git',
-      :revision => '2793ee6ba',
-    })}
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core').with({
-      :creates => '/usr/src/git-subtree/git-subtree',
-      :cwd     => '/usr/src/git-subtree',
-    })}
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core install').with({
-      :creates => '/usr/lib/git-core/git-subtree',
-      :cwd     => '/usr/src/git-subtree',
-    })}
-
-    it { should create_file('/etc/bash_completion.d/git-subtree').with({
-      :ensure => 'file',
-      :source => 'puppet:///modules/git/subtree/bash_completion.sh',
-      :mode   => '0644',
-    })}
-  end 
-
-  context 'when git version >= 1.7.11' do
-    let(:facts) { {
-      :git_version   => '1.7.11',
-      :git_exec_path => '/usr/lib/git-core',
-    } }
-
-    it { should create_class('git') }
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core').with({
-      :creates => '/usr/share/doc/git-core/contrib/subtree/git-subtree',
-      :cwd     => '/usr/share/doc/git-core/contrib/subtree',
-    })}
-
-    it { should create_exec('/usr/bin/make prefix=/usr libexecdir=/usr/lib/git-core install').with({
-      :creates => '/usr/lib/git-core/git-subtree',
-      :cwd     => '/usr/share/doc/git-core/contrib/subtree',
-    })}
-
-    it { should create_file('/etc/bash_completion.d/git-subtree').with({
-      :ensure => 'file',
-      :source => 'puppet:///modules/git/subtree/bash_completion.sh',
-      :mode   => '0644',
-    })}
-  end 
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/gitosis.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/gitosis.pp
deleted file mode 100644
index e6240ae21f0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/gitosis.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'git::gitosis': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/init.pp
deleted file mode 100644
index c232904713f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/git/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'git': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.fixtures.yml
deleted file mode 100644
index 0d21abb8c40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-  symlinks:
-    mailcatcher: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.travis.yml
deleted file mode 100644
index 08a65c81874..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Gemfile
deleted file mode 100644
index 170516d9813..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-
-gem 'puppet', puppetversion
-
-group :test do
-  gem 'rake', '>= 0.9.0'
-  gem 'rspec', '>= 2.8.0'
-  gem 'rspec-puppet', '>= 0.1.1'
-  gem 'puppetlabs_spec_helper', '>= 0.4.1'
-  gem 'puppet-lint'
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Modulefile
deleted file mode 100644
index 54de3a1024f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name    'actionjack-mailcatcher'
-version '0.1.5'
-source 'https://github.com/actionjack/puppet-mailcatcher'
-author 'actionjack'
-license 'Apache License, Version 2.0'
-summary 'Install and configure the mailcatcher application.'
-description "This puppet module is used to install and configure the mailcatcher
-application.
-MailCatcher runs a super simple SMTP server which catches any message sent to it
-to display in a web interface."
-project_page 'https://github.com/actionjack/puppet-mailcatcher'
-
-dependency 'puppetlabs/stdlib', '>= 2.2.1'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/README.md
deleted file mode 100644
index 12d569a08b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Mailcatcher
-
-[![Build Status](https://travis-ci.org/actionjack/puppet-mailcatcher.png?branch=master)](https://travis-ci.org/actionjack/puppet-mailcatcher)
-
-This puppet module is used to install and configure the mailcatcher application.
-MailCatcher runs a super simple SMTP server which catches any message sent to it to display in a web interface.
-http://mailcatcher.me/
-
-* * *
-
-## Configuration
-
-
-## Dependencies
-
-Current dependencies are:
-
- * 'puppetlabs/stdlib', '>= 2.1.0'
-
-## Usage
-
-
-
-```ruby
-class {'mailcatcher': }
-```
-
-## Documentation
-
-This module is written in puppetdoc compliant format so details on configuration and usage can be found by executing:
-
-```bash
-$ puppet doc manifest/init.pp
-```
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Rakefile
deleted file mode 100644
index e0e78cfbb8a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/config.pp
deleted file mode 100644
index c4a27921e90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/config.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# class mailcatcher::config
-#
-class mailcatcher::config {
-  user { 'mailcatcher':
-    ensure  => present,
-    comment => 'Mailcatcher Mock Smtp Service User',
-    home    => '/var/spool/mailcatcher',
-    shell   => '/bin/true',
-  }
-
-  file { $mailcatcher::params::log_path:
-    ensure  => directory,
-    owner   => 'mailcatcher',
-    group   => 'mailcatcher',
-    mode    => 0755,
-    require => User['mailcatcher']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/init.pp
deleted file mode 100644
index 31c5d3434e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/init.pp
+++ /dev/null
@@ -1,64 +0,0 @@
-# == Class: mailcatcher
-#
-# Install and configure Mailcatcher.
-# MailCatcher runs a super simple SMTP server which catches any message sent to
-# it to display in a web interface.
-# http://mailcatcher.me/
-#
-# === Parameters
-#
-# Document parameters here.
-#
-# [*smtp_ip*]
-#   What IP address the mailcatcher smtp service should listen on.
-#   The default is 127.0.0.1
-#
-# [*smtp_port*]
-#   What TCP Port the mailcatcher smtp service should listen on.
-#   The default is 1025
-#
-# [*http_ip*]
-#   What IP address the mailcatcher web mail client service should listen on.
-#   The default is 0.0.0.0
-#
-# [*http_port*]
-#   What TCP Port the mailcatcher web mail client service should listen on.
-#   The default is 1080
-#
-# [*mailcatcher_path*]
-#   Path to the mailcatcher program.
-#   The default is '/usr/local/bin'
-#
-# === Examples
-#
-# [*default*]
-#
-#  class { mailcatcher:  }
-#
-# [*listen on all ethernet adapters*]
-#
-#  class { mailcatcher:
-#   smtp_ip => '0.0.0.0'
-#  }
-#
-# === Authors
-#
-# Martin Jackson <contact@uncommonsense-uk.com>
-#
-# === Copyright
-#
-# Copyright 2013 Martin Jackson, unless otherwise noted.
-#
-class mailcatcher (
-  $smtp_ip          = $mailcatcher::params::smtp_ip,
-  $smtp_port        = $mailcatcher::params::smtp_port,
-  $http_ip          = $mailcatcher::params::http_ip,
-  $http_port        = $mailcatcher::params::http_port,
-  $mailcatcher_path = $mailcatcher::params::mailcatcher_path,
-  $log_path         = $mailcatcher::params::log_path
-) inherits mailcatcher::params {
-
-  class {'mailcatcher::package': } ->
-  class {'mailcatcher::config': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/package.pp
deleted file mode 100644
index 6d66fb836b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/package.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# class mailcatcher::package
-#
-class mailcatcher::package {
-  each( $mailcatcher::params::packages ) |$package| {
-    if ! defined(Package[$package]) {
-      package { $package:
-        ensure => present
-      }
-    }
-  }
-
-  package { 'mailcatcher':
-    ensure   => present,
-    provider => 'gem',
-    require  => Package[$mailcatcher::params::packages]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/params.pp
deleted file mode 100644
index a21d6b07e5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/manifests/params.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# class mailcatcher::params
-#
-class mailcatcher::params {
-  $smtp_ip          = '0.0.0.0'
-  $smtp_port        = '1025'
-  $http_ip          = '0.0.0.0'
-  $http_port        = '1080'
-  $mailcatcher_path = '/usr/local/bin'
-  $log_path         = '/var/log/mailcatcher'
-
-  case $::osfamily {
-    'Debian': {
-      $packages = ['ruby-dev', 'sqlite3', 'libsqlite3-dev', 'rubygems']
-    }
-    'Redhat': {
-      $packages = ['ruby-devel', 'sqlite', 'sqlite-devel', 'ruby-sqlite3', 'rubygems']
-    }
-    default: {
-      fail("${::osfamily} is not supported.")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb
deleted file mode 100644
index 4ae17bd3b1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/classes/mailcatcher_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe 'mailcatcher', :type => :class do
-  context "As a Web Operations Engineer" do
-    context 'When I install the mailcatcher base class on Ubuntu' do
-      let :facts do {
-          :osfamily        => 'Debian',
-          :operatingsystem => 'Ubuntu'
-      }
-      end
-
-      describe 'by default it' do
-        it { should contain_package('ruby-dev') }
-        it { should contain_package('sqlite3') }
-        it { should contain_package('libsqlite3-dev') }
-        it { should contain_package('rubygems') }
-        it { should contain_package('mailcatcher').with({ 'provider' => 'gem'}) }
-        it { should contain_user('mailcatcher') }
-        it 'should contain a properly formatted start up configuration for upstart' do
-          should contain_file('/etc/init/mailcatcher.conf').with_content(/exec\s+nohup\s+\/usr\/local\/bin\/mailcatcher\s+--http-ip\s+0\.0\.0\.0\s+--http-port\s+1080\s+--smtp-ip\s+0\.0\.0\.0\s+--smtp-port\s+1025\s+-f/)
-        end
-        it { should contain_file('/etc/init/mailcatcher.conf').with({ :notify => 'Class[Mailcatcher::Service]'})}
-        it { should contain_file('/var/log/mailcatcher').with({
-            :ensure  => 'directory',
-            :owner   => 'mailcatcher',
-            :group   => 'mailcatcher',
-            :mode    => '0755',
-            :require => 'User[mailcatcher]'
-        })}
-        it { should contain_service('mailcatcher').with({
-            :ensure     => 'running',
-            :provider   => 'upstart',
-            :hasstatus  => true,
-            :hasrestart => true,
-            :require    => 'Class[Mailcatcher::Config]',
-        })}
-
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb
deleted file mode 100644
index 3d92005247c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb
deleted file mode 100644
index 4cd663ffe59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/templates/etc/init/mailcatcher.conf.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-# mailcatcher - mock smtp server
-#
-# mailCatcher runs a super simple SMTP server which catches any
-# message sent to it to display in a web interface.
-
-description     "mock smtp server"
-
-start on startup
-stop on shutdown
-
-setuid mailcatcher
-setgid mailcatcher
-
-script
- exec nohup <%= @mailcatcher_path %>/mailcatcher<%= @options.join(' ') %> -f  >> /var/log/mailcatcher/mailcatcher.log 2>&1
-end script
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/tests/init.pp
deleted file mode 100644
index adead2832a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mailcatcher/tests/init.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# The baseline for module testing used by Puppet Labs is that each manifest
-# should have a corresponding test manifest that declares that class or defined
-# type.
-#
-# Tests are then run by using puppet apply --noop (to check for compilation
-# errors and view a log of events) or by fully applying the test in a virtual
-# environment (to compare the resulting system state to the desired state).
-#
-# Learn more about module testing here:
-# http://docs.puppetlabs.com/guides/tests_smoke.html
-#
-include mailcatcher
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.fixtures.yml
deleted file mode 100644
index e48e20aaee9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.fixtures.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
-  symlinks:
-    "mongodb": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.travis.yml
deleted file mode 100644
index f6eff1ce965..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-branches:
-  only:
-    - master
-language: ruby
-before_install:
-  - gem update bundler
-  - bundle --version
-  - gem update --system 2.1.11
-  - gem --version
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: "iUYpjvk33JffZB9lVRqjuwRWesvcvmTknh908xnf60rUOA0QbGEPXxQY+LsQJEIimVsMA22fV6vp9BcqMEjO7OfK2MvAWsEWU/lG+kisFqhWDRf96sADE7k/RvPWJeB2xe+lWXK7Eh26jgctNfk4NptX1X1MjGmdzEvH7Aq79/w="
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/CHANGELOG
deleted file mode 100644
index 92a220f481d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/CHANGELOG
+++ /dev/null
@@ -1,74 +0,0 @@
-##2014-05-27 - Release 0.8.0
-
-This feature features a rewritten mongodb_replset{} provider, includes several
-important bugfixes, ruby 1.8 support, and two new features.
-
-####Features
-- Rewritten mongodb_replset{}, featuring puppet resource support, prefetching,
-and flushing.
-- Add Ruby 1.8 compatibility.
-- Adds `syslog`, allowing you to configure mongodb to send all logging to the hosts syslog.
-- Add mongodb::replset, a wrapper class for hiera users.
-- Improved testing!
-
-####Bugfixes
-- Fixes the package names to work since 10gen renamed them again.
-- Fix provider name in the README.
-- Disallow `nojournal` and `journal` to be set at the same time.
-- Changed - to = for versioned install on Ubuntu.
-
-####Known Bugs
-* No known bugs
-
-2014-1-29 - Version 0.7.0
-
-Summary:
-
-Added Replica Set Type and Provider
-
-2014-1-17 - Version 0.6.0
-
-Summary:
-
-Added support for installing MongoDB client on 
-RHEL family systems.
-
-2014-01-10 Version 0.5.0
-
-Summary:
-
-Added types for providers for Mongo users and databases.
-
-2013-12 Version 0.4.0
-
-Major refactoring of the MongoDB module. Includes a new 'mongodb::globals' 
-that consolidates many shared parameters into one location. This is an 
-API-breaking release in anticipation of a 1.0 release.
-
-2013-10-31 - Version 0.3.0
-
-Summary:
-
-Adds a number of parameters and fixes some platform
-specific bugs in module deployment.
-
-2013-09-25 - Version 0.2.0
-
-Summary:
-
-This release fixes a duplicate parameter.
-
-Fixes:
-- Fix a duplicated parameter.
-
-2012-07-13 Puppet Labs <info@puppetlabs.com> - 0.1.0
-* Add support for RHEL/CentOS
-* Change default mongodb install location to OS repo
-
-2012-05-29 Puppet Labs <info@puppetlabs.com> - 0.0.2
-* Fix Modulefile typo.
-* Remove repo pin.
-* Update spec tests and add travis support.
-
-2012-05-03 Puppet Labs <info@puppetlabs.com> - 0.0.1
-* Initial Release.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Gemfile
deleted file mode 100644
index 39abe867d49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Gemfile
+++ /dev/null
@@ -1,19 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-group :test, :development do
-  gem 'rspec-puppet',            :require => false
-  gem 'rake',                    :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-if puppetversion = ENV['PUPPET_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/LICENSE
deleted file mode 100644
index 8961ce8a6d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright (C) 2012 Puppet Labs Inc
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Modulefile
deleted file mode 100644
index e2eb82771a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name 'puppetlabs-mongodb'
-version '0.8.0'
-source 'git@github.com:puppetlabs/puppetlabs-mongodb.git'
-author 'puppetlabs'
-license 'Apache License Version 2.0'
-summary 'mongodb puppet module'
-description '10gen mongodb puppet module'
-project_page 'https://github.com/puppetlabs/puppetlabs-mongodb'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/apt', '>= 1.0.0'
-dependency 'puppetlabs/stdlib', '>= 2.2.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/README.md
deleted file mode 100644
index 2bc16bb3485..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/README.md
+++ /dev/null
@@ -1,515 +0,0 @@
-# mongodb puppet module
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-mongodb.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-mongodb)
-
-####Table of Contents
-
-1. [Overview] (#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with mongodb](#setup)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-6. [Limitations - OS compatibility, etc.] (#limitations)
-7. [Development - Guide for contributing to the module] (#development)
-
-## Overview
-
-Installs MongoDB on RHEL/Ubuntu/Debian from OS repo, or alternatively from
-10gen repository [installation documentation](http://www.mongodb.org/display/DOCS/Ubuntu+and+Debian+packages).
-
-### Deprecation Warning ###
-
-This release is a major refactoring of the module which means that the API may
-have changed in backwards incompatible ways. If your project depends on the old API,
-please pin your dependencies to 0.3 version to ensure your environments don't break.
-
-The current module design is undergoing review for potential 1.0 release. We welcome
-any feedback with regard to the APIs and patterns used in this release.
-
-##Module Description
-
-The MongoDB module manages mongod server installation and configuration of the
-mongod daemon. For the time being it supports only a single MongoDB server
-instance, without sharding functionality.
-
-For the 0.5 release, the MongoDB module now supports database and user types.
-
-For the 0.6 release, the MongoDB module now supports basic replicaset features
-(initiating a replicaset and adding members, but without specific options).
-
-## Setup
-
-###What MongoDB affects
-
-* MongoDB package.
-* MongoDB configuration files.
-* MongoDB service.
-* MongoDB client.
-* 10gen/mongodb apt/yum repository.
-
-###Beginning with MongoDB
-
-If you just want a server installation with the default options you can run
-`include '::mongodb::server'`. If you need to customize configuration
-options you need to do the following:
-
-```puppet
-class {'::mongodb::server':
-  port    => 27018,
-  verbose => true,
-}
-```
-
-For Red Hat family systems, the client can be installed in a similar fashion:
-
-```
-puppet class {'::mongodb::client':}
-```
-
-Note that for Debian/Ubuntu family systems the client is installed with the 
-server. Using the client class will by default install the server.
-
-Although most distros come with a prepacked MongoDB server we recommend to
-use the 10gen/MongoDB software repository, because most of the current OS
-packages are outdated and not appropriate for a production environment.
-To install MongoDB from 10gen repository:
-
-```puppet
-class {'::mongodb::globals':
-  manage_package_repo => true,
-}->
-class {'::mongodb::server': }->
-class {'::mongodb::client': }
-```
-
-## Usage
-
-Most of the interaction for the server is done via `mongodb::server`. For
-more options please have a look at [mongodb::server](#class-mongodbserver).
-Also in this version we introduced `mongodb::globals`, which is meant more
-for future implementation, where you can configure the main settings for
-this module in a global way, to be used by other classes and defined resources.
-On its own it does nothing.
-
-### Create MongoDB database
-
-To install MongoDB server, create database "testdb" and user "user1" with password "pass1".
-
-```puppet
-class {'::mongodb::server':
-  auth => true,
-}
-
-mongodb::db { 'testdb':
-  user          => 'user1',
-  password_hash => 'a15fbfca5e3a758be80ceaf42458bcd8',
-}
-```
-Parameter 'password_hash' is hex encoded md5 hash of "user1:mongo:pass1".
-Unsafe plain text password could be used with 'password' parameter instead of 'password_hash'.
-
-## Reference
-
-### Classes
-
-####Public classes
-* `mongodb::server`: Installs and configure MongoDB
-* `mongodb::client`: Installs the MongoDB client shell (for Red Hat family systems)
-* `mongodb::globals`: Configure main settings in a global way
-
-####Private classes
-* `mongodb::repo`: Manage 10gen/MongoDB software repository
-* `mongodb::repo::apt`: Manage Debian/Ubuntu apt 10gen/MongoDB repository
-* `mongodb::repo::yum`: Manage Redhat/CentOS apt 10gen/MongoDB repository
-* `mongodb::server::config`: Configures MongoDB configuration files
-* `mongodb::server::install`: Install MongoDB software packages
-* `mongodb::server::service`: Manages service
-* `mongodb::client::install`: Installs the MongoDB client software package
-
-####Class: mongodb::globals
-*Note:* most server specific defaults should be overridden in the `mongodb::server`
-class. This class should only be used if you are using a non-standard OS or
-if you are changing elements such as `version` or `manage_package_repo` that
-can only be changed here.
-
-This class allows you to configure the main settings for this module in a
-global way, to be used by the other classes and defined resources. On its
-own it does nothing.
-
-#####`server_package_name`
-This setting can be used to override the default MongoDB server package
-name. If not specified, the module will use whatever package name is the
-default for your OS distro.
-
-#####`service_name`
-This setting can be used to override the default MongoDB service name. If not
-specified, the module will use whatever service name is the default for your OS distro.
-
-#####`service_provider`
-This setting can be used to override the default MongoDB service provider. If
-not specified, the module will use whatever service provider is the default for
-your OS distro.
-
-#####`service_status`
-This setting can be used to override the default status check command for
-your MongoDB service. If not specified, the module will use whatever service
-name is the default for your OS distro.
-
-#####`user`
-This setting can be used to override the default MongoDB user and owner of the
-service and related files in the file system. If not specified, the module will
-use the default for your OS distro.
-
-#####`group`
-This setting can be used to override the default MongoDB user group to be used
-for related files in the file system. If not specified, the module will use
-the default for your OS distro.
-
-#####`bind_ip`
-This setting can be used to configure MonogDB process to bind to and listen
-for connections from applications on this address. If not specified, the
-module will use the default for your OS distro.
-*Note:* This value should be passed as an array.
-
-#####`version`
-The version of MonogDB to install/manage. This is a simple way of providing
-a specific version such as '2.2' or '2.4' for example. If not specified,
-the module will use the default for your OS distro.
-
-####Class: mongodb::server
-
-Most of the parameters manipulate the mongod.conf file.
-
-For more details about configuration parameters consult the
-[MongoDB Configuration File Options](http://docs.mongodb.org/manual/reference/configuration-options/).
-
-#####`ensure`
-Used to ensure that the package is installed and the service is running, or that the package is absent/purged and the service is stopped. Valid values are true/false/present/absent/purged.
-
-#####`config`
-Path of the config file. If not specified, the module will use the default
-for your OS distro.
-
-#####`dbpath`
-Set this value to designate a directory for the mongod instance to store
-it's data. If not specified, the module will use the default for your OS distro.
-
-#####`pidfilepath`
-Specify a file location to hold the PID or process ID of the mongod process.
-If not specified, the module will use the default for your OS distro.
-
-#####`logpath`
-Specify the path to a file name for the log file that will hold all diagnostic
-logging information. Unless specified, mongod will output all log information
-to the standard output.
-
-#####`bind_ip`
-Set this option to configure the mongod or mongos process to bind to and listen
-for connections from applications on this address. If not specified, the module
-will use the default for your OS distro. Example: bind_ip=['127.0.0.1', '192.168.0.3']
-*Note*: bind_ip accepts an array as a value.
-
-#####`logappend`
-Set to true to add new entries to the end of the logfile rather than overwriting
-the content of the log when the process restarts. Default: True
-
-#####`fork`
-Set to true to fork server process at launch time. The default setting depends on
-the operating system.
-
-#####`port`
-Specifies a TCP port for the server instance to listen for client connections.
-Default: 27017
-
-#####`journal`
-Set to true to enable operation journaling to ensure write durability and
-data consistency. Default: on 64-bit systems true and on 32-bit systems false
-
-#####`nojournal`
-Set nojournal = true to disable durability journaling. By default, mongod
-enables journaling in 64-bit versions after v2.0.
-Default: on 64-bit systems  false and on 32-bit systems true
-
-*Note*: You must use journal to enable journaling on 32-bit systems.
-
-#####`smallfiles`
-Set to true to modify MongoDB to use a smaller default data file size.
-Specifically, smallfiles reduces the initial size for data files and
-limits them to 512 megabytes.  Default: false
-
-#####`cpu`
-Set to true to force mongod to report every four seconds CPU utilization
-and the amount of time that the processor waits for I/O operations to
-complete (i.e. I/O wait.) Default: false
-
-#####`auth`
-Set to true to enable database authentication for users connecting from
-remote hosts. If no users exist, the localhost interface will continue
-to have access to the database until you create the first user.
-Default: false
-
-#####`noauth`
-Disable authentication. Currently the default. Exists for future compatibility
- and clarity.
-
-#####`verbose`
-Increases the amount of internal reporting returned on standard output or in
-the log file generated by `logpath`. Default: false
-
-#####`verbositylevel`
-MongoDB has the following levels of verbosity: v, vv, vvv, vvvv and vvvvv.
-Default: None
-
-#####`objcheck`
-Forces the mongod to validate all requests from clients upon receipt to ensure
-that clients never insert invalid documents into the database.
-Default: on v2.4 default to true and on earlier version to false
-
-#####`quota`
-Set to true to enable a maximum limit for the number of data files each database
-can have. The default quota is 8 data files, when quota is true. Default: false
-
-#####`quotafiles`
-Modify limit on the number of data files per database. This option requires the
-`quota` setting. Default: 8
-
-#####`diaglog`
-Creates a very verbose diagnostic log for troubleshooting and recording various
-errors.  Valid values: 0, 1, 2, 3 and 7.
-For more information please refer to [MongoDB Configuration File Options](http://docs.mongodb.org/manual/reference/configuration-options/).
-
-#####`directoryperdb`
-Set to true to modify the storage pattern of the data directory to store each
-database’s files in a distinct folder. Default: false
-
-#####`profile`
-Modify this value to changes the level of database profiling, which inserts
-information about operation performance into output of mongod or the
-log file if specified by `logpath`.
-
-#####`maxconns`
-Specifies a value to set the maximum number of simultaneous connections
-that MongoDB will accept. Default: depends on system (i.e. ulimit and file descriptor)
-limits. Unless set, MongoDB will not limit its own connections.
-
-#####`oplog_size`
-Specifies a maximum size in megabytes for the replication operation log
-(e.g. oplog.) mongod creates an oplog based on the maximum amount of space
-available. For 64-bit systems, the oplog is typically 5% of available disk space.
-
-#####`nohints`
-Ignore query hints. Default: None
-
-#####`nohttpinterface`
-Set to true to disable the HTTP interface. This command will override the rest
-and disable the HTTP interface if you specify both. Default: false
-
-#####`noscripting`
-Set noscripting = true to disable the scripting engine. Default: false
-
-#####`notablescan`
-Set notablescan = true to forbid operations that require a table scan. Default: false
-
-#####`noprealloc`
-Set noprealloc = true to disable the preallocation of data files. This will shorten
-the start up time in some cases, but can cause significant performance penalties
-during normal operations. Default: false
-
-#####`nssize`
-Use this setting to control the default size for all newly created namespace
-files (i.e .ns). Default: 16
-
-#####`mms_token`
-MMS token for mms monitoring. Default: None
-
-#####`mms_name`
-MMS identifier for mms monitoring. Default: None
-
-#####`mms_interval`
-MMS interval for mms monitoring. Default: None
-
-#####`replset`
-Use this setting to configure replication with replica sets. Specify a replica
-set name as an argument to this set. All hosts must have the same set name.
-
-#####`rest`
-Set to true to enable a simple REST interface. Default: false
-
-#####`slowms`
-Sets the threshold for mongod to consider a query “slow” for the database profiler.
-Default: 100 ms
-
-#####`keyfile`
-Specify the path to a key file to store authentication information. This option
-is only useful for the connection between replica set members. Default: None
-
-#####`master`
-Set to true to configure the current instance to act as master instance in a
-replication configuration. Default: False  *Note*: deprecated – use replica sets
-
-#####`set_parameter`
-Specify extra configuration file parameters (i.e.
-textSearchEnabled=true). Default: None
-
-#####`syslog`
-Sends all logging output to the host’s syslog system rather than to standard
-output or a log file. Default: None
-*Important*: You cannot use syslog with logpath.
-
-#####`slave`
-Set to true to configure the current instance to act as slave instance in a
-replication configuration. Default: false
-*Note*: deprecated – use replica sets
-
-#####`only`
-Used with the slave option, only specifies only a single database to
-replicate. Default: <>
-*Note*: deprecated – use replica sets
-
-#####`source`
-Used with the slave setting to specify the master instance from which
-this slave instance will replicate. Default: <>
-*Note*: deprecated – use replica sets
-
-### Definitions
-
-#### Definition: mongodb:db
-
-Creates database with user. Resource title used as database name.
-
-#####`user`
-Name of the user for database
-
-#####`password_hash`
-Hex encoded md5 hash of "$username:mongo:$password".
-For more information please refer to [MongoDB Authentication Process](http://docs.mongodb.org/meta-driver/latest/legacy/implement-authentication-in-driver/#authentication-process).
-
-#####`password`
-Plain-text user password (will be hashed)
-
-#####`roles`
-Array with user roles. Default: ['dbAdmin']
-
-### Providers
-
-#### Provider: mongodb_database
-'mongodb_database' can be used to create and manage databases within MongoDB.
-
-```puppet
-mongodb_database { testdb:
-  ensure   => present,
-  tries    => 10,
-  require  => Class['mongodb::server'],
-}
-```
-#####`tries`
-The maximum amount of two second tries to wait MongoDB startup. Default: 10
-
-
-#### Provider: mongodb_user
-'mongodb_user' can be used to create and manage users within MongoDB database.
-
-```puppet
-mongodb_user { testuser:
-  ensure        => present,
-  password_hash => mongodb_password('testuser', 'p@ssw0rd'),
-  database      => testdb,
-  roles         => ['readWrite', 'dbAdmin'],
-  tries         => 10,
-  require       => Class['mongodb::server'],
-}
-```
-#####`password_hash`
-Hex encoded md5 hash of "$username:mongo:$password".
-
-#####`database`
-Name of database. It will be created, if not exists.
-
-#####`roles`
-Array with user roles. Default: ['dbAdmin']
-
-#####`tries`
-The maximum amount of two second tries to wait MongoDB startup. Default: 10
-
-#### Provider: mongodb_replset
-'mongodb_replset' can be used to create and manage MongoDB replicasets.
-
-```puppet
-mongodb_replset { rsmain:
-  ensure  => present,
-  members => ['host1:27017', 'host2:27017', 'host3:27017']
-}
-```
-
-Ideally the ```mongodb_replset``` resource will be declared on the initial
-desired primary node (arbitrarily the first of the list) and this node will be
-processed once the secondary nodes are up. This will ensure all the nodes are
-in the first configuration of the replicaset, else it will require running
-puppet again to add them.
-
-#####`members`
-Array of 'host:port' of the replicaset members.
-
-It currently only adds members without options.
-
-## Limitation
-
-This module has been tested on:
-
-* Debian 7.* (Wheezy)
-* Debian 6.* (squeeze)
-* Ubuntu 12.04.2 (precise)
-* Ubuntu 10.04.4 LTS (lucid)
-* RHEL 5/6
-* CentOS 5/6
-
-For a full list of tested operating systems please have a look at the [.nodeset.xml](https://github.com/puppetlabs/puppetlabs-mongodb/blob/master/.nodeset.yml) definition.
-
-This module should support `service_ensure` separate from the `ensure` value on `Class[mongodb::server]` but it does not yet.
-
-## Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Testing
-
-There are two types of tests distributed with this module. Unit tests with
-rspec-puppet and system tests using rspec-system.
-
-
-unit tests should be run under Bundler with the gem versions as specified
-in the Gemfile. To install the necessary gems:
-
-    bundle install --path=vendor
-
-Test setup and teardown is handled with rake tasks, so the
-supported way of running tests is with
-
-    bundle exec rake spec
-
-
-For system test you will also need to install vagrant > 1.3.x and virtualbox > 4.2.10.
-To run the system tests
-
-    bundle exec rake spec:system
-
-To run the tests on different operating systems, see the sets available in [.nodeset.xml](https://github.com/puppetlabs/puppetlabs-mongodb/blob/master/.nodeset.yml)
-and run the specific set with the following syntax:
-
-    RSPEC_SET=ubuntu-server-12042-x64 bundle exec rake spec:system
-
-### Authors
-
-We would like to thank everyone who has contributed issues and pull requests to this module.
-A complete list of contributors can be found on the
-[GitHub Contributor Graph](https://github.com/puppetlabs/puppetlabs-mongodb/graphs/contributors)
-for the [puppetlabs-mongodb module](https://github.com/puppetlabs/puppetlabs-mongodb).
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb
deleted file mode 100644
index e61bcb9dae9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/parser/functions/mongodb_password.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'digest/md5'
-
-module Puppet::Parser::Functions
-  newfunction(:mongodb_password, :type => :rvalue, :doc => <<-EOS
-    Returns the mongodb password hash from the clear text password.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, 'mongodb_password(): Wrong number of arguments ' +
-      "given (#{args.size} for 2)") if args.size != 2
-
-    Digest::MD5.hexdigest("#{args[0]}:mongo:#{args[1]}")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb
deleted file mode 100644
index 0acc76996ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_database/mongodb.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-Puppet::Type.type(:mongodb_database).provide(:mongodb) do
-
-  desc "Manages MongoDB database."
-
-  defaultfor :kernel => 'Linux'
-
-  commands :mongo => 'mongo'
-
-  def block_until_mongodb(tries = 10)
-    begin
-      mongo('--quiet', '--eval', 'db.getMongo()')
-    rescue => e
-      debug('MongoDB server not ready, retrying')
-      sleep 2
-      if (tries -= 1) > 0
-        retry
-      else
-        raise e
-      end
-    end
-  end
-
-  def create
-    mongo(@resource[:name], '--quiet', '--eval', "db.dummyData.insert({\"created_by_puppet\": 1})")
-  end
-
-  def destroy
-    mongo(@resource[:name], '--quiet', '--eval', 'db.dropDatabase()')
-  end
-
-  def exists?
-    block_until_mongodb(@resource[:tries])
-    mongo("--quiet", "--eval", 'db.getMongo().getDBNames()').split(",").include?(@resource[:name])
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb
deleted file mode 100644
index d77afe3036e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_replset/mongo.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-# Author: François Charlier <francois.charlier@enovance.com>
-#
-
-Puppet::Type.type(:mongodb_replset).provide(:mongo) do
-
-  desc "Manage hosts members for a replicaset."
-
-  confine :true =>
-    begin
-      require 'json'
-      true
-    rescue LoadError
-      false
-    end
-
-  commands :mongo => 'mongo'
-
-  mk_resource_methods
-
-  def initialize(resource={})
-    super(resource)
-    @property_flush = {}
-  end
-
-  def members=(hosts)
-    @property_flush[:members] = hosts
-  end
-
-  def self.instances
-    instance = get_replset_properties
-    if instance
-      # There can only be one replset per node
-      [new(instance)]
-    else
-      []
-    end
-  end
-
-  def self.prefetch(resources)
-    instances.each do |prov|
-      if resource = resources[prov.name]
-        resource.provider = prov
-      end
-    end
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present
-  end
-
-  def create
-    @property_flush[:ensure] = :present
-    @property_flush[:members] = resource.should(:members)
-  end
-
-  def destroy
-    @property_flush[:ensure] = :absent
-  end
-
-  def flush
-    set_members
-    @property_hash = self.class.get_replset_properties
-  end
-
-  private
-
-  def db_ismaster(host)
-    mongo_command("db.isMaster()", host)
-  end
-
-  def rs_initiate(conf, master)
-    return mongo_command("rs.initiate(#{conf})", master)
-  end
-
-  def rs_status(host)
-    mongo_command("rs.status()", host)
-  end
-
-  def rs_add(host, master)
-    mongo_command("rs.add(\"#{host}\")", master)
-  end
-
-  def rs_remove(host, master)
-    mongo_command("rs.remove(\"#{host}\")", master)
-  end
-
-  def master_host(hosts)
-    hosts.each do |host|
-      status = db_ismaster(host)
-      if status.has_key?('primary')
-        return status['primary']
-      end
-    end
-    false
-  end
-
-  def self.get_replset_properties
-    output = mongo_command('rs.conf()')
-    if output['members']
-      members = output['members'].collect do |val|
-        val['host']
-      end
-      props = {
-        :name     => output['_id'],
-        :ensure   => :present,
-        :members  => members,
-        :provider => :mongo,
-      }
-    else
-      props = nil
-    end
-    Puppet.debug("MongoDB replset properties: #{props.inspect}")
-    props
-  end
-
-  def alive_members(hosts)
-    hosts.select do |host|
-      begin
-        Puppet.debug "Checking replicaset member #{host} ..."
-        status = rs_status(host)
-        if status.has_key?('errmsg') and status['errmsg'] == 'not running with --replSet'
-          raise Puppet::Error, "Can't configure replicaset #{self.name}, host #{host} is not supposed to be part of a replicaset."
-        end
-        if status.has_key?('set')
-          if status['set'] != self.name
-            raise Puppet::Error, "Can't configure replicaset #{self.name}, host #{host} is already part of another replicaset."
-          end
-
-          # This node is alive and supposed to be a member of our set
-          Puppet.debug "Host #{self.name} is available for replset #{status['set']}"
-          true
-        elsif status.has_key?('info')
-          Puppet.debug "Host #{self.name} is alive but unconfigured: #{status['info']}"
-          true
-        end
-      rescue Puppet::ExecutionFailure
-        Puppet.warning "Can't connect to replicaset member #{host}."
-
-        false
-      end
-    end
-  end
-
-  def set_members
-    if @property_flush[:ensure] == :absent
-      # TODO: I don't know how to remove a node from a replset; unimplemented
-      #Puppet.debug "Removing all members from replset #{self.name}"
-      #@property_hash[:members].collect do |member|
-      #  rs_remove(member, master_host(@property_hash[:members]))
-      #end
-      return
-    end
-
-    if ! @property_flush[:members].empty?
-      # Find the alive members so we don't try to add dead members to the replset
-      alive_hosts = alive_members(@property_flush[:members])
-      dead_hosts  = @property_flush[:members] - alive_hosts
-      raise Puppet::Error, "Can't connect to any member of replicaset #{self.name}." if alive_hosts.empty?
-      Puppet.debug "Alive members: #{alive_hosts.inspect}"
-      Puppet.debug "Dead members: #{dead_hosts.inspect}" unless dead_hosts.empty?
-    else
-      alive_hosts = []
-    end
-
-    if @property_flush[:ensure] == :present and @property_hash[:ensure] != :present
-      Puppet.debug "Initializing the replset #{self.name}"
-
-      # Create a replset configuration
-      hostconf = alive_hosts.each_with_index.map do |host,id|
-        "{ _id: #{id}, host: \"#{host}\" }"
-      end.join(',')
-      conf = "{ _id: \"#{self.name}\", members: [ #{hostconf} ] }"
-
-      # Set replset members with the first host as the master
-      output = rs_initiate(conf, alive_hosts[0])
-      if output['ok'] == 0
-        raise Puppet::Error, "rs.initiate() failed for replicaset #{self.name}: #{output['errmsg']}"
-      end
-    else
-      # Add members to an existing replset
-      if master = master_host(alive_hosts)
-        current_hosts = db_ismaster(master)['hosts']
-        newhosts = alive_hosts - current_hosts
-        newhosts.each do |host|
-          output = rs_add(host, master)
-          if output['ok'] == 0
-            raise Puppet::Error, "rs.add() failed to add host to replicaset #{self.name}: #{output['errmsg']}"
-          end
-        end
-      else
-        raise Puppet::Error, "Can't find master host for replicaset #{self.name}."
-      end
-    end
-  end
-
-  def mongo_command(command, host, retries=4)
-    self.class.mongo_command(command,host,retries)
-  end
-
-  def self.mongo_command(command, host=nil, retries=4)
-    # Allow waiting for mongod to become ready
-    # Wait for 2 seconds initially and double the delay at each retry
-    wait = 2
-    begin
-      args = Array.new
-      args << '--quiet'
-      args << ['--host',host] if host
-      args << ['--eval',"printjson(#{command})"]
-      output = mongo(args.flatten)
-    rescue Puppet::ExecutionFailure => e
-      if e =~ /Error: couldn't connect to server/ and wait <= 2**max_wait
-        info("Waiting #{wait} seconds for mongod to become available")
-        sleep wait
-        wait *= 2
-        retry
-      else
-        raise
-      end
-    end
-
-    # Dirty hack to remove JavaScript objects
-    output.gsub!(/ISODate\((.+?)\)/, '\1 ')
-    output.gsub!(/Timestamp\((.+?)\)/, '[\1]')
-
-    #Hack to avoid non-json empty sets
-    output = "{}" if output == "null\n"
-
-    JSON.parse(output)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb
deleted file mode 100644
index 10e0bf7f07a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/provider/mongodb_user/mongodb.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-Puppet::Type.type(:mongodb_user).provide(:mongodb) do
-
-  desc "Manage users for a MongoDB database."
-
-  defaultfor :kernel => 'Linux'
-
-  commands :mongo => 'mongo'
-
-  def block_until_mongodb(tries = 10)
-    begin
-      mongo('--quiet', '--eval', 'db.getMongo()')
-    rescue
-      debug('MongoDB server not ready, retrying')
-      sleep 2
-      retry unless (tries -= 1) <= 0
-    end
-  end
-
-  def create
-    mongo(@resource[:database], '--eval', "db.system.users.insert({user:\"#{@resource[:name]}\", pwd:\"#{@resource[:password_hash]}\", roles: #{@resource[:roles].inspect}})")
-  end
-
-  def destroy
-    mongo(@resource[:database], '--quiet', '--eval', "db.removeUser(\"#{@resource[:name]}\")")
-  end
-
-  def exists?
-    block_until_mongodb(@resource[:tries])
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.find({user:\"#{@resource[:name]}\"}).count()").strip.eql?('1')
-  end
-
-  def password_hash
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.findOne({user:\"#{@resource[:name]}\"})[\"pwd\"]").strip
-  end
-
-  def password_hash=(value)
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.update({user:\"#{@resource[:name]}\"}, { $set: {pwd:\"#{value}\"}})")
-  end
-
-  def roles
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.findOne({user:\"#{@resource[:name]}\"})[\"roles\"]").strip.split(",").sort
-  end
-
-  def roles=(value)
-    mongo(@resource[:database], '--quiet', '--eval', "db.system.users.update({user:\"#{@resource[:name]}\"}, { $set: {roles: #{@resource[:roles].inspect}}})")
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb
deleted file mode 100644
index 45c0f8fa238..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_database.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-Puppet::Type.newtype(:mongodb_database) do
-  @doc = "Manage MongoDB databases."
-
-  ensurable
-
-  newparam(:name, :namevar=>true) do
-    desc "The name of the database."
-    newvalues(/^\w+$/)
-  end
-
-  newparam(:tries) do
-    desc "The maximum amount of two second tries to wait MongoDB startup."
-    defaultto 10
-    newvalues(/^\d+$/)
-    munge do |value|
-      Integer(value)
-    end
-  end
-
-  autorequire(:package) do
-    'mongodb'
-  end
-
-  autorequire(:service) do
-    'mongodb'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb
deleted file mode 100644
index 8115ef034e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_replset.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Author: François Charlier <francois.charlier@enovance.com>
-#
-
-Puppet::Type.newtype(:mongodb_replset) do
-  @doc = "Manage a MongoDB replicaSet"
-
-  ensurable do
-    defaultto :present
-
-    newvalue(:present) do
-      provider.create
-    end
-  end
-
-  newparam(:name) do
-    desc "The name of the replicaSet"
-  end
-
-  newproperty(:members, :array_matching => :all) do
-    desc "The replicaSet members"
-
-    def insync?(is)
-      is.sort == should.sort
-    end
-  end
-
-  autorequire(:package) do
-    'mongodb'
-  end
-
-  autorequire(:service) do
-    'mongodb'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb
deleted file mode 100644
index 7f7e97b8430..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/lib/puppet/type/mongodb_user.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-Puppet::Type.newtype(:mongodb_user) do
-  @doc = 'Manage a MongoDB user. This includes management of users password as well as privileges.'
-
-  ensurable
-
-  def initialize(*args)
-    super
-    # Sort roles array before comparison.
-    self[:roles] = Array(self[:roles]).sort!
-  end
-
-  newparam(:name, :namevar=>true) do
-    desc "The name of the user."
-  end
-
-  newparam(:database) do
-    desc "The user's target database."
-    defaultto do
-      fail("Parameter 'database' must be set")
-    end
-    newvalues(/^\w+$/)
-  end
-
-  newparam(:tries) do
-    desc "The maximum amount of two second tries to wait MongoDB startup."
-    defaultto 10
-    newvalues(/^\d+$/)
-    munge do |value|
-      Integer(value)
-    end
-  end
-
-  newproperty(:roles, :array_matching => :all) do
-    desc "The user's roles."
-    defaultto ['dbAdmin']
-    newvalue(/^\w+$/)
-
-    # Pretty output for arrays.
-    def should_to_s(value)
-      value.inspect
-    end
-
-    def is_to_s(value)
-      value.inspect
-    end
-  end
-
-  newproperty(:password_hash) do
-    desc "The password hash of the user. Use mongodb_password() for creating hash."
-    defaultto do
-      fail("Property 'password_hash' must be set. Use mongodb_password() for creating hash.")
-    end
-    newvalue(/^\w+$/)
-  end
-
-  autorequire(:package) do
-    'mongodb'
-  end
-
-  autorequire(:service) do
-    'mongodb'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client.pp
deleted file mode 100644
index de1b339c7d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Class for installing a MongoDB client shell (CLI).
-#
-# == Parameters
-#
-# [ensure] Desired ensure state of the package. Optional.
-#   Defaults to 'true'
-#
-# [package_name] Name of the package to install the client from. Default
-#   is repository dependent.
-#
-class mongodb::client (
-  $ensure       = $mongodb::params::ensure_client,
-  $package_name = $mongodb::params::client_package_name,
-) inherits mongodb::params {
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      class { 'mongodb::client::install': }
-    }
-    'Debian': {
-      warning ('Debian client is included by default with server. Please use ::mongodb::server to install the mongo client for Debian family systems.')
-    }
-    default: {
-      # no action taken, failure happens in params.pp
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client/install.pp
deleted file mode 100644
index 6da26003baf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/client/install.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::client::install {
-  $package_ensure = $mongodb::client::ensure
-  $package_name   = $mongodb::client::package_name
-
-  case $package_ensure {
-    true:     {
-      $my_package_ensure = 'present'
-    }
-    false:    {
-      $my_package_ensure = 'purged'
-    }
-    'absent': {
-      $my_package_ensure = 'purged'
-    }
-    default:  {
-      $my_package_ensure = $package_ensure
-    }
-  }
-
-  package { 'mongodb_client':
-    ensure  => $my_package_ensure,
-    name    => $package_name,
-    tag     => 'mongodb',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/db.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/db.pp
deleted file mode 100644
index 708f5d75e7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/db.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# == Class: mongodb::db
-#
-# Class for creating mongodb databases and users.
-#
-# == Parameters
-#
-#  user - Database username.
-#  password_hash - Hashed password. Hex encoded md5 hash of "$username:mongo:$password".
-#  password - Plain text user password. This is UNSAFE, use 'password_hash' unstead.
-#  roles (default: ['dbAdmin']) - array with user roles.
-#  tries (default: 10) - The maximum amount of two second tries to wait MongoDB startup.
-#
-define mongodb::db (
-  $user,
-  $password_hash = false,
-  $password      = false,
-  $roles         = ['dbAdmin'],
-  $tries         = 10,
-) {
-
-  mongodb_database { $name:
-    ensure   => present,
-    tries    => $tries,
-    require  => Class['mongodb::server'],
-  }
-
-  if $password_hash {
-    $hash = $password_hash
-  } elsif $password {
-    $hash = mongodb_password($user, $password)
-  } else {
-    fail("Parameter 'password_hash' or 'password' should be provided to mongodb::db.")
-  }
-
-  mongodb_user { $user:
-    ensure        => present,
-    password_hash => $hash,
-    database      => $name,
-    roles         => $roles,
-    require       => Mongodb_database[$name],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/globals.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/globals.pp
deleted file mode 100644
index fb04df694de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/globals.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Class for setting cross-class global overrides. See README.md for more
-# details.
-
-class mongodb::globals (
-  $server_package_name  = undef,
-  $client_package_name  = undef,
-
-  $service_name         = undef,
-  $service_provider     = undef,
-  $service_status       = undef,
-
-  $user                 = undef,
-  $group                = undef,
-  $bind_ip              = undef,
-
-  $version              = undef,
-
-  $manage_package_repo  = undef,
-) {
-
-  # Setup of the repo only makes sense globally, so we are doing it here.
-  if($manage_package_repo) {
-    class { '::mongodb::repo':
-      ensure  => present,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/init.pp
deleted file mode 100644
index d489731b0d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/init.pp
+++ /dev/null
@@ -1,136 +0,0 @@
-# == Class: mongodb
-#
-# Direct use of this class is deprecated. Please use mongodb::server
-#
-# Manage mongodb installations on RHEL, CentOS, Debian and Ubuntu - either
-# installing from the 10Gen repo or from EPEL in the case of EL systems.
-#
-# === Parameters
-#
-# enable_10gen (default: false) - Whether or not to set up 10gen software repositories
-# init (auto discovered) - override init (sysv or upstart) for Debian derivatives
-# location - override apt location configuration for Debian derivatives
-# packagename (auto discovered) - override the package name
-# servicename (auto discovered) - override the service name
-# service-enable (default: true) - Enable the service and ensure it is running
-#
-# === Examples
-#
-# To install with defaults from the distribution packages on any system:
-#   include mongodb
-#
-# To install from 10gen on a EL server
-#   class { 'mongodb':
-#     enable_10gen => true,
-#   }
-#
-# === Authors
-#
-# Craig Dunn <craig@craigdunn.org>
-#
-# === Copyright
-#
-# Copyright 2013 PuppetLabs
-#
-
-class mongodb (
-  # Deprecated parameters
-  $enable_10gen    = undef,
-
-  $init            = $mongodb::params::service_provider,
-  $location        = '',
-  $packagename     = undef,
-  $version         = undef,
-  $servicename     = $mongodb::params::service_name,
-  $service_enable  = true, #deprecated
-  $logpath         = $mongodb::params::logpath,
-  $logappend       = true,
-  $fork            = $mongodb::params::fork,
-  $port            = 27017,
-  $dbpath          = $mongodb::params::dbpath,
-  $journal         = undef,
-  $nojournal       = undef,
-  $smallfiles      = undef,
-  $cpu             = undef,
-  $noauth          = undef,
-  $auth            = undef,
-  $verbose         = undef,
-  $objcheck        = undef,
-  $quota           = undef,
-  $oplog           = undef, #deprecated it's on if replica set
-  $oplog_size      = undef,
-  $nohints         = undef,
-  $nohttpinterface = undef,
-  $noscripting     = undef,
-  $notablescan     = undef,
-  $noprealloc      = undef,
-  $nssize          = undef,
-  $mms_token       = undef,
-  $mms_name        = undef,
-  $mms_interval    = undef,
-  $slave           = undef,
-  $only            = undef,
-  $master          = undef,
-  $source          = undef,
-  $replset         = undef,
-  $rest            = undef,
-  $slowms          = undef,
-  $keyfile         = undef,
-  $bind_ip         = undef,
-  $pidfilepath     = undef
-) inherits mongodb::params {
-
-  if $enable_10gen {
-    fail("Parameter enable_10gen is no longer supported. Please use class { 'mongodb::globals': manage_package_repo => true }")
-  }
-
-  if $version {
-    fail("Parameter version is no longer supported. Please use class { 'mongodb::globals': version => VERSION }")
-  }
-
-  if $oplog {
-    fail('Parameter is no longer supported. On replica set Oplog is enabled by default.')
-  }
-
-  notify { 'An attempt has been made below to automatically apply your custom
-    settings to mongodb::server. Please verify this works in a safe test
-    environment.': }
-
-  class { 'mongodb::server':
-    package_name    => $packagename,
-    logpath         => $logpath,
-    logappend       => $logappend,
-    fork            => $fork,
-    port            => $port,
-    dbpath          => $dbpath,
-    journal         => $journal,
-    nojournal       => $nojournal,
-    smallfiles      => $smallfiles,
-    cpu             => $cpu,
-    noauth          => $noauth,
-    verbose         => $verbose,
-    objcheck        => $objcheck,
-    quota           => $quota,
-    oplog_size      => $oplog_size,
-    nohints         => $nohints,
-    nohttpinterface => $nohttpinterface,
-    noscripting     => $noscripting,
-    notablescan     => $notablescan,
-    noprealloc      => $noprealloc,
-    nssize          => $nssize,
-    mms_token       => $mms_token,
-    mms_name        => $mms_name,
-    mms_interval    => $mms_interval,
-    slave           => $slave,
-    only            => $only,
-    master          => $master,
-    source          => $source,
-    replset         => $replset,
-    rest            => $rest,
-    slowms          => $slowms,
-    keyfile         => $keyfile,
-    bind_ip         => $bind_ip,
-    pidfilepath     => $pidfilepath,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/params.pp
deleted file mode 100644
index 5afc4845e35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/params.pp
+++ /dev/null
@@ -1,93 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::params inherits mongodb::globals {
-  $ensure           = true
-  $service_status   = $service_status
-  $ensure_client    = true
-
-  # Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
-  case $::osfamily {
-    'RedHat', 'Linux': {
-
-      if $mongodb::globals::manage_package_repo {
-        $user        = pick($user, 'mongod')
-        $group       = pick($group, 'mongod')
-        if $::mongodb::globals::version {
-          $server_package_name = "mongodb-org-server-${::mongodb::globals::version}"
-          $client_package_name = "mongodb-org-${::mongodb::globals::version}"
-        } else {
-          $server_package_name = 'mongodb-org-server'
-          $client_package_name = 'mongodb-org'
-        }
-        $service_name = pick($service_name, 'mongod')
-        $config      = '/etc/mongod.conf'
-        $dbpath      = '/var/lib/mongo'
-        $logpath     = '/var/log/mongodb/mongod.log'
-        $pidfilepath = '/var/run/mongodb/mongod.pid'
-        $bind_ip     = pick($bind_ip, ['127.0.0.1'])
-        $fork        = true
-      } else {
-        # RedHat/CentOS doesn't come with a prepacked mongodb
-        # so we assume that you are using EPEL repository.
-        $user                = pick($user, 'mongodb')
-        $group               = pick($group, 'mongodb')
-        $server_package_name = pick($server_package_name, 'mongodb-server')
-        $client_package_name = pick($client_package_name, 'mongodb')
-
-        $service_name        = pick($service_name, 'mongod')
-        $config              = '/etc/mongodb.conf'
-        $dbpath              = '/var/lib/mongodb'
-        $logpath             = '/var/log/mongodb/mongodb.log'
-        $bind_ip             = pick($bind_ip, ['127.0.0.1'])
-        $pidfilepath         = '/var/run/mongodb/mongodb.pid'
-        $fork                = true
-        $journal             = true
-      }
-    }
-    'Debian': {
-      if $mongodb::globals::manage_package_repo {
-        $user  = pick($user, 'mongodb')
-        $group = pick($group, 'mongodb')
-        if $::mongodb::globals::version {
-          $server_package_name = "mongodb-10gen=${::mongodb::globals::version}"
-        } else {
-          $server_package_name = 'mongodb-10gen'
-        }
-        $service_name = 'mongodb'
-        $config       = '/etc/mongodb.conf'
-        $dbpath       = '/var/lib/mongodb'
-        $logpath      = '/var/log/mongodb/mongodb.log'
-        $bind_ip      = ['127.0.0.1']
-      } else {
-        # although we are living in a free world,
-        # I would not recommend to use the prepacked
-        # mongodb server on Ubuntu 12.04 or Debian 6/7,
-        # because its really outdated
-        $user                = pick($user, 'mongodb')
-        $group               = pick($group, 'mongodb')
-        $server_package_name = pick($server_package_name, 'mongodb-server')
-        $client_package_name = pick($client_package_name, 'mongodb')
-        $service_name        = pick($service_name, 'mongodb')
-        $config              = '/etc/mongodb.conf'
-        $dbpath              = '/var/lib/mongodb'
-        $logpath             = '/var/log/mongodb/mongodb.log'
-        $bind_ip             = pick($bind_ip, ['127.0.0.1'])
-        $pidfilepath         = undef
-      }
-      # avoid using fork because of the init scripts design
-      $fork = undef
-    }
-    default: {
-      fail("Osfamily ${::osfamily} and ${::operatingsystem} is not supported")
-    }
-  }
-
-  case $::operatingsystem {
-    'Ubuntu': {
-      $service_provider = pick($service_provider, 'upstart')
-    }
-    default: {
-      $service_provider = undef
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/replset.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/replset.pp
deleted file mode 100644
index ce4a0255579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/replset.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Wrapper class useful for hiera based deployments
-
-class mongodb::replset(
-  $sets = undef
-) {
-
-  if $sets {
-    create_resources(mongodb_replset, $sets)
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo.pp
deleted file mode 100644
index ecd6de1b71c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::repo (
-  $ensure  = $mongodb::params::ensure,
-) inherits mongodb::params {
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      $location = $::architecture ? {
-        'x86_64' => 'http://downloads-distro.mongodb.org/repo/redhat/os/x86_64/',
-        'i686'   => 'http://downloads-distro.mongodb.org/repo/redhat/os/i686/',
-        'i386'   => 'http://downloads-distro.mongodb.org/repo/redhat/os/i686/',
-        default  => undef
-      }
-      class { 'mongodb::repo::yum': }
-    }
-
-    'Debian': {
-      $location = $::operatingsystem ? {
-        'Debian' => 'http://downloads-distro.mongodb.org/repo/debian-sysvinit',
-        'Ubuntu' => 'http://downloads-distro.mongodb.org/repo/ubuntu-upstart',
-        default  => undef
-      }
-      class { 'mongodb::repo::apt': }
-    }
-
-    default: {
-      if($ensure == 'present' or $ensure == true) {
-        fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily RedHat, Debian and Ubuntu")
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp
deleted file mode 100644
index e8f4b812f91..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/apt.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::repo::apt inherits mongodb::repo {
-  # we try to follow/reproduce the instruction
-  # from http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
-
-  include ::apt
-
-  if($::mongodb::repo::ensure == 'present' or $::mongodb::repo::ensure == true) {
-    apt::source { 'downloads-distro.mongodb.org':
-      location    => $::mongodb::repo::location,
-      release     => 'dist',
-      repos       => '10gen',
-      key         => '9ECBEC467F0CEB10',
-      key_server  => 'keyserver.ubuntu.com',
-      include_src => false,
-    }
-
-    Apt::Source['downloads-distro.mongodb.org']->Package<|tag == 'mongodb'|>
-  }
-  else {
-    apt::source { 'downloads-distro.mongodb.org':
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp
deleted file mode 100644
index 3a3f6b5d849..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/repo/yum.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class mongodb::repo::yum inherits mongodb::repo {
-  # We try to follow/reproduce the instruction
-  # http://docs.mongodb.org/manual/tutorial/install-mongodb-on-red-hat-centos-or-fedora-linux/
-
-  if($::mongodb::repo::ensure == 'present' or $::mongodb::repo::ensure == true) {
-    yumrepo { 'mongodb':
-      descr    => 'MongoDB/10gen Repository',
-      baseurl  => $::mongodb::repo::location,
-      gpgcheck => '0',
-      enabled  => '1',
-    }
-    Yumrepo['mongodb'] -> Package<|tag == 'mongodb'|>
-  }
-  else {
-    yumrepo { 'mongodb':
-      enabled => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server.pp
deleted file mode 100644
index 04c576a1398..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# This installs a MongoDB server. See README.md for more details.
-class mongodb::server (
-  $ensure           = $mongodb::params::ensure,
-
-  $user             = $mongodb::params::user,
-  $group            = $mongodb::params::group,
-
-  $config           = $mongodb::params::config,
-  $dbpath           = $mongodb::params::dbpath,
-  $pidfilepath      = $mongodb::params::pidfilepath,
-
-  $service_provider = $mongodb::params::service_provider,
-  $service_name     = $mongodb::params::service_name,
-  $service_status   = $mongodb::params::service_status,
-
-  $package_ensure  = $ensure,
-  $package_name    = $mongodb::params::server_package_name,
-
-  $logpath         = $mongodb::params::logpath,
-  $bind_ip         = $mongodb::params::bind_ip,
-  $logappend       = true,
-  $fork            = $mongodb::params::fork,
-  $port            = 27017,
-  $journal         = $mongodb::params::journal,
-  $nojournal       = undef,
-  $smallfiles      = undef,
-  $cpu             = undef,
-  $auth            = false,
-  $noauth          = undef,
-  $verbose         = undef,
-  $verbositylevel  = undef,
-  $objcheck        = undef,
-  $quota           = undef,
-  $quotafiles      = undef,
-  $diaglog         = undef,
-  $directoryperdb  = undef,
-  $profile         = undef,
-  $maxconns        = undef,
-  $oplog_size      = undef,
-  $nohints         = undef,
-  $nohttpinterface = undef,
-  $noscripting     = undef,
-  $notablescan     = undef,
-  $noprealloc      = undef,
-  $nssize          = undef,
-  $mms_token       = undef,
-  $mms_name        = undef,
-  $mms_interval    = undef,
-  $replset         = undef,
-  $rest            = undef,
-  $slowms          = undef,
-  $keyfile         = undef,
-  $set_parameter   = undef,
-  $syslog          = undef,
-
-  # Deprecated parameters
-  $master          = undef,
-  $slave           = undef,
-  $only            = undef,
-  $source          = undef,
-) inherits mongodb::params {
-
-
-  if ($ensure == 'present' or $ensure == true) {
-    anchor { 'mongodb::server::start': }->
-    class { 'mongodb::server::install': }->
-    class { 'mongodb::server::config': }->
-    class { 'mongodb::server::service': }->
-    anchor { 'mongodb::server::end': }
-  } else {
-    anchor { 'mongodb::server::start': }->
-    class { 'mongodb::server::service': }->
-    class { 'mongodb::server::config': }->
-    class { 'mongodb::server::install': }->
-    anchor { 'mongodb::server::end': }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/config.pp
deleted file mode 100644
index 2056c14d546..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/config.pp
+++ /dev/null
@@ -1,92 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::server::config {
-  $ensure          = $mongodb::server::ensure
-  $user            = $mongodb::server::user
-  $group           = $mongodb::server::group
-  $config          = $mongodb::server::config
-
-  $dbpath          = $mongodb::server::dbpath
-  $pidfilepath     = $mongodb::server::pidfilepath
-  $logpath         = $mongodb::server::logpath
-  $logappend       = $mongodb::server::logappend
-  $fork            = $mongodb::server::fork
-  $port            = $mongodb::server::port
-  $journal         = $mongodb::server::journal
-  $nojournal       = $mongodb::server::nojournal
-  $smallfiles      = $mongodb::server::smallfiles
-  $cpu             = $mongodb::server::cpu
-  $auth            = $mongodb::server::auth
-  $noath           = $mongodb::server::noauth
-  $verbose         = $mongodb::server::verbose
-  $verbositylevel  = $mongodb::server::verbositylevel
-  $objcheck        = $mongodb::server::objcheck
-  $quota           = $mongodb::server::quota
-  $quotafiles      = $mongodb::server::quotafiles
-  $diaglog         = $mongodb::server::diaglog
-  $oplog_size      = $mongodb::server::oplog_size
-  $nohints         = $mongodb::server::nohints
-  $nohttpinterface = $mongodb::server::nohttpinterface
-  $noscripting     = $mongodb::server::noscripting
-  $notablescan     = $mongodb::server::notablescan
-  $noprealloc      = $mongodb::server::noprealloc
-  $nssize          = $mongodb::server::nssize
-  $mms_token       = $mongodb::server::mms_token
-  $mms_name        = $mongodb::server::mms_name
-  $mms_interval    = $mongodb::server::mms_interval
-  $master          = $mongodb::server::master
-  $slave           = $mongodb::server::slave
-  $only            = $mongodb::server::only
-  $source          = $mongodb::server::source
-  $replset         = $mongodb::server::replset
-  $rest            = $mongodb::server::rest
-  $slowms          = $mongodb::server::slowms
-  $keyfile         = $mongodb::server::keyfile
-  $bind_ip         = $mongodb::server::bind_ip
-  $directoryperdb  = $mongodb::server::directoryperdb
-  $profile         = $mongodb::server::profile
-  $set_parameter   = $mongodb::server::set_parameter
-  $syslog          = $mongodb::server::syslog
-
-  File {
-    owner => $user,
-    group => $group,
-  }
-
-  if ($logpath and $syslog) { fail('You cannot use syslog with logpath')}
-
-  if ($ensure == 'present' or $ensure == true) {
-
-    # Exists for future compatibility and clarity.
-    if $auth {
-      $noauth = false
-    }
-    else {
-      $noauth = true
-    }
-
-    file { $config:
-      content => template('mongodb/mongodb.conf.erb'),
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      notify  => Class['mongodb::server::service']
-    }
-
-    file { $dbpath:
-      ensure  => directory,
-      mode    => '0755',
-      owner   => $user,
-      group   => $group,
-      require => File[$config]
-    }
-  } else {
-    file { $dbpath:
-      ensure => absent,
-      force  => true,
-      backup => false,
-    }
-    file { $config:
-      ensure => absent
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/install.pp
deleted file mode 100644
index 46b0e749b17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/install.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::server::install {
-  $package_ensure = $mongodb::server::package_ensure
-  $package_name   = $mongodb::server::package_name
-
-  case $package_ensure {
-    true:     {
-      $my_package_ensure = 'present'
-      $file_ensure     = 'directory'
-    }
-    false:    {
-      $my_package_ensure = 'absent'
-      $file_ensure     = 'absent'
-    }
-    'absent': {
-      $my_package_ensure = 'absent'
-      $file_ensure     = 'absent'
-    }
-    'purged': {
-      $my_package_ensure = 'purged'
-      $file_ensure     = 'absent'
-    }
-    default:  {
-      $my_package_ensure = $package_ensure
-      $file_ensure     = 'present'
-    }
-  }
-
-  package { 'mongodb_server':
-    ensure  => $my_package_ensure,
-    name    => $package_name,
-    tag     => 'mongodb',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/service.pp
deleted file mode 100644
index 8cb4a48ef5e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/manifests/server/service.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class mongodb::server::service {
-  $ensure           = $mongodb::server::ensure
-  $service_name     = $mongodb::server::service_name
-  $service_provider = $mongodb::server::service_provider
-  $service_status   = $mongodb::server::service_status
-
-  $service_ensure = $ensure ? {
-    present => true,
-    absent  => false,
-    purged  => false,
-    default => $ensure
-  }
-
-  service { 'mongodb':
-    ensure    => $service_ensure,
-    name      => $service_name,
-    enable    => $service_ensure,
-    provider  => $service_provider,
-    hasstatus => true,
-    status    => $service_status,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml
deleted file mode 100644
index ae19ee77c81..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-6-vcloud.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-HOSTS:
-  'master':
-    roles:
-      - master
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-  'slave':
-    roles:
-      - slave
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 4e2cb809e85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml
deleted file mode 100644
index ae19ee77c81..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-6-vcloud.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-HOSTS:
-  'master':
-    roles:
-      - master
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-  'slave':
-    roles:
-      - slave
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/multi-centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb
deleted file mode 100644
index 8be5a0f4638..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/replset_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'spec_helper_acceptance'
-
-if hosts.length > 1
-  describe 'mongodb_replset resource' do
-    after :all do
-      # Have to drop the DB to disable replsets for further testing
-      on hosts, %{mongo local --verbose --eval 'db.dropDatabase()'}
-
-      pp = <<-EOS
-        class { 'mongodb::globals': }
-        -> class { 'mongodb::server':
-          ensure => purged,
-        }
-        if $::osfamily == 'RedHat' {
-          class { 'mongodb::client': }
-        }
-      EOS
-
-      apply_manifest_on(hosts.reverse, pp, :catch_failures => true)
-    end
-
-    it 'configures mongo on both nodes' do
-      pp = <<-EOS
-        class { 'mongodb::globals': }
-        -> class { 'mongodb::server':
-          bind_ip => '0.0.0.0',
-          replset => 'test',
-        }
-        if $::osfamily == 'RedHat' {
-          class { 'mongodb::client': }
-        }
-      EOS
-
-      apply_manifest_on(hosts.reverse, pp, :catch_failures => true)
-      apply_manifest_on(hosts.reverse, pp, :catch_changes  => true)
-    end
-
-    it 'sets up the replset with puppet' do
-      pp = <<-EOS
-        mongodb_replset { 'test':
-          members => [#{hosts.collect{|x|"'#{x}:27017'"}.join(',')}],
-        }
-      EOS
-      apply_manifest_on(hosts_as('master'), pp, :catch_failures => true)
-      on(hosts_as('master'), 'mongo --quiet --eval "printjson(rs.conf())"') do |r|
-        expect(r.stdout).to match /#{hosts[0]}:27017/
-        expect(r.stdout).to match /#{hosts[1]}:27017/
-      end
-    end
-
-    it 'inserts data on the master' do
-      sleep(30)
-      on hosts_as('master'), %{mongo --verbose --eval 'db.test.save({name:"test1",value:"some value"})'}
-    end
-
-    it 'checks the data on the master' do
-      on hosts_as('master'), %{mongo --verbose --eval 'printjson(db.test.findOne({name:"test1"}))'} do |r|
-        expect(r.stdout).to match /some value/
-      end
-    end
-
-    it 'checks the data on the slave' do
-      sleep(10)
-      on hosts_as('slave'), %{mongo --verbose --eval 'rs.slaveOk(); printjson(db.test.findOne({name:"test1"}))'} do |r|
-        expect(r.stdout).to match /some value/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb
deleted file mode 100644
index c1132f594cd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/acceptance/server_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mongodb::server class' do
-
-  shared_examples 'normal tests' do |tengen|
-    if tengen
-      case fact('osfamily')
-      when 'RedHat'
-        package_name = 'mongodb-org-server'
-        service_name = 'mongod'
-        config_file  = '/etc/mongod.conf'
-      when 'Debian'
-        package_name = 'mongodbdb-org-10gen'
-        service_name = 'mongodb'
-        config_file  = '/etc/mongodb.conf'
-      end
-    else
-      case fact('osfamily')
-      when 'RedHat'
-        package_name = 'mongodb-server'
-        service_name = 'mongod'
-        config_file  = '/etc/mongodb.conf'
-      when 'Debian'
-        package_name = 'mongodb-server'
-        service_name = 'mongodb'
-        config_file  = '/etc/mongodb.conf'
-      end
-    end
-
-    client_name  = 'mongo --version'
-
-    context "default parameters with 10gen => #{tengen}" do
-      after :all do
-        if tengen
-          puts "XXX uninstalls mongodb because changing the port with tengen doesn't work because they have a crappy init script"
-          pp = <<-EOS
-            class {'mongodb::globals': manage_package_repo => #{tengen}, }
-            -> class { 'mongodb::server': ensure => absent, }
-            -> class { 'mongodb::client': ensure => absent, }
-          EOS
-          apply_manifest(pp, :catch_failures => true)
-        end
-      end
-
-      it 'should work with no errors' do
-        case fact('osfamily')
-        when 'RedHat'
-          pp = <<-EOS
-            class { 'mongodb::globals': manage_package_repo => #{tengen}, }
-            -> class { 'mongodb::server': }
-            -> class { 'mongodb::client': }
-          EOS
-        when 'Debian'
-          pp = <<-EOS
-            class { 'mongodb::globals': manage_package_repo => #{tengen}, }
-            -> class { 'mongodb::server': }
-          EOS
-        end
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes  => true)
-      end
-
-      describe package(package_name) do
-        it { should be_installed }
-      end
-
-      describe file(config_file) do
-        it { should be_file }
-      end
-
-      describe service(service_name) do
-         it { should be_enabled }
-         it { should be_running }
-      end
-
-      describe port(27017) do
-        it do
-          sleep(20)
-          should be_listening
-        end
-      end
-
-      describe command(client_name) do
-        it do
-          should return_exit_status 0
-        end
-      end
-    end
-
-    context "test using custom port and 10gen => #{tengen}" do
-      it 'change port to 27018' do
-        pp = <<-EOS
-          class { 'mongodb::globals': manage_package_repo => #{tengen}, }
-          -> class { 'mongodb::server': port => 27018, }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes  => true)
-      end
-
-      describe port(27018) do
-        sleep(20)
-        it { sleep 5 ; should be_listening }
-      end
-    end
-
-    describe "uninstalling with 10gen => #{tengen}" do
-      it 'uninstalls mongodb' do
-        pp = <<-EOS
-          class {'mongodb::globals': manage_package_repo => #{tengen}, }
-          -> class { 'mongodb::server': ensure => absent, }
-          -> class { 'mongodb::client': ensure => absent, }
-        EOS
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-  end
-
-  it_behaves_like 'normal tests', false
-  it_behaves_like 'normal tests', true
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb
deleted file mode 100644
index 5fe4bfa7cc5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/client_install_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::client::install', :type => :class do
-  describe 'it should create package' do
-    let(:pre_condition) { ["class mongodb::client { $ensure = true $package_name = 'mongodb' }", "include mongodb::client"]}
-    it {
-      should contain_package('mongodb_client').with({
-        :ensure => 'present',
-        :name   => 'mongodb',
-      })
-    }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb
deleted file mode 100644
index aa051e915f2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/repo_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::repo', :type => :class do
-
-  context 'when deploying on Debian' do
-    let :facts do
-      {
-        :osfamily        => 'Debian',
-        :operatingsystem => 'Debian',
-        :lsbdistid       => 'Debian',
-      }
-    end
-
-    it {
-      should contain_class('mongodb::repo::apt')
-    }
-  end
-
-  context 'when deploying on CentOS' do
-    let :facts do
-      {
-        :osfamily        => 'RedHat',
-        :operatingsystem => 'CentOS',
-      }
-    end
-
-    it {
-      should contain_class('mongodb::repo::yum')
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb
deleted file mode 100644
index db05b88e310..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_config_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::server::config', :type => :class do
-
-  describe 'with preseted variables' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf')
-    }
-
-  end
-
-  describe 'with default values' do
-    let(:pre_condition) {[ "class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $user = 'mongod' $group = 'mongod' $port = 29017 $bind_ip = ['0.0.0.0'] $fork = true $logpath ='/var/log/mongo/mongod.log' $logappend = true }",  "include mongodb::server" ]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with({
-        :mode   => '0644',
-        :owner  => 'root',
-        :group  => 'root'
-      })
-
-      should contain_file('/etc/mongod.conf').with_content(/^dbpath=\/var\/lib\/mongo/)
-      should contain_file('/etc/mongod.conf').with_content(/bind_ip\s=\s0\.0\.0\.0/)
-      should contain_file('/etc/mongod.conf').with_content(/^port = 29017$/)
-      should contain_file('/etc/mongod.conf').with_content(/^logappend=true/)
-      should contain_file('/etc/mongod.conf').with_content(/^logpath=\/var\/log\/mongo\/mongod\.log/)
-      should contain_file('/etc/mongod.conf').with_content(/^fork=true/)
-    }
-  end
-
-  describe 'with absent ensure' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = absent }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with({ :ensure => 'absent' })
-    }
-
-  end
-
-  describe 'with specific bind_ip values' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $bind_ip = ['127.0.0.1', '10.1.1.13']}", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with_content(/bind_ip\s=\s127\.0\.0\.1\,10\.1\.1\.13/)
-    }
-  end
-
-  describe 'when specifying auth to true' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $auth = true $dbpath = '/var/lib/mongo' $ensure = present }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with_content(/^auth=true/)
-    }
-  end
-  
-  describe 'when specifying set_parameter value' do
-    let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $set_parameter = 'textSearchEnable=true' $dbpath = '/var/lib/mongo' $ensure = present }", "include mongodb::server"]}
-
-    it {
-      should contain_file('/etc/mongod.conf').with_content(/^setParameter = textSearchEnable=true/)
-    }
-  end
-
-  describe 'with journal:' do
-    context 'on true with i686 architecture' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $journal = true }", "include mongodb::server"]}
-      let (:facts) { { :architecture => 'i686' } }
-
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/^journal = true/)
-      }
-    end
-  end
-
-  # check nested quota and quotafiles
-  describe 'with quota to' do
-
-    context 'true and without quotafiles' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $quota = true }", "include mongodb::server"]}
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/^quota = true/)
-      }
-    end
-
-    context 'true and with quotafiles' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $quota = true $quotafiles = 1 }", "include mongodb::server"]}
-
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/quota = true/)
-        should contain_file('/etc/mongod.conf').with_content(/quotaFiles = 1/)
-      }
-    end
-  end
-
-  describe 'when specifying syslog value' do
-    context 'it should be set to true' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $syslog = true }", "include mongodb::server"]}
-
-      it {
-        should contain_file('/etc/mongod.conf').with_content(/^syslog = true/)
-      }
-    end
-
-    context 'if logpath is also set an error should be raised' do
-      let(:pre_condition) { ["class mongodb::server { $config = '/etc/mongod.conf' $dbpath = '/var/lib/mongo' $ensure = present $syslog = true $logpath ='/var/log/mongo/mongod.log' }", "include mongodb::server"]}
-
-      it {
-        expect { should contain_file('/etc/mongod.conf') }.to raise_error(Puppet::Error, /You cannot use syslog with logpath/)
-      }
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb
deleted file mode 100644
index 5ca01a90e42..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_install_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::server::install', :type => :class do
-
-  describe 'it should create package and dbpath file' do
-    let(:pre_condition) { ["class mongodb::server { $package_ensure = true $dbpath = '/var/lib/mongo' $user = 'mongodb' $package_name = 'mongodb-server' }", "include mongodb::server"]}
-
-    it {
-      should contain_package('mongodb_server').with({
-        :ensure => 'present',
-        :name   => 'mongodb-server',
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb
deleted file mode 100644
index c74e7f0c166..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/classes/server_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::server' do
-  let :facts do
-    {
-      :osfamily        => 'Debian',
-      :operatingsystem => 'Debian',
-    }
-  end
-
-  context 'with defaults' do
-    it { should contain_class('mongodb::server::install') }
-    it { should contain_class('mongodb::server::config') }
-  end
-
-  context 'when deploying on Solaris' do
-    let :facts do
-      { :osfamily        => 'Solaris' }
-    end
-    it { expect { should raise_error(Puppet::Error) } }
-  end
-
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb
deleted file mode 100644
index 65a6f105238..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/defines/db_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'mongodb::db', :type => :define do
-  let(:title) { 'testdb' }
-
-  let(:params) {
-    { 'user'     => 'testuser',
-      'password' => 'testpass',
-    }
-  }
-
-  it 'should contain mongodb_database with mongodb::server requirement' do
-    should contain_mongodb_database('testdb')\
-      .with_require('Class[Mongodb::Server]')
-  end
-
-  it 'should contain mongodb_user with mongodb_database requirement' do
-    should contain_mongodb_user('testuser')\
-      .with_require('Mongodb_database[testdb]')
-  end
-
-  it 'should contain mongodb_user with proper database name' do
-    should contain_mongodb_user('testuser')\
-      .with_database('testdb')
-  end
-
-  it 'should contain mongodb_user with proper roles' do
-    params.merge!({'roles' => ['testrole1', 'testrole2']})
-    should contain_mongodb_user('testuser')\
-      .with_roles(["testrole1", "testrole2"])
-  end
-
-  it 'should prefer password_hash instead of password' do
-    params.merge!({'password_hash' => 'securehash'})
-    should contain_mongodb_user('testuser')\
-      .with_password_hash('securehash')
-  end
-
-  it 'should contain mongodb_database with proper tries param' do
-    params.merge!({'tries' => 5})
-    should contain_mongodb_database('testdb').with_tries(5)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb
deleted file mode 100755
index c1c09a9b74e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = []
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-    on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d'
-  else
-    install_puppet
-    on hosts, 'mkdir -p /etc/facter/facts.d'
-    on hosts, '/bin/touch /etc/puppet/hiera.yaml'
-  end
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    puppet_module_install(:source => proj_root, :module_name => 'mongodb')
-    on hosts, 'puppet module install puppetlabs-stdlib'
-    on hosts, 'puppet module install puppetlabs-apt'
-    case fact('osfamily')
-    when 'RedHat'
-      on hosts, 'puppet module install stahnma-epel'
-      apply_manifest_on hosts, 'include epel'
-    end
-    on hosts, 'service iptables stop'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb
deleted file mode 100644
index 7e2c48fb5e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-
-include RSpecSystemPuppet::Helpers
-include Serverspec::Helper::RSpecSystem
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  c.include RSpecSystemPuppet::Helpers
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'mongodb')
-    shell('puppet module install puppetlabs-stdlib')
-    shell('puppet module install puppetlabs-apt')
-
-    case node.facts['osfamily']
-    when 'RedHat'
-      shell('puppet module install stahnma-epel')
-      puppet_apply('include epel')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb
deleted file mode 100644
index 5b0b825e565..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/mongodb_password_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe 'the mongodb_password function' do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it 'should exist' do
-    Puppet::Parser::Functions.function('mongodb_password').should == 'function_mongodb_password'
-  end
-
-  it 'should raise a ParseError if there no arguments' do
-    lambda { scope.function_mongodb_password([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should raise a ParseError if there is more than 2 arguments' do
-    lambda { scope.function_mongodb_password(%w(foo bar baz)) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should convert password into a hash' do
-    result = scope.function_mongodb_password(%w(user pass))
-    result.should(eq('e0c4a7b97d4db31f5014e9694e567d6b'))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb
deleted file mode 100644
index 4376ada54b9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_database/mongodb_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mongodb_database).provider(:mongodb) do
-
-  let(:resource) { Puppet::Type.type(:mongodb_database).new(
-    { :ensure   => :present,
-      :name     => 'new_database',
-      :provider => described_class.name
-    }
-  )}
-
-  let(:provider) { resource.provider }
-
-  describe 'create' do
-    it 'makes a database' do
-      provider.expects(:mongo)
-      provider.create
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a database' do
-      provider.expects(:mongo)
-      provider.destroy
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if database exists' do
-      provider.expects(:mongo).at_least(2).returns("db1,new_database,db2")
-      provider.exists?.should be_true
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb
deleted file mode 100644
index 51b3f9effe2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_replset/mongodb_spec.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# Authors: Emilien Macchi <emilien.macchi@enovance.com>
-#          Francois Charlier <francois.charlier@enovance.com>
-#
-
-require 'spec_helper'
-
-describe Puppet::Type.type(:mongodb_replset).provider(:mongo) do
-
-  valid_members = ['mongo1:27017', 'mongo2:27017', 'mongo3:27017']
-
-  let(:resource) { Puppet::Type.type(:mongodb_replset).new(
-    { :ensure        => :present,
-      :name          => 'rs_test',
-      :members       => valid_members,
-      :provider      => :mongo
-    }
-  )}
-
-  let(:resources) { { 'rs_test' => resource } }
-  let(:provider) { described_class.new(resource) }
-
-  describe '#create' do
-    it 'should create a replicaset' do
-      provider.class.stubs(:get_replset_properties)
-      provider.stubs(:alive_members).returns(valid_members)
-      provider.expects('rs_initiate').with("{ _id: \"rs_test\", members: [ { _id: 0, host: \"mongo1:27017\" },{ _id: 1, host: \"mongo2:27017\" },{ _id: 2, host: \"mongo3:27017\" } ] }", "mongo1:27017").returns(
-        { "info" => "Config now saved locally.  Should come online in about a minute.",
-          "ok"   => 1 } )
-      provider.create
-      provider.flush
-    end
-  end
-
-  describe '#exists?' do
-    describe 'when the replicaset does not exist' do
-      it 'returns false' do
-        provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"startupStatus" : 3,
-	"info" : "run rs.initiate(...) if not yet done for the set",
-	"ok" : 0,
-	"errmsg" : "can't get local.system.replset config from self or any seed (EMPTYCONFIG)"
-}
-EOT
-        provider.class.prefetch(resources)
-        resource.provider.exists?.should be_false
-      end
-    end
-
-    describe 'when the replicaset exists' do
-      it 'returns true' do
-        provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"_id" : "rs_test",
-	"version" : 1,
-	"members" : [ ]
-}
-EOT
-        provider.class.prefetch(resources)
-        resource.provider.exists?.should be_true
-      end
-    end
-  end
-
-  describe '#members' do
-    it 'returns the members of a configured replicaset' do
-      provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"_id" : "rs_test",
-	"version" : 1,
-	"members" : [
-		{
-			"_id" : 0,
-			"host" : "mongo1:27017"
-		},
-		{
-			"_id" : 1,
-			"host" : "mongo2:27017"
-		},
-		{
-			"_id" : 2,
-			"host" : "mongo3:27017"
-		}
-	]
-}
-EOT
-      provider.class.prefetch(resources)
-      resource.provider.members.should =~ valid_members
-    end
-  end
-
-  describe 'members=' do
-    before :each do
-      provider.class.stubs(:mongo).returns(<<EOT)
-{
-	"setName" : "rs_test",
-	"ismaster" : true,
-	"secondary" : false,
-	"hosts" : [
-		"mongo1:27017"
-	],
-	"primary" : "mongo1:27017",
-	"me" : "mongo1:27017",
-	"maxBsonObjectSize" : 16777216,
-	"maxMessageSizeBytes" : 48000000,
-	"localTime" : ISODate("2014-01-10T19:31:51.281Z"),
-	"ok" : 1
-}
-EOT
-    end
-
-    it 'adds missing members to an existing replicaset' do
-      provider.stubs(:rs_status).returns({ "set" => "rs_test" })
-      provider.expects('rs_add').times(2).returns({ 'ok' => 1 })
-      provider.members=(valid_members)
-      provider.flush
-    end
-
-    it 'raises an error when the master host is not available' do
-      provider.stubs(:rs_status).returns({ "set" => "rs_test" })
-      provider.stubs(:db_ismaster).returns({ "primary" => false })
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, "Can't find master host for replicaset #{resource[:name]}.")
-    end
-
-    it 'raises an error when at least one member is not running with --replSet' do
-      provider.stubs(:rs_status).returns({ "ok" => 0, "errmsg" => "not running with --replSet" })
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, /is not supposed to be part of a replicaset\.$/)
-    end
-
-    it 'raises an error when at least one member is configured with another replicaset name' do
-      provider.stubs(:rs_status).returns({ "set" => "rs_another" })
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, /is already part of another replicaset\.$/)
-    end
-
-    it 'raises an error when no member is available' do
-      provider.class.stubs(:mongo_command).raises(Puppet::ExecutionFailure, <<EOT)
-Fri Jan 10 20:20:33.995 Error: couldn't connect to server localhost:9999 at src/mongo/shell/mongo.js:147
-exception: connect failed
-EOT
-      provider.members=(valid_members)
-      expect { provider.flush }.to raise_error(Puppet::Error, "Can't connect to any member of replicaset #{resource[:name]}.")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb
deleted file mode 100644
index 997b6cae6cd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/provider/mongodb_user/mongodb_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mongodb_user).provider(:mongodb) do
-
-  let(:resource) { Puppet::Type.type(:mongodb_user).new(
-    { :ensure        => :present,
-      :name          => 'new_user',
-      :database      => 'new_database',
-      :password_hash => 'pass',
-      :roles         => ['role1', 'role2'],
-      :provider      => described_class.name
-    }
-  )}
-
-  let(:provider) { resource.provider }
-
-  describe 'create' do
-    it 'creates a user' do
-      provider.expects(:mongo)
-      provider.create
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user' do
-      provider.expects(:mongo)
-      provider.destroy
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      provider.expects(:mongo).at_least(2).returns("1")
-      provider.exists?.should be_true
-    end
-  end
-
-  describe 'password_hash' do
-    it 'returns a password_hash' do
-      provider.expects(:mongo).returns("pass\n")
-      provider.password_hash.should == "pass"
-    end
-  end
-
-  describe 'password_hash=' do
-    it 'changes a password_hash' do
-      provider.expects(:mongo)
-      provider.password_hash=("newpass")
-    end
-  end
-
-  describe 'roles' do
-    it 'returns a sorted roles' do
-      provider.expects(:mongo).returns("role2,role1\n")
-      provider.roles.should == ['role1','role2']
-    end
-  end
-
-  describe 'roles=' do
-    it 'changes a roles' do
-      provider.expects(:mongo)
-      provider.roles=(['role3','role4'])
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb
deleted file mode 100644
index 245a1becf1f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_database_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'puppet'
-require 'puppet/type/mongodb_database'
-describe Puppet::Type.type(:mongodb_database) do
-
-  before :each do
-    @db = Puppet::Type.type(:mongodb_database).new(:name => 'test')
-  end
-
-  it 'should accept a database name' do
-    @db[:name].should == 'test'
-  end
-
-  it 'should accept a tries parameter' do
-    @db[:tries] = 5
-    @db[:tries].should == 5
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mongodb_database).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb
deleted file mode 100644
index f9b72d42361..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_replset_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Author: Emilien Macchi <emilien.macchi@enovance.com>
-#
-
-require 'puppet'
-require 'puppet/type/mongodb_replset'
-describe Puppet::Type.type(:mongodb_replset) do
-
-  before :each do
-    @replset = Puppet::Type.type(:mongodb_replset).new(:name => 'test')
-  end
-
-  it 'should accept a replica set name' do
-    @replset[:name].should == 'test'
-  end
-
-  it 'should accept a members array' do
-    @replset[:members] = ['mongo1:27017', 'mongo2:27017']
-    @replset[:members].should == ['mongo1:27017', 'mongo2:27017']
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mongodb_replset).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb
deleted file mode 100644
index c822265d11d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/spec/unit/puppet/type/mongodb_user_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'puppet'
-require 'puppet/type/mongodb_user'
-describe Puppet::Type.type(:mongodb_user) do
-
-  before :each do
-    @user = Puppet::Type.type(:mongodb_user).new(
-              :name => 'test',
-              :database => 'testdb',
-              :password_hash => 'pass')
-  end
-
-  it 'should accept a user name' do
-    @user[:name].should == 'test'
-  end
-
-  it 'should accept a database name' do
-    @user[:database].should == 'testdb'
-  end
-
-  it 'should accept a tries parameter' do
-    @user[:tries] = 5
-    @user[:tries].should == 5
-  end
-
-  it 'should accept a password' do
-    @user[:password_hash] = 'foo'
-    @user[:password_hash].should == 'foo'
-  end
-
-  it 'should use default role' do
-    @user[:roles].should == ['dbAdmin']
-  end
-
-  it 'should accept a roles array' do
-    @user[:roles] = ['role1', 'role2']
-    @user[:roles].should == ['role1', 'role2']
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mongodb_user).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-  it 'should require a database' do
-    expect {
-      Puppet::Type.type(:mongodb_user).new({:name => 'test', :password_hash => 'pass'})
-    }.to raise_error(Puppet::Error, 'Parameter \'database\' must be set')
-  end
-
-  it 'should require a password_hash' do
-    expect {
-      Puppet::Type.type(:mongodb_user).new({:name => 'test', :database => 'testdb'})
-    }.to raise_error(Puppet::Error, 'Property \'password_hash\' must be set. Use mongodb_password() for creating hash.')
-  end
-
-  it 'should sort roles' do
-    # Reinitialize type with explicit unsorted roles.
-    @user = Puppet::Type.type(:mongodb_user).new(
-              :name => 'test',
-              :database => 'testdb',
-              :password_hash => 'pass',
-              :roles => ['b', 'a'])
-    @user[:roles].should == ['a', 'b']
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb
deleted file mode 100644
index 85d81054bb3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/templates/mongodb.conf.erb
+++ /dev/null
@@ -1,172 +0,0 @@
-# mongo.conf - generated from Puppet
-
-
-<% if @logpath -%>
-#where to log
-logpath=<%= @logpath %>
-<% if @logappend -%>
-logappend=<%= @logappend %>
-<% end -%>
-<% end -%>
-<% if @bind_ip -%>
-# Set this option to configure the mongod or mongos process to bind to and
-# listen for connections from applications on this address.
-# You may concatenate a list of comma separated values to bind mongod to multiple IP addresses.
-bind_ip = <%= Array(@bind_ip).join(',') %>
-<% end -%>
-<% if @fork -%>
-# fork and run in background
-fork=<%= @fork %>
-<% end -%>
-port = <%= @port %>
-dbpath=<%= @dbpath %>
-<% if @pidfilepath -%>
-# location of pidfile
-pidfilepath = <%= @pidfilepath %>
-<% end -%>
-<% if @nojournal and not @journal -%>
-# Disables write-ahead journaling
-nojournal = <%= @nojournal %>
-<% end -%>
-<% if @journal and not @nojournal -%>
-# Enables journaling
-journal = <%= @journal %>
-<% end -%>
-<% if @cpu -%>
-# Enables periodic logging of CPU utilization and I/O wait
-cpu = <%= @cpu %>
-<% end -%>
-# Turn on/off security.  Off is currently the default
-<% if @noauth and not @auth -%>
-noauth=<%= @noauth %>
-<% end -%>
-<% if @auth and not @noauth -%>
-auth=<%= @auth %>
-<% end -%>
-<% if @verbose -%>
-# Verbose logging output.
-verbose = <%= @verbose %>
-<% end -%>
-<% if @verbositylevel -%>
-<%= @verbositylevel -%> = true
-<% end -%>
-<% if @objcheck -%>
-# Inspect all client data for validity on receipt (useful for
-# developing drivers)
-objcheck = <%= @objcheck %>
-<% end -%>
-<% if @maxconns -%>
-maxConns = <%= @maxconns %>
-<% end -%>
-<% if @quota -%>
-# Enable db quota management
-quota = <%= @quota %>
-<% if @quotafiles -%>
-quotaFiles = <%= @quotafiles %>
-<% end -%>
-<% end -%>
-<% if @diaglog -%>
-# Set oplogging level where n is
-#   0=off (default)
-#   1=W
-#   2=R
-#   3=both
-#   7=W+some reads
-diaglog  = <%= @diaglog %>
-<% end -%>
-<% if @oplog_size -%>
-# Specifies a maximum size in megabytes for the replication operation log
-oplogSize = <%= @oplog_size %>
-<% end -%>
-<% if @nohints -%>
-# Ignore query hints
-nohints = <%= @nohints %>
-<% end -%>
-<% if @nohttpinterface -%>
-# Disable the HTTP interface (Defaults to localhost:27018).
-nohttpinterface = <%= @nohttpinterface %>
-<% end -%>
-<% if @noscripting -%>
-# Turns off server-side scripting.  This will result in greatly limited
-# functionality
-noscripting = <%= @noscripting %>
-<% end -%>
-<% if @notablescan -%>
-# Turns off table scans.  Any query that would do a table scan fails.
-notablescan = <%= @notablescan %>
-<% end -%>
-<% if @noprealloc -%>
-# Disable data file preallocation.
-noprealloc = <%= @noprealloc %>
-<% end -%>
-<% if @nssize -%>
-# Specify .ns file size for new databases in megabytes.
-nssize = <%= @nssize %>
-<% end -%>
-<% if @mms_token -%>
-# Accout token for Mongo monitoring server.
-mms-token = <%= @mms_token %>
-<% end -%>
-<% if @mms_name -%>
-# Server name for Mongo monitoring server.
-mms-name = <%= @mms_name %>
-<% end -%>
-<% if @mms_interval -%>
-# Ping interval for Mongo monitoring server.
-mms-interval = <%= @mms_interval %>
-<% end -%>
-<% if @slave -%>
-slave = <%= @slave %>
-<% end -%>
-<% if @source -%>
-source = <%= @source %>
-<% end -%>
-<% if @only -%>
-# Slave only: specify a single database to replicate
-only = <%= @only %>
-<% end -%>
-<% if @master -%>
-master = <%= @master %>
-<% end -%>
-<% if @directoryperdb -%>
-# Alters the storage pattern of the data directory to store each database
-# files in a distinct folder.
-directoryperdb = <%= @directoryperdb %>
-<% end -%>
-<% if @replset -%>
-# Configure ReplicaSet membership
-replSet = <%= @replset %>
-<% end -%>
-<% if @smallfiles -%>
-# Use a smaller default data file size.
-smallfiles = <%= @smallfiles %>
-<% end -%>
-<% if @rest -%>
-# Enable rest API (disabled by default)
-rest = <%= @rest %>
-<% end -%>
-<% if @profile -%>
-# Modify this value to changes the level of database profiling, which inserts
-# information about operation performance into output of mongod or the log file.
-#0 = Off. No profiling. default
-#1 = On. Only includes slow operations.
-#2 = On. Includes all operations.
-profile = <%= @profile %>
-<% end -%>
-<% if @slowms -%>
-# Sets the threshold in milliseconds for mongod to consider a query slow for the profiler.
-slowms = <%= @slowms %>
-<% end -%>
-<% if @keyfile -%>
-# Specify the path to a key file to store authentication information.
-keyFile = <%= @keyfile %>
-<% end -%>
-<% if @directoryperdb -%>
-directoryperdb = <%= @directoryperdb %>
-<% end -%>
-<% if @set_parameter -%>
-setParameter = <%= @set_parameter %>
-<% end -%>
-<% if @syslog -%>
-syslog = <%= @syslog %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/globals.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/globals.pp
deleted file mode 100644
index 8166214bb7c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/globals.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class { 'mongodb::globals':
-  manage_package_repo => true
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/init.pp
deleted file mode 100644
index aac044ee0d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { '::mongodb': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/replicaset.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/replicaset.pp
deleted file mode 100644
index a758b8dd266..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/replicaset.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-node default {
-  class { '::mongodb::globals':
-    manage_package_repo => true
-  } ->
-  class { '::mongodb::server':
-    smallfiles => true,
-    bind_ip    => ['0.0.0.0'],
-    replset    => 'rsmain'
-  }
-}
-
-node /mongo1/ inherits default {
-  mongodb_replset{'rsmain':
-    members => ['mongo1:27017', 'mongo2:27017', 'mongo3:27017']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/server.pp
deleted file mode 100644
index 95106ebc989..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mongodb/tests/server.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-class { 'mongodb::globals': manage_package_repo => true }->
-class { 'mongodb::server': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.fixtures.yml
deleted file mode 100644
index 5631e2a2312..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib"
-  symlinks:
-    "mysql": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.travis.yml
deleted file mode 100644
index 42aea591808..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-    - PUPPET_GEM_VERSION="~> 3.4.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: |-
-        Hc9OPm/kRTmjXSP3TbLir/y6Yy1LqmZS8zrqxdTbpo3Z04EYv1uKhaFDpECl
-        0a6bJRUWpLWIuDco08fHMeCTWoFGzE97EDelhHKSYiTNllzYKWPHy7ki/al6
-        wjz0gLtiDfmktHQOHatBy6EKLFjoyjGoE4cUUta4Ixq4tMBNzEA=
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/CHANGELOG.md
deleted file mode 100644
index 8349998f3fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/CHANGELOG.md
+++ /dev/null
@@ -1,476 +0,0 @@
-##2014-03-04 - Supported Release 2.2.3
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-* No known bugs
-
-##2014-03-04 - Supported Release 2.2.2
-###Summary
-This is a supported release. Mostly comprised of enhanced testing, plus a
-bugfix for Suse.
-
-####Bugfixes
-- PHP bindings on Suse
-- Test fixes
-
-####Known Bugs
-* No known bugs
-
-##2014-02-19 - Version 2.2.1
-
-###Summary
-
-Minor release that repairs mysql_database{} so that it sees the correct
-collation settings (it was only checking the global mysql ones, not the
-actual database and constantly setting it over and over since January 22nd).
-
-Also fixes a bunch of tests on various platforms.
-
-
-##2014-02-13 - Version 2.2.0
-
-###Summary
-
-####Features
-- Add `backupdirmode`, `backupdirowner`, `backupdirgroup` to
-  mysql::server::backup to allow customizing the mysqlbackupdir.
-- Support multiple options of the same name, allowing you to
-  do 'replicate-do-db' => ['base1', 'base2', 'base3'] in order to get three
-  lines of replicate-do-db = base1, replicate-do-db = base2 etc.
-
-####Bugfixes
-- Fix `restart` so it actually stops mysql restarting if set to false.
-- DRY out the defaults_file functionality in the providers.
-- mysql_grant fixed to work with root@localhost/@.
-- mysql_grant fixed for WITH MAX_QUERIES_PER_HOUR
-- mysql_grant fixed so revoking all privileges accounts for GRANT OPTION
-- mysql_grant fixed to remove duplicate privileges.
-- mysql_grant fixed to handle PROCEDURES when removing privileges.
-- mysql_database won't try to create existing databases, breaking replication.
-- bind_address renamed bind-address in 'mysqld' options.
-- key_buffer renamed to key_buffer_size.
-- log_error renamed to log-error.
-- pid_file renamed to pid-file.
-- Ensure mysql::server:root_password runs before mysql::server::backup
-- Fix options_override -> override_options in the README.
-- Extensively rewrite the README to be accurate and awesome.
-- Move to requiring stdlib 3.2.0, shipped in PE3.0
-- Add many new tests.
-
-
-##2013-11-13 - Version 2.1.0
-
-###Summary
-
-The most important changes in 2.1.0 are improvements to the my.cnf creation,
-as well as providers.  Setting options to = true strips them to be just the
-key name itself, which is required for some options.
-
-The provider updates fix a number of bugs, from lowercase privileges to
-deprecation warnings.
-
-Last, the new hiera integration functionality should make it easier to
-externalize all your grants, users, and, databases.  Another great set of
-community submissions helped to make this release.
-
-####Features
-- Some options can not take a argument. Gets rid of the '= true' when an
-option is set to true.
-- Easier hiera integration:  Add hash parameters to mysql::server to allow
-specifying grants, users, and databases.
-
-####Bugfixes
-- Fix an issue with lowercase privileges in mysql_grant{} causing them to be reapplied needlessly.
-- Changed defaults-file to defaults-extra-file in providers.
-- Ensure /root/.my.cnf is 0600 and root owned.
-- database_user deprecation warning was incorrect.
-- Add anchor pattern for client.pp
-- Documentation improvements.
-- Various test fixes.
-
-
-##2013-10-21 - Version 2.0.1
-
-###Summary
-
-This is a bugfix release to handle an issue where unsorted mysql_grant{}
-privileges could cause Puppet to incorrectly reapply the permissions on
-each run.
-
-####Bugfixes
-- Mysql_grant now sorts privileges in the type and provider for comparison.
-- Comment and test tweak for PE3.1.
-
-
-##2013-10-14 - Version 2.0.0
-
-###Summary
-
-(Previously detailed in the changelog for 2.0.0-rc1)
-
-This module has been completely refactored and works significantly different.
-The changes are broad and touch almost every piece of the module.
-
-See the README.md for full details of all changes and syntax.
-Please remain on 1.0.0 if you don't have time to fully test this in dev.
-
-* mysql::server, mysql::client, and mysql::bindings are the primary interface
-classes.
-* mysql::server takes an `override_options` parameter to set my.cnf options,
-with the hash format: { 'section' => { 'thing' => 'value' }}
-* mysql attempts backwards compatibility by forwarding all parameters to
-mysql::server.
-
-
-##2013-10-09 - Version 2.0.0-rc5
-
-###Summary
-
-Hopefully the final rc!  Further fixes to mysql_grant (stripping out the
-cleverness so we match a much wider range of input.)
-
-####Bugfixes
-- Make mysql_grant accept '.*'@'.*' in terms of input for user@host.
-
-
-##2013-10-09 - Version 2.0.0-rc4
-
-###Summary
-
-Bugfixes to mysql_grant and mysql_user form the bulk of this rc, as well as
-ensuring that values in the override_options hash that contain a value of ''
-are created as just "key" in the conf rather than "key =" or "key = false".
-
-####Bugfixes
-- Improve mysql_grant to work with IPv6 addresses (both long and short).
-- Ensure @host users work as well as user@host users.
-- Updated my.cnf template to support items with no values.
-
-
-##2013-10-07 - Version 2.0.0-rc3
-
-###Summary
-Fix mysql::server::monitor's use of mysql_user{}.
-
-####Bugfixes
-- Fix myql::server::monitor's use of mysql_user{} to grant the proper
-permissions.  Add specs as well.  (Thanks to treydock!)
-
-
-##2013-10-03 - Version 2.0.0-rc2
-
-###Summary
-Bugfixes
-
-####Bugfixes
-- Fix a duplicate parameter in mysql::server
-
-
-##2013-10-03 - Version 2.0.0-rc1
-
-###Summary
-
-This module has been completely refactored and works significantly different.
-The changes are broad and touch almost every piece of the module.
-
-See the README.md for full details of all changes and syntax.
-Please remain on 1.0.0 if you don't have time to fully test this in dev.
-
-* mysql::server, mysql::client, and mysql::bindings are the primary interface
-classes.
-* mysql::server takes an `override_options` parameter to set my.cnf options,
-with the hash format: { 'section' => { 'thing' => 'value' }}
-* mysql attempts backwards compatibility by forwarding all parameters to
-mysql::server.
-
----
-##2013-09-23 - Version 1.0.0
-
-###Summary
-
-This release introduces a number of new type/providers, to eventually
-replace the database_ ones.  The module has been converted to call the
-new providers rather than the previous ones as they have a number of
-fixes, additional options, and work with puppet resource.
-
-This 1.0.0 release precedes a large refactoring that will be released
-almost immediately after as 2.0.0.
-
-####Features
-- Added mysql_grant, mysql_database, and mysql_user.
-- Add `mysql::bindings` class and refactor all other bindings to be contained underneath mysql::bindings:: namespace.
-- Added support to back up specified databases only with 'mysqlbackup' parameter.
-- Add option to mysql::backup to set the backup script to perform a mysqldump on each database to its own file
-
-####Bugfixes
-- Update my.cnf.pass.erb to allow custom socket support
-- Add environment variable for .my.cnf in mysql::db.
-- Add HOME environment variable for .my.cnf to mysqladmin command when
-(re)setting root password
-
----
-##2013-07-15 - Version 0.9.0
-####Features
-- Add `mysql::backup::backuprotate` parameter
-- Add `mysql::backup::delete_before_dump` parameter
-- Add `max_user_connections` attribute to `database_user` type
-
-####Bugfixes
-- Add client package dependency for `mysql::db`
-- Remove duplicate `expire_logs_days` and `max_binlog_size` settings
-- Make root's `.my.cnf` file path dynamic
-- Update pidfile path for Suse variants
-- Fixes for lint
-
-##2013-07-05 - Version 0.8.1
-####Bugfixes
- - Fix a typo in the Fedora 19 support.
-
-##2013-07-01 - Version 0.8.0
-####Features
- - mysql::perl class to install perl-DBD-mysql.
- - minor improvements to the providers to improve reliability
- - Install the MariaDB packages on Fedora 19 instead of MySQL.
- - Add new `mysql` class parameters:
-   -  `max_connections`: The maximum number of allowed connections.
-   -  `manage_config_file`: Opt out of puppetized control of my.cnf.
-   -  `ft_min_word_len`: Fine tune the full text search.
-   -  `ft_max_word_len`: Fine tune the full text search.
- - Add new `mysql` class performance tuning parameters:
-   -  `key_buffer`
-   -  `thread_stack`
-   -  `thread_cache_size`
-   -  `myisam-recover`
-   -  `query_cache_limit`
-   -  `query_cache_size`
-   -  `max_connections`
-   -  `tmp_table_size`
-   -  `table_open_cache`
-   -  `long_query_time`
- - Add new `mysql` class replication parameters:
-   -  `server_id`
-   -  `sql_log_bin`
-   -  `log_bin`
-   -  `max_binlog_size`
-   -  `binlog_do_db`
-   -  `expire_logs_days`
-   -  `log_bin_trust_function_creators`
-   -  `replicate_ignore_table`
-   -  `replicate_wild_do_table`
-   -  `replicate_wild_ignore_table`
-   -  `expire_logs_days`
-   -  `max_binlog_size`
-
-####Bugfixes
- - No longer restart MySQL when /root/.my.cnf changes.
- - Ensure mysql::config runs before any mysql::db defines.
-
-##2013-06-26 - Version 0.7.1
-####Bugfixes
-- Single-quote password for special characters
-- Update travis testing for puppet 3.2.x and missing Bundler gems
-
-##2013-06-25 - Version 0.7.0
-This is a maintenance release for community bugfixes and exposing
-configuration variables.
-
-* Add new `mysql` class parameters:
-  -  `basedir`: The base directory mysql uses
-  -  `bind_address`: The IP mysql binds to
-  -  `client_package_name`: The name of the mysql client package
-  -  `config_file`: The location of the server config file
-  -  `config_template`: The template to use to generate my.cnf
-  -  `datadir`: The directory MySQL's datafiles are stored
-  -  `default_engine`: The default engine to use for tables
-  -  `etc_root_password`: Whether or not to add the mysql root password to
- /etc/my.cnf
-  -  `java_package_name`: The name of the java package containing the java
- connector
-  -  `log_error`: Where to log errors
-  -  `manage_service`: Boolean dictating if mysql::server should manage the
- service
-  -  `max_allowed_packet`: Maximum network packet size mysqld will accept
-  -  `old_root_password`: Previous root user password
-  -  `php_package_name`: The name of the phpmysql package to install
-  -  `pidfile`: The location mysql will expect the pidfile to be
-  -  `port`: The port mysql listens on
-  -  `purge_conf_dir`: Value fed to recurse and purge parameters of the
- /etc/mysql/conf.d resource
-  -  `python_package_name`: The name of the python mysql package to install
-  -  `restart`: Whether to restart mysqld
-  -  `root_group`: Use specified group for root-owned files
-  -  `root_password`: The root MySQL password to use
-  -  `ruby_package_name`: The name of the ruby mysql package to install
-  -  `ruby_package_provider`: The installation suite to use when installing the
- ruby package
-  -  `server_package_name`: The name of the server package to install
-  -  `service_name`: The name of the service to start
-  -  `service_provider`: The name of the service provider
-  -  `socket`: The location of the MySQL server socket file
-  -  `ssl_ca`: The location of the SSL CA Cert
-  -  `ssl_cert`: The location of the SSL Certificate to use
-  -  `ssl_key`: The SSL key to use
-  -  `ssl`: Whether or not to enable ssl
-  -  `tmpdir`: The directory MySQL's tmpfiles are stored
-* Deprecate `mysql::package_name` parameter in favor of
-`mysql::client_package_name`
-* Fix local variable template deprecation
-* Fix dependency ordering in `mysql::db`
-* Fix ANSI quoting in queries
-* Fix travis support (but still messy)
-* Fix typos
-
-##2013-01-11 - Version 0.6.1
-* Fix providers when /root/.my.cnf is absent
-
-##2013-01-09 - Version 0.6.0
-* Add `mysql::server::config` define for specific config directives
-* Add `mysql::php` class for php support
-* Add `backupcompress` parameter to `mysql::backup`
-* Add `restart` parameter to `mysql::config`
-* Add `purge_conf_dir` parameter to `mysql::config`
-* Add `manage_service` parameter to `mysql::server`
-* Add syslog logging support via the `log_error` parameter
-* Add initial SuSE support
-* Fix remove non-localhost root user when fqdn != hostname
-* Fix dependency in `mysql::server::monitor`
-* Fix .my.cnf path for root user and root password
-* Fix ipv6 support for users
-* Fix / update various spec tests
-* Fix typos
-* Fix lint warnings
-
-##2012-08-23 - Version 0.5.0
-* Add puppetlabs/stdlib as requirement
-* Add validation for mysql privs in provider
-* Add `pidfile` parameter to mysql::config
-* Add `ensure` parameter to mysql::db
-* Add Amazon linux support
-* Change `bind_address` parameter to be optional in my.cnf template
-* Fix quoting root passwords
-
-##2012-07-24 - Version 0.4.0
-* Fix various bugs regarding database names
-* FreeBSD support
-* Allow specifying the storage engine
-* Add a backup class
-* Add a security class to purge default accounts
-
-##2012-05-03 - Version 0.3.0
-* 14218 Query the database for available privileges
-* Add mysql::java class for java connector installation
-* Use correct error log location on different distros
-* Fix set_mysql_rootpw to properly depend on my.cnf
-
-##2012-04-11 - Version 0.2.0
-
-##2012-03-19 - William Van Hevelingen <blkperl@cat.pdx.edu>
-* (#13203) Add ssl support (f7e0ea5)
-
-##2012-03-18 - Nan Liu <nan@puppetlabs.com>
-* Travis ci before script needs success exit code. (0ea463b)
-
-##2012-03-18 - Nan Liu <nan@puppetlabs.com>
-* Fix Puppet 2.6 compilation issues. (9ebbbc4)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Add travis.ci for testing multiple puppet versions. (33c72ef)
-
-##2012-03-15 - William Van Hevelingen <blkperl@cat.pdx.edu>
-* (#13163) Datadir should be configurable (f353fc6)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Document create_resources dependency. (558a59c)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Fix spec test issues related to error message. (eff79b5)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* Fix mysql service on Ubuntu. (72da2c5)
-
-##2012-03-16 - Dan Bode <dan@puppetlabs.com>
-* Add more spec test coverage (55e399d)
-
-##2012-03-16 - Nan Liu <nan@puppetlabs.com>
-* (#11963) Fix spec test due to path changes. (1700349)
-
-##2012-03-07 - François Charlier <fcharlier@ploup.net>
-* Add a test to check path for 'mysqld-restart' (b14c7d1)
-
-##2012-03-07 - François Charlier <fcharlier@ploup.net>
-* Fix path for 'mysqld-restart' (1a9ae6b)
-
-##2012-03-15 - Dan Bode <dan@puppetlabs.com>
-* Add rspec-puppet tests for mysql::config (907331a)
-
-##2012-03-15 - Dan Bode <dan@puppetlabs.com>
-* Moved class dependency between sever and config to server (da62ad6)
-
-##2012-03-14 - Dan Bode <dan@puppetlabs.com>
-* Notify mysql restart from set_mysql_rootpw exec (0832a2c)
-
-##2012-03-15 - Nan Liu <nan@puppetlabs.com>
-* Add documentation related to osfamily fact. (8265d28)
-
-##2012-03-14 - Dan Bode <dan@puppetlabs.com>
-* Mention osfamily value in failure message (e472d3b)
-
-##2012-03-14 - Dan Bode <dan@puppetlabs.com>
-* Fix bug when querying for all database users (015490c)
-
-##2012-02-09 - Nan Liu <nan@puppetlabs.com>
-* Major refactor of mysql module. (b1f90fd)
-
-##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
-* Ruby and Python's MySQL libraries are named differently on different distros. (1e926b4)
-
-##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
-* Per @ghoneycutt, we should fail explicitly and explain why. (09af083)
-
-##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
-* Removing duplicate declaration (7513d03)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Use socket value from params class instead of hardcoding. (663e97c)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Instead of hardcoding the config file target, pull it from mysql::params (031a47d)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Moved $socket to within the case to toggle between distros.  Added a $config_file variable to allow per-distro config file destinations. (360eacd)
-
-##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
-* Pretty sure this is a bug, 99% of Linux distros out there won't ever hit the default. (3462e6b)
-
-##2012-02-09 - William Van Hevelingen <blkperl@cat.pdx.edu>
-* Changed the README to use markdown (3b7dfeb)
-
-##2012-02-04 - Daniel Black <grooverdan@users.sourceforge.net>
-* (#12412) mysqltuner.pl update (b809e6f)
-
-##2011-11-17 - Matthias Pigulla <mp@webfactory.de>
-* (#11363) Add two missing privileges to grant: event_priv, trigger_priv (d15c9d1)
-
-##2011-12-20 - Jeff McCune <jeff@puppetlabs.com>
-* (minor) Fixup typos in Modulefile metadata (a0ed6a1)
-
-##2011-12-19 - Carl Caum <carl@carlcaum.com>
-* Only notify Exec to import sql if sql is given (0783c74)
-
-##2011-12-19 - Carl Caum <carl@carlcaum.com>
-* (#11508) Only load sql_scripts on DB creation (e3b9fd9)
-
-##2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
-* Require not needed due to implicit dependencies (3058feb)
-
-##2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
-* Bug #11375: puppetlabs-mysql fails on CentOS/RHEL (a557b8d)
-
-##2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1
-* initial commit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Gemfile
deleted file mode 100644
index 39687be0319..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Gemfile
+++ /dev/null
@@ -1,25 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-group :development, :test do
-  gem 'mime-types', '<2.0',      :require => false
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'rspec-system',            :require => false
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/LICENSE
deleted file mode 100644
index 297f85cfa86..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!) The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Modulefile
deleted file mode 100644
index e89be88ecb3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name 'puppetlabs-mysql'
-version '2.2.3'
-source 'git://github.com/puppetlabs/puppetlabs-mysql.git'
-author 'Puppet Labs'
-license 'Apache 2.0'
-summary 'Mysql module'
-description 'Mysql module'
-project_page 'http://github.com/puppetlabs/puppetlabs-mysql'
-dependency 'puppetlabs/stdlib', '>= 3.2.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/README.md
deleted file mode 100644
index 03b6bbd369b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/README.md
+++ /dev/null
@@ -1,523 +0,0 @@
-#MySQL
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with mysql](#setup)
-    * [What mysql affects](#what-mysql-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with mysql](#beginning-with-mysql)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-The mysql module installs, configures, and manages the MySQL service.
-
-##Module Description
-
-The mysql module manages both the installation and configuration of MySQL as
-well as extends Puppet to allow management of MySQL resources, such as
-databases, users, and grants.
-
-##Backwards Compatibility
-
-This module has just undergone a very large rewrite.  Some new classes have been added, and many previous classes and configurations work differently than before.  We've attempted to handle backwards compatibility automatically by adding a
-`attempt_compatibility_mode` parameter to the main mysql class.  If you set
-this to 'true' it will attempt to map your previous parameters into the new
-`mysql::server` class.
-
-#####WARNING
-
-Compatibility mode may fail. It may eat your MySQL server. PLEASE test it before running it live, even if the test is just a no-op and manual comparison. Please be careful!
-
-##Setup
-
-###What MySQL affects
-
-* MySQL package
-* MySQL configuration files
-* MySQL service
-
-###Beginning with MySQL
-
-If you just want a server installed with the default options you can run
-`include '::mysql::server'`.  
-
-If you need to customize options, such as the root
-password or `/etc/my.cnf` settings, then you must also pass in an override hash:
-
-```puppet
-class { '::mysql::server':
-  root_password    => 'strongpassword',
-  override_options => { 'mysqld' => { 'max_connections' => '1024' } }
-}
-```
-
-##Usage
-
-All interaction for the server is done via `mysql::server`.  To install the
-client you use `mysql::client`, and to install bindings you can use
-`mysql::bindings`.
-
-###Overrides
-
-The hash structure for overrides in `mysql::server` is as follows:
-
-```puppet
-$override_options = {
-  'section' => {
-    'item'             => 'thing',
-  }
-}
-```
-
-For items that you would traditionally represent as:
-
-<pre>
-[section]
-thing = X
-</pre>
-
-You can just make an entry like `thing => true`, `thing => value`, or `thing => "` in the hash. You can also pass an array `thing => ['value', 'value2']` or even list each `thing => value` separately on separate lines. MySQL doesn't care if 'thing' is alone or set to a value; it'll happily accept both.  To keep an option out of the my.cnf file, e.g. when using override_options to revert to a default value, you can pass thing => undef.
-If an option needs multiple instances, you can pass an array. For example
-
-```puppet
-$override_options = {
-  'mysqld' => {
-    'replicate-do-db' => ['base1', 'base2'],
-  }
-}
-```
-
-will produce
-
-<pre>
-[mysql]
-replicate-do-db = base1
-replicate-do-db = base2
-</pre>
-
-###Custom configuration
-
-To add custom MySQL configuration, drop additional files into
-`/etc/mysql/conf.d/`. Dropping files into conf.d allows you to override settings or add additional ones, which is helpful if you choose not to use `override_options` in `mysql::server`. The conf.d location is hardcoded into the my.cnf template file.
-
-##Reference
-
-###Classes
-
-####Public classes
-* `mysql::server`: Installs and configures MySQL.
-* `mysql::server::account_security`: Deletes default MySQL accounts.
-* `mysql::server::monitor`: Sets up a monitoring user.
-* `mysql::server::mysqltuner`: Installs MySQL tuner script.
-* `mysql::server::backup`: Sets up MySQL backups via cron.
-* `mysql::bindings`: Installs various MySQL language bindings.
-* `mysql::client`: Installs MySQL client (for non-servers).
-
-####Private classes
-* `mysql::server::install`: Installs packages.
-* `mysql::server::config`: Configures MYSQL.
-* `mysql::server::service`: Manages service.
-* `mysql::server::root_password`: Sets MySQL root password.
-* `mysql::server::providers`: Creates users, grants, and databases.
-* `mysql::bindings::java`: Installs Java bindings.
-* `mysql::bindings::perl`: Installs Perl bindings.
-* `mysql::bindings::python`: Installs Python bindings.
-* `mysql::bindings::ruby`: Installs Ruby bindings.
-* `mysql::client::install`:  Installs MySQL client.
-
-###Parameters
-
-####mysql::server
-
-#####`root_password`
-
-The MySQL root password.  Puppet will attempt to set the root password and update `/root/.my.cnf` with it.
-
-#####`old_root_password`
-
-The previous root password (**REQUIRED** if you wish to change the root password via Puppet.)
-
-#####`override_options`
-
-The hash of override options to pass into MySQL.  It can be structured
-like a hash in the my.cnf file, so entries look like
-
-```puppet
-$override_options = {
-  'section' => {
-    'item'             => 'thing',
-  }
-}
-```
-
-For items that you would traditionally represent as:
-
-<pre>
-[section]
-thing = X
-</pre>
-
-You can just make an entry like `thing => true`, `thing => value`, or `thing => "` in the hash. You can also pass an array `thing => ['value', 'value2']` or even list each `thing => value` separately on separate lines. MySQL doesn't care if 'thing' is alone or set to a value; it'll happily accept both.  To keep an option out of the my.cnf file, e.g. when using override_options to revert to a default value, you can pass thing => undef.
-
-#####`config_file`
-
-The location of the MySQL configuration file.
-
-#####`manage_config_file`
-
-Whether the MySQL configuration file should be managed.
-
-#####`purge_conf_dir`
-
-Whether the conf.d directory should be purged.
-
-#####`restart`
-
-Whether the service should be restarted when things change.
-
-#####`root_group`
-
-What is the group used for root?
-
-#####`package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`package_name`
-
-The name of the mysql server package to install.
-
-#####`remove_default_accounts`
-
-Boolean to decide if we should automatically include
-`mysql::server::account_security`.
-
-#####`service_enabled`
-
-Boolean to decide if the service should be enabled.
-
-#####`service_manage`
-
-Boolean to decide if the service should be managed.
-
-#####`service_name`
-
-The name of the mysql server service.
-
-#####`service_provider`
-
-The provider to use to manage the service.
-
-#####`users`
-
-Optional hash of users to create, which are passed to [mysql_user](#mysql_user). 
-
-```puppet
-$users = {
-  'someuser@localhost' => {
-    ensure                   => 'present',
-    max_connections_per_hour => '0',
-    max_queries_per_hour     => '0',
-    max_updates_per_hour     => '0',
-    max_user_connections     => '0',
-    password_hash            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF',
-  },
-}
-```
-
-#####`grants`
-
-Optional hash of grants, which are passed to [mysql_grant](#mysql_grant). 
-
-```puppet
-$grants = {
-  'someuser@localhost/somedb.*' => {
-    ensure     => 'present',
-    options    => ['GRANT'],
-    privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'],
-    table      => 'somedb.*',
-    user       => 'someuser@localhost',
-  },
-}
-```
-
-#####`databases`
-
-Optional hash of databases to create, which are passed to [mysql_database](#mysql_database).
-
-```puppet
-$databases = {
-  'somedb' => {
-    ensure  => 'present',
-    charset => 'utf8',
-  },
-}
-```
-
-####mysql::server::backup
-
-#####`backupuser`
-
-MySQL user to create for backups.
-
-#####`backuppassword`
-
-MySQL user password for backups.
-
-#####`backupdir`
-
-Directory to back up into.
-
-#####`backupdirmode`
-
-Permissions applied to the backup directory. This parameter is passed directly
-to the `file` resource.
-
-#####`backupdirowner`
-
-Owner for the backup directory. This parameter is passed directly to the `file`
-resource.
-
-#####`backupdirgroup`
-
-Group owner for the backup directory. This parameter is passed directly to the
-`file` resource.
-
-#####`backupcompress`
-
-Boolean to determine if backups should be compressed.
-
-#####`backuprotate`
-
-How many days to keep backups for.
-
-#####`delete_before_dump`
-
-Boolean to determine if you should cleanup before backing up or after.
-
-#####`backupdatabases`
-
-Array of databases to specifically back up.
-
-#####`file_per_database`
-
-Whether a separate file be used per database.
-
-#####`ensure`
-
-Allows you to remove the backup scripts. Can be 'present' or 'absent'.
-
-#####`time`
-
-An array of two elements to set the backup time.  Allows ['23', '5'] or ['3', '45'] for HH:MM times.
-
-#####`postscript`
-
-A script that is executed at when the backup is finished. This could be used to (r)sync the backup to a central store. This script can be either a single line that is directly executed or a number of lines, when supplied as an array. It could also be one or more externally managed (executable) files.
-
-####mysql::server::monitor
-
-#####`mysql_monitor_username`
-
-The username to create for MySQL monitoring.
-
-#####`mysql_monitor_password`
-
-The password to create for MySQL monitoring.
-
-#####`mysql_monitor_hostname`
-
-The hostname to allow to access the MySQL monitoring user.
-
-####mysql::bindings
-
-#####`java_enable`
-
-Boolean to decide if the Java bindings should be installed.
-
-#####`perl_enable`
-
-Boolean to decide if the Perl bindings should be installed.
-
-#####`php_enable`
-
-Boolean to decide if the PHP bindings should be installed.
-
-#####`python_enable`
-
-Boolean to decide if the Python bindings should be installed.
-
-#####`ruby_enable`
-
-Boolean to decide if the Ruby bindings should be installed.
-
-#####`java_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`java_package_name`
-
-The name of the package to install.
-
-#####`java_package_provider`
-
-What provider should be used to install the package.
-
-#####`perl_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`perl_package_name`
-
-The name of the package to install.
-
-#####`perl_package_provider`
-
-What provider should be used to install the package.
-
-#####`python_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`python_package_name`
-
-The name of the package to install.
-
-#####`python_package_provider`
-
-What provider should be used to install the package.
-
-#####`ruby_package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`ruby_package_name`
-
-The name of the package to install.
-
-#####`ruby_package_provider`
-
-What provider should be used to install the package.
-
-####mysql::client
-
-#####`bindings_enable`
-
-Boolean to automatically install all bindings.
-
-#####`package_ensure`
-
-What to set the package to.  Can be 'present', 'absent', or 'x.y.z'.
-
-#####`package_name`
-
-What is the name of the mysql client package to install.
-
-###Defines
-
-####mysql::db
-
-Creates a database with a user and assigns some privileges.
-
-```puppet
-    mysql::db { 'mydb':
-      user     => 'myuser',
-      password => 'mypass',
-      host     => 'localhost',
-      grant    => ['SELECT', 'UPDATE'],
-    }
-```
-
-###Providers
-
-####mysql_database
-
-`mysql_database` can be used to create and manage databases within MySQL.
-
-```puppet
-mysql_database { 'information_schema':
-  ensure  => 'present',
-  charset => 'utf8',
-  collate => 'utf8_swedish_ci',
-}
-mysql_database { 'mysql':
-  ensure  => 'present',
-  charset => 'latin1',
-  collate => 'latin1_swedish_ci',
-}
-```
-
-####mysql_user
-
-`mysql_user` can be used to create and manage user grants within MySQL.
-
-```puppet
-mysql_user { 'root@127.0.0.1':
-  ensure                   => 'present',
-  max_connections_per_hour => '0',
-  max_queries_per_hour     => '0',
-  max_updates_per_hour     => '0',
-  max_user_connections     => '0',
-}
-```
-
-####mysql_grant
-
-`mysql_grant` can be used to create grant permissions to access databases within
-MySQL.  To use it you must create the title of the resource as shown below,
-following the pattern of `username@hostname/database.table`:
-
-```puppet
-mysql_grant { 'root@localhost/*.*':
-  ensure     => 'present',
-  options    => ['GRANT'],
-  privileges => ['ALL'],
-  table      => '*.*',
-  user       => 'root@localhost',
-}
-```
-
-##Limitations
-
-This module has been tested on:
-
-* RedHat Enterprise Linux 5/6
-* Debian 6/7
-* CentOS 5/6
-* Ubuntu 12.04
-
-Testing on other platforms has been light and cannot be guaranteed.
-
-#Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Authors
-
-This module is based on work by David Schmitt. The following contributors have contributed patches to this module (beyond Puppet Labs):
-
-* Larry Ludwig
-* Christian G. Warden
-* Daniel Black
-* Justin Ellison
-* Lowe Schmidt
-* Matthias Pigulla
-* William Van Hevelingen
-* Michael Arnold
-* Chris Weyl
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Rakefile
deleted file mode 100644
index bb60173e570..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/Rakefile
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'rspec-system/rake_task'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/TODO b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/TODO
deleted file mode 100644
index 39132939307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-The best that I can tell is that this code traces back to David Schmitt. It has been forked many times since then :)
-
-1. you cannot add databases to an instance that has a root password
-2. you have to specify username as USER@BLAH or it cannot be found
-3. mysql_grant does not complain if user does not exist
-4. Needs support for pre-seeding on debian
-5. the types may need to take user/password
-6. rather or not to configure /etc/.my.cnf should be configurable
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/files/mysqltuner.pl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/files/mysqltuner.pl
deleted file mode 100644
index 46cdb7f42f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/files/mysqltuner.pl
+++ /dev/null
@@ -1,966 +0,0 @@
-#!/usr/bin/perl -w
-# mysqltuner.pl - Version 1.2.0
-# High Performance MySQL Tuning Script
-# Copyright (C) 2006-2011 Major Hayden - major@mhtx.net
-#
-# For the latest updates, please visit http://mysqltuner.com/
-# Git repository available at http://github.com/rackerhacker/MySQLTuner-perl
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-# This project would not be possible without help from:
-#   Matthew Montgomery     Paul Kehrer          Dave Burgess
-#   Jonathan Hinds         Mike Jackson         Nils Breunese
-#   Shawn Ashlee           Luuk Vosslamber      Ville Skytta
-#   Trent Hornibrook       Jason Gill           Mark Imbriaco
-#   Greg Eden              Aubin Galinotti      Giovanni Bechis
-#   Bill Bradford          Ryan Novosielski     Michael Scheidell
-#   Blair Christensen      Hans du Plooy        Victor Trac
-#   Everett Barnes         Tom Krouper          Gary Barrueto
-#   Simon Greenaway        Adam Stein           Isart Montane
-#   Baptiste M.
-#
-# Inspired by Matthew Montgomery's tuning-primer.sh script:
-# http://forge.mysql.com/projects/view.php?id=44
-#
-use strict;
-use warnings;
-use diagnostics;
-use File::Spec;
-use Getopt::Long;
-
-# Set up a few variables for use in the script
-my $tunerversion = "1.2.0";
-my (@adjvars, @generalrec);
-
-# Set defaults
-my %opt = (
-		"nobad" 		=> 0,
-		"nogood" 		=> 0,
-		"noinfo" 		=> 0,
-		"nocolor" 		=> 0,
-		"forcemem" 		=> 0,
-		"forceswap" 	=> 0,
-		"host" 			=> 0,
-		"socket" 		=> 0,
-		"port" 			=> 0,
-		"user" 			=> 0,
-		"pass"			=> 0,
-		"skipsize" 		=> 0,
-		"checkversion" 	=> 0,
-	);
-
-# Gather the options from the command line
-GetOptions(\%opt,
-		'nobad',
-		'nogood',
-		'noinfo',
-		'nocolor',
-		'forcemem=i',
-		'forceswap=i',
-		'host=s',
-		'socket=s',
-		'port=i',
-		'user=s',
-		'pass=s',
-		'skipsize',
-		'checkversion',
-		'help',
-	);
-
-if (defined $opt{'help'} && $opt{'help'} == 1) { usage(); }
-
-sub usage {
-	# Shown with --help option passed
-	print "\n".
-		"   MySQLTuner $tunerversion - MySQL High Performance Tuning Script\n".
-		"   Bug reports, feature requests, and downloads at http://mysqltuner.com/\n".
-		"   Maintained by Major Hayden (major\@mhtx.net) - Licensed under GPL\n".
-		"\n".
-		"   Important Usage Guidelines:\n".
-		"      To run the script with the default options, run the script without arguments\n".
-		"      Allow MySQL server to run for at least 24-48 hours before trusting suggestions\n".
-		"      Some routines may require root level privileges (script will provide warnings)\n".
-		"      You must provide the remote server's total memory when connecting to other servers\n".
-		"\n".
-		"   Connection and Authentication\n".
-		"      --host <hostname>    Connect to a remote host to perform tests (default: localhost)\n".
-		"      --socket <socket>    Use a different socket for a local connection\n".
-		"      --port <port>        Port to use for connection (default: 3306)\n".
-		"      --user <username>    Username to use for authentication\n".
-		"      --pass <password>    Password to use for authentication\n".
-		"\n".
-		"   Performance and Reporting Options\n".
-		"      --skipsize           Don't enumerate tables and their types/sizes (default: on)\n".
-		"                             (Recommended for servers with many tables)\n".
-		"      --checkversion       Check for updates to MySQLTuner (default: don't check)\n".
-		"      --forcemem <size>    Amount of RAM installed in megabytes\n".
-		"      --forceswap <size>   Amount of swap memory configured in megabytes\n".
-		"\n".
-		"   Output Options:\n".
-		"      --nogood             Remove OK responses\n".
-		"      --nobad              Remove negative/suggestion responses\n".
-		"      --noinfo             Remove informational responses\n".
-		"      --nocolor            Don't print output in color\n".
-		"\n";
-	exit;
-}
-
-my $devnull = File::Spec->devnull();
-
-# Setting up the colors for the print styles
-my $good = ($opt{nocolor} == 0)? "[\e[0;32mOK\e[0m]" : "[OK]" ;
-my $bad = ($opt{nocolor} == 0)? "[\e[0;31m!!\e[0m]" : "[!!]" ;
-my $info = ($opt{nocolor} == 0)? "[\e[0;34m--\e[0m]" : "[--]" ;
-
-# Functions that handle the print styles
-sub goodprint { print $good." ".$_[0] unless ($opt{nogood} == 1); }
-sub infoprint { print $info." ".$_[0] unless ($opt{noinfo} == 1); }
-sub badprint { print $bad." ".$_[0] unless ($opt{nobad} == 1); }
-sub redwrap { return ($opt{nocolor} == 0)? "\e[0;31m".$_[0]."\e[0m" : $_[0] ; }
-sub greenwrap { return ($opt{nocolor} == 0)? "\e[0;32m".$_[0]."\e[0m" : $_[0] ; }
-
-# Calculates the parameter passed in bytes, and then rounds it to one decimal place
-sub hr_bytes {
-	my $num = shift;
-	if ($num >= (1024**3)) { #GB
-		return sprintf("%.1f",($num/(1024**3)))."G";
-	} elsif ($num >= (1024**2)) { #MB
-		return sprintf("%.1f",($num/(1024**2)))."M";
-	} elsif ($num >= 1024) { #KB
-		return sprintf("%.1f",($num/1024))."K";
-	} else {
-		return $num."B";
-	}
-}
-
-# Calculates the parameter passed in bytes, and then rounds it to the nearest integer
-sub hr_bytes_rnd {
-	my $num = shift;
-	if ($num >= (1024**3)) { #GB
-		return int(($num/(1024**3)))."G";
-	} elsif ($num >= (1024**2)) { #MB
-		return int(($num/(1024**2)))."M";
-	} elsif ($num >= 1024) { #KB
-		return int(($num/1024))."K";
-	} else {
-		return $num."B";
-	}
-}
-
-# Calculates the parameter passed to the nearest power of 1000, then rounds it to the nearest integer
-sub hr_num {
-	my $num = shift;
-	if ($num >= (1000**3)) { # Billions
-		return int(($num/(1000**3)))."B";
-	} elsif ($num >= (1000**2)) { # Millions
-		return int(($num/(1000**2)))."M";
-	} elsif ($num >= 1000) { # Thousands
-		return int(($num/1000))."K";
-	} else {
-		return $num;
-	}
-}
-
-# Calculates uptime to display in a more attractive form
-sub pretty_uptime {
-	my $uptime = shift;
-	my $seconds = $uptime % 60;
-	my $minutes = int(($uptime % 3600) / 60);
-	my $hours = int(($uptime % 86400) / (3600));
-	my $days = int($uptime / (86400));
-	my $uptimestring;
-	if ($days > 0) {
-		$uptimestring = "${days}d ${hours}h ${minutes}m ${seconds}s";
-	} elsif ($hours > 0) {
-		$uptimestring = "${hours}h ${minutes}m ${seconds}s";
-	} elsif ($minutes > 0) {
-		$uptimestring = "${minutes}m ${seconds}s";
-	} else {
-		$uptimestring = "${seconds}s";
-	}
-	return $uptimestring;
-}
-
-# Retrieves the memory installed on this machine
-my ($physical_memory,$swap_memory,$duflags);
-sub os_setup {
-	sub memerror {
-		badprint "Unable to determine total memory/swap; use '--forcemem' and '--forceswap'\n";
-		exit;
-	}
-	my $os = `uname`;
-	$duflags = ($os =~ /Linux/) ? '-b' : '';
-	if ($opt{'forcemem'} > 0) {
-		$physical_memory = $opt{'forcemem'} * 1048576;
-		infoprint "Assuming $opt{'forcemem'} MB of physical memory\n";
-		if ($opt{'forceswap'} > 0) {
-			$swap_memory = $opt{'forceswap'} * 1048576;
-			infoprint "Assuming $opt{'forceswap'} MB of swap space\n";
-		} else {
-			$swap_memory = 0;
-			badprint "Assuming 0 MB of swap space (use --forceswap to specify)\n";
-		}
-	} else {
-		if ($os =~ /Linux/) {
-			$physical_memory = `free -b | grep Mem | awk '{print \$2}'` or memerror;
-			$swap_memory = `free -b | grep Swap | awk '{print \$2}'` or memerror;
-		} elsif ($os =~ /Darwin/) {
-			$physical_memory = `sysctl -n hw.memsize` or memerror;
-			$swap_memory = `sysctl -n vm.swapusage | awk '{print \$3}' | sed 's/\..*\$//'` or memerror;
-		} elsif ($os =~ /NetBSD|OpenBSD/) {
-			$physical_memory = `sysctl -n hw.physmem` or memerror;
-			if ($physical_memory < 0) {
-				$physical_memory = `sysctl -n hw.physmem64` or memerror;
-			}
-			$swap_memory = `swapctl -l | grep '^/' | awk '{ s+= \$2 } END { print s }'` or memerror;
-		} elsif ($os =~ /BSD/) {
-			$physical_memory = `sysctl -n hw.realmem`;
-			$swap_memory = `swapinfo | grep '^/' | awk '{ s+= \$2 } END { print s }'`;
-		} elsif ($os =~ /SunOS/) {
-			$physical_memory = `/usr/sbin/prtconf | grep Memory | cut -f 3 -d ' '` or memerror;
-			chomp($physical_memory);
-			$physical_memory = $physical_memory*1024*1024;
-		} elsif ($os =~ /AIX/) {
-			$physical_memory = `lsattr -El sys0 | grep realmem | awk '{print \$2}'` or memerror;
-			chomp($physical_memory);
-			$physical_memory = $physical_memory*1024;
-			$swap_memory = `lsps -as | awk -F"(MB| +)" '/MB /{print \$2}'` or memerror;
-			chomp($swap_memory);
-			$swap_memory = $swap_memory*1024*1024;
-		}
-	}
-	chomp($physical_memory);
-}
-
-# Checks to see if a MySQL login is possible
-my ($mysqllogin,$doremote,$remotestring);
-sub mysql_setup {
-	$doremote = 0;
-	$remotestring = '';
-	my $command = `which mysqladmin`;
-	chomp($command);
-	if (! -e $command) {
-		badprint "Unable to find mysqladmin in your \$PATH.  Is MySQL installed?\n";
-		exit;
-	}
-	# Are we being asked to connect via a socket?
-	if ($opt{socket} ne 0) {
-		$remotestring = " -S $opt{socket}";
-	}
-	# Are we being asked to connect to a remote server?
-	if ($opt{host} ne 0) {
-		chomp($opt{host});
-		$opt{port} = ($opt{port} eq 0)? 3306 : $opt{port} ;
-		# If we're doing a remote connection, but forcemem wasn't specified, we need to exit
-		if ($opt{'forcemem'} eq 0) {
-			badprint "The --forcemem option is required for remote connections\n";
-			exit;
-		}
-		infoprint "Performing tests on $opt{host}:$opt{port}\n";
-		$remotestring = " -h $opt{host} -P $opt{port}";
-		$doremote = 1;
-	}
-	# Did we already get a username and password passed on the command line?
-	if ($opt{user} ne 0 and $opt{pass} ne 0) {
-		$mysqllogin = "-u $opt{user} -p'$opt{pass}'".$remotestring;
-		my $loginstatus = `mysqladmin ping $mysqllogin 2>&1`;
-		if ($loginstatus =~ /mysqld is alive/) {
-			goodprint "Logged in using credentials passed on the command line\n";
-			return 1;
-		} else {
-			badprint "Attempted to use login credentials, but they were invalid\n";
-			exit 0;
-		}
-	}
-	if ( -r "/etc/psa/.psa.shadow" and $doremote == 0 ) {
-		# It's a Plesk box, use the available credentials
-		$mysqllogin = "-u admin -p`cat /etc/psa/.psa.shadow`";
-		my $loginstatus = `mysqladmin ping $mysqllogin 2>&1`;
-		unless ($loginstatus =~ /mysqld is alive/) {
-			badprint "Attempted to use login credentials from Plesk, but they failed.\n";
-			exit 0;
-		}
-	} elsif ( -r "/etc/mysql/debian.cnf" and $doremote == 0 ){
-		# We have a debian maintenance account, use it
-		$mysqllogin = "--defaults-extra-file=/etc/mysql/debian.cnf";
-		my $loginstatus = `mysqladmin $mysqllogin ping 2>&1`;
-		if ($loginstatus =~ /mysqld is alive/) {
-			goodprint "Logged in using credentials from debian maintenance account.\n";
-			return 1;
-		} else {
-			badprint "Attempted to use login credentials from debian maintenance account, but they failed.\n";
-			exit 0;
-		}
-	} else {
-		# It's not Plesk or debian, we should try a login
-		my $loginstatus = `mysqladmin $remotestring ping 2>&1`;
-		if ($loginstatus =~ /mysqld is alive/) {
-			# Login went just fine
-			$mysqllogin = " $remotestring ";
-			# Did this go well because of a .my.cnf file or is there no password set?
-			my $userpath = `printenv HOME`;
-			if (length($userpath) > 0) {
-				chomp($userpath);
-			}
-			unless ( -e "${userpath}/.my.cnf" ) {
-				badprint "Successfully authenticated with no password - SECURITY RISK!\n";
-			}
-			return 1;
-		} else {
-			print STDERR "Please enter your MySQL administrative login: ";
-			my $name = <>;
-			print STDERR "Please enter your MySQL administrative password: ";
-			system("stty -echo >$devnull 2>&1");
-			my $password = <>;
-			system("stty echo >$devnull 2>&1");
-			chomp($password);
-			chomp($name);
-			$mysqllogin = "-u $name";
-			if (length($password) > 0) {
-				$mysqllogin .= " -p'$password'";
-			}
-			$mysqllogin .= $remotestring;
-			my $loginstatus = `mysqladmin ping $mysqllogin 2>&1`;
-			if ($loginstatus =~ /mysqld is alive/) {
-				print STDERR "\n";
-				if (! length($password)) {
-					# Did this go well because of a .my.cnf file or is there no password set?
-					my $userpath = `ls -d ~`;
-					chomp($userpath);
-					unless ( -e "$userpath/.my.cnf" ) {
-						badprint "Successfully authenticated with no password - SECURITY RISK!\n";
-					}
-				}
-				return 1;
-			} else {
-				print "\n".$bad." Attempted to use login credentials, but they were invalid.\n";
-				exit 0;
-			}
-			exit 0;
-		}
-	}
-}
-
-# Populates all of the variable and status hashes
-my (%mystat,%myvar,$dummyselect);
-sub get_all_vars {
-	# We need to initiate at least one query so that our data is useable
-	$dummyselect = `mysql $mysqllogin -Bse "SELECT VERSION();"`;
-	my @mysqlvarlist = `mysql $mysqllogin -Bse "SHOW /*!50000 GLOBAL */ VARIABLES;"`;
-	foreach my $line (@mysqlvarlist) {
-		$line =~ /([a-zA-Z_]*)\s*(.*)/;
-		$myvar{$1} = $2;
-	}
-	my @mysqlstatlist = `mysql $mysqllogin -Bse "SHOW /*!50000 GLOBAL */ STATUS;"`;
-	foreach my $line (@mysqlstatlist) {
-		$line =~ /([a-zA-Z_]*)\s*(.*)/;
-		$mystat{$1} = $2;
-	}
-	# Workaround for MySQL bug #59393 wrt. ignore-builtin-innodb
-	if (($myvar{'ignore_builtin_innodb'} || "") eq "ON") {
-		$myvar{'have_innodb'} = "NO";
-	}
-	# have_* for engines is deprecated and will be removed in MySQL 5.6;
-	# check SHOW ENGINES and set corresponding old style variables.
-	# Also works around MySQL bug #59393 wrt. skip-innodb
-	my @mysqlenginelist = `mysql $mysqllogin -Bse "SHOW ENGINES;" 2>$devnull`;
-	foreach my $line (@mysqlenginelist) {
-		if ($line =~ /^([a-zA-Z_]+)\s+(\S+)/) {
-			my $engine = lc($1);
-			if ($engine eq "federated" || $engine eq "blackhole") {
-				$engine .= "_engine";
-			} elsif ($engine eq "berkeleydb") {
-				$engine = "bdb";
-			}
-			my $val = ($2 eq "DEFAULT") ? "YES" : $2;
-			$myvar{"have_$engine"} = $val;
-		}
-	}
-}
-
-sub security_recommendations {
-	print "\n-------- Security Recommendations  -------------------------------------------\n";
-	my @mysqlstatlist = `mysql $mysqllogin -Bse "SELECT CONCAT(user, '\@', host) FROM mysql.user WHERE password = '' OR password IS NULL;"`;
-	if (@mysqlstatlist) {
-		foreach my $line (sort @mysqlstatlist) {
-			chomp($line);
-			badprint "User '".$line."' has no password set.\n";
-		}
-	} else {
-		goodprint "All database users have passwords assigned\n";
-	}
-}
-
-sub get_replication_status {
-	my $slave_status = `mysql $mysqllogin -Bse "show slave status\\G"`;
-	my ($io_running) = ($slave_status =~ /slave_io_running\S*\s+(\S+)/i);
-	my ($sql_running) = ($slave_status =~ /slave_sql_running\S*\s+(\S+)/i);
-	if ($io_running eq 'Yes' && $sql_running eq 'Yes') {
-		if ($myvar{'read_only'} eq 'OFF') {
-			badprint "This replication slave is running with the read_only option disabled.";
-		} else {
-			goodprint "This replication slave is running with the read_only option enabled.";
-		}
-	}
-}
-
-# Checks for updates to MySQLTuner
-sub validate_tuner_version {
-	print "\n-------- General Statistics --------------------------------------------------\n";
-	if ($opt{checkversion} eq 0) {
-		infoprint "Skipped version check for MySQLTuner script\n";
-		return;
-	}
-	my $update;
-	my $url = "http://mysqltuner.com/versioncheck.php?v=$tunerversion";
-	if (-e "/usr/bin/curl") {
-		$update = `/usr/bin/curl --connect-timeout 5 '$url' 2>$devnull`;
-		chomp($update);
-	} elsif (-e "/usr/bin/wget") {
-		$update = `/usr/bin/wget -e timestamping=off -T 5 -O - '$url' 2>$devnull`;
-		chomp($update);
-	}
-	if ($update eq 1) {
-		badprint "There is a new version of MySQLTuner available\n";
-	} elsif ($update eq 0) {
-		goodprint "You have the latest version of MySQLTuner\n";
-	} else {
-		infoprint "Unable to check for the latest MySQLTuner version\n";
-	}
-}
-
-# Checks for supported or EOL'ed MySQL versions
-my ($mysqlvermajor,$mysqlverminor);
-sub validate_mysql_version {
-	($mysqlvermajor,$mysqlverminor) = $myvar{'version'} =~ /(\d)\.(\d)/;
-	if (!mysql_version_ge(5)) {
-		badprint "Your MySQL version ".$myvar{'version'}." is EOL software!  Upgrade soon!\n";
-	} elsif (mysql_version_ge(6)) {
-		badprint "Currently running unsupported MySQL version ".$myvar{'version'}."\n";
-	} else {
-		goodprint "Currently running supported MySQL version ".$myvar{'version'}."\n";
-	}
-}
-
-# Checks if MySQL version is greater than equal to (major, minor)
-sub mysql_version_ge {
-	my ($maj, $min) = @_;
-	return $mysqlvermajor > $maj || ($mysqlvermajor == $maj && $mysqlverminor >= ($min || 0));
-}
-
-# Checks for 32-bit boxes with more than 2GB of RAM
-my ($arch);
-sub check_architecture {
-	if ($doremote eq 1) { return; }
-	if (`uname` =~ /SunOS/ && `isainfo -b` =~ /64/) {
-		$arch = 64;
-		goodprint "Operating on 64-bit architecture\n";
-	} elsif (`uname` !~ /SunOS/ && `uname -m` =~ /64/) {
-		$arch = 64;
-		goodprint "Operating on 64-bit architecture\n";
-	} elsif (`uname` =~ /AIX/ && `bootinfo -K` =~ /64/) {
-		$arch = 64;
-		goodprint "Operating on 64-bit architecture\n";
-	} else {
-		$arch = 32;
-		if ($physical_memory > 2147483648) {
-			badprint "Switch to 64-bit OS - MySQL cannot currently use all of your RAM\n";
-		} else {
-			goodprint "Operating on 32-bit architecture with less than 2GB RAM\n";
-		}
-	}
-}
-
-# Start up a ton of storage engine counts/statistics
-my (%enginestats,%enginecount,$fragtables);
-sub check_storage_engines {
-	if ($opt{skipsize} eq 1) {
-		print "\n-------- Storage Engine Statistics -------------------------------------------\n";
-		infoprint "Skipped due to --skipsize option\n";
-		return;
-	}
-	print "\n-------- Storage Engine Statistics -------------------------------------------\n";
-	infoprint "Status: ";
-	my $engines;
-	$engines .= (defined $myvar{'have_archive'} && $myvar{'have_archive'} eq "YES")? greenwrap "+Archive " : redwrap "-Archive " ;
-	$engines .= (defined $myvar{'have_bdb'} && $myvar{'have_bdb'} eq "YES")? greenwrap "+BDB " : redwrap "-BDB " ;
-	$engines .= (defined $myvar{'have_federated_engine'} && $myvar{'have_federated_engine'} eq "YES")? greenwrap "+Federated " : redwrap "-Federated " ;
-	$engines .= (defined $myvar{'have_innodb'} && $myvar{'have_innodb'} eq "YES")? greenwrap "+InnoDB " : redwrap "-InnoDB " ;
-	$engines .= (defined $myvar{'have_isam'} && $myvar{'have_isam'} eq "YES")? greenwrap "+ISAM " : redwrap "-ISAM " ;
-	$engines .= (defined $myvar{'have_ndbcluster'} && $myvar{'have_ndbcluster'} eq "YES")? greenwrap "+NDBCluster " : redwrap "-NDBCluster " ;
-	print "$engines\n";
-	if (mysql_version_ge(5)) {
-		# MySQL 5 servers can have table sizes calculated quickly from information schema
-		my @templist = `mysql $mysqllogin -Bse "SELECT ENGINE,SUM(DATA_LENGTH),COUNT(ENGINE) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','mysql') AND ENGINE IS NOT NULL GROUP BY ENGINE ORDER BY ENGINE ASC;"`;
-		foreach my $line (@templist) {
-			my ($engine,$size,$count);
-			($engine,$size,$count) = $line =~ /([a-zA-Z_]*)\s+(\d+)\s+(\d+)/;
-			if (!defined($size)) { next; }
-			$enginestats{$engine} = $size;
-			$enginecount{$engine} = $count;
-		}
-		$fragtables = `mysql $mysqllogin -Bse "SELECT COUNT(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema','mysql') AND Data_free > 0 AND NOT ENGINE='MEMORY';"`;
-		chomp($fragtables);
-	} else {
-		# MySQL < 5 servers take a lot of work to get table sizes
-		my @tblist;
-		# Now we build a database list, and loop through it to get storage engine stats for tables
-		my @dblist = `mysql $mysqllogin -Bse "SHOW DATABASES"`;
-		foreach my $db (@dblist) {
-			chomp($db);
-			if ($db eq "information_schema") { next; }
-			my @ixs = (1, 6, 9);
-			if (!mysql_version_ge(4, 1)) {
-				# MySQL 3.23/4.0 keeps Data_Length in the 5th (0-based) column
-				@ixs = (1, 5, 8);
-			}
-			push(@tblist, map { [ (split)[@ixs] ] } `mysql $mysqllogin -Bse "SHOW TABLE STATUS FROM \\\`$db\\\`"`);
-		}
-		# Parse through the table list to generate storage engine counts/statistics
-		$fragtables = 0;
-		foreach my $tbl (@tblist) {
-			my ($engine, $size, $datafree) = @$tbl;
-			if (defined $enginestats{$engine}) {
-				$enginestats{$engine} += $size;
-				$enginecount{$engine} += 1;
-			} else {
-				$enginestats{$engine} = $size;
-				$enginecount{$engine} = 1;
-			}
-			if ($datafree > 0) {
-				$fragtables++;
-			}
-		}
-	}
-	while (my ($engine,$size) = each(%enginestats)) {
-		infoprint "Data in $engine tables: ".hr_bytes_rnd($size)." (Tables: ".$enginecount{$engine}.")"."\n";
-	}
-	# If the storage engine isn't being used, recommend it to be disabled
-	if (!defined $enginestats{'InnoDB'} && defined $myvar{'have_innodb'} && $myvar{'have_innodb'} eq "YES") {
-		badprint "InnoDB is enabled but isn't being used\n";
-		push(@generalrec,"Add skip-innodb to MySQL configuration to disable InnoDB");
-	}
-	if (!defined $enginestats{'BerkeleyDB'} && defined $myvar{'have_bdb'} && $myvar{'have_bdb'} eq "YES") {
-		badprint "BDB is enabled but isn't being used\n";
-		push(@generalrec,"Add skip-bdb to MySQL configuration to disable BDB");
-	}
-	if (!defined $enginestats{'ISAM'} && defined $myvar{'have_isam'} && $myvar{'have_isam'} eq "YES") {
-		badprint "ISAM is enabled but isn't being used\n";
-		push(@generalrec,"Add skip-isam to MySQL configuration to disable ISAM (MySQL > 4.1.0)");
-	}
-	# Fragmented tables
-	if ($fragtables > 0) {
-		badprint "Total fragmented tables: $fragtables\n";
-		push(@generalrec,"Run OPTIMIZE TABLE to defragment tables for better performance");
-	} else {
-		goodprint "Total fragmented tables: $fragtables\n";
-	}
-}
-
-my %mycalc;
-sub calculations {
-	if ($mystat{'Questions'} < 1) {
-		badprint "Your server has not answered any queries - cannot continue...";
-		exit 0;
-	}
-	# Per-thread memory
-	if (mysql_version_ge(4)) {
-		$mycalc{'per_thread_buffers'} = $myvar{'read_buffer_size'} + $myvar{'read_rnd_buffer_size'} + $myvar{'sort_buffer_size'} + $myvar{'thread_stack'} + $myvar{'join_buffer_size'};
-	} else {
-		$mycalc{'per_thread_buffers'} = $myvar{'record_buffer'} + $myvar{'record_rnd_buffer'} + $myvar{'sort_buffer'} + $myvar{'thread_stack'} + $myvar{'join_buffer_size'};
-	}
-	$mycalc{'total_per_thread_buffers'} = $mycalc{'per_thread_buffers'} * $myvar{'max_connections'};
-	$mycalc{'max_total_per_thread_buffers'} = $mycalc{'per_thread_buffers'} * $mystat{'Max_used_connections'};
-
-	# Server-wide memory
-	$mycalc{'max_tmp_table_size'} = ($myvar{'tmp_table_size'} > $myvar{'max_heap_table_size'}) ? $myvar{'max_heap_table_size'} : $myvar{'tmp_table_size'} ;
-	$mycalc{'server_buffers'} = $myvar{'key_buffer_size'} + $mycalc{'max_tmp_table_size'};
-	$mycalc{'server_buffers'} += (defined $myvar{'innodb_buffer_pool_size'}) ? $myvar{'innodb_buffer_pool_size'} : 0 ;
-	$mycalc{'server_buffers'} += (defined $myvar{'innodb_additional_mem_pool_size'}) ? $myvar{'innodb_additional_mem_pool_size'} : 0 ;
-	$mycalc{'server_buffers'} += (defined $myvar{'innodb_log_buffer_size'}) ? $myvar{'innodb_log_buffer_size'} : 0 ;
-	$mycalc{'server_buffers'} += (defined $myvar{'query_cache_size'}) ? $myvar{'query_cache_size'} : 0 ;
-
-	# Global memory
-	$mycalc{'max_used_memory'} = $mycalc{'server_buffers'} + $mycalc{"max_total_per_thread_buffers"};
-	$mycalc{'total_possible_used_memory'} = $mycalc{'server_buffers'} + $mycalc{'total_per_thread_buffers'};
-	$mycalc{'pct_physical_memory'} = int(($mycalc{'total_possible_used_memory'} * 100) / $physical_memory);
-
-	# Slow queries
-	$mycalc{'pct_slow_queries'} = int(($mystat{'Slow_queries'}/$mystat{'Questions'}) * 100);
-
-	# Connections
-	$mycalc{'pct_connections_used'} = int(($mystat{'Max_used_connections'}/$myvar{'max_connections'}) * 100);
-	$mycalc{'pct_connections_used'} = ($mycalc{'pct_connections_used'} > 100) ? 100 : $mycalc{'pct_connections_used'} ;
-
-	# Key buffers
-	if (mysql_version_ge(4, 1)) {
-		$mycalc{'pct_key_buffer_used'} = sprintf("%.1f",(1 - (($mystat{'Key_blocks_unused'} * $myvar{'key_cache_block_size'}) / $myvar{'key_buffer_size'})) * 100);
-	}
-	if ($mystat{'Key_read_requests'} > 0) {
-		$mycalc{'pct_keys_from_mem'} = sprintf("%.1f",(100 - (($mystat{'Key_reads'} / $mystat{'Key_read_requests'}) * 100)));
-	} else {
-	    $mycalc{'pct_keys_from_mem'} = 0;
-	}
-	if ($doremote eq 0 and !mysql_version_ge(5)) {
-		my $size = 0;
-		$size += (split)[0] for `find $myvar{'datadir'} -name "*.MYI" 2>&1 | xargs du -L $duflags 2>&1`;
-		$mycalc{'total_myisam_indexes'} = $size;
-	} elsif (mysql_version_ge(5)) {
-		$mycalc{'total_myisam_indexes'} = `mysql $mysqllogin -Bse "SELECT IFNULL(SUM(INDEX_LENGTH),0) FROM information_schema.TABLES WHERE TABLE_SCHEMA NOT IN ('information_schema') AND ENGINE = 'MyISAM';"`;
-	}
-	if (defined $mycalc{'total_myisam_indexes'} and $mycalc{'total_myisam_indexes'} == 0) {
-		$mycalc{'total_myisam_indexes'} = "fail";
-	} elsif (defined $mycalc{'total_myisam_indexes'}) {
-		chomp($mycalc{'total_myisam_indexes'});
-	}
-
-	# Query cache
-	if (mysql_version_ge(4)) {
-		$mycalc{'query_cache_efficiency'} = sprintf("%.1f",($mystat{'Qcache_hits'} / ($mystat{'Com_select'} + $mystat{'Qcache_hits'})) * 100);
-		if ($myvar{'query_cache_size'}) {
-			$mycalc{'pct_query_cache_used'} = sprintf("%.1f",100 - ($mystat{'Qcache_free_memory'} / $myvar{'query_cache_size'}) * 100);
-		}
-	if ($mystat{'Qcache_lowmem_prunes'} == 0) {
-			$mycalc{'query_cache_prunes_per_day'} = 0;
-		} else {
-			$mycalc{'query_cache_prunes_per_day'} = int($mystat{'Qcache_lowmem_prunes'} / ($mystat{'Uptime'}/86400));
-		}
-	}
-
-	# Sorting
-	$mycalc{'total_sorts'} = $mystat{'Sort_scan'} + $mystat{'Sort_range'};
-	if ($mycalc{'total_sorts'} > 0) {
-		$mycalc{'pct_temp_sort_table'} = int(($mystat{'Sort_merge_passes'} / $mycalc{'total_sorts'}) * 100);
-	}
-
-	# Joins
-	$mycalc{'joins_without_indexes'} = $mystat{'Select_range_check'} + $mystat{'Select_full_join'};
-	$mycalc{'joins_without_indexes_per_day'} = int($mycalc{'joins_without_indexes'} / ($mystat{'Uptime'}/86400));
-
-	# Temporary tables
-	if ($mystat{'Created_tmp_tables'} > 0) {
-		if ($mystat{'Created_tmp_disk_tables'} > 0) {
-			$mycalc{'pct_temp_disk'} = int(($mystat{'Created_tmp_disk_tables'} / ($mystat{'Created_tmp_tables'} + $mystat{'Created_tmp_disk_tables'})) * 100);
-		} else {
-			$mycalc{'pct_temp_disk'} = 0;
-		}
-	}
-
-	# Table cache
-	if ($mystat{'Opened_tables'} > 0) {
-		$mycalc{'table_cache_hit_rate'} = int($mystat{'Open_tables'}*100/$mystat{'Opened_tables'});
-	} else {
-		$mycalc{'table_cache_hit_rate'} = 100;
-	}
-
-	# Open files
-	if ($myvar{'open_files_limit'} > 0) {
-		$mycalc{'pct_files_open'} = int($mystat{'Open_files'}*100/$myvar{'open_files_limit'});
-	}
-
-	# Table locks
-	if ($mystat{'Table_locks_immediate'} > 0) {
-		if ($mystat{'Table_locks_waited'} == 0) {
-			$mycalc{'pct_table_locks_immediate'} = 100;
-		} else {
-			$mycalc{'pct_table_locks_immediate'} = int($mystat{'Table_locks_immediate'}*100/($mystat{'Table_locks_waited'} + $mystat{'Table_locks_immediate'}));
-		}
-	}
-
-	# Thread cache
-	$mycalc{'thread_cache_hit_rate'} = int(100 - (($mystat{'Threads_created'} / $mystat{'Connections'}) * 100));
-
-	# Other
-	if ($mystat{'Connections'} > 0) {
-		$mycalc{'pct_aborted_connections'} = int(($mystat{'Aborted_connects'}/$mystat{'Connections'}) * 100);
-	}
-	if ($mystat{'Questions'} > 0) {
-		$mycalc{'total_reads'} = $mystat{'Com_select'};
-		$mycalc{'total_writes'} = $mystat{'Com_delete'} + $mystat{'Com_insert'} + $mystat{'Com_update'} + $mystat{'Com_replace'};
-		if ($mycalc{'total_reads'} == 0) {
-			$mycalc{'pct_reads'} = 0;
-			$mycalc{'pct_writes'} = 100;
-		} else {
-			$mycalc{'pct_reads'} = int(($mycalc{'total_reads'}/($mycalc{'total_reads'}+$mycalc{'total_writes'})) * 100);
-			$mycalc{'pct_writes'} = 100-$mycalc{'pct_reads'};
-		}
-	}
-
-	# InnoDB
-	if ($myvar{'have_innodb'} eq "YES") {
-		$mycalc{'innodb_log_size_pct'} = ($myvar{'innodb_log_file_size'} * 100 / $myvar{'innodb_buffer_pool_size'});
-	}
-}
-
-sub mysql_stats {
-	print "\n-------- Performance Metrics -------------------------------------------------\n";
-	# Show uptime, queries per second, connections, traffic stats
-	my $qps;
-	if ($mystat{'Uptime'} > 0) { $qps = sprintf("%.3f",$mystat{'Questions'}/$mystat{'Uptime'}); }
-	if ($mystat{'Uptime'} < 86400) { push(@generalrec,"MySQL started within last 24 hours - recommendations may be inaccurate"); }
-	infoprint "Up for: ".pretty_uptime($mystat{'Uptime'})." (".hr_num($mystat{'Questions'}).
-		" q [".hr_num($qps)." qps], ".hr_num($mystat{'Connections'})." conn,".
-		" TX: ".hr_num($mystat{'Bytes_sent'}).", RX: ".hr_num($mystat{'Bytes_received'}).")\n";
-	infoprint "Reads / Writes: ".$mycalc{'pct_reads'}."% / ".$mycalc{'pct_writes'}."%\n";
-
-	# Memory usage
-	infoprint "Total buffers: ".hr_bytes($mycalc{'server_buffers'})." global + ".hr_bytes($mycalc{'per_thread_buffers'})." per thread ($myvar{'max_connections'} max threads)\n";
-	if ($mycalc{'total_possible_used_memory'} > 2*1024*1024*1024 && $arch eq 32) {
-		badprint "Allocating > 2GB RAM on 32-bit systems can cause system instability\n";
-		badprint "Maximum possible memory usage: ".hr_bytes($mycalc{'total_possible_used_memory'})." ($mycalc{'pct_physical_memory'}% of installed RAM)\n";
-	} elsif ($mycalc{'pct_physical_memory'} > 85) {
-		badprint "Maximum possible memory usage: ".hr_bytes($mycalc{'total_possible_used_memory'})." ($mycalc{'pct_physical_memory'}% of installed RAM)\n";
-		push(@generalrec,"Reduce your overall MySQL memory footprint for system stability");
-	} else {
-		goodprint "Maximum possible memory usage: ".hr_bytes($mycalc{'total_possible_used_memory'})." ($mycalc{'pct_physical_memory'}% of installed RAM)\n";
-	}
-
-	# Slow queries
-	if ($mycalc{'pct_slow_queries'} > 5) {
-		badprint "Slow queries: $mycalc{'pct_slow_queries'}% (".hr_num($mystat{'Slow_queries'})."/".hr_num($mystat{'Questions'}).")\n";
-	} else {
-		goodprint "Slow queries: $mycalc{'pct_slow_queries'}% (".hr_num($mystat{'Slow_queries'})."/".hr_num($mystat{'Questions'}).")\n";
-	}
-	if ($myvar{'long_query_time'} > 10) { push(@adjvars,"long_query_time (<= 10)"); }
-	if (defined($myvar{'log_slow_queries'})) {
-		if ($myvar{'log_slow_queries'} eq "OFF") { push(@generalrec,"Enable the slow query log to troubleshoot bad queries"); }
-	}
-
-	# Connections
-	if ($mycalc{'pct_connections_used'} > 85) {
-		badprint "Highest connection usage: $mycalc{'pct_connections_used'}%  ($mystat{'Max_used_connections'}/$myvar{'max_connections'})\n";
-		push(@adjvars,"max_connections (> ".$myvar{'max_connections'}.")");
-		push(@adjvars,"wait_timeout (< ".$myvar{'wait_timeout'}.")","interactive_timeout (< ".$myvar{'interactive_timeout'}.")");
-		push(@generalrec,"Reduce or eliminate persistent connections to reduce connection usage")
-	} else {
-		goodprint "Highest usage of available connections: $mycalc{'pct_connections_used'}% ($mystat{'Max_used_connections'}/$myvar{'max_connections'})\n";
-	}
-
-	# Key buffer
-	if (!defined($mycalc{'total_myisam_indexes'}) and $doremote == 1) {
-		push(@generalrec,"Unable to calculate MyISAM indexes on remote MySQL server < 5.0.0");
-	} elsif ($mycalc{'total_myisam_indexes'} =~ /^fail$/) {
-		badprint "Cannot calculate MyISAM index size - re-run script as root user\n";
-	} elsif ($mycalc{'total_myisam_indexes'} == "0") {
-		badprint "None of your MyISAM tables are indexed - add indexes immediately\n";
-	} else {
-		if ($myvar{'key_buffer_size'} < $mycalc{'total_myisam_indexes'} && $mycalc{'pct_keys_from_mem'} < 95) {
-			badprint "Key buffer size / total MyISAM indexes: ".hr_bytes($myvar{'key_buffer_size'})."/".hr_bytes($mycalc{'total_myisam_indexes'})."\n";
-			push(@adjvars,"key_buffer_size (> ".hr_bytes($mycalc{'total_myisam_indexes'}).")");
-		} else {
-			goodprint "Key buffer size / total MyISAM indexes: ".hr_bytes($myvar{'key_buffer_size'})."/".hr_bytes($mycalc{'total_myisam_indexes'})."\n";
-		}
-		if ($mystat{'Key_read_requests'} > 0) {
-			if ($mycalc{'pct_keys_from_mem'} < 95) {
-				badprint "Key buffer hit rate: $mycalc{'pct_keys_from_mem'}% (".hr_num($mystat{'Key_read_requests'})." cached / ".hr_num($mystat{'Key_reads'})." reads)\n";
-			} else {
-				goodprint "Key buffer hit rate: $mycalc{'pct_keys_from_mem'}% (".hr_num($mystat{'Key_read_requests'})." cached / ".hr_num($mystat{'Key_reads'})." reads)\n";
-			}
-		} else {
-			# No queries have run that would use keys
-		}
-	}
-
-	# Query cache
-	if (!mysql_version_ge(4)) {
-		# MySQL versions < 4.01 don't support query caching
-		push(@generalrec,"Upgrade MySQL to version 4+ to utilize query caching");
-	} elsif ($myvar{'query_cache_size'} < 1) {
-		badprint "Query cache is disabled\n";
-		push(@adjvars,"query_cache_size (>= 8M)");
-	} elsif ($mystat{'Com_select'} == 0) {
-		badprint "Query cache cannot be analyzed - no SELECT statements executed\n";
-	} else {
-		if ($mycalc{'query_cache_efficiency'} < 20) {
-			badprint "Query cache efficiency: $mycalc{'query_cache_efficiency'}% (".hr_num($mystat{'Qcache_hits'})." cached / ".hr_num($mystat{'Qcache_hits'}+$mystat{'Com_select'})." selects)\n";
-			push(@adjvars,"query_cache_limit (> ".hr_bytes_rnd($myvar{'query_cache_limit'}).", or use smaller result sets)");
-		} else {
-			goodprint "Query cache efficiency: $mycalc{'query_cache_efficiency'}% (".hr_num($mystat{'Qcache_hits'})." cached / ".hr_num($mystat{'Qcache_hits'}+$mystat{'Com_select'})." selects)\n";
-		}
-		if ($mycalc{'query_cache_prunes_per_day'} > 98) {
-			badprint "Query cache prunes per day: $mycalc{'query_cache_prunes_per_day'}\n";
-			if ($myvar{'query_cache_size'} > 128*1024*1024) {
-			    push(@generalrec,"Increasing the query_cache size over 128M may reduce performance");
-		        push(@adjvars,"query_cache_size (> ".hr_bytes_rnd($myvar{'query_cache_size'}).") [see warning above]");
-			} else {
-		        push(@adjvars,"query_cache_size (> ".hr_bytes_rnd($myvar{'query_cache_size'}).")");
-			}
-		} else {
-			goodprint "Query cache prunes per day: $mycalc{'query_cache_prunes_per_day'}\n";
-		}
-	}
-
-	# Sorting
-	if ($mycalc{'total_sorts'} == 0) {
-		# For the sake of space, we will be quiet here
-		# No sorts have run yet
-	} elsif ($mycalc{'pct_temp_sort_table'} > 10) {
-		badprint "Sorts requiring temporary tables: $mycalc{'pct_temp_sort_table'}% (".hr_num($mystat{'Sort_merge_passes'})." temp sorts / ".hr_num($mycalc{'total_sorts'})." sorts)\n";
-		push(@adjvars,"sort_buffer_size (> ".hr_bytes_rnd($myvar{'sort_buffer_size'}).")");
-		push(@adjvars,"read_rnd_buffer_size (> ".hr_bytes_rnd($myvar{'read_rnd_buffer_size'}).")");
-	} else {
-		goodprint "Sorts requiring temporary tables: $mycalc{'pct_temp_sort_table'}% (".hr_num($mystat{'Sort_merge_passes'})." temp sorts / ".hr_num($mycalc{'total_sorts'})." sorts)\n";
-	}
-
-	# Joins
-	if ($mycalc{'joins_without_indexes_per_day'} > 250) {
-		badprint "Joins performed without indexes: $mycalc{'joins_without_indexes'}\n";
-		push(@adjvars,"join_buffer_size (> ".hr_bytes($myvar{'join_buffer_size'}).", or always use indexes with joins)");
-		push(@generalrec,"Adjust your join queries to always utilize indexes");
-	} else {
-		# For the sake of space, we will be quiet here
-		# No joins have run without indexes
-	}
-
-	# Temporary tables
-	if ($mystat{'Created_tmp_tables'} > 0) {
-		if ($mycalc{'pct_temp_disk'} > 25 && $mycalc{'max_tmp_table_size'} < 256*1024*1024) {
-			badprint "Temporary tables created on disk: $mycalc{'pct_temp_disk'}% (".hr_num($mystat{'Created_tmp_disk_tables'})." on disk / ".hr_num($mystat{'Created_tmp_disk_tables'} + $mystat{'Created_tmp_tables'})." total)\n";
-			push(@adjvars,"tmp_table_size (> ".hr_bytes_rnd($myvar{'tmp_table_size'}).")");
-			push(@adjvars,"max_heap_table_size (> ".hr_bytes_rnd($myvar{'max_heap_table_size'}).")");
-			push(@generalrec,"When making adjustments, make tmp_table_size/max_heap_table_size equal");
-			push(@generalrec,"Reduce your SELECT DISTINCT queries without LIMIT clauses");
-		} elsif ($mycalc{'pct_temp_disk'} > 25 && $mycalc{'max_tmp_table_size'} >= 256) {
-			badprint "Temporary tables created on disk: $mycalc{'pct_temp_disk'}% (".hr_num($mystat{'Created_tmp_disk_tables'})." on disk / ".hr_num($mystat{'Created_tmp_disk_tables'} + $mystat{'Created_tmp_tables'})." total)\n";
-			push(@generalrec,"Temporary table size is already large - reduce result set size");
-			push(@generalrec,"Reduce your SELECT DISTINCT queries without LIMIT clauses");
-		} else {
-			goodprint "Temporary tables created on disk: $mycalc{'pct_temp_disk'}% (".hr_num($mystat{'Created_tmp_disk_tables'})." on disk / ".hr_num($mystat{'Created_tmp_disk_tables'} + $mystat{'Created_tmp_tables'})." total)\n";
-		}
-	} else {
-		# For the sake of space, we will be quiet here
-		# No temporary tables have been created
-	}
-
-	# Thread cache
-	if ($myvar{'thread_cache_size'} eq 0) {
-		badprint "Thread cache is disabled\n";
-		push(@generalrec,"Set thread_cache_size to 4 as a starting value");
-		push(@adjvars,"thread_cache_size (start at 4)");
-	} else {
-		if ($mycalc{'thread_cache_hit_rate'} <= 50) {
-			badprint "Thread cache hit rate: $mycalc{'thread_cache_hit_rate'}% (".hr_num($mystat{'Threads_created'})." created / ".hr_num($mystat{'Connections'})." connections)\n";
-			push(@adjvars,"thread_cache_size (> $myvar{'thread_cache_size'})");
-		} else {
-			goodprint "Thread cache hit rate: $mycalc{'thread_cache_hit_rate'}% (".hr_num($mystat{'Threads_created'})." created / ".hr_num($mystat{'Connections'})." connections)\n";
-		}
-	}
-
-	# Table cache
-	if ($mystat{'Open_tables'} > 0) {
-		if ($mycalc{'table_cache_hit_rate'} < 20) {
-			badprint "Table cache hit rate: $mycalc{'table_cache_hit_rate'}% (".hr_num($mystat{'Open_tables'})." open / ".hr_num($mystat{'Opened_tables'})." opened)\n";
-			if (mysql_version_ge(5, 1)) {
-				push(@adjvars,"table_cache (> ".$myvar{'table_open_cache'}.")");
-			} else {
-				push(@adjvars,"table_cache (> ".$myvar{'table_cache'}.")");
-			}
-			push(@generalrec,"Increase table_cache gradually to avoid file descriptor limits");
-		} else {
-			goodprint "Table cache hit rate: $mycalc{'table_cache_hit_rate'}% (".hr_num($mystat{'Open_tables'})." open / ".hr_num($mystat{'Opened_tables'})." opened)\n";
-		}
-	}
-
-	# Open files
-	if (defined $mycalc{'pct_files_open'}) {
-		if ($mycalc{'pct_files_open'} > 85) {
-			badprint "Open file limit used: $mycalc{'pct_files_open'}% (".hr_num($mystat{'Open_files'})."/".hr_num($myvar{'open_files_limit'}).")\n";
-			push(@adjvars,"open_files_limit (> ".$myvar{'open_files_limit'}.")");
-		} else {
-			goodprint "Open file limit used: $mycalc{'pct_files_open'}% (".hr_num($mystat{'Open_files'})."/".hr_num($myvar{'open_files_limit'}).")\n";
-		}
-	}
-
-	# Table locks
-	if (defined $mycalc{'pct_table_locks_immediate'}) {
-		if ($mycalc{'pct_table_locks_immediate'} < 95) {
-			badprint "Table locks acquired immediately: $mycalc{'pct_table_locks_immediate'}%\n";
-			push(@generalrec,"Optimize queries and/or use InnoDB to reduce lock wait");
-		} else {
-			goodprint "Table locks acquired immediately: $mycalc{'pct_table_locks_immediate'}% (".hr_num($mystat{'Table_locks_immediate'})." immediate / ".hr_num($mystat{'Table_locks_waited'}+$mystat{'Table_locks_immediate'})." locks)\n";
-		}
-	}
-
-	# Performance options
-	if (!mysql_version_ge(4, 1)) {
-		push(@generalrec,"Upgrade to MySQL 4.1+ to use concurrent MyISAM inserts");
-	} elsif ($myvar{'concurrent_insert'} eq "OFF") {
-		push(@generalrec,"Enable concurrent_insert by setting it to 'ON'");
-	} elsif ($myvar{'concurrent_insert'} eq 0) {
-		push(@generalrec,"Enable concurrent_insert by setting it to 1");
-	}
-	if ($mycalc{'pct_aborted_connections'} > 5) {
-		badprint "Connections aborted: ".$mycalc{'pct_aborted_connections'}."%\n";
-		push(@generalrec,"Your applications are not closing MySQL connections properly");
-	}
-
-	# InnoDB
-	if (defined $myvar{'have_innodb'} && $myvar{'have_innodb'} eq "YES" && defined $enginestats{'InnoDB'}) {
-		if ($myvar{'innodb_buffer_pool_size'} > $enginestats{'InnoDB'}) {
-			goodprint "InnoDB data size / buffer pool: ".hr_bytes($enginestats{'InnoDB'})."/".hr_bytes($myvar{'innodb_buffer_pool_size'})."\n";
-		} else {
-			badprint "InnoDB data size / buffer pool: ".hr_bytes($enginestats{'InnoDB'})."/".hr_bytes($myvar{'innodb_buffer_pool_size'})."\n";
-			push(@adjvars,"innodb_buffer_pool_size (>= ".hr_bytes_rnd($enginestats{'InnoDB'}).")");
-		}
-	}
-}
-
-# Take the two recommendation arrays and display them at the end of the output
-sub make_recommendations {
-	print "\n-------- Recommendations -----------------------------------------------------\n";
-	if (@generalrec > 0) {
-		print "General recommendations:\n";
-		foreach (@generalrec) { print "    ".$_."\n"; }
-	}
-	if (@adjvars > 0) {
-		print "Variables to adjust:\n";
-		if ($mycalc{'pct_physical_memory'} > 90) {
-			print "  *** MySQL's maximum memory usage is dangerously high ***\n".
-				  "  *** Add RAM before increasing MySQL buffer variables ***\n";
-		}
-		foreach (@adjvars) { print "    ".$_."\n"; }
-	}
-	if (@generalrec == 0 && @adjvars ==0) {
-		print "No additional performance recommendations are available.\n"
-	}
-	print "\n";
-}
-
-# ---------------------------------------------------------------------------
-# BEGIN 'MAIN'
-# ---------------------------------------------------------------------------
-print	"\n >>  MySQLTuner $tunerversion - Major Hayden <major\@mhtx.net>\n".
-		" >>  Bug reports, feature requests, and downloads at http://mysqltuner.com/\n".
-		" >>  Run with '--help' for additional options and output filtering\n";
-mysql_setup;					# Gotta login first
-os_setup;						# Set up some OS variables
-get_all_vars;					# Toss variables/status into hashes
-validate_tuner_version;			# Check current MySQLTuner version
-validate_mysql_version;			# Check current MySQL version
-check_architecture;				# Suggest 64-bit upgrade
-check_storage_engines;			# Show enabled storage engines
-security_recommendations;		# Display some security recommendations
-calculations;					# Calculate everything we need
-mysql_stats;					# Print the server stats
-make_recommendations;			# Make recommendations based on stats
-# ---------------------------------------------------------------------------
-# END 'MAIN'
-# ---------------------------------------------------------------------------
-
-# Local variables:
-# indent-tabs-mode: t
-# cperl-indent-level: 8
-# perl-indent-level: 8
-# End:
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb
deleted file mode 100644
index aca9c7a3dad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_deepmerge.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:mysql_deepmerge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Recursively merges two or more hashes together and returns the resulting hash.
-
-    For example:
-
-        $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-        $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-        $merged_hash = mysql_deepmerge($hash1, $hash2)
-        # The resulting hash is equivalent to:
-        # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } }
-
-    When there is a duplicate key that is a hash, they are recursively merged.
-    When there is a duplicate key that is not a hash, the key in the rightmost hash will "win."
-    When there are conficting uses of dashes and underscores in two keys (which mysql would otherwise equate),
-      the rightmost style will win.
-
-    ENDHEREDOC
-
-    if args.length < 2
-      raise Puppet::ParseError, ("mysql_deepmerge(): wrong number of arguments (#{args.length}; must be at least 2)")
-    end
-
-    result = Hash.new
-    args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
-      # If the argument was not a hash, skip it.
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "mysql_deepmerge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
-
-      # Now we have to traverse our hash assigning our non-hash values
-      # to the matching keys in our result while following our hash values
-      # and repeating the process.
-      overlay( result, arg )
-    end
-    return( result )
-  end
-end
-
-def has_normalized!(hash, key)
-  return true if hash.has_key?( key )
-  return false unless key.match(/-|_/)
-  other_key = key.include?('-') ? key.gsub( '-', '_' ) : key.gsub( '_', '-' )
-  return false unless hash.has_key?( other_key )
-  hash[key] = hash.delete( other_key )
-  return true;
-end
-
-def overlay( hash1, hash2 )
-  hash2.each do |key, value|
-    if(has_normalized!( hash1, key ) and value.is_a?(Hash) and hash1[key].is_a?(Hash))
-      overlay( hash1[key], value )
-    else
-      hash1[key] = value
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
deleted file mode 100644
index f057a3139da..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_password.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# hash a string as mysql's "PASSWORD()" function would do it
-require 'digest/sha1'
-
-module Puppet::Parser::Functions
-  newfunction(:mysql_password, :type => :rvalue, :doc => <<-EOS
-    Returns the mysql password hash from the clear text password.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, 'mysql_password(): Wrong number of arguments ' +
-      "given (#{args.size} for 1)") if args.size != 1
-
-    '*' + Digest::SHA1.hexdigest(Digest::SHA1.digest(args[0])).upcase
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb
deleted file mode 100644
index 8e850d02a52..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/parser/functions/mysql_strip_hash.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:mysql_strip_hash, :type => :rvalue, :arity => 1, :doc => <<-EOS
-TEMPORARY FUNCTION: EXPIRES 2014-03-10
-When given a hash this function strips out all blank entries.
-EOS
-  ) do |args|
-
-    hash = args[0]
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'mysql_strip_hash(): Requires hash to work with')
-    end
-
-    # Filter out all the top level blanks.
-    hash.reject{|k,v| v == ''}.each do |k,v|
-      if v.is_a?(Hash)
-        v.reject!{|ki,vi| vi == '' }
-      end
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb
deleted file mode 100644
index ace742967e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database/mysql.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:database).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-  desc 'Manages MySQL database.'
-
-  defaultfor :kernel => 'Linux'
-
-  optional_commands :mysql      => 'mysql'
-  optional_commands :mysqladmin => 'mysqladmin'
-
-  def self.instances
-    mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name|
-      new(:name => name)
-    end
-  end
-
-  def create
-    mysql([defaults_file, '-NBe', "create database `#{@resource[:name]}` character set #{resource[:charset]}"].compact)
-  end
-
-  def destroy
-    mysqladmin([defaults_file, '-f', 'drop', @resource[:name]].compact)
-  end
-
-  def charset
-    mysql([defaults_file, '-NBe', "show create database `#{resource[:name]}`"].compact).match(/.*?(\S+)\s(?:COLLATE.*)?\*\//)[1]
-  end
-
-  def charset=(value)
-    mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}"].compact)
-  end
-
-  def exists?
-    begin
-      mysql([defaults_file, '-NBe', 'show databases'].compact).match(/^#{@resource[:name]}$/)
-    rescue => e
-      debug(e.message)
-      return nil
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb
deleted file mode 100644
index eabc649c3dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_grant/mysql.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-# A grant is either global or per-db. This can be distinguished by the syntax
-# of the name:
-#   user@host => global
-#   user@host/db => per-db
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:database_grant).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'Uses mysql as database.'
-
-  defaultfor :kernel => 'Linux'
-
-  optional_commands :mysql      => 'mysql'
-  optional_commands :mysqladmin => 'mysqladmin'
-
-  def self.prefetch(resources)
-    @user_privs = query_user_privs
-    @db_privs = query_db_privs
-  end
-
-  def self.user_privs
-    @user_privs || query_user_privs
-  end
-
-  def self.db_privs
-    @db_privs || query_db_privs
-  end
-
-  def user_privs
-    self.class.user_privs
-  end
-
-  def db_privs
-    self.class.db_privs
-  end
-
-  def self.query_user_privs
-    results = mysql([defaults_file, 'mysql', '-Be', 'describe user'].compact)
-    column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
-    @user_privs = column_names.delete_if { |e| !( e =~/_priv$/) }
-  end
-
-  def self.query_db_privs
-    results = mysql([defaults_file, 'mysql', '-Be', 'describe db'].compact)
-    column_names = results.split(/\n/).map { |l| l.chomp.split(/\t/)[0] }
-    @db_privs = column_names.delete_if { |e| !(e =~/_priv$/) }
-  end
-
-  def mysql_flush
-    mysqladmin([defaults_file, 'flush-privileges'].compact)
-  end
-
-  # this parses the
-  def split_name(string)
-    matches = /^([^@]*)@([^\/]*)(\/(.*))?$/.match(string).captures.compact
-    case matches.length
-    when 2
-      {
-        :type => :user,
-        :user => matches[0],
-        :host => matches[1]
-      }
-    when 4
-      {
-        :type => :db,
-        :user => matches[0],
-        :host => matches[1],
-        :db => matches[3]
-      }
-    end
-  end
-
-  def create_row
-    unless @resource.should(:privileges).empty?
-      name = split_name(@resource[:name])
-      case name[:type]
-      when :user
-        mysql([defaults_file, 'mysql', '-e', "INSERT INTO user (host, user) VALUES ('%s', '%s')" % [
-          name[:host], name[:user],
-        ]].compact)
-      when :db
-        mysql([defaults_file, 'mysql', '-e', "INSERT INTO db (host, user, db) VALUES ('%s', '%s', '%s')" % [
-          name[:host], name[:user], name[:db],
-        ]].compact)
-      end
-      mysql_flush
-    end
-  end
-
-  def destroy
-    mysql([defaults_file, 'mysql', '-e', "REVOKE ALL ON '%s'.* FROM '%s@%s'" % [ @resource[:privileges], @resource[:database], @resource[:name], @resource[:host] ]].compact)
-  end
-
-  def row_exists?
-    name = split_name(@resource[:name])
-    fields = [:user, :host]
-    if name[:type] == :db
-      fields << :db
-    end
-    not mysql([defaults_file, 'mysql', '-NBe', "SELECT '1' FROM %s WHERE %s" % [ name[:type], fields.map do |f| "%s='%s'" % [f, name[f]] end.join(' AND ')]].compact).empty?
-  end
-
-  def all_privs_set?
-    all_privs = case split_name(@resource[:name])[:type]
-                when :user
-                  user_privs
-                when :db
-                  db_privs
-                end
-    all_privs = all_privs.collect do |p| p.downcase end.sort.join('|')
-    privs = privileges.collect do |p| p.downcase end.sort.join('|')
-
-    all_privs == privs
-  end
-
-  def privileges
-    name = split_name(@resource[:name])
-    privs = ''
-
-    case name[:type]
-    when :user
-      privs = mysql([defaults_file, 'mysql', '-Be', "select * from mysql.user where user='%s' and host='%s'" % [ name[:user], name[:host] ]].compact)
-    when :db
-      privs = mysql([defaults_file, 'mysql', '-Be', "select * from mysql.db where user='%s' and host='%s' and db='%s'" % [ name[:user], name[:host], name[:db] ]].compact)
-    end
-
-    if privs.match(/^$/)
-      privs = [] # no result, no privs
-    else
-      # returns a line with field names and a line with values, each tab-separated
-      privs = privs.split(/\n/).map! do |l| l.chomp.split(/\t/) end
-      # transpose the lines, so we have key/value pairs
-      privs = privs[0].zip(privs[1])
-      privs = privs.select do |p| p[0].match(/_priv$/) and p[1] == 'Y' end
-    end
-
-    privs.collect do |p| p[0] end
-  end
-
-  def privileges=(privs)
-    unless row_exists?
-      create_row
-    end
-
-    # puts "Setting privs: ", privs.join(", ")
-    name = split_name(@resource[:name])
-    stmt = ''
-    where = ''
-    all_privs = []
-    case name[:type]
-    when :user
-      stmt = 'update user set '
-      where = " where user='%s' and host='%s'" % [ name[:user], name[:host] ]
-      all_privs = user_privs
-    when :db
-      stmt = 'update db set '
-      where = " where user='%s' and host='%s' and db='%s'" % [ name[:user], name[:host], name[:db] ]
-      all_privs = db_privs
-    end
-
-    if privs[0].downcase == 'all'
-      privs = all_privs
-    end
-
-    # Downcase the requested priviliges for case-insensitive selection
-    # we don't map! here because the all_privs object has to remain in
-    # the same case the DB gave it to us in
-    privs = privs.map { |p| p.downcase }
-
-    # puts "stmt:", stmt
-    set = all_privs.collect do |p| "%s = '%s'" % [p, privs.include?(p.downcase) ? 'Y' : 'N'] end.join(', ')
-    # puts "set:", set
-    stmt = stmt << set << where
-
-    validate_privs privs, all_privs
-    mysql([defaults_file, 'mysql', '-Be', stmt].compact)
-    mysql_flush
-  end
-
-  def validate_privs(set_privs, all_privs)
-    all_privs = all_privs.collect { |p| p.downcase }
-    set_privs = set_privs.collect { |p| p.downcase }
-    invalid_privs = Array.new
-    hints = Array.new
-    # Test each of the user provided privs to see if they exist in all_privs
-    set_privs.each do |priv|
-      invalid_privs << priv unless all_privs.include?(priv)
-      hints << "#{priv}_priv" if all_privs.include?("#{priv}_priv")
-    end
-    unless invalid_privs.empty?
-      # Print a decently helpful and gramatically correct error message
-      hints = "Did you mean '#{hints.join(',')}'?" unless hints.empty?
-      p = invalid_privs.size > 1 ? ['s', 'are not valid'] : ['', 'is not valid']
-      detail = ["The privilege#{p[0]} '#{invalid_privs.join(',')}' #{p[1]}."]
-      fail [detail, hints].join(' ')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb
deleted file mode 100644
index 71e76d5c369..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/database_user/mysql.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:database_user).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'manage users for a mysql database.'
-
-  defaultfor :kernel => 'Linux'
-
-  commands :mysql      => 'mysql'
-  commands :mysqladmin => 'mysqladmin'
-
-  def self.instances
-    users = mysql([defaults_file, 'mysql', '-BNe' "select concat(User, '@',Host) as User from mysql.user"].compact).split("\n")
-    users.select{ |user| user =~ /.+@/ }.collect do |name|
-      new(:name => name)
-    end
-  end
-
-  def create
-    merged_name          = self.class.cmd_user(@resource[:name])
-    password_hash        = @resource.value(:password_hash)
-    max_user_connections = @resource.value(:max_user_connections) || 0
-
-    mysql([defaults_file, 'mysql', '-e', "grant usage on *.* to #{merged_name} identified by PASSWORD
-      '#{password_hash}' with max_user_connections #{max_user_connections}"].compact)
-
-    exists? ? (return true) : (return false)
-  end
-
-  def destroy
-    merged_name   = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, 'mysql', '-e', "drop user #{merged_name}"].compact)
-
-    exists? ? (return false) : (return true)
-  end
-
-  def password_hash
-    mysql([defaults_file, 'mysql', '-NBe', "select password from mysql.user where CONCAT(user, '@', host) = '#{@resource[:name]}'"].compact).chomp
-  end
-
-  def password_hash=(string)
-    mysql([defaults_file, 'mysql', '-e', "SET PASSWORD FOR #{self.class.cmd_user(@resource[:name])} = '#{string}'"].compact)
-
-    password_hash == string ? (return true) : (return false)
-  end
-
-  def max_user_connections
-    mysql([defaults_file, "mysql", "-NBe", "select max_user_connections from mysql.user where CONCAT(user, '@', host) = '#{@resource[:name]}'"].compact).chomp
-  end
-
-  def max_user_connections=(int)
-    mysql([defaults_file, "mysql", "-e", "grant usage on *.* to %s with max_user_connections #{int}" % [ self.class.cmd_user(@resource[:name])] ].compact).chomp
-
-    max_user_connections == int ? (return true) : (return false)
-  end
-
-  def exists?
-    not mysql([defaults_file, 'mysql', '-NBe', "select '1' from mysql.user where CONCAT(user, '@', host) = '%s'" % @resource.value(:name)].compact).empty?
-  end
-
-  def flush
-    @property_hash.clear
-    mysqladmin([defaults_file, 'flush-privileges'].compact)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb
deleted file mode 100644
index 9b34ca00e27..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-class Puppet::Provider::Mysql < Puppet::Provider
-
-  # Without initvars commands won't work.
-  initvars
-  commands :mysql      => 'mysql'
-  commands :mysqladmin => 'mysqladmin'
-
-  # Optional defaults file
-  def self.defaults_file
-    if File.file?("#{Facter.value(:root_home)}/.my.cnf")
-      "--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf"
-    else
-      nil
-    end
-  end
-  
-  def defaults_file
-    self.class.defaults_file
-  end
-
-  def self.users
-    mysql([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"].compact).split("\n")
-  end
-
-  # Take root@localhost and munge it to 'root'@'localhost'
-  def self.cmd_user(user)
-    "'#{user.sub('@', "'@'")}'"
-  end
-
-  # Take root.* and return ON `root`.*
-  def self.cmd_table(table)
-    table_string = ''
-
-    # We can't escape *.* so special case this.
-    if table == '*.*'
-      table_string << '*.*'
-    # Special case also for PROCEDURES
-    elsif table.start_with?('PROCEDURE ')
-      table_string << table.sub(/^PROCEDURE (.*)(\..*)/, 'PROCEDURE `\1`\2')
-    else
-      table_string << table.sub(/^(.*)(\..*)/, '`\1`\2')
-    end
-    table_string
-  end
-
-  def self.cmd_privs(privileges)
-    if privileges.include?('ALL')
-      return 'ALL PRIVILEGES'
-    else
-      priv_string = ''
-      privileges.each do |priv|
-        priv_string << "#{priv}, "
-      end
-    end
-    # Remove trailing , from the last element.
-    priv_string.sub(/, $/, '')
-  end
-
-  # Take in potential options and build up a query string with them.
-  def self.cmd_options(options)
-    option_string = ''
-    options.each do |opt|
-      if opt == 'GRANT'
-        option_string << ' WITH GRANT OPTION'
-      end
-    end
-    option_string
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb
deleted file mode 100644
index ae9ab393024..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_database/mysql.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:mysql_database).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-  desc 'Manages MySQL databases.'
-
-  commands :mysql => 'mysql'
-
-  def self.instances
-    mysql([defaults_file, '-NBe', 'show databases'].compact).split("\n").collect do |name|
-      attributes = {}
-      mysql([defaults_file, '-NBe', "show variables like '%_database'", name].compact).split("\n").each do |line|
-        k,v = line.split(/\s/)
-        attributes[k] = v
-      end
-      new(:name    => name,
-          :ensure  => :present,
-          :charset => attributes['character_set_database'],
-          :collate => attributes['collation_database']
-         )
-    end
-  end
-
-  # We iterate over each mysql_database entry in the catalog and compare it against
-  # the contents of the property_hash generated by self.instances
-  def self.prefetch(resources)
-    databases = instances
-    resources.keys.each do |database|
-      if provider = databases.find { |db| db.name == database }
-        resources[database].provider = provider
-      end
-    end
-  end
-
-  def create
-    mysql([defaults_file, '-NBe', "create database if not exists `#{@resource[:name]}` character set #{@resource[:charset]} collate #{@resource[:collate]}"].compact)
-
-    @property_hash[:ensure]  = :present
-    @property_hash[:charset] = @resource[:charset]
-    @property_hash[:collate] = @resource[:collate]
-
-    exists? ? (return true) : (return false)
-  end
-
-  def destroy
-    mysql([defaults_file, '-NBe', "drop database `#{@resource[:name]}`"].compact)
-
-    @property_hash.clear
-    exists? ? (return false) : (return true)
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present || false
-  end
-
-  mk_resource_methods
-
-  def charset=(value)
-    mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET #{value}"].compact)
-    @property_hash[:charset] = value
-    charset == value ? (return true) : (return false)
-  end
-
-  def collate=(value)
-    mysql([defaults_file, '-NBe', "alter database `#{resource[:name]}` COLLATE #{value}"].compact)
-    @property_hash[:collate] = value
-    collate == value ? (return true) : (return false)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb
deleted file mode 100644
index 7dabf462056..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_grant/mysql.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:mysql_grant).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'Set grants for users in MySQL.'
-
-  def self.instances
-    instances = []
-    users.select{ |user| user =~ /.+@/ }.collect do |user|
-      user_string = self.cmd_user(user)
-      query = "SHOW GRANTS FOR #{user_string};"
-      grants = mysql([defaults_file, "-NBe", query].compact)
-      # Once we have the list of grants generate entries for each.
-      grants.each_line do |grant|
-        # Match the munges we do in the type.
-        munged_grant = grant.delete("'").delete("`")
-        # Matching: GRANT (SELECT, UPDATE) PRIVILEGES ON (*.*) TO ('root')@('127.0.0.1') (WITH GRANT OPTION)
-        if match = munged_grant.match(/^GRANT\s(.+)\sON\s(.+)\sTO\s(.*)@(.*?)(\s.*)$/)
-          privileges, table, user, host, rest = match.captures
-          # Once we split privileges up on the , we need to make sure we
-          # shortern ALL PRIVILEGES to just all.
-          stripped_privileges = privileges.split(',').map do |priv|
-            priv == 'ALL PRIVILEGES' ? 'ALL' : priv.lstrip.rstrip
-          end
-          # Same here, but to remove OPTION leaving just GRANT.
-          options = ['GRANT'] if rest.match(/WITH\sGRANT\sOPTION/)
-          # We need to return an array of instances so capture these
-          instances << new(
-              :name       => "#{user}@#{host}/#{table}",
-              :ensure     => :present,
-              :privileges => stripped_privileges.sort,
-              :table      => table,
-              :user       => "#{user}@#{host}",
-              :options    => options
-          )
-        end
-      end
-    end
-    return instances
-  end
-
-  def self.prefetch(resources)
-    users = instances
-    resources.keys.each do |name|
-      if provider = users.find { |user| user.name == name }
-        resources[name].provider = provider
-      end
-    end
-  end
-
-  def grant(user, table, privileges, options)
-    user_string = self.class.cmd_user(user)
-    priv_string = self.class.cmd_privs(privileges)
-    table_string = self.class.cmd_table(table)
-    query = "GRANT #{priv_string}"
-    query << " ON #{table_string}"
-    query << " TO #{user_string}"
-    query << self.class.cmd_options(options) unless options.nil?
-    mysql([defaults_file, '-e', query].compact)
-  end
-
-  def create
-    grant(@resource[:user], @resource[:table], @resource[:privileges], @resource[:options])
-
-    @property_hash[:ensure]     = :present
-    @property_hash[:table]      = @resource[:table]
-    @property_hash[:user]       = @resource[:user]
-    @property_hash[:options]    = @resource[:options] if @resource[:options]
-    @property_hash[:privileges] = @resource[:privileges]
-
-    exists? ? (return true) : (return false)
-  end
-
-  def revoke(user, table)
-    user_string = self.class.cmd_user(user)
-    table_string = self.class.cmd_table(table)
-
-    query = "REVOKE ALL ON #{table_string} FROM #{user_string}"
-    mysql([defaults_file, '-e', query].compact)
-    # revoke grant option needs to be a extra query, because
-    # "REVOKE ALL PRIVILEGES, GRANT OPTION [..]" is only valid mysql syntax
-    # if no ON clause is used.
-    query = "REVOKE GRANT OPTION ON #{table_string} FROM #{user_string}"
-    mysql([defaults_file, '-e', query].compact)
-  end
-
-  def destroy
-    revoke(@property_hash[:user], @property_hash[:table])
-    @property_hash.clear
-
-    exists? ? (return false) : (return true)
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present || false
-  end
-
-  def flush
-    @property_hash.clear
-    mysql([defaults_file, '-NBe', 'FLUSH PRIVILEGES'].compact)
-  end
-
-  mk_resource_methods
-
-  def privileges=(privileges)
-    revoke(@property_hash[:user], @property_hash[:table])
-    grant(@property_hash[:user], @property_hash[:table], privileges, @property_hash[:options])
-    @property_hash[:privileges] = privileges
-
-    self.privileges
-  end
-
-  def options=(options)
-    revoke(@property_hash[:user], @property_hash[:table])
-    grant(@property_hash[:user], @property_hash[:table], @property_hash[:privileges], options)
-    @property_hash[:options] = options
-
-    self.options
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb
deleted file mode 100644
index 066ea0b00d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/provider/mysql_user/mysql.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'mysql'))
-Puppet::Type.type(:mysql_user).provide(:mysql, :parent => Puppet::Provider::Mysql) do
-
-  desc 'manage users for a mysql database.'
-  commands :mysql => 'mysql'
-
-  # Build a property_hash containing all the discovered information about MySQL
-  # users.
-  def self.instances
-    users = mysql([defaults_file, '-NBe',
-      "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"].compact).split("\n")
-    # To reduce the number of calls to MySQL we collect all the properties in
-    # one big swoop.
-    users.collect do |name|
-      query = "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD FROM mysql.user WHERE CONCAT(user, '@', host) = '#{name}'"
-      @max_user_connections, @max_connections_per_hour, @max_queries_per_hour,
-      @max_updates_per_hour, @password = mysql([defaults_file, "-NBe", query].compact).split(/\s/)
-
-      new(:name                     => name,
-          :ensure                   => :present,
-          :password_hash            => @password,
-          :max_user_connections     => @max_user_connections,
-          :max_connections_per_hour => @max_connections_per_hour,
-          :max_queries_per_hour     => @max_queries_per_hour,
-          :max_updates_per_hour     => @max_updates_per_hour
-         )
-    end
-  end
-
-  # We iterate over each mysql_user entry in the catalog and compare it against
-  # the contents of the property_hash generated by self.instances
-  def self.prefetch(resources)
-    users = instances
-    resources.keys.each do |name|
-      if provider = users.find { |user| user.name == name }
-        resources[name].provider = provider
-      end
-    end
-  end
-
-  def create
-    merged_name             = @resource[:name].sub('@', "'@'")
-    password_hash            = @resource.value(:password_hash)
-    max_user_connections     = @resource.value(:max_user_connections) || 0
-    max_connections_per_hour = @resource.value(:max_connections_per_hour) || 0
-    max_queries_per_hour     = @resource.value(:max_queries_per_hour) || 0
-    max_updates_per_hour     = @resource.value(:max_updates_per_hour) || 0
-
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO '#{merged_name}' IDENTIFIED BY PASSWORD '#{password_hash}' WITH MAX_USER_CONNECTIONS #{max_user_connections} MAX_CONNECTIONS_PER_HOUR #{max_connections_per_hour} MAX_QUERIES_PER_HOUR #{max_queries_per_hour} MAX_UPDATES_PER_HOUR #{max_updates_per_hour}"].compact)
-
-    @property_hash[:ensure] = :present
-    @property_hash[:password_hash] = password_hash
-    @property_hash[:max_user_connections] = max_user_connections
-    @property_hash[:max_connections_per_hour] = max_connections_per_hour
-    @property_hash[:max_queries_per_hour] = max_queries_per_hour
-    @property_hash[:max_updates_per_hour] = max_updates_per_hour
-
-    exists? ? (return true) : (return false)
-  end
-
-  def destroy
-    merged_name = @resource[:name].sub('@', "'@'")
-    mysql([defaults_file, '-e', "DROP USER '#{merged_name}'"].compact)
-
-    @property_hash.clear
-    exists? ? (return false) : (return true)
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present || false
-  end
-
-  ##
-  ## MySQL user properties
-  ##
-
-  # Generates method for all properties of the property_hash
-  mk_resource_methods
-
-  def password_hash=(string)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "SET PASSWORD FOR #{merged_name} = '#{string}'"].compact)
-
-    password_hash == string ? (return true) : (return false)
-  end
-
-  def max_user_connections=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_USER_CONNECTIONS #{int}"].compact).chomp
-
-    max_user_connections == int ? (return true) : (return false)
-  end
-
-  def max_connections_per_hour=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_CONNECTIONS_PER_HOUR #{int}"].compact).chomp
-
-    max_connections_per_hour == int ? (return true) : (return false)
-  end
-
-  def max_queries_per_hour=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_QUERIES_PER_HOUR #{int}"].compact).chomp
-
-    max_queries_per_hour == int ? (return true) : (return false)
-  end
-
-  def max_updates_per_hour=(int)
-    merged_name = self.class.cmd_user(@resource[:name])
-    mysql([defaults_file, '-e', "GRANT USAGE ON *.* TO #{merged_name} WITH MAX_UPDATES_PER_HOUR #{int}"].compact).chomp
-
-    max_updates_per_hour == int ? (return true) : (return false)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb
deleted file mode 100644
index b02fb109988..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:database) do
-  @doc = 'Manage databases.'
-
-  ensurable
-
-  newparam(:name, :namevar=>true) do
-    desc 'The name of the database.'
-    validate do |value|
-      Puppet.warning("database has been deprecated in favor of mysql_database.")
-      true
-    end
-  end
-
-  newproperty(:charset) do
-    desc 'The characterset to use for a database'
-    defaultto :utf8
-    newvalue(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb
deleted file mode 100644
index 7fdad823179..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_grant.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:database_grant) do
-  @doc = "Manage a database user's rights."
-  #ensurable
-
-  autorequire :database do
-    # puts "Starting db autoreq for %s" % self[:name]
-    reqs = []
-    matches = self[:name].match(/^([^@]+)@([^\/]+)\/(.+)$/)
-    unless matches.nil?
-      reqs << matches[3]
-    end
-    # puts "Autoreq: '%s'" % reqs.join(" ")
-    reqs
-  end
-
-  autorequire :database_user do
-    # puts "Starting user autoreq for %s" % self[:name]
-    reqs = []
-    matches = self[:name].match(/^([^@]+)@([^\/]+).*$/)
-    unless matches.nil?
-      reqs << '%s@%s' % [ matches[1], matches[2] ]
-    end
-    # puts "Autoreq: '%s'" % reqs.join(" ")
-    reqs
-  end
-
-  newparam(:name, :namevar=>true) do
-    desc 'The primary key: either user@host for global privilges or user@host/database for database specific privileges'
-    validate do |value|
-      Puppet.warning("database_grant has been deprecated in favor of mysql_grant.")
-      true
-    end
-  end
-
-  newproperty(:privileges, :array_matching => :all) do
-    desc 'The privileges the user should have. The possible values are implementation dependent.'
-
-    def should_to_s(newvalue = @should)
-      if newvalue
-        unless newvalue.is_a?(Array)
-          newvalue = [ newvalue ]
-        end
-        newvalue.collect do |v| v.downcase end.sort.join ', '
-      else
-        nil
-      end
-    end
-
-    def is_to_s(currentvalue = @is)
-      if currentvalue
-        unless currentvalue.is_a?(Array)
-          currentvalue = [ currentvalue ]
-        end
-        currentvalue.collect do |v| v.downcase end.sort.join ', '
-      else
-        nil
-      end
-    end
-
-    # use the sorted outputs for comparison
-    def insync?(is)
-      if defined? @should and @should
-        case self.should_to_s
-        when 'all'
-          self.provider.all_privs_set?
-        when self.is_to_s(is)
-          true
-        else
-          false
-        end
-      else
-        true
-      end
-    end
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb
deleted file mode 100644
index 9a9d5fbc746..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/database_user.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:database_user) do
-  @doc = 'Manage a database user. This includes management of users password as well as privileges'
-
-  ensurable
-
-  newparam(:name, :namevar=>true) do
-    desc "The name of the user. This uses the 'username@hostname' or username@hostname."
-    validate do |value|
-      Puppet.warning("database has been deprecated in favor of mysql_user.")
-      # https://dev.mysql.com/doc/refman/5.1/en/account-names.html
-      # Regex should problably be more like this: /^[`'"]?[^`'"]*[`'"]?@[`'"]?[\w%\.]+[`'"]?$/
-      raise(ArgumentError, "Invalid database user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/
-      username = value.split('@')[0]
-      if username.size > 16
-        raise ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters'
-      end
-    end
-  end
-
-  newproperty(:password_hash) do
-    desc 'The password hash of the user. Use mysql_password() for creating such a hash.'
-    newvalue(/\w+/)
-  end
-
-  newproperty(:max_user_connections) do
-    desc "Max concurrent connections for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb
deleted file mode 100644
index 3e8518c9670..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_database.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-Puppet::Type.newtype(:mysql_database) do
-  @doc = 'Manage MySQL databases.'
-
-  ensurable
-
-  newparam(:name, :namevar => true) do
-    desc 'The name of the MySQL database to manage.'
-  end
-
-  newproperty(:charset) do
-    desc 'The CHARACTER SET setting for the database'
-    defaultto :utf8
-    newvalue(/^\S+$/)
-  end
-
-  newproperty(:collate) do
-    desc 'The COLLATE setting for the database'
-    defaultto :utf8_general_ci
-    newvalue(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb
deleted file mode 100644
index be8dfbc340c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_grant.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:mysql_grant) do
-  @doc = "Manage a MySQL user's rights."
-  ensurable
-
-  autorequire(:file) { '/root/.my.cnf' }
-
-  def initialize(*args)
-    super
-    # Forcibly munge any privilege with 'ALL' in the array to exist of just
-    # 'ALL'.  This can't be done in the munge in the property as that iterates
-    # over the array and there's no way to replace the entire array before it's
-    # returned to the provider.
-    if self[:ensure] == :present and Array(self[:privileges]).count > 1 and self[:privileges].to_s.include?('ALL')
-      self[:privileges] = 'ALL'
-    end
-    # Sort the privileges array in order to ensure the comparision in the provider
-    # self.instances method match.  Otherwise this causes it to keep resetting the
-    # privileges.
-    self[:privileges] = Array(self[:privileges]).map(&:upcase).uniq.reject{|k| k == 'GRANT' or k == 'GRANT OPTION'}.sort!
-  end
-
-  validate do
-    fail('privileges parameter is required.') if self[:ensure] == :present and self[:privileges].nil?
-    fail('table parameter is required.') if self[:ensure] == :present and self[:table].nil?
-    fail('user parameter is required.') if self[:ensure] == :present and self[:user].nil?
-  end
-
-  newparam(:name, :namevar => true) do
-    desc 'Name to describe the grant.'
-
-    munge do |value|
-      value.delete("'")
-    end
-  end
-
-  newproperty(:privileges, :array_matching => :all) do
-    desc 'Privileges for user'
-
-    munge do |value|
-      value.upcase
-    end
-  end
-
-  newproperty(:table) do
-    desc 'Table to apply privileges to.'
-
-    munge do |value|
-      value.delete("`")
-    end
-
-    newvalues(/.*\..*/,/@/)
-  end
-
-  newproperty(:user) do
-    desc 'User to operate on.'
-    validate do |value|
-      # https://dev.mysql.com/doc/refman/5.1/en/account-names.html
-      # Regex should problably be more like this: /^[`'"]?[^`'"]*[`'"]?@[`'"]?[\w%\.]+[`'"]?$/
-      raise(ArgumentError, "Invalid user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/
-      username = value.split('@')[0]
-      if username.size > 16
-        raise ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters'
-      end
-    end
-  end
-
-  newproperty(:options, :array_matching => :all) do
-    desc 'Options to grant.'
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb
deleted file mode 100644
index 38564a948b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/lib/puppet/type/mysql_user.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# This has to be a separate type to enable collecting
-Puppet::Type.newtype(:mysql_user) do
-  @doc = 'Manage a MySQL user. This includes management of users password as well as privileges.'
-
-  ensurable
-
-  newparam(:name, :namevar => true) do
-    desc "The name of the user. This uses the 'username@hostname' or username@hostname."
-    validate do |value|
-      # https://dev.mysql.com/doc/refman/5.1/en/account-names.html
-      # Regex should problably be more like this: /^[`'"]?[^`'"]*[`'"]?@[`'"]?[\w%\.]+[`'"]?$/
-      raise(ArgumentError, "Invalid database user #{value}") unless value =~ /[\w-]*@[\w%\.:]+/
-      username = value.split('@')[0]
-      if username.size > 16
-        raise ArgumentError, 'MySQL usernames are limited to a maximum of 16 characters'
-      end
-    end
-  end
-
-  newproperty(:password_hash) do
-    desc 'The password hash of the user. Use mysql_password() for creating such a hash.'
-    newvalue(/\w+/)
-  end
-
-  newproperty(:max_user_connections) do
-    desc "Max concurrent connections for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-  newproperty(:max_connections_per_hour) do
-    desc "Max connections per hour for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-  newproperty(:max_queries_per_hour) do
-    desc "Max queries per hour for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-  newproperty(:max_updates_per_hour) do
-    desc "Max updates per hour for the user. 0 means no (or global) limit."
-    newvalue(/\d+/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/backup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/backup.pp
deleted file mode 100644
index 680a5744d51..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/backup.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Deprecated class
-class mysql::backup (
-  $backupuser,
-  $backuppassword,
-  $backupdir,
-  $backupcompress = true,
-  $backuprotate = 30,
-  $delete_before_dump = false,
-  $backupdatabases = [],
-  $file_per_database = false,
-  $ensure = 'present',
-  $time = ['23', '5'],
-) {
-
-  crit("This class has been deprecated and callers should directly call
-  mysql::server::backup now.")
-
-  class { 'mysql::server::backup':
-    ensure             => $ensure,
-    backupuser         => $backupuser,
-    backuppassword     => $backuppassword,
-    backupdir          => $backupdir,
-    backupcompress     => $backupcompress,
-    backuprotate       => $backuprotate,
-    delete_before_dump => $delete_before_dump,
-    backupdatabases    => $backupdatabases,
-    file_per_database  => $file_per_database,
-    time               => $time,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings.pp
deleted file mode 100644
index 88c49033932..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# See README.md.
-class mysql::bindings (
-  # Boolean to determine if we should include the classes.
-  $java_enable   = false,
-  $perl_enable   = false,
-  $php_enable    = false,
-  $python_enable = false,
-  $ruby_enable   = false,
-  # Settings for the various classes.
-  $java_package_ensure     = $mysql::params::java_package_ensure,
-  $java_package_name       = $mysql::params::java_package_name,
-  $java_package_provider   = $mysql::params::java_package_provider,
-  $perl_package_ensure     = $mysql::params::perl_package_ensure,
-  $perl_package_name       = $mysql::params::perl_package_name,
-  $perl_package_provider   = $mysql::params::perl_package_provider,
-  $php_package_ensure      = $mysql::params::php_package_ensure,
-  $php_package_name        = $mysql::params::php_package_name,
-  $php_package_provider    = $mysql::params::php_package_provider,
-  $python_package_ensure   = $mysql::params::python_package_ensure,
-  $python_package_name     = $mysql::params::python_package_name,
-  $python_package_provider = $mysql::params::python_package_provider,
-  $ruby_package_ensure     = $mysql::params::ruby_package_ensure,
-  $ruby_package_name       = $mysql::params::ruby_package_name,
-  $ruby_package_provider   = $mysql::params::ruby_package_provider
-) inherits mysql::params {
-
-  if $java_enable   { include '::mysql::bindings::java' }
-  if $perl_enable   { include '::mysql::bindings::perl' }
-  if $php_enable    { include '::mysql::bindings::php' }
-  if $python_enable { include '::mysql::bindings::python' }
-  if $ruby_enable   { include '::mysql::bindings::ruby' }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/java.pp
deleted file mode 100644
index d0808373349..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/java.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::java {
-
-  package { 'mysql-connector-java':
-    ensure   => $mysql::bindings::java_package_ensure,
-    name     => $mysql::bindings::java_package_name,
-    provider => $mysql::bindings::java_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp
deleted file mode 100644
index 58c76f4b348..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/perl.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::perl {
-
-  package{ 'perl_mysql':
-    ensure   => $mysql::bindings::perl_package_ensure,
-    name     => $mysql::bindings::perl_package_name,
-    provider => $mysql::bindings::perl_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/php.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/php.pp
deleted file mode 100644
index 81d08d3aa49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/php.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class: See README.md
-class mysql::bindings::php {
-
-  package { 'php-mysql':
-    ensure   => $mysql::bindings::php_package_ensure,
-    name     => $mysql::bindings::php_package_name,
-    provider => $mysql::bindings::php_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/python.pp
deleted file mode 100644
index 96a3882b340..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/python.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::python {
-
-  package { 'python-mysqldb':
-    ensure   => $mysql::bindings::python_package_ensure,
-    name     => $mysql::bindings::python_package_name,
-    provider => $mysql::bindings::python_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp
deleted file mode 100644
index f916f54c23b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/bindings/ruby.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Private class
-class mysql::bindings::ruby {
-
-  package{ 'ruby_mysql':
-    ensure   => $mysql::bindings::ruby_package_ensure,
-    name     => $mysql::bindings::ruby_package_name,
-    provider => $mysql::bindings::ruby_package_provider,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client.pp
deleted file mode 100644
index 59487f7005b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-class mysql::client (
-  $bindings_enable = $mysql::params::bindings_enable,
-  $package_ensure  = $mysql::params::client_package_ensure,
-  $package_name    = $mysql::params::client_package_name,
-) inherits mysql::params {
-
-  include '::mysql::client::install'
-
-  if $bindings_enable {
-    class { 'mysql::bindings':
-      java_enable   => true,
-      perl_enable   => true,
-      php_enable    => true,
-      python_enable => true,
-      ruby_enable   => true,
-    }
-  }
-
-
-  # Anchor pattern workaround to avoid resources of mysql::client::install to
-  # "float off" outside mysql::client
-  anchor { 'mysql::client::start': } ->
-    Class['mysql::client::install'] ->
-  anchor { 'mysql::client::end': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client/install.pp
deleted file mode 100644
index a443f5320ea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/client/install.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class mysql::client::install {
-
-  package { 'mysql_client':
-    ensure => $mysql::client::package_ensure,
-    name   => $mysql::client::package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/db.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/db.pp
deleted file mode 100644
index d406a07d521..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/db.pp
+++ /dev/null
@@ -1,59 +0,0 @@
-# See README.md for details.
-define mysql::db (
-  $user,
-  $password,
-  $charset     = 'utf8',
-  $collate     = 'utf8_general_ci',
-  $host        = 'localhost',
-  $grant       = 'ALL',
-  $sql         = '',
-  $enforce_sql = false,
-  $ensure      = 'present'
-) {
-  #input validation
-  validate_re($ensure, '^(present|absent)$',
-  "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  $table = "${name}.*"
-
-  include '::mysql::client'
-
-  mysql_database { $name:
-    ensure   => $ensure,
-    charset  => $charset,
-    collate  => $collate,
-    provider => 'mysql',
-    require  => [ Class['mysql::server'], Class['mysql::client'] ],
-    before   => Mysql_user["${user}@${host}"],
-  }
-
-  $user_resource = {
-    ensure        => $ensure,
-    password_hash => mysql_password($password),
-    provider      => 'mysql',
-    require       => Class['mysql::server'],
-  }
-  ensure_resource('mysql_user', "${user}@${host}", $user_resource)
-
-  if $ensure == 'present' {
-    mysql_grant { "${user}@${host}/${table}":
-      privileges => $grant,
-      provider   => 'mysql',
-      user       => "${user}@${host}",
-      table      => $table,
-      require    => [ Mysql_user["${user}@${host}"], Class['mysql::server'] ],
-    }
-
-    $refresh = ! $enforce_sql
-
-    if $sql {
-      exec{ "${name}-import":
-        command     => "/usr/bin/mysql ${name} < ${sql}",
-        logoutput   => true,
-        environment => "HOME=${::root_home}",
-        refreshonly => $refresh,
-        require     => Mysql_grant["${user}@${host}/${table}"],
-        subscribe   => Mysql_database[$name],
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/init.pp
deleted file mode 100644
index eba5c206311..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/init.pp
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-class mysql(
-  $basedir               = '',
-  $bind_address          = '',
-  $client_package_ensure = '',
-  $client_package_name   = '',
-  $config_file           = '',
-  $config_template       = '',
-  $datadir               = '',
-  $default_engine        = '',
-  $etc_root_password     = '',
-  $log_error             = '',
-  $manage_config_file    = '',
-  $manage_service        = '',
-  $max_allowed_packet    = '',
-  $max_connections       = '',
-  $old_root_password     = '',
-  $package_ensure        = '',
-  $php_package_name      = '',
-  $pidfile               = '',
-  $port                  = '',
-  $purge_conf_dir        = '',
-  $restart               = '',
-  $root_group            = '',
-  $root_password         = '',
-  $server_package_name   = '',
-  $service_name          = '',
-  $service_provider      = '',
-  $socket                = '',
-  $ssl                   = '',
-  $ssl_ca                = '',
-  $ssl_cert              = '',
-  $ssl_key               = '',
-  $tmpdir                = '',
-  $attempt_compatibility_mode = false,
-) {
-
-  if $attempt_compatibility_mode {
-    notify { "An attempt has been made below to automatically apply your custom
-    settings to mysql::server. Please verify this works in a safe test
-    environment.": }
-
-    $override_options = {
-      'client'                 => {
-        'port'                 => $port,
-        'socket'               => $socket
-      },
-      'mysqld_safe'            => {
-        'log_error'            => $log_error,
-        'socket'               => $socket,
-      },
-      'mysqld'               => {
-        'basedir'            => $basedir,
-        'bind_address'       => $bind_address,
-        'datadir'            => $datadir,
-        'log_error'          => $log_error,
-        'max_allowed_packet' => $max_allowed_packet,
-        'max_connections'    => $max_connections,
-        'pid_file'           => $pidfile,
-        'port'               => $port,
-        'socket'             => $socket,
-        'ssl-ca'             => $ssl_ca,
-        'ssl-cert'           => $ssl_cert,
-        'ssl-key'            => $ssl_key,
-        'tmpdir'             => $tmpdir,
-      },
-      'mysqldump'              => {
-        'max_allowed_packet'  => $max_allowed_packet,
-      },
-      'config_file'          => $config_file,
-      'etc_root_password'    => $etc_root_password,
-      'manage_config_file'   => $manage_config_file,
-      'old_root_password'    => $old_root_password,
-      'purge_conf_dir'       => $purge_conf_dir,
-      'restart'              => $restart,
-      'root_group'           => $root_group,
-      'root_password'        => $root_password,
-      'service_name'         => $service_name,
-      'ssl'                  => $ssl
-    }
-    $filtered_options = mysql_strip_hash($override_options)
-    validate_hash($filtered_options)
-    notify { $filtered_options: }
-    class { 'mysql::server':
-      override_options => $filtered_options,
-    }
-
-  } else {
-    fail("ERROR:  This class has been deprecated and the functionality moved
-    into mysql::server.  If you run mysql::server without correctly calling
-    mysql:: server with the new override_options hash syntax you will revert
-    your MySQL to the stock settings.  Do not proceed without removing this
-    class and using mysql::server correctly.
-
-    If you are brave you may set attempt_compatibility_mode in this class which
-    attempts to automap the previous settings to appropriate calls to
-    mysql::server")
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/params.pp
deleted file mode 100644
index 67dd785b09d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/params.pp
+++ /dev/null
@@ -1,230 +0,0 @@
-# Private class: See README.md.
-class mysql::params {
-
-  $manage_config_file     = true
-  $old_root_password      = ''
-  $purge_conf_dir         = false
-  $restart                = false
-  $root_password          = 'UNSET'
-  $server_package_ensure  = 'present'
-  $server_service_manage  = true
-  $server_service_enabled = true
-  # mysql::bindings
-  $bindings_enable         = false
-  $java_package_ensure     = 'present'
-  $java_package_provider   = undef
-  $perl_package_ensure     = 'present'
-  $perl_package_provider   = undef
-  $php_package_ensure      = 'present'
-  $php_package_provider    = undef
-  $python_package_ensure   = 'present'
-  $python_package_provider = undef
-  $ruby_package_ensure     = 'present'
-  $ruby_package_provider   = undef
-
-
-  case $::osfamily {
-    'RedHat': {
-      if $::operatingsystem == 'Fedora' and (is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 19 or $::operatingsystemrelease == "Rawhide") {
-        $client_package_name = 'mariadb'
-        $server_package_name = 'mariadb-server'
-      } else {
-        $client_package_name = 'mysql'
-        $server_package_name = 'mysql-server'
-      }
-      $basedir             = '/usr'
-      $config_file         = '/etc/my.cnf'
-      $datadir             = '/var/lib/mysql'
-      $log_error           = '/var/log/mysqld.log'
-      $pidfile             = '/var/run/mysqld/mysqld.pid'
-      $root_group          = 'root'
-      $server_service_name = 'mysqld'
-      $socket              = '/var/lib/mysql/mysql.sock'
-      $ssl_ca              = '/etc/mysql/cacert.pem'
-      $ssl_cert            = '/etc/mysql/server-cert.pem'
-      $ssl_key             = '/etc/mysql/server-key.pem'
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'mysql-connector-java'
-      $perl_package_name   = 'perl-DBD-MySQL'
-      $php_package_name    = 'php-mysql'
-      $python_package_name = 'MySQL-python'
-      $ruby_package_name   = 'ruby-mysql'
-    }
-
-    'Suse': {
-      $client_package_name   = $::operatingsystem ? {
-        /OpenSuSE/           => 'mysql-community-server-client',
-        /(SLES|SLED)/        => 'mysql-client',
-      }
-      $server_package_name   = $::operatingsystem ? {
-        /OpenSuSE/           => 'mysql-community-server',
-        /(SLES|SLED)/        => 'mysql',
-      }
-      $basedir             = '/usr'
-      $config_file         = '/etc/my.cnf'
-      $datadir             = '/var/lib/mysql'
-      $log_error           = $::operatingsystem ? {
-        /OpenSuSE/         => '/var/log/mysql/mysqld.log',
-        /(SLES|SLED)/      => '/var/log/mysqld.log',
-      }
-      $pidfile             = $::operatingsystem ? {
-        /OpenSuSE/         => '/var/run/mysql/mysqld.pid',
-        /(SLES|SLED)/      => '/var/lib/mysql/mysqld.pid',
-      }
-      $root_group          = 'root'
-      $server_service_name = 'mysql'
-      $socket              = $::operatingsystem ? {
-        /OpenSuSE/         => '/var/run/mysql/mysql.sock',
-        /(SLES|SLED)/      => '/var/lib/mysql/mysql.sock',
-      }
-      $ssl_ca              = '/etc/mysql/cacert.pem'
-      $ssl_cert            = '/etc/mysql/server-cert.pem'
-      $ssl_key             = '/etc/mysql/server-key.pem'
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'mysql-connector-java'
-      $perl_package_name   = 'perl-DBD-mysql'
-      $php_package_name    = 'apache2-mod_php53'
-      $python_package_name = 'python-mysql'
-      $ruby_package_name   = $::operatingsystem ? {
-        /OpenSuSE/         => 'rubygem-mysql',
-        /(SLES|SLED)/      => 'ruby-mysql',
-      }
-    }
-
-    'Debian': {
-      $client_package_name = 'mysql-client'
-      $server_package_name = 'mysql-server'
-
-      $basedir             = '/usr'
-      $config_file         = '/etc/mysql/my.cnf'
-      $datadir             = '/var/lib/mysql'
-      $log_error           = '/var/log/mysql/error.log'
-      $pidfile             = '/var/run/mysqld/mysqld.pid'
-      $root_group          = 'root'
-      $server_service_name = 'mysql'
-      $socket              = '/var/run/mysqld/mysqld.sock'
-      $ssl_ca              = '/etc/mysql/cacert.pem'
-      $ssl_cert            = '/etc/mysql/server-cert.pem'
-      $ssl_key             = '/etc/mysql/server-key.pem'
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'libmysql-java'
-      $perl_package_name   = 'libdbd-mysql-perl'
-      $php_package_name    = 'php5-mysql'
-      $python_package_name = 'python-mysqldb'
-      $ruby_package_name   = 'libmysql-ruby'
-    }
-
-    'FreeBSD': {
-      $client_package_name = 'databases/mysql55-client'
-      $server_package_name = 'databases/mysql55-server'
-      $basedir             = '/usr/local'
-      $config_file         = '/var/db/mysql/my.cnf'
-      $datadir             = '/var/db/mysql'
-      $log_error           = "/var/db/mysql/${::hostname}.err"
-      $pidfile             = '/var/db/mysql/mysql.pid'
-      $root_group          = 'wheel'
-      $server_service_name = 'mysql-server'
-      $socket              = '/tmp/mysql.sock'
-      $ssl_ca              = undef
-      $ssl_cert            = undef
-      $ssl_key             = undef
-      $tmpdir              = '/tmp'
-      # mysql::bindings
-      $java_package_name   = 'databases/mysql-connector-java'
-      $perl_package_name   = 'p5-DBD-mysql'
-      $php_package_name    = 'php5-mysql'
-      $python_package_name = 'databases/py-MySQLdb'
-      $ruby_package_name   = 'databases/ruby-mysql'
-    }
-
-    default: {
-      case $::operatingsystem {
-        'Amazon': {
-          $client_package_name = 'mysql'
-          $server_package_name = 'mysql-server'
-          $basedir             = '/usr'
-          $config_file         = '/etc/my.cnf'
-          $datadir             = '/var/lib/mysql'
-          $log_error           = '/var/log/mysqld.log'
-          $pidfile             = '/var/run/mysqld/mysqld.pid'
-          $root_group          = 'root'
-          $server_service_name = 'mysqld'
-          $socket              = '/var/lib/mysql/mysql.sock'
-          $ssl_ca              = '/etc/mysql/cacert.pem'
-          $ssl_cert            = '/etc/mysql/server-cert.pem'
-          $ssl_key             = '/etc/mysql/server-key.pem'
-          $tmpdir              = '/tmp'
-          # mysql::bindings
-          $java_package_name   = 'mysql-connector-java'
-          $perl_package_name   = 'perl-DBD-MySQL'
-          $php_package_name    = 'php-mysql'
-          $python_package_name = 'MySQL-python'
-          $ruby_package_name   = 'ruby-mysql'
-        }
-
-        default: {
-          fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat, Debian, and FreeBSD, or operatingsystem Amazon")
-        }
-      }
-    }
-  }
-
-  case $::operatingsystem {
-    'Ubuntu': {
-      $server_service_provider = upstart
-    }
-    default: {
-      $server_service_provider = undef
-    }
-  }
-
-  $default_options = {
-    'client'          => {
-      'port'          => '3306',
-      'socket'        => $mysql::params::socket,
-    },
-    'mysqld_safe'        => {
-      'nice'             => '0',
-      'log-error'        => $mysql::params::log_error,
-      'socket'           => $mysql::params::socket,
-    },
-    'mysqld'                  => {
-      'basedir'               => $mysql::params::basedir,
-      'bind-address'          => '127.0.0.1',
-      'datadir'               => $mysql::params::datadir,
-      'expire_logs_days'      => '10',
-      'key_buffer_size'       => '16M',
-      'log-error'             => $mysql::params::log_error,
-      'max_allowed_packet'    => '16M',
-      'max_binlog_size'       => '100M',
-      'max_connections'       => '151',
-      'myisam_recover'        => 'BACKUP',
-      'pid-file'              => $mysql::params::pidfile,
-      'port'                  => '3306',
-      'query_cache_limit'     => '1M',
-      'query_cache_size'      => '16M',
-      'skip-external-locking' => true,
-      'socket'                => $mysql::params::socket,
-      'ssl'                   => false,
-      'ssl-ca'                => $mysql::params::ssl_ca,
-      'ssl-cert'              => $mysql::params::ssl_cert,
-      'ssl-key'               => $mysql::params::ssl_key,
-      'thread_cache_size'     => '8',
-      'thread_stack'          => '256K',
-      'tmpdir'                => $mysql::params::tmpdir,
-      'user'                  => 'mysql',
-    },
-    'mysqldump'             => {
-      'max_allowed_packet'  => '16M',
-      'quick'               => true,
-      'quote-names'         => true,
-    },
-    'isamchk'      => {
-      'key_buffer_size' => '16M',
-    },
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server.pp
deleted file mode 100644
index ae8b208a187..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server.pp
+++ /dev/null
@@ -1,82 +0,0 @@
-# Class: mysql::server:  See README.md for documentation.
-class mysql::server (
-  $config_file             = $mysql::params::config_file,
-  $manage_config_file      = $mysql::params::manage_config_file,
-  $old_root_password       = $mysql::params::old_root_password,
-  $override_options        = {},
-  $package_ensure          = $mysql::params::server_package_ensure,
-  $package_name            = $mysql::params::server_package_name,
-  $purge_conf_dir          = $mysql::params::purge_conf_dir,
-  $remove_default_accounts = false,
-  $restart                 = $mysql::params::restart,
-  $root_group              = $mysql::params::root_group,
-  $root_password           = $mysql::params::root_password,
-  $service_enabled         = $mysql::params::server_service_enabled,
-  $service_manage          = $mysql::params::server_service_manage,
-  $service_name            = $mysql::params::server_service_name,
-  $service_provider        = $mysql::params::server_service_provider,
-  $users                   = {},
-  $grants                  = {},
-  $databases               = {},
-
-  # Deprecated parameters
-  $enabled                 = undef,
-  $manage_service          = undef
-) inherits mysql::params {
-
-  # Deprecated parameters.
-  if $enabled {
-    crit('This parameter has been renamed to service_enabled.')
-    $real_service_enabled = $enabled
-  } else {
-    $real_service_enabled = $service_enabled
-  }
-  if $manage_service {
-    crit('This parameter has been renamed to service_manage.')
-    $real_service_manage = $manage_service
-  } else {
-    $real_service_manage = $service_manage
-  }
-
-  # Create a merged together set of options.  Rightmost hashes win over left.
-  $options = mysql_deepmerge($mysql::params::default_options, $override_options)
-
-  Class['mysql::server::root_password'] -> Mysql::Db <| |>
-
-  include '::mysql::server::install'
-  include '::mysql::server::config'
-  include '::mysql::server::service'
-  include '::mysql::server::root_password'
-  include '::mysql::server::providers'
-
-  if $remove_default_accounts {
-    class { '::mysql::server::account_security':
-      require => Anchor['mysql::server::end'],
-    }
-  }
-
-  anchor { 'mysql::server::start': }
-  anchor { 'mysql::server::end': }
-
-  if $restart {
-    Anchor['mysql::server::start'] ->
-    Class['mysql::server::install'] ->
-    # Only difference between the blocks is that we use ~> to restart if
-    # restart is set to true.
-    Class['mysql::server::config'] ~>
-    Class['mysql::server::service'] ->
-    Class['mysql::server::root_password'] ->
-    Class['mysql::server::providers'] ->
-    Anchor['mysql::server::end']
-  } else {
-    Anchor['mysql::server::start'] ->
-    Class['mysql::server::install'] ->
-    Class['mysql::server::config'] ->
-    Class['mysql::server::service'] ->
-    Class['mysql::server::root_password'] ->
-    Class['mysql::server::providers'] ->
-    Anchor['mysql::server::end']
-  }
-
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/account_security.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/account_security.pp
deleted file mode 100644
index 36d943757c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/account_security.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class mysql::server::account_security {
-  mysql_user {
-    [ "root@${::fqdn}",
-      'root@127.0.0.1',
-      'root@::1',
-      "@${::fqdn}",
-      '@localhost',
-      '@%']:
-    ensure  => 'absent',
-    require => Anchor['mysql::server::end'],
-  }
-  if ($::fqdn != $::hostname) {
-    mysql_user { ["root@${::hostname}", "@${::hostname}"]:
-      ensure  => 'absent',
-      require => Anchor['mysql::server::end'],
-    }
-  }
-  mysql_database { 'test':
-    ensure  => 'absent',
-    require => Anchor['mysql::server::end'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/backup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/backup.pp
deleted file mode 100644
index a33b2b03b40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/backup.pp
+++ /dev/null
@@ -1,61 +0,0 @@
-# See README.me for usage.
-class mysql::server::backup (
-  $backupuser,
-  $backuppassword,
-  $backupdir,
-  $backupdirmode = '0700',
-  $backupdirowner = 'root',
-  $backupdirgroup = 'root',
-  $backupcompress = true,
-  $backuprotate = 30,
-  $ignore_events = true,
-  $delete_before_dump = false,
-  $backupdatabases = [],
-  $file_per_database = false,
-  $ensure = 'present',
-  $time = ['23', '5'],
-  $postscript = false,
-) {
-
-  mysql_user { "${backupuser}@localhost":
-    ensure        => $ensure,
-    password_hash => mysql_password($backuppassword),
-    provider      => 'mysql',
-    require       => Class['mysql::server::root_password'],
-  }
-
-  mysql_grant { "${backupuser}@localhost/*.*":
-    ensure     => present,
-    user       => "${backupuser}@localhost",
-    table      => '*.*',
-    privileges => [ 'SELECT', 'RELOAD', 'LOCK TABLES', 'SHOW VIEW' ],
-    require    => Mysql_user["${backupuser}@localhost"],
-  }
-
-  cron { 'mysql-backup':
-    ensure  => $ensure,
-    command => '/usr/local/sbin/mysqlbackup.sh',
-    user    => 'root',
-    hour    => $time[0],
-    minute  => $time[1],
-    require => File['mysqlbackup.sh'],
-  }
-
-  file { 'mysqlbackup.sh':
-    ensure  => $ensure,
-    path    => '/usr/local/sbin/mysqlbackup.sh',
-    mode    => '0700',
-    owner   => 'root',
-    group   => 'root',
-    content => template('mysql/mysqlbackup.sh.erb'),
-  }
-
-  file { 'mysqlbackupdir':
-    ensure => 'directory',
-    path   => $backupdir,
-    mode   => $backupdirmode,
-    owner  => $backupdirowner,
-    group  => $backupdirgroup,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/config.pp
deleted file mode 100644
index c51f22ff97d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/config.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# See README.me for options.
-class mysql::server::config {
-
-  $options = $mysql::server::options
-
-  File {
-    owner  => 'root',
-    group  => $mysql::server::root_group,
-    mode   => '0400',
-  }
-
-  file { '/etc/mysql':
-    ensure => directory,
-    mode   => '0755',
-  }
-
-  file { '/etc/mysql/conf.d':
-    ensure  => directory,
-    mode    => '0755',
-    recurse => $mysql::server::purge_conf_dir,
-    purge   => $mysql::server::purge_conf_dir,
-  }
-
-  if $mysql::server::manage_config_file  {
-    file { $mysql::server::config_file:
-      content => template('mysql/my.cnf.erb'),
-      mode    => '0644',
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/install.pp
deleted file mode 100644
index dcb04cb1283..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/install.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-class mysql::server::install {
-
-  package { 'mysql-server':
-    ensure => $mysql::server::package_ensure,
-    name   => $mysql::server::package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/monitor.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/monitor.pp
deleted file mode 100644
index 9e86b92c774..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/monitor.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-#This is a helper class to add a monitoring user to the database
-class mysql::server::monitor (
-  $mysql_monitor_username,
-  $mysql_monitor_password,
-  $mysql_monitor_hostname
-) {
-
-  Anchor['mysql::server::end'] -> Class['mysql::server::monitor']
-
-  mysql_user { "${mysql_monitor_username}@${mysql_monitor_hostname}":
-    ensure        => present,
-    password_hash => mysql_password($mysql_monitor_password),
-    require       => Class['mysql::server::service'],
-  }
-
-  mysql_grant { "${mysql_monitor_username}@${mysql_monitor_hostname}/*.*":
-    ensure     => present,
-    user       => "${mysql_monitor_username}@${mysql_monitor_hostname}",
-    table      => '*.*',
-    privileges => [ 'PROCESS', 'SUPER' ],
-    require    => Mysql_user["${mysql_monitor_username}@${mysql_monitor_hostname}"],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp
deleted file mode 100644
index 23d19a55851..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/mysqltuner.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-class mysql::server::mysqltuner($ensure='present') {
-  # mysql performance tester
-  file { '/usr/local/bin/mysqltuner':
-    ensure  => $ensure,
-    mode    => '0550',
-    source  => 'puppet:///modules/mysql/mysqltuner.pl',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/providers.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/providers.pp
deleted file mode 100644
index b651172fca3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/providers.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-# Convenience class to call each of the three providers with the corresponding
-# hashes provided in mysql::server.
-# See README.md for details.
-class mysql::server::providers {
-  create_resources('mysql_user', $mysql::server::users)
-  create_resources('mysql_grant', $mysql::server::grants)
-  create_resources('mysql_database', $mysql::server::databases)
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/root_password.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/root_password.pp
deleted file mode 100644
index e75412dabee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/root_password.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-class mysql::server::root_password {
-
-  $options = $mysql::server::options
-
-  # manage root password if it is set
-  if $mysql::server::root_password != 'UNSET' {
-    mysql_user { 'root@localhost':
-      ensure        => present,
-      password_hash => mysql_password($mysql::server::root_password),
-    }
-
-    file { "${::root_home}/.my.cnf":
-      content => template('mysql/my.cnf.pass.erb'),
-      owner   => 'root',
-      mode    => '0600',
-      require => Mysql_user['root@localhost'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/service.pp
deleted file mode 100644
index c60e0366233..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/manifests/server/service.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-class mysql::server::service {
-
-  if $mysql::server::real_service_enabled {
-    $service_ensure = 'running'
-  } else {
-    $service_ensure = 'stopped'
-  }
-
-  if $mysql::server::real_service_manage {
-    service { 'mysqld':
-      ensure   => $service_ensure,
-      name     => $mysql::server::service_name,
-      enable   => $mysql::server::real_service_enabled,
-      provider => $mysql::server::service_provider,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/metadata.json
deleted file mode 100644
index e1a8c790534..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/metadata.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "SLES",
-      "operatingsystemrelease": [
-        "11 SP1"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": "3.x"
-    }
-  ],
-  "name": "puppetlabs-mysql",
-  "version": "2.2.3",
-  "source": "git://github.com/puppetlabs/puppetlabs-mysql.git",
-  "author": "Puppet Labs",
-  "license": "Apache 2.0",
-  "summary": "Mysql module",
-  "description": "Mysql module",
-  "project_page": "http://github.com/puppetlabs/puppetlabs-mysql",
-  "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 3.2.0"
-    }
-  ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb
deleted file mode 100644
index 07c99a183cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_account_delete_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::account_security class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'running puppet code' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': remove_default_accounts => true }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe 'accounts' do
-      it 'should delete accounts' do
-        shell("mysql -e 'show grants for root@127.0.0.1;'", :acceptable_exit_codes => 1)
-      end
-
-      it 'should delete databases' do
-        shell("mysql -e 'show databases;' |grep test", :acceptable_exit_codes => 1)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb
deleted file mode 100644
index 131520661fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_backup_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::backup class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  context 'should work with no errors' do
-    it 'when configuring mysql backups' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'password' }
-        mysql::db { 'backup1':
-          user     => 'backup',
-          password => 'secret',
-        }
-
-        class { 'mysql::server::backup':
-          backupuser     => 'myuser',
-          backuppassword => 'mypassword',
-          backupdir      => '/tmp/backups',
-          backupcompress => true,
-          postscript     => [
-            'rm -rf /var/tmp/mysqlbackups',
-            'rm -f /var/tmp/mysqlbackups.done',
-            'cp -r /tmp/backups /var/tmp/mysqlbackups',
-            'touch /var/tmp/mysqlbackups.done',
-          ],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-
-  describe 'mysqlbackup.sh' do
-    it 'should run mysqlbackup.sh with no errors' do
-      shell("/usr/local/sbin/mysqlbackup.sh") do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-
-    it 'should dump all databases to single file' do
-      shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r|
-        expect(r.stdout).to match(/1/)
-        expect(r.exit_code).to be_zero
-      end
-    end
-
-    context 'should create one file per database per run' do
-      it 'executes mysqlbackup.sh a second time' do
-        shell('sleep 1')
-        shell('/usr/local/sbin/mysqlbackup.sh')
-      end
-
-      it 'creates at least one backup tarball' do
-        shell('ls -l /tmp/backups/mysql_backup_*-*.sql.bz2 | wc -l') do |r|
-          expect(r.stdout).to match(/2/)
-          expect(r.exit_code).to be_zero
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb
deleted file mode 100644
index b7e25d63d3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_bindings_spec.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-require 'spec_helper_acceptance'
-
-osfamily = fact('osfamily')
-operatingsystem = fact('operatingsystem')
-
-case osfamily
-when 'RedHat'
-  java_package   = 'mysql-connector-java'
-  perl_package   = 'perl-DBD-MySQL'
-  php_package    = 'php-mysql'
-  python_package = 'MySQL-python'
-  ruby_package   = 'ruby-mysql'
-when 'Suse'
-  java_package   = 'mysql-connector-java'
-  perl_package   = 'perl-DBD-mysql'
-  php_package    = 'apache2-mod_php53'
-  python_package = 'python-mysql'
-  case operatingsystem
-  when /OpenSuSE/
-    ruby_package = 'rubygem-mysql'
-  when /(SLES|SLED)/
-    ruby_package = 'ruby-mysql'
-  end
-when 'Debian'
-  java_package = 'libmysql-java'
-  perl_package   = 'libdbd-mysql-perl'
-  php_package    = 'php5-mysql'
-  python_package = 'python-mysqldb'
-  ruby_package   = 'libmysql-ruby'
-when 'FreeBSD'
-  java_package = 'databases/mysql-connector-java'
-  perl_package   = 'p5-DBD-mysql'
-  php_package    = 'php5-mysql'
-  python_package = 'databases/py-MySQLdb'
-  ruby_package   = 'ruby-mysql'
-else
-  case operatingsystem
-  when 'Amazon'
-    java_package = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    php_package    = 'php5-mysql'
-    python_package = 'MySQL-python'
-    ruby_package   = 'ruby-mysql'
-  end
-end
-
-describe 'mysql::bindings class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-
-  describe 'running puppet code' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::bindings': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe 'all parameters' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::bindings':
-          java_enable             => true,
-          perl_enable             => true,
-          php_enable              => true,
-          python_enable           => true,
-          ruby_enable             => true,
-          java_package_ensure     => present,
-          perl_package_ensure     => present,
-          php_package_ensure      => present,
-          python_package_ensure   => present,
-          ruby_package_ensure     => present,
-          java_package_name       => #{java_package},
-          perl_package_name       => #{perl_package},
-          php_package_name        => #{php_package},
-          python_package_name     => #{python_package},
-          ruby_package_name       => #{ruby_package},
-          java_package_provider   => undef,
-          perl_package_provider   => undef,
-          php_package_provider    => undef,
-          python_package_provider => undef,
-          ruby_package_provider   => undef,
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe package(java_package) do
-      it { should be_installed }
-    end
-
-    describe package(perl_package) do
-      it { should be_installed }
-    end
-
-    # This package is not available out of the box and adding in other repos
-    # is a bit much for the scope of this test.
-    unless fact('osfamily') == 'RedHat'
-      describe package(php_package) do
-        it { should be_installed }
-      end
-    end
-
-    describe package(python_package) do
-      it { should be_installed }
-    end
-
-    describe package(ruby_package) do
-      it { should be_installed }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb
deleted file mode 100644
index 1e8df8a1f4e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_db_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::db define', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'creating a database' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'password' }
-        mysql::db { 'spec1':
-          user     => 'root1',
-          password => 'password',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      expect(shell("mysql -e 'show databases;'|grep spec1").exit_code).to be_zero
-    end
-  end
-
-  describe 'creating a database with post-sql' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-        file { '/tmp/spec.sql':
-          ensure  => file,
-          content => 'CREATE TABLE table1 (id int);',
-          before  => Mysql::Db['spec2'],
-        }
-        mysql::db { 'spec2':
-          user     => 'root1',
-          password => 'password',
-          sql      => '/tmp/spec.sql',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'should have the table' do
-      expect(shell("mysql -e 'show tables;' spec2|grep table1").exit_code).to be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb
deleted file mode 100644
index d327dd29aed..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_config_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'config location', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'creates the file elsewhere' do
-    pp = <<-EOS
-        class { 'mysql::server':
-          config_file => '/etc/testmy.cnf',
-        }
-    EOS
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  describe file('/etc/testmy.cnf') do
-    it { should be_file }
-  end
-end
-
-describe 'manage_config_file', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'wont reset the location of my.cnf' do
-    pp = <<-EOS
-      class { 'mysql::server':
-        config_file        => '/etc/my.cnf',
-        manage_config_file => false,
-        service_manage     => false,
-      }
-    EOS
-    # Make sure this doesn't exist so we can test if puppet
-    # readded it.  It may not exist in the first place on
-    # some platforms.
-    shell('rm /etc/my.cnf', :acceptable_exit_codes => [0,1,2])
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  describe file('/etc/my.cnf') do
-    it { should_not be_file }
-  end
-end
-
-describe 'resets', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'cleans up' do
-    pp = <<-EOS
-        class { 'mysql::server': }
-    EOS
-    apply_manifest(pp, :catch_failures => true)
-    shell('rm /etc/testmy.cnf')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb
deleted file mode 100644
index 9c66334e5bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_monitor_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::monitor class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'should work with no errors' do
-    pp = <<-EOS
-      class { 'mysql::server': root_password => 'password' }
-
-      class { 'mysql::server::monitor':
-        mysql_monitor_username => 'monitoruser',
-        mysql_monitor_password => 'monitorpass',
-        mysql_monitor_hostname => 'localhost',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-  end
-
-  it 'should run mysqladmin ping with no errors' do
-    expect(shell("mysqladmin -u monitoruser -pmonitorpass -h localhost ping").stdout).to match(/mysqld is alive/)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb
deleted file mode 100644
index f6035f0b362..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_root_password_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql::server::root_password class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-
-  describe 'reset' do
-    it 'shuts down mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => false }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'deletes the /root/.my.cnf password' do
-      shell('rm -rf /root/.my.cnf')
-    end
-
-    it 'deletes all databases' do
-      case fact('osfamily')
-      when 'RedHat', 'Suse'
-        shell('rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
-      when 'Debian'
-        shell('rm -rf `grep datadir /etc/mysql/my.cnf | cut -d" " -f 3`/*')
-        shell('mysql_install_db')
-      end
-    end
-
-    it 'starts up mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => true }
-      EOS
-
-      puppet_apply(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'when unset' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-
-  describe 'when set' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'new', old_root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-  end
-end
-
-# Debian relies on a debian-sys-maint@ account to do almost everything.
-# Without recreating this account we can't even stop the service in future
-# tests.
-if fact('osfamily') == 'Debian'
-  describe 'readd debian user' do
-    it 'readds the user' do
-      shell("MYSQL_PASSWORD=`head -5 /etc/mysql/debian.cnf | grep password | cut -d' ' -f 3`; mysql -NBe \"GRANT ALL PRIVILEGES ON *.* to 'debian-sys-maint'@'localhost' IDENTIFIED BY '${MYSQL_PASSWORD}' WITH GRANT OPTION;\"")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb
deleted file mode 100644
index 938368dbf9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/mysql_server_spec.rb
+++ /dev/null
@@ -1,281 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name     = 'mysql-server'
-    service_name     = 'mysqld'
-    service_provider = 'undef'
-    mycnf            = '/etc/my.cnf'
-  when 'Suse'
-    case fact('operatingsystem')
-    when 'OpenSuSE'
-      package_name     = 'mysql-community-server'
-      service_name     = 'mysql'
-      service_provider = 'undef'
-      mycnf            = '/etc/my.cnf'
-    when 'SLES'
-      package_name     = 'mysql'
-      service_name     = 'mysql'
-      service_provider = 'undef'
-      mycnf            = '/etc/my.cnf'
-    end
-  when 'Debian'
-    package_name     = 'mysql-server'
-    service_name     = 'mysql'
-    service_provider = 'undef'
-    mycnf            = '/etc/mysql/my.cnf'
-  when 'Ubuntu'
-    package_name     = 'mysql-server'
-    service_name     = 'mysql'
-    service_provider = 'upstart'
-    mycnf            = '/etc/mysql/my.cnf'
-  end
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-
-    describe service(service_name) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'mycnf' do
-    it 'should contain sensible values' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer_size = 16M' }
-      it { should contain 'max_binlog_size = 100M' }
-      it { should contain 'query_cache_size = 16M' }
-    end
-  end
-
-  describe 'my.cnf changes' do
-    it 'sets values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'key_buffer'       => '32M',
-              'max_binlog_size'  => '200M',
-              'query_cache_size' => '32M',
-            }
-          }  
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer = 32M' }
-      it { should contain 'max_binlog_size = 200M' }
-      it { should contain 'query_cache_size = 32M' }
-    end
-  end
-
-  describe 'my.cnf should contain multiple instances of the same option' do
-    it 'sets multiple values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'replicate-do-db' => ['base1', 'base2', 'base3'], }
-          }  
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file(mycnf) do
-      it { should contain 'replicate-do-db = base1' }
-      it { should contain 'replicate-do-db = base2' }
-      it { should contain 'replicate-do-db = base3' }
-    end
-  end
-
-  describe 'package_ensure => absent' do
-    it 'uninstalls mysql' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          service_enabled => false,
-          package_ensure  => absent,
-          package_name    => #{package_name}
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package(package_name) do
-      it { should_not be_installed }
-    end
-  end
-
-  describe 'package_ensure => present' do
-    it 'installs mysql' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          package_ensure => present,
-          package_name   => #{package_name}
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-  end
-
-  describe 'purge_conf_dir' do
-
-    it 'purges the conf dir' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          purge_conf_dir => true
-        }
-      EOS
-      shell('touch /etc/mysql/conf.d/test.conf')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/mysql/conf.d/test.conf') do
-      it { should_not be_file }
-    end
-  end
-
-  describe 'restart' do
-    it 'restart => true' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          restart          => true,
-          override_options => { 'mysqldump' => { 'default-character-set' => 'UTF-8' } }
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.exit_code).to eq(2)
-        expect(r.stdout).to match(/Scheduling refresh/)
-      end
-    end
-    it 'restart => false' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          restart          => false,
-          override_options => { 'mysqldump' => { 'default-character-set' => 'UTF-16' } }
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.exit_code).to eq(2)
-        expect(r.stdout).to_not match(/Scheduling refresh/)
-      end
-    end
-  end
-
-  describe 'root_group' do
-    it 'creates a group' do
-      pp = "group { 'test': ensure => present }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'sets the group of files' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          root_group => 'test',
-          config_file => '/tmp/mysql_group_test',
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/tmp/mysql_group_test') do
-      it { should be_grouped_into 'test' }
-    end
-  end
-
-  describe 'service parameters' do
-    it 'calls all parameters' do
-      pp = <<-EOS
-      class { 'mysql::server':
-        service_enabled  => true,
-        service_manage   => true,
-        service_name     => #{service_name},
-        service_provider => #{service_provider}
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'users, grants, and databases' do
-    it 'are created' do
-      pp = <<-EOS
-      class { 'mysql::server':
-        users => {
-          'zerg1@localhost' => {
-            ensure                   => 'present',
-            max_connections_per_hour => '0',
-            max_queries_per_hour     => '0',
-            max_updates_per_hour     => '0',
-            max_user_connections     => '0',
-            password_hash            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF',
-          }
-        },
-        grants => {
-          'zerg1@localhost/zergdb.*' => {
-            ensure     => 'present',
-            options    => ['GRANT'],
-            privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'],
-            table      => 'zergdb.*',
-            user       => 'zerg1@localhost',
-          }
-        },
-        databases => {
-          'zergdb' => {
-            ensure  => 'present',
-            charset => 'utf8',
-          }
-        },
-      }
-    EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'has a user' do
-      shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'zerg1@localhost'\"") do |r|
-        expect(r.stdout).to match(/^1$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'has a grant' do
-      shell("mysql -NBe \"SHOW GRANTS FOR zerg1@localhost\"") do |r|
-        expect(r.stdout).to match(/GRANT SELECT, INSERT, UPDATE, DELETE ON `zergdb`.* TO 'zerg1'@'localhost' WITH GRANT OPTION/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'has a database' do
-      shell("mysql -NBe \"SHOW DATABASES LIKE 'zergdb'\"") do |r|
-        expect(r.stdout).to match(/zergdb/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb
deleted file mode 100644
index c064209916a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_database_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql_database', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'setup' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'creating database' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_database { 'spec_db':
-          ensure => present,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the database' do
-      shell("mysql -NBe \"SHOW DATABASES LIKE 'spec_db'\"") do |r|
-        expect(r.stdout).to match(/^spec_db$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'charset and collate' do
-    it 'should create two db of different types idempotently' do
-      pp = <<-EOS
-        mysql_database { 'spec_latin1':
-          charset => 'latin1',
-          collate => 'latin1_swedish_ci',
-        }
-        mysql_database { 'spec_utf8':
-          charset => 'utf8',
-          collate => 'utf8_general_ci',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-
-    it 'should find latin1 db' do
-      shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_latin1") do |r|
-        expect(r.stdout).to match(/^character_set_database\tlatin1\ncollation_database\tlatin1_swedish_ci$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-
-    it 'should find utf8 db' do
-      shell("mysql -NBe \"SHOW VARIABLES LIKE '%_database'\" spec_utf8") do |r|
-        expect(r.stdout).to match(/^character_set_database\tutf8\ncollation_database\tutf8_general_ci$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb
deleted file mode 100644
index df8bea4f319..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_grant_spec.rb
+++ /dev/null
@@ -1,308 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql_grant', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-
-  describe 'setup' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'missing privileges for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test1@tester/test.*':
-          ensure => 'present',
-          table  => 'test.*',
-          user   => 'test1@tester',
-        }
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/privileges parameter is required/)
-    end
-
-    it 'should not find the user' do
-      expect(shell("mysql -NBe \"SHOW GRANTS FOR test1@tester\"", { :acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'test1' on host 'tester'/)
-    end
-  end
-
-  describe 'missing table for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'atest@tester/test.*':
-          ensure => 'present',
-          user   => 'atest@tester',
-          privileges => ['ALL'],
-        }
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-
-    it 'should not find the user' do
-      expect(shell("mysql -NBe \"SHOW GRANTS FOR atest@tester\"", {:acceptable_exit_codes => 1}).stderr).to match(/There is no such grant defined for user 'atest' on host 'tester'/)
-    end
-  end
-
-  describe 'adding privileges' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test2@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test2@tester',
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT SELECT, UPDATE.*TO 'test2'@'tester'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'adding option' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test3@tester/test.*':
-          ensure  => 'present',
-          table   => 'test.*',
-          user    => 'test3@tester',
-          options => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test3@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT SELECT, UPDATE ON `test`.* TO 'test3'@'tester' WITH GRANT OPTION$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'adding all privileges without table' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/table parameter is required./)
-    end
-  end
-
-  describe 'adding all privileges' do
-    it 'should only try to apply ALL' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test4@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test4'@'tester' WITH GRANT OPTION/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  # Test combinations of user@host to ensure all cases work.
-  describe 'short hostname' do
-    it 'should apply' do
-      pp = <<-EOS
-        mysql_grant { 'test@short/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@short',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@long.hostname.com/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@long.hostname.com',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@192.168.5.6/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@192.168.5.6',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@2607:f0d0:1002:0051:0000:0000:0000:0004/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@2607:f0d0:1002:0051:0000:0000:0000:0004',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@::1/128/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@::1/128',
-          privileges => 'ALL',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'finds short hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test@short\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'short'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds long hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'long.hostname.com'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'long.hostname.com'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds ipv4' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.6'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.6'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-    it 'finds short ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'::1/128'\"") do |r|
-        expect(r.stdout).to match(/GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'::1\/128'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-
-  describe 'complex test' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-      $dbSubnet = '10.10.10.%'
-
-      mysql_database { 'foo':
-        ensure => present,
-      }
-
-      exec { 'mysql-create-table':
-        command     => '/usr/bin/mysql -NBe "CREATE TABLE foo.bar (name VARCHAR(20))"',
-        environment => "HOME=${::root_home}",
-        unless      => '/usr/bin/mysql -NBe "SELECT 1 FROM foo.bar LIMIT 1;"',
-        require     => Mysql_database['foo'],
-      }
-
-      Mysql_grant {
-          ensure     => present,
-          options    => ['GRANT'],
-          privileges => ['ALL'],
-          table      => '*.*',
-          require    => [ Mysql_database['foo'], Exec['mysql-create-table'] ],
-      }
-
-      mysql_grant { "user1@${dbSubnet}/*.*":
-          user       => "user1@${dbSubnet}",
-      }
-      mysql_grant { "user2@${dbSubnet}/foo.bar":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user2@${dbSubnet}",
-          table      => 'foo.bar',
-      }
-      mysql_grant { "user3@${dbSubnet}/foo.*":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user3@${dbSubnet}",
-          table      => 'foo.*',
-      }
-      mysql_grant { 'web@%/*.*':
-          user       => 'web@%',
-      }
-      mysql_grant { "web@${dbSubnet}/*.*":
-          user       => "web@${dbSubnet}",
-      }
-      mysql_grant { "web@${fqdn}/*.*":
-          user       => "web@${fqdn}",
-      }
-      mysql_grant { 'web@localhost/*.*':
-          user       => 'web@localhost',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-  end
-
-  describe 'lower case privileges' do
-    it 'create ALL privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'ALL',
-          table      => '*.*',
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'create lowercase all privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'all',
-          table      => '*.*',
-      }
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to eq(0)
-    end
-  end
-
-  describe 'adding procedure privileges' do
-    it 'should work without errors' do
-       pp = <<-EOS
-       mysql_grant { 'test2@tester/PROCEDURE test.simpleproc':
-         ensure     => 'present',
-         table      => 'PROCEDURE test.simpleproc',
-         user       => 'test2@tester',
-         privileges => ['EXECUTE'],
-       }
-       EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r|
-        expect(r.stdout).to match(/GRANT EXECUTE ON PROCEDURE `test`.`simpleproc` TO 'test2'@'tester'/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb
deleted file mode 100644
index 65b403f193b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/types/mysql_user_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'mysql_user', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'setup' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-
-  describe 'adding user' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_user { 'ashp@localhost':
-          password_hash => '6f8c114b58f2ce9e',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r|
-        expect(r.stdout).to match(/^1$/)
-        expect(r.stderr).to be_empty
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 449f35a63b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'should fail' do
-    pp = <<-EOS
-    class { 'mysql::server': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported osfamily/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb
deleted file mode 100644
index 8ec4428bb0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_bindings_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::bindings' do
-  let(:params) {{
-    'java_enable'   => true,
-    'perl_enable'   => true,
-    'php_enable'    => true,
-    'python_enable' => true,
-    'ruby_enable'   => true,
-  }}
-
-  shared_examples 'bindings' do |osfamily, operatingsystem, java_name, perl_name, php_name, python_name, ruby_name|
-    let :facts do
-      { :osfamily => osfamily, :operatingsystem => operatingsystem, :root_home => '/root'}
-    end
-    it { should contain_package('mysql-connector-java').with(
-      :name   => java_name,
-      :ensure => 'present'
-    )}
-    it { should contain_package('perl_mysql').with(
-      :name     => perl_name,
-      :ensure   => 'present'
-    )}
-    it { should contain_package('python-mysqldb').with(
-      :name   => python_name,
-      :ensure => 'present'
-    )}
-    it { should contain_package('ruby_mysql').with(
-      :name     => ruby_name,
-      :ensure   => 'present'
-    )}
-  end
-
-  context 'Debian' do
-    it_behaves_like 'bindings', 'Debian', 'Debian', 'libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
-    it_behaves_like 'bindings', 'Debian', 'Ubuntu', 'libmysql-java', 'libdbd-mysql-perl', 'php5-mysql', 'python-mysqldb', 'libmysql-ruby'
-  end
-
-  context 'freebsd' do
-    it_behaves_like 'bindings', 'FreeBSD', 'FreeBSD', 'databases/mysql-connector-java', 'p5-DBD-mysql', 'databases/php5-mysql', 'databases/py-MySQLdb', 'databases/ruby-mysql'
-  end
-
-  context 'redhat' do
-    it_behaves_like 'bindings', 'RedHat', 'RedHat', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
-    it_behaves_like 'bindings', 'RedHat', 'OpenSuSE', 'mysql-connector-java', 'perl-DBD-MySQL', 'php-mysql', 'MySQL-python', 'ruby-mysql'
-  end
-
-  describe 'on any other os' do
-    let :facts do
-      {:osfamily => 'foo', :root_home => '/root'}
-    end
-
-    it 'should fail' do
-      expect { subject }.to raise_error(/Unsupported osfamily: foo/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb
deleted file mode 100644
index d7386d17a69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_client_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-describe 'mysql::client' do
-  let(:facts) {{ :osfamily => 'RedHat' }}
-
-  context 'with defaults' do
-    it { should_not contain_class('mysql::bindings') }
-    it { should contain_package('mysql_client') }
-  end
-
-  context 'with bindings enabled' do
-    let(:params) {{ :bindings_enable => true }}
-
-    it { should contain_class('mysql::bindings') }
-    it { should contain_package('mysql_client') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb
deleted file mode 100644
index 1d0e7506c44..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_account_security_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::server::account_security' do
-
-  let :facts do {
-    :fqdn     => 'myhost.mydomain',
-    :hostname => 'myhost',
-    :root_home => '/root'
-  }
-  end
-
-  it 'should remove Mysql_User[root@myhost.mydomain]' do
-    should contain_mysql_user('root@myhost.mydomain').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[root@myhost]' do
-    should contain_mysql_user('root@myhost').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[root@127.0.0.1]' do
-    should contain_mysql_user('root@127.0.0.1').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[root@::1]' do
-    should contain_mysql_user('root@::1').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@myhost.mydomain]' do
-    should contain_mysql_user('@myhost.mydomain').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@myhost]' do
-    should contain_mysql_user('@myhost').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@localhost]' do
-    should contain_mysql_user('@localhost').with_ensure('absent')
-  end
-  it 'should remove Mysql_User[@%]' do
-    should contain_mysql_user('@%').with_ensure('absent')
-  end
-
-  it 'should remove Mysql_database[test]' do
-    should contain_mysql_database('test').with_ensure('absent')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb
deleted file mode 100644
index c46f95bd790..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_backup_spec.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::server::backup' do
-
-    let(:default_params) {
-        { 'backupuser'         => 'testuser',
-            'backuppassword'     => 'testpass',
-            'backupdir'          => '/tmp',
-            'backuprotate'       => '25',
-            'delete_before_dump' => true,
-        }
-    }
-    context 'standard conditions' do
-        let(:params) { default_params }
-
-        it { should contain_mysql_user('testuser@localhost').with(
-            :require => 'Class[Mysql::Server::Root_password]'
-        )}
-
-        it { should contain_mysql_grant('testuser@localhost/*.*').with(
-            :privileges => ["SELECT", "RELOAD", "LOCK TABLES", "SHOW VIEW"]
-        )}
-
-        it { should contain_cron('mysql-backup').with(
-            :command => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure  => 'present'
-        )}
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it { should contain_file('mysqlbackupdir').with(
-            :path   => '/tmp',
-            :ensure => 'directory'
-        )}
-
-        it 'should have compression by default' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            ' --all-databases | bzcat -zc > ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql.bz2',
-            ])
-        end
-        it 'should skip backing up events table by default' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            'EVENTS="--ignore-table=mysql.event"',
-            ])
-        end
-
-        it 'should have 25 days of rotation' do
-            # MySQL counts from 0 I guess.
-            should contain_file('mysqlbackup.sh').with_content(/.*ROTATE=24.*/)
-        end
-    end
-
-    context 'custom ownership and mode for backupdir' do
-        let(:params) do
-            { :backupdirmode => '0750',
-                :backupdirowner => 'testuser',
-                :backupdirgroup => 'testgrp',
-            }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackupdir').with(
-            :path => '/tmp',
-            :ensure => 'directory',
-            :mode => '0750',
-            :owner => 'testuser',
-            :group => 'testgrp'
-        ) }
-    end
-
-    context 'with compression disabled' do
-        let(:params) do
-            { :backupcompress => false }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it 'should be able to disable compression' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            ' --all-databases > ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql',
-            ])
-        end
-    end
-
-    context 'with mysql.events backedup' do
-        let(:params) do
-            { :ignore_events => false }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it 'should be able to backup events table' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            'EVENTS="--events"',
-            ])
-        end
-    end
-
-
-    context 'with database list specified' do
-        let(:params) do
-            { :backupdatabases => ['mysql'] }.merge(default_params)
-        end
-
-        it { should contain_file('mysqlbackup.sh').with(
-            :path   => '/usr/local/sbin/mysqlbackup.sh',
-            :ensure => 'present'
-        ) }
-
-        it 'should have a backup file for each database' do
-            content = subject.resource('file','mysqlbackup.sh').send(:parameters)[:content]
-            content.should match(' mysql | bzcat -zc \${DIR}\\\${PREFIX}mysql_`date')
-            #      verify_contents(subject, 'mysqlbackup.sh', [
-            #        ' mysql | bzcat -zc ${DIR}/${PREFIX}mysql_`date +%Y%m%d-%H%M%S`.sql',
-            #      ])
-        end 
-    end
-
-    context 'with file per database' do
-        let(:params) do
-            default_params.merge({ :file_per_database => true })
-        end
-
-        it 'should loop through backup all databases' do
-            verify_contents(subject, 'mysqlbackup.sh', [
-                            'mysql -s -r -N -e \'SHOW DATABASES\' | while read dbname',
-                            'do',
-                            '  mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \\',
-                            '    ${EVENTS} \\',
-                            '    ${dbname} | bzcat -zc > ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql.bz2',
-                            'done',
-            ])
-        end
-
-        context 'with compression disabled' do
-            let(:params) do
-                default_params.merge({ :file_per_database => true, :backupcompress => false })
-            end
-
-            it 'should loop through backup all databases without compression' do
-                verify_contents(subject, 'mysqlbackup.sh', [
-                                '    ${dbname} > ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql',
-                ])
-            end
-        end
-    end
-
-		context 'with postscript' do
-			let(:params) do
-				default_params.merge({ :postscript => 'rsync -a /tmp backup01.local-lan:' })
-			end
-
-			it 'should be add postscript' do
-				verify_contents(subject, 'mysqlbackup.sh', [
-					'rsync -a /tmp backup01.local-lan:',
-				])
-			end
-		end
-
-		context 'with postscripts' do
-			let(:params) do
-				default_params.merge({ :postscript => [
-					'rsync -a /tmp backup01.local-lan:',
-					'rsync -a /tmp backup02.local-lan:',
-				]})
-			end
-
-			it 'should be add postscript' do
-				verify_contents(subject, 'mysqlbackup.sh', [
-					'rsync -a /tmp backup01.local-lan:',
-					'rsync -a /tmp backup02.local-lan:',
-				])
-			end
-		end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb
deleted file mode 100644
index 8df9530f0a5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_monitor_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-describe 'mysql::server::monitor' do
-  let :facts do
-    { :osfamily => 'Debian', :root_home => '/root' }
-  end
-  let :pre_condition do
-    "include 'mysql::server'"
-  end
-
-  let :default_params do
-    {
-      :mysql_monitor_username   => 'monitoruser',
-      :mysql_monitor_password   => 'monitorpass',
-      :mysql_monitor_hostname   => 'monitorhost',
-    }
-  end
-
-  let :params do
-    default_params
-  end
-
-  it { should contain_mysql_user('monitoruser@monitorhost')}
-
-  it { should contain_mysql_grant('monitoruser@monitorhost/*.*').with(
-    :ensure     => 'present',
-    :user       => 'monitoruser@monitorhost',
-    :table      => '*.*',
-    :privileges => ["PROCESS", "SUPER"],
-    :require    => 'Mysql_user[monitoruser@monitorhost]'
-  )}
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb
deleted file mode 100644
index 7e9499a65ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_mysqltuner_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-describe 'mysql::server::mysqltuner' do
-
-  it { should contain_file('/usr/local/bin/mysqltuner') }
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb
deleted file mode 100644
index c14b70f7c66..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/classes/mysql_server_spec.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-require 'spec_helper'
-describe 'mysql::server' do
-  let(:facts) {{:osfamily => 'RedHat', :root_home => '/root'}}
-
-  context 'with defaults' do
-    it { should contain_class('mysql::server::install') }
-    it { should contain_class('mysql::server::config') }
-    it { should contain_class('mysql::server::service') }
-    it { should contain_class('mysql::server::root_password') }
-    it { should contain_class('mysql::server::providers') }
-  end
-
-  # make sure that overriding the mysqld settings keeps the defaults for everything else
-  context 'with overrides' do
-    let(:params) {{ :override_options => { 'mysqld' => { 'socket' => '/var/lib/mysql/mysql.sock' } } }}
-    it do
-      should contain_file('/etc/my.cnf').with({
-        :mode => '0644',
-      }).with_content(/basedir/)
-    end
-  end
-
-  describe 'with multiple instance of an option' do
-    let(:params) {{ :override_options => { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2', 'base3'], } }}}
-    it do
-      should contain_file('/etc/my.cnf').with_content(
-        /^replicate-do-db = base1$/
-      ).with_content(
-        /^replicate-do-db = base2$/
-      ).with_content(
-        /^replicate-do-db = base3$/
-      )
-    end
-  end
-
-  describe 'an option set to true' do
-    let(:params) {
-      { :override_options => { 'mysqld' => { 'ssl' => true } }}
-    }
-    it do
-      should contain_file('/etc/my.cnf').with_content(/^\s*ssl\s*(?:$|= true)/m)
-    end
-  end
-
-  describe 'an option set to false' do
-    let(:params) {
-      { :override_options => { 'mysqld' => { 'ssl' => false } }}
-    }
-    it do
-      should contain_file('/etc/my.cnf').with_content(/^\s*ssl = false/m)
-    end
-  end
-
-  context 'with remove_default_accounts set' do
-    let (:params) {{ :remove_default_accounts => true }}
-    it { should contain_class('mysql::server::account_security') }
-  end
-
-  context 'mysql::server::install' do
-    let(:params) {{ :package_ensure => 'present', :name => 'mysql-server' }}
-    it do
-      should contain_package('mysql-server').with({
-      :ensure => :present,
-      :name   => 'mysql-server',
-    })
-    end
-  end
-
-  context 'mysql::server::config' do
-    it do
-      should contain_file('/etc/mysql').with({
-        :ensure => :directory,
-        :mode   => '0755',
-      })
-    end
-
-    it do
-      should contain_file('/etc/mysql/conf.d').with({
-        :ensure => :directory,
-        :mode   => '0755',
-      })
-    end
-
-    it do
-      should contain_file('/etc/my.cnf').with({
-        :mode => '0644',
-      })
-    end
-  end
-
-  context 'mysql::server::service' do
-    context 'with defaults' do
-      it { should contain_service('mysqld') }
-    end
-
-    context 'service_enabled set to false' do
-      let(:params) {{ :service_enabled => false }}
-
-      it do
-        should contain_service('mysqld').with({
-          :ensure => :stopped
-        })
-      end
-    end
-  end
-
-  context 'mysql::server::root_password' do
-    describe 'when defaults' do
-      it { should_not contain_mysql_user('root@localhost') }
-      it { should_not contain_file('/root/.my.cnf') }
-    end
-    describe 'when set' do
-      let(:params) {{:root_password => 'SET' }}
-      it { should contain_mysql_user('root@localhost') }
-      it { should contain_file('/root/.my.cnf') }
-    end
-
-  end
-
-  context 'mysql::server::providers' do
-    describe 'with users' do
-      let(:params) {{:users => {
-        'foo@localhost' => {
-          'max_connections_per_hour' => '1',
-          'max_queries_per_hour'     => '2',
-          'max_updates_per_hour'     => '3',
-          'max_user_connections'     => '4',
-          'password_hash'            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF'
-        },
-        'foo2@localhost' => {}
-      }}}
-      it { should contain_mysql_user('foo@localhost').with(
-        :max_connections_per_hour => '1',
-        :max_queries_per_hour     => '2',
-        :max_updates_per_hour     => '3',
-        :max_user_connections     => '4',
-        :password_hash            => '*F3A2A51A9B0F2BE2468926B4132313728C250DBF'
-      )}
-      it { should contain_mysql_user('foo2@localhost').with(
-        :max_connections_per_hour => nil,
-        :max_queries_per_hour     => nil,
-        :max_updates_per_hour     => nil,
-        :max_user_connections     => nil,
-        :password_hash            => ''
-      )}
-    end
-
-    describe 'with grants' do
-      let(:params) {{:grants => {
-        'foo@localhost/somedb.*' => {
-          'user'       => 'foo@localhost',
-          'table'      => 'somedb.*',
-          'privileges' => ["SELECT", "UPDATE"],
-          'options'    => ["GRANT"],
-        },
-        'foo2@localhost/*.*' => {
-          'user'       => 'foo2@localhost',
-          'table'      => '*.*',
-          'privileges' => ["SELECT"],
-        },
-      }}}
-      it { should contain_mysql_grant('foo@localhost/somedb.*').with(
-        :user       => 'foo@localhost',
-        :table      => 'somedb.*',
-        :privileges => ["SELECT", "UPDATE"],
-        :options    => ["GRANT"]
-      )}
-      it { should contain_mysql_grant('foo2@localhost/*.*').with(
-        :user       => 'foo2@localhost',
-        :table      => '*.*',
-        :privileges => ["SELECT"],
-        :options    => nil
-      )}
-    end
-
-    describe 'with databases' do
-      let(:params) {{:databases => {
-        'somedb' => {
-          'charset' => 'latin1',
-          'collate' => 'latin1',
-        },
-        'somedb2' => {}
-      }}}
-      it { should contain_mysql_database('somedb').with(
-        :charset => 'latin1',
-        :collate => 'latin1'
-      )}
-      it { should contain_mysql_database('somedb2')}
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb
deleted file mode 100644
index a7ee31ff8b7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/defines/mysql_db_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe 'mysql::db', :type => :define do
-  let(:facts) {{ :osfamily => 'RedHat' }}
-  let(:title) { 'test_db' }
-
-  let(:params) {
-    { 'user'     => 'testuser',
-      'password' => 'testpass',
-    }
-  }
-
-  it 'should report an error when ensure is not present or absent' do
-    params.merge!({'ensure' => 'invalid_val'})
-    expect { subject }.to raise_error(Puppet::Error,
-      /invalid_val is not supported for ensure\. Allowed values are 'present' and 'absent'\./)
-  end
-
-  it 'should not notify the import sql exec if no sql script was provided' do
-    should contain_mysql_database('test_db').without_notify
-  end
-
-  it 'should subscribe to database if sql script is given' do
-    params.merge!({'sql' => 'test_sql'})
-    should contain_exec('test_db-import').with_subscribe('Mysql_database[test_db]')
-  end
-
-  it 'should only import sql script on creation if not enforcing' do
-    params.merge!({'sql' => 'test_sql', 'enforce_sql' => false})
-    should contain_exec('test_db-import').with_refreshonly(true)
-  end
-
-  it 'should import sql script on creation if enforcing' do
-    params.merge!({'sql' => 'test_sql', 'enforce_sql' => true})
-    should contain_exec('test_db-import').with_refreshonly(false)
-  end
-
-  it 'should not create database and database user' do
-    params.merge!({'ensure' => 'absent', 'host' => 'localhost'})
-    should contain_mysql_database('test_db').with_ensure('absent')
-    should contain_mysql_user('testuser@localhost').with_ensure('absent')
-  end
-
-  it 'should create with an appropriate collate and charset' do
-    params.merge!({'charset' => 'utf8', 'collate' => 'utf8_danish_ci'})
-    should contain_mysql_database('test_db').with({
-      'charset' => 'utf8',
-      'collate' => 'utf8_danish_ci',
-    })
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper.rb
deleted file mode 100644
index 1fd2563f597..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter "/spec/"
-end
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb
deleted file mode 100644
index a76c2e58338..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = [ 'Windows', 'Solaris', 'AIX' ]
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    # Install Puppet
-    if host.is_pe?
-      install_pe
-    else
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'mysql')
-    hosts.each do |host|
-      # Required for binding tests.
-      if fact('osfamily') == 'RedHat'
-        version = fact("operatingsystemmajrelease")
-        shell("yum localinstall -y http://yum.puppetlabs.com/puppetlabs-release-el-#{version}.noarch.rpm")
-        if version == '6'
-          shell("yum localinstall -y http://mirror.pnl.gov/epel/6/i386/epel-release-6-8.noarch.rpm")
-        elsif version == '5'
-          shell("yum localinstall -y http://mirrors.servercentral.net/fedora/epel/5/i386/epel-release-5-4.noarch.rpm")
-        else
-          puts "Sorry, this version is not supported."
-          exit
-        end
-      end
-
-      shell("/bin/touch #{default['distmoduledir']}/hiera.yaml")
-      shell('puppet module install puppetlabs-stdlib --version 3.2.0', { :acceptable_exit_codes => [0,1] })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb
deleted file mode 100644
index de20690c51e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  c.include RSpecSystemPuppet::Helpers
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'mysql')
-    shell('puppet module install puppetlabs-stdlib')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb
deleted file mode 100644
index 11f776a05c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_account_delete_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::account_security class' do
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': remove_default_accounts => true }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe 'accounts' do
-      it 'should delete accounts' do
-        shell("mysql -e 'show grants for root@127.0.01;'") do |s|
-          s.exit_code.should == 1
-        end
-      end
-
-     it 'should delete databases' do
-      shell("mysql -e 'show databases;' |grep test") do |s|
-        s.exit_code.should == 1
-      end
-     end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb
deleted file mode 100644
index cdbf4ed2789..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_backup_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::backup class' do
-  context 'should work with no errors' do
-    pp = <<-EOS
-      class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-      mysql::db { 'backup1':
-        user     => 'backup',
-        password => 'secret',
-      }
-      
-      class { 'mysql::server::backup':
-        backupuser     => 'myuser',
-        backuppassword => 'mypassword',
-        backupdir      => '/tmp/backups',
-        backupcompress => true,
-        postscript     => [
-          'rm -rf /var/tmp/mysqlbackups',
-          'rm -f /var/tmp/mysqlbackups.done',
-          'cp -r /tmp/backups /var/tmp/mysqlbackups',
-          'touch /var/tmp/mysqlbackups.done',
-        ],
-      }
-    EOS
-
-    context puppet_apply(pp) do
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should_not == 1 }
-      its(:refresh) { should be_nil }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-  end
-
-  describe 'mysqlbackup.sh' do
-    context 'should run mysqlbackup.sh with no errors' do
-      context shell("/usr/local/sbin/mysqlbackup.sh") do
-        its(:exit_code) { should be_zero }
-        its(:stderr) { should be_empty }
-      end
-    end
-
-    context 'should dump all databases to single file' do
-      describe command('ls /tmp/backups/ | grep -c "mysql_backup_[0-9][0-9]*-[0-9][0-9]*.sql.bz2"') do
-        it { should return_stdout /1/ }
-        it { should return_exit_status 0 }
-      end
-    end
-
-    context 'should create one file per database per run' do
-      context shell("/usr/local/sbin/mysqlbackup.sh") do
-        its(:exit_code) { should be_zero }
-        its(:stderr) { should be_empty }
-      end
-
-      describe command('ls /tmp/backups/ | grep -c "mysql_backup_backup1_[0-9][0-9]*-[0-9][0-9]*.sql.bz2"') do
-        it { should return_stdout /2/ }
-        it { should return_exit_status 0 }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb
deleted file mode 100644
index 694cf574d43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_bindings_spec.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::bindings class' do
-  let(:os) {
-    node.facts['osfamily']
-  }
-
-  case node.facts['osfamily']
-  when 'RedHat'
-    java_package   = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    python_package = 'MySQL-python'
-    ruby_package   = 'ruby-mysql'
-  when 'Suse'
-    java_package   = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    python_package = 'python-mysql'
-    case node.facts['operatingsystem']
-    when /OpenSuSE/
-      ruby_package = 'rubygem-mysql'
-    when /(SLES|SLED)/
-      ruby_package = 'ruby-mysql'
-    end
-  when 'Debian'
-    java_package = 'libmysql-java'
-    perl_package   = 'libdbd-mysql-perl'
-    python_package = 'python-mysqldb'
-    ruby_package   = 'libmysql-ruby'
-  when 'FreeBSD'
-    java_package = 'databases/mysql-connector-java'
-    perl_package   = 'p5-DBD-mysql'
-    python_package = 'databases/py-MySQLdb'
-    ruby_package   = 'ruby-mysql'
-  else
-    case node.facts['operatingsystem']
-    when 'Amazon'
-      java_package = 'mysql-connector-java'
-    perl_package   = 'perl-DBD-MySQL'
-    python_package = 'MySQL-python'
-    ruby_package   = 'ruby-mysql'
-    end
-  end
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::bindings': }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'enabling bindings' do
-    it 'should work with no errors' do
-      puppet_apply(%{
-      class { 'mysql::bindings':
-        java_enable   => true,
-        perl_enable   => true,
-        python_enable => true,
-        ruby_enable   => true,
-      }
-      })
-    end
-
-    describe package(java_package) do
-      it { should be_installed }
-    end
-
-    describe package(perl_package) do
-      it { should be_installed }
-    end
-
-    describe package(python_package) do
-      it { should be_installed }
-    end
-
-    describe package(ruby_package) do
-      it { should be_installed }
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb
deleted file mode 100644
index 49299e1ddb1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_db_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::db define' do
-  describe 'creating a database' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-        mysql::db { 'spec1':
-          user     => 'root1',
-          password => 'password',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    it 'should have the database' do
-      shell("mysql -e 'show databases;'|grep spec1") do |s|
-        s.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'creating a database with post-sql' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': override_options => { 'root_password' => 'password' } }
-        file { '/tmp/spec.sql':
-          ensure  => file,
-          content => 'CREATE TABLE table1 (id int);',
-          before  => Mysql::Db['spec2'],
-        }
-        mysql::db { 'spec2':
-          user     => 'root1',
-          password => 'password',
-          sql      => '/tmp/spec.sql',
-        }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    it 'should have the table' do
-      shell("mysql -e 'show tables;' spec2|grep table1") do |s|
-        s.exit_code.should == 0
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb
deleted file mode 100644
index b7ebd0dffd5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_monitor_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::monitor class' do
-  context 'should work with no errors' do
-    pp = <<-EOS
-      class { 'mysql::server': root_password => 'password' } 
-      
-      class { 'mysql::server::monitor':
-        mysql_monitor_username => 'monitoruser',
-        mysql_monitor_password => 'monitorpass',
-        mysql_monitor_hostname => 'localhost',
-      }
-    EOS
-
-    context puppet_apply(pp) do
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should_not == 1 }
-      its(:refresh) { should be_nil }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-
-    context 'should run mysqladmin ping with no errors' do
-      describe command("mysqladmin -u monitoruser -pmonitorpass -h localhost ping") do
-        it { should return_stdout /mysqld is alive/ }
-        it { should return_exit_status 0 }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb
deleted file mode 100644
index ea9cafad56c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_root_password_spec.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql::server::root_password class' do
-
-  describe 'reset' do
-    it 'shuts down mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => false }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    it 'deletes the /root/.my.cnf password' do
-      shell('rm -rf /root/.my.cnf')
-    end
-
-    it 'deletes all databases' do
-      case node.facts['osfamily']
-      when 'RedHat'
-        shell('rm -rf `grep datadir /etc/my.cnf | cut -d" " -f 3`/*')
-      when 'Debian'
-        shell('rm -rf `grep datadir /etc/mysql/my.cnf | cut -d" " -f 3`/*')
-        shell('mysql_install_db')
-      end
-    end
-
-    it 'starts up mysql' do
-      pp = <<-EOS
-      class { 'mysql::server': service_enabled => true }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-  end
-
-  describe 'when unset' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'when set' do
-    it 'should work' do
-      pp = <<-EOS
-        class { 'mysql::server': root_password => 'new', old_root_password => 'test' }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb
deleted file mode 100644
index b9ecabdce23..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/mysql_server_spec.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql class' do
-  case node.facts['osfamily']
-  when 'RedHat'
-    package_name = 'mysql-server'
-    service_name = 'mysqld'
-    mycnf        = '/etc/my.cnf'
-  when 'Suse'
-    package_name = 'mysql-community-server'
-    service_name = 'mysql'
-    mycnf        = '/etc/my.cnf'
-  when 'Debian'
-    package_name = 'mysql-server'
-    service_name = 'mysql'
-    mycnf        = '/etc/mysql/my.cnf'
-  end
-
-  describe 'running puppet code' do
-    # Using puppet_apply as a helper
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      # Run it twice and test for idempotency
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe package(package_name) do
-      it { should be_installed }
-    end
-
-    describe service(service_name) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'mycnf' do
-    it 'should contain sensible values' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer = 16M' }
-      it { should contain 'max_binlog_size = 100M' }
-      it { should contain 'query_cache_size = 16M' }
-    end
-  end
-
-  describe 'my.cnf changes' do
-    it 'sets values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'key_buffer'       => '32M',
-              'max_binlog_size'  => '200M',
-              'query_cache_size' => '32M',
-            }
-          }  
-        }
-      EOS
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    describe file(mycnf) do
-      it { should contain 'key_buffer = 32M' }
-      it { should contain 'max_binlog_size = 200M' }
-      it { should contain 'query_cache_size = 32M' }
-    end
-  end
-
-  describe 'my.cnf should contain multiple instances of the same option' do
-    it 'sets multiple values' do
-      pp = <<-EOS
-        class { 'mysql::server':
-          override_options => { 'mysqld' => 
-            { 'replicate-do-db' => ['base1', 'base2', 'base3'], }
-          }  
-        }
-      EOS
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-      end
-    end
-
-    describe file(mycnf) do
-      it { should contain 'replicate-do-db = base1' }
-      it { should contain 'replicate-do-db = base2' }
-      it { should contain 'replicate-do-db = base3' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb
deleted file mode 100644
index a3bdf8282fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_grant_spec.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql_grant' do
-
-  describe 'setup' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      puppet_apply(pp)
-    end
-  end
-
-  describe 'missing privileges for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test1@tester/test.*':
-          ensure => 'present',
-          table  => 'test.*',
-          user   => 'test1@tester',
-        }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.stderr.should =~ /privileges parameter is required/
-      end
-    end
-
-    it 'should not find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test1@tester\"") do |r|
-        r.stderr.should =~ /There is no such grant defined for user 'test1' on host 'tester'/
-        r.exit_code.should eq 1
-      end
-    end
-  end
-
-  describe 'missing table for user' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'atest@tester/test.*':
-          ensure => 'present',
-          user   => 'atest@tester',
-          privileges => ['ALL'],
-        }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should eq 1
-      end
-    end
-
-    it 'should not find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR atest@tester\"") do |r|
-        r.stderr.should =~ /There is no such grant defined for user 'atest' on host 'tester'/
-        r.exit_code.should eq 1
-      end
-    end
-  end
-
-  describe 'adding privileges' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test2@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test2@tester',
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test2@tester\"") do |r|
-        r.stdout.should =~ /GRANT SELECT, UPDATE.*TO 'test2'@'tester'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'adding option' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_grant { 'test3@tester/test.*':
-          ensure  => 'present',
-          table   => 'test.*',
-          user    => 'test3@tester',
-          options => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE'],
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test3@tester\"") do |r|
-        r.stdout.should =~ /GRANT SELECT, UPDATE ON `test`.* TO 'test3'@'tester' WITH GRANT OPTION$/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'adding all privileges without table' do
-    it 'should fail' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.stderr.should =~ /table parameter is required./
-      end
-    end
-
-  end
-
-
-  describe 'adding all privileges' do
-    it 'should only try to apply ALL' do
-      pp = <<-EOS
-        mysql_grant { 'test4@tester/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test4@tester',
-          options    => ['GRANT'],
-          privileges => ['SELECT', 'UPDATE', 'ALL'],
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test4@tester\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test4'@'tester' WITH GRANT OPTION/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  # Test combinations of user@host to ensure all cases work.
-  describe 'short hostname' do
-    it 'should apply' do
-      pp = <<-EOS
-        mysql_grant { 'test@short/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@short',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@long.hostname.com/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@long.hostname.com',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@192.168.5.6/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@192.168.5.6',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@2607:f0d0:1002:0051:0000:0000:0000:0004/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@2607:f0d0:1002:0051:0000:0000:0000:0004',
-          privileges => 'ALL',
-        }
-        mysql_grant { 'test@::1/128/test.*':
-          ensure     => 'present',
-          table      => 'test.*',
-          user       => 'test@::1/128',
-          privileges => 'ALL',
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'finds short hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR test@short\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'short'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds long hostname' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'long.hostname.com'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'long.hostname.com'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds ipv4' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'192.168.5.6'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'192.168.5.6'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'2607:f0d0:1002:0051:0000:0000:0000:0004'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-    it 'finds short ipv6' do
-      shell("mysql -NBe \"SHOW GRANTS FOR 'test'@'::1/128'\"") do |r|
-        r.stdout.should =~ /GRANT ALL PRIVILEGES ON `test`.* TO 'test'@'::1\/128'/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'complex test' do
-    it 'setup mysql::server' do
-      pp = <<-EOS
-      $dbSubnet = '10.10.10.%'
-
-      mysql_database { 'foo':
-        ensure => present,
-      }
-
-      exec { 'mysql-create-table':
-        command     => '/usr/bin/mysql -NBe "CREATE TABLE foo.bar (name VARCHAR(20))"',
-        environment => "HOME=${::root_home}",
-        unless      => '/usr/bin/mysql -NBe "SELECT 1 FROM foo.bar LIMIT 1;"',
-        require     => Mysql_database['foo'],
-      }
-
-      Mysql_grant {
-          ensure     => present,
-          options    => ['GRANT'],
-          privileges => ['ALL'],
-          table      => '*.*',
-          require    => [ Mysql_database['foo'], Exec['mysql-create-table'] ],
-      }
-
-      mysql_grant { "user1@${dbSubnet}/*.*":
-          user       => "user1@${dbSubnet}",
-      }
-      mysql_grant { "user2@${dbSubnet}/foo.bar":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user2@${dbSubnet}",
-          table      => 'foo.bar',
-      }
-      mysql_grant { "user3@${dbSubnet}/foo.*":
-          privileges => ['SELECT', 'INSERT', 'UPDATE'],
-          user       => "user3@${dbSubnet}",
-          table      => 'foo.*',
-      }
-      mysql_grant { 'web@%/*.*':
-          user       => 'web@%',
-      }
-      mysql_grant { "web@${dbSubnet}/*.*":
-          user       => "web@${dbSubnet}",
-      }
-      mysql_grant { "web@${fqdn}/*.*":
-          user       => "web@${fqdn}",
-      }
-      mysql_grant { 'web@localhost/*.*':
-          user       => 'web@localhost',
-      }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should_not == 1
-        r.refresh
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe 'lower case privileges' do
-    it 'create ALL privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'ALL',
-          table      => '*.*',
-      }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'create lowercase all privs' do
-      pp = <<-EOS
-      mysql_grant { 'lowercase@localhost/*.*':
-          user       => 'lowercase@localhost',
-          privileges => 'all',
-          table      => '*.*',
-      }
-      EOS
-
-      puppet_apply(pp) do |r|
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb
deleted file mode 100644
index 7aaa9797e40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/system/types/mysql_user_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper_system'
-
-describe 'mysql_user' do
-
-  describe 'setup' do
-    it 'should work with no errors' do
-      pp = <<-EOS
-        class { 'mysql::server': }
-      EOS
-
-      puppet_apply(pp)
-    end
-  end
-
-  describe 'adding user' do
-    it 'should work without errors' do
-      pp = <<-EOS
-        mysql_user { 'ashp@localhost':
-          password_hash => '6f8c114b58f2ce9e',
-        }
-      EOS
-
-      puppet_apply(pp)
-    end
-
-    it 'should find the user' do
-      shell("mysql -NBe \"select '1' from mysql.user where CONCAT(user, '@', host) = 'ashp@localhost'\"") do |r|
-        r.stdout.should =~ /^1$/
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb
deleted file mode 100644
index 07369100496..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/mysql_password_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe 'the mysql_password function' do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it 'should exist' do
-    Puppet::Parser::Functions.function('mysql_password').should == 'function_mysql_password'
-  end
-
-  it 'should raise a ParseError if there is less than 1 arguments' do
-    lambda { scope.function_mysql_password([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should raise a ParseError if there is more than 1 arguments' do
-    lambda { scope.function_mysql_password(%w(foo bar)) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it 'should convert password into a hash' do
-    result = scope.function_mysql_password(%w(password))
-    result.should(eq('*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19'))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb
deleted file mode 100644
index fa9c72b787f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/functions/mysql_deepmerge_spec.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:mysql_deepmerge) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling mysql_deepmerge from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = mysql_deepmerge()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$my_hash={'one' => 1}\n$x = mysql_deepmerge($my_hash)"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-
-  describe 'when calling mysql_deepmerge on the scope instance' do
-    it 'should require all parameters are hashes' do
-      expect { new_hash = scope.function_mysql_deepmerge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
-      expect { new_hash = scope.function_mysql_deepmerge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
-    end
-
-    it 'should accept empty strings as puppet undef' do
-      expect { new_hash = scope.function_mysql_deepmerge([{}, ''])}.not_to raise_error
-    end
-
-    it 'should be able to mysql_deepmerge two hashes' do
-      new_hash = scope.function_mysql_deepmerge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}])
-      new_hash['one'].should   == '1'
-      new_hash['two'].should   == '2'
-      new_hash['three'].should == '2'
-    end
-
-    it 'should mysql_deepmerge multiple hashes' do
-      hash = scope.function_mysql_deepmerge([{'one' => 1}, {'one' => '2'}, {'one' => '3'}])
-      hash['one'].should == '3'
-    end
-
-    it 'should accept empty hashes' do
-      scope.function_mysql_deepmerge([{},{},{}]).should == {}
-    end
-
-    it 'should mysql_deepmerge subhashes' do
-      hash = scope.function_mysql_deepmerge([{'one' => 1}, {'two' => 2, 'three' => { 'four' => 4 } }])
-      hash['one'].should == 1
-      hash['two'].should == 2
-      hash['three'].should == { 'four' => 4 }
-    end
-
-    it 'should append to subhashes' do
-      hash = scope.function_mysql_deepmerge([{'one' => { 'two' => 2 } }, { 'one' => { 'three' => 3 } }])
-      hash['one'].should == { 'two' => 2, 'three' => 3 }
-    end
-
-    it 'should append to subhashes 2' do
-      hash = scope.function_mysql_deepmerge([{'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, {'two' => 'dos', 'three' => { 'five' => 5 } }])
-      hash['one'].should == 1
-      hash['two'].should == 'dos'
-      hash['three'].should == { 'four' => 4, 'five' => 5 }
-    end
-
-    it 'should append to subhashes 3' do
-      hash = scope.function_mysql_deepmerge([{ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, { 'key1' => { 'b' => 99 } }])
-      hash['key1'].should == { 'a' => 1, 'b' => 99 }
-      hash['key2'].should == { 'c' => 3 }
-    end
-
-    it 'should equate keys mod dash and underscore' do
-      hash = scope.function_mysql_deepmerge([{  'a-b-c' => 1 } , { 'a_b_c' => 10 }])
-      hash['a_b_c'].should == 10
-      hash.should_not have_key('a-b-c')
-    end
-
-    it 'should keep style of the last when keys are euqal mod dash and underscore' do
-      hash = scope.function_mysql_deepmerge([{  'a-b-c' => 1,  'b_c_d' => { 'c-d-e' => 2, 'e-f-g' => 3 }} , { 'a_b_c' => 10, 'b-c-d' => { 'c_d_e' => 12 } }])
-      hash['a_b_c'].should == 10
-      hash.should_not have_key('a-b-c')
-      hash['b-c-d'].should == { 'e-f-g' => 3, 'c_d_e' => 12 }
-      hash.should_not have_key('b_c_d')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb
deleted file mode 100644
index e2557fc35d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database/mysql_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:database).provider(:mysql)
-
-describe provider_class do
-  subject { provider_class }
-
-  let(:root_home) { '/root' }
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-
-  let(:raw_databases) do
-    <<-SQL_OUTPUT
-information_schema
-mydb
-mysql
-performance_schema
-test
-    SQL_OUTPUT
-  end
-
-  let(:parsed_databases) { %w(information_schema mydb mysql performance_schema test) }
-
-  before :each do
-    @resource = Puppet::Type::Database.new(
-      { :charset => 'utf8', :name => 'new_database' }
-    )
-    @provider = provider_class.new(@resource)
-    Facter.stubs(:value).with(:root_home).returns(root_home)
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:defaults_file).returns('--defaults-extra-file=/root/.my.cnf')
-  end
-
-  describe 'self.instances' do
-    it 'returns an array of databases' do
-      subject.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns(raw_databases)
-
-      databases = subject.instances.collect {|x| x.name }
-      parsed_databases.should match_array(databases)
-    end
-  end
-
-  describe 'create' do
-    it 'makes a user' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', "create database `#{@resource[:name]}` character set #{@resource[:charset]}"])
-      @provider.create
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user if present' do
-      subject.expects(:mysqladmin).with([defaults_file, '-f', 'drop', "#{@resource[:name]}"])
-      @provider.destroy
-    end
-  end
-
-  describe 'charset' do
-    it 'returns a charset' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', "show create database `#{@resource[:name]}`"]).returns('mydbCREATE DATABASE `mydb` /*!40100 DEFAULT CHARACTER SET utf8 */')
-      @provider.charset.should == 'utf8'
-    end
-  end
-
-  describe 'charset=' do
-    it 'changes the charset' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{@resource[:name]}` CHARACTER SET blah"]).returns('0')
-
-      @provider.charset=('blah')
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      subject.expects(:mysql).with([defaults_file, '-NBe', 'show databases']).returns('information_schema\nmydb\nmysql\nperformance_schema\ntest')
-      @provider.exists?
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('#{root_home}/.my.cnf').returns(true)
-      @provider.defaults_file.should == '--defaults-extra-file=/root/.my.cnf'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb
deleted file mode 100644
index 4d9484d04f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_grant/mysql_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require 'puppet'
-require 'mocha/api'
-require 'spec_helper'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:database_grant).provider(:mysql)
-describe provider_class do
-  let(:root_home) { '/root' }
-
-  before :each do
-    @resource = Puppet::Type::Database_grant.new(
-      { :privileges => 'all', :provider => 'mysql', :name => 'user@host'}
-    )
-    @provider = provider_class.new(@resource)
-    Facter.stubs(:value).with(:root_home).returns(root_home)
-    File.stubs(:file?).with("#{root_home}/.my.cnf").returns(true)
-  end
-
-  it 'should query privileges from the database' do
-    provider_class.expects(:mysql) .with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe user']).returns <<-EOT
-Field	Type	Null	Key	Default	Extra
-Host	char(60)	NO	PRI		
-User	char(16)	NO	PRI		
-Password	char(41)	NO			
-Select_priv	enum('N','Y')	NO		N	
-Insert_priv	enum('N','Y')	NO		N	
-Update_priv	enum('N','Y')	NO		N
-EOT
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', 'describe db']).returns <<-EOT
-Field	Type	Null	Key	Default	Extra
-Host	char(60)	NO	PRI		
-Db	char(64)	NO	PRI		
-User	char(16)	NO	PRI		
-Select_priv	enum('N','Y')	NO		N	
-Insert_priv	enum('N','Y')	NO		N	
-Update_priv	enum('N','Y')	NO		N
-EOT
-    provider_class.user_privs.should == %w(Select_priv Insert_priv Update_priv)
-    provider_class.db_privs.should == %w(Select_priv Insert_priv Update_priv)
-  end
-
-  it 'should query set privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
-Host	User	Password	Select_priv	Insert_priv	Update_priv
-host	user		Y	N	Y
-EOT
-    @provider.privileges.should == %w(Select_priv Update_priv)
-  end
-
-  it 'should recognize when all privileges are set' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
-Host	User	Password	Select_priv	Insert_priv	Update_priv
-host	user		Y	Y	Y
-EOT
-    @provider.all_privs_set?.should == true
-  end
-
-  it 'should recognize when all privileges are not set' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "select * from mysql.user where user='user' and host='host'"]).returns <<-EOT
-Host	User	Password	Select_priv	Insert_priv	Update_priv
-host	user		Y	N	Y
-EOT
-    @provider.all_privs_set?.should == false
-  end
-
-  it 'should be able to set all privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%W(--defaults-extra-file=#{root_home}/.my.cnf flush-privileges))
-    @provider.privileges=(%w(all))
-  end
-
-  it 'should be able to set partial privileges' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'N', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%W(--defaults-extra-file=#{root_home}/.my.cnf flush-privileges))
-    @provider.privileges=(%w(Select_priv Update_priv))
-  end
-
-  it 'should be case insensitive' do
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'Y', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(["--defaults-extra-file=#{root_home}/.my.cnf", 'flush-privileges'])
-    @provider.privileges=(%w(SELECT_PRIV insert_priv UpDaTe_pRiV))
-  end
-
-  it 'should not pass --defaults-extra-file if $root_home/.my.cnf is absent' do
-    File.stubs(:file?).with("#{root_home}/.my.cnf").returns(false)
-    provider_class.expects(:mysql).with(['mysql', '-NBe', "SELECT '1' FROM user WHERE user='user' AND host='host'"]).returns "1\n"
-    provider_class.expects(:mysql).with(['mysql', '-Be', "update user set Select_priv = 'Y', Insert_priv = 'N', Update_priv = 'Y' where user='user' and host='host'"])
-    provider_class.expects(:mysqladmin).with(%w(flush-privileges))
-    @provider.privileges=(%w(Select_priv Update_priv))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb
deleted file mode 100644
index 0939fdd224d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/database_user/mysql_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'spec_helper'
-
-provider_class = Puppet::Type.type(:database_user).provider(:mysql)
-
-describe provider_class do
-  subject { provider_class }
-
-  let(:root_home) { '/root' }
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-  let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' }
-
-  let(:raw_users) do
-    <<-SQL_OUTPUT
-root@127.0.0.1
-root@::1
-@localhost
-debian-sys-maint@localhost
-root@localhost
-usvn_user@localhost
-@vagrant-ubuntu-raring-64
-    SQL_OUTPUT
-  end
-
-  let(:parsed_users) { %w(root@127.0.0.1 root@::1 debian-sys-maint@localhost root@localhost usvn_user@localhost) }
-
-  before :each do
-    # password hash = mypass
-    @resource = Puppet::Type::Database_user.new(
-      { :password_hash => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4',
-        :name => 'joe@localhost',
-        :max_user_connections => '10'
-      }
-    )
-    @provider = provider_class.new(@resource)
-    Facter.stubs(:value).with(:root_home).returns(root_home)
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    subject.stubs(:defaults_file).returns('--defaults-extra-file=/root/.my.cnf')
-  end
-
-  describe 'self.instances' do
-    it 'returns an array of users' do
-      subject.stubs(:mysql).with([defaults_file, 'mysql', "-BNeselect concat(User, '@',Host) as User from mysql.user"]).returns(raw_users)
-
-      usernames = subject.instances.collect {|x| x.name }
-      parsed_users.should match_array(usernames)
-    end
-  end
-
-  describe 'create' do
-    it 'makes a user' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "grant usage on *.* to 'joe'@'localhost' identified by PASSWORD
-      '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' with max_user_connections 10"])
-      @provider.expects(:exists?).returns(true)
-      @provider.create.should be_true
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user if present' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "drop user 'joe'@'localhost'"])
-      @provider.expects(:exists?).returns(false)
-      @provider.destroy.should be_true
-    end
-  end
-
-  describe 'password_hash' do
-    it 'returns a hash' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select password from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4')
-      @provider.password_hash.should == '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
-    end
-  end
-
-  describe 'password_hash=' do
-    it 'changes the hash' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'"]).returns('0')
-
-      @provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-      @provider.password_hash=('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-    end
-  end
-
-  describe 'max_user_connections' do
-    it 'returns max user connections' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select max_user_connections from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('10')
-      @provider.max_user_connections.should == '10'
-    end
-  end
-
-  describe 'max_user_connections=' do
-    it 'changes max user connections' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-e', "grant usage on *.* to 'joe'@'localhost' with max_user_connections 42"]).returns('0')
-      @provider.expects(:max_user_connections).returns('42')
-      @provider.max_user_connections=('42')
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      subject.expects(:mysql).with([defaults_file, 'mysql', '-NBe', "select '1' from mysql.user where CONCAT(user, '@', host) = 'joe@localhost'"]).returns('1')
-      @provider.exists?.should be_true
-    end
-  end
-
-  describe 'flush' do
-    it 'removes cached privileges' do
-      subject.expects(:mysqladmin).with([defaults_file, 'flush-privileges'])
-      @provider.flush
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('#{root_home}/.my.cnf').returns(true)
-      @provider.defaults_file.should == '--defaults-extra-file=/root/.my.cnf'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
deleted file mode 100644
index 10f061f5d8f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_database/mysql_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mysql_database).provider(:mysql) do
-
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-
-  let(:raw_databases) do
-    <<-SQL_OUTPUT
-information_schema
-mydb
-mysql
-performance_schema
-test
-    SQL_OUTPUT
-  end
-
-  let(:parsed_databases) { %w(information_schema mydb mysql performance_schema test) }
-
-  let(:resource) { Puppet::Type.type(:mysql_database).new(
-    { :ensure   => :present,
-      :charset  => 'latin1',
-      :collate  => 'latin1_swedish_ci',
-      :name     => 'new_database',
-      :provider => described_class.name
-    }
-  )}
-  let(:provider) { resource.provider }
-
-  before :each do
-    Facter.stubs(:value).with(:root_home).returns('/root')
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    File.stubs(:file?).with('/root/.my.cnf').returns(true)
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns('new_database')
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'", 'new_database']).returns("character_set_database latin1\ncollation_database latin1_swedish_ci\nskip_show_database OFF")
-  end
-
-  let(:instance) { provider.class.instances.first }
-
-  describe 'self.instances' do
-    it 'returns an array of databases' do
-      provider.class.stubs(:mysql).with([defaults_file, '-NBe', 'show databases']).returns(raw_databases)
-      raw_databases.each_line do |db|
-        provider.class.stubs(:mysql).with([defaults_file, '-NBe', "show variables like '%_database'", db.chomp]).returns("character_set_database latin1\ncollation_database  latin1_swedish_ci\nskip_show_database  OFF")
-      end
-      databases = provider.class.instances.collect {|x| x.name }
-      parsed_databases.should match_array(databases)
-    end
-  end
-
-  describe 'self.prefetch' do
-    it 'exists' do
-      provider.class.instances
-      provider.class.prefetch({})
-    end
-  end
-
-  describe 'create' do
-    it 'makes a database' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "create database if not exists `#{resource[:name]}` character set #{resource[:charset]} collate #{resource[:collate]}"])
-      provider.expects(:exists?).returns(true)
-      provider.create.should be_true
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a database if present' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "drop database `#{resource[:name]}`"])
-      provider.expects(:exists?).returns(false)
-      provider.destroy.should be_true
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if database exists' do
-      instance.exists?.should be_true
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('/root/.my.cnf').returns(true)
-      provider.defaults_file.should eq '--defaults-extra-file=/root/.my.cnf'
-    end
-    it 'fails if file missing' do
-      File.stubs(:file?).with('/root/.my.cnf').returns(false)
-      provider.defaults_file.should be_nil
-    end
-  end
-
-  describe 'charset' do
-    it 'returns a charset' do
-      instance.charset.should == 'latin1'
-    end
-  end
-
-  describe 'charset=' do
-    it 'changes the charset' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{resource[:name]}` CHARACTER SET blah"]).returns('0')
-
-      provider.charset=('blah')
-    end
-  end
-
-  describe 'collate' do
-    it 'returns a collate' do
-      instance.collate.should == 'latin1_swedish_ci'
-    end
-  end
-
-  describe 'collate=' do
-    it 'changes the collate' do
-      provider.expects(:mysql).with([defaults_file, '-NBe', "alter database `#{resource[:name]}` COLLATE blah"]).returns('0')
-
-      provider.collate=('blah')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
deleted file mode 100644
index 34639c920fb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/provider/mysql_user/mysql_spec.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:mysql_user).provider(:mysql) do
-  let(:defaults_file) { '--defaults-extra-file=/root/.my.cnf' }
-  let(:newhash) { '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5' }
-
-  let(:raw_users) do
-    <<-SQL_OUTPUT
-root@127.0.0.1
-root@::1
-@localhost
-debian-sys-maint@localhost
-root@localhost
-usvn_user@localhost
-@vagrant-ubuntu-raring-64
-    SQL_OUTPUT
-  end
-
-  let(:parsed_users) { %w(root@127.0.0.1 root@::1 @localhost debian-sys-maint@localhost root@localhost usvn_user@localhost @vagrant-ubuntu-raring-64) }
-
-  let(:resource) { Puppet::Type.type(:mysql_user).new(
-      { :ensure                   => :present,
-        :password_hash            => '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4',
-        :name                     => 'joe@localhost',
-        :max_user_connections     => '10',
-        :max_connections_per_hour => '10',
-        :max_queries_per_hour     => '10',
-        :max_updates_per_hour     => '10',
-        :provider                 => described_class.name
-      }
-  )}
-  let(:provider) { resource.provider }
-
-  before :each do
-    # Set up the stubs for an instances call.
-    Facter.stubs(:value).with(:root_home).returns('/root')
-    Puppet::Util.stubs(:which).with('mysql').returns('/usr/bin/mysql')
-    File.stubs(:file?).with('/root/.my.cnf').returns(true)
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"]).returns('joe@localhost')
-    provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD FROM mysql.user WHERE CONCAT(user, '@', host) = 'joe@localhost'"]).returns('10 10 10 10 *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4')
-  end
-
-  let(:instance) { provider.class.instances.first }
-
-  describe 'self.instances' do
-    it 'returns an array of users' do
-      provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT CONCAT(User, '@',Host) AS User FROM mysql.user"]).returns(raw_users)
-      parsed_users.each do |user|
-        provider.class.stubs(:mysql).with([defaults_file, '-NBe', "SELECT MAX_USER_CONNECTIONS, MAX_CONNECTIONS, MAX_QUESTIONS, MAX_UPDATES, PASSWORD FROM mysql.user WHERE CONCAT(user, '@', host) = '#{user}'"]).returns('10 10 10 10 ')
-      end
-
-      usernames = provider.class.instances.collect {|x| x.name }
-      parsed_users.should match_array(usernames)
-    end
-  end
-
-  describe 'self.prefetch' do
-    it 'exists' do
-      provider.class.instances
-      provider.class.prefetch({})
-    end
-  end
-
-  describe 'create' do
-    it 'makes a user' do
-      provider.expects(:mysql).with([defaults_file, '-e', "GRANT USAGE ON *.* TO 'joe'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' WITH MAX_USER_CONNECTIONS 10 MAX_CONNECTIONS_PER_HOUR 10 MAX_QUERIES_PER_HOUR 10 MAX_UPDATES_PER_HOUR 10"])
-      provider.expects(:exists?).returns(true)
-      provider.create.should be_true
-    end
-  end
-
-  describe 'destroy' do
-    it 'removes a user if present' do
-      provider.expects(:mysql).with([defaults_file, '-e', "DROP USER 'joe'@'localhost'"])
-      provider.expects(:exists?).returns(false)
-      provider.destroy.should be_true
-    end
-  end
-
-  describe 'exists?' do
-    it 'checks if user exists' do
-      instance.exists?.should be_true
-    end
-  end
-
-  describe 'self.defaults_file' do
-    it 'sets --defaults-extra-file' do
-      File.stubs(:file?).with('/root/.my.cnf').returns(true)
-      provider.defaults_file.should eq '--defaults-extra-file=/root/.my.cnf'
-    end
-    it 'fails if file missing' do
-      File.expects(:file?).with('/root/.my.cnf').returns(false)
-      provider.defaults_file.should be_nil
-    end
-  end
-
-  describe 'password_hash' do
-    it 'returns a hash' do
-      instance.password_hash.should == '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
-    end
-  end
-
-  describe 'password_hash=' do
-    it 'changes the hash' do
-      provider.expects(:mysql).with([defaults_file, '-e', "SET PASSWORD FOR 'joe'@'localhost' = '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5'"]).returns('0')
-
-      provider.expects(:password_hash).returns('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-      provider.password_hash=('*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF5')
-    end
-  end
-
-  ['max_user_connections', 'max_connections_per_hour', 'max_queries_per_hour',
-   'max_updates_per_hour'].each do |property|
-
-    describe property do
-      it "returns #{property}" do
-        instance.send("#{property}".to_sym).should == '10'
-      end
-    end
-
-    describe "#{property}=" do
-      it "changes #{property}" do
-        provider.expects(:mysql).with([defaults_file, '-e', "GRANT USAGE ON *.* TO 'joe'@'localhost' WITH #{property.upcase} 42"]).returns('0')
-        provider.expects(property.to_sym).returns('42')
-        provider.send("#{property}=".to_sym, '42')
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb
deleted file mode 100644
index e2ebd90d4e7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_database_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'puppet'
-require 'puppet/type/mysql_database'
-describe Puppet::Type.type(:mysql_database) do
-
-  before :each do
-    @user = Puppet::Type.type(:mysql_database).new(:name => 'test', :charset => 'utf8', :collate => 'utf8_blah_ci')
-  end
-
-  it 'should accept a database name' do
-    @user[:name].should == 'test'
-  end
-
-  it 'should accept a charset' do
-    @user[:charset] = 'latin1'
-    @user[:charset].should == 'latin1'
-  end
-
-  it 'should accept a collate' do
-    @user[:collate] = 'latin1_swedish_ci'
-    @user[:collate].should == 'latin1_swedish_ci'
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mysql_database).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb
deleted file mode 100644
index d56ba241a49..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_grant_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'puppet'
-require 'puppet/type/mysql_grant'
-describe Puppet::Type.type(:mysql_grant) do
-
-  before :each do
-    @user = Puppet::Type.type(:mysql_grant).new(:name => 'foo@localhost/*.*', :privileges => ['ALL', 'PROXY'], :table => ['*.*','@'], :user => 'foo@localhost')
-  end
-
-  it 'should accept a grant name' do
-    @user[:name].should == 'foo@localhost/*.*'
-  end
-  
-  it 'should accept ALL privileges' do
-    @user[:privileges] = 'ALL'
-    @user[:privileges].should == ['ALL']
-  end
-
-  it 'should accept PROXY privilege' do
-    @user[:privileges] = 'PROXY'
-    @user[:privileges].should == ['PROXY']
-  end
-  
-  it 'should accept a table' do
-    @user[:table] = '*.*'
-    @user[:table].should == '*.*'
-  end
-  
-  it 'should accept @ for table' do
-    @user[:table] = '@'
-    @user[:table].should == '@'
-  end
-  
-  it 'should accept a user' do
-    @user[:user] = 'foo@localhost'
-    @user[:user].should == 'foo@localhost'
-  end
-  
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mysql_grant).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb
deleted file mode 100644
index 62aad7aef3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/spec/unit/puppet/type/mysql_user_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'puppet'
-require 'puppet/type/mysql_user'
-describe Puppet::Type.type(:mysql_user) do
-
-  before :each do
-    @user = Puppet::Type.type(:mysql_user).new(:name => 'foo@localhost', :password_hash => 'pass')
-  end
-
-  it 'should accept a user name' do
-    @user[:name].should == 'foo@localhost'
-  end
-
-  it 'should fail with a long user name' do
-    expect {
-      Puppet::Type.type(:mysql_user).new({:name => '12345678901234567@localhost', :password_hash => 'pass'})
-      }.to raise_error /MySQL usernames are limited to a maximum of 16 characters/
-  end
-
-  it 'should accept a password' do
-    @user[:password_hash] = 'foo'
-    @user[:password_hash].should == 'foo'
-  end
-
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:mysql_user).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.erb
deleted file mode 100644
index 5aa959ba0bf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% @options.sort.map do |k,v| -%>
-<%   if v.is_a?(Hash) -%>
-[<%=   k %>]
-<%     v.sort.map do |ki, vi| -%>
-<%       if vi == true or v == '' -%>
-<%=        ki %>
-<%       elsif vi.is_a?(Array) -%>
-<%         vi.each do |vii| -%>
-<%=          ki %> = <%= vii %>
-<%         end -%>
-<%       elsif vi != :undef -%>
-<%=        ki %> = <%= vi %>
-<%       end -%>
-<%     end -%>
-<%   end %>
-<% end -%>
-
-!includedir /etc/mysql/conf.d/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb
deleted file mode 100644
index 99663fccdc2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.cnf.pass.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-[client]
-user=root
-host=localhost
-<% unless scope.lookupvar('mysql::server::root_password') == 'UNSET' -%>
-password='<%= scope.lookupvar('mysql::server::root_password') %>'
-<% end -%>
-socket=<%= @options['client']['socket'] -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb
deleted file mode 100644
index 04d2974294f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/my.conf.cnf.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-### MANAGED BY PUPPET ###
-<% @settings.sort.each do |section, content|      -%>
-[<%= section %>]
-<%   content.sort.each do |key, values|          -%>
-<%     [values].flatten.sort.each do |value|     -%>
-<%= !value ? '#' : '' %><%= key -%><%=
-         case value
-         when true, false
-           ''
-         else
-           " = #{value}"
-         end
-%>
-<%     end                                       -%>
-<%   end                                         -%>
-
-<% end                                           -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb
deleted file mode 100755
index ff38b23af03..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/templates/mysqlbackup.sh.erb
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-#
-# MySQL Backup Script
-#  Dumps mysql databases to a file for another backup tool to pick up.
-#
-# MySQL code:
-# GRANT SELECT, RELOAD, LOCK TABLES ON *.* TO 'user'@'localhost'
-# IDENTIFIED BY 'password';
-# FLUSH PRIVILEGES;
-#
-##### START CONFIG ###################################################
-
-USER=<%= @backupuser %>
-PASS=<%= @backuppassword %>
-DIR=<%= @backupdir %>
-ROTATE=<%= [ Integer(@backuprotate) - 1, 0 ].max %>
-
-PREFIX=mysql_backup_
-<% if @ignore_events %>
-EVENTS="--ignore-table=mysql.event"
-<% else %>
-EVENTS="--events"
-<% end %>
-
-##### STOP CONFIG ####################################################
-PATH=/usr/bin:/usr/sbin:/bin:/sbin
-
-
-
-set -o pipefail
-
-cleanup()
-{
-    find "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | xargs -0 -r rm -f
-}
-
-<% if @delete_before_dump -%>
-cleanup
-
-<% end -%>
-<% if @backupdatabases.empty? -%>
-<% if @file_per_database -%>
-mysql -s -r -N -e 'SHOW DATABASES' | while read dbname
-do
-  mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \
-    ${EVENTS} \
-    ${dbname} <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}${dbname}_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end  %>
-done
-<% else -%>
-mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \
- ${EVENTS} \
- --all-databases <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end  %>
-<% end -%>
-<% else -%>
-<% @backupdatabases.each do |db| -%>
-mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \ 
-    ${EVENTS} \
- <%= db %><% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}<%= db %>_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end  %>
-<% end -%>
-<% end -%>
-
-<% unless @delete_before_dump -%>
-if [ $? -eq 0 ] ; then
-    cleanup
-fi
-<% end -%>
-
-<% if @postscript -%>
-  <%- [@postscript].flatten.compact.each do |script|%>
-<%= script %>
-  <%- end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/backup.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/backup.pp
deleted file mode 100644
index cb669e6db80..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/backup.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
-}
-class { 'mysql::backup':
-  backupuser     => 'myuser',
-  backuppassword => 'mypassword',
-  backupdir      => '/tmp/backups',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/bindings.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/bindings.pp
deleted file mode 100644
index 83af3713a9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/bindings.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class { 'mysql::bindings':
-  php_enable => 'true',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/init.pp
deleted file mode 100644
index 846121b7df5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include mysql
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/java.pp
deleted file mode 100644
index 0fc009a6da8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/java.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'mysql::java':}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_database.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_database.pp
deleted file mode 100644
index 8747f707d57..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_database.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class { 'mysql::server':
-  config_hash => {'root_password' => 'password'}
-}
-database{ ['test1', 'test2', 'test3']:
-  ensure  => present,
-  charset => 'utf8',
-  require => Class['mysql::server'],
-}
-database{ 'test4':
-  ensure  => present,
-  charset => 'latin1',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_grant.pp
deleted file mode 100644
index 20fe78d6a7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_grant.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-mysql_grant{'test1@localhost/redmine.*':
-  user       => 'test1@localhost',
-  table      => 'redmine.*',
-  privileges => ['UPDATE'],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_user.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_user.pp
deleted file mode 100644
index f63908431b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/mysql_user.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-$mysql_root_pw = 'password'
-
-class { 'mysql::server':
-  config_hash => {
-    root_password => 'password',
-  }
-}
-
-database_user{ 'redmine@localhost':
-  ensure        => present,
-  password_hash => mysql_password('redmine'),
-  require       => Class['mysql::server'],
-}
-
-database_user{ 'dan@localhost':
-  ensure        => present,
-  password_hash => mysql_password('blah')
-}
-
-database_user{ 'dan@%':
-  ensure        => present,
-  password_hash => mysql_password('blah'),
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/perl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/perl.pp
deleted file mode 100644
index 87e941751a0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/perl.pp
+++ /dev/null
@@ -1 +0,0 @@
-include mysql::perl
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/python.pp
deleted file mode 100644
index 04f7ffa1ac1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/python.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'mysql::python':}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/ruby.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/ruby.pp
deleted file mode 100644
index e84c046a31c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/ruby.pp
+++ /dev/null
@@ -1 +0,0 @@
-include mysql::ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server.pp
deleted file mode 100644
index 8afdd00d24c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class { 'mysql::server':
-  root_password => 'password',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/account_security.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/account_security.pp
deleted file mode 100644
index de393cce4d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/account_security.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class { 'mysql::server':
-  config_hash => { 'root_password' => 'password', },
-}
-class { 'mysql::server::account_security': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/config.pp
deleted file mode 100644
index fe8d86e9058..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/mysql/tests/server/config.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-mysql::server::config { 'testfile':
-  settings => {
-    'mysqld' => {
-      'bind-address' => '0.0.0.0',
-      'read-only'    => true,
-    },
-    'client' => {
-      'port' => '3306'
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.fixtures.yml
deleted file mode 100644
index 439f1aba9d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.fixtures.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-fixtures:
-  symlinks:
-    nginx: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis.yml
deleted file mode 100644
index 61c92863a11..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-script: "bundle exec rake --rakefile $PWD/.travis/Rakefile spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.9.3
-  - 2.0.0
-gemfile: .travis/Gemfile
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-      gemfile: .travis/Gemfile
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-      gemfile: .travis/Gemfile
-notifications:
-  email: false  
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Gemfile
deleted file mode 100644
index 8af652f2516..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Gemfile
+++ /dev/null
@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-group :rake do
-  gem 'puppetlabs_spec_helper'
-  gem 'librarian-puppet-maestrodev'
-  gem 'open3_backport', :platforms => :ruby_18
-  gem 'json',           :platforms => :ruby_18
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Rakefile
deleted file mode 100644
index 500bd023a98..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/.travis/Rakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
-task :librarian_spec_prep do
-  sh "librarian-puppet install --path=$PWD/spec/fixtures/modules/"
-end
-task :spec_prep => :librarian_spec_prep
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Gemfile
deleted file mode 100644
index 513b910ae92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Gemfile
+++ /dev/null
@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-group :rake do
-  gem 'puppet',       '>=3.0.1'
-  gem 'rspec-puppet', '>=1.0.1'
-  gem 'rake',         '>=0.9.2.2'
-  gem 'puppet-lint',  '>=0.1.12'
-  gem 'puppetlabs_spec_helper'
-  gem 'puppet-blacksmith'
-  gem 'librarian-puppet-maestrodev'
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/LICENSE
deleted file mode 100644
index d955a86d742..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Modulefile
deleted file mode 100644
index 8754662feff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Modulefile
+++ /dev/null
@@ -1,12 +0,0 @@
-name    'jfryman-nginx'
-version '0.0.9'
-source 'http://github.com/jfryman/puppet-nginx'
-author 'James Fryman'
-license 'Apache License Version 2.0'
-summary 'Puppet NGINX management module'
-description 'This module can be used for basic NGINX Management'
-project_page 'http://github.com/jfryman/puppet-nginx'
-
-dependency 'puppetlabs/stdlib', '>= 0.1.6'
-dependency 'puppetlabs/apt', '>= 1.0.0'
-dependency 'puppetlabs/concat', '>= 1.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile
deleted file mode 100644
index 7a314f2e9a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile
+++ /dev/null
@@ -1,5 +0,0 @@
-forge 'http://forge.puppetlabs.com'
-
-mod 'puppetlabs/stdlib', '>=0.1.6'
-mod 'puppetlabs/apt', '>=1.0.0'
-mod 'puppetlabs/concat', '>=1.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile.lock b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile.lock
deleted file mode 100644
index aac666e4036..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Puppetfile.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-FORGE
-  remote: http://forge.puppetlabs.com
-  specs:
-    puppetlabs/apt (1.2.0)
-      puppetlabs/stdlib (>= 2.2.1)
-    puppetlabs/concat (1.0.0)
-    puppetlabs/stdlib (4.1.0)
-
-DEPENDENCIES
-  puppetlabs/apt (>= 1.0.0)
-  puppetlabs/concat (>= 1.0.0)
-  puppetlabs/stdlib (>= 0.1.6)
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/README.markdown
deleted file mode 100644
index a640f039687..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/README.markdown
+++ /dev/null
@@ -1,240 +0,0 @@
-# NGINX Module
-
-[![Build Status](https://travis-ci.org/jfryman/puppet-nginx.png)](https://travis-ci.org/jfryman/puppet-nginx)
-
-James Fryman <james@frymanet.com>
-
-This module manages NGINX configuration.
-
-## Quick Start
-
-### Requirements
-
-* Puppet-2.7.0 or later
-* Ruby-1.9.3 or later (Ruby-1.8.7 does not work)
-
-### Install and bootstrap an NGINX instance
-
-```puppet
-class { 'nginx': }
-```
-
-### Setup a new virtual host
-
-```puppet
-nginx::resource::vhost { 'www.puppetlabs.com':
-  www_root => '/var/www/www.puppetlabs.com',
-}
-```
-
-### Add a Proxy Server
-
-```puppet
-nginx::resource::upstream { 'puppet_rack_app':
-  members => [
-    'localhost:3000',
-    'localhost:3001',
-    'localhost:3002',
-  ],
-}
-
-nginx::resource::vhost { 'rack.puppetlabs.com':
-  proxy => 'http://puppet_rack_app',
-}
-```
-
-### Add a smtp proxy
-
-```puppet
-class { 'nginx':
-  mail => true,
-}
-
-nginx::resource::mailhost { 'domain1.example':
-  auth_http   => 'server2.example/cgi-bin/auth',
-  protocol    => 'smtp',
-  listen_port => 587,
-  ssl_port    => 465,
-  starttls    => 'only',
-  xclient     => 'off',
-  ssl         => true,
-  ssl_cert    => '/tmp/server.crt',
-  ssl_key     => '/tmp/server.pem',
-}
-```
-
-## SSL configuration
-
-By default, creating a vhost resource will only create a HTTP vhost. To also create a HTTPS (SSL-enabled) vhost, set `ssl => true` on the vhost. You will have a HTTP server listening on `listen_port` (port `80` by default) and a HTTPS server listening on `ssl_port` (port `443` by default). Both vhosts will have the same `server_name` and a similar configuration.
-
-To create only a HTTPS vhost, set `ssl => true` and also set `listen_port` to the same value as `ssl_port`. Setting these to the same value disables the HTTP vhost. The resulting vhost will be listening on `ssl_port`.
-
-### Locations
-
-Locations require specific settings depending on whether they should be included in the HTTP, HTTPS or both vhosts.
-
-#### HTTP only vhost (default)
-If you only have a HTTP vhost (i.e. `ssl => false` on the vhost) maks sure you don't set `ssl => true` on any location you associate with the vhost.
-
-#### HTTP and HTTPS vhost
-If you set `ssl => true` and also set `listen_port` and `ssl_port` to different values on the vhost you will need to be specific with the location settings since you will have a HTTP vhost listening on `listen_port` and a HTTPS vhost listening on `ssl_port`:
-
-* To add a location to only the HTTP server, set `ssl => false` on the location (this is the default).
-* To add a location to both the HTTP and HTTPS server, set `ssl => true` on the location, and ensure `ssl_only => false` (which is the default value for `ssl_only`).
-* To add a location only to the HTTPS server, set both `ssl => true` and `ssl_only => true` on the location.
-
-#### HTTPS only vhost
-If you have set `ssl => true` and also set `listen_port` and `ssl_port` to the same value on the vhost, you will have a single HTTPS vhost listening on `ssl_port`. To add a location to this vhost set `ssl => true` and `ssl_only => true` on the location.
-
-## Hiera Support
-
-Defining nginx resources in Hiera.
-
-```yaml
-nginx::nginx_upstreams:
-  'puppet_rack_app':
-    ensure: present
-    members:
-      - localhost:3000
-      - localhost:3001
-      - localhost:3002
-nginx::nginx_vhosts:
-  'www.puppetlabs.com':
-    www_root: '/var/www/www.puppetlabs.com'
-  'rack.puppetlabs.com':
-    proxy: 'http://puppet_rack_app'
-nginx::nginx_locations:
-  'static':
-    location: '~ "^/static/[0-9a-fA-F]{8}\/(.*)$"'
-    vhost: www.puppetlabs.com
-  'userContent':
-    location: /userContent
-    vhost: www.puppetlabs.com
-    www_root: /var/www/html
-```
-
-## Nginx with precompiled Passenger
-
-Currently this works only for Debian family.
-
-```puppet
-class { 'nginx':
-  package_source  => 'passenger',
-  http_cfg_append => {
-    'passenger_root' => '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',
-  }
-}
-```
-
-Package source `passenger` will add [Phusion Passenger repository](https://oss-binaries.phusionpassenger.com/apt/passenger) to APT sources.
-For each virtual host you should specify which ruby should be used.
-
-```puppet
-nginx::resource::vhost { 'www.puppetlabs.com':
-  www_root         => '/var/www/www.puppetlabs.com',
-  vhost_cfg_append => {
-    'passenger_enabled' => 'on',
-    'passenger_ruby'    => '/usr/bin/ruby',
-  }
-}
-```
-
-### Puppet master served by Nginx and Passenger
-
-Virtual host config for serving puppet master:
-
-```puppet
-nginx::resource::vhost { 'puppet':
-  ensure               => present,
-  server_name          => ['puppet'],
-  listen_port          => 8140,
-  ssl                  => true,
-  ssl_cert             => '/var/lib/puppet/ssl/certs/example.com.pem',
-  ssl_key              => '/var/lib/puppet/ssl/private_keys/example.com.pem',
-  ssl_port             => 8140,
-  vhost_cfg_append     => {
-    'passenger_enabled'      => 'on',
-    'passenger_ruby'         => '/usr/bin/ruby',
-    'ssl_crl'                => '/var/lib/puppet/ssl/ca/ca_crl.pem',
-    'ssl_client_certificate' => '/var/lib/puppet/ssl/certs/ca.pem',
-    'ssl_verify_client'      => 'optional',
-    'ssl_verify_depth'       => 1,
-  },
-  www_root             => '/etc/puppet/rack/public',
-  use_default_location => false,
-  access_log           => '/var/log/nginx/puppet_access.log',
-  error_log            => '/var/log/nginx/puppet_error.log',
-  passenger_cgi_param  => {
-    'HTTP_X_CLIENT_DN'     => '$ssl_client_s_dn',
-    'HTTP_X_CLIENT_VERIFY' => '$ssl_client_verify',
-  },
-}
-```
-
-### Example puppet class calling nginx::vhost with HTTPS FastCGI and redirection of HTTP
-
-```puppet
-
-$full_web_path = '/var/www'
-
-define web::nginx_ssl_with_redirect (
-  $backend_port         = 9000,
-  $php                  = true,
-  $proxy                = undef,
-  $www_root             = "${full_web_path}/${name}/",
-  $location_cfg_append  = undef,
-) {
-  nginx::resource::vhost { "${name}.${::domain}":
-    ensure              => present,
-    www_root            => "${full_web_path}/${name}/",
-    location_cfg_append => { 'rewrite' => '^ https://$server_name$request_uri? permanent' },
-  }
-
-  if !$www_root {
-    $tmp_www_root = undef
-  } else {
-    $tmp_www_root = $www_root
-  }
-   
-  nginx::resource::vhost { "${name}.${::domain} ${name}":
-    ensure                => present,
-    listen_port           => 443,
-    www_root              => $tmp_www_root,
-    proxy                 => $proxy,
-    location_cfg_append   => $location_cfg_append,
-    index_files           => [ 'index.php' ],
-    ssl                   => true,
-    ssl_cert              => 'puppet:///modules/sslkey/whildcard_mydomain.crt',
-    ssl_key               => 'puppet:///modules/sslkey/whildcard_mydomain.key',
-  }
-   
-   
-  if $php {
-    nginx::resource::location { "${name}_root":
-      ensure          => present,
-      ssl             => true,   
-      ssl_only        => true,   
-      vhost           => "${name}.${::domain} ${name}",
-      www_root        => "${full_web_path}/${name}/",  
-      location        => '~ \.php$',
-      index_files     => ['index.php', 'index.html', 'index.htm'],
-      proxy           => undef,
-      fastcgi         => "127.0.0.1:${backend_port}",
-      fastcgi_script  => undef,
-      location_cfg_append => { 
-        fastcgi_connect_timeout => '3m',
-        fastcgi_read_timeout    => '3m',
-        fastcgi_send_timeout    => '3m' 
-      }
-    }  
-  }    
-}      
-```       
-
-# Call class web::nginx_ssl_with_redirect
-
-```puppet
-web::nginx_ssl_with_redirect { 'sub-domain-name':
-    backend_port => 9001,
-  }
-```
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Rakefile
deleted file mode 100644
index e0913e5864a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/Rakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'bundler'
-Bundler.require(:rake)
-require 'rake/clean'
-
-CLEAN.include('spec/fixtures/', 'doc', 'pkg')
-CLOBBER.include('.tmp', '.librarian')
-
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet_blacksmith/rake_tasks'
-require 'rspec-system/rake_task'
-
-# use librarian-puppet to manage fixtures instead of .fixtures.yml
-# offers more possibilities like explicit version management, forge downloads,...
-task :librarian_spec_prep do
- sh "librarian-puppet install --path=spec/fixtures/modules/"
-end
-task :spec_prep => :librarian_spec_prep
-
-task :default => [:clean, :spec]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/composer.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/composer.json
deleted file mode 100644
index 91f362f7034..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/composer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "name": "jfryman/puppet-nginx",
-    "type": "project",
-    "description": "Puppet module for nginx installation",
-    "keywords": ["puppet", "nginx"],
-    "license": "Apache-2.0",
-    "require": {
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/config.pp
deleted file mode 100644
index f22b3a6895c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/config.pp
+++ /dev/null
@@ -1,146 +0,0 @@
-# Class: nginx::config
-#
-# This module manages NGINX bootstrap and configuration
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::config(
-  $worker_processes       = $nginx::params::nx_worker_processes,
-  $worker_connections     = $nginx::params::nx_worker_connections,
-  $worker_rlimit_nofile   = $nginx::params::nx_worker_rlimit_nofile,
-  $confd_purge            = $nginx::params::nx_confd_purge,
-  $vhost_purge            = $nginx::params::nx_vhost_purge,
-  $server_tokens          = $nginx::params::nx_server_tokens,
-  $proxy_set_header       = $nginx::params::nx_proxy_set_header,
-  $proxy_cache_path       = $nginx::params::nx_proxy_cache_path,
-  $proxy_cache_levels     = $nginx::params::nx_proxy_cache_levels,
-  $proxy_cache_keys_zone  = $nginx::params::nx_proxy_cache_keys_zone,
-  $proxy_cache_max_size   = $nginx::params::nx_proxy_cache_max_size,
-  $proxy_cache_inactive   = $nginx::params::nx_proxy_cache_inactive,
-  $proxy_http_version     = $nginx::params::nx_proxy_http_version,
-  $names_hash_bucket_size = $nginx::params::nx_names_hash_bucket_size,
-  $names_hash_max_size    = $nginx::params::nx_names_hash_max_size,
-  $types_hash_max_size    = $nginx::params::nx_types_hash_max_size,
-  $types_hash_bucket_size = $nginx::params::nx_types_hash_bucket_size,
-  $client_max_body_size   = $nginx::params::nx_client_max_body_size,
-  $proxy_buffers          = $nginx::params::nx_proxy_buffers,
-  $http_cfg_append        = $nginx::params::nx_http_cfg_append,
-  $nginx_error_log        = $nginx::params::nx_nginx_error_log,
-  $http_access_log        = $nginx::params::nx_http_access_log,
-  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
-  $gzip                   = $nginx::params::nx_gzip,
-  $conf_template          = $nginx::params::nx_conf_template,
-  $proxy_conf_template    = $nginx::params::nx_proxy_conf_template,
-) inherits nginx::params {
-
-  File {
-    owner => 'root',
-    group => 'root',
-    mode  => '0644',
-  }
-
-  file { $nginx::params::nx_conf_dir:
-    ensure => directory,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.d":
-    ensure => directory,
-  }
-  if $confd_purge == true {
-    File["${nginx::params::nx_conf_dir}/conf.d"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.mail.d":
-    ensure => directory,
-  }
-  if $confd_purge == true {
-    File["${nginx::params::nx_conf_dir}/conf.mail.d"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.d/vhost_autogen.conf":
-    ensure => absent,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.mail.d/vhost_autogen.conf":
-    ensure => absent,
-  }
-
-  file {$nginx::config::nx_run_dir:
-    ensure => directory,
-  }
-
-  file {$nginx::config::nx_client_body_temp_path:
-    ensure => directory,
-    owner  => $nginx::params::nx_daemon_user,
-  }
-
-  file {$nginx::config::nx_proxy_temp_path:
-    ensure => directory,
-    owner  => $nginx::params::nx_daemon_user,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/sites-available":
-    ensure => directory,
-  }
-
-  if $vhost_purge == true {
-    File["${nginx::params::nx_conf_dir}/sites-available"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { "${nginx::params::nx_conf_dir}/sites-enabled":
-    ensure => directory,
-  }
-
-  if $vhost_purge == true {
-    File["${nginx::params::nx_conf_dir}/sites-enabled"] {
-      purge   => true,
-      recurse => true,
-    }
-  }
-
-  file { '/etc/nginx/sites-enabled/default':
-    ensure => absent,
-  }
-
-  file { "${nginx::params::nx_conf_dir}/nginx.conf":
-    ensure  => file,
-    content => template($conf_template),
-  }
-
-  file { "${nginx::params::nx_conf_dir}/conf.d/proxy.conf":
-    ensure  => file,
-    content => template($proxy_conf_template),
-  }
-
-  file { "${nginx::config::nx_temp_dir}/nginx.d":
-    ensure  => absent,
-    purge   => true,
-    recurse => true,
-    force   => true,
-  }
-
-  file { "${nginx::config::nx_temp_dir}/nginx.mail.d":
-    ensure  => absent,
-    purge   => true,
-    recurse => true,
-    force   => true,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/init.pp
deleted file mode 100644
index 9ed41690372..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/init.pp
+++ /dev/null
@@ -1,173 +0,0 @@
-# Class: nginx
-#
-# This module manages NGINX.
-#
-# Parameters:
-#
-# There are no default parameters for this class. All module parameters
-# are managed via the nginx::params class
-#
-# Actions:
-#
-# Requires:
-#  puppetlabs-stdlib - https://github.com/puppetlabs/puppetlabs-stdlib
-#
-#  Packaged NGINX
-#    - RHEL: EPEL or custom package
-#    - Debian/Ubuntu: Default Install or custom package
-#    - SuSE: Default Install or custom package
-#
-#  stdlib
-#    - puppetlabs-stdlib module >= 0.1.6
-#    - plugin sync enabled to obtain the anchor type
-#
-# Sample Usage:
-#
-# The module works with sensible defaults:
-#
-# node default {
-#   include nginx
-# }
-class nginx (
-  $worker_processes       = $nginx::params::nx_worker_processes,
-  $worker_connections     = $nginx::params::nx_worker_connections,
-  $worker_rlimit_nofile   = $nginx::params::nx_worker_rlimit_nofile,
-  $package_name           = $nginx::params::package_name,
-  $package_ensure         = $nginx::params::package_ensure,
-  $package_source         = $nginx::params::package_source,
-  $proxy_set_header       = $nginx::params::nx_proxy_set_header,
-  $proxy_http_version     = $nginx::params::nx_proxy_http_version,
-  $confd_purge            = $nginx::params::nx_confd_purge,
-  $vhost_purge            = $nginx::params::nx_vhost_purge,
-  $proxy_cache_path       = $nginx::params::nx_proxy_cache_path,
-  $proxy_cache_levels     = $nginx::params::nx_proxy_cache_levels,
-  $proxy_cache_keys_zone  = $nginx::params::nx_proxy_cache_keys_zone,
-  $proxy_cache_max_size   = $nginx::params::nx_proxy_cache_max_size,
-  $proxy_cache_inactive   = $nginx::params::nx_proxy_cache_inactive,
-  $configtest_enable      = $nginx::params::nx_configtest_enable,
-  $service_restart        = $nginx::params::nx_service_restart,
-  $service_ensure         = $nginx::params::nx_service_ensure,
-  $mail                   = $nginx::params::nx_mail,
-  $server_tokens          = $nginx::params::nx_server_tokens,
-  $client_max_body_size   = $nginx::params::nx_client_max_body_size,
-  $names_hash_bucket_size = $nginx::params::nx_names_hash_bucket_size,
-  $names_hash_max_size    = $nginx::params::nx_names_hash_max_size,
-  $proxy_buffers          = $nginx::params::nx_proxy_buffers,
-  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
-  $http_cfg_append        = $nginx::params::nx_http_cfg_append,
-  $nginx_error_log        = $nginx::params::nx_nginx_error_log,
-  $http_access_log        = $nginx::params::nx_http_access_log,
-  $gzip                   = $nginx::params::nx_gzip,
-  $conf_template          = $nginx::params::nx_conf_template,
-  $proxy_conf_template    = $nginx::params::nx_proxy_conf_template,
-  $nginx_vhosts           = {},
-  $nginx_upstreams        = {},
-  $nginx_locations        = {},
-  $manage_repo            = $nginx::params::manage_repo,
-) inherits nginx::params {
-
-  include stdlib
-
-  if (!is_string($worker_processes)) and (!is_integer($worker_processes)) {
-    fail('$worker_processes must be an integer or have value "auto".')
-  }
-  if (!is_integer($worker_connections)) {
-    fail('$worker_connections must be an integer.')
-  }
-  if (!is_integer($worker_rlimit_nofile)) {
-    fail('$worker_rlimit_nofile must be an integer.')
-  }
-  validate_string($package_name)
-  validate_string($package_ensure)
-  validate_string($package_source)
-  validate_array($proxy_set_header)
-  validate_string($proxy_http_version)
-  validate_bool($confd_purge)
-  validate_bool($vhost_purge)
-  if ($proxy_cache_path != false) {
-    validate_string($proxy_cache_path)
-  }
-  if (!is_integer($proxy_cache_levels)) {
-    fail('$proxy_cache_levels must be an integer.')
-  }
-  validate_string($proxy_cache_keys_zone)
-  validate_string($proxy_cache_max_size)
-  validate_string($proxy_cache_inactive)
-  validate_bool($configtest_enable)
-  validate_string($service_restart)
-  validate_bool($mail)
-  validate_string($server_tokens)
-  validate_string($client_max_body_size)
-  if (!is_integer($names_hash_bucket_size)) {
-    fail('$names_hash_bucket_size must be an integer.')
-  }
-  if (!is_integer($names_hash_max_size)) {
-    fail('$names_hash_max_size must be an integer.')
-  }
-  validate_string($proxy_buffers)
-  validate_string($proxy_buffer_size)
-  if ($http_cfg_append != false) {
-    validate_hash($http_cfg_append)
-  }
-  validate_string($nginx_error_log)
-  validate_string($http_access_log)
-  validate_hash($nginx_upstreams)
-  validate_hash($nginx_vhosts)
-  validate_hash($nginx_locations)
-  validate_bool($manage_repo)
-
-  class { 'nginx::package':
-    package_name   => $package_name,
-    package_source => $package_source,
-    package_ensure => $package_ensure,
-    notify         => Class['nginx::service'],
-    manage_repo    => $manage_repo,
-  }
-
-  class { 'nginx::config':
-    worker_processes       => $worker_processes,
-    worker_connections     => $worker_connections,
-    worker_rlimit_nofile   => $worker_rlimit_nofile,
-    proxy_set_header       => $proxy_set_header,
-    proxy_http_version     => $proxy_http_version,
-    proxy_cache_path       => $proxy_cache_path,
-    proxy_cache_levels     => $proxy_cache_levels,
-    proxy_cache_keys_zone  => $proxy_cache_keys_zone,
-    proxy_cache_max_size   => $proxy_cache_max_size,
-    proxy_cache_inactive   => $proxy_cache_inactive,
-    confd_purge            => $confd_purge,
-    vhost_purge            => $vhost_purge,
-    server_tokens          => $server_tokens,
-    client_max_body_size   => $client_max_body_size,
-    names_hash_bucket_size => $names_hash_bucket_size,
-    names_hash_max_size    => $names_hash_max_size,
-    proxy_buffers          => $proxy_buffers,
-    proxy_buffer_size      => $proxy_buffer_size,
-    http_cfg_append        => $http_cfg_append,
-    nginx_error_log        => $nginx_error_log,
-    http_access_log        => $http_access_log,
-    gzip                   => $gzip,
-    conf_template          => $conf_template,
-    proxy_conf_template    => $proxy_conf_template,
-    require                => Class['nginx::package'],
-    notify                 => Class['nginx::service'],
-  }
-
-  class { 'nginx::service':
-  }
-
-  create_resources('nginx::resource::upstream', $nginx_upstreams)
-  create_resources('nginx::resource::vhost', $nginx_vhosts)
-  create_resources('nginx::resource::location', $nginx_locations)
-
-  # Allow the end user to establish relationships to the "main" class
-  # and preserve the relationship to the implementation classes through
-  # a transitive relationship to the composite class.
-  anchor{ 'nginx::begin':
-    before => Class['nginx::package'],
-    notify => Class['nginx::service'],
-  }
-  anchor { 'nginx::end':
-    require => Class['nginx::service'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package.pp
deleted file mode 100644
index 74885b2b5ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package.pp
+++ /dev/null
@@ -1,79 +0,0 @@
-# Class: nginx::package
-#
-# This module manages NGINX package installation
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package(
-  $package_name   = 'nginx',
-  $package_source = 'nginx',
-  $package_ensure = 'present',
-  $manage_repo    = true,
-) {
-
-  anchor { 'nginx::package::begin': }
-  anchor { 'nginx::package::end': }
-
-  case $::osfamily {
-    'redhat': {
-      class { 'nginx::package::redhat':
-        manage_repo    => $manage_repo,
-        package_ensure => $package_ensure,
-        package_name   => $package_name,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
-      }
-    }
-    'debian': {
-      class { 'nginx::package::debian':
-        package_name   => $package_name,
-        package_source => $package_source,
-        package_ensure => $package_ensure,
-        manage_repo    => $manage_repo,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
-      }
-    }
-    'suse': {
-      class { 'nginx::package::suse':
-        require => Anchor['nginx::package::begin'],
-        before  => Anchor['nginx::package::end'],
-      }
-    }
-    'Solaris': {
-      class { 'nginx::package::solaris':
-        package_name   => $package_name,
-        package_source => $package_source,
-        package_ensure => $package_ensure,
-        require => Anchor['nginx::package::begin'],
-        before  => Anchor['nginx::package::end'],
-      }
-    }
-    default: {
-      case $::operatingsystem {
-        'amazon': {
-          # Amazon was added to osfamily RedHat in 1.7.2
-          # https://github.com/puppetlabs/facter/commit/c12d3b6c557df695a7b2b009da099f6a93c7bd31#lib/facter/osfamily.rb
-          warning("Module ${module_name} support for ${::operatingsystem} with facter < 1.7.2 is deprecated")
-          warning("Please upgrade from facter ${::facterversion} to >= 1.7.2")
-          class { 'nginx::package::redhat':
-            require => Anchor['nginx::package::begin'],
-            before  => Anchor['nginx::package::end'],
-          }
-        }
-        default: {
-          fail("Module ${module_name} is not supported on ${::operatingsystem}")
-        }
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/debian.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/debian.pp
deleted file mode 100644
index b87e3c0bed3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/debian.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Class: nginx::package::debian
-#
-# This module manages NGINX package installation on debian based systems
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::debian(
-    $manage_repo    = true,
-    $package_name   = 'nginx',
-    $package_source = 'nginx',
-    $package_ensure = 'present'
-  ) {
-
-  
-  $distro = downcase($::operatingsystem)
-
-  package { $package_name:
-    ensure  => $package_ensure,
-    require => Anchor['nginx::apt_repo'],
-  }
-
-  anchor { 'nginx::apt_repo' : }
-
-  include '::apt'
-
-  if $manage_repo {
-    case $package_source {
-      'nginx': {
-        apt::source { 'nginx':
-          location   => "http://nginx.org/packages/${distro}",
-          repos      => 'nginx',
-          key        => '7BD9BF62',
-          key_source => 'http://nginx.org/keys/nginx_signing.key',
-          notify     => Exec['apt_get_update_for_nginx'],
-        }
-      }
-      'passenger': {
-        ensure_resource('package', 'apt-transport-https', {'ensure' => 'present' })
-
-        apt::source { 'nginx':
-          location   => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
-          repos      => "main",
-          key        => '561F9B9CAC40B2F7',
-          key_source => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
-          notify     => Exec['apt_get_update_for_nginx'],
-        }
-
-        package { 'passenger':
-          ensure  => 'present',
-          require => Anchor['nginx::apt_repo'],
-        }
-      }
-      default: {}
-    }
-
-    exec { 'apt_get_update_for_nginx':
-      command     => '/usr/bin/apt-get update',
-      timeout     => 240,
-      returns     => [ 0, 100 ],
-      refreshonly => true,
-      before      => Anchor['nginx::apt_repo'],
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/redhat.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/redhat.pp
deleted file mode 100644
index 4cc34eea9ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/redhat.pp
+++ /dev/null
@@ -1,71 +0,0 @@
-# Class: nginx::package::redhat
-#
-# This module manages NGINX package installation on RedHat based systems
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::redhat (
-  $manage_repo    = true,
-  $package_ensure = 'present',
-  $package_name   = 'nginx',
-) {
-
-  case $::operatingsystem {
-    'fedora': {
-      # nginx.org does not supply RPMs for fedora
-      # fedora 18 provides 1.2.x packages
-      # fedora 19 has 1.4.x packages are in
-
-      # fedora 18 users will need to supply their own nginx 1.4 rpms and/or repo
-      if $::lsbmajdistrelease and $::lsbmajdistrelease < 19 {
-        notice("${::operatingsystem} ${::lsbmajdistrelease} does not supply nginx >= 1.4 packages")
-      }
-    }
-    default: {
-      case $::lsbmajdistrelease {
-        5, 6: {
-          $os_rel = $::lsbmajdistrelease
-        }
-        default: {
-          # Amazon uses the year as the $::lsbmajdistrelease
-          $os_rel = 6
-        }
-      }
-
-      # as of 2013-07-28
-      # http://nginx.org/packages/centos appears to be identical to
-      # http://nginx.org/packages/rhel
-      # no other dedicated dirs exist for platforms under $::osfamily == redhat
-      if $manage_repo {
-        yumrepo { 'nginx-release':
-          baseurl  => "http://nginx.org/packages/rhel/${os_rel}/\$basearch/",
-          descr    => 'nginx repo',
-          enabled  => '1',
-          gpgcheck => '1',
-          priority => '1',
-          gpgkey   => 'http://nginx.org/keys/nginx_signing.key',
-          before   => Package[$package_name],
-        }
-
-        file { '/etc/yum.repos.d/nginx-release.repo':
-          ensure  => present,
-          require => Yumrepo['nginx-release'],
-        }
-      }
-    }
-  }
-
-  package { $package_name:
-    ensure  => $package_ensure,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/solaris.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/solaris.pp
deleted file mode 100644
index fb1386c95a7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/solaris.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Class: nginx::package::solaris
-#
-# This module manages NGINX package installation on solaris based systems
-#
-# Parameters:
-#
-# *package_name*
-# Needs to be specified. SFEnginx,CSWnginx depending on where you get it.
-#
-# *package_source* 
-# Needed in case of Solaris 10.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::solaris(
-    $package_name   = undef,
-    $package_source = '',
-    $package_ensure = 'present'
-  ){
-  package { $package_name:
-	ensure 		=> $package_ensure,
-  	source 		=> $package_source
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/suse.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/suse.pp
deleted file mode 100644
index 0c044b09f18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/package/suse.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# Class: nginx::package::suse
-#
-# This module manages NGINX package installation for SuSE based systems
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#  This module contains all of the required package for SuSE. Apache and all
-#  other packages listed below are built into the packaged RPM spec for
-#  SuSE and OpenSuSE.
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::package::suse {
-
-  $suse_packages = [
-    'nginx-0.8', 'apache2', 'apache2-itk', 'apache2-utils', 'gd', 'libapr1',
-    'libapr-util1', 'libjpeg62', 'libpng14-14', 'libxslt', 'rubygem-daemon_controller',
-    'rubygem-fastthread', 'rubygem-file-tail', 'rubygem-passenger',
-    'rubygem-passenger-nginx', 'rubygem-rack', 'rubygem-rake', 'rubygem-spruz',
-  ]
-
-  package { $suse_packages:
-    ensure => $nginx::package_ensure,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/params.pp
deleted file mode 100644
index 8ecf1015453..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/params.pp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Class: nginx::param
-#
-# This module manages NGINX paramaters
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::params {
-
-  $nx_temp_dir                = '/tmp'
-  $nx_run_dir                 = '/var/nginx'
-
-  $nx_conf_template           = 'nginx/conf.d/nginx.conf.erb'
-  $nx_proxy_conf_template     = 'nginx/conf.d/proxy.conf.erb'
-  $nx_confd_purge             = false
-  $nx_vhost_purge             = false
-  $nx_worker_processes        = 1
-  $nx_worker_connections      = 1024
-  $nx_worker_rlimit_nofile    = 1024
-  $nx_types_hash_max_size     = 1024
-  $nx_types_hash_bucket_size  = 512
-  $nx_names_hash_bucket_size  = 64
-  $nx_names_hash_max_size     = 512
-  $nx_multi_accept            = off
-  # One of [kqueue|rtsig|epoll|/dev/poll|select|poll|eventport]
-  # or false to use OS default
-  $nx_events_use              = false
-  $nx_sendfile                = on
-  $nx_keepalive_timeout       = 65
-  $nx_tcp_nodelay             = on
-  $nx_gzip                    = on
-  $nx_server_tokens           = on
-  $nx_spdy                    = off
-  $nx_ssl_stapling            = off
-
-  $nx_proxy_redirect          = off
-  $nx_proxy_set_header        = [
-    'Host $host',
-    'X-Real-IP $remote_addr',
-    'X-Forwarded-For $proxy_add_x_forwarded_for',
-  ]
-  $nx_proxy_cache_path        = false
-  $nx_proxy_cache_levels      = 1
-  $nx_proxy_cache_keys_zone   = 'd2:100m'
-  $nx_proxy_cache_max_size    = '500m'
-  $nx_proxy_cache_inactive    = '20m'
-
-  $nx_client_body_temp_path   = "${nx_run_dir}/client_body_temp"
-  $nx_client_body_buffer_size = '128k'
-  $nx_client_max_body_size    = '10m'
-  $nx_proxy_temp_path         = "${nx_run_dir}/proxy_temp"
-  $nx_proxy_connect_timeout   = '90'
-  $nx_proxy_send_timeout      = '90'
-  $nx_proxy_read_timeout      = '90'
-  $nx_proxy_buffers           = '32 4k'
-  $nx_proxy_http_version      = '1.0'
-  $nx_proxy_buffer_size       = '8k'
-
-  $nx_logdir = $::kernel ? {
-    /(?i-mx:linux)/ => '/var/log/nginx',
-    /(?i-mx:sunos)/ => '/var/log/nginx',
-  }
-
-  $nx_pid = $::kernel ? {
-    /(?i-mx:linux)/  => '/var/run/nginx.pid',
-    /(?i-mx:sunos)/  => '/var/run/nginx.pid',
-  }
-
-  $nx_conf_dir = $::kernelversion ? {
-    /(?i-mx:joyent)/ => '/opt/local/etc/nginx',
-    default => '/etc/nginx',
-  }
-
-  if $::osfamily {
-    $solaris_nx_daemon_user = $::kernelversion ? {
-      /(?i-mx:joyent)/ => 'www',
-      default => 'webservd',
-    }
-    $nx_daemon_user = $::osfamily ? {
-      /(?i-mx:redhat|suse|gentoo|linux)/ => 'nginx',
-      /(?i-mx:debian)/                   => 'www-data',
-      /(?i-mx:solaris)/                  => $solaris_nx_daemon_user,
-    }
-  } else {
-    warning('$::osfamily not defined. Support for $::operatingsystem is deprecated')
-    warning("Please upgrade from factor ${::facterversion} to >= 1.7.2")
-    $nx_daemon_user = $::operatingsystem ? {
-      /(?i-mx:debian|ubuntu)/                                                                => 'www-data',
-      /(?i-mx:fedora|rhel|redhat|centos|scientific|suse|opensuse|amazon|gentoo|oraclelinux)/ => 'nginx',
-      /(?i-mx:solaris)/                                                                      => 'webservd',
-    }
-  }
-
-  # Service restart after Nginx 0.7.53 could also be just
-  # "/path/to/nginx/bin -s HUP" Some init scripts do a configtest, some don't.
-  # If configtest_enable it's true then service restart will take
-  # $nx_service_restart value, forcing configtest.
-
-  $nx_configtest_enable = false
-  $nx_service_restart = '/etc/init.d/nginx configtest && /etc/init.d/nginx restart'
-  $nx_service_ensure = running
-
-  $nx_mail = false
-
-  $nx_http_cfg_append = false
-
-  $nx_nginx_error_log = "${nx_logdir}/error.log"
-  $nx_http_access_log = "${nx_logdir}/access.log"
-
-  # package name depends on distribution, e.g. for Debian nginx-full | nginx-light
-  $package_name   = 'nginx'
-  $package_ensure = 'present'
-  $package_source = 'nginx'
-  $manage_repo    = true
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/location.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/location.pp
deleted file mode 100644
index c44a6737931..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/location.pp
+++ /dev/null
@@ -1,299 +0,0 @@
-# define: nginx::resource::location
-#
-# This definition creates a new location entry within a virtual host
-#
-# Parameters:
-#   [*ensure*]               - Enables or disables the specified location
-#     (present|absent)
-#   [*vhost*]                - Defines the default vHost for this location
-#     entry to include with
-#   [*location*]             - Specifies the URI associated with this location
-#     entry
-#   [*location_allow*]       - Array: Locations to allow connections from.
-#   [*location_deny*]        - Array: Locations to deny connections from.
-#   [*www_root*]             - Specifies the location on disk for files to be
-#     read from. Cannot be set in conjunction with $proxy
-#   [*autoindex*]            - Set it on 'on' to activate autoindex directory
-#     listing. Undef by default.
-#   [*index_files*]          - Default index files for NGINX to read when
-#     traversing a directory
-#   [*proxy*]                - Proxy server(s) for a location to connect to.
-#     Accepts a single value, can be used in conjunction with
-#     nginx::resource::upstream
-#   [*proxy_read_timeout*]   - Override the default the proxy read timeout
-#     value of 90 seconds
-#   [*fastcgi*]              - location of fastcgi (host:port)
-#   [*fastcgi_params*]       - optional alternative fastcgi_params file to use
-#   [*fastcgi_script*]       - optional SCRIPT_FILE parameter
-#   [*fastcgi_split_path*]   - Allows settings of fastcgi_split_path_info so
-#     that you can split the script_name and path_info via regex
-#   [*ssl*]                  - Indicates whether to setup SSL bindings for
-#     this location.
-#   [*ssl_only*]             - Required if the SSL and normal vHost have the
-#     same port.
-#   [*location_alias*]       - Path to be used as basis for serving requests
-#     for this location
-#   [*stub_status*]          - If true it will point configure module
-#     stub_status to provide nginx stats on location
-#   [*location_custom_cfg*]  - Expects a hash with custom directives, cannot
-#     be used with other location types (proxy, fastcgi, root, or stub_status)
-#   [*location_cfg_prepend*] - Expects a hash with extra directives to put
-#     before anything else inside location (used with all other types except
-#     custom_cfg)
-#   [*location_custom_cfg_prepend*]   - Expects a array with extra directives
-#     to put before anything else inside location (used with all other types
-#     except custom_cfg). Used for logical structures such as if.
-#   [*location_custom_cfg_append*]    - Expects a array with extra directives
-#     to put before anything else inside location (used with all other types
-#     except custom_cfg). Used for logical structures such as if.
-#   [*location_cfg_append*]  - Expects a hash with extra directives to put
-#     after everything else inside location (used with all other types except
-#     custom_cfg)
-#   [*try_files*]            - An array of file locations to try
-#   [*option*]               - Reserved for future use
-#   [*proxy_cache*]           - This directive sets name of zone for caching.
-#     The same zone can be used in multiple places.
-#   [*proxy_cache_valid*]     - This directive sets the time for caching
-#     different replies.
-#   [*proxy_method*]         - If defined, overrides the HTTP method of the
-#     request to be passed to the backend.
-#   [*proxy_set_body*]       - If defined, sets the body passed to the backend.
-#   [*auth_basic*]            - This directive includes testing name and password
-#     with HTTP Basic Authentication.
-#   [*auth_basic_user_file*]  - This directive sets the htpasswd filename for
-#     the authentication realm.
-#   [*priority*]              - Location priority. Default: 500. User priority
-#     401-499, 501-599. If the priority is higher than the default priority,
-#     the location will be defined after root, or before root.
-#
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::location { 'test2.local-bob':
-#    ensure   => present,
-#    www_root => '/var/www/bob',
-#    location => '/bob',
-#    vhost    => 'test2.local',
-#  }
-#
-#  Custom config example to limit location on localhost,
-#  create a hash with any extra custom config you want.
-#  $my_config = {
-#    'access_log' => 'off',
-#    'allow'      => '127.0.0.1',
-#    'deny'       => 'all'
-#  }
-#  nginx::resource::location { 'test2.local-bob':
-#    ensure              => present,
-#    www_root            => '/var/www/bob',
-#    location            => '/bob',
-#    vhost               => 'test2.local',
-#    location_cfg_append => $my_config,
-#  }
-
-define nginx::resource::location (
-  $ensure               = present,
-  $location             = $name,
-  $vhost                = undef,
-  $www_root             = undef,
-  $autoindex            = undef,
-  $index_files          = [
-    'index.html',
-    'index.htm',
-    'index.php'],
-  $proxy                = undef,
-  $proxy_read_timeout   = $nginx::params::nx_proxy_read_timeout,
-  $fastcgi              = undef,
-  $fastcgi_params       = '/etc/nginx/fastcgi_params',
-  $fastcgi_script       = undef,
-  $fastcgi_split_path   = undef,
-  $ssl                  = false,
-  $ssl_only             = false,
-  $location_alias       = undef,
-  $location_allow       = undef,
-  $location_deny        = undef,
-  $option               = undef,
-  $stub_status          = undef,
-  $location_custom_cfg  = undef,
-  $location_cfg_prepend = undef,
-  $location_cfg_append  = undef,
-  $location_custom_cfg_prepend  = undef,
-  $location_custom_cfg_append   = undef,
-  $try_files            = undef,
-  $proxy_cache          = false,
-  $proxy_cache_valid    = false,
-  $proxy_method         = undef,
-  $proxy_set_body       = undef,
-  $auth_basic           = undef,
-  $auth_basic_user_file = undef,
-  $rewrite_rules        = [],
-  $priority             = 500
-) {
-  File {
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    notify => Class['nginx::service'],
-  }
-
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  validate_string($location)
-  if ($vhost != undef) {
-    validate_string($vhost)
-  }
-  if ($www_root != undef) {
-    validate_string($www_root)
-  }
-  if ($autoindex != undef) {
-    validate_string($autoindex)
-  }
-  validate_array($index_files)
-  if ($proxy != undef) {
-    validate_string($proxy)
-  }
-  validate_string($proxy_read_timeout)
-  if ($fastcgi != undef) {
-    validate_string($fastcgi)
-  }
-  validate_string($fastcgi_params)
-  if ($fastcgi_script != undef) {
-    validate_string($fastcgi_script)
-  }
-  if ($fastcgi_split_path != undef) {
-    validate_string($fastcgi_split_path)
-  }
-  validate_bool($ssl)
-  validate_bool($ssl_only)
-  if ($location_alias != undef) {
-    validate_string($location_alias)
-  }
-  if ($location_allow != undef) {
-    validate_array($location_allow)
-  }
-  if ($location_deny != undef) {
-    validate_array($location_deny)
-  }
-  if ($option != undef) {
-    warning('The $option parameter has no effect and is deprecated.')
-  }
-  if ($stub_status != undef) {
-    validate_bool($stub_status)
-  }
-  if ($location_custom_cfg != undef) {
-    validate_hash($location_custom_cfg)
-  }
-  if ($location_cfg_prepend != undef) {
-    validate_hash($location_cfg_prepend)
-  }
-  if ($location_cfg_append != undef) {
-    validate_hash($location_cfg_append)
-  }
-  if ($try_files != undef) {
-    validate_array($try_files)
-  }
-  if ($proxy_cache != false) {
-    validate_string($proxy_cache)
-  }
-  if ($proxy_cache_valid != false) {
-    validate_string($proxy_cache_valid)
-  }
-  if ($proxy_method != undef) {
-    validate_string($proxy_method)
-  }
-  if ($proxy_set_body != undef) {
-    validate_string($proxy_set_body)
-  }
-  if ($auth_basic != undef) {
-    validate_string($auth_basic)
-  }
-  if ($auth_basic_user_file != undef) {
-    validate_string($auth_basic_user_file)
-  }
-  if !is_integer($priority) {
-    fail('$priority must be an integer.')
-  }
-  validate_array($rewrite_rules)
-  if ($priority < 401) or ($priority > 599) {
-    fail('$priority must be in the range 401-599.')
-  }
-
-  # # Shared Variables
-  $ensure_real = $ensure ? {
-    'absent' => absent,
-    default  => file,
-  }
-
-  $vhost_sanitized = regsubst($vhost, ' ', '_', 'G')
-  $config_file = "${nginx::config::nx_conf_dir}/sites-available/${vhost_sanitized}.conf"
-
-  $location_sanitized_tmp = regsubst($location, '\/', '_', 'G')
-  $location_sanitized = regsubst($location_sanitized_tmp, '\\', '_', 'G')
-
-  ## Check for various error conditions
-  if ($vhost == undef) {
-    fail('Cannot create a location reference without attaching to a virtual host')
-  }
-  if (($www_root == undef) and ($proxy == undef) and ($location_alias == undef) and ($stub_status == undef) and ($fastcgi == undef) and ($location_custom_cfg == undef)) {
-    fail('Cannot create a location reference without a www_root, proxy, location_alias, fastcgi, stub_status, or location_custom_cfg defined')
-  }
-  if (($www_root != undef) and ($proxy != undef)) {
-    fail('Cannot define both directory and proxy in a virtual host')
-  }
-
-  # Use proxy or fastcgi template if $proxy is defined, otherwise use directory template.
-  if ($proxy != undef) {
-    $content_real = template('nginx/vhost/vhost_location_proxy.erb')
-  } elsif ($location_alias != undef) {
-    $content_real = template('nginx/vhost/vhost_location_alias.erb')
-  } elsif ($stub_status != undef) {
-    $content_real = template('nginx/vhost/vhost_location_stub_status.erb')
-  } elsif ($fastcgi != undef) {
-    $content_real = template('nginx/vhost/vhost_location_fastcgi.erb')
-  } elsif ($www_root != undef) {
-    $content_real = template('nginx/vhost/vhost_location_directory.erb')
-  } else {
-    $content_real = template('nginx/vhost/vhost_location_empty.erb')
-  }
-
-  if $fastcgi != undef and !defined(File['/etc/nginx/fastcgi_params']) {
-    file { '/etc/nginx/fastcgi_params':
-      ensure  => present,
-      mode    => '0770',
-      content => template('nginx/vhost/fastcgi_params.erb'),
-    }
-  }
-
-  ## Create stubs for vHost File Fragment Pattern
-  if ($ssl_only != true) {
-    concat::fragment { "${vhost_sanitized}-${priority}-${location_sanitized}":
-      ensure  => present,
-      target  => $config_file,
-      content => $content_real,
-      order   => "${priority}",
-    }
-  }
-
-  ## Only create SSL Specific locations if $ssl is true.
-  if ($ssl == true) {
-    $ssl_priority = $priority + 300
-    concat::fragment {"${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl":
-      ensure  => present,
-      target  => $config_file,
-      content => $content_real,
-      order   => "${ssl_priority}",
-    }
-  }
-
-  if ($auth_basic_user_file != undef) {
-    #Generate htpasswd with provided file-locations
-    file { "${nginx::params::nx_conf_dir}/${location_sanitized}_htpasswd":
-      ensure => $ensure,
-      mode   => '0644',
-      source => $auth_basic_user_file,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp
deleted file mode 100644
index 89e0245d70a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/mailhost.pp
+++ /dev/null
@@ -1,144 +0,0 @@
-# define: nginx::resource::mailhost
-#
-# This definition creates a virtual host
-#
-# Parameters:
-#   [*ensure*]              - Enables or disables the specified mailhost (present|absent)
-#   [*listen_ip*]           - Default IP Address for NGINX to listen with this vHost on. Defaults to all interfaces (*)
-#   [*listen_port*]         - Default IP Port for NGINX to listen with this vHost on. Defaults to TCP 80
-#   [*listen_options*]      - Extra options for listen directive like 'default' to catchall. Undef by default.
-#   [*ipv6_enable*]         - BOOL value to enable/disable IPv6 support (false|true). Module will check to see if IPv6
-#                             support exists on your system before enabling.
-#   [*ipv6_listen_ip*]      - Default IPv6 Address for NGINX to listen with this vHost on. Defaults to all interfaces (::)
-#   [*ipv6_listen_port*]    - Default IPv6 Port for NGINX to listen with this vHost on. Defaults to TCP 80
-#   [*ipv6_listen_options*] - Extra options for listen directive like 'default' to catchall. Template will allways add ipv6only=on.
-#                             While issue jfryman/puppet-nginx#30 is discussed, default value is 'default'.
-#   [*index_files*]         - Default index files for NGINX to read when traversing a directory
-#   [*ssl*]                 - Indicates whether to setup SSL bindings for this mailhost.
-#   [*ssl_cert*]            - Pre-generated SSL Certificate file to reference for SSL Support. This is not generated by this module.
-#   [*ssl_key*]             - Pre-generated SSL Key file to reference for SSL Support. This is not generated by this module.
-#   [*ssl_port*]            - Default IP Port for NGINX to listen with this SSL vHost on. Defaults to TCP 443
-#   [*starttls*]            - enable STARTTLS support: (on|off|only)
-#   [*protocol*]            - Mail protocol to use: (imap|pop3|smtp)
-#   [*auth_http*]           - With this directive you can set the URL to the external HTTP-like server for authorization.
-#   [*xclient*]             - wheter to use xclient for smtp (on|off)
-#   [*server_name*]         - List of mailhostnames for which this mailhost will respond. Default [$name].
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::mailhost { 'domain1.example':
-#    ensure      => present,
-#    auth_http   => 'server2.example/cgi-bin/auth',
-#    protocol    => 'smtp',
-#    listen_port => 587,
-#    ssl_port    => 465,
-#    starttls    => 'only',
-#    xclient     => 'off',
-#    ssl         => true,
-#    ssl_cert    => '/tmp/server.crt',
-#    ssl_key     => '/tmp/server.pem',
-#  }
-define nginx::resource::mailhost (
-  $listen_port,
-  $ensure              = 'present',
-  $listen_ip           = '*',
-  $listen_options      = undef,
-  $ipv6_enable         = false,
-  $ipv6_listen_ip      = '::',
-  $ipv6_listen_port    = '80',
-  $ipv6_listen_options = 'default ipv6only=on',
-  $ssl                 = false,
-  $ssl_cert            = undef,
-  $ssl_key             = undef,
-  $ssl_port            = undef,
-  $starttls            = 'off',
-  $protocol            = undef,
-  $auth_http           = undef,
-  $xclient             = 'on',
-  $server_name         = [$name]) {
-  File {
-    owner => 'root',
-    group => 'root',
-    mode  => '0644',
-  }
-
-  if !is_integer($listen_port) {
-    fail('$listen_port must be an integer.')
-  }
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  validate_string($listen_ip)
-  if ($listen_options != undef) {
-    validate_string($listen_options)
-  }
-  validate_bool($ipv6_enable)
-  validate_string($ipv6_listen_ip)
-  if !is_integer($ipv6_listen_port) {
-    fail('$ipv6_listen_port must be an integer.')
-  }
-  validate_string($ipv6_listen_options)
-  validate_bool($ssl)
-  if ($ssl_cert != undef) {
-    validate_string($ssl_cert)
-  }
-  if ($ssl_key != undef) {
-    validate_string($ssl_key)
-  }
-  if ($ssl_port != undef) and (!is_integer($ssl_port)) {
-    fail('$ssl_port must be an integer.')
-  }
-  validate_re($starttls, '^(on|only|off)$',
-    "${starttls} is not supported for starttls. Allowed values are 'on', 'only' and 'off'.")
-  if ($protocol != undef) {
-    validate_string($protocol)
-  }
-  if ($auth_http != undef) {
-    validate_string($auth_http)
-  }
-  validate_string($xclient)
-  validate_array($server_name)
-
-  $config_file = "${nginx::config::nx_conf_dir}/conf.mail.d/${name}.conf"
-
-  # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
-  # and support does not exist for it in the kernel.
-  if ($ipv6_enable and !$::ipaddress6) {
-    warning('nginx: IPv6 support is not enabled or configured properly')
-  }
-
-  # Check to see if SSL Certificates are properly defined.
-  if ($ssl or $starttls == 'on' or $starttls == 'only') {
-    if ($ssl_cert == undef) or ($ssl_key == undef) {
-      fail('nginx: SSL certificate/key (ssl_cert/ssl_cert) and/or SSL Private must be defined and exist on the target system(s)')
-    }
-  }
-
-  concat { $config_file:
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    notify => Class['nginx::service'],
-  }
-
-  if ($listen_port != $ssl_port) {
-    concat::fragment { "${name}-header":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/mailhost/mailhost.erb'),
-      order   => '001',
-    }
-  }
-
-  # Create SSL File Stubs if SSL is enabled
-  if ($ssl) {
-    concat::fragment { "${name}-ssl":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/mailhost/mailhost_ssl.erb'),
-      order   => '700',
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp
deleted file mode 100644
index 920aff98a18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/upstream.pp
+++ /dev/null
@@ -1,68 +0,0 @@
-# define: nginx::resource::upstream
-#
-# This definition creates a new upstream proxy entry for NGINX
-#
-# Parameters:
-#   [*members*]               - Array of member URIs for NGINX to connect to. Must follow valid NGINX syntax.
-#   [*ensure*]                - Enables or disables the specified location (present|absent)
-#   [*upstream_cfg_prepend*]  - It expects a hash with custom directives to put before anything else inside upstream
-#   [*upstream_fail_timeout*] - Set the fail_timeout for the upstream. Default is 10 seconds - As that is what Nginx does normally.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::upstream { 'proxypass':
-#    ensure  => present,
-#    members => [
-#      'localhost:3000',
-#      'localhost:3001',
-#      'localhost:3002',
-#    ],
-#  }
-#
-#  Custom config example to use ip_hash, and 20 keepalive connections
-#  create a hash with any extra custom config you want.
-#  $my_config = {
-#    'ip_hash'   => '',
-#    'keepalive' => '20',
-#  }
-#  nginx::resource::upstream { 'proxypass':
-#    ensure              => present,
-#    members => [
-#      'localhost:3000',
-#      'localhost:3001',
-#      'localhost:3002',
-#    ],
-#    upstream_cfg_prepend => $my_config,
-#  }
-define nginx::resource::upstream (
-  $members,
-  $ensure = 'present',
-  $upstream_cfg_prepend = undef,
-  $upstream_fail_timeout = '10s',
-) {
-
-  validate_array($members)
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  if ($upstream_cfg_prepend != undef) {
-    validate_hash($upstream_cfg_prepend)
-  }
-
-  File {
-    owner => 'root',
-    group => 'root',
-    mode  => '0644',
-  }
-
-  file { "/etc/nginx/conf.d/${name}-upstream.conf":
-    ensure  => $ensure ? {
-      'absent' => absent,
-      default  => 'file',
-    },
-    content => template('nginx/conf.d/upstream.erb'),
-    notify  => Class['nginx::service'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp
deleted file mode 100644
index 453984dc26a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/resource/vhost.pp
+++ /dev/null
@@ -1,511 +0,0 @@
-# define: nginx::resource::vhost
-#
-# This definition creates a virtual host
-#
-# Parameters:
-#   [*ensure*]              - Enables or disables the specified vhost
-#     (present|absent)
-#   [*listen_ip*]           - Default IP Address for NGINX to listen with this
-#     vHost on. Defaults to all interfaces (*)
-#   [*listen_port*]         - Default IP Port for NGINX to listen with this
-#     vHost on. Defaults to TCP 80
-#   [*listen_options*]      - Extra options for listen directive like
-#     'default' to catchall. Undef by default.
-#   [*location_allow*]      - Array: Locations to allow connections from.
-#   [*location_deny*]       - Array: Locations to deny connections from.
-#   [*ipv6_enable*]         - BOOL value to enable/disable IPv6 support
-#     (false|true). Module will check to see if IPv6 support exists on your
-#     system before enabling.
-#   [*ipv6_listen_ip*]      - Default IPv6 Address for NGINX to listen with
-#     this vHost on. Defaults to all interfaces (::)
-#   [*ipv6_listen_port*]    - Default IPv6 Port for NGINX to listen with this
-#     vHost on. Defaults to TCP 80
-#   [*ipv6_listen_options*] - Extra options for listen directive like 'default'
-#     to catchall. Template will allways add ipv6only=on. While issue
-#     jfryman/puppet-nginx#30 is discussed, default value is 'default'.
-#   [*add_header*]          - Hash: Adds headers to the HTTP response when
-#     response code is equal to 200, 204, 301, 302 or 304.
-#   [*index_files*]         - Default index files for NGINX to read when
-#     traversing a directory
-#   [*autoindex*]           - Set it on 'on' or 'off 'to activate/deactivate
-#                             autoindex directory listing. Undef by default.
-#   [*proxy*]               - Proxy server(s) for the root location to connect
-#     to.  Accepts a single value, can be used in conjunction with
-#     nginx::resource::upstream
-#   [*proxy_read_timeout*]  - Override the default the proxy read timeout value
-#     of 90 seconds
-#   [*resolver*]            - String: Configures name servers used to resolve
-#     names of upstream servers into addresses.
-#   [*fastcgi*]             - location of fastcgi (host:port)
-#   [*fastcgi_params*]      - optional alternative fastcgi_params file to use
-#   [*fastcgi_script*]      - optional SCRIPT_FILE parameter
-#   [*ssl*]                 - Indicates whether to setup SSL bindings for this
-#     vhost.
-#   [*ssl_cert*]            - Pre-generated SSL Certificate file to reference
-#     for SSL Support. This is not generated by this module.
-#   [*ssl_dhparam*]         - This directive specifies a file containing
-#     Diffie-Hellman key agreement protocol cryptographic parameters, in PEM
-#     format, utilized for exchanging session keys between server and client.
-#   [*ssl_key*]             - Pre-generated SSL Key file to reference for SSL
-#     Support. This is not generated by this module.
-#   [*ssl_port*]            - Default IP Port for NGINX to listen with this SSL
-#     vHost on. Defaults to TCP 443
-#   [*ssl_protocols*]       - SSL protocols enabled. Defaults to 'SSLv3 TLSv1
-#     TLSv1.1 TLSv1.2'.
-#   [*ssl_ciphers*]         - SSL ciphers enabled. Defaults to
-#     'HIGH:!aNULL:!MD5'.
-#   [*ssl_stapling*]        - Bool: Enables or disables stapling of OCSP
-#     responses by the server. Defaults to false.
-#   [*ssl_stapling_file*]   - String: When set, the stapled OCSP response
-#     will be taken from the specified file instead of querying the OCSP
-#     responder specified in the server certificate.
-#   [*ssl_stapling_responder*] - String: Overrides the URL of the OCSP
-#     responder specified in the Authority Information Access certificate
-#     extension.
-#   [*ssl_stapling_verify*] - Bool: Enables or disables verification of
-#     OCSP responses by the server. Defaults to false.
-#   [*ssl_trusted_cert*]    - String: Specifies a file with trusted CA
-#     certificates in the PEM format used to verify client certificates and
-#     OCSP responses if ssl_stapling is enabled.
-#   [*spdy*]                - Toggles SPDY protocol.
-#   [*server_name*]         - List of vhostnames for which this vhost will
-#     respond. Default [$name].
-#   [*www_root*]            - Specifies the location on disk for files to be
-#     read from. Cannot be set in conjunction with $proxy
-#   [*rewrite_www_to_non_www*]  - Adds a server directive and rewrite rule to
-#     rewrite www.domain.com to domain.com in order to avoid duplicate
-#     content (SEO);
-#   [*try_files*]               - Specifies the locations for files to be
-#     checked as an array. Cannot be used in conjuction with $proxy.
-#   [*proxy_cache*]             - This directive sets name of zone for caching.
-#     The same zone can be used in multiple places.
-#   [*proxy_cache_valid*]       - This directive sets the time for caching
-#     different replies.
-#   [*proxy_method*]            - If defined, overrides the HTTP method of the
-#     request to be passed to the backend.
-#   [*proxy_set_body*]          - If defined, sets the body passed to the backend.
-#   [*auth_basic*]              - This directive includes testing name and
-#      password with HTTP Basic Authentication.
-#   [*auth_basic_user_file*]    - This directive sets the htpasswd filename for
-#     the authentication realm.
-#   [*client_max_body_size*]    - This directive sets client_max_body_size.
-#   [*vhost_cfg_append*]        - It expects a hash with custom directives to
-#     put after everything else inside vhost
-#   [*vhost_cfg_prepend*]       - It expects a hash with custom directives to
-#     put before everything else inside vhost
-#   [*vhost_cfg_ssl_append*]        - It expects a hash with custom directives to
-#     put after everything else inside vhost ssl
-#   [*vhost_cfg_ssl_prepend*]       - It expects a hash with custom directives to
-#     put before everything else inside vhost ssl
-#   [*rewrite_to_https*]        - Adds a server directive and rewrite rule to
-#      rewrite to ssl
-#   [*include_files*]           - Adds include files to vhost
-#   [*access_log*]              - Where to write access log. May add additional
-#      options like log format to the end.
-#   [*error_log*]               - Where to write error log. May add additional
-#      options like error level to the end.
-#   [*passenger_cgi_param*]     - Allows one to define additional CGI environment
-#      variables to pass to the backend application
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#  nginx::resource::vhost { 'test2.local':
-#    ensure   => present,
-#    www_root => '/var/www/nginx-default',
-#    ssl      => true,
-#    ssl_cert => '/tmp/server.crt',
-#    ssl_key  => '/tmp/server.pem',
-#  }
-define nginx::resource::vhost (
-  $ensure                 = 'present',
-  $listen_ip              = '*',
-  $listen_port            = '80',
-  $listen_options         = undef,
-  $location_allow         = [],
-  $location_deny          = [],
-  $ipv6_enable            = false,
-  $ipv6_listen_ip         = '::',
-  $ipv6_listen_port       = '80',
-  $ipv6_listen_options    = 'default ipv6only=on',
-  $add_header             = undef,
-  $ssl                    = false,
-  $ssl_cert               = undef,
-  $ssl_dhparam            = undef,
-  $ssl_key                = undef,
-  $ssl_port               = '443',
-  $ssl_protocols          = 'SSLv3 TLSv1 TLSv1.1 TLSv1.2',
-  $ssl_ciphers            = 'HIGH:!aNULL:!MD5',
-  $ssl_cache              = 'shared:SSL:10m',
-  $ssl_stapling           = false,
-  $ssl_stapling_file      = undef,
-  $ssl_stapling_responder = undef,
-  $ssl_stapling_verify    = false,
-  $ssl_trusted_cert       = undef,
-  $spdy                   = $nginx::params::nx_spdy,
-  $proxy                  = undef,
-  $proxy_read_timeout     = $nginx::params::nx_proxy_read_timeout,
-  $proxy_set_header       = [],
-  $proxy_cache            = false,
-  $proxy_cache_valid      = false,
-  $proxy_method           = undef,
-  $proxy_set_body         = undef,
-  $resolver               = undef,
-  $fastcgi                = undef,
-  $fastcgi_params         = '/etc/nginx/fastcgi_params',
-  $fastcgi_script         = undef,
-  $index_files            = [
-    'index.html',
-    'index.htm',
-    'index.php'],
-  $autoindex              = undef,
-  $server_name            = [$name],
-  $www_root               = undef,
-  $rewrite_www_to_non_www = false,
-  $rewrite_to_https       = undef,
-  $location_custom_cfg    = undef,
-  $location_cfg_prepend   = undef,
-  $location_cfg_append    = undef,
-  $try_files              = undef,
-  $auth_basic             = undef,
-  $auth_basic_user_file   = undef,
-  $client_max_body_size   = undef,
-  $vhost_cfg_prepend      = undef,
-  $vhost_cfg_append       = undef,
-  $vhost_cfg_ssl_prepend      = undef,
-  $vhost_cfg_ssl_append       = undef,
-  $include_files          = undef,
-  $access_log             = undef,
-  $error_log              = undef,
-  $passenger_cgi_param    = undef,
-  $use_default_location   = true,
-  $rewrite_rules          = [],
-) {
-
-  validate_re($ensure, '^(present|absent)$',
-    "${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
-  validate_string($listen_ip)
-  if !is_integer($listen_port) {
-    fail('$listen_port must be an integer.')
-  }
-  if ($listen_options != undef) {
-    validate_string($listen_options)
-  }
-  validate_array($location_allow)
-  validate_array($location_deny)
-  validate_bool($ipv6_enable)
-  validate_string($ipv6_listen_ip)
-  if !is_integer($ipv6_listen_port) {
-    fail('$ipv6_listen_port must be an integer.')
-  }
-  validate_string($ipv6_listen_options)
-  if ($add_header != undef) {
-    validate_hash($add_header)
-  }
-  validate_bool($ssl)
-  if ($ssl_cert != undef) {
-    validate_string($ssl_cert)
-  }
-  if ($ssl_dhparam != undef) {
-    validate_string($ssl_dhparam)
-  }
-  if ($ssl_key != undef) {
-    validate_string($ssl_key)
-  }
-  if !is_integer($ssl_port) {
-    fail('$ssl_port must be an integer.')
-  }
-  validate_string($ssl_protocols)
-  validate_string($ssl_ciphers)
-  validate_string($ssl_cache)
-  validate_bool($ssl_stapling)
-  if ($ssl_stapling_file != undef) {
-    validate_string($ssl_stapling_file)
-  }
-  if ($ssl_stapling_responder != undef) {
-    validate_string($ssl_stapling_responder)
-  }
-  validate_bool($ssl_stapling_verify)
-  if ($ssl_trusted_cert != undef) {
-    validate_string($ssl_trusted_cert)
-  }
-  validate_string($spdy)
-  if ($proxy != undef) {
-    validate_string($proxy)
-  }
-  validate_string($proxy_read_timeout)
-  validate_array($proxy_set_header)
-  if ($proxy_cache != false) {
-    validate_string($proxy_cache)
-  }
-  if ($proxy_cache_valid != false) {
-    validate_string($proxy_cache_valid)
-  }
-  if ($proxy_method != undef) {
-    validate_string($proxy_method)
-  }
-  if ($proxy_set_body != undef) {
-    validate_string($proxy_set_body)
-  }
-  if ($resolver != undef) {
-    validate_string($resolver)
-  }
-  if ($fastcgi != undef) {
-    validate_string($fastcgi)
-  }
-  validate_string($fastcgi_params)
-  if ($fastcgi_script != undef) {
-    validate_string($fastcgi_script)
-  }
-  validate_array($index_files)
-  if ($autoindex != undef) {
-    validate_string($autoindex)
-  }
-  validate_array($server_name)
-  if ($www_root != undef) {
-    validate_string($www_root)
-  }
-  validate_bool($rewrite_www_to_non_www)
-  if ($rewrite_to_https != undef) {
-    validate_bool($rewrite_to_https)
-  }
-  if ($location_custom_cfg != undef) {
-    validate_hash($location_custom_cfg)
-  }
-  if ($location_cfg_prepend != undef) {
-    validate_hash($location_cfg_prepend)
-  }
-  if ($location_cfg_append != undef) {
-    validate_hash($location_cfg_append)
-  }
-  if ($try_files != undef) {
-    validate_array($try_files)
-  }
-  if ($auth_basic != undef) {
-    validate_string($auth_basic)
-  }
-  if ($auth_basic_user_file != undef) {
-    validate_string($auth_basic_user_file)
-  }
-  if ($vhost_cfg_prepend != undef) {
-    validate_hash($vhost_cfg_prepend)
-  }
-  if ($vhost_cfg_append != undef) {
-    validate_hash($vhost_cfg_append)
-  }
-  if ($vhost_cfg_ssl_prepend != undef) {
-    validate_hash($vhost_cfg_ssl_prepend)
-  }
-  if ($vhost_cfg_ssl_append != undef) {
-    validate_hash($vhost_cfg_ssl_append)
-  }
-  if ($include_files != undef) {
-    validate_array($include_files)
-  }
-  if ($access_log != undef) {
-    validate_string($access_log)
-  }
-  if ($error_log != undef) {
-    validate_string($error_log)
-  }
-  if ($passenger_cgi_param != undef) {
-    validate_hash($passenger_cgi_param)
-  }
-  validate_bool($use_default_location)
-  validate_array($rewrite_rules)
-
-  # Variables
-  $vhost_dir = "${nginx::config::nx_conf_dir}/sites-available"
-  $vhost_enable_dir = "${nginx::config::nx_conf_dir}/sites-enabled"
-  $vhost_symlink_ensure = $ensure ? {
-    'absent' => absent,
-    default  => 'link',
-  }
-
-  $name_sanitized = regsubst($name, ' ', '_', 'G')
-  $config_file = "${vhost_dir}/${name_sanitized}.conf"
-
-  File {
-    ensure => $ensure ? {
-      'absent' => absent,
-      default  => 'file',
-    },
-    notify => Class['nginx::service'],
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-  }
-
-  # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
-  # and support does not exist for it in the kernel.
-  if ($ipv6_enable == true) and (!$ipaddress6) {
-    warning('nginx: IPv6 support is not enabled or configured properly')
-  }
-
-  # Check to see if SSL Certificates are properly defined.
-  if ($ssl == true) {
-    if ($ssl_cert == undef) or ($ssl_key == undef) {
-      fail('nginx: SSL certificate/key (ssl_cert/ssl_cert) and/or SSL Private must be defined and exist on the target system(s)')
-    }
-  }
-
-  # This was a lot to add up in parameter list so add it down here
-  # Also opted to add more logic here and keep template cleaner which
-  # unfortunately means resorting to the $varname_real thing
-  $access_log_real = $access_log ? {
-    undef   => "${nginx::params::nx_logdir}/${name_sanitized}.access.log",
-    default => $access_log,
-  }
-  $error_log_real = $error_log ? {
-    undef   => "${nginx::params::nx_logdir}/${name_sanitized}.error.log",
-    default => $error_log,
-  }
-
-  concat { $config_file:
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    notify => Class['nginx::service'],
-  }
-
-  $ssl_only = ($ssl == true) and ($ssl_port == $listen_port)
-
-  if $use_default_location == true {
-    # Create the default location reference for the vHost
-    nginx::resource::location {"${name_sanitized}-default":
-      ensure              => $ensure,
-      vhost               => $name_sanitized,
-      ssl                 => $ssl,
-      ssl_only            => $ssl_only,
-      location            => '/',
-      location_allow      => $location_allow,
-      location_deny       => $location_deny,
-      proxy               => $proxy,
-      proxy_read_timeout  => $proxy_read_timeout,
-      proxy_cache         => $proxy_cache,
-      proxy_cache_valid   => $proxy_cache_valid,
-      proxy_method        => $proxy_method,
-      proxy_set_body      => $proxy_set_body,
-      fastcgi             => $fastcgi,
-      fastcgi_params      => $fastcgi_params,
-      fastcgi_script      => $fastcgi_script,
-      try_files           => $try_files,
-      www_root            => $www_root,
-      autoindex           => $autoindex,
-      index_files         => [],
-      location_custom_cfg => $location_custom_cfg,
-      notify              => Class['nginx::service'],
-      rewrite_rules       => $rewrite_rules,
-    }
-  } else {
-    $root = $www_root
-  }
-
-  # Support location_cfg_prepend and location_cfg_append on default location created by vhost
-  if $location_cfg_prepend {
-    Nginx::Resource::Location["${name_sanitized}-default"] {
-      location_cfg_prepend => $location_cfg_prepend }
-  }
-
-  if $location_cfg_append {
-    Nginx::Resource::Location["${name_sanitized}-default"] {
-      location_cfg_append => $location_cfg_append }
-  }
-
-  if $fastcgi != undef and !defined(File['/etc/nginx/fastcgi_params']) {
-    file { '/etc/nginx/fastcgi_params':
-      ensure  => present,
-      mode    => '0770',
-      content => template('nginx/vhost/fastcgi_params.erb'),
-    }
-  }
-
-  if ($listen_port != $ssl_port) {
-    concat::fragment { "${name_sanitized}-header":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_header.erb'),
-      order   => '001',
-    }
-  }
-
-  # Create a proper file close stub.
-  if ($listen_port != $ssl_port) {
-    concat::fragment { "${name_sanitized}-footer":
-      ensure  => present,
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_footer.erb'),
-      order   => '699',
-    }
-  }
-
-  # Create SSL File Stubs if SSL is enabled
-  if ($ssl == true) {
-    # Access and error logs are named differently in ssl template
-    $ssl_access_log = $access_log ? {
-      undef   => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.access.log",
-      default => $access_log,
-    }
-    $ssl_error_log = $error_log ? {
-      undef   => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.error.log",
-      default => $error_log,
-    }
-
-    concat::fragment { "${name_sanitized}-ssl-header":
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_ssl_header.erb'),
-      order   => '700',
-    }
-    concat::fragment { "${name_sanitized}-ssl-footer":
-      target  => $config_file,
-      content => template('nginx/vhost/vhost_ssl_footer.erb'),
-      order   => '999',
-    }
-
-    #Generate ssl key/cert with provided file-locations
-    $cert = regsubst($name,' ','_')
-
-    # Check if the file has been defined before creating the file to
-    # avoid the error when using wildcard cert on the multiple vhosts
-    ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.crt", {
-      owner  => $nginx::params::nx_daemon_user,
-      mode   => '0444',
-      source => $ssl_cert,
-    })
-    ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.key", {
-      owner  => $nginx::params::nx_daemon_user,
-      mode   => '0440',
-      source => $ssl_key,
-    })
-    if ($ssl_dhparam != undef) {
-      ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.dh.pem", {
-        owner  => $nginx::params::nx_daemon_user,
-        mode   => '0440',
-        source => $ssl_dhparam,
-      })
-    }
-    if ($ssl_stapling_file != undef) {
-      ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.ocsp.resp", {
-        owner  => $nginx::params::nx_daemon_user,
-        mode   => '0440',
-        source => $ssl_stapling_file,
-      })
-    }
-    if ($ssl_trusted_cert != undef) {
-      ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.trusted.crt", {
-        owner  => $nginx::params::nx_daemon_user,
-        mode   => '0440',
-        source => $ssl_trusted_cert,
-      })
-    }
-  }
-
-  file{ "${name_sanitized}.conf symlink":
-    ensure  => $vhost_symlink_ensure,
-    path    => "${vhost_enable_dir}/${name_sanitized}.conf",
-    target  => $config_file,
-    require => Concat[$config_file],
-    notify  => Service['nginx'],
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/service.pp
deleted file mode 100644
index 9ec899395bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/manifests/service.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Class: nginx::service
-#
-# This module manages NGINX service management and vhost rebuild
-#
-# Parameters:
-#
-# There are no default parameters for this class.
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-# This class file is not called directly
-class nginx::service(
-  $configtest_enable = $nginx::configtest_enable,
-  $service_restart   = $nginx::service_restart,
-  $service_ensure    = $nginx::service_ensure,
-) {
-  
-  $service_enable = $service_ensure ? {
-    running => true,
-    absent => false,
-    stopped => false,
-    default => true,
-  }
-
-  service { 'nginx':
-    ensure     => $service_ensure,
-    enable     => $service_enable,
-    hasstatus  => true,
-    hasrestart => true,
-  }
-  if $configtest_enable == true {
-    Service['nginx'] {
-      restart => $service_restart,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb
deleted file mode 100644
index 6076e5481e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/config_spec.rb
+++ /dev/null
@@ -1,324 +0,0 @@
-require 'spec_helper'
-describe 'nginx::config' do
-
-  describe 'with defaults' do
-    [
-      { :osfamily => 'debian', :operatingsystem => 'debian', },
-      { :osfamily => 'debian', :operatingsystem => 'ubuntu', },
-      { :osfamily => 'redhat', :operatingsystem => 'fedora', },
-      { :osfamily => 'redhat', :operatingsystem => 'rhel', },
-      { :osfamily => 'redhat', :operatingsystem => 'redhat', },
-      { :osfamily => 'redhat', :operatingsystem => 'centos', },
-      { :osfamily => 'redhat', :operatingsystem => 'scientific', },
-      { :osfamily => 'redhat', :operatingsystem => 'amazon', },
-      { :osfamily => 'suse',   :operatingsystem => 'suse', },
-      { :osfamily => 'suse',   :operatingsystem => 'opensuse', },
-      { :osfamily => 'gentoo', :operatingsystem => 'gentoo', },
-      { :osfamily => 'linux',  :operatingsystem => 'gentoo', },
-    ].each do |facts|
-
-      context "when osfamily/operatingsystem is #{facts[:osfamily]}/#{facts[:operatingsystem]}" do
-
-        let :facts do
-          {
-            :osfamily        => facts[:osfamily],
-            :operatingsystem => facts[:operatingsystem],
-          }
-        end
-
-        it { should contain_class("nginx::params") }
-
-        it { should contain_file("/etc/nginx").only_with(
-          :path   => "/etc/nginx",
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.d").only_with(
-          :path   => '/etc/nginx/conf.d',
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.mail.d").only_with(
-          :path   => '/etc/nginx/conf.mail.d',
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.d/vhost_autogen.conf").with_ensure('absent') }
-        it { should contain_file("/etc/nginx/conf.mail.d/vhost_autogen.conf").with_ensure('absent') }
-        it { should contain_file("/var/nginx").with(
-          :ensure => 'directory',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/var/nginx/client_body_temp").with(
-          :ensure => 'directory',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/var/nginx/proxy_temp").with(
-          :ensure => 'directory',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file('/etc/nginx/sites-enabled/default').with_ensure('absent') }
-        it { should contain_file("/etc/nginx/nginx.conf").with(
-          :ensure => 'file',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/etc/nginx/conf.d/proxy.conf").with(
-          :ensure => 'file',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
-        it { should contain_file("/tmp/nginx.d").with(
-          :ensure => 'absent',
-          :purge => true,
-          :recurse => true
-        )}
-        it { should contain_file("/tmp/nginx.mail.d").with(
-          :ensure => 'absent',
-          :purge => true,
-          :recurse => true
-        )}
-      end
-    end
-  end
-
-  describe 'with defaults' do
-    [
-      { :osfamily => 'debian', :operatingsystem => 'debian', },
-      { :osfamily => 'debian', :operatingsystem => 'ubuntu', },
-    ].each do |facts|
-
-      context "when osfamily/operatingsystem is #{facts[:osfamily]}/#{facts[:operatingsystem]}" do
-
-        let :facts do
-          {
-            :osfamily        => facts[:osfamily],
-            :operatingsystem => facts[:operatingsystem],
-          }
-        end
-        it { should contain_file("/var/nginx/client_body_temp").with(:owner => 'www-data')}
-        it { should contain_file("/var/nginx/proxy_temp").with(:owner => 'www-data')}
-        it { should contain_file("/etc/nginx/nginx.conf").with_content %r{^user www-data;}}
-      end
-    end
-  end
-
-  describe 'with defaults' do
-    [
-      { :osfamily => 'redhat', :operatingsystem => 'fedora', },
-      { :osfamily => 'redhat', :operatingsystem => 'rhel', },
-      { :osfamily => 'redhat', :operatingsystem => 'redhat', },
-      { :osfamily => 'redhat', :operatingsystem => 'centos', },
-      { :osfamily => 'redhat', :operatingsystem => 'scientific', },
-      { :osfamily => 'redhat', :operatingsystem => 'amazon', },
-      { :osfamily => 'suse',   :operatingsystem => 'suse', },
-      { :osfamily => 'suse',   :operatingsystem => 'opensuse', },
-      { :osfamily => 'gentoo', :operatingsystem => 'gentoo', },
-      { :osfamily => 'linux',  :operatingsystem => 'gentoo', },
-    ].each do |facts|
-
-      context "when osfamily/operatingsystem is #{facts[:osfamily]}/#{facts[:operatingsystem]}" do
-
-        let :facts do
-          {
-            :osfamily        => facts[:osfamily],
-            :operatingsystem => facts[:operatingsystem],
-          }
-        end
-        it { should contain_file("/var/nginx/client_body_temp").with(:owner => 'nginx')}
-        it { should contain_file("/var/nginx/proxy_temp").with(:owner => 'nginx')}
-        it { should contain_file("/etc/nginx/nginx.conf").with_content %r{^user nginx;}}
-      end
-    end
-  end
-
-  describe 'os-independent items' do
-
-    let :facts do
-      {
-        :osfamily        => 'debian',
-        :operatingsystem => 'debian',
-      }
-    end
-
-    describe "nginx.conf template content" do
-      [
-        {
-          :title => 'should set worker_processes',
-          :attr  => 'worker_processes',
-          :value => '4',
-          :match => 'worker_processes 4;',
-        },
-        {
-          :title => 'should set worker_rlimit_nofile',
-          :attr  => 'worker_rlimit_nofile',
-          :value => '10000',
-          :match => 'worker_rlimit_nofile 10000;',
-        },
-        {
-          :title => 'should set error_log',
-          :attr  => 'nginx_error_log',
-          :value => '/path/to/error.log',
-          :match => 'error_log  /path/to/error.log;',
-        },
-        {
-          :title => 'should set worker_connections',
-          :attr  => 'worker_connections',
-          :value => '100',
-          :match => '  worker_connections 100;',
-        },
-        {
-          :title => 'should set access_log',
-          :attr  => 'http_access_log',
-          :value => '/path/to/access.log',
-          :match => '  access_log  /path/to/access.log;',
-        },
-        {
-          :title => 'should set server_tokens',
-          :attr  => 'server_tokens',
-          :value => 'on',
-          :match => '  server_tokens on;',
-        },
-        {
-          :title => 'should set proxy_cache_path',
-          :attr  => 'proxy_cache_path',
-          :value => '/path/to/proxy.cache',
-          :match => '  proxy_cache_path    /path/to/proxy.cache levels=1 keys_zone=d2:100m max_size=500m inactive=20m;',
-        },
-        {
-          :title    => 'should not set proxy_cache_path',
-          :attr     => 'proxy_cache_path',
-          :value    => false,
-          :notmatch => /  proxy_cache_path    \/path\/to\/proxy\.cache levels=1 keys_zone=d2:100m max_size=500m inactive=20m;/,
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'http_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2;',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do { param[:attr].to_sym => param[:value] } end
-
-          it { should contain_file("/etc/nginx/nginx.conf").with_mode('0644') }
-          it param[:title] do
-            verify_contents(subject, "/etc/nginx/nginx.conf", Array(param[:match]))
-            Array(param[:notmatch]).each do |item|
-              should contain_file("/etc/nginx/nginx.conf").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "proxy.conf template content" do
-      [
-        {
-          :title => 'should set client_max_body_size',
-          :attr  => 'client_max_body_size',
-          :value => '5m',
-          :match => 'client_max_body_size      5m;',
-        },
-        {
-          :title => 'should set proxy_buffers',
-          :attr  => 'proxy_buffers',
-          :value => '50 5k',
-          :match => 'proxy_buffers           50 5k;',
-        },
-        {
-          :title => 'should set proxy_buffer_size',
-          :attr  => 'proxy_buffer_size',
-          :value => '2k',
-          :match => 'proxy_buffer_size       2k;',
-        },
-        {
-          :title => 'should set proxy_http_version',
-          :attr  => 'proxy_http_version',
-          :value => '1.1',
-          :match => 'proxy_http_version      1.1;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'proxy_set_header',
-          :value => ['header1','header2'],
-          :match => [
-            'proxy_set_header        header1;',
-            'proxy_set_header        header2;',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do { param[:attr].to_sym => param[:value] } end
-
-          it { should contain_file("/etc/nginx/conf.d/proxy.conf").with_mode('0644') }
-          it param[:title] do
-            verify_contents(subject, "/etc/nginx/conf.d/proxy.conf", Array(param[:match]))
-            Array(param[:notmatch]).each do |item|
-              should contain_file("/etc/nginx/conf.d/proxy.conf").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    context "when confd_purge true" do
-      let(:params) {{:confd_purge => true}}
-      it { should contain_file('/etc/nginx/conf.d').with(
-        :purge => true,
-        :recurse => true
-      )}
-    end
-
-    context "when confd_purge false" do
-      let(:params) {{:confd_purge => false}}
-      it { should contain_file('/etc/nginx/conf.d').without([
-        'ignore',
-        'purge',
-        'recurse'
-      ])}
-    end
-
-    context "when vhost_purge true" do
-      let(:params) {{:vhost_purge => true}}
-      it { should contain_file('/etc/nginx/sites-available').with(
-        :purge => true,
-        :recurse => true
-      )}
-      it { should contain_file('/etc/nginx/sites-enabled').with(
-        :purge => true,
-        :recurse => true
-      )}
-    end
-
-    context "when vhost_purge false" do
-      let(:params) {{:vhost_purge => false}}
-      it { should contain_file('/etc/nginx/sites-available').without([
-        'ignore',
-        'purge',
-        'recurse'
-      ])}
-      it { should contain_file('/etc/nginx/sites-enabled').without([
-        'ignore',
-        'purge',
-        'recurse'
-      ])}
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb
deleted file mode 100644
index edebfbcdc15..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/nginx_spec.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx' do
-  let :params do
-    {
-      :nginx_upstreams => { 'upstream1' => { 'members' => ['localhost:3000']} },
-      :nginx_vhosts    => { 'test2.local' => { 'www_root' => '/' } },
-      :nginx_locations => { 'test2.local' => { 'vhost' => 'test2.local', 'www_root' => '/'} }
-    }
-  end
-
-  shared_examples "a Linux OS" do
-    it { should compile.with_all_deps }
-    it { should contain_class('nginx') }
-    it { should contain_anchor('nginx::begin') }
-    it { should contain_nginx__package.that_requires('Anchor[nginx::begin]') }
-    it { should contain_nginx__config.that_requires('Class[nginx::package]') }
-    it { should contain_nginx__service.that_subscribes_to('Anchor[nginx::begin]') }
-    it { should contain_nginx__service.that_subscribes_to('Class[nginx::package]') }
-    it { should contain_nginx__service.that_subscribes_to('Class[nginx::config]') }
-    it { should contain_anchor('nginx::end').that_requires('Class[nginx::service]') }
-    it { should contain_class("nginx::params") }
-    it { should contain_nginx__resource__upstream("upstream1") }
-    it { should contain_nginx__resource__vhost("test2.local") }
-    it { should contain_nginx__resource__location("test2.local") }
-  end
-
-  context "Debian OS" do
-    it_behaves_like "a Linux OS" do
-      let :facts do
-        {
-          :operatingsystem => 'Debian',
-          :osfamily        => 'Debian',
-          :lsbdistcodename => 'precise',
-        }
-      end
-    end
-  end
-
-  context "RedHat OS" do
-    it_behaves_like "a Linux OS" do
-      let :facts do
-        {
-          :operatingsystem => 'RedHat',
-          :osfamily        => 'RedHat',
-        }
-      end
-    end
-  end
-
-  context "Suse OS" do
-    it_behaves_like "a Linux OS" do
-      let :facts do
-        {
-          :operatingsystem => 'SuSE',
-          :osfamily        => 'Suse',
-        }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb
deleted file mode 100644
index 0ff2ec6cec0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/package_spec.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::package' do
-
-  shared_examples 'redhat' do |operatingsystem|
-    let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'RedHat' }}
-
-    context "using defaults" do
-      it { should contain_package('nginx') }
-      it { should contain_yumrepo('nginx-release').with(
-        'baseurl'  => 'http://nginx.org/packages/rhel/6/$basearch/',
-        'descr'    => 'nginx repo',
-        'enabled'  => '1',
-        'gpgcheck' => '1',
-        'priority' => '1',
-        'gpgkey'   => 'http://nginx.org/keys/nginx_signing.key'
-      )}
-      it { should contain_file('/etc/yum.repos.d/nginx-release.repo') }
-      it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::redhat]') }
-      it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::redhat]') }
-    end
-
-    context "manage_repo => false" do
-      let(:params) {{ :manage_repo => false }}
-      it { should contain_package('nginx') }
-      it { should_not contain_yumrepo('nginx-release') }
-      it { should_not contain_file('/etc/yum.repos.d/nginx-release.repo') }
-    end
-
-    context "lsbmajdistrelease = 5" do
-      let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'RedHat', :lsbmajdistrelease => 5 }}
-      it { should contain_package('nginx') }
-      it { should contain_yumrepo('nginx-release').with(
-        'baseurl'  => 'http://nginx.org/packages/rhel/5/$basearch/'
-      )}
-      it { should contain_file('/etc/yum.repos.d/nginx-release.repo') }
-    end
-
-    describe 'installs the requested package version' do
-      let(:facts) {{ :operatingsystem => 'redhat', :osfamily => 'redhat' }}
-      let(:params) {{ :package_ensure => '3.0.0' }}
-
-      it 'installs 3.0.0 exactly' do
-        should contain_package('nginx').with({
-          'ensure' => '3.0.0'
-        })
-      end
-    end
-  end
-
-  shared_examples 'debian' do |operatingsystem, lsbdistcodename|
-    let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'Debian', :lsbdistcodename => lsbdistcodename }}
-
-    context "using defaults" do
-      it { should contain_package('nginx') }
-      it { should_not contain_package('passenger') }
-      it { should contain_apt__source('nginx').with(
-        'location'   => "http://nginx.org/packages/#{operatingsystem}",
-        'repos'      => 'nginx',
-        'key'        => '7BD9BF62',
-        'key_source' => 'http://nginx.org/keys/nginx_signing.key'
-      )}
-      it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::debian]') }
-      it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::debian]') }
-    end
-
-    context "package_source => 'passenger'" do
-      let(:params) {{ :package_source => 'passenger' }}
-      it { should contain_package('nginx') }
-      it { should contain_package('passenger') }
-      it { should contain_apt__source('nginx').with(
-        'location'   => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
-        'repos'      => "main",
-        'key'        => '561F9B9CAC40B2F7',
-        'key_source' => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt'
-      )}
-    end
-
-    context "manage_repo => false" do
-      let(:params) {{ :manage_repo => false }}
-      it { should contain_package('nginx') }
-      it { should_not contain_apt__source('nginx') }
-      it { should_not contain_package('passenger') }
-    end
-  end
-
-  shared_examples 'suse' do |operatingsystem|
-    let(:facts) {{ :operatingsystem => operatingsystem, :osfamily => 'Suse'}}
-    [
-      'nginx-0.8',
-      'apache2',
-      'apache2-itk',
-      'apache2-utils',
-      'gd',
-      'libapr1',
-      'libapr-util1',
-      'libjpeg62',
-      'libpng14-14',
-      'libxslt',
-      'rubygem-daemon_controller',
-      'rubygem-fastthread',
-      'rubygem-file-tail',
-      'rubygem-passenger',
-      'rubygem-passenger-nginx',
-      'rubygem-rack',
-      'rubygem-rake',
-      'rubygem-spruz',
-    ].each do |package|
-      it { should contain_package("#{package}") }
-    end
-    it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::suse]') }
-    it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::suse]') }
-  end
-
-
-  context 'redhat' do
-    it_behaves_like 'redhat', 'centos'
-    it_behaves_like 'redhat', 'rhel'
-    it_behaves_like 'redhat', 'redhat'
-    it_behaves_like 'redhat', 'scientific'
-    it_behaves_like 'redhat', 'amazon'
-  end
-
-  context 'debian' do
-    it_behaves_like 'debian', 'debian', 'wheezy'
-    it_behaves_like 'debian', 'ubuntu', 'precise'
-  end
-
-  context 'suse' do
-    it_behaves_like 'suse', 'opensuse'
-    it_behaves_like 'suse', 'suse'
-  end
-
-  context 'amazon with facter < 1.7.2' do
-    let(:facts) {{ :operatingsystem => 'Amazon', :osfamily => 'Linux' }}
-      it { should contain_package('nginx') }
-      it { should contain_yumrepo('nginx-release').with(
-        'baseurl'  => 'http://nginx.org/packages/rhel/6/$basearch/',
-        'descr'    => 'nginx repo',
-        'enabled'  => '1',
-        'gpgcheck' => '1',
-        'priority' => '1',
-        'gpgkey'   => 'http://nginx.org/keys/nginx_signing.key'
-      )}
-      it { should contain_file('/etc/yum.repos.d/nginx-release.repo') }
-      it { should contain_anchor('nginx::package::begin').that_comes_before('Class[nginx::package::redhat]') }
-      it { should contain_anchor('nginx::package::end').that_requires('Class[nginx::package::redhat]') }
-  end
-
-  context 'fedora' do
-    # fedora is identical to the rest of osfamily RedHat except for not
-    # including nginx-release
-    let(:facts) {{ :operatingsystem => 'Fedora', :osfamily => 'RedHat', :lsbmajdistrelease => 6 }}
-    it { should contain_package('nginx') }
-    it { should_not contain_yumrepo('nginx-release') }
-    it { should_not contain_file('/etc/yum.repos.d/nginx-release.repo') }
-  end
-
-  context 'other' do
-    let(:facts) {{ :operatingsystem => 'xxx', :osfamily => 'linux' }}
-    it { expect { subject }.to raise_error(Puppet::Error, /Module nginx is not supported on xxx/) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb
deleted file mode 100644
index a813b3a10c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/params_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::params' do
-  context "On a Debian OS" do
-    let :facts do {
-      :osfamily        => 'debian',
-      :operatingsystem => 'debian',
-    } end
-
-    it { should contain_nginx__params }
-    it { should have_class_count(1) }    #only nginx::params itself
-    it { should have_resource_count(0) } #params class should never declare resources
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb
deleted file mode 100644
index 300316e5d83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/classes/service_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-describe 'nginx::service' do
-
-  let :facts do {
-    :osfamily        => 'Debian',
-    :operatingsystem => 'debian',
-  } end
-
-  let :params do {
-      :configtest_enable => false,
-      :service_restart => '/etc/init.d/nginx configtest && /etc/init.d/nginx restart',
-      :service_ensure => 'running',
-  } end   
-
-  context "using default parameters" do
-
-    it { should contain_service('nginx').with(
-      :ensure     => 'running',
-      :enable     => true,
-      :hasstatus  => true,
-      :hasrestart => true
-    )}
-
-    it { should contain_service('nginx').without_restart }
-
-  end
-
-  describe "when configtest_enable => true" do
-    let(:params) {{ :configtest_enable => true,  :service_restart => '/etc/init.d/nginx configtest && /etc/init.d/nginx restart'}}
-    it { should contain_service('nginx').with_restart('/etc/init.d/nginx configtest && /etc/init.d/nginx restart') }
-
-    context "when service_restart => 'a restart command'" do
-      let(:params) {{ :configtest_enable => true, :service_restart => 'a restart command' }}
-      it { should contain_service('nginx').with_restart('a restart command') }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb
deleted file mode 100644
index 23cc8acf34f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_location_spec.rb
+++ /dev/null
@@ -1,621 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::location' do
-  let :title do
-    'rspec-test'
-  end
-  let :facts do
-    {
-      :osfamily        => 'Debian',
-      :operatingsystem => 'debian',
-    }
-  end
-  let :pre_condition do
-    [
-      'include ::nginx::params',
-      'include ::nginx::config',
-    ]
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do {
-        :www_root => "/var/www/rspec",
-        :vhost    => 'vhost1',
-      } end
-
-      it { should contain_class("nginx::params") }
-      it { should contain_class("nginx::config") }
-      it { should contain_concat__fragment("vhost1-500-rspec-test").with_content(/location rspec-test/) }
-      it { should_not contain_file('/etc/nginx/fastcgi_params') }
-      it { should_not contain_concat__fragment("vhost1-800-rspec-test-ssl") }
-      it { should_not contain_file("/etc/nginx/rspec-test_htpasswd") }
-    end
-
-    describe "vhost_location_proxy template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set proxy_cache',
-          :attr  => 'proxy_cache',
-          :value => 'value',
-          :match => '    proxy_cache         value;',
-        },
-        {
-          :title    => 'should not set proxy_cache',
-          :attr     => 'proxy_cache',
-          :value    => false,
-          :notmatch => /proxy_cache/
-        },
-        {
-          :title => 'should set proxy_method',
-          :attr  => 'proxy_method',
-          :value => 'value',
-          :match => '    proxy_method        value;',
-        },
-        {
-          :title => 'should set proxy_set_body',
-          :attr  => 'proxy_set_body',
-          :value => 'value',
-          :match => '    proxy_set_body      value;',
-        },
-        {
-          :title => 'should set proxy_pass',
-          :attr  => 'proxy',
-          :value => 'value',
-          :match => '    proxy_pass          value;',
-        },
-        {
-          :title => 'should set proxy_read_timeout',
-          :attr  => 'proxy_read_timeout',
-          :value => 'value',
-          :match => '    proxy_read_timeout  value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1a;',
-            '    test1 test value 1b;',
-            '    test2 test value 2;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should contain rewrite rules',
-          :attr  => 'rewrite_rules',
-          :value => [
-            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last',
-            '^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last',
-            '^/users/(.*)$ /show?user=$1? last',
-          ],
-          :match => [
-            '    rewrite ^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last;',
-            '    rewrite ^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last;',
-            '    rewrite ^/users/(.*)$ /show?user=$1? last;',
-          ],
-        },
-        {
-          :title    => 'should not set rewrite_rules',
-          :attr     => 'rewrite_rules',
-          :value    => [],
-          :notmatch => /rewrite/
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :proxy => 'proxy_value', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-
-      context "when proxy_cache_valid is 10m" do
-        let :params do {
-          :location => 'location',
-          :proxy => 'proxy_value',
-          :vhost => 'vhost1',
-          :proxy_cache => 'true',
-          :proxy_cache_valid => '10m',
-        } end
-
-        it { should contain_concat__fragment("vhost1-500-location").with_content(/proxy_cache_valid   10m;/) }
-      end
-    end
-
-    describe "vhost_location_alias template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set alias',
-          :attr  => 'location_alias',
-          :value => 'value',
-          :match => '    alias      value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :location_alias => 'location_alias_value', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_stub_status template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :stub_status => true, :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_fastcgi template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set www_root',
-          :attr  => 'www_root',
-          :value => '/',
-          :match => '    root  /;'
-        },
-        {
-          :title => 'should set fastcgi_split_path',
-          :attr  => 'fastcgi_split_path',
-          :value => 'value',
-          :match => '    fastcgi_split_path_info value;'
-        },
-        {
-          :title => 'should set try_file(s)',
-          :attr  => 'try_files',
-          :value => ['name1','name2'],
-          :match => '    try_files name1 name2;',
-        },
-        {
-          :title => 'should set fastcgi_params',
-          :attr  => 'fastcgi_params',
-          :value => 'value',
-          :match => '    include value;'
-        },
-        {
-          :title => 'should set fastcgi_pass',
-          :attr  => 'fastcgi',
-          :value => 'value',
-          :match => '    fastcgi_pass value;'
-        },
-        {
-          :title => 'should set fastcgi_param',
-          :attr  => 'fastcgi_script',
-          :value => 'value',
-          :match => '    fastcgi_param SCRIPT_FILENAME value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :fastcgi => 'localhost:9000', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(/#{item}/)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_directory template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should set the allow directive',
-          :attr  => 'location_allow',
-          :value => ['rule1','rule2'],
-          :match => ['    allow rule1;', '    allow rule2;'],
-        },
-        {
-          :title => 'should set the deny directive',
-          :attr  => 'location_deny',
-          :value => ['rule1','rule2'],
-          :match => ['    deny rule1;', '    deny rule2;'],
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'location_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should set www_root',
-          :attr  => 'www_root',
-          :value => '/',
-          :match => '    root  /;'
-        },
-        {
-          :title => 'should set try_file(s)',
-          :attr  => 'try_files',
-          :value => ['name1','name2'],
-          :match => '    try_files name1 name2;',
-        },
-        {
-          :title => 'should set index_file(s)',
-          :attr  => 'index_files',
-          :value => ['name1','name2'],
-          :match => '    index  name1 name2;',
-        },
-        {
-          :title => 'should set auth_basic',
-          :attr  => 'auth_basic',
-          :value => 'value',
-          :match => '    auth_basic           "value";',
-        },
-        {
-          :title => 'should set auth_basic_user_file',
-          :attr  => 'auth_basic_user_file',
-          :value => 'value',
-          :match => '    auth_basic_user_file value;',
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'location_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1;',
-            '    test2 test value 2a;',
-            '    test2 test value 2b;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-        {
-          :title => 'should contain rewrite rules',
-          :attr  => 'rewrite_rules',
-          :value => [
-            '^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last',
-            '^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last',
-            '^/users/(.*)$ /show?user=$1? last',
-          ],
-          :match => [
-            '    rewrite ^(/download/.*)/media/(.*)\..*$ $1/mp3/$2.mp3 last;',
-            '    rewrite ^(/download/.*)/audio/(.*)\..*$ $1/mp3/$2.ra  last;',
-            '    rewrite ^/users/(.*)$ /show?user=$1? last;',
-          ],
-        },
-        {
-          :title    => 'should not set rewrite_rules',
-          :attr     => 'rewrite_rules',
-          :value    => [],
-          :notmatch => /rewrite/
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :www_root => '/var/www/root', :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_location_empty template content" do
-      [
-        {
-          :title => 'should set the location',
-          :attr  => 'location',
-          :value => 'my_location',
-          :match => '  location my_location {',
-        },
-        {
-          :title => 'should contain ordered config directives',
-          :attr  => 'location_custom_cfg',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3',
-                      'test4' => { 'subtest1' => ['"sub test value1a"', '"sub test value1b"'],
-                                  'subtest2' => '"sub test value2"' } },
-          :match => [
-            '    allow test value 3;',
-            '    test1 test value 1a;',
-            '    test1 test value 1b;',
-            '    test2 test value 2;',
-            '    test4 subtest1 "sub test value1a";',
-            '    test4 subtest1 "sub test value1b";',
-            '    test4 subtest2 "sub test value2";',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do { :location => 'location', :location_custom_cfg => {'test1'=>'value1'}, :vhost => 'vhost1' } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("vhost1-500-#{params[:location]}") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "vhost1-500-#{params[:location]}").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("vhost1-500-#{params[:location]}").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    context 'attribute resources' do
-      context 'when fastcgi => "localhost:9000"' do
-        let :params do { :fastcgi => 'localhost:9000', :vhost => 'vhost1' } end
-
-        it { should contain_file('/etc/nginx/fastcgi_params').with_mode('0770') }
-      end
-
-      context 'when ssl_only => true' do
-        let :params do { :ssl_only => true, :vhost => 'vhost1', :www_root => '/', } end
-        it { should_not contain_concat__fragment("vhost1-500-rspec-test") }
-      end
-
-      context 'when ssl_only => false' do
-        let :params do { :ssl_only => false, :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should contain_concat__fragment("vhost1-500-rspec-test") }
-      end
-
-      context 'when ssl => true' do
-        let :params do { :ssl => true, :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should contain_concat__fragment("vhost1-800-rspec-test-ssl") }
-      end
-
-      context 'when ssl => false' do
-        let :params do { :ssl => false, :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should_not contain_concat__fragment("vhost1-800-rspec-test-ssl") }
-      end
-
-      context 'when auth_basic_user_file => true' do
-        let :params do { :auth_basic_user_file => '/path/to/file', :vhost => 'vhost1', :www_root => '/', } end
-
-        it { should contain_file("/etc/nginx/rspec-test_htpasswd") }
-      end
-
-      context 'when ensure => absent' do
-        let :params do {
-          :www_root             => '/',
-          :vhost                => 'vhost1',
-          :ensure               => 'absent',
-          :ssl                  => true,
-          :auth_basic_user_file => '/path/to/file',
-        } end
-
-        it { should contain_file("/etc/nginx/rspec-test_htpasswd").with_ensure('absent') }
-      end
-
-      context "vhost missing" do
-        let :params do {
-          :www_root => '/',
-        } end
-
-        it { expect { should contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot create a location reference without attaching to a virtual host/) }
-      end
-
-      context "location type missing" do
-        let :params do {
-          :vhost => 'vhost1',
-        } end
-
-        it { expect { should contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot create a location reference without a www_root, proxy, location_alias, fastcgi, stub_status, or location_custom_cfg defined/) }
-      end
-
-      context "www_root and proxy are set" do
-        let :params do {
-          :vhost    => 'vhost1',
-          :www_root => '/',
-          :proxy    => 'http://localhost:8000/uri/',
-        } end
-
-        it { expect { should contain_class('nginx::resource::location') }.to raise_error(Puppet::Error, /Cannot define both directory and proxy in a virtual host/) }
-      end
-
-      context 'when vhost name is sanitized' do
-        let :title do 'www.rspec-location.com' end
-        let :params do {
-          :vhost => 'www rspec-vhost com',
-          :www_root => '/',
-          :ssl => true,
-        } end
-
-        it { should contain_concat__fragment("www_rspec-vhost_com-500-www.rspec-location.com").with_target('/etc/nginx/sites-available/www_rspec-vhost_com.conf') }
-        it { should contain_concat__fragment("www_rspec-vhost_com-800-www.rspec-location.com-ssl").with_target('/etc/nginx/sites-available/www_rspec-vhost_com.conf') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb
deleted file mode 100644
index e59adfdabb5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_mailhost_spec.rb
+++ /dev/null
@@ -1,401 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::mailhost' do
-  let :title do
-    'www.rspec.example.com'
-  end
-  let :facts do
-    {
-      :osfamily        => 'debian',
-      :operatingsystem => 'debian',
-      :ipaddress6      => '::',
-    }
-  end
-  let :default_params do
-    {
-      :listen_port => 25,
-      :ipv6_enable => true,
-    }
-  end
-  let :pre_condition do
-    [
-      'include ::nginx::config',
-    ]
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do default_params end
-      it { should contain_class("nginx::config") }
-      it { should contain_concat("/etc/nginx/conf.mail.d/#{title}.conf").with({
-        'owner' => 'root',
-        'group' => 'root',
-        'mode'  => '0644',
-      })}
-      it { should contain_concat__fragment("#{title}-header") }
-      it { should_not contain_concat__fragment("#{title}-ssl") }
-    end
-
-    describe "mailhost template content" do
-      [
-        {
-          :title => 'should set the IPv4 listen IP',
-          :attr  => 'listen_ip',
-          :value => '127.0.0.1',
-          :match => '  listen                127.0.0.1:25;',
-        },
-        {
-          :title => 'should set the IPv4 listen port',
-          :attr  => 'listen_port',
-          :value => 45,
-          :match => '  listen                *:45;',
-        },
-        {
-          :title => 'should set the IPv4 listen options',
-          :attr  => 'listen_options',
-          :value => 'spdy default',
-          :match => '  listen                *:25 spdy default;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:80 default ipv6only=on;',
-        },
-        {
-          :title    => 'should not enable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:80 default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ipv6_listen_port',
-          :value => 45,
-          :match => '  listen [::]:45 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy',
-          :match => '  listen [::]:80 spdy;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name           name1 name2;',
-        },
-        {
-          :title => 'should set protocol',
-          :attr  => 'protocol',
-          :value => 'test-protocol',
-          :match => '  protocol              test-protocol;',
-        },
-        {
-          :title => 'should set xclient',
-          :attr  => 'xclient',
-          :value => 'test-xclient',
-          :match => '  xclient               test-xclient;',
-        },
-        {
-          :title => 'should set auth_http',
-          :attr  => 'auth_http',
-          :value => 'test-auth_http',
-          :match => '  auth_http             test-auth_http;',
-        },
-        {
-          :title => 'should set starttls',
-          :attr  => 'starttls',
-          :value => 'on',
-          :match => '  starttls              on;',
-        },
-        {
-          :title => 'should set starttls',
-          :attr  => 'starttls',
-          :value => 'only',
-          :match => '  starttls              only;',
-        },
-        {
-          :title    => 'should not enable SSL',
-          :attr     => 'starttls',
-          :value    => 'off',
-          :notmatch => /  ssl_session_timeout  5m;/,
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do {
-            :listen_port => 25,
-            :ipv6_enable => true,
-            :ssl_cert    => 'dummy.crt',
-            :ssl_key     => 'dummy.key',
-          } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "mailhost template content (SSL enabled)" do
-      [
-        {
-          :title => 'should enable SSL',
-          :attr  => 'starttls',
-          :value => 'on',
-          :match => '  ssl_session_timeout  5m;',
-        },
-        {
-          :title => 'should enable SSL',
-          :attr  => 'starttls',
-          :value => 'only',
-          :match => '  ssl_session_timeout  5m;',
-        },
-        {
-          :title    => 'should not enable SSL',
-          :attr     => 'starttls',
-          :value    => 'off',
-          :notmatch => /  ssl_session_timeout  5m;/,
-        },
-        {
-          :title => 'should set ssl_certificate',
-          :attr  => 'ssl_cert',
-          :value => 'test-ssl-cert',
-          :match => '  ssl_certificate      test-ssl-cert;',
-        },
-        {
-          :title => 'should set ssl_certificate_key',
-          :attr  => 'ssl_key',
-          :value => 'test-ssl-cert-key',
-          :match => '  ssl_certificate_key  test-ssl-cert-key;',
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do {
-            :listen_port => 25,
-            :starttls    => 'on',
-            :ssl_cert    => 'dummy.crt',
-            :ssl_key     => 'dummy.key',
-          } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "mailhost_ssl template content" do
-      [
-        {
-          :title => 'should set the IPv4 SSL listen port',
-          :attr  => 'ssl_port',
-          :value => '45',
-          :match => '  listen       45;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:80 default ipv6only=on;',
-        },
-        {
-          :title    => 'should not enable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:80 default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ipv6_listen_port',
-          :value => 45,
-          :match => '  listen [::]:45 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy',
-          :match => '  listen [::]:80 spdy;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name           name1 name2;',
-        },
-        {
-          :title => 'should set protocol',
-          :attr  => 'protocol',
-          :value => 'test-protocol',
-          :match => '  protocol              test-protocol;',
-        },
-        {
-          :title => 'should set xclient',
-          :attr  => 'xclient',
-          :value => 'test-xclient',
-          :match => '  xclient               test-xclient;',
-        },
-        {
-          :title => 'should set auth_http',
-          :attr  => 'auth_http',
-          :value => 'test-auth_http',
-          :match => '  auth_http             test-auth_http;',
-        },
-        {
-          :title => 'should set ssl_certificate',
-          :attr  => 'ssl_cert',
-          :value => 'test-ssl-cert',
-          :match => '  ssl_certificate      test-ssl-cert;',
-        },
-        {
-          :title => 'should set ssl_certificate_key',
-          :attr  => 'ssl_key',
-          :value => 'test-ssl-cert-key',
-          :match => '  ssl_certificate_key  test-ssl-cert-key;',
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :default_params do {
-            :listen_port => 25,
-            :ipv6_enable => true,
-            :ssl         => true,
-            :ssl_cert    => 'dummy.crt',
-            :ssl_key     => 'dummy.key',
-          } end
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-ssl") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-ssl").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-ssl").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    context 'attribute resources' do
-      context "SSL cert missing and ssl => true" do
-        let :params do default_params.merge({
-          :ssl     => true,
-          :ssl_key => 'key',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing and ssl => true" do
-        let :params do default_params.merge({
-          :ssl      => true,
-          :ssl_cert => 'cert',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL cert missing and starttls => 'on'" do
-        let :params do default_params.merge({
-          :starttls => 'on',
-          :ssl_key  => 'key',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing and starttls => 'on'" do
-        let :params do default_params.merge({
-          :starttls => 'on',
-          :ssl_cert => 'cert',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL cert missing and starttls => 'only'" do
-        let :params do default_params.merge({
-          :starttls => 'only',
-          :ssl_key  => 'key',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing and starttls => 'only'" do
-        let :params do default_params.merge({
-          :starttls => 'only',
-          :ssl_cert => 'cert',
-        }) end
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context 'when listen_port != ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 443,
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-      end
-
-      context 'when listen_port == ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 80,
-        }) end
-
-        it { should_not contain_concat__fragment("#{title}-header") }
-      end
-
-      context 'when ssl => true' do
-        let :params do default_params.merge({
-          :ensure   => 'absent',
-          :ssl      => true,
-          :ssl_key  => 'dummy.key',
-          :ssl_cert => 'dummy.cert',
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-        it { should contain_concat__fragment("#{title}-ssl") }
-      end
-
-      context 'when ssl => false' do
-        let :params do default_params.merge({
-          :ensure => 'absent',
-          :ssl    => false,
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-        it { should_not contain_concat__fragment("#{title}-ssl") }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb
deleted file mode 100644
index 8423eb43765..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_upstream_spec.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::upstream' do
-  let :title do
-    'upstream-test'
-  end
-
-  let :default_params do
-    {
-      :members => ['test'],
-    }
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do default_params end
-
-      it { should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with(
-        {
-          'owner'   => 'root',
-          'group'   => 'root',
-          'mode'    => '0644',
-          'ensure'  => 'file',
-          'content' => /upstream #{title}/,
-        }
-      )}
-    end
-
-    describe "upstream.conf template content" do
-      [
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'upstream_cfg_prepend',
-          :value => {
-            'test3' => 'test value 3',
-            'test1' => 'test value 1',
-            'test2' => 'test value 2',
-            'test4' => ['test value 1', 'test value 2'],
-            'test5' => {'subkey1' => 'subvalue1'},
-            'test6' => {'subkey1' => ['subvalue1', 'subvalue2']},
-          },
-          :match => [
-            '  test1 test value 1;',
-            '  test2 test value 2;',
-            '  test3 test value 3;',
-            '  test4 test value 1;',
-            '  test4 test value 2;',
-            '  test5 subkey1 subvalue1;',
-            '  test6 subkey1 subvalue1;',
-            '  test6 subkey1 subvalue2;',
-          ],
-        },
-        {
-          :title => 'should set server',
-          :attr  => 'members',
-          :value => [
-            'test3',
-            'test1',
-            'test2',
-          ],
-          :match => [
-            '  server     test3  fail_timeout=10s;',
-            '  server     test1  fail_timeout=10s;',
-            '  server     test2  fail_timeout=10s;',
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with_mode('0644') }
-          it param[:title] do
-            verify_contents(subject, "/etc/nginx/conf.d/#{title}-upstream.conf", Array(param[:match]))
-            Array(param[:notmatch]).each do |item|
-              should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").without_content(item)
-            end
-          end
-        end
-      end
-
-      context 'when ensure => absent' do
-        let :params do default_params.merge(
-          {
-            :ensure => 'absent'
-          }
-        ) end
-
-        it { should contain_file("/etc/nginx/conf.d/#{title}-upstream.conf").with_ensure('absent') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb
deleted file mode 100644
index 9d4ef3d903b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/defines/resource_vhost_spec.rb
+++ /dev/null
@@ -1,647 +0,0 @@
-require 'spec_helper'
-
-describe 'nginx::resource::vhost' do
-  let :title do
-    'www.rspec.example.com'
-  end
-  let :default_params do
-    {
-      :www_root    => '/',
-      :ipv6_enable => true,
-    }
-  end
-  let :facts do
-    {
-      :osfamily        => 'Debian',
-      :operatingsystem => 'debian',
-      :ipaddress6      => '::',
-    }
-  end
-  let :pre_condition do
-    [
-      'include ::nginx::params',
-      'include ::nginx::config',
-    ]
-  end
-
-  describe 'os-independent items' do
-
-    describe 'basic assumptions' do
-      let :params do default_params end
-      it { should contain_class("nginx::params") }
-      it { should contain_class("nginx::config") }
-      it { should contain_concat("/etc/nginx/sites-available/#{title}.conf").with({
-        'owner' => 'root',
-        'group' => 'root',
-        'mode'  => '0644',
-      })}
-      it { should contain_concat__fragment("#{title}-header").with_content(%r{access_log[ ]+/var/log/nginx/www\.rspec\.example\.com\.access\.log}) }
-      it { should contain_concat__fragment("#{title}-header").with_content(%r{error_log[ ]+/var/log/nginx/www\.rspec\.example\.com\.error\.log}) }
-      it { should contain_concat__fragment("#{title}-footer") }
-      it { should contain_nginx__resource__location("#{title}-default") }
-      it { should_not contain_file("/etc/nginx/fastcgi_params") }
-      it { should contain_file("#{title}.conf symlink").with({
-        'ensure' => 'link',
-        'path'   => "/etc/nginx/sites-enabled/#{title}.conf",
-        'target' => "/etc/nginx/sites-available/#{title}.conf"
-      })}
-    end
-
-    describe "vhost_header template content" do
-      [
-        {
-          :title => 'should set the IPv4 listen IP',
-          :attr  => 'listen_ip',
-          :value => '127.0.0.1',
-          :match => '  listen                127.0.0.1:80;',
-        },
-        {
-          :title => 'should set the IPv4 listen port',
-          :attr  => 'listen_port',
-          :value => 45,
-          :match => '  listen                *:45;',
-        },
-        {
-          :title => 'should set the IPv4 listen options',
-          :attr  => 'listen_options',
-          :value => 'spdy default',
-          :match => '  listen                *:80 spdy default;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:80 default ipv6only=on;',
-        },
-        {
-          :title    => 'should not enable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:80 default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:80 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ipv6_listen_port',
-          :value => 45,
-          :match => '  listen [::]:45 default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy',
-          :match => '  listen [::]:80 spdy;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name           name1 name2;',
-        },
-        {
-          :title => 'should rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => '  server_name           rspec.example.com;',
-        },
-        {
-          :title => 'should not rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => false,
-          :match => '  server_name           www.rspec.example.com;',
-        },
-        {
-          :title => 'should set auth_basic',
-          :attr  => 'auth_basic',
-          :value => 'value',
-          :match => '  auth_basic           "value";',
-        },
-        {
-          :title => 'should set auth_basic_user_file',
-          :attr  => 'auth_basic_user_file',
-          :value => 'value',
-          :match => '  auth_basic_user_file value;',
-        },
-        {
-          :title => 'should contain ordered prepended directives',
-          :attr  => 'vhost_cfg_prepend',
-          :value => { 'test1' => ['test value 1a', 'test value 1b'], 'test2' => 'test value 2', 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1a;',
-            '  test1 test value 1b;',
-            '  test2 test value 2;',
-          ],
-        },
-        {
-          :title => 'should set root',
-          :attr  => 'use_default_location',
-          :value => false,
-          :match => '  root /;',
-        },
-        {
-          :title    => 'should not set root',
-          :attr     => 'use_default_location',
-          :value    => true,
-          :notmatch => /  root \/;/,
-        },
-        {
-          :title => 'should set proxy_set_header',
-          :attr  => 'proxy_set_header',
-          :value => ['header1','header2'],
-          :match => [
-            '  proxy_set_header        header1;',
-            '  proxy_set_header        header2;',
-          ],
-        },
-        {
-          :title => 'should rewrite to HTTPS',
-          :attr  => 'rewrite_to_https',
-          :value => true,
-          :match => [
-            '  if ($ssl_protocol = "") {',
-            '       return 301 https://$host$request_uri;',
-          ],
-        },
-        {
-          :title    => 'should not rewrite to HTTPS',
-          :attr     => 'rewrite_to_https',
-          :value    => false,
-          :notmatch => [
-            /if \(\$ssl_protocol = ""\) \{/,
-            /       return 301 https:\/\/\$host\$request_uri;/,
-          ],
-        },
-        {
-          :title => 'should set access_log',
-          :attr  => 'access_log',
-          :value => '/path/to/access.log',
-          :match => '  access_log            /path/to/access.log;',
-        },
-        {
-          :title => 'should set error_log',
-          :attr  => 'error_log',
-          :value => '/path/to/error.log',
-          :match => '  error_log             /path/to/error.log;',
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_footer template content" do
-      [
-        {
-          :title => 'should contain include directives',
-          :attr  => 'include_files',
-          :value => [ '/file1', '/file2' ],
-          :match => [
-            'include /file1;',
-            'include /file2;',
-          ],
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'vhost_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ],
-        },
-        {
-          :title => 'should contain www to non-www rewrite',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => [
-            '  listen                *:80;',
-            '  server_name           www.rspec.example.com;',
-            '  rewrite               ^ http://rspec.example.com$uri permanent;',
-          ],
-        },
-        {
-          :title    => 'should not contain www to non-www rewrite',
-          :attr     => 'rewrite_www_to_non_www',
-          :value    => false,
-          :notmatch => [
-            /  listen                \*:80;/,
-            /  server_name           www\.rspec\.example\.com;/,
-            /  rewrite               \^ http:\/\/rspec\.example\.com\$uri permanent;/,
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({ param[:attr].to_sym => param[:value] }) end
-
-          it { should contain_concat__fragment("#{title}-footer") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-footer").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-footer").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_ssl_header template content" do
-      [
-        {
-          :title => 'should set the IPv4 listen IP',
-          :attr  => 'listen_ip',
-          :value => '127.0.0.1',
-          :match => '  listen       127.0.0.1:443 ssl;',
-        },
-        {
-          :title => 'should set the IPv4 SSL listen port',
-          :attr  => 'ssl_port',
-          :value => 45,
-          :match => '  listen       *:45 ssl;',
-        },
-        {
-          :title => 'should set SPDY',
-          :attr  => 'spdy',
-          :value => 'on',
-          :match => '  listen       *:443 ssl spdy;',
-        },
-        {
-          :title => 'should not set SPDY',
-          :attr  => 'spdy',
-          :value => 'off',
-          :match => '  listen       *:443 ssl;',
-        },
-        {
-          :title => 'should set the IPv4 listen options',
-          :attr  => 'listen_options',
-          :value => 'default',
-          :match => '  listen       *:443 ssl default;',
-        },
-        {
-          :title => 'should enable IPv6',
-          :attr  => 'ipv6_enable',
-          :value => true,
-          :match => '  listen [::]:443 ssl default ipv6only=on;',
-        },
-        {
-          :title    => 'should disable IPv6',
-          :attr     => 'ipv6_enable',
-          :value    => false,
-          :notmatch => /  listen \[::\]:443 ssl default ipv6only=on;/,
-        },
-        {
-          :title => 'should set the IPv6 listen IP',
-          :attr  => 'ipv6_listen_ip',
-          :value => '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-          :match => '  listen [2001:0db8:85a3:0000:0000:8a2e:0370:7334]:443 ssl default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen port',
-          :attr  => 'ssl_port',
-          :value => 45,
-          :match => '  listen [::]:45 ssl default ipv6only=on;',
-        },
-        {
-          :title => 'should set the IPv6 listen options',
-          :attr  => 'ipv6_listen_options',
-          :value => 'spdy default',
-          :match => '  listen [::]:443 ssl spdy default;',
-        },
-        {
-          :title => 'should set servername(s)',
-          :attr  => 'server_name',
-          :value => ['name1','name2'],
-          :match => '  server_name  name1 name2;',
-        },
-        {
-          :title => 'should rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => '  server_name  rspec.example.com;',
-        },
-        {
-          :title => 'should not rewrite www servername to non-www',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => false,
-          :match => '  server_name  www.rspec.example.com;',
-        },
-        {
-          :title => 'should set the SSL cache',
-          :attr  => 'ssl_cache',
-          :value => 'shared:SSL:1m',
-          :match => '  ssl_session_cache         shared:SSL:1m;',
-        },
-        {
-          :title => 'should set the SSL protocols',
-          :attr  => 'ssl_protocols',
-          :value => 'SSLv3',
-          :match => '  ssl_protocols             SSLv3;',
-        },
-        {
-          :title => 'should set the SSL ciphers',
-          :attr  => 'ssl_ciphers',
-          :value => 'HIGH',
-          :match => '  ssl_ciphers               HIGH;',
-        },
-        {
-          :title => 'should set auth_basic',
-          :attr  => 'auth_basic',
-          :value => 'value',
-          :match => '  auth_basic                "value";',
-        },
-        {
-          :title => 'should set auth_basic_user_file',
-          :attr  => 'auth_basic_user_file',
-          :value => 'value',
-          :match => '  auth_basic_user_file      "value";',
-        },
-        {
-          :title => 'should set access_log',
-          :attr  => 'access_log',
-          :value => '/path/to/access.log',
-          :match => '  access_log            /path/to/access.log;',
-        },
-        {
-          :title => 'should set error_log',
-          :attr  => 'error_log',
-          :value => '/path/to/error.log',
-          :match => '  error_log             /path/to/error.log;',
-        },
-        {
-          :title => 'should contain ordered prepend directives',
-          :attr  => 'vhost_cfg_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ]
-        },
-        {
-          :title => 'should contain ordered ssl prepend directives',
-          :attr  => 'vhost_cfg_ssl_prepend',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ]
-        },
-        {
-          :title => 'should set root',
-          :attr  => 'use_default_location',
-          :value => false,
-          :match => '  root /;',
-        },
-        {
-          :title    => 'should not set root',
-          :attr     => 'use_default_location',
-          :value    => true,
-          :notmatch => /  root \/;/,
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :ssl                => true,
-            :ssl_key            => 'dummy.key',
-            :ssl_cert           => 'dummy.crt',
-          }) end
-          it { should contain_concat__fragment("#{title}-ssl-header") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-ssl-header").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-ssl-header").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "vhost_ssl_footer template content" do
-      [
-        {
-          :title => 'should contain include directives',
-          :attr  => 'include_files',
-          :value => [ '/file1', '/file2' ],
-          :match => [
-            'include /file1;',
-            'include /file2;',
-          ],
-        },
-        {
-          :title => 'should contain ordered appended directives',
-          :attr  => 'vhost_cfg_append',
-          :value => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2;',
-          ]
-        },
-        {
-          :title => 'should contain ordered ssl appended directives',
-          :attr  => 'vhost_cfg_ssl_append',
-          :value => { 'test1' => 'test value 1', 'test2' => ['test value 2a', 'test value 2b'], 'allow' => 'test value 3' },
-          :match => [
-            '  allow test value 3;',
-            '  test1 test value 1;',
-            '  test2 test value 2a;',
-            '  test2 test value 2b;',
-          ]
-        },
-        {
-          :title => 'should contain www to non-www rewrite',
-          :attr  => 'rewrite_www_to_non_www',
-          :value => true,
-          :match => [
-            '  listen                *:443 ssl;',
-            '  server_name           www.rspec.example.com;',
-            '  rewrite               ^ https://rspec.example.com$uri permanent;',
-          ],
-        },
-        {
-          :title    => 'should not contain www to non-www rewrite',
-          :attr     => 'rewrite_www_to_non_www',
-          :value    => false,
-          :notmatch => [
-            /  listen                \*:443 ssl;/,
-            /  server_name           www\.rspec\.example\.com;/,
-            /  rewrite               \^ https:\/\/rspec\.example\.com\$uri permanent;/,
-          ],
-        },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do default_params.merge({
-            param[:attr].to_sym => param[:value],
-            :ssl                => true,
-            :ssl_key            => 'dummy.key',
-            :ssl_cert           => 'dummy.crt',
-          }) end
-
-          it { should contain_concat__fragment("#{title}-ssl-footer") }
-          it param[:title] do
-            lines = subject.resource('concat::fragment', "#{title}-ssl-footer").send(:parameters)[:content].split("\n")
-            (lines & Array(param[:match])).should == Array(param[:match])
-            Array(param[:notmatch]).each do |item|
-              should contain_concat__fragment("#{title}-ssl-footer").without_content(item)
-            end
-          end
-        end
-      end
-    end
-    context 'attribute resources' do
-      context "SSL cert missing" do
-        let(:params) {{ :ssl => true, :ssl_key => 'key' }}
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context "SSL key missing" do
-        let(:params) {{ :ssl => true, :ssl_cert => 'cert' }}
-
-        it { expect { should contain_class('nginx::resource::vhost') }.to raise_error(Puppet::Error, %r{nginx: SSL certificate/key \(ssl_cert/ssl_cert\) and/or SSL Private must be defined and exist on the target system\(s\)}) }
-      end
-
-      context 'when use_default_location => true' do
-        let :params do default_params.merge({
-          :use_default_location => true,
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default") }
-      end
-
-      context 'when use_default_location => false' do
-        let :params do default_params.merge({
-          :use_default_location => false,
-        }) end
-
-        it { should_not contain_nginx__resource__location("#{title}-default") }
-      end
-
-      context 'when location_cfg_prepend => { key => value }' do
-        let :params do default_params.merge({
-          :location_cfg_prepend => { 'key' => 'value' },
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_location_cfg_prepend({ 'key' => 'value' }) }
-      end
-
-      context 'when location_cfg_append => { key => value }' do
-        let :params do default_params.merge({
-          :location_cfg_append => { 'key' => 'value' },
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_location_cfg_append({ 'key' => 'value' }) }
-      end
-
-      context 'when fastcgi => "localhost:9000"' do
-        let :params do default_params.merge({
-          :fastcgi => 'localhost:9000',
-        }) end
-
-        it { should contain_file('/etc/nginx/fastcgi_params').with_mode('0770') }
-      end
-
-      context 'when listen_port == ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 80,
-        }) end
-
-        it { should_not contain_concat__fragment("#{title}-header") }
-        it { should_not contain_concat__fragment("#{title}-footer") }
-      end
-
-      context 'when listen_port != ssl_port' do
-        let :params do default_params.merge({
-          :listen_port => 80,
-          :ssl_port    => 443,
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header") }
-        it { should contain_concat__fragment("#{title}-footer") }
-      end
-
-      context 'when ensure => absent' do
-        let :params do default_params.merge({
-          :ensure   => 'absent',
-          :ssl      => true,
-          :ssl_key  => 'dummy.key',
-          :ssl_cert => 'dummy.cert',
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_ensure('absent') }
-        it { should contain_file("#{title}.conf symlink").with_ensure('absent') }
-      end
-
-      context 'when ssl => true and ssl_port == listen_port' do
-        let :params do default_params.merge({
-          :ssl         => true,
-          :listen_port => 80,
-          :ssl_port    => 80,
-          :ssl_key     => 'dummy.key',
-          :ssl_cert    => 'dummy.cert',
-        }) end
-
-        it { should contain_nginx__resource__location("#{title}-default").with_ssl_only(true) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content(%r{access_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.access\.log}) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content(%r{error_log[ ]+/var/log/nginx/ssl-www\.rspec\.example\.com\.error\.log}) }
-        it { should contain_concat__fragment("#{title}-ssl-footer") }
-        it { should contain_file("/etc/nginx/#{title}.crt") }
-        it { should contain_file("/etc/nginx/#{title}.key") }
-      end
-
-      context 'when passenger_cgi_param is set' do
-        let :params do default_params.merge({
-          :passenger_cgi_param => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'test3' => 'test value 3' }
-        }) end
-
-        it { should contain_concat__fragment("#{title}-header").with_content( /passenger_set_cgi_param  test1 test value 1;/ ) }
-        it { should contain_concat__fragment("#{title}-header").with_content( /passenger_set_cgi_param  test2 test value 2;/ ) }
-        it { should contain_concat__fragment("#{title}-header").with_content( /passenger_set_cgi_param  test3 test value 3;/ ) }
-      end
-
-      context 'when passenger_cgi_param is set and ssl => true' do
-        let :params do default_params.merge({
-          :passenger_cgi_param => { 'test1' => 'test value 1', 'test2' => 'test value 2', 'test3' => 'test value 3' },
-          :ssl                 => true,
-          :ssl_key             => 'dummy.key',
-          :ssl_cert            => 'dummy.cert',
-        }) end
-
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content( /passenger_set_cgi_param  test1 test value 1;/ ) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content( /passenger_set_cgi_param  test2 test value 2;/ ) }
-        it { should contain_concat__fragment("#{title}-ssl-header").with_content( /passenger_set_cgi_param  test3 test value 3;/ ) }
-      end
-
-      context 'when vhost name is sanitized' do
-        let :title do 'www rspec-vhost com' end
-        let :params do default_params end
-
-        it { should contain_concat('/etc/nginx/sites-available/www_rspec-vhost_com.conf') }
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper.rb
deleted file mode 100644
index a987b6e6caa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-RSpec.configure do |c|
-  c.default_facts = {
-    :kernel          => 'Linux',
-    :concat_basedir  => '/var/lib/puppet/concat',
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb
deleted file mode 100644
index bfb7271d0a2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-require 'rspec-system-serverspec/helpers'
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-
-    # Install modules and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'nginx')
-    shell('puppet module install puppetlabs-apt')
-    shell('puppet module install puppetlabs-stdlib')
-    shell('puppet module install puppetlabs-concat')
-
-    # Fake keys.
-    # Valid self-signed SSL key with 10 year expiry.
-    # Required for nginx to start when SSL enabled
-    shell('echo "-----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAOPchwRZRF4KmU6E
-g7C6Pq9zhdLiQt9owdcLZNiZS+UVRQjeDHSy3titzh5YwSoQonlnSqd0g/PJ6kNA
-O3CNOMVuzAddnAaHzW1J4Rt6sZwOuidtJC4t/hFCgz5NqOMgYOOfratQx00A7ZXK
-TXMgNG79lDP5L/N06Ox53sOxhy4hAgMBAAECgYEAlfktCKi0fe0d8Hb5slUzMwmn
-GCECAMeTZbXDH2jucg4ozOhRbHHaiOUEmCa0pLokJiHdGhBvVQMd5Dufo7nflZzE
-mpZY0lCZE7HSeK6Bcbru/8w3vm3iBQTGK+MCaDtH5nQU7m/3cOXaenOX0ZmsTzRs
-QE/V84S1fuO8bBPSz20CQQD9d4LxrBByosFxRdHsTb/nnqx/rzLEf4M3MC7uydPv
-fDDbSRRSYpNxonQJfU3JrOk1WPWoXY30VQCv395s57X7AkEA5iOBT+ME8/PxuUUC
-ZDjg21tAdkaiCQ5kgeVTmkD1k/gTwreOV2AexWGrrcW/MLaIhpDCpQkw37y5vrYw
-UyDdkwJAAU+j8sIUF7O10nMtAc7pJjaQ59wtJA0QzbFHHN8YZI285vV60G5IGvdf
-KElopJlrX2ZFZwiM2m2yIjbDPMb6DwJAbNoiUbzZHOInVTA0316fzGEu7kKeZZYv
-J9lmX7GV9nUCM7lKVD2ckFOQNlMwCURs8ukJh7H/MfQ8Dt5xoQAMjQJBAOWpK6k6
-b0fTREZFZRGZBJcSu959YyMzhpSFA+lXkLNTWX8j1/D88H731oMSImoQNWcYx2dH
-sCwOCDqu1nZ2LJ8=
------END PRIVATE KEY-----" > /tmp/blah.key')
-    shell('echo "-----BEGIN CERTIFICATE-----
-MIIDRjCCAq+gAwIBAgIJAL9m0V4sHW2tMA0GCSqGSIb3DQEBBQUAMIG7MQswCQYD
-VQQGEwItLTESMBAGA1UECAwJU29tZVN0YXRlMREwDwYDVQQHDAhTb21lQ2l0eTEZ
-MBcGA1UECgwQU29tZU9yZ2FuaXphdGlvbjEfMB0GA1UECwwWU29tZU9yZ2FuaXph
-dGlvbmFsVW5pdDEeMBwGA1UEAwwVbG9jYWxob3N0LmxvY2FsZG9tYWluMSkwJwYJ
-KoZIhvcNAQkBFhpyb290QGxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xMzExMzAw
-NzA3NDlaFw0yMzExMjgwNzA3NDlaMIG7MQswCQYDVQQGEwItLTESMBAGA1UECAwJ
-U29tZVN0YXRlMREwDwYDVQQHDAhTb21lQ2l0eTEZMBcGA1UECgwQU29tZU9yZ2Fu
-aXphdGlvbjEfMB0GA1UECwwWU29tZU9yZ2FuaXphdGlvbmFsVW5pdDEeMBwGA1UE
-AwwVbG9jYWxob3N0LmxvY2FsZG9tYWluMSkwJwYJKoZIhvcNAQkBFhpyb290QGxv
-Y2FsaG9zdC5sb2NhbGRvbWFpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-49yHBFlEXgqZToSDsLo+r3OF0uJC32jB1wtk2JlL5RVFCN4MdLLe2K3OHljBKhCi
-eWdKp3SD88nqQ0A7cI04xW7MB12cBofNbUnhG3qxnA66J20kLi3+EUKDPk2o4yBg
-45+tq1DHTQDtlcpNcyA0bv2UM/kv83To7Hnew7GHLiECAwEAAaNQME4wHQYDVR0O
-BBYEFP5Kkot/7pStLaYPtT+vngE0v6N8MB8GA1UdIwQYMBaAFP5Kkot/7pStLaYP
-tT+vngE0v6N8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAwYYQKVRN
-HaHIWGMBuXApE7t4PNdYWZ5Y56tI+HT59yVoDjc1YSnuzkKlWUPibVYoLpX/ROKr
-aIZ8kxsBjLvpi9KQTHi7Wl6Sw3ecoYdKy+2P8S5xOIpWjs8XVmOWf7Tq1+9KPv3z
-HLw/FDCzntkdq3G4em15CdFlO9BTY4HXiHU=
------END CERTIFICATE-----" > /tmp/blah.cert')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb
deleted file mode 100644
index 775c8b65435..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/basic_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'spec_helper_system'
-
-# Here we put the more basic fundamental tests, ultra obvious stuff.
-describe "basic tests:" do
-  context 'make sure we have copied the module across' do
-    # No point diagnosing any more if the module wasn't copied properly
-    context shell 'ls /etc/puppet/modules/nginx' do
-      its(:stdout) { should =~ /Modulefile/ }
-      its(:stderr) { should be_empty }
-      its(:exit_code) { should be_zero }
-    end
-  end
-
-  #puppet smoke test
-  context puppet_apply 'notice("foo")' do
-    its(:stdout) { should =~ /foo/ }
-    its(:stderr) { should be_empty }
-    its(:exit_code) { should be_zero }
-  end
-
-  it 'nginx class should work with no errors' do
-    pp = <<-EOS
-      class { 'nginx': }
-    EOS
-
-    # Run it twice and test for idempotency
-    puppet_apply(pp) do |r|
-      [0,2].should include(r.exit_code)
-      r.refresh
-      r.exit_code.should be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/class_spec.rb
deleted file mode 100644
index d8eff7c418d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/class_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx class:" do
-  case node.facts['osfamily']
-  when 'RedHat'
-    package_name = 'nginx'
-  when 'Debian'
-    package_name = 'nginx'
-  when 'Suse'
-    package_name = 'nginx-0.8'
-  end
-
-  context 'should run successfully' do
-    it 'should run successfully' do
-      pp = "class { 'nginx': }"
-
-      puppet_apply(pp) do |r|
-        #r.stderr.should be_empty
-        [0,2].should include r.exit_code
-        r.refresh
-        #r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  describe package(package_name) do
-    it { should be_installed }
-  end
-
-  describe service('nginx') do
-    it { should be_running }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb
deleted file mode 100644
index e8cce6cf1c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_mail_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx::resource::mailhost define:" do
-  it 'should run successfully' do
-
-    pp = "
-    class { 'nginx':
-      mail => true,
-    }
-    nginx::resource::vhost { 'www.puppetlabs.com':
-      ensure   => present,
-      www_root => '/var/www/www.puppetlabs.com',
-    }
-    nginx::resource::mailhost { 'domain1.example':
-      ensure      => present,
-      auth_http   => 'localhost/cgi-bin/auth',
-      protocol    => 'smtp',
-      listen_port => 587,
-      ssl_port    => 465,
-      xclient     => 'off',
-    }
-    "
-
-    puppet_apply(pp) do |r|
-      [0,2].should include r.exit_code
-      r.refresh
-      # Not until deprecated variables fixed.
-      #r.stderr.should be_empty
-      r.exit_code.should be_zero
-    end
-  end
-
-  describe file('/etc/nginx/conf.mail.d/domain1.example.conf') do
-   it { should be_file }
-   it { should contain "auth_http             localhost/cgi-bin/auth;" }
-  end
-
-  describe file('/etc/nginx/sites-available/www.puppetlabs.com.conf') do
-    it { should be_file }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb
deleted file mode 100644
index 09b18856553..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_proxy_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx::resource::upstream define:" do
-  it 'should run successfully' do
-
-    pp = "
-    class { 'nginx': }
-    nginx::resource::upstream { 'puppet_rack_app':
-      ensure  => present,
-      members => [
-        'localhost:3000',
-        'localhost:3001',
-        'localhost:3002',
-      ],
-    }
-    nginx::resource::vhost { 'rack.puppetlabs.com':
-      ensure => present,
-      proxy  => 'http://puppet_rack_app',
-    }
-    "
-
-    puppet_apply(pp) do |r|
-      [0,2].should include r.exit_code
-      r.refresh
-      r.stderr.should be_empty
-      r.exit_code.should be_zero
-    end
-  end
-
-  describe file('/etc/nginx/conf.d/puppet_rack_app-upstream.conf') do
-   it { should be_file }
-   it { should contain "server     localhost:3000" }
-   it { should contain "server     localhost:3001" }
-   it { should contain "server     localhost:3002" }
-   it { should_not contain "server     localhost:3003" }
-  end
-
-  describe file('/etc/nginx/sites-available/rack.puppetlabs.com.conf') do
-    it { should be_file }
-    it { should contain "proxy_pass          http://puppet_rack_app;" }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb
deleted file mode 100644
index d4f34467691..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/spec/system/nginx_vhost_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'spec_helper_system'
-
-describe "nginx::resource::vhost define:" do
-  context 'new vhost on port 80' do
-    it 'should configure a nginx vhost' do
-
-      pp = "
-      class { 'nginx': }
-      nginx::resource::vhost { 'www.puppetlabs.com':
-        ensure   => present,
-        www_root => '/var/www/www.puppetlabs.com',
-      }
-      host { 'www.puppetlabs.com': ip => '127.0.0.1', }
-      file { ['/var/www','/var/www/www.puppetlabs.com']: ensure => directory }
-      file { '/var/www/www.puppetlabs.com/index.html': ensure  => file, content => 'Hello from www\n', }
-      "
-
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe file('/etc/nginx/sites-available/www.puppetlabs.com.conf') do
-      it { should be_file }
-      it { should contain "www.puppetlabs.com" }
-    end
-
-    describe file('/etc/nginx/sites-enabled/www.puppetlabs.com.conf') do
-      it { should be_linked_to '/etc/nginx/sites-available/www.puppetlabs.com.conf' }
-    end
-
-    describe service('nginx') do
-      it { should be_running }
-    end
-
-    it 'should answer to www.puppetlabs.com' do
-      shell("/usr/bin/curl http://www.puppetlabs.com:80") do |r|
-        r.stdout.should == "Hello from www\n"
-        r.exit_code.should be_zero
-      end
-    end
-  end
-
-  context 'should run successfully with ssl' do
-    it 'should configure a nginx SSL vhost' do
-
-      pp = "
-      class { 'nginx': }
-      nginx::resource::vhost { 'www.puppetlabs.com':
-        ensure   => present,
-        ssl      => true,
-        ssl_cert => '/tmp/blah.cert',
-        ssl_key  => '/tmp/blah.key',
-        www_root => '/var/www/www.puppetlabs.com',
-      }
-      host { 'www.puppetlabs.com': ip => '127.0.0.1', }
-      file { ['/var/www','/var/www/www.puppetlabs.com']: ensure => directory }
-      file { '/var/www/www.puppetlabs.com/index.html': ensure  => file, content => 'Hello from www\n', }
-      "
-
-      puppet_apply(pp) do |r|
-        [0,2].should include r.exit_code
-        r.refresh
-        r.stderr.should be_empty
-        r.exit_code.should be_zero
-      end
-    end
-
-    describe file('/etc/nginx/sites-available/www.puppetlabs.com.conf') do
-      it { should be_file }
-      it { should contain "ssl on;" }
-    end
-
-    describe file('/etc/nginx/sites-enabled/www.puppetlabs.com.conf') do
-      it { should be_linked_to '/etc/nginx/sites-available/www.puppetlabs.com.conf' }
-    end
-
-    describe service('nginx') do
-      it { should be_running }
-    end
-
-    it 'should answer to http://www.puppetlabs.com' do
-      shell("/usr/bin/curl http://www.puppetlabs.com:80") do |r|
-        r.stdout.should == "Hello from www\n"
-        r.exit_code.should == 0
-      end
-    end
-
-    it 'should answer to https://www.puppetlabs.com' do
-      # use --insecure because it's a self-signed cert
-      shell("/usr/bin/curl --insecure https://www.puppetlabs.com:443") do |r|
-        r.stdout.should == "Hello from www\n"
-        r.exit_code.should == 0
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb
deleted file mode 100644
index 62e49e2a31d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/nginx.conf.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-user <%= scope.lookupvar('nginx::config::nx_daemon_user') %>;
-worker_processes <%= @worker_processes %>;
-worker_rlimit_nofile <%= @worker_rlimit_nofile %>;
-
-error_log  <%= @nginx_error_log %>;
-pid        <%= scope.lookupvar('nginx::params::nx_pid')%>;
-
-events {
-  worker_connections <%= @worker_connections -%>;
-<% if scope.lookupvar('nginx::params::nx_multi_accept') == 'on' %>multi_accept on;<% end -%>
-<% if scope.lookupvar('nginx::params::nx_events_use') %>use <%= scope.lookupvar('nginx::params::nx_events_use')%>;<% end -%>
-}
-
-http {
-  include       <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/mime.types;
-  default_type  application/octet-stream;
-
-  access_log  <%= @http_access_log %>;
-
-  sendfile    <%= scope.lookupvar('nginx::params::nx_sendfile')%>;
-
-  server_tokens <%= @server_tokens %>;
-
-  types_hash_max_size <%= scope.lookupvar('nginx::params::nx_types_hash_max_size')%>;
-  types_hash_bucket_size <%= scope.lookupvar('nginx::params::nx_types_hash_bucket_size')%>;
-
-  server_names_hash_bucket_size <%= @names_hash_bucket_size %>;
-  server_names_hash_max_size <%= @names_hash_max_size %>;
-
-  keepalive_timeout  <%= scope.lookupvar('nginx::params::nx_keepalive_timeout')%>;
-  tcp_nodelay        <%= scope.lookupvar('nginx::params::nx_tcp_nodelay')%>;
-
-<% if @gzip == 'on' %>
-  gzip         on;
-  gzip_disable "MSIE [1-6]\.(?!.*SV1)";
-<% end -%>
-
-<% if @proxy_cache_path -%>
-  proxy_cache_path    <%= @proxy_cache_path %> levels=<%= @proxy_cache_levels %> keys_zone=<%= @proxy_cache_keys_zone %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive %>;
-<% end -%>
-
-<% if @http_cfg_append -%><% @http_cfg_append.sort_by{|k,v| k}.each do |key,value| -%>
-  <%= key %> <%= value %>;
-<% end -%>
-<% end -%>
-
-  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/conf.d/*.conf;
-  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/sites-enabled/*;
-
-}
-<% if scope.lookupvar('nginx::mail') %>
-mail {
-  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/conf.mail.d/*.conf;
-}
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb
deleted file mode 100644
index fcd7e1d5b92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/proxy.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-proxy_redirect          <%= scope.lookupvar('nginx::params::nx_proxy_redirect') %>;
-client_max_body_size      <%= @client_max_body_size %>;
-client_body_buffer_size <%= scope.lookupvar('nginx::params::nx_client_body_buffer_size') %>;
-proxy_connect_timeout   <%= scope.lookupvar('nginx::params::nx_proxy_connect_timeout') %>;
-proxy_send_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_send_timeout') %>;
-proxy_read_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_read_timeout') %>;
-proxy_buffers           <%= @proxy_buffers %>;
-proxy_buffer_size       <%= @proxy_buffer_size %>;
-proxy_http_version      <%= @proxy_http_version %>;
-<% @proxy_set_header.each do |header| %>
-proxy_set_header        <%= header %>;<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb
deleted file mode 100644
index a96121ab228..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/conf.d/upstream.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream <%= @name %> {
-<% if @upstream_cfg_prepend -%><% @upstream_cfg_prepend.sort_by{|k,v| k}.each do |key,value| %>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  <% @members.each do |i| %>
-  server     <%= i %>  fail_timeout=<%= @upstream_fail_timeout %>;<% end %>
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb
deleted file mode 100644
index a6bab3f93be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-server {
-  listen                <%= @listen_ip %>:<%= @listen_port %><% if @listen_options %> <%= @listen_options %><% end %>;
-  <% # check to see if ipv6 support exists in the kernel before applying %>
-  <% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %>;
-  <% end %>
-  server_name           <%= @server_name.join(" ") %>;
-  protocol              <%= @protocol %>;
-  xclient               <%= @xclient %>;
-  auth_http             <%= @auth_http %>;
-  starttls              <%= @starttls %>;
-  <% if @starttls == 'on' || @starttls == 'only' %>
-  ssl_certificate      <%= @ssl_cert %>;
-  ssl_certificate_key  <%= @ssl_key %>;
-
-  ssl_session_timeout  5m;
-
-  ssl_protocols  SSLv3 TLSv1;
-  ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
-  ssl_prefer_server_ciphers   on;
-  <%- end -%>
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb
deleted file mode 100644
index 98d193f8f5f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/mailhost/mailhost_ssl.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-server {
-  listen       <%= @ssl_port %>;
-  <% # check to see if ipv6 support exists in the kernel before applying %>
-  <% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %>;
-  <% end %>
-  server_name           <%= @server_name.join(" ") %>;
-  protocol              <%= @protocol %>;
-  xclient               <%= @xclient %>;
-  auth_http             <%= @auth_http %>;
-
-  ssl on;
-  ssl_certificate      <%= @ssl_cert %>;
-  ssl_certificate_key  <%= @ssl_key %>;
-
-  ssl_session_timeout  5m;
-
-  ssl_protocols  SSLv3 TLSv1;
-  ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
-  ssl_prefer_server_ciphers   on;
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb
deleted file mode 100644
index fe8bc20f0dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/fastcgi_params.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file managed by puppet on host <%= @fqdn %>
-
-fastcgi_param	QUERY_STRING		  $query_string;
-fastcgi_param	REQUEST_METHOD	  $request_method;
-fastcgi_param	CONTENT_TYPE		  $content_type;
-fastcgi_param	CONTENT_LENGTH	  $content_length;
-
-fastcgi_param	SCRIPT_FILENAME	  $request_filename;
-fastcgi_param	SCRIPT_NAME		    $fastcgi_script_name;
-fastcgi_param	REQUEST_URI		    $request_uri;
-fastcgi_param	DOCUMENT_URI		  $document_uri;
-fastcgi_param	DOCUMENT_ROOT		  $document_root;
-fastcgi_param	SERVER_PROTOCOL	  $server_protocol;
-
-fastcgi_param	GATEWAY_INTERFACE	CGI/1.1;
-fastcgi_param	SERVER_SOFTWARE		nginx/$nginx_version;
-
-fastcgi_param	REMOTE_ADDR		    $remote_addr;
-fastcgi_param	REMOTE_PORT		    $remote_port;
-fastcgi_param	SERVER_ADDR		    $server_addr;
-fastcgi_param	SERVER_PORT		    $server_port;
-fastcgi_param	SERVER_NAME		    $server_name;
-
-fastcgi_param	HTTPS			        $https;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param	REDIRECT_STATUS		200;
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb
deleted file mode 100644
index b4a4d7eb64d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_footer.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% if @include_files %><% @include_files.each do |file| -%>
-include <%= file %>;
-<% end -%><% end -%>
-<%# make sure that allow comes before deny by forcing the allow key (if it -%>
-<%# exists) to be first in the output order.  The hash keys also need to be -%>
-<%# sorted so that the ordering is stable. -%>
-<% if @vhost_cfg_append -%><% @vhost_cfg_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-}
-<% if @rewrite_www_to_non_www -%>
-server {
-  listen                <%= @listen_ip %>:<%= @listen_port %>;
-  server_name           www.<%= @name.gsub(/^www\./, '') %>;
-  rewrite               ^ http://<%= @name.gsub(/^www\./, '') %>$uri permanent;
-}
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb
deleted file mode 100644
index 8fd7615aef8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_header.erb
+++ /dev/null
@@ -1,54 +0,0 @@
-server {
-  listen                <%= @listen_ip %>:<%= @listen_port %><% if @listen_options %> <%= @listen_options %><% end %>;
-<% # check to see if ipv6 support exists in the kernel before applying %>
-<% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %>;
-<% end %>
-  server_name           <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
-<% if defined? @auth_basic -%>
-  auth_basic           "<%= @auth_basic %>";
-<% end -%>
-<% if defined? @auth_basic_user_file -%>
-  auth_basic_user_file <%= @auth_basic_user_file %>;
-<% end -%>
-<% if defined? @client_max_body_size -%>
-  client_max_body_size <%= @client_max_body_size %>;
-<% end -%>
-<%# make sure that allow comes before deny by forcing the allow key (if it -%>
-<%# exists) to be first in the output order.  The hash keys also need to be -%>
-<%# sorted so that the ordering is stable. -%>
-<% if @vhost_cfg_prepend -%><% @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @root -%>
-  root <%= @root %>;
-<% end -%>
-<% if @passenger_cgi_param -%><% @passenger_cgi_param.keys.sort.each do |key| -%>
-  passenger_set_cgi_param  <%= key %> <%= @passenger_cgi_param[key] %>;
-<% end -%><% end -%>
-<% @proxy_set_header.each do |header| -%>
-  proxy_set_header        <%= header %>;
-<% end -%>
-<% if @add_header -%><% @add_header.each do |key,value| -%>
-  add_header              <%= key %> <%= value %>;
-<% end -%><% end -%>
-<% if @rewrite_to_https -%>
-  if ($ssl_protocol = "") {
-       return 301 https://$host$request_uri;
-  }
-<% end -%>
-<% if @index_files.count > 0 -%>
-    index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
-<% end -%>
-
-  access_log            <%= @access_log_real %>;
-  error_log             <%= @error_log_real %>;
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb
deleted file mode 100644
index ccd47f8df5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_alias.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-  location <%= @location %> {
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-    alias      <%= @location_alias %>;
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb
deleted file mode 100644
index c5f6f01af31..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_directory.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-  location <%= @location %> {
-<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
-    allow <%= allow_rule %>;
-<% end -%><% end -%>
-<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
-    deny <%= deny_rule %>;
-<% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |value| -%>
-    <%= value %>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if defined? @www_root -%>
-    root  <%= @www_root %>;
-<% end -%>
-<% if @try_files -%>
-    try_files<% @try_files.each do |try| -%> <%= try %><% end -%>;
-<% end -%>
-<% if defined? @autoindex -%>
-     autoindex <%= @autoindex %>;
-<% end -%>
-<% if @index_files.count > 0 -%>
-    index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
-<% end -%>
-<% @rewrite_rules.each do |rewrite_rule| -%>
-    rewrite <%= rewrite_rule %>;
-<% end -%>
-<% if defined? @auth_basic -%>
-    auth_basic           "<%= @auth_basic %>";
-<% end -%>
-<% if defined? @auth_basic_user_file -%>
-    auth_basic_user_file <%= @auth_basic_user_file %>;
-<% end -%>
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb
deleted file mode 100644
index 10f0d3c6cf0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_empty.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-  location <%= @location %> {
-<% if @location_custom_cfg -%><% @location_custom_cfg.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb
deleted file mode 100644
index 015e1d7d586..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_fastcgi.erb
+++ /dev/null
@@ -1,66 +0,0 @@
-  location <%= @location %> {
-<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
-    allow <%= allow_rule %>;
-<% end -%><% end -%>
-<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
-    deny <%= deny_rule %>;
-<% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if defined? @www_root -%>
-    root  <%= @www_root %>;
-<% end -%>
-<% if @fastcgi_split_path -%>
-    fastcgi_split_path_info <%= @fastcgi_split_path %>;
-<% end -%>
-<% if @try_files -%>
-    try_files<% @try_files.each do |try| -%> <%= try %><% end -%>;
-<% end -%>
-    include <%= @fastcgi_params %>;
-    fastcgi_pass <%= @fastcgi %>;
-<% if defined? @fastcgi_script %>
-    fastcgi_param SCRIPT_FILENAME <%= @fastcgi_script %>;
-<% end -%>
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb
deleted file mode 100644
index 6b8acc2dbd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_proxy.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-  location <%= @location %> {
-<% if @location_allow -%><% @location_allow.each do |allow_rule| -%>
-    allow <%= allow_rule %>;
-<% end -%><% end -%>
-<% if @location_deny -%><% @location_deny.each do |deny_rule| -%>
-    deny <%= deny_rule %>;
-<% end -%><% end -%>
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%=subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @proxy_cache -%>
-    proxy_cache         <%= @proxy_cache %>;
-    proxy_cache_valid   <%= @proxy_cache_valid %>;
-<% end -%>
-    proxy_pass          <%= @proxy %>;
-    proxy_read_timeout  <%= @proxy_read_timeout %>;
-<% if @proxy_method -%>
-    proxy_method        <%= @proxy_method %>;
-<% end -%>
-<% if @proxy_set_body -%>
-    proxy_set_body      <%= @proxy_set_body %>;
-<% end -%>
-<% @rewrite_rules.each do |rewrite_rule| -%>
-    rewrite <%= rewrite_rule %>;
-<% end -%>
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb
deleted file mode 100644
index c560933e88d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_location_stub_status.erb
+++ /dev/null
@@ -1,47 +0,0 @@
-  location <%= @location %> {
-<% if @location_custom_cfg_prepend -%><% @location_custom_cfg_prepend.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-    stub_status on;
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @location_custom_cfg_append -%><% @location_custom_cfg_append.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-    <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-    <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-  }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb
deleted file mode 100644
index 86419a232cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_footer.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-<% if @include_files %><% @include_files.each do |file| -%>
-include <%= file %>;
-<% end -%><% end -%>
-<% if @vhost_cfg_append -%><% @vhost_cfg_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @vhost_cfg_ssl_append -%><% @vhost_cfg_ssl_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-}
-<% if @rewrite_www_to_non_www -%>
-server {
-  listen                <%= @listen_ip %>:<%= @ssl_port %> ssl;
-  server_name           www.<%= @name.gsub(/^www\./, '') %>;
-  rewrite               ^ https://<%= @name.gsub(/^www\./, '') %>$uri permanent;
-}
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb
deleted file mode 100644
index e165b712342..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/templates/vhost/vhost_ssl_header.erb
+++ /dev/null
@@ -1,84 +0,0 @@
-server {
-  listen       <%= @listen_ip %>:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @listen_options %> <%= @listen_options %><% end %>;
-  <% if @ipv6_enable && (defined? @ipaddress6) %>
-  listen [<%= @ipv6_listen_ip %>]:<%= @ssl_port %> ssl<% if @spdy == 'on' %> spdy<% end %><% if @ipv6_listen_options %> <%= @ipv6_listen_options %><% end %>;
-  <% end %>
-  server_name  <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
-
-  ssl on;
-
-  ssl_certificate           <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.crt;
-  ssl_certificate_key       <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.key;
-<% if defined? @ssl_dhparam -%>
-  ssl_dhparam               <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.dh.pem;
-<% end -%>
-  ssl_session_cache         <%= @ssl_cache %>;
-  ssl_session_timeout       5m;
-  ssl_protocols             <%= @ssl_protocols %>;
-  ssl_ciphers               <%= @ssl_ciphers %>;
-  ssl_prefer_server_ciphers on;
-<% if @ssl_stapling -%>
-  ssl_stapling              on;
-<% end -%>
-<% if defined? @ssl_stapling_file -%>
-  ssl_stapling_file         <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.ocsp.resp;
-<% end -%>
-<% if defined? @ssl_stapling_responder -%>
-  ssl_stapling_responder    <%= @ssl_stapling_responder %>;
-<% end -%>
-<% if @ssl_stapling_verify -%>
-  ssl_stapling_verify       on;
-<% end -%>
-<% if defined? @ssl_trusted_cert -%>
-  ssl_trusted_certificate   <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.trusted.crt;
-<% end -%>
-<% if defined? @resolver -%>
-  resolver                  <%= @resolver %>;
-<% end -%>
-<% if defined? @auth_basic -%>
-  auth_basic                "<%= @auth_basic %>";
-<% end -%>
-<% if defined? @auth_basic_user_file -%>
-  auth_basic_user_file      "<%= @auth_basic_user_file %>";
-<% end -%>
-<% if @index_files.count > 0 -%>
-    index <% Array(@index_files).each do |i| %> <%= i %><% end %>;
-<% end -%>
-
-  access_log            <%= @ssl_access_log %>;
-  error_log             <%= @ssl_error_log %>;
-  
-<% if @vhost_cfg_prepend -%><% @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @vhost_cfg_ssl_prepend -%><% @vhost_cfg_ssl_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
-<% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>
-<% Array(subvalue).each do |asubvalue| -%>
-  <%= key %> <%= subkey %> <%= asubvalue %>;
-<% end -%>
-<% end -%><% else -%>
-<% Array(value).each do |asubvalue| -%>
-  <%= key %> <%= asubvalue %>;
-<% end -%>
-<% end -%>
-<% end -%><% end -%>
-<% if @root -%>
-  root <%= @root %>;
-<% end -%>
-<% if @passenger_cgi_param -%><% @passenger_cgi_param.each do |key,value| -%>
-  passenger_set_cgi_param  <%= key %> <%= value %>;
-<% end -%><% end -%>
-<% @proxy_set_header.each do |header| -%>
-  proxy_set_header        <%= header %>;
-<% end -%>
-<% if @add_header -%><% @add_header.each do |key,value| -%>
-  add_header              <%= key %> <%= value %>;
-<% end -%><% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/init.pp
deleted file mode 100644
index 41cc19dec38..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/init.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# The notify before should always come BEFORE all resources
-# managed by the nginx class
-# and the notify last should always come AFTER all resources
-# managed by the nginx class.
-node default {
-  notify { 'before': }
-  -> class { 'nginx': }
-  -> notify { 'last': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/location_alias.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/location_alias.pp
deleted file mode 100644
index ac774bafe92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/location_alias.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-include nginx
-
-nginx::resource::location { 'www.test.com-alias':
-    ensure         => present,
-    location       => '/some/url',
-    location_alias => '/new/url/',
-    vhost          => 'www.test.com',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/upstream.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/upstream.pp
deleted file mode 100644
index 8cc323b1cb2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/upstream.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-include nginx
-
-nginx::resource::upstream { 'proxypass':
-  ensure  => present,
-  members => [
-        'localhost:3000',
-        'localhost:3001',
-        'localhost:3002',
-  ],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost.pp
deleted file mode 100644
index cce5657d40a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-include nginx
-
-nginx::resource::vhost { 'test.local test':
-  ensure       => present,
-  ipv6_enable  => true,
-  proxy        => 'http://proxypass',
-}
-
-nginx::resource::vhost { 'test.local:8080':
-  ensure       => present,
-  listen_port  => 8080,
-  server_name  => ['test.local test'],
-  ipv6_enable  => true,
-  proxy        => 'http://proxypass',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp
deleted file mode 100644
index f11c967732b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/nginx/tests/vhost_ssl.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-include nginx
-
-nginx::resource::vhost { 'test2.local test2':
-  ensure   => present,
-  www_root => '/var/www/nginx-default',
-  ssl      => true,
-  ssl_cert => 'puppet:///modules/sslkey/whildcard_mydomain.crt',
-  ssl_key  => 'puppet:///modules/sslkey/whildcard_mydomain.key' 
-}
-
-nginx::resource::location { 'test2.local-bob':
-  ensure   => present,
-  www_root => '/var/www/bob',
-  location => '/bob',
-  vhost    => 'test2.local test2',
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.fixtures.yml
deleted file mode 100644
index a4b980143e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-  symlinks:
-    "ntp": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.nodeset.yml
deleted file mode 100644
index cbd0d57b83d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.nodeset.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
-  'sles-11sp1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'sles-11sp1-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.travis.yml
deleted file mode 100644
index fe5850a5d96..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-branches:
-  only:
-  - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.0.0"
-    - PUPPET_GEM_VERSION="~> 3.1.0"
-    - PUPPET_GEM_VERSION="~> 3.2.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 3.2.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CHANGELOG.md
deleted file mode 100644
index cfcac4292e0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CHANGELOG.md
+++ /dev/null
@@ -1,152 +0,0 @@
-##2014-04-09 - Supported Release 3.0.4
-###Summary
-This is a supported release.
-
-The only functional change in this release is to split up the restrict
-defaults to be per operating system so that we can provide safer defaults
-for AIX, to resolve cases where IPv6 are disabled.
-
-####Features
-- Rework restrict defaults.
-
-####Bugfixes
-- Fix up a comment.
-- Fix a test to work better on PE.
-
-#####Known Bugs
-* No known bugs
-
-##2014-03-04 - Supported Release 3.0.3
-###Summary
-This is a supported release. Correct stdlib compatibility
-
-####Bugfixes
-- Remove `dirname()` call for correct stdlib compatibility.
-- Improved tests
-
-####Known Bugs
-* No known bugs
-
-
-## 2014-02-13 - Release 3.0.2
-###Summary
-
-No functional changes: Update the README and allow custom gem sources.
-
-## 2013-12-17 - Release 3.0.1
-### Summary
-
-Work around a packaging bug with symlinks, no other functional changes.
-
-## 2013-12-13 - Release 3.0.0
-### Summary
-
-Final release of 3.0, enjoy!
-
-
-## 2013-10-14 - Version 3.0.0-rc1
-
-###Summary
-
-This release changes the behavior of restrict and adds AIX osfamily support.
-
-####Backwards-incompatible Changes:
-
-`restrict` no longer requires you to pass in parameters as:
-
-restrict => [ 'restrict x', 'restrict y' ]
-
-but just as:
-
-restrict => [ 'x', 'y' ]
-
-As the template now prefixes each line with restrict.
-
-####Features
-- Change the behavior of `restrict` so you no longer need the restrict
-keyword.
-- Add `udlc` parameter to enable undisciplined local clock regardless of the
-machines status as a virtual machine.
-- Add AIX support.
-
-####Fixes
-- Use class{} instead of including and then anchoring. (style)
-- Extend Gentoo coverage to Facter 1.7.
-
----
-##2013-09-05 - Version 2.0.1
-
-###Summary
-
-Correct the LICENSE file.
-
-####Bugfixes
-- Add in the appropriate year and name in LICENSE.
-
-
-##2013-07-31 - Version 2.0.0
-
-###Summary
-
-The 2.0 release focuses on merging all the distro specific
-templates into a single reusable template across all platforms.
-
-To aid in that goal we now allow you to change the driftfile,
-ntp keys, and perferred_servers.
-
-####Backwards-incompatible changes
-
-As all the distro specific templates have been removed and a
-unified one created you may be missing functionality you
-previously relied on.  Please test carefully before rolling
-out globally.
-
-Configuration directives that might possibly be affected:
-- `filegen`
-- `fudge` (for virtual machines)
-- `keys`
-- `logfile`
-- `restrict`
-- `restrictkey`
-- `statistics`
-- `trustedkey`
-
-####Features:
-- All templates merged into a single template.
-- NTP Keys support added.
-- Add preferred servers support.
-- Parameters in `ntp` class:
-  - `driftfile`: path for the ntp driftfile.
-  - `keys_enable`: Enable NTP keys feature.
-  - `keys_file`: Path for the NTP keys file.
-  - `keys_trusted`: Which keys to trust.
-  - `keys_controlkey`: Which key to use for the control key.
-  - `keys_requestkey`: Which key to use for the request key.
-  - `preferred_servers`: Array of servers to prefer.
-  - `restrict`: Array of restriction options to apply.
-
----
-###2013-07-15 - Version 1.0.1
-####Bugfixes
-- Fix deprecated warning in `autoupdate` parameter.
-- Correctly quote is_virtual fact.
-
-
-##2013-07-08 - Version 1.0.0
-####Features
-- Completely refactored to split across several classes.
-- rspec-puppet tests rewritten to cover more options.
-- rspec-system tests added.
-- ArchLinux handled via osfamily instead of special casing.
-- parameters in `ntp` class:
-  - `autoupdate`: deprecated in favor of directly setting package_ensure.
-  - `panic`: set to false if you wish to allow large clock skews. 
-
----
-##2011-11-10 Dan Bode <dan@puppetlabs.com> - 0.0.4
-* Add Amazon Linux as a supported platform
-* Add unit tests
-
-
-##2011-06-16 Jeff McCune <jeff@puppetlabs.com> - 0.0.3
-* Initial release under puppetlabs
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CONTRIBUTING.md
deleted file mode 100644
index a2b1d77bc8e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/CONTRIBUTING.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions
-are essential for keeping them great. We can’t access the huge number of platforms and
-myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work
-in your environment. There are a few guidelines that we need contributors to follow so
-that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Gemfile
deleted file mode 100644
index 7f86b2d6bdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Gemfile
+++ /dev/null
@@ -1,19 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'specinfra', '>=0.7.0'
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/LICENSE
deleted file mode 100644
index bc1c718de57..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [2013] [Puppet Labs]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Modulefile
deleted file mode 100644
index fc436324af8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name    'puppetlabs-ntp'
-version '3.0.4'
-source 'git://github.com/puppetlabs/puppetlabs-ntp'
-author 'Puppet Labs'
-license 'Apache Version 2.0'
-summary 'NTP Module'
-description 'NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo.'
-project_page 'http://github.com/puppetlabs/puppetlabs-ntp'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 0.1.6'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/README.markdown
deleted file mode 100644
index e25e3c43ba8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/README.markdown
+++ /dev/null
@@ -1,227 +0,0 @@
-#ntp
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with ntp](#setup)
-    * [What ntp affects](#what-ntp-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with ntp](#beginning-with-ntp)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-The ntp module installs, configures, and manages the NTP service.
-
-##Module Description
-
-The ntp module handles installing, configuring, and running NTP across a range of operating systems and distributions.
-
-##Setup
-
-###What ntp affects
-
-* ntp package.
-* ntp configuration file.
-* ntp service.
-
-###Beginning with ntp
-
-`include '::ntp'` is enough to get you up and running.  If you wish to pass in
-parameters specifying which servers to use, then:
-
-```puppet
-class { '::ntp':
-  servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-}
-```
-
-##Usage
-
-All interaction with the ntp module can do be done through the main ntp class.
-This means you can simply toggle the options in `::ntp` to have full functionality of the module.
-
-###I just want NTP, what's the minimum I need?
-
-```puppet
-include '::ntp'
-```
-
-###I just want to tweak the servers, nothing else.
-
-```puppet
-class { '::ntp':
-  servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-}
-```
-
-###I'd like to make sure I restrict who can connect as well.
-
-```puppet
-class { '::ntp':
-  servers  => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-  restrict => ['127.0.0.1'],
-}
-```
-
-###I'd like to opt out of having the service controlled; we use another tool for that.
-
-```puppet
-class { '::ntp':
-  servers        => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-  restrict       => ['127.0.0.1'],
-  manage_service => false,
-}
-```
-
-###Looks great!  But I'd like a different template; we need to do something unique here.
-
-```puppet
-class { '::ntp':
-  servers         => [ 'ntp1.corp.com', 'ntp2.corp.com' ],
-  restrict        => ['127.0.0.1'],
-  manage_service  => false,
-  config_template => 'different/module/custom.template.erb',
-}
-```
-
-##Reference
-
-###Classes
-
-####Public Classes
-
-* ntp: Main class, includes all other classes.
-
-####Private Classes
-
-* ntp::install: Handles the packages.
-* ntp::config: Handles the configuration file.
-* ntp::service: Handles the service.
-
-###Parameters
-
-The following parameters are available in the ntp module:
-
-####`autoupdate`
-
-**Deprecated:** This parameter determined whether the ntp module should be
-automatically updated to the latest version available.  Replaced by `package_ensure`.
-
-####`config`
-
-Sets the file that ntp configuration is written into.
-
-####`config_template`
-
-Determines which template Puppet should use for the ntp configuration.
-
-####`driftfile`
-
-Sets the location of the drift file for ntp.
-
-####`keys_controlkey`
-
-The key to use as the control key.
-
-####`keys_enable`
-
-Whether the ntp keys functionality is enabled.
-
-####`keys_file`
-
-Location of the keys file.
-
-####`keys_requestkey`
-
-Which of the keys is the request key.
-
-#### `keys_trusted`
-
-Array of trusted keys.
-
-####`package_ensure`
-
-Sets the ntp package to be installed. Can be set to 'present', 'latest', or a specific version. 
-
-####`package_name`
-
-Determines the name of the package to install.
-
-####`panic`
-
-Determines if ntp should 'panic' in the event of a very large clock skew.
-This defaults to false for virtual machines, as they don't do a great job with keeping time.
-
-####`preferred_servers`
-
-List of ntp servers to prefer.  Will append 'prefer' for any server in this list
-that also appears in the servers list.
-
-####`restrict`
-
-Sets the restrict options in the ntp configuration.  The lines are
-prefixed with 'restrict', so you just need to list the rest of the restriction.
-
-####`servers`
-
-Selects the servers to use for ntp peers.
-
-####`service_enable`
-
-Determines if the service should be enabled at boot.
-
-####`service_ensure`
-
-Determines if the service should be running or not.
-
-####`service_manage`
-
-Selects whether Puppet should manage the service.
-
-####`service_name`
-
-Selects the name of the ntp service for Puppet to manage.
-
-####`udlc`
-
-Enables configs for undisciplined local clock, regardless of
-status as a virtual machine. 
-
-
-##Limitations
-
-This module has been built on and tested against Puppet 2.7 and higher.
-
-The module has been tested on:
-
-* RedHat Enterprise Linux 5/6
-* Debian 6/7
-* CentOS 5/6
-* Ubuntu 12.04
-* Gentoo
-* Arch Linux
-* FreeBSD
-
-Testing on other platforms has been light and cannot be guaranteed. 
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-###Contributors
-
-The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-ntp/graphs/contributors](https://github.com/puppetlabs/puppetlabs-ntp/graphs/contributors)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/config.pp
deleted file mode 100644
index fbb01fe8ead..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/config.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-class ntp::config inherits ntp {
-
-  if $keys_enable {
-    # Workaround for the lack of dirname() in stdlib 3.2.
-    $directory = inline_template('<%= File.dirname(keys_file) %>')
-    file { $directory:
-      ensure  => directory,
-      owner   => 0,
-      group   => 0,
-      mode    => '0755',
-      recurse => true,
-    }
-  }
-
-  file { $config:
-    ensure  => file,
-    owner   => 0,
-    group   => 0,
-    mode    => '0644',
-    content => template($config_template),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/init.pp
deleted file mode 100644
index 74c9d7c4f92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/init.pp
+++ /dev/null
@@ -1,56 +0,0 @@
-class ntp (
-  $autoupdate        = $ntp::params::autoupdate,
-  $config            = $ntp::params::config,
-  $config_template   = $ntp::params::config_template,
-  $driftfile         = $ntp::params::driftfile,
-  $keys_enable       = $ntp::params::keys_enable,
-  $keys_file         = $ntp::params::keys_file,
-  $keys_controlkey   = $ntp::params::keys_controlkey,
-  $keys_requestkey   = $ntp::params::keys_requestkey,
-  $keys_trusted      = $ntp::params::keys_trusted,
-  $package_ensure    = $ntp::params::package_ensure,
-  $package_name      = $ntp::params::package_name,
-  $panic             = $ntp::params::panic,
-  $preferred_servers = $ntp::params::preferred_servers,
-  $restrict          = $ntp::params::restrict,
-  $servers           = $ntp::params::servers,
-  $service_enable    = $ntp::params::service_enable,
-  $service_ensure    = $ntp::params::service_ensure,
-  $service_manage    = $ntp::params::service_manage,
-  $service_name      = $ntp::params::service_name,
-  $udlc              = $ntp::params::udlc
-) inherits ntp::params {
-
-  validate_absolute_path($config)
-  validate_string($config_template)
-  validate_absolute_path($driftfile)
-  validate_bool($keys_enable)
-  validate_re($keys_controlkey, ['^\d+$', ''])
-  validate_re($keys_requestkey, ['^\d+$', ''])
-  validate_array($keys_trusted)
-  validate_string($package_ensure)
-  validate_array($package_name)
-  validate_bool($panic)
-  validate_array($preferred_servers)
-  validate_array($restrict)
-  validate_array($servers)
-  validate_bool($service_enable)
-  validate_string($service_ensure)
-  validate_bool($service_manage)
-  validate_string($service_name)
-  validate_bool($udlc)
-
-  if $autoupdate {
-    notice('autoupdate parameter has been deprecated and replaced with package_ensure.  Set this to latest for the same behavior as autoupdate => true.')
-  }
-
-  # Anchor this as per #8040 - this ensures that classes won't float off and
-  # mess everything up.  You can read about this at:
-  # http://docs.puppetlabs.com/puppet/2.7/reference/lang_containment.html#known-issues
-  anchor { 'ntp::begin': } ->
-  class { '::ntp::install': } ->
-  class { '::ntp::config': } ~>
-  class { '::ntp::service': } ->
-  anchor { 'ntp::end': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/install.pp
deleted file mode 100644
index 098949c398e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/install.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-class ntp::install inherits ntp {
-
-  package { 'ntp':
-    ensure => $package_ensure,
-    name   => $package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/params.pp
deleted file mode 100644
index b8ae5032ca2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/params.pp
+++ /dev/null
@@ -1,185 +0,0 @@
-class ntp::params {
-
-  $autoupdate        = false
-  $config_template   = 'ntp/ntp.conf.erb'
-  $keys_enable       = false
-  $keys_controlkey   = ''
-  $keys_requestkey   = ''
-  $keys_trusted      = []
-  $package_ensure    = 'present'
-  $preferred_servers = []
-  $service_enable    = true
-  $service_ensure    = 'running'
-  $service_manage    = true
-  $udlc              = false
-
-  # On virtual machines allow large clock skews.
-  $panic = str2bool($::is_virtual) ? {
-    true    => false,
-    default => true,
-  }
-
-  case $::osfamily {
-    'AIX': {
-      $config = '/etc/ntp.conf'
-      $keysfile = '/etc/ntp.keys'
-      $driftfile = '/etc/ntp.drift'
-      $package_name = [ 'bos.net.tcp.client' ]
-      $restrict          = [
-        'default nomodify notrap nopeer noquery',
-        '127.0.0.1',
-      ]
-      $service_name = 'xntpd'
-      $servers = [
-        '0.debian.pool.ntp.org iburst',
-        '1.debian.pool.ntp.org iburst',
-        '2.debian.pool.ntp.org iburst',
-        '3.debian.pool.ntp.org iburst',
-      ]
-    }
-    'Debian': {
-      $config          = '/etc/ntp.conf'
-      $keys_file       = '/etc/ntp/keys'
-      $driftfile       = '/var/lib/ntp/drift'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntp'
-      $servers         = [
-        '0.debian.pool.ntp.org iburst',
-        '1.debian.pool.ntp.org iburst',
-        '2.debian.pool.ntp.org iburst',
-        '3.debian.pool.ntp.org iburst',
-      ]
-    }
-    'RedHat': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.centos.pool.ntp.org',
-        '1.centos.pool.ntp.org',
-        '2.centos.pool.ntp.org',
-      ]
-    }
-    'SuSE': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift/ntp.drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntp'
-      $servers         = [
-        '0.opensuse.pool.ntp.org',
-        '1.opensuse.pool.ntp.org',
-        '2.opensuse.pool.ntp.org',
-        '3.opensuse.pool.ntp.org',
-      ]
-    }
-    'FreeBSD': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/db/ntpd.drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = ['net/ntp']
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.freebsd.pool.ntp.org iburst maxpoll 9',
-        '1.freebsd.pool.ntp.org iburst maxpoll 9',
-        '2.freebsd.pool.ntp.org iburst maxpoll 9',
-        '3.freebsd.pool.ntp.org iburst maxpoll 9',
-      ]
-    }
-    'Archlinux': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = [ 'ntp' ]
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.pool.ntp.org',
-        '1.pool.ntp.org',
-        '2.pool.ntp.org',
-      ]
-    }
-    # Gentoo was added as its own $::osfamily in Facter 1.7.0
-    'Gentoo': {
-      $config          = '/etc/ntp.conf'
-      $driftfile       = '/var/lib/ntp/drift'
-      $keys_file       = '/etc/ntp/keys'
-      $package_name    = ['net-misc/ntp']
-      $restrict          = [
-        'default kod nomodify notrap nopeer noquery',
-        '-6 default kod nomodify notrap nopeer noquery',
-        '127.0.0.1',
-        '-6 ::1',
-      ]
-      $service_name    = 'ntpd'
-      $servers         = [
-        '0.gentoo.pool.ntp.org',
-        '1.gentoo.pool.ntp.org',
-        '2.gentoo.pool.ntp.org',
-        '3.gentoo.pool.ntp.org',
-      ]
-    }
-    'Linux': {
-      # Account for distributions that don't have $::osfamily specific settings.
-      # Before Facter 1.7.0 Gentoo did not have its own $::osfamily
-      case $::operatingsystem {
-        'Gentoo': {
-          $config          = '/etc/ntp.conf'
-          $driftfile       = '/var/lib/ntp/drift'
-          $keys_file       = '/etc/ntp/keys'
-          $package_name    = ['net-misc/ntp']
-          $restrict          = [
-            'default kod nomodify notrap nopeer noquery',
-            '-6 default kod nomodify notrap nopeer noquery',
-            '127.0.0.1',
-            '-6 ::1',
-          ]
-          $service_name    = 'ntpd'
-          $servers         = [
-            '0.gentoo.pool.ntp.org',
-            '1.gentoo.pool.ntp.org',
-            '2.gentoo.pool.ntp.org',
-            '3.gentoo.pool.ntp.org',
-          ]
-        }
-        default: {
-          fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution.")
-        }
-      }
-    }
-    default: {
-      fail("The ${module_name} module is not supported on an ${::osfamily} based system.")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/service.pp
deleted file mode 100644
index 3f1ada0b72d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/manifests/service.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-class ntp::service inherits ntp {
-
-  if ! ($service_ensure in [ 'running', 'stopped' ]) {
-    fail('service_ensure parameter must be running or stopped')
-  }
-
-  if $service_manage == true {
-    service { 'ntp':
-      ensure     => $service_ensure,
-      enable     => $service_enable,
-      name       => $service_name,
-      hasstatus  => true,
-      hasrestart => true,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/metadata.json
deleted file mode 100644
index 81b2675dbbe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/metadata.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "SLES",
-      "operatingsystemrelease": [
-        "11 SP1"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    },
-    {
-      "operatingsystem": "AIX",
-      "operatingsystemrelease": [
-        "5.3",
-        "6.1",
-        "7.1"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": "3.x"
-    }
-  ],
-  "name": "puppetlabs-ntp",
-  "version": "3.0.4",
-  "source": "git://github.com/puppetlabs/puppetlabs-ntp",
-  "author": "Puppet Labs",
-  "license": "Apache Version 2.0",
-  "summary": "NTP Module",
-  "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux and Gentoo.",
-  "project_page": "http://github.com/puppetlabs/puppetlabs-ntp",
-  "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 0.1.6"
-    }
-  ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb
deleted file mode 100644
index e61f9db5bc1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'ntp class:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should run successfully' do
-    pp = "class { 'ntp': }"
-
-    # Apply twice to ensure no errors the second time.
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-    end
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-      expect(r.exit_code).to be_zero
-    end
-  end
-
-  context 'service_ensure => stopped:' do
-    it 'runs successfully' do
-      pp = "class { 'ntp': service_ensure => stopped }"
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-
-  context 'service_ensure => running:' do
-    it 'runs successfully' do
-      pp = "class { 'ntp': service_ensure => running }"
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stderr).to eq("")
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index 4e2cb809e85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
deleted file mode 100644
index 196ba76584a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_config_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'FreeBSD'
-  line = '0.freebsd.pool.ntp.org iburst maxpoll 9'
-when 'Debian'
-  line = '0.debian.pool.ntp.org iburst'
-when 'RedHat'
-  line = '0.centos.pool.ntp.org'
-when 'SuSE'
-  line = '0.opensuse.pool.ntp.org'
-when 'Gentoo'
-  line = '0.gentoo.pool.ntp.org'
-when 'Linux'
-  case fact('operatingsystem')
-  when 'ArchLinux'
-    line = '0.pool.ntp.org'
-  when 'Gentoo'
-    line = '0.gentoo.pool.ntp.org'
-  end
-when 'AIX'
-  line = '0.debian.pool.ntp.org iburst'
-end
-
-describe 'ntp::config class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'sets up ntp.conf' do
-    apply_manifest(%{
-      class { 'ntp': }
-    }, :catch_failures => true)
-  end
-
-  describe file('/etc/ntp.conf') do
-    it { should be_file }
-    it { should contain line }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
deleted file mode 100644
index 1a451bbb23f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_install_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'FreeBSD'
-  packagename = 'net/ntp'
-when 'Gentoo'
-  packagename = 'net-misc/ntp'
-when 'Linux'
-  case fact('operatingsystem')
-  when 'ArchLinux'
-    packagename = 'ntp'
-  when 'Gentoo'
-    packagename = 'net-misc/ntp'
-  end
-when 'AIX'
-  packagename = 'bos.net.tcp.client'
-else
-  packagename = 'ntp'
-end
-
-describe 'ntp::install class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'installs the package' do
-    apply_manifest(%{
-      class { 'ntp': }
-    }, :catch_failures => true)
-  end
-
-  describe package(packagename) do
-    it { should be_installed }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
deleted file mode 100644
index 71a6b202aa0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_parameters_spec.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'FreeBSD'
-  packagename = 'net/ntp'
-when 'Gentoo'
-  packagename = 'net-misc/ntp'
-when 'Linux'
-  case fact('operatingsystem')
-  when 'ArchLinux'
-    packagename = 'ntp'
-  when 'Gentoo'
-    packagename = 'net-misc/ntp'
-  end
-when 'AIX'
-  packagename = 'bos.net.tcp.client'
-else
-  packagename = 'ntp'
-end
-
-describe "ntp class:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'applies successfully' do
-    pp = "class { 'ntp': }"
-
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-    end
-  end
-
-  describe 'autoconfig' do
-    it 'raises a deprecation warning' do
-      pp = "class { 'ntp': autoupdate => true }"
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/autoupdate parameter has been deprecated and replaced with package_ensure/)
-      end
-    end
-  end
-
-  describe 'config' do
-    it 'sets the ntp.conf location' do
-      pp = "class { 'ntp': config => '/etc/antp.conf' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/antp.conf') do
-      it { should be_file }
-    end
-  end
-
-  describe 'config_template' do
-    it 'sets up template' do
-      modulepath = default['distmoduledir']
-      shell("mkdir -p #{modulepath}/test/templates")
-      shell("echo 'testcontent' >> #{modulepath}/test/templates/ntp.conf")
-    end
-
-    it 'sets the ntp.conf location' do
-      pp = "class { 'ntp': config_template => 'test/ntp.conf' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain 'testcontent' }
-    end
-  end
-
-  describe 'driftfile' do
-    it 'sets the driftfile location' do
-      pp = "class { 'ntp': driftfile => '/tmp/driftfile' }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain 'driftfile /tmp/driftfile' }
-    end
-  end
-
-  describe 'keys' do
-    it 'enables the key parameters' do
-      pp = <<-EOS
-      class { 'ntp':
-        keys_enable     => true,
-        keys_file       => '/etc/ntp/keys',
-        keys_controlkey => '/etc/ntp/controlkey',
-        keys_requestkey => '1',
-        keys_trusted    => [ '1', '2' ],
-      }
-      EOS
-      # Rely on a shell command instead of a file{} here to avoid loops
-      # within puppet when it tries to manage /etc/ntp/keys before /etc/ntp.
-      shell("mkdir -p /etc/ntp && echo '1 M AAAABBBB' >> /etc/ntp/keys")
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain 'keys /etc/ntp/keys' }
-      it { should contain 'controlkey /etc/ntp/controlkey' }
-      it { should contain 'requestkey 1' }
-      it { should contain 'trustedkey 1 2' }
-    end
-  end
-
-  describe 'package' do
-    it 'installs the right package' do
-      pp = <<-EOS
-      class { 'ntp':
-        package_ensure => present,
-        package_name   => ['#{packagename}'],
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe package(packagename) do
-      it { should be_installed }
-    end
-  end
-
-  describe 'panic => false' do
-    it 'enables the tinker panic setting' do
-      pp = <<-EOS
-      class { 'ntp':
-        panic => false,
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should contain 'tinker panic' }
-    end
-  end
-
-  describe 'panic => true' do
-    it 'disables the tinker panic setting' do
-      pp = <<-EOS
-      class { 'ntp':
-        panic => true,
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should_not contain 'tinker panic 0' }
-    end
-  end
-
-  describe 'udlc' do
-    it 'adds a udlc' do
-      pp = "class { 'ntp': udlc => true }"
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/ntp.conf') do
-      it { should be_file }
-      it { should contain '127.127.1.0' }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
deleted file mode 100644
index cac12de5dcf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/ntp_service_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'spec_helper_acceptance'
-
-case fact('osfamily')
-when 'RedHat', 'FreeBSD', 'Linux', 'Gentoo'
-  servicename = 'ntpd'
-when 'AIX'
-  servicename = 'xntpd'
-else
-  servicename = 'ntp'
-end
-
-describe 'ntp::service class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'basic test' do
-    it 'sets up the service' do
-      apply_manifest(%{
-        class { 'ntp': }
-      }, :catch_failures => true)
-    end
-
-    describe service(servicename) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  describe 'service parameters' do
-    it 'starts the service' do
-      pp = <<-EOS
-      class { 'ntp':
-        service_enable => true,
-        service_ensure => running,
-        service_manage => true,
-        service_name   => '#{servicename}'
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-
-  describe 'service is unmanaged' do
-    it 'shouldnt stop the service' do
-      pp = <<-EOS
-      class { 'ntp':
-        service_enable => false,
-        service_ensure => stopped,
-        service_manage => false,
-        service_name   => '#{servicename}'
-      }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(servicename) do
-      it { should be_running }
-      it { should be_enabled }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
deleted file mode 100644
index 7994acedbec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/preferred_servers_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'preferred servers', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  pp = <<-EOS
-      class { '::ntp':
-        servers           => ['a', 'b', 'c', 'd'],
-        preferred_servers => ['c', 'd'],
-      }
-  EOS
-
-  it 'applies cleanly' do
-    apply_manifest(pp, :catch_failures => true) do |r|
-      expect(r.stderr).to eq("")
-    end
-  end
-
-  describe file('/etc/ntp.conf') do
-    it { should be_file }
-    it { should contain 'server a' }
-    it { should contain 'server b' }
-    it { should contain 'server c prefer' }
-    it { should contain 'server d prefer' }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
deleted file mode 100644
index 753b1b3d011..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/restrict_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe "ntp class with restrict:", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'should run successfully' do
-    pp = "class { 'ntp': restrict => ['test restrict']}"
-
-    it 'runs twice' do
-      2.times do
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stderr).to be_empty
-        end
-      end
-    end
-  end
-
-  describe file('/etc/ntp.conf') do
-    it { should contain('test restrict') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 5f4490dee61..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should fail' do
-    pp = <<-EOS
-    class { 'ntp': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/is not supported on an/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb
deleted file mode 100644
index 5535d9b25ee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/classes/ntp_spec.rb
+++ /dev/null
@@ -1,272 +0,0 @@
-require 'spec_helper'
-
-describe 'ntp' do
-
-  ['Debian', 'RedHat','SuSE', 'FreeBSD', 'Archlinux', 'Gentoo', 'Gentoo (Facter < 1.7)'].each do |system|
-    if system == 'Gentoo (Facter < 1.7)'
-      let(:facts) {{ :osfamily => 'Linux', :operatingsystem => 'Gentoo' }}
-    else
-      let(:facts) {{ :osfamily => system }}
-    end
-
-    it { should include_class('ntp::install') }
-    it { should include_class('ntp::config') }
-    it { should include_class('ntp::service') }
-
-    describe "ntp::config on #{system}" do
-      it { should contain_file('/etc/ntp.conf').with_owner('0') }
-      it { should contain_file('/etc/ntp.conf').with_group('0') }
-      it { should contain_file('/etc/ntp.conf').with_mode('0644') }
-
-      describe 'allows template to be overridden' do
-        let(:params) {{ :config_template => 'my_ntp/ntp.conf.erb' }}
-        it { should contain_file('/etc/ntp.conf').with({
-          'content' => /server foobar/})
-        }
-      end
-
-      describe "keys for osfamily #{system}" do
-        context "when enabled" do
-          let(:params) {{
-            :keys_enable     => true,
-            :keys_file       => '/etc/ntp/ntp.keys',
-            :keys_trusted    => ['1', '2', '3'],
-            :keys_controlkey => '2',
-            :keys_requestkey => '3',
-          }}
-
-          it { should contain_file('/etc/ntp').with({
-            'ensure'  => 'directory'})
-          }
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /trustedkey 1 2 3/})
-          }
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /controlkey 2/})
-          }
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /requestkey 3/})
-          }
-        end
-      end
-
-      context "when disabled" do
-        let(:params) {{
-          :keys_enable     => false,
-          :keys_file       => '/etc/ntp/ntp.keys',
-          :keys_trusted    => ['1', '2', '3'],
-          :keys_controlkey => '2',
-          :keys_requestkey => '3',
-        }}
-
-        it { should_not contain_file('/etc/ntp').with({
-          'ensure'  => 'directory'})
-        }
-        it { should_not contain_file('/etc/ntp.conf').with({
-          'content' => /trustedkey 1 2 3/})
-        }
-        it { should_not contain_file('/etc/ntp.conf').with({
-          'content' => /controlkey 2/})
-        }
-        it { should_not contain_file('/etc/ntp.conf').with({
-          'content' => /requestkey 3/})
-        }
-      end
-
-      describe 'preferred servers' do
-        context "when set" do
-          let(:params) {{
-            :servers           => ['a', 'b', 'c', 'd'],
-            :preferred_servers => ['a', 'b']
-          }}
-
-          it { should contain_file('/etc/ntp.conf').with({
-            'content' => /server a prefer\nserver b prefer\nserver c\nserver d/})
-          }
-        end
-        context "when not set" do
-          let(:params) {{
-            :servers           => ['a', 'b', 'c', 'd'],
-            :preferred_servers => []
-          }}
-
-          it { should_not contain_file('/etc/ntp.conf').with({
-            'content' => /server a prefer/})
-          }
-        end
-      end
-
-      describe "ntp::install on #{system}" do
-        let(:params) {{ :package_ensure => 'present', :package_name => ['ntp'], }}
-
-        it { should contain_package('ntp').with(
-          :ensure => 'present',
-          :name   => 'ntp'
-        )}
-
-        describe 'should allow package ensure to be overridden' do
-          let(:params) {{ :package_ensure => 'latest', :package_name => ['ntp'] }}
-          it { should contain_package('ntp').with_ensure('latest') }
-        end
-
-        describe 'should allow the package name to be overridden' do
-          let(:params) {{ :package_ensure => 'present', :package_name => ['hambaby'] }}
-          it { should contain_package('ntp').with_name('hambaby') }
-        end
-      end
-
-      describe 'ntp::service' do
-        let(:params) {{
-          :service_manage => true,
-          :service_enable => true,
-          :service_ensure => 'running',
-          :service_name   => 'ntp'
-        }}
-
-        describe 'with defaults' do
-          it { should contain_service('ntp').with(
-            :enable => true,
-            :ensure => 'running',
-            :name   => 'ntp'
-          )}
-        end
-
-        describe 'service_ensure' do
-          describe 'when overridden' do
-            let(:params) {{ :service_name => 'ntp', :service_ensure => 'stopped' }}
-            it { should contain_service('ntp').with_ensure('stopped') }
-          end
-        end
-
-        describe 'service_manage' do
-          let(:params) {{
-            :service_manage => false,
-            :service_enable => true,
-            :service_ensure => 'running',
-            :service_name   => 'ntpd',
-          }}
-
-          it 'when set to false' do
-            should_not contain_service('ntp').with({
-              'enable' => true,
-              'ensure' => 'running',
-              'name'   => 'ntpd'
-            })
-          end
-        end
-      end
-    end
-
-    context 'ntp::config' do
-      describe "for operating system Gentoo (Facter < 1.7)" do
-        let(:facts) {{ :operatingsystem => 'Gentoo',
-                       :osfamily        => 'Linux' }}
-
-        it 'uses the NTP pool servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.gentoo.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily Gentoo" do
-        let(:facts) {{ :osfamily => 'Gentoo' }}
-
-        it 'uses the NTP pool servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.gentoo.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily Debian" do
-        let(:facts) {{ :osfamily => 'debian' }}
-
-        it 'uses the debian ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.debian.pool.ntp.org iburst/,
-          })
-        end
-      end
-
-      describe "on osfamily RedHat" do
-        let(:facts) {{ :osfamily => 'RedHat' }}
-
-        it 'uses the redhat ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.centos.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily SuSE" do
-        let(:facts) {{ :osfamily => 'SuSE' }}
-
-        it 'uses the opensuse ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.opensuse.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "on osfamily FreeBSD" do
-        let(:facts) {{ :osfamily => 'FreeBSD' }}
-
-        it 'uses the freebsd ntp servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.freebsd.pool.ntp.org iburst maxpoll 9/,
-          })
-        end
-      end
-
-      describe "on osfamily ArchLinux" do
-        let(:facts) {{ :osfamily => 'ArchLinux' }}
-
-        it 'uses the NTP pool servers by default' do
-          should contain_file('/etc/ntp.conf').with({
-            'content' => /server \d.pool.ntp.org/,
-          })
-        end
-      end
-
-      describe "for operating system family unsupported" do
-        let(:facts) {{
-          :osfamily  => 'unsupported',
-        }}
-
-        it { expect{ subject }.to raise_error(
-          /^The ntp module is not supported on an unsupported based system./
-        )}
-      end
-    end
-
-    describe 'for virtual machines' do
-      let(:facts) {{ :osfamily        => 'Archlinux',
-                     :is_virtual      => 'true' }}
-
-      it 'should not use local clock as a time source' do
-        should_not contain_file('/etc/ntp.conf').with({
-          'content' => /server.*127.127.1.0.*fudge.*127.127.1.0 stratum 10/,
-        })
-      end
-
-      it 'allows large clock skews' do
-        should contain_file('/etc/ntp.conf').with({
-          'content' => /tinker panic 0/,
-        })
-      end
-    end
-
-    describe 'for physical machines' do
-      let(:facts) {{ :osfamily        => 'Archlinux',
-                     :is_virtual      => 'false' }}
-
-      it 'disallows large clock skews' do
-        should_not contain_file('/etc/ntp.conf').with({
-          'content' => /tinker panic 0/,
-        })
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb
deleted file mode 100644
index 40cf67c6d0a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/fixtures/modules/my_ntp/templates/ntp.conf.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-#my uber ntp config
-#
-
-server foobar
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 3d99cc368d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = [ 'windows', 'Solaris' ]
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    # Install Puppet
-    if host.is_pe?
-      install_pe
-    else
-      install_package host, 'rubygems'
-      on host, 'gem install puppet --no-ri --no-rdoc'
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'ntp')
-    hosts.each do |host|
-      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
-      shell('puppet module install puppetlabs-stdlib', :acceptable_exit_codes => [0,1])
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
deleted file mode 100644
index 7025850210d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/provider/README.markdown
+++ /dev/null
@@ -1,4 +0,0 @@
-Provider Specs
-==============
-
-Define specs for your providers under this directory.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
deleted file mode 100644
index 1ee19ac840f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/spec/unit/puppet/type/README.markdown
+++ /dev/null
@@ -1,4 +0,0 @@
-Resource Type Specs
-===================
-
-Define specs for your resource types in this directory.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/templates/ntp.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/templates/ntp.conf.erb
deleted file mode 100644
index d24126c2212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/templates/ntp.conf.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-# ntp.conf: Managed by puppet.
-#
-<% if @panic == false -%>
-# Keep ntpd from panicking in the event of a large clock skew
-# when a VM guest is suspended and resumed.
-tinker panic 0
-<% end -%>
-
-<% if @restrict != [] -%>
-# Permit time synchronization with our time source, but do not
-# permit the source to query or modify the service on this system.
-<% @restrict.flatten.each do |restrict| -%>
-restrict <%= restrict %>
-<% end %>
-<% end -%>
-
-<% [@servers].flatten.each do |server| -%>
-server <%= server %><% if @preferred_servers.include?(server) -%> prefer<% end %>
-<% end -%>
-
-<% if scope.lookupvar('::is_virtual') == "false" or @udlc -%>
-# Undisciplined Local Clock. This is a fake driver intended for backup
-# and when no outside source of synchronized time is available. 
-server	127.127.1.0 
-fudge	127.127.1.0 stratum 10
-restrict 127.127.1.0
-<% end -%>
-
-# Driftfile.
-driftfile <%= @driftfile %>
-
-<% if @keys_enable -%>
-keys <%= @keys_file %>
-<% unless @keys_trusted.empty? -%>
-trustedkey <%= @keys_trusted.join(' ') %>
-<% end -%>
-<% if @keys_requestkey != '' -%>
-requestkey <%= @keys_requestkey %>
-<% end -%>
-<% if @keys_controlkey != '' -%>
-controlkey <%= @keys_controlkey %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/tests/init.pp
deleted file mode 100644
index e6d9b537fb2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/ntp/tests/init.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-node default {
-
-  notify { 'enduser-before': }
-  notify { 'enduser-after': }
-
-  class { 'ntp':
-    require => Notify['enduser-before'],
-    before  => Notify['enduser-after'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.fixtures.yml
deleted file mode 100644
index ca9960712c4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.fixtures.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-fixtures:
-  repositories:
-    "puppi": "git://github.com/example42/puppi.git"
-    "monitor": "git://github.com/example42/puppet-monitor.git"
-    "firewall": "git://github.com/example42/puppet-firewall.git"
-    "iptables": "git://github.com/example42/puppet-iptables.git"
-    "concat": "git://github.com/example42/puppet-concat.git"
-  symlinks:
-    "php": "#{source_dir}"
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.gemfile
deleted file mode 100644
index 459723a8e59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-source :rubygems
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.project
deleted file mode 100644
index 12b382826a1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>php</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.travis.yml
deleted file mode 100644
index dffeca98741..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-script:
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.6.0"
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.6.0"
-      gemfile: .gemfile
-
-gemfile: .gemfile
-notifications:
-  email:
-    - al@lab42.it
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/LICENSE
deleted file mode 100644
index f41da018579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2013 Alessandro Franceschi / Lab42
-
-for the relevant commits Copyright (C) by the respective authors.
-
-Contact Lab42 at: info@lab42.it
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Modulefile
deleted file mode 100644
index 55ae20813f1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name    'example42-php'
-version '2.0.17'
-author  'Alessandro Franceschi'
-license 'Apache2'
-project_page 'http://www.example42.com'
-source  'https://github.com/example42/puppet-php'
-summary 'Puppet module for php'
-description 'This module installs and manages php. Check README.rdoc for details. Puppi is required for some common functions: you can install them without using the whole module. Monitor and firewall dependencies are needed only if the relevant features are enabled'
-dependency 'example42/puppi', '>= 2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/README.md
deleted file mode 100644
index a211dcbc2d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/README.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Puppet module: php
-
-This is a Puppet module for php based on the second generation layout ("NextGen") of Example42 Puppet Modules.
-
-Made by ALessandro Franceschi / Lab42
-
-Official site: http://www.example42.com
-
-Official git repository: http://github.com/example42/puppet-php
-
-Released under the terms of Apache 2 License.
-
-This module requires functions provided by the Example42 Puppi module (you need it even if you don't use and install Puppi)
-
-For detailed info about the logic and usage patterns of Example42 modules check the DOCS directory on Example42 main modules set.
-
-## USAGE - Basic management
-
-* Install php with default settings
-
-        class { 'php': }
-
-* Install a specific version of php package
-
-        class { 'php':
-          version => '1.0.1',
-        }
-
-* Remove php package
-
-        class { 'php':
-          absent => true
-        }
-
-* Enable auditing without without making changes on existing php configuration files
-
-        class { 'php':
-          audit_only => true
-        }
-
-* Install php in an nginx environment
-
-        class { 'php':
-          service => 'nginx'
-        }
-
-## USAGE - Module installation
-
-* Install a new module
-
-        php::module { "imagick": }
-
-* Install a specific version of a module:
-
-        php::module { "imagick":
-          version => '1.0.1';
-        }
-
-* Remove php module
-
-        php::module { "imagick":
-            absent => true,
-        }
-
-* By default module package name is php-$title for RedHat and php5-$title . You can override this prefix.
-
-        php::module { "apc":
-          module_prefix => "php-"
-        }
-
-
-## USAGE - Pear Management
-
-* Install a pear package
-
-        php::pear::module { "XML_Util": }
-
-* Install a pear package from a remote repository
-
-        php::pear::module { 'PHPUnit':
-          repository  => 'pear.phpunit.de',
-          use_package => 'no',
-        }
-
-* Install a pear package will all dependencies (--alldeps)
-
-        php::pear::module { 'PHPUnit':
-          repository  => 'pear.phpunit.de',
-          alldeps => 'true',
-        }
-
-* Set a config option
-
-        php::pear::config { http_proxy: value => "myproxy:8080" }
-
-
-## USAGE - Pecl Management
-
-* Install a pecl package
-
-        php::pecl::module { "XML_Util": }
-
-* Install a pecl package from source specifying the preferred state (note that you must have the package 'make' installed on your system)
-
-        php::pecl::module { "xhprof":
-          use_package     => 'false',
-          preferred_state => 'beta',
-        }
-
-* Set a config option
-
-        php::pecl::config { http_proxy: value => "myproxy:8080" }
-
-
-## USAGE - Overrides and Customizations
-* Use custom sources for main config file.
-
-        class { 'php':
-          source => [ "puppet:///modules/lab42/php/php.conf-${hostname}" , "puppet:///modules/lab42/php/php.conf" ],
-        }
-
-* Manage php.ini files on Debian and Suse derivatives. Here the main config file path (managed with the source/template params) defaults to /etc/php5/apache2/php.ini. To manage other files, either set a different path in config_file or use the php::conf define.
-
-        class { 'php':
-          config_file => '/etc/php5/apache2/php.ini',      # Default value on Ubuntu/Suse
-          template    => 'example42/php/php.ini-apache2.erb',
-        }
-
-        php::conf { 'php.ini-cli':
-          path     => '/etc/php5/cli/php.ini',
-          template => 'example42/php/php.ini-cli.erb',
-        }
-
-* Use custom source directory for the whole configuration dir
-
-        class { 'php':
-          source_dir       => 'puppet:///modules/lab42/php/conf/',
-          source_dir_purge => false, # Set to true to purge any existing file not present in $source_dir
-        }
-
-* Use custom template for main config file. Note that template and source arguments are alternative.
-
-        class { 'php':
-          template => 'example42/php/php.conf.erb',
-        }
-
-* Automatically include a custom subclass
-
-        class { 'php':
-          my_class => 'php::example42',
-        }
-
-
-
-
-
-[![Build Status](https://travis-ci.org/example42/puppet-php.png?branch=master)](https://travis-ci.org/example42/puppet-php)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Rakefile
deleted file mode 100644
index 1a8a8a0c30e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/Rakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb
deleted file mode 100644
index 7138a3277ee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_extension_dir.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Facter.add("php_fact_extension_dir") do
-  setcode do
-    Facter::Util::Resolution.exec('php-config --extension-dir')    || nil
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb
deleted file mode 100644
index c164c345f7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/lib/facter/php_fact_version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Facter.add("php_fact_version") do
-  setcode do
-    Facter::Util::Resolution.exec('php-config --version')    || nil
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/augeas.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/augeas.pp
deleted file mode 100644
index 722d65dd35d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/augeas.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# = Define: php::augeas
-#
-# Manage php.ini through augeas
-#
-# Here's an example how to find the augeas path to a variable:
-#
-#     # augtool --noload
-#     augtool> rm /augeas/load
-#     rm : /augeas/load 781
-#     augtool> set /augeas/load/myfile/lens @PHP
-#     augtool> set /augeas/load/myfile/incl /usr/local/etc/php5/cgi/php.ini
-#     augtool> load
-#     augtool> print
-#     ...
-#     /files/usr/local/etc/php5/cgi/php.ini/soap/soap.wsdl_cache_limit = "5"
-#     /files/usr/local/etc/php5/cgi/php.ini/ldap/ldap.max_links = "-1"
-#     ...
-#     augtool> exit
-#     #
-#
-# The part after 'php.ini/' is what you need to use as 'entry'.
-#
-# == Parameters
-#
-# [*entry*]
-#   Augeas path to entry to be modified.
-#
-# [*ensure*]
-#   Standard puppet ensure variable
-#
-# [*target*]
-#   Which php.ini to manipulate. Default is $php::config_file
-#
-# [*value*]
-#   Value to set
-#
-# == Examples
-#
-# php::augeas {
-#   'php-memorylimit':
-#     entry  => 'PHP/memory_limit',
-#     value  => '128M';
-#   'php-error_log':
-#     entry  => 'PHP/error_log',
-#     ensure => absent;
-#   'php-sendmail_path':
-#     entry  => 'mail function/sendmail_path',
-#     value  => '/usr/sbin/sendmail -t -i -f info@example.com';
-#   'php-date_timezone':
-#     entry  => 'Date/date.timezone',
-#     value  => 'Europe/Amsterdam';
-# }
-#
-define php::augeas (
-  $entry,
-  $ensure = present,
-  $target = $php::config_file,
-  $value  = '',
-  ) {
-
-  include php
-
-  $service = $php::service
-
-  $changes = $ensure ? {
-    present => [ "set '${entry}' '${value}'" ],
-    absent  => [ "rm '${entry}'" ],
-  }
-
-  augeas { "php_ini-${name}":
-    incl    => $target,
-    lens    => 'Php.lns',
-    changes => $changes,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/conf.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/conf.pp
deleted file mode 100644
index 12514dbf55a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/conf.pp
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# = Define: php::conf
-#
-# With this define you can manage any php configuration file
-# You have 3 parameters to provide it: source, template and content.
-#
-# == Parameters
-#
-# [*template*]
-#   String. Optional. Default: undef. Alternative to: source, content.
-#   Sets the module path of a custom template to use as content of
-#   the config file
-#   When defined, config file has: content => content($template),
-#   Example: template => 'site/php/my.conf.erb',
-#
-# [*content*]
-#   String. Optional. Default: undef. Alternative to: template, source.
-#   Sets directly the value of the file's content parameter
-#   When defined, config file has: content => $content,
-#   Example: content => "# File Managed by Puppet \n",
-#
-# [*source*]
-#   String. Optional. Default: undef. Alternative to: template, content.
-#   Sets the value of the file's source parameter
-#   When defined, config file has: source => $source,
-#   Example: source => 'puppet:///site/php/my.conf',
-#
-# [*ensure*]
-#   String. Default: present
-#   Manages config file presence. Possible values:
-#   * 'present' - Create and manages the file.
-#   * 'absent' - Remove the file.
-#
-# [*path*]
-#   String. Optional. Default: $config_dir/$title
-#   The path of the created config file. If not defined a file
-#   name like the  the name of the title a custom template to use as content of configfile
-#   If defined, configfile file has: content => content("$template")
-#
-# [*mode*] [*owner*] [*group*] [*notify*] [*replace*]
-#   String. Optional. Default: undef
-#   All these parameters map directly to the created file attributes.
-#   If not defined the module's defaults are used.
-#   If defined, config file file has, for example: mode => $mode
-#
-# [*options_hash*]
-#   Hash. Default undef. Needs: 'template'.
-#   An hash of custom options to be used in templates to manage any key pairs of
-#   arbitrary settings.
-#
-define php::conf (
-
-  $source       = undef,
-  $template     = undef,
-  $content      = undef,
-
-  $path         = undef,
-  $mode         = undef,
-  $owner        = undef,
-  $group        = undef,
-  $notify       = undef,
-  $replace      = undef,
-
-  $options_hash = undef,
-
-  $ensure       = present ) {
-
-  validate_re($ensure, ['present','absent'], 'Valid values are: present, absent. WARNING: If set to absent the conf file is removed.')
-
-  include php
-
-  $managed_path = $path ? {
-    undef   => "${php::config_dir}/${name}",
-    default => $path,
-  }
-
-  $managed_content = $content ? {
-    undef   => $template ? {
-      undef => undef,
-      default => template($template),
-    },
-    default => $content,
-  }
-
-  $managed_mode = $mode ? {
-    undef   => $php::config_file_mode,
-    default => $mode,
-  }
-
-  $managed_owner = $owner ? {
-    undef   => $php::config_file_owner,
-    default => $owner,
-  }
-
-  $managed_group = $group ? {
-    undef   => $php::config_file_group,
-    default => $group,
-  }
-
-  file { "php_conf_${name}":
-    ensure  => $ensure,
-    source  => $source,
-    content => $managed_content,
-    path    => $managed_path,
-    mode    => $managed_mode,
-    owner   => $managed_owner,
-    group   => $managed_group,
-    notify  => $notify,
-    replace => $replace,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/devel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/devel.pp
deleted file mode 100644
index 634f35ea2de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/devel.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Class php::devel
-#
-# Installs php devel package
-#
-class php::devel {
-
-  if $php::package_devel != ''
-  and ! defined(Package[$php::package_devel]) {
-    package { $php::package_devel :
-      ensure => $php::manage_package,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/ini.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/ini.pp
deleted file mode 100644
index 2851aa4c67e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/ini.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# = Define: php::ini
-#
-define php::ini (
-    $value       = '',
-    $template    = 'extra-ini.erb',
-    $target      = 'extra.ini',
-    $service     = $php::service,
-    $config_dir  = $php::config_dir
-) {
-
-  include php
-
-  file { "${config_dir}/conf.d/${target}":
-    ensure  => 'present',
-    content => template("php/${template}"),
-    require => Package['php'],
-    notify  => Service[$service],
-  }
-
-  file { "${config_dir}/cli/conf.d/${target}":
-    ensure  => 'present',
-    content => template("php/${template}"),
-    require => Package['php'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/init.pp
deleted file mode 100644
index 7370528657a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/init.pp
+++ /dev/null
@@ -1,298 +0,0 @@
-# = Class: php
-#
-# This is the main php class
-#
-#
-# == Parameters
-#
-# Module specific parameters
-# [*package_devel*]
-#   Name of the php-devel package
-#
-# [*package_pear*]
-#   Name of the php-pear package
-#
-# Standard class parameters
-# Define the general class behaviour and customizations
-#
-# [*my_class*]
-#   Name of a custom class to autoload to manage module's customizations
-#   If defined, php class will automatically "include $my_class"
-#   Can be defined also by the (top scope) variable $php_myclass
-#
-# [*service*]
-#   The service that runs the php interpreter. Defines what service gets
-#   notified. Default: apache2|httpd.
-#
-# [*source*]
-#   Sets the content of source parameter for main configuration file
-#   If defined, php main config file will have the param: source => $source
-#   Can be defined also by the (top scope) variable $php_source
-#
-# [*source_dir*]
-#   If defined, the whole php configuration directory content is retrieved
-#   recursively from the specified source
-#   (source => $source_dir , recurse => true)
-#   Can be defined also by the (top scope) variable $php_source_dir
-#
-# [*source_dir_purge*]
-#   If set to true (default false) the existing configuration directory is
-#   mirrored with the content retrieved from source_dir
-#   (source => $source_dir , recurse => true , purge => true, force => true)
-#   Can be defined also by the (top scope) variable $php_source_dir_purge
-#
-# [*template*]
-#   Sets the path to the template to use as content for main configuration file
-#   If defined, php main config file has: content => content("$template")
-#   Note source and template parameters are mutually exclusive: don't use both
-#   Can be defined also by the (top scope) variable $php_template
-#
-# [*augeas*]
-#   If set to true (default false), the php.ini will be managed through
-#   augeas. This will make php::pecl automatically add extensions to the
-#   php.ini.
-#   Can be defined also by the (top scope) variable $php_augeas
-#
-# [*options*]
-#   An hash of custom options to be used in templates for arbitrary settings.
-#   Can be defined also by the (top scope) variable $php_options
-#
-# [*version*]
-#   The package version, used in the ensure parameter of package type.
-#   Default: present. Can be 'latest' or a specific version number.
-#   Note that if the argument absent (see below) is set to true, the
-#   package is removed, whatever the value of version parameter.
-#
-# [*absent*]
-#   Set to 'true' to remove package(s) installed by module
-#   Can be defined also by the (top scope) variable $php_absent
-#
-# [*puppi*]
-#   Set to 'true' to enable creation of module data files that are used by puppi
-#   Can be defined also by the (top scope) variables $php_puppi and $puppi
-#
-# [*puppi_helper*]
-#   Specify the helper to use for puppi commands. The default for this module
-#   is specified in params.pp and is generally a good choice.
-#   You can customize the output of puppi commands for this module using another
-#   puppi helper. Use the define puppi::helper to create a new custom helper
-#   Can be defined also by the (top scope) variables $php_puppi_helper
-#   and $puppi_helper
-#
-# [*debug*]
-#   Set to 'true' to enable modules debugging
-#   Can be defined also by the (top scope) variables $php_debug and $debug
-#
-# [*audit_only*]
-#   Set to 'true' if you don't intend to override existing configuration files
-#   and want to audit the difference between existing files and the ones
-#   managed by Puppet.
-#   Can be defined also by the (top scope) variables $php_audit_only
-#   and $audit_only
-#
-# Default class params - As defined in php::params.
-# Note that these variables are mostly defined and used in the module itself,
-# overriding the default values might not affected all the involved components.
-# Set and override them only if you know what you're doing.
-# Note also that you can't override/set them via top scope variables.
-#
-# [*package*]
-#   The name of php package
-#
-# [*config_dir*]
-#   Main configuration directory. Used by puppi
-#
-# [*config_file*]
-#   Main configuration file path
-#
-# [*config_file_mode*]
-#   Main configuration file path mode
-#
-# [*config_file_owner*]
-#   Main configuration file path owner
-#
-# [*config_file_group*]
-#   Main configuration file path group
-#
-# [*config_file_init*]
-#   Path of configuration file sourced by init script
-#
-# [*pid_file*]
-#   Path of pid file. Used by monitor
-#
-# [*data_dir*]
-#   Path of application data directory. Used by puppi
-#
-# [*log_dir*]
-#   Base logs directory. Used by puppi
-#
-# [*log_file*]
-#   Log file(s). Used by puppi
-#
-# == Examples
-#
-# You can use this class in 2 ways:
-# - Set variables (at top scope level on in a ENC) and "include php"
-# - Call php as a parametrized class
-#
-# See README for details.
-#
-#
-class php (
-  $package_devel       = params_lookup( 'package_devel' ),
-  $package_pear        = params_lookup( 'package_pear' ),
-  $my_class            = params_lookup( 'my_class' ),
-  $service             = params_lookup( 'service' ),
-  $service_autorestart = params_lookup( 'service_autorestart' ),
-  $source              = params_lookup( 'source' ),
-  $source_dir          = params_lookup( 'source_dir' ),
-  $source_dir_purge    = params_lookup( 'source_dir_purge' ),
-  $template            = params_lookup( 'template' ),
-  $augeas              = params_lookup( 'augeas' ),
-  $options             = params_lookup( 'options' ),
-  $version             = params_lookup( 'version' ),
-  $absent              = params_lookup( 'absent' ),
-  $monitor             = params_lookup( 'monitor' , 'global' ),
-  $monitor_tool        = params_lookup( 'monitor_tool' , 'global' ),
-  $monitor_target      = params_lookup( 'monitor_target' , 'global' ),
-  $puppi               = params_lookup( 'puppi' , 'global' ),
-  $puppi_helper        = params_lookup( 'puppi_helper' , 'global' ),
-  $debug               = params_lookup( 'debug' , 'global' ),
-  $audit_only          = params_lookup( 'audit_only' , 'global' ),
-  $package             = params_lookup( 'package' ),
-  $module_prefix       = params_lookup( 'module_prefix' ),
-  $config_dir          = params_lookup( 'config_dir' ),
-  $config_file         = params_lookup( 'config_file' ),
-  $config_file_mode    = params_lookup( 'config_file_mode' ),
-  $config_file_owner   = params_lookup( 'config_file_owner' ),
-  $config_file_group   = params_lookup( 'config_file_group' ),
-  $config_file_init    = params_lookup( 'config_file_init' ),
-  $pid_file            = params_lookup( 'pid_file' ),
-  $data_dir            = params_lookup( 'data_dir' ),
-  $log_dir             = params_lookup( 'log_dir' ),
-  $log_file            = params_lookup( 'log_file' ),
-  $port                = params_lookup( 'port' ),
-  $protocol            = params_lookup( 'protocol' )
-  ) inherits php::params {
-
-  $bool_service_autorestart=any2bool($service_autorestart)
-  $bool_source_dir_purge=any2bool($source_dir_purge)
-  $bool_augeas=any2bool($augeas)
-  $bool_absent=any2bool($absent)
-  $bool_monitor=any2bool($monitor)
-  $bool_puppi=any2bool($puppi)
-  $bool_debug=any2bool($debug)
-  $bool_audit_only=any2bool($audit_only)
-
-  ### Definition of some variables used in the module
-  $manage_package = $php::bool_absent ? {
-    true  => 'absent',
-    false => $php::version,
-  }
-
-  $manage_file = $php::bool_absent ? {
-    true    => 'absent',
-    default => 'present',
-  }
-
-  if $php::bool_absent == true {
-    $manage_monitor = false
-  } else {
-    $manage_monitor = true
-  }
-
-  $manage_audit = $php::bool_audit_only ? {
-    true  => 'all',
-    false => undef,
-  }
-
-  $manage_file_replace = $php::bool_audit_only ? {
-    true  => false,
-    false => true,
-  }
-
-  if ($php::source and $php::template) {
-    fail ('PHP: cannot set both source and template')
-  }
-  if ($php::source and $php::bool_augeas) {
-    fail ('PHP: cannot set both source and augeas')
-  }
-  if ($php::template and $php::bool_augeas) {
-    fail ('PHP: cannot set both template and augeas')
-  }
-
-  $manage_file_source = $php::source ? {
-    ''        => undef,
-    default   => $php::source,
-  }
-
-  $manage_file_content = $php::template ? {
-    ''        => undef,
-    default   => template($php::template),
-  }
-
-  ### Managed resources
-  package { 'php':
-    ensure => $php::manage_package,
-    name   => $php::package,
-  }
-
-  file { 'php.conf':
-    ensure  => $php::manage_file,
-    path    => $php::config_file,
-    mode    => $php::config_file_mode,
-    owner   => $php::config_file_owner,
-    group   => $php::config_file_group,
-    require => Package['php'],
-    source  => $php::manage_file_source,
-    content => $php::manage_file_content,
-    replace => $php::manage_file_replace,
-    audit   => $php::manage_audit,
-  }
-
-  # The whole php configuration directory can be recursively overriden
-  if $php::source_dir {
-    file { 'php.dir':
-      ensure  => directory,
-      path    => $php::config_dir,
-      require => Package['php'],
-      source  => $php::source_dir,
-      recurse => true,
-      purge   => $php::bool_source_dir_purge,
-      force   => $php::bool_source_dir_purge,
-      replace => $php::manage_file_replace,
-      audit   => $php::manage_audit,
-    }
-  }
-
-
-  ### Include custom class if $my_class is set
-  if $php::my_class {
-    include $php::my_class
-  }
-
-
-  ### Provide puppi data, if enabled ( puppi => true )
-  if $php::bool_puppi == true {
-    $classvars=get_class_args()
-    puppi::ze { 'php':
-      ensure    => $php::manage_file,
-      variables => $classvars,
-      helper    => $php::puppi_helper,
-    }
-  }
-
-
-  ### Debugging, if enabled ( debug => true )
-  if $php::bool_debug == true {
-    file { 'debug_php':
-      ensure  => $php::manage_file,
-      path    => "${settings::vardir}/debug-php",
-      mode    => '0640',
-      owner   => 'root',
-      group   => 'root',
-      content => inline_template('<%= scope.to_hash.reject { |k,v| k.to_s =~ /(uptime.*|path|timestamp|free|.*password.*|.*psk.*|.*key)/ }.to_yaml %>'),
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/module.pp
deleted file mode 100644
index 714c1de283d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/module.pp
+++ /dev/null
@@ -1,85 +0,0 @@
-# = Define: php::module
-#
-# This define installs and configures php modules
-# On Debian and derivatives it install module named php5-${name}
-# On RedHat and derivatives it install module named php-${name}
-# If you need a custom prefix you can overload default $module_prefix parameter
-#
-# == Parameters
-#
-# [*version*]
-#   Version to install.
-#
-# [*absent*]
-#   true to ensure package isn't installed.
-#
-# [*notify_service*]
-#   If you want to restart a service automatically when
-#   the module is applied. Default: true
-#
-# [*service_autorestart*]
-#   whatever we want a module installation notify a service to restart.
-#
-# [*service*]
-#   Service to restart.
-#
-# [*module_prefix*]
-#   If package name prefix isn't standard.
-#
-# == Examples
-# php::module { 'gd': }
-#
-# php::module { 'gd':
-#   ensure => absent,
-# }
-#
-# This will install php-apc on debian instead of php5-apc
-#
-# php::module { 'apc':
-#   module_prefix => "php-",
-# }
-#
-# Note that you may include or declare the php class when using
-# the php::module define
-#
-define php::module (
-  $version             = 'present',
-  $service_autorestart = '',
-  $module_prefix       = '',
-  $absent              = ''
-  ) {
-
-  include php
-
-  if $absent {
-    $real_version = 'absent'
-  } else {
-    $real_version = $version
-  }
-
-  $real_service_autorestart = $service_autorestart ? {
-    true    => "Service[${php::service}]",
-    false   => undef,
-    ''      => $php::service_autorestart ? {
-      true    => "Service[${php::service}]",
-      false   => undef,
-    }
-  }
-
-  $real_module_prefix = $module_prefix ? {
-    ''      => $php::module_prefix,
-    default => $module_prefix,
-  }
-
-  $real_install_package = "${real_module_prefix}${name}"
-
-  if defined(Package[$real_install_package]) == false {
-    package { "PhpModule_${name}":
-      ensure  => $real_version,
-      name    => $real_install_package,
-      notify  => $real_service_autorestart,
-      require => Package['php'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/params.pp
deleted file mode 100644
index 4db3267d901..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/params.pp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Class: php::params
-#
-# This class defines default parameters used by the main module class php
-# Operating Systems differences in names and paths are addressed here
-#
-# == Variables
-#
-# Refer to php class for the variables defined here.
-#
-# == Usage
-#
-# This class is not intended to be used directly.
-# It may be imported or inherited by other classes
-#
-class php::params {
-
-  $package_devel = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => 'php5-dev',
-    /(?i:SLES|OpenSuSe)/      => 'php5-devel',
-    default                   => 'php-devel',
-  }
-
-  $package_pear = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => 'php-pear',
-    /(?i:SLES|OpenSuSe)/      => 'php5-pear',
-    default                   => 'php-pear',
-  }
-
-  ### Application related parameters
-  $module_prefix = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => 'php5-',
-    default                                 => 'php-',
-  }
-
-  $pear_module_prefix = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/             => 'php-',
-    /(?i:SLES|OpenSuSe)/                  => 'php5-pear-',
-    /(?i:CentOS|RedHat|Scientific|Linux)/ => 'php-pear-',
-    default                               => 'pear-',
-  }
-
-  $package = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => 'php5',
-    /(?i:SLES|OpenSuSE)/      => [ 'php5','apache2-mod_php5'],
-    default                   => 'php',
-  }
-
-  # Here it's not the php service script name but
-  # web service name like apache2, nginx, etc.
-  $service = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => 'apache2',
-    default                                 => 'httpd',
-  }
-
-  $config_dir = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint|SLES|OpenSuSE)/ => '/etc/php5',
-    default                                   => '/etc/php.d',
-  }
-
-  $config_file = $::operatingsystem ? {
-    /(?i:Ubuntu|Debian|Mint)/ => '/etc/php5/php.ini',
-    /(?i:SLES|OpenSuSE)/      => '/etc/php5/apache2/php.ini',
-    default                   => '/etc/php.ini',
-  }
-
-  $config_file_mode = $::operatingsystem ? {
-    default => '0644',
-  }
-
-  $config_file_owner = $::operatingsystem ? {
-    default => 'root',
-  }
-
-  $config_file_group = $::operatingsystem ? {
-    default => 'root',
-  }
-
-  $data_dir = $::operatingsystem ? {
-    default => '',
-  }
-
-  $log_dir = $::operatingsystem ? {
-    default => '',
-  }
-
-  $log_file = $::operatingsystem ? {
-    default => '',
-  }
-
-  # General Settings
-  $my_class = ''
-  $source = ''
-  $source_dir = ''
-  $source_dir_purge = false
-  $augeas = false
-  $template = ''
-  $options = ''
-  $version = 'present'
-  $service_autorestart = true
-  $absent = false
-
-  ### General module variables that can have a site or per module default
-  $puppi = false
-  $puppi_helper = 'standard'
-  $debug = false
-  $audit_only = false
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear.pp
deleted file mode 100644
index a333a8448b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Class: php::pear
-#
-# Installs Pear for PHP module
-#
-# Usage:
-# include php::pear
-#
-# == Parameters
-#
-# Standard class parameters
-# Define the general class behaviour and customizations
-#
-# [*package*]
-#   Name of the package to install. Defaults to 'php-pear'
-#
-# [*version*]
-#   Version to install. Defaults to 'present'
-#
-# [*install_package*]
-#   Boolean. Determines if any package should be installed to support the PEAR functionality.
-#   Can be false if PEAR was already provided by another package or module.
-#   Default: true
-#
-class php::pear (
-  $package         = $php::package_pear,
-  $install_package = true,
-  $version         = 'present',
-  $path            = '/usr/bin:/usr/sbin:/bin:/sbin'
-  ) inherits php {
-
-  if ( $install_package ) {
-    package { 'php-pear':
-      ensure => $version,
-      name   => $package,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/config.pp
deleted file mode 100644
index 41c5b75091f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/config.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# Define: php::pear::config
-#
-# Configures pear
-#
-# Usage:
-# php::pear::config { http_proxy: value => "myproxy:8080" }
-#
-define php::pear::config ($value) {
-
-  include php::pear
-
-  exec { "pear-config-set-${name}":
-    command => "pear config-set ${name} ${value}",
-    path    => $php::pear::path,
-    unless  => "pear config-get ${name} | grep ${value}",
-    require => Package['php-pear'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/module.pp
deleted file mode 100644
index 4d11b16f19f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pear/module.pp
+++ /dev/null
@@ -1,119 +0,0 @@
-# Define: php::pear::module
-#
-# Installs the defined php pear component
-#
-# Variables:
-# [*use_package*]
-#   (default=true) - Tries to install pear module with the relevant OS package
-#   If set to "no" it installs the module via pear command
-#
-# [*preferred_state*]
-#   (default="stable") - Define which preferred state to use when installing
-#   Pear modules via pear via command line (when use_package=false)
-#
-# [*alldeps*]
-#   (default="false") - Define if all the available (optional) modules should
-#   be installed. (when use_package=false)
-#
-# Usage:
-# php::pear::module { packagename: }
-# Example:
-# php::pear::module { Crypt-CHAP: }
-#
-define php::pear::module (
-  $service             = '',
-  $use_package         = true,
-  $preferred_state     = 'stable',
-  $alldeps             = false,
-  $version             = 'present',
-  $repository          = 'pear.php.net',
-  $service_autorestart = '',
-  $module_prefix       = '',
-  $path                = '/usr/bin:/usr/sbin:/bin:/sbin',
-  $ensure              = 'present',
-  $timeout             = 300
-  ) {
-
-  include php::pear
-
-  $bool_use_package = any2bool($use_package)
-  $bool_alldeps = any2bool($alldeps)
-  $manage_alldeps = $bool_alldeps ? {
-    true  => '--alldeps',
-    false => '',
-  }
-
-  $pear_source = $version ? {
-    'present' => "${repository}/${name}",
-    default   => "${repository}/${name}-${version}",
-  }
-
-  $pear_exec_command = $ensure ? {
-    present => "pear -d preferred_state=${preferred_state} install ${manage_alldeps} ${pear_source}",
-    absent  => "pear uninstall -n ${pear_source}",
-  }
-
-  $pear_exec_require = $repository ? {
-    'pear.php.net' => Package['php-pear'],
-    default        => [ Package['php-pear'],Php::Pear::Config['auto_discover'] ],
-  }
-
-  $pear_exec_unless = $ensure ? {
-    present => "pear info ${pear_source}",
-    absent  => undef
-  }
-
-  $pear_exec_onlyif = $ensure ? {
-    present => undef,
-    absent  => "pear info ${pear_source}",
-  }
-
-  $real_service = $service ? {
-    ''      => $php::service,
-    default => $service,
-  }
-
-  $real_service_autorestart = $service_autorestart ? {
-    true    => "Service[${real_service}]",
-    false   => undef,
-    ''      => $php::service_autorestart ? {
-      true    => "Service[${real_service}]",
-      false   => undef,
-    }
-  }
-
-  $real_module_prefix = $module_prefix ? {
-    ''      => $php::pear_module_prefix,
-    default => $module_prefix,
-  }
-  $package_name = "${real_module_prefix}${name}"
-
-
-  case $bool_use_package {
-    true: {
-      package { "pear-${name}":
-        ensure  => $ensure,
-        name    => $package_name,
-        notify  => $real_service_autorestart,
-      }
-    }
-    default: {
-      if $repository != 'pear.php.net' {
-        if !defined (Php::Pear::Config['auto_discover']) {
-          php::pear::config { 'auto_discover':
-            value => '1',
-          }
-        }
-      }
-      exec { "pear-${name}":
-        command => $pear_exec_command,
-        path    => $path,
-        unless  => $pear_exec_unless,
-        onlyif  => $pear_exec_onlyif,
-        require => $pear_exec_require,
-        timeout => $timeout,
-      }
-    }
-  } # End Case
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/config.pp
deleted file mode 100644
index 437a2ab10ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/config.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# Define: php::pecl::config
-#
-# Configures pecl
-#
-# Usage:
-# php::pecl::config { http_proxy: value => "myproxy:8080" }
-#
-define php::pecl::config (
-  $value,
-  $layer = 'user',
-  $path  = '/usr/bin:/bin:/usr/sbin:/sbin'
-  ) {
-
-  include php::pear
-
-  exec { "pecl-config-set-${name}":
-    command => "pecl config-set ${name} ${value} ${layer}",
-    path    => $path,
-    unless  => "pecl config-get ${name} | grep ${value}",
-    require => Package['php-pear'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/module.pp
deleted file mode 100644
index b47b10b5d71..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/pecl/module.pp
+++ /dev/null
@@ -1,126 +0,0 @@
-# Define: php::pecl::module
-#
-# Installs the defined php pecl component
-#
-# == Parameters
-#
-# [*service_autorestart*]
-#   wathever we want a module installation notify a service to restart.
-#
-# [*service*]
-#   Service to restart.
-#
-# [*use_package*]
-#   Tries to install pecl module with the relevant package.
-#   If set to "no" it installs the module via pecl command. Default: true
-#
-# [*preferred_state*]
-#   Define which preferred state to use when installing Pear modules via pecl
-#   command line (when use_package=no). Default: true
-#
-# [*auto_answer*]
-#   The answer(s) to give to pecl prompts for unattended install
-#
-# [*verbose*]
-#   (Optional) - If you want to see verbose pecl output during installation.
-#   This can help to debug installation problems (missing packages) during
-#   installation process. Default: false
-#
-# == Examples
-# php::pecl::module { 'intl': }
-#
-# This will install xdebug from pecl source instead of using the package
-#
-# php::pecl::module { 'xdebug':.
-#   use_package => "no",
-# }
-#
-define php::pecl::module (
-  $service_autorestart = $php::bool_service_autorestart,
-  $service             = $php::service,
-  $use_package         = 'yes',
-  $preferred_state     = 'stable',
-  $auto_answer         = '\\n',
-  $ensure              = present,
-  $path                = '/usr/bin:/usr/sbin:/bin:/sbin',
-  $verbose             = false,
-  $version             = '',
-  $config_file         = $php::config_file) {
-
-  include php
-  include php::pear
-  include php::devel
-
-  $manage_service_autorestart = $service_autorestart ? {
-    true    => $service ? {
-      ''      => undef,
-      default => "Service[${service}]",
-    },
-    false   => undef,
-    undef   => undef,
-  }
-
-  $real_package_name = $::operatingsystem ? {
-    ubuntu  => "php5-${name}",
-    debian  => "php5-${name}",
-    default => "php-${name}",
-  }
-
-  case $use_package {
-    yes: {
-      package { "php-${name}":
-        ensure => $ensure,
-        name   => $real_package_name,
-        notify => $manage_service_autorestart,
-      }
-    }
-    default: {
-
-      $bool_verbose = any2bool($verbose)
-
-      $pecl_exec_logoutput = $bool_verbose ? {
-        true  => true,
-        false => undef,
-      }
-
-      if $version != '' {
-        $new_version = "-${version}"
-      } else {
-        $new_version = ''
-      }
-
-      $pecl_exec_command = $ensure ? {
-        present => "printf \"${auto_answer}\" | pecl -d preferred_state=${preferred_state} install ${name}${new_version}",
-        absent  => "pecl uninstall -n ${name}",
-      }
-
-      $pecl_exec_unless = $ensure ? {
-        present => "pecl info ${name}",
-        absent  => undef
-      }
-
-      $pecl_exec_onlyif = $ensure ? {
-        present => undef,
-        absent  => "pecl info ${name}",
-      }
-
-      exec { "pecl-${name}":
-        command   => $pecl_exec_command,
-        unless    => $pecl_exec_unless,
-        onlyif    => $pecl_exec_onlyif,
-        logoutput => $pecl_exec_logoutput,
-        path      => $path,
-        require   => [ Class['php::pear'], Class['php::devel']],
-      }
-      if $php::bool_augeas == true {
-        php::augeas { "augeas-${name}":
-          ensure => $ensure,
-          entry  => "PHP/extension[. = \"${name}.so\"]",
-          value  => "${name}.so",
-          notify => $manage_service_autorestart,
-          target => $config_file,
-        }
-      }
-    }
-  } # End Case
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/spec.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/spec.pp
deleted file mode 100644
index 3be06f47f8c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/manifests/spec.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Class: php::spec
-#
-# This class is used only for rpsec-puppet tests
-# Can be taken as an example on how to do custom classes but should not
-# be modified.
-#
-# == Usage
-#
-# This class is not intended to be used directly.
-# Use it as reference
-#
-class php::spec inherits php {
-
-  # This just a test to override the arguments of an existing resource
-  # Note that you can achieve this same result with just:
-  # class { "php": template => "php/spec.erb" }
-
-  File['php.conf'] {
-    content => template('php/spec.erb'),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/classes/php_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/classes/php_spec.rb
deleted file mode 100644
index be9a4e327ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/classes/php_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'php' do
-
-  let(:title) { 'php' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :ipaddress => '10.42.42.42' } }
-
-  describe 'Test standard installation' do
-    it { should contain_package('php').with_ensure('present') }
-    it { should contain_file('php.conf').with_ensure('present') }
-  end
-
-  describe 'Test installation of a specific version' do
-    let(:params) { {:version => '1.0.42' } }
-    it { should contain_package('php').with_ensure('1.0.42') }
-  end
-
-  describe 'Test decommissioning - absent' do
-    let(:params) { {:absent => true, :monitor => true } }
-
-    it 'should remove Package[php]' do should contain_package('php').with_ensure('absent') end 
-    it 'should remove php configuration file' do should contain_file('php.conf').with_ensure('absent') end
-  end
-
-  describe 'Test customizations - template' do
-    let(:params) { {:template => "php/spec.erb" , :options => { 'opt_a' => 'value_a' } } }
-
-    it 'should generate a valid template' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:content]
-      content.should match "fqdn: rspec.example42.com"
-    end
-    it 'should generate a template that uses custom options' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:content]
-      content.should match "value_a"
-    end
-
-  end
-
-  describe 'Test customizations - source' do
-    let(:params) { {:source => "puppet://modules/php/spec" , :source_dir => "puppet://modules/php/dir/spec" , :source_dir_purge => true } }
-
-    it 'should request a valid source ' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:source]
-      content.should == "puppet://modules/php/spec"
-    end
-    it 'should request a valid source dir' do
-      content = catalogue.resource('file', 'php.dir').send(:parameters)[:source]
-      content.should == "puppet://modules/php/dir/spec"
-    end
-    it 'should purge source dir if source_dir_purge is true' do
-      content = catalogue.resource('file', 'php.dir').send(:parameters)[:purge]
-      content.should == true
-    end
-  end
-
-  describe 'Test customizations - custom class' do
-    let(:params) { {:my_class => "php::spec" } }
-    it 'should automatically include a custom class' do
-      content = catalogue.resource('file', 'php.conf').send(:parameters)[:content]
-      content.should match "fqdn: rspec.example42.com"
-    end
-  end
-
-  describe 'Test Puppi Integration' do
-    let(:params) { {:puppi => true, :puppi_helper => "myhelper"} }
-
-    it 'should generate a puppi::ze define' do
-      content = catalogue.resource('puppi::ze', 'php').send(:parameters)[:helper]
-      content.should == "myhelper"
-    end
-  end
-
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb
deleted file mode 100644
index 614f0a10877..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_module_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'php::module' do
-
-  let(:title) { 'php::module' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { 'operatingsystem' => 'Ubuntu' } }
-
-  describe 'Test standard installation' do
-    let(:params) { { 'name' =>  'ps', } }
-    it 'should create a package with the default OS prefix' do
-      should contain_package('PhpModule_ps').with_name('php5-ps')
-    end
-    it 'should notify the default service' do
-      should contain_package('PhpModule_ps').with_notify('Service[apache2]')
-    end
-  end
-
-  describe 'Test custom params' do
-    let(:params) { { 'name' =>  'ps', 'module_prefix' => 'my-' , 'service_autorestart' => false } }
-    it 'should create a package with custom prefix' do
-      should contain_package('PhpModule_ps').with(
-        'ensure' => 'present',
-        'name'   => 'my-ps'
-      )
-      should contain_package('PhpModule_ps').without('notify')
-    end
-  end
-
-  describe 'Test uninstallation' do
-    let(:params) { { 'name' =>  'ps', 'absent' => 'true' } }
-    it 'should remove the package' do
-      should contain_package('PhpModule_ps').with_ensure('absent')
-    end
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb
deleted file mode 100644
index b093a8acfea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/defines/php_pear_module_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'php::pear::module' do
-
-  let(:title) { 'php::pear::module' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { 'operatingsystem' => 'Ubuntu' } }
-
-  describe 'Test standard installation' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', } }
-    it 'should install pear module with default OS package' do
-      should contain_package('pear-Crypt-CHAP').with_name('php-Crypt-CHAP')
-    end
-    it 'should notify the default service' do
-      should contain_package('pear-Crypt-CHAP').with_notify('Service[apache2]')
-    end
-  end
-
-  describe 'Test custom params' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', 'module_prefix' => 'my-' , 'service_autorestart' => false } }
-    it 'should create a package with custom prefix' do
-      should contain_package('pear-Crypt-CHAP').with(
-        'ensure' => 'present',
-        'name'   => 'my-Crypt-CHAP'
-      )
-      should contain_package('pear-Crypt-CHAP').without('notify')
-    end
-  end
-
-  describe 'Test uninstallation' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', 'ensure' => 'absent' } }
-    it 'should remove the package' do
-      should contain_package('pear-Crypt-CHAP').with_ensure('absent')
-    end
-  end
-
-  describe 'Test installation via exec' do
-    let(:params) { { 'name' =>  'Crypt-CHAP', 'use_package' => 'false' } }
-    it 'should install pear module with exec commands' do
-      should contain_exec('pear-Crypt-CHAP').with(
-        'command' => 'pear -d preferred_state=stable install  pear.php.net/Crypt-CHAP',
-        'unless'  => 'pear info pear.php.net/Crypt-CHAP'
-      )
-    end
-  end
-
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/extra-ini.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/extra-ini.erb
deleted file mode 100644
index e0e7087e892..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/extra-ini.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-; File Managed by Puppet
-
-<% if @value != "" -%>
-<% if @value.is_a? Array -%>
-<% @value.each do |name| -%>
-<%= name %>
-<% end %>
-<% else -%>
-<%= value %>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/spec.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/spec.erb
deleted file mode 100644
index 87b8c1e65dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/php/templates/spec.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is a template used only for rspec tests
-
-# Yaml of the whole scope
-<%= scope.to_hash.reject { |k,v| !( k.is_a?(String) && v.is_a?(String) ) }.to_yaml %>
-
-# Custom Options
-<%= options['opt_a'] %>
-<%= options['opt_b'] %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.fixtures.yml
deleted file mode 100644
index 5dbd5d048df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.fixtures.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-fixtures:
-  repositories:
-    apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
-    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-    firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
-    concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
-  symlinks:
-    postgresql: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.nodeset.yml
deleted file mode 100644
index 767f9cd2f6e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.nodeset.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.project
deleted file mode 100644
index a680a0bce77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>postgresql</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.travis.yml
deleted file mode 100644
index 795fa6fcd19..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION="~> 3.4.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: jY81Y/csdcDjjXRzX9VA3fbb5db+/KraLRPErHjYANO15DZjh3b9tBwo/ybLCLCGJE8ej1yXzTxs1dJhokySQL12m1VW1i8dM26kMc4x+wOnIFKny7VB78Tcbp8RV1iV1kWN3UcuAbQ5hvMrI3rzoWkD22zF0k3nFEcv1kpix1w=
-matrix:
-  fast_finish: true
-  exclude:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/CHANGELOG.md
deleted file mode 100644
index 5f70a34dcd3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/CHANGELOG.md
+++ /dev/null
@@ -1,550 +0,0 @@
-##2014-03-04 - Supported Release 3.3.3
-###Summary
-
-This is a supported release.  This release removes a testing symlink that can
-cause trouble on systems where /var is on a seperate filesystem from the
-modulepath.
-
-####Features
-####Bugfixes
-####Known Bugs
-* SLES is not supported.
-
-##2014-03-04 - Supported Release 3.3.2
-###Summary
-This is a supported release. It fixes a problem with updating passwords on postgresql.org distributed versions of PostgreSQL.
-
-####Bugfixes
-- Correct psql path when setting password on custom versions.
-- Documentation updates
-- Test updates
-
-####Known Bugs
-* SLES is not supported.
-
-
-##2014-02-12 - Version 3.3.1
-####Bugfix:
-- Allow dynamic rubygems host
-
-
-##2014-01-28 - Version 3.3.0
-
-###Summary
-
-This release rolls up a bunch of bugfixes our users have found and fixed for
-us over the last few months.  This improves things for 9.1 users, and makes
-this module usable on FreeBSD.
-
-This release is dedicated to 'bma', who's suffering with Puppet 3.4.1 issues
-thanks to Puppet::Util::SUIDManager.run_and_capture.
-
-####Features
- - Add lc_ config entry settings
- - Can pass template at database creation.
- - Add FreeBSD support.
- - Add support for customer `xlogdir` parameter.
- - Switch tests from rspec-system to beaker.  (This isn't really a feature)
-
-####Bugfixes
- - Properly fix the deprecated Puppet::Util::SUIDManager.run_and_capture errors.
- - Fix NOREPLICATION option for Postgres 9.1
- - Wrong parameter name: manage_pg_conf -> manage_pg_hba_conf
- - Add $postgresql::server::client_package_name, referred to by install.pp
- - Add missing service_provider/service_name descriptions in ::globals.
- - Fix several smaller typos/issues throughout.
- - Exec['postgresql_initdb'] needs to be done after $datadir exists
- - Prevent defined resources from floating in the catalog.
- - Fix granting all privileges on a table.
- - Add some missing privileges.
- - Remove deprecated and unused concat::fragment parameters.
-
-
-##2013-11-05 - Version 3.2.0
-
-###Summary
-
-Add's support for Ubuntu 13.10 (and 14.04) as well as x, y, z.
-
-####Features
-- Add versions for Ubuntu 13.10 and 14.04.
-- Use default_database in validate_db_connection instead of a hardcoded
-'postgres'
-- Add globals/params layering for default_database.
-- Allow specification of default database name.
-
-####Bugs
-- Fixes to the README.
-
-
-##2013-10-25 - Version 3.1.0
-
-###Summary
-
-This is a minor feature and bug fix release.
-
-Firstly, the postgresql_psql type now includes a new parameter `search_path` which is equivalent to using `set search_path` which allows you to change the default schema search path.
-
-The default version of Fedora 17 has now been added, so that Fedora 17 users can enjoy the module.
-
-And finally we've extended the capabilities of the defined type postgresql::validate_db_connection so that now it can handle retrying and sleeping between retries. This feature has been monopolized to fix a bug we were seeing with startup race conditions, but it can also be used by remote systems to 'wait' for PostgreSQL to start before their Puppet run continues.
-
-####Features
-- Defined $default_version for Fedora 17 (Bret Comnes)
-- add search_path attribute to postgresql_psql resource (Jeremy Kitchen)
-- (GH-198) Add wait and retry capability to validate_db_connection (Ken Barber)
-
-####Bugs
-- enabling defined postgres user password without resetting on every puppet run (jonoterc)
-- periods are valid in configuration variables also (Jeremy Kitchen)
-- Add zero length string to join() function (Jarl Stefansson)
-- add require of install to reload class (cdenneen)
-- (GH-198) Fix race condition on postgresql startup (Ken Barber)
-- Remove concat::setup for include in preparation for the next concat release (Ken Barber)
-
-
-##2013-10-14 - Version 3.0.0
-
-Final release of 3.0, enjoy!
-
-
-##2013-10-14 - Version 3.0.0-rc3
-
-###Summary
-
-Add a parameter to unmanage pg_hba.conf to fix a regression from 2.5, as well
-as allowing owner to be passed into x.
-
-####Features
-- `manage_pg_hba_conf` parameter added to control pg_hba.conf management.
-- `owner` parameter added to server::db.
-
-
-##2013-10-09 - Version 3.0.0-rc2
-
-###Summary
-
-A few bugfixes have been found since -rc1.
-
-####Fixes
-- Special case for $datadir on Amazon
-- Fix documentation about username/password for the postgresql_hash function
-
-
-##2013-10-01 - Version 3.0.0-rc1
-
-###Summary
-
-Version 3 was a major rewrite to fix some internal dependency issues, and to
-make the new Public API more clear. As a consequence a lot of things have
-changed for version 3 and older revisions that we will try to outline here.
-
-(NOTE:  The format of this CHANGELOG differs to normal in an attempt to
-explain the scope of changes)
-
-* Server specific objects now moved under `postgresql::server::` namespace:
-
-To restructure server specific elements under the `postgresql::server::`
-namespaces the following objects were renamed as such:
-
-`postgresql::database`       -> `postgresql::server::database`
-`postgresql::database_grant` -> `postgresql::server::database_grant`
-`postgresql::db`             -> `postgresql::server::db`
-`postgresql::grant`          -> `postgresql::server::grant`
-`postgresql::pg_hba_rule`    -> `postgresql::server::pg_hba_rule`
-`postgresql::plperl`         -> `postgresql::server::plperl`
-`postgresql::contrib`        -> `postgresql::server::contrib`
-`postgresql::role`           -> `postgresql::server::role`
-`postgresql::table_grant`    -> `postgresql::server::table_grant`
-`postgresql::tablespace`     -> `postgresql::server::tablespace`
-
-* New `postgresql::server::config_entry` resource for managing configuration:
-
-Previously we used the `file_line` resource to modify `postgresql.conf`. This
-new revision now adds a new resource named `postgresql::server::config_entry`
-for managing this file. For example:
-
-```puppet
-    postgresql::server::config_entry { 'check_function_bodies':
-      value => 'off',
-    }
-```
-
-If you were using `file_line` for this purpose, you should change to this new
-methodology.
-
-* `postgresql_puppet_extras.conf` has been removed:
-
-Now that we have a methodology for managing `postgresql.conf`, and due to
-concerns over the file management methodology using an `exec { 'touch ...': }`
-as a way to create an empty file the existing postgresql\_puppet\_extras.conf
-file is no longer managed by this module.
-
-If you wish to recreate this methodology yourself, use this pattern:
-
-```puppet
-    class { 'postgresql::server': }
-
-    $extras = "/tmp/include.conf"
-
-    file { $extras:
-      content => 'max_connections = 123',
-      notify  => Class['postgresql::server::service'],
-    }->
-    postgresql::server::config_entry { 'include':
-      value   => $extras,
-    }
-```
-
-* All uses of the parameter `charset` changed to `encoding`:
-
-Since PostgreSQL uses the terminology `encoding` not `charset` the parameter
-has been made consisent across all classes and resources.
-
-* The `postgresql` base class is no longer how you set globals:
-
-The old global override pattern was less then optimal so it has been fixed,
-however we decided to demark this properly by specifying these overrides in
-the class `postgresql::global`. Consult the documentation for this class now
-to see what options are available.
-
-Also, some parameter elements have been moved between this and the
-`postgresql::server` class where it made sense.
-
-* `config_hash` parameter collapsed for the `postgresql::server` class:
-
-Because the `config_hash` was really passing data through to what was in
-effect an internal class (`postgresql::config`). And since we don't want this
-kind of internal exposure the parameters were collapsed up into the
-`postgresql::server` class directly.
-
-* Lots of changes to 'private' or 'undocumented' classes:
-
-If you were using these before, these have changed names. You should only use
-what is documented in this README.md, and if you don't have what you need you
-should raise a patch to add that feature to a public API. All internal classes
-now have a comment at the top indicating them as private to make sure the
-message is clear that they are not supported as Public API.
-
-* `pg_hba_conf_defaults` parameter included to turn off default pg\_hba rules:
-
-The defaults should be good enough for most cases (if not raise a bug) but if
-you simply need an escape hatch, this setting will turn off the defaults. If
-you want to do this, it may affect the rest of the module so make sure you
-replace the rules with something that continues operation.
-
-* `postgresql::database_user` has now been removed:
-
-Use `postgresql::server::role` instead.
-
-* `postgresql::psql` resource has now been removed:
-
-Use `postgresql_psql` instead. In the future we may recreate this as a wrapper
-to add extra capability, but it will not match the old behaviour.
-
-* `postgresql_default_version` fact has now been removed:
-
-It didn't make sense to have this logic in a fact any more, the logic has been
-moved into `postgresql::params`.
-
-* `ripienaar/concat` is no longer used, instead we use `puppetlabs/concat`:
-
-The older concat module is now deprecated and moved into the
-`puppetlabs/concat` namespace. Functionality is more or less identical, but
-you may need to intervene during the installing of this package - as both use
-the same `concat` namespace.
-
----
-##2013-09-09 Release 2.5.0
-
-###Summary
-
-The focus of this release is primarily to capture the fixes done to the
-types and providers to make sure refreshonly works properly and to set
-the stage for the large scale refactoring work of 3.0.0.
-
-####Features
-
-
-####Bugfixes 
-- Use boolean for refreshonly.
-- Fix postgresql::plperl documentation.
-- Add two missing parameters to config::beforeservice
-- Style fixes
-
-
-##2013-08-01 Release 2.4.1
-
-###Summary
-
-This minor bugfix release solves an idempotency issue when using plain text
-passwords for the password_hash parameter for the postgresql::role defined
-type. Without this, users would continually see resource changes everytime
-your run Puppet.
-
-####Bugfixes
-- Alter role call not idempotent with cleartext passwords (Ken Barber)
-
-
-##2013-07-19 Release 2.4.0
-
-###Summary
-
-This updates adds the ability to change permissions on tables, create template
-databases from normal databases, manage PL-Perl's postgres package, and
-disable the management of `pg_hba.conf`.
-
-####Features
-- Add `postgresql::table_grant` defined resource
-- Add `postgresql::plperl` class
-- Add `manage_pg_hba_conf` parameter to the `postgresql::config` class
-- Add `istemplate` parameter to the `postgresql::database` define
-
-####Bugfixes
-- Update `postgresql::role` class to be able to update roles when modified
-instead of only on creation.
-- Update tests
-- Fix documentation of `postgresql::database_grant`
-
-
-##2.3.0
-
-This feature release includes the following changes:
-
-* Add a new parameter `owner` to the `database` type.  This can be used to
-  grant ownership of a new database to a specific user.  (Bruno Harbulot)
-* Add support for operating systems other than Debian/RedHat, as long as the
-  user supplies custom values for all of the required paths, package names, etc.
-  (Chris Price)
-* Improved integration testing (Ken Barber)
-
-
-##2.2.1
-
-This release fixes a bug whereby one of our shell commands (psql) were not ran from a globally accessible directory. This was causing permission denied errors when the command attempted to change user without changing directory.
-
-Users of previous versions might have seen this error:
-
-    Error: Error executing SQL; psql returned 256: 'could not change directory to "/root"
-
-This patch should correct that.
-
-#### Detail Changes
-
-* Set /tmp as default CWD for postgresql_psql
-
-
-##2.2.0
-
-This feature release introduces a number of new features and bug fixes.
-
-First of all it includes a new class named `postgresql::python` which provides you with a convenient way of install the python Postgresql client libraries.
-
-    class { 'postgresql::python':
-    }
-
-You are now able to use `postgresql::database_user` without having to specify a password_hash, useful for different authentication mechanisms that do not need passwords (ie. cert, local etc.).
-
-We've also provided a lot more advanced custom parameters now for greater control of your Postgresql installation. Consult the class documentation for PuppetDB in the README.
-
-This release in particular has largely been contributed by the community members below, a big thanks to one and all.
-
-#### Detailed Changes
-
-* Add support for psycopg installation (Flaper Fesp and Dan Prince)
-* Added default PostgreSQL version for Ubuntu 13.04 (Kamil Szymanski)
-* Add ability to create users without a password (Bruno Harbulot)
-* Three Puppet 2.6 fixes (Dominic Cleal)
-* Add explicit call to concat::setup when creating concat file (Dominic Cleal)
-* Fix readme typo (Jordi Boggiano)
-* Update postgres_default_version for Ubuntu (Kamil Szymanski)
-* Allow to set connection for noew role (Kamil Szymanski)
-* Fix pg_hba_rule for postgres local access (Kamil Szymanski)
-* Fix versions for travis-ci (Ken Barber)
-* Add replication support (Jordi Boggiano)
-* Cleaned up and added unit tests (Ken Barber)
-* Generalization to provide more flexability in postgresql configuration (Karel Brezina)
-* Create dependent directory for sudoers so tests work on Centos 5 (Ken Barber)
-* Allow SQL commands to be run against a specific DB (Carlos Villela)
-* Drop trailing comma to support Puppet 2.6 (Michael Arnold)
-
-
-##2.1.1
-
-
-This release provides a bug fix for RHEL 5 and Centos 5 systems, or specifically systems using PostgreSQL 8.1 or older. On those systems one would have received the error:
-
-    Error: Could not start Service[postgresqld]: Execution of ‘/sbin/service postgresql start’ returned 1:
-
-And the postgresql log entry:
-
-    FATAL: unrecognized configuration parameter "include"
-
-This bug is due to a new feature we had added in 2.1.0, whereby the `include` directive in `postgresql.conf` was not compatible. As a work-around we have added checks in our code to make sure systems running PostgreSQL 8.1 or older do not have this directive added.
-
-#### Detailed Changes
-
-2013-01-21 - Ken Barber <ken@bob.sh>
-* Only install `include` directive and included file on PostgreSQL >= 8.2
-* Add system tests for Centos 5
-
-
-##2.1.0
-
-This release is primarily a feature release, introducing some new helpful constructs to the module.
-
-For starters, we've added the line `include 'postgresql_conf_extras.conf'` by default so extra parameters not managed by the module can be added by other tooling or by Puppet itself. This provides a useful escape-hatch for managing settings that are not currently managed by the module today.
-
-We've added a new defined resource for managing your tablespace, so you can now create new tablespaces using the syntax:
-
-    postgresql::tablespace { 'dbspace':
-      location => '/srv/dbspace',
-    }
-
-We've added a locale parameter to the `postgresql` class, to provide a default. Also the parameter has been added to the `postgresql::database` and `postgresql::db` defined resources for changing the locale per database:
-
-    postgresql::db { 'mydatabase':
-      user     => 'myuser',
-      password => 'mypassword',
-      encoding => 'UTF8',
-      locale   => 'en_NG',
-    }
-
-There is a new class for installing the necessary packages to provide the PostgreSQL JDBC client jars:
-
-    class { 'postgresql::java': }
-
-And we have a brand new defined resource for managing fine-grained rule sets within your pg_hba.conf access lists:
-
-    postgresql::pg_hba { 'Open up postgresql for access from 200.1.2.0/24':
-      type => 'host',
-      database => 'app',
-      user => 'app',
-      address => '200.1.2.0/24',
-      auth_method => 'md5',
-    }
-
-Finally, we've also added Travis-CI support and unit tests to help us iterate faster with tests to reduce regression. The current URL for these tests is here: https://travis-ci.org/puppetlabs/puppet-postgresql. Instructions on how to run the unit tests available are provided in the README for the module.
-
-A big thanks to all those listed below who made this feature release possible :-).
-
-#### Detailed Changes
-
-2013-01-18 - Simão Fontes <simaofontes@gmail.com> & Flaper Fesp <flaper87@gmail.com>
-* Remove trailing commas from params.pp property definition for Puppet 2.6.0 compatibility
-
-2013-01-18 - Lauren Rother <lauren.rother@puppetlabs.com>
-* Updated README.md to conform with best practices template
-
-2013-01-09 - Adrien Thebo <git@somethingsinistral.net>
-* Update postgresql_default_version to 9.1 for Debian 7.0
-
-2013-01-28 - Karel Brezina <karel.brezina@gmail.com>
-* Add support for tablespaces
-
-2013-01-16 - Chris Price <chris@puppetlabs.com> & Karel Brezina <karel.brezina@gmail.com>
-* Provide support for an 'include' config file 'postgresql_conf_extras.conf' that users can modify manually or outside of the module.
-
-2013-01-31 - jv <jeff@jeffvier.com>
-* Fix typo in README.pp for postgresql::db example
-
-2013-02-03 - Ken Barber <ken@bob.sh>
-* Add unit tests and travis-ci support
-
-2013-02-02 - Ken Barber <ken@bob.sh>
-* Add locale parameter support to the 'postgresql' class
-
-2013-01-21 - Michael Arnold <github@razorsedge.org>
-* Add a class for install the packages containing the PostgreSQL JDBC jar
-
-2013-02-06 - fhrbek <filip.hbrek@gmail.com>
-* Coding style fixes to reduce warnings in puppet-lint and Geppetto
-
-2013-02-10 - Ken Barber <ken@bob.sh>
-* Provide new defined resource for managing pg_hba.conf
-
-2013-02-11 - Ken Barber <ken@bob.sh>
-* Fix bug with reload of Postgresql on Redhat/Centos
-
-2013-02-15 - Erik Dalén <dalen@spotify.com>
-* Fix more style issues to reduce warnings in puppet-lint and Geppetto
-
-2013-02-15 - Erik Dalén <dalen@spotify.com>
-* Fix case whereby we were modifying a hash after creation
-
-
-##2.0.1
-
-Minor bugfix release.
-
-2013-01-16 - Chris Price <chris@puppetlabs.com>
- * Fix revoke command in database.pp to support postgres 8.1 (43ded42)
-
-2013-01-15 - Jordi Boggiano <j.boggiano@seld.be>
- * Add support for ubuntu 12.10 status (3504405)
-
-##2.0.0
-
-Many thanks to the following people who contributed patches to this
-release:
-
-* Adrien Thebo
-* Albert Koch
-* Andreas Ntaflos
-* Brett Porter
-* Chris Price
-* dharwood
-* Etienne Pelletier
-* Florin Broasca
-* Henrik
-* Hunter Haugen
-* Jari Bakken
-* Jordi Boggiano
-* Ken Barber
-* nzakaria
-* Richard Arends
-* Spenser Gilliland
-* stormcrow
-* William Van Hevelingen
-
-Notable features:
-
-   * Add support for versions of postgres other than the system default version
-     (which varies depending on OS distro).  This includes optional support for
-     automatically managing the package repo for the "official" postgres yum/apt
-     repos.  (Major thanks to Etienne Pelletier <epelletier@maestrodev.com> and
-     Ken Barber <ken@bob.sh> for their tireless efforts and patience on this
-     feature set!)  For example usage see `tests/official-postgresql-repos.pp`.
-
-   * Add some support for Debian Wheezy and Ubuntu Quantal
-
-   * Add new `postgres_psql` type with a Ruby provider, to replace the old
-     exec-based `psql` type.  This gives us much more flexibility around
-     executing SQL statements and controlling their logging / reports output.
-
-   * Major refactor of the "spec" tests--which are actually more like
-     acceptance tests.  We now support testing against multiple OS distros
-     via vagrant, and the framework is in place to allow us to very easily add
-     more distros.  Currently testing against Cent6 and Ubuntu 10.04.
-
-   * Fixed a bug that was preventing multiple databases from being owned by the
-     same user
-     (9adcd182f820101f5e4891b9f2ff6278dfad495c - Etienne Pelletier <epelletier@maestrodev.com>)
-
-   * Add support for ACLs for finer-grained control of user/interface access
-     (b8389d19ad78b4fb66024897097b4ed7db241930 - dharwood <harwoodd@cat.pdx.edu>)
-
-   * Many other bug fixes and improvements!
-
----
-##1.0.0
-
-2012-09-17 - Version 0.3.0 released
-
-2012-09-14 - Chris Price <chris@puppetlabs.com>
- * Add a type for validating a postgres connection (ce4a049)
-
-2012-08-25 - Jari Bakken <jari.bakken@gmail.com>
- * Remove trailing commas. (e6af5e5)
-
-2012-08-16 - Version 0.2.0 released
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Gemfile
deleted file mode 100644
index cb5deeccef1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Gemfile
+++ /dev/null
@@ -1,20 +0,0 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake'
-  gem 'pry',                    :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', '< 1.0'
-  gem 'puppet-lint', '~> 0.3.2'
-  gem 'beaker',                 :require => false
-  gem 'beaker-rspec',           :require => false
-  gem 'serverspec',             :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/LICENSE
deleted file mode 100644
index 7a29c73c878..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Modulefile
deleted file mode 100644
index e0e93541b3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name 'puppetlabs-postgresql'
-version '3.3.3'
-source 'git://github.com/puppetlabs/puppet-postgresql.git'
-author 'Inkling/Puppet Labs'
-description 'PostgreSQL defined resource types'
-summary 'PostgreSQL defined resource types'
-license 'ASL 2.0'
-project_page 'https://github.com/puppetlabs/puppet-postgresql'
-
-dependency 'puppetlabs/stdlib', '>=3.2.0 <5.0.0'
-dependency 'puppetlabs/firewall', '>= 0.0.4'
-dependency 'puppetlabs/apt', '>=1.1.0 <2.0.0'
-dependency 'puppetlabs/concat', '>= 1.0.0 <2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/NOTICE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/NOTICE
deleted file mode 100644
index c01b4637bc7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/NOTICE
+++ /dev/null
@@ -1,14 +0,0 @@
-Puppetlabs postgresql module
-
-Copyright 2012 Inkling Systems Inc
-Copyright 2012-2013 Puppet Labs Inc
-Copyright 2012-2013 Camptocamp SA.
-
-This product includes software developed by:
-  The Puppet Labs Inc (http://www.puppetlabs.com/).
-
-This product includes also software developed by:
-  Camptocamp SA (http://www.camptocamp.com/)
-
-This product includes also software developed by:
-  Inkling Systems Inc (https://www.inkling.com/)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/README.md
deleted file mode 100644
index 7a26cb9f4a2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/README.md
+++ /dev/null
@@ -1,901 +0,0 @@
-postgresql
-==========
-
-Table of Contents
------------------
-
-1. [Overview - What is the PostgreSQL module?](#overview)
-2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with PostgreSQL module](#setup)
-    * [PE 3.2 supported module](#pe-3.2-supported-module)
-    * [Configuring the server](#configuring-the-server) 
-4. [Usage - How to use the module for various tasks](#usage)
-5. [Upgrading - Guide for upgrading from older revisions of this module](#upgrading)
-6. [Reference - The classes, defines,functions and facts available in this module](#reference)
-7. [Limitations - OS compatibility, etc.](#limitations)
-8. [Development - Guide for contributing to the module](#development)
-9. [Disclaimer - Licensing information](#disclaimer)
-10. [Transfer Notice - Notice of authorship change](#transfer-notice)
-11. [Contributors - List of module contributors](#contributors)
-
-Overview
---------
-
-The PostgreSQL module allows you to easily manage postgres databases with Puppet.
-
-Module Description
--------------------
-
-PostgreSQL is a high-performance, free, open-source relational database server. The postgresql module allows you to manage PostgreSQL packages and services on several operating systems, while also supporting basic management of PostgreSQL databases and users. The module offers support for managing firewall for postgres ports on RedHat-based distros, as well as support for basic management of common security settings.
-
-Setup
------
-
-**What puppetlabs-PostgreSQL affects:**
-
-* package/service/configuration files for PostgreSQL
-* listened-to ports
-* system firewall (optional)
-* IP and mask (optional)
-
-**Introductory Questions**
-
-The postgresql module offers many security configuration settings. Before getting started, you will want to consider:
-
-* Do you want/need to allow remote connections?
-    * If yes, what about TCP connections?
-* Would you prefer to work around your current firewall settings or overwrite some of them?
-* How restrictive do you want the database superuser's permissions to be?
-
-Your answers to these questions will determine which of the module's parameters you'll want to specify values for.
-
-###PE 3.2 supported module
-
-PE 3.2 introduces Puppet Labs supported modules. The version of the postgresql module that ships within PE 3.2 is supported via normal [Puppet Enterprise support](http://puppetlabs.com/services/customer-support) channels. If you would like to access the [supported module](http://forge.puppetlabs.com/supported) version, you will need to uninstall the shipped module and install the supported version from the Puppet Forge. You can do this by first running
-
-    # puppet module uninstall puppetlabs-postgresql
-and then running
-
-    # puppet module install puppetlabs/postgresql
-
-###Configuring the server
-
-The main configuration you'll need to do will be around the `postgresql::server` class. The default parameters are reasonable, but fairly restrictive regarding permissions for who can connect and from where. To manage a PostgreSQL server with sane defaults:
-
-    class { 'postgresql::server': }
-
-For a more customized configuration:
-
-    class { 'postgresql::server':
-      ip_mask_deny_postgres_user => '0.0.0.0/32',
-      ip_mask_allow_all_users    => '0.0.0.0/0',
-      listen_addresses           => '*',
-      ipv4acls                   => ['hostssl all johndoe 192.168.0.0/24 cert'],
-      manage_firewall            => true,
-      postgres_password          => 'TPSrep0rt!',
-    }
-
-Once you've completed your configuration of `postgresql::server`, you can test out your settings from the command line:
-
-    $ psql -h localhost -U postgres
-    $ psql -h my.postgres.server -U
-
-If you get an error message from these commands, it means that your permissions are set in a way that restricts access from where you're trying to connect. That might be a good thing or a bad thing, depending on your goals.
-
-For more details about server configuration parameters consult the [PostgreSQL Runtime Configuration docs](http://www.postgresql.org/docs/9.2/static/runtime-config.html).
-
-Usage
------
-
-###Creating a database
-
-There are many ways to set up a postgres database using the `postgresql::server::db` class. For instance, to set up a database for PuppetDB:
-
-    class { 'postgresql::server': }
-
-    postgresql::server::db { 'mydatabasename':
-      user     => 'mydatabaseuser',
-      password => postgresql_password('mydatabaseuser', 'mypassword'),
-    }
-
-###Managing users, roles and permissions
-
-To manage users, roles and permissions:
-
-    class { 'postgresql::server': }
-
-    postgresql::server::role { 'marmot':
-      password_hash => postgresql_password('marmot', 'mypasswd'),
-    }
-
-    postgresql::server::database_grant { 'test1':
-      privilege => 'ALL',
-      db        => 'test1',
-      role      => 'marmot',
-    }
-
-    postgresql::server::table_grant { 'my_table of test2':
-      privilege => 'ALL',
-      table     => 'my_table',
-      db        => 'test2',
-      role      => 'marmot',
-    }
-
-In this example, you would grant ALL privileges on the test1 database and on the `my_table` table of the test2 database to the user or group specified by dan.
-
-At this point, you would just need to plunk these database name/username/password values into your PuppetDB config files, and you are good to go.
-
-Upgrading
----------
-
-###Upgrading from 2.x to version 3
-
-*Note:* if you are upgrading for 2.x, you *must* read this, as just about everything has changed.
-
-Version 3 was a major rewrite to fix some internal dependency issues, and to make the new Public API more clear. As a consequence a lot of things have changed for version 3 and older revisions that we will try to outline here.
-
-####Server specific objects now moved under `postgresql::server::` namespace
-
-To restructure server specific elements under the `postgresql::server::` namespaces the following objects were renamed as such:
-
-* `postgresql::database`       -> `postgresql::server::database`
-* `postgresql::database_grant` -> `postgresql::server::database_grant`
-* `postgresql::db`             -> `postgresql::server::db`
-* `postgresql::grant`          -> `postgresql::server::grant`
-* `postgresql::pg_hba_rule`    -> `postgresql::server::pg_hba_rule`
-* `postgresql::plperl`         -> `postgresql::server::plperl`
-* `postgresql::contrib`        -> `postgresql::server::contrib`
-* `postgresql::role`           -> `postgresql::server::role`
-* `postgresql::table_grant`    -> `postgresql::server::table_grant`
-* `postgresql::tablespace`     -> `postgresql::server::tablespace`
-
-####New `postgresql::server::config_entry` resource for managing configuration
-
-Previously we used the `file_line` resource to modify `postgresql.conf`. This new revision now adds a new resource named `postgresql::server::config_entry` for managing this file. For example:
-
-    postgresql::server::config_entry { 'check_function_bodies':
-      value => 'off',
-    }
-
-If you were using `file_line` for this purpose, you should change to this new methodology.
-
-####`postgresql_puppet_extras.conf` has been removed
-
-Now that we have a methodology for managing `postgresql.conf`, and due to concerns over the file management methodology using an `exec { 'touch ...': }` as a way to create an empty file the existing postgresql\_puppet\_extras.conf file is no longer managed by this module.
-
-If you wish to recreate this methodology yourself, use this pattern:
-
-    class { 'postgresql::server': }
-
-    $extras = "/tmp/include.conf"
-
-    file { $extras:
-      content => 'max_connections = 123',
-      notify  => Class['postgresql::server::service'],
-    }->
-    postgresql::server::config_entry { 'include':
-      value   => $extras,
-    }
-
-####All uses of the parameter `charset` changed to `encoding`
-
-Since PostgreSQL uses the terminology `encoding` not `charset` the parameter has been made consisent across all classes and resources.
-
-####The `postgresql` base class is no longer how you set globals
-
-The old global override pattern was less then optimal so it has been fixed, however we decided to demark this properly by specifying these overrides in the class `postgresql::globals`. Consult the documentation for this class now to see what options are available.
-
-Also, some parameter elements have been moved between this and the `postgresql::server` class where it made sense.
-
-####`config_hash` parameter collapsed for the `postgresql::server` class
-
-Because the `config_hash` was really passing data through to what was in effect an internal class (`postgresql::config`). And since we don't want this kind of internal exposure the parameters were collapsed up into the `postgresql::server` class directly.
-
-####Lots of changes to 'private' or 'undocumented' classes
-
-If you were using these before, these have changed names. You should only use what is documented in this README.md, and if you don't have what you need you should raise a patch to add that feature to a public API. All internal classes now have a comment at the top indicating them as private to make sure the message is clear that they are not supported as Public API.
-
-####`pg_hba_conf_defaults` parameter included to turn off default pg\_hba rules
-
-The defaults should be good enough for most cases (if not raise a bug) but if you simply need an escape hatch, this setting will turn off the defaults. If you want to do this, it may affect the rest of the module so make sure you replace the rules with something that continues operation.
-
-####`postgresql::database_user` has now been removed
-
-Use `postgresql::server::role` instead.
-
-####`postgresql::psql` resource has now been removed
-
-Use `postgresql_psql` instead. In the future we may recreate this as a wrapper to add extra capability, but it will not match the old behaviour.
-
-####`postgresql_default_version` fact has now been removed
-
-It didn't make sense to have this logic in a fact any more, the logic has been moved into `postgresql::params`.
-
-####`ripienaar/concat` is no longer used, instead we use `puppetlabs/concat`
-
-The older concat module is now deprecated and moved into the `puppetlabs/concat` namespace. Functionality is more or less identical, but you may need to intervene during the installing of this package - as both use the same `concat` namespace.
-
-Reference
----------
-
-The postgresql module comes with many options for configuring the server. While you are unlikely to use all of the below settings, they allow you a decent amount of control over your security settings.
-
-Classes:
-
-* [postgresql::client](#class-postgresqlclient)
-* [postgresql::globals](#class-postgresqlglobals)
-* [postgresql::lib::devel](#class-postgresqllibdevel)
-* [postgresql::lib::java](#class-postgresqllibjava)
-* [postgresql::lib::python](#class-postgresqllibpython)
-* [postgresql::server](#class-postgresqlserver)
-* [postgresql::server::plperl](#class-postgresqlserverplperl)
-* [postgresql::server::contrib](#class-postgresqlservercontrib)
-
-Resources:
-
-* [postgresql::server::config_entry](#resource-postgresqlserverconfigentry)
-* [postgresql::server::db](#resource-postgresqlserverdb)
-* [postgresql::server::database](#resource-postgresqlserverdatabase)
-* [postgresql::server::database_grant](#resource-postgresqlserverdatabasegrant)
-* [postgresql::server::pg_hba_rule](#resource-postgresqlserverpghbarule)
-* [postgresql::server::role](#resource-postgresqlserverrole)
-* [postgresql::server::table_grant](#resource-postgresqlservertablegrant)
-* [postgresql::server::tablespace](#resource-postgresqlservertablespace)
-* [postgresql::validate_db_connection](#resource-postgresqlvalidatedbconnection)
-
-Functions:
-
-* [postgresql\_password](#function-postgresqlpassword)
-* [postgresql\_acls\_to\_resources\_hash](#function-postgresqlaclstoresourceshashaclarray-id-orderoffset)
-
-
-###Class: postgresql::globals
-*Note:* most server specific defaults should be overriden in the `postgresql::server` class. This class should only be used if you are using a non-standard OS or if you are changing elements such as `version` or `manage_package_repo` that can only be changed here.
-
-This class allows you to configure the main settings for this module in a global way, to be used by the other classes and defined resources. On its own it does nothing.
-
-For example, if you wanted to overwrite the default `locale` and `encoding` for all classes you could use the following combination:
-
-    class { 'postgresql::globals':
-      encoding => 'UTF8',
-      locale   => 'en_NG',
-    }->
-    class { 'postgresql::server':
-    }
-
-That would make the `encoding` and `locale` the default for all classes and defined resources in this module.
-
-If you want to use the upstream PostgreSQL packaging, and be specific about the version you wish to download, you could use something like this:
-
-    class { 'postgresql::globals':
-      manage_package_repo => true,
-      version             => '9.2',
-    }->
-    class { 'postgresql::server': }
-
-####`client_package_name`
-This setting can be used to override the default postgresql client package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`server_package_name`
-This setting can be used to override the default postgresql server package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`contrib_package_name`
-This setting can be used to override the default postgresql contrib package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`devel_package_name`
-This setting can be used to override the default postgresql devel package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`java_package_name`
-This setting can be used to override the default postgresql java package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`plperl_package_name`
-This setting can be used to override the default postgresql PL/perl package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`python_package_name`
-This setting can be used to override the default postgresql Python package name. If not specified, the module will use whatever package name is the default for your OS distro.
-
-####`service_name`
-This setting can be used to override the default postgresql service name. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`service_provider`
-This setting can be used to override the default postgresql service provider. If not specified, the module will use whatever service provider is the default for your OS distro.
-
-####`service_status`
-This setting can be used to override the default status check command for your PostgreSQL service. If not specified, the module will use whatever service status is the default for your OS distro.
-
-####`default_database`
-This setting is used to specify the name of the default database to connect with. On most systems this will be "postgres".
-
-####`initdb_path`
-Path to the `initdb` command.
-
-####`createdb_path`
-Path to the `createdb` command.
-
-####`psql_path`
-Path to the `psql` command.
-
-####`pg_hba_conf_path`
-Path to your `pg\_hba.conf` file.
-
-####`postgresql_conf_path`
-Path to your `postgresql.conf` file.
-
-####`pg_hba_conf_defaults`
-If false, disables the defaults supplied with the module for `pg\_hba.conf`. This is useful if you disagree with the defaults and wish to override them yourself. Be sure that your changes of course align with the rest of the module, as some access is required to perform basic `psql` operations for example.
-
-####`datadir`
-This setting can be used to override the default postgresql data directory for the target platform. If not specified, the module will use whatever directory is the default for your OS distro.
-
-####`confdir`
-This setting can be used to override the default postgresql configuration directory for the target platform. If not specified, the module will use whatever directory is the default for your OS distro.
-
-####`bindir`
-This setting can be used to override the default postgresql binaries directory for the target platform. If not specified, the module will use whatever directory is the default for your OS distro.
-
-####`xlogdir`
-This setting can be used to override the default postgresql xlog directory. If not specified the module will use initdb's default path.
-
-####`user`
-This setting can be used to override the default postgresql super user and owner of postgresql related files in the file system. If not specified, the module will use the user name 'postgres'.
-
-####`group`
-This setting can be used to override the default postgresql user group to be used for related files in the file system. If not specified, the module will use the group name 'postgres'.
-
-####`version`
-The version of PostgreSQL to install/manage. This is a simple way of providing a specific version such as '9.2' or '8.4' for example.
-
-Defaults to your operating system default.
-
-####`needs_initdb`
-This setting can be used to explicitly call the initdb operation after server package is installed and before the postgresql service is started. If not specified, the module will decide whether to call initdb or not depending on your OS distro.
-
-####`encoding`
-This will set the default encoding encoding for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to the operating system default.
-
-####`locale`
-This will set the default database locale for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to `undef` which is effectively `C`.
-
-#####Debian
-
-On Debian you'll need to ensure that the 'locales-all' package is installed for full functionality of Postgres.
-
-####`firewall_supported`
-This allows you to override the automated detection to see if your OS supports the `firewall` module.
-
-####`manage_package_repo`
-If `true` this will setup the official PostgreSQL repositories on your host. Defaults to `false`.
-
-###Class: postgresql::server
-The following list are options that you can set in the `config_hash` parameter of `postgresql::server`.
-
-####`ensure`
-This value default to `present`. When set to `absent` it will remove all packages, configuration and data so use this with extreme caution.
-
-####`version`
-This will set the version of the PostgreSQL software to install. Defaults to your operating systems default.
-
-####`postgres_password`
-This value defaults to `undef`, meaning the super user account in the postgres database is a user called `postgres` and this account does not have a password. If you provide this setting, the module will set the password for the `postgres` user to your specified value.
-
-####`package_name`
-The name of the package to use for installing the server software. Defaults to the default for your OS distro.
-
-####`package_ensure`
-Value to pass through to the `package` resource when creating the server instance. Defaults to `undef`.
-
-####`plperl_package_name`
-This sets the default package name for the PL/Perl extension. Defaults to utilising the operating system default.
-
-####`service_name`
-This setting can be used to override the default postgresql service name. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`service_name`
-This setting can be used to override the default postgresql service provider. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`service_status`
-This setting can be used to override the default status check command for your PostgreSQL service. If not specified, the module will use whatever service name is the default for your OS distro.
-
-####`default_database`
-This setting is used to specify the name of the default database to connect with. On most systems this will be "postgres".
-
-####`listen_addresses`
-This value defaults to `localhost`, meaning the postgres server will only accept connections from localhost. If you'd like to be able to connect to postgres from remote machines, you can override this setting. A value of `*` will tell postgres to accept connections from any remote machine. Alternately, you can specify a comma-separated list of hostnames or IP addresses. (For more info, have a look at the `postgresql.conf` file from your system's postgres package).
-
-####`ip_mask_deny_postgres_user`
-This value defaults to `0.0.0.0/0`. Sometimes it can be useful to block the superuser account from remote connections if you are allowing other database users to connect remotely. Set this to an IP and mask for which you want to deny connections by the postgres superuser account. So, e.g., the default value of `0.0.0.0/0` will match any remote IP and deny access, so the postgres user won't be able to connect remotely at all. Conversely, a value of `0.0.0.0/32` would not match any remote IP, and thus the deny rule will not be applied and the postgres user will be allowed to connect.
-
-####`ip_mask_allow_all_users`
-This value defaults to `127.0.0.1/32`. By default, Postgres does not allow any database user accounts to connect via TCP from remote machines. If you'd like to allow them to, you can override this setting. You might set it to `0.0.0.0/0` to allow database users to connect from any remote machine, or `192.168.0.0/16` to allow connections from any machine on your local 192.168 subnet.
-
-####`ipv4acls`
-List of strings for access control for connection method, users, databases, IPv4 addresses; see [postgresql documentation](http://www.postgresql.org/docs/9.2/static/auth-pg-hba-conf.html) about `pg_hba.conf` for information (please note that the link will take you to documentation for the most recent version of Postgres, however links for earlier versions can be found on that page).
-
-####`ipv6acls`
-List of strings for access control for connection method, users, databases, IPv6 addresses; see [postgresql documentation](http://www.postgresql.org/docs/9.2/static/auth-pg-hba-conf.html) about `pg_hba.conf` for information (please note that the link will take you to documentation for the most recent version of Postgres, however links for earlier versions can be found on that page).
-
-####`initdb_path`
-Path to the `initdb` command.
-
-####`createdb_path`
-Path to the `createdb` command.
-
-####`psql_path`
-Path to the `psql` command.
-
-####`pg_hba_conf_path`
-Path to your `pg\_hba.conf` file.
-
-####`postgresql_conf_path`
-Path to your `postgresql.conf` file.
-
-####`pg_hba_conf_defaults`
-If false, disables the defaults supplied with the module for `pg\_hba.conf`. This is useful if you di
-sagree with the defaults and wish to override them yourself. Be sure that your changes of course alig
-n with the rest of the module, as some access is required to perform basic `psql` operations for exam
-ple.
-
-####`user`
-This setting can be used to override the default postgresql super user and owner of postgresql related files in the file system. If not specified, the module will use the user name 'postgres'.
-
-####`group`
-This setting can be used to override the default postgresql user group to be used for related files in the file system. If not specified, the module will use the group name 'postgres'.
-
-####`needs_initdb`
-This setting can be used to explicitly call the initdb operation after server package is installed and before the postgresql service is started. If not specified, the module will decide whether to call initdb or not depending on your OS distro.
-
-####`encoding`
-This will set the default encoding encoding for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to the operating system default.
-
-####`locale`
-This will set the default database locale for all databases created with this module. On certain operating systems this will be used during the `template1` initialization as well so it becomes a default outside of the module as well. Defaults to `undef` which is effectively `C`.
-
-#####Debian
-
-On Debian you'll need to ensure that the 'locales-all' package is installed for full functionality of Postgres.
-
-####`manage_firewall`
-This value defaults to `false`. Many distros ship with a fairly restrictive firewall configuration which will block the port that postgres tries to listen on. If you'd like for the puppet module to open this port for you (using the [puppetlabs-firewall](http://forge.puppetlabs.com/puppetlabs/firewall) module), change this value to true. Check the documentation for `puppetlabs/firewall` to ensure the rest of the global setup is applied, to ensure things like persistence and global rules are set correctly.
-
-####`manage_pg_hba_conf`
-This value defaults to `true`. Whether or not manage the pg_hba.conf. If set to `true`, puppet will overwrite this file. If set to `false`, puppet will not modify the file.
-
-
-###Class: postgresql::client
-
-This class installs postgresql client software. Alter the following parameters if you have a custom version you would like to install (Note: don't forget to make sure to add any necessary yum or apt repositories if specifying a custom version):
-
-####`package_name`
-The name of the postgresql client package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql client package resource.
-
-
-###Class: postgresql::server::contrib
-Installs the postgresql contrib package.
-
-####`package_name`
-The name of the postgresql contrib package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql contrib package resource.
-
-
-###Class: postgresql::lib::devel
-Installs the packages containing the development libraries for PostgreSQL.
-
-####`package_ensure`
-Override for the `ensure` parameter during package installation. Defaults to `present`.
-
-####`package_name`
-Overrides the default package name for the distribution you are installing to. Defaults to `postgresql-devel` or `postgresql<version>-devel` depending on your distro.
-
-
-###Class: postgresql::lib::java
-This class installs postgresql bindings for Java (JDBC). Alter the following parameters if you have a custom version you would like to install (Note: don't forget to make sure to add any necessary yum or apt repositories if specifying a custom version):
-
-####`package_name`
-The name of the postgresql java package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql java package resource.
-
-
-###Class: postgresql::lib::python
-This class installs the postgresql Python libraries. For customer requirements you can customise the following parameters:
-
-####`package_name`
-The name of the postgresql python package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql python package resource.
-
-
-###Class: postgresql::server::plperl
-This class installs the PL/Perl procedural language for postgresql.
-
-####`package_name`
-The name of the postgresql PL/Perl package.
-
-####`package_ensure`
-The ensure parameter passed on to postgresql PL/Perl package resource.
-
-
-###Resource: postgresql::server::config\_entry
-This resource can be used to modify your `postgresql.conf` configuration file.
-
-Each resource maps to a line inside your `postgresql.conf` file, for example:
-
-    postgresql::server::config_entry { 'check_function_bodies':
-      value => 'off',
-    }
-
-####`namevar`
-Name of the setting to change.
-
-####`ensure`
-Set to `absent` to remove an entry.
-
-####`value`
-Value for the setting.
-
-
-###Resource: postgresql::server::db
-This is a convenience resource that creates a database, user and assigns necessary permissions in one go.
-
-For example, to create a database called `test1` with a corresponding user of the same name, you can use:
-
-    postgresql::server::db { 'test1':
-      user     => 'test1',
-      password => 'test1',
-    }
-
-####`namevar`
-The namevar for the resource designates the name of the database.
-
-####`user`
-User to create and assign access to the database upon creation. Mandatory.
-
-####`password`
-Password for the created user. Mandatory.
-
-####`encoding`
-Override the character set during creation of the database. Defaults to the default defined during installation.
-
-####`locale`
-Override the locale during creation of the database. Defaults to the default defined during installation.
-
-####`grant`
-Grant permissions during creation. Defaults to `ALL`.
-
-####`tablespace`
-The name of the tablespace to allocate this database to. If not specifies, it defaults to the PostgreSQL default.
-
-####`istemplate`
-Define database as a template. Defaults to `false`.
-
-
-###Resource: postgresql::server::database
-This defined type can be used to create a database with no users and no permissions, which is a rare use case.
-
-####`namevar`
-The name of the database to create.
-
-####`dbname`
-The name of the database, defaults to the namevar.
-
-####`owner`
-Name of the database user who should be set as the owner of the database. Defaults to the $user variable set in `postgresql::server` or `postgresql::globals`.
-
-####`tablespace`
-Tablespace for where to create this database. Defaults to the defaults defined during PostgreSQL installation.
-
-####`encoding`
-Override the character set during creation of the database. Defaults to the default defined during installation.
-
-####`locale`
-Override the locale during creation of the database. Defaults to the default defined during installation.
-
-####`istemplate`
-Define database as a template. Defaults to `false`.
-
-
-###Resource: postgresql::server::database\_grant
-This defined type manages grant based access privileges for users, wrapping the `postgresql::server::database_grant` for database specific permissions. Consult the PostgreSQL documentation for `grant` for more information.
-
-####`namevar`
-Used to uniquely identify this resource, but functionality not used during grant.
-
-####`privilege`
-Can be one of `SELECT`, `TEMPORARY`, `TEMP`, `CONNECT`. `ALL` is used as a synonym for `CREATE`. If you need to add multiple privileges, a space delimited string can be used.
-
-####`db`
-Database to grant access to.
-
-####`role`
-Role or user whom you are granting access for.
-
-####`psql_db`
-Database to execute the grant against. This should not ordinarily be changed from the default, which is `postgres`.
-
-####`psql_user`
-OS user for running `psql`. Defaults to the default user for the module, usually `postgres`.
-
-
-###Resource: postgresql::server::pg\_hba\_rule
-This defined type allows you to create an access rule for `pg_hba.conf`. For more details see the [PostgreSQL documentation](http://www.postgresql.org/docs/8.2/static/auth-pg-hba-conf.html).
-
-For example:
-
-    postgresql::server::pg_hba_rule { 'allow application network to access app database':
-      description => "Open up postgresql for access from 200.1.2.0/24",
-      type => 'host',
-      database => 'app',
-      user => 'app',
-      address => '200.1.2.0/24',
-      auth_method => 'md5',
-    }
-
-This would create a ruleset in `pg_hba.conf` similar to:
-
-    # Rule Name: allow application network to access app database
-    # Description: Open up postgresql for access from 200.1.2.0/24
-    # Order: 150
-    host  app  app  200.1.2.0/24  md5
-
-####`namevar`
-A unique identifier or short description for this rule. The namevar doesn't provide any functional usage, but it is stored in the comments of the produced `pg_hba.conf` so the originating resource can be identified.
-
-####`description`
-A longer description for this rule if required. Defaults to `none`. This description is placed in the comments above the rule in `pg_hba.conf`.
-
-####`type`
-The type of rule, this is usually one of: `local`, `host`, `hostssl` or `hostnossl`.
-
-####`database`
-A comma separated list of databases that this rule matches.
-
-####`user`
-A comma separated list of database users that this rule matches.
-
-####`address`
-If the type is not 'local' you can provide a CIDR based address here for rule matching.
-
-####`auth_method`
-The `auth_method` is described further in the `pg_hba.conf` documentation, but it provides the method that is used for authentication for the connection that this rule matches.
-
-####`auth_option`
-For certain `auth_method` settings there are extra options that can be passed. Consult the PostgreSQL `pg_hba.conf` documentation for further details.
-
-####`order`
-An order for placing the rule in `pg_hba.conf`. Defaults to `150`.
-
-####`target`
-This provides the target for the rule, and is generally an internal only property. Use with caution.
-
-
-###Resource: postgresql::server::role
-This resource creates a role or user in PostgreSQL.
-
-####`namevar`
-The role name to create.
-
-####`password_hash`
-The hash to use during password creation. If the password is not already pre-encrypted in a format that PostgreSQL supports, use the `postgresql_password` function to provide an MD5 hash here, for example:
-
-    postgresql::role { "myusername":
-      password_hash => postgresql_password('myusername', 'mypassword'),
-    }
-
-####`createdb`
-Whether to grant the ability to create new databases with this role. Defaults to `false`.
-
-####`createrole`
-Whether to grant the ability to create new roles with this role. Defaults to `false`.
-
-####`login`
-Whether to grant login capability for the new role. Defaults to `false`.
-
-####`superuser`
-Whether to grant super user capability for the new role. Defaults to `false`.
-
-####`replication`
-If `true` provides replication capabilities for this role. Defaults to `false`.
-
-####`connection_limit`
-Specifies how many concurrent connections the role can make. Defaults to `-1` meaning no limit.
-
-####`username`
-The username of the role to create, defaults to `namevar`.
-
-
-###Resource: postgresql::server::table\_grant
-This defined type manages grant based access privileges for users. Consult the PostgreSQL documentation for `grant` for more information.
-
-####`namevar`
-Used to uniquely identify this resource, but functionality not used during grant.
-
-####`privilege`
-Can be one of `SELECT`, `INSERT`, `UPDATE`, `REFERENCES`. `ALL` is used as a synonym for `CREATE`. If you need to add multiple privileges, a space delimited string can be used.
-
-####`table`
-Table to grant access on.
-
-####`db`
-Database of table.
-
-####`role`
-Role or user whom you are granting access for.
-
-####`psql_db`
-Database to execute the grant against. This should not ordinarily be changed from the default, which is `postgres`.
-
-####`psql_user`
-OS user for running `psql`. Defaults to the default user for the module, usually `postgres`.
-
-
-###Resource: postgresql::server::tablespace
-This defined type can be used to create a tablespace. For example:
-
-    postgresql::tablespace { 'tablespace1':
-      location => '/srv/space1',
-    }
-
-It will create the location if necessary, assigning it the same permissions as your
-PostgreSQL server.
-
-####`namevar`
-The tablespace name to create.
-
-####`location`
-The path to locate this tablespace.
-
-####`owner`
-The default owner of the tablespace.
-
-####`spcname`
-Name of the tablespace. Defaults to `namevar`.
-
-
-###Resource: postgresql::validate\_db\_connection
-This resource can be utilised inside composite manifests to validate that a client has a valid connection with a remote PostgreSQL database. It can be ran from any node where the PostgreSQL client software is installed to validate connectivity before commencing other dependent tasks in your Puppet manifests, so it is often used when chained to other tasks such as: starting an application server, performing a database migration.
-
-Example usage:
-
-    postgresql::validate_db_connection { 'validate my postgres connection':
-      database_host           => 'my.postgres.host',
-      database_username       => 'mydbuser',
-      database_password       => 'mydbpassword',
-      database_name           => 'mydbname',
-    }->
-    exec { 'rake db:migrate':
-      cwd => '/opt/myrubyapp',
-    }
-
-####`namevar`
-Uniquely identify this resource, but functionally does nothing.
-
-####`database_host`
-The hostname of the database you wish to test. Defaults to 'undef' which generally uses the designated local unix socket.
-
-####`database_port`
-Port to use when connecting. Default to 'undef' which generally defaults to 5432 depending on your PostgreSQL packaging.
-
-####`database_name`
-The name of the database you wish to test. Defaults to 'postgres'.
-
-####`database_username`
-Username to connect with. Defaults to 'undef', which when using a unix socket and ident auth will be the user you are running as. If the host is remote you must provide a username.
-
-####`database_password`
-Password to connect with. Can be left blank, but that is not recommended.
-
-####`run_as`
-The user to run the `psql` command with for authenticiation. This is important when trying to connect to a database locally using Unix sockets and `ident` authentication. It is not needed for remote testing.
-
-####`sleep`
-Upon failure, sets the number of seconds to sleep for before trying again.
-
-####`tries`
-Upon failure, sets the number of attempts before giving up and failing the resource.
-
-####`create_db_first`
-This will ensure the database is created before running the test. This only really works if your test is local. Defaults to `true`.
-
-
-###Function: postgresql\_password
-If you need to generate a postgres encrypted password, use `postgresql_password`. You can call it from your production manifests if you don't mind them containing the clear text versions of your passwords, or you can call it from the command line and then copy and paste the encrypted password into your manifest:
-
-    $ puppet apply --execute 'notify { "test": message => postgresql_password("username", "password") }'
-
-###Function: postgresql\_acls\_to\_resources\_hash(acl\_array, id, order\_offset)
-This internal function converts a list of `pg_hba.conf` based acls (passed in as an array of strings) to a format compatible with the `postgresql::pg_hba_rule` resource.
-
-**This function should only be used internally by the module**.
-
-Limitations
-------------
-
-Works with versions of PostgreSQL from 8.1 through 9.2.
-
-Current it is only actively tested with the following operating systems:
-
-* Debian 6.x and 7.x
-* Centos 5.x and 6.x
-* Ubuntu 10.04 and 12.04
-
-Although patches are welcome for making it work with other OS distros, it is considered best effort.
-
-Development
-------------
-
-Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We can't access the huge number of platforms and myriad of hardware, software, and deployment configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Tests
-
-There are two types of tests distributed with the module. Unit tests with rspec-puppet and system tests using rspec-system.
-
-For unit testing, make sure you have:
-
-* rake
-* bundler
-
-Install the necessary gems:
-
-    bundle install --path=vendor
-
-And then run the unit tests:
-
-    bundle exec rake spec
-
-The unit tests are ran in Travis-CI as well, if you want to see the results of your own tests regsiter the service hook through Travis-CI via the accounts section for your Github clone of this project.
-
-If you want to run the system tests, make sure you also have:
-
-* vagrant > 1.2.x
-* Virtualbox > 4.2.10
-
-Then run the tests using:
-
-    bundle exec rake spec:system
-
-To run the tests on different operating systems, see the sets available in .nodeset.yml and run the specific set with the following syntax:
-
-    RSPEC_SET=debian-607-x64 bundle exec rake spec:system
-
-Transfer Notice
-----------------
-
-This Puppet module was originally authored by Inkling Systems. The maintainer preferred that Puppet Labs take ownership of the module for future improvement and maintenance as Puppet Labs is using it in the PuppetDB module.  Existing pull requests and issues were transferred over, please fork and continue to contribute here instead of Inkling.
-
-Previously: [https://github.com/inkling/puppet-postgresql](https://github.com/inkling/puppet-postgresql)
-
-Contributors
-------------
-
- * Andrew Moon
- * [Kenn Knowles](https://github.com/kennknowles) ([@kennknowles](https://twitter.com/KennKnowles))
- * Adrien Thebo
- * Albert Koch
- * Andreas Ntaflos
- * Bret Comnes
- * Brett Porter
- * Chris Price
- * dharwood
- * Etienne Pelletier
- * Florin Broasca
- * Henrik
- * Hunter Haugen
- * Jari Bakken
- * Jordi Boggiano
- * Ken Barber
- * nzakaria
- * Richard Arends
- * Spenser Gilliland
- * stormcrow
- * William Van Hevelingen
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Rakefile
deleted file mode 100644
index 3e7d0059ebc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/Rakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-
-Bundler.require :default
-
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-task :default do
-  sh %{rake -T}
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG
deleted file mode 100644
index 065274e0d9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/RPM-GPG-KEY-PGDG
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr
-BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a
-9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo
-tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee
-Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn
-XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr
-peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt
-L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9
-KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR
-TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu
-ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
-AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ
-8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6
-ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6
-dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3
-nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04
-K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/
-z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl
-u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v
-OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz
-FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN
-VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd
-l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad
-GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y
-1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA==
-=au6K
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh
deleted file mode 100644
index f126d99be4b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/files/validate_postgresql_connection.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# usage is: validate_db_connection 2 50 psql
-
-SLEEP=$1
-TRIES=$2
-PSQL=$3
-
-STATE=1
-
-for (( c=1; c<=$TRIES; c++ ))
-do
-  echo $c
-  if [ $c -gt 1 ]
-  then
-    echo 'sleeping'
-    sleep $SLEEP
-  fi
-
-  /bin/echo "SELECT 1" | $PSQL
-  STATE=$?
-
-  if [ $STATE -eq 0 ]
-  then
-    exit 0
-  fi
-done
-
-echo 'Unable to connect to postgresql'
-
-exit 1
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb
deleted file mode 100644
index 7fa785486c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_acls_to_resources_hash.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:postgresql_acls_to_resources_hash, :type => :rvalue, :doc => <<-EOS
-    This internal function translates the ipv(4|6)acls format into a resource
-    suitable for create_resources. It is not intended to be used outside of the
-    postgresql internal classes/defined resources.
-
-    This function accepts an array of strings that are pg_hba.conf rules. It
-    will return a hash that can be fed into create_resources to create multiple
-    individual pg_hba_rule resources.
-
-    The second parameter is an identifier that will be included in the namevar
-    to provide uniqueness. It must be a string.
-
-    The third parameter is an order offset, so you can start the order at an
-    arbitrary starting point.
-    EOS
-  ) do |args|
-    func_name = "postgresql_acls_to_resources_hash()"
-
-    raise(Puppet::ParseError, "#{func_name}: Wrong number of arguments " +
-      "given (#{args.size} for 3)") if args.size != 3
-
-    acls = args[0]
-    raise(Puppet::ParseError, "#{func_name}: first argument must be an array") \
-      unless acls.instance_of? Array
-
-    id = args[1]
-    raise(Puppet::ParseError, "#{func_name}: second argument must be a string") \
-      unless id.instance_of? String
-
-    offset = args[2].to_i
-    raise(Puppet::ParseError, "#{func_name}: third argument must be a number") \
-      unless offset.instance_of? Fixnum
-
-    resources = {}
-    acls.each do |acl|
-      index = acls.index(acl)
-
-      parts = acl.split
-
-      raise(Puppet::ParseError, "#{func_name}: acl line #{index} does not " +
-        "have enough parts") unless parts.length >= 4
-
-      resource = {
-        'type' => parts[0],
-        'database' => parts[1],
-        'user' => parts[2],
-        'order' => format('%03d', offset + index),
-      }
-      if parts[0] == 'local' then
-        resource['auth_method'] = parts[3]
-        if parts.length > 4 then
-          resource['auth_option'] = parts.last(parts.length - 4).join(" ")
-        end
-      else
-        if parts[4] =~ /^\d/
-          resource['address'] = parts[3] + ' ' + parts[4]
-          resource['auth_method'] = parts[5]
-
-          if parts.length > 6 then
-            resource['auth_option'] = parts.last(parts.length - 6).join(" ")
-          end
-        else
-          resource['address'] = parts[3]
-          resource['auth_method'] = parts[4]
-
-          if parts.length > 5 then
-            resource['auth_option'] = parts.last(parts.length - 5).join(" ")
-          end
-        end
-      end
-      resources["postgresql class generated rule #{id} #{index}"] = resource
-    end
-    resources
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb
deleted file mode 100644
index 4089a4e94de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_escape.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'digest/md5'
-
-module Puppet::Parser::Functions
-  newfunction(:postgresql_escape, :type => :rvalue, :doc => <<-EOS
-    Safely escapes a string using $$ using a random tag which should be consistent
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "postgresql_escape(): Wrong number of arguments " +
-      "given (#{args.size} for 1)") if args.size != 1
-
-    password = args[0]
-
-    if password !~ /\$\$/ 
-      retval = "$$#{password}$$"
-    else
-      escape = Digest::MD5.hexdigest(password)[0..5].gsub(/\d/,'')
-      until password !~ /#{escape}/
-        escape = Digest::MD5.hexdigest(escape)[0..5].gsub(/\d/,'')
-      end
-      retval = "$#{escape}$#{password}$#{escape}$"
-    end
-    retval 
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb
deleted file mode 100644
index 0689e0e5b0f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/parser/functions/postgresql_password.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# hash a string as mysql's "PASSWORD()" function would do it
-require 'digest/md5'
-
-module Puppet::Parser::Functions
-  newfunction(:postgresql_password, :type => :rvalue, :doc => <<-EOS
-    Returns the postgresql password hash from the clear text username / password.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "postgresql_password(): Wrong number of arguments " +
-      "given (#{args.size} for 2)") if args.size != 2
-
-    username = args[0]
-    password = args[1]
-
-    'md5' + Digest::MD5.hexdigest(password + username)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb
deleted file mode 100644
index c9366b52003..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_conf/parsed.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'puppet/provider/parsedfile'
-
-Puppet::Type.type(:postgresql_conf).provide(
-  :parsed,
-  :parent => Puppet::Provider::ParsedFile,
-  :default_target => '/etc/postgresql.conf',
-  :filetype => :flat
-) do
-  desc "Set key/values in postgresql.conf."
-
-  text_line :comment, :match => /^\s*#/
-  text_line :blank, :match => /^\s*$/
-
-  record_line :parsed,
-    :fields   => %w{name value comment},
-    :optional => %w{comment},
-    :match    => /^\s*([\w\.]+)\s*=?\s*(.*?)(?:\s*#\s*(.*))?\s*$/,
-    :to_line  => proc { |h|
-
-      # simple string and numeric values don't need to be enclosed in quotes
-      dontneedquote = h[:value].match(/^(\w+|[0-9.-]+)$/)
-      dontneedequal = h[:name].match(/^(include|include_if_exists)$/i)
-
-      str =  h[:name].downcase # normalize case
-      str += dontneedequal ? ' ' : ' = '
-      str += "'" unless dontneedquote && !dontneedequal
-      str += h[:value]
-      str += "'" unless dontneedquote && !dontneedequal
-      str += " # #{h[:comment]}" unless (h[:comment].nil? or h[:comment] == :absent)
-      str
-    },
-    :post_parse => proc { |h|
-      h[:name].downcase! # normalize case
-      h[:value].gsub!(/(^'|'$)/, '') # strip out quotes
-    }
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb
deleted file mode 100644
index b86fb62a6e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/provider/postgresql_psql/ruby.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-Puppet::Type.type(:postgresql_psql).provide(:ruby) do
-
-  def command()
-    if ((! resource[:unless]) or (resource[:unless].empty?))
-      if (resource.refreshonly?)
-        # So, if there's no 'unless', and we're in "refreshonly" mode,
-        # we need to return the target command here.  If we don't,
-        # then Puppet will generate an event indicating that this
-        # property has changed.
-        return resource[:command]
-      end
-
-      # if we're not in refreshonly mode, then we return nil,
-      # which will cause Puppet to sync this property.  This
-      # is what we want if there is no 'unless' value specified.
-      return nil
-    end
-
-    if Puppet::PUPPETVERSION.to_f < 4
-      output, status = run_unless_sql_command(resource[:unless])
-    else
-      output = run_unless_sql_command(resource[:unless])
-      status = output.exitcode
-    end
-
-    if status != 0
-      puts status
-      self.fail("Error evaluating 'unless' clause: '#{output}'")
-    end
-    result_count = output.strip.to_i
-    if result_count > 0
-      # If the 'unless' query returned rows, then we don't want to execute
-      # the 'command'.  Returning the target 'command' here will cause
-      # Puppet to treat this property as already being 'insync?', so it
-      # won't call the setter to run the 'command' later.
-      return resource[:command]
-    end
-
-    # Returning 'nil' here will cause Puppet to see this property
-    # as out-of-sync, so it will call the setter later.
-    nil
-  end
-
-  def command=(val)
-    output, status = run_sql_command(val)
-
-    if status != 0
-      self.fail("Error executing SQL; psql returned #{status}: '#{output}'")
-    end
-  end
-
-
-  def run_unless_sql_command(sql)
-    # for the 'unless' queries, we wrap the user's query in a 'SELECT COUNT',
-    # which makes it easier to parse and process the output.
-    run_sql_command('SELECT COUNT(*) FROM (' <<  sql << ') count')
-  end
-
-  def run_sql_command(sql)
-    if resource[:search_path]
-      sql = "set search_path to #{Array(resource[:search_path]).join(',')}; #{sql}"
-    end
-
-    command = [resource[:psql_path]]
-    command.push("-d", resource[:db]) if resource[:db]
-    command.push("-t", "-c", sql)
-
-    if resource[:cwd]
-      Dir.chdir resource[:cwd] do
-        run_command(command, resource[:psql_user], resource[:psql_group])
-      end
-    else
-      run_command(command, resource[:psql_user], resource[:psql_group])
-    end
-  end
-
-  def run_command(command, user, group)
-    if Puppet::PUPPETVERSION.to_f < 3.4
-      Puppet::Util::SUIDManager.run_and_capture(command, user, group)
-    else
-      output = Puppet::Util::Execution.execute(command, {
-        :uid                => user,
-        :gid                => group,
-        :failonfail         => false,
-        :combine            => true,
-        :override_locale    => true,
-        :custom_environment => {}
-      })
-      [output, $CHILD_STATUS.dup]
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb
deleted file mode 100644
index f227fd7824d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_conf.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Puppet
-  newtype(:postgresql_conf) do
-
-    @doc = "This type allows puppet to manage postgresql.conf parameters."
-
-    ensurable
-
-    newparam(:name) do
-      desc "The postgresql parameter name to manage."
-      isnamevar
-
-      newvalues(/^[\w\.]+$/)
-    end
-
-    newproperty(:value) do
-      desc "The value to set for this parameter."
-    end
-
-    newproperty(:target) do
-      desc "The path to postgresql.conf"
-      defaultto {
-        if @resource.class.defaultprovider.ancestors.include?(Puppet::Provider::ParsedFile)
-          @resource.class.defaultprovider.default_target
-        else
-          nil
-        end
-      }
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb
deleted file mode 100644
index 8646914d6e3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/lib/puppet/type/postgresql_psql.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-Puppet::Type.newtype(:postgresql_psql) do
-
-  newparam(:name) do
-    desc "An arbitrary tag for your own reference; the name of the message."
-    isnamevar
-  end
-
-  newproperty(:command) do
-    desc 'The SQL command to execute via psql.'
-
-    defaultto { @resource[:name] }
-
-    def sync(refreshing = false)
-      # We're overriding 'sync' here in order to do some magic
-      # in support of providing a 'refreshonly' parameter.  This
-      # is kind of hacky because the logic for 'refreshonly' is
-      # spread between the type and the provider, but this is
-      # the least horrible way that I could determine to accomplish
-      # it.
-      #
-      # Note that our overridden version of 'sync' takes a parameter,
-      # 'refreshing', which the parent version doesn't take.  This
-      # allows us to call the sync method directly from the 'refresh'
-      # method, and then inside of the body of 'sync' we can tell
-      # whether or not we're refreshing.
-
-      if (!@resource.refreshonly? || refreshing)
-        # If we're not in 'refreshonly' mode, or we're not currently
-        # refreshing, then we just call the parent method.
-        super()
-      else
-        # If we get here, it means we're in 'refreshonly' mode and
-        # we're not being called by the 'refresh' method, so we
-        # just no-op.  We'll be called again by the 'refresh'
-        # method momentarily.
-        nil
-      end
-    end
-  end
-
-  newparam(:unless) do
-    desc "An optional SQL command to execute prior to the main :command; " +
-        "this is generally intended to be used for idempotency, to check " +
-        "for the existence of an object in the database to determine whether " +
-        "or not the main SQL command needs to be executed at all."
-  end
-
-  newparam(:db) do
-    desc "The name of the database to execute the SQL command against."
-  end
-
-  newparam(:search_path) do
-    desc "The schema search path to use when executing the SQL command"
-  end
-
-  newparam(:psql_path) do
-    desc "The path to psql executable."
-    defaultto("psql")
-  end
-
-  newparam(:psql_user) do
-    desc "The system user account under which the psql command should be executed."
-    defaultto("postgres")
-  end
-
-  newparam(:psql_group) do
-    desc "The system user group account under which the psql command should be executed."
-    defaultto("postgres")
-  end
-
-  newparam(:cwd, :parent => Puppet::Parameter::Path) do
-    desc "The working directory under which the psql command should be executed."
-    defaultto("/tmp")
-  end
-
-  newparam(:refreshonly, :boolean => true) do
-    desc "If 'true', then the SQL will only be executed via a notify/subscribe event."
-
-    defaultto(:false)
-    newvalues(:true, :false)
-  end
-
-  def refresh()
-    # All of the magic for this type is attached to the ':command' property, so
-    # we just need to sync it to accomplish a 'refresh'.
-    self.property(:command).sync(true)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/client.pp
deleted file mode 100644
index bdb821d73bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/client.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Install client cli tool. See README.md for more details.
-class postgresql::client (
-  $package_name   = $postgresql::params::client_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-  validate_string($package_name)
-
-  package { 'postgresql-client':
-    ensure  => $package_ensure,
-    name    => $package_name,
-    tag     => 'postgresql',
-  }
-
-  $file_ensure = $package_ensure ? {
-    'present' => 'file',
-    true      => 'file',
-    'absent'  => 'absent',
-    false     => 'absent',
-    default   => 'file',
-  }
-  file { "/usr/local/bin/validate_postgresql_connection.sh":
-    ensure => $file_ensure,
-    source => "puppet:///modules/postgresql/validate_postgresql_connection.sh",
-    owner  => 0,
-    group  => 0,
-    mode   => 0755,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/globals.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/globals.pp
deleted file mode 100644
index ebc117d47ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/globals.pp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Class for setting cross-class global overrides. See README.md for more
-# details.
-class postgresql::globals (
-  $ensure               = undef,
-
-  $client_package_name  = undef,
-  $server_package_name  = undef,
-  $contrib_package_name = undef,
-  $devel_package_name   = undef,
-  $java_package_name    = undef,
-  $plperl_package_name  = undef,
-  $python_package_name  = undef,
-
-  $service_name         = undef,
-  $service_provider     = undef,
-  $service_status       = undef,
-  $default_database     = undef,
-
-  $initdb_path          = undef,
-  $createdb_path        = undef,
-  $psql_path            = undef,
-  $pg_hba_conf_path     = undef,
-  $postgresql_conf_path = undef,
-
-  $pg_hba_conf_defaults = undef,
-
-  $datadir              = undef,
-  $confdir              = undef,
-  $bindir               = undef,
-  $xlogdir              = undef,
-
-  $user                 = undef,
-  $group                = undef,
-
-  $version              = undef,
-
-  $needs_initdb         = undef,
-
-  $encoding             = undef,
-  $locale               = undef,
-
-  $manage_firewall      = undef,
-  $manage_pg_hba_conf   = undef,
-  $firewall_supported   = undef,
-
-  $manage_package_repo  = undef
-) {
-  # We are determining this here, because it is needed by the package repo
-  # class.
-  $default_version = $::osfamily ? {
-    /^(RedHat|Linux)/ => $::operatingsystem ? {
-      'Fedora' => $::operatingsystemrelease ? {
-        /^(18|19|20)$/ => '9.2',
-        /^(17)$/ => '9.1',
-        default => undef,
-      },
-      'Amazon' => '9.2',
-      default => $::operatingsystemrelease ? {
-        /^6\./ => '8.4',
-        /^5\./ => '8.1',
-        default => undef,
-      },
-    },
-    'Debian' => $::operatingsystem ? {
-      'Debian' => $::operatingsystemrelease ? {
-        /^6\./ => '8.4',
-        /^(wheezy|7\.)/ => '9.1',
-        default => undef,
-      },
-      'Ubuntu' => $::operatingsystemrelease ? {
-        /^(14.04)$/ => '9.3',
-        /^(11.10|12.04|12.10|13.04|13.10)$/ => '9.1',
-        /^(10.04|10.10|11.04)$/ => '8.4',
-        default => undef,
-      },
-      default => undef,
-    },
-    'Archlinux' => $::operatingsystem ? {
-      /Archlinux/ => '9.2',
-      default => '9.2',
-    },
-    'FreeBSD' => '93',
-    default => undef,
-  }
-  $globals_version = pick($version, $default_version, 'unknown')
-
-  # Setup of the repo only makes sense globally, so we are doing this here.
-  if($manage_package_repo) {
-    class { 'postgresql::repo':
-      ensure  => $ensure,
-      version => $globals_version
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp
deleted file mode 100644
index 0c446d439cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/devel.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# This class installs postgresql development libraries. See README.md for more
-# details.
-class postgresql::lib::devel(
-  $package_name   = $postgresql::params::devel_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-
-  validate_string($package_name)
-
-  package { 'postgresql-devel':
-    ensure => $package_ensure,
-    name   => $package_name,
-    tag    => 'postgresql',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/java.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/java.pp
deleted file mode 100644
index e9ee53dabee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/java.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# This class installs the postgresql jdbc connector. See README.md for more
-# details.
-class postgresql::lib::java (
-  $package_name   = $postgresql::params::java_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-
-  validate_string($package_name)
-
-  package { 'postgresql-jdbc':
-    ensure => $package_ensure,
-    name   => $package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/python.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/python.pp
deleted file mode 100644
index bfe05854875..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/lib/python.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# This class installs the python libs for postgresql. See README.md for more
-# details.
-class postgresql::lib::python(
-  $package_name   = $postgresql::params::python_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-
-  package { 'python-psycopg2':
-    ensure => $package_ensure,
-    name   => $package_name,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/params.pp
deleted file mode 100644
index 4f5ae97eba7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/params.pp
+++ /dev/null
@@ -1,175 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::params inherits postgresql::globals {
-  $ensure                     = true
-  $version                    = $globals_version
-  $listen_addresses           = 'localhost'
-  $ip_mask_deny_postgres_user = '0.0.0.0/0'
-  $ip_mask_allow_all_users    = '127.0.0.1/32'
-  $ipv4acls                   = []
-  $ipv6acls                   = []
-  $user                       = pick($user, 'postgres')
-  $group                      = pick($group, 'postgres')
-  $encoding                   = $encoding
-  $locale                     = $locale
-  $service_provider           = $service_provider
-  $manage_firewall            = $manage_firewall
-  $manage_pg_hba_conf         = pick($manage_pg_hba_conf, true)
-
-  # Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      $needs_initdb       = pick($needs_initdb, true)
-      $firewall_supported = pick($firewall_supported, true)
-
-      if $version == $default_version {
-        $client_package_name  = pick($client_package_name, 'postgresql')
-        $server_package_name  = pick($server_package_name, 'postgresql-server')
-        $contrib_package_name = pick($contrib_package_name,'postgresql-contrib')
-        $devel_package_name   = pick($devel_package_name, 'postgresql-devel')
-        $java_package_name    = pick($java_package_name, 'postgresql-jdbc')
-        $plperl_package_name  = pick($plperl_package_name, 'postgresql-plperl')
-        $service_name         = pick($service_name, 'postgresql')
-        $bindir               = pick($bindir, '/usr/bin')
-        $datadir              = $::operatingsystem ? {
-          'Amazon' => pick($datadir, '/var/lib/pgsql9/data'),
-          default  => pick($datadir, '/var/lib/pgsql/data'),
-        }
-        $confdir              = pick($confdir, $datadir)
-      } else {
-        $version_parts        = split($version, '[.]')
-        $package_version      = "${version_parts[0]}${version_parts[1]}"
-        $client_package_name  = pick($client_package_name, "postgresql${package_version}")
-        $server_package_name  = pick($server_package_name, "postgresql${package_version}-server")
-        $contrib_package_name = pick($contrib_package_name,"postgresql${package_version}-contrib")
-        $devel_package_name   = pick($devel_package_name, "postgresql${package_version}-devel")
-        $java_package_name    = pick($java_package_name, "postgresql${package_version}-jdbc")
-        $plperl_package_name  = pick($plperl_package_name, "postgresql${package_version}-plperl")
-        $service_name         = pick($service_name, "postgresql-${version}")
-        $bindir               = pick($bindir, "/usr/pgsql-${version}/bin")
-        $datadir              = $::operatingsystem ? {
-          'Amazon' => pick($datadir, "/var/lib/pgsql9/${version}/data"),
-          default  => pick($datadir, "/var/lib/pgsql/${version}/data"),
-        }
-        $confdir              = pick($confdir, $datadir)
-      }
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      $service_status      = $service_status
-      $python_package_name = pick($python_package_name, 'python-psycopg2')
-    }
-
-    'Archlinux': {
-      # Based on the existing version of the firewall module, this is normally
-      # true for Archlinux, but archlinux users want more control.
-      # so they can set it themself
-      $firewall_supported = pick($firewall_supported, true)
-      $needs_initdb       = pick($needs_initdb, true)
-
-      # Archlinux doesn't have a client-package but has a libs package which
-      # pulls in postgresql server
-      $client_package_name  = pick($client_package_name, 'postgresql')
-      $server_package_name  = pick($server_package_name, 'postgresql-libs')
-      $java_package_name    = pick($java_package_name, 'postgresql-jdbc')
-      # Archlinux doesn't have develop packages
-      $devel_package_name   = pick($devel_package_name, 'postgresql-devel')
-      # Archlinux does have postgresql-contrib but it isn't maintained
-      $contrib_package_name = pick($contrib_package_name,'undef')
-      # Archlinux postgresql package provides plperl
-      $plperl_package_name  = pick($plperl_package_name, 'undef')
-      $service_name         = pick($service_name, 'postgresql')
-      $bindir               = pick($bindir, '/usr/bin')
-      $datadir              = pick($datadir, '/var/lib/postgres/data')
-      $confdir              = pick($confdir, $datadir)
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      $service_status      = $service_status
-      $python_package_name = pick($python_package_name, 'python-psycopg2')
-    }
-
-    'Debian': {
-
-      if $manage_package_repo == true {
-        $needs_initdb = pick($needs_initdb, true)
-        $service_name = pick($service_name, 'postgresql')
-      } else {
-        $needs_initdb = pick($needs_initdb, false)
-        $service_name = $::operatingsystem ? {
-          'Debian' => pick($service_name, 'postgresql'),
-          'Ubuntu' => $::lsbmajdistrelease ? {
-            '10' => pick($service_name, "postgresql-${version}"),
-            default => pick($service_name, 'postgresql'),
-          },
-          default => undef
-        }
-      }
-
-      $client_package_name  = pick($client_package_name, "postgresql-client-${version}")
-      $server_package_name  = pick($server_package_name, "postgresql-${version}")
-      $contrib_package_name = pick($contrib_package_name, "postgresql-contrib-${version}")
-      $devel_package_name   = pick($devel_package_name, 'libpq-dev')
-      $java_package_name    = pick($java_package_name, 'libpostgresql-jdbc-java')
-      $plperl_package_name  = pick($plperl_package_name, "postgresql-plperl-${version}")
-      $python_package_name  = pick($python_package_name, 'python-psycopg2')
-
-      $bindir               = pick($bindir, "/usr/lib/postgresql/${version}/bin")
-      $datadir              = pick($datadir, "/var/lib/postgresql/${version}/main")
-      $confdir              = pick($confdir, "/etc/postgresql/${version}/main")
-      $service_status       = pick($service_status, "/etc/init.d/${service_name} status | /bin/egrep -q 'Running clusters: .+|online'")
-      $psql_path            = pick($psql_path, "/usr/bin/psql")
-
-      $firewall_supported   = pick($firewall_supported, true)
-    }
-
-    'FreeBSD': {
-
-      $client_package_name  = pick($client_package_name, "databases/postgresql${version}-client")
-      $server_package_name  = pick($server_package_name, "databases/postgresql${version}-server")
-      $contrib_package_name = pick($contrib_package_name, "databases/postgresql${version}-contrib")
-      $devel_package_name   = pick($devel_package_name, 'databases/postgresql-libpqxx3')
-      $java_package_name    = pick($java_package_name, 'databases/postgresql-jdbc')
-      $plperl_package_name  = pick($plperl_package_name, "databases/postgresql${version}-plperl")
-      $python_package_name  = pick($python_package_name, 'databases/py-psycopg2')
-
-      $service_name         = pick($service_name, 'postgresql')
-      $bindir               = pick($bindir, '/usr/local/bin')
-      $datadir              = pick($datadir, '/usr/local/pgsql/data')
-      $confdir              = pick($confdir, '/usr/local/share/postgresql')
-      $service_status       = pick($service_status, "/usr/local/etc/rc.d/${service_name} status")
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      $firewall_supported   = pick($firewall_supported, false)
-      $needs_initdb         = pick($needs_initdb, true)
-    }
-
-    default: {
-      # Based on the existing version of the firewall module, this is normally
-      # false for other OS, but this allows an escape hatch to override it.
-      $firewall_supported = pick($firewall_supported, false)
-
-      $psql_path            = pick($psql_path, "${bindir}/psql")
-
-      # Since we can't determine defaults on our own, we rely on users setting
-      # parameters with the postgresql::globals class. Here we are checking
-      # that the mandatory minimum is set for the module to operate.
-      $err_prefix = "Module ${module_name} does not provide defaults for osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}; please specify a value for ${module_name}::globals::"
-      if ($needs_initdb == undef) { fail("${err_prefix}needs_initdb") }
-      if ($service_name == undef) { fail("${err_prefix}service_name") }
-      if ($client_package_name == undef) { fail("${err_prefix}client_package_name") }
-      if ($server_package_name == undef) { fail("${err_prefix}server_package_name") }
-      if ($bindir == undef) { fail("${err_prefix}bindir") }
-      if ($datadir == undef) { fail("${err_prefix}datadir") }
-      if ($confdir == undef) { fail("${err_prefix}confdir") }
-    }
-  }
-
-  $initdb_path          = pick($initdb_path, "${bindir}/initdb")
-  $createdb_path        = pick($createdb_path, "${bindir}/createdb")
-  $pg_hba_conf_path     = pick($pg_hba_conf_path, "${confdir}/pg_hba.conf")
-  $pg_hba_conf_defaults = pick($pg_hba_conf_defaults, true)
-  $postgresql_conf_path = pick($postgresql_conf_path, "${confdir}/postgresql.conf")
-  $default_database     = pick($default_database, 'postgres')
-
-  if($version == 'unknown') {
-    fail('No preferred version defined or automatically detected.')
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo.pp
deleted file mode 100644
index 2e2cbd3f41a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::repo (
-  $ensure  = $postgresql::params::ensure,
-  $version = undef
-) inherits postgresql::params {
-  case $::osfamily {
-    'RedHat', 'Linux': {
-      if $version == undef {
-        fail("The parameter 'version' for 'postgresql::repo' is undefined. You must always define it when osfamily == Redhat or Linux")
-      }
-      class { 'postgresql::repo::yum_postgresql_org': }
-    }
-
-    'Debian': {
-      class { 'postgresql::repo::apt_postgresql_org': }
-    }
-
-    default: {
-      fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily RedHat and Debian")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp
deleted file mode 100644
index 610eb4724b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/apt_postgresql_org.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::repo::apt_postgresql_org inherits postgresql::repo {
-  if($ensure == 'present' or $ensure == true) {
-    # Here we have tried to replicate the instructions on the PostgreSQL site:
-    #
-    # http://www.postgresql.org/download/linux/debian/
-    #
-    apt::pin { 'apt.postgresql.org':
-      originator => 'apt.postgresql.org',
-      priority   => 500,
-    }->
-    apt::source { 'apt.postgresql.org':
-      location          => 'http://apt.postgresql.org/pub/repos/apt/',
-      release           => "${::lsbdistcodename}-pgdg",
-      repos             => "main ${version}",
-      key               => 'ACCC4CF8',
-      key_source        => 'http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc',
-      include_src       => false,
-    }
-
-    Apt::Source['apt.postgresql.org']->Package<|tag == 'postgresql'|>
-  } else {
-    apt::source { 'apt.postgresql.org':
-      ensure => absent,
-    }
-    apt::pin { 'apt.postgresql.org':
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp
deleted file mode 100644
index 9cdfd4af66c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/repo/yum_postgresql_org.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::repo::yum_postgresql_org inherits postgresql::repo {
-  $version_parts   = split($version, '[.]')
-  $package_version = "${version_parts[0]}${version_parts[1]}"
-  $gpg_key_path    = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}"
-
-  if ($ensure == 'present' or $ensure == true) {
-    file { $gpg_key_path:
-      source => 'puppet:///modules/postgresql/RPM-GPG-KEY-PGDG',
-      before => Yumrepo['yum.postgresql.org']
-    }
-
-    if($::operatingsystem == 'Fedora') {
-      $label1 = 'fedora'
-      $label2 = $label1
-    } else {
-      $label1 = 'redhat'
-      $label2 = 'rhel'
-    }
-
-    yumrepo { 'yum.postgresql.org':
-      descr    => "PostgreSQL ${version} \$releasever - \$basearch",
-      baseurl  => "http://yum.postgresql.org/${version}/${label1}/${label2}-\$releasever-\$basearch",
-      enabled  => 1,
-      gpgcheck => 1,
-      gpgkey   => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}",
-    }
-
-    Yumrepo['yum.postgresql.org'] -> Package<|tag == 'postgresql'|>
-  } else {
-    yumrepo { 'yum.postgresql.org':
-      enabled => absent,
-    }->
-    file { $gpg_key_path:
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server.pp
deleted file mode 100644
index 4d5baab4976..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server.pp
+++ /dev/null
@@ -1,73 +0,0 @@
-# This installs a PostgreSQL server. See README.md for more details.
-class postgresql::server (
-  $ensure                     = $postgresql::params::ensure,
-
-  $version                    = $postgresql::params::version,
-
-  $postgres_password          = undef,
-
-  $package_name               = $postgresql::params::server_package_name,
-  $client_package_name        = $postgresql::params::client_package_name,
-  $package_ensure             = $ensure,
-
-  $plperl_package_name        = $postgresql::params::plperl_package_name,
-
-  $service_name               = $postgresql::params::service_name,
-  $service_provider           = $postgresql::params::service_provider,
-  $service_status             = $postgresql::params::service_status,
-  $default_database           = $postgresql::params::default_database,
-
-  $listen_addresses           = $postgresql::params::listen_addresses,
-  $ip_mask_deny_postgres_user = $postgresql::params::ip_mask_deny_postgres_user,
-  $ip_mask_allow_all_users    = $postgresql::params::ip_mask_allow_all_users,
-  $ipv4acls                   = $postgresql::params::ipv4acls,
-  $ipv6acls                   = $postgresql::params::ipv6acls,
-
-  $initdb_path                = $postgresql::params::initdb_path,
-  $createdb_path              = $postgresql::params::createdb_path,
-  $psql_path                  = $postgresql::params::psql_path,
-  $pg_hba_conf_path           = $postgresql::params::pg_hba_conf_path,
-  $postgresql_conf_path       = $postgresql::params::postgresql_conf_path,
-
-  $datadir                    = $postgresql::params::datadir,
-  $xlogdir                    = $postgresql::params::xlogdir,
-
-  $pg_hba_conf_defaults       = $postgresql::params::pg_hba_conf_defaults,
-
-  $user                       = $postgresql::params::user,
-  $group                      = $postgresql::params::group,
-
-  $needs_initdb               = $postgresql::params::needs_initdb,
-
-  $encoding                   = $postgresql::params::encoding,
-  $locale                     = $postgresql::params::locale,
-
-  $manage_firewall            = $postgresql::params::manage_firewall,
-  $manage_pg_hba_conf         = $postgresql::params::manage_pg_hba_conf,
-  $firewall_supported         = $postgresql::params::firewall_supported
-) inherits postgresql::params {
-  $pg = 'postgresql::server'
-
-  if ($ensure == 'present' or $ensure == true) {
-    # Reload has its own ordering, specified by other defines
-    class { "${pg}::reload": require => Class["${pg}::install"] }
-
-    anchor { "${pg}::start": }->
-    class { "${pg}::install": }->
-    class { "${pg}::initdb": }->
-    class { "${pg}::config": }->
-    class { "${pg}::service": }->
-    class { "${pg}::passwd": }->
-    class { "${pg}::firewall": }->
-    anchor { "${pg}::end": }
-  } else {
-    anchor { "${pg}::start": }->
-    class { "${pg}::firewall": }->
-    class { "${pg}::passwd": }->
-    class { "${pg}::service": }->
-    class { "${pg}::install": }->
-    class { "${pg}::initdb": }->
-    class { "${pg}::config": }->
-    anchor { "${pg}::end": }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config.pp
deleted file mode 100644
index a59f1793d29..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config.pp
+++ /dev/null
@@ -1,108 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::config {
-  $ensure                     = $postgresql::server::ensure
-  $ip_mask_deny_postgres_user = $postgresql::server::ip_mask_deny_postgres_user
-  $ip_mask_allow_all_users    = $postgresql::server::ip_mask_allow_all_users
-  $listen_addresses           = $postgresql::server::listen_addresses
-  $ipv4acls                   = $postgresql::server::ipv4acls
-  $ipv6acls                   = $postgresql::server::ipv6acls
-  $pg_hba_conf_path           = $postgresql::server::pg_hba_conf_path
-  $postgresql_conf_path       = $postgresql::server::postgresql_conf_path
-  $pg_hba_conf_defaults       = $postgresql::server::pg_hba_conf_defaults
-  $user                       = $postgresql::server::user
-  $group                      = $postgresql::server::group
-  $version                    = $postgresql::server::version
-  $manage_pg_hba_conf         = $postgresql::server::manage_pg_hba_conf
-
-  if ($ensure == 'present' or $ensure == true) {
-
-    if ($manage_pg_hba_conf == true) {
-      # Prepare the main pg_hba file
-      concat { $pg_hba_conf_path:
-        owner  => 0,
-        group  => $group,
-        mode   => '0640',
-        warn   => true,
-        notify => Class['postgresql::server::reload'],
-      }
-
-      if $pg_hba_conf_defaults {
-        Postgresql::Server::Pg_hba_rule {
-          database => 'all',
-          user => 'all',
-        }
-
-        # Lets setup the base rules
-        $local_auth_option = $version ? {
-          '8.1'   => 'sameuser',
-          default => undef,
-        }
-        postgresql::server::pg_hba_rule { 'local access as postgres user':
-          type        => 'local',
-          user        => $user,
-          auth_method => 'ident',
-          auth_option => $local_auth_option,
-          order       => '001',
-        }
-        postgresql::server::pg_hba_rule { 'local access to database with same name':
-          type        => 'local',
-          auth_method => 'ident',
-          auth_option => $local_auth_option,
-          order       => '002',
-        }
-        postgresql::server::pg_hba_rule { 'allow localhost TCP access to postgresql user':
-          type        => 'host',
-          user        => $user,
-          address     => '127.0.0.1/32',
-          auth_method => 'md5',
-          order       => '003',
-        }
-        postgresql::server::pg_hba_rule { 'deny access to postgresql user':
-          type        => 'host',
-          user        => $user,
-          address     => $ip_mask_deny_postgres_user,
-          auth_method => 'reject',
-          order       => '004',
-        }
-
-        # ipv4acls are passed as an array of rule strings, here we transform
-        # them into a resources hash, and pass the result to create_resources
-        $ipv4acl_resources = postgresql_acls_to_resources_hash($ipv4acls,
-        'ipv4acls', 10)
-        create_resources('postgresql::server::pg_hba_rule', $ipv4acl_resources)
-
-        postgresql::server::pg_hba_rule { 'allow access to all users':
-          type        => 'host',
-          address     => $ip_mask_allow_all_users,
-          auth_method => 'md5',
-          order       => '100',
-        }
-        postgresql::server::pg_hba_rule { 'allow access to ipv6 localhost':
-          type        => 'host',
-          address     => '::1/128',
-          auth_method => 'md5',
-          order       => '101',
-        }
-
-        # ipv6acls are passed as an array of rule strings, here we transform
-        # them into a resources hash, and pass the result to create_resources
-        $ipv6acl_resources = postgresql_acls_to_resources_hash($ipv6acls,
-        'ipv6acls', 102)
-        create_resources('postgresql::server::pg_hba_rule', $ipv6acl_resources)
-      }
-    }
-
-    # We must set a "listen_addresses" line in the postgresql.conf if we
-    # want to allow any connections from remote hosts.
-    postgresql::server::config_entry { 'listen_addresses':
-      value => $listen_addresses,
-    }
-  } else {
-    file { $pg_hba_conf_path:
-      ensure => absent,
-    }
-    file { $postgresql_conf_path:
-      ensure => absent,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp
deleted file mode 100644
index c6cd1a7adf6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/config_entry.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Manage a postgresql.conf entry. See README.md for more details.
-define postgresql::server::config_entry (
-  $ensure = 'present',
-  $value  = undef,
-  $path   = false
-) {
-  $postgresql_conf_path = $postgresql::server::postgresql_conf_path
-
-  $target = $path ? {
-    false   => $postgresql_conf_path,
-    default => $path,
-  }
-
-  case $name {
-    /data_directory|hba_file|ident_file|include|listen_addresses|port|max_connections|superuser_reserved_connections|unix_socket_directory|unix_socket_group|unix_socket_permissions|bonjour|bonjour_name|ssl|ssl_ciphers|shared_buffers|max_prepared_transactions|max_files_per_process|shared_preload_libraries|wal_level|wal_buffers|archive_mode|max_wal_senders|hot_standby|logging_collector|silent_mode|track_activity_query_size|autovacuum_max_workers|autovacuum_freeze_max_age|max_locks_per_transaction|max_pred_locks_per_transaction|restart_after_crash|lc_messages|lc_monetary|lc_numeric|lc_time/: {
-      Postgresql_conf {
-        notify => Class['postgresql::server::service'],
-        before => Class['postgresql::server::reload'],
-      }
-    }
-
-    default: {
-      Postgresql_conf {
-        notify => Class['postgresql::server::reload'],
-      }
-    }
-  }
-
-  case $ensure {
-    /present|absent/: {
-      postgresql_conf { $name:
-        ensure  => $ensure,
-        target  => $target,
-        value   => $value,
-        require => Class['postgresql::server::initdb'],
-      }
-    }
-
-    default: {
-      fail("Unknown value for ensure '${ensure}'.")
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp
deleted file mode 100644
index fe6309e17b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/contrib.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Install the contrib postgresql packaging. See README.md for more details.
-class postgresql::server::contrib (
-  $package_name   = $postgresql::params::contrib_package_name,
-  $package_ensure = 'present'
-) inherits postgresql::params {
-  validate_string($package_name)
-
-  package { 'postgresql-contrib':
-    ensure => $package_ensure,
-    name   => $package_name,
-    tag    => 'postgresql',
-  }
-
-  if($package_ensure == 'present' or $package_ensure == true) {
-    anchor { 'postgresql::server::contrib::start': }->
-    Class['postgresql::server::install']->
-    Package['postgresql-contrib']->
-    Class['postgresql::server::service']->
-    anchor { 'postgresql::server::contrib::end': }
-  } else {
-    anchor { 'postgresql::server::contrib::start': }->
-    Class['postgresql::server::service']->
-    Package['postgresql-contrib']->
-    Class['postgresql::server::install']->
-    anchor { 'postgresql::server::contrib::end': }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database.pp
deleted file mode 100644
index adeabde7970..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# Define for creating a database. See README.md for more details.
-define postgresql::server::database(
-  $dbname     = $title,
-  $owner      = $postgresql::server::user,
-  $tablespace = undef,
-  $template   = 'template0',
-  $encoding   = $postgresql::server::encoding,
-  $locale     = $postgresql::server::locale,
-  $istemplate = false
-) {
-  $createdb_path = $postgresql::server::createdb_path
-  $user          = $postgresql::server::user
-  $group         = $postgresql::server::group
-  $psql_path     = $postgresql::server::psql_path
-  $version       = $postgresql::server::version
-
-  # Set the defaults for the postgresql_psql resource
-  Postgresql_psql {
-    psql_user  => $user,
-    psql_group => $group,
-    psql_path  => $psql_path,
-  }
-
-  # Optionally set the locale switch. Older versions of createdb may not accept
-  # --locale, so if the parameter is undefined its safer not to pass it.
-  if ($version != '8.1') {
-    $locale_option = $locale ? {
-      undef   => '',
-      default => "--locale=${locale} ",
-    }
-    $public_revoke_privilege = 'CONNECT'
-  } else {
-    $locale_option = ''
-    $public_revoke_privilege = 'ALL'
-  }
-
-  $encoding_option = $encoding ? {
-    undef   => '',
-    default => "--encoding '${encoding}' ",
-  }
-
-  $tablespace_option = $tablespace ? {
-    undef   => '',
-    default => "--tablespace='${tablespace}' ",
-  }
-
-  $createdb_command = "${createdb_path} --owner='${owner}' --template=${template} ${encoding_option}${locale_option}${tablespace_option} '${dbname}'"
-
-  postgresql_psql { "Check for existence of db '${dbname}'":
-    command => 'SELECT 1',
-    unless  => "SELECT datname FROM pg_database WHERE datname='${dbname}'",
-    require => Class['postgresql::server::service']
-  }~>
-  exec { $createdb_command :
-    refreshonly => true,
-    user        => $user,
-    logoutput   => on_failure,
-  }~>
-
-  # This will prevent users from connecting to the database unless they've been
-  #  granted privileges.
-  postgresql_psql {"REVOKE ${public_revoke_privilege} ON DATABASE \"${dbname}\" FROM public":
-    db          => $user,
-    refreshonly => true,
-  }
-
-  Exec [ $createdb_command ]->
-  postgresql_psql {"UPDATE pg_database SET datistemplate = ${istemplate} WHERE datname = '${dbname}'":
-    unless => "SELECT datname FROM pg_database WHERE datname = '${dbname}' AND datistemplate = ${istemplate}",
-  }
-
-  # Build up dependencies on tablespace
-  if($tablespace != undef and defined(Postgresql::Server::Tablespace[$tablespace])) {
-    Postgresql::Server::Tablespace[$tablespace]->Exec[$createdb_command]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp
deleted file mode 100644
index 5973144127a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/database_grant.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Manage a database grant. See README.md for more details.
-define postgresql::server::database_grant(
-  $privilege,
-  $db,
-  $role,
-  $psql_db   = undef,
-  $psql_user = undef
-) {
-  postgresql::server::grant { "database:${name}":
-    role        => $role,
-    db          => $db,
-    privilege   => $privilege,
-    object_type => 'DATABASE',
-    object_name => $db,
-    psql_db     => $psql_db,
-    psql_user   => $psql_user,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/db.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/db.pp
deleted file mode 100644
index 5cc7954c3eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/db.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Define for conveniently creating a role, database and assigning the correct
-# permissions. See README.md for more details.
-define postgresql::server::db (
-  $user,
-  $password,
-  $encoding   = $postgresql::server::encoding,
-  $locale     = $postgresql::server::locale,
-  $grant      = 'ALL',
-  $tablespace = undef,
-  $template   = 'template0',
-  $istemplate = false,
-  $owner      = undef
-) {
-  postgresql::server::database { $name:
-    encoding   => $encoding,
-    tablespace => $tablespace,
-    template   => $template,
-    locale     => $locale,
-    istemplate => $istemplate,
-    owner      => $owner,
-  }
-
-  if ! defined(Postgresql::Server::Role[$user]) {
-    postgresql::server::role { $user:
-      password_hash => $password,
-    }
-  }
-
-  postgresql::server::database_grant { "GRANT ${user} - ${grant} - ${name}":
-    privilege => $grant,
-    db        => $name,
-    role      => $user,
-  }
-
-  if($tablespace != undef and defined(Postgresql::Server::Tablespace[$tablespace])) {
-    Postgresql::Server::Tablespace[$tablespace]->Postgresql::Server::Database[$name]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp
deleted file mode 100644
index afe3797415d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/firewall.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::server::firewall {
-  $ensure             = $postgresql::server::ensure
-  $manage_firewall    = $postgresql::server::manage_firewall
-  $firewall_supported = $postgresql::server::firewall_supported
-
-  if ($manage_firewall and $firewall_supported) {
-    if ($ensure == 'present' or $ensure == true) {
-      # TODO: get rid of hard-coded port
-      firewall { '5432 accept - postgres':
-        port   => '5432',
-        proto  => 'tcp',
-        action => 'accept',
-      }
-    } else {
-      firewall { '5432 accept - postgres':
-        ensure => absent,
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/grant.pp
deleted file mode 100644
index d24130ca28b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/grant.pp
+++ /dev/null
@@ -1,85 +0,0 @@
-# Define for granting permissions to roles. See README.md for more details.
-define postgresql::server::grant (
-  $role,
-  $db,
-  $privilege   = undef,
-  $object_type = 'database',
-  $object_name = $db,
-  $psql_db     = $postgresql::server::user,
-  $psql_user   = $postgresql::server::user
-) {
-  $group     = $postgresql::server::group
-  $psql_path = $postgresql::server::psql_path
-
-  ## Munge the input values
-  $_object_type = upcase($object_type)
-  $_privilege   = upcase($privilege)
-
-  ## Validate that the object type is known
-  validate_string($_object_type,
-    #'COLUMN',
-    'DATABASE',
-    #'FOREIGN SERVER',
-    #'FOREIGN DATA WRAPPER',
-    #'FUNCTION',
-    #'PROCEDURAL LANGUAGE',
-    #'SCHEMA',
-    #'SEQUENCE',
-    'TABLE',
-    #'TABLESPACE',
-    #'VIEW',
-  )
-
-  ## Validate that the object type's privilege is acceptable
-  # TODO: this is a terrible hack; if they pass "ALL" as the desired privilege,
-  #  we need a way to test for it--and has_database_privilege does not
-  #  recognize 'ALL' as a valid privilege name. So we probably need to
-  #  hard-code a mapping between 'ALL' and the list of actual privileges that
-  #  it entails, and loop over them to check them.  That sort of thing will
-  #  probably need to wait until we port this over to ruby, so, for now, we're
-  #  just going to assume that if they have "CREATE" privileges on a database,
-  #  then they have "ALL".  (I told you that it was terrible!)
-  case $_object_type {
-    'DATABASE': {
-      $unless_privilege = $_privilege ? {
-        'ALL'   => 'CREATE',
-        default => $_privilege,
-      }
-      validate_string($unless_privilege,'CREATE','CONNECT','TEMPORARY','TEMP',
-        'ALL','ALL PRIVILEGES')
-      $unless_function = 'has_database_privilege'
-      $on_db = $psql_db
-    }
-    'TABLE': {
-      $unless_privilege = $_privilege ? {
-        'ALL'   => 'INSERT',
-        default => $_privilege,
-      }
-      validate_string($unless_privilege,'SELECT','INSERT','UPDATE','DELETE',
-        'TRUNCATE','REFERENCES','TRIGGER','ALL','ALL PRIVILEGES')
-      $unless_function = 'has_table_privilege'
-      $on_db = $db
-    }
-    default: {
-      fail("Missing privilege validation for object type ${_object_type}")
-    }
-  }
-
-  $grant_cmd = "GRANT ${_privilege} ON ${_object_type} \"${object_name}\" TO \"${role}\""
-  postgresql_psql { $grant_cmd:
-    db         => $on_db,
-    psql_user  => $psql_user,
-    psql_group => $group,
-    psql_path  => $psql_path,
-    unless     => "SELECT 1 WHERE ${unless_function}('${role}', '${object_name}', '${unless_privilege}')",
-    require    => Class['postgresql::server']
-  }
-
-  if($role != undef and defined(Postgresql::Server::Role[$role])) {
-    Postgresql::Server::Role[$role]->Postgresql_psql[$grant_cmd]
-  }
-
-  if($db != undef and defined(Postgresql::Server::Database[$db])) {
-    Postgresql::Server::Database[$db]->Postgresql_psql[$grant_cmd]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp
deleted file mode 100644
index a56f19c39b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/initdb.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::initdb {
-  $ensure       = $postgresql::server::ensure
-  $needs_initdb = $postgresql::server::needs_initdb
-  $initdb_path  = $postgresql::server::initdb_path
-  $datadir      = $postgresql::server::datadir
-  $xlogdir      = $postgresql::server::xlogdir
-  $encoding     = $postgresql::server::encoding
-  $locale       = $postgresql::server::locale
-  $group        = $postgresql::server::group
-  $user         = $postgresql::server::user
-
-  if($ensure == 'present' or $ensure == true) {
-    # Make sure the data directory exists, and has the correct permissions.
-    file { $datadir:
-      ensure => directory,
-      owner  => $user,
-      group  => $group,
-      mode   => '0700',
-    }
-
-    if($xlogdir) {
-      # Make sure the xlog directory exists, and has the correct permissions.
-      file { $xlogdir:
-        ensure => directory,
-        owner  => $user,
-        group  => $group,
-        mode   => '0700',
-      }
-    }
-
-    if($needs_initdb) {
-      # Build up the initdb command.
-      #
-      # We optionally add the locale switch if specified. Older versions of the
-      # initdb command don't accept this switch. So if the user didn't pass the
-      # parameter, lets not pass the switch at all.
-      $ic_base = "${initdb_path} --encoding '${encoding}' --pgdata '${datadir}'"
-      $ic_xlog = $xlogdir ? {
-        undef   => $ic_base,
-        default => "${ic_base} --xlogdir '${xlogdir}'"
-      }
-      $initdb_command = $locale ? {
-        undef   => $ic_xlog,
-        default => "${ic_xlog} --locale '${locale}'"
-      }
-
-      # This runs the initdb command, we use the existance of the PG_VERSION
-      # file to ensure we don't keep running this command.
-      exec { 'postgresql_initdb':
-        command   => $initdb_command,
-        creates   => "${datadir}/PG_VERSION",
-        user      => $user,
-        group     => $group,
-        logoutput => on_failure,
-        require   => File[$datadir],
-      }
-    }
-  } else {
-    # Purge data directory if ensure => absent
-    file { $datadir:
-      ensure  => absent,
-      recurse => true,
-      force   => true,
-    }
-
-    if($xlogdir) {
-      # Make sure the xlog directory exists, and has the correct permissions.
-      file { $xlogdir:
-        ensure  => absent,
-        recurse => true,
-        force   => true,
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/install.pp
deleted file mode 100644
index 1e912a8b1dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/install.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::install {
-  $package_ensure      = $postgresql::server::package_ensure
-  $package_name        = $postgresql::server::package_name
-  $client_package_name = $postgresql::server::client_package_name
-
-  # This is necessary to ensure that the extra client package that was
-  # installed automatically by the server package is removed and all
-  # of its dependencies are removed also. Without this later installation
-  # of the native Ubuntu packages will fail.
-  if($::operatingsystem == 'Ubuntu' and $package_ensure == 'absent') {
-    # This is an exec, because we want to invoke autoremove.
-    #
-    # An alternative would be to have a full list of packages, but that seemed
-    # more problematic to maintain, not to mention the conflict with the
-    # client class will create duplicate resources.
-    exec { 'apt-get-autoremove-postgresql-client-XX':
-      command   => "apt-get autoremove --purge --yes ${client_package_name}",
-      onlyif    => "dpkg -l ${client_package_name} | grep -e '^ii'",
-      logoutput => on_failure,
-      path      => '/usr/bin:/bin:/usr/sbin/:/sbin',
-    }
-
-    # This will clean up anything we miss
-    exec { 'apt-get-autoremove-postgresql-client-brute':
-      command   => "dpkg -P postgresql*",
-      onlyif    => "dpkg -l postgresql* | grep -e '^ii'",
-      logoutput => on_failure,
-      path      => '/usr/bin:/bin:/usr/sbin/:/sbin',
-    }
-  }
-
-  $_package_ensure = $package_ensure ? {
-    true     => 'present',
-    false    => 'purged',
-    'absent' => 'purged',
-    default => $package_ensure,
-  }
-
-  package { 'postgresql-server':
-    ensure => $_package_ensure,
-    name   => $package_name,
-
-    # This is searched for to create relationships with the package repos, be
-    # careful about its removal
-    tag    => 'postgresql',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp
deleted file mode 100644
index 5777b03354a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/passwd.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::passwd {
-  $ensure            = $postgresql::server::ensure
-  $postgres_password = $postgresql::server::postgres_password
-  $user              = $postgresql::server::user
-  $group             = $postgresql::server::group
-  $psql_path         = $postgresql::server::psql_path
-
-  if($ensure == 'present' or $ensure == true) {
-    if ($postgres_password != undef) {
-      # NOTE: this password-setting logic relies on the pg_hba.conf being
-      #  configured to allow the postgres system user to connect via psql
-      #  without specifying a password ('ident' or 'trust' security). This is
-      #  the default for pg_hba.conf.
-      $escaped = postgresql_escape($postgres_password)
-      $env = "env PGPASSWORD='${postgres_password}'"
-      exec { 'set_postgres_postgrespw':
-        # This command works w/no password because we run it as postgres system
-        # user
-        command     => "${psql_path} -c 'ALTER ROLE \"${user}\" PASSWORD ${escaped}'",
-        user        => $user,
-        group       => $group,
-        logoutput   => true,
-        cwd         => '/tmp',
-        # With this command we're passing -h to force TCP authentication, which
-        # does require a password.  We specify the password via the PGPASSWORD
-        # environment variable. If the password is correct (current), this
-        # command will exit with an exit code of 0, which will prevent the main
-        # command from running.
-        unless      => "${env} ${psql_path} -h localhost -c 'select 1' > /dev/null",
-        path        => '/usr/bin:/usr/local/bin:/bin',
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp
deleted file mode 100644
index ea300d1baa5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/pg_hba_rule.pp
+++ /dev/null
@@ -1,52 +0,0 @@
-# This resource manages an individual rule that applies to the file defined in
-# $target. See README.md for more details.
-define postgresql::server::pg_hba_rule(
-  $type,
-  $database,
-  $user,
-  $auth_method,
-  $address     = undef,
-  $description = 'none',
-  $auth_option = undef,
-  $order       = '150',
-
-  # Needed for testing primarily, support for multiple files is not really
-  # working.
-  $target      = $postgresql::server::pg_hba_conf_path
-) {
-
-  if $postgresql::server::manage_pg_hba_conf == false {
-      fail('postgresql::server::manage_pg_hba_conf has been disabled, so this resource is now unused and redundant, either enable that option or remove this resource from your manifests')
-  } else {
-    validate_re($type, '^(local|host|hostssl|hostnossl)$',
-    "The type you specified [${type}] must be one of: local, host, hostssl, hostnosssl")
-
-    if($type =~ /^host/ and $address == undef) {
-      fail('You must specify an address property when type is host based')
-    }
-
-    $allowed_auth_methods = $postgresql::server::version ? {
-      '9.3' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'],
-      '9.2' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'],
-      '9.1' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam'],
-      '9.0' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'radius', 'cert', 'pam'],
-      '8.4' => ['trust', 'reject', 'md5', 'sha1', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'cert', 'pam'],
-      '8.3' => ['trust', 'reject', 'md5', 'sha1', 'crypt', 'password', 'gss', 'sspi', 'krb5', 'ident', 'ldap', 'pam'],
-      '8.2' => ['trust', 'reject', 'md5', 'crypt', 'password', 'krb5', 'ident', 'ldap', 'pam'],
-      '8.1' => ['trust', 'reject', 'md5', 'crypt', 'password', 'krb5', 'ident', 'pam'],
-      default => ['trust', 'reject', 'md5', 'password', 'gss', 'sspi', 'krb5', 'ident', 'peer', 'ldap', 'radius', 'cert', 'pam', 'crypt']
-    }
-
-    $auth_method_regex = join(['^(', join($allowed_auth_methods, '|'), ')$'],'')
-    validate_re($auth_method, $auth_method_regex,
-    join(["The auth_method you specified [${auth_method}] must be one of: ", join($allowed_auth_methods, ', ')],''))
-
-    # Create a rule fragment
-    $fragname = "pg_hba_rule_${name}"
-    concat::fragment { $fragname:
-      target  => $target,
-      content => template('postgresql/pg_hba_rule.conf'),
-      order   => $order,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp
deleted file mode 100644
index c338f165701..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/plperl.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# This class installs the PL/Perl procedural language for postgresql. See
-# README.md for more details.
-class postgresql::server::plperl(
-  $package_ensure = 'present',
-  $package_name   = $postgresql::server::plperl_package_name
-) {
-  package { 'postgresql-plperl':
-    ensure => $package_ensure,
-    name   => $package_name,
-    tag    => 'postgresql',
-  }
-
-  if($package_ensure == 'present' or $package_ensure == true) {
-    anchor { 'postgresql::server::plperl::start': }->
-    Class['postgresql::server::install']->
-    Package['postgresql-plperl']->
-    Class['postgresql::server::service']->
-    anchor { 'postgresql::server::plperl::end': }
-  } else {
-    anchor { 'postgresql::server::plperl::start': }->
-    Class['postgresql::server::service']->
-    Package['postgresql-plperl']->
-    Class['postgresql::server::install']->
-    anchor { 'postgresql::server::plperl::end': }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/reload.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/reload.pp
deleted file mode 100644
index 6b11ebfc1b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/reload.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# PRIVATE CLASS: do not use directly
-class postgresql::server::reload {
-  $ensure         = $postgresql::server::ensure
-  $service_name   = $postgresql::server::service_name
-  $service_status = $postgresql::server::service_status
-
-  if($ensure == 'present' or $ensure == true) {
-    exec { 'postgresql_reload':
-      path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-      command     => "service ${service_name} reload",
-      onlyif      => $service_status,
-      refreshonly => true,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/role.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/role.pp
deleted file mode 100644
index 971191f5d54..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/role.pp
+++ /dev/null
@@ -1,85 +0,0 @@
-# Define for creating a database role. See README.md for more information
-define postgresql::server::role(
-  $password_hash    = false,
-  $createdb         = false,
-  $createrole       = false,
-  $db               = $postgresql::server::user,
-  $login            = true,
-  $superuser        = false,
-  $replication      = false,
-  $connection_limit = '-1',
-  $username         = $title
-) {
-  $psql_user  = $postgresql::server::user
-  $psql_group = $postgresql::server::group
-  $psql_path  = $postgresql::server::psql_path
-  $version    = $postgresql::server::version
-
-  $login_sql       = $login       ? { true => 'LOGIN',       default => 'NOLOGIN' }
-  $createrole_sql  = $createrole  ? { true => 'CREATEROLE',  default => 'NOCREATEROLE' }
-  $createdb_sql    = $createdb    ? { true => 'CREATEDB',    default => 'NOCREATEDB' }
-  $superuser_sql   = $superuser   ? { true => 'SUPERUSER',   default => 'NOSUPERUSER' }
-  $replication_sql = $replication ? { true => 'REPLICATION', default => '' }
-  if ($password_hash != false) {
-    $password_sql = "ENCRYPTED PASSWORD '${password_hash}'"
-  } else {
-    $password_sql = ''
-  }
-
-  Postgresql_psql {
-    db         => $db,
-    psql_user  => $psql_user,
-    psql_group => $psql_group,
-    psql_path  => $psql_path,
-    require    => [ Postgresql_psql["CREATE ROLE \"${username}\" ${password_sql} ${login_sql} ${createrole_sql} ${createdb_sql} ${superuser_sql} ${replication_sql} CONNECTION LIMIT ${connection_limit}"], Class['postgresql::server'] ],
-  }
-
-  postgresql_psql {"CREATE ROLE \"${username}\" ${password_sql} ${login_sql} ${createrole_sql} ${createdb_sql} ${superuser_sql} ${replication_sql} CONNECTION LIMIT ${connection_limit}":
-    unless  => "SELECT rolname FROM pg_roles WHERE rolname='${username}'",
-    require => Class['Postgresql::Server'],
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${superuser_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolsuper=${superuser}",
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${createdb_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolcreatedb=${createdb}",
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${createrole_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolcreaterole=${createrole}",
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" ${login_sql}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolcanlogin=${login}",
-  }
-
-  if(versioncmp($version, '9.1') >= 0) {
-    if $replication_sql == '' {
-      postgresql_psql {"ALTER ROLE \"${username}\" NOREPLICATION":
-        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
-      }
-    } else {
-      postgresql_psql {"ALTER ROLE \"${username}\" ${replication_sql}":
-        unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolreplication=${replication}",
-      }
-    }
-  }
-
-  postgresql_psql {"ALTER ROLE \"${username}\" CONNECTION LIMIT ${connection_limit}":
-    unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}' and rolconnlimit=${connection_limit}",
-  }
-
-  if $password_hash {
-    if($password_hash =~ /^md5.+/) {
-      $pwd_hash_sql = $password_hash
-    } else {
-      $pwd_md5 = md5("${password_hash}${username}")
-      $pwd_hash_sql = "md5${pwd_md5}"
-    }
-    postgresql_psql {"ALTER ROLE \"${username}\" ${password_sql}":
-      unless => "SELECT usename FROM pg_shadow WHERE usename='${username}' and passwd='${pwd_hash_sql}'",
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/service.pp
deleted file mode 100644
index 598acd876a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/service.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# PRIVATE CLASS: do not call directly
-class postgresql::server::service {
-  $ensure           = $postgresql::server::ensure
-  $service_name     = $postgresql::server::service_name
-  $service_provider = $postgresql::server::service_provider
-  $service_status   = $postgresql::server::service_status
-  $user             = $postgresql::server::user
-  $default_database = $postgresql::server::default_database
-
-  $service_ensure = $ensure ? {
-    present => true,
-    absent  => false,
-    default => $ensure
-  }
-
-  anchor { 'postgresql::server::service::begin': }
-
-  service { 'postgresqld':
-    ensure    => $service_ensure,
-    name      => $service_name,
-    enable    => $service_ensure,
-    provider  => $service_provider,
-    hasstatus => true,
-    status    => $service_status,
-  }
-
-  if($service_ensure) {
-    # This blocks the class before continuing if chained correctly, making
-    # sure the service really is 'up' before continuing.
-    #
-    # Without it, we may continue doing more work before the database is
-    # prepared leading to a nasty race condition.
-    postgresql::validate_db_connection { 'validate_service_is_running':
-      run_as          => $user,
-      database_name   => $default_database,
-      sleep           => 1,
-      tries           => 60,
-      create_db_first => false,
-      require         => Service['postgresqld'],
-      before          => Anchor['postgresql::server::service::end']
-    }
-  }
-
-  anchor { 'postgresql::server::service::end': }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp
deleted file mode 100644
index 643416e0d06..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/table_grant.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# This resource wraps the grant resource to manage table grants specifically.
-# See README.md for more details.
-define postgresql::server::table_grant(
-  $privilege,
-  $table,
-  $db,
-  $role,
-  $psql_db   = undef,
-  $psql_user = undef
-) {
-  postgresql::server::grant { "table:${name}":
-    role        => $role,
-    db          => $db,
-    privilege   => $privilege,
-    object_type => 'TABLE',
-    object_name => $table,
-    psql_db     => $psql_db,
-    psql_user   => $psql_user,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp
deleted file mode 100644
index 22523773c1f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/server/tablespace.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# This module creates tablespace. See README.md for more details.
-define postgresql::server::tablespace(
-  $location,
-  $owner   = undef,
-  $spcname = $title
-) {
-  $user      = $postgresql::server::user
-  $group     = $postgresql::server::group
-  $psql_path = $postgresql::server::psql_path
-
-  Postgresql_psql {
-    psql_user  => $user,
-    psql_group => $group,
-    psql_path  => $psql_path,
-  }
-
-  if ($owner == undef) {
-    $owner_section = ''
-  } else {
-    $owner_section = "OWNER \"${owner}\""
-  }
-
-  $create_tablespace_command = "CREATE TABLESPACE \"${spcname}\" ${owner_section} LOCATION '${location}'"
-
-  file { $location:
-    ensure => directory,
-    owner  => $user,
-    group  => $group,
-    mode   => '0700',
-  }
-
-  $create_ts = "Create tablespace '${spcname}'"
-  postgresql_psql { "Create tablespace '${spcname}'":
-    command => $create_tablespace_command,
-    unless  => "SELECT spcname FROM pg_tablespace WHERE spcname='${spcname}'",
-    require => [Class['postgresql::server'], File[$location]],
-  }
-
-  if($owner != undef and defined(Postgresql::Server::Role[$owner])) {
-    Postgresql::Server::Role[$owner]->Postgresql_psql[$create_ts]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp
deleted file mode 100644
index f70af1e4efd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/manifests/validate_db_connection.pp
+++ /dev/null
@@ -1,75 +0,0 @@
-# This type validates that a successful postgres connection can be established
-# between the node on which this resource is run and a specified postgres
-# instance (host/port/user/password/database name).
-#
-# See README.md for more details.
-define postgresql::validate_db_connection(
-  $database_host     = undef,
-  $database_name     = undef,
-  $database_password = undef,
-  $database_username = undef,
-  $database_port     = undef,
-  $run_as            = undef,
-  $sleep             = 2,
-  $tries             = 10,
-  $create_db_first   = true
-) {
-  require postgresql::client
-  include postgresql::params
-
-  $psql_path = $postgresql::params::psql_path
-
-  $cmd_init = "${psql_path} --tuples-only --quiet "
-  $cmd_host = $database_host ? {
-    default => "-h ${database_host} ",
-    undef   => "",
-  }
-  $cmd_user = $database_username ? {
-    default => "-U ${database_username} ",
-    undef   => "",
-  }
-  $cmd_port = $database_port ? {
-    default => "-p ${database_port} ",
-    undef   => "",
-  }
-  $cmd_dbname = $database_name ? {
-    default => "--dbname ${database_name} ",
-    undef   => "--dbname ${postgresql::params::default_database} ",
-  }
-  $env = $database_password ? {
-    default => "PGPASSWORD=${database_password}",
-    undef   => undef,
-  }
-  $cmd = join([$cmd_init, $cmd_host, $cmd_user, $cmd_port, $cmd_dbname])
-  $validate_cmd = "/usr/local/bin/validate_postgresql_connection.sh ${sleep} ${tries} '${cmd}'"
-
-  # This is more of a safety valve, we add a little extra to compensate for the
-  # time it takes to run each psql command.
-  $timeout = (($sleep + 2) * $tries)
-
-  $exec_name = "validate postgres connection for ${database_host}/${database_name}"
-  exec { $exec_name:
-    command     => "echo 'Unable to connect to defined database using: ${cmd}' && false",
-    unless      => $validate_cmd,
-    cwd         => '/tmp',
-    environment => $env,
-    logoutput   => 'on_failure',
-    user        => $run_as,
-    path        => '/bin',
-    timeout     => $timeout,
-    require     => Package['postgresql-client'],
-  }
-
-  # This is a little bit of puppet magic.  What we want to do here is make
-  # sure that if the validation and the database instance creation are being
-  # applied on the same machine, then the database resource is applied *before*
-  # the validation resource.  Otherwise, the validation is guaranteed to fail
-  # on the first run.
-  #
-  # We accomplish this by using Puppet's resource collection syntax to search
-  # for the Database resource in our current catalog; if it exists, the
-  # appropriate relationship is created here.
-  if($create_db_first) {
-    Postgresql::Server::Database<|title == $database_name|> -> Exec[$exec_name]
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/metadata.json
deleted file mode 100644
index 3da197dcc97..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/metadata.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": "3.x"
-    }
-  ],
-  "name": "puppetlabs-postgresql",
-  "version": "3.3.3",
-  "source": "git://github.com/puppetlabs/puppet-postgresql.git",
-  "author": "Inkling/Puppet Labs",
-  "license": "ASL 2.0",
-  "summary": "PostgreSQL defined resource types",
-  "description": "PostgreSQL defined resource types",
-  "project_page": "https://github.com/puppetlabs/puppet-postgresql",
-  "dependencies": [
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">=3.2.0 <5.0.0"
-    },
-    {
-      "name": "puppetlabs/firewall",
-      "version_requirement": ">= 0.0.4"
-    },
-    {
-      "name": "puppetlabs/apt",
-      "version_requirement": ">=1.1.0 <2.0.0"
-    },
-    {
-      "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.0.0 <2.0.0"
-    }
-  ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb
deleted file mode 100644
index eaff5263d4d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/client_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::client:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::client': package_ensure => purged }",
-                   :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::client': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb
deleted file mode 100644
index 441da70e86c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/common_patterns_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'common patterns:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  describe 'postgresql.conf include pattern' do
-    after :all do
-      pp = <<-EOS.unindent
-        class { 'postgresql::server': ensure => absent }
-
-        file { '/tmp/include.conf':
-          ensure => absent
-        }
-      EOS
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it "should support an 'include' directive at the end of postgresql.conf" do
-      pending('no support for include directive with centos 5/postgresql 8.1',
-        :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-
-      pp = <<-EOS.unindent
-        class { 'postgresql::server': }
-
-        $extras = "/etc/postgresql-include.conf"
-
-        file { $extras:
-          content => 'max_connections = 123',
-          seltype => 'postgresql_db_t',
-          seluser => 'system_u',
-          notify  => Class['postgresql::server::service'],
-        }
-
-        postgresql::server::config_entry { 'include':
-          value   => $extras,
-          require => File[$extras],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="show max_connections" -t', 'postgres') do |r|
-        expect(r.stdout).to match(/123/)
-        expect(r.stderr).to eq('')
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb
deleted file mode 100644
index d6dbb956a3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/contrib_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::contrib:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran, remove both contrib and server as contrib
-    # pulls in the server based packages.
-    pp = <<-EOS.unindent
-      class { 'postgresql::server':
-        ensure => absent,
-      }
-      class { 'postgresql::server::contrib':
-        package_ensure => purged,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-      class { 'postgresql::server::contrib': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb
deleted file mode 100644
index 51a5ea988e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/devel_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::lib::devel:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::lib::devel': package_ensure => purged }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::lib::devel': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb
deleted file mode 100644
index c943bed54e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/java_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::lib::java:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::lib::java': package_ensure => purged }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pending('libpostgresql-java-jdbc not available natively for Ubuntu 10.04 and Debian 6',
-      :if => (fact('osfamily') == 'Debian' and ['6', '10'].include?(fact('lsbmajdistrelease'))))
-
-    pp = <<-EOS.unindent
-      class { 'postgresql::lib::java': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb
deleted file mode 100644
index 173204e7153..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/lib/python_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::lib::python:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::lib::python': package_ensure => purged }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pending('psycopg2 not available natively for centos 5', :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-
-    pp = <<-EOS.unindent
-      class { 'postgresql::lib::python': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml
deleted file mode 100644
index 12c9e7893a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-510-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-510-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-510-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-510-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml
deleted file mode 100644
index 2ad90b86aab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-59-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-59-x64:
-    roles:
-      - master
-    platform: el-5-x86_64
-    box : centos-59-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 06398354907..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml
deleted file mode 100644
index 4c8be42d033..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-607-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-607-x64:
-    roles:
-      - master
-    platform: debian-6-amd64
-    box : debian-607-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml
deleted file mode 100644
index 3e31a827602..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/debian-73-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  debian-73-x64:
-    roles:
-      - master
-    platform: debian-7-amd64
-    box : debian-73-x64-virtualbox-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 06398354907..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5047017e623..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index 1c7a34ccbaa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb
deleted file mode 100644
index 5c03a7a8745..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/postgresql_psql_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql_psql:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should run some SQL when the unless query returns no rows' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql_psql { 'foobar':
-        db        => 'postgres',
-        psql_user => 'postgres',
-        command   => 'select 1',
-        unless    => 'select 1 where 1=2',
-        require   => Class['postgresql::server'],
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should not run SQL when the unless query returns rows' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql_psql { 'foobar':
-        db        => 'postgres',
-        psql_user => 'postgres',
-        command   => 'select * from pg_database limit 1',
-        unless    => 'select 1 where 1=1',
-        require   => Class['postgresql::server'],
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb
deleted file mode 100644
index a58903acb56..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/config_entry_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::config_entry:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should change setting and reflect it in show all' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql::server::config_entry { 'check_function_bodies':
-        value => 'off',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    psql('--command="show all" postgres') do |r|
-      expect(r.stdout).to match(/check_function_bodies.+off/)
-      expect(r.stderr).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb
deleted file mode 100644
index 99ce44ddae7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_grant_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::database_grant:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should grant access so a user can create objects in a database' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgres'
-        $user = 'psql_grant_tester'
-        $password = 'psql_grant_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        postgresql::server::database_grant { 'grant create test':
-          privilege => 'CREATE',
-          db        => $db,
-          role      => $user,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      # Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb
deleted file mode 100644
index 7f227d1686b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/database_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::database:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create a db that we can connect to' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgresql_test_db'
-        class { 'postgresql::server': }
-
-        postgresql::server::database { $db: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" postgresql_test_db') do |r|
-        expect(r.stdout).to match(/postgresql_test_db/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database postgresql_test_db" postgres')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb
deleted file mode 100644
index 0287976a857..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/db_spec.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::db', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create a db that we can connect to' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgresql_test_db'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user     => $db,
-          password => postgresql_password($db, $db),
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" postgresql_test_db') do |r|
-        expect(r.stdout).to match(/postgresql_test_db/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database postgresql_test_db" postgres')
-    end
-  end
-
-  it 'should take a locale parameter' do
-    pending('no support for locale parameter with centos 5', :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-    begin
-      pp = <<-EOS.unindent
-        class { 'postgresql::server': }
-        postgresql::server::db { 'test1':
-          user     => 'test1',
-          password => postgresql_password('test1', 'test1'),
-          encoding => 'UTF8',
-          locale   => 'en_NG.UTF-8',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('-c "show lc_ctype" test1') do |r|
-        expect(r.stdout).to match(/en_NG/)
-      end
-
-      psql('-c "show lc_collate" test1') do |r|
-        expect(r.stdout).to match(/en_NG/)
-      end
-    ensure
-      psql('--command="drop database test1" postgres')
-    end
-  end
-
-  it 'should take an istemplate parameter' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'template2'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user       => $db,
-          password   => postgresql_password($db, $db),
-          istemplate => true,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" template2') do |r|
-        expect(r.stdout).to match(/template2/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database template2" postgres', 'postgres', [1,2]) do |r|
-        expect(r.stdout).to eq('')
-        expect(r.stderr).to match(/cannot drop a template database/)
-      end
-    end
-  end
-
-  it 'should update istemplate parameter' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'template2'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user       => $db,
-          password   => postgresql_password($db, $db),
-          istemplate => false,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" template2') do |r|
-        expect(r.stdout).to match(/template2/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database template2" postgres')
-    end
-  end
-
-  it 'should take a template parameter' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgresql_test_db'
-        class { 'postgresql::server': }
-
-        postgresql::server::db { $db:
-          user       => $db,
-          template   => 'template1',
-          password   => postgresql_password($db, $db),
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      psql('--command="select datname from pg_database" postgresql_test_db') do |r|
-        expect(r.stdout).to match(/postgresql_test_db/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop database postgresql_test_db" postgres')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb
deleted file mode 100644
index d34523a60fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/grant_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::grant:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should grant access so a user can create in a database' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'postgres'
-        $user = 'psql_grant_tester'
-        $password = 'psql_grant_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        postgresql::server::grant { 'grant create test':
-          object_type => 'database',
-          privilege   => 'CREATE',
-          db          => $db,
-          role        => $user,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      # Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb
deleted file mode 100644
index bbc8e9464f0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/pg_hba_rule_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::pg_hba_rule:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should create a ruleset in pg_hba.conf' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-      postgresql::server::pg_hba_rule { "allow application network to access app database":
-        type        => "host",
-        database    => "app",
-        user        => "app",
-        address     => "200.1.2.0/24",
-        auth_method => md5,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_failures => true)
-
-    shell("grep '200.1.2.0/24' /etc/postgresql/*/*/pg_hba.conf || grep '200.1.2.0/24' /var/lib/pgsql/data/pg_hba.conf")
-  end
-
-  it 'should create a ruleset in pg_hba.conf that denies db access to db test1' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      postgresql::server::db { "test1":
-        user     => "test1",
-        password => postgresql_password('test1', 'test1'),
-        grant    => "all",
-      }
-
-      postgresql::server::pg_hba_rule { "allow anyone to have access to db test1":
-        type        => "local",
-        database    => "test1",
-        user        => "test1",
-        auth_method => reject,
-        order       => '001',
-      }
-
-      user { "test1":
-        shell      => "/bin/bash",
-        managehome => true,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-
-    shell('su - test1 -c \'psql -U test1 -c "\q" test1\'', :acceptable_exit_codes => [2])
-  end
-
-  it 'should fail catalogue if postgresql::server::manage_pga_conf is disabled' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server':
-        manage_pg_hba_conf => false,
-      }
-      postgresql::server::pg_hba_rule { 'foo':
-        type        => "local",
-        database    => "test1",
-        user        => "test1",
-        auth_method => reject,
-        order       => '001',
-      }
-    EOS
-
-    apply_manifest(pp, :expect_failures => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb
deleted file mode 100644
index 73312845259..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/plperl_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'server plperl:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': ensure => absent }
-      class { 'postgresql::server::plperl': package_ensure => purged }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pending('no support for plperl with default version on centos 5',
-      :if => (fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5'))
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-      class { 'postgresql::server::plperl': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb
deleted file mode 100644
index 2bd2b70db0c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/role_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::role:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create a user who can log in' do
-    pp = <<-EOS.unindent
-      $user = "postgresql_test_user"
-      $password = "postgresql_test_password"
-
-      class { 'postgresql::server': }
-
-      # Since we are not testing pg_hba or any of that, make a local user for ident auth
-      user { $user:
-        ensure => present,
-      }
-
-      postgresql::server::role { $user:
-        password_hash => postgresql_password($user, $password),
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-
-    # Check that the user can log in
-    psql('--command="select datname from pg_database" postgres', 'postgresql_test_user') do |r|
-      expect(r.stdout).to match(/template1/)
-      expect(r.stderr).to eq('')
-    end
-  end
-
-  it 'should idempotently alter a user who can log in' do
-    pp = <<-EOS.unindent
-      $user = "postgresql_test_user"
-      $password = "postgresql_test_password2"
-
-      class { 'postgresql::server': }
-
-      # Since we are not testing pg_hba or any of that, make a local user for ident auth
-      user { $user:
-        ensure => present,
-      }
-
-      postgresql::server::role { $user:
-        password_hash => postgresql_password($user, $password),
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    # Check that the user can log in
-    psql('--command="select datname from pg_database" postgres', 'postgresql_test_user') do |r|
-      expect(r.stdout).to match(/template1/)
-      expect(r.stderr).to eq('')
-    end
-  end
-
-  it 'should idempotently create a user with a cleartext password' do
-    pp = <<-EOS.unindent
-      $user = "postgresql_test_user2"
-      $password = "postgresql_test_password2"
-
-      class { 'postgresql::server': }
-
-      # Since we are not testing pg_hba or any of that, make a local user for ident auth
-      user { $user:
-        ensure => present,
-      }
-
-      postgresql::server::role { $user:
-        password_hash => $password,
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    # Check that the user can log in
-    psql('--command="select datname from pg_database" postgres', 'postgresql_test_user2') do |r|
-      expect(r.stdout).to match(/template1/)
-      expect(r.stderr).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb
deleted file mode 100644
index 6a779d9f631..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/table_grant_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::table_grant:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should grant all accesses to a user' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'table_grant'
-        $user = 'psql_grant_tester'
-        $password = 'psql_table_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        # Create a rule for the user
-        postgresql::server::pg_hba_rule { "allow ${user}":
-          type        => 'local',
-          database    => $db,
-          user        => $user,
-          auth_method => 'ident',
-          order       => 1,
-        }
-
-        postgresql_psql { 'Create testing table':
-          command => 'CREATE TABLE "test_table" (field integer NOT NULL)',
-          db      => $db,
-          unless  => "SELECT * FROM pg_tables WHERE tablename = 'test_table'",
-          require => Postgresql::Server::Database[$db],
-        }
-
-        postgresql::server::table_grant { 'grant insert test':
-          privilege => 'ALL',
-          table     => 'test_table',
-          db        => $db,
-          role      => $user,
-          require   => Postgresql_psql['Create testing table'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      ## Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-
-  it 'should grant access so a user can insert in a table' do
-    begin
-      pp = <<-EOS.unindent
-        $db = 'table_grant'
-        $user = 'psql_grant_tester'
-        $password = 'psql_table_pw'
-
-        class { 'postgresql::server': }
-
-        # Since we are not testing pg_hba or any of that, make a local user for ident auth
-        user { $user:
-          ensure => present,
-        }
-
-        postgresql::server::role { $user:
-          password_hash => postgresql_password($user, $password),
-        }
-
-        postgresql::server::database { $db: }
-
-        # Create a rule for the user
-        postgresql::server::pg_hba_rule { "allow ${user}":
-          type        => 'local',
-          database    => $db,
-          user        => $user,
-          auth_method => 'ident',
-          order       => 1,
-        }
-
-        postgresql_psql { 'Create testing table':
-          command => 'CREATE TABLE "test_table" (field integer NOT NULL)',
-          db      => $db,
-          unless  => "SELECT * FROM pg_tables WHERE tablename = 'test_table'",
-          require => Postgresql::Server::Database[$db],
-        }
-
-        postgresql::server::table_grant { 'grant insert test':
-          privilege => 'INSERT',
-          table     => 'test_table',
-          db        => $db,
-          role      => $user,
-          require   => Postgresql_psql['Create testing table'],
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-
-      ## Check that the user can create a table in the database
-      psql('--command="create table foo (foo int)" postgres', 'psql_grant_tester') do |r|
-        expect(r.stdout).to match(/CREATE TABLE/)
-        expect(r.stderr).to eq('')
-      end
-    ensure
-      psql('--command="drop table foo" postgres', 'psql_grant_tester')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb
deleted file mode 100644
index c633d6da7b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server/tablespace_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::server::tablespace:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should idempotently create tablespaces and databases that are using them' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-
-      file { '/tmp/postgres/pg_tablespaces':
-        ensure => 'directory',
-        owner  => 'postgres',
-        group  => 'postgres',
-        mode   => '0700',
-      }
-
-      postgresql::server::tablespace { 'tablespace1':
-        location => '/tmp/postgres/pg_tablespaces/space1',
-      }
-      postgresql::server::database { 'tablespacedb1':
-        encoding   => 'utf8',
-        tablespace => 'tablespace1',
-      }
-      postgresql::server::db { 'tablespacedb2':
-        user       => 'dbuser2',
-        password   => postgresql_password('dbuser2', 'dbuser2'),
-        tablespace => 'tablespace1',
-      }
-
-      postgresql::server::role { 'spcuser':
-        password_hash => postgresql_password('spcuser', 'spcuser'),
-      }
-      postgresql::server::tablespace { 'tablespace2':
-        location => '/tmp/postgres/pg_tablespaces/space2',
-        owner    => 'spcuser',
-      }
-      postgresql::server::database { 'tablespacedb3':
-        encoding   => 'utf8',
-        tablespace => 'tablespace2',
-      }
-    EOS
-
-    shell('mkdir -p /tmp/postgres')
-    # Apply appropriate selinux labels
-    if fact('osfamily') == 'RedHat'
-      if shell('getenforce').stdout =~ /Enforcing/
-        shell('chcon -Rv --type=postgresql_db_t /tmp/postgres')
-      end
-    end
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-
-    # Check that databases use correct tablespaces
-    psql('--command="select ts.spcname from pg_database db, pg_tablespace ts where db.dattablespace = ts.oid and db.datname = \'"\'tablespacedb1\'"\'"') do |r|
-      expect(r.stdout).to match(/tablespace1/)
-      expect(r.stderr).to eq('')
-    end
-
-    psql('--command="select ts.spcname from pg_database db, pg_tablespace ts where db.dattablespace = ts.oid and db.datname = \'"\'tablespacedb3\'"\'"') do |r|
-      expect(r.stdout).to match(/tablespace2/)
-      expect(r.stderr).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb
deleted file mode 100644
index b8456ee76d4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/server_spec.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'server:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    # Cleanup after tests have ran
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'test loading class with no parameters' do
-    pp = <<-EOS.unindent
-      class { 'postgresql::server': }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-    apply_manifest(pp, :catch_changes => true)
-  end
-
-  describe port(5432) do
-    it { should be_listening }
-  end
-
-  describe 'setting postgres password' do
-    it 'should install and successfully adjust the password' do
-      pp = <<-EOS.unindent
-        class { 'postgresql::server':
-          postgres_password          => 'foobarbaz',
-          ip_mask_deny_postgres_user => '0.0.0.0/32',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/\[set_postgres_postgrespw\]\/returns: executed successfully/)
-      end
-      apply_manifest(pp, :catch_changes => true)
-
-      pp = <<-EOS.unindent
-        class { 'postgresql::server':
-          postgres_password          => 'TPSR$$eports!',
-          ip_mask_deny_postgres_user => '0.0.0.0/32',
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/\[set_postgres_postgrespw\]\/returns: executed successfully/)
-      end
-      apply_manifest(pp, :catch_changes => true)
-
-    end
-  end
-end
-
-describe 'server without defaults:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  context 'test installing non-default version of postgresql' do
-    after :all do
-      psql('--command="drop database postgresql_test_db" postgres', 'postgres')
-      pp = <<-EOS.unindent
-        if $::osfamily == 'Debian' {
-          class { 'apt': }
-          # XXX Need to purge postgresql-common after uninstalling 9.3 because
-          # it leaves the init script behind. Poor packaging.
-          package { 'postgresql-common':
-            ensure  => purged,
-            require => Class['postgresql::server'],
-          }
-        }
-        class { 'postgresql::globals':
-          ensure              => absent,
-          manage_package_repo => true,
-          version             => '9.3',
-        }
-        class { 'postgresql::server':
-          ensure => absent,
-        }
-      EOS
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq('')
-    end
-
-    it 'perform installation and create a db' do
-      pp = <<-EOS.unindent
-        if $::osfamily == 'Debian' {
-          class { 'apt': }
-        }
-        class { "postgresql::globals":
-          version             => "9.3",
-          manage_package_repo => true,
-          encoding            => 'UTF8',
-          locale              => 'en_US.UTF-8',
-          xlogdir             => '/tmp/pg_xlogs',
-        }
-        class { "postgresql::server": }
-        postgresql::server::db { "postgresql_test_db":
-          user     => "foo1",
-          password => postgresql_password('foo1', 'foo1'),
-        }
-        postgresql::server::config_entry { 'port':
-          value => '5432',
-        }
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stderr).to eq('')
-      apply_manifest(pp, :catch_changes => true)
-
-      shell('test -d /tmp/pg_xlogs') do |r|
-        expect(r.stdout).to eq('')
-        expect(r.stderr).to eq('')
-      end
-
-      psql('postgresql_test_db --command="select datname from pg_database limit 1"')
-    end
-
-    describe port(5432) do
-      it { should be_listening }
-    end
-  end
-
-  unless ((fact('osfamily') == 'RedHat' and fact('lsbmajdistrelease') == '5') ||
-    fact('osfamily') == 'Debian')
-
-    context 'override locale and encoding' do
-      after :each do
-        apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-      end
-
-      it 'perform installation with different locale and encoding' do
-        pp = <<-EOS.unindent
-          class { 'postgresql::server':
-            locale   => 'en_NG',
-            encoding => 'UTF8',
-          }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-        apply_manifest(pp, :catch_changes => true)
-
-        # Remove db first, if it exists for some reason
-        shell('su postgres -c "dropdb test1"', :acceptable_exit_codes => [0,1,2])
-        shell('su postgres -c "createdb test1"')
-        shell('su postgres -c \'psql -c "show lc_ctype" test1\'') do |r|
-          expect(r.stdout).to match(/en_NG/)
-        end
-
-        shell('su postgres -c \'psql -c "show lc_collate" test1\'') do |r|
-          expect(r.stdout).to match(/en_NG/)
-        end
-      end
-    end
-  end
-end
-
-describe 'server with firewall:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  context 'test installing postgresql with firewall management on' do
-    it 'perform installation and make sure it is idempotent' do
-      pending('no support for firewall with fedora', :if => (fact('operatingsystem') == 'Fedora'))
-      pp = <<-EOS.unindent
-        class { 'firewall': }
-        class { "postgresql::server":
-          manage_firewall => true,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-  end
-end
-
-describe 'server without pg_hba.conf:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  after :all do
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  context 'test installing postgresql without pg_hba.conf management on' do
-    it 'perform installation and make sure it is idempotent' do
-      pp = <<-EOS.unindent
-        class { "postgresql::server":
-          manage_pg_hba_conf => false,
-        }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      apply_manifest(pp, :catch_changes => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb
deleted file mode 100644
index 1f64a1fa5e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  it 'should fail for client' do
-    pp = <<-EOS
-    class { 'postgresql::client': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not provide defaults for osfamily/i)
-  end
-  it 'should fail for server' do
-    pp = <<-EOS
-    class { 'postgresql::server': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not provide defaults for osfamily/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb
deleted file mode 100644
index 0bfe509d273..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/acceptance/validate_db_connection_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'postgresql::validate_db_connection:', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  before :all do
-    # Setup postgresql server and a sample database for tests to use.
-    pp = <<-EOS.unindent
-      $db = 'foo'
-      class { 'postgresql::server': }
-
-      postgresql::server::db { $db:
-        user     => $db,
-        password => postgresql_password($db, $db),
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  after :all do
-    # Remove postgresql server after all tests have ran.
-    apply_manifest("class { 'postgresql::server': ensure => absent }", :catch_failures => true)
-  end
-
-  it 'should run puppet with no changes declared if socket connectivity works' do
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foo':
-        database_name => 'foo',
-        run_as        => 'postgres',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should keep retrying if database is down' do
-    # So first we shut the db down, then background a startup routine with a
-    # sleep 10 in front of it. That way the tests should continue while
-    # the pause and db startup happens in the background.
-    shell("/etc/init.d/postgresql* stop")
-    shell('nohup bash -c "sleep 10; /etc/init.d/postgresql* start" > /dev/null 2>&1 &')
-
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foo':
-        database_name => 'foo',
-        tries         => 30,
-        sleep         => 1,
-        run_as        => 'postgres',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should run puppet with no changes declared if db ip connectivity works' do
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foo':
-        database_host     => 'localhost',
-        database_name     => 'foo',
-        database_username => 'foo',
-        database_password => 'foo',
-      }
-    EOS
-
-    apply_manifest(pp, :catch_failures => true)
-  end
-
-  it 'should fail catalogue if database connectivity fails' do
-    pp = <<-EOS.unindent
-      postgresql::validate_db_connection { 'foobarbaz':
-        database_host     => 'localhost',
-        database_name     => 'foobarbaz',
-        database_username => 'foobarbaz',
-        database_password => 'foobarbaz',
-      }
-    EOS
-
-    apply_manifest(pp, :expect_failures => true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper.rb
deleted file mode 100644
index b4c44aa851e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-RSpec.configure do |c|
-  c.mock_with :rspec do |mock|
-    mock.syntax = [:expect, :should]
-  end
-  c.include PuppetlabsSpec::Files
-
-  c.before :each do
-    # Ensure that we don't accidentally cache facts and environment
-    # between test cases.
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-
-    # Store any environment variables away to be restored later
-    @old_env = {}
-    ENV.each_key {|k| @old_env[k] = ENV[k]}
-  end
-
-  c.after :each do
-    PuppetlabsSpec::Files.cleanup
-  end
-end
-
-# Convenience helper for returning parameters for a type from the
-# catalogue.
-def param(type, title, param)
-  param_value(catalogue, type, title, param)
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 4984da6b523..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
-
-class String
-  # Provide ability to remove indentation from strings, for the purpose of
-  # left justifying heredoc blocks.
-  def unindent
-    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
-  end
-end
-
-def shellescape(str)
-  str = str.to_s
-
-  # An empty argument will be skipped, so return empty quotes.
-  return "''" if str.empty?
-
-  str = str.dup
-
-  # Treat multibyte characters as is.  It is caller's responsibility
-  # to encode the string in the right encoding for the shell
-  # environment.
-  str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
-
-  # A LF cannot be escaped with a backslash because a backslash + LF
-  # combo is regarded as line continuation and simply ignored.
-  str.gsub!(/\n/, "'\n'")
-
-  return str
-end
-
-def psql(psql_cmd, user = 'postgres', exit_codes = [0], &block)
-  psql = "psql #{psql_cmd}"
-  shell("su #{shellescape(user)} -c #{shellescape(psql)}", :acceptable_exit_codes => exit_codes, &block)
-end
-
-unless ENV['RS_PROVISION'] == 'no'
-  hosts.each do |host|
-    if host.is_pe?
-      install_pe
-    else
-      install_puppet
-      on host, "mkdir -p #{host['distmoduledir']}"
-    end
-  end
-end
-
-UNSUPPORTED_PLATFORMS = ['AIX','windows','Solaris','Suse']
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'postgresql')
-    hosts.each do |host|
-      on host, "/bin/touch #{default['puppetpath']}/hiera.yaml"
-      on host, 'chmod 755 /root'
-      if fact('osfamily') == 'Debian'
-        on host, "echo \"en_US ISO-8859-1\nen_NG.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\n\" > /etc/locale.gen"
-        on host, '/usr/sbin/locale-gen'
-        on host, '/usr/sbin/update-locale'
-      end
-      on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-firewall'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
-      on host, puppet('module','install','puppetlabs-concat'), { :acceptable_exit_codes => [0,1] }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb
deleted file mode 100644
index dd24dbfd4ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/client_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::client', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  describe 'with parameters' do
-    let :params do
-      {
-        :package_ensure => 'absent',
-        :package_name => 'mypackage',
-      }
-    end
-
-    it 'should modify package' do
-      should contain_package("postgresql-client").with({
-        :ensure => 'absent',
-        :name => 'mypackage',
-        :tag => 'postgresql',
-      })
-    end
-  end
-
-  describe 'with no parameters' do
-    it 'should create package with postgresql tag' do
-      should contain_package('postgresql-client').with({
-        :tag => 'postgresql',
-      })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb
deleted file mode 100644
index f8feb2f7825..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/globals_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::globals', :type => :class do
-  let :facts do
-    {
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :lsbdistid              => 'Debian',
-    }
-  end
-
-  describe 'with no parameters' do
-    it 'should work' do
-      should contain_class("postgresql::globals")
-    end
-  end
-
-  describe 'manage_package_repo => true' do
-    let(:params) do
-      {
-        :manage_package_repo => true,
-      }
-    end
-    it 'should pull in class postgresql::repo' do
-      should contain_class("postgresql::repo")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb
deleted file mode 100644
index 8c289fc54ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/devel_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::lib::devel', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-  it { should contain_class("postgresql::lib::devel") }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb
deleted file mode 100644
index 7541bf586f4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/java_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::lib::java', :type => :class do
-
-  describe 'on a debian based os' do
-    let :facts do {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-    end
-    it { should contain_package('postgresql-jdbc').with(
-      :name   => 'libpostgresql-jdbc-java',
-      :ensure => 'present'
-    )}
-  end
-
-  describe 'on a redhat based os' do
-    let :facts do {
-      :osfamily => 'RedHat',
-      :operatingsystem => 'RedHat',
-      :operatingsystemrelease => '6.4',
-    }
-    end
-    it { should contain_package('postgresql-jdbc').with(
-      :name => 'postgresql-jdbc',
-      :ensure => 'present'
-    )}
-    describe 'when parameters are supplied' do
-      let :params do
-        {:package_ensure => 'latest', :package_name => 'somepackage'}
-      end
-      it { should contain_package('postgresql-jdbc').with(
-        :name => 'somepackage',
-        :ensure => 'latest'
-      )}
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb
deleted file mode 100644
index ab3fd3207dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/lib/python_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::lib::python', :type => :class do
-
-  describe 'on a redhat based os' do
-    let :facts do {
-      :osfamily => 'RedHat',
-      :operatingsystem => 'RedHat',
-      :operatingsystemrelease => '6.4',
-    }
-    end
-    it { should contain_package('python-psycopg2').with(
-      :name => 'python-psycopg2',
-      :ensure => 'present'
-    )}
-  end
-
-  describe 'on a debian based os' do
-    let :facts do {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-    end
-    it { should contain_package('python-psycopg2').with(
-      :name => 'python-psycopg2',
-      :ensure => 'present'
-    )}
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb
deleted file mode 100644
index 730fd1097a1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/params_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::params', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-  it { should contain_class("postgresql::params") }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb
deleted file mode 100644
index e7e286f6421..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/repo_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::repo', :type => :class do
-  let :facts do
-    {
-      :osfamily               => 'Debian',
-      :operatingsystem        => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :lsbdistid              => 'Debian',
-    }
-  end
-
-  describe 'with no parameters' do
-    it 'should instantiate apt_postgresql_org class' do
-      should contain_class('postgresql::repo::apt_postgresql_org')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb
deleted file mode 100644
index 9fbab060f05..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/contrib_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::contrib', :type => :class do
-  let :pre_condition do
-    "class { 'postgresql::server': }"
-  end
-
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :kernel => 'Linux',
-      :concat_basedir => tmpfilename('contrib'),
-    }
-  end
-
-  describe 'with parameters' do
-    let(:params) do
-      {
-        :package_name => 'mypackage',
-        :package_ensure => 'absent',
-      }
-    end
-
-    it 'should create package with correct params' do
-      should contain_package('postgresql-contrib').with({
-        :ensure => 'absent',
-        :name => 'mypackage',
-        :tag => 'postgresql',
-      })
-    end
-  end
-
-  describe 'with no parameters' do
-    it 'should create package with postgresql tag' do
-      should contain_package('postgresql-contrib').with({
-        :tag => 'postgresql',
-      })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb
deleted file mode 100644
index bcf2dbe1bc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/initdb_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::initdb', :type => :class do
-  let (:pre_condition) do
-    "include postgresql::server"
-  end
-  describe 'on RedHat' do
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-        :operatingsystem => 'CentOS',
-        :operatingsystemrelease => '6.0',
-        :concat_basedir => tmpfilename('server'),
-      }
-    end
-    it { should contain_file('/var/lib/pgsql/data').with_ensure('directory') }
-  end
-  describe 'on Amazon' do
-    let :facts do
-      {
-        :osfamily => 'RedHat',
-        :operatingsystem => 'Amazon',
-        :concat_basedir => tmpfilename('server'),
-      }
-    end
-    it { should contain_file('/var/lib/pgsql9/data').with_ensure('directory') }
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb
deleted file mode 100644
index 785ed9a7f00..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server/plperl_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::plperl', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :kernel => 'Linux',
-      :concat_basedir => tmpfilename('plperl'),
-    }
-  end
-
-  let :pre_condition do
-    "class { 'postgresql::server': }"
-  end
-
-  describe 'with no parameters' do
-    it { should contain_class("postgresql::server::plperl") }
-    it 'should create package' do
-      should contain_package('postgresql-plperl').with({
-        :ensure => 'present',
-        :tag => 'postgresql',
-      })
-    end
-  end
-
-  describe 'with parameters' do
-    let :params do
-      {
-        :package_ensure => 'absent',
-        :package_name => 'mypackage',
-      }
-    end
-
-    it { should contain_class("postgresql::server::plperl") }
-    it 'should create package with correct params' do
-      should contain_package('postgresql-plperl').with({
-        :ensure => 'absent',
-        :name => 'mypackage',
-        :tag => 'postgresql',
-      })
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb
deleted file mode 100644
index 203eecb51d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/classes/server_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server', :type => :class do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :concat_basedir => tmpfilename('server'),
-      :kernel => 'Linux',
-    }
-  end
-
-  describe 'with no parameters' do
-    it { should contain_class("postgresql::params") }
-    it { should contain_class("postgresql::server") }
-    it 'should validate connection' do
-      should contain_postgresql__validate_db_connection('validate_service_is_running')
-    end
-  end
-
-  describe 'manage_firewall => true' do
-    let(:params) do
-      {
-        :manage_firewall => true,
-        :ensure => true,
-      }
-    end
-
-    it 'should create firewall rule' do
-      should contain_firewall("5432 accept - postgres")
-    end
-  end
-
-  describe 'ensure => absent' do
-    let(:params) do
-      {
-        :ensure => 'absent',
-        :datadir => '/my/path',
-        :xlogdir => '/xlog/path',
-      }
-    end
-
-    it 'should make package purged' do
-      should contain_package('postgresql-server').with({
-        :ensure => 'purged',
-      })
-    end
-
-    it 'stop the service' do
-      should contain_service('postgresqld').with({
-        :ensure => false,
-      })
-    end
-
-    it 'should remove datadir' do
-      should contain_file('/my/path').with({
-        :ensure => 'absent',
-      })
-    end
-
-    it 'should remove xlogdir' do
-      should contain_file('/xlog/path').with({
-        :ensure => 'absent',
-      })
-    end
-  end
-
-  describe 'package_ensure => absent' do
-    let(:params) do
-      {
-        :package_ensure => 'absent',
-      }
-    end
-
-    it 'should remove the package' do
-      should contain_package('postgresql-server').with({
-        :ensure => 'purged',
-      })
-    end
-
-    it 'should still enable the service' do
-      should contain_service('postgresqld').with({
-        :ensure => true,
-      })
-    end
-  end
-
-  describe 'needs_initdb => true' do
-    let(:params) do
-      {
-        :needs_initdb => true,
-      }
-    end
-
-    it 'should contain proper initdb exec' do
-      should contain_exec('postgresql_initdb')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb
deleted file mode 100644
index 4c25c67916e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/config_entry_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::config_entry', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'RedHat',
-      :operatingsystem => 'RedHat',
-      :operatingsystemrelease => '6.4',
-    }
-  end
-
-  let(:title) { 'config_entry'}
-
-  let :target do
-    tmpfilename('postgresql_conf')
-  end
-
-  context "syntax check" do
-    let(:params) { { :ensure => 'present'} }
-    it { should contain_postgresql__server__config_entry('config_entry') }
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb
deleted file mode 100644
index 2e481df9fba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_grant_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::database_grant', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :privilege => 'ALL',
-      :db => 'test',
-      :role => 'test',
-    }
-  end
-
-  it { should contain_postgresql__server__database_grant('test') }
-  it { should contain_postgresql__server__grant('database:test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb
deleted file mode 100644
index a703827fec1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/database_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::database', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-  let :title do
-    'test'
-  end
-  it { should contain_postgresql__server__database('test') }
-  it { should contain_postgresql_psql("Check for existence of db 'test'") }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb
deleted file mode 100644
index 60fa9a9315d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/db_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::db', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :user => 'test',
-      :password => 'test',
-      :owner => 'tester',
-    }
-  end
-
-  it { should contain_postgresql__server__db('test') }
-  it { should contain_postgresql__server__database('test').with_owner('tester') }
-  it { should contain_postgresql__server__role('test') }
-  it { should contain_postgresql__server__database_grant('GRANT test - ALL - test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb
deleted file mode 100644
index 43eeb8c01de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/grant_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::grant', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :db => 'test',
-      :role => 'test',
-    }
-  end
-
-  it { should contain_postgresql__server__grant('test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb
deleted file mode 100644
index b01e338a4bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/pg_hba_rule_spec.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::pg_hba_rule', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-      :concat_basedir => tmpfilename('pg_hba'),
-    }
-  end
-  let :title do
-    'test'
-  end
-  let :target do
-    tmpfilename('pg_hba_rule')
-  end
-
-  context 'test template 1' do
-    let :params do
-      {
-        :type => 'host',
-        :database => 'all',
-        :user => 'all',
-        :address => '1.1.1.1/24',
-        :auth_method => 'md5',
-        :target => target,
-      }
-    end
-    it do
-      content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-      content.should =~ /host\s+all\s+all\s+1\.1\.1\.1\/24\s+md5/
-    end
-  end
-
-  context 'test template 2' do
-    let :params do
-      {
-        :type => 'local',
-        :database => 'all',
-        :user => 'all',
-        :auth_method => 'ident',
-        :target => target,
-      }
-    end
-    it do
-      content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-      content.should =~ /local\s+all\s+all\s+ident/
-    end
-  end
-
-  context 'test template 3' do
-    let :params do
-      {
-        :type => 'host',
-        :database => 'all',
-        :user => 'all',
-        :address => '0.0.0.0/0',
-        :auth_method => 'ldap',
-        :auth_option => 'foo=bar',
-        :target => target,
-      }
-    end
-    it do
-      content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-      content.should =~ /host\s+all\s+all\s+0\.0\.0\.0\/0\s+ldap\s+foo=bar/
-    end
-  end
-
-  context 'validation' do
-    context 'validate type test 1' do
-      let :params do
-        {
-          :type => 'invalid',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'ldap',
-          :target => target,
-        }
-      end
-      it 'should fail parsing when type is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
-          /The type you specified \[invalid\] must be one of/)
-      end
-    end
-
-    context 'validate auth_method' do
-      let :params do
-        {
-          :type => 'local',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'invalid',
-          :target => target,
-        }
-      end
-
-      it 'should fail parsing when auth_method is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
-          /The auth_method you specified \[invalid\] must be one of/)
-      end
-    end
-
-    context 'validate unsupported auth_method' do
-      let :pre_condition do
-        <<-EOS
-          class { 'postgresql::globals':
-            version => '9.0',
-          }
-          class { 'postgresql::server': }
-        EOS
-      end
-
-      let :params do
-        {
-          :type => 'local',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'peer',
-          :target => target,
-        }
-      end
-
-      it 'should fail parsing when auth_method is not valid' do
-        expect {subject}.to raise_error(Puppet::Error,
-          /The auth_method you specified \[peer\] must be one of: trust, reject, md5, sha1, password, gss, sspi, krb5, ident, ldap, radius, cert, pam/)
-      end
-    end
-
-    context 'validate supported auth_method' do
-      let :pre_condition do
-        <<-EOS
-          class { 'postgresql::globals':
-            version => '9.2',
-          }
-          class { 'postgresql::server': }
-        EOS
-      end
-
-      let :params do
-        {
-          :type => 'local',
-          :database => 'all',
-          :user => 'all',
-          :address => '0.0.0.0/0',
-          :auth_method => 'peer',
-          :target => target,
-        }
-      end
-
-      it do
-        content = param('concat::fragment', 'pg_hba_rule_test', 'content')
-        content.should =~ /local\s+all\s+all\s+0\.0\.0\.0\/0\s+peer/
-      end
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb
deleted file mode 100644
index a50ca1448ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/role_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::role', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :password_hash => 'test',
-    }
-  end
-
-  it { should contain_postgresql__server__role('test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb
deleted file mode 100644
index 15136a71e25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/table_grant_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::table_grant', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :privilege => 'ALL',
-      :db => 'test',
-      :role => 'test',
-      :table => 'foo',
-    }
-  end
-
-  it { should contain_postgresql__server__table_grant('test') }
-  it { should contain_postgresql__server__grant('table:test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb
deleted file mode 100644
index eb29f1e5773..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/server/tablespace_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::server::tablespace', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  let :params do
-    {
-      :location => '/srv/data/foo',
-    }
-  end
-
-  it { should contain_postgresql__server__tablespace('test') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb
deleted file mode 100644
index 7a248f6c09a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/defines/validate_db_connection_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql::validate_db_connection', :type => :define do
-  let :facts do
-    {
-      :osfamily => 'Debian',
-      :operatingsystem => 'Debian',
-      :operatingsystemrelease => '6.0',
-    }
-  end
-
-  let :title do
-    'test'
-  end
-
-  describe 'should work with only default parameters' do
-    it { should contain_postgresql__validate_db_connection('test') }
-  end
-
-  describe 'should work with all parameters' do
-    let :params do
-      {
-        :database_host => 'test',
-        :database_name => 'test',
-        :database_password => 'test',
-        :database_username => 'test',
-        :database_port => 5432,
-        :run_as => 'postgresq',
-        :sleep => 4,
-        :tries => 30,
-      }
-    end
-    it { should contain_postgresql__validate_db_connection('test') }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb
deleted file mode 100644
index 0ac1d1bfdab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_acls_to_resources_hash_spec.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql_acls_to_resources_hash', :type => :puppet_function do
-  context 'individual transform tests' do
-    it do
-      input = 'local   all             postgres                                ident'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"local",
-          "database"=>"all",
-          "user"=>"postgres",
-          "auth_method"=>"ident",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'local   all             root                                ident'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"local",
-          "database"=>"all",
-          "user"=>"root",
-          "auth_method"=>"ident",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input_array = [
-        'local   all             all                                     ident',
-      ]
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"local",
-          "database"=>"all",
-          "user"=>"all",
-          "auth_method"=>"ident",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params(input_array, 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             127.0.0.1/32            md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"127.0.0.1/32",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             0.0.0.0/0            md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"0.0.0.0/0",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             ::1/128                 md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"::1/128",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             1.1.1.1 255.255.255.0    md5'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"1.1.1.1 255.255.255.0",
-          "auth_method"=>"md5",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-
-    it do
-      input = 'host    all             all             1.1.1.1 255.255.255.0   ldap ldapserver=ldap.example.net ldapprefix="cn=" ldapsuffix=", dc=example, dc=net"'
-      result = {
-        "postgresql class generated rule test 0"=>{
-          "type"=>"host",
-          "database"=>"all",
-          "user"=>"all",
-          "address"=>"1.1.1.1 255.255.255.0",
-          "auth_method"=>"ldap",
-          "auth_option"=>"ldapserver=ldap.example.net ldapprefix=\"cn=\" ldapsuffix=\", dc=example, dc=net\"",
-          "order"=>"100",
-        },
-      }
-
-      should run.with_params([input], 'test', 100).and_return(result)
-    end
-  end
-
-  it 'should return an empty hash when input is empty array' do
-    should run.with_params([], 'test', 100).and_return({})
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb
deleted file mode 100644
index ee1157d0e7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_escape_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql_escape', :type => :puppet_function do
-  it { should run.with_params('foo').
-    and_return('$$foo$$') }
-end
-describe 'postgresql_escape', :type => :puppet_function do
-  it { should run.with_params('fo$$o').
-    and_return('$ed$fo$$o$ed$') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb
deleted file mode 100644
index 0d043f87340..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/functions/postgresql_password_spec.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'spec_helper'
-
-describe 'postgresql_password', :type => :puppet_function do
-  it { should run.with_params('foo', 'bar').
-    and_return('md596948aad3fcae80c08a35c9b5958cd89') }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb
deleted file mode 100644
index 2e2bfbe2d01..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/provider/postgresql_conf/parsed_spec.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'spec_helper'
-require "tempfile"
-
-provider_class = Puppet::Type.type(:postgresql_conf).provider(:parsed)
-
-describe provider_class do
-  let(:title) { 'postgresql_conf' }
-  let(:provider) {
-    conf_class = Puppet::Type.type(:postgresql_conf)
-    provider = conf_class.provider(:parsed)
-    conffile = tmpfilename('postgresql.conf')
-    provider.any_instance.stubs(:target).returns conffile
-    provider
-  }
-
-  before do
-  end
-
-  after :each do
-    provider.initvars
-  end
-
-  describe "simple configuration that should be allowed" do
-    it "should parse a simple ini line" do
-      provider.parse_line("listen_addreses = '*'").should ==
-        { :name=>"listen_addreses", :value=>"*", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should parse a simple ini line (2)" do
-      provider.parse_line("   listen_addreses = '*'").should ==
-        { :name=>"listen_addreses", :value=>"*", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should parse a simple ini line (3)" do
-      provider.parse_line("listen_addreses = '*' # dont mind me").should ==
-        { :name=>"listen_addreses", :value=>"*", :comment=>"dont mind me", :record_type=>:parsed }
-    end
-
-    it "should parse a comment" do
-      provider.parse_line("# dont mind me").should ==
-        { :line=>"# dont mind me", :record_type=>:comment }
-    end
-
-    it "should parse a comment (2)" do
-      provider.parse_line(" \t# dont mind me").should ==
-        { :line=>" \t# dont mind me", :record_type=>:comment }
-    end
-
-    it "should allow includes" do
-      provider.parse_line("include puppetextra").should ==
-        { :name=>"include", :value=>"puppetextra", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should allow numbers thorugh without quotes" do
-      provider.parse_line("wal_keep_segments = 32").should ==
-        { :name=>"wal_keep_segments", :value=>"32", :comment=>nil, :record_type=>:parsed }
-    end
-
-    it "should allow blanks thorugh " do
-      provider.parse_line("").should ==
-        { :line=>"", :record_type=>:blank }
-    end
-
-    it "should parse keys with dots " do
-      provider.parse_line("auto_explain.log_min_duration = 1ms").should ==
-        { :name => "auto_explain.log_min_duration", :value => "1ms", :comment => nil, :record_type => :parsed }
-    end
-  end
-
-  describe "configuration that should be set" do
-    it "should set comment lines" do
-      provider.to_line({ :line=>"# dont mind me", :record_type=>:comment }).should ==
-        '# dont mind me'
-    end
-
-    it "should set blank lines" do
-      provider.to_line({ :line=>"", :record_type=>:blank }).should ==
-        ''
-    end
-
-    it "should set simple configuration" do
-      provider.to_line({:name=>"listen_addresses", :value=>"*", :comment=>nil, :record_type=>:parsed }).should ==
-        "listen_addresses = '*'"
-    end
-
-    it "should set simple configuration with period in name" do
-      provider.to_line({:name => "auto_explain.log_min_duration", :value => '100ms', :comment => nil, :record_type => :parsed }).should ==
-        "auto_explain.log_min_duration = 100ms"
-    end
-
-    it "should set simple configuration even with comments" do
-      provider.to_line({:name=>"listen_addresses", :value=>"*", :comment=>'dont mind me', :record_type=>:parsed }).should ==
-        "listen_addresses = '*' # dont mind me"
-    end
-
-    it 'should quote includes' do
-      provider.to_line( {:name=>"include", :value=>"puppetextra", :comment=>nil, :record_type=>:parsed }).should ==
-        "include 'puppetextra'"
-    end
-
-    it 'should quote multiple words' do
-      provider.to_line( {:name=>"archive_command", :value=>"rsync up", :comment=>nil, :record_type=>:parsed }).should ==
-        "archive_command = 'rsync up'"
-    end
-
-    it 'shouldn\'t quote numbers' do
-      provider.to_line( {:name=>"wal_segments", :value=>"32", :comment=>nil, :record_type=>:parsed }).should ==
-        "wal_segments = 32"
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb
deleted file mode 100644
index 325e3dbd4bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:postgresql_psql).provider(:ruby) do
-  let(:name) { 'rspec psql test' }
-  let(:resource) do
-    Puppet::Type.type(:postgresql_psql).new({ :name => name, :provider => :ruby }.merge attributes)
-  end
-
-  let(:provider) { resource.provider }
-
-  context("#run_sql_command") do
-    describe "with default attributes" do
-      let(:attributes) do { :db => 'spec_db' } end
-
-      it "executes with the given psql_path on the given DB" do
-        expect(provider).to receive(:run_command).with(['psql', '-d',
-          attributes[:db], '-t', '-c', 'SELECT something'], 'postgres',
-          'postgres')
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-    describe "with psql_path and db" do
-      let(:attributes) do {
-        :psql_path  => '/opt/postgres/psql',
-        :psql_user  => 'spec_user',
-        :psql_group => 'spec_group',
-        :cwd        => '/spec',
-        :db         => 'spec_db'
-      } end
-
-      it "executes with the given psql_path on the given DB" do
-        expect(Dir).to receive(:chdir).with(attributes[:cwd]).and_yield
-        expect(provider).to receive(:run_command).with([attributes[:psql_path],
-          '-d', attributes[:db], '-t', '-c', 'SELECT something'],
-          attributes[:psql_user], attributes[:psql_group])
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-    describe "with search_path string" do
-      let(:attributes) do {
-        :search_path => "schema1"
-      } end
-
-      it "executes with the given search_path" do
-        expect(provider).to receive(:run_command).with(['psql', '-t', '-c',
-          'set search_path to schema1; SELECT something'],
-          'postgres', 'postgres')
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-    describe "with search_path array" do
-      let(:attributes) do {
-        :search_path => ['schema1','schema2'],
-      } end
-
-      it "executes with the given search_path" do
-        expect(provider).to receive(:run_command).with(['psql', '-t', '-c',
-          'set search_path to schema1,schema2; SELECT something'],
-          'postgres',
-          'postgres'
-        )
-
-        provider.run_sql_command("SELECT something")
-      end
-    end
-
-  end
-
-  context("#command") do
-    context "when unless is specified" do
-      [:true, :false, true, false].each do |refresh|
-        context "and refreshonly is #{refresh}" do
-          let(:attributes) { {
-            :command     => 'SELECT something',
-            :db          => 'spec_db',
-            :unless      => 'SELECT something',
-            :refreshonly => refresh
-          } }
-
-          it "does not fail when the status is successful" do
-            expect(provider).to receive(:run_unless_sql_command).and_return ["1 row returned", 0]
-            provider.command
-          end
-
-          it "returns the given command when rows are returned" do
-            expect(provider).to receive(:run_unless_sql_command).and_return ["1 row returned", 0]
-            expect(provider.command).to eq("SELECT something")
-          end
-
-          it "does not return the given command when no rows are returned" do
-            expect(provider).to receive(:run_unless_sql_command).and_return ["0 rows returned", 0]
-            expect(provider.command).to_not eq("SELECT something")
-          end
-
-          it "raises an error when the sql command fails" do
-            allow(provider).to receive(:run_unless_sql_command).and_return ["Something went wrong", 1]
-            expect { provider.command }.to raise_error(Puppet::Error, /Something went wrong/)
-          end
-        end
-      end
-    end
-
-    context "when unless is not specified" do
-      context "and refreshonly is true" do
-        let(:attributes) do {
-          :command     => 'SELECT something',
-          :db          => 'spec_db',
-          :refreshonly => :true
-        } end
-        it "does not run unless sql command" do
-          expect(provider).to_not receive(:run_unless_sql_command)
-          provider.command
-        end
-
-        it "returns the given command do disable sync" do
-          expect(provider.command).to eq("SELECT something")
-        end
-      end
-
-      context "and refreshonly is false" do
-        let(:attributes) do {
-          :command     => 'SELECT something',
-          :db          => 'spec_db',
-          :refreshonly => :false
-        } end
-        it "does not run unless sql command" do
-          expect(provider).to_not receive(:run_unless_sql_command)
-          provider.command
-        end
-
-        it "does not return the command so as to enable sync" do
-          expect(provider.command).to_not eq("SELECT something")
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb
deleted file mode 100644
index e89c05fedf8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/puppet/type/postgresql_psql_spec.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:postgresql_psql), "when validating attributes" do
-  [:name, :unless, :db, :psql_path, :psql_user, :psql_group].each do |attr|
-    it "should have a #{attr} parameter" do
-      expect(Puppet::Type.type(:postgresql_psql).attrtype(attr)).to eq(:param)
-    end
-  end
-
-  [:command].each do |attr|
-    it "should have a #{attr} property" do
-      expect(Puppet::Type.type(:postgresql_psql).attrtype(attr)).to eq(:property)
-    end
-  end
-end
-
-describe Puppet::Type.type(:postgresql_psql), :unless => Puppet.features.microsoft_windows? do
-  subject do
-    Puppet::Type.type(:postgresql_psql).new({:name => 'rspec'}.merge attributes)
-  end
-
-  describe "available attributes" do
-    {
-      :name        => "rspec",
-      :command     => "SELECT stuff",
-      :unless      => "SELECT other,stuff",
-      :db          => "postgres",
-      :psql_path   => "/bin/false",
-      :psql_user   => "postgres",
-      :psql_group  => "postgres",
-      :cwd         => "/var/lib",
-      :refreshonly => :true,
-      :search_path => [ "schema1", "schema2"]
-    }.each do |attr, value|
-      context attr do
-        let(:attributes) do { attr => value } end
-        its([attr]) { should == value }
-      end
-    end
-
-    context "default values" do
-      let(:attributes) do {} end
-      its([:psql_path]) { should eq("psql") }
-      its([:psql_user]) { should eq("postgres") }
-      its([:psql_group]) { should eq("postgres") }
-      its([:cwd]) { should eq("/tmp") }
-      its(:refreshonly?) { should be_false }
-    end
-  end
-
-  describe "#refreshonly" do
-    [true, :true].each do |refreshonly|
-      context "=> #{refreshonly.inspect}" do
-        let(:attributes) do { :refreshonly => refreshonly } end
-        it "has a value of true" do
-          expect(subject.refreshonly?).to be_true
-        end
-        it "will not enforce command on sync because refresh() will be called" do
-          expect(subject.provider).to_not receive(:command=)
-          subject.property(:command).sync
-        end
-      end
-    end
-
-    [false, :false].each do |refreshonly|
-      context "=> #{refreshonly.inspect}" do
-        let(:attributes) do { :refreshonly => refreshonly } end
-        it "has a value of false" do
-          expect(subject.refreshonly?).to be_false
-        end
-        it "will enforce command on sync because refresh() will not be called" do
-          expect(subject.provider).to receive(:command=)
-          subject.property(:command).sync
-        end
-      end
-    end
-  end
-
-  ## If we refresh the resource, the command should always be run regardless of
-  ## refreshonly
-  describe "when responding to refresh" do
-    [true, :true, false, :false].each do |refreshonly|
-      context "with refreshonly => #{refreshonly.inspect}" do
-        let(:attributes) do { :refreshonly => refreshonly } end
-        it "will enforce command on sync" do
-          expect(subject.provider).to receive(:command=)
-          subject.refresh
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb
deleted file mode 100644
index 45242033a09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/spec/unit/type/postgresql_conf_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/env ruby
-require 'spec_helper'
-
-describe Puppet::Type.type(:postgresql_conf) do
-  before do
-    @provider_class = described_class.provide(:simple) { mk_resource_methods }
-    @provider_class.stubs(:suitable?).returns true
-    described_class.stubs(:defaultprovider).returns @provider_class
-  end
-
-  describe "namevar validation" do
-    it "should have :name as its namevar" do
-      described_class.key_attributes.should == [:name]
-    end
-    it "should not invalid names" do
-      expect { described_class.new(:name => 'foo bar') }.to raise_error(Puppet::Error, /Invalid value/)
-    end
-    it "should allow dots in names" do
-      expect { described_class.new(:name => 'foo.bar') }.to_not raise_error
-    end
-  end
-
-  describe "when validating attributes" do
-    [:name, :provider].each do |param|
-      it "should have a #{param} parameter" do
-        described_class.attrtype(param).should == :param
-      end
-    end
-
-    [:value, :target].each do |property|
-      it "should have a #{property} property" do
-        described_class.attrtype(property).should == :property
-      end
-    end
-  end
-
-  describe "when validating values" do
-    describe "ensure" do
-      it "should support present as a value for ensure" do
-        expect { described_class.new(:name => 'foo', :ensure => :present) }.to_not raise_error
-      end
-      it "should support absent as a value for ensure" do
-        expect { described_class.new(:name => 'foo', :ensure => :absent) }.to_not raise_error
-      end
-      it "should not support other values" do
-        expect { described_class.new(:name => 'foo', :ensure => :foo) }.to raise_error(Puppet::Error, /Invalid value/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf
deleted file mode 100644
index af54db5b2a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/postgresql/templates/pg_hba_rule.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# Rule Name: <%=@name%>
-# Description: <%=@description%>
-# Order: <%=@order%>
-<%=@type%>	<%=@database%>	<%=@user%>	<%=@address%>	<%=@auth_method%>	<%=@auth_option%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/LICENSE
deleted file mode 100644
index 9914a458b9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Juan Treminio and other contributors
-https://puphpet.com
-
-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.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/README.md
deleted file mode 100644
index 6f3403c1b35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Puppet module: puphpet
-
-This is a Puppet module for [PuPHPet](https://puphpet.com)-related code
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb
deleted file mode 100644
index 4d0967e8880..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/files/xdebug_cli_alias.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-XDEBUG_CONFIG="idekey=xdebug" php -dxdebug.remote_host=`echo $SSH_CLIENT | cut -d "=" -f 2 | awk '{print $1}'` "$@"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb
deleted file mode 100644
index 118c4b64870..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/lib/puppet/parser/functions/hash_key_equals.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# hash_key_equals.rb
-#
-
-module Puppet::Parser::Functions
-
-  newfunction(:hash_key_equals, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-
-    Returns true if the variable passed to this function is a hash,
-    it contains the key requested, and the key matches value.
-    ENDHEREDOC
-
-    unless args.length == 3
-      raise Puppet::ParseError, ("hash_key_equals(): wrong number of arguments (#{args.length}; must be 3)")
-    end
-
-    hashVar       = args[0]
-    keyVar        = args[1]
-    expectedValue = args[2]
-
-    unless hashVar.is_a?(Hash)
-      return false
-    end
-
-    unless hashVar.has_key?(keyVar)
-      return false
-    end
-
-    unless hashVar[keyVar].to_i == expectedValue.to_i
-      return false
-    end
-
-    return true
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/adminer.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/adminer.pp
deleted file mode 100644
index 0d23275bcca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/adminer.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class puphpet::adminer(
-  $location,
-  $owner       = 'www-data',
-  $php_package = 'php'
-) {
-
-  if ! defined(File[$location]) {
-    file { $location:
-      replace => no,
-      ensure  => directory,
-      mode    => 775,
-      require => Package[$php_package]
-    }
-  }
-
-  exec{ "download adminer to ${location}":
-    command => "wget http://www.adminer.org/latest.php -O ${location}/index.php",
-    require => File[$location],
-    creates => "${location}/index.php",
-    returns => [ 0, 4 ],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp
deleted file mode 100644
index 95979499049..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modpagespeed.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# This depends on puppetlabs/apache: https://github.com/puppetlabs/puppetlabs-apache
-
-class puphpet::apache::modpagespeed (
-  $url     = $puphpet::params::apache_mod_pagespeed_url,
-  $package = $puphpet::params::apache_mod_pagespeed_package,
-  $ensure  = 'present'
-) {
-
-  $download_location = $::osfamily ? {
-    'Debian' => '/.puphpet-stuff/mod-pagespeed.deb',
-    'Redhat' => '/.puphpet-stuff/mod-pagespeed.rpm'
-  }
-
-  $provider = $::osfamily ? {
-    'Debian' => 'dpkg',
-    'Redhat' => 'yum'
-  }
-
-  exec { "download apache mod-pagespeed to ${download_location}":
-    creates => $download_location,
-    command => "wget ${url} -O ${download_location}",
-    timeout => 30,
-    path    => '/usr/bin'
-  }
-
-  package { $package:
-    ensure   => $ensure,
-    provider => $provider,
-    source   => $download_location,
-    notify   => Service['httpd']
-  }
-
-  file { [
-    "${apache::params::mod_dir}/pagespeed.load",
-    "${apache::params::mod_dir}/pagespeed.conf",
-    "${apache::params::confd_dir}/pagespeed_libraries.conf"
-  ] :
-    purge => false,
-  }
-
-  if $apache::params::mod_enable_dir != undef {
-    file { [
-      "${apache::params::mod_enable_dir}/pagespeed.load",
-      "${apache::params::mod_enable_dir}/pagespeed.conf"
-    ] :
-      purge => false,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp
deleted file mode 100644
index 6cee775b50e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/apache/modspdy.pp
+++ /dev/null
@@ -1,86 +0,0 @@
-# This depends on puppetlabs/apache: https://github.com/puppetlabs/puppetlabs-apache
-
-class puphpet::apache::modspdy (
-  $url         = $puphpet::params::apache_mod_spdy_url,
-  $package     = $puphpet::params::apache_mod_spdy_package,
-  $php_package = 'php',
-  $ensure      = 'present'
-) {
-
-  class { 'apache::mod::php':
-    package_ensure => 'purged'
-  }
-
-  if $php_package == 'php' and ! defined(Package[$puphpet::params::apache_mod_spdy_cgi]) {
-    package { $puphpet::params::apache_mod_spdy_cgi:
-      ensure => present,
-      notify => Service[$apache::params::service_name]
-    }
-  }
-
-  if ! defined(Class['apache::mod::fastcgi']) {
-    class { 'apache::mod::fastcgi': }
-  }
-
-  if ! defined(Class['apache::mod::cgi']) {
-    class { 'apache::mod::cgi': }
-  }
-
-  $download_location = $::osfamily ? {
-    'Debian' => '/.puphpet-stuff/mod-spdy.deb',
-    'Redhat' => '/.puphpet-stuff/mod-spdy.rpm'
-  }
-
-  $provider = $::osfamily ? {
-    'Debian' => 'dpkg',
-    'Redhat' => 'yum'
-  }
-
-  exec { "download apache mod-spdy to ${download_location}":
-    creates => $download_location,
-    command => "wget ${url} -O ${download_location}",
-    timeout => 30,
-    path    => '/usr/bin'
-  }
-
-  package { $package:
-    ensure   => $ensure,
-    provider => $provider,
-    source   => $download_location,
-    notify   => Service[$apache::params::service_name]
-  }
-
-  file { [
-    "${apache::params::mod_dir}/spdy.load",
-    "${apache::params::mod_dir}/spdy.conf",
-    "${apache::params::mod_dir}/php5filter.conf"
-  ] :
-    purge => false,
-  }
-
-  if $apache::params::mod_enable_dir != undef {
-    file { [
-      "${apache::params::mod_enable_dir}/spdy.load",
-      "${apache::params::mod_enable_dir}/spdy.conf",
-      "${apache::params::mod_enable_dir}/php5filter.conf"
-    ] :
-      purge => false,
-    }
-  }
-
-  file { "${apache::params::confd_dir}/spdy.conf":
-    content => template("${module_name}/apache/mod/spdy/spdy_conf.erb"),
-    ensure  => $ensure,
-    purge   => false,
-    require => Package[$package]
-  }
-
-  file { '/usr/local/bin/php-wrapper':
-    content => template("${module_name}/apache/mod/spdy/php-wrapper.erb"),
-    ensure  => $ensure,
-    mode    => 0775,
-    purge   => false,
-    require => Package[$package]
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp
deleted file mode 100644
index 90083232cdc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/hhvm.pp
+++ /dev/null
@@ -1,125 +0,0 @@
-# This depends on
-#   puppetlabs/apt: https://github.com/puppetlabs/puppetlabs-apt
-#   example42/puppet-yum: https://github.com/example42/puppet-yum
-#   puppetlabs/puppetlabs-apache: https://github.com/puppetlabs/puppetlabs-apache (if apache)
-
-class puphpet::hhvm(
-  $nightly = false,
-  $webserver
-) {
-
-  $real_webserver = $webserver ? {
-    'apache'  => 'apache2',
-    'httpd'   => 'apache2',
-    'apache2' => 'apache2',
-    'nginx'   => 'nginx',
-    'fpm'     => 'fpm',
-    'cgi'     => 'cgi',
-    'fcgi'    => 'cgi',
-    'fcgid'   => 'cgi',
-    undef     => undef,
-  }
-
-  if $nightly == true {
-    $package_name_base = $puphpet::params::hhvm_package_name_nightly
-  } else {
-    $package_name_base = $puphpet::params::hhvm_package_name
-  }
-
-  if $nightly == true and $::osfamily == 'Redhat' {
-    warning('HHVM-nightly is not available for RHEL distros. Falling back to normal release')
-  }
-
-  case $::operatingsystem {
-    'debian': {
-      if $::lsbdistcodename != 'wheezy' {
-        fail('Sorry, HHVM currently only works with Debian 7+.')
-      }
-
-      $sources_list = '/etc/apt/sources.list'
-
-      $deb_srcs = [
-        'deb http://http.us.debian.org/debian wheezy main',
-        'deb-src http://http.us.debian.org/debian wheezy main',
-        'deb http://security.debian.org/ wheezy/updates main',
-        'deb-src http://security.debian.org/ wheezy/updates main',
-        'deb http://http.us.debian.org/debian wheezy-updates main',
-        'deb-src http://http.us.debian.org/debian wheezy-updates main'
-      ]
-
-      each( $deb_srcs ) |$value| {
-        exec { "add contrib non-free to ${value}":
-          cwd     => '/etc/apt',
-          command => "perl -p -i -e 's#${value}#${value} contrib non-free#gi' ${sources_list}",
-          unless  => "grep -Fxq '${value} contrib non-free' ${sources_list}",
-          path    => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ],
-          notify  => Exec['apt_update']
-        }
-      }
-    }
-    'ubuntu': {
-      if ! ($lsbdistcodename in ['precise', 'raring', 'trusty']) {
-        fail('Sorry, HHVM currently only works with Ubuntu 12.04, 13.10 and 14.04.')
-      }
-
-      apt::key { '5D50B6BA': key_server => 'hkp://keyserver.ubuntu.com:80' }
-
-      if $lsbdistcodename in ['lucid', 'precise'] {
-        apt::ppa { 'ppa:mapnik/boost': require => Apt::Key['5D50B6BA'], options => '' }
-      }
-    }
-    'centos': {
-      yum::managed_yumrepo { 'hop5':
-        descr    => 'hop5 repository',
-        baseurl  => 'http://www.hop5.in/yum/el6/',
-        gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-HOP5',
-        enabled  => 1,
-        gpgcheck => 0,
-        priority => 1
-      }
-    }
-  }
-
-  if $real_webserver == 'apache2' {
-    if ! defined(Class['apache::mod::mime']) {
-      class { 'apache::mod::mime': }
-    }
-    if ! defined(Class['apache::mod::fastcgi']) {
-      class { 'apache::mod::fastcgi': }
-    }
-    if ! defined(Class['apache::mod::alias']) {
-      class { 'apache::mod::alias': }
-    }
-    if ! defined(Class['apache::mod::proxy']) {
-      class { 'apache::mod::proxy': }
-    }
-    if ! defined(Class['apache::mod::proxy_http']) {
-      class { 'apache::mod::proxy_http': }
-    }
-    if ! defined(Apache::Mod['actions']) {
-      apache::mod{ 'actions': }
-    }
-  }
-
-  $os = downcase($::operatingsystem)
-
-  case $::osfamily {
-    'debian': {
-      apt::key { 'hhvm':
-        key        => '16d09fb4',
-        key_source => 'http://dl.hhvm.com/conf/hhvm.gpg.key',
-      }
-
-      apt::source { 'hhvm':
-        location          => "http://dl.hhvm.com/${os}",
-        repos             => 'main',
-        required_packages => 'debian-keyring debian-archive-keyring',
-        include_src       => false,
-        require           => Apt::Key['hhvm']
-      }
-    }
-  }
-
-  ensure_packages( [ $package_name_base ] )
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ini.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ini.pp
deleted file mode 100644
index 50f471bacbe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ini.pp
+++ /dev/null
@@ -1,305 +0,0 @@
-# Defines where we can expect PHP ini files and paths to be located.
-#
-# Different OS, OS version, webserver and PHP versions all contributes
-# to making a mess of where we can expect INI files to be found.
-#
-# I have listed a bunch of places:
-#
-# 5.3
-#     DEBIAN 6 - squeeze
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d
-#     DEBIAN 7 - wheezy
-#         APACHE
-#             NOT CORRECT; PHP 5.4 INSTALLED
-#         NGINX
-#             NOT CORRECT; PHP 5.4 INSTALLED
-#     UBUNTU 10.04 - lucid
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d
-#     UBUNTU 12.04 - precise
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d
-#     UBUNTU 14.04 - trusty
-#         APACHE
-#             NOT CORRECT; PHP 5.5 INSTALLED
-#         NGINX
-#             NOT CORRECT; PHP 5.5 INSTALLED
-# 5.4
-#     CENTOS 6
-#         CLI
-#             /etc/php.d
-#         APACHE
-#             /etc/php.d
-#     DEBIAN 6 - squeeze
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     DEBIAN 7 - wheezy
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     UBUNTU 10.04 - lucid
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     UBUNTU 12.04 - precise
-#         CLI
-#             /etc/php5/cli/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  conf.d/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d    -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  conf.d/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d        -> /etc/php5/conf.d/*   -> /etc/php5/mods-available/*
-#     UBUNTU 14.04 - trusty
-#         APACHE
-#             NOT CORRECT; PHP 5.5 INSTALLED
-#         NGINX
-#             NOT CORRECT; PHP 5.5 INSTALLED
-# 5.5
-#     DEBIAN 6 - squeeze
-#         APACHE
-#             NOT A VALID OPTION
-#         NGINX
-#             NOT A VALID OPTION
-#     DEBIAN 7 - wheezy
-#         CLI
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  mods-available/  php.ini
-#             /etc/php5/apache2/conf.d/*  -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d/*      -> /etc/php5/mods-available/*
-#     UBUNTU 10.04 - lucid
-#         APACHE
-#             NOT A VALID OPTION
-#         NGINX
-#             NOT A VALID OPTION
-#     UBUNTU 12.04 - precise
-#         CLI
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#         APACHE
-#             FOLDERS: cli/  apache2/  mods-available/
-#             /etc/php5/apache2/conf.d/*      -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  fpm/  mods-available/
-#             /etc/php5/fpm/conf.d/*      -> /etc/php5/mods-available/*
-#     UBUNTU 14.04 - trusty
-#         CLI
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/conf.d/*
-#         APACHE
-#             FOLDERS: apache2/  cli/  mods-available/  php.ini
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#             /etc/php5/apache2/conf.d/*  -> /etc/php5/mods-available/*
-#         NGINX
-#             FOLDERS: cli/  fpm/  mods-available/
-#             /etc/php5/cli/conf.d/*      -> /etc/php5/mods-available/*
-#             /etc/php5/fpm/conf.d/*      -> /etc/php5/mods-available/*
-#
-# This depends on example42/puppet-php: https://github.com/example42/puppet-php
-#
-define puphpet::ini (
-  $php_version,
-  $webserver,
-  $ini_filename = 'zzzz_custom.ini',
-  $entry,
-  $value  = '',
-  $ensure = present
-  ) {
-
-  $real_webserver = $webserver ? {
-    'apache'   => 'apache2',
-    'httpd'    => 'apache2',
-    'apache2'  => 'apache2',
-    'nginx'    => 'fpm',
-    'php5-fpm' => 'fpm',
-    'php-fpm'  => 'fpm',
-    'fpm'      => 'fpm',
-    'cgi'      => 'cgi',
-    'fcgi'     => 'cgi',
-    'fcgid'    => 'cgi',
-    undef      => undef,
-  }
-
-  case $php_version {
-    '5.3', '53': {
-      case $::osfamily {
-        'debian': {
-          $target_dir  = '/etc/php5/conf.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        'redhat': {
-          $target_dir  = '/etc/php.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        default: { fail('This OS has not yet been defined for PHP 5.3!') }
-      }
-    }
-    '5.4', '54': {
-      case $::osfamily {
-        'debian': {
-          $target_dir  = '/etc/php5/mods-available'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-
-          $symlink = "/etc/php5/conf.d/${ini_filename}"
-
-          if ! defined(File[$symlink]) {
-            file { $symlink:
-              ensure  => link,
-              target  => $target_file,
-              require => File[$target_file],
-            }
-          }
-        }
-        'redhat': {
-          $target_dir  = '/etc/php.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        default: { fail('This OS has not yet been defined for PHP 5.4!') }
-      }
-    }
-    '5.5', '55': {
-      case $::osfamily {
-        'debian': {
-          $target_dir  = '/etc/php5/mods-available'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          $webserver_ini_location = $real_webserver ? {
-              'apache2' => '/etc/php5/apache2/conf.d',
-              'cgi'     => '/etc/php5/cgi/conf.d',
-              'fpm'     => '/etc/php5/fpm/conf.d',
-              undef     => undef,
-          }
-          $cli_ini_location = '/etc/php5/cli/conf.d'
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-
-          if $webserver_ini_location != undef and ! defined(File["${webserver_ini_location}/${ini_filename}"]) {
-            file { "${webserver_ini_location}/${ini_filename}":
-              ensure  => link,
-              target  => $target_file,
-              require => File[$target_file],
-            }
-          }
-
-          if ! defined(File["${cli_ini_location}/${ini_filename}"]) {
-            file { "${cli_ini_location}/${ini_filename}":
-              ensure  => link,
-              target  => $target_file,
-              require => File[$target_file],
-            }
-          }
-        }
-        'redhat': {
-          $target_dir  = '/etc/php.d'
-          $target_file = "${target_dir}/${ini_filename}"
-
-          if ! defined(File[$target_file]) {
-            file { $target_file:
-              replace => no,
-              ensure  => present,
-              require => Package['php']
-            }
-          }
-        }
-        default: { fail('This OS has not yet been defined for PHP 5.5!') }
-      }
-    }
-    default: { fail('Unrecognized PHP version') }
-  }
-
-  if $real_webserver != undef {
-    if $real_webserver == 'cgi' {
-      $webserver_service = 'apache2'
-    } else {
-      $webserver_service = $webserver
-    }
-
-    $notify_service = Service[$webserver_service]
-  } else {
-    $notify_service = []
-  }
-
-  php::augeas{ "${entry}-${value}" :
-    target  => $target_file,
-    entry   => $entry,
-    value   => $value,
-    ensure  => $ensure,
-    require => File[$target_file],
-    notify  => $notify_service,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/init.pp
deleted file mode 100644
index 17c999a761b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-class puphpet inherits puphpet::params {}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/mariadb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/mariadb.pp
deleted file mode 100644
index e68968f5437..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/mariadb.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# This depends on
-#   puppetlabs/apt: https://github.com/puppetlabs/puppetlabs-apt
-#   example42/puppet-yum: https://github.com/example42/puppet-yum
-
-class puphpet::mariadb(
-  $distro  = $::operatingsystem,
-  $release = $::lsbdistcodename,
-  $arch    = $::architecture,
-  $version = '10.0',
-  $url     = $puphpet::params::apache_mod_pagespeed_url,
-  $package = $puphpet::params::apache_mod_pagespeed_package
-) {
-
-  $arch_package_name = $::architecture ? {
-    'i386'   => 'x86',
-    'amd64'  => 'amd64',
-    'x86_64' => 'amd64'
-  }
-
-  case $::osfamily {
-    'debian': {
-      $os = downcase($::operatingsystem)
-
-      apt::source { 'mariadb':
-        location          => "http://mirror.jmu.edu/pub/mariadb/repo/${version}/${os}",
-        release           => $release,
-        repos             => 'main',
-        required_packages => 'debian-keyring debian-archive-keyring',
-        key               => '1BB943DB',
-        key_server        => 'keyserver.ubuntu.com',
-        include_src       => true
-      }
-
-      apt::pin { 'mariadb':
-        packages => '*',
-        priority => 1000,
-        origin   => 'mirror.jmu.edu',
-      }
-    }
-    'redhat': {
-      yum::managed_yumrepo { 'MariaDB':
-        descr         => 'MariaDB - mariadb.org',
-        baseurl       => "http://yum.mariadb.org/${version}/centos6-${arch_package_name}",
-        enabled       => 1,
-        gpgcheck      => 0,
-        priority      => 1
-      }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/nginx.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/nginx.pp
deleted file mode 100644
index 7a28797dfa8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/nginx.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-class puphpet::nginx(
-  $fastcgi_pass = '127.0.0.1:9000',
-  $webroot      = $puphpet::params::nginx_webroot_location
-) inherits puphpet::params {
-
-  $conf_file = $::osfamily ? {
-    'debian' => '/etc/nginx/conf.d/default.conf',
-    'redhat' => '/etc/nginx/conf.d/default.conf',
-    default  => '/etc/nginx/conf.d/default.conf',
-  }
-
-  file { [
-      '/var/log',
-      '/var/log/nginx',
-      '/var/log/nginx/log'
-    ]:
-    ensure  => directory,
-    recurse => true,
-  }
-
-  file { [
-      '/var/log/nginx/log/host.access.log',
-      '/var/log/nginx/log/host.error.log'
-    ]:
-    ensure  => present,
-    mode    => 0777,
-    replace => 'no',
-    require => File['/var/log/nginx/log']
-  }
-
-  file {"${conf_file} puphpet::nginx override":
-    ensure  => present,
-    path    => $conf_file,
-    replace => 'yes',
-    content => template('puphpet/nginx/default_conf.erb')
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp
deleted file mode 100644
index 1a998e9271b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/params.pp
+++ /dev/null
@@ -1,87 +0,0 @@
-class puphpet::params {
-
-  $xdebug_package = $::osfamily ? {
-    'Debian' => 'php5-xdebug',
-    'Redhat' => 'php-pecl-xdebug'
-  }
-
-  $xhprof_package = $::osfamily ? {
-    'Debian' => $::operatingsystem ? {
-      'ubuntu' => false,
-      'debian' => 'php5-xhprof'
-    },
-    'Redhat' => 'xhprof'
-  }
-
-  $apache_webroot_location = $::osfamily ? {
-    'Debian' => '/var/www',
-    'Redhat' => '/var/www/html'
-  }
-
-  $apache_mod_pagespeed_url = $::osfamily ? {
-    'Debian' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_i386.deb',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_amd64.deb',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_amd64.deb'
-      },
-    'Redhat' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_i386.rpm',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_x86_64.rpm'
-      },
-  }
-
-  $apache_mod_pagespeed_package = 'mod-pagespeed-stable'
-
-  $apache_mod_spdy_url = $::osfamily ? {
-    'Debian' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_i386.deb',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_amd64.deb',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_amd64.deb'
-      },
-    'Redhat' => $::architecture ? {
-        'i386'   => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_i386.rpm',
-        'amd64'  => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_x86_64.rpm',
-        'x86_64' => 'https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_x86_64.rpm'
-      },
-  }
-
-  $apache_mod_spdy_package = 'mod-spdy-beta'
-
-  $apache_mod_spdy_cgi = $::osfamily ? {
-    'Debian' => 'php5-cgi',
-    'Redhat' => 'php-cgi'
-  }
-
-  $nginx_webroot_location = $::osfamily ? {
-    'Debian' => '/var/www/html',
-    'Redhat' => '/usr/share/nginx/html'
-  }
-
-  $mariadb_package_client_name = $::osfamily ? {
-    'Debian' => 'mariadb-client',
-    'Redhat' => 'MariaDB-client',
-  }
-
-  $mariadb_package_server_name = $::osfamily ? {
-    'Debian' => 'mariadb-server',
-    'Redhat' => 'MariaDB-server',
-  }
-
-  $hhvm_package_name = 'hhvm'
-  $hhvm_package_name_nightly = $::osfamily ? {
-    'Debian' => 'hhvm-nightly',
-    'Redhat' => 'hhvm'
-  }
-
-  $ssl_cert_location = $::osfamily ? {
-    'Debian' => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
-    'Redhat' => '/etc/ssl/certs/ssl-cert-snakeoil'
-  }
-
-  $ssl_key_location = $::osfamily ? {
-    'Debian' => '/etc/ssl/private/ssl-cert-snakeoil.key',
-    'Redhat' => '/etc/ssl/certs/ssl-cert-snakeoil'
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp
deleted file mode 100644
index 6461f621120..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/extra_repos.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Some PHP packages require extra repos.
- * ex: PECL mongo is best to fetch Mongo's official repo
- */
-
-define puphpet::php::extra_repos {
-
-  $downcase_name = downcase($name)
-
-  if $downcase_name == 'mongo' and ! defined(Class['mongodb::globals']) {
-    class { 'mongodb::globals':
-      manage_package_repo => true,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/module.pp
deleted file mode 100644
index 2d37ad56d51..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/module.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This "translates" PHP module package names into system-specific names.
- */
-
-define puphpet::php::module (
-  $service_autorestart
-){
-
-  $package = $::osfamily ? {
-    'Debian' => {
-      'mbstring' => false, # Comes packaged with PHP, not available in repos
-    },
-    'Redhat' => {
-      #
-    }
-  }
-
-  $downcase_name = downcase($name)
-
-  if has_key($package, $downcase_name) {
-    $package_name = $package[$downcase_name]
-  }
-  else {
-    $package_name = $name
-  }
-
-  if $package_name and ! defined(::Php::Module[$package_name]) {
-    ::php::module { $package_name:
-      service_autorestart => $service_autorestart,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp
deleted file mode 100644
index 4582e67a17a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pear.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * This returns PEAR packages requiring beta stability
- */
-
-define puphpet::php::pear (
-  $service_autorestart
-){
-
-  $package = {
-    'auth_sasl2'                => 'beta',
-    'config_lite'               => 'beta',
-    'console_getoptplus'        => 'beta',
-    'mdb2_driver_mysql'         => false,
-    'mdb2_driver_mysqli'        => false,
-    'pear_command_packaging'    => 'alpha',
-    'pear_frontend_gtk2'        => false,
-    'php_beautifier'            => 'beta',
-    'php_parser_docblockparser' => 'alpha',
-    'testing_selenium'          => 'beta',
-    'versioncontrol_git'        => 'alpha',
-    'versioncontrol_svn'        => 'alpha',
-    'xml_parser2'               => 'beta',
-    'xml_util2'                 => 'alpha',
-  }
-
-  $downcase_name = downcase($name)
-
-  if has_key($package, $downcase_name) {
-    $package_name    = $name
-    $preferred_state = $package[$downcase_name]
-  }
-  else {
-    $package_name    = $name
-    $preferred_state = 'stable'
-  }
-
-  if $package_name and $preferred_state and ! defined(::Php::Pear::Module[$package_name]) {
-    ::php::pear::module { $name:
-      use_package         => false,
-      preferred_state     => $preferred_state,
-      service_autorestart => $php_webserver_restart,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp
deleted file mode 100644
index 2dd2b817fec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/php/pecl.pp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * This "translates" PECL package names into system-specific names.
- * For example, APCu does not install correctly on CentOS via PECL,
- * but there is a system package for it that works well. Use that
- * instead of the PECL package.
- */
-
-define puphpet::php::pecl (
-  $service_autorestart
-){
-
-  $ignore = {
-    'date_time' => true,
-    'mysql'     => true,
-  }
-
-  $pecl = $::osfamily ? {
-    'Debian' => {
-      #
-    },
-    'Redhat' => {
-      #
-    }
-  }
-
-  $pecl_beta = $::osfamily ? {
-    'Debian' => {
-      'augeas'      => 'augeas',
-      'zendopcache' => $::operatingsystem ? {
-        'debian' => false,
-        'ubuntu' => 'ZendOpcache',
-      },
-    },
-    'Redhat' => {
-      #
-    }
-  }
-
-  $package = $::osfamily ? {
-    'Debian' => {
-      'apc'         => $::operatingsystem ? {
-        'debian' => 'php5-apc',
-        'ubuntu' => 'php5-apcu',
-      },
-      'apcu'        => 'php5-apcu',
-      'imagick'     => 'php5-imagick',
-      'memcache'    => 'php5-memcache',
-      'memcached'   => 'php5-memcached',
-      'mongo'       => $::lsbdistcodename ? {
-        'precise' => false,
-        default   => 'php5-mongo',
-      },
-      'zendopcache' => 'php5-zendopcache',
-    },
-    'Redhat' => {
-      'apc'         => 'php-pecl-apcu',
-      'apcu'        => 'php-pecl-apcu',
-      'imagick'     => 'php-pecl-imagick',
-      'memcache'    => 'php-pecl-memcache',
-      'memcached'   => 'php-pecl-memcached',
-      'mongo'       => 'php-pecl-mongo',
-      'zendopcache' => 'php-pecl-zendopcache',
-    }
-  }
-
-  $downcase_name = downcase($name)
-
-  if has_key($ignore, $downcase_name) {
-    $pecl_name       = $pecl[$downcase_name]
-    $package_name    = false
-    $preferred_state = 'stable'
-  }
-  elsif has_key($pecl, $downcase_name) {
-    $pecl_name       = false
-    $package_name    = false
-    $preferred_state = false
-  }
-  elsif has_key($pecl_beta, $downcase_name) and $pecl_beta[$downcase_name] {
-    $pecl_name       = $pecl_beta[$downcase_name]
-    $package_name    = false
-    $preferred_state = 'beta'
-  }
-  elsif has_key($package, $downcase_name) {
-    $pecl_name    = false
-    $package_name = $package[$downcase_name]
-  }
-  else {
-    $pecl_name    = $name
-    $package_name = false
-  }
-
-  if $pecl_name and ! defined(::Php::Pecl::Module[$pecl_name]) {
-    ::php::pecl::module { $pecl_name:
-      use_package         => false,
-      preferred_state     => $preferred_state,
-      service_autorestart => $service_autorestart,
-    }
-  }
-  elsif $package_name and ! defined(Package[$package_name]) {
-    package { $package_name:
-      ensure  => present,
-      require => Class['Php::Devel'],
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp
deleted file mode 100644
index e227aaa9780..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/phpmyadmin.pp
+++ /dev/null
@@ -1,46 +0,0 @@
-# This depends on
-#   puppetlabs/apt: https://github.com/puppetlabs/puppetlabs-apt
-
-class puphpet::phpmyadmin(
-  $dbms             = 'mysql::server',
-  $webroot_location = '/var/www'
-) inherits puphpet::params {
-
-  if $::osfamily == 'debian' {
-    if $::operatingsystem == 'ubuntu' {
-      apt::key { '80E7349A06ED541C': key_server => 'hkp://keyserver.ubuntu.com:80' }
-      apt::ppa { 'ppa:nijel/phpmyadmin': require => Apt::Key['80E7349A06ED541C'] }
-    }
-
-    $phpMyAdmin_package = 'phpmyadmin'
-    $phpMyAdmin_folder  = 'phpmyadmin'
-  } elsif $::osfamily == 'redhat' {
-    $phpMyAdmin_package = 'phpMyAdmin.noarch'
-    $phpMyAdmin_folder  = 'phpMyAdmin'
-  } else {
-    error('phpMyAdmin module currently only works with Debian or RHEL families')
-  }
-
-  if ! defined(Package[$phpMyAdmin_package]) {
-    package { $phpMyAdmin_package:
-      require => Class[$dbms]
-    }
-  }
-
-  if ! defined(File[$webroot_location]) {
-    file { $webroot_location:
-      ensure  => directory,
-      require => Package[$phpMyAdmin_package]
-    }
-  }
-
-  exec { 'cp phpmyadmin to webroot':
-    command => "cp -LR /usr/share/${phpMyAdmin_folder} ${webroot_location}/phpmyadmin",
-    onlyif  => "test ! -d ${mysql_pma_webroot_location}/phpmyadmin",
-    require => [
-      Package[$phpMyAdmin_package],
-      File[$webroot_location]
-    ]
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp
deleted file mode 100644
index 2389d60af82..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/ssl_cert.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-class puphpet::ssl_cert
-  inherits puphpet::params {
-
-  case $::osfamily {
-    'debian': {
-      if ! defined(Package['ssl-cert']) {
-        package { 'ssl-cert':
-          ensure => latest,
-        }
-      }
-
-      exec { 'make-ssl-cert generate-default-snakeoil --force-overwrite':
-        creates => [
-          $puphpet::params::ssl_cert_location,
-          $puphpet::params::ssl_key_location
-        ],
-        require => Package['ssl-cert'],
-        path    => [ '/bin/', '/usr/bin/', '/usr/sbin/' ]
-      }
-    }
-    'redhat': {
-      if ! defined(Package['openssl']) {
-        package { 'openssl':
-          ensure => latest,
-        }
-      }
-
-      exec { "make-dummy-cert ${puphpet::params::ssl_cert_location}":
-        creates => $puphpet::params::ssl_cert_location,
-        require => Package['openssl'],
-        path    => [ '/bin/', '/usr/bin/', '/usr/sbin/', '/etc/pki/tls/certs/' ]
-      }
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xdebug.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xdebug.pp
deleted file mode 100644
index 3c1985228e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xdebug.pp
+++ /dev/null
@@ -1,32 +0,0 @@
-class puphpet::xdebug (
-  $install_cli = true,
-  $webserver,
-  $ensure = present
-) inherits puphpet::params {
-
-  if $webserver != undef {
-    $notify_service = Service[$webserver]
-  } else {
-    $notify_service = []
-  }
-
-  if defined(Package[$puphpet::params::xdebug_package]) == false {
-    package { 'xdebug':
-      name    => $puphpet::params::xdebug_package,
-      ensure  => installed,
-      require => Package['php'],
-      notify  => $notify_service,
-    }
-  }
-
-  # shortcut for xdebug CLI debugging
-  if $install_cli and defined(File['/usr/bin/xdebug']) == false {
-    file { '/usr/bin/xdebug':
-      ensure  => present,
-      mode    => '+X',
-      source  => 'puppet:///modules/puphpet/xdebug_cli_alias.erb',
-      require => Package['php']
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xhprof.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xhprof.pp
deleted file mode 100644
index 0649ab684f8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/manifests/xhprof.pp
+++ /dev/null
@@ -1,93 +0,0 @@
-class puphpet::xhprof (
-  $php_version      = '54',
-  $webroot_location = '/var/www',
-  $webserver_service
-) inherits puphpet::params {
-
-  exec { 'delete-xhprof-path-if-empty-folder':
-    command => "rm -rf ${webroot_location}/xhprof",
-    onlyif  => "test ! -f ${webroot_location}/xhprof/extension/config.m4"
-  }
-
-  vcsrepo { "${webroot_location}/xhprof":
-    ensure   => present,
-    provider => git,
-    source   => 'https://github.com/facebook/xhprof.git',
-    require  => Exec['delete-xhprof-path-if-empty-folder']
-  }
-
-  file { "${webroot_location}/xhprof/xhprof_html":
-    ensure  => directory,
-    mode    => 0775,
-    require => Vcsrepo["${webroot_location}/xhprof"]
-  }
-
-  if $::operatingsystem == 'ubuntu' and $php_version != '53' {
-    exec { 'configure xhprof':
-      cwd     => "${webroot_location}/xhprof/extension",
-      command => 'phpize && ./configure && make && make install',
-      require => [
-        Vcsrepo["${webroot_location}/xhprof"],
-        Class['Php::Devel']
-      ],
-      path    => [ '/bin/', '/usr/bin/' ]
-    }
-
-    puphpet::ini { 'add xhprof ini extension':
-      php_version  => $php_version,
-      webserver    => $webserver_service,
-      ini_filename => '20-xhprof-custom.ini',
-      entry        => 'XHPROF/extension',
-      value        => 'xhprof.so',
-      ensure       => 'present',
-      require      => Exec['configure xhprof']
-    }
-
-    puphpet::ini { 'add xhprof ini xhprof.output_dir':
-      php_version  => $php_version,
-      webserver    => $webserver_service,
-      ini_filename => '20-xhprof-custom.ini',
-      entry        => 'XHPROF/xhprof.output_dir',
-      value        => '/tmp',
-      ensure       => 'present',
-      require      => Exec['configure xhprof']
-    }
-
-    composer::exec { 'xhprof-composer-run':
-      cmd     => 'install',
-      cwd     => "${webroot_location}/xhprof",
-      require => [
-        Class['composer'],
-        Exec['configure xhprof']
-      ]
-    }
-  } else {
-    $xhprof_package = $puphpet::params::xhprof_package
-
-    if $webserver_service != undef and is_string($webserver_service) {
-      $xhprof_package_notify = [Service[$webserver_service]]
-    } elsif $webserver_service != undef {
-      $xhprof_package_notify = $webserver_service
-    } else {
-      $xhprof_package_notify = []
-    }
-
-    if ! defined(Package[$xhprof_package]) {
-      package { $xhprof_package:
-        ensure  => installed,
-        require => Package['php'],
-        notify  => $xhprof_package_notify,
-      }
-    }
-
-    composer::exec { 'xhprof-composer-run':
-      cmd     => 'install',
-      cwd     => "${webroot_location}/xhprof",
-      require => [
-        Class['composer'],
-        File["${webroot_location}/xhprof/xhprof_html"]
-      ]
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb
deleted file mode 100644
index 7a1312528b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/custom_fragment.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= @vhost['custom_fragment'] %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb
deleted file mode 100644
index af276cbe149..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/hhvm-httpd.conf.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= scope.function_template(['apache/httpd.conf.erb']) -%>
-
-FastCgiExternalServer <%= @docroot %>/hhvm.external -host <%= @hhvm_values['settings']['host'] %>:<%= @hhvm_values['settings']['port'] %>
-AddHandler hhvm .php
-Action hhvm /usr/lib/cgi-bin/hhvm.external
-Alias /usr/lib/cgi-bin/ <%= @docroot %>/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb
deleted file mode 100644
index 54df3f74795..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/php-wrapper.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-PHP_FCGI_MAX_REQUESTS=10000
-export PHP_FCGI_MAX_REQUESTS
-
-exec <%= @phpcgi %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb
deleted file mode 100644
index 64603c101db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/apache/mod/spdy/spdy_conf.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# FcgidMaxRequestsPerProcess should be <= PHP_FCGI_MAX_REQUESTS
-FcgidMaxRequestsPerProcess 10000
-
-<Location />
-    AddHandler fcgid-script .php
-    Options +ExecCGI
-    FcgidWrapper /usr/local/bin/php-wrapper .php
-</Location>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb
deleted file mode 100644
index cc2d6f032ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puphpet/templates/nginx/default_conf.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-server {
-   listen                80;
-   server_name           localhost;
-
-   index index.php index.html index.htm;
-
-   access_log            /var/log/nginx/log/host.access.log;
-   error_log             /var/log/nginx/log/host.error.log;
-
-   location / {
-     root  <%= @webroot %>;
-     try_files  $uri  $uri/  /index.php?$args ;
-     index  index.html index.htm index.php;
-   }
-
-   location ~ \.php$ {
-     root  <%= @webroot %>;
-     try_files  $uri  $uri/  /index.php?$args ;
-     index  index.html index.htm index.php;
-
-     fastcgi_index index.php;
-     fastcgi_param PATH_INFO $fastcgi_path_info;
-     fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
-     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-     fastcgi_pass  <%= @fastcgi_pass %>;
-     fastcgi_split_path_info ^(.+\.php)(/.+)$;
-     include fastcgi_params;
-   }
- }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.fixtures.yml
deleted file mode 100644
index 96cb39d1b84..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.fixtures.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-fixtures:
-  repositories:
-    "concat": "git://github.com/puppetlabs/puppetlabs-concat.git"
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-  symlinks:
-    "puppi": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.gemfile
deleted file mode 100644
index 9309493452e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'puppet-blacksmith', '>= 2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.project
deleted file mode 100644
index b6061843aa2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>puppi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.cloudsmith.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.cloudsmith.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.travis.yml
deleted file mode 100644
index dffeca98741..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-script:
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.6.0"
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.6.0"
-      gemfile: .gemfile
-
-gemfile: .gemfile
-notifications:
-  email:
-    - al@lab42.it
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/LICENSE
deleted file mode 100644
index f41da018579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2013 Alessandro Franceschi / Lab42
-
-for the relevant commits Copyright (C) by the respective authors.
-
-Contact Lab42 at: info@lab42.it
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Modulefile
deleted file mode 100644
index d69331f33a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name 'example42-puppi'
-version '2.1.8'
-
-author 'lab42'
-license 'Apache'
-project_page 'http://www.example42.com'
-source 'git://github.com/example42/puppi'
-summary 'Installs and configures Puppi'
-description 'This module provides the Puppi libraries required by Example42 modules and, if explicitely included, the puppi command, its working environment, the defines and procedures to deploy applications'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README.md
deleted file mode 100644
index 1f6ed569ebb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README.md
+++ /dev/null
@@ -1,257 +0,0 @@
-# Puppi: Puppet Knowledge to the CLI
-
-Puppi One and Puppi module written by Alessandro Franceschi / al @ lab42.it
-
-Puppi Gem by Celso Fernandez / Zertico
-
-Source: http://www.example42.com
-
-Licence: Apache 2
-
-Puppi is a Puppet module and a CLI command.
-It's data is entirely driven by Puppet code.
-It can be used to standardize and automate the deployment of web applications
-or to provides quick and standard commands to query and check your system's resources
-
-Its structure provides FULL flexibility on the actions required for virtually any kind of
-application deployment and information gathering.
-
-The module provides:
-
-* Old-Gen and Next-Gen Puppi implementation
-
-* A set of scripts that can be used in chain to automate any kind of deployment
-
-* Puppet defines that make it easy to prepare a puppi set of commands for a project deployment
-
-* Puppet defines to populate the output of the different actions
-
-
-## HOW TO INSTALL
-
-Download Puppi from GitHub and place it in your modules directory: 
-
-       git clone https://github.com/example42/puppi.git /etc/puppet/modules/puppi
-
-To use the Puppi "Original, old and widely tested" version, just declare or include the puppi class
-
-       class { 'puppi': }
-
-To test the Next-Gen version you can perform the following command. Please note that this module is
-not stable yet:
-        class { 'puppi':
-          version => '2',
-        }
-
-If you have resources conflicts, do not install automatically the Puppi dependencies (commands and packages)
-
-        class { 'puppi':
-          install_dependencies => false,
-        }
-
-
-## HOW TO USE
-
-Once Puppi is installed you can use it to:
-
-* Easily define in Puppet manifests Web Applications deploy procedures. For example:
-
-        puppi::project::war { "myapp":
-            source           => "http://repo.example42.com/deploy/prod/myapp.war",
-            deploy_root      => "/opt/tomcat/myapp/webapps",
-        }
-
-* Integrate with your modules for puppi check, info and log 
-
-* Enable Example42 modules integration
-
-
-## HOW TO USE WITH EXAMPLE42 MODULES
-
-The Example42 modules provide (optional) Puppi integration.
-Once enabled for each module you have puppi check, info and log commands.
-
-To eanble Puppi in OldGen Modules, set in the scope these variables:
-
-        $puppi = yes   # Enables puppi integration.
-        $monitor = yes # Enables automatic monitoring 
-        $monitor_tool = "puppi" # Sets puppi as monitoring tool
-
-For the NextGen modules set the same parameters via Hiera, at Top Scope or as class arguments:
-
-        class { 'openssh':
-          puppi        => yes, 
-          monitor      => yes,
-          monitor_tool => 'puppi', 
-        }
-
-
-## USAGE OF THE PUPPI COMMAND (OLD GEN)
-
-        puppi <action> <project_name> [ -options ]
-
-The puppi command has these possibile actions:
-
-First time initialization of the defined project (if available)
-        puppi init <project>
-
-Deploy the specified project
-        puppi deploy <project>
-
-Rollback to a previous deploy state
-        puppi rollback <project>
-
-Run local checks on system and applications
-        puppi check
-
-Tail system or application logs
-        puppi log
-
-Show system information (for all or only the specified topic)
-        puppi info [topic]
-
-Show things to do (or done) manually on the system (not done via Puppet)
-        puppi todo
-
-In the deploy/rollback/init actions, puppi runs the commands in /etc/puppi/projects/$project/$action, logs their status and then run the commands in /etc/puppi/projects/$project/report to provide reporting, in whatever, pluggable, way.
-
-You can also provide some options:
-
-* -f : Force puppi commands execution also on CRITICAL errors
-
-* -i : Interactively ask confirmation for every command
-
-* -t : Test mode. Just show the commands that should be executed without doing anything
-
-* -d <yes|full>: Debug mode. Show debugging info during execution
-
-* -o "parameter=value parameter2=value2" : Set manual options to override defaults. The options must be in parameter=value syntax, separated by spaces and inside double quotes.
-
-
-Some common puppi commnds when you log for an application deployment:
-
-        puppi check
-        puppi log &    # (More readable if done on another window)
-        puppi deploy myapp
-        puppi check
-        puppi info myapp
-
-
-## THE PUPPI MODULE
-
-The set of commands needed for each of these actions are entirely managed with specific
-Puppet "basic defines":
-
-Create the main project structure. One or more different deployment projects can exist on a node.
-        puppi::project
-
-Create a single command to be placed in the init sequence. It's not required for every project.
-        puppi::initialize
-
-Create a single command to be placed in the deploy sequence. More than one is generally needed for each project.
-        puppi::deploy
-
-Create a single command to be placed in the rollback sequence. More than one is generally needed for each project.
-        puppi::rollback
-
-Create a single check (based on Nagios plugins) for a project or for the whole host (host wide checks are auto generated by Example42 monitor module)
-        puppi::check
-
-Create a reporting command to be placed in the report sequence.
-        puppi::report
-
-Create a log filename entry for a project or the whole hosts.
-        puppi::log
-
-Create an info entry with the commands used to provide info on a topic
-        puppi::info
-
-Read details in the relevant READMEs
-
-
-## FILE PATHS (all of them are provided, and can be configured, in the puppi module):
-
-A link to the actual version of puppi enabled
-        /usr/sbin/puppi
-
-The original puppi bash command.
-        /usr/sbin/puppi.one
-
-Puppi (one) main config file. Various puppi wide paths are defined here.
-        /etc/puppi/puppi.conf
-
-Directory where by default all the host wide checks can be placed. If you use the Example42 monitor module and have "puppi" as $monitor_tool, this directory is automatically filled with Nagios plugins based checks.
-        /etc/puppi/checks/ ($checksdir)
-
-Directory that containts projects subdirs, with the commands to be run for deploy, rollback and check actions. They are completely built (and purged) by the Puppet module.
-        /etc/puppi/projects/ ($projectsdir)
-
-The general-use scripts directory, these are used by the above commands and may require one or more arguments.
-        /etc/puppi/scripts/ ($scriptsdir)
-
-The general-use directory where files are placed which contain the log paths to be used by puppi log
-        /etc/puppi/logs/ ($logssdir)
-
-The general-use directory where files are placed which contain the log paths to be used by puppi log
-        /etc/puppi/info/ ($infodir)
-
-Where all data to rollback is placed.
-        /var/lib/puppi/archive/ ($archivedir)
-
-Where logs and reports of the different commands are placed.
-        /var/log/puppi/ ($logdir)
-
-Temporary, scratchable, directory where Puppi places temporary files.
-        /tmp/puppi/ ($workdir)
-
-A runtime configuration file, which is used by all all the the scripts invoked by puppi to read and write dynamic variables at runtime. This is necessary to mantain "state" information that changes on every puppi run (such as the deploy datetime, used for backups).
-        /tmp/puppi/$project/config
-
-
-## HOW TO CUSTOMIZE
-It should be clear that with puppi you have full flexibility in the definition of a deployment 
-procedure, since the puppi command is basically a wrapper that executes arbitrary scripts with
-a given sequence, in pure KISS logic.
-
-The advantanges though, are various:
-* You have a common syntax to manage deploys and rollbacks on an host
-
-* In your Puppet manifests, you can set in simple, coherent and still flexible and customizable
-  defines all the elements, you need for your application deployments. 
-  Think about it: with just a Puppet define you build the whole deploy logic
-
-* Reporting for each deploy/rollback is built-in and extensible 
-
-* Automatic checks can be built in the deploy procedure
-
-* You have a common, growing, set of general-use scripts for typical actions
-
-* You have quick and useful command to see what's happening on the system (puppi check, log, info)
-
-There are different parts where you can customize the behaviour of puppi:
-
-* The set of general-use scripts in /etc/puppi/scripts/ ( this directory is filled with the content
-  of puppi/files/scripts/ ) can/should be enhanced. These can be arbitrary scripts in whatever
-  language. If you want to follow puppi's logic, though, consider that they should import the
-  common and runtime configuration files and have an exit code logic similar to the one of
-  Nagios plugins: 0 is OK, 1 is WARNING, 2 is CRITICAL. Note that by default a script that 
-  exits with WARNING doesn't block the deploy procedure, on the other hand, if a script exits
-  with CRITICAL (exit 2) by default it blocks the procedure.
-  Take a second, also, to explore the runtime config file created by the puppi command that
-  contains variables that can be set and used by the scripts invoked by puppi.
-
-* The custom project defines that describe deploy templates. These are placed in
-  puppi/manifests/project/ and can request all the arguments you want to feed your scripts with.
-  Generally is a good idea to design a standard enough template that can be used for all the 
-  cases where the deployment procedure involves similar steps. Consider also that you can handle
-  exceptions with variables (see the $loadbalancer_ip usage in puppi/manifests/project/maven.pp)
-
-
-## (NO) DEPENDENCIES AND CONFLICTS
-Puppi is self contained. It doesn't require other modules.
-(And is required by all Example42 modules).
-
-For correct functionality by default some extra packages are installed.
-If you have conflicts with your existing modules, set the argument:
-  install_dependencies => false
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_check.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_check.md
deleted file mode 100644
index e63204ca0e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_check.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# PUPPI CHECK INSTRUCTIONS
-Documentation and examples related to the puppi action check
-
-## SYNOPSIS (cli)
-        puppi check [project_name] [-r yes|no|fail]
-
-## EXAMPLES (cli)
-Run host-wide checks.
-        puppi check
-Run project "myapp" specific tests AND host-wide checks
-        puppi check myapp
-
-Run checks and send reports only if some of them fail
-        puppi check -r fail
-
-Run checks and send reports
-        puppi check -r yes
-
-Run checks and show only failed ones
-        puppi check -s fail
-
-## EXAMPLES (puppet)
-The basic define related to a check is:
-        puppi::check   - Creates a single command to be placed in the check sequence.
-
-A simple example might be:
-        puppi::check { 'Port_Apache':
-          command  => "check_tcp -H ${fqdn} -p 80" ,
-        }
-
-but also something that uses variables Puppet already knows
-        puppi::check { 'apache_process':
-          command  => "check_procs  -c 1: -C ${apache::params::processname}" ,
-        }
-
-To avoid repetitions you can include the relevant checks in defines you already have
-to manage, for example, virtualhosts, and use the data you already provide to configure
-their local puppi checks. 
-        puppi::check { "Url_$name":
-          enable   => $enable,
-          command  => "check_http -I '${target}' -p '${port}' -u '${url}' -s '${pattern}'" ,
-        }
-
-You can also use custom scripts for your checks. They should behave similarly to Nagios plugins inn their exit codes: 0 for SUCCESS, 1 for WARNINGS, 2 for CRITICAL. In this case you've to specify the directory there the scripts stays:
-        puppi::check { 'my_stack':
-          command  => 'stack_check.sh',
-          bade_dir => '/usr/bin',
-        }
-
-
-## EXAMPLES (with example42 puppet modules)
-If you use the whole Example42 modules set you get automatically many service related checks out of the box.
-Just set (via an ENC, facts or manifests) these puppet variables:
-        $monitor="yes" # To enable automagic monitoring
-        $monitor_tool = "puppi"  # As monitoring tool define at least puppi. If you like Nagios, you may use:
-        $monitor_tool = ["nagios","puppi"] # This enables the below checks both for Puppi and Nagios
-        $puppi=yes # To enable puppi extensions autoloading
-
-To the port and service checks automatically added for the included modules, you can add custom url checks 
-with something like:
-        monitor::url { "URL_Check_Database_Connection":
-          url      => "http://www.example42.com/check/db",
-          pattern  => 'SUCCESS',
-          port     => '80',
-          target   => "${fqdn}",
-        }
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_deploy.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_deploy.md
deleted file mode 100644
index 683f48bfb2e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_deploy.md
+++ /dev/null
@@ -1,263 +0,0 @@
-# PUPPI DEPLOY INSTRUCTIONS
-Documentation and examples related to the puppi actions: deploy, rollback and init
-
-## SYNOPSIS (COMMAND LINE)
-Shell command to launch a deploy:
-        puppi deploy <project_name>
-        puppi deploy <project_name> [-f] [-i] [-t] [-d yes|full] [-r yes|no|fail] [-p "parameter=value parameter2=value2"]
-
-Shell command to launch a rollback:
-        puppi rollback <project_name> 
-
-Shell command to launch the first deploy:
-        puppi init <project_name>
-
-
-## EXAMPLES (cli)
-
-Deploy myapp with the standard logic/parameters defined in Puppet:
-        puppi deploy myapp
-
-Deploy myapp and doesn't stop in case of Critical errors:
-        puppi deploy myapp -f
-
-Deploy myapp in interactive mode. Confirmation is asked for each step
-        puppi deploy myapp -i
-
-Test mode. Just show the commands that would be executed
-        puppi deploy myapp -t
-
-Deploy myapp with full debugging output
-        puppi deploy myapp -d full
-
-Deploy myapp in interactive mode and sets some custom options that override the standard Puppet params.
-Note that these parameters change according to the script you use (and the scripts must honour this override in order to make this option work).
-        puppi deploy myapp -i -o "version=1.1 source_url=http://dev.example42.com/code/my_app/"
-
-Make the first deploy of "myapp". Can be optional and may require a subsequent puppi deploy myapp
-        puppi init myapp
-
-Rollback myapp to a previous archived state. User is asked to choose which deploy to override. Note that by default you have 5 backups to rollback from. Older backups are automatically removed.
-        puppi rollback myapp
-
-Automatically rollback to the latest saved state (unattended).
-        puppi rollback myapp latest
-
-
-## EXAMPLES (puppet)
-Here follow some sample defines you can use out of the box in your manifests once you include puppi.
-Get a war from $source and deploy it in $deploy_root:
-        puppi::project::war { 'myapp':
-          source           => 'http://repo.example42.com/deploy/prod/myapp.war',
-          deploy_root      => '/store/tomcat/myapp/webapps',
-        }
-
-Get a tarball from $source, unpack it in $deploy_root, restart service called apache and send a mail
-to $report_mail (you can have a comma separated list of destination addresses):
-        puppi::project::tar { 'mysite':
-          source           => 'rsync://repo.example42.com/deploy/prod/release.tgz',
-          init_script      => 'apache',
-          deploy_root      => '/var/www/html/',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true', # Redundant
-        }
-
-Get a tarfile with a .sql query file and apply to to you local Mysql with the credentials provided:
-        puppi::project::mysql { 'myweb_sql':
-          source          => 'http://repo.example42.com/deploy/prod/database.sql.gz',
-          mysql_user      => 'myweb',
-          mysql_password  => $secret::mysql_myweb_pw,
-          mysql_host      => 'localhost',
-          mysql_database  => 'myweb',
-          report_email    => 'sysadmins@example42.com,dbadmins@example42.com',
-          enable          => 'true',
-        }
-
-Get a list of files from $source, retrieve the actual files from $source_baseurl and place them
-in $deploy_root
-        puppi::project::files { 'gfxupdates':
-          source           => 'http://deploy.example42.com/prod/website2/list.txt',
-          source_baseurl   => 'http://design.example42.com/website2/gfx/',
-          deploy_root      => '/var/www/html/gfx',
-          report_email     => 'sysadmins@example42.com,designers@example42.com',
-          enable           => 'true',
-        }
-
-Deploy from a Nexus repository (retrieve maven-metadata.xml from dir specified in $source), get the war 
-(version is achieved from the "release" tag in the xml) and deploy it in $deploy_root and then restart tomcat.
-        puppi::project::maven { 'supersite':
-          source           => 'http://nexus.example42.com/nexus/content/repositories/releases/it/example42/supersite/',
-          deploy_root      => '/usr/local/tomcat/supersite/webapps',
-          init_script      => 'tomcat',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true',
-        }
-
-Get the maven-metadata.xml from a Nexus repository and deploy:
-- The release war in $deploy_root
-- A configurations tarball tagged with the Maven qualifier $config_suffix in $config_root
-- A static files tarball tagged with the Maven qualifier $document_suffix in $document_root
-        puppi::project::maven { 'supersite':
-          source           => 'http://nexus.example42.com/nexus/content/repositories/releases/it/example42/supersite/',
-          deploy_root      => '/usr/local/tomcat/supersite/webapps',
-          config_suffix    => 'cfg',
-          config_root      => '/srv/htdocs/supersite',
-          document_suffix  => 'css',
-          document_root    => '/srv/htdocs/supersite',
-          init_script      => 'tomcat',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true',
-        }
-
-The same deploy Nexus repository with some more options:
-- A Source dir to be used to deploy static files when issuing "puppi init supersite"
-- A block from a loadbalancer IP (managing different sites addresess)
-- Some more elaborate rsync exclusion rules
-- A backup retention of 3 archives (instead of the default 5)
-        puppi::project::maven { 'supersite':
-          source           => 'http://nexus.example42.com/nexus/content/repositories/releases/it/example42/supersite/',
-          deploy_root      => '/usr/local/tomcat/supersite/webapps',
-          config_suffix    => 'cfg',
-          config_root      => '/srv/htdocs/supersite',
-          document_suffix  => 'css',
-          document_root    => '/srv/htdocs/supersite',
-          document_init_source => 'rsync://backup.example42.com/initdir/supersite/',
-          firewall_src_ip  => $site ? {
-              dr      => '192.168.101.1/30',
-              main    => '192.168.1.1/30',
-          },
-          backup_rsync_options => '--exclude .snapshot --exclude /doc_root/autojs/*** --exclude /doc_root/autocss/*** --exclude /doc_root/xsl',
-          backup_retention => '3',
-          init_script      => 'tomcat',
-          report_email     => 'sysadmins@example42.com',
-          enable           => 'true',
-        }
-
-An elaborated war deploy:
-- get from $source,
-- execute /usr/local/bin/mychecks.sh as root before the deploy
-(or better with sequence number 39)
-- deploy to /data/tomcat/myapp/webapps as user pippo
-- stop and start tomcat-myapp but also monit and puppet
-- backup passing  $backup_rsync_options to rsync:
-        puppi::project::war { 'myapp':
-          source                  => 'http://repo.example42.com/deploy/prod/myapp.war',
-          deploy_root             => '/store/tomcat/myapp/webapps',
-          predeploy_customcommand => '/usr/local/bin/mychecks.sh',
-          predeploy_priority      => '39',
-          predeploy_user          => 'root',
-          backup_rsync_options    => '--exclude logs/',
-          user                    => 'pippo',
-          init_script             => 'tomcat-myapp',
-          deploy_root             => '/data/tomcat/myapp/webapps',
-          report_email            => 'sysadmins@example42.com',
-          disable_services        => 'monit puppet',
-        }
-An example of usage of the generic builder define to deploy a zip file, with an example custom
-post deploy command executed as root (as all puppi commands, if not specified otherwise)
-        puppi::project::builder { 'cms':
-          source                   => 'http://repo.example42.com/deploy/cms/cms.zip',
-          source_type              => 'zip',
-          user                     => 'root',
-          deploy_root              => '/var/www',
-          postdeploy_customcommand => 'chown -R www-data /var/www/files',
-          postdeploy_user          => 'root',
-          postdeploy_priority      => '41',
-          report_email             => 'sysadmins@example42.com',
-          enable                   => 'true',
-        }
-
-These are just examples, possibilities are many, refer to the docs in puppi/manifests/project/*.pp
-to have a full list of the available options.
-
-
-## BASIC PUPPI DEFINES
-The above puppi::projects defines manage more or less complex deployments procedures for different kind of projects. They are just samples of possible procedures and you may create your one ones, if the ones provided there don't fit your needs.
-They will have to contain one or more of these basic puppi defines.
-
-Create the main project structure. One or more different deployment projects can exist on a node.
-        puppi::project
-
-Create a single command to be placed in the init sequence. It's not required for every project.
-        puppi::initialize
-
-Create a single command to be placed in the deploy sequence. More than one is generally needed for each project.
-        puppi::deploy
-
-Create a single command to be placed in the rollback sequence. More than one is generally needed for each project.
-         puppi::rollback
-
-These defines have generally a standard structure and similar arguments.
-Every one is reversable (enable => false) but you can wipe out the whole /etc/puppi directory
-to have it rebuilt from scratch. Here is an example for a single deploy command:
-        puppi::deploy { 'Retrieve files':       # The $name of the define is used in the file name
-          command  => 'get_curl.sh',          # The name of the general-use script to use
-          argument => 'file:///storage/file', # The argument(s) passed to the above script
-          priority => '10',                   # Lower priority scripts are executed first
-          user     => 'root',                 # As what user we run the script
-          project  => 'my-web.app',           # The name of the project to use
-        }
-
-This define creates a file named:
-        /etc/puppi/projects/${project}/deploy/${priority}-${name}
-Its content is, simply:
-        su - ${user} -c "export project=${project} && /etc/puppi/scripts/${command} ${arguments}"
-
-
-## DEPLOY PROCEDURES DEFINES
-The puppi module provides some examples of deploy workflows they are in the puppi/manifests/project
-directory and contain simple to use defines that contain one puppi::project and several puppi::deploy and
-puppi::rollback defines to design a specific workflow using the builtin commands present in
-puppi/files/scripts.
-Note that if you need to design your own deploy procedure you have different options:
-- Verify if you can reuse the existing ones, using optional arguments as pre/postdeploy_commands
-- Use the existing ones as a base to make you own custom defines, reusing parts of their logic 
-  and the builtin commands (puppi/files/scripts/*) they use
-- Write your own commands (in whatever language) and integrate them in your own procedure.
-
-Here follow the main and most reusable deploy workflows defines available in puppi/manifests/project/.
-The have generally a set of common arguments that make you manage if to stop and restart specific 
-services, if you want to isolate your server from a loadbalancer during the deploy procedure, what to backup,
-how many backup copies to mantain, if to send a report mail to specific addresses and if you need
-to run custom commands during the standard procedure.
-For all of the you have to specify a source from where to get the source files (http/ftp/rsync/file..) 
-a directory where to place them and the user that has to own the deploy files.
-Full documentation is available in the relevant .pp files
-
-- puppi::project::tar - Use this to retrieve and deploy a simple tar file
-- puppi::project::war - Use this to retrieve and deploy a war
-- puppi::project::files - Use this to deploy one or more files based on a provided list
-- puppi::project::dir - Use this to syncronize a remote directory to a local deploy one
-- puppi::project::mysql - Use this to retrive and apply a .sql file for mysql schema updates 
-- puppi::project::maven - Use this to deploy war and tar files generated via Maven released on Nexus or similar. A good source of Open Source Java artifacts is http://www.artifact-repository.org/
-- puppi::project::builder - This is a general purpose define that incorporates most the of cases provided by the above procedures
-
-
-## BUILTIN COMMANDS
-The puppi/files/scripts directory in the module contains some general usage "native" bash scripts
-that can be used in custom deployments. They are generally made to work together according to a
-specific logic, which is at the base of the deploy procedures defines in puppi/manifests/project/
-but you're free to write your own scripts, in whatever language, according to your needs.
-
-The default scripts are engineered to follow these steps for a deployment:
-- Remote files are downloaded in /tmp/puppi/$project/store or directly in the predeploy
-  directory: /tmp/puppi/$project/deploy
-- If  necessary the downloaded files are expanded in one or more predeploy directories
-  (default:/tmp/puppi/$project/deploy).
-- Runtime configuration entries might be saved in /tmp/puppi/$project/config
-- Files are eventually backed from the deploy directory (Apache' docroot, Tomcat webapps or whatever)
-  to the archive directory (/var/lib/puppi/archive/$project). Older backups are deleted (by default
-  there's a retention of 5 backups).
-- Files are copied from the predeploy directory to the deploy dir.
-- Relevant services are eventually stopped and started
-
-The most used common scripts are (they might have different arguments, some of them are quite simple):
-- get_file.sh - Retrieves a file via ssh/http/rsync/svn and places it in a temp dir (store or predeploy)
-- deploy.sh - Copies the files in the predeploy dir to deploy dir
-- archive.sh - Backups and restores files in deploy dir
-- service.sh - Stops or starts one or more services
-- wait.sh - Waits for the presence or absence of a file, for the presence of a string in a file or a defined number or seconds.
-- get_metadata.sh - Extracts metadata from various sources in order to provide info to other scripts. These info are save in the Runtime configuration file (/tmp/puppi/$project/config)
-- report_mail.sh - Sends a mail with the report of the operations done
-
-General functions, used by both the puppi command and these scripts, are in puppi/files/scripts/functions
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_info.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_info.md
deleted file mode 100644
index ff45eb3780e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_info.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# PUPPI INFO README
-The puppi info commands executes scripts in /etc/puppi/info/ which are generated by templates provided by the puppi::info define
-These scripts are supposed to show status details on the omonimous info topic.
-
-## SYNOPSIS (cli)
-        puppi info [topic] [-i]
-
-## EXAMPLES (cli)
-Show host-wide infos. Much stuff.
-        puppi info
-
-Show info about apache (connections, processes, config, logs...)
-        puppi info apache
-
-Interactively select the info topics you want to show
-        puppi info -i
-
-Show complete info and send reports (email, rest ... )
-        puppi info -r yes
-
-Grep the output with the string defined
-        puppi info -g <string>
-
-
-## EXAMPLES (puppet)
-The basic define related to a info is puppi::info, it creates a script executed
-when running "puppi info $name" based on the provided template.
-Customize the template to customize the info you want to see.
-
-A sample that just runs commands using the default template:
-        puppi::info { 'network':
-          description => 'Network settings and stats' ,
-          run         => [ 'ifconfig' , 'route -n' , 'cat /etc/resolv.conf' , 'netstat -natup | grep LISTEN' ],
-        }
-
-You can have more useful and dedicated info topics using a custom puppi::info define inside your
-own defines. For example in a define that creates a tomcat instance you can add something like:
-        puppi::info::instance { "tomcat-${instance_name}":
-          servicename => "tomcat-${instance_name}",
-          processname => "${instance_name}",
-          configdir   => "${tomcat::params::storedir}/${instance_name}/conf/",
-          bindir      => "${tomcat::params::storedir}/${instance_name}/bin/",
-          pidfile     => "${instance_rundir}/tomcat-${instance_name}.pid",
-          datadir     => "${instance_path}/webapps",
-          logdir      => "${instance_logdir}",
-          httpport    => "${instance_httpport}",
-          controlport => "${instance_controlport}",
-          ajpport     => "${instance_ajpport}",
-          templatefile=> "puppi/info/instance.erb",
-          description => "Info for ${instance_name} Tomcat instance" ,
-        }
-which has custom arguments, feeded by the data you provided to the define, and a custom
-template file that uses these variables. 
-
-## EXAMPLES (with example42 puppet modules)
-If you use the old Example42 modules set you get automatically many service related infos out of the box to be used with Puppi One.
-NextGen modules are supposed to provide pupi info intergration on Puppi Two (TO DO)
-Just set (via an ENC, facts or manifests) $puppi=yes to enable puppi extensions autoloading.
-This will automatically deploy info topics related to the modules you use.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_log.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_log.md
deleted file mode 100644
index 8fe806ea020..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/README_log.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# PUPPI LOG README
-Documentation and examples related to the puppi action log
-
-## SYNOPSIS (cli)
-        puppi log [topic] [-i]
-
-## EXAMPLES (cli)
-
-Tails (tail -10f) all the known logs.
-        puppi log
-
-Tails only the logs related to the given topic
-        puppi log apache
-
-Choose interactively which logs to show
-        puppi log
-
-Grep the output with the string defined
-        puppi log -g <string>
-
-## EXAMPLES (puppet)
-The basic define related to a log is:
-        puppi::log
-it creates a file in /etc/puppi/logs/ with one or more logs paths.
-
-A simple, operating system aware, example might be:
-        puppi::log { 'auth':
-          description => 'Users and authentication' ,
-          log => $::operatingsystem ? { 
-            redhat => '/var/log/secure',
-            darwin => '/var/log/secure.log',
-            ubuntu => ['/var/log/user.log','/var/log/auth.log'],
-          }
-        }
-
-but also something that uses variables Puppet already knows
-        puppi::log { "tomcat-${instance_name}":
-          log => "${tomcat::params::storedir}/${instance_name}/logs/catalina.out"
-        }
-
-EXAMPLES (with example42 puppet modules)
-If you use the old Example42 modules set you get automatically many service related logs out of the box to be used with Puppi One.
-NextGen modules are supposed to provide puppi log intergration on Puppi Two (TO DO)
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Rakefile
deleted file mode 100644
index 8fcea70edb1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet_blacksmith/rake_tasks'
-require 'puppet-lint'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/composer.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/composer.json
deleted file mode 100644
index f56438cd236..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/composer.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "example42/puppi",
-    "description": "Puppet driven applications deployment tool",
-    "homepage": "https://github.com/example42/puppi",
-    "type": "library",
-    "license": "Apache License, Version 2.0",
-    "authors": [
-        {
-            "name": "Example42",
-            "homepage": "http://www.example42.com/"
-        }
-    ]
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme
deleted file mode 100644
index 08778cc69c4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme
+++ /dev/null
@@ -1,2 +0,0 @@
-Default ReadMe File.
-Edit puppi/files/info/readme/readme to change this message
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme-default b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme-default
deleted file mode 100644
index 187d6f3a10a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/info/readme/readme-default
+++ /dev/null
@@ -1,4 +0,0 @@
-No extra node or role related info available.
-To have node or role specific extar info, create 
-modules/puppi/files/info/readme/readme--$hostname or
-modules/puppi/files/info/readme/readme-$role 
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mailpuppicheck b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mailpuppicheck
deleted file mode 100644
index fbde3bfda79..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mailpuppicheck
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-# Possible Usage:
-# Run this command at the end of each Puppet run to be 
-# immediately notified if a Puppet Runs has broken some service
-# 
-# Options:
-# -m destination_email
-# -i <interval> (in seconds) before retrying a Puppi check
-# -r <number_of_retries> how many attempts to retry if there are failures
-#
-# In puppet.conf add something like:
-# postrun_command = "/usr/bin/mailpuppicheck -m roots@example.com"
-#
-retries=1
-interval=2
-workdir="/tmp"
-counter=0
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -m)
-      mail=$2
-      shift 2 ;;
-    -i)
-      internal=$2
-      shift 2 ;;
-    -r)
-      retries=$2
-      shift 2 ;;
-  esac
-done
-
-if [ ! $mail ] ; then
-    echo "Provide at least an email addess"
-    exit 1
-fi
-
-# randfile="$(mktemp)"
-lastrunfile=$workdir/puppicheck_lastrun
-savedfile=$workdir/puppicheck_saved
-
-while [ $counter -lt $retries ] ; do
-  puppi check | grep FAILED > $lastrunfile
-  if [ "x$?" == "x0" ] ; then
-    errors="yes"
-    sleep $interval
-  else
-    errors="no"
-    echo "Run $counter - Errors $errors"
-    echo > $savedfile
-    exit 0
-  fi
-  echo "Run $counter - Errors $errors"
-  let counter=$counter+1
-done
-
-diff $lastrunfile $savedfile
-if [ "x$?" == "x0" ] ; then
-  echo "No changes detected"
-else
-  echo "Changes detected"
-  notify="yes"
-fi
-
-cp $lastrunfile $savedfile
-if [ "x$notify" == "xyes" ] ; then 
-  # Yes, it's ugly
-  cat -v $lastrunfile  | sed -e 's:\^\[\[60G\[\^\[\[0;31m: :g' | sed -e 's:\^\[\[0;39m\]\^M: :g' | mail -s "[puppet] Errors after Puppet run on $(hostname -f)" $mail
-  echo "Sent notification"
-fi
-
-exit 0
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi
deleted file mode 100755
index 26f1e45a40e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/mc-puppi
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-
-# Client program for the mcollective puppi agent 
-#
-# Released under Apache License 2.0
-
-require 'mcollective'
-
-include MCollective::RPC
-
-options = rpcoptions do |parser, options|
-    options[:timeout] = 180
-
-    parser.define_head "Execute Puppi commands"
-    parser.banner = "Usage: mc-puppi [filters] command [project] [puppioptions]"
-    parser.separator ""
-    parser.separator "Available commands:"
-    parser.separator "  check [project] - Run puppi check"
-    parser.separator "  info [topic] - Run puppi info. For all or specified topic"
-    parser.separator "  log [topic] - Run puppi log. For all or specified topic"
-    parser.separator "  todo - Run puppi todo"
-    parser.separator "  deploy <project> - Run puppi deploy on the defined project"
-    parser.separator "  configure <project> - Run puppi configure on the defined project"
-    parser.separator "  rollback <project> - Run puppi rollback latest on the defined project"
-    parser.separator "  init <project> - Run puppi init on the defined project"
-end
-
-if MCollective::Util.empty_filter?(options[:filter])
-    print("Do you really want to operate on services unfiltered? (y/n): ")
-    STDOUT.flush
-
-    exit unless STDIN.gets.chomp =~ /^y$/
-end
-
-if ARGV.length >= 1
-    command = ARGV.shift
-    project = ARGV.shift
-    puppioptions = ARGV.shift
-
-    unless command =~ /^(check|deploy|rollback|init|configure|info|log|todo)$/
-        puts("Command has to be check|info|log|deploy|rollback|init|configure|todo")
-        exit 1
-    end
-else
-    puts("Please specify at least a command")
-    exit 1
-end
-
-mc = rpcclient("puppi", :options => options)
-mc.progress = true
-# mc.send(command, {:project => project}) do |resp|
-args = {};
-args[:project] = project if project
-args[:puppioptions] = puppioptions if puppioptions
-mc.send(command, args) do |resp|
-    begin
-#        puts resp[:serverid]
-        puts resp[:body][:data]
-#        puts resp[:body][:exitcode]
-
-    rescue RPCError => er
-        puts "RPC Agent error: #{er}"
-    end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl
deleted file mode 100644
index f86ec468fe1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.ddl
+++ /dev/null
@@ -1,68 +0,0 @@
-metadata    :name        => "SimpleRPC Agent For PUPPI Commands",
-            :description => "Agent to query PUPPI commands via MCollective", 
-            :author      => "Al @ Lab42",
-            :license     => "Apache License 2.0",
-            :version     => "0.3",
-            :url         => "http://www.example42.com/",
-            :timeout     => 600
-
-[ "check" , "log" , "info" ].each do |myact| 
-    action myact, :description => "Run puppi myact" do
-        display :always
-
-        input :project,
-              :prompt      => "Project",
-              :description => "PUPPI project",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => true,
-              :maxlength   => 50
-
-        input :puppioptions,
-              :prompt      => "Puppi options",
-              :description => "PUPPI options",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => true,
-              :maxlength   => 50
-
-        output :data,
-              :description => "Output from the Puppi run",
-              :display_as  => "Output"
-
-        output :exitcode,
-              :description  => "Exit Code from the Puppi run",
-              :display_as => "Exit Code"
-    end
-end
-
-[ "deploy" , "rollback" , "init" , "configure" ].each do |myact|
-    action myact, :description => "Run puppi myact" do
-        display :always
-
-        input :project,
-              :prompt      => "Project",
-              :description => "PUPPI project",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => false,
-              :maxlength   => 50
-
-        input :puppioptions,
-              :prompt      => "Puppi options",
-              :description => "PUPPI options",
-              :type        => :string,
-              :validation  => '^[a-zA-Z\-\.=_\d]+$',
-              :optional    => true,
-              :maxlength   => 50
-
-        output :data,
-              :description => "Output from the Puppi run",
-              :display_as  => "Output"
-
-        output :exitcode,
-              :description  => "Exit Code from the Puppi run",
-              :display_as => "Exit Code"
-    end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb
deleted file mode 100644
index ee0b3289f23..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppi.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-module MCollective
-    module Agent
-        class Puppi<RPC::Agent
-            metadata    :name        => "SimpleRPC Agent For PUPPI Commands",
-                        :description => "Agent to execute PUPPI actions via MCollective",
-                        :author      => "Al @ Lab42",
-                        :license     => "Apache License 2.0",
-                        :version     => "0.3",
-                        :url         => "http://www.example42.com/",
-                        :timeout     => 600
-
-            def check_action
-#                   validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi check #{project}].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def info_action
-#                   validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi info #{project}].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def log_action
-#                   validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi log #{project} -c 10].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def deploy_action
-                    validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    if (!File.directory? "/etc/puppi/projects/#{project}")
-                      reply.fail "No such project #{project}"
-                      return
-                    end
-                    puppioptions = request[:puppioptions]
-                    reply.data = %x[puppi deploy #{project} -o "#{puppioptions}"].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def rollback_action
-                    validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi rollback #{project} latest].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-
-            def init_action
-                    validate :project, :shellsafe
-                    project = request[:project] if request[:project]
-                    reply.data = %x[puppi init #{project}].chomp
-                    if ($?.exitstatus > 0)
-                      reply.fail "FAILED: #{reply.data}"
-                    end
-            end
-            
-            def configure_action
-                  validate :project, :shellsafe
-                  project = request[:project] if request[:project]
-                  reply.data = %x[puppi configure #{project}].chomp
-                  if ($?.exitstatus > 0)
-                    reply.fail "FAILED: #{reply.data}"
-                  end
-            end
-
-        end
-    end
-end
-# vi:tabstop=4:expandtab:ai
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppicheck b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppicheck
deleted file mode 100644
index 988d310fad8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppicheck
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-PATH=$PATH:/usr/local/bin
-
-if [ ! $1 ] ; then
-    echo "Provide at least a match pattern. For example:"
-    echo "role=fep-pgol"
-    exit 1
-fi
-
-filtered=$(echo $* | sed "s/[^a-Z0-9= _.\-]//Ig")
-
-randfile="$(mktemp)"
-
-trap "rm -f $randfile" SIGINT SIGTERM EXIT
-
-myarg=$(echo $filtered | sed -e "s/ / -F /g")
-
-mc-puppi check -F $myarg | tee $randfile
-grep FAILED $randfile && exit 1
-exit 0
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppideploy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppideploy
deleted file mode 100644
index 2f722d6c3e3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/mcollective/puppideploy
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-PATH=$PATH:/usr/local/bin
-
-if [ ! $2 ] ; then
-    echo "Provide the hostname and the project you want to deploy:"
-    echo "superdeploy web01.example42.com myapp"
-    exit 1
-fi
-
-filtered=$(echo $* | sed "s/[^a-Z0-9= _.\-]//Ig")
-
-randfile="$(mktemp)"
-
-trap "rm -f $randfile" SIGINT SIGTERM EXIT
-
-myarg=$(echo $filtered | sed -e "s/ / -F /g")
-
-mc-puppi deploy -I $1 $2 | tee $randfile
-grep FAILED $randfile && exit 1
-exit 0
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/archive.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/archive.sh
deleted file mode 100644
index 7448613d391..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/archive.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-# archive.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to backup or restore contents to/from puppi archivedir"
-    echo "It has the following options:"
-    echo "-b <backup_source> - Backups the files to be changed in the defined directory"
-    echo "-r <recovery_destination> - Recovers file to the provided destination"
-    echo "-s <copy|move> - Specifies the backup strategy (move or copy files)"
-    echo "-t <tag> - Specifies a tag to be used for the backup"
-    echo "-d <variable> - Specifies the runtime variable that defines the predeploy dir"
-    echo "-c <yes|no> - Specifies if you want compressed (tar.gz) archives. Default: yes"
-    echo "-o 'options' - Specifies the rsync options to use during backup. Use it to specify custom "
-    echo "               exclude patterns of files you don't want to archive, for example"
-    echo "-m <full|diff> - Specifies the backup type: 'full' backups all the files in backup_source,"
-    echo "                 'diff' backups only the files deployed"
-    echo "-n <number> - Number of copies of backups to keep on the filesystem. Default 5"
-    echo 
-    echo "Examples:"
-    echo "archive.sh -b /var/www/html/my_app -t html -c yes"
-}
-
-# Arguments check
-if [ "$#" = "0" ] ; then
-    showhelp
-    exit
-fi
-
-# Default settings
-compression=yes
-backuptag=all
-strategy=copy
-backupmethod=full
-bakret=5
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -b)
-      backuproot=$2
-#      [ $deploy_root ] && backuproot=$deploy_root # This is needed to allow override of $deploy_root via puppi cmd. But breaks on puppi::project::maven
-      action=backup
-      shift 2 ;;
-    -r)
-      backuproot=$2
-#      [ $deploy_root ] && backuproot=$deploy_root # This is needed to allow override of $deploy_root via puppi cmd. But breaks on puppi::project::maven
-      action=recovery
-      shift 2 ;;
-    -t)
-      backuptag=$2
-      shift 2 ;;
-    -s)
-      case "$2" in
-        mv) strategy="move" ;;
-        move) strategy="move" ;;
-        *) strategy="copy" ;;
-      esac
-      shift 2 ;;
-    -m)
-      case "$2" in
-        diff) backupmethod="diff" ;;
-        *) backupmethod="full" ;;
-      esac
-      shift 2 ;;
-    -c)
-      case "$2" in
-        yes) compression="yes" ;;
-        y) compression="yes" ;;
-        *) compression="none" ;;
-      esac
-      shift 2  ;;
-    -d)
-      predeploydir="$(eval "echo \${$(echo $2)}")"
-      shift 2 ;;
-    -o) 
-      rsync_options=$2
-      shift 2 ;;
-    -n)
-      bakret=$2
-      shift 2 ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-
-# Backup and Restore functions
-backup () {
-    mkdir -p $archivedir/$project/$tag/$backuptag
-    if [ $archivedir/$project/latest ] ; then
-        rm -f $archivedir/$project/latest
-    fi
-    ln -sf $archivedir/$project/$tag $archivedir/$project/latest
-
-    filelist=$storedir/filelist
-    cd $predeploydir
-    find . | cut -c 3- | grep -v "^$" > $filelist
-
-    if [ "$strategy" = "move" ] ; then 
-        for file in $(cat $filelist) ; do
-            mv $backuproot/$file $archivedir/$project/$tag/$backuptag/
-        done
-        if [ "$backupmethod" = "full" ] ; then
-            rsync -a $rsync_options $backuproot/ $archivedir/$project/$tag/$backuptag/
-        fi
-    else
-        if [ "$backupmethod" = "full" ] ; then
-            rsync -a $rsync_options $backuproot/ $archivedir/$project/$tag/$backuptag/
-        else
-            rsync -a $rsync_options --files-from=$filelist $backuproot/ $archivedir/$project/$tag/$backuptag/
-        fi
-    fi
-
-    if [ "$compression" = "yes" ] ; then
-        cd $archivedir/$project/$tag/$backuptag/
-        tar -czf ../$backuptag.tar.gz .
-        cd $archivedir/$project/$tag/
-        rm -rf $archivedir/$project/$tag/$backuptag/
-    fi
-}
-
-recovery () {
-    if [ ! $rollbackversion ] ; then
-        echo "Variable rollbackversion must exist!"
-        exit 2 
-    fi
-
-    if [ -d $archivedir/$project ] ; then
-        cd $archivedir/$project
-    else 
-        echo "Can't find archivedir for this project"
-        exit 2
-    fi
-
-    if [ "$compression" = "yes" ] ; then
-        cd $backuproot/
-        tar -xzf $archivedir/$project/$rollbackversion/$backuptag.tar.gz .
-    else 
-        rsync -a $rsync_options $rollbackversion/$backuptag/* $backuproot
-    fi
-
-}
-
-delete_old () {
-    # We don't count the "latest" symlink
-    bakret=$(expr $bakret + 1 )
-
-    cd $archivedir/$project
-
-    ddirs=$(ls -1p 2>/dev/null | wc -l)
-    while [ $ddirs -gt $bakret ]
-    do
-        victim=$(ls -tr 2>/dev/null | head -1)
-        rm -rf $victim && echo "Deleted old $archivedir/$project/$victim"
-        ddirs=$(ls -1p 2>/dev/null | wc -l)
-    done
-}
-
-# Action!
-case "$action" in
-    backup) backup ; delete_old ;;
-    recovery) recovery ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/check_project.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/check_project.sh
deleted file mode 100644
index 1f1c1d6d9b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/check_project.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# check_project.sh - Made for Puppi
-# This script runs the checks defined in $projectsdir/$project/check and then in $checksdir
-# It can be used to automatically run tests during the deploy procedure
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Main functions
-handle_check () {
-        RETVAL=$?
-        if [ "$RETVAL" = "1" ] ; then
-            EXITWARN="1"
-        fi
-        if [ "$RETVAL" = "2" ] ; then
-            EXITCRIT="1"
-        fi
-}
-
-check () {
-    for command in $(ls -v1 $projectsdir/$project/check) ; do
-        "$projectsdir/$project/check/$command"
-        handle_check
-    done
-
-    for command in $(ls -v1 $checksdir) ; do
-        "$checksdir/$command" 
-        handle_check
-    done
-}
-
-# For nicer output when launched via cli
-echo -n "\n"
-
-# Run checks
-check
-
-# Manage general return code
-if [ "$EXITCRIT" = "1" ] ; then
-    exit 1
-fi
-
-if [ "$EXITWARN" = "1" ] ; then
-    exit 1
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh
deleted file mode 100644
index 7e1b79228ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/checkwardir.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# checkwardir.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to check if a webapp directory is successfully created or removed"
-    echo " after the (un)deploy of a war file"
-    echo "It implies that a directory with the name of the war file is created in the same path"
-    echo "-p <warname> - Waits until war created dir is present"
-    echo "-a <warname> - Wait until war created dir is absent"
-    echo "-s <seconds> - Wait some more seconds after the check"
-    echo "-c <configentry> - Name of the runtime config variable that contains the warname"
-    echo "Examples:"
-    echo "checkwardir.sh -p /store/tomcat/myapp/webapps/myapp.war"
-    echo "checkwardir.sh -a /store/tomcat/myoldapp/webapps/myoldapp.war"
-}
-
-seconds=2
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -s)
-      seconds=$2
-      shift 2
-      ;;
-    -p)
-      check="present"
-      warname=$2
-      shift 2
-      ;;
-    -a)
-      check="absent"
-      warname=$2
-      shift 2
-      ;;
-    -c)
-      warname="$(eval "echo \${$(echo ${2})}")"      
-      shift 2
-      ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-checkdir () {
-    wardir=${warname%\.*}
-    while true
-       do
-        if [ $check == absent ] ; then
-            [ ! -d $wardir ] && break
-        else
-            [ -f $wardir/WEB-INF/web.xml ] && break
-        fi
-        sleep $seconds
-    done
-}
-
-checkdir
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh
deleted file mode 100644
index 40edae99204..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/clean_filelist.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# clean_filelist.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to cleanup a list of files to download from unwanted data"
-    echo "It has 1 optional argument:"
-    echo "The prefix, present in the list, to cut out when defining files to deploy"
-    echo "The list file is defined as $downloadedfile , these variables are gathered from the Puppi runtime"
-    echo "  config file."
-    echo 
-    echo "Example:"
-    echo "clean_filelist.sh http://svn.example42.com/myproject"
-}
-
-
-if [ $1 ] ; then
-    prefix=$1
-else
-    prefix=""
-fi
-
-deployfilelist=$downloadedfile
-
-# Clean list
-cleanlist () {
-
-    sed -i "s/^$prefix//g" $deployfilelist
-
-}
-
-cleanlist
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/database.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/database.sh
deleted file mode 100644
index f8d89399d3f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/database.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# database.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script executes database queries and dumps"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-t <database_type> The database type. Currently only mysql is suppoerted"
-    echo "-a <action> The action to perform:"
-    echo "            run - Run a mysql command based on a given .sql file"
-    echo "            dump - Dump the specified database in the archive dir"
-    echo "            restore - Restore the specified database from the archive dir"
-    echo "-d <database_name> The database name to manage"
-    echo "-u <database_user> The database user used to run the queries"
-    echo "-p <database_password> The user password"
-    echo "-h <host> The database server hostname"
-}
-
-# Arguments defaults
-db_type=mysql
-db_action=run
-db_user=root
-db_host=localhost
-db_password=""
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -t)
-      db_type=$2
-      shift 2 ;;
-    -a)
-      db_action=$2
-      shift 2 ;;
-    -d)
-      db_name=$2
-      shift 2 ;;
-    -u)
-      db_user=$2
-      shift 2 ;;
-    -p)
-      db_password=$2
-      shift 2 ;;
-    -h)
-      db_host=$2
-      shift 2 ;;
-  esac
-done
-
-
-
-mysql_run () {
-    case "$db_action" in
-      run)
-        file $downloadedfile | grep gzip &>/dev/null 2>&1 && sqlfile_type="gzip"
-        file $downloadedfile | grep Zip &>/dev/null 2>&1 && sqlfile_type="zip"
-        case "$sqlfile_type" in
-          gzip)
-            zcat $downloadedfile | mysql -u $db_user -p$db_password -h $db_host $db_name
-            check_retcode ;;
-          zip)
-            unzip -p $downloadedfile | mysql -u $db_user -p$db_password -h $db_host $db_name
-            check_retcode ;;
-          *)
-            mysql -u $db_user -p$db_password -h $db_host $db_name < $downloadedfile
-            check_retcode ;;
-        esac
-        ;;
-      dump)
-        mkdir -p $archivedir/$project/$tag
-        if [ $archivedir/$project/latest ] ; then
-            rm -f $archivedir/$project/latest
-        fi
-        ln -sf $archivedir/$project/$tag $archivedir/$project/latest
-
-        mysqldump -u $db_user -p$db_password -h $db_host --add-drop-table --databases $db_name | gzip > $archivedir/$project/$tag/$db_name.sql.gz
-        check_retcode ;;
-      restore)
-        zcat $archivedir/$project/$rollbackversion/$db_name.sql.gz | mysql -u $db_user -p$db_password -h $db_host $db_name
-        check_retcode ;;
-    esac
-}
-
-case "$db_type" in
-      mysql)
-        mysql_run
-        ;;
-      *)
-        showhelp
-        ;;
-esac
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/delete.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/delete.sh
deleted file mode 100644
index d255c6a832a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/delete.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# delete.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Manage script variables
-if [ $1 ] ; then
-    tobedeleted=$1
-else
-    echo "You must provide a file or directory to delete!"
-    exit 2 
-fi
-
-if [ "$tobedeleted" = "/" ] ; then
-    echo "Be Serious!"
-    exit 2
-fi
-
-# Move file
-move () {
-    mkdir -p $workdir/$project/deleted
-    mv $tobedeleted $workdir/$project/deleted
-}
-
-move
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy.sh
deleted file mode 100644
index 96d3b64c57b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-# deploy.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script deploys the files present in the \$predeploydir to the deploy destination dir"
-    echo "It has the following options:"
-    echo "\$1 (Required) - Destination directory where to deploy files"
-    echo "\$2 (Optional) - Name of the variable that identifies a specific predeploydir"
-    echo 
-    echo "Examples:"
-    echo "deploy.sh /var/www/html/my_app"
-    echo "deploy.sh /var/www/html/my_app/conf config"
-}
-
-# Check arguments
-if [ $1 ] ; then
-    deploy_destdir=$1
-# This breaks on projects::maven when using more than one deploy destinations
-#    [ $deploy_root ] && deploy_destdir=$deploy_root
-else
-    showhelp
-    exit 2 
-fi
-
-# Obtain the value of the variable with name passed as second argument
-# If no one is given, we take all the files in $predeploydir
-if [ $2 ] ; then
-    deployfilevar=$2
-    deploy_sourcedir="$(eval "echo \${$(echo ${deployfilevar})}")"
-    if [ "$deploy_sourcedir" = "" ] ; then
-        exit 0
-    fi
-else
-    deploy_sourcedir="$predeploydir"
-fi
-
-# Copy files
-deploy () {
-    case "$debug" in
-        yes)
-            rsync -rlptDv $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        full)
-            rsync -rlptDv $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        *)
-            rsync -rlptD $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-    esac
-}
-
-deploy
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh
deleted file mode 100644
index 95bb4ff150b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/deploy_files.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-# deploy_files.sh - Made for Puppi
-# This is an extended version of the deploy script
-# It accepts more options to better handle how files are deployed
-# in the destination directory
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script deploys the files present in the \$predeploydir to the deploy destination dir"
-    echo "It has the following options:"
-    echo "-d <path> (Required) - Destination directory where to deploy files"
-    echo "-p <name> (Optional) - Name of the variable that identifies a specific predeploydir"
-    echo "-c <true|false> (Default: false) - If to enabled the --delete option to the rsync command"
-    echo 
-    echo "Examples:"
-    echo "deploy_files.sh -d /var/www/html/my_app"
-    echo "deploy_files.sh -d /var/www/html/my_app/conf -p config"
-    echo "deploy_files.sh -d /var/www/html/my_app/conf -c true"
-}
-
-deploy_sourcedir="$predeploydir"
-clean_destdir="false"
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -d)
-      deploy_destdir=$2
-      shift 2 ;;
-    -p)
-      deployfilevar=$2
-      deploy_sourcedir="$(eval "echo \${$(echo ${deployfilevar})}")"
-      shift 2 ;;
-    -c)
-      clean_destdir=$2
-      shift 2 ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-rsync_delete=""
-if [ x$clean_destdir == "xtrue" ] ; then
-  rsync_delete="--delete"
-fi
-
-# Copy files
-deploy () {
-    case "$debug" in
-        yes)
-            rsync -rlptDv $rsync_delete $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        full)
-            rsync -rlptDv $rsync_delete $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-        *)
-            rsync -rlptD $rsync_delete $deploy_sourcedir/ $deploy_destdir/
-            check_retcode
-        ;;
-    esac
-}
-
-deploy
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/execute.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/execute.sh
deleted file mode 100644
index e63d3050549..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/execute.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# execute.sh - Made for Puppi
-# This script just executes what is passed as argument
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-#parse variables
-command=$(eval "echo "$*"")
-
-#execute command
-eval "${command}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/firewall.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/firewall.sh
deleted file mode 100644
index 382542c6e3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/firewall.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# firewall.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script places a temporary firewall (iptables) rule to block access from the IP defined"
-    echo "It has the following options:"
-    echo "\$1 (Required) - Remote Ip address to block (Generally a load balancer"
-    echo "\$2 (Required) - Local port to block (0 for all ports"
-    echo "\$3 (Required) - Set on or off to insert or remove the blocking rule"
-    echo "\$4 (Required) - Number of seconds to sleep after having set the rule"
-    echo 
-    echo "Examples:"
-    echo "firewall.sh 10.42.0.1 0 on"
-    echo "firewall.sh 10.42.0.1 0 off"
-}
-
-# Check arguments
-if [ $2 ] ; then
-    ip=$1
-    port=$2
-else
-    showhelp
-    exit 2 
-fi
-
-if [ $3 ] ; then
-    if [ "$3" = "on" ] ; then
-        action="-I"
-    elif [ "$3" = "off" ] ; then
-        action="-D"
-    else 
-        showhelp
-        exit 2
-    fi
-else
-    showhelp
-    exit 2
-fi
-
-if [ $4 ] ; then
-    delay=$4
-else
-    delay="1"
-fi
-
-# Block
-run_iptables () {
-    if [ "$port" = "0" ] ; then
-        iptables $action INPUT -s $ip -j DROP
-    else
-        iptables $action INPUT -s $ip -p tcp --dport $port -j DROP
-    fi
-}
-
-run_iptables
-echo "Sleeping for $delay seconds"
-sleep $delay
-
-# Sooner or later this script will have multiOS support
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/functions b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/functions
deleted file mode 100644
index 38bedcad3fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/functions
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/bin/bash
-# General Puppi functions
-
-BOOTUP=color
-RES_COL=75
-MOVE_TO_COL="echo -en \\033[${RES_COL}G"
-SETCOLOR_SUCCESS="echo -en \\033[0;32m"
-SETCOLOR_FAILURE="echo -en \\033[0;31m"
-SETCOLOR_WARNING="echo -en \\033[0;33m"
-SETCOLOR_NORMAL="echo -en \\033[0;39m"
-SETCOLOR_TITLE="echo -en \\033[0;35m"
-SETCOLOR_BOLD="echo -en \\033[0;1m"
-
-echo_success() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_SUCCESS
-  echo -n $"  OK  "
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 0
-}
-
-echo_dontdeploy() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_SUCCESS
-  echo -n $" NO NEED TO DEPLOY "
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 0
-}
-
-echo_failure() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_FAILURE
-  echo -n $"FAILED"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 1
-}
-
-echo_passed() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING
-  echo -n $"PASSED"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 1
-}
-
-echo_warning() {
-  [ "$BOOTUP" = "color" ] && $MOVE_TO_COL
-  echo -n "["
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_WARNING
-  echo -n $"WARNING"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-  echo -n "]"
-  echo -ne "\r"
-  return 1
-}
-
-echo_title () {
-  echo
-  echo
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_TITLE
-  echo "$1"
-  [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
-}
-
-check_retcode () {
-    if [ $? = "0" ] ; then
-        true
-    else
-        exit 2
-    fi
-}
-
-handle_result () {
-        RETVAL=$?
-        if [ "$RETVAL" = "0" ] ; then
-            showresult="echo_success"
-            result="OK"
-        fi
-        if [ "$RETVAL" = "1" ] ; then
-            showresult="echo_warning"
-            EXITWARN="1"
-            result="WARNING"
-        fi
-        if [ "$RETVAL" = "2" ] ; then
-            showresult="echo_failure"
-            EXITCRIT="1"
-            result="CRITICAL"
-        fi
-        if [ "$RETVAL" = "99" ] ; then
-            showresult="echo_dontdeploy"
-            DONTDEPLOY="1"
-            result="OK"
-        fi
-        if [ x$show == "xyes" ] ; then
-            $showresult
-            echo
-            echo -e "$output"
-            echo
-        elif [ x$show == "xfail" ] && [ x$RETVAL != "x0" ] ; then
-            $showresult
-            echo
-            echo -e "$output"
-            echo
-        fi
-
-        # Output to file
-        if [ ! -d $logdir/$project/$tag ] ; then
-            mkdir -p $logdir/$project/$tag
-        fi
-        let counter=counter+1
-        echo $title > $logdir/$project/$tag/$counter-$command
-        echo $code >> $logdir/$project/$tag/$counter-$command
-        echo $result >> $logdir/$project/$tag/$counter-$command
-        echo $output >> $logdir/$project/$tag/$counter-$command
-
-}
-
-
-# Function taken from http://www.threadstates.com/articles/parsing_xml_in_bash.html
-xml_parse () {
-    local tag=$1
-    local xml=$2
-
-    # Find tag in the xml, convert tabs to spaces, remove leading spaces, remove the tag.
-    grep $tag $xml | \
-        tr '\011' '\040' | \
-        sed -e 's/^[ ]*//' \
-            -e 's/^<.*>\([^<].*\)<.*>$/\1/'
-}
-
-# Stores the passed arguments in Project runtime config file
-# Only if the parameter is not already defined
-# Usage:
-# save_runtime_config parameter=value # Sets or overrides parameter
-# save_runtime_config parameter=value notforce # Sets parameters only if is not already set
-save_runtime_config () {
-    parameter=$(echo $1 | cut -d '=' -f1)
-    value=$(echo $1 | cut -d '=' -f2-)
-    force=$2
-
-    if [[ ! $(grep $parameter $workdir/$project/config) ]] ; then
-        echo  >> $workdir/$project/config
-        echo "# Added by $0" >> $workdir/$project/config
-        echo "$parameter=\"$value\"" >> $workdir/$project/config
-    else
-#        sed -i "/^$parameter=/d" $workdir/$project/config # No real need to remove lines with old configs
-        if [[ x$force == xnotforce ]] ; then
-            echo  >> $workdir/$project/config
-            echo "# CHANGE NOT FORCED by $0" >> $workdir/$project/config
-            echo "# $parameter=\"$value\"" >> $workdir/$project/config
-        else
-            echo  >> $workdir/$project/config
-            echo "# CHANGED by $0" >> $workdir/$project/config
-            echo "$parameter=\"$value\"" >> $workdir/$project/config
-       fi
-    fi
-    
-}
-
-# Adds a runtime comment to Project runtime config file
-save_runtime_comment () {
-    echo  >> $workdir/$project/config
-    echo "# Added by $0" >> $workdir/$project/config
-    echo "  ## $1" >> $workdir/$project/config
-}
-
-
-# Stores the passed arguments in Project runtime config file
-# Forces parameter overwrite if already defined
-overwrite_runtime_config () {
-    echo "$1" >> $workdir/$project/config
-}
-
-ask_interactive () {
-    if [ x$show == "xyes" ] ; then
-        echo -n $title
-    fi
-
-    if [ "$interactive" = "yes" ] ; then
-        echo 
-        echo "INTERACTIVE MODE: Press 'x' to exit or just return to go on" 
-        read press
-        case $press in 
-            x) exit 2 ;;
-            *) return
-        esac
-    fi
-}
-
-# Shows or executes a command
-show_command () {
-   echo
-   $SETCOLOR_BOLD ; echo "$HOSTNAME: $*" ; $SETCOLOR_NORMAL
-
-   bash -c "$*"
-
-# Grep filter at show_command level
-#   if [ ! -z "$greppattern" ] ; then
-#       bash -c "$*" | grep $greppattern
-#   else
-#       bash -c "$*"
-#   fi
-}
-
-# Filtering out only:  $ ; ` | < >
-shell_filter () {
-    echo $1 | sed 's/\$//g' | sed 's/;//g' | sed 's/`//g' | sed 's/|//g' | sed 's/<//g' | sed 's/>//g'
-}
-
-shell_filter_strict () {
-# Filtering out:  $ ; ` | < > = ! { } [ ] / \ # &
-    echo $1 | sed 's/\$//g' | sed 's/;//g' | sed 's/`//g' | sed 's/|//g' | sed 's/<//g' | sed 's/>//g'  | sed 's/=//g' | sed 's/!//g' | sed 's/{//g' | sed 's/}//g' | sed 's/\[//g' | sed 's/\]//g' | sed 's/\///g' | sed 's/\\//g' | sed 's/#//g' | sed 's/&//g'
-
-# Filtering out: all but accepted chars
-#     echo $1 | sed "s/[^a-Z0-9_\-]//Ig"
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_file.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_file.sh
deleted file mode 100644
index 9afe577e2c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_file.sh
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-# get_file.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to retrieve the file defined after the -s parameter"
-    echo "The source specified  can be any of these:"
-    echo "  file://local/file/path"
-    echo "  http(s)://my.server/file/path"
-    echo "  ssh://user@my.server/file/path"
-    echo "  svn://user:password@my.server/file/path"
-    echo "Note: Avoid using chars like : / and @ outside the Uri standards paths"
-    echo
-    echo "It has the following options:"
-    echo "-s <source_file> - The URL of the file to get"
-    echo "-t <file_type> - The type of file that is retrieved: list|tarball|maven-metadata|dir"
-    echo "-d <local_dir> - An alternative destination directory (default is automatically chosen)"
-    echo "-a <yes|no> - If 'no' return a special error code (99) if the download checksum is the same of the one previously downloaded"
-    echo "-u <http_user> - in case of type http, specify a http_user for curl"
-    echo "-p <http_password> - in case of type http, specifiy http_user for curl"
-    echo "-k - tell curl not to validate ssl certs"
-    echo "              This option can be used for automatic deploys (ie via cron) that actually deploy only new changes"
-}
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -s)
-      type=$(echo $2 | cut -d':' -f1)
-      url=$2
-      downloadfilename=$(basename $2)
-      downloaddir=$predeploydir
-      shift 2 ;;
-    -t)
-      case $2 in
-      # This logic is applied:
-      # In $predeploydir go ($workdir/$project/deploy) go file that have to be deployed
-      # In $storedir go ($workdir/$project/store) go support files as tarballs or lists
-          list)
-          downloaddir=$storedir
-          save_runtime_config "source_type=list"
-          ;;
-          tarball)
-          downloaddir=$storedir
-          save_runtime_config "source_type=tarball"
-          ;;
-          tar)
-          downloaddir=$storedir
-          save_runtime_config "source_type=tar"
-          ;;
-          zip)
-          downloaddir=$storedir
-          save_runtime_config "source_type=zip"
-          ;;
-          maven-metadata)
-          downloaddir=$storedir
-          save_runtime_config "source_type=maven"
-          ;;
-          dir)
-          downloaddir=$predeploydir
-          save_runtime_config "source_type=dir"
-          ;;
-          war)
-          downloaddir=$predeploydir
-          save_runtime_config "source_type=war"
-          ;;
-          mysql)
-          downloaddir=$storedir
-          save_runtime_config "source_type=mysql"
-          ;;
-          gz)
-          downloaddir=$storedir
-          save_runtime_config "source_type=gz"
-          ;;
-      esac
-      shift 2 ;;
-    -d)
-      # Enforces and overrides and alternative downloaddir
-      downloaddir=$2
-      shift 2 ;;
-    -a)
-      alwaysdeploy=$2
-      shift 2 ;;
-    -u)
-      http_user=$2
-      shift 2 ;;
-    -p)
-      http_password=$2
-      shift 2 ;;
-    -k)
-      ssl_arg=$1
-      shift 1 ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-# Define what to use for downloads
-cd $downloaddir
-
-case $type in
-    s3)
-        s3cmd get $url
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    ssh|scp) 
-        # ssh://user@my.server/file/path
-        scpuri=$(echo $url | cut -d'/' -f3-)
-        scpconn=$(echo $scpuri | cut -d'/' -f1)
-        scppath=/$(echo $scpuri | cut -d'/' -f2-)
-        rsync -rlptD -e ssh $scpconn:$scppath .
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    http|https)
-        if [ -z "$http_password" ] ; then
-          curl $ssl_arg -s -f -L "$url" -O
-        else
-          curl $ssl_arg -s -f -L --anyauth --user $http_user:$http_password "$url" -O
-	fi
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    svn)
-        svnuri=$(echo $url | cut -d'/' -f3-)
-        svnusername=$(echo $svnuri | cut -d':' -f1)
-        svnpassword=$(echo $svnuri | cut -d':' -f2 | cut -d'@' -f1)
-        svnserver=$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f1)
-        svnpath=/$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f2-)
-        mkdir -p $(dirname $svnpath)
-        svn export --force --username="$svnusername" --password="$svnpassword" svn://$svnserver/$svnpath $downloaddir
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    file)
-        # file:///file/path
-        filesrc=$(echo $url | cut -d '/' -f3-)
-        rsync -rlptD $filesrc .
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-    rsync)
-        rsync -a "$url" .
-        # rsync -rlptD $url . # Why not preserving users/groups?
-        check_retcode
-        save_runtime_config "downloadedfile=$downloaddir/$downloadfilename"
-    ;;
-
-esac
-
-if [ x$alwaysdeploy == "xno" ] ; then
-    # Here is checked the md5sum of the downloaded file against a previously save one
-    # If the sums are the same the scripts exits 99 and puppi will stop the deploy without any warning or notification
-    [ -d $archivedir/$project ] || mkdir -p $archivedir/$project
-    touch $archivedir/$project/md5sum
-    md5sum $downloaddir/$downloadfilename > $workdir/$project/md5sum_downloaded
-    cat $archivedir/$project/md5sum > $workdir/$project/md5sum_deployed
-    diff $workdir/$project/md5sum_downloaded $workdir/$project/md5sum_deployed && exit 99
-    md5sum $downloaddir/$downloadfilename > $archivedir/$project/md5sum
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh
deleted file mode 100644
index 2f5eea17942..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_filesfromlist.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-# get_filesfromlist.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to retrieve the files present in a text file list."
-    echo "It has 1 required argument:"
-    echo "First argument (\$1 - required) is the base url (in URI format) from where to retrieve the files defined in the list"
-    echo "The list file is defined as \$downloadedfile , these variables are gathered from the Puppi runtime"
-    echo "  config file."
-    echo 
-    echo "Examples: "
-    echo "get_filesfromlist.sh http://svn.example42.com/myproject"
-    echo "get_filesfromlist.sh file:///mount/wwwdata/myproject"
-    echo "get_filesfromlist.sh ssh://user@server/var/www/myproject"
-    echo "get_filesfromlist.sh svn://user:password@server/repo/myproject"
-}
-
-
-if [ $1 ] ; then
-    baseurl=$1
-    type=$(echo $1 | cut -d':' -f1)
-else
-    showhelp
-    exit 2 
-fi
-
-
-# Download files
-downloadfiles () {
-
-    cd $predeploydir
-
-    for file in $(cat $downloadedfile | grep -v "^#" | grep -v "^$" ) ; do
-        filepath=$file
-        filedir=$(dirname $filepath)
-        mkdir -p $filedir
-        check_retcode
-        
-        case $type in 
-            ssh|scp) 
-                scp "$baseurl:$filepath" $filepath
-                check_retcode
-            ;;
-            http|https|file)
-                curl -s -f "$baseurl/$filepath" -o $filepath
-                check_retcode
-            ;;
-            svn)
-                svnuri=$(echo $baseurl/$filepath | cut -d'/' -f3-)
-                svnusername=$(echo $svnuri | cut -d':' -f1)
-                svnpassword=$(echo $svnuri | cut -d':' -f2 | cut -d'@' -f1)
-                svnserver=$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f1)
-                svnpath=/$(echo $svnuri | cut -d'@' -f2 | cut -d'/' -f2-)
-                mkdir -p $(dirname $svnpath)
-                svn export --force --username="$svnusername" --password="$svnpassword" http://$svnserver/$svnpath $(dirname $svnpath)
-                check_retcode
-            ;;
-        esac
-
-    done
-}
-
-downloadfiles
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh
deleted file mode 100644
index 43e5647561f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_maven_files.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-# get_maven_files.sh - Made for Puppi
-# This script retrieves the files to deploy from a Maven repository.
-# It uses variables defined in the general and project runtime configuration files.
-# It uses curl to retrieve files so the $1 argument (base url of the maven repository) 
-# has to be in curl friendly format
-#   It has the following options:
-#   -u <http_user> - in case of type http, specify a http_user for curl
-#   -p <http_password> - in case of type http, specifiy http_user for curl
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -u)
-      http_user=$2
-      shift 2 ;;
-    -p)
-      http_password=$2
-      shift 2 ;;
-    *)
-      url=$1
-      ftype=$2
-      shift 2 ;;
-  esac
-done
-
-# Obtain the value of the variable with name passed as second argument
-# If no one is given, we take all the files in storedir
-
-#echo "Download and deploy $2 ? (Y/n)" 
-#read press
-#case $press in 
-#    Y|y) true ;;
-#    N|n) save_runtime_config "predeploydir_$2=" ; exit 0
-#esac
-
-if [ $debug ] ; then
-    tarcommand="tar -xvf"
-else
-    tarcommand="tar -xf"
-fi
-
-if [ $debug ] ; then
-    zipcommand="unzip"
-else
-    zipcommand="unzip -q"
-fi
-
-cd $storedir
-
-if [ -z "$http_password" ] ; then
-    authparam=""
-else
-    authparam="--anyauth --user $http_user:$http_password"
-fi
-
-case $ftype in
-    warfile)
-        curl -s -f $authparam "$url/$version/$warfile" -O
-        check_retcode
-        cp -a $warfile $predeploydir/$artifact.war
-        save_runtime_config "deploy_warpath=$deploy_root/$artifact.war"
-    ;;
-    jarfile)
-        curl -s -f $authparam "$url/$version/$jarfile" -O
-        check_retcode
-        cp -a $jarfile $predeploydir/$artifact.jar
-        save_runtime_config "deploy_jarpath=$deploy_root/$artifact.jar"
-    ;;
-    configfile)
-        curl -s -f $authparam "$url/$version/$configfile" -O
-        check_retcode
-        mkdir $workdir/$project/deploy_configfile
-        cd $workdir/$project/deploy_configfile
-        $tarcommand $storedir/$configfile
-        check_retcode
-        save_runtime_config "predeploydir_configfile=$workdir/$project/deploy_configfile"
-    ;;
-    srcfile)
-        curl -s -f $authparam "$url/$version/$srcfile" -O
-        check_retcode
-        mkdir $workdir/$project/deploy_srcfile
-        cd $workdir/$project/deploy_srcfile
-        $tarcommand $storedir/$srcfile
-        check_retcode
-        save_runtime_config "predeploydir_srcfile=$workdir/$project/deploy_srcfile"
-    ;;
-    zipfile)
-        curl -s -f $authparam "$url/$version/$zipfile" -O
-        check_retcode
-        mkdir $workdir/$project/deploy_zipfile
-        cd $workdir/$project/deploy_zipfile
-        $zipcommand $storedir/$zipfile
-        check_retcode
-        save_runtime_config "predeploydir_zipfile=$workdir/$project/deploy_zipfile"
-    ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh
deleted file mode 100644
index 79dc97ca38e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/get_metadata.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-# get_metadata.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script retrieves some metadata from the downwloaded files "
-    echo "The metadatasource is automatically detected from the \$source_type runtime config"
-    echo
-    echo "It has some, not required, options:"
-    echo "-m <magicstring> - The string to use as *fix in custom metadata info provided "
-    echo "-mc <anotherstring> - The string to use as qualifier for Maven metadata config tars"
-    echo "-mj <anotherstring> - The string to use as qualifier for Maven metadata jars"
-    echo "-mw <anotherstring> - The string to use as qualifier for Maven metadata wars"
-    echo "-mz <anotherstring> - The string to use as qualifier for Maven metadata zips"
-    echo "-at <anotherstring> - The type to obtain the artifact, should be \"release\", "
-    echo "                      \"latest\", \"snapshot\" or a specific version (e.g. \"2.5.0\")"
-}
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -m)
-      suffix=$2
-      shift 2 ;;
-    -mc)
-      config_suffix=$2
-      shift 2 ;;
-    -mj)
-      jar_suffix=$2
-      shift 2 ;;
-    -mw)
-      war_suffix=$2
-      shift 2 ;;
-    -mz)
-      zip_suffix=$2
-      shift 2 ;;
-    -at)
-      artifact_type=$2
-      shift 2 ;;
-    -h)
-      showhelp ;;
-  esac
-done
-
-# validating input
-# see http://docs.codehaus.org/display/MAVEN/Repository+Metadata for specs
-case $artifact_type in
-    release)
-    ;;
-    latest)
-    ;;
-    snapshot)
-    ;;
-    *)
-    # defaulting to version 
-    version=$artifact_type
-    ;;
-esac
-
-case $source_type in
-    list)
-    if [ -z $suffix ] ; then
-        suffix="####"
-    fi
-    # TODO Make this more secure, for God's sake!
-    for param in $(cat $downloadedfile | grep "^$suffix" ) ; do
-        save_runtime_comment $param
-    done
-    ;;
-    tarball)
-    ;;
-    maven)
-    [ ${#version} -eq 0 ] && version=$(xml_parse $artifact_type $downloadedfile )
-    artifact=$(xml_parse artifactId $downloadedfile )
-
-    # Definition of qualifiers for Maven has changed from the (wrong) assumption
-    # of having cfg-$suffix and src-$suffix for staticfiles and config tarballs
-    # to a more flexible management of qualifiers names with two different params (-m and -mc)
-    # The "suffixnotset" string is passed by default by the Puppi maven define
-    # YES, it's crap. 
-    if [[ x$suffix != "xsuffixnotset" ]] ; then
-        srcfile=$artifact-$version-$suffix.tar
-    else 
-        srcfile=$artifact-$version.tar
-    fi
-
-    if [[ x$config_suffix != "xsuffixnotset" ]] ; then
-        configfile=$artifact-$version-$config_suffix.tar
-    else
-        configfile=$artifact-$version.tar
-    fi
-
-    if [[ x$jar_suffix != "xsuffixnotset" ]] ; then
-        jarfile=$artifact-$version-$jar_suffix.jar
-    else
-        jarfile=$artifact-$version.jar
-    fi
-
-    if [[ x$war_suffix != "xsuffixnotset" ]] ; then
-        warfile=$artifact-$version-$war_suffix.war
-    else
-        warfile=$artifact-$version.war
-    fi
-
-    if [[ x$zip_suffix != "xsuffixnotset" ]] ; then
-        zipfile=$artifact-$version-$zip_suffix.zip
-    else
-        zipfile=$artifact-$version.zip
-    fi
-
-    # Store metadata
-    save_runtime_config "version=$version" 
-    save_runtime_config "artifact=$artifact"
-    # Store filenames
-    save_runtime_config "zipfile=$zipfile"
-    save_runtime_config "warfile=$warfile"
-    save_runtime_config "jarfile=$jarfile"
-    save_runtime_config "srcfile=$srcfile" 
-    save_runtime_config "configfile=$configfile" 
-    ;;
-esac
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/git.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/git.sh
deleted file mode 100644
index 08b8c338a41..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/git.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/bash
-# git.sh - Made for Puppi
-
-# All variables are exported
-set -a 
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script performs the git operations required by puppi::project::git"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-a <action> (Optional) What action to perform. Available options: deploy (default), rollback"
-    echo "-s <source> (Required) Git source repo to use"
-    echo "-d <destination> (Required) Directory where files are deployed"
-    echo "-u <user> (Optional) User that performs the deploy operations. Default root"
-    echo "-gs <git_subdir> (Optional) If only a specific subdir of the gitrepo has to be copied to the install destination"
-    echo "-t <tag> (Optional) Tag to deploy"
-    echo "-b <branch> (Optional) Branch to deploy"
-    echo "-c <commit> (Optional) Commit to deploy"
-    echo "-v <true|false> (Optional) If verbose"
-    echo "-k <true|false> (Optional) If .git dir is kept on deploy_root"
-    echo 
-    echo "Examples:"
-    echo "git.sh -a deploy -s $source -d $deploy_root -u $user -gs $git_subdir -t $tag -b $branch -c $commit -v $bool_verbose -k $bool_keep_gitdata"
-}
-
-verbose="true"
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -a)
-      case $2 in
-          rollback)
-          action="rollback"
-          ;;
-          *)
-          action="install"
-          ;;
-      esac 
-      shift 2 ;;
-    -s)
-      if [ $source ] ; then
-        source=$source
-      else
-        source=$2
-      fi
-      shift 2 ;;
-    -d)
-      if [ $deploy_root ] ; then
-        deploy_root=$deploy_root
-      else
-        deploy_root=$2
-      fi
-      shift 2 ;;
-    -u)
-      if [ $user ] ; then
-        deploy_user=$user
-      else
-        deploy_user=$2
-      fi
-      shift 2 ;;
-    -gs)
-      if [ $git_subdir ] ; then
-        git_subdir=$git_subdir
-      else
-        git_subdir=$2
-      fi
-      shift 2 ;;
-    -t)
-      if [ $git_tag ] ; then
-        git_tag=$git_tag
-      else
-        git_tag=$2
-      fi
-      shift 2 ;;
-    -b)
-      if [ $branch ] ; then
-        branch=$branch
-      else
-        branch=$2
-      fi
-      shift 2 ;;
-    -c)
-      if [ $commit ] ; then
-        commit=$commit
-      else
-        commit=$2
-      fi
-      shift 2 ;;
-    -v)
-      if [ $verbose ] ; then
-        verbose=$verbose
-      else
-        verbose=$2
-      fi
-      shift 2 ;;
-    -k)
-      if [ $keep_gitdata ] ; then
-        keep_gitdata=$keep_gitdata
-      else
-        keep_gitdata=$2
-      fi
-      shift 2 ;;
-    *)
-      showhelp
-      exit ;;
-  esac
-done
-
-if [ "x$verbose" == "xtrue" ] ; then
-  verbosity=""
-else
-  verbosity="--quiet"
-fi
-
-cd /
-
-gitsubdir=""
-gitdir=$deploy_root
-if [ "x$keep_gitdata" != "xtrue" ] ; then
-  if [ ! -d $archivedir/$project-git ] ; then
-    mkdir $archivedir/$project-git
-    chown -R $deploy_user:$deploy_user $archivedir/$project-git
-  fi
-  gitdir=$archivedir/$project-git/gitrepo
-fi
-if [ "x$git_subdir" != "xundefined" ] ; then
-  if [ ! -d $archivedir/$project-git ] ; then
-    mkdir $archivedir/$project-git
-    chown -R $deploy_user:$deploy_user $archivedir/$project-git
-  fi
-  gitdir=$archivedir/$project-git
-  gitsubdir="$git_subdir/"
-fi
-
-do_install () {
-  if [ -d $gitdir/.git ] ; then
-    cd $gitdir
-    git pull $verbosity origin $branch
-    git checkout $verbosity $branch
-    if [ "x$?" != "x0" ] ; then
-      git checkout -b $verbosity $branch
-    fi
-  else
-    git clone $verbosity --branch $branch --recursive $source $gitdir
-    cd $gitdir
-  fi
-
-  if [ "x$git_tag" != "xundefined" ] ; then
-    git checkout $verbosity $git_tag
-  fi
-
-  if [ "x$commit" != "xundefined" ] ; then
-    git checkout $verbosity $commit
-  fi
-
-  if [ "x$gitdir" == "x$archivedir/$project-git" ] ; then
-    rsync -a --exclude=".git" $gitdir/$gitsubdir $deploy_root/
-  fi
-
-}
-
-do_rollback () {
-
-  echo "Rollback not yet supported"
-}
-
-# Action!
-case "$action" in
-    install) export -f do_install ; su $deploy_user -c do_install ;;
-    rollback) do_rollback ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/header b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/header
deleted file mode 100644
index 9b04824109b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/header
+++ /dev/null
@@ -1,25 +0,0 @@
-configfile="/etc/puppi/puppi.conf"
-
-# Load general configurations
-if [ ! -f $configfile ] ; then
-    echo "Config file: $configfile not found"
-    exit 2
-else
-    . $configfile
-    . $scriptsdir/functions
-fi
-
-# Load project runtime configuration
-projectconfigfile="$workdir/$project/config"
-if [ ! -f $projectconfigfile ] ; then
-    echo "Project runtime config file: $projectconfigfile not found"
-    exit 2
-else
-    . $projectconfigfile
-fi
-
-# Activate debug 
-case "$debug" in
-    yes) set -x  ;;
-    full) set -xv  ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh
deleted file mode 100644
index 0af50314ffa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-# predeploy.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script prepares the contents of the predeploy directory"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-v <variable_name> (optional) Name of the variable that identifies the file to untar/unzip"
-    echo "                              By default is used $downloadedfile"
-    echo "-t <file_type> (optional) The type of file that is retrieved: zip|tarball"
-    echo "                          By default is used $source_type "
-    echo "-m <magicfix> (optional) The prefix (directory) you may not want to put in the deploy"
-    echo "                       Use this if the zip or tar contain a base dir (as often) and you want to copy"
-    echo "                       to the deploy dir only its contents and not the whole directory"
-    echo 
-    echo "Examples:"
-    echo "predeploy.sh "
-    echo "predeploy.sh -t zip"
-    echo "predeploy.sh -t zip -v myz"
-}
-
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -v)
-      downloadedfile="$(eval "echo \${$(echo ${2})}")"
-      shift 2 ;;
-    -t)
-      source_type=$2
-      shift 2 ;;
-    -m)
-      predeploy_dirprefix=$2
-      shift 2 ;;
-  esac
-done
-
-
-
-predeploy () {
-    cd $predeploydir
-    case "$source_type" in
-      tarball)
-        case "$debug" in
-          yes|full)
-            tar -zxvf $downloadedfile
-            check_retcode
-          ;;
-          *)
-            tar -zxf $downloadedfile
-            check_retcode
-          ;;
-        esac
-        ;;
-      zip)
-        case "$debug" in
-          yes|full)
-            unzip $downloadedfile
-            check_retcode
-          ;;
-          *)
-            unzip -qq $downloadedfile
-            check_retcode
-          ;;
-        esac
-        ;;
-      gz)
-        case "$debug" in
-          yes|full)
-            gzip -d $downloadedfile
-            check_retcode
-          ;;
-          *)
-            gzip -d -q $downloadedfile
-            check_retcode
-          ;;
-        esac
-        ;;
-      war)
-        cp $downloadedfile .
-        check_retcode
-        ;;
-    esac
-}
-
-predeploy
-
-# Updates predeploydir if a directory prefix exists
-if [[ x$predeploy_dirprefix != "x" ]] ; then
-   save_runtime_config "predeploydir=$predeploydir/$predeploy_dirprefix"
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh
deleted file mode 100644
index 91d28a6b4a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/predeploy_tar.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# predeploy_tar.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script unpacks (tar) file from the download dir (storedir) to the predeploydir"
-    echo "It has the following options:"
-    echo "\$1 (Required) - Name of the variable that identifies the tar to predeploy"
-    echo 
-    echo "Examples:"
-    echo "predeploy_tar.sh tarfile"
-}
-
-# Check Arguments
-if [ $1 ] ; then
-    deployfilevar=$1
-    deployfile="$(eval "echo \${$(echo ${deployfilevar})}")"
-else
-    showhelp
-    exit 2 
-fi
-
-# Untar  file
-untar () {
-    cd $predeploydir
-#    file $deployfile | grep gzip 2>&1>/dev/null
-#    if [ $? == "0"] ; then
-        tar -zxf $deployfile
-#    else
-#        tar -xvf $deployfile
-#    fi
-}
-
-untar
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh
deleted file mode 100644
index 749462e9f97..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mail.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# report_mail.sh - Made for Puppi
-# This script sends a summary mail to the recipients defined in $1
-# Use a comma separated list for multiple emails
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Check arguments & eventually apply runtimeconfig overwrite
-recipients=$1
-[ $report_email ] && recipients=$report_email
-
-# Main functions
-mail_send () {
-    result=$(grep result $logdir/$project/$tag/summary | awk '{ print $NF }')
-    cat $logdir/$project/$tag/summary | mail -s "[puppi] $result $action of $project on $(hostname)" $recipients
-}
-
-mail_send
-
-if [ "$EXITCRIT" = "1" ] ; then
-    exit 2
-fi
-
-if [ "$EXITWARN" = "1" ] ; then
-    exit 1
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh
deleted file mode 100644
index c68ed7d0439..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/report_mongo.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# report_mongodb.sh - Made for Puppi
-# e.g. somemongohost/dbname
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-
-# Show help
-showhelp () {
-    echo "This script reports deployments to a mongo DB."
-    echo "It has the following options:"
-    echo "-e <env_key> - Facter key to identify server environment (default: env)."
-    echo "If no facter key can be found, the fallback is ''environment''."
-    echo 
-    echo "Examples:"
-    echo "deploy_files.sh mongodb://someuser:hispassword@somehost/somedb"
-    echo "deploy_files.sh -e env mongodb://someuser:hispassword@somehost/somedb"
-}
-
-
-env_key="env"
-fallback_key="environment"
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -e)
-      env_key=$2
-      echo "env_key"
-      shift 2 ;;
-    *)
-      mongourl=$1
-      shift 1
-      ;;
-  esac
-done
-
-if [ "$EXITCRIT" = "1" ] ; then
-    proposed_exit=2
-fi
-
-if [ "$EXITWARN" = "1" ] ; then
-    proposed_exit=1
-fi
-
-# check prerequisites
-mongo -version > /dev/null
-if [ $? -ne 0 ]; then
-        echo "mongo-client is not installed, aborting"
-        exit $proposed_exit
-fi
-
-fqdn=$(facter fqdn)
-
-environment=$(facter ${env_key} -p)
-
-if [ -z "${environment} ]
-then
-    environment=$(facter ${fallback_key} -p)
-fi
-
-
-# something like mongodb://someuser:hispassword@somehost/somedb
-
-
-if [[ ! $mongourl =~ "mongodb://" ]]; then
-  echo "WARNING: mongourl invalid! Please use a valid monurl!"
-  showhelp
-  exit $proposed_exit
-fi
-
-if [[ $mongourl =~ @ ]]; then
-  # ok we have to deal with passwords
-  # you HAVE to provide a password if you provide a user
-  mongodb=`echo $mongourl | sed 's/.*@//'`
-  mongouser=`echo $mongourl | sed 's/mongodb:\/\///' | sed 's/:.*//' `
-  mongopassword=`echo $mongourl | sed 's/mongodb:\/\///' | sed 's/[^:]*://' | sed 's/@.*//' `
-  mongoarguments="--username $mongouser --password $mongopassword"
-else
-  mongodb=`echo $mongourl | sed 's/mongodb:\/\///'` 	
-fi
-
-result=$(grep result $logdir/$project/$tag/summary | awk '{ print $NF }')
-summary=$(cat $logdir/$project/$tag/summary)
-
-mcmd="db.deployments.insert({ts:new Date(),result:\"${result}\",fqdn:\"${fqdn}\",project:\"${project}\",source:\"${source}\",tag:\"${tag}\",version:\"${version}\",artifact:\"${artifact}\",testmode:\"${testmode}\",warfile:\"${warfile}\",environment:\"${environment}\"}); quit(0)"
-
-
-mongo $mongoarguments $mongodb --eval "$mcmd"
-
-# Now do a reporting to enable "most-recent-versions on all servers"
-
-read -r -d '' mcmd <<'EOF'
-var map = function() {
-  project=this.project ;
-  emit( this.fqdn +":"+ this.project,  {project:this.project, fqdn:this.fqdn, ts:this.ts,version:this.version,environment:this.environment}  );
-};
-var reduce = function(k,vals) {
-  result = vals[0];
-  vals.forEach(function(val) { if (val.ts > result.ts) result=val } ) ;
-  return result;
-};
-db.deployments.mapReduce(
-  map,
-  reduce,
-  {out:{replace:"versions"}})
-EOF
-
-mongo $mongoarguments $mongodb --eval "$mcmd"
-
-exit $proposed_exit
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/service.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/service.sh
deleted file mode 100644
index 1105d25d6c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/service.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# service.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to manage one or more services"
-    echo "It requires AT LEAST 2 arguments:"
-    echo "First argument (\$1 - required) is the script command (stop|start|restart|reload)"
-    echo "Second argument and following (\$2 - required) is the space separated list of sevices to manage"
-    echo
-    echo "Examples:"
-    echo "service.sh stop monit puppet"
-}
-
-# Check arguments
-if [ $1 ] ; then
-    servicecommand=$1
-else
-    showhelp
-    exit 2
-fi
-
-
-if [ $# -ge 2 ] ; then
-    shift
-    services=$@
-else
-    showhelp
-    exit 2
-fi
-
-# Manage service
-service () {
-    for serv in $services ; do
-        /etc/init.d/$serv $servicecommand
-    done
-}
-
-service
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/svn.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/svn.sh
deleted file mode 100644
index a2dd4bcf730..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/svn.sh
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/bin/bash
-# svn.sh - Made for Puppi
-
-# All variables are exported
-set -a 
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script performs the svn operations required by puppi::project::svn"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-a <action> (Optional) What action to perform. Available options: deploy (default), rollback"
-    echo "-s <source> (Required) Subversion source repo to use"
-    echo "-d <destination> (Required) Directory where files are deployed"
-    echo "-u <user> (Optional) User that performs the deploy operations. Default root"
-    echo "-su <user> (Optional) Username for access to private svn repo"
-    echo "-sp <password> (Optional) Password for access to private svn repo"
-    echo "-gs <svn_subdir> (Optional) If only a specific subdir of the svnrepo has to be copied to the install destination"
-    echo "-t <tag> (Optional) Tag to deploy"
-    echo "-b <branch> (Optional) Branch to deploy"
-    echo "-c <commit> (Optional) Commit to deploy"
-    echo "-v <true|false> (Optional) If verbose"
-    echo "-k <true|false> (Optional) If .svn dir is kept on deploy_root"
-    echo "-e <true|false> (Optional) If use export instead of checkout for svn operations"
-    echo 
-    echo "Examples:"
-    echo "svn.sh -a deploy -s $source -d $deploy_root -u $user -gs $svn_subdir -t $tag -b $branch -c $commit -v $bool_verbose -k $bool_keep_svndata"
-}
-
-verbose="true"
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -a)
-      case $2 in
-          rollback)
-          action="rollback"
-          ;;
-          *)
-          action="install"
-          ;;
-      esac 
-      shift 2 ;;
-    -s)
-      if [ $source ] ; then
-        source=$source
-      else
-        source=$2
-      fi
-      shift 2 ;;
-    -d)
-      if [ $deploy_root ] ; then
-        deploy_root=$deploy_root
-      else
-        deploy_root=$2
-      fi
-      shift 2 ;;
-    -u)
-      if [ $user ] ; then
-        deploy_user=$user
-      else
-        deploy_user=$2
-      fi
-      shift 2 ;;
-    -gs)
-      if [ $svn_subdir ] ; then
-        svn_subdir=$svn_subdir
-      else
-        svn_subdir=$2
-      fi
-      shift 2 ;;
-    -su)
-      if [ $svn_user ] ; then
-        svn_user=$svn_user
-      else
-        svn_user=$2
-      fi
-      shift 2 ;;
-    -sp)
-      if [ $svn_password ] ; then
-        svn_password=$svn_password
-      else
-        svn_password=$2
-      fi
-      shift 2 ;;
-    -t)
-      if [ $svn_tag ] ; then
-        svn_tag=$svn_tag
-      else
-        svn_tag=$2
-      fi
-      shift 2 ;;
-    -b)
-      if [ $branch ] ; then
-        branch=$branch
-      else
-        branch=$2
-      fi
-      shift 2 ;;
-    -c)
-      if [ $commit ] ; then
-        commit=$commit
-      else
-        commit=$2
-      fi
-      shift 2 ;;
-    -v)
-      if [ $verbose ] ; then
-        verbose=$verbose
-      else
-        verbose=$2
-      fi
-      shift 2 ;;
-    -k)
-      if [ $keep_svndata ] ; then
-        keep_svndata=$keep_svndata
-      else
-        keep_svndata=$2
-      fi
-      shift 2 ;;
-    -e)
-      if [ $svn_export ] ; then
-        svn_export=$svn_export
-      else
-        svn_export=$2
-      fi
-      shift 2 ;;
-    *)
-      showhelp
-      exit ;;
-  esac
-done
-
-if [ "x$verbose" == "xtrue" ] ; then
-  verbosity=""
-else
-  verbosity="--quiet"
-fi
-
-cd /
-
-if [ "x$branch" == "xundefined" ] ; then
-  branch="trunk"
-fi
-
-real_source="$source/$branch"
-
-if [ "x$svn_tag" != "xundefined" ] ; then
-  real_source="$source/$svn_tag"
-fi
-
-if [ "x$svn_user" != "xundefined" ] && [ "x$svn_password" != "xundefined" ] ; then
-  svn_auth="--username=$svn_user --password=$svn_password"
-else
-  svn_auth=""
-fi
-
-svnsubdir=""
-svndir=$deploy_root
-
-
-do_install () {
-  if [ "x$keep_svndata" != "xtrue" ] ; then
-    if [ ! -d $archivedir/$project-svn ] ; then
-      mkdir $archivedir/$project-svn
-      chown -R $user:$user $archivedir/$project-svn
-    fi
-    svndir=$archivedir/$project-svn/svnrepo
-  fi
-  if [ "x$svn_subdir" != "xundefined" ] ; then
-    if [ ! -d $archivedir/$project-svn ] ; then
-      mkdir $archivedir/$project-svn
-      chown -R $user:$user $archivedir/$project-svn
-    fi
-    svndir=$archivedir/$project-svn
-    svnsubdir="$svn_subdir/"
-  fi
-
-  if [ -d $svndir/.svn ] ; then
-    cd $svndir
-    svn up $verbosity $svn_auth --non-interactive
-  else
-    svn co $verbosity $real_source $svndir $svn_auth --non-interactive
-    cd $svndir
-  fi
-
-  if [ "x$svndir" == "x$archivedir/$project-svn" ] ; then
-    rsync -a --exclude=".svn" $svndir/$svnsubdir $deploy_root/
-  fi
-}
-
-do_export () {
-  svn export $verbosity $svn_auth --force --non-interactive $real_source/$svn_subdir $deploy_root
-}
-
-do_rollback () {
-  echo "Rollback not yet supported"
-}
-
-# Action!
-case "$action" in
-    install) 
-      if [ "x$svn_export" == "xtrue" ] ; then
-        export -f do_export ; su $user -c do_export
-      else
-        export -f do_install ; su $user -c do_install
-      fi
-      ;;
-    rollback) do_rollback ;;
-esac
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/wait.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/wait.sh
deleted file mode 100644
index 4e2fe6152d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/wait.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-# wait.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to introduce pauses during the deploy workflow"
-    echo
-    echo "It has the following options:"
-    echo "-s <seconds> - The number of seconds to wait"
-    echo "-p <filename> - Wait until filename is present"
-    echo "-a <filename> - Wait until filename is absent"
-    echo "-f <pattern> <filename> - Wait until is found the pattern in the filename"
-}
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -s)
-      sleep $2
-      exit 0
-      ;;
-    -p)
-      while true
-         do
-            [ -e $2 ] && break
-         sleep 1
-      done
-      exit 0
-      ;;
-    -a)
-      while true
-         do
-            [ ! -e $2 ] && break
-         sleep 1
-      done
-      exit 0
-      ;;
-    -f)
-      while true
-         do
-            grep $2 $3 && break
-         sleep 1
-      done
-      exit 0
-      ;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yant.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yant.sh
deleted file mode 100644
index f9934619ea6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yant.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# yant.sh - Made for Puppi
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script is used to call ant in a hybris-system"
-    echo "It requires AT LEAST 2 arguments:"
-    echo "First the \${hybris_parent_dir} where it can find a hybris-directory"
-    echo "Second argument: Everything you want to pass through to ant"
-    echo "The script assumes that hybris is located in \${hybris_parent_dir}/hybris"
-    echo
-    echo "Examples:"
-    echo "yant.sh /home/hybris clean all"
-}
-
-# Unfortunately, showhelp will never be called
-
-cd $1/hybris/bin/platform
-. ./setantenv.sh
-
-# somehow dirty ...
-shift
-
-if [ -d /opt/hybris/config ]; then
-	template=""
-else
-	template=-Dinput.template=develop 
-fi
-
-if [ $debug ] ; then
-    ant -Dinput.template=develop $* 
-else
-    ant $* > /dev/null
-fi
-
-handle_result
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yum.sh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yum.sh
deleted file mode 100644
index f649bad93c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/files/scripts/yum.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# yum.sh - Made for Puppi
-
-# Sources common header for Puppi scripts
-. $(dirname $0)/header || exit 10
-
-# Show help
-showhelp () {
-    echo "This script performs the yum operations required by puppi::project::yum"
-    echo "It integrates and uses variables provided by other core Puppi scripts"
-    echo "It has the following options:"
-    echo "-a <action> (Optional) What action to perform. Available options: deploy (default), rollback, remove"
-    echo "-n <rpm_name> (Required) Name of the package to handle"
-    echo "-v <rpm_version> (Optional) The version of the rpm to manage. Default: latest"
-    echo "-r <install_root> (Optional) The Instll root path. Default: /"
-    echo 
-    echo "Examples:"
-    echo "yum.sh -a deploy -n ${rpm} -r ${install_root} -v ${rpm_version}"
-}
-
-rpm_version="latest"
-install_root="/"
-
-# Check Arguments
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -a)
-      case $2 in
-          rollback)
-          action="rollback"
-          ;;
-          remove)
-          action="remove"
-          ;;
-          *)
-          action="install"
-          ;;
-      esac 
-      shift 2 ;;
-    -n)
-      rpm_name=$2
-      shift 2 ;;
-    -v)
-      rpm_version=$2
-      shift 2 ;;
-    -r)
-      install_root=$2
-      shift 2 ;;
-    *)
-      showhelp
-      exit ;;
-  esac
-done
-
-
-do_install () {
-    if [ x$rpm_version == "xlatest" ] ; then
-        full_rpm_name=$rpm_name
-    else
-        full_rpm_name=$rpm_name-$rpm_version
-    fi
-
-    # Archives version of the rpm to update
-    oldversion=$(rpm -q $rpm_name --qf  "%{VERSION}-%{RELEASE}\n")
-    if [ "$?" = "0" ]; then
-        mkdir -p $archivedir/$project/$oldversion
-        if [ $archivedir/$project/latest ] ; then
-            rm -f $archivedir/$project/latest
-        fi
-        ln -sf $archivedir/$project/$oldversion $archivedir/$project/latest
-    fi
-
-    if [ x$install_root != "x/" ] ; then
-        yum install -y -q --installroot=$install_root $full_rpm_name
-    else
-        yum install -y -q $full_rpm_name
-    fi
-}
-
-do_rollback () {
-    yum downgrade -y -q $rpm_name-$rollbackversion
-}
-
-do_remove () {
-    yum remove -y -q $rpm_name
-}
-
-# Action!
-case "$action" in
-    install) do_install ;;
-    rollback) do_rollback ;;
-    remove) do_remove ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/last_run.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/last_run.rb
deleted file mode 100644
index 19869842d9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/last_run.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'facter'
-Facter.add("last_run") do
-  confine :kernel => [ 'Linux' , 'SunOS' , 'FreeBSD' , 'Darwin' ]
-  setcode do
-    Facter::Util::Resolution.exec('date')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb
deleted file mode 100755
index ccd3e3f22b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/puppi_projects.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'facter'
-Facter.add("puppi_projects") do
-  confine :kernel => [ 'Linux' , 'SunOS' , 'FreeBSD' , 'Darwin' ]
-  setcode do
-    Facter::Util::Resolution.exec('ls `grep projectsdir  /etc/puppi/puppi.conf | sed \'s/projectsdir="\([^"]*\)"/\1/\'` | tr \'\n\' \',\' | sed \'s/,$//\'') if File.exists?("/etc/puppi/puppi.conf")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb
deleted file mode 100644
index 7a7ca232657..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/facter/windows_common_appdata.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'facter'
-Facter.add(:windows_common_appdata) do
-  confine :operatingsystem => :windows
-  if Facter.value(:osfamily) == "windows"
-    require 'win32/dir'
-  end
-  setcode do
-    Dir::COMMON_APPDATA
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb
deleted file mode 100644
index a2652cbae27..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/any2bool.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# any2bool.rb
-#
-# This define is heavily based on PuppetLabs' stdlib str2bool
-#
-module Puppet::Parser::Functions
-  newfunction(:any2bool, :type => :rvalue, :doc => <<-EOS
-This converts any input to a boolean. This attempt to convert strings that 
-contain things like: y, 1, t, true to 'true' and strings that contain things
-like: 0, f, n, false, no to 'false'.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "any2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    string = arguments[0]
-
-#    unless string.is_a?(String)
-#      raise(Puppet::ParseError, 'str2bool(): Requires either ' +
-#        'string to work with')
-#    end
-
-    # We consider all the yes, no, y, n and so on too ...
-    result = case string
-      #
-      # This is how undef looks like in Puppet ...
-      # We yield false in this case.
-      #
-      when false then false
-      when true then true
-      when /^$/, '' then false # Empty string will be false ...
-      when /^(1|t|y|true|yes)$/  then true
-      when /^(0|f|n|false|no)$/  then false
-      when /^(undef|undefined)$/ then false # This is not likely to happen ...
-      else
-        raise(Puppet::ParseError, 'any2bool(): Unknown type of boolean given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb
deleted file mode 100644
index 0ebe275e196..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/bool2ensure.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# bool2ensure.rb
-#
-# This define return present/absent accroding to the boolean value passed
-#
-module Puppet::Parser::Functions
-  newfunction(:bool2ensure, :type => :rvalue, :doc => <<-EOS
-This converts any input similar to a boolean to the stringpresent or absent
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "bool2ensure(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    string = arguments[0]
-
-    result = case string
-      when false then "absent"
-      when true then "present"
-      when /^$/, '' then "present" 
-      when /^(1|t|y|true|yes)$/  then "present"
-      when /^(0|f|n|false|no)$/  then "absent"
-      when /^(undef|undefined)$/ then "present"
-      else
-        raise(Puppet::ParseError, 'bool2ensure(): Unknown type of boolean given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb
deleted file mode 100644
index 1aad859b3a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_class_args.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# This function is based on Ken Barber's get_scope_args
-# It has been slightly changed and renamed to avoid naming clash
-
-module Puppet::Parser::Functions
-  newfunction(:get_class_args, :type => :rvalue, :doc => <<-EOS
-This function will return all arguments passed to the current scope. This could
-be a class or defined resource.
-    EOS
-  ) do |arguments|
- 
-    if (arguments.size != 0) then
-      raise(Puppet::ParseError, "validate_resource(): Wrong number of arguments "+
-        "given #{arguments.size} for 0")
-    end
-
-    # Grab the current scope, turn it to a hash but do not be recursive 
-    # about it.
-    classhash = to_hash(recursive=false)
-
-    # Strip bits that do not matter for validation
-#    classhash.delete("name")
-#    classhash.delete("title")
-#    classhash.delete("caller_module_name")
-#    classhash.delete("module_name")
-
-    # Return munged classhash
-    classhash
-  end
-end
-
-# vim: set ts=2 sw=2 et :
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb
deleted file mode 100644
index 65a03560b52..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_magicvar.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# get_magicvar.rb
-#
-# This define return the value of the the provided var name
-#
-module Puppet::Parser::Functions
-  newfunction(:get_magicvar, :type => :rvalue, :doc => <<-EOS
-This returns the value of the input variable. For example if you input role
-it returns the value of $role'.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "get_magicvar(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    my_var = arguments[0]
-    result = lookupvar("#{my_var}")
-    result = 'all' if ( result == :undefined || result == '' )
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb
deleted file mode 100644
index 1421b91f52f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/get_module_path.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:get_module_path, :type =>:rvalue, :doc => <<-EOT
-    Returns the absolute path of the specified module for the current
-    environment.
-
-    Example:
-      $module_path = get_module_path('stdlib')
-  EOT
-  ) do |args|
-    raise(Puppet::ParseError, "get_module_path(): Wrong number of arguments, expects one") unless args.size == 1
-    if module_path = Puppet::Module.find(args[0], compiler.environment.to_s)
-      module_path.path
-    else
-      raise(Puppet::ParseError, "Could not find module #{args[0]} in environment #{compiler.environment}")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb
deleted file mode 100644
index 33a2f8e7d76..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/nslookup.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# nslookup.rb
-#
-# This fuction looks up the ip address of a hostname.
-#
-# Params:
-#  * Hostname: (string) The hostname to lookup
-#  * Type: (string) The DNS type to lookup. Optional. Default: 'AAAA'
-#
-# Returns: an array with the ip addresses that belong to this hostname
-#
-# Dolf Schimmel - Freeaqingme <dolf@dolfschimmel.nl>
-# 
-module Puppet::Parser::Functions
-  newfunction(:nslookup, :type => :rvalue, :doc => <<-EOS
-Lookup a hostname and return its ip addresses
-    EOS
-  ) do |vals|
-    hostname, type = vals
-    raise(ArgumentError, 'Must specify a hostname') unless hostname
-    type = 'AAAA' unless type
-    
-    require 'ipaddr'
-    
-    if (ip = IPAddr.new(hostname) rescue nil)
-      if (ip.ipv6? and type == 'AAAA') or (ip.ipv4? and type != 'AAAA')
-        return hostname
-      else
-        return []
-      end
-    end
-
-    typeConst = Resolv::DNS::Resource::IN.const_get "#{type.upcase}"
-    out = []
-    
-    Resolv::DNS.open do |dns|
-      dns.getresources(hostname, typeConst).collect {|r| 
-        out << IPAddr::new_ntoh(r.address.address).to_s
-      }
-    end
-
-    return out
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb
deleted file mode 100644
index 2acf87ca487..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/options_lookup.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# options_lookup.rb
-#
-# This fuction takes two arguments (option, and default value) and looks for the given
-# option key in the calling modules options hash, and returns the value.
-# The function is intended to be used in templates.
-# If no option is found in the options hash, default value (second argument), is returned.
-#
-# Example usages:
-#
-# Default value of no
-#   <%= scope.function_options_lookup(['PasswordAuthentication', 'no']) %>
-# Empty default value
-#   <%= scope.function_options_lookup(['PasswordAuthentication', '']) %>
-# Fact or param based default value
-#   <%= scope.function_options_lookup(['Listen', ipaddress]) %>
-# Lookup inside a custom hash - in this case client_options
-#   <%= scope.function_options_lookup(['PasswordAuthentication', 'no', 'client_options']) %>
-#
-#
-# Michal Nowak <mailto:michal@casanowak.com>
-# 
-module Puppet::Parser::Functions
-  newfunction(:options_lookup, :type => :rvalue, :doc => <<-EOS
-This fuction takes two arguments (option, and default value) and looks for the given
-option key in the calling modules options hash, and returns the value.
-The function is intended to be used in templates.
-If no option is found in the options hash, default value (second argument), is returned.
-
-Default value of no
-  <%= scope.function_options_lookup(['PasswordAuthentication', 'no']) %>
-Empty default value
-  <%= scope.function_options_lookup(['PasswordAuthentication', '']) %>
-Fact or param based default value
-   <%= scope.function_options_lookup(['Listen', ipaddress]) %>
-Lookup inside a custom hash - in this case client_options
-   <%= scope.function_options_lookup(['PasswordAuthentication', 'no', 'client_options']) %>
-
-EOS
-  ) do |args|
-
-    raise ArgumentError, ("options_lookup(): wrong number of arguments (#{args.length}; must be 2 or 3)") if (args.length != 2 and args.length != 3)
-
-    value = ''
-    option_name = args[0]
-    default_val = args[1]
-    hash_name = args[2]
-    module_name = parent_module_name
-
-    hash_name = "options" if (hash_name == :undefined || hash_name == '' || hash_name == nil)
-    value = lookupvar("#{module_name}::#{hash_name}")["#{option_name}"] if (lookupvar("#{module_name}::#{hash_name}").size > 0)
-    value = "#{default_val}" if (value == :undefined || value == '' || value == nil)
-
-    return value
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb
deleted file mode 100644
index 53aad84d768..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/params_lookup.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# params_lookup.rb
-#
-# This function lookups for a variable value in various locations
-# following this order (first match is returned)
-# - Hiera backend (if present) for modulename_varname
-# - Hiera backend (if present) for varname (if second argument is 'global')
-# - Top Scope Variable ::modulename_varname
-# - Top Scope Variable ::varname (if second argument is 'global')
-# - Module default: ::modulename::params::varname
-#
-# It's based on a suggestion of Dan Bode on how to better manage
-# Example42 NextGen modules params lookups.
-# Major help has been given by  Brice Figureau, Peter Meier
-# and Ohad Levy during the Fosdem 2012 days (thanks guys)
-#
-# Tested and adapted to Puppet 2.6.x and later
-#
-# Alessandro Franceschi al@lab42.it
-#
-module Puppet::Parser::Functions
-  newfunction(:params_lookup, :type => :rvalue, :doc => <<-EOS
-This fuction looks for the given variable name in a set of different sources:
-- Hiera, if available ('modulename_varname')
-- Hiera, if available (if second argument is 'global')
-- ::modulename_varname
-- ::varname (if second argument is 'global')
-- ::modulename::params::varname
-If no value is found in the defined sources, it returns an empty string ('')
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "params_lookup(): Define at least the variable name " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = ''
-    var_name = arguments[0]
-    module_name = parent_module_name
-
-    # Hiera Lookup
-    if Puppet::Parser::Functions.function('hiera')
-      value = function_hiera(["#{module_name}_#{var_name}", ''])
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-
-      value = function_hiera(["#{var_name}", '']) if arguments[1] == 'global'
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    # Top Scope Variable Lookup (::modulename_varname)
-    value = lookupvar("::#{module_name}_#{var_name}")
-    return value if (not value.nil?) && (value != :undefined) && (value != '')
-
-    # Look up ::varname (only if second argument is 'global')
-    if arguments[1] == 'global'
-      value = lookupvar("::#{var_name}")
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    # needed for the next two lookups
-    classname = self.resource.name.downcase
-    loaded_classes = catalog.classes
-
-    # self::params class lookup for default value
-    if loaded_classes.include?("#{classname}::params")
-      value = lookupvar("::#{classname}::params::#{var_name}")
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    # Params class lookup for default value
-    if loaded_classes.include?("#{module_name}::params")
-      value = lookupvar("::#{module_name}::params::#{var_name}")
-      return value if (not value.nil?) && (value != :undefined) && (value != '')
-    end
-
-    return ''
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb
deleted file mode 100644
index 5af9953f502..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/lib/puppet/parser/functions/url_parse.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'uri'
-
-Puppet::Parser::Functions::newfunction(:url_parse, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Returns information about an url
-    
-    This function expects two arguments, an URL and the part of the url you want to retrieve. 
-
-    Example:
-    $source_filename = url_parse($source_url,path)
-
-    Given an url like: https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0
-    You obtain the following results according to the second argument:
-    scheme   : https
-    userinfo : my_user:my_pass
-    user     : my_user
-    password : my_pass
-    host     : www.example.com
-    port     : 8080
-    path     : /path/to/file.php
-    query    : id=1&ret=0
-    filename : file.php
-    filetype : php
-    filedir  : file
-   
- 
-  ENDHEREDOC
-  raise ArgumentError, ("url_parse(): wrong number of arguments (#{args.length}; must be 2)") if args.length != 2
-  url=URI.parse args[0]
-  case args[1]
-    when 'scheme' then url.scheme
-    when 'userinfo' then url.userinfo
-    when 'user' then url.user
-    when 'password' then url.password
-    when 'host' then url.host
-    when 'port' then url.port
-    when 'path' then url.path
-    when 'query' then url.query
-    when 'filename' then File.basename url.path
-    when 'filetype' then File.extname url.path
-    when 'filedir' then (File.basename url.path).chomp(File.extname(url.path))
-    else url
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/check.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/check.pp
deleted file mode 100644
index f652d093657..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/check.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Define puppi::check
-#
-# This define creates a file with a check command that can be used locally.
-# It uses Nagios plugins for all checks so that $command is just the
-# plugin name with its arguments
-#
-# == Usage
-# Basic Usage:
-# puppi::check { "checkname":
-#   command => "check_tcp -H localhost -p 80"
-# }
-#
-# :include:../README.check
-#
-define puppi::check (
-  $command,
-  $base_dir = '',
-  $hostwide = 'no',
-  $priority = '50',
-  $project  = 'default',
-  $enable   = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-  $bool_hostwide = any2bool($hostwide)
-
-  $real_base_dir = $base_dir ? {
-    ''      => $puppi::params::checkpluginsdir,
-    default => $base_dir,
-  }
-
-  $path = $bool_hostwide ? {
-    true  => "${puppi::params::checksdir}/${priority}-${name}" ,
-    false => "${puppi::params::projectsdir}/${project}/check/${priority}-${name}",
-  }
-
-  file { "Puppi_check_${project}_${priority}_${name}":
-    ensure  => $ensure,
-    path    => $path,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "${real_base_dir}/${command}\n",
-    tag     => 'puppi_check',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/configure.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/configure.pp
deleted file mode 100644
index c827fd77f2d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/configure.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Define puppi::deploy
-#
-# This define creates a file with a deploy command that can be used locally.
-#
-# == Usage:
-# puppi::configure { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-# :include:../README.deploy
-#
-define puppi::configure (
-  $command,
-  $project,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/configure/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_deploy',
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/dependencies.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/dependencies.pp
deleted file mode 100644
index 828b86d7835..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/dependencies.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Class puppi::dependencies
-#
-# This class provides commands and tools needed for full Puppi
-# functionality. Since you might already have these package
-# resources in your modules, to avoid conflicts you may decide
-# to include the needed packages somewhere else and avoid the
-# direct inclusion of puppi::dependencies with the parameter:
-#   install_dependencies => false
-#
-class puppi::dependencies {
-
-  require puppi::params
-
-  if ! defined(Package['curl']) {
-    package { 'curl' : ensure => present }
-  }
-
-  if ! defined(Package['wget']) {
-    package { 'wget' : ensure => present }
-  }
-
-  if ! defined(Package['unzip']) {
-    package { 'unzip' : ensure => present }
-  }
-
-  if ! defined(Package['rsync']) {
-    package { 'rsync' : ensure => present }
-  }
-
-  if ! defined(Package[$puppi::params::package_nagiosplugins]) {
-    package { $puppi::params::package_nagiosplugins : ensure => present }
-  }
-
-  if ! defined(Package[$puppi::params::package_mail]) {
-    package { $puppi::params::package_mail : ensure => present }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/deploy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/deploy.pp
deleted file mode 100644
index b2633ccecd7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/deploy.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Define puppi::deploy
-#
-# This define creates a file with a deploy command that can be used locally.
-#
-# == Usage:
-# puppi::deploy { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-# :include:../README.deploy
-#
-define puppi::deploy (
-  $command,
-  $project,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/deploy/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_deploy',
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/extras.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/extras.pp
deleted file mode 100644
index 5b81e97e29a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/extras.pp
+++ /dev/null
@@ -1,208 +0,0 @@
-# Class puppi::extras
-#
-# Default extras class with predefined puppi
-# check, log , info content.
-# You can provide a custom extra class to use instead of this
-# with a parameter like:
-#   extra_class=> 'example42::puppi::extras',
-#
-class puppi::extras {
-
-  # Default Checks
-
-  puppi::check { 'NTP_Sync':
-    command  => "check_ntp -H ${puppi::params::ntp}" ,
-    priority => '99' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Disks_Usage':
-    command  => 'check_disk -w 20% -c 10% -L -X tmpfs' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'System_Load':
-    command  => 'check_load -w 15,10,5 -c 30,25,20' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Zombie_Processes':
-    command  => 'check_procs -w 5 -c 10 -s Z' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Local_Mail_Queue':
-    command  => 'check_mailq -w 2 -c 5' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'Connected_Users':
-    command  => 'check_users -w 5 -c 10' ,
-    priority => '10' ,
-    hostwide => 'yes' ,
-  }
-
-  puppi::check { 'DNS_Resolution':
-    command  => 'check_dns -H example.com' ,
-    priority => '15' ,
-    hostwide => 'yes' ,
-  }
-
-
-  # Info Pages
-  $network_run = $::operatingsystem ? {
-    Solaris => [ 'ifconfig -a' , 'netstat -nr' , 'cat /etc/resolv.conf' , 'arp -an' , 'netstat -na' ],
-    default => [ 'ifconfig' , 'route -n' , 'cat /etc/resolv.conf' , 'arp -an' , 'netstat -natup | grep LISTEN' ],
-  }
-
-  puppi::info { 'network':
-    description => 'Network settings and stats' ,
-    run         => $network_run,
-  }
-
-  $users_run = $::operatingsystem ? {
-    Solaris => [ 'who' , 'last' ],
-    default => [ 'who' , 'last' , 'LANG=C lastlog | grep -v \'Never logged in\'' ],
-  }
-
-  puppi::info { 'users':
-    description => 'Users and logins information' ,
-    run         => $users_run,
-  }
-
-  $perf_run = $::operatingsystem ? {
-    Solaris => [ 'uptime' , 'vmstat 1 5' ],
-    default => [ 'uptime' , 'free' , 'vmstat 1 5' ],
-  }
-
-  puppi::info { 'perf':
-    description => 'System performances and resources utilization' ,
-    run         => $perf_run,
-  }
-
-  $disks_run = $::operatingsystem ? {
-    Solaris => [ 'df -h' , 'mount' ],
-    default => [ 'df -h' , 'mount' , 'blkid' , 'fdisk -l' ],
-  }
-
-  puppi::info { 'disks':
-    description => 'Disks and filesystem information' ,
-    run         => $disks_run,
-  }
-
-  $hardware_run = $::operatingsystem ? {
-    Solaris => [ 'find /devices/' ],
-    default => [ 'lspci' , 'cat /proc/cpuinfo' ],
-  }
-
-  puppi::info { 'hardware':
-    description => 'Hardware information' ,
-    run         => $hardware_run,
-  }
-
-  $packages_run = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => [ 'yum repolist' , 'rpm -qa' ] ,
-    /(?i:Debian|Ubuntu|Mint)/                    => [ 'apt-config dump' , 'apt-cache stats' , 'apt-key list' , 'dpkg -l' ],
-    /(Solaris)/                                  => [ 'pkginfo' ],
-    /(Archlinux)/                                => [ 'pacman -Qet' ],
-    default                                      => [ 'echo' ],
-  }
-
-  puppi::info { 'packages':
-    description => 'Packages information' ,
-    run         => $packages_run,
-  }
-
-  puppi::info::module { 'puppi':
-    configfile  => ["${puppi::params::basedir}/puppi.conf"],
-    configdir   => [$puppi::params::basedir],
-    datadir     => [$puppi::params::archivedir],
-    logdir      => [$puppi::params::logdir],
-    description => 'What Puppet knows about puppi' ,
-    verbose     => 'yes',
-#   run         => "ls -lR ${puppi::params::logdir}/puppi-data/",
-  }
-
-  ### Default Logs
-  case $::operatingsystem {
-
-    Debian,Ubuntu: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/syslog'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/user.log','/var/log/auth.log'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/mail.log'],
-      }
-    }
-
-    RedHat,CentOS,Scientific,Amazon,Linux: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/messages'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/secure'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/maillog'],
-      }
-    }
-
-    SLES,OpenSuSE: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/messages'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/mail'],
-      }
-      puppi::log { 'zypper':
-        description => 'Zypper messages',
-        log         => ['/var/log/zypper.log'],
-      }
-    }
-
-    Solaris: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/adm/messages'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/authlog'],
-      }
-    }
-
-    Archlinux: {
-      puppi::log { 'system':
-        description => 'General System Messages',
-        log         => ['/var/log/messages.log','/var/log/syslog.log'],
-      }
-      puppi::log { 'auth':
-        description => 'Users and authentication',
-        log         => ['/var/log/user.log','/var/log/auth.log'],
-      }
-      puppi::log { 'mail':
-        description => 'Mail messages',
-        log         => ['/var/log/mail.log'],
-      }
-    }
-
-    default: { }
-
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helper.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helper.pp
deleted file mode 100644
index d87c198d583..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helper.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Define puppi::helper
-#
-# The Puppi 2.0 define that creates an helper file that contains
-# the commands to execute, for the different puppi actions, using
-# the variables present in the datafile
-#
-# == Usage
-# Basic Usage:
-# puppi::helper { "myhelper":
-#   template => 'myproject/puppi/helpers/myhelper.erb',
-# }
-#
-define puppi::helper (
-  $template,
-  $ensure = 'present' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "puppi_helper_${name}":
-    ensure  => $ensure,
-    path    => "${puppi::params::helpersdir}/${name}.yml",
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template($template),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helpers.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helpers.pp
deleted file mode 100644
index b8cd2f4805a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/helpers.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# Class puppi::helpers
-#
-# A class that defines all the default helpers used by Example42
-#  modules
-#
-# == Usage
-# Automatically included by Puppi
-#
-class puppi::helpers {
-
-  # Standard helper for Example42 modules
-  puppi::helper { 'standard':
-    template => 'puppi/helpers/standard.yml.erb',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info.pp
deleted file mode 100644
index 7ae750d7c18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info.pp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Define puppi::info
-#
-# This define creates a basic info file that simply contains a set
-# of commands that show infos about custom topics.
-# To be used by the puppi info command.
-# By default it builds the info script based on the minimal puppi/info.erb
-# template but you can choose a custom template.
-# Other info defines are used to gather and create puppi info scripts with
-# different arguments and contents.
-# Check puppi/manifests/info/ for alternative puppi::info::  plugins
-#
-# == Usage:
-# puppi::info { "network":
-#   description => "Network status and information" ,
-#   run  => [ "ifconfig" , "route -n" ],
-# }
-#
-# :include:../README.info
-#
-define puppi::info (
-  $description  = '',
-  $templatefile = 'puppi/info.erb',
-  $run          = '' ) {
-
-  require puppi
-  require puppi::params
-
-  $array_run = is_array($run) ? {
-    false     => $run ? {
-      ''      => [],
-      default => split($run, ','),
-    },
-    default   => $run,
-  }
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/instance.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/instance.pp
deleted file mode 100644
index 9d9d9926b4d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/instance.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# Define puppi::info::instance
-#
-# This is a puppi info plugin specific for the tomcat::instance define
-#
-define puppi::info::instance (
-  $servicename  = '',
-  $processname  = '',
-  $configdir    = '',
-  $bindir       = '',
-  $pidfile      = '',
-  $datadir      = '',
-  $logdir       = '',
-  $httpport     = '',
-  $controlport  = '',
-  $ajpport      = '',
-  $description  = '',
-  $run          = '',
-  $verbose      = 'no',
-  $templatefile = 'puppi/info/instance.erb' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/module.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/module.pp
deleted file mode 100644
index df6f3c63cb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/module.pp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Define puppi::info::module
-#
-# This is a puppi info plugin that provides automatic info to modules
-# It uses a default template puppi/info/module.erb that can be changed
-# and adapted
-#
-# == Usage
-# (Sample from Example42 apache module where there's wide use of
-# qualified variables, note that you can provide direct values to it
-# without using variables):
-#
-#  puppi::info::module { "apache":
-#    packagename => "${apache::params::packagename}",
-#    servicename => "${apache::params::servicename}",
-#    processname => "${apache::params::processname}",
-#    configfile  => "${apache::params::configfile}",
-#    configdir   => "${apache::params::configdir}",
-#    pidfile     => "${apache::params::pidfile}",
-#    datadir     => "${apache::params::datadir}",
-#    logfile     => "${apache::params::logfile}",
-#    logdir      => "${apache::params::logdir}",
-#    protocol    => "${apache::params::protocol}",
-#    port        => "${apache::params::port}",
-#    description => "What Puppet knows about apache" ,
-#    run         => "httpd -V",
-#  }
-#
-define puppi::info::module (
-  $packagename    = '',
-  $servicename    = '',
-  $processname    = '',
-  $configfile     = '',
-  $configdir      = '',
-  $initconfigfile = '',
-  $pidfile        = '',
-  $datadir        = '',
-  $logfile        = '',
-  $logdir         = '',
-  $protocol       = '',
-  $port           = '',
-  $description    = '',
-  $run            = '',
-  $verbose        = 'no',
-  $templatefile   = 'puppi/info/module.erb' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/readme.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/readme.pp
deleted file mode 100644
index 5cf9950b465..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/info/readme.pp
+++ /dev/null
@@ -1,69 +0,0 @@
-# Define puppi::info::readme
-#
-# This is a puppi info plugin that provides a Readme text which can be
-# used to show local info on the managed server and eventually run custom commands.
-#
-#  puppi::info::readme { "myapp":
-#    description => "Guidelines for myapp setup",
-#    readme => "myapp/readme.txt" ,
-#    run     => "myapp -V",
-#  }
-#
-define puppi::info::readme (
-  $description       = '',
-  $readme            = '',
-  $autoreadme        = 'no',
-  $run               = '',
-  $source_module     = 'undefined',
-  $templatefile      = 'puppi/info/readme.erb' ) {
-
-  require puppi
-  require puppi::params
-
-  $bool_autoreadme = any2bool($autoreadme)
-
-  file { "${puppi::params::infodir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template($templatefile),
-    tag     => 'puppi_info',
-  }
-
-  $readme_source = $readme ? {
-    ''      => 'puppet:///modules/puppi/info/readme/readme',
-    default => $readme,
-  }
-
-  file { "${puppi::params::readmedir}/${name}":
-    ensure  => present,
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_readmedir'],
-    source  => $readme_source,
-    tag     => 'puppi_info',
-  }
-
-  if $bool_autoreadme == true {
-  file { "${puppi::params::readmedir}/${name}-custom":
-    ensure  => present,
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_readmedir'],
-    source  => [
-      "puppet:///modules/${source_module}/puppi/info/readme/readme-${::hostname}" ,
-      "puppet:///modules/${source_module}/puppi/info/readme/readme-${::role}" ,
-      "puppet:///modules/${source_module}/puppi/info/readme/readme-default" ,
-      "puppet:///modules/puppi/info/readme/readme-${::hostname}" ,
-      "puppet:///modules/puppi/info/readme/readme-${::role}" ,
-      'puppet:///modules/puppi/info/readme/readme-default'
-    ],
-    tag     => 'puppi_info',
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/init.pp
deleted file mode 100644
index be2043f740a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/init.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# = Class: puppi
-#
-# This is Puppi NextGen
-# Includes both first generation of Puppi and the
-# NextGen developments and modules integration
-#
-# == Parameters
-#
-# [*version*]
-#   Define the Puppi version to use:
-#   1 - First generation of Puppi, compatible with old modules
-#   2 - NextGen version. Intended to work with NextGen modules
-#   Default: 1 , for the moment
-#
-# [*install_dependencies*]
-#   Set to false if you want to manage the sofware puppi needs
-#   with your local modules.
-#
-# [*template*]
-#   Sets the path to a custom template for /etc/puppi/puppi.conf
-#
-# [*helpers_class*]
-#   Name of the class there default helpers are defined
-#   (Used on in Puppi 2)
-#
-# [*logs_retention_days*]
-#   Number of days for retenton of puppi logs. Default 30
-#   This option creates a script in /etc/cron.daily that purges
-#   all the old logs. Set to false or to 0 to remove the purge script.
-#
-# [*extra_class*]
-#   Name of the class where extra puppi resources are added
-#   Here, by default are placed general system commands for
-#   puppi info, check and log
-#
-class puppi (
-  $version              = params_lookup( 'version' ),
-  $install_dependencies = params_lookup( 'install_dependencies' ),
-  $template             = params_lookup( 'template' ),
-  $helpers_class        = params_lookup( 'helpers_class' ),
-  $logs_retention_days  = params_lookup( 'logs_retention_days' ),
-  $extra_class          = params_lookup( 'extra_class' )
-  ) inherits puppi::params {
-
-  $bool_install_dependencies=any2bool($install_dependencies)
-
-  # Manage Version
-  $puppi_ensure = $puppi::version ? {
-    1 => '/usr/sbin/puppi.one',
-    2 => '/usr/local/bin/puppi',
-  }
-
-  file { 'puppi.link':
-    ensure => $puppi_ensure,
-    path   => '/usr/sbin/puppi',
-  }
-
-  # Puppi version one is always installed
-  include puppi::one
-
-  # Puppi 2 gem (still experimental) is installed only when forced
-  if $puppi::version == '2' {
-    include puppi::two
-  }
-
-  # Create Puppi common dirs and scripts
-  include puppi::skel
-
-  # Include extra resources
-  include $puppi::extra_class
-
-  # Include some packages needed by Puppi
-  if $bool_install_dependencies {
-    include puppi::dependencies
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/initialize.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/initialize.pp
deleted file mode 100644
index 0fe66afe5d8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/initialize.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Define puppi::initialize
-#
-# This define creates a file with a initialize command that can be used locally.
-#
-# Usage:
-# puppi::initialize { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-define puppi::initialize (
-  $command,
-  $project,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/initialize/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_initialize',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/install_packages.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/install_packages.pp
deleted file mode 100644
index 6338e8adfa5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/install_packages.pp
+++ /dev/null
@@ -1,83 +0,0 @@
-# = Define: puppi::install_packages
-#
-# This define installs a list of packages without manging them as Puppet
-# resources. It's useful when you need a set of packages installed,
-# for example as prerequisites to build code from source, but you don't want
-# to create Puppet package resources for them (since they may conflict with
-# existing classes that provide the same packages.
-#
-# == Parameters:
-#
-# [*packages*]
-#   String. Required.
-#   A space separated list of of the packages to install
-#
-# [*template*]
-#   String. Optional. Default: 'puppi/install_packages.erb'
-#   The template to use to generate the script that installs the packages
-#
-# [*scrips_dir*]
-#   String. Optional. Default: '/root/puppi_install_packages'
-#    The directory where you place the scripts created by the define.
-#
-# [*autorun*]
-#   Boolean. Default: true.
-#   Define if to automatically execute the script when Puppet runs.
-#
-# [*refreshonly*]
-#   Boolean. Optional. Default: true
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*timeout*]
-#   String. Optional. Default: '600'
-#   Exec timeout in seconds.
-#
-# [*ensure*]
-#   Define if the runscript script and eventual cron job
-#   must be present or absent. Default: present.
-#
-# == Examples
-#
-# - Minimal setup
-# puppi::install_packages { 'build_tools':
-#   source           => 'build-essential vim git-core curl bison',
-# }
-#
-define puppi::install_packages (
-  $packages,
-  $template         = 'puppi/install_packages.erb',
-  $scripts_dir      = '/root/puppi_install_packages',
-  $autorun          = true,
-  $refreshonly      = true,
-  $timeout          = '600',
-  $ensure           = 'present' ) {
-
-  if ! defined(File[$scripts_dir]) {
-    file { $scripts_dir:
-      ensure => directory,
-      mode   => '0755',
-      owner  => 'root',
-      group  => 'root',
-    }
-  }
-
-  file { "install_packages_${name}":
-    ensure  => $ensure,
-    path    => "${scripts_dir}/${name}",
-    mode    => '0755',
-    owner   => 'root',
-    group   => 'root',
-    content => template($template),
-  }
-
-  if $autorun == true {
-    exec { "install_packages_${name}":
-      command     => "${scripts_dir}/${name}",
-      refreshonly => $refreshonly,
-      subscribe   => File["install_packages_${name}"],
-      timeout     => $timeout,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/log.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/log.pp
deleted file mode 100644
index 8cfe08ab12b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/log.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# Define puppi::log
-#
-# This define creates a basic log file that simply contains
-# the list of logs to show when issuing the puppi log command.
-#
-# == Usage:
-# puppi::log { "system":
-#   description => "General System Logs" ,
-#   log  => [ "/var/log/syslog" , "/var/log/messages" ],
-# }
-#
-# :include:../README.log
-#
-define puppi::log (
-  $log,
-  $description = '' ) {
-
-  require puppi
-  require puppi::params
-
-  $array_log = is_array($log) ? {
-    false     => split($log, ','),
-    default   => $log,
-  }
-
-  file { "${puppi::params::logsdir}/${name}":
-    ensure  => 'present',
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template('puppi/log.erb'),
-    tag     => 'puppi_log',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp
deleted file mode 100644
index a15d0ca259c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/client.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-# = Class puppi::mcollective::client
-#
-# This class installs the mc puppi command for mcollective clients
-# (Note that in mcollective terminology a client is an host from
-# where you can manage mcollective servers)
-#
-# The class installs also the puppideploy and puppicheck commands
-# that are simple wrappers about mco puppi that correctly trap
-# remote errors and can be used in automatic procedures or
-# to give limited access (typically via sudo) to mc puppi commands
-#
-# They can be integrated, for example, in Jenkins as remote ssh
-# commands to manage deployments or tests
-#
-# == Usage:
-# include puppi::mcollective::client
-#
-# :include:../README.mcollective
-#
-class puppi::mcollective::client {
-
-  require puppi::params
-  require puppi::mcollective::server
-
-# OLD STYLE mc-puppi command
-  file { '/usr/local/bin/mc-puppi':
-    ensure  => 'present',
-    mode    => '0755',
-    owner   => 'root',
-    group   => 'root',
-    source  => 'puppet:///modules/puppi/mcollective/mc-puppi',
-    require => Class['mcollective'],
-    }
-
-# mco application TODO
-#  file { "${puppi::params::mcollective}/application/puppi.rb":
-#    ensure  => 'present',
-#    mode    => '0644',
-#    owner   => 'root',
-#    group   => 'root',
-#    source  => 'puppet:///modules/puppi/mcollective/mcpuppi.rb',
-#  }
-
-  file { '/usr/bin/puppicheck':
-    ensure  => 'present',
-    mode    => '0750',
-    owner   => $puppi::params::mcollective_user,
-    group   => $puppi::params::mcollective_group,
-    source  => 'puppet:///modules/puppi/mcollective/puppicheck',
-  }
-
-  file { '/usr/bin/puppideploy':
-    ensure  => 'present',
-    mode    => '0750',
-    owner   => $puppi::params::mcollective_user,
-    group   => $puppi::params::mcollective_group,
-    source  => 'puppet:///modules/puppi/mcollective/puppideploy',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp
deleted file mode 100644
index 40def160a1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/mcollective/server.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-# = Class puppi::mcollective::server
-#
-# This class installs the puppi agent on mcollective servers
-# (Note that in mcollective terminology a server is an host
-# managed by a mcollective client)
-#
-# == Usage:
-# include puppi::mcollective::server
-#
-# :include:../README.mcollective
-#
-class puppi::mcollective::server {
-
-  require puppi::params
-
-  file { "${puppi::params::mcollective}/agent/puppi.ddl":
-    ensure  => 'present',
-    mode    => '0644',
-    owner   => 'root',
-    group   => 'root',
-    source  => 'puppet:///modules/puppi/mcollective/puppi.ddl',
-    require => Class['mcollective'],
-  }
-
-  file { "${puppi::params::mcollective}/agent/puppi.rb":
-    ensure  => 'present',
-    mode    => '0644',
-    owner   => 'root',
-    group   => 'root',
-    source  => 'puppet:///modules/puppi/mcollective/puppi.rb',
-    require => Class['mcollective'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/netinstall.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/netinstall.pp
deleted file mode 100644
index a7b7ed6d086..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/netinstall.pp
+++ /dev/null
@@ -1,169 +0,0 @@
-# Define: puppi::netinstall
-#
-# This defines simplifies the installation of a file
-# downloaded from the web. It provides arguments to manage
-# different kind of downloads and custom commands.
-# It's used, among the others, by NextGen modules of webapps
-# when the argument install is set to => source
-#
-# == Variables
-#
-# [*url*]
-#   The Url of the file to retrieve. Required.
-#   Example: http://www.example42.com/file.tar.gz
-#
-# [*destination_dir*]
-#   The final destination where to unpack or copy what has been
-#   downloaded. Required.
-#   Example: /var/www/html
-#
-# [*retrieve_args*]
-#   A string of arguments to pass to wget.
-#
-# [*extracted_dir*]
-#   The name of a directory or file created after the extraction
-#   Needed only if its name is different from the downloaded file name
-#   (without suffixes). Optional.
-#
-# [*owner*]
-#   The user owner of the directory / file created. Default: root
-#
-# [*group*]
-#   The group owner of the directory / file created. Default: root
-#
-# [*timeout*]
-#   The timeout in seconds for each command executed
-#
-# [*work_dir*]
-#   A temporary work dir where file is downloaded. Default: /var/tmp
-#
-# [*path*]
-#  Define the path for the exec commands.
-#  Default: /bin:/sbin:/usr/bin:/usr/sbin
-#
-# [*exec_env*]
-#   Define any additional environment variables to be used with the
-#   exec commands. Note that if you use this to set PATH, it will
-#   override the path attribute. Multiple environment variables
-#   should be specified as an array.
-#
-# [*extract_command*]
-#   The command used to extract the downloaded file.
-#   By default is autocalculated accoring to the file extension
-#   Set 'rsync' if the file has to be placed in the destination_dir
-#   as is (for example for war files)
-#
-# [*preextract_command*]
-#   An optional custom command to run before extracting the file.
-#
-# [*postextract_command*]
-#   An optional custom command to run after having extracted the file.
-#
-define puppi::netinstall (
-  $url,
-  $destination_dir,
-  $extracted_dir       = '',
-  $retrieve_command    = 'wget',
-  $retrieve_args       = '',
-  $owner               = 'root',
-  $group               = 'root',
-  $timeout             = '3600',
-  $work_dir            = '/var/tmp',
-  $path                = '/bin:/sbin:/usr/bin:/usr/sbin',
-  $extract_command     = '',
-  $preextract_command  = '',
-  $postextract_command = '',
-  $postextract_cwd     = '',
-  $exec_env            = []
-  ) {
-
-  $source_filename = url_parse($url,'filename')
-  $source_filetype = url_parse($url,'filetype')
-  $source_dirname = url_parse($url,'filedir')
-
-  $real_extract_command = $extract_command ? {
-    ''      => $source_filetype ? {
-      '.tgz'     => 'tar -zxf',
-      '.gz'      => 'tar -zxf',
-      '.bz2'     => 'tar -jxf',
-      '.tar'     => 'tar -xf',
-      '.zip'     => 'unzip',
-      default    => 'tar -zxf',
-    },
-    default => $extract_command,
-  }
-
-  $extract_command_second_arg = $real_extract_command ? {
-    /^cp.*/    => '.',
-    /^rsync.*/ => '.',
-    default    => '',
-  }
-
-  $real_extracted_dir = $extracted_dir ? {
-    ''      => $real_extract_command ? {
-      /(^cp.*|^rsync.*)/         => $source_filename,
-      /(^tar -zxf*|^tar -jxf*)/  => regsubst($source_dirname,'.tar',''),
-      default                    => $source_dirname,
-    },
-    default => $extracted_dir,
-  }
-
-  $real_postextract_cwd = $postextract_cwd ? {
-    ''      => "${destination_dir}/${real_extracted_dir}",
-    default => $postextract_cwd,
-  }
-
-  if $preextract_command {
-    exec { "PreExtract ${source_filename} in ${destination_dir}":
-      command     => $preextract_command,
-      subscribe   => Exec["Retrieve ${url} in ${work_dir}"],
-      refreshonly => true,
-      path        => $path,
-      environment => $exec_env,
-      timeout     => $timeout,
-    }
-  }
-
-  exec { "Retrieve ${url} in ${work_dir}":
-    cwd         => $work_dir,
-    command     => "${retrieve_command} ${retrieve_args} ${url}",
-    creates     => "${work_dir}/${source_filename}",
-    timeout     => $timeout,
-    path        => $path,
-    environment => $exec_env,
-  }
-
-  exec { "Extract ${source_filename} from ${work_dir}":
-    command     => "mkdir -p ${destination_dir} && cd ${destination_dir} && ${real_extract_command} ${work_dir}/${source_filename} ${extract_command_second_arg}",
-    unless      => "ls ${destination_dir}/${real_extracted_dir}",
-    creates     => "${destination_dir}/${real_extracted_dir}",
-    timeout     => $timeout,
-    require     => Exec["Retrieve ${url} in ${work_dir}"],
-    path        => $path,
-    environment => $exec_env,
-    notify      => Exec["Chown ${source_filename} in ${destination_dir}"],
-  }
-
-  exec { "Chown ${source_filename} in ${destination_dir}":
-    command     => "chown -R ${owner}:${group} ${destination_dir}/${real_extracted_dir}",
-    refreshonly => true,
-    timeout     => $timeout,
-    require     => Exec["Extract ${source_filename} from ${work_dir}"],
-    path        => $path,
-    environment => $exec_env,
-  }
-
-  if $postextract_command {
-    exec { "PostExtract ${source_filename} in ${destination_dir}":
-      command     => $postextract_command,
-      cwd         => $real_postextract_cwd,
-      subscribe   => Exec["Extract ${source_filename} from ${work_dir}"],
-      refreshonly => true,
-      timeout     => $timeout,
-      require     => [Exec["Retrieve ${url} in ${work_dir}"],Exec["Chown ${source_filename} in ${destination_dir}"]],
-      path        => $path,
-      environment => $exec_env,
-    }
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/one.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/one.pp
deleted file mode 100644
index 47574bcb7ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/one.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Class: puppi::one
-#
-# Installs Puppi 1.0
-#
-class puppi::one {
-
-  require puppi::params
-
-  # Main configuration file
-  file { 'puppi.conf':
-    ensure  => present,
-    path    => "${puppi::params::basedir}/puppi.conf",
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template($puppi::template),
-    require => File['puppi_basedir'],
-  }
-
-  # The Puppi 1.0 command
-  file { 'puppi':
-    ensure  => present,
-    path    => '/usr/sbin/puppi.one',
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => template('puppi/puppi.erb'),
-    require => File['puppi_basedir'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/params.pp
deleted file mode 100644
index 721eae14129..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/params.pp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Class: puppi::params
-#
-# Sets internal variables and defaults for puppi module
-#
-class puppi::params  {
-
-## PARAMETERS
-  $version              = '1'
-  $install_dependencies = true
-  $template             = 'puppi/puppi.conf.erb'
-  $helpers_class        = 'puppi::helpers'
-  $logs_retention_days  = '30'
-  $extra_class          = 'puppi::extras'
-
-
-## INTERNALVARS
-  $basedir     = '/etc/puppi'
-  $scriptsdir  = '/etc/puppi/scripts'
-  $checksdir   = '/etc/puppi/checks'
-  $logsdir     = '/etc/puppi/logs'
-  $infodir     = '/etc/puppi/info'
-  $tododir     = '/etc/puppi/todo'
-  $projectsdir = '/etc/puppi/projects'
-  $datadir     = '/etc/puppi/data'
-  $helpersdir  = '/etc/puppi/helpers'
-  $libdir      = '/var/lib/puppi'
-  $readmedir   = '/var/lib/puppi/readme'
-  $logdir      = '/var/log/puppi'
-
-  $archivedir = $::puppi_archivedir ? {
-    ''      => '/var/lib/puppi/archive',
-    default => $::puppi_archivedir,
-  }
-
-  $workdir = $::puppi_workdir ? {
-    ''      => '/tmp/puppi',
-    default => $::puppi_workdir,
-  }
-
-  $configfile_mode  = '0644'
-  $configfile_owner = 'root'
-  $configfile_group = 'root'
-
-# External tools
-# Directory where are placed the checks scripts
-# By default we use Nagios plugins
-  $checkpluginsdir = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => $::architecture ? {
-      x86_64  => '/usr/lib64/nagios/plugins',
-      default => '/usr/lib/nagios/plugins',
-    },
-    default                    => '/usr/lib/nagios/plugins',
-  }
-
-  $package_nagiosplugins = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux|Fedora)/ => 'nagios-plugins-all',
-    default                       => 'nagios-plugins',
-  }
-
-  $package_mail = $::operatingsystem ? {
-    /(?i:Debian|Ubuntu|Mint)/ => 'bsd-mailx',
-    default           => 'mailx',
-  }
-
-  $ntp = $::ntp_server ? {
-    ''    => 'pool.ntp.org' ,
-    default => is_array($::ntp_server) ? {
-      false   => $::ntp_server,
-      true  => $::ntp_server[0],
-      default => $::ntp_server,
-    }
-  }
-
-# Mcollective paths
-# TODO: Add Paths for Puppet Enterprise:
-# /opt/puppet/libexec/mcollective/mcollective/
-  $mcollective = $::operatingsystem ? {
-    debian  => '/usr/share/mcollective/plugins/mcollective',
-    ubuntu  => '/usr/share/mcollective/plugins/mcollective',
-    centos  => '/usr/libexec/mcollective/mcollective',
-    redhat  => '/usr/libexec/mcollective/mcollective',
-    default => '/usr/libexec/mcollective/mcollective',
-  }
-
-  $mcollective_user = 'root'
-  $mcollective_group = 'root'
-
-
-# Commands used in puppi info templates
-  $info_package_query = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -qi',
-    /(?i:Ubuntu|Debian|Mint)/          => 'dpkg -s',
-    default                    => 'echo',
-  }
-  $info_package_list = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Scientific|Amazon|Linux)/ => 'rpm -ql',
-    /(?i:Ubuntu|Debian|Mint)/                    => 'dpkg -L',
-    default                                      => 'echo',
-  }
-  $info_service_check = $::operatingsystem ? {
-    default => '/etc/init.d/',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project.pp
deleted file mode 100644
index 4cf23313e83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project.pp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Define puppi::project
-#
-# This define creates and configures a Puppi project
-# You must use different puppi::deploy and puppi::rollback defines
-# to to build up the commands list
-#
-define puppi::project (
-  $enable = true ) {
-
-  require puppi::params
-
-  $ensure = any2bool($enable) ? {
-    false   => 'absent',
-    default => 'directory',
-  }
-
-  $ensurefile = bool2ensure($enable)
-
-  # Create Project subdirs
-  file {
-    "${puppi::params::projectsdir}/${name}":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true;
-
-    "${puppi::params::projectsdir}/${name}/check":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/rollback":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/deploy":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/initialize":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-      
-    "${puppi::params::projectsdir}/${name}/configure":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-
-    "${puppi::params::projectsdir}/${name}/report":
-      ensure  => $ensure,
-      mode    => '0755',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      force   => true,
-      recurse => true,
-      purge   => true,
-      require => File["${puppi::params::projectsdir}/${name}"];
-  }
-
-  # Create Project configuration file
-  file {
-    "${puppi::params::projectsdir}/${name}/config":
-      ensure  => $ensurefile,
-      content => template('puppi/project/config.erb'),
-      mode    => '0644',
-      owner   => $puppi::params::configfile_owner,
-      group   => $puppi::params::configfile_group,
-      require => File["${puppi::params::projectsdir}/${name}"];
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/README b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/README
deleted file mode 100644
index ea75c5da38a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/README
+++ /dev/null
@@ -1,31 +0,0 @@
-In this directory you find some examples of deploy procedures
-for general purposes deploys (single wars, single files, tarballs, list
-of files from a list...) described in a single define.
-
-They are made in order to be generic enough to adapt to different 
-environments and scenarious but you might need to design your
-own deployment process.
-
-In order to do that you can create a new define that includes:
-- All the variables, required or optional, you may want
-- One puppi:project statement 
-- All the puppi::deploy statements you need (each one runs a command)
-- All the puppi::rollback statements you need
-- One or more puppi::report statements for reporting
-
-The examples provided here make use of the scripts provided in
-puppi/files/scripts and tend to split the deploy procedures in many 
-different, reusable, scripts (one gets the source file(s), another 
-archives the current content, another one actually copies the files
-to deploy and so on) but you can use just a single new script or 
-whatever combination you might prefer.
-
-The default puppi scripts and the general ordering of commands
-execution in these sample deploy defines follow this scheme:
-Priority - Kind of operations
-1x - Pre Deploy checks 
-2x - Files retrieving and preparation
-3x - Operations to accomplish before the deploy (Archiving, Services stopping..)
-40 - Deploy.sh - The script that actually copied the files on deploy dir
-4x - Operations to accomplish after the deploy (Services start...)
-8x - Post Deploy checks
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/archive.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/archive.pp
deleted file mode 100644
index 34d25f0dee2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/archive.pp
+++ /dev/null
@@ -1,406 +0,0 @@
-# = Define puppi::project::archive
-#
-# This is a puppi deployment project to be used for archives
-# like tarballs and zips
-#
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*clean_deploy*]
-#   (Optional, default false) - If during the deploy procedure, all the
-#   existing files that are not on the source have to be deleted.
-#   (When true, a --delete option is added to the rsync command)
-#   Do not set to true if source files are incremental.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::archive (
-  $source,
-  $deploy_root,
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $clean_deploy             = false,
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_clean_deploy = any2bool($clean_deploy)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $source_type = url_parse($source,filetype)
-
-  $real_source_type = $source_type ? {
-    '.tar'     => 'tar',
-    '.tar.gz'  => 'tarball',
-    '.gz'      => 'tarball',
-    '.tgz'     => 'tarball',
-    '.zip'     => 'zip',
-  }
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here source file is retrieved
-    puppi::deploy { "${name}-Retrieve_Archive":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t ${real_source_type} -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-PreDeploy_Archive":
-      priority  => '25' ,
-      command   => 'predeploy.sh' ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy_files.sh' ,
-      arguments => "-d ${deploy_root} -c ${bool_clean_deploy}",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/builder.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/builder.pp
deleted file mode 100644
index c76cd1777a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/builder.pp
+++ /dev/null
@@ -1,561 +0,0 @@
-# = Define puppi::project::builder
-#
-# This is a shortcut define to build a puppi project for the deploy of web
-# applications based on different sources: a war file, a tar file, a source dir,
-# a list of files or a nexus maven repository
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*source_type*]
-#   The type of file that is retrieved. Accepted values: tarball, zip, list,
-#   war, dir, maven-metadata.
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*magicfix*]
-#   (Optional) - A string that is used as prefix or suffix according to the
-#   context and the scripts used in the deploy procedure.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup*]
-#   (Optional) - How backups of files are made. Default: "full". Options:
-#   "full" - Make full backup of the deploy_root before making the deploy
-#   "diff" - Backup only the files that are going to be deployed. Note that
-#     in order to make reliable rollbacks of versions older that the latest
-#     you've to individually rollback every intermediate deploy
-#   "false" - Do not make backups. This disables the option to make rollbacks
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# == Usage
-# A sample deploy of a zip with custom postdeploy command and mail notification
-# puppi::project::builder { "cms":
-#   source                   => "http://repo.example42.com/deploy/cms/cms.zip",
-#   source_type              => "zip",
-#   user                     => "root",
-#   deploy_root              => "/var/www",
-#   postdeploy_customcommand => "chown -R www-data /var/www/files",
-#   postdeploy_user          => "root",
-#   postdeploy_priority      => "41",
-#   report_email             => "sysadmins@example42.com",
-#   enable                   => "true",
-# }
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::builder (
-  $source,
-  $source_type,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $magicfix                 = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup                   = 'full',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Autoinclude the puppi class
-  include puppi
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $real_source_type = $source_type ? {
-    'dir'            => 'dir',
-    'tarball'        => 'tarball',
-    'zip'            => 'zip',
-    'gz'             => 'gz',
-    'maven-metadata' => 'maven-metadata',
-    'maven'          => 'maven-metadata',
-    'war'            => 'war',
-    'list'           => 'list',
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $source_filename = url_parse($source,'filename')
-
-# Create Project
-  puppi::project { $name: enable => $enable }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Here source file is retrieved
-  puppi::deploy { "${name}-Retrieve_SourceFile":
-    priority  => '20' ,
-    command   => 'get_file.sh' ,
-    arguments => "-s ${source} -t ${real_source_type} -a ${real_always_deploy}" ,
-    user      => 'root' ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  $args_magicfix = $magicfix ? {
-    ''      => '',
-    default => "-m ${magicfix}" ,
-  }
-
-  if ($real_source_type == 'tarball') {
-    puppi::deploy { "${name}-PreDeploy_Tar":
-      priority  => '25' ,
-      command   => 'predeploy.sh' ,
-      arguments => $args_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'zip') {
-
-    puppi::deploy { "${name}-PreDeploy_Zip":
-      priority  => '25' ,
-      command   => 'predeploy.sh' ,
-      arguments => $args_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'list') {
-    puppi::deploy { "${name}-Extract_File_Metadata":
-      priority  => '22' ,
-      command   => 'get_metadata.sh' ,
-      arguments => $args_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    $clean_file_list_magicfix = $magicfix ? {
-      ''      => '',
-      default => $magicfix,
-    }
-
-    puppi::deploy { "${name}-Clean_File_List":
-      priority  => '24' ,
-      command   => 'clean_filelist.sh' ,
-      arguments => $clean_file_list_magicfix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::deploy { "${name}-Retrieve_Files":
-      priority  => '25' ,
-      command   => 'get_filesfromlist.sh' ,
-      arguments => $source ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($backup == 'full') or ($backup == 'diff') {
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -m ${backup} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '34' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::deploy { "${name}-Remove_existing_WAR":
-      priority  => '35' ,
-      command   => 'delete.sh' ,
-      arguments => "${deploy_root}/${source_filename}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::deploy { "${name}-Check_undeploy":
-      priority  => '36' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::deploy { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '34' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::rollback { "${name}-Remove_existing_WAR":
-      priority  => '35' ,
-      command   => 'delete.sh' ,
-      arguments => "${deploy_root}/${source_filename}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::rollback { "${name}-Check_undeploy":
-      priority  => '36' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($backup == 'full') or ($backup == 'diff') {
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -m ${backup} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($real_source_type == 'war') {
-    puppi::rollback { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root}/${source_filename}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/dir.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/dir.pp
deleted file mode 100644
index a56ad645522..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/dir.pp
+++ /dev/null
@@ -1,450 +0,0 @@
-# = Define puppi::project::dir
-#
-# This is a shortcut define to build a puppi project for a deploy based
-# on the syncronization of a directory.
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*skip_predeploy*]
-#    For large data to deploy predeploy copy in /tmp/puppi might full the
-#    filesystem. Set to "yes" to deploy directly to $deploy_root. Default: no
-#    (files are first predeployed in /tmp/puppi then copied to $deploy_root)
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::dir (
-  $source,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $skip_predeploy           = false,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_skip_predeploy = any2bool($skip_predeploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_skip_predeploy == false) {
-    puppi::deploy { "${name}-Sync_Files":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t dir" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Here is done the deploy on $deploy_root
-  if ($bool_skip_predeploy == false) {
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_skip_predeploy == true) {
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-  # End deploy
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK SEQUENCE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/files.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/files.pp
deleted file mode 100644
index 1c625b9819a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/files.pp
+++ /dev/null
@@ -1,482 +0,0 @@
-# = Define puppi::project::files
-#
-# This is a sample define to build a puppi project for the deploy of
-# one or more files based on a provided list containing, one per line,
-# the full path of the files to deploy.
-# The place (url) from where to get the files is defined by the
-# $source_baseurl variable.
-# You can strip out some beginning chars from each line with the
-# (optional) $files_prefix variable.
-# Files are then copied to the $deploy_root you define.
-#
-# Many different variables are optional in order to adapt the define
-# to different cases and needs, if you still need to customize it,
-# you can clone this puppi::project into another file and change the
-# define name.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*source_baseurl*]
-#   The full URL, in URI standard format, to prepend to the entries i
-#   the files list in order to retrieve the relative files.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*prefix*]
-#   (Optional) - The prefix that might be present in the filelist to
-#   define custom  metadata
-#
-# [*files_prefix*]
-#   (Optional) The prefix to remove from the list entries in order to
-#   determine the files path on the deploy_root
-#   We suggest to place in the files list just the deploy_root relative
-#   paths of the files, and in this case the $files_prefix is null
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::files (
-  $source,
-  $source_baseurl,
-  $deploy_root,
-  $init_source              = '',
-  $files_prefix             = '',
-  $prefix                   = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Retrieve_File_List":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t list" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    $args_prefix = $prefix ? {
-      ''      => '',
-      default => "-m ${prefix}",
-    }
-
-    puppi::deploy { "${name}-Extract_File_Metadata":
-      priority  => '22' ,
-      command   => 'get_metadata.sh' ,
-      arguments => $args_prefix,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Clean_File_List":
-      priority  => '24' ,
-      command   => 'clean_filelist.sh' ,
-      arguments => $files_prefix ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Retrieve_Files":
-      priority  => '25' ,
-      command   => 'get_filesfromlist.sh' ,
-      arguments => $source_baseurl ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK SEQUENCE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/git.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/git.pp
deleted file mode 100644
index ac48e301a18..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/git.pp
+++ /dev/null
@@ -1,418 +0,0 @@
-# == Define puppi::project::git
-#
-# This is a shortcut define to build a puppi project for the deploy of
-# file from a git repo.
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the git repo to retrieve.
-#   Format should be in git friendly standard (http:// git:// ssh:// ..).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*install_git*]
-#   If the git package hs to be installed. Default true.
-#   Set to false if you install git via other modules and have resource
-#   conflicts.
-#
-# [*git_subdir*]
-#   (Optional) - If you want to copy to the deploy_root only a subdir
-#   of the specified git repo, specify here the path of the directory
-#   relative to the repo root. Default undefined
-#
-# [*tag*]
-#   (Optional) - A specific tag you may want to deploy. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "tag=release"
-#
-# [*branch*]
-#   (Optional) - A specific branch you may want to deploy. Default: master
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "branch=devel"
-#
-# [*commit*]
-#   (Optional) - A specific commit you may want to use. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "commit=1061cb731bc75a1188b58b889b74ce1505ccb412"
-#
-# [*keep_gitdata*]
-#   (Optional) - Define if you want to keep git metadata directory (.git)
-#   in the deploy root. According to this value backup and rollback
-#   operations change (with keep_gitdata set to true no real backups are done
-#   and operations are made on the git tree, if set to false, file are copied
-#   and the $backup_* options used. Default is true
-#
-# [*verbose*]
-#   (Optional) - If you want to see verbose git utput (file names) during
-#   the deploy. Default is true.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#   If different from root (default) it must have write permissions on
-#   the $deploy_root dir.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#   This option is used when $keep_gitmeta is set to false
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#   This option is used when $keep_gitmeta is set to false
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::git (
-  $source,
-  $deploy_root,
-  $install_git              = true,
-  $git_subdir               = 'undefined',
-  $tag                      = 'undefined',
-  $branch                   = 'master',
-  $commit                   = 'undefined',
-  $keep_gitdata             = true,
-  $verbose                  = true,
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_install_git = any2bool($install_git)
-  $bool_keep_gitdata = any2bool($keep_gitdata)
-  $bool_verbose = any2bool($verbose)
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### INSTALL GIT
-  if ($bool_install_git == true) {
-    if ! defined(Package['git']) { package { 'git': ensure => installed } }
-  }
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_gitdata == true) {
-    puppi::deploy { "${name}-Backup_existing_data":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'git.sh' ,
-      arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_gitdata == true) {
-    puppi::rollback { "${name}-Recover_Files_To_Deploy":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_gitdata != true) {
-    puppi::rollback { "${name}-Rollback_Files":
-      priority  => '40' ,
-      command   => 'git.sh' ,
-      arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${git_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_gitdata}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/maven.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/maven.pp
deleted file mode 100644
index a1979dae478..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/maven.pp
+++ /dev/null
@@ -1,814 +0,0 @@
-# = Define puppi::project::maven
-#
-# This is a shortcut define to build a puppi project for the
-# deploy of war and tar files generated via Maven and published on
-# a repository like Sonar.
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the maven-metadata.xml file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*http_password*]
-#   The http_password to use for authentication to the source in case of http.
-#
-# [*http_user*]
-#   The http_user to use for authentication to the source in case of http.
-#
-# [*artifact_type*]
-#   The artifact_type to parse the maven-metadata.xml. Either "release", "latest" or
-#   a specific version (e.g. "2.5.0")
-#   Default is "release". With artifactory, don't use the
-#   "Maven Snapshot Version Behavior" "unique" for your repository.
-#
-# [*deploy_root*]
-#   The destination directory where file(s) are deployed.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*war_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the war
-#
-# [*zip_root*]
-#   (Optional) - The destination directory where the zip is unpacked
-#
-# [*zip_user*]
-#   (Optional) - The user to be used for deploy operations of the zip
-#
-# [*zip_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the zip
-#
-# [*jar_root*]
-#   (Optional) - The destination directory where the jar is copied.
-#   If set a jar file is searched in Maven
-#
-# [*jar_user*]
-#   (Optional) - The user to be used for deploy operations of the jar
-#   (owner of the files deployed in $jar_root)
-#
-# [*jar_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the jar
-#
-# [*document_root*]
-#   (Optional) - The destination directory where the eventual tarball generated
-#   via Maven containing static files ("src tar") is unpacked
-#
-# [*document_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the
-#   static files tarballs ("src tar")
-#
-# [*document_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#    project files present in the source tarball. They are copied to the
-#    $document_root. Format should be in URI standard (http:// file:// ...)
-#
-# [*document_user*]
-#   (Optional) - The user to be used for deploy operations of the tarball
-#   (owner of the files in $document_root)
-#
-# [*config_root*]
-#   (Optional) - The destination directory where the cfg tar is unpacked
-#
-# [*config_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to
-#   configuration tarballs ("cfg tar")
-#
-# [*config_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#   project files present in the cfg tar. They are copied to the $config_root.
-#   Format should be in URI standard (http:// file:// ssh:// svn://)
-#
-# [*config_user*]
-#   (Optional) - The user to be used for deploy operations of cfg tar
-#   (owner of the files in $config_root)
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*report_mongo*]
-#   (Optional) - A mongourl with optional user:password to report to. Append the
-#   database with a slash ("mongodb://user:password@mymongo.mydomain.com/theNameOfDb")
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*check_deploy*]
-#   (Optional) - Checks if the war is deployed (Default yes). Set to no if
-#   you deploy on Jboss or the deployed dir is different for the war filename
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::maven (
-  $source,
-  $http_user                = '',
-  $http_password            = '',
-  $artifact_type            = 'release',
-  $deploy_root              = '',
-  $user                     = 'root',
-  $war_suffix               = 'suffixnotset',
-  $zip_root                 = '',
-  $zip_user                 = '',
-  $zip_suffix               = 'suffixnotset',
-  $jar_root                 = '',
-  $jar_user                 = '',
-  $jar_suffix               = 'suffixnotset',
-  $document_root            = '',
-  $document_user            = '',
-  $document_suffix          = 'suffixnotset',
-  $document_init_source     = '',
-  $config_root              = '',
-  $config_user              = '',
-  $config_suffix            = 'suffixnotset',
-  $config_init_source       = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $report_mongo             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $check_deploy             = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $config_real_user = $config_user ? {
-    ''      => $user,
-    default => $config_user,
-  }
-
-  $document_real_user = $document_user ? {
-    ''      => $user,
-    default => $document_user,
-  }
-
-  $jar_real_user = $jar_user ? {
-    ''      => $user,
-    default => $jar_user,
-  }
-
-  $zip_real_user = $zip_user ? {
-    ''      => $user,
-    default => $zip_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_check_deploy = any2bool($check_deploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($document_init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${document_init_source} -d ${deploy_root}" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_init_source != '') {
-    puppi::initialize { "${name}-Deploy_CFG_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${config_init_source} -d ${deploy_root}" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  $metadata_arguments = $http_password ? {
-    '' => "-s ${source}/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}",
-    default => "-s ${source}/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}"
-  }
-
-  puppi::deploy { "${name}-Get_Maven_Metadata_File":
-    priority  => '20' ,
-    command   => 'get_file.sh' ,
-    arguments => $metadata_arguments,
-    user      => 'root' ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  puppi::deploy { "${name}-Extract_Maven_Metadata":
-    priority  => '22' ,
-    command   => 'get_metadata.sh' ,
-    arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-    user      => 'root' ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  # Files retrieval
-  if ($deploy_root != '') {
-    $war_arguments = $http_password ? {
-      '' => "${source} warfile",
-      default => "-u ${http_user} -p ${http_password} ${source} warfile"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_WAR":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => $war_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_JAR":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} jarfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_Config":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} configfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_SRC":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} srcfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($zip_root != '') {
-    $real_arguments = $http_password ? {
-      ''      => "${source} zipfile",
-      default => "-u ${http_user} -p ${http_password} ${source} zipfile"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_ZIP":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments =>  $real_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '30' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Existing files backup
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_WAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -t war -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_JAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${jar_root} -t jar -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_ConfigDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${config_root} -t config -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_DocumentDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${document_root} -t docroot -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($zip_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_ZipDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${zip_root} -t ziproot -d predeploydir_zipfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) and ($deploy_root != '') {
-    puppi::deploy { "${name}-Check_undeploy":
-      priority  => '31' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root} -c deploy_warpath" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Deploys
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Deploy_Maven_WAR":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $deploy_root ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Deploy_Maven_JAR":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => $jar_root ,
-      user      => $jar_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Deploy_ConfigDir":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${config_root} predeploydir_configfile" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Deploy_DocumentDir":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${document_root} predeploydir_srcfile" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($zip_root != '') {
-    puppi::deploy { "${name}-Deploy_Zip":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${zip_root} predeploydir_zipfile" ,
-      user      => $zip_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) and ($deploy_root != '') {
-    puppi::deploy { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root} -c deploy_warpath" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($deploy_root != '') {
-    puppi::rollback { "${name}-Recover_WAR":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -t war -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::rollback { "${name}-Recover_JAR":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${jar_root} -t jar -o '${backup_rsync_options}'" ,
-      user      => $jar_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::rollback { "${name}-Recover_ConfigDir":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${config_root} -t config -o '${backup_rsync_options}'" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::rollback { "${name}-Recover_DocumentDir":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${document_root} -t docroot -o '${backup_rsync_options}'" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) {
-    puppi::rollback { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root} -c deploy_warpath" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($report_mongo != '') {
-    puppi::report { "${name}-Mongo_Store":
-      priority  => '30' ,
-      command   => 'report_mongo.sh' ,
-      arguments => $report_mongo ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/mysql.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/mysql.pp
deleted file mode 100644
index aa787d80ac3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/mysql.pp
+++ /dev/null
@@ -1,425 +0,0 @@
-# = Define puppi::project::mysql
-#
-# This is a shortcut define to build a puppi project for the
-# management of mysql queries, contained in the .sql file defined
-# as $source
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main sql file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*mysql_database*]
-#   (Required) - The Mysql database to work on
-#   Default: root
-#
-# [*mysql_user*]
-#   (Optional) - The Mysql user to be used to run the queries
-#   Default: root
-#
-# [*mysql_password*]
-#   (Optional) - The password to use for the specified mysql user
-#   Default: '' (blank)
-#
-# [*mysql_host*]
-#   (Optional) - The Mysql server. Use ip or hostname
-#   Default: localhost
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve a sql file to
-#   process only for the first time,
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup*]
-#   (Optional) - If and how backups of existing databases are made.
-#   Default: true
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::mysql (
-  $source,
-  $mysql_database,
-  $mysql_user               = 'root',
-  $mysql_host               = 'localhost',
-  $mysql_password           = '',
-  $init_source              = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup                   = true,
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => 'root',
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => 'root',
-    default => $postdeploy_user,
-  }
-
-  $init_real_source = $init_source ? {
-    ''      => $source,
-    default => $init_source,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_backup = any2bool($backup)
-  $real_source_type = 'mysql'
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $source_filename = url_parse($source,'filename')
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -t ${real_source_type}" ,
-      user      => root ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-    puppi::initialize { "${name}-Run_SQL":
-      priority  => '42' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a run -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::deploy { "${name}-Retrieve_SQLFile":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -t ${real_source_type} -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup == true) {
-    puppi::deploy { "${name}-Backup_Database":
-      priority  => '30' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a dump -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the db change
-    puppi::deploy { "${name}-Run_SQL":
-      priority  => '40' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a run -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup == true) {
-    puppi::rollback { "${name}-Backup_Database_PreRollback":
-      priority  => '30' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a dump -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup == true) {
-    puppi::rollback { "${name}-Recover_Database":
-      priority  => '40' ,
-      command   => 'database.sh' ,
-      arguments => "-t mysql -a restore -u ${mysql_user} -p '${mysql_password}' -d ${mysql_database} -h ${mysql_host}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/service.pp
deleted file mode 100644
index 62eb6c8b95a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/service.pp
+++ /dev/null
@@ -1,352 +0,0 @@
-# = Define puppi::project::service
-#
-# This is a shortcut define to build a case-limit puppi project
-# that just manages services and custom commands without deploying
-# any file. It doesn't require any parameter but you should at least
-# provide one among predeploy_customcommand, postdeploy_customcommand,
-# init_script, disable_services to make something useful.
-# The rollback option is kept for coherency with the standard puppi
-# deploy approach, but actually should not be used since there is no
-# data to rollback.
-#
-# == Variables:
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::service (
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/svn.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/svn.pp
deleted file mode 100644
index 0affd38de4f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/svn.pp
+++ /dev/null
@@ -1,438 +0,0 @@
-# == Define puppi::project::svn
-#
-# This is a shortcut define to build a puppi project for the deploy of
-# file from a svn repo.
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the svn repo to retrieve.
-#   Format should be in svn friendly standard (http:// svn:// ..).
-#
-# [*svn_user*]
-#   Name of the user to access a private svn repo. Optional.
-#
-# [*svn_password*]
-#   Name of the password to access a private svn repo. Optional.
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*install_svn*]
-#   If the svn package has to be installed. Default true.
-#   Set to false if you install svn via other modules and have resource
-#   conflicts.
-#
-# [*svn_subdir*]
-#   (Optional) - If you want to copy to the deploy_root only a subdir
-#   of the specified svn repo, specify here the path of the directory
-#   relative to the repo root. Default undefined
-#
-# [*svn_export*]
-#   (Optional) - If to use a svn export command instead of checkout
-#   Default: false (A checkout is done)
-#
-# [*tag*]
-#   (Optional) - A specific tag you may want to deploy. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "tag=release"
-#
-# [*branch*]
-#   (Optional) - A specific branch you may want to deploy. Default: master
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "branch=devel"
-#
-# [*commit*]
-#   (Optional) - A specific commit you may want to use. Default undefined
-#   You can override the default value via command-line with:
-#   puppi deploy myapp -o "commit=1061cb731bc75a1188b58b889b74ce1505ccb412"
-#
-# [*keep_svndata*]
-#   (Optional) - Define if you want to keep svn metadata directory (.svn)
-#   in the deploy root. According to this value backup and rollback
-#   operations change (with keep_svndata set to true no real backups are done
-#   and operations are made on the svn tree, if set to false, file are copied
-#   and the $backup_* options used. Default is true
-#
-# [*verbose*]
-#   (Optional) - If you want to see verbose svn utput (file names) during
-#   the deploy. Default is true.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#   If different from root (default) it must have write permissions on
-#   the $deploy_root dir.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#   This option is used when $keep_svnmeta is set to false
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#   This option is used when $keep_svnmeta is set to false
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::svn (
-  $source,
-  $deploy_root,
-  $install_svn              = true,
-  $svn_user                 = 'undefined',
-  $svn_password             = 'undefined',
-  $svn_subdir               = 'undefined',
-  $svn_export               = false,
-  $tag                      = 'undefined',
-  $branch                   = 'master',
-  $commit                   = 'undefined',
-  $keep_svndata             = true,
-  $verbose                  = true,
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $bool_install_svn = any2bool($install_svn)
-  $bool_svn_export = any2bool($svn_export)
-  $bool_keep_svndata = any2bool($keep_svndata)
-  $bool_verbose = any2bool($verbose)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### INSTALL GIT
-  if ($bool_install_svn == true) {
-    if ! defined(Package['subversion']) { package { 'subversion': ensure => installed } }
-  }
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_keep_svndata == true and $bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_data":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'svn.sh' ,
-      arguments => "-a deploy -s ${source} -d ${deploy_root} -u ${user} -gs ${svn_subdir} -su ${svn_user} -sp ${svn_password} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata} -e ${bool_svn_export}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-  if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_keep_svndata == true) {
-      puppi::rollback { "${name}-Recover_Files_To_Deploy":
-        priority  => '40' ,
-        command   => 'archive.sh' ,
-        arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_keep_svndata != true) {
-      puppi::rollback { "${name}-Rollback_Files":
-        priority  => '40' ,
-        command   => 'svn.sh' ,
-        arguments => "-a rollback -s ${source} -d ${deploy_root} -gs ${svn_subdir} -t ${tag} -b ${branch} -c ${commit} -v ${bool_verbose} -k ${bool_keep_svndata}" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/tar.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/tar.pp
deleted file mode 100644
index 3206864f1ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/tar.pp
+++ /dev/null
@@ -1,479 +0,0 @@
-# = Define puppi::project::tar
-#
-# This is a shortcut define to build a puppi project for the
-# deploy of a tar.gz file into a deploy root
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*clean_deploy*]
-#   (Optional, default false) - If during the deploy procedure, all the
-#   existing files that are not on the source have to be deleted.
-#   (When true, a --delete option is added to the rsync command)
-#   Do not set to true if source files are incremental.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::tar (
-  $source,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $clean_deploy             = false,
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $verify_ssl               = true,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $init_real_source = $init_source ? {
-    ''      => $source,
-    default => $init_source,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_clean_deploy = any2bool($clean_deploy)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  if ($verify_ssl) {
-    $ssl_arg = ''
-  }else{
-    $ssl_arg = '-k'
-  }
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "${ssl_arg} -s '${init_source}' -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here source file is retrieved
-    puppi::deploy { "${name}-Retrieve_TarBall":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "${ssl_arg} -s '${source}' -t tarball -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-PreDeploy_TarBall":
-      priority  => '25' ,
-      command   => 'predeploy_tar.sh' ,
-      arguments => 'downloadedfile' ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_Files":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'deploy_files.sh' ,
-      arguments => "-d ${deploy_root} -c ${bool_clean_deploy}",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_stop":
-        priority  => '38' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-      puppi::rollback { "${name}-Recover_Files_To_Deploy":
-        priority  => '40' ,
-        command   => 'archive.sh' ,
-        arguments => "-r ${deploy_root} -o '${backup_rsync_options}'" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_start":
-        priority  => '42' ,
-        command   => 'service.sh' ,
-        arguments => "start ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/war.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/war.pp
deleted file mode 100644
index f9ec025d078..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/war.pp
+++ /dev/null
@@ -1,525 +0,0 @@
-# == Define puppi::project::war
-#
-# This is a shortcut define to build a puppi project for the deploy of warfiles
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the main file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*deploy_root*]
-#   The destination directory where the retrieved file(s) are deployed.
-#
-# [*init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time,
-#   the project files. They are copied directly to the $deploy_root
-#   Format should be in URI standard (http:// file:// ssh:// svn://).
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*clean_deploy*]
-#   (Optional, default false) - If during the deploy procedure, all the
-#   existing files that are not on the source have to be deleted.
-#   (When true, a --delete option is added to the rsync command)
-#   Do not set to true if source files are incremental.
-#
-# [*backup_enable*]
-#   (Optional, default true) - If the backup of files in the deploy dir
-#   is done (before deploy). If set to false, rollback is disabled.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*check_deploy*]
-#   (Optional) - Checks if the war is deployed (Default yes). Set to no if
-#   you deploy on Jboss or the deployed dir is different for the war filename
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::war (
-  $source,
-  $deploy_root,
-  $init_source              = '',
-  $user                     = 'root',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $clean_deploy             = false,
-  $backup_enable            = true,
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $check_deploy             = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  # Unless explicitely defined, we assume that the WAR file to use
-  # for initialization is the same to use for deploys
-  $init_real_source = $init_source ? {
-    ''      => $source,
-    default => $init_source,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_clean_deploy = any2bool($clean_deploy)
-  $bool_backup_enable = any2bool($backup_enable)
-  $bool_check_deploy = any2bool($check_deploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-  $war_file = url_parse($source,'filename')
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${init_source} -d ${deploy_root}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here source file is retrieved
-    puppi::deploy { "${name}-Retrieve_WAR":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${source} -a ${real_always_deploy}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_backup_enable == true) {
-    puppi::deploy { "${name}-Backup_existing_WAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -t war -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-}
-
-  if ($bool_check_deploy == true) {
-    puppi::deploy { "${name}-Check_undeploy":
-      priority  => '32' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-a ${deploy_root}/${war_file}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy_WAR":
-      priority  => '40' ,
-      command   => 'deploy_files.sh' ,
-      arguments => "-d ${deploy_root} -c ${bool_clean_deploy}",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_check_deploy == true) {
-    puppi::deploy { "${name}-Check_deploy":
-      priority  => '45' ,
-      command   => 'checkwardir.sh' ,
-      arguments => "-p ${deploy_root}/${war_file}" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($bool_backup_enable == true) {
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Block":
-        priority  => '25' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-      puppi::rollback { "${name}-Remove_existing_WAR":
-        priority  => '30' ,
-        command   => 'delete.sh' ,
-        arguments => "${deploy_root}/${war_file}" ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-
-    if ($bool_check_deploy == true) {
-      puppi::rollback { "${name}-Check_undeploy":
-        priority  => '36' ,
-        command   => 'checkwardir.sh' ,
-        arguments => "-a ${deploy_root}/${war_file}" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Disable_extra_services":
-        priority  => '37' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_stop":
-        priority  => '38' ,
-        command   => 'service.sh' ,
-        arguments => "stop ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($predeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-        priority  => $predeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $predeploy_customcommand ,
-        user      => $predeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-      puppi::rollback { "${name}-Recover_Files_To_Deploy":
-        priority  => '40' ,
-        command   => 'archive.sh' ,
-        arguments => "-r ${deploy_root} -t war -o '${backup_rsync_options}'" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-
-    if ($postdeploy_customcommand != '') {
-      puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-        priority  => $postdeploy_priority ,
-        command   => 'execute.sh' ,
-        arguments => $postdeploy_customcommand ,
-        user      => $postdeploy_real_user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($init_script != '') {
-      puppi::rollback { "${name}-Service_start":
-        priority  => '42' ,
-        command   => 'service.sh' ,
-        arguments => "start ${init_script}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($disable_services != '') {
-      puppi::rollback { "${name}-Enable_extra_services":
-        priority  => '44' ,
-        command   => 'service.sh' ,
-        arguments => "start ${disable_services}" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_check_deploy == true) {
-      puppi::rollback { "${name}-Check_deploy":
-        priority  => '45' ,
-        command   => 'checkwardir.sh' ,
-        arguments => "-p ${deploy_root}/${war_file}" ,
-        user      => $user ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($firewall_src_ip != '') {
-      puppi::rollback { "${name}-Load_Balancer_Unblock":
-        priority  => '46' ,
-        command   => 'firewall.sh' ,
-        arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-        user      => 'root',
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-
-    if ($bool_run_checks == true) {
-      puppi::rollback { "${name}-Run_POST-Checks":
-        priority  => '80' ,
-        command   => 'check_project.sh' ,
-        arguments => $name ,
-        user      => 'root' ,
-        project   => $name ,
-        enable    => $enable ,
-      }
-    }
-  }
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp
deleted file mode 100644
index ec48cf419e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/y4maven.pp
+++ /dev/null
@@ -1,723 +0,0 @@
-# = Define puppi::project::y4maven
-#
-# This is a shortcut define to build a puppi project for the
-# deploying hybris-production-zips via Maven and published on
-# a repository like artifactory.
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*source*]
-#   The full URL of the maven-metadata.xml file to retrieve.
-#   Format should be in URI standard (http:// file:// ssh:// rsync://).
-#
-# [*http_password*]
-#   The http_password to use for authentication to the source in case of http.
-#
-# [*http_user*]
-#   The http_user to use for authentication to the source in case of http.
-#
-# [*artifact_type*]
-#   The artifact_type to parse the maven-metadata.xml. Either "release" or "latest"
-#   Default is "release". With artifactory, don't use the
-#   "Maven Snapshot Version Behavior" "unique" for your repository.
-#
-# [*deploy_root*]
-#   The destination directory where file(s) are deployed.
-#
-# [*user*]
-#   (Optional) - The user to be used for deploy operations.
-#
-# [*war_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the war
-#
-# [*zip_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the zip
-#
-# [*jar_root*]
-#   (Optional) - The destination directory where the jar is copied.
-#   If set a jar file is searched in Maven
-#
-# [*jar_user*]
-#   (Optional) - The user to be used for deploy operations of the jar
-#   (owner of the files deployed in $jar_root)
-#
-# [*jar_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the jar
-#
-# [*document_root*]
-#   (Optional) - The destination directory where the eventual tarball generated
-#   via Maven containing static files ("src tar") is unpacked
-#
-# [*document_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to the
-#   static files tarballs ("src tar")
-#
-# [*document_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#    project files present in the source tarball. They are copied to the
-#    $document_root. Format should be in URI standard (http:// file:// ...)
-#
-# [*document_user*]
-#   (Optional) - The user to be used for deploy operations of the tarball
-#   (owner of the files in $document_root)
-#
-# [*config_root*]
-#   (Optional) - The destination directory where the cfg tar is unpacked
-#
-# [*config_suffix*]
-#   (Optional) - The suffix (Maven qualifier) that might be appended to
-#   configuration tarballs ("cfg tar")
-#
-# [*config_init_source*]
-#   (Optional) - The full URL to be used to retrieve, for the first time, the
-#   project files present in the cfg tar. They are copied to the $config_root.
-#   Format should be in URI standard (http:// file:// ssh:// svn://)
-#
-# [*config_user*]
-#   (Optional) - The user to be used for deploy operations of cfg tar
-#   (owner of the files in $config_root)
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*init_script*]
-#   (Optional - Obsolete) - The name (ex: tomcat) of the init script of your
-#   Application server. If you define it, the AS is stopped and then started
-#   during deploy. This option is deprecated, you can use $disable_services
-#   for the same functionality
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*backup_rsync_options*]
-#   (Optional) - The extra options to pass to rsync for backup operations. Use
-#   it, for example, to exclude directories that you don't want to archive.
-#   IE: "--exclude .snapshot --exclude cache --exclude www/cache".
-#
-# [*backup_retention*]
-#   (Optional) - Number of backup archives to keep. (Default 5).
-#   Lower the default value if your backups are too large and may fill up the
-#   filesystem.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*check_deploy*]
-#   (Optional) - Checks if the war is deployed (Default yes). Set to no if
-#   you deploy on Jboss or the deployed dir is different for the war filename
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::y4maven (
-  $source,
-  $http_user                = '',
-  $http_password            = '',
-  $artifact_type            = 'release',
-  $deploy_root              = '',
-  $user                     = 'root',
-  $war_suffix               = 'suffixnotset',
-  $zip_suffix               = 'suffixnotset',
-  $jar_root                 = '',
-  $jar_user                 = '',
-  $jar_suffix               = 'suffixnotset',
-  $document_root            = '',
-  $document_user            = '',
-  $document_suffix          = 'suffixnotset',
-  $document_init_source     = '',
-  $config_root              = '',
-  $config_user              = '',
-  $config_suffix            = 'suffixnotset',
-  $config_init_source       = '',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $init_script              = '',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $backup_rsync_options     = '--exclude .snapshot',
-  $backup_retention         = '5',
-  $run_checks               = true,
-  $always_deploy            = true,
-  $check_deploy             = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => $user,
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => $user,
-    default => $postdeploy_user,
-  }
-
-  $config_real_user = $config_user ? {
-    ''      => $user,
-    default => $config_user,
-  }
-
-  $document_real_user = $document_user ? {
-    ''      => $user,
-    default => $document_user,
-  }
-
-  $jar_real_user = $jar_user ? {
-    ''      => $user,
-    default => $jar_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    false   => 'no',
-    true    => 'yes',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_check_deploy = any2bool($check_deploy)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-
-### INIT SEQUENCE
-  if ($document_init_source != '') {
-    puppi::initialize { "${name}-Deploy_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${document_init_source} -d ${deploy_root}" ,
-      user      => $document_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_init_source != '') {
-    puppi::initialize { "${name}-Deploy_CFG_Files":
-      priority  => '40' ,
-      command   => 'get_file.sh' ,
-      arguments => "-s ${config_init_source} -d ${deploy_root}" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # First: hybrisServer-Platform
-    $platform_metadata_arguments = $http_password ? {
-      '' => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}" ,
-      default => "-s ${source}/hybrisServer-Platform/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Metadata_hybrisServer-Platform_File":
-      priority  => '20' ,
-      command   => 'get_file.sh' ,
-      arguments => $platform_metadata_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Extract_Maven_Metadata_hybrisServer-Platform":
-      priority  => '21' ,
-      command   => 'get_metadata.sh' ,
-      arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  # Files retrieval
-  $platform_zipfile_arguments = $http_password ? {
-    ''      => "${source}/hybrisServer-Platform zipfile",
-    default => "-u ${http_user} -p ${http_password} ${source}/hybrisServer-Platform zipfile",
-  }
-
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Get_Maven_Files_ZIP_hybrisServer-Platform":
-      priority  => '22' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => $platform_zipfile_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Second: hybrisServer-AllExtensions
-    $extensions_metadata_arguments = $http_password ? {
-      ''      => "-s ${source}/hybrisServer-AllExtensions/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}",
-      default => "-s ${source}/hybrisServer-AllExtensions/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}",
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Metadata_hybrisServer-AllExtensions_File":
-      priority  => '23' ,
-      command   => 'get_file.sh' ,
-      arguments => $extensions_metadata_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Extract_Maven_Metadata_hybrisServer-AllExtensions":
-      priority  => '24' ,
-      command   => 'get_metadata.sh' ,
-      arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  # Files retrieval
-  if ($deploy_root != '') {
-    $extensions_zipfile_arguments = $http_password ? {
-      ''      => "${source}/hybrisServer-AllExtensions zipfile",
-      default => "-u ${http_user} -p ${http_password} ${source}/hybrisServer-AllExtensions zipfile",
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_ZIP_hybrisServer-AllExtensions":
-      priority  => '25' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => $extensions_zipfile_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-  if ($config_root != '') {
-    # Third: config-tarball (optional, right now not supported)
-    $config_metadata_arguments = $http_password ? {
-      ''      => "-s ${source}/config/maven-metadata.xml -t maven-metadata -a ${real_always_deploy}",
-      default => "-s ${source}/config/maven-metadata.xml -t maven-metadata -a ${real_always_deploy} -u ${http_user} -p ${http_password}"
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Metadata_config-tarball_File":
-      priority  => '26' ,
-      command   => 'get_file.sh' ,
-      arguments => $config_metadata_arguments,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Extract_Maven_Metadata_config-tarball":
-      priority  => '27' ,
-      command   => 'get_metadata.sh' ,
-      arguments => "-m ${document_suffix} -mc ${config_suffix} -mj ${jar_suffix} -mw ${war_suffix} -mz ${zip_suffix} -at ${artifact_type}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-    puppi::deploy { "${name}-Get_Maven_Files_Config":
-      priority  => '28' ,
-      command   => 'get_maven_files.sh' ,
-      arguments => "${source} configfile" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '30' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Existing files backup
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_WAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${deploy_root} -t war -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($jar_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_JAR":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${jar_root} -t jar -s move -m diff -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_ConfigDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${config_root} -t config -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($document_root != '') {
-    puppi::deploy { "${name}-Backup_Existing_DocumentDir":
-      priority  => '30' ,
-      command   => 'archive.sh' ,
-      arguments => "-b ${document_root} -t docroot -d predeploydir_configfile -o '${backup_rsync_options}' -n ${backup_retention}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  # Deploys
-  if ($deploy_root != '') {
-    puppi::deploy { "${name}-Deploy_Maven_ZIP":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${deploy_root} predeploydir_zipfile ",
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::deploy { "${name}-Deploy_ConfigDir":
-      priority  => '40' ,
-      command   => 'deploy.sh' ,
-      arguments => "${config_root} predeploydir_configfile" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  puppi::deploy { "${name}-yant":
-    priority  => '42' ,
-    command   => 'yant.sh' ,
-    arguments => "${deploy_root} clean all" ,
-    user      => $user ,
-    project   => $name ,
-    enable    => $enable ,
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::deploy { "${name}-Service_start":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '45' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '47' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_stop":
-      priority  => '38' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($deploy_root != '') {
-    puppi::rollback { "${name}-Recover_ZIP":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${deploy_root} -t zip -o '${backup_rsync_options}'" ,
-      user      => $user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($config_root != '') {
-    puppi::rollback { "${name}-Recover_ConfigDir":
-      priority  => '40' ,
-      command   => 'archive.sh' ,
-      arguments => "-r ${config_root} -t config -o '${backup_rsync_options}'" ,
-      user      => $config_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($init_script != '') {
-    puppi::rollback { "${name}-Service_start":
-      priority  => '42' ,
-      command   => 'service.sh' ,
-      arguments => "start ${init_script}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/yum.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/yum.pp
deleted file mode 100644
index 5379ebeea5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/project/yum.pp
+++ /dev/null
@@ -1,347 +0,0 @@
-# = Define puppi::project::yum
-#
-# This is a shortcut define to build a puppi project for the
-# deploy of applications packaged as rpm and retrievable via yum
-#
-# It uses different "core" defines (puppi::project, puppi:deploy (many),
-# puppi::rollback (many)) to build a full featured template project for
-# automatic deployments.
-# If you need to customize it, either change the template defined here or
-# build up your own custom ones.
-#
-# == Variables:
-#
-# [*rpm*]
-#   The name of the rpm to install
-#
-# [*rpm_version*]
-#   (Optional) - The version to install (default: latest)
-#
-# [*install_root*]
-#   (Optional) - The rpm installation root (default: / )
-#
-# [*predeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute before the deploy. The command is executed as $predeploy_user.
-#
-# [*predeploy_user*]
-#   (Optional) - The user to be used to execute the $predeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*predeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $predeploy_customcommand is executed
-#   Default: 39 (immediately before the copy of files on the deploy root).
-#
-# [*postdeploy_customcommand*]
-#   (Optional) -  Full path with arguments of an eventual custom command to
-#   execute after the deploy. The command is executed as $postdeploy_user.
-#
-# [*postdeploy_user*]
-#   (Optional) - The user to be used to execute the $postdeploy_customcommand.
-#   By default is the same of $user.
-#
-# [*postdeploy_priority*]
-#   (Optional) - The priority (execution sequence number) that defines when,
-#   during the deploy procedure, the $postdeploy_customcommand is executed
-#   Default: 41 (immediately after the copy of files on the deploy root).
-#
-# [*disable_services*]
-#   (Optional) - The names (space separated) of the services you might want to
-#   stop during deploy. By default is blank. Example: "apache puppet monit".
-#
-# [*firewall_src_ip*]
-#   (Optional) - The IP address of a loadbalancer you might want to block out
-#   during a deploy.
-#
-# [*firewall_dst_port*]
-#   (Optional) - The local port to block from the loadbalancer during deploy
-#   (Default all).
-#
-# [*firewall_delay*]
-#   (Optional) - A delay time in seconds to wait after the block of
-#   $firewall_src_ip. Should be at least as long as the loadbalancer check
-#   interval for the services stopped during deploy (Default: 1).
-#
-# [*report_email*]
-#   (Optional) - The (space separated) email(s) to notify of deploy/rollback
-#   operations. If none is specified, no email is sent.
-#
-# [*run_checks*]
-#   (Optional) - If you want to run local puppi checks before and after the
-#   deploy procedure. Default: "true".
-#
-# [*checks_required*]
-#   (Optional) - Set to "true" if you want to block the installation if
-#   preliminary checks fail. Default: "false"
-#
-# [*always_deploy*]
-#   (Optional) - If you always deploy what has been downloaded. Default="yes",
-#   if set to "no" a checksum is made between the files previously downloaded
-#   and the new files. If they are the same the deploy is not done.
-#
-# [*auto_deploy*]
-#   (Optional) - If you want to automatically run this puppi deploy when
-#   Puppet runs. Default: 'false'
-#
-define puppi::project::yum (
-  $rpm,
-  $rpm_version              = 'latest',
-  $install_root             = '/',
-  $predeploy_customcommand  = '',
-  $predeploy_user           = '',
-  $predeploy_priority       = '39',
-  $postdeploy_customcommand = '',
-  $postdeploy_user          = '',
-  $postdeploy_priority      = '41',
-  $disable_services         = '',
-  $firewall_src_ip          = '',
-  $firewall_dst_port        = '0',
-  $firewall_delay           = '1',
-  $report_email             = '',
-  $run_checks               = true,
-  $checks_required          = false,
-  $always_deploy            = true,
-  $auto_deploy              = false,
-  $enable                   = true ) {
-
-  require puppi
-  require puppi::params
-
-  # Set default values
-  $predeploy_real_user = $predeploy_user ? {
-    ''      => 'root',
-    default => $predeploy_user,
-  }
-
-  $postdeploy_real_user = $postdeploy_user ? {
-    ''      => 'root',
-    default => $postdeploy_user,
-  }
-
-  $real_always_deploy = any2bool($always_deploy) ? {
-    true    => 'yes',
-    default => 'no',
-  }
-
-  $real_checks_required = any2bool($checks_required) ? {
-    true    => 'yes',
-    default => 'no',
-  }
-
-  $bool_run_checks = any2bool($run_checks)
-  $bool_auto_deploy = any2bool($auto_deploy)
-
-### CREATE PROJECT
-    puppi::project { $name:
-      enable => $enable ,
-    }
-
-### DEPLOY SEQUENCE
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_PRE-Checks":
-      priority  => '10' ,
-      command   => 'check_project.sh' ,
-      arguments => "${name} ${real_checks_required}",
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Disable_extra_services":
-      priority  => '36' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    # Here is done the deploy on $deploy_root
-    puppi::deploy { "${name}-Deploy":
-      priority  => '40' ,
-      command   => 'yum.sh' ,
-      arguments => "-a deploy -n ${rpm} -r ${install_root} -v ${rpm_version}" ,
-      user      => root ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::deploy { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::deploy { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::deploy { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::deploy { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### ROLLBACK PROCEDURE
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Block":
-      priority  => '25' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} on ${firewall_delay}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Disable_extra_services":
-      priority  => '37' ,
-      command   => 'service.sh' ,
-      arguments => "stop ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($predeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PreDeploy_Script":
-      priority  => $predeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $predeploy_customcommand ,
-      user      => $predeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-    puppi::rollback { "${name}-Rollback":
-      priority  => '40' ,
-      command   => 'yum.sh' ,
-      arguments => "-a rollback -n ${rpm} -r ${install_root} -v ${rpm_version}" ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-
-  if ($postdeploy_customcommand != '') {
-    puppi::rollback { "${name}-Run_Custom_PostDeploy_Script":
-      priority  => $postdeploy_priority ,
-      command   => 'execute.sh' ,
-      arguments => $postdeploy_customcommand ,
-      user      => $postdeploy_real_user ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($disable_services != '') {
-    puppi::rollback { "${name}-Enable_extra_services":
-      priority  => '44' ,
-      command   => 'service.sh' ,
-      arguments => "start ${disable_services}" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($firewall_src_ip != '') {
-    puppi::rollback { "${name}-Load_Balancer_Unblock":
-      priority  => '46' ,
-      command   => 'firewall.sh' ,
-      arguments => "${firewall_src_ip} ${firewall_dst_port} off 0" ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-  if ($bool_run_checks == true) {
-    puppi::rollback { "${name}-Run_POST-Checks":
-      priority  => '80' ,
-      command   => 'check_project.sh' ,
-      arguments => $name ,
-      user      => 'root' ,
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-
-### REPORTING
-
-  if ($report_email != '') {
-    puppi::report { "${name}-Mail_Notification":
-      priority  => '20' ,
-      command   => 'report_mail.sh' ,
-      arguments => $report_email ,
-      user      => 'root',
-      project   => $name ,
-      enable    => $enable ,
-    }
-  }
-
-### AUTO DEPLOY DURING PUPPET RUN
-  if ($bool_auto_deploy == true) {
-    puppi::run { $name: }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/report.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/report.pp
deleted file mode 100644
index 4f8651e93ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/report.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Define puppi::report
-#
-# This define creates a file with a report command that can be used locally.
-#
-# Usage:
-# puppi::report { "Retrieve files":
-#   command  => "report_mail.sh",
-#   argument => "roots@example42.com",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-define puppi::report (
-  $project,
-  $command,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi::params
-
-  # Autoinclude the puppi class
-  include puppi
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/report/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_report',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/rollback.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/rollback.pp
deleted file mode 100644
index b09692df632..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/rollback.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# Define puppi::rollback
-#
-# This define creates a file with a rollback command that can be used locally.
-#
-# Usage:
-# puppi::rollback { "Retrieve files":
-#   command  => "get_file.sh",
-#   argument => "/remote/dir/file",
-#   priority => "10",
-#   user   => "root",
-#   project  => "spysite",
-# }
-#
-define puppi::rollback (
-  $project,
-  $command,
-  $arguments = '',
-  $priority  = '50',
-  $user      = 'root',
-  $enable    = true ) {
-
-  require puppi
-  require puppi::params
-
-  $ensure = bool2ensure($enable)
-
-  file { "${puppi::params::projectsdir}/${project}/rollback/${priority}-${name}":
-    ensure  => $ensure,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => "su - ${user} -c \"export project=${project} && ${puppi::params::scriptsdir}/${command} ${arguments}\"\n",
-    tag     => 'puppi_rollback',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/run.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/run.pp
deleted file mode 100644
index 01556d663fe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/run.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Define puppi::run
-#
-# This define triggers a puppi deploy run directly during Puppet
-# execution. It can be used to automate FIRST TIME applications
-# deployments directly during the first Puppet execution
-#
-# == Variables
-#
-# [*name*]
-#   The title/name you use has to be the name of an existing puppi::project
-#   procedure define
-#
-# == Usage
-# Basic Usage:
-# puppi::run { "myapp": }
-#
-define puppi::run (
-  $project = '',
-  $timeout = 300) {
-
-  require puppi
-
-  exec { "Run_Puppi_${name}":
-    command => "puppi deploy ${name}; [ $? -le \"1\" ] && touch ${puppi::params::archivedir}/puppirun_${name}",
-    path    => '/bin:/sbin:/usr/sbin:/usr/bin',
-    creates => "${puppi::params::archivedir}/puppirun_${name}",
-    timeout => $timeout,
-    # require => File[ tag == 'puppi_deploy' ],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/runscript.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/runscript.pp
deleted file mode 100644
index 01aa36c20e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/runscript.pp
+++ /dev/null
@@ -1,154 +0,0 @@
-# = Define: puppi::runscript
-#
-# This define creates, executes and optionally crontabs a
-# simple whose content is directly managed by arguments.
-# The script content is provided either with $source or $content arguments.
-# It's placed in:
-# $destination_path , if provided, or in /usr/local/sbin/${name}
-#
-# Cron execution times are defined by the $cron argument (Default empty).
-# Automatic execution of the script via Puppet is managed by the $autorun
-# parameter (default: true).
-# Conditional execution of the script at subsequent puppet runs is
-# defined by the $refreshonly, $creates, $unless $onlyif parameters
-# that map the omonimous exec type arguments.
-#
-# == Parameters:
-#
-# [*source*]
-#   String. Optional. Default: undef. Alternative to content.
-#   Source of the script file to provide for execuution.
-#   Sample: source => 'puppet:///modules/site/scripts/my_script',
-#
-# [*content*]
-#   String. Optional. Default: undef. Alternative to source.
-#   Content of the script file to provide for execuution.
-#   This parameter is alternative to source.
-#   Sample: content => 'template(site/scripts/my_script.erb'),
-#
-# [*destination_path*]
-#   String. Optional. Default: ''
-#   Path of the provided script. If not provided the script in saved in
-#   /usr/local/sbin/${name}
-#
-# [*parameters*]
-#   String. Optional. Default: ''
-#   Optional parameters to pass to the script when executing it.
-#
-# [*autorun*]
-#   Boolean. Default: true.
-#   Define if to automatically execute the script when Puppet runs.
-#
-# [*refreshonly*]
-#   Boolen. Optional. Default: true
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*creates*]
-#   String. Optional. Default: undef
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*onlyif*]
-#   String. Optional. Default: undef
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*unless*]
-#   String. Optional. Default: undef
-#   Defines the logic of execution of the script when Puppet runs.
-#   Maps to the omonymous Exec type argument.
-#
-# [*basedir*]
-#   String. Optional. Default: /usr/local/sbin
-#   Directory where the runscript scripts are created when destination_path
-#   is empty.
-#
-# [*cron*]
-#   String. Optional. Default: ''
-#   Optional cron schedule to crontab the execution of the
-#   script. Format must be in standard cron style.
-#   Example: '0 4 * * *' .
-#   By default no cron is scheduled.
-#
-# [*cron_user*]
-#   String. Optional. Default: 'root'
-#   When cron is enabled the user that executes the cron job.
-#
-# [*owner*]
-#   Owner of the created script. Default: root.
-#
-# [*group*]
-#   Group of the created script. Default: root.
-#
-# [*mode*]
-#   Mode of the created script. Default: '7550'.
-#   NOTE: Keep the execution flag!
-#
-# [*ensure*]
-#   Define if the runscript script and eventual cron job
-#   must be present or absent. Default: present.
-#
-# == Examples
-#
-# - Minimal setup
-# puppi::runscript { 'my_script':
-#   source           => 'puppet:///modules/site/scripts/my_script.sh',
-#   destination_path => '/usr/local/bin/my_script.sh',
-# }
-#
-define puppi::runscript (
-  $source           = undef,
-  $content          = undef,
-  $destination_path = '',
-  $parameters       = '',
-  $autorun          = true,
-  $refreshonly      = true,
-  $creates          = undef,
-  $onlyif           = undef,
-  $unless           = undef,
-  $basedir          = '/usr/local/sbin',
-  $cron             = '',
-  $cron_user        = 'root',
-  $owner            = 'root',
-  $group            = 'root',
-  $mode             = '0755',
-  $ensure           = 'present' ) {
-
-  $real_command = $destination_path ? {
-    ''      => "${basedir}/${name}",
-    default => $destination_path,
-  }
-
-  file { "runscript_${name}":
-    ensure  => $ensure,
-    path    => $real_command,
-    mode    => $mode,
-    owner   => $owner,
-    group   => $group,
-    content => $content,
-    source  => $source,
-  }
-
-  if $autorun == true {
-    exec { "runscript_${name}":
-      command     => $real_command,
-      refreshonly => $refreshonly,
-      creates     => $creates,
-      onlyif      => $onlyif,
-      unless      => $unless,
-      subscribe   => File["runscript_${name}"],
-    }
-  }
-
-  if $cron != '' {
-    file { "runscript_cron_${name}":
-      ensure  => $ensure,
-      path    => "/etc/cron.d/runscript_${name}",
-      mode    => '0644',
-      owner   => 'root',
-      group   => 'root',
-      content => "${cron} ${cron_user} ${real_command} ${parameters}\n",
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/skel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/skel.pp
deleted file mode 100644
index 6be5cc94ffa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/skel.pp
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# Class puppi::skel
-#
-# Creates the base Puppi dirs
-#
-class puppi::skel {
-
-  require puppi::params
-
-  file { 'puppi_basedir':
-    ensure  => directory,
-    path    => $puppi::params::basedir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-  }
-
-  file { 'puppi_checksdir':
-    ensure  => directory,
-    path    => $puppi::params::checksdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_logsdir':
-    ensure  => directory,
-    path    => $puppi::params::logsdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_helpersdir':
-    ensure  => directory,
-    path    => $puppi::params::helpersdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  file { 'puppi_infodir':
-    ensure  => directory,
-    path    => $puppi::params::infodir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_tododir':
-    ensure  => directory,
-    path    => $puppi::params::tododir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_projectsdir':
-    ensure  => directory,
-    path    => $puppi::params::projectsdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_datadir':
-    ensure  => directory,
-    path    => $puppi::params::datadir,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-    recurse => true,
-    purge   => true,
-    force   => true,
-  }
-
-  file { 'puppi_workdir':
-    ensure  => directory,
-    path    => $puppi::params::workdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  file { 'puppi_archivedir':
-    ensure  => directory,
-    path    => $puppi::params::archivedir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_libdir'],
-  }
-
-  file { 'puppi_readmedir':
-    ensure  => directory,
-    path    => $puppi::params::readmedir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_libdir'],
-  }
-
-  file { 'puppi_libdir':
-    ensure  => directory,
-    path    => $puppi::params::libdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  file { 'puppi_logdir':
-    ensure  => directory,
-    path    => $puppi::params::logdir,
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => File['puppi_basedir'],
-  }
-
-  # MailPuppiCheck script
-  file { '/usr/bin/mailpuppicheck':
-    ensure  => 'present',
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    source  => 'puppet:///modules/puppi/mailpuppicheck',
-  }
-
-  # Puppi common scripts
-  file { 'puppi.scripts':
-    ensure  => present,
-    path    => "${puppi::params::scriptsdir}/",
-    mode    => '0755',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    source  => 'puppet:///modules/puppi/scripts/',
-    recurse => true,
-#   purge   => true,
-    ignore  => '.svn',
-  }
-
-  # Logs cleanup script
-  if $::kernel == 'Linux' {
-    if $puppi::logs_retention_days
-    and $puppi::logs_retention_days != '0' {
-      $purge_cron_ensure = 'present'
-    } else {
-      $purge_cron_ensure = 'absent'
-    }
-
-    file { 'puppi_cron_logs_purge':
-      ensure  => $purge_cron_ensure,
-      path    => '/etc/cron.daily/puppi_clean',
-      mode    => '0755',
-      owner   => 'root',
-      group   => 'root',
-      content => template('puppi/puppi_clean.erb'),
-    }
-  } 
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/todo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/todo.pp
deleted file mode 100644
index 6fff3805b78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/todo.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-# Define puppi::todo
-#
-# This define creates a basic todo file that simply contains informations
-# on how to complete tasks that for time or other reasons could not be
-# entirely automated by Puppet.
-# The basic idea is to have a quick way to document and check if are completed
-# some specific operations that are required to bring a new, puppettized system
-# to full operative status.
-# This can be useful for cases hard to automate with Puppet:
-# - First setup and import of a database needed by an application (module)
-# - Installation of a legacy application that involves user interaction
-# - Run of any kind of setup/configuration/init command that can't be automated
-# It can also be used as a quick reminder on things done by hand and not
-# Puppettized for lack of time or skill.
-#
-# Use the command puppi todo to show the todo present in your node.
-# The exit status can be:
-# 0 - OK - The task to do has been accomplished because the command specified
-#    as check_command returns true (exit status 0)
-# 1- WARNING - User hasn't specified a check_command to verify if the todo as
-#    been accomplished, so it can't be notified if the todo has been done
-# 2- ERROR - The task to do has not been accomplished becuase the command
-#    specified as check_command returns an error (exit status different from 0)
-#
-# == Usage:
-# puppi::todo { "cacti_db_install":
-#   description => "Manual cacti db installation" ,
-# }
-#
-define puppi::todo (
-  $description   = '',
-  $notes         = '',
-  $check_command = '',
-  $run           = '' ) {
-
-  require puppi
-  require puppi::params
-
-  $array_run = is_array($run) ? {
-    false     => $run ? {
-      ''      => [],
-      default => split($run, ','),
-    },
-    default   => $run,
-  }
-
-  file { "${puppi::params::tododir}/${name}":
-    ensure  => present,
-    mode    => '0750',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    require => Class['puppi'],
-    content => template('puppi/todo.erb'),
-    tag     => 'puppi_todo',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/two.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/two.pp
deleted file mode 100644
index 1bbe5fca4a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/two.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Class: puppi::two
-#
-# Installs Puppi NextGen
-#
-class puppi::two {
-
-  # The Puppi command
-  package { 'puppi':
-    ensure   => present,
-    provider => 'gem',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/ze.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/ze.pp
deleted file mode 100644
index 5f62e1d738c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/manifests/ze.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Define puppi::ze
-#
-# The Puppi 2.0 define that transforms any class variable in data
-# you can use with Puppi
-#
-# == Usage
-# Basic Usage:
-# puppi::ze { "openssh":
-#   variables => get_class_args(),
-# }
-#
-# puppi::ze { "openssh":
-#   variables => get_class_args(),
-#   filter    => '.*content.*|.*key.*',
-# }
-#
-define puppi::ze (
-  $variables,
-  $helper = 'standard',
-  $filter = '.*content.*|.*password.*',
-  $ensure = 'present' ) {
-
-  require puppi
-  require puppi::params
-
-  file { "puppize_${name}":
-    ensure  => $ensure,
-    path    => "${puppi::params::datadir}/${helper}_${name}.yml",
-    mode    => '0644',
-    owner   => $puppi::params::configfile_owner,
-    group   => $puppi::params::configfile_group,
-    content => inline_template("---\n<%= Hash[@variables].reject{ |k,v| k.to_s =~ /(${filter})/ }.keys.sort.map{|k| Array({k => @variables[k]}.to_yaml)[1..-1].join}.join(\"\n\") %>\n"),
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb
deleted file mode 100644
index f6c072f9f2b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/classes/puppi_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi' do
-
-  let(:node) { 'rspec.example42.com' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :ipaddress => '10.42.42.42' } }
-
-  describe 'Test standard installation' do
-    it { should contain_file('puppi').with_ensure('present') }
-    it { should contain_file('puppi.conf').with_ensure('present') }
-    it { should contain_file('puppi.scripts').with_ensure('present') }
-    it { should contain_file('puppi_basedir').with_ensure('directory') }
-    it { should contain_file('puppi_datadir').with_ensure('directory') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb
deleted file mode 100644
index ba050bb79eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_check_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::check' do
-
-  let(:title) { 'puppi::check' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :arch => 'i386' } }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi check step file creation' do
-    it 'should create a puppi::check step file' do
-      should contain_file('Puppi_check_myapp_50_get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::check step file' do
-      should contain_file('Puppi_check_myapp_50_get').with_content(/\/usr\/lib\/nagios\/plugins\/echo/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb
deleted file mode 100644
index a1969bae76f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_deploy_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::deploy' do
-
-  let(:title) { 'puppi::deploy' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi deploy step file creation' do
-    it 'should create a puppi::deploy step file' do
-      should contain_file('/etc/puppi/projects/myapp/deploy/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::deploy step file' do
-      should contain_file('/etc/puppi/projects/myapp/deploy/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb
deleted file mode 100644
index 8e5ae9bcc6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_helper_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::helper' do
-
-  let(:title) { 'spec' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'template'   => 'puppi/helpers/standard.yml.erb'  }
-  }
-
-  describe 'Test puppi helper file creation' do
-    it 'should create a puppi helper file' do
-      should contain_file('puppi_helper_spec').with_ensure('present')
-    end
-    it 'should populate correctly the helper file' do
-      should contain_file('puppi_helper_spec').with_content(/info/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb
deleted file mode 100644
index 7dcc99fe939..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_info_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::info' do
-
-  let(:title) { 'puppi::info' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'name'         =>  'sample',
-      'description'  =>  'Sample Info',
-      'templatefile' =>  'puppi/info.erb',
-      'run'          =>  'myownscript',
-    }
-  }
-
-  describe 'Test puppi info step file creation' do
-    it 'should create a puppi::info step file' do
-      should contain_file('/etc/puppi/info/sample').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::info step file' do
-      should contain_file('/etc/puppi/info/sample').with_content(/myownscript/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb
deleted file mode 100644
index 158a6005724..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_initialize_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::initialize' do
-
-  let(:title) { 'puppi::initialize' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi initialize step file creation' do
-    it 'should create a puppi::initialize step file' do
-      should contain_file('/etc/puppi/projects/myapp/initialize/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::initialize step file' do
-      should contain_file('/etc/puppi/projects/myapp/initialize/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb
deleted file mode 100644
index 7fd8e9119bb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_log_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::log' do
-
-  let(:title) { 'mylog' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'log'         =>  '/var/log/mylog.log',
-      'description' =>  'My Log',
-    }
-  }
-
-  describe 'Test puppi log file creation' do
-    it 'should create a puppi::log file' do
-      should contain_file('/etc/puppi/logs/mylog').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::log step file' do
-      should contain_file('/etc/puppi/logs/mylog').with_content(/mylog.log/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb
deleted file mode 100644
index fbbf8ba7094..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_project_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::report' do
-
-  let(:title) { 'puppi::report' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi report step file creation' do
-    it 'should create a puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb
deleted file mode 100644
index fbbf8ba7094..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_report_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::report' do
-
-  let(:title) { 'puppi::report' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi report step file creation' do
-    it 'should create a puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::report step file' do
-      should contain_file('/etc/puppi/projects/myapp/report/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb
deleted file mode 100644
index 2d4cbe5b51c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_rollback_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::rollback' do
-
-  let(:title) { 'puppi::rollback' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'enable'   =>  'true',
-      'name'     =>  'get',
-      'command'  =>  'echo',
-      'priority' =>  '50',
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi rollback step file creation' do
-    it 'should create a puppi::rollback step file' do
-      should contain_file('/etc/puppi/projects/myapp/rollback/50-get').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::rollback step file' do
-      should contain_file('/etc/puppi/projects/myapp/rollback/50-get').with_content("su - root -c \"export project=myapp && /etc/puppi/scripts/echo \"\n")
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb
deleted file mode 100644
index 692711c5837..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_run_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::run' do
-
-  let(:title) { 'myapp' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 
-      'project'  =>  'myapp',
-    }
-  }
-
-  describe 'Test puppi run exe creation' do
-    it { should contain_exec('Run_Puppi_myapp').with_command(/puppi deploy myapp/) }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb
deleted file mode 100644
index 483852202d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_todo_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::todo' do
-
-  let(:title) { 'mytodo' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'notes'         =>  'Test Notes',
-      'description'   =>  'Test Description',
-      'check_command' =>  'check_test',
-      'run'           =>  'test',
-    }
-  }
-
-  describe 'Test puppi todo file creation' do
-    it 'should create a puppi::todo file' do
-      should contain_file('/etc/puppi/todo/mytodo').with_ensure('present')
-    end
-    it 'should populate correctly the puppi::todo step file' do
-      should contain_file('/etc/puppi/todo/mytodo').with_content(/check_test/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb
deleted file mode 100644
index 17913686913..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/defines/puppi_ze_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'puppi::ze' do
-
-  let(:title) { 'sample' }
-  let(:node) { 'rspec.example42.com' }
-  let(:params) {
-    { 'helper'     => 'mytest',
-      'variables'  => { 'var1' => 'get', 'var2' => 'got' },
-      'name'       => 'sample',
-    }
-  }
-
-  describe 'Test puppi ze data file creation' do
-    it 'should create a puppi::ze step file' do
-      should contain_file('puppize_sample').with_ensure('present')
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb
deleted file mode 100644
index bc9a5ee9459..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/any2bool_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'any2bool' do
-
-  describe 'Test Any2True' do
-    it { should run.with_params(true).and_return(true) }
-    it { should run.with_params('true').and_return(true) }
-    it { should run.with_params('yes').and_return(true) }
-    it { should run.with_params('y').and_return(true) }
-  end
-
-  describe 'Test Any2false' do
-    it { should run.with_params(false).and_return(false) }
-    it { should run.with_params('false').and_return(false) }
-    it { should run.with_params('no').and_return(false) }
-    it { should run.with_params('n').and_return(false) }
-  end
-
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb
deleted file mode 100644
index 967d36c3b55..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/bool2ensure_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'bool2ensure' do
-
-  describe 'Test true2present' do
-    it { should run.with_params(true).and_return('present') }
-    it { should run.with_params('true').and_return('present') }
-    it { should run.with_params('yes').and_return('present') }
-    it { should run.with_params('y').and_return('present') }
-  end
-
-  describe 'Test false2absent' do
-    it { should run.with_params(false).and_return('absent') }
-    it { should run.with_params('false').and_return('absent') }
-    it { should run.with_params('no').and_return('absent') }
-    it { should run.with_params('n').and_return('absent') }
-  end
-
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb
deleted file mode 100644
index 3388e9ae9c0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/functions/url_parse_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'url_parse' do
-
-  describe 'Test Url Components parsing' do
-    it 'should return correct scheme' do
-      should run.with_params('ftp://www.example.com/test','scheme').and_return('ftp') 
-    end
-    it 'should return correct userinfo' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','userinfo').and_return('my_user:my_pass') 
-    end
-    it 'should return correct user' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','user').and_return('my_user') 
-    end
-    it 'should return correct password' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','password').and_return('my_pass') 
-    end
-    it 'should return correct host' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','host').and_return('www.example.com') 
-    end
-    it 'should return correct port' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','port').and_return(8080) 
-    end
-    it 'should return correct path' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','path').and_return('/path/to/file.php') 
-    end
-    it 'should return correct query' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','query').and_return('id=1&ret=0') 
-    end
-    it 'should return correct filename' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','filename').and_return('file.php') 
-    end
-    it 'should return correct filetype' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','filetype').and_return('.php') 
-    end
-    it 'should return correct filedir' do
-      should run.with_params('https://my_user:my_pass@www.example.com:8080/path/to/file.php?id=1&ret=0','filedir').and_return('file') 
-    end
-
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb
deleted file mode 100644
index 5b090700a19..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/helpers/standard.yml.erb
+++ /dev/null
@@ -1,49 +0,0 @@
----
-:info:
-  -
-    :command: "<%= scope.lookupvar('puppi::params::info_package_query') %> %{package}"
-    :description: "Package info"
-  -
-    :command: "<%= scope.lookupvar('puppi::params::info_package_list') %> %{package} | egrep '(/bin|^/etc|/sbin|log$)'"
-    :description: "Interesting files from package"
-  -
-    :command: "head %{config_file}"
-    :description: "Main configuration file"
-  -
-    :command: "ls -latr %{config_dir}"
-    :description: "Configuration directory"
-  -
-    :command: "ls -latr %{data_dir}"
-    :description: "Data directory"
-  -
-    :command: "ls -latr %{log_dir}"
-    :description: "Logs directory"
-  -
-    :command: "tail %{log_file}"
-    :description: "Latest log entries"
-  -
-    :command: "service %{service status}"
-    :description: "Service status"
-  -
-    :command: "ps -adef | grep %{process} | grep -v grep | head -20"
-    :description: "Running process"
-  -
-    :command: "netstat -natup | grep %{port} | head -20"
-    :description: "Network connections"
-
-:check:
-  -
-    :command: "service %{service} status"
-    :description: "Service status"
-  -
-    :command: "check_tcp %{port}"
-    :description: "Check listening port"
-  -
-    :command: "check_procs c 1: -C %{process}"
-    :description: "Check process"
-
-:log:
-  -
-    :command: "tail -f %{log_file}"
-    :description: "Tailing logs"
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info.erb
deleted file mode 100644
index f866f7a56b0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-echo_title "$HOSTNAME - <%= @description %>"
-<% @array_run.each do |cmd| %>show_command "<%= cmd %>"
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/instance.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/instance.erb
deleted file mode 100644
index d74f7e601c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/instance.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-<% if @configdir != "" -%>
-# Show config info
-echo_title "$HOSTNAME - <%= @name %>: Configurations directory: <%= @configdir %>"
-show_command "ls -latr <%= @configdir %>"
-<% end -%>
-
-<% if @datadir != "" -%>
-# Show data dir
-echo_title "$HOSTNAME - <%= @name %>: Application data are in: <% datadir.each do |item| %><%= item %><% end %>"
-<% @datadir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @bindir != "" -%>
-# Show bin dir
-echo_title "$HOSTNAME - <%= @name %>: Startup scripts are in: <% bindir.each do |item| %><%= item %><% end %>"
-<% @bindir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @logdir != "" -%>
-# Show log dir
-echo_title "$HOSTNAME - <%= @name %>: Logs are in: <% logdir.each do |item| %><%= item %><% end %>"
-<% @logdir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-show_command "tail -30 <%= item %>/catalina.out"
-<% end -%>
-<% end -%>
-
-<% if @run != "" -%>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end -%>
-<% end -%>
-
-
-<% if @servicename != "" -%>
-# Show service info
-echo_title "$HOSTNAME - <%= @name %>: Services: <% @servicename.each do |item| %><%= item %><% end %>"
-<% @servicename.each do |item| -%>
-show_command "/etc/init.d/<%= item %> status"
-<% end -%>
-<% if @verbose == "yes" -%>
-show_command "ps -adef | grep java | grep <%= @processname %>"
-<% else -%>
-show_command "ps -adef | grep java | grep <%= @processname %> | head -20"
-<% end -%>
-<% end -%>
-
-<% if @httpport != "" -%>
-# Show port info
-echo_title "$HOSTNAME - <%= @name %>: httpport - <%= @httpport %>"
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= @httpport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= @httpport %> ' | head -20"
-<% end -%>
-<% end -%>
-
-<% if @controlport != "" -%>
-# Show port info
-echo_title "$HOSTNAME - <%= @name %>: controlport - <%= @controlport %>"
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= @controlport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= @controlport %> ' | head -20"
-<% end -%>
-<% end -%>
-
-<% if @ajpport != "" -%>
-# Show port info
-echo_title "$HOSTNAME - <%= @name %>: ajpport - <%= @ajpport %>"
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= @ajpport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= @ajpport %> ' | head -20"
-<% end -%>
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/module.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/module.erb
deleted file mode 100644
index aa53d25cce1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/module.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %> 
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-<% if @packagename != "" -%>
-# Show packages info
-echo_title "$HOSTNAME - <%= @name %>: Packages Installed: <% @packagename.each do |item| %><%= item %><% end %>"
-<% @packagename.each do |item| -%>
-show_command "<%= scope.lookupvar('puppi::params::info_package_query') %> <%= item %>"
-<% if @verbose == "yes" -%>
-show_command "<%= scope.lookupvar('puppi::params::info_package_list') %> <%= item %>"
-<% else -%>
-show_command "<%= scope.lookupvar('puppi::params::info_package_list') %> <%= item %> | egrep '(/bin|^/etc|/sbin|log$)'"
-<% end -%>
-<% end -%>
-<% end -%>
-
-<% if @configfile != "" -%>
-# Show config info
-echo_title "$HOSTNAME - <%= @name %>: Configuration Files managed: <% @configfile.each do |item| %><%= item %><% end %>"
-<% @configfile.each do |item| -%>
-<% if @verbose == "yes" -%>
-show_command "cat <%= item %>"
-<% else -%> 
-show_command "head <%= item %>"
-<% end -%>
-<% end -%>
-<% end -%>
-
-<% if @datadir != "" -%>
-# Show data dir
-echo_title "$HOSTNAME - <%= @name %>: Application data are in: <% @datadir.each do |item| %><%= item %><% end %>"
-<% @datadir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-show_command "df <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @logdir != "" -%>
-# Show log dir
-echo_title "$HOSTNAME - <%= @name %>: Logs are in: <% @logdir.each do |item| %><%= item %><% end %>"
-<% @logdir.each do |item| -%>
-show_command "ls -latr <%= item %>"
-show_command "df <%= item %>"
-<% end -%>
-<% end -%>
-
-<% if @logfile != "" -%>
-# Show logs
-echo_title "$HOSTNAME - <%= @name %>: Last log entries: <% @logfile.each do |item| %><%= item %><% end %>"
-<% @logfile.each do |item| -%>
-<% if @verbose == "yes" -%>
-show_command "tail -30 <%= item %>"
-<% else -%>
-show_command "tail -10 <%= item %>"
-<% end -%>
-<% end -%>
-<% end -%>
-
-<% if @run != "" -%>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end -%>
-<% end -%>
-
-
-<% if @servicename != "" -%>
-# Show service info
-echo_title "$HOSTNAME - <%= @name %>: Services: <% @servicename.each do |item| %><%= item %><% end %>"
-<% @servicename.each do |item| -%>
-show_command "/etc/init.d/<%= item %> status"
-<% end -%>
-<% if @verbose == "yes" -%>
-show_command "ps -adef | grep <%= @processname %> | grep -v grep"
-<% else -%>
-show_command "ps -adef | grep <%= @processname %> | grep -v grep | head -20"
-<% end -%>
-<% @port.each do |mport| -%>
-<% if @verbose == "yes" -%>
-show_command "netstat -natup | grep ':<%= mport %> '"
-<% else -%>
-show_command "netstat -natup | grep ':<%= mport %> ' | head -20"
-<% end -%>
-<% end -%>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/puppet.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/puppet.erb
deleted file mode 100644
index 8f377ca12cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/puppet.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-# Show Puppet info
-echo_title "$HOSTNAME - <%= @name %>: Information on management with Puppet"
-echo "Where to configure this node in Puppet:"
-echo "manifests/nodes/<%= @site %>.pp - Node's definition"
-echo "manifests/roles/role_<%= @role %>.pp - Role's definition"
-echo "modules/<modulename>/manifests/init.pp - Main class for each module"
-echo
-
-# Show ReadMe file
-echo_title "$HOSTNAME - <%= @name %>: ReadMe"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>"
-
-<% if @autoreadme == "yes" %>
-echo_title "$HOSTNAME - <%= @name %>: ReadMe Custom"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>-custom"
-<% end %>
-
-<% if @run != "" %>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/readme.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/readme.erb
deleted file mode 100644
index 4e4b1357b59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/info/readme.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# <%= @description %>
-# Script generated by Puppet. It's executed when you run:
-# puppi info <%= @name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-# Show ReadMe file
-echo_title "$HOSTNAME - <%= @name %>: ReadMe"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>"
-
-<% if @autoreadme == "yes" %>
-echo_title "$HOSTNAME - <%= @name %>: ReadMe Custom"
-show_command "cat <%= scope.lookupvar('puppi::params::readmedir') %>/<%= @name %>-custom"
-<% end %>
-
-<% if @run != "" %>
-echo_title "$HOSTNAME - <%= @name %>: Extra info"
-<% @run.each do |cmd| %>show_command "<%= cmd %>"
-<% end %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/install_packages.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/install_packages.erb
deleted file mode 100644
index 906d15e8a5e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/install_packages.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# File Managed by Puppet
-export PATH=$PATH:/bin:/sbin:/usr/bin:usr/sbin
-<% if scope.lookupvar('::operatingsystem') == 'Debian' or scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
-apt-get update ; apt-get install -y <%= @packages %>
-<% elsif scope.lookupvar('::operatingsystem') == 'Centos' or scope.lookupvar('::operatingsystem') == 'RedHat' -%>
-yum install -y <%= @packages %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/log.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/log.erb
deleted file mode 100644
index 5ca47bbf510..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/log.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<% @array_log.each do |path| %><%= path %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/project/config.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/project/config.erb
deleted file mode 100644
index 4e8a952bdf3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/project/config.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-# File Managed by Puppet
-# This is the base configuration file for project <%= scope.lookupvar('name') %>
-# During a puppi deploy it's copied into the runtime configuration
-#   used by the scripts executed by puppi 
-#
-# Do not edit this file. You can modify these variables:
-# Permanently: directly on your puppi manifests (When you use the puppi:project:: defines)
-# Temporarily: using the puppi option -o to override them.
-#   example: puppi deploy $name -o "source=http://alt.com/file deploy_root=/var/tmp"
-
-# Common variables for project defines
-project="<%= @name %>"
-source="<%= @source %>"
-deploy_root="<%= @deploy_root %>"
-user="<%= @user %>"
-predeploy_customcommand="<%= @predeploy_customcommand %>"
-postdeploy_customcommand="<%= @postdeploy_customcommand %>"
-init_script="<%= @init_script %>"
-disable_services="<%= @disable_services %>"
-firewall_src_ip="<%= @firewall_src_ip %>"
-firewall_dst_port="<%= @firewall_dst_port %>"
-report_email="<%= @report_email %>"
-enable="<%= @enable %>"
-
-# Variables used by project::files
-files_prefix="<%= @files_prefix %>"
-source_baseurl="<%= @source_baseurl %>"
-
-# Variables used by project::maven
-document_root="<%= @document_root %>"
-config_root="<%= @config_root %>"
-
-# Variables added during runtime puppi operations
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.conf.erb
deleted file mode 100644
index b167c036e43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.conf.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-# General configuration file for Puppi tools
-# This file is managed by Puppet
-
-# Directory locations
-basedir="<%= scope.lookupvar('puppi::params::basedir') %>"
-checksdir="<%= scope.lookupvar('puppi::params::checksdir') %>"
-workdir="<%= scope.lookupvar('puppi::params::workdir') %>"
-projectsdir="<%= scope.lookupvar('puppi::params::projectsdir') %>"
-scriptsdir="<%= scope.lookupvar('puppi::params::scriptsdir') %>"
-libdir="<%= scope.lookupvar('puppi::params::libdir') %>"
-archivedir="<%= scope.lookupvar('puppi::params::archivedir') %>"
-logdir="<%= scope.lookupvar('puppi::params::logdir') %>"
-logsdir="<%= scope.lookupvar('puppi::params::logsdir') %>"
-infodir="<%= scope.lookupvar('puppi::params::infodir') %>"
-tododir="<%= scope.lookupvar('puppi::params::tododir') %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.erb
deleted file mode 100644
index 7248a2a1125..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi.erb
+++ /dev/null
@@ -1,517 +0,0 @@
-#!/bin/bash
-configfile="<%= scope.lookupvar('puppi::params::basedir') %>/puppi.conf"
-
-# This is the actual command used to run the different scripts
-# Use cat for debugging noop purposes 
-# runcommand="cat"
-runcommand=""
-
-# Define defaults
-verbosity="max"
-show="yes"
-
-# Define action tag
-export tag=$(date +%Y%m%d-%H%M%S)
-
-counter=0
-
-# Load general configurations
-if [ ! -f $configfile ] ; then
-    echo "Config file: $configfile not found"
-    exit 1
-else
-    . $configfile
-    . $scriptsdir/functions
-fi
-
-# Main functions
-check_host () {
-    for command in $(ls -1 $checksdir) ; do
-        title="$HOSTNAME check: $command"
-        code=$(cat "$checksdir/$command")
-        ask_interactive
-        output=$($runcommand "$checksdir/$command" 2>&1)
-        handle_result
-    done
-}
-
-check () {
-    for command in $(ls -1 $projectsdir/$project/check) ; do
-        title="$HOSTNAME check: $command"
-        code=$(cat "$projectsdir/$project/check/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/check/$command" 2>&1)
-        handle_result
-    done
-
-    check_host
-    # show_report
-}
-
-log () {
-    tailcommand="tail"
-    which colortail >/dev/null 2>&1  && tailcommand="colortail"
-
-    if [ "x$project" != "xdefault" ] ; then
-        if [ $logsdir/$project ] ; then
-            alllog="$alllog $(cat $logsdir/$project)"
-        else
-            echo "WARNING: $logsdir/$project does not exist!"
-            exit 1
-        fi
-    else
-        if [ "$interactive" = "yes" ] ; then
-            echo "Choose one or more log topics to show. Select the last number (done) to end selection"
-            PS3="Type one number to add a log topic to the show list."
-            all_choices=""
-            select choice in $( ls $logsdir ) done
-            do
-                echo "You selected $choice [$REPLY]"
-                [[ $choice == "done" ]] && break
-                all_choices="$all_choices $choice"
-                echo "Your choices: $all_choices"
-            done
-            for log in $all_choices ; do
-                alllog="$alllog $(cat $logsdir/$log)"
-            done
-        else
-            for log in $(ls $logsdir) ; do
-                alllog="$alllog $(cat $logsdir/$log)"
-            done
-        fi
-    fi
-
-    # So, show something
-    if [ ! -z "$counts" ] ; then
-        if [ ! -z "$greppattern" ] ; then
-            $tailcommand -n $counts $alllog | grep $greppattern
-        else
-            $tailcommand -n $counts $alllog
-        fi
-    else
-        if [ ! -z "$greppattern" ] ; then
-            $tailcommand -f $alllog | grep $greppattern
-        else
-            $tailcommand -f $alllog
-        fi
-    fi
-}
-
-info () {
-    if [ "x$project" != "xdefault" ] ; then
-        if [ $infodir/$project ] ; then
-            $infodir/$project 
-        else
-            echo "WARNING: $infodir/$project does not exist!"
-            exit 1
-        fi
-    else
-        if [ "$interactive" = "yes" ] ; then
-            echo "Choose one or more topics to show. Select the last number (done) to end selection"
-            PS3="Type one number to add an info topic to the show list."
-            all_choices=""
-            select choice in $( ls $infodir ) done
-            do
-                echo "You selected $choice [$REPLY]"
-                [[ $choice == "done" ]] && break
-                all_choices="$all_choices $choice"
-                echo "Your choices: $all_choices"
-            done
-            for info in $all_choices ; do
-                if [ ! -z "$greppattern" ] ; then
-                    $infodir/$info | grep $greppattern
-                else
-                    $infodir/$info
-                fi
-            done
-        else
-            for info in $(ls $infodir) ; do
-                if [ ! -z "$greppattern" ] ; then
-                    $infodir/$info | grep $greppattern
-                else
-                    $infodir/$info
-                fi
-            done
-        fi
-    fi
-}
-
-
-todo () {
-    for todo in $(ls $tododir) ; do
-        $tododir/$todo
-    done
-}
-
-
-rollback () {
-    if [ ! -z $rollbackversion ] ; then
-        save_runtime_config "rollbackversion=$rollbackversion" || initerr=1
-    else
-        echo "Choose deploy to rollback:"
-        ls -1 $archivedir/$project
-        read rollbackversion
-        save_runtime_config "rollbackversion=$rollbackversion" || initerr=1
-    fi
-    
-    for command in $(ls -1 $projectsdir/$project/rollback) ; do
-        title="$HOSTNAME Rollback: $command"
-        code=$(cat "$projectsdir/$project/rollback/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/rollback/$command" 2>&1)
-        handle_result
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-deploy () {
-    for command in $(ls -1 $projectsdir/$project/deploy) ; do
-        title="$HOSTNAME Deploy: $command"
-        code=$(cat "$projectsdir/$project/deploy/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/deploy/$command" 2>&1)
-        handle_result
-        [ "$EXITCRIT" = "1" ] && [ "$force" != "yes" ] && break
-        if [ "$DONTDEPLOY" = "1" ] ; then
-             echo "No need to deploy: source file has not changed"
-             echo "Type 'rm $archivedir/$project/md5sum' and run puppi again to force deployment" 
-             exit 0
-        fi
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-initialize () {
-    for command in $(ls -1 $projectsdir/$project/initialize) ; do
-        title="$HOSTNAME Init: $command"
-        code=$(cat "$projectsdir/$project/initialize/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/initialize/$command" 2>&1)
-        handle_result
-        [ "$EXITCRIT" = "1" ] && [ "$force" != "yes" ] && break
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-configure () {
-    for command in $(ls -1 $projectsdir/$project/configure) ; do
-        title="$HOSTNAME Init: $command"
-        code=$(cat "$projectsdir/$project/configure/$command")
-        ask_interactive
-        output=$($runcommand "$projectsdir/$project/configure/$command" 2>&1)
-        handle_result
-        [ "$EXITCRIT" = "1" ] && [ "$force" != "yes" ] && break
-    done
-
-    send_reports
-    show_report
-    [ "$result" = "OK" ] && exit 0
-}
-
-save_summary () {
-    tagend=$(date +%Y%m%d-%H%M%S)
-
-    result="OK"
-    if [ "$EXITWARN" = "1" ] ; then
-        result="WARNING"
-    fi
-    if [ "$EXITCRIT" = "1" ] ; then
-        result="ERROR"
-    fi
-
-    echo "Report for $action on $project" > $logdir/$project/$tag/summary
-    echo "Job start: $tag" >> $logdir/$project/$tag/summary
-    echo "Job end: $tagend" >> $logdir/$project/$tag/summary
-    echo "Job result: $result" >> $logdir/$project/$tag/summary
-    echo "Actions executed:" >> $logdir/$project/$tag/summary
-    cd $logdir/$project/$tag/
-    for message in $(ls -1 $logdir/$project/$tag/ | grep -v summary ) ; do
-        msg_title=$(head -1 $message)
-        msg_code=$(head -2 $message | tail -1) 
-        msg_result=$(head -3 $message | tail -1) 
-        echo "[$msg_result] $msg_title : $msg_code" >> $logdir/$project/$tag/summary
-    done
-
-    # Copy runtime config in archive
-    cp $workdir/$project/config $logdir/$project/$tag/
-
-    # Write runtime config on Summary
-    echo >> $logdir/$project/$tag/summary
-    echo "RUNTIME CONFIGURATION" >> $logdir/$project/$tag/summary
-    cat $workdir/$project/config | grep -vE "^#|^$"  >> $logdir/$project/$tag/summary
-
-}
-
-send_reports () {
-    if [[ "x$report" == "xyes" ]] ; then
-        save_summary
-        for command in $(ls -1 $projectsdir/$project/report) ; do
-            title="Reporting: $command"
-            code=$(cat "$projectsdir/$project/report/$command")
-            echo -n $title
-            output=$($runcommand "$projectsdir/$project/report/$command" 2>&1)
-            # handle_result # This breaks the overall exit code when deploy fails
-        done
-    fi
-}
-
-show_report () {
-    echo
-    echo "REPORT FOR PUPPI - STATUS $result"
-    echo "Summary of operations is: $logdir/$project/$tag/summary "
-    echo "Details are in: $logdir/$project/$tag/"
-    echo "Temporary workdir has been: $workdir/$project/ (Will be rewritten at the next puppi run)"
-    echo "Runtime config file is: $workdir/$project/config"
-    echo "Files have been archived in: $archivedir/$project/$tag"
-    test "$testmode" = "yes" && echo "This was a TEST RUN! Nothing has been done for real."
-}
-
-
-create_runtime_conf () {
-    if [[ ( ! -e $projectsdir/$project ) && ( ! -e $infodir/$project ) && ( ! -e $logsdir/$project ) ]] ; then
-        showhelp
-        exit 1
-    fi
-
-    initerr=0
-
-    # When project is unset we set it to default
-    [ ! -z "$project" ] || export project="default"
-
-    # Clean up and Create runtime configuration file 
-#    command="00-$project-RuntimeConfig-Initialization"
-#    title="Puppi setup: $command"
-#    code="rm -rf $workdir/$project && touch $workdir/$project/config [...]"
-#    echo -n $title
-
-    echo $workdir | grep tmp >/dev/null 2>&1 || ( echo "Workdir must contain string tmp" ; exit 1 )
-    rm -rf $workdir/$project || initerr=1
-
-    mkdir -p $workdir/$project || initerr=1
-    touch $workdir/$project/config || initerr=1
-
-    test -r "$projectsdir/$project/config" && cp $projectsdir/$project/config $workdir/$project/
-    chmod 644 $workdir/$project/config || initerr=1
-
-    save_runtime_config "project=$project" || initerr=1
-    save_runtime_config "tag=$tag" || initerr=1
-    save_runtime_config "action=$action" || initerr=1
-
-    storedir=$workdir/$project/store || initerr=1
-    mkdir -p $storedir || initerr=1
-    save_runtime_config "storedir=$storedir" || initerr=1
-
-    predeploydir=$workdir/$project/deploy || initerr=1
-    mkdir -p $predeploydir || initerr=1
-    save_runtime_config "predeploydir=$predeploydir" || initerr=1
-
-    save_runtime_config "force=$force" || initerr=1
-    save_runtime_config "testmode=$testmode" || initerr=1
-    save_runtime_config "interactive=$interactive" || initerr=1
-    save_runtime_config "debug=$debug" || initerr=1
-    save_runtime_config "report=$report" || initerr=1
-    save_runtime_config "show=$show" || initerr=1
-    save_runtime_config "counts=$counts" || initerr=1
-    save_runtime_config "greppattern=$greppattern" || initerr=1
-
-    for oopt in $(echo $options) ; do
-        save_runtime_config "$(echo $oopt)" || initerr=1
-    done
-    
-    echo $initerr | grep "0" 2>&1 > /dev/null
-#    handle_result
-}
-
-
-showhelp () {
-   echo "Usage: puppi <command> [project|topic] [options]"
-   echo " "
-   echo "Available commands:"
-   echo "check [project] [-s <yes|no|fail>] - Run puppi checks host or project wide"
-   echo "log [topic] [-i] [-g <pattern>] - Show system and application specific logs"
-   echo "info [topic] [-i] [-g <pattern>] - Show informations about the system"
-   echo "todo - Show todo's checklist of the system"
-   echo "init <project> [-i] [-f] [-t] - First time project initialization and setup"
-   echo "configure <project> [-i] [-f] [-t] - Project configuration deployment."
-   echo "deploy <project> [-i] [-f] [-t] [-o ...] - Deploy the specified project"
-   echo "rollback <project> [state] [-i] [-f] [-t] - Rollback the specified project. "
-   echo " "
-   echo "Available options:"
-   echo "-f - Force puppi commands execution flow also on CRITICAL errors"
-   echo "-i - Interactively ask confirmation for every step"
-   echo "-t - Test mode. Just show the commands that should be executed"
-   echo "-d <yes|full> - Debug mode. Show debug of what is done."
-   echo "-r <yes|no|fail> - Enable reporting: yes/no/only on failures. Default depends on action"
-   echo "-s <yes|no|fail> - Show output: yes/no/only for failures. Default: yes"
-   echo "-g <pattern> - Grep command output with the selected pattern"
-   echo "-o \"parameter=value parameter2=value2\" - Set manual options to override defaults"
-   echo " "
-   echo "Available deploy projects:"
-   ls -1 $projectsdir
-   echo 
-   echo "Available info topics:"
-   ls $infodir 
-   echo 
-   echo "Available log topics:"
-   ls $logsdir
-}
-
-# Check Input
-if [ "$#" = "0" ] ; then
-    showhelp
-    exit
-fi
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    deploy|init|configure)
-      report="yes"
-      export action=$1
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else
-          shift
-        fi
-      else
-        showhelp
-        exit
-        shift
-      fi
-    ;;
-    rollback)
-      report="yes"
-      export action=$1
-      if [ -n "$3" ] ; then
-        echo "$3" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          export rollbackversion=$(shell_filter_strict $3)
-          shift 3
-        else
-          shift 2
-        fi
-      elif [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else
-          shift
-        fi
-      else
-        showhelp
-        exit
-        shift
-      fi
-    ;;
-    check)
-      report="no"
-      export action="checkhost"
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          export action="check"
-          shift 2
-        else
-          shift
-        fi
-      else
-        shift
-      fi
-    ;;
-    log)
-      report="no"
-      export action="log"
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else 
-          shift
-        fi
-      else
-        shift
-      fi
-    ;;
-    info)
-      report="no"
-      export action="info"
-      if [ -n "$2" ] ; then
-        echo "$2" | egrep -q "^-.$"
-        if [ "$?" != "0" ] ; then
-          export project=$(shell_filter_strict $2)
-          shift 2
-        else
-          shift
-        fi
-      else
-        shift
-      fi
-    ;;
-    todo)
-      report="no"
-      export action="todo"
-      shift ;;
-    -i)
-      interactive="yes"
-      shift ;;
-    -f)
-      force="yes"
-      shift ;;
-    -t)
-      testmode="yes"
-      runcommand="cat"
-      shift ;;
-    -o)
-      options="$2"
-      shift 2;;
-    -d)
-      debug="$(shell_filter_strict $2)"
-      shift 2;;
-    -r)
-      report="$(shell_filter_strict $2)"
-      shift 2;;
-    -s)
-      show="$(shell_filter_strict $2)"
-      shift 2;;
-    -c)
-      counts="$(shell_filter_strict $2)"
-      shift 2;;
-    -g)
-      greppattern="$(shell_filter_strict $2)"
-      # greppattern="$(shell_filter $2)" # This allows partial regexp usage
-      # greppattern="$2" # This allows full regexp usage but is highly insecure if you sudo puppi
-      shift 2;;
-    *)
-      showhelp
-      exit
-      ;;
-  esac
-done
-
-# Action!
-case $action in 
-    check) check ;;
-    checkhost) check_host ;;
-    log) create_runtime_conf ; log ;;
-    info) create_runtime_conf ; info ;;
-    todo) create_runtime_conf ; todo ;;
-    rollback) create_runtime_conf ; rollback ;;
-    deploy) create_runtime_conf ; deploy ;;
-    init) create_runtime_conf ; initialize ;;
-    configure) create_runtime_conf ; configure ;;
-esac
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi_clean.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi_clean.erb
deleted file mode 100644
index f6a0eaa0da7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/puppi_clean.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# This scripts cleans puppi log files older than <%= scope.lookupvar('puppi::logs_retention_days') %>
-seconds=$(( (RANDOM%60+1)*60 ))
-sleep $seconds
-
-if [ "<%= scope.lookupvar('puppi::params::logdir') %>" == "/" ] || [ "x<%= scope.lookupvar('puppi::params::logdir') %>" == "x" ]; then
-  exit 1
-fi
-find <%= scope.lookupvar('puppi::params::logdir') %> -type f -mtime +<%= scope.lookupvar('puppi::logs_retention_days') %> -exec rm '{}' '+' >/dev/null 2>&1
-find <%= scope.lookupvar('puppi::params::logdir') %> -type d -mtime +<%= scope.lookupvar('puppi::logs_retention_days') %> -exec rmdir '{}' '+' >/dev/null 2>&1
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/todo.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/todo.erb
deleted file mode 100644
index 3eaf03fc341..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/puppi/templates/todo.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Script generated by Puppet. It's executed when you run:
-# puppi todo <%= name %>
-#
-# Sources common header for Puppi scripts
-. <%= scope.lookupvar('puppi::params::scriptsdir') %>/header || exit 10
-
-echo_title "$HOSTNAME - <%= name %>"
-
-<% if @description != "" -%>
-cat <<EOF
-<%= @description %>
-EOF
-<% end -%>
-
-<% if @notes != "" -%>
-cat <<EOF
-<%= @notes %>
-EOF
-<% end -%>
-
-<% if @run != "" -%>
-<% array_run.each do |cmd| %>show_command "<%= cmd -%>"
-<% end -%>
-<% end -%>
-
-<% if @check_command != "" -%>
-<%= @check_command %>
-if [ "x$?" = "x0" ] ; then
-    echo_success
-    result="OK"
-else
-    echo_failure
-    result="CRITICAL"
-    EXITCRIT="1"
-fi
-<% else -%>
-echo_warning
-result="WARNING"
-EXITWARN="1"
-<% end -%>
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.fixtures.yml
deleted file mode 100644
index 1d111f97527..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.fixtures.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-fixtures:
-  repositories:
-    "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
-    "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
-    "staging": "git://github.com/nanliu/puppet-staging.git"
-    erlang:
-      repo: "https://github.com/garethr/garethr-erlang.git"
-  symlinks:
-    "rabbitmq": "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.nodeset.yml
deleted file mode 100644
index cbd0d57b83d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.nodeset.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'fedora-18-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'fedora-18-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
-  'sles-11sp1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'sles-11sp1-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.travis.yml
deleted file mode 100644
index 9f68e1fe0d3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: bundle exec rake spec SPEC_OPTS='--format documentation'
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-  - .forge-releng/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - PUPPET_GEM_VERSION="~> 3.4.0"
-    - PUPPET_GEM_VERSION="~> 3.5.0"
-  global:
-    - PUBLISHER_LOGIN=puppetlabs
-    - secure: |-
-        mSHk+9ReN6wxJ9sOgySOSKEjaXOdtT9B1BtvsOGcm/FQI3p57meid3B6z37r\nNv9PbxwGb
-        mcZafMxNAfwr8nUb/bqxeXnZaGiY0E9pvg9aRr3g4knczn+siW+\nDkKlvM0rex2zzF0PDc
-        495e61kP5cxcKNVdDJSiUPPK6fNGQ1xX8=
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.1.1
-      env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-    - rvm: 2.1.1
-      env: PUPPET_GEM_VERSION="~> 3.4.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/CHANGELOG
deleted file mode 100644
index 2a6e7d81acb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/CHANGELOG
+++ /dev/null
@@ -1,115 +0,0 @@
-2014-05-16 - Version 4.0.0
-
-Summary:
-
-This release includes many new features and bug fixes.  With the exception of
-erlang management this should be backwards compatible with 3.1.0.
-
-Backwards-incompatible Changes:
-- erlang_manage was removed.  You will need to manage erlang separately. See
-the README for more information on how to configure this.
-
-Features:
-- Improved SSL support
-- Add LDAP support
-- Add ability to manage RabbitMQ repositories
-- Add ability to manage Erlang kernel configuration options
-- Improved handling of user tags
-- Use nanliu-staging module instead of hardcoded 'curl'
-- Switch to yum or zypper provider instead of rpm
-- Add ability to manage STOMP plugin installation.
-- Allow empty permission fields
-- Convert existing system tests to beaker acceptance tests.
-
-Bugfixes:
-- exchanges no longer recreated on each puppet run if non-default vhost is used
-- Allow port to be UNSET
-- Re-added rabbitmq::server class
-- Deprecated previously unused manage_service variable in favor of 
-  service_manage
-- Use correct key for rabbitmq apt::source
-- config_mirrored_queues variable removed
-  - It previously did nothing, will now at least throw a warning if you try to
-    use it
-- Remove unnecessary dependency on Class['rabbitmq::repo::rhel'] in
-  rabbitmq::install
-
-
-2013-09-14 - Version 3.1.0
-
-Summary:
-
-This release focuses on a few small (but critical) bugfixes as well as extends
-the amount of custom RabbitMQ configuration you can do with the module.
-
-Features:
-- You can now change RabbitMQ 'Config Variables' via the parameter `config_variables`.
-- You can now change RabbitMQ 'Environment Variables' via the parameter `environment_variables`.
-- ArchLinux support added.
-
-Fixes:
-- Make use of the user/password parameters in rabbitmq_exchange{}
-- Correct the read/write parameter order on set_permissions/list_permissions as
-  they were reversed.
-- Make the module pull down 3.1.5 by default.
-
-* 2013-07-18 3.0.0
-Summary:
-This release heavily refactors the RabbitMQ and changes functionality in
-several key ways.  Please pay attention to the new README.md file for
-details of how to interact with the class now.  Puppet 3 and RHEL are
-now fully supported.  The default version of RabbitMQ has changed to
-a 3.x release.
-
-Bugfixes:
-- Improve travis testing options.
-- Stop reimporting the GPG key on every run on RHEL and Debian.
-- Fix documentation to make it clear you don't have to set provider => each time.
-- Reference the standard rabbitmq port in the documentation instead of a custom port.
-- Fixes to the README formatting.
-
-Features:
-- Refactor the module to fix RHEL support.  All interaction with the module
-is now done through the main rabbitmq class.
-- Add support for mirrored queues (Only on Debian family distributions currently)
-- Add rabbitmq_exchange provider (using rabbitmqadmin)
-- Add new `rabbitmq` class parameters:
-  - `manage_service`: Boolean to choose if Puppet should manage the service. (For pacemaker/HA setups)
-- Add SuSE support.
-
-Incompatible Changes:
-- Rabbitmq::server has been removed and is now rabbitmq::config.  You should
-not use this class directly, only via the main rabbitmq class.
-
-* 2013-04-11 2.1.0
-- remove puppetversion from rabbitmq.config template
-- add cluster support
-- escape resource names in regexp
-
-* 2012-07-31 Jeff McCune <jeff@puppetlabs.com> 2.0.2
-- Re-release 2.0.1 with $EDITOR droppings cleaned up
-
-* 2012-05-03 2.0.0
-- added support for new-style admin users
-- added support for rabbitmq 2.7.1
-
-* 2011-06-14 Dan Bode <dan@Puppetlabs.com> 2.0.0rc1
-- Massive refactor:
-- added native types for user/vhost/user_permissions
-- added apt support for vendor packages
-- added smoke tests
-
-* 2011-04-08 Jeff McCune <jeff@puppetlabs.com> 1.0.4
-- Update module for RabbitMQ 2.4.1 and rabbitmq-plugin-stomp package.
-
-2011-03-24 1.0.3
-- Initial release to the forge.  Reviewed by Cody.  Whitespace is good.
-
-2011-03-22 1.0.2
-- Whitespace only fix again...  ack '\t' is my friend...
-
-2011-03-22 1.0.1
-- Whitespace only fix.
-
-2011-03-22 1.0.0
-- Initial Release.  Manage the package, file and service.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Gemfile
deleted file mode 100644
index 02e632165fd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Gemfile
+++ /dev/null
@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake', '10.1.1',          :require => false
-  gem 'rspec-puppet', '>=1.0.0', :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'serverspec',              :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
-end
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/LICENSE
deleted file mode 100644
index 297f85cfa86..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!) The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 Puppet Labs
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Modulefile
deleted file mode 100644
index 5301dbce61b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name    'puppetlabs-rabbitmq'
-version '4.0.0'
-source 'git://github.com/puppetlabs/puppetlabs-rabbitmq.git'
-author 'puppetlabs'
-license 'Apache'
-summary 'RabbitMQ Puppet Module'
-description 'This module manages RabbitMQ. Tested on Debian, Ubuntu, and RedHat'
-project_page 'http://github.com/puppetlabs/puppetlabs-rabbitmq'
-
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 2.0.0'
-dependency 'puppetlabs/apt', '>= 1.0.0'
-dependency 'nanliu/staging', '>= 0.3.1'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md
deleted file mode 100644
index c6750445516..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/README.md
+++ /dev/null
@@ -1,349 +0,0 @@
-#rabbitmq
-
-####Table of Contents
-
-1. [Overview](#overview)
-2. [Module Description - What the module does and why it is useful](#module-description)
-3. [Setup - The basics of getting started with rabbitmq](#setup)
-    * [What rabbitmq affects](#what-rabbitmq-affects)
-    * [Setup requirements](#setup-requirements)
-    * [Beginning with rabbitmq](#beginning-with-rabbitmq)
-4. [Usage - Configuration options and additional functionality](#usage)
-5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
-5. [Limitations - OS compatibility, etc.](#limitations)
-   * [RedHat module dependencies](#redhat-module-dependecies)
-6. [Development - Guide for contributing to the module](#development)
-
-##Overview
-
-This module manages RabbitMQ (www.rabbitmq.com)
-
-##Module Description
-The rabbitmq module sets up rabbitmq and has a number of providers to manage
-everything from vhosts to exchanges after setup.
-
-This module has been tested against 2.7.1 and is known to not support
-all features against earlier versions.
-
-##Setup
-
-###What rabbitmq affects
-
-* rabbitmq repository files.
-* rabbitmq package.
-* rabbitmq configuration file.
-* rabbitmq service.
-
-###Beginning with rabbitmq
-
-```puppet
-include '::rabbitmq'
-```
-
-##Usage
-
-All options and configuration can be done through interacting with the parameters
-on the main rabbitmq class.  These are documented below.
-
-##rabbitmq class
-
-To begin with the rabbitmq class controls the installation of rabbitmq.  In here
-you can control many parameters relating to the package and service, such as
-disabling puppet support of the service:
-
-```puppet
-class { '::rabbitmq':
-  service_manage    => false,
-  port              => '5672',
-  delete_guest_user => true,
-}
-```
-
-### Environment Variables
-To use RabbitMQ Environment Variables, use the parameters `environment_variables` e.g.:
-
-```puppet
-class { 'rabbitmq':
-  port              => '5672',
-  environment_variables   => {
-    'RABBITMQ_NODENAME'     => 'node01',
-    'RABBITMQ_SERVICENAME'  => 'RabbitMQ'
-  }
-}
-```
-
-### Variables Configurable in rabbitmq.config
-To change RabbitMQ Config Variables in rabbitmq.config, use the parameters `config_variables` e.g.:
-
-```puppet
-class { 'rabbitmq':
-  port              => '5672',
-  config_variables   => {
-    'hipe_compile'  => true,
-    'frame_max'     => 131072,
-    'log_levels'    => "[{connection, info}]"
-  }
-}
-```
-
-To change Erlang Kernel Config Variables in rabbitmq.config, use the parameters
-`config_kernel_variables` e.g.:
-
-```puppet
-class { 'rabbitmq':
-  port              => '5672',
-  config_kernel_variables  => {
-    'inet_dist_listen_min' => 9100,
-    'inet_dist_listen_max' => 9105,
-  }
-}
-```
-
-### Clustering
-To use RabbitMQ clustering facilities, use the rabbitmq parameters
-`config_cluster`, `cluster_nodes`, and `cluster_node_type`, e.g.:
-
-```puppet
-class { 'rabbitmq':
-  config_cluster    => true,
-  cluster_nodes     => ['rabbit1', 'rabbit2'],
-  cluster_node_type => 'ram',
-}
-```
-
-##Reference
-
-##Classes
-
-* rabbitmq: Main class for installation and service management.
-* rabbitmq::config: Main class for rabbitmq configuration/management.
-* rabbitmq::install: Handles package installation.
-* rabbitmq::params: Different configuration data for different systems.
-* rabbitmq::service: Handles the rabbitmq service.
-* rabbitmq::repo::apt: Handles apt repo for Debian systems.
-* rabbitmq::repo::rhel: Handles yum repo for Redhat systems.
-
-###Parameters
-
-####`admin_enable`
-
-If enabled sets up the management interface/plugin for RabbitMQ.
-
-####`cluster_disk_nodes`
-
-DEPRECATED AND REPLACED BY CLUSTER_NODES.
-
-####`cluster_node_type`
-
-Choose between disk and ram nodes.
-
-####`cluster_nodes`
-
-An array of nodes for clustering.
-
-####`config`
-
-The file to use as the rabbitmq.config template.
-
-####`config_cluster`
-
-Boolean to enable or disable clustering support.
-
-####`config_mirrored_queues`
-
-DEPRECATED
-
-Configuring queue mirroring should be done by setting the according policy for
-the queue. You can read more about it
-[here](http://www.rabbitmq.com/ha.html#genesis)
-
-####`config_path`
-
-The path to write the RabbitMQ configuration file to.
-
-####`config_stomp`
-
-Boolean to enable or disable stomp.
-
-####`delete_guest_user`
-
-Boolean to decide if we should delete the default guest user.
-
-####`env_config`
-
-The template file to use for rabbitmq_env.config.
-
-####`env_config_path`
-
-The path to write the rabbitmq_env.config file to.
-
-####`erlang_cookie`
-
-The erlang cookie to use for clustering - must be the same between all nodes.
-
-####`config_variables`
-
-To set config variables in rabbitmq.config
-
-####`node_ip_address`
-
-The value of RABBITMQ_NODE_IP_ADDRESS in rabbitmq_env.config
-
-####`environment_variables`
-
-RabbitMQ Environment Variables in rabbitmq_env.config
-
-####`package_ensure`
-
-Determines the ensure state of the package.  Set to installed by default, but could
-be changed to latest.
-
-####`package_name`
-
-The name of the package to install.
-
-####`package_provider`
-
-What provider to use to install the package.
-
-####`package_source`
-
-Where should the package be installed from?
-
-####`plugin_dir`
-
-Location of RabbitMQ plugins.
-
-####`port`
-
-The RabbitMQ port.
-
-####`management_port`
-
-The port for the RabbitMQ management interface.
-
-####`service_ensure`
-
-The state of the service.
-
-####`service_manage`
-
-Determines if the service is managed.
-
-####`service_name`
-
-The name of the service to manage.
-
-####`stomp_port`
-
-The port to use for Stomp.
-
-####`stomp_ensure`
-
-Boolean to install the stomp plugin.
-
-####`wipe_db_on_cookie_change`
-
-Boolean to determine if we should DESTROY AND DELETE the RabbitMQ database.
-
-####`version`
-
-Sets the version to install.
-
-##Native Types
-
-### rabbitmq\_user
-
-query all current users: `$ puppet resource rabbitmq_user`
-
-```
-rabbitmq_user { 'dan':
-  admin    => true,
-  password => 'bar',
-}
-```
-
-### rabbitmq\_vhost
-
-query all current vhosts: `$ puppet resource rabbitmq_vhost`
-
-```puppet
-rabbitmq_vhost { 'myhost':
-  ensure => present,
-}
-```
-
-### rabbitmq\_exchange
-
-```puppet
-rabbitmq_exchange { 'myexchange@myhost':
-  user     => 'dan',
-  password => 'bar',
-  type     => 'topic',
-  ensure   => present,
-}
-```
-
-### rabbitmq\_user\_permissions
-
-```puppet
-rabbitmq_user_permissions { 'dan@myhost':
-  configure_permission => '.*',
-  read_permission      => '.*',
-  write_permission     => '.*',
-}
-```
-
-### rabbitmq\_plugin
-
-query all currently enabled plugins `$ puppet resource rabbitmq_plugin`
-
-```puppet
-rabbitmq_plugin {'rabbitmq_stomp':
-  ensure => present,
-}
-```
-
-##Limitations
-
-This module has been built on and tested against Puppet 2.7 and higher.
-
-The module has been tested on:
-
-* RedHat Enterprise Linux 5/6
-* Debian 6/7
-* CentOS 5/6
-* Ubuntu 12.04
-
-Testing on other platforms has been light and cannot be guaranteed.
-
-### RedHat module dependencies
-To have a suitable erlang version installed on RedHat systems,
-you have to install another puppet module from http://forge.puppetlabs.com/garethr/erlang with:
-
-    puppet module install garethr-erlang
-
-This module handles the packages for erlang.
-To use the module, add the following snippet to your site.pp or an appropriate profile class:
-
-    include 'erlang'
-    class { 'erlang': epel_enable => true}
-
-##Development
-
-Puppet Labs modules on the Puppet Forge are open projects, and community
-contributions are essential for keeping them great. We can’t access the
-huge number of platforms and myriad of hardware, software, and deployment
-configurations that Puppet is intended to serve.
-
-We want to keep it as easy as possible to contribute changes so that our
-modules work in your environment. There are a few guidelines that we need
-contributors to follow so that we can have a chance of keeping on top of things.
-
-You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing)
-
-### Authors
-* Jeff McCune <jeff@puppetlabs.com>
-* Dan Bode <dan@puppetlabs.com>
-* RPM/RHEL packages by Vincent Janelle <randomfrequency@gmail.com>
-* Puppetlabs Module Team
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Rakefile
deleted file mode 100644
index 5868545f200..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/Rakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.fail_on_warnings
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/TODO b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/TODO
deleted file mode 100644
index 8ae578e9e38..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-provider TODO -
-  - password should be a property and not a param
-     - what if we tried to log in as that user?
-  - can permissions from list_user_permissions contain whitespace?
-  - what about defaultfor :true?
-  - prefetching for performance
-  - rabbit plugin should require rabbitmq class
-  - rabbitmq class should be renamed server??
-  - service name should default to -server
-  - cannot find stomp package
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/README.markdown
deleted file mode 100644
index be52188c47b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/README.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
-Files
-=====
-
-Puppet comes with both a client and server for copying files around. The file
-serving function is provided as part of the central Puppet daemon,
-puppetmasterd, and the client function is used through the source attribute of
-file objects. Learn more at
-http://projects.puppetlabs.com/projects/puppet/wiki/File_Serving_Configuration
-
-You can use managed files like this:
-
-    class myclass {
-      package { mypackage: ensure => latest }
-      service { myservice: ensure => running }
-      file { "/etc/myfile":
-        source => "puppet://$servername/modules/mymodule/myfile"
-      }
-    }
-
-The files are searched for in:
-
-    $modulepath/mymodule/files/myfile
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez
deleted file mode 100644
index 6ef6d4ff148..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/amqp_client-2.3.1.ez and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez
deleted file mode 100644
index 4a28b72f832..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/files/plugins/rabbit_stomp-2.3.1.ez and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb
deleted file mode 100644
index 474e12885ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/facter/rabbitmq_erlang_cookie.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Fact: rabbitmq_erlang_cookie
-#
-# Purpose: To determine the current erlang cookie value.
-#
-# Resolution: Returns the cookie.
-Facter.add(:rabbitmq_erlang_cookie) do
-  confine :osfamily => %w[Debian RedHat Suse]
-
-  setcode do
-    if File.exists?('/var/lib/rabbitmq/.erlang.cookie')
-      File.read('/var/lib/rabbitmq/.erlang.cookie')
-    else
-      nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
deleted file mode 100644
index fcc3764fdd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'puppet'
-Puppet::Type.type(:rabbitmq_exchange).provide(:rabbitmqadmin) do
-
-  commands :rabbitmqctl => '/usr/sbin/rabbitmqctl'
-  commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
-  defaultfor :feature => :posix
-
-  def should_vhost
-    if @should_vhost
-      @should_vhost
-    else
-      @should_vhost = resource[:name].split('@')[1]
-    end
-  end
-
-  def self.all_vhosts
-    vhosts = []
-    parse_command(rabbitmqctl('list_vhosts')).collect do |vhost|
-        vhosts.push(vhost)
-    end
-    vhosts
-  end
-
-  def self.all_exchanges(vhost)
-    exchanges = []
-    parse_command(rabbitmqctl('list_exchanges', '-p', vhost, 'name', 'type'))
-  end
-
-  def self.parse_command(cmd_output)
-    # first line is:
-    # Listing exchanges/vhosts ...
-    # while the last line is
-    # ...done.
-    #
-    cmd_output.split(/\n/)[1..-2]
-  end
-
-  def self.instances
-    resources = []
-    all_vhosts.each do |vhost|
-        all_exchanges(vhost).collect do |line|
-            name, type = line.split()
-            if type.nil?
-                # if name is empty, it will wrongly get the type's value.
-                # This way type will get the correct value
-                type = name
-                name = ''
-            end
-            exchange = {
-              :type   => type,
-              :ensure => :present,
-              :name   => "%s@%s" % [name, vhost],
-            }
-            resources << new(exchange) if exchange[:type]
-        end
-    end
-    resources
-  end
-
-  def self.prefetch(resources)
-    packages = instances
-    resources.keys.each do |name|
-      if provider = packages.find{ |pkg| pkg.name == name }
-        resources[name].provider = provider
-      end
-    end
-  end
-
-  def exists?
-    @property_hash[:ensure] == :present
-  end
-
-  def create
-    vhost_opt = should_vhost ? "--vhost=#{should_vhost}" : ''
-    name = resource[:name].split('@')[0]
-    rabbitmqadmin('declare', 'exchange', vhost_opt, "--user=#{resource[:user]}", "--password=#{resource[:password]}", "name=#{name}", "type=#{resource[:type]}")
-    @property_hash[:ensure] = :present
-  end
-
-  def destroy
-    vhost_opt = should_vhost ? "--vhost=#{should_vhost}" : ''
-    name = resource[:name].split('@')[0]
-    rabbitmqadmin('delete', 'exchange', vhost_opt, "--user=#{resource[:user]}", "--password=#{resource[:password]}", "name=#{name}")
-    @property_hash[:ensure] = :absent
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
deleted file mode 100644
index e416cbe02b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-Puppet::Type.type(:rabbitmq_plugin).provide(:rabbitmqplugins) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    commands :rabbitmqplugins => 'rabbitmq-plugins'
-  else
-    has_command(:rabbitmqplugins, 'rabbitmq-plugins') do
-      environment :HOME => "/tmp"
-    end
-  end
-
-  defaultfor :feature => :posix
-
-  def self.instances
-    rabbitmqplugins('list', '-E').split(/\n/).map do |line|
-      if line.split(/\s+/)[1] =~ /^(\S+)$/
-        new(:name => $1)
-      else
-        raise Puppet::Error, "Cannot parse invalid plugins line: #{line}"
-      end
-    end
-  end
-
-  def create
-    rabbitmqplugins('enable', resource[:name])
-  end
-
-  def destroy
-    rabbitmqplugins('disable', resource[:name])
-  end
-
-  def exists?
-    rabbitmqplugins('list', '-E').split(/\n/).detect do |line|
-      line.split(/\s+/)[1].match(/^#{resource[:name]}$/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
deleted file mode 100644
index 9cb2e41c293..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require 'puppet'
-require 'set'
-Puppet::Type.type(:rabbitmq_user).provide(:rabbitmqctl) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    commands :rabbitmqctl => 'rabbitmqctl'
-  else
-     has_command(:rabbitmqctl, 'rabbitmqctl') do
-       environment :HOME => "/tmp"
-     end
-  end
-
-  defaultfor :feature => :posix
-
-  def self.instances
-    rabbitmqctl('list_users').split(/\n/)[1..-2].collect do |line|
-      if line =~ /^(\S+)(\s+\[.*?\]|)$/
-        new(:name => $1)
-      else
-        raise Puppet::Error, "Cannot parse invalid user line: #{line}"
-      end
-    end
-  end
-
-  def create
-    rabbitmqctl('add_user', resource[:name], resource[:password])
-    if resource[:admin] == :true
-      make_user_admin()
-    end
-  end
-
-  def destroy
-    rabbitmqctl('delete_user', resource[:name])
-  end
-
-  def exists?
-    rabbitmqctl('list_users').split(/\n/)[1..-2].detect do |line|
-      line.match(/^#{Regexp.escape(resource[:name])}(\s+(\[.*?\]|\S+)|)$/)
-    end
-  end
-
-  # def password
-  # def password=()
-  def admin
-    if usertags = get_user_tags
-      (:true if usertags.include?('administrator')) || :false
-    else
-      raise Puppet::Error, "Could not match line '#{resource[:name]} (true|false)' from list_users (perhaps you are running on an older version of rabbitmq that does not support admin users?)"
-    end
-  end
-
-
-  def admin=(state)
-    if state == :true
-      make_user_admin()
-    else
-      usertags = get_user_tags
-      usertags.delete('administrator')
-      rabbitmqctl('set_user_tags', resource[:name], usertags.entries.sort)
-    end
-  end
-
-  def make_user_admin
-    usertags = get_user_tags
-    usertags.add('administrator')
-    rabbitmqctl('set_user_tags', resource[:name], usertags.entries.sort)
-  end
-
-  private
-  def get_user_tags
-    match = rabbitmqctl('list_users').split(/\n/)[1..-2].collect do |line|
-      line.match(/^#{Regexp.escape(resource[:name])}\s+\[(.*?)\]/)
-    end.compact.first
-    Set.new(match[1].split(/, /)) if match
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
deleted file mode 100644
index 83bd808e2ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-Puppet::Type.type(:rabbitmq_user_permissions).provide(:rabbitmqctl) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    commands :rabbitmqctl => 'rabbitmqctl'
-  else
-     has_command(:rabbitmqctl, 'rabbitmqctl') do
-       environment :HOME => "/tmp"
-     end
-  end
-
-  defaultfor :feature=> :posix
-
-  # cache users permissions
-  def self.users(name, vhost)
-    @users = {} unless @users
-    unless @users[name]
-      @users[name] = {}
-      rabbitmqctl('list_user_permissions', name).split(/\n/)[1..-2].each do |line|
-        if line =~ /^(\S+)\s+(\S*)\s+(\S*)\s+(\S*)$/
-          @users[name][$1] =
-            {:configure => $2, :read => $4, :write => $3}
-        else
-          raise Puppet::Error, "cannot parse line from list_user_permissions:#{line}"
-        end
-      end
-    end
-    @users[name][vhost]
-  end
-
-  def users(name, vhost)
-    self.class.users(name, vhost)
-  end
-
-  def should_user
-    if @should_user
-      @should_user
-    else
-      @should_user = resource[:name].split('@')[0]
-    end
-  end
-
-  def should_vhost
-    if @should_vhost
-      @should_vhost
-    else
-      @should_vhost = resource[:name].split('@')[1]
-    end
-  end
-
-  def create
-    resource[:configure_permission] ||= "''"
-    resource[:read_permission]      ||= "''"
-    resource[:write_permission]     ||= "''"
-    rabbitmqctl('set_permissions', '-p', should_vhost, should_user, resource[:configure_permission], resource[:write_permission], resource[:read_permission]) 
-  end
-
-  def destroy
-    rabbitmqctl('clear_permissions', '-p', should_vhost, should_user)
-  end
-
-  # I am implementing prefetching in exists b/c I need to be sure
-  # that the rabbitmq package is installed before I make this call.
-  def exists?
-    users(should_user, should_vhost)
-  end
-
-  def configure_permission
-    users(should_user, should_vhost)[:configure]
-  end
-
-  def configure_permission=(perm)
-    set_permissions
-  end
-
-  def read_permission
-    users(should_user, should_vhost)[:read]
-  end
-
-  def read_permission=(perm)
-    set_permissions
-  end
-
-  def write_permission
-    users(should_user, should_vhost)[:write]
-  end
-
-  def write_permission=(perm)
-    set_permissions
-  end
-
-  # implement memoization so that we only call set_permissions once
-  def set_permissions
-    unless @permissions_set
-      @permissions_set = true
-      resource[:configure_permission] ||= configure_permission
-      resource[:read_permission]      ||= read_permission
-      resource[:write_permission]     ||= write_permission
-      rabbitmqctl('set_permissions', '-p', should_vhost, should_user,
-        resource[:configure_permission], resource[:write_permission],
-        resource[:read_permission]
-      )
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
deleted file mode 100644
index 2ee45c31119..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-Puppet::Type.type(:rabbitmq_vhost).provide(:rabbitmqctl) do
-
-  if Puppet::PUPPETVERSION.to_f < 3
-    commands :rabbitmqctl => 'rabbitmqctl'
-  else
-     has_command(:rabbitmqctl, 'rabbitmqctl') do
-       environment :HOME => "/tmp"
-     end
-  end
-
-  def self.instances
-    rabbitmqctl('list_vhosts').split(/\n/)[1..-2].map do |line|
-      if line =~ /^(\S+)$/
-        new(:name => $1)
-      else
-        raise Puppet::Error, "Cannot parse invalid user line: #{line}"
-      end
-    end
-  end
-
-  def create
-    rabbitmqctl('add_vhost', resource[:name])
-  end
-
-  def destroy
-    rabbitmqctl('delete_vhost', resource[:name])
-  end
-
-  def exists?
-    out = rabbitmqctl('list_vhosts').split(/\n/)[1..-2].detect do |line|
-      line.match(/^#{Regexp.escape(resource[:name])}$/)
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
deleted file mode 100644
index 6a96520c681..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_exchange.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_exchange) do
-  desc 'Native type for managing rabbitmq exchanges'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  newparam(:name, :namevar => true) do
-    desc 'Name of exchange'
-    newvalues(/^\S*@\S+$/)
-  end
-
-  newparam(:type) do
-    desc 'Exchange type to be set *on creation*'
-    newvalues(/^\S+$/)
-  end
-
-  newparam(:user) do
-    desc 'The user to use to connect to rabbitmq'
-    defaultto('guest')
-    newvalues(/^\S+$/)
-  end
-
-  newparam(:password) do
-    desc 'The password to use to connect to rabbitmq'
-    defaultto('guest')
-    newvalues(/\S+/)
-  end
-
-  validate do
-    if self[:ensure] == :present and self[:type].nil?
-      raise ArgumentError, "must set type when creating exchange for #{self[:name]} whose type is #{self[:type]}"
-    end
-  end
-
-  autorequire(:rabbitmq_vhost) do
-    [self[:name].split('@')[1]]
-  end
-
-  autorequire(:rabbitmq_user) do
-    [self[:user]]
-  end
-
-  autorequire(:rabbitmq_user_permissions) do
-    ["#{self[:user]}@#{self[:name].split('@')[1]}"]
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb
deleted file mode 100644
index 497ced4e6b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_plugin.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_plugin) do
-  desc 'manages rabbitmq plugins'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  newparam(:name, :namevar => true) do
-    'name of the plugin to enable'
-    newvalues(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
deleted file mode 100644
index 642710d1c07..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_user) do
-  desc 'Native type for managing rabbitmq users'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  autorequire(:service) { 'rabbitmq-server' }
-
-  newparam(:name, :namevar => true) do
-    desc 'Name of user'
-    newvalues(/^\S+$/)
-  end
-
-  # newproperty(:password) do
-  newparam(:password) do
-    desc 'User password to be set *on creation*'
-  end
-
-  newproperty(:admin) do
-    desc 'rather or not user should be an admin'
-    newvalues(/true|false/)
-    munge do |value|
-      # converting to_s incase its a boolean
-      value.to_s.to_sym
-    end
-    defaultto :false
-  end
-
-  validate do
-    if self[:ensure] == :present and ! self[:password]
-      raise ArgumentError, 'must set password when creating user' unless self[:password]
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
deleted file mode 100644
index 493d47c88a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_user_permissions.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_user_permissions) do
-  desc 'Type for managing rabbitmq user permissions'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  autorequire(:service) { 'rabbitmq-server' }
-
-  newparam(:name, :namevar => true) do
-    desc 'combination of user@vhost to grant privileges to'
-    newvalues(/^\S+@\S+$/)
-  end
-
-  newproperty(:configure_permission) do
-    desc 'regexp representing configuration permissions'
-    validate do |value|
-      resource.validate_permissions(value)
-    end
-  end
-
-  newproperty(:read_permission) do
-    desc 'regexp representing read permissions'
-    validate do |value|
-      resource.validate_permissions(value)
-    end
-  end
-
-  newproperty(:write_permission) do
-    desc 'regexp representing write permissions'
-    validate do |value|
-      resource.validate_permissions(value)
-    end
-  end
-
-  autorequire(:rabbitmq_vhost) do
-    [self[:name].split('@')[1]]
-  end
-
-  autorequire(:rabbitmq_user) do
-    [self[:name].split('@')[0]]
-  end
-
-  # I may want to dissalow whitespace
-  def validate_permissions(value)
-    begin
-      Regexp.new(value)
-    rescue RegexpError
-      raise ArgumentError, "Invalid regexp #{value}"
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb
deleted file mode 100644
index 9dd0982dcac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/lib/puppet/type/rabbitmq_vhost.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-Puppet::Type.newtype(:rabbitmq_vhost) do
-  desc 'manages rabbitmq vhosts'
-
-  ensurable do
-    defaultto(:present)
-    newvalue(:present) do
-      provider.create
-    end
-    newvalue(:absent) do
-      provider.destroy
-    end
-  end
-
-  newparam(:name, :namevar => true) do
-    'name of the vhost to add'
-    newvalues(/^\S+$/)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp
deleted file mode 100644
index 96877f6a631..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/config.pp
+++ /dev/null
@@ -1,117 +0,0 @@
-class rabbitmq::config {
-
-  $cluster_disk_nodes         = $rabbitmq::cluster_disk_nodes
-  $cluster_node_type          = $rabbitmq::cluster_node_type
-  $cluster_nodes              = $rabbitmq::cluster_nodes
-  $config                     = $rabbitmq::config
-  $config_cluster             = $rabbitmq::config_cluster
-  $config_path                = $rabbitmq::config_path
-  $config_stomp               = $rabbitmq::config_stomp
-  $default_user               = $rabbitmq::default_user
-  $default_pass               = $rabbitmq::default_pass
-  $env_config                 = $rabbitmq::env_config
-  $env_config_path            = $rabbitmq::env_config_path
-  $erlang_cookie              = $rabbitmq::erlang_cookie
-  $node_ip_address            = $rabbitmq::node_ip_address
-  $plugin_dir                 = $rabbitmq::plugin_dir
-  $port                       = $rabbitmq::port
-  $service_name               = $rabbitmq::service_name
-  $ssl                        = $rabbitmq::ssl
-  $ssl_cacert                 = $rabbitmq::ssl_cacert
-  $ssl_cert                   = $rabbitmq::ssl_cert
-  $ssl_key                    = $rabbitmq::ssl_key
-  $ssl_management_port        = $rabbitmq::ssl_management_port
-  $ssl_stomp_port             = $rabbitmq::ssl_stomp_port
-  $stomp_port                 = $rabbitmq::stomp_port
-  $wipe_db_on_cookie_change   = $rabbitmq::wipe_db_on_cookie_change
-  $config_variables           = $rabbitmq::config_variables
-  $config_kernel_variables    = $rabbitmq::config_kernel_variables
-  $cluster_partition_handling = $rabbitmq::cluster_partition_handling
-  $default_env_variables      =  {
-    'RABBITMQ_NODE_PORT'        => $port,
-    'RABBITMQ_NODE_IP_ADDRESS'  => $node_ip_address
-  }
-
-  # Handle env variables.
-  $environment_variables = merge($default_env_variables, $rabbitmq::environment_variables)
-
-  # Handle deprecated option.
-  if $cluster_disk_nodes != [] {
-    notify { 'cluster_disk_nodes':
-      message => 'WARNING: The cluster_disk_nodes is deprecated.
-       Use cluster_nodes instead.',
-    }
-    $r_cluster_nodes = $cluster_disk_nodes
-  } else {
-    $r_cluster_nodes = $cluster_nodes
-  }
-
-  file { '/etc/rabbitmq':
-    ensure  => directory,
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-  }
-
-  file { '/etc/rabbitmq/ssl':
-    ensure  => directory,
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-  }
-
-  file { 'rabbitmq.config':
-    ensure  => file,
-    path    => $config_path,
-    content => template($config),
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-    notify  => Class['rabbitmq::service'],
-  }
-
-  file { 'rabbitmq-env.config':
-    ensure  => file,
-    path    => $env_config_path,
-    content => template($env_config),
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
-    notify  => Class['rabbitmq::service'],
-  }
-
-
-  if $config_cluster {
-
-    file { 'erlang_cookie':
-      ensure  => 'present',
-      path    => '/var/lib/rabbitmq/.erlang.cookie',
-      owner   => 'rabbitmq',
-      group   => 'rabbitmq',
-      mode    => '0400',
-      content => $erlang_cookie,
-      replace => true,
-      before  => File['rabbitmq.config'],
-      notify  => Class['rabbitmq::service'],
-    }
-
-    # rabbitmq_erlang_cookie is a fact in this module.
-    if $erlang_cookie != $::rabbitmq_erlang_cookie {
-      # Safety check.
-      if $wipe_db_on_cookie_change {
-        exec { 'wipe_db':
-          command    => "puppet resource service ${service_name} ensure=stopped; rm -rf /var/lib/rabbitmq/mnesia",
-          path       => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
-        }
-        File['erlang_cookie'] {
-          require => Exec['wipe_db'],
-        }
-      } else {
-        fail("ERROR: The current erlang cookie is ${::rabbitmq_erlang_cookie} and needs to change to ${erlang_cookie}. In order to do this the RabbitMQ database needs to be wiped.  Please set the parameter called wipe_db_on_cookie_change to true to allow this to happen automatically.")
-      }
-    }
-
-  }
-
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp
deleted file mode 100644
index 6c14f0097d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/init.pp
+++ /dev/null
@@ -1,169 +0,0 @@
-  #
-class rabbitmq(
-  $admin_enable               = $rabbitmq::params::admin_enable,
-  $cluster_disk_nodes         = $rabbitmq::params::cluster_disk_nodes,
-  $cluster_node_type          = $rabbitmq::params::cluster_node_type,
-  $cluster_nodes              = $rabbitmq::params::cluster_nodes,
-  $config                     = $rabbitmq::params::config,
-  $config_cluster             = $rabbitmq::params::config_cluster,
-  $config_path                = $rabbitmq::params::config_path,
-  $config_stomp               = $rabbitmq::params::config_stomp,
-  $default_user               = $rabbitmq::params::default_user,
-  $default_pass               = $rabbitmq::params::default_pass,
-  $delete_guest_user          = $rabbitmq::params::delete_guest_user,
-  $env_config                 = $rabbitmq::params::env_config,
-  $env_config_path            = $rabbitmq::params::env_config_path,
-  $erlang_cookie              = $rabbitmq::params::erlang_cookie,
-  $management_port            = $rabbitmq::params::management_port,
-  $node_ip_address            = $rabbitmq::params::node_ip_address,
-  $package_apt_pin            = $rabbitmq::params::package_apt_pin,
-  $package_ensure             = $rabbitmq::params::package_ensure,
-  $package_gpg_key            = $rabbitmq::params::package_gpg_key,
-  $package_name               = $rabbitmq::params::package_name,
-  $package_provider           = $rabbitmq::params::package_provider,
-  $package_source             = $rabbitmq::params::package_source,
-  $manage_repos               = $rabbitmq::params::manage_repos,
-  $plugin_dir                 = $rabbitmq::params::plugin_dir,
-  $port                       = $rabbitmq::params::port,
-  $service_ensure             = $rabbitmq::params::service_ensure,
-  $service_manage             = $rabbitmq::params::service_manage,
-  $service_name               = $rabbitmq::params::service_name,
-  $ssl                        = $rabbitmq::params::ssl,
-  $ssl_cacert                 = $rabbitmq::params::ssl_cacert,
-  $ssl_cert                   = $rabbitmq::params::ssl_cert,
-  $ssl_key                    = $rabbitmq::params::ssl_key,
-  $ssl_management_port        = $rabbitmq::params::ssl_management_port,
-  $ssl_stomp_port             = $rabbitmq::params::ssl_stomp_port,
-  $ssl_verify                 = $rabbitmq::params::ssl_verify,
-  $ssl_fail_if_no_peer_cert   = $rabbitmq::params::ssl_fail_if_no_peer_cert,
-  $stomp_ensure               = $rabbitmq::params::stomp_ensure,
-  $ldap_auth                  = $rabbitmq::params::ldap_auth,
-  $ldap_server                = $rabbitmq::params::ldap_server,
-  $ldap_user_dn_pattern       = $rabbitmq::params::ldap_user_dn_pattern,
-  $ldap_use_ssl               = $rabbitmq::params::ldap_use_ssl,
-  $ldap_port                  = $rabbitmq::params::ldap_port,
-  $ldap_log                   = $rabbitmq::params::ldap_log,
-  $stomp_port                 = $rabbitmq::params::stomp_port,
-  $version                    = $rabbitmq::params::version,
-  $wipe_db_on_cookie_change   = $rabbitmq::params::wipe_db_on_cookie_change,
-  $cluster_partition_handling = $rabbitmq::params::cluster_partition_handling,
-  $environment_variables      = $rabbitmq::params::environment_variables,
-  $config_variables           = $rabbitmq::params::config_variables,
-  $config_kernel_variables    = $rabbitmq::params::config_kernel_variables,
-) inherits rabbitmq::params {
-
-  validate_bool($admin_enable)
-  # Validate install parameters.
-  validate_re($package_apt_pin, '^(|\d+)$')
-  validate_string($package_ensure)
-  validate_string($package_gpg_key)
-  validate_string($package_name)
-  validate_string($package_provider)
-  validate_string($package_source)
-  validate_bool($manage_repos)
-  validate_re($version, '^\d+\.\d+\.\d+(-\d+)*$') # Allow 3 digits and optional -n postfix.
-  # Validate config parameters.
-  validate_array($cluster_disk_nodes)
-  validate_re($cluster_node_type, '^(ram|disc)$')
-  validate_array($cluster_nodes)
-  validate_string($config)
-  validate_absolute_path($config_path)
-  validate_bool($config_cluster)
-  validate_bool($config_stomp)
-  validate_string($default_user)
-  validate_string($default_pass)
-  validate_bool($delete_guest_user)
-  validate_string($env_config)
-  validate_absolute_path($env_config_path)
-  validate_string($erlang_cookie)
-  validate_re($management_port, '\d+')
-  validate_string($node_ip_address)
-  validate_absolute_path($plugin_dir)
-  validate_re($port, ['\d+','UNSET'])
-  validate_re($stomp_port, '\d+')
-  validate_bool($wipe_db_on_cookie_change)
-  # Validate service parameters.
-  validate_re($service_ensure, '^(running|stopped)$')
-  validate_bool($service_manage)
-  validate_string($service_name)
-  validate_bool($ssl)
-  validate_string($ssl_cacert)
-  validate_string($ssl_cert)
-  validate_string($ssl_key)
-  validate_string($ssl_management_port)
-  validate_re($ssl_management_port, '\d+')
-  validate_string($ssl_stomp_port)
-  validate_re($ssl_stomp_port, '\d+')
-  validate_bool($stomp_ensure)
-  validate_bool($ldap_auth)
-  validate_string($ldap_server)
-  validate_string($ldap_user_dn_pattern)
-  validate_bool($ldap_use_ssl)
-  validate_re($ldap_port, '\d+')
-  validate_bool($ldap_log)
-  validate_hash($environment_variables)
-  validate_hash($config_variables)
-  validate_hash($config_kernel_variables)
-
-  include '::rabbitmq::install'
-  include '::rabbitmq::config'
-  include '::rabbitmq::service'
-  include '::rabbitmq::management'
-
-  if $rabbitmq::manage_repos == true {
-    case $::osfamily {
-      'RedHat', 'SUSE':
-        { include '::rabbitmq::repo::rhel' }
-      'Debian':
-        { include '::rabbitmq::repo::apt' }
-      default:
-        { }
-    }
-  }
-
-  if $admin_enable and $service_manage {
-    include '::rabbitmq::install::rabbitmqadmin'
-
-    rabbitmq_plugin { 'rabbitmq_management':
-      ensure  => present,
-      require => Class['rabbitmq::install'],
-      notify  => Class['rabbitmq::service'],
-      provider => 'rabbitmqplugins'
-    }
-
-    Class['::rabbitmq::service'] -> Class['::rabbitmq::install::rabbitmqadmin']
-  }
-
-  if $stomp_ensure {
-    rabbitmq_plugin { 'rabbitmq_stomp':
-      ensure  => $stomp_ensure,
-      require => Class['rabbitmq::install'],
-      notify  => Class['rabbitmq::service'],
-      provider => 'rabbitmqplugins'
-    }
-  }
-
-  if ($ldap_auth) {
-    rabbitmq_plugin { 'rabbitmq_auth_backend_ldap':
-      ensure   => present,
-      require  => Class['rabbitmq::install'],
-      notify   => Class['rabbitmq::service'],
-      provider => 'rabbitmqplugins',
-    }
-  }
-
-  # Anchor this as per #8040 - this ensures that classes won't float off and
-  # mess everything up.  You can read about this at:
-  # http://docs.puppetlabs.com/puppet/2.7/reference/lang_containment.html#known-issues
-  anchor { 'rabbitmq::begin': }
-  anchor { 'rabbitmq::end': }
-
-  Anchor['rabbitmq::begin'] -> Class['::rabbitmq::install']
-    -> Class['::rabbitmq::config'] ~> Class['::rabbitmq::service']
-    -> Class['::rabbitmq::management'] -> Anchor['rabbitmq::end']
-
-  # Make sure the various providers have their requirements in place.
-  Class['::rabbitmq::install'] -> Rabbitmq_plugin<| |>
-  Class['::rabbitmq::install::rabbitmqadmin'] -> Rabbitmq_exchange<| |>
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install.pp
deleted file mode 100644
index 09fe3b32134..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class rabbitmq::install {
-
-  $package_ensure   = $rabbitmq::package_ensure
-  $package_name     = $rabbitmq::package_name
-  $package_provider = $rabbitmq::package_provider
-  $package_source   = $rabbitmq::package_source
-
-  package { 'rabbitmq-server':
-    ensure   => $package_ensure,
-    name     => $package_name,
-    provider => $package_provider,
-    notify   => Class['rabbitmq::service'],
-  }
-
-  if $package_source {
-    Package['rabbitmq-server'] {
-      source  => $package_source,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp
deleted file mode 100644
index aae05f928c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/install/rabbitmqadmin.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-class rabbitmq::install::rabbitmqadmin {
-
-  $management_port = $rabbitmq::management_port
-
-  staging::file { 'rabbitmqadmin':
-    target  => '/var/lib/rabbitmq/rabbitmqadmin',
-    source  => "http://localhost:${management_port}/cli/rabbitmqadmin",
-    require => [
-      Class['rabbitmq::service'],
-      Rabbitmq_plugin['rabbitmq_management']
-    ],
-  }
-
-  file { '/usr/local/bin/rabbitmqadmin':
-    owner   => 'root',
-    group   => 'root',
-    source  => '/var/lib/rabbitmq/rabbitmqadmin',
-    mode    => '0755',
-    require => Staging::File['rabbitmqadmin'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp
deleted file mode 100644
index 481a7b4f931..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/management.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-class rabbitmq::management {
-
-  $delete_guest_user = $rabbitmq::delete_guest_user
-
-  if $delete_guest_user {
-    rabbitmq_user{ 'guest':
-      ensure   => absent,
-      provider => 'rabbitmqctl',
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp
deleted file mode 100644
index 9018bb7b244..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/params.pp
+++ /dev/null
@@ -1,96 +0,0 @@
-  # Class: rabbitmq::params
-#
-#   The RabbitMQ Module configuration settings.
-#
-class rabbitmq::params {
-
-  case $::osfamily {
-    'Archlinux': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq'
-      $service_name     = 'rabbitmq'
-      $package_source   = ''
-      $version          = '3.1.3-1'
-      $base_version     = regsubst($version,'^(.*)-\d$','\1')
-      # This must remain at the end as we need $base_version and $version defined first
-    }
-    'Debian': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq-server'
-      $service_name     = 'rabbitmq-server'
-      $package_provider = 'apt'
-      $package_source   = ''
-      $version          = '3.1.5'
-    }
-    'RedHat': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq-server'
-      $service_name     = 'rabbitmq-server'
-      $package_provider = 'yum'
-      $version          = '3.1.5-1'
-      $base_version     = regsubst($version,'^(.*)-\d$','\1')
-      # This must remain at the end as we need $base_version and $version defined first.
-      $package_source   = "http://www.rabbitmq.com/releases/rabbitmq-server/v${base_version}/rabbitmq-server-${version}.noarch.rpm"
-    }
-    'SUSE': {
-      $package_ensure   = 'installed'
-      $package_name     = 'rabbitmq-server'
-      $service_name     = 'rabbitmq-server'
-      $package_provider = 'zypper'
-      $version          = '3.1.5-1'
-      $base_version     = regsubst($version,'^(.*)-\d$','\1')
-      # This must remain at the end as we need $base_version and $version defined first.
-      $package_source   = "http://www.rabbitmq.com/releases/rabbitmq-server/v${base_version}/rabbitmq-server-${version}.noarch.rpm"
-    }
-    default: {
-      fail("The ${module_name} module is not supported on an ${::osfamily} based system.")
-    }
-  }
-
-  #install
-  $admin_enable               = true
-  $management_port            = '15672'
-  $package_apt_pin            = ''
-  $package_gpg_key            = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc'
-  $manage_repos               = true
-  $service_ensure             = 'running'
-  $service_manage             = true
-  #config
-  $cluster_disk_nodes         = []
-  $cluster_node_type          = 'disc'
-  $cluster_nodes              = []
-  $config                     = 'rabbitmq/rabbitmq.config.erb'
-  $config_cluster             = false
-  $config_path                = '/etc/rabbitmq/rabbitmq.config'
-  $config_stomp               = false
-  $default_user               = 'guest'
-  $default_pass               = 'guest'
-  $delete_guest_user          = false
-  $env_config                 = 'rabbitmq/rabbitmq-env.conf.erb'
-  $env_config_path            = '/etc/rabbitmq/rabbitmq-env.conf'
-  $erlang_cookie              = 'EOKOWXQREETZSHFNTPEY'
-  $node_ip_address            = 'UNSET'
-  $plugin_dir                 = "/usr/lib/rabbitmq/lib/rabbitmq_server-${version}/plugins"
-  $port                       = '5672'
-  $ssl                        = false
-  $ssl_cacert                 = 'UNSET'
-  $ssl_cert                   = 'UNSET'
-  $ssl_key                    = 'UNSET'
-  $ssl_management_port        = '5671'
-  $ssl_stomp_port             = '6164'
-  $ssl_verify                 = 'verify_none'
-  $ssl_fail_if_no_peer_cert   = 'false'
-  $stomp_ensure               = false
-  $ldap_auth                  = false
-  $ldap_server                = 'ldap'
-  $ldap_user_dn_pattern       = 'cn=${username},ou=People,dc=example,dc=com'
-  $ldap_use_ssl               = false
-  $ldap_port                  = '389'
-  $ldap_log                   = false
-  $stomp_port                 = '6163'
-  $wipe_db_on_cookie_change   = false
-  $cluster_partition_handling = 'ignore'
-  $environment_variables      = {}
-  $config_variables           = {}
-  $config_kernel_variables    = {}
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp
deleted file mode 100644
index 28635f6783f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/apt.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# requires
-#   puppetlabs-apt
-#   puppetlabs-stdlib
-class rabbitmq::repo::apt(
-  $location    = 'http://www.rabbitmq.com/debian/',
-  $release     = 'testing',
-  $repos       = 'main',
-  $include_src = false,
-  $key         = '056E8E56',
-  $key_source  = 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc',
-  ) {
-
-  $pin = $rabbitmq::package_apt_pin
-
-  Class['rabbitmq::repo::apt'] -> Package<| title == 'rabbitmq-server' |>
-
-  apt::source { 'rabbitmq':
-    location    => $location,
-    release     => $release,
-    repos       => $repos,
-    include_src => $include_src,
-    key         => $key,
-    key_source  => $key_source,
-  }
-
-  if $pin {
-    validate_re($pin, '\d\d\d')
-    apt::pin { 'rabbitmq':
-      packages => 'rabbitmq-server',
-      priority => $pin,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp
deleted file mode 100644
index f2271cd4677..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/repo/rhel.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-class rabbitmq::repo::rhel {
-
-  $package_gpg_key = $rabbitmq::package_gpg_key
-
-  Class['rabbitmq::repo::rhel'] -> Package<| title == 'rabbitmq-server' |>
-
-  exec { "rpm --import ${package_gpg_key}":
-    path   => ['/bin','/usr/bin','/sbin','/usr/sbin'],
-    onlyif => 'test `rpm -qa | grep gpg-pubkey-056e8e56-468e43f2 | wc -l` -eq 0',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp
deleted file mode 100644
index 495ea2f2dfc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/server.pp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Class: rabbitmq::server
-#
-# This module manages the installation and config of the rabbitmq server
-#   it has only been tested on certain version of debian-ish systems
-# Parameters:
-#  [*port*] - port where rabbitmq server is hosted
-#  [*delete_guest_user*] - rather or not to delete the default user
-#  [*version*] - version of rabbitmq-server to install
-#  [*package_name*] - name of rabbitmq package
-#  [*service_name*] - name of rabbitmq service
-#  [*service_ensure*] - desired ensure state for service
-#  [*stomp_port*] - port stomp should be listening on
-#  [*node_ip_address*] - ip address for rabbitmq to bind to
-#  [*config*] - contents of config file
-#  [*env_config*] - contents of env-config file
-#  [*config_cluster*] - whether to configure a RabbitMQ cluster
-#  [*config_mirrored_queues*] - DEPRECATED (doesn't do anything)
-#  [*cluster_disk_nodes*] - DEPRECATED (use cluster_nodes instead)
-#  [*cluster_nodes*] - which nodes to cluster with (including the current one)
-#  [*cluster_node_type*] - Type of cluster node (disc or ram)
-#  [*erlang_cookie*] - erlang cookie, must be the same for all nodes in a cluster
-#  [*wipe_db_on_cookie_change*] - whether to wipe the RabbitMQ data if the specified
-#    erlang_cookie differs from the current one. This is a sad parameter: actually,
-#    if the cookie indeed differs, then wiping the database is the *only* thing you
-#    can do. You're only required to set this parameter to true as a sign that you
-#    realise this.
-# Requires:
-#  stdlib
-# Sample Usage:
-#
-# This module is used as backward compability layer for modules
-# which require rabbitmq::server instead of rabbitmq class.
-# It's still common uasge in many modules.
-#
-#
-# [Remember: No empty lines between comments and class definition]
-class rabbitmq::server(
-  $port                     = $rabbitmq::params::port,
-  $delete_guest_user        = $rabbitmq::params::delete_guest_user,
-  $package_name             = $rabbitmq::params::package_name,
-  $version                  = $rabbitmq::params::version,
-  $service_name             = $rabbitmq::params::service_name,
-  $service_ensure           = $rabbitmq::params::service_ensure,
-  $service_manage           = $rabbitmq::params::service_manage,
-  $config_stomp             = $rabbitmq::params::config_stomp,
-  $stomp_port               = $rabbitmq::params::stomp_port,
-  $config_cluster           = $rabbitmq::params::config_cluster,
-  $cluster_disk_nodes       = $rabbitmq::params::cluster_disk_nodes,
-  $cluster_nodes            = $rabbitmq::params::cluster_nodes,
-  $cluster_node_type        = $rabbitmq::params::cluster_node_type,
-  $node_ip_address          = $rabbitmq::params::node_ip_address,
-  $config                   = $rabbitmq::params::config,
-  $env_config               = $rabbitmq::params::env_config,
-  $erlang_cookie            = $rabbitmq::params::erlang_cookie,
-  $wipe_db_on_cookie_change = $rabbitmq::params::wipe_db_on_cookie_change,
-  # DEPRECATED
-  $manage_service           = undef,
-  $config_mirrored_queues   = undef,
-) inherits rabbitmq::params {
-
-  if $manage_service != undef {
-    warning('The $manage_service parameter is deprecated; please use $service_manage instead')
-    $_service_manage = $manage_service
-  } else {
-    $_service_manage = $service_manage
-  }
-
-  if $config_mirrored_queues != undef {
-    warning('The $config_mirrored_queues parameter is deprecated; it does not affect anything')
-  }
-
-  anchor {'before::rabbimq::class':
-    before => Class['rabbitmq'],
-  }
-
-  anchor {'after::rabbimq::class':
-    require => Class['rabbitmq'],
-  }
-
-  class { 'rabbitmq':
-    port                      => $port,
-    delete_guest_user         => $delete_guest_user,
-    package_name              => $package_name,
-    version                   => $version,
-    service_name              => $service_name,
-    service_ensure            => $service_ensure,
-    service_manage            => $_service_manage,
-    config_stomp              => $config_stomp,
-    stomp_port                => $stomp_port,
-    config_cluster            => $config_cluster,
-    cluster_disk_nodes        => $cluster_disk_nodes,
-    cluster_nodes             => $cluster_nodes,
-    cluster_node_type         => $cluster_node_type,
-    node_ip_address           => $node_ip_address,
-    config                    => $config,
-    env_config                => $env_config,
-    erlang_cookie             => $erlang_cookie,
-    wipe_db_on_cookie_change  => $wipe_db_on_cookie_change,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/service.pp
deleted file mode 100644
index c01aa64ad35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/manifests/service.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Class: rabbitmq::service
-#
-#   This class manages the rabbitmq server service itself.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class rabbitmq::service(
-  $service_ensure = $rabbitmq::service_ensure,
-  $service_manage = $rabbitmq::service_manage,
-  $service_name   = $rabbitmq::service_name,
-) inherits rabbitmq {
-
-  validate_re($service_ensure, '^(running|stopped)$')
-  validate_bool($service_manage)
-
-  if ($service_manage) {
-    if $service_ensure == 'running' {
-      $ensure_real = 'running'
-      $enable_real = true
-    } else {
-      $ensure_real = 'stopped'
-      $enable_real = false
-    }
-
-    service { 'rabbitmq-server':
-      ensure     => $ensure_real,
-      enable     => $enable_real,
-      hasstatus  => true,
-      hasrestart => true,
-      name       => $service_name,
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/README.markdown
deleted file mode 100644
index 286d3417dc6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/README.markdown
+++ /dev/null
@@ -1,7 +0,0 @@
-Specs
-=====
-
-The Puppet project uses RSpec for testing.
-
-For more information on RSpec, see http://rspec.info/
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb
deleted file mode 100644
index c0b5576736a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/class_spec.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq class:' do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'SUSE'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Debian'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Archlinux'
-    package_name = 'rabbitmq'
-    service_name = 'rabbitmq'
-  end
-
-  context "default class inclusion" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      # Apply twice to ensure no errors the second time.
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_changes => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }      
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  context "disable and stop service" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq':
-        service_ensure => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should_not be_enabled }
-      it { should_not be_running }
-    end
-  end
-
-  context "service is unmanaged" do
-    it 'should run successfully' do
-      pp_pre = <<-EOS
-      class { 'rabbitmq': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      pp = <<-EOS
-      class { 'rabbitmq':
-        service_manage => false,
-        service_ensure  => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      
-      apply_manifest(pp_pre, :catch_failures => true)
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb
deleted file mode 100644
index 04627fa6ff6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/clustering_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq clustering' do
-  context 'rabbitmq::config_cluster => true' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq': 
-        config_cluster           => true,
-        cluster_nodes            => ['rabbit1', 'rabbit2'],
-        cluster_node_type        => 'ram',
-        wipe_db_on_cookie_change => true,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
- 
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/etc/rabbitmq/rabbitmq.config') do
-      it { should be_file }
-      it { should contain 'cluster_nodes' }
-      it { should contain 'rabbit@rabbit1' }
-      it { should contain 'rabbit@rabbit2' }
-      it { should contain 'ram' }
-    end
-
-    describe file('/var/lib/rabbitmq/.erlang.cookie') do
-      it { should be_file }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb
deleted file mode 100644
index d480e88438d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/delete_guest_user_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq with delete_guest_user' do
-  context 'delete_guest_user' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq': 
-        port              => '5672',
-        delete_guest_user => true,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-      shell('rabbitmqctl list_users > /tmp/rabbitmqctl_users')
-    end
-
-    describe file('/tmp/rabbitmqctl_users') do
-      it { should be_file }
-      it { should_not contain 'guest' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index ce47212a8c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level: debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
deleted file mode 100644
index f4b2366f3bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1310-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1310-x64:
-    roles:
-      - master
-    platform: ubuntu-13.10-amd64
-    box : ubuntu-server-1310-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-1310-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
deleted file mode 100644
index 4cb4ad43090..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-HOSTS:
-  ubuntu-server-1404-x64:
-    roles:
-      - master
-    platform: ubuntu-14.04-amd64
-    box : trusty-server-cloudimg-amd64-vagrant-disk1
-    box_url : https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box
-    hypervisor : vagrant
-CONFIG:
-  log_level   : debug
-  type: git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb
deleted file mode 100644
index 618f8203428..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/rabbitmqadmin_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq::install::rabbitmqadmin class' do
-  context 'does nothing if service is unmanaged' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq':
-        admin_enable   => true,
-        service_manage => false,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      shell('rm -f /var/lib/rabbitmq/rabbitmqadmin')
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/var/lib/rabbitmq/rabbitmqadmin') do
-      it { should_not be_file }
-    end
-  end
-
-  context 'downloads the cli tools' do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq':
-        admin_enable   => true,
-        service_manage => true,
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe file('/var/lib/rabbitmq/rabbitmqadmin') do
-      it { should be_file }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb
deleted file mode 100644
index d99f995db53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/acceptance/server_spec.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-require 'spec_helper_acceptance'
-
-describe 'rabbitmq server:' do
-  case fact('osfamily')
-  when 'RedHat'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'SUSE'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Debian'
-    package_name = 'rabbitmq-server'
-    service_name = 'rabbitmq-server'
-  when 'Archlinux'
-    package_name = 'rabbitmq'
-    service_name = 'rabbitmq'
-  end
-
-  context "default class inclusion" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq::server': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      # Apply twice to ensure no errors the second time.
-      apply_manifest(pp, :catch_failures => true)
-      expect(apply_manifest(pp, :catch_changes => true).exit_code).to be_zero
-    end
-
-    describe package(package_name) do
-      it { should be_installed }      
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-
-  context "disable and stop service" do
-    it 'should run successfully' do
-      pp = <<-EOS
-      class { 'rabbitmq::server':
-        service_ensure => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should_not be_enabled }
-      it { should_not be_running }
-    end
-  end
-
-  context "service is unmanaged" do
-    it 'should run successfully' do
-      pp_pre = <<-EOS
-      class { 'rabbitmq::server': }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      pp = <<-EOS
-      class { 'rabbitmq::server':
-        service_manage => false,
-        service_ensure  => 'stopped',
-      }
-      if $::osfamily == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq::server']
-      }
-      EOS
-
-      
-      apply_manifest(pp_pre, :catch_failures => true)
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
deleted file mode 100644
index 3e577843e8a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/classes/rabbitmq_spec.rb
+++ /dev/null
@@ -1,486 +0,0 @@
-require 'spec_helper'
-
-describe 'rabbitmq' do
-
-  context 'on unsupported distributions' do
-    let(:facts) {{ :osfamily => 'Unsupported' }}
-
-    it 'we fail' do
-      expect { subject }.to raise_error(/not supported on an Unsupported/)
-    end
-  end
-
-  context 'on Debian' do
-    let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
-    it 'includes rabbitmq::repo::apt' do
-      should contain_class('rabbitmq::repo::apt')
-    end
-
-    describe 'apt::source default values' do
-      let(:facts) {{ :osfamily => 'Debian' }}
-      it 'should add a repo with defaults values' do
-        contain_file('/etc/apt/sources.list.d/rabbitmq.list')\
-          .with_content(/deb http\:\/\/www\.rabbitmq.com\/debian\/ testing main/)
-      end
-    end
-
-    describe 'apt::source custom values' do
-      let(:params) {
-        { :location => 'http://www.foorepo.com/debian',
-          :release => 'unstable',
-          :repos => 'main'
-        }}
-      it 'should add a repo with custom new values' do
-        contain_file('/etc/apt/sources.list.d/rabbitmq.list')\
-          .with_content(/deb http\:\/\/www\.foorepo.com\/debian\/ unstable main/)
-      end
-    end
-  end
-
-  context 'on Debian' do
-    let(:params) {{ :manage_repos => false }}
-    let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze' }}
-    it 'does not include rabbitmq::repo::apt when manage_repos is false' do
-      should_not contain_class('rabbitmq::repo::apt')
-    end
-  end
-
-  context 'on Redhat' do
-    let(:facts) {{ :osfamily => 'RedHat' }}
-    it 'includes rabbitmq::repo::rhel' do
-      should contain_class('rabbitmq::repo::rhel')
-    end
-  end
-
-  context 'on Redhat' do
-    let(:params) {{ :manage_repos => false }}
-    let(:facts) {{ :osfamily => 'RedHat' }}
-    it 'does not include rabbitmq::repo::rhel when manage_repos is false' do
-      should_not contain_class('rabbitmq::repo::rhel')
-    end
-  end
-
-  ['Debian', 'RedHat', 'SUSE', 'Archlinux'].each do |distro|
-    context "on #{distro}" do
-      let(:facts) {{
-        :osfamily => distro,
-        :rabbitmq_erlang_cookie => 'EOKOWXQREETZSHFNTPEY',
-        :lsbdistcodename => 'squeeze',
-        :lsbdistid => 'Debian'
-      }}
-
-      it { should contain_class('rabbitmq::install') }
-      it { should contain_class('rabbitmq::config') }
-      it { should contain_class('rabbitmq::service') }
-
-
-      context 'with admin_enable set to true' do
-        let(:params) {{ :admin_enable => true }}
-        context 'with service_manage set to true' do
-          it 'we enable the admin interface by default' do
-            should contain_class('rabbitmq::install::rabbitmqadmin')
-            should contain_rabbitmq_plugin('rabbitmq_management').with(
-              'require' => 'Class[Rabbitmq::Install]',
-              'notify'  => 'Class[Rabbitmq::Service]'
-            )
-          end
-        end
-        context 'with service_manage set to false' do
-          let(:params) {{ :admin_enable => true, :service_manage => false }}
-          it 'should do nothing' do
-            should_not contain_class('rabbitmq::install::rabbitmqadmin')
-            should_not contain_rabbitmq_plugin('rabbitmq_management')
-          end
-        end
-      end
-
-      context 'deprecated parameters' do
-        describe 'cluster_disk_nodes' do
-          let(:params) {{ :cluster_disk_nodes => ['node1', 'node2'] }}
-
-          it { should contain_notify('cluster_disk_nodes') }
-        end
-      end
-
-      describe 'manages configuration directory correctly' do
-        it { should contain_file('/etc/rabbitmq').with(
-          'ensure' => 'directory'
-        )}
-      end
-
-      describe 'manages configuration file correctly' do
-        it { should contain_file('rabbitmq.config') }
-      end
-
-      context 'configures config_cluster' do
-        let(:facts) {{ :osfamily => distro, :rabbitmq_erlang_cookie => 'ORIGINAL', :lsbdistid => 'Debian' }}
-        let(:params) {{
-          :config_cluster           => true,
-          :cluster_nodes            => ['hare-1', 'hare-2'],
-          :cluster_node_type        => 'ram',
-          :erlang_cookie            => 'TESTCOOKIE',
-          :wipe_db_on_cookie_change => false
-        }}
-
-        describe 'with defaults' do
-          it 'fails' do
-            expect{subject}.to raise_error(/^ERROR: The current erlang cookie is ORIGINAL/)
-          end
-        end
-
-        describe 'with wipe_db_on_cookie_change set' do
-          let(:params) {{
-            :config_cluster           => true,
-            :cluster_nodes            => ['hare-1', 'hare-2'],
-            :cluster_node_type        => 'ram',
-            :erlang_cookie            => 'TESTCOOKIE',
-            :wipe_db_on_cookie_change => true
-          }}
-          it 'wipes the database' do
-            should contain_exec('wipe_db')
-            should contain_file('erlang_cookie')
-          end
-        end
-
-        describe 'correctly when cookies match' do
-          let(:params) {{
-            :config_cluster           => true,
-            :cluster_nodes            => ['hare-1', 'hare-2'],
-            :cluster_node_type        => 'ram',
-            :erlang_cookie            => 'ORIGINAL',
-            :wipe_db_on_cookie_change => true
-          }}
-          it 'and doesnt wipe anything' do
-            should contain_file('erlang_cookie')
-          end
-        end
-
-        describe 'and sets appropriate configuration' do
-          let(:params) {{
-            :config_cluster           => true,
-            :cluster_nodes            => ['hare-1', 'hare-2'],
-            :cluster_node_type        => 'ram',
-            :erlang_cookie            => 'ORIGINAL',
-            :wipe_db_on_cookie_change => true
-          }}
-          it 'for cluster_nodes' do
-            should contain_file('rabbitmq.config').with({
-              'content' => /cluster_nodes.*\['rabbit@hare-1', 'rabbit@hare-2'\], ram/,
-            })
-          end
-
-          it 'for erlang_cookie' do
-            should contain_file('erlang_cookie').with({
-              'content' => 'ORIGINAL',
-            })
-          end
-        end
-      end
-
-      describe 'rabbitmq-env configuration' do
-        let(:params) {{ :environment_variables => {
-          'RABBITMQ_NODE_IP_ADDRESS'    => '1.1.1.1',
-          'RABBITMQ_NODE_PORT'          => '5656',
-          'RABBITMQ_NODENAME'           => 'HOSTNAME',
-          'RABBITMQ_SERVICENAME'        => 'RabbitMQ',
-          'RABBITMQ_CONSOLE_LOG'        => 'RabbitMQ.debug',
-          'RABBITMQ_CTL_ERL_ARGS'       => 'verbose',
-          'RABBITMQ_SERVER_ERL_ARGS'    => 'v',
-          'RABBITMQ_SERVER_START_ARGS'  => 'debug'
-        }}}
-        it 'should set environment variables' do
-          should contain_file('rabbitmq-env.config') \
-            .with_content(/RABBITMQ_NODE_IP_ADDRESS=1.1.1.1/) \
-            .with_content(/RABBITMQ_NODE_PORT=5656/) \
-            .with_content(/RABBITMQ_NODENAME=HOSTNAME/) \
-            .with_content(/RABBITMQ_SERVICENAME=RabbitMQ/) \
-            .with_content(/RABBITMQ_CONSOLE_LOG=RabbitMQ.debug/) \
-            .with_content(/RABBITMQ_CTL_ERL_ARGS=verbose/) \
-            .with_content(/RABBITMQ_SERVER_ERL_ARGS=v/) \
-            .with_content(/RABBITMQ_SERVER_START_ARGS=debug/)
-        end
-      end
-
-      context 'delete_guest_user' do
-        describe 'should do nothing by default' do
-          it { should_not contain_rabbitmq_user('guest') }
-        end
-
-        describe 'delete user when delete_guest_user set' do
-          let(:params) {{ :delete_guest_user => true }}
-          it 'removes the user' do
-            should contain_rabbitmq_user('guest').with(
-              'ensure'   => 'absent',
-              'provider' => 'rabbitmqctl'
-            )
-          end
-        end
-      end
-
-      context 'configuration setting' do
-        describe 'node_ip_address when set' do
-          let(:params) {{ :node_ip_address => '172.0.0.1' }}
-          it 'should set RABBITMQ_NODE_IP_ADDRESS to specified value' do
-            contain_file('rabbitmq-env.config').with({
-              'content' => 'RABBITMQ_NODE_IP_ADDRESS=172.0.0.1',
-            })
-          end
-        end
-
-        describe 'stomp by default' do
-          it 'should not specify stomp parameters in rabbitmq.config' do
-            contain_file('rabbitmq.config').without({
-              'content' => /stomp/,})
-          end
-        end
-        describe 'stomp when set' do
-          let(:params) {{ :config_stomp => true, :stomp_port => 5679 }}
-          it 'should specify stomp port in rabbitmq.config' do
-            contain_file('rabbitmq.config').with({
-              'content' => /rabbitmq_stomp.*tcp_listeners, \[5679\]/,
-            })
-          end
-        end
-        describe 'stomp when set with ssl' do
-          let(:params) {{ :config_stomp => true, :stomp_port => 5679, :ssl_stomp_port => 5680 }}
-          it 'should specify stomp port and ssl stomp port in rabbitmq.config' do
-            contain_file('rabbitmq.config').with({
-              'content' => /rabbitmq_stomp.*tcp_listeners, \[5679\].*ssl_listeners, \[5680\]/,
-            })
-          end
-        end
-      end
-
-      describe 'configuring ldap authentication' do
-        let :params do
-          { :config_stomp         => true,
-            :ldap_auth            => true,
-            :ldap_server          => 'ldap.example.com',
-            :ldap_user_dn_pattern => 'ou=users,dc=example,dc=com',
-            :ldap_use_ssl         => false,
-            :ldap_port            => '389',
-            :ldap_log             => true
-          }
-        end
-
-        it { should contain_rabbitmq_plugin('rabbitmq_auth_backend_ldap') }
-
-        it 'should contain ldap parameters' do
-          verify_contents(subject, 'rabbitmq.config', 
-                          ['[', '  {rabbit, [', '    {auth_backends, [rabbit_auth_backend_internal, rabbit_auth_backend_ldap]},', '  ]}',
-                            '  {rabbitmq_auth_backend_ldap, [', '    {other_bind, anon},',
-                            '    {servers, ["ldap.example.com"]},',
-                            '    {user_dn_pattern, "ou=users,dc=example,dc=com"},', '    {use_ssl, false},',
-                            '    {port, 389},', '    {log, true}'])
-        end
-      end
-
-      describe 'default_user and default_pass set' do
-        let(:params) {{ :default_user => 'foo', :default_pass => 'bar' }}
-        it 'should set default_user and default_pass to specified values' do
-          contain_file('rabbitmq.config').with({
-            'content' => /default_user, <<"foo">>.*default_pass, <<"bar">>/,
-          })
-        end
-      end
-
-      describe 'ssl options' do
-        let(:params) {
-          { :ssl => true,
-            :ssl_management_port => 3141,
-            :ssl_cacert => '/path/to/cacert',
-            :ssl_cert => '/path/to/cert',
-            :ssl_key => '/path/to/key'
-        } }
-
-        it 'should set ssl options to specified values' do
-          contain_file('rabbitmq.config').with({
-            'content' => /ssl_listeners, \[3141\].*
-            ssl_options, \[{cacertfile,"\/path\/to\/cacert".*
-            certfile="\/path\/to\/cert".*
-            keyfile,"\/path\/to\/key/,
-          })
-        end
-      end
-
-      describe 'config_variables options' do
-        let(:params) {{ :config_variables => {
-            'hipe_compile'                  => true,
-            'vm_memory_high_watermark'      => 0.4,
-            'frame_max'                     => 131072,
-            'collect_statistics'            => "none",
-            'auth_mechanisms'               => "['PLAIN', 'AMQPLAIN']",
-        }}}
-        it 'should set environment variables' do
-          should contain_file('rabbitmq.config') \
-            .with_content(/\{hipe_compile, true\}/) \
-            .with_content(/\{vm_memory_high_watermark, 0.4\}/) \
-            .with_content(/\{frame_max, 131072\}/) \
-            .with_content(/\{collect_statistics, none\}/) \
-            .with_content(/\{auth_mechanisms, \['PLAIN', 'AMQPLAIN'\]\}/)
-        end
-      end
-
-      describe 'config_kernel_variables options' do
-        let(:params) {{ :config_kernel_variables => {
-            'inet_dist_listen_min'      => 9100,
-            'inet_dist_listen_max'      => 9105,
-        }}}
-        it 'should set config variables' do
-          should contain_file('rabbitmq.config') \
-            .with_content(/\{inet_dist_listen_min, 9100\}/) \
-            .with_content(/\{inet_dist_listen_max, 9105\}/) 
-        end
-      end
-
-      context 'delete_guest_user' do
-        describe 'should do nothing by default' do
-          it { should_not contain_rabbitmq_user('guest') }
-        end
-
-        describe 'delete user when delete_guest_user set' do
-          let(:params) {{ :delete_guest_user => true }}
-          it 'removes the user' do
-            should contain_rabbitmq_user('guest').with(
-              'ensure'   => 'absent',
-              'provider' => 'rabbitmqctl'
-            )
-          end
-        end
-      end
-
-      ##
-      ## rabbitmq::service
-      ##
-      describe 'service with default params' do
-        it { should contain_service('rabbitmq-server').with(
-          'ensure'     => 'running',
-          'enable'     => 'true',
-          'hasstatus'  => 'true',
-          'hasrestart' => 'true'
-        )}
-      end
-
-      describe 'service with ensure stopped' do
-        let :params do
-          { :service_ensure => 'stopped' }
-        end
-
-        it { should contain_service('rabbitmq-server').with(
-          'ensure'    => 'stopped',
-          'enable'    => false
-        ) }
-      end
-
-      describe 'service with ensure neither running neither stopped' do
-        let :params do
-          { :service_ensure => 'foo' }
-        end
-
-        it 'should raise an error' do
-          expect {
-            should contain_service('rabbitmq-server').with(
-              'ensure' => 'stopped' )
-          }.to raise_error(Puppet::Error, /validate_re\(\): "foo" does not match "\^\(running\|stopped\)\$"/)
-        end
-      end
-
-      describe 'service with service_manage equal to false' do
-        let :params do
-          { :service_manage => false }
-        end
-
-        it { should_not contain_service('rabbitmq-server') }
-      end
-
-    end
-  end
-
-  ##
-  ## rabbitmq::install
-  ##
-  context "on RHEL" do
-    let(:facts) {{ :osfamily => 'RedHat' }}
-    let(:params) {{ :package_source => 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.2.3/rabbitmq-server-3.2.3-1.noarch.rpm' }}
-    it 'installs the rabbitmq package' do
-      should contain_package('rabbitmq-server').with(
-        'ensure'   => 'installed',
-        'name'     => 'rabbitmq-server',
-        'provider' => 'yum',
-        'source'   => 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.2.3/rabbitmq-server-3.2.3-1.noarch.rpm'
-      )
-    end
-  end
-
-  context "on Debian" do
-    let(:facts) {{ :osfamily => 'Debian', :lsbdistid => 'Debian', :lsbdistcodename => 'precise' }}
-    it 'installs the rabbitmq package' do
-      should contain_package('rabbitmq-server').with(
-        'ensure'   => 'installed',
-        'name'     => 'rabbitmq-server',
-        'provider' => 'apt'
-      )
-    end
-  end
-
-  context "on Archlinux" do
-    let(:facts) {{ :osfamily => 'Archlinux' }}
-    it 'installs the rabbitmq package' do
-      should contain_package('rabbitmq-server').with(
-        'ensure'   => 'installed',
-        'name'     => 'rabbitmq')
-    end
-  end
-
-  describe 'repo management on Debian' do
-    let(:facts)  {{ :osfamily => 'Debian', :lsbdistid => 'Debian' }}
-
-    context 'with no pin' do
-      let(:params) {{ :package_apt_pin => '' }}
-      describe 'it sets up an apt::source' do
-
-        it { should contain_apt__source('rabbitmq').with(
-          'location'    => 'http://www.rabbitmq.com/debian/',
-          'release'     => 'testing',
-          'repos'       => 'main',
-          'include_src' => false,
-          'key'         => '056E8E56'
-        ) }
-      end
-    end
-
-    context 'with pin' do
-      let(:params) {{ :package_apt_pin => '700' }}
-      describe 'it sets up an apt::source and pin' do
-
-        it { should contain_apt__source('rabbitmq').with(
-          'location'    => 'http://www.rabbitmq.com/debian/',
-          'release'     => 'testing',
-          'repos'       => 'main',
-          'include_src' => false,
-          'key'         => '056E8E56'
-        ) }
-
-        it { should contain_apt__pin('rabbitmq').with(
-          'packages' => 'rabbitmq-server',
-          'priority' => '700'
-        ) }
-
-      end
-    end
-  end
-
-  ['RedHat', 'SuSE'].each do |distro|
-    describe "repo management on #{distro}" do
-      describe 'imports the key' do
-        let(:facts) {{ :osfamily => distro }}
-        let(:params) {{ :package_gpg_key => 'http://www.rabbitmq.com/rabbitmq-signing-key-public.asc' }}
-
-        it { should contain_exec("rpm --import #{params[:package_gpg_key]}").with(
-          'path' => ['/bin','/usr/bin','/sbin','/usr/sbin']
-        ) }
-      end
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb
deleted file mode 100644
index 1dbc82a8658..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = []
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-  else
-    install_puppet
-  end
-  hosts.each do |host|
-    on hosts, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-  c.before :suite do
-    puppet_module_install(:source => proj_root, :module_name => 'rabbitmq')
-    hosts.each do |host|
-
-      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
-      shell('puppet module install puppetlabs-stdlib', { :acceptable_exit_codes => [0,1] })
-      if fact('osfamily') == 'Debian'
-        shell('puppet module install puppetlabs-apt', { :acceptable_exit_codes => [0,1] })
-      end
-      shell('puppet module install nanliu-staging', { :acceptable_exit_codes => [0,1] })
-      if fact('osfamily') == 'RedHat'
-        shell('puppet module install garethr-erlang', { :acceptable_exit_codes => [0,1] })
-      end
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb
deleted file mode 100644
index f4daf79bd62..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/facts/rabbitmq_erlang_cookie_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe 'rabbitmq_erlang_cookie', :type => :fact do
-  before(:each) { Facter.clear }
-
-  it 'works correctly' do
-    Facter.fact(:osfamily).stubs(:value).returns('RedHat')
-    File.stubs(:exists?).with('/var/lib/rabbitmq/.erlang.cookie').returns(true)
-    File.stubs(:read).with('/var/lib/rabbitmq/.erlang.cookie').returns('THISISACOOKIE')
-    Facter.fact(:rabbitmq_erlang_cookie).value.should == 'THISISACOOKIE'
-  end
-
-  it 'fails if file doesnt exist' do
-    Facter.fact(:osfamily).stubs(:value).returns('RedHat')
-    File.stubs(:exists?).with('/var/lib/rabbitmq/.erlang.cookie').returns(false)
-    Facter.fact(:rabbitmq_erlang_cookie).value.should == nil
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb
deleted file mode 100644
index ac68970cf75..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:rabbitmq_exchange).provider(:rabbitmqadmin)
-describe provider_class do
-  before :each do
-    @resource = Puppet::Type::Rabbitmq_exchange.new(
-      {:name => 'amq.direct@/',
-       :type => :topic}
-    )
-    @provider = provider_class.new(@resource)
-  end
-
-  it 'should return instances' do
-    provider_class.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-/
-...done.
-EOT
-    provider_class.expects(:rabbitmqctl).with('list_exchanges', '-p', '/', 'name', 'type').returns <<-EOT
-Listing exchanges ...
-        direct
-	amq.direct      direct
-	amq.fanout      fanout
-	amq.headers     headers
-	amq.match       headers
-	amq.rabbitmq.log        topic
-	amq.rabbitmq.trace      topic
-	amq.topic       topic
-	...done.
-EOT
-    instances = provider_class.instances
-    instances.size.should == 8
-  end
-
-  it 'should call rabbitmqadmin to create' do
-    @provider.expects(:rabbitmqadmin).with('declare', 'exchange', '--vhost=/', '--user=guest', '--password=guest', 'name=amq.direct', 'type=topic')
-    @provider.create
-  end
-
-  it 'should call rabbitmqadmin to destroy' do
-    @provider.expects(:rabbitmqadmin).with('delete', 'exchange', '--vhost=/', '--user=guest', '--password=guest', 'name=amq.direct')
-    @provider.destroy
-  end
-
-  context 'specifying credentials' do
-    before :each do
-      @resource = Puppet::Type::Rabbitmq_exchange.new(
-        {:name => 'amq.direct@/',
-        :type => :topic,
-        :user => 'colin',
-        :password => 'secret',
-        }
-      )
-      @provider = provider_class.new(@resource)
-    end
-
-    it 'should call rabbitmqadmin to create' do
-      @provider.expects(:rabbitmqadmin).with('declare', 'exchange', '--vhost=/', '--user=colin', '--password=secret', 'name=amq.direct', 'type=topic')
-      @provider.create
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
deleted file mode 100644
index ea4233cba13..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:rabbitmq_user).provider(:rabbitmqctl)
-describe provider_class do
-  before :each do
-    @resource = Puppet::Type::Rabbitmq_user.new(
-      {:name => 'foo', :password => 'bar'}
-    )
-    @provider = provider_class.new(@resource)
-  end
-  it 'should match user names' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo
-...done.
-EOT
-    @provider.exists?.should == 'foo'
-  end
-  it 'should match user names with 2.4.1 syntax' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo bar
-...done.
-EOT
-    @provider.exists?.should == 'foo bar'
-  end
-  it 'should not match if no users on system' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should not match if no matching users on system' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-fooey
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should match user names from list' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one
-two three
-foo
-bar
-...done.
-EOT
-    @provider.exists?.should == 'foo'
-  end
-  it 'should create user and set password' do
-    @resource[:password] = 'bar'
-    @provider.expects(:rabbitmqctl).with('add_user', 'foo', 'bar')
-    @provider.create
-  end
-  it 'should create user, set password and set to admin' do
-    @resource[:password] = 'bar'
-    @resource[:admin] = 'true'
-    @provider.expects(:rabbitmqctl).with('add_user', 'foo', 'bar')
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   []
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['administrator'])
-    @provider.create
-  end
-  it 'should call rabbitmqctl to delete' do
-    @provider.expects(:rabbitmqctl).with('delete_user', 'foo')
-    @provider.destroy
-  end
-  it 'should be able to retrieve admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo [administrator]
-...done.
-EOT
-    @provider.admin.should == :true
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-one [administrator]
-foo []
-...done.
-EOT
-    @provider.admin.should == :false
-  end
-  it 'should fail if admin value is invalid' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo fail
-...done.
-EOT
-    expect { @provider.admin }.to raise_error(Puppet::Error, /Could not match line/)
-  end
-  it 'should be able to set admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   []
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['administrator'])
-    @provider.admin=:true
-  end
-  it 'should not interfere with existing tags on the user when setting admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   [bar, baz]
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['bar','baz', 'administrator'].sort) 
-    @provider.admin=:true
-  end
-  it 'should be able to unset admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo     [administrator]
-guest   [administrator]
-icinga  []
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', [])
-    @provider.admin=:false
-  end
-  it 'should not interfere with existing tags on the user when unsetting admin value' do
-    @provider.expects(:rabbitmqctl).with('list_users').returns <<-EOT
-Listing users ...
-foo   [administrator, bar, baz]
-icinga  [monitoring]
-kitchen []
-kitchen2        [abc, def, ghi]
-...done.
-EOT
-    @provider.expects(:rabbitmqctl).with('set_user_tags', 'foo', ['bar','baz'].sort) 
-    @provider.admin=:false
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
deleted file mode 100644
index a8824fdf429..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-describe 'Puppet::Type.type(:rabbitmq_user_permissions).provider(:rabbitmqctl)' do
-  before :each do
-    @provider_class = Puppet::Type.type(:rabbitmq_user_permissions).provider(:rabbitmqctl)
-    @resource = Puppet::Type::Rabbitmq_user_permissions.new(
-      {:name => 'foo@bar'}
-    )
-    @provider = @provider_class.new(@resource)
-  end
-  after :each do
-    @provider_class.instance_variable_set(:@users, nil)
-  end
-  it 'should match user permissions from list' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-    @provider.exists?.should == {:configure=>"1", :write=>"2", :read=>"3"}
-  end
-  it 'should match user permissions with empty columns' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar			3
-...done.
-EOT
-    @provider.exists?.should == {:configure=>"", :write=>"", :read=>"3"}
-  end
-  it 'should not match user permissions with more than 3 columns' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3 4
-...done.
-EOT
-    expect { @provider.exists? }.to raise_error(Puppet::Error, /cannot parse line from list_user_permissions/)
-  end
-  it 'should not match an empty list' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-...done.
-EOT
-    @provider.exists?.should == nil
-  end
-  it 'should create default permissions' do
-    @provider.instance_variable_set(:@should_vhost, "bar")
-    @provider.instance_variable_set(:@should_user, "foo")
-    @provider.expects(:rabbitmqctl).with('set_permissions', '-p', 'bar', 'foo', "''", "''", "''")
-    @provider.create 
-  end
-  it 'should destroy permissions' do
-    @provider.instance_variable_set(:@should_vhost, "bar")
-    @provider.instance_variable_set(:@should_user, "foo")
-    @provider.expects(:rabbitmqctl).with('clear_permissions', '-p', 'bar', 'foo')
-    @provider.destroy 
-  end
-  {:configure_permission => '1', :write_permission => '2', :read_permission => '3'}.each do |k,v|
-    it "should be able to retrieve #{k}" do
-      @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-      @provider.send(k).should == v
-    end
-  end
-  {:configure_permission => '1', :write_permission => '2', :read_permission => '3'}.each do |k,v|
-    it "should be able to retrieve #{k} after exists has been called" do
-      @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-      @provider.exists?
-      @provider.send(k).should == v
-    end
-  end
-  {:configure_permission => ['foo', '2', '3'],
-   :read_permission      => ['1', '2', 'foo'],
-   :write_permission     => ['1', 'foo', '3']
-  }.each do |perm, columns|
-    it "should be able to sync #{perm}" do
-      @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-      @provider.resource[perm] = 'foo'
-      @provider.expects(:rabbitmqctl).with('set_permissions', '-p', 'bar', 'foo', *columns)
-      @provider.send("#{perm}=".to_sym, 'foo')
-    end
-  end
-  it 'should only call set_permissions once' do
-    @provider.class.expects(:rabbitmqctl).with('list_user_permissions', 'foo').returns <<-EOT
-Listing users ...
-bar 1 2 3
-...done.
-EOT
-    @provider.resource[:configure_permission] = 'foo'
-    @provider.resource[:read_permission] = 'foo'
-    @provider.expects(:rabbitmqctl).with('set_permissions', '-p', 'bar', 'foo', 'foo', '2', 'foo').once
-    @provider.configure_permission='foo'
-    @provider.read_permission='foo'
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb
deleted file mode 100644
index a1f89ad2ce3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'puppet'
-require 'mocha'
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-provider_class = Puppet::Type.type(:rabbitmq_vhost).provider(:rabbitmqctl)
-describe provider_class do
-  before :each do
-    @resource = Puppet::Type::Rabbitmq_vhost.new(
-      {:name => 'foo'}
-    )
-    @provider = provider_class.new(@resource)
-  end
-  it 'should match vhost names' do
-    @provider.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-foo
-...done.
-EOT
-    @provider.exists?.should == 'foo'
-  end
-  it 'should not match if no vhosts on system' do
-    @provider.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should not match if no matching vhosts on system' do
-    @provider.expects(:rabbitmqctl).with('list_vhosts').returns <<-EOT
-Listing vhosts ...
-fooey
-...done.
-EOT
-    @provider.exists?.should be_nil
-  end
-  it 'should call rabbitmqctl to create' do
-    @provider.expects(:rabbitmqctl).with('add_vhost', 'foo')
-    @provider.create
-  end
-  it 'should call rabbitmqctl to create' do
-    @provider.expects(:rabbitmqctl).with('delete_vhost', 'foo')
-    @provider.destroy
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb
deleted file mode 100644
index c4c2caa98bc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_exchange_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_exchange'
-describe Puppet::Type.type(:rabbitmq_exchange) do
-  before :each do
-    @exchange = Puppet::Type.type(:rabbitmq_exchange).new(
-      :name => 'foo@bar',
-      :type => :topic
-    )
-  end
-  it 'should accept an exchange name' do
-    @exchange[:name] = 'dan@pl'
-    @exchange[:name].should == 'dan@pl'
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_exchange).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should not allow whitespace in the name' do
-    expect {
-      @exchange[:name] = 'b r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-  it 'should not allow names without @' do
-    expect {
-      @exchange[:name] = 'b_r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-
-  it 'should accept an exchange type' do
-    @exchange[:type] = :direct
-    @exchange[:type].should == :direct
-  end
-  it 'should require a type' do
-    expect {
-      Puppet::Type.type(:rabbitmq_exchange).new(:name => 'foo@bar')
-    }.to raise_error(/.*must set type when creating exchange.*/)
-  end
-  it 'should not require a type when destroying' do
-    expect {
-            Puppet::Type.type(:rabbitmq_exchange).new(:name => 'foo@bar', :ensure => :absent)
-    }.to_not raise_error
-  end
-
-  it 'should accept a user' do
-    @exchange[:user] = :root
-    @exchange[:user].should == :root
-  end
-
-  it 'should accept a password' do
-    @exchange[:password] = :PaSsw0rD
-    @exchange[:password].should == :PaSsw0rD
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
deleted file mode 100644
index 7cb66eac366..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_user_permissions'
-describe Puppet::Type.type(:rabbitmq_user_permissions) do
-  before :each do
-    @perms = Puppet::Type.type(:rabbitmq_user_permissions).new(:name => 'foo@bar')
-  end
-  it 'should accept a valid hostname name' do
-    @perms[:name] = 'dan@bar'
-    @perms[:name].should == 'dan@bar'
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_user_permissions).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should fail when names dont have a @' do
-    expect {
-      @perms[:name] = 'bar'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-  [:configure_permission, :read_permission, :write_permission].each do |param|
-    it 'should not default to anything' do
-       @perms[param].should == nil
-    end
-    it "should accept a valid regex for #{param}" do
-      @perms[param] = '.*?'
-      @perms[param].should == '.*?'  
-    end
-    it "should accept an empty string for #{param}" do
-      @perms[param] = ''
-      @perms[param].should == ''  
-    end
-    it "should not accept invalid regex for #{param}" do
-      expect {
-        @perms[param] = '*'
-      }.to raise_error(Puppet::Error, /Invalid regexp/)
-    end
-  end
-  {:rabbitmq_vhost => 'dan@test', :rabbitmq_user => 'test@dan'}.each do |k,v|
-    it "should autorequire #{k}" do
-      if k == :rabbitmq_vhost
-        vhost = Puppet::Type.type(k).new(:name => "test")
-      else
-        vhost = Puppet::Type.type(k).new(:name => "test", :password => 'pass')
-      end
-      perm  = Puppet::Type.type(:rabbitmq_user_permissions).new(:name => v)
-      config = Puppet::Resource::Catalog.new :testing do |conf|
-        [vhost, perm].each { |resource| conf.add_resource resource }
-      end
-      rel = perm.autorequire[0]
-      rel.source.ref.should == vhost.ref
-      rel.target.ref.should == perm.ref
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb
deleted file mode 100644
index 92e69055797..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_user_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_user'
-describe Puppet::Type.type(:rabbitmq_user) do
-  before :each do
-    @user = Puppet::Type.type(:rabbitmq_user).new(:name => 'foo', :password => 'pass')
-  end
-  it 'should accept a user name' do
-    @user[:name] = 'dan'
-    @user[:name].should == 'dan'
-    @user[:admin].should == :false
-  end
-  it 'should accept a password' do
-    @user[:password] = 'foo'
-    @user[:password].should == 'foo'
-  end
-  it 'should require a password' do
-    expect {
-      Puppet::Type.type(:rabbitmq_user).new(:name => 'foo')
-    }.to raise_error(/must set password/)
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_user).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should not allow whitespace in the name' do
-    expect {
-      @user[:name] = 'b r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-  [true, false, 'true', 'false'].each do |val|
-    it "admin property should accept #{val}" do
-      @user[:admin] = val
-      @user[:admin].should == val.to_s.to_sym
-    end
-  end
-  it 'should not accept non-boolean values for admin' do
-    expect {
-      @user[:admin] = 'yes'
-    }.to raise_error(Puppet::Error, /Invalid value/)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb
deleted file mode 100644
index 70b8e374149..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/spec/unit/puppet/type/rabbitmq_vhost_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'puppet'
-require 'puppet/type/rabbitmq_vhost'
-describe Puppet::Type.type(:rabbitmq_vhost) do
-  before :each do
-    @vhost = Puppet::Type.type(:rabbitmq_vhost).new(:name => 'foo')
-  end
-  it 'should accept a vhost name' do
-    @vhost[:name] = 'dan'
-    @vhost[:name].should == 'dan'
-  end
-  it 'should require a name' do
-    expect {
-      Puppet::Type.type(:rabbitmq_vhost).new({})
-    }.to raise_error(Puppet::Error, 'Title or name must be provided')
-  end
-  it 'should not allow whitespace in the name' do
-    expect {
-      @vhost[:name] = 'b r'
-    }.to raise_error(Puppet::Error, /Valid values match/)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/README.markdown
deleted file mode 100644
index 575bbeaef8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/README.markdown
+++ /dev/null
@@ -1,23 +0,0 @@
-Templates
-=========
-
-Puppet supports templates and templating via ERB, which is part of the Ruby
-standard library and is used for many other projects including Ruby on Rails.
-Templates allow you to manage the content of template files, for example
-configuration files that cannot yet be managed as a Puppet type. Learn more at
-http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Templating
-
-You can use templates like this: 
-
-    class myclass {
-      package { mypackage: ensure => latest }
-      service { myservice: ensure => running }
-      file { "/etc/myfile":
-        content => template("mymodule/myfile.erb")
-      }
-    }
-
-The templates are searched for in:
-
-    $templatedir/mymodule/myfile.erb
-    $modulepath/mymodule/templates/myfile.erb
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb
deleted file mode 100644
index 0c6b5d19849..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq-env.conf.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%- @environment_variables.keys.sort.each do |key| -%>
-<%- if @environment_variables[key] != 'UNSET' -%>
-<%= key %>=<%= @environment_variables[key] %>
-<%- end -%>
-<%- end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
deleted file mode 100644
index 766192dfdac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/templates/rabbitmq.config.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-% This file managed by Puppet
-% Template Path: <%= @module_name %>/templates/rabbitmq.config
-[
-  {rabbit, [
-<% if @ldap_auth -%>
-    {auth_backends, [rabbit_auth_backend_internal, rabbit_auth_backend_ldap]},
-<% end -%>
-<% if @config_cluster -%>
-    {cluster_nodes, {[<%= @r_cluster_nodes.map { |n| "\'rabbit@#{n}\'" }.join(', ') %>], <%= @cluster_node_type %>}},
-    {cluster_partition_handling, <%= @cluster_partition_handling %>},
-<% end -%>
-<%- if @ssl %>
-    {ssl_listeners, [<%= @ssl_management_port %>]},
-    {ssl_options, [{cacertfile,"<%= @ssl_cacert %>"},
-                    {certfile,"<%= @ssl_cert %>"},
-                    {keyfile,"<%= @ssl_key %>"},
-                    {verify,<%= @ssl_verify %>},
-                    {fail_if_no_peer_cert,<%= @ssl_fail_if_no_peer_cert %>}]},
-<%- end -%>
-<% if @config_variables -%>
-<%- @config_variables.keys.sort.each do |key| -%>
-    {<%= key %>, <%= @config_variables[key] %>},
-<%- end -%>
-<%- end -%>
-    {default_user, <<"<%= @default_user %>">>},
-    {default_pass, <<"<%= @default_pass %>">>}
-  ]}<% if @config_kernel_variables -%>,
-  {kernel, [
-    <%= @config_kernel_variables.sort.map{|k,v| "{#{k}, #{v}}"}.join(",\n    ") %>
-  ]}
-<%- end -%>
-<% if @config_stomp -%>,
-% Configure the Stomp Plugin listening port
-  {rabbitmq_stomp, [
-    {tcp_listeners, [<%= @stomp_port %>]}
-  <%- if @ssl_stomp_port -%>,
-    {ssl_listeners, [<%= @ssl_stomp_port %>]}
-  <%- end -%>
-  ]}
-<%- if @ldap_auth -%>,
-% Configure the LDAP authentication plugin
-  {rabbitmq_auth_backend_ldap, [
-    {other_bind, anon},
-    {servers, ["<%= @ldap_server %>"]},
-    {user_dn_pattern, "<%= @ldap_user_dn_pattern %>"},
-    {use_ssl, <%= @ldap_use_ssl %>},
-    {port, <%= @ldap_port %>},
-    {log, <%= @ldap_log %>}
-  ]}
-<% end -%>
-<%- end -%>
-].
-% EOF
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp
deleted file mode 100644
index d34d9441f14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/erlang_deps.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# install first the garethr-erlang module. See README.md
-include 'erlang'
-
-class { 'erlang': epel_enable => true}
-Class['erlang'] -> Class['rabbitmq']
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/full.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/full.pp
deleted file mode 100644
index c6dfc5cf0ca..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/full.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class { 'rabbitmq::repo::apt':
-  pin => '900',
-}->
-class { 'rabbitmq::server':
-  delete_guest_user => true,
-#  version           => '2.4.1',
-}->
-rabbitmq_user { 'dan':
-  admin    => true,
-  password => 'pass',
-  provider => 'rabbitmqctl',
-}->
-rabbitmq_vhost { 'myhost':
-  provider => 'rabbitmqctl',
-}
-rabbitmq_user_permissions { 'dan@myhost':
-  configure_permission => '.*',
-  read_permission      => '.*',
-  write_permission     => '.*',
-  provider             => 'rabbitmqctl',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp
deleted file mode 100644
index fb71af14317..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/permissions/add.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-rabbitmq_user { 'blah7':
-  password => 'foo',
-}
-rabbitmq_vhost { 'test5': }
-rabbitmq_user_permissions { 'blah7@test5':
-  configure_permission => 'config2',
-  read_permission      => 'ready',
-  #write_permission     => 'ready',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/plugin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/plugin.pp
deleted file mode 100644
index 6c5605b9e2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/plugin.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class { 'rabbitmq::server':
-    config_stomp => true,
-}
-
-$rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
-
-rabbitmq_plugin { $rabbitmq_plugins:
-  ensure   => present,
-  require  => Class['rabbitmq::server'],
-  provider => 'rabbitmqplugins',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp
deleted file mode 100644
index f1373737fdc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/repo/apt.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-# requires pupetlabs-apt
-include rabbitmq::repo::apt
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/server.pp
deleted file mode 100644
index caea893772f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/server.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class { 'rabbitmq::server':
-  port              => '5672',
-  delete_guest_user => true,
-  version           => 'latest',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/service.pp
deleted file mode 100644
index 9a00d2b6d3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/service.pp
+++ /dev/null
@@ -1 +0,0 @@
-class { 'rabbitmq::service': }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/site.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/site.pp
deleted file mode 100644
index 75ebcfed325..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/site.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-node default {
-
-  $rabbitmq_plugins = [ 'amqp_client', 'rabbitmq_stomp' ]
-
-  class { 'rabbitmq::server':
-    config => '[ {rabbit_stomp, [{tcp_listeners, [1234]} ]} ].',
-  }
-
-  # Required for MCollective
-  rabbitmq_plugin { $rabbitmq_plugins:
-    ensure   => present,
-    require  => Class['rabbitmq::server'],
-    provider => 'rabbitmqplugins',
-  }
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/user/add.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/user/add.pp
deleted file mode 100644
index 2c3a87096af..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/user/add.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-rabbitmq_user { ['blah2', 'blah3', 'blah4']:
-  password => 'phoey!',
-  #provider => 'rabbitmqctl',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp
deleted file mode 100644
index d818a1923d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/rabbitmq/tests/vhosts/add.pp
+++ /dev/null
@@ -1 +0,0 @@
-rabbitmq_vhost { ['fooey', 'blah']: }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/.travis.yml
deleted file mode 100644
index 079eb44c72c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-language: ruby
-rvm:
-- 1.8.7
-- 1.9.3
-script:
-- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-- .forge-releng/publish
-branches:
-  only:
-  - master
-env:
-  global:
-  - PUBLISHER_LOGIN=fsalum
-  - secure: "DENnYQVOgU9VOxYGjKsCdsoCNeZ42yf751SFhK9s7Fmu790KiQvnY7Vjs+Sj\nrQ3xYXProkMYtx+KVbtzQo02oSYRF+sVYyBza3066bir0GK1YPdgrpT9Q3vo\nuT4+kfaeJK8StiBRWvPlyY3QrDbVsnIuQ+NxBFxjnZdDg350G8Q="
-  matrix:
-  - PUPPET_VERSION=2.7.25
-  - PUPPET_VERSION=3.1.1
-  - PUPPET_VERSION=3.2.4
-  - PUPPET_VERSION=3.3.2
-  - PUPPET_VERSION=3.4.2
-notifications:
-  email: false
-gemfile: Gemfile
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/CHANGELOG
deleted file mode 100644
index 02800f976de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/CHANGELOG
+++ /dev/null
@@ -1,63 +0,0 @@
-## fsalum-redis changelog
-
-Release notes for the fsalum-redis module.
-
-------------------------------------------
-
-#### 0.0.11 - 2014-02-19
-
-* system_sysctl parameter for redis class (@tehmaspc)
-
-#### 0.0.10 - 2014-02-19
-
-* Allow conf_bind to be unset (@stevelacey)
-* Changing default of glueoutputbuf to UNSET (@tehmaspc)
-
-#### 0.0.9 - 2014-01-09
-
-* Add quotes around all instances of UNSET (@charlesdunbar)
-
-#### 0.0.8 - 2013-12-20
-
-* Setting mode permission for conf_dir (@KlavsKlavsen)
-
-#### 0.0.7 - 2013-12-11
-
-* Add glueoutputbuf config option (@kryptx)
-* Add support for Amazon Linux AMI (@mattboston)
-
-#### 0.0.6 - 2013-08-01
-
-* Install package before poking config (@doismellburning)
-
-#### 0.0.5 - 2013-06-06
-
-* Fix Puppet 3.2.1 deprecation warnings (@ripienaar)
-* Fix duplicate entry for logrotate on Debian/RHEL using different paths (@arthurfurlan)
-* Add $conf_nosave parameter (@fsalum)
-* Minor changes to params variables (@fsalum)
-* Update CHANGELOG format
-
-------------------------------------------
-
-#### 0.0.4 - 2013-04-18
-
-* Creates conf_dir directory if it doesn't exist
-
-------------------------------------------
-
-#### 0.0.3 - 2013-02-25
-
-* Fixing redis.conf less options on Debian
-
-------------------------------------------
-
-#### 0.0.2 - 2013-02-25
-
-* Fixing redis.conf location for Debian
-
-------------------------------------------
-
-#### 0.0.1 - 2013-02-25
-
-* Initial Forge release
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Gemfile
deleted file mode 100644
index 2df03ec63cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source :rubygems
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-
-gem 'rake'
-gem 'puppet-lint'
-gem 'puppet', puppetversion
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/LICENSE
deleted file mode 100644
index f31e47dd22e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright (C) 2012 Felipe Salum
-
-Felipe Salum can be contacted at: fsalum@gmail.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Modulefile
deleted file mode 100644
index 3d9432ecc9e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Modulefile
+++ /dev/null
@@ -1,13 +0,0 @@
-name    'fsalum-redis'
-version '0.0.11'
-source 'git://github.com/fsalum/puppet-redis.git'
-author 'Felipe Salum'
-license 'Apache License, Version 2.0'
-summary 'Puppet module for Redis Server'
-description 'Module to install and configure a Redis server'
-project_page 'https://github.com/fsalum/puppet-redis'
-
-## Add dependencies, if any:
-
-# https://forge.puppetlabs.com/thias/sysctl
-dependency 'thias/sysctl', '0.3.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/README.md
deleted file mode 100644
index 3fcd7d4d65f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-Redis Module for Puppet
-=======================
-[![Build Status](https://secure.travis-ci.org/fsalum/puppet-redis.png)](http://travis-ci.org/fsalum/puppet-redis)
-
-This module installs and manages a Redis server. All redis.conf options are
-accepted in the parameterized class.
-
-Operating System
-----------------
-
-Tested on CentOS 6.3 and Debian Squeeze.
-
-Quick Start
------------
-
-Use the default parameters:
-
-    class { 'redis': }
-
-To change the port and listening network interface:
-
-    class { 'redis':
-      conf_port => '6379',
-      conf_bind => '0.0.0.0',
-    }
-
-Parameters
-----------
-
-Check the [init.pp](https://github.com/fsalum/puppet-redis/blob/master/manifests/init.pp) file for a complete list of parameters accepted.
-
-To enable and set important Linux kernel sysctl parameters as described in the [Redis Admin Guide](http://redis.io/topics/admin) - use the following configuration option:
-
-    class { 'redis':
-      system_sysctl => true
-    }
-
-By default, this sysctl parameter will not be enabled. Furthermore, you will need the sysctl module defined in the [Modulefile](https://github.com/fsalum/puppet-redis/blob/master/Modulefile) file.
-
-Copyright and License
----------------------
-
-Copyright (C) 2012 Felipe Salum
-
-Felipe Salum can be contacted at: fsalum@gmail.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Rakefile
deleted file mode 100644
index d29667f8cad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send('disable_class_parameter_defaults')
-
-task :default => :lint
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Vagrantfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Vagrantfile
deleted file mode 100644
index 2c687ecd457..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/Vagrantfile
+++ /dev/null
@@ -1,18 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vbguest.auto_update = false
-  config.hostmanager.enabled = false
-
-  config.vm.define 'redis' do |node|
-      node.vm.box = "centos65"
-      node.vm.hostname = "redis.local"
-      node.vm.network :private_network, ip: "192.168.100.100"
-      node.vm.provision :shell, :inline => "yum install -y git && gem install librarian-puppet --no-ri --no-rdoc"
-      node.vm.provision :shell, :inline => "cd /vagrant ; librarian-puppet install --clean --path /etc/puppet/modules"
-      node.vm.provision :puppet do |puppet|
-        puppet.manifests_path = ["vm", "/etc/puppet/modules/redis/tests"]
-        puppet.manifest_file  = "init.pp"
-      end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/init.pp
deleted file mode 100644
index 41854941ee5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/init.pp
+++ /dev/null
@@ -1,160 +0,0 @@
-# == Class: redis
-#
-# Install and configure a Redis server
-#
-# === Parameters
-#
-# All the redis.conf parameters can be passed to the class.
-# See below for a complete list of parameters accepted.
-#
-# Check the README.md file for any further information about parameters for this class.
-#
-# === Examples
-#
-#  class { redis:
-#    conf_port => '6380',
-#    conf_bind => '0.0.0.0',
-#  }
-#
-# === Authors
-#
-# Felipe Salum <fsalum@gmail.com>
-#
-# === Copyright
-#
-# Copyright 2013 Felipe Salum, unless otherwise noted.
-#
-class redis (
-  $package_ensure                   = 'present',
-  $service_ensure                   = 'running',
-  $service_enable                   = true,
-  $system_sysctl                    = false,
-  $conf_daemonize                   = 'yes',
-  $conf_pidfile                     = 'UNSET',
-  $conf_port                        = '6379',
-  $conf_bind                        = '127.0.0.1',
-  $conf_timeout                     = '0',
-  $conf_loglevel                    = 'notice',
-  $conf_logfile                     = 'UNSET',
-  $conf_syslog_enabled              = 'UNSET',
-  $conf_syslog_ident                = 'UNSET',
-  $conf_syslog_facility             = 'UNSET',
-  $conf_databases                   = '16',
-  $conf_save                        = 'UNSET',
-  $conf_nosave                      = 'UNSET',
-  $conf_rdbcompression              = 'yes',
-  $conf_dbfilename                  = 'dump.rdb',
-  $conf_dir                         = '/var/lib/redis/',
-  $conf_slaveof                     = 'UNSET',
-  $conf_masterauth                  = 'UNSET',
-  $conf_slave_server_stale_data     = 'yes',
-  $conf_repl_ping_slave_period      = '10',
-  $conf_repl_timeout                = '60',
-  $conf_requirepass                 = 'UNSET',
-  $conf_maxclients                  = 'UNSET',
-  $conf_maxmemory                   = 'UNSET',
-  $conf_maxmemory_policy            = 'UNSET',
-  $conf_maxmemory_samples           = 'UNSET',
-  $conf_appendonly                  = 'no',
-  $conf_appendfilename              = 'UNSET',
-  $conf_appendfsync                 = 'everysec',
-  $conf_no_appendfsync_on_rewrite   = 'no',
-  $conf_auto_aof_rewrite_percentage = '100',
-  $conf_auto_aof_rewrite_min_size   = '64mb',
-  $conf_slowlog_log_slower_than     = '10000',
-  $conf_slowlog_max_len             = '1024',
-  $conf_vm_enabled                  = 'no',
-  $conf_vm_swap_file                = '/tmp/redis.swap',
-  $conf_vm_max_memory               = '0',
-  $conf_vm_page_size                = '32',
-  $conf_vm_pages                    = '134217728',
-  $conf_vm_max_threads              = '4',
-  $conf_hash_max_zipmap_entries     = '512',
-  $conf_hash_max_zipmap_value       = '64',
-  $conf_list_max_ziplist_entries    = '512',
-  $conf_list_max_ziplist_value      = '64',
-  $conf_set_max_intset_entries      = '512',
-  $conf_zset_max_ziplist_entries    = '128',
-  $conf_zset_max_ziplist_value      = '64',
-  $conf_activerehashing             = 'yes',
-  $conf_include                     = 'UNSET',
-  $conf_glueoutputbuf               = 'UNSET',
-) {
-
-  include redis::params
-
-  $conf_template  = $redis::params::conf_template
-  $conf_redis     = $redis::params::conf
-  $conf_logrotate = $redis::params::conf_logrotate
-  $package        = $redis::params::package
-  $service        = $redis::params::service
-
-  $conf_pidfile_real = $conf_pidfile ? {
-    'UNSET' => $::redis::params::pidfile,
-    default => $conf_pidfile,
-  }
-
-  $conf_logfile_real = $conf_logfile ? {
-    'UNSET' => $::redis::params::logfile,
-    default => $conf_logfile,
-  }
-
-  package { 'redis':
-    ensure => $package_ensure,
-    name   => $package,
-  }
-
-  service { 'redis':
-    ensure     => $service_ensure,
-    name       => $service,
-    enable     => $service_enable,
-    hasrestart => true,
-    hasstatus  => true,
-    require    => Package['redis'],
-  }
-
-  file { $conf_redis:
-    path    => $conf_redis,
-    content => template("redis/${conf_template}"),
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    require => Package['redis'],
-    notify  => Service['redis'],
-  }
-
-  file { $conf_logrotate:
-    path    => $conf_logrotate,
-    content => template('redis/redis.logrotate.erb'),
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-  }
-
-  exec { $conf_dir:
-    path    => '/bin:/usr/bin:/sbin:/usr/sbin',
-    command => "mkdir -p ${conf_dir}",
-    user    => root,
-    group   => root,
-    creates => $conf_dir,
-    before  => Service['redis'],
-    require => Package['redis'],
-    notify  => Service['redis'],
-  }
-
-  file { $conf_dir:
-    ensure  => directory,
-    owner   => redis,
-    group   => redis,
-    mode    => 0755,
-    before  => Service['redis'],
-    require => Exec[$conf_dir],
-  }
-
-  if ( $system_sysctl == true ) {
-    # add necessary kernel parameters
-    # see the redis admin guide here: http://redis.io/topics/admin
-    sysctl { 'vm.overcommit_memory': value => '1' }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/params.pp
deleted file mode 100644
index 8983eeadf71..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/manifests/params.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-# Class: redis::params
-#
-# This class configures parameters for the puppet-redis module.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class redis::params {
-
-  case $::operatingsystem {
-    'centos', 'redhat', 'fedora', 'amazon': {
-      $package        = 'redis'
-      $service        = 'redis'
-      $conf           = '/etc/redis.conf'
-      $conf_template  = 'redis.rhel.conf.erb'
-      $conf_logrotate = '/etc/logrotate.d/redis'
-      $pidfile        = '/var/run/redis/redis.pid'
-      $logfile        = '/var/log/redis/redis.log'
-    }
-    'ubuntu', 'debian': {
-      $package        = 'redis-server'
-      $service        = 'redis-server'
-      $conf           = '/etc/redis/redis.conf'
-      $conf_template  = 'redis.debian.conf.erb'
-      $conf_logrotate = '/etc/logrotate.d/redis-server'
-      $pidfile        = '/var/run/redis/redis-server.pid'
-      $logfile        = '/var/log/redis/redis-server.log'
-    }
-    default: {
-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/spec/spec_helper.rb
deleted file mode 100644
index 5fda58875b1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/spec/spec_helper.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-require 'mocha'
-require 'puppet'
-require 'rspec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-    config.mock_with :mocha
-end
-
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb
deleted file mode 100644
index e6706d061d7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.debian.conf.erb
+++ /dev/null
@@ -1,221 +0,0 @@
-# Redis configuration file example
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize <%= @conf_daemonize %>
-
-# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
-# You can specify a custom pid file location here.
-pidfile <%= @conf_pidfile_real %>
-
-# Accept connections on the specified port, default is 6379
-port <%= @conf_port %>
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for connections.
-#
-<% if @conf_bind != 'UNSET' %>
-bind <%= @conf_bind %>
-<% end %>
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout <%= @conf_timeout %>
-
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel <%= @conf_loglevel %>
-
-# Specify the log file name. Also 'stdout' can be used to force
-# the demon to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile <%= @conf_logfile_real %>
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases <%= @conf_databases %>
-
-################################ SNAPSHOTTING  #################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-<% if @conf_nosave != 'UNSET' %>
-#do not persist to disk:
-#save 900 1
-#save 300 10
-#save 60 10000
-<% else %>
-  <% if @conf_save != 'UNSET' %>
-  save <%= @conf_save %>
-  <% else %>
-  save 900 1
-  save 300 10
-  save 60 10000
-  <% end %>
-<% end %>
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression <%= @conf_rdbcompression %>
-
-# The filename where to dump the DB
-dbfilename <%= @conf_dbfilename %>
-
-# For default save/load DB in/from the working directory
-# Note that you must specify a directory not a file name.
-dir <%= @conf_dir %>
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-#
-# slaveof <masterip> <masterport>
-<% if @conf_slaveof != 'UNSET' %>
-slaveof <%= @conf_slaveof %>
-<% end %>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-# masterauth <master-password>
-<% if @conf_masterauth != 'UNSET' %>
-masterauth <%= @conf_masterauth %>
-<% end %>
-
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# requirepass foobared
-<% if @conf_requirepass != 'UNSET' %>
-requirepass <%= @conf_requirepass %>
-<% end %>
-
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default there
-# is no limit, and it's up to the number of file descriptors the Redis process
-# is able to open. The special value '0' means no limts.
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 128
-<% if @conf_maxclients != 'UNSET' %>
-maxclients <%= @conf_maxclients %>
-<% end %>
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys with an
-# EXPIRE set. It will try to start freeing keys that are going to expire
-# in little time and preserve keys with a longer time to live.
-# Redis will also try to remove objects from free lists if possible.
-#
-# If all this fails, Redis will start to reply with errors to commands
-# that will use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to most read-only commands like GET.
-#
-# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
-# 'state' server or cache, not as a real DB. When Redis is used as a real
-# database the memory usage will grow over the weeks, it will be obvious if
-# it is going to use too much memory in the long run, and you'll have the time
-# to upgrade. With maxmemory after the limit is reached you'll start to get
-# errors for write operations, and this may even lead to DB inconsistency.
-#
-# maxmemory <bytes>
-<% if @conf_maxmemory != 'UNSET' %>
-maxmemory <%= @conf_maxmemory %>
-<% end %>
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. If you can live
-# with the idea that the latest records will be lost if something like a crash
-# happens this is the preferred way to run Redis. If instead you care a lot
-# about your data and don't want to that a single record can get lost you should
-# enable the append only mode: when this mode is enabled Redis will append
-# every write operation received in the file appendonly.log. This file will
-# be read on startup in order to rebuild the full dataset in memory.
-#
-# Note that you can have both the async dumps and the append only file if you
-# like (you have to comment the "save" statements above to disable the dumps).
-# Still if append only mode is enabled Redis will load the data from the
-# log file at startup ignoring the dump.rdb file.
-#
-# The name of the append only file is "appendonly.log"
-#
-# IMPORTANT: Check the BGREWRITEAOF to check how to rewrite the append
-# log file in background when it gets too big.
-
-appendonly <%= @conf_appendonly %>
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead to wait for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log . Slow, Safest.
-# everysec: fsync only if one second passed since the last fsync. Compromise.
-#
-# The default is "always" that's the safer of the options. It's up to you to
-# understand if you can relax this to "everysec" that will fsync every second
-# or to "no" that will let the operating system flush the output buffer when
-# it want, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting).
-
-appendfsync <%= @conf_appendfsync %>
-# appendfsync everysec
-# appendfsync no
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-<% if @conf_glueoutputbuf != 'UNSET' %>
-glueoutputbuf <%= @conf_glueoutputbuf %>
-<% end %>
-
-# Use object sharing. Can save a lot of memory if you have many common
-# string in your dataset, but performs lookups against the shared objects
-# pool so it uses more CPU and can be a bit slower. Usually it's a good
-# idea.
-#
-# When object sharing is enabled (shareobjects yes) you can use
-# shareobjectspoolsize to control the size of the pool used in order to try
-# object sharing. A bigger pool size will lead to better sharing capabilities.
-# In general you want this value to be at least the double of the number of
-# very common strings you have in your dataset.
-#
-# WARNING: object sharing is experimental, don't enable this feature
-# in production before of Redis 1.0-stable. Still please try this feature in
-# your development environment so that we can test it better.
-# shareobjects no
-# shareobjectspoolsize 1024
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.logrotate.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.logrotate.erb
deleted file mode 100644
index b9ba724a590..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.logrotate.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= @conf_logfile_real %> {
-    weekly
-    rotate 10
-    copytruncate
-    delaycompress
-    compress
-    notifempty
-    missingok
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb
deleted file mode 100644
index 51d1e07e164..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/templates/redis.rhel.conf.erb
+++ /dev/null
@@ -1,549 +0,0 @@
-# Redis configuration file example
-
-# Note on units: when memory size is needed, it is possible to specifiy
-# it in the usual form of 1k 5GB 4M and so forth:
-#
-# 1k => 1000 bytes
-# 1kb => 1024 bytes
-# 1m => 1000000 bytes
-# 1mb => 1024*1024 bytes
-# 1g => 1000000000 bytes
-# 1gb => 1024*1024*1024 bytes
-#
-# units are case insensitive so 1GB 1Gb 1gB are all the same.
-
-# By default Redis does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize <%= @conf_daemonize %>
-
-# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
-# default. You can specify a custom pid file location here.
-pidfile <%= @conf_pidfile_real %>
-
-# Accept connections on the specified port, default is 6379.
-# If port 0 is specified Redis will not listen on a TCP socket.
-port <%= @conf_port %>
-
-# If you want you can bind a single interface, if the bind option is not
-# specified all the interfaces will listen for incoming connections.
-#
-<% if @conf_bind != 'UNSET' %>
-bind <%= @conf_bind %>
-<% end %>
-
-# Specify the path for the unix socket that will be used to listen for
-# incoming connections. There is no default, so Redis will not listen
-# on a unix socket when not specified.
-#
-# unixsocket /tmp/redis.sock
-# unixsocketperm 755
-
-# Close the connection after a client is idle for N seconds (0 to disable)
-timeout <%= @conf_timeout %>
-
-# Set server verbosity to 'debug'
-# it can be one of:
-# debug (a lot of information, useful for development/testing)
-# verbose (many rarely useful info, but not a mess like the debug level)
-# notice (moderately verbose, what you want in production probably)
-# warning (only very important / critical messages are logged)
-loglevel <%= @conf_loglevel %>
-
-# Specify the log file name. Also 'stdout' can be used to force
-# Redis to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile <%= @conf_logfile_real %>
-
-# To enable logging to the system logger, just set 'syslog-enabled' to yes,
-# and optionally update the other syslog parameters to suit your needs.
-<% if @conf_syslog_enabled != 'UNSET' %>
-syslog-enabled <%= @conf_syslog_enabled %>
-<% else %>
-# syslog-enabled no
-<% end %>
-
-# Specify the syslog identity.
-<% if @conf_syslog_ident != 'UNSET' %>
-syslog-ident <%= @conf_syslog_ident %>
-<% else %>
-# syslog-ident redis
-<% end %>
-
-# Specify the syslog facility.  Must be USER or between LOCAL0-LOCAL7.
-<% if @conf_syslog_facility != 'UNSET' %>
-syslog-facility <%= @conf_syslog_facility %>
-<% else %>
-# syslog-facility local0
-<% end %>
-
-# Set the number of databases. The default database is DB 0, you can select
-# a different one on a per-connection basis using SELECT <dbid> where
-# dbid is a number between 0 and 'databases'-1
-databases <%= @conf_databases %>
-
-################################ SNAPSHOTTING  #################################
-#
-# Save the DB on disk:
-#
-#   save <seconds> <changes>
-#
-#   Will save the DB if both the given number of seconds and the given
-#   number of write operations against the DB occurred.
-#
-#   In the example below the behaviour will be to save:
-#   after 900 sec (15 min) if at least 1 key changed
-#   after 300 sec (5 min) if at least 10 keys changed
-#   after 60 sec if at least 10000 keys changed
-#
-#   Note: you can disable saving at all commenting all the "save" lines.
-
-<% if @conf_nosave != 'UNSET' %>
-#do not persist to disk:
-#save 900 1
-#save 300 10
-#save 60 10000
-<% else %>
-  <% if @conf_save != 'UNSET' %>
-  save <%= @conf_save %>
-  <% else %>
-  save 900 1
-  save 300 10
-  save 60 10000
-  <% end %>
-<% end %>
-
-# Compress string objects using LZF when dump .rdb databases?
-# For default that's set to 'yes' as it's almost always a win.
-# If you want to save some CPU in the saving child set it to 'no' but
-# the dataset will likely be bigger if you have compressible values or keys.
-rdbcompression <%= @conf_rdbcompression %>
-
-# The filename where to dump the DB
-dbfilename <%= @conf_dbfilename %>
-
-# The working directory.
-#
-# The DB will be written inside this directory, with the filename specified
-# above using the 'dbfilename' configuration directive.
-#
-# Also the Append Only File will be created inside this directory.
-#
-# Note that you must specify a directory here, not a file name.
-dir <%= @conf_dir %>
-
-################################# REPLICATION #################################
-
-# Master-Slave replication. Use slaveof to make a Redis instance a copy of
-# another Redis server. Note that the configuration is local to the slave
-# so for example it is possible to configure the slave to save the DB with a
-# different interval, or to listen to another port, and so on.
-#
-<% if @conf_slaveof != 'UNSET' %>
-slaveof <%= @conf_slaveof %>
-<% else %>
-# slaveof <masterip> <masterport>
-<% end %>
-
-# If the master is password protected (using the "requirepass" configuration
-# directive below) it is possible to tell the slave to authenticate before
-# starting the replication synchronization process, otherwise the master will
-# refuse the slave request.
-#
-<% if @conf_masterauth != 'UNSET' %>
-masterauth <%= @conf_masterauth %>
-<% else %>
-# masterauth <master-password>
-<% end %>
-
-# When a slave lost the connection with the master, or when the replication
-# is still in progress, the slave can act in two different ways:
-#
-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
-#    still reply to client requests, possibly with out of data data, or the
-#    data set may just be empty if this is the first synchronization.
-#
-# 2) if slave-serve-stale data is set to 'no' the slave will reply with
-#    an error "SYNC with master in progress" to all the kind of commands
-#    but to INFO and SLAVEOF.
-#
-slave-serve-stale-data <%= @conf_slave_server_stale_data %>
-
-# Slaves send PINGs to server in a predefined interval. It's possible to change
-# this interval with the repl_ping_slave_period option. The default value is 10
-# seconds.
-#
-# repl-ping-slave-period 10
-repl-ping-slave-period <%= @conf_repl_ping_slave_period %>
-
-# The following option sets a timeout for both Bulk transfer I/O timeout and
-# master data or ping response timeout. The default value is 60 seconds.
-#
-# It is important to make sure that this value is greater than the value
-# specified for repl-ping-slave-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the slave.
-#
-# repl-timeout 60
-repl-timeout <%= @conf_repl_timeout %>
-
-################################## SECURITY ###################################
-
-# Require clients to issue AUTH <PASSWORD> before processing any other
-# commands.  This might be useful in environments in which you do not trust
-# others with access to the host running redis-server.
-#
-# This should stay commented out for backward compatibility and because most
-# people do not need auth (e.g. they run their own servers).
-#
-# Warning: since Redis is pretty fast an outside user can try up to
-# 150k passwords per second against a good box. This means that you should
-# use a very strong password otherwise it will be very easy to break.
-#
-<% if @conf_requirepass != 'UNSET' %>
-requirepass <%= @conf_requirepass %>
-<% else %>
-# requirepass foobared
-<% end %>
-
-# Command renaming.
-#
-# It is possilbe to change the name of dangerous commands in a shared
-# environment. For instance the CONFIG command may be renamed into something
-# of hard to guess so that it will be still available for internal-use
-# tools but not available for general clients.
-#
-# Example:
-#
-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
-#
-# It is also possilbe to completely kill a command renaming it into
-# an empty string:
-#
-# rename-command CONFIG ""
-
-################################### LIMITS ####################################
-
-# Set the max number of connected clients at the same time. By default there
-# is no limit, and it's up to the number of file descriptors the Redis process
-# is able to open. The special value '0' means no limits.
-# Once the limit is reached Redis will close all the new connections sending
-# an error 'max number of clients reached'.
-#
-# maxclients 128
-<% if @conf_maxclients != 'UNSET' %>
-maxclients <%= @conf_maxclients %>
-<% end %>
-
-# Don't use more memory than the specified amount of bytes.
-# When the memory limit is reached Redis will try to remove keys
-# accordingly to the eviction policy selected (see maxmemmory-policy).
-#
-# If Redis can't remove keys according to the policy, or if the policy is
-# set to 'noeviction', Redis will start to reply with errors to commands
-# that would use more memory, like SET, LPUSH, and so on, and will continue
-# to reply to read-only commands like GET.
-#
-# This option is usually useful when using Redis as an LRU cache, or to set
-# an hard memory limit for an instance (using the 'noeviction' policy).
-#
-# WARNING: If you have slaves attached to an instance with maxmemory on,
-# the size of the output buffers needed to feed the slaves are subtracted
-# from the used memory count, so that network problems / resyncs will
-# not trigger a loop where keys are evicted, and in turn the output
-# buffer of slaves is full with DELs of keys evicted triggering the deletion
-# of more keys, and so forth until the database is completely emptied.
-#
-# In short... if you have slaves attached it is suggested that you set a lower
-# limit for maxmemory so that there is some free RAM on the system for slave
-# output buffers (but this is not needed if the policy is 'noeviction').
-#
-# maxmemory <bytes>
-<% if @conf_maxmemory != 'UNSET' %>
-maxmemory <%= @conf_maxmemory %>
-<% end %>
-
-# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
-# is reached? You can select among five behavior:
-#
-# volatile-lru -> remove the key with an expire set using an LRU algorithm
-# allkeys-lru -> remove any key accordingly to the LRU algorithm
-# volatile-random -> remove a random key with an expire set
-# allkeys->random -> remove a random key, any key
-# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
-# noeviction -> don't expire at all, just return an error on write operations
-#
-# Note: with all the kind of policies, Redis will return an error on write
-#       operations, when there are not suitable keys for eviction.
-#
-#       At the date of writing this commands are: set setnx setex append
-#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
-#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
-#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
-#       getset mset msetnx exec sort
-#
-# The default is:
-#
-# maxmemory-policy volatile-lru
-<% if @conf_maxmemory_policy != 'UNSET' %>
-maxmemory-policy <%= @conf_maxmemory_policy %>
-<% end %>
-
-# LRU and minimal TTL algorithms are not precise algorithms but approximated
-# algorithms (in order to save memory), so you can select as well the sample
-# size to check. For instance for default Redis will check three keys and
-# pick the one that was used less recently, you can change the sample size
-# using the following configuration directive.
-#
-# maxmemory-samples 3
-<% if @conf_maxmemory_samples != 'UNSET' %>
-maxmemory-samples <%= @conf_maxmemory_samples %>
-<% end %>
-
-############################## APPEND ONLY MODE ###############################
-
-# By default Redis asynchronously dumps the dataset on disk. If you can live
-# with the idea that the latest records will be lost if something like a crash
-# happens this is the preferred way to run Redis. If instead you care a lot
-# about your data and don't want to that a single record can get lost you should
-# enable the append only mode: when this mode is enabled Redis will append
-# every write operation received in the file appendonly.aof. This file will
-# be read on startup in order to rebuild the full dataset in memory.
-#
-# Note that you can have both the async dumps and the append only file if you
-# like (you have to comment the "save" statements above to disable the dumps).
-# Still if append only mode is enabled Redis will load the data from the
-# log file at startup ignoring the dump.rdb file.
-#
-# IMPORTANT: Check the BGREWRITEAOF to check how to rewrite the append
-# log file in background when it gets too big.
-
-appendonly <%= @conf_appendonly %>
-
-# The name of the append only file (default: "appendonly.aof")
-# appendfilename appendonly.aof
-<% if @conf_appendfilename != 'UNSET' %>
-appendfilename <%= @conf_appendfilename %>
-<% end %>
-
-# The fsync() call tells the Operating System to actually write data on disk
-# instead to wait for more data in the output buffer. Some OS will really flush
-# data on disk, some other OS will just try to do it ASAP.
-#
-# Redis supports three different modes:
-#
-# no: don't fsync, just let the OS flush the data when it wants. Faster.
-# always: fsync after every write to the append only log . Slow, Safest.
-# everysec: fsync only if one second passed since the last fsync. Compromise.
-#
-# The default is "everysec" that's usually the right compromise between
-# speed and data safety. It's up to you to understand if you can relax this to
-# "no" that will will let the operating system flush the output buffer when
-# it wants, for better performances (but if you can live with the idea of
-# some data loss consider the default persistence mode that's snapshotting),
-# or on the contrary, use "always" that's very slow but a bit safer than
-# everysec.
-#
-# If unsure, use "everysec".
-
-# appendfsync always
-appendfsync <%= @conf_appendfsync %>
-# appendfsync no
-
-# When the AOF fsync policy is set to always or everysec, and a background
-# saving process (a background save or AOF log background rewriting) is
-# performing a lot of I/O against the disk, in some Linux configurations
-# Redis may block too long on the fsync() call. Note that there is no fix for
-# this currently, as even performing fsync in a different thread will block
-# our synchronous write(2) call.
-#
-# In order to mitigate this problem it's possible to use the following option
-# that will prevent fsync() from being called in the main process while a
-# BGSAVE or BGREWRITEAOF is in progress.
-#
-# This means that while another child is saving the durability of Redis is
-# the same as "appendfsync none", that in pratical terms means that it is
-# possible to lost up to 30 seconds of log in the worst scenario (with the
-# default Linux settings).
-#
-# If you have latency problems turn this to "yes". Otherwise leave it as
-# "no" that is the safest pick from the point of view of durability.
-no-appendfsync-on-rewrite <%= @conf_no_appendfsync_on_rewrite %>
-
-# Automatic rewrite of the append only file.
-# Redis is able to automatically rewrite the log file implicitly calling
-# BGREWRITEAOF when the AOF log size will growth by the specified percentage.
-#
-# This is how it works: Redis remembers the size of the AOF file after the
-# latest rewrite (or if no rewrite happened since the restart, the size of
-# the AOF at startup is used).
-#
-# This base size is compared to the current size. If the current size is
-# bigger than the specified percentage, the rewrite is triggered. Also
-# you need to specify a minimal size for the AOF file to be rewritten, this
-# is useful to avoid rewriting the AOF file even if the percentage increase
-# is reached but it is still pretty small.
-#
-# Specify a precentage of zero in order to disable the automatic AOF
-# rewrite feature.
-
-auto-aof-rewrite-percentage <%= @conf_auto_aof_rewrite_percentage %>
-auto-aof-rewrite-min-size <%= @conf_auto_aof_rewrite_min_size %>
-
-################################## SLOW LOG ###################################
-
-# The Redis Slow Log is a system to log queries that exceeded a specified
-# execution time. The execution time does not include the I/O operations
-# like talking with the client, sending the reply and so forth,
-# but just the time needed to actually execute the command (this is the only
-# stage of command execution where the thread is blocked and can not serve
-# other requests in the meantime).
-#
-# You can configure the slow log with two parameters: one tells Redis
-# what is the execution time, in microseconds, to exceed in order for the
-# command to get logged, and the other parameter is the length of the
-# slow log. When a new command is logged the oldest one is removed from the
-# queue of logged commands.
-
-# The following time is expressed in microseconds, so 1000000 is equivalent
-# to one second. Note that a negative number disables the slow log, while
-# a value of zero forces the logging of every command.
-slowlog-log-slower-than <%= @conf_slowlog_log_slower_than %>
-
-# There is no limit to this length. Just be aware that it will consume memory.
-# You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len <%= @conf_slowlog_max_len %>
-
-################################ VIRTUAL MEMORY ###############################
-
-### WARNING! Virtual Memory is deprecated in Redis 2.4
-### The use of Virtual Memory is strongly discouraged.
-
-# Virtual Memory allows Redis to work with datasets bigger than the actual
-# amount of RAM needed to hold the whole dataset in memory.
-# In order to do so very used keys are taken in memory while the other keys
-# are swapped into a swap file, similarly to what operating systems do
-# with memory pages.
-#
-# To enable VM just set 'vm-enabled' to yes, and set the following three
-# VM parameters accordingly to your needs.
-
-#vm-enabled <%= @conf_vm_enabled %>
-# vm-enabled yes
-
-# This is the path of the Redis swap file. As you can guess, swap files
-# can't be shared by different Redis instances, so make sure to use a swap
-# file for every redis process you are running. Redis will complain if the
-# swap file is already in use.
-#
-# The best kind of storage for the Redis swap file (that's accessed at random)
-# is a Solid State Disk (SSD).
-#
-# *** WARNING *** if you are using a shared hosting the default of putting
-# the swap file under /tmp is not secure. Create a dir with access granted
-# only to Redis user and configure Redis to create the swap file there.
-#vm-swap-file <%= @conf_vm_swap_file %>
-
-# vm-max-memory configures the VM to use at max the specified amount of
-# RAM. Everything that deos not fit will be swapped on disk *if* possible, that
-# is, if there is still enough contiguous space in the swap file.
-#
-# With vm-max-memory 0 the system will swap everything it can. Not a good
-# default, just specify the max amount of RAM you can in bytes, but it's
-# better to leave some margin. For instance specify an amount of RAM
-# that's more or less between 60 and 80% of your free RAM.
-#vm-max-memory <%= @conf_vm_max_memory %>
-
-# Redis swap files is split into pages. An object can be saved using multiple
-# contiguous pages, but pages can't be shared between different objects.
-# So if your page is too big, small objects swapped out on disk will waste
-# a lot of space. If you page is too small, there is less space in the swap
-# file (assuming you configured the same number of total swap file pages).
-#
-# If you use a lot of small objects, use a page size of 64 or 32 bytes.
-# If you use a lot of big objects, use a bigger page size.
-# If unsure, use the default :)
-#vm-page-size <%= @conf_vm_page_size %>
-
-# Number of total memory pages in the swap file.
-# Given that the page table (a bitmap of free/used pages) is taken in memory,
-# every 8 pages on disk will consume 1 byte of RAM.
-#
-# The total swap size is vm-page-size * vm-pages
-#
-# With the default of 32-bytes memory pages and 134217728 pages Redis will
-# use a 4 GB swap file, that will use 16 MB of RAM for the page table.
-#
-# It's better to use the smallest acceptable value for your application,
-# but the default is large in order to work in most conditions.
-#vm-pages <%= @conf_vm_pages %>
-
-# Max number of VM I/O threads running at the same time.
-# This threads are used to read/write data from/to swap file, since they
-# also encode and decode objects from disk to memory or the reverse, a bigger
-# number of threads can help with big objects even if they can't help with
-# I/O itself as the physical device may not be able to couple with many
-# reads/writes operations at the same time.
-#
-# The special value of 0 turn off threaded I/O and enables the blocking
-# Virtual Memory implementation.
-#vm-max-threads <%= @conf_vm_max_threads %>
-
-############################### ADVANCED CONFIG ###############################
-
-# Hashes are encoded in a special way (much more memory efficient) when they
-# have at max a given numer of elements, and the biggest element does not
-# exceed a given threshold. You can configure this limits with the following
-# configuration directives.
-#hash-max-zipmap-entries <%= @conf_hash_max_zipmap_entries %>
-#hash-max-zipmap-value <%= @conf_hash_max_zipmap_value %>
-
-# Similarly to hashes, small lists are also encoded in a special way in order
-# to save a lot of space. The special representation is only used when
-# you are under the following limits:
-list-max-ziplist-entries <%= @conf_list_max_ziplist_entries %>
-list-max-ziplist-value <%= @conf_list_max_ziplist_value %>
-
-# Sets have a special encoding in just one case: when a set is composed
-# of just strings that happens to be integers in radix 10 in the range
-# of 64 bit signed integers.
-# The following configuration setting sets the limit in the size of the
-# set in order to use this special memory saving encoding.
-set-max-intset-entries <%= @conf_set_max_intset_entries %>
-
-# Similarly to hashes and lists, sorted sets are also specially encoded in
-# order to save a lot of space. This encoding is only used when the length and
-# elements of a sorted set are below the following limits:
-zset-max-ziplist-entries <%= @conf_zset_max_ziplist_entries %>
-zset-max-ziplist-value <%= @conf_zset_max_ziplist_value %>
-
-# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
-# order to help rehashing the main Redis hash table (the one mapping top-level
-# keys to values). The hash table implementation redis uses (see dict.c)
-# performs a lazy rehashing: the more operation you run into an hash table
-# that is rhashing, the more rehashing "steps" are performed, so if the
-# server is idle the rehashing is never complete and some more memory is used
-# by the hash table.
-#
-# The default is to use this millisecond 10 times every second in order to
-# active rehashing the main dictionaries, freeing memory when possible.
-#
-# If unsure:
-# use "activerehashing no" if you have hard latency requirements and it is
-# not a good thing in your environment that Redis can reply form time to time
-# to queries with 2 milliseconds delay.
-#
-# use "activerehashing yes" if you don't have such hard requirements but
-# want to free memory asap when possible.
-activerehashing <%= @conf_activerehashing %>
-
-################################## INCLUDES ###################################
-
-# Include one or more other config files here.  This is useful if you
-# have a standard template that goes to all redis server but also need
-# to customize a few per-server settings.  Include files can include
-# other files, so use this wisely.
-#
-# include /path/to/local.conf
-# include /path/to/other.conf
-<% if @conf_include != 'UNSET' %>
-include <%= @conf_include %>
-<% end %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/tests/init.pp
deleted file mode 100644
index b9859818e83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/redis/tests/init.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-node default {
-
-  package { 'epel-release':
-    ensure   => present,
-    source   => 'http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm',
-    provider => rpm,
-  }
-
-  class { 'redis':
-    conf_port     => '6379',
-    conf_bind     => '0.0.0.0',
-    system_sysctl => true,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.fixtures.yml
deleted file mode 100644
index d64f95571e1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.fixtures.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-  symlinks:
-    staging: "#{source_dir}"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.travis.yml
deleted file mode 100644
index 1a4302e6dfa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: ruby
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
-before_install:
-  - gem update bundler
-  - bundle --version
-  - gem update --system 2.1.11
-  - gem --version
-rvm:
-  - 1.8.7
-  - 1.9.3
-env:
-  - PUPPET_GEM_VERSION="~> 3.2.0"
-  - PUPPET_GEM_VERSION=">= 3.0.0"
-branches:
-  only:
-    - master
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION=">= 3.0.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Gemfile
deleted file mode 100644
index dbc5ead104d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Gemfile
+++ /dev/null
@@ -1,25 +0,0 @@
-source "https://rubygems.org"
-
-group :development, :test do
-  gem 'rake'
-  gem 'rspec', "~> 2.11.0", :require => false
-  gem 'mocha', "~> 0.10.5", :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', :require => false
-  gem 'puppet-lint'
-end
-
-facterversion = ENV['GEM_FACTER_VERSION']
-if facterversion
-  gem 'facter', facterversion
-else
-  gem 'facter', :require => false
-end
-
-ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
-puppetversion = ENV['GEM_PUPPET_VERSION']
-if puppetversion
-  gem 'puppet', puppetversion
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/LICENSE
deleted file mode 100644
index 51fca54c2a0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Modulefile
deleted file mode 100644
index 3750abc30c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Modulefile
+++ /dev/null
@@ -1,10 +0,0 @@
-name    'nanliu-staging'
-version '0.4.0'
-source  'git@github.com:nanliu/puppet-staging.git'
-author  'nanliu'
-license 'Apache License Version 2.0'
-summary 'Compressed file staging and deployment'
-description 'Manages compressed file staging and deployment.'
-project_page 'https://github.com/nanliu/puppet-staging'
-
-## Add dependencies, if any:
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/README.md
deleted file mode 100644
index a0d3e37ccbf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Staging module for Puppet
-
-Manages staging directory, along with download/extraction of compressed files.
-
-[![Build Status](https://secure.travis-ci.org/nanliu/puppet-staging.png?branch=master)](http://travis-ci.org/nanliu/puppet-staging)
-
-WARNING: Version 0.2.0 no longer uses hiera functions. The same behavior should be available in Puppet 3.0.
-
-## Usage
-
-Specify a different default staging path (must be declared before using resource):
-
-    class { 'staging':
-      path  => '/var/staging',
-      owner => 'puppet',
-      group => 'puppet',
-    }
-
-Staging files from various sources:
-
-    staging::file { 'sample':
-      source => 'puppet://modules/staging/sample',
-    }
-
-    staging::file { 'apache-tomcat-6.0.35':
-      source => 'http://apache.cs.utah.edu/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz',
-    }
-
-
-Staging and extracting files:
-
-    staging::file { 'sample.tar.gz':
-      source => 'puppet:///modules/staging/sample.tar.gz'
-    }
-
-    staging::extract { 'sample.tar.gz':
-      target  => '/tmp/staging',
-      creates => '/tmp/staging/sample',
-      require => Staging::File['sample.tar.gz'],
-    }
-
-Staging files currently support the following source:
-
-* http(s)://
-* puppet://
-* ftp://
-* local (though this doesn't serve any real purpose.)
-
-## Contributor
-
-* Adrien Thebo
-* gizero
-* Harald Skoglund
-* Hunter Haugen
-* Justin Clayton
-* Owen Jacobson
-* Reid Vandewiele
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Rakefile
deleted file mode 100644
index 5bc13983e88..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Rakefile
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-
-def io_popen(command)
-  IO.popen(command) do |io|
-    io.each do |line|
-      print line
-      yield line if block_given?
-    end
-  end
-end
-
-# Customize lint option
-task :lint do
-  PuppetLint.configuration.send("disable_80chars")
-  PuppetLint.configuration.send("disable_class_parameter_defaults")
-end
-
-desc "Validate manifests, templates, and ruby files in lib."
-task :validate do
-  Dir['manifests/**/*.pp'].each do |manifest|
-    sh "puppet parser validate --noop #{manifest}"
-  end
-  Dir['lib/**/*.rb'].each do |lib_file|
-    sh "ruby -c #{lib_file}"
-  end
-  Dir['templates/**/*.erb'].each do |template|
-    sh "erb -P -x -T '-' #{template} | ruby -c"
-  end
-end
-
-# Initialize vagrant instance for testing
-desc "Powers on Vagrant VMs with specific manifests"
-task :vagrant, :manifest do |t, args|
-  Rake::Task["spec_prep"].execute
-
-  prefix = "VAGRANT_MANIFEST='#{args[:manifest]||'init.pp'}'"
-
-  puts args[:manifest]
-  provision = false
-  io_popen("export #{prefix}; vagrant up --provider=vmware_fusion") do |line|
-    provision = true if line =~ /Machine is already running./
-  end
-  io_popen("export #{prefix}; vagrant provision") if provision
-end
-
-# Cleanup vagrant environment
-task :vagrant_clean do
-  `vagrant destroy -f`
-  Rake::Task["spec_clean"].execute
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Vagrantfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Vagrantfile
deleted file mode 100644
index 9f9ac91e712..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/Vagrantfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  #config.vm.synced_folder "manifests", "/tmp/manifests", "tests"
-  config.vm.synced_folder "./", "/etc/puppet/modules/staging"
-
-  config.vm.define :staging do |m|
-    m.vm.box = "centos63"
-    m.vm.box_url = "https://dl.dropbox.com/s/eqdrqnla4na8qax/centos63.box"
-
-    m.vm.hostname = 'staging'
-    m.vm.provider :vmware_fusion do |v|
-      v.vmx["displayName"] = "staging"
-      v.vmx["memsize"] = 512
-      v.vmx["numvcpus"] = 4
-    end
-
-    m.vm.provision :puppet do |puppet|
-      puppet.manifests_path = "tests"
-      puppet.module_path    = "spec/fixtures/modules/"
-      puppet.manifest_file  = "init.pp"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/deploy.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/deploy.html
deleted file mode 100644
index fdcdc34e184..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/deploy.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>deploy.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>deploy.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Define:_staging::deploy'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Define:_staging::deploy">&#182;</a>
-        </div>
-        <h3>Define: staging::deploy</h3>
-
-<p>The define resource extracts compressed file to a staging location.</p>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>source</em>]:  the source file location, supports local files, puppet://, http://, https://, ftp:// (default: )</li>
-<li>[<em>target</em>]:  the target extraction directory (default: )</li>
-<li>[<em>staging_path</em>]:  the staging location for compressed file. defaults to ${staging::path}/${caller_module_name} (default: undef)</li>
-<li>[<em>username</em>]:  https or ftp username (default: undef)</li>
-<li>[<em>certificate</em>]:  https certifcate file (default: undef)</li>
-<li>[<em>password</em>]:  https or ftp user password or https certificate password (default: undef)</li>
-<li>[<em>environment</em>]:  environment variable for settings such as http_proxy (default: undef)</li>
-<li>[<em>timeout</em>]:  the time to wait for the file transfer to complete (default: undef)</li>
-<li>[<em>user</em>]:  extract file as this user (default: undef)</li>
-<li>[<em>group</em>]:  extract group as this group (default: undef)</li>
-<li>[<em>creates</em>]:  the file/folder created after extraction. if unspecified defaults to ${target}/${name} (default: undef)</li>
-<li>[<em>unless</em>]:  alternative way to conditionally extract file (default: undef)</li>
-<li>[<em>onlyif</em>]:  alternative way to conditionally extract file (default: undef)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>staging::deploy { 'sample.tar.gz':
-  source =&gt; 'puppet:///modules/staging/sample.tar.gz',
-  target =&gt; '/usr/local',
-}
-</code></pre>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="n">define</span> <span class="n">staging</span><span class="o">::</span><span class="n">deploy</span> <span class="p">(</span>
-  <span class="vg">$source</span><span class="p">,</span>               
-  <span class="vg">$target</span><span class="p">,</span>               
-  <span class="vg">$staging_path</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$username</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$certificate</span>  <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$password</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$environment</span>  <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$timeout</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$user</span>         <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$group</span>        <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$creates</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$unless</span>       <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$onlyif</span>       <span class="o">=</span> <span class="k">undef</span>  
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="n">staging</span><span class="o">::</span><span class="n">file</span> <span class="p">{</span> <span class="vg">$name</span><span class="p">:</span>
-    <span class="n">source</span>      <span class="o">=&gt;</span> <span class="vg">$source</span><span class="p">,</span>
-    <span class="n">target</span>      <span class="o">=&gt;</span> <span class="vg">$staging_path</span><span class="p">,</span>
-    <span class="n">username</span>    <span class="o">=&gt;</span> <span class="vg">$username</span><span class="p">,</span>
-    <span class="n">certificate</span> <span class="o">=&gt;</span> <span class="vg">$certificate</span><span class="p">,</span>
-    <span class="n">password</span>    <span class="o">=&gt;</span> <span class="vg">$password</span><span class="p">,</span>
-    <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-    <span class="n">subdir</span>      <span class="o">=&gt;</span> <span class="vg">$caller_module_name</span><span class="p">,</span>
-    <span class="n">timeout</span>     <span class="o">=&gt;</span> <span class="vg">$timeout</span><span class="p">,</span>
-  <span class="p">}</span>
-
-  <span class="n">staging</span><span class="o">::</span><span class="n">extract</span> <span class="p">{</span> <span class="vg">$name</span><span class="p">:</span>
-    <span class="n">target</span>      <span class="o">=&gt;</span> <span class="vg">$target</span><span class="p">,</span>
-    <span class="n">source</span>      <span class="o">=&gt;</span> <span class="vg">$staging_path</span><span class="p">,</span>
-    <span class="n">user</span>        <span class="o">=&gt;</span> <span class="vg">$user</span><span class="p">,</span>
-    <span class="n">group</span>       <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-    <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-    <span class="n">subdir</span>      <span class="o">=&gt;</span> <span class="vg">$caller_module_name</span><span class="p">,</span>
-    <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$creates</span><span class="p">,</span>
-    <span class="k">unless</span>      <span class="o">=&gt;</span> <span class="vg">$unless</span><span class="p">,</span>
-    <span class="n">onlyif</span>      <span class="o">=&gt;</span> <span class="vg">$onlyif</span><span class="p">,</span>
-    <span class="nb">require</span>     <span class="o">=&gt;</span> <span class="no">Staging</span><span class="o">::</span><span class="no">File</span><span class="o">[</span><span class="vg">$name</span><span class="o">]</span><span class="p">,</span>
-  <span class="p">}</span>
-
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/extract.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/extract.html
deleted file mode 100644
index 0f46958a3db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/extract.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>extract.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>extract.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Define:_staging::extract'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Define:_staging::extract">&#182;</a>
-        </div>
-        <h3>Define: staging::extract</h3>
-
-<p>Define resource to extract files from staging directories to target directories.</p>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>target</em>]:  the target extraction directory (default: )</li>
-<li>[<em>source</em>]:  the source compression file, supports tar, tar.gz, zip, war (default: undef)</li>
-<li>[<em>creates</em>]:  the file created after extraction. if unspecified defaults ${staging::path}/${caller_module_name}/${name} ${target}/${name} (default: undef)</li>
-<li>[<em>unless</em>]:  alternative way to conditionally check whether to extract file. (default: undef)</li>
-<li>[<em>onlyif</em>]:  alternative way to conditionally check whether to extract file. (default: undef)</li>
-<li>[<em>user</em>]:  extract file as this user. (default: undef)</li>
-<li>[<em>group</em>]:   extract file as this group. (default: undef)</li>
-<li>[<em>environment</em>]:  environment variables. (default: undef)</li>
-<li>[<em>subdir</em>]:  subdir per module in staging directory. (default: $caller_module_name)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>$caller_module_name = 'demo'
-
-class { 'staging':
-  path =&gt; '/tmp/staging',
-}
-
-staging::file { 'sample.tar.gz':
-  source =&gt; 'puppet:///modules/staging/sample.tar.gz'
-}
-
-staging::extract { 'sample.tar.gz':
-  target  =&gt; '/tmp/staging',
-  creates =&gt; '/tmp/staging/sample',
-  require =&gt; Staging::File['sample.tar.gz'],
-}
-</code></pre>
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="n">define</span> <span class="n">staging</span><span class="o">::</span><span class="n">extract</span> <span class="p">(</span>
-  <span class="vg">$target</span><span class="p">,</span>              
-  <span class="vg">$source</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$creates</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$unless</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$onlyif</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$user</span>        <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$group</span>       <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$environment</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$subdir</span>      <span class="o">=</span> <span class="vg">$caller_module_name</span> 
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="kp">include</span> <span class="n">staging</span>
-
-  <span class="k">if</span> <span class="vg">$source</span> <span class="p">{</span>
-    <span class="vg">$source_path</span> <span class="o">=</span> <span class="vg">$source</span>
-  <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="vg">$source_path</span> <span class="o">=</span> <span class="s2">&quot;${staging::path}/${subdir}/${name}&quot;</span>
-  <span class="p">}</span></pre></div>
-      </td>
-    </tr>
-    <tr id='section-2'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-2">&#182;</a>
-        </div>
-        <p>Use user supplied creates path, set default value if creates, unless or
-onlyif is not supplied.</p>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre>  <span class="k">if</span> <span class="vg">$creates</span> <span class="p">{</span>
-    <span class="vg">$creates_path</span> <span class="o">=</span> <span class="vg">$creates</span>
-  <span class="p">}</span> <span class="k">elsif</span> <span class="o">!</span> <span class="p">(</span><span class="vg">$unless</span> <span class="ow">or</span> <span class="vg">$onlyif</span><span class="p">)</span> <span class="p">{</span>
-    <span class="k">if</span> <span class="vg">$name</span> <span class="o">=~</span> <span class="sr">/.tar.gz$/</span> <span class="p">{</span>
-      <span class="vg">$folder</span>       <span class="o">=</span> <span class="n">staging_parse</span><span class="p">(</span><span class="vg">$name</span><span class="p">,</span> <span class="s1">&#39;basename&#39;</span><span class="p">,</span> <span class="s1">&#39;.tar.gz&#39;</span><span class="p">)</span>
-      <span class="vg">$creates_path</span> <span class="o">=</span> <span class="s2">&quot;${target}/${folder}&quot;</span>
-    <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-      <span class="vg">$folder</span>       <span class="o">=</span> <span class="n">staging_parse</span><span class="p">(</span><span class="vg">$name</span><span class="p">,</span> <span class="s1">&#39;basename&#39;</span><span class="p">)</span>
-      <span class="vg">$creates_path</span> <span class="o">=</span> <span class="s2">&quot;${target}/${folder}&quot;</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="k">if</span> <span class="n">scope_defaults</span><span class="p">(</span><span class="s1">&#39;Exec&#39;</span><span class="p">,</span><span class="s1">&#39;path&#39;</span><span class="p">)</span> <span class="p">{</span>
-    <span class="no">Exec</span><span class="p">{</span>
-      <span class="n">cwd</span>         <span class="o">=&gt;</span> <span class="vg">$target</span><span class="p">,</span>
-      <span class="n">user</span>        <span class="o">=&gt;</span> <span class="vg">$user</span><span class="p">,</span>
-      <span class="n">group</span>       <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-      <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-      <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$creates_path</span><span class="p">,</span>
-      <span class="k">unless</span>      <span class="o">=&gt;</span> <span class="vg">$unless</span><span class="p">,</span>
-      <span class="n">onlyif</span>      <span class="o">=&gt;</span> <span class="vg">$onlyif</span><span class="p">,</span>
-      <span class="n">logoutput</span>   <span class="o">=&gt;</span> <span class="n">on_failure</span><span class="p">,</span>
-    <span class="p">}</span>
-  <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="no">Exec</span><span class="p">{</span>
-      <span class="n">path</span>        <span class="o">=&gt;</span> <span class="vg">$:</span><span class="ss">:path</span><span class="p">,</span>
-      <span class="n">cwd</span>         <span class="o">=&gt;</span> <span class="vg">$target</span><span class="p">,</span>
-      <span class="n">user</span>        <span class="o">=&gt;</span> <span class="vg">$user</span><span class="p">,</span>
-      <span class="n">group</span>       <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-      <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-      <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$creates_path</span><span class="p">,</span>
-      <span class="k">unless</span>      <span class="o">=&gt;</span> <span class="vg">$unless</span><span class="p">,</span>
-      <span class="n">onlyif</span>      <span class="o">=&gt;</span> <span class="vg">$onlyif</span><span class="p">,</span>
-      <span class="n">logoutput</span>   <span class="o">=&gt;</span> <span class="n">on_failure</span><span class="p">,</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="k">case</span> <span class="vg">$name</span> <span class="p">{</span>
-    <span class="sr">/.tar$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;tar xf ${source_path}&quot;</span>
-    <span class="p">}</span>
-
-    <span class="sr">/(.tgz|.tar.gz)$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="k">if</span> <span class="vg">$:</span><span class="ss">:osfamily</span> <span class="o">==</span> <span class="s1">&#39;Solaris&#39;</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;gunzip -dc &lt; ${source_path} | tar xf - &quot;</span>
-      <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;tar xzf ${source_path}&quot;</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/.zip$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;unzip ${source_path}&quot;</span>
-    <span class="p">}</span>
-
-    <span class="sr">/.war$/</span><span class="p">:</span> <span class="p">{</span>
-      <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;jar xf ${source_path}&quot;</span>
-    <span class="p">}</span>
-
-    <span class="n">default</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nb">fail</span><span class="p">(</span><span class="s2">&quot;staging::extract: unsupported file format ${name}.&quot;</span><span class="p">)</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="nb">exec</span> <span class="p">{</span> <span class="s2">&quot;extract ${name}&quot;</span><span class="p">:</span>
-    <span class="n">command</span> <span class="o">=&gt;</span> <span class="vg">$command</span><span class="p">,</span>
-  <span class="p">}</span>
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/file.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/file.html
deleted file mode 100644
index 38aa0da55c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/file.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>file.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>file.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Define:_staging::file'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Define:_staging::file">&#182;</a>
-        </div>
-        <h3>Define: staging::file</h3>
-
-<h4>Overview:</h4>
-
-<p>Define resource to retrieve files to staging directories. It is
-intententionally not replacing files, as these intend to be large binaries
-that are versioned.</p>
-
-<h4>Notes:</h4>
-
-<p>  If you specify a different staging location, please manage the file
-  resource as necessary.</p>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>source</em>]:  the source file location, supports local files, puppet://, http://, https://, ftp:// (default: )</li>
-<li>[<em>target</em>]:  the target staging directory, if unspecified ${staging::path}/${caller_module_name} (default: undef)</li>
-<li>[<em>username</em>]:  https or ftp username (default: undef)</li>
-<li>[<em>certificate</em>]:  https certificate file (default: undef)</li>
-<li>[<em>password</em>]:  https or ftp user password or https certificate password (default: undef)</li>
-<li>[<em>environment</em>]:  environment variable for settings such as http_proxy, https_proxy, of ftp_proxy (default: undef)</li>
-<li>[<em>timeout</em>]:  the the time to wait for the file transfer to complete (default: undef)</li>
-<li>[<em>subdir</em>]:  (default: $caller_module_name)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>$caller_module_name = 'demo'
-
-class { 'staging':
-  path =&gt; '/tmp/staging',
-}
-
-staging::file { 'sample':
-  source =&gt; 'puppet:///modules/staging/sample',
-}
-
-staging::file { 'passwd':
-  source =&gt; '/etc/passwd',
-}
-
-staging::file { 'manpage.html':
-  source =&gt; 'http://curl.haxx.se/docs/manpage.html',
-}
-</code></pre>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="n">define</span> <span class="n">staging</span><span class="o">::</span><span class="n">file</span> <span class="p">(</span>
-  <span class="vg">$source</span><span class="p">,</span>              
-  <span class="vg">$target</span>      <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$username</span>    <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$certificate</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$password</span>    <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$environment</span> <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$timeout</span>     <span class="o">=</span> <span class="k">undef</span><span class="p">,</span> 
-  <span class="vg">$subdir</span>      <span class="o">=</span> <span class="vg">$caller_module_name</span>
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="kp">include</span> <span class="n">staging</span>
-
-  <span class="k">if</span> <span class="vg">$target</span> <span class="p">{</span>
-    <span class="vg">$target_file</span> <span class="o">=</span> <span class="vg">$target</span>
-    <span class="vg">$staging_dir</span> <span class="o">=</span> <span class="n">staging_parse</span><span class="p">(</span><span class="vg">$target</span><span class="p">,</span> <span class="s1">&#39;parent&#39;</span><span class="p">)</span>
-  <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-    <span class="vg">$staging_dir</span> <span class="o">=</span> <span class="s2">&quot;${staging::path}/${subdir}&quot;</span>
-    <span class="vg">$target_file</span> <span class="o">=</span> <span class="s2">&quot;${staging_dir}/${name}&quot;</span>
-
-    <span class="k">if</span> <span class="o">!</span> <span class="n">defined</span><span class="p">(</span><span class="no">File</span><span class="o">[</span><span class="vg">$staging_dir</span><span class="o">]</span><span class="p">)</span> <span class="p">{</span>
-      <span class="n">file</span> <span class="p">{</span> <span class="vg">$staging_dir</span><span class="p">:</span>
-        <span class="k">ensure</span><span class="o">=&gt;</span><span class="n">directory</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-  <span class="no">Exec</span> <span class="p">{</span>
-    <span class="n">path</span>        <span class="o">=&gt;</span> <span class="s1">&#39;/usr/local/bin:/usr/bin:/bin&#39;</span><span class="p">,</span>
-    <span class="n">environment</span> <span class="o">=&gt;</span> <span class="vg">$environment</span><span class="p">,</span>
-    <span class="n">cwd</span>         <span class="o">=&gt;</span> <span class="vg">$staging_dir</span><span class="p">,</span>
-    <span class="n">creates</span>     <span class="o">=&gt;</span> <span class="vg">$target_file</span><span class="p">,</span>
-    <span class="n">timeout</span>     <span class="o">=&gt;</span> <span class="vg">$timeout</span><span class="p">,</span>
-    <span class="n">logoutput</span>   <span class="o">=&gt;</span> <span class="n">on_failure</span><span class="p">,</span>
-  <span class="p">}</span>
-
-  <span class="k">case</span> <span class="vg">$source</span> <span class="p">{</span>
-    <span class="sr">/^\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="n">file</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">source</span>  <span class="o">=&gt;</span> <span class="vg">$source</span><span class="p">,</span>
-        <span class="n">replace</span> <span class="o">=&gt;</span> <span class="kp">false</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^puppet:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="n">file</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">source</span>  <span class="o">=&gt;</span> <span class="vg">$source</span><span class="p">,</span>
-        <span class="n">replace</span> <span class="o">=&gt;</span> <span class="kp">false</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^http:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nb">exec</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">command</span>     <span class="o">=&gt;</span> <span class="s2">&quot;curl -L -o ${name} ${source}&quot;</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^https:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="k">if</span> <span class="vg">$username</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -L -o ${name} -u ${username}:${password} ${source}&quot;</span>
-      <span class="p">}</span> <span class="k">elsif</span> <span class="vg">$certificate</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -L -o ${name} -E ${certificate}:${password} ${source}&quot;</span>
-      <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -L -o ${name} ${source}&quot;</span>
-      <span class="p">}</span>
-
-      <span class="nb">exec</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">command</span>     <span class="o">=&gt;</span> <span class="vg">$command</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="sr">/^ftp:\/\//</span><span class="p">:</span> <span class="p">{</span>
-      <span class="k">if</span> <span class="vg">$username</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -o ${name} -u ${username}:${password} ${source}&quot;</span>
-      <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="vg">$command</span> <span class="o">=</span> <span class="s2">&quot;curl -o ${name} ${source}&quot;</span>
-      <span class="p">}</span>
-
-      <span class="nb">exec</span> <span class="p">{</span> <span class="vg">$target_file</span><span class="p">:</span>
-        <span class="n">command</span>     <span class="o">=&gt;</span> <span class="vg">$command</span><span class="p">,</span>
-      <span class="p">}</span>
-    <span class="p">}</span>
-
-    <span class="n">default</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nb">fail</span><span class="p">(</span><span class="s2">&quot;stage::file: do not recognize source ${source}.&quot;</span><span class="p">)</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/init.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/init.html
deleted file mode 100644
index da5b2be9a9d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/docs/init.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8">
-  <title>init.pp</title>
-  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
-</head>
-<body>
-<div id='container'>
-  <div id="background"></div>
-  <div id="jump_to">
-    Jump To &hellip;
-    <div id="jump_wrapper">
-      <div id="jump_page">
-          <a class="source" href="deploy.html">deploy.pp</a>
-          <a class="source" href="extract.html">extract.pp</a>
-          <a class="source" href="file.html">file.pp</a>
-          <a class="source" href="init.html">init.pp</a>
-      </div>
-    </div>
-  </div>
-  <table cellspacing=0 cellpadding=0>
-  <thead>
-    <tr>
-      <th class=docs><h1>init.pp</h1></th>
-      <th class=code></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr id='section-Class:_staging'>
-      <td class=docs>
-        <div class="pilwrap">
-          <a class="pilcrow" href="#section-Class:_staging">&#182;</a>
-        </div>
-        <h3>Class: staging</h3>
-
-<p>This module manages staging and extraction of files from various sources.</p>
-
-<h4>Actions:</h4>
-
-<p>Creates the root staging directory. By default files will be created in a subdirectory matching the caller_module_name.</p>
-
-<p>   /opt/staging/</p>
-
-<pre><code>          |-- puppet
-          |   `-- puppet.enterprise.2.0.tar.gz
-          `-- tomcat
-              `-- tomcat.5.0.tar.gz
-</code></pre>
-
-<h3>Parameters:</h3>
-
-<ul>
-<li>[<em>path</em>]:  staging directory filepath (default: &lsquo;/opt/staging&rsquo;)</li>
-<li>[<em>owner</em>]:  staging directory owner (default: &lsquo;0&rsquo;)</li>
-<li>[<em>group</em>]:  staging directory group (default: &lsquo;0&rsquo;)</li>
-<li>[<em>mode</em>]:  staging directory permission (default: &lsquo;0755&rsquo;)</li>
-</ul>
-
-
-<h3>Usage:</h3>
-
-<pre><code>include staging
-</code></pre>
-
-      </td>
-      <td class=code>
-        <div class='highlight'><pre><span class="k">class</span> <span class="n">staging</span> <span class="p">(</span>
-  <span class="vg">$path</span>  <span class="o">=</span> <span class="s1">&#39;/opt/staging&#39;</span><span class="p">,</span> 
-  <span class="vg">$owner</span> <span class="o">=</span> <span class="s1">&#39;0&#39;</span><span class="p">,</span>            
-  <span class="vg">$group</span> <span class="o">=</span> <span class="s1">&#39;0&#39;</span><span class="p">,</span>            
-  <span class="vg">$mode</span>  <span class="o">=</span> <span class="s1">&#39;0755&#39;</span>          
-<span class="p">)</span> <span class="p">{</span>
-
-  <span class="n">file</span> <span class="p">{</span> <span class="vg">$path</span><span class="p">:</span>
-    <span class="k">ensure</span> <span class="o">=&gt;</span> <span class="n">directory</span><span class="p">,</span>
-    <span class="n">owner</span>  <span class="o">=&gt;</span> <span class="vg">$owner</span><span class="p">,</span>
-    <span class="n">group</span>  <span class="o">=&gt;</span> <span class="vg">$group</span><span class="p">,</span>
-    <span class="n">mode</span>   <span class="o">=&gt;</span> <span class="vg">$mode</span><span class="p">,</span>
-  <span class="p">}</span>
-
-<span class="p">}</span></pre></div>
-      </td>
-    </tr>
-  </table>
-</div>
-</body>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample
deleted file mode 100644
index 01e34c31d91..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample
+++ /dev/null
@@ -1 +0,0 @@
-sample file to test module.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.bz2 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.bz2
deleted file mode 100644
index f7fbcf229f0..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.bz2 and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.gz b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.gz
deleted file mode 100644
index 9bb95d11a56..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/files/sample.tar.gz and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb
deleted file mode 100644
index 19784a690eb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_http_get.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-Facter.add("staging_http_get") do
-  setcode do
-
-    fact = nil
-
-    which = lambda do |cmd|
-      result = nil
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each do |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
-          result = exe if File.executable? exe
-          break if result
-        end
-        break if result
-      end
-      result
-    end
-
-    ['curl', 'wget', 'powershell'].each do |cmd|
-      available = which.call(cmd)
-      fact = available ? cmd : nil
-      break if fact
-    end
-
-    fact
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb
deleted file mode 100644
index 82086336512..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/facter/staging_windir.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Facter.add(:staging_windir) do
-  confine :osfamily => :windows
-  setcode do
-    program_data = `echo %SYSTEMDRIVE%\\ProgramData`.chomp
-    if File.directory? program_data
-      "#{program_data}\\staging"
-    else
-      "C:\\staging"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb
deleted file mode 100644
index 6c814849a0d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/scope_defaults.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:scope_defaults, :type => :rvalue, :doc => <<-EOS
-Determine if specified resource defaults have a attribute defined in
-current scope.
-EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "scope_defaults(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    # auto capitalize puppet resource for lookup:
-    res_type = arguments[0].split('::').collect{ |x| x.capitalize }.join('::')
-    res_attr = arguments[1]
-
-    return self.lookupdefaults(res_type).has_key?(res_attr.to_sym)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb
deleted file mode 100644
index 666c887e3c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/lib/puppet/parser/functions/staging_parse.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'uri'
-
-module Puppet::Parser::Functions
-  newfunction(:staging_parse, :type => :rvalue, :doc => <<-EOS
-Parse filepath to retrieve information about the file.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "staging_parse(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1, 2, 3)") if arguments.size < 1 || arguments.size > 3
-
-    source    = arguments[0]
-    path      = URI.parse(source).path
-
-    raise Puppet::ParseError, "staging_parse(): #{source.inspect} has no URI " +
-      "'path' component" if path.nil?
-
-    info      = arguments[1] ? arguments[1] : 'filename'
-    extension = arguments[2] ? arguments[2] : File.extname(path)
-
-    case info
-    when 'filename'
-      result = File.basename(path)
-    when 'basename'
-      result = File.basename(path, extension)
-    when 'extname'
-      result = File.extname(path)
-    when 'parent'
-      result = File.expand_path(File.join(path, '..'))
-    else
-      raise Puppet::ParseError, "staging_parse(), unknown parse info #{info}."
-    end
-
-    return result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/deploy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/deploy.pp
deleted file mode 100644
index 565038701f1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/deploy.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# The define resource extracts compressed file to a staging location.
-define staging::deploy (
-  $source,               #: the source file location, supports local files, puppet://, http://, https://, ftp://
-  $target,               #: the target extraction directory
-  $staging_path = undef, #: the staging location for compressed file. defaults to ${staging::path}/${caller_module_name}
-  $username     = undef, #: https or ftp username
-  $certificate  = undef, #: https certifcate file
-  $password     = undef, #: https or ftp user password or https certificate password
-  $environment  = undef, #: environment variable for settings such as http_proxy
-  $timeout      = undef, #: the time to wait for the file transfer to complete
-  $user         = undef, #: extract file as this user
-  $group        = undef, #: extract group as this group
-  $creates      = undef, #: the file/folder created after extraction. if unspecified defaults to ${target}/${name}
-  $unless       = undef, #: alternative way to conditionally extract file
-  $onlyif       = undef  #: alternative way to conditionally extract file
-) {
-
-  staging::file { $name:
-    source      => $source,
-    target      => $staging_path,
-    username    => $username,
-    certificate => $certificate,
-    password    => $password,
-    environment => $environment,
-    subdir      => $caller_module_name,
-    timeout     => $timeout,
-  }
-
-  staging::extract { $name:
-    target      => $target,
-    source      => $staging_path,
-    user        => $user,
-    group       => $group,
-    environment => $environment,
-    subdir      => $caller_module_name,
-    creates     => $creates,
-    unless      => $unless,
-    onlyif      => $onlyif,
-    require     => Staging::File[$name],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/extract.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/extract.pp
deleted file mode 100644
index 163da149265..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/extract.pp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Define resource to extract files from staging directories to target directories.
-define staging::extract (
-  $target,              #: the target extraction directory
-  $source      = undef, #: the source compression file, supports tar, tar.gz, zip, war
-  $creates     = undef, #: the file created after extraction. if unspecified defaults ${staging::path}/${caller_module_name}/${name} ${target}/${name}
-  $unless      = undef, #: alternative way to conditionally check whether to extract file.
-  $onlyif      = undef, #: alternative way to conditionally check whether to extract file.
-  $user        = undef, #: extract file as this user.
-  $group       = undef, #:  extract file as this group.
-  $environment = undef, #: environment variables.
-  $subdir      = $caller_module_name #: subdir per module in staging directory.
-) {
-
-  include staging
-
-  if $source {
-    $source_path = $source
-  } else {
-    $source_path = "${staging::path}/${subdir}/${name}"
-  }
-
-  # Use user supplied creates path, set default value if creates, unless or
-  # onlyif is not supplied.
-  if $creates {
-    $creates_path = $creates
-  } elsif ! ($unless or $onlyif) {
-    if $name =~ /.tar.gz$/ {
-      $folder       = staging_parse($name, 'basename', '.tar.gz')
-    } elsif $name =~ /.tar.bz2$/ {
-      $folder       = staging_parse($name, 'basename', '.tar.bz2')
-    } else {
-      $folder       = staging_parse($name, 'basename')
-    }
-    $creates_path = "${target}/${folder}"
-  }
-
-  if scope_defaults('Exec','path') {
-    Exec{
-      cwd         => $target,
-      user        => $user,
-      group       => $group,
-      environment => $environment,
-      creates     => $creates_path,
-      unless      => $unless,
-      onlyif      => $onlyif,
-      logoutput   => on_failure,
-    }
-  } else {
-    Exec{
-      path        => $::path,
-      cwd         => $target,
-      user        => $user,
-      group       => $group,
-      environment => $environment,
-      creates     => $creates_path,
-      unless      => $unless,
-      onlyif      => $onlyif,
-      logoutput   => on_failure,
-    }
-  }
-
-  case $name {
-    /.tar$/: {
-      $command = "tar xf ${source_path}"
-    }
-
-    /(.tgz|.tar.gz)$/: {
-      if $::osfamily == 'Solaris' {
-        $command = "gunzip -dc < ${source_path} | tar xf - "
-      } else {
-        $command = "tar xzf ${source_path}"
-      }
-    }
-
-    /.tar.bz2$/: {
-      $command = "tar xjf ${source_path}"
-    }
-
-    /.zip$/: {
-      $command = "unzip ${source_path}"
-    }
-
-    /(.war|.jar)$/: {
-      $command = "jar xf ${source_path}"
-    }
-
-    default: {
-      fail("staging::extract: unsupported file format ${name}.")
-    }
-  }
-
-  exec { "extract ${name}":
-    command => $command,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/file.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/file.pp
deleted file mode 100644
index 60b69d796b2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/file.pp
+++ /dev/null
@@ -1,115 +0,0 @@
-# #### Overview:
-#
-# Define resource to retrieve files to staging directories. It is
-# intententionally not replacing files, as these intend to be large binaries
-# that are versioned.
-#
-# #### Notes:
-#
-#   If you specify a different staging location, please manage the file
-#   resource as necessary.
-#
-define staging::file (
-  $source,              #: the source file location, supports local files, puppet://, http://, https://, ftp://
-  $target      = undef, #: the target staging directory, if unspecified ${staging::path}/${caller_module_name}
-  $username    = undef, #: https or ftp username
-  $certificate = undef, #: https certificate file
-  $password    = undef, #: https or ftp user password or https certificate password
-  $environment = undef, #: environment variable for settings such as http_proxy, https_proxy, of ftp_proxy
-  $timeout     = undef, #: the the time to wait for the file transfer to complete
-  $curl_option = undef, #: options to pass to curl
-  $wget_option = undef, #: options to pass to wget
-  $subdir      = $caller_module_name
-) {
-
-  include staging
-
-  $quoted_source = shellquote($source)
-
-  if $target {
-    $target_file = $target
-    $staging_dir = staging_parse($target, 'parent')
-  } else {
-    $staging_dir = "${staging::path}/${subdir}"
-    $target_file = "${staging_dir}/${name}"
-
-    if ! defined(File[$staging_dir]) {
-      file { $staging_dir:
-        ensure=>directory,
-      }
-    }
-  }
-
-  Exec {
-    path        => $staging::exec_path,
-    environment => $environment,
-    cwd         => $staging_dir,
-    creates     => $target_file,
-    timeout     => $timeout,
-    logoutput   => on_failure,
-  }
-
-  case $::staging_http_get {
-    'curl', default: {
-      $http_get        = "curl ${curl_option} -f -L -o ${name} ${quoted_source}"
-      $http_get_passwd = "curl ${curl_option} -f -L -o ${name} -u ${username}:${password} ${quoted_source}"
-      $http_get_cert   = "curl ${curl_option} -f -L -o ${name} -E ${certificate}:${password} ${quoted_source}"
-      $ftp_get         = "curl ${curl_option} -o ${name} ${quoted_source}"
-      $ftp_get_passwd  = "curl ${curl_option} -o ${name} -u ${username}:${password} ${quoted_source}"
-    }
-    'wget': {
-      $http_get        = "wget ${wget_option} -O ${name} ${quoted_source}"
-      $http_get_passwd = "wget ${wget_option} -O ${name} --user=${username} --password=${password} ${quoted_source}"
-      $http_get_cert   = "wget ${wget_option} -O ${name} --user=${username} --certificate=${certificate} ${quoted_source}"
-      $ftp_get         = $http_get
-      $ftp_get_passwd  = $http_get_passwd
-    }
-    'powershell':{
-      $http_get           = "powershell.exe -Command \"\$wc = New-Object System.Net.WebClient;\$wc.DownloadFile('${source}','${target_file}')\""
-      $ftp_get            = $http_get
-      $http_get_password  = "powershell.exe -Command \"\$wc = (New-Object System.Net.WebClient);\$wc.Credentials = New-Object System.Net.NetworkCredential('${username}','${password}');\$wc.DownloadFile(${source},${target_file})\""
-      $ftp_get_password   = $http_get_password
-    }
-  }
-
-  case $source {
-    /^\//: {
-      file { $target_file:
-        source  => $source,
-        replace => false,
-      }
-    }
-    /^puppet:\/\//: {
-      file { $target_file:
-        source  => $source,
-        replace => false,
-      }
-    }
-    /^http:\/\//: {
-      if $username { $command = $http_get_passwd }
-      else         { $command = $http_get        }
-      exec { $target_file:
-        command   => $command,
-      }
-    }
-    /^https:\/\//: {
-      if $username       { $command = $http_get_passwd }
-      elsif $certificate { $command = $http_get_cert   }
-      else               { $command = $http_get        }
-      exec { $target_file:
-        command => $command,
-      }
-    }
-    /^ftp:\/\//: {
-      if $username       { $command = $ftp_get_passwd }
-      else               { $command = $ftp_get        }
-      exec { $target_file:
-        command     => $command,
-      }
-    }
-    default: {
-      fail("stage::file: do not recognize source ${source}.")
-    }
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/init.pp
deleted file mode 100644
index 19bb2da40e9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/init.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-#   This module manages staging and extraction of files from various sources.
-#
-# #### Actions:
-#
-#   Creates the root staging directory. By default files will be created in a subdirectory matching the caller_module_name.
-#
-#      /opt/staging/
-#                 |-- puppet
-#                 |   `-- puppet.enterprise.2.0.tar.gz
-#                 `-- tomcat
-#                     `-- tomcat.5.0.tar.gz
-#
-class staging (
-  $path      = $staging::params::path,     #: staging directory filepath
-  $owner     = $staging::params::owner,    #: staging directory owner
-  $group     = $staging::params::group,    #: staging directory group
-  $mode      = $staging::params::mode,     #: staging directory permission
-  $exec_path = $staging::params::exec_path #: executable default path
-) inherits staging::params {
-
-  file { $path:
-    ensure => directory,
-    owner  => $owner,
-    group  => $group,
-    mode   => $mode,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/params.pp
deleted file mode 100644
index 95ee0a134d9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/manifests/params.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# OS specific parameters
-class staging::params {
-  case $::osfamily {
-    default: {
-      $path      = '/opt/staging'
-      $owner     = '0'
-      $group     = '0'
-      $mode      = '0755'
-      $exec_path = '/usr/local/bin:/usr/bin:/bin'
-    }
-    'Solaris': {
-      $path      = '/opt/staging'
-      $owner     = '0'
-      $group     = '0'
-      $mode      = '0755'
-      $exec_path = '/usr/local/bin:/usr/bin:/bin:/usr/sfw/bin'
-    }
-    'windows': {
-      $path      = $::staging_windir
-      $owner     = undef
-      $group     = undef
-      $mode      = '0755'
-      $exec_path = $::path
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb
deleted file mode 100644
index 66541d22f1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_deploy_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-describe 'staging::deploy', :type => :define do
-
-  # forcing a more sane caller_module_name to match real usage.
-  let(:facts) { { :caller_module_name => 'spec',
-                  :osfamily           => 'RedHat',
-                  :path               => '/usr/local/bin:/usr/bin:/bin', } }
-
-  describe 'when deploying tar.gz' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'puppet:///modules/staging/sample.tar.gz',
-      :target => '/usr/local' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_file('/opt/staging/spec/sample.tar.gz')
-      should contain_exec('extract sample.tar.gz').with({
-        :command => 'tar xzf /opt/staging/spec/sample.tar.gz',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/usr/local',
-        :creates => '/usr/local/sample'
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb
deleted file mode 100644
index a3d742245df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_extract_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'spec_helper'
-describe 'staging::extract', :type => :define do
-
-  # forcing a more sane caller_module_name to match real usage.
-  let(:facts) { { :caller_module_name => 'spec',
-                  :osfamily           => 'RedHat',
-                  :path               => '/usr/local/bin:/usr/bin:/bin' } }
-
-  describe 'when deploying tar.gz' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :target => '/opt' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('extract sample.tar.gz').with({
-        :command => 'tar xzf /opt/staging/spec/sample.tar.gz',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/opt',
-        :creates => '/opt/sample'
-      })
-    }
-  end
-
-  describe 'when deploying zip' do
-    let(:title) { 'sample.zip' }
-    let(:params) { { :target => '/opt' } }
-
-    it { should contain_file('/opt/staging')
-      should contain_exec('extract sample.zip').with({
-        :command => 'unzip /opt/staging/spec/sample.zip',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/opt',
-        :creates => '/opt/sample'
-      })
-    }
-  end
-
-  describe 'when deploying war' do
-    let(:title) { 'sample.war' }
-    let(:params) { { :target => '/opt' } }
-
-    it { should contain_file('/opt/staging')
-      should contain_exec('extract sample.war').with({
-        :command => 'jar xf /opt/staging/spec/sample.war',
-        :path    => '/usr/local/bin:/usr/bin:/bin',
-        :cwd     => '/opt',
-        :creates => '/opt/sample'
-      })
-    }
-  end
-
-  describe 'when deploying unknown' do
-     let(:title) { 'sample.zzz'}
-     let(:params) { { :target => '/opt' } }
-
-     it { expect { should contain_exec("exec sample.zzz") }.to raise_error(Puppet::Error) }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb
deleted file mode 100644
index ab1ee59e119..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/defines/staging_file_spec.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-require 'spec_helper'
-describe 'staging::file', :type => :define do
-
-  # forcing a more sane caller_module_name to match real usage.
-  let(:facts) { { :caller_module_name=> 'spec' } }
-
-  describe 'when deploying via puppet' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'puppet:///modules/staging/sample.tar.gz' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_file('/opt/staging/spec/sample.tar.gz')
-      should_not contain_exec('/opt/staging/spec/sample.tar.gz')
-    }
-  end
-
-  describe 'when deploying via local' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => '/nfs/sample.tar.gz',
-      :target => '/usr/local/sample.tar.gz',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_file('/usr/local/sample.tar.gz')
-      should_not contain_exec('/opt/staging/spec/sample.tar.gz')
-    }
-  end
-
-  describe 'when deploying via http' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'http://webserver/sample.tar.gz' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -f -L -o sample.tar.gz http://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via http with custom curl options' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { {
-      :source => 'http://webserver/sample.tar.gz',
-      :curl_option => '-b',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl -b -f -L -o sample.tar.gz http://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via http with parameters' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'http://webserver/sample.tar.gz',
-      :target => '/usr/local/sample.tar.gz',
-    } }
-
-    it { should contain_file('/opt/staging')
-      should contain_exec('/usr/local/sample.tar.gz').with( {
-        :command => 'curl  -f -L -o sample.tar.gz http://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/usr/local',
-        :creates     => '/usr/local/sample.tar.gz',
-      })
-    }
-  end
-
-  describe 'when deploying via https' do
-     let(:title) { 'sample.tar.gz' }
-     let(:params) { { :source => 'https://webserver/sample.tar.gz' } }
-
-     it { should contain_file('/opt/staging') }
-     it { should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-       :command => 'curl  -f -L -o sample.tar.gz https://webserver/sample.tar.gz',
-       :path        => '/usr/local/bin:/usr/bin:/bin',
-       :environment => nil,
-       :cwd         => '/opt/staging/spec',
-       :creates     => '/opt/staging/spec/sample.tar.gz',
-       :logoutput   => 'on_failure',
-     }) }
-  end
-
-  describe 'when deploying via https with parameters' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'https://webserver/sample.tar.gz',
-      :username => 'puppet',
-      :password => 'puppet',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -f -L -o sample.tar.gz -u puppet:puppet https://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via ftp' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'ftp://webserver/sample.tar.gz' } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -o sample.tar.gz ftp://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-  describe 'when deploying via ftp with parameters' do
-    let(:title) { 'sample.tar.gz' }
-    let(:params) { { :source => 'ftp://webserver/sample.tar.gz',
-      :username => 'puppet',
-      :password => 'puppet',
-    } }
-
-    it {
-      should contain_file('/opt/staging')
-      should contain_exec('/opt/staging/spec/sample.tar.gz').with( {
-        :command => 'curl  -o sample.tar.gz -u puppet:puppet ftp://webserver/sample.tar.gz',
-        :path        => '/usr/local/bin:/usr/bin:/bin',
-        :environment => nil,
-        :cwd         => '/opt/staging/spec',
-        :creates     => '/opt/staging/spec/sample.tar.gz',
-        :logoutput   => 'on_failure',
-      })
-    }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml
deleted file mode 100644
index 771e483f53c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/fixtures/hiera.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-:backends: - puppet
-
-:hierarchy: - common
-
-:puppet:
-    :datasource: data
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/spec_helper.rb
deleted file mode 100644
index dc7e9f4a0ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/spec_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb
deleted file mode 100644
index 50c460de732..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/scope_defaults_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-
-describe "the scope_defaults function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("scope_defaults").should == "function_scope_defaults"
-  end
-
-  it "should raise a ParseError if there is less than 2 arguments" do
-    expect{ scope.function_scope_defaults([]) }.
-      to raise_error(Puppet::ParseError)
-  end
-
-  it "should raise a ParseError if there is more than 2 arguments" do
-    expect{ scope.function_scope_defaults(['exec', 'path', 'error']) }.
-      to raise_error(Puppet::ParseError)
-  end
-
-  it "should return false for invalid resource" do
-    result = scope.function_scope_defaults(['foo', 'path'])
-    result.should(eq(false))
-  end
-
-  it "should return false for resource without default attributes" do
-    if scope.respond_to? :define_settings
-      scope.define_settings('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    else
-      scope.setdefaults('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    end
-    result = scope.function_scope_defaults(['Exec', 'foo'])
-    result.should(eq(false))
-  end
-
-  it "should return true for resource with default attributes" do
-    if scope.respond_to? :define_settings
-      scope.define_settings('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    else
-      scope.setdefaults('Exec', Puppet::Parser::Resource::Param.new(:name => :path, :value => "/bin"))
-    end
-    result = scope.function_scope_defaults(['Exec', 'path'])
-    result.should(eq(true))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb
deleted file mode 100755
index c7c9c69f6de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/spec/unit/puppet/parser/functions/staging_parse_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-
-describe "the staging parser function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("staging_parse").should == "function_staging_parse"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_staging_parse([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is more than 3 arguments" do
-    lambda { scope.function_staging_parse(['/etc', 'filename', '.zip', 'error']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is an invalid info request" do
-    lambda { scope.function_staging_parse(['/etc', 'sheep', '.zip']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if 'source' doesn't have a URI path component" do
-    lambda { scope.function_staging_parse(['uri:without-path']) }.should( raise_error(Puppet::ParseError, /has no URI 'path' component/))
-  end
-
-  it "should return the filename by default" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz"])
-    result.should(eq('sample.tar.gz'))
-  end
-
-  it "should return the file basename" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "basename"])
-    result.should(eq('sample.tar'))
-  end
-
-  it "should return the file basename with custom extensions" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "basename", ".tar.gz"])
-    result.should(eq('sample'))
-  end
-
-  it "should return the file extname" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "extname"])
-    result.should(eq('.gz'))
-  end
-
-  it "should return the file parent" do
-    result = scope.function_staging_parse(["/etc/puppet/sample.tar.gz", "parent"])
-    result.should(eq('/etc/puppet'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/deploy.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/deploy.pp
deleted file mode 100644
index cf9ac58d5ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/deploy.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-staging::deploy { 'sample.tar.gz':
-  source => 'puppet:///modules/staging/sample.tar.gz',
-  target => '/usr/local',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/extract.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/extract.pp
deleted file mode 100644
index 257f478cfd4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/extract.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-$caller_module_name = 'demo'
-
-class { 'staging':
-  path => '/tmp/staging',
-}
-
-staging::file { 'sample.tar.gz':
-  source => 'puppet:///modules/staging/sample.tar.gz'
-}
-
-staging::extract { 'sample.tar.gz':
-  target  => '/tmp/staging',
-  creates => '/tmp/staging/sample',
-  require => Staging::File['sample.tar.gz'],
-}
-
-staging::file { 'sample.tar.bz2':
-  source => 'puppet:///modules/staging/sample.tar.bz2'
-}
-
-staging::extract { 'sample.tar.bz2':
-  target  => '/tmp/staging',
-  creates => '/tmp/staging/sample-tar-bz2',
-  require => Staging::File['sample.tar.bz2'],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/file.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/file.pp
deleted file mode 100644
index 475cf5628c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/file.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-$caller_module_name = 'demo'
-
-class { 'staging':
-  path => '/tmp/staging',
-}
-
-staging::file { 'sample':
-  source => 'puppet:///modules/staging/sample',
-}
-
-staging::file { 'passwd':
-  source => '/etc/passwd',
-}
-
-staging::file { 'manpage.html':
-  source => 'http://curl.haxx.se/docs/manpage.html',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/init.pp
deleted file mode 100644
index 3015c10f047..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include staging
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/scope_defaults.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/scope_defaults.pp
deleted file mode 100644
index 3073ff4aaff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/scope_defaults.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-Exec {
-  path => '/bin',
-}
-
-if scope_defaults('Exec', 'path') {
-  notice('good')
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/staging_parse.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/staging_parse.pp
deleted file mode 100644
index 117ad166845..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/staging/tests/staging_parse.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-$file      = '/etc/puppetlabs/foo.bar.tar.gz'
-$filename  = staging_parse($file)
-$basename  = staging_parse($file, 'basename')
-$extname   = staging_parse($file, 'extname')
-$parent    = staging_parse($file, 'parent')
-$rbasename = staging_parse($file, 'basename', '.tar.gz')
-
-notice($filename)
-notice($basename)
-notice($extname)
-notice($parent)
-notice($rbasename)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CHANGELOG.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CHANGELOG.md
deleted file mode 100644
index 5a3597e3404..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CHANGELOG.md
+++ /dev/null
@@ -1,413 +0,0 @@
-## 2014-05-08 - Release - 4.2.1
-### Summary
-This release moves a stray symlink that can cause problems.
-
-## 2014-05-08 - Release - 4.2.0
-### Summary
-This release adds many new functions and fixes, and continues to be backwards compatible with stdlib 3.x
-
-#### Features
-- New `base64()` function
-- New `deep_merge()` function
-- New `delete_undef_values()` function
-- New `delete_values()` function
-- New `difference()` function
-- New `intersection()` function
-- New `is_bool()` function
-- New `pick_default()` function
-- New `union()` function
-- New `validate_ipv4_address` function
-- New `validate_ipv6_address` function
-- Update `ensure_packages()` to take an option hash as a second parameter.
-- Update `range()` to take an optional third argument for range step
-- Update `validate_slength()` to take an optional third argument for minimum length
-- Update `file_line` resource to take `after` and `multiple` attributes
-
-#### Bugfixes
-- Correct `is_string`, `is_domain_name`, `is_array`, `is_float`, and `is_function_available` for parsing odd types such as bools and hashes.
-- Allow facts.d facts to contain `=` in the value
-- Fix `root_home` fact on darwin systems
-- Fix `concat()` to work with a second non-array argument
-- Fix `floor()` to work with integer strings
-- Fix `is_integer()` to return true if passed integer strings
-- Fix `is_numeric()` to return true if passed integer strings
-- Fix `merge()` to work with empty strings
-- Fix `pick()` to raise the correct error type
-- Fix `uriescape()` to use the default URI.escape list
-- Add/update unit & acceptance tests.
-
-
-##2014-03-04 - Supported Release - 3.2.1
-###Summary
-This is a supported release
-
-####Bugfixes
-- Fixed `is_integer`/`is_float`/`is_numeric` for checking the value of arithmatic expressions.
-
-####Known bugs
-* No known bugs
-
----
-
-##### 2013-05-06 - Jeff McCune <jeff@puppetlabs.com> - 4.1.0
-
- * (#20582) Restore facter\_dot\_d to stdlib for PE users (3b887c8)
- * (maint) Update Gemfile with GEM\_FACTER\_VERSION (f44d535)
-
-##### 2013-05-06 - Alex Cline <acline@us.ibm.com> - 4.1.0
-
- * Terser method of string to array conversion courtesy of ethooz. (d38bce0)
-
-##### 2013-05-06 - Alex Cline <acline@us.ibm.com> 4.1.0
-
- * Refactor ensure\_resource expectations (b33cc24)
-
-##### 2013-05-06 - Alex Cline <acline@us.ibm.com> 4.1.0
-
- * Changed str-to-array conversion and removed abbreviation. (de253db)
-
-##### 2013-05-03 - Alex Cline <acline@us.ibm.com> 4.1.0
-
- * (#20548) Allow an array of resource titles to be passed into the ensure\_resource function (e08734a)
-
-##### 2013-05-02 - Raphaël Pinson <raphael.pinson@camptocamp.com> - 4.1.0
-
- * Add a dirname function (2ba9e47)
-
-##### 2013-04-29 - Mark Smith-Guerrero <msmithgu@gmail.com> - 4.1.0
-
- * (maint) Fix a small typo in hash() description (928036a)
-
-##### 2013-04-12 - Jeff McCune <jeff@puppetlabs.com> - 4.0.2
-
- * Update user information in gemspec to make the intent of the Gem clear.
-
-##### 2013-04-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.1
-
- * Fix README function documentation (ab3e30c)
-
-##### 2013-04-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * stdlib 4.0 drops support with Puppet 2.7
- * stdlib 4.0 preserves support with Puppet 3
-
-##### 2013-04-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * Add ability to use puppet from git via bundler (9c5805f)
-
-##### 2013-04-10 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * (maint) Make stdlib usable as a Ruby GEM (e81a45e)
-
-##### 2013-04-10 - Erik Dalén <dalen@spotify.com> - 4.0.0
-
- * Add a count function (f28550e)
-
-##### 2013-03-31 - Amos Shapira <ashapira@atlassian.com> - 4.0.0
-
- * (#19998) Implement any2array (7a2fb80)
-
-##### 2013-03-29 - Steve Huff <shuff@vecna.org> - 4.0.0
-
- * (19864) num2bool match fix (8d217f0)
-
-##### 2013-03-20 - Erik Dalén <dalen@spotify.com> - 4.0.0
-
- * Allow comparisons of Numeric and number as String (ff5dd5d)
-
-##### 2013-03-26 - Richard Soderberg <rsoderberg@mozilla.com> - 4.0.0
-
- * add suffix function to accompany the prefix function (88a93ac)
-
-##### 2013-03-19 - Kristof Willaert <kristof.willaert@gmail.com> - 4.0.0
-
- * Add floor function implementation and unit tests (0527341)
-
-##### 2012-04-03 - Eric Shamow <eric@puppetlabs.com> - 4.0.0
-
- * (#13610) Add is\_function\_available to stdlib (961dcab)
-
-##### 2012-12-17 - Justin Lambert <jlambert@eml.cc> - 4.0.0
-
- * str2bool should return a boolean if called with a boolean (5d5a4d4)
-
-##### 2012-10-23 - Uwe Stuehler <ustuehler@team.mobile.de> - 4.0.0
-
- * Fix number of arguments check in flatten() (e80207b)
-
-##### 2013-03-11 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * Add contributing document (96e19d0)
-
-##### 2013-03-04 - Raphaël Pinson <raphael.pinson@camptocamp.com> - 4.0.0
-
- * Add missing documentation for validate\_augeas and validate\_cmd to README.markdown (a1510a1)
-
-##### 2013-02-14 - Joshua Hoblitt <jhoblitt@cpan.org> - 4.0.0
-
- * (#19272) Add has\_element() function (95cf3fe)
-
-##### 2013-02-07 - Raphaël Pinson <raphael.pinson@camptocamp.com> - 4.0.0
-
- * validate\_cmd(): Use Puppet::Util::Execution.execute when available (69248df)
-
-##### 2012-12-06 - Raphaël Pinson <raphink@gmail.com> - 4.0.0
-
- * Add validate\_augeas function (3a97c23)
-
-##### 2012-12-06 - Raphaël Pinson <raphink@gmail.com> - 4.0.0
-
- * Add validate\_cmd function (6902cc5)
-
-##### 2013-01-14 - David Schmitt <david@dasz.at> - 4.0.0
-
- * Add geppetto project definition (b3fc0a3)
-
-##### 2013-01-02 - Jaka Hudoklin <jakahudoklin@gmail.com> - 4.0.0
-
- * Add getparam function to get defined resource parameters (20e0e07)
-
-##### 2013-01-05 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * (maint) Add Travis CI Support (d082046)
-
-##### 2012-12-04 - Jeff McCune <jeff@puppetlabs.com> - 4.0.0
-
- * Clarify that stdlib 3 supports Puppet 3 (3a6085f)
-
-##### 2012-11-30 - Erik Dalén <dalen@spotify.com> - 4.0.0
-
- * maint: style guideline fixes (7742e5f)
-
-##### 2012-11-09 - James Fryman <james@frymanet.com> - 4.0.0
-
- * puppet-lint cleanup (88acc52)
-
-##### 2012-11-06 - Joe Julian <me@joejulian.name> - 4.0.0
-
- * Add function, uriescape, to URI.escape strings. Redmine #17459 (fd52b8d)
-
-##### 2012-09-18 - Chad Metcalf <chad@wibidata.com> - 3.2.0
-
- * Add an ensure\_packages function. (8a8c09e)
-
-##### 2012-11-23 - Erik Dalén <dalen@spotify.com> - 3.2.0
-
- * (#17797) min() and max() functions (9954133)
-
-##### 2012-05-23 - Peter Meier <peter.meier@immerda.ch> - 3.2.0
-
- * (#14670) autorequire a file\_line resource's path (dfcee63)
-
-##### 2012-11-19 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 3.2.0
-
- * Add join\_keys\_to\_values function (ee0f2b3)
-
-##### 2012-11-17 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 3.2.0
-
- * Extend delete function for strings and hashes (7322e4d)
-
-##### 2012-08-03 - Gary Larizza <gary@puppetlabs.com> - 3.2.0
-
- * Add the pick() function (ba6dd13)
-
-##### 2012-03-20 - Wil Cooley <wcooley@pdx.edu> - 3.2.0
-
- * (#13974) Add predicate functions for interface facts (f819417)
-
-##### 2012-11-06 - Joe Julian <me@joejulian.name> - 3.2.0
-
- * Add function, uriescape, to URI.escape strings. Redmine #17459 (70f4a0e)
-
-##### 2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 3.1.1
-
- * (maint) Fix spec failures resulting from Facter API changes (97f836f)
-
-##### 2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 3.1.0
-
- * Add PE facts to stdlib (cdf3b05)
-
-##### 2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.1
-
- * Fix accidental removal of facts\_dot\_d.rb in 3.0.0 release
-
-##### 2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.0
-
- * stdlib 3.0 drops support with Puppet 2.6
- * stdlib 3.0 preserves support with Puppet 2.7
-
-##### 2012-08-07 - Dan Bode <dan@puppetlabs.com> - 3.0.0
-
- * Add function ensure\_resource and defined\_with\_params (ba789de)
-
-##### 2012-07-10 - Hailee Kenney <hailee@puppetlabs.com> - 3.0.0
-
- * (#2157) Remove facter\_dot\_d for compatibility with external facts (f92574f)
-
-##### 2012-04-10 - Chris Price <chris@puppetlabs.com> - 3.0.0
-
- * (#13693) moving logic from local spec\_helper to puppetlabs\_spec\_helper (85f96df)
-
-##### 2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 2.5.1
-
- * (maint) Fix spec failures resulting from Facter API changes (97f836f)
-
-##### 2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 2.5.0
-
- * Add PE facts to stdlib (cdf3b05)
-
-##### 2012-08-15 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Explicitly load functions used by ensure\_resource (9fc3063)
-
-##### 2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Add better docs about duplicate resource failures (97d327a)
-
-##### 2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Handle undef for parameter argument (4f8b133)
-
-##### 2012-08-07 - Dan Bode <dan@puppetlabs.com> - 2.5.0
-
- * Add function ensure\_resource and defined\_with\_params (a0cb8cd)
-
-##### 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
-
- * Disable tests that fail on 2.6.x due to #15912 (c81496e)
-
-##### 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
-
- * (Maint) Fix mis-use of rvalue functions as statements (4492913)
-
-##### 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
-
- * Add .rspec file to repo root (88789e8)
-
-##### 2012-06-07 - Chris Price <chris@puppetlabs.com> - 2.4.0
-
- * Add support for a 'match' parameter to file\_line (a06c0d8)
-
-##### 2012-08-07 - Erik Dalén <dalen@spotify.com> - 2.4.0
-
- * (#15872) Add to\_bytes function (247b69c)
-
-##### 2012-07-19 - Jeff McCune <jeff@puppetlabs.com> - 2.4.0
-
- * (Maint) use PuppetlabsSpec::PuppetInternals.scope (master) (deafe88)
-
-##### 2012-07-10 - Hailee Kenney <hailee@puppetlabs.com> - 2.4.0
-
- * (#2157) Make facts\_dot\_d compatible with external facts (5fb0ddc)
-
-##### 2012-03-16 - Steve Traylen <steve.traylen@cern.ch> - 2.4.0
-
- * (#13205) Rotate array/string randomley based on fqdn, fqdn\_rotate() (fef247b)
-
-##### 2012-05-22 - Peter Meier <peter.meier@immerda.ch> - 2.3.3
-
- * fix regression in #11017 properly (f0a62c7)
-
-##### 2012-05-10 - Jeff McCune <jeff@puppetlabs.com> - 2.3.3
-
- * Fix spec tests using the new spec\_helper (7d34333)
-
-##### 2012-05-10 - Puppet Labs <support@puppetlabs.com> - 2.3.2
-
- * Make file\_line default to ensure => present (1373e70)
- * Memoize file\_line spec instance variables (20aacc5)
- * Fix spec tests using the new spec\_helper (1ebfa5d)
- * (#13595) initialize\_everything\_for\_tests couples modules Puppet ver (3222f35)
- * (#13439) Fix MRI 1.9 issue with spec\_helper (15c5fd1)
- * (#13439) Fix test failures with Puppet 2.6.x (665610b)
- * (#13439) refactor spec helper for compatibility with both puppet 2.7 and master (82194ca)
- * (#13494) Specify the behavior of zero padded strings (61891bb)
-
-##### 2012-03-29 Puppet Labs <support@puppetlabs.com> - 2.1.3
-
-* (#11607) Add Rakefile to enable spec testing
-* (#12377) Avoid infinite loop when retrying require json
-
-##### 2012-03-13 Puppet Labs <support@puppetlabs.com> - 2.3.1
-
-* (#13091) Fix LoadError bug with puppet apply and puppet\_vardir fact
-
-##### 2012-03-12 Puppet Labs <support@puppetlabs.com> - 2.3.0
-
-* Add a large number of new Puppet functions
-* Backwards compatibility preserved with 2.2.x
-
-##### 2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.2.1
-
-* Documentation only release for the Forge
-
-##### 2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.1.2
-
-* Documentation only release for PE 2.0.x
-
-##### 2011-11-08 Puppet Labs <support@puppetlabs.com> - 2.2.0
-
-* #10285 - Refactor json to use pson instead.
-* Maint  - Add watchr autotest script
-* Maint  - Make rspec tests work with Puppet 2.6.4
-* #9859  - Add root\_home fact and tests
-
-##### 2011-08-18 Puppet Labs <support@puppetlabs.com> - 2.1.1
-
-* Change facts.d paths to match Facter 2.0 paths.
-* /etc/facter/facts.d
-* /etc/puppetlabs/facter/facts.d
-
-##### 2011-08-17 Puppet Labs <support@puppetlabs.com> - 2.1.0
-
-* Add R.I. Pienaar's facts.d custom facter fact
-* facts defined in /etc/facts.d and /etc/puppetlabs/facts.d are
-  automatically loaded now.
-
-##### 2011-08-04 Puppet Labs <support@puppetlabs.com> - 2.0.0
-
-* Rename whole\_line to file\_line
-* This is an API change and as such motivating a 2.0.0 release according to semver.org.
-
-##### 2011-08-04 Puppet Labs <support@puppetlabs.com> - 1.1.0
-
-* Rename append\_line to whole\_line
-* This is an API change and as such motivating a 1.1.0 release.
-
-##### 2011-08-04 Puppet Labs <support@puppetlabs.com> - 1.0.0
-
-* Initial stable release
-* Add validate\_array and validate\_string functions
-* Make merge() function work with Ruby 1.8.5
-* Add hash merging function
-* Add has\_key function
-* Add loadyaml() function
-* Add append\_line native
-
-##### 2011-06-21 Jeff McCune <jeff@puppetlabs.com> - 0.1.7
-
-* Add validate\_hash() and getvar() functions
-
-##### 2011-06-15 Jeff McCune <jeff@puppetlabs.com> - 0.1.6
-
-* Add anchor resource type to provide containment for composite classes
-
-##### 2011-06-03 Jeff McCune <jeff@puppetlabs.com> - 0.1.5
-
-* Add validate\_bool() function to stdlib
-
-##### 0.1.4 2011-05-26 Jeff McCune <jeff@puppetlabs.com>
-
-* Move most stages after main
-
-##### 0.1.3 2011-05-25 Jeff McCune <jeff@puppetlabs.com>
-
-* Add validate\_re() function
-
-##### 0.1.2 2011-05-24 Jeff McCune <jeff@puppetlabs.com>
-
-* Update to add annotated tag
-
-##### 0.1.1 2011-05-24 Jeff McCune <jeff@puppetlabs.com>
-
-* Add stdlib::stages class with a standard set of stages
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CONTRIBUTING.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CONTRIBUTING.md
deleted file mode 100644
index 5280da15ecc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/CONTRIBUTING.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# How to contribute
-
-Third-party patches are essential for keeping stdlib great. We simply can't
-access the huge number of platforms and myriad configurations for running
-stdlib. We want to keep it as easy as possible to contribute changes that
-get things working in your environment. There are a few guidelines that we
-need contributors to follow so that we can have a chance of keeping on
-top of things.
-
-## Getting Started
-
-* Make sure you have a [Jira account](http://tickets.puppetlabs.com)
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version that you know has the issue.
-* Fork the repository on GitHub
-
-## Making Changes
-
-* Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * Only target release branches if you are certain your fix must be on that
-    branch.
-  * To quickly create a topic branch based on master; `git branch
-    fix/master/my_contribution master` then checkout the new branch with `git
-    checkout fix/master/my_contribution`.  Please avoid working directly on the
-    `master` branch.
-* Make commits of logical units.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-
-````
-    (#99999) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    from our issue tracker.  The body describes the behavior without the patch,
-    why this is a problem, and how the patch fixes the problem when applied.
-````
-
-* Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken.
-
-## Submitting Changes
-
-* Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla).
-* Push your changes to a topic branch in your fork of the repository.
-* Submit a pull request to the repository in the puppetlabs organization.
-* Update your ticket to mark that you have submitted code and are ready for it to be reviewed.
-  * Include a link to the pull request in the ticket
-
-# Additional Resources
-
-* [More information on contributing](http://links.puppetlabs.com/contribute-to-puppet)
-* [Bug tracker (Jira)](http://tickets.puppetlabs.com)
-* [Contributor License Agreement](http://links.puppetlabs.com/cla)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* #puppet-dev IRC channel on freenode.org
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile
deleted file mode 100644
index bbef720351c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile
+++ /dev/null
@@ -1,33 +0,0 @@
-source ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-def location_for(place, fake_version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-group :development, :test do
-  gem 'rake', '~> 10.1.0',       :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-end
-
-ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
-puppetversion = ENV['GEM_PUPPET_VERSION']
-if puppetversion
-  gem 'puppet', *location_for(puppetversion)
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile.lock b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile.lock
deleted file mode 100644
index cf4881eaaa7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Gemfile.lock
+++ /dev/null
@@ -1,174 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.2.7)
-    addressable (2.3.6)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
-    aws-sdk (1.38.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
-    beaker (1.10.0)
-      aws-sdk (~> 1.38)
-      blimpy (~> 0.6)
-      fission (~> 0.4)
-      google-api-client (~> 0.6.4)
-      inifile (~> 2.0)
-      json (~> 1.8)
-      mime-types (~> 1.25)
-      net-scp (~> 1.1)
-      net-ssh (~> 2.6)
-      nokogiri (= 1.5.10)
-      rbvmomi (= 1.8.1)
-      unf (~> 0.1)
-    beaker-rspec (2.0.0)
-      beaker
-      rspec
-    blimpy (0.6.7)
-      fog
-      minitar
-      thor
-    builder (3.2.2)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    docile (1.1.3)
-    excon (0.31.0)
-    extlib (0.9.16)
-    facter (2.0.1)
-      CFPropertyList (~> 2.2.6)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.19.0)
-      builder
-      excon (~> 0.31.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-    formatador (0.2.4)
-    google-api-client (0.6.4)
-      addressable (>= 2.3.2)
-      autoparse (>= 0.3.3)
-      extlib (>= 0.9.15)
-      faraday (~> 0.8.4)
-      jwt (>= 0.1.5)
-      launchy (>= 2.1.1)
-      multi_json (>= 1.0.0)
-      signet (~> 0.4.5)
-      uuidtools (>= 2.1.0)
-    hiera (1.3.2)
-      json_pure
-    highline (1.6.21)
-    inifile (2.0.2)
-    json (1.8.1)
-    json_pure (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    kwalify (0.7.2)
-    launchy (2.4.2)
-      addressable (~> 2.3)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitar (0.5.4)
-    mocha (1.0.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.9.2)
-    multipart-post (1.2.0)
-    net-scp (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
-    nokogiri (1.5.10)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    puppet (3.5.1)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
-      json_pure
-      rgen (~> 0.6.5)
-    puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
-      rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.1)
-    rbvmomi (1.8.1)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
-    rgen (0.6.6)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-puppet (1.0.1)
-      rspec
-    rspec-system (2.5.1)
-      kwalify (~> 0.7.2)
-      net-scp (~> 1.1)
-      net-ssh (~> 2.6)
-      nokogiri (~> 1.5.9)
-      rbvmomi (~> 1.6)
-      rspec (~> 2.13)
-      systemu (~> 2.5)
-    rspec-system-puppet (2.2.1)
-      rspec-system (~> 2.0)
-    rspec-system-serverspec (1.0.0)
-      rspec-system (~> 2.0)
-      serverspec (~> 0.6.0)
-    ruby-hmac (0.4.0)
-    serverspec (0.6.30)
-      highline
-      net-ssh
-      rspec (~> 2.13.0)
-    signet (0.4.5)
-      addressable (>= 2.2.3)
-      faraday (~> 0.8.1)
-      jwt (>= 0.1.5)
-      multi_json (>= 1.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.5.0)
-    systemu (2.6.4)
-    thor (0.19.1)
-    trollop (2.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.6)
-    uuidtools (2.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  beaker
-  beaker-rspec
-  pry
-  puppet
-  puppet-lint
-  puppetlabs_spec_helper
-  rake (~> 10.1.0)
-  rspec-puppet
-  rspec-system
-  rspec-system-puppet
-  rspec-system-serverspec
-  serverspec
-  simplecov
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/LICENSE
deleted file mode 100644
index ec0587c0d9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2011 Puppet Labs Inc
-
-and some parts:
-
-Copyright (C) 2011 Krzysztof Wilczynski
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Modulefile
deleted file mode 100644
index c5da72daccd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name    'puppetlabs-stdlib'
-version '4.2.1'
-source 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet Module Standard Library'
-description 'Standard Library for Puppet Modules'
-project_page 'https://github.com/puppetlabs/puppetlabs-stdlib'
-
-## Add dependencies, if any:
-# dependency 'username/name', '>= 1.2.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README.markdown
deleted file mode 100644
index e9ad53b8b9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README.markdown
+++ /dev/null
@@ -1,1304 +0,0 @@
-# Puppet Labs Standard Library #
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-stdlib.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-stdlib)
-
-This module provides a "standard library" of resources for developing Puppet
-Modules.  This modules will include the following additions to Puppet
-
- * Stages
- * Facts
- * Functions
- * Defined resource types
- * Types
- * Providers
-
-This module is officially curated and provided by Puppet Labs.  The modules
-Puppet Labs writes and distributes will make heavy use of this standard
-library.
-
-To report or research a bug with any part of this module, please go to
-[http://tickets.puppetlabs.com/browse/PUP](http://tickets.puppetlabs.com/browse/PUP)
-
-# Versions #
-
-This module follows semver.org (v1.0.0) versioning guidelines.  The standard
-library module is released as part of [Puppet
-Enterprise](http://puppetlabs.com/puppet/puppet-enterprise/) and as a result
-older versions of Puppet Enterprise that Puppet Labs still supports will have
-bugfix maintenance branches periodically "merged up" into master.  The current
-list of integration branches are:
-
- * v2.1.x (v2.1.1 released in PE 1)
- * v2.2.x (Never released as part of PE, only to the Forge)
- * v2.3.x (Released in PE 2)
- * v3.0.x (Released in PE 3)
- * v4.0.x (Maintains compatibility with v3.x despite the major semantic version bump.  Compatible with Puppet 2.7.x)
- * v5.x (To be released when stdlib can drop support for Puppet 2.7.x.  Please see [this discussion](https://github.com/puppetlabs/puppetlabs-stdlib/pull/176#issuecomment-30251414))
- * master (mainline development branch)
-
-The first Puppet Enterprise version including the stdlib module is Puppet
-Enterprise 1.2.
-
-# Compatibility #
-
-Puppet Versions | < 2.6 | 2.6 | 2.7 | 3.x |
-:---------------|:-----:|:---:|:---:|:----:
-**stdlib 2.x**  | no    | **yes** | **yes** | no
-**stdlib 3.x**  | no    | no  | **yes** | **yes**
-**stdlib 4.x**  | no    | no  | **yes** | **yes**
-
-The stdlib module does not work with Puppet versions released prior to Puppet
-2.6.0.
-
-## stdlib 2.x ##
-
-All stdlib releases in the 2.0 major version support Puppet 2.6 and Puppet 2.7.
-
-## stdlib 3.x ##
-
-The 3.0 major release of stdlib drops support for Puppet 2.6.  Stdlib 3.x
-supports Puppet 2 and Puppet 3.
-
-## stdlib 4.x ##
-
-The 4.0 major release of stdlib was intended to drop support for Puppet 2.7,
-but the impact on end users was too high.  The decision was made to treat
-stdlib 4.x as a continuation of stdlib 3.x support.  Stdlib 4.x supports Puppet
-2.7 and 3.  Notably, ruby 1.8.5 is no longer supported though ruby
-1.8.7, 1.9.3, and 2.0.0 are fully supported.
-
-# Functions #
-
-abs
----
-Returns the absolute value of a number, for example -34.56 becomes
-34.56. Takes a single integer and float value as an argument.
-
-
-- *Type*: rvalue
-
-any2array
----------
-This converts any object to an array containing that object. Empty argument
-lists are converted to an empty array. Arrays are left untouched. Hashes are
-converted to arrays of alternating keys and values.
-
-
-- *Type*: rvalue
-
-base64
---------
-Converts a string to and from base64 encoding.
-Requires an action ['encode','decode'] and either a plain or base64 encoded
-string
-
-
-- *Type*: rvalue
-
-bool2num
---------
-Converts a boolean to a number. Converts the values:
-false, f, 0, n, and no to 0
-true, t, 1, y, and yes to 1
-    Requires a single boolean or string as an input.
-
-
-- *Type*: rvalue
-
-capitalize
-----------
-Capitalizes the first letter of a string or array of strings.
-Requires either a single string or an array as an input.
-
-
-- *Type*: rvalue
-
-chomp
------
-Removes the record separator from the end of a string or an array of
-strings, for example `hello\n` becomes `hello`.
-Requires a single string or array as an input.
-
-
-- *Type*: rvalue
-
-chop
-----
-Returns a new string with the last character removed. If the string ends
-with `\r\n`, both characters are removed. Applying chop to an empty
-string returns an empty string. If you wish to merely remove record
-separators then you should use the `chomp` function.
-Requires a string or array of strings as input.
-
-
-- *Type*: rvalue
-
-concat
-------
-Appends the contents of array 2 onto array 1.
-
-*Example:*
-
-    concat(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-  ['1','2','3','4','5','6']
-
-  concat(['1','2','3'],'4')
-
-Would result in:
-
-  ['1','2','3','4']
-
-- *Type*: rvalue
-
-count
------
-Takes an array as first argument and an optional second argument.
-Count the number of elements in array that matches second argument.
-If called with only an array it counts the number of elements that are not nil/undef.
-
-
-- *Type*: rvalue
-
-defined_with_params
--------------------
-Takes a resource reference and an optional hash of attributes.
-
-Returns true if a resource with the specified attributes has already been added
-to the catalog, and false otherwise.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-    if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
-      user { 'dan': ensure => present, }
-    }
-
-
-- *Type*: rvalue
-
-delete
-------
-Deletes all instances of a given element from an array, substring from a
-string, or key from a hash.
-
-*Examples:*
-
-    delete(['a','b','c','b'], 'b')
-    Would return: ['a','c']
-
-    delete({'a'=>1,'b'=>2,'c'=>3}, 'b')
-    Would return: {'a'=>1,'c'=>3}
-
-    delete('abracadabra', 'bra')
-    Would return: 'acada'
-
-
-- *Type*: rvalue
-
-delete_at
----------
-Deletes a determined indexed value from an array.
-
-*Examples:*
-
-    delete_at(['a','b','c'], 1)
-
-Would return: ['a','c']
-
-
-- *Type*: rvalue
-
-delete_values
--------------
-Deletes all instances of a given value from a hash.
-
-*Examples:*
-
-    delete_values({'a'=>'A','b'=>'B','c'=>'C','B'=>'D'}, 'B')
-
-Would return: {'a'=>'A','c'=>'C','B'=>'D'}
-
-
-- *Type*: rvalue
-
-delete_undef_values
--------------------
-Deletes all instances of the undef value from an array or hash.
-
-*Examples:*
-
-    $hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
-
-Would return: {a => 'A', b => '', d => false}
-
-    $array = delete_undef_values(['A','',undef,false])
-
-Would return: ['A','',false]
-
-- *Type*: rvalue
-
-difference
-----------
-This function returns the difference between two arrays.
-The returned array is a copy of the original array, removing any items that
-also appear in the second array.
-
-*Examples:*
-
-    difference(["a","b","c"],["b","c","d"])
-
-Would return: ["a"]
-
-dirname
--------
-Returns the `dirname` of a path.
-
-*Examples:*
-
-    dirname('/path/to/a/file.ext')
-
-Would return: '/path/to/a'
-
-downcase
---------
-Converts the case of a string or all strings in an array to lower case.
-
-
-- *Type*: rvalue
-
-empty
------
-Returns true if the variable is empty.
-
-
-- *Type*: rvalue
-
-ensure_packages
----------------
-Takes a list of packages and only installs them if they don't already exist.
-It optionally takes a hash as a second parameter that will be passed as the
-third argument to the ensure_resource() function.
-
-
-- *Type*: statement
-
-ensure_resource
----------------
-Takes a resource type, title, and a list of attributes that describe a
-resource.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-This example only creates the resource if it does not already exist:
-
-    ensure_resource('user', 'dan', {'ensure' => 'present' })
-
-If the resource already exists but does not match the specified parameters,
-this function will attempt to recreate the resource leading to a duplicate
-resource definition error.
-
-An array of resources can also be passed in and each will be created with
-the type and parameters specified if it doesn't already exist.
-
-    ensure_resource('user', ['dan','alex'], {'ensure' => 'present'})
-
-
-
-- *Type*: statement
-
-file_line
----------
-This resource ensures that a given line is contained within a file. You can also use 
-"match" to replace existing lines.
-
-*Examples:*
-
-    file_line { 'sudo_rule':
-      path => '/etc/sudoers',
-      line => '%sudo ALL=(ALL) ALL',
-    }
-
-    file_line { 'change_mount':
-      path  => '/etc/fstab',
-      line  => '10.0.0.1:/vol/data /opt/data nfs defaults 0 0',
-      match => '^172.16.17.2:/vol/old',
-    }
-
-- *Type*: resource
-
-flatten
--------
-This function flattens any deeply nested arrays and returns a single flat array
-as a result.
-
-*Examples:*
-
-    flatten(['a', ['b', ['c']]])
-
-Would return: ['a','b','c']
-
-
-- *Type*: rvalue
-
-floor
------
-Returns the largest integer less or equal to the argument.
-Takes a single numeric value as an argument.
-
-
-- *Type*: rvalue
-
-fqdn_rotate
------------
-Rotates an array a random number of times based on a nodes fqdn.
-
-
-- *Type*: rvalue
-
-get_module_path
----------------
-Returns the absolute path of the specified module for the current
-environment.
-
-Example:
-  $module_path = get_module_path('stdlib')
-
-
-- *Type*: rvalue
-
-getparam
---------
-Takes a resource reference and name of the parameter and
-returns value of resource's parameter.
-
-*Examples:*
-
-    define example_resource($param) {
-    }
-
-    example_resource { "example_resource_instance":
-        param => "param_value"
-    }
-
-    getparam(Example_resource["example_resource_instance"], "param")
-
-Would return: param_value
-
-
-- *Type*: rvalue
-
-getvar
-------
-Lookup a variable in a remote namespace.
-
-For example:
-
-    $foo = getvar('site::data::foo')
-    # Equivalent to $foo = $site::data::foo
-
-This is useful if the namespace itself is stored in a string:
-
-    $datalocation = 'site::data'
-    $bar = getvar("${datalocation}::bar")
-    # Equivalent to $bar = $site::data::bar
-
-
-- *Type*: rvalue
-
-grep
-----
-This function searches through an array and returns any elements that match
-the provided regular expression.
-
-*Examples:*
-
-    grep(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['aaa','aaaddd']
-
-
-- *Type*: rvalue
-
-has_interface_with
-------------------
-Returns boolean based on kind and value:
-* macaddress
-* netmask
-* ipaddress
-* network
-
-*Examples:*
-
-    has_interface_with("macaddress", "x:x:x:x:x:x")
-    has_interface_with("ipaddress", "127.0.0.1")    => true
-
-etc.
-
-If no "kind" is given, then the presence of the interface is checked:
-
-    has_interface_with("lo")                        => true
-
-
-- *Type*: rvalue
-
-has_ip_address
---------------
-Returns true if the client has the requested IP address on some interface.
-
-This function iterates through the 'interfaces' fact and checks the
-'ipaddress_IFACE' facts, performing a simple string comparison.
-
-
-- *Type*: rvalue
-
-has_ip_network
---------------
-Returns true if the client has an IP address within the requested network.
-
-This function iterates through the 'interfaces' fact and checks the
-'network_IFACE' facts, performing a simple string comparision.
-
-
-- *Type*: rvalue
-
-has_key
--------
-Determine if a hash has a certain key value.
-
-Example:
-
-    $my_hash = {'key_one' => 'value_one'}
-    if has_key($my_hash, 'key_two') {
-      notice('we will not reach here')
-    }
-    if has_key($my_hash, 'key_one') {
-      notice('this will be printed')
-    }
-
-
-
-- *Type*: rvalue
-
-hash
-----
-This function converts an array into a hash.
-
-*Examples:*
-
-    hash(['a',1,'b',2,'c',3])
-
-Would return: {'a'=>1,'b'=>2,'c'=>3}
-
-
-- *Type*: rvalue
-
-intersection
------------
-This function returns an array an intersection of two.
-
-*Examples:*
-
-    intersection(["a","b","c"],["b","c","d"])
-
-Would return: ["b","c"]
-
-is_array
---------
-Returns true if the variable passed to this function is an array.
-
-- *Type*: rvalue
-
-is_bool
---------
-Returns true if the variable passed to this function is a boolean.
-
-- *Type*: rvalue
-
-is_domain_name
---------------
-Returns true if the string passed to this function is a syntactically correct domain name.
-
-- *Type*: rvalue
-
-is_float
---------
-Returns true if the variable passed to this function is a float.
-
-- *Type*: rvalue
-
-is_function_available
----------------------
-This function accepts a string as an argument, determines whether the
-Puppet runtime has access to a function by that name.  It returns a
-true if the function exists, false if not.
-
-- *Type*: rvalue
-
-is_hash
--------
-Returns true if the variable passed to this function is a hash.
-
-- *Type*: rvalue
-
-is_integer
-----------
-Returns true if the variable returned to this string is an integer.
-
-- *Type*: rvalue
-
-is_ip_address
--------------
-Returns true if the string passed to this function is a valid IP address.
-
-- *Type*: rvalue
-
-is_mac_address
---------------
-Returns true if the string passed to this function is a valid mac address.
-
-- *Type*: rvalue
-
-is_numeric
-----------
-Returns true if the variable passed to this function is a number.
-
-- *Type*: rvalue
-
-is_string
----------
-Returns true if the variable passed to this function is a string.
-
-- *Type*: rvalue
-
-join
-----
-This function joins an array into a string using a separator.
-
-*Examples:*
-
-    join(['a','b','c'], ",")
-
-Would result in: "a,b,c"
-
-- *Type*: rvalue
-
-join_keys_to_values
--------------------
-This function joins each key of a hash to that key's corresponding value with a
-separator. Keys and values are cast to strings. The return value is an array in
-which each element is one joined key/value pair.
-
-*Examples:*
-
-    join_keys_to_values({'a'=>1,'b'=>2}, " is ")
-
-Would result in: ["a is 1","b is 2"]
-
-- *Type*: rvalue
-
-keys
-----
-Returns the keys of a hash as an array.
-
-- *Type*: rvalue
-
-loadyaml
---------
-Load a YAML file containing an array, string, or hash, and return the data
-in the corresponding native data type.
-
-For example:
-
-    $myhash = loadyaml('/etc/puppet/data/myhash.yaml')
-
-
-- *Type*: rvalue
-
-lstrip
-------
-Strips leading spaces to the left of a string.
-
-- *Type*: rvalue
-
-max
----
-Returns the highest value of all arguments.
-Requires at least one argument.
-
-- *Type*: rvalue
-
-member
-------
-This function determines if a variable is a member of an array.
-
-*Examples:*
-
-    member(['a','b'], 'b')
-
-Would return: true
-
-    member(['a','b'], 'c')
-
-Would return: false
-
-- *Type*: rvalue
-
-merge
------
-Merges two or more hashes together and returns the resulting hash.
-
-For example:
-
-    $hash1 = {'one' => 1, 'two' => 2}
-    $hash2 = {'two' => 'dos', 'three' => 'tres'}
-    $merged_hash = merge($hash1, $hash2)
-    # The resulting hash is equivalent to:
-    # $merged_hash =  {'one' => 1, 'two' => 'dos', 'three' => 'tres'}
-
-When there is a duplicate key, the key in the rightmost hash will "win."
-
-- *Type*: rvalue
-
-min
----
-Returns the lowest value of all arguments.
-Requires at least one argument.
-
-- *Type*: rvalue
-
-num2bool
---------
-This function converts a number or a string representation of a number into a
-true boolean. Zero or anything non-numeric becomes false. Numbers higher then 0
-become true.
-
-- *Type*: rvalue
-
-parsejson
----------
-This function accepts JSON as a string and converts into the correct Puppet
-structure.
-
-- *Type*: rvalue
-
-parseyaml
----------
-This function accepts YAML as a string and converts it into the correct
-Puppet structure.
-
-- *Type*: rvalue
-
-pick
-----
-This function is similar to a coalesce function in SQL in that it will return
-the first value in a list of values that is not undefined or an empty string
-(two things in Puppet that will return a boolean false value). Typically,
-this function is used to check for a value in the Puppet Dashboard/Enterprise
-Console, and failover to a default value like the following:
-
-    $real_jenkins_version = pick($::jenkins_version, '1.449')
-
-The value of $real_jenkins_version will first look for a top-scope variable
-called 'jenkins_version' (note that parameters set in the Puppet Dashboard/
-Enterprise Console are brought into Puppet as top-scope variables), and,
-failing that, will use a default value of 1.449.
-
-- *Type*: rvalue
-
-prefix
-------
-This function applies a prefix to all elements in an array.
-
-*Examples:*
-
-    prefix(['a','b','c'], 'p')
-
-Will return: ['pa','pb','pc']
-
-- *Type*: rvalue
-
-range
------
-When given range in the form of (start, stop) it will extrapolate a range as
-an array.
-
-*Examples:*
-
-    range("0", "9")
-
-Will return: [0,1,2,3,4,5,6,7,8,9]
-
-    range("00", "09")
-
-Will return: [0,1,2,3,4,5,6,7,8,9] - Zero padded strings are converted to
-integers automatically
-
-    range("a", "c")
-
-Will return: ["a","b","c"]
-
-    range("host01", "host10")
-
-Will return: ["host01", "host02", ..., "host09", "host10"]
-
-- *Type*: rvalue
-
-reject
-------
-This function searches through an array and rejects all elements that match
-the provided regular expression.
-
-*Examples:*
-
-    reject(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['bbb','ccc']
-
-
-- *Type*: rvalue
-
-reverse
--------
-Reverses the order of a string or array.
-
-- *Type*: rvalue
-
-rstrip
-------
-Strips leading spaces to the right of the string.
-
-- *Type*: rvalue
-
-shuffle
--------
-Randomizes the order of a string or array elements.
-
-- *Type*: rvalue
-
-size
-----
-Returns the number of elements in a string or array.
-
-- *Type*: rvalue
-
-sort
-----
-Sorts strings and arrays lexically.
-
-- *Type*: rvalue
-
-squeeze
--------
-Returns a new string where runs of the same character that occur in this set
-are replaced by a single character.
-
-- *Type*: rvalue
-
-str2bool
---------
-This converts a string to a boolean. This attempts to convert strings that
-contain things like: y, 1, t, true to 'true' and strings that contain things
-like: 0, f, n, false, no to 'false'.
-
-
-- *Type*: rvalue
-
-str2saltedsha512
-----------------
-This converts a string to a salted-SHA512 password hash (which is used for
-OS X versions >= 10.7). Given any simple string, you will get a hex version
-of a salted-SHA512 password hash that can be inserted into your Puppet
-manifests as a valid password attribute.
-
-
-- *Type*: rvalue
-
-strftime
---------
-This function returns formatted time.
-
-*Examples:*
-
-To return the time since epoch:
-
-    strftime("%s")
-
-To return the date:
-
-    strftime("%Y-%m-%d")
-
-*Format meaning:*
-
-    %a - The abbreviated weekday name (``Sun'')
-    %A - The  full  weekday  name (``Sunday'')
-    %b - The abbreviated month name (``Jan'')
-    %B - The  full  month  name (``January'')
-    %c - The preferred local date and time representation
-    %C - Century (20 in 2009)
-    %d - Day of the month (01..31)
-    %D - Date (%m/%d/%y)
-    %e - Day of the month, blank-padded ( 1..31)
-    %F - Equivalent to %Y-%m-%d (the ISO 8601 date format)
-    %h - Equivalent to %b
-    %H - Hour of the day, 24-hour clock (00..23)
-    %I - Hour of the day, 12-hour clock (01..12)
-    %j - Day of the year (001..366)
-    %k - hour, 24-hour clock, blank-padded ( 0..23)
-    %l - hour, 12-hour clock, blank-padded ( 0..12)
-    %L - Millisecond of the second (000..999)
-    %m - Month of the year (01..12)
-    %M - Minute of the hour (00..59)
-    %n - Newline (\n)
-    %N - Fractional seconds digits, default is 9 digits (nanosecond)
-            %3N  millisecond (3 digits)
-            %6N  microsecond (6 digits)
-            %9N  nanosecond (9 digits)
-    %p - Meridian indicator (``AM''  or  ``PM'')
-    %P - Meridian indicator (``am''  or  ``pm'')
-    %r - time, 12-hour (same as %I:%M:%S %p)
-    %R - time, 24-hour (%H:%M)
-    %s - Number of seconds since 1970-01-01 00:00:00 UTC.
-    %S - Second of the minute (00..60)
-    %t - Tab character (	)
-    %T - time, 24-hour (%H:%M:%S)
-    %u - Day of the week as a decimal, Monday being 1. (1..7)
-    %U - Week  number  of the current year,
-            starting with the first Sunday as the first
-            day of the first week (00..53)
-    %v - VMS date (%e-%b-%Y)
-    %V - Week number of year according to ISO 8601 (01..53)
-    %W - Week  number  of the current year,
-            starting with the first Monday as the first
-            day of the first week (00..53)
-    %w - Day of the week (Sunday is 0, 0..6)
-    %x - Preferred representation for the date alone, no time
-    %X - Preferred representation for the time alone, no date
-    %y - Year without a century (00..99)
-    %Y - Year with century
-    %z - Time zone as  hour offset from UTC (e.g. +0900)
-    %Z - Time zone name
-    %% - Literal ``%'' character
-
-
-- *Type*: rvalue
-
-strip
------
-This function removes leading and trailing whitespace from a string or from
-every string inside an array.
-
-*Examples:*
-
-    strip("    aaa   ")
-
-Would result in: "aaa"
-
-
-- *Type*: rvalue
-
-suffix
-------
-This function applies a suffix to all elements in an array.
-
-*Examples:*
-
-    suffix(['a','b','c'], 'p')
-
-Will return: ['ap','bp','cp']
-
-
-- *Type*: rvalue
-
-swapcase
---------
-This function will swap the existing case of a string.
-
-*Examples:*
-
-    swapcase("aBcD")
-
-Would result in: "AbCd"
-
-
-- *Type*: rvalue
-
-time
-----
-This function will return the current time since epoch as an integer.
-
-*Examples:*
-
-    time()
-
-Will return something like: 1311972653
-
-
-- *Type*: rvalue
-
-to_bytes
---------
-Converts the argument into bytes, for example 4 kB becomes 4096.
-Takes a single string value as an argument.
-
-
-- *Type*: rvalue
-
-type
-----
-Returns the type when passed a variable. Type can be one of:
-
-* string
-* array
-* hash
-* float
-* integer
-* boolean
-
-
-- *Type*: rvalue
-
-union
------
-This function returns a union of two arrays.
-
-*Examples:*
-
-    union(["a","b","c"],["b","c","d"])
-
-Would return: ["a","b","c","d"]
-
-
-unique
-------
-This function will remove duplicates from strings and arrays.
-
-*Examples:*
-
-    unique("aabbcc")
-
-Will return:
-
-    abc
-
-You can also use this with arrays:
-
-    unique(["a","a","b","b","c","c"])
-
-This returns:
-
-    ["a","b","c"]
-
-
-- *Type*: rvalue
-
-upcase
-------
-Converts a string or an array of strings to uppercase.
-
-*Examples:*
-
-    upcase("abcd")
-
-Will return:
-
-    ABCD
-
-
-- *Type*: rvalue
-
-uriescape
----------
-Urlencodes a string or array of strings.
-Requires either a single string or an array as an input.
-
-
-- *Type*: rvalue
-
-validate_absolute_path
-----------------------
-Validate the string represents an absolute path in the filesystem.  This function works
-for windows and unix style paths.
-
-The following values will pass:
-
-    $my_path = "C:/Program Files (x86)/Puppet Labs/Puppet"
-    validate_absolute_path($my_path)
-    $my_path2 = "/var/lib/puppet"
-    validate_absolute_path($my_path2)
-
-
-The following values will fail, causing compilation to abort:
-
-    validate_absolute_path(true)
-    validate_absolute_path([ 'var/lib/puppet', '/var/foo' ])
-    validate_absolute_path([ '/var/lib/puppet', 'var/foo' ])
-    $undefined = undef
-    validate_absolute_path($undefined)
-
-
-
-- *Type*: statement
-
-validate_array
---------------
-Validate that all passed values are array data structures. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $my_array = [ 'one', 'two' ]
-    validate_array($my_array)
-
-The following values will fail, causing compilation to abort:
-
-    validate_array(true)
-    validate_array('some_string')
-    $undefined = undef
-    validate_array($undefined)
-
-
-
-- *Type*: statement
-
-validate_augeas
----------------
-Perform validation of a string using an Augeas lens
-The first argument of this function should be a string to
-test, and the second argument should be the name of the Augeas lens to use.
-If Augeas fails to parse the string with the lens, the compilation will
-abort with a parse error.
-
-A third argument can be specified, listing paths which should
-not be found in the file. The `$file` variable points to the location
-of the temporary file being tested in the Augeas tree.
-
-For example, if you want to make sure your passwd content never contains
-a user `foo`, you could write:
-
-    validate_augeas($passwdcontent, 'Passwd.lns', ['$file/foo'])
-
-Or if you wanted to ensure that no users used the '/bin/barsh' shell,
-you could use:
-
-    validate_augeas($passwdcontent, 'Passwd.lns', ['$file/*[shell="/bin/barsh"]']
-
-If a fourth argument is specified, this will be the error message raised and
-seen by the user.
-
-A helpful error message can be returned like this:
-
-    validate_augeas($sudoerscontent, 'Sudoers.lns', [], 'Failed to validate sudoers content with Augeas')
-
-
-
-- *Type*: statement
-
-validate_bool
--------------
-Validate that all passed values are either true or false. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $iamtrue = true
-    validate_bool(true)
-    validate_bool(true, true, false, $iamtrue)
-
-The following values will fail, causing compilation to abort:
-
-    $some_array = [ true ]
-    validate_bool("false")
-    validate_bool("true")
-    validate_bool($some_array)
-
-
-
-- *Type*: statement
-
-validate_cmd
-------------
-Perform validation of a string with an external command.
-The first argument of this function should be a string to
-test, and the second argument should be a path to a test command
-taking a file as last argument. If the command, launched against
-a tempfile containing the passed string, returns a non-null value,
-compilation will abort with a parse error.
-
-If a third argument is specified, this will be the error message raised and
-seen by the user.
-
-A helpful error message can be returned like this:
-
-Example:
-
-    validate_cmd($sudoerscontent, '/usr/sbin/visudo -c -f', 'Visudo failed to validate sudoers content')
-
-
-
-- *Type*: statement
-
-validate_hash
--------------
-Validate that all passed values are hash data structures. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $my_hash = { 'one' => 'two' }
-    validate_hash($my_hash)
-
-The following values will fail, causing compilation to abort:
-
-    validate_hash(true)
-    validate_hash('some_string')
-    $undefined = undef
-    validate_hash($undefined)
-
-
-
-- *Type*: statement
-
-validate_re
------------
-Perform simple validation of a string against one or more regular
-expressions. The first argument of this function should be a string to
-test, and the second argument should be a stringified regular expression
-(without the // delimiters) or an array of regular expressions.  If none
-of the regular expressions match the string passed in, compilation will
-abort with a parse error.
-
-If a third argument is specified, this will be the error message raised and
-seen by the user.
-
-The following strings will validate against the regular expressions:
-
-    validate_re('one', '^one$')
-    validate_re('one', [ '^one', '^two' ])
-
-The following strings will fail to validate, causing compilation to abort:
-
-    validate_re('one', [ '^two', '^three' ])
-
-A helpful error message can be returned like this:
-
-    validate_re($::puppetversion, '^2.7', 'The $puppetversion fact value does not match 2.7')
-
-
-
-- *Type*: statement
-
-validate_slength
-----------------
-Validate that the first argument is a string (or an array of strings), and
-less/equal to than the length of the second argument.  It fails if the first
-argument is not a string or array of strings, and if arg 2 is not convertable
-to a number.
-
-The following values will pass:
-
-    validate_slength("discombobulate",17)
-    validate_slength(["discombobulate","moo"],17)
-
-The following values will not:
-
-    validate_slength("discombobulate",1)
-    validate_slength(["discombobulate","thermometer"],5)
-
-
-
-- *Type*: statement
-
-validate_string
----------------
-Validate that all passed values are string data structures. Abort catalog
-compilation if any value fails this check.
-
-The following values will pass:
-
-    $my_string = "one two"
-    validate_string($my_string, 'three')
-
-The following values will fail, causing compilation to abort:
-
-    validate_string(true)
-    validate_string([ 'some', 'array' ])
-    $undefined = undef
-    validate_string($undefined)
-
-
-- *Type*: statement
-
-values
-------
-When given a hash this function will return the values of that hash.
-
-*Examples:*
-
-    $hash = {
-      'a' => 1,
-      'b' => 2,
-      'c' => 3,
-    }
-    values($hash)
-
-This example would return:
-
-    [1,2,3]
-
-
-- *Type*: rvalue
-
-values_at
----------
-Finds value inside an array based on location.
-
-The first argument is the array you want to analyze, and the second element can
-be a combination of:
-
-* A single numeric index
-* A range in the form of 'start-stop' (eg. 4-9)
-* An array combining the above
-
-*Examples*:
-
-    values_at(['a','b','c'], 2)
-
-Would return ['c'].
-
-    values_at(['a','b','c'], ["0-1"])
-
-Would return ['a','b'].
-
-    values_at(['a','b','c','d','e'], [0, "2-3"])
-
-Would return ['a','c','d'].
-
-
-- *Type*: rvalue
-
-zip
----
-Takes one element from first array and merges corresponding elements from second array. This generates a sequence of n-element arrays, where n is one more than the count of arguments.
-
-*Example:*
-
-    zip(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-    ["1", "4"], ["2", "5"], ["3", "6"]
-
-
-- *Type*: rvalue
-
-*This page autogenerated on 2013-04-11 13:54:25 -0700*
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown
deleted file mode 100644
index 04349ed79b4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_DEVELOPER.markdown
+++ /dev/null
@@ -1,35 +0,0 @@
-Puppet Specific Facts
-=====================
-
-Facter is meant to stand alone and apart from Puppet.  However, Facter often
-runs inside Puppet and all custom facts included in the stdlib module will
-almost always be evaluated in the context of Puppet and Facter working
-together.
-
-Still, we don't want to write custom facts that blow up in the users face if
-Puppet is not loaded in memory.  This is often the case if the user runs
-`facter` without also supplying the `--puppet` flag.
-
-Ah! But Jeff, the custom fact won't be in the `$LOAD_PATH` unless the user
-supplies `--facter`! You might say...
-
-Not (always) true I say!  If the user happens to have a CWD of
-`<modulepath>/stdlib/lib` then the facts will automatically be evaluated and
-blow up.
-
-In any event, it's pretty easy to write a fact that has no value if Puppet is
-not loaded.  Simply do it like this:
-
-    Facter.add(:node_vardir) do
-      setcode do
-        # This will be nil if Puppet is not available.
-        Facter::Util::PuppetSettings.with_puppet do
-          Puppet[:vardir]
-        end
-      end
-    end
-
-The `Facter::Util::PuppetSettings.with_puppet` method accepts a block and
-yields to it only if the Puppet library is loaded.  If the Puppet library is
-not loaded, then the method silently returns `nil` which Facter interprets as
-an undefined fact value.  The net effect is that the fact won't be set.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_SPECS.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_SPECS.markdown
deleted file mode 100644
index 917b6310dd2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/README_SPECS.markdown
+++ /dev/null
@@ -1,7 +0,0 @@
-NOTE
-====
-
-This project's specs depend on puppet core, and thus they require the
-`puppetlabs_spec_helper` project.  For more information please see the README
-in that project, which can be found here: [puppetlabs spec
-helper](https://github.com/puppetlabs/puppetlabs_spec_helper)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown
deleted file mode 100644
index 0f9328ed0fa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/RELEASE_PROCESS.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributing to this module #
-
- * Work in a topic branch
- * Submit a github pull request
- * Address any comments / feeback
- * Merge into master using --no-ff
-
-# Releasing this module #
-
- * This module adheres to http://semver.org/
- * Look for API breaking changes using git diff vX.Y.Z..master
-   * If no API breaking changes, the minor version may be bumped.
-   * If there are API breaking changes, the major version must be bumped.
-   * If there are only small minor changes, the patch version may be bumped.
- * Update the CHANGELOG
- * Update the Modulefile
- * Commit these changes with a message along the lines of "Update CHANGELOG and
-   Modulefile for release"
- * Create an annotated tag with git tag -a vX.Y.Z -m 'version X.Y.Z' (NOTE the
-   leading v as per semver.org)
- * Push the tag with git push origin --tags
- * Build a new package with puppet-module or the rake build task if it exists
- * Publish the new package to the forge
- * Bonus points for an announcement to puppet-users.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Rakefile
deleted file mode 100644
index 4ed1327a3be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/Rakefile
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
-
-desc "Validate manifests, templates, and ruby files in lib."
-task :validate do
-  Dir['manifests/**/*.pp'].each do |manifest|
-    sh "puppet parser validate --noop #{manifest}"
-  end
-  Dir['lib/**/*.rb'].each do |lib_file|
-    sh "ruby -c #{lib_file}"
-  end
-  Dir['templates/**/*.erb'].each do |template|
-    sh "erb -P -x -T '-' #{template} | ruby -c"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
deleted file mode 100644
index 2c096b049d6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/facter_dot_d.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-# A Facter plugin that loads facts from /etc/facter/facts.d
-# and /etc/puppetlabs/facter/facts.d.
-#
-# Facts can be in the form of JSON, YAML or Text files
-# and any executable that returns key=value pairs.
-#
-# In the case of scripts you can also create a file that
-# contains a cache TTL.  For foo.sh store the ttl as just
-# a number in foo.sh.ttl
-#
-# The cache is stored in /tmp/facts_cache.yaml as a mode
-# 600 file and will have the end result of not calling your
-# fact scripts more often than is needed
-
-class Facter::Util::DotD
-  require 'yaml'
-
-  def initialize(dir="/etc/facts.d", cache_file="/tmp/facts_cache.yml")
-    @dir = dir
-    @cache_file = cache_file
-    @cache = nil
-    @types = {".txt" => :txt, ".json" => :json, ".yaml" => :yaml}
-  end
-
-  def entries
-    Dir.entries(@dir).reject{|f| f =~ /^\.|\.ttl$/}.sort.map {|f| File.join(@dir, f) }
-  rescue
-    []
-  end
-
-  def fact_type(file)
-    extension = File.extname(file)
-
-    type = @types[extension] || :unknown
-
-    type = :script if type == :unknown && File.executable?(file)
-
-    return type
-  end
-
-  def txt_parser(file)
-    File.readlines(file).each do |line|
-      if line =~ /^([^=]+)=(.+)$/
-        var = $1; val = $2
-
-        Facter.add(var) do
-          setcode { val }
-        end
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as text facts: #{e.class}: #{e}")
-  end
-
-  def json_parser(file)
-    begin
-      require 'json'
-    rescue LoadError
-      retry if require 'rubygems'
-      raise
-    end
-
-    JSON.load(File.read(file)).each_pair do |f, v|
-      Facter.add(f) do
-        setcode { v }
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as json facts: #{e.class}: #{e}")
-  end
-
-  def yaml_parser(file)
-    require 'yaml'
-
-    YAML.load_file(file).each_pair do |f, v|
-      Facter.add(f) do
-        setcode { v }
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as yaml facts: #{e.class}: #{e}")
-  end
-
-  def script_parser(file)
-    result = cache_lookup(file)
-    ttl = cache_time(file)
-
-    unless result
-      result = Facter::Util::Resolution.exec(file)
-
-      if ttl > 0
-        Facter.debug("Updating cache for #{file}")
-        cache_store(file, result)
-        cache_save!
-      end
-    else
-      Facter.debug("Using cached data for #{file}")
-    end
-
-    result.split("\n").each do |line|
-      if line =~ /^(.+)=(.+)$/
-        var = $1; val = $2
-
-        Facter.add(var) do
-          setcode { val }
-        end
-      end
-    end
-  rescue Exception => e
-    Facter.warn("Failed to handle #{file} as script facts: #{e.class}: #{e}")
-    Facter.debug(e.backtrace.join("\n\t"))
-  end
-
-  def cache_save!
-    cache = load_cache
-    File.open(@cache_file, "w", 0600) {|f| f.write(YAML.dump(cache)) }
-  rescue
-  end
-
-  def cache_store(file, data)
-    load_cache
-
-    @cache[file] = {:data => data, :stored => Time.now.to_i}
-  rescue
-  end
-
-  def cache_lookup(file)
-    cache = load_cache
-
-    return nil if cache.empty?
-
-    ttl = cache_time(file)
-
-    if cache[file]
-      now = Time.now.to_i
-
-      return cache[file][:data] if ttl == -1
-      return cache[file][:data] if (now - cache[file][:stored]) <= ttl
-      return nil
-    else
-      return nil
-    end
-  rescue
-    return nil
-  end
-
-  def cache_time(file)
-    meta = file + ".ttl"
-
-    return File.read(meta).chomp.to_i
-  rescue
-    return 0
-  end
-
-  def load_cache
-    unless @cache
-      if File.exist?(@cache_file)
-        @cache = YAML.load_file(@cache_file)
-      else
-        @cache = {}
-      end
-    end
-
-    return @cache
-  rescue
-    @cache = {}
-    return @cache
-  end
-
-  def create
-    entries.each do |fact|
-      type = fact_type(fact)
-      parser = "#{type}_parser"
-
-      if respond_to?("#{type}_parser")
-        Facter.debug("Parsing #{fact} using #{parser}")
-
-        send(parser, fact)
-      end
-    end
-  end
-end
-
-
-mdata = Facter.version.match(/(\d+)\.(\d+)\.(\d+)/)
-if mdata
-  (major, minor, patch) = mdata.captures.map { |v| v.to_i }
-  if major < 2
-    # Facter 1.7 introduced external facts support directly
-    unless major == 1 and minor > 6
-      Facter::Util::DotD.new("/etc/facter/facts.d").create
-      Facter::Util::DotD.new("/etc/puppetlabs/facter/facts.d").create
-
-      # Windows has a different configuration directory that defaults to a vendor
-      # specific sub directory of the %COMMON_APPDATA% directory.
-      if Dir.const_defined? 'COMMON_APPDATA' then
-        windows_facts_dot_d = File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'facter', 'facts.d')
-        Facter::Util::DotD.new(windows_facts_dot_d).create
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb
deleted file mode 100644
index 0cc0f64e950..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/pe_version.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# Fact: is_pe, pe_version, pe_major_version, pe_minor_version, pe_patch_version
-#
-# Purpose: Return various facts about the PE state of the system
-#
-# Resolution: Uses a regex match against puppetversion to determine whether the
-#   machine has Puppet Enterprise installed, and what version (overall, major,
-#   minor, patch) is installed.
-#
-# Caveats:
-#
-Facter.add("pe_version") do
-  setcode do
-    pe_ver = Facter.value("puppetversion").match(/Puppet Enterprise (\d+\.\d+\.\d+)/)
-    pe_ver[1] if pe_ver
-  end
-end
-
-Facter.add("is_pe") do
-  setcode do
-    if Facter.value(:pe_version).to_s.empty? then
-      false
-    else
-      true
-    end
-  end
-end
-
-Facter.add("pe_major_version") do
-  confine :is_pe => true
-  setcode do
-    if pe_version = Facter.value(:pe_version)
-      pe_version.to_s.split('.')[0]
-    end
-  end
-end
-
-Facter.add("pe_minor_version") do
-  confine :is_pe => true
-  setcode do
-    if pe_version = Facter.value(:pe_version)
-      pe_version.to_s.split('.')[1]
-    end
-  end
-end
-
-Facter.add("pe_patch_version") do
-  confine :is_pe => true
-  setcode do
-    if pe_version = Facter.value(:pe_version)
-      pe_version.to_s.split('.')[2]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
deleted file mode 100644
index 0e6af40e49a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/puppet_vardir.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# This facter fact returns the value of the Puppet vardir setting for the node
-# running puppet or puppet agent.  The intent is to enable Puppet modules to
-# automatically have insight into a place where they can place variable data,
-# regardless of the node's platform.
-#
-# The value should be directly usable in a File resource path attribute.
-
-
-begin
-  require 'facter/util/puppet_settings'
-rescue LoadError => e
-  # puppet apply does not add module lib directories to the $LOAD_PATH (See
-  # #4248). It should (in the future) but for the time being we need to be
-  # defensive which is what this rescue block is doing.
-  rb_file = File.join(File.dirname(__FILE__), 'util', 'puppet_settings.rb')
-  load rb_file if File.exists?(rb_file) or raise e
-end
-
-Facter.add(:puppet_vardir) do
-  setcode do
-    # This will be nil if Puppet is not available.
-    Facter::Util::PuppetSettings.with_puppet do
-      Puppet[:vardir]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb
deleted file mode 100644
index b4f87ff2ab2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/root_home.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# A facter fact to determine the root home directory.
-# This varies on PE supported platforms and may be
-# reconfigured by the end user.
-
-module Facter::Util::RootHome
-  class << self
-  def get_root_home
-    root_ent = Facter::Util::Resolution.exec("getent passwd root")
-    # The home directory is the sixth element in the passwd entry
-    # If the platform doesn't have getent, root_ent will be nil and we should
-    # return it straight away.
-    root_ent && root_ent.split(":")[5]
-  end
-  end
-end
-
-Facter.add(:root_home) do
-  setcode { Facter::Util::RootHome.get_root_home }
-end
-
-Facter.add(:root_home) do
-  confine :kernel => :darwin
-  setcode do
-    str = Facter::Util::Resolution.exec("dscacheutil -q user -a name root")
-    hash = {}
-    str.split("\n").each do |pair|
-      key,value = pair.split(/:/)
-      hash[key] = value
-    end
-    hash['dir'].strip
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb
deleted file mode 100644
index 1ad945218ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/facter/util/puppet_settings.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Facter
-  module Util
-    module PuppetSettings
-      # This method is intended to provide a convenient way to evaluate a
-      # Facter code block only if Puppet is loaded.  This is to account for the
-      # situation where the fact happens to be in the load path, but Puppet is
-      # not loaded for whatever reason.  Perhaps the user is simply running
-      # facter without the --puppet flag and they happen to be working in a lib
-      # directory of a module.
-      def self.with_puppet
-        begin
-          Module.const_get("Puppet")
-        rescue NameError
-          nil
-        else
-          yield
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb
deleted file mode 100644
index 11d2d7feade..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# abs.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:abs, :type => :rvalue, :doc => <<-EOS
-    Returns the absolute value of a number, for example -34.56 becomes
-    34.56. Takes a single integer and float value as an argument.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "abs(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-
-    # Numbers in Puppet are often string-encoded which is troublesome ...
-    if value.is_a?(String)
-      if value.match(/^-?(?:\d+)(?:\.\d+){1}$/)
-        value = value.to_f
-      elsif value.match(/^-?\d+$/)
-        value = value.to_i
-      else
-        raise(Puppet::ParseError, 'abs(): Requires float or ' +
-          'integer to work with')
-      end
-    end
-
-    # We have numeric value to handle ...
-    result = value.abs
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb
deleted file mode 100644
index e71407e89e7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/any2array.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# any2array.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:any2array, :type => :rvalue, :doc => <<-EOS
-This converts any object to an array containing that object. Empty argument
-lists are converted to an empty array. Arrays are left untouched. Hashes are
-converted to arrays of alternating keys and values.
-    EOS
-  ) do |arguments|
-
-    if arguments.empty?
-        return []
-    end
-
-    if arguments.length == 1
-        if arguments[0].kind_of?(Array)
-            return arguments[0]
-        elsif arguments[0].kind_of?(Hash)
-            result = []
-            arguments[0].each do |key, value|
-                result << key << value
-            end
-            return result
-        end
-    end
-
-    return arguments
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb
deleted file mode 100644
index 617ba31b6e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/base64.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:base64, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-
-    Base64 encode or decode a string based on the command and the string submitted
-
-    Usage:
-
-      $encodestring = base64('encode','thestring')
-      $decodestring = base64('decode','dGhlc3RyaW5n')
-
-    ENDHEREDOC
-
-    require 'base64'
-
-    raise Puppet::ParseError, ("base64(): Wrong number of arguments (#{args.length}; must be = 2)") unless args.length == 2
-
-    actions = ['encode','decode']
-
-    unless actions.include?(args[0])
-      raise Puppet::ParseError, ("base64(): the first argument must be one of 'encode' or 'decode'")
-    end
-
-    unless args[1].is_a?(String)
-      raise Puppet::ParseError, ("base64(): the second argument must be a string to base64")
-    end
-
-    case args[0]
-      when 'encode'
-        result = Base64.encode64(args[1])
-      when 'decode'
-        result = Base64.decode64(args[1])
-    end
-
-    return result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb
deleted file mode 100644
index 9a07a8a1192..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# bool2num.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:bool2num, :type => :rvalue, :doc => <<-EOS
-    Converts a boolean to a number. Converts the values:
-      false, f, 0, n, and no to 0
-      true, t, 1, y, and yes to 1
-    Requires a single boolean or string as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "bool2num(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    # We can have either true or false, or string which resembles boolean ...
-    unless [FalseClass, TrueClass, String].include?(klass)
-      raise(Puppet::ParseError, 'bool2num(): Requires either ' +
-        'boolean or string to work with')
-    end
-
-    if value.is_a?(String)
-      # We consider all the yes, no, y, n and so on too ...
-      value = case value
-        #
-        # This is how undef looks like in Puppet ...
-        # We yield 0 (or false if you wish) in this case.
-        #
-        when /^$/, '' then false # Empty string will be false ...
-        when /^(1|t|y|true|yes)$/  then true
-        when /^(0|f|n|false|no)$/  then false
-        when /^(undef|undefined)$/ then false # This is not likely to happen ...
-        else
-          raise(Puppet::ParseError, 'bool2num(): Unknown type of boolean given')
-      end
-    end
-
-    # We have real boolean values as well ...
-    result = value ? 1 : 0
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb
deleted file mode 100644
index 640d00b82fa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  capitalize.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:capitalize, :type => :rvalue, :doc => <<-EOS
-    Capitalizes the first letter of a string or array of strings.
-    Requires either a single string or an array as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "capitalize(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'capitalize(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.capitalize : i }
-    else
-      result = value.capitalize
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb
deleted file mode 100644
index 4564a000abe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  chomp.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:chomp, :type => :rvalue, :doc => <<-'EOS'
-    Removes the record separator from the end of a string or an array of
-    strings, for example `hello\n` becomes `hello`.
-    Requires a single string or array as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "chomp(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'chomp(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.chomp : i }
-    else
-      result = value.chomp
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb
deleted file mode 100644
index f242af39ce8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  chop.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:chop, :type => :rvalue, :doc => <<-'EOS'
-    Returns a new string with the last character removed. If the string ends
-    with `\r\n`, both characters are removed. Applying chop to an empty
-    string returns an empty string. If you wish to merely remove record
-    separators then you should use the `chomp` function.
-    Requires a string or array of strings as input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "chop(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'chop(): Requires either an ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.chop : i }
-    else
-      result = value.chop
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb
deleted file mode 100644
index 6c8638222ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/concat.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# concat.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:concat, :type => :rvalue, :doc => <<-EOS
-Appends the contents of array 2 onto array 1.
-
-*Example:*
-
-    concat(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-  ['1','2','3','4','5','6']
-    EOS
-  ) do |arguments|
-
-    # Check that 2 arguments have been given ...
-    raise(Puppet::ParseError, "concat(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    a = arguments[0]
-    b = arguments[1]
-
-    # Check that the first parameter is an array
-    unless a.is_a?(Array)
-      raise(Puppet::ParseError, 'concat(): Requires array to work with')
-    end
-
-    if b.is_a?(Array)
-      result = a.concat(b)
-    else
-      result = a << b
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb
deleted file mode 100644
index 52de1b8a5a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/count.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:count, :type => :rvalue, :arity => -2, :doc => <<-EOS
-Takes an array as first argument and an optional second argument.
-Count the number of elements in array that matches second argument.
-If called with only an array it counts the number of elements that are not nil/undef.
-    EOS
-  ) do |args|
-
-    if (args.size > 2) then
-      raise(ArgumentError, "count(): Wrong number of arguments "+
-        "given #{args.size} for 1 or 2.")
-    end
-
-    collection, item = args
-
-    if item then
-      collection.count item
-    else
-      collection.count { |obj| obj != nil && obj != :undef && obj != '' }
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
deleted file mode 100644
index 6df32e9c567..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/deep_merge.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:deep_merge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Recursively merges two or more hashes together and returns the resulting hash.
-
-    For example:
-
-        $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-        $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-        $merged_hash = deep_merge($hash1, $hash2)
-        # The resulting hash is equivalent to:
-        # $merged_hash = { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } }
-
-    When there is a duplicate key that is a hash, they are recursively merged.
-    When there is a duplicate key that is not a hash, the key in the rightmost hash will "win."
-
-    ENDHEREDOC
-
-    if args.length < 2
-      raise Puppet::ParseError, ("deep_merge(): wrong number of arguments (#{args.length}; must be at least 2)")
-    end
-
-    deep_merge = Proc.new do |hash1,hash2|
-      hash1.merge(hash2) do |key,old_value,new_value|
-        if old_value.is_a?(Hash) && new_value.is_a?(Hash)
-          deep_merge.call(old_value, new_value)
-        else
-          new_value
-        end
-      end
-    end
-
-    result = Hash.new
-    args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
-      # If the argument was not a hash, skip it.
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "deep_merge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
-
-      result = deep_merge.call(result, arg)
-    end
-    return( result )
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
deleted file mode 100644
index d7df306c793..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:defined_with_params,
-                                      :type => :rvalue,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource reference and an optional hash of attributes.
-
-Returns true if a resource with the specified attributes has already been added
-to the catalog, and false otherwise.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-    if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
-      user { 'dan': ensure => present, }
-    }
-ENDOFDOC
-) do |vals|
-  reference, params = vals
-  raise(ArgumentError, 'Must specify a reference') unless reference
-  if (! params) || params == ''
-    params = {}
-  end
-  ret = false
-  if resource = findresource(reference.to_s)
-    matches = params.collect do |key, value|
-      resource[key] == value
-    end
-    ret = params.empty? || !matches.include?(false)
-  end
-  Puppet.debug("Resource #{reference} was not determined to be defined")
-  ret
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb
deleted file mode 100644
index d03a29355e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# delete.rb
-#
-
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-
-module Puppet::Parser::Functions
-  newfunction(:delete, :type => :rvalue, :doc => <<-EOS
-Deletes all instances of a given element from an array, substring from a
-string, or key from a hash.
-
-*Examples:*
-
-    delete(['a','b','c','b'], 'b')
-    Would return: ['a','c']
-
-    delete({'a'=>1,'b'=>2,'c'=>3}, 'b')
-    Would return: {'a'=>1,'c'=>3}
-
-    delete('abracadabra', 'bra')
-    Would return: 'acada'
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 2) then
-      raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
-        "given #{arguments.size} for 2.")
-    end
-
-    collection = arguments[0].dup
-    item = arguments[1]
-
-    case collection
-    when Array, Hash
-      collection.delete item
-    when String
-      collection.gsub! item, ''
-    else
-      raise(TypeError, "delete(): First argument must be an Array, " +
-            "String, or Hash. Given an argument of class #{collection.class}.")
-    end
-    collection
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb
deleted file mode 100644
index 3eb4b53756a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# delete_at.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:delete_at, :type => :rvalue, :doc => <<-EOS
-Deletes a determined indexed value from an array.
-
-*Examples:*
-
-    delete_at(['a','b','c'], 1)
-
-Would return: ['a','c']
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "delete_at(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'delete_at(): Requires array to work with')
-    end
-
-    index = arguments[1]
-
-    if index.is_a?(String) and not index.match(/^\d+$/)
-      raise(Puppet::ParseError, 'delete_at(): You must provide ' +
-        'non-negative numeric index')
-    end
-
-    result = array.clone
-
-    # Numbers in Puppet are often string-encoded which is troublesome ...
-    index = index.to_i
-
-    if index > result.size - 1 # First element is at index 0 is it not?
-      raise(Puppet::ParseError, 'delete_at(): Given index ' +
-        'exceeds size of array given')
-    end
-
-    result.delete_at(index) # We ignore the element that got deleted ...
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
deleted file mode 100644
index f94d4da8d42..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_undef_values.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:delete_undef_values, :type => :rvalue, :doc => <<-EOS
-Returns a copy of input hash or array with all undefs deleted.
-
-*Examples:*
-
-    $hash = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
-
-Would return: {a => 'A', b => '', d => false}
-
-    $array = delete_undef_values(['A','',undef,false])
-
-Would return: ['A','',false]
-
-      EOS
-    ) do |args|
-
-    raise(Puppet::ParseError,
-          "delete_undef_values(): Wrong number of arguments given " +
-          "(#{args.size})") if args.size < 1
-
-    unless args[0].is_a? Array or args[0].is_a? Hash
-      raise(Puppet::ParseError,
-            "delete_undef_values(): expected an array or hash, got #{args[0]} type  #{args[0].class} ")
-    end
-    result = args[0].dup
-    if result.is_a?(Hash)
-      result.delete_if {|key, val| val.equal? :undef}
-    elsif result.is_a?(Array)
-      result.delete :undef
-    end
-    result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb
deleted file mode 100644
index f6c8c0e6b6f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/delete_values.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:delete_values, :type => :rvalue, :doc => <<-EOS
-Deletes all instances of a given value from a hash.
-
-*Examples:*
-
-    delete_values({'a'=>'A','b'=>'B','c'=>'C','B'=>'D'}, 'B')
-
-Would return: {'a'=>'A','c'=>'C','B'=>'D'}
-
-      EOS
-    ) do |arguments|
-
-    raise(Puppet::ParseError,
-          "delete_values(): Wrong number of arguments given " +
-          "(#{arguments.size} of 2)") if arguments.size != 2
-
-    hash, item = arguments
-
-    if not hash.is_a?(Hash)
-      raise(TypeError, "delete_values(): First argument must be a Hash. " + \
-                       "Given an argument of class #{hash.class}.")
-    end
-    hash.dup.delete_if { |key, val| item == val }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb
deleted file mode 100644
index cd258f75165..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/difference.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# difference.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:difference, :type => :rvalue, :doc => <<-EOS
-This function returns the difference between two arrays.
-The returned array is a copy of the original array, removing any items that
-also appear in the second array.
-
-*Examples:*
-
-    difference(["a","b","c"],["b","c","d"])
-
-Would return: ["a"]
-    EOS
-  ) do |arguments|
-
-    # Two arguments are required
-    raise(Puppet::ParseError, "difference(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    first = arguments[0]
-    second = arguments[1]
-
-    unless first.is_a?(Array) && second.is_a?(Array)
-      raise(Puppet::ParseError, 'difference(): Requires 2 arrays')
-    end
-
-    result = first - second
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb
deleted file mode 100644
index ea8cc1e081e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/dirname.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:dirname, :type => :rvalue, :doc => <<-EOS
-    Returns the dirname of a path.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "dirname(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    path = arguments[0]
-    return File.dirname(path)
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb
deleted file mode 100644
index 4066d210f77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  downcase.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:downcase, :type => :rvalue, :doc => <<-EOS
-Converts the case of a string or all strings in an array to lower case.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "downcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'downcase(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.downcase : i }
-    else
-      result = value.downcase
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb
deleted file mode 100644
index 80ebb86b891..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# empty.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:empty, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable is empty.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "empty(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, Hash, String].include?(klass)
-      raise(Puppet::ParseError, 'empty(): Requires either ' +
-        'array, hash or string to work with')
-    end
-
-    result = value.empty?
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
deleted file mode 100644
index f1da4aaaafe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# ensure_packages.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:ensure_packages, :type => :statement, :doc => <<-EOS
-Takes a list of packages and only installs them if they don't already exist.
-It optionally takes a hash as a second parameter that will be passed as the
-third argument to the ensure_resource() function.
-    EOS
-  ) do |arguments|
-
-    if arguments.size > 2 or arguments.size == 0
-      raise(Puppet::ParseError, "ensure_packages(): Wrong number of arguments " +
-        "given (#{arguments.size} for 1 or 2)")
-    elsif arguments.size == 2 and !arguments[1].is_a?(Hash) 
-      raise(Puppet::ParseError, 'ensure_packages(): Requires second argument to be a Hash')
-    end
-
-    packages = Array(arguments[0])
-
-    if arguments[1]
-      defaults = { 'ensure' => 'present' }.merge(arguments[1])
-    else
-      defaults = { 'ensure' => 'present' }
-    end
-
-    Puppet::Parser::Functions.function(:ensure_resource)
-    packages.each { |package_name|
-      function_ensure_resource(['package', package_name, defaults ])
-    }
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb
deleted file mode 100644
index 05e5593fc17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:ensure_resource,
-                                      :type => :statement,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource type, title, and a list of attributes that describe a
-resource.
-
-    user { 'dan':
-      ensure => present,
-    }
-
-This example only creates the resource if it does not already exist:
-
-    ensure_resource('user', 'dan', {'ensure' => 'present' })
-
-If the resource already exists but does not match the specified parameters,
-this function will attempt to recreate the resource leading to a duplicate
-resource definition error.
-
-An array of resources can also be passed in and each will be created with
-the type and parameters specified if it doesn't already exist.
-
-    ensure_resource('user', ['dan','alex'], {'ensure' => 'present'})
-
-ENDOFDOC
-) do |vals|
-  type, title, params = vals
-  raise(ArgumentError, 'Must specify a type') unless type
-  raise(ArgumentError, 'Must specify a title') unless title
-  params ||= {}
-
-  items = [title].flatten
-
-  items.each do |item|
-    Puppet::Parser::Functions.function(:defined_with_params)
-    if function_defined_with_params(["#{type}[#{item}]", params])
-      Puppet.debug("Resource #{type}[#{item}] not created because it already exists")
-    else
-      Puppet::Parser::Functions.function(:create_resources)
-      function_create_resources([type.capitalize, { item => params }])
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb
deleted file mode 100644
index a1ed1832901..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# flatten.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:flatten, :type => :rvalue, :doc => <<-EOS
-This function flattens any deeply nested arrays and returns a single flat array
-as a result.
-
-*Examples:*
-
-    flatten(['a', ['b', ['c']]])
-
-Would return: ['a','b','c']
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "flatten(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'flatten(): Requires array to work with')
-    end
-
-    result = array.flatten
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb
deleted file mode 100644
index 9a6f014d7c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:floor, :type => :rvalue, :doc => <<-EOS
-    Returns the largest integer less or equal to the argument.
-    Takes a single numeric value as an argument.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "floor(): Wrong number of arguments " +
-          "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    begin
-      arg = Float(arguments[0])
-    rescue TypeError, ArgumentError => e
-      raise(Puppet::ParseError, "floor(): Wrong argument type " +
-            "given (#{arguments[0]} for Numeric)")
-    end
-
-    raise(Puppet::ParseError, "floor(): Wrong argument type " +
-          "given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false
-
-    arg.floor
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb
deleted file mode 100644
index 6558206055f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# fqdn_rotate.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:fqdn_rotate, :type => :rvalue, :doc => <<-EOS
-Rotates an array a random number of times based on a nodes fqdn.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "fqdn_rotate(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-    require 'digest/md5'
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'fqdn_rotate(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.clone
-
-    string = value.is_a?(String) ? true : false
-
-    # Check whether it makes sense to rotate ...
-    return result if result.size <= 1
-
-    # We turn any string value into an array to be able to rotate ...
-    result = string ? result.split('') : result
-
-    elements = result.size
-
-    srand(Digest::MD5.hexdigest([lookupvar('::fqdn'),arguments].join(':')).hex)
-    rand(elements).times {
-       result.push result.shift
-    }
-
-    result = string ? result.join : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb
deleted file mode 100644
index 1421b91f52f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:get_module_path, :type =>:rvalue, :doc => <<-EOT
-    Returns the absolute path of the specified module for the current
-    environment.
-
-    Example:
-      $module_path = get_module_path('stdlib')
-  EOT
-  ) do |args|
-    raise(Puppet::ParseError, "get_module_path(): Wrong number of arguments, expects one") unless args.size == 1
-    if module_path = Puppet::Module.find(args[0], compiler.environment.to_s)
-      module_path.path
-    else
-      raise(Puppet::ParseError, "Could not find module #{args[0]} in environment #{compiler.environment}")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb
deleted file mode 100644
index 6d510069f90..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getparam.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:getparam,
-                                      :type => :rvalue,
-                                      :doc => <<-'ENDOFDOC'
-Takes a resource reference and name of the parameter and
-returns value of resource's parameter.
-
-*Examples:*
-
-    define example_resource($param) {
-    }
-
-    example_resource { "example_resource_instance":
-        param => "param_value"
-    }
-
-    getparam(Example_resource["example_resource_instance"], "param")
-
-Would return: param_value
-ENDOFDOC
-) do |vals|
-  reference, param = vals
-  raise(ArgumentError, 'Must specify a reference') unless reference
-  raise(ArgumentError, 'Must specify name of a parameter') unless param and param.instance_of? String
-
-  return '' if param.empty?
-
-  if resource = findresource(reference.to_s)
-    return resource[param] if resource[param]
-  end
-
-  return ''
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb
deleted file mode 100644
index 162114995b3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:getvar, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Lookup a variable in a remote namespace.
-
-    For example:
-
-        $foo = getvar('site::data::foo')
-        # Equivalent to $foo = $site::data::foo
-
-    This is useful if the namespace itself is stored in a string:
-
-        $datalocation = 'site::data'
-        $bar = getvar("${datalocation}::bar")
-        # Equivalent to $bar = $site::data::bar
-    ENDHEREDOC
-
-    unless args.length == 1
-      raise Puppet::ParseError, ("getvar(): wrong number of arguments (#{args.length}; must be 1)")
-    end
-
-    self.lookupvar("#{args[0]}")
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb
deleted file mode 100644
index ceba9ecc8ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# grep.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:grep, :type => :rvalue, :doc => <<-EOS
-This function searches through an array and returns any elements that match
-the provided regular expression.
-
-*Examples:*
-
-    grep(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['aaa','aaaddd']
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 2) then
-      raise(Puppet::ParseError, "grep(): Wrong number of arguments "+
-        "given #{arguments.size} for 2")
-    end
-
-    a = arguments[0]
-    pattern = Regexp.new(arguments[1])
-
-    a.grep(pattern)
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb
deleted file mode 100644
index 7f150a7176c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# has_interface_with
-#
-
-module Puppet::Parser::Functions
-  newfunction(:has_interface_with, :type => :rvalue, :doc => <<-EOS
-Returns boolean based on kind and value:
-  * macaddress
-  * netmask
-  * ipaddress
-  * network
-
-has_interface_with("macaddress", "x:x:x:x:x:x")
-has_interface_with("ipaddress", "127.0.0.1")    => true
-etc.
-
-If no "kind" is given, then the presence of the interface is checked:
-has_interface_with("lo")                        => true
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "has_interface_with(): Wrong number of arguments " +
-          "given (#{args.size} for 1 or 2)") if args.size < 1 or args.size > 2
-
-    interfaces = lookupvar('interfaces')
-
-    # If we do not have any interfaces, then there are no requested attributes
-    return false if (interfaces == :undefined)
-
-    interfaces = interfaces.split(',')
-
-    if args.size == 1
-      return interfaces.member?(args[0])
-    end
-
-    kind, value = args
-
-    if lookupvar(kind) == value
-      return true
-    end
-
-    result = false
-    interfaces.each do |iface|
-      if value == lookupvar("#{kind}_#{iface}")
-        result = true
-        break
-      end
-    end
-
-    result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb
deleted file mode 100644
index 842c8ec6743..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# has_ip_address
-#
-
-module Puppet::Parser::Functions
-  newfunction(:has_ip_address, :type => :rvalue, :doc => <<-EOS
-Returns true if the client has the requested IP address on some interface.
-
-This function iterates through the 'interfaces' fact and checks the
-'ipaddress_IFACE' facts, performing a simple string comparison.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "has_ip_address(): Wrong number of arguments " +
-          "given (#{args.size} for 1)") if args.size != 1
-
-    Puppet::Parser::Functions.autoloader.load(:has_interface_with) \
-      unless Puppet::Parser::Functions.autoloader.loaded?(:has_interface_with)
-
-    function_has_interface_with(['ipaddress', args[0]])
-
-  end
-end
-
-# vim:sts=2 sw=2
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb
deleted file mode 100644
index 9ccf9024f78..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# has_ip_network
-#
-
-module Puppet::Parser::Functions
-  newfunction(:has_ip_network, :type => :rvalue, :doc => <<-EOS
-Returns true if the client has an IP address within the requested network.
-
-This function iterates through the 'interfaces' fact and checks the
-'network_IFACE' facts, performing a simple string comparision.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "has_ip_network(): Wrong number of arguments " +
-          "given (#{args.size} for 1)") if args.size != 1
-
-    Puppet::Parser::Functions.autoloader.load(:has_interface_with) \
-      unless Puppet::Parser::Functions.autoloader.loaded?(:has_interface_with)
-
-    function_has_interface_with(['network', args[0]])
-
-  end
-end
-
-# vim:sts=2 sw=2
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb
deleted file mode 100644
index 4657cc29cd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:has_key, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Determine if a hash has a certain key value.
-
-    Example:
-
-        $my_hash = {'key_one' => 'value_one'}
-        if has_key($my_hash, 'key_two') {
-          notice('we will not reach here')
-        }
-        if has_key($my_hash, 'key_one') {
-          notice('this will be printed')
-        }
-
-    ENDHEREDOC
-
-    unless args.length == 2
-      raise Puppet::ParseError, ("has_key(): wrong number of arguments (#{args.length}; must be 2)")
-    end
-    unless args[0].is_a?(Hash)
-      raise Puppet::ParseError, "has_key(): expects the first argument to be a hash, got #{args[0].inspect} which is of type #{args[0].class}"
-    end
-    args[0].has_key?(args[1])
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb
deleted file mode 100644
index 8cc4823be5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# hash.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:hash, :type => :rvalue, :doc => <<-EOS
-This function converts an array into a hash.
-
-*Examples:*
-
-    hash(['a',1,'b',2,'c',3])
-
-Would return: {'a'=>1,'b'=>2,'c'=>3}
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "hash(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'hash(): Requires array to work with')
-    end
-
-    result = {}
-
-    begin
-      # This is to make it compatible with older version of Ruby ...
-      array  = array.flatten
-      result = Hash[*array]
-    rescue Exception
-      raise(Puppet::ParseError, 'hash(): Unable to compute ' +
-        'hash from array given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb
deleted file mode 100644
index 48f02e9d379..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/intersection.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# intersection.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:intersection, :type => :rvalue, :doc => <<-EOS
-This function returns an array an intersection of two.
-
-*Examples:*
-
-    intersection(["a","b","c"],["b","c","d"])
-
-Would return: ["b","c"]
-    EOS
-  ) do |arguments|
-
-    # Two arguments are required
-    raise(Puppet::ParseError, "intersection(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    first = arguments[0]
-    second = arguments[1]
-
-    unless first.is_a?(Array) && second.is_a?(Array)
-      raise(Puppet::ParseError, 'intersection(): Requires 2 arrays')
-    end
-
-    result = first & second
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb
deleted file mode 100644
index b39e184ae54..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# is_array.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_array, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is an array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_array(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    type = arguments[0]
-
-    result = type.is_a?(Array)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb
deleted file mode 100644
index 8bbdbc8a146..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_bool.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# is_bool.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_bool, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a boolean.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    type = arguments[0]
-
-    result = type.is_a?(TrueClass) || type.is_a?(FalseClass)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
deleted file mode 100644
index b3fee965a0b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# is_domain_name.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_domain_name, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a syntactically correct domain name.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_domain_name(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    domain = arguments[0]
-
-    # Limits (rfc1035, 3.1)
-    domain_max_length=255
-    label_min_length=1
-    label_max_length=63
-
-    # Only allow string types
-    return false unless domain.is_a?(String)
-
-    # Allow ".", it is the top level domain
-    return true if domain == '.'
-
-    # Remove the final dot, if present.
-    domain.chomp!('.')
-
-    # Check the whole domain
-    return false if domain.empty?
-    return false if domain.length > domain_max_length
-
-    # Check each label in the domain
-    labels = domain.split('.')
-    vlabels = labels.each do |label|
-      break if label.length < label_min_length
-      break if label.length > label_max_length
-      break if label[-1..-1] == '-'
-      break if label[0..0] == '-'
-      break unless /^[a-z\d-]+$/i.match(label)
-    end
-    return vlabels == labels
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb
deleted file mode 100644
index a2da94385be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# is_float.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_float, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a float.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_float(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    # Only allow Numeric or String types
-    return false unless value.is_a?(Numeric) or value.is_a?(String)
-
-    if value != value.to_f.to_s and !value.is_a? Float then
-      return false
-    else
-      return true
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb
deleted file mode 100644
index 6da82c8c170..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_function_available.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# is_function_available.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_function_available, :type => :rvalue, :doc => <<-EOS
-This function accepts a string as an argument, determines whether the
-Puppet runtime has access to a function by that name.  It returns a
-true if the function exists, false if not.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_function_available?(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    # Only allow String types
-    return false unless arguments[0].is_a?(String)
-
-    function = Puppet::Parser::Functions.function(arguments[0].to_sym)
-    function.is_a?(String) and not function.empty?
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb
deleted file mode 100644
index ad907f086f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# is_hash.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_hash, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a hash.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_hash(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    type = arguments[0]
-
-    result = type.is_a?(Hash)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb
deleted file mode 100644
index c03d28df920..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# is_integer.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_integer, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is an Integer or
-a decimal (base 10) integer in String form. The string may
-start with a '-' (minus). A value of '0' is allowed, but a leading '0' digit may not
-be followed by other digits as this indicates that the value is octal (base 8).
-
-If given any other argument `false` is returned.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_integer(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    # Regex is taken from the lexer of puppet
-    # puppet/pops/parser/lexer.rb but modified to match also
-    # negative values and disallow numbers prefixed with multiple
-    # 0's
-    #
-    # TODO these parameter should be a constant but I'm not sure
-    # if there is no risk to declare it inside of the module
-    # Puppet::Parser::Functions
-
-    # Integer numbers like
-    # -1234568981273
-    # 47291
-    numeric = %r{^-?(?:(?:[1-9]\d*)|0)$}
-
-    if value.is_a? Integer or (value.is_a? String and value.match numeric)
-      return true
-    else
-      return false
-    end
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
deleted file mode 100644
index a90adabe15a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# is_ip_address.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_ip_address, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a valid IP address.
-    EOS
-  ) do |arguments|
-
-    require 'ipaddr'
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_ip_address(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    begin
-      ip = IPAddr.new(arguments[0])
-    rescue ArgumentError
-      return false
-    end
-
-    if ip.ipv4? or ip.ipv6? then
-      return true
-    else
-      return false
-    end
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
deleted file mode 100644
index 1b3088a26aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# is_mac_address.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_mac_address, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a valid mac address.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_mac_address(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    mac = arguments[0]
-
-    if /^[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}:[a-fA-F0-9]{1,2}$/.match(mac) then
-      return true
-    else
-      return false
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb
deleted file mode 100644
index e7e1d2a746f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# is_numeric.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_numeric, :type => :rvalue, :doc => <<-EOS
-Returns true if the given argument is a Numeric (Integer or Float),
-or a String containing either a valid integer in decimal base 10 form, or
-a valid floating point string representation.
-
-The function recognizes only decimal (base 10) integers and float but not
-integers in hex (base 16) or octal (base 8) form.
-
-The string representation may start with a '-' (minus). If a decimal '.' is used,
-it must be followed by at least one digit.
-
-Valid examples:
-
-  77435
-  10e-12
-  -8475
-  0.2343
-  -23.561e3
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_numeric(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    # Regex is taken from the lexer of puppet
-    # puppet/pops/parser/lexer.rb but modified to match also
-    # negative values and disallow invalid octal numbers or
-    # numbers prefixed with multiple 0's (except in hex numbers)
-    #
-    # TODO these parameters should be constants but I'm not sure
-    # if there is no risk to declare them inside of the module
-    # Puppet::Parser::Functions
-
-    # TODO decide if this should be used
-    # HEX numbers like
-    # 0xaa230F
-    # 0X1234009C
-    # 0x0012
-    # -12FcD
-    #numeric_hex = %r{^-?0[xX][0-9A-Fa-f]+$}
-
-    # TODO decide if this should be used
-    # OCTAL numbers like
-    # 01234567
-    # -045372
-    #numeric_oct = %r{^-?0[1-7][0-7]*$}
-
-    # Integer/Float numbers like
-    # -0.1234568981273
-    # 47291
-    # 42.12345e-12
-    numeric = %r{^-?(?:(?:[1-9]\d*)|0)(?:\.\d+)?(?:[eE]-?\d+)?$}
-
-    if value.is_a? Numeric or (value.is_a? String and (
-      value.match(numeric) #or
-    #  value.match(numeric_hex) or
-    #  value.match(numeric_oct)
-    ))
-      return true
-    else
-      return false
-    end
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb
deleted file mode 100644
index f5bef0457f7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# is_string.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:is_string, :type => :rvalue, :doc => <<-EOS
-Returns true if the variable passed to this function is a string.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "is_string(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    type = arguments[0]
-
-    result = type.is_a?(String)
-
-    if result and (type == type.to_f.to_s or type == type.to_i.to_s) then
-      return false
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb
deleted file mode 100644
index 6c0a6ba026c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# join.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:join, :type => :rvalue, :doc => <<-EOS
-This function joins an array into a string using a separator.
-
-*Examples:*
-
-    join(['a','b','c'], ",")
-
-Would result in: "a,b,c"
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "join(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'join(): Requires array to work with')
-    end
-
-    suffix = arguments[1] if arguments[1]
-
-    if suffix
-      unless suffix.is_a?(String)
-        raise(Puppet::ParseError, 'join(): Requires string to work with')
-      end
-    end
-
-    result = suffix ? array.join(suffix) : array.join
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
deleted file mode 100644
index e9924fe2e63..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# join.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:join_keys_to_values, :type => :rvalue, :doc => <<-EOS
-This function joins each key of a hash to that key's corresponding value with a
-separator. Keys and values are cast to strings. The return value is an array in
-which each element is one joined key/value pair.
-
-*Examples:*
-
-    join_keys_to_values({'a'=>1,'b'=>2}, " is ")
-
-Would result in: ["a is 1","b is 2"]
-    EOS
-  ) do |arguments|
-
-    # Validate the number of arguments.
-    if arguments.size != 2
-      raise(Puppet::ParseError, "join_keys_to_values(): Takes exactly two " +
-            "arguments, but #{arguments.size} given.")
-    end
-
-    # Validate the first argument.
-    hash = arguments[0]
-    if not hash.is_a?(Hash)
-      raise(TypeError, "join_keys_to_values(): The first argument must be a " +
-            "hash, but a #{hash.class} was given.")
-    end
-
-    # Validate the second argument.
-    separator = arguments[1]
-    if not separator.is_a?(String)
-      raise(TypeError, "join_keys_to_values(): The second argument must be a " +
-            "string, but a #{separator.class} was given.")
-    end
-
-    # Join the keys to their values.
-    hash.map do |k,v|
-      String(k) + separator + String(v)
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb
deleted file mode 100644
index f0d13b64760..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# keys.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:keys, :type => :rvalue, :doc => <<-EOS
-Returns the keys of a hash as an array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "keys(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    hash = arguments[0]
-
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'keys(): Requires hash to work with')
-    end
-
-    result = hash.keys
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb
deleted file mode 100644
index 10c400501be..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:loadyaml, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Load a YAML file containing an array, string, or hash, and return the data
-    in the corresponding native data type.
-
-    For example:
-
-        $myhash = loadyaml('/etc/puppet/data/myhash.yaml')
-    ENDHEREDOC
-
-    unless args.length == 1
-      raise Puppet::ParseError, ("loadyaml(): wrong number of arguments (#{args.length}; must be 1)")
-    end
-
-    YAML.load_file(args[0])
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb
deleted file mode 100644
index 3a64de33766..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-#  lstrip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:lstrip, :type => :rvalue, :doc => <<-EOS
-Strips leading spaces to the left of a string.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "lstrip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'lstrip(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.lstrip : i }
-    else
-      result = value.lstrip
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb
deleted file mode 100644
index 60fb94ac041..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/max.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:max, :type => :rvalue, :doc => <<-EOS
-    Returns the highest value of all arguments.
-    Requires at least one argument.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "max(): Wrong number of arguments " +
-          "need at least one") if args.size == 0
-
-    # Sometimes we get numbers as numerics and sometimes as strings.
-    # We try to compare them as numbers when possible
-    return args.max do |a,b|
-      if a.to_s =~ /\A-?\d+(.\d+)?\z/ and b.to_s =~ /\A-?\d+(.\d+)?\z/ then
-        a.to_f <=> b.to_f
-      else
-        a.to_s <=> b.to_s
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb
deleted file mode 100644
index 43d76affd9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/member.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# member.rb
-#
-
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-# TODO(Krzysztof Wilczynski): Support for strings and hashes too ...
-
-module Puppet::Parser::Functions
-  newfunction(:member, :type => :rvalue, :doc => <<-EOS
-This function determines if a variable is a member of an array.
-
-*Examples:*
-
-    member(['a','b'], 'b')
-
-Would return: true
-
-    member(['a','b'], 'c')
-
-Would return: false
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "member(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'member(): Requires array to work with')
-    end
-
-    item = arguments[1]
-
-    raise(Puppet::ParseError, 'member(): You must provide item ' +
-      'to search for within array given') if item.empty?
-
-    result = array.include?(item)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb
deleted file mode 100644
index 1b39f20600f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:merge, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
-    Merges two or more hashes together and returns the resulting hash.
-
-    For example:
-
-        $hash1 = {'one' => 1, 'two', => 2}
-        $hash2 = {'two' => 'dos', 'three', => 'tres'}
-        $merged_hash = merge($hash1, $hash2)
-        # The resulting hash is equivalent to:
-        # $merged_hash =  {'one' => 1, 'two' => 'dos', 'three' => 'tres'}
-
-    When there is a duplicate key, the key in the rightmost hash will "win."
-
-    ENDHEREDOC
-
-    if args.length < 2
-      raise Puppet::ParseError, ("merge(): wrong number of arguments (#{args.length}; must be at least 2)")
-    end
-
-    # The hash we accumulate into
-    accumulator = Hash.new
-    # Merge into the accumulator hash
-    args.each do |arg|
-      next if arg.is_a? String and arg.empty? # empty string is synonym for puppet's undef
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, "merge: unexpected argument type #{arg.class}, only expects hash arguments"
-      end
-      accumulator.merge!(arg)
-    end
-    # Return the fully merged hash
-    accumulator
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb
deleted file mode 100644
index 6bd6ebf20cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/min.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:min, :type => :rvalue, :doc => <<-EOS
-    Returns the lowest value of all arguments.
-    Requires at least one argument.
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "min(): Wrong number of arguments " +
-          "need at least one") if args.size == 0
-
-    # Sometimes we get numbers as numerics and sometimes as strings.
-    # We try to compare them as numbers when possible
-    return args.min do |a,b|
-      if a.to_s =~ /\A^-?\d+(.\d+)?\z/ and b.to_s =~ /\A-?\d+(.\d+)?\z/ then
-        a.to_f <=> b.to_f
-      else
-        a.to_s <=> b.to_s
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb
deleted file mode 100644
index af0e6ed7895..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# num2bool.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:num2bool, :type => :rvalue, :doc => <<-EOS
-This function converts a number or a string representation of a number into a
-true boolean. Zero or anything non-numeric becomes false. Numbers higher then 0
-become true.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "num2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    number = arguments[0]
-
-    case number
-    when Numeric
-      # Yay, it's a number
-    when String
-      begin
-        number = Float(number)
-      rescue ArgumentError => ex
-        raise(Puppet::ParseError, "num2bool(): '#{number}' does not look like a number: #{ex.message}")
-      end
-    else
-      begin
-        number = number.to_s
-      rescue NoMethodError => ex
-        raise(Puppet::ParseError, "num2bool(): Unable to parse argument: #{ex.message}")
-      end
-    end
-
-    # Truncate Floats
-    number = number.to_i
-
-    # Return true for any positive number and false otherwise
-    return number > 0
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
deleted file mode 100644
index a9a16a4524b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# parsejson.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:parsejson, :type => :rvalue, :doc => <<-EOS
-This function accepts JSON as a string and converts into the correct Puppet
-structure.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "parsejson(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    json = arguments[0]
-
-    # PSON is natively available in puppet
-    PSON.load(json)
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
deleted file mode 100644
index 53d54faff74..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# parseyaml.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
-This function accepts YAML as a string and converts it into the correct
-Puppet structure.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "parseyaml(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    require 'yaml'
-
-    YAML::load(arguments[0])
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb
deleted file mode 100644
index fdd0aefd722..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:pick, :type => :rvalue, :doc => <<-EOS
-
-This function is similar to a coalesce function in SQL in that it will return
-the first value in a list of values that is not undefined or an empty string
-(two things in Puppet that will return a boolean false value). Typically,
-this function is used to check for a value in the Puppet Dashboard/Enterprise
-Console, and failover to a default value like the following:
-
-  $real_jenkins_version = pick($::jenkins_version, '1.449')
-
-The value of $real_jenkins_version will first look for a top-scope variable
-called 'jenkins_version' (note that parameters set in the Puppet Dashboard/
-Enterprise Console are brought into Puppet as top-scope variables), and,
-failing that, will use a default value of 1.449.
-
-EOS
-) do |args|
-   args = args.compact
-   args.delete(:undef)
-   args.delete(:undefined)
-   args.delete("")
-   if args[0].to_s.empty? then
-     fail Puppet::ParseError, "pick(): must receive at least one non empty value"
-   else
-     return args[0]
-   end
- end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb
deleted file mode 100644
index 36e33abfa9a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/pick_default.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:pick_default, :type => :rvalue, :doc => <<-EOS
-
-This function is similar to a coalesce function in SQL in that it will return
-the first value in a list of values that is not undefined or an empty string
-(two things in Puppet that will return a boolean false value). If no value is
-found, it will return the last argument.
-
-Typically, this function is used to check for a value in the Puppet
-Dashboard/Enterprise Console, and failover to a default value like the
-following:
-
-  $real_jenkins_version = pick_default($::jenkins_version, '1.449')
-
-The value of $real_jenkins_version will first look for a top-scope variable
-called 'jenkins_version' (note that parameters set in the Puppet Dashboard/
-Enterprise Console are brought into Puppet as top-scope variables), and,
-failing that, will use a default value of 1.449.
-
-Note that, contrary to the pick() function, the pick_default does not fail if
-all arguments are empty. This allows pick_default to use an empty value as
-default.
-
-EOS
-) do |args|
-   fail "Must receive at least one argument." if args.empty?
-   default = args.last
-   args = args[0..-2].compact
-   args.delete(:undef)
-   args.delete(:undefined)
-   args.delete("")
-   args << default
-   return args[0]
- end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb
deleted file mode 100644
index d02286afac3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# prefix.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:prefix, :type => :rvalue, :doc => <<-EOS
-This function applies a prefix to all elements in an array.
-
-*Examples:*
-
-    prefix(['a','b','c'], 'p')
-
-Will return: ['pa','pb','pc']
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "prefix(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise Puppet::ParseError, "prefix(): expected first argument to be an Array, got #{array.inspect}"
-    end
-
-    prefix = arguments[1] if arguments[1]
-
-    if prefix
-      unless prefix.is_a?(String)
-        raise Puppet::ParseError, "prefix(): expected second argument to be a String, got #{prefix.inspect}"
-      end
-    end
-
-    # Turn everything into string same as join would do ...
-    result = array.collect do |i|
-      i = i.to_s
-      prefix ? prefix + i : i
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb
deleted file mode 100644
index ffbdf84630d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/range.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# range.rb
-#
-
-# TODO(Krzysztof Wilczynski): We probably need to approach numeric values differently ...
-
-module Puppet::Parser::Functions
-  newfunction(:range, :type => :rvalue, :doc => <<-EOS
-When given range in the form of (start, stop) it will extrapolate a range as
-an array.
-
-*Examples:*
-
-    range("0", "9")
-
-Will return: [0,1,2,3,4,5,6,7,8,9]
-
-    range("00", "09")
-
-Will return: [0,1,2,3,4,5,6,7,8,9] (Zero padded strings are converted to
-integers automatically)
-
-    range("a", "c")
-
-Will return: ["a","b","c"]
-
-    range("host01", "host10")
-
-Will return: ["host01", "host02", ..., "host09", "host10"]
-
-Passing a third argument will cause the generated range to step by that
-interval, e.g.
-
-    range("0", "9", "2")
-
-Will return: [0,2,4,6,8]
-    EOS
-  ) do |arguments|
-
-    # We support more than one argument but at least one is mandatory ...
-    raise(Puppet::ParseError, "range(): Wrong number of " +
-      "arguments given (#{arguments.size} for 1)") if arguments.size < 1
-
-    if arguments.size > 1
-      start = arguments[0]
-      stop  = arguments[1]
-      step  = arguments[2].nil? ? 1 : arguments[2].to_i.abs
-
-      type = '..' # We select simplest type for Range available in Ruby ...
-
-    elsif arguments.size > 0
-      value = arguments[0]
-
-      if m = value.match(/^(\w+)(\.\.\.?|\-)(\w+)$/)
-        start = m[1]
-        stop  = m[3]
-
-        type = m[2]
-
-      elsif value.match(/^.+$/)
-        raise(Puppet::ParseError, 'range(): Unable to compute range ' +
-          'from the value given')
-      else
-        raise(Puppet::ParseError, 'range(): Unknown format of range given')
-      end
-    end
-
-      # Check whether we have integer value if so then make it so ...
-      if start.match(/^\d+$/)
-        start = start.to_i
-        stop  = stop.to_i
-      else
-        start = start.to_s
-        stop  = stop.to_s
-      end
-
-      range = case type
-        when /^(\.\.|\-)$/ then (start .. stop)
-        when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
-      end
-
-      result = range.step(step).collect { |i| i } # Get them all ... Pokemon ...
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb
deleted file mode 100644
index 1953ffcf118..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# reject.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:reject, :type => :rvalue, :doc => <<-EOS) do |args|
-This function searches through an array and rejects all elements that match
-the provided regular expression.
-
-*Examples:*
-
-    reject(['aaa','bbb','ccc','aaaddd'], 'aaa')
-
-Would return:
-
-    ['bbb','ccc']
-EOS
-
-    if (args.size != 2)
-      raise Puppet::ParseError,
-        "reject(): Wrong number of arguments given #{args.size} for 2"
-    end
-
-    ary = args[0]
-    pattern = Regexp.new(args[1])
-
-    ary.reject { |e| e =~ pattern }
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb
deleted file mode 100644
index fe048690cdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# reverse.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:reverse, :type => :rvalue, :doc => <<-EOS
-Reverses the order of a string or array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "reverse(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'reverse(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.reverse
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
deleted file mode 100644
index 29b0998205f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  rstrip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:rstrip, :type => :rvalue, :doc => <<-EOS
-Strips leading spaces to the right of the string.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "rstrip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'rstrip(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      result = value.collect { |i| i.is_a?(String) ? i.rstrip : i }
-    else
-      result = value.rstrip
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb
deleted file mode 100644
index 18134ab633e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# shuffle.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:shuffle, :type => :rvalue, :doc => <<-EOS
-Randomizes the order of a string or array elements.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "shuffle(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'shuffle(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.clone
-
-    string = value.is_a?(String) ? true : false
-
-    # Check whether it makes sense to shuffle ...
-    return result if result.size <= 1
-
-    # We turn any string value into an array to be able to shuffle ...
-    result = string ? result.split('') : result
-
-    elements = result.size
-
-    # Simple implementation of Fisher–Yates in-place shuffle ...
-    elements.times do |i|
-      j = rand(elements - i) + i
-      result[j], result[i] = result[i], result[j]
-    end
-
-    result = string ? result.join : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb
deleted file mode 100644
index cc207e3fadc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/size.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# size.rb
-#
-
-# TODO(Krzysztof Wilczynski): Support for hashes would be nice too ...
-
-module Puppet::Parser::Functions
-  newfunction(:size, :type => :rvalue, :doc => <<-EOS
-Returns the number of elements in a string or array.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "size(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    item = arguments[0]
-
-    if item.is_a?(String)
-
-      begin
-        #
-        # Check whether your item is a numeric value or not ...
-        # This will take care about positive and/or negative numbers
-        # for both integer and floating-point values ...
-        #
-        # Please note that Puppet has no notion of hexadecimal
-        # nor octal numbers for its DSL at this point in time ...
-        #
-        Float(item)
-
-        raise(Puppet::ParseError, 'size(): Requires either ' +
-          'string or array to work with')
-
-      rescue ArgumentError
-        result = item.size
-      end
-
-    elsif item.is_a?(Array)
-      result = item.size
-    else
-      raise(Puppet::ParseError, 'size(): Unknown type given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb
deleted file mode 100644
index cefbe5463b4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# sort.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:sort, :type => :rvalue, :doc => <<-EOS
-Sorts strings and arrays lexically.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "sort(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
-
-    value = arguments[0]
-
-    if value.is_a?(Array) then
-      value.sort
-    elsif value.is_a?(String) then
-      value.split("").sort.join("")
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
deleted file mode 100644
index 81fadfdb2f0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# squeeze.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:squeeze, :type => :rvalue, :doc => <<-EOS
-Returns a new string where runs of the same character that occur in this set are replaced by a single character.
-    EOS
-  ) do |arguments|
-
-    if ((arguments.size != 2) and (arguments.size != 1)) then
-      raise(Puppet::ParseError, "squeeze(): Wrong number of arguments "+
-        "given #{arguments.size} for 2 or 1")
-    end
-
-    item = arguments[0]
-    squeezeval = arguments[1]
-
-    if item.is_a?(Array) then
-      if squeezeval then
-        item.collect { |i| i.squeeze(squeezeval) }
-      else
-        item.collect { |i| i.squeeze }
-      end
-    else
-      if squeezeval then
-        item.squeeze(squeezeval)
-      else
-        item.squeeze
-      end
-    end
-
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb
deleted file mode 100644
index 446732ece40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# str2bool.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:str2bool, :type => :rvalue, :doc => <<-EOS
-This converts a string to a boolean. This attempt to convert strings that
-contain things like: y, 1, t, true to 'true' and strings that contain things
-like: 0, f, n, false, no to 'false'.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "str2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    string = arguments[0]
-
-    # If string is already Boolean, return it
-    if !!string == string
-      return string
-    end
-
-    unless string.is_a?(String)
-      raise(Puppet::ParseError, 'str2bool(): Requires either ' +
-        'string to work with')
-    end
-
-    # We consider all the yes, no, y, n and so on too ...
-    result = case string
-      #
-      # This is how undef looks like in Puppet ...
-      # We yield false in this case.
-      #
-      when /^$/, '' then false # Empty string will be false ...
-      when /^(1|t|y|true|yes)$/  then true
-      when /^(0|f|n|false|no)$/  then false
-      when /^(undef|undefined)$/ then false # This is not likely to happen ...
-      else
-        raise(Puppet::ParseError, 'str2bool(): Unknown type of boolean given')
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb
deleted file mode 100644
index 7fe7b0128ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# str2saltedsha512.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:str2saltedsha512, :type => :rvalue, :doc => <<-EOS
-This converts a string to a salted-SHA512 password hash (which is used for
-OS X versions >= 10.7). Given any simple string, you will get a hex version
-of a salted-SHA512 password hash that can be inserted into your Puppet
-manifests as a valid password attribute.
-    EOS
-  ) do |arguments|
-    require 'digest/sha2'
-
-    raise(Puppet::ParseError, "str2saltedsha512(): Wrong number of arguments " +
-      "passed (#{arguments.size} but we require 1)") if arguments.size != 1
-
-    password = arguments[0]
-
-    unless password.is_a?(String)
-      raise(Puppet::ParseError, 'str2saltedsha512(): Requires a ' +
-        "String argument, you passed: #{password.class}")
-    end
-
-    seedint    = rand(2**31 - 1)
-    seedstring = Array(seedint).pack("L")
-    saltedpass = Digest::SHA512.digest(seedstring + password)
-    (seedstring + saltedpass).unpack('H*')[0]
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb
deleted file mode 100644
index 0b52adecdbf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# strftime.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:strftime, :type => :rvalue, :doc => <<-EOS
-This function returns formatted time.
-
-*Examples:*
-
-To return the time since epoch:
-
-    strftime("%s")
-
-To return the date:
-
-    strftime("%Y-%m-%d")
-
-*Format meaning:*
-
-    %a - The abbreviated weekday name (``Sun'')
-    %A - The  full  weekday  name (``Sunday'')
-    %b - The abbreviated month name (``Jan'')
-    %B - The  full  month  name (``January'')
-    %c - The preferred local date and time representation
-    %C - Century (20 in 2009)
-    %d - Day of the month (01..31)
-    %D - Date (%m/%d/%y)
-    %e - Day of the month, blank-padded ( 1..31)
-    %F - Equivalent to %Y-%m-%d (the ISO 8601 date format)
-    %h - Equivalent to %b
-    %H - Hour of the day, 24-hour clock (00..23)
-    %I - Hour of the day, 12-hour clock (01..12)
-    %j - Day of the year (001..366)
-    %k - hour, 24-hour clock, blank-padded ( 0..23)
-    %l - hour, 12-hour clock, blank-padded ( 0..12)
-    %L - Millisecond of the second (000..999)
-    %m - Month of the year (01..12)
-    %M - Minute of the hour (00..59)
-    %n - Newline (\n)
-    %N - Fractional seconds digits, default is 9 digits (nanosecond)
-            %3N  millisecond (3 digits)
-            %6N  microsecond (6 digits)
-            %9N  nanosecond (9 digits)
-    %p - Meridian indicator (``AM''  or  ``PM'')
-    %P - Meridian indicator (``am''  or  ``pm'')
-    %r - time, 12-hour (same as %I:%M:%S %p)
-    %R - time, 24-hour (%H:%M)
-    %s - Number of seconds since 1970-01-01 00:00:00 UTC.
-    %S - Second of the minute (00..60)
-    %t - Tab character (\t)
-    %T - time, 24-hour (%H:%M:%S)
-    %u - Day of the week as a decimal, Monday being 1. (1..7)
-    %U - Week  number  of the current year,
-            starting with the first Sunday as the first
-            day of the first week (00..53)
-    %v - VMS date (%e-%b-%Y)
-    %V - Week number of year according to ISO 8601 (01..53)
-    %W - Week  number  of the current year,
-            starting with the first Monday as the first
-            day of the first week (00..53)
-    %w - Day of the week (Sunday is 0, 0..6)
-    %x - Preferred representation for the date alone, no time
-    %X - Preferred representation for the time alone, no date
-    %y - Year without a century (00..99)
-    %Y - Year with century
-    %z - Time zone as  hour offset from UTC (e.g. +0900)
-    %Z - Time zone name
-    %% - Literal ``%'' character
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "strftime(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    format = arguments[0]
-
-    raise(Puppet::ParseError, 'strftime(): You must provide ' +
-      'format for evaluation') if format.empty?
-
-    # The Time Zone argument is optional ...
-    time_zone = arguments[1] if arguments[1]
-
-    time = Time.new
-
-    # There is probably a better way to handle Time Zone ...
-    if time_zone and not time_zone.empty?
-      original_zone = ENV['TZ']
-
-      local_time = time.clone
-      local_time = local_time.utc
-
-      ENV['TZ'] = time_zone
-
-      time = local_time.localtime
-
-      ENV['TZ'] = original_zone
-    end
-
-    result = time.strftime(format)
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb
deleted file mode 100644
index 5f4630d7de9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  strip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:strip, :type => :rvalue, :doc => <<-EOS
-This function removes leading and trailing whitespace from a string or from
-every string inside an array.
-
-*Examples:*
-
-    strip("    aaa   ")
-
-Would result in: "aaa"
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "strip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'strip(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      result = value.collect { |i| i.is_a?(String) ? i.strip : i }
-    else
-      result = value.strip
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb
deleted file mode 100644
index f7792d6f7a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/suffix.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# suffix.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:suffix, :type => :rvalue, :doc => <<-EOS
-This function applies a suffix to all elements in an array.
-
-*Examples:*
-
-    suffix(['a','b','c'], 'p')
-
-Will return: ['ap','bp','cp']
-    EOS
-  ) do |arguments|
-
-    # Technically we support two arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "suffix(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    array = arguments[0]
-
-    unless array.is_a?(Array)
-      raise Puppet::ParseError, "suffix(): expected first argument to be an Array, got #{array.inspect}"
-    end
-
-    suffix = arguments[1] if arguments[1]
-
-    if suffix
-      unless suffix.is_a? String
-        raise Puppet::ParseError, "suffix(): expected second argument to be a String, got #{suffix.inspect}"
-      end
-    end
-
-    # Turn everything into string same as join would do ...
-    result = array.collect do |i|
-      i = i.to_s
-      suffix ? i + suffix : i
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb
deleted file mode 100644
index b9e66325338..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#  swapcase.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:swapcase, :type => :rvalue, :doc => <<-EOS
-This function will swap the existing case of a string.
-
-*Examples:*
-
-    swapcase("aBcD")
-
-Would result in: "AbCd"
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "swapcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'swapcase(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.swapcase : i }
-    else
-      result = value.swapcase
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb
deleted file mode 100644
index 0cddaf86b93..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/time.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# time.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:time, :type => :rvalue, :doc => <<-EOS
-This function will return the current time since epoch as an integer.
-
-*Examples:*
-
-    time()
-
-Will return something like: 1311972653
-    EOS
-  ) do |arguments|
-
-    # The Time Zone argument is optional ...
-    time_zone = arguments[0] if arguments[0]
-
-    if (arguments.size != 0) and (arguments.size != 1) then
-      raise(Puppet::ParseError, "time(): Wrong number of arguments "+
-        "given #{arguments.size} for 0 or 1")
-    end
-
-    time = Time.new
-
-    # There is probably a better way to handle Time Zone ...
-    if time_zone and not time_zone.empty?
-      original_zone = ENV['TZ']
-
-      local_time = time.clone
-      local_time = local_time.utc
-
-      ENV['TZ'] = time_zone
-
-      time = local_time.localtime
-
-      ENV['TZ'] = original_zone
-    end
-
-    # Calling Time#to_i on a receiver changes it.  Trust me I am the Doctor.
-    result = time.strftime('%s')
-    result = result.to_i
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
deleted file mode 100644
index 8ff73d10b41..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:to_bytes, :type => :rvalue, :doc => <<-EOS
-    Converts the argument into bytes, for example 4 kB becomes 4096.
-    Takes a single string value as an argument.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "to_bytes(): Wrong number of arguments " +
-          "given (#{arguments.size} for 1)") if arguments.size != 1
-
-    arg = arguments[0]
-
-    return arg if arg.is_a? Numeric
-
-    value,prefix = */([0-9.e+-]*)\s*([^bB]?)/.match(arg)[1,2]
-
-    value = value.to_f
-    case prefix
-    when '' then return value.to_i
-    when 'k' then return (value*(1<<10)).to_i
-    when 'M' then return (value*(1<<20)).to_i
-    when 'G' then return (value*(1<<30)).to_i
-    when 'T' then return (value*(1<<40)).to_i
-    when 'E' then return (value*(1<<50)).to_i
-    else raise Puppet::ParseError, "to_bytes(): Unknown prefix #{prefix}"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb
deleted file mode 100644
index 8d85f11585e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/type.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# type.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:type, :type => :rvalue, :doc => <<-EOS
-Returns the type when passed a variable. Type can be one of:
-
-* string
-* array
-* hash
-* float
-* integer
-* boolean
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "type(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-
-    klass = value.class
-
-    if not [TrueClass, FalseClass, Array, Bignum, Fixnum, Float, Hash, String].include?(klass)
-      raise(Puppet::ParseError, 'type(): Unknown type')
-    end
-
-    klass = klass.to_s # Ugly ...
-
-    # We note that Integer is the parent to Bignum and Fixnum ...
-    result = case klass
-      when /^(?:Big|Fix)num$/ then 'integer'
-      when /^(?:True|False)Class$/ then 'boolean'
-      else klass
-    end
-
-    if result == "String" then
-      if value == value.to_i.to_s then
-        result = "Integer"
-      elsif value == value.to_f.to_s then
-        result = "Float"
-      end
-    end
-
-    return result.downcase
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb
deleted file mode 100644
index c91bb805373..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/union.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# union.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:union, :type => :rvalue, :doc => <<-EOS
-This function returns a union of two arrays.
-
-*Examples:*
-
-    union(["a","b","c"],["b","c","d"])
-
-Would return: ["a","b","c","d"]
-    EOS
-  ) do |arguments|
-
-    # Two arguments are required
-    raise(Puppet::ParseError, "union(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
-
-    first = arguments[0]
-    second = arguments[1]
-
-    unless first.is_a?(Array) && second.is_a?(Array)
-      raise(Puppet::ParseError, 'union(): Requires 2 arrays')
-    end
-
-    result = first | second
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb
deleted file mode 100644
index 8844a741852..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# unique.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:unique, :type => :rvalue, :doc => <<-EOS
-This function will remove duplicates from strings and arrays.
-
-*Examples:*
-
-    unique("aabbcc")
-
-Will return:
-
-    abc
-
-You can also use this with arrays:
-
-    unique(["a","a","b","b","c","c"])
-
-This returns:
-
-    ["a","b","c"]
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "unique(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'unique(): Requires either ' +
-        'array or string to work with')
-    end
-
-    result = value.clone
-
-    string = value.is_a?(String) ? true : false
-
-    # We turn any string value into an array to be able to shuffle ...
-    result = string ? result.split('') : result
-    result = result.uniq # Remove duplicates ...
-    result = string ? result.join : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb
deleted file mode 100644
index fe6cadc3cce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# upcase.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:upcase, :type => :rvalue, :doc => <<-EOS
-Converts a string or an array of strings to uppercase.
-
-*Examples:*
-
-    upcase("abcd")
-
-Will return:
-
-    ASDF
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "upcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'upcase(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? i.upcase : i }
-    else
-      result = value.upcase
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
deleted file mode 100644
index 0d81de5d108..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/uriescape.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#  uriescape.rb
-#
-require 'uri'
-
-module Puppet::Parser::Functions
-  newfunction(:uriescape, :type => :rvalue, :doc => <<-EOS
-    Urlencodes a string or array of strings.
-    Requires either a single string or an array as an input.
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "uriescape(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    value = arguments[0]
-    klass = value.class
-
-    unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'uriescape(): Requires either ' +
-        'array or string to work with')
-    end
-
-    if value.is_a?(Array)
-      # Numbers in Puppet are often string-encoded which is troublesome ...
-      result = value.collect { |i| i.is_a?(String) ? URI.escape(i,unsafe) : i }
-    else
-      result = URI.escape(value)
-    end
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb
deleted file mode 100644
index fe279744ec6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_absolute_path.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:validate_absolute_path, :doc => <<-'ENDHEREDOC') do |args|
-    Validate the string represents an absolute path in the filesystem.  This function works
-    for windows and unix style paths.
-
-    The following values will pass:
-
-        $my_path = "C:/Program Files (x86)/Puppet Labs/Puppet"
-        validate_absolute_path($my_path)
-        $my_path2 = "/var/lib/puppet"
-        validate_absolute_path($my_path2)
-
-
-    The following values will fail, causing compilation to abort:
-
-        validate_absolute_path(true)
-        validate_absolute_path([ 'var/lib/puppet', '/var/foo' ])
-        validate_absolute_path([ '/var/lib/puppet', 'var/foo' ])
-        $undefined = undef
-        validate_absolute_path($undefined)
-
-    ENDHEREDOC
-
-    require 'puppet/util'
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_absolute_path(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      # This logic was borrowed from
-      # [lib/puppet/file_serving/base.rb](https://github.com/puppetlabs/puppet/blob/master/lib/puppet/file_serving/base.rb)
-
-      # Puppet 2.7 and beyond will have Puppet::Util.absolute_path?  Fall back to a back-ported implementation otherwise.
-      if Puppet::Util.respond_to?(:absolute_path?) then
-        unless Puppet::Util.absolute_path?(arg, :posix) or Puppet::Util.absolute_path?(arg, :windows)
-          raise Puppet::ParseError, ("#{arg.inspect} is not an absolute path.")
-        end
-      else
-        # This code back-ported from 2.7.x's lib/puppet/util.rb Puppet::Util.absolute_path?
-        # Determine in a platform-specific way whether a path is absolute. This
-        # defaults to the local platform if none is specified.
-        # Escape once for the string literal, and once for the regex.
-        slash = '[\\\\/]'
-        name = '[^\\\\/]+'
-        regexes = {
-          :windows => %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
-          :posix   => %r!^/!,
-        }
-
-        rval = (!!(arg =~ regexes[:posix])) || (!!(arg =~ regexes[:windows]))
-        rval or raise Puppet::ParseError, ("#{arg.inspect} is not an absolute path.")
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb
deleted file mode 100644
index 34b511825cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_array.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_array, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are array data structures. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $my_array = [ 'one', 'two' ]
-        validate_array($my_array)
-
-    The following values will fail, causing compilation to abort:
-
-        validate_array(true)
-        validate_array('some_string')
-        $undefined = undef
-        validate_array($undefined)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_array(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(Array)
-        raise Puppet::ParseError, ("#{arg.inspect} is not an Array.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb
deleted file mode 100644
index 154d66091cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_augeas.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:validate_augeas, :doc => <<-'ENDHEREDOC') do |args|
-    Perform validation of a string using an Augeas lens
-    The first argument of this function should be a string to
-    test, and the second argument should be the name of the Augeas lens to use.
-    If Augeas fails to parse the string with the lens, the compilation will
-    abort with a parse error.
-
-    A third argument can be specified, listing paths which should
-    not be found in the file. The `$file` variable points to the location
-    of the temporary file being tested in the Augeas tree.
-
-    For example, if you want to make sure your passwd content never contains
-    a user `foo`, you could write:
-
-        validate_augeas($passwdcontent, 'Passwd.lns', ['$file/foo'])
-
-    Or if you wanted to ensure that no users used the '/bin/barsh' shell,
-    you could use:
-
-        validate_augeas($passwdcontent, 'Passwd.lns', ['$file/*[shell="/bin/barsh"]']
-
-    If a fourth argument is specified, this will be the error message raised and
-    seen by the user.
-
-    A helpful error message can be returned like this:
-
-        validate_augeas($sudoerscontent, 'Sudoers.lns', [], 'Failed to validate sudoers content with Augeas')
-
-    ENDHEREDOC
-    unless Puppet.features.augeas?
-      raise Puppet::ParseError, ("validate_augeas(): this function requires the augeas feature. See http://projects.puppetlabs.com/projects/puppet/wiki/Puppet_Augeas#Pre-requisites for how to activate it.")
-    end
-
-    if (args.length < 2) or (args.length > 4) then
-      raise Puppet::ParseError, ("validate_augeas(): wrong number of arguments (#{args.length}; must be 2, 3, or 4)")
-    end
-
-    msg = args[3] || "validate_augeas(): Failed to validate content against #{args[1].inspect}"
-
-    require 'augeas'
-    aug = Augeas::open(nil, nil, Augeas::NO_MODL_AUTOLOAD)
-    begin
-      content = args[0]
-
-      # Test content in a temporary file
-      tmpfile = Tempfile.new("validate_augeas")
-      begin
-        tmpfile.write(content)
-      ensure
-        tmpfile.close
-      end
-
-      # Check for syntax
-      lens = args[1]
-      aug.transform(
-        :lens => lens,
-        :name => 'Validate_augeas',
-        :incl => tmpfile.path
-      )
-      aug.load!
-
-      unless aug.match("/augeas/files#{tmpfile.path}//error").empty?
-        error = aug.get("/augeas/files#{tmpfile.path}//error/message")
-        msg += " with error: #{error}"
-        raise Puppet::ParseError, (msg)
-      end
-
-      # Launch unit tests
-      tests = args[2] || []
-      aug.defvar('file', "/files#{tmpfile.path}")
-      tests.each do |t|
-        msg += " testing path #{t}"
-        raise Puppet::ParseError, (msg) unless aug.match(t).empty?
-      end
-    ensure
-      aug.close
-      tmpfile.unlink
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb
deleted file mode 100644
index 59a08056b09..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_bool.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_bool, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are either true or false. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $iamtrue = true
-        validate_bool(true)
-        validate_bool(true, true, false, $iamtrue)
-
-    The following values will fail, causing compilation to abort:
-
-        $some_array = [ true ]
-        validate_bool("false")
-        validate_bool("true")
-        validate_bool($some_array)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_bool(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless function_is_bool([arg])
-        raise Puppet::ParseError, ("#{arg.inspect} is not a boolean.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb
deleted file mode 100644
index 2ebe91cf78e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_cmd.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'puppet/util/execution'
-
-module Puppet::Parser::Functions
-  newfunction(:validate_cmd, :doc => <<-'ENDHEREDOC') do |args|
-    Perform validation of a string with an external command.
-    The first argument of this function should be a string to
-    test, and the second argument should be a path to a test command
-    taking a file as last argument. If the command, launched against
-    a tempfile containing the passed string, returns a non-null value,
-    compilation will abort with a parse error.
-
-    If a third argument is specified, this will be the error message raised and
-    seen by the user.
-
-    A helpful error message can be returned like this:
-
-    Example:
-
-        validate_cmd($sudoerscontent, '/usr/sbin/visudo -c -f', 'Visudo failed to validate sudoers content')
-
-    ENDHEREDOC
-    if (args.length < 2) or (args.length > 3) then
-      raise Puppet::ParseError, ("validate_cmd(): wrong number of arguments (#{args.length}; must be 2 or 3)")
-    end
-
-    msg = args[2] || "validate_cmd(): failed to validate content with command #{args[1].inspect}"
-
-    content = args[0]
-    checkscript = args[1]
-
-    # Test content in a temporary file
-    tmpfile = Tempfile.new("validate_cmd")
-    begin
-      tmpfile.write(content)
-      tmpfile.close
-      if Puppet::Util::Execution.respond_to?('execute')
-        Puppet::Util::Execution.execute("#{checkscript} #{tmpfile.path}")
-      else
-        Puppet::Util.execute("#{checkscript} #{tmpfile.path}")
-      end
-    rescue Puppet::ExecutionFailure => detail
-      msg += "\n#{detail}"
-      raise Puppet::ParseError, msg
-    ensure
-      tmpfile.unlink
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb
deleted file mode 100644
index 9bdd543283d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_hash.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_hash, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are hash data structures. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $my_hash = { 'one' => 'two' }
-        validate_hash($my_hash)
-
-    The following values will fail, causing compilation to abort:
-
-        validate_hash(true)
-        validate_hash('some_string')
-        $undefined = undef
-        validate_hash($undefined)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_hash(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(Hash)
-        raise Puppet::ParseError, ("#{arg.inspect} is not a Hash.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
deleted file mode 100644
index fc02748e816..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv4_address.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_ipv4_address, :doc => <<-ENDHEREDOC
-    Validate that all values passed are valid IPv4 addresses.
-    Fail compilation if any value fails this check.
-
-    The following values will pass:
-
-    $my_ip = "1.2.3.4"
-    validate_ipv4_address($my_ip)
-    validate_bool("8.8.8.8", "172.16.0.1", $my_ip)
-
-    The following values will fail, causing compilation to abort:
-
-    $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ]
-    validate_ipv4_address($some_array)
-
-    ENDHEREDOC
-  ) do |args|
-
-    require "ipaddr"
-    rescuable_exceptions = [ ArgumentError ]
-
-    if defined?(IPAddr::InvalidAddressError)
-      rescuable_exceptions << IPAddr::InvalidAddressError
-    end
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_ipv4_address(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(String)
-        raise Puppet::ParseError, "#{arg.inspect} is not a string."
-      end
-
-      begin
-        unless IPAddr.new(arg).ipv4?
-          raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address."
-        end
-      rescue *rescuable_exceptions
-        raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address."
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb
deleted file mode 100644
index b0f2558df77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_ipv6_address.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_ipv6_address, :doc => <<-ENDHEREDOC
-    Validate that all values passed are valid IPv6 addresses.
-    Fail compilation if any value fails this check.
-
-    The following values will pass:
-
-    $my_ip = "3ffe:505:2"
-    validate_ipv6_address(1)
-    validate_ipv6_address($my_ip)
-    validate_bool("fe80::baf6:b1ff:fe19:7507", $my_ip)
-
-    The following values will fail, causing compilation to abort:
-
-    $some_array = [ true, false, "garbage string", "1.2.3.4" ]
-    validate_ipv6_address($some_array)
-
-    ENDHEREDOC
-  ) do |args|
-
-    require "ipaddr"
-    rescuable_exceptions = [ ArgumentError ]
-
-    if defined?(IPAddr::InvalidAddressError)
-      rescuable_exceptions << IPAddr::InvalidAddressError
-    end
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_ipv6_address(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(String)
-        raise Puppet::ParseError, "#{arg.inspect} is not a string."
-      end
-
-      begin
-        unless IPAddr.new(arg).ipv6?
-          raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv6 address."
-        end
-      rescue *rescuable_exceptions
-        raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv6 address."
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb
deleted file mode 100644
index ca25a702c58..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_re.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Puppet::Parser::Functions
-  newfunction(:validate_re, :doc => <<-'ENDHEREDOC') do |args|
-    Perform simple validation of a string against one or more regular
-    expressions. The first argument of this function should be a string to
-    test, and the second argument should be a stringified regular expression
-    (without the // delimiters) or an array of regular expressions.  If none
-    of the regular expressions match the string passed in, compilation will
-    abort with a parse error.
-
-    If a third argument is specified, this will be the error message raised and
-    seen by the user.
-
-    The following strings will validate against the regular expressions:
-
-        validate_re('one', '^one$')
-        validate_re('one', [ '^one', '^two' ])
-
-    The following strings will fail to validate, causing compilation to abort:
-
-        validate_re('one', [ '^two', '^three' ])
-
-    A helpful error message can be returned like this:
-
-        validate_re($::puppetversion, '^2.7', 'The $puppetversion fact value does not match 2.7')
-
-    ENDHEREDOC
-    if (args.length < 2) or (args.length > 3) then
-      raise Puppet::ParseError, ("validate_re(): wrong number of arguments (#{args.length}; must be 2 or 3)")
-    end
-
-    msg = args[2] || "validate_re(): #{args[0].inspect} does not match #{args[1].inspect}"
-
-    # We're using a flattened array here because we can't call String#any? in
-    # Ruby 1.9 like we can in Ruby 1.8
-    raise Puppet::ParseError, (msg) unless [args[1]].flatten.any? do |re_str|
-      args[0] =~ Regexp.compile(re_str)
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb
deleted file mode 100644
index 7d534f3703e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_slength.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_slength, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that the first argument is a string (or an array of strings), and
-    less/equal to than the length of the second argument. An optional third
-    parameter can be given a the minimum length. It fails if the first
-    argument is not a string or array of strings, and if arg 2 and arg 3 are
-    not convertable to a number.
-
-    The following values will pass:
-
-      validate_slength("discombobulate",17)
-      validate_slength(["discombobulate","moo"],17)
-      validate_slength(["discombobulate","moo"],17,3)
-
-    The following valueis will not:
-
-      validate_slength("discombobulate",1)
-      validate_slength(["discombobulate","thermometer"],5)
-      validate_slength(["discombobulate","moo"],17,10)
-
-    ENDHEREDOC
-
-    raise Puppet::ParseError, "validate_slength(): Wrong number of arguments (#{args.length}; must be 2 or 3)" unless args.length == 2 or args.length == 3
-
-    input, max_length, min_length = *args
-
-    begin
-      max_length = Integer(max_length)
-      raise ArgumentError if max_length <= 0
-    rescue ArgumentError, TypeError
-      raise Puppet::ParseError, "validate_slength(): Expected second argument to be a positive Numeric, got #{max_length}:#{max_length.class}"
-    end
-
-    if min_length
-      begin
-        min_length = Integer(min_length)
-        raise ArgumentError if min_length < 0
-    rescue ArgumentError, TypeError
-        raise Puppet::ParseError, "validate_slength(): Expected third argument to be unset or a positive Numeric, got #{min_length}:#{min_length.class}"
-      end
-    else
-      min_length = 0
-    end
-
-    if min_length > max_length
-      raise Puppet::ParseError, "validate_slength(): Expected second argument to be larger than third argument"
-    end
-
-    validator = lambda do |str|
-      unless str.length <= max_length and str.length >= min_length
-        raise Puppet::ParseError, "validate_slength(): Expected length of #{input.inspect} to be between #{min_length} and #{max_length}, was #{input.length}"
-      end
-    end
-
-    case input
-    when String
-      validator.call(input)
-    when Array
-      input.each_with_index do |arg, pos|
-        if arg.is_a? String
-          validator.call(arg)
-        else
-          raise Puppet::ParseError, "validate_slength(): Expected element at array position #{pos} to be a String, got #{arg.class}"
-        end
-      end
-    else
-      raise Puppet::ParseError, "validate_slength(): Expected first argument to be a String or Array, got #{input.class}"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb
deleted file mode 100644
index e667794a679..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/validate_string.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Puppet::Parser::Functions
-
-  newfunction(:validate_string, :doc => <<-'ENDHEREDOC') do |args|
-    Validate that all passed values are string data structures. Abort catalog
-    compilation if any value fails this check.
-
-    The following values will pass:
-
-        $my_string = "one two"
-        validate_string($my_string, 'three')
-
-    The following values will fail, causing compilation to abort:
-
-        validate_string(true)
-        validate_string([ 'some', 'array' ])
-        $undefined = undef
-        validate_string($undefined)
-
-    ENDHEREDOC
-
-    unless args.length > 0 then
-      raise Puppet::ParseError, ("validate_string(): wrong number of arguments (#{args.length}; must be > 0)")
-    end
-
-    args.each do |arg|
-      unless arg.is_a?(String)
-        raise Puppet::ParseError, ("#{arg.inspect} is not a string.  It looks to be a #{arg.class}")
-      end
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb
deleted file mode 100644
index 16067561b40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# values.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:values, :type => :rvalue, :doc => <<-EOS
-When given a hash this function will return the values of that hash.
-
-*Examples:*
-
-    $hash = {
-      'a' => 1,
-      'b' => 2,
-      'c' => 3,
-    }
-    values($hash)
-
-This example would return:
-
-    [1,2,3]
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "values(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
-    hash = arguments[0]
-
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'values(): Requires hash to work with')
-    end
-
-    result = hash.values
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb
deleted file mode 100644
index d3e69d97fc1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/values_at.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# values_at.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:values_at, :type => :rvalue, :doc => <<-EOS
-Finds value inside an array based on location.
-
-The first argument is the array you want to analyze, and the second element can
-be a combination of:
-
-* A single numeric index
-* A range in the form of 'start-stop' (eg. 4-9)
-* An array combining the above
-
-*Examples*:
-
-    values_at(['a','b','c'], 2)
-
-Would return ['c'].
-
-    values_at(['a','b','c'], ["0-1"])
-
-Would return ['a','b'].
-
-    values_at(['a','b','c','d','e'], [0, "2-3"])
-
-Would return ['a','c','d'].
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "values_at(): Wrong number of " +
-      "arguments given (#{arguments.size} for 2)") if arguments.size < 2
-
-    array = arguments.shift
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'values_at(): Requires array to work with')
-    end
-
-    indices = [arguments.shift].flatten() # Get them all ... Pokemon ...
-
-    if not indices or indices.empty?
-      raise(Puppet::ParseError, 'values_at(): You must provide ' +
-        'at least one positive index to collect')
-    end
-
-    result       = []
-    indices_list = []
-
-    indices.each do |i|
-      if m = i.match(/^(\d+)(\.\.\.?|\-)(\d+)$/)
-        start = m[1].to_i
-        stop  = m[3].to_i
-
-        type = m[2]
-
-        if start > stop
-          raise(Puppet::ParseError, 'values_at(): Stop index in ' +
-            'given indices range is smaller than the start index')
-        elsif stop > array.size - 1 # First element is at index 0 is it not?
-          raise(Puppet::ParseError, 'values_at(): Stop index in ' +
-            'given indices range exceeds array size')
-        end
-
-        range = case type
-          when /^(\.\.|\-)$/ then (start .. stop)
-          when /^(\.\.\.)$/  then (start ... stop) # Exclusive of last element ...
-        end
-
-        range.each { |i| indices_list << i.to_i }
-      else
-        # Only positive numbers allowed in this case ...
-        if not i.match(/^\d+$/)
-          raise(Puppet::ParseError, 'values_at(): Unknown format ' +
-            'of given index')
-        end
-
-        # In Puppet numbers are often string-encoded ...
-        i = i.to_i
-
-        if i > array.size - 1 # Same story.  First element is at index 0 ...
-          raise(Puppet::ParseError, 'values_at(): Given index ' +
-            'exceeds array size')
-        end
-
-        indices_list << i
-      end
-    end
-
-    # We remove nil values as they make no sense in Puppet DSL ...
-    result = indices_list.collect { |i| array[i] }.compact
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb
deleted file mode 100644
index 2b56e9ca070..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/parser/functions/zip.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# zip.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:zip, :type => :rvalue, :doc => <<-EOS
-Takes one element from first array and merges corresponding elements from second array. This generates a sequence of n-element arrays, where n is one more than the count of arguments.
-
-*Example:*
-
-    zip(['1','2','3'],['4','5','6'])
-
-Would result in:
-
-    ["1", "4"], ["2", "5"], ["3", "6"]
-    EOS
-  ) do |arguments|
-
-    # Technically we support three arguments but only first is mandatory ...
-    raise(Puppet::ParseError, "zip(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    a = arguments[0]
-    b = arguments[1]
-
-    unless a.is_a?(Array) and b.is_a?(Array)
-      raise(Puppet::ParseError, 'zip(): Requires array to work with')
-    end
-
-    flatten = arguments[2] if arguments[2]
-
-    if flatten
-      klass = flatten.class
-
-      # We can have either true or false, or string which resembles boolean ...
-      unless [FalseClass, TrueClass, String].include?(klass)
-        raise(Puppet::ParseError, 'zip(): Requires either ' +
-          'boolean or string to work with')
-      end
-
-      if flatten.is_a?(String)
-        # We consider all the yes, no, y, n and so on too ...
-        flatten = case flatten
-          #
-          # This is how undef looks like in Puppet ...
-          # We yield false in this case.
-          #
-          when /^$/, '' then false # Empty string will be false ...
-          when /^(1|t|y|true|yes)$/  then true
-          when /^(0|f|n|false|no)$/  then false
-          when /^(undef|undefined)$/ then false # This is not likely to happen ...
-          else
-            raise(Puppet::ParseError, 'zip(): Unknown type of boolean given')
-        end
-      end
-    end
-
-    result = a.zip(b)
-    result = flatten ? result.flatten : result
-
-    return result
-  end
-end
-
-# vim: set ts=2 sw=2 et :
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
deleted file mode 100644
index 94e7fac9196..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-Puppet::Type.type(:file_line).provide(:ruby) do
-  def exists?
-    lines.find do |line|
-      line.chomp == resource[:line].chomp
-    end
-  end
-
-  def create
-    if resource[:match]
-      handle_create_with_match
-    elsif resource[:after]
-      handle_create_with_after
-    else
-      append_line
-    end
-  end
-
-  def destroy
-    local_lines = lines
-    File.open(resource[:path],'w') do |fh|
-      fh.write(local_lines.reject{|l| l.chomp == resource[:line] }.join(''))
-    end
-  end
-
-  private
-  def lines
-    # If this type is ever used with very large files, we should
-    #  write this in a different way, using a temp
-    #  file; for now assuming that this type is only used on
-    #  small-ish config files that can fit into memory without
-    #  too much trouble.
-    @lines ||= File.readlines(resource[:path])
-  end
-
-  def handle_create_with_match()
-    regex = resource[:match] ? Regexp.new(resource[:match]) : nil
-    match_count = lines.select { |l| regex.match(l) }.size
-    if match_count > 1 && resource[:multiple].to_s != 'true'
-     raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
-    end
-    File.open(resource[:path], 'w') do |fh|
-      lines.each do |l|
-        fh.puts(regex.match(l) ? resource[:line] : l)
-      end
-
-      if (match_count == 0)
-        fh.puts(resource[:line])
-      end
-    end
-  end
-
-  def handle_create_with_after
-    regex = Regexp.new(resource[:after])
-
-    count = lines.count {|l| l.match(regex)}
-
-    case count
-    when 1 # find the line to put our line after
-      File.open(resource[:path], 'w') do |fh|
-        lines.each do |l|
-          fh.puts(l)
-          if regex.match(l) then
-            fh.puts(resource[:line])
-          end
-        end
-      end
-    when 0 # append the line to the end of the file
-      append_line
-    else
-      raise Puppet::Error, "#{count} lines match pattern '#{resource[:after]}' in file '#{resource[:path]}'.  One or no line must match the pattern."
-    end
-  end
-
-  ##
-  # append the line to the file.
-  #
-  # @api private
-  def append_line
-    File.open(resource[:path], 'a') do |fh|
-      fh.puts resource[:line]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb
deleted file mode 100644
index fe1e5aa1952..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/anchor.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-Puppet::Type.newtype(:anchor) do
-  desc <<-'ENDOFDESC'
-  A simple resource type intended to be used as an anchor in a composite class.
-
-  In Puppet 2.6, when a class declares another class, the resources in the
-  interior class are not contained by the exterior class. This interacts badly
-  with the pattern of composing complex modules from smaller classes, as it
-  makes it impossible for end users to specify order relationships between the
-  exterior class and other modules.
-
-  The anchor type lets you work around this. By sandwiching any interior
-  classes between two no-op resources that _are_ contained by the exterior
-  class, you can ensure that all resources in the module are contained.
-
-      class ntp {
-        # These classes will have the correct order relationship with each
-        # other. However, without anchors, they won't have any order
-        # relationship to Class['ntp'].
-        class { 'ntp::package': }
-        -> class { 'ntp::config': }
-        -> class { 'ntp::service': }
-
-        # These two resources "anchor" the composed classes within the ntp
-        # class.
-        anchor { 'ntp::begin': } -> Class['ntp::package']
-        Class['ntp::service']    -> anchor { 'ntp::end': }
-      }
-
-  This allows the end user of the ntp module to establish require and before
-  relationships with Class['ntp']:
-
-      class { 'ntp': } -> class { 'mcollective': }
-      class { 'mcollective': } -> class { 'ntp': }
-
-  ENDOFDESC
-
-  newparam :name do
-    desc "The name of the anchor resource."
-  end
-
-  def refresh
-    # We don't do anything with them, but we need this to
-    #   show that we are "refresh aware" and not break the
-    #   chain of propagation.
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb
deleted file mode 100644
index 323fc4c9c7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/lib/puppet/type/file_line.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-Puppet::Type.newtype(:file_line) do
-
-  desc <<-EOT
-    Ensures that a given line is contained within a file.  The implementation
-    matches the full line, including whitespace at the beginning and end.  If
-    the line is not contained in the given file, Puppet will add the line to
-    ensure the desired state.  Multiple resources may be declared to manage
-    multiple lines in the same file.
-
-    Example:
-
-        file_line { 'sudo_rule':
-          path => '/etc/sudoers',
-          line => '%sudo ALL=(ALL) ALL',
-        }
-        file_line { 'sudo_rule_nopw':
-          path => '/etc/sudoers',
-          line => '%sudonopw ALL=(ALL) NOPASSWD: ALL',
-        }
-
-    In this example, Puppet will ensure both of the specified lines are
-    contained in the file /etc/sudoers.
-
-  EOT
-
-  ensurable do
-    defaultvalues
-    defaultto :present
-  end
-
-  newparam(:name, :namevar => true) do
-    desc 'An arbitrary name used as the identity of the resource.'
-  end
-
-  newparam(:match) do
-    desc 'An optional regular expression to run against existing lines in the file;\n' +
-        'if a match is found, we replace that line rather than adding a new line.'
-  end
-
-  newparam(:multiple) do
-    desc 'An optional value to determine if match can change multiple lines.'
-    newvalues(true, false)
-  end
-
-  newparam(:after) do
-    desc 'An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)'
-  end
-
-  newparam(:line) do
-    desc 'The line to be appended to the file located by the path parameter.'
-  end
-
-  newparam(:path) do
-    desc 'The file Puppet will ensure contains the line specified by the line parameter.'
-    validate do |value|
-      unless (Puppet.features.posix? and value =~ /^\//) or (Puppet.features.microsoft_windows? and (value =~ /^.:\// or value =~ /^\/\/[^\/]+\/[^\/]+/))
-        raise(Puppet::Error, "File paths must be fully qualified, not '#{value}'")
-      end
-    end
-  end
-
-  # Autorequire the file resource if it's being managed
-  autorequire(:file) do
-    self[:path]
-  end
-
-  validate do
-    unless self[:line] and self[:path]
-      raise(Puppet::Error, "Both line and path are required attributes")
-    end
-
-    if (self[:match])
-      unless Regexp.new(self[:match]).match(self[:line])
-        raise(Puppet::Error, "When providing a 'match' parameter, the value must be a regex that matches against the value of your 'line' parameter")
-      end
-    end
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/init.pp
deleted file mode 100644
index 500ad770d53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/init.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Class: stdlib
-#
-# This module manages stdlib. Most of stdlib's features are automatically
-# loaded by Puppet, but this class should be declared in order to use the
-# standardized run stages.
-#
-# Parameters: none
-#
-# Actions:
-#
-#   Declares all other classes in the stdlib module. Currently, this consists
-#   of stdlib::stages.
-#
-# Requires: nothing
-#
-class stdlib {
-
-  class { 'stdlib::stages': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/stages.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/stages.pp
deleted file mode 100644
index eb15fd650d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/manifests/stages.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Class: stdlib::stages
-#
-# This class manages a standard set of run stages for Puppet. It is managed by
-# the stdlib class, and should not be declared independently.
-#
-# The high level stages are (in order):
-#
-#  * setup
-#  * main
-#  * runtime
-#  * setup_infra
-#  * deploy_infra
-#  * setup_app
-#  * deploy_app
-#  * deploy
-#
-# Parameters: none
-#
-# Actions:
-#
-#   Declares various run-stages for deploying infrastructure,
-#   language runtimes, and application layers.
-#
-# Requires: nothing
-#
-# Sample Usage:
-#
-#  node default {
-#    include stdlib
-#    class { java: stage => 'runtime' }
-#  }
-#
-class stdlib::stages {
-
-  stage { 'setup':  before => Stage['main'] }
-  stage { 'runtime': require => Stage['main'] }
-  -> stage { 'setup_infra': }
-  -> stage { 'deploy_infra': }
-  -> stage { 'setup_app': }
-  -> stage { 'deploy_app': }
-  -> stage { 'deploy': }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/metadata.json
deleted file mode 100644
index e3bacbe75f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/metadata.json
+++ /dev/null
@@ -1,509 +0,0 @@
-{
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "4",
-        "5",
-        "6"
-      ]
-    },
-    {
-      "operatingsystem": "SLES",
-      "operatingsystemrelease": [
-        "11 SP1"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "6",
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "10.04",
-        "12.04"
-      ]
-    },
-    {
-      "operatingsystem": "Solaris",
-      "operatingsystemrelease": [
-        "10",
-        "11"
-      ]
-    },
-    {
-      "operatingsystem": "Windows",
-      "operatingsystemrelease": [
-        "Server 2003",
-        "Server 2003 R2",
-        "Server 2008",
-        "Server 2008 R2",
-        "Server 2012",
-        "Server 2012 R2",
-        "7",
-        "8"
-      ]
-    },
-    {
-      "operatingsystem": "AIX",
-      "operatingsystemrelease": [
-        "5.3",
-        "6.1",
-        "7.1"
-      ]
-    }
-  ],
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "3.2.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": ">=2.7.20 <4.0.0"
-    }
-  ],
-  "name": "puppetlabs-stdlib",
-  "version": "4.2.1",
-  "source": "git://github.com/puppetlabs/puppetlabs-stdlib.git",
-  "author": "puppetlabs",
-  "license": "Apache 2.0",
-  "summary": "Puppet Module Standard Library",
-  "description": "Standard Library for Puppet Modules",
-  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
-  "dependencies": [
-
-  ],
-  "types": [
-    {
-      "name": "anchor",
-      "doc": "A simple resource type intended to be used as an anchor in a composite class.\n\nIn Puppet 2.6, when a class declares another class, the resources in the\ninterior class are not contained by the exterior class. This interacts badly\nwith the pattern of composing complex modules from smaller classes, as it\nmakes it impossible for end users to specify order relationships between the\nexterior class and other modules.\n\nThe anchor type lets you work around this. By sandwiching any interior\nclasses between two no-op resources that _are_ contained by the exterior\nclass, you can ensure that all resources in the module are contained.\n\n    class ntp {\n      # These classes will have the correct order relationship with each\n      # other. However, without anchors, they won't have any order\n      # relationship to Class['ntp'].\n      class { 'ntp::package': }\n      -> class { 'ntp::config': }\n      -> class { 'ntp::service': }\n\n      # These two resources \"anchor\" the composed classes within the ntp\n      # class.\n      anchor { 'ntp::begin': } -> Class['ntp::package']\n      Class['ntp::service']    -> anchor { 'ntp::end': }\n    }\n\nThis allows the end user of the ntp module to establish require and before\nrelationships with Class['ntp']:\n\n    class { 'ntp': } -> class { 'mcollective': }\n    class { 'mcollective': } -> class { 'ntp': }",
-      "properties": [
-
-      ],
-      "parameters": [
-        {
-          "name": "name",
-          "doc": "The name of the anchor resource.\n\n"
-        }
-      ]
-    },
-    {
-      "name": "file_line",
-      "doc": "Ensures that a given line is contained within a file.  The implementation\nmatches the full line, including whitespace at the beginning and end.  If\nthe line is not contained in the given file, Puppet will add the line to\nensure the desired state.  Multiple resources may be declared to manage\nmultiple lines in the same file.\n\nExample:\n\n    file_line { 'sudo_rule':\n      path => '/etc/sudoers',\n      line => '%sudo ALL=(ALL) ALL',\n    }\n    file_line { 'sudo_rule_nopw':\n      path => '/etc/sudoers',\n      line => '%sudonopw ALL=(ALL) NOPASSWD: ALL',\n    }\n\nIn this example, Puppet will ensure both of the specified lines are\ncontained in the file /etc/sudoers.",
-      "properties": [
-        {
-          "name": "ensure",
-          "doc": "The basic property that the resource should be in.\n\nValid values are `present`, `absent`. "
-        }
-      ],
-      "parameters": [
-        {
-          "name": "name",
-          "doc": "An arbitrary name used as the identity of the resource.\n\n"
-        },
-        {
-          "name": "match",
-          "doc": "An optional regular expression to run against existing lines in the file;\\nif a match is found, we replace that line rather than adding a new line.\n\n"
-        },
-        {
-          "name": "multiple",
-          "doc": "An optional value to determine if match can change multiple lines.\n\nValid values are `true`, `false`. "
-        },
-        {
-          "name": "after",
-          "doc": "An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)\n\n"
-        },
-        {
-          "name": "line",
-          "doc": "The line to be appended to the file located by the path parameter.\n\n"
-        },
-        {
-          "name": "path",
-          "doc": "The file Puppet will ensure contains the line specified by the line parameter.\n\n"
-        }
-      ],
-      "providers": [
-        {
-          "name": "ruby",
-          "doc": ""
-        }
-      ]
-    }
-  ],
-  "checksums": {
-    "CHANGELOG.md": "82acb10a79b6dba5b3a8d464e0c9fecf",
-    "CONTRIBUTING.md": "7fcaaec4913b3d7c123510329ecc4b2d",
-    "Gemfile": "38895f95212fe38cf47474a05cff2ad2",
-    "Gemfile.lock": "d30f1ca4792bd19fa9561557f4982a55",
-    "LICENSE": "38a048b9d82e713d4e1b2573e370a756",
-    "Modulefile": "9786075c3cc32e7ba85888727e37851f",
-    "README.markdown": "21410cab41d903b5c39c55739846b6b3",
-    "README_DEVELOPER.markdown": "220a8b28521b5c5d2ea87c4ddb511165",
-    "README_SPECS.markdown": "82bb4c6abbb711f40778b162ec0070c1",
-    "RELEASE_PROCESS.markdown": "94b92bc99ac4106ba1a74d5c04e520f9",
-    "Rakefile": "dfa334598bfd087adf11533a72d71106",
-    "lib/facter/facter_dot_d.rb": "1f1fcf1bde3443e42a445d3573602304",
-    "lib/facter/pe_version.rb": "4a9353952963b011759f3e6652a10da5",
-    "lib/facter/puppet_vardir.rb": "c7ddc97e8a84ded3dd93baa5b9b3283d",
-    "lib/facter/root_home.rb": "d9c8276acdceb7340d95f60c36dcdcc5",
-    "lib/facter/util/puppet_settings.rb": "9f1d2593d0ae56bfca89d4b9266aeee1",
-    "lib/puppet/parser/functions/abs.rb": "32161bd0435fdfc2aec2fc559d2b454b",
-    "lib/puppet/parser/functions/any2array.rb": "a81e71d6b67a551d38770ba9a1948a75",
-    "lib/puppet/parser/functions/base64.rb": "ae25adf92295df67ebd9edfabc9ecdd6",
-    "lib/puppet/parser/functions/bool2num.rb": "8e627eee990e811e35e7e838c586bd77",
-    "lib/puppet/parser/functions/capitalize.rb": "14481fc8c7c83fe002066ebcf6722f17",
-    "lib/puppet/parser/functions/chomp.rb": "719d46923d75251f7b6b68b6e015cccc",
-    "lib/puppet/parser/functions/chop.rb": "4691a56e6064b792ed4575e4ad3f3d20",
-    "lib/puppet/parser/functions/concat.rb": "c522e67e558336e1ac26b0a3cfeeed2d",
-    "lib/puppet/parser/functions/count.rb": "9eb74eccd93e2b3c87fd5ea14e329eba",
-    "lib/puppet/parser/functions/deep_merge.rb": "d83696855578fb81b64b9e92b9c7cc7c",
-    "lib/puppet/parser/functions/defined_with_params.rb": "ffab4433d03f32b551f2ea024a2948fc",
-    "lib/puppet/parser/functions/delete.rb": "96e569dac96b8c9387e9303445d73048",
-    "lib/puppet/parser/functions/delete_at.rb": "6bc24b79390d463d8be95396c963381a",
-    "lib/puppet/parser/functions/delete_undef_values.rb": "b32d4a3925753b2eb2c318cbd7f14404",
-    "lib/puppet/parser/functions/delete_values.rb": "39b147f7d369bb5f809044b6341954a2",
-    "lib/puppet/parser/functions/difference.rb": "e31b95fbaf974cf853a510177368bfb9",
-    "lib/puppet/parser/functions/dirname.rb": "bef7214eb89db3eb8f7ee5fc9dca0233",
-    "lib/puppet/parser/functions/downcase.rb": "9204a04c2a168375a38d502db8811bbe",
-    "lib/puppet/parser/functions/empty.rb": "ae92905c9d94ddca30bf56b7b1dabedf",
-    "lib/puppet/parser/functions/ensure_packages.rb": "fbed5c0c9bf82b7746e01f15f89d184f",
-    "lib/puppet/parser/functions/ensure_resource.rb": "6678127386e77bbc0f09db7b5a32ab6a",
-    "lib/puppet/parser/functions/flatten.rb": "25777b76f9719162a8bab640e5595b7a",
-    "lib/puppet/parser/functions/floor.rb": "42cad4c689231a51526c55a6f0985d1f",
-    "lib/puppet/parser/functions/fqdn_rotate.rb": "20743a138c56fc806a35cb7b60137dbc",
-    "lib/puppet/parser/functions/get_module_path.rb": "d4bf50da25c0b98d26b75354fa1bcc45",
-    "lib/puppet/parser/functions/getparam.rb": "4dd7a0e35f4a3780dcfc9b19b4e0006e",
-    "lib/puppet/parser/functions/getvar.rb": "10bf744212947bc6a7bfd2c9836dbd23",
-    "lib/puppet/parser/functions/grep.rb": "5682995af458b05f3b53dd794c4bf896",
-    "lib/puppet/parser/functions/has_interface_with.rb": "8d3ebca805dc6edb88b6b7a13d404787",
-    "lib/puppet/parser/functions/has_ip_address.rb": "ee207f47906455a5aa49c4fb219dd325",
-    "lib/puppet/parser/functions/has_ip_network.rb": "b4d726c8b2a0afac81ced8a3a28aa731",
-    "lib/puppet/parser/functions/has_key.rb": "7cd9728c38f0b0065f832dabd62b0e7e",
-    "lib/puppet/parser/functions/hash.rb": "9d072527dfc7354b69292e9302906530",
-    "lib/puppet/parser/functions/intersection.rb": "924ac4aceec7b896952166a7ec08fdb1",
-    "lib/puppet/parser/functions/is_array.rb": "875ca4356cb0d7a10606fb146b4a3d11",
-    "lib/puppet/parser/functions/is_bool.rb": "e693b7c4b5366cff1380b6e0c7dd7b11",
-    "lib/puppet/parser/functions/is_domain_name.rb": "cf72726c0fec831eb703ec9deea739eb",
-    "lib/puppet/parser/functions/is_float.rb": "10e0d3ecf75fac15e415aee79acf70dc",
-    "lib/puppet/parser/functions/is_function_available.rb": "628428bbcd9313ce09783d9484330e09",
-    "lib/puppet/parser/functions/is_hash.rb": "8c7d9a05084dab0389d1b779c8a05b1a",
-    "lib/puppet/parser/functions/is_integer.rb": "c665be82686aa4729959bb42c66a7510",
-    "lib/puppet/parser/functions/is_ip_address.rb": "a714a736c1560e8739aaacd9030cca00",
-    "lib/puppet/parser/functions/is_mac_address.rb": "288bd4b38d4df42a83681f13e7eaaee0",
-    "lib/puppet/parser/functions/is_numeric.rb": "93ddc9d4c0834a5e5e0562d7b3cdce91",
-    "lib/puppet/parser/functions/is_string.rb": "2bd9a652bbb2668323eee6c57729ff64",
-    "lib/puppet/parser/functions/join.rb": "a285a05c015ae278608f6454aef211ea",
-    "lib/puppet/parser/functions/join_keys_to_values.rb": "f29da49531228f6ca5b3aa0df00a14c2",
-    "lib/puppet/parser/functions/keys.rb": "eb6ac815ea14fbf423580ed903ef7bad",
-    "lib/puppet/parser/functions/loadyaml.rb": "2b912f257aa078e376d3b3f6a86c2a00",
-    "lib/puppet/parser/functions/lstrip.rb": "210b103f78622e099f91cc2956b6f741",
-    "lib/puppet/parser/functions/max.rb": "f652fd0b46ef7d2fbdb42b141f8fdd1d",
-    "lib/puppet/parser/functions/member.rb": "541e67d06bc4155e79b00843a125e9bc",
-    "lib/puppet/parser/functions/merge.rb": "f3dcc5c83440cdda2036cce69b61a14b",
-    "lib/puppet/parser/functions/min.rb": "0d2a1b7e735ab251c5469e735fa3f4c6",
-    "lib/puppet/parser/functions/num2bool.rb": "605c12fa518c87ed2c66ae153e0686ce",
-    "lib/puppet/parser/functions/parsejson.rb": "e7f968c34928107b84cd0860daf50ab1",
-    "lib/puppet/parser/functions/parseyaml.rb": "00f10ec1e2b050e23d80c256061ebdd7",
-    "lib/puppet/parser/functions/pick.rb": "bf01f13bbfe2318e7f6a302ac7c4433f",
-    "lib/puppet/parser/functions/pick_default.rb": "ad3ea60262de408767786d37a54d45dc",
-    "lib/puppet/parser/functions/prefix.rb": "aebbea0290be82a4ae89ddfffbee1125",
-    "lib/puppet/parser/functions/range.rb": "17a05dbae8f562f882450f9e648d4e2d",
-    "lib/puppet/parser/functions/reject.rb": "689f6a7c961a55fe9dcd240921f4c7f9",
-    "lib/puppet/parser/functions/reverse.rb": "1386371c0f5301055fdf99079e862b3e",
-    "lib/puppet/parser/functions/rstrip.rb": "8a0d69876bdbc88a2054ba41c9c38961",
-    "lib/puppet/parser/functions/shuffle.rb": "6445e6b4dc62c37b184a60eeaf34414b",
-    "lib/puppet/parser/functions/size.rb": "8972d48c0f9e487d659bd7326b40b642",
-    "lib/puppet/parser/functions/sort.rb": "504b033b438461ca4f9764feeb017833",
-    "lib/puppet/parser/functions/squeeze.rb": "541f85b4203b55c9931d3d6ecd5c75f8",
-    "lib/puppet/parser/functions/str2bool.rb": "6320f1a50fd28ec027981cd1fb8ffdd0",
-    "lib/puppet/parser/functions/str2saltedsha512.rb": "49afad7b386be38ce53deaefef326e85",
-    "lib/puppet/parser/functions/strftime.rb": "e02e01a598ca5d7d6eee0ba22440304a",
-    "lib/puppet/parser/functions/strip.rb": "273d547c7b05c0598556464dfd12f5fd",
-    "lib/puppet/parser/functions/suffix.rb": "109279db4180441e75545dbd5f273298",
-    "lib/puppet/parser/functions/swapcase.rb": "4902f38f0b9292afec66d40fee4b02ec",
-    "lib/puppet/parser/functions/time.rb": "08d88d52abd1e230e3a2f82107545d48",
-    "lib/puppet/parser/functions/to_bytes.rb": "83f23c33adbfa42b2a9d9fc2db3daeb4",
-    "lib/puppet/parser/functions/type.rb": "62f914d6c90662aaae40c5539701be60",
-    "lib/puppet/parser/functions/union.rb": "137998fe47decf25aede20f0c0155a4c",
-    "lib/puppet/parser/functions/unique.rb": "217ccce6d23235af92923f50f8556963",
-    "lib/puppet/parser/functions/upcase.rb": "a5744a74577cfa136fca2835e75888d3",
-    "lib/puppet/parser/functions/uriescape.rb": "321b8d2c33a5ea48337e1293774db4e0",
-    "lib/puppet/parser/functions/validate_absolute_path.rb": "385137ac24a2dec6cecc4e6ea75be442",
-    "lib/puppet/parser/functions/validate_array.rb": "72b29289b8af1cfc3662ef9be78911b8",
-    "lib/puppet/parser/functions/validate_augeas.rb": "d4acca7b8a9fdada9ae39e5101902cc1",
-    "lib/puppet/parser/functions/validate_bool.rb": "a712634a000024398b3c6cd4ecc46463",
-    "lib/puppet/parser/functions/validate_cmd.rb": "78fd21cb3fc52efc3b53ba2b3301de18",
-    "lib/puppet/parser/functions/validate_hash.rb": "e9cfaca68751524efe16ecf2f958a9a0",
-    "lib/puppet/parser/functions/validate_ipv4_address.rb": "a8fb6f0ca36aa460d462c07c2af5d5a2",
-    "lib/puppet/parser/functions/validate_ipv6_address.rb": "4699238e4cad60e7e1428905523eaeb7",
-    "lib/puppet/parser/functions/validate_re.rb": "c6664b3943bc820415a43f16372dc2a9",
-    "lib/puppet/parser/functions/validate_slength.rb": "7e67c213509b9383707819cc612b2a29",
-    "lib/puppet/parser/functions/validate_string.rb": "6afcbc51f83f0714348b8d61e06ea7eb",
-    "lib/puppet/parser/functions/values.rb": "066a6e4170e5034edb9a80463dff2bb5",
-    "lib/puppet/parser/functions/values_at.rb": "094ac110ce9f7a5b16d0c80a0cf2243c",
-    "lib/puppet/parser/functions/zip.rb": "a80782461ed9465f0cd0c010936f1855",
-    "lib/puppet/provider/file_line/ruby.rb": "10d65268d2d1e75b5dae014974b79d60",
-    "lib/puppet/type/anchor.rb": "bbd36bb49c3b554f8602d8d3df366c0c",
-    "lib/puppet/type/file_line.rb": "a1eceef6bd7cbfe99892cf3ee57ef2b4",
-    "manifests/init.pp": "f2ba5f36e7227ed87bbb69034fc0de8b",
-    "manifests/stages.pp": "cc6ed1751d334b0ea278c0335c7f0b5a",
-    "spec/acceptance/abs_spec.rb": "435478ef1ba43a6cca1f7b4db14a4bcc",
-    "spec/acceptance/any2array_spec.rb": "78187dc3683c8ecd15774d99024de47d",
-    "spec/acceptance/base64_spec.rb": "1684d5dd176dd5bbd4c3c6b1e64fbcea",
-    "spec/acceptance/bool2num_spec.rb": "c5e3aadb08a437f181247429f4125bab",
-    "spec/acceptance/build_csv.rb": "f28ef587de764ade1513091c4906412c",
-    "spec/acceptance/capitalize_spec.rb": "e77ea2c37144a75a67969c0d0839adfd",
-    "spec/acceptance/chomp_spec.rb": "fb0862a6b7eeb3c290e280788e705061",
-    "spec/acceptance/chop_spec.rb": "0bd1065b9c16a54b86adeb4e3be041fb",
-    "spec/acceptance/concat_spec.rb": "3a0dae19a34bb13d406c8e0ec87d8fe5",
-    "spec/acceptance/count_spec.rb": "5b35e597ae1051f41431812707d4b502",
-    "spec/acceptance/deep_merge_spec.rb": "c335a947f1666e185e0210e661f1c78a",
-    "spec/acceptance/defined_with_params_spec.rb": "f27c54ade9872c63c69316f62b03c119",
-    "spec/acceptance/delete_at_spec.rb": "9c028b703ee0286565c9877757678f3f",
-    "spec/acceptance/delete_spec.rb": "31e6dfcb9cc7c16b20d47c00e6a85a1d",
-    "spec/acceptance/delete_undef_values_spec.rb": "6e6a66aee0c383c843b5f92ef8c8410c",
-    "spec/acceptance/delete_values_spec.rb": "22c9b4914d4cbc0153aa3862cb4fb50e",
-    "spec/acceptance/difference_spec.rb": "289f4f1788feaacb304ffd54971c7e7e",
-    "spec/acceptance/dirname_spec.rb": "84db53878c4400a6c684c924cff05cfc",
-    "spec/acceptance/downcase_spec.rb": "0f094849b94a94df491ee01186473104",
-    "spec/acceptance/empty_spec.rb": "35c1f43e8a3e1fe7dd4335ef86e7efcc",
-    "spec/acceptance/ensure_packages_spec.rb": "ebeaa1624b30f5750cbfdcdce8690640",
-    "spec/acceptance/ensure_resource_spec.rb": "9e03216abb2431e749be76a4302931df",
-    "spec/acceptance/flatten_spec.rb": "83fb08cc168a105c1d5d0df66b1d9e84",
-    "spec/acceptance/floor_spec.rb": "d7267b2914b1da6406224abb7489ca86",
-    "spec/acceptance/fqdn_rotate_spec.rb": "bc3d0a01f91d2a85f3dbf53daf404fd1",
-    "spec/acceptance/get_module_path_spec.rb": "6a6552ff8d6d75ce795b0139c68a7993",
-    "spec/acceptance/getparam_spec.rb": "b62a47524f434b903f9e155ad56959b3",
-    "spec/acceptance/getvar_spec.rb": "ba2f081a88be97c0e7004a6296294f23",
-    "spec/acceptance/grep_spec.rb": "98818b8b0557b80d6ff519f70ea7617c",
-    "spec/acceptance/has_interface_with_spec.rb": "467183aeada0bec74143be6cf0b89a3d",
-    "spec/acceptance/has_ip_address_spec.rb": "e0369b12725695c528e2d47b8ea2b4d8",
-    "spec/acceptance/has_ip_network_spec.rb": "ca8dd6faa6df940784a60a49bec1330d",
-    "spec/acceptance/has_key_spec.rb": "6509a26a0886f7d591eaa926b2f92407",
-    "spec/acceptance/hash_spec.rb": "1c626457ba056bdd3936e28aa5bf503e",
-    "spec/acceptance/intersection_spec.rb": "40f586af7f95408a5d4a2882a4aa98f1",
-    "spec/acceptance/is_array_spec.rb": "c2ff70ce59b90b50a5aed67abaa5399d",
-    "spec/acceptance/is_bool_spec.rb": "c001fdecff6b0a3c9dc78774987a0b15",
-    "spec/acceptance/is_domain_name_spec.rb": "63e84285c26d8717fd5d4dda01e3f432",
-    "spec/acceptance/is_float_spec.rb": "2f0164b4d732166aa46055a2cf7b4ea9",
-    "spec/acceptance/is_function_available_spec.rb": "7745eba89f8719c9ca7ebf04d5b005f7",
-    "spec/acceptance/is_hash_spec.rb": "cff723cd8fddac45033af5dc8406d4e4",
-    "spec/acceptance/is_integer_spec.rb": "c09201d17d3914bba197872897fa3413",
-    "spec/acceptance/is_ip_address_spec.rb": "aa14cf9abf404c3fe1e761ea957871fe",
-    "spec/acceptance/is_mac_address_spec.rb": "30ff4c6a63be58daa3568305617ca2a7",
-    "spec/acceptance/is_numeric_spec.rb": "fb9829c7a1a8d4a58836df6ff4c3386d",
-    "spec/acceptance/is_string_spec.rb": "df3022de123b72f0022728eb2d8ce857",
-    "spec/acceptance/join_keys_to_values_spec.rb": "8aa128bbaeea65aab8d92badee3ca2b5",
-    "spec/acceptance/join_spec.rb": "c6378ed481265152bba9871fc5501ee6",
-    "spec/acceptance/keys_spec.rb": "20486e3ebee53e50dc9de3b78b9d6ae6",
-    "spec/acceptance/loadyaml_spec.rb": "5bce9c4b90e73bccdcd4f66fc988676b",
-    "spec/acceptance/lstrip_spec.rb": "e29ab4039b65660ec2bd76a298adcae0",
-    "spec/acceptance/max_spec.rb": "209cda4b83d677743afb1a8870330618",
-    "spec/acceptance/member_spec.rb": "0dac8ec7c7f670fca429fc26cf8ccc14",
-    "spec/acceptance/merge_spec.rb": "ac61d7627c66565a3a5cbfb2f9db21eb",
-    "spec/acceptance/min_spec.rb": "152a7db28434a0d0378561d4f64cddcc",
-    "spec/acceptance/nodesets/centos-6-vcloud.yml": "bdf9ce9d3b0f0b4995666ae9d64d878d",
-    "spec/acceptance/nodesets/centos-64-x64-pe.yml": "ec075d95760df3d4702abea1ce0a829b",
-    "spec/acceptance/nodesets/centos-64-x64.yml": "092dd2c588a9f87fa1fb12997c0723ef",
-    "spec/acceptance/nodesets/default.yml": "3e5c36e6aa5a690229e720f4048bb8af",
-    "spec/acceptance/nodesets/fedora-18-x64.yml": "80e41b1ee16ea489f53164bfdae58855",
-    "spec/acceptance/nodesets/sles-11-x64.yml": "44e4c6c15c018333bfa9840a5e702f66",
-    "spec/acceptance/nodesets/ubuntu-server-10044-x64.yml": "75e86400b7889888dc0781c0ae1a1297",
-    "spec/acceptance/nodesets/ubuntu-server-12042-x64.yml": "d30d73e34cd50b043c7d14e305955269",
-    "spec/acceptance/num2bool_spec.rb": "e4a00b913b08c68a689837e9f9336cb2",
-    "spec/acceptance/parsejson_spec.rb": "ea3973d412ad6f72425fdfac6fbb2bb4",
-    "spec/acceptance/parseyaml_spec.rb": "278e4f8e1f52e12e05f6ce31f1ffc9f2",
-    "spec/acceptance/pick_default_spec.rb": "1bc2562380ef6f6cded5ec90a03922be",
-    "spec/acceptance/pick_spec.rb": "272c54c8f9398f499768331bdb4276ee",
-    "spec/acceptance/prefix_spec.rb": "da620568c6771e7d492ec1ff697c531c",
-    "spec/acceptance/range_spec.rb": "65e5b98ceca257658604d988fbec7d03",
-    "spec/acceptance/reject_spec.rb": "b5185f1a6071c9bdc7aca92e6f899c3e",
-    "spec/acceptance/reverse_spec.rb": "7bdee543e82532e97bbf7a067140031c",
-    "spec/acceptance/rstrip_spec.rb": "28a64ceb7cb5ae8a93d31f49816190ab",
-    "spec/acceptance/shuffle_spec.rb": "451301879512a0ea3f321b5c78993bbf",
-    "spec/acceptance/size_spec.rb": "ae17d8a55921a0570972200c7c9327e1",
-    "spec/acceptance/sort_spec.rb": "d44b1b8c090f0f00a2f38515fda431ea",
-    "spec/acceptance/squeeze_spec.rb": "adcd65fa4e72203b97f1f14c8835c2cd",
-    "spec/acceptance/str2bool_spec.rb": "55ad165ceef6b9ba32bf20ca3b53b44c",
-    "spec/acceptance/str2saltedsha512_spec.rb": "b684c4214d06ae3d5bae055262a5ccaa",
-    "spec/acceptance/strftime_spec.rb": "0f4eadbd74445b35de4a42c9790fbcc1",
-    "spec/acceptance/strip_spec.rb": "6767da5bc735beb5362aeee6ff692c9e",
-    "spec/acceptance/suffix_spec.rb": "07dfc7eed48b75fcc1b93d0308243eda",
-    "spec/acceptance/swapcase_spec.rb": "5c3c1bc19a09fed6e01881f79b0b4ea5",
-    "spec/acceptance/time_spec.rb": "044b2f634a1fa6ecc735998d68a93b73",
-    "spec/acceptance/to_bytes_spec.rb": "f9df1f234b9409f5eaf56ef24e651c36",
-    "spec/acceptance/type_spec.rb": "d103a7e1607ab9cea74cdef25af610b0",
-    "spec/acceptance/union_spec.rb": "b6092941e0574f3c60910bebf84d2844",
-    "spec/acceptance/unique_spec.rb": "9b00b21cefde3b5391f50eeb9cd2493b",
-    "spec/acceptance/unsupported_spec.rb": "09b9265ecb05252cd5e5a18327c7ae97",
-    "spec/acceptance/upcase_spec.rb": "ffd1d6f9e6ec24131fb78983c53a75f9",
-    "spec/acceptance/uriescape_spec.rb": "13daa387714cbfc63b587aaa8dbf7fcd",
-    "spec/acceptance/validate_absolute_path_spec.rb": "8b9ebfae80329231d84fcab606a3eeaf",
-    "spec/acceptance/validate_array_spec.rb": "382641719e754622ffae562d10e38bf7",
-    "spec/acceptance/validate_augeas_spec.rb": "ec0a9c030e2c3494889973d74d60b2a4",
-    "spec/acceptance/validate_bool_spec.rb": "08bc139459204cf0a35098a5bc30ab95",
-    "spec/acceptance/validate_cmd_spec.rb": "d08eacac4dd5bdb50b5b0f02a6494048",
-    "spec/acceptance/validate_hash_spec.rb": "70ceacc18a0dee97b26ab2e50f925706",
-    "spec/acceptance/validate_ipv4_address_spec.rb": "dc901bbd05c3764a93cb49154cea6e4b",
-    "spec/acceptance/validate_ipv6_address_spec.rb": "c0872c56230ac2800cd5723eaa5bc53a",
-    "spec/acceptance/validate_re_spec.rb": "b289909078d6ae0d015419f518566698",
-    "spec/acceptance/validate_slength_spec.rb": "f0a05c1c2b895b096cb7326df4821594",
-    "spec/acceptance/validate_string_spec.rb": "6c9ced99fb1e263e66e25427d24f8f7b",
-    "spec/acceptance/values_at_spec.rb": "669b26c4d47742051472003518c3aa61",
-    "spec/acceptance/values_spec.rb": "714a13735aa0db3ffd3dfc4cd2c2e330",
-    "spec/acceptance/zip_spec.rb": "0a76aa26bd9552b8dae3294af7d233ab",
-    "spec/classes/anchor_spec.rb": "40600ba2845f9bd360a9504a347f12ba",
-    "spec/fixtures/dscacheutil/root": "e1a7622f55f3d1be258c9a5b16b474be",
-    "spec/functions/abs_spec.rb": "0a5864a29a8e9e99acc483268bd5917c",
-    "spec/functions/any2array_spec.rb": "167e114cfa222de971bf8be141766b6a",
-    "spec/functions/base64_spec.rb": "fe16d992be54dbb06d040f1b0e189571",
-    "spec/functions/bool2num_spec.rb": "67c3055d5d4e4c9fbcaca82038a09081",
-    "spec/functions/capitalize_spec.rb": "82a4209a033fc88c624f708c12e64e2a",
-    "spec/functions/chomp_spec.rb": "3cd8e2fe6b12efeffad94cce5b693b7c",
-    "spec/functions/chop_spec.rb": "4e9534d25b952b261c9f46add677c390",
-    "spec/functions/concat_spec.rb": "d7657b1af27a96072aae711cee041181",
-    "spec/functions/count_spec.rb": "db98ef89752a7112425f0aade10108e0",
-    "spec/functions/deep_merge_spec.rb": "7961a696e1b45167cead127f841f1c99",
-    "spec/functions/defined_with_params_spec.rb": "3bdfac38e3d6f06140ff2e926f4ebed2",
-    "spec/functions/delete_at_spec.rb": "7fd4fe7db8d213925fbc80c992673d10",
-    "spec/functions/delete_spec.rb": "fe66bdf9e61b9c992bc73ee54a37035c",
-    "spec/functions/delete_undef_values_spec.rb": "83b9c3027463f5c8a90a6d47d219acd5",
-    "spec/functions/delete_values_spec.rb": "ddcaa269caa95ad926b8a3ef82976da9",
-    "spec/functions/difference_spec.rb": "e64c1501699fef8eb1037a3ca60a05a6",
-    "spec/functions/dirname_spec.rb": "1d7cf70468c2cfa6dacfc75935322395",
-    "spec/functions/downcase_spec.rb": "b0197829512f2e92a2d2b06ce8e2226f",
-    "spec/functions/empty_spec.rb": "028c30267d648a172d8a81a9262c3abe",
-    "spec/functions/ensure_packages_spec.rb": "f1b60599078cdcb3cff1368346108264",
-    "spec/functions/ensure_resource_spec.rb": "7765dde3b9fc54b7dddb6597e0f7b523",
-    "spec/functions/flatten_spec.rb": "583c9a70f93e492cfb22ffa1811f6aa0",
-    "spec/functions/floor_spec.rb": "d01ef7dfe0245d7a0a73d7df13cb02e3",
-    "spec/functions/fqdn_rotate_spec.rb": "c67b71737bee9936f5261d41a37bad46",
-    "spec/functions/get_module_path_spec.rb": "b7ea196f548b1a9a745ab6671295ab27",
-    "spec/functions/getparam_spec.rb": "75153d949eb122aa18f0c5e2c8e861e5",
-    "spec/functions/getvar_spec.rb": "842bf88d47077a9ae64097b6e39c3364",
-    "spec/functions/grep_spec.rb": "78179537496a7150469e591a95e255d8",
-    "spec/functions/has_interface_with_spec.rb": "7c16d731c518b434c81b8cb2227cc916",
-    "spec/functions/has_ip_address_spec.rb": "f53c7baeaf024ff577447f6c28c0f3a7",
-    "spec/functions/has_ip_network_spec.rb": "885ea8a4c987b735d683b742bf846cb1",
-    "spec/functions/has_key_spec.rb": "3e4e730d98bbdfb88438b6e08e45868e",
-    "spec/functions/hash_spec.rb": "826337a92d8f7a189b7ac19615db0ed7",
-    "spec/functions/intersection_spec.rb": "1b1f1a3900a1f1e165692b056e766fba",
-    "spec/functions/is_array_spec.rb": "8c020af9c360abdbbf1ba887bb26babe",
-    "spec/functions/is_bool_spec.rb": "3219ba1500de75161bfb4f292404d1fa",
-    "spec/functions/is_domain_name_spec.rb": "8eed3a9eb9334bf6a473ad4e2cabc2ec",
-    "spec/functions/is_float_spec.rb": "171fc0e382d9856c2d8db2b70c9ec9cd",
-    "spec/functions/is_function_available.rb": "c8858a3c6253713cce0113a98d229b5d",
-    "spec/functions/is_hash_spec.rb": "408e121a5e30c4c5c4a0a383beb6e209",
-    "spec/functions/is_integer_spec.rb": "c848f20da5f62ac4bbaf0f6c1485c88f",
-    "spec/functions/is_ip_address_spec.rb": "6040a9bae4e5c853966148b634501157",
-    "spec/functions/is_mac_address_spec.rb": "644cd498b426ff2f9ea9cbc5d8e141d7",
-    "spec/functions/is_numeric_spec.rb": "65f2ad0e70d9b60c601740351eba94fd",
-    "spec/functions/is_string_spec.rb": "5c015d8267de852da3a12b984e077092",
-    "spec/functions/join_keys_to_values_spec.rb": "7c7937411b7fe4bb944c0c022d3a96b0",
-    "spec/functions/join_spec.rb": "c3b50c39390a86b493511be2c6722235",
-    "spec/functions/keys_spec.rb": "35cc2ed490dc68da6464f245dfebd617",
-    "spec/functions/loadyaml_spec.rb": "ce86614d8aaceec93653ecf299d3d441",
-    "spec/functions/lstrip_spec.rb": "1fc2c2d80b5f724a358c3cfeeaae6249",
-    "spec/functions/max_spec.rb": "5562bccc643443af7e4fa7c9d1e52b8b",
-    "spec/functions/member_spec.rb": "067c60985efc57022ca1c5508d74d77f",
-    "spec/functions/merge_spec.rb": "c17a7244453f2da22970acc02a6de110",
-    "spec/functions/min_spec.rb": "bf80bf58261117bb24392670b624a611",
-    "spec/functions/num2bool_spec.rb": "8cd5b46b7c8e612dfae3362e3a68a5f9",
-    "spec/functions/parsejson_spec.rb": "37ab84381e035c31d6a3dd9bf73a3d53",
-    "spec/functions/parseyaml_spec.rb": "65dfed872930ffe0d21954c15daaf498",
-    "spec/functions/pick_default_spec.rb": "db0a9d261b7e1b82e2786716dd924e92",
-    "spec/functions/pick_spec.rb": "34382f7483b6c10d38831de2169777c2",
-    "spec/functions/prefix_spec.rb": "7245749e27bafe1b36c1c5bae6f705c7",
-    "spec/functions/range_spec.rb": "c40b3c6d4031fc541c2421ff7b8c41fe",
-    "spec/functions/reject_spec.rb": "8e16c9f064870e958b6278261e480954",
-    "spec/functions/reverse_spec.rb": "48169990e59081ccbd112b6703418ce4",
-    "spec/functions/rstrip_spec.rb": "a408e933753c9c323a05d7079d32cbb3",
-    "spec/functions/shuffle_spec.rb": "2141a54d2fb3cf725b88184d639677f4",
-    "spec/functions/size_spec.rb": "d126b696b21a8cd754d58f78ddba6f06",
-    "spec/functions/sort_spec.rb": "7039cd230a94e95d9d1de2e1094acae2",
-    "spec/functions/squeeze_spec.rb": "df5b349c208a9a2a4d4b8e6d9324756f",
-    "spec/functions/str2bool_spec.rb": "e2a8a4d39680f3ed18621e26d67c6024",
-    "spec/functions/str2saltedsha512_spec.rb": "1de174be8835ba6fef86b590887bb2cc",
-    "spec/functions/strftime_spec.rb": "bf140883ecf3254277306fa5b25f0344",
-    "spec/functions/strip_spec.rb": "a01796bebbdabd3fad12b0662ea5966e",
-    "spec/functions/suffix_spec.rb": "ee875e2d09d7ffc363bf6c34d9ef322f",
-    "spec/functions/swapcase_spec.rb": "0660ce8807608cc8f98ad1edfa76a402",
-    "spec/functions/time_spec.rb": "b6d0279062779efe5153fe5cfafc5bbd",
-    "spec/functions/to_bytes_spec.rb": "80aaf68cf7e938e46b5278c1907af6be",
-    "spec/functions/type_spec.rb": "422f2c33458fe9b0cc9614d16f7573ba",
-    "spec/functions/union_spec.rb": "c4f72a55e186813cd3a47a83ba3e9a61",
-    "spec/functions/unique_spec.rb": "2df8b3b2edb9503943cb4dcb4a371867",
-    "spec/functions/upcase_spec.rb": "813668919bc62cdd1d349dafc19fbbb3",
-    "spec/functions/uriescape_spec.rb": "204e9b1566e330a0234761ac8ac7083f",
-    "spec/functions/validate_absolute_path_spec.rb": "5a0b98675070e511810dab9e60dc43b6",
-    "spec/functions/validate_array_spec.rb": "bcd231229554785c4270ca92ef99cb60",
-    "spec/functions/validate_augeas_spec.rb": "eee1a0c3ef3051bda525b1e17d577ab0",
-    "spec/functions/validate_bool_spec.rb": "7aeb6085fc9601c6bbe6c49e56d209a4",
-    "spec/functions/validate_cmd_spec.rb": "efc88e8e21481acd36c7f948b1f226ea",
-    "spec/functions/validate_hash_spec.rb": "8529c74051ceb71e6b1b97c9cecdf625",
-    "spec/functions/validate_ipv4_address_spec.rb": "19f2f44fbbdf7a2e69aeaa2f0f402695",
-    "spec/functions/validate_ipv6_address_spec.rb": "2d8617be4405bdbd84d140ba8be6c184",
-    "spec/functions/validate_re_spec.rb": "d8ab477f9afcb748f144588ebb3a28a3",
-    "spec/functions/validate_slength_spec.rb": "73273a083a26941b3f7c1e3b2e18b3e2",
-    "spec/functions/validate_string_spec.rb": "64a4f681084cba55775a070f7fab5e0c",
-    "spec/functions/values_at_spec.rb": "de45fd8abbc4c037c3c4fac2dcf186f9",
-    "spec/functions/values_spec.rb": "0ac9e141ed1f612d7cc224f747b2d1d9",
-    "spec/functions/zip_spec.rb": "06a86e4e70d2aea63812582aae1d26c4",
-    "spec/lib/puppet_spec/compiler.rb": "3c1f03dd8ac2f6f90d7e8f879a3ce4c0",
-    "spec/lib/puppet_spec/database.rb": "c74c0cf62980beea88c7749f876ccfa7",
-    "spec/lib/puppet_spec/files.rb": "906da85e399302cee403e10e357d3f4c",
-    "spec/lib/puppet_spec/fixtures.rb": "0722c5ccbfcba1fc27da1900e54b4463",
-    "spec/lib/puppet_spec/matchers.rb": "dd30ba6b936e8c267511d67acb087c35",
-    "spec/lib/puppet_spec/modules.rb": "445d2739aa8754568a14816280727d70",
-    "spec/lib/puppet_spec/pops.rb": "adf661defa460b7189e3750535533d34",
-    "spec/lib/puppet_spec/scope.rb": "01aeb89bdc2d29a2528ced26ec6402ec",
-    "spec/lib/puppet_spec/settings.rb": "5da4e0dad8bf6b21cc4437c73753a56d",
-    "spec/lib/puppet_spec/verbose.rb": "71dbccd9a45ed89d12fd1c44456a6820",
-    "spec/monkey_patches/alias_should_to_must.rb": "b19ee31563afb91a72f9869f9d7362ff",
-    "spec/monkey_patches/publicize_methods.rb": "c690e444b77c871375d321e413e28ca1",
-    "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
-    "spec/spec_helper.rb": "846cc69a2d612d55d130622759aa12e0",
-    "spec/spec_helper_acceptance.rb": "d82b5682eac4ff46bbe5aa08c29d5e28",
-    "spec/unit/facter/facter_dot_d_spec.rb": "cce0748b2671b1b104332a7c757e5206",
-    "spec/unit/facter/pe_version_spec.rb": "ef031cca838f36f99b1dab3259df96a5",
-    "spec/unit/facter/root_home_spec.rb": "ecd851e2b8a4a8578960cce094cf41ee",
-    "spec/unit/facter/util/puppet_settings_spec.rb": "8666142d017e5804445f5596f3be76e8",
-    "spec/unit/puppet/provider/file_line/ruby_spec.rb": "e118a65a3eb0ccd3d1bf99d7bb010669",
-    "spec/unit/puppet/type/anchor_spec.rb": "3c3251acbc1085b121623f4617107fb9",
-    "spec/unit/puppet/type/file_line_spec.rb": "72ba1d9ad9de5df592f3ff03551983cb",
-    "tests/file_line.pp": "67727539aa7b7dd76f06626fe734f7f7",
-    "tests/has_interface_with.pp": "59c98b4af0d39fc11d1ef4c7a6dc8f7a",
-    "tests/has_ip_address.pp": "93ce02915f67ddfb43a049b2b84ef391",
-    "tests/has_ip_network.pp": "abc05686797a776ea8c054657e6f7456",
-    "tests/init.pp": "1d98070412c76824e66db4b7eb74d433"
-  }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb
deleted file mode 100755
index 8e056424ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/abs_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'abs function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should accept a string' do
-      pp = <<-EOS
-      $input  = '-34.56'
-      $output = abs($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 34.56/)
-      end
-    end
-
-    it 'should accept a float' do
-      pp = <<-EOS
-      $input  = -34.56
-      $output = abs($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 34.56/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb
deleted file mode 100755
index 467d6afda03..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/any2array_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'any2array function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should create an empty array' do
-      pp = <<-EOS
-      $input = ''
-      $output = any2array($input)
-      validate_array($output)
-      notify { "Output: ${output}": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: Output: /)
-      end
-    end
-
-    it 'should leave arrays modified' do
-      pp = <<-EOS
-      $input = ['test', 'array']
-      $output = any2array($input)
-      validate_array($output)
-      notify { "Output: ${output}": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: Output: testarray/)
-      end
-    end
-
-    it 'should turn a hash into an array' do
-      pp = <<-EOS
-      $input = {'test' => 'array'}
-      $output = any2array($input)
-
-      validate_array($output)
-      # Check each element of the array is a plain string.
-      validate_string($output[0])
-      validate_string($output[1])
-      notify { "Output: ${output}": }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: Output: testarray/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb
deleted file mode 100755
index 97e1738ef68..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/base64_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'base64 function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should encode then decode a string' do
-      pp = <<-EOS
-      $encodestring = base64('encode', 'thestring')
-      $decodestring = base64('decode', $encodestring)
-      notify { $decodestring: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/thestring/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb
deleted file mode 100755
index 7a70311ca7a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/bool2num_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'bool2num function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    ['false', 'f', '0', 'n', 'no'].each do |bool|
-      it 'should convert a given boolean, #{bool}, to 0' do
-        pp = <<-EOS
-        $input = #{bool}
-        $output = bool2num($input)
-        notify { $output: }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: 0/)
-        end
-      end
-    end
-
-    ['true', 't', '1', 'y', 'yes'].each do |bool|
-      it 'should convert a given boolean, #{bool}, to 1' do
-        pp = <<-EOS
-        $input = #{bool}
-        $output = bool2num($input)
-        notify { $output: }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: 1/)
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb
deleted file mode 100755
index 62ecbf13a40..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/build_csv.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set sw=2 sts=2 et tw=80 :
-require 'rspec'
-
-#XXX Super ugly hack to keep from starting beaker nodes
-module Kernel
-  # make an alias of the original require
-  alias_method :original_require, :require
-  # rewrite require
-  def require name
-    original_require name if name != 'spec_helper_acceptance'
-  end
-end
-UNSUPPORTED_PLATFORMS = []
-def fact(*args) [] end
-#XXX End hax
-
-# Get a list of functions for test coverage
-function_list = Dir[File.join(File.dirname(__FILE__),"..","..","lib","puppet","parser","functions","*.rb")].collect do |function_rb|
-  File.basename(function_rb,".rb")
-end
-
-## Configure rspec to parse tests
-options = RSpec::Core::ConfigurationOptions.new(['spec/acceptance'])
-configuration = RSpec::configuration
-world = RSpec::world
-options.parse_options
-options.configure(configuration)
-configuration.load_spec_files
-
-## Collect up tests and example groups into a hash
-def get_tests(children)
-  children.inject({}) do |memo,c|
-    memo[c.description] = Hash.new
-    memo[c.description]["groups"] = get_tests(c.children) unless c.children.empty?
-    memo[c.description]["tests"] = c.examples.collect { |e|
-      e.description unless e.pending?
-    }.compact unless c.examples.empty?
-    memo[c.description]["pending_tests"] = c.examples.collect { |e|
-      e.description if e.pending?
-    }.compact unless c.examples.empty?
-    memo
-  end
-end
-
-def count_test_types_in(type,group)
-  return 0 if group.nil?
-  group.inject(0) do |m,(k,v)|
-    m += v.length if k == type
-    m += count_tests_in(v) if v.is_a?(Hash)
-    m
-  end
-end
-def count_tests_in(group)
-  count_test_types_in('tests',group)
-end
-def count_pending_tests_in(group)
-  count_test_types_in('pending_tests',group)
-end
-
-# Convert tests hash to csv format
-def to_csv(function_list,tests)
-  function_list.collect do |function_name|
-    if v = tests["#{function_name} function"]
-      positive_tests = count_tests_in(v["groups"]["success"])
-      negative_tests = count_tests_in(v["groups"]["failure"])
-      pending_tests  =
-        count_pending_tests_in(v["groups"]["failure"]) +
-        count_pending_tests_in(v["groups"]["failure"])
-    else
-      positive_tests = 0
-      negative_tests = 0
-      pending_tests  = 0
-    end
-    sprintf("%-25s, %-9d, %-9d, %-9d", function_name,positive_tests,negative_tests,pending_tests)
-  end.compact
-end
-
-tests = get_tests(world.example_groups)
-csv = to_csv(function_list,tests)
-percentage_tested = "#{tests.count*100/function_list.count}%"
-printf("%-25s,  %-9s, %-9s, %-9s\n","#{percentage_tested} have tests.","Positive","Negative","Pending")
-puts csv
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb
deleted file mode 100755
index e5e7b7bf841..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/capitalize_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'capitalize function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should capitalize the first letter of a string' do
-      pp = <<-EOS
-      $input = 'this is a string'
-      $output = capitalize($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: This is a string/)
-      end
-    end
-
-    it 'should capitalize the first letter of an array of strings' do
-      pp = <<-EOS
-      $input = ['this', 'is', 'a', 'string']
-      $output = capitalize($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: This/)
-        expect(r.stdout).to match(/Notice: Is/)
-        expect(r.stdout).to match(/Notice: A/)
-        expect(r.stdout).to match(/Notice: String/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb
deleted file mode 100755
index f6c15956e4f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chomp_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'chomp function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should eat the newline' do
-      pp = <<-EOS
-      $input = "test\n"
-      if size($input) != 5 {
-        fail("Size of ${input} is not 5.")
-      }
-      $output = chomp($input)
-      if size($output) != 4 {
-        fail("Size of ${input} is not 4.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb
deleted file mode 100755
index dbc28da7ec3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/chop_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'chop function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should eat the last character' do
-      pp = <<-EOS
-      $input = "test"
-      if size($input) != 4 {
-        fail("Size of ${input} is not 4.")
-      }
-      $output = chop($input)
-      if size($output) != 3 {
-        fail("Size of ${input} is not 3.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should eat the last two characters of \r\n' do
-      pp = <<-EOS
-      $input = "test\r\n"
-      if size($input) != 6 {
-        fail("Size of ${input} is not 6.")
-      }
-      $output = chop($input)
-      if size($output) != 4 {
-        fail("Size of ${input} is not 4.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-
-    it 'should not fail on empty strings' do
-      pp = <<-EOS
-      $input = ""
-      $output = chop($input)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb
deleted file mode 100755
index 7bda3653a05..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/concat_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'concat function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should concat one array to another' do
-      pp = <<-EOS
-      $output = concat(['1','2','3'],['4','5','6'])
-      validate_array($output)
-      if size($output) != 6 {
-        fail("${output} should have 6 elements.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb
deleted file mode 100755
index 51a40ba5c17..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/count_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'count function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should count elements in an array' do
-      pp = <<-EOS
-      $input = [1,2,3,4]
-      $output = count($input)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 4/)
-      end
-    end
-
-    it 'should count elements in an array that match a second argument' do
-      pp = <<-EOS
-      $input = [1,1,1,2]
-      $output = count($input, 1)
-      notify { $output: }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: 3/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb
deleted file mode 100755
index c0f9b126d03..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/deep_merge_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'deep_merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should deep merge two hashes' do
-      pp = <<-EOS
-      $hash1 = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-      $hash2 = {'two' => 'dos', 'three' => { 'five' => 5 } }
-      $merged_hash = deep_merge($hash1, $hash2)
-
-      if $merged_hash != { 'one' => 1, 'two' => 'dos', 'three' => { 'four' => 4, 'five' => 5 } } {
-        fail("Hash was incorrectly merged.")
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb
deleted file mode 100755
index fc544508b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/defined_with_params_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'defined_with_params function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should successfully notify' do
-      pp = <<-EOS
-      user { 'dan':
-        ensure => present,
-      }
-
-      if defined_with_params(User[dan], {'ensure' => 'present' }) {
-        notify { 'User defined with ensure=>present': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: User defined with ensure=>present/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb
deleted file mode 100755
index db0c01f7483..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_at_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete_at function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the array' do
-      pp = <<-EOS
-      $output = delete_at(['a','b','c','b'], 1)
-      if $output == ['a','c','b'] {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb
deleted file mode 100755
index a28604ceaa0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the array' do
-      pp = <<-EOS
-      $output = delete(['a','b','c','b'], 'b')
-      if $output == ['a','c'] {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb
deleted file mode 100755
index b7eda1926c8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_undef_values_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete_undef_values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the array' do
-      pp = <<-EOS
-      $output = delete_undef_values({a=>'A', b=>'', c=>undef, d => false})
-      if $output == { a => 'A', b => '', d => false } {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb
deleted file mode 100755
index 6d2369c3e81..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/delete_values_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'delete_values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should delete elements of the hash' do
-      pp = <<-EOS
-      $a = { 'a' => 'A', 'b' => 'B', 'B' => 'C', 'd' => 'B' }
-      $b = { 'a' => 'A', 'B' => 'C' }
-      $o = delete_values($a, 'B')
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles non-hash arguments'
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb
deleted file mode 100755
index 2fae5c432f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/difference_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'difference function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns non-duplicates in the first array' do
-      pp = <<-EOS
-      $a = ['a','b','c']
-      $b = ['b','c','d']
-      $c = ['a']
-      $o = difference($a, $b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles non-array arguments'
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb
deleted file mode 100755
index 97913ddb063..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/dirname_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'dirname function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    context 'absolute path' do
-      it 'returns the dirname' do
-        pp = <<-EOS
-        $a = '/path/to/a/file.txt'
-        $b = '/path/to/a'
-        $o = dirname($a)
-        if $o == $b {
-          notify { 'output correct': }
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: output correct/)
-        end
-      end
-    end
-    context 'relative path' do
-      it 'returns the dirname' do
-        pp = <<-EOS
-        $a = 'path/to/a/file.txt'
-        $b = 'path/to/a'
-        $o = dirname($a)
-        if $o == $b {
-          notify { 'output correct': }
-        }
-        EOS
-
-        apply_manifest(pp, :catch_failures => true) do |r|
-          expect(r.stdout).to match(/Notice: output correct/)
-        end
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb
deleted file mode 100755
index bc4e70692d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/downcase_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'downcase function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns the downcase' do
-      pp = <<-EOS
-      $a = 'AOEU'
-      $b = 'aoeu'
-      $o = downcase($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'doesn\'t affect lowercase words' do
-      pp = <<-EOS
-      $a = 'aoeu aoeu'
-      $b = 'aoeu aoeu'
-      $o = downcase($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb
deleted file mode 100755
index 8b46aacdad8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/empty_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'empty function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'recognizes empty strings' do
-      pp = <<-EOS
-      $a = ''
-      $b = true
-      $o = empty($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'recognizes non-empty strings' do
-      pp = <<-EOS
-      $a = 'aoeu'
-      $b = false
-      $o = empty($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb
deleted file mode 100755
index 145bdc5e5de..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_packages_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'ensure_packages function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'ensure_packages a package' do
-      apply_manifest('package { "zsh": ensure => absent, }')
-      pp = <<-EOS
-      $a = "zsh"
-      ensure_packages($a)
-      EOS
-
-      apply_manifest(pp, :expect_changes => true) do |r|
-        expect(r.stdout).to match(/Package\[zsh\]\/ensure: created/)
-      end
-    end
-    it 'ensures a package already declared'
-    it 'takes defaults arguments'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb
deleted file mode 100755
index c4d8887df29..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/ensure_resource_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'ensure_resource function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'ensure_resource a package' do
-      apply_manifest('package { "zsh": ensure => absent, }')
-      pp = <<-EOS
-      $a = "zsh"
-      ensure_resource('package', $a)
-      EOS
-
-      apply_manifest(pp, :expect_changes => true) do |r|
-        expect(r.stdout).to match(/Package\[zsh\]\/ensure: created/)
-      end
-    end
-    it 'ensures a resource already declared'
-    it 'takes defaults arguments'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb
deleted file mode 100755
index c4d66e04650..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/flatten_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'flatten function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'flattens arrays' do
-      pp = <<-EOS
-      $a = ["a","b",["c",["d","e"],"f","g"]]
-      $b = ["a","b","c","d","e","f","g"]
-      $o = flatten($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'does not affect flat arrays' do
-      pp = <<-EOS
-      $a = ["a","b","c","d","e","f","g"]
-      $b = ["a","b","c","d","e","f","g"]
-      $o = flatten($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb
deleted file mode 100755
index 0dcdad9c2b0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/floor_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'floor function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'floors floats' do
-      pp = <<-EOS
-      $a = 12.8
-      $b = 12
-      $o = floor($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'floors integers' do
-      pp = <<-EOS
-      $a = 7
-      $b = 7
-      $o = floor($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb
deleted file mode 100755
index b7f8bf8ab9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/fqdn_rotate_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    let(:facts_d) do
-      if fact('is_pe') == "true"
-        '/etc/puppetlabs/facter/facts.d'
-      else
-        '/etc/facter/facts.d'
-      end
-    end
-    after :each do
-      shell("if [ -f #{facts_d}/fqdn.txt ] ; then rm #{facts_d}/fqdn.txt ; fi")
-    end
-    it 'fqdn_rotates floats' do
-      shell("echo 'fqdn=fakehost.localdomain' > #{facts_d}/fqdn.txt")
-      pp = <<-EOS
-      $a = ['a','b','c','d']
-      $o = fqdn_rotate($a)
-      notice(inline_template('fqdn_rotate is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/fqdn_rotate is \["c", "d", "a", "b"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb
deleted file mode 100755
index 34d91fa3dab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/get_module_path_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'get_module_paths stdlib' do
-      pp = <<-EOS
-      $a = $::is_pe ? {
-        'true'  => '/opt/puppet/share/puppet/modules/stdlib',
-        'false' => '/etc/puppet/modules/stdlib',
-      }
-      $o = get_module_path('stdlib')
-      if $o == $a {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'get_module_paths dne' do
-      pp = <<-EOS
-      $a = $::is_pe ? {
-        'true'  => '/etc/puppetlabs/puppet/modules/dne',
-        'false' => '/etc/puppet/modules/dne',
-      }
-      $o = get_module_path('dne')
-      if $o == $a {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb
deleted file mode 100755
index 91fc9a00f34..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getparam_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'getparam function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'getparam a package' do
-      pp = <<-EOS
-      user { "rspec":
-        ensure     => present,
-        managehome => true,
-      }
-      $o = getparam(User['rspec'], 'managehome')
-      notice(inline_template('getparam is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/getparam is true/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb
deleted file mode 100755
index 333c467f673..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/getvar_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'getvar function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'getvars from classes' do
-      pp = <<-EOS
-      class a::data { $foo = 'aoeu' }
-      include a::data
-      $b = 'aoeu'
-      $o = getvar("a::data::foo")
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-numbers'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb
deleted file mode 100755
index b39d48ecbe6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/grep_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'grep function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'greps arrays' do
-      pp = <<-EOS
-      $a = ['aaabbb','bbbccc','dddeee']
-      $b = 'bbb'
-      $c = ['aaabbb','bbbccc']
-      $o = grep($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb
deleted file mode 100755
index 41ae19fd1c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_interface_with_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_interface_with existing ipaddress' do
-      pp = <<-EOS
-      $a = '127.0.0.1'
-      $o = has_interface_with('ipaddress', $a)
-      notice(inline_template('has_interface_with is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_interface_with is true/)
-      end
-    end
-    it 'has_interface_with absent ipaddress' do
-      pp = <<-EOS
-      $a = '128.0.0.1'
-      $o = has_interface_with('ipaddress', $a)
-      notice(inline_template('has_interface_with is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_interface_with is false/)
-      end
-    end
-    it 'has_interface_with existing interface' do
-      pp = <<-EOS
-      $a = 'lo'
-      $o = has_interface_with($a)
-      notice(inline_template('has_interface_with is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_interface_with is true/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb
deleted file mode 100755
index 7d5fd872926..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_address_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_ip_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_ip_address existing ipaddress' do
-      pp = <<-EOS
-      $a = '127.0.0.1'
-      $o = has_ip_address($a)
-      notice(inline_template('has_ip_address is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_address is true/)
-      end
-    end
-    it 'has_ip_address absent ipaddress' do
-      pp = <<-EOS
-      $a = '128.0.0.1'
-      $o = has_ip_address($a)
-      notice(inline_template('has_ip_address is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_address is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
deleted file mode 100755
index 692eaf9b4c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_ip_network_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_ip_network function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_ip_network existing ipaddress' do
-      pp = <<-EOS
-      $a = '127.0.0.0'
-      $o = has_ip_network($a)
-      notice(inline_template('has_ip_network is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_network is true/)
-      end
-    end
-    it 'has_ip_network absent ipaddress' do
-      pp = <<-EOS
-      $a = '128.0.0.0'
-      $o = has_ip_network($a)
-      notice(inline_template('has_ip_network is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/has_ip_network is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb
deleted file mode 100755
index c8557cbeb66..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/has_key_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'has_key function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'has_keys in hashes' do
-      pp = <<-EOS
-      $a = { 'aaa' => 'bbb','bbb' => 'ccc','ddd' => 'eee' }
-      $b = 'bbb'
-      $c = true
-      $o = has_key($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'has_keys not in hashes' do
-      pp = <<-EOS
-      $a = { 'aaa' => 'bbb','bbb' => 'ccc','ddd' => 'eee' }
-      $b = 'ccc'
-      $c = false
-      $o = has_key($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-hashes'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb
deleted file mode 100755
index ed53834bed2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/hash_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'hash function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'hashs arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','bbb','ccc','ddd','eee']
-      $b = { 'aaa' => 'bbb', 'bbb' => 'ccc', 'ddd' => 'eee' }
-      $o = hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'handles odd-length arrays'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb
deleted file mode 100755
index 66b86529786..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/intersection_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'intersection function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'intersections arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = ['bbb','ccc','ddd','eee']
-      $c = ['bbb','ccc']
-      $o = intersection($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'intersections empty arrays'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb
deleted file mode 100755
index 9c6bad735f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_array_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_array function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_arrays arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = true
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_arrays empty arrays' do
-      pp = <<-EOS
-      $a = []
-      $b = true
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_arrays strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $b = false
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_arrays hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb'}
-      $b = false
-      $o = is_array($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb
deleted file mode 100755
index 60079f95eff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_bool_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_bools arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = false
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools true' do
-      pp = <<-EOS
-      $a = true
-      $b = true
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools false' do
-      pp = <<-EOS
-      $a = false
-      $b = true
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools strings' do
-      pp = <<-EOS
-      $a = "true"
-      $b = false
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_bools hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb'}
-      $b = false
-      $o = is_bool($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb
deleted file mode 100755
index e0f03fa878e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_domain_name_spec.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_domain_name function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_domain_names arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-    it 'is_domain_names true' do
-      pp = <<-EOS
-      $a = true
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-    it 'is_domain_names false' do
-      pp = <<-EOS
-      $a = false
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-    it 'is_domain_names strings with hyphens' do
-      pp = <<-EOS
-      $a = "3foo-bar.2bar-fuzz.com"
-      $b = true
-      $o = is_domain_name($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_domain_names strings beginning with hyphens' do
-      pp = <<-EOS
-      $a = "-bar.2bar-fuzz.com"
-      $b = false
-      $o = is_domain_name($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_domain_names hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $o = is_domain_name($a)
-      notice(inline_template('is_domain_name is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_domain_name is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb
deleted file mode 100755
index 338ba58d468..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_float_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_float function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_floats arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $o = is_float($a)
-      notice(inline_template('is_float is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_float is false/)
-      end
-    end
-    it 'is_floats true' do
-      pp = <<-EOS
-      $a = true
-      $o = is_float($a)
-      notice(inline_template('is_float is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_float is false/)
-      end
-    end
-    it 'is_floats strings' do
-      pp = <<-EOS
-      $a = "3.5"
-      $b = true
-      $o = is_float($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_floats floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = true
-      $o = is_float($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_floats integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = false
-      $o = is_float($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_floats hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $o = is_float($a)
-      notice(inline_template('is_float is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_float is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb
deleted file mode 100755
index 2b5dd6d1731..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_function_available_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_function_available function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_function_availables arrays' do
-      pp = <<-EOS
-      $a = ['fail','include','require']
-      $o = is_function_available($a)
-      notice(inline_template('is_function_available is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_function_available is false/)
-      end
-    end
-    it 'is_function_availables true' do
-      pp = <<-EOS
-      $a = true
-      $o = is_function_available($a)
-      notice(inline_template('is_function_available is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_function_available is false/)
-      end
-    end
-    it 'is_function_availables strings' do
-      pp = <<-EOS
-      $a = "fail"
-      $b = true
-      $o = is_function_available($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_function_availables function_availables' do
-      pp = <<-EOS
-      $a = "is_function_available"
-      $o = is_function_available($a)
-      notice(inline_template('is_function_available is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_function_available is true/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb
deleted file mode 100755
index 2ef310abccb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_hash_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_hash function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_hashs arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $o = is_hash($a)
-      notice(inline_template('is_hash is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_hash is false/)
-      end
-    end
-    it 'is_hashs empty hashs' do
-      pp = <<-EOS
-      $a = {}
-      $b = true
-      $o = is_hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_hashs strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $b = false
-      $o = is_hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_hashs hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb'}
-      $b = true
-      $o = is_hash($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb
deleted file mode 100755
index bf6902b904c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_integer_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_integer function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_integers arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers true' do
-      pp = <<-EOS
-      $a = true
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers strings' do
-      pp = <<-EOS
-      $a = "3"
-      $b = true
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = true
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_integers hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $b = false
-      $o = is_integer($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
deleted file mode 100755
index ed7a85439d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_ip_address_spec.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_ip_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_ip_addresss ipv4' do
-      pp = <<-EOS
-      $a = '1.2.3.4'
-      $b = true
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss ipv6' do
-      pp = <<-EOS
-      $a = "fe80:0000:cd12:d123:e2f8:47ff:fe09:dd74"
-      $b = true
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss ipv6 compressed' do
-      pp = <<-EOS
-      $a = "fe00::1"
-      $b = true
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $b = false
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_ip_addresss ipv4 out of range' do
-      pp = <<-EOS
-      $a = '1.2.3.400'
-      $b = false
-      $o = is_ip_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb
deleted file mode 100755
index a2c892f435b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_mac_address_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_mac_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_mac_addresss a mac' do
-      pp = <<-EOS
-      $a = '00:a0:1f:12:7f:a0'
-      $b = true
-      $o = is_mac_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_mac_addresss a mac out of range' do
-      pp = <<-EOS
-      $a = '00:a0:1f:12:7f:g0'
-      $b = false
-      $o = is_mac_address($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb
deleted file mode 100755
index 21c898841ee..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_numeric_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_numeric function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_numerics arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $b = false
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics true' do
-      pp = <<-EOS
-      $a = true
-      $b = false
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics strings' do
-      pp = <<-EOS
-      $a = "3"
-      $b = true
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = true
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = true
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_numerics hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $b = false
-      $o = is_numeric($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-    it 'handles non-arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb
deleted file mode 100755
index 94d8e967830..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/is_string_spec.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'is_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'is_strings arrays' do
-      pp = <<-EOS
-      $a = ['aaa.com','bbb','ccc']
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings true' do
-      pp = <<-EOS
-      $a = true
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings strings' do
-      pp = <<-EOS
-      $a = "aoeu"
-      $o = is_string($a)
-      notice(inline_template('is_string is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_string is true/)
-      end
-    end
-    it 'is_strings number strings' do
-      pp = <<-EOS
-      $a = "3"
-      $o = is_string($a)
-      notice(inline_template('is_string is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/is_string is false/)
-      end
-    end
-    it 'is_strings floats' do
-      pp = <<-EOS
-      $a = 3.5
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings integers' do
-      pp = <<-EOS
-      $a = 3
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'is_strings hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'www.com'}
-      $b = false
-      $o = is_string($a)
-      if $o == $b {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb
deleted file mode 100755
index 70493fd5a2a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_keys_to_values_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'join_keys_to_values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'join_keys_to_valuess hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb','ccc'=>'ddd'}
-      $b = ':'
-      $o = join_keys_to_values($a,$b)
-      notice(inline_template('join_keys_to_values is <%= @o.sort.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/join_keys_to_values is \["aaa:bbb", "ccc:ddd"\]/)
-      end
-    end
-    it 'handles non hashes'
-    it 'handles empty hashes'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb
deleted file mode 100755
index 5397ce2c8c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/join_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'join function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'joins arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = ':'
-      $c = 'aaa:bbb:ccc'
-      $o = join($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'handles non arrays'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb
deleted file mode 100755
index 176918e91c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/keys_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'keys function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'keyss hashes' do
-      pp = <<-EOS
-      $a = {'aaa'=>'bbb','ccc'=>'ddd'}
-      $o = keys($a)
-      notice(inline_template('keys is <%= @o.sort.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/keys is \["aaa", "ccc"\]/)
-      end
-    end
-    it 'handles non hashes'
-    it 'handles empty hashes'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb
deleted file mode 100644
index 944a727359f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/loadyaml_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'loadyaml function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'loadyamls array of values' do
-      shell('echo "---
-      aaa: 1
-      bbb: 2
-      ccc: 3
-      ddd: 4" > /testyaml.yaml')
-      pp = <<-EOS
-      $o = loadyaml('/testyaml.yaml')
-      notice(inline_template('loadyaml[aaa] is <%= @o["aaa"].inspect %>'))
-      notice(inline_template('loadyaml[bbb] is <%= @o["bbb"].inspect %>'))
-      notice(inline_template('loadyaml[ccc] is <%= @o["ccc"].inspect %>'))
-      notice(inline_template('loadyaml[ddd] is <%= @o["ddd"].inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/loadyaml\[aaa\] is 1/)
-        expect(r.stdout).to match(/loadyaml\[bbb\] is 2/)
-        expect(r.stdout).to match(/loadyaml\[ccc\] is 3/)
-        expect(r.stdout).to match(/loadyaml\[ddd\] is 4/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb
deleted file mode 100755
index 3dc952fbc65..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/lstrip_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'lstrip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'lstrips arrays' do
-      pp = <<-EOS
-      $a = ["  the   ","   public   ","   art","galleries   "]
-      # Anagram: Large picture halls, I bet
-      $o = lstrip($a)
-      notice(inline_template('lstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/lstrip is \["the   ", "public   ", "art", "galleries   "\]/)
-      end
-    end
-    it 'lstrips strings' do
-      pp = <<-EOS
-      $a = "   blowzy night-frumps vex'd jack q   "
-      $o = lstrip($a)
-      notice(inline_template('lstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/lstrip is "blowzy night-frumps vex'd jack q   "/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb
deleted file mode 100755
index f04e3d28332..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/max_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'max function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'maxs arrays' do
-      pp = <<-EOS
-      $o = max("the","public","art","galleries")
-      notice(inline_template('max is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/max is "the"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb
deleted file mode 100755
index b467dbbe9c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/member_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'member function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'members arrays' do
-      pp = <<-EOS
-      $a = ['aaa','bbb','ccc']
-      $b = 'ccc'
-      $c = true
-      $o = member($a,$b)
-      if $o == $c {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
-    it 'members arrays without members'
-  end
-  describe 'failure' do
-    it 'handles improper argument counts'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb
deleted file mode 100755
index a60e784ee67..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/merge_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'merge function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'should merge two hashes' do
-      pp = <<-EOS
-      $a = {'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }
-      $b = {'two' => 'dos', 'three' => { 'five' => 5 } }
-      $o = merge($a, $b)
-      notice(inline_template('merge[one]   is <%= @o["one"].inspect %>'))
-      notice(inline_template('merge[two]   is <%= @o["two"].inspect %>'))
-      notice(inline_template('merge[three] is <%= @o["three"].inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/merge\[one\]   is "1"/)
-        expect(r.stdout).to match(/merge\[two\]   is "dos"/)
-        expect(r.stdout).to match(/merge\[three\] is {"five"=>"5"}/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb
deleted file mode 100755
index 509092d3c7c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/min_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'min function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'mins arrays' do
-      pp = <<-EOS
-      $o = min("the","public","art","galleries")
-      notice(inline_template('min is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/min is "art"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml
deleted file mode 100644
index ca9c1d32986..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-6-vcloud.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-HOSTS:
-  'centos-6-vcloud':
-    roles:
-      - master
-    platform: el-6-x86_64
-    hypervisor: vcloud
-    template: centos-6-x86_64
-CONFIG:
-  type: foss
-  ssh:
-    keys: "~/.ssh/id_rsa-acceptance"
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml
deleted file mode 100644
index 7d9242f1b95..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64-pe.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: pe
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml
deleted file mode 100644
index 05540ed8c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/centos-64-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-64-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml
deleted file mode 100644
index 4e2cb809e85..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  centos-65-x64:
-    roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-65-x64-vbox436-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml
deleted file mode 100644
index 13616498307..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/fedora-18-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  fedora-18-x64:
-    roles:
-      - master
-    platform: fedora-18-x86_64
-    box : fedora-18-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml
deleted file mode 100644
index 41abe2135e2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/sles-11-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  sles-11-x64.local:
-    roles:
-      - master
-    platform: sles-11-x64
-    box : sles-11sp1-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-    type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
deleted file mode 100644
index 5ca1514e407..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-10044-x64:
-    roles:
-      - master
-    platform: ubuntu-10.04-amd64
-    box : ubuntu-server-10044-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
deleted file mode 100644
index d065b304f83..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-server-12042-x64:
-    roles:
-      - master
-    platform: ubuntu-12.04-amd64
-    box : ubuntu-server-12042-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
-    hypervisor : vagrant
-CONFIG:
-  type: foss
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb
deleted file mode 100755
index 1d99ba02514..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/num2bool_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'num2bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'bools positive numbers and numeric strings as true' do
-      pp = <<-EOS
-      $a = 1
-      $b = "1"
-      $c = "50"
-      $ao = num2bool($a)
-      $bo = num2bool($b)
-      $co = num2bool($c)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      notice(inline_template('b is <%= @bo.inspect %>'))
-      notice(inline_template('c is <%= @co.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/a is true/)
-        expect(r.stdout).to match(/b is true/)
-        expect(r.stdout).to match(/c is true/)
-      end
-    end
-    it 'bools negative numbers as false' do
-      pp = <<-EOS
-      $a = 0
-      $b = -0.1
-      $c = ["-50","1"]
-      $ao = num2bool($a)
-      $bo = num2bool($b)
-      $co = num2bool($c)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      notice(inline_template('b is <%= @bo.inspect %>'))
-      notice(inline_template('c is <%= @co.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/a is false/)
-        expect(r.stdout).to match(/b is false/)
-        expect(r.stdout).to match(/c is false/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails on words' do
-      pp = <<-EOS
-      $a = "a"
-      $ao = num2bool($a)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/not look like a number/)
-    end
-
-    it 'fails on numberwords' do
-      pp = <<-EOS
-      $b = "1b"
-      $bo = num2bool($b)
-      notice(inline_template('b is <%= @bo.inspect %>'))
-      EOS
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/not look like a number/)
-
-    end
-
-    it 'fails on non-numeric/strings' do
-      pending "The function will call .to_s.to_i on anything not a Numeric or
-      String, and results in 0. Is this intended?"
-      pp = <<-EOS
-      $c = {"c" => "-50"}
-      $co = num2bool($c)
-      notice(inline_template('c is <%= @co.inspect %>'))
-      EOS
-      expect(apply_manifest(ppc :expect_failures => true).stderr).to match(/Unable to parse/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb
deleted file mode 100755
index 50978102726..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parsejson_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'parsejson function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'parses valid json' do
-      pp = <<-EOS
-      $a = '{"hunter": "washere", "tests": "passing"}'
-      $ao = parsejson($a)
-      $tests = $ao['tests']
-      notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/tests are "passing"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error on incorrect json' do
-      pp = <<-EOS
-      $a = '{"hunter": "washere", "tests": "passing",}'
-      $ao = parsejson($a)
-      notice(inline_template('a is <%= @ao.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/expected next name/)
-      end
-    end
-
-    it 'raises error on incorrect number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb
deleted file mode 100755
index 4b4bf3df3df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/parseyaml_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'parseyaml function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'parses valid yaml' do
-      pp = <<-EOS
-      $a = "---\nhunter: washere\ntests: passing\n"
-      $o = parseyaml($a)
-      $tests = $o['tests']
-      notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/tests are "passing"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error on incorrect yaml' do
-      pp = <<-EOS
-      $a = "---\nhunter: washere\ntests: passing\n:"
-      $o = parseyaml($a)
-      $tests = $o['tests']
-      notice(inline_template('tests are <%= @tests.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/syntax error/)
-      end
-    end
-
-    it 'raises error on incorrect number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb
deleted file mode 100755
index a663f54e8ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_default_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'pick_default function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'pick_defaults a default value' do
-      pp = <<-EOS
-      $a = undef
-      $o = pick_default($a, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "default"/)
-      end
-    end
-    it 'pick_defaults with no value' do
-      pp = <<-EOS
-      $a = undef
-      $b = undef
-      $o = pick_default($a,$b)
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is ""/)
-      end
-    end
-    it 'pick_defaults the first set value' do
-      pp = <<-EOS
-      $a = "something"
-      $b = "long"
-      $o = pick_default($a, $b, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "something"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error with no values' do
-      pp = <<-EOS
-      $o = pick_default()
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/Must receive at least one argument/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb
deleted file mode 100755
index 46cf63f28fb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/pick_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'pick function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'picks a default value' do
-      pp = <<-EOS
-      $a = undef
-      $o = pick($a, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "default"/)
-      end
-    end
-    it 'picks the first set value' do
-      pp = <<-EOS
-      $a = "something"
-      $b = "long"
-      $o = pick($a, $b, 'default')
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/picked is "something"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'raises error with all undef values' do
-      pp = <<-EOS
-      $a = undef
-      $b = undef
-      $o = pick($a, $b)
-      notice(inline_template('picked is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :expect_failures => true) do |r|
-        expect(r.stderr).to match(/must receive at least one non empty value/)
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb
deleted file mode 100755
index de55530eb26..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/prefix_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'prefix function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'prefixes array of values' do
-      pp = <<-EOS
-      $o = prefix(['a','b','c'],'p')
-      notice(inline_template('prefix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/prefix is \["pa", "pb", "pc"\]/)
-      end
-    end
-    it 'prefixs with empty array' do
-      pp = <<-EOS
-      $o = prefix([],'p')
-      notice(inline_template('prefix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/prefix is \[\]/)
-      end
-    end
-    it 'prefixs array of values with undef' do
-      pp = <<-EOS
-      $o = prefix(['a','b','c'], undef)
-      notice(inline_template('prefix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/prefix is \["a", "b", "c"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-    it 'fails when first argument is not array'
-    it 'fails when second argument is not string'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb
deleted file mode 100755
index a3ccd3396aa..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/range_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'range function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'ranges letters' do
-      pp = <<-EOS
-      $o = range('a','d')
-      notice(inline_template('range is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/range is \["a", "b", "c", "d"\]/)
-      end
-    end
-    it 'ranges letters with a step' do
-      pp = <<-EOS
-      $o = range('a','d', '2')
-      notice(inline_template('range is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/range is \["a", "c"\]/)
-      end
-    end
-    it 'ranges letters with a negative step'
-    it 'ranges numbers'
-    it 'ranges numbers with a step'
-    it 'ranges numbers with a negative step'
-    it 'ranges numeric strings'
-    it 'ranges zero padded numbers'
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb
deleted file mode 100755
index 7f16a008dc4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reject_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'reject function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'rejects array of values' do
-      pp = <<-EOS
-      $o = reject(['aaa','bbb','ccc','aaaddd'], 'aaa')
-      notice(inline_template('reject is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reject is \["bbb", "ccc"\]/)
-      end
-    end
-    it 'rejects with empty array' do
-      pp = <<-EOS
-      $o = reject([],'aaa')
-      notice(inline_template('reject is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reject is \[\]/)
-      end
-    end
-    it 'rejects array of values with undef' do
-      pp = <<-EOS
-      $o = reject(['aaa','bbb','ccc','aaaddd'], undef)
-      notice(inline_template('reject is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reject is \[\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-    it 'fails when first argument is not array'
-    it 'fails when second argument is not string'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb
deleted file mode 100755
index c3f01567a64..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/reverse_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'reverse function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'reverses strings' do
-      pp = <<-EOS
-      $a = "the public art galleries"
-      # Anagram: Large picture halls, I bet
-      $o = reverse($a)
-      notice(inline_template('reverse is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/reverse is "seirellag tra cilbup eht"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb
deleted file mode 100755
index b57a8b04581..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/rstrip_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'rstrip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'rstrips arrays' do
-      pp = <<-EOS
-      $a = ["  the   ","   public   ","   art","galleries   "]
-      # Anagram: Large picture halls, I bet
-      $o = rstrip($a)
-      notice(inline_template('rstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/rstrip is \["  the", "   public", "   art", "galleries"\]/)
-      end
-    end
-    it 'rstrips strings' do
-      pp = <<-EOS
-      $a = "   blowzy night-frumps vex'd jack q   "
-      $o = rstrip($a)
-      notice(inline_template('rstrip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/rstrip is "   blowzy night-frumps vex'd jack q"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb
deleted file mode 100755
index 02d1201dd0c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/shuffle_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'shuffle function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'shuffles arrays' do
-      pp = <<-EOS
-      $a = ["the","public","art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = shuffle($a)
-      notice(inline_template('shuffle is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to_not match(/shuffle is \["the", "public", "art", "galleries"\]/)
-      end
-    end
-    it 'shuffles strings' do
-      pp = <<-EOS
-      $a = "blowzy night-frumps vex'd jack q"
-      $o = shuffle($a)
-      notice(inline_template('shuffle is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to_not match(/shuffle is "blowzy night-frumps vex'd jack q"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb
deleted file mode 100755
index a52b778bde6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/size_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'size function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'single string size' do
-      pp = <<-EOS
-      $a = 'discombobulate'
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 14/)
-      end
-    end
-    it 'with empty string' do
-      pp = <<-EOS
-      $a = ''
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 0/)
-      end
-    end
-    it 'with undef' do
-      pp = <<-EOS
-      $a = undef
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 0/)
-      end
-    end
-    it 'strings in array' do
-      pp = <<-EOS
-      $a = ['discombobulate', 'moo']
-      $o = size($a)
-      notice(inline_template('size is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/size is 2/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb
deleted file mode 100755
index c85bfabd5c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/sort_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'sort function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'sorts arrays' do
-      pp = <<-EOS
-      $a = ["the","public","art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = sort($a)
-      notice(inline_template('sort is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/sort is \["art", "galleries", "public", "the"\]/)
-      end
-    end
-    it 'sorts strings' do
-      pp = <<-EOS
-      $a = "blowzy night-frumps vex'd jack q"
-      $o = sort($a)
-      notice(inline_template('sort is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/sort is "    '-abcdefghijklmnopqrstuvwxyz"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb
deleted file mode 100755
index 400a458c9b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/squeeze_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'squeeze function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'squeezes arrays' do
-      pp = <<-EOS
-      # Real words!
-      $a = ["wallless", "laparohysterosalpingooophorectomy", "brrr", "goddessship"]
-      $o = squeeze($a)
-      notice(inline_template('squeeze is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/squeeze is \["wales", "laparohysterosalpingophorectomy", "br", "godeship"\]/)
-      end
-    end
-    it 'squeezez arrays with an argument'
-    it 'squeezes strings' do
-      pp = <<-EOS
-      $a = "wallless laparohysterosalpingooophorectomy brrr goddessship"
-      $o = squeeze($a)
-      notice(inline_template('squeeze is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/squeeze is "wales laparohysterosalpingophorectomy br godeship"/)
-      end
-    end
-
-    it 'squeezes strings with an argument' do
-      pp = <<-EOS
-      $a = "countessship duchessship governessship hostessship"
-      $o = squeeze($a, 's')
-      notice(inline_template('squeeze is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/squeeze is "counteship ducheship governeship hosteship"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb
deleted file mode 100755
index cf549dab886..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2bool_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'str2bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'works with "y"' do
-      pp = <<-EOS
-      $o = str2bool('y')
-      notice(inline_template('str2bool is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/str2bool is true/)
-      end
-    end
-    it 'works with "Y"'
-    it 'works with "yes"'
-    it 'works with "1"'
-    it 'works with "true"'
-    it 'works with "n"'
-    it 'works with "N"'
-    it 'works with "no"'
-    it 'works with "0"'
-    it 'works with "false"'
-    it 'works with undef'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non arrays or strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb
deleted file mode 100755
index 993e63baceb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/str2saltedsha512_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'str2saltedsha512 function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'works with "y"' do
-      pp = <<-EOS
-      $o = str2saltedsha512('password')
-      notice(inline_template('str2saltedsha512 is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/str2saltedsha512 is "[a-f0-9]{136}"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles more than one argument'
-    it 'handles non strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb
deleted file mode 100755
index 53b7f903bec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strftime_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'strftime function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'gives the Century' do
-      pp = <<-EOS
-      $o = strftime('%C')
-      notice(inline_template('strftime is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strftime is "20"/)
-      end
-    end
-    it 'takes a timezone argument'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles invalid format strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb
deleted file mode 100755
index 906fd7abed3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/strip_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'strip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'strips arrays' do
-      pp = <<-EOS
-      $a = ["  the   ","   public   ","   art","galleries   "]
-      # Anagram: Large picture halls, I bet
-      $o = strip($a)
-      notice(inline_template('strip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strip is \["the", "public", "art", "galleries"\]/)
-      end
-    end
-    it 'strips strings' do
-      pp = <<-EOS
-      $a = "   blowzy night-frumps vex'd jack q   "
-      $o = strip($a)
-      notice(inline_template('strip is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/strip is "blowzy night-frumps vex'd jack q"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb
deleted file mode 100755
index 630f866d700..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/suffix_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'suffix function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'suffixes array of values' do
-      pp = <<-EOS
-      $o = suffix(['a','b','c'],'p')
-      notice(inline_template('suffix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/suffix is \["ap", "bp", "cp"\]/)
-      end
-    end
-    it 'suffixs with empty array' do
-      pp = <<-EOS
-      $o = suffix([],'p')
-      notice(inline_template('suffix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/suffix is \[\]/)
-      end
-    end
-    it 'suffixs array of values with undef' do
-      pp = <<-EOS
-      $o = suffix(['a','b','c'], undef)
-      notice(inline_template('suffix is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/suffix is \["a", "b", "c"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'fails with no arguments'
-    it 'fails when first argument is not array'
-    it 'fails when second argument is not string'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb
deleted file mode 100755
index b7894fbe274..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/swapcase_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'swapcase function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'works with strings' do
-      pp = <<-EOS
-      $o = swapcase('aBcD')
-      notice(inline_template('swapcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/swapcase is "AbCd"/)
-      end
-    end
-    it 'works with arrays'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non arrays or strings'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb
deleted file mode 100755
index cdb296070cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/time_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'time function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'gives the time' do
-      pp = <<-EOS
-      $o = time()
-      notice(inline_template('time is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        m = r.stdout.match(/time is (\d+)\D/)
-
-        # When I wrote this test
-        expect(Integer(m[1])).to be > 1398894170
-      end
-    end
-    it 'takes a timezone argument' do
-      pp = <<-EOS
-      $o = time('UTC')
-      notice(inline_template('time is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        m = r.stdout.match(/time is (\d+)\D/)
-
-        expect(Integer(m[1])).to be > 1398894170
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles more arguments'
-    it 'handles invalid timezones'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb
deleted file mode 100755
index 2b4c61f48db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/to_bytes_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'to_bytes function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'converts kB to B' do
-      pp = <<-EOS
-      $o = to_bytes('4 kB')
-      notice(inline_template('to_bytes is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        m = r.stdout.match(/to_bytes is (\d+)\D/)
-        expect(m[1]).to eq("4096")
-      end
-    end
-    it 'works without the B in unit'
-    it 'works without a space before unit'
-    it 'works without a unit'
-    it 'converts fractions'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non integer arguments'
-    it 'handles unknown units like uB'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb
deleted file mode 100755
index 0043aad7cdd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/type_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'type function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'types arrays' do
-      pp = <<-EOS
-      $a = ["the","public","art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = type($a)
-      notice(inline_template('type is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/type is "array"/)
-      end
-    end
-    it 'types strings' do
-      pp = <<-EOS
-      $a = "blowzy night-frumps vex'd jack q"
-      $o = type($a)
-      notice(inline_template('type is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/type is "string"/)
-      end
-    end
-    it 'types hashes'
-    it 'types integers'
-    it 'types floats'
-    it 'types booleans'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb
deleted file mode 100755
index 6db8d0cf96f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/union_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'union function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'unions arrays' do
-      pp = <<-EOS
-      $a = ["the","public"]
-      $b = ["art","galleries"]
-      # Anagram: Large picture halls, I bet
-      $o = union($a,$b)
-      notice(inline_template('union is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/union is \["the", "public", "art", "galleries"\]/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb
deleted file mode 100755
index bfadad19bf9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unique_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'unique function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'uniques arrays' do
-      pp = <<-EOS
-      $a = ["wallless", "wallless", "brrr", "goddessship"]
-      $o = unique($a)
-      notice(inline_template('unique is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/unique is \["wallless", "brrr", "goddessship"\]/)
-      end
-    end
-    it 'uniques strings' do
-      pp = <<-EOS
-      $a = "wallless laparohysterosalpingooophorectomy brrr goddessship"
-      $o = unique($a)
-      notice(inline_template('unique is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/unique is "wales prohytingcmbd"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb
deleted file mode 100755
index 1c559f67ecb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/unsupported_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'unsupported distributions and OSes', :if => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  it 'should fail' do
-    pp = <<-EOS
-    class { 'mysql::server': }
-    EOS
-    expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/unsupported osfamily/i)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb
deleted file mode 100755
index 3d2906d7254..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/upcase_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'upcase function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'upcases arrays' do
-      pp = <<-EOS
-      $a = ["wallless", "laparohysterosalpingooophorectomy", "brrr", "goddessship"]
-      $o = upcase($a)
-      notice(inline_template('upcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/upcase is \["WALLLESS", "LAPAROHYSTEROSALPINGOOOPHORECTOMY", "BRRR", "GODDESSSHIP"\]/)
-      end
-    end
-    it 'upcases strings' do
-      pp = <<-EOS
-      $a = "wallless laparohysterosalpingooophorectomy brrr goddessship"
-      $o = upcase($a)
-      notice(inline_template('upcase is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/upcase is "WALLLESS LAPAROHYSTEROSALPINGOOOPHORECTOMY BRRR GODDESSSHIP"/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb
deleted file mode 100755
index 7e30205e8dd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/uriescape_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'uriescape function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'uriescape strings' do
-      pp = <<-EOS
-      $a = ":/?#[]@!$&'()*+,;= \\\"{}"
-      $o = uriescape($a)
-      notice(inline_template('uriescape is <%= @o.inspect %>'))
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/uriescape is ":\/\?%23\[\]@!\$&'\(\)\*\+,;=%20%22%7B%7D"/)
-      end
-    end
-    it 'does nothing if a string is already safe'
-  end
-  describe 'failure' do
-    it 'handles no arguments'
-    it 'handles non strings or arrays'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb
deleted file mode 100755
index 7082e848ef9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_absolute_path_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_absolute_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    %w{
-      C:/
-      C:\\\\
-      C:\\\\WINDOWS\\\\System32
-      C:/windows/system32
-      X:/foo/bar
-      X:\\\\foo\\\\bar
-      /var/tmp
-      /var/lib/puppet
-      /var/opt/../lib/puppet
-    }.each do |path|
-      it "validates a single argument #{path}" do
-        pp = <<-EOS
-        $one = '#{path}'
-        validate_absolute_path($one)
-        EOS
-
-        apply_manifest(pp, :catch_failures => true)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles relative paths'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb
deleted file mode 100755
index b53e98c273e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_array_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_array function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = ['a', 'b']
-      validate_array($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = ['a', 'b']
-      $two = [['c'], 'd']
-      validate_array($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-array' do
-      {
-        %{validate_array({'a' => 'hash' })} => "Hash",
-        %{validate_array('string')}         => "String",
-        %{validate_array(false)}            => "FalseClass",
-        %{validate_array(undef)}            => "String"
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb
deleted file mode 100755
index aeec67ae1b9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_augeas_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_augeas function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'prep' do
-    it 'installs augeas for tests'
-  end
-  describe 'success' do
-    context 'valid inputs with no 3rd argument' do
-      {
-        'root:x:0:0:root:/root:/bin/bash\n'                        => 'Passwd.lns',
-        'proc /proc   proc    nodev,noexec,nosuid     0       0\n' => 'Fstab.lns'
-      }.each do |line,lens|
-        it "validates a single argument for #{lens}" do
-          pp = <<-EOS
-          $line = "#{line}"
-          $lens = "#{lens}"
-          validate_augeas($line, $lens)
-          EOS
-
-          apply_manifest(pp, :catch_failures => true)
-        end
-      end
-    end
-    context 'valid inputs with 3rd and 4th arguments' do
-      it "validates a restricted value" do
-        line        = 'root:x:0:0:root:/root:/bin/barsh\n'
-        lens        = 'Passwd.lns'
-        restriction = '$file/*[shell="/bin/barsh"]'
-        pp = <<-EOS
-        $line        = "#{line}"
-        $lens        = "#{lens}"
-        $restriction = ['#{restriction}']
-        validate_augeas($line, $lens, $restriction, "my custom failure message")
-        EOS
-
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/my custom failure message/)
-      end
-    end
-    context 'invalid inputs' do
-      {
-        'root:x:0:0:root' => 'Passwd.lns',
-        '127.0.1.1'       => 'Hosts.lns'
-      }.each do |line,lens|
-        it "validates a single argument for #{lens}" do
-          pp = <<-EOS
-          $line = "#{line}"
-          $lens = "#{lens}"
-          validate_augeas($line, $lens)
-          EOS
-
-          apply_manifest(pp, :expect_failures => true)
-        end
-      end
-    end
-    context 'garbage inputs' do
-      it 'raises an error on invalid inputs'
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb
deleted file mode 100755
index c837f089f29..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_bool_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_bool function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = true
-      validate_bool($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = true
-      $two = false
-      validate_bool($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-bool' do
-      {
-        %{validate_bool('true')}  => "String",
-        %{validate_bool('false')} => "String",
-        %{validate_bool([true])}  => "Array",
-        %{validate_bool(undef)}   => "String",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb
deleted file mode 100755
index 385676d14b0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_cmd_spec.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_cmd function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a true command' do
-      pp = <<-EOS
-      $one = 'foo'
-      if $::osfamily == 'windows' {
-        $two = 'echo' #shell built-in
-      } else {
-        $two = '/bin/echo'
-      }
-      validate_cmd($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a fail command' do
-      pp = <<-EOS
-      $one = 'foo'
-      if $::osfamily == 'windows' {
-        $two = 'C:/aoeu'
-      } else {
-        $two = '/bin/aoeu'
-      }
-      validate_cmd($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates a fail command with a custom error message' do
-      pp = <<-EOS
-      $one = 'foo'
-      if $::osfamily == 'windows' {
-        $two = 'C:/aoeu'
-      } else {
-        $two = '/bin/aoeu'
-      }
-      validate_cmd($one,$two,"aoeu is dvorak)
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/aoeu is dvorak/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles improper argument types'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb
deleted file mode 100755
index 52fb615bdf4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_hash_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_hash function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = { 'a' => 1 }
-      validate_hash($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = { 'a' => 1 }
-      $two = { 'b' => 2 }
-      validate_hash($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-hash' do
-      {
-        %{validate_hash('{ "not" => "hash" }')} => "String",
-        %{validate_hash('string')}              => "String",
-        %{validate_hash(["array"])}             => "Array",
-        %{validate_hash(undef)}                 => "String",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb
deleted file mode 100755
index 64841c37163..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv4_address_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_ipv4_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = '1.2.3.4'
-      validate_ipv4_address($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = '1.2.3.4'
-      $two = '5.6.7.8'
-      validate_ipv4_address($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles ipv6 addresses'
-    it 'handles non-ipv4 strings'
-    it 'handles numbers'
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb
deleted file mode 100755
index 6426d1a526a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_ipv6_address_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_ipv6_address function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = '3ffe:0505:0002::'
-      validate_ipv6_address($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = '3ffe:0505:0002::'
-      $two = '3ffe:0505:0001::'
-      validate_ipv6_address($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles ipv6 addresses'
-    it 'handles non-ipv6 strings'
-    it 'handles numbers'
-    it 'handles no arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb
deleted file mode 100755
index 22f6d47d1d1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_re_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_re function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a string' do
-      pp = <<-EOS
-      $one = 'one'
-      $two = '^one$'
-      validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an array' do
-      pp = <<-EOS
-      $one = 'one'
-      $two = ['^one$', '^two']
-      validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a failed array' do
-      pp = <<-EOS
-      $one = 'one'
-      $two = ['^two$', '^three']
-      validate_re($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates a failed array with a custom error message' do
-      pp = <<-EOS
-      $one = '3.4.3'
-      $two = '^2.7'
-      validate_re($one,$two,"The $puppetversion fact does not match 2.7")
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/does not match/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles improper argument types'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb
deleted file mode 100755
index 1ab2bb986e8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_slength_spec.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_slength function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single string max' do
-      pp = <<-EOS
-      $one = 'discombobulate'
-      $two = 17
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates multiple string maxes' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 17
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates min/max of  strings in array' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 17
-      $three = 3
-      validate_slength($one,$two,$three)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a single string max of incorrect length' do
-      pp = <<-EOS
-      $one = 'discombobulate'
-      $two = 1
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates multiple string maxes of incorrect length' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 3
-      validate_slength($one,$two)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-    it 'validates multiple strings min/maxes of incorrect length' do
-      pp = <<-EOS
-      $one = ['discombobulate', 'moo']
-      $two = 17
-      $three = 10
-      validate_slength($one,$two,$three)
-      EOS
-
-      apply_manifest(pp, :expect_failures => true)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-    it 'handles improper first argument type'
-    it 'handles non-strings in array of first argument'
-    it 'handles improper second argument type'
-    it 'handles improper third argument type'
-    it 'handles negative ranges'
-    it 'handles improper ranges'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb
deleted file mode 100755
index 8956f48c908..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/validate_string_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'validate_string function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'validates a single argument' do
-      pp = <<-EOS
-      $one = 'string'
-      validate_string($one)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates an multiple arguments' do
-      pp = <<-EOS
-      $one = 'string'
-      $two = 'also string'
-      validate_string($one,$two)
-      EOS
-
-      apply_manifest(pp, :catch_failures => true)
-    end
-    it 'validates a non-string' do
-      {
-        %{validate_string({ 'a' => 'hash' })} => "Hash",
-        %{validate_string(['array'])}         => "Array",
-        %{validate_string(false)}             => "FalseClass",
-      }.each do |pp,type|
-        expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/a #{type}/)
-      end
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb
deleted file mode 100755
index da63cf307a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_at_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'values_at function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns a specific value' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = 1
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["b"\]/)
-    end
-    it 'returns a specific negative index value' do
-      pending("negative numbers don't work")
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = -1
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["e"\]/)
-    end
-    it 'returns a range of values' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = "1-3"
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["b", "c", "d"\]/)
-    end
-    it 'returns a negative specific value and range of values' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = ["1-3",0]
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["b", "c", "d", "a"\]/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $output = values_at($one)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Wrong number of arguments/)
-    end
-    it 'handles non-indicies arguments' do
-      pp = <<-EOS
-      $one = ['a','b','c','d','e']
-      $two = []
-      $output = values_at($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/at least one positive index/)
-    end
-
-    it 'detects index ranges smaller than the start range'
-    it 'handles index ranges larger than array'
-    it 'handles non-integer indicies'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb
deleted file mode 100755
index 7ef956e0489..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/values_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-
-describe 'values function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'returns an array of values' do
-      pp = <<-EOS
-      $arg = {
-        'a' => 1,
-        'b' => 2,
-        'c' => 3,
-      }
-      $output = values($arg)
-      notice(inline_template('<%= @output.sort.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "2", "3"\]/)
-    end
-  end
-  describe 'failure' do
-    it 'handles non-hash arguments' do
-      pp = <<-EOS
-      $arg = "foo"
-      $output = values($arg)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Requires hash/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb
deleted file mode 100755
index 0e924e8492f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/acceptance/zip_spec.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper_acceptance'
-require 'puppet'
-
-describe 'zip function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
-  describe 'success' do
-    it 'zips two arrays of numbers together' do
-      pp = <<-EOS
-      $one = [1,2,3,4]
-      $two = [5,6,7,8]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", "5"\], \["2", "6"\], \["3", "7"\], \["4", "8"\]\]/)
-    end
-    it 'zips two arrays of numbers & bools together' do
-      pp = <<-EOS
-      $one = [1,2,"three",4]
-      $two = [true,true,false,false]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", true\], \["2", true\], \["three", false\], \["4", false\]\]/)
-    end
-    it 'zips two arrays of numbers together and flattens them' do
-      # XXX This only tests the argument `true`, even though the following are valid:
-      # 1 t y true yes
-      # 0 f n false no
-      # undef undefined
-      pp = <<-EOS
-      $one = [1,2,3,4]
-      $two = [5,6,7,8]
-      $output = zip($one,$two,true)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\["1", "5", "2", "6", "3", "7", "4", "8"\]/)
-    end
-    it 'handles unmatched length' do
-      # XXX Is this expected behavior?
-      pp = <<-EOS
-      $one = [1,2]
-      $two = [5,6,7,8]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :catch_failures => true).stdout).to match(/\[\["1", "5"\], \["2", "6"\]\]/)
-    end
-  end
-  describe 'failure' do
-    it 'handles improper number of arguments' do
-      pp = <<-EOS
-      $one = [1,2]
-      $output = zip($one)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Wrong number of arguments/)
-    end
-    it 'handles improper argument types' do
-      pp = <<-EOS
-      $one = "a string"
-      $two = [5,6,7,8]
-      $output = zip($one,$two)
-      notice(inline_template('<%= @output.inspect %>'))
-      EOS
-
-      expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/Requires array/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb
deleted file mode 100755
index 2d4455e417e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/classes/anchor_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'puppet_spec/compiler'
-
-describe "anchorrefresh" do
-  include PuppetSpec::Compiler
-
-  let :transaction do
-    apply_compiled_manifest(<<-ANCHORCLASS)
-      class anchored {
-        anchor { 'anchored::begin': }
-        ~> anchor { 'anchored::end': }
-      }
-
-      class anchorrefresh {
-        notify { 'first': }
-        ~> class { 'anchored': }
-        ~> anchor { 'final': }
-      }
-
-      include anchorrefresh
-    ANCHORCLASS
-  end
-
-  it 'propagates events through the anchored class' do
-    resource = transaction.resource_status('Anchor[final]')
-
-    expect(resource.restarted).to eq(true)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root
deleted file mode 100644
index 1e34519b2af..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/fixtures/dscacheutil/root
+++ /dev/null
@@ -1,8 +0,0 @@
-name: root
-password: *
-uid: 0
-gid: 0
-dir: /var/root
-shell: /bin/bash
-gecos: rawr Root
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb
deleted file mode 100755
index c0b42970c52..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/abs_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the abs function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("abs").should == "function_abs"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_abs([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert a negative number into a positive" do
-    result = scope.function_abs(["-34"])
-    result.should(eq(34))
-  end
-
-  it "should do nothing with a positive number" do
-    result = scope.function_abs(["5678"])
-    result.should(eq(5678))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb
deleted file mode 100755
index b266e84f4f3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/any2array_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the any2array function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("any2array").should == "function_any2array"
-  end
-
-  it "should return an empty array if there is less than 1 argument" do
-    result = scope.function_any2array([])
-    result.should(eq([]))
-  end
-
-  it "should convert boolean true to [ true ] " do
-    result = scope.function_any2array([true])
-    result.should(eq([true]))
-  end
-
-  it "should convert one object to [object]" do
-    result = scope.function_any2array(['one'])
-    result.should(eq(['one']))
-  end
-
-  it "should convert multiple objects to [objects]" do
-    result = scope.function_any2array(['one', 'two'])
-    result.should(eq(['one', 'two']))
-  end
-
-  it "should return empty array it was called with" do
-    result = scope.function_any2array([[]])
-    result.should(eq([]))
-  end
-
-  it "should return one-member array it was called with" do
-    result = scope.function_any2array([['string']])
-    result.should(eq(['string']))
-  end
-
-  it "should return multi-member array it was called with" do
-    result = scope.function_any2array([['one', 'two']])
-    result.should(eq(['one', 'two']))
-  end
-
-  it "should return members of a hash it was called with" do
-    result = scope.function_any2array([{ 'key' => 'value' }])
-    result.should(eq(['key', 'value']))
-  end
-
-  it "should return an empty array if it was called with an empty hash" do
-    result = scope.function_any2array([{ }])
-    result.should(eq([]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb
deleted file mode 100755
index 5faa5e66c73..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/base64_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the base64 function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("base64").should == "function_base64"
-  end
-
-  it "should raise a ParseError if there are other than 2 arguments" do
-    expect { scope.function_base64([]) }.to(raise_error(Puppet::ParseError))
-    expect { scope.function_base64(["asdf"]) }.to(raise_error(Puppet::ParseError))
-    expect { scope.function_base64(["asdf","moo","cow"]) }.to(raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if argument 1 isn't 'encode' or 'decode'" do
-    expect { scope.function_base64(["bees","astring"]) }.to(raise_error(Puppet::ParseError, /first argument must be one of/))
-  end
-
-  it "should raise a ParseError if argument 2 isn't a string" do
-    expect { scope.function_base64(["encode",["2"]]) }.to(raise_error(Puppet::ParseError, /second argument must be a string/))
-  end
-
-  it "should encode a encoded string" do
-    result = scope.function_base64(["encode",'thestring'])
-    result.should =~ /\AdGhlc3RyaW5n\n\Z/
-  end
-  it "should decode a base64 encoded string" do
-    result = scope.function_base64(["decode",'dGhlc3RyaW5n'])
-    result.should == 'thestring'
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb
deleted file mode 100755
index 518ac85ec5f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/bool2num_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the bool2num function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("bool2num").should == "function_bool2num"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_bool2num([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert true to 1" do
-    result = scope.function_bool2num([true])
-    result.should(eq(1))
-  end
-
-  it "should convert false to 0" do
-    result = scope.function_bool2num([false])
-    result.should(eq(0))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb
deleted file mode 100755
index 69c9758f25b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/capitalize_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the capitalize function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("capitalize").should == "function_capitalize"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_capitalize([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should capitalize the beginning of a string" do
-    result = scope.function_capitalize(["abc"])
-    result.should(eq("Abc"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb
deleted file mode 100755
index e425365fcb0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chomp_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the chomp function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("chomp").should == "function_chomp"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_chomp([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should chomp the end of a string" do
-    result = scope.function_chomp(["abc\n"])
-    result.should(eq("abc"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb
deleted file mode 100755
index 9e466de4b69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/chop_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the chop function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("chop").should == "function_chop"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_chop([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should chop the end of a string" do
-    result = scope.function_chop(["asdf\n"])
-    result.should(eq("asdf"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb
deleted file mode 100755
index 6e67620966b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/concat_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the concat function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should raise a ParseError if the client does not provide two arguments" do
-    lambda { scope.function_concat([]) }.should(raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if the first parameter is not an array" do
-    lambda { scope.function_concat([1, []])}.should(raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to concat an array" do
-    result = scope.function_concat([['1','2','3'],['4','5','6']])
-    result.should(eq(['1','2','3','4','5','6']))
-  end
-
-  it "should be able to concat a primitive to an array" do
-    result = scope.function_concat([['1','2','3'],'4'])
-    result.should(eq(['1','2','3','4']))
-  end
-
-  it "should not accidentally flatten nested arrays" do
-    result = scope.function_concat([['1','2','3'],[['4','5'],'6']])
-    result.should(eq(['1','2','3',['4','5'],'6']))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb
deleted file mode 100755
index 2453815c26d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/count_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the count function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("count").should == "function_count"
-  end
-
-  it "should raise a ArgumentError if there is more than 2 arguments" do
-    lambda { scope.function_count(['foo', 'bar', 'baz']) }.should( raise_error(ArgumentError))
-  end
-
-  it "should be able to count arrays" do
-    scope.function_count([["1","2","3"]]).should(eq(3))
-  end
-
-  it "should be able to count matching elements in arrays" do
-    scope.function_count([["1", "2", "2"], "2"]).should(eq(2))
-  end
-
-  it "should not count nil or empty strings" do
-    scope.function_count([["foo","bar",nil,""]]).should(eq(2))
-  end
-
-  it 'does not count an undefined hash key or an out of bound array index (which are both :undef)' do
-    expect(scope.function_count([["foo",:undef,:undef]])).to eq(1)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb
deleted file mode 100755
index f1347014cf2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/deep_merge_spec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:deep_merge) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling deep_merge from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = deep_merge()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$my_hash={'one' => 1}\n$x = deep_merge($my_hash)"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-
-  describe 'when calling deep_merge on the scope instance' do
-    it 'should require all parameters are hashes' do
-      expect { new_hash = scope.function_deep_merge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
-      expect { new_hash = scope.function_deep_merge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
-    end
-
-    it 'should accept empty strings as puppet undef' do
-      expect { new_hash = scope.function_deep_merge([{}, ''])}.not_to raise_error
-    end
-
-    it 'should be able to deep_merge two hashes' do
-      new_hash = scope.function_deep_merge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}])
-      new_hash['one'].should   == '1'
-      new_hash['two'].should   == '2'
-      new_hash['three'].should == '2'
-    end
-
-    it 'should deep_merge multiple hashes' do
-      hash = scope.function_deep_merge([{'one' => 1}, {'one' => '2'}, {'one' => '3'}])
-      hash['one'].should == '3'
-    end
-
-    it 'should accept empty hashes' do
-      scope.function_deep_merge([{},{},{}]).should == {}
-    end
-
-    it 'should deep_merge subhashes' do
-      hash = scope.function_deep_merge([{'one' => 1}, {'two' => 2, 'three' => { 'four' => 4 } }])
-      hash['one'].should == 1
-      hash['two'].should == 2
-      hash['three'].should == { 'four' => 4 }
-    end
-
-    it 'should append to subhashes' do
-      hash = scope.function_deep_merge([{'one' => { 'two' => 2 } }, { 'one' => { 'three' => 3 } }])
-      hash['one'].should == { 'two' => 2, 'three' => 3 }
-    end
-
-    it 'should append to subhashes 2' do
-      hash = scope.function_deep_merge([{'one' => 1, 'two' => 2, 'three' => { 'four' => 4 } }, {'two' => 'dos', 'three' => { 'five' => 5 } }])
-      hash['one'].should == 1
-      hash['two'].should == 'dos'
-      hash['three'].should == { 'four' => 4, 'five' => 5 }
-    end
-
-    it 'should append to subhashes 3' do
-      hash = scope.function_deep_merge([{ 'key1' => { 'a' => 1, 'b' => 2 }, 'key2' => { 'c' => 3 } }, { 'key1' => { 'b' => 99 } }])
-      hash['key1'].should == { 'a' => 1, 'b' => 99 }
-      hash['key2'].should == { 'c' => 3 }
-    end
-
-    it 'should not change the original hashes' do
-      hash1 = {'one' => { 'two' => 2 } }
-      hash2 = { 'one' => { 'three' => 3 } }
-      hash = scope.function_deep_merge([hash1, hash2])
-      hash1.should == {'one' => { 'two' => 2 } }
-      hash2.should == { 'one' => { 'three' => 3 } }
-      hash['one'].should == { 'two' => 2, 'three' => 3 }
-    end
-
-    it 'should not change the original hashes 2' do
-      hash1 = {'one' => { 'two' => [1,2] } }
-      hash2 = { 'one' => { 'three' => 3 } }
-      hash = scope.function_deep_merge([hash1, hash2])
-      hash1.should == {'one' => { 'two' => [1,2] } }
-      hash2.should == { 'one' => { 'three' => 3 } }
-      hash['one'].should == { 'two' => [1,2], 'three' => 3 }
-    end
-
-    it 'should not change the original hashes 3' do
-      hash1 = {'one' => { 'two' => [1,2, {'two' => 2} ] } }
-      hash2 = { 'one' => { 'three' => 3 } }
-      hash = scope.function_deep_merge([hash1, hash2])
-      hash1.should == {'one' => { 'two' => [1,2, {'two' => 2}] } }
-      hash2.should == { 'one' => { 'three' => 3 } }
-      hash['one'].should == { 'two' => [1,2, {'two' => 2} ], 'three' => 3 }
-      hash['one']['two'].should == [1,2, {'two' => 2}]
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb
deleted file mode 100755
index 28dbab31192..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/defined_with_params_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-require 'rspec-puppet'
-describe 'defined_with_params' do
-  describe 'when a resource is not specified' do
-    it { should run.with_params().and_raise_error(ArgumentError) }
-  end
-  describe 'when compared against a resource with no attributes' do
-    let :pre_condition do
-      'user { "dan": }'
-    end
-    it do
-      should run.with_params('User[dan]', {}).and_return(true)
-      should run.with_params('User[bob]', {}).and_return(false)
-      should run.with_params('User[dan]', {'foo' => 'bar'}).and_return(false)
-    end
-  end
-
-  describe 'when compared against a resource with attributes' do
-    let :pre_condition do
-      'user { "dan": ensure => present, shell => "/bin/csh", managehome => false}'
-    end
-    it do
-      should run.with_params('User[dan]', {}).and_return(true)
-      should run.with_params('User[dan]', '').and_return(true)
-      should run.with_params('User[dan]', {'ensure' => 'present'}
-                            ).and_return(true)
-      should run.with_params('User[dan]',
-                             {'ensure' => 'present', 'managehome' => false}
-                            ).and_return(true)
-      should run.with_params('User[dan]',
-                             {'ensure' => 'absent', 'managehome' => false}
-                            ).and_return(false)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb
deleted file mode 100755
index 593cf45929f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_at_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete_at function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete_at").should == "function_delete_at"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_delete_at([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should delete an item at specified location from an array" do
-    result = scope.function_delete_at([['a','b','c'],1])
-    result.should(eq(['a','c']))
-  end
-
-  it "should not change origin array passed as argument" do
-    origin_array = ['a','b','c','d']
-    result = scope.function_delete_at([origin_array, 1])
-    origin_array.should(eq(['a','b','c','d']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb
deleted file mode 100755
index 1508a63e914..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete").should == "function_delete"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_delete([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there are greater than 2 arguments" do
-    lambda { scope.function_delete([[], 'foo', 'bar']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a TypeError if a number is passed as the first argument" do
-    lambda { scope.function_delete([1, 'bar']) }.should( raise_error(TypeError))
-  end
-
-  it "should delete all instances of an element from an array" do
-    result = scope.function_delete([['a','b','c','b'],'b'])
-    result.should(eq(['a','c']))
-  end
-
-  it "should delete all instances of a substring from a string" do
-    result = scope.function_delete(['foobarbabarz','bar'])
-    result.should(eq('foobaz'))
-  end
-
-  it "should delete a key from a hash" do
-    result = scope.function_delete([{ 'a' => 1, 'b' => 2, 'c' => 3 },'b'])
-    result.should(eq({ 'a' => 1, 'c' => 3 }))
-  end
-
-  it "should not change origin array passed as argument" do
-    origin_array = ['a','b','c','d']
-    result = scope.function_delete([origin_array, 'b'])
-    origin_array.should(eq(['a','b','c','d']))
-  end
-
-  it "should not change the origin string passed as argument" do
-    origin_string = 'foobarbabarz'
-    result = scope.function_delete([origin_string,'bar'])
-    origin_string.should(eq('foobarbabarz'))
-  end
-
-  it "should not change origin hash passed as argument" do
-    origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
-    result = scope.function_delete([origin_hash, 'b'])
-    origin_hash.should(eq({ 'a' => 1, 'b' => 2, 'c' => 3 }))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb
deleted file mode 100755
index b341d888ae1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_undef_values_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete_undef_values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete_undef_values").should == "function_delete_undef_values"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    lambda { scope.function_delete_undef_values([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if the argument is not Array nor Hash" do
-    lambda { scope.function_delete_undef_values(['']) }.should( raise_error(Puppet::ParseError))
-    lambda { scope.function_delete_undef_values([nil]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should delete all undef items from Array and only these" do
-    result = scope.function_delete_undef_values([['a',:undef,'c','undef']])
-    result.should(eq(['a','c','undef']))
-  end
-
-  it "should delete all undef items from Hash and only these" do
-    result = scope.function_delete_undef_values([{'a'=>'A','b'=>:undef,'c'=>'C','d'=>'undef'}])
-    result.should(eq({'a'=>'A','c'=>'C','d'=>'undef'}))
-  end
-
-  it "should not change origin array passed as argument" do
-    origin_array = ['a',:undef,'c','undef']
-    result = scope.function_delete_undef_values([origin_array])
-    origin_array.should(eq(['a',:undef,'c','undef']))
-  end
-
-  it "should not change origin hash passed as argument" do
-    origin_hash = { 'a' => 1, 'b' => :undef, 'c' => 'undef' }
-    result = scope.function_delete_undef_values([origin_hash])
-    origin_hash.should(eq({ 'a' => 1, 'b' => :undef, 'c' => 'undef' }))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb
deleted file mode 100755
index 8d7f2315d46..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/delete_values_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the delete_values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("delete_values").should == "function_delete_values"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_delete_values([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there are greater than 2 arguments" do
-    lambda { scope.function_delete_values([[], 'foo', 'bar']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a TypeError if the argument is not a hash" do
-    lambda { scope.function_delete_values([1,'bar']) }.should( raise_error(TypeError))
-    lambda { scope.function_delete_values(['foo','bar']) }.should( raise_error(TypeError))
-    lambda { scope.function_delete_values([[],'bar']) }.should( raise_error(TypeError))
-  end
-
-  it "should delete all instances of a value from a hash" do
-    result = scope.function_delete_values([{ 'a'=>'A', 'b'=>'B', 'B'=>'C', 'd'=>'B' },'B'])
-    result.should(eq({ 'a'=>'A', 'B'=>'C' }))
-  end
-
-  it "should not change origin hash passed as argument" do
-    origin_hash = { 'a' => 1, 'b' => 2, 'c' => 3 }
-    result = scope.function_delete_values([origin_hash, 2])
-    origin_hash.should(eq({ 'a' => 1, 'b' => 2, 'c' => 3 }))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb
deleted file mode 100755
index 9feff091890..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/difference_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the difference function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("difference").should == "function_difference"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_difference([]) }.should( raise_error(Puppet::ParseError) )
-  end
-
-  it "should return the difference between two arrays" do
-    result = scope.function_difference([["a","b","c"],["b","c","d"]])
-    result.should(eq(["a"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb
deleted file mode 100755
index fb3b4feca77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/dirname_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the dirname function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("dirname").should == "function_dirname"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_dirname([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return dirname for an absolute path" do
-    result = scope.function_dirname(['/path/to/a/file.ext'])
-    result.should(eq('/path/to/a'))
-  end
-
-  it "should return dirname for a relative path" do
-    result = scope.function_dirname(['path/to/a/file.ext'])
-    result.should(eq('path/to/a'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb
deleted file mode 100755
index acef1f05d92..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/downcase_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the downcase function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("downcase").should == "function_downcase"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_downcase([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should downcase a string" do
-    result = scope.function_downcase(["ASFD"])
-    result.should(eq("asfd"))
-  end
-
-  it "should do nothing to a string that is already downcase" do
-    result = scope.function_downcase(["asdf asdf"])
-    result.should(eq("asdf asdf"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb
deleted file mode 100755
index 77458752248..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/empty_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the empty function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("empty").should == "function_empty"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_empty([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return a true for an empty string" do
-    result = scope.function_empty([''])
-    result.should(eq(true))
-  end
-
-  it "should return a false for a non-empty string" do
-    result = scope.function_empty(['asdf'])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb
deleted file mode 100755
index 436be10bc4e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_packages_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'spec_helper'
-require 'rspec-puppet'
-require 'puppet_spec/compiler'
-
-describe 'ensure_packages' do
-  include PuppetSpec::Compiler
-
-  before :each do
-    Puppet::Parser::Functions.autoloader.loadall
-    Puppet::Parser::Functions.function(:ensure_packages)
-    Puppet::Parser::Functions.function(:ensure_resource)
-    Puppet::Parser::Functions.function(:defined_with_params)
-    Puppet::Parser::Functions.function(:create_resources)
-  end
-
-  let :node     do Puppet::Node.new('localhost') end
-  let :compiler do Puppet::Parser::Compiler.new(node) end
-  let :scope    do
-    if Puppet.version.to_f >= 3.0
-      Puppet::Parser::Scope.new(compiler)
-    else
-      newscope = Puppet::Parser::Scope.new
-      newscope.compiler = compiler
-      newscope.source   = Puppet::Resource::Type.new(:node, :localhost)
-      newscope
-    end
-  end
-
-  describe 'argument handling' do
-    it 'fails with no arguments' do
-      expect {
-        scope.function_ensure_packages([])
-      }.to raise_error(Puppet::ParseError, /0 for 1 or 2/)
-    end
-
-    it 'accepts an array of values' do
-      scope.function_ensure_packages([['foo']])
-    end
-
-    it 'accepts a single package name as a string' do
-      scope.function_ensure_packages(['foo'])
-    end
-  end
-
-  context 'given a catalog with puppet package => absent' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        ensure_packages(['facter'])
-        package { puppet: ensure => absent }
-      EOS
-      )
-    end
-
-    it 'has no effect on Package[puppet]' do
-      expect(catalog.resource(:package, 'puppet')['ensure']).to eq('absent')
-    end
-  end
-
-  context 'given a clean catalog' do
-    let :catalog do
-      compile_to_catalog('ensure_packages(["facter"])')
-    end
-
-    it 'declares package resources with ensure => present' do
-      expect(catalog.resource(:package, 'facter')['ensure']).to eq('present')
-    end
-  end
-
-  context 'given a clean catalog and specified defaults' do
-    let :catalog do
-      compile_to_catalog('ensure_packages(["facter"], {"provider" => "gem"})')
-    end
-
-    it 'declares package resources with ensure => present' do
-      expect(catalog.resource(:package, 'facter')['ensure']).to eq('present')
-      expect(catalog.resource(:package, 'facter')['provider']).to eq('gem')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb
deleted file mode 100755
index 33bcac0d1f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/ensure_resource_spec.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'rspec-puppet'
-require 'puppet_spec/compiler'
-
-describe 'ensure_resource' do
-  include PuppetSpec::Compiler
-
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-    Puppet::Parser::Functions.function(:ensure_packages)
-  end
-
-  let :node     do Puppet::Node.new('localhost') end
-  let :compiler do Puppet::Parser::Compiler.new(node) end
-  let :scope    do Puppet::Parser::Scope.new(compiler) end
-
-  describe 'when a type or title is not specified' do
-    it { expect { scope.function_ensure_resource([]) }.to raise_error }
-    it { expect { scope.function_ensure_resource(['type']) }.to raise_error }
-  end
-
-  describe 'when compared against a resource with no attributes' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        user { "dan": }
-        ensure_resource('user', 'dan', {})
-      EOS
-      )
-    end
-
-    it 'should contain the the ensured resources' do
-      expect(catalog.resource(:user, 'dan').to_s).to eq('User[dan]')
-    end
-  end
-
-  describe 'works when compared against a resource with non-conflicting attributes' do
-    [
-      "ensure_resource('User', 'dan', {})",
-      "ensure_resource('User', 'dan', '')",
-      "ensure_resource('User', 'dan', {'ensure' => 'present'})",
-      "ensure_resource('User', 'dan', {'ensure' => 'present', 'managehome' => false})"
-    ].each do |ensure_resource|
-      pp = <<-EOS
-        user { "dan": ensure => present, shell => "/bin/csh", managehome => false}
-        #{ensure_resource}
-      EOS
-
-      it { expect { compile_to_catalog(pp) }.to_not raise_error }
-    end
-  end
-
-  describe 'fails when compared against a resource with conflicting attributes' do
-    pp = <<-EOS
-      user { "dan": ensure => present, shell => "/bin/csh", managehome => false}
-      ensure_resource('User', 'dan', {'ensure' => 'absent', 'managehome' => false})
-    EOS
-
-    it { expect { compile_to_catalog(pp) }.to raise_error }
-  end
-
-  describe 'when an array of new resources are passed in' do
-    let :catalog do
-      compile_to_catalog("ensure_resource('User', ['dan', 'alex'], {})")
-    end
-
-    it 'should contain the ensured resources' do
-      expect(catalog.resource('User[dan]').to_s).to eq('User[dan]')
-      expect(catalog.resource('User[alex]').to_s).to eq('User[alex]')
-    end
-  end
-
-  describe 'when an array of existing resources is compared against existing resources' do
-    pp = <<-EOS
-      user { 'dan': ensure => present; 'alex': ensure => present }
-      ensure_resource('User', ['dan', 'alex'], {})
-    EOS
-
-    let :catalog do
-      compile_to_catalog(pp)
-    end
-
-    it 'should return the existing resources' do
-      expect(catalog.resource('User[dan]').to_s).to eq('User[dan]')
-      expect(catalog.resource('User[alex]').to_s).to eq('User[alex]')
-    end
-  end
-
-  describe 'works when compared against existing resources with attributes' do
-    [
-      "ensure_resource('User', ['dan', 'alex'], {})",
-      "ensure_resource('User', ['dan', 'alex'], '')",
-      "ensure_resource('User', ['dan', 'alex'], {'ensure' => 'present'})",
-    ].each do |ensure_resource|
-      pp = <<-EOS
-        user { 'dan': ensure => present; 'alex': ensure => present }
-        #{ensure_resource}
-      EOS
-
-      it { expect { compile_to_catalog(pp) }.to_not raise_error }
-    end
-  end
-
-  describe 'fails when compared against existing resources with conflicting attributes' do
-    pp = <<-EOS
-      user { 'dan': ensure => present; 'alex': ensure => present }
-      ensure_resource('User', ['dan', 'alex'], {'ensure' => 'absent'})
-    EOS
-
-    it { expect { compile_to_catalog(pp) }.to raise_error }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb
deleted file mode 100755
index dba7a6bbdb1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/flatten_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the flatten function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("flatten").should == "function_flatten"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_flatten([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there is more than 1 argument" do
-    lambda { scope.function_flatten([[], []]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should flatten a complex data structure" do
-    result = scope.function_flatten([["a","b",["c",["d","e"],"f","g"]]])
-    result.should(eq(["a","b","c","d","e","f","g"]))
-  end
-
-  it "should do nothing to a structure that is already flat" do
-    result = scope.function_flatten([["a","b","c","d"]])
-    result.should(eq(["a","b","c","d"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb
deleted file mode 100755
index dbc8c773585..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/floor_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the floor function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("floor").should == "function_floor"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    lambda { scope.function_floor([]) }.should( raise_error(Puppet::ParseError, /Wrong number of arguments/))
-  end
-
-  it "should should raise a ParseError if input isn't numeric (eg. String)" do
-    lambda { scope.function_floor(["foo"]) }.should( raise_error(Puppet::ParseError, /Wrong argument type/))
-  end
-
-  it "should should raise a ParseError if input isn't numeric (eg. Boolean)" do
-    lambda { scope.function_floor([true]) }.should( raise_error(Puppet::ParseError, /Wrong argument type/))
-  end
-
-  it "should return an integer when a numeric type is passed" do
-    result = scope.function_floor([12.4])
-    result.is_a?(Integer).should(eq(true))
-  end
-
-  it "should return the input when an integer is passed" do
-    result = scope.function_floor([7])
-    result.should(eq(7))
-  end
-
-  it "should return the largest integer less than or equal to the input" do
-    result = scope.function_floor([3.8])
-    result.should(eq(3))
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
deleted file mode 100755
index 2577723351a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the fqdn_rotate function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("fqdn_rotate").should == "function_fqdn_rotate"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_fqdn_rotate([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should rotate a string and the result should be the same size" do
-    scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1")
-    result = scope.function_fqdn_rotate(["asdf"])
-    result.size.should(eq(4))
-  end
-
-  it "should rotate a string to give the same results for one host" do
-    scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1").twice
-    scope.function_fqdn_rotate(["abcdefg"]).should eql(scope.function_fqdn_rotate(["abcdefg"]))
-  end
-
-  it "should rotate a string to give different values on different hosts" do
-     scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1")
-     val1 = scope.function_fqdn_rotate(["abcdefghijklmnopqrstuvwxyz01234567890987654321"])
-     scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.2")
-     val2 = scope.function_fqdn_rotate(["abcdefghijklmnopqrstuvwxyz01234567890987654321"])
-     val1.should_not eql(val2)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb
deleted file mode 100755
index 486bef6f200..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/get_module_path_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:get_module_path) do
-  Internals = PuppetlabsSpec::PuppetInternals
-  class StubModule
-    attr_reader :path
-    def initialize(path)
-      @path = path
-    end
-  end
-
-  def scope(environment = "production")
-    Internals.scope(:compiler => Internals.compiler(:node => Internals.node(:environment => environment)))
-  end
-
-  it 'should only allow one argument' do
-    expect { scope.function_get_module_path([]) }.to raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/)
-    expect { scope.function_get_module_path(['1','2','3']) }.to raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/)
-  end
-  it 'should raise an exception when the module cannot be found' do
-    expect { scope.function_get_module_path(['foo']) }.to raise_error(Puppet::ParseError, /Could not find module/)
-  end
-  describe 'when locating a module' do
-    let(:modulepath) { "/tmp/does_not_exist" }
-    let(:path_of_module_foo) { StubModule.new("/tmp/does_not_exist/foo") }
-
-    before(:each) { Puppet[:modulepath] = modulepath }
-
-    it 'should be able to find module paths from the modulepath setting' do
-      Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo)
-      scope.function_get_module_path(['foo']).should == path_of_module_foo.path
-    end
-    it 'should be able to find module paths when the modulepath is a list' do
-      Puppet[:modulepath] = modulepath + ":/tmp"
-      Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo)
-      scope.function_get_module_path(['foo']).should == path_of_module_foo.path
-    end
-    it 'should respect the environment' do
-      pending("Disabled on Puppet 2.6.x") if Puppet.version =~ /^2\.6\b/
-      Puppet.settings[:environment] = 'danstestenv'
-      Puppet::Module.expects(:find).with('foo', 'danstestenv').returns(path_of_module_foo)
-      scope('danstestenv').function_get_module_path(['foo']).should == path_of_module_foo.path
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb
deleted file mode 100755
index bf024af0e5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getparam_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'rspec-puppet'
-require 'puppet_spec/compiler'
-
-describe 'getparam' do
-  include PuppetSpec::Compiler
-
-  before :each do
-    Puppet::Parser::Functions.autoloader.loadall
-    Puppet::Parser::Functions.function(:getparam)
-  end
-
-  let :node     do Puppet::Node.new('localhost') end
-  let :compiler do Puppet::Parser::Compiler.new(node) end
-  if Puppet.version.to_f >= 3.0
-    let :scope    do Puppet::Parser::Scope.new(compiler) end
-  else
-    let :scope    do
-      newscope = Puppet::Parser::Scope.new
-      newscope.compiler = compiler
-      newscope.source   = Puppet::Resource::Type.new(:node, :localhost)
-      newscope
-    end
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("getparam").should == "function_getparam"
-  end
-
-  describe 'when a resource is not specified' do
-    it { expect { scope.function_getparam([]) }.to raise_error }
-    it { expect { scope.function_getparam(['User[dan]']) }.to raise_error }
-    it { expect { scope.function_getparam(['User[dan]']) }.to raise_error }
-    it { expect { scope.function_getparam(['User[dan]', {}]) }.to raise_error }
-    # This seems to be OK because we just check for a string.
-    it { expect { scope.function_getparam(['User[dan]', '']) }.to_not raise_error }
-  end
-
-  describe 'when compared against a resource with no params' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        user { "dan": }
-      EOS
-      )
-    end
-
-    it do
-      expect(scope.function_getparam(['User[dan]', 'shell'])).to eq('')
-    end
-  end
-
-  describe 'when compared against a resource with params' do
-    let :catalog do
-      compile_to_catalog(<<-EOS
-        user { 'dan': ensure => present, shell => '/bin/sh', managehome => false}
-        $test = getparam(User[dan], 'shell')
-      EOS
-      )
-    end
-
-    it do
-      resource = Puppet::Parser::Resource.new(:user, 'dan', {:scope => scope})
-      resource.set_parameter('ensure', 'present')
-      resource.set_parameter('shell', '/bin/sh')
-      resource.set_parameter('managehome', false)
-      compiler.add_resource(scope, resource)
-
-      expect(scope.function_getparam(['User[dan]', 'shell'])).to eq('/bin/sh')
-      expect(scope.function_getparam(['User[dan]', ''])).to eq('')
-      expect(scope.function_getparam(['User[dan]', 'ensure'])).to eq('present')
-      # TODO: Expected this to be false, figure out why we're getting '' back.
-      expect(scope.function_getparam(['User[dan]', 'managehome'])).to eq('')
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb
deleted file mode 100755
index 5ff834ee71e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/getvar_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:getvar) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  describe 'when calling getvar from puppet' do
-
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$foo = getvar()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when too many arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$foo = getvar("foo::bar", "baz")'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should lookup variables in other namespaces" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        class site::data { $foo = 'baz' }
-        include site::data
-        $foo = getvar("site::data::foo")
-        if $foo != 'baz' {
-          fail('getvar did not return what we expect')
-        }
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb
deleted file mode 100755
index a93b842537e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/grep_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the grep function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("grep").should == "function_grep"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_grep([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should grep contents from an array" do
-    result = scope.function_grep([["aaabbb","bbbccc","dddeee"], "bbb"])
-    result.should(eq(["aaabbb","bbbccc"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb
deleted file mode 100755
index c5264e4f309..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_interface_with_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_interface_with) do
-
-  let(:scope) do
-    PuppetlabsSpec::PuppetInternals.scope
-  end
-
-  # The subject of these examples is the method itself.
-  subject do
-    function_name = Puppet::Parser::Functions.function(:has_interface_with)
-    scope.method(function_name)
-  end
-
-  # We need to mock out the Facts so we can specify how we expect this function
-  # to behave on different platforms.
-  context "On Mac OS X Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with("interfaces").returns('lo0,gif0,stf0,en1,p2p0,fw0,en0,vmnet1,vmnet8,utun0')
-    end
-    it 'should have loopback (lo0)' do
-      subject.call(['lo0']).should be_true
-    end
-    it 'should not have loopback (lo)' do
-      subject.call(['lo']).should be_false
-    end
-  end
-  context "On Linux Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with("interfaces").returns('eth0,lo')
-      scope.stubs(:lookupvar).with("ipaddress").returns('10.0.0.1')
-      scope.stubs(:lookupvar).with("ipaddress_lo").returns('127.0.0.1')
-      scope.stubs(:lookupvar).with("ipaddress_eth0").returns('10.0.0.1')
-      scope.stubs(:lookupvar).with('muppet').returns('kermit')
-      scope.stubs(:lookupvar).with('muppet_lo').returns('mspiggy')
-      scope.stubs(:lookupvar).with('muppet_eth0').returns('kermit')
-    end
-    it 'should have loopback (lo)' do
-      subject.call(['lo']).should be_true
-    end
-    it 'should not have loopback (lo0)' do
-      subject.call(['lo0']).should be_false
-    end
-    it 'should have ipaddress with 127.0.0.1' do
-      subject.call(['ipaddress', '127.0.0.1']).should be_true
-    end
-    it 'should have ipaddress with 10.0.0.1' do
-      subject.call(['ipaddress', '10.0.0.1']).should be_true
-    end
-    it 'should not have ipaddress with 10.0.0.2' do
-      subject.call(['ipaddress', '10.0.0.2']).should be_false
-    end
-    it 'should have muppet named kermit' do
-      subject.call(['muppet', 'kermit']).should be_true
-    end
-    it 'should have muppet named mspiggy' do
-      subject.call(['muppet', 'mspiggy']).should be_true
-    end
-    it 'should not have muppet named bigbird' do
-      subject.call(['muppet', 'bigbird']).should be_false
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb
deleted file mode 100755
index 5a684608209..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_address_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_ip_address) do
-
-  let(:scope) do
-    PuppetlabsSpec::PuppetInternals.scope
-  end
-
-  subject do
-    function_name = Puppet::Parser::Functions.function(:has_ip_address)
-    scope.method(function_name)
-  end
-
-  context "On Linux Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with('interfaces').returns('eth0,lo')
-      scope.stubs(:lookupvar).with('ipaddress').returns('10.0.2.15')
-      scope.stubs(:lookupvar).with('ipaddress_eth0').returns('10.0.2.15')
-      scope.stubs(:lookupvar).with('ipaddress_lo').returns('127.0.0.1')
-    end
-
-    it 'should have primary address (10.0.2.15)' do
-      subject.call(['10.0.2.15']).should be_true
-    end
-
-    it 'should have lookupback address (127.0.0.1)' do
-      subject.call(['127.0.0.1']).should be_true
-    end
-
-    it 'should not have other address' do
-      subject.call(['192.1681.1.1']).should be_false
-    end
-
-    it 'should not have "mspiggy" on an interface' do
-      subject.call(['mspiggy']).should be_false
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb
deleted file mode 100755
index c3a289e3728..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_ip_network_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_ip_network) do
-
-  let(:scope) do
-    PuppetlabsSpec::PuppetInternals.scope
-  end
-
-  subject do
-    function_name = Puppet::Parser::Functions.function(:has_ip_network)
-    scope.method(function_name)
-  end
-
-  context "On Linux Systems" do
-    before :each do
-      scope.stubs(:lookupvar).with('interfaces').returns('eth0,lo')
-      scope.stubs(:lookupvar).with('network').returns(:undefined)
-      scope.stubs(:lookupvar).with('network_eth0').returns('10.0.2.0')
-      scope.stubs(:lookupvar).with('network_lo').returns('127.0.0.1')
-    end
-
-    it 'should have primary network (10.0.2.0)' do
-      subject.call(['10.0.2.0']).should be_true
-    end
-
-    it 'should have loopback network (127.0.0.0)' do
-      subject.call(['127.0.0.1']).should be_true
-    end
-
-    it 'should not have other network' do
-      subject.call(['192.168.1.0']).should be_false
-    end
-  end
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb
deleted file mode 100755
index 490daeae7cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/has_key_spec.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:has_key) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling has_key from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = has_key()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$x = has_key('foo')"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should require the first value to be a Hash" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$x = has_key('foo', 'bar')"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /expects the first argument to be a hash/)
-    end
-  end
-
-  describe 'when calling the function has_key from a scope instance' do
-    it 'should detect existing keys' do
-      scope.function_has_key([{'one' => 1}, 'one']).should be_true
-    end
-
-    it 'should detect existing keys' do
-      scope.function_has_key([{'one' => 1}, 'two']).should be_false
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb
deleted file mode 100755
index 7c91be9077f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/hash_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the hash function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("hash").should == "function_hash"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_hash([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert an array to a hash" do
-    result = scope.function_hash([['a',1,'b',2,'c',3]])
-    result.should(eq({'a'=>1,'b'=>2,'c'=>3}))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb
deleted file mode 100755
index fd44f7fe3dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/intersection_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the intersection function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("intersection").should == "function_intersection"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_intersection([]) }.should( raise_error(Puppet::ParseError) )
-  end
-
-  it "should return the intersection of two arrays" do
-    result = scope.function_intersection([["a","b","c"],["b","c","d"]])
-    result.should(eq(["b","c"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb
deleted file mode 100755
index e7f4bcd6df4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_array_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_array function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_array").should == "function_is_array"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_array([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed an array" do
-    result = scope.function_is_array([[1,2,3]])
-    result.should(eq(true))
-  end
-
-  it "should return false if passed a hash" do
-    result = scope.function_is_array([{'a'=>1}])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed a string" do
-    result = scope.function_is_array(["asdf"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb
deleted file mode 100755
index c94e83a9d9f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_bool_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_bool function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_bool").should == "function_is_bool"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_bool([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed a TrueClass" do
-    result = scope.function_is_bool([true])
-    result.should(eq(true))
-  end
-
-  it "should return true if passed a FalseClass" do
-    result = scope.function_is_bool([false])
-    result.should(eq(true))
-  end
-
-  it "should return false if passed the string 'true'" do
-    result = scope.function_is_bool(['true'])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed the string 'false'" do
-    result = scope.function_is_bool(['false'])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed an array" do
-    result = scope.function_is_bool([["a","b"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed a hash" do
-    result = scope.function_is_bool([{"a" => "b"}])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb
deleted file mode 100755
index f2ea76dac70..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_domain_name_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_domain_name function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_domain_name").should == "function_is_domain_name"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_domain_name([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a valid short domain name" do
-    result = scope.function_is_domain_name(["x.com"])
-    result.should(be_true)
-  end
-
-  it "should return true if the domain is ." do
-    result = scope.function_is_domain_name(["."])
-    result.should(be_true)
-  end
-
-  it "should return true if the domain is x.com." do
-    result = scope.function_is_domain_name(["x.com."])
-    result.should(be_true)
-  end
-
-  it "should return true if a valid domain name" do
-    result = scope.function_is_domain_name(["foo.bar.com"])
-    result.should(be_true)
-  end
-
-  it "should allow domain parts to start with numbers" do
-    result = scope.function_is_domain_name(["3foo.2bar.com"])
-    result.should(be_true)
-  end
-
-  it "should allow domain to end with a dot" do
-    result = scope.function_is_domain_name(["3foo.2bar.com."])
-    result.should(be_true)
-  end
-
-  it "should allow a single part domain" do
-    result = scope.function_is_domain_name(["orange"])
-    result.should(be_true)
-  end
-
-  it "should return false if domain parts start with hyphens" do
-    result = scope.function_is_domain_name(["-3foo.2bar.com"])
-    result.should(be_false)
-  end
-
-  it "should return true if domain contains hyphens" do
-    result = scope.function_is_domain_name(["3foo-bar.2bar-fuzz.com"])
-    result.should(be_true)
-  end
-
-  it "should return false if domain name contains spaces" do
-    result = scope.function_is_domain_name(["not valid"])
-    result.should(be_false)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb
deleted file mode 100755
index b7d73b04a25..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_float_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_float function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_float").should == "function_is_float"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_float([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a float" do
-    result = scope.function_is_float(["0.12"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a string" do
-    result = scope.function_is_float(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return false if an integer" do
-    result = scope.function_is_float(["3"])
-    result.should(eq(false))
-  end
-  it "should return true if a float is created from an arithmetical operation" do
-    result = scope.function_is_float([3.2*2])
-    result.should(eq(true))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb
deleted file mode 100755
index d5669a75837..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_function_available.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_function_available function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  before :each do
-    @scope = Puppet::Parser::Scope.new
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_function_available").should == "function_is_function_available"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { @scope.function_is_function_available([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return false if a nonexistent function is passed" do
-    result = @scope.function_is_function_available(['jeff_mccunes_left_sock'])
-    result.should(eq(false))
-  end
-
-  it "should return true if an available function is passed" do
-    result = @scope.function_is_function_available(['require'])
-    result.should(eq(true))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb
deleted file mode 100755
index bbebf39f9c7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_hash_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_hash function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_hash").should == "function_is_hash"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_hash([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed a hash" do
-    result = scope.function_is_hash([{"a"=>1,"b"=>2}])
-    result.should(eq(true))
-  end
-
-  it "should return false if passed an array" do
-    result = scope.function_is_hash([["a","b"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if passed a string" do
-    result = scope.function_is_hash(["asdf"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb
deleted file mode 100755
index 24141cc7b7e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_integer_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_integer function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_integer").should == "function_is_integer"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_integer([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if an integer" do
-    result = scope.function_is_integer(["3"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a negative integer" do
-    result = scope.function_is_integer(["-7"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a float" do
-    result = scope.function_is_integer(["3.2"])
-    result.should(eq(false))
-  end
-
-  it "should return false if a string" do
-    result = scope.function_is_integer(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return true if an integer is created from an arithmetical operation" do
-    result = scope.function_is_integer([3*2])
-    result.should(eq(true))
-  end
-
-  it "should return false if an array" do
-    result = scope.function_is_numeric([["asdf"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if a hash" do
-    result = scope.function_is_numeric([{"asdf" => false}])
-    result.should(eq(false))
-  end
-
-  it "should return false if a boolean" do
-    result = scope.function_is_numeric([true])
-    result.should(eq(false))
-  end
-
-  it "should return false if a whitespace is in the string" do
-    result = scope.function_is_numeric([" -1324"])
-    result.should(eq(false))
-  end
-
-  it "should return false if it is zero prefixed" do
-    result = scope.function_is_numeric(["0001234"])
-    result.should(eq(false))
-  end
-
-  it "should return false if it is wrapped inside an array" do
-    result = scope.function_is_numeric([[1234]])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb
deleted file mode 100755
index c0debb3d43b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_ip_address_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_ip_address function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_ip_address").should == "function_is_ip_address"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_ip_address([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if an IPv4 address" do
-    result = scope.function_is_ip_address(["1.2.3.4"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a full IPv6 address" do
-    result = scope.function_is_ip_address(["fe80:0000:cd12:d123:e2f8:47ff:fe09:dd74"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a compressed IPv6 address" do
-    result = scope.function_is_ip_address(["fe00::1"])
-    result.should(eq(true))
-  end
-
-  it "should return false if not valid" do
-    result = scope.function_is_ip_address(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return false if IP octets out of range" do
-    result = scope.function_is_ip_address(["1.1.1.300"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb
deleted file mode 100755
index ca9c5904767..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_mac_address_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_mac_address function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_mac_address").should == "function_is_mac_address"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_mac_address([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a valid mac address" do
-    result = scope.function_is_mac_address(["00:a0:1f:12:7f:a0"])
-    result.should(eq(true))
-  end
-
-  it "should return false if octets are out of range" do
-    result = scope.function_is_mac_address(["00:a0:1f:12:7f:g0"])
-    result.should(eq(false))
-  end
-
-  it "should return false if not valid" do
-    result = scope.function_is_mac_address(["not valid"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb
deleted file mode 100755
index 1df14978711..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_numeric_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_numeric function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_numeric").should == "function_is_numeric"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    lambda { scope.function_is_numeric([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if an integer" do
-    result = scope.function_is_numeric(["3"])
-    result.should(eq(true))
-  end
-
-  it "should return true if a float" do
-    result = scope.function_is_numeric(["3.2"])
-    result.should(eq(true))
-  end
-
-  it "should return true if an integer is created from an arithmetical operation" do
-    result = scope.function_is_numeric([3*2])
-    result.should(eq(true))
-  end
-
-  it "should return true if a float is created from an arithmetical operation" do
-    result = scope.function_is_numeric([3.2*2])
-    result.should(eq(true))
-  end
-
-  it "should return false if a string" do
-    result = scope.function_is_numeric(["asdf"])
-    result.should(eq(false))
-  end
-
-  it "should return false if an array" do
-    result = scope.function_is_numeric([["asdf"]])
-    result.should(eq(false))
-  end
-
-  it "should return false if an array of integers" do
-    result = scope.function_is_numeric([[1,2,3,4]])
-    result.should(eq(false))
-  end
-
-  it "should return false if a hash" do
-    result = scope.function_is_numeric([{"asdf" => false}])
-    result.should(eq(false))
-  end
-
-  it "should return false if a hash with numbers in it" do
-    result = scope.function_is_numeric([{1 => 2}])
-    result.should(eq(false))
-  end
-
-  it "should return false if a boolean" do
-    result = scope.function_is_numeric([true])
-    result.should(eq(false))
-  end
-
-  it "should return true if a negative float with exponent" do
-    result = scope.function_is_numeric(["-342.2315e-12"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a negative integer with whitespaces before/after the dash" do
-    result = scope.function_is_numeric([" -  751"])
-    result.should(eq(false))
-  end
-
-#  it "should return true if a hexadecimal" do
-#    result = scope.function_is_numeric(["0x52F8c"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return true if a hexadecimal with uppercase 0X prefix" do
-#    result = scope.function_is_numeric(["0X52F8c"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return false if a hexadecimal without a prefix" do
-#    result = scope.function_is_numeric(["52F8c"])
-#    result.should(eq(false))
-#  end
-#
-#  it "should return true if a octal" do
-#    result = scope.function_is_numeric(["0751"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return true if a negative hexadecimal" do
-#    result = scope.function_is_numeric(["-0x52F8c"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return true if a negative octal" do
-#    result = scope.function_is_numeric(["-0751"])
-#    result.should(eq(true))
-#  end
-#
-#  it "should return false if a negative octal with whitespaces before/after the dash" do
-#    result = scope.function_is_numeric([" -  0751"])
-#    result.should(eq(false))
-#  end
-#
-#  it "should return false if a bad hexadecimal" do
-#    result = scope.function_is_numeric(["0x23d7g"])
-#    result.should(eq(false))
-#  end
-#
-#  it "should return false if a bad octal" do
-#    result = scope.function_is_numeric(["0287"])
-#    result.should(eq(false))
-#  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb
deleted file mode 100755
index 3756bea8b5f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/is_string_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the is_string function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("is_string").should == "function_is_string"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_string([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a string" do
-    result = scope.function_is_string(["asdf"])
-    result.should(eq(true))
-  end
-
-  it "should return false if an integer" do
-    result = scope.function_is_string(["3"])
-    result.should(eq(false))
-  end
-
-  it "should return false if a float" do
-    result = scope.function_is_string(["3.23"])
-    result.should(eq(false))
-  end
-
-  it "should return false if an array" do
-    result = scope.function_is_string([["a","b","c"]])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
deleted file mode 100755
index a52fb719f27..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_keys_to_values_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the join_keys_to_values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("join_keys_to_values").should == "function_join_keys_to_values"
-  end
-
-  it "should raise a ParseError if there are fewer than two arguments" do
-    lambda { scope.function_join_keys_to_values([{}]) }.should raise_error Puppet::ParseError
-  end
-
-  it "should raise a ParseError if there are greater than two arguments" do
-    lambda { scope.function_join_keys_to_values([{}, 'foo', 'bar']) }.should raise_error Puppet::ParseError
-  end
-
-  it "should raise a TypeError if the first argument is an array" do
-    lambda { scope.function_join_keys_to_values([[1,2], ',']) }.should raise_error TypeError
-  end
-
-  it "should raise a TypeError if the second argument is an array" do
-    lambda { scope.function_join_keys_to_values([{}, [1,2]]) }.should raise_error TypeError
-  end
-
-  it "should raise a TypeError if the second argument is a number" do
-    lambda { scope.function_join_keys_to_values([{}, 1]) }.should raise_error TypeError
-  end
-
-  it "should return an empty array given an empty hash" do
-    result = scope.function_join_keys_to_values([{}, ":"])
-    result.should == []
-  end
-
-  it "should join hash's keys to its values" do
-    result = scope.function_join_keys_to_values([{'a'=>1,2=>'foo',:b=>nil}, ":"])
-    result.should =~ ['a:1','2:foo','b:']
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb
deleted file mode 100755
index aafa1a7f76e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/join_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the join function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("join").should == "function_join"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_join([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should join an array into a string" do
-    result = scope.function_join([["a","b","c"], ":"])
-    result.should(eq("a:b:c"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb
deleted file mode 100755
index fdd7a7073e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/keys_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the keys function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("keys").should == "function_keys"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_keys([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return an array of keys when given a hash" do
-    result = scope.function_keys([{'a'=>1, 'b'=>2}])
-    # =~ performs 'array with same elements' (set) matching
-    # For more info see RSpec::Matchers::MatchArray
-    result.should =~ ['a','b']
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb
deleted file mode 100755
index fe163182671..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/loadyaml_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the loadyaml function" do
-  include PuppetlabsSpec::Files
-
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("loadyaml").should == "function_loadyaml"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    expect { scope.function_loadyaml([]) }.to raise_error(Puppet::ParseError)
-  end
-
-  it "should convert YAML file to a data structure" do
-    yaml_file = tmpfilename ('yamlfile')
-    File.open(yaml_file, 'w') do |fh|
-      fh.write("---\n aaa: 1\n bbb: 2\n ccc: 3\n ddd: 4\n")
-    end
-    result = scope.function_loadyaml([yaml_file])
-    result.should == {"aaa" => 1, "bbb" => 2, "ccc" => 3, "ddd" => 4 }
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb
deleted file mode 100755
index b280ae7ac1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/lstrip_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the lstrip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("lstrip").should == "function_lstrip"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_lstrip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should lstrip a string" do
-    result = scope.function_lstrip(["  asdf"])
-    result.should(eq('asdf'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb
deleted file mode 100755
index ff6f2b361c3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/max_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the max function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("max").should == "function_max"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_max([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to compare strings" do
-    scope.function_max(["albatross","dog","horse"]).should(eq("horse"))
-  end
-
-  it "should be able to compare numbers" do
-    scope.function_max([6,8,4]).should(eq(8))
-  end
-
-  it "should be able to compare a number with a stringified number" do
-    scope.function_max([1,"2"]).should(eq("2"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb
deleted file mode 100755
index 6e9a023fa46..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/member_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the member function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("member").should == "function_member"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_member([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if a member is in an array" do
-    result = scope.function_member([["a","b","c"], "a"])
-    result.should(eq(true))
-  end
-
-  it "should return false if a member is not in an array" do
-    result = scope.function_member([["a","b","c"], "d"])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb
deleted file mode 100755
index 15a5d94cf82..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/merge_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:merge) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling merge from puppet' do
-    it "should not compile when no arguments are passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = '$x = merge()'
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should not compile when 1 argument is passed" do
-      pending("Fails on 2.6.x, see bug #15912") if Puppet.version =~ /^2\.6\./
-      Puppet[:code] = "$my_hash={'one' => 1}\n$x = merge($my_hash)"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-
-  describe 'when calling merge on the scope instance' do
-    it 'should require all parameters are hashes' do
-      expect { new_hash = scope.function_merge([{}, '2'])}.to raise_error(Puppet::ParseError, /unexpected argument type String/)
-      expect { new_hash = scope.function_merge([{}, 2])}.to raise_error(Puppet::ParseError, /unexpected argument type Fixnum/)
-    end
-
-    it 'should accept empty strings as puppet undef' do
-      expect { new_hash = scope.function_merge([{}, ''])}.not_to raise_error
-    end
-
-    it 'should be able to merge two hashes' do
-      new_hash = scope.function_merge([{'one' => '1', 'two' => '1'}, {'two' => '2', 'three' => '2'}])
-      new_hash['one'].should   == '1'
-      new_hash['two'].should   == '2'
-      new_hash['three'].should == '2'
-    end
-
-    it 'should merge multiple hashes' do
-      hash = scope.function_merge([{'one' => 1}, {'one' => '2'}, {'one' => '3'}])
-      hash['one'].should == '3'
-    end
-
-    it 'should accept empty hashes' do
-      scope.function_merge([{},{},{}]).should == {}
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb
deleted file mode 100755
index 71d593ef091..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/min_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the min function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("min").should == "function_min"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_min([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to compare strings" do
-    scope.function_min(["albatross","dog","horse"]).should(eq("albatross"))
-  end
-
-  it "should be able to compare numbers" do
-    scope.function_min([6,8,4]).should(eq(4))
-  end
-
-  it "should be able to compare a number with a stringified number" do
-    scope.function_min([1,"2"]).should(eq(1))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb
deleted file mode 100755
index b56196d3c6b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/num2bool_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the num2bool function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("num2bool").should == "function_num2bool"
-  end
-
-  it "should raise a ParseError if there are no arguments" do
-    lambda { scope.function_num2bool([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if there are more than 1 arguments" do
-    lambda { scope.function_num2bool(["foo","bar"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if passed something non-numeric" do
-    lambda { scope.function_num2bool(["xyzzy"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return true if passed string 1" do
-    result = scope.function_num2bool(["1"])
-    result.should(be_true)
-  end
-
-  it "should return true if passed string 1.5" do
-    result = scope.function_num2bool(["1.5"])
-    result.should(be_true)
-  end
-
-  it "should return true if passed number 1" do
-    result = scope.function_num2bool([1])
-    result.should(be_true)
-  end
-
-  it "should return false if passed string 0" do
-    result = scope.function_num2bool(["0"])
-    result.should(be_false)
-  end
-
-  it "should return false if passed number 0" do
-    result = scope.function_num2bool([0])
-    result.should(be_false)
-  end
-
-  it "should return false if passed string -1" do
-    result = scope.function_num2bool(["-1"])
-    result.should(be_false)
-  end
-
-  it "should return false if passed string -1.5" do
-    result = scope.function_num2bool(["-1.5"])
-    result.should(be_false)
-  end
-
-  it "should return false if passed number -1" do
-    result = scope.function_num2bool([-1])
-    result.should(be_false)
-  end
-
-  it "should return false if passed float -1.5" do
-    result = scope.function_num2bool([-1.5])
-    result.should(be_false)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb
deleted file mode 100755
index f179ac111a6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parsejson_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the parsejson function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("parsejson").should == "function_parsejson"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_parsejson([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert JSON to a data structure" do
-    json = <<-EOS
-["aaa","bbb","ccc"]
-EOS
-    result = scope.function_parsejson([json])
-    result.should(eq(['aaa','bbb','ccc']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb
deleted file mode 100755
index 0c7aea8a5ab..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/parseyaml_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the parseyaml function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("parseyaml").should == "function_parseyaml"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_parseyaml([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert YAML to a data structure" do
-    yaml = <<-EOS
-- aaa
-- bbb
-- ccc
-EOS
-    result = scope.function_parseyaml([yaml])
-    result.should(eq(['aaa','bbb','ccc']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb
deleted file mode 100755
index c9235b53464..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_default_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the pick_default function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("pick_default").should == "function_pick_default"
-  end
-
-  it 'should return the correct value' do
-    scope.function_pick_default(['first', 'second']).should == 'first'
-  end
-
-  it 'should return the correct value if the first value is empty' do
-    scope.function_pick_default(['', 'second']).should == 'second'
-  end
-
-  it 'should skip empty string values' do
-    scope.function_pick_default(['', 'first']).should == 'first'
-  end
-
-  it 'should skip :undef values' do
-    scope.function_pick_default([:undef, 'first']).should == 'first'
-  end
-
-  it 'should skip :undefined values' do
-    scope.function_pick_default([:undefined, 'first']).should == 'first'
-  end
-
-  it 'should return the empty string if it is the last possibility' do
-    scope.function_pick_default([:undef, :undefined, '']).should == ''
-  end
-
-  it 'should return :undef if it is the last possibility' do
-    scope.function_pick_default(['', :undefined, :undef]).should == :undef
-  end
-
-  it 'should return :undefined if it is the last possibility' do
-    scope.function_pick_default([:undef, '', :undefined]).should == :undefined
-  end
-
-  it 'should return the empty string if it is the only possibility' do
-    scope.function_pick_default(['']).should == ''
-  end
-
-  it 'should return :undef if it is the only possibility' do
-    scope.function_pick_default([:undef]).should == :undef
-  end
-
-  it 'should return :undefined if it is the only possibility' do
-    scope.function_pick_default([:undefined]).should == :undefined
-  end
-
-  it 'should error if no values are passed' do
-    expect { scope.function_pick_default([]) }.to raise_error(Puppet::Error, /Must receive at least one argument./)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb
deleted file mode 100755
index f53fa800053..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/pick_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the pick function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("pick").should == "function_pick"
-  end
-
-  it 'should return the correct value' do
-    scope.function_pick(['first', 'second']).should == 'first'
-  end
-
-  it 'should return the correct value if the first value is empty' do
-    scope.function_pick(['', 'second']).should == 'second'
-  end
-
-  it 'should remove empty string values' do
-    scope.function_pick(['', 'first']).should == 'first'
-  end
-
-  it 'should remove :undef values' do
-    scope.function_pick([:undef, 'first']).should == 'first'
-  end
-
-  it 'should remove :undefined values' do
-    scope.function_pick([:undefined, 'first']).should == 'first'
-  end
-
-  it 'should error if no values are passed' do
-    expect { scope.function_pick([]) }.to( raise_error(Puppet::ParseError, "pick(): must receive at least one non empty value"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb
deleted file mode 100755
index 6e8ddc58ee8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/prefix_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the prefix function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "raises a ParseError if there is less than 1 arguments" do
-    expect { scope.function_prefix([]) }.to raise_error(Puppet::ParseError, /number of arguments/)
-  end
-
-  it "raises an error if the first argument is not an array" do
-    expect {
-      scope.function_prefix([Object.new])
-    }.to raise_error(Puppet::ParseError, /expected first argument to be an Array/)
-  end
-
-
-  it "raises an error if the second argument is not a string" do
-    expect {
-      scope.function_prefix([['first', 'second'], 42])
-    }.to raise_error(Puppet::ParseError, /expected second argument to be a String/)
-  end
-
-  it "returns a prefixed array" do
-    result = scope.function_prefix([['a','b','c'], 'p'])
-    result.should(eq(['pa','pb','pc']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb
deleted file mode 100755
index 0e1ad376f6f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/range_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the range function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "exists" do
-    Puppet::Parser::Functions.function("range").should == "function_range"
-  end
-
-  it "raises a ParseError if there is less than 1 arguments" do
-    expect { scope.function_range([]) }.to raise_error Puppet::ParseError, /Wrong number of arguments.*0 for 1/
-  end
-
-  describe 'with a letter range' do
-    it "returns a letter range" do
-      result = scope.function_range(["a","d"])
-      result.should eq ['a','b','c','d']
-    end
-
-    it "returns a letter range given a step of 1" do
-      result = scope.function_range(["a","d","1"])
-      result.should eq ['a','b','c','d']
-    end
-
-    it "returns a stepped letter range" do
-      result = scope.function_range(["a","d","2"])
-      result.should eq ['a','c']
-    end
-
-    it "returns a stepped letter range given a negative step" do
-      result = scope.function_range(["a","d","-2"])
-      result.should eq ['a','c']
-    end
-  end
-
-  describe 'with a number range' do
-    it "returns a number range" do
-      result = scope.function_range(["1","4"])
-      result.should eq [1,2,3,4]
-    end
-
-    it "returns a number range given a step of 1" do
-      result = scope.function_range(["1","4","1"])
-      result.should eq [1,2,3,4]
-    end
-
-    it "returns a stepped number range" do
-      result = scope.function_range(["1","4","2"])
-      result.should eq [1,3]
-    end
-
-    it "returns a stepped number range given a negative step" do
-      result = scope.function_range(["1","4","-2"])
-      result.should eq [1,3]
-    end
-  end
-
-  describe 'with a numeric-like string range' do
-    it "works with padded hostname like strings" do
-      expected = ("host01".."host10").to_a
-      scope.function_range(["host01","host10"]).should eq expected
-    end
-
-    it "coerces zero padded digits to integers" do
-      expected = (0..10).to_a
-      scope.function_range(["00", "10"]).should eq expected
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb
deleted file mode 100755
index f2cb7419352..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reject_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'spec_helper'
-
-describe "the reject function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("reject").should == "function_reject"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_reject([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should reject contents from an array" do
-    result = scope.function_reject([["1111", "aaabbb","bbbccc","dddeee"], "bbb"])
-    result.should(eq(["1111", "dddeee"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb
deleted file mode 100755
index 1b592065478..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/reverse_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the reverse function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("reverse").should == "function_reverse"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_reverse([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should reverse a string" do
-    result = scope.function_reverse(["asdfghijkl"])
-    result.should(eq('lkjihgfdsa'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb
deleted file mode 100755
index d90de1d0609..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/rstrip_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the rstrip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("rstrip").should == "function_rstrip"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_rstrip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should rstrip a string" do
-    result = scope.function_rstrip(["asdf  "])
-    result.should(eq('asdf'))
-  end
-
-  it "should rstrip each element in an array" do
-    result = scope.function_rstrip([["a ","b ", "c "]])
-    result.should(eq(['a','b','c']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb
deleted file mode 100755
index 93346d53700..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/shuffle_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the shuffle function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("shuffle").should == "function_shuffle"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_shuffle([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should shuffle a string and the result should be the same size" do
-    result = scope.function_shuffle(["asdf"])
-    result.size.should(eq(4))
-  end
-
-  it "should shuffle a string but the sorted contents should still be the same" do
-    result = scope.function_shuffle(["adfs"])
-    result.split("").sort.join("").should(eq("adfs"))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb
deleted file mode 100755
index b1c435a3027..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/size_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the size function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("size").should == "function_size"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_size([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return the size of a string" do
-    result = scope.function_size(["asdf"])
-    result.should(eq(4))
-  end
-
-  it "should return the size of an array" do
-    result = scope.function_size([["a","b","c"]])
-    result.should(eq(3))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb
deleted file mode 100755
index 3187a5aecbc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/sort_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the sort function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("sort").should == "function_sort"
-  end
-
-  it "should raise a ParseError if there is not 1 arguments" do
-    lambda { scope.function_sort(['','']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should sort an array" do
-    result = scope.function_sort([["a","c","b"]])
-    result.should(eq(['a','b','c']))
-  end
-
-  it "should sort a string" do
-    result = scope.function_sort(["acb"])
-    result.should(eq('abc'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb
deleted file mode 100755
index 60e5a3028db..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/squeeze_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the squeeze function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("squeeze").should == "function_squeeze"
-  end
-
-  it "should raise a ParseError if there is less than 2 arguments" do
-    lambda { scope.function_squeeze([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should squeeze a string" do
-    result = scope.function_squeeze(["aaabbbbcccc"])
-    result.should(eq('abc'))
-  end
-
-  it "should squeeze all elements in an array" do
-    result = scope.function_squeeze([["aaabbbbcccc","dddfff"]])
-    result.should(eq(['abc','df']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb
deleted file mode 100755
index 73c09c72922..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2bool_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the str2bool function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("str2bool").should == "function_str2bool"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_str2bool([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert string 'true' to true" do
-    result = scope.function_str2bool(["true"])
-    result.should(eq(true))
-  end
-
-  it "should convert string 'undef' to false" do
-    result = scope.function_str2bool(["undef"])
-    result.should(eq(false))
-  end
-
-  it "should return the boolean it was called with" do
-    result = scope.function_str2bool([true])
-    result.should(eq(true))
-    result = scope.function_str2bool([false])
-    result.should(eq(false))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb
deleted file mode 100755
index df8fb8e905c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/str2saltedsha512_spec.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the str2saltedsha512 function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("str2saltedsha512").should == "function_str2saltedsha512"
-  end
-
-  it "should raise a ParseError if there is less than 1 argument" do
-    expect { scope.function_str2saltedsha512([]) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should raise a ParseError if there is more than 1 argument" do
-    expect { scope.function_str2saltedsha512(['foo', 'bar', 'baz']) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should return a salted-sha512 password hash 136 characters in length" do
-    result = scope.function_str2saltedsha512(["password"])
-    result.length.should(eq(136))
-  end
-
-  it "should raise an error if you pass a non-string password" do
-    expect { scope.function_str2saltedsha512([1234]) }.to( raise_error(Puppet::ParseError) )
-  end
-
-  it "should generate a valid password" do
-    # Allow the function to generate a password based on the string 'password'
-    password_hash = scope.function_str2saltedsha512(["password"])
-
-    # Separate the Salt and Password from the Password Hash
-    salt     = password_hash[0..7]
-    password = password_hash[8..-1]
-
-    # Convert the Salt and Password from Hex to Binary Data
-    str_salt     = Array(salt.lines).pack('H*')
-    str_password = Array(password.lines).pack('H*')
-
-    # Combine the Binary Salt with 'password' and compare the end result
-    saltedpass    = Digest::SHA512.digest(str_salt + 'password')
-    result        = (str_salt + saltedpass).unpack('H*')[0]
-    result.should == password_hash
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb
deleted file mode 100755
index df42b6f26bd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strftime_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the strftime function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("strftime").should == "function_strftime"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_strftime([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "using %s should be higher then when I wrote this test" do
-    result = scope.function_strftime(["%s"])
-    result.to_i.should(be > 1311953157)
-  end
-
-  it "using %s should be lower then 1.5 trillion" do
-    result = scope.function_strftime(["%s"])
-    result.to_i.should(be < 1500000000)
-  end
-
-  it "should return a date when given %Y-%m-%d" do
-    result = scope.function_strftime(["%Y-%m-%d"])
-    result.should =~ /^\d{4}-\d{2}-\d{2}$/
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb
deleted file mode 100755
index fccdd26067c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/strip_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the strip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("strip").should == "function_strip"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_strip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should strip a string" do
-    result = scope.function_strip([" ab cd "])
-    result.should(eq('ab cd'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb
deleted file mode 100755
index 89ba3b82309..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/suffix_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the suffix function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "raises a ParseError if there is less than 1 arguments" do
-    expect { scope.function_suffix([]) }.to raise_error(Puppet::ParseError, /number of arguments/)
-  end
-
-  it "raises an error if the first argument is not an array" do
-    expect {
-      scope.function_suffix([Object.new])
-    }.to raise_error(Puppet::ParseError, /expected first argument to be an Array/)
-  end
-
-  it "raises an error if the second argument is not a string" do
-    expect {
-      scope.function_suffix([['first', 'second'], 42])
-    }.to raise_error(Puppet::ParseError, /expected second argument to be a String/)
-  end
-
-  it "returns a suffixed array" do
-    result = scope.function_suffix([['a','b','c'], 'p'])
-    result.should(eq(['ap','bp','cp']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb
deleted file mode 100755
index 808b4158767..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/swapcase_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the swapcase function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("swapcase").should == "function_swapcase"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_swapcase([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should swapcase a string" do
-    result = scope.function_swapcase(["aaBBccDD"])
-    result.should(eq('AAbbCCdd'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb
deleted file mode 100755
index e9fb76e6ac3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/time_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the time function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("time").should == "function_time"
-  end
-
-  it "should raise a ParseError if there is more than 2 arguments" do
-    lambda { scope.function_time(['','']) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return a number" do
-    result = scope.function_time([])
-    result.should be_an(Integer)
-  end
-
-  it "should be higher then when I wrote this test" do
-    result = scope.function_time([])
-    result.should(be > 1311953157)
-  end
-
-  it "should be lower then 1.5 trillion" do
-    result = scope.function_time([])
-    result.should(be < 1500000000)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb
deleted file mode 100755
index d1ea4c80cc2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/to_bytes_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the to_bytes function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("to_bytes").should == "function_to_bytes"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_to_bytes([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should convert kB to B" do
-    result = scope.function_to_bytes(["4 kB"])
-    result.should(eq(4096))
-  end
-
-  it "should work without B in unit" do
-    result = scope.function_to_bytes(["4 k"])
-    result.should(eq(4096))
-  end
-
-  it "should work without a space before unit" do
-    result = scope.function_to_bytes(["4k"])
-    result.should(eq(4096))
-  end
-
-  it "should work without a unit" do
-    result = scope.function_to_bytes(["5678"])
-    result.should(eq(5678))
-  end
-
-  it "should convert fractions" do
-    result = scope.function_to_bytes(["1.5 kB"])
-    result.should(eq(1536))
-  end
-
-  it "should convert scientific notation" do
-    result = scope.function_to_bytes(["1.5e2 B"])
-    result.should(eq(150))
-  end
-
-  it "should do nothing with a positive number" do
-    result = scope.function_to_bytes([5678])
-    result.should(eq(5678))
-  end
-
-  it "should should raise a ParseError if input isn't a number" do
-    lambda { scope.function_to_bytes(["foo"]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should should raise a ParseError if prefix is unknown" do
-    lambda { scope.function_to_bytes(["5 uB"]) }.should( raise_error(Puppet::ParseError))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb
deleted file mode 100755
index 8fec88f2660..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/type_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the type function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  it "should exist" do
-    Puppet::Parser::Functions.function("type").should == "function_type"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_type([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return string when given a string" do
-    result = scope.function_type(["aaabbbbcccc"])
-    result.should(eq('string'))
-  end
-
-  it "should return array when given an array" do
-    result = scope.function_type([["aaabbbbcccc","asdf"]])
-    result.should(eq('array'))
-  end
-
-  it "should return hash when given a hash" do
-    result = scope.function_type([{"a"=>1,"b"=>2}])
-    result.should(eq('hash'))
-  end
-
-  it "should return integer when given an integer" do
-    result = scope.function_type(["1"])
-    result.should(eq('integer'))
-  end
-
-  it "should return float when given a float" do
-    result = scope.function_type(["1.34"])
-    result.should(eq('float'))
-  end
-
-  it "should return boolean when given a boolean" do
-    result = scope.function_type([true])
-    result.should(eq('boolean'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb
deleted file mode 100755
index 0d282caa653..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/union_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the union function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("union").should == "function_union"
-  end
-
-  it "should raise a ParseError if there are fewer than 2 arguments" do
-    lambda { scope.function_union([]) }.should( raise_error(Puppet::ParseError) )
-  end
-
-  it "should join two arrays together" do
-    result = scope.function_union([["a","b","c"],["b","c","d"]])
-    result.should(eq(["a","b","c","d"]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb
deleted file mode 100755
index 5d48d49b723..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/unique_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the unique function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("unique").should == "function_unique"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_unique([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should remove duplicate elements in a string" do
-    result = scope.function_unique(["aabbc"])
-    result.should(eq('abc'))
-  end
-
-  it "should remove duplicate elements in an array" do
-    result = scope.function_unique([["a","a","b","b","c"]])
-    result.should(eq(['a','b','c']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb
deleted file mode 100755
index 5db55138a69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/upcase_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the upcase function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("upcase").should == "function_upcase"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_upcase([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should upcase a string" do
-    result = scope.function_upcase(["abc"])
-    result.should(eq('ABC'))
-  end
-
-  it "should do nothing if a string is already upcase" do
-    result = scope.function_upcase(["ABC"])
-    result.should(eq('ABC'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb
deleted file mode 100755
index 7211c88783d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/uriescape_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the uriescape function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("uriescape").should == "function_uriescape"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_uriescape([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should uriescape a string" do
-    result = scope.function_uriescape([":/?#[]@!$&'()*+,;= \"{}"])
-    result.should(eq(':/?%23[]@!$&\'()*+,;=%20%22%7B%7D'))
-  end
-
-  it "should do nothing if a string is already safe" do
-    result = scope.function_uriescape(["ABCdef"])
-    result.should(eq('ABCdef'))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb
deleted file mode 100755
index 342ae848257..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_absolute_path_spec.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_absolute_path) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  # The subject of these examples is the method itself.
-  subject do
-    # This makes sure the function is loaded within each test
-    function_name = Puppet::Parser::Functions.function(:validate_absolute_path)
-    scope.method(function_name)
-  end
-
-  describe "Valid Paths" do
-    def self.valid_paths
-      %w{
-        C:/
-        C:\\
-        C:\\WINDOWS\\System32
-        C:/windows/system32
-        X:/foo/bar
-        X:\\foo\\bar
-        /var/tmp
-        /var/lib/puppet
-        /var/opt/../lib/puppet
-      }
-    end
-
-    context "Without Puppet::Util.absolute_path? (e.g. Puppet <= 2.6)" do
-      before :each do
-        # The intent here is to mock Puppet to behave like Puppet 2.6 does.
-        # Puppet 2.6 does not have the absolute_path? method.  This is only a
-        # convenience test, stdlib should be run with the Puppet 2.6.x in the
-        # $LOAD_PATH in addition to 2.7.x and master.
-        Puppet::Util.expects(:respond_to?).with(:absolute_path?).returns(false)
-      end
-      valid_paths.each do |path|
-        it "validate_absolute_path(#{path.inspect}) should not fail" do
-          expect { subject.call [path] }.not_to raise_error
-        end
-      end
-    end
-
-    context "Puppet without mocking" do
-      valid_paths.each do |path|
-        it "validate_absolute_path(#{path.inspect}) should not fail" do
-          expect { subject.call [path] }.not_to raise_error
-        end
-      end
-    end
-  end
-
-  describe 'Invalid paths' do
-    context 'Garbage inputs' do
-      [
-        nil,
-        [ nil ],
-        { 'foo' => 'bar' },
-        { },
-        '',
-      ].each do |path|
-        it "validate_absolute_path(#{path.inspect}) should fail" do
-          expect { subject.call [path] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-
-    context 'Relative paths' do
-      %w{
-        relative1
-        .
-        ..
-        ./foo
-        ../foo
-        etc/puppetlabs/puppet
-        opt/puppet/bin
-      }.each do |path|
-        it "validate_absolute_path(#{path.inspect}) should fail" do
-          expect { subject.call [path] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb
deleted file mode 100755
index 4b31cfde42f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_array_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_array) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  describe 'when calling validate_array from puppet' do
-
-    %w{ true false }.each do |the_string|
-      it "should not compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_array('#{the_string}')"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not an Array/)
-      end
-
-      it "should not compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_array(#{the_string})"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not an Array/)
-      end
-    end
-
-    it "should compile when multiple array arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = [ ]
-        $bar = [ 'one', 'two' ]
-        validate_array($foo, $bar)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should not compile when an undef variable is passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = undef
-        validate_array($foo)
-      ENDofPUPPETcode
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not an Array/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb
deleted file mode 100755
index c695ba2eb7f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_augeas_spec.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_augeas), :if => Puppet.features.augeas? do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  # The subject of these examplres is the method itself.
-  subject do
-    # This makes sure the function is loaded within each test
-    function_name = Puppet::Parser::Functions.function(:validate_augeas)
-    scope.method(function_name)
-  end
-
-  context 'Using Puppet::Parser::Scope.new' do
-
-    describe 'Garbage inputs' do
-      inputs = [
-        [ nil ],
-        [ [ nil ] ],
-        [ { 'foo' => 'bar' } ],
-        [ { } ],
-        [ '' ],
-        [ "one", "one", "MSG to User", "4th arg" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call [input] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-
-    describe 'Valid inputs' do
-      inputs = [
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns' ],
-        [ "proc /proc   proc    nodev,noexec,nosuid     0       0\n", 'Fstab.lns'],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should not fail" do
-          expect { subject.call input }.not_to raise_error
-        end
-      end
-    end
-
-    describe "Valid inputs which should raise an exception without a message" do
-      # The intent here is to make sure valid inputs raise exceptions when they
-      # don't specify an error message to display.  This is the behvior in
-      # 2.2.x and prior.
-      inputs = [
-        [ "root:x:0:0:root\n", 'Passwd.lns' ],
-        [ "127.0.1.1\n", 'Hosts.lns' ],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /validate_augeas.*?matched less than it should/
-        end
-      end
-    end
-
-    describe "Nicer Error Messages" do
-      # The intent here is to make sure the function returns the 3rd argument
-      # in the exception thrown
-      inputs = [
-        [ "root:x:0:0:root\n", 'Passwd.lns', [], 'Failed to validate passwd content' ],
-        [ "127.0.1.1\n", 'Hosts.lns', [], 'Wrong hosts content' ],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /#{input[2]}/
-        end
-      end
-    end
-
-    describe "Passing simple unit tests" do
-      inputs = [
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
-        [ "root:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.not_to raise_error
-        end
-      end
-    end
-
-    describe "Failing simple unit tests" do
-      inputs = [
-        [ "foobar:x:0:0:root:/root:/bin/bash\n", 'Passwd.lns', ['$file/foobar']],
-        [ "root:x:0:0:root:/root:/bin/sh\n", 'Passwd.lns', ['$file/root/shell[.="/bin/sh"]', 'foobar']],
-      ]
-
-      inputs.each do |input|
-        it "validate_augeas(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /testing path/
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb
deleted file mode 100755
index a352d3b550b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_bool_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_bool) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-  describe 'when calling validate_bool from puppet' do
-
-    %w{ true false }.each do |the_string|
-
-      it "should not compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_bool('#{the_string}')"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a boolean/)
-      end
-
-      it "should compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_bool(#{the_string})"
-        scope.compiler.compile
-      end
-
-    end
-
-    it "should not compile when an arbitrary string is passed" do
-      Puppet[:code] = 'validate_bool("jeff and dan are awesome")'
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a boolean/)
-    end
-
-    it "should not compile when no arguments are passed" do
-      Puppet[:code] = 'validate_bool()'
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-
-    it "should compile when multiple boolean arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = true
-        $bar = false
-        validate_bool($foo, $bar, true, false)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should compile when multiple boolean arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = true
-        $bar = false
-        validate_bool($foo, $bar, true, false, 'jeff')
-      ENDofPUPPETcode
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a boolean/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb
deleted file mode 100755
index a6e68df2105..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_cmd_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-TESTEXE = File.exists?('/usr/bin/test') ? '/usr/bin/test' : '/bin/test'
-TOUCHEXE = File.exists?('/usr/bin/touch') ? '/usr/bin/touch' : '/bin/touch'
-
-describe Puppet::Parser::Functions.function(:validate_cmd) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  subject do
-    function_name = Puppet::Parser::Functions.function(:validate_cmd)
-    scope.method(function_name)
-  end
-
-  describe "with an explicit failure message" do
-    it "prints the failure message on error" do
-      expect {
-        subject.call ['', '/bin/false', 'failure message!']
-      }.to raise_error Puppet::ParseError, /failure message!/
-    end
-  end
-
-  describe "on validation failure" do
-    it "includes the command error output" do
-      expect {
-        subject.call ['', "#{TOUCHEXE} /cant/touch/this"]
-      }.to raise_error Puppet::ParseError, /(cannot touch|o such file or)/
-    end
-
-    it "includes the command return value" do
-      expect {
-        subject.call ['', '/cant/run/this']
-      }.to raise_error Puppet::ParseError, /returned 1\b/
-    end
-  end
-
-  describe "when performing actual validation" do
-    it "can positively validate file content" do
-      expect { subject.call ["non-empty", "#{TESTEXE} -s"] }.to_not raise_error
-    end
-
-    it "can negatively validate file content" do
-      expect {
-        subject.call ["", "#{TESTEXE} -s"]
-      }.to raise_error Puppet::ParseError, /failed to validate.*test -s/
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb
deleted file mode 100755
index a0c35c2304f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_hash_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_hash) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling validate_hash from puppet' do
-
-    %w{ true false }.each do |the_string|
-
-      it "should not compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_hash('#{the_string}')"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a Hash/)
-      end
-
-      it "should not compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_hash(#{the_string})"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a Hash/)
-      end
-
-    end
-
-    it "should compile when multiple hash arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = {}
-        $bar = { 'one' => 'two' }
-        validate_hash($foo, $bar)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should not compile when an undef variable is passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = undef
-        validate_hash($foo)
-      ENDofPUPPETcode
-      expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a Hash/)
-    end
-
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
deleted file mode 100755
index 45401a42327..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv4_address_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require "spec_helper"
-
-describe Puppet::Parser::Functions.function(:validate_ipv4_address) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe "when calling validate_ipv4_address from puppet" do
-    describe "when given IPv4 address strings" do
-      it "should compile with one argument" do
-        Puppet[:code] = "validate_ipv4_address('1.2.3.4')"
-        scope.compiler.compile
-      end
-
-      it "should compile with multiple arguments" do
-        Puppet[:code] = "validate_ipv4_address('1.2.3.4', '5.6.7.8')"
-        scope.compiler.compile
-      end
-    end
-
-    describe "when given an IPv6 address" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address('3ffe:505')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv4 address/)
-      end
-    end
-
-    describe "when given other strings" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address('hello', 'world')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv4 address/)
-      end
-    end
-
-    describe "when given numbers" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address(1, 2)"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /is not a valid IPv4 address/)
-      end
-    end
-
-    describe "when given booleans" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv4_address(true, false)"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /is not a string/)
-      end
-    end
-
-    it "should not compile when no arguments are passed" do
-      Puppet[:code] = "validate_ipv4_address()"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb
deleted file mode 100755
index a839d902c9e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_ipv6_address_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require "spec_helper"
-
-describe Puppet::Parser::Functions.function(:validate_ipv6_address) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe "when calling validate_ipv6_address from puppet" do
-    describe "when given IPv6 address strings" do
-      it "should compile with one argument" do
-        Puppet[:code] = "validate_ipv6_address('3ffe:0505:0002::')"
-        scope.compiler.compile
-      end
-
-      it "should compile with multiple arguments" do
-        Puppet[:code] = "validate_ipv6_address('3ffe:0505:0002::', '3ffe:0505:0001::')"
-        scope.compiler.compile
-      end
-    end
-
-    describe "when given an ipv4 address" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv6_address('1.2.3.4')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv6 address/)
-      end
-    end
-
-    describe "when given other strings" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv6_address('hello', 'world')"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /not a valid IPv6 address/)
-      end
-    end
-
-    # 1.8.7 is EOL'd and also absolutely insane about ipv6
-    unless RUBY_VERSION == '1.8.7'
-      describe "when given numbers" do
-        it "should not compile" do
-          Puppet[:code] = "validate_ipv6_address(1, 2)"
-          expect {
-            scope.compiler.compile
-          }.to raise_error(Puppet::ParseError, /not a valid IPv6 address/)
-        end
-      end
-    end
-
-    describe "when given booleans" do
-      it "should not compile" do
-        Puppet[:code] = "validate_ipv6_address(true, false)"
-        expect {
-          scope.compiler.compile
-        }.to raise_error(Puppet::ParseError, /is not a string/)
-      end
-    end
-
-    it "should not compile when no arguments are passed" do
-      Puppet[:code] = "validate_ipv6_address()"
-      expect {
-        scope.compiler.compile
-      }.to raise_error(Puppet::ParseError, /wrong number of arguments/)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb
deleted file mode 100755
index d29988bf006..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_re_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_re) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  # The subject of these examplres is the method itself.
-  subject do
-    # This makes sure the function is loaded within each test
-    function_name = Puppet::Parser::Functions.function(:validate_re)
-    scope.method(function_name)
-  end
-
-  context 'Using Puppet::Parser::Scope.new' do
-
-    describe 'Garbage inputs' do
-      inputs = [
-        [ nil ],
-        [ [ nil ] ],
-        [ { 'foo' => 'bar' } ],
-        [ { } ],
-        [ '' ],
-        [ "one", "one", "MSG to User", "4th arg" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should fail" do
-          expect { subject.call [input] }.to raise_error Puppet::ParseError
-        end
-      end
-    end
-
-    describe 'Valid inputs' do
-      inputs = [
-        [ '/full/path/to/something', '^/full' ],
-        [ '/full/path/to/something', 'full' ],
-        [ '/full/path/to/something', ['full', 'absent'] ],
-        [ '/full/path/to/something', ['full', 'absent'], 'Message to the user' ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should not fail" do
-          expect { subject.call input }.not_to raise_error
-        end
-      end
-    end
-    describe "Valid inputs which should raise an exception without a message" do
-      # The intent here is to make sure valid inputs raise exceptions when they
-      # don't specify an error message to display.  This is the behvior in
-      # 2.2.x and prior.
-      inputs = [
-        [ "hello", [ "bye", "later", "adios" ] ],
-        [ "greetings", "salutations" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /validate_re.*?does not match/
-        end
-      end
-    end
-    describe "Nicer Error Messages" do
-      # The intent here is to make sure the function returns the 3rd argument
-      # in the exception thrown
-      inputs = [
-        [ "hello", [ "bye", "later", "adios" ], "MSG to User" ],
-        [ "greetings", "salutations", "Error, greetings does not match salutations" ],
-      ]
-
-      inputs.each do |input|
-        it "validate_re(#{input.inspect}) should fail" do
-          expect { subject.call input }.to raise_error /#{input[2]}/
-        end
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb
deleted file mode 100755
index 851835fa1e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_slength_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe "the validate_slength function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("validate_slength").should == "function_validate_slength"
-  end
-
-  describe "validating the input argument types" do
-    it "raises an error if there are less than two arguments" do
-      expect { scope.function_validate_slength([]) }.to raise_error Puppet::ParseError, /Wrong number of arguments/
-    end
-
-    it "raises an error if there are more than three arguments" do
-      expect { scope.function_validate_slength(['input', 1, 2, 3]) }.to raise_error Puppet::ParseError, /Wrong number of arguments/
-    end
-
-    it "raises an error if the first argument is not a string" do
-      expect { scope.function_validate_slength([Object.new, 2, 1]) }.to raise_error Puppet::ParseError, /Expected first argument.*got .*Object/
-    end
-
-    it "raises an error if the second argument cannot be cast to an Integer" do
-      expect { scope.function_validate_slength(['input', Object.new]) }.to raise_error Puppet::ParseError, /Expected second argument.*got .*Object/
-    end
-
-    it "raises an error if the third argument cannot be cast to an Integer" do
-      expect { scope.function_validate_slength(['input', 1, Object.new]) }.to raise_error Puppet::ParseError, /Expected third argument.*got .*Object/
-    end
-
-    it "raises an error if the second argument is smaller than the third argument" do
-      expect { scope.function_validate_slength(['input', 1, 2]) }.to raise_error Puppet::ParseError, /Expected second argument to be larger than third argument/
-    end
-  end
-
-  describe "validating the input string length" do
-    describe "when the input is a string" do
-      it "fails validation if the string is larger than the max length" do
-        expect { scope.function_validate_slength(['input', 1]) }.to raise_error Puppet::ParseError, /Expected length .* between 0 and 1, was 5/
-      end
-
-      it "fails validation if the string is less than the min length" do
-        expect { scope.function_validate_slength(['input', 10, 6]) }.to raise_error Puppet::ParseError, /Expected length .* between 6 and 10, was 5/
-      end
-
-      it "doesn't raise an error if the string is under the max length" do
-        scope.function_validate_slength(['input', 10])
-      end
-
-      it "doesn't raise an error if the string is equal to the max length" do
-        scope.function_validate_slength(['input', 5])
-      end
-
-      it "doesn't raise an error if the string is equal to the min length" do
-        scope.function_validate_slength(['input', 10, 5])
-      end
-    end
-
-    describe "when the input is an array" do
-      it "fails validation if one of the array elements is not a string" do
-        expect { scope.function_validate_slength([["a", "b", Object.new], 2]) }.to raise_error Puppet::ParseError, /Expected element at array position 2 .*String, got .*Object/
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb
deleted file mode 100755
index 3b4fb3e1da1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/validate_string_spec.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-require 'spec_helper'
-
-describe Puppet::Parser::Functions.function(:validate_string) do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  describe 'when calling validate_string from puppet' do
-
-    %w{ foo bar baz }.each do |the_string|
-
-      it "should compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_string('#{the_string}')"
-        scope.compiler.compile
-      end
-
-      it "should compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_string(#{the_string})"
-        scope.compiler.compile
-      end
-
-    end
-
-    %w{ true false }.each do |the_string|
-      it "should compile when #{the_string} is a string" do
-        Puppet[:code] = "validate_string('#{the_string}')"
-        scope.compiler.compile
-      end
-
-      it "should not compile when #{the_string} is a bare word" do
-        Puppet[:code] = "validate_string(#{the_string})"
-        expect { scope.compiler.compile }.to raise_error(Puppet::ParseError, /is not a string/)
-      end
-    end
-
-    it "should compile when multiple string arguments are passed" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = ''
-        $bar = 'two'
-        validate_string($foo, $bar)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should compile when an explicitly undef variable is passed (NOTE THIS MAY NOT BE DESIRABLE)" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        $foo = undef
-        validate_string($foo)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-
-    it "should compile when an undefined variable is passed (NOTE THIS MAY NOT BE DESIRABLE)" do
-      Puppet[:code] = <<-'ENDofPUPPETcode'
-        validate_string($foobarbazishouldnotexist)
-      ENDofPUPPETcode
-      scope.compiler.compile
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb
deleted file mode 100755
index 08e95a567bc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_at_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the values_at function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("values_at").should == "function_values_at"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_values_at([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should raise a ParseError if you try to use a range where stop is greater then start" do
-    lambda { scope.function_values_at([['a','b'],["3-1"]]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return a value at from an array" do
-    result = scope.function_values_at([['a','b','c'],"1"])
-    result.should(eq(['b']))
-  end
-
-  it "should return a value at from an array when passed a range" do
-    result = scope.function_values_at([['a','b','c'],"0-1"])
-    result.should(eq(['a','b']))
-  end
-
-  it "should return chosen values from an array when passed number of indexes" do
-    result = scope.function_values_at([['a','b','c'],["0","2"]])
-    result.should(eq(['a','c']))
-  end
-
-  it "should return chosen values from an array when passed ranges and multiple indexes" do
-    result = scope.function_values_at([['a','b','c','d','e','f','g'],["0","2","4-5"]])
-    result.should(eq(['a','c','e','f']))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb
deleted file mode 100755
index 14ae4176380..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/values_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the values function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("values").should == "function_values"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_values([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should return values from a hash" do
-    result = scope.function_values([{'a'=>'1','b'=>'2','c'=>'3'}])
-    # =~ is the RSpec::Matchers::MatchArray matcher.
-    # A.K.A. "array with same elements" (multiset) matching
-    result.should =~ %w{ 1 2 3 }
-  end
-
-  it "should return a multiset" do
-    result = scope.function_values([{'a'=>'1','b'=>'3','c'=>'3'}])
-    result.should     =~ %w{ 1 3 3 }
-    result.should_not =~ %w{ 1 3 }
-  end
-
-  it "should raise a ParseError unless a Hash is provided" do
-    lambda { scope.function_values([['a','b','c']]) }.should( raise_error(Puppet::ParseError))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb
deleted file mode 100755
index f45ab17308d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/functions/zip_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-
-describe "the zip function" do
-  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_zip([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-  it "should be able to zip an array" do
-    result = scope.function_zip([['1','2','3'],['4','5','6']])
-    result.should(eq([["1", "4"], ["2", "5"], ["3", "6"]]))
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb
deleted file mode 100755
index 2f0ae4d7974..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/compiler.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Compiler
-  def compile_to_catalog(string, node = Puppet::Node.new('foonode'))
-    Puppet[:code] = string
-    Puppet::Parser::Compiler.compile(node)
-  end
-
-  def compile_to_ral(manifest)
-    catalog = compile_to_catalog(manifest)
-    ral = catalog.to_ral
-    ral.finalize
-    ral
-  end
-
-  def compile_to_relationship_graph(manifest, prioritizer = Puppet::Graph::SequentialPrioritizer.new)
-    ral = compile_to_ral(manifest)
-    graph = Puppet::Graph::RelationshipGraph.new(prioritizer)
-    graph.populate_from(ral)
-    graph
-  end
-
-  if Puppet.version.to_f >= 3.3
-    def apply_compiled_manifest(manifest, prioritizer = Puppet::Graph::SequentialPrioritizer.new)
-      transaction = Puppet::Transaction.new(compile_to_ral(manifest),
-                                          Puppet::Transaction::Report.new("apply"),
-                                          prioritizer)
-      transaction.evaluate
-      transaction.report.finalize_report
-
-      transaction
-    end
-  else
-    def apply_compiled_manifest(manifest)
-      transaction = Puppet::Transaction.new(compile_to_ral(manifest), Puppet::Transaction::Report.new("apply"))
-      transaction.evaluate
-      transaction.report.finalize_report
-
-      transaction
-    end
-  end
-
-  def order_resources_traversed_in(relationships)
-    order_seen = []
-    relationships.traverse { |resource| order_seen << resource.ref }
-    order_seen
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb
deleted file mode 100755
index f5c2341791b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/database.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-# This just makes some nice things available at global scope, and for setup of
-# tests to use a real fake database, rather than a fake stubs-that-don't-work
-# version of the same.  Fun times.
-def sqlite?
-  if $sqlite.nil?
-    begin
-      require 'sqlite3'
-      $sqlite = true
-    rescue LoadError
-      $sqlite = false
-    end
-  end
-  $sqlite
-end
-
-def can_use_scratch_database?
-  sqlite? and Puppet.features.rails?
-end
-
-
-# This is expected to be called in your `before :each` block, and will get you
-# ready to roll with a serious database and all.  Cleanup is handled
-# automatically for you.  Nothing to do there.
-def setup_scratch_database
-  Puppet[:dbadapter] = 'sqlite3'
-  Puppet[:dblocation] = ':memory:'
-  Puppet[:railslog] = PuppetSpec::Files.tmpfile('storeconfigs.log')
-  Puppet::Rails.init
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb
deleted file mode 100755
index 71b38ffedfd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/files.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'fileutils'
-require 'tempfile'
-require 'tmpdir'
-require 'pathname'
-
-# A support module for testing files.
-module PuppetSpec::Files
-  def self.cleanup
-    $global_tempfiles ||= []
-    while path = $global_tempfiles.pop do
-      begin
-        Dir.unstub(:entries)
-        FileUtils.rm_rf path, :secure => true
-      rescue Errno::ENOENT
-        # nothing to do
-      end
-    end
-  end
-
-  def make_absolute(path) PuppetSpec::Files.make_absolute(path) end
-  def self.make_absolute(path)
-    path = File.expand_path(path)
-    path[0] = 'c' if Puppet.features.microsoft_windows?
-    path
-  end
-
-  def tmpfile(name, dir = nil) PuppetSpec::Files.tmpfile(name, dir) end
-  def self.tmpfile(name, dir = nil)
-    # Generate a temporary file, just for the name...
-    source = dir ? Tempfile.new(name, dir) : Tempfile.new(name)
-    path = source.path
-    source.close!
-
-    record_tmp(File.expand_path(path))
-
-    path
-  end
-
-  def file_containing(name, contents) PuppetSpec::Files.file_containing(name, contents) end
-  def self.file_containing(name, contents)
-    file = tmpfile(name)
-    File.open(file, 'wb') { |f| f.write(contents) }
-    file
-  end
-
-  def tmpdir(name) PuppetSpec::Files.tmpdir(name) end
-  def self.tmpdir(name)
-    dir = Dir.mktmpdir(name)
-
-    record_tmp(dir)
-
-    dir
-  end
-
-  def self.record_tmp(tmp)
-    # ...record it for cleanup,
-    $global_tempfiles ||= []
-    $global_tempfiles << tmp
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb
deleted file mode 100755
index 81e9775ff87..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/fixtures.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Fixtures
-  def fixtures(*rest)
-    File.join(PuppetSpec::FIXTURE_DIR, *rest)
-  end
-  def my_fixture_dir
-    callers = caller
-    while line = callers.shift do
-      next unless found = line.match(%r{/spec/(.*)_spec\.rb:})
-      return fixtures(found[1])
-    end
-    fail "sorry, I couldn't work out your path from the caller stack!"
-  end
-  def my_fixture(name)
-    file = File.join(my_fixture_dir, name)
-    unless File.readable? file then
-      fail Puppet::DevError, "fixture '#{name}' for #{my_fixture_dir} is not readable"
-    end
-    return file
-  end
-  def my_fixtures(glob = '*', flags = 0)
-    files = Dir.glob(File.join(my_fixture_dir, glob), flags)
-    unless files.length > 0 then
-      fail Puppet::DevError, "fixture '#{glob}' for #{my_fixture_dir} had no files!"
-    end
-    block_given? and files.each do |file| yield file end
-    files
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb
deleted file mode 100755
index 093d77c8122..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/matchers.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'stringio'
-
-########################################################################
-# Backward compatibility for Jenkins outdated environment.
-module RSpec
-  module Matchers
-    module BlockAliases
-      alias_method :to,     :should      unless method_defined? :to
-      alias_method :to_not, :should_not  unless method_defined? :to_not
-      alias_method :not_to, :should_not  unless method_defined? :not_to
-    end
-  end
-end
-
-
-########################################################################
-# Custom matchers...
-RSpec::Matchers.define :have_matching_element do |expected|
-  match do |actual|
-    actual.any? { |item| item =~ expected }
-  end
-end
-
-
-RSpec::Matchers.define :exit_with do |expected|
-  actual = nil
-  match do |block|
-    begin
-      block.call
-    rescue SystemExit => e
-      actual = e.status
-    end
-    actual and actual == expected
-  end
-  failure_message_for_should do |block|
-    "expected exit with code #{expected} but " +
-      (actual.nil? ? " exit was not called" : "we exited with #{actual} instead")
-  end
-  failure_message_for_should_not do |block|
-    "expected that exit would not be called with #{expected}"
-  end
-  description do
-    "expect exit with #{expected}"
-  end
-end
-
-class HavePrintedMatcher
-  attr_accessor :expected, :actual
-
-  def initialize(expected)
-    case expected
-    when String, Regexp
-      @expected = expected
-    else
-      @expected = expected.to_s
-    end
-  end
-
-  def matches?(block)
-    begin
-      $stderr = $stdout = StringIO.new
-      $stdout.set_encoding('UTF-8') if $stdout.respond_to?(:set_encoding)
-      block.call
-      $stdout.rewind
-      @actual = $stdout.read
-    ensure
-      $stdout = STDOUT
-      $stderr = STDERR
-    end
-
-    if @actual then
-      case @expected
-      when String
-        @actual.include? @expected
-      when Regexp
-        @expected.match @actual
-      end
-    else
-      false
-    end
-  end
-
-  def failure_message_for_should
-    if @actual.nil? then
-      "expected #{@expected.inspect}, but nothing was printed"
-    else
-      "expected #{@expected.inspect} to be printed; got:\n#{@actual}"
-    end
-  end
-
-  def failure_message_for_should_not
-    "expected #{@expected.inspect} to not be printed; got:\n#{@actual}"
-  end
-
-  def description
-    "expect #{@expected.inspect} to be printed"
-  end
-end
-
-def have_printed(what)
-  HavePrintedMatcher.new(what)
-end
-
-RSpec::Matchers.define :equal_attributes_of do |expected|
-  match do |actual|
-    actual.instance_variables.all? do |attr|
-      actual.instance_variable_get(attr) == expected.instance_variable_get(attr)
-    end
-  end
-end
-
-RSpec::Matchers.define :be_one_of do |*expected|
-  match do |actual|
-    expected.include? actual
-  end
-
-  failure_message_for_should do |actual|
-    "expected #{actual.inspect} to be one of #{expected.map(&:inspect).join(' or ')}"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb
deleted file mode 100755
index 910c6d94e43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/modules.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Modules
-  class << self
-    def create(name, dir, options = {})
-      module_dir = File.join(dir, name)
-      FileUtils.mkdir_p(module_dir)
-
-      environment = options[:environment]
-
-      if metadata = options[:metadata]
-        metadata[:source]  ||= 'github'
-        metadata[:author]  ||= 'puppetlabs'
-        metadata[:version] ||= '9.9.9'
-        metadata[:license] ||= 'to kill'
-        metadata[:dependencies] ||= []
-
-        metadata[:name] = "#{metadata[:author]}/#{name}"
-
-        File.open(File.join(module_dir, 'metadata.json'), 'w') do |f|
-          f.write(metadata.to_pson)
-        end
-      end
-
-      Puppet::Module.new(name, module_dir, environment)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb
deleted file mode 100755
index e056a52b77d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/pops.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Pops
-  extend RSpec::Matchers::DSL
-
-  # Checks if an Acceptor has a specific issue in its list of diagnostics
-  matcher :have_issue do |expected|
-    match do |actual|
-      actual.diagnostics.index { |i| i.issue == expected } != nil
-    end
-    failure_message_for_should do |actual|
-      "expected Acceptor[#{actual.diagnostics.collect { |i| i.issue.issue_code }.join(',')}] to contain issue #{expected.issue_code}"
-    end
-    failure_message_for_should_not do |actual|
-      "expected Acceptor[#{actual.diagnostics.collect { |i| i.issue.issue_code }.join(',')}] to not contain issue #{expected.issue_code}"
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb
deleted file mode 100755
index 3847ede1877..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/scope.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-
-module PuppetSpec::Scope
-  # Initialize a new scope suitable for testing.
-  #
-  def create_test_scope_for_node(node_name)
-    node = Puppet::Node.new(node_name)
-    compiler = Puppet::Parser::Compiler.new(node)
-    scope = Puppet::Parser::Scope.new(compiler)
-    scope.source = Puppet::Resource::Type.new(:node, node_name)
-    scope.parent = compiler.topscope
-    scope
-  end
-
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb
deleted file mode 100755
index 8ddcb975fb4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/settings.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-module PuppetSpec::Settings
-
-  # It would probably be preferable to refactor defaults.rb such that the real definitions of
-  #  these settings were available as a variable, which was then accessible for use during tests.
-  #  However, I'm not doing that yet because I don't want to introduce any additional moving parts
-  #  to this already very large changeset.
-  #  Would be nice to clean this up later.  --cprice 2012-03-20
-  TEST_APP_DEFAULT_DEFINITIONS = {
-    :name         => { :default => "test", :desc => "name" },
-    :logdir       => { :type => :directory, :default => "test", :desc => "logdir" },
-    :confdir      => { :type => :directory, :default => "test", :desc => "confdir" },
-    :vardir       => { :type => :directory, :default => "test", :desc => "vardir" },
-    :rundir       => { :type => :directory, :default => "test", :desc => "rundir" },
-  }
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb
deleted file mode 100755
index b2683df0483..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/lib/puppet_spec/verbose.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-# Support code for running stuff with warnings disabled.
-module Kernel
-  def with_verbose_disabled
-    verbose, $VERBOSE = $VERBOSE, nil
-    result = yield
-    $VERBOSE = verbose
-    return result
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb
deleted file mode 100755
index 505e240920b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/alias_should_to_must.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'rspec'
-
-class Object
-  # This is necessary because the RAL has a 'should'
-  # method.
-  alias :must :should
-  alias :must_not :should_not
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb
deleted file mode 100755
index 3ae59f978b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/monkey_patches/publicize_methods.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-# Some monkey-patching to allow us to test private methods.
-class Class
-    def publicize_methods(*methods)
-        saved_private_instance_methods = methods.empty? ? self.private_instance_methods : methods
-
-        self.class_eval { public(*saved_private_instance_methods) }
-        yield
-        self.class_eval { private(*saved_private_instance_methods) }
-    end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper.rb
deleted file mode 100755
index 78925fdea3d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-# So everyone else doesn't have to include this base constant.
-module PuppetSpec
-  FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
-end
-
-require 'puppet'
-require 'rspec-puppet'
-require 'simplecov'
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'puppet_spec/verbose'
-require 'puppet_spec/files'
-require 'puppet_spec/settings'
-require 'puppet_spec/fixtures'
-require 'puppet_spec/matchers'
-require 'puppet_spec/database'
-require 'monkey_patches/alias_should_to_must'
-require 'mocha/setup'
-
-
-SimpleCov.start do
-  add_filter "/spec/"
-end
-
-
-RSpec.configure do |config|
-  config.before :each do
-    # Ensure that we don't accidentally cache facts and environment between
-    # test cases.  This requires each example group to explicitly load the
-    # facts being exercised with something like
-    # Facter.collection.loader.load(:ipaddress)
-    Facter::Util::Loader.any_instance.stubs(:load_all)
-    Facter.clear
-    Facter.clear_messages
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb
deleted file mode 100755
index 8e56daa6830..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/spec_helper_acceptance.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'beaker-rspec'
-
-UNSUPPORTED_PLATFORMS = []
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  if hosts.first.is_pe?
-    install_pe
-    on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d'
-  else
-    install_puppet
-    on hosts, 'mkdir -p /etc/facter/facts.d'
-    on hosts, '/bin/touch /etc/puppet/hiera.yaml'
-  end
-  hosts.each do |host|
-    on host, "mkdir -p #{host['distmoduledir']}"
-  end
-end
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Readable test descriptions
-  c.formatter = :documentation
-
-  # Configure all nodes in nodeset
-  c.before :suite do
-    puppet_module_install(:source => proj_root, :module_name => 'stdlib')
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json
deleted file mode 100644
index 3cb5e70c964..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.last_run.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "result": {
-    "covered_percent": 100.0
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json
deleted file mode 100644
index bed049341c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/.resultset.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "RSpec": {
-    "coverage": {
-    },
-    "timestamp": 1398200553
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css
deleted file mode 100644
index d86560434df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.css
+++ /dev/null
@@ -1,799 +0,0 @@
-/* -----------------------------------------------------------------------
-
-
- Blueprint CSS Framework 0.9
- http://blueprintcss.org
-
-   * Copyright (c) 2007-Present. See LICENSE for more info.
-   * See README for instructions on how to use Blueprint.
-   * For credits and origins, see AUTHORS.
-   * This is a compressed file. See the sources in the 'src' directory.
-
------------------------------------------------------------------------ */
-
-/* reset.css */
-
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
-article, aside, dialog, figure, footer, header, hgroup, nav, section {display:block;}
-body {line-height:1.5;}
-table {border-collapse:separate;border-spacing:0;}
-caption, th, td {text-align:left;font-weight:normal;}
-table, td, th {vertical-align:middle;}
-blockquote:before, blockquote:after, q:before, q:after {content:"";}
-blockquote, q {quotes:"" "";}
-a img {border:none;}
-
-/* typography.css */
-html {font-size:100.01%;}
-body {font-size:82%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
-h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
-h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
-h2 {font-size:2em;margin-bottom:0.75em;}
-h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
-h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
-h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
-h6 {font-size:1em;font-weight:bold;}
-h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
-p {margin:0 0 1.5em;}
-p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
-p img.right {float:right;margin:1.5em 0 1.5em 1.5em;}
-a:focus, a:hover {color:#000;}
-a {color:#009;text-decoration:underline;}
-blockquote {margin:1.5em;color:#666;font-style:italic;}
-strong {font-weight:bold;}
-em, dfn {font-style:italic;}
-dfn {font-weight:bold;}
-sup, sub {line-height:0;}
-abbr, acronym {border-bottom:1px dotted #666;}
-address {margin:0 0 1.5em;font-style:italic;}
-del {color:#666;}
-pre {margin:1.5em 0;white-space:pre;}
-pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
-li ul, li ol {margin:0;}
-ul, ol {margin:0 1.5em 1.5em 0;padding-left:3.333em;}
-ul {list-style-type:disc;}
-ol {list-style-type:decimal;}
-dl {margin:0 0 1.5em 0;}
-dl dt {font-weight:bold;}
-dd {margin-left:1.5em;}
-table {margin-bottom:1.4em;width:100%;}
-th {font-weight:bold;}
-thead th {background:#c3d9ff;}
-th, td, caption {padding:4px 10px 4px 5px;}
-tr.even td {background:#efefef;}
-tfoot {font-style:italic;}
-caption {background:#eee;}
-.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
-.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
-.hide {display:none;}
-.quiet {color:#666;}
-.loud {color:#000;}
-.highlight {background:#ff0;}
-.added {background:#060;color:#fff;}
-.removed {background:#900;color:#fff;}
-.first {margin-left:0;padding-left:0;}
-.last {margin-right:0;padding-right:0;}
-.top {margin-top:0;padding-top:0;}
-.bottom {margin-bottom:0;padding-bottom:0;}
-
-/* forms.css */
-label {font-weight:bold;}
-fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
-legend {font-weight:bold;font-size:1.2em;}
-input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;}
-input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;}
-input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
-input.text, input.title {width:300px;padding:5px;}
-input.title {font-size:1.5em;}
-textarea {width:390px;height:250px;padding:5px;}
-input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;}
-form.inline {line-height:3;}
-form.inline p {margin-bottom:0;}
-.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;}
-.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
-.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
-.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
-.error a {color:#8a1f11;}
-.notice a {color:#514721;}
-.success a {color:#264409;}
-.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;}
-hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;}
-hr.space {background:#fff;color:#fff;visibility:hidden;}
-.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
-.clearfix, .container {display:block;}
-.clear {clear:both;}
-/*
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-*/
-
-
-pre code {
-}
-
-pre .comment,
-pre .template_comment,
-pre .diff .header,
-pre .javadoc {
-  color: #998;
-  font-style: italic
-}
-
-pre .keyword,
-pre .css .rule .keyword,
-pre .winutils,
-pre .javascript .title,
-pre .lisp .title {
-  color: #000;
-  font-weight: bold
-}
-
-pre .number,
-pre .hexcolor {
-  color: #458
-}
-
-
-pre .string,
-pre .tag .value,
-pre .phpdoc,
-pre .tex .formula {
-  color: #d14
-}
-
-pre .subst {
-  color: #712;
-}
-
-pre .constant,
-pre .title,
-pre .id {
-  color: #900;
-  font-weight: bold
-}
-
-pre .javascript .title,
-pre .lisp .title,
-pre .subst {
-  font-weight: normal
-}
-
-pre .class .title,
-pre .haskell .label,
-pre .tex .command {
-  color: #458;
-  font-weight: bold
-}
-
-pre .tag,
-pre .tag .title,
-pre .rules .property,
-pre .django .tag .keyword {
-  color: #000080;
-  font-weight: normal
-}
-
-pre .attribute,
-pre .variable,
-pre .instancevar,
-pre .lisp .body {
-  color: #008080
-}
-
-pre .regexp {
-  color: #009926
-}
-
-pre .class {
-  color: #458;
-  font-weight: bold
-}
-
-pre .symbol,
-pre .ruby .symbol .string,
-pre .ruby .symbol .keyword,
-pre .ruby .symbol .keymethods,
-pre .lisp .keyword,
-pre .tex .special,
-pre .input_number {
-  color: #990073
-}
-
-pre .builtin,
-pre .built_in,
-pre .lisp .title {
-  color: #0086b3
-}
-
-pre .preprocessor,
-pre .pi,
-pre .doctype,
-pre .shebang,
-pre .cdata {
-  color: #999;
-  font-weight: bold
-}
-
-pre .deletion {
-  background: #fdd
-}
-
-pre .addition {
-  background: #dfd
-}
-
-pre .diff .change {
-  background: #0086b3
-}
-
-pre .chunk {
-  color: #aaa
-}
-
-pre .tex .formula {
-  opacity: 0.5;
-}
-/*
- * jQuery UI CSS Framework @VERSION
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework @VERSION
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
-/*
-    ColorBox Core Style:
-    The following CSS is consistent between example themes and should not be altered.
-*/
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
-#cboxOverlay{position:fixed; width:100%; height:100%;}
-#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative;}
-#cboxLoadedContent{overflow:auto;}
-#cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
-#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
-.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
-.cboxIframe{width:100%; height:100%; display:block; border:0;}
-#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
-
-/*
-    User Style:
-    Change the following styles to modify the appearance of ColorBox.  They are
-    ordered & tabbed in a way that represents the nesting of the generated HTML.
-*/
-#cboxOverlay{background:#000;}
-#colorbox{}
-    #cboxTopLeft{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat 0 0;}
-    #cboxTopCenter{height:14px; background:url(colorbox/border.png) repeat-x top left;}
-    #cboxTopRight{width:14px; height:14px; background:url(colorbox/controls.png) no-repeat -36px 0;}
-    #cboxBottomLeft{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat 0 -32px;}
-    #cboxBottomCenter{height:43px; background:url(colorbox/border.png) repeat-x bottom left;}
-    #cboxBottomRight{width:14px; height:43px; background:url(colorbox/controls.png) no-repeat -36px -32px;}
-    #cboxMiddleLeft{width:14px; background:url(colorbox/controls.png) repeat-y -175px 0;}
-    #cboxMiddleRight{width:14px; background:url(colorbox/controls.png) repeat-y -211px 0;}
-    #cboxContent{background:#fff; overflow:visible;}
-        .cboxIframe{background:#fff;}
-        #cboxError{padding:50px; border:1px solid #ccc;}
-        #cboxLoadedContent{margin-bottom:5px;}
-        #cboxLoadingOverlay{background:url(colorbox/loading_background.png) no-repeat center center;}
-        #cboxLoadingGraphic{background:url(colorbox/loading.gif) no-repeat center center;}
-        #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;}
-        #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;}
-
-        #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{position:absolute; bottom:-29px; background:url(colorbox/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;}
-        #cboxPrevious{left:0px; background-position: -51px -25px;}
-        #cboxPrevious:hover{background-position:-51px 0px;}
-        #cboxNext{left:27px; background-position:-75px -25px;}
-        #cboxNext:hover{background-position:-75px 0px;}
-        #cboxClose{right:0; background-position:-100px -25px;}
-        #cboxClose:hover{background-position:-100px 0px;}
-
-        .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;}
-        .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;}
-        .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;}
-        .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;}
-#loading {
-  position: fixed;
-  left: 40%;
-  top: 50%; }
-
-a {
-  color: #333333;
-  text-decoration: none; }
-  a:hover {
-    color: black;
-    text-decoration: underline; }
-
-body {
-  font-family: "Lucida Grande", Helvetica, "Helvetica Neue", Arial, sans-serif;
-  padding: 12px;
-  background-color: #333333; }
-
-h1, h2, h3, h4 {
-  color: #1c2324;
-  margin: 0;
-  padding: 0;
-  margin-bottom: 12px; }
-
-table {
-  width: 100%; }
-
-#content {
-  clear: left;
-  background-color: white;
-  border: 2px solid #dddddd;
-  border-top: 8px solid #dddddd;
-  padding: 18px;
-  -webkit-border-bottom-left-radius: 5px;
-  -webkit-border-bottom-right-radius: 5px;
-  -webkit-border-top-right-radius: 5px;
-  -moz-border-radius-bottomleft: 5px;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-topright: 5px;
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-  border-top-right-radius: 5px; }
-
-.dataTables_filter, .dataTables_info {
-  padding: 2px 6px; }
-
-abbr.timeago {
-  text-decoration: none;
-  border: none;
-  font-weight: bold; }
-
-.timestamp {
-  float: right;
-  color: #dddddd; }
-
-.group_tabs {
-  list-style: none;
-  float: left;
-  margin: 0;
-  padding: 0; }
-  .group_tabs li {
-    display: inline;
-    float: left; }
-    .group_tabs li a {
-      font-family: Helvetica, Arial, sans-serif;
-      display: block;
-      float: left;
-      text-decoration: none;
-      padding: 4px 8px;
-      background-color: #aaaaaa;
-      background: -webkit-gradient(linear, 0 0, 0 bottom, from(#dddddd), to(#aaaaaa));
-      background: -moz-linear-gradient(#dddddd, #aaaaaa);
-      background: linear-gradient(#dddddd, #aaaaaa);
-      text-shadow: #e5e5e5 1px 1px 0px;
-      border-bottom: none;
-      color: #333333;
-      font-weight: bold;
-      margin-right: 8px;
-      border-top: 1px solid #efefef;
-      -webkit-border-top-left-radius: 2px;
-      -webkit-border-top-right-radius: 2px;
-      -moz-border-radius-topleft: 2px;
-      -moz-border-radius-topright: 2px;
-      border-top-left-radius: 2px;
-      border-top-right-radius: 2px; }
-      .group_tabs li a:hover {
-        background-color: #cccccc;
-        background: -webkit-gradient(linear, 0 0, 0 bottom, from(#eeeeee), to(#aaaaaa));
-        background: -moz-linear-gradient(#eeeeee, #aaaaaa);
-        background: linear-gradient(#eeeeee, #aaaaaa); }
-      .group_tabs li a:active {
-        padding-top: 5px;
-        padding-bottom: 3px; }
-    .group_tabs li.active a {
-      color: black;
-      text-shadow: white 1px 1px 0px;
-      background-color: #dddddd;
-      background: -webkit-gradient(linear, 0 0, 0 bottom, from(white), to(#dddddd));
-      background: -moz-linear-gradient(white, #dddddd);
-      background: linear-gradient(white, #dddddd); }
-
-.file_list {
-  margin-bottom: 18px; }
-
-a.src_link {
-  background: url("./magnify.png") no-repeat left 50%;
-  padding-left: 18px; }
-
-tr, td {
-  margin: 0;
-  padding: 0; }
-
-th {
-  white-space: nowrap; }
-  th.ui-state-default {
-    cursor: pointer; }
-  th span.ui-icon {
-    float: left; }
-
-td {
-  padding: 4px 8px; }
-  td.strong {
-    font-weight: bold; }
-
-.source_table h3, .source_table h4 {
-  padding: 0;
-  margin: 0;
-  margin-bottom: 4px; }
-.source_table .header {
-  padding: 10px; }
-.source_table pre {
-  margin: 0;
-  padding: 0;
-  white-space: normal;
-  color: black;
-  font-family: "Monaco", "Inconsolata", "Consolas", monospace; }
-.source_table code {
-  color: black;
-  font-family: "Monaco", "Inconsolata", "Consolas", monospace; }
-.source_table pre {
-  background-color: #333333; }
-  .source_table pre ol {
-    margin: 0px;
-    padding: 0px;
-    margin-left: 45px;
-    font-size: 12px;
-    color: white; }
-  .source_table pre li {
-    margin: 0px;
-    padding: 2px 6px;
-    border-left: 5px solid white; }
-    .source_table pre li code {
-      white-space: pre;
-      white-space: pre-wrap; }
-  .source_table pre .hits {
-    float: right;
-    margin-left: 10px;
-    padding: 2px 4px;
-    background-color: #444444;
-    background: -webkit-gradient(linear, 0 0, 0 bottom, from(#222222), to(#666666));
-    background: -moz-linear-gradient(#222222, #666666);
-    background: linear-gradient(#222222, #666666);
-    color: white;
-    font-family: Helvetica, "Helvetica Neue", Arial, sans-serif;
-    font-size: 10px;
-    font-weight: bold;
-    text-align: center;
-    border-radius: 6px; }
-
-#footer {
-  color: #dddddd;
-  font-size: 12px;
-  font-weight: bold;
-  margin-top: 12px;
-  text-align: right; }
-  #footer a {
-    color: #eeeeee;
-    text-decoration: underline; }
-    #footer a:hover {
-      color: white;
-      text-decoration: none; }
-
-.green {
-  color: #009900; }
-
-.red {
-  color: #990000; }
-
-.yellow {
-  color: #ddaa00; }
-
-.source_table .covered {
-  border-color: #009900; }
-.source_table .missed {
-  border-color: #990000; }
-.source_table .never {
-  border-color: black; }
-.source_table .skipped {
-  border-color: #ffcc00; }
-.source_table .covered:nth-child(odd) {
-  background-color: #cdf2cd; }
-.source_table .covered:nth-child(even) {
-  background-color: #dbf2db; }
-.source_table .missed:nth-child(odd) {
-  background-color: #f7c0c0; }
-.source_table .missed:nth-child(even) {
-  background-color: #f7cfcf; }
-.source_table .never:nth-child(odd) {
-  background-color: #efefef; }
-.source_table .never:nth-child(even) {
-  background-color: #f4f4f4; }
-.source_table .skipped:nth-child(odd) {
-  background-color: #fbf0c0; }
-.source_table .skipped:nth-child(even) {
-  background-color: #fbffcf; }
-
-
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js
deleted file mode 100644
index 5e06df5f31d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/application.js
+++ /dev/null
@@ -1,1559 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.6.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Jun 30 14:16:56 2011 -0400
- */
-
-(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
-shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
-)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
-var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/</gm,"&lt;")}function c(q,p,o){return RegExp(p,"m"+(q.cI?"i":"")+(o?"g":""))}function i(q){for(var o=0;o<q.childNodes.length;o++){var p=q.childNodes[o];if(p.nodeName=="CODE"){return p}if(!(p.nodeType==3&&p.nodeValue.match(/\s+/))){break}}}function g(s,r){var q="";for(var p=0;p<s.childNodes.length;p++){if(s.childNodes[p].nodeType==3){var o=s.childNodes[p].nodeValue;if(r){o=o.replace(/\n/g,"")}q+=o}else{if(s.childNodes[p].nodeName=="BR"){q+="\n"}else{q+=g(s.childNodes[p])}}}if(/MSIE [678]/.test(navigator.userAgent)){q=q.replace(/\r/g,"\n")}return q}function a(r){var p=r.className.split(/\s+/);p=p.concat(r.parentNode.className.split(/\s+/));for(var o=0;o<p.length;o++){var q=p[o].replace(/^language-/,"");if(d[q]||q=="no-highlight"){return q}}}function b(o){var p=[];(function(r,s){for(var q=0;q<r.childNodes.length;q++){if(r.childNodes[q].nodeType==3){s+=r.childNodes[q].nodeValue.length}else{if(r.childNodes[q].nodeName=="BR"){s+=1}else{p.push({event:"start",offset:s,node:r.childNodes[q]});s=arguments.callee(r.childNodes[q],s);p.push({event:"stop",offset:s,node:r.childNodes[q]})}}}return s})(o,0);return p}function k(x,y,w){var q=0;var v="";var s=[];function t(){if(x.length&&y.length){if(x[0].offset!=y[0].offset){return(x[0].offset<y[0].offset)?x:y}else{return y[0].event=="start"?x:y}}else{return x.length?x:y}}function r(B){var C="<"+B.nodeName.toLowerCase();for(var z=0;z<B.attributes.length;z++){var A=B.attributes[z];C+=" "+A.nodeName.toLowerCase();if(A.nodeValue!=undefined){C+='="'+l(A.nodeValue)+'"'}}return C+">"}while(x.length||y.length){var u=t().splice(0,1)[0];v+=l(w.substr(q,u.offset-q));q=u.offset;if(u.event=="start"){v+=r(u.node);s.push(u.node)}else{if(u.event=="stop"){var p=s.length;do{p--;var o=s[p];v+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);s.splice(p,1);while(p<s.length){v+=r(s[p]);p++}}}}v+=w.substr(q);return v}function f(I,C){function y(r,L){for(var K=0;K<L.c.length;K++){if(L.c[K].bR.test(r)){return L.c[K]}}}function v(K,r){if(B[K].e&&B[K].eR.test(r)){return 1}if(B[K].eW){var L=v(K-1,r);return L?L+1:0}return 0}function w(r,K){return K.iR&&K.iR.test(r)}function z(N,M){var L=[];for(var K=0;K<N.c.length;K++){L.push(N.c[K].b)}var r=B.length-1;do{if(B[r].e){L.push(B[r].e)}r--}while(B[r+1].eW);if(N.i){L.push(N.i)}return c(M,"("+L.join("|")+")",true)}function q(L,K){var M=B[B.length-1];if(!M.t){M.t=z(M,G)}M.t.lastIndex=K;var r=M.t.exec(L);if(r){return[L.substr(K,r.index-K),r[0],false]}else{return[L.substr(K),"",true]}}function o(N,r){var K=G.cI?r[0].toLowerCase():r[0];for(var M in N.kG){if(!N.kG.hasOwnProperty(M)){continue}var L=N.kG[M].hasOwnProperty(K);if(L){return[M,L]}}return false}function E(L,N){if(!N.k){return l(L)}var M="";var O=0;N.lR.lastIndex=0;var K=N.lR.exec(L);while(K){M+=l(L.substr(O,K.index-O));var r=o(N,K);if(r){s+=r[1];M+='<span class="'+r[0]+'">'+l(K[0])+"</span>"}else{M+=l(K[0])}O=N.lR.lastIndex;K=N.lR.exec(L)}M+=l(L.substr(O,L.length-O));return M}function J(r,L){if(L.sL&&d[L.sL]){var K=f(L.sL,r);s+=K.keyword_count;return K.value}else{return E(r,L)}}function H(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){p+=K;L.buffer=""}else{if(L.eB){p+=l(r)+K;L.buffer=""}else{p+=K;L.buffer=r}}B.push(L);A+=L.r}function D(N,K,P){var Q=B[B.length-1];if(P){p+=J(Q.buffer+N,Q);return false}var L=y(K,Q);if(L){p+=J(Q.buffer+N,Q);H(L,K);return L.rB}var r=v(B.length-1,K);if(r){var M=Q.cN?"</span>":"";if(Q.rE){p+=J(Q.buffer+N,Q)+M}else{if(Q.eE){p+=J(Q.buffer+N,Q)+M+l(K)}else{p+=J(Q.buffer+N+K,Q)+M}}while(r>1){M=B[B.length-2].cN?"</span>":"";p+=M;r--;B.length--}var O=B[B.length-1];B.length--;B[B.length-1].buffer="";if(O.starts){H(O.starts,"")}return Q.rE}if(w(K,Q)){throw"Illegal"}}var G=d[I];var B=[G.dM];var A=0;var s=0;var p="";try{var u=0;G.dM.buffer="";do{var x=q(C,u);var t=D(x[0],x[1],x[2]);u+=x[0].length;if(!t){u+=x[1].length}}while(!x[2]);if(B.length>1){throw"Illegal"}return{language:I,r:A,keyword_count:s,value:p}}catch(F){if(F=="Illegal"){return{language:null,r:0,keyword_count:0,value:l(C)}}else{throw F}}}function h(){function o(t,s,u){if(t.compiled){return}if(!u){t.bR=c(s,t.b?t.b:"\\B|\\b");if(!t.e&&!t.eW){t.e="\\B|\\b"}if(t.e){t.eR=c(s,t.e)}}if(t.i){t.iR=c(s,t.i)}if(t.r==undefined){t.r=1}if(t.k){t.lR=c(s,t.l||hljs.IR,true)}for(var r in t.k){if(!t.k.hasOwnProperty(r)){continue}if(t.k[r] instanceof Object){t.kG=t.k}else{t.kG={keyword:t.k}}break}if(!t.c){t.c=[]}t.compiled=true;for(var q=0;q<t.c.length;q++){o(t.c[q],s,false)}if(t.starts){o(t.starts,s,false)}}for(var p in d){if(!d.hasOwnProperty(p)){continue}o(d[p].dM,d[p],true)}}function e(){if(e.called){return}e.called=true;h()}function n(t,y,p){e();var A=g(t,p);var r=a(t);if(r=="no-highlight"){return}if(r){var w=f(r,A)}else{var w={language:"",keyword_count:0,r:0,value:l(A)};var x=w;for(var z in d){if(!d.hasOwnProperty(z)){continue}var u=f(z,A);if(u.keyword_count+u.r>x.keyword_count+x.r){x=u}if(u.keyword_count+u.r>w.keyword_count+w.r){x=w;w=u}}}var s=t.className;if(!s.match(w.language)){s=s?(s+" "+w.language):w.language}var o=b(t);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=k(o,b(q),A)}if(y){w.value=w.value.replace(/^((<[^>]+>|\t)+)/gm,function(B,E,D,C){return E.replace(/\t/g,y)})}if(p){w.value=w.value.replace(/\n/g,"<br>")}if(/MSIE [678]/.test(navigator.userAgent)&&t.tagName=="CODE"&&t.parentNode.tagName=="PRE"){var q=t.parentNode;var v=document.createElement("div");v.innerHTML="<pre><code>"+w.value+"</code></pre>";t=v.firstChild.firstChild;v.firstChild.cN=q.cN;q.parentNode.replaceChild(v.firstChild,q)}else{t.innerHTML=w.value}t.className=s;t.dataset={};t.dataset.result={language:w.language,kw:w.keyword_count,re:w.r};if(x&&x.language){t.dataset.second_best={language:x.language,kw:x.keyword_count,re:x.r}}}function j(){if(j.called){return}j.called=true;e();var q=document.getElementsByTagName("pre");for(var o=0;o<q.length;o++){var p=i(q[o]);if(p){n(p,hljs.tabReplace)}}}function m(){var o=arguments;var p=function(){j.apply(null,o)};if(window.addEventListener){window.addEventListener("DOMContentLoaded",p,false);window.addEventListener("load",p,false)}else{if(window.attachEvent){window.attachEvent("onload",p)}else{window.onload=p}}}var d={};this.LANGUAGES=d;this.initHighlightingOnLoad=m;this.highlightBlock=n;this.initHighlighting=j;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="\\b(0x[A-Za-z0-9]+|\\d+(\\.\\d+)?)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\.",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.inherit=function(o,r){var q={};for(var p in o){q[p]=o[p]}if(r){for(var p in r){q[p]=r[p]}}return q}}();hljs.LANGUAGES.ruby=function(){var g="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var a="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var n={keyword:{and:1,"false":1,then:1,defined:1,module:1,"in":1,"return":1,redo:1,"if":1,BEGIN:1,retry:1,end:1,"for":1,"true":1,self:1,when:1,next:1,until:1,"do":1,begin:1,unless:1,END:1,rescue:1,nil:1,"else":1,"break":1,undef:1,not:1,"super":1,"class":1,"case":1,require:1,yield:1,alias:1,"while":1,ensure:1,elsif:1,or:1,def:1},keymethods:{__id__:1,__send__:1,abort:1,abs:1,"all?":1,allocate:1,ancestors:1,"any?":1,arity:1,assoc:1,at:1,at_exit:1,autoload:1,"autoload?":1,"between?":1,binding:1,binmode:1,"block_given?":1,call:1,callcc:1,caller:1,capitalize:1,"capitalize!":1,casecmp:1,"catch":1,ceil:1,center:1,chomp:1,"chomp!":1,chop:1,"chop!":1,chr:1,"class":1,class_eval:1,"class_variable_defined?":1,class_variables:1,clear:1,clone:1,close:1,close_read:1,close_write:1,"closed?":1,coerce:1,collect:1,"collect!":1,compact:1,"compact!":1,concat:1,"const_defined?":1,const_get:1,const_missing:1,const_set:1,constants:1,count:1,crypt:1,"default":1,default_proc:1,"delete":1,"delete!":1,delete_at:1,delete_if:1,detect:1,display:1,div:1,divmod:1,downcase:1,"downcase!":1,downto:1,dump:1,dup:1,each:1,each_byte:1,each_index:1,each_key:1,each_line:1,each_pair:1,each_value:1,each_with_index:1,"empty?":1,entries:1,eof:1,"eof?":1,"eql?":1,"equal?":1,"eval":1,exec:1,exit:1,"exit!":1,extend:1,fail:1,fcntl:1,fetch:1,fileno:1,fill:1,find:1,find_all:1,first:1,flatten:1,"flatten!":1,floor:1,flush:1,for_fd:1,foreach:1,fork:1,format:1,freeze:1,"frozen?":1,fsync:1,getc:1,gets:1,global_variables:1,grep:1,gsub:1,"gsub!":1,"has_key?":1,"has_value?":1,hash:1,hex:1,id:1,include:1,"include?":1,included_modules:1,index:1,indexes:1,indices:1,induced_from:1,inject:1,insert:1,inspect:1,instance_eval:1,instance_method:1,instance_methods:1,"instance_of?":1,"instance_variable_defined?":1,instance_variable_get:1,instance_variable_set:1,instance_variables:1,"integer?":1,intern:1,invert:1,ioctl:1,"is_a?":1,isatty:1,"iterator?":1,join:1,"key?":1,keys:1,"kind_of?":1,lambda:1,last:1,length:1,lineno:1,ljust:1,load:1,local_variables:1,loop:1,lstrip:1,"lstrip!":1,map:1,"map!":1,match:1,max:1,"member?":1,merge:1,"merge!":1,method:1,"method_defined?":1,method_missing:1,methods:1,min:1,module_eval:1,modulo:1,name:1,nesting:1,"new":1,next:1,"next!":1,"nil?":1,nitems:1,"nonzero?":1,object_id:1,oct:1,open:1,pack:1,partition:1,pid:1,pipe:1,pop:1,popen:1,pos:1,prec:1,prec_f:1,prec_i:1,print:1,printf:1,private_class_method:1,private_instance_methods:1,"private_method_defined?":1,private_methods:1,proc:1,protected_instance_methods:1,"protected_method_defined?":1,protected_methods:1,public_class_method:1,public_instance_methods:1,"public_method_defined?":1,public_methods:1,push:1,putc:1,puts:1,quo:1,raise:1,rand:1,rassoc:1,read:1,read_nonblock:1,readchar:1,readline:1,readlines:1,readpartial:1,rehash:1,reject:1,"reject!":1,remainder:1,reopen:1,replace:1,require:1,"respond_to?":1,reverse:1,"reverse!":1,reverse_each:1,rewind:1,rindex:1,rjust:1,round:1,rstrip:1,"rstrip!":1,scan:1,seek:1,select:1,send:1,set_trace_func:1,shift:1,singleton_method_added:1,singleton_methods:1,size:1,sleep:1,slice:1,"slice!":1,sort:1,"sort!":1,sort_by:1,split:1,sprintf:1,squeeze:1,"squeeze!":1,srand:1,stat:1,step:1,store:1,strip:1,"strip!":1,sub:1,"sub!":1,succ:1,"succ!":1,sum:1,superclass:1,swapcase:1,"swapcase!":1,sync:1,syscall:1,sysopen:1,sysread:1,sysseek:1,system:1,syswrite:1,taint:1,"tainted?":1,tell:1,test:1,"throw":1,times:1,to_a:1,to_ary:1,to_f:1,to_hash:1,to_i:1,to_int:1,to_io:1,to_proc:1,to_s:1,to_str:1,to_sym:1,tr:1,"tr!":1,tr_s:1,"tr_s!":1,trace_var:1,transpose:1,trap:1,truncate:1,"tty?":1,type:1,ungetc:1,uniq:1,"uniq!":1,unpack:1,unshift:1,untaint:1,untrace_var:1,upcase:1,"upcase!":1,update:1,upto:1,"value?":1,values:1,values_at:1,warn:1,write:1,write_nonblock:1,"zero?":1,zip:1}};var h={cN:"yardoctag",b:"@[A-Za-z]+"};var d={cN:"comment",b:"#",e:"$",c:[h]};var c={cN:"comment",b:"^\\=begin",e:"^\\=end",c:[h],r:10};var b={cN:"comment",b:"^__END__",e:"\\n$"};var u={cN:"subst",b:"#\\{",e:"}",l:g,k:n};var p=[hljs.BE,u];var s={cN:"string",b:"'",e:"'",c:p,r:0};var r={cN:"string",b:'"',e:'"',c:p,r:0};var q={cN:"string",b:"%[qw]?\\(",e:"\\)",c:p,r:10};var o={cN:"string",b:"%[qw]?\\[",e:"\\]",c:p,r:10};var m={cN:"string",b:"%[qw]?{",e:"}",c:p,r:10};var l={cN:"string",b:"%[qw]?<",e:">",c:p,r:10};var k={cN:"string",b:"%[qw]?/",e:"/",c:p,r:10};var j={cN:"string",b:"%[qw]?%",e:"%",c:p,r:10};var i={cN:"string",b:"%[qw]?-",e:"-",c:p,r:10};var t={cN:"string",b:"%[qw]?\\|",e:"\\|",c:p,r:10};var e={cN:"function",b:"\\bdef\\s+",e:" |$|;",l:g,k:n,c:[{cN:"title",b:a,l:g,k:n},{cN:"params",b:"\\(",e:"\\)",l:g,k:n},d,c,b]};var f={cN:"identifier",b:g,l:g,k:n,r:0};var v=[d,c,b,s,r,q,o,m,l,k,j,i,t,{cN:"class",b:"\\b(class|module)\\b",e:"$|;",k:{"class":1,module:1},c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+hljs.IR+"::)?"+hljs.IR}]},d,c,b]},e,{cN:"constant",b:"(::)?([A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[s,r,q,o,m,l,k,j,i,t,f],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},f,{b:"("+hljs.RSR+")\\s*",c:[d,c,b,{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[hljs.BE]}],r:0}];u.c=v;e.c[1].c=v;return{dM:{l:g,k:n,c:v}}}();
-// ColorBox v1.3.20.1 - jQuery lightbox plugin
-// (c) 2011 Jack Moore - jacklmoore.com
-// License: http://www.opensource.org/licenses/mit-license.php
-(function ($, document, window) {
-	var
-	// Default settings object.
-	// See http://jacklmoore.com/colorbox for details.
-	defaults = {
-		transition: "elastic",
-		speed: 300,
-		width: false,
-		initialWidth: "600",
-		innerWidth: false,
-		maxWidth: false,
-		height: false,
-		initialHeight: "450",
-		innerHeight: false,
-		maxHeight: false,
-		scalePhotos: true,
-		scrolling: true,
-		inline: false,
-		html: false,
-		iframe: false,
-		fastIframe: true,
-		photo: false,
-		href: false,
-		title: false,
-		rel: false,
-		opacity: 0.9,
-		preloading: true,
-
-		current: "image {current} of {total}",
-		previous: "previous",
-		next: "next",
-		close: "close",
-		xhrError: "This content failed to load.",
-		imgError: "This image failed to load.",
-
-		open: false,
-		returnFocus: true,
-		reposition: true,
-		loop: true,
-		slideshow: false,
-		slideshowAuto: true,
-		slideshowSpeed: 2500,
-		slideshowStart: "start slideshow",
-		slideshowStop: "stop slideshow",
-		onOpen: false,
-		onLoad: false,
-		onComplete: false,
-		onCleanup: false,
-		onClosed: false,
-		overlayClose: true,
-		escKey: true,
-		arrowKey: true,
-		top: false,
-		bottom: false,
-		left: false,
-		right: false,
-		fixed: false,
-		data: undefined
-	},
-	
-	// Abstracting the HTML and event identifiers for easy rebranding
-	colorbox = 'colorbox',
-	prefix = 'cbox',
-	boxElement = prefix + 'Element',
-	
-	// Events
-	event_open = prefix + '_open',
-	event_load = prefix + '_load',
-	event_complete = prefix + '_complete',
-	event_cleanup = prefix + '_cleanup',
-	event_closed = prefix + '_closed',
-	event_purge = prefix + '_purge',
-	
-	// Special Handling for IE
-	isIE = !$.support.opacity && !$.support.style, // IE7 & IE8
-	isIE6 = isIE && !window.XMLHttpRequest, // IE6
-	event_ie6 = prefix + '_IE6',
-
-	// Cached jQuery Object Variables
-	$overlay,
-	$box,
-	$wrap,
-	$content,
-	$topBorder,
-	$leftBorder,
-	$rightBorder,
-	$bottomBorder,
-	$related,
-	$window,
-	$loaded,
-	$loadingBay,
-	$loadingOverlay,
-	$title,
-	$current,
-	$slideshow,
-	$next,
-	$prev,
-	$close,
-	$groupControls,
-	
-	// Variables for cached values or use across multiple functions
-	settings,
-	interfaceHeight,
-	interfaceWidth,
-	loadedHeight,
-	loadedWidth,
-	element,
-	index,
-	photo,
-	open,
-	active,
-	closing,
-	loadingTimer,
-	publicMethod,
-	div = "div",
-	init;
-
-	// ****************
-	// HELPER FUNCTIONS
-	// ****************
-	
-	// Convience function for creating new jQuery objects
-	function $tag(tag, id, css) {
-		var element = document.createElement(tag);
-
-		if (id) {
-			element.id = prefix + id;
-		}
-
-		if (css) {
-			element.style.cssText = css;
-		}
-
-		return $(element);
-	}
-
-	// Determine the next and previous members in a group.
-	function getIndex(increment) {
-		var
-		max = $related.length,
-		newIndex = (index + increment) % max;
-		
-		return (newIndex < 0) ? max + newIndex : newIndex;
-	}
-
-	// Convert '%' and 'px' values to integers
-	function setSize(size, dimension) {
-		return Math.round((/%/.test(size) ? ((dimension === 'x' ? winWidth() : winHeight()) / 100) : 1) * parseInt(size, 10));
-	}
-	
-	// Checks an href to see if it is a photo.
-	// There is a force photo option (photo: true) for hrefs that cannot be matched by this regex.
-	function isImage(url) {
-		return settings.photo || /\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i.test(url);
-	}
-	
-	function winWidth() {
-		// $(window).width() is incorrect for some mobile browsers, but
-		// window.innerWidth is unsupported in IE8 and lower.
-		return window.innerWidth || $window.width();
-	}
-
-	function winHeight() {
-		return window.innerHeight || $window.height();
-	}
-
-	// Assigns function results to their respective properties
-	function makeSettings() {
-		var i,
-			data = $.data(element, colorbox);
-		
-		if (data == null) {
-			settings = $.extend({}, defaults);
-			if (console && console.log) {
-				console.log('Error: cboxElement missing settings object');
-			}
-		} else {
-			settings = $.extend({}, data);
-		}
-		
-		for (i in settings) {
-			if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time.
-				settings[i] = settings[i].call(element);
-			}
-		}
-		
-		settings.rel = settings.rel || element.rel || $(element).data('rel') || 'nofollow';
-		settings.href = settings.href || $(element).attr('href');
-		settings.title = settings.title || element.title;
-		
-		if (typeof settings.href === "string") {
-			settings.href = $.trim(settings.href);
-		}
-	}
-
-	function trigger(event, callback) {
-		$.event.trigger(event);
-		if (callback) {
-			callback.call(element);
-		}
-	}
-
-	// Slideshow functionality
-	function slideshow() {
-		var
-		timeOut,
-		className = prefix + "Slideshow_",
-		click = "click." + prefix,
-		start,
-		stop,
-		clear;
-		
-		if (settings.slideshow && $related[1]) {
-			start = function () {
-				$slideshow
-					.html(settings.slideshowStop)
-					.unbind(click)
-					.bind(event_complete, function () {
-						if (settings.loop || $related[index + 1]) {
-							timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
-						}
-					})
-					.bind(event_load, function () {
-						clearTimeout(timeOut);
-					})
-					.one(click + ' ' + event_cleanup, stop);
-				$box.removeClass(className + "off").addClass(className + "on");
-				timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
-			};
-			
-			stop = function () {
-				clearTimeout(timeOut);
-				$slideshow
-					.html(settings.slideshowStart)
-					.unbind([event_complete, event_load, event_cleanup, click].join(' '))
-					.one(click, function () {
-						publicMethod.next();
-						start();
-					});
-				$box.removeClass(className + "on").addClass(className + "off");
-			};
-			
-			if (settings.slideshowAuto) {
-				start();
-			} else {
-				stop();
-			}
-		} else {
-			$box.removeClass(className + "off " + className + "on");
-		}
-	}
-
-	function launch(target) {
-		if (!closing) {
-			
-			element = target;
-			
-			makeSettings();
-			
-			$related = $(element);
-			
-			index = 0;
-			
-			if (settings.rel !== 'nofollow') {
-				$related = $('.' + boxElement).filter(function () {
-					var data = $.data(this, colorbox),
-						relRelated;
-
-					if (data) {
-						relRelated =  $(this).data('rel') || data.rel || this.rel;
-					}
-					
-					return (relRelated === settings.rel);
-				});
-				index = $related.index(element);
-				
-				// Check direct calls to ColorBox.
-				if (index === -1) {
-					$related = $related.add(element);
-					index = $related.length - 1;
-				}
-			}
-			
-			if (!open) {
-				open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
-				
-				$box.show();
-				
-				if (settings.returnFocus) {
-					$(element).blur().one(event_closed, function () {
-						$(this).focus();
-					});
-				}
-				
-				// +settings.opacity avoids a problem in IE when using non-zero-prefixed-string-values, like '.5'
-				$overlay.css({"opacity": +settings.opacity, "cursor": settings.overlayClose ? "pointer" : "auto"}).show();
-				
-				// Opens inital empty ColorBox prior to content being loaded.
-				settings.w = setSize(settings.initialWidth, 'x');
-				settings.h = setSize(settings.initialHeight, 'y');
-				publicMethod.position();
-				
-				if (isIE6) {
-					$window.bind('resize.' + event_ie6 + ' scroll.' + event_ie6, function () {
-						$overlay.css({width: winWidth(), height: winHeight(), top: $window.scrollTop(), left: $window.scrollLeft()});
-					}).trigger('resize.' + event_ie6);
-				}
-				
-				trigger(event_open, settings.onOpen);
-				
-				$groupControls.add($title).hide();
-				
-				$close.html(settings.close).show();
-			}
-			
-			publicMethod.load(true);
-		}
-	}
-
-	// ColorBox's markup needs to be added to the DOM prior to being called
-	// so that the browser will go ahead and load the CSS background images.
-	function appendHTML() {
-		if (!$box && document.body) {
-			init = false;
-
-			$window = $(window);
-			$box = $tag(div).attr({id: colorbox, 'class': isIE ? prefix + (isIE6 ? 'IE6' : 'IE') : ''}).hide();
-			$overlay = $tag(div, "Overlay", isIE6 ? 'position:absolute' : '').hide();
-			$loadingOverlay = $tag(div, "LoadingOverlay").add($tag(div, "LoadingGraphic"));
-			$wrap = $tag(div, "Wrapper");
-			$content = $tag(div, "Content").append(
-				$loaded = $tag(div, "LoadedContent", 'width:0; height:0; overflow:hidden'),
-				$title = $tag(div, "Title"),
-				$current = $tag(div, "Current"),
-				$next = $tag(div, "Next"),
-				$prev = $tag(div, "Previous"),
-				$slideshow = $tag(div, "Slideshow").bind(event_open, slideshow),
-				$close = $tag(div, "Close")
-			);
-			
-			$wrap.append( // The 3x3 Grid that makes up ColorBox
-				$tag(div).append(
-					$tag(div, "TopLeft"),
-					$topBorder = $tag(div, "TopCenter"),
-					$tag(div, "TopRight")
-				),
-				$tag(div, false, 'clear:left').append(
-					$leftBorder = $tag(div, "MiddleLeft"),
-					$content,
-					$rightBorder = $tag(div, "MiddleRight")
-				),
-				$tag(div, false, 'clear:left').append(
-					$tag(div, "BottomLeft"),
-					$bottomBorder = $tag(div, "BottomCenter"),
-					$tag(div, "BottomRight")
-				)
-			).find('div div').css({'float': 'left'});
-			
-			$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none');
-			
-			$groupControls = $next.add($prev).add($current).add($slideshow);
-
-			$(document.body).append($overlay, $box.append($wrap, $loadingBay));
-		}
-	}
-
-	// Add ColorBox's event bindings
-	function addBindings() {
-		if ($box) {
-			if (!init) {
-				init = true;
-
-				// Cache values needed for size calculations
-				interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height();//Subtraction needed for IE6
-				interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width();
-				loadedHeight = $loaded.outerHeight(true);
-				loadedWidth = $loaded.outerWidth(true);
-				
-				// Setting padding to remove the need to do size conversions during the animation step.
-				$box.css({"padding-bottom": interfaceHeight, "padding-right": interfaceWidth});
-
-				// Anonymous functions here keep the public method from being cached, thereby allowing them to be redefined on the fly.
-				$next.click(function () {
-					publicMethod.next();
-				});
-				$prev.click(function () {
-					publicMethod.prev();
-				});
-				$close.click(function () {
-					publicMethod.close();
-				});
-				$overlay.click(function () {
-					if (settings.overlayClose) {
-						publicMethod.close();
-					}
-				});
-				
-				// Key Bindings
-				$(document).bind('keydown.' + prefix, function (e) {
-					var key = e.keyCode;
-					if (open && settings.escKey && key === 27) {
-						e.preventDefault();
-						publicMethod.close();
-					}
-					if (open && settings.arrowKey && $related[1]) {
-						if (key === 37) {
-							e.preventDefault();
-							$prev.click();
-						} else if (key === 39) {
-							e.preventDefault();
-							$next.click();
-						}
-					}
-				});
-
-				$('.' + boxElement, document).live('click', function (e) {
-					// ignore non-left-mouse-clicks and clicks modified with ctrl / command, shift, or alt.
-					// See: http://jacklmoore.com/notes/click-events/
-					if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey)) {
-						e.preventDefault();
-						launch(this);
-					}
-				});
-			}
-			return true;
-		}
-		return false;
-	}
-
-	// Don't do anything if ColorBox already exists.
-	if ($.colorbox) {
-		return;
-	}
-
-	// Append the HTML when the DOM loads
-	$(appendHTML);
-
-
-	// ****************
-	// PUBLIC FUNCTIONS
-	// Usage format: $.fn.colorbox.close();
-	// Usage from within an iframe: parent.$.fn.colorbox.close();
-	// ****************
-	
-	publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) {
-		var $this = this;
-		
-		options = options || {};
-		
-		appendHTML();
-
-		if (addBindings()) {
-			if (!$this[0]) {
-				if ($this.selector) { // if a selector was given and it didn't match any elements, go ahead and exit.
-					return $this;
-				}
-				// if no selector was given (ie. $.colorbox()), create a temporary element to work with
-				$this = $('<a/>');
-				options.open = true; // assume an immediate open
-			}
-			
-			if (callback) {
-				options.onComplete = callback;
-			}
-			
-			$this.each(function () {
-				$.data(this, colorbox, $.extend({}, $.data(this, colorbox) || defaults, options));
-			}).addClass(boxElement);
-			
-			if (($.isFunction(options.open) && options.open.call($this)) || options.open) {
-				launch($this[0]);
-			}
-		}
-		
-		return $this;
-	};
-
-	publicMethod.position = function (speed, loadedCallback) {
-		var
-		css,
-		top = 0,
-		left = 0,
-		offset = $box.offset(),
-		scrollTop,
-		scrollLeft;
-		
-		$window.unbind('resize.' + prefix);
-
-		// remove the modal so that it doesn't influence the document width/height
-		$box.css({top: -9e4, left: -9e4});
-
-		scrollTop = $window.scrollTop();
-		scrollLeft = $window.scrollLeft();
-
-		if (settings.fixed && !isIE6) {
-			offset.top -= scrollTop;
-			offset.left -= scrollLeft;
-			$box.css({position: 'fixed'});
-		} else {
-			top = scrollTop;
-			left = scrollLeft;
-			$box.css({position: 'absolute'});
-		}
-
-		// keeps the top and left positions within the browser's viewport.
-		if (settings.right !== false) {
-			left += Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0);
-		} else if (settings.left !== false) {
-			left += setSize(settings.left, 'x');
-		} else {
-			left += Math.round(Math.max(winWidth() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
-		}
-		
-		if (settings.bottom !== false) {
-			top += Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.bottom, 'y'), 0);
-		} else if (settings.top !== false) {
-			top += setSize(settings.top, 'y');
-		} else {
-			top += Math.round(Math.max(winHeight() - settings.h - loadedHeight - interfaceHeight, 0) / 2);
-		}
-
-		$box.css({top: offset.top, left: offset.left});
-
-		// setting the speed to 0 to reduce the delay between same-sized content.
-		speed = ($box.width() === settings.w + loadedWidth && $box.height() === settings.h + loadedHeight) ? 0 : speed || 0;
-		
-		// this gives the wrapper plenty of breathing room so it's floated contents can move around smoothly,
-		// but it has to be shrank down around the size of div#colorbox when it's done.  If not,
-		// it can invoke an obscure IE bug when using iframes.
-		$wrap[0].style.width = $wrap[0].style.height = "9999px";
-		
-		function modalDimensions(that) {
-			$topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = that.style.width;
-			$content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = that.style.height;
-		}
-
-		css = {width: settings.w + loadedWidth, height: settings.h + loadedHeight, top: top, left: left};
-		if(speed===0){ // temporary workaround to side-step jQuery-UI 1.8 bug (http://bugs.jquery.com/ticket/12273)
-			$box.css(css);
-		}
-		$box.dequeue().animate(css, {
-			duration: speed,
-			complete: function () {
-				modalDimensions(this);
-				
-				active = false;
-				
-				// shrink the wrapper down to exactly the size of colorbox to avoid a bug in IE's iframe implementation.
-				$wrap[0].style.width = (settings.w + loadedWidth + interfaceWidth) + "px";
-				$wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px";
-				
-				if (settings.reposition) {
-					setTimeout(function () {  // small delay before binding onresize due to an IE8 bug.
-						$window.bind('resize.' + prefix, publicMethod.position);
-					}, 1);
-				}
-
-				if (loadedCallback) {
-					loadedCallback();
-				}
-			},
-			step: function () {
-				modalDimensions(this);
-			}
-		});
-	};
-
-	publicMethod.resize = function (options) {
-		if (open) {
-			options = options || {};
-			
-			if (options.width) {
-				settings.w = setSize(options.width, 'x') - loadedWidth - interfaceWidth;
-			}
-			if (options.innerWidth) {
-				settings.w = setSize(options.innerWidth, 'x');
-			}
-			$loaded.css({width: settings.w});
-			
-			if (options.height) {
-				settings.h = setSize(options.height, 'y') - loadedHeight - interfaceHeight;
-			}
-			if (options.innerHeight) {
-				settings.h = setSize(options.innerHeight, 'y');
-			}
-			if (!options.innerHeight && !options.height) {
-				$loaded.css({height: "auto"});
-				settings.h = $loaded.height();
-			}
-			$loaded.css({height: settings.h});
-			
-			publicMethod.position(settings.transition === "none" ? 0 : settings.speed);
-		}
-	};
-
-	publicMethod.prep = function (object) {
-		if (!open) {
-			return;
-		}
-		
-		var callback, speed = settings.transition === "none" ? 0 : settings.speed;
-		
-		$loaded.remove();
-		$loaded = $tag(div, 'LoadedContent').append(object);
-		
-		function getWidth() {
-			settings.w = settings.w || $loaded.width();
-			settings.w = settings.mw && settings.mw < settings.w ? settings.mw : settings.w;
-			return settings.w;
-		}
-		function getHeight() {
-			settings.h = settings.h || $loaded.height();
-			settings.h = settings.mh && settings.mh < settings.h ? settings.mh : settings.h;
-			return settings.h;
-		}
-		
-		$loaded.hide()
-		.appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
-		.css({width: getWidth(), overflow: settings.scrolling ? 'auto' : 'hidden'})
-		.css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
-		.prependTo($content);
-		
-		$loadingBay.hide();
-		
-		// floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width.
-		//$(photo).css({'float': 'none', marginLeft: 'auto', marginRight: 'auto'});
-		
-		$(photo).css({'float': 'none'});
-		
-		// Hides SELECT elements in IE6 because they would otherwise sit on top of the overlay.
-		if (isIE6) {
-			$('select').not($box.find('select')).filter(function () {
-				return this.style.visibility !== 'hidden';
-			}).css({'visibility': 'hidden'}).one(event_cleanup, function () {
-				this.style.visibility = 'inherit';
-			});
-		}
-		
-		callback = function () {
-			var preload,
-				i,
-				total = $related.length,
-				iframe,
-				frameBorder = 'frameBorder',
-				allowTransparency = 'allowTransparency',
-				complete,
-				src,
-				img,
-				data;
-			
-			if (!open) {
-				return;
-			}
-			
-			function removeFilter() {
-				if (isIE) {
-					$box[0].style.removeAttribute('filter');
-				}
-			}
-			
-			complete = function () {
-				clearTimeout(loadingTimer);
-				// Detaching forces Andriod stock browser to redraw the area underneat the loading overlay.  Hiding alone isn't enough.
-				$loadingOverlay.detach().hide();
-				trigger(event_complete, settings.onComplete);
-			};
-			
-			if (isIE) {
-				//This fadeIn helps the bicubic resampling to kick-in.
-				if (photo) {
-					$loaded.fadeIn(100);
-				}
-			}
-			
-			$title.html(settings.title).add($loaded).show();
-			
-			if (total > 1) { // handle grouping
-				if (typeof settings.current === "string") {
-					$current.html(settings.current.replace('{current}', index + 1).replace('{total}', total)).show();
-				}
-				
-				$next[(settings.loop || index < total - 1) ? "show" : "hide"]().html(settings.next);
-				$prev[(settings.loop || index) ? "show" : "hide"]().html(settings.previous);
-				
-				if (settings.slideshow) {
-					$slideshow.show();
-				}
-				
-				// Preloads images within a rel group
-				if (settings.preloading) {
-					preload = [
-						getIndex(-1),
-						getIndex(1)
-					];
-					while (i = $related[preload.pop()]) {
-						data = $.data(i, colorbox);
-						
-						if (data && data.href) {
-							src = data.href;
-							if ($.isFunction(src)) {
-								src = src.call(i);
-							}
-						} else {
-							src = i.href;
-						}
-
-						if (isImage(src)) {
-							img = new Image();
-							img.src = src;
-						}
-					}
-				}
-			} else {
-				$groupControls.hide();
-			}
-			
-			if (settings.iframe) {
-				iframe = $tag('iframe')[0];
-				
-				if (frameBorder in iframe) {
-					iframe[frameBorder] = 0;
-				}
-				
-				if (allowTransparency in iframe) {
-					iframe[allowTransparency] = "true";
-				}
-
-				if (!settings.scrolling) {
-					iframe.scrolling = "no";
-				}
-				
-				$(iframe)
-					.attr({
-						src: settings.href,
-						name: (new Date()).getTime(), // give the iframe a unique name to prevent caching
-						'class': prefix + 'Iframe',
-						allowFullScreen : true, // allow HTML5 video to go fullscreen
-						webkitAllowFullScreen : true,
-						mozallowfullscreen : true
-					})
-					.one('load', complete)
-					.one(event_purge, function () {
-						iframe.src = "//about:blank";
-					})
-					.appendTo($loaded);
-				
-				if (settings.fastIframe) {
-					$(iframe).trigger('load');
-				}
-			} else {
-				complete();
-			}
-			
-			if (settings.transition === 'fade') {
-				$box.fadeTo(speed, 1, removeFilter);
-			} else {
-				removeFilter();
-			}
-		};
-		
-		if (settings.transition === 'fade') {
-			$box.fadeTo(speed, 0, function () {
-				publicMethod.position(0, callback);
-			});
-		} else {
-			publicMethod.position(speed, callback);
-		}
-	};
-
-	publicMethod.load = function (launched) {
-		var href, setResize, prep = publicMethod.prep;
-		
-		active = true;
-		
-		photo = false;
-		
-		element = $related[index];
-		
-		if (!launched) {
-			makeSettings();
-		}
-		
-		trigger(event_purge);
-		
-		trigger(event_load, settings.onLoad);
-		
-		settings.h = settings.height ?
-				setSize(settings.height, 'y') - loadedHeight - interfaceHeight :
-				settings.innerHeight && setSize(settings.innerHeight, 'y');
-		
-		settings.w = settings.width ?
-				setSize(settings.width, 'x') - loadedWidth - interfaceWidth :
-				settings.innerWidth && setSize(settings.innerWidth, 'x');
-		
-		// Sets the minimum dimensions for use in image scaling
-		settings.mw = settings.w;
-		settings.mh = settings.h;
-		
-		// Re-evaluate the minimum width and height based on maxWidth and maxHeight values.
-		// If the width or height exceed the maxWidth or maxHeight, use the maximum values instead.
-		if (settings.maxWidth) {
-			settings.mw = setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth;
-			settings.mw = settings.w && settings.w < settings.mw ? settings.w : settings.mw;
-		}
-		if (settings.maxHeight) {
-			settings.mh = setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight;
-			settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh;
-		}
-		
-		href = settings.href;
-		
-		loadingTimer = setTimeout(function () {
-			$loadingOverlay.show().appendTo($content);
-		}, 100);
-		
-		if (settings.inline) {
-			// Inserts an empty placeholder where inline content is being pulled from.
-			// An event is bound to put inline content back when ColorBox closes or loads new content.
-			$tag(div).hide().insertBefore($(href)[0]).one(event_purge, function () {
-				$(this).replaceWith($loaded.children());
-			});
-			prep($(href));
-		} else if (settings.iframe) {
-			// IFrame element won't be added to the DOM until it is ready to be displayed,
-			// to avoid problems with DOM-ready JS that might be trying to run in that iframe.
-			prep(" ");
-		} else if (settings.html) {
-			prep(settings.html);
-		} else if (isImage(href)) {
-			$(photo = new Image())
-			.addClass(prefix + 'Photo')
-			.error(function () {
-				settings.title = false;
-				prep($tag(div, 'Error').html(settings.imgError));
-			})
-			.load(function () {
-				var percent;
-				photo.onload = null; //stops animated gifs from firing the onload repeatedly.
-				
-				if (settings.scalePhotos) {
-					setResize = function () {
-						photo.height -= photo.height * percent;
-						photo.width -= photo.width * percent;
-					};
-					if (settings.mw && photo.width > settings.mw) {
-						percent = (photo.width - settings.mw) / photo.width;
-						setResize();
-					}
-					if (settings.mh && photo.height > settings.mh) {
-						percent = (photo.height - settings.mh) / photo.height;
-						setResize();
-					}
-				}
-				
-				if (settings.h) {
-					photo.style.marginTop = Math.max(settings.h - photo.height, 0) / 2 + 'px';
-				}
-				
-				if ($related[1] && (settings.loop || $related[index + 1])) {
-					photo.style.cursor = 'pointer';
-					photo.onclick = function () {
-						publicMethod.next();
-					};
-				}
-				
-				if (isIE) {
-					photo.style.msInterpolationMode = 'bicubic';
-				}
-				
-				setTimeout(function () { // A pause because Chrome will sometimes report a 0 by 0 size otherwise.
-					prep(photo);
-				}, 1);
-			});
-			
-			setTimeout(function () { // A pause because Opera 10.6+ will sometimes not run the onload function otherwise.
-				photo.src = href;
-			}, 1);
-		} else if (href) {
-			$loadingBay.load(href, settings.data, function (data, status, xhr) {
-				prep(status === 'error' ? $tag(div, 'Error').html(settings.xhrError) : $(this).contents());
-			});
-		}
-	};
-		
-	// Navigates to the next page/image in a set.
-	publicMethod.next = function () {
-		if (!active && $related[1] && (settings.loop || $related[index + 1])) {
-			index = getIndex(1);
-			publicMethod.load();
-		}
-	};
-	
-	publicMethod.prev = function () {
-		if (!active && $related[1] && (settings.loop || index)) {
-			index = getIndex(-1);
-			publicMethod.load();
-		}
-	};
-
-	// Note: to use this within an iframe use the following format: parent.$.fn.colorbox.close();
-	publicMethod.close = function () {
-		if (open && !closing) {
-			
-			closing = true;
-			
-			open = false;
-			
-			trigger(event_cleanup, settings.onCleanup);
-			
-			$window.unbind('.' + prefix + ' .' + event_ie6);
-			
-			$overlay.fadeTo(200, 0);
-			
-			$box.stop().fadeTo(300, 0, function () {
-			
-				$box.add($overlay).css({'opacity': 1, cursor: 'auto'}).hide();
-				
-				trigger(event_purge);
-				
-				$loaded.remove();
-				
-				setTimeout(function () {
-					closing = false;
-					trigger(event_closed, settings.onClosed);
-				}, 1);
-			});
-		}
-	};
-
-	// Removes changes ColorBox made to the document, but does not remove the plugin
-	// from jQuery.
-	publicMethod.remove = function () {
-		$([]).add($box).add($overlay).remove();
-		$box = null;
-		$('.' + boxElement)
-			.removeData(colorbox)
-			.removeClass(boxElement)
-			.die();
-	};
-
-	// A method for fetching the current element ColorBox is referencing.
-	// returns a jQuery object.
-	publicMethod.element = function () {
-		return $(element);
-	};
-
-	publicMethod.settings = defaults;
-
-}(jQuery, document, window));
-/*
- * File:        jquery.dataTables.min.js
- * Version:     1.7.0
- * Author:      Allan Jardine (www.sprymedia.co.uk)
- * Info:        www.datatables.net
- * 
- * Copyright 2008-2010 Allan Jardine, all rights reserved.
- *
- * This source file is free software, under either the GPL v2 license or a
- * BSD style license, as supplied with this software.
- * 
- * This source file is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
- * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
- */
-
-(function(j,Y,p){j.fn.dataTableSettings=[];var E=j.fn.dataTableSettings;j.fn.dataTableExt={};var m=j.fn.dataTableExt;m.sVersion="1.7.0";m.sErrMode="alert";m.iApiIndex=0;m.oApi={};m.afnFiltering=[];m.aoFeatures=[];m.ofnSearch={};m.afnSortData=[];m.oStdClasses={sPagePrevEnabled:"paginate_enabled_previous",sPagePrevDisabled:"paginate_disabled_previous",sPageNextEnabled:"paginate_enabled_next",sPageNextDisabled:"paginate_disabled_next",sPageJUINext:"",sPageJUIPrev:"",sPageButton:"paginate_button",sPageButtonActive:"paginate_active",
-sPageButtonStaticDisabled:"paginate_button",sPageFirst:"first",sPagePrevious:"previous",sPageNext:"next",sPageLast:"last",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",
-sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:""};m.oJUIClasses={sPagePrevEnabled:"fg-button ui-state-default ui-corner-left",sPagePrevDisabled:"fg-button ui-state-default ui-corner-left ui-state-disabled",
-sPageNextEnabled:"fg-button ui-state-default ui-corner-right",sPageNextDisabled:"fg-button ui-state-default ui-corner-right ui-state-disabled",sPageJUINext:"ui-icon ui-icon-circle-arrow-e",sPageJUIPrev:"ui-icon ui-icon-circle-arrow-w",sPageButton:"fg-button ui-state-default",sPageButtonActive:"fg-button ui-state-default ui-state-disabled",sPageButtonStaticDisabled:"fg-button ui-state-default ui-state-disabled",sPageFirst:"first ui-corner-tl ui-corner-bl",sPagePrevious:"previous",sPageNext:"next",
-sPageLast:"last ui-corner-tr ui-corner-br",sStripOdd:"odd",sStripEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate fg-buttonset fg-buttonset-multi paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"ui-state-default",sSortDesc:"ui-state-default",sSortable:"ui-state-default",sSortableAsc:"ui-state-default",sSortableDesc:"ui-state-default",sSortableNone:"ui-state-default",
-sSortColumn:"sorting_",sSortJUIAsc:"css_right ui-icon ui-icon-triangle-1-n",sSortJUIDesc:"css_right ui-icon ui-icon-triangle-1-s",sSortJUI:"css_right ui-icon ui-icon-carat-2-n-s",sSortJUIAscAllowed:"css_right ui-icon ui-icon-carat-1-n",sSortJUIDescAllowed:"css_right ui-icon ui-icon-carat-1-s",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead ui-state-default",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot ui-state-default",
-sScrollFootInner:"dataTables_scrollFootInner",sFooterTH:"ui-state-default"};m.oPagination={two_button:{fnInit:function(g,l,q){var r,u,y;if(g.bJUI){r=p.createElement("a");u=p.createElement("a");y=p.createElement("span");y.className=g.oClasses.sPageJUINext;u.appendChild(y);y=p.createElement("span");y.className=g.oClasses.sPageJUIPrev;r.appendChild(y)}else{r=p.createElement("div");u=p.createElement("div")}r.className=g.oClasses.sPagePrevDisabled;u.className=g.oClasses.sPageNextDisabled;r.title=g.oLanguage.oPaginate.sPrevious;
-u.title=g.oLanguage.oPaginate.sNext;l.appendChild(r);l.appendChild(u);j(r).click(function(){g.oApi._fnPageChange(g,"previous")&&q(g)});j(u).click(function(){g.oApi._fnPageChange(g,"next")&&q(g)});j(r).bind("selectstart",function(){return false});j(u).bind("selectstart",function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");r.setAttribute("id",g.sTableId+"_previous");u.setAttribute("id",g.sTableId+"_next")}},fnUpdate:function(g){if(g.aanFeatures.p)for(var l=
-g.aanFeatures.p,q=0,r=l.length;q<r;q++)if(l[q].childNodes.length!==0){l[q].childNodes[0].className=g._iDisplayStart===0?g.oClasses.sPagePrevDisabled:g.oClasses.sPagePrevEnabled;l[q].childNodes[1].className=g.fnDisplayEnd()==g.fnRecordsDisplay()?g.oClasses.sPageNextDisabled:g.oClasses.sPageNextEnabled}}},iFullNumbersShowPages:5,full_numbers:{fnInit:function(g,l,q){var r=p.createElement("span"),u=p.createElement("span"),y=p.createElement("span"),C=p.createElement("span"),w=p.createElement("span");r.innerHTML=
-g.oLanguage.oPaginate.sFirst;u.innerHTML=g.oLanguage.oPaginate.sPrevious;C.innerHTML=g.oLanguage.oPaginate.sNext;w.innerHTML=g.oLanguage.oPaginate.sLast;var x=g.oClasses;r.className=x.sPageButton+" "+x.sPageFirst;u.className=x.sPageButton+" "+x.sPagePrevious;C.className=x.sPageButton+" "+x.sPageNext;w.className=x.sPageButton+" "+x.sPageLast;l.appendChild(r);l.appendChild(u);l.appendChild(y);l.appendChild(C);l.appendChild(w);j(r).click(function(){g.oApi._fnPageChange(g,"first")&&q(g)});j(u).click(function(){g.oApi._fnPageChange(g,
-"previous")&&q(g)});j(C).click(function(){g.oApi._fnPageChange(g,"next")&&q(g)});j(w).click(function(){g.oApi._fnPageChange(g,"last")&&q(g)});j("span",l).bind("mousedown",function(){return false}).bind("selectstart",function(){return false});if(g.sTableId!==""&&typeof g.aanFeatures.p=="undefined"){l.setAttribute("id",g.sTableId+"_paginate");r.setAttribute("id",g.sTableId+"_first");u.setAttribute("id",g.sTableId+"_previous");C.setAttribute("id",g.sTableId+"_next");w.setAttribute("id",g.sTableId+"_last")}},
-fnUpdate:function(g,l){if(g.aanFeatures.p){var q=m.oPagination.iFullNumbersShowPages,r=Math.floor(q/2),u=Math.ceil(g.fnRecordsDisplay()/g._iDisplayLength),y=Math.ceil(g._iDisplayStart/g._iDisplayLength)+1,C="",w,x=g.oClasses;if(u<q){r=1;w=u}else if(y<=r){r=1;w=q}else if(y>=u-r){r=u-q+1;w=u}else{r=y-Math.ceil(q/2)+1;w=r+q-1}for(q=r;q<=w;q++)C+=y!=q?'<span class="'+x.sPageButton+'">'+q+"</span>":'<span class="'+x.sPageButtonActive+'">'+q+"</span>";w=g.aanFeatures.p;var z,D=function(){g._iDisplayStart=
-(this.innerHTML*1-1)*g._iDisplayLength;l(g);return false},L=function(){return false};q=0;for(r=w.length;q<r;q++)if(w[q].childNodes.length!==0){z=w[q].childNodes[2];z.innerHTML=C;j("span",z).click(D).bind("mousedown",L).bind("selectstart",L);z=w[q].getElementsByTagName("span");z=[z[0],z[1],z[z.length-2],z[z.length-1]];j(z).removeClass(x.sPageButton+" "+x.sPageButtonActive+" "+x.sPageButtonStaticDisabled);if(y==1){z[0].className+=" "+x.sPageButtonStaticDisabled;z[1].className+=" "+x.sPageButtonStaticDisabled}else{z[0].className+=
-" "+x.sPageButton;z[1].className+=" "+x.sPageButton}if(u===0||y==u||g._iDisplayLength==-1){z[2].className+=" "+x.sPageButtonStaticDisabled;z[3].className+=" "+x.sPageButtonStaticDisabled}else{z[2].className+=" "+x.sPageButton;z[3].className+=" "+x.sPageButton}}}}}};m.oSort={"string-asc":function(g,l){g=g.toLowerCase();l=l.toLowerCase();return g<l?-1:g>l?1:0},"string-desc":function(g,l){g=g.toLowerCase();l=l.toLowerCase();return g<l?1:g>l?-1:0},"html-asc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();
-l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?-1:g>l?1:0},"html-desc":function(g,l){g=g.replace(/<.*?>/g,"").toLowerCase();l=l.replace(/<.*?>/g,"").toLowerCase();return g<l?1:g>l?-1:0},"date-asc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l==="")l=Date.parse("01/01/1970 00:00:00");return g-l},"date-desc":function(g,l){g=Date.parse(g);l=Date.parse(l);if(isNaN(g)||g==="")g=Date.parse("01/01/1970 00:00:00");if(isNaN(l)||l===
-"")l=Date.parse("01/01/1970 00:00:00");return l-g},"numeric-asc":function(g,l){return(g=="-"||g===""?0:g*1)-(l=="-"||l===""?0:l*1)},"numeric-desc":function(g,l){return(l=="-"||l===""?0:l*1)-(g=="-"||g===""?0:g*1)}};m.aTypes=[function(g){if(g.length===0)return"numeric";var l,q=false;l=g.charAt(0);if("0123456789-".indexOf(l)==-1)return null;for(var r=1;r<g.length;r++){l=g.charAt(r);if("0123456789.".indexOf(l)==-1)return null;if(l=="."){if(q)return null;q=true}}return"numeric"},function(g){var l=Date.parse(g);
-if(l!==null&&!isNaN(l)||g.length===0)return"date";return null},function(g){if(g.indexOf("<")!=-1&&g.indexOf(">")!=-1)return"html";return null}];m.fnVersionCheck=function(g){var l=function(w,x){for(;w.length<x;)w+="0";return w},q=m.sVersion.split(".");g=g.split(".");for(var r="",u="",y=0,C=g.length;y<C;y++){r+=l(q[y],3);u+=l(g[y],3)}return parseInt(r,10)>=parseInt(u,10)};m._oExternConfig={iNextUnique:0};j.fn.dataTable=function(g){function l(){this.fnRecordsTotal=function(){return this.oFeatures.bServerSide?
-this._iRecordsTotal:this.aiDisplayMaster.length};this.fnRecordsDisplay=function(){return this.oFeatures.bServerSide?this._iRecordsDisplay:this.aiDisplay.length};this.fnDisplayEnd=function(){return this.oFeatures.bServerSide?this.oFeatures.bPaginate===false?this._iDisplayStart+this.aiDisplay.length:Math.min(this._iDisplayStart+this._iDisplayLength,this._iDisplayStart+this.aiDisplay.length):this._iDisplayEnd};this.sInstance=this.oInstance=null;this.oFeatures={bPaginate:true,bLengthChange:true,bFilter:true,
-bSort:true,bInfo:true,bAutoWidth:true,bProcessing:false,bSortClasses:true,bStateSave:false,bServerSide:false};this.oScroll={sX:"",sXInner:"",sY:"",bCollapse:false,iBarWidth:0};this.aanFeatures=[];this.oLanguage={sProcessing:"Processing...",sLengthMenu:"Show _MENU_ entries",sZeroRecords:"No matching records found",sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",
-sInfoPostFix:"",sSearch:"Search:",sUrl:"",oPaginate:{sFirst:"First",sPrevious:"Previous",sNext:"Next",sLast:"Last"}};this.aoData=[];this.aiDisplay=[];this.aiDisplayMaster=[];this.aoColumns=[];this.iNextId=0;this.asDataSearch=[];this.oPreviousSearch={sSearch:"",bRegex:false,bSmart:true};this.aoPreSearchCols=[];this.aaSorting=[[0,"asc",0]];this.aaSortingFixed=null;this.asStripClasses=[];this.asDestoryStrips=[];this.fnFooterCallback=this.fnHeaderCallback=this.fnRowCallback=null;this.aoDrawCallback=[];
-this.fnInitComplete=null;this.sTableId="";this.nTableWrapper=this.nTBody=this.nTFoot=this.nTHead=this.nTable=null;this.iDefaultSortIndex=0;this.bInitialised=false;this.aoOpenRows=[];this.sDom="lfrtip";this.sPaginationType="two_button";this.iCookieDuration=7200;this.sCookiePrefix="SpryMedia_DataTables_";this.sAjaxSource=null;this.bAjaxDataGet=true;this.fnServerData=function(a,b,c){j.ajax({url:a,data:b,success:c,dataType:"json",cache:false,error:function(){alert("DataTables warning: JSON data from server failed to load or be parsed. This is most likely to be caused by a JSON formatting error.")}})};
-this.fnFormatNumber=function(a){if(a<1E3)return a;else{var b=a+"";a=b.split("");var c="";b=b.length;for(var d=0;d<b;d++){if(d%3===0&&d!==0)c=","+c;c=a[b-d-1]+c}}return c};this.aLengthMenu=[10,25,50,100];this.iDraw=0;this.iDrawError=-1;this._iDisplayLength=10;this._iDisplayStart=0;this._iDisplayEnd=10;this._iRecordsDisplay=this._iRecordsTotal=0;this.bJUI=false;this.oClasses=m.oStdClasses;this.bSorted=this.bFiltered=false;this.oInit=null}function q(a){return function(){var b=[B(this[m.iApiIndex])].concat(Array.prototype.slice.call(arguments));
-return m.oApi[a].apply(this,b)}}function r(a){if(a.bInitialised===false)setTimeout(function(){r(a)},200);else{na(a);z(a);if(a.oFeatures.bSort)O(a);else{a.aiDisplay=a.aiDisplayMaster.slice();F(a);D(a)}if(a.sAjaxSource!==null&&!a.oFeatures.bServerSide){K(a,true);a.fnServerData.call(a.oInstance,a.sAjaxSource,null,function(b){for(var c=0;c<b.aaData.length;c++)w(a,b.aaData[c]);a.iInitDisplayStart=a._iDisplayStart;if(a.oFeatures.bSort)O(a);else{a.aiDisplay=a.aiDisplayMaster.slice();F(a);D(a)}K(a,false);
-typeof a.fnInitComplete=="function"&&a.fnInitComplete.call(a.oInstance,a,b)})}else{typeof a.fnInitComplete=="function"&&a.fnInitComplete.call(a.oInstance,a);a.oFeatures.bServerSide||K(a,false)}}}function u(a,b,c){n(a.oLanguage,b,"sProcessing");n(a.oLanguage,b,"sLengthMenu");n(a.oLanguage,b,"sEmptyTable");n(a.oLanguage,b,"sZeroRecords");n(a.oLanguage,b,"sInfo");n(a.oLanguage,b,"sInfoEmpty");n(a.oLanguage,b,"sInfoFiltered");n(a.oLanguage,b,"sInfoPostFix");n(a.oLanguage,b,"sSearch");if(typeof b.oPaginate!=
-"undefined"){n(a.oLanguage.oPaginate,b.oPaginate,"sFirst");n(a.oLanguage.oPaginate,b.oPaginate,"sPrevious");n(a.oLanguage.oPaginate,b.oPaginate,"sNext");n(a.oLanguage.oPaginate,b.oPaginate,"sLast")}typeof b.sEmptyTable=="undefined"&&typeof b.sZeroRecords!="undefined"&&n(a.oLanguage,b,"sZeroRecords","sEmptyTable");c&&r(a)}function y(a,b){a.aoColumns[a.aoColumns.length++]={sType:null,_bAutoType:true,bVisible:true,bSearchable:true,bSortable:true,asSorting:["asc","desc"],sSortingClass:a.oClasses.sSortable,
-sSortingClassJUI:a.oClasses.sSortJUI,sTitle:b?b.innerHTML:"",sName:"",sWidth:null,sWidthOrig:null,sClass:null,fnRender:null,bUseRendered:true,iDataSort:a.aoColumns.length-1,sSortDataType:"std",nTh:b?b:p.createElement("th"),nTf:null};b=a.aoColumns.length-1;if(typeof a.aoPreSearchCols[b]=="undefined"||a.aoPreSearchCols[b]===null)a.aoPreSearchCols[b]={sSearch:"",bRegex:false,bSmart:true};else{if(typeof a.aoPreSearchCols[b].bRegex=="undefined")a.aoPreSearchCols[b].bRegex=true;if(typeof a.aoPreSearchCols[b].bSmart==
-"undefined")a.aoPreSearchCols[b].bSmart=true}C(a,b,null)}function C(a,b,c){b=a.aoColumns[b];if(typeof c!="undefined"&&c!==null){if(typeof c.sType!="undefined"){b.sType=c.sType;b._bAutoType=false}n(b,c,"bVisible");n(b,c,"bSearchable");n(b,c,"bSortable");n(b,c,"sTitle");n(b,c,"sName");n(b,c,"sWidth");n(b,c,"sWidth","sWidthOrig");n(b,c,"sClass");n(b,c,"fnRender");n(b,c,"bUseRendered");n(b,c,"iDataSort");n(b,c,"asSorting");n(b,c,"sSortDataType")}if(!a.oFeatures.bSort)b.bSortable=false;if(!b.bSortable||
-j.inArray("asc",b.asSorting)==-1&&j.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableNone;b.sSortingClassJUI=""}else if(j.inArray("asc",b.asSorting)!=-1&&j.inArray("desc",b.asSorting)==-1){b.sSortingClass=a.oClasses.sSortableAsc;b.sSortingClassJUI=a.oClasses.sSortJUIAscAllowed}else if(j.inArray("asc",b.asSorting)==-1&&j.inArray("desc",b.asSorting)!=-1){b.sSortingClass=a.oClasses.sSortableDesc;b.sSortingClassJUI=a.oClasses.sSortJUIDescAllowed}}function w(a,b){if(b.length!=a.aoColumns.length&&
-a.iDrawError!=a.iDraw){J(a,0,"Added data does not match known number of columns");a.iDrawError=a.iDraw;return-1}b=b.slice();var c=a.aoData.length;a.aoData.push({nTr:p.createElement("tr"),_iId:a.iNextId++,_aData:b,_anHidden:[],_sRowStripe:""});for(var d,f,e=0;e<b.length;e++){d=p.createElement("td");if(b[e]===null)b[e]="";if(typeof b[e]!="string")b[e]+="";b[e]=j.trim(b[e]);if(typeof a.aoColumns[e].fnRender=="function"){f=a.aoColumns[e].fnRender({iDataRow:c,iDataColumn:e,aData:b,oSettings:a});d.innerHTML=
-f;if(a.aoColumns[e].bUseRendered)a.aoData[c]._aData[e]=f}else d.innerHTML=b[e];if(a.aoColumns[e].sClass!==null)d.className=a.aoColumns[e].sClass;if(a.aoColumns[e]._bAutoType&&a.aoColumns[e].sType!="string"){f=Z(a.aoData[c]._aData[e]);if(a.aoColumns[e].sType===null)a.aoColumns[e].sType=f;else if(a.aoColumns[e].sType!=f)a.aoColumns[e].sType="string"}if(a.aoColumns[e].bVisible)a.aoData[c].nTr.appendChild(d);else a.aoData[c]._anHidden[e]=d}a.aiDisplayMaster.push(c);return c}function x(a){var b,c,d,f,
-e,i,h,k;if(a.sAjaxSource===null){h=a.nTBody.childNodes;b=0;for(c=h.length;b<c;b++)if(h[b].nodeName.toUpperCase()=="TR"){i=a.aoData.length;a.aoData.push({nTr:h[b],_iId:a.iNextId++,_aData:[],_anHidden:[],_sRowStripe:""});a.aiDisplayMaster.push(i);k=a.aoData[i]._aData;i=h[b].childNodes;d=e=0;for(f=i.length;d<f;d++)if(i[d].nodeName.toUpperCase()=="TD"){k[e]=j.trim(i[d].innerHTML);e++}}}h=S(a);i=[];b=0;for(c=h.length;b<c;b++){d=0;for(f=h[b].childNodes.length;d<f;d++){e=h[b].childNodes[d];e.nodeName.toUpperCase()==
-"TD"&&i.push(e)}}i.length!=h.length*a.aoColumns.length&&J(a,1,"Unexpected number of TD elements. Expected "+h.length*a.aoColumns.length+" and got "+i.length+". DataTables does not support rowspan / colspan in the table body, and there must be one cell for each row/column combination.");h=0;for(d=a.aoColumns.length;h<d;h++){if(a.aoColumns[h].sTitle===null)a.aoColumns[h].sTitle=a.aoColumns[h].nTh.innerHTML;f=a.aoColumns[h]._bAutoType;e=typeof a.aoColumns[h].fnRender=="function";k=a.aoColumns[h].sClass!==
-null;var o=a.aoColumns[h].bVisible,t,s;if(f||e||k||!o){b=0;for(c=a.aoData.length;b<c;b++){t=i[b*d+h];if(f)if(a.aoColumns[h].sType!="string"){s=Z(a.aoData[b]._aData[h]);if(a.aoColumns[h].sType===null)a.aoColumns[h].sType=s;else if(a.aoColumns[h].sType!=s)a.aoColumns[h].sType="string"}if(e){s=a.aoColumns[h].fnRender({iDataRow:b,iDataColumn:h,aData:a.aoData[b]._aData,oSettings:a});t.innerHTML=s;if(a.aoColumns[h].bUseRendered)a.aoData[b]._aData[h]=s}if(k)t.className+=" "+a.aoColumns[h].sClass;if(!o){a.aoData[b]._anHidden[h]=
-t;t.parentNode.removeChild(t)}}}}}function z(a){var b,c,d,f=0;if(a.nTHead.getElementsByTagName("th").length!==0){b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;if(a.aoColumns[b].bVisible){if(a.aoColumns[b].sWidth!==null)c.style.width=a.aoColumns[b].sWidth;if(a.aoColumns[b].sTitle!=c.innerHTML)c.innerHTML=a.aoColumns[b].sTitle}else{c.parentNode.removeChild(c);f++}}}else{f=p.createElement("tr");b=0;for(d=a.aoColumns.length;b<d;b++){c=a.aoColumns[b].nTh;c.innerHTML=a.aoColumns[b].sTitle;
-if(a.aoColumns[b].bVisible){if(a.aoColumns[b].sClass!==null)c.className=a.aoColumns[b].sClass;if(a.aoColumns[b].sWidth!==null)c.style.width=a.aoColumns[b].sWidth;f.appendChild(c)}}j(a.nTHead).html("")[0].appendChild(f)}if(a.bJUI){b=0;for(d=a.aoColumns.length;b<d;b++)a.aoColumns[b].nTh.insertBefore(p.createElement("span"),a.aoColumns[b].nTh.firstChild)}if(a.oFeatures.bSort){for(b=0;b<a.aoColumns.length;b++)a.aoColumns[b].bSortable!==false?$(a,a.aoColumns[b].nTh,b):j(a.aoColumns[b].nTh).addClass(a.oClasses.sSortableNone);
-j("th",a.nTHead).mousedown(function(){this.onselectstart=function(){return false};return false})}if(a.nTFoot!==null){f=0;c=a.nTFoot.getElementsByTagName("th");b=0;for(d=c.length;b<d;b++)if(typeof a.aoColumns[b]!="undefined"){a.aoColumns[b].nTf=c[b-f];if(a.oClasses.sFooterTH!=="")a.aoColumns[b].nTf.className+=" "+a.oClasses.sFooterTH;if(!a.aoColumns[b].bVisible){c[b-f].parentNode.removeChild(c[b-f]);f++}}}}function D(a){var b,c,d=[],f=0,e=false;b=a.asStripClasses.length;c=a.aoOpenRows.length;if(typeof a.iInitDisplayStart!=
-"undefined"&&a.iInitDisplayStart!=-1){a._iDisplayStart=a.oFeatures.bServerSide?a.iInitDisplayStart:a.iInitDisplayStart>=a.fnRecordsDisplay()?0:a.iInitDisplayStart;a.iInitDisplayStart=-1;F(a)}if(!(a.oFeatures.bServerSide&&!oa(a))){if(a.aiDisplay.length!==0){var i=a._iDisplayStart,h=a._iDisplayEnd;if(a.oFeatures.bServerSide){i=0;h=a.aoData.length}for(i=i;i<h;i++){var k=a.aoData[a.aiDisplay[i]],o=k.nTr;if(b!==0){var t=a.asStripClasses[f%b];if(k._sRowStripe!=t){j(o).removeClass(k._sRowStripe).addClass(t);
-k._sRowStripe=t}}if(typeof a.fnRowCallback=="function"){o=a.fnRowCallback.call(a.oInstance,o,a.aoData[a.aiDisplay[i]]._aData,f,i);if(!o&&!e){J(a,0,"A node was not returned by fnRowCallback");e=true}}d.push(o);f++;if(c!==0)for(k=0;k<c;k++)o==a.aoOpenRows[k].nParent&&d.push(a.aoOpenRows[k].nTr)}}else{d[0]=p.createElement("tr");if(typeof a.asStripClasses[0]!="undefined")d[0].className=a.asStripClasses[0];e=p.createElement("td");e.setAttribute("valign","top");e.colSpan=T(a);e.className=a.oClasses.sRowEmpty;
-e.innerHTML=typeof a.oLanguage.sEmptyTable!="undefined"&&a.fnRecordsTotal()===0?a.oLanguage.sEmptyTable:a.oLanguage.sZeroRecords.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()));d[f].appendChild(e)}typeof a.fnHeaderCallback=="function"&&a.fnHeaderCallback.call(a.oInstance,j(">tr",a.nTHead)[0],V(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);typeof a.fnFooterCallback=="function"&&a.fnFooterCallback.call(a.oInstance,j(">tr",a.nTFoot)[0],V(a),a._iDisplayStart,a.fnDisplayEnd(),a.aiDisplay);f=
-p.createDocumentFragment();b=p.createDocumentFragment();if(a.nTBody){e=a.nTBody.parentNode;b.appendChild(a.nTBody);c=a.nTBody.childNodes;for(b=c.length-1;b>=0;b--)c[b].parentNode.removeChild(c[b]);b=0;for(c=d.length;b<c;b++)f.appendChild(d[b]);a.nTBody.appendChild(f);e!==null&&e.appendChild(a.nTBody)}if(typeof a._bInitComplete=="undefined"){a._bInitComplete=true;a.nTableWrapper!=a.nTable.parentNode&&j(a.nTableWrapper).width()>j(a.nTable.parentNode).width()&&U(a)}b=0;for(c=a.aoDrawCallback.length;b<
-c;b++)a.aoDrawCallback[b].fn.call(a.oInstance,a);a.bSorted=false;a.bFiltered=false}}function L(a){if(a.oFeatures.bSort)O(a,a.oPreviousSearch);else if(a.oFeatures.bFilter)P(a,a.oPreviousSearch);else{F(a);D(a)}}function oa(a){if(a.bAjaxDataGet){K(a,true);var b=a.aoColumns.length,c=[],d;a.iDraw++;c.push({name:"sEcho",value:a.iDraw});c.push({name:"iColumns",value:b});c.push({name:"sColumns",value:aa(a)});c.push({name:"iDisplayStart",value:a._iDisplayStart});c.push({name:"iDisplayLength",value:a.oFeatures.bPaginate!==
-false?a._iDisplayLength:-1});if(a.oFeatures.bFilter!==false){c.push({name:"sSearch",value:a.oPreviousSearch.sSearch});c.push({name:"bRegex",value:a.oPreviousSearch.bRegex});for(d=0;d<b;d++){c.push({name:"sSearch_"+d,value:a.aoPreSearchCols[d].sSearch});c.push({name:"bRegex_"+d,value:a.aoPreSearchCols[d].bRegex});c.push({name:"bSearchable_"+d,value:a.aoColumns[d].bSearchable})}}if(a.oFeatures.bSort!==false){var f=a.aaSortingFixed!==null?a.aaSortingFixed.length:0,e=a.aaSorting.length;c.push({name:"iSortingCols",
-value:f+e});for(d=0;d<f;d++){c.push({name:"iSortCol_"+d,value:a.aaSortingFixed[d][0]});c.push({name:"sSortDir_"+d,value:a.aaSortingFixed[d][1]})}for(d=0;d<e;d++){c.push({name:"iSortCol_"+(d+f),value:a.aaSorting[d][0]});c.push({name:"sSortDir_"+(d+f),value:a.aaSorting[d][1]})}for(d=0;d<b;d++)c.push({name:"bSortable_"+d,value:a.aoColumns[d].bSortable})}a.fnServerData.call(a.oInstance,a.sAjaxSource,c,function(i){pa(a,i)});return false}else return true}function pa(a,b){if(typeof b.sEcho!="undefined")if(b.sEcho*
-1<a.iDraw)return;else a.iDraw=b.sEcho*1;ba(a);a._iRecordsTotal=b.iTotalRecords;a._iRecordsDisplay=b.iTotalDisplayRecords;var c=aa(a);if(c=typeof b.sColumns!="undefined"&&c!==""&&b.sColumns!=c)var d=qa(a,b.sColumns);for(var f=0,e=b.aaData.length;f<e;f++)if(c){for(var i=[],h=0,k=a.aoColumns.length;h<k;h++)i.push(b.aaData[f][d[h]]);w(a,i)}else w(a,b.aaData[f]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=false;D(a);a.bAjaxDataGet=true;K(a,false)}function na(a){var b=p.createElement("div");a.nTable.parentNode.insertBefore(b,
-a.nTable);a.nTableWrapper=p.createElement("div");a.nTableWrapper.className=a.oClasses.sWrapper;a.sTableId!==""&&a.nTableWrapper.setAttribute("id",a.sTableId+"_wrapper");for(var c=a.nTableWrapper,d=a.sDom.split(""),f,e,i,h,k,o,t,s=0;s<d.length;s++){e=0;i=d[s];if(i=="<"){h=p.createElement("div");k=d[s+1];if(k=="'"||k=='"'){o="";for(t=2;d[s+t]!=k;){o+=d[s+t];t++}if(o=="H")o="fg-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";else if(o=="F")o="fg-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";
-h.className=o;s+=t}c.appendChild(h);c=h}else if(i==">")c=c.parentNode;else if(i=="l"&&a.oFeatures.bPaginate&&a.oFeatures.bLengthChange){f=ra(a);e=1}else if(i=="f"&&a.oFeatures.bFilter){f=sa(a);e=1}else if(i=="r"&&a.oFeatures.bProcessing){f=ta(a);e=1}else if(i=="t"){f=ua(a);e=1}else if(i=="i"&&a.oFeatures.bInfo){f=va(a);e=1}else if(i=="p"&&a.oFeatures.bPaginate){f=wa(a);e=1}else if(m.aoFeatures.length!==0){h=m.aoFeatures;k=0;for(o=h.length;k<o;k++)if(i==h[k].cFeature){if(f=h[k].fnInit(a))e=1;break}}if(e==
-1){if(typeof a.aanFeatures[i]!="object")a.aanFeatures[i]=[];a.aanFeatures[i].push(f);c.appendChild(f)}}b.parentNode.replaceChild(a.nTableWrapper,b)}function ua(a){if(a.oScroll.sX===""&&a.oScroll.sY==="")return a.nTable;var b=p.createElement("div"),c=p.createElement("div"),d=p.createElement("div"),f=p.createElement("div"),e=p.createElement("div"),i=p.createElement("div"),h=a.nTable.cloneNode(false),k=a.nTable.cloneNode(false),o=a.nTable.getElementsByTagName("thead")[0],t=a.nTable.getElementsByTagName("tfoot").length===
-0?null:a.nTable.getElementsByTagName("tfoot")[0],s=typeof g.bJQueryUI!="undefined"&&g.bJQueryUI?m.oJUIClasses:m.oStdClasses;c.appendChild(d);e.appendChild(i);f.appendChild(a.nTable);b.appendChild(c);b.appendChild(f);d.appendChild(h);h.appendChild(o);if(t!==null){b.appendChild(e);i.appendChild(k);k.appendChild(t)}b.className=s.sScrollWrapper;c.className=s.sScrollHead;d.className=s.sScrollHeadInner;f.className=s.sScrollBody;e.className=s.sScrollFoot;i.className=s.sScrollFootInner;c.style.overflow="hidden";
-e.style.overflow="hidden";f.style.overflow="auto";c.style.border="0";e.style.border="0";d.style.width="150%";h.removeAttribute("id");h.style.marginLeft="0";a.nTable.style.marginLeft="0";if(t!==null){k.removeAttribute("id");k.style.marginLeft="0"}d=j(">caption",a.nTable);i=0;for(k=d.length;i<k;i++)h.appendChild(d[i]);if(a.oScroll.sX!==""){c.style.width=v(a.oScroll.sX);f.style.width=v(a.oScroll.sX);if(t!==null)e.style.width=v(a.oScroll.sX);j(f).scroll(function(){c.scrollLeft=this.scrollLeft;if(t!==
-null)e.scrollLeft=this.scrollLeft})}if(a.oScroll.sY!=="")f.style.height=v(a.oScroll.sY);a.aoDrawCallback.push({fn:xa,sName:"scrolling"});a.nScrollHead=c;a.nScrollFoot=e;return b}function xa(a){var b=a.nScrollHead.getElementsByTagName("div")[0],c=b.getElementsByTagName("table")[0],d=a.nTable.parentNode,f,e,i,h,k,o,t,s,H=[];i=a.nTable.getElementsByTagName("thead");i.length>0&&a.nTable.removeChild(i[0]);if(a.nTFoot!==null){k=a.nTable.getElementsByTagName("tfoot");k.length>0&&a.nTable.removeChild(k[0])}i=
-a.nTHead.cloneNode(true);a.nTable.insertBefore(i,a.nTable.childNodes[0]);if(a.nTFoot!==null){k=a.nTFoot.cloneNode(true);a.nTable.insertBefore(k,a.nTable.childNodes[1])}var I=ca(i);f=0;for(e=I.length;f<e;f++){t=da(a,f);I[f].style.width=a.aoColumns[t].sWidth}a.nTFoot!==null&&M(function(A){A.style.width=""},k.getElementsByTagName("tr"));f=j(a.nTable).outerWidth();if(a.oScroll.sX===""){a.nTable.style.width="100%";if(j.browser.msie&&j.browser.version<=7)a.nTable.style.width=v(j(a.nTable).outerWidth()-
-a.oScroll.iBarWidth)}else if(a.oScroll.sXInner!=="")a.nTable.style.width=v(a.oScroll.sXInner);else if(f==j(d).width()&&j(d).height()<j(a.nTable).height()){a.nTable.style.width=v(f-a.oScroll.iBarWidth);if(j(a.nTable).outerWidth()>f-a.oScroll.iBarWidth)a.nTable.style.width=v(f)}else a.nTable.style.width=v(f);f=j(a.nTable).outerWidth();e=a.nTHead.getElementsByTagName("tr");i=i.getElementsByTagName("tr");M(function(A,G){o=A.style;o.paddingTop="0";o.paddingBottom="0";o.borderTopWidth="0";o.borderBottomWidth=
-"0";o.height=0;s=j(A).width();G.style.width=v(s);H.push(s)},i,e);if(a.nTFoot!==null){h=k.getElementsByTagName("tr");k=a.nTFoot.getElementsByTagName("tr");M(function(A,G){o=A.style;o.paddingTop="0";o.paddingBottom="0";o.borderTopWidth="0";o.borderBottomWidth="0";s=j(A).width();G.style.width=v(s);H.push(s)},h,k)}M(function(A){A.innerHTML="";A.style.width=v(H.shift())},i);a.nTFoot!==null&&M(function(A){A.innerHTML="";A.style.width=v(H.shift())},h);if(j(a.nTable).outerWidth()<f)if(a.oScroll.sX==="")J(a,
-1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you enable x-scrolling or increase the width the table has in which to be drawn");else a.oScroll.sXInner!==""&&J(a,1,"The table cannot fit into the current element which will cause column misalignment. It is suggested that you increase the sScrollXInner property to allow it to draw in a larger area, or simply remove that parameter to allow automatic calculation");if(a.oScroll.sY==="")if(j.browser.msie&&
-j.browser.version<=7)d.style.height=v(a.nTable.offsetHeight+a.oScroll.iBarWidth);if(a.oScroll.sY!==""&&a.oScroll.bCollapse){d.style.height=v(a.oScroll.sY);h=a.oScroll.sX!==""&&a.nTable.offsetWidth>d.offsetWidth?a.oScroll.iBarWidth:0;if(a.nTable.offsetHeight<d.offsetHeight)d.style.height=v(j(a.nTable).height()+h)}c.style.width=v(j(a.nTable).outerWidth());b.style.width=v(j(a.nTable).outerWidth()+a.oScroll.iBarWidth);if(a.nTFoot!==null){b=a.nScrollFoot.getElementsByTagName("div")[0];c=b.getElementsByTagName("table")[0];
-b.style.width=v(a.nTable.offsetWidth+a.oScroll.iBarWidth);c.style.width=v(a.nTable.offsetWidth)}}function U(a){if(a.oFeatures.bAutoWidth===false)return false;ea(a);for(var b=0,c=a.aoColumns.length;b<c;b++)a.aoColumns[b].nTh.style.width=a.aoColumns[b].sWidth}function sa(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.f=="undefined"&&b.setAttribute("id",a.sTableId+"_filter");b.className=a.oClasses.sFilter;b.innerHTML=a.oLanguage.sSearch+(a.oLanguage.sSearch===""?"":" ")+'<input type="text" />';
-var c=j("input",b);c.val(a.oPreviousSearch.sSearch.replace('"',"&quot;"));c.keyup(function(){for(var d=a.aanFeatures.f,f=0,e=d.length;f<e;f++)d[f]!=this.parentNode&&j("input",d[f]).val(this.value);P(a,{sSearch:this.value,bRegex:a.oPreviousSearch.bRegex,bSmart:a.oPreviousSearch.bSmart})});c.keypress(function(d){if(d.keyCode==13)return false});return b}function P(a,b,c){ya(a,b.sSearch,c,b.bRegex,b.bSmart);for(b=0;b<a.aoPreSearchCols.length;b++)za(a,a.aoPreSearchCols[b].sSearch,b,a.aoPreSearchCols[b].bRegex,
-a.aoPreSearchCols[b].bSmart);m.afnFiltering.length!==0&&Aa(a);a.bFiltered=true;a._iDisplayStart=0;F(a);D(a);Q(a,0)}function Aa(a){for(var b=m.afnFiltering,c=0,d=b.length;c<d;c++)for(var f=0,e=0,i=a.aiDisplay.length;e<i;e++){var h=a.aiDisplay[e-f];if(!b[c](a,a.aoData[h]._aData,h)){a.aiDisplay.splice(e-f,1);f++}}}function za(a,b,c,d,f){if(b!==""){var e=0;b=fa(b,d,f);for(d=a.aiDisplay.length-1;d>=0;d--){f=ga(a.aoData[a.aiDisplay[d]]._aData[c],a.aoColumns[c].sType);if(!b.test(f)){a.aiDisplay.splice(d,
-1);e++}}}}function ya(a,b,c,d,f){var e=fa(b,d,f);if(typeof c=="undefined"||c===null)c=0;if(m.afnFiltering.length!==0)c=1;if(b.length<=0){a.aiDisplay.splice(0,a.aiDisplay.length);a.aiDisplay=a.aiDisplayMaster.slice()}else if(a.aiDisplay.length==a.aiDisplayMaster.length||a.oPreviousSearch.sSearch.length>b.length||c==1||b.indexOf(a.oPreviousSearch.sSearch)!==0){a.aiDisplay.splice(0,a.aiDisplay.length);Q(a,1);for(c=0;c<a.aiDisplayMaster.length;c++)e.test(a.asDataSearch[c])&&a.aiDisplay.push(a.aiDisplayMaster[c])}else{var i=
-0;for(c=0;c<a.asDataSearch.length;c++)if(!e.test(a.asDataSearch[c])){a.aiDisplay.splice(c-i,1);i++}}a.oPreviousSearch.sSearch=b;a.oPreviousSearch.bRegex=d;a.oPreviousSearch.bSmart=f}function Q(a,b){a.asDataSearch.splice(0,a.asDataSearch.length);var c=p.createElement("div");b=typeof b!="undefined"&&b==1?a.aiDisplayMaster:a.aiDisplay;for(var d=0,f=b.length;d<f;d++){a.asDataSearch[d]="";for(var e=0,i=a.aoColumns.length;e<i;e++)if(a.aoColumns[e].bSearchable)a.asDataSearch[d]+=ga(a.aoData[b[d]]._aData[e],
-a.aoColumns[e].sType)+"  ";if(a.asDataSearch[d].indexOf("&")!==-1){c.innerHTML=a.asDataSearch[d];a.asDataSearch[d]=c.textContent?c.textContent:c.innerText}}}function fa(a,b,c){if(c){a=b?a.split(" "):ha(a).split(" ");a="^(?=.*?"+a.join(")(?=.*?")+").*$";return new RegExp(a,"i")}else{a=b?a:ha(a);return new RegExp(a,"i")}}function ga(a,b){if(typeof m.ofnSearch[b]=="function")return m.ofnSearch[b](a);else if(b=="html")return a.replace(/\n/g," ").replace(/<.*?>/g,"");else if(typeof a=="string")return a.replace(/\n/g,
-" ");return a}function O(a,b){var c=[],d=m.oSort,f=a.aoData,e,i,h,k;if(!a.oFeatures.bServerSide&&(a.aaSorting.length!==0||a.aaSortingFixed!==null)){c=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(h=0;h<c.length;h++){e=c[h][0];i=N(a,e);k=a.aoColumns[e].sSortDataType;if(typeof m.afnSortData[k]!="undefined"){var o=m.afnSortData[k](a,e,i);i=0;for(k=f.length;i<k;i++)f[i]._aData[e]=o[i]}}if(Y.runtime){var t=[],s=c.length;for(h=0;h<s;h++){e=a.aoColumns[c[h][0]].iDataSort;
-t.push([e,a.aoColumns[e].sType+"-"+c[h][1]])}a.aiDisplayMaster.sort(function(H,I){for(var A,G=0;G<s;G++){A=d[t[G][1]](f[H]._aData[t[G][0]],f[I]._aData[t[G][0]]);if(A!==0)return A}return 0})}else{this.ClosureDataTables={fn:function(){},data:f,sort:m.oSort};k="this.ClosureDataTables.fn = function(a,b){var iTest, oSort=this.ClosureDataTables.sort, aoData=this.ClosureDataTables.data;";for(h=0;h<c.length-1;h++){e=a.aoColumns[c[h][0]].iDataSort;i=a.aoColumns[e].sType;k+="iTest = oSort['"+i+"-"+c[h][1]+
-"']( aoData[a]._aData["+e+"], aoData[b]._aData["+e+"] ); if ( iTest === 0 )"}if(c.length>0){e=a.aoColumns[c[c.length-1][0]].iDataSort;i=a.aoColumns[e].sType;k+="iTest = oSort['"+i+"-"+c[c.length-1][1]+"']( aoData[a]._aData["+e+"], aoData[b]._aData["+e+"] );if (iTest===0) return oSort['numeric-"+c[c.length-1][1]+"'](a, b); return iTest;}";eval(k);a.aiDisplayMaster.sort(this.ClosureDataTables.fn)}this.ClosureDataTables=undefined}}if(typeof b=="undefined"||b)W(a);a.bSorted=true;if(a.oFeatures.bFilter)P(a,
-a.oPreviousSearch,1);else{a.aiDisplay=a.aiDisplayMaster.slice();a._iDisplayStart=0;F(a);D(a)}}function $(a,b,c,d){j(b).click(function(f){if(a.aoColumns[c].bSortable!==false){var e=function(){var i,h;if(f.shiftKey){for(var k=false,o=0;o<a.aaSorting.length;o++)if(a.aaSorting[o][0]==c){k=true;i=a.aaSorting[o][0];h=a.aaSorting[o][2]+1;if(typeof a.aoColumns[i].asSorting[h]=="undefined")a.aaSorting.splice(o,1);else{a.aaSorting[o][1]=a.aoColumns[i].asSorting[h];a.aaSorting[o][2]=h}break}k===false&&a.aaSorting.push([c,
-a.aoColumns[c].asSorting[0],0])}else if(a.aaSorting.length==1&&a.aaSorting[0][0]==c){i=a.aaSorting[0][0];h=a.aaSorting[0][2]+1;if(typeof a.aoColumns[i].asSorting[h]=="undefined")h=0;a.aaSorting[0][1]=a.aoColumns[i].asSorting[h];a.aaSorting[0][2]=h}else{a.aaSorting.splice(0,a.aaSorting.length);a.aaSorting.push([c,a.aoColumns[c].asSorting[0],0])}O(a)};if(a.oFeatures.bProcessing){K(a,true);setTimeout(function(){e();a.oFeatures.bServerSide||K(a,false)},0)}else e();typeof d=="function"&&d(a)}})}function W(a){var b,
-c,d,f,e,i=a.aoColumns.length,h=a.oClasses;for(b=0;b<i;b++)a.aoColumns[b].bSortable&&j(a.aoColumns[b].nTh).removeClass(h.sSortAsc+" "+h.sSortDesc+" "+a.aoColumns[b].sSortingClass);f=a.aaSortingFixed!==null?a.aaSortingFixed.concat(a.aaSorting):a.aaSorting.slice();for(b=0;b<a.aoColumns.length;b++)if(a.aoColumns[b].bSortable){e=a.aoColumns[b].sSortingClass;d=-1;for(c=0;c<f.length;c++)if(f[c][0]==b){e=f[c][1]=="asc"?h.sSortAsc:h.sSortDesc;d=c;break}j(a.aoColumns[b].nTh).addClass(e);if(a.bJUI){c=j("span",
-a.aoColumns[b].nTh);c.removeClass(h.sSortJUIAsc+" "+h.sSortJUIDesc+" "+h.sSortJUI+" "+h.sSortJUIAscAllowed+" "+h.sSortJUIDescAllowed);c.addClass(d==-1?a.aoColumns[b].sSortingClassJUI:f[d][1]=="asc"?h.sSortJUIAsc:h.sSortJUIDesc)}}else j(a.aoColumns[b].nTh).addClass(a.aoColumns[b].sSortingClass);e=h.sSortColumn;if(a.oFeatures.bSort&&a.oFeatures.bSortClasses){d=X(a);if(d.length>=i)for(b=0;b<i;b++)if(d[b].className.indexOf(e+"1")!=-1){c=0;for(a=d.length/i;c<a;c++)d[i*c+b].className=d[i*c+b].className.replace(" "+
-e+"1","")}else if(d[b].className.indexOf(e+"2")!=-1){c=0;for(a=d.length/i;c<a;c++)d[i*c+b].className=d[i*c+b].className.replace(" "+e+"2","")}else if(d[b].className.indexOf(e+"3")!=-1){c=0;for(a=d.length/i;c<a;c++)d[i*c+b].className=d[i*c+b].className.replace(" "+e+"3","")}h=1;var k;for(b=0;b<f.length;b++){k=parseInt(f[b][0],10);c=0;for(a=d.length/i;c<a;c++)d[i*c+k].className+=" "+e+h;h<3&&h++}}}function wa(a){var b=p.createElement("div");b.className=a.oClasses.sPaging+a.sPaginationType;m.oPagination[a.sPaginationType].fnInit(a,
-b,function(c){F(c);D(c)});typeof a.aanFeatures.p=="undefined"&&a.aoDrawCallback.push({fn:function(c){m.oPagination[c.sPaginationType].fnUpdate(c,function(d){F(d);D(d)})},sName:"pagination"});return b}function Ba(a,b){var c=a._iDisplayStart;if(b=="first")a._iDisplayStart=0;else if(b=="previous"){a._iDisplayStart=a._iDisplayLength>=0?a._iDisplayStart-a._iDisplayLength:0;if(a._iDisplayStart<0)a._iDisplayStart=0}else if(b=="next")if(a._iDisplayLength>=0){if(a._iDisplayStart+a._iDisplayLength<a.fnRecordsDisplay())a._iDisplayStart+=
-a._iDisplayLength}else a._iDisplayStart=0;else if(b=="last")if(a._iDisplayLength>=0){b=parseInt((a.fnRecordsDisplay()-1)/a._iDisplayLength,10)+1;a._iDisplayStart=(b-1)*a._iDisplayLength}else a._iDisplayStart=0;else J(a,0,"Unknown paging action: "+b);return c!=a._iDisplayStart}function va(a){var b=p.createElement("div");b.className=a.oClasses.sInfo;if(typeof a.aanFeatures.i=="undefined"){a.aoDrawCallback.push({fn:Ca,sName:"information"});a.sTableId!==""&&b.setAttribute("id",a.sTableId+"_info")}return b}
-function Ca(a){if(!(!a.oFeatures.bInfo||a.aanFeatures.i.length===0)){var b=j(a.aanFeatures.i[0]),c=a.fnFormatNumber(a.fnRecordsTotal()),d=a.fnFormatNumber(a._iDisplayStart+1),f=a.fnFormatNumber(a.fnDisplayEnd()),e=a.fnFormatNumber(a.fnRecordsDisplay());if(a.fnRecordsDisplay()===0&&a.fnRecordsDisplay()==a.fnRecordsTotal())b.html(a.oLanguage.sInfoEmpty+a.oLanguage.sInfoPostFix);else if(a.fnRecordsDisplay()===0)b.html(a.oLanguage.sInfoEmpty+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",c)+a.oLanguage.sInfoPostFix);
-else a.fnRecordsDisplay()==a.fnRecordsTotal()?b.html(a.oLanguage.sInfo.replace("_START_",d).replace("_END_",f).replace("_TOTAL_",e)+a.oLanguage.sInfoPostFix):b.html(a.oLanguage.sInfo.replace("_START_",d).replace("_END_",f).replace("_TOTAL_",e)+" "+a.oLanguage.sInfoFiltered.replace("_MAX_",a.fnFormatNumber(a.fnRecordsTotal()))+a.oLanguage.sInfoPostFix);a=a.aanFeatures.i;if(a.length>1){b=b.html();c=1;for(d=a.length;c<d;c++)j(a[c]).html(b)}}}function ra(a){var b='<select size="1" '+(a.sTableId===""?
-"":'name="'+a.sTableId+'_length"')+">",c,d;if(a.aLengthMenu.length==2&&typeof a.aLengthMenu[0]=="object"&&typeof a.aLengthMenu[1]=="object"){c=0;for(d=a.aLengthMenu[0].length;c<d;c++)b+='<option value="'+a.aLengthMenu[0][c]+'">'+a.aLengthMenu[1][c]+"</option>"}else{c=0;for(d=a.aLengthMenu.length;c<d;c++)b+='<option value="'+a.aLengthMenu[c]+'">'+a.aLengthMenu[c]+"</option>"}b+="</select>";var f=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.l=="undefined"&&f.setAttribute("id",a.sTableId+
-"_length");f.className=a.oClasses.sLength;f.innerHTML=a.oLanguage.sLengthMenu.replace("_MENU_",b);j('select option[value="'+a._iDisplayLength+'"]',f).attr("selected",true);j("select",f).change(function(){var e=j(this).val(),i=a.aanFeatures.l;c=0;for(d=i.length;c<d;c++)i[c]!=this.parentNode&&j("select",i[c]).val(e);a._iDisplayLength=parseInt(e,10);F(a);if(a.fnDisplayEnd()==a.fnRecordsDisplay()){a._iDisplayStart=a.fnDisplayEnd()-a._iDisplayLength;if(a._iDisplayStart<0)a._iDisplayStart=0}if(a._iDisplayLength==
--1)a._iDisplayStart=0;D(a)});return f}function ta(a){var b=p.createElement("div");a.sTableId!==""&&typeof a.aanFeatures.r=="undefined"&&b.setAttribute("id",a.sTableId+"_processing");b.innerHTML=a.oLanguage.sProcessing;b.className=a.oClasses.sProcessing;a.nTable.parentNode.insertBefore(b,a.nTable);return b}function K(a,b){if(a.oFeatures.bProcessing){a=a.aanFeatures.r;for(var c=0,d=a.length;c<d;c++)a[c].style.visibility=b?"visible":"hidden"}}function da(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===
-true&&c++;if(c==b)return d}return null}function N(a,b){for(var c=-1,d=0;d<a.aoColumns.length;d++){a.aoColumns[d].bVisible===true&&c++;if(d==b)return a.aoColumns[d].bVisible===true?c:null}return null}function R(a,b){var c,d;c=a._iDisplayStart;for(d=a._iDisplayEnd;c<d;c++)if(a.aoData[a.aiDisplay[c]].nTr==b)return a.aiDisplay[c];c=0;for(d=a.aoData.length;c<d;c++)if(a.aoData[c].nTr==b)return c;return null}function T(a){for(var b=0,c=0;c<a.aoColumns.length;c++)a.aoColumns[c].bVisible===true&&b++;return b}
-function F(a){a._iDisplayEnd=a.oFeatures.bPaginate===false?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength>a.aiDisplay.length||a._iDisplayLength==-1?a.aiDisplay.length:a._iDisplayStart+a._iDisplayLength}function Da(a,b){if(!a||a===null||a==="")return 0;if(typeof b=="undefined")b=p.getElementsByTagName("body")[0];var c=p.createElement("div");c.style.width=a;b.appendChild(c);a=c.offsetWidth;b.removeChild(c);return a}function ea(a){var b=0,c,d=0,f=a.aoColumns.length,e,i=j("th",a.nTHead);for(e=
-0;e<f;e++)if(a.aoColumns[e].bVisible){d++;if(a.aoColumns[e].sWidth!==null){c=Da(a.aoColumns[e].sWidthOrig,a.nTable.parentNode);if(c!==null)a.aoColumns[e].sWidth=v(c);b++}}if(f==i.length&&b===0&&d==f){ia(a,a.nTable);for(e=0;e<a.aoColumns.length;e++){c=j(i[e]).width();if(c!==null)a.aoColumns[e].sWidth=v(c)}}else{b=a.nTable.cloneNode(false);e=p.createElement("tbody");c=p.createElement("tr");b.removeAttribute("id");b.appendChild(a.nTHead.cloneNode(true));if(a.nTFoot!==null){b.appendChild(a.nTFoot.cloneNode(true));
-M(function(h){h.style.width=""},b.getElementsByTagName("tr"))}b.appendChild(e);e.appendChild(c);e=j("thead th",b);if(e.length===0)e=j("tbody tr:eq(0)>td",b);e.each(function(h){this.style.width="";h=da(a,h);if(h!==null&&a.aoColumns[h].sWidthOrig!=="")this.style.width=a.aoColumns[h].sWidthOrig});for(e=0;e<f;e++)if(a.aoColumns[e].bVisible){d=Ea(a,e);if(d!==null){d=d.cloneNode(true);c.appendChild(d)}}e=a.nTable.parentNode;e.appendChild(b);if(a.oScroll.sX!==""&&a.oScroll.sXInner!=="")b.style.width=v(a.oScroll.sXInner);
-else if(a.oScroll.sX!==""){b.style.width="";if(j(b).width()<e.offsetWidth)b.style.width=v(e.offsetWidth)}else b.style.width=v(e.offsetWidth);b.style.visibility="hidden";ia(a,b);f=j("tbody tr:eq(0)>td",b);if(f.length===0)f=j("thead tr:eq(0)>th",b);for(e=c=0;e<a.aoColumns.length;e++)if(a.aoColumns[e].bVisible){d=j(f[c]).width();if(d!==null&&d>0)a.aoColumns[e].sWidth=v(d);c++}a.nTable.style.width=v(j(b).outerWidth());b.parentNode.removeChild(b)}}function ia(a,b){if(a.oScroll.sX===""&&a.oScroll.sY!==
-""){j(b).width();b.style.width=v(j(b).outerWidth()-a.oScroll.iBarWidth)}else if(a.oScroll.sX!=="")b.style.width=v(j(b).outerWidth())}function Ea(a,b,c){if(typeof c=="undefined"||c){c=Fa(a,b);b=N(a,b);if(c<0)return null;return a.aoData[c].nTr.getElementsByTagName("td")[b]}var d=-1,f,e;c=-1;var i=p.createElement("div");i.style.visibility="hidden";i.style.position="absolute";p.body.appendChild(i);f=0;for(e=a.aoData.length;f<e;f++){i.innerHTML=a.aoData[f]._aData[b];if(i.offsetWidth>d){d=i.offsetWidth;
-c=f}}p.body.removeChild(i);if(c>=0){b=N(a,b);if(a=a.aoData[c].nTr.getElementsByTagName("td")[b])return a}return null}function Fa(a,b){for(var c=0,d=-1,f=0;f<a.aoData.length;f++){var e=a.aoData[f]._aData[b];if(e.length>c){c=e.length;d=f}}return d}function v(a){if(a===null)return"0px";if(typeof a=="number")return a+"px";if(a.indexOf("em")!=-1||a.indexOf("%")!=-1||a.indexOf("ex")!=-1||a.indexOf("px")!=-1)return a;return a+"px"}function La(a,b){if(a.length!=b.length)return 1;for(var c=0;c<a.length;c++)if(a[c]!=
-b[c])return 2;return 0}function Z(a){for(var b=m.aTypes,c=b.length,d=0;d<c;d++){var f=b[d](a);if(f!==null)return f}return"string"}function B(a){for(var b=0;b<E.length;b++)if(E[b].nTable==a)return E[b];return null}function V(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d]._aData);return b}function S(a){for(var b=[],c=a.aoData.length,d=0;d<c;d++)b.push(a.aoData[d].nTr);return b}function X(a){var b=S(a),c=[],d,f=[],e,i,h,k;e=0;for(i=b.length;e<i;e++){c=[];h=0;for(k=b[e].childNodes.length;h<
-k;h++){d=b[e].childNodes[h];d.nodeName.toUpperCase()=="TD"&&c.push(d)}h=d=0;for(k=a.aoColumns.length;h<k;h++)if(a.aoColumns[h].bVisible)f.push(c[h-d]);else{f.push(a.aoData[e]._anHidden[h]);d++}}return f}function ha(a){return a.replace(new RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^)","g"),"\\$1")}function ja(a,b){for(var c=-1,d=0,f=a.length;d<f;d++)if(a[d]==b)c=d;else a[d]>b&&a[d]--;c!=-1&&a.splice(c,1)}function qa(a,b){b=b.split(",");for(var c=[],d=0,f=a.aoColumns.length;d<
-f;d++)for(var e=0;e<f;e++)if(a.aoColumns[d].sName==b[e]){c.push(e);break}return c}function aa(a){for(var b="",c=0,d=a.aoColumns.length;c<d;c++)b+=a.aoColumns[c].sName+",";if(b.length==d)return"";return b.slice(0,-1)}function J(a,b,c){a=a.sTableId===""?"DataTables warning: "+c:"DataTables warning (table id = '"+a.sTableId+"'): "+c;if(b===0)if(m.sErrMode=="alert")alert(a);else throw a;else typeof console!="undefined"&&typeof console.log!="undefined"&&console.log(a)}function ba(a){a.aoData.length=0;
-a.aiDisplayMaster.length=0;a.aiDisplay.length=0;F(a)}function Ga(a){if(a.oFeatures.bStateSave){var b,c="{";c+='"iCreate": '+(new Date).getTime()+",";c+='"iStart": '+a._iDisplayStart+",";c+='"iEnd": '+a._iDisplayEnd+",";c+='"iLength": '+a._iDisplayLength+",";c+='"sFilter": "'+a.oPreviousSearch.sSearch.replace('"','\\"')+'",';c+='"sFilterEsc": '+!a.oPreviousSearch.bRegex+",";c+='"aaSorting": [ ';for(b=0;b<a.aaSorting.length;b++)c+="["+a.aaSorting[b][0]+",'"+a.aaSorting[b][1]+"'],";c=c.substring(0,c.length-
-1);c+="],";c+='"aaSearchCols": [ ';for(b=0;b<a.aoPreSearchCols.length;b++)c+="['"+a.aoPreSearchCols[b].sSearch.replace("'","'")+"',"+!a.aoPreSearchCols[b].bRegex+"],";c=c.substring(0,c.length-1);c+="],";c+='"abVisCols": [ ';for(b=0;b<a.aoColumns.length;b++)c+=a.aoColumns[b].bVisible+",";c=c.substring(0,c.length-1);c+="]";c+="}";Ha(a.sCookiePrefix+a.sInstance,c,a.iCookieDuration,a.sCookiePrefix)}}function Ia(a,b){if(a.oFeatures.bStateSave){var c,d=ka(a.sCookiePrefix+a.sInstance);if(d!==null&&d!==""){try{c=
-typeof JSON=="object"&&typeof JSON.parse=="function"?JSON.parse(d.replace(/'/g,'"')):eval("("+d+")")}catch(f){return}a._iDisplayStart=c.iStart;a.iInitDisplayStart=c.iStart;a._iDisplayEnd=c.iEnd;a._iDisplayLength=c.iLength;a.oPreviousSearch.sSearch=c.sFilter;a.aaSorting=c.aaSorting.slice();a.saved_aaSorting=c.aaSorting.slice();if(typeof c.sFilterEsc!="undefined")a.oPreviousSearch.bRegex=!c.sFilterEsc;if(typeof c.aaSearchCols!="undefined")for(d=0;d<c.aaSearchCols.length;d++)a.aoPreSearchCols[d]={sSearch:c.aaSearchCols[d][0],
-bRegex:!c.aaSearchCols[d][1]};if(typeof c.abVisCols!="undefined"){b.saved_aoColumns=[];for(d=0;d<c.abVisCols.length;d++){b.saved_aoColumns[d]={};b.saved_aoColumns[d].bVisible=c.abVisCols[d]}}}}}function Ha(a,b,c,d){var f=new Date;f.setTime(f.getTime()+c*1E3);c=Y.location.pathname.split("/");var e=a+"_"+c.pop().replace(/[\/:]/g,"").toLowerCase();b=e+"="+encodeURIComponent(b)+"; expires="+f.toGMTString()+"; path="+c.join("/")+"/";f="";a=9999999999999;var i;if((ka(e)!==null?p.cookie.length:b.length+
-p.cookie.length)+10>4096){e=p.cookie.split(";");for(var h=0,k=e.length;h<k;h++)if(e[h].indexOf(d)!=-1){var o=e[h].split("=");try{i=eval("("+decodeURIComponent(o[1])+")")}catch(t){continue}if(typeof i.iCreate!="undefined"&&i.iCreate<a){f=o[0];a=i.iCreate}}if(f!=="")p.cookie=f+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+c.join("/")+"/"}p.cookie=b}function ka(a){var b=Y.location.pathname.split("/");a=a+"_"+b[b.length-1].replace(/[\/:]/g,"").toLowerCase()+"=";b=p.cookie.split(";");for(var c=0;c<
-b.length;c++){for(var d=b[c];d.charAt(0)==" ";)d=d.substring(1,d.length);if(d.indexOf(a)===0)return decodeURIComponent(d.substring(a.length,d.length))}return null}function ca(a){a=a.getElementsByTagName("tr");if(a.length==1)return a[0].getElementsByTagName("th");var b=[],c=[],d,f,e,i,h,k,o=function(G,Ma,la){for(;typeof G[Ma][la]!="undefined";)la++;return la},t=function(G){if(typeof b[G]=="undefined")b[G]=[]};d=0;for(i=a.length;d<i;d++){t(d);var s=0,H=[];f=0;for(h=a[d].childNodes.length;f<h;f++)if(a[d].childNodes[f].nodeName.toUpperCase()==
-"TD"||a[d].childNodes[f].nodeName.toUpperCase()=="TH")H.push(a[d].childNodes[f]);f=0;for(h=H.length;f<h;f++){var I=H[f].getAttribute("colspan")*1,A=H[f].getAttribute("rowspan")*1;if(!I||I===0||I===1){k=o(b,d,s);b[d][k]=H[f].nodeName.toUpperCase()=="TD"?4:H[f];if(A||A===0||A===1)for(e=1;e<A;e++){t(d+e);b[d+e][k]=2}s++}else{k=o(b,d,s);for(e=0;e<I;e++)b[d][k+e]=3;s+=I}}}d=0;for(i=b[0].length;d<i;d++){f=0;for(h=b.length;f<h;f++)typeof b[f][d]=="object"&&c.push(b[f][d])}return c}function Ja(){var a=p.createElement("p"),
-b=a.style;b.width="100%";b.height="200px";var c=p.createElement("div");b=c.style;b.position="absolute";b.top="0px";b.left="0px";b.visibility="hidden";b.width="200px";b.height="150px";b.overflow="hidden";c.appendChild(a);p.body.appendChild(c);b=a.offsetWidth;c.style.overflow="scroll";a=a.offsetWidth;if(b==a)a=c.clientWidth;p.body.removeChild(c);return b-a}function M(a,b,c){for(var d=0,f=b.length;d<f;d++)for(var e=0,i=b[d].childNodes.length;e<i;e++)if(b[d].childNodes[e].nodeType==1)typeof c!="undefined"?
-a(b[d].childNodes[e],c[d].childNodes[e]):a(b[d].childNodes[e])}function n(a,b,c,d){if(typeof d=="undefined")d=c;if(typeof b[c]!="undefined")a[d]=b[c]}this.oApi={};this.fnDraw=function(a){var b=B(this[m.iApiIndex]);if(typeof a!="undefined"&&a===false){F(b);D(b)}else L(b)};this.fnFilter=function(a,b,c,d,f){var e=B(this[m.iApiIndex]);if(e.oFeatures.bFilter){if(typeof c=="undefined")c=false;if(typeof d=="undefined")d=true;if(typeof f=="undefined")f=true;if(typeof b=="undefined"||b===null){P(e,{sSearch:a,
-bRegex:c,bSmart:d},1);if(f&&typeof e.aanFeatures.f!="undefined"){b=e.aanFeatures.f;c=0;for(d=b.length;c<d;c++)j("input",b[c]).val(a)}}else{e.aoPreSearchCols[b].sSearch=a;e.aoPreSearchCols[b].bRegex=c;e.aoPreSearchCols[b].bSmart=d;P(e,e.oPreviousSearch,1)}}};this.fnSettings=function(){return B(this[m.iApiIndex])};this.fnVersionCheck=m.fnVersionCheck;this.fnSort=function(a){var b=B(this[m.iApiIndex]);b.aaSorting=a;O(b)};this.fnSortListener=function(a,b,c){$(B(this[m.iApiIndex]),a,b,c)};this.fnAddData=
-function(a,b){if(a.length===0)return[];var c=[],d,f=B(this[m.iApiIndex]);if(typeof a[0]=="object")for(var e=0;e<a.length;e++){d=w(f,a[e]);if(d==-1)return c;c.push(d)}else{d=w(f,a);if(d==-1)return c;c.push(d)}f.aiDisplay=f.aiDisplayMaster.slice();Q(f,1);if(typeof b=="undefined"||b)L(f);return c};this.fnDeleteRow=function(a,b,c){var d=B(this[m.iApiIndex]);a=typeof a=="object"?R(d,a):a;var f=d.aoData.splice(a,1);ja(d.aiDisplayMaster,a);ja(d.aiDisplay,a);Q(d,1);typeof b=="function"&&b.call(this,d,f);
-if(d._iDisplayStart>=d.aiDisplay.length){d._iDisplayStart-=d._iDisplayLength;if(d._iDisplayStart<0)d._iDisplayStart=0}if(typeof c=="undefined"||c){F(d);D(d)}return f};this.fnClearTable=function(a){var b=B(this[m.iApiIndex]);ba(b);if(typeof a=="undefined"||a)D(b)};this.fnOpen=function(a,b,c){var d=B(this[m.iApiIndex]);this.fnClose(a);var f=p.createElement("tr"),e=p.createElement("td");f.appendChild(e);e.className=c;e.colSpan=T(d);e.innerHTML=b;b=j("tr",d.nTBody);j.inArray(a,b)!=-1&&j(f).insertAfter(a);
-d.aoOpenRows.push({nTr:f,nParent:a});return f};this.fnClose=function(a){for(var b=B(this[m.iApiIndex]),c=0;c<b.aoOpenRows.length;c++)if(b.aoOpenRows[c].nParent==a){(a=b.aoOpenRows[c].nTr.parentNode)&&a.removeChild(b.aoOpenRows[c].nTr);b.aoOpenRows.splice(c,1);return 0}return 1};this.fnGetData=function(a){var b=B(this[m.iApiIndex]);if(typeof a!="undefined"){a=typeof a=="object"?R(b,a):a;return b.aoData[a]._aData}return V(b)};this.fnGetNodes=function(a){var b=B(this[m.iApiIndex]);if(typeof a!="undefined")return b.aoData[a].nTr;
-return S(b)};this.fnGetPosition=function(a){var b=B(this[m.iApiIndex]);if(a.nodeName.toUpperCase()=="TR")return R(b,a);else if(a.nodeName.toUpperCase()=="TD")for(var c=R(b,a.parentNode),d=0,f=0;f<b.aoColumns.length;f++)if(b.aoColumns[f].bVisible){if(b.aoData[c].nTr.getElementsByTagName("td")[f-d]==a)return[c,f-d,f]}else d++;return null};this.fnUpdate=function(a,b,c,d,f){var e=B(this[m.iApiIndex]),i=typeof b=="object"?R(e,b):b;if(typeof a!="object"){b=a;e.aoData[i]._aData[c]=b;if(e.aoColumns[c].fnRender!==
-null){b=e.aoColumns[c].fnRender({iDataRow:i,iDataColumn:c,aData:e.aoData[i]._aData,oSettings:e});if(e.aoColumns[c].bUseRendered)e.aoData[i]._aData[c]=b}c=N(e,c);if(c!==null)e.aoData[i].nTr.getElementsByTagName("td")[c].innerHTML=b}else{if(a.length!=e.aoColumns.length){J(e,0,"An array passed to fnUpdate must have the same number of columns as the table in question - in this case "+e.aoColumns.length);return 1}for(var h=0;h<a.length;h++){b=a[h];e.aoData[i]._aData[h]=b;if(e.aoColumns[h].fnRender!==null){b=
-e.aoColumns[h].fnRender({iDataRow:i,iDataColumn:h,aData:e.aoData[i]._aData,oSettings:e});if(e.aoColumns[h].bUseRendered)e.aoData[i]._aData[h]=b}c=N(e,h);if(c!==null)e.aoData[i].nTr.getElementsByTagName("td")[c].innerHTML=b}}if(typeof f=="undefined"||f){Q(e,1);U(e)}if(typeof d=="undefined"||d)L(e);return 0};this.fnSetColumnVis=function(a,b){var c=B(this[m.iApiIndex]),d,f;f=c.aoColumns.length;var e,i;if(c.aoColumns[a].bVisible!=b){e=j(">tr",c.nTHead)[0];var h=j(">tr",c.nTFoot)[0],k=[],o=[];for(d=0;d<
-f;d++){k.push(c.aoColumns[d].nTh);o.push(c.aoColumns[d].nTf)}if(b){for(d=b=0;d<a;d++)c.aoColumns[d].bVisible&&b++;if(b>=T(c)){e.appendChild(k[a]);h&&h.appendChild(o[a]);d=0;for(f=c.aoData.length;d<f;d++){e=c.aoData[d]._anHidden[a];c.aoData[d].nTr.appendChild(e)}}else{for(d=a;d<f;d++){i=N(c,d);if(i!==null)break}e.insertBefore(k[a],e.getElementsByTagName("th")[i]);h&&h.insertBefore(o[a],h.getElementsByTagName("th")[i]);X(c);d=0;for(f=c.aoData.length;d<f;d++){e=c.aoData[d]._anHidden[a];c.aoData[d].nTr.insertBefore(e,
-j(">td:eq("+i+")",c.aoData[d].nTr)[0])}}c.aoColumns[a].bVisible=true}else{e.removeChild(k[a]);h&&h.removeChild(o[a]);i=X(c);d=0;for(f=c.aoData.length;d<f;d++){e=i[d*c.aoColumns.length+a*1];c.aoData[d]._anHidden[a]=e;e.parentNode.removeChild(e)}c.aoColumns[a].bVisible=false}d=0;for(f=c.aoOpenRows.length;d<f;d++)c.aoOpenRows[d].nTr.colSpan=T(c);U(c);D(c)}};this.fnPageChange=function(a,b){var c=B(this[m.iApiIndex]);Ba(c,a);F(c);if(typeof b=="undefined"||b)D(c)};this.fnDestroy=function(){var a=B(this[m.iApiIndex]),
-b=a.nTableWrapper.parentNode,c=a.nTBody,d;a.nTable.parentNode.removeChild(a.nTable);j(a.nTableWrapper).remove();a.aaSorting=[];a.aaSortingFixed=[];W(a);j(S(a)).removeClass(a.asStripClasses.join(" "));if(a.bJUI){j("th",a.nTHead).removeClass([m.oStdClasses.sSortable,m.oJUIClasses.sSortableAsc,m.oJUIClasses.sSortableDesc,m.oJUIClasses.sSortableNone].join(" "));j("th span",a.nTHead).remove()}else j("th",a.nTHead).removeClass([m.oStdClasses.sSortable,m.oStdClasses.sSortableAsc,m.oStdClasses.sSortableDesc,
-m.oStdClasses.sSortableNone].join(" "));b.appendChild(a.nTable);b=0;for(d=a.aoData.length;b<d;b++)c.appendChild(a.aoData[b].nTr);j(">tr:even",c).addClass(a.asDestoryStrips[0]);j(">tr:odd",c).addClass(a.asDestoryStrips[1]);b=0;for(d=E.length;b<d;b++)E[b]==a&&E.splice(b,1)};this.fnAdjustColumnSizing=function(a){U(B(this[m.iApiIndex]));if(typeof a=="undefined"||a)this.fnDraw(false)};for(var ma in m.oApi)if(ma)this[ma]=q(ma);this.oApi._fnExternApiFunc=q;this.oApi._fnInitalise=r;this.oApi._fnLanguageProcess=
-u;this.oApi._fnAddColumn=y;this.oApi._fnColumnOptions=C;this.oApi._fnAddData=w;this.oApi._fnGatherData=x;this.oApi._fnDrawHead=z;this.oApi._fnDraw=D;this.oApi._fnReDraw=L;this.oApi._fnAjaxUpdate=oa;this.oApi._fnAjaxUpdateDraw=pa;this.oApi._fnAddOptionsHtml=na;this.oApi._fnFeatureHtmlTable=ua;this.oApi._fnScrollDraw=xa;this.oApi._fnAjustColumnSizing=U;this.oApi._fnFeatureHtmlFilter=sa;this.oApi._fnFilterComplete=P;this.oApi._fnFilterCustom=Aa;this.oApi._fnFilterColumn=za;this.oApi._fnFilter=ya;this.oApi._fnBuildSearchArray=
-Q;this.oApi._fnFilterCreateSearch=fa;this.oApi._fnDataToSearch=ga;this.oApi._fnSort=O;this.oApi._fnSortAttachListener=$;this.oApi._fnSortingClasses=W;this.oApi._fnFeatureHtmlPaginate=wa;this.oApi._fnPageChange=Ba;this.oApi._fnFeatureHtmlInfo=va;this.oApi._fnUpdateInfo=Ca;this.oApi._fnFeatureHtmlLength=ra;this.oApi._fnFeatureHtmlProcessing=ta;this.oApi._fnProcessingDisplay=K;this.oApi._fnVisibleToColumnIndex=da;this.oApi._fnColumnIndexToVisible=N;this.oApi._fnNodeToDataIndex=R;this.oApi._fnVisbleColumns=
-T;this.oApi._fnCalculateEnd=F;this.oApi._fnConvertToWidth=Da;this.oApi._fnCalculateColumnWidths=ea;this.oApi._fnScrollingWidthAdjust=ia;this.oApi._fnGetWidestNode=Ea;this.oApi._fnGetMaxLenString=Fa;this.oApi._fnStringToCss=v;this.oApi._fnArrayCmp=La;this.oApi._fnDetectType=Z;this.oApi._fnSettingsFromNode=B;this.oApi._fnGetDataMaster=V;this.oApi._fnGetTrNodes=S;this.oApi._fnGetTdNodes=X;this.oApi._fnEscapeRegex=ha;this.oApi._fnDeleteIndex=ja;this.oApi._fnReOrderIndex=qa;this.oApi._fnColumnOrdering=
-aa;this.oApi._fnLog=J;this.oApi._fnClearTable=ba;this.oApi._fnSaveState=Ga;this.oApi._fnLoadState=Ia;this.oApi._fnCreateCookie=Ha;this.oApi._fnReadCookie=ka;this.oApi._fnGetUniqueThs=ca;this.oApi._fnScrollBarWidth=Ja;this.oApi._fnApplyToChildren=M;this.oApi._fnMap=n;var Ka=this;return this.each(function(){var a=0,b,c,d,f;a=0;for(b=E.length;a<b;a++){if(E[a].nTable==this)if(typeof g=="undefined"||typeof g.bRetrieve!="undefined"&&g.bRetrieve===true)return E[a].oInstance;else if(typeof g.bDestroy!="undefined"&&
-g.bDestroy===true){E[a].oInstance.fnDestroy();break}else{J(E[a],0,"Cannot reinitialise DataTable.\n\nTo retrieve the DataTables object for this table, please pass either no arguments to the dataTable() function, or set bRetrieve to true. Alternatively, to destory the old table and create a new one, set bDestroy to true (note that a lot of changes to the configuration can be made through the API which is usually much faster).");return}if(E[a].sTableId!==""&&E[a].sTableId==this.getAttribute("id")){E.splice(a,
-1);break}}var e=new l;E.push(e);var i=false,h=false;a=this.getAttribute("id");if(a!==null){e.sTableId=a;e.sInstance=a}else e.sInstance=m._oExternConfig.iNextUnique++;e.oInstance=Ka;e.nTable=this;e.oApi=Ka.oApi;if(typeof g!="undefined"&&g!==null){e.oInit=g;n(e.oFeatures,g,"bPaginate");n(e.oFeatures,g,"bLengthChange");n(e.oFeatures,g,"bFilter");n(e.oFeatures,g,"bSort");n(e.oFeatures,g,"bInfo");n(e.oFeatures,g,"bProcessing");n(e.oFeatures,g,"bAutoWidth");n(e.oFeatures,g,"bSortClasses");n(e.oFeatures,
-g,"bServerSide");n(e.oScroll,g,"sScrollX","sX");n(e.oScroll,g,"sScrollXInner","sXInner");n(e.oScroll,g,"sScrollY","sY");n(e.oScroll,g,"bScrollCollapse","bCollapse");n(e,g,"asStripClasses");n(e,g,"fnRowCallback");n(e,g,"fnHeaderCallback");n(e,g,"fnFooterCallback");n(e,g,"fnInitComplete");n(e,g,"fnServerData");n(e,g,"fnFormatNumber");n(e,g,"aaSorting");n(e,g,"aaSortingFixed");n(e,g,"aLengthMenu");n(e,g,"sPaginationType");n(e,g,"sAjaxSource");n(e,g,"iCookieDuration");n(e,g,"sCookiePrefix");n(e,g,"sDom");
-n(e,g,"oSearch","oPreviousSearch");n(e,g,"aoSearchCols","aoPreSearchCols");n(e,g,"iDisplayLength","_iDisplayLength");n(e,g,"bJQueryUI","bJUI");typeof g.fnDrawCallback=="function"&&e.aoDrawCallback.push({fn:g.fnDrawCallback,sName:"user"});e.oFeatures.bServerSide&&e.oFeatures.bSort&&e.oFeatures.bSortClasses&&e.aoDrawCallback.push({fn:W,sName:"server_side_sort_classes"});if(typeof g.bJQueryUI!="undefined"&&g.bJQueryUI){e.oClasses=m.oJUIClasses;if(typeof g.sDom=="undefined")e.sDom='<"H"lfr>t<"F"ip>'}if(e.oScroll.sX!==
-""||e.oScroll.sY!=="")e.oScroll.iBarWidth=Ja();if(typeof g.iDisplayStart!="undefined"&&typeof e.iInitDisplayStart=="undefined"){e.iInitDisplayStart=g.iDisplayStart;e._iDisplayStart=g.iDisplayStart}if(typeof g.bStateSave!="undefined"){e.oFeatures.bStateSave=g.bStateSave;Ia(e,g);e.aoDrawCallback.push({fn:Ga,sName:"state_save"})}if(typeof g.aaData!="undefined")h=true;if(typeof g!="undefined"&&typeof g.aoData!="undefined")g.aoColumns=g.aoData;if(typeof g.oLanguage!="undefined")if(typeof g.oLanguage.sUrl!=
-"undefined"&&g.oLanguage.sUrl!==""){e.oLanguage.sUrl=g.oLanguage.sUrl;j.getJSON(e.oLanguage.sUrl,null,function(o){u(e,o,true)});i=true}else u(e,g.oLanguage,false)}else g={};if(typeof g.asStripClasses=="undefined"){e.asStripClasses.push(e.oClasses.sStripOdd);e.asStripClasses.push(e.oClasses.sStripEven)}c=false;d=j("tbody>tr",this);a=0;for(b=e.asStripClasses.length;a<b;a++)if(d.filter(":lt(2)").hasClass(e.asStripClasses[a])){c=true;break}if(c){e.asDestoryStrips=["",""];if(j(d[0]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[0]+=
-e.oClasses.sStripOdd+" ";if(j(d[0]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[0]+=e.oClasses.sStripEven;if(j(d[1]).hasClass(e.oClasses.sStripOdd))e.asDestoryStrips[1]+=e.oClasses.sStripOdd+" ";if(j(d[1]).hasClass(e.oClasses.sStripEven))e.asDestoryStrips[1]+=e.oClasses.sStripEven;d.removeClass(e.asStripClasses.join(" "))}a=this.getElementsByTagName("thead");c=a.length===0?[]:ca(a[0]);d=typeof g.aoColumns!="undefined";a=0;for(b=d?g.aoColumns.length:c.length;a<b;a++){f=d?g.aoColumns[a]:null;
-var k=c?c[a]:null;if(typeof g.saved_aoColumns!="undefined"&&g.saved_aoColumns.length==b){if(f===null)f={};f.bVisible=g.saved_aoColumns[a].bVisible}y(e,k)}if(typeof g.aoColumnDefs!="undefined")for(a=g.aoColumnDefs.length-1;a>=0;a--){k=g.aoColumnDefs[a].aTargets;c=0;for(d=k.length;c<d;c++)if(typeof k[c]=="number"&&k[c]>=0){for(;e.aoColumns.length<=k[c];)y(e);C(e,k[c],g.aoColumnDefs[a])}else if(typeof k[c]=="number"&&k[c]<0)C(e,e.aoColumns.length+k[c],g.aoColumnDefs[a]);else if(typeof k[c]=="string"){b=
-0;for(f=e.aoColumns.length;b<f;b++)if(k[c]=="_all"||e.aoColumns[b].nTh.className.indexOf(k[c])!=-1)C(e,b,g.aoColumnDefs[a])}}if(typeof g.aoColumns!="undefined"){a=0;for(b=g.aoColumns.length;a<b;a++)C(e,a,g.aoColumns[a])}a=0;for(b=e.aaSorting.length;a<b;a++){f=e.aoColumns[e.aaSorting[a][0]];if(typeof e.aaSorting[a][2]=="undefined")e.aaSorting[a][2]=0;if(typeof g.aaSorting=="undefined"&&typeof e.saved_aaSorting=="undefined")e.aaSorting[a][1]=f.asSorting[0];c=0;for(d=f.asSorting.length;c<d;c++)if(e.aaSorting[a][1]==
-f.asSorting[c]){e.aaSorting[a][2]=c;break}}this.getElementsByTagName("thead").length===0&&this.appendChild(p.createElement("thead"));this.getElementsByTagName("tbody").length===0&&this.appendChild(p.createElement("tbody"));e.nTHead=this.getElementsByTagName("thead")[0];e.nTBody=this.getElementsByTagName("tbody")[0];if(this.getElementsByTagName("tfoot").length>0)e.nTFoot=this.getElementsByTagName("tfoot")[0];if(h)for(a=0;a<g.aaData.length;a++)w(e,g.aaData[a]);else x(e);e.aiDisplay=e.aiDisplayMaster.slice();
-e.oFeatures.bAutoWidth&&ea(e);e.bInitialised=true;i===false&&r(e)})}})(jQuery,window,document);
-
-jQuery.fn.dataTableExt.oSort['percent-asc']  = function(a,b) {
-	var x = (a == "-") ? 0 : a.replace( /%/, "" );
-	var y = (b == "-") ? 0 : b.replace( /%/, "" );
-	x = parseFloat( x );
-	y = parseFloat( y );
-	return ((x < y) ? -1 : ((x > y) ?  1 : 0));
-};
-
-jQuery.fn.dataTableExt.oSort['percent-desc'] = function(a,b) {
-	var x = (a == "-") ? 0 : a.replace( /%/, "" );
-	var y = (b == "-") ? 0 : b.replace( /%/, "" );
-	x = parseFloat( x );
-	y = parseFloat( y );
-	return ((x < y) ?  1 : ((x > y) ? -1 : 0));
-};
-/*
- * timeago: a jQuery plugin, version: 0.9 (2010-06-21)
- * @requires jQuery v1.2.3 or later
- *
- * Timeago is a jQuery plugin that makes it easy to support automatically
- * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
- *
- * For usage and examples, visit:
- * http://timeago.yarp.com/
- *
- * Licensed under the MIT:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * Copyright (c) 2008-2010, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org)
- */
-
-(function($) {
-  $.timeago = function(timestamp) {
-    if (timestamp instanceof Date) return inWords(timestamp);
-    else if (typeof timestamp == "string") return inWords($.timeago.parse(timestamp));
-    else return inWords($.timeago.datetime(timestamp));
-  };
-  var $t = $.timeago;
-
-  $.extend($.timeago, {
-    settings: {
-      refreshMillis: 60000,
-      allowFuture: false,
-      strings: {
-        prefixAgo: null,
-        prefixFromNow: null,
-        suffixAgo: "ago",
-        suffixFromNow: "from now",
-        seconds: "less than a minute",
-        minute: "about a minute",
-        minutes: "%d minutes",
-        hour: "about an hour",
-        hours: "about %d hours",
-        day: "a day",
-        days: "%d days",
-        month: "about a month",
-        months: "%d months",
-        year: "about a year",
-        years: "%d years",
-        numbers: []
-      }
-    },
-    inWords: function(distanceMillis) {
-      var $l = this.settings.strings;
-      var prefix = $l.prefixAgo;
-      var suffix = $l.suffixAgo;
-      if (this.settings.allowFuture) {
-        if (distanceMillis < 0) {
-          prefix = $l.prefixFromNow;
-          suffix = $l.suffixFromNow;
-        }
-        distanceMillis = Math.abs(distanceMillis);
-      }
-
-      var seconds = distanceMillis / 1000;
-      var minutes = seconds / 60;
-      var hours = minutes / 60;
-      var days = hours / 24;
-      var years = days / 365;
-
-      function substitute(stringOrFunction, number) {
-        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number) : stringOrFunction;
-        var value = ($l.numbers && $l.numbers[number]) || number;
-        return string.replace(/%d/i, value);
-      }
-
-      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
-        seconds < 90 && substitute($l.minute, 1) ||
-        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
-        minutes < 90 && substitute($l.hour, 1) ||
-        hours < 24 && substitute($l.hours, Math.round(hours)) ||
-        hours < 48 && substitute($l.day, 1) ||
-        days < 30 && substitute($l.days, Math.floor(days)) ||
-        days < 60 && substitute($l.month, 1) ||
-        days < 365 && substitute($l.months, Math.floor(days / 30)) ||
-        years < 2 && substitute($l.year, 1) ||
-        substitute($l.years, Math.floor(years));
-
-      return $.trim([prefix, words, suffix].join(" "));
-    },
-    parse: function(iso8601) {
-      var s = $.trim(iso8601);
-      s = s.replace(/\.\d\d\d/,""); // remove milliseconds
-      s = s.replace(/-/,"/").replace(/-/,"/");
-      s = s.replace(/T/," ").replace(/Z/," UTC");
-      s = s.replace(/([\+-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
-      return new Date(s);
-    },
-    datetime: function(elem) {
-      // jQuery's `is()` doesn't play well with HTML5 in IE
-      var isTime = $(elem).get(0).tagName.toLowerCase() == "time"; // $(elem).is("time");
-      var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title");
-      return $t.parse(iso8601);
-    }
-  });
-
-  $.fn.timeago = function() {
-    var self = this;
-    self.each(refresh);
-
-    var $s = $t.settings;
-    if ($s.refreshMillis > 0) {
-      setInterval(function() { self.each(refresh); }, $s.refreshMillis);
-    }
-    return self;
-  };
-
-  function refresh() {
-    var data = prepareData(this);
-    if (!isNaN(data.datetime)) {
-      $(this).text(inWords(data.datetime));
-    }
-    return this;
-  }
-
-  function prepareData(element) {
-    element = $(element);
-    if (!element.data("timeago")) {
-      element.data("timeago", { datetime: $t.datetime(element) });
-      var text = $.trim(element.text());
-      if (text.length > 0) element.attr("title", text);
-    }
-    return element.data("timeago");
-  }
-
-  function inWords(date) {
-    return $t.inWords(distance(date));
-  }
-
-  function distance(date) {
-    return (new Date().getTime() - date.getTime());
-  }
-
-  // fix for IE6 suckage
-  document.createElement("abbr");
-  document.createElement("time");
-})(jQuery);
-// JQuery URL Parser
-// Written by Mark Perkins, mark@allmarkedup.com
-// License: http://unlicense.org/ (i.e. do what you want with it!)
-
-jQuery.url = function()
-{
-	var segments = {};
-	
-	var parsed = {};
-	
-	/**
-    * Options object. Only the URI and strictMode values can be changed via the setters below.
-    */
-  	var options = {
-	
-		url : window.location, // default URI is the page in which the script is running
-		
-		strictMode: false, // 'loose' parsing by default
-	
-		key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], // keys available to query 
-		
-		q: {
-			name: "queryKey",
-			parser: /(?:^|&)([^&=]*)=?([^&]*)/g
-		},
-		
-		parser: {
-			strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,  //less intuitive, more accurate to the specs
-			loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/ // more intuitive, fails on relative paths and deviates from specs
-		}
-		
-	};
-	
-    /**
-     * Deals with the parsing of the URI according to the regex above.
- 	 * Written by Steven Levithan - see credits at top.
-     */		
-	var parseUri = function()
-	{
-		str = decodeURI( options.url );
-		
-		var m = options.parser[ options.strictMode ? "strict" : "loose" ].exec( str );
-		var uri = {};
-		var i = 14;
-
-		while ( i-- ) {
-			uri[ options.key[i] ] = m[i] || "";
-		}
-
-		uri[ options.q.name ] = {};
-		uri[ options.key[12] ].replace( options.q.parser, function ( $0, $1, $2 ) {
-			if ($1) {
-				uri[options.q.name][$1] = $2;
-			}
-		});
-
-		return uri;
-	};
-
-    /**
-     * Returns the value of the passed in key from the parsed URI.
-  	 * 
-	 * @param string key The key whose value is required
-     */		
-	var key = function( key )
-	{
-		if ( ! parsed.length )
-		{
-			setUp(); // if the URI has not been parsed yet then do this first...	
-		} 
-		if ( key == "base" )
-		{
-			if ( parsed.port !== null && parsed.port !== "" )
-			{
-				return parsed.protocol+"://"+parsed.host+":"+parsed.port+"/";	
-			}
-			else
-			{
-				return parsed.protocol+"://"+parsed.host+"/";
-			}
-		}
-	
-		return ( parsed[key] === "" ) ? null : parsed[key];
-	};
-	
-	/**
-     * Returns the value of the required query string parameter.
-  	 * 
-	 * @param string item The parameter whose value is required
-     */		
-	var param = function( item )
-	{
-		if ( ! parsed.length )
-		{
-			setUp(); // if the URI has not been parsed yet then do this first...	
-		}
-		return ( parsed.queryKey[item] === null ) ? null : parsed.queryKey[item];
-	};
-
-    /**
-     * 'Constructor' (not really!) function.
-     *  Called whenever the URI changes to kick off re-parsing of the URI and splitting it up into segments. 
-     */	
-	var setUp = function()
-	{
-		parsed = parseUri();
-		
-		getSegments();	
-	};
-	
-    /**
-     * Splits up the body of the URI into segments (i.e. sections delimited by '/')
-     */
-	var getSegments = function()
-	{
-		var p = parsed.path;
-		segments = []; // clear out segments array
-		segments = parsed.path.length == 1 ? {} : ( p.charAt( p.length - 1 ) == "/" ? p.substring( 1, p.length - 1 ) : path = p.substring( 1 ) ).split("/");
-	};
-	
-	return {
-		
-	    /**
-	     * Sets the parsing mode - either strict or loose. Set to loose by default.
-	     *
-	     * @param string mode The mode to set the parser to. Anything apart from a value of 'strict' will set it to loose!
-	     */
-		setMode : function( mode )
-		{
-			strictMode = mode == "strict" ? true : false;
-			return this;
-		},
-		
-		/**
-	     * Sets URI to parse if you don't want to to parse the current page's URI.
-		 * Calling the function with no value for newUri resets it to the current page's URI.
-	     *
-	     * @param string newUri The URI to parse.
-	     */		
-		setUrl : function( newUri )
-		{
-			options.url = newUri === undefined ? window.location : newUri;
-			setUp();
-			return this;
-		},		
-		
-		/**
-	     * Returns the value of the specified URI segment. Segments are numbered from 1 to the number of segments.
-		 * For example the URI http://test.com/about/company/ segment(1) would return 'about'.
-		 *
-		 * If no integer is passed into the function it returns the number of segments in the URI.
-	     *
-	     * @param int pos The position of the segment to return. Can be empty.
-	     */	
-		segment : function( pos )
-		{
-			if ( ! parsed.length )
-			{
-				setUp(); // if the URI has not been parsed yet then do this first...	
-			} 
-			if ( pos === undefined )
-			{
-				return segments.length;
-			}
-			return ( segments[pos] === "" || segments[pos] === undefined ) ? null : segments[pos];
-		},
-		
-		attr : key, // provides public access to private 'key' function - see above
-		
-		param : param // provides public access to private 'param' function - see above
-		
-	};
-	
-}();
-
-
-
-
-$(document).ready(function() {
-  // Configuration for fancy sortable tables for source file groups
-  $('.file_list').dataTable({
-    "aaSorting": [[ 1, "asc" ]],
-    "bPaginate": false,
-    "bJQueryUI": true,
-    "aoColumns": [
-      null,
-      { "sType": "percent" },
-      null,
-      null,
-      null,
-      null,
-      null
-    ]
-  });
-
-  // Syntax highlight all files up front - deactivated
-  // $('.source_table pre code').each(function(i, e) {hljs.highlightBlock(e, '  ')});
-
-  // Syntax highlight source files on first toggle of the file view popup
-  $("a.src_link").click(function() {
-    // Get the source file element that corresponds to the clicked element
-    var source_table = $($(this).attr('href'));
-
-    // If not highlighted yet, do it!
-    if (!source_table.hasClass('highlighted')) {
-      source_table.find('pre code').each(function(i, e) {hljs.highlightBlock(e, '  ')});
-      source_table.addClass('highlighted');
-    };
-  });
-
-  var prev_anchor;
-  var curr_anchor;
-
-  // Set-up of popup for source file views
-  $("a.src_link").colorbox({
-    transition: "none",
-    inline: true,
-    opacity: 1,
-    width: "95%",
-    height: "95%",
-    onLoad: function() {
-      if (prev_anchor) {
-        prev_anchor = jQuery.url.attr('anchor');
-      }
-      curr_anchor = this.href.split('#')[1];
-      window.location.hash = curr_anchor;
-    },
-    onCleanup: function() {
-      if (prev_anchor) {
-        $('a[href="#'+prev_anchor+'"]').click();
-        curr_anchor = prev_anchor;
-      } else {
-        $('.group_tabs a:first').click();
-        prev_anchor = curr_anchor;
-        curr_anchor = "#_AllFiles";
-      }
-      window.location.hash = curr_anchor;
-    }
-  });
-
-  // Hide src files and file list container after load
-  $('.source_files').hide();
-  $('.file_list_container').hide();
-
-  // Add tabs based upon existing file_list_containers
-  $('.file_list_container h2').each(function(){
-    var container_id = $(this).parent().attr('id');
-    var group_name = $(this).find('.group_name').first().html();
-    var covered_percent = $(this).find('.covered_percent').first().html();
-
-    $('.group_tabs').append('<li><a href="#' + container_id + '">' + group_name + ' ('+ covered_percent +')</a></li>');
-  });
-
-  $('.group_tabs a').each( function() {
-    $(this).addClass($(this).attr('href').replace('#', ''));
-  });
-
-  // Make sure tabs don't get ugly focus borders when active
-  $('.group_tabs a').live('focus', function() { $(this).blur(); });
-
-  var favicon_path = $('link[rel="shortcut icon"]').attr('href');
-  $('.group_tabs a').live('click', function(){
-    if (!$(this).parent().hasClass('active')) {
-      $('.group_tabs a').parent().removeClass('active');
-      $(this).parent().addClass('active');
-      $('.file_list_container').hide();
-      $(".file_list_container" + $(this).attr('href')).show();
-      window.location.href = window.location.href.split('#')[0] + $(this).attr('href').replace('#', '#_');
-
-      // Force favicon reload - otherwise the location change containing anchor would drop the favicon...
-      // Works only on firefox, but still... - Anyone know a better solution to force favicon on local file?
-      $('link[rel="shortcut icon"]').remove();
-      $('head').append('<link rel="shortcut icon" type="image/png" href="'+ favicon_path +'" />');
-    };
-    return false;
-  });
-
-  if (jQuery.url.attr('anchor')) {
-    var anchor = jQuery.url.attr('anchor')
-    if (anchor.length == 40) {
-      $('a.src_link[href=#' + anchor + ']').click();
-    } else {
-      $('.group_tabs a.'+anchor.replace('_', '')).click();
-    }
-  } else {
-    $('.group_tabs a:first').click();
-  };
-
-  $("abbr.timeago").timeago();
-  $('#loading').fadeOut();
-  $('#wrapper').show();
-});
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png
deleted file mode 100644
index df13bb6daf7..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/border.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png
deleted file mode 100644
index 65cfd1dc95c..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/controls.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif
deleted file mode 100644
index b4695d811d4..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading.gif and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png
deleted file mode 100644
index 9de11f46719..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/colorbox/loading_background.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png
deleted file mode 100644
index 74db330cd05..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_green.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png
deleted file mode 100644
index fbe093a5511..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_red.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png
deleted file mode 100644
index e53847ea09a..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/favicon_yellow.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif
deleted file mode 100644
index 3596a61f3af..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/loading.gif and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png
deleted file mode 100644
index 6073b9530ed..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/magnify.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index 5b5dab2ab7b..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
deleted file mode 100644
index ac8b229af95..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index ad3d6346e00..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 42ccba269b6..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png
deleted file mode 100644
index 5a46b47cb16..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
deleted file mode 100644
index 86c2baa655e..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
deleted file mode 100644
index 4443fdc1a15..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted file mode 100644
index 7c9fa6c6edc..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png
deleted file mode 100644
index b273ff111d2..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 09d1cdc856c..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png
deleted file mode 100644
index 59bd45b907c..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png
deleted file mode 100644
index 6d02426c114..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index 2ab019b73ec..00000000000
Binary files a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/assets/0.8.0/smoothness/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html
deleted file mode 100644
index 3416ca7e30a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/coverage/index.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html xmlns='http://www.w3.org/1999/xhtml'>
-  <head>
-    <title>Code coverage for Facter</title>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <script src='./assets/0.8.0/application.js' type='text/javascript'></script>    
-    <link href='./assets/0.8.0/application.css' media='screen, projection, print' rel='stylesheet' type='text/css'>
-    <link rel="shortcut icon" type="image/png" href="./assets/0.8.0/favicon_green.png" />
-    <link rel="icon" type="image/png" href="./assets/0.8.0/favicon.png" />
-  </head>
-  
-  <body>
-    <div id="loading">
-      <img src="./assets/0.8.0/loading.gif" alt="loading"/>
-    </div>
-    <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2014-04-22T23:02:33+02:00">2014-04-22T23:02:33+02:00</abbr></div>
-      <ul class="group_tabs"></ul>
-
-      <div id="content">
-        <div class="file_list_container" id="AllFiles">
-  <h2>
-    <span class="group_name">All Files</span>
-    (<span class="covered_percent"><span class="green">100.0%</span></span>
-     covered at
-     <span class="covered_strength">
-       <span class="red">
-         0.0
-       </span>
-    </span> hits/line)
-  </h2>
-  <a name="AllFiles"></a>
-  <div>
-    <b>0</b> files in total.
-    <b>0.0</b> relevant lines. 
-    <span class="green"><b>0.0</b> lines covered</span> and
-    <span class="red"><b>0.0</b> lines missed </span>
-  </div>
-  <table class="file_list">
-    <thead>
-      <tr>
-        <th>File</th>
-        <th>% covered</th>
-        <th>Lines</th>
-        <th>Relevant Lines</th>
-        <th>Lines covered</th>
-        <th>Lines missed</th>
-        <th>Avg. Hits / Line</th>
-      </tr>
-    </thead>
-    <tbody>
-      
-    </tbody>
-  </table>
-</div>
-
-
-        
-      </div>
-    
-      <div id="footer">
-        Generated by <a href="http://github.com/colszowka/simplecov">simplecov</a> v0.8.2 
-        and simplecov-html v0.8.0<br/>
-        using RSpec
-      </div>
-    
-      <div class="source_files">
-      
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb
deleted file mode 100755
index 2fb72b29efb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/facter_dot_d_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'facter/facter_dot_d'
-
-describe Facter::Util::DotD do
-
-  context 'returns a simple fact' do
-    before :each do
-      Facter.stubs(:version).returns('1.6.1')
-      subject.stubs(:entries).returns(['/etc/facter/facts.d/fake_fact.txt'])
-      File.stubs(:readlines).with('/etc/facter/facts.d/fake_fact.txt').returns(['fake_fact=fake fact'])
-      subject.create
-    end
-
-    it 'should return successfully' do
-      Facter.fact(:fake_fact).value.should == 'fake fact'
-    end
-  end
-
-  context 'returns a fact with equals signs' do
-    before :each do
-      Facter.stubs(:version).returns('1.6.1')
-      subject.stubs(:entries).returns(['/etc/facter/facts.d/foo.txt'])
-      File.stubs(:readlines).with('/etc/facter/facts.d/foo.txt').returns(['foo=1+1=2'])
-      subject.create
-    end
-
-    it 'should return successfully' do
-      Facter.fact(:foo).value.should == '1+1=2'
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb
deleted file mode 100755
index 931c6d4b0a3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/pe_version_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env rspec
-
-require 'spec_helper'
-
-describe "PE Version specs" do
-  before :each do
-    # Explicitly load the pe_version.rb file which contains generated facts
-    # that cannot be automatically loaded.  Puppet 2.x implements
-    # Facter.collection.load while Facter 1.x markes Facter.collection.load as
-    # a private method.
-    if Facter.collection.respond_to? :load
-      Facter.collection.load(:pe_version)
-    else
-      Facter.collection.loader.load(:pe_version)
-    end
-  end
-
-  context "If PE is installed" do
-    %w{ 2.6.1 2.10.300 }.each do |version|
-      puppetversion = "2.7.19 (Puppet Enterprise #{version})"
-      context "puppetversion => #{puppetversion}" do
-        before :each do
-          Facter.fact(:puppetversion).stubs(:value).returns(puppetversion)
-        end
-
-        (major,minor,patch) = version.split(".")
-
-        it "Should return true" do
-          Facter.fact(:is_pe).value.should == true
-        end
-
-        it "Should have a version of #{version}" do
-          Facter.fact(:pe_version).value.should == version
-        end
-
-        it "Should have a major version of #{major}" do
-          Facter.fact(:pe_major_version).value.should == major
-        end
-
-        it "Should have a minor version of #{minor}" do
-          Facter.fact(:pe_minor_version).value.should == minor
-        end
-
-        it "Should have a patch version of #{patch}" do
-          Facter.fact(:pe_patch_version).value.should == patch
-        end
-      end
-    end
-  end
-
-  context "When PE is not installed" do
-    before :each do
-      Facter.fact(:puppetversion).stubs(:value).returns("2.7.19")
-    end
-
-    it "is_pe is false" do
-      Facter.fact(:is_pe).value.should == false
-    end
-
-    it "pe_version is nil" do
-      Facter.fact(:pe_version).value.should be_nil
-    end
-
-    it "pe_major_version is nil" do
-      Facter.fact(:pe_major_version).value.should be_nil
-    end
-
-    it "pe_minor_version is nil" do
-      Facter.fact(:pe_minor_version).value.should be_nil
-    end
-
-    it "Should have a patch version" do
-      Facter.fact(:pe_patch_version).value.should be_nil
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb
deleted file mode 100755
index 73eb3eada8c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/root_home_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'facter/root_home'
-
-describe Facter::Util::RootHome do
-  context "solaris" do
-    let(:root_ent) { "root:x:0:0:Super-User:/:/sbin/sh" }
-    let(:expected_root_home) { "/" }
-
-    it "should return /" do
-      Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(root_ent)
-      Facter::Util::RootHome.get_root_home.should == expected_root_home
-    end
-  end
-  context "linux" do
-    let(:root_ent) { "root:x:0:0:root:/root:/bin/bash" }
-    let(:expected_root_home) { "/root" }
-
-    it "should return /root" do
-      Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(root_ent)
-      Facter::Util::RootHome.get_root_home.should == expected_root_home
-    end
-  end
-  context "windows" do
-    before :each do
-      Facter::Util::Resolution.expects(:exec).with("getent passwd root").returns(nil)
-    end
-    it "should be nil on windows" do
-      Facter::Util::RootHome.get_root_home.should be_nil
-    end
-  end
-end
-
-describe 'root_home', :type => :fact do
-  before { Facter.clear }
-  after { Facter.clear }
-
-  context "macosx" do
-    before do
-      Facter.fact(:kernel).stubs(:value).returns("Darwin")
-      Facter.fact(:osfamily).stubs(:value).returns("Darwin")
-    end
-    let(:expected_root_home) { "/var/root" }
-    sample_dscacheutil = File.read(fixtures('dscacheutil','root'))
-
-    it "should return /var/root" do
-      Facter::Util::Resolution.stubs(:exec).with("dscacheutil -q user -a name root").returns(sample_dscacheutil)
-      Facter.fact(:root_home).value.should == expected_root_home
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb
deleted file mode 100755
index e77779bae14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/facter/util/puppet_settings_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'facter/util/puppet_settings'
-
-describe Facter::Util::PuppetSettings do
-
-  describe "#with_puppet" do
-    context "Without Puppet loaded" do
-      before(:each) do
-        Module.expects(:const_get).with("Puppet").raises(NameError)
-      end
-
-      it 'should be nil' do
-        subject.with_puppet { Puppet[:vardir] }.should be_nil
-      end
-      it 'should not yield to the block' do
-        Puppet.expects(:[]).never
-        subject.with_puppet { Puppet[:vardir] }.should be_nil
-      end
-    end
-    context "With Puppet loaded" do
-      module Puppet; end
-      let(:vardir) { "/var/lib/puppet" }
-
-      before :each do
-        Puppet.expects(:[]).with(:vardir).returns vardir
-      end
-      it 'should yield to the block' do
-        subject.with_puppet { Puppet[:vardir] }
-      end
-      it 'should return the nodes vardir' do
-        subject.with_puppet { Puppet[:vardir] }.should eq vardir
-      end
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb
deleted file mode 100755
index a016b685c35..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/provider/file_line/ruby_spec.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'tempfile'
-provider_class = Puppet::Type.type(:file_line).provider(:ruby)
-describe provider_class do
-  context "when adding" do
-    let :tmpfile do
-      tmp = Tempfile.new('tmp')
-      path = tmp.path
-      tmp.close!
-      path
-    end
-    let :resource do
-      Puppet::Type::File_line.new(
-        {:name => 'foo', :path => tmpfile, :line => 'foo'}
-      )
-    end
-    let :provider do
-      provider_class.new(resource)
-    end
-
-    it 'should detect if the line exists in the file' do
-      File.open(tmpfile, 'w') do |fh|
-        fh.write('foo')
-      end
-      provider.exists?.should be_true
-    end
-    it 'should detect if the line does not exist in the file' do
-      File.open(tmpfile, 'w') do |fh|
-        fh.write('foo1')
-      end
-      provider.exists?.should be_nil
-    end
-    it 'should append to an existing file when creating' do
-      provider.create
-      File.read(tmpfile).chomp.should == 'foo'
-    end
-  end
-
-  context "when matching" do
-    before :each do
-      # TODO: these should be ported over to use the PuppetLabs spec_helper
-      #  file fixtures once the following pull request has been merged:
-      # https://github.com/puppetlabs/puppetlabs-stdlib/pull/73/files
-      tmp = Tempfile.new('tmp')
-      @tmpfile = tmp.path
-      tmp.close!
-      @resource = Puppet::Type::File_line.new(
-          {
-           :name => 'foo',
-           :path => @tmpfile,
-           :line => 'foo = bar',
-           :match => '^foo\s*=.*$',
-          }
-      )
-      @provider = provider_class.new(@resource)
-    end
-
-    describe 'using match' do
-      it 'should raise an error if more than one line matches, and should not have modified the file' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz")
-        end
-        @provider.exists?.should be_nil
-        expect { @provider.create }.to raise_error(Puppet::Error, /More than one line.*matches/)
-        File.read(@tmpfile).should eql("foo1\nfoo=blah\nfoo2\nfoo=baz")
-      end
-
-      it 'should replace all lines that matches' do
-        @resource = Puppet::Type::File_line.new(
-          {
-            :name => 'foo',
-            :path => @tmpfile,
-            :line => 'foo = bar',
-            :match => '^foo\s*=.*$',
-            :multiple => true
-          }
-        )
-        @provider = provider_class.new(@resource)
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo=blah\nfoo2\nfoo=baz")
-        end
-        @provider.exists?.should be_nil
-        @provider.create
-        File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2\nfoo = bar")
-      end
-
-      it 'should raise an error with invalid values' do
-        expect {
-          @resource = Puppet::Type::File_line.new(
-            {
-              :name => 'foo',
-              :path => @tmpfile,
-              :line => 'foo = bar',
-              :match => '^foo\s*=.*$',
-              :multiple => 'asgadga'
-            }
-          )
-        }.to raise_error(Puppet::Error, /Invalid value "asgadga"\. Valid values are true, false\./)
-      end
-
-      it 'should replace a line that matches' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo=blah\nfoo2")
-        end
-        @provider.exists?.should be_nil
-        @provider.create
-        File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2")
-      end
-      it 'should add a new line if no lines match' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo2")
-        end
-        @provider.exists?.should be_nil
-        @provider.create
-        File.read(@tmpfile).should eql("foo1\nfoo2\nfoo = bar\n")
-      end
-      it 'should do nothing if the exact line already exists' do
-        File.open(@tmpfile, 'w') do |fh|
-          fh.write("foo1\nfoo = bar\nfoo2")
-        end
-        @provider.exists?.should be_true
-        @provider.create
-        File.read(@tmpfile).chomp.should eql("foo1\nfoo = bar\nfoo2")
-      end
-    end
-
-    describe 'using after' do
-      let :resource do
-        Puppet::Type::File_line.new(
-          {
-            :name  => 'foo',
-            :path  => @tmpfile,
-            :line  => 'inserted = line',
-            :after => '^foo1',
-          }
-        )
-      end
-
-      let :provider do
-        provider_class.new(resource)
-      end
-
-      context 'with one line matching the after expression' do
-        before :each do
-          File.open(@tmpfile, 'w') do |fh|
-            fh.write("foo1\nfoo = blah\nfoo2\nfoo = baz")
-          end
-        end
-
-        it 'inserts the specified line after the line matching the "after" expression' do
-          provider.create
-          File.read(@tmpfile).chomp.should eql("foo1\ninserted = line\nfoo = blah\nfoo2\nfoo = baz")
-        end
-      end
-
-      context 'with two lines matching the after expression' do
-        before :each do
-          File.open(@tmpfile, 'w') do |fh|
-            fh.write("foo1\nfoo = blah\nfoo2\nfoo1\nfoo = baz")
-          end
-        end
-
-        it 'errors out stating "One or no line must match the pattern"' do
-          expect { provider.create }.to raise_error(Puppet::Error, /One or no line must match the pattern/)
-        end
-      end
-
-      context 'with no lines matching the after expression' do
-        let :content do
-          "foo3\nfoo = blah\nfoo2\nfoo = baz\n"
-        end
-
-        before :each do
-          File.open(@tmpfile, 'w') do |fh|
-            fh.write(content)
-          end
-        end
-
-        it 'appends the specified line to the file' do
-          provider.create
-          File.read(@tmpfile).should eq(content << resource[:line] << "\n")
-        end
-      end
-    end
-  end
-
-  context "when removing" do
-    before :each do
-      # TODO: these should be ported over to use the PuppetLabs spec_helper
-      #  file fixtures once the following pull request has been merged:
-      # https://github.com/puppetlabs/puppetlabs-stdlib/pull/73/files
-      tmp = Tempfile.new('tmp')
-      @tmpfile = tmp.path
-      tmp.close!
-      @resource = Puppet::Type::File_line.new(
-        {:name => 'foo', :path => @tmpfile, :line => 'foo', :ensure => 'absent' }
-      )
-      @provider = provider_class.new(@resource)
-    end
-    it 'should remove the line if it exists' do
-      File.open(@tmpfile, 'w') do |fh|
-        fh.write("foo1\nfoo\nfoo2")
-      end
-      @provider.destroy
-      File.read(@tmpfile).should eql("foo1\nfoo2")
-    end
-
-    it 'should remove the line without touching the last new line' do
-      File.open(@tmpfile, 'w') do |fh|
-        fh.write("foo1\nfoo\nfoo2\n")
-      end
-      @provider.destroy
-      File.read(@tmpfile).should eql("foo1\nfoo2\n")
-    end
-
-    it 'should remove any occurence of the line' do
-      File.open(@tmpfile, 'w') do |fh|
-        fh.write("foo1\nfoo\nfoo2\nfoo\nfoo")
-      end
-      @provider.destroy
-      File.read(@tmpfile).should eql("foo1\nfoo2\n")
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb
deleted file mode 100755
index f92065f79ba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/anchor_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'spec_helper'
-
-anchor = Puppet::Type.type(:anchor).new(:name => "ntp::begin")
-
-describe anchor do
-  it "should stringify normally" do
-    anchor.to_s.should == "Anchor[ntp::begin]"
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
deleted file mode 100755
index ab5b81bb96b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/spec/unit/puppet/type/file_line_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /usr/bin/env ruby -S rspec
-require 'spec_helper'
-require 'tempfile'
-describe Puppet::Type.type(:file_line) do
-  let :file_line do
-    Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path')
-  end
-  it 'should accept a line and path' do
-    file_line[:line] = 'my_line'
-    file_line[:line].should == 'my_line'
-    file_line[:path] = '/my/path'
-    file_line[:path].should == '/my/path'
-  end
-  it 'should accept a match regex' do
-    file_line[:match] = '^foo.*$'
-    file_line[:match].should == '^foo.*$'
-  end
-  it 'should not accept a match regex that does not match the specified line' do
-    expect {
-      Puppet::Type.type(:file_line).new(
-          :name   => 'foo',
-          :path   => '/my/path',
-          :line   => 'foo=bar',
-          :match  => '^bar=blah$'
-    )}.to raise_error(Puppet::Error, /the value must be a regex that matches/)
-  end
-  it 'should accept a match regex that does match the specified line' do
-    expect {
-      Puppet::Type.type(:file_line).new(
-          :name   => 'foo',
-          :path   => '/my/path',
-          :line   => 'foo=bar',
-          :match  => '^\s*foo=.*$'
-      )}.not_to raise_error
-  end
-  it 'should accept posix filenames' do
-    file_line[:path] = '/tmp/path'
-    file_line[:path].should == '/tmp/path'
-  end
-  it 'should not accept unqualified path' do
-    expect { file_line[:path] = 'file' }.to raise_error(Puppet::Error, /File paths must be fully qualified/)
-  end
-  it 'should require that a line is specified' do
-    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => '/tmp/file') }.to raise_error(Puppet::Error, /Both line and path are required attributes/)
-  end
-  it 'should require that a file is specified' do
-    expect { Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'path') }.to raise_error(Puppet::Error, /Both line and path are required attributes/)
-  end
-  it 'should default to ensure => present' do
-    file_line[:ensure].should eq :present
-  end
-
-  it "should autorequire the file it manages" do
-    catalog = Puppet::Resource::Catalog.new
-    file = Puppet::Type.type(:file).new(:name => "/tmp/path")
-    catalog.add_resource file
-    catalog.add_resource file_line
-
-    relationship = file_line.autorequire.find do |rel|
-      (rel.source.to_s == "File[/tmp/path]") and (rel.target.to_s == file_line.to_s)
-    end
-    relationship.should be_a Puppet::Relationship
-  end
-
-  it "should not autorequire the file it manages if it is not managed" do
-    catalog = Puppet::Resource::Catalog.new
-    catalog.add_resource file_line
-    file_line.autorequire.should be_empty
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp
deleted file mode 100644
index eea693e15ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/file_line.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is a simple smoke test
-# of the file_line resource type.
-file { '/tmp/dansfile':
-  ensure => present
-}->
-file_line { 'dans_line':
-  line => 'dan is awesome',
-  path => '/tmp/dansfile',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp
deleted file mode 100644
index e1f1353cdd9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_interface_with.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-include stdlib
-info('has_interface_with(\'lo\'):', has_interface_with('lo'))
-info('has_interface_with(\'loX\'):', has_interface_with('loX'))
-info('has_interface_with(\'ipaddress\', \'127.0.0.1\'):', has_interface_with('ipaddress', '127.0.0.1'))
-info('has_interface_with(\'ipaddress\', \'127.0.0.100\'):', has_interface_with('ipaddress', '127.0.0.100'))
-info('has_interface_with(\'network\', \'127.0.0.0\'):', has_interface_with('network', '127.0.0.0'))
-info('has_interface_with(\'network\', \'128.0.0.0\'):', has_interface_with('network', '128.0.0.0'))
-info('has_interface_with(\'netmask\', \'255.0.0.0\'):', has_interface_with('netmask', '255.0.0.0'))
-info('has_interface_with(\'netmask\', \'256.0.0.0\'):', has_interface_with('netmask', '256.0.0.0'))
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp
deleted file mode 100644
index 8429a885539..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_address.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-include stdlib
-info('has_ip_address(\'192.168.1.256\'):', has_ip_address('192.168.1.256'))
-info('has_ip_address(\'127.0.0.1\'):', has_ip_address('127.0.0.1'))
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp
deleted file mode 100644
index a15d8c011b6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/has_ip_network.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-include stdlib
-info('has_ip_network(\'127.0.0.0\'):', has_ip_network('127.0.0.0'))
-info('has_ip_network(\'128.0.0.0\'):', has_ip_network('128.0.0.0'))
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp
deleted file mode 100644
index 9675d8374b5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/stdlib/tests/init.pp
+++ /dev/null
@@ -1 +0,0 @@
-include stdlib
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml
deleted file mode 100644
index 15f96922e01..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.fixtures.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-fixtures:
-  repositories:
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
-    concat: "git://github.com/puppetlabs/puppetlabs-concat"
-  symlinks:
-    supervisord: "#{source_dir}"
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml
deleted file mode 100644
index c9a6e5a3e24..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.nodeset.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-default_set: 'centos-64-x64'
-sets:
-  'centos-59-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-59-x64'
-  'centos-64-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'centos-64-x64'
-  'debian-607-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-607-x64'
-  'debian-70rc1-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'debian-70rc1-x64'
-  'ubuntu-server-10044-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-10044-x64'
-  'ubuntu-server-12042-x64':
-    nodes:
-      "main.foo.vm":
-        prefab: 'ubuntu-server-12042-x64'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml
deleted file mode 100644
index 6e544518c19..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec lint"
-rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-env:
-  matrix:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.3.0"
-  - PUPPET_GEM_VERSION="~> 3.4.0"
-matrix:
-  exclude:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
-
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog
deleted file mode 100644
index ab4faa445ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Changelog
+++ /dev/null
@@ -1,50 +0,0 @@
-2013-10-31 - v0.2.3
-
-Fixes:
-
-- Fixed large bug on debian wheezy where /var/run is changed from a symlink to a 
-  directory causing all pids to be inaccessible breaking lots of services
-
-
-2013-10-30 - v0.2.2
-
-Fixes:
-
-- Fixed syntax error in README examples and tests
-
-2013-10-16 - v0.2.1
-
-Fixes:
-
-- Fixed user params in templates
-- Added missing environment support in main supervisord.conf
-
-
-2013-10-15 - v0.2.0
-
-Feature complete release
-
-- Added Eventlistener template and function
-- Added FGCI-Program template and function
-- More consistent log naming and fixed missing new lines
-
-
-2013-10-15 - v0.1.1
-
-Fixes:
-
-- Missing '=' in template tags when using certain parameters
-- Added log file default to program define to avoid /tmp being used when not specified
-- Fixed logic when not using environment variables in program
-
-
-2013-10-15 - v0.1.0
-
-Summary:
-
-Completed basic module functionality for
-
-- Install with pip
-- Configure programs
-- Configure groups
-- Install init scripts for RedHat and Debian families 
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile
deleted file mode 100644
index 8612255f5b8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Gemfile
+++ /dev/null
@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake'
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-system-puppet', '~> 2.0'
-  gem 'puppet-lint', '~> 0.3.2'
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile
deleted file mode 100644
index 4a0552115da..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name    'ajcrowe-supervisord'
-version '0.2.3'
-source 'git@github.com/ajcrowe/puppet-supervisord.git'
-author 'Alex Crowe'
-license 'Apache License, Version 2.0'
-summary 'supervisord class and functions'
-description 'supervisord class and functions'
-project_page 'https://github.com/ajcrowe/puppet-supervisord'
-
-dependency 'puppetlabs/concat', '>= 1.0.0 <2.0.0'
-dependency 'puppetlabs/stdlib', '>= 4.1.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md
deleted file mode 100644
index a8419a09082..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Puppet Supervisord
-
-[![Build Status](https://travis-ci.org/ajcrowe/puppet-supervisord.png?branch=master)](https://travis-ci.org/ajcrowe/puppet-supervisord)
-
-Puppet module to manage the [supervisord](http://supervisord.org/) process control system.
-
-Functions available to configure 
-
-* [programs](http://supervisord.org/configuration.html#program-x-section-settings)
-* [groups](http://supervisord.org/configuration.html#group-x-section-settings)
-* [fcgi-programs](http://supervisord.org/configuration.html#fcgi-program-x-section-settings)
-* [eventlisteners](http://supervisord.org/configuration.html#eventlistener-x-section-settings)
-
-## Examples
-
-### Configuring supervisord with defaults
-
-Install supervisord with pip and install an init script if available
-
-```ruby
-include supervisord
-```
-
-### Install supervisord and pip
-
-Install supervisord and install pip if not available.
-
-```ruby
-class supervisord {
-  $install_pip  => true,
-}
-```
-
-This will download [setuptool](https://bitbucket.org/pypa/setuptools) and install pip with easy_install. 
-
-You can pass a specific url with `$setuptools_url = 'url'`
-
-Note: Only Debian and RedHat families have an init script currently.
-
-### Configure a program
-
-```ruby
-supervisord::program { 'myprogram':
-  command     => 'command --args',
-  priority    => '100',
-  environment => {
-    'HOME'   => '/home/myuser',
-    'PATH'   => '/bin:/sbin:/usr/bin:/usr/sbin',
-    'SECRET' => 'mysecret'
-  }
-}
-```
-
-You may also specify a variable for a hiera lookup to retreive your environment hash. This allows you to reuse existing environment variable hashes.
-
-```ruby
-supervisord::program { 'myprogram':
-  command  => 'command --args',
-  priority => '100',
-  env_var  => 'my_common_envs'
-}
-```
-
-### Configure a group
-
-```ruby
-supervisord::group { 'mygroup':
-  priority => 100,
-  program  => ['program1', 'program2', 'program3']
-}
-```
-
-### Development
-
-If you have suggestions or improvements please file an issue or pull request, i'll try and sort them as quickly as possble.
-
-If you submit a pull please try and include tests for the new functionality. The module is tested with [Travis-CI](https://travis-ci.org/ajcrowe/puppet-supervisord).
-
-
-### Credits
-
-* Debian init script sourced from the system package.
-* RedHat/Centos init script sourced from https://github.com/Supervisor/initscripts 
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile
deleted file mode 100644
index e00f7d11877..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/Rakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-require 'rspec-system/rake_task'
-
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_documentation')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb
deleted file mode 100644
index cfa52b2bbf2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/array2csv.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Converts the array to a csv string
-#
-#
-# $array = [ 'string1', 'string2', 'string3' ]
-#
-# becomes:
-#
-# $string = "string1,string2,string3"
-#
-
-module Puppet::Parser::Functions
-  newfunction(:array2csv, :type => :rvalue, :doc => <<-'EOS'
-    Returns a sorted csv formatted string from an array in the form
-    VALUE1,VALUE2,VALUE3
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "array2csv(): Wrong number of arguments " +
-      "given (#{args.size} of 1)") if args.size < 1
-
-    array = args[0]
-
-    unless array.is_a?(Array)
-      raise(Puppet::ParseError, 'array2csv(): Requires an Array')
-    end
-
-    sorted_array = array.sort
-    result = ''
-
-    sorted_array.each {|value|
-      result += "#{value},"
-    }
-
-    return result.chop!
-    
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb
deleted file mode 100644
index 6098b67367d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/lib/puppet/parser/functions/hash2csv.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Converts the hash to a csv string
-#
-#
-# $hash = {
-#   HOME   => '/home/user',
-#   ENV1   => 'env1',
-#   SECRET => 'secret'	
-# }
-#
-# becomes:
-#
-# $string = "HOME='/home/user',ENV1='env1',SECRET='secret'"
-#
-
-module Puppet::Parser::Functions
-  newfunction(:hash2csv, :type => :rvalue, :doc => <<-'EOS'
-    Returns a csv formatted string from an hash in the form
-    KEY=VALUE,KEY2=VALUE2,KEY3=VALUE3 ordered by key
-    EOS
-  ) do |args|
-
-    raise(Puppet::ParseError, "hash2csv(): Wrong number of arguments " +
-      "given (#{args.size} of 1)") if args.size < 1
-
-    hash = args[0]
-
-    unless hash.is_a?(Hash)
-      raise(Puppet::ParseError, 'hash2csv(): Requires an Hash')
-    end
-
-    sorted_hash = hash.sort
-    result = ''
-
-    sorted_hash.each {|key, value|
-      result += "#{key}='#{value}',"
-    }
-
-    return result.chop!
-
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp
deleted file mode 100644
index cc8b1ee49d0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/config.pp
+++ /dev/null
@@ -1,66 +0,0 @@
-class supervisord::config inherits supervisord {
-
-  file { [ "${supervisord::config_include}", "${supervisord::log_path}"]:
-    ensure => directory,
-    owner  => 'root',
-    mode   => '0755'
-  }
-
-  if $supervisord::run_path != '/var/run' {
-    file { $supervisord::run_path:
-      ensure => directory,
-      owner  => 'root',
-      mode   => '0755'
-    }
-  }
-
-  if $supervisord::install_init {
-
-    $osname = downcase($::osfamily)
-
-    file { '/etc/init.d/supervisord':
-      ensure  => present,
-      owner   => 'root',
-      mode    => '0755',
-      content => template("supervisord/init/${osname}_init.erb")
-    }
-
-    if $supervisord::init_extras {
-      file { $supervisord::init_extras:
-        ensure  => present,
-        owner   => 'root',
-        mode    => '0755',
-        content => template("supervisord/init/${osname}_extra.erb")
-      }
-    }
-
-  }
-
-  concat { $supervisord::config_file:
-    owner => 'root',
-    group => 'root',
-    mode  => '0755'
-  }
-
-  if $supervisord::unix_socket {
-    concat::fragment { 'supervisord_unix':
-      target  => $supervisord::config_file,
-      content => template('supervisord/supervisord_unix.erb'),
-      order   => 01
-    }
-  }
-
-  if $supervisord::inet_server {
-    concat::fragment { 'supervisord_inet':
-      target  => $supervisord::config_file,
-      content => template('supervisord/supervisord_inet.erb'),
-      order   => 01
-    }
-  }
-
-  concat::fragment { 'supervisord_main':
-    target  => $supervisord::config_file,
-    content => template('supervisord/supervisord_main.erb'),
-    order   => 02
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp
deleted file mode 100644
index 41b7cf6c730..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/eventlistener.pp
+++ /dev/null
@@ -1,60 +0,0 @@
-define supervisord::eventlistener(
-  $command,
-  $ensure                  = present,
-  $events                  = undef,
-  $buffer_size             = undef,
-  $result_handler          = undef,
-  $env_var                 = undef,
-  $process_name            = undef,
-  $numprocs                = undef,
-  $numprocs_start          = undef,
-  $priority                = undef,
-  $autostart               = undef,
-  $autorestart             = undef,
-  $startsecs               = undef,
-  $startretries            = undef,
-  $exitcodes               = undef,
-  $stopsignal              = undef,
-  $stopwaitsec             = undef,
-  $stopasgroup             = undef,
-  $killasgroup             = undef,
-  $user                    = undef,
-  $redirect_stderr         = undef,
-  $stdout_logfile          = "${supervisord::log_path}/eventlistener_${name}.log",
-  $stdout_logfile_maxbytes = undef,
-  $stdout_logfile_backups  = undef,
-  $stdout_events_enabled   = undef,
-  $stderr_logfile          = "${supervisord::log_path}/eventlistener_${name}.error",
-  $stderr_logfile_maxbytes = undef,
-  $stderr_logfile_backups  = undef,
-  $stderr_events_enabled   = undef,
-  $environment             = undef,
-  $directory               = undef,
-  $umask                   = undef,
-  $serverurl               = undef
-) {
-
-  include supervisord
-
-  if $env_var {
-    $env_hash = hiera($env_var)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    $env_string = hash2csv($environment)
-  }
-
-  if $events {
-    $events_string = array2csv($events)
-  }
-
-  $conf = "${supervisord::config_include}/eventlistener_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/eventlistener.erb'),
-    notify  => Class['supervisord::service']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp
deleted file mode 100644
index 923b1798bff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/fcgi_program.pp
+++ /dev/null
@@ -1,58 +0,0 @@
-define supervisord::fcgi_program(
-  $command,
-  $socket,
-  $ensure                  = present,
-  $socket_owner            = undef,
-  $socket_mode             = undef,
-  $env_var                 = undef,
-  $process_name            = undef,
-  $numprocs                = undef,
-  $numprocs_start          = undef,
-  $priority                = undef,
-  $autostart               = undef,
-  $autorestart             = undef,
-  $startsecs               = undef,
-  $startretries            = undef,
-  $exitcodes               = undef,
-  $stopsignal              = undef,
-  $stopwaitsec             = undef,
-  $stopasgroup             = undef,
-  $killasgroup             = undef,
-  $user                    = undef,
-  $redirect_stderr         = undef,
-  $stdout_logfile          = "${supervisord::log_path}/fcgi-program_${name}.log",
-  $stdout_logfile_maxbytes = undef,
-  $stdout_logfile_backups  = undef,
-  $stdout_capture_maxbytes = undef,
-  $stdout_events_enabled   = undef,
-  $stderr_logfile          = "${supervisord::log_path}/fcgi-program_${name}.error",
-  $stderr_logfile_maxbytes = undef,
-  $stderr_logfile_backups  = undef,
-  $stderr_capture_maxbytes = undef,
-  $stderr_events_enabled   = undef,
-  $environment             = undef,
-  $directory               = undef,
-  $umask                   = undef,
-  $serverurl               = undef
-) {
-
-  include supervisord
-
-  if $env_var {
-    $env_hash = hiera($env_var)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    $env_string = hash2csv($environment)
-  }
-
-  $conf = "${supervisord::config_include}/fcgi-program_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/fcgi_program.erb'),
-    notify  => Class['supervisord::service']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp
deleted file mode 100644
index 0f6b1ca2adc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/group.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-define supervisord::group (
-  $programs,
-  $ensure   = present,
-  $priority = undef
-) {
-
-  include supervisord
-
-  $progstring = array2csv($programs)
-  $conf = "${supervisord::config_include}/group_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/group.erb')
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp
deleted file mode 100644
index 801c46b3b36..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/init.pp
+++ /dev/null
@@ -1,72 +0,0 @@
-# This class installs supervisord and configured it to run on boot
-class supervisord(
-  $package_ensure       = $supervisord::params::package_ensure,
-  $service_ensure       = $supervisord::params::service_ensure,
-  $install_init         = $supervisord::params::install_init,
-  $install_pip          = false,
-  $init_extras          = $supervisord::params::init_extras,
-  $setuptools_url       = $supervisord::params::setuptools_url,
-  $executable           = $supervisord::params::executable,
-
-  $log_path             = $supervisord::params::log_path,
-  $log_file             = $supervisord::params::log_file,
-  $log_level            = $supervisord::params::log_level,
-  $logfile_maxbytes     = $supervisord::params::logfile_maxbytes,
-  $logfile_backups      = $supervisord::params::logfile_backups,
-
-  $run_path             = $supervisord::params::run_path,
-  $pid_file             = $supervisord::params::pid_file,
-  $nodaemon             = $supervisord::params::nodaemon,
-  $minfds               = $supervisord::params::minfds,
-  $minprocs             = $supervisord::params::minprocs,
-  $config_path          = $supervisord::params::config_path,
-  $config_include       = $supervisord::params::config_include,
-  $config_file          = $supervisord::params::config_file,
-  $umask                = $supervisord::params::umask,
-
-  $unix_socket          = $supervisord::params::unix_socket,
-  $unix_socket_file     = $supervisord::params::unix_socket_file,
-  $unix_socket_mode     = $supervisord::params::unix_socket_mode,
-  $unix_socket_owner    = $supervisord::params::unix_socket_owner,
-  $unix_scoket_group    = $supervisord::params::unix_socket_group,
-
-  $inet_server          = $supervisord::params::inet_server,
-  $inet_server_hostname = $supervisord::params::inet_hostname,
-  $inet_server_port     = $supervisord::params::inet_port,
-
-  $unix_auth            = false,
-  $unix_username        = undef,
-  $unix_password        = undef,
-
-  $inet_auth            = false,
-  $inet_username        = undef,
-  $inet_password        = undef,
-
-  $user                 = undef,
-  $identifier           = undef,
-  $childlogdir          = undef,
-  $environment          = undef,
-  $env_var              = undef,
-  $strip_ansi           = false,
-  $nocleanup            = false
-
-) inherits supervisord::params {
-
-  if $env_var {
-    $env_hash = hiera($env_var)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    $env_string = hash2csv($environment)
-  }
-
-  if $install_pip {
-    include supervisord::pip
-    Class['supervisord::pip'] -> Class['supervisord::install']
-  }
-
-  include supervisord::install, supervisord::config, supervisord::service
-
-  Class['supervisord::install'] -> Class['supervisord::config'] ~> Class['supervisord::service']
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp
deleted file mode 100644
index 1d36ec68334..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/install.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class supervisord::install inherits supervisord {
-  package { 'supervisor':
-    ensure   => $supervisord::package_ensure,
-    provider => 'pip'
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp
deleted file mode 100644
index 87d17d16179..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/params.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-class supervisord::params {
-  $package_ensure       = 'installed'
-  $service_ensure       = 'running'
-  $package_name         = 'supervisor'
-  $executable           = '/usr/local/bin/supervisord'
-
-  $run_path             = '/var/run'
-  $pid_file             = "${run_path}/supervisord.pid"
-  $log_path             = '/var/log/supervisor'
-  $log_file             = "${log_path}/supervisord.log"
-  $logfile_maxbytes     = '50MB'
-  $logfile_backups      = '10'
-  $log_level            = 'info'
-  $nodaemon             = false
-  $minfds               = '1024'
-  $minprocs             = '200'
-  $umask                = '022'
-  $config_include       = '/etc/supervisor.d'
-  $config_file          = '/etc/supervisord.conf'
-  $setuptools_url       = 'https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py'
-
-  $unix_socket          = true
-  $unix_socket_file     = "${run_path}/supervisor.sock"
-  $unix_socket_mode     = '0700'
-  $unix_socket_owner    = 'nobody'
-
-  $inet_server          = false
-  $inet_server_hostname = '127.0.0.1'
-  $inet_server_port     = '9001'
-  $inet_auth            = false
-
-  case $::osfamily {
-    'RedHat': {
-      $init_extras       = '/etc/sysconfig/supervisord'
-      $unix_socket_group = 'nobody'
-      $install_init      = true
-    }
-    'Debian': {
-      $init_extras       = '/etc/default/supervisor'
-      $unix_socket_group = 'nogroup'
-      $install_init      = true
-    }
-    default:  {
-      $init_extras       = false
-      $unix_socket_group = 'nogroup'
-      $install_init      = false
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp
deleted file mode 100644
index c05f2d7f64b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/pip.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-class supervisord::pip inherits supervisord {
-
-  Exec {
-    path => '/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin'
-  }
-
-  exec { 'install_setuptools':
-    command => "curl ${supervisord::setuptools_url} | python",
-    cwd     => '/tmp',
-    unless  => 'which easy_install',
-    before  => Exec['install_pip']
-  }
-
-  exec { 'install_pip':
-    command     => 'easy_install pip',
-    unless      => 'which pip'
-  }
-
-  if $::osfamily == 'RedHat' {
-    exec { 'pip_provider_name_fix':
-      command     => 'alternatives --install /usr/bin/pip-python pip-python /usr/bin/pip 1',
-      subscribe   => Exec['install_pip'],
-      unless      => 'which pip-python'
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp
deleted file mode 100644
index 8a00d41c77c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/program.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-define supervisord::program(
-  $command,
-  $ensure                  = present,
-  $env_var                 = undef,
-  $process_name            = undef,
-  $numprocs                = undef,
-  $numprocs_start          = undef,
-  $priority                = undef,
-  $autostart               = undef,
-  $autorestart             = undef,
-  $startsecs               = undef,
-  $startretries            = undef,
-  $exitcodes               = undef,
-  $stopsignal              = undef,
-  $stopwaitsec             = undef,
-  $stopasgroup             = undef,
-  $killasgroup             = undef,
-  $user                    = undef,
-  $redirect_stderr         = undef,
-  $stdout_logfile          = "${supervisord::log_path}/program_${name}.log",
-  $stdout_logfile_maxbytes = undef,
-  $stdout_logfile_backups  = undef,
-  $stdout_capture_maxbytes = undef,
-  $stdout_events_enabled   = undef,
-  $stderr_logfile          = "${supervisord::log_path}/program_${name}.error",
-  $stderr_logfile_maxbytes = undef,
-  $stderr_logfile_backups  = undef,
-  $stderr_capture_maxbytes = undef,
-  $stderr_events_enabled   = undef,
-  $environment             = undef,
-  $directory               = undef,
-  $umask                   = undef,
-  $serverurl               = undef
-) {
-
-  include supervisord
-
-  if $env_var {
-    $env_hash = hiera($env_var)
-    $env_string = hash2csv($env_hash)
-  }
-  elsif $environment {
-    $env_string = hash2csv($environment)
-  }
-
-  $conf = "${supervisord::config_include}/program_${name}.conf"
-
-  file { $conf:
-    ensure  => $ensure,
-    owner   => 'root',
-    mode    => '0755',
-    content => template('supervisord/conf/program.erb'),
-    notify  => Class['supervisord::service']
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp
deleted file mode 100644
index 6e17976165d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/manifests/service.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class supervisord::service inherits supervisord  {
-  service { 'supervisord':
-    ensure     => $supervisord::service_ensure,
-    enable     => true,
-    hasrestart => true,
-    hasstatus  => true
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb
deleted file mode 100644
index 238876c7dcd..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/classes/supervisord_spec.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord' do
-
-  concatdir = '/var/lib/puppet/concat'
-  configfile = '/etc/supervisord.conf'
-  let(:facts) {{ :concat_basedir => concatdir }}
-
-  it { should contain_class('supervisord') }
-  it { should contain_class('supervisord::install') }
-  it { should contain_class('supervisord::config') }
-  it { should contain_class('supervisord::service') }
-  it { should contain_concat__fragment('supervisord_main').with_content(/logfile/) }
-
-  describe '#install_pip' do
-    context 'default' do
-      it { should_not contain_class('supervisord::pip') }
-    end
-
-    context 'true' do
-      let (:params) {{ :install_pip => true }}
-      it { should contain_class('supervisord::pip') }
-    end
-  end
-
-  describe '#env_var' do
-    context 'default' do
-      it { should contain_class('supervisord').without_env_hash }
-      it { should contain_class('supervisord').without_env_string }
-    end
-    #context 'is specified' do
-    #  let(:params) {{ :env_var => 'foovars' }}
-    #  let(:hiera_data) {{ :foovars => { 'key1' => 'value1', 'key2' => 'value2' } }}
-    #  it { should contain_concat__fragment('supervisord_main').with_content(/environment=key1='value1',key2='value2'/) }
-    #end
-  end
-
-  describe '#environment' do
-    context 'default' do
-      it { should contain_class('supervisord').without_env_string }
-    end
-    context 'is specified' do
-      let(:params) {{ :environment => { 'key1' => 'value1', 'key2' => 'value2' } }}
-      it { should contain_concat__fragment('supervisord_main').with_content(/environment=key1='value1',key2='value2'/) }
-    end
-  end
-
-  describe '#install_init' do
-    context 'default' do
-      it { should_not contain_file('/etc/init.d/supervisord') }
-    end
-
-    context 'false' do 
-      it { should_not contain_file('/etc/init.d/supervisord') }
-    end
-
-    describe 'on supported OS'
-      context 'with Debian' do
-        let(:facts) {{ :osfamily => 'Debian', :concat_basedir => concatdir }}
-        it { should contain_file('/etc/init.d/supervisord') }
-      end
-
-      context 'with RedHat' do
-        let(:facts) {{ :osfamily => 'RedHat', :concat_basedir => concatdir }}
-        it { should contain_file('/etc/init.d/supervisord') }
-      end
-    end
-      
-  describe '#unix_socket' do
-    context 'default' do
-      it { should contain_concat__fragment('supervisord_unix')}
-    end
-    context 'false' do
-      let(:params) {{ :unix_socket => false }}
-      it { should_not contain_concat__fragment('supervisord_unix')}
-    end
-  end
-
-  describe '#inet_server' do
-    context 'default' do
-      it { should_not contain_concat__fragment('supervisord_inet')}
-    end
-    context 'true' do
-      let(:params) {{ :inet_server => true }}
-      it { should contain_concat__fragment('supervisord_inet')}
-    end
-  end
-
-  describe '#run_path' do
-    context 'default' do
-      it { should_not contain_file('/var/run') }
-    end
-    context 'custom setting' do
-      let(:params) {{ :run_path => '/var/run/supervisord'}}
-      it { should contain_file('/var/run/supervisord') }
-    end
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb
deleted file mode 100644
index 6e04f44f97b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/eventlistener_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::eventlistener', :type => :define do
-  let(:title) {'foo'}
-  let(:default_params) {{ :command => 'bar',
-                  :stdout_logfile => '/var/log/supervisor/eventlistener_foo.log',
-                  :stderr_logfile => '/var/log/supervisor/eventlistener_foo.error',
-  }}
-  let(:params) { default_params }
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-
-  it { should contain_supervisord__eventlistener('foo') }
-  it { should contain_file('/etc/supervisor.d/eventlistener_foo.conf').with_content(/command=bar/) }
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb
deleted file mode 100644
index 7fd8ab07b86..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/fcgi_program_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::fcgi_program', :type => :define do
-  let(:title) {'foo'}
-  let(:default_params) {{ :command => 'bar',
-                  :socket          => 'tcp://localhost:1000',
-                  :stdout_logfile  => '/var/log/supervisor/fcgi-program_foo.log',
-                  :stderr_logfile  => '/var/log/supervisor/fcgi-program_foo.error',
-                  :user            => 'baz'
-  }}
-  let(:params) { default_params }
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-
-  it { should contain_supervisord__fcgi_program('foo') }
-  it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/\[fcgi-program:foo\]/) }
-  it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/socket=tcp:\/\/localhost:1000/) }
-  it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/command=bar/) }
-  it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/user=baz/) }
-  it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/fcgi-program_foo.log/) }
-  it { should contain_file('/etc/supervisor.d/fcgi-program_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/fcgi-program_foo.error/) }
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb
deleted file mode 100644
index ba8d70196ce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/group_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::group', :type => :define do
-  let(:title) {'foo'}
-  let(:params) {{ :programs => ['bar', 'baz'] }}
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-
-  it { should contain_supervisord__group('foo').with_program }
-  it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/) }
-
-  describe '#priority' do
-    it 'should default to undef' do
-      should_not contain_file('/etc/supervisor.d/group_foo.conf').with_content(/priority/)
-      should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/)
-    end
-    context '100' do
-      let(:params) {{ :priority => '100', :programs => ['bar', 'baz'] }}
-      it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/priority=100/) }
-      it { should contain_file('/etc/supervisor.d/group_foo.conf').with_content(/programs=bar,baz/) }
-    end
-  end
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb
deleted file mode 100644
index 077828bdfcf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/defines/program_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe 'supervisord::program', :type => :define do
-  let(:title) {'foo'}
-  let(:default_params) {{ :command => 'bar',
-                  :stdout_logfile  => '/var/log/supervisor/program_foo.log',
-                  :stderr_logfile  => '/var/log/supervisor/program_foo.error',
-                  :user            => 'baz'
-  }}
-  let(:params) { default_params }
-  let(:facts) {{ :concat_basedir => '/var/lib/puppet/concat' }}
-
-  it { should contain_supervisord__program('foo') }
-  it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/\[program:foo\]/) }
-  it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/command=bar/) }
-  it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/user=baz/) }
-  it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stdout_logfile=\/var\/log\/supervisor\/program_foo.log/) }
-  it { should contain_file('/etc/supervisor.d/program_foo.conf').with_content(/stderr_logfile=\/var\/log\/supervisor\/program_foo.error/) }
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb
deleted file mode 100644
index dd8dffa07ec..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/array2csv_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe 'array2csv' do
-  it { should run.with_params(['value1']).and_return('value1') }
-  it { should run.with_params(['value1', 'value2', 'value3']).and_return('value1,value2,value3') }
-  it { should run.with_params('foo').and_raise_error(Puppet::ParseError) }
-  it { should run.with_params().and_raise_error(Puppet::ParseError) }
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb
deleted file mode 100644
index 68f04a6445a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/functions/hash2csv_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe 'hash2csv' do
-  it { should run.with_params({'key1' => 'value1'}).and_return("key1='value1'") }
-  it { should run.with_params({'key1' => 'value1', 'key2' => 'value2'}).and_return("key1='value1',key2='value2'") }
-  it { should run.with_params('foo').and_raise_error(Puppet::ParseError) }
-  it { should run.with_params().and_raise_error(Puppet::ParseError) }
-end
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb
deleted file mode 100644
index 644f7c33ac0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-
-RSpec.configure do |c|
-  c.module_path = File.join(fixture_path, 'modules')
-  c.manifest_dir = File.join(fixture_path, 'manifests')
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_system.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_system.rb
deleted file mode 100644
index a790d7d526c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/spec_helper_system.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'rspec-system/spec_helper'
-require 'rspec-system-puppet/helpers'
-
-include RSpecSystemPuppet::Helpers
-
-RSpec.configure do |c|
-  # Project root
-  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-  # Enable colour
-  c.tty = true
-
-  # This is where we 'setup' the nodes before running our tests
-  c.before :suite do
-    # Install puppet
-    puppet_install
-    puppet_master_install
-
-    # Replace mymodule with your module name
-    puppet_module_install(:source => proj_root, :module_name => 'supervisord')
-    shell('puppet module install puppetlabs/stdlib')
-    shell('puppet module install puppetlabs/concat')
-
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/system/basic_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/system/basic_spec.rb
deleted file mode 100644
index 62cf7dd8c2e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/spec/system/basic_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper_system'
-
-describe 'basic install' do
-
-  it 'class should work with no errors' do
-    pp = <<-EOS
-      class { 'supervisord': install_pip  => true, install_init => true}
-    EOS
-
-    puppet_apply(pp) do |r|
-      r.exit_code.should_not == 1
-      r.refresh
-      r.exit_code.should be_zero
-    end
-
-    shell("pgrep supervisord") do |r|
-      r.exit_code.should be_zero
-    end
-
-  end
-end
-
-describe 'add a program config' do
-
-  it 'supervisord::program should install a program config' do
-
-    pp = <<-EOS
-      include supervisord
-      supervisord::program { 'test': 
-        command => 'echo', 
-        priority => '100', 
-        environment => { 
-          'HOME' => '/root',
-          'PATH' => '/bin',
-        }
-      }
-    EOS
-
-    puppet_apply(pp) do |r|
-      r.exit_code.should_not == 1
-      r.refresh
-      r.exit_code.should be_zero
-    end
-
-    shell("grep command=echo /etc/supervisor.d/program_test.conf") do |r|
-      r.exit_code.should be_zero
-    end
-    shell("grep priority=100 /etc/supervisor.d/program_test.conf") do |r|
-      r.exit_code.should be_zero
-    end
-    shell('grep "environment=" /etc/supervisor.d/program_test.conf') do |r|
-      r.exit_code.should be_zero
-    end
-  end
-end 
-
-describe 'add a fcgi-program config' do
-
-  it 'supervisord::fcgi_program should install a program config' do
-
-    pp = <<-EOS
-      include supervisord
-      supervisord::fcgi_program { 'test':
-        socket  => 'tcp://localhost:1000',
-        command => 'echo',
-        priority => '100',
-        environment => {
-          'HOME' => '/root',
-          'PATH' => '/bin',
-        }
-      }
-    EOS
-
-    puppet_apply(pp) do |r|
-      r.exit_code.should_not == 1
-      r.refresh
-      r.exit_code.should be_zero
-    end
-
-    shell("grep socket=tcp://localhost:1000 /etc/supervisor.d/fcgi-program_test.conf") do |r|
-      r.exit_code.should be_zero
-    end
-    shell("grep command=echo /etc/supervisor.d/fcgi-program_test.conf") do |r|
-      r.exit_code.should be_zero
-    end
-    shell("grep priority=100 /etc/supervisor.d/fcgi-program_test.conf") do |r|
-      r.exit_code.should be_zero
-    end
-    shell('grep "environment=" /etc/supervisor.d/fcgi-program_test.conf') do |r|
-      r.exit_code.should be_zero
-    end
-  end
-end
-
-describe 'add a group config' do
-
-  it 'supervisord::group should install a program config' do
-
-    pp = <<-EOS
-      include supervisord
-      supervisord::group { 'test':
-        programs => ['program1', 'program2'],
-        priority => '100',
-      }
-    EOS
-
-    puppet_apply(pp) do |r|
-      r.exit_code.should_not == 1
-      r.refresh
-      r.exit_code.should be_zero
-    end
-
-    shell('grep "programs=program1,program2" /etc/supervisor.d/group_test.conf') do |r|
-      r.exit_code.should be_zero
-    end
-    shell("grep priority=100 /etc/supervisor.d/fcgi-program_test.conf") do |r|
-      r.exit_code.should be_zero
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb
deleted file mode 100644
index 4ee2b893419..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/eventlistener.erb
+++ /dev/null
@@ -1,88 +0,0 @@
-[eventlistener:<%= @name %>]
-command=<%= @command %>
-<% if @process_name -%>
-process_name=<%= @process_name %>
-<% end -%>
-<% if @numprocs -%>
-numprocs=<%= @numprocs %>
-<% end -%>
-<% if @numprocs_start -%>
-numprocs_start=<%= @numprocs_start %>
-<% end -%>
-<% if @events_string -%>
-events=<%= @events_string %>
-<% end -%>
-<% if @buffer_size -%>
-buffer_size=<%= @buffer_size %>
-<% end -%>
-<% if @result_handler -%>
-result_handler=<%= @result_handler %>
-<% end -%>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
-<% if @autostart -%>
-autostart=<%= @autostart %>
-<% end -%>
-<% if @autorestart -%>
-autorestart=<%= @autorestart %>
-<% end -%>
-<% if @startsecs -%>
-startsecs=<%= @startsecs %>
-<% end -%>
-<% if @startretries -%>
-startretries=<%= @startretries %>
-<% end -%>
-<% if @exitcodes -%>
-exitcodes=<%= @exitcodes %>
-<% end -%>
-<% if @stopsignal -%>
-stopsignal=<%= @stopsignal %>
-<% end -%>
-<% if @stopwaitsec -%>
-stopwaitsec=<%= @stopwaitsec %>
-<% end -%>
-<% if @stopasgroup -%>
-stopasgroup=<%= @stopasgroup %>
-<% end -%>
-<% if @killasgroup -%>
-killasgroup=<%= @killasgroup %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @redirect_stderr -%>
-redirect_stderr=<%= @redirect_stderr %>
-<% end -%>
-stdout_logfile=<%= @stdout_logfile %>
-<% if @stdout_logfile_maxbytes -%>
-stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %>
-<% end -%>
-<% if @stdout_logfile_backups -%>
-stdout_logfile_backups=<%= @stdout_logfile_backups %>
-<% end -%>
-<% if @stdout_events_enabled -%>
-stdout_events_enabled=<%= @stdout_events_enabled %>
-<% end -%>
-stderr_logfile=<%= @stderr_logfile %>
-<% if @stderr_logfile_maxbytes -%>
-stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %>
-<% end -%>
-<% if @stderr_logfile_backups -%>
-stderr_logfile_backups=<%= @stderr_logfile_backups %>
-<% end -%>
-<% if @stderr_events_enabled -%>
-stderr_events_enabled=<%= @stderr_events_enabled %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @umask -%>
-umask=<%= @umask %>
-<% end -%>
-<% if @serverurl -%>
-serverurl=<%= @serverurl %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb
deleted file mode 100644
index a1478bce536..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/fcgi_program.erb
+++ /dev/null
@@ -1,96 +0,0 @@
-[fcgi-program:<%= @name %>]
-command=<%= @command %>
-socket=<%= @socket %>
-<% if @socket_owner -%>
-socket_owner=<%= @socket_owner %>
-<% end -%>
-<% if @socket_mode -%>
-socket_mode=<%= @socket_mode %>
-<% end -%>
-<% if @process_name -%>
-process_name=<%= @process_name %>
-<% end -%>
-<% if @numprocs -%>
-numprocs=<%= @numprocs %>
-<% end -%>
-<% if @numprocs_start -%>
-numprocs_start=<%= @numprocs_start %>
-<% end -%>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
-<% if @autostart -%>
-autostart=<%= @autostart %>
-<% end -%>
-<% if @autorestart -%>
-autorestart=<%= @autorestart %>
-<% end -%>
-<% if @startsecs -%>
-startsecs=<%= @startsecs %>
-<% end -%>
-<% if @startretries -%>
-startretries=<%= @startretries %>
-<% end -%>
-<% if @exitcodes -%>
-exitcodes=<%= @exitcodes %>
-<% end -%>
-<% if @stopsignal -%>
-stopsignal=<%= @stopsignal %>
-<% end -%>
-<% if @stopwaitsec -%>
-stopwaitsec=<%= @stopwaitsec %>
-<% end -%>
-<% if @stopasgroup -%>
-stopasgroup=<%= @stopasgroup %>
-<% end -%>
-<% if @killasgroup -%>
-killasgroup=<%= @killasgroup %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @redirect_stderr -%>
-redirect_stderr=<%= @redirect_stderr %>
-<% end -%>
-<% if @stdout_logfile -%>
-stdout_logfile=<%= @stdout_logfile %>
-<% end -%>
-<% if @stdout_logfile_maxbytes -%>
-stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %>
-<% end -%>
-<% if @stdout_logfile_backups -%>
-stdout_logfile_backups=<%= @stdout_logfile_backups %>
-<% end -%>
-<% if @stdout_capture_maxbytes -%>
-stdout_capture_maxbytes=<%= @stdout_capture_maxbytes %>
-<% end -%>
-<% if @stdout_events_enabled -%>
-stdout_events_enabled=<%= @stdout_events_enabled %>
-<% end -%>
-<% if @stderr_logfile -%>
-stderr_logfile=<%= @stderr_logfile %>
-<% end -%>
-<% if @stderr_logfile_maxbytes -%>
-stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %>
-<% end -%>
-<% if @stderr_logfile_backups -%>
-stderr_logfile_backups=<%= @stderr_logfile_backups %>
-<% end -%>
-<% if @stderr_capture_maxbytes -%>
-stderr_capture_maxbytes=<%= @stderr_capture_maxbytes %>
-<% end -%>
-<% if @stderr_events_enabled -%>
-stderr_events_enabled=<%= @stderr_events_enabled %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @umask -%>
-umask=<%= @umask %>
-<% end -%>
-<% if @serverurl -%>
-serverurl=<%= @serverurl %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb
deleted file mode 100644
index 478a02e4504..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/group.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-[group:<%= @name %>]
-programs=<%= @progstring %>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb
deleted file mode 100644
index ca96d34d6ad..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/conf/program.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-[program:<%= @name %>]
-command=<%= @command %>
-<% if @process_name -%>
-process_name=<%= @process_name %>
-<% end -%>
-<% if @numprocs -%>
-numprocs=<%= @numprocs %>
-<% end -%>
-<% if @numprocs_start -%>
-numprocs_start=<%= @numprocs_start %>
-<% end -%>
-<% if @priority -%>
-priority=<%= @priority %>
-<% end -%>
-<% if @autostart -%>
-autostart=<%= @autostart %>
-<% end -%>
-<% if @autorestart -%>
-autorestart=<%= @autorestart %>
-<% end -%>
-<% if @startsecs -%>
-startsecs=<%= @startsecs %>
-<% end -%>
-<% if @startretries -%>
-startretries=<%= @startretries %>
-<% end -%>
-<% if @exitcodes -%>
-exitcodes=<%= @exitcodes %>
-<% end -%>
-<% if @stopsignal -%>
-stopsignal=<%= @stopsignal %>
-<% end -%>
-<% if @stopwaitsec -%>
-stopwaitsec=<%= @stopwaitsec %>
-<% end -%>
-<% if @stopasgroup -%>
-stopasgroup=<%= @stopasgroup %>
-<% end -%>
-<% if @killasgroup -%>
-killasgroup=<%= @killasgroup %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @redirect_stderr -%>
-redirect_stderr=<%= @redirect_stderr %>
-<% end -%>
-<% if @stdout_logfile -%>
-stdout_logfile=<%= @stdout_logfile %>
-<% end -%>
-<% if @stdout_logfile_maxbytes -%>
-stdout_logfile_maxbytes=<%= @stdout_logfile_maxbytes %>
-<% end -%>
-<% if @stdout_logfile_backups -%>
-stdout_logfile_backups=<%= @stdout_logfile_backups %>
-<% end -%>
-<% if @stdout_capture_maxbytes -%>
-stdout_capture_maxbytes=<%= @stdout_capture_maxbytes %>
-<% end -%>
-<% if @stdout_events_enabled -%>
-stdout_events_enabled=<%= @stdout_events_enabled %>
-<% end -%>
-<% if @stderr_logfile -%>
-stderr_logfile=<%= @stderr_logfile %>
-<% end -%>
-<% if @stderr_logfile_maxbytes -%>
-stderr_logfile_maxbytes=<%= @stderr_logfile_maxbytes %>
-<% end -%>
-<% if @stderr_logfile_backups -%>
-stderr_logfile_backups=<%= @stderr_logfile_backups %>
-<% end -%>
-<% if @stderr_capture_maxbytes -%>
-stderr_capture_maxbytes=<%= @stderr_capture_maxbytes %>
-<% end -%>
-<% if @stderr_events_enabled -%>
-stderr_events_enabled=<%= @stderr_events_enabled %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @umask -%>
-umask=<%= @umask %>
-<% end -%>
-<% if @serverurl -%>
-serverurl=<%= @serverurl %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_extra.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_extra.erb
deleted file mode 100644
index 232f5356da3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_extra.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Defaults for supervisor initscript
-# sourced by /etc/init.d/supervisor
-# installed at /etc/default/supervisor by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS="-c <%= @config_file %>"
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_init.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_init.erb
deleted file mode 100644
index b94f9337f59..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/debian_init.erb
+++ /dev/null
@@ -1,133 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          supervisor
-# Required-Start:    $remote_fs $network $named
-# Required-Stop:     $remote_fs $network $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start/stop supervisor
-# Description:       Start/stop supervisor daemon and its configured
-#                    subprocesses.
-### END INIT INFO
-
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=<%= @executable %>
-NAME=supervisord
-DESC=supervisor
-
-test -x $DAEMON || exit 0
-
-LOGDIR=<%= @log_path %>
-PIDFILE=<%= @pid_file %>
-DODTIME=5                   # Time to wait for the server to die, in seconds
-                            # If this value is set too low you might not
-                            # let some servers to die gracefully and
-                            # 'restart' will not work
-
-# Include supervisor defaults if available
-if [ -f /etc/default/supervisor ] ; then
-        . /etc/default/supervisor
-fi
-
-set -e
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    (cat /proc/$pid/cmdline | tr "\000" "\n"|grep -q $name) || return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-force_stop() {
-# Forcefully kill the process
-    [ ! -f "$PIDFILE" ] && return
-    if running ; then
-        kill -15 $pid
-        # Is it really dead?
-        [ -n "$DODTIME" ] && sleep "$DODTIME"s
-        if running ; then
-            kill -9 $pid
-            [ -n "$DODTIME" ] && sleep "$DODTIME"s
-            if running ; then
-                echo "Cannot kill $DESC (pid=$pid)!"
-                exit 1
-            fi
-        fi
-    fi
-    rm -f $PIDFILE
-    return 0
-}
-
-case "$1" in
-  start)
-    if [ -e $PIDFILE ]; then
-        echo "$DESC already running with pid: `cat $PIDFILE`"
-        exit 0
-    fi
-    echo -n "Starting $DESC: "
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --exec $DAEMON -- $DAEMON_OPTS
-    test -f $PIDFILE || sleep 1
-        if running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-    ;;
-    stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
-        echo "$NAME."
-    ;;
-    force-stop)
-        echo -n "Forcefully stopping $DESC: "
-        force_stop
-        if ! running ; then
-            echo "$NAME."
-        else
-            echo " ERROR."
-        fi
-    ;;
-    restart)
-        echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
-        [ -n "$DODTIME" ] && sleep $DODTIME
-        start-stop-daemon --start --quiet --pidfile \
-            $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
-        echo "$NAME."
-    ;;
-    status)
-        echo -n "$DESC is "
-        if running ;  then
-            echo "running"
-        else
-            echo "not running."
-            exit 1
-        fi
-    ;;
-    *)
-        N=/etc/init.d/$NAME
-        echo "Usage: $N {start|stop|restart|status|force-stop}" >&2
-        exit 1
-    ;;
-esac
-
-exit 0
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_extra.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_extra.erb
deleted file mode 100644
index b892c2d6203..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_extra.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-# this is sourced by the supervisord init script
-# written by jkoppe
-
-set -a 
-
-# should probably put both of these options as runtime arguments 
-OPTIONS="-c <%= @config_file %>"
-PIDFILE=<%= @pid_file %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_init.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_init.erb
deleted file mode 100644
index 1dc2da2aff1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/init/redhat_init.erb
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-#
-# supervisord   This scripts turns supervisord on
-#
-# Author:       Mike McGrath <mmcgrath@redhat.com> (based off yumupdatesd)
-#               Jason Koppe <jkoppe@indeed.com> adjusted to read sysconfig,
-#                   use supervisord tools to start/stop, conditionally wait
-#                   for child processes to shutdown, and startup later
-#
-# chkconfig:    345 83 04
-#
-# description:  supervisor is a process control utility.  It has a web based
-#               xmlrpc interface as well as a few other nifty features.
-# processname:  supervisord
-# config: <%= @config_file %>
-# pidfile: <%= @pid_file %>
-#
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-# source system settings
-[ -e <%= @init_extras %> ] && . <%= @init_extras %>
-
-RETVAL=0
-DAEMON=/usr/bin/supervisord
-DESC=supervisord
-
-running_pid()
-{
-    # Check if a given process pid's cmdline matches a given name
-    pid=$1
-    name=$2
-    [ -z "$pid" ] && return 1
-    [ ! -d /proc/$pid ] &&  return 1
-    (cat /proc/$pid/cmdline | tr "\000" "\n"|grep -q $name) || return 1
-    return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-    # No pidfile, probably no daemon present
-    [ ! -f "$PIDFILE" ] && return 1
-    # Obtain the pid and check it against the binary name
-    pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
-    return 0
-}
-
-start() {
-    echo -n "Starting $DESC: "
-    if [ -e $PIDFILE ]; then 
-        echo "ALREADY STARTED"
-        return 1
-    else
-        # start supervisord with options from sysconfig (stuff like -c)
-        daemon $DAEMON $OPTIONS
-        # only create the subsyslock if we created the PIDFILE
-        [ -e $PIDFILE ] && touch /var/lock/subsys/supervisord
-        return 0
-    fi
-}
-
-stop() {
-    echo -n "Stopping supervisord: "
-    killproc -p $PIDFILE $DESC 
-    # always remove the subsys.  we might have waited a while, but just remove it at this point.
-    rm -f /var/lock/subsys/supervisord
-    return 0
-}
-
-restart() {
-        stop
-        start
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart|force-reload)
-        restart
-        ;;
-    reload)
-        /usr/bin/supervisorctl $OPTIONS reload
-        RETVAL=$?
-        ;;
-    condrestart)
-        [ -f /var/lock/subsys/supervisord ] && restart
-        RETVAL=$?
-        ;;
-    status)
-        echo -n "supervisord is "
-        if running ;  then
-            echo "running"
-        else
-            echo "not running."
-            exit 1
-    fi
-    ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
-        exit 1
-esac
-
-exit $RETVAL
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb
deleted file mode 100644
index 9f04cb24779..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_inet.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-[inet_http_server]
-port=<%= @inet_server_hostname %>:<%= @inet_server_port %>
-<% if @inet_auth -%>
-username=<%= @inet_username %>
-password=<%= @inet_password %>
-<% end -%>
-
-[supervisorctl]
-serverurl=http://<%= @inet_hostname%>:<%= @inet_server_port %>
-<% if @inet_auth -%>
-username=<%= @inet_username %>
-password=<%= @inet_password %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb
deleted file mode 100644
index 1baf5607a2f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_main.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-[supervisord]
-logfile=<%= @log_file %>
-pidfile=<%= @pid_file %>
-nodaemon=<%= @nodaemon %>
-minfds=<%= @minfds %>
-minfds=<%= @minprocs %>
-umask=<%= @umask %>
-<% if @strip_ansi -%>
-strip_ansi=<%= @strip_ansi %>
-<% end -%>
-<% if @user -%>
-user=<%= @user %>
-<% end -%>
-<% if @identifier -%>
-indentifier=<%= @identifier %>
-<% end -%>
-<% if @directory -%>
-directory=<%= @directory %>
-<% end -%>
-<% if @nocleanup -%>
-nocleanup=true
-<% end -%>
-<% if @childlogdir -%>
-childlogdir=<%= @childlogdir %>
-<% end -%>
-<% if @env_string -%>
-environment=<%= @env_string %>
-<% end -%>
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[include]
-files=<%= @config_include %>/*.conf
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb
deleted file mode 100644
index 414e75198ba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/templates/supervisord_unix.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-[unix_http_server]
-file=<%= @unix_socket_file %>
-chmod=<%= @unix_socket_mode %>
-chown=<%= @unix_socket_owner %>:<%= @unix_socket_group %>
-<% if @unix_auth -%>
-username=<%= @unix_socket_username %>
-password=<%= @unix_socket_password %>
-<% end -%>
-
-[supervisorctl]
-serverurl=unix://<%= @unix_socket_file %>
-<% if @unix_auth -%>
-username=<%= @unix_username %>
-password=<%= @unix_password %>
-<% end -%>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp
deleted file mode 100644
index 3d340460dfb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/group.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-supervisord::group { 'mygroup':
-  priority => 100,
-  program  => ['program1', 'program2', 'program3']
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp
deleted file mode 100644
index 48bc1f47987..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/init.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class { 'supervisord':
-  install_pip  => true,
-  install_init => true,
-  nocleanup    => true,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp
deleted file mode 100644
index 6c789c96dc1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/supervisord/tests/program.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-supervisord::program { 'myprogram':
-  command     => 'command --args',
-  priority    => '100',
-  environment => {
-    'HOME'   => '/home/myuser',
-    'PATH'   => '/bin:/sbin:/usr/bin:/usr/sbin',
-    'SECRET' => 'mysecret'
-  }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog
deleted file mode 100644
index a91a0e2cf48..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-2014-01-20 - 0.3.0
-* Add optional comment inside the sysctl.d file.
-* Use sysctl -p with the created/modified file instead of sysctl -w (#3).
-* Fix purge and set its default to false (#7, tehmaspc).
-
-2013-10-02 - 0.2.0
-* Add optional prefix to the sysctl.d file name, to force ordering.
-
-2013-06-25 - 0.1.1
-* Make purge optional, still enabled by default.
-* Add rspec tests (Justin Lambert).
-* Minor fix for values with spaces (needs more changes to be robust).
-
-2013-03-06 - 0.1.0
-* Update README to markdown.
-* Change to recommended 2 space indent.
-
-2012-12-18 - 0.0.3
-* Add feature to update existing values in /etc/sysctl.conf.
-* Apply setting on each run if needed (hakamadare).
-* Make sure $ensure => absent still works with the above change.
-
-2012-09-19 - 0.0.2
-* Fix deprecation warnings.
-* Fix README markup.
-
-2012-07-19 - 0.0.1
-* Initial module release.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile
deleted file mode 100644
index d4c141f5a3c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-source :rubygems
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'rspec-puppet'
-gem 'puppetlabs_spec_helper', '>= 0.4.0'
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE
deleted file mode 100644
index 49a6e5c4010..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/LICENSE
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright (C) 2011-2013 Matthias Saou
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile
deleted file mode 100644
index 2d9f13ff73a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Modulefile
+++ /dev/null
@@ -1,8 +0,0 @@
-name 'thias-sysctl'
-version '0.3.0'
-source 'git://github.com/thias/puppet-sysctl'
-author 'Matthias Saou'
-license 'Apache 2.0'
-summary 'Sysctl module'
-description "Manage sysctl variable values."
-project_page 'https://github.com/thias/puppet-sysctl'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md
deleted file mode 100644
index 554bcfa0f14..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# puppet-sysctl
-
-## Overview
-
-Manage sysctl variable values. All changes are immediately applied, as well as
-configured to become persistent. Tested on Red Hat Enterprise Linux 6.
-
- * `sysctl` : Definition to manage sysctl variables by setting a value.
- * `sysctl::base`: Base class (included from the definition).
-
-For persistence to work, your Operating System needs to support looking for
-sysctl configuration inside `/etc/sysctl.d/`.
-
-You may optionally enable purging of the `/etc/sysctl.d/` directory, so that
-all files which are not (or no longer) managed by this module will be removed.
-
-Beware that for the purge to work, you need to either have at least one
-sysctl definition call left for the node, or include `sysctl::base` manually.
-
-You may also force a value to `ensure => absent`, which will always work.
-
-For the few original settings in the main `/etc/sysct.conf` file, the value is
-also replaced so that running `sysctl -p` doesn't revert any change made by
-puppet.
-
-## Examples
-
-Enable IP forwarding globally :
-```puppet
-sysctl { 'net.ipv4.ip_forward': value => '1' }
-```
-
-Set a value for maximum number of connections per UNIX socket :
-```puppet
-sysctl { 'net.core.somaxconn': value => '65536' }
-```
-
-Make sure we don't have any explicit value set for swappiness, typically
-because it was set at some point but no longer needs to be. The original
-value for existing nodes won't be reset until the next reboot :
-```puppet
-sysctl { 'vm.swappiness': ensure => absent }
-```
-
-If the order in which the files get applied is important, you can set it by
-using a file name prefix, which could also be set globally from `site.pp` :
-```puppet
-Sysctl { prefix => '60' }
-```
-
-To enable purging of settings, you can use hiera to set the `sysctl::base`
-`$purge` parameter :
-```yaml
----
-# sysctl
-sysctl::base::purge: true
-```
- 
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile
deleted file mode 100644
index 184b9b5915e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/Rakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint'
-PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.send("disable_autoloader_layout")
-PuppetLint.configuration.send("disable_quoted_booleans")
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp
deleted file mode 100644
index f7a95131467..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/base.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Class: sysctl::base
-#
-# Common part for the sysctl definition. Not meant to be used on its own.
-#
-class sysctl::base (
-  $purge = false,
-) {
-
-  if $purge {
-    $recurse = true
-  } else {
-    $recurse = false
-  }
-
-  file { '/etc/sysctl.d':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
-    # Magic hidden here
-    purge   => $purge,
-    recurse => $recurse,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp
deleted file mode 100644
index 379e69136c2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/manifests/init.pp
+++ /dev/null
@@ -1,66 +0,0 @@
-# Define: sysctl
-#
-# Manage sysctl variable values.
-#
-# Parameters:
-#  $value:
-#    The value for the sysctl parameter. Mandatory, unless $ensure is 'absent'.
-#  $prefix:
-#    Optional prefix for the sysctl.d file to be created. Default: none.
-#  $ensure:
-#    Whether the variable's value should be 'present' or 'absent'.
-#    Defaults to 'present'.
-#
-# Sample Usage :
-#  sysctl { 'net.ipv6.bindv6only': value => '1' }
-#
-define sysctl (
-  $value   = undef,
-  $prefix  = undef,
-  $comment = undef,
-  $ensure  = undef,
-) {
-
-  include sysctl::base
-
-  # If we have a prefix, then add the dash to it
-  if $prefix {
-    $sysctl_d_file = "${prefix}-${title}.conf"
-  } else {
-    $sysctl_d_file = "${title}.conf"
-  }
-
-  # The permanent change
-  file { "/etc/sysctl.d/${sysctl_d_file}":
-    ensure  => $ensure,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => template("${module_name}/sysctl.d-file.erb"),
-    notify  => [
-      Exec["sysctl-${title}"],
-      Exec["update-sysctl.conf-${title}"],
-    ],
-  }
-
-  if $ensure != 'absent' {
-
-    # The immediate change + re-check on each run "just in case"
-    exec { "sysctl-${title}":
-      command     => "/sbin/sysctl -p /etc/sysctl.d/${sysctl_d_file}",
-      refreshonly => true,
-      require     => File["/etc/sysctl.d/${sysctl_d_file}"],
-    }
-
-    # For the few original values from the main file
-    exec { "update-sysctl.conf-${title}":
-      command     => "sed -i -e 's/^${title} *=.*/${title} = ${value}/' /etc/sysctl.conf",
-      path        => [ '/usr/sbin', '/sbin', '/usr/bin', '/bin' ],
-      refreshonly => true,
-      onlyif      => "grep -E '^${title} *=' /etc/sysctl.conf",
-    }
-
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json
deleted file mode 100644
index 237befce806..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/metadata.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "project_page": "https://github.com/thias/puppet-sysctl",
-  "version": "0.3.0",
-  "license": "Apache 2.0",
-  "description": "Manage sysctl variable values.",
-  "dependencies": [
-
-  ],
-  "types": [
-
-  ],
-  "name": "thias-sysctl",
-  "author": "Matthias Saou",
-  "summary": "Sysctl module",
-  "source": "git://github.com/thias/puppet-sysctl",
-  "checksums": {
-    "tests/init.pp": "e70e5327b9840b44699bb7fae71d47cd",
-    "spec/spec_helper.rb": "3ea886dd135e120afa31e0aab12e85b0",
-    "ChangeLog": "ed8052eb5cb46b92eaa03b882c11779e",
-    "LICENSE": "99219472697a01561e7630d63aaecdc1",
-    "Modulefile": "3b8a6a0dfff841a31118a5f46fde59da",
-    "spec/defines/sysctl_init_spec.rb": "21d524df70961750cb22f6b83349093e",
-    "manifests/init.pp": "0f7dd893b08ebbbec8994d14eca6701b",
-    "README.md": "ed4837849a1c4790b7178cd99824a204",
-    "spec/classes/sysctl_base_spec.rb": "6241cf3e290871c00b1bb3bbd5490108",
-    "templates/sysctl.d-file.erb": "0212783df32c499b3e9e343993f608da",
-    "manifests/base.pp": "9508015ce74b5ce1420ad8c8ebc7d3af",
-    "tests/base.pp": "1ba89838432dbc94339097327c19ae3d",
-    "Gemfile": "3ad486d60d90bfe4395b368b95481e01",
-    "Rakefile": "ab253b919e7093c2a5eb7adf0e39ffbc"
-  }
-}
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb
deleted file mode 100644
index a1d47a21e77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/classes/sysctl_base_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe 'sysctl::base', :type => :class do
-
-  it { should create_class('sysctl::base') }
-  it { should contain_file('/etc/sysctl.d') }
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb
deleted file mode 100644
index 1f8db67cce0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/defines/sysctl_init_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe 'sysctl', :type => :define do
-  let(:title) { 'net.ipv4.ip_forward'}
-
-  context 'present' do
-    let(:params) { { :value => '1' } }
-
-    it { should contain_file('/etc/sysctl.d/net.ipv4.ip_forward.conf').with(
-      :content  => "net.ipv4.ip_forward = 1\n",
-      :ensure   => nil
-    ) }
-
-    it { should contain_exec('sysctl-net.ipv4.ip_forward') }
-    it { should contain_exec('update-sysctl.conf-net.ipv4.ip_forward')}
-  end
-
-  context 'absent' do
-    let(:params) { { :ensure  => 'absent' } }
-
-    it { should contain_file('/etc/sysctl.d/net.ipv4.ip_forward.conf').with_ensure('absent') }
-  end
-
-end
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb
deleted file mode 100644
index dc7e9f4a0ef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/spec/spec_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb
deleted file mode 100644
index 843721435a8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/templates/sysctl.d-file.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if @comment -%>
-<% @comment.each do |line| -%>
-# <%= line %>
-<% end -%>
-<% end -%>
-<%= @title %> = <%= @value %>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp
deleted file mode 100644
index a4868712ef7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/base.pp
+++ /dev/null
@@ -1 +0,0 @@
-include sysctl::base
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp
deleted file mode 100644
index 402615bb798..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/sysctl/tests/init.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-sysctl { 'net.ipv4.ip_forward': value => '1' }
-sysctl { 'net.core.somaxconn': value => '65536' }
-sysctl { 'vm.swappiness': ensure => absent }
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml
deleted file mode 100644
index 1c5e71b98df..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-branches:
-  only:
-    - master
-language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-after_success:
-  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
-  - .forge-release/publish
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-env:
-  matrix:
-    - PUPPET_GEM_VERSION="~> 2.7.0"
-    - PUPPET_GEM_VERSION="~> 3.3.0"
-  global:
-  - PUBLISHER_LOGIN=puppetlabs
-  - secure: |-
-      ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR
-      kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu
-      IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c=
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-notifications:
-  email: false
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG
deleted file mode 100644
index 8142f5d6e45..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/CHANGELOG
+++ /dev/null
@@ -1,41 +0,0 @@
-2013-11-13 - Version 0.2.0
-
-Summary:
-
-This release mainly focuses on a number of bugfixes, which should
-significantly improve the reliability of Git and SVN.  Thanks to
-our many contributors for all of these fixes!
-
-Features:
-- Git:
- - Add autorequire for Package['git']
-- HG:
- - Allow user and identity properties.
-- Bzr:
- - "ensure => latest" support.
-- SVN:
- - Added configuration parameter.
- - Add support for master svn repositories.
-- CVS:
- - Allow for setting the CVS_RSH environment variable.
-
-Fixes:
-- Handle Puppet::Util[::Execution].withenv for 2.x and 3.x properly.
-- Change path_empty? to not do full directory listing.
-- Overhaul spec tests to work with rspec2.
-- Git:
- - Improve Git SSH usage documentation.
- - Add ssh session timeouts to prevent network issues from blocking runs.
- - Fix git provider checkout of a remote ref on an existing repo.
- - Allow unlimited submodules (thanks to --recursive).
- - Use git checkout --force instead of short -f everywhere.
- - Update git provider to handle checking out into an existing (empty) dir.
-- SVN:
- - Handle force property. for svn.
- - Adds support for changing upstream repo url.
- - Check that the URL of the WC matches the URL from the manifest.
- - Changed from using "update" to "switch".
- - Handle revision update without source switch.
- - Fix svn provider to look for '^Revision:' instead of '^Last Changed Rev:'.
-- CVS:
- - Documented the "module" attribute.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile
deleted file mode 100644
index 5def8292208..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Gemfile
+++ /dev/null
@@ -1,22 +0,0 @@
-source 'https://rubygems.org'
-
-group :development, :test do
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'rspec-system',            :require => false
-  gem 'rspec-system-puppet',     :require => false
-  gem 'rspec-system-serverspec', :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint',             :require => false
-  gem 'pry',                     :require => false
-  gem 'simplecov',               :require => false
-end
-
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-# vim:ft=ruby
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE
deleted file mode 100644
index 2ee80c8ec84..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2010-2012 Puppet Labs Inc.
-
-Puppet Labs can be contacted at: info@puppetlabs.com
-
-This program and entire repository is free software; you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License as published by the Free Software
-Foundation; either version 2 of the License, or any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile
deleted file mode 100644
index d2bbe929598..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Modulefile
+++ /dev/null
@@ -1,4 +0,0 @@
-name 'puppetlabs/vcsrepo'
-version '0.2.0'
-summary 'Manage repositories from various version control systems'
-description 'Manage repositories from various version control systems'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown
deleted file mode 100644
index cc257e9fdf6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.BZR.markdown
+++ /dev/null
@@ -1,47 +0,0 @@
-Using vcsrepo with Bazaar
-=========================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure   => present,
-      provider => bzr
-    }
-
-To branch from an existing repository
--------------------------------------
-
-Provide the `source` location:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => bzr,
-        source   => 'lp:myproj'
-    }
-
-For a specific revision, use `revision` with a valid revisionspec
-(see `bzr help revisionspec` for more information on formatting a revision):
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => bzr,
-        source   => 'lp:myproj',
-        revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
-    }
-
-For sources that use SSH (eg, `bzr+ssh://...`, `sftp://...`)
-------------------------------------------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/bzr/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown
deleted file mode 100644
index 3bdd59da4f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.CVS.markdown
+++ /dev/null
@@ -1,66 +0,0 @@
-Using vcsrepo with CVS
-======================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure => present,
-      provider => cvs
-    }
-
-To checkout/update from a repository
-------------------------------------
-
-To get the current mainline:
-
-    vcsrepo { "/path/to/workspace":
-        ensure => present,
-        provider => cvs,
-        source => ":pserver:anonymous@example.com:/sources/myproj"
-    }
-    
-To get a specific module on the current mainline:
-
-    vcsrepo {"/vagrant/lockss-daemon-source":
-        ensure   => present,
-        provider => cvs,
-        source   => ":pserver:anonymous@lockss.cvs.sourceforge.net:/cvsroot/lockss",
-        module   => "lockss-daemon",
-    }
-
-
-You can use the `compression` parameter (it works like CVS `-z`):
-
-    vcsrepo { "/path/to/workspace":
-        ensure => present,
-        provider => cvs,
-        compression => 3,
-        source => ":pserver:anonymous@example.com:/sources/myproj"
-    }
-
-For a specific tag, use `revision`:
-
-    vcsrepo { "/path/to/workspace":
-        ensure => present,
-        provider => cvs,
-        compression => 3,
-        source => ":pserver:anonymous@example.com:/sources/myproj",
-        revision => "SOMETAG"
-    }
-
-For sources that use SSH
-------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/cvs/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown
deleted file mode 100644
index 846bdcc2944..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.GIT.markdown
+++ /dev/null
@@ -1,95 +0,0 @@
-Using vcsrepo with Git
-======================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure => present,
-      provider => git
-    }
-
-If you're defining this for a central/"official" repository, you'll
-probably want to make it a "bare" repository.  Do this by setting
-`ensure` to `bare` instead of `present`:
-
-    vcsrepo { "/path/to/repo":
-        ensure => bare,
-        provider => git
-    }
-
-To clone/pull a repository
-----------------------------
-
-To get the current [master] HEAD:
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => "git://example.com/repo.git"
-    }
-
-For a specific revision or branch (can be a commit SHA, tag or branch name):
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31'
-    }
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => '1.1.2rc1'
-    }
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => 'development'
-    }
-
-Check out as a user:
-
-    vcsrepo { "/path/to/repo":
-        ensure => present,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => '0c466b8a5a45f6cd7de82c08df2fb4ce1e920a31',
-        user => 'someUser'
-    }
-
-Keep the repository at the latest revision (note: this will always overwrite local changes to the repository):
-
-    vcsrepo { "/path/to/repo":
-        ensure => latest,
-        provider => git,
-        source => 'git://example.com/repo.git',
-        revision => 'master',
-    }
-
-For sources that use SSH (eg, `username@server:...`)
-----------------------------------------------------
-
-If your SSH key is associated with a user, simply fill the `user` parameter to use his keys.
-
-Example:
-
-    user => 'toto'  # will use toto's $HOME/.ssh setup
-
-
-Otherwise, manage your SSH keys with Puppet and use `require` in your `vcsrepo` to ensure they are present.
-For more information, see the `require` metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/git/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown
deleted file mode 100644
index 55ceef4acce..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.HG.markdown
+++ /dev/null
@@ -1,73 +0,0 @@
-Using vcsrepo with Mercurial
-============================
-
-To create a blank repository
-----------------------------
-
-Define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure   => present,
-      provider => hg
-    }
-
-To clone/pull & update a repository
------------------------------------
-
-To get the default branch tip:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo"
-    }
-
-For a specific changeset, use `revision`:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo",
-        revision => '21ea4598c962'
-    }
-
-You can also set `revision` to a tag:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo",
-        revision => '1.1.2'
-    }
-
-Check out as a user:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "http://hg.example.com/myrepo",
-        user     => 'user'
-    }
-
-Specify an SSH identity key:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => hg,
-        source   => "ssh://hg@hg.example.com/myrepo",
-        identity => "/home/user/.ssh/id_dsa,
-    }
-
-For sources that use SSH (eg, `ssh://...`)
-------------------------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/hg/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown
deleted file mode 100644
index f374094c1dc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.SVN.markdown
+++ /dev/null
@@ -1,62 +0,0 @@
-Using vcsrepo with Subversion
-=============================
-
-To create a blank repository
-----------------------------
-
-To create a blank repository suitable for use as a central repository,
-define a `vcsrepo` without a `source` or `revision`:
-
-    vcsrepo { "/path/to/repo":
-      ensure   => present,
-      provider => svn
-    }
-
-To checkout from a repository
------------------------------
-
-Provide a `source` qualified to the branch/tag you want:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => svn,
-        source   => "svn://svnrepo/hello/branches/foo"
-    }
-
-You can provide a specific `revision`:
-
-    vcsrepo { "/path/to/repo":
-        ensure   => present,
-        provider => svn,
-        source   => "svn://svnrepo/hello/branches/foo",
-        revision => '1234'
-    }
-
-
-Using a specified Subversion configuration directory 
------------------------------
-
-Provide a `configuration` parameter which should be a directory path on the local system where your svn configuration
-files are.  Typically, it is /path/to/.subversion:
-
-    vcsrepo { "/path/to/repo":
-        ensure        => present,
-        provider      => svn,
-        source        => "svn://svnrepo/hello/branches/foo",
-        configuration => "/path/to/.subversion"
-    }
-
-
-For sources that use SSH (eg, `svn+ssh://...`)
-----------------------------------------------
-
-Manage your SSH keys with Puppet and use `require` in your `vcsrepo`
-to ensure they are present.  For more information, see the `require`
-metaparameter documentation[1].
-
-More Examples
--------------
-
-For examples you can run, see `examples/svn/`
-
-[1]: http://docs.puppetlabs.com/references/stable/metaparameter.html#require
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown
deleted file mode 100644
index 848725630a2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/README.markdown
+++ /dev/null
@@ -1,32 +0,0 @@
-vcsrepo
-=======
-
-[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-vcsrepo.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-vcsrepo)
-
-Purpose
--------
-
-This provides a single type, `vcsrepo`.
-
-This type can be used to describe:
-
-* A working copy checked out from a (remote or local) source, at an
-  arbitrary revision
-* A "blank" working copy not associated with a source (when it makes
-  sense for the VCS being used)
-* A "blank" central repository (when the distinction makes sense for the VCS
-  being used)
-
-Supported Version Control Systems
----------------------------------
-
-This module supports a wide range of VCS types, each represented by a
-separate provider.
-
-For information on how to use this module with a specific VCS, see
-`README.<VCS>.markdown`.
-
-License
--------
-
-See LICENSE.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile
deleted file mode 100644
index cd3d3799589..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/Rakefile
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp
deleted file mode 100644
index 0ed0705ee8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/branch.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-vcsrepo { '/tmp/vcstest-bzr-branch':
-  ensure   => present,
-  provider => bzr,
-  source   => 'lp:do',
-  revision => '1312',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp
deleted file mode 100644
index 1129dd7d059..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/bzr/init_repo.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-bzr-init':
-  ensure   => present,
-  provider => bzr,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp
deleted file mode 100644
index 155742e34d5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/local.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-vcsrepo { '/tmp/vcstest-cvs-repo':
-  ensure   => present,
-  provider => cvs,
-}
-
-vcsrepo { '/tmp/vcstest-cvs-workspace-local':
-  ensure   => present,
-  provider => cvs,
-  source   => '/tmp/vcstest-cvs-repo',
-  require  => Vcsrepo['/tmp/vcstest-cvs-repo'],
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp
deleted file mode 100644
index eb9665a92e5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/cvs/remote.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-vcsrepo { '/tmp/vcstest-cvs-workspace-remote':
-  ensure   => present,
-  provider => cvs,
-  source   => ':pserver:anonymous@cvs.sv.gnu.org:/sources/leetcvrt',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp
deleted file mode 100644
index 4166f6e6963..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/bare_init.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-git-bare':
-  ensure   => bare,
-  provider => git,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp
deleted file mode 100644
index b29a4fdbef5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/clone.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-vcsrepo { '/tmp/vcstest-git-clone':
-  ensure   => present,
-  provider => git,
-  source   => 'git://github.com/bruce/rtex.git',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp
deleted file mode 100644
index e3352eb7c77..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/git/working_copy_init.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-git-wc':
-  ensure   => present,
-  provider => git,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp
deleted file mode 100644
index be2d955de53..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/clone.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-vcsrepo { '/tmp/vcstest-hg-clone':
-  ensure   => present,
-  provider => hg,
-  source   => 'http://hg.basho.com/riak',
-  revision => 'riak-0.5.3',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp
deleted file mode 100644
index a8908040490..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/hg/init_repo.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-hg-init':
-  ensure   => present,
-  provider => hg,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp
deleted file mode 100644
index f9fc2730f5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/checkout.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-vcsrepo { '/tmp/vcstest-svn-checkout':
-  ensure   => present,
-  provider => svn,
-  source   => 'http://svn.edgewall.org/repos/babel/trunk',
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp
deleted file mode 100644
index de7c390f9f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/examples/svn/server.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-vcsrepo { '/tmp/vcstest-svn-server':
-  ensure   => present,
-  provider => svn,
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb
deleted file mode 100644
index 8793e632cb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'tmpdir'
-require 'digest/md5'
-require 'fileutils'
-
-# Abstract
-class Puppet::Provider::Vcsrepo < Puppet::Provider
-
-  private
-
-  def set_ownership
-    owner = @resource.value(:owner) || nil
-    group = @resource.value(:group) || nil
-    FileUtils.chown_R(owner, group, @resource.value(:path))
-  end
-
-  def path_exists?
-    File.directory?(@resource.value(:path))
-  end
-
-  def path_empty?
-    # Path is empty if the only entries are '.' and '..'
-    d = Dir.new(@resource.value(:path))
-    d.read # should return '.'
-    d.read # should return '..'
-    d.read.nil?
-  end
-
-  # Note: We don't rely on Dir.chdir's behavior of automatically returning the
-  # value of the last statement -- for easier stubbing.
-  def at_path(&block) #:nodoc:
-    value = nil
-    Dir.chdir(@resource.value(:path)) do
-      value = yield
-    end
-    value
-  end
-
-  def tempdir
-    @tempdir ||= File.join(Dir.tmpdir, 'vcsrepo-' + Digest::MD5.hexdigest(@resource.value(:path)))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb
deleted file mode 100644
index 6688ce87b22..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/bzr.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:bzr, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Bazaar repositories"
-
-  optional_commands   :bzr => 'bzr'
-  has_features :reference_tracking
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      clone_repository(@resource.value(:revision))
-    end
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), '.bzr'))
-  end
-
-  def exists?
-    working_copy_exists?
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def revision
-    at_path do
-      current_revid = bzr('version-info')[/^revision-id:\s+(\S+)/, 1]
-      desired = @resource.value(:revision)
-      begin
-        desired_revid = bzr('revision-info', desired).strip.split(/\s+/).last
-      rescue Puppet::ExecutionFailure
-        # Possible revid available during update (but definitely not current)
-        desired_revid = nil
-      end
-      if current_revid == desired_revid
-        desired
-      else
-        current_revid
-      end
-    end
-  end
-
-  def revision=(desired)
-    at_path do
-      begin
-        bzr('update', '-r', desired)
-      rescue Puppet::ExecutionFailure
-        bzr('update', '-r', desired, ':parent')
-      end
-    end
-  end
-
-  def latest
-    at_path do
-      bzr('version-info', ':parent')[/^revision-id:\s+(\S+)/, 1]
-    end
-  end
-
-  def latest?
-    at_path do
-      return self.revision == self.latest
-    end
-  end
-
-  private
-
-  def create_repository(path)
-    bzr('init', path)
-  end
-
-  def clone_repository(revision)
-    args = ['branch']
-    if revision
-      args.push('-r', revision)
-    end
-    args.push(@resource.value(:source),
-              @resource.value(:path))
-    bzr(*args)
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb
deleted file mode 100644
index 206e73295e4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/cvs.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports CVS repositories/workspaces"
-
-  optional_commands   :cvs => 'cvs'
-  has_features :gzip_compression, :reference_tracking, :modules, :cvs_rsh
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      checkout_repository
-    end
-    update_owner
-  end
-
-  def exists?
-    if @resource.value(:source)
-      directory = File.join(@resource.value(:path), 'CVS')
-    else
-      directory = File.join(@resource.value(:path), 'CVSROOT')
-    end
-    File.directory?(directory)
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), 'CVS'))
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    debug "Checking for updates because 'ensure => latest'"
-    at_path do
-      # We cannot use -P to prune empty dirs, otherwise
-      # CVS would report those as "missing", regardless
-      # if they have contents or updates.
-      is_current = (runcvs('-nq', 'update', '-d').strip == "")
-      if (!is_current) then debug "There are updates available on the checkout's current branch/tag." end
-      return is_current
-    end
-  end
-
-  def latest
-    # CVS does not have a conecpt like commit-IDs or change
-    # sets, so we can only have the current branch name (or the
-    # requested one, if that differs) as the "latest" revision.
-    should = @resource.value(:revision)
-    current = self.revision
-    return should != current ? should : current
-  end
-
-  def revision
-    if !@rev
-      if File.exist?(tag_file)
-        contents = File.read(tag_file).strip
-        # Note: Doesn't differentiate between N and T entries
-        @rev = contents[1..-1]
-      else
-        @rev = 'HEAD'
-      end
-      debug "Checkout is on branch/tag '#{@rev}'"
-    end
-    return @rev
-  end
-
-  def revision=(desired)
-    at_path do
-      runcvs('update', '-dr', desired, '.')
-      update_owner
-      @rev = desired
-    end
-  end
-
-  private
-
-  def tag_file
-    File.join(@resource.value(:path), 'CVS', 'Tag')
-  end
-
-  def checkout_repository
-    dirname, basename = File.split(@resource.value(:path))
-    Dir.chdir(dirname) do
-      args = ['-d', @resource.value(:source)]
-      if @resource.value(:compression)
-        args.push('-z', @resource.value(:compression))
-      end
-      args.push('checkout')
-      if @resource.value(:revision)
-        args.push('-r', @resource.value(:revision))
-      end
-      args.push('-d', basename, module_name)
-      runcvs(*args)
-    end
-  end
-
-  # When the source:
-  # * Starts with ':' (eg, :pserver:...)
-  def module_name
-    if (m = @resource.value(:module))
-      m
-    elsif (source = @resource.value(:source))
-      source[0, 1] == ':' ? File.basename(source) : '.'
-    end
-  end
-
-  def create_repository(path)
-    runcvs('-d', path, 'init')
-  end
-
-  def update_owner
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-  end
-
-  def runcvs(*args)
-    if @resource.value(:cvs_rsh)
-      debug "Using CVS_RSH = " + @resource.value(:cvs_rsh)
-      e = { :CVS_RSH => @resource.value(:cvs_rsh) }
-    else
-      e = {}
-    end
-
-    # The location of withenv changed from Puppet 2.x to 3.x
-    withenv = Puppet::Util.method(:withenv) if Puppet::Util.respond_to?(:withenv)
-    withenv = Puppet::Util::Execution.method(:withenv) if Puppet::Util::Execution.respond_to?(:withenv)
-    fail("Cannot set custom environment #{e}") if e && !withenv
-
-    withenv.call e do
-      Puppet.debug cvs *args
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb
deleted file mode 100644
index f7b4e54b897..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/dummy.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:dummy, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Dummy default provider"
-
-  defaultfor :vcsrepo => :dummy
-
-  def working_copy_exists?
-    providers = @resource.class.providers.map{|x| x.to_s}.sort.reject{|x| x == "dummy"}.join(", ") rescue "none"
-    raise("vcsrepo resource must have a provider, available: #{providers}")
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb
deleted file mode 100644
index 47e84d29ec7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/git.rb
+++ /dev/null
@@ -1,323 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Git repositories"
-
-  ##TODO modify the commands below so that the su - is included
-  optional_commands :git => 'git',
-                    :su  => 'su'
-  has_features :bare_repositories, :reference_tracking, :ssh_identity, :multiple_remotes, :user
-
-  def create
-    if !@resource.value(:source)
-      init_repository(@resource.value(:path))
-    else
-      clone_repository(@resource.value(:source), @resource.value(:path))
-      if @resource.value(:revision)
-        if @resource.value(:ensure) == :bare
-          notice "Ignoring revision for bare repository"
-        else
-          checkout
-        end
-      end
-      if @resource.value(:ensure) != :bare
-        update_submodules
-      end
-    end
-    update_owner_and_excludes
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    at_path do
-      return self.revision == self.latest
-    end
-  end
-
-  def latest
-    branch = on_branch?
-    if branch == 'master'
-      return get_revision("#{@resource.value(:remote)}/HEAD")
-    elsif branch == '(no branch)'
-      return get_revision('HEAD')
-    else
-      return get_revision("#{@resource.value(:remote)}/%s" % branch)
-    end
-  end
-
-  def revision
-    update_references
-    current = at_path { git_with_identity('rev-parse', 'HEAD').chomp }
-    return current unless @resource.value(:revision)
-
-    if tag_revision?(@resource.value(:revision))
-      canonical = at_path { git_with_identity('show', @resource.value(:revision)).scan(/^commit (.*)/).to_s }
-    else
-      # if it's not a tag, look for it as a local ref
-      canonical = at_path { git_with_identity('rev-parse', '--revs-only', @resource.value(:revision)).chomp }
-      if canonical.empty?
-        # git rev-parse executed properly but didn't find the ref;
-        # look for it in the remote
-        remote_ref = at_path { git_with_identity('ls-remote', '--heads', '--tags', @resource.value(:remote), @resource.value(:revision)).chomp }
-        if remote_ref.empty?
-          fail("#{@resource.value(:revision)} is not a local or remote ref")
-        end
-
-        # $ git ls-remote --heads --tags origin feature/cvs
-        # 7d4244b35e72904e30130cad6d2258f901c16f1a	refs/heads/feature/cvs
-        canonical = remote_ref.split.first
-      end
-    end
-
-    if current == canonical
-      @resource.value(:revision)
-    else
-      current
-    end
-  end
-
-  def revision=(desired)
-    checkout(desired)
-    if local_branch_revision?(desired)
-      # reset instead of pull to avoid merge conflicts. assuming remote is
-      # authoritative.
-      # might be worthwhile to have an allow_local_changes param to decide
-      # whether to reset or pull when we're ensuring latest.
-      at_path { git_with_identity('reset', '--hard', "#{@resource.value(:remote)}/#{desired}") }
-    end
-    if @resource.value(:ensure) != :bare
-      update_submodules
-    end
-    update_owner_and_excludes
-  end
-
-  def bare_exists?
-    bare_git_config_exists? && !working_copy_exists?
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), '.git'))
-  end
-
-  def exists?
-    working_copy_exists? || bare_exists?
-  end
-
-  def update_remote_origin_url
-    current = git_with_identity('config', 'remote.origin.url')
-    unless @resource.value(:source).nil?
-      if current.nil? or current.strip != @resource.value(:source)
-        git_with_identity('config', 'remote.origin.url', @resource.value(:source))
-      end
-    end
-  end
-
-  def update_references
-    at_path do
-      update_remote_origin_url
-      git_with_identity('fetch', @resource.value(:remote))
-      git_with_identity('fetch', '--tags', @resource.value(:remote))
-      update_owner_and_excludes
-    end
-  end
-
-  private
-
-  def bare_git_config_exists?
-    File.exist?(File.join(@resource.value(:path), 'config'))
-  end
-
-  def clone_repository(source, path)
-    check_force
-    args = ['clone']
-    if @resource.value(:ensure) == :bare
-      args << '--bare'
-    end
-    if !File.exist?(File.join(@resource.value(:path), '.git'))
-      args.push(source, path)
-      Dir.chdir("/") do
-        git_with_identity(*args)
-      end
-    else
-      notice "Repo has already been cloned"
-    end
-  end
-
-  def check_force
-    if path_exists? and not path_empty?
-      if @resource.value(:force)
-        notice "Removing %s to replace with vcsrepo." % @resource.value(:path)
-        destroy
-      else
-        raise Puppet::Error, "Could not create repository (non-repository at path)"
-      end
-    end
-  end
-
-  def init_repository(path)
-    check_force
-    if @resource.value(:ensure) == :bare && working_copy_exists?
-      convert_working_copy_to_bare
-    elsif @resource.value(:ensure) == :present && bare_exists?
-      convert_bare_to_working_copy
-    else
-      # normal init
-      FileUtils.mkdir(@resource.value(:path))
-      FileUtils.chown(@resource.value(:user), nil, @resource.value(:path)) if @resource.value(:user)
-      args = ['init']
-      if @resource.value(:ensure) == :bare
-        args << '--bare'
-      end
-      at_path do
-        git_with_identity(*args)
-      end
-    end
-  end
-
-  # Convert working copy to bare
-  #
-  # Moves:
-  #   <path>/.git
-  # to:
-  #   <path>/
-  def convert_working_copy_to_bare
-    notice "Converting working copy repository to bare repository"
-    FileUtils.mv(File.join(@resource.value(:path), '.git'), tempdir)
-    FileUtils.rm_rf(@resource.value(:path))
-    FileUtils.mv(tempdir, @resource.value(:path))
-  end
-
-  # Convert bare to working copy
-  #
-  # Moves:
-  #   <path>/
-  # to:
-  #   <path>/.git
-  def convert_bare_to_working_copy
-    notice "Converting bare repository to working copy repository"
-    FileUtils.mv(@resource.value(:path), tempdir)
-    FileUtils.mkdir(@resource.value(:path))
-    FileUtils.mv(tempdir, File.join(@resource.value(:path), '.git'))
-    if commits_in?(File.join(@resource.value(:path), '.git'))
-      reset('HEAD')
-      git_with_identity('checkout', '--force')
-      update_owner_and_excludes
-    end
-  end
-
-  def commits_in?(dot_git)
-    Dir.glob(File.join(dot_git, 'objects/info/*'), File::FNM_DOTMATCH) do |e|
-      return true unless %w(. ..).include?(File::basename(e))
-    end
-    false
-  end
-
-  def checkout(revision = @resource.value(:revision))
-    if !local_branch_revision? && remote_branch_revision?
-      at_path { git_with_identity('checkout', '-b', revision, '--track', "#{@resource.value(:remote)}/#{revision}") }
-    else
-      at_path { git_with_identity('checkout', '--force', revision) }
-    end
-  end
-
-  def reset(desired)
-    at_path do
-      git_with_identity('reset', '--hard', desired)
-    end
-  end
-
-  def update_submodules
-    at_path do
-      git_with_identity('submodule', 'update', '--init', '--recursive')
-    end
-  end
-
-  def remote_branch_revision?(revision = @resource.value(:revision))
-    # git < 1.6 returns '#{@resource.value(:remote)}/#{revision}'
-    # git 1.6+ returns 'remotes/#{@resource.value(:remote)}/#{revision}'
-    branch = at_path { branches.grep /(remotes\/)?#{@resource.value(:remote)}\/#{revision}/ }
-    branch unless branch.empty?
-  end
-
-  def local_branch_revision?(revision = @resource.value(:revision))
-    at_path { branches.include?(revision) }
-  end
-
-  def tag_revision?(revision = @resource.value(:revision))
-    at_path { tags.include?(revision) }
-  end
-
-  def branches
-    at_path { git_with_identity('branch', '-a') }.gsub('*', ' ').split(/\n/).map { |line| line.strip }
-  end
-
-  def on_branch?
-    at_path { git_with_identity('branch', '-a') }.split(/\n/).grep(/\*/).first.to_s.gsub('*', '').strip
-  end
-
-  def tags
-    at_path { git_with_identity('tag', '-l') }.split(/\n/).map { |line| line.strip }
-  end
-
-  def set_excludes
-    at_path { open('.git/info/exclude', 'w') { |f| @resource.value(:excludes).each { |ex| f.write(ex + "\n") }}}
-  end
-
-  def get_revision(rev)
-    if !working_copy_exists?
-      create
-    end
-    at_path do
-      update_remote_origin_url
-      git_with_identity('fetch', @resource.value(:remote))
-      git_with_identity('fetch', '--tags', @resource.value(:remote))
-    end
-    current = at_path { git_with_identity('rev-parse', rev).strip }
-    if @resource.value(:revision)
-      if local_branch_revision?
-        canonical = at_path { git_with_identity('rev-parse', @resource.value(:revision)).strip }
-      elsif remote_branch_revision?
-        canonical = at_path { git_with_identity('rev-parse', "#{@resource.value(:remote)}/" + @resource.value(:revision)).strip }
-      end
-      current = @resource.value(:revision) if current == canonical
-    end
-    update_owner_and_excludes
-    return current
-  end
-
-  def update_owner_and_excludes
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-    if @resource.value(:excludes)
-      set_excludes
-    end
-  end
-
-  def git_with_identity(*args)
-    if @resource.value(:identity)
-      Tempfile.open('git-helper') do |f|
-        f.puts '#!/bin/sh'
-        f.puts "exec ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -oConnectTimeout=120 -i #{@resource.value(:identity)} $*"
-        f.close
-
-        FileUtils.chmod(0755, f.path)
-        env_save = ENV['GIT_SSH']
-        ENV['GIT_SSH'] = f.path
-
-        ret = git(*args)
-
-        ENV['GIT_SSH'] = env_save
-
-        return ret
-      end
-    elsif @resource.value(:user)
-      su(@resource.value(:user), '-c', "git #{args.join(' ')}" )
-    else
-      git(*args)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb
deleted file mode 100644
index 4886b7a1f8e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/hg.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Mercurial repositories"
-
-  optional_commands :hg => 'hg',
-                    :su => 'su'
-  has_features :reference_tracking, :ssh_identity, :user
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      clone_repository(@resource.value(:revision))
-    end
-    update_owner
-  end
-
-  def working_copy_exists?
-    File.directory?(File.join(@resource.value(:path), '.hg'))
-  end
-
-  def exists?
-    working_copy_exists?
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    at_path do
-      return self.revision == self.latest
-    end
-  end
-
-  def latest
-    at_path do
-      begin
-        hg_wrapper('incoming', '--branch', '.', '--newest-first', '--limit', '1')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1]
-      rescue Puppet::ExecutionFailure
-        # If there are no new changesets, return the current nodeid
-        self.revision
-      end
-    end
-  end
-
-  def revision
-    at_path do
-      current = hg_wrapper('parents')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1]
-      desired = @resource.value(:revision)
-      if desired
-        # Return the tag name if it maps to the current nodeid
-        mapped = hg_wrapper('tags')[/^#{Regexp.quote(desired)}\s+\d+:(\S+)/m, 1]
-        if current == mapped
-          desired
-        else
-          current
-        end
-      else
-        current
-      end
-    end
-  end
-
-  def revision=(desired)
-    at_path do
-      begin
-        hg_wrapper('pull')
-      rescue
-      end
-      begin
-        hg_wrapper('merge')
-      rescue Puppet::ExecutionFailure
-        # If there's nothing to merge, just skip
-      end
-      hg_wrapper('update', '--clean', '-r', desired)
-    end
-    update_owner
-  end
-
-  private
-
-  def create_repository(path)
-    hg_wrapper('init', path)
-  end
-
-  def clone_repository(revision)
-    args = ['clone']
-    if revision
-      args.push('-u', revision)
-    end
-    args.push(@resource.value(:source),
-              @resource.value(:path))
-    hg_wrapper(*args)
-  end
-
-  def update_owner
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-  end
-
-  def hg_wrapper(*args)
-    if @resource.value(:identity)
-      args += ["--ssh", "ssh -oStrictHostKeyChecking=no -oPasswordAuthentication=no -oKbdInteractiveAuthentication=no -oChallengeResponseAuthentication=no -i #{@resource.value(:identity)}"]
-    end
-    if @resource.value(:user)
-      args.map! { |a| if a =~ /\s/ then "'#{a}'" else a end }  # Adds quotes to arguments with whitespaces.
-      su(@resource.value(:user), '-c', "hg #{args.join(' ')}")
-    else
-      hg(*args)
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb
deleted file mode 100644
index e0d5b2164e6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/provider/vcsrepo/svn.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'vcsrepo')
-
-Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) do
-  desc "Supports Subversion repositories"
-
-  optional_commands :svn      => 'svn',
-                    :svnadmin => 'svnadmin',
-                    :svnlook  => 'svnlook'
-
-  has_features :filesystem_types, :reference_tracking, :basic_auth, :configuration
-
-  def create
-    if !@resource.value(:source)
-      create_repository(@resource.value(:path))
-    else
-      checkout_repository(@resource.value(:source),
-                          @resource.value(:path),
-                          @resource.value(:revision))
-    end
-    update_owner
-  end
-
-  def working_copy_exists?
-    if File.directory?(@resource.value(:path))
-      # :path is an svn checkout
-      return true if File.directory?(File.join(@resource.value(:path), '.svn'))
-      # :path is an svn server
-      return true if svnlook('uuid', @resource.value(:path))
-    end
-    false
-  end
-
-  def exists?
-    working_copy_exists?
-  end
-
-  def destroy
-    FileUtils.rm_rf(@resource.value(:path))
-  end
-
-  def latest?
-    at_path do
-      (self.revision >= self.latest) and (@resource.value(:source) == self.sourceurl)
-    end
-  end
-
-  def buildargs
-    args = ['--non-interactive']
-    if @resource.value(:basic_auth_username) && @resource.value(:basic_auth_password)
-      args.push('--username', @resource.value(:basic_auth_username))
-      args.push('--password', @resource.value(:basic_auth_password))
-      args.push('--no-auth-cache')
-    end
-
-    if @resource.value(:force)
-      args.push('--force')
-    end
-
-    if @resource.value(:configuration)
-      args.push('--config-dir', @resource.value(:configuration))
-    end
-
-    args
-  end
-
-  def latest
-    args = buildargs.push('info', '-r', 'HEAD')
-    at_path do
-      svn(*args)[/^Revision:\s+(\d+)/m, 1]
-    end
-  end
-
-  def sourceurl
-    args = buildargs.push('info')
-    at_path do
-      svn(*args)[/^URL:\s+(\S+)/m, 1]
-    end
-  end
-
-  def revision
-    args = buildargs.push('info')
-    at_path do
-      svn(*args)[/^Revision:\s+(\d+)/m, 1]
-    end
-  end
-
-  def revision=(desired)
-    args = if @resource.value(:source)
-             buildargs.push('switch', '-r', desired, @resource.value(:source))
-           else
-             buildargs.push('update', '-r', desired)
-           end
-    at_path do
-      svn(*args)
-    end
-    update_owner
-  end
-
-  private
-
-  def checkout_repository(source, path, revision)
-    args = buildargs.push('checkout')
-    if revision
-      args.push('-r', revision)
-    end
-    args.push(source, path)
-    svn(*args)
-  end
-
-  def create_repository(path)
-    args = ['create']
-    if @resource.value(:fstype)
-      args.push('--fs-type', @resource.value(:fstype))
-    end
-    args << path
-    svnadmin(*args)
-  end
-
-  def update_owner
-    if @resource.value(:owner) or @resource.value(:group)
-      set_ownership
-    end
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb
deleted file mode 100644
index ad90cedd833..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/lib/puppet/type/vcsrepo.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-require 'pathname'
-
-Puppet::Type.newtype(:vcsrepo) do
-  desc "A local version control repository"
-
-  feature :gzip_compression,
-          "The provider supports explicit GZip compression levels"
-  feature :basic_auth,
-          "The provider supports HTTP Basic Authentication"
-  feature :bare_repositories,
-          "The provider differentiates between bare repositories
-          and those with working copies",
-          :methods => [:bare_exists?, :working_copy_exists?]
-
-  feature :filesystem_types,
-          "The provider supports different filesystem types"
-
-  feature :reference_tracking,
-          "The provider supports tracking revision references that can change
-           over time (eg, some VCS tags and branch names)"
-
-  feature :ssh_identity,
-          "The provider supports a configurable SSH identity file"
-
-  feature :user,
-          "The provider can run as a different user"
-
-  feature :modules,
-          "The repository contains modules that can be chosen of"
-
-  feature :multiple_remotes,
-          "The repository tracks multiple remote repositories"
-
-  feature :configuration,
-          "The configuration directory to use"
-
-  feature :cvs_rsh,
-          "The provider understands the CVS_RSH environment variable"
-
-  ensurable do
-    attr_accessor :latest
-
-    def insync?(is)
-      @should ||= []
-
-      case should
-      when :present
-        return true unless [:absent, :purged, :held].include?(is)
-      when :latest
-        if is == :latest
-          return true
-        else
-          return false
-        end
-      when :bare
-        return is == :bare
-      end
-    end
-
-    newvalue :present do
-      notice "Creating repository from present"
-      provider.create
-    end
-
-    newvalue :bare, :required_features => [:bare_repositories] do
-      if !provider.exists?
-        provider.create
-      end
-    end
-
-    newvalue :absent do
-      provider.destroy
-    end
-
-    newvalue :latest, :required_features => [:reference_tracking] do
-      if provider.exists?
-        if provider.respond_to?(:update_references)
-          provider.update_references
-        end
-        if provider.respond_to?(:latest?)
-            reference = provider.latest || provider.revision
-        else
-          reference = resource.value(:revision) || provider.revision
-        end
-        notice "Updating to latest '#{reference}' revision"
-        provider.revision = reference
-      else
-        notice "Creating repository from latest"
-        provider.create
-      end
-    end
-
-    def retrieve
-      prov = @resource.provider
-      if prov
-        if prov.working_copy_exists?
-          (@should.include?(:latest) && prov.latest?) ? :latest : :present
-        elsif prov.class.feature?(:bare_repositories) and prov.bare_exists?
-          :bare
-        else
-          :absent
-        end
-      else
-        raise Puppet::Error, "Could not find provider"
-      end
-    end
-
-  end
-
-  newparam :path do
-    desc "Absolute path to repository"
-    isnamevar
-    validate do |value|
-      path = Pathname.new(value)
-      unless path.absolute?
-        raise ArgumentError, "Path must be absolute: #{path}"
-      end
-    end
-  end
-
-  newparam :source do
-    desc "The source URI for the repository"
-  end
-
-  newparam :fstype, :required_features => [:filesystem_types] do
-    desc "Filesystem type"
-  end
-
-  newproperty :revision do
-    desc "The revision of the repository"
-    newvalue(/^\S+$/)
-  end
-
-  newparam :owner do
-    desc "The user/uid that owns the repository files"
-  end
-
-  newparam :group do
-    desc "The group/gid that owns the repository files"
-  end
-
-  newparam :user do
-    desc "The user to run for repository operations"
-  end
-
-  newparam :excludes do
-    desc "Files to be excluded from the repository"
-  end
-
-  newparam :force do
-    desc "Force repository creation, destroying any files on the path in the process."
-    newvalues(:true, :false)
-    defaultto false
-  end
-
-  newparam :compression, :required_features => [:gzip_compression] do
-    desc "Compression level"
-    validate do |amount|
-      unless Integer(amount).between?(0, 6)
-        raise ArgumentError, "Unsupported compression level: #{amount} (expected 0-6)"
-      end
-    end
-  end
-
-  newparam :basic_auth_username, :required_features => [:basic_auth] do
-    desc "HTTP Basic Auth username"
-  end
-
-  newparam :basic_auth_password, :required_features => [:basic_auth] do
-    desc "HTTP Basic Auth password"
-  end
-
-  newparam :identity, :required_features => [:ssh_identity] do
-    desc "SSH identity file"
-  end
-
-  newparam :module, :required_features => [:modules] do
-    desc "The repository module to manage"
-  end
-
-  newparam :remote, :required_features => [:multiple_remotes] do
-    desc "The remote repository to track"
-    defaultto "origin"
-  end
-
-  newparam :configuration, :required_features => [:configuration]  do
-    desc "The configuration directory to use"
-  end
-
-  newparam :cvs_rsh, :required_features => [:cvs_rsh] do
-    desc "The value to be used for the CVS_RSH environment variable."
-  end
-
-  autorequire(:package) do
-    ['git', 'git-core']
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt
deleted file mode 100644
index 88a56a1c80f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/bzr_version_info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-revision-id: menesis@pov.lt-20100309191856-4wmfqzc803fj300x
-date: 2010-03-09 21:18:56 +0200
-build-date: 2010-03-14 00:42:43 -0800
-revno: 2634
-branch-nick: mytest
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt
deleted file mode 100644
index 2c99829d48f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_a.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-  feature/foo
-  feature/bar
-  feature/baz
-  feature/quux
-  only/local
-* master
-  refactor/foo
-  origin/HEAD
-  origin/feature/foo
-  origin/feature/bar
-  origin/feature/baz
-  origin/feature/quux
-  origin/only/remote
-  origin/master
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt
deleted file mode 100644
index 72d5e2009c5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_feature_bar.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-  feature/foo
-* feature/bar
-  feature/baz
-  feature/quux
-  only/local
-  master
-  refactor/foo
-  origin/HEAD
-  origin/feature/foo
-  origin/feature/bar
-  origin/feature/baz
-  origin/feature/quux
-  origin/only/remote
-  origin/master
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt
deleted file mode 100644
index 7207c37929b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/git_branch_none.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-  feature/foo
-  feature/bar
-  feature/baz
-  feature/quux
-  only/local
-  master
-* (no branch)  
-  refactor/foo
-  origin/HEAD
-  origin/feature/foo
-  origin/feature/bar
-  origin/feature/baz
-  origin/feature/quux
-  origin/only/remote
-  origin/master
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt
deleted file mode 100644
index 46173df499d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_parents.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-changeset:   3:34e6012c783a
-parent:      2:21ea4598c962
-parent:      1:9d0ff0028458
-user:        Test User <test.user@example.com>
-date:        Fri Aug 07 13:13:02 2009 -0400
-summary:     merge
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt
deleted file mode 100644
index 53792e5ac8d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/hg_tags.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-tip                             1019:bca3f20b249b
-0.9.1                           1017:76ce7cca95d8
-0.9                             1001:dbaa6f4ec585
-0.8                              839:65b66ac0fc83
-0.7.1                            702:e1357f00129f
-0.7                              561:7b2af3b4c968
-0.6.3                            486:e38077f4e4aa
-0.6.2                            405:07bb099b7b10
-0.6.1                            389:93750f3fbbe2
-0.6                              369:34e6012c783a
-0.5.3                            321:5ffa6ae7e699
-0.5.2                            318:fdc2c2e4cebe
-0.5.1                            315:33a5ea0cbe7a
-0.5                              313:47490716f4c9
-0.4                              240:47fa3a14cc63
-0.3.1                            132:bc231db18e1c
-0.3                              130:661615e510dd
-0.2                               81:f98d13b442f6
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt
deleted file mode 100644
index d2a975b238f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/fixtures/svn_info.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Path: .
-URL: http://example.com/svn/trunk
-Repository Root: http://example.com/svn
-Repository UUID: 75246ace-e253-0410-96dd-a7613ca8dc81
-Revision: 4
-Node Kind: directory
-Schedule: normal
-Last Changed Author: jon
-Last Changed Rev: 3
-Last Changed Date: 2008-08-07 11:34:25 -0700 (Thu, 07 Aug 2008)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts
deleted file mode 100644
index 91cd6427ed6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec.opts
+++ /dev/null
@@ -1,6 +0,0 @@
---format
-s
---colour
---loadby
-mtime
---backtrace
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb
deleted file mode 100644
index acfae0cb8cb..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/spec_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
-require 'simplecov'
-require 'support/filesystem_helpers'
-require 'support/fixture_helpers'
-
-SimpleCov.start do
-    add_filter "/spec/"
-end
-
-RSpec.configure do |c|
-  c.include FilesystemHelpers
-  c.include FixtureHelpers
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb
deleted file mode 100644
index 15e2ca750a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/filesystem_helpers.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module FilesystemHelpers
-
-  def expects_chdir(path = resource.value(:path))
-    Dir.expects(:chdir).with(path).at_least_once.yields
-  end
-
-  def expects_mkdir(path = resource.value(:path))
-    Dir.expects(:mkdir).with(path).at_least_once
-  end
-
-  def expects_rm_rf(path = resource.value(:path))
-    FileUtils.expects(:rm_rf).with(path)
-  end
-
-  def expects_directory?(returns = true, path = resource.value(:path))
-    File.expects(:directory?).with(path).returns(returns)
-  end
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb
deleted file mode 100644
index 8a0e0a0b4cc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/support/fixture_helpers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module FixtureHelpers
-
-  def fixture(name, ext = '.txt')
-    File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', name.to_s + ext))
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
deleted file mode 100644
index 488ddc0f90a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:bzr_provider) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :bzr,
-    :revision => '2634',
-    :source   => 'lp:do',
-    :path     => '/tmp/test',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('bzr').returns('/usr/bin/bzr')
-  end
-
-  describe 'creating' do
-    context 'with defaults' do
-      it "should execute 'bzr clone -r' with the revision" do
-        provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'without revision' do
-      it "should just execute 'bzr clone' without a revision" do
-        resource.delete(:revision)
-        provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'without source' do
-      it "should execute 'bzr init'" do
-        resource.delete(:source)
-        provider.expects(:bzr).with('init', resource.value(:path))
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the directory" do
-      File.expects(:directory?).with(File.join(resource.value(:path), '.bzr')).returns(true)
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      expects_chdir
-      provider.expects(:bzr).with('version-info').returns(File.read(fixtures('bzr_version_info.txt')))
-      @current_revid = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
-    end
-
-    context "when given a non-revid as the resource revision" do
-      context "when its revid is not different than the current revid" do
-        it "should return the ref" do
-          resource[:revision] = '2634'
-          provider.expects(:bzr).with('revision-info', '2634').returns("2634 menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n")
-          provider.revision.should == resource.value(:revision)
-        end
-      end
-      context "when its revid is different than the current revid" do
-        it "should return the current revid" do
-          resource[:revision] = '2636'
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2635 foo\n")
-          provider.revision.should == @current_revid
-        end
-      end
-    end
-
-    context "when given a revid as the resource revision" do
-      context "when it is the same as the current revid" do
-        it "should return it" do
-          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n")
-          provider.revision.should == resource.value(:revision)
-        end
-      end
-      context "when it is not the same as the current revid" do
-        it "should return the current revid" do
-          resource[:revision] = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'
-          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2636 foo\n")
-          provider.revision.should == @current_revid
-        end
-      end
-
-    end
-  end
-
-  describe "setting the revision property" do
-    it "should use 'bzr update -r' with the revision" do
-      Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
-      provider.expects(:bzr).with('update', '-r', 'somerev')
-      provider.revision = 'somerev'
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
deleted file mode 100644
index efa4b33b36a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/cvs_spec.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:cvs_provider) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :cvs,
-    :revision => '2634',
-    :source   => 'lp:do',
-    :path     => '/tmp/test',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('cvs').returns('/usr/bin/cvs')
-  end
-
-  describe 'creating' do
-    context "with a source" do
-      it "should execute 'cvs checkout'" do
-        resource[:source] = ':ext:source@example.com:/foo/bar'
-        resource[:revision] = 'an-unimportant-value'
-        expects_chdir('/tmp')
-        provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-r', 'an-unimportant-value', '-d', 'test', 'bar')
-        provider.create
-      end
-
-      it "should just execute 'cvs checkout' without a revision" do
-        resource[:source] = ':ext:source@example.com:/foo/bar'
-        resource.delete(:revision)
-        provider.expects(:cvs).with('-d', resource.value(:source), 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
-        provider.create
-      end
-
-      context "with a compression" do
-        it "should just execute 'cvs checkout' without a revision" do
-          resource[:source] = ':ext:source@example.com:/foo/bar'
-          resource[:compression] = '3'
-          resource.delete(:revision)
-          provider.expects(:cvs).with('-d', resource.value(:source), '-z', '3', 'checkout', '-d', File.basename(resource.value(:path)), File.basename(resource.value(:source)))
-          provider.create
-        end
-      end
-    end
-
-    context "when a source is not given" do
-      it "should execute 'cvs init'" do
-        resource.delete(:source)
-        provider.expects(:cvs).with('-d', resource.value(:path), 'init')
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the CVS directory with source" do
-      resource[:source] = ':ext:source@example.com:/foo/bar'
-      File.expects(:directory?).with(File.join(resource.value(:path), 'CVS'))
-      provider.exists?
-    end
-
-    it "should check for the CVSROOT directory without source" do
-      resource.delete(:source)
-      File.expects(:directory?).with(File.join(resource.value(:path), 'CVSROOT'))
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      @tag_file = File.join(resource.value(:path), 'CVS', 'Tag')
-    end
-
-    context "when CVS/Tag exists" do
-      before do
-        @tag = 'TAG'
-        File.expects(:exist?).with(@tag_file).returns(true)
-      end
-      it "should read CVS/Tag" do
-        File.expects(:read).with(@tag_file).returns("T#{@tag}")
-        provider.revision.should == @tag
-      end
-    end
-
-    context "when CVS/Tag does not exist" do
-      before do
-        File.expects(:exist?).with(@tag_file).returns(false)
-      end
-      it "assumes HEAD" do
-        provider.revision.should == 'HEAD'
-      end
-    end
-  end
-
-  describe "when setting the revision property" do
-    before do
-      @tag = 'SOMETAG'
-    end
-
-    it "should use 'cvs update -dr'" do
-      expects_chdir
-      provider.expects(:cvs).with('update', '-dr', @tag, '.')
-      provider.revision = @tag
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb
deleted file mode 100644
index 15fee535654..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ /dev/null
@@ -1,369 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:git_provider) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :git,
-    :revision => '2634',
-    :source   => 'git@repo',
-    :path     => '/tmp/test',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git')
-  end
-
-  context 'creating' do
-    context "with a revision that is a remote branch" do
-      it "should execute 'git clone' and 'git checkout -b'" do
-        resource[:revision] = 'only/remote'
-        Dir.expects(:chdir).with('/').at_least_once.yields
-        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
-        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.create
-      end
-    end
-
-    context "with a revision that is not a remote branch" do
-      it "should execute 'git clone' and 'git reset --hard'" do
-        resource[:revision] = 'a-commit-or-tag'
-        Dir.expects(:chdir).with('/').at_least_once.yields
-        Dir.expects(:chdir).with('/tmp/test').at_least_once.yields
-        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.create
-      end
-
-      it "should execute 'git clone' and submodule commands" do
-        resource.delete(:revision)
-        provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
-        provider.expects(:update_submodules)
-        provider.create
-      end
-    end
-
-    context "with an ensure of bare" do
-      context "with revision" do
-        it "should just execute 'git clone --bare'" do
-          resource[:ensure] = :bare
-          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
-          provider.create
-        end
-      end
-      context "without revision" do
-        it "should just execute 'git clone --bare'" do
-          resource[:ensure] = :bare
-          resource.delete(:revision)
-          provider.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
-          provider.create
-        end
-      end
-    end
-
-    context "when a source is not given" do
-      context "when the path does not exist" do
-        it "should execute 'git init'" do
-          resource[:ensure] = :present
-          resource.delete(:source)
-          expects_mkdir
-          expects_chdir
-          expects_directory?(false)
-
-          provider.expects(:bare_exists?).returns(false)
-          provider.expects(:git).with('init')
-          provider.create
-        end
-      end
-
-      context "when the path is a bare repository" do
-        it "should convert it to a working copy" do
-          resource[:ensure] = :present
-          resource.delete(:source)
-          provider.expects(:bare_exists?).returns(true)
-          provider.expects(:convert_bare_to_working_copy)
-          provider.create
-        end
-      end
-
-      context "when the path is not empty and not a repository" do
-        it "should raise an exception" do
-          provider.expects(:path_exists?).returns(true)
-          provider.expects(:path_empty?).returns(false)
-          proc { provider.create }.should raise_error(Puppet::Error)
-        end
-      end
-    end
-
-    context "when the path does not exist" do
-      it "should execute 'git init --bare'" do
-        resource[:ensure] = :bare
-        resource.delete(:source)
-        expects_chdir
-        expects_mkdir
-        expects_directory?(false)
-        provider.expects(:working_copy_exists?).returns(false)
-        provider.expects(:git).with('init', '--bare')
-        provider.create
-      end
-    end
-
-    context "when the path is a working copy repository" do
-      it "should convert it to a bare repository" do
-        resource[:ensure] = :bare
-        resource.delete(:source)
-        provider.expects(:working_copy_exists?).returns(true)
-        provider.expects(:convert_working_copy_to_bare)
-        provider.create
-      end
-    end
-
-    context "when the path is not empty and not a repository" do
-      it "should raise an exception" do
-        expects_directory?(true)
-        provider.expects(:path_empty?).returns(false)
-        proc { provider.create }.should raise_error(Puppet::Error)
-      end
-    end
-  end
-
-
-  context 'destroying' do
-    it "it should remove the directory" do
-      #expects_rm_rf
-      provider.destroy
-    end
-  end
-
-  context "checking the revision property" do
-    before do
-      expects_chdir('/tmp/test')
-      resource[:revision] = 'currentsha'
-      resource.delete(:source)
-      provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
-    end
-
-    context "when its SHA is not different than the current SHA" do
-      it "should return the ref" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.revision.should == resource.value(:revision)
-      end
-    end
-
-    context "when its SHA is different than the current SHA" do
-      it "should return the current SHA" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('othersha')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.revision.should == 'currentsha'
-      end
-    end
-
-    context "when its a ref to a remote head" do
-      it "should return the revision" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns("newsha refs/heads/#{resource.value(:revision)}")
-        provider.revision.should == 'currentsha'
-      end
-    end
-
-    context "when its a ref to non existant remote head" do
-      it "should fail" do
-        provider.expects(:git).with('config', 'remote.origin.url').returns('')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('')
-        provider.expects(:git).with('ls-remote', '--heads', '--tags', 'origin', resource.value(:revision)).returns('')
-        expect { provider.revision }.to raise_error(Puppet::Error, /not a local or remote ref$/)
-      end
-    end
-
-    context "when the source is modified" do
-      it "should update the origin url" do
-        resource[:source] = 'git://git@foo.com/bar.git'
-        provider.expects(:git).with('config', 'remote.origin.url').returns('old')
-        provider.expects(:git).with('config', 'remote.origin.url', 'git://git@foo.com/bar.git')
-        provider.expects(:git).with('fetch', 'origin') # FIXME
-        provider.expects(:git).with('fetch', '--tags', 'origin')
-        provider.expects(:git).with('rev-parse', '--revs-only', resource.value(:revision)).returns('currentsha')
-        provider.expects(:git).with('tag', '-l').returns("Hello")
-        provider.revision.should == resource.value(:revision)
-      end
-    end
-  end
-
-  context "setting the revision property" do
-    before do
-      expects_chdir
-    end
-    context "when it's an existing local branch" do
-      it "should use 'git fetch' and 'git reset'" do
-        resource[:revision] = 'feature/foo'
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}")
-        provider.revision = resource.value(:revision)
-      end
-    end
-    context "when it's a remote branch" do
-      it "should use 'git fetch' and 'git reset'" do
-        resource[:revision] = 'only/remote'
-        provider.expects(:update_submodules)
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.expects(:git).with('branch', '-a').returns(resource.value(:revision))
-        provider.expects(:git).with('reset', '--hard', "origin/#{resource.value(:revision)}")
-        provider.revision = resource.value(:revision)
-      end
-    end
-    context "when it's a commit or tag" do
-      it "should use 'git fetch' and 'git reset'" do
-        resource[:revision] = 'a-commit-or-tag'
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.expects(:git).with('checkout', '--force', resource.value(:revision))
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.expects(:git).with('submodule', 'update', '--init', '--recursive')
-        provider.revision = resource.value(:revision)
-      end
-    end
-  end
-
-  context "updating references" do
-    it "should use 'git fetch --tags'" do
-      resource.delete(:source)
-      expects_chdir
-      provider.expects(:git).with('config', 'remote.origin.url').returns('')
-      provider.expects(:git).with('fetch', 'origin')
-      provider.expects(:git).with('fetch', '--tags', 'origin')
-      provider.update_references
-    end
-  end
-
-  context "checking if revision" do
-    before do
-      expects_chdir
-      provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-    end
-    context "is a local branch" do
-      context "when it's listed in 'git branch -a'" do
-        it "should return true" do
-          resource[:revision] = 'feature/foo'
-          provider.should be_local_branch_revision
-        end
-      end
-      context "when it's not listed in 'git branch -a'" do
-        it "should return false" do
-          resource[:revision] = 'feature/notexist'
-          provider.should_not be_local_branch_revision
-        end
-      end
-    end
-    context "is a remote branch" do
-      context "when it's listed in 'git branch -a' with an 'origin/' prefix" do
-        it "should return true" do
-          resource[:revision] = 'only/remote'
-          provider.should be_remote_branch_revision
-        end
-      end
-      context "when it's not listed in 'git branch -a' with an 'origin/' prefix" do
-        it "should return false" do
-          resource[:revision] = 'only/local'
-          provider.should_not be_remote_branch_revision
-        end
-      end
-    end
-  end
-
-  describe 'latest?' do
-    before do
-      expects_chdir('/tmp/test')
-    end
-    context 'when true' do
-      it do
-        provider.expects(:revision).returns('testrev')
-        provider.expects(:latest).returns('testrev')
-        provider.latest?.should be_true
-      end
-    end
-    context 'when false' do
-      it do
-        provider.expects(:revision).returns('master')
-        provider.expects(:latest).returns('testrev')
-        provider.latest?.should be_false
-      end
-    end
-  end
-
-  describe 'latest' do
-    before do
-      provider.expects(:get_revision).returns('master')
-      expects_chdir
-    end
-    context 'on master' do
-      it do
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_a))
-        provider.latest.should == 'master'
-      end
-    end
-    context 'no branch' do
-      it do
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_none))
-        provider.latest.should == 'master'
-      end
-    end
-    context 'feature/bar' do
-      it do
-        provider.expects(:git).with('branch', '-a').returns(fixture(:git_branch_feature_bar))
-        provider.latest.should == 'master'
-      end
-    end
-  end
-
-  describe 'convert_working_copy_to_bare' do
-    it do
-      FileUtils.expects(:mv).returns(true)
-      FileUtils.expects(:rm_rf).returns(true)
-      FileUtils.expects(:mv).returns(true)
-
-      provider.instance_eval { convert_working_copy_to_bare }
-    end
-  end
-
-  describe 'convert_bare_to_working_copy' do
-    it do
-      FileUtils.expects(:mv).returns(true)
-      FileUtils.expects(:mkdir).returns(true)
-      FileUtils.expects(:mv).returns(true)
-      provider.expects(:commits_in?).returns(true)
-      # If you forget to stub these out you lose 3 hours of rspec work.
-      provider.expects(:reset).with('HEAD').returns(true)
-      provider.expects(:git_with_identity).returns(true)
-      provider.expects(:update_owner_and_excludes).returns(true)
-
-      provider.instance_eval { convert_bare_to_working_copy }
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
deleted file mode 100644
index 7fd53486a74..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/hg_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:hg) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :hg,
-    :path     => '/tmp/vcsrepo',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('hg').returns('/usr/bin/hg')
-  end
-
-  describe 'creating' do
-    context 'with source and revision' do
-      it "should execute 'hg clone -u' with the revision" do
-        resource[:source] = 'something'
-        resource[:revision] = '1'
-        provider.expects(:hg).with('clone', '-u',
-          resource.value(:revision),
-          resource.value(:source),
-          resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'without revision' do
-      it "should just execute 'hg clone' without a revision" do
-        resource[:source] = 'something'
-        provider.expects(:hg).with('clone', resource.value(:source), resource.value(:path))
-        provider.create
-      end
-    end
-
-    context "when a source is not given" do
-      it "should execute 'hg init'" do
-        provider.expects(:hg).with('init', resource.value(:path))
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      expects_rm_rf
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the directory" do
-      expects_directory?(true, File.join(resource.value(:path), '.hg'))
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      expects_chdir
-    end
-
-    context "when given a non-SHA as the resource revision" do
-      before do
-        provider.expects(:hg).with('parents').returns(fixture(:hg_parents))
-        provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
-      end
-
-      context "when its SHA is not different than the current SHA" do
-        it "should return the ref" do
-          resource[:revision] = '0.6'
-          provider.revision.should == '0.6'
-        end
-      end
-
-      context "when its SHA is different than the current SHA" do
-        it "should return the current SHA" do
-          resource[:revision] = '0.5.3'
-          provider.revision.should == '34e6012c783a'
-        end
-      end
-    end
-    context "when given a SHA as the resource revision" do
-      before do
-        provider.expects(:hg).with('parents').returns(fixture(:hg_parents))
-      end
-
-      context "when it is the same as the current SHA", :resource => {:revision => '34e6012c783a'} do
-        it "should return it" do
-          resource[:revision] = '34e6012c783a'
-          provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
-          provider.revision.should == resource.value(:revision)
-        end
-      end
-
-      context "when it is not the same as the current SHA", :resource => {:revision => 'not-the-same'} do
-        it "should return the current SHA" do
-          resource[:revision] = 'not-the-same'
-          provider.expects(:hg).with('tags').returns(fixture(:hg_tags))
-          provider.revision.should == '34e6012c783a'
-        end
-      end
-    end
-  end
-
-  describe "setting the revision property" do
-    before do
-      @revision = '6aa99e9b3ab1'
-    end
-    it "should use 'hg update ---clean -r'" do
-      expects_chdir
-      provider.expects(:hg).with('pull')
-      provider.expects(:hg).with('merge')
-      provider.expects(:hg).with('update', '--clean', '-r', @revision)
-      provider.revision = @revision
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
deleted file mode 100644
index f44e314a56f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/provider/vcsrepo/svn_spec.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-require 'spec_helper'
-
-describe Puppet::Type.type(:vcsrepo).provider(:svn) do
-
-  let(:resource) { Puppet::Type.type(:vcsrepo).new({
-    :name     => 'test',
-    :ensure   => :present,
-    :provider => :svn,
-    :path     => '/tmp/vcsrepo',
-  })}
-
-  let(:provider) { resource.provider }
-
-  before :each do
-    Puppet::Util.stubs(:which).with('git').returns('/usr/bin/git')
-  end
-
-  describe 'creating' do
-    context 'with source and revision' do
-      it "should execute 'svn checkout' with a revision" do
-        resource[:source] = 'exists'
-        resource[:revision] = '1'
-        provider.expects(:svn).with('--non-interactive', 'checkout', '-r',
-          resource.value(:revision),
-          resource.value(:source),
-          resource.value(:path))
-        provider.create
-      end
-    end
-    context 'with source' do
-      it "should just execute 'svn checkout' without a revision" do
-        resource[:source] = 'exists'
-        provider.expects(:svn).with('--non-interactive', 'checkout',
-          resource.value(:source),
-          resource.value(:path))
-        provider.create
-      end
-    end
-
-    context 'with fstype' do
-      it "should execute 'svnadmin create' with an '--fs-type' option" do
-        resource[:fstype] = 'ext4'
-        provider.expects(:svnadmin).with('create', '--fs-type',
-                                          resource.value(:fstype),
-                                          resource.value(:path))
-        provider.create
-      end
-    end
-    context 'without fstype' do
-      it "should execute 'svnadmin create' without an '--fs-type' option" do
-        provider.expects(:svnadmin).with('create', resource.value(:path))
-        provider.create
-      end
-    end
-  end
-
-  describe 'destroying' do
-    it "it should remove the directory" do
-      expects_rm_rf
-      provider.destroy
-    end
-  end
-
-  describe "checking existence" do
-    it "should check for the directory" do
-      expects_directory?(true, resource.value(:path))
-      expects_directory?(true, File.join(resource.value(:path), '.svn'))
-      provider.exists?
-    end
-  end
-
-  describe "checking the revision property" do
-    before do
-      provider.expects(:svn).with('--non-interactive', 'info').returns(fixture(:svn_info))
-    end
-    it "should use 'svn info'" do
-      expects_chdir
-      provider.revision.should == '4' # From 'Revision', not 'Last Changed Rev'
-    end
-  end
-
-  describe "setting the revision property" do
-    before do
-      @revision = '30'
-    end
-    it "should use 'svn update'" do
-      expects_chdir
-      provider.expects(:svn).with('--non-interactive', 'update', '-r', @revision)
-      provider.revision = @revision
-    end
-  end
-
-  describe "setting the revision property and repo source" do
-    before do
-      @revision = '30'
-    end
-    it "should use 'svn switch'" do
-      resource[:source] = 'an-unimportant-value'
-      expects_chdir
-      provider.expects(:svn).with('--non-interactive', 'switch', '-r', @revision, 'an-unimportant-value')
-      provider.revision = @revision
-    end
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown
deleted file mode 100644
index 1ee19ac840f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/vcsrepo/spec/unit/puppet/type/README.markdown
+++ /dev/null
@@ -1,4 +0,0 @@
-Resource Type Specs
-===================
-
-Define specs for your resource types in this directory.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml
deleted file mode 100644
index bb90cc14880..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.fixtures.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-fixtures:
-  repositories:
-    "puppi": "git://github.com/example42/puppi.git"
-    "monitor": "git://github.com/example42/puppet-monitor.git"
-    "firewall": "git://github.com/example42/puppet-firewall.git"
-    "iptables": "git://github.com/example42/puppet-iptables.git"
-    "concat": "git://github.com/example42/puppet-concat.git"
-  symlinks:
-    "yum": "#{source_dir}"
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile
deleted file mode 100644
index 49ea04a4918..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source :rubygems
-
-puppetversion = ENV['PUPPET_VERSION']
-gem 'puppet', puppetversion, :require => false
-gem 'puppet-lint'
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
-gem 'rspec-puppet', '0.1.6'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project
deleted file mode 100644
index 13cd06f922b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>yum</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml
deleted file mode 100644
index dffeca98741..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-script:
-  - "rake spec SPEC_OPTS='--format documentation'"
-env:
-  - PUPPET_VERSION="~> 2.6.0"
-  - PUPPET_VERSION="~> 2.7.0"
-  - PUPPET_VERSION="~> 3.0.0"
-  - PUPPET_VERSION="~> 3.1.0"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_VERSION="~> 2.6.0"
-      gemfile: .gemfile
-
-gemfile: .gemfile
-notifications:
-  email:
-    - al@lab42.it
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE
deleted file mode 100644
index f41da018579..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Copyright (C) 2013 Alessandro Franceschi / Lab42
-
-for the relevant commits Copyright (C) by the respective authors.
-
-Contact Lab42 at: info@lab42.it
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile
deleted file mode 100644
index 69820b86e02..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name    'example42-yum'
-version '2.1.9'
-author  'Alessandro Franceschi'
-license 'Apache2'
-project_page 'http://www.example42.com'
-source  'https://github.com/example42/puppet-yum'
-summary 'Puppet module for nagios'
-description 'This module installs and manages yum and yum repositories'
-dependency 'example42/puppi', '>= 2.0.0'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md
deleted file mode 100644
index cb254401bf1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/README.md
+++ /dev/null
@@ -1,132 +0,0 @@
-# Puppet module: yum
-
-This is a Puppet module that manages Yum repositories for Centos RedHat and Scientific Linux
-
-Made by Alessandro Franceschi / Lab42
-
-Inspired by the Yum Immerda module: https://git.puppet.immerda.ch
-
-Official site: http://www.example42.com
-
-Official git repository: http://github.com/example42/puppet-yum
-
-Released under the terms of Apache 2 License.
-
-This module requires functions provided by the Example42 Puppi module.
-
-## USAGE 
-
-* Just leave the default options: Automatic detection of Operating System (RedHat, Centos, Scientific supported) Epel repo installation, keeping of local yum files, automatic updates disabled.
-
-        class { 'yum':
-        }
-
-* Enable automatic updates via cron (updatesd is supported only on 5)
-
-        class { 'yum':
-          update => 'cron',
-        }
-
-
-* Purge local /etc/yum.repos.d/ and enforce its contents only via a custom source
-
-        class { 'yum':
-          source_repo_dir => 'puppet:///modules/example42/yum/conf/',
-          clean_repos     => true,
-        }
-
-* Enable EPEL and PuppetLabs repos
-
-        class { 'yum':
-          extrarepo => [ 'epel' , 'puppetlabs' ],
-        }
-
-
-* Do not include any extra repo (By default EPEL is added)
-
-        class { 'yum':
-          extrarepo => '' ,
-        }
-
-* Automatically copy in /etc/pki/rpm-gpg  all the rpm-gpg keys known by the yum module (this was the "old" and intrusive behaviour, now each rpm-gpg key may be individually provided by the yum::manages_repos' gpgkey_source parameter)
-
-        class { 'yum':
-          install_all_keys => true ,
-        }
-
-* Include a selected extra repo
-
-        include yum::repo::puppetlabs
-
-
-## USAGE - Overrides and Customizations
-* Enable auditing without without making changes on existing yum configuration files
-
-        class { 'yum':
-          audit_only => true
-        }
-
-
-* Use custom sources for main config file
-
-        class { 'yum':
-          source => [ "puppet:///modules/lab42/yum/yum.conf-${hostname}" , "puppet:///modules/lab42/yum/yum.conf" ],
-        }
-
-
-* Use custom source directory for the whole configuration dir
-
-        class { 'yum':
-          source_dir       => 'puppet:///modules/lab42/yum/conf/',
-          source_dir_purge => false, # Set to true to purge any existing file not present in $source_dir
-        }
-
-* Use custom template for main config file. Note that template and source arguments are alternative.
-
-        class { 'yum':
-          template => 'example42/yum/yum.conf.erb',
-        }
-
-* Automatically include a custom subclass
-
-        class { 'yum':
-          my_class => 'yum::example42',
-        }
-
-
-## USAGE - Example42 extensions management
-* Activate puppi (recommended, but disabled by default)
-
-        class { 'yum':
-          puppi    => true,
-        }
-
-* Activate puppi and use a custom puppi_helper template (to be provided separately with a puppi::helper define ) to customize the output of puppi commands
-
-        class { 'yum':
-          puppi        => true,
-          puppi_helper => 'myhelper',
-        }
-
-
-## OPERATING SYSTEMS SUPPORT
-
-REDHAT 6 - Full
-
-REDHAT 5 - Full
-
-REDHAT 4 - Partial
-
-CENTOS 6 - Full
-
-CENTOS 5 - Full
-
-CENTOS 4 - Partial
-
-SCIENTIFIC 6 - Full
-
-SCIENTIFIC 5 - Full
-
-AMAZON LINUX 3 (Sigh) - Partial
-
-[![Build Status](https://travis-ci.org/example42/puppet-yum.png?branch=master)](https://travis-ci.org/example42/puppet-yum)
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile
deleted file mode 100644
index f0d1465cdc0..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/Rakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6
deleted file mode 100644
index bd863d8e212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-CentOS-6
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW
-NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr
-bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE
-/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f
-QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el
-x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R
-FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW
-2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w
-lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc
-ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer
-Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB
-tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d
-MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w
-ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA
-mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm
-sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW
-qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya
-h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp
-JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G
-hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO
-sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m
-YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl
-JNGtzulnNP07RyfzQcpCNFH7W4lXzqM=
-=jrWY
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Amazon.3/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.4/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5
deleted file mode 100644
index 2627d31d8f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-CentOS-5
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk
-CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB
-+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr
-Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO
-LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB
-qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy
-XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ
-RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ
-NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg
-S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl
-eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI
-E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5
-bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N
-F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks
-4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ
-aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD
-/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni
-nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos
-Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC
-GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/
-9GxdNhGQEAweSlQfhPa3yYXH
-=o/Mx
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art
deleted file mode 100644
index 825424e1f33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.art
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd
-gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB
-T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR
-yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe
-8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde
-/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn
-F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f
-DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF
-aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv
-Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC
-ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO
-jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA
-6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/
-m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk
-ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq
-Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH
-AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR
-7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq
-nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK
-=NOIx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.5/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6
deleted file mode 100644
index bd863d8e212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-CentOS-6
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW
-NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr
-bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE
-/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f
-QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el
-x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R
-FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW
-2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w
-lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc
-ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer
-Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB
-tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d
-MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w
-ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA
-mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm
-sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW
-qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya
-h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp
-JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G
-hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO
-sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m
-YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl
-JNGtzulnNP07RyfzQcpCNFH7W4lXzqM=
-=jrWY
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG
deleted file mode 100644
index 8722c21cbd6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-PGDG
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr
-BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a
-9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo
-tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee
-Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn
-XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr
-peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt
-L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9
-KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR
-TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu
-ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
-AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ
-8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6
-ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6
-dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3
-nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04
-K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/
-z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl
-u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v
-OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz
-FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN
-VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd
-l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad
-GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y
-1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA==
-=au6K
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art
deleted file mode 100644
index 825424e1f33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.art
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd
-gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB
-T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR
-yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe
-8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde
-/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn
-F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f
-DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF
-aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv
-Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC
-ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO
-jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA
-6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/
-m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk
-ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq
-Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH
-AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR
-7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq
-nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK
-=NOIx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/CentOS.6/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5
deleted file mode 100644
index 2627d31d8f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-CentOS-5
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk
-CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB
-+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr
-Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO
-LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB
-qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy
-XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ
-RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ
-NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg
-S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl
-eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI
-E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5
-bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N
-F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks
-4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ
-aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD
-/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni
-nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos
-Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC
-GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/
-9GxdNhGQEAweSlQfhPa3yYXH
-=o/Mx
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson
deleted file mode 100644
index c71c5047541..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-dawson
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD/9sIMRBADp28M+gDNgYJ/UMW1Tem0W/D17FAZRVRI8Ht68QcZsq6uS1k3L
-HPX7rLG3iKrKj4crvEE+CY/3L182NZ6bRJt61rQLrtSbMFIMvt7L6dG6BYYw0i8P
-SqyVC6uPb2W8wi1RtNdQk0pSeDSQh8wCsDDo8WYHkdRztoKWHvd3hAN7NwCgzRVU
-QS3Uw6McILxO9cUBgJEhBj8D/38TomjexWRUp+rzs6aouqHoZyslSCUe4aLeJvSQ
-Whi1j4E0sgWMJ2L/Ta6FXNM2Of3Ze6delf8eVPZ2N78yELh+LV7DZr5Cy+zDtSWY
-WnyWGSqHVEqf0UarpC8XVcJ1jJu3sHfaBf94tnKJI/uipxbD8oU4ixoLvANFR1fp
-YfKdBACm+C8Rk2NpXeAtXIyN9UgJPpj9H5IXxnrdYJa0ce72qrrniM0dhGHz9+9H
-5d8rVJYTNEW6kDhj79vnFLq86o0n8VIpv/0g38FO+FCi4yVJ49qA2+D7unysBVTm
-ZXo3LRMiBJfeh39ONEIg+CWVD6sXo7FTwVKpawJpeO6Lp8nrlbQ6VHJveSBEYXdz
-b24gKFNwaWt5IEhhaXIgSGF3YWlpYW4gU2hpcnRzKSA8ZGF3c29uQGZuYWwuZ292
-PohZBBMRAgAZBQI//bCDBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDaatAIgv0XsoJ2
-AJ9KdOcfYSVAjoUwwrQjARa6xWP/NQCcCJKfBYUVZDiWsiZjVm1EOGcNCSS5AQ0E
-P/2whBAEAJYHI18UVqIrZPX3C3FvzXf7MzNs31UPA1iCgp3f02w6nh/XZs8Y0CNB
-ig9rCR/e2O8O4Fnl56Z+N+a9H7jPmF8sOhacvqNaS7yAJ+9pHj0op6Az/X69dWnS
-AdaFXPB1Tc6ryfNtbs0CB0tWRbjlB4BTd/1PEerLNUNGoLOpFWeXAAMFA/0UD2ku
-vIRoQwAjNf1/swcIQe44DNNQYY+GSzi0tXVhytiJquziPk/la2elinl4N1KERrO8
-fgdrHtZl4X7n3nv5GGdwVjQfcZJfzFcGIlzqJOcLHAlVSVEpAJAlkykbx8BDtfod
-JbODs9NfU+VwmwrTwyVdpbOEHb9ktdeuabIXMIhGBBgRAgAGBQI//bCEAAoJENpq
-0AiC/Rey1JoAnjJ1qsi4gbkb+srAgH2UCBRcM0uQAKCGiibCE9G5udph5YplnHhL
-ZpAqxA==
-=3u8+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta
deleted file mode 100644
index 7b40671a4c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-beta
+++ /dev/null
@@ -1,61 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBEmkAzABEAC2/c7bP1lHQ3XScxbIk0LQWe1YOiibQBRLwf8Si5PktgtuPibT
-kKpZjw8p4D+fM7jD1WUzUE0X7tXg2l/eUlMM4dw6XJAQ1AmEOtlwSg7rrMtTvM0A
-BEtI7Km6fC6sU6RtBMdcqD1cH/6dbsfh8muznVA7UlX+PRBHVzdWzj6y8h84dBjo
-gzcbYu9Hezqgj/lLzicqsSZPz9UdXiRTRAIhp8V30BD8uRaaa0KDDnD6IzJv3D9P
-xQWbFM4Z12GN9LyeZqmD7bpKzZmXG/3drvfXVisXaXp3M07t3NlBa3Dt8NFIKZ0D
-FRXBz5bvzxRVmdH6DtkDWXDPOt+Wdm1rZrCOrySFpBZQRpHw12eo1M1lirANIov7
-Z+V1Qh/aBxj5EUu32u9ZpjAPPNtQF6F/KjaoHHHmEQAuj4DLex4LY646Hv1rcv2i
-QFuCdvLKQGSiFBrfZH0j/IX3/0JXQlZzb3MuMFPxLXGAoAV9UP/Sw/WTmAuTzFVm
-G13UYFeMwrToOiqcX2VcK0aC1FCcTP2z4JW3PsWvU8rUDRUYfoXovc7eg4Vn5wHt
-0NBYsNhYiAAf320AUIHzQZYi38JgVwuJfFu43tJZE4Vig++RQq6tsEx9Ftz3EwRR
-fJ9z9mEvEiieZm+vbOvMvIuimFVPSCmLH+bI649K8eZlVRWsx3EXCVb0nQARAQAB
-tDBSZWQgSGF0LCBJbmMuIChiZXRhIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0LmNv
-bT6JAjYEEwECACAFAkpSM+cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCT
-ioDK8hVB6/9tEAC0+KmzeKceXQ/GTUoU6jy9vtkFCFrmv+c7ol4XpdTt0QhqBOwy
-6m2mKWwmm8KfYfy0cADQ4y/EcoXl7FtFBwYmkCuEQGXhTDn9DvVjhooIq59LEMBQ
-OW879RwwzRIZ8ebbjMUjDPF5MfPQqP2LBu9N4KvXlZp4voykwuuaJ+cbsKZR6pZ6
-0RQKPHKP+NgUFC0fff7XY9cuOZZWFAeKRhLN2K7bnRHKxp+kELWb6R9ZfrYwZjWc
-MIPbTd1khE53L4NTfpWfAnJRtkPSDOKEGVlVLtLq4HEAxQt07kbslqISRWyXER3u
-QOJj64D1ZiIMz6t6uZ424VE4ry9rBR0Jz55cMMx5O/ni9x3xzFUgH8Su2yM0r3jE
-Rf24+tbOaPf7tebyx4OKe+JW95hNVstWUDyGbs6K9qGfI/pICuO1nMMFTo6GqzQ6
-DwLZvJ9QdXo7ujEtySZnfu42aycaQ9ZLC2DOCQCUBY350Hx6FLW3O546TAvpTfk0
-B6x+DV7mJQH7MGmRXQsE7TLBJKjq28Cn4tVp04PmybQyTxZdGA/8zY6pPl6xyVMH
-V68hSBKEVT/rlouOHuxfdmZva1DhVvUC6Xj7+iTMTVJUAq/4Uyn31P1OJmA2a0PT
-CAqWkbJSgKFccsjPoTbLyxhuMSNkEZFHvlZrSK9vnPzmfiRH0Orx3wYpMQ==
-=21pb
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc. for this beta using `rpm -K' using the GNU GPG
-package.  Questions about this key should be sent to security@redhat.com.
-
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDySTqsRBACzc7xuCIp10oj5B2PAV4XzDeVxprv/WTMreSNSK+iC0bEz0IBp
-Vnn++qtyiXfH+bGIE9jqZgIEnpttWhUOaU5LhcLFzy+m8NWfngIFP9QfGmGAe9Gd
-LFeAdhj4RmSG/vgr7vDd83Hz22dv403Ar/sliWO4vDOrMmZBG57WGYTWtwCgkMsi
-UUQuJ6slbzKn82w+bYxOlL0EAIylWJGaTkKOTL5DqVR3ik9aT0Dt3FNVYiuhcKBe
-II4E3KOIVA9kO8in1IZjx2gs6K2UV+GsoAVANdfKL7l9O+k+J8OxhE74oycvYJxW
-QzCgXMZkNcvW5wyXwEMcr6TVd/5BGztcMw8oT3/l2MtAEG/vn1XaWToRSO1XDMDz
-+AjUA/4m0mTkN8S4wjzJG8lqN7+quW3UOaiCe8J3SFrrrhE0XbY9cTJI/9nuXHU1
-VjqOSmXQYH2Db7UOroFTBiWhlAedA4O4yuK52AJnvSsHbnJSEmn9rpo5z1Q8F+qI
-mDlzriJdrIrVLeDiUeTlpH3kpG38D7007GhXBV72k1gpMoMcpbQ3UmVkIEhhdCwg
-SW5jLiAoQmV0YSBUZXN0IFNvZnR3YXJlKSA8cmF3aGlkZUByZWRoYXQuY29tPohX
-BBMRAgAXBQI8l5p/BQsHCgMEAxUDAgMWAgECF4AACgkQ/TcmiYl9oHqdeQCfZjw4
-F9sir3XfRAjVe9kYNcQ8hnIAn0WgyT7H5RriWYTOCfauOmd+cAW4iEYEEBECAAYF
-AjyXmqQACgkQIZGAzdtCpg5nDQCfepuRUyuVJvhuQkPWySETYvRw+WoAnjAWhx6q
-0npMx4OE1JGFi8ymKXktuQENBDySTq4QBADKL/mK7S8E3synxISlu7R6fUvu07Oc
-RoX96n0Di6T+BS99hC44XzHjMDhUX2ZzVvYS88EZXoUDDkB/8g7SwZrOJ/QE1zrI
-JmSVciNhSYWwqeT40Evs88ajZUfDiNbS/cSC6oui98iS4vxd7sE7IPY+FSx9vuAR
-xOa9vBnJY/dx0wADBQQAosm+Iltt2uigC6LJzxNOoIdB5r0GqTC1o5sHCeNqXJhU
-ExAG8m74uzMlYVLOpGZi4y4NwwAWvCWC0MWWnnu+LGFy1wKiJKRjhv5F+WkFutY5
-WHV5L44vp9jSIlBCRG+84jheTh8xqhndM9wOfPwWdYYu1vxrB8Tn6kA17PcYfHSI
-RgQYEQIABgUCPJJergAKCRD9NyaJiX2geiCPAJ4nEM4NtI9Uj8lONDk6FU86PmoL
-yACfb68fBd2pWEzLKsOk9imIobHHpzE=
-=gpIn
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
deleted file mode 100644
index 3818b2c926f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
+++ /dev/null
@@ -1,37 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped prior to November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.0 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8
-HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM
-GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV
-EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS
-ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP
-lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW
-XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb
-E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES
-PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg
-SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID
-FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB
-XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U
-lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+
-5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3
-Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI
-hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+
-JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9
-E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK
-ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8
-BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5
-4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY
-FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk
-OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h
-VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==
-=3AHZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
deleted file mode 100644
index 09aded8bec7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
+++ /dev/null
@@ -1,24 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEV2EyQRBAD4/SR69qoLzK4HIa6g9iS+baiX0o3NjkLftFHg/xy+IMOMg//i
-4c5bUpLKDTMH3+yT0G8qpul/RALUFOESKFkZm3/SlkJKuroXcB8U6s2dh5XX9DDB
-ISqRwL7M5qB8rfDPKHN+k/XwJ9CNpHMdNxnnc2WhnnmHNp6NrD/bUEH4vwCglMa0
-rFRXPaN7407DARGHvW/jugsEANFaeZsFwos/sajL1XQRfHZUTnvDjJgz31IFY+OL
-DlOVAOtV/NaECMwIJsMIhoisW4Luwp4m75Qh3ogq3bwqSWNLsfJ9WFnNqXOgamyD
-h/F4q492z6FpyIb1JZLABBSH7LEQjHlR/s/Ct5JEWc5MyfzdjBi6J9qCh3y/IYL0
-EbfRA/4yoJ/fH9uthDLZsZRWmnGJvb+VpRvcVs8IQ4aIAcOMbWu2Sp3U9pm6cxZF
-N7tShmAwiiGj9UXVtlhpj3lnqulLMD9VqXGF0YgDOaQ7CP/99OEEhUjBj/8o8udF
-gxc1i2WJjc7/sr8IMbDv/SNToi0bnZUxXa/BUjj92uaQ6/LupbQxUmVkIEhhdCwg
-SW5jLiAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUByZWRoYXQuY29tPohfBBMRAgAf
-BQJFdhMkAhsDBgsJCAcDAgQVAggDAxYCAQIeAQIXgAAKCRBTJoEBNwFxhogXAKCD
-TuYeyQrkYXjg9JmOdTZvsIVfZgCcCWKJXtfbC5dbv0piTHI/cdwVzJo=
-=mhzo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
deleted file mode 100644
index 0f875c0e207..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEYk7/IRBACdWFJInc51/+0sqvadIvf0E+Vhv4aIqB76jWtIGqXnTeG6hEl/
-9tJoLszBh4g/KBFVF3E4VxTHXKO/L7GZRa8JzoMtvV8XiP6BaYq6ykx6H7alKvoP
-qzk7xBbvNbqsXJCO7keo+g7iIDdfAxvsSJYbhQBxDn5W4Hw7SnHcMmTDOQCg7vOj
-UzaZG32yYMBZLjOAB/QzXgsD/1JRDnQ8cL6d17B1ie57ZuVOI3ziQJSmj0zbC0IX
-OsxlcFjwydLk3TA88iCr0SO2mfXCsGTeDGFbrl2IRCoH91l3Ew49HI4OYtl+OPSt
-pIYdFLSQ+RUPs9CFYwF9Ogjrwmi6jVptKq/+v0WgnCrbfz3DYxCWt/VB1PYDj5y6
-Mv//BACKa2mUuQoukDvzqiwZXV/Z52MeDOzPbOFo6qhx+54nav9Inz1yziEjYrP/
-ZrNJ4BT6fBgin/a6UmD5FqMtkrrhOCpHFQK2H+XYZ0vVJGZI7h74/fY8U2n+1Mle
-xQ/ejWojF+H5nFUAwKHaNVNofKcw8c8msgGn2jsvrAISTSHshrQwUmVkIEhhdCwg
-SW5jLiAoUkhYIGtleSkgPHJoeC1zdXBwb3J0QHJlZGhhdC5jb20+iF8EExECAB8F
-AkYk7/ICGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEDmhOhJCGT5r6FoAoLsB
-+DOPmTc3P+77DnNhU460nmjQAKCI3BJ/SxqPqfp8jL6lTfVo2zxegQ==
-=t0np
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release
deleted file mode 100644
index 47c6be6700b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-redhat-release
+++ /dev/null
@@ -1,62 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2009, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
-pub  4096R/FD431D51 2009-10-22 Red Hat, Inc. (release key 2) <security@redhat.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF
-0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF
-0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c
-u7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh
-XGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H
-5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW
-9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj
-/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1
-PcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY
-HVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF
-buhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB
-tDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0
-LmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC
-2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf
-C/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5
-un3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E
-0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE
-IGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh
-8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL
-Ght5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki
-JUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25
-OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq
-dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
-=zbHE
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is a supporting (auxiliary) key for
-Red Hat products shipped after November 2006 and for all updates to
-those products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEVwDGkRBACwPhZIpvkjI8wV9sFTDoqyPLx1ub8Sd/w+YuI5Ovm49mvvEQVT
-VLg8FgE5JlST59AbsLDyVtRa9CxIvN5syBVrWWWtHtDnnylFBcqG/A6J3bI4E9/A
-UtSL5Zxbav0+utP6f3wOpxQrxc+WIDVgpurdBKAQ3dsobGBqypeX6FXZ5wCgou6C
-yZpGIBqosJaDWLzNeOfb/70D/1thLkQyhW3JJ6cHCYJHNfBShvbLWBf6S231mgmu
-MyMlt8Kmipc9bw+saaAkSkVsQ/ZbfjrWB7e5kbMruKLVrH+nGhamlHYUGyAPtsPg
-Uj/NUSj5BmrCsOkMpn43ngTLssE9MLhSPj2nIHGFv9B+iVLvomDdwnaBRgQ1aK8z
-z6MAA/406yf5yVJ/MlTWs1/68VwDhosc9BtU1V5IE0NXgZUAfBJzzfVzzKQq6zJ2
-eZsMLhr96wbsW13zUZt1ing+ulwh2ee4meuJq6h/971JspFY/XBhcfq4qCNqVjsq
-SZnWoGdCO6J8CxPIemD2IUHzjoyyeEj3RVydup6pcWZAmhzkKrQzUmVkIEhhdCwg
-SW5jLiAoYXV4aWxpYXJ5IGtleSkgPHNlY3VyaXR5QHJlZGhhdC5jb20+iF4EExEC
-AB4FAkVwDGkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQRWiciC+mWOC1rQCg
-ooNLCFOzNPcvhd9Za8C801HmnsYAniCw3yzrCqtjYnxDDxlufH0FVTwX
-=d/bm
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl
deleted file mode 100644
index 70b6bd17ef3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXadARBACHhOfMUuT/4iDvBRmm6bEsvnMN++L79aYhEUMNlrZ2TjKPjPvG
-Y0vGk+I0JhUJWutkQRZVbqgVDsNjmnELnACK+xvdryvtxh50wCI9WUl7CT5EV7BS
-/jD7JxTFbXyC/Xv0ixMB9vj6U9cySyE8PxONp0HzO6LTIr1OMPgDUsP4lwCgh8De
-fmY8TN2m9a0huLdNrnmKw0cD/2bkt6rJAi3+BGHWNgQ9Nb/4wQff8BKGDtL/8acp
-3yH91axuD2iYCKw0ZP5akBpRGv+4e30Plmbi1f5NaEDo9Ga1c4TDPopwgiYhrVLj
-56efoTfP2AiZl3iBKFPI83/YOhrVZF8UiYoAoUnOFpOg8vmtCzgvYip5UZLTgbfJ
-lcWvA/9vMb8By+1pHjW98d7GkzvZqzyMtWlbO7PXCn8P7bGQYjwvyTGiRNz3q22c
-2Z29qQw4r1L1L1JGsUwuOMahkczWVdD4TRHc8mhVJEUEA6AkNAZc+Ymsfr/ip0kX
-nSZLE3pYVifOhBRO8EbT0WhCMScmZNpwvZU//HKL/p+n3LArUrRZU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4KSA8
-c2NpZW50aWZpYy1saW51eC1kZXZlbEBmbmFsLmdvdj6IYAQTEQIAIAUCSldp0AIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELC0GD8ZKn19cXIAnA5R+EbaYr4/
-IL6It/UxHXlBFIajAJ9bwmNDF14uvDnFigg1PLevLTBnTIhGBBARAgAGBQJKV6lf
-AAoJENpq0AiC/ReyKLQAmwVC/Ii3sAKsptwZKHw/uk1kbupCAJ0eIzSaUo1hSa1V
-fP7O/dqigu6JAbkCDQRKV2nZEAgAzAcaC7unRNdrIwAGGKqOIvI8WNwpftHY50Y5
-zPSl7vtWVkp3N+2fynJR+tW4G/2xDChBbPzPz/TavRyBc21LKzAlym8qIGEE02cZ
-U/YJAYnbAkNNiGMOAnAIjBw1KUcQamAxdk0glE7MP1JiXY1MO4tTW38UEcvQbSvg
-Mh/eECqFOwiQXJmkPpZhPUwnwmZRCV4vlCZQM3CMExZ9pDV/V+kuhefw2WeheXyh
-g4DC88gcrv2mO0I3sVmpxn3JLMayiMlQbOSYLQuNVKN/EFDwuAbS9Ane7vm6wF9X
-NswMX0I/vO1IVvSN1fi5ZM71QzeYUGKBQv97kLO20hbRWZ1V+wADBggAys+jhlYH
-mtFZQxV4an1ucqnVauKnstj0zF88Hiy7yivT3W5h3Zd067uOfcBQCJUlt7y8sYD2
-q9htm5Rrxx+J29bl0zxwrEatnv0gLzprSa7Ei3wR6IrvBM3Ic0mGSzlsSxlzaFtt
-Pwak5C47vX9+PwKEKXFdM1gVzHTuD6PXEYxA4YMlQGeGVA68FvTHxMHpf8POQWTV
-QtjoI0flvFT7d4ozqUJdjJZxJDFQ7GO2YdIfF3sUdfn5kFxK0SUzqrmCYXeheniS
-LKC4mpAR0PetWJ7r1gY5khHb2eHW1vdEBYUXlHjB+jLaOBns05MHMZYd4CHe8q/Q
-gzMeVlh8YLSdZYhJBBgRAgAJBQJKV2nZAhsMAAoJELC0GD8ZKn19iU8AniUIFu32
-VeRJ+VKL2vBQMVbFVZOMAJ434Bi99fN2CSh7T62oxtQvhw70fw==
-=eL9H
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3
deleted file mode 100644
index 5d16185468e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl3
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXatkRBADSVLhSFxxebo3H16HGjvOg+tSAuppoqrmg9WrC2ly6I41BHXng
-n2H0t07nAemb35XSRfb6j4vNIiNoXGFzcjTMP5/cwn24hvilXyA0zX59hhD0ut4c
-VGksNhUKnYkVI/+0+EjJ3RnCouVvVx8p2eCIDhjIueDjuLp3mVBLYh7OEwCgmQrO
-ysS+xHHcYfUX4jsghfzge10EAIuMAXGWmMLRUJ6PCjrAKVVGT4FxH53UyPjXGXga
-SYR4A4aFq9eoDPLRo/nRB/isT0/NfcBbp4wdzYUxz8pmMOWGLFjg7DBBvOj84q+0
-ZFibybxFJAtjaZcKw+feCb6R2tJPOfJr6+noOeAZ9MFYZ7z5NG5vezGB1rLu/c5k
-vb5LA/9wI8pz7jCMOPBE4LGO9C1tbvKfrFHEfsgn5zsF/+YABCrbHrc2eN2NESpv
-84jLHvrssKaPjJVHL1JlRRfO2myT37hLa/D3pUrAcs/CqWGeddKkhJE7c816EO6d
-FZU5/7Utill9x3tLu8ZS+WXkH5sr/garxim5P3Sm3K1/ZXZaEbRbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDMp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2rZ
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQAYjOtesQYlrupwCfR65pEGRf
-air4Nzf+ZP5Q2i8doscAnAhod/cVNjPA9Lo4UOEAJ5kWZ4CXiEYEEBECAAYFAkpX
-pTwACgkQsLQYPxkqfX2m9QCfUzSI3MVchLk00M2c67Xj7ghvNaMAn3TybHcAHpGu
-pJ8qBwisCX6mPMSqiEYEEBECAAYFAkpXqW4ACgkQ2mrQCIL9F7LGjwCfWBc67ftN
-jTGxL+ilnrYyZhupKd8AoKoSkHG61pxk+Ja58aSvsGRWAdv9uQINBEpXat0QCADG
-G22g1V5t8xoxjA5sgDw+ow3QonkA8p+EEr1+xjZyJTsMMiRioz88WH54xcbLBoCM
-ltgK3gSYpywEoB76yzFS/woLSjBdCLEMwX6Dj/y1U67ykoDoop31LIW8a4geYJpW
-0a83Np00noLidNi7xhuExvp3BxHPpM9mVvqfDOkFcuiexaAU9uF6cgVov8eE95l9
-jWcNn1oLnqo2mq2pqJFk0Qkq612Nj2TWOdcrJlksIqEG+H6Jn434u+leGgyR6RnW
-Ty4OS4JnwRYXeAfLh2wCCFPWVL6eQTfRjkWmjWlvKIgz8YX+vTx7SfYsfhPRKkgs
-ZS0VyRkUSV8EkkRlaRw3AAQLB/9YOgCeW673SBZJUITb1TM4bxT2bk03ORpfqPzu
-NBfb4Szm1lsJvlOgEfwZZR2UcQeCqm+WtSSx/Ajce/LA/Q+MYW0X/Vcy1pEYYhs1
-9YRZ/1Q7+JR2Q/hCMBvtMf3XN+1sEjHwPJpskq0qBng6SofE+V7FOELswfSk6j+b
-2d4G4WEyuiaj6FD5tvrWFmcWgBnhpGG+Rx2n1UT1lqk+r81H4iZB6MoIkicR1gyx
-i6mfqJnKMFSWeeXddx7kr6xclDungGlTF/dnk5K73CRm5XBxxYsUYS1Kz8tF6MbB
-d/FYJjYlQWx2eAh1xoimlnBgX8BNsmzjbvOtcLtZOUTT95F2iEkEGBECAAkFAkpX
-at0CGwwACgkQAYjOtesQYlqHcACfQqTUZxtuSjHWeM2yODl4Cb6kMqkAnjgBLM1s
-uix25Q+HkPygJyHv7nEI
-=eJoE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4
deleted file mode 100644
index 14f3096678e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl4
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXa1QRBACRt4l3x+38VrBV58HhPrz8iOKDhMVzBODGetPzqmIX0bLz7nz/
-ZYmEPsY0Nhnp77e3cU4YRSUKOM96BZwo8DsJz9sT14b3IozNEo2R7JZNp22RrvU4
-gRXjgQmg5N83tnU03KK/IxrbjdO29Go3vGBWM4tWxUoGLG9kQGhYtZL0MwCgn13c
-xYt5JRtxLdfNM/Kxbg4FDTsD/31hBoeMetdNHjuMq+I3SMgnAATkgQ1TZHj8lCV3
-y0qM0zAfVRuPSTVodlJuMjOUKkERAAWqzXiNkgKtIgREBORmz6d9q/bangLr9ygL
-fz/4vTxtfdmXxG8Ru/zVF9Ulu1GuLZKlP1PZosZsMQfbByWVOybg38qdyeC93EGd
-qmrBBACQeehjanXRjgEROKXkpe2A6w31m0iu2sT42TUvq5neSXjrFTXN8YPd0SpK
-8IiCZHkAh3YBCRogfT7T+uWQsrwICCAf00pEAuP9c6BUeepbjQZPK2fqD16lhRn8
-A1TjdngDto45/2T8eIUafh8ONheRuA1Lnb3gV92fUSkQDppw57RbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDQp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2tU
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ8VzxvJUFci5eswCffepTdZlb
-60FSFxWfLGXdr6NLVY0Anj2ILigIHnOQ/Tb0fX4Wok2rObm1iEYEEBECAAYFAkpX
-pPwACgkQsLQYPxkqfX27WgCfccR97sqL4klabdAmAkQ0TSXZ+AgAn0FUCu92L9xP
-i9td6W7lPh0zdnudiEYEEBECAAYFAkpXqXsACgkQ2mrQCIL9F7LzywCdGT6FQ4ZT
-swwxZA63MrLn7ZdN/r4AoLvfdudahfiuiZQtGTYvoR3gzw70uQINBEpXa10QCACr
-GeMNUJTtApiwStqIKXGj5BahvI2muQPOF0yr5fqpOwA1SnucTQmwEVtBHRhR+J3V
-iOQ8igyMUxOe0F6JCOAbZIx0G5iVs51+wT1LYD2bQkUoObIToGut9r6NlI2selcP
-lqx2ckziGVOSU77/7MoGo5GNbWJaNHWCNh6zrA+5hKY46va7hkm0WFFvlZ+U8OCB
-aI8BnwB7JZCNdrBgL37oX1qm53BboDaE4aY/73gIvCd3M5bjuqbe666zvQo8xdbL
-wiSe8LrHHa7EHxWNFYxv91H56FIP7sbnbiSYKZiOMahnc2hBAa0CAsWhWKDSnqt4
-IN6VOMvqooFllvRXLVgnAAQLCACMm7NhtX0k5AAz3dsXREiQ5hpCS0+djxHTOyAf
-aYjB9FTV2WfWQ9G/KTowpQm4nu6IHzFtHWn8mt7/wnxnSIPeykjgAeuzXd/mSBM6
-/FobeXZsb7a6vDZNP4gSGzMAv7xl4QdBWGxQMRED7Lvg1rU70Dh/X2WvRu3a0MBy
-xHdTBmpIUIQJ0VV6ikGXvu7DS2skvL7lZxKTHPr0zho6rf9De7GJ6FGCAKfdmgjQ
-Gm1i9/pH05UQ4+FD/JyNwEX/CPf8qb6PgtwoJeJ+SPnWZlayYBEB03sK1fD/RIfF
-TbRoJz8YRBniC0AwLlUj3n6IdVGrcK8vy2MvVHF//cXLmCroiEgEGBECAAkFAkpX
-a10CGwwACgkQ8VzxvJUFci4ylgCY4OS+SEAqiiqz1VBCKq5PxNpzXgCffwtqFgV9
-aFtaKnBEuQRBQ5uz+mA=
-=G01V
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5
deleted file mode 100644
index 1e1c594ae7e..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl5
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXa6URBADLDs4W73NK1DOZq0mWfmMwv27uaAS4RZuJJWj6eTmF2YcAdVPr
-rsfvBB1GrN5YluqGCN0CBSULtmoxE8AVB/2kGgIZmD7x10+dMXn0cYJrQuTjtf1z
-xos1cmdzK7Or0p5dQbuxvlpEseFATGimggBeunwSt5qMpXqN9/1dqksK0wCgi/Tu
-JyR3Wsg0NqZrUbr5vEiqHoMEALmYht9n6lCt4j6oYZGZ1DlTwjaAjeJe9qdDlbx7
-fNsfFwV1fqMFc2Bop7UJXfTytVXzDwISsn5YLK2ty1kSuA/7PCt7OkrbchBwm/y0
-5KiGjnC0D+6qdApnwJClWFsu6VqquRiplAJ+6bMw/z+VXVnJztMx09tQ/M9idN//
-mJYHA/9989JcHDi0hPlCCYHGs9Bw70H9TvzanKwq5GRlSbEDz9LrrJopJuz788Xu
-xg0WXVlduwrEqU2wlq8lY2m6UlkfIya/fs6NkDCJE3bHSMjfovpL6cUFCKedKsas
-ODOio6i3ZEcWXz3w4Dv43Mb/z1m8Fe5e6Z0jw5OwEQeWLIHHjbRbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDUp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2ul
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQKHfjrROgotzliQCfdmgSNeDY
-fkako6w5P1RgYg+gnoAAnjdtRp8wrrlT7lD1fyZelaX+5GOxiEYEEBECAAYFAkpX
-pFMACgkQsLQYPxkqfX1tUACdEsZdXFXMG2nhU4Eema+NQ7dPT3EAn2xH8ARaCHLo
-xg/knc9G04Wd0Q6NiEYEEBECAAYFAkpXqYgACgkQ2mrQCIL9F7Ji0gCbBQ6cYMbI
-Dd9B+cYFXDrSDqUmkXMAoJAv8rAPO4IfRsVd++gt28/G293TuQINBEpXa6gQCAC3
-VnB5gncnFQSjlu0YXhMQzOlXZ1/UVT262emIACbECDTUoy9U1J4VEecZimIe/BId
-uEEBY76i5pmvEV5iWzP3UbCCCUQmpMlFk2LV1jci30/2uTSVXL3yicfrOs74W3rG
-4DxN3cHbttEAZJgH0nKAg48APWsKOgrlgzPk63/vzcuymSnXWTiYksslXQ+NYOoV
-2Oux9y65K1PjEZoftjorrtcx4E6P0LO5hoowFucfo3VEYpzCjeLogjMmS5Af5GyI
-+/5QSQLQ+m0vzppwE8mIt1jsHtEy/0XIdOZTIA10e/I4AvxVoRHbdVY1LjtrkXKN
-CGTyaydBe3a4MDoUQWTzAAMGCACW8tORZd0boInktcNWS/szBgAllwPVhFUF4hk7
-pp1rPsiW3h36ARvhvdtNlHHgFPExU4fSinnpMUL0ajx4jEXGg6178WHMFvLUw6ww
-Ts1rXaHHagLwemG9iQ1++lLewSkqlKOjVvdV03WOHBwt5GTNe7KCuuM2ko27wSVY
-YpbP4A5jEhMkQuWsXPpNu+Oj5uS8XzrIR9McHK0lD9vU2cUUM7OauRo4obygodOa
-cwmd0NnRyYf5aPMn4AI795/eWuFK1WYz1Fe7uX7PNcrc2oGEUuqADFNfwtN2HN1V
-4dDBHUiPiPydrSml2l4T2NOLI2wVaXIfKdM/6R4agf7lruJliEkEGBECAAkFAkpX
-a6gCGwwACgkQKHfjrROgotzpAwCfbLfWIHyWyaWdBRRTixIRs/LFkzYAn3eVy9pL
-omk16gZFWxiB8lelViC1
-=ta+t
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6
deleted file mode 100644
index 70e93822bc9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY-sl6
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXa+QRBADFJtkQOdBsPIElO4SQnri0o6+d1uaaIkclI3uu88Pmy7LkBO4L
-y8U7jKS1y4m6I49hpqALM43wq8tm7BYWObd+xlol2mZEgbrxHoFugqfEKAOKxLut
-CkCC0wFOK3psQQMSNLokPHYLP6MJL84VsS+molGpUE7EtZZMRaHXyHiU+wCgg5dF
-3TD3rYn2PXkiAFlHs6/OficEAK0zmzEdzNfdfWwipf4AQrAEaBO9If7eo5zj6RX9
-bajg0IRgTxpwq6dP+bnnoEtm/v0vZeAGe8zscCX8xIPtDqu7+QbMe89SSdKJXHog
-/cC/vOS1+s5TKX2ervZ7pAauyve1xO53eVxsg6oDtTwIqvlQbmi6Vs2I3lplhJj9
-sZZ1A/4oNeWoZlBnxr/0eyHDktW89x0wt0R+jJVksnHJxyg7D+MLmaDZR0Fjg8Wt
-EhW8Q5WS0rkk39VaFoA3oR9nfEzAJgymSqNjTEwLsPaqvq6Q5zE+nouYP46cMbcW
-PKmST+QZCRMfznam667eKk0+opBIhDy57M2Kerx4EZyMy/0l4LRbU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4IDYp
-IDxzY2llbnRpZmljLWxpbnV4LWRldmVsQGZuYWwuZ292PohgBBMRAgAgBQJKV2vk
-AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQkV114Jsf01BepACeO7UR33C6
-g4HfHvLVq8zf1SU99y4An1ZOfgrW5iVCEwDc+bWiUu6sbujIiEYEEBECAAYFAkpX
-pBIACgkQsLQYPxkqfX0yCACfap7Y7XpjuSr2DXL+ohDbAM+xdOIAnRjegnSEBqHa
-Hpi8a7gS69H2hz51iEYEEBECAAYFAkpXqZUACgkQ2mrQCIL9F7IHlgCgr/SqepQ/
-8aXpbQqtwXQho6kDEHIAnRbtNiBRZl4B+fbh6ZsdOr6QHIiOuQINBEpXa+oQCACw
-50+Jv6VEVrAL+rRoptmBmHbg8XhNfOPn349GYCtZ9TebCtmU82MEWYF4Eo5vk1JM
-P29EBTKfYHBYsD231HavQa4EXVcjYm38i43c0P0sVvO1t5x2EDncthd+Sx3P/36k
-mr9pjCA9PFR3zLUA3YxqeipgrfU2NhDh4yvxgHogYjn1Gdqf0TWo2lqYnLjAMbZ0
-y7Mk5G6SfZcSRrZvjZgvXUlmynJXMY766LjyrfasuS4fd2LWFovXOakBb5lR7Z/O
-ec1U8CEypQ2iC9ww+Tg0tq+oIJ8g27pJrYsfoCf6HVhsxFOzxf8pjNTilWIB4lMk
-ok5+QnQwDVOykeXFDoKXAAMFB/9w1l+PFODmKJFCPqkYj2+0a+rT+76hDVaPJC8E
-xcsGf5uJQpOdgqgqMgT1kczMX4CbJ/OIqJVnuFGxoBh2tblwtHvGTwepSTn/yUyd
-SbCKmgMr8WafSZUxcRFPql4U2yBvAvdkTCTl+OHv3CrAZxDTV15FoHyPRm/2XU2f
-75Y3EutNLrh3TB5aXEveTe1LP+eYDtYTa/nW6A3WqOKWN7wpMBQ9H65mgN9au+g2
-Euh4DtV/myhnyILMYfCPvUAO68MZ4INC/koV0R78HBI4HHVE0Im338fQeS4g30eL
-+IPoYGAkRQsZ8pi5JnVdqUK9DuNA+NuEhZmYycC6RCxUaKFmiEkEGBECAAkFAkpX
-a+oCGwwACgkQkV114Jsf01C04QCdGkNIVHih/YkT79eykpQ8dUUfGkUAnjV0pyzz
-5XK12rKD3j1Z+SNr+Lqs
-=EcEL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/Scientific.6/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder
deleted file mode 100644
index d7c13725067..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/empty/.placeholder
+++ /dev/null
@@ -1 +0,0 @@
-# Placeholder for git
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5
deleted file mode 100644
index 2627d31d8f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-5
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfB6MRBACrnYW6yKMT+MwJlCIhoyTxGf3mAxmnAiDEy6HcYN8rivssVTJk
-CFtQBlBOpLV/OW2YtKrCO2xHn46eNfnMri8FGT8g+9JF3MUVi7kiV1He4iJynHXB
-+F2ZqIvHf3IaUj1ys+p8TK64FDFxDQDrGQfIsD/+pkSGx53/877IrvdwjwCguQcr
-Ioip5TH0Fj0OLUY4asYVZH8EAIqFHEqsY+9ziP+2R3/FyxSllKkjwcMLrBug+cYO
-LYDD6eQXE9Mq8XKGFDj9ZB/0+JzK/XQeStheeFG75q3noq5oCPVFO4czuKErIRAB
-qKbDBhaTj3JhOgM12XsUYn+rI6NeMV2ZogoQCC2tWmDETfRpYp2moo53NuFWHbAy
-XjETA/sHEeQT9huHzdi/lebNBj0L8nBGfLN1nSRP1GtvagBvkR4RZ6DTQyl0UzOJ
-RA3ywWlrL9IV9mrpb1Fmn60l2jTMMCc7J6LacmPK906N+FcN/Docj1M4s/4CNanQ
-NhzcFhAFtQL56SNyLTCk1XzhssGZ/jwGnNbU/aaj4wOj0Uef5LRGQ2VudE9TLTUg
-S2V5IChDZW50T1MgNSBPZmZpY2lhbCBTaWduaW5nIEtleSkgPGNlbnRvcy01LWtl
-eUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwekAhsDBQkSzAMABgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEKikR9zoViiXKlEAmwSoZDvZo+WChcg3s/SpNoWCKhMAAJwI
-E2aXpZVrpsQnInUQWwkdrTiL5YhMBBMRAgAMBQJFnwiSBYMSzAIRAAoJEDjCFhY5
-bKCk0hAAn134bIx3wSbq58E6P6U5RT7Z2Zx4AJ9VxnVkoGHkVIgSdsxHUgRjo27N
-F7kBDQRFnwezEAQA/HnJ5yiozwgtf6jt+kii8iua+WnjqBKomPHOQ8moxbWdv5Ks
-4e1DPhzRqxhshjmub4SuJ93sgMSAF2ayC9t51mSJV33KfzPF2gIahcMqfABe/2hJ
-aMzcQZHrGJCEX6ek8l8SFKou7vICzyajRSIK8gxWKBuQknP/9LKsoczV+xsAAwUD
-/idXPkk4vRRHsCwc6I23fdI0ur52bzEqHiAIswNfO521YgLk2W1xyCLc2aYjc8Ni
-nrMX1tCnEx0/gK7ICyJoWH1Vc7//79sWFtX2EaTO+Q07xjFX4E66WxJlCo9lOjos
-Vk5qc7R+xzLDoLGFtbzaTRQFzf6yr7QTu+BebWLoPwNTiE8EGBECAA8FAkWfB7MC
-GwwFCRLMAwAACgkQqKRH3OhWKJfvvACfbsF1WK193zM7vSc4uq51XsceLwgAoI0/
-9GxdNhGQEAweSlQfhPa3yYXH
-=o/Mx
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6
deleted file mode 100644
index bd863d8e212..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-CentOS-6
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE4P06MBEACqn48FZgYkG2QrtUAVDV58H6LpDYEcTcv4CIFSkgs6dJ9TavCW
-NyPBZRpM2R+Rg5eVqlborp7TmktBP/sSsxc8eJ+3P2aQWSWc5ol74Y0OznJUCrBr
-bIdypJllsD9Fe+h7gLBXTh3vdBEWr2lR+xA+Oou8UlO2gFbVFQqMafUgU1s0vqaE
-/hHH0TzwD0/tJ6eqIbHwVR/Bu6kHFK4PwePovhfvyYD9Y+C0vOYd5Ict2vbLHz1f
-QBDZObv4M6KN3j7nzme47hKtdMd+LwFqxM5cXfM6b5doDulWPmuGV78VoX6OR7el
-x1tlfpuiFeuXYnImm5nTawArcQ1UkXUSYcTUKShJebRDLR3BycxR39Q9jtbOQ29R
-FumHginovEhdUcinRr22eRXgcmzpR00zFIWoFCwHh/OCtG14nFhefuZ8Z80qbVhW
-2J9+/O4tksv9HtQBmQNOK5S8C4HNF2M8AfOWNTr8esFSDc0YA5/cxzdfOOtWam/w
-lBpNcUUSSgddRsBwijPuWhVA3NmA/uQlJtAo4Ji5vo8cj5MTPG3+U+rfNqRxu1Yc
-ioXRo4LzggPscaTZX6V24n0fzw0J2k7TT4sX007k+7YXwEMqmHpcMYbDNzdCzUer
-Zilh5hihJwvGfdi234W3GofttoO+jaAZjic7a3p6cO1ICMgfVqrbZCUQVQARAQAB
-tEZDZW50T1MtNiBLZXkgKENlbnRPUyA2IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
-Y2VudG9zLTYta2V5QGNlbnRvcy5vcmc+iQI8BBMBAgAmBQJOD9OjAhsDBQkSzAMA
-BgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQCUb8osEFud6ajRAAnb6d+w6Y/v/d
-MSy7UEy4rNquArix8xhqBwwjoGXpa37OqTvvcJrftZ1XgtzmTbkqXc+9EFch0C+w
-ST10f+H0SPTUGuPwqLkg27snUkDAv1B8laub+l2L9erzCaRriH8MnFyxt5v1rqWA
-mVlRymzgXK+EQDr+XOgMm1CvxVY3OwdjdoHNox4TdVQWlZl83xdLXBxkd5IRciNm
-sg5fJAzAMeg8YsoDee3m4khg9gEm+/Rj5io8Gfk0nhQpgGGeS1HEXl5jzTb44zQW
-qudkfcLEdUMOECbu7IC5Z1wrcj559qcp9C94IwQQO+LxLwg4kHffvZjCaOXDRiya
-h8KGsEDuiqwjU9HgGq9fa0Ceo3OyUazUi+WnOxBLVIQ8cUZJJ2Ia5PDnEsz59kCp
-JmBZaYPxUEteMtG3yDTa8c8jUnJtMPpkwpSkeMBeNr/rEH4YcBoxuFjppHzQpJ7G
-hZRbOfY8w97TgJbfDElwTX0/xX9ypsmBezgGoOvOkzP9iCy9YUBc9q/SNnflRWPO
-sMVrjec0vc6ffthu2xBdigBXhL7x2bphWzTXf2T067k+JOdoh5EGney6LhQzcp8m
-YCTENStCR+L/5XwrvNgRBnoXe4e0ZHet1CcCuBCBvSmsPHp5ml21ahsephnHx+rl
-JNGtzulnNP07RyfzQcpCNFH7W4lXzqM=
-=jrWY
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-4
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5
deleted file mode 100644
index 5a13bb4f9f9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-5
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEXopTIRBACZDBMOoFOakAjaxw1LXjeSvh/kmE35fU1rXfM7T0AV31NATCLF
-l5CQiNDA4oWreDThg2Bf6+LIVTsGQb1V+XXuLak4Em5yTYwMTVB//4/nMxQEbpl/
-QB2XwlJ7EQ0vW+kiPDz/7pHJz1p1jADzd9sQQicMtzysS4qT2i5A23j0VwCg1PB/
-lpYqo0ZhWTrevxKMa1n34FcD/REavj0hSLQFTaKNLHRotRTF8V0BajjSaTkUT4uk
-/RTaZ8Kr1mTosVtosqmdIAA2XHxi8ZLiVPPSezJjfElsSqOAxEKPL0djfpp2wrTm
-l/1iVnX+PZH5DRKCbjdCMLDJhYap7YUhcPsMGSeUKrwmBCBJUPc6DhjFvyhA9IMl
-1T0+A/9SKTv94ToP/JYoCTHTgnG5MoVNafisfe0wojP2mWU4gRk8X4dNGKMj6lic
-vM6gne3hESyjcqZSmr7yELPPGhI9MNauJ6Ob8cTR2T12Fmv9w03DD3MnBstR6vhP
-QcqZKhc5SJYYY7oVfxlSOfF4xfwcHQKoD5TOKwIAQ6T8jyFpKbQkRmVkb3JhIEVQ
-RUwgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iGQEExECACQFAkXopTICGwMFCRLM
-AwAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQEZzANiF1IfabmQCgzvE60MnHSOBa
-ZXXF7uU2Vzu8EOkAoKg9h+j0NuNom6WUYZyJQt4zc5seuQINBEXopTYQCADapnR/
-blrJ8FhlgNPl0X9S3JE/kygPbNXIqne4XBVYisVp0uzNCRUxNZq30MpY027JCs2J
-nL2fMpwvx33f0phU029vrIZKA3CmnnwVsjcWfMJOVPBmVN7m5bGU68F+PdRIcDsl
-PMOWRLkTBZOGolLgIbM4719fqA8etewILrX6uPvRDwywV7/sPCFpRcfNNBUY+Zx3
-5bf4fnkaCKxgXgQS3AT+hGYhlzIqQVTkGNveHTnt4SSzgAqR9sSwQwqvEfVtYNeS
-w5rDguLG41HQm1Hojv59HNYjH6F/S1rClZi21bLgZbKpCFX76qPt8CTw+iQLBPPd
-yoOGHfzyp7nsfhUrAAMFB/9/H9Gpk822ZpBexQW4y3LGFo9ZSnmu+ueOZPU3SqDA
-DW1ovZdYzGuJTGGM9oMl6bL8eZrcUBBOFaWge5wZczIE3hx2exEOkDdvq+MUDVD1
-axmN45q/7h1NYRp5GQL2ZsoV4g9U2gMdzHOFtZCER6PP9ErVlfJpgBUCdSL93V4H
-Sgpkk7znmTOklbCM6l/G/A6q4sCRqfzHwVSTiruyTBiU9lfROsAl8fjIq2OzWJ2T
-P9sadBe1llUYaow7txYSUxssW+89avct35gIyrBbof5M+CBXyAOUaSWmpM2eub24
-0qbqiSr/Y6Om0t6vSzR8gRk7g+1H6IE0Tt1IJCvCAMimiE8EGBECAA8FAkXopTYC
-GwwFCRLMAwAACgkQEZzANiF1IfZQYgCgiZHCv4xb+sTHCn/otc1Ovvi/OgMAnRXY
-bbsLFWOfmzAnNIGvFRWy+YHi
-=MMNL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6 b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6
deleted file mode 100644
index 7a2030489d2..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-EPEL-6
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
-JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
-M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
-XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
-pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
-QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
-Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
-3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
-vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
-1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
-YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
-tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
-KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
-qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
-9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
-Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
-WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
-HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
-p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
-x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
-wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
-l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
-iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
-XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
-=V/6I
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG
deleted file mode 100644
index 8722c21cbd6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-PGDG
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEeD8koRBACC1VBRsUwGr9gxFFRho9kZpdRUjBJoPhkeOTvp9LzkdAQMFngr
-BFi6N0ov1kCX7LLwBmDG+JPR7N+XcH9YR1coSHpLVg+JNy2kFDd4zAyWxJafjZ3a
-9zFg9Yx+0va1BJ2t4zVcmKS4aOfbgQ5KwIOWUujalQW5Y+Fw39Gn86qjbwCg5dIo
-tkM0l19h2sx50D027pV5aPsD/2c9pfcFTbMhB0CcKS836GH1qY+NCAdUwPs646ee
-Ex/k9Uy4qMwhl3HuCGGGa+N6Plyon7V0TzZuRGp/1742dE8IO+I/KLy2L1d1Fxrn
-XOTBZd8qe6nBwh12OMcKrsPBVBxn+iSkaG3ULsgOtx+HHLfa1/p22L5+GzGdxizr
-peBuA/90cCp+lYcEwdYaRoFVR501yDOTmmzBc1DrsyWP79QMEGzMqa393G0VnqXt
-L4pGmunq66Agw2EhPcIt3pDYiCmEt/obdVtSJH6BtmSDB/zYhbE8u3vLP3jfFDa9
-KXxgtYj0NvuUVoRmxSKm8jtfmj1L7zoKNz3jl+Ba3L0WxIv4+bRBUG9zdGdyZVNR
-TCBSUE0gQnVpbGRpbmcgUHJvamVjdCA8cGdzcWxycG1zLWhhY2tlcnNAcGdmb3Vu
-ZHJ5Lm9yZz6IYAQTEQIAIAUCR4PySgIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheA
-AAoJEB8W0uFELfD4jnkAoMqd6ZwwsgYHZ3hP9vt+DJt1uDW7AKDbRwP8ESKFhwdJ
-8m91RPBeJW/tMLkCDQRHg/JKEAgA64+ZXgcERPYfZYo4p+yMTJAAa9aqnE3U4Ni6
-ZMB57GPuEy8NfbNya+HiftO8hoozmJdcI6XFyRBCDUVCdZ8SE+PJdOx2FFqZVIu6
-dKnr8ykhgLpNNEFDG3boK9UfLj/5lYQ3Y550Iym1QKOgyrJYeAp6sZ+Nx2PavsP3
-nMFCSD67BqAbcLCVQN7a2dAUXfEbfXJjPHXTbo1/kxtzE+KCRTLdXEbSEe3nHO04
-K/EgTBjeBUOxnciH5RylJ2oGy/v4xr9ed7R1jJtshsDKMdWApwoLlCBJ63jg/4T/
-z/OtXmu4AvmWaJxaTl7fPf2GqSqqb6jLCrQAH7AIhXr9V0zPZwADBQgAlpptNQHl
-u7euIdIujFwwcxyQGfee6BG+3zaNSEHMVQMuc6bxuvYmgM9r7aki/b0YMfjJBk8v
-OJ3Eh1vDH/woJi2iJ13vQ21ot+1JP3fMd6NPR8/qEeDnmVXu7QAtlkmSKI9Rdnjz
-FFSUJrQPHnKsH4V4uvAM+njwYD+VFiwlBPTKNeL8cdBb4tPN2cdVJzoAp57wkZAN
-VA2tKxNsTJKBi8wukaLWX8+yPHiWCNWItvyB4WCEp/rZKG4A868NM5sZQMAabpLd
-l4fTiGu68OYgK9qUPZvhEAL2C1jPDVHPkLm+ZsD+90Pe66w9vB00cxXuHLzm8Pad
-GaCXCY8h3xi6VIhJBBgRAgAJBQJHg/JKAhsMAAoJEB8W0uFELfD4K4cAoJ4yug8y
-1U0cZEiF5W25HDzMTtaDAKCaM1m3Cbd+AZ0NGWNg/VvIX9MsPA==
-=au6K
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL
deleted file mode 100644
index 152fd799008..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-RBEL
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-mQGiBEZ6qawRBAC2gDuA1sZioGh1VP/U0l+9RmzOdkWBGB3NfWqezAwt1Up+cP5o
-h+UNkghOKbJVQ/zLyY/edYOppQ78yxT1X/J1RHNhs5bjqzWlQxMbT5/tt1N4PExu
-gvO38RGFTV0DqIy3lQw5YIwp2le+G8MktYh2NKI4lG0AJoXZicNlI7+mEwCgmfw+
-CnsB/kb/xUD1dq6Mo3dYXVcEAKSFfqt+6jvJNxcIYfpQqjEslQsQmPKpXzK9CPyV
-UCjUEOirbhPxV86u3Ge/yuy5USMvTTs+ztImabbH6UHBEP+tEw3LiuPUpfh+nEna
-3Hz+U81PvUwGEwUMzCr+OemBXqGW7jl66NqKqm8YM3Pkvc4NlS/7slky9A/s6i8S
-hToWA/9kP55aSbIXte5TbC88lx6YuLx7qW541ni38DmJfPN5hHywLGnM82MMQMbk
-hg1v49+7TTNv44LJpGT7t8gsW9F4Z4rWoChhsldypeeqbDOIv4kFiXt/8122Ud9J
-nE67CR9XUuS5Jp+gP6xxNr9/vbvqsOGMJAQkVgkBPVuKYv25gLQ3U2VyZ2lvIFJ1
-YmlvIChGcmFtZU9TIERldmVsb3BlcnMpIDxydWJpb2pyQGZyYW1lb3Mub3JnPohr
-BBMRAgArAhsDBQkGE0x0BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCTBs76AIZ
-AQAKCRCOw9dP80W+dFhjAJ0dKy761iPcG+ALwEAuAgxDpUVBzgCdFxGCAZ7ELYvf
-3uFc0Ou2ihDzvyy0IFNlcmdpbyBSdWJpbyA8c2VyZ2lvQHJ1YmlvLm5hbWU+iGYE
-ExECACYCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUJBhNMdAUCTBs7XgAKCRCO
-w9dP80W+dDdtAJ9NYoW1ChfMyES7nQUlesEQ4aWXjQCeIoGxoOuIGyg6+AKr/2Wr
-6fE1zt2IaQQTEQIAKQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkBBQJIHsGo
-BQkCuHFEAAoJEI7D10/zRb50KjgAnRTzzNIODKqrHnrHaUG8dWDCwmYjAJ48Hbcn
-ZC6E8LGTeM8vPN0mMI9ijLkCDQRGeqm2EAgAh720kjA9bNDms+6agb6CirD9RkmZ
-3G+OHd5iia3KbaUiBtC3PECg4UE8N54JuBNKdjgJQfdYSg2J0EZHyhZHdAVWjykE
-tj/IKZKnAfUqKh44uT9OUPW8PChPo/gioLn+DexSAW7n19h7VIa1P3shYqYR/gz8
-zgfrXkFFpkpKnOLsXuF20JEEBIBdwrfYRJIBrUTYrfS/2GKLJjyutENkb9uI3JgQ
-LfR6DckTaar4eeArjgvOxZRHiU0vRezetlbG8ZM9mSYrcMM3Xa5vLpFlDj6vYzat
-RWEuZUfLgXWUVoVyFiNVXhpff/w7/bAb3WpXqjZd6sK8CCJJPNtnbLE7CwADBQf9
-EQjT9iiEZis35V9HqeLsxXVjPOGNuLiwjIpacI7CM3aGV1q7NXiCE4oWS/PvpHmu
-W+XdXMPH4Bt2VmjZSarlAipTeNnOuiEXipUFIjAlNn1xNVRRd7T35zIvXLtmNtUe
-nN1/mqZljKPbCbW1AgktH417t/vJfTnRWr9IgS3Am+o4q200i+1FjrQ/UI3s9+vg
-5B+KASFP6HspNttl0kwzQ6SFIHAebd4DKHOj6ShxXPNl18W4R8qPqayrAFqdkgMJ
-Jn8j2E8rmGYnssSfjck2kLtvNdTEAMjFnhg+oUapUzJAVeterudiWZFNrtn9ewnf
-8SUiiYJlxb+nz545zo0gQIhJBBgRAgAJBQJGeqm2AhsMAAoJEI7D10/zRb50PJEA
-mwTA+Sp3wvzwDr8sk7W7U4bBfw26AKCVoYw3mfTime+j3mFk1yk1yxjE2Q==
-=iyOs
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta
deleted file mode 100644
index b86da239064..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-beta
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEWfBuERBACrwDH+6QvpyaOgzhXiemsIX+q4HlhX/HDmrmZOUd7i9VmZNogP
-6LRRiTygn2+UphaGV3NDA36ZB/1JRpgvgpzbpZNeAoFvsljIbxGIwkH2JgRF6oNo
-eGB3QYzDQJvYVIejk79M0ed3oor4w8OiNVcdxLyVIthFrjrrCqwRP3bLZwCgtY9t
-Ezf5WL63Ue45vdht7A2GH+0D/iNAnWKsU7FUMFZrcwMaMbyP7YG8z0+zXUOgtgyP
-tbgJG5yikNT3vJypb42gbKfcriUUDC5AeiRmkR8QPvYuOm34rM90+wx2LGqXWnHM
-IyLAyl8TS3MQmePem8bfTGTNYxtt3Q7iadez2WYTLBSlmM6hbxZfdwm1hhyM0AJU
-YyFUA/9kHH+CUBxKb1UgG7TSp53Po/5p/Yyuty+RJ7zIGv6SiN/JK4/ntWfm5WS5
-ZprSdE5ODoFQ/Gs3/VB/eolg2fBW1DcftH6lKHT3GKEOaicGX+T9eOMerZZedm5U
-vDA9mFvWnOdOxK8LuRgVqip4jCnWICchpatmdP0whJQHQ6MGLLRMQ2VudE9TLTUg
-QmV0YSBLZXkgKENlbnRPUyA1IEJldGEgU2lnbmluZyBLZXkpIDxjZW50b3MtNS1i
-ZXRhLWtleUBjZW50b3Mub3JnPohkBBMRAgAkBQJFnwbhAhsDBQkSzAMABgsJCAcD
-AgMVAgMDFgIBAh4BAheAAAoJEM/aaIEJLXsrWDkAoKcqa+AAdAWvp5qlJkGQiRy8
-aNFDAJ4qRfIxMiLinmjbqcuygWMp61wY5ohMBBMRAgAMBQJFnwhtBYMSzAF0AAoJ
-EDjCFhY5bKCkG/wAn14LDlJqjZv1Wz0WNfhr80+qJrf6AKCaIZExwo4ApQpESk/F
-SApLd/pEILkBDQRFnwbrEAQAwKzjI2aTB/sS9HuQ4CHCwrj4vr0HxMMwQikYBIvy
-MYTtek04KDTKoJL5g3411DsfDW9VRGJdFCHvldgam/5UVfO6nywLkdwAA5TQA5dv
-8YE8jTtwdy5Y1QKFc8LaIBZK0+ZbhEvdNfv67egvfcxZc5PvpBZ3C03n+iQ3wPcg
-PhcAAwUD/iYkq4LG/je43Qa5rTz5kF5rIiX7Bk5vXT7XSFOFKwHy8V+PGEoVM1W8
-+EHIlmTycwIlsVp3by6qCDkMYu4V6VukxZNzJyeoMICiYIXUPh6NKHRoqaYlu6ZO
-eFN1TQNXmodPk+iNtdbcby/zAklNqoO/dWSwd8NAo8s6WAHq3VPpiE8EGBECAA8F
-AkWfBusCGwwFCRLMAwAACgkQz9pogQkteysXkACgoraCU0EBC+W8TuxrsePO20ma
-D0IAoLRRQLTEXL0p3K0WE+LfyTr9EVG5
-=mH0S
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org
deleted file mode 100644
index fe0c0822752..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-elrepo.org
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEm+/6QRBAC5mbtqOFSQ0FkTLIMdIoqxtraIeUqwbPp3IBYQ/u/EREjyEf1D
-qFyBEXII0dD8JDT85vRZ81jhB7nFWa0VbUfY0xfghkbnokiNBVNpiQcvszw3UYDF
-aLAaOC8Z98vmlsQaBBTQG6704ZXLr7FJyG3GP5WE6egXIQQbrMcdmCoRBwCg/dwC
-HLWjuemoDc5SX7hKHbB4zZ8D/jP+oMbqz+bDn8OZ2UuaGdxr+mHW8tzTdPjnEU8e
-hUt1ws8eBqn/gMfKvUBa8xFSILe8Ty99u+VjFbcRsdf0H6dRre9AdDVUz5oxzoPw
-gamA8mhPQvFh3wt9smtRUh5IoM2LiM1s5pGMLuYuvSnVUPArEnSfW6K5I6v7OarU
-3WfrBACDEGGcaWKjfdkRtmKIQrzu6AnldVC1ISLVAoqxHnKNFTk1BgO0PSZDpfJI
-x8fMCnGlusoL6F5+LYEk4K4B0zvlj1ur3JocjxpuBLccl94JTo/+I9ZbS8ptUqLw
-LBUkgIQJzzIH4G5NZsQ3FpzSWGRFVa7etqTv9BfUMUmJxhEoobQ/ZWxyZXBvLm9y
-ZyAoUlBNIFNpZ25pbmcgS2V5IGZvciBlbHJlcG8ub3JnKSA8c2VjdXJlQGVscmVw
-by5vcmc+iGAEExECACAFAkm+/6QCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRAwm8MFuq2uUlgWAKCGWOpyodbzxS7Xy/0X9m9qVnHq+ACfUHrQzYAtFRpT07Sg
-giosE+mvAKu5Ag0ESb7/pxAIALgT0q0HhwugE717a7N+gAtCbFu8pCXOZcrAnJpG
-cMA9VWmsODZStPTxXYM2ggCMSzUnNis8pPZOPIP5C+t2IYtVjLshM4C9UiY7u5ET
-jErWCxWmF+2QLO50K56E4qxj0wufZt9P+Ih0USUM5L2oyrQG51uj/2v3Qq3igc8Z
-NTtmEOfis3losusQbAfZtTBmNQ0570kkhMxiyavgAUxLenXHYrkDJFuL7XdBCmna
-kykTn2dzU81rIDZ+QPxII4V/eZ5xGiRY/EDUIAysEV2m0NNZgWi/twUnZICm7zYp
-VRviJrBnFTvNEPMhiGRnJgQp/Krv4WIHQ67N8lQg3q5RJX8AAwUH/0UBjBgbsuWR
-dB+ZYWjKPBy+bJY/6HefPUuLrt3QDNINMW8kY7VzWRMWyGc4IlPJDW0nwOn/vT5H
-Dgc3YmA3tm7cKj5wpFijzff61Db8eq+CUKGscKxDBGzHq6oirM5U7DQLmipCs5Eb
-efwHIjE3aOUSnoQmniEnBWI2hm/rftmY9oJSi8xgns4wAokDPiMcucADtbV3fznx
-ppuowtBi8bcGB1vJZjTySQcSKWv+IVp5ej06uZ9501BEm6HxUZkuAGPecP65kcQu
-5bg7B7LQeI5AWyujqvfuWgAF34xhl9QU/sDWxM3wUog+bw7y8pyWCqnJhp70yx8o
-SqzhFygT62eISQQYEQIACQUCSb7/pwIbDAAKCRAwm8MFuq2uUq8PAKC1+E2pSwiS
-oHXkKYPYDwApsP1mVACfRe1YnggLYQtG9LMeweVQQC77rK8=
-=qyRr
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh
deleted file mode 100644
index f8c688e5f4c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-kbsingh
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEIu6hwRBACOz2JFa1nW+seAKlVGOu0ykhdFVNI9E4/Abp2+8nsJIZyUwLAp
-ei76rPD8WdptgIjtYOCsqz1TbP+eqeEG0LLihOdFRLUuAjQX4X7LLf5Qm+nvUB73
-uLbSf9Ptps2CMUEtu7+0wVoTbuC19HXUhUr5sRdCnJbPJBH6aAHG7Pl9ZwCguN9o
-V7IKTnIQiZg0nxSjZ4V9e6UD/R7KoMwH3NPQQF7T7rJaBjSZcVHUPhAcNPNn+ms/
-Tw9mzHZ0mnQnOzSEW0ZUj9TkLN52VQ3WmGZKAv9yeVr0/230YIgmtH863lSystmk
-LNO9brK0+3vKg5GRpV0/MSWSmf39WPAS1hXNXIFfYp1eGHUfed4FVNxrMTWHQozr
-8JosA/wP+zGfM51bSAazLUqP/MEm7F9OFkuD7Sw97w55FyYlrPp1FQWrWczoiKHr
-wS5NRCQbCGEEM/+j9id6CukxPLXxwMYCfeg5K0HxMaQT6hxbwjOzAzN3PBFytNel
-09qdrdoSDa35twT0SAt+rzM+zvRI8ycizFG3lIih4UItWWve2bQ6S2FyYW5iaXIg
-U2luZ2ggKGh0dHA6Ly93d3cua2FyYW4ub3JnLykgPGtic2luZ2hAa2FyYW4ub3Jn
-PoheBBMRAgAeBQJCLuocAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEDANvZ4+
-E89b/P4AnjufrDCS+TAEL0KpkYDURePbDCHBAJ4+0iI1Td4YrcnLwmQ1+XDCJ3Zr
-a7kBDQRCLuocEAQAjAl48FM9eGtP6M9FgswlSPAuCcJct6wOHmd/qZ923HckJPAD
-zIFRMlM6H8P0bKoaIluv7agZM7Gsf8NeTg3NEeMKqnibIAyvjYeSkceRIwvBCQ3A
-YwWk+B2zLUAFMxnE31oA10zjCKUo7Dc6XDUxSY/qdLymZzyG/Ndav+vMOVsAAwUD
-/RCFDuW/GSM/s3DO7XxrOBRTGQmf9v9tCYdZZD615+s8ghaa5oZTvp1cbTTWiSq8
-ybncfjVHz9HezDgQjJsFZtrYd4w2JD+7K0+8sZ+BUGo1dDSv4UgN8ACtaGJnShiq
-s8pQWRZFqFa3waay8oUSTKHiTHdpxLi3x4HhK/8MTsxniEkEGBECAAkFAkIu6hwC
-GwwACgkQMA29nj4Tz1tHSgCcDgKL4swEu7ShvI8nZt2JLmTKB5QAn0qZi2zbexbi
-DX+bbalHM+xVnXZN
-=rZT6
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta
deleted file mode 100644
index 7b40671a4c1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-beta
+++ /dev/null
@@ -1,61 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBEmkAzABEAC2/c7bP1lHQ3XScxbIk0LQWe1YOiibQBRLwf8Si5PktgtuPibT
-kKpZjw8p4D+fM7jD1WUzUE0X7tXg2l/eUlMM4dw6XJAQ1AmEOtlwSg7rrMtTvM0A
-BEtI7Km6fC6sU6RtBMdcqD1cH/6dbsfh8muznVA7UlX+PRBHVzdWzj6y8h84dBjo
-gzcbYu9Hezqgj/lLzicqsSZPz9UdXiRTRAIhp8V30BD8uRaaa0KDDnD6IzJv3D9P
-xQWbFM4Z12GN9LyeZqmD7bpKzZmXG/3drvfXVisXaXp3M07t3NlBa3Dt8NFIKZ0D
-FRXBz5bvzxRVmdH6DtkDWXDPOt+Wdm1rZrCOrySFpBZQRpHw12eo1M1lirANIov7
-Z+V1Qh/aBxj5EUu32u9ZpjAPPNtQF6F/KjaoHHHmEQAuj4DLex4LY646Hv1rcv2i
-QFuCdvLKQGSiFBrfZH0j/IX3/0JXQlZzb3MuMFPxLXGAoAV9UP/Sw/WTmAuTzFVm
-G13UYFeMwrToOiqcX2VcK0aC1FCcTP2z4JW3PsWvU8rUDRUYfoXovc7eg4Vn5wHt
-0NBYsNhYiAAf320AUIHzQZYi38JgVwuJfFu43tJZE4Vig++RQq6tsEx9Ftz3EwRR
-fJ9z9mEvEiieZm+vbOvMvIuimFVPSCmLH+bI649K8eZlVRWsx3EXCVb0nQARAQAB
-tDBSZWQgSGF0LCBJbmMuIChiZXRhIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0LmNv
-bT6JAjYEEwECACAFAkpSM+cCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCT
-ioDK8hVB6/9tEAC0+KmzeKceXQ/GTUoU6jy9vtkFCFrmv+c7ol4XpdTt0QhqBOwy
-6m2mKWwmm8KfYfy0cADQ4y/EcoXl7FtFBwYmkCuEQGXhTDn9DvVjhooIq59LEMBQ
-OW879RwwzRIZ8ebbjMUjDPF5MfPQqP2LBu9N4KvXlZp4voykwuuaJ+cbsKZR6pZ6
-0RQKPHKP+NgUFC0fff7XY9cuOZZWFAeKRhLN2K7bnRHKxp+kELWb6R9ZfrYwZjWc
-MIPbTd1khE53L4NTfpWfAnJRtkPSDOKEGVlVLtLq4HEAxQt07kbslqISRWyXER3u
-QOJj64D1ZiIMz6t6uZ424VE4ry9rBR0Jz55cMMx5O/ni9x3xzFUgH8Su2yM0r3jE
-Rf24+tbOaPf7tebyx4OKe+JW95hNVstWUDyGbs6K9qGfI/pICuO1nMMFTo6GqzQ6
-DwLZvJ9QdXo7ujEtySZnfu42aycaQ9ZLC2DOCQCUBY350Hx6FLW3O546TAvpTfk0
-B6x+DV7mJQH7MGmRXQsE7TLBJKjq28Cn4tVp04PmybQyTxZdGA/8zY6pPl6xyVMH
-V68hSBKEVT/rlouOHuxfdmZva1DhVvUC6Xj7+iTMTVJUAq/4Uyn31P1OJmA2a0PT
-CAqWkbJSgKFccsjPoTbLyxhuMSNkEZFHvlZrSK9vnPzmfiRH0Orx3wYpMQ==
-=21pb
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc. for this beta using `rpm -K' using the GNU GPG
-package.  Questions about this key should be sent to security@redhat.com.
-
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.6 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDySTqsRBACzc7xuCIp10oj5B2PAV4XzDeVxprv/WTMreSNSK+iC0bEz0IBp
-Vnn++qtyiXfH+bGIE9jqZgIEnpttWhUOaU5LhcLFzy+m8NWfngIFP9QfGmGAe9Gd
-LFeAdhj4RmSG/vgr7vDd83Hz22dv403Ar/sliWO4vDOrMmZBG57WGYTWtwCgkMsi
-UUQuJ6slbzKn82w+bYxOlL0EAIylWJGaTkKOTL5DqVR3ik9aT0Dt3FNVYiuhcKBe
-II4E3KOIVA9kO8in1IZjx2gs6K2UV+GsoAVANdfKL7l9O+k+J8OxhE74oycvYJxW
-QzCgXMZkNcvW5wyXwEMcr6TVd/5BGztcMw8oT3/l2MtAEG/vn1XaWToRSO1XDMDz
-+AjUA/4m0mTkN8S4wjzJG8lqN7+quW3UOaiCe8J3SFrrrhE0XbY9cTJI/9nuXHU1
-VjqOSmXQYH2Db7UOroFTBiWhlAedA4O4yuK52AJnvSsHbnJSEmn9rpo5z1Q8F+qI
-mDlzriJdrIrVLeDiUeTlpH3kpG38D7007GhXBV72k1gpMoMcpbQ3UmVkIEhhdCwg
-SW5jLiAoQmV0YSBUZXN0IFNvZnR3YXJlKSA8cmF3aGlkZUByZWRoYXQuY29tPohX
-BBMRAgAXBQI8l5p/BQsHCgMEAxUDAgMWAgECF4AACgkQ/TcmiYl9oHqdeQCfZjw4
-F9sir3XfRAjVe9kYNcQ8hnIAn0WgyT7H5RriWYTOCfauOmd+cAW4iEYEEBECAAYF
-AjyXmqQACgkQIZGAzdtCpg5nDQCfepuRUyuVJvhuQkPWySETYvRw+WoAnjAWhx6q
-0npMx4OE1JGFi8ymKXktuQENBDySTq4QBADKL/mK7S8E3synxISlu7R6fUvu07Oc
-RoX96n0Di6T+BS99hC44XzHjMDhUX2ZzVvYS88EZXoUDDkB/8g7SwZrOJ/QE1zrI
-JmSVciNhSYWwqeT40Evs88ajZUfDiNbS/cSC6oui98iS4vxd7sE7IPY+FSx9vuAR
-xOa9vBnJY/dx0wADBQQAosm+Iltt2uigC6LJzxNOoIdB5r0GqTC1o5sHCeNqXJhU
-ExAG8m74uzMlYVLOpGZi4y4NwwAWvCWC0MWWnnu+LGFy1wKiJKRjhv5F+WkFutY5
-WHV5L44vp9jSIlBCRG+84jheTh8xqhndM9wOfPwWdYYu1vxrB8Tn6kA17PcYfHSI
-RgQYEQIABgUCPJJergAKCRD9NyaJiX2geiCPAJ4nEM4NtI9Uj8lONDk6FU86PmoL
-yACfb68fBd2pWEzLKsOk9imIobHHpzE=
-=gpIn
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
deleted file mode 100644
index 3818b2c926f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
+++ /dev/null
@@ -1,37 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped prior to November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.0 (GNU/Linux)
-Comment: For info see http://www.gnupg.org
-
-mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8
-HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM
-GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV
-EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS
-ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP
-lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW
-XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb
-E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES
-PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg
-SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID
-FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB
-XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U
-lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+
-5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3
-Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI
-hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+
-JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9
-E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK
-ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8
-BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5
-4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY
-FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk
-OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h
-VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==
-=3AHZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
deleted file mode 100644
index 09aded8bec7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
+++ /dev/null
@@ -1,24 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2006, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEV2EyQRBAD4/SR69qoLzK4HIa6g9iS+baiX0o3NjkLftFHg/xy+IMOMg//i
-4c5bUpLKDTMH3+yT0G8qpul/RALUFOESKFkZm3/SlkJKuroXcB8U6s2dh5XX9DDB
-ISqRwL7M5qB8rfDPKHN+k/XwJ9CNpHMdNxnnc2WhnnmHNp6NrD/bUEH4vwCglMa0
-rFRXPaN7407DARGHvW/jugsEANFaeZsFwos/sajL1XQRfHZUTnvDjJgz31IFY+OL
-DlOVAOtV/NaECMwIJsMIhoisW4Luwp4m75Qh3ogq3bwqSWNLsfJ9WFnNqXOgamyD
-h/F4q492z6FpyIb1JZLABBSH7LEQjHlR/s/Ct5JEWc5MyfzdjBi6J9qCh3y/IYL0
-EbfRA/4yoJ/fH9uthDLZsZRWmnGJvb+VpRvcVs8IQ4aIAcOMbWu2Sp3U9pm6cxZF
-N7tShmAwiiGj9UXVtlhpj3lnqulLMD9VqXGF0YgDOaQ7CP/99OEEhUjBj/8o8udF
-gxc1i2WJjc7/sr8IMbDv/SNToi0bnZUxXa/BUjj92uaQ6/LupbQxUmVkIEhhdCwg
-SW5jLiAocmVsZWFzZSBrZXkpIDxzZWN1cml0eUByZWRoYXQuY29tPohfBBMRAgAf
-BQJFdhMkAhsDBgsJCAcDAgQVAggDAxYCAQIeAQIXgAAKCRBTJoEBNwFxhogXAKCD
-TuYeyQrkYXjg9JmOdTZvsIVfZgCcCWKJXtfbC5dbv0piTHI/cdwVzJo=
-=mhzo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
deleted file mode 100644
index 0f875c0e207..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEYk7/IRBACdWFJInc51/+0sqvadIvf0E+Vhv4aIqB76jWtIGqXnTeG6hEl/
-9tJoLszBh4g/KBFVF3E4VxTHXKO/L7GZRa8JzoMtvV8XiP6BaYq6ykx6H7alKvoP
-qzk7xBbvNbqsXJCO7keo+g7iIDdfAxvsSJYbhQBxDn5W4Hw7SnHcMmTDOQCg7vOj
-UzaZG32yYMBZLjOAB/QzXgsD/1JRDnQ8cL6d17B1ie57ZuVOI3ziQJSmj0zbC0IX
-OsxlcFjwydLk3TA88iCr0SO2mfXCsGTeDGFbrl2IRCoH91l3Ew49HI4OYtl+OPSt
-pIYdFLSQ+RUPs9CFYwF9Ogjrwmi6jVptKq/+v0WgnCrbfz3DYxCWt/VB1PYDj5y6
-Mv//BACKa2mUuQoukDvzqiwZXV/Z52MeDOzPbOFo6qhx+54nav9Inz1yziEjYrP/
-ZrNJ4BT6fBgin/a6UmD5FqMtkrrhOCpHFQK2H+XYZ0vVJGZI7h74/fY8U2n+1Mle
-xQ/ejWojF+H5nFUAwKHaNVNofKcw8c8msgGn2jsvrAISTSHshrQwUmVkIEhhdCwg
-SW5jLiAoUkhYIGtleSkgPHJoeC1zdXBwb3J0QHJlZGhhdC5jb20+iF8EExECAB8F
-AkYk7/ICGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEDmhOhJCGT5r6FoAoLsB
-+DOPmTc3P+77DnNhU460nmjQAKCI3BJ/SxqPqfp8jL6lTfVo2zxegQ==
-=t0np
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release
deleted file mode 100644
index 47c6be6700b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-redhat-release
+++ /dev/null
@@ -1,62 +0,0 @@
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is used for packages in Red Hat
-products shipped after November 2009, and for all updates to those
-products.
-
-Questions about this key should be sent to security@redhat.com.
-
-pub  4096R/FD431D51 2009-10-22 Red Hat, Inc. (release key 2) <security@redhat.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQINBErgSTsBEACh2A4b0O9t+vzC9VrVtL1AKvUWi9OPCjkvR7Xd8DtJxeeMZ5eF
-0HtzIG58qDRybwUe89FZprB1ffuUKzdE+HcL3FbNWSSOXVjZIersdXyH3NvnLLLF
-0DNRB2ix3bXG9Rh/RXpFsNxDp2CEMdUvbYCzE79K1EnUTVh1L0Of023FtPSZXX0c
-u7Pb5DI5lX5YeoXO6RoodrIGYJsVBQWnrWw4xNTconUfNPk0EGZtEnzvH2zyPoJh
-XGF+Ncu9XwbalnYde10OCvSWAZ5zTCpoLMTvQjWpbCdWXJzCm6G+/hx9upke546H
-5IjtYm4dTIVTnc3wvDiODgBKRzOl9rEOCIgOuGtDxRxcQkjrC+xvg5Vkqn7vBUyW
-9pHedOU+PoF3DGOM+dqv+eNKBvh9YF9ugFAQBkcG7viZgvGEMGGUpzNgN7XnS1gj
-/DPo9mZESOYnKceve2tIC87p2hqjrxOHuI7fkZYeNIcAoa83rBltFXaBDYhWAKS1
-PcXS1/7JzP0ky7d0L6Xbu/If5kqWQpKwUInXtySRkuraVfuK3Bpa+X1XecWi24JY
-HVtlNX025xx1ewVzGNCTlWn1skQN2OOoQTV4C8/qFpTW6DTWYurd4+fE0OJFJZQF
-buhfXYwmRlVOgN5i77NTIJZJQfYFj38c/Iv5vZBPokO6mffrOTv3MHWVgQARAQAB
-tDNSZWQgSGF0LCBJbmMuIChyZWxlYXNlIGtleSAyKSA8c2VjdXJpdHlAcmVkaGF0
-LmNvbT6JAjYEEwECACAFAkrgSTsCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRAZni+R/UMdUWzpD/9s5SFR/ZF3yjY5VLUFLMXIKUztNN3oc45fyLdTI3+UClKC
-2tEruzYjqNHhqAEXa2sN1fMrsuKec61Ll2NfvJjkLKDvgVIh7kM7aslNYVOP6BTf
-C/JJ7/ufz3UZmyViH/WDl+AYdgk3JqCIO5w5ryrC9IyBzYv2m0HqYbWfphY3uHw5
-un3ndLJcu8+BGP5F+ONQEGl+DRH58Il9Jp3HwbRa7dvkPgEhfFR+1hI+Btta2C7E
-0/2NKzCxZw7Lx3PBRcU92YKyaEihfy/aQKZCAuyfKiMvsmzs+4poIX7I9NQCJpyE
-IGfINoZ7VxqHwRn/d5mw2MZTJjbzSf+Um9YJyA0iEEyD6qjriWQRbuxpQXmlAJbh
-8okZ4gbVFv1F8MzK+4R8VvWJ0XxgtikSo72fHjwha7MAjqFnOq6eo6fEC/75g3NL
-Ght5VdpGuHk0vbdENHMC8wS99e5qXGNDued3hlTavDMlEAHl34q2H9nakTGRF5Ki
-JUfNh3DVRGhg8cMIti21njiRh7gyFI2OccATY7bBSr79JhuNwelHuxLrCFpY7V25
-OFktl15jZJaMxuQBqYdBgSay2G0U6D1+7VsWufpzd/Abx1/c3oi9ZaJvW22kAggq
-dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
-=zbHE
------END PGP PUBLIC KEY BLOCK-----
-The following public key can be used to verify RPM packages built and
-signed by Red Hat, Inc.  This key is a supporting (auxiliary) key for
-Red Hat products shipped after November 2006 and for all updates to
-those products.
-
-Questions about this key should be sent to security@redhat.com.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEVwDGkRBACwPhZIpvkjI8wV9sFTDoqyPLx1ub8Sd/w+YuI5Ovm49mvvEQVT
-VLg8FgE5JlST59AbsLDyVtRa9CxIvN5syBVrWWWtHtDnnylFBcqG/A6J3bI4E9/A
-UtSL5Zxbav0+utP6f3wOpxQrxc+WIDVgpurdBKAQ3dsobGBqypeX6FXZ5wCgou6C
-yZpGIBqosJaDWLzNeOfb/70D/1thLkQyhW3JJ6cHCYJHNfBShvbLWBf6S231mgmu
-MyMlt8Kmipc9bw+saaAkSkVsQ/ZbfjrWB7e5kbMruKLVrH+nGhamlHYUGyAPtsPg
-Uj/NUSj5BmrCsOkMpn43ngTLssE9MLhSPj2nIHGFv9B+iVLvomDdwnaBRgQ1aK8z
-z6MAA/406yf5yVJ/MlTWs1/68VwDhosc9BtU1V5IE0NXgZUAfBJzzfVzzKQq6zJ2
-eZsMLhr96wbsW13zUZt1ing+ulwh2ee4meuJq6h/971JspFY/XBhcfq4qCNqVjsq
-SZnWoGdCO6J8CxPIemD2IUHzjoyyeEj3RVydup6pcWZAmhzkKrQzUmVkIEhhdCwg
-SW5jLiAoYXV4aWxpYXJ5IGtleSkgPHNlY3VyaXR5QHJlZGhhdC5jb20+iF4EExEC
-AB4FAkVwDGkCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQRWiciC+mWOC1rQCg
-ooNLCFOzNPcvhd9Za8C801HmnsYAniCw3yzrCqtjYnxDDxlufH0FVTwX
-=d/bm
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi
deleted file mode 100644
index 32833860645..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-remi
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-mQGiBEJny1wRBACRnbQgZ6qLmJSuGvi/EwrRL6aW610BbdpLQRL3dnwy5wI5t9T3
-/JEiEJ7GTvAwfiisEHifMfk2sRlWRf2EDQFttHyrrYXfY5L6UAF2IxixK5FL7PWA
-/2a7tkw1IbCbt4IGG0aZJ6/xgQejrOLi4ewniqWuXCc+tLuWBZrGpE2QfwCggZ+L
-0e6KPTHMP97T4xV81e3Ba5MD/3NwOQh0pVvZlW66Em8IJnBgM+eQh7pl4xq7nVOh
-dEMJwVU0wDRKkXqQVghOxALOSAMapj5mDppEDzGLZHZNSRcvGEs2iPwo9vmY+Qhp
-AyEBzE4blNR8pwPtAwL0W3cBKUx7ZhqmHr2FbNGYNO/hP4tO2ochCn5CxSwAfN1B
-Qs5pBACOkTZMNC7CLsSUT5P4+64t04x/STlAFczEBcJBLF1T16oItDITJmAsPxbY
-iee6JRfXmZKqmDP04fRdboWMcRjfDfCciSdIeGqP7vMcO25bDZB6x6++fOcmQpyD
-1Fag3ZUq2yojgXWqVrgFHs/HB3QE7UQkykNp1fjQGbKK+5mWTrQkUmVtaSBDb2xs
-ZXQgPFJQTVNARmFtaWxsZUNvbGxldC5jb20+iGAEExECACAFAkZ+MYoCGwMGCwkI
-BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAATm9HAPl/Vv/UAJ9EL8ioMTsz/2EPbNuQ
-MP5Xx/qPLACeK5rk2hb8VFubnEsbVxnxfxatGZ25AQ0EQmfLXRAEANwGvY+mIZzj
-C1L5Nm2LbSGZNTN3NMbPFoqlMfmym8XFDXbdqjAHutGYEZH/PxRI6GC8YW5YK4E0
-HoBAH0b0F97JQEkKquahCakj0P5mGuH6Q8gDOfi6pHimnsSAGf+D+6ZwAn8bHnAa
-o+HVmEITYi6s+Csrs+saYUcjhu9zhyBfAAMFA/9Rmfj9/URdHfD1u0RXuvFCaeOw
-CYfH2/nvkx+bAcSIcbVm+tShA66ybdZ/gNnkFQKyGD9O8unSXqiELGcP8pcHTHsv
-JzdD1k8DhdFNhux/WPRwbo/es6QcpIPa2JPjBCzfOTn9GXVdT4pn5tLG2gHayudK
-8Sj1OI2vqGLMQzhxw4hJBBgRAgAJBQJCZ8tdAhsMAAoJEABOb0cA+X9WcSAAn11i
-gC5ns/82kSprzBOU0BNwUeXZAJ0cvNmY7rvbyiJydyLsSxh/la6HKw==
-=6Rbg
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
deleted file mode 100644
index 8ee27f45b9b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-rpmforge-dag
+++ /dev/null
@@ -1,32 +0,0 @@
-The following public key can be used to verify RPM packages
-downloaded from  http://dag.wieers.com/apt/  using 'rpm -K'
-if you have the GNU GPG package.
-Questions about this key should be sent to:
-Dag Wieers <dag@wieers.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBD9JMT0RBAC9Q2B0AloUMTxaK73sD0cOu1MMdD8yuDagbMlDtUYA1aGeJVO6
-TV02JLGr67OBY+UkYuC1c3PUwmb3+jakZd5bW1L8E2L705wS0129xQOZPz6J+alF
-5rTzVkiefg8ch1yEcMayK20NdyOmhDGXQXNQS8OJFLTIC6bJs+7MZL83/wCg3cG3
-3q7MWHm3IpJb+6QKpB9YH58D/2WjPDK+7YIky/JbFBT4JPgTSBy611+bLqHA6PXq
-39tzY6un8KDznAMNtm+NAsr6FEG8PHe406+tbgd7tBkecz3HPX8nR5v0JtDT+gzN
-8fM3kAiAzjCHUAFWVAMAZLr5TXuoq4lGTTxvZbwTjZfyjCm7gIieCu8+qnPWh6hm
-30NgA/0ZyEHG6I4rOWqPks4vZuD+wlp5XL8moBXEKfEVOMh2MCNDRGnvVHu1P3eD
-oHOooVMt9sWrGcgxpYuupPNL4Uf6B6smiLlH6D4tEg+qCxC17zABI5572XJTJ170
-JklZJrPGtnkPrrKMamnN9MU4RjGmjh9JZPa7rKjZHyWP/z/CBrQ1RGFnIFdpZWVy
-cyAoRGFnIEFwdCBSZXBvc2l0b3J5IHYxLjApIDxkYWdAd2llZXJzLmNvbT6IWQQT
-EQIAGQUCP0kxPQQLBwMCAxUCAwMWAgECHgECF4AACgkQog5SFGuNeeYvDQCeKHST
-hIq/WzFBXtJOnQkJGSqAoHoAnRtsJVWYmzYKHqzkRx1qAzL18Sd0iEYEEBECAAYF
-Aj9JMWAACgkQoj2iXPqnmevnOACfRQaageMcESHVE1+RSuP3txPUvoEAoJAtOHon
-g+3SzVNSZLn/g7/Ljfw+uQENBD9JMT8QBACj1QzRptL6hbpWl5DdQ2T+3ekEjJGt
-llCwt4Mwt/yOHDhzLe8SzUNyYxTXUL4TPfFvVW9/j8WOkNGvffbs7g84k7a5h/+l
-IJTTlP9V9NruDt1dlrBe+mWF6eCY55OFHjb6nOIkcJwKxRd3nGlWnLsz0ce9Hjrg
-6lMrn0lPsMV6swADBQP9H42sss6mlqnJEFA97Fl3V9s+7UVJoAIA5uSVXxEOwVoh
-Vq7uECQRvWzif6tzOY+vHkUxOBRvD6oIU6tlmuG3WByKyA1d0MTqMr3eWieSYf/L
-n5VA9NuD7NwjFA1kLkoDwfSbsF51LppTMkUggzwgvwE46MB6yyuqAVI1kReAWw+I
-RgQYEQIABgUCP0kxPwAKCRCiDlIUa4155oktAKDAzm9QYbDpk6SrQhkSFy016BjE
-BACeJU1hpElFnUZCL4yKj4EuLnlo8kc=
-=mqUt
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl
deleted file mode 100644
index 70b6bd17ef3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-sl
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEpXadARBACHhOfMUuT/4iDvBRmm6bEsvnMN++L79aYhEUMNlrZ2TjKPjPvG
-Y0vGk+I0JhUJWutkQRZVbqgVDsNjmnELnACK+xvdryvtxh50wCI9WUl7CT5EV7BS
-/jD7JxTFbXyC/Xv0ixMB9vj6U9cySyE8PxONp0HzO6LTIr1OMPgDUsP4lwCgh8De
-fmY8TN2m9a0huLdNrnmKw0cD/2bkt6rJAi3+BGHWNgQ9Nb/4wQff8BKGDtL/8acp
-3yH91axuD2iYCKw0ZP5akBpRGv+4e30Plmbi1f5NaEDo9Ga1c4TDPopwgiYhrVLj
-56efoTfP2AiZl3iBKFPI83/YOhrVZF8UiYoAoUnOFpOg8vmtCzgvYip5UZLTgbfJ
-lcWvA/9vMb8By+1pHjW98d7GkzvZqzyMtWlbO7PXCn8P7bGQYjwvyTGiRNz3q22c
-2Z29qQw4r1L1L1JGsUwuOMahkczWVdD4TRHc8mhVJEUEA6AkNAZc+Ymsfr/ip0kX
-nSZLE3pYVifOhBRO8EbT0WhCMScmZNpwvZU//HKL/p+n3LArUrRZU2NpZW50aWZp
-YyBMaW51eCAoUlBNIHNpZ25pbmcga2V5IGZvciBTY2llbnRpZmljIExpbnV4KSA8
-c2NpZW50aWZpYy1saW51eC1kZXZlbEBmbmFsLmdvdj6IYAQTEQIAIAUCSldp0AIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELC0GD8ZKn19cXIAnA5R+EbaYr4/
-IL6It/UxHXlBFIajAJ9bwmNDF14uvDnFigg1PLevLTBnTIhGBBARAgAGBQJKV6lf
-AAoJENpq0AiC/ReyKLQAmwVC/Ii3sAKsptwZKHw/uk1kbupCAJ0eIzSaUo1hSa1V
-fP7O/dqigu6JAbkCDQRKV2nZEAgAzAcaC7unRNdrIwAGGKqOIvI8WNwpftHY50Y5
-zPSl7vtWVkp3N+2fynJR+tW4G/2xDChBbPzPz/TavRyBc21LKzAlym8qIGEE02cZ
-U/YJAYnbAkNNiGMOAnAIjBw1KUcQamAxdk0glE7MP1JiXY1MO4tTW38UEcvQbSvg
-Mh/eECqFOwiQXJmkPpZhPUwnwmZRCV4vlCZQM3CMExZ9pDV/V+kuhefw2WeheXyh
-g4DC88gcrv2mO0I3sVmpxn3JLMayiMlQbOSYLQuNVKN/EFDwuAbS9Ane7vm6wF9X
-NswMX0I/vO1IVvSN1fi5ZM71QzeYUGKBQv97kLO20hbRWZ1V+wADBggAys+jhlYH
-mtFZQxV4an1ucqnVauKnstj0zF88Hiy7yivT3W5h3Zd067uOfcBQCJUlt7y8sYD2
-q9htm5Rrxx+J29bl0zxwrEatnv0gLzprSa7Ei3wR6IrvBM3Ic0mGSzlsSxlzaFtt
-Pwak5C47vX9+PwKEKXFdM1gVzHTuD6PXEYxA4YMlQGeGVA68FvTHxMHpf8POQWTV
-QtjoI0flvFT7d4ozqUJdjJZxJDFQ7GO2YdIfF3sUdfn5kFxK0SUzqrmCYXeheniS
-LKC4mpAR0PetWJ7r1gY5khHb2eHW1vdEBYUXlHjB+jLaOBns05MHMZYd4CHe8q/Q
-gzMeVlh8YLSdZYhJBBgRAgAJBQJKV2nZAhsMAAoJELC0GD8ZKn19iU8AniUIFu32
-VeRJ+VKL2vBQMVbFVZOMAJ434Bi99fN2CSh7T62oxtQvhw70fw==
-=eL9H
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy
deleted file mode 100644
index 317b802b560..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY-webtatic-andy
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBE1e+1MRBAD8j+KyOIpGNRN39gNy2E/1HG4ZoLFuxIOxI5/1FEuZB/GjYF5m
-DvJerZukd0QCqCs72J6J+uWnfD/52t2XWTw4IHPpCWeyr9TWex3uOYmrYzY+0l0l
-qsCsrhT0XGkAE0+/20oEP2+t/d+1q0yRcYZRwWK/ME2rUUX0jOa/B3Bc6wCg3blw
-XdZNrv1wVNd1PCOUI79k0V0D+wfbybos8Cmdv2f8dD746fSR/hmp4SzpBDmPRRQu
-0gtJAKI6ycTdotGq5zHfZj76kDQBudeIgdbWtqfckP2lK47i8lIENAyC4MK8dxh9
-Ts+b1LqXlbcPyixzImf4qoT5DT1lSEUPwoMRX8W/29GAcvnZpOwQ8g7DNmRBpFFY
-8U2GBADz6uEeP3YwJAuL7pi77AalxR0WQAADMR59pGltQdXaZvANXoioU0W519Pb
-nl3gKWDiTuwUDrwaSPoBbNLyX4s0AE7/0HSG02/eRjLB8toQpAH9xkK/u2WPe/do
-erZg5yg1qhoCbEM7kJ2I/GBl6VbPedt2ORdsC4ZTWTnZJh6tYLQhQW5keSBUaG9t
-cHNvbiA8YW5keUB3ZWJ0YXRpYy5jb20+iGAEExECACAFAk1e+1MCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAAKCRC3Q0sGz0xP+TA0AJwJf5ZPeub8v+5CtZwdcZhV
-LU0sjgCgrP3y54heBjF1vhZQ3rJywTmRLHe5Ag0ETV77UxAIAIQPLVFbqheJ90Kf
-NF8TYt3ZIMpP5chw25OYq4tuZMzVJxKjUlM7KPQxUKquY/F9WpjH980LmICTb4Fz
-txzn2bshIsGyg8pDUSnVK0NPY5uaq9bK4oht8wkr3FNFT2FpeqDIJyn+phIuEpIi
-qt1LJyzzjobh9csaaGmNHvtrlkIggBj2n/ZQuGNhcYnKUZ/WGmkItCTSOfA++G+C
-dCo1aPEymfbnJvaLB/mLyzA+r/r7LQM10cZEtqh5JdclJEh3CzZmx9HsRxCDZF8W
-X/C4MmCwmIxmuU4vkVNhHFTQimQEUR8vg9ltiz8+xBjyE1Iav4MxfOYh3xjdJk1d
-zlovyUcAAwUH/2KPgf0UQ1o+4IjOYinEEbNlrD1pKw5anUKwaaeQi0vm/oRG0E2F
-ZCJ73OHxW/0hMrwbrGwXcm4NBARnAppg+/CecOVpkBgD5hrM+11DPhxdd1bjjfza
-Pq8GmPp8SSsiTPUCoSlzojxL3Z05RNbvKVzxzxbYdx5h5XOTflI7bAHTY4AzGSDf
-WaFljjCucht/d7u5empAd02haldUXWjT9RvY5RwnRZ+hjI47e+wUA0FMLHYtA1/0
-cwEIvpp2xwF/jpH3ODmnIGEeNoLyzAV7X0KAlSN8VRsh7igZRB9TRGI67aTjRgk8
-ayf/QNxAzwEk1MeDv67IFKNYVolxHCt4CtqISQQYEQIACQUCTV77UwIbDAAKCRC3
-Q0sGz0xP+dPiAKDUNJ5rkB9CRoMH9BC35d0fqXXeugCgwl/HYv52dWgatbyEGLet
-etv5Qeg=
-=nIAo
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art
deleted file mode 100644
index 825424e1f33..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.art
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (GNU/Linux)
-
-mQGiBEGP+skRBACyZz7muj2OgWc9FxK+Hj7tWPnrfxEN+0PE+n8MtqH+dxwQpMTd
-gDpOXxJa45GM5pEwB6CFSFK7Fb/faniF9fDbm1Ga7MpBupIBYLactkoOTZMuTlGB
-T0O5ha4h26YLqFfQOtlEi7d0+BDDdfHRQw3o67ycgRnLgYSA79DISc3MywCgk2TR
-yd5sRfZAG23b4EDl+D0+oaMEAK73J7zuxf6F6V5EaxLd/w4JVB2xW0Glcn0fACOe
-8FV9lzcZuo2xPpdGuyj02f/xlqvEav3XqTfFU2no61mA2pamaRNhlo+CEfGc7qde
-/1twfSgOYqzeCx7+aybyPo8Th41b80FT19mfkjBf6+5NbUHffRabFFh1FmcPVNBn
-F3FoA/95nRIzqDMItdTRitaZn02dIGNjdwllBD75bSVEvaR9O5hjBo0VMc25DB7f
-DM2qEO52wCQbAKw9zFC284ekZVDaK4aHYt7iobHaqJEpKHgsDut5WWuMiSLR+SsF
-aBHIZ9HvrKWLSUQKHU6A1Hva0P0r3GnoCMc/VCVfrLl721SjPbQzQXRvbWljIFJv
-Y2tldCBUdXJ0bGUgPGFkbWluQGF0b21pY3JvY2tldHR1cnRsZS5jb20+iFkEExEC
-ABkFAkGP+skECwcDAgMVAgMDFgIBAh4BAheAAAoJEDKpURRevSdEzcQAn1hSHqTO
-jwv/z/picpOnR+mgycwHAKCBex2ciyXo5xeaQ9w7OMf7Jsmon7kBDQRBj/rMEAQA
-6JvRndqE4koK0e49fUkICm1X0ZEzsVg9VmUW+Zft5guCRxmGlYTmtlC7oJCToRP/
-m/xH5uIevGiJycRKB0Ix+Csl6f9QuTkQ7tSTHcaIKbI3tL1x6CCBoWeTGYaOJlvk
-ubrmajiMFaBfopLH2firoSToDGoUvv4e7bImIHEgNr8AAwUEAND0YR9DOEZvc+Lq
-Ta/PQyxkdZ75o+Ty/O64E3OmO1Tuw2ciSQXCcwrbrMSE6EHHetxtGCnOdkjjjtmH
-AnxsxdONv/EJuQmLcoNcsigZZ4tfRdmtXgcbnOmXBgmy1ea1KvWcsmecNSAMJHwR
-7vDDKzbj4mSmudzjapHeeOewFF10iEYEGBECAAYFAkGP+swACgkQMqlRFF69J0Sq
-nQCfa/q9Y/oY4dOTGj6MsdmRIQkKZhYAoIscjinFwTru4FVi2MIEzUUMToDK
-=NOIx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms
deleted file mode 100644
index 860ace4d247..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RPM-GPG-KEY.atrpms
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBD5gtCgRBACKIvjMF+20r9k/Uw2Hq6Y/qn1nM0AZEFalhglXP5pMm5bMgkcI
-1vCWqJxSbhQhk8hSEenoszes8hyUxHj4hFFUDiRtAxOpCpGCsCnUddgQtHAQd+tm
-aQsM6J3Jm/EZPtwR0lvwvRGvz2x6Rr95G8+42KK9x+mBYhLk0y3gAbBzhwCgnkDH
-a97MGBT7gRLrmtFqiHrWlPkD/2tBaH6IEuoJhcAbNj9MukbhDOYJ6ic9Nzf6sR3t
-ZG+XgQLLS2DNy8+HWcYJOjpJDEe8zWFDdUv3cL1D0U2f2e85FuJaMucHn+816iw8
-mNjZXJEoDE4LJ8Vv53fkevNZpdWmO2VtRwI+woDnIHYHukDLj2sWhVt+5W+uOKAE
-OippA/9OzuWrwBtTR+Np8ApZGkxhxU1z0iEStV+kQNqJE7YoR4SGMuzEa3bFzrPx
-k4qIU+rw4YgFgHrs1x08lXxNOZkq6avvbl60HqN2qF2UQL/YdU+5X3ixaJVaYYk8
-yuK+hp0Hx2DdBWmVhq6rEzIfpnFhF4qspwMWEiiBGjYDL62W7LQ0QVRycG1zLm5l
-dCAocnBtIHNpZ25pbmcga2V5KSA8QXhlbC5UaGltbUBBVHJwbXMubmV0PohnBBMR
-AgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJFfF9PBQkJGI4nAAoJEFCM
-5eZmU0wrJ0IAnA0BdyRlq2S8ess55R8YMFnWAWXEAJ9Fa7cEHku4j4B83shCODps
-+DYUZohnBBMRAgAnAhsDBQkDdMLsBgsJCAcDAgMVAgMDFgIBAh4BAheABQJAKteu
-AhkBAAoJEFCM5eZmU0wrMMUAnRjS2PXQp0tsC/69IGMMxqU+8xeAAJ9XQjVAo+mU
-kg/3AeBlMBIlFe5hDQ==
-=23Fz
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key
deleted file mode 100644
index b91a5a88769..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/rpm-gpg/RubyWorks.GPG.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-mQGiBEY5QQ0RBACfC1NbAdGFMOS/Y7P9hmNph2Wh3TJTh6IZpL+lTJBuZSEa6rp0
-CghS/yU3gGXUPaxAy91M7PXMv5p7S3U/SusZHATLhFdU5J4LuWMf4IiBy9FOB/aj
-Q1s5vZ/i3YFaqolXsRP8TgIu4Lzp/j3+KAxFb3gF7lz64J/Et2Jil0OQzwCgkn9i
-SoPEM6d9SCFOidhUuTHUhM0D/3UXl/FKPVFrFzjslFpaN9NgArRrmXKTOBWEqMLy
-12pbTzOtv+p17Ot51q4h0ebEWrmVJ/h/7Is6QT6AKHuOIW+1/88fcSrmef//0Scz
-wtEwVudkYA+kOGt1pwhapVYf1lWE9Z6L3V/MVdxXUesylGO6jJjOjpUB+ZBItwl7
-exkhA/4iemhq4D5Jp6r1Kv3aKSPNENdhTORyfZz4UfyOsUfYncaprP5IZja0j+rd
-tQLIsH8hXvCT2kSAUY6nMGmzPgpgGamtHI6gH1ZmoNX2gEF7tzGNgKMbbUmwO89B
-N56U7wm68AreXE8XviRjGjAtZWnouqe5X+EiUurdJkzRwU0c2rQpVGhvdWdodFdv
-cmtzIDxydWJ5d29ya3NAdGhvdWdodHdvcmtzLmNvbT6IYAQTEQIAIAUCRjlBDQIb
-AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEHM/KlUQbeB0SSYAn0sgAx5ZK975
-wZiChkIqOCyFZ9PLAJ9laivkzqT2y+Kh9FGe3TP/CAhRTbkCDQRGOUEVEAgAqxJI
-MFrYV3JKyeXHVKXHNd5Nf1WdqKi37VOdSTBftiehzZdR9hxkGEknYxnbBLGJR9YD
-/uJ2+DRwNBcw2RrrEmb0DCZxcLQLZ3xYa7+WvcR4/Nir/3858SGJ+wmGCHKyX2So
-M2TurmKu5bqyUUaBgf+IhKfwOr9zeK3rIRhUq/aiYkw8sWA8ruUvxXwLnbkK1aP9
-hfvSqScwjkfUVk6CQ6GFUD+4N4mNRtRcZz3gYa+0jSNeEJZQOJxRuE/gBHav3eyN
-dm4VAFPF20BobvBVEcMhO0KaR/X4jW1G1eFAKLxI7cdx3+vLeNPaFwHiSMSknsNs
-UiucI9oV+I5S/50ZrwADBwf/StYTK9KvPnY9ZqmirBpSh0Zl0xylMtAiMblG7pKv
-qKTPNr9zXooheQBpAbnhOfju0DB/OtE4V21HqnbMws2aFvHecEbO5EmjwT7ZTltH
-5vlbiPrXOc7SpP22FdkOYdunM2+nsA6398mpYFEiFFNAzX6pReN2tbbmXf6zxS9n
-nHjMAgl5nMuOASLZrTrUX/7yu6ySS1hy0ZVfEoAFeILy4MV8y0lVjBQa2kNOCNpO
-Cc+y1+4EHLS3fuN0x+tho3rhjKAzj8KOt4XnALn8OouRMx9G7ItC2U8kNzHHFRg5
-adT/+nEthVd9q9pYLrUaze7aMQyl+7cD1KzmSe34X9B6W4hJBBgRAgAJBQJGOUEV
-AhsMAAoJEHM/KlUQbeB0O7QAn09h4qrKPhWD9eaiyMRS5YeARTYgAJ9WxLcQEvkA
-yOSLb33CweehCrlTnQ==
-=scSy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf
deleted file mode 100644
index 39181c9d6e3..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/files/yum-updatesd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# File Managed by Puppet
-[main]
-# how often to check for new updates (in seconds)
-run_interval = 3600
-# how often to allow checking on request (in seconds)
-updaterefresh = 600
-
-# how to send notifications (valid: dbus, email, syslog)
-emit_via = dbus
-# should we listen via dbus to give out update information/check for
-# new updates 
-dbus_listener = yes
-
-# automatically install updates
-do_update = yes
-# automatically download updates
-do_download = no
-# automatically download deps of updates
-do_download_deps = no
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp
deleted file mode 100644
index 5b404a0b183..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/cron.pp
+++ /dev/null
@@ -1,47 +0,0 @@
-# = Class yum::cron
-#
-#
-class yum::cron {
-
-  $manage_update_package = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  $manage_update_service_ensure = $yum::bool_update_disable ? {
-    true    => stopped,
-    default => running,
-  }
-
-  $manage_update_service_enable = $yum::bool_update_disable ? {
-    true    => false,
-    default => true,
-  }
-
-  $manage_update_file = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  package { 'yum-cron':
-    ensure => $manage_update_package,
-  }
-
-  service { 'yum-cron':
-    ensure     => $manage_update_service_ensure,
-    name       => $yum::service,
-    enable     => $manage_update_service_enable,
-    hasstatus  => true,
-    hasrestart => true,
-    require    => Package['yum-cron'],
-  }
-
-  file { 'yum-cron':
-    ensure   => $manage_update_file,
-    path     => '/etc/sysconfig/yum-cron',
-    content  => template($yum::update_template),
-    require  => Package['yum-cron'],
-    notify   => Service['yum-cron'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp
deleted file mode 100644
index 5d2a072d058..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/defaults.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-# = Class: yum::defaults
-#
-# This class manages default yum repositories for RedHat based distros:
-# RHEL, Centos, Scientific Linux
-#
-class yum::defaults ( ) inherits yum::params {
-
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  if $yum::extrarepo =~ /epel/ { include yum::repo::epel }
-  if $yum::extrarepo =~ /rpmforge/ { include yum::repo::rpmforge }
-  if $yum::extrarepo =~ /jpackage5/ { include yum::repo::jpackage5 }
-  if $yum::extrarepo =~ /jpackage6/ { include yum::repo::jpackage6 }
-  if $yum::extrarepo =~ /remi/ { include yum::repo::remi }
-  if $yum::extrarepo =~ /remi_php55/ { include yum::repo::remi_php55 }
-  if $yum::extrarepo =~ /tmz/ and $osver[0] != '4' { include yum::repo::tmz }
-  if $yum::extrarepo =~ /webtatic/ { include yum::repo::webtatic }
-  if $yum::extrarepo =~ /puppetlabs/ and $osver[0] != '4' { include yum::repo::puppetlabs }
-  if $yum::extrarepo =~ /puppetdevel/ and $osver[0] != '4' { include yum::repo::puppetdevel }
-  if $yum::extrarepo =~ /nginx/ and $osver[0] != '4' { include yum::repo::nginx }
-  if $yum::extrarepo =~ /mongodb/ and $osver[0] != '4' { include yum::repo::mongodb }
-  if $yum::extrarepo =~ /repoforge/ { include yum::repo::repoforge }
-  if $yum::extrarepo =~ /repoforgeextras/ { include yum::repo::repoforgeextras }
-  if $yum::extrarepo =~ /integ_ganeti/ { include yum::repo::integ_ganeti }
-  if $yum::extrarepo =~ /elrepo/ { include yum::repo::elrepo }
-  if $yum::extrarepo =~ /centalt/ { include yum::repo::centalt }
-
-  if $yum::bool_defaultrepo {
-    case $::operatingsystem {
-      centos: {
-        if $osver[0] == '6' { include yum::repo::centos6 }
-        if $osver[0] == '5' { include yum::repo::centos5 }
-        if $osver[0] == '4' { include yum::repo::centos4 }
-        if $yum::extrarepo =~ /centos-testing/ { include yum::repo::centos_testing }
-        if $yum::extrarepo =~ /karan/ { include yum::repo::karan }
-        if $yum::extrarepo =~ /atomic/ { include yum::repo::atomic }
-      }
-      redhat: {
-      }
-      scientific: {
-        if $osver[0] == '6' { include yum::repo::sl6 }
-        if $osver[0] == '5' { include yum::repo::sl5 }
-        if $yum::extrarepo =~ /centos-testing/ { include yum::repo::centos_testing }
-        if $yum::extrarepo =~ /karan/ { include yum::repo::karan }
-      }
-      default: { }
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp
deleted file mode 100644
index c4617f420ba..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/init.pp
+++ /dev/null
@@ -1,329 +0,0 @@
-# = Class: yum
-#
-# This class manages yum repositories for RedHat based distros:
-# RHEL, Centos, Scientific Linux
-#
-# Copyright 2008, admin(at)immerda.ch
-# Copyright 2008, Puzzle ITC GmbH
-# Marcel Harry haerry+puppet(at)puzzle.ch
-# Simon Josi josi+puppet(at)puzzle.ch
-#
-# This program is free software; you can redistribute
-# it and/or modify it under the terms of the GNU
-# General Public License version 3 as published by
-# the Free Software Foundation.
-#
-# Apapted for Example42 by Alessandro Franceschi
-#
-# == Parameters
-#
-# [*install_all_keys*]
-#   If to provide all the module's known rpm gpgp keys.
-#   Default true, set to false to keep backwards compatibility
-#
-# [*update*]
-#   If you want yum automatic updates. Possibile values:
-#   cron - Updates in a cronjob
-#   updatesd - Updates via updatesd (Only on Centos/RedHat/SL 5)
-#   false/no - Automatic updates disabled (Default)
-#
-# [*update_disable*]
-#   Set to true if you have enabled updates and now wish to disable
-#   Defaults to false.  Logic pertaining to this parameter is only applied
-#   when the update method parameter (immediately above) is set.
-#
-# [*defaultrepo*]
-#   If you want to enable default repositories for supported OS
-#   Default: true
-#   Note: This variable is ignored if you provide a custom source_repo_dir
-#
-# [*extrarepo*]
-#   If you want to enable some (supported) extra repositories
-#   Can be an array. Default: 'epel'
-#   (Epel is used by many modules)
-#   Note: This variable is ignored if you provide a custom source_repo_dir
-#
-# [*plugins_source_dir*]
-#   The path of the plugins configuration directory
-#
-# [*repo_dir*]
-#   The path of the yum.repos.d directory
-#
-# [*source_repo_dir*]
-#   The source path to use to populate the yum.repos.d directory
-#
-# [*clean_repos*]
-#   Boolean. Defines if you want to cleanup the yum.repos.d dir
-#   and be sure that it contains only files managed by Puppet
-#   Default: false
-#
-# [*my_class*]
-#   Name of a custom class to autoload to manage module's customizations
-#   If defined, yum class will automatically "include $my_class"
-#   Can be defined also by the (top scope) variable $yum_myclass
-#
-# [*source*]
-#   Sets the content of source parameter for main configuration file
-#   If defined, yum main config file will have the param: source => $source
-#   Can be defined also by the (top scope) variable $yum_source
-#
-# [*source_dir*]
-#   If defined, the whole yum configuration directory content is retrieved
-#   recursively from the specified source
-#   (source => $source_dir , recurse => true)
-#   Can be defined also by the (top scope) variable $yum_source_dir
-#
-# [*source_dir_purge*]
-#   If set to true (default false) the existing configuration directory is
-#   mirrored with the content retrieved from source_dir
-#   (source => $source_dir , recurse => true , purge => true)
-#   Can be defined also by the (top scope) variable $yum_source_dir_purge
-#
-# [*template*]
-#   Sets the path to the template to use as content for main configuration file
-#   If defined, yum main config file has: content => content("$template")
-#   Note source and template parameters are mutually exclusive: don't use both
-#   Can be defined also by the (top scope) variable $yum_template
-#
-# [*options*]
-#   An hash of custom options to be used in templates for arbitrary settings.
-#   Can be defined also by the (top scope) variable $yum_options
-#
-# [*absent*]
-#   Set to 'true' to remove package(s) installed by module
-#   Can be defined also by the (top scope) variable $yum_absent
-#
-# [*disable*]
-#   Set to 'true' to disable service(s) managed by module
-#   Can be defined also by the (top scope) variable $yum_disable
-#
-# [*disableboot*]
-#   Set to 'true' to disable service(s) at boot, without checks if it's running
-#   Use this when the service is managed by a tool like a cluster software
-#   Can be defined also by the (top scope) variable $yum_disableboot
-#
-# [*puppi*]
-#   Set to 'true' to enable creation of module data files that are used by puppi
-#   Can be defined also by the (top scope) variables $yum_puppi and $puppi
-#
-# [*puppi_helper*]
-#   Specify the helper to use for puppi commands. The default for this module
-#   is specified in params.pp and is generally a good choice.
-#   You can customize the output of puppi commands for this module using another
-#   puppi helper. Use the define puppi::helper to create a new custom helper
-#   Can be defined also by the (top scope) variables $yum_puppi_helper
-#   and $puppi_helper
-#
-# [*debug*]
-#   Set to 'true' to enable modules debugging
-#   Can be defined also by the (top scope) variables $yum_debug and $debug
-#
-# [*audit_only*]
-#   Set to 'true' if you don't intend to override existing configuration files
-#   and want to audit the difference between existing files and the ones
-#   managed by Puppet.
-#   Can be defined also by the (top scope) variables $yum_audit_only
-#   and $audit_only
-#
-# [*config_dir*]
-#   Main configuration directory. Used by puppi
-#
-# [*config_file*]
-#   Main configuration file path
-#
-# [*config_file_mode*]
-#   Main configuration file path mode
-#
-# [*config_file_owner*]
-#   Main configuration file path owner
-#
-# [*config_file_group*]
-#   Main configuration file path group
-#
-# [*cron_params*]
-#   Optional extra arguments for $update = cron ONLY
-#
-# [*cron_mailto*]
-#   Optional mail addres to send update reports for $update = cron ONLY
-#
-# [*cron_dotw*]
-#   Days of the week to perform yum updates by cron
-#   0123456 (default)
-#
-# [*log_file*]
-#   Log file(s). Used by puppi
-#
-class yum (
-  $install_all_keys    = params_lookup( 'install_all_keys' ),
-  $update              = params_lookup( 'update' ),
-  $update_disable      = params_lookup( 'update_disable' ),
-  $defaultrepo         = params_lookup( 'defaultrepo' ),
-  $extrarepo           = params_lookup( 'extrarepo' ),
-  $plugins_source_dir  = params_lookup( 'plugins_source_dir' ),
-  $repo_dir            = params_lookup( 'repo_dir' ),
-  $source_repo_dir     = params_lookup( 'source_repo_dir' ),
-  $clean_repos         = params_lookup( 'clean_repos' ),
-  $my_class            = params_lookup( 'my_class' ),
-  $source              = params_lookup( 'source' ),
-  $source_dir          = params_lookup( 'source_dir' ),
-  $source_dir_purge    = params_lookup( 'source_dir_purge' ),
-  $template            = params_lookup( 'template' ),
-  $options             = params_lookup( 'options' ),
-  $absent              = params_lookup( 'absent' ),
-  $disable             = params_lookup( 'disable' ),
-  $disableboot         = params_lookup( 'disableboot' ),
-  $puppi               = params_lookup( 'puppi' , 'global' ),
-  $puppi_helper        = params_lookup( 'puppi_helper' , 'global' ),
-  $debug               = params_lookup( 'debug' , 'global' ),
-  $audit_only          = params_lookup( 'audit_only' , 'global' ),
-  $config_dir          = params_lookup( 'config_dir' ),
-  $config_file         = params_lookup( 'config_file' ),
-  $config_file_mode    = params_lookup( 'config_file_mode' ),
-  $config_file_owner   = params_lookup( 'config_file_owner' ),
-  $config_file_group   = params_lookup( 'config_file_group' ),
-  $update_template     = params_lookup( 'update_template' ),
-  $cron_param          = params_lookup( 'cron_param' ),
-  $cron_mailto         = params_lookup( 'cron_mailto' ),
-  $cron_dotw           = params_lookup( 'cron_dotw' ),
-  $log_file            = params_lookup( 'log_file' )
-  ) inherits yum::params {
-
-  $bool_install_all_keys=any2bool($install_all_keys)
-  $bool_defaultrepo=any2bool($defaultrepo)
-  $bool_clean_repos=any2bool($clean_repos)
-  $bool_source_dir_purge=any2bool($source_dir_purge)
-  $bool_absent=any2bool($absent)
-  $bool_disable=any2bool($disable)
-  $bool_disableboot=any2bool($disableboot)
-  $bool_puppi=any2bool($puppi)
-  $bool_debug=any2bool($debug)
-  $bool_audit_only=any2bool($audit_only)
-  $bool_update_disable=any2bool($update_disable)
-
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  $manage_service_enable = $yum::bool_disableboot ? {
-    true    => false,
-    default => $yum::bool_disable ? {
-      true    => false,
-      default => $yum::bool_absent ? {
-        true  => false,
-        false => true,
-      },
-    },
-  }
-
-  $manage_service_ensure = $yum::bool_disable ? {
-    true    => 'stopped',
-    default =>  $yum::bool_absent ? {
-      true    => 'stopped',
-      default => 'running',
-    },
-  }
-
-  $manage_file = $yum::bool_absent ? {
-    true    => 'absent',
-    default => 'present',
-  }
-
-  $manage_audit = $yum::bool_audit_only ? {
-    true  => 'all',
-    false => undef,
-  }
-
-  $manage_file_replace = $yum::bool_audit_only ? {
-    true  => false,
-    false => true,
-  }
-
-  $manage_file_source = $yum::source ? {
-    ''        => undef,
-    default   => $yum::source,
-  }
-
-  $manage_file_content = $yum::template ? {
-    ''        => undef,
-    default   => template($yum::template),
-  }
-
-  $manage_updates = $yum::update ? {
-    'cron'     => true,
-    'updatesd' => true,
-    default    => false,
-  }
-
-  file { 'yum.repo_dir':
-    ensure  => directory,
-    path    => $yum::repo_dir,
-    source  => $yum::source_repo_dir,
-    recurse => true,
-    purge   => $yum::bool_clean_repos,
-    replace => $yum::manage_file_replace,
-    audit   => $yum::manage_audit,
-  }
-
-  if $yum::source_repo_dir == undef {
-    include yum::defaults
-  }
-
-  # Yum Configuration file
-  file { 'yum.conf':
-    ensure  => $yum::manage_file,
-    path    => $yum::config_file,
-    mode    => $yum::config_file_mode,
-    owner   => $yum::config_file_owner,
-    group   => $yum::config_file_group,
-    source  => $yum::manage_file_source,
-    content => $yum::manage_file_content,
-    replace => $yum::manage_file_replace,
-    audit   => $yum::manage_audit,
-  }
-
-  # The whole yum configuration directory can be recursively overriden
-  if $yum::source_dir {
-    file { 'yum.dir':
-      ensure  => directory,
-      path    => $yum::config_dir,
-      source  => $yum::source_dir,
-      recurse => true,
-      purge   => $yum::source_dir_purge,
-      replace => $yum::manage_file_replace,
-      audit   => $yum::manage_audit,
-    }
-  }
-
-  ### Manage Automatic Updates
-  if $yum::manage_updates {
-    include $yum::update
-  }
-
-  ### Include custom class if $my_class is set
-  if $yum::my_class {
-    include $yum::my_class
-  }
-
-
-  ### Provide puppi data, if enabled ( puppi => true )
-  if $yum::bool_puppi == true {
-    $classvars=get_class_args()
-    puppi::ze { 'yum':
-      ensure    => $yum::manage_file,
-      variables => $classvars,
-      helper    => $yum::puppi_helper,
-    }
-  }
-
-  ### Debugging, if enabled ( debug => true )
-  if $yum::bool_debug == true {
-    file { 'debug_yum':
-      ensure  => $yum::manage_file,
-      path    => "${settings::vardir}/debug-yum",
-      mode    => '0640',
-      owner   => 'root',
-      group   => 'root',
-      content => inline_template('<%= scope.to_hash.reject { |k,v| k.to_s =~ /(uptime.*|path|timestamp|free|.*password.*|.*psk.*|.*key)/ }.to_yaml %>'),
-    }
-  }
-
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp
deleted file mode 100644
index bc74acda903..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/managed_yumrepo.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# = Define yum::managed_yumrepo
-#
-define yum::managed_yumrepo (
-  $descr          = 'absent',
-  $baseurl        = 'absent',
-  $mirrorlist     = 'absent',
-  $enabled        = 0,
-  $gpgcheck       = 0,
-  $gpgkey         = 'absent',
-  $gpgkey_source  = '',
-  $gpgkey_name    = '',
-  $failovermethod = 'absent',
-  $priority       = 99,
-  $protect        = 'absent',
-  $exclude        = 'absent',
-  $autokeyimport  = 'no',
-  $includepkgs    = 'absent') {
-
-  # ensure that everything is setup
-  include yum::prerequisites
-
-  if $protect != 'absent' {
-    if ! defined(Yum::Plugin['protectbase']) {
-      yum::plugin { 'protectbase': }
-    }
-  }
-
-  file { "/etc/yum.repos.d/${name}.repo":
-    ensure  => file,
-    replace => false,
-    before  => Yumrepo[ $name ],
-    mode    => '0644',
-    owner   => 'root',
-    group   => 0,
-  }
-
-  $gpgkey_real_name = $gpgkey_name ? {
-    ''      => url_parse($gpgkey_source,'filename'),
-    default => $gpgkey_name,
-  }
-
-  if $gpgkey_source != '' {
-    if ! defined(File["/etc/pki/rpm-gpg/${gpgkey_real_name}"]) {
-      file { "/etc/pki/rpm-gpg/${gpgkey_real_name}":
-        ensure  => file,
-        replace => false,
-        before  => Yumrepo[ $name ],
-        source  => $gpgkey_source,
-        mode    => '0644',
-        owner   => 'root',
-        group   => 0,
-      }
-    }
-  }
-  yumrepo { $name:
-    descr          => $descr,
-    baseurl        => $baseurl,
-    mirrorlist     => $mirrorlist,
-    enabled        => $enabled,
-    gpgcheck       => $gpgcheck,
-    gpgkey         => $gpgkey,
-    failovermethod => $failovermethod,
-    priority       => $priority,
-    protect        => $protect,
-    exclude        => $exclude,
-    includepkgs    => $includepkgs,
-  }
-
-  if $autokeyimport == 'yes' and $gpgkey != '' {
-    exec { "rpmkey_add_${gpgkey}":
-      command     => "rpm --import ${gpgkey}",
-      before      => Yumrepo[ $name ],
-      refreshonly => true,
-      path        => '/sbin:/bin:/usr/sbin:/usr/bin',
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp
deleted file mode 100644
index 708793bad0f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/params.pp
+++ /dev/null
@@ -1,62 +0,0 @@
-# = Class yum::params
-#
-class yum::params  {
-
-  $install_all_keys = false
-
-  $update = false
-
-  $defaultrepo = true
-
-  $extrarepo = 'epel'
-
-  $clean_repos = false
-
-  $plugins_config_dir = '/etc/yum/pluginconf.d'
-
-  $source_repo_dir = undef
-
-  $repo_dir = '/etc/yum.repos.d'
-
-  $config_dir = '/etc/yum'
-
-  $config_file = '/etc/yum.conf'
-
-  $config_file_mode = '0644'
-
-  $config_file_owner = 'root'
-
-  $config_file_group = 'root'
-
-  $log_file = '/var/log/yum.log'
-
-  # parameters for the auto-update classes cron.pp/updatesd.pp
-  $update_disable = false
-
-  $update_template = $::operatingsystemrelease ? {
-    /6.*/ => 'yum/yum-cron.erb',
-    default => undef,
-  }
-
-  # The following two params are for cron.pp only
-
-  $cron_param = ''
-
-  $cron_mailto = ''
-
-  $cron_dotw = '0123456'
-
-  $source = ''
-  $source_dir = ''
-  $source_dir_purge = false
-  $template = ''
-  $options = ''
-  $absent = false
-  $disable = false
-  $disableboot = false
-  $puppi = false
-  $puppi_helper = 'standard'
-  $debug = false
-  $audit_only = false
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp
deleted file mode 100644
index 6e5d372ace7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/plugin.pp
+++ /dev/null
@@ -1,54 +0,0 @@
-# Define: pagios::plugin
-#
-# Adds a yum plugin
-#
-# Usage:
-# With standard source package:
-# yum::plugin { 'priorities': }
-#
-# With custom config file source
-# yum::plugin { 'priorities':
-#   source => 'puppet:///modules/example42/yum/plugin-priorities'
-# }
-#
-# With custom package name (default is taken from $name)
-# yum::plugin { 'priorities':
-#   package_name => 'yum-priorities'
-# }
-#
-define yum::plugin (
-  $package_name = '',
-  $source       = '',
-  $enable       = true
-  ) {
-
-  include yum
-
-  $ensure = bool2ensure( $enable )
-
-  $yum_plugins_prefix = $yum::osver[0] ? {
-    5       => 'yum',
-    6       => 'yum-plugin',
-    default => 'yum-plugin',
-  }
-
-  $real_package_name = $package_name ? {
-    ''      => "${yum_plugins_prefix}-${name}",
-    default => $package_name,
-  }
-
-  package { $real_package_name :
-    ensure => $ensure
-  }
-
-  if ( $source != '' ) {
-    file { "yum_plugin_conf_${name}":
-      ensure  => $ensure,
-      path    => "${yum::plugins_config_dir}/${name}.conf",
-      owner   => root,
-      group   => root,
-      mode    => '0755',
-      source  => $source,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp
deleted file mode 100644
index def976ff396..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/prerequisites.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# = Class yum::prerequisites
-#
-class yum::prerequisites {
-
-  require yum
-
-  yum::plugin { 'priorities': }
-#  yum::plugin { 'security': }
-
-  if $yum::bool_install_all_keys == true {
-    file { 'rpm_gpg':
-      path    => '/etc/pki/rpm-gpg/',
-      source  => "puppet:///modules/yum/${::operatingsystem}.${yum::osver[0]}/rpm-gpg/",
-      recurse => true,
-      ignore  => '.svn',
-      mode    => '0644',
-      owner   => root,
-      group   => 0,
-    }
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp
deleted file mode 100644
index 3f6bbf5d477..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/10gen.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# = Class: yum::repo::10gen
-#
-# This class installs the 10gen repo for MongoDB
-#
-class yum::repo::10gen {
-  yum::managed_yumrepo { '10gen':
-    descr       => '10gen Repository',
-    baseurl     => "http://downloads-distro.mongodb.org/repo/redhat/os/${::architecture}",
-    enabled     => 1,
-    gpgcheck    => 0,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp
deleted file mode 100644
index 13a24149dd5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atomic.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# = Class: yum::repo::atomic
-#
-# This class installs the atomic repo
-#
-class yum::repo::atomic {
-  yum::managed_yumrepo { 'atomic':
-    descr          => 'CentOS / Red Hat Enterprise Linux $releasever - atomicrocketturtle.com',
-    mirrorlist     => 'http://www.atomicorp.com/channels/mirrorlist/atomic/centos-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY.art',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY.art',
-    priority       => 1,
-    exclude        => 'nmap-ncat',
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp
deleted file mode 100644
index dce3b67d47a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/atrpms.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::atrpms
-#
-# This class installs the atrpms repo
-#
-class yum::repo::atrpms {
-
-  yum::managed_yumrepo { 'centos5-atrpms':
-    descr          => 'CentOS $releasever - $basearch - ATrpms',
-    baseurl        => 'http://dl.atrpms.net/el$releasever-$basearch/atrpms/stable',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY.atrpms',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY.atrpms',
-    priority       => 30,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp
deleted file mode 100644
index 238b1e19c5a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centalt.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-# = Class: yum::repo::centalt
-#
-# This class installs the centalt repo
-#
-class yum::repo::centalt {
-  $osver = split($::operatingsystemrelease, '[.]')
-  $release = $::operatingsystem ? {
-    /(?i:Centos|RedHat|Scientific)/ => $osver[0],
-    default                         => '6',
-  }
-
-  yum::managed_yumrepo { 'centalt':
-    descr          => 'CentALT RPM Repository',
-    baseurl        => "http://centos.alt.ru/repository/centos/${release}/\$basearch/",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://centos.alt.ru/repository/centos/RPM-GPG-KEY-CentALT',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp
deleted file mode 100644
index 7d0330d9066..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos4.pp
+++ /dev/null
@@ -1,61 +0,0 @@
-# = Class: yum::repo::centos4
-#
-# Base Centos4 repos
-#
-class yum::repo::centos4 {
-
-  yum::managed_yumrepo { 'base':
-    descr      => 'CentOS-$releasever - Base',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'updates':
-    descr      => 'CentOS-$releasever - Updates',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'addons':
-    descr      => 'CentOS-$releasever - Addons',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'extras':
-    descr      => 'CentOS-$releasever - Extras',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras',
-    enabled    => 1,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 1,
-  }
-
-  yum::managed_yumrepo { 'centosplus':
-    descr      => 'CentOS-$releasever - Centosplus',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus',
-    enabled    => 0,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 2,
-  }
-
-  yum::managed_yumrepo { 'contrib':
-    descr      => 'CentOS-$releasever - Contrib',
-    mirrorlist => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib',
-    enabled    => 0,
-    gpgcheck   => 1,
-    gpgkey     => 'http://mirror.centos.org/centos/RPM-GPG-KEY-centos4',
-    priority   => 2,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp
deleted file mode 100644
index c48cccdefc1..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos5.pp
+++ /dev/null
@@ -1,124 +0,0 @@
-# = Class: yum::repo::centos5
-#
-# Base Centos5 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `rsync://msync.centos.org::CentOS`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/centos`
-#   Default: `undef`
-#
-class yum::repo::centos5 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_base = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/os/\$basearch/",
-  }
-
-  $baseurl_updates = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/updates/\$basearch/",
-  }
-
-  $baseurl_addons = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/addons/\$basearch/",
-  }
-
-  $baseurl_extras = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/extras/\$basearch/",
-  }
-
-  $baseurl_centosplus = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/centosplus/\$basearch/",
-  }
-
-  $baseurl_contrib = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/contrib/\$basearch/",
-  }
-
-  yum::managed_yumrepo { 'base':
-    descr          => 'CentOS-$releasever - Base',
-    baseurl        => $baseurl_base,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'updates':
-    descr          => 'CentOS-$releasever - Updates',
-    baseurl        => $baseurl_updates,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'addons':
-    descr          => 'CentOS-$releasever - Addons',
-    baseurl        => $baseurl_addons,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=addons',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'extras':
-    descr          => 'CentOS-$releasever - Extras',
-    baseurl        => $baseurl_extras,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'centosplus':
-    descr          => 'CentOS-$releasever - Centosplus',
-    baseurl        => $baseurl_centosplus,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 2,
-  }
-
-  yum::managed_yumrepo { 'contrib':
-    descr          => 'CentOS-$releasever - Contrib',
-    baseurl        => $baseurl_contrib,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5',
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp
deleted file mode 100644
index ddfdaf46fef..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos6.pp
+++ /dev/null
@@ -1,108 +0,0 @@
-# = Class: yum::repo::centos6
-#
-# Base Centos6 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `rsync://msync.centos.org::CentOS`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/centos`
-#   Default: `undef`
-#
-class yum::repo::centos6 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_base = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/os/\$basearch/",
-  }
-
-  $baseurl_updates = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/updates/\$basearch/",
-  }
-
-  $baseurl_extras = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/extras/\$basearch/",
-  }
-
-  $baseurl_centosplus = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/centosplus/\$basearch/",
-  }
-
-  $baseurl_contrib = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/\$releasever/contrib/\$basearch/",
-  }
-
-  yum::managed_yumrepo { 'base':
-    descr          => 'CentOS-$releasever - Base',
-    baseurl        => $baseurl_base,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'updates':
-    descr          => 'CentOS-$releasever - Updates',
-    baseurl        => $baseurl_updates,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'extras':
-    descr          => 'CentOS-$releasever - Extras',
-    baseurl        => $baseurl_extras,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'centosplus':
-    descr          => 'CentOS-$releasever - Centosplus',
-    baseurl        => $baseurl_centosplus,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 2,
-  }
-
-  yum::managed_yumrepo { 'contrib':
-    descr          => 'CentOS-$releasever - Contrib',
-    baseurl        => $baseurl_contrib,
-    mirrorlist     => 'http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6',
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp
deleted file mode 100644
index a71f311bcb7..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/centos_testing.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# = Class: yum::repo::centos_testing
-#
-# Centos Testing
-#
-class yum::repo::centos_testing (
-  $include_pkgs = '',
-  $exclude_pkgs = undef
-  ) {
-  if $include_pkgs == '' {
-    fail('Please configure $include_pkgs as we run the testing repo with highest repository')
-  }
-
-  yum::managed_yumrepo{'centos5-testing':
-    descr       => 'CentOS-$releasever - Testing',
-    baseurl     => 'http://dev.centos.org/centos/$releasever/testing/$basearch',
-    enabled     => 1,
-    gpgcheck    => 1,
-    gpgkey      => 'http://dev.centos.org/centos/RPM-GPG-KEY-CentOS-testing',
-    priority    => 1,
-    includepkgs => $include_pkgs,
-    exclude     => $exclude_pkgs,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp
deleted file mode 100644
index 33449ecf501..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/ceph.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::ceph
-#
-# This class installs the official ceph repo
-#
-class yum::repo::ceph (
-  $release = 'emperor'
-) {
-
-  yum::managed_yumrepo { 'ceph':
-    descr          => "Ceph ${release} repository",
-    baseurl        => "http://ceph.com/rpm-${release}/\$releasever/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc',
-    autokeyimport  => 'yes',
-    priority       => 5,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp
deleted file mode 100644
index d55e8120733..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch10.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::elasticsearch10
-#
-# This class installs the elasticsearch10 repo
-#
-class yum::repo::elasticsearch10 {
-
-  yum::managed_yumrepo { 'elasticsearch-1.0':
-    descr          => 'Elasticsearch repository for 1.0.x packages',
-    baseurl        => 'http://packages.elasticsearch.org/elasticsearch/1.0/centos',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp
deleted file mode 100644
index 50e312ebab5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elasticsearch90.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::elasticsearch90
-#
-# This class installs the elasticsearch90 repo
-#
-class yum::repo::elasticsearch90 {
-
-  yum::managed_yumrepo { 'elasticsearch-0.90':
-    descr          => 'Elasticsearch repository for 0.90.x packages',
-    baseurl        => 'http://packages.elasticsearch.org/elasticsearch/0.90/centos',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp
deleted file mode 100644
index 60ae3e0a6cf..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/elrepo.pp
+++ /dev/null
@@ -1,105 +0,0 @@
-# = Class: yum::repo::elrepo
-#
-# This class installs the ELRepo repository
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://elrepo.org/linux/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://elrepo.org/linux/`
-#   Default: `undef`
-#
-class yum::repo::elrepo (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  # Workaround for Facter < 1.7.0
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  case $::operatingsystem {
-    'RedHat','CentOS','Scientific': {
-      $release = "el${osver[0]}"
-    }
-    default: {
-      fail("${title}: Operating system '${::operatingsystem}' is not currently supported")
-    }
-  }
-
-  $baseurl_elrepo = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/elrepo/${release}/\$basearch",
-  }
-
-  $baseurl_elrepo_testing = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${release}/\$basearch",
-  }
-
-  $baseurl_elrepo_kernel = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/kernel/${release}/\$basearch",
-  }
-
-  $baseurl_elrepo_extras = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/extras/${release}/\$basearch",
-  }
-
-  yum::managed_yumrepo { 'elrepo':
-    descr          => "ELRepo.org Community Enterprise Linux Repository - ${release}",
-    baseurl        => $baseurl_elrepo,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo.${release}",
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'elrepo-testing':
-    descr          => "ELRepo.org Community Enterprise Linux Testing Repository - ${release}",
-    baseurl        => $baseurl_elrepo_testing,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo-testing.${release}",
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'elrepo-kernel':
-    descr          => "ELRepo.org Community Enterprise Linux Kernel Repository - ${release}",
-    baseurl        => $baseurl_elrepo_kernel,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo-kernel.${release}",
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'elrepo-extras':
-    descr          => "ELRepo.org Community Enterprise Linux Extras Repository - ${release}",
-    baseurl        => $baseurl_elrepo_extras,
-    mirrorlist     => "http://elrepo.org/mirrors-elrepo-extras.${release}",
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org',
-    failovermethod => 'priority',
-    priority       => 17,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp
deleted file mode 100644
index 4039d81ebd8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/epel.pp
+++ /dev/null
@@ -1,132 +0,0 @@
-# = Class: yum::repo::epel
-#
-# This class installs the epel repo
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://dl.fedoraproject.org/pub/epel/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/epel`
-#   Default: `undef`
-#
-class yum::repo::epel (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  if $::operatingsystem == 'Amazon' {
-    $osver = [ '6' ]
-  } else {
-    $osver = split($::operatingsystemrelease, '[.]')
-  }
-
-  $baseurl_epel = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/${osver[0]}/\$basearch/",
-  }
-
-  $baseurl_epel_debuginfo = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/${osver[0]}/\$basearch/debug",
-  }
-
-  $baseurl_epel_source = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/${osver[0]}/SRPMS/",
-  }
-
-  $baseurl_epel_testing = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${osver[0]}/\$basearch/",
-  }
-
-  $baseurl_epel_testing_debuginfo = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${osver[0]}/\$basearch/debug",
-  }
-
-  $baseurl_epel_testing_source = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/testing/${osver[0]}/SRPMS/",
-  }
-
-  yum::managed_yumrepo { 'epel':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch",
-    baseurl        => $baseurl_epel,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${osver[0]}&arch=\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    gpgkey_source  => "puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'epel-debuginfo':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch - Debug",
-    baseurl        => $baseurl_epel_debuginfo,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'epel-source':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - \$basearch - Source",
-    baseurl        => $baseurl_epel_source,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'epel-testing':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch",
-    baseurl        => $baseurl_epel_testing,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'epel-testing-debuginfo':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch - Debug",
-    baseurl        => $baseurl_epel_testing_debuginfo,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 17,
-  }
-
-  yum::managed_yumrepo { 'epel-testing-source':
-    descr          => "Extra Packages for Enterprise Linux ${osver[0]} - Testing - \$basearch - Source",
-    baseurl        => $baseurl_epel_testing_source,
-    mirrorlist     => "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel${osver[0]}&arch=\$basearch",
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${osver[0]}",
-    priority       => 17,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp
deleted file mode 100644
index b62b4c77474..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/foreman.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::foreman
-#
-# This class installs the foreman repo
-#
-class yum::repo::foreman {
-
-  yum::managed_yumrepo { 'foreman':
-    descr          => 'Foreman Repo',
-    baseurl        => 'http://yum.theforeman.org/stable/',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    # gpgkey       => 'http://yum.theforeman.org/RPM-GPG-KEY-foreman',
-    priority       => 1,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp
deleted file mode 100644
index f43eb97062f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/integ_ganeti.pp
+++ /dev/null
@@ -1,69 +0,0 @@
-# = Class: yum::repo::integ_ganeti
-#
-# This class installs the Integ Ganeti Yum repo
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://jfut.integ.jp/linux/ganeti/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/ganeti`
-#   Default: `undef`
-#
-class yum::repo::integ_ganeti (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  # Workaround for Facter < 1.7.0
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  case $::operatingsystem {
-    'Fedora': {
-      $release = 'fedora'
-    }
-    'RedHat','CentOS','Scientific': {
-      $release = $osver[0]
-    }
-    default: {
-      fail("${title}: Operating system '${::operatingsystem}' is not currently supported")
-    }
-  }
-
-  $baseurl_integ_ganeti = $mirror_url ? {
-    undef   => "http://jfut.integ.jp/linux/ganeti/${release}/\$basearch",
-    default => "${mirror_url}/${release}/\$basearch",
-  }
-
-  $baseurl_integ_ganeti_source = $mirror_url ? {
-    undef   => "http://jfut.integ.jp/linux/ganeti/${release}/SRPMS",
-    default => "${mirror_url}/${release}/SRPMS",
-  }
-
-  yum::managed_yumrepo { 'integ-ganeti':
-    descr          => "Integ Ganeti Packages ${osver[0]} - \$basearch",
-    baseurl        => $baseurl_integ_ganeti,
-    enabled        => 1,
-    gpgcheck       => 0,
-    priority       => 15,
-  }
-
-  yum::managed_yumrepo { 'integ-ganeti-source':
-    descr          => "Integ Ganeti Packages ${osver[0]} - Source",
-    baseurl        => $baseurl_integ_ganeti_source,
-    enabled        => 0,
-    gpgcheck       => 0,
-    priority       => 15,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp
deleted file mode 100644
index 3cf0a6c88fc..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage5.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-# = Class: yum::repo::jpackage5
-#
-# This class installs the jpackage5 repo
-#
-class yum::repo::jpackage5 {
-
-  include yum
-
-  yum::managed_yumrepo { 'jpackage-generic-5.0':
-    descr          => 'JPackage (free), generic',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=5.0',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'jpackage-generic-5.0-updates':
-    descr          => 'JPackage (free), generic updates',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=5.0-updates',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'jpackage-rhel':
-    descr          => 'JPackage (free) for Red Hat Enterprise Linux $releasever',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=redhat-el-$releasever&type=free&release=5.0',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'jpackage-generic-5.0-devel':
-    descr          => 'JPackage (free), generic',
-    baseurl        => 'http://mirrors.dotsrc.org/jpackage/5.0/generic/devel',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 0,
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp
deleted file mode 100644
index 373006d1a84..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/jpackage6.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::jpackage6
-#
-# This class installs the jpackage6 repo
-#
-class yum::repo::jpackage6 {
-
-  yum::managed_yumrepo { 'jpackage':
-    descr          => 'JPackage 6 generic',
-    mirrorlist     => 'http://www.jpackage.org/mirrorlist.php?dist=generic&type=free&release=6.0',
-    failovermethod => 'priority',
-    gpgcheck       => 1,
-    gpgkey         => 'http://www.jpackage.org/jpackage.asc',
-    enabled        => 1,
-    priority       => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp
deleted file mode 100644
index 96059ec3758..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/karan.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# = Class: yum::repo::karan
-#
-# This class installs the karan repo
-#
-class yum::repo::karan {
-
-  yum::managed_yumrepo { 'kbs-CentOS-Extras':
-    descr          => 'CentOS.Karan.Org-EL$releasever - Stable',
-    baseurl        => 'http://centos.karan.org/el$releasever/extras/stable/$basearch/RPMS/',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority       => 20,
-  }
-
-  yum::managed_yumrepo { 'kbs-CentOS-Extras-Testing':
-    descr    => 'CentOS.Karan.Org-EL$releasever - Testing',
-    baseurl  => 'http://centos.karan.org/el$releasever/extras/testing/$basearch/RPMS/',
-    enabled  => 0,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority => 20,
-  }
-
-  yum::managed_yumrepo { 'kbs-CentOS-Misc':
-    descr    => 'CentOS.Karan.Org-EL$releasever - Stable',
-    baseurl  => 'http://centos.karan.org/el$releasever/misc/stable/$basearch/RPMS/',
-    enabled  => 1,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority => 20,
-  }
-
-  yum::managed_yumrepo { 'kbs-CentOS-Misc-Testing':
-    descr    => 'CentOS.Karan.Org-EL$releasever - Testing',
-    baseurl  => 'http://centos.karan.org/el$releasever/misc/testing/$basearch/RPMS/',
-    enabled  => 0,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kbsingh',
-    priority => 20,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp
deleted file mode 100644
index 9e6ca82c708..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/logstash13.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::logstash13
-#
-# This class installs the logstash13 repo
-#
-class yum::repo::logstash13 {
-
-  yum::managed_yumrepo { 'logstash-1.3':
-    descr          => 'logstash repository for 1.3.x packages',
-    baseurl        => 'http://packages.elasticsearch.org/logstash/1.3/centos',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp
deleted file mode 100644
index 9b2f6968af4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/mongodb.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::mongodb
-#
-# This class installs the mongodb repo
-#
-class yum::repo::mongodb {
-
-  yum::managed_yumrepo { 'mongodb':
-    descr     => '10gen MongoDB Repo',
-    baseurl   => 'http://downloads-distro.mongodb.org/repo/redhat/os/x86_64',
-    enabled   => 1,
-    gpgcheck  => 0,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp
deleted file mode 100644
index 8ebea58a5ff..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/monitoringsucks.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# = Class: yum::repo::monitoringsucks
-#
-# This class installs the monitoringsucks repo
-#
-class yum::repo::monitoringsucks {
-
-  yum::managed_yumrepo { 'monitoringsucks':
-    descr          => 'MonitoringSuck at Inuits',
-    baseurl        => 'http://pulp.inuits.eu/pulp/repos/monitoring',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    priority       => 99,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp
deleted file mode 100644
index 3d81ae09a06..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/newrelic.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::newrelic
-#
-# This class installs the newrelic repo
-#
-class yum::repo::newrelic {
-
-  yum::managed_yumrepo { 'newrelic':
-    descr     => 'Newrelic official release packages',
-    baseurl   => 'http://yum.newrelic.com/pub/newrelic/el5/$basearch/',
-    enabled   => 1,
-    gpgcheck  => 0,
-    priority  => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp
deleted file mode 100644
index c361aa33cde..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/nginx.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# = Class: yum::repo::nginx
-#
-# This class installs the nginx repo
-#
-class yum::repo::nginx {
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  yum::managed_yumrepo { 'nginx':
-    descr    => 'Nginx official release packages',
-    baseurl  => "http://nginx.org/packages/rhel/${osver[0]}/\$basearch/",
-    enabled  => 1,
-    gpgcheck => 0,
-    priority => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp
deleted file mode 100644
index 175916194f6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/openstack_grizzly.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::openstack_grizzly
-#
-# This class installs the EPEL-6 repo for OpenStack Grizzly
-#
-class yum::repo::openstack_grizzly {
-
-  yum::managed_yumrepo { 'epel-openstack-grizzly':
-    descr          => 'OpenStack Grizzly Repository for EPEL 6',
-    baseurl        => 'http://repos.fedorapeople.org/repos/openstack/openstack-grizzly/epel-6',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp
deleted file mode 100644
index c80d668bbea..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/passenger.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::passenger
-#
-# This class installs the passenger repo
-#
-class yum::repo::passenger {
-
-  yum::managed_yumrepo { 'passenger':
-    descr          => 'Red Hat Enterprise $releasever - Phusion Passenger',
-    baseurl        => 'http://passenger.stealthymonkeys.com/rhel/$releasever/$basearch',
-    mirrorlist     => 'http://passenger.stealthymonkeys.com/rhel/mirrors',
-    enabled        => 1 ,
-    gpgcheck       => 0, # To fix key autoimport
-    failovermethod => 'priority',
-    gpgkey         => 'http://passenger.stealthymonkeys.com/RPM-GPG-KEY-stealthymonkeys.asc',
-    autokeyimport  => 'yes',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp
deleted file mode 100644
index 89fe7c9cf4f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg91.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::pdgd91
-#
-# This class installs the postgresql 9.1 repo
-#
-class yum::repo::pgdg91 {
-
-  yum::managed_yumrepo { 'pgdg91':
-    descr          => 'PostgreSQL 9.1 $releasever - $basearch',
-    baseurl        => 'http://yum.postgresql.org/9.1/redhat/rhel-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp
deleted file mode 100644
index fe2dc057e69..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg92.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::pdgd92
-#
-# This class installs the postgresql 9.2 repo
-#
-class yum::repo::pgdg92 {
-
-  yum::managed_yumrepo { 'pgdg92':
-    descr          => 'PostgreSQL 9.2 $releasever - $basearch',
-    baseurl        => 'http://yum.postgresql.org/9.2/redhat/rhel-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp
deleted file mode 100644
index c3064ba12f5..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/pgdg93.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::pdgd93
-#
-# This class installs the postgresql 9.3 repo
-#
-class yum::repo::pgdg93 {
-
-  yum::managed_yumrepo { 'pgdg93':
-    descr          => 'PostgreSQL 9.3 $releasever - $basearch',
-    baseurl        => 'http://yum.postgresql.org/9.3/redhat/rhel-$releasever-$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-PGDG',
-    priority       => 20,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp
deleted file mode 100644
index 1e553bedb4a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetdevel.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# = Class: yum::repo::puppetdevel
-#
-# This class installs the puppetdevel repo
-#
-class yum::repo::puppetdevel {
-
-  yum::managed_yumrepo { 'puppetlabs_devel':
-    descr          => 'Puppet Labs Packages - Devel',
-    baseurl        => 'http://yum.puppetlabs.com/el/$releasever/devel/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 15,
-  }
-
-  yum::managed_yumrepo { 'puppetlabs_dependencies':
-    descr          => 'Puppet Labs Packages - Dependencies',
-    baseurl        => 'http://yum.puppetlabs.com/el/$releasever/dependencies/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 15,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp
deleted file mode 100644
index 0b3f5ea996a..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/puppetlabs.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# = Class: yum::repo::puppetlabs
-#
-# This class installs the puppetlabs repo
-#
-class yum::repo::puppetlabs {
-  $osver = split($::operatingsystemrelease, '[.]')
-  $release = $::operatingsystem ? {
-    /(?i:Centos|RedHat|Scientific)/ => $osver[0],
-    default                         => '6',
-  }
-
-  yum::managed_yumrepo { 'puppetlabs':
-    descr          => 'Puppet Labs Packages',
-    baseurl        => "http://yum.puppetlabs.com/el/${release}/products/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 1,
-  }
-
-  # The dependencies repo has the same priority as base,
-  # because it needs to override base packages.
-  # E.g. puppet-3.0 requires Ruby => 1.8.7, but EL5 ships with 1.8.5.
-  #
-  yum::managed_yumrepo { 'puppetlabs_dependencies':
-    descr          => 'Puppet Labs Packages',
-    baseurl        => "http://yum.puppetlabs.com/el/${release}/dependencies/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs',
-    priority       => 1,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp
deleted file mode 100644
index 85d22bff89f..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rbel.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::rbel
-#
-# This class installs the rbel repo
-#
-class yum::repo::rbel {
-
-  $osver = split($::operatingsystemrelease, '[.]')
-  yum::managed_yumrepo { 'rbel':
-    descr          => 'RBEL Repo',
-    baseurl        => "http://rbel.frameos.org/stable/el${osver[0]}/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RBEL' ,
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-RBEL',
-    priority       => 16,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp
deleted file mode 100644
index f27d6c9a290..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# = Class: yum::repo::remi
-#
-# This class installs the remi repo
-#
-class yum::repo::remi {
-  yum::managed_yumrepo { 'remi':
-    descr          => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch',
-    mirrorlist     => 'http://rpms.famillecollet.com/enterprise/$releasever/remi/mirror',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi',
-    priority       => 1,
-  }
-
-  yum::managed_yumrepo { 'remi-test':
-    descr          => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch - Test',
-    mirrorlist     => 'http://rpms.famillecollet.com/enterprise/$releasever/test/mirror',
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp
deleted file mode 100755
index 13a9412f5a4..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/remi_php55.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# = Class: yum::repo::remi_php55
-#
-# This class installs the remi-php55 repo
-#
-class yum::repo::remi_php55 {
-  yum::managed_yumrepo { 'remi-php55':
-    descr          => 'Les RPM de remi pour Enterpise Linux $releasever - $basearch - PHP 5.5',
-    mirrorlist     => 'http://rpms.famillecollet.com/enterprise/$releasever/php55/mirror',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-remi',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp
deleted file mode 100644
index b43e57dc565..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforge.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::repoforge
-#
-# This class installs the repoforge repo
-#
-class yum::repo::repoforge {
-
-  yum::managed_yumrepo { 'repoforge':
-    descr          => 'RepoForge packages',
-    baseurl        => 'http://apt.sw.be/redhat/el$releasever/en/$basearch/rpmforge',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    priority       => 1,
-    exclude        => 'nagios-*',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp
deleted file mode 100644
index 5242b5849a9..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/repoforgeextras.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::repoforgeextras
-#
-# This class installs the repoforge extras repo
-#
-class yum::repo::repoforgeextras {
-
-  yum::managed_yumrepo { 'repoforgeextras':
-    descr    => 'RepoForge extra packages',
-    baseurl  => 'http://apt.sw.be/redhat/el$releasever/en/$basearch/extras',
-    enabled  => 1,
-    gpgcheck => 1,
-    gpgkey   => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    priority => 1,
-    exclude  => 'perl-IO-Compress-* perl-DBD-MySQL',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp
deleted file mode 100644
index d6c048d2f43..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/rpmforge.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::rpmforge
-#
-# This class installs the rpmforce repo
-#
-class yum::repo::rpmforge {
-
-  yum::managed_yumrepo { 'rpmforge-rhel5':
-    descr          => 'RPMForge RHEL5 packages',
-    baseurl        => 'http://wftp.tu-chemnitz.de/pub/linux/dag/redhat/el$releasever/en/$basearch/dag',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-rpmforge-dag',
-    priority       => 30,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp
deleted file mode 100644
index 39f2633641c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl5.pp
+++ /dev/null
@@ -1,77 +0,0 @@
-# = Class: yum::repo::sl5
-#
-# Base Scientific Linux 5 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://ftp.scientificlinux.org/linux/scientific/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/scientific`
-#   Default: `undef`
-#
-class yum::repo::sl5 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_sl5x = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/5x/\$basearch/os/",
-  }
-
-  $baseurl_sl5x_security = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/5x/\$basearch/updates/security/",
-  }
-
-  $baseurl_sl5x_fastbugs = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/5x/\$basearch/updates/fastbugs/",
-  }
-
-  yum::managed_yumrepo { 'sl5x':
-    descr          => 'Scientific Linux 5x - $basearch',
-    baseurl        => $baseurl_sl5x,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-5x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-sl',
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'sl5x-security':
-    descr          => 'Scientific Linux 5x - $basearch - security updates',
-    baseurl        => $baseurl_sl5x_security,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-5x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    priority       => 10,
-  }
-
-  yum::managed_yumrepo { 'sl5x-fastbugs':
-    descr          => 'Scientific Linux 5x - $basearch - fastbug updates',
-    baseurl        => $baseurl_sl5x_fastbugs,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-5x.txt',
-    failovermethod => 'priority',
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    priority       => 10,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp
deleted file mode 100644
index 4e2daa4e453..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/sl6.pp
+++ /dev/null
@@ -1,74 +0,0 @@
-# = Class: yum::repo::sl6
-#
-# Base Scientific Linux 6 repos
-#
-# == Parameters:
-#
-# [*mirror_url*]
-#   A clean URL to a mirror of `http://ftp.scientificlinux.org/linux/scientific/`.
-#   The paramater is interpolated with the known directory structure to
-#   create a the final baseurl parameter for each yumrepo so it must be
-#   "clean", i.e., without a query string like `?key1=valA&key2=valB`.
-#   Additionally, it may not contain a trailing slash.
-#   Example: `http://mirror.example.com/pub/rpm/scientific`
-#   Default: `undef`
-#
-class yum::repo::sl6 (
-  $mirror_url = undef,
-) {
-
-  if $mirror_url {
-    validate_re(
-      $mirror_url,
-      '^(?:https?|ftp):\/\/[\da-zA-Z-][\da-zA-Z\.-]*\.[a-zA-Z]{2,6}\.?(?:\/[\w~-]*)*$',
-      '$mirror must be a Clean URL with no query-string, a fully-qualified hostname and no trailing slash.'
-    )
-  }
-
-  $baseurl_sl6x = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/6x/\$basearch/os/",
-  }
-
-  $baseurl_sl6x_security = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/6x/\$basearch/updates/security/",
-  }
-
-  $baseurl_sl6x_fastbugs = $mirror_url ? {
-    undef   => undef,
-    default => "${mirror_url}/6x/\$basearch/updates/fastbugs/",
-  }
-
-  yum::managed_yumrepo { 'sl6x':
-    descr          => 'Scientific Linux 6x - $basearch',
-    baseurl        => $baseurl_sl6x,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-base-6x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-sl',
-  }
-
-  yum::managed_yumrepo { 'sl6x-security':
-    descr          => 'Scientific Linux 6x - $basearch - security updates',
-    baseurl        => $baseurl_sl6x_security,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-security-6x.txt',
-    failovermethod => 'priority',
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-  }
-
-  yum::managed_yumrepo { 'sl6x-fastbugs':
-    descr          => 'Scientific Linux 6x - $basearch - fastbug updates',
-    baseurl        => $baseurl_sl6x_fastbugs,
-    mirrorlist     => 'http://ftp.scientificlinux.org/linux/scientific/mirrorlist/sl-fastbugs-6x.txt',
-    failovermethod => 'priority',
-    enabled        => 0,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-sl file:///etc/pki/rpm-gpg/RPM-GPG-KEY-dawson',
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp
deleted file mode 100644
index f53ba9a0f3b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/tmz.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-# = Class: yum::repo::tmz
-#
-# This class installs the tmz repo
-#
-class yum::repo::tmz {
-
-  yum::managed_yumrepo { 'tmz-puppet':
-    descr          => 'Puppet for EL $releasever - $basearch',
-    baseurl        => 'http://tmz.fedorapeople.org/repo/puppet/epel/$releasever/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://tmz.fedorapeople.org/repo/RPM-GPG-KEY-tmz',
-    priority       => 16,
-  }
-
-  yum::managed_yumrepo { 'tmz-puppet-source':
-    descr          => 'Puppet for EL $releasever - Source',
-    baseurl        => 'http://tmz.fedorapeople.org/repo/puppet/epel/$releasever/SRPMS',
-    enabled        => 0,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://tmz.fedorapeople.org/repo/RPM-GPG-KEY-tmz',
-    priority       => 16,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp
deleted file mode 100644
index 75cc4584752..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/varnish.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# = Class: yum::repo::varnish
-#
-# This class installs the varnish 3.0 repo
-#
-class yum::repo::varnish {
-
-  yum::managed_yumrepo { 'varnish':
-    descr          => 'Varnish 3.0 for Enterprise Linux 5 - $basearch',
-    baseurl        => 'http://repo.varnish-cache.org/redhat/varnish-3.0/el5/$basearch',
-    enabled        => 1,
-    gpgcheck       => 0,
-    failovermethod => 'priority',
-    # gpgkey       => 'http://yum.theforeman.org/RPM-GPG-KEY-VARNISH',
-    priority       => 26,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp
deleted file mode 100644
index 7e7847de317..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/vfabric.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# = Class: yum::repo::vfabric
-#
-# This class installs the vfabric repo
-#
-class yum::repo::vfabric {
-
-  $osver = split($::operatingsystemrelease, '[.]')
-
-  yum::managed_yumrepo { 'vfabric':
-    descr          => 'vFabric 5.2 Repo - $basesearch',
-    baseurl        => "http://repo.vmware.com/pub/rhel${osver[0]}/vfabric/5.2/\$basearch",
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => "http://repo.vmware.com/pub/rhel${osver[0]}/vfabric/5.2/RPM-GPG-KEY-VFABRIC-5.2-EL${osver[0]}",
-    priority       => 1,
-  }
-
-}
-
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp
deleted file mode 100644
index 171acf2df34..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/virtualbox.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# = Class: yum::repo::virtualbox
-#
-# This class installs the virtualbox repo
-#
-class yum::repo::virtualbox {
-
-  yum::managed_yumrepo { 'virtualbox':
-    descr          => 'RHEL/CentOS-$releasever / $basearch - VirtualBox',
-    baseurl        => 'http://download.virtualbox.org/virtualbox/rpm/rhel/$releasever/$basearch',
-    enabled        => 1,
-    gpgcheck       => 1,
-    failovermethod => 'priority',
-    gpgkey         => 'http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc',
-    autokeyimport  => 'yes',
-    priority       => 18,
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp
deleted file mode 100644
index adf9c5d8f1d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/repo/webtatic.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# = Class: yum::repo::webtatic
-#
-# This class installs the webtatic repo
-#
-class yum::repo::webtatic {
-  $osver = split($::operatingsystemrelease, '[.]')
-  yum::managed_yumrepo { 'webtatic':
-    descr          => 'Webtatic Repository $releasever - $basearch',
-    mirrorlist     => $osver[0] ? {
-      5 => 'http://repo.webtatic.com/yum/centos/5/$basearch/mirrorlist',
-      6 => 'http://repo.webtatic.com/yum/el6/$basearch/mirrorlist',
-    },
-    enabled        => 1,
-    gpgcheck       => 1,
-    gpgkey         => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-webtatic-andy',
-    gpgkey_source  => 'puppet:///modules/yum/rpm-gpg/RPM-GPG-KEY-webtatic-andy',
-    priority       => 1,
-  }
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp
deleted file mode 100644
index 264541d2a5c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/manifests/updatesd.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Class yum::updatesd
-#
-# Installs and enables yum updatesd
-#
-#
-class yum::updatesd {
-
-  require yum
-
-  $manage_update_package = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  $manage_update_service_ensure = $yum::bool_update_disable ? {
-    true    => stopped,
-    default => running,
-  }
-
-  $manage_update_service_enable = $yum::bool_update_disable ? {
-    true    => false,
-    default => true,
-  }
-
-  $manage_update_file = $yum::bool_update_disable ? {
-    true    => absent,
-    default => present,
-  }
-
-  package { 'yum-updatesd':
-    ensure => $manage_update_package,
-    name   => 'yum-updatesd',
-  }
-
-  service { 'yum-updatesd':
-    ensure     => $manage_update_service_ensure,
-    enable     => $manage_update_service_enable,
-    hasstatus  => true,
-    hasrestart => true,
-    require    => Package['yum-updatesd'],
-  }
-
-  file { 'yum-updatesd.conf':
-    ensure  => $manage_update_file,
-    path    => '/etc/yum/yum-updatesd.conf',
-    source  => 'puppet:///modules/yum/yum-updatesd.conf',
-    require => Package['yum-updatesd'],
-  }
-
-}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb
deleted file mode 100644
index 62d9f9c65ac..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/classes/yum_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "#{File.join(File.dirname(__FILE__),'..','spec_helper.rb')}"
-
-describe 'yum' do
-
-  let(:title) { 'yum' }
-  let(:node) { 'rspec.example42.com' }
-  let(:facts) { { :ipaddress => '10.42.42.42' } }
-
-  describe 'Test minimal installation' do
-    it { should contain_file('yum.conf').with_ensure('present') }
-  end
-
-  describe 'Test decommissioning - absent' do
-    let(:params) { {:absent => true } }
-    it 'should remove yum configuration file' do should contain_file('yum.conf').with_ensure('absent') end
-  end
-
-  describe 'Test customizations - source' do
-    let(:params) { {:source => "puppet:///modules/yum/spec"} }
-    it { should contain_file('yum.conf').with_source('puppet:///modules/yum/spec') }
-  end
-
-end
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb
deleted file mode 100644
index 2c6f56649ae..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/spec/spec_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'puppetlabs_spec_helper/module_spec_helper'
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb b/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb
deleted file mode 100644
index f4f5971a83c..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/yum/templates/yum-cron.erb
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# File Managed by Puppet
-#
-# Pass any given paramter to yum, as run in all the scripts invoked
-# by this package.  Be aware that this is global, and yum is invoked in 
-# several modes by these scripts for which your own parameter might not
-# be appropriate
-YUM_PARAMETER=<%= scope.lookupvar('yum::cron_param') %>
-
-# Don't install, just check (valid: yes|no)
-CHECK_ONLY=no
-
-# Check to see if you can reach the repos before updating (valid: yes|no)
-CHECK_FIRST=no
-
-# Don't install, just check and download (valid: yes|no)
-# Implies CHECK_ONLY=yes (gotta check first to see what to download)
-DOWNLOAD_ONLY=no
-
-# Error level, practical range 0-10, 0 means print only critical errors which
-# you must be told, 1 means print all errors, even ones that are not important
-# Level 0 is the default
-# ERROR_LEVEL=0
-
-# Debug level, practical range 0-10, higher number means more output
-# Level 1 is a useful level if you want to see what's been done and
-# don't want to read /var/log/yum.log
-# Level 0 is the default
-# DEBUG_LEVEL=1
-
-# randomwait is used by yum to wait random time
-# default is 60 so yum waits random time from 1 to 60 minutes
-# the value must not be zero
-RANDOMWAIT="60"
-
-# if MAILTO is set and the mail command is available, the mail command 
-# is used to deliver yum output
-
-# by default MAILTO is unset, so crond mails the output by itself
-# example:  MAILTO=root
-MAILTO=<%= scope.lookupvar('yum::cron_mailto') %>
-
-# you may set SYSTEMNAME if you want your yum emails tagged differently
-# default is output of hostname command 
-# this variable is used only if MAILTO is set too
-#SYSTEMNAME="" 
-
-# you may set DAYS_OF_WEEK to the days of the week you want to run 
-# default is every day 
-#DAYS_OF_WEEK="0123456" 
-DAYS_OF_WEEK=<%= scope.lookupvar('yum::cron_dotw') %>
-
-# which day should it do cleanup on?  defaults to 0 (Sunday).  If this day isn't in the 
-# DAYS_OF_WEEK above, it'll never happen
-CLEANDAY="0"
-
-# set to yes to make the yum-cron service to wait for transactions to complete
-SERVICE_WAITS=yes
-
-# set maximum time period (in seconds) for the yum-cron service to wait for
-# transactions to complete.  The default is 300 seconds (5 minutes)
-SERVICE_WAIT_TIME=300
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh b/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh
deleted file mode 100644
index 06713c2ee99..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/execute-files.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-shopt -s nullglob
-files=("${VAGRANT_CORE_FOLDER}"/files/exec-once/*)
-
-if [[ ! -f '/.puphpet-stuff/exec-once-ran' && (${#files[@]} -gt 0) ]]; then
-    echo 'Running files in files/exec-once'
-    find "${VAGRANT_CORE_FOLDER}/files/exec-once" -maxdepth 1 -not -path '*/\.*' -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec {} \;
-    echo 'Finished running files in files/exec-once'
-    echo 'To run again, delete file /.puphpet-stuff/exec-once-ran'
-    touch /.puphpet-stuff/exec-once-ran
-fi
-
-echo 'Running files in files/exec-always'
-find "${VAGRANT_CORE_FOLDER}/files/exec-always" -maxdepth 1 -not -path '*/\.*' -type f \( ! -iname "empty" \) -exec chmod +x '{}' \; -exec {} \;
-echo 'Finished running files in files/exec-always'
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh b/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh
deleted file mode 100644
index bd1bb95cabe..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-if [[ ! -f '/.puphpet-stuff/displayed-important-notices' ]]; then
-    cat "${VAGRANT_CORE_FOLDER}/shell/important-notices.txt"
-
-    touch '/.puphpet-stuff/displayed-important-notices'
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt b/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt
deleted file mode 100644
index 0dc384f1e06..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/important-notices.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-                                              _
-                                             / )
-                                        .--.; |    _...,-"""-,
-                         .-""-.-""""-. /   _`'-._.'   /`      \
-                        /'     \      \|  (/'-._/     )        ;
-                .-""""-;       (       '--' /-'    _           |
-              .'       |        ;    e     /       a  ,       ;
-             /          \       |      __.'`-.__,    ;       /
-            /            `._     ;    .-'     `--.,__.\    /`
-           //|              \     \,-'                /\_.'
-          // |               `;.___>              /,-'.
-        /`|  /                |`\      _..---\    |    \
-        |/  /     _,.-----\   |  \   /`|      |   |\    \
-           /    .;   |    |   |   \ /  |      |   | \    )
-          |    / |   \    /   |\..' \   \     |   \  \..'
-       jgs \../  \.../    \.../ \.../---'     \.../
-
-Read me for some important information!
-
-If Puppet did not blow up (you do not see a sea of red above), then your VM
-was generated successfully!
-
-* A unique private key was generated for you! It is located at
-  "puphpet/files/dot/ssh/id_rsa". If you are on Windows, a PuTTY-friendly key
-  was also generated at same location with a ".ppk" extension.
-* If you want to use your own private key for future provisions, overwrite the
-  generated key above with your own. Make sure to follow the naming pattern,
-  and include a ".pub" public key.
-* If you wish to add packages, modules, Apache/Nginx vhosts, or anything else,
-  open up "puphpet/config.yaml" and make changes within! Some things will
-  have random strings like "DIdXRs2OI2LJ" - you must create a random string
-  as well! To do so, please apply face to keyboard and roll.
-* If you change "puphpet/config.yaml", simple run "$ vagrant provision" and
-  your VM will be updated with the changes you requested!
-
-Did something go wrong? Don't worry! I can (maybe) help! Please go to our
-Github issues page at https://github.com/puphpet/puphpet/issues and search for
-your problem. If you do not find your problem answered, open a new ticket!
-
-----------------------------------------------------------------------------
-PLEASE REMEMBER TO INCLUDE THE CONTENTS OF YOUR "puphpet/config.yaml" FILE.
-----------------------------------------------------------------------------
-
-Make sure to xxx out any potential API keys or passwords that you do not want
-others to see!
-
-Happy programming!
-                                                            - Juan Treminio
-
-┈╭━━━━━━━━━━━━┳━━╮┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈
- ┃         ╭╯ ┃ ▋┃╭━┓   ____                _      _    _                    _
-╭┫         ┃  ┃  ┃┃╭┛  |  _ \ ___  __ _  __| |    / \  | |__   _____   _____| |
-┃┃         ╰━━╯ ┃╰╯┃   | |_) / _ \/ _` |/ _` |   / _ \ | '_ \ / _ \ \ / / _ \ |
-╯┃              ╰┳━╯   |  _ <  __/ (_| | (_| |  / ___ \| |_) | (_) \ V /  __/_|
- ┃               ┃     |_| \_\___|\__,_|\__,_| /_/   \_\_.__/ \___/ \_/ \___(_)
- ┃ ┏━┳━━━━━━━┓ ┏ ┃
-▔┗━┻━┛▔▔▔▔▔▔▔┗━┻━┛▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔▔
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh b/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh
deleted file mode 100644
index 8fbfe3a2014..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/initial-setup.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(echo "$1")
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME)
-
-cat "${VAGRANT_CORE_FOLDER}/shell/self-promotion.txt"
-
-if [[ ! -d '/.puphpet-stuff' ]]; then
-    mkdir '/.puphpet-stuff'
-    echo 'Created directory /.puphpet-stuff'
-fi
-
-touch '/.puphpet-stuff/vagrant-core-folder.txt'
-echo "${VAGRANT_CORE_FOLDER}" > '/.puphpet-stuff/vagrant-core-folder.txt'
-
-if [[ ! -f '/.puphpet-stuff/initial-setup-base-packages' ]]; then
-    if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then
-        echo 'Running initial-setup apt-get update'
-        apt-get update >/dev/null
-        echo 'Finished running initial-setup apt-get update'
-
-        echo 'Installing git'
-        apt-get -q -y install git-core >/dev/null
-        echo 'Finished installing git'
-
-        if [[ "${CODENAME}" == 'lucid' || "${CODENAME}" == 'precise' ]]; then
-            echo 'Installing basic curl packages (Ubuntu only)'
-            apt-get install -y libcurl3 libcurl4-gnutls-dev curl >/dev/null
-            echo 'Finished installing basic curl packages (Ubuntu only)'
-        fi
-
-        echo 'Installing rubygems'
-        apt-get install -y rubygems >/dev/null
-        echo 'Finished installing rubygems'
-
-        echo 'Installing base packages for r10k'
-        apt-get install -y build-essential ruby-dev >/dev/null
-        gem install json >/dev/null
-        echo 'Finished installing base packages for r10k'
-
-        if [ "${OS}" == 'ubuntu' ]; then
-            echo 'Updating libgemplugin-ruby (Ubuntu only)'
-            apt-get install -y libgemplugin-ruby >/dev/null
-            echo 'Finished updating libgemplugin-ruby (Ubuntu only)'
-        fi
-
-        if [ "${CODENAME}" == 'lucid' ]; then
-            echo 'Updating rubygems (Ubuntu Lucid only)'
-            gem install rubygems-update >/dev/null 2>&1
-            /var/lib/gems/1.8/bin/update_rubygems >/dev/null 2>&1
-            echo 'Finished updating rubygems (Ubuntu Lucid only)'
-        fi
-
-        echo 'Installing r10k'
-        gem install r10k >/dev/null 2>&1
-        echo 'Finished installing r10k'
-
-        touch '/.puphpet-stuff/initial-setup-base-packages'
-    elif [[ "${OS}" == 'centos' ]]; then
-        echo 'Running initial-setup yum update'
-        perl -p -i -e 's@enabled=1@enabled=0@gi' /etc/yum/pluginconf.d/fastestmirror.conf
-        perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/os/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/os/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo
-        perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/updates/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/updates/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo
-        perl -p -i -e 's@#baseurl=http://mirror.centos.org/centos/\$releasever/extras/\$basearch/@baseurl=http://mirror.rackspace.com/CentOS//\$releasever/extras/\$basearch/\nenabled=1@gi' /etc/yum.repos.d/CentOS-Base.repo
-
-        yum -y --nogpgcheck install 'http://www.elrepo.org/elrepo-release-6-6.el6.elrepo.noarch.rpm' >/dev/null
-        yum -y --nogpgcheck install 'https://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm' >/dev/null
-        yum -y install centos-release-SCL >/dev/null
-        yum clean all >/dev/null
-        yum -y check-update >/dev/null
-        echo 'Finished running initial-setup yum update'
-
-        echo 'Installing git'
-        yum -y install git >/dev/null
-        echo 'Finished installing git'
-
-        echo 'Updating to Ruby 1.9.3'
-        yum -y install centos-release-SCL >/dev/null 2>&1
-        yum remove ruby >/dev/null 2>&1
-        yum -y install ruby193 ruby193-ruby-irb ruby193-ruby-doc ruby193-libyaml rubygems >/dev/null 2>&1
-        yum -y --nogpgcheck install 'https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-rgen-0.6.5-2.el6.noarch.rpm' >/dev/null 2>&1
-        gem update --system >/dev/null 2>&1
-        gem install haml >/dev/null 2>&1
-
-        yum -y --nogpgcheck install 'https://yum.puppetlabs.com/el/6/products/x86_64/hiera-1.3.2-1.el6.noarch.rpm' >/dev/null
-        yum -y --nogpgcheck install 'https://yum.puppetlabs.com/el/6/products/x86_64/facter-1.7.5-1.el6.x86_64.rpm' >/dev/null
-        yum -y --nogpgcheck install 'https://yum.puppetlabs.com/el/6/dependencies/x86_64/rubygem-json-1.5.5-1.el6.x86_64.rpm' >/dev/null
-        yum -y --nogpgcheck install 'https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-json-1.5.5-1.el6.x86_64.rpm' >/dev/null
-        yum -y --nogpgcheck install 'https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-shadow-2.2.0-2.el6.x86_64.rpm' >/dev/null
-        yum -y --nogpgcheck install 'https://yum.puppetlabs.com/el/6/dependencies/x86_64/ruby-augeas-0.4.1-3.el6.x86_64.rpm' >/dev/null
-        echo 'Finished updating to Ruby 1.9.3'
-
-        echo 'Installing basic development tools (CentOS)'
-        yum -y groupinstall 'Development Tools' >/dev/null
-        echo 'Finished installing basic development tools (CentOS)'
-
-        echo 'Installing r10k'
-        gem install r10k >/dev/null 2>&1
-        echo 'Finished installing r10k'
-
-        touch '/.puphpet-stuff/initial-setup-base-packages'
-    fi
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh b/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh
deleted file mode 100644
index 3f679008fe8..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/os-detect.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# Try and get debian operating system
-# id, codename, and release
-
-TYPE=$(echo "$1" | tr '[A-Z]' '[a-z]')
-OS=$(uname)
-ID='unknown'
-CODENAME='unknown'
-RELEASE='unknown'
-
-if [ "${OS}" == 'Linux' ]; then
-    # detect centos
-    grep 'centos' /etc/issue -i -q
-    if [ $? = '0' ]; then
-        ID='centos'
-        RELEASE=$(cat /etc/redhat-release | grep -o 'release [0-9]' | cut -d " " -f2)
-    # could be debian or ubuntu
-    elif [ $(which lsb_release) ]; then
-        ID=$(lsb_release -i | cut -f2)
-        CODENAME=$(lsb_release -c | cut -f2)
-        RELEASE=$(lsb_release -r | cut -f2)
-    elif [ -f '/etc/lsb-release' ]; then
-        ID=$(cat /etc/lsb-release | grep DISTRIB_ID | cut -d "=" -f2)
-        CODENAME=$(cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -d "=" -f2)
-        RELEASE=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f2)
-    elif [ -f '/etc/issue' ]; then
-        ID=$(head -1 /etc/issue | cut -d " " -f1)
-        if [ -f '/etc/debian_version' ]; then
-          RELEASE=$(</etc/debian_version)
-        else
-          RELEASE=$(head -1 /etc/issue | cut -d " " -f2)
-        fi
-    fi
-fi
-
-declare -A info
-
-info[id]=$(echo "${ID}" | tr '[A-Z]' '[a-z]')
-info[codename]=$(echo "${CODENAME}" | tr '[A-Z]' '[a-z]')
-info[release]=$(echo "${RELEASE}" | tr '[A-Z]' '[a-z]')
-
-if [ "${TYPE}" ] ; then
-    echo "${info[${TYPE}]}"
-else
-    echo -e "ID\t${info[id]}"
-    echo -e "CODENAME\t${info[codename]}"
-    echo -e "RELEASE\t${info[release]}"
-fi
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/r10k.sh b/dev/vagrant/dolibarrdev/puphpet/shell/r10k.sh
deleted file mode 100644
index 1c9befe917d..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/r10k.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME)
-
-# Directory in which r10k should manage its modules directory
-PUPPET_DIR=/etc/puppet/
-
-if [[ ! -d "${PUPPET_DIR}" ]]; then
-    mkdir -p "${PUPPET_DIR}"
-    echo "Created directory ${PUPPET_DIR}"
-fi
-
-cp "${VAGRANT_CORE_FOLDER}/puppet/Puppetfile" "${PUPPET_DIR}"
-echo 'Copied Puppetfile'
-
-echo 'Running update r10k'
-cd "${PUPPET_DIR}" && r10k puppetfile install >/dev/null
-echo 'Finished running update r10k'
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/self-promotion.txt b/dev/vagrant/dolibarrdev/puphpet/shell/self-promotion.txt
deleted file mode 100644
index 8cd11701e7b..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/self-promotion.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-         ____        ____  _   _ ____      _      generated using
-        |  _ \ _   _|  _ \| | | |  _ \ ___| |_   ___ ___  _ __ ___
-        | |_) | | | | |_) | |_| | |_) / _ \ __| / __/ _ \| '_ ` _ \
-        |  __/| |_| |  __/|  _  |  __/  __/ |_ | (_| (_) | | | | | |
-        |_|    \__,_|_|   |_| |_|_|   \___|\__(_)___\___/|_| |_| |_|
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh b/dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh
deleted file mode 100644
index 6bb7614f9c6..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/ssh-keygen.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-VAGRANT_SSH_USERNAME=$(echo "$1")
-
-if [[ ! -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" ]]; then
-    ssh-keygen -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" -P ""
-
-    if [[ ! -f "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.ppk" ]]; then
-        if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then
-            apt-get install -y putty-tools >/dev/null
-        elif [ "${OS}" == 'centos' ]; then
-            yum -y install putty >/dev/null
-        fi
-
-        puttygen "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa" -O private -o "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.ppk"
-    fi
-
-    echo 'Your private key for SSH-based authentication have been saved to "puphpet/files/dot/ssh/"!'
-else
-    echo 'Using pre-existing private key at "puphpet/files/dot/ssh/id_rsa"'
-fi
-
-echo 'Adding generated key to /root/.ssh/authorized_keys'
-mkdir -p /root/.ssh
-cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" > '/root/.ssh/authorized_keys'
-chmod 600 '/root/.ssh/authorized_keys'
-
-if [ "${VAGRANT_SSH_USERNAME}" != 'root' ]; then
-    VAGRANT_SSH_FOLDER="/home/${VAGRANT_SSH_USERNAME}/.ssh";
-
-    echo "Adding generated key to ${VAGRANT_SSH_FOLDER}/authorized_keys"
-    cat "${VAGRANT_CORE_FOLDER}/files/dot/ssh/id_rsa.pub" > "${VAGRANT_SSH_FOLDER}/authorized_keys"
-    chown "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}/authorized_keys"
-    chgrp "${VAGRANT_SSH_USERNAME}" "${VAGRANT_SSH_FOLDER}/authorized_keys"
-    chmod 600 "${VAGRANT_SSH_FOLDER}/authorized_keys"
-fi
-
-passwd -d vagrant >/dev/null
diff --git a/dev/vagrant/dolibarrdev/puphpet/shell/update-puppet.sh b/dev/vagrant/dolibarrdev/puphpet/shell/update-puppet.sh
deleted file mode 100644
index f8c1f5d2256..00000000000
--- a/dev/vagrant/dolibarrdev/puphpet/shell/update-puppet.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-VAGRANT_CORE_FOLDER=$(cat '/.puphpet-stuff/vagrant-core-folder.txt')
-
-OS=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" ID)
-RELEASE=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" RELEASE)
-CODENAME=$(/bin/bash "${VAGRANT_CORE_FOLDER}/shell/os-detect.sh" CODENAME)
-
-if [[ ! -f '/.puphpet-stuff/update-puppet' ]]; then
-    if [ "${OS}" == 'debian' ] || [ "${OS}" == 'ubuntu' ]; then
-        echo "Downloading http://apt.puppetlabs.com/puppetlabs-release-${CODENAME}.deb"
-        wget --quiet --tries=5 --connect-timeout=10 -O "/.puphpet-stuff/puppetlabs-release-${CODENAME}.deb" "http://apt.puppetlabs.com/puppetlabs-release-${CODENAME}.deb"
-        echo "Finished downloading http://apt.puppetlabs.com/puppetlabs-release-${CODENAME}.deb"
-
-        dpkg -i "/.puphpet-stuff/puppetlabs-release-${CODENAME}.deb" >/dev/null
-
-        echo 'Running update-puppet apt-get update'
-        apt-get update >/dev/null
-        echo 'Finished running update-puppet apt-get update'
-
-        echo 'Updating Puppet to version 3.4.x'
-        apt-get install -y puppet-common=3.4.* puppet=3.4.* >/dev/null
-        apt-mark hold puppet puppet-common >/dev/null
-        PUPPET_VERSION=$(puppet help | grep 'Puppet v')
-        echo "Finished updating puppet to latest version: ${PUPPET_VERSION}"
-
-        touch '/.puphpet-stuff/update-puppet'
-    elif [ "${OS}" == 'centos' ]; then
-        echo "Downloading http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppet-3.4.3-1.el6.noarch.rpm"
-        yum -y --nogpgcheck install "http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppet-3.4.3-1.el6.noarch.rpm" >/dev/null
-        echo "Finished downloading http://yum.puppetlabs.com/el/${RELEASE}/products/x86_64/puppet-3.4.3-1.el6.noarch.rpm"
-
-        echo 'Installing/Updating Puppet to version 3.4.x'
-        yum -y install yum-versionlock puppet >/dev/null
-        yum versionlock puppet
-        PUPPET_VERSION=$(puppet help | grep 'Puppet v')
-        echo "Finished installing/updating puppet to version: ${PUPPET_VERSION}"
-
-        touch '/.puphpet-stuff/update-puppet'
-    fi
-fi
diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index e7d542c9320..bf99a2deebe 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -1,7 +1,7 @@
 /test.php
-/custom*
 /extensions*
 /nltechno*
+/ancot*
 /teclib*
 /bootstrap*
 /google*
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
new file mode 100644
index 00000000000..0c2a825604b
--- /dev/null
+++ b/htdocs/accountancy/admin/account.php
@@ -0,0 +1,223 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/account.php
+ * \ingroup		Accounting Expert
+ * \brief		List accounting account
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+// Langs
+$langs->load("compta");
+$langs->load("accountancy");
+
+$mesg = '';
+$action = GETPOST('action');
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$search_account = GETPOST("search_account");
+$search_label = GETPOST("search_label");
+$search_accountparent = GETPOST("search_accountparent");
+$search_pcgtype = GETPOST("search_pcgtype");
+$search_pcgsubtype = GETPOST("search_pcgsubtype");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'sortorder');
+$limit = $conf->liste_limit;
+$page = GETPOST("page", 'int');
+if ($page == - 1) {
+	$page = 0;
+}
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield)
+	$sortfield = "aa.account_number";
+if (! $sortorder)
+	$sortorder = "ASC";
+
+if ($action == 'delete') {
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id, $langs->trans('DeleteAccount'), $langs->trans('ConfirmDeleteAccount'), 'confirm_delete', '', 0, 1);
+	print $formconfirm;
+}
+
+$accounting = new AccountingAccount($db);
+
+if ($action == 'disable') {
+	if ($accounting->fetch($id)) {
+		$result = $accounting->account_desactivate($id);
+	}
+	
+	$action = 'update';
+	if ($result < 0) {
+		setEventMessage($accounting->error, 'errors');
+	}
+} else if ($action == 'enable') {
+	if ($accounting->fetch($id)) {
+		$result = $accounting->account_activate($id);
+	}
+	$action = 'update';
+	if ($result < 0) {
+		setEventMessage($accounting->error, 'errors');
+	}
+}
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_account="";
+    $search_label="";
+	$search_accountparent="";
+	$search_pcgtype="";
+	$search_pcgsubtype="";
+}
+
+/*
+ * View
+ *
+ */
+llxHeader('', $langs->trans("ListAccounts"));
+
+$pcgver = $conf->global->CHARTOFACCOUNTS;
+
+$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.pcg_subtype, aa.account_number, aa.account_parent , aa.label, aa.active ";
+$sql .= " FROM " . MAIN_DB_PREFIX . "accountingaccount as aa, " . MAIN_DB_PREFIX . "accounting_system as asy";
+$sql .= " WHERE aa.fk_pcg_version = asy.pcg_version";
+$sql .= " AND asy.rowid = " . $pcgver;
+
+if (strlen(trim($search_account))) {
+	$sql .= " AND aa.account_number like '%" . $search_account . "%'";
+}
+if (strlen(trim($search_label))) {
+	$sql .= " AND aa.label like '%" . $search_label . "%'";
+}
+if (strlen(trim($search_accountparent))) {
+	$sql .= " AND aa.account_parent like '%" . $search_accountparent . "%'";
+}
+if (strlen(trim($search_pcgtype))) {
+	$sql .= " AND aa.pcg_type like '%" . $search_pcgtype . "%'";
+}
+if (strlen(trim($search_pcgsubtype))) {
+	$sql .= " AND aa.pcg_subtype like '%" . $search_pcgsubtype . "%'";
+}
+
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog('accountancy/admin/account.php:: $sql=' . $sql);
+$result = $db->query($sql);
+
+if ($result) {
+	$num = $db->num_rows($result);
+	
+	print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num);
+	
+	$i = 0;
+	
+	print '<form method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
+	
+	print '<br/>';
+	
+	print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
+	print '<a class="butAction" href="./importaccounts.php">' . $langs->trans("ImportAccount") . '</a>';
+	print '<br/><br/>';
+	
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("AccountNumber"), $_SERVER["PHP_SELF"], "aa.account_number", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "aa.label", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Accountparent"), $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Pcgtype"), $_SERVER["PHP_SELF"], "aa.pcg_type", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Pcgsubtype"), $_SERVER["PHP_SELF"], "aa.pcg_subtype", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Active"), $_SERVER["PHP_SELF"], "aa.active", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
+	print '</tr>';
+	
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_account" value="' . $search_account . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . $search_label . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_accountparent" value="' . $search_accountparent . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_pcgtype" value="' . $search_pcgtype . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td align="right" colspan="2" class="liste_titre">';
+	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '&nbsp;';
+	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+	print '</tr>';
+	
+	$var = true;
+	
+	while ( $i < min($num, $limit) ) {
+		$obj = $db->fetch_object($resql);
+		
+		$var = ! $var;
+		print '<tr ' . $bc[$var] . '>';
+		print '<td><a href="./card.php?id=' . $obj->rowid . '">' . $obj->account_number . '</td>';
+		print '<td>' . $obj->label . '</td>';
+		print '<td>' . $obj->account_parent . '</td>';
+		print '<td>' . $obj->pcg_type . '</td>';
+		print '<td>' . $obj->pcg_subtype . '</td>';
+		print '<td>';
+		if (empty($obj->active)) {
+			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=enable">';
+			print img_picto($langs->trans("Disabled"), 'switch_off');
+			print '</a>';
+		} else {
+			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $obj->rowid . '&action=disable">';
+			print img_picto($langs->trans("Activated"), 'switch_on');
+			print '</a>';
+		}
+		print '</td>';
+		
+		// Action
+		print '<td align="center">';
+		if ($user->admin) {
+			print '<a href="./card.php?action=update&id=' . $obj->rowid . '">';
+			print img_edit();
+			print '</a>';
+			print '&nbsp;';
+			print '<a href="./card.php?action=delete&id=' . $obj->rowid . '">';
+			print img_delete();
+			print '</a>';
+		}
+		print '</td>' . "\n";
+		
+		print "</tr>\n";
+		$i ++;
+	}
+	
+	print "</table>";
+	print '</form>';
+} else {
+	dol_print_error($db);
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
new file mode 100644
index 00000000000..ad6ca01b6ca
--- /dev/null
+++ b/htdocs/accountancy/admin/card.php
@@ -0,0 +1,297 @@
+<?PHP
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/card.php
+ * \ingroup		Accounting Expert
+ * \brief		Card accounting account
+ */
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+// Langs
+$langs->load("bills");
+$langs->load("accountancy");
+
+$mesg = '';
+$action = GETPOST('action');
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+	
+$accounting = new AccountingAccount($db);
+
+// Action
+if ($action == 'add')
+{
+	if (! GETPOST('cancel', 'alpha')) {
+		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
+		
+		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+		$result = $db->query($sql);
+		$obj = $db->fetch_object($result);
+		
+		$accounting->fk_pcg_version = $obj->pcg_version;
+		$accounting->pcg_type = GETPOST('pcg_type');
+		$accounting->pcg_subtype = GETPOST('pcg_subtype');
+		$accounting->account_number = GETPOST('account_number', 'int');
+		$accounting->account_parent = GETPOST('account_parent', 'int');
+		$accounting->label = GETPOST('label', 'alpha');
+		$accounting->active = 1;
+		
+		$res = $accounting->create($user);
+		
+		if ($res == 0) {
+		} else {
+			if ($res == - 3) {
+				$_error = 1;
+				$action = "create";
+			}
+			if ($res == - 4) {
+				$_error = 2;
+				$action = "create";
+			}
+		}
+	}
+	Header("Location: account.php");
+}
+else if ($action == 'edit')
+{
+	if (! GETPOST('cancel', 'alpha')) {
+		$result = $accounting->fetch($id);
+		
+		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
+		
+		dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+		$result2 = $db->query($sql);
+		$obj = $db->fetch_object($result2);
+		
+		$accounting->fk_pcg_version = $obj->pcg_version;
+		$accounting->pcg_type = GETPOST('pcg_type');
+		$accounting->pcg_subtype = GETPOST('pcg_subtype');
+		$accounting->account_number = GETPOST('account_number', 'int');
+		$accounting->account_parent = GETPOST('account_parent', 'int');
+		$accounting->label = GETPOST('label', 'alpha');
+		
+		$result = $accounting->update($user);
+		
+		if ($result > 0) {
+			header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+			exit();
+		} else {
+			$mesg = $object->error;
+		}
+	} else {
+		header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+		exit();
+	}
+}
+else if ($action == 'delete')
+{
+	$result = $accounting->fetch($id);
+	
+	if (! empty($accounting->id)) {
+		$result = $accounting->delete($user);
+		
+		if ($result > 0) {
+			Header("Location: account.php");
+		}
+	}
+	
+	if ($result < 0) {
+		setEventMessage($accounting->error, 'errors');
+	}
+}
+
+/*
+ * View
+ *
+ */
+llxheader('', $langs->trans('AccountAccounting'));
+
+$form = new Form($db);
+$htmlacc = new FormVentilation($db);
+
+if ($action == 'create')
+{
+	print_fiche_titre($langs->trans('NewAccount'));
+	
+	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+	print '<input type="hidden" name="action" value="add">';
+	
+	print '<table class="border" width="100%">';
+	
+	print '<tr><td width="25%">' . $langs->trans("AccountNumber") . '</td>';
+	print '<td><input name="account_number" size="30" value="' . $accounting->account_number . '"</td></tr>';
+	print '<tr><td>' . $langs->trans("Label") . '</td>';
+	print '<td><input name="label" size="70" value="' . $accounting->label . '"</td></tr>';
+	print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
+	print '<td>';
+	print $htmlacc->select_account($accounting->account_parent, 'account_parent');
+	print '</td></tr>';
+	print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
+	print '<td>';
+	print $htmlacc->select_pcgtype($accounting->pcg_type, 'pcg_type');
+	print '</td></tr>';
+	print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
+	print '<td>';
+	print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcg_subtype');
+	print '</td></tr>';
+	
+	print '</table>';
+	
+	print '<br><center><input class="button" type="submit" value="' . $langs->trans("Save") . '"> &nbsp; &nbsp; ';
+	print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '"></center';
+	
+	print '</form>';
+}
+else if ($id)
+{
+	$rowid = $id;
+	$account = $accounting->fetch($rowid);
+	
+	if ($account > 0) {
+		dol_htmloutput_mesg($mesg);
+		
+		$head = accounting_prepare_head($accounting);
+		
+		if ($action == 'update')
+		{
+			$soc = new Societe($db);
+			if ($object->socid) {
+				$soc->fetch($object->socid);
+			}
+			
+			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
+			
+			print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="edit">';
+			print '<input type="hidden" name="id" value="' . $id . '">';
+			
+			print '<table class="border" width="100%">';
+			
+			print '<tr><td width="25%">' . $langs->trans("AccountNumber") . '</td>';
+			print '<td><input name="account_number" size="30" value="' . $accounting->account_number . '"</td></tr>';
+			print '<tr><td>' . $langs->trans("Label") . '</td>';
+			print '<td><input name="label" size="70" value="' . $accounting->label . '"</td></tr>';
+			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
+			print '<td>';
+			print $htmlacc->select_account($accounting->account_parent, 'account_parent');
+			print '</td></tr>';
+			print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
+			print '<td>';
+			print $htmlacc->select_pcgtype($accounting->pcg_type, 'pcg_type');
+			print '</td></tr>';
+			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
+			print '<td>';
+			print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcg_subtype');
+			print '</td></tr>';
+			
+			print '</table>';
+			
+			print '<br><center><input type="submit" class="button" value="' . $langs->trans("Save") . '"> &nbsp; ';
+			print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
+			print '</center>';
+			
+			print '</form>';
+			
+			print '</div>';
+		}
+		else
+		{
+			$linkback = '<a href="../admin/account.php">' . $langs->trans("BackToChartofaccounts") . '</a>';
+			
+			dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
+			
+			print '<table class="border" width="100%">';
+			
+			// Account number
+			print '<tr><td width="25%">' . $langs->trans("AccountNumber") . '</td>';
+			print '<td>' . $accounting->account_number . '</td>';
+			print '<td align="right" width="25%">' . $linkback . '</td></tr>';
+			
+			print '<tr><td>' . $langs->trans("Label") . '</td>';
+			print '<td colspan="2">' . $accounting->label . '</td></tr>';
+			
+			$accp = new AccountingAccount($db);
+			if (! empty($accounting->account_parent)) {
+				$accp->fetch($accounting->account_parent, '');
+			}
+			print '<tr><td>' . $langs->trans("Accountparent") . '</td>';
+			print '<td colspan="2">' . $accp->account_number . ' - ' . $accp->label . '</td></tr>';
+			
+			print '<tr><td>' . $langs->trans("Pcgtype") . '</td>';
+			print '<td colspan="2">' . $accounting->pcg_type . '</td></tr>';
+			
+			print '<tr><td>' . $langs->trans("Pcgsubtype") . '</td>';
+			print '<td colspan="2">' . $accounting->pcg_subtype . '</td></tr>';
+			
+			print '<tr><td>' . $langs->trans("Active") . '</td>';
+			print '<td colspan="2">';
+			
+			if (empty($accounting->active)) {
+				print img_picto($langs->trans("Disabled"), 'switch_off');
+			} else {
+				print img_picto($langs->trans("Activated"), 'switch_on');
+			}
+			
+			print '</td></tr>';
+			
+			print '</table>';
+			
+			print '</div>';
+			
+			/*
+			 * Barre d'actions
+			 */
+			
+			print '<div class="tabsAction">';
+			
+			if ($user->admin) {
+				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=update&id=' . $id . '">' . $langs->trans('Modify') . '</a>';
+			} else {
+				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Modify') . '</a>';
+			}
+			
+			if ($user->admin) {
+				print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+			} else {
+				print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>';
+			}
+			
+			print '</div>';
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
new file mode 100644
index 00000000000..d0eef1dc2f4
--- /dev/null
+++ b/htdocs/accountancy/admin/export.php
@@ -0,0 +1,164 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/export.php
+ * \ingroup		Accounting Expert
+ * \brief		Setup page to configure accounting expert module
+ */
+
+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';
+
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("admin");
+$langs->load("accountancy");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+$action = GETPOST('action', 'alpha');
+
+// Other parameters ACCOUNTING_*
+$list = array (
+		'ACCOUNTING_SEPARATORCSV'
+);
+
+/*
+ * Actions
+ */
+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 {
+		setEventMessage($langs->trans("Error"), 'errors');
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+
+$head = admin_accounting_prepare_head();
+
+dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');
+
+print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<table class="noborder" width="100%">';
+$var = true;
+
+print '<tr class="liste_titre">';
+print '<td colspan="2">' . $langs->trans("Modelcsv") . '</td>';
+print '</tr>';
+
+$var = ! $var;
+
+print '<tr ' . $bc[$var] . '>';
+print "<td>" . $langs->trans("Selectmodelcsv") . "</td>";
+print "<td>";
+print '<select class="flat" name="modelcsv" id="modelcsv">';
+print '<option value="0"';
+if ($conf->global->ACCOUNTING_MODELCSV == 0) {
+	print ' selected="selected"';
+}
+print '>' . $langs->trans("Modelcsv_normal") . '</option>';
+print '<option value="1"';
+if ($conf->global->ACCOUNTING_MODELCSV == 1) {
+	print ' selected="selected"';
+}
+print '>' . $langs->trans("Modelcsv_CEGID") . '</option>';
+print "</select>";
+print "</td></tr>";
+print "</table>";
+
+print "<br>\n";
+
+/*
+ *  Params
+ *
+ */
+
+$num = count($list);
+if ($num) {
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
+	print "</tr>\n";
+}
+
+foreach ( $list as $key ) {
+	$var = ! $var;
+
+	print '<tr ' . $bc[$var] . ' class="value">';
+
+	// Param
+	$label = $langs->trans($key);
+	print '<td>' . $label . '</td>';
+
+	// Value
+	print '<td>';
+	print '<input type="text" size="20" name="' . $key . '" value="' . $conf->global->$key . '">';
+	print '</td></tr>';
+}
+
+print '</form>';
+print "</table>\n";
+
+print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
new file mode 100644
index 00000000000..4dd005fca85
--- /dev/null
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -0,0 +1,131 @@
+<?php
+/* Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/accountancy/admin/fiscalyear.php
+ *		\ingroup    fiscal year
+ *		\brief      Setup page to configure fiscal year
+ */
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
+
+$action=GETPOST('action');
+
+$langs->load("admin");
+$langs->load("compta");
+
+if (! $user->admin) accessforbidden();
+
+$error=0;
+
+// List of statut
+static $tmpstatut2label=array(
+		'0'=>'OpenFiscalYear',
+		'1'=>'CloseFiscalYear'
+);
+$statut2label=array('');
+foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
+
+$errors=array();
+
+$object = new Fiscalyear($db);
+
+/*
+ * Actions
+ */
+
+/*
+ * View
+ */
+
+$max=100;
+
+$form = new Form($db);
+
+$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";
+$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as f";
+$sql.= " WHERE f.entity = ".$conf->entity;
+
+$result = $db->query($sql);
+if ($result)
+{
+	$var=false;
+    $num = $db->num_rows($result);
+
+    $i = 0;
+
+	// Load attribute_label
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Ref").'</td>';
+	print '<td>'.$langs->trans("Label").'</td>';
+	print '<td>'.$langs->trans("DateStart").'</td>';
+	print '<td>'.$langs->trans("DateEnd").'</td>';
+	print '<td align="right">'.$langs->trans("Statut").'</td>';
+	print '</tr>';
+
+	if ($num)
+    {
+	    $fiscalyearstatic=new Fiscalyear($db);
+
+		while ($i < $num && $i < $max)
+        {
+            $obj = $db->fetch_object($result);
+            $fiscalyearstatic->ref=$obj->rowid;
+            $fiscalyearstatic->id=$obj->rowid;
+            print '<tr '.$bc[$var].'>';
+			print '<td><a href="fiscalyear_card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowFiscalYear"),"technic").' '.$obj->rowid.'</a></td>';
+            print '<td align="left">'.$obj->label.'</td>';
+            print '<td align="left">'.dol_print_date($db->jdate($obj->date_start),'day').'</td>';
+			print '<td align="left">'.dol_print_date($db->jdate($obj->date_end),'day').'</td>';
+            print '<td align="right">'.$fiscalyearstatic->LibStatut($obj->statut,5).'</td>';
+            print '</tr>';
+            $var=!$var;
+            $i++;
+        }
+
+    }
+    else
+    {
+        print '<tr '.$bc[$var].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
+    }
+
+	print '</table>';
+}
+else
+{
+	dol_print_error($db);
+}
+
+dol_fiche_end();
+
+// Buttons
+print '<div class="tabsAction">';
+print '<a class="butAction" href="fiscalyear_card.php?action=create">'.$langs->trans("NewFiscalYear").'</a>';
+print '</div>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
new file mode 100644
index 00000000000..423ac88b490
--- /dev/null
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -0,0 +1,334 @@
+<?php
+/* Copyright (C) 2014	Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       	htdocs/accountancy/admin/fiscalyear_card.php
+ *  \brief      	Page to show a fiscal year
+ */
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
+
+
+$langs->load("admin");
+$langs->load("compta");
+
+// Security check
+if (! $user->admin) accessforbidden();
+
+$error=0;
+
+$action = GETPOST('action','alpha');
+$confirm = GETPOST('confirm','alpha');
+$id = GETPOST('id','int');
+
+// List of statut
+static $tmpstatut2label=array(
+		'0'=>'OpenFiscalYear',
+		'1'=>'CloseFiscalYear'
+);
+$statut2label=array('');
+foreach ($tmpstatut2label as $key => $val) $statut2label[$key]=$langs->trans($val);
+
+$object = new Fiscalyear($db);
+
+$date_start=dol_mktime(0,0,0,GETPOST('fiscalyearmonth','int'),GETPOST('fiscalyearday','int'),GETPOST('fiscalyearyear','int'));
+$date_end=dol_mktime(0,0,0,GETPOST('fiscalyearendmonth','int'),GETPOST('fiscalyearendday','int'),GETPOST('fiscalyearendyear','int'));
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'confirm_delete' && $confirm == "yes")
+{
+    $result=$object->delete($id);
+    if ($result >= 0)
+    {
+        header("Location: fiscalyear.php");
+        exit;
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+else if ($action == 'add')
+{
+    if (! GETPOST('cancel','alpha'))
+    {
+        $error=0;
+
+		$object->date_start		= $date_start;
+	    $object->date_end		= $date_end;
+		$object->label			= GETPOST('label','alpha');
+        $object->statut     	= GETPOST('statut','int');
+		$object->datec			= dol_now();
+
+        if (empty($object->date_start) && empty($object->date_end))
+        {
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
+            $error++;
+        }
+        if (empty($object->label))
+        {
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Label")), 'errors');
+            $error++;
+        }
+
+        if (! $error)
+        {
+			$db->begin();
+
+        	$id = $object->create($user);
+
+            if ($id > 0)
+            {
+            	$db->commit();
+
+                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+                exit;
+            }
+            else
+           {
+            	$db->rollback();
+
+            	setEventMessage($object->error, 'errors');
+                $action='create';
+            }
+        }
+        else
+       {
+            $action='create';
+        }
+    }
+    else
+    {
+        header("Location: ./fiscalyear.php");
+        exit;
+    }
+}
+
+// Update record
+else if ($action == 'update')
+{
+    if (! GETPOST('cancel','alpha'))
+    {
+        $result = $object->fetch($id);
+
+		$object->date_start	= empty($_POST["fiscalyear"])?'':$date_start;
+		$object->date_end	= empty($_POST["fiscalyearend"])?'':$date_end;
+		$object->label		= GETPOST('label','alpha');
+		$object->statut     = GETPOST('statut','int');
+
+        $result = $object->update($user);
+
+        if ($result > 0)
+        {
+            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+            exit;
+        }
+        else
+        {
+	        setEventMessage($object->error, 'errors');
+        }
+    }
+    else
+    {
+        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+        exit;
+    }
+}
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+/*
+ * Action create
+*/
+if ($action == 'create')
+{
+    print_fiche_titre($langs->trans("NewFiscalYear"));
+
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+
+    print '<table class="border" width="100%">';
+
+	// Label
+    print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="32" value="' . GETPOST("label") . '"></td></tr>';
+
+	// Date start
+    print '<tr><td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
+    print $form->select_date(($date_start?$date_start:''),'fiscalyear');
+    print '</td></tr>';
+
+    // Date end
+    print '<tr><td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
+    print $form->select_date(($date_end?$date_end:-1),'fiscalyearend');
+    print '</td></tr>';
+
+	// Statut
+    print '<tr>';
+    print '<td class="fieldrequired">'.$langs->trans("Statut").'</td>';
+	print '<td class="valeur">';
+	print $form->selectarray('statut',$statut2label,GETPOST('statut'));
+    print '</td></tr>';
+
+    print '</table>';
+
+    print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; ';
+    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></center';
+
+    print '</form>';
+}
+else if ($id)
+{
+    $result = $object->fetch($id);
+    if ($result > 0)
+    {
+        $head = fiscalyear_prepare_head($object);
+
+        if ($action == 'edit')
+        {
+        	dol_fiche_head($head, 'card', $langs->trans("FiscalYearCard"), 0, 'cron');
+
+        	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="id" value="'.$id.'">';
+
+            print '<table class="border" width="100%">';
+
+            // Ref
+            print "<tr>";
+            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
+            print $object->ref;
+            print '</td></tr>';
+
+            // Label
+            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
+            print '<input name="label" class="flat" size="32" value="'.$object->label.'">';
+            print '</td></tr>';
+
+			// Date start
+            print '<tr><td class="fieldrequired">'.$langs->trans("DateStart").'</td><td>';
+            print $form->select_date($object->date_start?$object->date_start:-1,'fiscalyear');
+            print '</td></tr>';
+
+            // Date end
+            print '<tr><td class="fieldrequired">'.$langs->trans("DateEnd").'</td><td>';
+            print $form->select_date($object->date_end?$object->date_end:-1,'fiscalyearend');
+            print '</td></tr>';
+
+			// Statut
+			print '<tr><td>'.$langs->trans("Statut").'</td><td>';
+			print $form->selectarray('statut',$statut2label,$object->statut);
+			print '</td></tr>';
+
+            print '</table>';
+
+            print '<br><center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
+            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+            print '</center>';
+
+            print '</form>';
+
+            dol_fiche_end();
+        }
+        else
+        {
+            /*
+             * Confirm delete
+            */
+            if ($action == 'delete')
+            {
+                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteFiscalYear"),$langs->trans("ConfirmDeleteFiscalYear"),"confirm_delete");
+
+            }
+
+        	dol_fiche_head($head, 'card', $langs->trans("FiscalYearCard"), 0, 'cron');
+
+        	print '<table class="border" width="100%">';
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/admin/fiscalyear.php">'.$langs->trans("BackToList").'</a>';
+
+            // Ref
+            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td width="50%">';
+            print $object->ref;
+			print '</td><td width="25%">';
+			print $linkback;
+            print '</td></tr>';
+
+			// Label
+            print '<tr><td valign="top">';
+            print $form->editfieldkey("Label",'label',$object->label,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'alpha:32');
+            print '</td><td colspan="2">';
+            print $form->editfieldval("Label",'label',$object->label,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'alpha:32');
+            print "</td></tr>";
+
+            // Date start
+            print '<tr><td>';
+            print $form->editfieldkey("Date",'date_start',$object->date_start,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
+            print '</td><td colspan="2">';
+            print $form->editfieldval("Date",'date_start',$object->date_start,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
+            print '</td></tr>';
+
+			// Date end
+            print '<tr><td>';
+            print $form->editfieldkey("Date",'date_end',$object->date_end,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
+            print '</td><td colspan="2">';
+            print $form->editfieldval("Date",'date_end',$object->date_end,$object,$conf->global->MAIN_EDIT_ALSO_INLINE,'datepicker');
+            print '</td></tr>';
+
+            // Statut
+            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">'.$object->getLibStatut(4).'</td></tr>';
+
+            print "</table>";
+
+            dol_fiche_end();
+
+            /*
+             * Barre d'actions
+            */
+
+            print '<div class="tabsAction">';
+
+            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+
+			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
+
+            print '</div>';
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
new file mode 100644
index 00000000000..b6fa546edff
--- /dev/null
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -0,0 +1,60 @@
+<?php
+/* Copyright (C) 2014	Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ *
+ * 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, seehttp://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       	htdocs/accountancy/admin/fiscalyear_card.php
+ *  \brief      	Page to show info of a fiscal year
+ */
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
+
+
+$langs->load("admin");
+$langs->load("compta");
+
+// Security check
+if (! $user->admin) accessforbidden();
+
+$id = GETPOST('id','int');
+
+// View
+llxHeader();
+
+if ($id)
+{
+	$object = new Fiscalyear($db);
+	$object->fetch($id);
+	$object->info($id);
+
+	$head = fiscalyear_prepare_head($object);
+
+	dol_fiche_head($head, 'info', $langs->trans("FiscalYearCard"), 0, 'cron');
+
+    print '<table width="100%"><tr><td>';
+    dol_print_object_info($object);
+    print '</td></tr></table>';
+
+    print '</div>';
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
new file mode 100644
index 00000000000..9e5c59f4555
--- /dev/null
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -0,0 +1,186 @@
+<?php
+/* 
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com> 
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file			htdocs/accountancy/admin/importaccounts.php
+ * \ingroup			Accounting Expert
+ * \brief			Page import accounting account
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+// langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("main");
+$langs->load("accountancy");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+llxHeader('', $langs->trans("ImportAccount"));
+
+$to_import = GETPOST("mesCasesCochees");
+
+if ($_POST["action"] == 'import') {
+	print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
+	if (is_array($to_import) && count($to_import) > 0) {
+		print '<div><font color="red">' . count($to_import) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
+		$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
+		
+		$result = $db->query($sql);
+		if ($result && ($db->num_rows($result) > 0)) {
+			
+			$obj = $db->fetch_object($result);
+			
+			$cpt = 0;
+			foreach ( $to_import as $maLigneCochee ) {
+				
+				$accounting = new AccountingAccount($db);
+				
+				$monLabel = GETPOST('label' . $maLigneCochee);
+				$monParentAccount = GETPOST('AccountParent' . $maLigneCochee);
+				$monType = GETPOST('pcgType' . $maLigneCochee);
+				$monSubType = GETPOST('pcgSubType' . $maLigneCochee);
+				
+				$accounting->fk_pcg_version = $obj->pcg_version;
+				$accounting->account_number = $maLigneCochee;
+				$accounting->label = $monLabel;
+				$accounting->account_parent = $monParentAccount;
+				$accounting->pcg_type = $monType;
+				$accounting->pcg_subtype = $monSubType;
+				$accounting->active = 1;
+				
+				$result = $accounting->create($user);
+				if ($result > 0) {
+					setEventMessage($langs->trans("AccountingAccountAdd"), 'mesgs');
+				} else {
+					setEventMessage($accounting->error, 'errors');
+				}
+				$cpt ++;
+			}
+		} else {
+			setEventMessage($langs->trans('AccountPlanNotFoundCheckSetting'), 'errors');
+		}
+	} else {
+		print '<div><font color="red">' . $langs->trans("AnyLineImport") . '</font></div>';
+	}
+	print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
+}
+
+/*
+* list accounting account from product 
+*
+*/
+$page = GETPOST("page");
+if ($page < 0)
+	$page = 0;
+$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+$offset = $limit * $page;
+
+$sql = "(SELECT p.rowid as product_id, p.accountancy_code_sell as accounting ";
+$sql .= " FROM  " . MAIN_DB_PREFIX . "product as p ";
+$sql .= " WHERE p.accountancy_code_sell >=0";
+$sql .= " GROUP BY accounting ";
+$sql .= ")";
+$sql .= "UNION ALL(SELECT p.rowid as product_id, p.accountancy_code_buy as accounting ";
+$sql .= " FROM  " . MAIN_DB_PREFIX . "product as p ";
+$sql .= " WHERE p.accountancy_code_buy >=0";
+$sql .= " GROUP BY accounting ";
+$sql .= ") ";
+$sql .= " ORDER BY accounting DESC " . $db->plimit($limit + 1, $offset);
+
+dol_syslog('accountancy/admin/importaccounts.php:: $sql=' . $sql);
+$result = $db->query($sql);
+if ($result) {
+	$num_lines = $db->num_rows($result);
+	$i = 0;
+	print_barre_liste($langs->trans("ImportAccount"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
+	
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>' . $langs->trans("accountingaccount") . '</td>';
+	print '<td>' . $langs->trans("label") . '</td>';
+	print '<td>' . $langs->trans("Accountparent") . '</td>';
+	print '<td>' . $langs->trans("Pcgtype") . '</td>';
+	print '<td>' . $langs->trans("Pcgsubtype") . '</td>';
+	print '<td align="center">' . $langs->trans("Import") . '</td>';
+	print '</tr>';
+	
+	$form = new Form($db);
+	$htmlacc = new FormVentilation($db);
+	
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+	print '<input type="hidden" name="action" value="import">';
+	
+	$var = true;
+	while ( $i < min($num_lines, $limit) ) {
+		$objp = $db->fetch_object($result);
+		$var = ! $var;
+		print "<tr $bc[$var]>";
+		
+		print '<td align="left">';
+		print $objp->accounting;
+		print '</td>';
+		
+		print '<td align="left">';
+		print '<input name="label" size="30" value="">';
+		print '</td>';
+		
+		// Colonne choix du compte
+		print '<td>';
+		print $htmlacc->select_account($accounting->account_parent, 'AccountParent');
+		print '</td>';
+		
+		print '<td>';
+		print $htmlacc->select_pcgtype($accounting->pcg_type, 'pcgType');
+		print '</td>';
+		
+		print '<td>';
+		print $htmlacc->select_pcgsubtype($accounting->pcg_subtype, 'pcgSubType');
+		print '</td>';
+		
+		// Colonne choix ligne a ventiler
+		
+		$checked = ('label' == 'O') ? ' checked=checked' : '';
+		
+		print '<td align="center">';
+		print '<input type="checkbox" name="mesCasesCochees[]" ' . $checked . ' value="' . $objp->accounting . '"/>';
+		print '</td>';
+		
+		print '</tr>';
+		$i ++;
+	}
+	
+	print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Import") . '"></td></tr>';
+	
+	print '</table>';
+	print '</form>';
+} else {
+	print $db->error();
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/exec-always/empty b/htdocs/accountancy/admin/index.html
similarity index 100%
rename from dev/vagrant/dolibarrdev/puphpet/files/exec-always/empty
rename to htdocs/accountancy/admin/index.html
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
new file mode 100644
index 00000000000..e72df6a0431
--- /dev/null
+++ b/htdocs/accountancy/admin/index.php
@@ -0,0 +1,294 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/index.php
+ * \ingroup		Accounting Expert
+ * \brief		Setup page to configure accounting expert module
+ */
+
+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';
+
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("admin");
+$langs->load("accountancy");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+$action = GETPOST('action', 'alpha');
+
+// Other parameters ACCOUNTING_*
+$list = array (
+		'ACCOUNTING_LIMIT_LIST_VENTILATION',
+		'ACCOUNTING_LENGTH_GACCOUNT',
+		'ACCOUNTING_LENGTH_AACCOUNT',
+		'ACCOUNTING_ACCOUNT_CUSTOMER',
+		'ACCOUNTING_ACCOUNT_SUPPLIER',
+		'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
+		'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
+		'ACCOUNTING_SERVICE_BUY_ACCOUNT',
+		'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+		'ACCOUNTING_ACCOUNT_SUSPENSE',
+		'ACCOUNTING_ACCOUNT_TRANSFER_CASH' 
+);
+
+/*
+ * Actions
+ */
+ 
+$accounting_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES';
+
+if ($action == 'update')
+{
+    $error = 0;
+
+    $accounting_modes = array(
+        'RECETTES-DEPENSES',
+        'CREANCES-DETTES'
+    );
+
+    $accounting_mode = GETPOST('accounting_mode','alpha');
+	
+	if (in_array($accounting_mode,$accounting_modes)) {
+
+        if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
+            $error++;
+        }
+    } else {
+        $error++;
+    }
+	
+	$chartofaccounts = GETPOST('chartofaccounts', 'int');
+	
+	if (! empty($chartofaccounts)) {
+		
+		if (! dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts, '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
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+if ($action == 'setlistsorttodo') {
+	$setlistsorttodo = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
+	if (! $res > 0)
+		$error ++;
+	
+	if (! $error) {
+		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+	} else {
+		setEventMessage($langs->trans("Error"), 'mesgs');
+	}
+}
+
+if ($action == 'setlistsortdone') {
+	$setlistsortdone = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
+	if (! $res > 0)
+		$error ++;
+	if (! $error) {
+		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+	} else {
+		setEventMessage($langs->trans("Error"), 'mesgs');
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+
+$head = admin_accounting_prepare_head($accounting);
+
+dol_fiche_head($head, 'general', $langs->trans("Configuration"), 0, 'cron');
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<table class="noborder" width="100%">';
+
+// Cas du parametre ACCOUNTING_MODE
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
+print "</tr>\n";
+print '<tr '.$bc[false].'><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
+// Write info on way to count VAT
+//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+//{
+//	//	print "<br>\n";
+//	//	print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
+//}
+//else
+//{
+//	//	print "<br>\n";
+//	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
+//}
+print "</td></tr>\n";
+print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
+print '</form>';
+
+print "</table>\n";
+
+print "<br>\n";
+
+/*
+ *  Define Chart of accounts
+ */
+print '<table class="noborder" width="100%">';
+$var = true;
+
+print '<tr class="liste_titre">';
+print '<td colspan="3">';
+print $langs->trans("Chartofaccounts") . '</td>';
+print "</tr>\n";
+$var = ! $var;
+print '<tr ' . $bc[$var] . '>';
+print "<td>" . $langs->trans("Selectchartofaccounts") . "</td>";
+print "<td>";
+print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
+
+$sql = "SELECT rowid, pcg_version, fk_pays, label, active";
+$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_system";
+$sql .= " WHERE active = 1";
+$sql .= " AND fk_pays = " . $mysoc->country_id;
+
+dol_syslog('accountancy/admin/index.php:: $sql=' . $sql);
+$resql = $db->query($sql);
+
+$var = true;
+
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ( $i < $num ) {
+		$var = ! $var;
+		$row = $db->fetch_row($resql);
+		
+		print '<option value="' . $row[0] . '"';
+		print $conf->global->CHARTOFACCOUNTS == $row[0] ? ' selected="selected"' : '';
+		print '>' . $row[1] . ' - ' . $row[3] . '</option>';
+		
+		$i ++;
+	}
+}
+print "</select>";
+print "</td></tr>";
+print "</table>";
+
+print "<br>\n";
+
+/*
+ *  Others params
+ */
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="3">' . $langs->trans('OtherOptions') . '</td>';
+print "</tr>\n";
+
+foreach ($list as $key)
+{
+	$var=!$var;
+
+	print '<tr '.$bc[$var].' class="value">';
+
+	// Param
+	$label = $langs->trans($key); 
+	print '<td><label for="'.$key.'">'.$label.'</label></td>';
+
+	// Value
+	print '<td>';
+	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td></tr>';
+}
+
+$var = ! $var;
+print "<tr " . $bc[$var] . ">";
+print '<td width="80%">' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO") . '</td>';
+if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
+	print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsorttodo&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+$var = ! $var;
+print "<tr " . $bc[$var] . ">";
+print '<td width="80%">' . $langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE") . '</td>';
+if (! empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
+	print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setlistsortdone&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+print '</form>';
+print "</table>\n";
+
+print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/admin/journaux.php b/htdocs/accountancy/admin/journaux.php
new file mode 100644
index 00000000000..f7507cda234
--- /dev/null
+++ b/htdocs/accountancy/admin/journaux.php
@@ -0,0 +1,172 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/journaux.php
+ * \ingroup		Accounting Expert
+ * \brief		Setup page to configure accounting expert module
+ */
+
+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';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("accountancy");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+$action = GETPOST('action', 'alpha');
+
+// Other parameters ACCOUNTING_*
+$list = array (
+		'ACCOUNTING_SELL_JOURNAL',
+		'ACCOUNTING_PURCHASE_JOURNAL',
+		'ACCOUNTING_SOCIAL_JOURNAL',
+		'ACCOUNTING_CASH_JOURNAL',
+		'ACCOUNTING_MISCELLANEOUS_JOURNAL' 
+);
+
+/*
+ * Actions
+ */
+
+if ($action == 'update') {
+	$error = 0;
+	
+	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 {
+		setEventMessage($langs->trans("Error"), 'errors');
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans('ConfigAccountingExpert'),$linkback,'setup');
+
+$head = admin_accounting_prepare_head(null);
+
+dol_fiche_head($head, 'journal', $langs->trans("Configuration"), 0, 'cron');
+
+print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="3">' . $langs->trans('Journaux') . '</td>';
+print "</tr>\n";
+
+foreach ( $list as $key ) {
+	$var = ! $var;
+	
+	print '<tr ' . $bc[$var] . ' class="value">';
+	
+	// Param
+	$label = $langs->trans($key);
+	print '<td width="50%"><label for="' . $key . '">' . $label . '</label></td>';
+	
+	// Value
+	print '<td>';
+	print '<input type="text" size="20" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
+	print '</td></tr>';
+}
+
+print '</form>';
+print "</table>\n";
+
+print '<br /><div style="text-align:center"><input type="submit" class="button" value="' . $langs->trans('Modify') . '" name="button"></div>';
+
+print '<br />';
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="3">' . $langs->trans('JournalFinancial') . '</td>';
+print "</tr>\n";
+
+// Bank account
+$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);
+		
+		$var = ! $var;
+	
+		print '<tr ' . $bc[$var] . ' class="value">';
+		
+		// Param
+		print '<td width="50%"><label for="' . $objp->rowid . '">' . $langs->trans("Journal") . ' - ' . $objp->label . '</label></td>';
+	
+		// Value
+		print '<td>';
+		print '<input type="text" size="20" id="' . $objp->rowid . '" name="' . $objp->label . '" value="' . $objp->accountancy_journal . '" disabled>';
+		print '</td></tr>';
+
+		$i++;
+	}
+}
+else dol_print_error($db);
+$db->free($resql);
+
+print "</table>\n";
+
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
new file mode 100644
index 00000000000..402ff72ed84
--- /dev/null
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -0,0 +1,147 @@
+<?PHP
+/*
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/admin/productaccount.php
+ * \ingroup		Accounting Expert
+ * \brief		Onglet de gestion de parametrages des ventilations
+ */
+
+// Dolibarr environment
+$res = @include ("../main.inc.php");
+if (! $res && file_exists("../main.inc.php"))
+	$res = @include ("../main.inc.php");
+if (! $res && file_exists("../../main.inc.php"))
+	$res = @include ("../../main.inc.php");
+if (! $res && file_exists("../../../main.inc.php"))
+	$res = @include ("../../../main.inc.php");
+if (! $res)
+	die("Include of main fails");
+
+	// Class
+dol_include_once("/core/lib/report.lib.php");
+dol_include_once("/core/lib/date.lib.php");
+dol_include_once("/product/class/product.class.php");
+
+$langs->load("companies");
+$langs->load("compta");
+$langs->load("main");
+$langs->load("accountancy");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+llxHeader('', $langs->trans("Accounts"));
+
+$form = new Form($db);
+
+print '<input type="button" class="button" style="float: right;" value="Renseigner les comptes comptables produits manquant" onclick="launch_export();" />';
+
+print '
+	<script type="text/javascript">
+		function launch_export() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+</script>';
+
+$sql = "SELECT p.rowid, p.ref , p.label, p.description , p.accountancy_code_sell as codesell, p.accountancy_code_buy, p.tms, p.fk_product_type as product_type , p.tosell , p.tobuy ";
+$sql .= " FROM " . MAIN_DB_PREFIX . "product as p";
+$sql .= " WHERE p.accountancy_code_sell IS NULL  AND p.tosell = 1  OR p.accountancy_code_buy IS NULL AND p.tobuy = 1";
+
+dol_syslog('accountancy/admin/productaccount.php:: $sql=' . $sql);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	/*
+* view
+*/
+
+	print '<br><br>';
+
+	print '<table class="noborder" width="100%">';
+	print '<td align="left">' . $langs->trans("Ref") . '</td>';
+	print '<td align="left">' . $langs->trans("Label") . '</td>';
+	print '<td align="left">' . $langs->trans("Description") . '</td>';
+	print '<td align="left">' . $langs->trans("Accountancy_code_buy") . '</td>';
+	print '<td align="left">' . $langs->trans("Accountancy_code_buy_suggest") . '</td>';
+	print '<td align="left">' . $langs->trans("Accountancy_code_sell") . '</td>';
+	print '<td align="left">' . $langs->trans("Accountancy_code_sell_suggest") . '</td>';
+
+	$var = true;
+
+	while ( $i < min($num, 250) ) {
+		$obj = $db->fetch_object($resql);
+		$var = ! $var;
+
+		$compta_prodsell = $obj->accountancy_code_sell;
+		if (empty($compta_prodsell)) {
+			if ($obj->product_type == 0)
+				$compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+			else
+				$compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+		}
+
+		$compta_prodbuy = $obj->accountancy_code_buy;
+		if (empty($compta_prodbuy)) {
+			if ($obj->product_type == 0)
+				$compta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+			else
+				$compta_prodbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+		}
+
+		$product_static = new Product($db);
+
+		print "<tr $bc[$var]>";
+		// Ref produit
+		$product_static->ref = $objp->ref;
+		$product_static->id = $objp->rowid;
+		$product_static->type = $objp->type;
+		print '<td>';
+		if ($product_static->id)
+			print $product_static->getNomUrl(1);
+		else
+			print '&nbsp;';
+		print '</td>';
+		print '<td align="left">' . $obj->ref . '</td>';
+		print '<td align="left">' . $obj->label . '</td>';
+		print '<td align="left">' . $obj->description . '</td>';
+
+		print '<td align="left">' . $obj->accountancy_code_buy . '</td>';
+		print '<td align="left">' . $compta_prodbuy . '</td>';
+
+		print '<td align="left">' . $obj->accountancy_code_sell . '</td>';
+		print '<td align="left">' . $compta_prodsell . '</td>';
+
+		print "</tr>\n";
+		$i ++;
+	}
+	print "</table>";
+	$db->free($resql);
+} else {
+	dol_print_error($db);
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
new file mode 100644
index 00000000000..120d08db09c
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -0,0 +1,134 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/bookkeeping/balancebymonth.php
+ * \ingroup		Accounting Expert
+ * \brief		Balance by month
+ */
+
+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';
+
+// Langs
+$langs->load("main");
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("accountancy");
+
+// Filter
+$year = $_GET["year"];
+if ($year == 0) {
+	$year_current = strftime("%Y", time());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
+}
+
+/*
+ * View
+ */
+llxHeader('', $langs->trans("CustomersVentilation"));
+
+$textprevyear = "<a href=\"balancebymonth.php?year=" . ($year_current - 1) . "\">" . img_previous() . "</a>";
+$textnextyear = " <a href=\"balancebymonth.php?year=" . ($year_current + 1) . "\">" . img_next() . "</a>";
+
+print_fiche_titre($langs->trans("AccountBalanceByMonth") . ' ' . $textprevyear . ' ' . $langs->trans("Year") . ' ' . $year_start . ' ' . $textnextyear);
+
+$sql = "SELECT count(*) FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$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/bookkeeping/balancebymonth.php:: $sql=' . $sql);
+$result = $db->query($sql);
+if ($result) {
+	$row = $db->fetch_row($result);
+	$nbfac = $row[0];
+	
+	$db->free($result);
+}
+
+$y = $year_current;
+
+$var = true;
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width=150>' . $langs->trans("Label") . '</td><td align="center">' . $langs->trans("JanuaryMin") . '</td><td align="center">' . $langs->trans("FebruaryMin") . '</td><td align="center">' . $langs->trans("MarchMin") . '</td><td align="center">' . $langs->trans("AprilMin") . '</td><td align="center">' . $langs->trans("MayMin") . '</td><td align="center">' . $langs->trans("JuneMin") . '</td><td align="center">' . $langs->trans("JulyMin") . '</td><td align="center">' . $langs->trans("AugustMin") . '</td><td align="center">' . $langs->trans("SeptemberMin") . '</td><td align="center">' . $langs->trans("OctoberMin") . '</td><td align="center">' . $langs->trans("NovemberMin") . '</td><td align="center">' . $langs->trans("DecemberMin") . '</td><td align="center"><b>Total</b></td></tr>';
+
+$sql = "SELECT bk.numero_compte AS 'compte',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=1,bk.montant,0)),2) AS 'Janvier',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=2,bk.montant,0)),2) AS 'Fevrier',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=3,bk.montant,0)),2) AS 'Mars',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=4,bk.montant,0)),2) AS 'Avril',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=5,bk.montant,0)),2) AS 'Mai',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=6,bk.montant,0)),2) AS 'Juin',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=7,bk.montant,0)),2) AS 'Juillet',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=8,bk.montant,0)),2) AS 'Aout',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=9,bk.montant,0)),2) AS 'Septembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=10,bk.montant,0)),2) AS 'Octobre',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=11,bk.montant,0)),2) AS 'Novembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(bk.doc_date)=12,bk.montant,0)),2) AS 'Decembre',";
+$sql .= "  ROUND(SUM(bk.montant),2) as 'Total'";
+$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+$sql .= " WHERE bk.doc_date >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+$sql .= "  AND bk.doc_date <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+$sql .= " GROUP BY bk.numero_compte";
+
+$resql = $db->query($sql);
+if ($resql) {
+	$i = 0;
+	$num = $db->num_rows($resql);
+	
+	while ( $i < $num ) {
+		
+		$row = $db->fetch_row($resql);
+		
+		print '<tr><td width="14%">' . length_accountg($row[0]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[1]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[2]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[3]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[4]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[5]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[6]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[7]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[8]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[9]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[10]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[11]) . '</td>';
+		print '<td align="right" width="6.5%">' . price($row[12]) . '</td>';
+		print '<td align="right" width="8%"><b>' . price($row[13]) . '</b></td>';
+		print '</tr>';
+		
+		$i ++;
+	}
+	$db->free($resql);
+} else {
+	print $db->lasterror();
+}
+print "</table>\n";
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
new file mode 100644
index 00000000000..608c62cf1d0
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -0,0 +1,371 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/bookkeeping/card.php
+ * \ingroup		Accounting Expert
+ * \brief		Page to show account
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+
+// Langs
+$langs->load("accounting");
+
+// Security check
+$id = GETPOST('id', 'int');
+if ($user->societe_id > 0)
+	accessforbidden();
+
+$action = GETPOST('action');
+$piece_num = GETPOST("piece_num");
+
+$mesg = '';
+
+$numero_compte = GETPOST('numero_compte');
+$code_tiers = GETPOST('code_tiers');
+$label_compte = GETPOST('label_compte');
+$debit = price2num(GETPOST('debit'));
+$credit = price2num(GETPOST('credit'));
+
+if ($action == "confirm_update") {
+	
+	$error = 0;
+	
+	if ((intval($debit) != 0) && (intval($credit) != 0)) {
+		setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
+		$error ++;
+	}
+	
+	if (empty($error)) {
+		$book = new BookKeeping($db);
+		
+		$result = $book->fetch($id);
+		if ($result < 0) {
+			setEventMessage($book->errors, 'errors');
+		} else {
+			$book->numero_compte = $numero_compte;
+			$book->code_tiers = $code_tiers;
+			$book->label_compte = $label_compte;
+			$book->debit = $debit;
+			$book->credit = $credit;
+			
+			if (! empty($debit)) {
+				$book->montant = $debit;
+				$book->sens = 'D';
+			}
+			if (! empty($credit)) {
+				$book->montant = $credit;
+				$book->sens = 'C';
+			}
+			
+			$result = $book->update();
+			if ($result < 0) {
+				setEventMessage($book->errors, 'errors');
+			} else {
+				setEventMessage($langs->trans('Saved'), 'mesgs');
+				$action = '';
+			}
+		}
+	}
+} 
+
+else if ($action == "add") {
+	
+	$error = 0;
+	if ((intval($debit) != 0) && (intval($credit) != 0)) {
+		setEventMessage($langs->trans('ErrorDebitCredit'), 'errors');
+		$error ++;
+	}
+	
+	if (empty($error)) {
+		$book = new BookKeeping($db);
+		
+		$book->numero_compte = $numero_compte;
+		$book->code_tiers = $code_tiers;
+		$book->label_compte = $label_compte;
+		$book->debit = $debit;
+		$book->credit = $credit;
+		$book->doc_date = GETPOST('doc_date');
+		$book->doc_type = GETPOST('doc_type');
+		$book->piece_num = $piece_num;
+		$book->doc_ref = GETPOST('doc_ref');
+		$book->code_journal = GETPOST('code_journal');
+		$book->fk_doc = GETPOST('fk_doc');
+		$book->fk_docdet = GETPOST('fk_docdet');
+		
+		if (! empty($debit)) {
+			$book->montant = $debit;
+			$book->sens = 'D';
+		}
+		if (! empty($credit)) {
+			$book->montant = $credit;
+			$book->sens = 'C';
+		}
+		
+		$result = $book->create_std($user);
+		if ($result < 0) {
+			setEventMessage($book->errors, 'errors');
+		} else {
+			setEventMessage($langs->trans('Saved'), 'mesgs');
+			$action = '';
+		}
+	}
+} 
+
+else if ($action == "confirm_delete") {
+	$book = new BookKeeping($db);
+	
+	$result = $book->fetch($id);
+	
+	$piece_num = $book->piece_num;
+	
+	if ($result < 0) {
+		setEventMessage($book->errors, 'errors');
+	} else {
+		$result = $book->delete($user);
+		if ($result < 0) {
+			setEventMessage($book->errors, 'errors');
+		}
+	}
+	$action = '';
+} 
+
+else if ($action == "confirm_create") {
+	$book = new BookKeeping($db);
+	
+	$book->label_compte = '';
+	$book->debit = 0;
+	$book->credit = 0;
+	$book->doc_date = $date_start = dol_mktime(0, 0, 0, GETPOST('doc_datemonth'), GETPOST('doc_dateday'), GETPOST('doc_dateyear'));
+	$book->doc_type = GETPOST('doc_type');
+	$book->piece_num = GETPOST('next_num_mvt');
+	$book->doc_ref = GETPOST('doc_ref');
+	$book->code_journal = GETPOST('code_journal');
+	$book->fk_doc = 0;
+	$book->fk_docdet = 0;
+	
+	$book->montant = 0;
+	
+	$result = $book->create_std($user);
+	if ($result < 0) {
+		setEventMessage($book->errors, 'errors');
+	} else {
+		setEventMessage($langs->trans('Saved'), 'mesgs');
+		$action = '';
+		$piece_num = $book->piece_num;
+	}
+}
+
+llxHeader();
+
+$html = new Form($db);
+
+/*
+ *	Confirmation to delete the command
+ */
+if ($action == 'delete') {
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+	print $formconfirm;
+}
+
+if ($action == 'create') {
+	
+	print_fiche_titre($langs->trans("CreateMvts"));
+	
+	$code_journal_array = array (
+			$conf->global->ACCOUNTING_SELL_JOURNAL => $conf->global->ACCOUNTING_SELL_JOURNAL,
+			$conf->global->ACCOUNTING_PURCHASE_JOURNAL => $conf->global->ACCOUNTING_PURCHASE_JOURNAL,
+			$conf->global->ACCOUNTING_BANK_JOURNAL => $conf->global->ACCOUNTING_BANK_JOURNAL,
+			$conf->global->ACCOUNTING_SOCIAL_JOURNAL => $conf->global->ACCOUNTING_SOCIAL_JOURNAL 
+	);
+	
+	$book = new BookKeeping($db);
+	$next_num_mvt = $book->getNextNumMvt();
+	
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" name="create_mvt" method="POST">';
+	print '<input type="hidden" name="action" value="confirm_create">' . "\n";
+	print '<input type="hidden" name="next_num_mvt" value="' . $next_num_mvt . '">' . "\n";
+	
+	print '<table class="border" width="100%">';
+	print '<tr class="pair">';
+	print '<td>' . $langs->trans("NumMvts") . '</td>';
+	print '<td>' . $next_num_mvt . '</td>';
+	print '</tr>';
+	print '<tr class="impair">';
+	print '<td>' . $langs->trans("Docdate") . '</td>';
+	print '<td>';
+	print $html->select_date('', 'doc_date', '', '', '', "create_mvt", 1, 1);
+	print '</td>';
+	
+	print '</tr>';
+	print '<tr class="pair">';
+	print '<td>' . $langs->trans("Codejournal") . '</td>';
+	
+	print '<td>' . $html->selectarray('code_journal', $code_journal_array) . '</td>';
+	print '</tr>';
+	print '<tr class="impair">';
+	print '<td>' . $langs->trans("Docref") . '</td>';
+	print '<td><input type="text" size="20" name="doc_ref" value=""/></td>';
+	print '</tr>';
+	print '<tr class="pair">';
+	print '<td>' . $langs->trans("Doctype") . '</td>';
+	print '<td><input type="text" size="20" name="doc_type" value=""/></td>';
+	print '</tr>';
+	print '</table>';
+	print '<br>';
+	print '<input type="submit" class="butAction" value="' . $langs->trans("Save") . '">';
+	
+	print '</form>';
+} 
+else
+{
+	$book = new BookKeeping($db);
+	$result = $book->fetch_per_mvt($piece_num);
+	if ($result < 0) {
+		setEventMessage($book->errors, 'errors');
+	}
+	if (! empty($book->piece_num)) {
+		
+		print_fiche_titre($langs->trans("UpdateMvts"));
+		
+		print '<table class="border" width="100%">';
+		print '<tr class="pair">';
+		print '<td>' . $langs->trans("NumMvts") . '</td>';
+		print '<td>' . $book->piece_num . '</td>';
+		print '</tr>';
+		print '<tr class="impair">';
+		print '<td>' . $langs->trans("Docdate") . '</td>';
+		print '<td>' . dol_print_date($book->doc_date, 'daytextshort') . '</td>';
+		print '</tr>';
+		print '<tr class="pair">';
+		print '<td>' . $langs->trans("Codejournal") . '</td>';
+		print '<td>' . $book->code_journal . '</td>';
+		print '</tr>';
+		print '<tr class="impair">';
+		print '<td>' . $langs->trans("Docref") . '</td>';
+		print '<td>' . $book->doc_ref . '</td>';
+		print '</tr>';
+		print '<tr class="pair">';
+		print '<td>' . $langs->trans("Doctype") . '</td>';
+		print '<td>' . $book->doc_type . '</td>';
+		print '</tr>';
+		print '</table>';
+		
+		$result = $book->fetch_all_per_mvt($piece_num);
+		if ($result < 0) {
+			setEventMessage($book->errors, 'errors');
+		} else {
+			
+			print_fiche_titre($langs->trans("ListeMvts"));
+			print "<table class=\"noborder\" width=\"100%\">";
+			if (count($book->linesmvt) > 0) {
+				
+				print '<tr class="liste_titre">';
+				
+				print_liste_field_titre($langs->trans("Numerocompte"));
+				print_liste_field_titre($langs->trans("Code_tiers"));
+				print_liste_field_titre($langs->trans("Labelcompte"));
+				print_liste_field_titre($langs->trans("Debit"));
+				print_liste_field_titre($langs->trans("Credit"));
+				print_liste_field_titre($langs->trans("Amount"));
+				print_liste_field_titre($langs->trans("Sens"));
+				
+				print '<td></td>';
+				print "</tr>\n";
+				
+				foreach ( $book->linesmvt as $line ) {
+					$var = ! $var;
+					print "<tr $bc[$var]>";
+					
+					if ($action == 'update' && $line->id == $id) {
+						
+						print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+						print '<input type="hidden" name="id" value="' . $line->id . '">' . "\n";
+						print '<input type="hidden" name="action" value="confirm_update">' . "\n";
+						print '<td><input type="text" size="6" name="numero_compte" value="' . $line->numero_compte . '"/></td>';
+						print '<td><input type="text" size="15" name="code_tiers" value="' . $line->code_tiers . '"/></td>';
+						print '<td><input type="text" size="15" name="label_compte" value="' . $line->label_compte . '"/></td>';
+						print '<td><input type="text" size="6" name="debit" value="' . price($line->debit) . '"/></td>';
+						print '<td><input type="text" size="6" name="credit" value="' . price($line->credit) . '"/></td>';
+						print '<td>' . $line->montant . '</td>';
+						print '<td>' . $line->sens . '</td>';
+						print '<td>';
+						print '<input type="submit" class="button" value="' . $langs->trans("Update") . '">';
+						print '</form>';
+						print '</td>';
+					}
+					else {
+						print '<td>' . $line->numero_compte . '</td>';
+						print '<td>' . $line->code_tiers . '</td>';
+						print '<td>' . $line->label_compte . '</td>';
+						print '<td>' . $line->debit . '</td>';
+						print '<td>' . $line->credit . '</td>';
+						print '<td>' . $line->montant . '</td>';
+						print '<td>' . $line->sens . '</td>';
+							
+						print '<td>';
+						print '<a href="./card.php?action=update&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
+						print img_edit();
+						print '</a>&nbsp;';
+						print '<a href="./card.php?action=delete&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
+						print img_delete();
+						print '</a>';
+						
+						print '</td>';
+					}
+					print "</tr>\n";
+				}
+				
+				if ($action == "" || $action == 'add') {
+					$var = ! $var;
+					print "<tr $bc[$var]>";
+						
+					print '<form action="' . $_SERVER["PHP_SELF"] . '?piece_num=' . $book->piece_num . '" method="post">';
+					print '<input type="hidden" name="action" value="add">' . "\n";
+					print '<input type="hidden" name="doc_date" value="' . $book->doc_date . '">' . "\n";
+					print '<input type="hidden" name="doc_type" value="' . $book->doc_type . '">' . "\n";
+					print '<input type="hidden" name="doc_ref" value="' . $book->doc_ref . '">' . "\n";
+					print '<input type="hidden" name="code_journal" value="' . $book->code_journal . '">' . "\n";
+					print '<input type="hidden" name="fk_doc" value="' . $book->fk_doc . '">' . "\n";
+					print '<input type="hidden" name="fk_docdet" value="' . $book->fk_docdet . '">' . "\n";
+					print '<td><input type="text" size="6" name="numero_compte" value="' . $numero_compte . '"/></td>';
+					print '<td><input type="text" size="15" name="code_tiers" value="' . $code_tiers . '"/></td>';
+					print '<td><input type="text" size="15" name="label_compte" value="' . $label_compte . '"/></td>';
+					print '<td><input type="text" size="6" name="debit" value="' . price($debit) . '"/></td>';
+					print '<td><input type="text" size="6" name="credit" value="' . price($credit) . '"/></td>';
+					print '<td></td>';
+					print '<td></td>';
+					print '<td><input type="submit" class="button" value="' . $langs->trans("Save") . '"></td>';
+					print '</tr>';
+				}
+				print "</table>";
+			}
+		}
+	}
+	else {
+		print_fiche_titre($langs->trans("NoRecords"));
+	}
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/dev/vagrant/dolibarrdev/puphpet/files/exec-once/empty b/htdocs/accountancy/bookkeeping/index.html
similarity index 100%
rename from dev/vagrant/dolibarrdev/puphpet/files/exec-once/empty
rename to htdocs/accountancy/bookkeeping/index.html
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
new file mode 100644
index 00000000000..b2acc60fb6a
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -0,0 +1,234 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com> 
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/bookkeeping/list.php
+ * \ingroup		Accounting Expert
+ * \brief		List operation of book keeping
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+
+
+$page = GETPOST("page");
+$sortorder = GETPOST("sortorder");
+$sortfield = GETPOST("sortfield");
+$action = GETPOST('action', 'alpha');
+$search_doc_type = GETPOST("search_doc_type");
+$search_doc_ref = GETPOST("search_doc_ref");
+$search_account = GETPOST("search_account");
+$search_thirdparty = GETPOST("search_thirdparty");
+$search_journal = GETPOST("search_journal");
+
+if ($sortorder == "")
+	$sortorder = "ASC";
+if ($sortfield == "")
+	$sortfield = "bk.rowid";
+
+$offset = $conf->liste_limit * $page;
+
+$formventilation = new FormVentilation($db);
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_doc_type="";
+    $search_doc_ref="";
+	$search_account="";
+	$search_thirdparty="";
+	$search_journal="";
+}
+
+/*
+ * Action
+ */
+if ($action == 'delbookkeeping') {
+	
+	$import_key = GETPOST('importkey', 'alpha');
+	
+	if (! empty($import_key)) {
+		$object = new BookKeeping($db);
+		$result = $object->delete_by_importkey($import_key);
+		Header("Location: list.php");
+		if ($result < 0) {
+			setEventMessage($object->errors, 'errors');
+		}
+	}
+} // export csv
+else if ($action == 'export_csv') {
+	
+	header('Content-Type: text/csv');
+	header('Content-Disposition: attachment;filename=export_csv.csv');
+	
+	$object = new BookKeeping($db);
+	$result = $object->export_bookkeping('ebp');
+	if ($result < 0) {
+		setEventMessage($object->errors, 'errors');
+	}
+	
+	foreach ( $object->linesexport as $line ) {
+		print $line->id . ',';
+		print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
+		print '"' . $line->code_journal . '",';
+		print '"' . $line->numero_compte . '",';
+		print '"' . substr($line->code_journal, 0, 2) . '",';
+		print '"' . substr($line->doc_ref, 0, 40) . '",';
+		print '"' . $line->num_piece . '",';
+		print '"' . $line->montant . '",';
+		print '"' . $line->sens . '",';
+		print '"' . dol_print_date($line->doc_date, '%d%m%Y') . '",';
+		print '"' . $conf->currency . '",';
+		print "\n";
+	}
+} 
+
+else {
+	
+	llxHeader('', $langs->trans("Bookkeeping"));
+	
+/*
+ * List
+ */
+	
+	$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num ";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+	
+	if (dol_strlen(trim($search_doc_type))) {
+		
+		$sql .= " WHERE bk.doc_type LIKE '%" . $search_doc_type . "%'";
+		
+		if (dol_strlen(trim($search_doc_ref))) {
+			$sql .= " AND bk.doc_ref LIKE '%" . $search_doc_ref . "%'";
+		}
+	}
+	if (dol_strlen(trim($search_doc_ref))) {
+		$sql .= " WHERE bk.doc_ref LIKE '%" . $search_doc_ref . "%'";
+	}
+	if (dol_strlen(trim($search_account))) {
+		$sql .= " WHERE bk.numero_compte LIKE '%" . $search_account . "%'";
+	}
+	if (dol_strlen(trim($search_thirdparty))) {
+		$sql .= " WHERE bk.code_tiers LIKE '%" . $search_thirdparty . "%'";
+	}
+	if (dol_strlen(trim($search_journal))) {
+		$sql .= " WHERE bk.code_journal LIKE '%" . $search_journal . "%'";
+	}
+	
+	$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit + 1, $offset);
+	
+	dol_syslog('accountancy/bookkeeping/list.php:: $sql=' . $sql);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		
+		print_barre_liste($langs->trans("Bookkeeping"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
+		
+		print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+		print '<input type="hidden" name="action" value="delbookkeeping">';
+		
+		print $formventilation->select_bookkeeping_importkey('importkey', GETPOST('importkey'));
+		
+		print '<div class="inline-block divButAction"><input type="submit" class="butAction" value="' . $langs->trans("DelBookKeeping") . '" />';
+		
+		print '</form>';
+		
+		print '<a href="./card.php?action=create" class="butAction">' . $langs->trans("NewAccountingMvt") . '</a></div>';
+		
+		print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+		print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+		print '<input type="hidden" name="action" value="export_csv">';
+		print '<input type="submit" class="button" style="float: right;" value="Export CSV" />';
+		print '</form>';
+		
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans("Doctype"), $_SERVER['PHP_SELF'], "bk.doc_type", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Docdate"), $_SERVER['PHP_SELF'], "bk.doc_date", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "bk.doc_ref", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Numerocompte"), $_SERVER['PHP_SELF'], "bk.numero_compte", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Code_tiers"), $_SERVER['PHP_SELF'], "bk.code_tiers", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Labelcompte"), $_SERVER['PHP_SELF'], "bk_label_compte", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "bk.debit", "", "", 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "bk.credit", "", "", 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "bk.montant", "", "", 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "bk.sens", "", "", 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "bk.code_journal", "", "", "", $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
+		print "</tr>\n";
+		
+		print '<tr class="liste_titre">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
+		print '<td><input type="text" name="search_doc_type" size="8" value="' . $search_doc_type . '"></td>';
+		print '<td>&nbsp;</td>';
+		print '<td><input type="text" name="search_doc_ref" size="8" value="' . $search_doc_ref . '"></td>';
+		print '<td><input type="text" name="search_account" size="8" value="' . $search_account . '"></td>';
+		print '<td><input type="text" name="search_thirdparty" size="8" value="' . $search_thirdparty . '"></td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print '<td><input type="text" name="search_journal" size="3" value="' . $search_journal . '"></td>';
+		print '<td align="right" colspan="2" class="liste_titre">';
+		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+		print '&nbsp;';
+		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+		print '</td>';
+		print '</form>';
+		print '</tr>';
+		
+		$var = True;
+		
+		while ( $i < min($num, $conf->liste_limit) ) {
+			$obj = $db->fetch_object($resql);
+			$var = ! $var;
+			
+			print "<tr $bc[$var]>";
+			
+			print '<td>' . $obj->doc_type . '</td>';
+			print '<td>' . dol_print_date($db->jdate($obj->doc_date), 'day') . '</td>';
+			print '<td>' . $obj->doc_ref . '</td>';
+			print '<td>' . length_accountg($obj->numero_compte) . '</td>';
+			print '<td>' . length_accounta($obj->code_tiers) . '</td>';
+			print '<td>' . $obj->label_compte . '</td>';
+			print '<td align="right">' . price($obj->debit) . '</td>';
+			print '<td align="right">' . price($obj->credit) . '</td>';
+			print '<td align="right">' . price($obj->montant) . '</td>';
+			print '<td align="center">' . $obj->sens . '</td>';
+			print '<td>' . $obj->code_journal . '</td>';
+			print '<td align="center"><a href="./card.php?piece_num=' . $obj->piece_num . '">' . img_edit() . '</a></td>';
+			print "</tr>\n";
+			$i ++;
+		}
+		print "</table>";
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php
new file mode 100644
index 00000000000..0829f792130
--- /dev/null
+++ b/htdocs/accountancy/bookkeeping/listbyyear.php
@@ -0,0 +1,128 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com> 
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/bookkeeping/listbyyear.php
+ * \ingroup		Accounting Expert
+ * \brief		Book keeping by year
+ */
+
+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';
+
+// Langs
+$langs->load("accountancy");
+
+$page = GETPOST("page");
+$sortorder = GETPOST("sortorder");
+$sortfield = GETPOST("sortfield");
+
+// Filter
+$year = GETPOST("year", 'int');
+if ($year == 0) {
+	$year_current = strftime("%Y", time());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
+}
+
+if ($sortorder == "")
+	$sortorder = "ASC";
+if ($sortfield == "")
+	$sortfield = "bk.rowid";
+
+$offset = $conf->liste_limit * $page;
+
+llxHeader('', $langs->trans("Bookkeeping"));
+
+$textprevyear = "<a href=\"listbyyear.php?year=" . ($year_current - 1) . "\">" . img_previous() . "</a>";
+$textnextyear = " <a href=\"listbyyear.php?year=" . ($year_current + 1) . "\">" . img_next() . "</a>";
+
+/*
+ * Mode Liste
+ *
+ */
+
+$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens, bk.code_journal";
+$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
+// $sql .= " WHERE bk.doc_date >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+// $sql .= " AND bk.doc_date <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit + 1, $offset);
+
+dol_syslog('accountancy/bookkeeping/listbyyear.php:: $sql=' . $sql);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
+	
+	print_barre_liste($langs->trans("Bookkeeping") . " $textprevyear " . $langs->trans("Year") . " $year_start $textnextyear", $page, $_SERVER['PHP_SELF'], "", $sortfield, $sortorder, '', $num);
+	print "<table class=\"noborder\" width=\"100%\">";
+	
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Doctype"), $_SERVER['PHP_SELF'], "bk.doc_type", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Date"), $_SERVER['PHP_SELF'], "bk.doc_date", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Docref"), $_SERVER['PHP_SELF'], "bk.doc_ref", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("AccountAccounting"), $_SERVER['PHP_SELF'], "bk.numero_compte", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("ThirdPartyAccount"), $_SERVER['PHP_SELF'], "bk.code_tiers", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER['PHP_SELF'], "bk_label_compte", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Debit"), $_SERVER['PHP_SELF'], "bk.debit", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Credit"), $_SERVER['PHP_SELF'], "bk.credit", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Amount"), $_SERVER['PHP_SELF'], "bk.montant", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Sens"), $_SERVER['PHP_SELF'], "bk.sens", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans("Codejournal"), $_SERVER['PHP_SELF'], "bk.code_journal", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("&nbsp;");
+	print "</tr>\n";
+	
+	$var = True;
+	
+	while ( $i < min($num, $conf->liste_limit) ) {
+		$obj = $db->fetch_object($resql);
+		$var = ! $var;
+		
+		print "<tr $bc[$var]>";
+		
+		print '<td>' . $obj->doc_type . '</td>' . "\n";
+		print '<td>' . dol_print_date($db->jdate($obj->doc_date)) . '</td>';
+		print '<td>' . $obj->doc_ref . '</td>';
+		print '<td>' . length_accountg($obj->numero_compte) . '</td>';
+		print '<td>' . length_accounta($obj->code_tiers) . '</td>';
+		print '<td>' . $obj->label_compte . '</td>';
+		print '<td align="right">' . price($obj->debit) . '</td>';
+		print '<td align="right">' . price($obj->credit) . '</td>';
+		print '<td align="right">' . price($obj->montant) . '</td>';
+		print '<td>' . $obj->sens . '</td>';
+		print '<td>' . $obj->code_journal . '</td>';
+		print '<td><a href="./card.php?action=update&id=' . $obj->rowid . '">' . img_edit() . '</a></td>';
+		print "</tr>\n";
+		
+		$i ++;
+	}
+	print "</table>";
+	$db->free($resql);
+} else {
+	dol_print_error($db);
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/class/accountancyaccount.class.php b/htdocs/accountancy/class/accountancyaccount.class.php
deleted file mode 100644
index 229bc79ba41..00000000000
--- a/htdocs/accountancy/class/accountancyaccount.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/* Copyright (C) 2006-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/accountancy/class/accountancyaccount.class.php
- * 	\ingroup    accounting
- * 	\brief      Fichier de la classe des comptes comptables
- */
-
-
-/**
- * \class 		AccountancyAccount
- * \brief 		Classe permettant la gestion des comptes
- */
-class AccountancyAccount
-{
-    var $db;
-    var $error;
-
-    var $rowid;
-    var $fk_pcg_version;
-    var $pcg_type;
-    var $pcg_subtype;
-    var $label;
-    var $account_number;
-    var $account_parent;
-
-
-    /**
-     *  Constructor
-     *
-     *  @param		DoliDB		$db		Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-
-    /**
-     *    Insert account into database
-     *
-     *    @param  	User	$user 	User making add
-     *    @return	int				<0 if KO, Id line added if OK
-     */
-    function create($user)
-    {
-    	$now=dol_now();
-    	
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."accountingaccount";
-        $sql.= " (date_creation, fk_user_author, numero,intitule)";
-        $sql.= " VALUES ('".$this->db->idate($now)."',".$user->id.",'".$this->numero."','".$this->intitule."')";
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $id = $this->db->last_insert_id(MAIN_DB_PREFIX."accountingaccount");
-
-            if ($id > 0)
-            {
-                $this->id = $id;
-                $result = $this->id;
-            }
-            else
-            {
-                $result = -2;
-                $this->error="AccountancyAccount::Create Erreur $result";
-                dol_syslog($this->error, LOG_ERR);
-            }
-        }
-        else
-        {
-            $result = -1;
-            $this->error="AccountancyAccount::Create Erreur $result";
-            dol_syslog($this->error, LOG_ERR);
-        }
-
-        return $result;
-    }
-
-}
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index 4d81a94985b..7ce2134d0d2 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -1,5 +1,7 @@
 <?php
-/* Copyright (C) 2006-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
+/* Copyright (C) 2013-2014 Olivier Geffroy       <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro    <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
  *
  * 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
@@ -16,20 +18,18 @@
  */
 
 /**
- *	\file       htdocs/accountancy/class/accountancysystem.class.php
- * 	\ingroup    accounting
- * 	\brief      File of class to manage accountancy systems
+ * \file		htdocs/accountancy/class/accountancysystem.class.php
+ * \ingroup		Accounting Expert
+ * \brief		File of class to manage accountancy systems
  */
 
-
-/**	\class 		AccountancySystem
- *	\brief 		Classe to manage accountancy systems
+/**
+ * Class to manage accountancy systems
  */
 class AccountancySystem
 {
 	var $db;
 	var $error;
-
 	var $rowid;
 	var $fk_pcg_version;
 	var $pcg_type;
@@ -38,57 +38,47 @@ class AccountancySystem
 	var $account_number;
 	var $account_parent;
 
-
 	/**
-	 *	Constructor
+	 * Constructor
 	 *
-	 *  @param		DoliDB		$db      Database handler
+	 * @param DoliDB $db handler
 	 */
-	function __construct($db)
-	{
+	function __construct($db) {
 		$this->db = $db;
 	}
 
-
 	/**
-	 *  Insert accountancy system name into database
+	 * Insert accountancy system name into database
 	 *
-	 *  @param  	User	$user 	User making insert
-	 *  @return		int				<0 if KO, Id of line if OK
+	 * @param User $user making insert
+	 * @return int if KO, Id of line if OK
 	 */
-	function create($user)
-	{
-		$now=dol_now();
+	function create($user) {
+		$now = dol_now();
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_system";
-		$sql.= " (date_creation, fk_user_author, numero,intitule)";
-		$sql.= " VALUES ('".$this->db->idate($now)."',".$user->id.",'".$this->numero."','".$this->intitule."')";
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_system";
+		$sql .= " (date_creation, fk_user_author, numero, label)";
+		$sql .= " VALUES (" . $this->db->idate($now) . "," . $user->id . ",'" . $this->numero . "','" . $this->label . "')";
 
+		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_system");
+		if ($resql) {
+			$id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_system");
 
-			if ($id > 0)
-			{
+			if ($id > 0) {
 				$this->id = $id;
 				$result = $this->id;
-			}
-			else
-			{
-				$result = -2;
-				$this->error="AccountancySystem::Create Erreur $result";
+			} else {
+				$result = - 2;
+				$this->error = "AccountancySystem::Create Erreur $result";
 				dol_syslog($this->error, LOG_ERR);
 			}
-		}
-		else
-		{
-			$result = -1;
-			$this->error="AccountancySystem::Create Erreur $result";
+		} else {
+			$result = - 1;
+			$this->error = "AccountancySystem::Create Erreur $result";
 			dol_syslog($this->error, LOG_ERR);
 		}
 
 		return $result;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
new file mode 100644
index 00000000000..46a34698785
--- /dev/null
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -0,0 +1,450 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014 	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/class/accountingaccount.class.php
+ * \ingroup		Accounting Expert
+ * \brief		Fichier de la classe des comptes comptable
+ */
+
+/**
+ * Class to manage accounting accounts
+ */
+class AccountingAccount
+{
+	var $db;
+	var $error;
+	var $errors;
+
+	var $id;
+	var $rowid;
+
+	var $datec; // Creation date
+	var $fk_pcg_version;
+	var $pcg_type;
+	var $pcg_subtype;
+	var $account_number;
+	var $account_parent;
+	var $label;
+	var $fk_user_author;
+	var $fk_user_modif;
+	var $active;
+
+	/**
+	 * Constructor
+	 *
+	 * @param 	DoliDB	$db		Database handle
+	 */
+	function __construct($db)
+
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Load record in memory
+	 *
+	 * @param	int		$rowid				Id
+	 * @param	string	$account_number		Account number
+	 * @return 	int							<0 if KO, >0 if OK
+	 */
+	function fetch($rowid = null, $account_number = null)
+	{
+		if ($rowid || $account_number)
+		{
+			$sql = "SELECT rowid, datec, tms, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, fk_user_author, fk_user_modif, active";
+			$sql.= " FROM " . MAIN_DB_PREFIX . "accountingaccount WHERE";
+			if ($rowid) {
+				$sql .= " rowid = '" . $rowid . "'";
+			} elseif ($account_number) {
+				$sql .= " account_number = '" . $account_number . "'";
+			}
+
+			dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$obj = $this->db->fetch_object($result);
+
+				if ($obj)
+				{
+					$this->id = $obj->rowid;
+					$this->rowid = $obj->rowid;
+					$this->datec = $obj->datec;
+					$this->tms = $obj->tms;
+					$this->fk_pcg_version = $obj->fk_pcg_version;
+					$this->pcg_type = $obj->pcg_type;
+					$this->pcg_subtype = $obj->pcg_subtype;
+					$this->account_number = $obj->account_number;
+					$this->account_parent = $obj->account_parent;
+					$this->label = $obj->label;
+					$this->fk_user_author = $obj->fk_user_author;
+					$this->fk_user_modif = $obj->fk_user_modif;
+					$this->active = $obj->active;
+
+					return $this->id;
+				}
+				else
+				{
+					return 0;
+				}
+			}
+			else
+			{
+				dol_print_error($this->db);
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Insert line in accountingaccount
+	 *
+	 * @param 	User	$user 			Use making action
+	 * @param	int		$notrigger		Disable triggers
+	 * @return 	int						<0 if KO, >0 if OK
+	 */
+	function create($user, $notrigger = 0)
+	{
+		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);
+		if (isset($this->pcg_type))
+			$this->pcg_type = trim($this->pcg_type);
+		if (isset($this->pcg_subtype))
+			$this->pcg_subtype = trim($this->pcg_subtype);
+		if (isset($this->account_number))
+			$this->account_number = trim($this->account_number);
+		if (isset($this->account_parent))
+			$this->account_parent = trim($this->account_parent);
+		if (isset($this->label))
+			$this->label = trim($this->label);
+		if (isset($this->fk_user_author))
+			$this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->active))
+			$this->active = trim($this->active);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accountingaccount(";
+
+		$sql .= "datec";
+		$sql .= ", entity";
+		$sql .= ", fk_pcg_version";
+		$sql .= ", pcg_type";
+		$sql .= ", pcg_subtype";
+		$sql .= ", account_number";
+		$sql .= ", account_parent";
+		$sql .= ", label";
+		$sql .= ", fk_user_author";
+		$sql .= ", active";
+
+		$sql .= ") VALUES (";
+
+		$sql .= " '" . $this->db->idate($now) . "'";
+		$sql .= ", " . $conf->entity;
+		$sql .= ", " . (! isset($this->fk_pcg_version) ? 'NULL' : "'" . $this->db->escape($this->fk_pcg_version) . "'");
+		$sql .= ", " . (! isset($this->pcg_type) ? 'NULL' : "'" . $this->db->escape($this->pcg_type) . "'");
+		$sql .= ", " . (! isset($this->pcg_subtype) ? 'NULL' : "'" . $this->pcg_subtype . "'");
+		$sql .= ", " . (! isset($this->account_number) ? 'NULL' : "'" . $this->account_number . "'");
+		$sql .= ", " . (! isset($this->account_parent) ? 'NULL' : "'" . $this->db->escape($this->account_parent) . "'");
+		$sql .= ", " . (! isset($this->label) ? 'NULL' : "'" . $this->db->escape($this->label) . "'");
+		$sql .= ", " . $user->id;
+		$sql .= ", " . (! isset($this->active) ? 'NULL' : "'" . $this->db->escape($this->active) . "'");
+
+		$sql .= ")";
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this) . "::create sql=" . $sql, 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 . "accountingaccount");
+
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				// // Call triggers
+				// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				// $interface=new Interfaces($this->db);
+				// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				// // End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ( $this->errors as $errmsg ) {
+				dol_syslog(get_class($this) . "::create " . $errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Update record
+	 *
+	 * @param 	User 	$user 	Use making update
+	 * @return 	int 			<0 if KO, >0 if OK
+	 */
+	function update($user)
+	{
+		global $langs;
+
+		$this->db->begin();
+
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accountingaccount ";
+		$sql .= " SET fk_pcg_version = " . ($this->fk_pcg_version ? "'" . $this->db->escape($this->fk_pcg_version) . "'" : "null");
+		$sql .= " , pcg_type = " . ($this->pcg_type ? "'" . $this->db->escape($this->pcg_type) . "'" : "null");
+		$sql .= " , pcg_subtype = " . ($this->pcg_subtype ? "'" . $this->db->escape($this->pcg_subtype) . "'" : "null");
+		$sql .= " , account_number = '" . $this->account_number . "'";
+		$sql .= " , account_parent = '" . $this->account_parent . "'";
+		$sql .= " , label = " . ($this->label ? "'" . $this->db->escape($this->label) . "'" : "null");
+		$sql .= " , fk_user_modif = " . $user->id;
+		$sql .= " , active = '" . $this->active . "'";
+
+		$sql .= " WHERE rowid = " . $this->id;
+
+		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return - 1;
+		}
+	}
+
+	/**
+	 * Check usage of accounting code
+	 *
+	 * @return 	int 			<0 if KO, >0 if OK
+	 */
+	function checkUsage()
+	{
+		global $langs;
+
+		$sql = "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facturedet";
+		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
+		$sql .= "UNION";
+		$sql .= "(SELECT fk_code_ventilation FROM " . MAIN_DB_PREFIX . "facture_fourn_det";
+		$sql .= " WHERE  fk_code_ventilation=" . $this->id . ")";
+
+		dol_syslog(get_class($this) . "::checkUsage sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num > 0) {
+				$this->error = $langs->trans('ErrorAccountancyCodeIsAlreadyUse');
+				return 0;
+			} else {
+				return 1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return - 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param 	User 	$user 			User that deletes
+	 * @param 	int 	$notrigger 		0=triggers after, 1=disable triggers
+	 * @return 	int 					<0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$result = $this->checkUsage();
+
+		if ($result > 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
+					// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+					// $interface=new Interfaces($this->db);
+					// $result=$interface->run_triggers('ACCOUNTANCY_ACCOUNT_DELETE',$this,$user,$langs,$conf);
+					// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+					// // End call triggers
+				}
+			}
+
+			if (! $error) {
+				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accountingaccount";
+				$sql .= " WHERE rowid=" . $this->id;
+
+				dol_syslog(get_class($this) . "::delete sql=" . $sql);
+				$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;
+			}
+		} else {
+			return - 1;
+		}
+	}
+
+	/**
+	 * Information on record
+	 *
+	 * @param int $id of record
+	 * @return void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT a.rowid, a.datec, a.fk_user_author, a.fk_user_modif, a.tms';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'accountingaccount as a';
+		$sql .= ' WHERE a.rowid = ' . $id;
+
+		dol_syslog(get_class($this) . '::info sql=' . $sql);
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Account desactivate
+	 *
+	 * @param	int		$id		Id
+	 * @return 	int 			<0 if KO, >0 if OK
+	 */
+	function account_desactivate($id)
+	{
+		global $langs;
+
+		$result = $this->checkUsage();
+
+		if ($result > 0) {
+			$this->db->begin();
+
+			$sql = "UPDATE " . MAIN_DB_PREFIX . "accountingaccount ";
+			$sql .= "SET active = '0'";
+			$sql .= " WHERE rowid = ".$this->db->escape($id);
+
+			dol_syslog(get_class($this) . "::desactivate sql=" . $sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+
+			if ($result) {
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return - 1;
+			}
+		} else {
+			return - 1;
+		}
+	}
+
+	/**
+	 * Account activate
+	 *
+	 * @param 	int		$id		Id
+	 * @return 	int 			<0 if KO, >0 if OK
+	 */
+	function account_activate($id)
+	{
+		global $langs;
+
+		$this->db->begin();
+
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accountingaccount ";
+		$sql .= "SET active = '1'";
+		$sql .= " WHERE rowid = ".$this->db->escape($id);
+
+		dol_syslog(get_class($this) . "::activate sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return - 1;
+		}
+	}
+}
\ No newline at end of file
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
new file mode 100644
index 00000000000..6291790d008
--- /dev/null
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -0,0 +1,715 @@
+<?php
+/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/class/bookkeeping.class.php
+ * \ingroup		Accounting Expert
+ * \brief		File of class to manage book keeping
+ */
+
+/**
+ *	Class to manage accountancy book keeping
+ */
+class BookKeeping
+{
+	var $db;
+	var $error;
+	var $errors;
+
+	var $id;
+	var $doc_date;
+	var $doc_type;
+	var $doc_ref;
+	var $date_create;
+	var $fk_doc;
+	var $fk_docdet;
+	var $code_tiers;
+	var $numero_compte;
+	var $label_compte;
+	var $debit;
+	var $credit;
+	var $montant;
+	var $sens;
+	var $fk_user_author;
+	var $code_journal;
+	var $piece_num;
+	var $linesexport = array ();
+	var $linesmvt = array ();
+
+    /**
+     *  Constructor
+     *
+     *  @param	DoliDB		$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+	/**
+     *      Load a line into memory from database
+     *
+     *      @param	int		$id		 	id of line to get
+     *      @return	int					<0 if KO, >0 if OK
+     */
+	function fetch($id)
+	{
+		$sql = "SELECT rowid, doc_date, doc_type,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers, ";
+		$sql .= " numero_compte, label_compte, debit, credit, ";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num  ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping ";
+		$sql .= " WHERE rowid = '" . $id . "'";
+
+		dol_syslog(get_class($this) . "fetch sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+
+			$this->id = $obj->rowid;
+
+			$this->doc_date = $this->db->jdate($obj->doc_date);
+			$this->doc_type = $obj->doc_type;
+			$this->doc_ref = $obj->doc_ref;
+			$this->fk_doc = $obj->fk_doc;
+			$this->fk_docdet = $obj->fk_docdet;
+			$this->code_tiers = $obj->code_tiers;
+			$this->numero_compte = $obj->numero_compte;
+			$this->label_compte = $obj->label_compte;
+			$this->debit = $obj->debit;
+			$this->credit = $obj->credit;
+			$this->montant = $obj->montant;
+			$this->sens = $obj->sens;
+			$this->code_journal = $obj->code_journal;
+			$this->piece_num = $obj->piece_num;
+		}
+		else
+		{
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::fetch " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		return 1;
+	}
+
+	/**
+     *      Load an accounting document into memory from database
+     *
+     *      @param	int		$piecenum 	Accounting document to get
+     *      @return	int					<0 if KO, >0 if OK
+     */
+	function fetch_per_mvt($piecenum)
+	{
+		$sql = "SELECT piece_num,doc_date,code_journal,doc_ref,doc_type";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+		$sql .= " WHERE piece_num = '" . $piecenum . "'";
+
+		dol_syslog(get_class($this) . "fetch_per_mvt sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+
+			$this->piece_num = $obj->piece_num;
+			$this->code_journal = $obj->code_journal;
+			$this->doc_date = $this->db->jdate($obj->doc_date);
+			$this->doc_ref = $obj->doc_ref;
+			$this->doc_type = $obj->doc_type;
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::fetch_per_mvt " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		return 1;
+	}
+
+	/**
+     *      Return next number movement
+     *
+     *      @return    string			Last number
+     */
+	function getNextNumMvt() {
+		$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+
+		dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+
+			return $obj->max;
+		}
+		else
+		{
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::getNextNumMvt " . $this->error, LOG_ERR);
+			return - 1;
+		}
+	}
+
+	/**
+     *      Load all informations of accountancy document
+     *
+     *      @param	int		$piecenum	id of line to get
+     *      @return	int					<0 if KO, >0 if OK
+     */
+	function fetch_all_per_mvt($piecenum)
+	{
+		$sql = "SELECT rowid, doc_date, doc_type,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " numero_compte, label_compte, debit, credit,";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping ";
+		$sql .= " WHERE piece_num = '" . $piecenum . "'";
+
+		dol_syslog(get_class($this) . "fetch_all_per_mvt sql=" . $sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+
+			while ( $obj = $this->db->fetch_object($result) ) {
+
+				$line = new BookKeepingLine();
+
+				$line->id = $obj->rowid;
+
+				$line->doc_date = $this->db->jdate($obj->doc_date);
+				$line->doc_type = $obj->doc_type;
+				$line->doc_ref = $obj->doc_ref;
+				$line->fk_doc = $obj->fk_doc;
+				$line->fk_docdet = $obj->fk_docdet;
+				$line->code_tiers = $obj->code_tiers;
+				$line->numero_compte = $obj->numero_compte;
+				$line->label_compte = $obj->label_compte;
+				$line->debit = $obj->debit;
+				$line->credit = $obj->credit;
+				$line->montant = $obj->montant;
+				$line->sens = $obj->sens;
+				$line->code_journal = $obj->code_journal;
+				$line->piece_num = $obj->piece_num;
+
+				$this->linesmvt[] = $line;
+			}
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::fetch_per_mvt " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		return 1;
+	}
+
+	/**
+	 * Insert line into bookkeeping
+	 *
+	 * @param 	User	$user		User who inserted operation
+	 * @return			$result		Result
+	 */
+	function create($user='')
+	{
+		global $conf, $user, $langs;
+
+		$this->piece_num = 0;
+
+		// first check if line not yet in bookkeeping
+		$sql = "SELECT count(*)";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping ";
+		$sql .= " WHERE doc_type = '" . $this->doc_type . "'";
+		$sql .= " AND fk_docdet = " . $this->fk_docdet;
+		$sql .= " AND numero_compte = '" . $this->numero_compte . "'";
+
+		dol_syslog(get_class($this) . ":: create sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			$row = $this->db->fetch_array($resql);
+			if ($row[0] == 0) {
+
+				// Determine piece_num
+				$sqlnum = "SELECT piece_num";
+				$sqlnum .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping ";
+				$sqlnum .= " WHERE doc_type = '" . $this->doc_type . "'";
+				$sqlnum .= " AND fk_docdet = '" . $this->fk_docdet . "'";
+				$sqlnum .= " AND doc_ref = '" . $this->doc_ref . "'";
+
+				dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
+				$resqlnum = $this->db->query($sqlnum);
+				if ($resqlnum)
+				{
+					$objnum = $this->db->fetch_object($resqlnum);
+					$this->piece_num = $objnum->piece_num;
+				}
+				dol_syslog(get_class($this) . ":: create this->piece_num=" . $this->piece_num, LOG_DEBUG);
+				if (empty($this->piece_num))
+				{
+					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
+					$sqlnum .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping ";
+
+					dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
+					$resqlnum = $this->db->query($sqlnum);
+					if ($resqlnum) {
+						$objnum = $this->db->fetch_object($resqlnum);
+						$this->piece_num = $objnum->maxpiecenum;
+					}
+				}
+				dol_syslog(get_class($this) . ":: create this->piece_num=" . $this->piece_num, LOG_DEBUG);
+				if (empty($this->piece_num)) {
+					$this->piece_num = 1;
+				}
+
+				$now = dol_now();
+				if (empty($this->date_create))
+					$this->date_create = $now();
+
+				$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_bookkeeping (doc_date, ";
+				$sql .= "doc_type, doc_ref,fk_doc,fk_docdet,code_tiers,numero_compte,label_compte,";
+				$sql .= "debit,credit,montant,sens,fk_user_author,import_key,code_journal,piece_num)";
+				$sql .= " VALUES ('" . $this->doc_date . "','" . $this->doc_type . "','" . $this->doc_ref . "'," . $this->fk_doc . ",";
+				$sql .= $this->fk_docdet . ",'" . $this->code_tiers . "','" . $this->numero_compte . "','" . $this->db->escape($this->label_compte) . "',";
+				$sql .= $this->debit . "," . $this->credit . "," . $this->montant . ",'" . $this->sens . "'," . $user->id . ", '";
+				$sql .= $this->date_create . "','" . $this->code_journal . "'," . $this->piece_num . ")";
+
+				dol_syslog(get_class($this) . ":: create sql=" . $sql, LOG_DEBUG);
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$id = $this->db->last_insert_id(MAIN_DB_PREFIX . "accounting_bookkeeping");
+
+					if ($id > 0) {
+						$this->id = $id;
+						$result = 0;
+					} else {
+						$result = - 2;
+						dol_syslog("BookKeeping::Create Erreur $result lecture ID");
+					}
+				} else {
+					$result = - 1;
+					dol_syslog("BookKeeping::Create Erreur $result INSERT Mysql");
+				}
+			} else {
+				$result = - 3;
+				dol_syslog("BookKeeping::Create Erreur $result SELECT Mysql");
+			}
+		} else {
+			$result = - 5;
+			dol_syslog("BookKeeping::Create Erreur $result SELECT Mysql");
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Delete bookkepping by importkey
+	 *
+	 * @param	string 	$importkey		Import key
+	 * @return	int						Result
+	 */
+	function delete_by_importkey($importkey) {
+		$this->db->begin();
+
+		// first check if line not yet in bookkeeping
+		$sql = "DELETE";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping ";
+		$sql .= " WHERE import_key = '" . $importkey . "'";
+
+		$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;
+		}
+	}
+
+	/**
+	 *	Create object into database
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@param  int		$notrigger		1=Does not execute triggers, 0 otherwise
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function create_std($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->doc_type))
+			$this->doc_type = trim($this->doc_type);
+		if (isset($this->doc_ref))
+			$this->doc_ref = trim($this->doc_ref);
+		if (isset($this->fk_doc))
+			$this->fk_doc = trim($this->fk_doc);
+		if (isset($this->fk_docdet))
+			$this->fk_docdet = trim($this->fk_docdet);
+		if (isset($this->code_tiers))
+			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->numero_compte))
+			$this->numero_compte = trim($this->numero_compte);
+		if (isset($this->label_compte))
+			$this->label_compte = trim($this->label_compte);
+		if (isset($this->debit))
+			$this->debit = trim($this->debit);
+		if (isset($this->credit))
+			$this->credit = trim($this->credit);
+		if (isset($this->montant))
+			$this->montant = trim($this->montant);
+		if (isset($this->sens))
+			$this->sens = trim($this->sens);
+		if (isset($this->fk_user_author))
+			$this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->import_key))
+			$this->import_key = trim($this->import_key);
+		if (isset($this->code_journal))
+			$this->code_journal = trim($this->code_journal);
+		if (isset($this->piece_num))
+			$this->piece_num = trim($this->piece_num);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Insert request
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "accounting_bookkeeping(";
+		$sql .= "doc_date,";
+		$sql .= "doc_type,";
+		$sql .= "doc_ref,";
+		$sql .= "fk_doc,";
+		$sql .= "fk_docdet,";
+		$sql .= "code_tiers,";
+		$sql .= "numero_compte,";
+		$sql .= "label_compte,";
+		$sql .= "debit,";
+		$sql .= "credit,";
+		$sql .= "montant,";
+		$sql .= "sens,";
+		$sql .= "fk_user_author,";
+		$sql .= "import_key,";
+		$sql .= "code_journal,";
+		$sql .= "piece_num";
+
+		$sql .= ") VALUES (";
+
+		$sql .= " " . (! isset($this->doc_date) || dol_strlen($this->doc_date) == 0 ? 'NULL' : $this->db->idate($this->doc_date)) . ",";
+		$sql .= " " . (! isset($this->doc_type) ? 'NULL' : "'" . $this->db->escape($this->doc_type) . "'") . ",";
+		$sql .= " " . (! isset($this->doc_ref) ? 'NULL' : "'" . $this->db->escape($this->doc_ref) . "'") . ",";
+		$sql .= " " . (! isset($this->fk_doc) ? 'NULL' : "'" . $this->fk_doc . "'") . ",";
+		$sql .= " " . (! isset($this->fk_docdet) ? 'NULL' : "'" . $this->fk_docdet . "'") . ",";
+		$sql .= " " . (! isset($this->code_tiers) ? 'NULL' : "'" . $this->db->escape($this->code_tiers) . "'") . ",";
+		$sql .= " " . (! isset($this->numero_compte) ? 'NULL' : "'" . $this->db->escape($this->numero_compte) . "'") . ",";
+		$sql .= " " . (! isset($this->label_compte) ? 'NULL' : "'" . $this->db->escape($this->label_compte) . "'") . ",";
+		$sql .= " " . (! isset($this->debit) ? 'NULL' : "'" . $this->debit . "'") . ",";
+		$sql .= " " . (! isset($this->credit) ? 'NULL' : "'" . $this->credit . "'") . ",";
+		$sql .= " " . (! isset($this->montant) ? 'NULL' : "'" . $this->montant . "'") . ",";
+		$sql .= " " . (! isset($this->sens) ? 'NULL' : "'" . $this->db->escape($this->sens) . "'") . ",";
+		$sql .= " " . $user->id . ",";
+		$sql .= " " . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . ",";
+		$sql .= " " . (! isset($this->code_journal) ? 'NULL' : "'" . $this->db->escape($this->code_journal) . "'") . ",";
+		$sql .= " " . (! isset($this->piece_num) ? 'NULL' : "'" . $this->piece_num . "'") . "";
+
+		$sql .= ")";
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this) . "::create_std sql=" . $sql, 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 . "accounting_bookkeeping");
+
+			if (! $notrigger) {
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				// // Call triggers
+				// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				// $interface=new Interfaces($this->db);
+				// $result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+				// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				// // End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ( $this->errors as $errmsg ) {
+				dol_syslog(get_class($this) . "::create_std " . $errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', ' . $errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return - 1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+	/**
+	 *	Update object into database
+	 *
+	 *	@param	User	$user      		Object user that create
+	 *	@param  int		$notrigger		1=Does not execute triggers, 0 otherwise
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function update($user = 0, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->doc_type))
+			$this->doc_type = trim($this->doc_type);
+		if (isset($this->doc_ref))
+			$this->doc_ref = trim($this->doc_ref);
+		if (isset($this->fk_doc))
+			$this->fk_doc = trim($this->fk_doc);
+		if (isset($this->fk_docdet))
+			$this->fk_docdet = trim($this->fk_docdet);
+		if (isset($this->code_tiers))
+			$this->code_tiers = trim($this->code_tiers);
+		if (isset($this->numero_compte))
+			$this->numero_compte = trim($this->numero_compte);
+		if (isset($this->label_compte))
+			$this->label_compte = trim($this->label_compte);
+		if (isset($this->debit))
+			$this->debit = trim($this->debit);
+		if (isset($this->credit))
+			$this->credit = trim($this->credit);
+		if (isset($this->montant))
+			$this->montant = trim($this->montant);
+		if (isset($this->sens))
+			$this->sens = trim($this->sens);
+		if (isset($this->fk_user_author))
+			$this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->import_key))
+			$this->import_key = trim($this->import_key);
+		if (isset($this->code_journal))
+			$this->code_journal = trim($this->code_journal);
+		if (isset($this->piece_num))
+			$this->piece_num = trim($this->piece_num);
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "accounting_bookkeeping SET";
+
+		$sql .= " doc_date=" . (dol_strlen($this->doc_date) != 0 ? "'" . $this->db->idate($this->doc_date) . "'" : 'null') . ",";
+		$sql .= " doc_type=" . (isset($this->doc_type) ? "'" . $this->db->escape($this->doc_type) . "'" : "null") . ",";
+		$sql .= " doc_ref=" . (isset($this->doc_ref) ? "'" . $this->db->escape($this->doc_ref) . "'" : "null") . ",";
+		$sql .= " fk_doc=" . (isset($this->fk_doc) ? $this->fk_doc : "null") . ",";
+		$sql .= " fk_docdet=" . (isset($this->fk_docdet) ? $this->fk_docdet : "null") . ",";
+		$sql .= " code_tiers=" . (isset($this->code_tiers) ? "'" . $this->db->escape($this->code_tiers) . "'" : "null") . ",";
+		$sql .= " numero_compte=" . (isset($this->numero_compte) ? "'" . $this->db->escape($this->numero_compte) . "'" : "null") . ",";
+		$sql .= " label_compte=" . (isset($this->label_compte) ? "'" . $this->db->escape($this->label_compte) . "'" : "null") . ",";
+		$sql .= " debit=" . (isset($this->debit) ? $this->debit : "null") . ",";
+		$sql .= " credit=" . (isset($this->credit) ? $this->credit : "null") . ",";
+		$sql .= " montant=" . (isset($this->montant) ? $this->montant : "null") . ",";
+		$sql .= " sens=" . (isset($this->sens) ? "'" . $this->db->escape($this->sens) . "'" : "null") . ",";
+		$sql .= " fk_user_author=" . (isset($this->fk_user_author) ? $this->fk_user_author : "null") . ",";
+		$sql .= " import_key=" . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . ",";
+		$sql .= " code_journal=" . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ",";
+		$sql .= " piece_num=" . (isset($this->piece_num) ? $this->piece_num : "null") . "";
+
+		$sql .= " WHERE rowid=" . $this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+		$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
+				// include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				// $interface=new Interfaces($this->db);
+				// $result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+				// if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				// // End call triggers
+			}
+		}
+
+		// 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	User	$user      		Object user that create
+	 *	@param  int		$notrigger		1=Does not execute triggers, 0 otherwise
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('ACCOUNTING_NUMPIECE_DELETE',$user);
+				if ($result < 0) $error++;
+                // End call triggers
+			}
+		}
+
+		if (! $error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+			$sql .= " WHERE rowid=" . $this->id;
+
+			dol_syslog(get_class($this) . "::delete sql=" . $sql);
+			$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;
+		}
+	}
+
+	/**
+	 * Delete bookkepping by importkey
+	 *
+	 * @param	string	$model		Model
+	 * @return	int					Result
+	 */
+	function export_bookkeping($model = 'ebp')
+	{
+		$sql = "SELECT rowid, doc_date, doc_type,";
+		$sql .= " doc_ref, fk_doc, fk_docdet, code_tiers,";
+		$sql .= " numero_compte, label_compte, debit, credit,";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, piece_num";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+
+		$resql = $this->db->query($sql);
+
+		dol_syslog(get_class($this) . "::export_bookkeping sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->linesexport = array ();
+
+			$num = $this->db->num_rows($resql);
+			while ( $obj = $this->db->fetch_object($resql) ) {
+				$line = new BookKeepingLine();
+
+				$line->id = $obj->rowid;
+
+				$line->doc_date = $this->db->jdate($obj->doc_date);
+				$line->doc_type = $obj->doc_type;
+				$line->doc_ref = $obj->doc_ref;
+				$line->fk_doc = $obj->fk_doc;
+				$line->fk_docdet = $obj->fk_docdet;
+				$line->code_tiers = $obj->code_tiers;
+				$line->numero_compte = $obj->numero_compte;
+				$line->label_compte = $obj->label_compte;
+				$line->debit = $obj->debit;
+				$line->credit = $obj->credit;
+				$line->montant = $obj->montant;
+				$line->sens = $obj->sens;
+				$line->code_journal = $obj->code_journal;
+				$line->piece_num = $obj->piece_num;
+
+				$this->linesexport[] = $line;
+			}
+			$this->db->free($resql);
+
+			return $num;
+		}
+		else
+		{
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::export_bookkeping " . $this->error, LOG_ERR);
+			return - 1;
+		}
+	}
+}
+
+/**
+ * Class BookKeepingLine
+ */
+class BookKeepingLine
+{
+	var $id;
+	var $doc_date;
+	var $doc_type;
+	var $doc_ref;
+	var $fk_doc;
+	var $fk_docdet;
+	var $code_tiers;
+	var $numero_compte;
+	var $label_compte;
+	var $debit;
+	var $credit;
+	var $montant;
+	var $sens;
+	var $fk_user_author;
+	var $code_journal;
+	var $piece_num;
+}
\ No newline at end of file
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
new file mode 100644
index 00000000000..33bb33a2353
--- /dev/null
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -0,0 +1,263 @@
+<?php
+/* Copyright (C) 2013-2014 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		htdocs/accountancy/class/html.formventilation.class.php
+ *	\ingroup	Accounting Expert
+ *	\brief		File of class with all html predefined components
+ */
+
+/**
+ *	Class to manage generation of HTML components for bank module
+ */
+class FormVentilation extends Form
+{
+	var $db;
+	var $error;
+
+	/**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+	public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+	/**
+	 *	Return select filter with date of transaction
+	 *
+	 *	@param	string	$htmlname		Name of select field
+	 *	@param	string	$selectedkey	Value
+	 *	@return	string					HTML edit field
+	 */
+	function select_bookkeeping_importkey($htmlname = 'importkey', $selectedkey='')
+	{
+		global $langs;
+
+		$date_array = array ();
+
+		$sql  = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+		$sql .= ' ORDER BY import_key DESC';
+
+		$out = '<SELECT name="' . $htmlname . '">';
+
+		dol_syslog(get_class($this) . "::select_bookkeeping_importkey sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$num = $this->db->num_rows($resql);
+
+			while ( $i < $num ) {
+				$obj = $this->db->fetch_object($resql);
+
+				$selected = '';
+				if ($selectedkey == $obj->import_key) {
+					$selected = ' selected="selected" ';
+				}
+
+				$out .= '<OPTION value="' . $obj->import_key . '"' . $selected . '>' . $obj->import_key . '</OPTION>';
+
+				$i ++;
+			}
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
+			return - 1;
+		}
+
+		$out .= '</SELECT>';
+
+		return $out;
+	}
+
+	/**
+	 *	Return list of accounts with label by chart of accounts
+	 *
+	 *	@param	string	$selectid		Preselected chart of accounts
+	 *	@param	string	$htmlname		Name of field in html form
+	 *	@param	int		$showempty		Add an empty field
+	 *  @param	array	$event			Event options
+     *
+	 *	@return	string					String with HTML select
+	 */
+	function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array())
+	{
+		global $conf, $user, $langs;
+
+		$out = '';
+
+		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accountingaccount as aa";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+		$sql .= " AND aa.active = 1";
+		$sql .= " ORDER BY aa.account_number";
+
+		dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+
+			$out .= ajax_combobox($htmlname, $event);
+			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
+			if ($showempty)
+				$out .= '<option value="-1"></option>';
+			$num = $this->db->num_rows($resql);
+
+			$i = 0;
+			if ($num) {
+				while ( $i < $num ) {
+					$obj = $this->db->fetch_object($resql);
+					$label = $obj->account_number . ' - ' . $obj->label;
+
+					// Remember guy's we store in database llx_facturedet the rowid of accountingaccount and not the account_number
+					// Bacause same account_number can be share between different accounting_system and do have the same meaning
+					if (($selectid != '') && $selectid == $obj->rowid) {
+						// $out .= '<option value="' . $obj->account_number . '" selected="selected">' . $label . '</option>';
+						$out .= '<option value="' . $obj->rowid . '" selected="selected">' . $label . '</option>';
+					} else {
+						// $out .= '<option value="' . $obj->account_number . '">' . $label . '</option>';
+						$out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';
+					}
+					$i ++;
+				}
+			}
+			$out .= '</select>';
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+			return - 1;
+		}
+		$this->db->free($resql);
+		return $out;
+	}
+
+	/**
+	 *	Return list of accounts with label by class of accounts
+	 *
+	 *	@param	string	$selectid		Preselected pcg_type
+	 *	@param	string	$htmlname		Name of field in html form
+	 *	@param	int		$showempty		Add an empty field
+	 *  @param	array	$event			Event options
+     *
+	 *	@return	string					String with HTML select
+	 */
+	function select_pcgtype($selectid, $htmlname = 'pcg_type', $showempty = 0, $event = array())
+	{
+		global $conf, $user, $langs;
+
+		$out = '';
+
+		$sql = "SELECT DISTINCT pcg_type ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accountingaccount as aa";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+		$sql .= " ORDER BY pcg_type";
+
+		dol_syslog(get_class($this) . "::select_pcgtype sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+
+			$out .= ajax_combobox($htmlname, $event);
+
+			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
+			if ($showempty)
+				$out .= '<option value="-1"></option>';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num) {
+				while ( $i < $num ) {
+					$obj = $this->db->fetch_object($resql);
+					$label = $obj->pcg_type;
+
+					if (($selectid != '') && $selectid == $obj->pcg_type) {
+						$out .= '<option value="' . $obj->pcg_type . '" selected="selected">' . $label . '</option>';
+					} else {
+						$out .= '<option value="' . $obj->pcg_type . '">' . $label . '</option>';
+					}
+					$i ++;
+				}
+			}
+			$out .= '</select>';
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_pcgtype " . $this->error, LOG_ERR);
+			return - 1;
+		}
+		$this->db->free($resql);
+		return $out;
+	}
+
+	/**
+	 *	Return list of accounts with label by sub_class of accounts
+	 *
+	 *	@param	string	$selectid		Preselected pcg_type
+	 *	@param	string	$htmlname		Name of field in html form
+	 *	@param	int		$showempty		Add an empty field
+	 *  @param	array	$event			Event options
+     *
+	 *	@return	string					String with HTML select
+	 */
+	function select_pcgsubtype($selectid, $htmlname = 'pcg_subtype', $showempty = 0, $event = array())
+	{
+		global $conf, $user, $langs;
+
+		$out = '';
+
+		$sql = "SELECT DISTINCT pcg_subtype ";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accountingaccount as aa";
+		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+		$sql .= " ORDER BY pcg_subtype";
+
+		dol_syslog(get_class($this) . "::select_pcgsubtype sql=" . $sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+
+			$out .= ajax_combobox($htmlname, $event);
+
+			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
+			if ($showempty)
+				$out .= '<option value="-1"></option>';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			if ($num) {
+				while ( $i < $num ) {
+					$obj = $this->db->fetch_object($resql);
+					$label = $obj->pcg_subtype;
+
+					if (($selectid != '') && $selectid == $obj->pcg_subtype) {
+						$out .= '<option value="' . $obj->pcg_subtype . '" selected="selected">' . $label . '</option>';
+					} else {
+						$out .= '<option value="' . $obj->pcg_subtype . '">' . $label . '</option>';
+					}
+					$i ++;
+				}
+			}
+			$out .= '</select>';
+		} else {
+			$this->error = "Error " . $this->db->lasterror();
+			dol_syslog(get_class($this) . "::select_pcgsubtype " . $this->error, LOG_ERR);
+			return - 1;
+		}
+		$this->db->free($resql);
+		return $out;
+	}
+}
diff --git a/dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp b/htdocs/accountancy/class/index.html
similarity index 100%
rename from dev/vagrant/dolibarrdev/puphpet/puppet/modules/beanstalkd/spec/fixtures/manifests/site.pp
rename to htdocs/accountancy/class/index.html
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
new file mode 100644
index 00000000000..28d3d0c1f79
--- /dev/null
+++ b/htdocs/accountancy/customer/card.php
@@ -0,0 +1,145 @@
+<?PHP
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/customer/card.php
+ * \ingroup		Accounting Expert
+ * \brief		Card customer ventilation
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+// Langs
+$langs->load("bills");
+$langs->load("accountancy");
+
+$action = GETPOST('action', 'alpha');
+$codeventil = GETPOST('codeventil');
+$id = GETPOST('id');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+	
+/*
+ * Actions
+ */
+
+if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch) 
+{
+	if (! GETPOST('cancel', 'alpha'))
+	{
+		$sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
+		$sql .= " SET fk_code_ventilation = " . $codeventil;
+		$sql .= " WHERE rowid = " . $id;
+	
+		dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
+		$resql = $db->query($sql);
+		if (! $resql) {
+			setEventMessage($db->lasterror(), 'errors');
+		}
+	} else {
+		header("Location: ./lines.php");
+		exit();
+	}		
+}
+
+llxHeader("", "", "FicheVentilation");
+
+if ($cancel == $langs->trans("Cancel")) {
+	$action = '';
+}
+
+/*
+ * Create
+ */
+$form = new Form($db);
+$facture_static = new Facture($db);
+$formventilation = new FormVentilation($db);
+
+if (! empty($id)) {
+	$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,";
+	$sql .= " l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice, p.accountancy_code_sell as code_sell,";
+	$sql .= " l.fk_code_ventilation, aa.account_number, aa.label";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as l";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON l.fk_code_ventilation = aa.rowid";
+	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = l.fk_facture";
+	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
+	
+	if (! empty($conf->multicompany->enabled)) {
+		$sql .= " AND f.entity = '" . $conf->entity . "'";
+	}
+	
+	dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG);
+	$result = $db->query($sql);
+	
+	if ($result) {
+		$num_lines = $db->num_rows($result);
+		$i = 0;
+		
+		if ($num_lines) {
+			
+			$objp = $db->fetch_object($result);
+			
+			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
+			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="ventil">';
+			
+			$linkback='<a href="'.DOL_URL_ROOT.'/accountancy/customer/lines.php">'.$langs->trans("Back").'</a>';
+			print_fiche_titre($langs->trans('CustomersVentilation'),$linkback,'setup');
+			
+			print '<table class="border" width="100%">';
+			
+			// Ref facture
+			print '<tr><td>' . $langs->trans("Invoice") . '</td>';
+			$facture_static->ref = $objp->facnumber;
+			$facture_static->id = $objp->facid;
+			print '<td>' . $facture_static->getNomUrl(1) . '</td>';
+			print '</tr>';
+			
+			print '<tr><td width="20%">' . $langs->trans("Line") . '</td>';
+			print '<td>' . nl2br($objp->description) . '</td></tr>';
+			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
+			print $objp->account_number . '-' . $objp->label;
+			print '<tr><td width="20%">' . $langs->trans("NewAccount") . '</td><td>';
+			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print '</td></tr>';
+			print '</table>';
+			
+			print '<br><center><input class="button" type="submit" value="' . $langs->trans("Save") . '"> &nbsp; &nbsp; ';
+			print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '"></center';
+	
+			print '</form>';
+		} else {
+			print "Error";
+		}
+	} else {
+		print "Error";
+	}
+} else {
+	print "Error ID incorrect";
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/.noencode b/htdocs/accountancy/customer/index.html
similarity index 100%
rename from htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/.noencode
rename to htdocs/accountancy/customer/index.html
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
new file mode 100644
index 00000000000..663e763a9d3
--- /dev/null
+++ b/htdocs/accountancy/customer/index.php
@@ -0,0 +1,342 @@
+<?php
+/* Copyright (C) 2013      Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/customer/index.php
+ * \ingroup		Accounting Expert
+ * \brief		Page accueil clients ventilation comptable
+ */
+
+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';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->ventilation->read)
+	accessforbidden();
+
+// Filter
+$year = $_GET["year"];
+if ($year == 0) {
+	$year_current = strftime("%Y", time());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
+}
+
+// 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";
+		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accountingaccount as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
+		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
+		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
+		$sql1 .= " AND fd.fk_code_ventilation = 0";
+	} else {
+		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accountingaccount as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
+		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
+		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
+		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
+		$sql1 .= " AND fd.fk_code_ventilation = 0";
+	}
+
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Dispatched'), 'mesgs');
+	}
+}
+
+/*
+ * View
+ */
+llxHeader('', $langs->trans("CustomersVentilation"));
+
+$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
+$textnextyear = ' <a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
+
+print_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
+
+print '<b>' . $langs->trans("DescVentilCustomer") . '</b>';
+print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=validatehistory">' . $langs->trans("ValidateHistory") . '</a></div>';
+
+$sql = "SELECT count(*) FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$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;";
+
+$result = $db->query($sql);
+if ($result) {
+	$row = $db->fetch_row($result);
+	$nbfac = $row[0];
+	$db->free($result);
+}
+
+$y = $year_current;
+
+$var = true;
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
+print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JanuaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("FebruaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MarchMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AprilMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MayMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JuneMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JulyMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AugustMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("SeptemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("OctoberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("NovemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("DecemberMin") . '</td>';
+print '<td width="60" align="center"><b>' . $langs->trans("Total") . '</b></td></tr>';
+
+$sql = "SELECT IF(aa.account_number IS NULL, 'Non pointe', aa.account_number) AS 'code comptable',";
+$sql .= "  IF(aa.label IS NULL, 'Non pointe', aa.label) AS 'Intitulé',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=1,fd.total_ht,0)),2) AS 'Janvier',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=2,fd.total_ht,0)),2) AS 'Fevrier',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=3,fd.total_ht,0)),2) AS 'Mars',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=4,fd.total_ht,0)),2) AS 'Avril',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=5,fd.total_ht,0)),2) AS 'Mai',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=6,fd.total_ht,0)),2) AS 'Juin',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=7,fd.total_ht,0)),2) AS 'Juillet',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=8,fd.total_ht,0)),2) AS 'Aout',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=9,fd.total_ht,0)),2) AS 'Septembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=10,fd.total_ht,0)),2) AS 'Octobre',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=11,fd.total_ht,0)),2) AS 'Novembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=12,fd.total_ht,0)),2) AS 'Decembre',";
+$sql .= "  ROUND(SUM(fd.total_ht),2) as 'Total'";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
+$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON aa.rowid = fd.fk_code_ventilation";
+$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 . "'";
+}
+
+$sql .= " GROUP BY fd.fk_code_ventilation";
+
+$resql = $db->query($sql);
+if ($resql) {
+	$i = 0;
+	$num = $db->num_rows($resql);
+
+	while ( $i < $num ) {
+		$row = $db->fetch_row($resql);
+
+		print '<tr><td>' . length_accountg($row[0]) . '</td>';
+		print '<td align="left">' . $row[1] . '</td>';
+		print '<td align="right">' . price($row[2]) . '</td>';
+		print '<td align="right">' . price($row[3]) . '</td>';
+		print '<td align="right">' . price($row[4]) . '</td>';
+		print '<td align="right">' . price($row[5]) . '</td>';
+		print '<td align="right">' . price($row[6]) . '</td>';
+		print '<td align="right">' . price($row[7]) . '</td>';
+		print '<td align="right">' . price($row[8]) . '</td>';
+		print '<td align="right">' . price($row[9]) . '</td>';
+		print '<td align="right">' . price($row[10]) . '</td>';
+		print '<td align="right">' . price($row[11]) . '</td>';
+		print '<td align="right">' . price($row[12]) . '</td>';
+		print '<td align="right">' . price($row[13]) . '</td>';
+		print '<td align="right"><b>' . price($row[14]) . '</b></td>';
+		print '</tr>';
+		$i ++;
+	}
+	$db->free($resql);
+} else {
+	print $db->lasterror(); // Show last sql error
+}
+print "</table>\n";
+
+print "<br>\n";
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("Total") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JanuaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("FebruaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MarchMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AprilMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MayMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JuneMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JulyMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AugustMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("SeptemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("OctoberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("NovemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("DecemberMin") . '</td>';
+print '<td width="60" align="center"><b>' . $langs->trans("Total") . '</b></td></tr>';
+
+$sql = "SELECT '" . $langs->trans("TotalVente") . "' AS 'Total',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=1,fd.total_ht,0)),2) AS 'Janvier',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=2,fd.total_ht,0)),2) AS 'Fevrier',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=3,fd.total_ht,0)),2) AS 'Mars',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=4,fd.total_ht,0)),2) AS 'Avril',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=5,fd.total_ht,0)),2) AS 'Mai',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=6,fd.total_ht,0)),2) AS 'Juin',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=7,fd.total_ht,0)),2) AS 'Juillet',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=8,fd.total_ht,0)),2) AS 'Aout',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=9,fd.total_ht,0)),2) AS 'Septembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=10,fd.total_ht,0)),2) AS 'Octobre',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=11,fd.total_ht,0)),2) AS 'Novembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=12,fd.total_ht,0)),2) AS 'Decembre',";
+$sql .= "  ROUND(SUM(fd.total_ht),2) as 'Total'";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$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 . "'";
+}
+
+$resql = $db->query($sql);
+if ($resql) {
+	$i = 0;
+	$num = $db->num_rows($resql);
+
+	while ( $i < $num ) {
+		$row = $db->fetch_row($resql);
+
+		print '<tr><td>' . $row[0] . '</td>';
+		print '<td align="right">' . price($row[1]) . '</td>';
+		print '<td align="right">' . price($row[2]) . '</td>';
+		print '<td align="right">' . price($row[3]) . '</td>';
+		print '<td align="right">' . price($row[4]) . '</td>';
+		print '<td align="right">' . price($row[5]) . '</td>';
+		print '<td align="right">' . price($row[6]) . '</td>';
+		print '<td align="right">' . price($row[7]) . '</td>';
+		print '<td align="right">' . price($row[8]) . '</td>';
+		print '<td align="right">' . price($row[9]) . '</td>';
+		print '<td align="right">' . price($row[10]) . '</td>';
+		print '<td align="right">' . price($row[11]) . '</td>';
+		print '<td align="right">' . price($row[12]) . '</td>';
+		print '<td align="right"><b>' . price($row[13]) . '</b></td>';
+		print '</tr>';
+		$i ++;
+	}
+	$db->free($resql);
+} else {
+	print $db->lasterror(); // Show last sql error
+}
+print "</table>\n";
+
+if (! empty($conf->margin->enabled)) {
+	print "<br>\n";
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td width="400">' . $langs->trans("TotalMarge") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("JanuaryMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("FebruaryMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("MarchMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("AprilMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("MayMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("JuneMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("JulyMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("AugustMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("SeptemberMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("OctoberMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("NovemberMin") . '</td>';
+	print '<td width="60" align="center">' . $langs->trans("DecemberMin") . '</td>';
+	print '<td width="60" align="center"><b>' . $langs->trans("Total") . '</b></td></tr>';
+
+	$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',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=3,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Mars',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=4,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Avril',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=5,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Mai',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=6,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Juin',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=7,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Juillet',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=8,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Aout',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=9,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Septembre',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=10,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Octobre',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=11,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Novembre',";
+	$sql .= "  ROUND(SUM(IF(MONTH(f.datef)=12,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Decembre',";
+	$sql .= "  ROUND(SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))),2) as 'Total'";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+	$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 . "'";
+	}
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$i = 0;
+		$num = $db->num_rows($resql);
+
+		while ( $i < $num ) {
+			$row = $db->fetch_row($resql);
+
+			print '<tr><td>' . $row[0] . '</td>';
+			print '<td align="right">' . price($row[1]) . '</td>';
+			print '<td align="right">' . price($row[2]) . '</td>';
+			print '<td align="right">' . price($row[3]) . '</td>';
+			print '<td align="right">' . price($row[4]) . '</td>';
+			print '<td align="right">' . price($row[5]) . '</td>';
+			print '<td align="right">' . price($row[6]) . '</td>';
+			print '<td align="right">' . price($row[7]) . '</td>';
+			print '<td align="right">' . price($row[8]) . '</td>';
+			print '<td align="right">' . price($row[9]) . '</td>';
+			print '<td align="right">' . price($row[10]) . '</td>';
+			print '<td align="right">' . price($row[11]) . '</td>';
+			print '<td align="right">' . price($row[12]) . '</td>';
+			print '<td align="right"><b>' . price($row[13]) . '</b></td>';
+			print '</tr>';
+			$i ++;
+		}
+		$db->free($resql);
+	} else {
+		print $db->lasterror(); // Show last sql error
+	}
+	print "</table>\n";
+}
+print "</table>\n";
+print '</td></tr></table>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
new file mode 100644
index 00000000000..9215d5a9d98
--- /dev/null
+++ b/htdocs/accountancy/customer/lines.php
@@ -0,0 +1,224 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2014      Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>   
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/customer/lines.php
+ * \ingroup		Accounting Expert
+ * \brief		Page of detail of the lines of ventilation of invoices customers
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// langs
+$langs->load("bills");
+$langs->load("compta");
+$langs->load("main");
+$langs->load("accountancy");
+
+$account_parent = GETPOST('account_parent');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->ventilation->dispatch)
+	accessforbidden();
+
+$formventilation = new FormVentilation($db);
+
+// change account
+
+$changeaccount = GETPOST('changeaccount');
+
+$is_search = GETPOST('button_search_x');
+
+if (is_array($changeaccount) && count($changeaccount) > 0 && empty($is_search)) {
+	$error = 0;
+	
+	$db->begin();
+	
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l";
+	$sql1 .= " SET l.fk_code_ventilation=" . $account_parent;
+	$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
+	
+	dol_syslog('accountancy/customer/lines.php::changeaccount sql= ' . $sql1);
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		setEventMessage($db->lasterror(), 'errors');
+	}
+	if (! $error) {
+		$db->commit();
+		setEventMessage($langs->trans('Save'), 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans("CustomersVentilation") . ' - ' . $langs->trans("Dispatched"));
+
+$page = GETPOST("page");
+if ($page < 0)
+	$page = 0;
+
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
+	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+} elseif ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+	$limit = $conf->liste_limit;
+} else {
+	$limit = $conf->liste_limit;
+}
+
+$offset = $limit * $page;
+
+$sql = "SELECT l.rowid , f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht, l.qty, l.tva_tx, l.fk_code_ventilation, aa.label, aa.account_number,";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
+$sql .= " , " . MAIN_DB_PREFIX . "accountingaccount as aa";
+$sql .= " , " . MAIN_DB_PREFIX . "facturedet as l";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
+$sql .= " WHERE f.rowid = l.fk_facture AND f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
+$sql .= " AND aa.rowid = l.fk_code_ventilation";
+if (strlen(trim(GETPOST("search_facture")))) {
+	$sql .= " AND f.facnumber like '%" . GETPOST("search_facture") . "%'";
+}
+if (strlen(trim(GETPOST("search_ref")))) {
+	$sql .= " AND p.ref like '%" . GETPOST("search_ref") . "%'";
+}
+if (strlen(trim(GETPOST("search_label")))) {
+	$sql .= " AND p.label like '%" . GETPOST("search_label") . "%'";
+}
+if (strlen(trim(GETPOST("search_desc")))) {
+	$sql .= " AND l.description like '%" . GETPOST("search_desc") . "%'";
+}
+if (strlen(trim(GETPOST("search_account")))) {
+	$sql .= " AND aa.account_number like '%" . GETPOST("search_account") . "%'";
+}
+
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND f.entity = '" . $conf->entity . "'";
+}
+
+$sql .= " ORDER BY l.rowid";
+if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
+	$sql .= " DESC ";
+}
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog("/accountancy/customer/linges.php sql=" . $sql, LOG_DEBUG);
+$result = $db->query($sql);
+if ($result) {
+	$num_lines = $db->num_rows($result);
+	$i = 0;
+	
+	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
+	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
+	
+	print '<td align="left"><b>' . $langs->trans("DescVentilDoneCustomer") . '</b></td>';
+	
+	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<table class="noborder" width="100%">';
+	
+	print '<br><br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount");
+	print $formventilation->select_account($account_parent, 'account_parent', 1);
+	print '<input type="submit" class="butAction" value="' . $langs->trans("Validate") . '"/></div>';
+	
+	print '<tr class="liste_titre"><td>' . $langs->trans("Invoice") . '</td>';
+	print '<td>' . $langs->trans("Ref") . '</td>';
+	print '<td>' . $langs->trans("Label") . '</td>';
+	print '<td>' . $langs->trans("Description") . '</td>';
+	print '<td align="left">' . $langs->trans("Amount") . '</td>';
+	print '<td colspan="2" align="left">' . $langs->trans("Account") . '</td>';
+	print '<td align="center">&nbsp;</td>';
+	print '<td align="center">&nbsp;</td>';
+	print "</tr>\n";
+	
+	print '<tr class="liste_titre"><td><input name="search_facture" size="8" value="' . GETPOST("search_facture") . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . GETPOST("search_ref") . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . GETPOST("search_label") . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_desc" value="' . GETPOST("search_desc") . '"></td>';
+	print '<td align="right">&nbsp;</td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_account" value="' . GETPOST("search_account") . '"></td>';
+	print '<td align="center">&nbsp;</td>';
+	print '<td align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" alt="' . $langs->trans("Search") . '">';
+	print '</td>';
+	print '<td align="center">&nbsp;</td>';
+	print "</tr>\n";
+	
+	$facture_static = new Facture($db);
+	$product_static = new Product($db);
+	
+	$var = True;
+	while ( $objp = $db->fetch_object($result) ) {
+		$var = ! $var;
+		$codeCompta = $objp->account_number . ' ' . $objp->label;
+		
+		print "<tr $bc[$var]>";
+		
+		// Ref facture
+		$facture_static->ref = $objp->facnumber;
+		$facture_static->id = $objp->facid;
+		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
+		
+		// Ref produit
+		$product_static->ref = $objp->product_ref;
+		$product_static->id = $objp->product_id;
+		$product_static->type = $objp->type;
+		print '<td>';
+		if ($product_static->id)
+			print $product_static->getNomUrl(1);
+		else
+			print '&nbsp;';
+		print '</td>';
+		
+		print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
+		print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
+		print '<td align="left">' . price($objp->total_ht) . '</td>';
+		print '<td align="left">' . $codeCompta . '</td>';
+		print '<td>' . $objp->rowid . '</td>';
+		print '<td><a href="./card.php?id=' . $objp->rowid . '">';
+		print img_edit();
+		print '</a></td>';
+		
+		print '<td align="center"><input type="checkbox" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		
+		print "</tr>";
+		$i ++;
+	}
+} else {
+	print $db->error();
+}
+
+print "</table></form>";
+
+$db->close();
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
new file mode 100644
index 00000000000..3b68bd6b69e
--- /dev/null
+++ b/htdocs/accountancy/customer/list.php
@@ -0,0 +1,238 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/customer/list.php
+ * \ingroup		Accounting Expert
+ * \brief		Ventilation page from customers invoices
+ */
+
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("main");
+$langs->load("accountancy");
+
+$action = GETPOST('action');
+$codeventil = GETPOST('codeventil', 'array');
+$mesCasesCochees = GETPOST('mesCasesCochees', 'array');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->ventilation->dispatch)
+	accessforbidden();
+
+$formventilation = new FormVentilation($db);
+
+llxHeader('', $langs->trans("Ventilation"));
+
+/*
+ * Action
+*/
+
+if ($action == 'ventil') {
+	print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
+	if (! empty($codeventil) && ! empty($mesCasesCochees)) {
+		print '<div><font color="red">' . count($mesCasesCochees) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
+		$mesCodesVentilChoisis = $codeventil;
+		$cpt = 0;
+		foreach ( $mesCasesCochees as $maLigneCochee ) {
+			// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
+			$maLigneCourante = explode("_", $maLigneCochee);
+			$monId = $maLigneCourante[0];
+			$monNumLigne = $maLigneCourante[1];
+			$monCompte = $mesCodesVentilChoisis[$monNumLigne];
+
+			$sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
+			$sql .= " SET fk_code_ventilation = " . $monCompte;
+			$sql .= " WHERE rowid = " . $monId;
+
+			dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
+			if ($db->query($sql)) {
+				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
+			} else {
+				print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '<br/> <pre>' . $sql . '</pre></font></div>';
+			}
+
+			$cpt ++;
+		}
+	} else {
+		print '<div><font color="red">' . $langs->trans("AnyLineVentilate") . '</font></div>';
+	}
+	print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
+}
+
+/*
+ * Customer Invoice lines
+ */
+$page = GETPOST('page');
+if ($page < 0)
+	$page = 0;
+
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
+	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+	$limit = $conf->liste_limit;
+} else {
+	$limit = $conf->liste_limit;
+}
+
+$offset = $limit * $page;
+
+$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht, l.rowid, l.fk_code_ventilation,";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell";
+$sql .= " , aa.rowid as aarowid";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as l ON f.rowid = l.fk_facture";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON p.accountancy_code_sell = aa.account_number";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
+$sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation = 0";
+$sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL)";
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND f.entity = '" . $conf->entity . "'";
+}
+
+$sql .= " ORDER BY l.rowid";
+if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+	$sql .= " DESC ";
+}
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
+$result = $db->query($sql);
+if ($result) {
+	$num_lines = $db->num_rows($result);
+	$i = 0;
+
+	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
+	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
+
+	print '<br><b>' . $langs->trans("DescVentilTodoCustomer") . '</b></br>';
+
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
+	print '<input type="hidden" name="action" value="ventil">';
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>' . $langs->trans("Invoice") . '</td>';
+	print '<td>' . $langs->trans("Ref") . '</td>';
+	print '<td>' . $langs->trans("Label") . '</td>';
+	print '<td>' . $langs->trans("Description") . '</td>';
+	print '<td align="right">' . $langs->trans("Amount") . '</td>';
+	print '<td align="right">' . $langs->trans("AccountAccounting") . '</td>';
+	print '<td align="center">' . $langs->trans("IntoAccount") . '</td>';
+	print '<td align="center">' . $langs->trans("Ventilate") . '</td>';
+	print '</tr>';
+
+	$facture_static = new Facture($db);
+	$product_static = new Product($db);
+	$form = new Form($db);
+
+	$var = True;
+	while ( $i < min($num_lines, $limit) ) {
+		$objp = $db->fetch_object($result);
+		$var = ! $var;
+
+		// product_type: 0 = service ? 1 = product
+		// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
+		// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
+		$code_sell_notset = '';
+
+		if (empty($objp->code_sell)) {
+			$code_sell_notset = 'color:red';
+
+			if (! empty($objp->type)) {
+				if ($objp->type == 1) {
+					$objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				} else {
+					$objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				}
+			} else {
+				$code_sell_notset = 'color:blue';
+
+				if ($objp->type == 1) {
+					$objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				} else {
+					$objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				}
+			}
+		}
+
+		print "<tr $bc[$var]>";
+
+		// Ref facture
+		$facture_static->ref = $objp->facnumber;
+		$facture_static->id = $objp->facid;
+		print '<td>' . $facture_static->getNomUrl(1) . '</td>';
+
+		// Ref produit
+		$product_static->ref = $objp->product_ref;
+		$product_static->id = $objp->product_id;
+		$product_static->type = $objp->type;
+		print '<td>';
+		if ($product_static->id)
+			print $product_static->getNomUrl(1);
+		else
+			print '&nbsp;';
+		print '</td>';
+
+		print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
+		print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
+
+		print '<td align="right">';
+		print price($objp->total_ht);
+		print '</td>';
+
+		print '<td align="center" style="' . $code_sell_notset . '">';
+		print $objp->code_sell;
+		print '</td>';
+
+		// Colonne choix du compte
+		print '<td align="center">';
+		print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1);
+		print '</td>';
+
+		// Colonne choix ligne a ventiler
+		print '<td align="center">';
+		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
+		print '</td>';
+
+		print '</tr>';
+		$i ++;
+	}
+
+	print '</table>';
+	print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></div>';
+	print '</form>';
+} else {
+	print $db->error();
+}
+
+$db->close();
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/accountancy/index.html b/htdocs/accountancy/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/accountancy/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
new file mode 100644
index 00000000000..1f9b0549121
--- /dev/null
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -0,0 +1,590 @@
+<?php
+/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
+ * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2013		Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2013-2014  Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014  Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014  Olivier Geffroy		<jeff@jeffinfo.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		htdocs/accountancy/journal/bankjournal.php
+ *	\ingroup	Accounting Expert
+ *	\brief		Page with sells journal
+ */
+
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+
+// Langs
+$langs->load("companies");
+$langs->load("other");
+$langs->load("compta");
+$langs->load("bank");
+$langs->load('bills');
+$langs->load("accountancy");
+
+$id_accountancy_journal = GETPOST('id_account');
+
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
+$action = GETPOST('action');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+
+/*
+ * View
+ */
+if (empty($id_accountancy_journal))
+{
+	accessforbidden();
+}
+
+$year_current = strftime("%Y", dol_now());
+$pastmonth = strftime("%m", dol_now()) - 1;
+$pastmonthyear = $year_current;
+if ($pastmonth == 0) {
+	$pastmonth = 12;
+	$pastmonthyear --;
+}
+
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+}
+
+$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+$idpays = $p[0];
+
+$sql = "SELECT b.rowid , b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, soc.code_compta, ba.courant,";
+$sql .= " soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, ba.account_number, bu1.type as typeop";
+$sql .= " FROM " . MAIN_DB_PREFIX . "bank b";
+$sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account ba on b.fk_account=ba.rowid";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe soc on bu1.url_id=soc.rowid";
+// To isolate the cash of the other accounts
+$sql .= " WHERE ba.courant <> 2";
+$sql .= " AND ba.rowid=".$id_accountancy_journal;
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND ba.entity = " . $conf->entity;
+}
+if ($date_start && $date_end)
+	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
+$sql .= " ORDER BY b.datev";
+
+$object = new Account($db);
+$paymentstatic = new Paiement($db);
+$paymentsupplierstatic = new PaiementFourn($db);
+$societestatic = new Societe($db);
+$chargestatic = new ChargeSociales($db);
+$paymentvatstatic = new TVA($db);
+$paymentsalstatic = new PaymentSalary($db);
+
+dol_syslog("accountancy/journal/bankjournal.php:: sql=" . $sql, LOG_DEBUG);
+$result = $db->query($sql);
+if ($result) {
+
+	$num = $db->num_rows($result);
+	// Variables
+	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
+	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
+	$cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
+	$accountancy_account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef"));
+
+	$tabpay = array ();
+	$tabbq = array ();
+	$tabtp = array ();
+	$tabtype = array ();
+
+	$i = 0;
+	while ( $i < $num )
+	{
+		$obj = $db->fetch_object($result);
+
+		$tabcompany[$obj->rowid] = array(
+				'id' => $obj->socid,
+				'name' => $obj->name,
+				'code_client' => $obj->code_compta
+		);
+
+		// Controls
+		$compta_bank = $obj->account_number;
+		if ($obj->label == '(SupplierInvoicePayment)')
+			$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $cptfour);
+		if ($obj->label == '(CustomerInvoicePayment)')
+			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $cptcli);
+		if ($obj->typeop == '(BankTransfert)')
+			$compta_soc = $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH;
+
+		// Variable bookkeeping
+		$tabpay[$obj->rowid]["date"] = $obj->do;
+		$tabpay[$obj->rowid]["type_payment"] = $obj->fk_type;
+		$tabpay[$obj->rowid]["ref"] = $obj->label;
+		$tabpay[$obj->rowid]["fk_bank"] = $obj->rowid;
+		if (preg_match('/^\((.*)\)$/i', $obj->label, $reg)) {
+			$tabpay[$obj->rowid]["lib"] = $langs->trans($reg[1]);
+		} else {
+			$tabpay[$obj->rowid]["lib"] = dol_trunc($obj->label, 60);
+		}
+		$links = $object->get_url($obj->rowid);
+
+		foreach ( $links as $key => $val )
+		{
+			$tabtype[$obj->rowid] = $links[$key]['type'];
+
+			if ($links[$key]['type'] == 'payment')
+			{
+				$paymentstatic->id = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
+			}
+			else if ($links[$key]['type'] == 'payment_supplier')
+			{
+				$paymentsupplierstatic->id = $links[$key]['url_id'];
+				$paymentsupplierstatic->ref = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
+			}
+			else if ($links[$key]['type'] == 'company')
+			{
+				$societestatic->id = $links[$key]['url_id'];
+				$societestatic->name = $links[$key]['label'];
+				$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
+				$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+			}
+			else if ($links[$key]['type'] == 'sc')
+			{
+				$chargestatic->id = $links[$key]['url_id'];
+				$chargestatic->ref = $links[$key]['url_id'];
+
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
+				if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
+					if ($reg[1] == 'socialcontribution')
+						$reg[1] = 'SocialContribution';
+					$chargestatic->lib = $langs->trans($reg[1]);
+				}
+				else
+				{
+					$chargestatic->lib = $links[$key]['label'];
+				}
+				$chargestatic->ref = $chargestatic->lib;
+				$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
+
+				$sqlmid = 'SELECT cchgsoc.accountancy_code';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
+				$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
+
+				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid)
+				{
+					$objmid = $db->fetch_object($resultmid);
+					$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
+				}
+			}
+			else if ($links[$key]['type'] == 'payment_vat')
+			{
+				$paymentvatstatic->id = $links[$key]['url_id'];
+				$paymentvatstatic->ref = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+			}
+			else if ($links[$key]['type'] == 'payment_salary')
+			{
+				$paymentsalstatic->id = $links[$key]['url_id'];
+				$paymentsalstatic->ref = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$accountancy_account_salary] += $obj->amount;
+			}
+			else if ($links[$key]['type'] == 'banktransfert')
+			{
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+			}
+			/*else {
+				$tabtp [$obj->rowid] [$accountancy_account_salary] += $obj->amount;
+			}*/
+		}
+		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
+
+		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+
+		$i ++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+/*
+ * Actions
+ */
+
+// Write bookkeeping
+if ($action == 'writeBookKeeping')
+{
+	$error = 0;
+	foreach ( $tabpay as $key => $val )
+	{
+		// Bank
+		foreach ( $tabbq[$key] as $k => $mt )
+		{
+			$bookkeeping = new BookKeeping($db);
+			$bookkeeping->doc_date = $val["date"];
+			$bookkeeping->doc_ref = $val["ref"];
+			$bookkeeping->doc_type = 'bank';
+			$bookkeeping->fk_doc = $key;
+			$bookkeeping->fk_docdet = $val["fk_bank"];
+			$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+			$bookkeeping->numero_compte = $k;
+			$bookkeeping->label_compte = $compte->label;
+			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+			$bookkeeping->code_journal = $conf->global->ACCOUNTING_BANK_JOURNAL;
+
+			if ($tabtype[$key] == 'payment') {
+
+				$sqlmid = 'SELECT fac.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+			} else if ($tabtype[$key] == 'payment_supplier') {
+
+				$sqlmid = 'SELECT facf.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+			}
+
+			$result = $bookkeeping->create();
+			if ($result < 0) {
+				$error ++;
+				setEventMessage($object->errors, 'errors');
+			}
+		}
+		// Third party
+		foreach ( $tabtp[$key] as $k => $mt )
+		{
+			$bookkeeping = new BookKeeping($db);
+			$bookkeeping->doc_date = $val["date"];
+			$bookkeeping->doc_ref = $val["ref"];
+			$bookkeeping->doc_type = 'banque';
+			$bookkeeping->fk_doc = $key;
+			$bookkeeping->fk_docdet = $val["fk_bank"];
+			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+			$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+			$bookkeeping->code_journal = $conf->global->ACCOUNTING_BANK_JOURNAL;
+
+			if ($tabtype[$key] == 'sc') {
+				$bookkeeping->code_tiers = '';
+				$bookkeeping->numero_compte = $k;
+			} else if ($tabtype[$key] == 'payment') {
+
+				$sqlmid = 'SELECT fac.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+				$bookkeeping->code_tiers = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+			} else if ($tabtype[$key] == 'payment_supplier') {
+
+				$sqlmid = 'SELECT facf.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+				$bookkeeping->code_tiers = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+			} else if ($tabtype[$key] == 'company') {
+
+				$sqlmid = 'SELECT fac.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+				$bookkeeping->code_tiers = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+			} else {
+
+				$bookkeeping->doc_ref = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+			}
+
+			$result = $bookkeeping->create();
+			if ($result < 0) {
+				$error ++;
+				setEventMessage($object->errors, 'errors');
+			}
+		}
+	}
+
+	if (empty($error)) {
+		setEventMessage($langs->trans('Success'), 'mesgs');
+	}
+}
+// export csv
+if ($action == 'export_csv')
+{
+	$sep = $conf->global->ACCOUNTING_SEPARATORCSV;
+
+	header('Content-Type: text/csv');
+	header('Content-Disposition: attachment;filename=journal_banque.csv');
+
+	$companystatic = new Client($db);
+
+	if ($conf->global->ACCOUNTING_MODELCSV == 1) 	// Modèle Export Cegid Expert
+	{
+		foreach ( $tabpay as $key => $val ) {
+			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
+
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+
+			// Bank
+			print $date . $sep;
+			print $conf->global->ACCOUNTING_BANK_JOURNAL . $sep;
+			foreach ( $tabbq[$key] as $k => $mt ) {
+				print length_accountg(html_entity_decode($k)) . $sep;
+				print $sep;
+				print ($mt < 0 ? 'C' : 'D') . $sep;
+				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+				print $val["type_payment"] . $sep;
+				print $sep;
+			}
+			print "\n";
+
+			// Third party
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($mt) {
+					print $date . $sep;
+					print $conf->global->ACCOUNTING_BANK_JOURNAL . $sep;
+					if ($val["lib"] == '(SupplierInvoicePayment)') {
+						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+					} else {
+						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+					}
+					print length_accounta(html_entity_decode($k)) . $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print $val["type_payment"] . $sep;
+					print $sep;
+					print "\n";
+				}
+			}
+		}
+	} else 	// Modèle Export Classique
+	{
+		foreach ( $tabpay as $key => $val ) {
+			$date = dol_print_date($db->jdate($val["date"]), 'day');
+
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+
+			print '"' . $date . '"' . $sep;
+			print '"' . $val["type_payment"] . '"' . $sep;
+
+			// Bank
+			foreach ( $tabbq[$key] as $k => $mt ) {
+				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $langs->trans("Bank") . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+			}
+			print "\n";
+
+			// Third party
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["type_payment"] . '"' . $sep;
+
+					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					print '"' . $companystatic->name . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
+		}
+	}
+}
+else
+{
+
+	$form = new Form($db);
+
+	llxHeader('', $langs->trans("BankJournal"));
+
+	$namereport = $langs->trans("BankJournal");
+	$namelink = '';
+	$periodlink = '';
+	$exportlink = '';
+	$builddate = time();
+	$description = $langs->trans("DescBankJournal") . '<br>';
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	report_header($namereport, $namelink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	print '<input type="button" class="button" style="float: right;" value="Export CSV" onclick="launch_export();" />';
+
+	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writeBookKeeping();" />';
+
+	print '
+	<script type="text/javascript">
+		function launch_export() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+		function writeBookKeeping() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writeBookKeeping");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+	</script>';
+
+	/*
+	 * Show result array
+	 */
+	print '<br><br>';
+
+	$i = 0;
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	print "<td>" . $langs->trans("Date") . "</td>";
+	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
+	print "<td>" . $langs->trans("Account") . "</td>";
+	print "<td>" . $langs->trans("Type") . "</td>";
+	print "<td>" . $langs->trans("PaymentMode") . "</td>";
+	print "<td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "</tr>\n";
+
+	$var = true;
+	$r = '';
+
+	foreach ( $tabpay as $key => $val ) {
+		$date = dol_print_date($db->jdate($val["date"]), 'day');
+
+		if ($val["lib"] == '(SupplierInvoicePayment)')
+			$reflabel = $langs->trans('SupplierInvoicePayment');
+		if ($val["lib"] == '(CustomerInvoicePayment)')
+			$reflabel = $langs->trans('CustomerInvoicePayment');
+
+		// Bank
+		foreach ( $tabbq[$key] as $k => $mt ) {
+			if (1) {
+				print "<tr " . $bc[$var] . ">";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $reflabel . "</td>";
+				print "<td>" . length_accountg($k) . "</td>";
+				print "<td>" . $langs->trans('Bank') . "</td>";
+				print "<td>" . $val["type_payment"] . "</td>";
+				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+
+		// Third party
+		foreach ( $tabtp[$key] as $k => $mt ) {
+			if ($k != 'type') {
+				print "<tr " . $bc[$var] . ">";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $val["soclib"] . "</td>";
+				print "<td>" . length_accounta($k) . "</td>";
+				print "<td>" . $langs->trans('ThirdParty') . " (" . $val['soclib'] . ")</td>";
+				print "<td>" . $val["type_payment"] . "</td>";
+				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+
+		$var = ! $var;
+	}
+
+	print "</table>";
+
+	// End of page
+	llxFooter();
+}
+
+$db->close();
diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php
new file mode 100644
index 00000000000..fb5a15a513c
--- /dev/null
+++ b/htdocs/accountancy/journal/cashjournal.php
@@ -0,0 +1,531 @@
+<?php
+/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
+ * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2013		Christophe Battarel	<christophe.battarel@altairis.fr>
+ * Copyright (C) 2013-2014  Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014  Florian Henry	    <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014  Olivier Geffroy     <jeff@jeffinfo.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/journal/cashjournal.php
+ * \ingroup		Accounting Expert
+ * \brief		Page with cash journal
+ */
+
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+
+// Langs
+$langs->load("companies");
+$langs->load("other");
+$langs->load("compta");
+$langs->load("bank");
+$langs->load("accountancy");
+
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+
+$action = GETPOST('action');
+
+/*
+ * View
+ */
+
+$year_current = strftime("%Y", dol_now());
+$pastmonth = strftime("%m", dol_now()) - 1;
+$pastmonthyear = $year_current;
+if ($pastmonth == 0) {
+	$pastmonth = 12;
+	$pastmonthyear --;
+}
+
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+}
+
+$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+$idpays = $p[0];
+
+$sql = "SELECT b.rowid , b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, soc.code_compta, ba.courant,";
+$sql .= " soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, ba.account_number, bu1.type as typeop";
+$sql .= " FROM " . MAIN_DB_PREFIX . "bank b";
+$sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account ba on b.fk_account=ba.rowid";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe soc on bu1.url_id=soc.rowid";
+
+// Code opération type caisse
+$sql .= " WHERE ba.courant = 2";
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND ba.entity = " . $conf->entity;
+}
+
+if ($date_start && $date_end)
+	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
+$sql .= " ORDER BY b.datev";
+
+$object = new Account($db);
+$paymentstatic = new Paiement($db);
+$paymentsupplierstatic = new PaiementFourn($db);
+$societestatic = new Societe($db);
+$chargestatic = new ChargeSociales($db);
+$paymentvatstatic = new TVA($db);
+
+dol_syslog("accountancy/journal/cashjournal.php:: sql=" . $sql, LOG_DEBUG);
+$result = $db->query($sql);
+if ($result) {
+
+	$num = $db->num_rows($result);
+	// les variables
+	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
+	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
+	$cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
+	$cptsociale = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef"));
+
+	$tabpay = array ();
+	$tabbq = array ();
+	$tabtp = array ();
+	$tabcompany = array ();
+	$tabtype = array ();
+
+	$i = 0;
+	while ( $i < $num ) {
+		$obj = $db->fetch_object($result);
+
+		// controls
+		$compta_bank = $obj->account_number;
+		if ($obj->label == '(SupplierInvoicePayment)')
+			$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $cptfour);
+		if ($obj->label == '(CustomerInvoicePayment)')
+			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $cptcli);
+		if ($obj->typeop == '(BankTransfert)')
+			$compta_soc = $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH;
+
+			// variable bookkeeping
+
+		$tabpay[$obj->rowid]["date"] = $obj->do;
+		$tabpay[$obj->rowid]["ref"] = $obj->label;
+		$tabpay[$obj->rowid]["fk_bank"] = $obj->rowid;
+		if (preg_match('/^\((.*)\)$/i', $obj->label, $reg)) {
+			$tabpay[$obj->rowid]["lib"] = $langs->trans($reg[1]);
+		} else {
+			$tabpay[$obj->rowid]["lib"] = dol_trunc($obj->label, 60);
+		}
+		$links = $object->get_url($obj->rowid);
+
+		foreach ( $links as $key => $val ) {
+
+			$tabtype[$obj->rowid] = $links[$key]['type'];
+
+			if ($links[$key]['type'] == 'payment') {
+				$paymentstatic->id = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
+			} else if ($links[$key]['type'] == 'payment_supplier') {
+				$paymentsupplierstatic->id = $links[$key]['url_id'];
+				$paymentsupplierstatic->ref = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
+			} else if ($links[$key]['type'] == 'company') {
+
+				$societestatic->id = $links[$key]['url_id'];
+				$societestatic->name = $links[$key]['label'];
+				$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
+				$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+			} else if ($links[$key]['type'] == 'sc') {
+
+				$chargestatic->id = $links[$key]['url_id'];
+				$chargestatic->ref = $links[$key]['url_id'];
+
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
+				if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
+					if ($reg[1] == 'socialcontribution')
+						$reg[1] = 'SocialContribution';
+					$chargestatic->lib = $langs->trans($reg[1]);
+				} else {
+					$chargestatic->lib = $links[$key]['label'];
+				}
+				$chargestatic->ref = $chargestatic->lib;
+				$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
+
+				$sqlmid = 'SELECT cchgsoc.accountancy_code';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON  chgsoc.fk_type=cchgsoc.id";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON  paycharg.fk_charge=chgsoc.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON  bkurl.url_id=paycharg.rowid";
+				$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
+				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
+				}
+			} else if ($links[$key]['type'] == 'payment_vat') {
+
+				$paymentvatstatic->id = $links[$key]['url_id'];
+				$paymentvatstatic->ref = $links[$key]['url_id'];
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+			} else if ($links[$key]['type'] == 'banktransfert') {
+				$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+				$tabtp[$obj->rowid][$cpttva] += $obj->amount;
+			}
+			/*else {
+				$tabtp [$obj->rowid] [$cptsociale] += $obj->amount;
+			}*/
+		}
+		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
+
+		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+
+		$i ++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+/*
+ * Actions
+*/
+
+// write bookkeeping
+if ($action == 'writeBookKeeping') {
+	$error = 0;
+	foreach ( $tabpay as $key => $val ) {
+		// cash
+		foreach ( $tabbq[$key] as $k => $mt ) {
+			$bookkeeping = new BookKeeping($db);
+			$bookkeeping->doc_date = $val["date"];
+			$bookkeeping->doc_ref = $val["ref"];
+			$bookkeeping->doc_type = 'cash';
+			$bookkeeping->fk_doc = $key;
+			$bookkeeping->fk_docdet = $val["fk_bank"];
+			$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+			$bookkeeping->numero_compte = $k;
+			$bookkeeping->label_compte = $compte->label;
+			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+			$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+			$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+			$bookkeeping->code_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
+
+			if ($tabtype[$key] == 'payment') {
+
+				$sqlmid = 'SELECT fac.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+			} else if ($tabtype[$key] == 'payment_supplier') {
+
+				$sqlmid = 'SELECT facf.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+			}
+
+			$result = $bookkeeping->create();
+			if ($result < 0) {
+				$error ++;
+				setEventMessage($object->errors, 'errors');
+			}
+		}
+		// third party
+		foreach ( $tabtp[$key] as $k => $mt ) {
+
+			$bookkeeping = new BookKeeping($db);
+			$bookkeeping->doc_date = $val["date"];
+			$bookkeeping->doc_ref = $val["ref"];
+			$bookkeeping->doc_type = 'cash';
+			$bookkeeping->fk_doc = $key;
+			$bookkeeping->fk_docdet = $val["fk_bank"];
+			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+			$bookkeeping->montant = ($mt < 0 ? - $mt : $mt);
+			$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+			$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+			$bookkeeping->credit = ($mt >= 0 ? $mt : 0);
+			$bookkeeping->code_journal = $conf->global->ACCOUNTING_CASH_JOURNAL;
+
+			if ($tabtype[$key] == 'sc') {
+				$bookkeeping->code_tiers = '';
+				$bookkeeping->numero_compte = $k;
+			} else if ($tabtype[$key] == 'payment') {
+
+				$sqlmid = 'SELECT fac.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+				$bookkeeping->code_tiers = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+			} else if ($tabtype[$key] == 'payment_supplier') {
+
+				$sqlmid = 'SELECT facf.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture_fourn facf ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
+				$sqlmid .= " WHERE payf.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+				$bookkeeping->code_tiers = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+			} else if ($tabtype[$key] == 'company') {
+
+				$sqlmid = 'SELECT fac.facnumber';
+				$sqlmid .= " FROM " . MAIN_DB_PREFIX . "facture fac ";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
+				$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as pay ON  payfac.fk_paiement=pay.rowid";
+				$sqlmid .= " WHERE pay.fk_bank=" . $key;
+				dol_syslog("accountancy/journal/cashjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+				$resultmid = $db->query($sqlmid);
+				if ($resultmid) {
+					$objmid = $db->fetch_object($resultmid);
+					$bookkeeping->doc_ref = $objmid->facnumber;
+				}
+				$bookkeeping->code_tiers = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+			} else {
+
+				$bookkeeping->doc_ref = $k;
+				$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+			}
+
+			$result = $bookkeeping->create();
+			if ($result < 0) {
+				$error ++;
+				setEventMessage($object->errors, 'errors');
+			}
+		}
+	}
+
+	if (empty($error)) {
+		setEventMessage($langs->trans('Success'), 'mesgs');
+	}
+}
+// export csv
+if ($action == 'export_csv') {
+	$sep = $conf->global->ACCOUNTING_SEPARATORCSV;
+
+	header('Content-Type: text/csv');
+	header('Content-Disposition:attachment;filename=journal_caisse.csv');
+
+	if ($conf->global->ACCOUNTING_MODELCSV == 1) 	// Modèle Export Cegid Expert
+	{
+		foreach ( $tabpay as $key => $val ) {
+			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
+
+			// Cash
+			print $date . $sep;
+			print $conf->global->ACCOUNTING_CASH_JOURNAL . $sep;
+
+			foreach ( $tabbq[$key] as $k => $mt ) {
+				print length_accountg(html_entity_decode($k)) . $sep;
+				print $sep;
+				print ($mt < 0 ? 'C' : 'D') . $sep;
+				print price($mt) . $sep;
+			}
+			print utf8_decode($langs->trans("CashPayment")) . $sep;
+			print $val["ref"] . $sep;
+			print "\n";
+
+			// Third party
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($mt) {
+					print $date . $sep;
+					print $conf->global->ACCOUNTING_CASH_JOURNAL . $sep;
+					if ($obj->label == '(SupplierInvoicePayment)') {
+						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+					} else {
+						print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+					}
+					print length_accounta(html_entity_decode($k)) . $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print price($mt) . $sep;
+					print $langs->trans("ThirdParty") . $sep;
+					print $val["ref"] . $sep;
+					print "\n";
+				}
+			}
+		}
+	} else 	// Modèle Export Classique
+	{
+		foreach ( $tabpay as $key => $val ) {
+			$date = dol_print_date($db->jdate($val["date"]), 'day');
+			print '"' . $date . '"' . $sep;
+			print '"' . $val["ref"] . '"' . $sep;
+
+			// Cash
+			foreach ( $tabbq[$key] as $k => $mt ) {
+				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+				print '"' . $langs->trans("Cash") . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+			}
+			print "\n";
+
+			// Third party
+			foreach ( $tabtp[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					print '"' . $langs->trans("ThirdParty") . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
+		}
+	}
+} else {
+
+	$form = new Form($db);
+
+	llxHeader('', $langs->trans("CashJournal"), '');
+
+	$name = $langs->trans("CashJournal");
+	$nomlink = '';
+	$periodlink = '';
+	$exportlink = '';
+	$builddate = time();
+	$description = $langs->trans("DescCashJournal") . '<br>';
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	report_header($name, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	print '<input type="button" class="button" style="float: right;" value="Export CSV" onclick="launch_export();" />';
+
+	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writeBookKeeping();" />';
+
+	print '
+	<script type="text/javascript">
+		function launch_export() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+		function writeBookKeeping() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writeBookKeeping");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+	</script>';
+
+	/*
+	 * Show result array
+	 */
+	print '<br><br>';
+
+	$i = 0;
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	print "<td>" . $langs->trans("Date") . "</td>";
+	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
+	print "<td>" . $langs->trans("Account") . "</td>";
+	print "<td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "</tr>\n";
+
+	$var = true;
+	$r = '';
+
+	foreach ( $tabpay as $key => $val ) {
+		$date = dol_print_date($db->jdate($val["date"]), 'day');
+
+		// Cash
+		foreach ( $tabbq[$key] as $k => $mt ) {
+			if (1) {
+				print "<tr " . $bc[$var] . " >";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $val["lib"] . "</td>";
+				print "<td>" . length_accountg($k) . "</td>";
+				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+
+		// third party
+		foreach ( $tabtp[$key] as $k => $mt ) {
+			if ($k != 'type') {
+				print "<tr " . $bc[$var] . ">";
+
+				print "<td>" . $date . "</td>";
+				print "<td>" . $val["soclib"] . "</td>";
+
+				print "<td>" . length_accounta($k) . "</td>";
+				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+			}
+		}
+
+		$var = ! $var;
+	}
+
+	print "</table>";
+
+	// End of page
+	llxFooter();
+}
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/journal/index.html b/htdocs/accountancy/journal/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/accountancy/journal/index.php b/htdocs/accountancy/journal/index.php
new file mode 100644
index 00000000000..36286ce265e
--- /dev/null
+++ b/htdocs/accountancy/journal/index.php
@@ -0,0 +1,46 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014  Florian Henry	    <florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/accountancy/journal/index.php
+ * \ingroup		Accounting Expert
+ * \brief		Index
+ */
+
+require '../../main.inc.php';
+	
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+
+llxHeader('', 'Journaux', '');
+
+$form = new Form($db);
+
+// End of page
+$db->close();
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
new file mode 100644
index 00000000000..d2f204c6b8c
--- /dev/null
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -0,0 +1,472 @@
+<?php
+/* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
+ * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012		Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2013-2014  Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014  Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014  Florian Henry	    <florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/journal/purchasesjournal.php
+ * \ingroup		Accounting Expert
+ * \brief		Page with purchases journal
+ */
+
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+
+$action = GETPOST('action');
+
+
+
+/*
+ * Actions
+ */
+
+$year_current = strftime("%Y", dol_now());
+$pastmonth = strftime("%m", dol_now()) - 1;
+$pastmonthyear = $year_current;
+if ($pastmonth == 0) {
+	$pastmonth = 12;
+	$pastmonthyear --;
+}
+
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+}
+
+$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+$idpays = $p[0];
+
+$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,";
+$sql .= " fd.rowid as fdid, fd.description, fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_type,";
+$sql .= " s.rowid as socid, s.nom as name, s.code_compta_fournisseur, s.fournisseur,";
+$sql .= " s.code_compta_fournisseur, p.accountancy_code_buy , ct.accountancy_code_buy as account_tva, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
+$sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql .= " WHERE f.fk_statut > 0 ";
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND f.entity = " . $conf->entity;
+}
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+	$sql .= " AND f.type IN (0,1,2)";
+else
+	$sql .= " AND f.type IN (0,1,2,3)";
+if ($date_start && $date_end)
+	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+$sql .= " ORDER BY f.datef";
+
+dol_syslog('accountancy/journal/purchasesjournal.php:: $sql=' . $sql);
+$result = $db->query($sql);
+if ($result) {
+	$num = $db->num_rows($result);
+	// les variables
+	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef");
+	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef");
+
+	$tabfac = array ();
+	$tabht = array ();
+	$tabtva = array ();
+	$tabttc = array ();
+	$tabcompany = array ();
+
+	$i = 0;
+	while ( $i < $num ) {
+		$obj = $db->fetch_object($result);
+		// contrôles
+		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
+		$compta_prod = $obj->compte;
+		if (empty($compta_prod)) {
+			if ($obj->product_type == 0)
+				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef");
+			else
+				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef");
+		}
+		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
+
+		$tabfac[$obj->rowid]["date"] = $obj->df;
+		$tabfac[$obj->rowid]["ref"] = $obj->ref;
+		$tabfac[$obj->rowid]["type"] = $obj->type;
+		$tabfac[$obj->rowid]["description"] = $obj->description;
+		$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
+		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
+		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
+		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
+		$tabcompany[$obj->rowid] = array (
+				'id' => $obj->socid,
+				'name' => $obj->name,
+				'code_fournisseur' => $obj->code_compta_fournisseur
+		);
+
+		$i ++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+// Bookkeeping Write
+if ($action == 'writebookkeeping') {
+	$now = dol_now();
+
+	foreach ( $tabfac as $key => $val ) {
+		foreach ( $tabttc[$key] as $k => $mt ) {
+			// get compte id and label
+
+			$bookkeeping = new BookKeeping($db);
+			$bookkeeping->doc_date = $val["date"];
+			$bookkeeping->doc_ref = $val["ref"];
+			$bookkeeping->date_create = $now;
+			$bookkeeping->doc_type = 'supplier_invoice';
+			$bookkeeping->fk_doc = $key;
+			$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
+			$bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur'];
+			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+			$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+			$bookkeeping->montant = $mt;
+			$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+			$bookkeeping->debit = ($mt <= 0) ? $mt : 0;
+			$bookkeeping->credit = ($mt > 0) ? $mt : 0;
+			$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+
+			$bookkeeping->create();
+		}
+
+		// Product / Service
+		foreach ( $tabht[$key] as $k => $mt ) {
+			if ($mt) {
+				// get compte id and label
+				$compte = new AccountingAccount($db);
+				if ($compte->fetch(null, $k)) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'supplier_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->label_compte = dol_trunc($val["description"], 128);
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+
+					$bookkeeping->create();
+				}
+			}
+		}
+
+		// VAT
+		// var_dump($tabtva);
+		foreach ( $tabtva[$key] as $k => $mt ) {
+			if ($mt) {
+				// get compte id and label
+
+				$bookkeeping = new BookKeeping($db);
+				$bookkeeping->doc_date = $val["date"];
+				$bookkeeping->doc_ref = $val["ref"];
+				$bookkeeping->date_create = $now;
+				$bookkeeping->doc_type = 'supplier_invoice';
+				$bookkeeping->fk_doc = $key;
+				$bookkeeping->fk_docdet = $val["fk_facturefourndet"];
+				$bookkeeping->code_tiers = '';
+				$bookkeeping->label_compte = $langs->trans("VAT");
+				$bookkeeping->numero_compte = $k;
+				$bookkeeping->montant = $mt;
+				$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
+				$bookkeeping->debit = ($mt > 0) ? $mt : 0;
+				$bookkeeping->credit = ($mt <= 0) ? $mt : 0;
+				$bookkeeping->code_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL;
+
+				$bookkeeping->create();
+			}
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+$companystatic = new Societe($db);
+
+// export csv
+if ($action == 'export_csv')
+{
+	$sep = $conf->global->ACCOUNTING_SEPARATORCSV;
+
+	header('Content-Type: text/csv');
+	header('Content-Disposition: attachment;filename=journal_achats.csv');
+
+	if ($conf->global->ACCOUNTING_MODELCSV == 1) 	// Modèle Export Cegid Expert
+	{
+		foreach ( $tabfac as $key => $val ) {
+			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
+
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				$companystatic->id = $tabcompany[$key]['id'];
+				$companystatic->name = $tabcompany[$key]['name'];
+				$companystatic->client = $tabcompany[$key]['code_client'];
+
+				if ($mt) {
+					print $date . $sep;
+					print $conf->global->ACCOUNTING_PURCHASE_JOURNAL . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'C' : 'D') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print dol_trunc($val["description"], 32) . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
+
+			// VAT
+			// var_dump($tabtva);
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print $date . $sep;
+					print $conf->global->ACCOUNTING_PURCHASE_JOURNAL . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'C' : 'D') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print $langs->trans("VAT") . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
+			print $date . $sep;
+			print $conf->global->ACCOUNTING_PURCHASE_JOURNAL . $sep;
+			print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep;
+
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print length_accounta(html_entity_decode($k)) . $sep;
+				print ($mt < 0 ? 'D' : 'C') . $sep;
+				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+				print utf8_decode($companystatic->name) . $sep;
+				print $val["ref"];
+			}
+			print "\n";
+		}
+	} else 	// Modèle Export Classique
+	{
+		foreach ( $tabfac as $key => $val ) {
+			$date = dol_print_date($db->jdate($val["date"]), 'day');
+
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
+
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . dol_trunc($val["description"], 32) . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+					print "\n";
+				}
+			}
+			// VAT
+			// var_dump($tabtva);
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+					print "\n";
+				}
+			}
+
+			// Third party
+			print '"' . $date . '"' . $sep;
+			print '"' . $val["ref"] . '"' . $sep;
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . utf8_decode($companystatic->name) . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+			}
+			print "\n";
+		}
+	}
+} else {
+
+	llxHeader('', '', '');
+
+	$form = new Form($db);
+
+	$nom = $langs->trans("PurchasesJournal");
+	$nomlink = '';
+	$periodlink = '';
+	$exportlink = '';
+	$builddate = time();
+	$description = $langs->trans("DescPurchasesJournal") . '<br>';
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	else
+		$description .= $langs->trans("DepositsAreIncluded");
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	print '<input type="button" class="button" style="float: right;" value="Export CSV" onclick="launch_export();" />';
+
+	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+
+	print '
+	<script type="text/javascript">
+		function launch_export() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+		function writebookkeeping() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+	</script>';
+
+	/*
+	 * Show result array
+	 */
+	print '<br><br>';
+
+	$i = 0;
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	// /print "<td>".$langs->trans("JournalNum")."</td>";
+	print "<td>" . $langs->trans("Date") . "</td>";
+	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
+	print "<td>" . $langs->trans("Account") . "</td>";
+	print "<t><td>" . $langs->trans("Type") . "</td><td align='right'>" . $langs->trans("Debit") . "</td><td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "</tr>\n";
+
+	$var = true;
+	$r = '';
+
+	$invoicestatic = new FactureFournisseur($db);
+	$companystatic = new Fournisseur($db);
+
+	foreach ( $tabfac as $key => $val ) {
+		$invoicestatic->id = $key;
+		$invoicestatic->ref = $val["ref"];
+		$invoicestatic->type = $val["type"];
+		$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
+
+		$date = dol_print_date($db->jdate($val["date"]), 'day');
+
+		// Product / Service
+		foreach ( $tabht[$key] as $k => $mt ) {
+			if ($mt) {
+				print "<tr " . $bc[$var] . " >";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				print "<td>" . length_accountg($k) . "</td>";
+				print "<td>" . $invoicestatic->description . "</td>";
+				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+		// VAT
+		// var_dump($tabtva);
+		foreach ( $tabtva[$key] as $k => $mt ) {
+			if ($mt) {
+				print "<tr " . $bc[$var] . " >";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				print "<td>" . length_accountg($k) . "</td><td>" . $langs->trans("VAT") . "</td>";
+				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+		print "<tr " . $bc[$var] . ">";
+
+		// Third party
+		print "<td>" . $date . "</td>";
+		print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+
+		foreach ( $tabttc[$key] as $k => $mt ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+
+			print "<td>" . length_accounta($k);
+			print "</td><td>" . $langs->trans("ThirdParty");
+			print ' (' . $companystatic->getNomUrl(0, 'supplier', 16) . ')';
+			print "</td>";
+			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
+			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+		}
+		print "</tr>";
+
+		$var = ! $var;
+	}
+
+	print "</table>";
+
+	// End of page
+	llxFooter();
+}
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
new file mode 100644
index 00000000000..5bb1f989a92
--- /dev/null
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -0,0 +1,474 @@
+<?php
+/* Copyright (C) 2007-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2010	Jean Heimburger			<jean@tiaris.info>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
+ * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2013-2014	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/journal/sellsjournal.php
+ * \ingroup		Accounting Expert
+ * \brief		Page with sells journal
+ */
+
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+
+$action = GETPOST('action');
+
+/*
+ * View
+ */
+
+$year_current = strftime("%Y", dol_now());
+$pastmonth = strftime("%m", dol_now()) - 1;
+$pastmonthyear = $year_current;
+if ($pastmonth == 0) {
+	$pastmonth = 12;
+	$pastmonthyear --;
+}
+
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+}
+
+$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+$idpays = $p[0];
+
+$sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc,";
+$sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
+$sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte, ";
+$sql .= " ct.accountancy_code_sell as account_tva";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
+$sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
+$sql .= " WHERE fd.fk_code_ventilation > 0 ";
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND f.entity = " . $conf->entity;
+}
+$sql .= " AND f.fk_statut > 0";
+if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+	$sql .= " AND f.type IN (0,1,2)";
+else
+	$sql .= " AND f.type IN (0,1,2,3)";
+$sql .= " AND fd.product_type IN (0,1)";
+if ($date_start && $date_end)
+	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+$sql .= " ORDER BY f.datef";
+
+dol_syslog('accountancy/journal/sellsjournal.php:: $sql=' . $sql);
+$result = $db->query($sql);
+if ($result) {
+	$tabfac = array ();
+	$tabht = array ();
+	$tabtva = array ();
+	$tabttc = array ();
+	$tabcompany = array ();
+
+	$num = $db->num_rows($result);
+	$i = 0;
+
+	while ( $i < $num ) {
+		$obj = $db->fetch_object($result);
+		// les variables
+		$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef");
+		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
+
+		$compta_prod = $obj->compte;
+		if (empty($compta_prod)) {
+			if ($obj->product_type == 0)
+				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+			else
+				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef");
+		}
+		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef");
+		$compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva);
+
+		// Invoice lines
+		$tabfac[$obj->rowid]["date"] = $obj->df;
+		$tabfac[$obj->rowid]["ref"] = $obj->facnumber;
+		$tabfac[$obj->rowid]["type"] = $obj->type;
+		$tabfac[$obj->rowid]["description"] = $obj->description;
+		$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
+		if (! isset($tabttc[$obj->rowid][$compta_soc]))
+			$tabttc[$obj->rowid][$compta_soc] = 0;
+		if (! isset($tabht[$obj->rowid][$compta_prod]))
+			$tabht[$obj->rowid][$compta_prod] = 0;
+		if (! isset($tabtva[$obj->rowid][$compta_tva]))
+			$tabtva[$obj->rowid][$compta_tva] = 0;
+		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
+		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
+		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
+		$tabcompany[$obj->rowid] = array (
+				'id' => $obj->socid,
+				'name' => $obj->name,
+				'code_client' => $obj->code_compta
+		);
+
+		$i ++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+/*
+ * Action
+ */
+
+// Bookkeeping Write
+if ($action == 'writebookkeeping') {
+	$now = dol_now();
+
+	foreach ( $tabfac as $key => $val ) {
+		foreach ( $tabttc[$key] as $k => $mt ) {
+			$bookkeeping = new BookKeeping($db);
+			$bookkeeping->doc_date = $val["date"];
+			$bookkeeping->doc_ref = $val["ref"];
+			$bookkeeping->date_create = $now;
+			$bookkeeping->doc_type = 'customer_invoice';
+			$bookkeeping->fk_doc = $key;
+			$bookkeeping->fk_docdet = $val["fk_facturedet"];
+			$bookkeeping->code_tiers = $tabcompany[$key]['code_client'];
+			$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+			$bookkeeping->label_compte = $tabcompany[$key]['name'];
+			$bookkeeping->montant = $mt;
+			$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+			$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+			$bookkeeping->credit = ($mt < 0) ? $mt : 0;
+			$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+
+			$bookkeeping->create();
+		}
+
+		// Product / Service
+		foreach ( $tabht[$key] as $k => $mt ) {
+			if ($mt) {
+				// get compte id and label
+				$compte = new AccountingAccount($db);
+				if ($compte->fetch(null, $k)) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_create = $now;
+					$bookkeeping->doc_type = 'customer_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = $val["fk_facturedet"];
+					$bookkeeping->code_tiers = '';
+					$bookkeeping->numero_compte = $k;
+					$bookkeeping->label_compte = dol_trunc($val["description"], 128);
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+
+					$bookkeeping->create();
+				}
+			}
+		}
+
+		// VAT
+		// var_dump($tabtva);
+		foreach ( $tabtva[$key] as $k => $mt ) {
+			if ($mt) {
+				$bookkeeping = new BookKeeping($db);
+				$bookkeeping->doc_date = $val["date"];
+				$bookkeeping->doc_ref = $val["ref"];
+				$bookkeeping->date_create = $now;
+				$bookkeeping->doc_type = 'customer_invoice';
+				$bookkeeping->fk_doc = $key;
+				$bookkeeping->fk_docdet = $val["fk_facturedet"];
+				$bookkeeping->fk_compte = $compte->id;
+				$bookkeeping->code_tiers = '';
+				$bookkeeping->numero_compte = $k;
+				$bookkeeping->label_compte = $langs->trans("VAT");
+				$bookkeeping->montant = $mt;
+				$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+				$bookkeeping->debit = ($mt < 0) ? $mt : 0;
+				$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+				$bookkeeping->code_journal = $conf->global->ACCOUNTING_SELL_JOURNAL;
+
+				$bookkeeping->create();
+			}
+		}
+	}
+}
+// export csv
+if ($action == 'export_csv') {
+	$sep = $conf->global->ACCOUNTING_SEPARATORCSV;
+
+	header('Content-Type: text/csv');
+	header('Content-Disposition: attachment;filename=journal_ventes.csv');
+
+	$companystatic = new Client($db);
+
+	if ($conf->global->ACCOUNTING_MODELCSV == 1) 	// Modèle Export Cegid Expert
+	{
+		foreach ( $tabfac as $key => $val ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
+
+			$date = dol_print_date($db->jdate($val["date"]), '%d%m%Y');
+
+			print $date . $sep;
+			print $conf->global->ACCOUNTING_SELL_JOURNAL . $sep;
+			print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep;
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print length_accounta(html_entity_decode($k)) . $sep;
+				print ($mt < 0 ? 'C' : 'D') . $sep;
+				print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+				print utf8_decode($companystatic->name) . $sep;
+			}
+			print $val["ref"];
+			print "\n";
+
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				if ($mt) {
+					print $date . $sep;
+					print $conf->global->ACCOUNTING_SELL_JOURNAL . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print dol_trunc($val["description"], 32) . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
+			// TVA
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print $date . $sep;
+					print $conf->global->ACCOUNTING_SELL_JOURNAL . $sep;
+					print length_accountg(html_entity_decode($k)) . $sep;
+					print $sep;
+					print ($mt < 0 ? 'D' : 'C') . $sep;
+					print ($mt <= 0 ? price(- $mt) : $mt) . $sep;
+					print $langs->trans("VAT") . $sep;
+					print $val["ref"];
+					print "\n";
+				}
+			}
+		}
+	} else 	// Modèle Export Classique
+	{
+		foreach ( $tabfac as $key => $val ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
+
+			$date = dol_print_date($db->jdate($val["date"]), 'day');
+			print '"' . $date . '"' . $sep;
+			print '"' . $val["ref"] . '"' . $sep;
+			foreach ( $tabttc[$key] as $k => $mt ) {
+				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+				print '"' . utf8_decode($companystatic->name) . '"' . $sep;
+				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
+				print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+			}
+			print "\n";
+
+			// Product / Service
+			foreach ( $tabht[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . dol_trunc($val["description"], 32) . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
+
+			// VAT
+			// var_dump($tabtva);
+			foreach ( $tabtva[$key] as $k => $mt ) {
+				if ($mt) {
+					print '"' . $date . '"' . $sep;
+					print '"' . $val["ref"] . '"' . $sep;
+					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
+					print '"' . $langs->trans("VAT") . '"' . $sep;
+					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
+					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print "\n";
+				}
+			}
+		}
+	}
+} else {
+
+	$form = new Form($db);
+
+	llxHeader('', $langs->trans("SellsJournal"));
+
+	$nom = $langs->trans("SellsJournal");
+	$nomlink = '';
+	$periodlink = '';
+	$exportlink = '';
+	$builddate = time();
+	$description = $langs->trans("DescSellsJournal") . '<br>';
+	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	else
+		$description .= $langs->trans("DepositsAreIncluded");
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+	report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+
+	print '<input type="button" class="button" style="float: right;" value="Export CSV" onclick="launch_export();" />';
+
+	print '<input type="button" class="button" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+
+	print '
+	<script type="text/javascript">
+		function launch_export() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+		function writebookkeeping() {
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("writebookkeeping");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("");
+		}
+	</script>';
+
+	/*
+	 * Show result array
+	 */
+	print '<br><br>';
+
+	$i = 0;
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	print "<td>" . $langs->trans("Date") . "</td>";
+	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
+	print "<td>" . $langs->trans("Account") . "</td>";
+	print "<td>" . $langs->trans("Type") . "</td>";
+	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
+	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "</tr>\n";
+
+	$var = true;
+	$r = '';
+
+	$invoicestatic = new Facture($db);
+	$companystatic = new Client($db);
+
+	foreach ( $tabfac as $key => $val ) {
+		$invoicestatic->id = $key;
+		$invoicestatic->ref = $val["ref"];
+		$invoicestatic->type = $val["type"];
+		$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
+
+		$date = dol_print_date($db->jdate($val["date"]), 'day');
+
+		print "<tr " . $bc[$var] . ">";
+
+		// Third party
+		print "<td>" . $date . "</td>";
+		print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+		foreach ( $tabttc[$key] as $k => $mt ) {
+			$companystatic->id = $tabcompany[$key]['id'];
+			$companystatic->name = $tabcompany[$key]['name'];
+			$companystatic->client = $tabcompany[$key]['code_client'];
+			print "<td>" . length_accounta($k);
+			print "</td><td>" . $langs->trans("ThirdParty");
+			print ' (' . $companystatic->getNomUrl(0, 'customer', 16) . ')';
+			print "</td><td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+		}
+		print "</tr>";
+
+		// Product / Service
+		foreach ( $tabht[$key] as $k => $mt ) {
+			if ($mt) {
+				print "<tr " . $bc[$var] . ">";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				print "<td>" . length_accountg($k) . "</td>";
+				print "<td>" . $invoicestatic->description . "</td>";
+				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+
+		// VAT
+		// var_dump($tabtva);
+		foreach ( $tabtva[$key] as $k => $mt ) {
+			if ($mt) {
+				print "<tr " . $bc[$var] . ">";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				print "<td>" . length_accountg($k) . "</td>";
+				print "<td>" . $langs->trans("VAT") . "</td>";
+				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "</tr>";
+			}
+		}
+
+		$var = ! $var;
+	}
+
+	print "</table>";
+
+	// End of page
+	llxFooter();
+}
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
new file mode 100644
index 00000000000..45c8de9b165
--- /dev/null
+++ b/htdocs/accountancy/supplier/card.php
@@ -0,0 +1,140 @@
+<?php
+/* Copyright (C) 2004       Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2005       Simon TOSSER          <simon@kornog-computing.com>
+ * Copyright (C) 2013-2014  Alexandre Spangaro    <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2014  Olivier Geffroy       <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014	Florian Henry	      <florian.henry@open-concept.pro>
+ * Copyright (C) 2014	    Juanjo Menent		s<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+/**
+ * \file		htdocs/accountancy/supplier/card.php
+ * \ingroup		Accounting Expert
+ * \brief		Card supplier ventilation
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+$action = GETPOST('action');
+$id = GETPOST('id', 'int');
+$codeventil = GETPOST('codeventil');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+
+if ($action == 'ventil' && $user->rights->accounting->ventilation->dispatch)
+{
+	$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
+	$sql .= " SET fk_code_ventilation = " . $codeventil;
+	$sql .= " WHERE rowid = " . $id;
+	
+	dol_syslog('accountancy/journal/sellsjournal.php:: $sql=' . $sql);
+	
+	$resql = $db->query($sql);
+	if (! $resql) {
+		setEventMessage($db->lasterror(), 'errors');
+	}
+}
+
+/*
+ * View
+ */
+llxHeader("", "", "FicheVentilation");
+
+if ($cancel == $langs->trans("Cancel")) {
+	$action = '';
+}
+
+/*
+ * Create
+ */
+$form = new Form($db);
+$facturefournisseur_static = new FactureFournisseur($db);
+$formventilation = new FormVentilation($db);
+
+if ($_GET["id"]) {
+	$sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.rowid, l.fk_code_ventilation, ";
+	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label";
+	$sql .= ", aa.account_number, aa.label";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as l";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
+	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON l.fk_code_ventilation = aa.rowid";
+	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn ";
+	$sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id;
+	if (! empty($conf->multicompany->enabled)) {
+		$sql .= " AND f.entity = '" . $conf->entity . "'";
+	}
+	
+	$result = $db->query($sql);
+	if ($result) {
+		$num_lines = $db->num_rows($result);
+		$i = 0;
+		
+		if ($num_lines) {
+			$objp = $db->fetch_object($result);
+			
+			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '" method="post">' . "\n";
+			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="ventil">';
+			
+			print_fiche_titre($langs->trans("SuppliersVentilation"));
+			
+			print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
+			
+			// ref invoice
+			print '<tr><td>' . $langs->trans("BillsSuppliers") . '</td>';
+			$facturefournisseur_static->ref = $objp->facnumber;
+			$facturefournisseur_static->id = $objp->facid;
+			print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
+			print '</tr>';
+			
+			print '<tr><td width="20%">Ligne</td>';
+			print '<td>' . stripslashes(nl2br($objp->description)) . '</td></tr>';
+			print '<tr><td width="20%">' . $langs->trans("ProductLabel") . '</td>';
+			print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
+			print '<tr><td width="20%">' . $langs->trans("Account") . '</td><td>';
+			print $objp->account_number . '-' . $objp->label;
+			print '<tr><td width="20%">' . $langs->trans("NewAccount") . '</td><td>';
+			print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
+			print '</td></tr>';
+			print '<tr><td>&nbsp;</td><td><input type="submit" class="button" value="' . $langs->trans("Update") . '"></td></tr>';
+			
+			print '</table>';
+			print '</form>';
+		} else {
+			print "Error 1";
+		}
+	} else {
+		print "Error 2";
+	}
+} else {
+	print "Error ID incorrect";
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/supplier/index.html b/htdocs/accountancy/supplier/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
new file mode 100644
index 00000000000..edebcfd9d46
--- /dev/null
+++ b/htdocs/accountancy/supplier/index.php
@@ -0,0 +1,262 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/supplier/index.php
+ * \ingroup		Accounting Expert
+ * \brief		Page accueil ventilation
+ */
+
+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';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->ventilation->read)
+	accessforbidden();
+	
+// Filter
+$year = $_GET["year"];
+if ($year == 0) {
+	$year_current = strftime("%Y", time());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
+}
+
+// Validate History
+$action = GETPOST('action');
+if ($action == 'validatehistory') {
+	
+	$error = 0;
+	$db->begin();
+	
+	if ($db->type == 'pgsql') {
+		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
+		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accountingaccount as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
+		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
+		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
+		$sql1 .= " AND fd.fk_code_ventilation = 0";
+	} else {
+		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accountingaccount as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
+		$sql1 .= " SET fd.fk_code_ventilation = accnt.rowid";
+		$sql1 .= " WHERE fd.fk_product = p.rowid AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
+		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_buy=accnt.account_number";
+		$sql1 .= " AND fd.fk_code_ventilation = 0";
+	}
+	
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	} else {
+		$db->commit();
+		setEventMessage($langs->trans('Dispatched'), 'mesgs');
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans("SuppliersVentilation"));
+
+$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
+$textnextyear = ' <a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
+
+print_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear);
+
+print '<b>' . $langs->trans("DescVentilSupplier") . '</b>';
+print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=validatehistory">' . $langs->trans("ValidateHistory") . '</a></div>';
+
+$y = $year_current;
+
+$var = true;
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
+print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JanuaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("FebruaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MarchMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AprilMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MayMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JuneMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JulyMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AugustMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("SeptemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("OctoberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("NovemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("DecemberMin") . '</td>';
+print '<td width="60" align="center"><b>' . $langs->trans("Total") . '</b></td></tr>';
+
+$sql = "SELECT IF(aa.account_number IS NULL, 'Non pointe', aa.account_number) AS 'code comptable',";
+$sql .= "  IF(aa.label IS NULL, 'Non pointe', aa.label) AS 'Intitulé',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=1,ffd.total_ht,0)),2) AS 'Janvier',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=2,ffd.total_ht,0)),2) AS 'Fevrier',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=3,ffd.total_ht,0)),2) AS 'Mars',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=4,ffd.total_ht,0)),2) AS 'Avril',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=5,ffd.total_ht,0)),2) AS 'Mai',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=6,ffd.total_ht,0)),2) AS 'Juin',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=7,ffd.total_ht,0)),2) AS 'Juillet',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=8,ffd.total_ht,0)),2) AS 'Aout',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=9,ffd.total_ht,0)),2) AS 'Septembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=10,ffd.total_ht,0)),2) AS 'Octobre',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=11,ffd.total_ht,0)),2) AS 'Novembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=12,ffd.total_ht,0)),2) AS 'Decembre',";
+$sql .= "  ROUND(SUM(ffd.total_ht),2) as 'Total'";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as ffd";
+$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
+$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON aa.rowid = ffd.fk_code_ventilation";
+$sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+$sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+$sql .= "  AND ff.fk_statut > 0 ";
+
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND ff.entity = '" . $conf->entity . "'";
+}
+
+$sql .= " GROUP BY ffd.fk_code_ventilation";
+
+dol_syslog('/accountancy/supplier/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 '<tr><td>' . length_accountg($row[0]) . '</td>';
+		print '<td align="left">' . $row[1] . '</td>';
+		print '<td align="right">' . price($row[2]) . '</td>';
+		print '<td align="right">' . price($row[3]) . '</td>';
+		print '<td align="right">' . price($row[4]) . '</td>';
+		print '<td align="right">' . price($row[5]) . '</td>';
+		print '<td align="right">' . price($row[6]) . '</td>';
+		print '<td align="right">' . price($row[7]) . '</td>';
+		print '<td align="right">' . price($row[8]) . '</td>';
+		print '<td align="right">' . price($row[9]) . '</td>';
+		print '<td align="right">' . price($row[10]) . '</td>';
+		print '<td align="right">' . price($row[11]) . '</td>';
+		print '<td align="right">' . price($row[12]) . '</td>';
+		print '<td align="right">' . price($row[13]) . '</td>';
+		print '<td align="right"><b>' . price($row[14]) . '</b></td>';
+		print '</tr>';
+		$i ++;
+	}
+	$db->free($resql);
+} else {
+	print $db->lasterror(); // Show last sql error
+}
+print "</table>\n";
+
+print "<br>\n";
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("Total") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JanuaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("FebruaryMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MarchMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AprilMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("MayMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JuneMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("JulyMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("AugustMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("SeptemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("OctoberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("NovemberMin") . '</td>';
+print '<td width="60" align="center">' . $langs->trans("DecemberMin") . '</td>';
+print '<td width="60" align="center"><b>' . $langs->trans("Total") . '</b></td></tr>';
+
+$sql = "SELECT '" . $langs->trans("CAHTF") . "' AS 'Total',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=1,ffd.total_ht,0)),2) AS 'Janvier',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=2,ffd.total_ht,0)),2) AS 'Fevrier',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=3,ffd.total_ht,0)),2) AS 'Mars',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=4,ffd.total_ht,0)),2) AS 'Avril',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=5,ffd.total_ht,0)),2) AS 'Mai',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=6,ffd.total_ht,0)),2) AS 'Juin',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=7,ffd.total_ht,0)),2) AS 'Juillet',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=8,ffd.total_ht,0)),2) AS 'Aout',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=9,ffd.total_ht,0)),2) AS 'Septembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=10,ffd.total_ht,0)),2) AS 'Octobre',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=11,ffd.total_ht,0)),2) AS 'Novembre',";
+$sql .= "  ROUND(SUM(IF(MONTH(ff.datef)=12,ffd.total_ht,0)),2) AS 'Decembre',";
+$sql .= "  ROUND(SUM(ffd.total_ht),2) as 'Total'";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as ffd";
+$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
+$sql .= " WHERE ff.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
+$sql .= "  AND ff.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
+$sql .= "  AND ff.fk_statut > 0 ";
+
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND ff.entity = '" . $conf->entity . "'";
+}
+
+dol_syslog('/accountancy/supplier/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 '<tr><td>' . $row[0] . '</td>';
+		print '<td align="right">' . $row[1] . '</td>';
+		print '<td align="right">' . price($row[2]) . '</td>';
+		print '<td align="right">' . price($row[3]) . '</td>';
+		print '<td align="right">' . price($row[4]) . '</td>';
+		print '<td align="right">' . price($row[5]) . '</td>';
+		print '<td align="right">' . price($row[6]) . '</td>';
+		print '<td align="right">' . price($row[7]) . '</td>';
+		print '<td align="right">' . price($row[8]) . '</td>';
+		print '<td align="right">' . price($row[9]) . '</td>';
+		print '<td align="right">' . price($row[10]) . '</td>';
+		print '<td align="right">' . price($row[11]) . '</td>';
+		print '<td align="right">' . price($row[12]) . '</td>';
+		print '<td align="right"><b>' . price($row[13]) . '</b></td>';
+		print '</tr>';
+		
+		$i ++;
+	}
+	
+	$db->free($resql);
+} else {
+	print $db->lasterror(); // Show last sql error
+}
+print "</table>\n";
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
new file mode 100644
index 00000000000..8b2a870220d
--- /dev/null
+++ b/htdocs/accountancy/supplier/lines.php
@@ -0,0 +1,224 @@
+<?php
+/* Copyright (C) 2002-2005 Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Simon TOSSER			<simon@kornog-computing.com>
+ * Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>  
+ * Copyright (C) 2013-2014 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ *   
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/supplier/lines.php
+ * \ingroup		Accounting Expert
+ * \brief 		Page of detail of the lines of ventilation of invoices suppliers
+ */
+
+require '../../main.inc.php';
+	
+// Class
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->ventilation->dispatch)
+	accessforbidden();
+
+$formventilation = new FormVentilation($db);
+
+$changeaccount = GETPOST('changeaccount');
+
+$is_search = GETPOST('button_search_x');
+
+if (is_array($changeaccount) && count($changeaccount) > 0 && empty($is_search)) {
+	$error = 0;
+	
+	$db->begin();
+	
+	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l";
+	$sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent');
+	$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
+	
+	dol_syslog('accountancy/supplier/lines.php::changeaccount sql= ' . $sql1);
+	$resql1 = $db->query($sql1);
+	if (! $resql1) {
+		$error ++;
+		setEventMessage($db->lasterror(), 'errors');
+	}
+	if (! $error) {
+		$db->commit();
+		setEventMessage($langs->trans('Save'), 'mesgs');
+	} else {
+		$db->rollback();
+		setEventMessage($db->lasterror(), 'errors');
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans("SuppliersVentilation") . ' - ' . $langs->trans("Dispatched"));
+
+$page = $_GET["page"];
+if ($page < 0)
+	$page = 0;
+
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
+	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+	$limit = $conf->liste_limit;
+} else {
+	$limit = $conf->liste_limit;
+}
+
+$offset = $limit * $page;
+
+$sql = "SELECT f.ref as facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ht , l.qty, l.rowid, l.tva_tx, aa.label, aa.account_number, ";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
+$sql .= " , " . MAIN_DB_PREFIX . "accountingaccount as aa";
+$sql .= " , " . MAIN_DB_PREFIX . "facture_fourn_det as l";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
+$sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
+$sql .= " AND aa.rowid = l.fk_code_ventilation";
+if (strlen(trim($_GET["search_facture"]))) {
+	$sql .= " AND f.facnumber like '%" . $_GET["search_facture"] . "%'";
+}
+if (strlen(trim($_GET["search_ref"]))) {
+	$sql .= " AND p.ref like '%" . $_GET["search_ref"] . "%'";
+}
+if (strlen(trim($_GET["search_label"]))) {
+	$sql .= " AND p.label like '%" . $_GET["search_label"] . "%'";
+}
+if (strlen(trim($_GET["search_desc"]))) {
+	$sql .= " AND l.description like '%" . $_GET["search_desc"] . "%'";
+}
+if (strlen(trim($_GET["search_account"]))) {
+	$sql .= " AND aa.account_number like '%" . $_GET["search_account"] . "%'";
+}
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND f.entity = '" . $conf->entity . "'";
+}
+
+$sql .= " ORDER BY l.rowid";
+if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
+	$sql .= " DESC ";
+}
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog('accountancy/supplier/lines.php::list sql= ' . $sql1);
+$result = $db->query($sql);
+
+if ($result) {
+	$num_lines = $db->num_rows($result);
+	$i = 0;
+	
+	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
+	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
+	
+	print '<td align="left"><b>' . $langs->trans("DescVentilDoneSupplier") . '</b></td>';
+	
+	print '<form method="GET" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<table class="noborder" width="100%">';
+	
+	print '<br><br><div class="inline-block divButAction">'. $langs->trans("ChangeAccount");
+	print $formventilation->select_account(GETPOST('account_parent'), 'account_parent', 1);
+	print '<input type="submit" class="butAction" value="' . $langs->trans("Validate") . '" /></div>';
+	
+	print '<tr class="liste_titre"><td>' . $langs->trans("Invoice") . '</td>';
+	print '<td>' . $langs->trans("Ref") . '</td>';
+	print '<td>' . $langs->trans("Label") . '</td>';
+	print '<td>' . $langs->trans("Description") . '</td>';
+	print '<td align="left">' . $langs->trans("Amount") . '</td>';
+	print '<td colspan="2" align="left">' . $langs->trans("Account") . '</td>';
+	print '<td align="center">&nbsp;</td>';
+	print '<td align="center">&nbsp;</td>';
+	print "</tr>\n";
+	
+	print '<tr class="liste_titre"><td><input name="search_facture" size="8" value="' . $_GET["search_facture"] . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_ref" value="' . GETPOST("search_ref") . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_label" value="' . GETPOST("search_label") . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_desc" value="' . GETPOST("search_desc") . '"></td>';
+	print '<td align="right">&nbsp;</td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="15" name="search_account" value="' . GETPOST("search_account") . '"></td>';
+	print '<td align="center">&nbsp;</td>';
+	print '<td align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" alt="' . $langs->trans("Search") . '">';
+	print '</td>';
+	print '<td align="center">&nbsp;</td>';
+	print "</tr>\n";
+	
+	$facturefournisseur_static = new FactureFournisseur($db);
+	$product_static = new Product($db);
+	
+	$var = True;
+	while ( $i < min($num_lines, $limit) ) {
+		$objp = $db->fetch_object($result);
+		$var = ! $var;
+		$codeCompta = $objp->account_number . ' ' . $objp->label;
+		
+		print "<tr $bc[$var]>";
+		
+		// Ref Invoice
+		$facturefournisseur_static->ref = $objp->facnumber;
+		$facturefournisseur_static->id = $objp->facid;
+		print '<td>' . $facturefournisseur_static->getNomUrl(1) . '</td>';
+		
+		// Ref Product
+		$product_static->ref = $objp->product_ref;
+		$product_static->id = $objp->product_id;
+		$product_static->type = $objp->type;
+		print '<td>';
+		if ($product_static->id)
+			print $product_static->getNomUrl(1);
+		else
+			print '&nbsp;';
+		print '</td>';
+		
+		print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
+		print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
+		print '<td align="left">' . price($objp->total_ht) . '</td>';
+		print '<td align="left">' . $codeCompta . '</td>';
+		print '<td>' . $objp->rowid . '</td>';
+		print '<td><a href="./card.php?id=' . $objp->rowid . '">';
+		print img_edit();
+		print '</a></td>';
+		
+		print '<td align="center"><input type="checkbox" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		
+		print "</tr>";
+		$i ++;
+	}
+} else {
+	print $db->error();
+}
+
+print "</table></form>";
+
+$db->close();
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
new file mode 100644
index 00000000000..f932fbfc8af
--- /dev/null
+++ b/htdocs/accountancy/supplier/list.php
@@ -0,0 +1,219 @@
+<?php
+/* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014		Ari Elbaz (elarifr)		<github@accedinfo.com>
+ * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/supplier/list.php
+ * \ingroup		Accounting Expert
+ * \brief		Page de ventilation des lignes de facture
+ */
+
+require '../../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php';
+
+// Langs
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("other");
+$langs->load("main");
+$langs->load("accountancy");
+
+$action = GETPOST('action');
+$codeventil = GETPOST('codeventil', 'array');
+$mesCasesCochees = GETPOST('mesCasesCochees', 'array');
+
+// Security check
+if ($user->societe_id > 0)
+	accessforbidden();
+if (! $user->rights->accounting->ventilation->dispatch)
+	accessforbidden();
+
+$formventilation = new FormVentilation($db);
+
+llxHeader('', $langs->trans("Ventilation"));
+
+/*
+ * Action
+ */
+
+if ($action == 'ventil') {
+	print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
+	if ($_POST['codeventil'] && $_POST["mesCasesCochees"]) {
+		print '<div><font color="red">' . count($_POST["mesCasesCochees"]) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
+		$mesCodesVentilChoisis = $codeventil;
+		$cpt = 0;
+
+		foreach ( $mesCasesCochees as $maLigneCochee ) {
+			// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
+			$maLigneCourante = explode("_", $maLigneCochee);
+			$monId = $maLigneCourante[0];
+			$monNumLigne = $maLigneCourante[1];
+			$monCompte = $mesCodesVentilChoisis[$monNumLigne];
+
+			$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
+			$sql .= " SET fk_code_ventilation = " . $monCompte;
+			$sql .= " WHERE rowid = " . $monId;
+
+			dol_syslog('accountancy/supplier/list.php:: sql=' . $sql);
+			if ($db->query($sql)) {
+				print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
+			} else {
+				print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '<br/> <pre>' . $sql . '</pre></font></div>';
+			}
+
+			$cpt ++;
+		}
+	} else {
+		print '<div><font color="red">' . $langs->trans("AnyLineVentilate") . '</font></div>';
+	}
+	print '<div><font color="red">' . $langs->trans("EndProcessing") . '</font></div>';
+}
+
+/*
+ * Supplier Invoice Lines
+ *
+ */
+$page = GETPOST('page');
+if ($page < 0)
+	$page = 0;
+
+if (! empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)) {
+	$limit = $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION;
+} else if ($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION <= 0) {
+	$limit = $conf->liste_limit;
+} else {
+	$limit = $conf->liste_limit;
+}
+
+$offset = $limit * $page;
+
+$sql = "SELECT f.ref, f.rowid as facid, f.ref_supplier, l.fk_product, l.description, l.total_ht as price, l.rowid, l.fk_code_ventilation, ";
+$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy";
+$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
+$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accountingaccount as aa ON p.accountancy_code_buy = aa.account_number";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_system as accsys ON accsys.pcg_version = aa.fk_pcg_version";
+$sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation = 0";
+$sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL)";
+
+if (! empty($conf->multicompany->enabled)) {
+	$sql .= " AND f.entity = '" . $conf->entity . "'";
+}
+
+$sql .= " ORDER BY l.rowid";
+if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+	$sql .= " DESC ";
+}
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog('accountancy/supplier/list.php:: $sql=' . $sql);
+$result = $db->query($sql);
+if ($result) {
+	$num_lines = $db->num_rows($result);
+	$i = 0;
+
+	// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
+	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
+
+	print '<td align="left"><br><b>' . $langs->trans("DescVentilTodoSupplier") . '</b></br></td>';
+
+	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
+	print '<input type="hidden" name="action" value="ventil">';
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>Facture</td>';
+	print '<td align="left">' . $langs->trans("Ref") . '</td>';
+	print '<td align="left">' . $langs->trans("Label") . '</td>';
+	print '<td>' . $langs->trans("Description") . '</td>';
+	print '<td align="right">' . $langs->trans("Amount") . '</td>';
+	print '<td align="right">' . $langs->trans("Compte") . '</td>';
+	print '<td align="center">' . $langs->trans("IntoAccount") . '</td>';
+	print '<td align="center">' . $langs->trans("Ventilate") . '</td>';
+	print "</tr>\n";
+
+	$facturefourn_static = new FactureFournisseur($db);
+	$productfourn_static = new ProductFournisseur($db);
+	$form = new Form($db);
+
+	$var = True;
+	while ( $i < min($num_lines, $limit) ) {
+		$objp = $db->fetch_object($result);
+		$var = ! $var;
+		print "<tr $bc[$var]>";
+
+		// Ref facture
+		$facturefourn_static->ref = $objp->ref;
+		$facturefourn_static->id = $objp->facid;
+		print '<td>' . $facturefourn_static->getNomUrl(1) . '</td>';
+
+		// Ref facture supplier
+		$productfourn_static->ref = $objp->product_ref;
+		$productfourn_static->id = $objp->product_id;
+		$productfourn_static->type = $objp->type;
+		print '<td>';
+		if ($productfourn_static->id)
+			print $productfourn_static->getNomUrl(1);
+		else
+			print '&nbsp;';
+		print '</td>';
+
+		// print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref.'</a></td>';
+
+		// print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref_supplier.'</a></td>';
+
+		print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
+
+		print '<td>' . stripslashes(nl2br($objp->description)) . '</td>';
+
+		print '<td align="right">';
+		print price($objp->price);
+		print '</td>';
+
+		print '<td align="right">';
+		print $objp->code_buy;
+		print '</td>';
+
+		// Colonne choix du compte
+		print '<td align="center">';
+		print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1);
+		print '</td>';
+		// Colonne choix ligne a ventiler
+		print '<td align="center">';
+		print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
+		print '</td>';
+
+		print "</tr>";
+		$i ++;
+	}
+
+	print '</table>';
+	print '<br><div align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></div>';
+	print '</form>';
+} else {
+	print $db->error();
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 0a251536ff6..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;
@@ -68,11 +68,11 @@ if ($action == 'update' || $action == 'add')
 
 	if (! $error)
 	{
-		$mesg = '<div class="ok">'.$langs->trans("SetupSaved").'</div>';
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = '<div class="error">'.$langs->trans("Error").'</div>';
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -117,10 +117,6 @@ $head = member_admin_prepare_head();
 
 dol_fiche_head($head, 'general', $langs->trans("Members"), 0, 'user');
 
-
-dol_htmloutput_mesg($mesg);
-
-
 print_fiche_titre($langs->trans("MemberMainOptions"),'','');
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
@@ -213,6 +209,23 @@ if ($conf->facture->enabled)
 	}
 	print "</tr>\n";
 	print '</form>';
+
+	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+	{
+		$var=!$var;
+		print '<form action="adherent.php" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="constname" value="ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS">';
+		print '<tr '.$bc[$var].'><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+		print '<td>';
+		print $form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'constvalue_ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
+		print '</td><td align="center" width="80">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		print '</td>';
+	}
+	print "</tr>\n";
+	print '</form>';
 }
 
 print '</table>';
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 059e42d50f5..1c98c2c16ba 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -35,7 +35,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index aa5e8cfa8d9..627d96acf17 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -37,7 +37,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/adherents/admin/public.php b/htdocs/adherents/admin/public.php
index 8a520a55c4e..740a5c97879 100644
--- a/htdocs/adherents/admin/public.php
+++ b/htdocs/adherents/admin/public.php
@@ -60,11 +60,11 @@ if ($action == 'update')
 
  	if (! $error)
     {
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
     }
 }
 
@@ -86,8 +86,6 @@ $head = member_admin_prepare_head();
 
 dol_fiche_head($head, 'public', $langs->trans("Members"), 0, 'user');
 
-dol_htmloutput_mesg($mesg);
-
 if ($conf->use_javascript_ajax)
 {
     print "\n".'<script type="text/javascript" language="javascript">';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index f1a18c5e4bf..343c8c4a628 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -44,6 +44,8 @@ $object = new Adherent($db);
 $result=$object->fetch($id);
 if ($result > 0)
 {
+	$object->fetch_thirdparty();
+
     $adht = new AdherentType($db);
     $result=$adht->fetch($object->typeid);
 }
@@ -84,7 +86,7 @@ if ($object->id > 0)
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/liste.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
 
 	// Reference
 	print '<tr><td width="20%">'.$langs->trans('Ref').'</td>';
@@ -139,14 +141,30 @@ if ($object->id > 0)
 
     if (! empty($conf->agenda->enabled))
     {
-        print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create">'.$langs->trans("AddAction").'</a></div>';
+        print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create">'.$langs->trans("AddAction").'</a></div>';
     }
 
     print '</div>';
 
     print '<br>';
 
-    print load_fiche_titre($langs->trans("ActionsOnMember"),'','');
+    $out='';
+
+    /*$objthirdparty=$object->thirdparty;
+    $objcon=new stdClass();
+
+    $permok=$user->rights->agenda->myactions->create;
+    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+    {
+        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+    	$out.=$langs->trans("AddAnAction").' ';
+    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+    	$out.="</a>";
+	}*/
+
+    print load_fiche_titre($langs->trans("ActionsOnMember"),$out,'');
 
     // List of todo actions
     show_actions_todo($conf,$langs,$db,$object);
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 4a8b8d584ab..cf89e1f526c 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -130,7 +130,7 @@ abstract class ActionsAdherentCardCommon
                 }
                 else
                 {
-                    $this->errors=$nuser->error;
+                    $this->errors[]=$nuser->error;
 
                     $this->db->rollback();
                 }
@@ -412,7 +412,7 @@ abstract class ActionsAdherentCardCommon
         // We set country_id, and country_code label of the chosen country
         if ($this->object->country_id)
         {
-            $sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_pays WHERE rowid = ".$this->object->country_id;
+            $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
             $resql=$this->db->query($sql);
             if ($resql)
             {
diff --git a/htdocs/adherents/canvas/default/index.php b/htdocs/adherents/canvas/default/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/adherents/canvas/default/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/adherents/canvas/default/tpl/index.html b/htdocs/adherents/canvas/default/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/adherents/canvas/default/tpl/index.php b/htdocs/adherents/canvas/default/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/adherents/canvas/default/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/adherents/canvas/index.html b/htdocs/adherents/canvas/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/adherents/canvas/index.php b/htdocs/adherents/canvas/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/adherents/canvas/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
new file mode 100644
index 00000000000..d6295981586
--- /dev/null
+++ b/htdocs/adherents/card.php
@@ -0,0 +1,1677 @@
+<?php
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2013 Philippe Grand       <philippe.grand@atoo-net.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/adherents/card.php
+ *       \ingroup    member
+ *       \brief      Page of member
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.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.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+$langs->load("companies");
+$langs->load("bills");
+$langs->load("members");
+$langs->load("users");
+$langs->load('other');
+
+$action=GETPOST('action','alpha');
+$backtopage=GETPOST('backtopage','alpha');
+$confirm=GETPOST('confirm','alpha');
+$rowid=GETPOST('rowid','int');
+$typeid=GETPOST('typeid','int');
+$userid=GETPOST('userid','int');
+$socid=GETPOST('socid','int');
+
+if (! empty($conf->mailmanspip->enabled))
+{
+	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
+
+	$langs->load('mailmanspip');
+
+	$mailmanspip = new MailmanSpip($db);
+}
+
+$object = new Adherent($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$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=null;
+if (! empty($canvas))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
+}
+
+// Security check
+$result=restrictedArea($user, 'adherent', $rowid, '', '', 'fk_soc', 'rowid', $objcanvas);
+
+if ($rowid > 0)
+{
+	// Load member
+	$result = $object->fetch($rowid);
+
+	// Define variables to know what current user can do on users
+	$canadduser=($user->admin || $user->rights->user->user->creer);
+	// Define variables to know what current user can do on properties of user linked to edited member
+	if ($object->user_id)
+	{
+		// $user est le user qui edite, $object->user_id est l'id de l'utilisateur lies au membre edite
+		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
+				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
+		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
+				|| (($user->id != $object->user_id) && $user->rights->user->user->password));
+	}
+}
+
+// Define variables to determine what the current user can do on the members
+$canaddmember=$user->rights->adherent->creer;
+// Define variables to determine what the current user can do on the properties of a member
+if ($rowid)
+{
+	$caneditfieldmember=$user->rights->adherent->creer;
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('membercard','globalcard'));
+
+
+/*
+ * 	Actions
+*/
+
+$parameters=array('rowid'=>$rowid, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
+{
+	$error=0;
+	if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
+	{
+		if ($userid != $user->id && $userid != $object->user_id)
+		{
+			$error++;
+			setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors');
+		}
+	}
+
+	if (! $error)
+	{
+		if ($userid != $object->user_id)	// If link differs from currently in database
+		{
+			$result=$object->setUserId($userid);
+			if ($result < 0) dol_print_error($object->db,$object->error);
+			$action='';
+		}
+	}
+}
+
+if ($action == 'setsocid')
+{
+	$error=0;
+	if (! $error)
+	{
+		if ($socid != $object->fk_soc)	// If link differs from currently in database
+		{
+			$sql ="SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
+			$sql.=" WHERE fk_soc = '".$socid."'";
+			$sql.=" AND entity = ".$conf->entity;
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj && $obj->rowid > 0)
+				{
+					$othermember=new Adherent($db);
+					$othermember->fetch($obj->rowid);
+					$thirdparty=new Societe($db);
+					$thirdparty->fetch($socid);
+					$error++;
+					setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors');
+				}
+			}
+
+			if (! $error)
+			{
+				$result=$object->setThirdPartyId($socid);
+				if ($result < 0) dol_print_error($object->db,$object->error);
+				$action='';
+			}
+		}
+	}
+}
+
+// Create user from a member
+if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
+{
+	if ($result > 0)
+	{
+		// Creation user
+		$nuser = new User($db);
+		$result=$nuser->create_from_member($object,GETPOST('login'));
+
+		if ($result < 0)
+		{
+			$langs->load("errors");
+			setEventMessage($langs->trans($nuser->error), 'errors');
+		}
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+// Create third party from a member
+if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
+{
+	if ($result > 0)
+	{
+		// Creation user
+		$company = new Societe($db);
+		$result=$company->create_from_member($object,GETPOST('companyname'));
+
+		if ($result < 0)
+		{
+			$langs->load("errors");
+			setEventMessage($langs->trans($company->error), 'errors');
+			setEventMessage($company->errors, 'errors');
+		}
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+if ($action == 'confirm_sendinfo' && $confirm == 'yes')
+{
+	if ($object->email)
+	{
+		$from=$conf->email_from;
+		if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
+
+		$result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
+
+		$langs->load("mails");
+		setEventMessage($langs->trans("MailSuccessfulySent", $from, $object->email));
+	}
+}
+
+if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	$birthdate='';
+	if (isset($_POST["birthday"]) && $_POST["birthday"]
+			&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
+			&& isset($_POST["birthyear"]) && $_POST["birthyear"])
+	{
+		$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
+	}
+	$lastname=$_POST["lastname"];
+	$firstname=$_POST["firstname"];
+	$morphy=$morphy=$_POST["morphy"];;
+	if ($morphy != 'mor' && empty($lastname)) {
+		$error++;
+		$langs->load("errors");
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname")), 'errors');
+	}
+	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
+		$error++;
+		$langs->load("errors");
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname")), 'errors');
+	}
+
+	// Create new object
+	if ($result > 0 && ! $error)
+	{
+		$object->oldcopy=dol_clone($object);
+
+		// Change values
+		$object->civility_id = trim($_POST["civility_id"]);
+		$object->firstname   = trim($_POST["firstname"]);
+		$object->lastname    = trim($_POST["lastname"]);
+		$object->login       = trim($_POST["login"]);
+		$object->pass        = trim($_POST["pass"]);
+
+		$object->societe     = trim($_POST["societe"]);
+		$object->company     = trim($_POST["societe"]);
+
+		$object->address     = trim($_POST["address"]);
+		$object->zip         = trim($_POST["zipcode"]);
+		$object->town        = trim($_POST["town"]);
+		$object->state_id    = $_POST["state_id"];
+		$object->country_id  = $_POST["country_id"];
+
+		$object->phone       = trim($_POST["phone"]);
+		$object->phone_perso = trim($_POST["phone_perso"]);
+		$object->phone_mobile= trim($_POST["phone_mobile"]);
+		$object->email       = trim($_POST["email"]);
+		$object->skype       = trim($_POST["skype"]);
+		$object->birth       = $birthdate;
+
+		$object->typeid      = $_POST["typeid"];
+		//$object->note        = trim($_POST["comment"]);
+		$object->morphy      = $_POST["morphy"];
+
+		if (GETPOST('deletephoto')) $object->photo='';
+		elseif (! empty($_FILES['photo']['name'])) $object->photo  = dol_sanitizeFileName($_FILES['photo']['name']);
+
+		// Get status and public property
+		$object->statut      = $_POST["statut"];
+		$object->public      = $_POST["public"];
+
+		// Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+		// Check if we need to also synchronize user information
+		$nosyncuser=0;
+		if ($object->user_id)	// If linked to a user
+		{
+			if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser=1;		// Disable synchronizing
+		}
+
+		// Check if we need to also synchronize password information
+		$nosyncuserpass=0;
+		if ($object->user_id)	// If linked to a user
+		{
+			if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass=1;	// Disable synchronizing
+		}
+
+		$result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
+		if ($result >= 0 && ! count($object->errors))
+		{
+			// Logo/Photo save
+			$dir= $conf->adherent->dir_output . '/' . get_exdir($object->id,2,0,1).'/photos';
+			$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+			if ($file_OK)
+			{
+				if (GETPOST('deletephoto'))
+				{
+					require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+					$fileimg=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/'.$object->photo;
+					$dirthumbs=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/thumbs';
+					dol_delete_file($fileimg);
+					dol_delete_dir_recursive($dirthumbs);
+				}
+
+				if (image_format_supported($_FILES['photo']['name']) > 0)
+				{
+					dol_mkdir($dir);
+
+					if (@is_dir($dir))
+					{
+						$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+						if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
+						{
+							setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors');
+						}
+						else
+						{
+							// Create small thumbs for company (Ratio is near 16/9)
+							// Used on logon for example
+							$imgThumbSmall = vignette($newfile, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+
+							// Create mini thumbs for company (Ratio is near 16/9)
+							// Used on menu or for setup page for example
+							$imgThumbMini = vignette($newfile, $maxwidthmini, $maxheightmini, '_mini', $quality);
+						}
+					}
+				}
+				else
+				{
+					setEventMessage("ErrorBadImageFormat", 'errors');
+				}
+			}
+			else
+			{
+				switch($_FILES['photo']['error'])
+				{
+					case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+					case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+						$errors[] = "ErrorFileSizeTooLarge";
+						break;
+					case 3: //uploaded file was only partially uploaded
+						$errors[] = "ErrorFilePartiallyUploaded";
+						break;
+				}
+			}
+
+            $rowid=$object->id;
+			$action='';
+
+			if (! empty($backtopage))
+			{
+				header("Location: ".$backtopage);
+				exit;
+			}
+		}
+		else
+		{
+			if ($object->error) {
+				setEventMessage($object->error, 'errors');
+			} else {
+				setEventMessage($object->errors, 'errors');
+			}
+			$action='';
+		}
+	}
+	else
+	{
+		$action='edit';
+	}
+}
+
+if ($action == 'add' && $user->rights->adherent->creer)
+{
+	if ($canvas) $object->canvas=$canvas;
+	$birthdate='';
+	if (isset($_POST["birthday"]) && $_POST["birthday"]
+			&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
+			&& isset($_POST["birthyear"]) && $_POST["birthyear"])
+	{
+		$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
+	}
+	$datecotisation='';
+	if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
+	{
+		$datecotisation=dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
+	}
+
+	$typeid=$_POST["typeid"];
+	$civility_id=$_POST["civility_id"];
+	$lastname=$_POST["lastname"];
+	$firstname=$_POST["firstname"];
+	$societe=$_POST["societe"];
+	$address=$_POST["address"];
+	$zip=$_POST["zipcode"];
+	$town=$_POST["town"];
+	$state_id=$_POST["state_id"];
+	$country_id=$_POST["country_id"];
+
+	$phone=$_POST["phone"];
+	$phone_perso=$_POST["phone_perso"];
+	$phone_mobile=$_POST["phone_mobile"];
+	$skype=$_POST["member_skype"];
+	$email=$_POST["member_email"];
+	$login=$_POST["member_login"];
+	$pass=$_POST["password"];
+	$photo=$_POST["photo"];
+	//$comment=$_POST["comment"];
+	$morphy=$_POST["morphy"];
+	$cotisation=$_POST["cotisation"];
+	$public=$_POST["public"];
+
+	$userid=$_POST["userid"];
+	$socid=$_POST["socid"];
+
+	$object->civility_id = $civility_id;
+	$object->firstname   = $firstname;
+	$object->lastname    = $lastname;
+	$object->societe     = $societe;
+	$object->address     = $address;
+	$object->zip         = $zip;
+	$object->town        = $town;
+	$object->state_id    = $state_id;
+	$object->country_id  = $country_id;
+	$object->phone       = $phone;
+	$object->phone_perso = $phone_perso;
+	$object->phone_mobile= $phone_mobile;
+	$object->skype       = $skype;
+	$object->email       = $email;
+	$object->login       = $login;
+	$object->pass        = $pass;
+	$object->birth       = $birthdate;
+	$object->photo       = $photo;
+	$object->typeid      = $typeid;
+	//$object->note        = $comment;
+	$object->morphy      = $morphy;
+	$object->user_id     = $userid;
+	$object->fk_soc      = $socid;
+	$object->public      = $public;
+
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	// Check parameters
+	if (empty($morphy) || $morphy == "-1") {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Nature")), 'errors');
+	}
+	// Test si le login existe deja
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+	{
+		if (empty($login)) {
+			$error++;
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Login")), 'errors');
+		}
+		else {
+			$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
+			}
+			if ($num) {
+				$error++;
+				$langs->load("errors");
+				setEventMessage($langs->trans("ErrorLoginAlreadyExists",$login), 'errors');
+			}
+		}
+		if (empty($pass)) {
+			$error++;
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Password")), 'errors');
+		}
+	}
+	if ($morphy != 'mor' && empty($lastname)) {
+		$error++;
+		$langs->load("errors");
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname")), 'errors');
+	}
+	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
+		$error++;
+		$langs->load("errors");
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname")), 'errors');
+	}
+	if (! ($typeid > 0)) {	// Keep () before !
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
+	}
+	if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
+		$error++;
+		$langs->load("errors");
+		setEventMessage($langs->trans("ErrorBadEMail",$email), 'errors');
+	}
+	$public=0;
+	if (isset($public)) $public=1;
+
+	if (! $error)
+	{
+		$db->begin();
+
+		// Email a peu pres correct et le login n'existe pas
+		$result=$object->create($user);
+		if ($result > 0)
+		{
+			$db->commit();
+			$rowid=$object->id;
+			$action='';
+		}
+		else
+		{
+			$db->rollback();
+
+			if ($object->error) {
+				setEventMessage($object->error, 'errors');
+			} else {
+				setEventMessage($object->errors, 'errors');
+			}
+
+			$action = 'create';
+		}
+	}
+	else {
+		$action = 'create';
+	}
+}
+
+if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
+{
+	$result=$object->delete($rowid);
+	if ($result > 0)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		else
+		{
+			header("Location: list.php");
+			exit;
+		}
+	}
+	else
+	{
+		$errmesg=$object->error;
+	}
+}
+
+if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
+{
+	$error=0;
+
+	$db->begin();
+
+	$adht = new AdherentType($db);
+	$adht->fetch($object->typeid);
+
+	$result=$object->validate($user);
+
+	if ($result >= 0 && ! count($object->errors))
+	{
+		// Send confirmation Email (selon param du type adherent sinon generique)
+		if ($object->email && GETPOST("send_mail"))
+		{
+			$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
+			if ($result < 0)
+			{
+				$error++;
+				setEventMessage($object->error, 'errors');
+			}
+		}
+	}
+	else
+	{
+		$error++;
+		if ($object->error) {
+			setEventMessage($object->error, 'errors');
+		} else {
+			setEventMessage($object->errors, 'errors');
+		}
+	}
+
+	if (! $error)
+	{
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
+	$action='';
+}
+
+if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
+{
+	$error = 0;
+
+	if ($confirm == 'yes')
+	{
+		$adht = new AdherentType($db);
+		$adht->fetch($object->typeid);
+
+		$result=$object->resiliate($user);
+
+		if ($result >= 0 && ! count($object->errors))
+		{
+			if ($object->email && GETPOST("send_mail"))
+			{
+				$result=$object->send_an_email($adht->getMailOnResiliate(),$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
+			}
+			if ($result < 0)
+			{
+				$error++;
+				setEventMessage($object->error, 'errors');
+			}
+		}
+		else
+		{
+			$error++;
+
+			if ($object->error) {
+				setEventMessage($object->error, 'errors');
+			} else {
+				setEventMessage($object->errors, 'errors');
+			}
+			$action='';
+		}
+	}
+	if (! empty($backtopage) && ! $error)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
+}
+
+// SPIP Management
+if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
+{
+	if (! count($object->errors))
+	{
+		if (!$mailmanspip->del_to_spip($object))
+		{
+			setEventMessage($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, 'errors');
+		}
+	}
+}
+
+if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
+{
+	if (! count($object->errors))
+	{
+		if (!$mailmanspip->add_to_spip($object))
+		{
+			setEventMessage($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, 'errors');
+		}
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+
+$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
+llxHeader('',$langs->trans("Member"),$help_url);
+
+$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
+	if (empty($object->error) && $rowid)
+	{
+		$object = new Adherent($db);
+		$result=$object->fetch($rowid);
+		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
+}
+else
+{
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
+
+	if ($action == 'create')
+	{
+		/* ************************************************************************** */
+		/*                                                                            */
+		/* Creation card                                                             */
+		/*                                                                            */
+		/* ************************************************************************** */
+		$object->canvas=$canvas;
+		$object->state_id = GETPOST('state_id', 'int');
+
+		// We set country_id, country_code and country for the selected country
+		$object->country_id=GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
+		if ($object->country_id)
+		{
+			$tmparray=getCountry($object->country_id,'all');
+			$object->country_code=$tmparray['code'];
+			$object->country=$tmparray['label'];
+		}
+
+		$adht = new AdherentType($db);
+
+		print_fiche_titre($langs->trans("NewMember"));
+
+		if ($conf->use_javascript_ajax)
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
+						jQuery("#selectcountry_id").change(function() {
+							document.formsoc.action.value="create";
+							document.formsoc.submit();
+						});
+						function initfieldrequired()
+						{
+							jQuery("#tdcompany").removeClass("fieldrequired");
+							jQuery("#tdlastname").removeClass("fieldrequired");
+							jQuery("#tdfirstname").removeClass("fieldrequired");
+							if (jQuery("#morphy").val() == \'mor\')
+							{
+								jQuery("#tdcompany").addClass("fieldrequired");
+							}
+							if (jQuery("#morphy").val() == \'phy\')
+							{
+								jQuery("#tdlastname").addClass("fieldrequired");
+								jQuery("#tdfirstname").addClass("fieldrequired");
+							}
+						}
+						jQuery("#morphy").change(function() {
+							initfieldrequired();
+						});
+						initfieldrequired();
+					})';
+			print '</script>'."\n";
+		}
+
+		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="add">';
+
+		print '<table class="border" width="100%">';
+
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" size="40" value="'.(isset($_POST["member_login"])?$_POST["member_login"]:$object->login).'"></td></tr>';
+		}
+
+		// Moral-Physique
+		$morphys["phy"] = $langs->trans("Physical");
+		$morphys["mor"] = $langs->trans("Moral");
+		print '<tr><td class="fieldrequired">'.$langs->trans("Nature")."</td><td>\n";
+		print $form->selectarray("morphy", $morphys, GETPOST('morphy','alpha')?GETPOST('morphy','alpha'):$object->morphy, 1);
+		print "</td>\n";
+
+		// Type
+		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
+		$listetype=$adht->liste_array();
+		if (count($listetype))
+		{
+			print $form->selectarray("typeid", $listetype, GETPOST('typeid','int')?GETPOST('typeid','int'):$typeid, count($listetype)>1?1:0);
+		} else {
+			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
+		}
+		print "</td>\n";
+
+		// Company
+		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(GETPOST('societe','alpha')?GETPOST('societe','alpha'):$object->societe).'"></td></tr>';
+
+		// Civility
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
+		print $formcompany->select_civility(GETPOST('civility_id','int')?GETPOST('civility_id','int'):$object->civility_id,'civility_id').'</td>';
+		print '</tr>';
+
+		// Lastname
+		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.(GETPOST('lastname','alpha')?GETPOST('lastname','alpha'):$object->lastname).'" size="40"></td>';
+		print '</tr>';
+
+		// Firstname
+		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
+		print '</tr>';
+
+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
+
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$generated_password=getRandomPassword(false);
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
+			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
+			print '</td></tr>';
+		}
+
+		// Address
+		print '<tr><td valign="top">'.$langs->trans("Address").'</td><td>';
+		print '<textarea name="address" wrap="soft" cols="40" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
+		print '</td></tr>';
+
+		// Zip / Town
+		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+		print $formcompany->select_ziptown((GETPOST('zipcode','alpha')?GETPOST('zipcode','alpha'):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+		print ' ';
+		print $formcompany->select_ziptown((GETPOST('town','alpha')?GETPOST('town','alpha'):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+		print '</td></tr>';
+
+		// Country
+		$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
+		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+		print $form->select_country(GETPOST('country_id','alpha')?GETPOST('country_id','alpha'):$object->country_id,'country_id');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td></tr>';
+
+		// State
+		if (empty($conf->global->MEMBER_DISABLE_STATE))
+		{
+			print '<tr><td>'.$langs->trans('State').'</td><td>';
+			if ($object->country_id)
+			{
+				print $formcompany->select_state(GETPOST('state_id','int')?GETPOST('state_id','int'):$object->state_id,$object->country_code);
+			}
+			else
+			{
+				print $countrynotdefined;
+			}
+			print '</td></tr>';
+		}
+
+		// Tel pro
+		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(GETPOST('phone','alpha')?GETPOST('phone','alpha'):$object->phone).'"></td></tr>';
+
+		// Tel perso
+		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(GETPOST('phone_perso','alpha')?GETPOST('phone_perso','alpha'):$object->phone_perso).'"></td></tr>';
+
+		// Tel mobile
+		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
+
+	    // Skype
+	    if (! empty($conf->skype->enabled))
+	    {
+			print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
+	    }
+
+		// Birthday
+		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
+		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
+		print "</td></tr>\n";
+
+		// Profil public
+		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
+		print $form->selectyesno("public",$object->public,1);
+		print "</td></tr>\n";
+
+		// Other attributes
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+		/*
+		 // Third party Dolibarr
+		if (! empty($conf->societe->enabled))
+		{
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
+		print $form->select_company($object->fk_soc,'socid','',1);
+		print '</td></tr>';
+		}
+
+		// Login Dolibarr
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
+		print $form->select_dolusers($object->user_id,'userid',1);
+		print '</td></tr>';
+		*/
+
+		print "</table>\n";
+		print '<br>';
+
+		print '<center><input type="submit" class="button" value="'.$langs->trans("AddMember").'"></center>';
+
+		print "</form>\n";
+
+	}
+
+	if ($action == 'edit')
+	{
+		/********************************************
+		 *
+		* Fiche en mode edition
+		*
+		********************************************/
+
+		$res=$object->fetch($rowid);
+		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;
+		}
+
+		$adht = new AdherentType($db);
+		$adht->fetch($object->typeid);
+
+		// We set country_id, and country_code, country of the chosen country
+		$country=GETPOST('country','int');
+		if (!empty($country) || $object->country_id)
+		{
+			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country)?$country:$object->country_id);
+			$resql=$db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+			}
+			else
+			{
+				dol_print_error($db);
+			}
+			$object->country_id=$obj->rowid;
+			$object->country_code=$obj->code;
+			$object->country=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
+		}
+
+		$head = member_prepare_head($object);
+
+		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+
+		if ($conf->use_javascript_ajax)
+		{
+			print "\n".'<script type="text/javascript" language="javascript">';
+			print 'jQuery(document).ready(function () {
+				jQuery("#selectcountry_id").change(function() {
+					document.formsoc.action.value="edit";
+					document.formsoc.submit();
+				});
+				function initfieldrequired()
+				{
+					jQuery("#tdcompany").removeClass("fieldrequired");
+					jQuery("#tdlastname").removeClass("fieldrequired");
+					jQuery("#tdfirstname").removeClass("fieldrequired");
+					if (jQuery("#morphy").val() == \'mor\')
+					{
+						jQuery("#tdcompany").addClass("fieldrequired");
+					}
+					if (jQuery("#morphy").val() == \'phy\')
+					{
+						jQuery("#tdlastname").addClass("fieldrequired");
+						jQuery("#tdfirstname").addClass("fieldrequired");
+					}
+				}
+				jQuery("#morphy").change(function() {
+					initfieldrequired();
+				});
+				initfieldrequired();
+			})';
+			print '</script>'."\n";
+		}
+
+		$rowspan=15;
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
+		if (! empty($conf->societe->enabled)) $rowspan++;
+
+		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+		print '<input type="hidden" name="action" value="update" />';
+		print '<input type="hidden" name="rowid" value="'.$rowid.'" />';
+		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
+		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
+
+		print '<table class="border" width="100%">';
+
+		// Ref
+		print '<tr><td>'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
+
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" size="30" value="'.(isset($_POST["login"])?$_POST["login"]:$object->login).'"></td></tr>';
+		}
+
+		// Physique-Moral
+		$morphys["phy"] = $langs->trans("Physical");
+		$morphys["mor"] = $langs->trans("Morale");
+		print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
+		print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
+		print "</td>";
+		// Photo
+		print '<td align="center" class="hideonsmartphone" valign="middle" width="25%" rowspan="'.$rowspan.'">';
+		print $form->showphoto('memberphoto',$object)."\n";
+		if ($caneditfieldmember)
+		{
+			if ($object->photo) print "<br>\n";
+			print '<table class="nobordernopadding">';
+			if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+			print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+			print '</table>';
+		}
+		print '</td>';
+
+		// Type
+		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+		if ($user->rights->adherent->creer)
+		{
+			print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
+		}
+		else
+		{
+			print $adht->getNomUrl(1);
+			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
+		}
+		print "</td></tr>";
+
+		// Company
+		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?$_POST["societe"]:$object->societe).'"></td></tr>';
+
+		// Civility
+		print '<tr><td width="20%">'.$langs->trans("UserTitle").'</td><td width="35%">';
+		print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id)."\n";
+		print '</td>';
+		print '</tr>';
+
+		// Lastname
+		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?$_POST["lastname"]:$object->lastname).'"></td>';
+		print '</tr>';
+
+		// Firstname
+		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td>';
+		print '</tr>';
+
+		// EMail
+		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td></tr>';
+
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" size="30" value="'.(isset($_POST["pass"])?$_POST["pass"]:$object->pass).'"></td></tr>';
+		}
+
+		// Address
+		print '<tr><td>'.$langs->trans("Address").'</td><td>';
+		print '<textarea name="address" wrap="soft" cols="40" rows="2">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea>';
+		print '</td></tr>';
+
+		// Zip / Town
+		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+		print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+		print ' ';
+		print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+		print '</td></tr>';
+
+		// Country
+		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
+		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
+		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td></tr>';
+
+		// State
+		if (empty($conf->global->MEMBER_DISABLE_STATE))
+		{
+			print '<tr><td>'.$langs->trans('State').'</td><td>';
+			print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id);
+			print '</td></tr>';
+		}
+
+		// Tel
+		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?$_POST["phone"]:$object->phone).'"></td></tr>';
+
+		// Tel perso
+		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$object->phone_perso).'"></td></tr>';
+
+		// Tel mobile
+		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td></tr>';
+
+	    // Skype
+	    if (! empty($conf->skype->enabled))
+	    {
+			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
+	    }
+
+		// Birthday
+		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
+		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
+		print "</td></tr>\n";
+
+		// Profil public
+		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
+		print $form->selectyesno("public",(isset($_POST["public"])?$_POST["public"]:$object->public),1);
+		print "</td></tr>\n";
+
+		// Other attributes
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+		// Third party Dolibarr
+		if (! empty($conf->societe->enabled))
+		{
+			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
+			if ($object->fk_soc)
+			{
+				$company=new Societe($db);
+				$result=$company->fetch($object->fk_soc);
+				print $company->getNomUrl(1);
+			}
+			else
+			{
+				print $langs->trans("NoThirdPartyAssociatedToMember");
+			}
+			print '</td></tr>';
+		}
+
+		// Login Dolibarr
+		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
+		if ($object->user_id)
+		{
+			print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
+		}
+		else print $langs->trans("NoDolibarrAccess");
+		print '</td></tr>';
+
+		print '</table>';
+
+		print '<br><center>';
+		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+		print ' &nbsp; &nbsp; &nbsp; ';
+		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</center';
+
+		print '</form>';
+
+		print '</div>';
+	}
+
+	if ($rowid && $action != 'edit')
+	{
+		/* ************************************************************************** */
+		/*                                                                            */
+		/* Mode affichage                                                             */
+		/*                                                                            */
+		/* ************************************************************************** */
+
+		$res=$object->fetch($rowid);
+		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;
+		}
+
+		$adht = new AdherentType($db);
+		$res=$adht->fetch($object->typeid);
+		if ($res < 0) {
+			dol_print_error($db); exit;
+		}
+
+
+		/*
+		 * Affichage onglets
+		*/
+		$head = member_prepare_head($object);
+
+		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
+
+		// Confirm create user
+		if ($action == 'create_user')
+		{
+			$login=$object->login;
+			if (empty($login))
+			{
+				// Full firstname and name separated with a dot : firstname.name
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				$login=dol_buildlogin($object->lastname,$object->firstname);
+			}
+			if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4));
+
+			// Create a form array
+			$formquestion=array(
+					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
+			);
+			$text=$langs->trans("ConfirmCreateLogin").'<br>';
+			if (! empty($conf->societe->enabled))
+			{
+				if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
+				else $text.=$langs->trans("UserWillBeInternalUser");
+			}
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
+		}
+
+		// Confirm create third party
+		if ($action == 'create_thirdparty')
+		{
+			$name = $object->getFullName($langs);
+			if (! empty($name))
+			{
+				if ($object->societe) $name.=' ('.$object->societe.')';
+			}
+			else
+			{
+				$name=$object->societe;
+			}
+
+			// Create a form array
+			$formquestion=array(		array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
+
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
+		}
+
+		// Confirm validate member
+		if ($action == 'valid')
+		{
+			$langs->load("mails");
+
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
+
+			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_VALID_SUBJECT);
+			$texttosend=$object->makeSubstitution($adht->getMailOnValid());
+
+			$tmp=$langs->trans("SendAnEMailToMember");
+			$tmp.=' ('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
+			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
+			$helpcontent='';
+			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
+			$helpcontent.=$subjecttosend."\n";
+			$helpcontent.="<br>";
+			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
+			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
+			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
+
+			// Cree un tableau formulaire
+			$formquestion=array();
+			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label,  'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
+			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_MAILMAN)) {
+				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>'');
+			}
+			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))    {
+				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>'');
+			}
+			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1);
+		}
+
+		// Confirm send card by mail
+		if ($action == 'sendinfo')
+		{
+			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
+		}
+
+		// Confirm resiliate
+		if ($action == 'resign')
+		{
+			$langs->load("mails");
+
+			$adht = new AdherentType($db);
+			$adht->fetch($object->typeid);
+
+			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_RESIL_SUBJECT);
+			$texttosend=$object->makeSubstitution($adht->getMailOnResiliate());
+
+			$tmp=$langs->trans("SendAnEMailToMember");
+			$tmp.=' ('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
+			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
+			$helpcontent='';
+			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
+			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
+			$helpcontent.=$subjecttosend."\n";
+			$helpcontent.="<br>";
+			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
+			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
+			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
+
+			// Cree un tableau formulaire
+			$formquestion=array();
+			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
+			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
+			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
+		}
+
+		// Confirm remove member
+		if ($action == 'delete')
+		{
+			$formquestion=array();
+			if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
+			print $form->formconfirm("card.php?rowid=".$rowid,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
+		}
+
+		/*
+		 * Confirm add in spip
+		 */
+		if ($action == 'add_spip')
+		{
+			print $form->formconfirm("card.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
+		}
+
+		/*
+		 * Confirm removed from spip
+		 */
+		if ($action == 'del_spip')
+		{
+			print $form->formconfirm("card.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
+		}
+
+		$rowspan=17;
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
+		if (! empty($conf->societe->enabled)) $rowspan++;
+		if (! empty($conf->skype->enabled)) $rowspan++;
+
+		print '<table class="border" width="100%">';
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
+
+		// Ref
+		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
+		print '<td class="valeur" colspan="2">';
+		print $form->showrefnav($object, 'rowid', $linkback);
+		print '</td></tr>';
+
+		$showphoto='<td rowspan="'.$rowspan.'" align="center" class="hideonsmartphone" valign="middle" width="25%">';
+		$showphoto.=$form->showphoto('memberphoto',$object);
+		$showphoto.='</td>';
+
+		// Login
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td>'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td>';
+			// Photo
+			print $showphoto; $showphoto='';
+			print '</tr>';
+		}
+
+		// Morphy
+		print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
+		print $showphoto; $showphoto='';
+		print '</tr>';
+
+		// Type
+		print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
+
+		// Company
+		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
+
+		// Civility
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+		print '</tr>';
+
+		// Lastname
+		print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
+		print '</tr>';
+
+		// Firstname
+		print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td></tr>';
+
+		// EMail
+		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
+
+		// Password
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
+		{
+			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i','*',$object->pass).'</td></tr>';
+		}
+
+		// Address
+		print '<tr><td>'.$langs->trans("Address").'</td><td class="valeur">';
+		dol_print_address($object->address,'gmap','member',$object->id);
+		print '</td></tr>';
+
+		// Zip / Town
+		print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td></tr>';
+
+		// Country
+		print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">';
+		$img=picto_from_langcode($object->country_code);
+		if ($img) print $img.' ';
+		print getCountry($object->country_code);
+		print '</td></tr>';
+
+		// State
+		print '<tr><td>'.$langs->trans('State').'</td><td class="valeur">'.$object->state.'</td>';
+
+		// Tel pro.
+		print '<tr><td>'.$langs->trans("PhonePro").'</td><td class="valeur">'.dol_print_phone($object->phone,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
+
+		// Tel perso
+		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td class="valeur">'.dol_print_phone($object->phone_perso,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
+
+		// Tel mobile
+		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td class="valeur">'.dol_print_phone($object->phone_mobile,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
+
+    	// Skype
+		if (! empty($conf->skype->enabled))
+		{
+			print '<tr><td>'.$langs->trans("Skype").'</td><td class="valeur">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
+		}
+
+		// Birthday
+		print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
+
+		// Public
+		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
+
+		// Status
+		print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';
+
+		// Other attributes
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields);
+		}
+
+		// Third party Dolibarr
+		if (! empty($conf->societe->enabled))
+		{
+			print '<tr><td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans("LinkedToDolibarrThirdParty");
+			print '</td>';
+			if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="2" class="valeur">';
+			if ($action == 'editthirdparty')
+			{
+				$htmlname='socid';
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
+				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="set'.$htmlname.'">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+				print '<tr><td>';
+				print $form->select_company($object->fk_soc,'socid','',1);
+				print '</td>';
+				print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+				print '</tr></table></form>';
+			}
+			else
+			{
+				if ($object->fk_soc)
+				{
+					$company=new Societe($db);
+					$result=$company->fetch($object->fk_soc);
+					print $company->getNomUrl(1);
+				}
+				else
+				{
+					print $langs->trans("NoThirdPartyAssociatedToMember");
+				}
+			}
+			print '</td></tr>';
+		}
+
+		// Login Dolibarr
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans("LinkedToDolibarrUser");
+		print '</td>';
+		if ($action != 'editlogin' && $user->rights->adherent->creer)
+		{
+			print '<td align="right">';
+			if ($user->rights->user->user->creer)
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a>';
+			}
+			print '</td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="2" class="valeur">';
+		if ($action == 'editlogin')
+		{
+			print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
+		}
+		else
+		{
+			if ($object->user_id)
+			{
+				print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
+			}
+			else print $langs->trans("NoDolibarrAccess");
+		}
+		print '</td></tr>';
+
+		print "</table>\n";
+
+		print "</div>\n";
+
+
+		/*
+		 * Barre d'actions
+		*
+		*/
+		print '<div class="tabsAction">';
+
+		if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
+		{
+			// Modify
+			if ($user->rights->adherent->creer)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$rowid.'&action=edit">'.$langs->trans("Modify")."</a></div>";
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
+			}
+
+			// Valider
+			if ($object->statut == -1)
+			{
+				if ($user->rights->adherent->creer)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$rowid.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
+				}
+			}
+
+			// Reactiver
+			if ($object->statut == 0)
+			{
+				if ($user->rights->adherent->creer)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$rowid.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
+				}
+			}
+
+			// Send card by email
+			if ($user->rights->adherent->creer)
+			{
+				if ($object->statut >= 1)
+				{
+					if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
+					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+				}
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
+			}
+
+			// Resilier
+			if ($object->statut >= 1)
+			{
+				if ($user->rights->adherent->supprimer)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$rowid.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
+				}
+			}
+
+			// Create third party
+			if (! empty($conf->societe->enabled) && ! $object->fk_soc)
+			{
+				if ($user->rights->societe->creer)
+				{
+					if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
+				}
+			}
+
+			// Create user
+			if (! $user->societe_id && ! $object->user_id)
+			{
+				if ($user->rights->user->user->creer)
+				{
+					if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
+				}
+				else
+				{
+					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
+				}
+			}
+
+			// Delete
+			if ($user->rights->adherent->supprimer)
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
+			}
+
+			// Action SPIP
+			if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
+			{
+				$isinspip = $mailmanspip->is_in_spip($object);
+
+				if ($isinspip == 1)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
+				}
+				if ($isinspip == 0)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
+				}
+			}
+
+		}
+
+		print '</div>';
+
+		if ($isinspip == -1)
+		{
+			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
+		}
+		print "<br>\n";
+
+	}
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 36967d56e22..7b710ba9aca 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';
 
@@ -52,7 +53,6 @@ $object = new Adherent($db);
 $extrafields = new ExtraFields($db);
 $adht = new AdherentType($db);
 $errmsg='';
-$errmsgs=array();
 
 $defaultdelay=1;
 $defaultdelayunit='y';
@@ -108,7 +108,7 @@ if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights
 		{
 			$langs->load("errors");
 			$errmsg=$langs->trans($company->error);
-			$errmsgs=$company->errors;
+			setEventMessage($company->errors, 'errors');
 		}
 		else
 		{
@@ -129,7 +129,7 @@ if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights
         if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id)
         {
             $error++;
-            $mesg='<div class="error">'.$langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly").'</div>';
+            setEventMessage($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), 'errors');
         }
     }
 
@@ -165,7 +165,7 @@ if ($action == 'setsocid')
                     $thirdparty=new Societe($db);
                     $thirdparty->fetch(GETPOST('socid','int'));
                     $error++;
-                    $mesg='<div class="error">'.$langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name).'</div>';
+	                setEventMessage($langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name), 'errors');
                 }
             }
 
@@ -277,12 +277,12 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
         $db->begin();
 
         // Create subscription
-        $crowid=$object->cotisation($datecotisation, $cotisation, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend, $option);
+        $crowid=$object->cotisation($datecotisation, $cotisation, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend);
         if ($crowid <= 0)
         {
             $error++;
             $errmsg=$object->error;
-            $errmsgs=$object->errors;
+	        setEventMessage($object->errors, 'errors');
         }
 
         if (! $error)
@@ -300,14 +300,14 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                 $insertid=$acct->addline($dateop, $operation, $label, $cotisation, $num_chq, '', $user, $emetteur_nom, $emetteur_banque);
                 if ($insertid > 0)
                 {
-                    $inserturlid=$acct->add_url_line($insertid, $object->id, DOL_URL_ROOT.'/adherents/fiche.php?rowid=', $object->getFullname($langs), 'member');
+                    $inserturlid=$acct->add_url_line($insertid, $object->id, DOL_URL_ROOT.'/adherents/card.php?rowid=', $object->getFullname($langs), 'member');
                     if ($inserturlid > 0)
                     {
                         // Met a jour la table cotisation
                         $sql ="UPDATE ".MAIN_DB_PREFIX."cotisation SET fk_bank=".$insertid;
                         $sql.=" WHERE rowid=".$crowid;
 
-                        dol_syslog("card_subscriptions::cotisation sql=".$sql);
+                        dol_syslog("card_subscriptions::cotisation", LOG_DEBUG);
                         $resql = $db->query($sql);
                         if (! $resql)
                         {
@@ -316,13 +316,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                         }
                     }
                     else
-                    {
+					{
                         $error++;
                         $errmsg=$acct->error;
                     }
                 }
                 else
-                {
+				{
                     $error++;
                     $errmsg=$acct->error;
                 }
@@ -386,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')
 	                {
@@ -444,7 +446,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                         if (! ($bank_line_id > 0))
                         {
                             $errmsg=$paiement->error;
-                            $errmsgs=$paiement->errors;
+	                        setEventMessage($paiement->errors, 'errors');
                             $error++;
                         }
                     }
@@ -454,8 +456,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
                         // Update fk_bank into subscription table
                         $sql = 'UPDATE '.MAIN_DB_PREFIX.'cotisation SET fk_bank='.$bank_line_id;
                         $sql.= ' WHERE rowid='.$crowid;
-                        dol_syslog('sql='.$sql);
-                        $result = $db->query($sql);
+
+	                    $result = $db->query($sql);
                         if (! $result)
                         {
                             $error++;
@@ -483,7 +485,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
 						}
                     	// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
 						//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-							facture_pdf_create($db, $invoice, $invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+	                    $invoice->generateDocument($invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 
                     }
@@ -555,7 +558,7 @@ if ($rowid)
     print '<input type="hidden" name="rowid" value="'.$object->id.'">';
     print '<table class="border" width="100%">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/liste.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
 
     // Ref
     print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
@@ -689,7 +692,7 @@ if ($rowid)
     dol_fiche_end();
 
 
-    dol_htmloutput_errors($errmsg,$errmsgs);
+    dol_htmloutput_errors($errmsg);
 
 
     /*
@@ -947,9 +950,10 @@ if ($rowid)
             print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.GETPOST('cotisation').'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
             // Label
-            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-            print '<td><input name="label" type="text" size="32" value="'.$langs->trans("Subscription").' ';
-            print dol_print_date(($datefrom?$datefrom:time()),"%Y").'" ></td></tr>';
+            print '<tr><td>'.$langs->trans("Label").'</td>';
+            print '<td><input name="label" type="text" size="32" value="';
+            if (empty($conf->global->MEMBER_NO_DEFAULT_LABEL)) print $langs->trans("Subscription").' '.dol_print_date(($datefrom?$datefrom:time()),"%Y");
+            print '"></td></tr>';
 
             // Complementary action
             if (! empty($conf->banque->enabled) || ! empty($conf->facture->enabled))
@@ -990,7 +994,13 @@ if ($rowid)
                     	print $langs->trans("CreateDolibarrThirdParty");
                     	print '</a>)';
                     }
-                    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 '<br>';
                 }
                 // Add invoice with payments
@@ -1009,7 +1019,13 @@ if ($rowid)
                     	print $langs->trans("CreateDolibarrThirdParty");
                     	print '</a>)';
                     }
-                    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 '<br>';
                 }
                 print '</td></tr>';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index dbccbdb4f01..98f5e908e16 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -64,15 +64,15 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
     $sql = "SELECT d.rowid, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,";
     $sql.= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,";
     $sql.= " t.libelle as type,";
-    $sql.= " p.code as country_code, p.libelle as country";
+    $sql.= " c.code as country_code, c.label as country";
     $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON d.country = p.rowid";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
     $sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
     if (is_numeric($foruserid)) $sql.=" AND d.rowid=".$foruserid;
     if ($foruserlogin) $sql.=" AND d.login='".$db->escape($foruserlogin)."'";
     $sql.= " ORDER BY d.rowid ASC";
 
-    dol_syslog("Search members sql=".$sql);
+    dol_syslog("Search members", LOG_DEBUG);
     $result = $db->query($sql);
     if ($result)
     {
diff --git a/htdocs/adherents/cartes/index.html b/htdocs/adherents/cartes/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/adherents/cartes/index.php b/htdocs/adherents/cartes/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/adherents/cartes/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0fa60a0d421..8c8c2d604ca 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -188,7 +188,7 @@ class Adherent extends CommonObject
 		if (dol_textishtml($text,1)) $msgishtml = 1;
 
 		$infos='';
-		if ($this->civility_id) $infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel(1)."\n";
+		if ($this->civility_id) $infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel()."\n";
 		$infos.= $langs->transnoentities("id").": ".$this->id."\n";
 		$infos.= $langs->transnoentities("Lastname").": ".$this->lastname."\n";
 		$infos.= $langs->transnoentities("Firstname").": ".$this->firstname."\n";
@@ -211,7 +211,7 @@ class Adherent extends CommonObject
 		$substitutionarray=array(
 				'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
 				'%ID%'=>$msgishtml?dol_htmlentitiesbr($this->id):$this->id,
-				'%CIVILITY%'=>$this->getCivilityLabel($msgishtml?0:1),
+				'%CIVILITY%'=>$this->getCivilityLabel(),
 				'%FIRSTNAME%'=>$msgishtml?dol_htmlentitiesbr($this->firstname):$this->firstname,
 				'%LASTNAME%'=>$msgishtml?dol_htmlentitiesbr($this->lastname):$this->lastname,
 				'%FULLNAME%'=>$msgishtml?dol_htmlentitiesbr($this->getFullName($langs)):$this->getFullName($langs),
@@ -312,7 +312,7 @@ class Adherent extends CommonObject
         $sql.= ", ".(! empty($this->import_key) ? "'".$this->import_key."'":"null");
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -337,7 +337,7 @@ class Adherent extends CommonObject
                     $sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
                     $sql.= " fk_member = '".$this->id."'";
                     $sql.= " WHERE rowid = ".$this->user_id;
-                    dol_syslog(get_class($this)."::create sql=".$sql);
+                    dol_syslog(get_class($this)."::create", LOG_DEBUG);
                     $resql = $this->db->query($sql);
                     if (! $resql)
                     {
@@ -349,11 +349,9 @@ class Adherent extends CommonObject
 
                 if (! $notrigger)
                 {
-                    // Call triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('MEMBER_CREATE',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                    // Call trigger
+                    $result=$this->call_trigger('MEMBER_CREATE',$user);
+                    if ($result < 0) { $error++; }
                     // End call triggers
                 }
 
@@ -380,7 +378,6 @@ class Adherent extends CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -429,7 +426,7 @@ class Adherent extends CommonObject
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-        $sql.= " civilite = ".(!is_null($this->civility_id)?"'".$this->civility_id."'":"null");
+        $sql.= " civility = ".(!is_null($this->civility_id)?"'".$this->civility_id."'":"null");
         $sql.= ", firstname = ".($this->firstname?"'".$this->db->escape($this->firstname)."'":"null");
         $sql.= ", lastname=" .($this->lastname?"'".$this->db->escape($this->lastname)."'":"null");
         $sql.= ", login="   .($this->login?"'".$this->db->escape($this->login)."'":"null");
@@ -457,7 +454,7 @@ class Adherent extends CommonObject
         $sql.= ", fk_user_mod=".($user->id>0?$user->id:'null');	// Can be null because member can be create by a guest
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::update update member sql=".$sql);
+        dol_syslog(get_class($this)."::update update member", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -468,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
@@ -503,14 +503,14 @@ class Adherent extends CommonObject
             {
                 dol_syslog(get_class($this)."::update update link to user");
                 $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".$this->id;
-                dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::update", LOG_DEBUG);
                 $resql = $this->db->query($sql);
                 if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
                 // If there is a user linked to this member
                 if ($this->user_id > 0)
                 {
                     $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".$this->id." WHERE rowid = ".$this->user_id;
-                    dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+                    dol_syslog(get_class($this)."::update", LOG_DEBUG);
                     $resql = $this->db->query($sql);
                     if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
                 }
@@ -601,12 +601,10 @@ class Adherent extends CommonObject
 
                 if (! $error && ! $notrigger)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('MEMBER_MODIFY',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('MEMBER_MODIFY',$user);
+                    if ($result < 0) { $error++; }
+                    // End call triggers
                 }
             }
 
@@ -625,7 +623,6 @@ class Adherent extends CommonObject
         {
             $this->db->rollback();
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::Update ".$this->error,LOG_ERR);
             return -2;
         }
     }
@@ -652,7 +649,7 @@ class Adherent extends CommonObject
         $sql.= " WHERE fk_adherent='".$this->id."'";
         $sql.= " ORDER by dateadh DESC";	// Sort by start subscription date
 
-        dol_syslog(get_class($this)."::update_end_date sql=".$sql);
+        dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -665,7 +662,7 @@ class Adherent extends CommonObject
             $sql.= " datefin=".($datefin != '' ? "'".$this->db->idate($datefin)."'" : "null");
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::update_end_date sql=".$sql);
+            dol_syslog(get_class($this)."::update_end_date", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -685,7 +682,6 @@ class Adherent extends CommonObject
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::update_end_date ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -713,14 +709,13 @@ class Adherent extends CommonObject
 
         // Remove category
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".$rowid;
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql)
         {
         	$error++;
         	$this->error .= $this->db->lasterror();
         	$errorflag=-1;
-        	dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
 
         }
 
@@ -728,14 +723,13 @@ class Adherent extends CommonObject
         if (! $error)
         {
         	 $sql = "DELETE FROM ".MAIN_DB_PREFIX."cotisation WHERE fk_adherent = ".$rowid;
-        	dol_syslog(get_class($this)."::delete sql=".$sql);
+        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         	$resql=$this->db->query($sql);
         	if (! $resql)
         	{
         		$error++;
         		$this->error .= $this->db->lasterror();
         		$errorflag=-2;
-        		dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
         	}
         }
 
@@ -748,7 +742,6 @@ class Adherent extends CommonObject
         		$error++;
         		$this->error .= $this->db->lasterror();
         		$errorflag=-3;
-        		dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
         	}
         }
 
@@ -771,25 +764,22 @@ class Adherent extends CommonObject
         if (! $error)
         {
         	$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent WHERE rowid = ".$rowid;
-        	dol_syslog(get_class($this)."::delete sql=".$sql);
+        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         	$resql=$this->db->query($sql);
         	if (! $resql)
         	{
         		$error++;
         		$this->error .= $this->db->lasterror();
         		$errorflag=-5;
-        		dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
         	}
         }
 
         if (! $error)
         {
-        	// Appel des triggers
-       		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        	$interface=new Interfaces($this->db);
-        	$result=$interface->run_triggers('MEMBER_DELETE',$this,$user,$langs,$conf);
-        	if ($result < 0) {$error++; $this->errors=$interface->errors;}
-        	// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_DELETE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
         }
 
 
@@ -843,12 +833,14 @@ class Adherent extends CommonObject
             $password_indatabase = $password;
         }
 
+        $this->db->begin();
+
         // Mise a jour
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET pass = '".$this->db->escape($password_indatabase)."'";
         $sql.= " WHERE rowid = ".$this->id;
 
         //dol_syslog("Adherent::Password sql=hidden");
-        dol_syslog(get_class($this)."::setPassword sql=".$sql);
+        dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -887,23 +879,24 @@ class Adherent extends CommonObject
 
                 if (! $error && ! $notrigger)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('MEMBER_NEW_PASSWORD',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('MEMBER_NEW_PASSWORD',$user);
+                    if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+                    // End call triggers
                 }
 
+                $this->db->commit();
                 return $this->pass;
             }
             else
             {
+                $this->db->rollback();
                 return 0;
             }
         }
         else
         {
+            $this->db->rollback();
             dol_print_error($this->db);
             return -1;
         }
@@ -924,7 +917,7 @@ class Adherent extends CommonObject
 
         // If user is linked to this member, remove old link to this member
         $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL WHERE fk_member = ".$this->id;
-        dol_syslog(get_class($this)."::setUserId sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::setUserId", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -1; }
 
@@ -933,7 +926,7 @@ class Adherent extends CommonObject
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = ".$this->id;
             $sql.= " WHERE rowid = ".$userid;
-            dol_syslog(get_class($this)."::setUserId sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::setUserId", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -2; }
         }
@@ -962,7 +955,7 @@ class Adherent extends CommonObject
             $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = null";
             $sql.= " WHERE fk_soc = '".$thirdpartyid."'";
             $sql.= " AND entity = ".$conf->entity;
-            dol_syslog(get_class($this)."::setThirdPartyId sql=".$sql);
+            dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
             $resql = $this->db->query($sql);
         }
 
@@ -970,7 +963,7 @@ class Adherent extends CommonObject
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = ".($thirdpartyid>0 ? $thirdpartyid : 'null');
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::setThirdPartyId sql=".$sql);
+        dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -980,7 +973,6 @@ class Adherent extends CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::setThirdPartyId ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -1053,14 +1045,14 @@ 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='')
     {
         global $langs;
 
-        $sql = "SELECT d.rowid, d.ref_ext, d.civilite as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note,";
+        $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note,";
         $sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
         $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
         $sql.= " d.datec as datec,";
@@ -1070,12 +1062,12 @@ class Adherent extends CommonObject
         $sql.= " d.datevalid as datev,";
         $sql.= " d.country,";
         $sql.= " d.state_id,";
-        $sql.= " p.rowid as country_id, p.code as country_code, p.libelle as country,";
+        $sql.= " c.rowid as country_id, c.code as country_code, c.label as country,";
         $sql.= " dep.nom as state, dep.code_departement as state_code,";
         $sql.= " t.libelle as type, t.cotisation as cotisation,";
         $sql.= " u.rowid as user_id, u.login as user_login";
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON d.country = p.rowid";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member";
         $sql.= " WHERE d.fk_adherent_type = t.rowid";
@@ -1090,7 +1082,7 @@ class Adherent extends CommonObject
         	$sql.= " AND d.ref_ext='".$this->db->escape($ref_ext)."'";
         }
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -1171,7 +1163,6 @@ class Adherent extends CommonObject
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -1200,7 +1191,7 @@ class Adherent extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."cotisation as c";
         $sql.= " WHERE c.fk_adherent = ".$this->id;
         $sql.= " ORDER BY c.dateadh";
-        dol_syslog(get_class($this)."::fetch_subscriptions sql=".$sql);
+        dol_syslog(get_class($this)."::fetch_subscriptions", LOG_DEBUG);
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -1303,12 +1294,10 @@ class Adherent extends CommonObject
                 $this->last_subscription_date_start=$date;
                 $this->last_subscription_date_end=$datefin;
 
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('MEMBER_SUBSCRIPTION',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('MEMBER_SUBSCRIPTION',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
             }
 
             if (! $error)
@@ -1317,7 +1306,7 @@ class Adherent extends CommonObject
                 return $rowid;
             }
             else
-            {
+			{
                 $this->db->rollback();
                 return -2;
             }
@@ -1358,18 +1347,16 @@ class Adherent extends CommonObject
         $sql.= ", fk_user_valid=".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::validate sql=".$sql);
+        dol_syslog(get_class($this)."::validate", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
             $this->statut=1;
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('MEMBER_VALIDATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_VALIDATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 
             $this->db->commit();
             return 1;
@@ -1414,12 +1401,10 @@ class Adherent extends CommonObject
         {
             $this->statut=0;
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('MEMBER_RESILIATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MEMBER_RESILIATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 
             $this->db->commit();
             return 1;
@@ -1549,7 +1534,7 @@ class Adherent extends CommonObject
     /**
      *    Return civility label of a member
      *
-     *    @return   string              	Translated name of civility
+     *    @return   string              	Translated name of civility (translated with transnoentitiesnoconv)
      */
     function getCivilityLabel()
     {
@@ -1558,7 +1543,7 @@ class Adherent extends CommonObject
 
     	$code=(empty($this->civility_id)?'':$this->civility_id);
     	if (empty($code)) return '';
-    	return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
+    	return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
     }
 
     /**
@@ -1577,7 +1562,7 @@ class Adherent extends CommonObject
 
         if ($option == 'card')
         {
-            $lien = '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$this->id.'">';
+            $lien = '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$this->id.'">';
             $lienfin='</a>';
         }
         if ($option == 'subscription')
@@ -1904,7 +1889,7 @@ class Adherent extends CommonObject
         $sql.= ' FROM '.MAIN_DB_PREFIX.'adherent as a';
         $sql.= ' WHERE a.rowid = '.$id;
 
-        dol_syslog(get_class($this)."::info sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::info", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index e861af709b8..2d5f3d835be 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -76,7 +76,7 @@ class AdherentType extends CommonObject
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
-        dol_syslog("Adherent_type::create sql=".$sql);
+        dol_syslog("Adherent_type::create", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -119,7 +119,7 @@ class AdherentType extends CommonObject
         if ($result)
         {
         	$action='update';
-        	
+
         	// Actions on extra fields (by external module or standard code)
         	$hookmanager->initHooks(array('membertypedao'));
         	$parameters=array('membertype'=>$this->id);
@@ -151,21 +151,23 @@ class AdherentType extends CommonObject
      *	Fonction qui permet de supprimer le status de l'adherent
      *
      *	@param      int		$rowid		Id of member type to delete
-     *  @return		int					>0 if OK, < 0 if KO
+     *  @return		int					>0 if OK, 0 if not found, < 0 if KO
      */
-    function delete($rowid)
+    function delete($rowid='')
     {
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid";
+    	if (empty($rowid)) $rowid=$this->id;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = ".$rowid;
 
         $resql=$this->db->query($sql);
         if ($resql)
         {
-            if ( $this->db->affected_rows($resql) )
+            if ($this->db->affected_rows($resql))
             {
                 return 1;
             }
             else
-            {
+			{
                 return 0;
             }
         }
@@ -188,7 +190,7 @@ class AdherentType extends CommonObject
         $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
         $sql .= " WHERE d.rowid = ".$rowid;
 
-        dol_syslog("Adherent_type::fetch sql=".$sql);
+        dol_syslog("Adherent_type::fetch", LOG_DEBUG);
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -211,7 +213,6 @@ class AdherentType extends CommonObject
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog("Adherent_type::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
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 1fc0994b54a..5193a729970 100644
--- a/htdocs/adherents/class/cotisation.class.php
+++ b/htdocs/adherents/class/cotisation.class.php
@@ -82,7 +82,7 @@ class Cotisation extends CommonObject
 		$sql.= " '".$this->db->idate($this->datef)."',";
 		$sql.= " ".$this->amount.",'".$this->db->escape($this->note)."')";
 
-		dol_syslog(get_class($this)."::create sql=".$sql);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -91,7 +91,6 @@ class Cotisation extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog($this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -113,7 +112,7 @@ class Cotisation extends CommonObject
 		$sql.=" FROM ".MAIN_DB_PREFIX."cotisation";
 		$sql.="	WHERE rowid=".$rowid;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -168,7 +167,7 @@ class Cotisation extends CommonObject
 		$sql .= " fk_bank = ".($this->fk_bank ? $this->fk_bank : 'null');
 		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -183,7 +182,6 @@ class Cotisation extends CommonObject
 		{
 			$this->db->rollback();
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -207,7 +205,7 @@ class Cotisation extends CommonObject
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."cotisation WHERE rowid = ".$this->id;
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/adherents/class/index.html b/htdocs/adherents/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 2bb7a438f3e..160f47365fa 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -97,17 +97,17 @@ if ($result)
     print '<table class="noborder" width="100%">';
 
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Ref"),"cotisations.php","c.rowid",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Name"),"cotisations.php","d.lastname",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Login"),"cotisations.php","d.login",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Label"),"cotisations.php","c.note",$param,"",'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"c.rowid",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"c.note",$param,"",'align="left"',$sortfield,$sortorder);
     if (! empty($conf->banque->enabled))
     {
-        print_liste_field_titre($langs->trans("Account"),"cotisations.php","b.fk_account",$pram,"","",$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"b.fk_account",$pram,"","",$sortfield,$sortorder);
     }
-    print_liste_field_titre($langs->trans("Date"),"cotisations.php","c.dateadh",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("DateEnd"),"cotisations.php","c.datef",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Amount"),"cotisations.php","c.cotisation",$param,"",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"c.dateadh",$param,"",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"c.datef",$param,"",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"c.cotisation",$param,"",'align="right"',$sortfield,$sortorder);
     print "</tr>\n";
 
     // Static objects
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index a3d7fe1cb40..1d780eb21a5 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -113,7 +113,7 @@ if ($id > 0)
 
 		print '<table class="border" width="100%">';
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/liste.php">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
 
         // Ref
         print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
deleted file mode 100644
index ef04edeeb53..00000000000
--- a/htdocs/adherents/fiche.php
+++ /dev/null
@@ -1,1674 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2012-2013 Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2014      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/adherents/fiche.php
- *       \ingroup    member
- *       \brief      Page of member
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.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.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("members");
-$langs->load("users");
-$langs->load('other');
-
-$action=GETPOST('action','alpha');
-$backtopage=GETPOST('backtopage','alpha');
-$confirm=GETPOST('confirm','alpha');
-$rowid=GETPOST('rowid','int');
-$typeid=GETPOST('typeid','int');
-$userid=GETPOST('userid','int');
-$socid=GETPOST('socid','int');
-
-if (! empty($conf->mailmanspip->enabled))
-{
-	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
-
-	$langs->load('mailmanspip');
-
-	$mailmanspip = new MailmanSpip($db);
-}
-
-$object = new Adherent($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$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='';
-if (! empty($canvas))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-	$objcanvas = new Canvas($db, $action);
-	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
-}
-
-// Security check
-$result=restrictedArea($user,'adherent',$rowid,'','','fk_soc', 'rowid', $objcanvas);
-
-$errmsg=''; $errmsgs=array();
-
-if ($rowid > 0)
-{
-	// Load member
-	$result = $object->fetch($rowid);
-
-	// Define variables to know what current user can do on users
-	$canadduser=($user->admin || $user->rights->user->user->creer);
-	// Define variables to know what current user can do on properties of user linked to edited member
-	if ($object->user_id)
-	{
-		// $user est le user qui edite, $object->user_id est l'id de l'utilisateur lies au membre edite
-		$caneditfielduser=((($user->id == $object->user_id) && $user->rights->user->self->creer)
-				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
-		$caneditpassworduser=((($user->id == $object->user_id) && $user->rights->user->self->password)
-				|| (($user->id != $object->user_id) && $user->rights->user->user->password));
-	}
-}
-
-// Define variables to determine what the current user can do on the members
-$canaddmember=$user->rights->adherent->creer;
-// Define variables to determine what the current user can do on the properties of a member
-if ($rowid)
-{
-	$caneditfieldmember=$user->rights->adherent->creer;
-}
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('membercard'));
-
-
-/*
- * 	Actions
-*/
-
-$parameters=array('rowid'=>$rowid, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-{
-	$error=0;
-	if (empty($user->rights->user->user->creer))	// If can edit only itself user, we can link to itself only
-	{
-		if ($userid != $user->id && $userid != $object->user_id)
-		{
-			$error++;
-			$mesg='<div class="error">'.$langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly").'</div>';
-		}
-	}
-
-	if (! $error)
-	{
-		if ($userid != $object->user_id)	// If link differs from currently in database
-		{
-			$result=$object->setUserId($userid);
-			if ($result < 0) dol_print_error($object->db,$object->error);
-			$action='';
-		}
-	}
-}
-
-if ($action == 'setsocid')
-{
-	$error=0;
-	if (! $error)
-	{
-		if ($socid != $object->fk_soc)	// If link differs from currently in database
-		{
-			$sql ="SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-			$sql.=" WHERE fk_soc = '".$socid."'";
-			$sql.=" AND entity = ".$conf->entity;
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-				if ($obj && $obj->rowid > 0)
-				{
-					$othermember=new Adherent($db);
-					$othermember->fetch($obj->rowid);
-					$thirdparty=new Societe($db);
-					$thirdparty->fetch($socid);
-					$error++;
-					$errmsg='<div class="error">'.$langs->trans("ErrorMemberIsAlreadyLinkedToThisThirdParty",$othermember->getFullName($langs),$othermember->login,$thirdparty->name).'</div>';
-				}
-			}
-
-			if (! $error)
-			{
-				$result=$object->setThirdPartyId($socid);
-				if ($result < 0) dol_print_error($object->db,$object->error);
-				$action='';
-			}
-		}
-	}
-}
-
-// Create user from a member
-if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-{
-	if ($result > 0)
-	{
-		// Creation user
-		$nuser = new User($db);
-		$result=$nuser->create_from_member($object,GETPOST('login'));
-
-		if ($result < 0)
-		{
-			$langs->load("errors");
-			$errmsg=$langs->trans($nuser->error);
-		}
-	}
-	else
-	{
-		$errmsg=$object->error;
-	}
-}
-
-// Create third party from a member
-if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-{
-	if ($result > 0)
-	{
-		// Creation user
-		$company = new Societe($db);
-		$result=$company->create_from_member($object,GETPOST('companyname'));
-
-		if ($result < 0)
-		{
-			$langs->load("errors");
-			$errmsg=$langs->trans($company->error);
-			$errmsgs=$company->errors;
-		}
-	}
-	else
-	{
-		$errmsg=$object->error;
-	}
-}
-
-if ($action == 'confirm_sendinfo' && $confirm == 'yes')
-{
-	if ($object->email)
-	{
-		$from=$conf->email_from;
-		if (! empty($conf->global->ADHERENT_MAIL_FROM)) $from=$conf->global->ADHERENT_MAIL_FROM;
-
-		$result=$object->send_an_email($langs->transnoentitiesnoconv("ThisIsContentOfYourCard")."\n\n%INFOS%\n\n",$langs->transnoentitiesnoconv("CardContent"));
-
-		$langs->load("mails");
-		$mesg=$langs->trans("MailSuccessfulySent", $from, $object->email);
-	}
-}
-
-if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$birthdate='';
-	if (isset($_POST["birthday"]) && $_POST["birthday"]
-			&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-			&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-	{
-		$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-	}
-	$lastname=$_POST["lastname"];
-	$firstname=$_POST["firstname"];
-	$morphy=$morphy=$_POST["morphy"];;
-	if ($morphy != 'mor' && empty($lastname)) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
-	}
-	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
-	}
-
-	// Create new object
-	if ($result > 0 && ! $error)
-	{
-		$object->oldcopy=dol_clone($object);
-
-		// Change values
-		$object->civility_id = trim($_POST["civility_id"]);
-		$object->firstname   = trim($_POST["firstname"]);
-		$object->lastname    = trim($_POST["lastname"]);
-		$object->login       = trim($_POST["login"]);
-		$object->pass        = trim($_POST["pass"]);
-
-		$object->societe     = trim($_POST["societe"]);
-		$object->company     = trim($_POST["societe"]);
-
-		$object->address     = trim($_POST["address"]);
-		$object->zip         = trim($_POST["zipcode"]);
-		$object->town        = trim($_POST["town"]);
-		$object->state_id    = $_POST["state_id"];
-		$object->country_id  = $_POST["country_id"];
-
-		$object->phone       = trim($_POST["phone"]);
-		$object->phone_perso = trim($_POST["phone_perso"]);
-		$object->phone_mobile= trim($_POST["phone_mobile"]);
-		$object->email       = trim($_POST["email"]);
-		$object->skype       = trim($_POST["skype"]);
-		$object->birth       = $birthdate;
-
-		$object->typeid      = $_POST["typeid"];
-		//$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']);
-
-		// Get status and public property
-		$object->statut      = $_POST["statut"];
-		$object->public      = $_POST["public"];
-
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-		// Check if we need to also synchronize user information
-		$nosyncuser=0;
-		if ($object->user_id)	// If linked to a user
-		{
-			if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser=1;		// Disable synchronizing
-		}
-
-		// Check if we need to also synchronize password information
-		$nosyncuserpass=0;
-		if ($object->user_id)	// If linked to a user
-		{
-			if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass=1;	// Disable synchronizing
-		}
-
-		$result=$object->update($user,0,$nosyncuser,$nosyncuserpass);
-		if ($result >= 0 && ! count($object->errors))
-		{
-			// Logo/Photo save
-			$dir= $conf->adherent->dir_output . '/' . get_exdir($object->id,2,0,1).'/photos';
-			$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-			if ($file_OK)
-			{
-				if (GETPOST('deletephoto'))
-				{
-					require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-					$fileimg=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/'.$object->photo;
-					$dirthumbs=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/thumbs';
-					dol_delete_file($fileimg);
-					dol_delete_dir_recursive($dirthumbs);
-				}
-
-				if (image_format_supported($_FILES['photo']['name']) > 0)
-				{
-					dol_mkdir($dir);
-
-					if (@is_dir($dir))
-					{
-						$newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-						if (! dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']) > 0)
-						{
-							$message .= '<div class="error">'.$langs->trans("ErrorFailedToSaveFile").'</div>';
-						}
-						else
-						{
-							// Create small thumbs for company (Ratio is near 16/9)
-							// Used on logon for example
-							$imgThumbSmall = vignette($newfile, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-
-							// Create mini thumbs for company (Ratio is near 16/9)
-							// Used on menu or for setup page for example
-							$imgThumbMini = vignette($newfile, $maxwidthmini, $maxheightmini, '_mini', $quality);
-						}
-					}
-				}
-				else
-				{
-					$errmsgs[] = "ErrorBadImageFormat";
-				}
-			}
-			else
-			{
-				switch($_FILES['photo']['error'])
-				{
-					case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-					case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-						$errors[] = "ErrorFileSizeTooLarge";
-						break;
-					case 3: //uploaded file was only partially uploaded
-						$errors[] = "ErrorFilePartiallyUploaded";
-						break;
-				}
-			}
-
-            $rowid=$object->id;
-			$action='';
-
-			if (! empty($backtopage))
-			{
-				header("Location: ".$backtopage);
-				exit;
-			}
-		}
-		else
-		{
-			if ($object->error) $errmsg=$object->error;
-			else $errmsgs=$object->errors;
-			$action='';
-		}
-	}
-	else
-	{
-		$action='edit';
-	}
-}
-
-if ($action == 'add' && $user->rights->adherent->creer)
-{
-	if ($canvas) $object->canvas=$canvas;
-	$birthdate='';
-	if (isset($_POST["birthday"]) && $_POST["birthday"]
-			&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-			&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-	{
-		$birthdate=dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-	}
-	$datecotisation='';
-	if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
-	{
-		$datecotisation=dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
-	}
-
-	$typeid=$_POST["typeid"];
-	$civility_id=$_POST["civility_id"];
-	$lastname=$_POST["lastname"];
-	$firstname=$_POST["firstname"];
-	$societe=$_POST["societe"];
-	$address=$_POST["address"];
-	$zip=$_POST["zipcode"];
-	$town=$_POST["town"];
-	$state_id=$_POST["state_id"];
-	$country_id=$_POST["country_id"];
-
-	$phone=$_POST["phone"];
-	$phone_perso=$_POST["phone_perso"];
-	$phone_mobile=$_POST["phone_mobile"];
-	$skype=$_POST["member_skype"];
-	$email=$_POST["member_email"];
-	$login=$_POST["member_login"];
-	$pass=$_POST["password"];
-	$photo=$_POST["photo"];
-	//$comment=$_POST["comment"];
-	$morphy=$_POST["morphy"];
-	$cotisation=$_POST["cotisation"];
-	$public=$_POST["public"];
-
-	$userid=$_POST["userid"];
-	$socid=$_POST["socid"];
-
-	$object->civility_id = $civility_id;
-	$object->firstname   = $firstname;
-	$object->lastname    = $lastname;
-	$object->societe     = $societe;
-	$object->address     = $address;
-	$object->zip         = $zip;
-	$object->town        = $town;
-	$object->state_id    = $state_id;
-	$object->country_id  = $country_id;
-	$object->phone       = $phone;
-	$object->phone_perso = $phone_perso;
-	$object->phone_mobile= $phone_mobile;
-	$object->skype       = $skype;
-	$object->email       = $email;
-	$object->login       = $login;
-	$object->pass        = $pass;
-	$object->naiss       = $birthdate;
-	$object->photo       = $photo;
-	$object->typeid      = $typeid;
-	//$object->note        = $comment;
-	$object->morphy      = $morphy;
-	$object->user_id     = $userid;
-	$object->fk_soc      = $socid;
-	$object->public      = $public;
-
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-	// Check parameters
-	if (empty($morphy) || $morphy == "-1") {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Nature"))."<br>\n";
-	}
-	// Test si le login existe deja
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
-		if (empty($login)) {
-			$error++;
-			$errmsg .= $langs->trans("ErrorFieldRequired",$langs->trans("Login"))."<br>\n";
-		}
-		else {
-			$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
-			$result = $db->query($sql);
-			if ($result) {
-				$num = $db->num_rows($result);
-			}
-			if ($num) {
-				$error++;
-				$langs->load("errors");
-				$errmsg .= $langs->trans("ErrorLoginAlreadyExists",$login)."<br>\n";
-			}
-		}
-		if (empty($pass)) {
-			$error++;
-			$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Password"))."<br>\n";
-		}
-	}
-	if ($morphy != 'mor' && empty($lastname)) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname"))."<br>\n";
-	}
-	if ($morphy != 'mor' && (!isset($firstname) || $firstname=='')) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentities("Firstname"))."<br>\n";
-	}
-	if (! ($typeid > 0)) {	// Keep () before !
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type"))."<br>\n";
-	}
-	if ($conf->global->ADHERENT_MAIL_REQUIRED && ! isValidEMail($email)) {
-		$error++;
-		$langs->load("errors");
-		$errmsg .= $langs->trans("ErrorBadEMail",$email)."<br>\n";
-	}
-	$public=0;
-	if (isset($public)) $public=1;
-
-	if (! $error)
-	{
-		$db->begin();
-
-		// Email a peu pres correct et le login n'existe pas
-		$result=$object->create($user);
-		if ($result > 0)
-		{
-			$db->commit();
-			$rowid=$object->id;
-			$action='';
-		}
-		else
-		{
-			$db->rollback();
-
-			if ($object->error) $errmsg=$object->error;
-			else $errmsgs=$object->errors;
-
-			$action = 'create';
-		}
-	}
-	else {
-		$action = 'create';
-	}
-}
-
-if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-{
-	$result=$object->delete($rowid);
-	if ($result > 0)
-	{
-		if (! empty($backtopage))
-		{
-			header("Location: ".$backtopage);
-			exit;
-		}
-		else
-		{
-			header("Location: liste.php");
-			exit;
-		}
-	}
-	else
-	{
-		$errmesg=$object->error;
-	}
-}
-
-if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
-{
-	$error=0;
-
-	$db->begin();
-
-	$adht = new AdherentType($db);
-	$adht->fetch($object->typeid);
-
-	$result=$object->validate($user);
-
-	if ($result >= 0 && ! count($object->errors))
-	{
-		// Send confirmation Email (selon param du type adherent sinon generique)
-		if ($object->email && GETPOST("send_mail"))
-		{
-			$result=$object->send_an_email($adht->getMailOnValid(),$conf->global->ADHERENT_MAIL_VALID_SUBJECT,array(),array(),array(),"","",0,2);
-			if ($result < 0)
-			{
-				$error++;
-				$errmsg.=$object->error;
-			}
-		}
-	}
-	else
-	{
-		$error++;
-		if ($object->error) $errmsg=$object->error;
-		else $errmsgs=$object->errors;
-	}
-
-	if (! $error)
-	{
-		$db->commit();
-	}
-	else
-	{
-		$db->rollback();
-	}
-	$action='';
-}
-
-if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
-{
-	if ($confirm == 'yes')
-	{
-		$adht = new AdherentType($db);
-		$adht->fetch($object->typeid);
-
-		$result=$object->resiliate($user);
-
-		if ($result >= 0 && ! count($object->errors))
-		{
-			if ($object->email && GETPOST("send_mail"))
-			{
-				$result=$object->send_an_email($adht->getMailOnResiliate(),$conf->global->ADHERENT_MAIL_RESIL_SUBJECT,array(),array(),array(),"","",0,-1);
-			}
-			if ($result < 0)
-			{
-				$errmsg.=$object->error;
-			}
-		}
-		else
-		{
-			if ($object->error) $errmsg=$object->error;
-			else $errmsgs=$object->errors;
-			$action='';
-		}
-	}
-	if (! empty($backtopage) && ! $errmsg)
-	{
-		header("Location: ".$backtopage);
-		exit;
-	}
-}
-
-// SPIP Management
-if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
-{
-	if (! count($object->errors))
-	{
-		if (!$mailmanspip->del_to_spip($object))
-		{
-			$errmsg.= $langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error."<BR>\n";
-		}
-	}
-}
-
-if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
-{
-	if (! count($object->errors))
-	{
-		if (!$mailmanspip->add_to_spip($object))
-		{
-			$errmsg.= $langs->trans('AddIntoSpipError').': '.$mailmanspip->error."<BR>\n";
-		}
-	}
-}
-
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formcompany = new FormCompany($db);
-
-$help_url='EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
-llxHeader('',$langs->trans("Member"),$help_url);
-
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
-	// -----------------------------------------
-	// When used with CANVAS
-	// -----------------------------------------
-	if (empty($object->error) && $rowid)
-	{
-		$object = new Adherent($db);
-		$result=$object->fetch($rowid);
-		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
-}
-else
-{
-	// -----------------------------------------
-	// When used in standard mode
-	// -----------------------------------------
-
-	if ($action == 'create')
-	{
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* Creation card                                                              */
-		/*                                                                            */
-		/* ************************************************************************** */
-		$object->canvas=$canvas;
-		$object->state_id = GETPOST('state_id', 'int');
-
-		// We set country_id, country_code and country for the selected country
-		$object->country_id=GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
-		if ($object->country_id)
-		{
-			$tmparray=getCountry($object->country_id,'all');
-			$object->country_code=$tmparray['code'];
-			$object->country=$tmparray['label'];
-		}
-
-		$adht = new AdherentType($db);
-
-		print_fiche_titre($langs->trans("NewMember"));
-
-		dol_htmloutput_mesg($errmsg,$errmsgs,'error');
-		dol_htmloutput_mesg($mesg,$mesgs);
-
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n".'<script type="text/javascript" language="javascript">';
-			print 'jQuery(document).ready(function () {
-						jQuery("#selectcountry_id").change(function() {
-							document.formsoc.action.value="create";
-							document.formsoc.submit();
-						});
-						function initfieldrequired()
-						{
-							jQuery("#tdcompany").removeClass("fieldrequired");
-							jQuery("#tdlastname").removeClass("fieldrequired");
-							jQuery("#tdfirstname").removeClass("fieldrequired");
-							if (jQuery("#morphy").val() == \'mor\')
-							{
-								jQuery("#tdcompany").addClass("fieldrequired");
-							}
-							if (jQuery("#morphy").val() == \'phy\')
-							{
-								jQuery("#tdlastname").addClass("fieldrequired");
-								jQuery("#tdfirstname").addClass("fieldrequired");
-							}
-						}
-						jQuery("#morphy").change(function() {
-							initfieldrequired();
-						});
-						initfieldrequired();
-					})';
-			print '</script>'."\n";
-		}
-
-		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="add">';
-
-		print '<table class="border" width="100%">';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" size="40" value="'.(isset($_POST["member_login"])?$_POST["member_login"]:$object->login).'"></td></tr>';
-		}
-
-		// Moral-Physique
-		$morphys["phy"] = $langs->trans("Physical");
-		$morphys["mor"] = $langs->trans("Moral");
-		print '<tr><td class="fieldrequired">'.$langs->trans("Nature")."</td><td>\n";
-		print $form->selectarray("morphy", $morphys, GETPOST('morphy','alpha')?GETPOST('morphy','alpha'):$object->morphy, 1);
-		print "</td>\n";
-
-		// Type
-		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
-		$listetype=$adht->liste_array();
-		if (count($listetype))
-		{
-			print $form->selectarray("typeid", $listetype, GETPOST('typeid','int')?GETPOST('typeid','int'):$typeid, count($listetype)>1?1:0);
-		} else {
-			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
-		}
-		print "</td>\n";
-
-		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(GETPOST('societe','alpha')?GETPOST('societe','alpha'):$object->societe).'"></td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(GETPOST('civility_id','int')?GETPOST('civility_id','int'):$object->civility_id,'civility_id').'</td>';
-		print '</tr>';
-
-		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.(GETPOST('lastname','alpha')?GETPOST('lastname','alpha'):$object->lastname).'" size="40"></td>';
-		print '</tr>';
-
-		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(GETPOST('firstname','alpha')?GETPOST('firstname','alpha'):$object->firstname).'"></td>';
-		print '</tr>';
-
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="member_email" size="40" value="'.(GETPOST('member_email','alpha')?GETPOST('member_email','alpha'):$object->email).'"></td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-			$generated_password=getRandomPassword(false);
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
-			print '<input size="30" maxsize="32" type="text" name="password" value="'.$generated_password.'">';
-			print '</td></tr>';
-		}
-
-		// Address
-		print '<tr><td valign="top">'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" cols="40" rows="2">'.(GETPOST('address','alpha')?GETPOST('address','alpha'):$object->address).'</textarea>';
-		print '</td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((GETPOST('zipcode','alpha')?GETPOST('zipcode','alpha'):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((GETPOST('town','alpha')?GETPOST('town','alpha'):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</td></tr>';
-
-		// Country
-		$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
-		print $form->select_country(GETPOST('country_id','alpha')?GETPOST('country_id','alpha'):$object->country_id,'country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
-			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($object->country_id)
-			{
-				print $formcompany->select_state(GETPOST('state_id','int')?GETPOST('state_id','int'):$object->state_id,$object->country_code);
-			}
-			else
-			{
-				print $countrynotdefined;
-			}
-			print '</td></tr>';
-		}
-
-		// Tel pro
-		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(GETPOST('phone','alpha')?GETPOST('phone','alpha'):$object->phone).'"></td></tr>';
-
-		// Tel perso
-		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(GETPOST('phone_perso','alpha')?GETPOST('phone_perso','alpha'):$object->phone_perso).'"></td></tr>';
-
-		// Tel mobile
-		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(GETPOST('phone_mobile','alpha')?GETPOST('phone_mobile','alpha'):$object->phone_mobile).'"></td></tr>';
-
-	    // Skype
-	    if (! empty($conf->skype->enabled))
-	    {
-			print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="member_skype" size="40" value="'.(GETPOST('member_skype','alpha')?GETPOST('member_skype','alpha'):$object->skype).'"></td></tr>';
-	    }
-
-		// Birthday
-		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
-		print "</td></tr>\n";
-
-		// Profil public
-		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-		print $form->selectyesno("public",$object->public,1);
-		print "</td></tr>\n";
-
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-		/*
-		 // Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
-		print $form->select_company($object->fk_soc,'socid','',1);
-		print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
-		print $form->select_dolusers($object->user_id,'userid',1);
-		print '</td></tr>';
-		*/
-
-		print "</table>\n";
-		print '<br>';
-
-		print '<center><input type="submit" class="button" value="'.$langs->trans("AddMember").'"></center>';
-
-		print "</form>\n";
-
-	}
-
-	if ($action == 'edit')
-	{
-		/********************************************
-		 *
-		* Fiche en mode edition
-		*
-		********************************************/
-
-		$res=$object->fetch($rowid);
-		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;
-		}
-
-		$adht = new AdherentType($db);
-		$adht->fetch($object->typeid);
-
-		// We set country_id, and country_code, country of the chosen country
-		$country=GETPOST('country','int');
-		if (!empty($country) || $object->country_id)
-		{
-			$sql = "SELECT rowid, code, libelle as label from ".MAIN_DB_PREFIX."c_pays where rowid = ".(!empty($country)?$country:$object->country_id);
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-			$object->country_id=$obj->rowid;
-			$object->country_code=$obj->code;
-			$object->country=$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
-		}
-
-		$head = member_prepare_head($object);
-
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
-		dol_htmloutput_errors($errmsg,$errmsgs);
-		dol_htmloutput_mesg($mesg);
-
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n".'<script type="text/javascript" language="javascript">';
-			print 'jQuery(document).ready(function () {
-				jQuery("#selectcountry_id").change(function() {
-					document.formsoc.action.value="edit";
-					document.formsoc.submit();
-				});
-				function initfieldrequired()
-				{
-					jQuery("#tdcompany").removeClass("fieldrequired");
-					jQuery("#tdlastname").removeClass("fieldrequired");
-					jQuery("#tdfirstname").removeClass("fieldrequired");
-					if (jQuery("#morphy").val() == \'mor\')
-					{
-						jQuery("#tdcompany").addClass("fieldrequired");
-					}
-					if (jQuery("#morphy").val() == \'phy\')
-					{
-						jQuery("#tdlastname").addClass("fieldrequired");
-						jQuery("#tdfirstname").addClass("fieldrequired");
-					}
-				}
-				jQuery("#morphy").change(function() {
-					initfieldrequired();
-				});
-				initfieldrequired();
-			})';
-			print '</script>'."\n";
-		}
-
-		$rowspan=15;
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
-		if (! empty($conf->societe->enabled)) $rowspan++;
-
-		print '<form name="formsoc" action="'.$_SERVER["PHP_SELF"].'" method="post" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-		print '<input type="hidden" name="action" value="update" />';
-		print '<input type="hidden" name="rowid" value="'.$rowid.'" />';
-		print '<input type="hidden" name="statut" value="'.$object->statut.'" />';
-		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
-
-		print '<table class="border" width="100%">';
-
-		// Ref
-		print '<tr><td>'.$langs->trans("Ref").'</td><td class="valeur" colspan="2">'.$object->id.'</td></tr>';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td colspan="2"><input type="text" name="login" size="30" value="'.(isset($_POST["login"])?$_POST["login"]:$object->login).'"></td></tr>';
-		}
-
-		// Physique-Moral
-		$morphys["phy"] = $langs->trans("Physical");
-		$morphys["mor"] = $langs->trans("Morale");
-		print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
-		print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
-		print "</td>";
-		// Photo
-		print '<td align="center" class="hideonsmartphone" valign="middle" width="25%" rowspan="'.$rowspan.'">';
-		print $form->showphoto('memberphoto',$object)."\n";
-		if ($caneditfieldmember)
-		{
-			if ($object->photo) print "<br>\n";
-			print '<table class="nobordernopadding">';
-			if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-			print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-			print '</table>';
-		}
-		print '</td>';
-
-		// Type
-		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer)
-		{
-			print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
-		}
-		else
-		{
-			print $adht->getNomUrl(1);
-			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
-		}
-		print "</td></tr>";
-
-		// Company
-		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.(isset($_POST["societe"])?$_POST["societe"]:$object->societe).'"></td></tr>';
-
-		// Civility
-		print '<tr><td width="20%">'.$langs->trans("UserTitle").'</td><td width="35%">';
-		print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id)."\n";
-		print '</td>';
-		print '</tr>';
-
-		// Lastname
-		print '<tr><td id="tdlastname">'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.(isset($_POST["lastname"])?$_POST["lastname"]:$object->lastname).'"></td>';
-		print '</tr>';
-
-		// Firstname
-		print '<tr><td id="tdfirstname">'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td>';
-		print '</tr>';
-
-		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED?'<span class="fieldrequired">':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'</span>':'').'</td><td><input type="text" name="email" size="40" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" size="30" value="'.(isset($_POST["pass"])?$_POST["pass"]:$object->pass).'"></td></tr>';
-		}
-
-		// Address
-		print '<tr><td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" cols="40" rows="2">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea>';
-		print '</td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</td></tr>';
-
-		// Country
-		//$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;    // In edit mode we don't force to company country if not defined
-		print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
-		print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
-			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id);
-			print '</td></tr>';
-		}
-
-		// Tel
-		print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input type="text" name="phone" size="20" value="'.(isset($_POST["phone"])?$_POST["phone"]:$object->phone).'"></td></tr>';
-
-		// Tel perso
-		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td><input type="text" name="phone_perso" size="20" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$object->phone_perso).'"></td></tr>';
-
-		// Tel mobile
-		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input type="text" name="phone_mobile" size="20" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td></tr>';
-
-	    // Skype
-	    if (! empty($conf->skype->enabled))
-	    {
-			    print '<tr><td>'.$langs->trans("Skype").'</td><td><input type="text" name="skype" size="40" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
-	    }
-
-		// Birthday
-		print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
-		$form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
-		print "</td></tr>\n";
-
-		// Profil public
-		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
-		print $form->selectyesno("public",(isset($_POST["public"])?$_POST["public"]:$object->public),1);
-		print "</td></tr>\n";
-
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-		// Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
-			if ($object->fk_soc)
-			{
-				$company=new Societe($db);
-				$result=$company->fetch($object->fk_soc);
-				print $company->getNomUrl(1);
-			}
-			else
-			{
-				print $langs->trans("NoThirdPartyAssociatedToMember");
-			}
-			print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
-		if ($object->user_id)
-		{
-			print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
-		print '</td></tr>';
-
-		print '</table>';
-
-		print '<br><center>';
-		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-		print ' &nbsp; &nbsp; &nbsp; ';
-		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</center';
-
-		print '</form>';
-
-		print '</div>';
-	}
-
-	if ($rowid && $action != 'edit')
-	{
-		dol_htmloutput_mesg($mesg);
-
-		/* ************************************************************************** */
-		/*                                                                            */
-		/* Mode affichage                                                             */
-		/*                                                                            */
-		/* ************************************************************************** */
-
-		$res=$object->fetch($rowid);
-		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;
-		}
-
-		$adht = new AdherentType($db);
-		$res=$adht->fetch($object->typeid);
-		if ($res < 0) {
-			dol_print_error($db); exit;
-		}
-
-
-		/*
-		 * Affichage onglets
-		*/
-		$head = member_prepare_head($object);
-
-		dol_fiche_head($head, 'general', $langs->trans("Member"), 0, 'user');
-
-		dol_htmloutput_errors($errmsg,$errmsgs);
-
-		// Confirm create user
-		if ($action == 'create_user')
-		{
-			$login=$object->login;
-			if (empty($login))
-			{
-				// Full firstname and name separated with a dot : firstname.name
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$login=dol_buildlogin($object->lastname,$object->firstname);
-			}
-			if (empty($login)) $login=strtolower(substr($object->firstname, 0, 4)) . strtolower(substr($object->lastname, 0, 4));
-
-			// Create a form array
-			$formquestion=array(
-					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
-			);
-			$text=$langs->trans("ConfirmCreateLogin").'<br>';
-			if (! empty($conf->societe->enabled))
-			{
-				if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
-				else $text.=$langs->trans("UserWillBeInternalUser");
-			}
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
-		}
-
-		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
-			$name = $object->getFullName($langs);
-			if (! empty($name))
-			{
-				if ($object->societe) $name.=' ('.$object->societe.')';
-			}
-			else
-			{
-				$name=$object->societe;
-			}
-
-			// Create a form array
-			$formquestion=array(		array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
-
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
-		}
-
-		// Confirm validate member
-		if ($action == 'valid')
-		{
-			$langs->load("mails");
-
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_VALID_SUBJECT);
-			$texttosend=$object->makeSubstitution($adht->getMailOnValid());
-
-			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.=' ('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
-			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
-			$helpcontent='';
-			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
-			$helpcontent.=$subjecttosend."\n";
-			$helpcontent.="<br>";
-			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
-			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
-			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
-			// Cree un tableau formulaire
-			$formquestion=array();
-			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label,  'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
-			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_MAILMAN)) {
-				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"),'value'=>'');
-			}
-			if (! empty($conf->mailman->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))    {
-				$formquestion[]=array('type'=>'other','label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"),'value'=>'');
-			}
-			print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1);
-		}
-
-		// Confirm send card by mail
-		if ($action == 'sendinfo')
-		{
-			print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
-		}
-
-		// Confirm resiliate
-		if ($action == 'resign')
-		{
-			$langs->load("mails");
-
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
-
-			$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_RESIL_SUBJECT);
-			$texttosend=$object->makeSubstitution($adht->getMailOnResiliate());
-
-			$tmp=$langs->trans("SendAnEMailToMember");
-			$tmp.=' ('.$langs->trans("MailFrom").': <b>'.$conf->global->ADHERENT_MAIL_FROM.'</b>, ';
-			$tmp.=$langs->trans("MailRecipient").': <b>'.$object->email.'</b>)';
-			$helpcontent='';
-			$helpcontent.='<b>'.$langs->trans("MailFrom").'</b>: '.$conf->global->ADHERENT_MAIL_FROM.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("MailRecipient").'</b>: '.$object->email.'<br>'."\n";
-			$helpcontent.='<b>'.$langs->trans("Subject").'</b>:<br>'."\n";
-			$helpcontent.=$subjecttosend."\n";
-			$helpcontent.="<br>";
-			$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
-			$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
-			$label=$form->textwithpicto($tmp,$helpcontent,1,'help');
-
-			// Cree un tableau formulaire
-			$formquestion=array();
-			if ($object->email) $formquestion[]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (! empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?'true':'false'));
-			if ($backtopage)    $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
-		}
-
-		// Confirm remove member
-		if ($action == 'delete')
-		{
-			$formquestion=array();
-			if ($backtopage) $formquestion[]=array('type' => 'hidden', 'name' => 'backtopage', 'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]));
-			print $form->formconfirm("fiche.php?rowid=".$rowid,$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",$formquestion,0,1);
-		}
-
-		/*
-		 * Confirm add in spip
-		 */
-		if ($action == 'add_spip')
-		{
-			print $form->formconfirm("fiche.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
-		}
-
-		/*
-		 * Confirm removed from spip
-		 */
-		if ($action == 'del_spip')
-		{
-			print $form->formconfirm("fiche.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
-		}
-
-		$rowspan=17;
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++;
-		if (! empty($conf->societe->enabled)) $rowspan++;
-		if (! empty($conf->skype->enabled)) $rowspan++;
-
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/liste.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-		print '<td class="valeur" colspan="2">';
-		print $form->showrefnav($object, 'rowid', $linkback);
-		print '</td></tr>';
-
-		$showphoto='<td rowspan="'.$rowspan.'" align="center" class="hideonsmartphone" valign="middle" width="25%">';
-		$showphoto.=$form->showphoto('memberphoto',$object);
-		$showphoto.='</td>';
-
-		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td>'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td>';
-			// Photo
-			print $showphoto; $showphoto='';
-			print '</tr>';
-		}
-
-		// Morphy
-		print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
-		print $showphoto; $showphoto='';
-		print '</tr>';
-
-		// Type
-		print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
-
-		// Company
-		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
-
-		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
-		print '</tr>';
-
-		// Lastname
-		print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
-		print '</tr>';
-
-		// Firstname
-		print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td></tr>';
-
-		// EMail
-		print '<tr><td>'.$langs->trans("EMail").'</td><td class="valeur">'.dol_print_email($object->email,0,$object->fk_soc,1).'</td></tr>';
-
-		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
-			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i','*',$object->pass).'</td></tr>';
-		}
-
-		// Address
-		print '<tr><td>'.$langs->trans("Address").'</td><td class="valeur">';
-		dol_print_address($object->address,'gmap','member',$object->id);
-		print '</td></tr>';
-
-		// Zip / Town
-		print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td></tr>';
-
-		// Country
-		print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">';
-		$img=picto_from_langcode($object->country_code);
-		if ($img) print $img.' ';
-		print getCountry($object->country_code);
-		print '</td></tr>';
-
-		// State
-		print '<tr><td>'.$langs->trans('State').'</td><td class="valeur">'.$object->state.'</td>';
-
-		// Tel pro.
-		print '<tr><td>'.$langs->trans("PhonePro").'</td><td class="valeur">'.dol_print_phone($object->phone,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
-
-		// Tel perso
-		print '<tr><td>'.$langs->trans("PhonePerso").'</td><td class="valeur">'.dol_print_phone($object->phone_perso,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
-
-		// Tel mobile
-		print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td class="valeur">'.dol_print_phone($object->phone_mobile,$object->country_code,0,$object->fk_soc,1).'</td></tr>';
-
-    	// Skype
-		if (! empty($conf->skype->enabled))
-		{
-			print '<tr><td>'.$langs->trans("Skype").'</td><td class="valeur">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
-		}
-
-		// Birthday
-		print '<tr><td>'.$langs->trans("Birthday").'</td><td class="valeur">'.dol_print_date($object->birth,'day').'</td></tr>';
-
-		// Public
-		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
-
-		// Status
-		print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';
-
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields);
-		}
-
-		// Third party Dolibarr
-		if (! empty($conf->societe->enabled))
-		{
-			print '<tr><td>';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print $langs->trans("LinkedToDolibarrThirdParty");
-			print '</td>';
-			if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'),1).'</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="2" class="valeur">';
-			if ($action == 'editthirdparty')
-			{
-				$htmlname='socid';
-				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
-				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-				print '<input type="hidden" name="action" value="set'.$htmlname.'">';
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-				print '<tr><td>';
-				print $form->select_company($object->fk_soc,'socid','',1);
-				print '</td>';
-				print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-				print '</tr></table></form>';
-			}
-			else
-			{
-				if ($object->fk_soc)
-				{
-					$company=new Societe($db);
-					$result=$company->fetch($object->fk_soc);
-					print $company->getNomUrl(1);
-				}
-				else
-				{
-					print $langs->trans("NoThirdPartyAssociatedToMember");
-				}
-			}
-			print '</td></tr>';
-		}
-
-		// Login Dolibarr
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans("LinkedToDolibarrUser");
-		print '</td>';
-		if ($action != 'editlogin' && $user->rights->adherent->creer)
-		{
-			print '<td align="right">';
-			if ($user->rights->user->user->creer)
-			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'),1).'</a>';
-			}
-			print '</td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editlogin')
-		{
-			print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
-		}
-		else
-		{
-			if ($object->user_id)
-			{
-				print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
-			}
-			else print $langs->trans("NoDolibarrAccess");
-		}
-		print '</td></tr>';
-
-		print "</table>\n";
-
-		print "</div>\n";
-
-
-		/*
-		 * Barre d'actions
-		*
-		*/
-		print '<div class="tabsAction">';
-
-		if ($action != 'valid' && $action != 'editlogin' && $action != 'editthirdparty')
-		{
-			// Modify
-			if ($user->rights->adherent->creer)
-			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$rowid.'&action=edit">'.$langs->trans("Modify")."</a></div>";
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
-			}
-
-			// Valider
-			if ($object->statut == -1)
-			{
-				if ($user->rights->adherent->creer)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$rowid.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
-				}
-			}
-
-			// Reactiver
-			if ($object->statut == 0)
-			{
-				if ($user->rights->adherent->creer)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$rowid.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
-				}
-			}
-
-			// Send card by email
-			if ($user->rights->adherent->creer)
-			{
-				if ($object->statut >= 1)
-				{
-					if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a></div>\n";
-					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a></div>\n";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-				}
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("SendCardByMail")."</font></div>";
-			}
-
-			// Resilier
-			if ($object->statut >= 1)
-			{
-				if ($user->rights->adherent->supprimer)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$rowid.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
-				}
-			}
-
-			// Create third party
-			if (! empty($conf->societe->enabled) && ! $object->fk_soc)
-			{
-				if ($user->rights->societe->creer)
-				{
-					if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
-				}
-			}
-
-			// Create user
-			if (! $user->societe_id && ! $object->user_id)
-			{
-				if ($user->rights->user->user->creer)
-				{
-					if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-				}
-				else
-				{
-					print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
-				}
-			}
-
-			// Delete
-			if ($user->rights->adherent->supprimer)
-			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="fiche.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><font class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Delete")."</font></div>";
-			}
-
-			// Action SPIP
-			if (! empty($conf->mailmanspip->enabled) && ! empty($conf->global->ADHERENT_USE_SPIP))
-			{
-				$isinspip = $mailmanspip->is_in_spip($object);
-
-				if ($isinspip == 1)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
-				}
-				if ($isinspip == 0)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
-				}
-			}
-
-		}
-
-		print '</div>';
-
-		if ($isinspip == -1)
-		{
-			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
-		}
-		print "<br>\n";
-
-	}
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php
index 950ff888612..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 '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="post">';
@@ -282,8 +282,6 @@ if ($rowid && $action != 'edit')
 
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), '', 'payment');
 
-	if ($msg) print '<div class="error">'.$msg.'</div>';
-
     // Confirmation to delete subscription
     if ($action == 'delete')
     {
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index e64466ce9a6..62e54c17948 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -68,7 +68,7 @@ $sql.= " AND d.entity IN (".getEntity().")";
 $sql.= " WHERE t.entity IN (".getEntity().")";
 $sql.= " GROUP BY t.rowid, t.libelle, t.cotisation, d.statut";
 
-dol_syslog("index.php::select nb of members by type sql=".$sql, LOG_DEBUG);
+dol_syslog("index.php::select nb of members by type", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
@@ -106,7 +106,7 @@ $sql.= " AND d.statut = 1 AND d.datefin >= '".$db->idate($now)."'";
 $sql.= " AND t.rowid = d.fk_adherent_type";
 $sql.= " GROUP BY d.fk_adherent_type";
 
-dol_syslog("index.php::select nb of uptodate members by type sql=".$sql, LOG_DEBUG);
+dol_syslog("index.php::select nb of uptodate members by type", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
@@ -127,7 +127,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 // Formulaire recherche adherent
-print '<form action="liste.php" method="post">';
+print '<form action="list.php" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="search">';
 print '<table class="noborder nohover" width="100%">';
@@ -137,15 +137,15 @@ print "</tr>\n";
 $var=false;
 print "<tr ".$bc[$var].">";
 print '<td>';
-print $langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="16">';
+print '<label for="search_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="16">';
 print '</td><td rowspan="3"><input class="button" type="submit" value="'.$langs->trans("Search").'"></td></tr>';
 print "<tr ".$bc[$var].">";
 print '<td>';
-print $langs->trans("Name").':</td><td><input type="text" name="search_lastname" class="flat" size="16">';
+print '<label for="search_lastname">'.$langs->trans("Name").'</label>:</td><td><input type="text" name="search_lastname" id="search_lastname" class="flat" size="16">';
 print '</td></tr>';
 print "<tr ".$bc[$var].">";
 print '<td>';
-print $langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="16">';
+print '<label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="16">';
 print '</td></tr>';
 print "</table></form>";
 
@@ -159,7 +159,7 @@ if ($conf->use_javascript_ajax)
     print '<br>';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>';
-    print '<tr><td align="center">';
+    print '<tr '.$bc[0].'><td align="center" colspan="2">';
 
     $SommeA=0;
     $SommeB=0;
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index ca651854a24..c05dc78af83 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -60,8 +60,6 @@ if (! $result)
 
 if ($action == 'dolibarr2ldap')
 {
-	$message="";
-
 	$db->begin();
 
 	$ldap=new Ldap();
@@ -75,12 +73,12 @@ if ($action == 'dolibarr2ldap')
 
 	if ($result >= 0)
 	{
-		$message.='<div class="ok">'.$langs->trans("MemberSynchronized").'</div>';
+		setEventMessage($langs->trans("MemberSynchronized"));
 		$db->commit();
 	}
 	else
 	{
-		$message.='<div class="error">'.$ldap->error.'</div>';
+		setEventMessage($ldap->error, 'errors');
 		$db->rollback();
 	}
 }
@@ -157,10 +155,6 @@ print '</table>';
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
new file mode 100644
index 00000000000..b70e212d2d2
--- /dev/null
+++ b/htdocs/adherents/list.php
@@ -0,0 +1,383 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2013      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/adherents/list.php
+ *      \ingroup    member
+ *		\brief      Page to list all members of foundation
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+
+$langs->load("members");
+$langs->load("companies");
+
+// Security check
+$result=restrictedArea($user,'adherent');
+
+$action=GETPOST("action");
+$filter=GETPOST("filter");
+$statut=GETPOST("statut");
+$search=GETPOST("search");
+$search_ref=GETPOST("search_ref");
+$search_lastname=GETPOST("search_lastname");
+$search_firstname=GETPOST("search_firstname");
+$search_login=GETPOST("search_login");
+$type=GETPOST("type");
+$search_email=GETPOST("search_email");
+$search_categ = GETPOST("search_categ",'int');
+$catid        = GETPOST("catid",'int');
+$sall=GETPOST("sall");
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) { $sortorder=($filter=='outofdate'?"ASC":"DESC"); }
+if (! $sortfield) { $sortfield=($filter=='outofdate'?"d.datefin":"d.lastname"); }
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search="";
+	$search_ref="";
+    $search_lastname="";
+	$search_firstname="";
+	$search_login="";
+	$type="";
+	$search_email="";
+	$search_categ="";
+	$catid="";
+	$sall="";
+}
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+$formother=new FormOther($db);
+$membertypestatic=new AdherentType($db);
+$memberstatic=new Adherent($db);
+
+llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
+
+$now=dol_now();
+
+$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
+$sql.= " d.datefin,";
+$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+$sql.= " t.libelle as type, t.cotisation";
+$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
+if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member"; // We need this table joined to the select in order to filter by categ
+$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
+$sql.= " WHERE d.fk_adherent_type = t.rowid ";
+if ($catid > 0)    $sql.= " AND cm.fk_categorie = ".$db->escape($catid);
+if ($catid == -2)  $sql.= " AND cm.fk_categorie IS NULL";
+if ($search_categ > 0)   $sql.= " AND cm.fk_categorie = ".$db->escape($search_categ);
+if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
+$sql.= " AND d.entity = ".$conf->entity;
+if ($sall)
+{
+        // For natural search
+        $scrit = explode(' ', $sall);
+        foreach ($scrit as $crit)
+        {
+            $sql.=" AND (";
+            if (is_numeric($sall)) $sql.= "d.rowid = ".$sall." OR ";
+            $sql.=" d.firstname LIKE '%".$db->escape($sall)."%' OR d.lastname LIKE '%".$db->escape($sall)."%' OR d.societe LIKE '%".$db->escape($sall)."%'";
+            $sql.=" OR d.email LIKE '%".$db->escape($sall)."%' OR d.login LIKE '%".$db->escape($sall)."%' OR d.address LIKE '%".$db->escape($sall)."%'";
+            $sql.=" OR d.town LIKE '%".$db->escape($sall)."%' OR d.note LIKE '%".$db->escape($sall)."%')";
+        }
+}
+if ($type > 0)
+{
+	$sql.=" AND t.rowid=".$type;
+}
+if (isset($_GET["statut"]) || isset($_POST["statut"]))
+{
+	$sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
+}
+if ($search_ref)
+{
+	if (is_numeric($search_ref)) $sql.= " AND (d.rowid = ".$db->escape($search_ref).")";
+	else $sql.=" AND 1 = 2";    // Always wrong
+}
+if ($search_lastname)
+{
+	$sql.= " AND (d.firstname LIKE '%".$db->escape($search_lastname)."%' OR d.lastname LIKE '%".$db->escape($search_lastname)."%' OR d.societe LIKE '%".$db->escape($search_lastname)."%')";
+}
+if ($search_login)
+{
+	$sql.= " AND d.login LIKE '%".$db->escape($search_login)."%'";
+}
+if ($search_email)
+{
+	$sql.= " AND (d.email LIKE '%".$db->escape($search_email)."%')";
+}
+if ($filter == 'uptodate')
+{
+	$sql.=" AND datefin >= '".$db->idate($now)."'";
+}
+if ($filter == 'outofdate')
+{
+	$sql.=" AND (datefin IS NULL OR datefin < '".$db->idate($now)."')";
+}
+
+// Count total nb of records with no order and no limits
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$resql = $db->query($sql);
+	if ($resql) $nbtotalofrecords = $db->num_rows($result);
+	else dol_print_error($db);
+}
+// Add order and limit
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+dol_syslog("get list", LOG_DEBUG);
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$titre=$langs->trans("MembersList");
+	if (isset($_GET["statut"]))
+	{
+		if ($statut == '-1,1') { $titre=$langs->trans("MembersListQualified"); }
+		if ($statut == '-1')   { $titre=$langs->trans("MembersListToValid"); }
+		if ($statut == '1' && ! $filter)    		{ $titre=$langs->trans("MembersListValid"); }
+		if ($statut == '1' && $filter=='uptodate')  { $titre=$langs->trans("MembersListUpToDate"); }
+		if ($statut == '1' && $filter=='outofdate')	{ $titre=$langs->trans("MembersListNotUpToDate"); }
+		if ($statut == '0')    { $titre=$langs->trans("MembersListResiliated"); }
+	}
+	elseif ($action == 'search')
+	{
+		$titre=$langs->trans("MembersListQualified");
+	}
+
+	if ($type > 0)
+	{
+		$membertype=new AdherentType($db);
+		$result=$membertype->fetch(GETPOST("type"));
+		$titre.=" (".$membertype->libelle.")";
+	}
+
+	$param="";
+	if ($statut != "") $param.="&statut=".$statut;
+	if ($search_nom)   $param.="&search_nom=".$search_nom;
+	if ($search_login) $param.="&search_login=".$search_login;
+	if ($search_email) $param.="&search_email=".$search_email;
+	if ($filter)       $param.="&filter=".$filter;
+	if ($type > 0)     $param.="&type=".$type;
+	print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+
+	if ($sall)
+	{
+		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
+	}
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
+	print "<table class=\"noborder\" width=\"100%\">";
+
+	// Filter on categories
+	$moreforfilter='';
+	if (! empty($conf->categorie->enabled))
+	{
+		$moreforfilter.=$langs->trans('Categories'). ': ';
+		$moreforfilter.=$formother->select_categories(3,$search_categ,'search_categ',1);
+		$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+	}
+	if ($moreforfilter)
+	{
+		print '<tr class="liste_titre">';
+		print '<td class="liste_titre" colspan="9">';
+		print $moreforfilter;
+		print '</td></tr>';
+	}
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+	// Lignes des champs de filtre
+	print '<tr class="liste_titre">';
+
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_ref" value="'.$search_ref.'" size="4"></td>';
+
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_lastname" value="'.$search_lastname.'" size="12"></td>';
+
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_login" value="'.$search_login.'" size="7"></td>';
+
+	print '<td class="liste_titre">';
+	$listetype=$membertypestatic->liste_array();
+	print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32);
+	print '</td>';
+
+	print '<td class="liste_titre">&nbsp;</td>';
+
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_email" value="'.$search_email.'" size="12"></td>';
+
+	print '<td class="liste_titre">&nbsp;</td>';
+
+	print '<td align="right" colspan="2" class="liste_titre">';
+	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '&nbsp; ';
+	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+
+	print "</tr>\n";
+	print '</form>';
+
+	$var=True;
+	while ($i < $num && $i < $conf->liste_limit)
+	{
+		$objp = $db->fetch_object($resql);
+
+		$datefin=$db->jdate($objp->datefin);
+		$memberstatic->id=$objp->rowid;
+		$memberstatic->ref=$objp->rowid;
+		$memberstatic->lastname=$objp->lastname;
+		$memberstatic->firstname=$objp->firstname;
+
+		if (! empty($objp->fk_soc)) {
+			$memberstatic->socid = $objp->fk_soc;
+			$memberstatic->fetch_thirdparty();
+			$companyname=$memberstatic->thirdparty->name;
+		} else {
+			$companyname=$objp->company;
+		}
+
+		$var=!$var;
+		print "<tr ".$bc[$var].">";
+
+		// Ref
+		print "<td>";
+		print $memberstatic->getNomUrl(1);
+		print "</td>\n";
+
+		// Lastname
+		print "<td><a href=\"card.php?rowid=$objp->rowid\">";
+		print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+		print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
+		print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+		print "</a></td>\n";
+
+		// Login
+		print "<td>".$objp->login."</td>\n";
+
+		// Type
+		$membertypestatic->id=$objp->type_id;
+		$membertypestatic->libelle=$objp->type;
+		print '<td class="nowrap">';
+		print $membertypestatic->getNomUrl(1,32);
+		print '</td>';
+
+		// Moral/Physique
+		print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
+
+		// EMail
+		print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+
+		// Statut
+		print '<td class="nowrap">';
+		print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2);
+		print "</td>";
+
+		// End of subscription date
+		if ($datefin)
+		{
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($datefin,'day');
+			if ($datefin < ($now -  $conf->adherent->cotisation->warning_delay) && $objp->statut > 0) print " ".img_warning($langs->trans("SubscriptionLate"));
+			print '</td>';
+		}
+		else
+		{
+			print '<td align="left" class="nowrap">';
+			if ($objp->cotisation == 'yes')
+			{
+				print $langs->trans("SubscriptionNotReceived");
+				if ($objp->statut > 0) print " ".img_warning();
+			}
+			else
+			{
+				print '&nbsp;';
+			}
+			print '</td>';
+		}
+
+		// Actions
+		print '<td align="center">';
+		if ($user->rights->adherent->creer)
+		{
+			print "<a href=\"card.php?rowid=".$objp->rowid."&action=edit&backtopage=1\">".img_edit()."</a>";
+		}
+		print '&nbsp;';
+		if ($user->rights->adherent->supprimer && $objp->statut == -1)
+		{
+			print "<a href=\"card.php?rowid=".$objp->rowid."&action=delete&backtopage=1\">".img_picto($langs->trans("Delete"),'disable.png')."</a>";
+		}
+		if ($user->rights->adherent->supprimer && $objp->statut == 1)
+		{
+			print "<a href=\"card.php?rowid=".$objp->rowid."&action=resign&backtopage=1\">".img_picto($langs->trans("Resiliate"),'disable.png')."</a>";
+		}
+		print "</td>";
+
+		print "</tr>\n";
+		$i++;
+	}
+
+	print "</table>\n";
+
+	if ($num > $conf->liste_limit)
+	{
+		print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
deleted file mode 100644
index 77f0783202e..00000000000
--- a/htdocs/adherents/liste.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2013      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/adherents/liste.php
- *      \ingroup    member
- *		\brief      Page to list all members of foundation
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-
-$langs->load("members");
-$langs->load("companies");
-
-// Security check
-$result=restrictedArea($user,'adherent');
-
-$action=GETPOST("action");
-$filter=GETPOST("filter");
-$statut=GETPOST("statut");
-$search=GETPOST("search");
-$search_ref=GETPOST("search_ref");
-$search_lastname=GETPOST("search_lastname");
-$search_firstname=GETPOST("search_firstname");
-$search_login=GETPOST("search_login");
-$type=GETPOST("type");
-$search_email=GETPOST("search_email");
-$search_categ = GETPOST("search_categ",'int');
-$catid        = GETPOST("catid",'int');
-$sall=GETPOST("sall");
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) { $sortorder=($filter=='outofdate'?"ASC":"DESC"); }
-if (! $sortfield) { $sortfield=($filter=='outofdate'?"d.datefin":"d.lastname"); }
-
-if (GETPOST("button_removefilter"))
-{
-    $search="";
-	$search_ref="";
-    $search_lastname="";
-	$search_firstname="";
-	$search_login="";
-	$type="";
-	$search_email="";
-	$search_categ="";
-	$catid="";
-	$sall="";
-}
-
-
-/*
- * View
- */
-
-$form=new Form($db);
-$formother=new FormOther($db);
-$membertypestatic=new AdherentType($db);
-$memberstatic=new Adherent($db);
-
-llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
-
-$now=dol_now();
-
-$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
-$sql.= " d.datefin,";
-$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
-$sql.= " t.libelle as type, t.cotisation";
-$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
-if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member"; // We need this table joined to the select in order to filter by categ
-$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-$sql.= " WHERE d.fk_adherent_type = t.rowid ";
-if ($catid > 0)    $sql.= " AND cm.fk_categorie = ".$db->escape($catid);
-if ($catid == -2)  $sql.= " AND cm.fk_categorie IS NULL";
-if ($search_categ > 0)   $sql.= " AND cm.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL";
-$sql.= " AND d.entity = ".$conf->entity;
-if ($sall)
-{
-        // For natural search
-        $scrit = explode(' ', $sall);
-        foreach ($scrit as $crit)
-        {
-            $sql.=" AND (";
-            if (is_numeric($sall)) $sql.= "d.rowid = ".$sall." OR ";
-            $sql.=" d.firstname LIKE '%".$db->escape($sall)."%' OR d.lastname LIKE '%".$db->escape($sall)."%' OR d.societe LIKE '%".$db->escape($sall)."%'";
-            $sql.=" OR d.email LIKE '%".$db->escape($sall)."%' OR d.login LIKE '%".$db->escape($sall)."%' OR d.address LIKE '%".$db->escape($sall)."%'";
-            $sql.=" OR d.town LIKE '%".$db->escape($sall)."%' OR d.note LIKE '%".$db->escape($sall)."%')";
-        }
-}
-if ($type > 0)
-{
-	$sql.=" AND t.rowid=".$type;
-}
-if (isset($_GET["statut"]) || isset($_POST["statut"]))
-{
-	$sql.=" AND d.statut in (".$db->escape($statut).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
-}
-if ($search_ref)
-{
-	if (is_numeric($search_ref)) $sql.= " AND (d.rowid = ".$db->escape($search_ref).")";
-	else $sql.=" AND 1 = 2";    // Always wrong
-}
-if ($search_lastname)
-{
-	$sql.= " AND (d.firstname LIKE '%".$db->escape($search_lastname)."%' OR d.lastname LIKE '%".$db->escape($search_lastname)."%' OR d.societe LIKE '%".$db->escape($search_lastname)."%')";
-}
-if ($search_login)
-{
-	$sql.= " AND d.login LIKE '%".$db->escape($search_login)."%'";
-}
-if ($search_email)
-{
-	$sql.= " AND (d.email LIKE '%".$db->escape($search_email)."%')";
-}
-if ($filter == 'uptodate')
-{
-	$sql.=" AND datefin >= '".$db->idate($now)."'";
-}
-if ($filter == 'outofdate')
-{
-	$sql.=" AND (datefin IS NULL OR datefin < '".$db->idate($now)."')";
-}
-
-// Count total nb of records with no order and no limits
-$nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$resql = $db->query($sql);
-	if ($resql) $nbtotalofrecords = $db->num_rows($result);
-	else dol_print_error($db);
-}
-// Add order and limit
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
-
-dol_syslog("get list sql=".$sql);
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$titre=$langs->trans("MembersList");
-	if (isset($_GET["statut"]))
-	{
-		if ($statut == '-1,1') { $titre=$langs->trans("MembersListQualified"); }
-		if ($statut == '-1')   { $titre=$langs->trans("MembersListToValid"); }
-		if ($statut == '1' && ! $filter)    		{ $titre=$langs->trans("MembersListValid"); }
-		if ($statut == '1' && $filter=='uptodate')  { $titre=$langs->trans("MembersListUpToDate"); }
-		if ($statut == '1' && $filter=='outofdate')	{ $titre=$langs->trans("MembersListNotUpToDate"); }
-		if ($statut == '0')    { $titre=$langs->trans("MembersListResiliated"); }
-	}
-	elseif ($action == 'search')
-	{
-		$titre=$langs->trans("MembersListQualified");
-	}
-
-	if ($type > 0)
-	{
-		$membertype=new AdherentType($db);
-		$result=$membertype->fetch(GETPOST("type"));
-		$titre.=" (".$membertype->libelle.")";
-	}
-
-	$param="";
-	if ($statut != "") $param.="&statut=".$statut;
-	if ($search_nom)   $param.="&search_nom=".$search_nom;
-	if ($search_login) $param.="&search_login=".$search_login;
-	if ($search_email) $param.="&search_email=".$search_email;
-	if ($filter)       $param.="&filter=".$filter;
-	if ($type > 0)     $param.="&type=".$type;
-	print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
-
-	if ($sall)
-	{
-		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
-	}
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].($param?'?'.$param:'').'">';
-	print "<table class=\"noborder\" width=\"100%\">";
-
-	// Filter on categories
-	$moreforfilter='';
-	if (! empty($conf->categorie->enabled))
-	{
-		$moreforfilter.=$langs->trans('Categories'). ': ';
-		$moreforfilter.=$formother->select_categories(3,$search_categ,'search_categ',1);
-		$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
-	}
-	if ($moreforfilter)
-	{
-		print '<tr class="liste_titre">';
-		print '<td class="liste_titre" colspan="9">';
-		print $moreforfilter;
-		print '</td></tr>';
-	}
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
-
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_ref" value="'.$search_ref.'" size="4"></td>';
-
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_lastname" value="'.$search_lastname.'" size="12"></td>';
-
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_login" value="'.$search_login.'" size="7"></td>';
-
-	print '<td class="liste_titre">';
-	$listetype=$membertypestatic->liste_array();
-	print $form->selectarray("type", $listetype, $type, 1, 0, 0, '', 0, 32);
-	print '</td>';
-
-	print '<td class="liste_titre">&nbsp;</td>';
-
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="search_email" value="'.$search_email.'" size="12"></td>';
-
-	print '<td class="liste_titre">&nbsp;</td>';
-
-	print '<td align="right" colspan="2" class="liste_titre">';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '&nbsp; ';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
-
-	print "</tr>\n";
-	print '</form>';
-
-	$var=True;
-	while ($i < $num && $i < $conf->liste_limit)
-	{
-		$objp = $db->fetch_object($resql);
-
-		$datefin=$db->jdate($objp->datefin);
-		$memberstatic->id=$objp->rowid;
-		$memberstatic->ref=$objp->rowid;
-		$memberstatic->lastname=$objp->lastname;
-		$memberstatic->firstname=$objp->firstname;
-
-		if (! empty($objp->fk_soc)) {
-			$memberstatic->socid = $objp->fk_soc;
-			$memberstatic->fetch_thirdparty();
-			$companyname=$memberstatic->thirdparty->name;
-		} else {
-			$companyname=$objp->company;
-		}
-
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-
-		// Ref
-		print "<td>";
-		print $memberstatic->getNomUrl(1);
-		print "</td>\n";
-
-		// Lastname
-		print "<td><a href=\"fiche.php?rowid=$objp->rowid\">";
-		print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-		print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
-		print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
-		print "</a></td>\n";
-
-		// Login
-		print "<td>".$objp->login."</td>\n";
-
-		// Type
-		$membertypestatic->id=$objp->type_id;
-		$membertypestatic->libelle=$objp->type;
-		print '<td class="nowrap">';
-		print $membertypestatic->getNomUrl(1,32);
-		print '</td>';
-
-		// Moral/Physique
-		print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
-
-		// EMail
-		print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
-
-		// Statut
-		print '<td class="nowrap">';
-		print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2);
-		print "</td>";
-
-		// End of subscription date
-		if ($datefin)
-		{
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($datefin,'day');
-			if ($datefin < ($now -  $conf->adherent->cotisation->warning_delay) && $objp->statut > 0) print " ".img_warning($langs->trans("SubscriptionLate"));
-			print '</td>';
-		}
-		else
-		{
-			print '<td align="left" class="nowrap">';
-			if ($objp->cotisation == 'yes')
-			{
-				print $langs->trans("SubscriptionNotReceived");
-				if ($objp->statut > 0) print " ".img_warning();
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-		}
-
-		// Actions
-		print '<td align="center">';
-		if ($user->rights->adherent->creer)
-		{
-			print "<a href=\"fiche.php?rowid=".$objp->rowid."&action=edit&backtopage=1\">".img_edit()."</a>";
-		}
-		print '&nbsp;';
-		if ($user->rights->adherent->supprimer && $objp->statut == -1)
-		{
-			print "<a href=\"fiche.php?rowid=".$objp->rowid."&action=delete&backtopage=1\">".img_picto($langs->trans("Delete"),'disable.png')."</a>";
-		}
-		if ($user->rights->adherent->supprimer && $objp->statut == 1)
-		{
-			print "<a href=\"fiche.php?rowid=".$objp->rowid."&action=resign&backtopage=1\">".img_picto($langs->trans("Resiliate"),'disable.png')."</a>";
-		}
-		print "</td>";
-
-		print "</tr>\n";
-		$i++;
-	}
-
-	print "</table>\n";
-
-	if ($num > $conf->liste_limit)
-	{
-		print_barre_liste('',$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
-	}
-}
-else
-{
-	dol_print_error($db);
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 96ccd19b928..727b3a9bcdc 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -87,7 +87,7 @@ if ($id)
 
     print '<table class="border" width="100%">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/liste.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
 
     // Reference
 	print '<tr><td width="20%">'.$langs->trans('Ref').'</td>';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index e8355cbb941..fdb9153ba88 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -74,7 +74,7 @@ $sql.=" GROUP BY d.morphy";
 $foundphy=$foundmor=0;
 
 // Define $data array
-dol_syslog("Count member sql=".$sql);
+dol_syslog("Count member", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 1cb98f353b6..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,18 +70,18 @@ dol_mkdir($dir);
 
 if ($mode)
 {
-    // Define sql	
+    // Define sql
     if ($mode == 'memberbycountry')
     {
         $label=$langs->trans("Country");
         $tab='statscountry';
 
         $data = array();
-        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.libelle as label";
-        $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_pays as c on d.country = c.rowid";
+        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label";
+        $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
         $sql.=" WHERE d.entity IN (".getEntity().")";
         $sql.=" AND d.statut = 1";
-        $sql.=" GROUP BY c.libelle, c.code";
+        $sql.=" GROUP BY c.label, c.code";
         //print $sql;
     }
 
@@ -91,29 +92,29 @@ if ($mode)
         $tab='statsstate';
 
         $data = array();
-        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, c.nom as label2"; //
+        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, co.code, co.label, c.nom as label2"; //
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-        $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.country = p.rowid";
+        $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
         $sql.=" WHERE d.entity IN (".getEntity().")";
         $sql.=" AND d.statut = 1";
-        $sql.=" GROUP BY p.libelle, p.code, c.nom";
+        $sql.=" GROUP BY co.label, co.code, c.nom";
         //print $sql;
     }
     if ($mode == 'memberbyregion') //
     {
-        $label=$langs->trans("Country"); //pays
+        $label=$langs->trans("Country");
         $label2=$langs->trans("Region"); //département
         $tab='statsregion'; //onglet
 
         $data = array(); //tableau de donnée
-        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, r.nom as label2";
+        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, co.code, co.label, r.nom as label2";
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid";
         $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
-        $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.country = p.rowid";
+        $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid";
         $sql.=" WHERE d.entity IN (".getEntity().")";
         $sql.=" AND d.statut = 1";
-        $sql.=" GROUP BY p.libelle, p.code, r.nom"; //+
+        $sql.=" GROUP BY co.label, co.code, r.nom"; //+
         //print $sql;
     }
     if ($mode == 'memberbytown')
@@ -123,12 +124,12 @@ if ($mode)
         $tab='statstown';
 
         $data = array();
-        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, d.town as label2";
+        $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label, d.town as label2";
         $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d";
-        $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.country = p.rowid";
+        $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid";
         $sql.=" WHERE d.entity IN (".getEntity().")";
         $sql.=" AND d.statut = 1";
-        $sql.=" GROUP BY p.libelle, p.code, d.town";
+        $sql.=" GROUP BY c.label, c.code, d.town";
         //print $sql;
     }
 
@@ -138,7 +139,7 @@ if ($mode)
     //print $langsen->trans("Country"."FI");exit;
 
     // Define $data array
-    dol_syslog("Count member sql=".$sql);
+    dol_syslog("Count member", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index fafc7941aed..0ffdc8b7e7f 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -70,7 +70,7 @@ if (GETPOST('button_removefilter'))
 
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('membertypecard'));
+$hookmanager->initHooks(array('membertypecard','globalcard'));
 
 /*
  *	Actions
@@ -237,8 +237,6 @@ if ($action == 'create')
 
 	print_fiche_titre($langs->trans("NewMemberType"));
 
-	if ($mesg) print '<div class="error">'.$mesg.'</div>';
-
 	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="border" width="100%">';
@@ -355,7 +353,7 @@ if ($rowid > 0)
 		}
 
 		// Add
-		print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?action=create&typeid='.$adht->id.'">'.$langs->trans("AddMember").'</a></div>';
+		print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$adht->id.'">'.$langs->trans("AddMember").'</a></div>';
 
 		// Delete
 		if ($user->rights->adherent->configurer)
@@ -366,7 +364,7 @@ if ($rowid > 0)
 		print "</div>";
 
 
-		// Show list of members (nearly same code than in page liste.php)
+		// Show list of members (nearly same code than in page list.php)
 
 		$membertypestatic=new AdherentType($db);
 
@@ -528,11 +526,11 @@ if ($rowid > 0)
 		        print '<tr '.$bc[$var].'>';
 		        if ($objp->societe != '')
 		        {
-		            print '<td><a href="fiche.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).'</a></td>'."\n";
+		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).'</a></td>'."\n";
 		        }
 		        else
 		        {
-		            print '<td><a href="fiche.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,32).'</a></td>'."\n";
+		            print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,32).'</a></td>'."\n";
 		        }
 
 		        // Login
@@ -590,12 +588,12 @@ if ($rowid > 0)
 		        print '<td align="center">';
 				if ($user->rights->adherent->creer)
 				{
-					print '<a href="fiche.php?rowid='.$objp->rowid.'&action=edit&return=liste.php">'.img_edit().'</a>';
+					print '<a href="card.php?rowid='.$objp->rowid.'&action=edit&return=list.php">'.img_edit().'</a>';
 				}
 				print '&nbsp;';
 				if ($user->rights->adherent->supprimer)
 				{
-					print '<a href="fiche.php?rowid='.$objp->rowid.'&action=resign&return=liste.php">'.img_picto($langs->trans("Resiliate"),'disable.png').'</a>';
+					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign&return=list.php">'.img_picto($langs->trans("Resiliate"),'disable.png').'</a>';
 		        }
 				print "</td>";
 
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
deleted file mode 100644
index 80f9a647125..00000000000
--- a/htdocs/admin/accounting.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013 Juanjo Menent	      <jmenent@2byte.es>
- * Copyright (C) 2011-2012 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/admin/accounting.php
- *	\ingroup    compta
- *	\brief      Page to setup accountancy module
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-
-$langs->load('admin');
-$langs->load('compta');
-
-if (!$user->admin)
-accessforbidden();
-
-$action = GETPOST('action','alpha');
-
-$compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES';
-
-if ($action == 'setcomptamode')
-{
-	$compta_mode = GETPOST('compta_mode','alpha');
-
-	$res = dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode,'chaine',0,'',$conf->entity);
-
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
-    }
-
-}
-
-if ($action == 'setchart')
-{
-	$chartofaccounts = GETPOST('chartofaccounts','alpha');
-
-	$res = dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts,'chaine',0,'',$conf->entity);
-
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
-    }
-}
-
-if ($action == 'update' || $action == 'add')
-{
-	$constname = GETPOST('constname','alpha');
-	$constvalue = GETPOST('constvalue','alpha');
-	$consttype = GETPOST('consttype','alpha');
-	$constnote = GETPOST('constnote','alpha');
-
-	$res = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
-
-	if (! $res > 0) $error++;
-
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
-    }
-}
-
-
-/*if ($action == 'delete')
-{
-	if (! dolibarr_del_const($db, $_GET['constname'],$conf->entity));
-	{
-		print $db->error();
-	}
-}*/
-
-/*
- * Affichage page
- */
-
-llxHeader();
-
-$form=new Form($db);
-
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
-
-
-print '<br>';
-
-print '<table class="noborder" width="100%">';
-
-// Cas du parametre COMPTA_MODE
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="setcomptamode">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
-print '<td align="right"><input class="button" type="submit" value="'.$langs->trans('Modify').'"></td>';
-print "</tr>\n";
-print '<tr '.$bc[false].'><td width="200"><input type="radio" name="compta_mode" value="RECETTES-DEPENSES"'.($compta_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
-print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
-// Write info on way to count VAT
-if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
-{
-	//	print "<br>\n";
-	//	print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
-}
-else
-{
-	//	print "<br>\n";
-	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
-}
-print "</td></tr>\n";
-print '<tr '.$bc[true].'><td width="200"><input type="radio" name="compta_mode" value="CREANCES-DETTES"'.($compta_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
-print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
-print '</form>';
-
-print "</table>\n";
-
-/*
- *  Define Chart of accounts
- *
- */
-if (! empty($conf->global->ACCOUNTING_SELECTCHART) && ! empty($conf->accounting->enabled))
-{
-  print '<br>';
-  print_titre($langs->trans("Definechartofaccounts"));
-
-  print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-  print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-
-  print '<table class="noborder" width="100%">';
-  $var=True;
-
-  print '<tr class="liste_titre">';
-  print '<td>';
-  print '<input type="hidden" name="action" value="setchart">';
-  print $langs->trans("Chartofaccounts").'</td>';
-  print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-  print "</tr>\n";
-  $var=!$var;
-  print '<tr '.$bc[$var].'>';
-  print "<td>".$langs->trans("Selectchartofaccounts")."</td>";
-  print "<td>";
-  print '<select class="flat" name="chartofaccounts" id="chartofaccounts">';
-  print '<option value="0">'.$langs->trans("DoNotSuggestChart").'</option>';
-
-  $sql = "SELECT rowid, pcg_version, fk_pays, label, active";
-  $sql.= " FROM ".MAIN_DB_PREFIX."accounting_system";
-  $sql.= " WHERE active = 1";
-  $sql.= " AND fk_pays = ".$mysoc->country_id;
-  $var=True;
-  $resql=$db->query($sql);
-  if ($resql)
-  {
-      $num = $db->num_rows($resql);
-      $i = 0;
-      while ($i < $num)
-      {
-          $var=!$var;
-          $row = $db->fetch_row($resql);
-
-          print '<option value="'.$row[0].'"';
-          print $conf->global->CHARTOFACCOUNTS == $row[0] ? ' selected="selected"':'';
-          print '>'.$row[1].' - '.$row[3].'</option>';
-
-          $i++;
-      }
-  }
-  print "</select>";
-  print "</td></tr>";
-  print "</table>";
-  print "</form>";
-}
-
-print "<br>\n";
-
-// Cas des autres parametres COMPTA_*
-$list=array('COMPTA_PRODUCT_BUY_ACCOUNT','COMPTA_PRODUCT_SOLD_ACCOUNT','COMPTA_SERVICE_BUY_ACCOUNT','COMPTA_SERVICE_SOLD_ACCOUNT',
-'COMPTA_VAT_ACCOUNT','COMPTA_ACCOUNT_CUSTOMER','COMPTA_ACCOUNT_SUPPLIER'
-);
-
-$num=count($list);
-if ($num)
-{
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="3">'.$langs->trans('OtherOptions').'</td>';
-	print "</tr>\n";
-}
-
-foreach ($list as $key)
-{
-	$var=!$var;
-
-	print '<form action="accounting.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="consttype" value="string">';
-	print '<input type="hidden" name="constname" value="'.$key.'">';
-
-	print '<tr '.$bc[$var].' class="value">';
-
-	// Param
-	$libelle = $langs->trans($key);
-	print '<td>'.$libelle;
-	//print ' ('.$key.')';
-	print "</td>\n";
-
-	// Value
-	print '<td>';
-	print '<input type="text" size="20" name="constvalue" value="'.$conf->global->$key.'">';
-	print '</td><td>';
-	print '<input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"> &nbsp; ';
-	print "</td></tr>\n";
-	print '</form>';
-
-	$i++;
-}
-
-if ($num)
-{
-	print "</table>\n";
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index f3fb1d9b6c9..5ad9673a16f 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2010	Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2014	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2011		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012  Juanjo Menent		<jmenent@2byte.es>
  *
@@ -36,11 +36,11 @@ $langs->load("other");
 $action = GETPOST('action','alpha');
 $cancel = GETPOST('cancel','alpha');
 
+
 // Get list of triggers available
 $sql = "SELECT a.rowid, a.code, a.label, a.elementtype";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a";
 $sql.= " ORDER BY a.rang ASC";
-
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -67,6 +67,7 @@ else
 /*
  *	Actions
  */
+
 if ($action == "save" && empty($cancel))
 {
     $i=0;
@@ -153,6 +154,7 @@ print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("ActionsEvents").'</td>';
 print '<td><a href="'.$_SERVER["PHP_SELF"].'?action=selectall">'.$langs->trans("All").'</a>/<a href="'.$_SERVER["PHP_SELF"].'?action=selectnone">'.$langs->trans("None").'</a>';
 print '</tr>'."\n";
+// Show each trigger (list is in c_action_trigger)
 if (! empty($triggers))
 {
 	foreach ($triggers as $trigger)
@@ -165,6 +167,9 @@ if (! empty($triggers))
 		//print 'module='.$module.'<br>';
 		if (! empty($conf->$module->enabled))
 		{
+			// Discard special case.
+			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
+
 			$var=!$var;
 			print '<tr '.$bc[$var].'>';
 			print '<td>'.$trigger['code'].'</td>';
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 2ba8f3d839c..c5f7d808302 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -41,7 +41,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 371854410b0..6b683c8b52b 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -62,10 +62,11 @@ if ($actionsave)
 	// Save agendas
 	while ($i <= $MAXAGENDA)
 	{
-		$name=trim(GETPOST('agenda_ext_name'.$i,'alpha'));
-		$src=trim(GETPOST('agenda_ext_src'.$i,'alpha'));
-		$color=trim(GETPOST('agenda_ext_color'.$i,'alpha'));
+		$name=trim(GETPOST('AGENDA_EXT_NAME'.$i,'alpha'));
+		$src=trim(GETPOST('AGENDA_EXT_SRC'.$i,'alpha'));
+		$color=trim(GETPOST('AGENDA_EXT_COLOR'.$i,'alpha'));
 		if ($color=='-1') $color='';
+		$enabled=trim(GETPOST('AGENDA_EXT_ENABLED'.$i,'alpha'));
 
 		if (! empty($src) && ! dol_is_url($src))
 		{
@@ -82,6 +83,8 @@ if ($actionsave)
 		if (! $res > 0) $error++;
 		$res=dolibarr_set_const($db,'AGENDA_EXT_COLOR'.$i,$color,'chaine',0,'',$conf->entity);
 		if (! $res > 0) $error++;
+		$res=dolibarr_set_const($db,'AGENDA_EXT_ENABLED'.$i,$enabled,'chaine',0,'',$conf->entity);
+		if (! $res > 0) $error++;
 		$i++;
 	}
 
@@ -195,19 +198,20 @@ while ($i <= $MAXAGENDA)
 	$name='AGENDA_EXT_NAME'.$key;
 	$src='AGENDA_EXT_SRC'.$key;
 	$color='AGENDA_EXT_COLOR'.$key;
+	$enabled='AGENDA_EXT_ENABLED'.$key;
 
 	$var=!$var;
 	print "<tr ".$bc[$var].">";
 	// Nb
 	print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>";
 	// Name
-	print '<td><input type="text" class="flat hideifnotset" name="agenda_ext_name'.$key.'" value="'. (GETPOST('agenda_ext_name'.$key)?GETPOST('agenda_ext_name'.$key):$conf->global->$name) . '" size="28"></td>';
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME'.$key.'" value="'. (GETPOST('AGENDA_EXT_NAME'.$key)?GETPOST('AGENDA_EXT_NAME'.$key):$conf->global->$name) . '" size="28"></td>';
 	// URL
-	print '<td><input type="url" class="flat hideifnotset" name="agenda_ext_src'.$key.'" value="'. (GETPOST('agenda_ext_src'.$key)?GETPOST('agenda_ext_src'.$key):$conf->global->$src) . '" size="60"></td>';
+	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC'.$key.'" value="'. (GETPOST('AGENDA_EXT_SRC'.$key)?GETPOST('AGENDA_EXT_SRC'.$key):$conf->global->$src) . '" size="60"></td>';
 	// Color (Possible colors are limited by Google)
 	print '<td class="nowrap" align="right">';
 	//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);
-	print $formother->selectColor((GETPOST("agenda_ext_color".$key)?GETPOST("agenda_ext_color".$key):$conf->global->$color), "agenda_ext_color".$key, 'extsitesconfig', 1, '', 'hideifnotset');
+	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key)?GETPOST("AGENDA_EXT_COLOR".$key):$conf->global->$color), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset');
 	print '</td>';
 	print "</tr>";
 	$i++;
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 3748a46f802..a069a0718c9 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -26,6 +26,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 
 if (!$user->admin)
     accessforbidden();
@@ -70,11 +71,20 @@ if (preg_match('/del_(.*)/',$action,$reg))
 	}
 }
 
+if ($action == 'set')
+{
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_TYPE', GETPOST('AGENDA_DEFAULT_FILTER_TYPE'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_FILTER_STATUS', GETPOST('AGENDA_DEFAULT_FILTER_STATUS'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, 'AGENDA_DEFAULT_VIEW', GETPOST('AGENDA_DEFAULT_VIEW'), 'chaine', 0, '', $conf->entity);
+}
+
 
 /**
  * View
  */
 
+$formactions=new FormActions($db);
+
 llxHeader();
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -86,43 +96,71 @@ $head=agenda_prepare_head();
 
 dol_fiche_head($head, 'other', $langs->trans("Agenda"), 0, 'action');
 
-print_titre($langs->trans("OtherOptions"));
+//print_titre($langs->trans("OtherOptions"));
 
 $var=true;
 
+print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
+print '<input type="hidden" name="action" value="set">';
+
 print '<table class="noborder allwidth">'."\n";
 print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
-print '<td align="center" width="20">&nbsp;</td>'."\n";
-print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'.$langs->trans("Value").'</td>'."\n";
 print '</tr>'."\n";
 
 // Manual or automatic
 $var=!$var;
 print '<tr '.$bc[$var].'>'."\n";
 print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE").'</td>'."\n";
-print '<td align="center" width="20">&nbsp;</td>'."\n";
-
-print '<td align="center" width="100">'."\n";
-if ($conf->use_javascript_ajax)
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'."\n";
+//print ajax_constantonoff('AGENDA_USE_EVENT_TYPE');	Do not use ajax here, we need to reload page to change other combo list
+if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-	print ajax_constantonoff('AGENDA_USE_EVENT_TYPE');
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
 }
 else
 {
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-	}
-	else
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Enabled"),'on').'</a>';
-	}
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
 }
 print '</td></tr>'."\n";
 
+// AGENDA_DEFAULT_FILTER_TYPE
+$var=!$var;
+print '<tr '.$bc[$var].'>'."\n";
+print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right" class="nowrap">'."\n";
+print $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), 1);
+print '</td></tr>'."\n";
+
+// AGENDA_DEFAULT_FILTER_STATUS
+$var=!$var;
+print '<tr '.$bc[$var].'>'."\n";
+print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'."\n";
+$formactions->form_select_status_action('agenda',$conf->global->AGENDA_DEFAULT_FILTER_STATUS,1,'AGENDA_DEFAULT_FILTER_STATUS',1,2);
+print '</td></tr>'."\n";
+
+// AGENDA_DEFAULT_VIEW
+$var=!$var;
+print '<tr '.$bc[$var].'>'."\n";
+print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'."\n";
+$tmplist=array('show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_list'=>$langs->trans("ViewList"), 'show_peruser'=>$langs->trans("ViewPerUser"));
+print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
+print '</td></tr>'."\n";
+
 print '</table>';
 
+print '<center><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></center>';
+
+print '</form>';
+
 dol_fiche_end();
 
 print "<br>";
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index dc7c4cb3d79..40454ed1302 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -142,7 +142,7 @@ print "</center>";
 
 print "</form>\n";
 
-print '</div>';
+dol_fiche_end();
 
 clearstatcache();
 
@@ -174,6 +174,8 @@ $message=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>';
 $message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>';
+$message.=$langs->trans("AgendaUrlOptionsProject",$user->login,$user->login);
+
 print info_admin($message);
 
 if (! empty($conf->use_javascript_ajax))
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 988b49efd07..11341f632a2 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -203,7 +203,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 $sql.= " WHERE entity = ".$conf->entity;
 $sql.= " ORDER BY code";
 
-dol_syslog("admin/barcode.php sql=".$sql);
+dol_syslog("admin/barcode.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -396,7 +396,7 @@ if ($conf->produit->enabled)
 	    			$var = !$var;
 
 	    			print '<tr '.$bc[$var].'>';
-	    			print '<td>'.$modBarCode->nom."</td><td>\n";
+	    			print '<td>'.(isset($modBarCode->name)?$modBarCode->name:$modBarCode->nom)."</td><td>\n";
 	    			print $modBarCode->info($langs);
 	    			print '</td>';
 	    			print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index d58a1576a31..e0a4bc85f0e 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -34,10 +34,10 @@ if (! $user->admin) accessforbidden();
 
 $rowid = GETPOST('rowid','int');
 $action = GETPOST('action','alpha');
-$errmesg='';
+
 
 // Define possible position of boxes
-$pos_name = getStaticMember('InfoBox','listOfPages');
+$pos_name = InfoBox::getListOfPagesForBoxes();
 $boxes = array();
 
 
@@ -46,7 +46,6 @@ $boxes = array();
  */
 
 if ($action == 'addconst')
-
 {
     dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity);
 }
@@ -54,84 +53,91 @@ if ($action == 'addconst')
 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;
-		$resql = $db->query($sql);
-		dol_syslog("boxes.php search fk_user to activate box for sql=".$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
-		{
-		    $errmesg=$db->lasterror();
-		    $error++;
-		}
-	}
+                // 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++;
+                    }
+                }
 
-	$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 = ".GETPOST("pos","alpha")." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
-	        dol_syslog("boxes.php activate box sql=".$sql);
-	        $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 = ".$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);
 
-	        $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.= ")";
+                        $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.= ")";
 
-	        dol_syslog("boxes.php activate box sql=".$sql);
-	        $resql = $db->query($sql);
-	        if (! $resql)
-	        {
-		        $errmesg=$db->lasterror();
-	            $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')
@@ -217,9 +223,6 @@ print_fiche_titre($langs->trans("Boxes"),'','setup');
 
 print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
 
-dol_htmloutput_errors($errmesg);
-
-
 /*
  * Recherche des boites actives par defaut pour chaque position possible
  * On stocke les boites actives par defaut dans $boxes[position][id_boite]=1
@@ -230,16 +233,18 @@ $actives = array();
 $sql = "SELECT b.rowid, b.box_id, b.position, b.box_order,";
 $sql.= " bd.rowid as boxid";
 $sql.= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd";
-$sql.= " WHERE b.entity = ".$conf->entity;
-$sql.= " AND b.box_id = bd.rowid";
+$sql.= " WHERE b.box_id = bd.rowid";
+$sql.= " AND b.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
 $sql.= " AND b.fk_user=0";
 $sql.= " ORDER by b.position, b.box_order";
 
-dol_syslog("Search available boxes sql=".$sql, LOG_DEBUG);
+dol_syslog("Search available boxes", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
+
+	// Check record to know if we must recalculate sort order
 	$i = 0;
 	$decalage=0;
 	$var=false;
@@ -271,7 +276,7 @@ if ($resql)
 		$sql.= " WHERE entity = ".$conf->entity;
 		$sql.= " AND LENGTH(box_order) <= 2";
 
-		dol_syslog("Execute requests to renumber box order sql=".$sql);
+		dol_syslog("Execute requests to renumber box order", LOG_DEBUG);
 		$result = $db->query($sql);
 		if ($result)
 		{
@@ -313,19 +318,22 @@ if ($resql)
 	$db->free($resql);
 }
 
-
 // Available boxes to activate
 $boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives);
 
 print "<br>\n";
+print "\n\n".'<!-- Boxes Available -->'."\n";
 print_titre($langs->trans("BoxesAvailable"));
 
-print '<table class="noborder" width="100%">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<input type="hidden" name="action" value="add">'."\n";
+print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre">';
 print '<td width="300">'.$langs->trans("Box").'</td>';
 print '<td>'.$langs->trans("Note").'/'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("SourceFile").'</td>';
-print '<td width="160">'.$langs->trans("ActivateOn").'</td>';
+print '<td width="160" align="center">'.$langs->trans("ActivateOn").'</td>';
 print "</tr>\n";
 $var=true;
 foreach($boxtoadd as $box)
@@ -342,12 +350,10 @@ foreach($boxtoadd as $box)
     }
 
     print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<tr '.$bc[$var].'>';
+    print '<tr '.$bc[$var].'>'."\n";
     print '<td>'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel);
     if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')';
-    print '</td>';
+    print '</td>'."\n";
     print '<td>';
     if ($box->note == '(WarningUsingThisBoxSlowDown)')
     {
@@ -355,27 +361,30 @@ foreach($boxtoadd as $box)
     	print $langs->trans("WarningUsingThisBoxSlowDown");
     }
 	else print ($box->note?$box->note:'&nbsp;');
-    print '</td>';
-    print '<td>' . $box->sourcefile . '</td>';
+    print '</td>'."\n";
+    print '<td>' . $box->sourcefile . '</td>'."\n";
 
     // Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position
-    print '<td>';
-    print $form->selectarray("pos",$pos_name,0,0,0,0,'',1);
-    print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="boxid" value="'.$box->box_id.'">';
-    print ' <input type="submit" class="button" name="button" value="'.$langs->trans("Activate").'">';
+    print '<td class="center">';
+    print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, 0, 1, 0, 0, '', 1)."\n";
+    print '<input type="hidden" name="boxid['.$box->box_id.'][value]" value="'.$box->box_id.'">'."\n";
+    //print '<input type="checkbox" class="flat" name="boxid['.$box->box_id.'][active]">'."\n";
     print '</td>';
 
-    print '</tr>';
-    print '</form>';
+    print '</tr>'."\n";
 }
 
-print '</table>';
+print '</table>'."\n";
+print '<div class="right">';
+print '<input type="submit" class="button"'.(count($boxtoadd)?'':' disabled="disabled"').' value="'.$langs->trans("Activate").'">';
+print '</div>'."\n";
+print '</form>';
+print "\n".'<!-- End Boxes Available -->'."\n";
 
 
 // Activated boxes
 $boxactivated=InfoBox::listBoxes($db,'activated',-1,null);
-
+//var_dump($boxactivated);
 print "<br>\n\n";
 print_titre($langs->trans("BoxesActivated"));
 
@@ -422,8 +431,8 @@ foreach($boxactivated as $key => $box)
 	$hasprevious=($key != 0);
 	print '<td align="center">'.($key+1).'</td>';
 	print '<td align="center">';
-	print ($hasnext?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key+1]->rowid.'">'.img_down().'</a>&nbsp;':'');
-	print ($hasprevious?'<a href="boxes.php?action=switch&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key-1]->rowid.'">'.img_up().'</a>':'');
+	print ($hasnext?'<a href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key+1]->rowid.'">'.img_down().'</a>&nbsp;':'');
+	print ($hasprevious?'<a href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key-1]->rowid.'">'.img_up().'</a>':'');
 	print '</td>';
 	print '<td align="center">';
 	print '<a href="boxes.php?rowid='.$box->rowid.'&amp;action=delete">'.img_delete().'</a>';
@@ -437,13 +446,14 @@ print '</table><br>';
 
 // Other parameters
 
+print "\n\n".'<!-- Other Const -->'."\n";
 print_titre($langs->trans("Other"));
-print '<table class="noborder" width="100%">';
-
-$var=false;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="addconst">';
+print '<table class="noborder" width="100%">';
+
+$var=false;
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">'.$langs->trans("Parameter").'</td>';
 print '<td class="liste_titre">'.$langs->trans("Value").'</td>';
@@ -460,9 +470,10 @@ print '<td align="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="Button">';
 print '</td>'."\n";
 print '</tr>';
-print '</form>';
 
 print '</table>';
+print '</form>';
+print "\n".'<!-- End Other Const -->'."\n";
 
 
 llxFooter();
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 1d05efa8e99..aaa1949d7dd 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Andre Cianfarani             <acianfa@free.fr>
- * Copyright (C) 2005-2012 Regis Houssin                <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
  * Copyright (C) 2011-2013 Philippe Grand			    <philippe.grand@atoo-net.com>
@@ -117,8 +117,37 @@ else if ($action == 'specimen')
 	}
 }
 
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 // Activate a model
-if ($action == 'set')
+else if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 }
@@ -192,13 +221,34 @@ else if ($action == 'set_COMMANDE_FREE_TEXT')
         setEventMessage($langs->trans("Error"),'errors');
     }
 }
-else if ($action=='setModuleOptions') {
-	if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF_ODT_PATH",GETPOST('value1'),'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->COMMANDE_ADDON_PDF_ODT_PATH = GETPOST('value1');
-	}
+
+// 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);
+    if (! $res > 0) $error++;
+    if (! $error) {
+        setEventMessage($langs->trans("SetupSaved"));
+    } else {
+        setEventMessage($langs->trans("Error"), 'errors');
+    }
+}
+
+// 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');
+    }
 }
 
 
@@ -216,7 +266,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
 print '<br>';
 
-$head = order_admin_prepare_head(null);
+$head = order_admin_prepare_head();
 
 dol_fiche_head($head, 'general', $langs->trans("Orders"), 0, 'order');
 
@@ -527,6 +577,52 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
+// Shippable Icon in List
+$var=!$var;
+print "<tr ".$bc[$var].">";
+print '<td>'.$langs->trans("ShippableOrderIconInList").'</td>';
+print '<td>&nbsp</td>';
+print '<td align="center">';
+if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+} else {
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+}
+print '</a></td>';
+print '</tr>';
+
+// Ask for payment bank during order
+if ($conf->banque->enabled)
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp</td><td align="center">';
+    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 '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+        }
+        else
+        {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+        }
+    }
+    print '</td></tr>';
+}
+else
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+}
+
 print '</table>';
 
 print '<br>';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 2cf381b31cb..96dff7755af 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -117,7 +117,7 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
                         }
                         else dol_syslog($imgThumbMini);
                     }
-                    else dol_syslog($langs->trans("ErrorImageFormatNotSupported"),LOG_WARNING);
+                    else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
                 }
                 else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
                 {
@@ -133,9 +133,10 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
                 }
             }
             else
-            {
+			{
             	$error++;
-                setEventMessage($langs->trans("ErrorOnlyPngJpgSupported"),'errors');
+				$langs->load("errors");
+            	setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
             }
         }
     }
@@ -159,6 +160,31 @@ if ( ($action == 'update' && empty($_POST["cancel"]))
     dolibarr_set_const($db, "FACTURE_LOCAL_TAX1_OPTION",$_POST["optionlocaltax1"],'chaine',0,'',$conf->entity);
     dolibarr_set_const($db, "FACTURE_LOCAL_TAX2_OPTION",$_POST["optionlocaltax2"],'chaine',0,'',$conf->entity);
 
+    if($_POST["optionlocaltax1"]=="localtax1on")
+    {
+    	if(!isset($_REQUEST['lt1']))
+    	{
+    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0,'chaine',0,'',$conf->entity);
+    	}
+    	else
+    	{
+    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1'),'chaine',0,'',$conf->entity);
+    	}
+    	dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC1", $_POST["clt1"],'chaine',0,'',$conf->entity);
+    }
+    if($_POST["optionlocaltax2"]=="localtax2on")
+    {
+    	if(!isset($_REQUEST['lt2']))
+    	{
+    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0,'chaine',0,'',$conf->entity);
+    	}
+    	else
+    	{
+    		dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2'),'chaine',0,'',$conf->entity);
+    	}
+    	dolibarr_set_const($db,"MAIN_INFO_LOCALTAX_CALC2", $_POST["clt2"],'chaine',0,'',$conf->entity);
+    }
+
     if ($action != 'updateedit' && ! $error)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
@@ -201,13 +227,15 @@ if ($action == 'addthumb')
         else
         {
         	$error++;
-            setEventMessage($langs->trans("ErrorImageFormatNotSupported"),'errors');
-            dol_syslog($langs->transnoentities("ErrorImageFormatNotSupported"),LOG_WARNING);
+        	$langs->load("errors");
+            setEventMessage($langs->trans("ErrorBadImageFormat"),'errors');
+            dol_syslog($langs->transnoentities("ErrorBadImageFormat"),LOG_WARNING);
         }
     }
     else
     {
     	$error++;
+    	$langs->load("errors");
         setEventMessage($langs->trans("ErrorFileDoesNotExists",$_GET["file"]),'errors');
         dol_syslog($langs->transnoentities("ErrorFileDoesNotExists",$_GET["file"]),LOG_WARNING);
     }
@@ -275,74 +303,74 @@ if ($action == 'edit' || $action == 'updateedit')
     print '<tr class="liste_titre"><th width="35%">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td class="fieldrequired">'.$langs->trans("CompanyName").'</td><td>';
-    print '<input name="nom" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM:$_POST["nom"]) . '"></td></tr>'."\n";
+    print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
+    print '<input name="nom" id="name" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_NOM?$conf->global->MAIN_INFO_SOCIETE_NOM:$_POST["nom"]) . '" autofocus="autofocus"></td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyAddress").'</td><td>';
-    print '<textarea name="address" cols="80" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:$_POST["address"]) . '</textarea></td></tr>'."\n";
+    print '<tr '.$bc[$var].'><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
+    print '<textarea name="address" id="address" cols="80" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_SOCIETE_ADDRESS?$conf->global->MAIN_INFO_SOCIETE_ADDRESS:$_POST["address"]) . '</textarea></td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyZip").'</td><td>';
-    print '<input name="zipcode" value="'. ($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:$_POST["zipcode"]) . '" size="10"></td></tr>'."\n";
+    print '<tr '.$bc[$var].'><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
+    print '<input name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_SOCIETE_ZIP?$conf->global->MAIN_INFO_SOCIETE_ZIP:$_POST["zipcode"]) . '" size="10"></td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyTown").'</td><td>';
-    print '<input name="town" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:$_POST["town"]) . '"></td></tr>'."\n";
+    print '<tr '.$bc[$var].'><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
+    print '<input name="town" id="town" size="30" value="'. ($conf->global->MAIN_INFO_SOCIETE_TOWN?$conf->global->MAIN_INFO_SOCIETE_TOWN:$_POST["town"]) . '"></td></tr>'."\n";
 
     // Country
     $var=!$var;
-    print '<tr '.$bc[$var].'><td class="fieldrequired">'.$langs->trans("Country").'</td><td class="maxwidthonsmartphone">';
-    //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // Par defaut, pays de la localisation
+    print '<tr '.$bc[$var].'><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
+    //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
     print $form->select_country($mysoc->country_id,'country_id');
     if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
     print '</td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("State").'</td><td class="maxwidthonsmartphone">';
+    print '<tr '.$bc[$var].'><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
     $formcompany->select_departement($conf->global->MAIN_INFO_SOCIETE_STATE,$mysoc->country_code,'state_id');
     print '</td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCurrency").'</td><td>';
+    print '<tr '.$bc[$var].'><td><label for="currency">'.$langs->trans("CompanyCurrency").'</label></td><td>';
     print $form->selectCurrency($conf->currency,"currency");
     print '</td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("Phone").'</td><td>';
-    print '<input name="tel" value="'. $conf->global->MAIN_INFO_SOCIETE_TEL . '"></td></tr>';
+    print '<tr '.$bc[$var].'><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+    print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_SOCIETE_TEL . '"></td></tr>';
     print '</td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("Fax").'</td><td>';
-    print '<input name="fax" value="'. $conf->global->MAIN_INFO_SOCIETE_FAX . '"></td></tr>';
+    print '<tr '.$bc[$var].'><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+    print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_SOCIETE_FAX . '"></td></tr>';
     print '</td></tr>'."\n";
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("EMail").'</td><td>';
-    print '<input name="mail" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
+    print '<tr '.$bc[$var].'><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+    print '<input name="mail" id="email" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_MAIL . '"></td></tr>';
     print '</td></tr>'."\n";
 
     // Web
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("Web").'</td><td>';
-    print '<input name="web" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
+    print '<tr '.$bc[$var].'><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+    print '<input name="web" id="web" size="60" value="'. $conf->global->MAIN_INFO_SOCIETE_WEB . '"></td></tr>';
     print '</td></tr>'."\n";
 
     // Barcode
     if (! empty($conf->barcode->enabled))
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$langs->trans("Gencod").'</td><td>';
-        print '<input name="barcode" size="40" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>';
+        print '<tr '.$bc[$var].'><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
+        print '<input name="barcode" id="barcode" size="40" value="'. $conf->global->MAIN_INFO_SOCIETE_GENCOD . '"></td></tr>';
         print '</td></tr>';
     }
 
     // Logo
     $var=!$var;
-    print '<tr'.dol_bc($var,'hideonsmartphone').'><td>'.$langs->trans("Logo").' (png,jpg)</td><td>';
+    print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
     print '<table width="100%" class="nocellnopadd"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
-    print '<input type="file" class="flat" name="logo" size="50">';
+    print '<input type="file" class="flat" name="logo" id="logo" size="50">';
     print '</td><td valign="middle" align="right">';
     if (! empty($mysoc->logo_mini))
     {
@@ -362,8 +390,8 @@ if ($action == 'edit' || $action == 'updateedit')
 
     // Note
     $var=!$var;
-    print '<tr '.$bc[$var].'><td valign="top">'.$langs->trans("Note").'</td><td>';
-    print '<textarea class="flat" name="note" cols="80" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '').'</textarea></td></tr>';
+    print '<tr '.$bc[$var].'><td valign="top"><label for="note">'.$langs->trans("Note").'</label></td><td>';
+    print '<textarea class="flat" name="note" id="note" cols="80" rows="'.ROWS_5.'">'.(! empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '').'</textarea></td></tr>';
     print '</td></tr>';
 
     print '</table>';
@@ -379,17 +407,17 @@ if ($action == 'edit' || $action == 'updateedit')
 
     // Managing Director(s)
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ManagingDirectors").'</td><td>';
-    print '<input name="MAIN_INFO_SOCIETE_MANAGERS" size="80" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%"><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
+    print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" size="80" value="' . $conf->global->MAIN_INFO_SOCIETE_MANAGERS . '"></td></tr>';
 
     // Capital
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
-    print '<input name="capital" size="20" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%"><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
+    print '<input name="capital" id="capital" size="20" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
 
     // Forme juridique
     $var=!$var;
-    print '<tr '.$bc[$var].'><td>'.$langs->trans("JuridicalStatus").'</td><td>';
+    print '<tr '.$bc[$var].'><td><label for="legal_form">'.$langs->trans("JuridicalStatus").'</label></td><td>';
     if ($mysoc->country_code)
     {
         print $formcompany->select_juridicalstatus($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE,$mysoc->country_code);
@@ -404,10 +432,10 @@ if ($action == 'edit' || $action == 'updateedit')
     if ($langs->transcountry("ProfId1",$mysoc->country_code) != '-')
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</td><td>';
+        print '<tr '.$bc[$var].'><td width="35%"><label for="profid1">'.$langs->transcountry("ProfId1",$mysoc->country_code).'</label></td><td>';
         if (! empty($mysoc->country_code))
         {
-            print '<input name="siren" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
+            print '<input name="siren" id="profid1" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '') . '">';
         }
         else
         {
@@ -420,10 +448,10 @@ if ($action == 'edit' || $action == 'updateedit')
     if ($langs->transcountry("ProfId2",$mysoc->country_code) != '-')
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</td><td>';
+        print '<tr '.$bc[$var].'><td width="35%"><label for="profid2">'.$langs->transcountry("ProfId2",$mysoc->country_code).'</label></td><td>';
         if (! empty($mysoc->country_code))
         {
-            print '<input name="siret" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '' ) . '">';
+            print '<input name="siret" id="profid2" size="20" value="' . (! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '' ) . '">';
         }
         else
         {
@@ -436,10 +464,10 @@ if ($action == 'edit' || $action == 'updateedit')
     if ($langs->transcountry("ProfId3",$mysoc->country_code) != '-')
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</td><td>';
+        print '<tr '.$bc[$var].'><td width="35%"><label for="profid3">'.$langs->transcountry("ProfId3",$mysoc->country_code).'</label></td><td>';
         if (! empty($mysoc->country_code))
         {
-            print '<input name="ape" size="20" value="' . (! empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
+            print '<input name="ape" id="profid3" size="20" value="' . (! empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '') . '">';
         }
         else
         {
@@ -452,10 +480,10 @@ if ($action == 'edit' || $action == 'updateedit')
     if ($langs->transcountry("ProfId4",$mysoc->country_code) != '-')
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</td><td>';
+        print '<tr '.$bc[$var].'><td width="35%"><label for="profid4">'.$langs->transcountry("ProfId4",$mysoc->country_code).'</label></td><td>';
         if (! empty($mysoc->country_code))
         {
-            print '<input name="rcs" size="20" value="' . (! empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
+            print '<input name="rcs" id="profid4" size="20" value="' . (! empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '') . '">';
         }
         else
         {
@@ -468,10 +496,10 @@ if ($action == 'edit' || $action == 'updateedit')
     if ($langs->transcountry("ProfId5",$mysoc->country_code) != '-')
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</td><td>';
+        print '<tr '.$bc[$var].'><td width="35%"><label for="profid5">'.$langs->transcountry("ProfId5",$mysoc->country_code).'</label></td><td>';
         if (! empty($mysoc->country_code))
         {
-            print '<input name="MAIN_INFO_PROFID5" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
+            print '<input name="MAIN_INFO_PROFID5" id="profid5" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '') . '">';
         }
         else
         {
@@ -484,10 +512,10 @@ if ($action == 'edit' || $action == 'updateedit')
     if ($langs->transcountry("ProfId6",$mysoc->country_code) != '-')
     {
         $var=!$var;
-        print '<tr '.$bc[$var].'><td width="35%">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</td><td>';
+        print '<tr '.$bc[$var].'><td width="35%"><label for="profid6">'.$langs->transcountry("ProfId6",$mysoc->country_code).'</label></td><td>';
         if (! empty($mysoc->country_code))
         {
-            print '<input name="MAIN_INFO_PROFID6" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
+            print '<input name="MAIN_INFO_PROFID6" id="profid6" size="20" value="' . (! empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '') . '">';
         }
         else
         {
@@ -498,8 +526,8 @@ if ($action == 'edit' || $action == 'updateedit')
 
     // TVA Intra
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("VATIntra").'</td><td>';
-    print '<input name="tva" size="20" value="' . (! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
+    print '<tr '.$bc[$var].'><td width="35%"><label for="intra_vat">'.$langs->trans("VATIntra").'</label></td><td>';
+    print '<input name="tva" id="intra_vat" size="20" value="' . (! empty($conf->global->MAIN_INFO_TVAINTRA) ? $conf->global->MAIN_INFO_TVAINTRA : '') . '">';
     print '</td></tr>';
 
     print '</table>';
@@ -514,7 +542,7 @@ if ($action == 'edit' || $action == 'updateedit')
     $var=true;
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FiscalMonthStart").'</td><td>';
+    print '<tr '.$bc[$var].'><td width="35%"><label for="fiscalmonthstart">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
     print $formother->select_month($conf->global->SOCIETE_FISCAL_MONTH_START,'fiscalmonthstart',1) . '</td></tr>';
 
     print "</table>";
@@ -530,19 +558,19 @@ if ($action == 'edit' || $action == 'updateedit')
     $var=true;
 
     $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+    print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td>".$langs->trans("VATIsUsedDesc")."</td></tr>";
+    print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
     print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
 
     $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+    print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td>".$langs->trans("VATIsNotUsedDesc")."</td></tr>";
+    print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
     print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
@@ -564,20 +592,31 @@ if ($action == 'edit' || $action == 'updateedit')
         $var=true;
         $var=!$var;
         // Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
         print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+        if(! isOnlyOneLocalTax(1))
+        {
+	        print '<tr><td align="left"><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
+    	    $formcompany->select_localtax(1,$conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
+        }
+        print '</td></tr>';
+
+        print '<tr><td align="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
+        $opcions=array($langs->transcountry("CalcLocaltax1",$mysoc->country_code),$langs->transcountry("CalcLocaltax2",$mysoc->country_code),$langs->transcountry("CalcLocaltax3",$mysoc->country_code));
+        print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
+        print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";
 
         $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax1\" value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
         print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
@@ -597,20 +636,30 @@ if ($action == 'edit' || $action == 'updateedit')
 
         $var=!$var;
         // Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
         print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+        print '<tr><td align="left"><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
+        if(! isOnlyOneLocalTax(2))
+        {
+	        $formcompany->select_localtax(2,$conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
+	        print '</td></tr>';
+        }
+        print '<tr><td align="left"><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
+        $opcions=array($langs->transcountry("CalcLocaltax1",$mysoc->country_code),$langs->transcountry("CalcLocaltax2",$mysoc->country_code),$langs->transcountry("CalcLocaltax3",$mysoc->country_code));
+        print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
+        print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";
 
         $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input type=\"radio\" name=\"optionlocaltax2\" value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
         print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
@@ -913,19 +962,19 @@ else
     $var=true;
 
     $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
+    print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"use_vat\" disabled value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")."</td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td>".$langs->trans("VATIsUsedDesc")."</td></tr>";
+    print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
     print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
 
     $var=!$var;
-    print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
+    print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optiontva\" id=\"no_vat\" disabled value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")."</td>";
     print '<td colspan="2">';
     print "<table>";
-    print "<tr><td>".$langs->trans("VATIsNotUsedDesc")."</td></tr>";
+    print "<tr><td><label=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
     print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
     print "</table>";
     print "</td></tr>\n";
@@ -948,20 +997,38 @@ else
         $var=true;
 
         $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" disabled value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td></label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
         print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+        if($conf->global->MAIN_INFO_VALUE_LOCALTAX1!=0)
+        {
+	        print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX1 .'</td></tr>';
+	    }
+        print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
+        if($conf->global->MAIN_INFO_LOCALTAX_CALC1==0)
+        {
+        	print $langs->transcountry("CalcLocaltax1",$mysoc->country_code);
+        }
+        else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==1)
+        {
+        	print $langs->transcountry("CalcLocaltax2",$mysoc->country_code);
+        }
+        else if($conf->global->MAIN_INFO_LOCALTAX_CALC1==2){
+        	print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
+        }
+
+        print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";
 
         $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" disabled value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" disabled value=\"localtax1off\"".($conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off"?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td><label for=\"no_lt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
         print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
@@ -981,20 +1048,39 @@ else
         $var=true;
 
         $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" disabled value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
         print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
+        if($conf->global->MAIN_INFO_VALUE_LOCALTAX2!=0)
+        {
+	        print '<tr><td>'.$langs->trans("LTRate").': '. $conf->global->MAIN_INFO_VALUE_LOCALTAX2 .'</td></tr>';
+	    }
+        print '<tr><td align="left">'.$langs->trans("CalcLocaltax").': ';
+        if($conf->global->MAIN_INFO_LOCALTAX_CALC2==0)
+        {
+        	print $langs->transcountry("CalcLocaltax1",$mysoc->country_code);
+        }
+        else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==1)
+        {
+        	print $langs->transcountry("CalcLocaltax2",$mysoc->country_code);
+        }
+        else if($conf->global->MAIN_INFO_LOCALTAX_CALC2==2)
+        {
+        	print $langs->transcountry("CalcLocaltax3",$mysoc->country_code);
+        }
+
+        print '</td></tr>';
         print "</table>";
         print "</td></tr>\n";
 
         $var=!$var;
-        print "<tr ".$bc[$var]."><td width=\"140\"><label><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" disabled value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</label></td>";
+        print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" disabled value=\"localtax2off\"".($conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off"?" checked":"")."> ".$langs->transcountry("LocalTax2IsNotUsed",$mysoc->country_code)."</td>";
         print '<td colspan="2">';
         print "<table>";
-        print "<tr><td>".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
+        print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</label></td></tr>";
         $example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
         print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 5c77149c0f0..b5aed0c683e 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -31,45 +31,46 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->load('admin');
 $langs->load('compta');
+$langs->load('accountancy');
 
 if (!$user->admin)
 accessforbidden();
 
 $action = GETPOST('action','alpha');
 
-// Other parameters COMPTA_*
+// Other parameters ACCOUNTING_*
 $list = array(
-    'COMPTA_PRODUCT_BUY_ACCOUNT',
-    'COMPTA_PRODUCT_SOLD_ACCOUNT',
-    'COMPTA_SERVICE_BUY_ACCOUNT',
-    'COMPTA_SERVICE_SOLD_ACCOUNT',
-    'COMPTA_VAT_ACCOUNT',
-    'COMPTA_VAT_BUY_ACCOUNT',
-    'COMPTA_ACCOUNT_CUSTOMER',
-    'COMPTA_ACCOUNT_SUPPLIER'
+    'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
+    'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
+    'ACCOUNTING_SERVICE_BUY_ACCOUNT',
+    'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
+    'ACCOUNTING_VAT_ACCOUNT',
+    'ACCOUNTING_VAT_BUY_ACCOUNT',
+    'ACCOUNTING_ACCOUNT_CUSTOMER',
+    'ACCOUNTING_ACCOUNT_SUPPLIER'
 );
 
 /*
  * Actions
  */
 
-$compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES';
+$accounting_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES';
 
 if ($action == 'update')
 {
     $error = 0;
 
-    $compta_modes = array(
+    $accounting_modes = array(
         'RECETTES-DEPENSES',
         'CREANCES-DETTES'
     );
 
-    $compta_mode = GETPOST('compta_mode','alpha');
+    $accounting_mode = GETPOST('accounting_mode','alpha');
 
 
-    if (in_array($compta_mode,$compta_modes)) {
+    if (in_array($accounting_mode,$accounting_modes)) {
 
-        if (!dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) {
+        if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $accounting_mode, 'chaine', 0, '', $conf->entity)) {
             $error++;
         }
     } else {
@@ -113,12 +114,12 @@ print '<input type="hidden" name="action" value="update">';
 
 print '<table class="noborder" width="100%">';
 
-// Cas du parametre COMPTA_MODE
+// Cas du parametre ACCOUNTING_MODE
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
 print "</tr>\n";
-print '<tr '.$bc[false].'><td width="200"><input type="radio" name="compta_mode" value="RECETTES-DEPENSES"'.($compta_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
+print '<tr '.$bc[false].'><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
 //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
@@ -132,7 +133,7 @@ print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 //	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
 //}
 print "</td></tr>\n";
-print '<tr '.$bc[true].'><td width="200"><input type="radio" name="compta_mode" value="CREANCES-DETTES"'.($compta_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
+print '<tr '.$bc[true].'><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"'.($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
 print '</form>';
 
@@ -153,7 +154,7 @@ foreach ($list as $key)
 	print '<tr '.$bc[$var].' class="value">';
 
 	// Param
-	$libelle = $langs->trans($key); 
+	$libelle = $langs->trans($key);
 	print '<td><label for="'.$key.'">'.$libelle.'</label></td>';
 
 	// Value
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index eb9cae41917..a64e3856dbc 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -233,7 +233,7 @@ if (empty($user->entity) && $debug) {} // to force for superadmin
 elseif ($user->entity || empty($conf->multicompany->enabled)) $sql.= " AND visible = 1";
 $sql.= " ORDER BY entity, name ASC";
 
-dol_syslog("Const::listConstant sql=".$sql);
+dol_syslog("Const::listConstant", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
@@ -260,7 +260,7 @@ if ($result)
 
 		// Note
 		print '<td>';
-		print '<input type="text" id="note_'.$i.'"class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note,1).'">';
+		print '<input type="text" id="note_'.$i.'" class="flat inputforupdate" size="40" name="const['.$i.'][note]" value="'.htmlspecialchars($obj->note,1).'">';
 		print '</td>';
 
 		// Entity limit to superadmin
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 4c3ee7207df..6905156990b 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -35,8 +35,9 @@ if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 $value = GETPOST('value','alpha');
+$label = GETPOST('label','alpha');
 $scandir = GETPOST('scandir','alpha');
-$type='contrat';
+$type='contract';
 
 if (empty($conf->global->CONTRACT_ADDON))
 {
@@ -111,6 +112,35 @@ else if ($action == 'specimen') // For contract
 	}
 }
 
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+        setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 // Activate a model
 else if ($action == 'set')
 {
@@ -152,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)
     {
@@ -187,12 +202,13 @@ else if ($action == 'set_CONTRACT_DRAFT_WATERMARK')
     }
 }
 
+
 /*
  * View
  */
 
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
- 
+
 llxHeader();
 
 $form=new Form($db);
@@ -318,7 +334,6 @@ print '</table><br>';
 print_titre($langs->trans("TemplatePDFContracts"));
 
 // Defini tableau def des modeles
-$type='contrat';
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
@@ -477,44 +492,43 @@ print "<br>";
  *
  */
 
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_other">';
+
 print_titre($langs->trans("OtherOptions"));
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
 $var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_CONTRACT_FREE_TEXT">';
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')<br>';
 print '<textarea name="CONTRACT_FREE_TEXT" class="flat" cols="120">'.$conf->global->CONTRACT_FREE_TEXT.'</textarea>';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
+print '</td></tr>'."\n";
 print '</form>';
 
 //Use draft Watermark
 $var=!$var;
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_CONTRACT_DRAFT_WATERMARK\">";
 print '<tr '.$bc[$var].'><td colspan="2">';
 print $langs->trans("WatermarkOnDraftContractCards").'<br>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
+print '</td></tr>'."\n";
 
 print '</table>';
 
-print '<br>';
+print '<div class="center">';
+print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+dol_fiche_end();
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 305843f7188..05402898ee6 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
@@ -8,7 +8,7 @@
  * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
  * Copyright (C) 2012-2013 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2012 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
  *
  * 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
@@ -70,15 +70,15 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,25,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,23,0,26);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,0,25);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
 $tabname[1] = MAIN_DB_PREFIX."c_forme_juridique";
 $tabname[2] = MAIN_DB_PREFIX."c_departements";
 $tabname[3] = MAIN_DB_PREFIX."c_regions";
-$tabname[4] = MAIN_DB_PREFIX."c_pays";
-$tabname[5] = MAIN_DB_PREFIX."c_civilite";
+$tabname[4] = MAIN_DB_PREFIX."c_country";
+$tabname[5] = MAIN_DB_PREFIX."c_civility";
 $tabname[6] = MAIN_DB_PREFIX."c_actioncomm";
 $tabname[7] = MAIN_DB_PREFIX."c_chargesociales";
 $tabname[8] = MAIN_DB_PREFIX."c_typent";
@@ -96,10 +96,9 @@ $tabname[19]= MAIN_DB_PREFIX."c_effectif";
 $tabname[20]= MAIN_DB_PREFIX."c_input_method";
 $tabname[21]= MAIN_DB_PREFIX."c_availability";
 $tabname[22]= MAIN_DB_PREFIX."c_input_reason";
-$tabname[23]= MAIN_DB_PREFIX."accountingaccount";
-$tabname[24]= MAIN_DB_PREFIX."accounting_system";
-$tabname[25]= MAIN_DB_PREFIX."c_revenuestamp";
-$tabname[26]= MAIN_DB_PREFIX."c_type_resource";
+$tabname[23]= MAIN_DB_PREFIX."c_revenuestamp";
+$tabname[24]= MAIN_DB_PREFIX."c_type_resource";
+$tabname[25]= MAIN_DB_PREFIX."c_email_templates";
 
 // Dictionary labels
 $tablib=array();
@@ -125,50 +124,48 @@ $tablib[19]= "DictionaryStaff";
 $tablib[20]= "DictionaryOrderMethods";
 $tablib[21]= "DictionaryAvailability";
 $tablib[22]= "DictionarySource";
-$tablib[23]= "DictionaryAccountancyplan";
-$tablib[24]= "DictionaryAccountancysystem";
-$tablib[25]= "DictionaryRevenueStamp";
-$tablib[26]= "DictionaryResourceType";
+$tablib[23]= "DictionaryRevenueStamp";
+$tablib[24]= "DictionaryResourceType";
+$tablib[25]= "DictionaryEMailTemplates";
 
-// Requete pour extraction des donnees des dictionnaires
+// Requests to extract data
 $tabsql=array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, p.code as country_code, p.libelle as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_pays as p WHERE f.fk_pays=p.rowid";
-$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, p.code as country_code, p.libelle as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p WHERE d.fk_region=r.code_region and r.fk_pays=p.rowid and r.active=1 and p.active=1";
-$tabsql[3] = "SELECT r.rowid as rowid, code_region as code, nom as libelle, r.fk_pays as country_id, p.code as country_code, p.libelle as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p WHERE r.fk_pays=p.rowid and p.active=1";
-$tabsql[4] = "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_pays";
-$tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.civilite AS libelle, c.active FROM ".MAIN_DB_PREFIX."c_civilite AS c";
-$tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
-$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, p.code as country_code, p.libelle as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_pays as p WHERE a.fk_pays=p.rowid and p.active=1";
-$tabsql[8] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_typent";
+$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c WHERE f.fk_pays=c.rowid";
+$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1";
+$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_pays=c.rowid and c.active=1";
+$tabsql[4] = "SELECT rowid   as rowid, code, label, active, favorite FROM ".MAIN_DB_PREFIX."c_country";
+$tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c";
+$tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
+$tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
+$tabsql[8] = "SELECT t.id    as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid";
 $tabsql[9] = "SELECT code_iso as code, label, unicode, active FROM ".MAIN_DB_PREFIX."c_currencies";
-$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid";
+$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
 $tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c';
-$tabsql[13]= "SELECT id      as rowid, code, c.libelle, type, active FROM ".MAIN_DB_PREFIX."c_paiement AS c";
-$tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.organization, e.fk_pays as country_id, p.code as country_code, p.libelle as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_pays as p WHERE e.fk_pays=p.rowid and p.active=1";
+$tabsql[13]= "SELECT id      as rowid, code, c.libelle, type, active, accountancy_code FROM ".MAIN_DB_PREFIX."c_paiement AS c";
+$tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
 $tabsql[15]= "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format";
 $tabsql[16]= "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectlevel";
-$tabsql[17]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_fees";
+$tabsql[17]= "SELECT id      as rowid, code, label, accountancy_code, active FROM ".MAIN_DB_PREFIX."c_type_fees";
 $tabsql[18]= "SELECT rowid   as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 $tabsql[19]= "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
 $tabsql[20]= "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method";
 $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c";
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
-$tabsql[23]= "SELECT rowid   as rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number as accountancy_code, account_parent, label, active FROM ".MAIN_DB_PREFIX."accountingaccount";
-$tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.code as country_code, p.libelle as pays, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_pays as p WHERE s.fk_pays=p.rowid and p.active=1";
-$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid";
-$tabsql[26]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
+$tabsql[23]= "SELECT t.rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
+$tabsql[24]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
+$tabsql[25]= "SELECT rowid   as rowid, label, type_template, private, position, topic, content, active FROM ".MAIN_DB_PREFIX."c_email_templates";
 
-// Critere de tri du dictionnaire
+// Criteria to sort dictionaries
 $tabsqlsort=array();
 $tabsqlsort[1] ="country ASC, code ASC";
 $tabsqlsort[2] ="country ASC, code ASC";
 $tabsqlsort[3] ="country ASC, code ASC";
 $tabsqlsort[4] ="code ASC";
-$tabsqlsort[5] ="libelle ASC";
+$tabsqlsort[5] ="label ASC";
 $tabsqlsort[6] ="a.type ASC, a.module ASC, a.position ASC, a.code ASC";
 $tabsqlsort[7] ="country ASC, code ASC, a.libelle ASC";
-$tabsqlsort[8] ="libelle ASC";
+$tabsqlsort[8] ="country DESC, libelle ASC";
 $tabsqlsort[9] ="label ASC";
 $tabsqlsort[10]="country ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC";
 $tabsqlsort[11]="element ASC, source ASC, code ASC";
@@ -183,97 +180,93 @@ $tabsqlsort[19]="id ASC";
 $tabsqlsort[20]="code ASC, libelle ASC";
 $tabsqlsort[21]="code ASC, label ASC";
 $tabsqlsort[22]="code ASC, label ASC";
-$tabsqlsort[23]="fk_pcg_version ASC, accountancy_code ASC";
-$tabsqlsort[24]="pcg_version ASC";
-$tabsqlsort[25]="country ASC, taux ASC";
-$tabsqlsort[26]="code ASC,label ASC";
+$tabsqlsort[23]="country ASC, taux ASC";
+$tabsqlsort[24]="code ASC,label ASC";
+$tabsqlsort[25]="label ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
 $tabfield[1] = "code,libelle,country";
 $tabfield[2] = "code,libelle,region_id,region,country";   // "code,libelle,region,country_code-country"
 $tabfield[3] = "code,libelle,country_id,country";
-$tabfield[4] = "code,libelle";
-$tabfield[5] = "code,libelle";
-$tabfield[6] = "code,libelle,type,position";
-$tabfield[7] = "code,libelle,country_id,country,accountancy_code,deductible";
-$tabfield[8] = "code,libelle";
+$tabfield[4] = "code,label";
+$tabfield[5] = "code,label";
+$tabfield[6] = "code,libelle,type,color,position";
+$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";
 $tabfield[11]= "element,source,code,libelle";
 $tabfield[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
-$tabfield[13]= "code,libelle,type";
+$tabfield[13]= "code,libelle,type,accountancy_code";
 $tabfield[14]= "code,libelle,price,organization,country_id,country";
 $tabfield[15]= "code,libelle,width,height,unit";
 $tabfield[16]= "code,libelle,sortorder";
-$tabfield[17]= "code,libelle";
+$tabfield[17]= "code,label,accountancy_code";
 $tabfield[18]= "code,libelle,tracking";
 $tabfield[19]= "code,libelle";
 $tabfield[20]= "code,libelle";
 $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
-$tabfield[23]= "fk_pcg_version,accountancy_code,account_parent,pcg_type,pcg_subtype,label";
-$tabfield[24]= "pcg_version,country_id,country,label";
-$tabfield[25]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
-$tabfield[26]= "code,label";
+$tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
+$tabfield[24]= "code,label";
+$tabfield[25]= "label,type_template,private,position,topic,content";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
 $tabfieldvalue[1] = "code,libelle,country";
 $tabfieldvalue[2] = "code,libelle,region";   // "code,libelle,region"
 $tabfieldvalue[3] = "code,libelle,country";
-$tabfieldvalue[4] = "code,libelle";
-$tabfieldvalue[5] = "code,libelle";
-$tabfieldvalue[6] = "code,libelle,type,position";
+$tabfieldvalue[4] = "code,label";
+$tabfieldvalue[5] = "code,label";
+$tabfieldvalue[6] = "code,libelle,type,color,position";
 $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible";
-$tabfieldvalue[8] = "code,libelle";
+$tabfieldvalue[8] = "code,libelle,country";
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10]= "country,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[11]= "element,source,code,libelle";
 $tabfieldvalue[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
-$tabfieldvalue[13]= "code,libelle,type";
+$tabfieldvalue[13]= "code,libelle,type,accountancy_code";
 $tabfieldvalue[14]= "code,libelle,price,organization,country";
 $tabfieldvalue[15]= "code,libelle,width,height,unit";
 $tabfieldvalue[16]= "code,libelle,sortorder";
-$tabfieldvalue[17]= "code,libelle";
+$tabfieldvalue[17]= "code,label,accountancy_code";
 $tabfieldvalue[18]= "code,libelle,tracking";
 $tabfieldvalue[19]= "code,libelle";
 $tabfieldvalue[20]= "code,libelle";
 $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
-$tabfieldvalue[23]= "fk_pcg_version,accountancy_code,account_parent,pcg_type,pcg_subtype,label";
-$tabfieldvalue[24]= "pcg_version,country,label";
-$tabfieldvalue[25]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
-$tabfieldvalue[26]= "code,label";
+$tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
+$tabfieldvalue[24]= "code,label";
+$tabfieldvalue[25]= "label,type_template,private,position,topic,content";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
 $tabfieldinsert[1] = "code,libelle,fk_pays";
 $tabfieldinsert[2] = "code_departement,nom,fk_region";
 $tabfieldinsert[3] = "code_region,nom,fk_pays";
-$tabfieldinsert[4] = "code,libelle";
-$tabfieldinsert[5] = "code,civilite";
-$tabfieldinsert[6] = "code,libelle,type,position";
+$tabfieldinsert[4] = "code,label";
+$tabfieldinsert[5] = "code,label";
+$tabfieldinsert[6] = "code,libelle,type,color,position";
 $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible";
-$tabfieldinsert[8] = "code,libelle";
+$tabfieldinsert[8] = "code,libelle,fk_country";
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10]= "fk_pays,taux,recuperableonly,localtax1_type,localtax1,localtax2_type,localtax2,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11]= "element,source,code,libelle";
 $tabfieldinsert[12]= "code,libelle,libelle_facture,nbjour,fdm,decalage";
-$tabfieldinsert[13]= "code,libelle,type";
+$tabfieldinsert[13]= "code,libelle,type,accountancy_code";
 $tabfieldinsert[14]= "code,libelle,price,organization,fk_pays";
 $tabfieldinsert[15]= "code,label,width,height,unit";
 $tabfieldinsert[16]= "code,label,sortorder";
-$tabfieldinsert[17]= "code,libelle";
+$tabfieldinsert[17]= "code,label,accountancy_code";
 $tabfieldinsert[18]= "code,libelle,tracking";
 $tabfieldinsert[19]= "code,libelle";
 $tabfieldinsert[20]= "code,libelle";
 $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
-$tabfieldinsert[23]= "fk_pcg_version,account_number,account_parent,pcg_type,pcg_subtype,label";
-$tabfieldinsert[24]= "pcg_version,fk_pays,label";
-$tabfieldinsert[25]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
-$tabfieldinsert[26]= "code,label";
+$tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
+$tabfieldinsert[24]= "code,label";
+$tabfieldinsert[25]= "label,type_template,private,position,topic,content";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -304,7 +297,6 @@ $tabrowid[22]= "rowid";
 $tabrowid[23]= "";
 $tabrowid[24]= "";
 $tabrowid[25]= "";
-$tabrowid[25]= "";
 
 // Condition to show dictionary in setup page
 $tabcond=array();
@@ -330,10 +322,9 @@ $tabcond[19]= ! empty($conf->societe->enabled);
 $tabcond[20]= ! empty($conf->fournisseur->enabled);
 $tabcond[21]= ! empty($conf->propal->enabled);
 $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled));
-$tabcond[23]= (! empty($conf->global->ACCOUNTING_USEDICTTOEDIT) && ! empty($conf->accounting->enabled));	// The accountancy plan should be edited with specific pages. You can set ACCOUNTING_USEDICTTOEDIT to 1 if you want to use dictionary editor.
-$tabcond[24]= (! empty($conf->global->ACCOUNTING_USEDICTTOEDIT) && ! empty($conf->accounting->enabled));	// The accountancy system should be edited with specific pages. You can set ACCOUNTING_USEDICTTOEDIT to 1 if you want to use dictionary editor.
-$tabcond[25]= true;
-$tabcond[26]= ! empty($conf->resource->enabled);
+$tabcond[23]= true;
+$tabcond[24]= ! empty($conf->resource->enabled);
+$tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC);
 
 // List of help for fields
 $tabhelp=array();
@@ -362,13 +353,40 @@ $tabhelp[22] = array();
 $tabhelp[23] = array();
 $tabhelp[24] = array();
 $tabhelp[25] = array();
-$tabhelp[26] = array();
+
+// List of check for fields (NOT USED YET)
+$tabfieldcheck=array();
+$tabfieldcheck[1]  = array();
+$tabfieldcheck[2]  = array();
+$tabfieldcheck[3]  = array();
+$tabfieldcheck[4]  = array();
+$tabfieldcheck[5]  = array();
+$tabfieldcheck[6]  = array();
+$tabfieldcheck[7]  = array();
+$tabfieldcheck[8]  = array();
+$tabfieldcheck[9]  = array();
+$tabfieldcheck[10] = array();
+$tabfieldcheck[11] = array();
+$tabfieldcheck[12] = array();
+$tabfieldcheck[13] = array();
+$tabfieldcheck[14] = array();
+$tabfieldcheck[15] = array();
+$tabfieldcheck[16] = array();
+$tabfieldcheck[17] = array();
+$tabfieldcheck[18] = array();
+$tabfieldcheck[19] = array();
+$tabfieldcheck[20] = array();
+$tabfieldcheck[21] = array();
+$tabfieldcheck[22] = array();
+$tabfieldcheck[23] = array();
+$tabfieldcheck[24] = array();
+$tabfieldcheck[25] = array();
 
 // Complete all arrays with entries found into modules
-complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp);
+complete_dictionary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp,$tabfieldcheck);
 
 
-// Define elementList and sourceList (used for dictionary "type of contacts")
+// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
 $sourceList=array();
 if ($id == 11)
@@ -380,26 +398,34 @@ if ($id == 11)
 	$langs->load("bills");
 	$langs->load("interventions");
 	$elementList = array(
-			'commande'          => $langs->trans('Order'),
+			''				    => '',
+//			'proposal'          => $langs->trans('Proposal'),
+//			'order'             => $langs->trans('Order'),
+//			'invoice'           => $langs->trans('Bill'),
 			'invoice_supplier'  => $langs->trans('SupplierBill'),
 			'order_supplier'    => $langs->trans('SupplierOrder'),
-			'contrat'           => $langs->trans('Contract'),
+//			'intervention'      => $langs->trans('InterventionCard'),
+//			'contract'          => $langs->trans('Contract'),
 			'project'           => $langs->trans('Project'),
 			'project_task'      => $langs->trans('Task'),
+			'agenda'			=> $langs->trans('Agenda'),
+			// old deprecated
+			'contrat'           => $langs->trans('Contract'),
 			'propal'            => $langs->trans('Proposal'),
+			'commande'          => $langs->trans('Order'),
 			'facture'           => $langs->trans('Bill'),
-			'facture_fourn'     => $langs->trans('SupplierBill'),
-			'fichinter'         => $langs->trans('InterventionCard'),
-			'agenda'			=> $langs->trans('Agenda')
+//			'facture_fourn'     => $langs->trans('SupplierBill'),
+			'fichinter'         => $langs->trans('InterventionCard')
 	);
-	if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
+	if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
+	asort($elementList);
 	$sourceList = array(
 			'internal' => $langs->trans('Internal'),
 			'external' => $langs->trans('External')
 	);
 }
 
-// Define localtax_typeList (used for dictionary "c_tva")
+// Define localtax_typeList (used for dictionary "llx_c_tva")
 $localtax_typeList = array();
 if ($id == 10)
 {
@@ -412,7 +438,6 @@ if ($id == 10)
 			"5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)",	//$langs->trans("%ageOnServiceWithoutVAT"),
 			"6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)"	//$langs->trans("%ageOnServiceBeforeVAT"),
 	);
-	if (! empty($conf->global->MAIN_USE_LOCALTAX_TYPE_7)) $localtax_typeList["7"]= $langs->trans("Yes").' ('.$langs->trans("Type")." 7)";	//$langs->trans("AmountOnOrder")	// We will enable this later. For the moment, work only of invoice localtype
 }
 
 
@@ -428,9 +453,11 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $ok=1;
     foreach ($listfield as $f => $value)
     {
-        if ($value == 'country' && in_array('region_id',$listfield)) continue;		// For region page, we do not require the country input
+        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 == 'localtax1' && empty($_POST['localtax1_type'])) continue;
         if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
+        if ($value == 'color' && empty($_POST['color'])) continue;
         if ((! isset($_POST[$value]) || $_POST[$value]=='')
         	&& (! in_array($listfield[$f], array('decalage','module','accountancy_code','accountancy_code_sell','accountancy_code_buy')))  // Fields that are not mandatory
 		)
@@ -473,10 +500,17 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
 	    }*/
     }
-    if (isset($_POST["country"]) && $_POST["country"]=='0')
+    if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
     {
-        $ok=0;
-        setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")),'errors');
+    	if (in_array($tablib[$id],array('DictionaryCompanyType')))
+    	{
+    		$_POST["country"]='';
+    	}
+    	else
+    	{
+        	$ok=0;
+        	setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->transnoentities("Country")),'errors');
+    	}
     }
 
 	// Clean some parameters
@@ -510,6 +544,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         $sql.= $tabfieldinsert[$id];
         $sql.=",active)";
         $sql.= " VALUES(";
+
         // List of values
         if ($tabrowid[$id] && ! in_array($tabrowid[$id],$listfieldinsert))
         	$sql.= $newid.",";
@@ -529,7 +564,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         }
         $sql.=",1)";
 
-        dol_syslog("actionadd sql=".$sql);
+        dol_syslog("actionadd", LOG_DEBUG);
         $result = $db->query($sql);
         if ($result)	// Add is ok
         {
@@ -578,7 +613,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         }
         $sql.= " WHERE ".$rowidcol." = '".$rowid."'";
 
-        dol_syslog("actionmodify sql=".$sql);
+        dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
         $resql = $db->query($sql);
         if (! $resql)
@@ -601,7 +636,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 
     $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$rowid."'";
 
-    dol_syslog("delete sql=".$sql);
+    dol_syslog("delete", LOG_DEBUG);
     $result = $db->query($sql);
     if (! $result)
     {
@@ -656,6 +691,46 @@ if ($action == $acts[1])
     }
 }
 
+// favorite
+if ($action == 'activate_favorite')
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
+// disable favorite
+if ($action == 'disable_favorite')
+{
+    if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
+    else { $rowidcol="rowid"; }
+
+    if ($rowid) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$rowid."'";
+    }
+    elseif ($_GET["code"]) {
+        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$_GET["code"]."'";
+    }
+
+    $result = $db->query($sql);
+    if (!$result)
+    {
+        dol_print_error($db);
+    }
+}
+
 
 /*
  * View
@@ -688,6 +763,7 @@ if ($action == 'delete')
 {
     print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$_GET["code"].'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
 }
+//var_dump($elementList);
 
 /*
  * Show a dictionary
@@ -755,7 +831,10 @@ if ($id)
             if ($fieldlist[$field]=='localtax2')       { $valuetoshow=$langs->trans("Rate")." 3";}
             if ($fieldlist[$field]=='organization')    { $valuetoshow=$langs->trans("Organization"); }
             if ($fieldlist[$field]=='lang')            { $valuetoshow=$langs->trans("Language"); }
-            if ($fieldlist[$field]=='type')            { $valuetoshow=$langs->trans("Type"); }
+            if ($fieldlist[$field]=='type')            {
+				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"),$langs->trans("TypePaymentDesc"),2,1,img_help(1,''));
+				else $valuetoshow=$langs->trans("Type");
+            }
             if ($fieldlist[$field]=='code')            { $valuetoshow=$langs->trans("Code"); }
             if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*"; }
             if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
@@ -779,6 +858,13 @@ if ($id)
             if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
             if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
             if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+
+            if ($id == 2)	// Special cas for state page
+            {
+            	if ($fieldlist[$field]=='region_id') { $valuetoshow='&nbsp;'; $showfield=1; }
+	            if ($fieldlist[$field]=='region') { $valuetoshow=$langs->trans("Country").'/'.$langs->trans("Region"); $showfield=1; }
+            }
+
             if ($valuetoshow != '')
             {
                 print '<td align="'.$align.'">';
@@ -789,12 +875,14 @@ if ($id)
              }
              if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') $alabelisused=1;
         }
-        print '<td colspan="3">';
+
+        if ($id == 4) print '<td></td>';
+        print '<td colspan="4">';
         print '<input type="hidden" name="id" value="'.$id.'">';
         print '&nbsp;</td>';
         print '</tr>';
 
-        // Line to type new values
+        // Line to enter new values
         print "<tr ".$bc[$var].">";
 
         $obj = new stdClass();
@@ -813,22 +901,31 @@ if ($id)
         $reshook=$hookmanager->executeHooks('createDictionaryFieldlist',$parameters, $obj, $tmpaction);    // Note that $action and $object may have been modified by some hooks
         $error=$hookmanager->error; $errors=$hookmanager->errors;
 
+        if ($id == 3)
+        {
+        	unset($fieldlist[2]);
+        }
+
         if (empty($reshook)) fieldList($fieldlist,$obj);
 
+        if ($id == 4) print '<td></td>';
         print '<td colspan="3" align="right"><input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'"></td>';
         print "</tr>";
 
+        $colspan=count($fieldlist)+2;
+        if ($id == 4) $colspan++;;
+
         if (! empty($alabelisused))  // Si un des champs est un libelle
         {
-            print '<tr><td colspan="'.(count($fieldlist)+2).'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
+        	print '<tr><td colspan="'.$colspan.'">* '.$langs->trans("LabelUsedByDefault").'.</td></tr>';
         }
-        print '<tr><td colspan="'.(count($fieldlist)+2).'">&nbsp;</td></tr>';
+        print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';
     }
 
     print '</form>';
 
     // List of available values in database
-    dol_syslog("htdocs/admin/dict sql=".$sql, LOG_DEBUG);
+    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -898,14 +995,18 @@ if ($id)
                 if ($fieldlist[$field]=='pcg_type')        { $valuetoshow=$langs->trans("Pcg_type"); }
                 if ($fieldlist[$field]=='pcg_subtype')     { $valuetoshow=$langs->trans("Pcg_subtype"); }
                 if ($fieldlist[$field]=='sortorder')       { $valuetoshow=$langs->trans("SortOrder"); }
+
                 // Affiche nom du champ
                 if ($showfield)
                 {
                     print getTitleFieldOfList($valuetoshow,0,$_SERVER["PHP_SELF"],($sortable?$fieldlist[$field]:''),($page?'page='.$page.'&':'').'&id='.$id,"","align=".$align,$sortfield,$sortorder);
                 }
             }
-            print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"active",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder);
-            print '<td colspan="2"  class="liste_titre">&nbsp;</td>';
+			// Favorite - Only activated on country dictionary
+            if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"),0,$_SERVER["PHP_SELF"],"favorite",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder);
+
+			print getTitleFieldOfList($langs->trans("Status"),0,$_SERVER["PHP_SELF"],"active",($page?'page='.$page.'&':'').'&id='.$id,"",'align="center"',$sortfield,$sortorder);
+            print '<td colspan="3"  class="liste_titre">&nbsp;</td>';
             print '</tr>';
 
             // Lines with values
@@ -983,7 +1084,7 @@ if ($id)
                                 $valuetoshow=($obj->code && $key != "PaymentCondition".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
                                 $valuetoshow=nl2br($valuetoshow);
                             }
-                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_pays') {
+                            else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_country') {
                                 $key=$langs->trans("Country".strtoupper($obj->code));
                                 $valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
                             }
@@ -1008,7 +1109,7 @@ if ($id)
                                 $key=$langs->trans(strtoupper($obj->code));
                                 $valuetoshow=($key != strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
                             }
-                            else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_civilite') {
+                            else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_civility') {
                                 $key=$langs->trans("Civility".strtoupper($obj->code));
                                 $valuetoshow=($obj->code && $key != "Civility".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]);
                             }
@@ -1046,7 +1147,7 @@ if ($id)
                                 $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
                                 $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->$fieldlist[$field]);
                             }
-                            else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+                            else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
                             {
                                 $langs->load('trips');
                                 $key = $langs->trans(strtoupper($obj->code));
@@ -1103,27 +1204,39 @@ if ($id)
                         }
                     }
 
-                    // Est-ce une entree du dictionnaire qui peut etre desactivee ?
-                    // True by default
-                    $iserasable=1;
+                    // Can an entry be erased or disabled ?
+                    $iserasable=1;$isdisable=1;	// true by default
 
                     if (isset($obj->code))
                     {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable = 0;
-                    	else if ($obj->code == 'RECEP') $iserasable = 0;
-                    	else if ($obj->code == 'EF0') $iserasable = 0;
+                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) { $iserasable = 0; $isdisable = 0; }
+                    	else if ($obj->code == 'RECEP') { $iserasable = 0; $isdisable = 0; }
+                    	else if ($obj->code == 'EF0')   { $iserasable = 0; $isdisable = 0; }
                     }
 
-                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0;
+                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable=0; }
+                    if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $isdisable=0; $isdisable = 0; }
 
                     $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?$obj->code:'').'&amp;id='.$id.'&amp;';
 
+					// Favorite
+					// Only activated on country dictionary
+                    if ($id == 4)
+					{
+						print '<td align="center" class="nowrap">';
+						if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
+						else print $langs->trans("AlwaysActive");
+						print '</td>';
+					}
+
                     // Active
                     print '<td align="center" class="nowrap">';
-                    if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                    if ($isdisable) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
                     else
                  	{
-                  		if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+                 		if (in_array($obj->code, array('AC_OTH','AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+                 		else if (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+                  		else if (isset($obj->type) && in_array($obj->type, array('system')) && ! empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
                     	else print $langs->trans("AlwaysActive");
                     }
                     print "</td>";
@@ -1220,7 +1333,7 @@ $db->close();
 
 
 /**
- *	Show field
+ *	Show fields in insert/edit mode
  *
  * 	@param		array	$fieldlist		Array of fields
  * 	@param		Object	$obj			If we show a particular record, obj is filled with record fields
@@ -1240,14 +1353,26 @@ function fieldList($fieldlist,$obj='',$tabname='')
 	foreach ($fieldlist as $field => $value)
 	{
 		if ($fieldlist[$field] == 'country') {
-			if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }	// For region page, we do not show the country input
+			if (in_array('region_id',$fieldlist))
+			{
+				print '<td>';
+				//print join(',',$fieldlist);
+				print '</td>';
+				continue;
+			}	// For state page, we do not show the country input (we link to region, not country)
 			print '<td>';
-			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 '</td>';
 		}
 		elseif ($fieldlist[$field] == 'country_id') {
-			$country_id = (! empty($obj->$fieldlist[$field]) ? $obj->$fieldlist[$field] : 0);
-			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
+			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 '<td>';
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
+				print '</td>';
+			}
 		}
 		elseif ($fieldlist[$field] == 'region') {
 			print '<td>';
@@ -1256,7 +1381,9 @@ function fieldList($fieldlist,$obj='',$tabname='')
 		}
 		elseif ($fieldlist[$field] == 'region_id') {
 			$region_id = (! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:0);
+			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
+			print '</td>';
 		}
 		elseif ($fieldlist[$field] == 'lang') {
 			print '<td>';
@@ -1295,7 +1422,7 @@ function fieldList($fieldlist,$obj='',$tabname='')
 			print '<input type="text" class="flat" value="'.(isset($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
-		elseif ($fieldlist[$field] == 'libelle_facture') {
+		elseif (in_array($fieldlist[$field], array('libelle_facture','content'))) {
 			print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->$fieldlist[$field])?$obj->$fieldlist[$field]:'').'</textarea></td>';
 		}
 		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i',$fieldlist[$field])) {
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index fbb89f4bfa2..ac0fe715c99 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2010  Laurent Destailleur  	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2013	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013       Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2014       Alexandre Spangaro		<alexandre.spangaro@gmail.com>
  *
  * 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
@@ -36,6 +37,8 @@ $typeconst=array('yesno','texte','chaine');
 
 $action = GETPOST('action','alpha');
 
+$type='donation';
+
 
 /*
  * Action
@@ -109,6 +112,63 @@ else if ($action == 'del')
 	}
 }
 
+// Option
+if ($action == 'set_DONATION_MESSAGE')
+{
+	$freemessage = GETPOST('DONATION_MESSAGE');	// No alpha here, we want exact string
+
+    $res = dolibarr_set_const($db, "DONATION_MESSAGE",$freemessage,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+// Activate an article
+else if ($action == 'setart200') {
+	$setart200 = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "DONATION_ART200", $setart200, 'yesno', 0, '', $conf->entity);
+	if (! $res > 0)
+		$error ++;
+
+	if (! $error) {
+		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+	} else {
+		setEventMessage($langs->trans("Error"), 'mesgs');
+	}
+}
+else if ($action == 'setart238') {
+	$setart238 = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "DONATION_ART238", $setart238, 'yesno', 0, '', $conf->entity);
+	if (! $res > 0)
+		$error ++;
+
+	if (! $error) {
+		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+	} else {
+		setEventMessage($langs->trans("Error"), 'mesgs');
+	}
+}
+else if ($action == 'setart885') {
+	$setart885 = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "DONATION_ART885", $setart885, 'yesno', 0, '', $conf->entity);
+	if (! $res > 0)
+		$error ++;
+
+	if (! $error) {
+		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+	} else {
+		setEventMessage($langs->trans("Error"), 'mesgs');
+	}
+}
+
 /*
  * View
  */
@@ -121,6 +181,88 @@ llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup');
 
+/*
+ *  Params
+ */
+print_titre($langs->trans("Options"));
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+$var=true;
+
+$var=! $var;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("FreeTextOnDonations").'<br>';
+print '<textarea name="DONATION_MESSAGE" class="flat" cols="120">'.$conf->global->DONATION_MESSAGE.'</textarea>';
+print '</td><td align="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print "</td></tr>\n";
+print "</table>\n";
+print '</form>';
+
+/*
+ *  French params
+ */
+if ($conf->global->MAIN_LANG_DEFAULT == "fr_FR")
+{
+	print '<br>';
+	print_titre($langs->trans("FrenchOptions"));
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
+	print "</tr>\n";
+
+	$var=!$var;
+	print "<tr " . $bc[$var] . ">";
+	print '<td width="80%">' . $langs->trans("DONATION_ART200") . '</td>';
+	if (! empty($conf->global->DONATION_ART200)) {
+		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart200&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart200&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr " . $bc[$var] . ">";
+	print '<td width="80%">' . $langs->trans("DONATION_ART238") . '</td>';
+	if (! empty($conf->global->DONATION_ART238)) {
+		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart238&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart238&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr " . $bc[$var] . ">";
+	print '<td width="80%">' . $langs->trans("DONATION_ART885") . '</td>';
+	if (! empty($conf->global->DONATION_ART885)) {
+		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart885&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on');
+		print '</a></td>';
+	} else {
+		print '<td align="center" colspan="2"><a href="' . $_SERVER['PHP_SELF'] . '?action=setart885&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
+	print "</table>\n";
+}
+
 // Document templates
 print '<br>';
 print_titre($langs->trans("DonationsModels"));
@@ -237,7 +379,7 @@ if (is_resource($handle))
                 print '<td align="center">';
                 print $form->textwithpicto('',$htmltooltip,-1,0);
                 print '</td>';
-				
+
 				// Preview
 				print '<td align="center">';
 				print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
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")."<br>\n";
 print "<br>\n";
 
-$head=security_prepare_head();
-
-dol_fiche_head($head, 'audit', $langs->trans("Security"));
-
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="save">';
 
+$head=security_prepare_head();
+
+dol_fiche_head($head, 'audit', $langs->trans("Security"));
+
+
 $var=true;
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
@@ -109,14 +110,14 @@ foreach ($eventstolog as $key => $arr)
 }
 print '</table>';
 
-print '<br><center>';
+dol_fiche_end();
+
+print '<div class="center">';
 print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
-print "</center>";
+print "</div>";
 
 print "</form>\n";
 
-print '</div>';
-
-$db->close();
 
 llxFooter();
+$db->close();
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index d89b406280b..2efdfdd56ba 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -138,6 +138,35 @@ else if ($action == 'specimen')
 	}
 }
 
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+else if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 // Activate a model
 else if ($action == 'set')
 {
@@ -175,14 +204,6 @@ else if ($action == 'setmodel')
 {
 	dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity);
 }
-else if ($action=='setModuleOptions') {
-	if (dolibarr_set_const($db, "EXPEDITION_ADDON_PDF_ODT_PATH",GETPOST('value1'),'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->EXPEDITION_ADDON_PDF_ODT_PATH = GETPOST('value1');
-	}
-}
 
 
 /*
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 0b9534689d0..f23e80f78ff 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -105,7 +105,6 @@ if ($action == 'add' || GETPOST("modify"))
         if ($result1 && $result2)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
@@ -171,7 +170,6 @@ if ($_POST["delete"])
         if ($result1 && $result2)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: external_rss.php");
             exit;
         }
@@ -229,7 +227,7 @@ $sql ="SELECT rowid, file, note FROM ".MAIN_DB_PREFIX."boxes_def";
 $sql.=" WHERE file = 'box_external_rss.php'";
 $sql.=" ORDER BY note";
 
-dol_syslog("select rss boxes sql=".$sql,LOG_DEBUG);
+dol_syslog("select rss boxes", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 4ffef4053d4..a7692655a0a 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@capnetworks.com>
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2012-2013  Juanjo Menent				<jmenent@2byte.es>
+ * Copyright (C) 2014		Teddy Andreotti				<125155@supinfo.com>
  *
  * 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
@@ -261,6 +262,24 @@ if ($action == 'setforcedate')
     }
 }
 
+if ($action == 'set_FAC_AUTO_FILLJS')
+{
+	$freetext = GETPOST('FAC_AUTO_FILLJS');	// No alpha here, we want exact string
+
+	$res = dolibarr_set_const($db, "FAC_AUTO_FILLJS",$freetext,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+	if (! $error)
+	{
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 
 /*
  * View
@@ -277,7 +296,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
 print '<br>';
 
-$head = invoice_admin_prepare_head(null);
+$head = invoice_admin_prepare_head();
 dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice');
 
 /*
@@ -765,6 +784,20 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
+// Add js auto fill amount on paiement form
+$var=! $var;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+print '<input type="hidden" name="action" value="set_FAC_AUTO_FILLJS" />';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("JSOnPaimentBill");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("FAC_AUTO_FILLJS",$conf->global->FAC_AUTO_FILLJS,1);
+print '</td><td align="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print "</td></tr>\n";
+print '</form>';
+
 print '</table>';
 
 
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 8c5dd6585f7..2541a6265e7 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -15,7 +15,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 /**
@@ -120,7 +119,7 @@ $var=true;
 
 if (empty($conf->use_javascript_ajax))
 {
-    dol_htmloutput_errors('',array($langs->trans("NotAvailable"),$langs->trans("JavascriptDisabled")),1);
+	setEventMessage(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), 'errors');
 }
 else
 {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 37a3b2a5a5c..dad5f484a4d 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur          <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio          <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier               <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012 Regis Houssin                <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
  * Copyright (C) 2011-2013 Philippe Grand			    <philippe.grand@atoo-net.com>
@@ -113,6 +113,35 @@ else if ($action == 'specimen') // For fiche inter
 	}
 }
 
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 // Activate a model
 else if ($action == 'set')
 {
@@ -261,13 +290,13 @@ foreach ($dirmodels as $reldir)
 					require_once $dir.$file.'.php';
 
 					$module = new $file;
-					
+
 					if ($module->isEnabled())
 					{
 						// Show modules according to features level
 						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
-					
+
 						$var=!$var;
 						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
 						print $module->info();
@@ -372,78 +401,99 @@ foreach ($dirmodels as $reldir)
 		$handle=opendir($dir);
 		if (is_resource($handle))
 		{
-		    while (($file = readdir($handle))!==false)
-		    {
-		    	if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_')
+			while (($file = readdir($handle))!==false)
+			{
+				$filelist[]=$file;
+			}
+			closedir($handle);
+			arsort($filelist);
+
+			foreach($filelist as $file)
+			{
+				if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
 		    	{
-				    $var=!$var;
-
-		    		$name = substr($file, 4, dol_strlen($file) -16);
-		    		$classname = substr($file, 0, dol_strlen($file) -12);
-
-				    require_once $dir.'/'.$file;
-				    $module = new $classname($db);
-
-		    		print '<tr '.$bc[$var].'><td>';
-				    print (empty($module->name)?$name:$module->name);
-		    		print "</td><td>\n";
-		    		require_once $dir.$file;
-		    		$module = new $classname($db);
-		    		print $module->description;
-		    		print '</td>';
-
-		    		// Active
-		    		if (in_array($name, $def))
+		    		if (file_exists($dir.'/'.$file))
 		    		{
-		    			print "<td align=\"center\">\n";
-		    			print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-		    			print img_picto($langs->trans("Enabled"),'switch_on');
-		    			print '</a>';
-		    			print "</td>";
-		    		}
-		    		else
-		    		{
-		    			print "<td align=\"center\">\n";
-		    			print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-		    			print "</td>";
-		    		}
+		    			$var=!$var;
 
-		    		// Default
-		    		print "<td align=\"center\">";
-		    		if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
-		    		{
-		    			print img_picto($langs->trans("Default"),'on');
-		    		}
-		    		else
-		    		{
-		    			print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-		    		}
-		    		print '</td>';
+		    			$name = substr($file, 4, dol_strlen($file) -16);
+		    			$classname = substr($file, 0, dol_strlen($file) -12);
 
-		    		// Info
-		    		$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-		    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-		    		$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-		    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-		    		$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-		    		$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
-		    		$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
-		    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
-		    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
-		    		print '<td align="center">';
-		    		print $form->textwithpicto('',$htmltooltip,-1,0);
-		    		print '</td>';
-		    		
-		    		// Preview
-		    		$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'intervention').'</a>';
-		    		print '<td align="center">';
-		    		print $link;
-		    		print '</td>';
+		    			require_once $dir.'/'.$file;
+		    			$module = new $classname($db);
 
-		    		print '</tr>';
+		    			$modulequalified=1;
+		    			if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+		    			if ($modulequalified)
+		    			{
+		    				print '<tr '.$bc[$var].'><td width="100">';
+		    				print (empty($module->name)?$name:$module->name);
+		    				print "</td><td>\n";
+		    				if (method_exists($module,'info')) print $module->info($langs);
+		    				else print $module->description;
+		    				print '</td>';
+
+		    				// Active
+		    				if (in_array($name, $def))
+		    				{
+		    					print "<td align=\"center\">\n";
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+		    					print img_picto($langs->trans("Enabled"),'switch_on');
+		    					print '</a>';
+		    					print "</td>";
+		    				}
+		    				else
+		    				{
+		    					print "<td align=\"center\">\n";
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+		    					print "</td>";
+		    				}
+
+		    				// Default
+		    				print "<td align=\"center\">";
+		    				if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
+		    				{
+		    					print img_picto($langs->trans("Default"),'on');
+		    				}
+		    				else
+		    				{
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		    				}
+		    				print '</td>';
+
+		    				// Info
+		    				$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+		    				$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+		    				$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+		    				$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+		    				$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+		    				$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
+		    				$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
+		    				$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
+		    				$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
+		    				print '<td align="center">';
+		    				print $form->textwithpicto('',$htmltooltip,-1,0);
+		    				print '</td>';
+
+		    				// Preview
+		    				print '<td align="center">';
+		    				if ($module->type == 'pdf')
+		    				{
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'intervention').'</a>';
+		    				}
+		    				else
+		    				{
+		    					print img_object($langs->trans("PreviewNotAvailable"),'generic');
+		    				}
+		    				print '</td>';
+
+		    				print '</tr>';
+		    			}
+		    		}
 		    	}
 		    }
-		    closedir($handle);
 		}
 	}
 }
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 358bf486607..db0f9de94bb 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -59,6 +59,8 @@ if ($action == 'update')
 	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);
 
@@ -140,7 +142,7 @@ if ($action == 'edit')	// Edit
 	print '</table><br>'."\n";
 
     // Themes
-    show_theme('',1);
+    show_theme(null,1);
     print '<br>';
 
     // Liste des zone de recherche permanantes supportees
@@ -171,13 +173,13 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-	// Taille max des listes
+	// Max size of lists
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-    // Desactivation javascript et ajax
+    // Disable javascript and ajax
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
     print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
@@ -204,7 +206,23 @@ if ($action == 'edit')	// Edit
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
 
-    // Firstname/Name
+    // DefaultWorkingDays
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+    print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5').'">';
+    print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+
+    // DefaultWorkingHours
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+    print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="'.(isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18').'">';
+    print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+
+	// Firstname/Name
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
 	$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"),1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
@@ -305,7 +323,7 @@ else	// Show
 
 
 	// Themes
-    show_theme('',0);
+    show_theme(null,0);
     print '<br>';
 
 
@@ -360,6 +378,22 @@ else	// Show
     $var=!$var;
     print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("WeekStartOnDay").'</td><td>';
     print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'));
+    print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+
+    // DefaultWorkingDays
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingDays").'</td><td>';
+    print isset($conf->global->MAIN_DEFAULT_WORKING_DAYS)?$conf->global->MAIN_DEFAULT_WORKING_DAYS:'1-5';
+    print '</td>';
+	print '<td width="20">&nbsp;</td>';
+	print '</tr>';
+
+    // DefaultWorkingHours
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DefaultWorkingHours").'</td><td>';
+    print isset($conf->global->MAIN_DEFAULT_WORKING_HOURS)?$conf->global->MAIN_DEFAULT_WORKING_HOURS:'9-18';
     print '</td>';
 	print '<td width="20">&nbsp;</td>';
 	print '</tr>';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 386bc19ff73..32e5310a201 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -427,7 +427,7 @@ if (function_exists("ldap_connect"))
             }
             else
            {
-                $mesg='<div class="error">'.$ldap->error.'</div>';
+                setEventMessage($ldap->error, 'errors');
             }
 
 			print "<br>\n";
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 9c0bc80a25a..5896ffc5416 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -43,7 +43,7 @@ if ($action == 'update')
     || $_POST["MAIN_MAX_DECIMALS_SHOWN"] > $MAXDEC)
     {
         $error++;
-        $mesg='<div class="error">'.$langs->trans("ErrorDecimalLargerThanAreForbidden",$MAXDEC).'</div>';
+	    setEventMessage($langs->trans("ErrorDecimalLargerThanAreForbidden",$MAXDEC), 'errors');
     }
 
     if ($_POST["MAIN_MAX_DECIMALS_UNIT"]  < 0
@@ -52,7 +52,7 @@ if ($action == 'update')
     {
         $langs->load("errors");
         $error++;
-        $mesg='<div class="error">'.$langs->trans("ErrorNegativeValueNotAllowed").'</div>';
+	    setEventMessage($langs->trans("ErrorNegativeValueNotAllowed"), 'errors');
     }
 
     if ($_POST["MAIN_ROUNDING_RULE_TOT"])
@@ -61,7 +61,7 @@ if ($action == 'update')
         {
             $langs->load("errors");
             $error++;
-            $mesg='<div class="error">'.$langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT").'</div>';
+	        setEventMessage($langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT"), 'errors');
         }
     }
 
@@ -94,8 +94,6 @@ print_fiche_titre($langs->trans("LimitsSetup"),'','setup');
 print $langs->trans("LimitsDesc")."<br>\n";
 print "<br>\n";
 
-if ($mesg) print $mesg.'<br>';
-
 if ($action == 'edit')
 {
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -207,8 +205,8 @@ else
 	$vat_rates=array();
 
 	$sql="SELECT taux as vat_rate";
-	$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-	$sql.=" WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$mysoc->country_code."' AND taux <> 0";
+	$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+	$sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND t.taux <> 0";
 	$sql.=" ORDER BY t.taux ASC";
 	$resql=$db->query($sql);
 	if ($resql)
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 415bff261de..b591aa79c08 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011-2013 Philippe Grand       <philippe.grand@atoo-net.com>
  *
@@ -95,7 +95,7 @@ if ($action == 'specimen')
     $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
     foreach($dirmodels as $reldir)
     {
-        $file=dol_buildpath($reldir."core/modules/livraison/pdf/pdf_".$modele.".modules.php",0);
+        $file=dol_buildpath($reldir."core/modules/livraison/doc/pdf_".$modele.".modules.php",0);
         if (file_exists($file))
         {
             $filefound=1;
@@ -128,6 +128,35 @@ if ($action == 'specimen')
     }
 }
 
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 if ($action == 'set')
 {
     $ret = addDocumentModel($value, $type, $label, $scandir);
@@ -356,75 +385,101 @@ clearstatcache();
 $var=true;
 foreach ($dirmodels as $reldir)
 {
-    $dir = dol_buildpath($reldir."core/modules/livraison/pdf/");
+    $dir = dol_buildpath($reldir."core/modules/livraison/doc/");
 
     if (is_dir($dir))
     {
         $handle = opendir($dir);
         if (is_resource($handle))
         {
-            while (($file = readdir($handle))!==false)
-            {
-                if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_')
+        	while (($file = readdir($handle))!==false)
+			{
+				$filelist[]=$file;
+			}
+			closedir($handle);
+			arsort($filelist);
+
+			foreach($filelist as $file)
+			{
+                if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
                 {
-                    $name = substr($file, 4, dol_strlen($file) - 16);
-                    $classname = substr($file, 0, dol_strlen($file) - 12);
+                	if (file_exists($dir.'/'.$file))
+                	{
+                		$var=!$var;
 
-                    $var=!$var;
+		    			$name = substr($file, 4, dol_strlen($file) -16);
+		    			$classname = substr($file, 0, dol_strlen($file) -12);
 
-                    print '<tr '.$bc[$var].'><td>';
-                    print $name;
-                    print "</td><td>\n";
-                    require_once $dir.$file;
-                    $module = new $classname($db);
+		    			require_once $dir.'/'.$file;
+		    			$module = new $classname($db);
 
-                    print $module->description;
-                    print '</td>';
+		    			$modulequalified=1;
+		    			if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+		    			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
 
-                    // Activ
-                    if (in_array($name, $def))
-                    {
-                        print "<td align=\"center\">\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-                        print img_picto($langs->trans("Enabled"),'switch_on');
-                        print '</a>';
-                        print "</td>";
-                    }
-                    else
-                    {
-                        print "<td align=\"center\">\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-                        print "</td>";
-                    }
+		    			if ($modulequalified)
+		    			{
+		    				print '<tr '.$bc[$var].'><td width="100">';
+		    				print (empty($module->name)?$name:$module->name);
+		    				print "</td><td>\n";
+		    				if (method_exists($module,'info')) print $module->info($langs);
+		    				else print $module->description;
+		    				print '</td>';
 
-                    // Default
-                    print "<td align=\"center\">";
-                    if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
-                    {
-                        print img_picto($langs->trans("Default"),'on');
-                    }
-                    else
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-                    }
-                    print '</td>';
+		    				// Active
+		    				if (in_array($name, $def))
+		    				{
+		    					print "<td align=\"center\">\n";
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+		    					print img_picto($langs->trans("Enabled"),'switch_on');
+		    					print '</a>';
+		    					print "</td>";
+		    				}
+		    				else
+		    				{
+		    					print "<td align=\"center\">\n";
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+		    					print "</td>";
+		    				}
 
-                    // Info
-                    $htmltooltip =    ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-                    $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-                    $htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
-                    $htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-                    print '<td align="center">';
-                    print $form->textwithpicto('',$htmltooltip,1,0);
-                    print '</td>';
-                    print '<td align="center">';
-                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'sending').'</a>';
-                    print '</td>';
+		    				// Default
+		    				print "<td align=\"center\">";
+		    				if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
+		    				{
+		    					print img_picto($langs->trans("Default"),'on');
+		    				}
+		    				else
+		    				{
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		    				}
+		    				print '</td>';
 
-                    print '</tr>';
+		    				// Info
+		    				$htmltooltip =    ''.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+		    				$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+		    				$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").'</u>:';
+		    				$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+		    				print '<td align="center">';
+		    				print $form->textwithpicto('',$htmltooltip,1,0);
+		    				print '</td>';
+
+		    				// Preview
+		    				print '<td align="center">';
+		    				if ($module->type == 'pdf')
+		    				{
+		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'sending').'</a>';
+		    				}
+		    				else
+		    				{
+		    					print img_object($langs->trans("PreviewNotAvailable"),'generic');
+		    				}
+		    				print '</td>';
+
+		    				print '</tr>';
+		    			}
+                	}
                 }
             }
-            closedir($handle);
         }
     }
 }
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 78ce79c4912..61914d1a09c 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -653,9 +653,13 @@ else
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>';
 		else
 		{
-			print '<div class="error">'.$langs->trans("ServerNotAvailableOnIPOrPort",$server,$port);
-			if ($mail->error) print ' - '.$mail->error;
-			print '</div>';
+			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort",$server,$port);
+
+			if ($mail->error) {
+				$errormsg .= ' - '.$mail->error;
+			}
+
+			setEventMessage($errormsg, 'errors');
 		}
 		print '<br>';
 	}
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index b09b524b435..6dfefd14feb 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');
 
@@ -49,8 +48,6 @@ foreach($dirmenus as $dirmenu)
 }
 
 $error=0;
-$errmsgs=array();
-
 
 // Cette page peut etre longue. On augmente le delai autorise.
 // Ne fonctionne que si on est pas en safe_mode.
@@ -105,7 +102,8 @@ if ($action == 'update' && empty($_POST["cancel"]))
 				else
 				{
 					$error++;
-					$errmsgs[]='Failed to initialize menu '.$key.'.';
+					//TODO: Translate
+					setEventMessage('Failed to initialize menu '.$key.'.', 'errors');
 					$db->rollback();
 				}
 			}
@@ -268,10 +266,6 @@ else
 
 print '</div>';
 
-
-dol_htmloutput_errors('',$errmsgs);
-
-
 if ($action != 'edit')
 {
 	print '<div class="tabsAction">';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 353cf3eaabe..ff015884bbc 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -39,7 +39,6 @@ $dirsmartphone = "/core/menus/smartphone";
 $dirmenu = array($dirstandard,$dirsmartphone);
 
 $action=GETPOST('action');
-$mesg=GETPOST('mesg');
 
 $menu_handler_top=$conf->global->MAIN_MENU_STANDARD;
 $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
@@ -79,16 +78,16 @@ if ($action == 'update')
             $result=$menu->update($user);
             if ($result > 0)
             {
-                $mesg='<div class="ok">'.$langs->trans("RecordModifiedSuccessfully").'</div>';
+	            setEventMessage($langs->trans("RecordModifiedSuccessfully"));
             }
             else
             {
-                $mesg='<div class="error">'.$menu->error.'</div>';
+	            setEventMessage($menu->error, 'errors');
             }
         }
         else
         {
-            $mesg='<div class="error">'.$menu->error.'</div>';
+	        setEventMessage($menu->error, 'errors');
         }
         $_GET["menuId"] = $_POST['menuId'];
         $action = "edit";
@@ -136,37 +135,37 @@ if ($action == 'add')
     $error=0;
     if (! $error && ! $_POST['menu_handler'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("MenuHandler")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("MenuHandler")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && ! $_POST['type'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && ! $_POST['url'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Url")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Url")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && ! $_POST['titre'])
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Title")), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && $_POST['menuId'] && $_POST['type'] == 'top')
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorTopMenuMustHaveAParentWithId0").'</div>';
+	    setEventMessage($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), 'errors');
         $action = 'create';
         $error++;
     }
     if (! $error && empty($_POST['menuId']) && $_POST['type'] == 'left')
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorLeftMenuMustHaveAParentId").'</div>';
+	    setEventMessage($langs->trans("ErrorLeftMenuMustHaveAParentId"), 'errors');
         $action = 'create';
         $error++;
     }
@@ -205,7 +204,7 @@ if ($action == 'add')
         else
         {
             $action = 'create';
-            $mesg='<div class="error">'.$menu->error.'</div>';
+	        setEventMessage($menu->error, 'errors');
         }
     }
 }
@@ -223,7 +222,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes')
         $this->db->commit();
 
         llxHeader();
-        print '<div class="ok">'.$langs->trans("MenuDeleted").'</div>';
+	    setEventMessage($langs->trans("MenuDeleted"));
         llxFooter();
         exit ;
     }
@@ -375,8 +374,6 @@ if ($action == 'create')
     print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
 
     print '</form>';
-
-    dol_htmloutput_mesg($mesg);
 }
 elseif ($action == 'edit')
 {
@@ -463,8 +460,6 @@ elseif ($action == 'edit')
     print '</form>';
 
     print '<br>';
-
-    dol_htmloutput_mesg($mesg);
 }
 
 
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index e598afe07a3..d7fce1c937d 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -43,7 +43,6 @@ foreach($dirmenus as $dirmenu)
 
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');
-$mesg=GETPOST('mesg');
 
 $menu_handler_top=$conf->global->MAIN_MENU_STANDARD;
 $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
@@ -187,7 +186,9 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		$db->commit();
 
-		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler.'&mesg='.urlencode($langs->trans("MenuDeleted")));
+		setEventMessage($langs->trans("MenuDeleted"));
+
+		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);
 		exit ;
 	}
 	else
@@ -216,9 +217,6 @@ llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss);
 print_fiche_titre($langs->trans("Menus"),'','setup');
 
 
-dol_htmloutput_mesg($mesg);
-
-
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT."/admin/menus.php";
@@ -304,7 +302,6 @@ if ($conf->use_javascript_ajax)
 	$sql.= " AND fk_menu >= 0";
 	$sql.= " ORDER BY m.position, m.rowid";		// Order is position then rowid (because we need a sort criteria when position is same)
 
-	dol_syslog("sql=".$sql);
 	$res  = $db->query($sql);
 	if ($res)
 	{
@@ -327,8 +324,9 @@ if ($conf->use_javascript_ajax)
 						'<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.$titre.'</a></strong>'.
 						'</td><td align="right">'.
 						'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.img_edit('default',0,'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> '.
-						'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default',0,'class="menuNew" id="new'.$menu['rowid'].'"').'</a> '.
-						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default',0,'class="menuDel" id="del'.$menu['rowid'].'"').'</a> '.
+						'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> '.
+						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> '.
+						'&nbsp; &nbsp; &nbsp;'.
 						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Monter","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Descendre","1downarrow").'</a>'.
 						'</td></tr></table>'
 			);
@@ -361,7 +359,7 @@ if ($conf->use_javascript_ajax)
 else
 {
 	$langs->load("errors");
-	print '<div class="error">'.$langs->trans("ErrorFeatureNeedJavascript").'</div>';
+	setEventMessage($langs->trans("ErrorFeatureNeedJavascript"), 'errors');
 }
 
 print '<br>';
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 "<tr ".$bc[$var].">\n";
     $url='http://www.dolistore.com';
-    print '<td align="left"><a href="'.$url.'" target="_blank"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
+    print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
     print '<td>'.$langs->trans("DoliStoreDesc").'</td>';
-    print '<td><a href="'.$url.'" target="_blank">'.$url.'</a></td>';
+    print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
     print '</tr>';
 
+    $var=!$var;
+    print "<tr ".$bc[$var].">\n";
+    $url='http://partners.dolibarr.org';
+    print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" width="180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
+    print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
+    print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
+    print '</tr>';
 
     print "</table>\n";
 }
@@ -534,7 +541,7 @@ dol_fiche_end();
 
 
 // Show warning about external users
-if ($mode != 'marketplace') print '<div class="info">'.showModulesExludedForExternal($modules).'</div><br>'."\n";
+if ($mode != 'marketplace') print info_admin(showModulesExludedForExternal($modules))."\n";
 
 
 llxFooter();
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index ca68c54c805..14aeba65c29 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -32,6 +32,7 @@ $langs->load("other");
 $langs->load("orders");
 $langs->load("propal");
 $langs->load("bills");
+$langs->load("errors");
 
 // Security check
 if (!$user->admin)
@@ -39,19 +40,32 @@ if (!$user->admin)
 
 $action = GETPOST("action");
 
+
 /*
  * Actions
  */
 
 if ($action == 'setvalue' && $user->admin)
 {
-	$result=dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM",$_POST["email_from"],'chaine',0,'',$conf->entity);
-  	if ($result >= 0)
+	$result=dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", $_POST["email_from"], 'chaine', 0, '', $conf->entity);
+    if ($result < 0) $error++;
+
+    if (! $error)
+    {
+	    foreach($_POST as $key => $val)
+	    {
+	    	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_/',$key)) continue;
+	    	//print $key.' - '.$val.'<br>';
+			$result=dolibarr_set_const($db, $key, $val, 'chaine', 0, '', $conf->entity);
+	    }
+    }
+
+  	if (! $error)
     {
         setEventMessage($langs->trans("SetupSaved"));
     }
     else
-    {
+	{
         setEventMessage($langs->trans("Error"),'errors');
     }
 }
@@ -67,7 +81,7 @@ llxHeader();
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("NotificationSetup"),$linkback,'setup');
 
-print $langs->trans("NotificationsDesc").'<br><br>';	
+print $langs->trans("NotificationsDesc").'<br><br>';
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -83,19 +97,13 @@ print "</tr>\n";
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("NotificationEMailFrom").'</td><td>';
-print '<input size="32" type="text" name="email_from" value="'.$conf->global->NOTIFICATION_EMAIL_FROM.'">';
-if (! empty($conf->global->NOTIFICATION_EMAIL_FROM) && ! isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail"));
+print '<input size="32" type="email" name="email_from" value="'.$conf->global->NOTIFICATION_EMAIL_FROM.'">';
+if (! empty($conf->global->NOTIFICATION_EMAIL_FROM) && ! isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) print ' '.img_warning($langs->trans("ErrorBadEMail"));
 print '</td></tr>';
 print '</table>';
 
 print '<br>';
 
-print '<center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center>';
-
-print '</form>';
-print '<br>';
-
-
 print_fiche_titre($langs->trans("ListOfAvailableNotifications"),'','');
 
 print '<table class="noborder" width="100%">';
@@ -103,6 +111,7 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Module").'</td>';
 print '<td>'.$langs->trans("Code").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("FixedEmailTarget").'</td>';
 print "</tr>\n";
 
 // Load array of available notifications
@@ -123,10 +132,21 @@ foreach($listofnotifiedevents as $notifiedevent)
     print '<td>'.$elementLabel.'</td>';
     print '<td>'.$notifiedevent['code'].'</td>';
     print '<td>'.$label.'</td>';
+    $param='NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'];
+    print '<td><input type="email" size="32" name="'.$param.'" value="'.dol_escape_htmltag(GETPOST($param)?GETPOST($param,'alpha'):$conf->global->$param).'">';
+	if (! empty($conf->global->$param) && ! isValidEmail($conf->global->$param)) print ' '.img_warning($langs->trans("ErrorBadEMail"));
+    print '</td>';
     print '</tr>';
 }
 print '</table>';
 
-$db->close();
+print '<br>';
+
+print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"></center>';
+
+print '</form>';
+
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 1169c699203..81b7e74a479 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -42,7 +42,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -73,7 +73,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
 print "<br>\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 794cc1b890a..515714a51e4 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -43,7 +43,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -74,7 +74,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
 print "<br>\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/osc-languages.php b/htdocs/admin/osc-languages.php
deleted file mode 100644
index 804c72f2850..00000000000
--- a/htdocs/admin/osc-languages.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file 		htdocs/admin/osc-languages.php
- * \ingroup    	boutique
- * \brief      	Page d'administration/configuration du module Boutique
- */
-
-require '../main.inc.php';
-
-$langs->load("admin");
-
-if (!$user->admin)
-accessforbidden();
-
-
-llxHeader();
-
-
-if (! dol_strlen(OSC_DB_NAME))
-{
-	print "Non dispo";
-	llxFooter();
-}
-
-if ($sortfield == "") {
-	$sortfield="lower(p.label),p.price";
-}
-if ($sortorder == "") {
-	$sortorder="ASC";
-}
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-
-print_barre_liste("Liste des langues oscommerce", $page, "osc-languages.php");
-
-$sql = "SELECT l.languages_id, l.name, l.code FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."languages as l";
-$sql.= $db->plimit($limit, $offset);
-
-print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-print "<tr class=\"liste_titre\">";
-print "<td>id</td>";
-print "<td>Name</td>";
-print "<td>Code</td>";
-print "</TR>\n";
-
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$var=True;
-	while ($i < $num) {
-		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		print "<TD>$objp->languages_id</TD>\n";
-		print "<TD>$objp->name</TD>\n";
-		print "<TD>$objp->code</TD>\n";
-		print "</TR>\n";
-		$i++;
-	}
-	$db->free();
-}
-
-print "</TABLE>";
-
-
-$db->close();
-
-llxFooter();
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).'<br>'."\n";
+print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
 print "<br>\n";
 
 
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 2247df9493e..3bff5c29118 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -55,7 +55,7 @@ if ($action == "set")
     if (! $res > 0) $error++;
 
     $id=GETPOST('PRELEVEMENT_ID_BANKACCOUNT','int');
-    $account = new Account($db, $id);
+    $account = new Account($db);
 
     if($account->fetch($id)>0)
     {
@@ -153,7 +153,7 @@ print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEME
 print '</td></tr>';
 
 // ICS
-print '<tr class="impair"><td>'.$langs->trans("ICS").'</td>';
+print '<tr class="pair"><td>'.$langs->trans("ICS").'</td>';
 print '<td align="left">';
 print '<input type="text" name="PRELEVEMENT_ICS" value="'.$conf->global->PRELEVEMENT_ICS.'" size="9" ></td>';
 print '</td></tr>';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 5503a906af2..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')
 {
@@ -171,28 +187,27 @@ if ($action == 'setModuleOptions')
 	$db->begin();
 
 	for($i=0;$i < $post_size;$i++)
-    {
-    	if (array_key_exists('param'.$i,$_POST))
-    	{
-    		$param=GETPOST("param".$i,'alpha');
-    		$value=GETPOST("value".$i,'alpha');
-    		if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-	    	if (! $res > 0) $error++;
-    	}
-    }
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
 	if (! $error)
-    {
-        $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        $db->rollback();
-        setEventMessage($langs->trans("Error"),'errors');
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessage($langs->trans("Error"),'errors');
 	}
 }
 
-
 // Activate a model
 if ($action == 'set')
 {
@@ -248,7 +263,7 @@ $form=new Form($db);
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 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');
 
@@ -583,6 +598,35 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
+if ($conf->banque->enabled)
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp</td><td align="right">';
+    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 '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+        }
+        else
+        {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+        }
+    }
+    print '</td></tr>';
+}
+else
+{
+    $var=!$var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+}
+
 print '</table>';
 
 
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")."<br>\n";
 print "<br>\n";
 
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_proxy">';
+
+
 $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 '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="set_proxy">';
-
 print '<table width="100%" class="noborder">';
 
 print '<tr class="liste_titre">';
@@ -196,14 +199,13 @@ print '</tr>';
 
 print '</table>';
 
-print '<br><center>';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</center>';
-
-print '</form>';
-
 dol_fiche_end();
 
+print '<div class="center">';
+print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
+print '</div>';
+
+print '</form>';
 
 $db->close();
 
diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php
new file mode 100644
index 00000000000..99651a4f4f3
--- /dev/null
+++ b/htdocs/admin/salaries.php
@@ -0,0 +1,118 @@
+<?php
+/* Copyright (C) 2014		Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * \file		htdocs/admin/salaries.php
+ * \ingroup		Salaries
+ * \brief		Setup page to configure salaries module
+ */
+
+require '../main.inc.php';
+
+// Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load("salaries");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+$action = GETPOST('action', 'alpha');
+
+// Other parameters SALARIES_*
+$list = array (
+		'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
+		'SALARIES_ACCOUNTING_ACCOUNT_CHARGE'
+);
+
+/*
+ * Actions
+ */
+
+if ($action == 'update')
+{
+    $error = 0;
+
+    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
+    {
+        setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('SalariesSetup'));
+
+$form = new Form($db);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans('SalariesSetup'),$linkback,'setup');
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+
+/*
+ *  Params
+ */
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="3">' . $langs->trans('Options') . '</td>';
+print "</tr>\n";
+
+foreach ($list as $key)
+{
+	$var=!$var;
+
+	print '<tr '.$bc[$var].' class="value">';
+
+	// Param
+	$label = $langs->trans($key);
+	print '<td><label for="'.$key.'">'.$label.'</label></td>';
+
+	// Value
+	print '<td>';
+	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td></tr>';
+}
+
+print '</tr>';
+
+print '</form>';
+print "</table>\n";
+
+print '<br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 43ccef1e954..adb590ffcd2 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -165,6 +165,16 @@ else if ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 	exit;
 }
 
+if ($action == 'maj_pattern')
+{
+	dolibarr_set_const($db, "USER_PASSWORD_PATTERN", GETPOST("pattern"),'chaine',0,'',$conf->entity);
+	header("Location: security.php");
+	exit;
+}
+
+
+
+
 
 
 
@@ -265,6 +275,113 @@ foreach ($arrayhandler as $key => $module)
 print '</table>';
 print '</form>';
 
+//if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
+// Patter for Password Perso
+if ($conf->global->USER_PASSWORD_GENERATED == "Perso"){
+$var=!$var;
+
+	$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+	/*$this->length2 = $tabConf[0];
+	$this->NbMaj = $tabConf[1];
+	$this->NbNum = $tabConf[2];
+	$this->NbSpe = $tabConf[3];
+	$this->NbRepeat = $tabConf[4];
+	$this->WithoutAmbi = $tabConf[5];
+	*/
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="3"> '.$langs->trans("PasswordPatternDesc").'</td>';
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td>' . $langs->trans("MinLength")."</td>";
+	print '<td colspan="2"><input type="number" value="'.$tabConf[0].'" id="minlenght" min="1"></td>';
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td>' . $langs->trans("NbMajMin")."</td>";
+	print '<td colspan="2"><input type="number" value="'.$tabConf[1].'" id="NbMajMin" min="0"></td>';
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td>' . $langs->trans("NbNumMin")."</td>";
+	print '<td colspan="2"><input type="number" value="'.$tabConf[2].'" id="NbNumMin" min="0"></td>';
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td>' . $langs->trans("NbSpeMin")."</td>";
+	print '<td colspan="2"><input type="number" value="'.$tabConf[3].'" id="NbSpeMin" min="0"></td>';
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td>' . $langs->trans("NbIteConsecutive")."</td>";
+	print '<td colspan="2"><input type="number" value="'.$tabConf[4].'" id="NbIteConsecutive" min="0"></td>';
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td>' . $langs->trans("NoAmbiCaracAutoGeneration")."</td>";
+	print '<td colspan="2"><input type="checkbox" id="NoAmbiCaracAutoGeneration" '.($tabConf[5] ? "checked" : "").' min="0"> <span id="textcheckbox">'.($tabConf[5] ? $langs->trans("Activated") : $langs->trans("Disabled")).'</span></td>';
+	print '</tr>';
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	print '<td colspan="2"></td><td width="103" align="center"><a id="linkChangePattern">'.$langs->trans("Save").'</a></td>';
+	print '</tr>';
+	print '</table>';
+
+	print '<script type="text/javascript">';
+	print '	function getStringArg(){';
+	print '		var pattern = "";';
+	print '		pattern += $("#minlenght").val() + ";";';
+	print '		pattern += $("#NbMajMin").val() + ";";';
+	print '		pattern += $("#NbNumMin").val() + ";";';
+	print '		pattern += $("#NbSpeMin").val() + ";";';
+	print '		pattern += $("#NbIteConsecutive").val() + ";";';
+	print '		pattern += $("#NoAmbiCaracAutoGeneration")[0].checked ? "1" : "0";';
+	print '		return pattern;';
+	print '	}';
+
+	print '	function valuePossible(){';
+	print '		var length = parseInt($("#minlenght").val());';
+	print '		var length_mini = parseInt($("#NbMajMin").val()) + parseInt($("#NbNumMin").val()) + parseInt($("#NbSpeMin").val());';
+	print '		return length >= length_mini;';
+	print '	}';
+
+	print '	function generatelink(){';
+	print '		return "security.php?action=maj_pattern&pattern="+getStringArg();';
+	print '	}';
+
+	print '	function valuePatternChange(){';
+	print '		var lang_save = "'.$langs->trans("Save").'";';
+	print '		var lang_error = "'.$langs->trans("Error").'";';
+	print '		var lang_Disabled = "'.$langs->trans("Disabled").'";';
+	print '		var lang_Activated = "'.$langs->trans("Activated").'";';
+	print '		$("#textcheckbox").html($("#NoAmbiCaracAutoGeneration")[0].checked ? unescape(lang_Activated) : unescape(lang_Disabled));';
+	print '		if(valuePossible()){';
+	print '			$("#linkChangePattern").attr("href",generatelink()).text(lang_save);';
+	print '		}';
+	print '		else{';
+	print '			$("#linkChangePattern").attr("href", null).text(lang_error);';
+	print '		}';
+	print '	}';
+
+	print '	$("#minlenght").change(function(){valuePatternChange();});';
+	print '	$("#NbMajMin").change(function(){valuePatternChange();});';
+	print '	$("#NbNumMin").change(function(){valuePatternChange();});';
+	print '	$("#NbSpeMin").change(function(){valuePatternChange();});';
+	print '	$("#NbIteConsecutive").change(function(){valuePatternChange();});';
+	print '	$("#NoAmbiCaracAutoGeneration").change(function(){valuePatternChange();});';
+
+	print '</script>';
+}
+
+
 // Cryptage mot de passe
 print '<br>';
 $var=true;
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 54bc933374c..c7ad04c322c 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -80,32 +80,19 @@ 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"));
+	$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);
+	$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 ($res1 && $res2 && $res3 && $res4 && $res5 && $res6) setEventMessage($langs->trans("RecordModifiedSuccessfully"));
 }
 
+
+
 // Delete file
 else if ($action == 'delete')
 {
@@ -131,42 +118,17 @@ print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 print $langs->trans("MiscellaneousDesc")."<br>\n";
 print "<br>\n";
 
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="updateform">';
+
 $head=security_prepare_head();
 
 dol_fiche_head($head, 'misc', $langs->trans("Security"));
 
 
-// Timeout
-$var=true;
-
-print '<table width="100%" class="noborder">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
-print '<td>'.$langs->trans("Value").'</td>';
-print '<td width="100">&nbsp;</td>';
-print "</tr>\n";
-
-$var=!$var;
-$sessiontimeout=ini_get("session.gc_maxlifetime");
-if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout;
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_SESSION_TIMEOUT" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("SessionTimeOut").'</td><td align="right">';
-print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
-print '</td>';
-print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_SESSION_TIMEOUT" type="text" size="6" value="'.htmlentities($conf->global->MAIN_SESSION_TIMEOUT).'"> '.strtolower($langs->trans("Seconds"));
-print '</td>';
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
-print '</tr></form>';
-
-print '</table>';
-
-print '<br>';
-
 
 // Other Options
 $var=true;
@@ -231,6 +193,44 @@ print "</td></tr>";
 
 print '</table>';
 
+
+print '<br>';
+
+
+// Timeout
+$var=true;
+
+print '<table width="100%" class="noborder">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+$var=!$var;
+$sessiontimeout=ini_get("session.gc_maxlifetime");
+if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("SessionTimeOut").'</td><td align="right">';
+print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat" name="MAIN_SESSION_TIMEOUT" type="text" size="6" value="'.htmlentities($conf->global->MAIN_SESSION_TIMEOUT).'"> '.strtolower($langs->trans("Seconds"));
+print '</td>';
+print '</tr>';
+
+$var=!$var;
+$sessiontimeout=ini_get("session.gc_maxlifetime");
+if (empty($conf->global->MAIN_APPLICATION_TITLE)) $conf->global->MAIN_APPLICATION_TITLE="";
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("MAIN_APPLICATION_TITLE").'</td><td align="right">';
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat" name="MAIN_APPLICATION_TITLE" type="text" size="20" value="'.htmlentities($conf->global->MAIN_APPLICATION_TITLE).'"> ';
+print '</td>';
+print '</tr>';
+
+print '</table>';
+
 print '<br>';
 
 // Upload options
@@ -240,11 +240,8 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
-print '<td width="100">&nbsp;</td>';
 print '</tr>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_UPLOAD_DOC" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].'>';
 print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
 $max=@ini_get('upload_max_filesize');
@@ -254,14 +251,9 @@ print '</td>';
 print '<td class="nowrap">';
 print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UPLOAD_DOC).'"> '.$langs->trans("Kb");
 print '</td>';
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
-print '</tr></form>';
+print '</tr>';
 
 $var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_UMASK" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].'>';
 print '<td>'.$langs->trans("UMask").'</td><td align="right">';
 print $form->textwithpicto('',$langs->trans("UMaskExplanation"));
@@ -269,15 +261,10 @@ print '</td>';
 print '<td class="nowrap">';
 print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UMASK).'">';
 print '</td>';
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
-print '</tr></form>';
+print '</tr>';
 
 // Use anti virus
 $var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_ANTIVIRUS_COMMAND" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<tr ".$bc[$var].">";
 print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
 print $langs->trans("AntiVirusCommandExample");
@@ -297,16 +284,10 @@ if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 }
 print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_COMMAND):'').'">';
 print "</td>";
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
 print '</tr>';
-print '</form>';
 
 // Use anti virus
 $var=!$var;
-print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_ANTIVIRUS_PARAM" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<tr ".$bc[$var].">";
 print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
 print $langs->trans("AntiVirusParamExample");
@@ -314,16 +295,18 @@ print '</td>';
 print '<td>';
 print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" size="72" value="'.(! empty($conf->global->MAIN_ANTIVIRUS_PARAM)?dol_htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM):'').'">';
 print "</td>";
-print '<td align="right">';
-print '<input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'">';
-print '</td>';
 print '</tr>';
-print '</form>';
 
 print '</table>';
 
 dol_fiche_end();
 
+print '<div class="center"><input type="submit" class="button" name="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
+
+
+
 // Form to test upload
 print '<br>';
 $formfile=new FormFile($db);
@@ -333,6 +316,5 @@ $formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestF
 $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/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 3cc9e70ca31..6b2c626da39 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -113,35 +113,20 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup');
 
 $form=new Form($db);
-$var=true;
-print '<table class="noborder" width="100%">';
 
-print '<tr class="liste_titre">';
-print "  <td>".$langs->trans("Parameters")."</td>\n";
-print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
-print '</tr>'."\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 "<tr ".$bc[$var].">";
-print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
-
-print '<td width="160" align="right">';
-print "<form method=\"post\" action=\"stock.php\">";
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
-print $form->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print '</form>';
-print "</td>\n";
-print "</tr>\n";
-print '<br>';
-print '</table>';
-print '<br>';
+//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 '<table class="noborder" width="100%">';
@@ -160,8 +145,8 @@ if (! empty($conf->facture->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_BILL\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -174,8 +159,8 @@ if (! empty($conf->commande->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_VALIDATE_ORDER\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -188,11 +173,12 @@ if (! empty($conf->expedition->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SHIPMENT\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 print '</table>';
+
 print '<br>';
 
 // Title rule for stock increase
@@ -212,8 +198,8 @@ if (! empty($conf->fournisseur->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_BILL\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -226,8 +212,8 @@ if (! empty($conf->fournisseur->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 if (! empty($conf->fournisseur->enabled))
@@ -239,8 +225,8 @@ if (! empty($conf->fournisseur->enabled))
 	print "<form method=\"post\" action=\"stock.php\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER\">";
-	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1,$disabled);
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"'.$disabled.'>';
 	print "</form>\n</td>\n</tr>\n";
 }
 
@@ -330,6 +316,33 @@ if ($virtualdiffersfromphysical)
 }
 
 
+$var=true;
+print '<table class="noborder" width="100%">';
+
+print '<tr class="liste_titre">';
+print "  <td>".$langs->trans("Other")."</td>\n";
+print "  <td align=\"right\" width=\"160\">&nbsp;</td>\n";
+print '</tr>'."\n";
+
+$var=!$var;
+
+print "<tr ".$bc[$var].">";
+print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
+
+print '<td width="160" align="right">';
+print "<form method=\"post\" action=\"stock.php\">";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
+print $form->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</form>';
+print "</td>\n";
+print "</tr>\n";
+print '<br>';
+print '</table>';
+print '<br>';
+
+
 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 "<br>";
 
-$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 "<br>";
 
-$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 85131440646..79dc0637b46 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -44,7 +44,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -75,7 +75,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
 print "<br>\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 9cb2dc65880..96e20b92f17 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -42,7 +42,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -73,7 +73,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("SuppliersSetup"),$linkback,'setup');
 print "<br>\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)."<br>\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 '<tr '.$bc[$var].'>';
@@ -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 "</table>\n";
 print "</form>\n";
 
-print '<br>';
+print '<br>'."\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 '</ul>';
 
 print $langs->trans("Developpers").':';
 print '<ul>';
-print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="http://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank">http://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
-print '<li>'.$langs->trans("DoliForge").': <a href="http://www.doliforge.org" target="_blank">http://wwww.doliforge.org</a></li>';
+print '<li>'.$langs->trans("SeeWikiForAllTeam").': <a href="http://wiki.dolibarr.org/index.php/Dolibarr_Project" target="_blank" rel="external">http://wiki.dolibarr.org/index.php/Dolibarr_Project</a></li>';
+print '<li>'.$langs->trans("DoliForge").': <a href="http://www.doliforge.org" target="_blank" rel="external">http://wwww.doliforge.org</a></li>';
 print '</ul>';
 
 //print "<br>\n";
@@ -61,31 +61,31 @@ print $langs->trans("OtherInformations").':';
 
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="http://www.dolibarr.org/">'.$langs->trans("OfficialWebSite").'</a>';
+print '<a target="_blank" href="http://www.dolibarr.org/" rel="external">'.$langs->trans("OfficialWebSite").'</a>';
 print '</li>';
 // If the French language, it displays French website
 if (preg_match('/^fr_/i',$langs->getDefaultLang()))
 {
 	print '<li>';
-	print '<a target="_blank" href="http://www.dolibarr.fr/">'.$langs->trans("OfficialWebSiteFr").'</a>';
+	print '<a target="_blank" href="http://www.dolibarr.fr/" rel="external">'.$langs->trans("OfficialWebSiteFr").'</a>';
 	print '</li>';
 }
 print '<li>';
-print '<a target="_blank" href="http://wiki.dolibarr.org/">'.$langs->trans("OfficialWiki").'</a>';
+print '<a target="_blank" href="http://wiki.dolibarr.org/" rel="external">'.$langs->trans("OfficialWiki").'</a>';
 print '</li>';
 print '</ul>';
 
 print $langs->trans("Demo").':';
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="http://www.dolibarr.org/onlinedemo/">'.$langs->trans("OfficialDemo").'</a>';
+print '<a target="_blank" href="http://www.dolibarr.org/onlinedemo/" rel="external">'.$langs->trans("OfficialDemo").'</a>';
 print '</li>';
 print '</ul>';
 
 print $langs->trans("ModulesMarketPlaces").':';
 print '<ul>';
 print '<li>';
-print '<a target="_blank" href="http://www.dolistore.com">'.$langs->trans("OfficialMarketPlace").'</a>';
+print '<a target="_blank" href="http://www.dolistore.com" rel="external">'.$langs->trans("OfficialMarketPlace").'</a>';
 print '</li>';
 print '</ul>';
 
@@ -94,7 +94,7 @@ print $langs->trans("HelpCenter").':';
 print '<ul>';
 print '<li>';
 //print $langs->trans("SeeWikiPage",'http://wiki.dolibarr.org/index.php/List_of_OpenSource_Software_companies_and_freelancers');
-print '<a target="_blank" href="'.DOL_URL_ROOT.'/support/index.php">'.$langs->trans("HelpCenter").'</a>';
+print '<a target="_blank" href="'.DOL_URL_ROOT.'/support/index.php" data-ajax="false">'.$langs->trans("HelpCenter").'</a>';
 print '</li>';
 print '</ul>';
 
@@ -104,11 +104,11 @@ print '<ul>';
 $url='http://wiki.dolibarr.org/index.php/Subscribe';
 if (preg_match('/^fr_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Adh%C3%A9rer';
 if (preg_match('/^es_/i',$langs->getDefaultLang())) $url='http://wiki.dolibarr.org/index.php/Subscribirse';
-print '<li><a href="'.$url.'" target="_blank">'.$langs->trans("SubscribeToFoundation").'</a></li>';
+print '<li><a href="'.$url.'" target="_blank" rel="external">'.$langs->trans("SubscribeToFoundation").'</a></li>';
 
-print '<li><a href="http://facebook.com/dolibarr" target="_blank">FaceBook</a></li>';
-print '<li><a href="http://twitter.com/dolibarr" target="_blank">Twitter</a></li>';
-print '<li><a href="http://plus.google.com/+DolibarrOrg" target="_blank">Google Plus page</a></li>';
+print '<li><a href="http://facebook.com/dolibarr" target="_blank" rel="external">FaceBook</a></li>';
+print '<li><a href="http://twitter.com/dolibarr" target="_blank" rel="external">Twitter</a></li>';
+print '<li><a href="http://plus.google.com/+DolibarrOrg" target="_blank" rel="external">Google Plus page</a></li>';
 
 print '</ul>';
 
@@ -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 '<li>';
-print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
+print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
 print '</li>';
 $url='http://partners.dolibarr.org'; $title=$langs->trans("ReferencedPreferredPartners");
 print '<li>';
-print '<a target="_blank" href="'.$url.'">'.$title.'</a>';
+print '<a target="_blank" href="'.$url.'" rel="external">'.$title.'</a>';
 print '</li>';
 
 print '</ul>';
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
new file mode 100644
index 00000000000..58601c6e998
--- /dev/null
+++ b/htdocs/admin/system/browser.php
@@ -0,0 +1,80 @@
+<?php
+/* Copyright (C) 2005-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2007		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2007-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/system/browser.php
+ *  \brief      Page to show Dolibarr informations
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+$langs->load("admin");
+$langs->load("install");
+$langs->load("other");
+
+if (! $user->admin)
+	accessforbidden();
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+llxHeader();
+
+print_fiche_titre($langs->trans("InfoBrowser"),'','setup');
+
+$tmp=getBrowserInfo();
+
+// Browser
+$var=true;
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("UserAgent").'</td><td colspan="2">'.$_SERVER['HTTP_USER_AGENT'].'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserName").'</td><td colspan="2">'.$tmp['browsername'].'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("BrowserOS").'</td><td colspan="2">'.$tmp['browseros'].'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Version").'</td><td colspan="2">'.$tmp['browserversion'].'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Layout").' (phone/tablet/classic)</td><td colspan="2">'.$tmp['layout'].'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("IPAddress").'</td><td colspan="2">'.$_SERVER['REMOTE_ADDR'].'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
+print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+print '</td></tr>'."\n";
+print '</table>';
+print '<br>';
+
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index d9833a13d01..1cacc757971 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -44,7 +44,7 @@ print_fiche_titre($langs->trans("InfoDatabase"),'','setup');
 // Database
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Database").'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300">'.$langs->trans("Version").'</td><td>'.getStaticMember(get_class($db),'label').' '.$db->getVersion().'</td></tr>'."\n";
+print '<tr '.$bc[0].'><td width="300">'.$langs->trans("Version").'</td><td>'.$db::LABEL.' '.$db->getVersion().'</td></tr>'."\n";
 print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DatabaseServer").'</td><td>'.$conf->db->host.'</td></tr>'."\n";
 print '<tr '.$bc[0].'><td width="300">'.$langs->trans("DatabasePort").'</td><td>'.(empty($conf->db->port)?$langs->trans("Default"):$conf->db->port).'</td></tr>'."\n";
 print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DatabaseName").'</td><td>'.$conf->db->name.'</td></tr>'."\n";
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 0990d89acd0..3102248bc0a 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -129,4 +129,5 @@ else
 }
 
 llxFooter();
+
 $db->close();
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index fe9bde59cec..641a3166c04 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -90,6 +90,20 @@ $var=!$var;
 print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("CurrentMenuHandler").'</td><td colspan="2">';
 print $conf->standard_menu;
 print '</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Screen").'</td><td colspan="2">';
+print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+print '</td></tr>'."\n";
+$var=!$var;
+print '<tr '.$bc[$var].'><td width="300">'.$langs->trans("Session").'</td><td colspan="2">';
+$i=0;
+foreach($_SESSION as $key => $val)
+{
+	if ($i > 0) print ', ';
+	print $key.' => '.$val;
+	$i++;
+}
+print '</td></tr>'."\n";
 print '</table>';
 print '<br>';
 
@@ -310,6 +324,22 @@ foreach($configfileparameters as $key => $value)
 			print "<td>";
 			if ($newkey == 'dolibarr_main_db_pass') print preg_replace('/./i','*',${$newkey});
 			else if ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/',${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT');
+			else if ($newkey == 'dolibarr_main_document_root_alt')
+			{
+				$tmparray=explode(',',${$newkey});
+				$i=0;
+				foreach($tmparray as $value2)
+				{
+					if ($i > 0) print ', ';
+					print $value2;
+					if (! is_readable($value2)) 
+					{
+						$langs->load("errors");
+						print ' '.img_warning($langs->trans("ErrorCantReadDir",$value2));
+					}
+					++$i;
+				}
+			}
 			else print ${$newkey};
 			if ($newkey == 'dolibarr_main_url_root' && $newkey != DOL_MAIN_URL_ROOT) print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
 			print "</td>";
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 1f95dce57cf..64df9432e82 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -86,7 +86,7 @@ print "<br>\n";
 // Database
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n";
-$dblabel=getStaticMember(get_class($db),'label');
+$dblabel=$db::LABEL;
 $dbversion=$db->getVersion();
 print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" .$dblabel." ".$dbversion."</td></tr>\n";
 print '</table>';
@@ -95,11 +95,10 @@ if ($db->type == 'pgsql')
 {
 	// Check option standard_conforming_strings is on
 	$paramarray=$db->getServerParametersValues('standard_conforming_strings');
-	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
-	{
-		$langs->load("errors");
-		//print '<div class="error">'.$langs->trans("ErrorDatabaseParameterWrong",'standard_conforming_strings','on').'</div>';
-	}
+//	if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
+//	{
+//		$langs->load("errors");
+//	}
 }
 print '<br>';
 
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').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
 
+// Recupere la version de PHP
+$phpversion=version_php();
+print "<br>PHP - ".$langs->trans("Version").": ".$phpversion."<br>\n";
+
+// Recupere la version du serveur web
+print "<br>Web server - ".$langs->trans("Version").": ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+
 // XDebug
 print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
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 "<tr ".$bc[$var].'><td  width="220px">'.$langs->trans("Version")."</td><td>".$phpversion."</td></tr>\n";
 
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 8154cfffb08..9d5317fdd88 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -65,7 +65,7 @@ if ($action == 'delete')
 $form=new Form($db);
 $formfile = new FormFile($db);
 
-$label=getStaticMember($db, 'label');
+$label=$db::LABEL;
 
 $help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
 llxHeader('','',$help_url);
@@ -366,9 +366,11 @@ print $langs->trans("BackupDescY").'<br><br>';
 	id="filename_template"
 	value="<?php
 $prefix='dump';
-if ($label == 'MySQL')      $prefix='mysqldump';
-if ($label == 'PostgreSQL') $prefix='pg_dump';
-$file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.sql';
+$ext='.sql';
+if ($label == 'MySQL')      { $prefix='mysqldump'; $ext='sql'; }
+//if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
+if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='sql'; }
+$file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
 echo $file;
 ?>" /> <br>
 <br>
@@ -376,16 +378,19 @@ echo $file;
 <?php
 
 // Define compressions array
-$compression=array(
-	'none' => array('function' => '',       'id' => 'radio_compression_none', 'label' => $langs->trans("None")),
-	'gz'   => array('function' => 'gzopen', 'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip")),
-);
+$compression=array();
 if ($label == 'MySQL')
 {
-//	$compression['zip']= array('function' => 'dol_compress', 'id' => 'radio_compression_zip',  'label' => $langs->trans("FormatZip"));		// Not open source format. Must implement dol_compress function
+	$compression['none'] = array('function' => '',       'id' => 'radio_compression_none', 'label' => $langs->trans("None"));
+	$compression['gz'] = array('function' => 'gzopen', 'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip"));
+	//	$compression['zip']= array('function' => 'dol_compress', 'id' => 'radio_compression_zip',  'label' => $langs->trans("FormatZip"));		// Not open source format. Must implement dol_compress function
     $compression['bz'] = array('function' => 'bzopen',       'id' => 'radio_compression_bzip', 'label' => $langs->trans("Bzip2"));
 }
-
+else
+{
+	$compression['none'] = array('function' => '',       'id' => 'radio_compression_none', 'label' => $langs->trans("Default"));
+	$compression['gz'] = array('function' => 'gzopen', 'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip"));
+}
 
 // Show compression choices
 print '<div class="formelementrow">';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 61e7e1e68a1..0cd1ae19fa9 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -38,7 +38,7 @@ $showpass=GETPOST('showpass');
  * View
  */
 
-$label=getStaticMember($db, 'label');
+$label=$db::LABEL;
 
 $help_url='EN:Restores|FR:Restaurations|ES:Restauraciones';
 llxHeader('','',$help_url);
@@ -94,7 +94,7 @@ print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'<br><br>';
     ?>
     <div class="formelementrow">
         <input type="radio" name="what" value="mysql" id="radio_dump_postgresql"<?php echo ($radio_dump=='postgresql_options'?' checked':''); ?> />
-        <label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore)</label>
+        <label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore or psql)</label>
     </div>
     <?php
     }
@@ -170,6 +170,9 @@ else if ($label == 'PostgreSQL')
     }*/
     $paramcrypted.=" -W";
     $paramclear.=" -W";
+    // With psql:
+    $paramcrypted.=" -f";
+    $paramclear.=" -f";
 
     echo $langs->trans("ImportPostgreSqlDesc");
     print '<br>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 8dccf89de09..0831571ace1 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011	   Juanjo Menent		<jmenent@2byte.es>
  *
 * This program is free software; you can redistribute it and/or modify
@@ -289,7 +289,9 @@ if ($what == 'postgresql')
     if (preg_match("/\s/",$command)) $command=$command=escapeshellarg($command);	// Use quotes on command
 
     //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-    $param=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
+    //$param="-F c";
+    $param="-F p";
+    $param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
     $param.=" -U ".$dolibarr_main_db_user;
     if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
     if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
@@ -416,7 +418,7 @@ function backup_tables($outputfile, $tables='*')
 
     // Print headers and global mysql config vars
     $sqlhead = '';
-    $sqlhead .= "-- ".getStaticMember($db, 'label')." dump via php
+    $sqlhead .= "-- ".$db::LABEL." dump via php
 --
 -- Host: ".$db->db->host_info."    Database: ".$db->database_name."
 -- ------------------------------------------------------
@@ -464,11 +466,11 @@ function backup_tables($outputfile, $tables='*')
 	        fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
 	        if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
 	        if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
-        
+
 	        $sql='SELECT * FROM '.$table;
 	        $result = $db->query($sql);
 	        $num_fields = $db->num_rows($result);
-	        while($row = $db->fetch_row($result)) 
+	        while($row = $db->fetch_row($result))
 	        {
 	            // For each row of data we print a line of INSERT
 	            fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
@@ -483,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]);
@@ -497,7 +499,7 @@ function backup_tables($outputfile, $tables='*')
 	        fwrite($handle,"\n\n\n");
 	    }
     }
-    
+
     /* Backup Procedure structure*/
     /*
      $result = $db->query('SHOW PROCEDURE STATUS');
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 10bd42d9590..fe577419eaf 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2013	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -78,7 +78,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
 	$sql.= " WHERE entity = ".$conf->entity;
 
-	dol_syslog("listevents purge sql=".$sql);
+	dol_syslog("listevents purge", LOG_DEBUG);
 	$resql = $db->query($sql);
 	if (! $resql)
 	{
@@ -229,10 +229,11 @@ if ($result)
 		// Description
 		print '<td>';
 		$text=$langs->trans($obj->description);
-		if (preg_match('/\((.*)\)/i',$obj->description,$reg))
+		if (preg_match('/\((.*)\)(.*)/i',$obj->description,$reg))
 		{
 			$val=explode(',',$reg[1]);
 			$text=$langs->trans($val[0], isset($val[1])?$val[1]:'', isset($val[2])?$val[2]:'', isset($val[3])?$val[3]:'', isset($val[4])?$val[4]:'');
+			if (! empty($reg[2])) $text.=$reg[2];
 		}
 		print $text;
 		print '</td>';
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 30c7ba4dd43..4f3f14302fd 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -165,4 +165,5 @@ if (preg_match('/^confirm/i',$choice))
 
 
 llxFooter();
+
 $db->close();
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 8b0b105d0f0..40683bdc747 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -30,7 +30,9 @@ $langs->load("other");
 
 if (! $user->admin) accessforbidden();
 
-if (GETPOST('msg','alpha')) $message='<div class="error">'.GETPOST('msg','alpha').'</div>';
+if (GETPOST('msg','alpha')) {
+	setEventMessage(GETPOST('msg','alpha'), 'errors');
+}
 
 
 $urldolibarr='http://www.dolibarr.org/downloads/';
@@ -54,7 +56,7 @@ if (GETPOST('action','alpha')=='install')
 	if (! $original_file)
 	{
 		$langs->load("Error");
-		$mesg = '<div class="warning">'.$langs->trans("ErrorFileRequired").'</div>';
+		setEventMessage($langs->trans("ErrorFileRequired"), 'warnings');
 		$error++;
 	}
 	else
@@ -62,7 +64,7 @@ if (GETPOST('action','alpha')=='install')
 		if (! preg_match('/\.zip/i',$original_file))
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorFileMustBeADolibarrPackage",$original_file).'</div>';
+			setEventMessage($langs->trans("ErrorFileMustBeADolibarrPackage",$original_file), 'errors');
 			$error++;
 		}
 	}
@@ -80,12 +82,11 @@ if (GETPOST('action','alpha')=='install')
 			if (! empty($result['error']))
 			{
 				$langs->load("errors");
-				$mesg = '<div class="error">'.$langs->trans($result['error'],$original_file).'</div>';
-
+				setEventMessage($langs->trans($result['error'],$original_file), 'errors');
 			}
 			else
 			{
-				$mesg = '<div class="ok">'.$langs->trans("SetupIsReadyForUse").'</div>';
+				setEventMessage($langs->trans("SetupIsReadyForUse"));
 			}
 		}
 	}
@@ -107,9 +108,6 @@ print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
 print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>';
 print '<br>';
 
-//dol_htmloutput_errors($mesg);
-dol_htmloutput_mesg($mesg);
-
 print $langs->trans("Upgrade").'<br>';
 print '<hr>';
 print $langs->trans("ThisIsProcessToFollow").'<br>';
@@ -152,7 +150,7 @@ if (! empty($conf->global->MAIN_ONLINE_INSTALL_MODULE))
 	else
 	{
 		$message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
-		print '<div class="warning">'.$message.'</div>';
+		setEventMessage($message, 'warnings');
 	}
 }
 else
@@ -173,4 +171,5 @@ if (! empty($result['return']))
 }
 
 llxFooter();
+
 $db->close();
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 66bc4fb22ba..95e3f555b6d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -57,8 +57,6 @@ print_fiche_titre($langs->trans("TranslationSetup"),'','setup');
 print $langs->trans("TranslationDesc")."<br>\n";
 print "<br>\n";
 
-dol_htmloutput_mesg($message);
-
 print $langs->trans("CurrentUserLanguage").': <strong>'.$langs->defaultlang.'</strong><br>';
 print img_warning().' '.$langs->trans("SomeTranslationAreUncomplete").'<br>';
 
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index fc9d0489e9a..85139b56ba9 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -50,7 +50,7 @@ print "<br>\n";
 $template_dir = DOL_DOCUMENT_ROOT.'/core/tpl/';
 
 $interfaces = new Interfaces($db);
-$triggers = $interfaces->getTriggersList(0,'priority');
+$triggers = $interfaces->getTriggersList();
 
 print '<table class="noborder">
 <tr class="liste_titre">
diff --git a/htdocs/asterisk/index.html b/htdocs/asterisk/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/asterisk/index.php b/htdocs/asterisk/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/asterisk/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index d6ca6a7d66f..19fb5c193bb 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -37,8 +37,6 @@ $forbarcode=GETPOST('forbarcode');
 $fk_barcode_type=GETPOST('fk_barcode_type');
 $eraseallbarcode=GETPOST('eraseallbarcode');
 
-$mesg='';
-
 $action=GETPOST('action');
 
 $producttmp=new Product($db);
@@ -126,7 +124,7 @@ if ($action == 'initbarcodeproducts')
 			$sql.=$db->order("datec","ASC");
 			$sql.=$db->plimit($maxperinit);
 
-			dol_syslog("codeinit sql=".$sql, LOG_DEBUG);
+			dol_syslog("codeinit", LOG_DEBUG);
 			$resql=$db->query($sql);
 			if ($resql)
 			{
@@ -198,8 +196,6 @@ print '<br>';
 print $langs->trans("MassBarcodeInitDesc").'<br>';
 print '<br>';
 
-dol_htmloutput_errors($mesg);
-
 //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
 //print '<br>';
 
@@ -291,7 +287,7 @@ if ($conf->product->enabled || $conf->product->service)
 	{
 		print $langs->trans("BarCodeNumberManager").": ";
 		$objproduct=new Product($db);
-		print '<b>'.$modBarCodeProduct->nom.'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
+		print '<b>'.(isset($modBarCodeProduct->name)?$modBarCodeProduct->name:$modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
 		$disabled=0;
 	}
 	else
diff --git a/htdocs/barcode/index.html b/htdocs/barcode/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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 ad480f6cf7f..68adb30f7ab 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -42,12 +42,12 @@ if ($action == 'setvalue')
 	if (! $error)
 	{
 		$db->commit();
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
 		$db->rollback();
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -82,8 +82,6 @@ print '<input size="3" type="text" name="BOOKMARKS_SHOW_IN_MENU" value="'.$conf-
 print '</td></tr>';
 print '</table><br /><center><input type="submit" class="button" value="'.$langs->trans("Modify").'"></center></form>';
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/bookmarks/admin/index.html b/htdocs/bookmarks/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index ebfe7e78db6..a9d2d7eb6c0 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -48,11 +48,11 @@ function printBookmarksList($aDb, $aLangs)
 	// Menu bookmark
 	$ret.= '<div class="menu_titre">';
 	$ret.= '<table class="nobordernopadding" width="100%" summary="bookmarkstable"><tr><td>';
-	$ret.= '<a class="vmenu" href="'.DOL_URL_ROOT.'/bookmarks/liste.php">'.$langs->trans('Bookmarks').'</a>';
+	$ret.= '<a class="vmenu" href="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</a>';
 	$ret.= '</td><td align="right">';
 	if ($user->rights->bookmark->creer)
 	{
-		$ret.= '<a class="vsmenu" href="'.DOL_URL_ROOT.'/bookmarks/fiche.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url).'">';
+		$ret.= '<a class="vsmenu" href="'.DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url).'">';
 		//$ret.=img_picto($langs->trans('AddThisPageToBookmarks'),'edit_add').' ';
 		$ret.=img_object($langs->trans('AddThisPageToBookmarks'),'bookmark');
 		$ret.= '</a>';
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
new file mode 100644
index 00000000000..6bb6367171a
--- /dev/null
+++ b/htdocs/bookmarks/card.php
@@ -0,0 +1,309 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/bookmarks/card.php
+ *       \brief      Page display/creation of bookmarks
+ *       \ingroup    bookmark
+ */
+
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
+
+$langs->load("bookmarks");
+$langs->load("other");
+
+// Security check
+if (! $user->rights->bookmark->lire) {
+    restrictedArea($user, 'bookmarks');
+}
+
+$id=GETPOST("id");
+$action=GETPOST("action","alpha");
+$title=GETPOST("title","alpha");
+$url=GETPOST("url","alpha");
+$target=GETPOST("target","alpha");
+$userid=GETPOST("userid","int");
+$position=GETPOST("position","int");
+$backtopage=GETPOST('backtopage','alpha');
+
+$bookmark=new Bookmark($db);
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'add' || $action == 'addproduct' || $action == 'update')
+{
+	$error = 0;
+
+	if (GETPOST("cancel"))
+	{
+		if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/list.php'));
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	if ($action == 'update') $bookmark->fetch($_POST["id"]);
+	$bookmark->fk_user=$userid;
+	$bookmark->title=$title;
+	$bookmark->url=$url;
+	$bookmark->target=$target;
+	$bookmark->position=$position;
+
+	if (! $title) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("BookmarkTitle")), 'errors');
+	}
+
+	if (! $url) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("UrlOrLink")), 'errors');
+	}
+
+	if (! $error)
+	{
+		$bookmark->favicon='none';
+
+		if ($action == 'update') $res=$bookmark->update();
+		else $res=$bookmark->create();
+
+		if ($res > 0)
+		{
+			if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):DOL_URL_ROOT.'/bookmarks/list.php');
+			header("Location: ".$backtopage);
+			exit;
+		}
+		else
+		{
+			if ($bookmark->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$langs->load("errors");
+				setEventMessage($langs->trans("WarningBookmarkAlreadyExists"), 'warnings');
+			}
+			else
+			{
+				setEventMessage($bookmark->error, 'errors');
+			}
+			$action='create';
+		}
+	}
+	else
+	{
+		$action='create';
+	}
+}
+
+/*
+ * View
+ */
+
+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')
+{
+	/*
+	 * Fact bookmark creation mode
+	 */
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">'."\n";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+
+	print_fiche_titre($langs->trans("NewBookmark"));
+
+	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark');
+
+	print '<table class="border" width="100%">';
+
+	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input class="flat" name="title" size="30" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat" name="url" size="50" value="'.$url.'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
+
+	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
+	$liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow"));
+	print $form->selectarray('target',$liste,1);
+	print '</td><td class="hideonsmartphone">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
+	$form->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1);
+	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
+
+	// Position
+	print '<tr><td>'.$langs->trans("Position").'</td><td>';
+	print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"])?$_POST["position"]:$bookmark->position).'">';
+	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	print '<div align="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("CreateBookmark").'" name="create"> &nbsp; ';
+	print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+if ($id > 0 && ! preg_match('/^add/i',$action))
+{
+	/*
+	 * Fact bookmark mode or visually edition
+	 */
+	$bookmark->fetch($id);
+
+
+	if ($action == 'edit')
+	{
+		print '<form name="edit" method="POST" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="id" value="'.$bookmark->id.'">';
+		print '<input type="hidden" name="urlsource" value="'.DOL_URL_ROOT.'/bookmarks/card.php?id='.$bookmark->id.'">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+
+	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark');
+
+	print '<table class="border" width="100%">';
+
+	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>'.$bookmark->ref.'</td></tr>';
+
+	print '<tr><td>';
+	if ($action == 'edit') {
+		print '<span class="fieldrequired">';
+	}
+
+	print $langs->trans("BookmarkTitle");
+
+	if ($action == 'edit') {
+		print '</span>';
+	}
+
+	print '</td><td>';
+	if ($action == 'edit') print '<input class="flat" name="title" size="30" value="'.(isset($_POST["title"])?$_POST["title"]:$bookmark->title).'">';
+	else print $bookmark->title;
+	print '</td></tr>';
+
+	print '<tr><td>';
+	if ($action == 'edit') {
+		print '<span class="fieldrequired">';
+	}
+	print $langs->trans("UrlOrLink");
+	if ($action == 'edit') {
+		print '</span>';
+	}
+	print '</td><td>';
+	if ($action == 'edit') print '<input class="flat" name="url" size="80" value="'.(isset($_POST["url"])?$_POST["url"]:$bookmark->url).'">';
+	else print '<a href="'.(preg_match('/^http/i',$bookmark->url)?$bookmark->url:DOL_URL_ROOT.$bookmark->url).'"'.($bookmark->target?' target="_blank"':'').'>'.$bookmark->url.'</a>';
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
+	if ($action == 'edit')
+	{
+		$liste=array(1=>$langs->trans("OpenANewWindow"),0=>$langs->trans("ReplaceWindow"));
+		print $form->selectarray('target',$liste,isset($_POST["target"])?$_POST["target"]:$bookmark->target);
+	}
+	else
+	{
+		if ($bookmark->target == 0) print $langs->trans("ReplaceWindow");
+		if ($bookmark->target == 1) print $langs->trans("OpenANewWindow");
+	}
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
+	if ($action == 'edit' && $user->admin)
+	{
+		$form->select_users(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1);
+	}
+	else
+	{
+		if ($bookmark->fk_user)
+		{
+			$fuser=new User($db);
+			$fuser->fetch($bookmark->fk_user);
+			print $fuser->getNomUrl(1);
+		}
+		else
+		{
+			print $langs->trans("Public");
+		}
+	}
+	print '</td></tr>';
+
+	// Position
+	print '<tr><td>'.$langs->trans("Position").'</td><td>';
+	if ($action == 'edit') print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"])?$_POST["position"]:$bookmark->position).'">';
+	else print $bookmark->position;
+	print '</td></tr>';
+
+	// Date creation
+	print '<tr><td>'.$langs->trans("DateCreation").'</td><td>'.dol_print_date($bookmark->datec,'dayhour').'</td></tr>';
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	if ($action == 'edit')
+	{
+		print '<div align="center"><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+		print '</form>';
+	}
+
+
+	print "<div class=\"tabsAction\">\n";
+
+	// Edit
+	if ($user->rights->bookmark->creer && $action != 'edit')
+	{
+		print "  <a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?id=".$bookmark->id."&amp;action=edit\">".$langs->trans("Edit")."</a>\n";
+	}
+
+	// Remove
+	if ($user->rights->bookmark->supprimer && $action != 'edit')
+	{
+		print "  <a class=\"butActionDelete\" href=\"list.php?bid=".$bookmark->id."&amp;action=delete\">".$langs->trans("Delete")."</a>\n";
+	}
+
+	print '</div>';
+
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 2aa86c5db20..aa92d2bedb9 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -65,7 +65,7 @@ class Bookmark
         $sql.= " WHERE rowid = ".$id;
         $sql.= " AND entity = ".$conf->entity;
 
-		dol_syslog("Bookmark::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog("Bookmark::fetch", LOG_DEBUG);
         $resql  = $this->db->query($sql);
         if ($resql)
         {
@@ -123,7 +123,7 @@ class Bookmark
         if ($this->fk_soc) $sql.=",".$this->fk_soc;
         $sql.= ")";
 
-        dol_syslog("Bookmark::update sql=".$sql, LOG_DEBUG);
+        dol_syslog("Bookmark::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -173,7 +173,7 @@ class Bookmark
         $sql.= " ,position = '".$this->position."'";
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog("Bookmark::update sql=".$sql, LOG_DEBUG);
+        dol_syslog("Bookmark::update", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             return 1;
@@ -196,7 +196,7 @@ class Bookmark
         $sql  = "DELETE FROM ".MAIN_DB_PREFIX."bookmark";
         $sql .= " WHERE rowid = ".$id;
 
-        dol_syslog("Bookmark::remove sql=".$sql, LOG_DEBUG);
+        dol_syslog("Bookmark::remove", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/bookmarks/class/index.html b/htdocs/bookmarks/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php
deleted file mode 100644
index 6167d6cd669..00000000000
--- a/htdocs/bookmarks/fiche.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/bookmarks/fiche.php
- *       \brief      Page display/creation of bookmarks
- *       \ingroup    bookmark
- */
-
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
-
-$langs->load("bookmarks");
-$langs->load("other");
-
-// Security check
-if (! $user->rights->bookmark->lire) {
-    restrictedArea($user, 'bookmarks');
-}
-
-$id=GETPOST("id");
-$action=GETPOST("action","alpha");
-$title=GETPOST("title","alpha");
-$url=GETPOST("url","alpha");
-$target=GETPOST("target","alpha");
-$userid=GETPOST("userid","int");
-$position=GETPOST("position","int");
-$backtopage=GETPOST('backtopage','alpha');
-
-
-/*
- * Actions
- */
-
-if ($action == 'add' || $action == 'addproduct' || $action == 'update')
-{
-	if (GETPOST("cancel"))
-	{
-		if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):((! empty($url))?$url:DOL_URL_ROOT.'/bookmarks/liste.php'));
-		header("Location: ".$backtopage);
-		exit;
-	}
-
-	$mesg='';
-
-	$bookmark=new Bookmark($db);
-	if ($action == 'update') $bookmark->fetch($_POST["id"]);
-	$bookmark->fk_user=$userid;
-	$bookmark->title=$title;
-	$bookmark->url=$url;
-	$bookmark->target=$target;
-	$bookmark->position=$position;
-
-	if (! $title) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("BookmarkTitle"));
-	if (! $url)   $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("UrlOrLink"));
-
-	if (! $mesg)
-	{
-		$bookmark->favicon='none';
-
-		if ($action == 'update') $res=$bookmark->update();
-		else $res=$bookmark->create();
-
-		if ($res > 0)
-		{
-			if (empty($backtopage)) $backtopage=(GETPOST("urlsource")?GETPOST("urlsource"):DOL_URL_ROOT.'/bookmarks/liste.php');
-			header("Location: ".$backtopage);
-			exit;
-		}
-		else
-		{
-			if ($bookmark->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
-				$langs->load("errors");
-				$mesg='<div class="warning">'.$langs->trans("WarningBookmarkAlreadyExists").'</div>';
-			}
-			else
-			{
-				$mesg='<div class="error">'.$bookmark->error.'</div>';
-			}
-			$action='create';
-		}
-	}
-	else
-	{
-		$mesg='<div class="error">'.$mesg.'</div>';
-		$action='create';
-	}
-}
-
-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
-	{
-		$mesg='<div class="error">'.$bookmark->error.'</div>';
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$form=new Form($db);
-
-
-if ($action == 'create')
-{
-	/*
-	 * Fact bookmark creation mode
-	 */
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">'."\n";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-	
-	print_fiche_titre($langs->trans("NewBookmark"));
-
-	dol_fiche_head($head, $hselected, $langs->trans("Bookmark"),0,'bookmark');
-	
-	dol_htmloutput_mesg($mesg);
-
-	print '<table class="border" width="100%">';
-
-	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input class="flat" name="title" size="30" value="'.$title.'"></td><td class="hideonsmartphone">'.$langs->trans("SetHereATitleForLink").'</td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("UrlOrLink").'</td><td><input class="flat" name="url" size="50" value="'.$url.'"></td><td class="hideonsmartphone">'.$langs->trans("UseAnExternalHttpLinkOrRelativeDolibarrLink").'</td></tr>';
-
-	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
-	$liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow"));
-	print $form->selectarray('target',$liste,1);
-	print '</td><td class="hideonsmartphone">'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
-	$form->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1);
-	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
-
-	// Position
-	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"])?$_POST["position"]:$bookmark->position).'">';
-	print '</td><td class="hideonsmartphone">&nbsp;</td></tr>';
-
-	print '</table><br>';
-	
-	print '<div align="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateBookmark").'" name="create"> &nbsp; ';
-	print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
-	print '</div>';
-
-	print '</form>';
-	
-	dol_fiche_end();
-}
-
-
-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');
-
-	if ($action == 'edit')
-	{
-		print '<form name="edit" method="POST" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="id" value="'.$bookmark->id.'">';
-		print '<input type="hidden" name="urlsource" value="'.DOL_URL_ROOT.'/bookmarks/fiche.php?id='.$bookmark->id.'">';
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-
-	print '<table class="border" width="100%">';
-
-	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>'.$bookmark->ref.'</td></tr>';
-
-	print '<tr><td>'.$langs->trans("BookmarkTitle").'</td><td>';
-	if ($action == 'edit') print '<input class="flat" name="title" size="30" value="'.(isset($_POST["title"])?$_POST["title"]:$bookmark->title).'">';
-	else print $bookmark->title;
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("UrlOrLink").'</td><td>';
-	if ($action == 'edit') print '<input class="flat" name="url" size="80" value="'.(isset($_POST["url"])?$_POST["url"]:$bookmark->url).'">';
-	else print '<a href="'.(preg_match('/^http/i',$bookmark->url)?$bookmark->url:DOL_URL_ROOT.$bookmark->url).'"'.($bookmark->target?' target="_blank"':'').'>'.$bookmark->url.'</a>';
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
-	if ($action == 'edit')
-	{
-		$liste=array(1=>$langs->trans("OpenANewWindow"),0=>$langs->trans("ReplaceWindow"));
-		print $form->selectarray('target',$liste,isset($_POST["target"])?$_POST["target"]:$bookmark->target);
-	}
-	else
-	{
-		if ($bookmark->target == 0) print $langs->trans("ReplaceWindow");
-		if ($bookmark->target == 1) print $langs->trans("OpenANewWindow");
-	}
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Owner").'</td><td>';
-	if ($action == 'edit' && $user->admin)
-	{
-		$form->select_users(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1);
-	}
-	else
-	{
-		if ($bookmark->fk_user)
-		{
-			$fuser=new User($db);
-			$fuser->fetch($bookmark->fk_user);
-			print $fuser->getNomUrl(1);
-		}
-		else
-		{
-			print $langs->trans("Public");
-		}
-	}
-	print '</td></tr>';
-
-	// Position
-	print '<tr><td>'.$langs->trans("Position").'</td><td>';
-	if ($action == 'edit') print '<input class="flat" name="position" size="5" value="'.(isset($_POST["position"])?$_POST["position"]:$bookmark->position).'">';
-	else print $bookmark->position;
-	print '</td></tr>';
-
-	// Date creation
-	print '<tr><td>'.$langs->trans("DateCreation").'</td><td>'.dol_print_date($bookmark->datec,'dayhour').'</td></tr>';
-
-	print '</table>';
-
-	if ($action == 'edit') print '<br><div align="center"><input class="button" type="submit" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-	
-	if ($action == 'edit') print '</form>';
-
-	dol_fiche_end();
-
-
-	print "<div class=\"tabsAction\">\n";
-
-	// Edit
-	if ($user->rights->bookmark->creer && $action != 'edit')
-	{
-		print "  <a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?id=".$bookmark->id."&amp;action=edit\">".$langs->trans("Edit")."</a>\n";
-	}
-
-	// Remove
-	if ($user->rights->bookmark->supprimer && $action != 'edit')
-	{
-		print "  <a class=\"butActionDelete\" href=\"liste.php?bid=".$bookmark->id."&amp;action=delete\">".$langs->trans("Delete")."</a>\n";
-	}
-
-	print '</div>';
-
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/bookmarks/index.html b/htdocs/bookmarks/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/bookmarks/index.php b/htdocs/bookmarks/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/bookmarks/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
new file mode 100644
index 00000000000..748a4d9b7fa
--- /dev/null
+++ b/htdocs/bookmarks/list.php
@@ -0,0 +1,218 @@
+<?php
+/* Copyright (C) 2005-2012 Laurent Destailleur       <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/bookmarks/list.php
+ *       \brief      Page to display list of bookmarks
+ *       \ingroup    bookmark
+ */
+
+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) {
+    restrictedArea($user, 'bookmarks');
+}
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0 ; }
+$offset = $conf->liste_limit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="position";
+$limit=$conf->liste_limit;
+
+
+/*
+ * Actions
+ */
+
+if ($_GET["action"] == 'delete')
+{
+    $bookmark=new Bookmark($db);
+    $res=$bookmark->remove($_GET["bid"]);
+    if ($res > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        setEventMessage($bookmark->error, 'errors');
+    }
+}
+
+
+/*
+ * View
+ */
+
+$userstatic=new User($db);
+
+llxHeader();
+
+print_fiche_titre($langs->trans("Bookmarks"));
+
+$sql = "SELECT b.fk_soc as rowid, b.dateb, b.rowid as bid, b.fk_user, b.url, b.target, b.title, b.favicon, b.position,";
+$sql.= " u.login, u.lastname, u.firstname";
+$sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b LEFT JOIN ".MAIN_DB_PREFIX."user as u ON b.fk_user=u.rowid";
+$sql.= " WHERE 1=1";
+$sql.= " AND b.entity = ".$conf->entity;
+if (! $user->admin) $sql.= " AND (b.fk_user = ".$user->id." OR b.fk_user is NULL OR b.fk_user = 0)";
+$sql.= $db->order($sortfield.", position",$sortorder);
+$sql.= $db->plimit($limit, $offset);
+
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    print "<table class=\"noborder\" width=\"100%\">";
+
+    print "<tr class=\"liste_titre\">";
+    //print "<td>&nbsp;</td>";
+    print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bid","","",'align="left"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Title"),'','')."</td>";
+    print_liste_field_titre($langs->trans("Link"),'','')."</td>";
+    print_liste_field_titre($langs->trans("Target"),'','','','','align="center"')."</td>";
+    print_liste_field_titre($langs->trans("Owner"),$_SERVER["PHP_SELF"],"u.lastname","","",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"b.dateb","","",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Position"),$_SERVER["PHP_SELF"],"b.position","","",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('','','');
+    print "</tr>\n";
+
+    $var=True;
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($resql);
+
+        $var=!$var;
+        print "<tr ".$bc[$var].">";
+
+        // Id
+        print '<td align="left">';
+        print "<a href=\"card.php?id=".$obj->bid."\">".img_object($langs->trans("ShowBookmark"),"bookmark").' '.$obj->bid."</a>";
+        print '</td>';
+
+        $lieninterne=0;
+        $title=dol_trunc($obj->title,24);
+        $lien=dol_trunc($obj->url,24);
+
+        // Title
+        print "<td>";
+        if ($obj->rowid)
+        {
+            // Lien interne societe
+            $lieninterne=1;
+            $lien="Dolibarr";
+            if (! $obj->title)
+            {
+                // For compatibility with old Dolibarr bookmarks
+                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+                $societe=new Societe($db);
+                $societe->fetch($obj->rowid);
+                $obj->title=$societe->name;
+            }
+            $title=img_object($langs->trans("ShowCompany"),"company").' '.$obj->title;
+        }
+        if ($lieninterne) print "<a href=\"".$obj->url."\">";
+        print $title;
+        if ($lieninterne) print "</a>";
+        print "</td>\n";
+
+        // Url
+        print "<td>";
+        if (! $lieninterne) print '<a href="'.$obj->url.'"'.($obj->target?' target="newlink"':'').'>';
+        print $lien;
+        if (! $lieninterne) print '</a>';
+        print "</td>\n";
+
+        // Target
+        print '<td align="center">';
+        if ($obj->target == 0) print $langs->trans("BookmarkTargetReplaceWindowShort");
+        if ($obj->target == 1) print $langs->trans("BookmarkTargetNewWindowShort");
+        print "</td>\n";
+
+        // Author
+        print '<td align="center">';
+		if ($obj->fk_user)
+		{
+        	$userstatic->id=$obj->fk_user;
+	    	$userstatic->lastname=$obj->login;
+			print $userstatic->getNomUrl(1);
+		}
+		else
+		{
+			print $langs->trans("Public");
+		}
+        print "</td>\n";
+
+        // Date creation
+        print '<td align="center">'.dol_print_date($db->jdate($obj->dateb),'day')."</td>";
+
+        // Position
+        print '<td align="right">'.$obj->position."</td>";
+
+        // Actions
+        print '<td align="right" class="nowrap">';
+        if ($user->rights->bookmark->creer)
+        {
+        	print "<a href=\"".DOL_URL_ROOT."/bookmarks/card.php?action=edit&id=".$obj->bid."&backtopage=".urlencode($_SERVER["PHP_SELF"])."\">".img_edit()."</a> ";
+        }
+        if ($user->rights->bookmark->supprimer)
+        {
+            print "<a href=\"".$_SERVER["PHP_SELF"]."?action=delete&bid=$obj->bid\">".img_delete()."</a>";
+        }
+        else
+        {
+            print "&nbsp;";
+        }
+        print "</td>";
+        print "</tr>\n";
+        $i++;
+    }
+    print "</table>";
+    $db->free($resql);
+}
+else
+{
+    dol_print_error($db);
+}
+
+
+
+print "<div class=\"tabsAction\">\n";
+
+if ($user->rights->bookmark->creer)
+{
+    print '<a class="butAction" href="card.php?action=create">'.$langs->trans("NewBookmark").'</a>';
+}
+
+print '</div>';
+
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php
deleted file mode 100644
index c3524ae5d43..00000000000
--- a/htdocs/bookmarks/liste.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/* Copyright (C) 2005-2012 Laurent Destailleur       <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/bookmarks/liste.php
- *       \brief      Page to display list of bookmarks
- *       \ingroup    bookmark
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
-
-$langs->load("bookmarks");
-
-// Security check
-if (! $user->rights->bookmark->lire) {
-    restrictedArea($user, 'bookmarks');
-}
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position";
-$limit=$conf->liste_limit;
-
-
-/*
- * Actions
- */
-
-if ($_GET["action"] == 'delete')
-{
-    $bookmark=new Bookmark($db);
-    $res=$bookmark->remove($_GET["bid"]);
-    if ($res > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else
-    {
-        $mesg='<div class="error">'.$bookmark->error.'</div>';
-    }
-}
-
-
-/*
- * View
- */
-
-$userstatic=new User($db);
-
-llxHeader();
-
-print_fiche_titre($langs->trans("Bookmarks"));
-
-if ($mesg) print $mesg;
-
-$sql = "SELECT b.fk_soc as rowid, b.dateb, b.rowid as bid, b.fk_user, b.url, b.target, b.title, b.favicon, b.position,";
-$sql.= " u.login, u.lastname, u.firstname";
-$sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b LEFT JOIN ".MAIN_DB_PREFIX."user as u ON b.fk_user=u.rowid";
-$sql.= " WHERE 1=1";
-$sql.= " AND b.entity = ".$conf->entity;
-if (! $user->admin) $sql.= " AND (b.fk_user = ".$user->id." OR b.fk_user is NULL OR b.fk_user = 0)";
-$sql.= $db->order($sortfield.", position",$sortorder);
-$sql.= $db->plimit($limit, $offset);
-
-$resql=$db->query($sql);
-if ($resql)
-{
-    $num = $db->num_rows($resql);
-    $i = 0;
-
-    print "<table class=\"noborder\" width=\"100%\">";
-
-    print "<tr class=\"liste_titre\">";
-    //print "<td>&nbsp;</td>";
-    print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bid","","",'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Title"),'','')."</td>";
-    print_liste_field_titre($langs->trans("Link"),'','')."</td>";
-    print_liste_field_titre($langs->trans("Target"),'','','','','align="center"')."</td>";
-    print_liste_field_titre($langs->trans("Owner"),$_SERVER["PHP_SELF"],"u.lastname","","",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"b.dateb","","",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Position"),$_SERVER["PHP_SELF"],"b.position","","",'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('','','');
-    print "</tr>\n";
-
-    $var=True;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($resql);
-
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
-
-        // Id
-        print '<td align="left">';
-        print "<a href=\"fiche.php?id=".$obj->bid."\">".img_object($langs->trans("ShowBookmark"),"bookmark").' '.$obj->bid."</a>";
-        print '</td>';
-
-        $lieninterne=0;
-        $title=dol_trunc($obj->title,24);
-        $lien=dol_trunc($obj->url,24);
-
-        // Title
-        print "<td>";
-        if ($obj->rowid)
-        {
-            // Lien interne societe
-            $lieninterne=1;
-            $lien="Dolibarr";
-            if (! $obj->title)
-            {
-                // For compatibility with old Dolibarr bookmarks
-                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-                $societe=new Societe($db);
-                $societe->fetch($obj->rowid);
-                $obj->title=$societe->name;
-            }
-            $title=img_object($langs->trans("ShowCompany"),"company").' '.$obj->title;
-        }
-        if ($lieninterne) print "<a href=\"".$obj->url."\">";
-        print $title;
-        if ($lieninterne) print "</a>";
-        print "</td>\n";
-
-        // Url
-        print "<td>";
-        if (! $lieninterne) print '<a href="'.$obj->url.'"'.($obj->target?' target="newlink"':'').'>';
-        print $lien;
-        if (! $lieninterne) print '</a>';
-        print "</td>\n";
-
-        // Target
-        print '<td align="center">';
-        if ($obj->target == 0) print $langs->trans("BookmarkTargetReplaceWindowShort");
-        if ($obj->target == 1) print $langs->trans("BookmarkTargetNewWindowShort");
-        print "</td>\n";
-
-        // Author
-        print '<td align="center">';
-		if ($obj->fk_user)
-		{
-        	$userstatic->id=$obj->fk_user;
-	    	$userstatic->lastname=$obj->login;
-			print $userstatic->getNomUrl(1);
-		}
-		else
-		{
-			print $langs->trans("Public");
-		}
-        print "</td>\n";
-
-        // Date creation
-        print '<td align="center">'.dol_print_date($db->jdate($obj->dateb),'day')."</td>";
-
-        // Position
-        print '<td align="right">'.$obj->position."</td>";
-
-        // Actions
-        print '<td align="right" class="nowrap">';
-        if ($user->rights->bookmark->creer)
-        {
-        	print "<a href=\"".DOL_URL_ROOT."/bookmarks/fiche.php?action=edit&id=".$obj->bid."&backtopage=".urlencode($_SERVER["PHP_SELF"])."\">".img_edit()."</a> ";
-        }
-        if ($user->rights->bookmark->supprimer)
-        {
-            print "<a href=\"".$_SERVER["PHP_SELF"]."?action=delete&bid=$obj->bid\">".img_delete()."</a>";
-        }
-        else
-        {
-            print "&nbsp;";
-        }
-        print "</td>";
-        print "</tr>\n";
-        $i++;
-    }
-    print "</table>";
-    $db->free($resql);
-}
-else
-{
-    dol_print_error($db);
-}
-
-
-
-print "<div class=\"tabsAction\">\n";
-
-if ($user->rights->bookmark->creer)
-{
-    print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewBookmark").'</a>';
-}
-
-print '</div>';
-
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php
deleted file mode 100644
index 65dab22f813..00000000000
--- a/htdocs/boutique/admin/boutique.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004 Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004 Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2012 Juanjo Menent		   <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *  \file 		htdocs/boutique/admin/boutique.php
- *  \ingroup    boutique
- *  \brief      Page d'administration/configuration du module OsCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-
-$langs->load("admin");
-$langs->load("oscommerce");
-
-if (!$user->admin) accessforbidden();
-
-
-
-/*
- * Actions
- */
-
-if (GETPOST('save','alpha'))
-{
-	$db->begin();
-
-	$i=0;
-
-	$i+=dolibarr_set_const($db,'OSC_DB_HOST',trim(GETPOST('oscommerce_dbhost','alpha')),'chaine',0,'',$conf->entity);
-	$i+=dolibarr_set_const($db,'OSC_DB_NAME',trim(GETPOST('oscommerce_dbname','alpha')),'chaine',0,'',$conf->entity);
-	$i+=dolibarr_set_const($db,'OSC_DB_USER',trim(GETPOST('oscommerce_dbuser','alpha')),'chaine',0,'',$conf->entity);
-	$i+=dolibarr_set_const($db,'OSC_DB_PASS',trim(GETPOST('oscommerce_dbpass','alpha')),'chaine',0,'',$conf->entity);
-	$i+=dolibarr_set_const($db,'OSC_DB_TABLE_PREFIX',trim(GETPOST('oscommerce_db_table_prefix','alpha')),'chaine',0,'',$conf->entity);
-	$i+=dolibarr_set_const($db,'OSC_LANGUAGE_ID',1,'chaine',0,'',$conf->entity);
-
-	if ($i >= 4)
-	{
-		$db->commit();
-		$mesg = "<font class=\"ok\">".$langs->trans("OSCommerceSetupSaved")."</font>";
-	}
-	else
-	{
-		$db->rollback();
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-}
-elseif (GETPOST('test','alpha'))
-{
-	//$resql=$db->query("select count(*) from ".MAIN_DB_PREFIX."const");
-	//print "< ".$db." - ".$db->db." - ".$resql." - ".$db->error()."><br>\n";
-
-	// Test de la connexion a la database webcalendar
-	$conf->oscommerce->db->type=$dolibarr_main_db_type;
-	$conf->oscommerce->db->host=GETPOST('oscommerce_dbhost','alpha');
-	$conf->oscommerce->db->port=GETPOST('oscommerce_dbport','alpha');
-	$conf->oscommerce->db->name=GETPOST('oscommerce_dbname','alpha');
-	$conf->oscommerce->db->user=GETPOST('oscommerce_dbuser','alpha');
-	$conf->oscommerce->db->pass=GETPOST('oscommerce_dbpass','alpha');
-
-    $oscommercedb=getDoliDBInstance($conf->oscommerce->db->type,$conf->oscommerce->db->host,$conf->oscommerce->db->user,$conf->oscommerce->db->pass,$conf->oscommerce->db->name,$conf->oscommerce->db->port);
-
-	if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1)
-	{
-		// Verifie si bonne base par requete sur une table OSCommerce
-		$sql ="SELECT configuration_value";
-		$sql.=" FROM ".$_POST["oscommerce_db_table_prefix"]."configuration";
-		$sql.=" WHERE configuration_key='STORE_NAME'";
-		$resql=$oscommercedb->query($sql);
-		if ($resql) {
-			$mesg ="<div class=\"ok\">".$langs->trans("OSCommerceTestOk",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'),GETPOST('oscommerce_dbuser','alpha'));
-			$mesg.="</div>";
-		}
-		else {
-			$mesg ="<div class=\"error\">".$langs->trans("OSCommerceErrorConnectOkButWrongDatabase",'STORE_NAME',GETPOST('oscommerce_db_table_prefix','alpha')."configuration");
-			$mesg.="</div>";
-		}
-
-		//$oscommercedb->close();    Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique
-	}
-	elseif ($oscommercedb->connected == 1 && $oscommercedb->database_selected != 1)
-	{
-		$mesg ="<div class=\"error\">".$langs->trans("OSCommerceTestKo1",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbname','alpha'));
-		$mesg.="<br>".$oscommercedb->error();
-		$mesg.="</div>";
-		//$oscommercedb->close();    Ne pas fermer car la conn de webcal est la meme que dolibarr si parametre host/user/pass identique
-	}
-	else
-	{
-		$mesg ="<div class=\"error\">".$langs->trans("OSCommerceTestKo2",GETPOST('oscommerce_dbhost','alpha'),GETPOST('oscommerce_dbuser','alpha'));
-		$mesg.="<br>".$oscommercedb->error();
-		$mesg.="</div>";
-	}
-
-	//$resql=$db->query("select count(*) from ".MAIN_DB_PREFIX."const");
-	//print "< ".$db." - ".$db->db." - ".$resql." - ".$db->error()."><br>\n";
-}
-
-
-
-/*
- * Affichage page
- */
-
-llxHeader();
-
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("OSCommerceSetup"),$linkback,'setup');
-
-
-
-print '<br>';
-
-$var=true;
-print '<form name="oscommerceconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print "<table class=\"noborder\" width=\"100%\">";
-print "<tr class=\"liste_titre\">";
-print "<td width=\"40%\">".$langs->trans("Parameter")."</td>";
-print "<td>".$langs->trans("Value")."</td>";
-print "<td>".$langs->trans("Examples")."</td>";
-print "</tr>";
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print "<td>".$langs->trans("OSCommerceServer")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"oscommerce_dbhost\" value=\"". (GETPOST('oscommerce_dbhost','alpha')?GETPOST('oscommerce_dbhost','alpha'):$conf->global->OSC_DB_HOST) . "\" size=\"30\"></td>";
-print "<td>localhost";
-//print "<br>__dolibarr_main_db_host__ <i>(".$dolibarr_main_db_host.")</i>"
-print "</td>";
-print "</tr>";
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print "<td>".$langs->trans("OSCommerceDatabaseName")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"oscommerce_dbname\" value=\"". (GETPOST('oscommerce_dbname','alpha')?GETPOST('oscommerce_dbname','alpha'):$conf->global->OSC_DB_NAME) . "\" size=\"30\"></td>";
-print "<td>oscommerce";
-//print "<br>__dolibarr_main_db_name__ <i>(".$dolibarr_main_db_name.")</i>";
-print "</td>";
-print "</tr>";
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print "<td>".$langs->trans("OSCommercePrefix")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"oscommerce_db_table_prefix\" value=\"". (GETPOST('oscommerce_db_table_prefix','alpha')?GETPOST('oscommerce_db_table_prefix','alpha'):$conf->global->DB_TABLE_PREFIX) . "\" size=\"30\"></td>";
-print "<td>osc_";
-print "</td>";
-print "</tr>";
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print "<td>".$langs->trans("OSCommerceUser")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"oscommerce_dbuser\" value=\"". (GETPOST('oscommerce_dbuser','alpha')?GETPOST('oscommerce_dbuser','alpha'):$conf->global->OSC_DB_USER) . "\" size=\"30\"></td>";
-print "<td>oscommerceuser";
-//print "<br>__dolibarr_main_db_user__ <i>(".$dolibarr_main_db_user.")</i>";
-print "</td>";
-print "</tr>";
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print "<td>".$langs->trans("Password")."</td>";
-print "<td><input type=\"password\" class=\"flat\" name=\"oscommerce_dbpass\" value=\"" . (GETPOST('oscommerce_dbpass','alpha')?GETPOST('oscommerce_dbpass','alpha'):$conf->global->OSC_DB_PASS) . "\" size=\"30\"></td>";
-print '<td>';
-//if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ <i>('.preg_replace('/./i','*',$dolibarr_main_db_pass).')</i>';
-print '&nbsp;</td>';
-print "</tr>";
-$var=!$var;
-print "<tr ".$bc[$var].">";
-print "<td>".$langs->trans("PasswordRetype")."</td>";
-print "<td><input type=\"password\" class=\"flat\" name=\"oscommerce_dbpass2\" value=\"" . (GETPOST('oscommerce_dbpass2','alpha')?GETPOST('oscommerce_dbpass2','alpha'):$conf->global->OSC_DB_PASS) ."\" size=\"30\"></td>";
-print '<td>';
-//if ($dolibarr_main_db_pass) print '__dolibarr_main_db_pass__ <i>('.preg_replace('/./i','*',$dolibarr_main_db_pass).')</i>';
-print '&nbsp;</td>';
-print "</tr>";
-print "</table>";
-
-
-print '<br><center>';
-print "<input type=\"submit\" name=\"test\" class=\"button\" value=\"".$langs->trans("TestConnection")."\">";
-print "&nbsp; &nbsp;";
-print "<input type=\"submit\" name=\"save\" class=\"button\" value=\"".$langs->trans("Save")."\">";
-print "</center>";
-
-print "</form>\n";
-
-
-dol_htmloutput_mesg($mesg);
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/boutique/client/class/boutiqueclient.class.php b/htdocs/boutique/client/class/boutiqueclient.class.php
deleted file mode 100644
index fdf393043b0..00000000000
--- a/htdocs/boutique/client/class/boutiqueclient.class.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *      \file       htdocs/boutique/client/class/boutiqueclient.class.php
- *      \brief      Classe permettant de gerer des clients de la boutique online
- *      \author	    Rodolphe Quiedeville
- */
-
-/**
- *      \class      BoutiqueClient
- *      \brief      Classe permettant de gerer des clients de la boutique online
- */
-class BoutiqueClient
-{
-    var $db ;
-
-    var $id ;
-    var $nom;
-
-
-	/**
-	 * 	Constructor
-	 *
-	 * 	@param		DoliDB	$db		Database handler
-	 */
-    function __construct($db)
-    {
-        $this->db = $db;
-    }
-
-    /**
-     *   Fonction permettant de recuperer les informations d'un clients de la boutique
-     *
-     *   @param		int		$id			Id du client
-     *   @return	int					<0 if KO, >0 if OK
-     */
-    function fetch($id)
-    {
-		global $conf;
-
-        $sql = "SELECT customers_id, customers_lastname, customers_firstname FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers WHERE customers_id = ".$id;
-
-        $resql = $this->db->query($sql);
-        if ( $resql )
-        {
-            $result = $this->db->fetch_array($resql);
-
-            $this->id      = $result["customers_id"];
-            $this->name    = $result["customers_firstname"] . " " . $result["customers_lastname"];
-
-            $this->db->free($resql);
-        	return 1;
-        }
-        else
-        {
-            print $this->db->error();
-            return -1;
-        }
-    }
-
-}
diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php
deleted file mode 100644
index 895eea66e79..00000000000
--- a/htdocs/boutique/client/fiche.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003-2005 Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *	\file       htdocs/boutique/client/fiche.php
- *	\ingroup    boutique
- *	\brief      Page fiche client OSCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-include_once DOL_DOCUMENT_ROOT.'/boutique/client/class/boutiqueclient.class.php';
-
-$id=GETPOST('id', 'int');
-
-
-/*
- * Actions
- */
-
-// None
-
-
-
-/*
- * View
- */
-
-llxHeader();
-
-if ($id > 0)
-{
-	$client = new BoutiqueClient($dbosc);
-	$result = $client->fetch($id);
-	if ( $result )
-	{
-		print '<div class="titre">'.$langs->trans("CustomerCard").': '.$client->name.'</div><br>';
-
-		print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
-		print "<tr>";
-		print '<td width="20%">Nom</td><td width="80%">'.$client->name.'</td></tr>';
-		print "</table>";
-
-
-		/*
-		 * Commandes
-		 */
-		$sql = "SELECT o.orders_id, o.customers_id, date_purchased, t.value as total";
-		$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
-		$sql .= " WHERE o.customers_id = " . $client->id;
-		$sql .= " AND o.orders_id = t.orders_id AND t.class = 'ot_total'";
-		//echo $sql;
-		$resql=$dbosc->query($sql);
-		if ($resql)
-		{
-			$num = $dbosc->num_rows($resql);
-			$i = 0;
-			print '<table class="noborder" width="50%">';
-			print "<tr class=\"liste_titre\"><td>Commandes</td>";
-			print "</tr>\n";
-			$var=True;
-			while ($i < $num)
-			{
-				$objp = $dbosc->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
-
-				print '<td><a href="'.DOL_URL_ROOT.'/boutique/commande/fiche.php?id='.$objp->orders_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Fiche">&nbsp;';
-
-				print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour')."</a>\n";
-				print $objp->total . "</a></TD>\n";
-				print "</tr>\n";
-				$i++;
-			}
-			print "</table>";
-			$dbosc->free($resql);
-		}
-		else
-		{
-			print "<p>ERROR 1</p>\n";
-			dol_print_error($dbosc);
-		}
-
-	}
-	else
-	{
-		print "<p>ERROR 1</p>\n";
-		dol_print_error($dbosc);
-	}
-}
-else
-{
-	print "<p>ERROR 1</p>\n";
-	print "Error";
-}
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-// Pas d'action
-
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php
deleted file mode 100644
index 358a74a750f..00000000000
--- a/htdocs/boutique/client/index.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 	    \file       htdocs/boutique/client/index.php
- * 		\ingroup    boutique
- * 		\brief      Page gestion client OSCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-$langs->load("companies");
-
-
-/*
- * View
- */
-
-llxHeader();
-
-if ($sortfield == "") {
-  $sortfield="lower(c.customers_lastname)";
-}
-if ($sortorder == "") {
-  $sortorder="ASC";
-}
-
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Liste des clients", $page, "index.php");
-
-$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c";
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $dbosc->plimit($limit,$offset);
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-  $i = 0;
-  print "<table class=\"noborder\" width=\"100%\">";
-  print "<tr class=\"liste_titre\">";
-  print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname");
-  print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname");
-  print '<td>'.$langs->trans("EMail").'</td><td align="center">'.$langs->trans("Newsletter").'</td>';
-  print "</tr>\n";
-  $var=True;
-  while ($i < $num)
-    {
-      $objp = $dbosc->fetch_object($resql);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-      print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></td>\n";
-      print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></td>\n";
-      print "<td>$objp->customers_email_address</td>\n";
-      print "<td align=\"center\">$objp->customers_newsletter</td>\n";
-      print "</tr>\n";
-      $i++;
-    }
-  print "</table>";
-  $dbosc->free();
-}
-else
-{
-  dol_print_error($dbosc);
-}
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php
deleted file mode 100644
index 5030e5ac559..00000000000
--- a/htdocs/boutique/commande/ca.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 		\file 		htdocs/boutique/commande/ca.php
- * 		\ingroup    boutique
- * 		\brief      Page ca commandes du module OsCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-
-/*
- * View
- */
-
-llxHeader();
-
-if ($sortfield == "")
-{
-  $sortfield="date_purchased";
-}
-if ($sortorder == "")
-{
-  $sortorder="DESC";
-}
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Liste des commandes", $page, "ca.php");
-
-print '<table class="noborder" cellspacing="0" cellpadding="3">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
-print '<td align="right">'.$langs->trans("Lastname").'</td></tr>';
-
-$sql = "SELECT sum(t.value) as value";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
-$sql .= " WHERE t.class = 'ot_subtotal'";
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-
-  $var=True;
-  if ($num > 0)
-    {
-      $objp = $dbosc->fetch_object($resql);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-      print '<td>Somme des commandes</td>';
-      print '<td align="right">'.price($objp->value).'</td>';
-
-      print "</tr>\n";
-      $i++;
-    }
-
-  $dbosc->free();
-}
-else
-{
-  dol_print_error($dbosc);
-}
-
-$sql = "SELECT sum(t.value) as value";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
-$sql .= " WHERE t.class = 'ot_shipping'";
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-
-  $var=True;
-  if ($num > 0)
-    {
-      $objp = $dbosc->fetch_object($resql);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-      print '<td>Somme des frais de port</td>';
-      print '<td align="right">'.price($objp->value).'</td></tr>';
-      $i++;
-    }
-
-  $dbosc->free();
-}
-else
-{
-  dol_print_error($dbosc);
-}
-
-
-print "</table>";
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/commande/class/boutiquecommande.class.php b/htdocs/boutique/commande/class/boutiquecommande.class.php
deleted file mode 100644
index 0a3383a33a3..00000000000
--- a/htdocs/boutique/commande/class/boutiquecommande.class.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/boutique/commande/class/boutiquecommande.class.php
- *	\ingroup    osc
- *	\brief      Fichier de la classe des commandes de la boutique online
- */
-
-require_once DOL_DOCUMENT_ROOT .'/societe/class/address.class.php';
-include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php';
-
-
-/**
- *	Class to manage orders OSC
- */
-class BoutiqueCommande
-{
-    var $db;
-
-    var $id;
-    var $nom;
-
-
-    /**
-     * Constructor
-     *
-     * @param	DoliDB	$db		Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->billing_adr = new Address();
-        $this->delivry_adr = new Address();
-
-        $this->total_ot_subtotal = 0;
-        $this->total_ot_shipping = 0;
-    }
-
-    /**
-     *	Get object and lines from database
-     *
-     *	@param	int		$id		id of object to load
-     * 	@param	string	$ref	Ref of order
-     *	@return int 		    >0 if OK, <0 if KO
-     */
-    function fetch($id,$ref='')
-    {
-        global $conf;
-
-        $sql = "SELECT orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_zipcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_zipcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value";
-        $sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders";
-        $sql.= " WHERE orders_id = ".$id;
-
-        $result = $this->db->query($sql);
-        if ( $result )
-        {
-            $array = $this->db->fetch_array($result);
-
-            $this->id          = $array["orders_id"];
-            $this->client_id   = $array["customers_id"];
-            $this->client_name = $array["customers_name"];
-
-            $this->payment_method = $array["payment_method"];
-
-            $this->date = $this->db->jdate($array["date_purchased"]);
-
-            $this->delivery_adr->name = $array["delivery_name"];
-            $this->delivery_adr->street = $array["delivery_street_address"];
-            $this->delivery_adr->zip = $array["delivery_zipcode"];
-            $this->delivery_adr->city = $array["delivery_city"];
-            $this->delivery_adr->country = $array["delivery_country"];
-
-            $this->billing_adr->name = $array["billing_name"];
-            $this->billing_adr->street = $array["billing_street_address"];
-            $this->billing_adr->zip = $array["billing_zipcode"];
-            $this->billing_adr->city = $array["billing_city"];
-            $this->billing_adr->country = $array["billing_country"];
-
-            $this->db->free();
-
-            /*
-             * Totaux
-             */
-            $sql = "SELECT value, class ";
-            $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total WHERE orders_id = $id";
-
-            $result = $this->db->query($sql);
-            if ( $result )
-            {
-                $num = $this->db->num_rows($result);
-
-				$i=0;
-                while ($i < $num)
-                {
-                    $array = $this->db->fetch_array($result);
-                    if ($array["class"] == 'ot_total')
-                    {
-                        $this->total_ot_total = $array["value"];
-                    }
-                    if ($array["class"] == 'ot_shipping')
-                    {
-                        $this->total_ot_shipping = $array["value"];
-                    }
-                    $i++;
-                }
-            }
-            else
-            {
-                print $this->db->error();
-            }
-
-        }
-        else
-        {
-            print $this->db->error();
-        }
-
-        return $result;
-    }
-
-}
diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php
deleted file mode 100644
index 1e2e90dd41c..00000000000
--- a/htdocs/boutique/commande/fiche.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003-2005 Eric Seigne <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *  \file       htdocs/boutique/commande/fiche.php
- *  \ingroup    boutique
- *  \brief      Page fiche commande OSCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-include_once DOL_DOCUMENT_ROOT.'/boutique/commande/class/boutiquecommande.class.php';
-
-$langs->load("products");
-
-$id=GETPOST('id', 'int');
-
-/*
- *	View
- */
-
-llxHeader();
-
-
-if ($id > 0)
-{
-	$commande = new BoutiqueCommande($db);
-	$result = $commande->fetch($id);
-	if ($result)
-	{
-		print '<div class="titre">'.$langs->trans("OrderCard").': '.$commande->id.'</div><br>';
-
-		print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
-		print '<tr><td width="20%">Date</td><td width="80%" colspan="2">'.$commande->date.'</td></tr>';
-		print '<td width="20%">Client</td><td width="80%" colspan="2"><a href="'.DOL_URL_ROOT.'/boutique/client/fiche.php?id='.$commande->client_id.'">'.$commande->client_name.'</a></td></tr>';
-
-		print '<td width="20%">Paiement</td><td width="80%" colspan="2">'.$commande->payment_method.'</td></tr>';
-
-		print "<tr><td>".$langs->trans("Address")."</td><td>".$langs->trans("Delivery")."</td><td>".$langs->trans("Invoice")."</td></tr>";
-
-		print "<td>&nbsp;</td><td>".$commande->delivery_adr->name."<br>".$commande->delivery_adr->street."<br>".$commande->delivery_adr->zip."<br>".$commande->delivery_adr->city."<br>".$commande->delivery_adr->country."</td>";
-		print "<td>".$commande->billing_adr->name."<br>".$commande->billing_adr->street."<br>".$commande->billing_adr->zip."<br>".$commande->billing_adr->city."<br>".$commande->billing_adr->country."</td>";
-		print "</tr>";
-
-		print "</table>";
-
-		print "<br>";
-
-		/*
-		 * Produits
-		 *
-		 */
-		$sql = "SELECT orders_id, products_id, products_model, products_name, products_price, final_price, products_quantity";
-		$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_products";
-		$sql .= " WHERE orders_id = " . $commande->id;
-		//$commande->id;
-		//	echo $sql;
-		$resql=$dbosc->query($sql);
-		if ($resql)
-		{
-			$num = $dbosc->num_rows($resql);
-			$i = 0;
-			print '<table class="noborder" width="100%">';
-			print '<tr class="liste_titre"><td align="left" width="40%">'.$langs->trans("Products").'</td>';
-			print '<td align="center">'.$langs->trans("Number").'</td><td align="right">'.$langs->trans("Price").'</td><td align="right">Prix final</td>';
-			print "</tr>\n";
-			$var=True;
-			while ($i < $num)
-			{
-				$objp = $dbosc->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
-				print '<td align="left" width="40%">';
-				print '<a href="fiche.php?id='.$objp->products_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" width="16" height="16" alt="Fiche livre"></a>';
-
-				print '<a href="fiche.php?id='.$objp->products_id.'">'.$objp->products_name.'</a>';
-				print "</td>";
-
-				print '<td align="center"><a href="fiche.php?id='.$objp->rowid."\">$objp->products_quantity</a></TD>\n";
-				print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->products_price)."</a></TD>\n";
-				print "<td align=\"right\"><a href=\"fiche.php?id=$objp->rowid\">".price($objp->final_price)."</a></TD>\n";
-
-				print "</tr>\n";
-				$i++;
-			}
-			print "</table>";
-			$dbosc->free();
-		}
-		else
-		{
-			print $dbosc->error();
-		}
-
-		/*
-		 *
-		 *
-		 */
-		print "<br>";
-
-		print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
-		print "<tr>";
-		print '<td width="20%">Frais d\'expeditions</td><td width="80%">'.price($commande->total_ot_shipping).' EUR</td></tr>';
-		print '<td width="20%">'.$langs->trans("Lastname").'</td><td width="80%">'.price($commande->total_ot_total).' EUR</td></tr>';
-		print "</table>";
-
-
-
-	}
-	else
-	{
-		print "Fetch failed";
-	}
-}
-else
-{
-	print "Error";
-}
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-print '<br><table width="100%" border="1" cellspacing="0" cellpadding="3">';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '</table><br>';
-
-
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php
deleted file mode 100644
index cc683994565..00000000000
--- a/htdocs/boutique/commande/index.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 	    \file       htdocs/boutique/commande/index.php
- * 		\ingroup    boutique
- * 		\brief      Page gestion commandes OSCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-
-
-llxHeader();
-
-if ($sortfield == "")
-{
-  $sortfield="date_purchased";
-}
-if ($sortorder == "")
-{
-  $sortorder="DESC";
-}
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Liste des commandes", $page, "commande.php");
-
-    $sql = "SELECT o.orders_id, customers_id, customers_name, customers_company, customers_street_address, customers_suburb, customers_city, customers_postcode, customers_state, customers_country, customers_telephone, customers_email_address, customers_address_format_id, delivery_name, delivery_company, delivery_street_address, delivery_suburb, delivery_city, delivery_postcode, delivery_state, delivery_country, delivery_address_format_id, billing_name, billing_company, billing_street_address, billing_suburb, billing_city, billing_postcode, billing_state, billing_country, billing_address_format_id, payment_method, cc_type, cc_owner, cc_number, cc_expires, last_modified, date_purchased, orders_status, orders_date_finished, currency, currency_value, t.value";
-
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
-$sql .= " WHERE o.orders_id = t.orders_id AND t.class = 'ot_total'";
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $dbosc->plimit($limit,$offset);
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-  $i = 0;
-  print "<table class=\"noborder\" width=\"100%\">";
-  print "<tr class=\"liste_titre\">";
-  print "<td>".$langs->trans("Ref")."</td>";
-  print "<td>".$langs->trans("Date")."</td>";
-  print_liste_field_titre("Client","commande.php", "customers_name");
-  print '<td align="right">'.$langs->trans("Total").'</td>';
-  print "</tr>\n";
-  $var=True;
-  while ($i < $num)
-    {
-      $objp = $dbosc->fetch_object($resql);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-
-      print '<td><a href="fiche.php?id='.$objp->orders_id.'"><img src="/theme/'.$conf->theme.'/img/filenew.png" border="0" alt="Fiche">&nbsp;';
-      print $objp->orders_id ."</a></td><td>";
-      print dol_print_date($dbosc->jdate($objp->date_purchased),'dayhour').'</td>';
-      print '<td><a href="../client/fiche.php?id='.$objp->customers_id.'">'.$objp->customers_name."</a></TD>\n";
-      print '<td align="right">'.price($objp->value).'</td>';
-      print "</tr>\n";
-      $i++;
-    }
-  print "</table>";
-  $dbosc->free();
-}
-else
-{
-  dol_print_error($dbosc);
-}
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php
deleted file mode 100644
index 1b7b9ff0669..00000000000
--- a/htdocs/boutique/critiques/bestproduct.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003 Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 	    \file       htdocs/boutique/critiques/bestproduct.php
- * 		\ingroup    boutique
- * 		\brief      Page affichage meilleures critiques OS Commerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-
-/*
- * View
- */
-
-llxHeader();
-
-if ($sortfield == "") {
-	$sortfield="rat";
-}
-if ($sortorder == "") {
-	$sortorder="DESC";
-}
-
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-
-print_barre_liste("Liste des produits classes par critiques", $page, "bestproduct.php");
-
-$sql = "SELECT sum(r.reviews_rating)/count(r.reviews_rating) as rat, r.products_id, p.products_model, p.products_quantity, p.products_status";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p ";
-$sql .= " WHERE r.products_id = p.products_id";
-$sql .= " GROUP BY r.products_id, p.products_model, p.products_quantity, p.products_status";
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $dbosc->plimit($limit,$offset);
-
-print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-print "<TR class=\"liste_titre\"><td>".$langs->trans("Ref");
-print '</td><TD align="center">Indice critiques</TD>';
-print '</td><td align="center">Quantite';
-print '</td><td align="center">Status</TD>';
-print "</TR>\n";
-
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-	$num = $dbosc->num_rows($resql);
-	$i = 0;
-
-	$var=True;
-	while ($i < $num) {
-		$objp = $dbosc->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		print '<TD><a href="'.DOL_URL_ROOT.'/boutique/livre/fiche.php?oscid='.$objp->products_id.'">'.$objp->products_model.'</a></TD>';
-		print '<TD align="center">'.$objp->rat."</TD>\n";
-		print '<TD align="center">'.$objp->products_quantity."</TD>\n";
-		print '<TD align="center">'.$objp->products_status."</TD>\n";
-		print "</TR>\n";
-		$i++;
-	}
-	$dbosc->free();
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-print "</TABLE>";
-
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/critiques/class/critique.class.php b/htdocs/boutique/critiques/class/critique.class.php
deleted file mode 100644
index cd3a72088ad..00000000000
--- a/htdocs/boutique/critiques/class/critique.class.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *		\file       htdocs/boutique/critiques/class/critique.class.php
- *		\ingroup    osc
- *		\brief      Fichier de la classe des critiques OSCommerce
- */
-
-
-/**
- *		Classe permettant la gestion des critiques OSCommerce
- */
-class Critique
-{
-	var $db;
-
-	var $id;
-	var $nom;
-
-	/**
-	 * Constructor
-	 *
-	 * @param	DoliDB		$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Load instance
-	 *
-	 *	@param	int		$id		Id to load
-	 *	@return	int				<0 if KO, >0 if OK
-	 */
-	function fetch ($id)
-	{
-		global $conf;
-
-		$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name";
-
-		$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews_description as d";
-		$sql .= " ,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
-
-		$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
-		$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID;
-		$sql .= " AND r.reviews_id=$id";
-
-		$result = $this->db->query($sql);
-
-		if ( $result )
-		{
-			$result = $this->db->fetch_array($result);
-
-			$this->id           = $result["reviews_id"];
-			$this->product_name = stripslashes($result["products_name"]);
-			$this->text         = stripslashes($result["reviews_text"]);
-
-			$this->db->free($result);
-		}
-		else
-		{
-			print $this->db->lasterror();
-		}
-
-		return $result;
-	}
-
-}
diff --git a/htdocs/boutique/critiques/fiche.php b/htdocs/boutique/critiques/fiche.php
deleted file mode 100644
index a5ea716ed8c..00000000000
--- a/htdocs/boutique/critiques/fiche.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 	    \file       htdocs/boutique/critiques/fiche.php
- * 		\ingroup    boutique
- * 		\brief      Page fiche critique OS Commerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-$id=$_GET["id"];
-
-
-
-llxHeader();
-
-if ($id)
-{
-
-  $critique = new Critique($dbosc);
-  $result = $critique->fetch($id);
-
-  if ( $result )
-    {
-
-      print '<div class="titre">Fiche Critique</div><br>';
-
-      print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
-      print "<tr>";
-      print '<td width="20%">Produit</td><td width="80%">'.$critique->product_name.'</td></tr>';
-
-      print '<tr><td width="20%">Texte</td><td width="80%">'.nl2br($critique->text).'</td></tr>';
-      print "</table>";
-
-
-
-    }
-  else
-    {
-      print "Fetch failed";
-    }
-
-}
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-print '<br><table width="100%" border="1" cellspacing="0" cellpadding="3">';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '<td width="20%" align="center">-</td>';
-print '</table><br>';
-
-
-
-$dbosc->close();
-
-llxFooter();
-
diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php
deleted file mode 100644
index 98294d5d09c..00000000000
--- a/htdocs/boutique/critiques/index.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 	    \file       htdocs/boutique/critiques/index.php
- * 		\ingroup    boutique
- * 		\brief      Page gestion critiques OSCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-
-/*
- * View
- */
-
-llxHeader();
-
-if ($sortfield == "") {
-	$sortfield="date_added";
-}
-if ($sortorder == "") {
-	$sortorder="DESC";
-}
-
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Critiques", $page, "index.php");
-
-$sql = "SELECT r.reviews_id, r.reviews_rating, d.reviews_text, p.products_name FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews as r, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."reviews_description as d, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
-$sql .= " WHERE r.reviews_id = d.reviews_id AND r.products_id=p.products_id";
-$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID. " AND d.languages_id=".$conf->global->OSC_LANGUAGE_ID;
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $dbosc->plimit($limit,$offset);
-
-print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-print '<TR class="liste_titre">';
-print "<td>Produit</td>";
-print "<td>Critique</td>";
-print "<td align=\"center\">Note</td>";
-print "<TD align=\"right\"></TD>";
-print "</TR>\n";
-
-$resql=$dbosc->query($sql);
-if ($resql) {
-	$num = $dbosc->num_rows($resql);
-	$i = 0;
-
-	$var=True;
-	while ($i < $num) {
-		$objp = $dbosc->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		print "<TD>".substr($objp->products_name, 0, 30)."</TD>\n";
-		print '<TD><a href="fiche.php?id='.$objp->reviews_id.'">'.substr($objp->reviews_text, 0, 40)." ...</a></td>\n";
-		print "<td align=\"center\">$objp->reviews_rating</TD>\n";
-		print "</TR>\n";
-		$i++;
-	}
-	$dbosc->free();
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-print "</TABLE>";
-
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php
deleted file mode 100644
index 040e81b726a..00000000000
--- a/htdocs/boutique/index.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/boutique/index.php
- *	\ingroup    boutique
- *	\brief      Main page of shop zone
- */
-
-require '../main.inc.php';
-
-$langs->load("shop");
-$langs->load("orders");
-
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-llxHeader("",$langs->trans("OSCommerceShop"),"");
-
-print_fiche_titre($langs->trans("OSCommerceShop"));
-
-print '<table width="100%" class="notopnoleftnoright">';
-
-print '<tr><td valign="top" width="40%" class="notopnoleft">';
-
-
-/*
- * Turnover
- */
-print_titre($langs->trans('SalesTurnover'));
-
-print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>';
-print '<td align="right">'.$langs->trans("Total").'</td></tr>';
-
-$now=dol_now();
-
-$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t";
-$sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id";
-$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate($now).")";
-$sql .= " GROUP BY mois ORDER BY mois";
-
-$result=$dbosc->query($sql);
-if ($result)
-{
-	$num = $dbosc->num_rows($result);
-
-	$var=True;
-	$i=0;
-	if ($num > 0)
-	{
-		while ($i < $num)
-		{
-			$objp = $dbosc->fetch_object($result);
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
-			print '<td align="left">'.$objp->mois.'</td>';
-			print '<td align="right">'.price($objp->value).'</td>';
-
-			print "</tr>\n";
-			$i++;
-		}
-	}
-
-	$dbosc->free();
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-
-print "</table>";
-print '</td><td valign="top" width="60%" class="notopnoleftnoright">';
-print_titre($langs->trans("Orders"));
-
-/*
- * Last 5 successful commands
- select o.orders_id, o.customers_id, o.customers_name, o.date_purchased, o.payement_method, o.status, t.value
- from orders_total as t
- join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc
- */
-$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
-$sql .= " WHERE t.class = 'ot_subtotal' ORDER BY o.date_purchased desc";
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-	$langs->load("orders");
-	$num = $dbosc->num_rows($resql);
-	if ($num > 0)
-	{
-		$i = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="4">'.$langs->trans("LastOrders").'</td></tr>';
-
-		$num = min($num,OSC_MAXNBCOM);
-		while ($i < $num)
-		{
-
-			$obj = $dbosc->fetch_object($resql);
-			print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
-			$i++;
-		}
-		print "</table><br>";
-	}
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-/*
- * Last 5 commands in wait
- */
-$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
-$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 5 order by o.date_purchased desc";
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-	$langs->load("orders");
-	$num = $dbosc->num_rows($resql);
-	if ($num > 0)
-	{
-		$i = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="4">'.$langs->trans("En Attente").'</td></tr>';
-
-		$num = min($num,OSC_MAXNBCOM);
-		while ($i < $num)
-		{
-
-	  $obj = $dbosc->fetch_object($resql);
-	  print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
-	  $i++;
-		}
-		print "</table><br>";
-	}
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-/*
- * Commands to treat
- */
-$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
-$sql .= " WHERE t.class = 'ot_subtotal' and o.orders_status = 2 order by o.date_purchased desc";
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-	$langs->load("orders");
-	$num = $dbosc->num_rows($resql);
-	if ($num > 0)
-	{
-		$i = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="4">'.$langs->trans("TreatmentInProgress").'</td></tr>';
-
-		$num = min($num,OSC_MAXNBCOM);
-		while ($i < $num)
-		{
-
-	  $obj = $dbosc->fetch_object($resql);
-	  print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>";
-	  $i++;
-		}
-		print "</table><br>";
-	}
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-
-print '</td></tr><tr>';
-/*
- * Last customers who commanded
- */
-$sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id ";
-$sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_status as s on o.orders_status = s.orders_status_id and s.language_id = 1";
-$sql .= " WHERE t.class = 'ot_subtotal' order by o.date_purchased desc";
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-	$langs->load("orders");
-	$num = $dbosc->num_rows($resql);
-	if ($num > 0)
-	{
-		$i = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="7">'.$langs->trans("Derniers clients").'</td></tr>';
-
-		$num = min($num,OSC_MAXNBCOM);
-		while ($i < $num)
-		{
-		  $obj = $dbosc->fetch_object($resql);
-		  print "<tr><td>$obj->date_purchased</td><td>$obj->customers_name</td><td>$obj->delivery_country</td><td>".price($obj->value)."</td><td>$obj->payment_method</td><td>$obj->orders_id</td><td>$obj->statut</td></tr>";
-		  $i++;
-		}
-		print "</table><br>";
-	}
-}
-else
-{
-	dol_print_error($dbosc);
-}
-print '</tr></table>';
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php
deleted file mode 100644
index f8a24c5a52c..00000000000
--- a/htdocs/boutique/notification/index.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 	    \file       htdocs/boutique/notification/index.php
- * 		\ingroup    boutique
- * 		\brief      Page gestion notification OS Commerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-$langs->load("products");
-
-
-
-llxHeader();
-
-if ($sortfield == "") {
-  $sortfield="lower(c.customers_lastname)";
-}
-if ($sortorder == "") {
-  $sortorder="ASC";
-}
-
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Liste des notifications", $page, "index.php");
-
-$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, p.products_name, p.products_id";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_notifications as n,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
-$sql .= ",".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers as c";
-$sql .= " WHERE n.customers_id = c.customers_id AND p.products_id=n.products_id";
-$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $dbosc->plimit($limit,$offset);
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-  $i = 0;
-  print "<table class=\noborder\" width=\"100%\">";
-  print "<tr class=\"liste_titre\">";
-  print_liste_field_titre("Client","index.php", "c.customers_lastname");
-  print '<td>'.$langs->trans("Product").'</td>';
-  print "</tr>\n";
-  $var=True;
-  while ($i < $num)
-    {
-      $objp = $dbosc->fetch_object($resql);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-      print "<td width='70%'><a href=\"fiche.php?id=$objp->rowid\">$objp->customers_firstname $objp->customers_lastname</a></TD>\n";
-      print '<td><a href="'.DOL_URL_ROOT.'/boutique/livre/fiche.php?oscid='.$objp->products_id.'">'.$objp->products_name."</a></td>";
-      print "</tr>\n";
-      $i++;
-    }
-  print "</table>";
-  $dbosc->free($resql);
-}
-else
-{
-  dol_print_error($dbosc);
-}
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php
deleted file mode 100644
index 6b4b82b60f5..00000000000
--- a/htdocs/boutique/notification/produits.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003 Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 	    \file       htdocs/boutique/notification/produits.php
- * 		\ingroup    boutique
- * 		\brief      Page fiche notification produits OS Commerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-
-/*
- * View
- */
-
-llxHeader();
-
-if ($sortfield == "") {
-  $sortfield="lower(p.products_name)";
-}
-if ($sortorder == "") {
-  $sortorder="ASC";
-}
-
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Liste des produits suivis", $page, "produits.php");
-
-$sql = "SELECT p.products_name, p.products_id, count(p.products_id) as nb";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_notifications as n,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as p";
-$sql .= " WHERE p.products_id=n.products_id";
-$sql .= " AND p.language_id = ".$conf->global->OSC_LANGUAGE_ID;
-$sql .= " GROUP BY p.products_name, p.products_id";
-$sql .= $dbosc->plimit($limit,$offset);
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-  $i = 0;
-  print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-  print "<TR class=\"liste_titre\">";
-  print '<td>Produit</td><td align="center">Nb.</td>';
-  print "<td></td>";
-  print "<td></td>";
-  print "</TR>\n";
-  $var=True;
-  while ($i < $num)
-    {
-      $objp = $dbosc->fetch_object($resql);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-
-      print '<td><a href="'.DOL_URL_ROOT.'/boutique/livre/fiche.php?oscid='.$objp->products_id.'">'.$objp->products_name."</a></td>";
-      print '<td align="center">'.$objp->nb.'</td>';
-
-      print '<td align="center"><a href="index.php?products_id='.$objp->products_id.'">Voir les clients</td>';
-      print '<td align="center"><a href="newsletter?products_id='.$objp->products_id.'">Envoyer une news</a></td>';
-
-      print "</TR>\n";
-      $i++;
-    }
-  print "</TABLE>";
-  $dbosc->free();
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php
deleted file mode 100644
index 057c15f30e1..00000000000
--- a/htdocs/boutique/osc_master.inc.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/* Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/boutique/osc_master.inc.php
- *       \brief      File of preparation of the environment Dolibarr for OSCommerce
- */
-
-
-/*
- * Creation objet $dbosc
- */
-$dbosc=getDoliDBInstance($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT);
-
-if (! $dbosc->connected)
-{
-    dol_syslog($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error,LOG_ERR);
-
-	llxHeader("",$langs->trans("OSCommerceShop"),"");
-	print '<div class="error">'.$langs->trans('FailedConnectDBCheckModuleSetup').'</div>';
-	llxFooter();
-	exit;
-}
-
diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php
deleted file mode 100644
index 02db7d5db2b..00000000000
--- a/htdocs/boutique/produits/index.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 		\file 		htdocs/boutique/produits/index.php
- * 		\ingroup    boutique
- * 		\brief      Page gestion produits du module OsCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-$langs->load("companies");
-
-
-
-llxHeader();
-
-if ($sortfield == "") {
-  $sortfield="lower(c.customers_lastname)";
-}
-if ($sortorder == "") {
-  $sortorder="ASC";
-}
-
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Liste des clients", $page, "index.php");
-
-$sql = "SELECT c.customers_id, c.customers_lastname, c.customers_firstname, c.customers_email_address, c.customers_newsletter";
-$sql .= " FROM ".DB_NAME_OSC.".customers as c";
-$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $dbosc->plimit($limit,$offset);
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-  $i = 0;
-  print "<table class=\"noborder\" width=\"100%\">";
-  print "<tr class=\"liste_titre\">";
-  print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname");
-  print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname");
-  print '<td>'.$langs->trans("EMail").'</td><td align="center">'.$langs->trans("Newsletter").'</td>';
-  print "</tr>\n";
-  $var=True;
-  while ($i < $num)
-    {
-      $objp = $dbosc->fetch_object($resql);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-      print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></td>\n";
-      print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></td>\n";
-      print "<td>$objp->customers_email_address</td>\n";
-      print "<td align=\"center\">$objp->customers_newsletter</td>\n";
-      print "</tr>\n";
-      $i++;
-    }
-  print "</table>";
-  $dbosc->free($resql);
-}
-else
-{
-  dol_print_error($dbosc);
-}
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php
deleted file mode 100644
index d8888505254..00000000000
--- a/htdocs/boutique/produits/osc-liste.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006      Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 		\file 		htdocs/boutique/produits/osc-liste.php
- *		\ingroup    boutique
- *		\brief      Page gestion produits du module OsCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-
-/*
- * View
- */
-
-llxHeader();
-
-if ($sortfield == "") {
-  $sortfield="p.label,p.price";
-}
-if ($sortorder == "") {
-  $sortorder="ASC";
-}
-
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-
-print_barre_liste("Liste des produits oscommerce", $page, "osc-liste.php");
-
-$sql = "SELECT p.products_id, p.products_model, p.products_quantity, p.products_status, d.products_name, m.manufacturers_name, m.manufacturers_id";
-$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as d, ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."manufacturers as m";
-$sql .= " WHERE p.products_id = d.products_id AND d.language_id =" . $conf->global->OSC_LANGUAGE_ID;
-$sql .= " AND p.manufacturers_id=m.manufacturers_id";
-if ($reqstock=='epuise')
-{
-  $sql .= " AND p.products_quantity <= 0";
-}
-
-//$sql .= " ORDER BY $sortfield $sortorder ";
-$sql .= $dbosc->plimit($limit,$offset);
-
-print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-print '<tr class="liste_titre">';
-print "<td>id</td>";
-print "<td>Ref</td>";
-print "<td>Titre</td>";
-print "<td>Groupe</td>";
-print '<td align="center">Stock</td>';
-print '<td align="center">Status</td>';
-print '</tr>'."\n";
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-  $i = 0;
-
-  $var=True;
-  while ($i < $num)
-  {
-    $objp = $dbosc->fetch_object($resql);
-    $var=!$var;
-    print "<tr ".$bc[$var].">";
-    print "<TD>$objp->products_id</TD>\n";
-    print "<TD>$objp->products_model</TD>\n";
-    print "<TD>$objp->products_name</TD>\n";
-    print "<TD>$objp->manufacturers_name</TD>\n";
-    print '<TD align="center">'.$objp->products_quantity."</TD>\n";
-    print '<TD align="center">'.$objp->products_status."</TD>\n";
-    print "</TR>\n";
-    $i++;
-  }
-  $dbosc->free();
-}
-else
-{
-	dol_print_error($dbosc);
-}
-
-print "</TABLE>";
-
-
-$dbosc->close();
-
-llxFooter();
diff --git a/htdocs/boutique/promotion/class/promotion.class.php b/htdocs/boutique/promotion/class/promotion.class.php
deleted file mode 100644
index 6e965ad76d1..00000000000
--- a/htdocs/boutique/promotion/class/promotion.class.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *      \file       htdocs/boutique/promotion/class/promotion.class.php
- *      \brief      File of class to manage discounts on online shop
- */
-
-/**
- *      \class      Promotion
- *      \brief      Class to manage discounts on online shop
- */
-class Promotion
-{
-	var $db;
-
-	var $id;
-	var $parent_id;
-	var $oscid;
-	var $ref;
-	var $titre;
-	var $description;
-	var $price;
-	var $status;
-
-	/**
-	 * 	Constructor
-	 *
-	 * 	@param		DoliDB		$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 *	Create promotion
-	 *
-	 *	@param	User	$user		Object user
-	 *	@param	int		$pid		Pid
-	 *	@param	int		$percent	Percent
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function create($user, $pid, $percent)
-	{
-		global $conf;
-
-		$sql = "SELECT products_price ";
-		$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p";
-		$sql .= " WHERE p.products_id = ".$pid;
-
-		$result = $this->db->query($sql);
-		if ( $result )
-		{
-			$result = $this->db->fetch_array($result);
-			$this->price_init = $result["products_price"];
-		}
-
-		$newprice = $percent * $this->price_init;
-
-		$date_exp = "2003-05-01";  // TODO ????
-		
-		$now=dol_now();
-
-		$sql = "INSERT INTO ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials ";
-		$sql .= " (products_id, specials_new_products_price, specials_date_added, specials_last_modified, expires_date, date_status_change, status) ";
-		$sql .= " VALUES ($pid, $newprice, '".$this->db->idate($now)."', NULL, '".$this->db->idate($now+3600*24*365)."', NULL, 1)";
-
-		if ($this->db->query($sql) )
-		{
-			$id = $this->db->last_insert_id(OSC_DB_NAME.".specials");
-
-			return $id;
-		}
-		else
-		{
-			print $this->db->error() . ' in ' . $sql;
-		}
-	}
-
-	/**
-	 * 	Update
-	 *
-	 *	@param	int		$id			id
-	 *	@param	User	$user		Object user
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function update($id, $user)
-	{
-		$sql = "UPDATE ".MAIN_DB_PREFIX."album ";
-		$sql .= " SET title = '" . trim($this->titre) ."'";
-		$sql .= ",description = '" . trim($this->description) ."'";
-
-		$sql .= " WHERE rowid = " . $id;
-
-		if ( $this->db->query($sql) ) {
-			return 1;
-		} else {
-			print $this->db->error() . ' in ' . $sql;
-		}
-	}
-
-	/**
-	 * 	Set active
-	 *
-	 *	@param	int		$id			id
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function set_active($id)
-	{
-		global $conf;
-
-		$sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials";
-		$sql .= " SET status = 1";
-
-		$sql .= " WHERE products_id = " . $id;
-
-		if ( $this->db->query($sql) ) {
-			return 1;
-		} else {
-			print $this->db->error() . ' in ' . $sql;
-		}
-	}
-
-	/**
-	 * 	Set inactive
-	 *
-	 *	@param	int		$id			id
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function set_inactive($id)
-	{
-		global $conf;
-
-		$sql = "UPDATE ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials";
-		$sql .= " SET status = 0";
-
-		$sql .= " WHERE products_id = " . $id;
-
-		if ( $this->db->query($sql) ) {
-			return 1;
-		} else {
-			print $this->db->error() . ' in ' . $sql;
-		}
-	}
-
-	/**
-	 * 	Fetch datas
-	 *
-	 *	@param	int		$id			id
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function fetch($id)
-	{
-		global $conf;
-
-		$sql = "SELECT c.categories_id, cd.categories_name, c.parent_id";
-		$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."categories as c,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."categories_description as cd";
-		$sql .= " WHERE c.categories_id = cd.categories_id AND cd.language_id = ".$conf->global->OSC_LANGUAGE_ID;
-		$sql .= " AND c.categories_id = ".$id;
-		$result = $this->db->query($sql);
-
-		if ( $result ) {
-			$result = $this->db->fetch_array($result);
-
-			$this->id          = $result["categories_id"];
-			$this->parent_id   = $result["parent_id"];
-			$this->name        = $result["categories_name"];
-			$this->titre       = $result["title"];
-			$this->description = $result["description"];
-			$this->oscid       = $result["osc_id"];
-		}
-		$this->db->free($result);
-
-		return $result;
-	}
-
-
-	/**
-	 * 	Delete object
-	 *
-	 *	@param	User	$user		Object user
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function delete($user)
-	{
-		global $conf;
-
-		$sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products WHERE products_id = $idosc ";
-
-		$sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_to_categories WHERE products_id = $idosc";
-
-		$sql = "DELETE FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description WHERE products_id = $idosc";
-
-	}
-
-
-}
diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php
deleted file mode 100644
index 10dfa09a8c1..00000000000
--- a/htdocs/boutique/promotion/index.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	    \file       htdocs/boutique/promotion/index.php
- * 		\ingroup    boutique
- * 		\brief      Page gestion promotions OSCommerce
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-
-
-llxHeader();
-
-if ($action == "inactive")
-{
-  $promotion = new Promotion($dbosc);
-  $promotion->set_inactive($id);
-}
-if ($action == "active")
-{
-  $promotion = new Promotion($dbosc);
-  $promotion->set_active($id);
-}
-
-if ($sortfield == "")
-{
-  $sortfield="pd.products_name";
-}
-if ($sortorder == "")
-{
-  $sortorder="ASC";
-}
-
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-print_barre_liste("Liste des promotions", $page, "index.php", "",$sortfield, $sortorder);
-
-$urladd = "&sortorder=$sortorder&sortfield=$sortfield";
-
-$sql = "SELECT pd.products_name, s.specials_new_products_price, p.products_price, p.products_model, s.status, p.products_id,";
-$sql.= " expires_date as fin";
-$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."specials as s,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products_description as pd,".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."products as p";
-$sql.= " WHERE s.products_id = pd.products_id AND pd.products_id = p.products_id AND pd.language_id = ".$conf->global->OSC_LANGUAGE_ID;
-$sql.= " ORDER BY $sortfield $sortorder ";
-$sql.= $dbosc->plimit($limit,$offset);
-
-$resql=$dbosc->query($sql);
-if ($resql)
-{
-  $num = $dbosc->num_rows($resql);
-  $i = 0;
-  print '<table class=\"noborder width="100%">';
-  print "<tr class=\"liste_titre\">";
-  print_liste_field_titre($langs->trans("Ref"),"index.php", "p.products_model");
-  print_liste_field_titre("Titre","index.php", "pd.products_name");
-  print "<td>&nbsp;</td><td>&nbsp;</td><td>Fin</td>";
-  print '<td align="right">Prix initial</td>';
-  print '<td align="right">Prix remise</td>';
-  print "</tr>\n";
-  $var=True;
-  while ($i < $num)
-    {
-      $objp = $dbosc->fetch_object($i);
-      $var=!$var;
-
-      print "<tr ".$bc[$var].">";
-      print '<td>'.$objp->products_model."</td>";
-      print '<td>'.$objp->products_name."</td>";
-
-      if ($objp->status == 1)
-	{
-	  print '<td align="center"><img src="/theme/'.$conf->theme.'/img/icon_status_green.png" border="0" alt="actif"></td>';
-	  print '<td align="center">';
-	  print '<a href="index.php?action=inactive&id='.$objp->products_id.''.$urladd.'&page='.$page.'">';
-	  print '<img src="/theme/'.$conf->theme.'/img/icon_status_red_light.png" border="0"></a></td>';
-	}
-      else
-	{
-	  print '<td align="center">';
-	  print '<a href="index.php?action=active&id='.$objp->products_id.''.$urladd.'&page='.$page.'">';
-	  print '<img src="/theme/'.$conf->theme.'/img/icon_status_green_light.png" border="0"></a></td>';
-	  print '<td align="center"><img src="/theme/'.$conf->theme.'/img/icon_status_red.png" border="0" alt="inactif"></td>';
-	}
-      print "<td>".dol_print_date($dbosc->jdate($objp->fin),'day')."</td>";
-      print '<td align="right">'.price($objp->products_price)."</td>";
-      print '<td align="right">'.price($objp->specials_new_products_price)."</td>";
-      print "</tr>";
-      $i++;
-    }
-  print "</TABLE>";
-  $dbosc->free();
-}
-else
-{
-	dol_print_error($dbosc);
-}
-$dbosc->close();
-
-llxFooter();
-
diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest
index 34782a02141..e46443bb86b 100644
--- a/htdocs/cache.manifest
+++ b/htdocs/cache.manifest
@@ -13,7 +13,6 @@ support/
 support/index.php
 support/online.php
 
-support/background.png
 support/default.css
 support/dolibarr_logo2.png
 support/headbg.jpg
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 692b055659b..1ddde37b98b 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'));
@@ -67,12 +66,12 @@ if (GETPOST('action','alpha') == 'set')
  	if (! $error)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
     }
 }
 
@@ -129,9 +128,25 @@ if (! empty($conf->banque->enabled))
 if (! empty($conf->stock->enabled))
 {
 	$var=!$var;
-	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';
+	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>';	// Force warehouse (this is not a default value)
 	print '<td colspan="2">';
-	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 '</td></tr>';
+
+	$disabled=$conf->global->CASHDESK_NO_DECREASE_STOCK;
+	
+	$var=!$var;
+	print '<tr '.$bc[$var].'><td>'.$langs->trans("CashDeskIdWareHouse").'</td>';	// Force warehouse (this is not a default value)
+	print '<td colspan="2">';
+	if (! $disabled)
+	{
+		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1,$disabled);
+		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
+	}
+	else
+	{
+		print $langs->trans("StockDecreaseForPointOfSaleDisabled");
+	}
 	print '</td></tr>';
 }
 
@@ -152,8 +167,6 @@ print '<center><input type="submit" class="button" value="'.$langs->trans("Save"
 
 print "</form>\n";
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/cashdesk/admin/index.html b/htdocs/cashdesk/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 543006baedf..6d8f5ca83ee 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -43,15 +43,19 @@ else
 	$obj_facturation = new Facturation();
 }
 
-print '<div class="liste_articles">';
 
-require ('tpl/liste_articles.tpl.php');
 
-$obj_facturation->prixTotalHt($lst_total_ht);
-$obj_facturation->prixTotalTtc($lst_total_ttc);
+$obj_facturation->calculTotaux();	// Redefine prix_total_ttc, prix_total_ht et montant_tva from $_SESSION['poscart']
 
-print '</div>';
+$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 '<div class="principal">';
 
 $page=GETPOST('menu','alpha');
@@ -75,4 +79,15 @@ else
 
 print '</div>';
 
+
+
+
+// Right area with selected articles (shopping cart)
+print '<div class="liste_articles">';
+
+require ('tpl/liste_articles.tpl.php');
+
+print '</div>';
+
+
 $_SESSION['serObjFacturation'] = serialize($obj_facturation);
diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index 5a713eed4d9..6ac2915a9d1 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -25,6 +25,7 @@
  */
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/environnement.php';
+require_once DOL_DOCUMENT_ROOT.'/cashdesk/include/keypad.php';
 
 // Test if already logged
 if ( $_SESSION['uid'] <= 0 )
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index b2bb87a0bb2..296ced0f172 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -103,7 +103,7 @@ class Facturation
         $sql.= " FROM ".MAIN_DB_PREFIX."c_tva";
         $sql.= " WHERE rowid = ".$this->tva();
 
-        dol_syslog("ajoutArticle sql=".$sql);
+        dol_syslog("ajoutArticle", LOG_DEBUG);
         $resql = $db->query($sql);
 
         if ($resql)
diff --git a/htdocs/cashdesk/class/index.html b/htdocs/cashdesk/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cashdesk/class/index.php b/htdocs/cashdesk/class/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/cashdesk/class/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/css/index.html b/htdocs/cashdesk/css/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index 578d8fed6a2..f62a9193830 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -30,23 +30,24 @@ p {
 .conteneur {
 	background: #fff;
 	text-align: left;
-	width: 770px;
+	max-width: 770px;
 	margin: 10px auto;
+	border: 2px solid #000;
 }
 
 .conteneur_img_gauche {
-	background: url("../img/bg_conteneur_gauche.png") top left repeat-y;
+	/* background: url("../img/bg_conteneur_gauche.png") top left repeat-y; */
 }
 
 .conteneur_img_droite {
-	background: url("../img/bg_conteneur_droite.png") top right repeat-y;
+	/* background: url("../img/bg_conteneur_droite.png") top right repeat-y; */
 }
 
 /* ------------------- Header ------------------- */
 .entete {
 	height: 15px;
 	margin: 0;
-	background: url('../img/bg_entete.png') no-repeat left top;
+	/* background: url('../img/bg_entete.png') no-repeat left top; */
 }
 
 .entete span {
@@ -57,7 +58,6 @@ p {
 .menu_principal {
     margin: 0 20px 20px 15px;
     font-size: 14px;
-	width: 735px;
 	height: 84px;
 	background: #CCCCCC;
 	background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(40,40,40,.3) 100%);
@@ -80,20 +80,21 @@ p {
 
 .menu li {
 	float: left;
+	padding-right: 10px;
 }
 
 .menu_choix1,.menu_choix2 {
 	font-size: 1.4em;
 	text-align: left;
-	width: 180px;
 }
 
 .menu_choix1 a,.menu_choix2 a {
 	display: block;
 	color: #fff;
 	text-decoration: none;
-	width: 100px;
+	padding-top: 18px;
 	padding-left: 54px;
+	font-size: 14px;
 	height: 48px;
 	background: url('../img/new.png') top left no-repeat;
 }
@@ -115,7 +116,6 @@ p {
 	text-align: right;
 	font-style: italic;
 	font-weight: normal;
-	width: 340px;
 	display: block;
 	color: #333;
 	text-decoration: none;
@@ -126,11 +126,13 @@ p {
 	font-weight: normal;
 	text-decoration: none;
 }
-
+li.menu_choix0 {
+		float: right;
+}
 
 /* ------------------- R�capitulatif des articles ------------------- */
 .liste_articles {
-	width: 215px;
+	min-width: 215px;
 	float: right;
 	margin-top: 8px;
 	margin-right: 20px;
@@ -215,16 +217,12 @@ p.titre {
 	border: 1px solid #6d3f6d;
 }
 
-.bouton_login input {
-	background: #fff;
-	border: 1px solid #6d3f6d;
-}
-
 .principal {
 	float: left;
 	margin: 0 15px;
 	padding: 0;
-	width: 495px;
+	max-width: 500px;
+	width: 100%;
 }
 
 .titre1 {
@@ -242,7 +240,6 @@ p.titre {
 .cadre_facturation {
 	border: 2px solid #ddd;
 	margin-bottom: 15px;
-	padding: 10px 10px;
 }
 
 .principal p {
@@ -312,7 +309,7 @@ p.titre {
 }
 
 .texte_ref {
-	width: 80px;
+	min-width: 150px;
 }
 
 .texte1,.texte1_off {
@@ -325,35 +322,12 @@ p.titre {
 
 /* ------------------- */
 .textarea_note {
-	width: 300px;
-	height: 150px;
+	width: 100%;
+	height: 50px;
 	padding: 2px 2px;
 }
 
 /* -------------- Boutons --------------------- */
-.bouton_ajout_article,.bouton_mode_reglement,.bouton_validation {
-	border: 1px solid #999;
-	background: #f7f7f7;
-	
-background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );	
-}
-
-.bouton_ajout_article:hover,.bouton_mode_reglement:hover,.bouton_validation:hover
-{
-	background: #cccccc;
-background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );
-}
-
 .bouton_ajout_article {
 	margin-top: 10px;
 	width: 100%;
@@ -389,7 +363,7 @@ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0,
 }
 
 .resume_label,.note_label {
-	width: 200px;
+	min-width: 200px;
 	font-weight: bold;
 	font-size: 1.1em;
 }
@@ -402,7 +376,7 @@ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0,
 .pied {
 	clear: both;
 	height: 15px;
-	background: url('../img/bg_pied.png') no-repeat bottom left;
+	/* background: url('../img/bg_pied.png') no-repeat bottom left; */
 }
 
 /* ------------------- Param�tres communs (messages d'erreur, informations, etc...) ------------------- */
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index 32411f627fb..dd722805eb6 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -65,7 +65,7 @@ if ( GETPOST('filtre') ) {
 	else $sql.= ")";
 	$sql.= " ORDER BY label";
 
-	dol_syslog("facturation.php sql=".$sql);
+	dol_syslog("facturation.php", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -156,11 +156,11 @@ $i=0;
 
 $sql = "SELECT t.rowid, t.taux";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
-$sql.= ", ".MAIN_DB_PREFIX."c_pays as p";
-$sql.= " WHERE t.fk_pays = p.rowid";
+$sql.= ", ".MAIN_DB_PREFIX."c_country as c";
+$sql.= " WHERE t.fk_pays = c.rowid";
 $sql.= " AND t.active = 1";
-$sql.= " AND p.code = '".$mysoc->country_code."'";
-//print $request;
+$sql.= " AND c.code = '".$mysoc->country_code."'";
+//print $sql;
 
 $resql = $db->query($sql);
 if ($resql)
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 88a22f7865a..e481fcbecf6 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -62,7 +62,7 @@ if (dol_strlen($_GET["code"]) >= 0)	// If search criteria is on char length at l
 	}
 	$sql.= " ORDER BY label";
 
-	dol_syslog("facturation_dhtml.php sql=".$sql);
+	dol_syslog("facturation_dhtml.php", LOG_DEBUG);
 	$result = $db->query($sql);
 
 	if ($result)
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/img/index.html b/htdocs/cashdesk/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cashdesk/img/index.php b/htdocs/cashdesk/img/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/cashdesk/img/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
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/index.html b/htdocs/cashdesk/include/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cashdesk/include/index.php b/htdocs/cashdesk/include/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/cashdesk/include/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/include/keypad.php b/htdocs/cashdesk/include/keypad.php
new file mode 100644
index 00000000000..7560180396a
--- /dev/null
+++ b/htdocs/cashdesk/include/keypad.php
@@ -0,0 +1,54 @@
+<?php
+/* Copyright (C) 2014	Charles-FR BENKE		<charles.fr@benke.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Return a string to output a keypad
+ *
+ * @param	string		$keypadname		Key pad name
+ * @param 	string		$formname		Form name
+ * @return	string						HTML code to show a js keypad.
+ */
+function genkeypad($keypadname, $formname)
+{
+	global $conf;
+
+	if (empty($conf->global->CASHDESK_SHOW_KEYPAD)) return '';
+
+	// défine the font size of button
+	$btnsize=32;
+	$sz='<input type="button" id="closekeypad'.$keypadname.'" value="X" style="display:none;" onclick="closekeypad(\''.$keypadname.'\')"/>'."\n";
+	$sz.='<input type="button" value="..." id="openkeypad'.$keypadname.'" onclick="openkeypad(\''.$keypadname.'\')"/><br>'."\n";
+	$sz.='<div id="keypad'.$keypadname.'" style="position:absolute;z-index:90;display:none; background:#AAA; vertical-align:top;">'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 7 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',7);"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 8 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',8);"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 9 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',9);"/><br/>'."\n";
+
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 4 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',4);"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 5 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',5);"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 6 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',6);"/><br/>'."\n";
+
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 1 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',1);"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 2 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',2);"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 3 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',3);"/><br/>'."\n";
+
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value=" 0 " onclick="addvalue(\''.$keypadname.'\',\''.$formname.'\',0);"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value="&larr;" ';
+	$sz.=' onclick="document.getElementById(\''.$keypadname.'\').value=document.getElementById(\''.$keypadname.'\').value.substr(0,document.getElementById(\''.$keypadname.'\').value.length-1);modif();"/>'."\n";
+	$sz.='<input type="button" style="font-size:'.$btnsize.'px;" value="CE" onclick="document.getElementById(\''.$keypadname.'\').value=0;modif();"/>'."\n";
+	$sz.='</div>';
+	return $sz;
+}
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 8ea6063a5e4..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 '</td>';
 print "</tr>\n";
 
-if (! empty($conf->stock->enabled))
+if (! empty($conf->stock->enabled) && empty($conf->global->CASHDESK_NO_DECREASE_STOCK))
 {
 	$langs->load("stocks");
 	print "<tr>";
 	print '<td class="label1">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
 	$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 '<input name="warehouse_id" class="texte_login" type="warehouse_id" value="" />';
+	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 '</td>';
 	print "</tr>\n";
 }
@@ -152,7 +151,7 @@ print "</tr>\n";
 </table>
 <br>
 
-<div align="center"><span class="bouton_login"><input name="sbmtConnexion" type="submit" value=<?php echo $langs->trans("Connection"); ?> /></span></div>
+<div align="center"><span class="bouton_login"><input class="button" name="sbmtConnexion" type="submit" value=<?php echo $langs->trans("Connection"); ?> /></span></div>
 
 </form>
 </fieldset>
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/javascript/index.html b/htdocs/cashdesk/javascript/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cashdesk/javascript/index.php b/htdocs/cashdesk/javascript/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/cashdesk/javascript/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/javascript/keypad.js b/htdocs/cashdesk/javascript/keypad.js
new file mode 100644
index 00000000000..6de759fc35a
--- /dev/null
+++ b/htdocs/cashdesk/javascript/keypad.js
@@ -0,0 +1,36 @@
+/* Copyright (C) 2014	Charles-FR BENKE		<charles.fr@benke.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+function closekeypad(keypadname)
+{
+	document.getElementById('keypad'+keypadname).style.display='none';
+	document.getElementById('closekeypad'+keypadname).style.display='none';
+	document.getElementById('openkeypad'+keypadname).style.display='inline-block';
+}
+function openkeypad(keypadname)
+{
+	document.getElementById('keypad'+keypadname).style.display='inline-block';
+	document.getElementById('closekeypad'+keypadname).style.display='inline-block';
+	document.getElementById('openkeypad'+keypadname).style.display='none';
+}
+function addvalue(keypadname, formname, valueToAdd)
+{
+	myform=document.forms[formname];
+	if (myform.elements[keypadname].value=="0")
+		myform.elements[keypadname].value="";
+	myform.elements[keypadname].value+=valueToAdd;
+	modif();
+}
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index d8e4049f922..338c0f23b16 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -28,6 +28,7 @@ $langs->load("cashdesk");
 
 <script type="text/javascript" src="javascript/facturation1.js"></script>
 <script type="text/javascript" src="javascript/dhtml.js"></script>
+<script type="text/javascript" src="javascript/keypad.js"></script>
 
 <!-- ========================= Cadre "Article" ============================= -->
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Article"); ?></legend>
@@ -42,6 +43,7 @@ $langs->load("cashdesk");
 			<!-- Affichage de la reference et de la designation -->
 			<td><input class="texte_ref" type="text" id ="txtRef" name="txtRef" value="<?php echo $obj_facturation->ref() ?>"
 				onchange="javascript: setSource('REF');"
+				onkeyup="javascript: verifResultat('resultats_dhtml', this.value);"
 				onfocus="javascript: this.select(); verifResultat('resultats_dhtml', this.value);"
 				onBlur="javascript: document.getElementById('resultats_dhtml').innerHTML = '';"/>
 			</td>
@@ -103,23 +105,28 @@ $langs->load("cashdesk");
             <th><?php echo $langs->trans("VATRate"); ?></th>
             </tr>
 			<tr>
-				<td><input class="texte1" type="text" name="txtQte" value="1" onkeyup="javascript: modif();" onfocus="javascript: this.select();" /></td>
+				<td><input class="texte1" type="text" id="txtQte" name="txtQte" value="1" onkeyup="javascript: modif();" onfocus="javascript: this.select();" />
+<?php print genkeypad("txtQte", "frmQte");?>
+				</td>
 				<!-- Affichage du stock pour l'article courant -->
 				<td>
 				<input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" />
 				</td>
-				<!-- Affichage du prix unitaire -->
-				<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" disabled="disabled" /></td>
+				<!-- Show unit price -->
+				<?php // TODO Remove the disabled and use this value when adding product into cart ?>
+				<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled="disabled" /></td>
 				<td><?php echo $conf->currency; ?></td>
     			<!-- Choix de la remise -->
-    			<td><input class="texte1" type="text" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/></td>
+    			<td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
+<?php print genkeypad("txtRemise", "frmQte");?>
+    			</td>
     			<!-- Affichage du total HT -->
     			<td><input class="texte1_off" type="text" name="txtTotal" value="" disabled="disabled" /></td><td><?php echo $conf->currency; ?></td>
                 <!-- Choix du taux de TVA -->
                 <td class="select_tva">
+                <?php //var_dump($tab_tva); ?>
                 <select name="selTva" onchange="javascript: modif();" >
                     <?php
-
                         $tva_tx = $obj_facturation->tva();
                         $tab_tva_size=count($tab_tva);
                         for($i=0;$i < $tab_tva_size;$i++) {
@@ -127,23 +134,21 @@ $langs->load("cashdesk");
                             if ( $tva_tx == $tab_tva[$i]['taux'] )
                                 $selected = 'selected="selected"';
                             else
-                                $selected = '';
+                            $selected = '';
 
                             echo ('<option '.$selected.' value="'.$tab_tva[$i]['rowid'].'">'.$tab_tva[$i]['taux'].'</option>'."\n               ");
-
                         }
-
                     ?>
                 </select>
                 </td>
 			</tr>
 		</table>
 
-		<input class="bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
+		<input class="button bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
 	</form>
 </fieldset>
 
-<!-- ========================= Cadre "Difference" ============================= -->
+<!-- ========================= Cadre "Amount" ============================= -->
 <form id="frmDifference"  class="formulaire1" method="post" onsubmit="javascript: return verifReglement()" action="validation_verif.php?action=valide_achat">
 	<input type="hidden" name="hdnChoix" value="" />
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@@ -154,7 +159,9 @@ $langs->load("cashdesk");
 			<!-- Affichage du montant du -->
 			<td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled="disabled" /></td>
 			<!-- Choix du montant encaisse -->
-			<td><input class="texte2" type="text" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /></td>
+			<td><input class="texte2" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" />
+<?php print genkeypad("txtEncaisse", "frmDifference");?>
+			</td>
 			<!-- Affichage du montant rendu -->
 			<td><input class="texte2_off" type="text" name="txtRendu" value="0" disabled="disabled" /></td>
 			</tr>
@@ -172,7 +179,7 @@ $langs->load("cashdesk");
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
 			}
-			else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
+			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
 			print '</td>';
 			print '<td>';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
@@ -180,15 +187,15 @@ $langs->load("cashdesk");
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
 			}
-			else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
+			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
 			print '</td>';
 			print '<td>';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
 			{
 				$langs->load("errors");
-				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cheque").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
+				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
 			}
-			else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cheque").'" onclick="javascript: verifClic(\'CHQ\');" />';
+			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
 			print '</td>';
 			?>
 			</tr>
@@ -196,14 +203,11 @@ $langs->load("cashdesk");
 		<table>
 			<tr>
 				<td>
-				<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
+				<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
 				<?php
 				echo $langs->trans("DateEcheance").' :';
 				print $form->select_date(-1,'txtDatePaiement');
 				?>
-<!-- <input class="texte2" type="text" id="txtDatePaiement" name="txtDatePaiement" value="" />
-				<input class="bouton_cal" type="image" src="img/calendrier.png" id="btnCalendrier" value="..." title="<?php echo $langs->trans("CalTip"); ?>" />
- -->
  				</td>
 			</tr>
 
diff --git a/htdocs/cashdesk/tpl/index.html b/htdocs/cashdesk/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cashdesk/tpl/index.php b/htdocs/cashdesk/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/cashdesk/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index 2fac2e2a16a..160c9afd8a8 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -67,8 +67,6 @@ else
     }
 }
 
-$obj_facturation->calculTotaux();
-$total_ttc = $obj_facturation->prixTotalTtc();
 echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price(price2num($total_ttc, 'MT'),0,$langs,0,0,-1,$conf->currency).'<br></p>'."\n");
 
 ?></div>
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.'<br>';
 /*print $langs->trans("CashDeskBankCash").': '.$bankcashLink.'<br>';
 print $langs->trans("CashDeskBankCB").': '.$bankcbLink.'<br>';
 print $langs->trans("CashDeskBankCheque").': '.$bankchequeLink.'<br>';*/
-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/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index 54e82c3ded7..9ea8cb70943 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -153,4 +153,5 @@ echo '<tr><th class="nowrap">'.$langs->trans("TotalTTC").'</th><td class="nowrap
 <a class="lien" href="#"
 	onclick="javascript: window.close(); return(false);"><?php echo $langs->trans("Close"); ?></a>
 
-</body>
\ No newline at end of file
+</body>
+</html>
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");
 		</p>
 		<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>
 
-		<span><input class="bouton_validation" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /></span>
-		<p><a class="lien1" href="affIndex.php?menu=facturation"><?php echo $langs->trans("RestartSelling"); ?></a></p>
+		<div class="center"><input class="button" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /><br>
+		<br><a class="lien1" href="affIndex.php?menu=facturation"><?php echo $langs->trans("RestartSelling"); ?></a>
+		</div>
 	</form>
 
 
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");
 
 ?>
 
-<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3>
+<h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3><br>
 
 <div class="cadre_facturation">
 
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/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 6f8369afc89..712f60f25cd 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -35,7 +35,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -65,7 +65,7 @@ llxHeader('',$langs->trans("Categories"),$help_url);
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'setup');
 
-$head = categoriesadmin_prepare_head(null);
+$head = categoriesadmin_prepare_head();
 
 dol_fiche_head($head, 'attributes_categories', $langs->trans("Categories"), 0, 'category');
 
diff --git a/htdocs/categories/admin/index.html b/htdocs/categories/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
new file mode 100644
index 00000000000..672c92b9508
--- /dev/null
+++ b/htdocs/categories/card.php
@@ -0,0 +1,272 @@
+<?php
+/* Copyright (C) 2005		Matthieu Valleton	<mv@seeschloss.org>
+ * Copyright (C) 2006-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2007		Patrick Raguin		<patrick.raguin@gmail.com>
+ * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/categories/card.php
+ *		\ingroup    category
+ *		\brief      Page to create a new category
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("categories");
+
+// Security check
+$socid=GETPOST('socid','int');
+if (!$user->rights->categorie->lire) accessforbidden();
+
+$action		= GETPOST('action','alpha');
+$cancel		= GETPOST('cancel','alpha');
+$origin		= GETPOST('origin','alpha');
+$catorigin	= GETPOST('catorigin','int');
+$type 		= GETPOST('type','alpha');
+$urlfrom	= GETPOST('urlfrom','alpha');
+
+$socid=GETPOST('socid','int');
+$label=GETPOST('label');
+$description=GETPOST('description');
+$visible=GETPOST('visible');
+$parent=GETPOST('parent');
+
+if ($origin)
+{
+	if ($type == 0) $idProdOrigin 		= $origin;
+	if ($type == 1) $idSupplierOrigin 	= $origin;
+	if ($type == 2) $idCompanyOrigin 	= $origin;
+	if ($type == 3) $idMemberOrigin 	= $origin;
+	if ($type == 4) $idContactOrigin 	= $origin;
+}
+
+if ($catorigin && $type == 0) $idCatOrigin = $catorigin;
+
+$object = new Categorie($db);
+
+$extrafields = new ExtraFields($db);
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+/*
+ *	Actions
+ */
+
+// Add action
+if ($action == 'add' && $user->rights->categorie->creer)
+{
+	// Action ajout d'une categorie
+	if ($cancel)
+	{
+		if ($urlfrom)
+		{
+			header("Location: ".$urlfrom);
+			exit;
+		}
+		else if ($idProdOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?id='.$idProdOrigin.'&type='.$type);
+			exit;
+		}
+		else if ($idCompanyOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idCompanyOrigin.'&type='.$type);
+			exit;
+		}
+		else if ($idSupplierOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idSupplierOrigin.'&type='.$type);
+			exit;
+		}
+		else if ($idMemberOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
+			exit;
+		}
+		else if ($idCatOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCatOrigin.'&type='.$type);
+			exit;
+		}
+		else if ($idContactOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
+			exit;
+		}
+		else
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
+			exit;
+		}
+	}
+
+
+
+	$object->label			= $label;
+	$object->description	= dol_htmlcleanlastbr($description);
+	$object->socid			= ($socid ? $socid : 'null');
+	$object->visible		= $visible;
+	$object->type			= $type;
+
+	if ($parent != "-1") $object->fk_parent = $parent;
+
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	if (! $object->label)
+	{
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")), 'errors');
+		$action = 'create';
+	}
+
+	// Create category in database
+	if (! $error)
+	{
+		$result = $object->create($user);
+		if ($result > 0)
+		{
+			$action = 'confirmed';
+			$_POST["addcat"] = '';
+		}
+		else
+		{
+			setEventMessage($object->error,'errors');
+		}
+	}
+}
+
+// Confirm action
+if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->creer)
+{
+	// Action confirmation de creation categorie
+	if ($action == 'confirmed')
+	{
+		if ($urlfrom)
+		{
+			header("Location: ".$urlfrom);
+			exit;
+		}
+		else if ($idProdOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?id='.$idProdOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
+			exit;
+		}
+		else if ($idCompanyOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idCompanyOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
+			exit;
+		}
+		else if ($idSupplierOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idSupplierOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
+			exit;
+		}
+		else if ($idMemberOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
+			exit;
+		}
+		else if ($idCatOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCatOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
+			exit;
+		}
+		else if ($idContactOrigin)
+		{
+			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
+			exit;
+		}
+
+		header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$result.'&type='.$type);
+		exit;
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+llxHeader("","",$langs->trans("Categories"));
+
+if ($user->rights->categorie->creer)
+{
+	/*
+	 * Fiche en mode creation
+	 */
+	if ($action == 'create' || $_POST["addcat"] == 'addcat')
+	{
+		dol_set_focus('#label');
+
+		print '<form action="'.$_SERVER['PHP_SELF'].'?type='.$type.'" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="urlfrom" value="'.$urlfrom.'">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="addcat" value="addcat">';
+		print '<input type="hidden" name="id" value="'.GETPOST('origin').'">';
+		print '<input type="hidden" name="type" value="'.$type.'">';
+		if ($origin) print '<input type="hidden" name="origin" value="'.$origin.'">';
+		if ($catorigin)	print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
+
+		print_fiche_titre($langs->trans("CreateCat"));
+
+		print '<table width="100%" class="border">';
+
+		// Ref
+		print '<tr>';
+		print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="flat" name="label" size="25" value="'.$label.'">';
+		print'</td></tr>';
+
+		// Description
+		print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor=new DolEditor('description',$description,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50);
+		$doleditor->Create();
+		print '</td></tr>';
+
+		// Parent category
+		print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
+		print $form->select_all_categories($type, $catorigin);
+		print '</td></tr>';
+
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+		print '</table>';
+
+		print '<center><br>';
+		print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
+		print ' &nbsp; &nbsp; ';
+		print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';
+		print '</center>';
+
+		print '</form>';
+	}
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 7f8ceac853e..e9e11b656b9 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -93,7 +93,7 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user,$objecttype,$objectid,$dbtablename,'','',$fieldid);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('categorycard'));
+$hookmanager->initHooks(array('categorycard','globalcard'));
 
 
 /*
@@ -102,7 +102,7 @@ $hookmanager->initHooks(array('categorycard'));
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
@@ -207,8 +207,7 @@ if (empty($reshook))
 			}
 			else
 			{
-				setEventMessage($cat->error,'errors');
-				setEventMessage($cat->errors,'errors');
+				setEventMessages($cat->error,$this->errors,'errors');
 			}
 		}
 	}
@@ -396,7 +395,7 @@ else if ($id || $ref)
 		llxHeader("","",$langs->trans("Member"));
 
 
-		$head=member_prepare_head($member, $user);
+		$head=member_prepare_head($member);
 		$titre=$langs->trans("Member");
 		$picto='user';
 		dol_fiche_head($head, 'category', $titre,0,$picto);
@@ -471,7 +470,7 @@ else if ($id || $ref)
 		llxHeader("","",$langs->trans("Contact"));
 
 
-		$head=contact_prepare_head($object, $user);
+		$head=contact_prepare_head($object);
 		$titre=$langs->trans("ContactsAddresses");
 		$picto='contact';
 		dol_fiche_head($head, 'category', $titre,0,$picto);
@@ -551,7 +550,7 @@ else if ($id || $ref)
         {
             $langs->load("mails");
             print '<td class="nowrap">'.$langs->trans("NbOfEMailingsReceived").'</td>';
-            print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/liste.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td>';
+            print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td>';
         }
         else
         {
@@ -622,32 +621,32 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
 	if ($typeid == 3) $title = $langs->trans("MembersCategoriesShort");
 	if ($typeid == 4) $title = $langs->trans("ContactCategoriesShort");
 
+	$linktocreate='';
+	if ($showclassifyform && $user->rights->categorie->creer)
+	{
+		$linktocreate='<a href="'.DOL_URL_ROOT.'/categories/card.php?action=create&amp;origin='.$object->id.'&type='.$typeid.'&urlfrom='.urlencode($_SERVER["PHP_SELF"].'?'.(($typeid==1||$typeid==2)?'socid':'id').'='.$object->id.'&type='.$typeid).'">';
+		$linktocreate.=$langs->trans("CreateCat").' ';
+		$linktocreate.=img_picto($langs->trans("Create"),'filenew');
+		$linktocreate.="</a>";
+	}
+
 	print '<br>';
-	print_fiche_titre($title,'','');
+	print_fiche_titre($title,$linktocreate,'');
 
 	// Form to add record into a category
 	if ($showclassifyform)
 	{
-		print '<form method="post" action="'.DOL_URL_ROOT.'/categories/categorie.php">';
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 		print '<input type="hidden" name="type" value="'.$typeid.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre"><td width="40%">';
-		print $langs->trans("ClassifyInCategory").' &nbsp;';
+		print '<span class="hideonsmartphone">'.$langs->trans("ClassifyInCategory").' &nbsp;</span>';
 		print $form->select_all_categories($typeid,'auto');
-		print '</td><td>';
-		print '<input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>';
-		if ($user->rights->categorie->creer)
-		{
-			print '<td align="right">';
-			print '<a href="'.DOL_URL_ROOT.'/categories/fiche.php?action=create&amp;origin='.$object->id.'&type='.$typeid.'&urlfrom='.urlencode($_SERVER["PHP_SELF"].'?'.(($typeid==1||$typeid==2)?'socid':'id').'='.$object->id.'&type='.$typeid).'">';
-			print $langs->trans("CreateCat").' ';
-			print img_picto($langs->trans("Create"),'filenew');
-			print "</a>";
-			print '</td>';
-		}
+		print '</td>';
+		print '<td><input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>';
 		print '</tr>';
 		print '</table>';
 		print '</form>';
@@ -680,10 +679,7 @@ function formCategory($db,$object,$typeid,$socid=0,$showclassifyform=1)
 				print "<tr ".$bc[$var].">";
 
 				// Categorie
-				print "<td>";
-				//$c->id=;
-				//print $c->getNomUrl(1);
-				print img_object('','category').' '.$way."</td>";
+				print "<td>".img_object('','category').' '.$way."</td>";
 
 				// Link to delete from category
 				print '<td align="right">';
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 2044c511c35..de8d494f9fc 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -87,10 +87,10 @@ class Categorie extends CommonObject
 
 		else
 		{
-			if ($label) $sql.= " WHERE label = '".$this->db->escape($label)."' AND entity=".$conf->entity;;
+			if ($label) $sql.= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category',1).")";
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -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);
 
@@ -161,7 +161,7 @@ class Categorie extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this).'::create sql='.$sql);
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie (";
 		$sql.= "fk_parent,";
 		$sql.= " label,";
@@ -188,7 +188,7 @@ class Categorie extends CommonObject
 		$sql.= $conf->entity;
 		$sql.= ")";
 
-		dol_syslog(get_class($this).'::create sql='.$sql);
+		dol_syslog(get_class($this).'::create', LOG_DEBUG);
 		$res = $this->db->query($sql);
 		if ($res)
 		{
@@ -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'));
@@ -216,15 +218,21 @@ class Categorie extends CommonObject
 				}
 				else if ($reshook < 0) $error++;
 
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('CATEGORY_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('CATEGORY_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 
-				$this->db->commit();
-				return $id;
+                if ( ! $error )
+                {
+    				$this->db->commit();
+    				return $id;
+                }
+                else
+              	{
+                	$this->db->rollback();
+                    return -3;
+                }
 			}
 			else
 			{
@@ -235,7 +243,6 @@ class Categorie extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-            dol_syslog(get_class($this)."::create error ".$this->error." sql=".$sql, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -281,14 +288,16 @@ class Categorie extends CommonObject
 		$sql .= ", fk_parent = ".$this->fk_parent;
 		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql);
+		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))
 			{
@@ -306,12 +315,10 @@ class Categorie extends CommonObject
 			$this->db->commit();
 
 
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CATEGORY_MODIFY',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('CATEGORY_MODIFY',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 
 			return 1;
 		}
@@ -335,6 +342,9 @@ class Categorie extends CommonObject
 
 		$error=0;
 
+        // Clean parameters
+		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);
+
 		dol_syslog(get_class($this)."::remove");
 
 		$this->db->begin();
@@ -349,7 +359,6 @@ class Categorie extends CommonObject
 			if (!$this->db->query($sql))
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
 				$error++;
 			}
 		}
@@ -360,7 +369,6 @@ class Categorie extends CommonObject
 			if (!$this->db->query($sql))
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
 				$error++;
 			}
 		}
@@ -371,7 +379,6 @@ class Categorie extends CommonObject
 			if (!$this->db->query($sql))
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
 				$error++;
 			}
 		}
@@ -382,7 +389,6 @@ class Categorie extends CommonObject
 			if (!$this->db->query($sql))
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
 				$error++;
 			}
 		}
@@ -393,7 +399,6 @@ class Categorie extends CommonObject
 			if (!$this->db->query($sql))
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
 				$error++;
 			}
 		}
@@ -402,6 +407,16 @@ class Categorie extends CommonObject
 			$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact";
 			$sql .= " WHERE fk_categorie = ".$this->id;
 			if (!$this->db->query($sql))
+			{
+				$this->error=$this->db->lasterror();
+				$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);
@@ -417,7 +432,6 @@ class Categorie extends CommonObject
 			if (!$this->db->query($sql))
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
 				$error++;
 			}
 			else
@@ -431,16 +445,14 @@ 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);
 						}
 					}
 				}
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('CATEGORY_DELETE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; $this->error=join(',',$this->errors); }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('CATEGORY_DELETE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 		}
 
@@ -480,10 +492,12 @@ class Categorie extends CommonObject
         if ($type=='contact') $column_name='socpeople';
         if ($type=='fournisseur') $column_name='societe';
 
+        $this->db->begin();
+
 		$sql  = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$type." (fk_categorie, fk_".$column_name.")";
 		$sql .= " VALUES (".$this->id.", ".$obj->id.")";
 
-		dol_syslog(get_class($this).'::add_type sql='.$sql);
+		dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			if (! empty($conf->global->CATEGORIE_RECURSIV_ADD))
@@ -491,7 +505,7 @@ class Categorie extends CommonObject
 				$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'categorie';
 				$sql.= " WHERE rowid = ".$this->id;
 
-				dol_syslog(get_class($this)."::add_type sql=".$sql);
+				dol_syslog(get_class($this)."::add_type", LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if ($resql)
 				{
@@ -520,6 +534,7 @@ class Categorie extends CommonObject
 
 				if ($error)
 				{
+				    $this->db->rollback();
 					return -1;
 				}
 			}
@@ -527,18 +542,26 @@ class Categorie extends CommonObject
 			// Save object we want to link category to into category instance to provide information to trigger
 			$this->linkto=$obj;
 
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CATEGORY_LINK',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; $this->error=$interface->error; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('CATEGORY_LINK',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+
+			if (! $error)
+			{
+			    $this->db->commit();
+			    return 1;
+			}
+			else
+			{
+			    $this->db->rollback();
+			    return -2;
+			}
 
-			if (! $error) return 1;
-			else return -2;
 		}
 		else
 		{
+		    $this->db->rollback();
 			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error=$this->db->lasterrno();
@@ -574,28 +597,37 @@ class Categorie extends CommonObject
         if ($type=='contact') $column_name='socpeople';
         if ($type=='fournisseur') $column_name='societe';
 
+        $this->db->begin();
+
 		$sql  = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".$type;
 		$sql .= " WHERE fk_categorie = ".$this->id;
 		$sql .= " AND   fk_".$column_name."   = ".$obj->id;
 
-		dol_syslog(get_class($this).'::del_type sql='.$sql);
+		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			// Save object we want to unlink category off into category instance to provide information to trigger
 			$this->unlinkoff=$obj;
 
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CATEGORY_UNLINK',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('CATEGORY_UNLINK',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
 
-			if (! $error) return 1;
-			else return -2;
+			if (! $error)
+			{
+			    $this->db->commit();
+			    return 1;
+			}
+			else
+			{
+			    $this->db->rollback();
+                return -2;
+			}
 		}
 		else
 		{
+		    $this->db->rollback();
 			$this->error=$this->db->lasterror();
 			return -1;
 		}
@@ -629,7 +661,7 @@ class Categorie extends CommonObject
 		$sql.= " AND c.fk_categorie = ".$this->id;
 		$sql.= " AND c.fk_".$field." = o.rowid";
 
-		dol_syslog(get_class($this)."::getObjectsInCateg sql=".$sql);
+		dol_syslog(get_class($this)."::getObjectsInCateg", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -644,7 +676,6 @@ class Categorie extends CommonObject
 		else
 		{
 			$this->error=$this->db->error().' sql='.$sql;
-			dol_syslog(get_class($this)."::getObjectsInCateg ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -682,13 +713,12 @@ class Categorie extends CommonObject
 		}
 		$sql = "SELECT COUNT(*) as nb FROM " . MAIN_DB_PREFIX . "categorie_" . $category_table;
 		$sql .= " WHERE fk_categorie = " . $this->id . " AND fk_" . $field . " = " . $object_id;
-		dol_syslog(get_class($this)."::containsObject sql=".$sql);
+		dol_syslog(get_class($this)."::containsObject", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			return $this->db->fetch_object($resql)->nb;
 		} else {
 			$this->error=$this->db->error().' sql='.$sql;
-			dol_syslog(get_class($this)."::containsObject ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -740,7 +770,7 @@ class Categorie extends CommonObject
 		$sql.= " WHERE fk_parent != 0";
 		$sql.= " AND entity IN (".getEntity('category',1).")";
 
-		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
+		dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -773,7 +803,7 @@ class Categorie extends CommonObject
 	 */
 	function get_full_arbo($type,$markafterid=0)
 	{
-	    global $langs;
+	    global $conf, $langs;
 
 		$this->cats = array();
 
@@ -783,15 +813,13 @@ 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;
 
-		dol_syslog(get_class($this)."::get_full_arbo get category list sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::get_full_arbo get category list", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -985,7 +1013,7 @@ class Categorie extends CommonObject
 		$sql.= " AND c.fk_parent = ".$this->fk_parent;
 		$sql.= " AND c.label = '".$this->db->escape($this->label)."'";
 
-		dol_syslog(get_class($this)."::already_exists sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::already_exists", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1009,7 +1037,6 @@ class Categorie extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-            dol_syslog(get_class($this)."::already_exists error ".$this->error." sql=".$sql, LOG_ERR);
 			return -1;
 		}
 	}
@@ -1148,7 +1175,7 @@ class Categorie extends CommonObject
 		$sql.= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".$table." = ".$id." AND c.type = ".$typeid;
 		$sql.= " AND c.entity IN (".getEntity('category',1).")";
 
-		dol_syslog(get_class($this).'::containing sql='.$sql);
+		dol_syslog(get_class($this).'::containing', LOG_DEBUG);
 		$res = $this->db->query($sql);
 		if ($res)
 		{
@@ -1230,7 +1257,6 @@ class Categorie extends CommonObject
 		else
 		{
 			$this->error=$this->db->error().' sql='.$sql;
-			dol_syslog(get_class($this)."::rechercher ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -1250,7 +1276,7 @@ class Categorie extends CommonObject
 		$result='';
 
 		$lien = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'">';
-		$label=$langs->trans("ShowCategory").': '.$this->label;
+		$label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label);
 		$lienfin='</a>';
 
 		$picto='category';
@@ -1258,7 +1284,7 @@ class Categorie extends CommonObject
 
 		if ($withpicto) $result.=($lien.img_object($label,$picto).$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;
 	}
 
@@ -1356,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;
@@ -1450,11 +1476,10 @@ class Categorie extends CommonObject
 	                $sql2.= " VALUES(".$this->id.",'".$key."','". $this->db->escape($this->label);
 	                $sql2.= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
 	            }
-	            dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
+	            dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
 	            if (! $this->db->query($sql2))
 	            {
 	                $this->error=$this->db->lasterror();
-	                dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
 	                return -1;
 	            }
 	        }
@@ -1476,11 +1501,10 @@ class Categorie extends CommonObject
 
 	            // on ne sauvegarde pas des champs vides
 	            if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] )
-	                dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
+	                dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
 	            if (! $this->db->query($sql2))
 	            {
 	                $this->error=$this->db->lasterror();
-	                dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
 	                return -1;
 	            }
 	        }
diff --git a/htdocs/categories/class/index.html b/htdocs/categories/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 0c61ab8cca6..aa82fdb455d 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -80,12 +80,12 @@ if ($action == 'update' && $user->rights->categorie->creer)
 	if (empty($categorie->label))
 	{
 		$action = 'create';
-		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 	}
 	if (empty($categorie->description))
 	{
 		$action = 'create';
-		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Description"));
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")), 'errors');
 	}
 	if (empty($categorie->error))
 	{
@@ -98,12 +98,12 @@ if ($action == 'update' && $user->rights->categorie->creer)
 		}
 		else
 		{
-			$mesg=$categorie->error;
+			setEventMessage($categorie->error, 'errors');
 		}
 	}
 	else
 	{
-		$mesg=$categorie->error;
+		setEventMessage($categorie->error, 'errors');
 	}
 }
 
@@ -117,10 +117,6 @@ llxHeader("","",$langs->trans("Categories"));
 
 print_fiche_titre($langs->trans("ModifCat"));
 
-
-dol_htmloutput_errors($mesg);
-
-
 $object->fetch($id);
 
 $form = new Form($db);
diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php
deleted file mode 100644
index 208cbb38331..00000000000
--- a/htdocs/categories/fiche.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/* Copyright (C) 2005      Matthieu Valleton    <mv@seeschloss.org>
- * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2007      Patrick Raguin	  	<patrick.raguin@gmail.com>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *		\file       htdocs/categories/fiche.php
- *		\ingroup    category
- *		\brief      Page to create a new category
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
-$langs->load("categories");
-
-// Security check
-$socid=GETPOST('socid','int');
-if (!$user->rights->categorie->lire) accessforbidden();
-
-$action		= GETPOST('action','alpha');
-$cancel		= GETPOST('cancel','alpha');
-$origin		= GETPOST('origin','alpha');
-$catorigin	= GETPOST('catorigin','int');
-$type 		= GETPOST('type','alpha');
-$urlfrom	= GETPOST('urlfrom','alpha');
-
-$socid=GETPOST('socid','int');
-$label=GETPOST('label');
-$description=GETPOST('description');
-$visible=GETPOST('visible');
-$parent=GETPOST('parent');
-
-if ($origin)
-{
-	if ($type == 0) $idProdOrigin 		= $origin;
-	if ($type == 1) $idSupplierOrigin 	= $origin;
-	if ($type == 2) $idCompanyOrigin 	= $origin;
-	if ($type == 3) $idMemberOrigin 	= $origin;
-	if ($type == 4) $idContactOrigin 	= $origin;
-}
-
-if ($catorigin && $type == 0) $idCatOrigin = $catorigin;
-
-$object = new Categorie($db);
-
-$extrafields = new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-/*
- *	Actions
- */
-
-// Add action
-if ($action == 'add' && $user->rights->categorie->creer)
-{
-	// Action ajout d'une categorie
-	if ($cancel)
-	{
-		if ($urlfrom)
-		{
-			header("Location: ".$urlfrom);
-			exit;
-		}
-		else if ($idProdOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?id='.$idProdOrigin.'&type='.$type);
-			exit;
-		}
-		else if ($idCompanyOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idCompanyOrigin.'&type='.$type);
-			exit;
-		}
-		else if ($idSupplierOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idSupplierOrigin.'&type='.$type);
-			exit;
-		}
-		else if ($idMemberOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
-			exit;
-		}
-		else if ($idCatOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCatOrigin.'&type='.$type);
-			exit;
-		}
-		else if ($idContactOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
-			exit;
-		}
-		else
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
-			exit;
-		}
-	}
-
-	
-
-	$object->label			= $label;
-	$object->description	= dol_htmlcleanlastbr($description);
-	$object->socid			= ($socid ? $socid : 'null');
-	$object->visible		= $visible;
-	$object->type			= $type;
-
-	if ($parent != "-1") $object->fk_parent = $parent;
-	
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-	if (! $object->label)
-	{
-		$error++;
-		$errors[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref"));
-		$action = 'create';
-	}
-
-	// Create category in database
-	if (! $error)
-	{
-		$result = $object->create($user);
-		if ($result > 0)
-		{
-			$action = 'confirmed';
-			$_POST["addcat"] = '';
-		} else {
-			setEventMessage($object->error,'errors');
-		}
-	}
-}
-
-// Confirm action
-if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->creer)
-{
-	// Action confirmation de creation categorie
-	if ($action == 'confirmed')
-	{
-		if ($urlfrom)
-		{
-			header("Location: ".$urlfrom);
-			exit;
-		}
-		else if ($idProdOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?id='.$idProdOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		}
-		else if ($idCompanyOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idCompanyOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		}
-		else if ($idSupplierOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/categorie.php?socid='.$idSupplierOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		}
-		else if ($idMemberOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
-			exit;
-		}
-		else if ($idCatOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCatOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		}
-		else if ($idContactOrigin)
-		{
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		}
-
-		header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$result.'&type='.$type);
-		exit;
-	}
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-llxHeader("","",$langs->trans("Categories"));
-
-if ($user->rights->categorie->creer)
-{
-	/*
-	 * Fiche en mode creation
-	 */
-	if ($action == 'create' || $_POST["addcat"] == 'addcat')
-	{
-		dol_set_focus('#label');
-
-		print '<form action="'.$_SERVER['PHP_SELF'].'?type='.$type.'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="urlfrom" value="'.$urlfrom.'">';
-		print '<input type="hidden" name="action" value="add">';
-		print '<input type="hidden" name="addcat" value="addcat">';
-		print '<input type="hidden" name="id" value="'.GETPOST('origin').'">';
-		print '<input type="hidden" name="type" value="'.$type.'">';
-		if ($origin) print '<input type="hidden" name="origin" value="'.$origin.'">';
-		if ($catorigin)	print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
-
-		print_fiche_titre($langs->trans("CreateCat"));
-
-		dol_htmloutput_errors('',$errors);
-
-		print '<table width="100%" class="border">';
-
-		// Ref
-		print '<tr>';
-		print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="flat" name="label" size="25" value="'.$label.'">';
-		print'</td></tr>';
-
-		// Description
-		print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
-		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor=new DolEditor('description',$description,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_PRODUCTDESC,ROWS_6,50);
-		$doleditor->Create();
-		print '</td></tr>';
-
-		// Parent category
-		print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
-		print $form->select_all_categories($type, $catorigin);
-		print '</td></tr>';
-
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-		print '</table>';
-
-		print '<center><br>';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateThisCat").'" name="creation" />';
-		print ' &nbsp; &nbsp; ';
-		print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel" />';
-		print '</center>';
-
-		print '</form>';
-	}
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index eceeb2890bc..76a19c91d7d 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -171,7 +171,7 @@ $nbofentries=(count($data) - 1);
 
 if ($nbofentries > 0)
 {
-	print '<tr><td colspan="3">';
+	print '<tr '.$bc[0].'><td colspan="3">';
 	tree_recur($data,$data[0],0);
 	print '</td></tr>';
 }
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 15e8f7f6a5f..0c154a0b72f 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -94,7 +94,7 @@ $cancel != $langs->trans("Cancel") &&
 	else
 	{
 		$action = 'add';
-		$mesg = '<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -127,7 +127,7 @@ $cancel != $langs->trans("Cancel") &&
 	else
 	{
 		$action = 'edit';
-		$mesg = '<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
@@ -153,10 +153,6 @@ else $title=$langs->trans("Category");
 $head = categories_prepare_head($object,$type);
 dol_fiche_head($head, 'translation', $title, 0, 'category');
 
-if (! empty($mesg)) {
-	dol_htmloutput_mesg($mesg);
-}
-
 print '<table class="border" width="100%">';
 
 // Reference
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 010306d1e00..c55f324ab06 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -32,13 +32,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 $langs->load("categories");
 
-$mesg = '';
 $id=GETPOST('id','int');
 $ref=GETPOST('ref');
 $type=GETPOST('type');
 $action=GETPOST('action');
 $confirm=GETPOST('confirm');
 $removeelem = GETPOST('removeelem','int');
+$elemid=GETPOST('elemid');
 
 if ($id == "")
 {
@@ -117,10 +117,37 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 	}
 	else
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
+if ($type==0 && $elemid && $action == 'addintocategory' && ($user->rights->produit->creer || $user->rights->service->creer))
+{
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+	$newobject = new Product($db);
+	$result = $newobject->fetch($elemid);
+	$elementtype = 'product';
+	
+	// TODO Add into categ
+	$result=$object->add_type($newobject,$elementtype);
+	if ($result >= 0)
+	{
+		setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref));
+	}
+	else
+	{
+		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+		{
+			setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings');
+		}
+		else
+		{
+			setEventMessages($object->error,$object->errors,'errors');
+		}
+	}
+	
+}
+
 
 
 /*
@@ -131,8 +158,6 @@ $form = new Form($db);
 
 llxHeader("","",$langs->trans("Categories"));
 
-dol_htmloutput_mesg($mesg);
-
 if ($type == 0) $title=$langs->trans("ProductsCategoryShort");
 elseif ($type == 1) $title=$langs->trans("SuppliersCategoryShort");
 elseif ($type == 2) $title=$langs->trans("CustomersCategoryShort");
@@ -147,6 +172,7 @@ dol_fiche_head($head, 'card', $title, 0, 'category');
 /*
  * Confirmation suppression
  */
+
 if ($action == 'delete')
 {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;type='.$type,$langs->trans('DeleteCategory'),$langs->trans('ConfirmDeleteCategory'),'confirm_delete');
@@ -215,7 +241,7 @@ else
 	print "<tr class='liste_titre'><td colspan='2'>".$langs->trans("SubCats").'</td><td align="right">';
 	if ($user->rights->categorie->creer)
 	{
-		print "<a href='".DOL_URL_ROOT."/categories/fiche.php?action=create&amp;catorigin=".$object->id."&amp;socid=".$object->socid."&amp;type=".$type."&amp;urlfrom=".urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type)."'>";
+		print "<a href='".DOL_URL_ROOT."/categories/card.php?action=create&amp;catorigin=".$object->id."&amp;socid=".$object->socid."&amp;type=".$type."&amp;urlfrom=".urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type)."'>";
 		print img_picto($langs->trans("Create"),'filenew');
 		print "</a>";
 	}
@@ -254,10 +280,9 @@ else
 	print "</table>\n";
 }
 
-// List of products
+// List of products or services (type is type of category)
 if ($object->type == 0)
 {
-
 	$prods = $object->getObjectsInCateg("product");
 	if ($prods < 0)
 	{
@@ -265,6 +290,29 @@ if ($object->type == 0)
 	}
 	else
 	{
+		$showclassifyform=1; $typeid=0;
+		
+		// Form to add record into a category
+		if ($showclassifyform)
+		{
+			print '<br>';
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="addintocategory">';
+			print '<table class="noborder" width="100%">';
+			print '<tr class="liste_titre"><td width="40%">';
+			print $langs->trans("AddProductServiceIntoCategory").' &nbsp;';
+			print $form->select_produits('','elemid','',0,0,-1,2,'',1);
+			print '</td><td>';
+			print '<input type="submit" class="button" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '</tr>';
+			print '</table>';
+			print '</form>';
+		}
+		
 		print "<br>";
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("ProductsAndServices")."</td></tr>\n";
@@ -519,4 +567,5 @@ if($object->type == 4)
 
 
 llxFooter();
+
 $db->close();
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
new file mode 100644
index 00000000000..180dbcddb30
--- /dev/null
+++ b/htdocs/comm/action/card.php
@@ -0,0 +1,1318 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/comm/action/card.php
+ *       \ingroup    agenda
+ *       \brief      Page for event card
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+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';
+if (! empty($conf->projet->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("companies");
+$langs->load("commercial");
+$langs->load("other");
+$langs->load("bills");
+$langs->load("orders");
+$langs->load("agenda");
+
+$action=GETPOST('action','alpha');
+$cancel=GETPOST('cancel','alpha');
+$backtopage=GETPOST('backtopage','alpha');
+$contactid=GETPOST('contactid','int');
+$origin=GETPOST('origin','alpha');
+$originid=GETPOST('originid','int');
+
+$fulldayevent=GETPOST('fullday');
+$datep=dol_mktime($fulldayevent?'00':GETPOST("aphour"), $fulldayevent?'00':GETPOST("apmin"), 0, GETPOST("apmonth"), GETPOST("apday"), GETPOST("apyear"));
+$datef=dol_mktime($fulldayevent?'23':GETPOST("p2hour"), $fulldayevent?'59':GETPOST("p2min"), $fulldayevent?'59':'0', GETPOST("p2month"), GETPOST("p2day"), GETPOST("p2year"));
+
+// Security check
+$socid = GETPOST('socid','int');
+$id = GETPOST('id','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
+if ($user->societe_id && $socid) $result = restrictedArea($user,'societe',$socid);
+
+$error=GETPOST("error");
+$donotclearsession=GETPOST('donotclearsession')?GETPOST('donotclearsession'):0;
+
+$cactioncomm = new CActionComm($db);
+$object = new ActionComm($db);
+$contact = new Contact($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+//var_dump($_POST);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('actioncard','globalcard'));
+
+
+/*
+ * Actions
+ */
+
+// Remove user to assigned list
+if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
+{
+	$idtoremove=GETPOST('removedassigned');
+
+	if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1);
+	else $tmpassigneduserids=array();
+
+	foreach ($tmpassigneduserids as $key => $val)
+	{
+		if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
+	}
+	//var_dump($_POST['removedassigned']);exit;
+	$_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids);
+	$donotclearsession=1;
+	if ($action == 'add') $action = 'create';
+	if ($action == 'update') $action = 'edit';
+}
+
+// Add user to assigned list
+if (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser'))
+{
+	// Add a new user
+	if (GETPOST('assignedtouser') > 0)
+	{
+		$assignedtouser=array();
+		if (! empty($_SESSION['assignedtouser']))
+		{
+			$assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true);
+		}
+		$assignedtouser[GETPOST('assignedtouser')]=array('id'=>GETPOST('assignedtouser'), 'transparency'=>GETPOST('transparency'),'mandatory'=>1);
+		$_SESSION['assignedtouser']=dol_json_encode($assignedtouser);
+	}
+	$donotclearsession=1;
+	if ($action == 'add') $action = 'create';
+	if ($action == 'update') $action = 'edit';
+}
+
+// Add event
+if ($action == 'add')
+{
+	$error=0;
+
+    if (empty($backtopage))
+    {
+        if ($socid > 0) $backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
+        else $backtopage=DOL_URL_ROOT.'/comm/action/index.php';
+    }
+
+    if ($contactid)
+	{
+		$result=$contact->fetch($contactid);
+	}
+
+	if ($cancel)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+    $percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):GETPOST("percentage");	// If status is -1 or 100, percentage is not defined and we must use status
+
+    // Clean parameters
+	$datep=dol_mktime($fulldayevent?'00':GETPOST("aphour"), $fulldayevent?'00':GETPOST("apmin"), 0, GETPOST("apmonth"), GETPOST("apday"), GETPOST("apyear"));
+	$datef=dol_mktime($fulldayevent?'23':GETPOST("p2hour"), $fulldayevent?'59':GETPOST("p2min"), $fulldayevent?'59':'0', GETPOST("p2month"), GETPOST("p2day"), GETPOST("p2year"));
+
+	// Check parameters
+	if (! $datef && $percentage == 100)
+	{
+		$error++; $donotclearsession=1;
+		$action = 'create';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")), 'errors');
+	}
+
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! GETPOST('label'))
+	{
+		$error++; $donotclearsession=1;
+		$action = 'create';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Title")), 'errors');
+	}
+
+	// Initialisation objet cactioncomm
+	if (! GETPOST('actioncode') > 0)	// actioncode is id
+	{
+		$error++; $donotclearsession=1;
+		$action = 'create';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
+	}
+	else
+	{
+		$object->type_code = GETPOST('actioncode');
+	}
+
+	if (! $error)
+	{
+		// Initialisation objet actioncomm
+		$object->priority = GETPOST("priority")?GETPOST("priority"):0;
+		$object->fulldayevent = (! empty($fulldayevent)?1:0);
+		$object->location = GETPOST("location");
+		$object->label = trim(GETPOST('label'));
+		$object->fk_element = GETPOST("fk_element");
+		$object->elementtype = GETPOST("elementtype");
+		if (! GETPOST('label'))
+		{
+			if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs))
+			{
+				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
+			}
+			else
+			{
+				if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
+				{
+					$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
+				}
+				else $object->label = $cactioncomm->libelle;
+			}
+		}
+		$object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
+		$object->datep = $datep;
+		$object->datef = $datef;
+		$object->percentage = $percentage;
+		$object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
+
+		$listofuserid=array();
+		if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']);
+		$i=0;
+		foreach($listofuserid as $key => $value)
+		{
+			if ($i == 0)	// First entry
+			{
+				if ($value['id'] > 0) $object->userownerid=$value['id'];
+				$object->transparency = (GETPOST("transparency")=='on'?1:0);
+			}
+
+			$object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0));
+
+			$i++;
+		}
+	}
+
+	if (! $error && ! empty($conf->global->AGENDA_ENABLE_DONEBY))
+	{
+		if (GETPOST("doneby") > 0) $object->userdoneid = GETPOST("doneby","int");
+	}
+
+	$object->note = trim($_POST["note"]);
+
+	if (isset($_POST["contactid"])) $object->contact = $contact;
+
+	if (GETPOST('socid','int') > 0)
+	{
+		$object->socid=GETPOST('socid','int');
+		$object->fetch_thirdparty();
+
+		$object->societe = $object->thirdparty;	// For backward compatibility
+	}
+
+	// Special for module webcal and phenix
+	// TODO external modules
+	if (! empty($conf->webcalendar->enabled) && GETPOST('add_webcal') == 'on') $object->use_webcal=1;
+	if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $object->use_phenix=1;
+
+	// Check parameters
+	if (empty($object->userownerid) && empty($_SESSION['assignedtouser']))
+	{
+		$error++; $donotclearsession=1;
+		$action = 'create';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionsOwnedBy")), 'errors');
+	}
+	if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent))))
+	{
+		$error++; $donotclearsession=1;
+		$action = 'create';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")), 'errors');
+	}
+
+	if (! GETPOST('apyear') && ! GETPOST('adyear'))
+	{
+		$error++; $donotclearsession=1;
+		$action = 'create';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
+	}
+
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	if (! $error)
+	{
+		$db->begin();
+
+		// On cree l'action
+		$idaction=$object->add($user);
+
+		if ($idaction > 0)
+		{
+			if (! $object->error)
+			{
+				unset($_SESSION['assignedtouser']);
+
+				$moreparam='';
+				if ($user->id != $object->ownerid) $moreparam="usertodo=-1";	// We force to remove filter so created record is visible when going back to per user view.
+
+				$db->commit();
+				if (! empty($backtopage))
+				{
+					dol_syslog("Back to ".$backtopage.($moreparam?(preg_match('/\?/',$backtopage)?'&'.$moreparam:'?'.$moreparam):''));
+					header("Location: ".$backtopage.($moreparam?(preg_match('/\?/',$backtopage)?'&'.$moreparam:'?'.$moreparam):''));
+				}
+				elseif($idaction)
+				{
+					header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam?'&'.$moreparam:''));
+				}
+				else
+				{
+					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam?'?'.$moreparam:''));
+				}
+				exit;
+			}
+			else
+			{
+				// If error
+				$db->rollback();
+				$langs->load("errors");
+				$error=$langs->trans($object->error);
+				setEventMessage($error,'errors');
+				$action = 'create'; $donotclearsession=1;
+			}
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'create'; $donotclearsession=1;
+		}
+	}
+}
+
+/*
+ * Action update event
+ */
+if ($action == 'update')
+{
+	if (empty($cancel))
+	{
+        $fulldayevent=GETPOST('fullday');
+        $aphour=GETPOST('aphour');
+        $apmin=GETPOST('apmin');
+        $p2hour=GETPOST('p2hour');
+        $p2min=GETPOST('p2min');
+		$percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):(in_array(GETPOST('complete'),array(-1,100))?GETPOST('complete'):GETPOST("percentage"));	// If status is -1 or 100, percentage is not defined and we must use status
+
+	    // Clean parameters
+		if ($aphour == -1) $aphour='0';
+		if ($apmin == -1) $apmin='0';
+		if ($p2hour == -1) $p2hour='0';
+		if ($p2min == -1) $p2min='0';
+
+		$object->fetch($id);
+		$object->fetch_userassigned();
+
+		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
+		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
+
+		$object->fk_action   = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
+		$object->label       = GETPOST("label");
+		$object->datep       = $datep;
+		$object->datef       = $datef;
+		$object->percentage  = $percentage;
+		$object->priority    = GETPOST("priority");
+        $object->fulldayevent= GETPOST("fullday")?1:0;
+		$object->location    = GETPOST('location');
+		$object->socid       = GETPOST("socid");
+		$object->contactid   = GETPOST("contactid",'int');
+		//$object->societe->id = $_POST["socid"];			// deprecated
+		//$object->contact->id = $_POST["contactid"];		// deprecated
+		$object->fk_project  = GETPOST("projectid",'int');
+		$object->note        = GETPOST("note");
+		$object->pnote       = GETPOST("note");
+		$object->fk_element	 = GETPOST("fk_element");
+		$object->elementtype = GETPOST("elementtype");
+
+		if (! $datef && $percentage == 100)
+		{
+			$error++; $donotclearsession=1;
+			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")),$object->errors,'errors');
+			$action = 'edit';
+		}
+
+		$transparency=(GETPOST("transparency")=='on'?1:0);
+
+		// Users
+		$listofuserid=array();
+		if (! empty($_SESSION['assignedtouser']))	// Now concat assigned users
+		{
+			// Restore array with key with same value than param 'id'
+			$tmplist1=dol_json_decode($_SESSION['assignedtouser'], true); $tmplist2=array();
+			foreach($tmplist1 as $key => $val)
+			{
+				if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val;
+			}
+		}
+		else {
+			$assignedtouser=(! empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : 0);
+			if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : ''));	// Owner first
+		}
+
+		$object->userassigned=array();	$object->userownerid=0; // Clear old content
+		$i=0;
+		foreach($listofuserid as $key => $val)
+		{
+			if ($i == 0) $object->userownerid = $val['id'];
+			$object->userassigned[$val['id']]=array('id'=>$val['id'], 'mandatory'=>0, 'transparency'=>($user->id == $val['id'] ? $transparency : ''));
+			$i++;
+		}
+
+		if (! empty($conf->global->AGENDA_ENABLE_DONEBY))
+		{
+			if (GETPOST("doneby")) $object->userdoneid=GETPOST("doneby","int");
+		}
+
+		// Check parameters
+		if (! GETPOST('actioncode') > 0)
+		{
+			$error++; $donotclearsession=1;
+			$action = 'edit';
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
+		}
+		else
+		{
+			$result=$cactioncomm->fetch(GETPOST('actioncode'));
+		}
+		if (empty($object->userownerid))
+		{
+			$error++; $donotclearsession=1;
+			$action = 'edit';
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ActionsOwnedBy")), 'errors');
+		}
+
+		// Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+		if (! $error)
+		{
+			$db->begin();
+
+			$result=$object->update($user);
+
+			if ($result > 0)
+			{
+				unset($_SESSION['assignedtouser']);
+
+				$db->commit();
+			}
+			else
+			{
+				setEventMessages($object->error,$object->errors,'errors');
+				$db->rollback();
+			}
+		}
+	}
+
+	if (! $error)
+	{
+        if (! empty($backtopage))
+        {
+        	unset($_SESSION['assignedtouser']);
+            header("Location: ".$backtopage);
+            exit;
+        }
+	}
+}
+
+/*
+ * delete event
+ */
+if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes')
+{
+	$object->fetch($id);
+
+	if ($user->rights->agenda->myactions->delete
+		|| $user->rights->agenda->allactions->delete)
+	{
+		$result=$object->delete();
+
+		if ($result >= 0)
+		{
+			header("Location: index.php");
+			exit;
+		}
+		else
+		{
+			setEventMessages($object->error,$object->errors,'errors');
+		}
+	}
+}
+
+/*
+ * Action move update, used when user move an event in calendar by drag'n drop
+ */
+if ($action == 'mupdate')
+{
+    $object->fetch($id);
+    $object->fetch_userassigned();
+
+    $shour = dol_print_date($object->datep,"%H");
+    $smin = dol_print_date($object->datep, "%M");
+
+    $newdate=GETPOST('newdate','alpha');
+    if (empty($newdate) || strpos($newdate,'dayevent_') != 0 )
+    {
+       header("Location: ".$backtopage);
+        exit;
+    }
+
+    $datep=dol_mktime($shour, $smin, 0, substr($newdate,13,2), substr($newdate,15,2), substr($newdate,9,4));
+    if ($datep!=$object->datep)
+    {
+        if (!empty($object->datef))
+        {
+            $object->datef+=$datep-$object->datep;
+        }
+        $object->datep=$datep;
+        $result=$object->update($user);
+        if ($result < 0)
+        {
+            setEventMessage($object->error,'errors');
+            setEventMessage($object->errors,'errors');
+        }
+    }
+    if (! empty($backtopage))
+    {
+        header("Location: ".$backtopage);
+        exit;
+    }
+    else
+    {
+        $action='';
+    }
+
+}
+
+
+/*
+ * View
+ */
+
+$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
+llxHeader('',$langs->trans("Agenda"),$help_url);
+
+$form = new Form($db);
+$formactions = new FormActions($db);
+
+if ($action == 'create')
+{
+	$contact = new Contact($db);
+
+	if (GETPOST("contactid"))
+	{
+		$result=$contact->fetch(GETPOST("contactid"));
+		if ($result < 0) dol_print_error($db,$contact->error);
+	}
+
+	dol_set_focus("#label");
+
+    if (! empty($conf->use_javascript_ajax))
+    {
+        print "\n".'<script type="text/javascript">';
+        print '$(document).ready(function () {
+        			function setdatefields()
+	            	{
+	            		if ($("#fullday:checked").val() == null) {
+	            			$(".fulldaystarthour").removeAttr("disabled");
+	            			$(".fulldaystartmin").removeAttr("disabled");
+	            			$(".fulldayendhour").removeAttr("disabled");
+	            			$(".fulldayendmin").removeAttr("disabled");
+	            			$("#p2").removeAttr("disabled");
+	            		} else {
+	            			$(".fulldaystarthour").attr("disabled","disabled").val("00");
+	            			$(".fulldaystartmin").attr("disabled","disabled").val("00");
+	            			$(".fulldayendhour").attr("disabled","disabled").val("23");
+	            			$(".fulldayendmin").attr("disabled","disabled").val("59");
+	            			$("#p2").removeAttr("disabled");
+	            		}
+	            	}
+                    setdatefields();
+                    $("#fullday").change(function() {
+                        setdatefields();
+                    });
+                    $("#selectcomplete").change(function() {
+                        if ($("#selectcomplete").val() == 100)
+                        {
+                            if ($("#doneby").val() <= 0) $("#doneby").val(\''.$user->id.'\');
+                        }
+                        if ($("#selectcomplete").val() == 0)
+                        {
+                            $("#doneby").val(-1);
+                        }
+                   });
+                   $("#actioncode").change(function() {
+                        if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
+                        else $("#dateend").removeClass("fieldrequired");
+                   });
+               })';
+        print '</script>'."\n";
+    }
+
+	print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="donotclearsession" value="1">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
+
+	if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous"));
+	else print_fiche_titre($langs->trans("AddAnAction"));
+
+	print '<table class="border" width="100%">';
+
+	// Type of event
+	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	{
+		print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
+		$formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
+		print '</td></tr>';
+	}
+
+	// Title
+	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" size="60" value="'.GETPOST('label').'"></td></tr>';
+
+    // Full day
+    print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday')?' checked="checked"':'').'></td></tr>';
+
+	// Date start
+	$datep=($datep?$datep:$object->datep);
+	if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0);
+	print '<tr><td width="30%" class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>';
+	if (GETPOST("afaire") == 1) $form->select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend');
+	else if (GETPOST("afaire") == 2) $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend');
+	else $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+	print '</td></tr>';
+
+	// Date end
+	$datef=($datef?$datef:$object->datef);
+    if (GETPOST('datef','int',1)) $datef=dol_stringtotime(GETPOST('datef','int',1),0);
+	if (empty($datef) && ! empty($datep) && ! empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS))
+	{
+		$datef=dol_time_plus_duree($datep, $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS, 'h');
+	}
+	print '<tr><td><span id="dateend"'.(GETPOST("actioncode") == 'AC_RDV'?' class="fieldrequired"':'').'>'.$langs->trans("DateActionEnd").'</span></td><td>';
+	if (GETPOST("afaire") == 1) $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+	else if (GETPOST("afaire") == 2) $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+	else $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+	print '</td></tr>';
+
+	// Status
+	print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
+	print '<td>';
+	$percent=-1;
+	if (isset($_GET['status']) || isset($_POST['status'])) $percent=GETPOST('status');
+	else if (isset($_GET['percentage']) || isset($_POST['percentage'])) $percent=GETPOST('percentage');
+	else
+	{
+		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent='0';
+		else if (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent=100;
+	}
+	$formactions->form_select_status_action('formaction',$percent,1,'complete');
+	print '</td></tr>';
+
+    // Location
+    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+    {
+		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.(GETPOST('location')?GETPOST('location'):$object->location).'"></td></tr>';
+    }
+
+	// Assigned to
+	print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
+	$listofuserid=array();
+	if (empty($donotclearsession))
+	{
+		$assignedtouser=GETPOST("assignedtouser")?GETPOST("assignedtouser"):(! empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
+		if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser,'mandatory'=>0,'transparency'=>$object->transparency);	// Owner first
+		$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
+	}
+	else
+	{
+		if (!empty($_SESSION['assignedtouser']))
+		{
+			$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+		}
+	}
+	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").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked="checked"':'').'> '.$langs->trans("Busy");
+	print '</td></tr>';
+
+	// Realised by
+	if (! empty($conf->global->AGENDA_ENABLE_DONEBY))
+	{
+		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
+		print $form->select_dolusers(GETPOST("doneby")?GETPOST("doneby"):(! empty($object->userdoneid) && $percent==100?$object->userdoneid:0),'doneby',1);
+		print '</td></tr>';
+	}
+
+	print '</table>';
+	print '<br><br>';
+	print '<table class="border" width="100%">';
+
+	// Societe, contact
+	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
+	if (GETPOST('socid','int') > 0)
+	{
+		$societe = new Societe($db);
+		$societe->fetch(GETPOST('socid','int'));
+		print $societe->getNomUrl(1);
+		print '<input type="hidden" id="socid" name="socid" value="'.GETPOST('socid','int').'">';
+	}
+	else
+	{
+
+		$events=array();
+		$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_thirdparty_list($user->societe_id,'socid','',1,1,0,$events);
+		} else {
+			print $form->select_thirdparty_list('','socid','',1,1,0,$events);
+		}
+
+	}
+	print '</td></tr>';
+
+	print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
+	$form->select_contacts(GETPOST('socid','int'),GETPOST('contactid'),'contactid',1);
+	print '</td></tr>';
+
+
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$formproject=new FormProjets($db);
+
+		// Projet associe
+		$langs->load("projects");
+
+		print '<tr><td valign="top">'.$langs->trans("Project").'</td><td>';
+
+		$numproject=$formproject->select_projects((! empty($societe->id)?$societe->id:0),GETPOST("projectid")?GETPOST("projectid"):'','projectid');
+		if ($numproject==0)
+		{
+			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$societe->id.'&action=create">'.$langs->trans("AddProject").'</a>';
+		}
+		print '</td></tr>';
+	}
+	if(!empty($origin) && !empty($originid))
+	{
+		print '<input type="hidden" name="fk_element" size="10" value="'.GETPOST('originid').'">';
+		print '<input type="hidden" name="elementtype" size="10" value="'.GETPOST('origin').'">';
+	}
+
+	if (GETPOST("datep") && preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/',GETPOST("datep"),$reg))
+	{
+		$object->datep=dol_mktime(0,0,0,$reg[2],$reg[3],$reg[1]);
+	}
+
+	// Priority
+	print '<tr><td class="nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
+	print '<input type="text" name="priority" value="'.(GETPOST('priority')?GETPOST('priority'):($object->priority?$object->priority:'')).'" size="5">';
+	print '</td></tr>';
+
+    // Description
+    print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('note',(GETPOST('note')?GETPOST('note'):$object->note),'',180,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_6,90);
+    $doleditor->Create();
+    print '</td></tr>';
+
+
+    // Other attributes
+    $parameters=array('id'=>$object->id);
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $object->showOptionals($extrafields,'edit');
+	}
+
+	print '</table>';
+
+	print '<center><br>';
+	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+	print ' &nbsp; &nbsp; ';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</center>';
+
+	print "</form>";
+}
+
+// View or edit
+if ($id > 0)
+{
+	$result1=$object->fetch($id);
+	$result2=$object->fetch_thirdparty();
+	$result3=$object->fetch_contact();
+	$result4=$object->fetch_userassigned();
+	$result5=$object->fetch_optionals($id,$extralabels);
+
+	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
+	{
+		dol_print_error($db,$object->error);
+		exit;
+	}
+
+	if ($object->authorid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; }
+	if ($object->usermodid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; }
+
+
+	/*
+	 * Show tabs
+	 */
+
+	$head=actions_prepare_head($object);
+
+	$now=dol_now();
+	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
+
+	// Confirmation suppression action
+	if ($action == 'delete')
+	{
+		print $form->formconfirm("card.php?id=".$id,$langs->trans("DeleteAction"),$langs->trans("ConfirmDeleteAction"),"confirm_delete",'','',1);
+	}
+
+	if ($action == 'edit')
+	{
+	    if (! empty($conf->use_javascript_ajax))
+        {
+            print "\n".'<script type="text/javascript">';
+            print '$(document).ready(function () {
+	            		function setdatefields()
+	            		{
+	            			if ($("#fullday:checked").val() == null) {
+	            				$(".fulldaystarthour").removeAttr("disabled");
+	            				$(".fulldaystartmin").removeAttr("disabled");
+	            				$(".fulldayendhour").removeAttr("disabled");
+	            				$(".fulldayendmin").removeAttr("disabled");
+	            			} else {
+	            				$(".fulldaystarthour").attr("disabled","disabled").val("00");
+	            				$(".fulldaystartmin").attr("disabled","disabled").val("00");
+	            				$(".fulldayendhour").attr("disabled","disabled").val("23");
+	            				$(".fulldayendmin").attr("disabled","disabled").val("59");
+	            			}
+	            		}
+	            		setdatefields();
+	            		$("#fullday").change(function() {
+	            			setdatefields();
+	            		});
+                   })';
+            print '</script>'."\n";
+        }
+
+		print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+		print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
+		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1'? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
+
+		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
+
+		print '<table class="border" width="100%">';
+
+		// Ref
+		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
+
+		// Type of event
+		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+		{
+			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
+			$formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
+			print '</td></tr>';
+		}
+
+		// Title
+		print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$object->label.'"></td></tr>';
+
+        // Full day event
+        print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent?' checked="checked"':'').'></td></tr>';
+
+		// Date start
+		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td colspan="3">';
+		if (GETPOST("afaire") == 1) $form->select_date($object->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart');
+		else if (GETPOST("afaire") == 2) $form->select_date($object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+		else $form->select_date($object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+		print '</td></tr>';
+		// Date end
+		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
+		if (GETPOST("afaire") == 1) $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+		else if (GETPOST("afaire") == 2) $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+		else $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+		print '</td></tr>';
+
+		// Status
+		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
+		$percent=GETPOST("percentage")?GETPOST("percentage"):$object->percentage;
+		$formactions->form_select_status_action('formaction',$percent,1);
+		print '</td></tr>';
+
+        // Location
+	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+	    {
+			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$object->location.'"></td></tr>';
+	    }
+
+		// Assigned to
+		print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
+		$listofuserid=array();
+		if (empty($donotclearsession))
+		{
+			if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->userassigned[$user->id]['transparency'],'answer_status'=>$object->userassigned[$user->id]['answer_status'],'mandatory'=>$object->userassigned[$user->id]['mandatory']);	// Owner first
+			if (! empty($object->userassigned))	// Now concat assigned users
+			{
+				// Restore array with key with same value than param 'id'
+				$tmplist1=$object->userassigned; $tmplist2=array();
+				foreach($tmplist1 as $key => $val)
+				{
+					if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+				}
+			}
+			$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
+		}
+		else
+		{
+			if (!empty($_SESSION['assignedtouser']))
+			{
+				$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+			}
+		}
+		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").':  <input id="transparency" type="checkbox" name="transparency"'.($listofuserid[$user->id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy");
+		print '</td></tr>';
+
+		// Realised by
+		if (! empty($conf->global->AGENDA_ENABLE_DONEBY))
+		{
+			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
+			print $form->select_dolusers($object->userdoneid> 0?$object->userdoneid:-1,'doneby',1);
+			print '</td></tr>';
+		}
+
+		print '</table>';
+
+		print '<br><br>';
+
+		print '<table class="border" width="100%">';
+
+		// Thirdparty - Contact
+		if ($conf->societe->enabled)
+		{
+			print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td>';
+			print '<td>';
+			$events=array();
+			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
+			print $form->select_company($object->socid,'socid','',1,1,0,$events);
+			print '</td>';
+
+			// Contact
+			print '<td>'.$langs->trans("Contact").'</td><td width="30%">';
+			$form->select_contacts($object->socid, $object->contactid,'contactid',1);
+			print '</td></tr>';
+		}
+
+		// Project
+		if (! empty($conf->projet->enabled))
+		{
+
+			$formproject=new FormProjets($db);
+
+			// Projet associe
+			$langs->load("project");
+
+			print '<tr><td width="30%" valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
+			$numprojet=$formproject->select_projects($object->socid,$object->fk_project,'projectid');
+			if ($numprojet==0)
+			{
+				print ' &nbsp; <a href="../../projet/card.php?socid='.$object->socid.'&action=create">'.$langs->trans("AddProject").'</a>';
+			}
+			print '</td></tr>';
+		}
+
+		// Priority
+		print '<tr><td nowrap width="30%">'.$langs->trans("Priority").'</td><td colspan="3">';
+		print '<input type="text" name="priority" value="'.($object->priority?$object->priority:'').'" size="5">';
+		print '</td></tr>';
+
+		// Object linked
+		if (! empty($object->fk_element) && ! empty($object->elementtype))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
+			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
+		}
+
+        // Description
+        print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+        // Editeur wysiwyg
+        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+        $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_5,90);
+        $doleditor->Create();
+        print '</td></tr>';
+
+        // Other attributes
+        $parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+		print '</table>';
+
+		dol_fiche_end();
+
+		print '<center><input type="submit" class="button" name="edit" value="'.$langs->trans("Save").'">';
+		print ' &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</center>';
+
+		print '</form>';
+	}
+	else
+	{
+		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
+
+		// Affichage fiche action en mode visu
+		print '<table class="border" width="100%">';
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
+
+		// Ref
+		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
+		print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
+		print '</td></tr>';
+
+		// Type
+		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+		{
+			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
+		}
+
+		// Title
+		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
+
+        // Full day event
+        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
+
+		$rowspan=4;
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++;
+
+		// Date start
+		print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="3">';
+		if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
+		else print dol_print_date($object->datep,'day');
+		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+		print '</td>';
+		print '</tr>';
+
+		// Date end
+		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
+        if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
+		else print dol_print_date($object->datef,'day');
+		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
+		print '</td></tr>';
+
+		// Status
+		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
+		print $object->getLibStatut(4);
+		print '</td></tr>';
+
+        // Location
+	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+    	{
+			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
+    	}
+
+		// Assigned to
+    	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
+		$listofuserid=array();
+		if (empty($donotclearsession))
+		{
+			if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);	// Owner first
+			if (! empty($object->userassigned))	// Now concat assigned users
+			{
+				// Restore array with key with same value than param 'id'
+				$tmplist1=$object->userassigned; $tmplist2=array();
+				foreach($tmplist1 as $key => $val)
+				{
+					if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+				}
+			}
+			$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
+		}
+		else
+		{
+			if (!empty($_SESSION['assignedtouser']))
+			{
+				$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+			}
+		}
+		print $form->select_dolusers_forevent('view','assignedtouser',1);
+		if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
+		print '	</td></tr>';
+
+		// Done by
+		if ($conf->global->AGENDA_ENABLE_DONEBY)
+		{
+			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
+			if ($object->userdoneid > 0)
+			{
+				$tmpuser=new User($db);
+				$tmpuser->fetch($object->userdoneid);
+				print $tmpuser->getNomUrl(1);
+			}
+			print '</td></tr>';
+		}
+
+		print '</table>';
+
+		print '<br><br>';
+
+		print '<table class="border" width="100%">';
+
+		// Third party - Contact
+		if ($conf->societe->enabled)
+		{
+			print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id?$object->thirdparty->getNomUrl(1):$langs->trans("None"));
+			if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL')
+			{
+				if ($object->thirdparty->fetch($object->thirdparty->id))
+				{
+					print "<br>".dol_print_phone($object->thirdparty->phone);
+				}
+			}
+			print '</td>';
+			print '<td>'.$langs->trans("Contact").'</td>';
+			print '<td>';
+			if ($object->contactid > 0)
+			{
+				print $object->contact->getNomUrl(1);
+				if ($object->contactid && $object->type_code == 'AC_TEL')
+				{
+					if ($object->contact->fetch($object->contactid))
+					{
+						print "<br>".dol_print_phone($object->contact->phone_pro);
+					}
+				}
+			}
+			else
+			{
+				print $langs->trans("None");
+			}
+			print '</td></tr>';
+		}
+
+		// Project
+		if (! empty($conf->projet->enabled))
+		{
+			print '<tr><td width="30%" valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
+			if ($object->fk_project)
+			{
+				$project=new Project($db);
+				$project->fetch($object->fk_project);
+				print $project->getNomUrl(1,'',1);
+			}
+			print '</td></tr>';
+		}
+
+		// Priority
+		print '<tr><td nowrap width="30%">'.$langs->trans("Priority").'</td><td colspan="3">';
+		print ($object->priority?$object->priority:'');
+		print '</td></tr>';
+
+		// Object linked
+		if (! empty($object->fk_element) && ! empty($object->elementtype))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
+			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
+		}
+
+		// Description
+		print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+		print dol_htmlentitiesbr($object->note);
+		print '</td></tr>';
+
+        // Other attributes
+		$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+		print '</table>';
+
+		//Extra field
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print '<br><br><table class="border" width="100%">';
+			foreach($extrafields->attribute_label as $key=>$label)
+			{
+				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options['options_'.$key])?$object->array_options['options_'.$key]:''));
+				print '<tr><td width="30%">'.$label.'</td><td>';
+				print $extrafields->showOutputField($key,$value);
+				print "</td></tr>\n";
+			}
+			print '</table>';
+		}
+
+		dol_fiche_end();
+	}
+
+
+	/*
+	 * Barre d'actions
+	 */
+
+	print '<div class="tabsAction">';
+
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook))
+	{
+		if ($action != 'edit')
+		{
+			if ($user->rights->agenda->allactions->create ||
+			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
+			}
+
+			if ($user->rights->agenda->allactions->delete ||
+			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete))
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Delete").'</a></div>';
+			}
+		}
+	}
+
+	print '</div>';
+
+	if ($action != 'edit')
+	{
+		// Link to agenda views
+		print '<div id="agendaviewbutton">';
+		print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_month">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_week">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_day">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_peruser">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
+		print '</form>'."\n";
+		print '</div>';
+
+		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
+		{
+			print '<div style="clear:both;">&nbsp;</div><div class="fichecenter"><div class="fichehalfleft">';
+            print '<a name="builddoc"></a>'; // 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 '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+			print '</div></div></div>';
+
+            print '<div style="clear:both;">&nbsp;</div>';
+	    }
+	}
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 360f38c3f45..135b775249b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -39,36 +39,44 @@ class ActionComm extends CommonObject
 
     var $id;
 
-    var $type_id;		// id into parent table llx_c_actioncomm (will be deprecated into future, link should not be required)
-    var $type_code;		// code into parent table llx_c_actioncomm (will be deprecated into future, link should not be required). With defautl setup, should be AC_OTH_AUTO or AC_OTH
-    var $type;			// label into parent table llx_c_actioncomm (will be deprecated into future, link should not be required)
+    var $type_id;		// Id into parent table llx_c_actioncomm (used only if option to use type is set)
+    var $type_code;		// Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
+    var $type;			// Label into parent table llx_c_actioncomm (used only if option to use type is set)
+    var $type_color;	// Color into parent table llx_c_actioncomm (used only if option to use type is set)
     var $code;			// Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
     var $label;
 
     var $datec;			// Date creation record (datec)
     var $datem;			// Date modification record (tms)
-    var $author;		// Object user that create action
-    var $usermod;		// Object user that modified action
+    var $author;		// Object user that create action 	//deprecated
+    var $usermod;		// Object user that modified action	// deprecated
+    var $authorid;		// Id user that create action
+    var $usermodid;		// Id user that modified action
 
     var $datep;			// Date action start (datep)
     var $datef;			// Date action end (datep2)
-    var $durationp = -1;      // -1=Unkown duration
+    var $durationp = -1;      // -1=Unkown duration			// deprecated
     var $fulldayevent = 0;    // 1=Event on full day
-    var $punctual = 1;        // Milestone
+    var $punctual = 1;        // Milestone					// deprecated. Milestone is already event with end date = start date
     var $percentage;    // Percentage
     var $location;      // Location
+
 	var $transparency;	// Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
     var $priority;      // Small int (0 By default)
     var $note;          // Description
 
-    var $usertodo;		// Object user that must do action
-    var $userdone;	 	// Object user that did action
+	var $userassigned = array();	// Array of user ids
+    var $userownerid;		// Id of user owner
+    var $userdoneid;	// Id of user done
+    var $usertodo;		// Object user of owner				// deprecated
+    var $userdone;	 	// Object user that did action		// deprecated
 
+    var $socid;
+    var $contactid;
     var $societe;		// Company linked to action (optional)
     var $contact;		// Contact linked to action (optional)
     var $fk_project;	// Id of project (optional)
 
-
     // Properties for links to other objects
     var $fk_element;    // Id of record
     var $elementtype;   // Type of record. This if property ->element of object linked to.
@@ -87,18 +95,17 @@ class ActionComm extends CommonObject
      */
     function __construct($db)
     {
+    	global $langs;
+
         $this->db = $db;
 
-        $this->author = new stdClass();
-        $this->usermod = new stdClass();
-        $this->usertodo = new stdClass();
-        $this->userdone = new stdClass();
-        $this->societe = new stdClass();
-        $this->contact = new stdClass();
+        $this->societe = new stdClass();	// deprecated
+        $this->contact = new stdClass();	// deprecated
     }
 
     /**
-     *    Add an action/event into database
+     *    Add an action/event into database.
+     *    $this->type_id OR $this->type_code must be set.
      *
      *    @param	User	$user      		Object user making action
      *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
@@ -122,7 +129,7 @@ class ActionComm extends CommonObject
         if (empty($this->transparency)) $this->transparency = 0;
         if ($this->percentage > 100) $this->percentage = 100;
         //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-        if (! empty($this->datep) && ! empty($this->datef))   $this->durationp=($this->datef - $this->datep);
+        if (! empty($this->datep) && ! empty($this->datef))   $this->durationp=($this->datef - $this->datep);		// deprecated
         //if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
         if (! empty($this->datep) && ! empty($this->datef) && $this->datep > $this->datef) $this->datef=$this->datep;
         //if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
@@ -131,24 +138,29 @@ class ActionComm extends CommonObject
         if ($this->elementtype=='commande') $this->elementtype='order';
         if ($this->elementtype=='contrat')  $this->elementtype='contract';
 
-        if (! $this->type_id && $this->type_code)
+        $userownerid=$this->userownerid;
+        $userdoneid=$this->userdoneid;
+
+        if (! $this->type_id || ! $this->type_code)
         {
+        	$key=empty($this->type_id)?$this->type_code:$this->type_id;
+
             // Get id from code
             $cactioncomm=new CActionComm($this->db);
-            $result=$cactioncomm->fetch($this->type_code);
+            $result=$cactioncomm->fetch($key);
 
             if ($result > 0)
             {
                 $this->type_id=$cactioncomm->id;
-                $this->code=$cactioncomm->code;
+                $this->type_code=$cactioncomm->code;
             }
             else if ($result == 0)
             {
-                $this->error='Failed to get record with code '.$this->type_code.' from dictionary "type of events"';
+                $this->error='Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
                 return -1;
             }
             else
-            {
+			{
                 $this->error=$cactioncomm->error;
                 return -1;
             }
@@ -167,7 +179,7 @@ class ActionComm extends CommonObject
         $sql.= "(datec,";
         $sql.= "datep,";
         $sql.= "datep2,";
-        $sql.= "durationp,";
+        $sql.= "durationp,";	// deprecated
         $sql.= "fk_action,";
         $sql.= "code,";
         $sql.= "fk_soc,";
@@ -186,16 +198,16 @@ class ActionComm extends CommonObject
         $sql.= "'".$this->db->idate($now)."',";
         $sql.= (strval($this->datep)!=''?"'".$this->db->idate($this->datep)."'":"null").",";
         $sql.= (strval($this->datef)!=''?"'".$this->db->idate($this->datef)."'":"null").",";
-        $sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").",";
+        $sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").",";	// deprecated
         $sql.= (isset($this->type_id)?$this->type_id:"null").",";
-        $sql.= (isset($this->code)?" '".$this->code."'":"null").",";
-        $sql.= (isset($this->societe->id) && $this->societe->id > 0?" '".$this->societe->id."'":"null").",";
+        $sql.= (isset($this->type_code)?" '".$this->type_code."'":"null").",";
+        $sql.= (isset($this->socid) && $this->socid > 0?" '".$this->socid."'":"null").",";
         $sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").",";
         $sql.= " '".$this->db->escape($this->note)."',";
-        $sql.= (isset($this->contact->id) && $this->contact->id > 0?"'".$this->contact->id."'":"null").",";
+        $sql.= (isset($this->contactid) && $this->contactid > 0?"'".$this->contactid."'":"null").",";
         $sql.= (isset($user->id) && $user->id > 0 ? "'".$user->id."'":"null").",";
-        $sql.= (isset($this->usertodo->id) && $this->usertodo->id > 0?"'".$this->usertodo->id."'":"null").",";
-        $sql.= (isset($this->userdone->id) && $this->userdone->id > 0?"'".$this->userdone->id."'":"null").",";
+        $sql.= ($userownerid>0?"'".$userownerid."'":"null").",";
+        $sql.= ($userdoneid>0?"'".$userdoneid."'":"null").",";
         $sql.= "'".$this->db->escape($this->label)."','".$this->percentage."','".$this->priority."','".$this->fulldayevent."','".$this->db->escape($this->location)."','".$this->punctual."',";
         $sql.= "'".$this->transparency."',";
         $sql.= (! empty($this->fk_element)?$this->fk_element:"null").",";
@@ -203,39 +215,59 @@ class ActionComm extends CommonObject
         $sql.= $conf->entity;
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::add sql=".$sql);
+        dol_syslog(get_class($this)."::add", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm","id");
 
-            // Actions on extra fields (by external module or standard code)
-            $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))
+            // Now insert assignedusers
+			if (! $error)
+			{
+				foreach($this->userassigned as $key => $val)
+				{
+					$sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
+					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['mandatory']?$val['mandatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")";
+
+					$resql = $this->db->query($sql);
+					if (! $resql)
+					{
+						$error++;
+		           		$this->errors[]=$this->db->lasterror();
+					}
+					//var_dump($sql);exit;
+				}
+			}
+
+            if (! $error)
             {
-            	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-            	{
-            		$result=$this->insertExtraFields();
-            		if ($result < 0)
-            		{
-            			$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('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))
+	            {
+	            	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++;
             }
-            else if ($reshook < 0) $error++;
 
             if (! $error && ! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('ACTION_CREATE',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('ACTION_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
             }
 
             if (! $error)
@@ -253,7 +285,6 @@ class ActionComm extends CommonObject
         {
             $this->db->rollback();
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::add ".$this->error,LOG_ERR);
             return -1;
         }
 
@@ -263,9 +294,10 @@ class ActionComm extends CommonObject
      *    Load object from database
      *
      *    @param	int		$id     Id of action to get
+     *    @param	string	$ref    Ref of action to get
      *    @return	int				<0 if KO, >0 if OK
      */
-    function fetch($id)
+    function fetch($id, $ref='')
     {
         global $langs;
 
@@ -274,8 +306,8 @@ class ActionComm extends CommonObject
         $sql.= " a.ref_ext,";
         $sql.= " a.datep,";
         $sql.= " a.datep2,";
+        $sql.= " a.durationp,";	// deprecated
         $sql.= " a.datec,";
-        $sql.= " a.durationp,";
         $sql.= " a.tms as datem,";
         $sql.= " a.code, a.label, a.note,";
         $sql.= " a.fk_soc,";
@@ -291,9 +323,11 @@ class ActionComm extends CommonObject
         $sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a)";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
-        $sql.= " WHERE a.id=".$id." AND a.fk_action=c.id";
+        $sql.= " WHERE a.fk_action=c.id";
+        if ($ref) $sql.= " AND a.id=".$ref;		// No field ref, we use id
+        else $sql.= " AND a.id=".$id;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -316,6 +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->datec   				= $this->db->jdate($obj->datec);
                 $this->datem   				= $this->db->jdate($obj->datem);
@@ -323,22 +358,30 @@ class ActionComm extends CommonObject
                 $this->note					= $obj->note;
                 $this->percentage			= $obj->percentage;
 
-                $this->author->id			= $obj->fk_user_author;
-                $this->author->firstname	= $obj->firstname;
-                $this->author->lastname		= $obj->lastname;
-                $this->usermod->id			= $obj->fk_user_mod;
+                $this->authorid             = $obj->fk_user_author;
+                $this->usermodid			= $obj->fk_user_mod;
 
-                $this->usertodo->id			= $obj->fk_user_action;
-                $this->userdone->id			= $obj->fk_user_done;
+                if (!is_object($this->author)) $this->author = new stdClass(); // For avoid warning
+                $this->author->id			= $obj->fk_user_author;		// deprecated
+                $this->author->firstname	= $obj->firstname;			// deprecated
+                $this->author->lastname		= $obj->lastname;			// deprecated
+                if (!is_object($this->usermod)) $this->usermod = new stdClass(); // For avoid warning
+                $this->usermod->id			= $obj->fk_user_mod;		// deprecated
+
+                $this->userownerid			= $obj->fk_user_action;
+                $this->userdoneid			= $obj->fk_user_done;
                 $this->priority				= $obj->priority;
                 $this->fulldayevent			= $obj->fulldayevent;
                 $this->location				= $obj->location;
                 $this->transparency			= $obj->transparency;
+                $this->punctual				= $obj->punctual;
 
-                $this->socid				= $obj->fk_soc;	// To have fetch_thirdparty method working
-                $this->societe->id			= $obj->fk_soc;
-                $this->contact->id			= $obj->fk_contact;
-                $this->fk_project			= $obj->fk_project;
+                $this->socid				= $obj->fk_soc;			// To have fetch_thirdparty method working
+                $this->contactid			= $obj->fk_contact;		// To have fetch_contact method working
+                $this->fk_project			= $obj->fk_project;		// To have fetch_project method working
+
+                $this->societe->id			= $obj->fk_soc;			// deprecated
+                $this->contact->id			= $obj->fk_contact;		// deprecated
 
                 $this->fk_element			= $obj->fk_element;
                 $this->elementtype			= $obj->elementtype;
@@ -353,6 +396,42 @@ class ActionComm extends CommonObject
         }
     }
 
+
+    /**
+     *    Initialize this->userassigned array with list of id of user assigned to event
+     *
+     *    @return	int				<0 if KO, >0 if OK
+     */
+    function fetch_userassigned()
+    {
+        global $langs;
+
+        $sql.="SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency";
+		$sql.=" FROM ".MAIN_DB_PREFIX."actioncomm_resources";
+		$sql.=" WHERE element_type = 'user' AND fk_actioncomm = ".$this->id;
+		$resql2=$this->db->query($sql);
+		if ($resql2)
+		{
+			$this->userassigned=array();
+
+			// If owner is known, we must but id first into list
+			if ($this->userownerid > 0) $this->userassigned[$this->userownerid]=array('id'=>$this->userownerid);	// Set first so will be first into list.
+
+            while ($obj = $this->db->fetch_object($resql2))
+            {
+            	if ($obj->fk_element > 0) $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
+            	if (empty($this->userownerid)) $this->userownerid=$obj->fk_element;	// If not defined (should not happened, we fix this)
+            }
+
+        	return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+    }
+
     /**
      *    Delete event from database
      *
@@ -370,7 +449,7 @@ class ActionComm extends CommonObject
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm";
         $sql.= " WHERE id=".$this->id;
 
-        dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $res=$this->db->query($sql);
         if ($res < 0) {
         	$this->error=$this->db->lasterror();
@@ -391,14 +470,10 @@ class ActionComm extends CommonObject
         {
             if (! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('ACTION_DELETE',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('ACTION_DELETE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
             }
 
             if (! $error)
@@ -416,7 +491,6 @@ class ActionComm extends CommonObject
         {
             $this->db->rollback();
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete ".$this->error,LOG_ERR);
             return -1;
         }
     }
@@ -444,19 +518,24 @@ class ActionComm extends CommonObject
         if (empty($this->fulldayevent))  $this->fulldayevent = 0;
         if ($this->percentage > 100) $this->percentage = 100;
         //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-        if ($this->datep && $this->datef)   $this->durationp=($this->datef - $this->datep);
+        if ($this->datep && $this->datef)   $this->durationp=($this->datef - $this->datep);		// deprecated
         //if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
         if ($this->datep && $this->datef && $this->datep > $this->datef) $this->datef=$this->datep;
         //if ($this->date  && $this->dateend && $this->date > $this->dateend) $this->dateend=$this->date;
         if ($this->fk_project < 0) $this->fk_project = 0;
 
         // Check parameters
-        if ($this->percentage == 0 && $this->userdone->id > 0)
+        if ($this->percentage == 0 && $this->userdoneid > 0)
         {
             $this->error="ErrorCantSaveADoneUserWithZeroPercentage";
             return -1;
         }
 
+        $socid=($this->socid?$this->socid:((isset($this->societe->id) && $this->societe->id > 0) ? $this->societe->id : 0));
+        $contactid=($this->contactid?$this->contactid:((isset($this->contact->id) && $this->contact->id > 0) ? $this->contact->id : 0));
+		$userownerid=($this->userownerid?$this->userownerid:0);
+		$userdoneid=($this->userdoneid?$this->userdoneid:0);
+
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
@@ -465,24 +544,29 @@ class ActionComm extends CommonObject
         $sql.= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'":"null");
         $sql.= ", datep = ".(strval($this->datep)!='' ? "'".$this->db->idate($this->datep)."'" : 'null');
         $sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null');
+        $sql.= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null");	// deprecated
         $sql.= ", note = ".($this->note ? "'".$this->db->escape($this->note)."'":"null");
-        $sql.= ", fk_soc =". ($this->societe->id > 0 ? "'".$this->societe->id."'":"null");
         $sql.= ", fk_project =". ($this->fk_project > 0 ? "'".$this->fk_project."'":"null");
-        $sql.= ", fk_contact =". ($this->contact->id > 0 ? "'".$this->contact->id."'":"null");
+        $sql.= ", fk_soc =". ($socid > 0 ? "'".$socid."'":"null");
+        $sql.= ", fk_contact =". ($contactid > 0 ? "'".$contactid."'":"null");
         $sql.= ", priority = '".$this->priority."'";
         $sql.= ", fulldayevent = '".$this->fulldayevent."'";
         $sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null");
         $sql.= ", transparency = '".$this->transparency."'";
         $sql.= ", fk_user_mod = '".$user->id."'";
-        $sql.= ", fk_user_action=".($this->usertodo->id > 0 ? "'".$this->usertodo->id."'":"null");
-        $sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null");
+        $sql.= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'":"null");
+        $sql.= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'":"null");
+        if (! empty($this->fk_element)) $sql.= ", fk_element=".($this->fk_element?$this->fk_element:"null");
+        if (! empty($this->elementtype)) $sql.= ", elementtype=".($this->elementtype?"'".$this->elementtype."'":"null");
         $sql.= " WHERE id=".$this->id;
 
-        dol_syslog(get_class($this)."::update sql=".$sql);
+        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
@@ -499,16 +583,33 @@ class ActionComm extends CommonObject
         	}
         	else if ($reshook < 0) $error++;
 
-            if (! $notrigger)
+            // Now insert assignedusers
+			if (! $error)
+			{
+				$sql ="DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources where fk_actioncomm = ".$this->id." AND element_type = 'user'";
+				$resql = $this->db->query($sql);
+
+				foreach($this->userassigned as $key => $val)
+				{
+					$sql ="INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
+					$sql.=" VALUES(".$this->id.", 'user', ".$val['id'].", ".($val['manadatory']?$val['manadatory']:'0').", ".($val['transparency']?$val['transparency']:'0').", ".($val['answer_status']?$val['answer_status']:'0').")";
+
+					$resql = $this->db->query($sql);
+					if (! $resql)
+					{
+						$error++;
+		           		$this->errors[]=$this->db->lasterror();
+					}
+					//var_dump($sql);exit;
+				}
+			}
+
+            if (! $error && ! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('ACTION_MODIFY',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('ACTION_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
             }
 
             if (! $error)
@@ -527,7 +628,6 @@ class ActionComm extends CommonObject
         {
             $this->db->rollback();
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
             return -1;
         }
     }
@@ -540,9 +640,11 @@ class ActionComm extends CommonObject
      * 	 @param		int		$fk_element		Id of element action is linked to
      *   @param		string	$elementtype	Type of element action is linked to
      *   @param		string	$filter			Other filter
+     *   @param		string	$sortfield		Sort on this field
+     *   @param		string	$sortorder		ASC or DESC
      *   @return	array or string			Error string if KO, array with actions if OK
      */
-    static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='')
+    static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='', $sortfield='', $sortorder='')
     {
         global $conf, $langs;
 
@@ -558,8 +660,9 @@ class ActionComm extends CommonObject
             else $sql.= " AND a.fk_element = ".$fk_element." AND a.elementtype = '".$elementtype."'";
         }
         if (! empty($filter)) $sql.= $filter;
+		if ($sortorder && $sortfield) $sql.=$db->order($sortfield, $sortorder);
 
-        dol_syslog(get_class()."::getActions sql=".$sql);
+        dol_syslog(get_class()."::getActions", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
@@ -645,7 +748,7 @@ class ActionComm extends CommonObject
         $sql.= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
         $sql.= ' WHERE a.id = '.$id;
 
-        dol_syslog(get_class($this)."::info sql=".$sql);
+        dol_syslog(get_class($this)."::info", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
@@ -755,8 +858,8 @@ class ActionComm extends CommonObject
     }
 
     /**
-     *    	Renvoie nom clicable (avec eventuellement le picto)
-     *      Utilise $this->id, $this->code et $this->label
+     *    	Return URL of event
+     *      Use $this->id, $this->type_code, $this->label and $this->type_label
      *
      * 		@param	int		$withpicto			0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
      *		@param	int		$maxlength			Nombre de caracteres max dans libelle
@@ -767,39 +870,34 @@ class ActionComm extends CommonObject
      */
     function getNomUrl($withpicto=0,$maxlength=0,$classname='',$option='',$overwritepicto='')
     {
-        global $langs;
+        global $conf,$langs;
 
         $result='';
         if ($option=='birthday') $lien = '<a '.($classname?'class="'.$classname.'" ':'').'href="'.DOL_URL_ROOT.'/contact/perso.php?id='.$this->id.'">';
-        else $lien = '<a '.($classname?'class="'.$classname.'" ':'').'href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$this->id.'">';
+        else $lien = '<a '.($classname?'class="'.$classname.'" ':'').'href="'.DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id.'">';
         $lienfin='</a>';
         $label=$this->label;
-        if (empty($label)) $label=$this->libelle;	// Fro backward compatibility
-        //print 'rrr'.$this->libelle;
+        if (empty($label)) $label=$this->libelle;	// For backward compatibility
+        //print 'rrr'.$this->libelle.'-'.$withpicto;
 
         if ($withpicto == 2)
         {
             $libelle=$label;
-        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->trans("Action".$this->type_code);
+        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->transnoentities("Action".$this->type_code);
             $libelleshort='';
         }
-        else if (empty($this->libelle))
-        {
-            $libelle=$label;
-        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->trans("Action".$this->type_code);
-        	$libelleshort=dol_trunc($label, $maxlength);
-        }
         else
        {
-            $libelle=$label;
-            $libelleshort=dol_trunc($label,$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))
+        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
         	{
-        		 $libelle.=(($this->type_code && $libelle!=$langs->trans("Action".$this->type_code) && $langs->trans("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->trans("Action".$this->type_code).')':'');
+        		 $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;
         }
@@ -870,7 +968,7 @@ class ActionComm extends CommonObject
             $sql = "SELECT a.id,";
             $sql.= " a.datep,";		// Start
             $sql.= " a.datep2,";	// End
-            $sql.= " a.durationp,";
+            $sql.= " a.durationp,";			// deprecated
             $sql.= " a.datec, a.tms as datem,";
             $sql.= " a.label, a.code, a.note, a.fk_action as type_id,";
             $sql.= " a.fk_soc,";
@@ -894,6 +992,7 @@ class ActionComm extends CommonObject
                 if ($key == 'id')           $sql.=" AND a.id=".(is_numeric($value)?$value:0);
                 if ($key == 'idfrom')       $sql.=" AND a.id >= ".(is_numeric($value)?$value:0);
                 if ($key == 'idto')         $sql.=" AND a.id <= ".(is_numeric($value)?$value:0);
+                if ($key == 'project')      $sql.=" AND a.fk_project=".(is_numeric($value)?$value:0);
                 if ($key == 'login')
                 {
                     $login=$value;
@@ -931,7 +1030,7 @@ class ActionComm extends CommonObject
             $sql.= " ORDER by datep";
             //print $sql;exit;
 
-            dol_syslog(get_class($this)."::build_exportfile select events sql=".$sql);
+            dol_syslog(get_class($this)."::build_exportfile select events", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -947,23 +1046,24 @@ class ActionComm extends CommonObject
                     $event['type']=$type;
                     $datestart=$this->db->jdate($obj->datep)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
                     $dateend=$this->db->jdate($obj->datep2)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
-                    $duration=$obj->durationp;
+                    $duration=($datestart && $dateend)?($dateend - $datestart):0;
                     $event['summary']=$obj->label.($obj->socname?" (".$obj->socname.")":"");
                     $event['desc']=$obj->note;
                     $event['startdate']=$datestart;
-                    $event['duration']=$duration;	// Not required with type 'journal'
                     $event['enddate']=$dateend;		// Not required with type 'journal'
+                    $event['duration']=$duration;	// Not required with type 'journal'
                     $event['author']=dolGetFirstLastname($obj->firstname, $obj->lastname);
                     $event['priority']=$obj->priority;
                     $event['fulldayevent']=$obj->fulldayevent;
                     $event['location']=$obj->location;
                     $event['transparency']=(($obj->transparency > 0)?'OPAQUE':'TRANSPARENT');		// OPAQUE (busy) or TRANSPARENT (not busy)
+                    $event['punctual']=$obj->punctual;
                     $event['category']=$obj->libelle;	// libelle type action
 					// Define $urlwithroot
 					$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
 					//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-                    $url=$urlwithroot.'/comm/action/fiche.php?id='.$obj->id;
+                    $url=$urlwithroot.'/comm/action/card.php?id='.$obj->id;
                     $event['url']=$url;
                     $event['created']=$this->db->jdate($obj->datec)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
                     $event['modified']=$this->db->jdate($obj->datem)-(empty($conf->global->AGENDA_EXPORT_FIX_TZ)?0:($conf->global->AGENDA_EXPORT_FIX_TZ*3600));
@@ -977,7 +1077,6 @@ class ActionComm extends CommonObject
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::build_exportfile ".$this->db->lasterror(), LOG_ERR);
                 return -1;
             }
 
@@ -1043,7 +1142,7 @@ class ActionComm extends CommonObject
      */
     function initAsSpecimen()
     {
-        global $user,$langs,$conf;
+        global $user,$langs,$conf,$user;
 
         $now=dol_now();
 
@@ -1064,9 +1163,12 @@ class ActionComm extends CommonObject
         $this->punctual=0;
         $this->percentage=0;
         $this->location='Location';
-        $this->transparency=0;
+        $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 68960c5a6c0..77dfea739e1 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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,7 @@ class CActionComm
     var $type;
     var $libelle;
     var $active;
+    var $color;
 
     var $type_actions=array();
 
@@ -59,12 +60,12 @@ class CActionComm
      */
     function fetch($id)
     {
-        $sql = "SELECT id, code, type, libelle, active";
+        $sql = "SELECT id, code, type, libelle, color, active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
         if (is_numeric($id)) $sql.= " WHERE id=".$id;
         else $sql.= " WHERE code='".$id."'";
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -77,12 +78,13 @@ class CActionComm
                 $this->type    = $obj->type;
                 $this->libelle = $obj->libelle;
                 $this->active  = $obj->active;
+                $this->color   = $obj->color;
 
                 $this->db->free($resql);
                 return 1;
             }
             else
-            {
+			{
                 $this->db->free($resql);
                 return 0;
             }
@@ -95,13 +97,13 @@ class CActionComm
     }
 
     /**
-     *  Return list of event types
+     *  Return list of event types: array(id=>label) or array(code=>label)
      *
      *  @param	int			$active     	1 or 0 to filter on event state active or not ('' by default = no filter)
      *  @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)
     {
@@ -111,13 +113,13 @@ class CActionComm
         $repid = array();
         $repcode = array();
 
-        $sql = "SELECT id, code, libelle, module, type";
+        $sql = "SELECT id, code, libelle, module, type, color";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
         if ($active != '') $sql.=" WHERE active=".$active;
         if (! empty($excludetype)) $sql.=($active != ''?" AND":" WHERE")." type <> '".$excludetype."'";
         $sql.= " ORDER BY module, position";
 
-        dol_syslog(get_class($this)."::liste_array sql=".$sql);
+        dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 717d7269fa2..2dd6ea2b125 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2006	Roman Ozana			<ozana@omdesign.cz>
- * Copyright (C) 2011	Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2013	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012	Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2006      Roman Ozana			<ozana@omdesign.cz>
+ * Copyright (C) 2011	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2013-2014 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * 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
@@ -261,6 +261,7 @@ class ICal
      */
     function ical_rrule($value)
     {
+    	$result=aray();
         $rrule = explode(';',$value);
         foreach ($rrule as $line)
         {
@@ -299,6 +300,7 @@ class ICal
      */
     function ical_dt_date($key, $value)
     {
+    	$return_value=array();
         $value = $this->ical_date_to_unix($value);
 
         // Analyse TZID
@@ -309,8 +311,8 @@ class ICal
             $value = str_replace('T', '', $value);
             return array($key,$value);
         }
-        // adding $value and $tzid
-        $key =     $temp[0];
+
+        $key = $temp[0];
         $temp = explode("=", $temp[1]);
         $return_value[$temp[0]] = $temp[1];
         $return_value['unixtime'] = $value;
@@ -330,8 +332,9 @@ class ICal
         {
             usort($temp, array(&$this, "ical_dtstart_compare"));
             return $temp;
-        } else
-        {
+        }
+        else
+       {
             return false;
         }
     }
diff --git a/htdocs/comm/action/class/index.html b/htdocs/comm/action/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php
deleted file mode 100644
index 84b50893844..00000000000
--- a/htdocs/comm/action/contact.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Philippe Grand       <philippe.grand@atoo-net.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/comm/action/contact.php
- *       \ingroup    agenda
- *       \brief      Page for multi-users event
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-
-$langs->load("companies");
-$langs->load("commercial");
-$langs->load("other");
-$langs->load("bills");
-
-$id      = GETPOST('id','int');
-$action  = GETPOST('action','alpha');
-$ref	 = GETPOST('ref');
-$confirm = GETPOST('confirm');
-$lineid  = GETPOST('lineid','int');
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if ($user->societe_id > 0)
-{
-	unset($_GET["action"]);
-	$action='';
-}
-$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
-
-
-$object = new ActionComm($db);
-
-
-/*
- * Actions
- */
-
-// Add new contact
-if ($action == 'addcontact' && $user->rights->action->creer)
-{
-	$result = $object->fetch($id);
-
-    if ($object->id > 0)
-    {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-    }
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
-		}
-		else
-		{
-			setEventMessage($object->error, 'errors');
-		}
-	}
-}
-
-// modification d'un contact. On enregistre le type
-if ($action == 'updateline')
-{
-	if ($object->fetch($id))
-	{
-		$contact = $object->detail_contact($_POST["line"]);
-		$type = $_POST["type"];
-		$statut = $contact->statut;
-
-		$result = $object->update_contact($_POST["line"], $statut, $type);
-		if ($result >= 0)
-		{
-			$db->commit();
-		} else
-		{
-			dol_print_error($db, "result=$result");
-			$db->rollback();
-		}
-	}
-	else
-	{
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-// Bascule du statut d'un contact
-else if ($action == 'swapstatut')
-{
-	if ($object->id > 0)
-	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-}
-
-// Efface un contact
-else if ($action == 'deletecontact')
-{
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formcompany= new FormCompany($db);
-
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
-
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
-
-
-if ($id > 0 || ! empty($ref))
-{
-	dol_htmloutput_mesg($mesg,$mesgs);
-
-	if ($object->fetch($id,$ref) > 0)
-	{
-
-		$head=actions_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("Action"),0,'action');
-
-		// Affichage fiche action en mode visu
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
-		print '</td></tr>';
-
-		// Type
-		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
-			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
-		}
-
-		// Title
-		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
-        // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
-
-		// Date start
-		print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
-		if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
-		else print dol_print_date($object->datep,'day');
-		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td>';
-		print '<td rowspan="4" align="center" valign="middle" width="180">'."\n";
-        print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_month">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" style="width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_week">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarweek').' <input type="submit" style="width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_day">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarday').' <input type="submit" style="width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
-        print '</form>'."\n";
-        print '</td>';
-		print '</tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
-        if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
-		else print dol_print_date($object->datef,'day');
-		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td></tr>';
-
-        // Location
-        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
-
-        print '</table>';
-
-   		dol_fiche_end();
-
-   		print '<br>';
-
-		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-		    $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-		    if ($res) break;
-		}
-
-	}
-	else
-	{
-		print "ErrorRecordNotFound";
-	}
-}
-
-llxFooter();
-
-$db->close();
-
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 694536b6d14..82d88089684 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -41,7 +41,7 @@ $langs->load("commercial");
 $langs->load("other");
 $langs->load("bills");
 
-$objectid = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
 $action=GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
@@ -53,19 +53,14 @@ if ($user->societe_id > 0)
 	unset($_GET["action"]);
 	$action='';
 }
-$result = restrictedArea($user, 'agenda', $objectid, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
+$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
 
 $object = new ActionComm($db);
 
-if ($objectid > 0)
+if ($id > 0)
 {
-	$ret = $object->fetch($objectid);
-	if ($ret > 0) {
-		$company=new Societe($db);
-		$company->fetch($object->societe->id);
-		$object->societe=$company; // For backward compatibility
-		$object->thirdparty=$company;
-	}
+	$ret = $object->fetch($id);
+	$object->fetch_thirdparty();
 }
 
 // Get parameters
@@ -101,13 +96,31 @@ llxHeader('',$langs->trans("Agenda"),$help_url);
 
 if ($object->id > 0)
 {
+	$result1=$object->fetch($id);
+	$result2=$object->fetch_thirdparty();
+	$result3=$object->fetch_contact();
+	$result4=$object->fetch_userassigned();
+	$result5=$object->fetch_optionals($id,$extralabels);
+
+	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
+	{
+		dol_print_error($db,$object->error);
+		exit;
+	}
+
+	if ($object->authorid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->authorid); $object->author=$tmpuser; }
+	if ($object->usermodid > 0)		{ $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermodid); $object->usermod=$tmpuser; }
+
 	$author=new User($db);
 	$author->fetch($object->author->id);
 	$object->author=$author;
 
-	if ($object->contact->id) $object->fetch_contact($object->contact->id);
 
 	$head=actions_prepare_head($object);
+
+	$now=dol_now();
+	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
+
 	dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'action');
 
 	// Affichage fiche action en mode visu
@@ -133,44 +146,15 @@ if ($object->id > 0)
 	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
 
 	// Date start
-	print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
+	print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="3">';
 	if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
 	else print dol_print_date($object->datep,'day');
 	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
 	print '</td>';
-	print '<td rowspan="4" align="center" valign="middle" width="180">'."\n";
-	print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="show_month">';
-	print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-	print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-	print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" style="width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
-	print '</form>'."\n";
-	print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="show_week">';
-	print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-	print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-	print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	print img_picto($langs->trans("ViewCal"),'object_calendarweek').' <input type="submit" style="width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
-	print '</form>'."\n";
-	print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="show_day">';
-	print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-	print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-	print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-	print img_picto($langs->trans("ViewCal"),'object_calendarday').' <input type="submit" style="width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
-	print '</form>'."\n";
-	print '</td>';
 	print '</tr>';
 
 	// Date end
-	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
 	if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
 	else print dol_print_date($object->datef,'day');
 	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
@@ -182,19 +166,49 @@ if ($object->id > 0)
 	print '</td></tr>';
 
 	// Location
-	print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
+	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
+	{
+		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
+	}
 
+	// Assigned to
+	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+	$listofuserid=array();
+	if (empty($donotclearsession))
+	{
+		if ($object->userownerid > 0) $listofuserid[$object->userownerid]=array('id'=>$object->userownerid,'transparency'=>$object->transparency);	// Owner first
+		if (! empty($object->userassigned))	// Now concat assigned users
+		{
+			// Restore array with key with same value than param 'id'
+			$tmplist1=$object->userassigned; $tmplist2=array();
+			foreach($tmplist1 as $key => $val)
+			{
+				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']]=$val;
+			}
+		}
+		$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
+	}
+	else
+	{
+		if (!empty($_SESSION['assignedtouser']))
+		{
+			$listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+		}
+	}
+	print $form->select_dolusers_forevent('view','assignedtouser',1);
+	if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
+	print '	</td></tr>';
 
 	print '</table><br><br><table class="border" width="100%">';
 
 
 	// Third party - Contact
-	print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->societe->id?$object->societe->getNomUrl(1):$langs->trans("None"));
-	if ($object->societe->id && $object->type_code == 'AC_TEL')
+	print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id?$object->thirdparty->getNomUrl(1):$langs->trans("None"));
+	if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL')
 	{
-		if ($object->societe->fetch($object->societe->id))
+		if ($object->thirdparty->fetch($object->thirdparty->id))
 		{
-			print "<br>".dol_print_phone($object->societe->phone);
+			print "<br>".dol_print_phone($object->thirdparty->phone);
 		}
 	}
 	print '</td>';
@@ -236,8 +250,20 @@ if ($object->id > 0)
 	print ($object->priority?$object->priority:'');
 	print '</td></tr>';
 
+	// Other attributes
+	$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $object->showOptionals($extrafields,'edit');
+	}
 
-	print '</table><br><br><table class="border" width="100%">';
+
+	print '</table>';
+
+	print '<br><br>';
+
+	print '<table class="border" width="100%">';
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
@@ -250,9 +276,59 @@ if ($object->id > 0)
 
 	print '<tr><td width="30%" nowrap>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
 	print '</table>';
 
-	print '</div>';
+	dol_fiche_end();
+
+
+
+	if ($action != 'edit')
+	{
+		// Link to agenda views
+		print '<div id="agendaviewbutton">';
+		print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_month">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_week">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_day">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
+		print '</form>'."\n";
+		print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="show_peruser">';
+		print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
+		print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
+		print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
+		print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
+		print '</form>'."\n";
+		print '</div>';
+
+		print '<div style="clear: both"></div>';
+		print "<br><br>";
+	}
+
 
 	$modulepart = 'actions';
 	$permission = $user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create;
@@ -264,6 +340,7 @@ else
 	print $langs->trans("ErrorUnknown");
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
deleted file mode 100644
index d17b1acb4f0..00000000000
--- a/htdocs/comm/action/fiche.php
+++ /dev/null
@@ -1,1099 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/comm/action/fiche.php
- *       \ingroup    agenda
- *       \brief      Page for event card
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-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';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
-$langs->load("companies");
-$langs->load("commercial");
-$langs->load("other");
-$langs->load("bills");
-$langs->load("orders");
-$langs->load("agenda");
-
-$action=GETPOST('action','alpha');
-$cancel=GETPOST('cancel','alpha');
-$backtopage=GETPOST('backtopage','alpha');
-$contactid=GETPOST('contactid','int');
-$origin=GETPOST('origin','alpha');
-$originid=GETPOST('originid','int');
-
-// Security check
-$socid = GETPOST('socid','int');
-$id = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
-if ($user->societe_id && $socid) $result = restrictedArea($user,'societe',$socid);
-
-$error=GETPOST("error");
-$mesg='';
-
-$cactioncomm = new CActionComm($db);
-$object = new ActionComm($db);
-$contact = new Contact($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-//var_dump($_POST);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('actioncard'));
-
-
-/*
- * Actions
- */
-
-// Add action
-if ($action == 'add_action')
-{
-	$error=0;
-
-    if (empty($backtopage))
-    {
-        if ($socid > 0) $backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
-        else $backtopage=DOL_URL_ROOT.'/comm/action/index.php';
-    }
-
-    if ($contactid)
-	{
-		$result=$contact->fetch($contactid);
-	}
-
-	if ($cancel)
-	{
-		header("Location: ".$backtopage);
-		exit;
-	}
-
-    $fulldayevent=GETPOST('fullday');
-    $percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):GETPOST("percentage");	// If status is -1 or 100, percentage is not defined and we must use status
-
-    // Clean parameters
-	$datep=dol_mktime($fulldayevent?'00':$_POST["aphour"], $fulldayevent?'00':$_POST["apmin"], 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
-	$datef=dol_mktime($fulldayevent?'23':$_POST["p2hour"], $fulldayevent?'59':$_POST["p2min"], $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
-
-	// Check parameters
-	if (! $datef && $percentage == 100)
-	{
-		$error++;
-		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")).'</div>';
-	}
-
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! GETPOST('label'))
-	{
-		$error++;
-		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Title")).'</div>';
-	}
-
-	// Initialisation objet cactioncomm
-	if (! GETPOST('actioncode'))
-	{
-		$error++;
-		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
-	}
-	else
-	{
-		$result=$cactioncomm->fetch(GETPOST('actioncode'));
-	}
-
-	// Initialisation objet actioncomm
-	$object->type_id = $cactioncomm->id;
-	$object->type_code = $cactioncomm->code;
-	$object->priority = GETPOST("priority")?GETPOST("priority"):0;
-	$object->fulldayevent = (! empty($fulldayevent)?1:0);
-	$object->location = GETPOST("location");
-	$object->transparency = (GETPOST("transparency")=='on'?1:0);
-	$object->label = trim(GETPOST('label'));
-	$object->fk_element = GETPOST("fk_element");
-	$object->elementtype = GETPOST("elementtype");
-	if (! GETPOST('label'))
-	{
-		if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs))
-		{
-			$object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
-		}
-		else
-		{
-			if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
-			{
-				$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
-			}
-			else $object->label = $cactioncomm->libelle;
-		}
-	}
-	$object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
-	$object->datep = $datep;
-	$object->datef = $datef;
-	$object->percentage = $percentage;
-	$object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
-
-	$usertodo=new User($db);
-	if ($_POST["affectedto"] > 0)
-	{
-		$usertodo->fetch($_POST["affectedto"]);
-	}
-	$object->usertodo = $usertodo;
-	$userdone=new User($db);
-	if ($_POST["doneby"] > 0)
-	{
-		$userdone->fetch($_POST["doneby"]);
-	}
-	$object->userdone = $userdone;
-
-	$object->note = trim($_POST["note"]);
-	if (isset($_POST["contactid"])) $object->contact = $contact;
-	if (GETPOST('socid','int') > 0)
-	{
-		$societe = new Societe($db);
-		$societe->fetch(GETPOST('socid','int'));
-		$object->societe = $societe;
-	}
-
-	// Special for module webcal and phenix
-	// TODO external modules
-	if (! empty($conf->webcalendar->enabled) && GETPOST('add_webcal') == 'on') $object->use_webcal=1;
-	if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $object->use_phenix=1;
-
-	// Check parameters
-	if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent))))
-	{
-		$error++;
-		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")).'</div>';
-	}
-
-	if (! GETPOST('apyear') && ! GETPOST('adyear'))
-	{
-		$error++;
-		$action = 'create';
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")).'</div>';
-	}
-
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-	if (! $error)
-	{
-		$db->begin();
-
-		// On cree l'action
-		$idaction=$object->add($user);
-
-		if ($idaction > 0)
-		{
-			if (! $object->error)
-			{
-				$db->commit();
-				if (! empty($backtopage))
-				{
-					dol_syslog("Back to ".$backtopage);
-					header("Location: ".$backtopage);
-				}
-				elseif($idaction)
-				{
-					header("Location: ".DOL_URL_ROOT.'/comm/action/fiche.php?id='.$idaction);
-				}
-				else
-				{
-					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php');
-				}
-				exit;
-			}
-			else
-			{
-				// If error
-				$db->rollback();
-				$langs->load("errors");
-				$error=$langs->trans($object->error);
-				setEventMessage($error,'errors');
-				$action = 'create';
-			}
-		}
-		else
-		{
-			$db->rollback();
-			$langs->load("errors");
-
-			if (! empty($object->error)) setEventMessage($langs->trans($object->error), 'errors');
-			if (count($object->errors)) setEventMessage($object->errors, 'errors');
-
-			$action = 'create';
-		}
-	}
-}
-
-/*
- * Action suppression de l'action
- */
-if ($action == 'confirm_delete' && GETPOST("confirm") == 'yes')
-{
-	$object->fetch($id);
-
-	if ($user->rights->agenda->myactions->delete
-		|| $user->rights->agenda->allactions->delete)
-	{
-		$result=$object->delete();
-
-		if ($result >= 0)
-		{
-			header("Location: index.php");
-			exit;
-		}
-		else
-		{
-			$mesg=$object->error;
-			setEventMessage($mesg,'errors');
-		}
-	}
-}
-
-/*
- * Action update event
- */
-if ($action == 'update')
-{
-	if (empty($cancel))
-	{
-        $fulldayevent=GETPOST('fullday');
-        $aphour=GETPOST('aphour');
-        $apmin=GETPOST('apmin');
-        $p2hour=GETPOST('p2hour');
-        $p2min=GETPOST('p2min');
-		$percentage=in_array(GETPOST('status'),array(-1,100))?GETPOST('status'):GETPOST("percentage");	// If status is -1 or 100, percentage is not defined and we must use status
-
-	    // Clean parameters
-		if ($aphour == -1) $aphour='0';
-		if ($apmin == -1) $apmin='0';
-		if ($p2hour == -1) $p2hour='0';
-		if ($p2min == -1) $p2min='0';
-
-		$object->fetch($id);
-
-		$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
-		$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
-
-		$object->fk_action   = dol_getIdFromCode($db, $_POST["actioncode"], 'c_actioncomm');
-		$object->label       = $_POST["label"];
-		$object->datep       = $datep;
-		$object->datef       = $datef;
-		$object->percentage  = $percentage;
-		$object->priority    = $_POST["priority"];
-        $object->fulldayevent= $_POST["fullday"]?1:0;
-		$object->location    = GETPOST('location');
-		$object->societe->id = $_POST["socid"];
-		$object->contact->id = $_POST["contactid"];
-		$object->fk_project  = $_POST["projectid"];
-		$object->note        = $_POST["note"];
-		$object->pnote       = $_POST["note"];
-		$object->fk_element	 = $_POST["fk_element"];
-		$object->elementtype = $_POST["elementtype"];
-		if (! $datef && $percentage == 100)
-		{
-			$error=$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd"));
-			$action = 'edit';
-		}
-
-		// Users
-		$usertodo=new User($db);
-		if ($_POST["affectedto"])
-		{
-			$usertodo->fetch($_POST["affectedto"]);
-		}
-		$object->usertodo = $usertodo;
-		$object->transparency=(GETPOST("transparency")=='on'?1:0);
-
-		$userdone=new User($db);
-		if ($_POST["doneby"])
-		{
-			$userdone->fetch($_POST["doneby"]);
-		}
-		$object->userdone = $userdone;
-
-		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-		if (! $error)
-		{
-			$db->begin();
-
-			$result=$object->update($user);
-
-			if ($result > 0)
-			{
-				$db->commit();
-			}
-			else
-			{
-				$db->rollback();
-			}
-		}
-	}
-
-	if ($result < 0)
-	{
-		setEventMessage($object->error,'errors');
-		setEventMessage($object->errors,'errors');
-	}
-	else
-	{
-        if (! empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-	}
-}
-
-
-/*
- * View
- */
-
-$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
-llxHeader('',$langs->trans("Agenda"),$help_url);
-
-$form = new Form($db);
-$htmlactions = new FormActions($db);
-
-if ($action == 'create')
-{
-	$contact = new Contact($db);
-
-	if (GETPOST("contactid"))
-	{
-		$result=$contact->fetch(GETPOST("contactid"));
-		if ($result < 0) dol_print_error($db,$contact->error);
-	}
-
-	dol_set_focus("#label");
-
-    if (! empty($conf->use_javascript_ajax))
-    {
-        print "\n".'<script type="text/javascript">';
-        print '$(document).ready(function () {
-        			function setdatefields()
-	            	{
-	            		if ($("#fullday:checked").val() == null) {
-	            			$(".fulldaystarthour").removeAttr("disabled");
-	            			$(".fulldaystartmin").removeAttr("disabled");
-	            			$(".fulldayendhour").removeAttr("disabled");
-	            			$(".fulldayendmin").removeAttr("disabled");
-	            			$("#p2").removeAttr("disabled");
-	            		} else {
-	            			$(".fulldaystarthour").attr("disabled","disabled").val("00");
-	            			$(".fulldaystartmin").attr("disabled","disabled").val("00");
-	            			$(".fulldayendhour").attr("disabled","disabled").val("23");
-	            			$(".fulldayendmin").attr("disabled","disabled").val("59");
-	            			$("#p2").removeAttr("disabled");
-	            		}
-	            	}
-                    setdatefields();
-                    $("#fullday").change(function() {
-                        setdatefields();
-                    });
-                    $("#selectcomplete").change(function() {
-                        if ($("#selectcomplete").val() == 100)
-                        {
-                            if ($("#doneby").val() <= 0) $("#doneby").val(\''.$user->id.'\');
-                        }
-                        if ($("#selectcomplete").val() == 0)
-                        {
-                            $("#doneby").val(-1);
-                        }
-                   });
-                   $("#actioncode").change(function() {
-                        if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
-                        else $("#dateend").removeClass("fieldrequired");
-                   });
-               })';
-        print '</script>'."\n";
-    }
-
-	print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add_action">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
-
-	if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous"));
-	else print_fiche_titre($langs->trans("AddAnAction"));
-
-	dol_htmloutput_mesg($mesg);
-
-	print '<table class="border" width="100%">';
-
-	// Type d'action actifs
-	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
-		print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
-		$htmlactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
-		print '</td></tr>';
-	}
-	else print '<input type="hidden" name="actioncode" value="AC_OTH">';
-
-	// Title
-	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" size="60" value="'.GETPOST('label').'"></td></tr>';
-
-    // Full day
-    print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday')?' checked="checked"':'').'></td></tr>';
-
-	// Date start
-	$datep=$object->datep;
-	if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0);
-	print '<tr><td width="30%" class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>';
-	if (GETPOST("afaire") == 1) $form->select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend');
-	else if (GETPOST("afaire") == 2) $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend');
-	else $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
-	print '</td></tr>';
-	// Date end
-	$datef=$object->datef;
-    if (GETPOST('datef','int',1)) $datef=dol_stringtotime(GETPOST('datef','int',1),0);
-	print '<tr><td><span id="dateend"'.(GETPOST("actioncode") == 'AC_RDV'?' class="fieldrequired"':'').'>'.$langs->trans("DateActionEnd").'</span></td><td>';
-	if (GETPOST("afaire") == 1) $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-	else if (GETPOST("afaire") == 2) $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-	else $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-	print '</td></tr>';
-
-	// Status
-	print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
-	print '<td>';
-	$percent=-1;
-	if (isset($_GET['status']) || isset($_POST['status']))
-	{
-		$percent=GETPOST('status');
-	}
-	else if (isset($_GET['percentage']) || isset($_POST['percentage']))
-	{
-		$percent=GETPOST('percentage');
-	}
-	else
-	{
-		if (GETPOST("afaire") == 1) $percent=0;
-		else if (GETPOST("afaire") == 2) $percent=100;
-	}
-	$htmlactions->form_select_status_action('formaction',$percent,1,'complete');
-	print '</td></tr>';
-
-    // Location
-    print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$object->location.'"></td></tr>';
-
-	// Assigned to
-	$var=false;
-	print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
-	$form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1);
-	print '</td></tr>';
-
-	print '</table>';
-
-	print '<br><br>';
-
-	print '<table class="border" width="100%">';
-
-	// Busy
-	print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td>';
-	print '<input id="transparency" type="checkbox" name="transparency"'.($actioncomm->transparency?' checked="checked"':'').'>';
-	print '</td></tr>';
-
-	// Realised by
-	if ($conf->global->AGENDA_ENABLE_DONEBY)
-	{
-		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-		$form->select_users(GETPOST("doneby")?GETPOST("doneby"):(! empty($object->userdone->id) && $percent==100?$object->userdone->id:0),'doneby',1);
-		print '</td></tr>';
-	}
-
-	print '</table>';
-	print '<br><br>';
-	print '<table class="border" width="100%">';
-
-	// Societe, contact
-	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
-	if (GETPOST('socid','int') > 0)
-	{
-		$societe = new Societe($db);
-		$societe->fetch(GETPOST('socid','int'));
-		print $societe->getNomUrl(1);
-		print '<input type="hidden" name="socid" value="'.GETPOST('socid','int').'">';
-	}
-	else
-	{
-
-		$events=array();
-		$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);
-		} else {
-			print $form->select_company('','socid','',1,1,0,$events);
-		}
-
-	}
-	print '</td></tr>';
-
-	print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
-	$form->select_contacts(GETPOST('socid','int'),GETPOST('contactid'),'contactid',1);
-	print '</td></tr>';
-
-
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$formproject=new FormProjets($db);
-
-		// Projet associe
-		$langs->load("projects");
-
-		print '<tr><td valign="top">'.$langs->trans("Project").'</td><td>';
-
-		$numproject=$formproject->select_projects((! empty($societe->id)?$societe->id:0),GETPOST("projectid")?GETPOST("projectid"):'','projectid');
-		if ($numproject==0)
-		{
-			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$societe->id.'&action=create">'.$langs->trans("AddProject").'</a>';
-		}
-		print '</td></tr>';
-	}
-	if(!empty($origin) && !empty($originid))
-	{
-		print '<input type="hidden" name="fk_element" size="10" value="'.GETPOST('originid').'">';
-		print '<input type="hidden" name="elementtype" size="10" value="'.GETPOST('origin').'">';
-	}
-
-	if (GETPOST("datep") && preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/',GETPOST("datep"),$reg))
-	{
-		$object->datep=dol_mktime(0,0,0,$reg[2],$reg[3],$reg[1]);
-	}
-
-	// Priority
-	print '<tr><td class="nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
-	print '<input type="text" name="priority" value="'.(GETPOST('priority')?GETPOST('priority'):($object->priority?$object->priority:'')).'" size="5">';
-	print '</td></tr>';
-
-    // Description
-    print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('note',(GETPOST('note')?GETPOST('note'):$object->note),'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_7,90);
-    $doleditor->Create();
-    print '</td></tr>';
-
-
-    // Other attributes
-    $parameters=array('id'=>$object->id);
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields,'edit');
-	}
-
-	print '</table>';
-
-	print '<center><br>';
-	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-	print ' &nbsp; &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</center>';
-
-	print "</form>";
-}
-
-// View or edit
-if ($id > 0)
-{
-	if ($error)
-	{
-		dol_htmloutput_errors($error);
-	}
-	if ($mesg)
-	{
-		dol_htmloutput_mesg($mesg);
-	}
-
-	$result=$object->fetch($id);
-	$object->fetch_optionals($id,$extralabels);
-
-	if ($result < 0)
-	{
-		dol_print_error($db,$object->error);
-		exit;
-	}
-
-	$societe = new Societe($db);
-	if ($object->societe->id)
-	{
-		$result=$societe->fetch($object->societe->id);
-	}
-	$object->societe = $societe;
-
-	if ($object->author->id > 0)   { $tmpuser=new User($db); $res=$tmpuser->fetch($object->author->id); $object->author=$tmpuser; }
-	if ($object->usermod->id > 0)  { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usermod->id); $object->usermod=$tmpuser; }
-	if ($object->usertodo->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->usertodo->id); $object->usertodo=$tmpuser; }
-	if ($object->userdone->id > 0) { $tmpuser=new User($db); $res=$tmpuser->fetch($object->userdone->id); $object->userdone=$tmpuser; }
-
-	$contact = new Contact($db);
-	if ($object->contact->id)
-	{
-		$result=$contact->fetch($object->contact->id,$user);
-	}
-	$object->contact = $contact;
-
-	/*
-	 * Affichage onglets
-	 */
-
-	$head=actions_prepare_head($object);
-
-	$now=dol_now();
-	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
-
-	// Confirmation suppression action
-	if ($action == 'delete')
-	{
-		print $form->formconfirm("fiche.php?id=".$id,$langs->trans("DeleteAction"),$langs->trans("ConfirmDeleteAction"),"confirm_delete",'','',1);
-	}
-
-	if ($action == 'edit')
-	{
-	    if (! empty($conf->use_javascript_ajax))
-        {
-            print "\n".'<script type="text/javascript">';
-            print '$(document).ready(function () {
-	            		function setdatefields()
-	            		{
-	            			if ($("#fullday:checked").val() == null) {
-	            				$(".fulldaystarthour").removeAttr("disabled");
-	            				$(".fulldaystartmin").removeAttr("disabled");
-	            				$(".fulldayendhour").removeAttr("disabled");
-	            				$(".fulldayendmin").removeAttr("disabled");
-	            			} else {
-	            				$(".fulldaystarthour").attr("disabled","disabled").val("00");
-	            				$(".fulldaystartmin").attr("disabled","disabled").val("00");
-	            				$(".fulldayendhour").attr("disabled","disabled").val("23");
-	            				$(".fulldayendmin").attr("disabled","disabled").val("59");
-	            			}
-	            		}
-	            		setdatefields();
-	            		$("#fullday").change(function() {
-	            			setdatefields();
-	            		});
-                   })';
-            print '</script>'."\n";
-        }
-
-        // Fiche action en mode edition
-		print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
-		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1'? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
-
-		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
-
-		print '<table class="border" width="100%">';
-
-		// Ref
-		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
-
-		// Type
-		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
-			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
-			$htmlactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
-			print '</td></tr>';
-		}
-
-		// Title
-		print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$object->label.'"></td></tr>';
-
-        // Full day event
-        print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent?' checked="checked"':'').'></td></tr>';
-
-		// Date start
-		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td colspan="3">';
-		if (GETPOST("afaire") == 1) $form->select_date($object->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart');
-		else if (GETPOST("afaire") == 2) $form->select_date($object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
-		else $form->select_date($object->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
-		print '</td></tr>';
-		// Date end
-		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-		if (GETPOST("afaire") == 1) $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-		else if (GETPOST("afaire") == 2) $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-		else $form->select_date($object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
-		print '</td></tr>';
-
-		// Status
-		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
-		$percent=GETPOST("percentage")?GETPOST("percentage"):$object->percentage;
-		$htmlactions->form_select_status_action('formaction',$percent,1);
-		print '</td></tr>';
-
-        // Location
-        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$object->location.'"></td></tr>';
-
-		// Assigned to
-		print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
-		print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'affectedto',1);
-		print '</td></tr>';
-
-        print '</table><br><br><table class="border" width="100%">';
-
-		// Busy
-		print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td>';
-		print '<input id="transparency" type="checkbox" name="transparency"'.($object->transparency?' checked="checked"':'').'">';
-		print '</td></tr>';
-
-		// Realised by
-		if ($conf->global->AGENDA_ENABLE_DONEBY)
-		{
-			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
-			print $form->select_dolusers($object->userdone->id> 0?$object->userdone->id:-1,'doneby',1);
-			print '</td></tr>';
-		}
-
-		print '</table><br><br>';
-
-		print '<table class="border" width="100%">';
-
-		// Thirdparty - Contact
-		if ($conf->societe->enabled)
-		{
-			print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td>';
-			print '<td>';
-			$events=array();
-			$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
-			print $form->select_company($object->societe->id,'socid','',1,1,0,$events);
-			print '</td>';
-
-			// Contact
-			print '<td>'.$langs->trans("Contact").'</td><td width="30%">';
-			$form->select_contacts($object->societe->id, $object->contact->id,'contactid',1);
-			print '</td></tr>';
-		}
-
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-
-			$formproject=new FormProjets($db);
-
-			// Projet associe
-			$langs->load("project");
-
-			print '<tr><td width="30%" valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
-			$numprojet=$formproject->select_projects($object->societe->id,$object->fk_project,'projectid');
-			if ($numprojet==0)
-			{
-				print ' &nbsp; <a href="../../projet/fiche.php?socid='.$societe->id.'&action=create">'.$langs->trans("AddProject").'</a>';
-			}
-			print '</td></tr>';
-		}
-
-		// Priority
-		print '<tr><td nowrap width="30%">'.$langs->trans("Priority").'</td><td colspan="3">';
-		print '<input type="text" name="priority" value="'.($object->priority?$object->priority:'').'" size="5">';
-		print '</td></tr>';
-
-		// Object linked
-		if (! empty($object->fk_element) && ! empty($object->elementtype))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
-			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
-		}
-
-        // Description
-        print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-        // Editeur wysiwyg
-        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-        $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','In',true,true,$conf->fckeditor->enabled,ROWS_5,90);
-        $doleditor->Create();
-        print '</td></tr>';
-
-        // Other attributes
-        $parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-		print '</table>';
-
-		dol_fiche_end();
-
-		print '<center><input type="submit" class="button" name="edit" value="'.$langs->trans("Save").'">';
-		print ' &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</center>';
-
-		print '</form>';
-	}
-	else
-	{
-		dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
-
-		// Affichage fiche action en mode visu
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', '');
-		print '</td></tr>';
-
-		// Type
-		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
-			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
-		}
-
-		// Title
-		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$object->label.'</td></tr>';
-
-        // Full day event
-        print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3">'.yn($object->fulldayevent).'</td></tr>';
-
-		// Date start
-		print '<tr><td width="30%">'.$langs->trans("DateActionStart").'</td><td colspan="2">';
-		if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
-		else print dol_print_date($object->datep,'day');
-		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td>';
-		print '<td rowspan="4" align="center" valign="middle" width="180">'."\n";
-        print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_month">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_week">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
-        print '</form>'."\n";
-        print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="show_day">';
-        print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
-        print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
-        print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        //print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
-        print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
-        print '</form>'."\n";
-        print '</td>';
-		print '</tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="2">';
-        if (! $object->fulldayevent) print dol_print_date($object->datef,'dayhour');
-		else print dol_print_date($object->datef,'day');
-		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late"));
-		print '</td></tr>';
-
-		// Status
-		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">';
-		print $object->getLibStatut(4);
-		print '</td></tr>';
-
-        // Location
-        print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
-
-		// Assigned to
-		print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
-		if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1);
-		print '</td></tr>';
-
-		print '</table><br><br><table class="border" width="100%">';
-
-		// Busy
-		print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td colspan="3">';
-		if ($object->usertodo->id > 0) print yn(($object->transparency > 0)?1:0);	// We show nothing if event is assigned to nobody
-		print '</td></tr>';
-
-		// Done by
-		if ($conf->global->AGENDA_ENABLE_DONEBY)
-		{
-			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
-			if ($object->userdone->id > 0) print $object->userdone->getNomUrl(1);
-			print '</td></tr>';
-		}
-
-		print '</table><br><br><table class="border" width="100%">';
-
-		// Third party - Contact
-		if ($conf->societe->enabled)
-		{
-			print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->societe->id?$object->societe->getNomUrl(1):$langs->trans("None"));
-			if ($object->societe->id && $object->type_code == 'AC_TEL')
-			{
-				if ($object->societe->fetch($object->societe->id))
-				{
-					print "<br>".dol_print_phone($object->societe->phone);
-				}
-			}
-			print '</td>';
-			print '<td>'.$langs->trans("Contact").'</td>';
-			print '<td>';
-			if ($object->contact->id > 0)
-			{
-				print $object->contact->getNomUrl(1);
-				if ($object->contact->id && $object->type_code == 'AC_TEL')
-				{
-					if ($object->contact->fetch($object->contact->id))
-					{
-						print "<br>".dol_print_phone($object->contact->phone_pro);
-					}
-				}
-			}
-			else
-			{
-				print $langs->trans("None");
-			}
-			print '</td></tr>';
-		}
-
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-			print '<tr><td width="30%" valign="top">'.$langs->trans("Project").'</td><td colspan="3">';
-			if ($object->fk_project)
-			{
-				$project=new Project($db);
-				$project->fetch($object->fk_project);
-				print $project->getNomUrl(1,'',1);
-			}
-			print '</td></tr>';
-		}
-
-		// Priority
-		print '<tr><td nowrap width="30%">'.$langs->trans("Priority").'</td><td colspan="3">';
-		print ($object->priority?$object->priority:'');
-		print '</td></tr>';
-
-		// Object linked
-		if (! empty($object->fk_element) && ! empty($object->elementtype))
-		{
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
-			print '<td colspan="3">'.dolGetElementUrl($object->fk_element,$object->elementtype,1).'</td></tr>';
-		}
-
-		// Description
-		print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-		print dol_htmlentitiesbr($object->note);
-		print '</td></tr>';
-
-        // Other attributes
-		$parameters=array('colspan'=>' colspan="3"', 'colspanvalue'=>'3', 'id'=>$object->id);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-		print '</table>';
-
-		//Extra field
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print '<br><br><table class="border" width="100%">';
-			foreach($extrafields->attribute_label as $key=>$label)
-			{
-				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options['options_'.$key])?$object->array_options['options_'.$key]:''));
-				print '<tr><td width="30%">'.$label.'</td><td>';
-				print $extrafields->showOutputField($key,$value);
-				print "</td></tr>\n";
-			}
-			print '</table><br><br>';
-		}
-
-		dol_fiche_end();
-	}
-
-
-	/*
-	 * Barre d'actions
-	 */
-
-	print '<div class="tabsAction">';
-
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook))
-	{
-		if ($action != 'edit')
-		{
-			if ($user->rights->agenda->allactions->create ||
-			   (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->create))
-			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
-			}
-
-			if ($user->rights->agenda->allactions->delete ||
-			   (($object->author->id == $user->id || $object->usertodo->id == $user->id) && $user->rights->agenda->myactions->delete))
-			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="fiche.php?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Delete").'</a></div>';
-			}
-		}
-	}
-
-	print '</div>';
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 38e8ab24bb1..4630d486ebf 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1,9 +1,10 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
  *
  * 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
@@ -42,8 +43,14 @@ $filter=GETPOST("filter",'',3);
 $filtera = GETPOST("userasked","int",3)?GETPOST("userasked","int",3):GETPOST("filtera","int",3);
 $filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
 $filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filterd","int",3);
+$usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
+// If not choice done on calendar owner, we filter on user.
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
+{
+	$filtert=$user->id;
+}
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -55,9 +62,10 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="a.datec";
 
 // Security check
-$socid = GETPOST("socid","int",1);
+$socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
+if ($socid < 0) $socid='';
 
 $canedit=1;
 if (! $user->rights->agenda->myactions->read) accessforbidden();
@@ -79,28 +87,36 @@ $pid=GETPOST("projectid","int",3);
 $status=GETPOST("status");
 $type=GETPOST("type");
 $maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
-$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_USE_EVENT_TYPE)?'AC_OTH':''));
+$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':'');
+
+if ($actioncode == '') $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
 
 if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week')  {
     $action='show_month'; $day='';
 }                                                   // View by month
-if (GETPOST('viewweek')) {
+if (GETPOST('viewweek') || $action == 'show_week') {
     $action='show_week'; $week=($week?$week:date("W")); $day=($day?$day:date("d"));
 }  // View by week
-if (GETPOST('viewday'))  {
+if (GETPOST('viewday') || $action == 'show_day')  {
     $action='show_day'; $day=($day?$day:date("d"));
 }                                  // View by day
 
+
 $langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('agenda'));
 
 
 /*
  * Actions
  */
-if (GETPOST("viewlist"))
+
+if (GETPOST("viewlist") || $action == 'show_list')
 {
     $param='';
     foreach($_POST as $key => $val)
@@ -113,7 +129,20 @@ if (GETPOST("viewlist"))
     exit;
 }
 
-if ($action=='delete_action')
+if (GETPOST("viewperuser") || $action == 'show_peruser')
+{
+    $param='';
+    foreach($_POST as $key => $val)
+    {
+        if ($key=='token') continue;
+        $param.='&'.$key.'='.urlencode($val);
+    }
+    //print $param;
+    header("Location: ".DOL_URL_ROOT.'/comm/action/peruser.php?'.$param);
+    exit;
+}
+
+if ($action =='delete_action')
 {
     $event = new ActionComm($db);
     $event->fetch($actionid);
@@ -134,10 +163,15 @@ $companystatic=new Societe($db);
 $contactstatic=new Contact($db);
 
 $now=dol_now();
+$nowarray=dol_getdate($now);
+$nowyear=$nowarray['year'];
+$nowmonth=$nowarray['mon'];
+$nowday=$nowarray['mday'];
 
-// Define list of all external calendars
 $listofextcals=array();
-if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0)
+
+// Define list of external calendars (global admin setup)
+if (empty($conf->global->AGENDA_DISABLE_EXT))
 {
     $i=0;
     while($i < $conf->global->AGENDA_EXT_NB)
@@ -154,7 +188,25 @@ if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0
         }
     }
 }
-
+// Define list of external calendars (user setup)
+if (empty($user->conf->AGENDA_DISABLE_EXT))
+{
+	$i=0;
+	while($i < $conf->global->AGENDA_EXT_NB)
+	{
+		$i++;
+		$source='AGENDA_EXT_SRC_'.$user->id.'_'.$i;
+		$name='AGENDA_EXT_NAME_'.$user->id.'_'.$i;
+		$color='AGENDA_EXT_COLOR_'.$user->id.'_'.$i;
+		$enabled='AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
+		$buggedfile='AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
+		if (! empty($user->conf->$source) && ! empty($user->conf->$name))
+		{
+			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
+			$listofextcals[]=array('src'=>$user->conf->$source,'name'=>$user->conf->$name,'color'=>$user->conf->$color,'buggedfile'=>(isset($user->conf->buggedfile)?$user->conf->buggedfile:0));
+		}
+	}
+}
 
 if (empty($action) || $action=='show_month')
 {
@@ -167,13 +219,13 @@ if (empty($action) || $action=='show_month')
 
     $max_day_in_prev_month = date("t",dol_mktime(0,0,0,$prev_month,1,$prev_year));  // Nb of days in previous month
     $max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));                 // Nb of days in next month
-    // tmpday is a negative or null cursor to know how many days before the 1 to show on month view (if tmpday=0 we start on monday)
-    $tmpday = -date("w",dol_mktime(0,0,0,$month,1,$year))+2;
+    // tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
+    $tmpday = -date("w",dol_mktime(12,0,0,$month,1,$year,true))+2;		// date('w') is 0 fo sunday
     $tmpday+=((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)-1);
-    if ($tmpday >= 1) $tmpday -= 7;
-    // Define firstdaytoshow and lastdaytoshow
+    if ($tmpday >= 1) $tmpday -= 7;	// If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
+    // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
     $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$max_day_in_prev_month+$tmpday,$prev_year);
-    $next_day=7-($max_day_in_month+1-$tmpday)%7;
+    $next_day=7 - ($max_day_in_month+1-$tmpday) % 7;
     if ($next_day < 6) $next_day+=7;
     $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year);
 }
@@ -186,6 +238,7 @@ if ($action=='show_week')
     $first_day  = $prev['first_day'];
     $first_month= $prev['first_month'];
     $first_year = $prev['first_year'];
+
     $week = $prev['week'];
 
     $day = (int) $day;
@@ -194,7 +247,7 @@ if ($action=='show_week')
     $next_month = $next['month'];
     $next_day   = $next['day'];
 
-    // Define firstdaytoshow and lastdaytoshow
+    // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
     $firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
 	$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd');
 
@@ -213,7 +266,7 @@ if ($action == 'show_day')
     $next_month = $next['month'];
     $next_day   = $next['day'];
 
-    // Define firstdaytoshow and lastdaytoshow
+    // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
     $firstdaytoshow=dol_mktime(0,0,0,$prev_month,$prev_day,$prev_year);
     $lastdaytoshow=dol_mktime(0,0,0,$next_month,$next_day,$next_year);
 }
@@ -227,8 +280,8 @@ if ($status == 'done') $title=$langs->trans("DoneActions");
 if ($status == 'todo') $title=$langs->trans("ToDoActions");
 
 $param='';
-$region='';
-if ($status)  $param="&status=".$status;
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
+if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
 if ($filter)  $param.="&filter=".$filter;
 if ($filtera) $param.="&filtera=".$filtera;
 if ($filtert) $param.="&filtert=".$filtert;
@@ -236,34 +289,36 @@ if ($filterd) $param.="&filterd=".$filterd;
 if ($socid)   $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
 if ($pid)     $param.="&projectid=".$pid;
-if ($actioncode != '') $param.="&actioncode=".$actioncode;
 if ($type)   $param.="&type=".$type;
-if ($action == 'show_day' || $action == 'show_week') $param.='&action='.$action;
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month') $param.='&action='.$action;
 $param.="&maxprint=".$maxprint;
 
 // Show navigation bar
 if (empty($action) || $action=='show_month')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;region=".$region.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y");
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;region=".$region.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendar';
 }
 if ($action=='show_week')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day."&amp;region=".$region.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
-    $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%Y").", ".$langs->trans("Week")." ".$week;
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day."&amp;region=".$region.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendarweek';
 }
 if ($action=='show_day')
 {
-    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day."&amp;region=".$region.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+    $nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
     $nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort");
     $nav.=" </span>\n";
-    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day."&amp;region=".$region.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+    $nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
     $picto='calendarday';
 }
 
@@ -274,12 +329,61 @@ $param.='&year='.$year.'&month='.$month.($day?'&day='.$day:'');
 
 
 
-$head = calendars_prepare_head('');
+$tabactive='';
+if ($action == 'show_month') $tabactive='cardmonth';
+if ($action == 'show_week') $tabactive='cardweek';
+if ($action == 'show_day')  $tabactive='cardday';
+if ($action == 'show_list') $tabactive='cardlist';
 
-dol_fiche_head($head, 'card', $langs->trans('Events'), 0, $picto);
-print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$listofextcals,$actioncode);
+$paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
+
+$head = calendars_prepare_head($paramnoaction);
+
+dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$action,$listofextcals,$actioncode,$usergroup);
 dol_fiche_end();
 
+$showextcals=$listofextcals;
+// Legend
+if ($conf->use_javascript_ajax)
+{
+	$s='';
+	$s.='<script type="text/javascript">' . "\n";
+	$s.='jQuery(document).ready(function () {' . "\n";
+	$s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
+	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
+	$s.='jQuery(".family_birthday").toggle();' . "\n";
+	if ($action=="show_week" || $action=="show_month" || empty($action))
+	{
+    	$s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+    	$s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+	}
+  	$s.='});' . "\n";
+	$s.='</script>' . "\n";
+	if (! empty($conf->use_javascript_ajax))
+	{
+		$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+		if (is_array($showextcals) && count($showextcals) > 0)
+		{
+			foreach ($showextcals as $val)
+			{
+				$htmlname = dol_string_nospecial($val['name']);
+				$s.='<script type="text/javascript">' . "\n";
+				$s.='jQuery(document).ready(function () {' . "\n";
+				$s.='		jQuery("#check_' . $htmlname . '").click(function() {';
+				$s.=' 		/* alert("'.$htmlname.'"); */';
+				$s.=' 		jQuery(".family_' . $htmlname . '").toggle();';
+				$s.='		});' . "\n";
+				$s.='});' . "\n";
+				$s.='</script>' . "\n";
+				$s.='<div class="nowrap float"><input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
+			}
+		}
+	}
+	$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+}
+
+
 $link='';
 // Add link to show birthdays
 if (empty($conf->use_javascript_ajax))
@@ -295,7 +399,7 @@ if (empty($conf->use_javascript_ajax))
     $link.='</a>';
 }
 
-print_fiche_titre($title,$link.' &nbsp; &nbsp; '.$nav, '');
+print_fiche_titre($s,$link.' &nbsp; &nbsp; '.$nav, '');
 
 
 // Get event in an array
@@ -308,18 +412,20 @@ $sql.= ' a.datea,';
 $sql.= ' a.datea2,';
 $sql.= ' a.percent,';
 $sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,';
-$sql.= ' a.priority, a.fulldayevent, a.location,';
+$sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql.= ' a.fk_soc, a.fk_contact,';
-$sql.= ' ca.code';
-$sql.= ' FROM ('.MAIN_DB_PREFIX.'c_actioncomm as ca,';
-$sql.= " ".MAIN_DB_PREFIX."actioncomm as a)";
+$sql.= ' ca.code as type_code, ca.libelle as type_label';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu";
 $sql.= ' WHERE a.fk_action = ca.id';
 $sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
 if ($actioncode) $sql.=" AND ca.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 . ")";
-if ($user->societe_id) $sql.= ' AND a.fk_soc = '.$user->societe_id; // To limit to external user company
+if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
+// FIXME: We must filter on assignement table
+if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action";
 if ($action == 'show_day')
 {
     $sql.= " AND (";
@@ -348,21 +454,26 @@ else
     $sql.= ')';
 }
 if ($type) $sql.= " AND ca.id = ".$type;
-if ($status == 'done') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
+if ($status == '0') { $sql.= " AND a.percent = 0"; }
+if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
+if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
+if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
 if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
-if ($filtera > 0 || $filtert > 0 || $filterd > 0)
+// FIXME: We must filter on assignement table
+if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
 {
     $sql.= " AND (";
     if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
     if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
     if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
+	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
     $sql.= ")";
 }
 // Sort on date
 $sql.= ' ORDER BY datep';
 //print $sql;
 
-dol_syslog("comm/action/index.php sql=".$sql, LOG_DEBUG);
+dol_syslog("comm/action/index.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -372,21 +483,29 @@ if ($resql)
     {
         $obj = $db->fetch_object($resql);
 
+        // Discard auto action if option is on
+        if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
+        {
+        	$i++;
+        	continue;
+        }
+
         // Create a new object action
         $event=new ActionComm($db);
         $event->id=$obj->id;
         $event->datep=$db->jdate($obj->datep);      // datep and datef are GMT date
         $event->datef=$db->jdate($obj->datep2);
-        $event->type_code=$obj->code;
+        $event->type_code=$obj->type_code;
+        $event->type_label=$obj->type_label;
         $event->libelle=$obj->label;
         $event->percentage=$obj->percent;
-        $event->author->id=$obj->fk_user_author;	// user id of creator
-        $event->usertodo->id=$obj->fk_user_action;	// user id of owner
-        $event->userdone->id=$obj->fk_user_done;	// deprecated
-		// $event->userstodo=... with s after user, in future version, will be an array with all id of user assigned to event
+        $event->authorid=$obj->fk_user_author;		// user id of creator
+        $event->userownerid=$obj->fk_user_action;	// user id of owner
+        $event->fetch_userassigned();				// This load $event->userassigned
         $event->priority=$obj->priority;
         $event->fulldayevent=$obj->fulldayevent;
         $event->location=$obj->location;
+        $event->transparency=$obj->transparency;
 
         $event->societe->id=$obj->fk_soc;
         $event->contact->id=$obj->fk_contact;
@@ -413,14 +532,14 @@ if ($resql)
 
         // Check values
         if ($event->date_end_in_calendar < $firstdaytoshow ||
-        $event->date_start_in_calendar > $lastdaytoshow)
+        $event->date_start_in_calendar >= $lastdaytoshow)
         {
             // This record is out of visible range
         }
         else
         {
             if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
-            if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow;
+            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow-1);
 
             // Add an entry in actionarray for each day
             $daycursor=$event->date_start_in_calendar;
@@ -473,7 +592,7 @@ if ($showbirthday)
     }
     $sql.= ' ORDER BY birthday';
 
-    dol_syslog("comm/action/index.php sql=".$sql, LOG_DEBUG);
+    dol_syslog("comm/action/index.php", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -550,7 +669,7 @@ if (count($listofextcals))
                 if (isset($icalevent['RRULE']) && is_array($icalevent['RRULE'])) //repeatable event
                 {
                     //if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
-                    //if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow;
+                    //if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow-1);
                     if ($icalevent['DTSTART;VALUE=DATE']) //fullday event
                     {
                         $datecurstart=dol_stringtotime($icalevent['DTSTART;VALUE=DATE'],1);
@@ -589,10 +708,10 @@ if (count($listofextcals))
                     $until=empty($icalevent['RRULE']['UNTIL'])?0:dol_stringtotime($icalevent['RRULE']['UNTIL'],1);
                     $maxrepeat=empty($icalevent['RRULE']['COUNT'])?0:$icalevent['RRULE']['COUNT'];
                     if ($until && ($until+($datecurend-$datecurstart)) < $firstdaytoshow) continue;  // We discard repeatable event that end before start date to show
-                    if ($datecurstart > $lastdaytoshow) continue;                                    // We discard repeatable event that start after end date to show
+                    if ($datecurstart >= $lastdaytoshow) continue;                                   // We discard repeatable event that start after end date to show
 
                     $numofevent=0;
-                    while (($datecurstart <= $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat)))
+                    while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat)))
                     {
                         if ($datecurend >= $firstdaytoshow)    // We add event
                         {
@@ -724,7 +843,7 @@ if (count($listofextcals))
                     }
 
                     // Add event into $eventarray if date range are ok.
-                    if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar > $lastdaytoshow)
+                    if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)
                     {
                         //print 'x'.$datestart.'-'.$dateend;exit;
                         //print 'x'.$datestart.'-'.$dateend;exit;
@@ -734,7 +853,7 @@ if (count($listofextcals))
                     else
                     {
                         if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
-                        if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=$lastdaytoshow;
+                        if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
 
                         // Add an entry in actionarray for each day
                         $daycursor=$event->date_start_in_calendar;
@@ -748,8 +867,7 @@ if (count($listofextcals))
                         $daykey=dol_mktime(0,0,0,$mois,$jour,$annee);
                         $daykeygmt=dol_mktime(0,0,0,$mois,$jour,$annee,true,0);
                         do
-                        //print 'x'.$datestart.'-'.$dateend;exit;
-                        {
+                     {
                             //if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';
                             $eventarray[$daykey][]=$event;
                             $daykey+=60*60*24;  $daykeygmt+=60*60*24;   // Add one day
@@ -766,6 +884,7 @@ if (count($listofextcals))
 $maxnbofchar=18;
 $cachethirdparties=array();
 $cachecontacts=array();
+$cacheusers=array();
 
 // Define theme_datacolor array
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
@@ -803,13 +922,12 @@ if (empty($action) || $action == 'show_month')      // View by month
 
     // In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month)
     //var_dump($eventarray);
-    //print $tmpday;
     for ($iter_week = 0; $iter_week < 6 ; $iter_week++)
     {
         echo " <tr>\n";
         for ($iter_day = 0; $iter_day < 7; $iter_day++)
         {
-            /* Show days before the beginning of the current month (previous month)  */
+        	/* Show days before the beginning of the current month (previous month)  */
             if ($tmpday <= 0)
             {
                 $style='cal_other_month cal_past';
@@ -822,21 +940,20 @@ if (empty($action) || $action == 'show_month')      // View by month
             elseif ($tmpday <= $max_day_in_month)
             {
                 $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
-
                 $style='cal_current_month';
                 if ($iter_day == 6) $style.=' cal_current_month_right';
                 $today=0;
                 if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
                 if ($today) $style='cal_today';
                 if ($curtime < $todaytms) $style.=' cal_past';
-
+				//var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style);
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
                 show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
             }
             /* Show days after the current month (next month) */
             else
-            {
+			{
                 $style='cal_other_month';
                 if ($iter_day == 6) $style.=' cal_other_month_right';
                 echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
@@ -848,6 +965,12 @@ if (empty($action) || $action == 'show_month')      // View by month
         echo " </tr>\n";
     }
     echo "</table>\n";
+    echo '<form id="move_event" action="" method="POST"><input type="hidden" name="action" value="mupdate">';
+    echo '<input type="hidden" name="backtopage" value="'.$_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'">';
+    echo '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    echo '<input type="hidden" name="newdate" id="newdate">' ;
+    echo '</form>';
+
 }
 elseif ($action == 'show_week') // View by week
 {
@@ -873,7 +996,7 @@ elseif ($action == 'show_week') // View by week
 
     echo " <tr>\n";
 
-    for($iter_day = 0; $iter_day < 7; $iter_day++)
+    for ($iter_day = 0; $iter_day < 7; $iter_day++)
     {
         // Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
@@ -896,6 +1019,11 @@ elseif ($action == 'show_week') // View by week
     echo " </tr>\n";
 
     echo "</table>\n";
+    echo '<form id="move_event" action="" method="POST"><input type="hidden" name="action" value="mupdate">';
+    echo '<input type="hidden" name="backtopage" value="'.$_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'">';
+    echo '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    echo '<input type="hidden" name="newdate" id="newdate">' ;
+    echo '</form>';
 }
 else    // View by day
 {
@@ -905,20 +1033,20 @@ else    // View by day
     $newparam=preg_replace('/viewday=[0-9]+&?/i','',$newparam);
     $newparam.='&viewday=1';
     // Code to show just one day
-    $style='cal_current_month';
+    $style='cal_current_month cal_current_month_oneday';
     $today=0;
     $todayarray=dol_getdate($now,'fast');
     if ($todayarray['mday']==$day && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
-    if ($today) $style='cal_today';
+    //if ($today) $style='cal_today';
 
     $timestamp=dol_mktime(12,0,0,$month,$day,$year);
     $arraytimestamp=dol_getdate($timestamp);
-    echo '<table width="100%" class="nocellnopadd">';
+    echo '<table width="100%" class="nocellnopadd cal_month">';
     echo ' <tr class="liste_titre">';
     echo '  <td align="center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
     echo " </tr>\n";
     echo " <tr>\n";
-    echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+    echo '  <td class="'.$style.'" width="14%" valign="top">';
     $maxnbofchar=80;
     show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
     echo "</td>\n";
@@ -927,8 +1055,6 @@ else    // View by day
 }
 
 
-$db->close();
-
 /* TODO Export
  print '
 <a href="" id="actionagenda_ical_link"><img src="'.DOL_URL_ROOT.'/theme/common/ical.gif" border="0"/></a>
@@ -945,6 +1071,8 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
 
 llxFooter();
 
+$db->close();
+
 
 /**
  * Show event of a particular day
@@ -955,22 +1083,24 @@ llxFooter();
  * @param   int		$year            Year
  * @param   int		$monthshown      Current month shown in calendar view
  * @param   string	$style           Style to use for this day
- * @param   array	$eventarray     Array of events
+ * @param   array	$eventarray      Array of events
  * @param   int		$maxprint        Nb of actions to show each day on month view (0 means no limit)
  * @param   int		$maxnbofchar     Nb of characters to show for event line
  * @param   string	$newparam        Parameters on current URL
- * @param   int		$showinfo        Add extended information (used by day view)
+ * @param   int		$showinfo        Add extended information (used by day and week view)
  * @param   int		$minheight       Minimum height for each event. 60px by default.
  * @return	void
  */
 function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60)
 {
     global $user, $conf, $langs;
-    global $filter, $filtera, $filtert, $filterd, $status, $actioncode;	// Filters used into search form
+    global $action, $filter, $filtera, $filtert, $filterd, $status, $actioncode;	// Filters used into search form
     global $theme_datacolor;
-    global $cachethirdparties, $cachecontacts, $colorindexused;
+    global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
 
     print '<div id="dayevent_'.sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day).'" class="dayevent">'."\n";
+
+    // Line with title of day
     $curtime = dol_mktime(0, 0, 0, $month, $day, $year);
     print '<table class="nobordernopadding" width="100%">';
     print '<tr><td align="left" class="nowrap">';
@@ -978,7 +1108,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
     print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
     print $newparam;
     print '">';
-    if ($showinfo) print dol_print_date($curtime,'daytext');
+    if ($showinfo) print dol_print_date($curtime,'daytextshort');
     else print dol_print_date($curtime,'%d');
     print '</a>';
     print '</td><td align="right" class="nowrap">';
@@ -988,18 +1118,21 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
         //$param='month='.$monthshown.'&year='.$year;
         $hourminsec='100000';
-        print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&datep='.sprintf("%04d%02d%02d",$year,$month,$day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'">';
+        print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d",$year,$month,$day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam?'?'.$newparam:'')).'">';
         print img_picto($langs->trans("NewAction"),'edit_add.png');
         print '</a>';
     }
     print '</td></tr>';
-    print '<tr height="'.$minheight.'"><td valign="top" colspan="2" class="nowrap" style="padding-bottom: 2px;">';
+
+    // Line with td contains all div of each events
+    print '<tr height="'.$minheight.'"><td valign="top" colspan="2" class="sortable" style="padding-bottom: 2px;">';
+	print '<div style="width: 100%; position: relative;">';
 
     //$curtime = dol_mktime (0, 0, 0, $month, $day, $year);
     $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
     $ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
 
-    $nextindextouse=count($colorindexused);
+    $nextindextouse=count($colorindexused);	// At first run this is 0, so fist user has 0, next 1, ...
 	//print $nextindextouse;
 
     foreach ($eventarray as $daykey => $notused)
@@ -1013,20 +1146,26 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
             {
                 if ($i < $maxprint || $maxprint == 0 || ! empty($conf->global->MAIN_JS_SWITCH_AGENDA))
                 {
-                    $ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+					$keysofuserassigned=array_keys($event->userassigned);
 
-                    // Define $color and $cssclass of event
+                	$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+
+                    // Define $color (Hex string like '0088FF') and $cssclass of event
                     $color=-1; $cssclass=''; $colorindex=-1;
-                    if ((! empty($event->author->id) && $event->author->id == $user->id)
-                    || (! empty($event->usertodo->id) && $event->usertodo->id == $user->id)
-                    || (! empty($event->userdone->id) && $event->userdone->id == $user->id))
-                    {
-                    	$nummytasks++; $cssclass='family_mytasks';
-                    	// TODO Set a color using user color
-                    	// Must defined rule to choose color of who to use.
-                    	// event->usertodo->id will still contains user id of owner
-                    	// event->userstodo will be an array in future.
-                    	// $color=$user->color;
+       				if (in_array($user->id, $keysofuserassigned))
+					{
+						$nummytasks++; $cssclass='family_mytasks';
+
+						if (empty($cacheusers[$event->userownerid]))
+						{
+							$newuser=new User($db);
+							$newuser->fetch($event->userownerid);
+							$cacheusers[$event->userownerid]=$newuser;
+						}
+						//var_dump($cacheusers[$event->userownerid]->color);
+
+                    	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+                    	if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
                     }
                     else if ($event->type_code == 'ICALEVENT')
                     {
@@ -1038,35 +1177,80 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     		$numicals[dol_string_nospecial($event->icalname)]++;
                     	}
                     	$color=$event->icalcolor;
-                    	$cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other');
+                    	$cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable');
                     }
-                    else if ($event->type_code == 'BIRTHDAY')  { $numbirthday++; $colorindex=2; $cssclass='family_birthday'; }
-                    else { $numother++; $cssclass='family_other'; }
+                    else if ($event->type_code == 'BIRTHDAY')
+                    {
+                    	$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+                    }
+                    else
+                 	{
+                 		$numother++; $cssclass='family_other';
+
+						if (empty($cacheusers[$event->userownerid]))
+						{
+							$newuser=new User($db);
+							$newuser->fetch($event->userownerid);
+							$cacheusers[$event->userownerid]=$newuser;
+						}
+						//var_dump($cacheusers[$event->userownerid]->color);
+
+                    	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+                    	if (! empty($cacheusers[$event->userownerid]->color)) $color=$cacheusers[$event->userownerid]->color;
+                 	}
                     if ($color == -1)	// Color was not forced. Set color according to color index.
                     {
                     	// Define color index if not yet defined
-                    	$idusertouse=($event->usertodo->id?$event->usertodo->id:0);
+                    	$idusertouse=($event->userownerid?$event->userownerid:0);
                     	if (isset($colorindexused[$idusertouse]))
                     	{
                     		$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
                     	}
                     	else
                     	{
-                    		$colorindex=$nextindextouse;
-                    		$colorindexused[$idusertouse]=$colorindex;
+                   			$colorindex=$nextindextouse;
+                   			$colorindexused[$idusertouse]=$colorindex;
                     		if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
                     	}
                     	//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';
 						// Define color
                     	$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
-                    }
+                  	}
                     $cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
 
+                    // Defined style to disable drag and drop feature
+                    if ($event->date_end_in_calendar && date('Ymd',$event->date_start_in_calendar) != date('Ymd',$event->date_end_in_calendar))
+                    {
+                        $tmpyearend    = date('Y',$event->date_end_in_calendar);
+                        $tmpmonthend   = date('m',$event->date_end_in_calendar);
+                        $tmpdayend     = date('d',$event->date_end_in_calendar);
+                        if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
+                        {
+                            $cssclass.= " unsortable";
+                        }
+                    }
+                    if ($event->type_code =='AC_OTH_AUTO')
+                    {
+                        $cssclass.= " unsortable";
+                    }
+
+                    $h=''; $nowrapontd=1;
+                    if ($action == 'show_day')  { $h='height: 100%; '; $nowrapontd=0; }
+                    if ($action == 'show_week') { $h='height: 100%; '; $nowrapontd=0; }
+
                     // Show rect of event
-                    print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'">';
-                    print '<ul class="cal_event"><li class="cal_event">';
-                    print '<table class="cal_event" style="background: #'.$color.'; -moz-border-radius:4px; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).')); " width="100%"><tr>';
-                    print '<td class="nowrap cal_event">';
+                    print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'"';
+                    //print ' style="height: 100px;';
+                    //print ' position: absolute; top: 40px; width: 50%;';
+                    //print '"';
+                    print '>';
+                    print '<ul class="cal_event" style="'.$h.'"><li class="cal_event" style="'.$h.'">';
+                    print '<table class="cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
+                    print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
+                    //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
+                    //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
+                    print ' -moz-border-radius:4px;" width="100%"><tr>';
+                    print '<td class="'.($nowrapontd?'nowrap ':'').'cal_event'.($event->type_code == 'BIRTHDAY'?' cal_event_birthday':'').'">';
                     if ($event->type_code == 'BIRTHDAY') // It's a birthday
                     {
                         print $event->getNomUrl(1,$maxnbofchar,'cal_event','birthday','contact');
@@ -1133,7 +1317,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                             print "<br>\n";
                         }
                         else
-                        {
+						{
                             if ($showinfo)
                             {
                                 print $langs->trans("EventOnFullDay")."<br>\n";
@@ -1197,7 +1381,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                 }
                 else
                 {
-                	print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?maxprint=0&month='.$monthshown.'&year='.$year;
+                	print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
                     print ($status?'&status='.$status:'').($filter?'&filter='.$filter:'');
                     print ($filtera?'&filtera='.$filtera:'').($filtert?'&filtert='.$filtert:'').($filterd?'&filterd='.$filterd:'');
                     print ($actioncode!=''?'&actioncode='.$actioncode:'');
@@ -1229,14 +1413,17 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
         print '}'."\n";
 
         print '});'."\n";
+
         print '</script>'."\n";
     }
 
+    print '</div>';
     print '</td></tr>';
     print '</table>';
     print '</div>'."\n";
 }
 
+
 /**
  * Change color with a delta
  *
@@ -1252,4 +1439,3 @@ function dol_color_minus($color, $minus)
 	$newcolor[4]=((hexdec($newcolor[4])-$minus)<0)?0:dechex((hexdec($newcolor[4])-$minus));
 	return $newcolor;
 }
-
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 2c0c108b275..a53628e3d31 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -42,13 +42,28 @@ $actioncode=GETPOST("actioncode","alpha",3);
 $pid=GETPOST("projectid",'int',3);
 $status=GETPOST("status",'alpha');
 $type=GETPOST('type');
+$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_USE_EVENT_TYPE)?'AC_OTH':''));
+$dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth'), GETPOST('dateselectday'), GETPOST('dateselectyear'));
+$datestart=dol_mktime(0, 0, 0, GETPOST('datestartmonth'), GETPOST('datestartday'), GETPOST('datestartyear'));
+$dateend=dol_mktime(0, 0, 0, GETPOST('dateendmonth'), GETPOST('dateendday'), GETPOST('dateendyear'));
+
+if ($actioncode == '') $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
 
 $filter=GETPOST("filter",'',3);
 $filtera = GETPOST("userasked","int",3)?GETPOST("userasked","int",3):GETPOST("filtera","int",3);
 $filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
 $filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filterd","int",3);
+$usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
+// If not choice done on calendar owner, we filter on user.
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
+{
+	$filtert=$user->id;
+}
+
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -57,21 +72,22 @@ $limit = $conf->liste_limit;
 $offset = $limit * $page ;
 if (! $sortorder)
 {
-	$sortorder="ASC";
-	if ($status == 'todo') $sortorder="ASC";
-	if ($status == 'done') $sortorder="DESC";
+	$sortorder="DESC";
+	if ($status == 'todo') $sortorder="DESC";
+	//if ($status == 'done') $sortorder="DESC";
 }
 if (! $sortfield)
 {
-	$sortfield="a.percent";
+	$sortfield="a.datep";
 	if ($status == 'todo') $sortfield="a.datep";
-	if ($status == 'done') $sortfield="a.datep2";
+	//if ($status == 'done') $sortfield="a.datep2";
 }
 
 // Security check
 $socid = GETPOST("socid",'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
+if ($socid < 0) $socid='';
 
 $canedit=1;
 if (! $user->rights->agenda->myactions->read) accessforbidden();
@@ -83,11 +99,21 @@ if (! $user->rights->agenda->allactions->read || $filter=='mine')	// If no permi
 	$filterd=$user->id;
 }
 
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $datestart='';
+    $dateend='';
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('agendalist'));
 
 
 /*
  *	Actions
  */
+
 if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
 {
 	$param='';
@@ -106,18 +132,36 @@ if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
  *  View
  */
 
+$form=new Form($db);
+
+$nav='';
+$nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav.='<input type="hidden" name="actioncode" value="'.$actioncode.'">';
+if ($status || isset($_GET['status']) || isset($_POST['status']))  $nav.='<input type="hidden" name="status" value="'.$status.'">';
+if ($filter)  $nav.='<input type="hidden" name="filter" value="'.$filter.'">';
+if ($filtera) $nav.='<input type="hidden" name="filtera" value="'.$filtera.'">';
+if ($filtert) $nav.='<input type="hidden" name="filtert" value="'.$filtert.'">';
+if ($filterd) $nav.='<input type="hidden" name="filterd" value="'.$filterd.'">';
+if ($socid)   $nav.='<input type="hidden" name="socid" value="'.$socid.'">';
+if ($showbirthday)  $nav.='<input type="hidden" name="showbirthday" value="1">';
+if ($pid)    $nav.='<input type="hidden" name="projectid" value="'.$pid.'">';
+if ($type)   $nav.='<input type="hidden" name="type" value="'.$type.'">';
+if ($usergroup) $nav.='<input type="hidden" name="usergroup" value="'.$usergroup.'">';
+$nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
+$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav.='</form>';
+
 $now=dol_now();
 
 $help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('',$langs->trans("Agenda"),$help_url);
 
-$form=new Form($db);
-
 // Define list of all external calendars
 $listofextcals=array();
 
 $param='';
-if ($status) $param="&status=".$status;
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
+if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
 if ($filter) $param.="&filter=".$filter;
 if ($filtera) $param.="&filtera=".$filtera;
 if ($filtert) $param.="&filtert=".$filtert;
@@ -126,15 +170,15 @@ if ($socid) $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
 if ($pid) $param.="&projectid=".$pid;
 if ($type) $param.="&type=".$type;
-if ($actioncode) $param.="&actioncode=".$actioncode;
+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,";
 $sql.= " a.fk_contact, a.note, a.label, a.percent as percent,";
-$sql.= " c.code as acode, c.libelle,";
+$sql.= " c.code as type_code, c.libelle as type_label,";
 $sql.= " ua.login as loginauthor, ua.rowid as useridauthor,";
 $sql.= " ut.login as logintodo, ut.rowid as useridtodo,";
-$sql.= " ud.login as logindone, ud.rowid as useriddone,";
+//$sql.= " ud.login as logindone, ud.rowid as useriddone,";
 $sql.= " sp.lastname, sp.firstname";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c,";
 $sql.= " ".MAIN_DB_PREFIX.'user as u,';
@@ -144,30 +188,43 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON a.fk_user_author = ua.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ut ON a.fk_user_action = ut.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ud ON a.fk_user_done = ud.rowid";
+//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as ud ON a.fk_user_done = ud.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().')';    // 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 . ")";
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+if ($socid > 0) $sql.= " AND s.rowid = ".$socid;
+// FIXME: We must filter on assignement table
+if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action";
 if ($type) $sql.= " AND c.id = ".$type;
-if ($status == 'done') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
+if ($status == '0') { $sql.= " AND a.percent = 0"; }
+if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
+if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
+if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
 if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
-if ($filtera > 0 || $filtert > 0 || $filterd > 0)
+// FIXME: We must filter on assignement table
+if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
 {
-	$sql.= " AND (";
-	if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
-	if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
-	if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
-	$sql.= ")";
+    $sql.= " AND (";
+    if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
+    if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
+    if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
+	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    $sql.= ")";
 }
+// 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 sql=".$sql);
+dol_syslog("comm/action/listactions.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -176,26 +233,20 @@ if ($resql)
 
 	$num = $db->num_rows($resql);
 
-	$title=$langs->trans("DoneAndToDoActions");
+	/*$title=$langs->trans("DoneAndToDoActions");
 	if ($status == 'done') $title=$langs->trans("DoneActions");
 	if ($status == 'todo') $title=$langs->trans("ToDoActions");
+	*/
+	$title=$langs->trans("ListOfEvents");
 
-	if ($socid)
-	{
-		$societe = new Societe($db);
-		$societe->fetch($socid);
-		$newtitle=$langs->trans($title).' '.$langs->trans("For").' '.$societe->nom;
-	}
-	else
-	{
-		$newtitle=$langs->trans($title);
-	}
+	$newtitle=$langs->trans($title);
 
+	$tabactive='cardlist';
 
-    $head = calendars_prepare_head('');
+	$head = calendars_prepare_head($param);
 
-    dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'list');
-    print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,-1,$actioncode);
+    dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+    print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirthday,$filtera,$filtert,$filterd,$pid,$socid,$action,-1,$actioncode,$usergroup);
     dol_fiche_end();
 
     // Add link to show birthdays
@@ -215,9 +266,11 @@ if ($resql)
     }
     */
 
-    print_barre_liste($newtitle, $page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,$link,$num,0,'');
+    print_barre_liste($newtitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $link, $num, 0, '', 0, $nav);
     //print '<br>';
 
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?'.$param.'">'."\n";
+
 	$i = 0;
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
@@ -227,12 +280,29 @@ if ($resql)
 	print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ActionUserAsk"),$_SERVER["PHP_SELF"],"ua.login",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("AffectedTo"),$_SERVER["PHP_SELF"],"ut.login",$param,"","",$sortfield,$sortorder);
+	//print_liste_field_titre($langs->trans("ActionUserAsk"),$_SERVER["PHP_SELF"],"ua.login",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ActionsOwnedBy"),$_SERVER["PHP_SELF"],"ut.login",$param,"","",$sortfield,$sortorder);
 	//print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder);
 	print "</tr>\n";
 
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre" align="center">';
+	print $form->select_date($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1);
+	print '</td>';
+	print '<td class="liste_titre" align="center">';
+	print $form->select_date($dateend, 'dateend', 0, 0, 1, '', 1, 0, 1);
+	print '</td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	//print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre"></td>';
+	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print '</td>';
+	print "</tr>\n";
+
 	$contactstatic = new Contact($db);
 	$now=dol_now();
 	$delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60;
@@ -242,6 +312,13 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
+        // Discard auto action if option is on
+        if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
+        {
+        	$i++;
+        	continue;
+        }
+
 		$var=!$var;
 
 		print "<tr ".$bc[$var].">";
@@ -249,14 +326,15 @@ if ($resql)
 		// Action (type)
 		print '<td>';
 		$actionstatic->id=$obj->id;
-		$actionstatic->type_code=$obj->acode;
+		$actionstatic->type_code=$obj->type_code;
+		$actionstatic->type_label=$obj->type_label;
 		$actionstatic->libelle=$obj->label;
 		print $actionstatic->getNomUrl(1,28);
 		print '</td>';
 
 		// Start date
 		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->dp),"day");
+		print dol_print_date($db->jdate($obj->dp),"dayhour");
 		$late=0;
 		if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
 		if ($obj->percent == 0 && ! $obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
@@ -267,7 +345,7 @@ if ($resql)
 
 		// End date
 		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->dp2),"day");
+		print dol_print_date($db->jdate($obj->dp2),"dayhour");
 		print '</td>';
 
 		// Third party
@@ -276,7 +354,7 @@ if ($resql)
 		{
 			$societestatic->id=$obj->socid;
 			$societestatic->client=$obj->client;
-			$societestatic->nom=$obj->societe;
+			$societestatic->name=$obj->societe;
 			print $societestatic->getNomUrl(1,'',10);
 		}
 		else print '&nbsp;';
@@ -298,6 +376,7 @@ if ($resql)
 		print '</td>';
 
 		// User author
+		/*
 		print '<td align="left">';
 		if ($obj->useridauthor)
 		{
@@ -308,6 +387,7 @@ if ($resql)
 		}
 		else print '&nbsp;';
 		print '</td>';
+		*/
 
 		// User to do
 		print '<td align="left">';
@@ -342,6 +422,9 @@ if ($resql)
 		$i++;
 	}
 	print "</table>";
+
+	print '</form>';
+
 	$db->free($resql);
 
 }
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
new file mode 100644
index 00000000000..22cf8841c02
--- /dev/null
+++ b/htdocs/comm/action/peruser.php
@@ -0,0 +1,1042 @@
+<?php
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+
+/**
+ *  \file       htdocs/comm/action/peruser.php
+ *  \ingroup    agenda
+ *  \brief      Tab of calendar events per user
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
+if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+
+
+if (! isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW=3;
+
+$filter=GETPOST("filter",'',3);
+$filtera = GETPOST("userasked","int",3)?GETPOST("userasked","int",3):GETPOST("filtera","int",3);
+$filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filtert","int",3);
+$filterd = GETPOST("userdone","int",3)?GETPOST("userdone","int",3):GETPOST("filterd","int",3);
+$usergroup = GETPOST("usergroup","int",3);
+//if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
+//$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
+$showbirthday = 0;
+
+// If not choice done on calendar owner, we filter on user.
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
+{
+	$filtert=$user->id;
+}
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page","int");
+if ($page == -1) { $page = 0; }
+$limit = $conf->liste_limit;
+$offset = $limit * $page;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="a.datec";
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'agenda', 0, '', 'myactions');
+if ($socid < 0) $socid='';
+
+$canedit=1;
+if (! $user->rights->agenda->myactions->read) accessforbidden();
+if (! $user->rights->agenda->allactions->read) $canedit=0;
+if (! $user->rights->agenda->allactions->read || $filter =='mine')  // If no permission to see all, we show only affected to me
+{
+    $filtera=$user->id;
+    $filtert=$user->id;
+    $filterd=$user->id;
+}
+
+//$action=GETPOST('action','alpha');
+$action='show_peruser'; //We use 'show_week' mode
+//$year=GETPOST("year");
+$year=GETPOST("year","int")?GETPOST("year","int"):date("Y");
+$month=GETPOST("month","int")?GETPOST("month","int"):date("m");
+$week=GETPOST("week","int")?GETPOST("week","int"):date("W");
+$day=GETPOST("day","int")?GETPOST("day","int"):date("d");
+$pid=GETPOST("projectid","int",3);
+$status=GETPOST("status");
+$type=GETPOST("type");
+$maxprint=(isset($_GET["maxprint"])?GETPOST("maxprint"):$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$actioncode=GETPOST("actioncode","alpha",3)?GETPOST("actioncode","alpha",3):(GETPOST("actioncode")=='0'?'0':'');
+
+$dateselect=dol_mktime(0, 0, 0, GETPOST('dateselectmonth'), GETPOST('dateselectday'), GETPOST('dateselectyear'));
+if ($dateselect > 0)
+{
+	$day=GETPOST('dateselectday');
+	$month=GETPOST('dateselectmonth');
+	$year=GETPOST('dateselectyear');
+}
+
+$tmp=empty($conf->global->MAIN_DEFAULT_WORKING_HOURS)?'9-18':$conf->global->MAIN_DEFAULT_WORKING_HOURS;
+$tmparray=explode('-',$tmp);
+$begin_h = GETPOST('begin_h')!=''?GETPOST('begin_h','int'):($tmparray[0] != '' ? $tmparray[0] : 9);
+$end_h   = GETPOST('end_h')?GETPOST('end_h'):($tmparray[1] != '' ? $tmparray[1] : 18);
+if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
+if ($end_h < 1 || $end_h > 24) $end_h = 18;
+if ($end_h <= $begin_h) $end_h = $begin_h + 1;
+
+$tmp=empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)?'1-5':$conf->global->MAIN_DEFAULT_WORKING_DAYS;
+$tmparray=explode('-',$tmp);
+$begin_d = GETPOST('begin_d')?GETPOST('begin_d','int'):($tmparray[0] != '' ? $tmparray[0] : 1);
+$end_d   = GETPOST('end_d')?GETPOST('end_d'):($tmparray[1] != '' ? $tmparray[1] : 5);
+if ($begin_d < 1 || $begin_d > 7) $begin_d = 1;
+if ($end_d < 1 || $end_d > 7) $end_d = 7;
+if ($end_d < $begin_d) $end_d = $begin_d + 1;
+
+if ($actioncode == '') $actioncode=(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($status == ''   && ! isset($_GET['status']) && ! isset($_POST['status'])) $status=(empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS)?'':$conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if (empty($action) && ! isset($_GET['action']) && ! isset($_POST['action'])) $action=(empty($conf->global->AGENDA_DEFAULT_VIEW)?'show_month':$conf->global->AGENDA_DEFAULT_VIEW);
+
+if (GETPOST('viewcal') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser')  {
+    $action='show_month'; $day='';
+}                                                   // View by month
+if (GETPOST('viewweek') || $action == 'show_week') {
+    $action='show_week'; $week=($week?$week:date("W")); $day=($day?$day:date("d"));
+}  // View by week
+if (GETPOST('viewday') || $action == 'show_day')  {
+    $action='show_day'; $day=($day?$day:date("d"));
+}                                  // View by day
+
+
+$langs->load("agenda");
+$langs->load("other");
+$langs->load("commercial");
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('agenda'));
+
+
+/*
+ * Actions
+ */
+
+if ($action =='delete_action')
+{
+    $event = new ActionComm($db);
+    $event->fetch($actionid);
+    $result=$event->delete();
+}
+
+
+
+/*
+ * View
+ */
+
+$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
+llxHeader('',$langs->trans("Agenda"),$help_url);
+
+$form=new Form($db);
+$companystatic=new Societe($db);
+
+$now=dol_now();
+$nowarray=dol_getdate($now);
+$nowyear=$nowarray['year'];
+$nowmonth=$nowarray['mon'];
+$nowday=$nowarray['mday'];
+
+
+// Define list of all external calendars (global setup)
+$listofextcals=array();
+
+$prev = dol_get_first_day_week($day, $month, $year);
+$first_day   = $prev['first_day'];
+$first_month = $prev['first_month'];
+$first_year  = $prev['first_year'];
+
+$week = $prev['week'];
+
+$day = (int) $day;
+$next = dol_get_next_week($day, $week, $month, $year);
+$next_year  = $next['year'];
+$next_month = $next['month'];
+$next_day   = $next['day'];
+
+$max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
+
+$tmpday = $first_day;
+//print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
+//print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
+
+$title=$langs->trans("DoneAndToDoActions");
+if ($status == 'done') $title=$langs->trans("DoneActions");
+if ($status == 'todo') $title=$langs->trans("ToDoActions");
+
+$param='';
+if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param.="&actioncode=".$actioncode;
+if ($status || isset($_GET['status']) || isset($_POST['status'])) $param.="&status=".$status;
+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;
+if ($type)   $param.="&type=".$type;
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param.='&action='.$action;
+$param.="&maxprint=".$maxprint;
+
+$prev = dol_get_first_day_week($day, $month, $year);
+$prev_year  = $prev['prev_year'];
+$prev_month = $prev['prev_month'];
+$prev_day   = $prev['prev_day'];
+$first_day  = $prev['first_day'];
+$first_month= $prev['first_month'];
+$first_year = $prev['first_year'];
+
+$week = $prev['week'];
+
+$day = (int) $day;
+$next = dol_get_next_week($first_day, $week, $first_month, $first_year);
+$next_year  = $next['year'];
+$next_month = $next['month'];
+$next_day   = $next['day'];
+
+// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
+$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
+$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd');
+//print dol_print_date($firstdaytoshow,'dayhour');
+//print dol_print_date($lastdaytoshow,'dayhour');
+
+$max_day_in_month = date("t",dol_mktime(0,0,0,$month,1,$year));
+
+$tmpday = $first_day;
+
+$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+$nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
+$nav.=" </span>\n";
+$nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+$nav.=" &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+$picto='calendarweek';
+
+$nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
+$nav.='<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+$nav.='<input type="hidden" name="action" value="' . $action . '">';
+$nav.='<input type="hidden" name="usertodo" value="' . $filtert . '">';
+$nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
+$nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
+$nav.='<input type="hidden" name="status" value="' . $status . '">';
+$nav.='<input type="hidden" name="socid" value="' . $socid . '">';
+$nav.='<input type="hidden" name="projectid" value="' . $projectid . '">';
+$nav.='<input type="hidden" name="begin_h" value="' . $begin_h . '">';
+$nav.='<input type="hidden" name="end_h" value="' . $end_h . '">';
+$nav.='<input type="hidden" name="begin_d" value="' . $begin_d . '">';
+$nav.='<input type="hidden" name="end_d" value="' . $end_d . '">';
+$nav.='<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
+
+$nav.=$form->select_date($dateselect, 'dateselect', 0, 0, 1, '', 1, 0, 1);
+$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav.='</form>';
+
+// Must be after the nav definition
+$param.='&year='.$year.'&month='.$month.($day?'&day='.$day:'');
+//print 'x'.$param;
+
+
+
+
+$tabactive='';
+if ($action == 'show_month') $tabactive='cardmonth';
+if ($action == 'show_week') $tabactive='cardweek';
+if ($action == 'show_day')  $tabactive='cardday';
+if ($action == 'show_list') $tabactive='cardlist';
+if ($action == 'show_peruser') $tabactive='cardperuser';
+
+$paramnoaction=preg_replace('/action=[a-z_]+/','',$param);
+
+$head = calendars_prepare_head($paramnoaction);
+
+dol_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
+print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup);
+dol_fiche_end();
+
+$showextcals=$listofextcals;
+// Legend
+if ($conf->use_javascript_ajax)
+{
+	$s='';
+	$s.='<script type="text/javascript">' . "\n";
+	$s.='jQuery(document).ready(function () {' . "\n";
+	$s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
+	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
+	$s.='jQuery(".family_birthday").toggle();' . "\n";
+	if ($action=="show_week" || $action=="show_month" || empty($action))
+	{
+    	$s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
+    	$s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
+	}
+  	$s.='});' . "\n";
+	$s.='</script>' . "\n";
+	if (! empty($conf->use_javascript_ajax))
+	{
+		$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+		if (is_array($showextcals) && count($showextcals) > 0)
+		{
+			foreach ($showextcals as $val)
+			{
+				$htmlname = dol_string_nospecial($val['name']);
+				$s.='<script type="text/javascript">' . "\n";
+				$s.='jQuery(document).ready(function () {' . "\n";
+				$s.='		jQuery("#check_' . $htmlname . '").click(function() {';
+				$s.=' 		/* alert("'.$htmlname.'"); */';
+				$s.=' 		jQuery(".family_' . $htmlname . '").toggle();';
+				$s.='		});' . "\n";
+				$s.='});' . "\n";
+				$s.='</script>' . "\n";
+				$s.='<div class="nowrap float"><input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
+			}
+		}
+	}
+	//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+}
+
+
+
+$link='';
+print_fiche_titre($s,$link.' &nbsp; &nbsp; '.$nav, '');
+
+
+// Get event in an array
+$eventarray=array();
+
+$sql = 'SELECT a.id,a.label,';
+$sql.= ' a.datep,';
+$sql.= ' a.datep2,';
+$sql.= ' a.datea,';
+$sql.= ' a.datea2,';
+$sql.= ' a.percent,';
+$sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,';
+$sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
+$sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype,';
+$sql.= ' ca.code, ca.color';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
+if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if ($usergroup > 0) $sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ugu";
+$sql.= ' WHERE a.fk_action = ca.id';
+$sql.= ' AND a.entity IN ('.getEntity('agenda', 1).')';
+if ($actioncode) $sql.=" AND ca.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 . ")";
+if ($socid > 0) $sql.= ' AND a.fk_soc = '.$socid;
+// FIXME: We must filter on assignement table
+if ($usergroup > 0) $sql.= " AND ugu.fk_user = a.fk_user_action";
+if ($action == 'show_day')
+{
+    $sql.= " AND (";
+    $sql.= " (a.datep BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
+    $sql.= " OR ";
+    $sql.= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
+    $sql.= " OR ";
+    $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,$day,$year))."'";
+    $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,$day,$year))."')";
+    $sql.= ')';
+}
+else
+{
+    // To limit array
+    $sql.= " AND (";
+    $sql.= " (a.datep BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,1,$year)-(60*60*24*7))."'";   // Start 7 days before
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,28,$year)+(60*60*24*10))."')";            // End 7 days after + 3 to go from 28 to 31
+    $sql.= " OR ";
+    $sql.= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0,0,0,$month,1,$year)-(60*60*24*7))."'";
+    $sql.= " AND '".$db->idate(dol_mktime(23,59,59,$month,28,$year)+(60*60*24*10))."')";
+    $sql.= " OR ";
+    $sql.= " (a.datep < '".$db->idate(dol_mktime(0,0,0,$month,1,$year)-(60*60*24*7))."'";
+    $sql.= " AND a.datep2 > '".$db->idate(dol_mktime(23,59,59,$month,28,$year)+(60*60*24*10))."')";
+    $sql.= ')';
+}
+if ($type) $sql.= " AND ca.id = ".$type;
+if ($status == '0') { $sql.= " AND a.percent = 0"; }
+if ($status == '-1') { $sql.= " AND a.percent = -1"; }	// Not applicable
+if ($status == '50') { $sql.= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
+if ($status == 'done' || $status == '100') { $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))"; }
+if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))"; }
+// FIXME: We must filter on assignement table
+if ($filtera > 0 || $filtert > 0 || $filterd > 0 || $usergroup > 0)
+{
+    $sql.= " AND (";
+    if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera;
+    if ($filtert > 0) $sql.= ($filtera>0?" OR ":"")." a.fk_user_action = ".$filtert;
+    if ($filterd > 0) $sql.= ($filtera>0||$filtert>0?" OR ":"")." a.fk_user_done = ".$filterd;
+	if ($usergroup > 0) $sql.= ($filtera>0||$filtert>0||$filterd>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
+    $sql.= ")";
+}
+// Sort on date
+$sql.= ' ORDER BY fk_user_action, datep'; //fk_user_action
+//print $sql;
+
+dol_syslog("comm/action/index.php", LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i=0;
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($resql);
+
+        // Discard auto action if option is on
+        if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
+        {
+        	$i++;
+        	continue;
+        }
+
+        // Create a new object action
+        $event=new ActionComm($db);
+        $event->id=$obj->id;
+        $event->datep=$db->jdate($obj->datep);      // datep and datef are GMT date
+        $event->datef=$db->jdate($obj->datep2);
+        $event->type_code=$obj->code;
+        $event->type_color=$obj->color;
+        //$event->libelle=$obj->label;				// deprecated
+        $event->label=$obj->label;
+        $event->percentage=$obj->percent;
+        //$event->author->id=$obj->fk_user_author;	// user id of creator
+        $event->authorid=$obj->fk_user_author;		// user id of creator
+        $event->userownerid=$obj->fk_user_action;	// user id of owner
+        $event->fetch_userassigned();				// This load $event->userassigned
+        $event->priority=$obj->priority;
+        $event->fulldayevent=$obj->fulldayevent;
+        $event->location=$obj->location;
+        $event->transparency=$obj->transparency;
+
+        $event->socid=$obj->fk_soc;
+        $event->contactid=$obj->fk_contact;
+        //$event->societe->id=$obj->fk_soc;			// deprecated
+        //$event->contact->id=$obj->fk_contact;		// deprecated
+
+        $event->fk_element=$obj->fk_element;
+        $event->elementtype=$obj->elementtype;
+
+        // Defined date_start_in_calendar and date_end_in_calendar property
+        // They are date start and end of action but modified to not be outside calendar view.
+        if ($event->percentage <= 0)
+        {
+            $event->date_start_in_calendar=$event->datep;
+            if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar=$event->datef;
+            else $event->date_end_in_calendar=$event->datep;
+        }
+        else
+		{
+            $event->date_start_in_calendar=$event->datep;
+            if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar=$event->datef;
+            else $event->date_end_in_calendar=$event->datep;
+        }
+        // Define ponctual property
+        if ($event->date_start_in_calendar == $event->date_end_in_calendar)
+        {
+            $event->ponctuel=1;
+        }
+
+        // Check values
+        if ($event->date_end_in_calendar < $firstdaytoshow ||
+        $event->date_start_in_calendar >= $lastdaytoshow)
+        {
+            // This record is out of visible range
+        }
+        else
+		{
+            if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
+            if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow - 1);
+
+            // Add an entry in actionarray for each day
+            $daycursor=$event->date_start_in_calendar;
+            $annee = date('Y',$daycursor);
+            $mois = date('m',$daycursor);
+            $jour = date('d',$daycursor);
+
+            // Loop on each day covered by action to prepare an index to show on calendar
+            $loop=true; $j=0;
+            $daykey=dol_mktime(0,0,0,$mois,$jour,$annee);
+            do
+			{
+                //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
+
+                $eventarray[$daykey][]=$event;
+                $j++;
+
+                $daykey+=60*60*24;
+                if ($daykey > $event->date_end_in_calendar) $loop=false;
+            }
+            while ($loop);
+
+            //print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
+            //print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
+        }
+        $i++;
+
+    }
+}
+else
+{
+    dol_print_error($db);
+}
+
+$maxnbofchar=18;
+$cachethirdparties=array();
+$cachecontacts=array();
+
+// Define theme_datacolor array
+$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
+if (is_readable($color_file))
+{
+    include_once $color_file;
+}
+if (! is_array($theme_datacolor)) $theme_datacolor=array(array(120,130,150), array(200,160,180), array(190,190,220));
+
+
+$newparam=$param;   // newparam is for birthday links
+$newparam=preg_replace('/showbirthday=/i','showbirthday_=',$newparam);	// To avoid replacement when replace day= is done
+$newparam=preg_replace('/action=show_month&?/i','',$newparam);
+$newparam=preg_replace('/action=show_week&?/i','',$newparam);
+$newparam=preg_replace('/day=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam);
+$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam);	// Restore correct parameter
+$newparam.='&viewweek=1';
+
+echo '<form id="move_event" action="" method="POST"><input type="hidden" name="action" value="mupdate">';
+echo '<input type="hidden" name="backtopage" value="'.$_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'].'">';
+echo '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+echo '<input type="hidden" name="newdate" id="newdate">' ;
+echo '</form>';
+
+
+// Table :
+echo '<table width="100%" class="nocellnopadd cal_month">';
+
+echo '<tr class="liste_titre">';
+echo '<td></td>';
+$i=0;
+while ($i < 7)
+{
+	if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+	{
+		$i++;
+		continue;
+	}
+	echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
+	echo $langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7));
+	print "<br>";
+	if ($i) print dol_print_date(dol_time_plus_duree($firstdaytoshow, $i, 'd'),'day');
+	else print dol_print_date($firstdaytoshow,'day');
+	echo "</td>\n";
+	$i++;
+}
+echo "</tr>\n";
+
+echo '<tr class="liste_titre">';
+echo '<td></td>';
+$i=0;
+while ($i < 7)
+{
+	if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+	{
+		$i++;
+		continue;
+	}
+	for ($h = $begin_h; $h < $end_h; $h++)
+	{
+		echo '<td align="center">';
+		print '<small style="font-family: courier">'.sprintf("%02d",$h).'</small>';
+		print "</td>";
+	}
+	echo "</td>\n";
+	$i++;
+}
+echo "</tr>\n";
+
+
+// Define $usernames
+$usernames = array(); //init
+$usernamesid = array();
+/* Use this to have list of users only if users have events */
+if (! empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW))
+{
+	foreach ($eventarray as $daykey => $notused)
+	{
+	   // Get all assigned users for each event
+	   foreach ($eventarray[$daykey] as $index => $event)
+	   {
+		   	$event->fetch_userassigned();
+			$listofuserid=$event->userassigned;
+			foreach($listofuserid as $userid => $tmp)
+			{
+			   	if (! in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
+			}
+	   }
+	}
+}
+/* Use this list to have for all users */
+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',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;
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+	    $num = $db->num_rows($resql);
+	    $i = 0;
+	    if ($num)
+	    {
+	        while ($i < $num)
+	        {
+	            $obj = $db->fetch_object($resql);
+				$usernamesid[$obj->rowid]=$obj->rowid;
+				$i++;
+	        }
+	    }
+	}
+	else dol_print_error($db);
+}
+//var_dump($usernamesid);
+foreach($usernamesid as $id)
+{
+	$tmpuser=new User($db);
+	$result=$tmpuser->fetch($id);
+	$usernames[]=$tmpuser;
+}
+
+/*
+if ($filtert > 0)
+{
+	$tmpuser = new User($db);
+	$tmpuser->fetch($filtert);
+	$usernames[] = $tmpuser;
+}
+else if ($usergroup)
+{
+	$tmpgroup = new UserGroup($db);
+	$tmpgroup->fetch($usergroup);
+	$usernames = $tmpgroup->listUsersForGroup();
+}
+else
+{
+	$tmpgroup = new UserGroup($db);
+	//$tmpgroup->fetch($usergroup); No fetch, we want all users for all groups
+	$usernames = $tmpgroup->listUsersForGroup();
+}*/
+
+// Load array of colors by type
+$colorsbytype=array();
+$labelbytype=array();
+$sql="SELECT code, color, libelle FROM ".MAIN_DB_PREFIX."c_actioncomm";
+$resql=$db->query($sql);
+while ($obj = $db->fetch_object($resql))
+{
+	$colorsbytype[$obj->code]=$obj->color;
+	$labelbytype[$obj->code]=$obj->libelle;
+}
+
+// Loop on each user to show calendar
+$todayarray=dol_getdate($now,'fast');
+$sav = $tmpday;
+$showheader = true;
+$var = false;
+foreach ($usernames as $username)
+{
+	$var = ! $var;
+	echo "<tr>";
+	echo '<td class="cal_current_month"'.($var?' style="background: #F8F8F8"':'').'>' . $username->getNomUrl(1). '</td>';
+	$tmpday = $sav;
+
+	// Lopp on each day of week
+	$i = 0;
+	for ($iter_day = 0; $iter_day < 7; $iter_day++)
+	{
+		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
+		{
+			$i++;
+			continue;
+		}
+
+        // Show days of the current week
+		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
+		$tmparray = dol_getdate($curtime,'fast');
+		$tmpday = $tmparray['mday'];
+		$tmpmonth = $tmparray['mon'];
+		$tmpyear = $tmparray['year'];
+
+		$style='cal_current_month';
+		if ($iter_day == 6) $style.=' cal_other_month';
+		$today=0;
+		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, $var);
+
+		$i++;
+	}
+	echo "</tr>\n";
+	$showheader = false;
+}
+
+echo "</table>\n";
+
+
+if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+{
+	$langs->load("commercial");
+	print '<br>'.$langs->trans("Legend").': <br>';
+	foreach($colorsbytype as $code => $color)
+	{
+		if ($color)
+		{
+			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color?'background: #'.$color.';':'').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+			print $langs->trans("Action".$code)!="Action".$code?$langs->trans("Action".$code):$labelbytype[$code];
+			//print $code;
+			print '</div>';
+		}
+	}
+	//$color=sprintf("%02x%02x%02x",$theme_datacolor[0][0],$theme_datacolor[0][1],$theme_datacolor[0][2]);
+	print '<div style="float: left; padding: 2px; margin-right: 6px;"><div class="peruser_busy" style="width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+	print $langs->trans("Other");
+	print '</div>';
+	/* TODO Show this if at least one cumulated event
+	print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="background: #222222; width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
+	print $langs->trans("SeveralEvents");
+	print '</div>';
+	*/
+}
+
+// Add js code to manage click on a box
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	jQuery(".onclickopenref").click(function() {
+		var ref=$(this).attr(\'ref\');
+		var res = ref.split("_");
+		var userid = res[1];
+		var year = res[2];
+		var month = res[3];
+		var day = res[4];
+		var hour = res[5];
+		var min = res[6];
+		var ids = res[7];
+		if (ids == \'none\') /* No event */
+		{
+			/* alert(\'no event\'); */
+			url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=create&assignedtouser="+userid+"&datep="+year+month+day+hour+min+"00&backtopage='.urlencode($_SERVER["PHP_SELF"].'?year='.$year.'&month='.$month.'&day='.$day).'"
+			window.location.href = url;
+		}
+		else if (ids.indexOf(",") > -1)	/* There is several events */
+		{
+			/* alert(\'several events\'); */
+			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?usertodo="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			window.location.href = url;
+		}
+		else	/* One event */
+		{
+			/* alert(\'one event\'); */
+			url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=view&id="+ids
+			window.location.href = url;
+		}
+	});
+});
+</script>';
+
+
+
+llxFooter();
+
+$db->close();
+
+
+
+
+/**
+ * Show event of a particular day for a user
+ *
+ * @param	string	$username		Login
+ * @param   int		$day            Day
+ * @param   int		$month          Month
+ * @param   int		$year           Year
+ * @param   int		$monthshown     Current month shown in calendar view
+ * @param   string	$style          Style to use for this day
+ * @param   array	$eventarray    	Array of events
+ * @param   int		$maxprint       Nb of actions to show each day on month view (0 means no limit)
+ * @param   int		$maxnbofchar    Nb of characters to show for event line
+ * @param   string	$newparam       Parameters on current URL
+ * @param   int		$showinfo       Add extended information (used by day view)
+ * @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(), $var=false)
+{
+	global $db;
+	global $user, $conf, $langs, $hookmanager, $action;
+	global $filter, $filtera, $filtert, $filterd, $status, $actioncode;	// Filters used into search form
+	global $theme_datacolor;	// Array with a list of different we can use (come from theme)
+	global $cachethirdparties, $cachecontacts, $colorindexused;
+	global $begin_h, $end_h;
+
+	$cases1 = array();	// Color first half hour
+	$cases2 = array(); // Color second half hour
+
+	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
+
+	$i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
+	$ymd=sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day);
+
+	$nextindextouse=count($colorindexused);	// At first run, this is 0, so fist user has 0, next 1, ...
+	//if ($username->id && $day==1) var_dump($eventarray);
+
+	// We are in a particular day for $username, now we scan all events
+	foreach ($eventarray as $daykey => $notused)
+	{
+		$annee = date('Y',$daykey);
+		$mois = date('m',$daykey);
+		$jour = date('d',$daykey);
+		//print $annee.'-'.$mois.'-'.$jour.' '.$year.'-'.$month.'-'.$day."<br>\n";
+
+		if ($day==$jour && $month==$mois && $year==$annee)	// Is it the day we are looking for when calling function ?
+		{
+			// Scan all event for this date
+			foreach ($eventarray[$daykey] as $index => $event)
+			{
+				$keysofuserassigned=array_keys($event->userassigned);
+				if (! in_array($username->id,$keysofuserassigned)) continue;	// We discard record if event is from another user than user we want to show
+				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
+
+				$parameters=array();
+				$reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+				$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
+
+				// Define $color (Hex string like '0088FF') and $cssclass of event
+				$color=-1; $cssclass=''; $colorindex=-1;
+				if (in_array($user->id, $keysofuserassigned))
+				{
+					$nummytasks++; $cssclass='family_mytasks';
+					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
+				}
+				else if ($event->type_code == 'ICALEVENT')
+				{
+					$numical++;
+					if (! empty($event->icalname))
+					{
+						if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
+							$numicals[dol_string_nospecial($event->icalname)] = 0;
+						}
+						$numicals[dol_string_nospecial($event->icalname)]++;
+					}
+
+					$color=$event->icalcolor;
+					$cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable');
+				}
+				else if ($event->type_code == 'BIRTHDAY')
+				{
+					$numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+				}
+				else
+				{
+					$numother++; $cssclass='family_other';
+					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
+				}
+
+				if ($color < 0)	// Color was not forced. Set color according to color index.
+				{
+					// Define color index if not yet defined
+					$idusertouse=($event->userownerid?$event->userownerid:0);
+					if (isset($colorindexused[$idusertouse]))
+					{
+						$colorindex=$colorindexused[$idusertouse];	// Color already assigned to this user
+					}
+					else
+					{
+						$colorindex=$nextindextouse;
+						$colorindexused[$idusertouse]=$colorindex;
+						if (! empty($theme_datacolor[$nextindextouse+1])) $nextindextouse++;	// Prepare to use next color
+					}
+					// Define color
+					$color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]);
+				}
+				//$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
+
+				// Define all rects with event (cases1 is first half hour, cases2 is second half hour)
+				for ($h = $begin_h; $h < $end_h; $h++)
+				{
+					//if ($username->id == 1 && $day==1) print 'h='.$h;
+					$newcolor = ''; //init
+					if (empty($event->fulldayevent))
+					{
+						$a = dol_mktime((int) $h,0,0,$month,$day,$year,false,false);
+						$b = dol_mktime((int) $h,30,0,$month,$day,$year,false,false);
+						$c = dol_mktime((int) $h+1,0,0,$month,$day,$year,false,false);
+
+						$dateendtouse=$event->date_end_in_calendar;
+						if ($dateendtouse==$event->date_start_in_calendar) $dateendtouse++;
+
+						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
+
+						if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
+						{
+							$busy=$event->transparency;
+							$cases1[$h][$event->id]['busy']=$busy;
+							$cases1[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+		                    if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+			        		{
+				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
+				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+				        		else $cases1[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+			        		}
+							$cases1[$h][$event->id]['string'].=' - '.$event->label;
+							$cases1[$h][$event->id]['typecode']=$event->type_code;
+							if ($event->socid)
+							{
+								//$cases1[$h][$event->id]['string'].='xxx';
+							}
+							$cases1[$h][$event->id]['color']=$color;
+						}
+						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
+						{
+							$busy=$event->transparency;
+							$cases2[$h][$event->id]['busy']=$busy;
+							$cases2[$h][$event->id]['string']=dol_print_date($event->date_start_in_calendar,'dayhour');
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
+			        		{
+				        		$tmpa=dol_getdate($event->date_start_in_calendar,true);
+				        		$tmpb=dol_getdate($event->date_end_in_calendar,true);
+				        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'hour');
+				        		else $cases2[$h][$event->id]['string'].='-'.dol_print_date($event->date_end_in_calendar,'dayhour');
+			        		}
+							$cases2[$h][$event->id]['string'].=' - '.$event->label;
+							$cases2[$h][$event->id]['typecode']=$event->type_code;
+							if ($event->socid)
+							{
+								//$cases2[$h][$event->id]['string'].='xxx';
+							}
+							$cases2[$h][$event->id]['color']=$color;
+						}
+					}
+					else
+					{
+						$busy=$event->transparency;
+						$cases1[$h][$event->id]['busy']=$busy;
+						$cases2[$h][$event->id]['busy']=$busy;
+						$cases1[$h][$event->id]['string']=$event->label;
+						$cases2[$h][$event->id]['string']=$event->label;
+						$cases1[$h][$event->id]['typecode']=$event->type_code;
+						$cases2[$h][$event->id]['typecode']=$event->type_code;
+						$cases1[$h][$event->id]['color']=$color;
+						$cases2[$h][$event->id]['color']=$color;
+					}
+				}
+				$i++;
+			}
+
+			break;	// We found the date we were looking for. No need to search anymore.
+		}
+	}
+
+	for ($h = $begin_h; $h < $end_h; $h++)
+	{
+		$color1='';$color2='';
+		$style1='';$style2='';
+		$string1='&nbsp;';$string2='&nbsp;';
+		$title1='';$title2='';
+		if (isset($cases1[$h]) && $cases1[$h] != '')
+		{
+			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			$string1='&nbsp;';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1='peruser_notbusy';
+			else $style1='peruser_busy';
+			foreach($cases1[$h] as $id => $ev)
+			{
+				if ($ev['busy']) $style1='peruser_busy';
+			}
+		}
+		if (isset($cases2[$h]) && $cases2[$h] != '')
+		{
+			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+			$string2='&nbsp;';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2='peruser_notbusy';
+			else $style2='peruser_busy';
+			foreach($cases2[$h] as $id => $ev)
+			{
+				if ($ev['busy']) $style2='peruser_busy';
+			}
+		}
+
+
+		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser"'.($var?' style="background: #F8F8F8"':'').'>';
+		else echo '<td class="'.$style.' cal_peruser"'.($var?' style="background: #F8F8F8"':'').'>';
+		if (count($cases1[$h]) == 1)	// 1 seul evenement
+		{
+			$ids=array_keys($cases1[$h]);
+			$output = array_slice($cases1[$h], 0, 1);
+			if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
+			if ($output[0]['color']) $color1 = $output[0]['color'];
+		}
+		else if (count($cases1[$h]) > 1) $color1='222222';
+
+		if (count($cases2[$h]) == 1)	// 1 seul evenement
+		{
+			$ids=array_keys($cases2[$h]);
+			$output = array_slice($cases2[$h], 0, 1);
+			if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
+			if ($output[0]['color']) $color2 = $output[0]['color'];
+		}
+		else if (count($cases2[$h]) > 1) $color2='222222';
+		$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 '<table class="nobordernopadding" width="100%">';
+		print '<tr><td '.($color1?'style="background: #'.$color1.';"':'').'class="'.($style1?$style1.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_00_'.($ids1?$ids1:'none').'"'.($title1?' title="'.$title1.'"':'').'>';
+		print $string1;
+		print '</td><td '.($color2?'style="background: #'.$color2.';"':'').'class="'.($style2?$style2.' ':'').'onclickopenref'.($title1?' cursorpointer':'').'" ref="ref_'.$username->id.'_'.sprintf("%04d",$year).'_'.sprintf("%02d",$month).'_'.sprintf("%02d",$day).'_'.sprintf("%02d",$h).'_30_'.($ids2?$ids2:'none').'"'.($title2?' title="'.$title2.'"':'').'>';
+		print $string2;
+		print '</td></tr>';
+		print '</table>';
+		print '</td>';
+	}
+}
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 78f1ca24827..24eb117684f 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -37,9 +37,6 @@ $action=GETPOST('action','alpha');
 $month=GETPOST('month');
 $year=GETPOST('year');
 
-$mesg='';
-$mesgs=array();
-
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -58,13 +55,14 @@ $result = restrictedArea($user, 'agenda', $socid, '', 'myactions');
 /*
  * Actions
  */
+
 if ($action == 'builddoc')
 {
 	$cat = new CommActionRapport($db, $month, $year);
 	$result=$cat->write_file(GETPOST('id','int'));
 	if ($result < 0)
 	{
-		$mesg=$cat->error;
+		setEventMessage($cat->error, 'errors');
 	}
 }
 
@@ -82,22 +80,20 @@ $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";
 $sql.= $db->plimit($limit+1,$offset);
 
 //print $sql;
-dol_syslog("select sql=".$sql);
+dol_syslog("select", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-	print_barre_liste($langs->trans("Actions"), $page, "index.php",'',$sortfield,$sortorder,'',$num);
-
-	dol_htmloutput_mesg($mesg,$mesgs);
+	print_barre_liste($langs->trans("Actions"), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num);
 
 	$i = 0;
 	print '<table class="noborder" width="100%">';
diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index 8e892845c66..0ffcb351500 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -95,7 +95,7 @@ if ($action == 'add' || $action == 'update')
             }
             elseif ($origin == 'shipment')
             {
-            	header("Location: ../expedition/fiche.php?id=".$originid);
+            	header("Location: ../expedition/card.php?id=".$originid);
             	exit;
             }
             else
@@ -106,7 +106,7 @@ if ($action == 'add' || $action == 'update')
         }
         else
         {
-            $mesg = $object->error;
+	        setEventMessage($object->error, 'errors');
             $action='create';
         }
     }
@@ -135,7 +135,7 @@ if ($action == 'add' || $action == 'update')
             }
             elseif ($origin == 'shipment')
             {
-                header("Location: ../expedition/fiche.php?id=".$originid);
+                header("Location: ../expedition/card.php?id=".$originid);
                 exit;
             }
             else
@@ -147,8 +147,8 @@ if ($action == 'add' || $action == 'update')
         else
         {
             $reload = 0;
-            $mesg = $object->error;
-            $actino= "edit";
+	        setEventMessage($object->error, 'errors');
+            $action= "edit";
         }
     }
 
@@ -181,9 +181,6 @@ $form = new Form($db);
 $formcompany = new FormCompany($db);
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-dol_htmloutput_errors($mesg);
-
-
 if ($action == 'create')
 {
     if ($user->rights->societe->creer)
@@ -307,7 +304,7 @@ elseif ($action == 'edit')
     $societe->fetch($socid);
     $head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'card', $societe->nom);
+    dol_fiche_head($head, 'card', $societe->name);
 
     print_titre($langs->trans("EditAddress"));
     print "<br>\n";
@@ -410,7 +407,7 @@ else
     $societe->fetch($object->socid);
     $head = societe_prepare_head($societe);
 
-    dol_fiche_head($head, 'customer', $societe->nom);
+    dol_fiche_head($head, 'customer', $societe->name);
 
 
     // Confirmation delete
diff --git a/htdocs/comm/admin/index.html b/htdocs/comm/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 434d2fc1972..2a1a2286db5 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -36,7 +36,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -69,7 +69,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$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 c9c28105466..40dbad4ef94 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -43,7 +43,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -74,7 +74,7 @@ llxHeader('',$langs->trans("PropalSetup"));
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 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
new file mode 100644
index 00000000000..5b64c834401
--- /dev/null
+++ b/htdocs/comm/card.php
@@ -0,0 +1,932 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
+ * Copyright (C) 2006      Andre Cianfarani            <acianfa@free.fr>
+ * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@capnetworks.com>
+ * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2014 Juanjo Menent               <jmenent@2byte.es>
+ * Copyright (C) 2013      Alexandre Spangaro          <alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/comm/card.php
+ *       \ingroup    commercial compta
+ *       \brief      Page to show customer card of a third party
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.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 (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+
+$langs->load("companies");
+if (! empty($conf->contrat->enabled))  $langs->load("contracts");
+if (! empty($conf->commande->enabled)) $langs->load("orders");
+if (! empty($conf->facture->enabled)) $langs->load("bills");
+if (! empty($conf->projet->enabled))  $langs->load("projects");
+if (! empty($conf->ficheinter->enabled)) $langs->load("interventions");
+if (! empty($conf->notification->enabled)) $langs->load("mails");
+
+// Security check
+$id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
+if ($user->societe_id > 0) $id=$user->societe_id;
+$result = restrictedArea($user,'societe',$id,'&societe');
+
+$action		= GETPOST('action');
+$mode		= GETPOST("mode");
+$modesearch	= GETPOST("mode_search");
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="nom";
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('commcard','globalcard'));
+
+$object = new Societe($db);
+
+/*
+ * Actions
+ */
+
+$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')
+{
+	if (! $cancelbutton) 
+	{
+		$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="";
+}
+
+// conditions de reglement
+if ($action == 'setconditions' && $user->rights->societe->creer)
+{
+	$object->fetch($id);
+	$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)
+{
+	$object->fetch($id);
+	$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);
+}
+
+// set prospect level
+if ($action == 'setprospectlevel' && $user->rights->societe->creer)
+{
+	$object->fetch($id);
+	$object->fk_prospectlevel=GETPOST('prospect_level_id','alpha');
+	$result=$object->set_prospect_level($user);
+	if ($result < 0) setEventMessage($object->error,'errors');
+}
+
+// Update communication level
+if ($action == 'cstc')
+{
+	$object->fetch($id);
+	$object->stcomm_id=GETPOST('stcomm','int');
+	$result=$object->set_commnucation_level($user);
+	if ($result < 0) setEventMessage($object->error,'errors');
+}
+
+// Update communication level
+if ($action == 'setOutstandingBill')
+{
+	if (!$cancelbutton) 
+	{
+		$object->fetch($id);
+		$object->outstanding_limit=GETPOST('OutstandingBill');
+		$result=$object->set_OutstandingBill($user);
+		if ($result < 0) setEventMessage($object->error,'errors');
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('CustomerCard'));
+
+
+$contactstatic = new Contact($db);
+$userstatic=new User($db);
+$form = new Form($db);
+$formcompany=new FormCompany($db);
+
+
+if ($mode == 'search')
+{
+	if ($modesearch == 'soc')
+	{
+		// TODO move to DAO class
+		$sql = "SELECT s.rowid";
+		if (!$user->rights->societe->client->voir && !$id) $sql .= ", sc.fk_soc, sc.fk_user ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'";
+		if (!$user->rights->societe->client->voir && !$id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		if ( $db->num_rows($resql) == 1)
+		{
+			$obj = $db->fetch_object($resql);
+			$id = $obj->rowid;
+		}
+		$db->free($resql);
+	}
+}
+
+
+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');
+
+
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+
+
+	print '<table class="border" width="100%">';
+
+	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
+	$object->next_prev_filter="te.client in (1,2,3)";
+	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
+	print '</td></tr>';
+
+	// Prospect/Customer
+	print '<tr><td width="30%">'.$langs->trans('ProspectCustomer').'</td><td width="70%" colspan="3">';
+	print $object->getLibCustProspStatut();
+	print '</td></tr>';
+
+	// Prefix
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+	   print ($object->prefix_comm?$object->prefix_comm:'&nbsp;');
+	   print '</td></tr>';
+    }
+
+	if ($object->client)
+	{
+        $langs->load("compta");
+
+		print '<tr><td>';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+
+		print '<tr>';
+		print '<td>';
+		print $form->editfieldkey("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
+		print '</td><td colspan="3">';
+		print $form->editfieldval("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Address
+	print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">';
+	dol_print_address($object->address,'gmap','thirdparty',$object->id);
+	print "</td></tr>";
+
+	// Zip / Town
+	print '<tr><td class="nowrap">'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td>';
+	print '<td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town."</td>";
+	print '</tr>';
+
+	// Country
+	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
+	if (! empty($object->country_code))
+	{
+		$img=picto_from_langcode($object->country_code);
+		if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
+		else print ($img?$img.' ':'').$object->country;
+	}
+	print '</td></tr>';
+
+	// EMail
+	print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
+
+	// Web
+	print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($object->url,'_blank').'</td></tr>';
+
+	// Phone
+	print '<tr><td>'.$langs->trans('Phone').'</td><td style="min-width: 25%;">'.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').'</td>';
+
+	// Fax
+	print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
+
+	// Skype
+  	if (! empty($conf->skype->enabled))
+  	{
+		print '<td>'.$langs->trans('Skype').'</td><td colspan="3">'.dol_print_skype($object->skype,0,$object->id,'AC_SKYPE').'</td></tr>';
+  	}
+
+	// Assujeti a TVA ou pas
+	print '<tr>';
+	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
+	print yn($object->tva_assuj);
+	print '</td>';
+	print '</tr>';
+
+	// Local Taxes
+	if ($mysoc->useLocalTax(1))
+	{
+		print '<tr><td class="nowrap">'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
+		print yn($object->localtax1_assuj);
+		print '</td></tr>';
+	}
+	if ($mysoc->useLocalTax(2))
+	{
+		print '<tr><td class="nowrap">'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
+		print yn($object->localtax2_assuj);
+		print '</td></tr>';
+	}
+
+
+	// TVA Intra
+	print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td colspan="3">';
+	print $object->tva_intra;
+	print '</td></tr>';
+
+	// Conditions de reglement par defaut
+	$langs->load('bills');
+	print '<tr><td>';
+	print '<table width="100%" class="nobordernopadding"><tr><td>';
+	print $langs->trans('PaymentConditions');
+	print '<td>';
+	if (($action != 'editconditions') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editconditions')
+	{
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id',1);
+	}
+	else
+	{
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none');
+	}
+	print "</td>";
+	print '</tr>';
+
+	// Mode de reglement par defaut
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('PaymentMode');
+	print '<td>';
+	if (($action != 'editmode') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editmode')
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+	}
+	else
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'none');
+	}
+	print "</td>";
+	print '</tr>';
+
+	// Relative discounts (Discounts-Drawbacks-Rebates)
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans("CustomerRelativeDiscountShort");
+	print '<td><td align="right">';
+	if ($user->rights->societe->creer && !$user->societe_id > 0)
+	{
+		print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+	}
+	print '</td></tr></table>';
+	print '</td><td colspan="3">'.($object->remise_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>':$langs->trans("DiscountNone")).'</td>';
+	print '</tr>';
+
+	// Absolute discounts (Discounts-Drawbacks-Rebates)
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding">';
+	print '<tr><td class="nowrap">';
+	print $langs->trans("CustomerAbsoluteDiscountShort");
+	print '<td><td align="right">';
+	if ($user->rights->societe->creer && !$user->societe_id > 0)
+	{
+		print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
+	}
+	print '</td></tr></table>';
+	print '</td>';
+	print '<td colspan="3">';
+	$amount_discount=$object->getAvailableDiscounts();
+	if ($amount_discount < 0) dol_print_error($db,$object->error);
+	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount,1,$langs,1,-1,-1,$conf->currency).'</a>';
+	else print $langs->trans("DiscountNone");
+	print '</td>';
+	print '</tr>';
+
+	if ($object->client)
+	{
+		print '<tr>';
+		print '<td>';
+		print $form->editfieldkey("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer);
+		print '</td><td colspan="3">';
+		print $form->editfieldval("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer,'amount',($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Multiprice level
+	if (! empty($conf->global->PRODUIT_MULTIPRICES))
+	{
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans("PriceLevel");
+		print '<td><td align="right">';
+		if ($user->rights->societe->creer)
+		{
+			print '<a href="'.DOL_URL_ROOT.'/comm/multiprix.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+		}
+		print '</td></tr></table>';
+		print '</td><td colspan="3">';
+		print $object->price_level;
+		$keyforlabel='PRODUIT_MULTIPRICES_LABEL'.$object->price_level;
+		if (! empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+		print "</td>";
+		print '</tr>';
+	}
+
+	// Level of prospect
+	if ($object->client == 2 || $object->client == 3)
+	{
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('ProspectLevel');
+		print '<td>';
+		if ($action != 'editlevel' && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editlevel')
+			$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
+		else
+			print $object->getLibProspLevel();
+		print "</td>";
+		print '</tr>';
+
+		// Status
+		print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="2">'.$object->getLibProspCommStatut(4).'</td>';
+		print '<td>';
+		if ($object->stcomm_id != -1) print '<a href="card.php?socid='.$object->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>';
+		if ($object->stcomm_id !=  0) print '<a href="card.php?socid='.$object->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>';
+		if ($object->stcomm_id !=  1) print '<a href="card.php?socid='.$object->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>';
+		if ($object->stcomm_id !=  2) print '<a href="card.php?socid='.$object->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>';
+		if ($object->stcomm_id !=  3) print '<a href="card.php?socid='.$object->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>';
+		print '</td></tr>';
+	}
+
+	// Sales representative
+	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
+
+    // Module Adherent
+    if (! empty($conf->adherent->enabled))
+    {
+        $langs->load("members");
+        $langs->load("users");
+        print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+        print '<td colspan="3">';
+        $adh=new Adherent($db);
+        $result=$adh->fetch('','',$object->id);
+        if ($result > 0)
+        {
+            $adh->ref=$adh->getFullName($langs);
+            print $adh->getNomUrl(1);
+        }
+        else
+        {
+            print $langs->trans("ThirdpartyNotLinkedToMember");
+        }
+        print '</td>';
+        print "</tr>\n";
+    }
+
+	print "</table>";
+
+
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+	// Nbre max d'elements des petites listes
+	$MAXLIST=4;
+	$tableaushown=1;
+
+	// Lien recap
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
+	print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id.'">'.$langs->trans("ShowCustomerPreview").'</a></td></tr></table></td>';
+	print '</tr>';
+	print '</table>';
+	print '<br>';
+
+	$now=dol_now();
+
+	/*
+	 * Last proposals
+	 */
+	if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
+	{
+		$propal_static = new Propal($db);
+
+		$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
+		$sql.= " p.datep as dp, p.fin_validite as datelimite";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
+		$sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
+		$sql.= " AND s.rowid = ".$object->id;
+		$sql.= " AND p.entity = ".$conf->entity;
+		$sql.= " ORDER BY p.datep DESC";
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$var=true;
+			$num = $db->num_rows($resql);
+
+            if ($num > 0)
+            {
+		        print '<table class="noborder" width="100%">';
+
+                print '<tr class="liste_titre">';
+    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").' ('.$num.')</a></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
+    			print '</tr></table></td>';
+    			print '</tr>';
+            }
+
+			$i = 0;
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$objp = $db->fetch_object($resql);
+				$var=!$var;
+				print "<tr ".$bc[$var].">";
+				print '<td class="nowrap"><a href="propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a>'."\n";
+				if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 )
+				{
+					print " ".img_warning();
+				}
+				print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+				print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
+				print '<td align="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>';
+				$i++;
+			}
+			$db->free($resql);
+
+			if ($num > 0) print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	/*
+	 * Last orders
+	 */
+	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+	{
+		$commande_static=new Commande($db);
+
+		$sql = "SELECT s.nom, s.rowid,";
+		$sql.= " c.rowid as cid, c.total_ht, c.ref, c.fk_statut, c.facture,";
+		$sql.= " c.date_commande as dc";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+		$sql.= " WHERE c.fk_soc = s.rowid ";
+		$sql.= " AND s.rowid = ".$object->id;
+		$sql.= " AND c.entity = ".$conf->entity;
+		$sql.= " ORDER BY c.date_commande DESC";
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$var=true;
+			$num = $db->num_rows($resql);
+
+			if ($num > 0)
+			{
+				// Check if there are orders billable
+				$sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
+				$sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as facturee';
+				$sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+				$sql2.= ', '.MAIN_DB_PREFIX.'commande as c';
+				$sql2.= ' WHERE c.fk_soc = s.rowid';
+				$sql2.= ' AND s.rowid = '.$object->id;
+				// Show orders with status validated, shipping started and delivered (well any order we can bill)
+				$sql2.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
+
+				$resql2=$db->query($sql2);
+				$orders2invoice = $db->num_rows($resql2);
+				$db->free($resql2);
+
+				print '<table class="noborder" width="100%">';
+
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").' ('.$num.')</a></td>';
+				print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
+				//if($num2 > 0) print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').'</a></td>';
+				//else print '<td width="20px" align="right"><a href="#">'.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
+
+			$i = 0;
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$objp = $db->fetch_object($resql);
+				$var=!$var;
+				print "<tr ".$bc[$var].">";
+				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$objp->cid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."</a>\n";
+				print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
+				print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
+				print '<td align="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'</td></tr>';
+				$i++;
+			}
+			$db->free($resql);
+
+			if ($num >0) print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	/*
+	 * Last linked contracts
+	 */
+	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+	{
+		$contratstatic=new Contrat($db);
+
+		$sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut, c.datec as dc";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+		$sql.= " WHERE c.fk_soc = s.rowid ";
+		$sql.= " AND s.rowid = ".$object->id;
+		$sql.= " AND c.entity = ".$conf->entity;
+		$sql.= " ORDER BY c.datec DESC";
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$var=true;
+			$num = $db->num_rows($resql);
+			if ($num >0 )
+			{
+		        print '<table class="noborder" width="100%">';
+
+			    print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'</td>';
+				print '<td align="right"><a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->id.'">'.$langs->trans("AllContracts").' ('.$num.')</a></td></tr></table></td>';
+				print '</tr>';
+			}
+			$i = 0;
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$contrat=new Contrat($db);
+
+				$objp = $db->fetch_object($resql);
+				$var=!$var;
+				print "<tr ".$bc[$var].">";
+				print '<td class="nowrap">';
+				$contrat->id=$objp->id;
+				$contrat->ref=$objp->ref?$objp->ref:$objp->id;
+				print $contrat->getNomUrl(1,12);
+				print "</td>\n";
+				print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
+				print '<td width="20">&nbsp;</td>';
+				print '<td align="right" class="nowrap">';
+				$contrat->fetch_lines();
+				print $contrat->getLibStatut(4);
+				print "</td>\n";
+				print '</tr>';
+				$i++;
+			}
+			$db->free($resql);
+
+			if ($num > 0) print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	/*
+	 * Last interventions
+	 */
+	if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
+	{
+		$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate";
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
+		$sql.= " WHERE f.fk_soc = s.rowid";
+		$sql.= " AND s.rowid = ".$object->id;
+		$sql.= " AND f.entity = ".$conf->entity;
+		$sql.= " ORDER BY f.tms DESC";
+
+		$fichinter_static=new Fichinter($db);
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$var=true;
+			$num = $db->num_rows($resql);
+			if ($num > 0)
+			{
+		        print '<table class="noborder" width="100%">';
+
+			    print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").' ('.$num.')</td></tr></table></td>';
+				print '</tr>';
+				$var=!$var;
+			}
+			$i = 0;
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$objp = $db->fetch_object($resql);
+
+				$fichinter_static->id=$objp->id;
+                $fichinter_static->statut=$objp->fk_statut;
+
+				print "<tr ".$bc[$var].">";
+				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n";
+                //print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
+				print '<td align="right" width="120">'.convertSecondToTime($objp->duration).'</td>'."\n";
+				print '<td align="right" width="100">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
+				print '</tr>';
+				$var=!$var;
+				$i++;
+			}
+			$db->free($resql);
+
+			if ($num > 0) print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	/*
+	 *   Last invoices
+	 */
+	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+	{
+		$facturestatic = new Facture($db);
+
+		$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.total, f.total_ttc,';
+		$sql.= ' f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut,';
+		$sql.= ' s.nom, s.rowid as socid,';
+		$sql.= ' SUM(pf.amount) as am';
+		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture';
+		$sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
+		$sql.= " AND f.entity = ".$conf->entity;
+		$sql.= ' GROUP BY f.rowid, f.facnumber, f.type, f.amount, f.total, f.total_ttc,';
+		$sql.= ' f.datef, f.datec, f.paye, f.fk_statut,';
+		$sql.= ' s.nom, s.rowid';
+		$sql.= " ORDER BY f.datef DESC, f.datec DESC";
+
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$var=true;
+			$num = $db->num_rows($resql);
+			$i = 0;
+			if ($num > 0)
+			{
+		        print '<table class="noborder" width="100%">';
+
+			    $tableaushown=1;
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").' ('.$num.')</a></td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
+
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$objp = $db->fetch_object($resql);
+				$var=!$var;
+				print "<tr ".$bc[$var].">";
+				print '<td class="nowrap">';
+				$facturestatic->id=$objp->facid;
+				$facturestatic->ref=$objp->facnumber;
+				$facturestatic->type=$objp->type;
+				print $facturestatic->getNomUrl(1);
+				print '</td>';
+				if ($objp->df > 0)
+				{
+					print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->df),'day').'</td>';
+				}
+				else
+				{
+					print '<td align="right"><b>!!!</b></td>';
+				}
+				print '<td align="right" width="120">'.price($objp->total_ttc).'</td>';
+
+				print '<td align="right" class="nowrap" width="100" >'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>';
+				print "</tr>\n";
+				$i++;
+			}
+			$db->free($resql);
+
+			if ($num > 0) print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	print '</div></div></div>';
+	print '<div style="clear:both"></div>';
+
+	dol_fiche_end();
+
+
+	/*
+	 * Barre d'actions
+	 */
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+
+
+	print '<div class="tabsAction">';
+
+	if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
+	{
+		$langs->load("propal");
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
+	}
+
+	if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
+	{
+		$langs->load("orders");
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
+	}
+
+	if ($user->rights->contrat->creer)
+	{
+		$langs->load("contracts");
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
+	}
+
+	if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer)
+	{
+		$langs->load("fichinter");
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
+	}
+
+	// Add invoice
+	if ($user->societe_id == 0)
+	{
+		if (! empty($conf->deplacement->enabled))
+		{
+			$langs->load("trips");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
+		}
+
+		if (! empty($conf->facture->enabled))
+		{
+			if ($user->rights->facture->creer)
+			{
+				$langs->load("bills");
+				$langs->load("orders");
+
+				if (! empty($conf->commande->enabled))
+				{
+					if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+				}
+
+				if ($object->client != 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+
+			}
+			else
+			{
+				print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+			}
+		}
+	}
+
+	// Add action
+	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+	{
+		if ($user->rights->agenda->myactions->create)
+		{
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
+		}
+		else
+		{
+			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
+		}
+	}
+
+	print '</div>';
+
+	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
+	{
+		// List of contacts
+		show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+	}
+
+	// Addresses list
+	if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
+	{
+		$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+	}
+
+    if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+    {
+        print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
+
+        // List of todo actions
+		show_actions_todo($conf,$langs,$db,$object);
+
+        // List of done actions
+		show_actions_done($conf,$langs,$db,$object);
+	}
+}
+else
+{
+	dol_print_error($db,'Bad value for socid parameter');
+}
+
+// End of page
+llxFooter();
+
+$db->close();
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 279044ccf25..a80796fe574 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -59,12 +59,12 @@ llxHeader('','Contacts');
 if ($type == "c" || $type == "p")
 {
   $label = $langs->trans("Customers");
-  $urlfiche="fiche.php";
+  $urlfiche="card.php";
 }
 if ($type == "f")
 {
   $label = $langs->trans("Suppliers");
-  $urlfiche="fiche.php";
+  $urlfiche="card.php";
 }
 
 /*
@@ -72,7 +72,7 @@ if ($type == "f")
  *
  */
 
-$sql = "SELECT s.rowid, s.nom,  st.libelle as stcomm";
+$sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm";
 $sql.= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
@@ -154,12 +154,12 @@ if ($resql)
 		$var=!$var;
 
 		print "<tr ".$bc[$var].">";
-		print '<td><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
-		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
+		print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowContact"),"contact");
+		print '</a>&nbsp;<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'&socid='.$obj->rowid.'">'.$obj->name.'</a></td>';
 		print "<td>$obj->firstname</TD>";
 
 		print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").'</a>&nbsp;';
-		print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->nom</a></td>\n";
+		print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->name</a></td>\n";
 
 		print '<td>'.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').'</td>';
 
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
deleted file mode 100644
index 307a8c57385..00000000000
--- a/htdocs/comm/fiche.php
+++ /dev/null
@@ -1,943 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville        <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur         <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
- * Copyright (C) 2006      Andre Cianfarani            <acianfa@free.fr>
- * Copyright (C) 2005-2012 Regis Houssin               <regis.houssin@capnetworks.com>
- * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2013 Juanjo Menent               <jmenent@2byte.es>
- * Copyright (C) 2013      Alexandre Spangaro          <alexandre.spangaro@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/comm/fiche.php
- *       \ingroup    commercial compta
- *       \brief      Page to show customer card of a third party
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.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 (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-
-$langs->load("companies");
-if (! empty($conf->contrat->enabled))  $langs->load("contracts");
-if (! empty($conf->commande->enabled)) $langs->load("orders");
-if (! empty($conf->facture->enabled)) $langs->load("bills");
-if (! empty($conf->projet->enabled))  $langs->load("projects");
-if (! empty($conf->ficheinter->enabled)) $langs->load("interventions");
-if (! empty($conf->notification->enabled)) $langs->load("mails");
-
-// Security check
-$id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
-if ($user->societe_id > 0) $id=$user->societe_id;
-$result = restrictedArea($user,'societe',$id,'&societe');
-
-$action		= GETPOST('action');
-$mode		= GETPOST("mode");
-$modesearch	= GETPOST("mode_search");
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="nom";
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('commcard'));
-
-$object = new Societe($db);
-
-/*
- * Actions
- */
-
-$parameters = array('socid' => $id);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
-
-//Some actions show a "cancel" input submit button with name="cancel"
-$cancelbutton = GETPOST('cancel');
-
-if ($action == 'setcustomeraccountancycode')
-{
-	if (!$cancelbutton) {
-		$result=$object->fetch($id);
-		$object->code_compta=$_POST["customeraccountancycode"];
-		$result=$object->update($object->id,$user,1,1,0);
-		if ($result < 0)
-		{
-			$mesgs[]=join(',',$object->errors);
-		}
-		$action="";
-	}
-}
-
-// conditions de reglement
-if ($action == 'setconditions' && $user->rights->societe->creer)
-{
-	$object->fetch($id);
-	$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)
-{
-	$object->fetch($id);
-	$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);
-}
-
-// set prospect level
-if ($action == 'setprospectlevel' && $user->rights->societe->creer)
-{
-	$object->fetch($id);
-	$object->fk_prospectlevel=GETPOST('prospect_level_id','alpha');
-	$result=$object->set_prospect_level($user);
-	if ($result < 0) setEventMessage($object->error,'errors');
-}
-
-// Update communication level
-if ($action == 'cstc')
-{
-	$object->fetch($id);
-	$object->stcomm_id=GETPOST('stcomm','int');
-	$result=$object->set_commnucation_level($user);
-	if ($result < 0) setEventMessage($object->error,'errors');
-}
-
-// Update communication level
-if ($action == 'setOutstandingBill')
-{
-	if (!$cancelbutton) {
-		$object->fetch($id);
-		$object->outstanding_limit = GETPOST('OutstandingBill');
-		$result = $object->set_OutstandingBill($user);
-		if ($result < 0) {
-			setEventMessage($object->error, 'errors');
-		}
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans('CustomerCard'));
-
-
-$contactstatic = new Contact($db);
-$userstatic=new User($db);
-$form = new Form($db);
-$formcompany=new FormCompany($db);
-
-
-if ($mode == 'search')
-{
-	if ($modesearch == 'soc')
-	{
-		// TODO move to DAO class
-		$sql = "SELECT s.rowid";
-		if (!$user->rights->societe->client->voir && !$id) $sql .= ", sc.fk_soc, sc.fk_user ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'";
-		if (!$user->rights->societe->client->voir && !$id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	}
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		if ( $db->num_rows($resql) == 1)
-		{
-			$obj = $db->fetch_object($resql);
-			$id = $obj->rowid;
-		}
-		$db->free($resql);
-	}
-}
-
-
-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');
-
-
-	print '<div class="fichecenter"><div class="fichehalfleft">';
-
-
-	print '<table class="border" width="100%">';
-
-	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
-	$object->next_prev_filter="te.client in (1,2,3)";
-	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
-	print '</td></tr>';
-
-	// Prospect/Customer
-	print '<tr><td width="30%">'.$langs->trans('ProspectCustomer').'</td><td width="70%" colspan="3">';
-	print $object->getLibCustProspStatut();
-	print '</td></tr>';
-
-	// Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-	   print ($object->prefix_comm?$object->prefix_comm:'&nbsp;');
-	   print '</td></tr>';
-    }
-
-	if ($object->client)
-	{
-        $langs->load("compta");
-
-		print '<tr><td>';
-		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		print '</td></tr>';
-
-		print '<tr>';
-		print '<td>';
-		print $form->editfieldkey("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
-		print '</td><td colspan="3">';
-		print $form->editfieldval("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Address
-	print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">';
-	dol_print_address($object->address,'gmap','thirdparty',$object->id);
-	print "</td></tr>";
-
-	// Zip / Town
-	print '<tr><td class="nowrap">'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td>';
-	print '<td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town."</td>";
-	print '</tr>';
-
-	// Country
-	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
-	if (! empty($object->country_code))
-	{
-		$img=picto_from_langcode($object->country_code);
-		if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
-		else print ($img?$img.' ':'').$object->country;
-	}
-	print '</td></tr>';
-
-	// EMail
-	print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
-
-	// Web
-	print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($object->url,'_blank').'</td></tr>';
-
-	// Phone
-	print '<tr><td>'.$langs->trans('Phone').'</td><td style="min-width: 25%;">'.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').'</td>';
-
-	// Fax
-	print '<td>'.$langs->trans('Fax').'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
-
-	// Skype
-  	if (! empty($conf->skype->enabled))
-  	{
-		print '<td>'.$langs->trans('Skype').'</td><td colspan="3">'.dol_print_skype($object->skype,0,$object->id,'AC_SKYPE').'</td></tr>';
-  	}
-
-	// Assujeti a TVA ou pas
-	print '<tr>';
-	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
-	print yn($object->tva_assuj);
-	print '</td>';
-	print '</tr>';
-
-	// Local Taxes
-	if($mysoc->country_code=='ES')
-	{
-		if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-		{
-			print '<tr><td class="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';
-			print yn($object->localtax1_assuj);
-			print '</td></tr>';
-			print '<tr><td class="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">';
-			print yn($object->localtax2_assuj);
-			print '</td></tr>';
-		}
-		elseif($mysoc->localtax1_assuj=="1")
-		{
-			print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-			print yn($object->localtax1_assuj);
-			print '</td></tr>';
-		}
-		elseif($mysoc->localtax2_assuj=="1")
-		{
-			print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-			print yn($object->localtax2_assuj);
-			print '</td></tr>';
-		}
-	}
-
-	// TVA Intra
-	print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td colspan="3">';
-	print $object->tva_intra;
-	print '</td></tr>';
-
-	// Conditions de reglement par defaut
-	$langs->load('bills');
-	print '<tr><td>';
-	print '<table width="100%" class="nobordernopadding"><tr><td>';
-	print $langs->trans('PaymentConditions');
-	print '<td>';
-	if (($action != 'editconditions') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($action == 'editconditions')
-	{
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_id,'cond_reglement_id',-1,1);
-	}
-	else
-	{
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_id,'none');
-	}
-	print "</td>";
-	print '</tr>';
-
-	// Mode de reglement par defaut
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	print $langs->trans('PaymentMode');
-	print '<td>';
-	if (($action != 'editmode') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($action == 'editmode')
-	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
-	}
-	else
-	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_id,'none');
-	}
-	print "</td>";
-	print '</tr>';
-
-	// Relative discounts (Discounts-Drawbacks-Rebates)
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	print $langs->trans("CustomerRelativeDiscountShort");
-	print '<td><td align="right">';
-	if ($user->rights->societe->creer && !$user->societe_id > 0)
-	{
-		print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
-	}
-	print '</td></tr></table>';
-	print '</td><td colspan="3">'.($object->remise_percent?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>':$langs->trans("DiscountNone")).'</td>';
-	print '</tr>';
-
-	// Absolute discounts (Discounts-Drawbacks-Rebates)
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding">';
-	print '<tr><td class="nowrap">';
-	print $langs->trans("CustomerAbsoluteDiscountShort");
-	print '<td><td align="right">';
-	if ($user->rights->societe->creer && !$user->societe_id > 0)
-	{
-		print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
-	}
-	print '</td></tr></table>';
-	print '</td>';
-	print '<td colspan="3">';
-	$amount_discount=$object->getAvailableDiscounts();
-	if ($amount_discount < 0) dol_print_error($db,$object->error);
-	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount,1,$langs,1,-1,-1,$conf->currency).'</a>';
-	else print $langs->trans("DiscountNone");
-	print '</td>';
-	print '</tr>';
-
-	if ($object->client)
-	{
-		print '<tr>';
-		print '<td>';
-		print $form->editfieldkey("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer);
-		print '</td><td colspan="3">';
-		print $form->editfieldval("OutstandingBill",'OutstandingBill',$object->outstanding_limit,$object,$user->rights->societe->creer,'amount',($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Multiprice level
-	if (! empty($conf->global->PRODUIT_MULTIPRICES))
-	{
-		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-		print $langs->trans("PriceLevel");
-		print '<td><td align="right">';
-		if ($user->rights->societe->creer)
-		{
-			print '<a href="'.DOL_URL_ROOT.'/comm/multiprix.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
-		}
-		print '</td></tr></table>';
-		print '</td><td colspan="3">';
-		print $object->price_level;
-		$keyforlabel='PRODUIT_MULTIPRICES_LABEL'.$object->price_level;
-		if (! empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
-		print "</td>";
-		print '</tr>';
-	}
-
-	// Level of prospect
-	if ($object->client == 2 || $object->client == 3)
-	{
-		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-		print $langs->trans('ProspectLevel');
-		print '<td>';
-		if ($action != 'editlevel' && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editlevel')
-			$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
-		else
-			print $object->getLibProspLevel();
-		print "</td>";
-		print '</tr>';
-
-		// Status
-		print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="2">'.$object->getLibProspCommStatut(4).'</td>';
-		print '<td>';
-		if ($object->stcomm_id != -1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>';
-		if ($object->stcomm_id !=  0) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>';
-		if ($object->stcomm_id !=  1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>';
-		if ($object->stcomm_id !=  2) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>';
-		if ($object->stcomm_id !=  3) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>';
-		print '</td></tr>';
-	}
-
-	// Sales representative
-	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
-
-    // Module Adherent
-    if (! empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
-        print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td colspan="3">';
-        $adh=new Adherent($db);
-        $result=$adh->fetch('','',$object->id);
-        if ($result > 0)
-        {
-            $adh->ref=$adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        }
-        else
-        {
-            print $langs->trans("ThirdpartyNotLinkedToMember");
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
-
-	print "</table>";
-
-
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-	// Nbre max d'elements des petites listes
-	$MAXLIST=4;
-	$tableaushown=1;
-
-	// Lien recap
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
-	print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id.'">'.$langs->trans("ShowCustomerPreview").'</a></td></tr></table></td>';
-	print '</tr>';
-	print '</table>';
-	print '<br>';
-
-	$now=dol_now();
-
-	/*
-	 * Last proposals
-	 */
-	if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
-	{
-		$propal_static = new Propal($db);
-
-		$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
-		$sql.= " p.datep as dp, p.fin_validite as datelimite";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		$sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
-		$sql.= " AND s.rowid = ".$object->id;
-		$sql.= " AND p.entity = ".$conf->entity;
-		$sql.= " ORDER BY p.datep DESC";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$var=true;
-			$num = $db->num_rows($resql);
-
-            if ($num > 0)
-            {
-		        print '<table class="noborder" width="100%">';
-
-                print '<tr class="liste_titre">';
-    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").' ('.$num.')</a></td>';
-                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
-    			print '</tr></table></td>';
-    			print '</tr>';
-            }
-
-			$i = 0;
-			while ($i < $num && $i < $MAXLIST)
-			{
-				$objp = $db->fetch_object($resql);
-				print "<tr ".$bc[$var].">";
-				print '<td class="nowrap"><a href="propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a>'."\n";
-				if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 )
-				{
-					print " ".img_warning();
-				}
-				print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-				print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
-				print '<td align="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>';
-				$var=!$var;
-				$i++;
-			}
-			$db->free($resql);
-
-			if ($num > 0) print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	/*
-	 * Last orders
-	 */
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-	{
-		$commande_static=new Commande($db);
-
-		$sql = "SELECT s.nom, s.rowid,";
-		$sql.= " c.rowid as cid, c.total_ht, c.ref, c.fk_statut, c.facture,";
-		$sql.= " c.date_commande as dc";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-		$sql.= " WHERE c.fk_soc = s.rowid ";
-		$sql.= " AND s.rowid = ".$object->id;
-		$sql.= " AND c.entity = ".$conf->entity;
-		$sql.= " ORDER BY c.date_commande DESC";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$var=true;
-			$num = $db->num_rows($resql);
-
-			if ($num > 0)
-			{
-				// Check if there are orders billable
-				$sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
-				$sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as facturee';
-				$sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-				$sql2.= ', '.MAIN_DB_PREFIX.'commande as c';
-				$sql2.= ' WHERE c.fk_soc = s.rowid';
-				$sql2.= ' AND s.rowid = '.$object->id;
-				// Show orders with status validated, shipping started and delivered (well any order we can bill)
-				$sql2.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
-
-				$resql2=$db->query($sql2);
-				$orders2invoice = $db->num_rows($resql2);
-				$db->free($resql2);
-
-				print '<table class="noborder" width="100%">';
-
-				print '<tr class="liste_titre">';
-				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php?socid='.$object->id.'">'.$langs->trans("AllOrders").' ('.$num.')</a></td>';
-				print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
-				//if($num2 > 0) print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').'</a></td>';
-				//else print '<td width="20px" align="right"><a href="#">'.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'</a></td>';
-				print '</tr></table></td>';
-				print '</tr>';
-			}
-
-			$i = 0;
-			while ($i < $num && $i < $MAXLIST)
-			{
-				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
-				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->cid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."</a>\n";
-				print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
-				print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
-				print '<td align="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'</td></tr>';
-				$i++;
-			}
-			$db->free($resql);
-
-			if ($num >0) print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	/*
-	 * Last linked contracts
-	 */
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-	{
-		$contratstatic=new Contrat($db);
-
-		$sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut, c.datec as dc";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-		$sql.= " WHERE c.fk_soc = s.rowid ";
-		$sql.= " AND s.rowid = ".$object->id;
-		$sql.= " AND c.entity = ".$conf->entity;
-		$sql.= " ORDER BY c.datec DESC";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$var=true;
-			$num = $db->num_rows($resql);
-			if ($num >0 )
-			{
-		        print '<table class="noborder" width="100%">';
-
-			    print '<tr class="liste_titre">';
-				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'</td>';
-				print '<td align="right"><a href="'.DOL_URL_ROOT.'/contrat/liste.php?socid='.$object->id.'">'.$langs->trans("AllContracts").' ('.$num.')</a></td></tr></table></td>';
-				print '</tr>';
-			}
-			$i = 0;
-			while ($i < $num && $i < $MAXLIST)
-			{
-				$contrat=new Contrat($db);
-
-				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
-				print '<td class="nowrap">';
-				$contrat->id=$objp->id;
-				$contrat->ref=$objp->ref?$objp->ref:$objp->id;
-				print $contrat->getNomUrl(1,12);
-				print "</td>\n";
-				print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n";
-				print '<td width="20">&nbsp;</td>';
-				print '<td align="right" class="nowrap">';
-				$contrat->fetch_lines();
-				print $contrat->getLibStatut(4);
-				print "</td>\n";
-				print '</tr>';
-				$i++;
-			}
-			$db->free($resql);
-
-			if ($num > 0) print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	/*
-	 * Last interventions
-	 */
-	if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
-	{
-		$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
-		$sql.= " WHERE f.fk_soc = s.rowid";
-		$sql.= " AND s.rowid = ".$object->id;
-		$sql.= " AND f.entity = ".$conf->entity;
-		$sql.= " ORDER BY f.tms DESC";
-
-		$fichinter_static=new Fichinter($db);
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$var=true;
-			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
-		        print '<table class="noborder" width="100%">';
-
-			    print '<tr class="liste_titre">';
-				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").' ('.$num.')</td></tr></table></td>';
-				print '</tr>';
-				$var=!$var;
-			}
-			$i = 0;
-			while ($i < $num && $i < $MAXLIST)
-			{
-				$objp = $db->fetch_object($resql);
-
-				$fichinter_static->id=$objp->id;
-                $fichinter_static->statut=$objp->fk_statut;
-
-				print "<tr ".$bc[$var].">";
-				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/fiche.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n";
-                //print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
-				print '<td align="right" width="120">'.convertSecondToTime($objp->duration).'</td>'."\n";
-				print '<td align="right" width="100">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
-				print '</tr>';
-				$var=!$var;
-				$i++;
-			}
-			$db->free($resql);
-
-			if ($num > 0) print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	/*
-	 *   Last invoices
-	 */
-	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
-	{
-		$facturestatic = new Facture($db);
-
-		$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.total, f.total_ttc,';
-		$sql.= ' f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut,';
-		$sql.= ' s.nom, s.rowid as socid,';
-		$sql.= ' SUM(pf.amount) as am';
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture';
-		$sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
-		$sql.= " AND f.entity = ".$conf->entity;
-		$sql.= ' GROUP BY f.rowid, f.facnumber, f.type, f.amount, f.total, f.total_ttc,';
-		$sql.= ' f.datef, f.datec, f.paye, f.fk_statut,';
-		$sql.= ' s.nom, s.rowid';
-		$sql.= " ORDER BY f.datef DESC, f.datec DESC";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$var=true;
-			$num = $db->num_rows($resql);
-			$i = 0;
-			if ($num > 0)
-			{
-		        print '<table class="noborder" width="100%">';
-
-			    $tableaushown=1;
-				print '<tr class="liste_titre">';
-				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").' ('.$num.')</a></td>';
-                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
-				print '</tr></table></td>';
-				print '</tr>';
-			}
-
-			while ($i < $num && $i < $MAXLIST)
-			{
-				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr ".$bc[$var].">";
-				print '<td class="nowrap">';
-				$facturestatic->id=$objp->facid;
-				$facturestatic->ref=$objp->facnumber;
-				$facturestatic->type=$objp->type;
-				print $facturestatic->getNomUrl(1);
-				print '</td>';
-				if ($objp->df > 0)
-				{
-					print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->df),'day').'</td>';
-				}
-				else
-				{
-					print '<td align="right"><b>!!!</b></td>';
-				}
-				print '<td align="right" width="120">'.price($objp->total_ttc).'</td>';
-
-				print '<td align="right" class="nowrap" width="100" >'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>';
-				print "</tr>\n";
-				$i++;
-			}
-			$db->free($resql);
-
-			if ($num > 0) print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	print '</div></div></div>';
-	print '<div style="clear:both"></div>';
-
-	dol_fiche_end();
-
-
-	/*
-	 * Barre d'actions
-	 */
-
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-
-
-	print '<div class="tabsAction">';
-
-	if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
-	{
-		$langs->load("propal");
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
-	}
-
-	if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
-	{
-		$langs->load("orders");
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
-	}
-
-	if ($user->rights->contrat->creer)
-	{
-		$langs->load("contracts");
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/fiche.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
-	}
-
-	if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer)
-	{
-		$langs->load("fichinter");
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/fiche.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
-	}
-
-	// Add invoice
-	if ($user->societe_id == 0)
-	{
-		if (! empty($conf->deplacement->enabled))
-		{
-			$langs->load("trips");
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/fiche.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
-		}
-
-		if (! empty($conf->facture->enabled))
-		{
-			if ($user->rights->facture->creer)
-			{
-				$langs->load("bills");
-				$langs->load("orders");
-
-				if (! empty($conf->commande->enabled))
-				{
-					if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-				}
-
-				if ($object->client != 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
-				else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-			}
-		}
-	}
-
-	// Add action
-	if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-	{
-		if ($user->rights->agenda->myactions->create)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
-		}
-		else
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
-		}
-	}
-
-	print '</div>';
-
-	if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
-	{
-		// List of contacts
-		show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-	}
-
-	// Addresses list
-	if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
-	{
-		$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-	}
-
-    if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
-
-        // List of todo actions
-		show_actions_todo($conf,$langs,$db,$object);
-
-        // List of done actions
-		show_actions_done($conf,$langs,$db,$object);
-	}
-}
-else
-{
-	dol_print_error($db,'Bad value for socid parameter');
-}
-
-dol_htmloutput_mesg('',$mesgs);
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 98653992025..4129b561ed1 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -78,9 +78,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAProposal").'</td></tr>';
 	print '<tr '.$bc[$var].'>';
-	print '<td class="nowrap">'.$langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td>';
+	print '<td class="nowrap"><label for="sf_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="sf_ref" id="sf_ref" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
 	print '</tr>';
 	print "</table></form>\n";
 	print "<br>\n";
@@ -91,12 +91,12 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
 	$var=false;
 	print '<table class="noborder nohover" width="100%">';
-	print '<form method="post" action="'.DOL_URL_ROOT.'/commande/liste.php">';
+	print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchACustomerOrder").'</td></tr>';
 	print '<tr '.$bc[$var].'><td>';
-	print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+	print '<label for="sref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="sref" id="sref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
 	print '</tr>';
 	print "</form></table><br>\n";
 }
@@ -105,14 +105,31 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
 	$var=false;
-	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/liste.php">';
+	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAContract").'</td></tr>';
 	print '<tr '.$bc[$var].'>';
-	print '<td class="nowrap">'.$langs->trans("Ref").':</td><td><input type="text" class="flat" name="search_contract" size="18"></td>';
+	print '<td class="nowrap"><label for="search_contract">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_contract" id="search_contract" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
+	print '</tr>';
+	print "</table></form>\n";
+	print "<br>";
+}
+
+// Search contract
+if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
+{
+	$var=false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="noborder nohover" width="100%">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAnIntervention").'</td></tr>';
+	print '<tr '.$bc[$var].'>';
+	print '<td class="nowrap"><label for="search_contract">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_inter" id="search_inter" size="18"></td>';
+	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="sall" id="sall" size="18"></td>';
 	print '</tr>';
 	print "</table></form>\n";
 	print "<br>";
@@ -217,7 +234,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			{
 				$var=!$var;
 				$obj = $db->fetch_object($resql);
-				print '<tr '.$bc[$var].'><td class="nowrap"><a href="../commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>';
+				print '<tr '.$bc[$var].'><td class="nowrap"><a href="../commande/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>';
 				print '<td class="nowrap">';
 				$companystatic->id=$obj->socid;
 				$companystatic->name=$obj->name;
@@ -417,7 +434,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				print "<tr ".$bc[$var]."><td><a href=\"../contrat/fiche.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."</a></td>";
+				print "<tr ".$bc[$var]."><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"))." ".$obj->ref."</a></td>";
 				print '<td>';
                 $companystatic->id=$objp->rowid;
                 $companystatic->name=$objp->name;
@@ -444,7 +461,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 {
 	$langs->load("propal");
 
-	$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
+	$sql = "SELECT s.nom as name, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql.= ", ".MAIN_DB_PREFIX."propal as p";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -497,7 +514,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 
 				print "</td>";
 
-				print '<td align="left"><a href="fiche.php?socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).'</a></td>'."\n";
+				print '<td align="left"><a href="card.php?socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,44).'</a></td>'."\n";
 				print '<td align="right">';
 				print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php
index 78d2b14c7bc..b35e4fab7cc 100644
--- a/htdocs/comm/list.php
+++ b/htdocs/comm/list.php
@@ -48,13 +48,12 @@ $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");
@@ -73,25 +72,23 @@ $hookmanager->initHooks(array('customerlist'));
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters);    // 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"))
+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
@@ -121,8 +118,8 @@ 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) {
@@ -149,13 +146,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-dol_syslog('comm/list.php: sql='.$sql,LOG_DEBUG);
+dol_syslog('comm/list.php:', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
 	$num = $db->num_rows($result);
 
-	$param = "&amp;search_nom=".$search_nom."&amp;search_code=".$search_code."&amp;search_zipcode=".$search_zipcode."&amp;search_town=".$search_town;
+	$param = "&amp;search_company=".$search_company."&amp;search_code=".$search_code."&amp;search_zipcode=".$search_zipcode."&amp;search_town=".$search_town;
  	if ($search_categ != '') $param.='&amp;search_categ='.$search_categ;
  	if ($search_sale != '')	$param.='&amp;search_sale='.$search_sale;
  	if ($search_status != '') $param.='&amp;search_status='.$search_status;
@@ -206,7 +203,7 @@ if ($result)
 	print '<tr class="liste_titre">';
 
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_nom" value="'.$search_nom.'" size="10">';
+	print '<input type="text" class="flat" name="search_company" value="'.$search_company.'" size="10">';
 	print '</td>';
 
 	print '<td class="liste_titre">';
@@ -234,7 +231,6 @@ if ($result)
     print '</td>';
 
     print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print '&nbsp; ';
     print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print '</td>';
 
@@ -269,7 +265,7 @@ if ($result)
         print '<td align="center">'.$thirdpartystatic->getLibStatut(3);
         print '</td>';
         print '<td></td>';
-        
+
         $parameters=array('obj' => $obj);
         $formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
new file mode 100644
index 00000000000..ef9f29815c4
--- /dev/null
+++ b/htdocs/comm/mailing/card.php
@@ -0,0 +1,1177 @@
+<?php
+/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2012	Laurent Destailleur		<eldy@uers.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/comm/mailing/card.php
+ *       \ingroup    mailing
+ *       \brief      Fiche mailing, onglet general
+ */
+
+if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("mails");
+
+if (! $user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->societe_id > 0)) accessforbidden();
+
+$id=(GETPOST('mailid','int') ? GETPOST('mailid','int') : GETPOST('id','int'));
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+$urlfrom=GETPOST('urlfrom');
+
+$object=new Mailing($db);
+$result=$object->fetch($id);
+
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('mailingcard','globalcard'));
+
+// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+$object->substitutionarray=array(
+    '__ID__' => 'IdRecord',
+    '__EMAIL__' => 'EMail',
+    '__LASTNAME__' => 'Lastname',
+    '__FIRSTNAME__' => 'Firstname',
+    '__MAILTOEMAIL__' => 'TagMailtoEmail',
+    '__OTHER1__' => 'Other1',
+    '__OTHER2__' => 'Other2',
+    '__OTHER3__' => 'Other3',
+    '__OTHER4__' => 'Other4',
+    '__OTHER5__' => 'Other5',
+    '__SIGNATURE__' => 'TagSignature',
+    '__CHECK_READ__' => 'TagCheckMail',
+	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
+	//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet
+);
+if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+{
+	$object->substitutionarray['__SECUREKEYPAYPAL__']='SecureKeyPaypal';
+	if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $object->substitutionarray['__SECUREKEYPAYPAL_MEMBER__']='SecureKeyPaypalUniquePerMember';
+}
+
+$object->substitutionarrayfortest=array(
+    '__ID__' => 'TESTIdRecord',
+    '__EMAIL__' => 'TESTEMail',
+    '__LASTNAME__' => 'TESTLastname',
+    '__FIRSTNAME__' => 'TESTFirstname',
+    '__MAILTOEMAIL__' => 'TESTMailtoEmail',
+    '__OTHER1__' => 'TESTOther1',
+    '__OTHER2__' => 'TESTOther2',
+    '__OTHER3__' => 'TESTOther3',
+    '__OTHER4__' => 'TESTOther4',
+    '__OTHER5__' => 'TESTOther5',
+	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
+    '__CHECK_READ__' => 'TagCheckMail',
+	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
+	//,'__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
+ */
+
+$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');
+
+// Action clone object
+if ($action == 'confirm_clone' && $confirm == 'yes')
+{
+	if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
+	{
+		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+	}
+	else
+	{
+		$result=$object->createFromClone($object->id,$_REQUEST["clone_content"],$_REQUEST["clone_receivers"]);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+			exit;
+		}
+		else
+		{
+			setEventMessage($object->error, 'errors');
+		}
+	}
+    $action='';
+}
+
+// Action send emailing for everybody
+if ($action == 'sendallconfirmed' && $confirm == 'yes')
+{
+	if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
+	{
+		//TODO: What is this for?
+		// Pour des raisons de securite, on ne permet pas cette fonction via l'IHM,
+		// on affiche donc juste un message
+		setEventMessage($langs->trans("MailingNeedCommand"), 'warnings');
+		setEventMessage('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', 'warnings');
+		setEventMessage($langs->trans("MailingNeedCommand2"), 'warnings');
+		$action='';
+	}
+	else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+	{
+		setEventMessage($langs->trans("NotEnoughPermissions"), 'warnings');
+		$action='';
+	}
+	else
+	{
+		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
+
+		if ($object->statut == 0)
+		{
+			dol_print_error('','ErrorMailIsNotValidated');
+			exit;
+		}
+
+		$id       = $object->id;
+		$subject  = $object->sujet;
+		$message  = $object->body;
+		$from     = $object->email_from;
+		$replyto  = $object->email_replyto;
+		$errorsto = $object->email_errorsto;
+		// Le message est-il en html
+		$msgishtml=-1;	// Unknown by default
+		if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
+
+		// Warning, we must not use begin-commit transaction here
+		// because we want to save update for each mail sent.
+
+		$nbok=0; $nbko=0;
+
+		// On choisit les mails non deja envoyes pour ce mailing (statut=0)
+		// ou envoyes en erreur (statut=-1)
+		$sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
+		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
+		$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
+
+		dol_syslog("card.php: select targets", LOG_DEBUG);
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);	// nb of possible recipients
+
+			if ($num)
+			{
+				dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG);
+
+				$now=dol_now();
+
+				// Positionne date debut envoi
+				$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=".$db->idate($now)." WHERE rowid=".$object->id;
+				$resql2=$db->query($sql);
+				if (! $resql2)
+				{
+					dol_print_error($db);
+				}
+
+				// Loop on each email and send it
+				$i = 0;
+
+				while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
+				{
+
+					$res=1;
+
+					$obj = $db->fetch_object($resql);
+
+					// sendto en RFC2822
+					$sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname))." <".$obj->email.">";
+
+					// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
+					$other=explode(';',$obj->other);
+					$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                    $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+                    // Array of possible substitutions (See also fie mailing-send.php that should manage same substitutions)
+					$substitutionarray=array(
+							'__ID__' => $obj->source_id,
+							'__EMAIL__' => $obj->email,
+							'__LASTNAME__' => $obj->lastname,
+							'__FIRSTNAME__' => $obj->firstname,
+							'__MAILTOEMAIL__' => '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>',
+							'__OTHER1__' => $other1,
+							'__OTHER2__' => $other2,
+							'__OTHER3__' => $other3,
+							'__OTHER4__' => $other4,
+							'__OTHER5__' => $other5,
+							'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
+							'__UNSUBSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>'
+					);
+					if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+					{
+						$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+						if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+						else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+					}
+					$substitutionisok=true;
+                    complete_substitutions_array($substitutionarray, $langs);
+					$newsubject=make_substitutions($subject,$substitutionarray);
+					$newmessage=make_substitutions($message,$substitutionarray);
+
+					$arr_file = array();
+					$arr_mime = array();
+					$arr_name = array();
+					$arr_css  = array();
+
+					$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+					if (count($listofpaths))
+					{
+						foreach($listofpaths as $key => $val)
+						{
+							$arr_file[]=$listofpaths[$key]['fullname'];
+							$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
+							$arr_name[]=$listofpaths[$key]['name'];
+						}
+					}
+
+					// Fabrication du mail
+					$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css);
+
+					if ($mail->error)
+					{
+						$res=0;
+					}
+					if (! $substitutionisok)
+					{
+						$mail->error='Some substitution failed';
+						$res=0;
+					}
+
+					// Send mail
+					if ($res)
+					{
+						$res=$mail->sendfile();
+					}
+
+					if ($res)
+					{
+						// Mail successful
+						$nbok++;
+
+						dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+
+						$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+						$sql.=" SET statut=1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
+						$resql2=$db->query($sql);
+						if (! $resql2)
+						{
+							dol_print_error($db);
+						}
+						else
+						{
+							//if cheack read is use then update prospect contact status
+							if (strpos($message, '__CHECK_READ__') !== false)
+							{
+								//Update status communication of thirdparty prospect
+								$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
+								dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
+								$resql2=$db->query($sql);
+								if (! $resql2)
+								{
+									dol_print_error($db);
+								}
+
+							    //Update status communication of contact prospect
+								$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+								dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
+
+								$resql2=$db->query($sql);
+								if (! $resql2)
+								{
+									dol_print_error($db);
+								}
+							}
+						}
+
+
+						//test if CHECK READ change statut prospect contact
+					}
+					else
+					{
+						// Mail failed
+						$nbko++;
+
+						dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
+
+						$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+						$sql.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
+						$resql2=$db->query($sql);
+						if (! $resql2)
+						{
+							dol_print_error($db);
+						}
+					}
+
+					$i++;
+				}
+			}
+			else
+			{
+				setEventMessage($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"));
+			}
+
+			// Loop finished, set global statut of mail
+			if ($nbko > 0)
+			{
+				$statut=2;	// Status 'sent partially' (because at least one error)
+				if ($nbok > 0) 	setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
+				else setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
+			}
+			else
+			{
+				if ($nbok >= $num)
+				{
+					$statut=3;	// Send to everybody
+					setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
+				}
+				else
+				{
+					$statut=2;	// Status 'sent partially' (because not send to everybody)
+					setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
+				}
+			}
+
+			$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
+			dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
+			$resql2=$db->query($sql);
+			if (! $resql2)
+			{
+				dol_print_error($db);
+			}
+		}
+		else
+		{
+			dol_syslog($db->error());
+			dol_print_error($db);
+		}
+
+		$action = '';
+	}
+}
+
+// Action send test emailing
+if ($action == 'send' && empty($_POST["cancel"]))
+{
+	$error=0;
+
+	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
+
+	$object->sendto = $_POST["sendto"];
+	if (! $object->sendto)
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("MailTo")), 'errors');
+		$error++;
+	}
+
+	if (! $error)
+	{
+		// Le message est-il en html
+		$msgishtml=-1;	// Inconnu par defaut
+		if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;
+
+		// Pratique les substitutions sur le sujet et message
+		$tmpsujet=make_substitutions($object->sujet,$object->substitutionarrayfortest);
+		$tmpbody=make_substitutions($object->body,$object->substitutionarrayfortest);
+
+		$arr_file = array();
+		$arr_mime = array();
+		$arr_name = array();
+		$arr_css  = array();
+
+        // Ajout CSS
+        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor;
+        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+
+        // Attached files
+		$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+		if (count($listofpaths))
+		{
+			foreach($listofpaths as $key => $val)
+			{
+				$arr_file[]=$listofpaths[$key]['fullname'];
+				$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
+				$arr_name[]=$listofpaths[$key]['name'];
+			}
+		}
+
+		$mailfile = new CMailFile($tmpsujet,$object->sendto,$object->email_from,$tmpbody, $arr_file,$arr_mime,$arr_name,'', '', 0, $msgishtml,$object->email_errorsto,$arr_css);
+
+		$result=$mailfile->sendfile();
+		if ($result)
+		{
+			setEventMessage($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)));
+		}
+		else
+		{
+			setEventMessage($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, 'errors');
+		}
+
+		$action='';
+	}
+}
+
+// Action add emailing
+if ($action == 'add')
+{
+	$mesgs = array();
+
+	$object->email_from     = trim($_POST["from"]);
+	$object->email_replyto  = trim($_POST["replyto"]);
+	$object->email_errorsto = trim($_POST["errorsto"]);
+	$object->titre          = trim($_POST["titre"]);
+	$object->sujet          = trim($_POST["sujet"]);
+	$object->body           = trim($_POST["body"]);
+	$object->bgcolor        = trim($_POST["bgcolor"]);
+	$object->bgimage        = trim($_POST["bgimage"]);
+
+	if (! $object->titre) {
+		$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+	}
+	if (! $object->sujet) {
+		$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+	}
+	if (! $object->body)  {
+		$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+	}
+
+	if (!count($mesgs))
+	{
+		if ($object->create($user) >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		$mesgs[] = $object->error;
+	}
+
+	setEventMessage($mesgs, 'errors');
+	$action="create";
+}
+
+// Action update description of emailing
+if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
+{
+	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
+
+	if ($action == 'settitre')					$object->titre          = trim(GETPOST('titre','alpha'));
+	else if ($action == 'setemail_from')		$object->email_from     = trim(GETPOST('email_from','alpha'));
+	else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
+	else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
+	else if ($action == 'settitre' && empty($object->titre)) {
+		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
+	}
+	else if ($action == 'setfrom' && empty($object->email_from)) {
+		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
+	}
+
+	if (! $mesg)
+	{
+		if ($object->update($user) >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		$mesg = $object->error;
+	}
+
+	setEventMessage($mesg, 'errors');
+	$action="";
+}
+
+/*
+ * Add file in email form
+ */
+if (! empty($_POST['addfile']))
+{
+	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    // Set tmp user directory
+    dol_add_file_process($upload_dir,0,0);
+
+	$action="edit";
+}
+
+// Action remove file
+if (! empty($_POST["removedfile"]))
+{
+	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    dol_remove_file_process($_POST['removedfile'],0);
+
+	$action="edit";
+}
+
+// Action update emailing
+if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	$isupload=0;
+
+	if (! $isupload)
+	{
+		$mesgs = array();
+
+		$object->sujet          = trim($_POST["sujet"]);
+		$object->body           = trim($_POST["body"]);
+		$object->bgcolor        = trim($_POST["bgcolor"]);
+		$object->bgimage        = trim($_POST["bgimage"]);
+
+		if (! $object->sujet) {
+			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
+		}
+		if (! $object->body) {
+			$mesgs[] = $langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
+		}
+
+		if (!count($mesgs))
+		{
+			if ($object->update($user) >= 0)
+			{
+				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+				exit;
+			}
+			$mesgs[] =$object->error;
+		}
+
+		setEventMessage($mesgs, 'errors');
+		$action="edit";
+	}
+	else
+	{
+		$action="edit";
+	}
+}
+
+// Action confirmation validation
+if ($action == 'confirm_valid' && $confirm == 'yes')
+{
+	if ($object->id > 0)
+	{
+		$object->valid($user);
+		setEventMessage($langs->trans("MailingSuccessfullyValidated"));
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+// Resend
+if ($action == 'confirm_reset' && $confirm == 'yes')
+{
+	if ($object->id > 0)
+	{
+		$db->begin();
+
+		$result=$object->valid($user);
+		if ($result > 0)
+		{
+			$result=$object->reset_targets_status($user);
+		}
+
+		if ($result > 0)
+		{
+			$db->commit();
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else
+		{
+			setEventMessage($object->error, 'errors');
+			$db->rollback();
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+// Action confirmation suppression
+if ($action == 'confirm_delete' && $confirm == 'yes')
+{
+	if ($object->delete($object->id))
+	{
+		$url= (! empty($urlfrom) ? $urlfrom : 'list.php');
+		header("Location: ".$url);
+		exit;
+	}
+}
+
+if (! empty($_POST["cancel"]))
+{
+	$action = '';
+}
+
+
+
+/*
+ * View
+ */
+
+
+$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
+llxHeader('',$langs->trans("Mailing"),$help_url);
+
+$form = new Form($db);
+$htmlother = new FormOther($db);
+
+if ($action == 'create')
+{
+	// EMailing in creation mode
+	print '<form name="new_mailing" action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+
+	print_fiche_titre($langs->trans("NewMailing"));
+
+	print '<table class="border" width="100%">';
+	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTitle").'</td><td><input class="flat" name="titre" size="40" value="'.$_POST['titre'].'"></td></tr>';
+	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat" name="from" size="40" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
+	print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td><input class="flat" name="errorsto" size="40" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO)?$conf->global->MAILING_EMAIL_ERRORSTO:$conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
+
+	// Other attributes
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $object->showOptionals($extrafields,'edit');
+	}
+
+	print '</table>';
+	print '</br><br>';
+
+	print '<table class="border" width="100%">';
+	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTopic").'</td><td><input class="flat" name="sujet" size="60" value="'.$_POST['sujet'].'"></td></tr>';
+	print '<tr><td width="25%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
+	print $htmlother->selectColor($_POST['bgcolor'],'bgcolor','new_mailing',0);
+	print '</td></tr>';
+	print '<tr><td width="25%" valign="top"><span class="fieldrequired">'.$langs->trans("MailMessage").'</span><br>';
+	print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
+	foreach($object->substitutionarray as $key => $val)
+	{
+		print $key.' = '.$langs->trans($val).'<br>';
+	}
+	print '</i></td>';
+	print '<td>';
+	// Editeur wysiwyg
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor=new DolEditor('body',$_POST['body'],'',320,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,70);
+	$doleditor->Create();
+	print '</td></tr>';
+	print '</table>';
+
+	print '<br><center><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></center>';
+
+	print '</form>';
+}
+else
+{
+	if ($object->id > 0)
+	{
+		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
+
+		$head = emailing_prepare_head($object);
+
+		dol_fiche_head($head, 'card', $langs->trans("Mailing"), 0, 'email');
+
+		// Confirmation de la validation du mailing
+		if ($action == 'valid')
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ValidMailing"),$langs->trans("ConfirmValidMailing"),"confirm_valid",'','',1);
+		}
+		// Confirm reset
+		else if ($action == 'reset')
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ResetMailing"),$langs->trans("ConfirmResetMailing",$object->ref),"confirm_reset",'','',2);
+		}
+		// Confirm delete
+		else if ($action == 'delete')
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(! empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''),$langs->trans("DeleteAMailing"),$langs->trans("ConfirmDeleteMailing"),"confirm_delete",'','',1);
+		}
+
+
+		if ($action != 'edit')
+		{
+			/*
+			 * Mailing en mode visu
+			 */
+			if ($action == 'sendall')
+			{
+                // Define message to recommand from command line
+
+				$sendingmode=$conf->global->MAIN_MAIL_SENDMODE;
+				if (empty($sendingmode)) $sendingmode='mail';	// If not defined, we use php mail function
+
+				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='<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
+					$linktoadminemailend='</a>';
+					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
+					setEventMessage($langs->trans("MailingNeedCommand"), 'warnings');
+					setEventMessage('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', 'warnings');
+					setEventMessage($langs->trans("MailingNeedCommand2"), 'warnings');
+					$_GET["action"]='';
+				}
+				else
+				{
+					$text='';
+                    if ($conf->file->mailing_limit_sendbyweb == 0)
+                    {
+                    	$text.=$langs->trans("MailingNeedCommand");
+                    	$text.='<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
+                    	$text.='<br><br>';
+                    }
+				    $text.=$langs->trans('ConfirmSendingEmailing').'<br>';
+					$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,270);
+				}
+			}
+
+			print '<table class="border" width="100%">';
+
+			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
+
+			print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
+			print '<td colspan="3">';
+			print $form->showrefnav($object,'id', $linkback);
+			print '</td></tr>';
+
+			// Description
+			print '<tr><td>'.$form->editfieldkey("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
+			print $form->editfieldval("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+			print '</td></tr>';
+
+			// From
+			print '<tr><td>'.$form->editfieldkey("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
+			print $form->editfieldval("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+			print '</td></tr>';
+
+			// Errors to
+			print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
+			print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
+			print '</td></tr>';
+
+			// Status
+			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+
+			// Nb of distinct emails
+			print '<tr><td>';
+			print $langs->trans("TotalNbOfDistinctRecipients");
+			print '</td><td colspan="3">';
+			$nbemail = ($object->nbemail?$object->nbemail:img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>');
+			if ($object->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && is_numeric($nbemail) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
+			{
+				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+				{
+					$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+					print $form->textwithpicto($nbemail,$text,1,'warning');
+				}
+				else
+				{
+					$text=$langs->trans('NotEnoughPermissions');
+					print $form->textwithpicto($nbemail,$text,1,'warning');
+				}
+
+			}
+			else
+			{
+				print $nbemail;
+			}
+			print '</td></tr>';
+
+			// Other attributes
+			$parameters=array();
+			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			{
+				print $object->showOptionals($extrafields);
+			}
+
+			print '</table>';
+
+			print "</div>";
+
+
+			// Clone confirmation
+			if ($action == 'clone')
+			{
+				// Create an array for form
+				$formquestion=array(
+					'text' => $langs->trans("ConfirmClone"),
+				array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneContent"),   'value' => 1),
+				array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
+				);
+				// Paiement incomplet. On demande si motif = escompte ou autre
+				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
+			}
+
+			/*
+			 * Boutons d'action
+			 */
+
+			if (GETPOST("cancel") || $confirm=='no' || $action == '' || in_array($action,array('valid','delete','sendall','clone')))
+			{
+				print "\n\n<div class=\"tabsAction\">\n";
+
+				if (($object->statut == 0) && $user->rights->mailing->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditMailing").'</a>';
+				}
+
+				//print '<a class="butAction" href="card.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
+
+				if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+				{
+					print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
+				}
+				else
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
+				}
+
+				if ($object->statut == 0)
+				{
+					if ($object->nbemail <= 0)
+					{
+						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
+					}
+					else if (empty($user->rights->mailing->valider))
+					{
+						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
+					}
+					else
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
+					}
+				}
+
+				if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
+				{
+					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send))
+					{
+						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
+					}
+					else
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
+					}
+				}
+
+				if ($user->rights->mailing->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&amp;object=emailing&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
+				}
+
+				if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
+				{
+					if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+					{
+						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
+					}
+					else
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
+					}
+				}
+
+				if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
+				{
+					if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
+					{
+						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
+					}
+					else
+					{
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
+					}
+				}
+
+				print '<br><br></div>';
+			}
+
+			// Affichage formulaire de TEST
+			if ($action == 'test')
+			{
+				print_titre($langs->trans("TestMailing"));
+
+				// Create l'objet formulaire mail
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				$formmail->fromname = $object->email_from;
+				$formmail->frommail = $object->email_from;
+				$formmail->withsubstit=1;
+				$formmail->withfrom=0;
+				$formmail->withto=$user->email?$user->email:1;
+				$formmail->withtocc=0;
+				$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+				$formmail->withtopic=0;
+				$formmail->withtopicreadonly=1;
+				$formmail->withfile=0;
+				$formmail->withbody=0;
+				$formmail->withbodyreadonly=1;
+				$formmail->withcancel=1;
+				$formmail->withdeliveryreceipt=0;
+				// Tableau des substitutions
+				$formmail->substit=$object->substitutionarrayfortest;
+				// Tableau des parametres complementaires du post
+				$formmail->param["action"]="send";
+				$formmail->param["models"]="body";
+				$formmail->param["mailid"]=$object->id;
+				$formmail->param["returnurl"]=$_SERVER['PHP_SELF']."?id=".$object->id;
+
+				print $formmail->get_form();
+
+				print '<br>';
+			}
+
+			// Print mail content
+			print_fiche_titre($langs->trans("EMail"),'','');
+			print '<table class="border" width="100%">';
+
+			// Subject
+			print '<tr><td width="25%">'.$langs->trans("MailTopic").'</td><td colspan="3">'.$object->sujet.'</td></tr>';
+
+			// Joined files
+			print '<tr><td>'.$langs->trans("MailFile").'</td><td colspan="3">';
+			// List of files
+			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+			if (count($listofpaths))
+			{
+				foreach($listofpaths as $key => $val)
+				{
+					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
+					print '<br>';
+				}
+			}
+			else
+			{
+				print $langs->trans("NoAttachedFiles").'<br>';
+			}
+			print '</td></tr>';
+
+            // Background color
+            /*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
+            print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
+            print '</td></tr>';*/
+
+		    // Message
+			print '<tr><td width="25%" valign="top">'.$langs->trans("MailMessage").'<br>';
+			print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
+			foreach($object->substitutionarray as $key => $val)
+			{
+				print $key.' = '.$langs->trans($val).'<br>';
+			}
+			print '</i></td>';
+			print '<td colspan="3" bgcolor="'.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
+			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')
+			{
+				$readonly=1;
+				// Editeur wysiwyg
+				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+				$doleditor=new DolEditor('body',$object->body,'',320,'dolibarr_mailings','',false,true,empty($conf->global->FCKEDITOR_ENABLE_MAILING)?0:1,20,120,$readonly);
+				$doleditor->Create();
+			}
+			else print dol_htmlentitiesbr($object->body);
+			print '</td>';
+			print '</tr>';
+
+			print '</table>';
+			print "<br>";
+		}
+		else
+		{
+			/*
+			 * Mailing en mode edition
+			 */
+
+			print '<table class="border" width="100%">';
+
+			// Ref
+			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
+			// Topic
+			print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+			// From
+			print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
+			// To
+			print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1).'</td></tr>';
+
+			// Status
+			print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+
+			// Nb of distinct emails
+			print '<tr><td width="25%">';
+			print $langs->trans("TotalNbOfDistinctRecipients");
+			print '</td><td colspan="3">';
+			$nbemail = ($object->nbemail?$object->nbemail:img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>');
+			if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && is_numeric($nbemail) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
+			{
+				$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+				print $form->textwithpicto($nbemail,$text,1,'warning');
+			}
+			else
+			{
+				print $nbemail;
+			}
+			print '</td></tr>';
+
+			// Other attributes
+			$parameters=array();
+			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			{
+				print $object->showOptionals($extrafields,'edit');
+			}
+
+			print '</table>';
+			print "</div>";
+
+			print "\n";
+			print '<form name="edit_mailing" action="card.php" method="post" enctype="multipart/form-data">'."\n";
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+			// Print mail content
+			print_fiche_titre($langs->trans("EMail"),'','');
+			print '<table class="border" width="100%">';
+
+			// Subject
+			print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat" type="text" size=60 name="sujet" value="'.$object->sujet.'"></td></tr>';
+
+			dol_init_file_process($upload_dir);
+
+			// Joined files
+			$addfileaction='addfile';
+			print '<tr><td>'.$langs->trans("MailFile").'</td>';
+			print '<td colspan="3">';
+			// List of files
+			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
+			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+			$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+			$out.= '<script type="text/javascript" language="javascript">';
+			$out.= 'jQuery(document).ready(function () {';
+			$out.= '    jQuery(".removedfile").click(function() {';
+			$out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+			$out.= '    });';
+			$out.= '})';
+			$out.= '</script>'."\n";
+			if (count($listofpaths))
+			{
+				foreach($listofpaths as $key => $val)
+				{
+					$out.= '<div id="attachfile_'.$key.'">';
+					$out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
+					$out.= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"),'delete.png','','',1).'" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+					$out.= '<br></div>';
+				}
+			}
+			else
+			{
+				$out.= $langs->trans("NoAttachedFiles").'<br>';
+			}
+			// Add link to add file
+			$out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+			$out.= ' ';
+			$out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+			print $out;
+			print '</td></tr>';
+
+		    // Background color
+			print '<tr><td width="25%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
+			print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
+			print '</td></tr>';
+
+			// Message
+			print '<tr><td width="25%" valign="top">'.$langs->trans("MailMessage").'<br>';
+			print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
+			foreach($object->substitutionarray as $key => $val)
+			{
+				print $key.' = '.$langs->trans($val).'<br>';
+			}
+			print '</i></td>';
+			print '<td colspan="3">';
+			// Editeur wysiwyg
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			$doleditor=new DolEditor('body',$object->body,'',320,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,120);
+			$doleditor->Create();
+			print '</td></tr>';
+
+			print '</table>';
+
+			print '<br><center>';
+			print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="save">';
+			print ' &nbsp; ';
+			print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
+			print '</center>';
+
+			print '</form>';
+			print '<br>';
+		}
+	}
+	else
+	{
+		dol_print_error($db,$object->error);
+	}
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d6599f204f1..75f2399017b 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2013 Laurent Destailleur  <eldy@uers.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +27,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -36,8 +38,6 @@ $langs->load("mails");
 if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
 
 
-$mesg = '';
-
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -54,6 +54,7 @@ $action=GETPOST("action");
 $search_lastname=GETPOST("search_lastname");
 $search_firstname=GETPOST("search_firstname");
 $search_email=GETPOST("search_email");
+$search_dest_status=GETPOST('search_dest_status');
 
 // Search modules dirs
 $modulesdir = dolGetModulesDirs('/mailings');
@@ -97,11 +98,10 @@ if ($action == 'add')
 			$result=$obj->add_to_target($id,$filtersarray);
 		}
 	}
-
 	if ($result > 0)
 	{
 		setEventMessage($langs->trans("XTargetsAdded",$result),'mesgs');
-		
+
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
@@ -144,7 +144,7 @@ if ($action == 'delete')
 		}
 		else
 		{
-			header("Location: liste.php");
+			header("Location: list.php");
 			exit;
 		}
 	}
@@ -166,10 +166,10 @@ if ($_POST["button_removefilter"])
 /*
  * View
  */
-
 llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
 
 $form = new Form($db);
+$formmailing = new FormMailing($db);
 
 if ($object->fetch($id) >= 0)
 {
@@ -180,7 +180,7 @@ if ($object->fetch($id) >= 0)
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/liste.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("BackToList").'</a>';
 
 	print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
 	print '<td colspan="3">';
@@ -218,11 +218,9 @@ if ($object->fetch($id) >= 0)
 
 	print "</div>";
 
-	dol_htmloutput_mesg($mesg);
-
 	$var=!$var;
 
-	$allowaddtarget=($object->statut == 0 || $object->statut == 1);
+	$allowaddtarget=($object->statut == 0);
 
 	// Show email selectors
 	if ($allowaddtarget && $user->rights->mailing->creer)
@@ -278,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))
@@ -306,12 +305,14 @@ if ($object->fetch($id) >= 0)
 					print img_object($langs->trans("Module").': '.get_class($obj),$obj->picto).' '.$obj->getDesc();
 					print '</td>';
 
-					/*
-					 print '<td width=\"100\">';
-					 print $modulename;
-					 print "</td>";
-					 */
-					$nbofrecipient=$obj->getNbOfRecipients('');
+					try {
+						$nbofrecipient=$obj->getNbOfRecipients('');
+					}
+					catch(Exception $e)
+					{
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
+
 					print '<td align="center">';
 					if ($nbofrecipient >= 0)
 					{
@@ -324,7 +325,13 @@ if ($object->fetch($id) >= 0)
 					print '</td>';
 
 					print '<td align="left">';
-					$filter=$obj->formFilter();
+					try {
+						$filter=$obj->formFilter();
+					}
+					catch(Exception $e)
+					{
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
 					if ($filter) print $filter;
 					else print $langs->trans("None");
 					print '</td>';
@@ -359,6 +366,7 @@ if ($object->fetch($id) >= 0)
 	if ($search_lastname)    $sql.= " AND mc.lastname    LIKE '%".$db->escape($search_lastname)."%'";
 	if ($search_firstname) $sql.= " AND mc.firstname LIKE '%".$db->escape($search_firstname)."%'";
 	if ($search_email)  $sql.= " AND mc.email  LIKE '%".$db->escape($search_email)."%'";
+	if (!empty($search_dest_status)) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." ";
 	$sql .= $db->order($sortfield,$sortorder);
 	$sql .= $db->plimit($conf->liste_limit+1, $offset);
 
@@ -378,7 +386,9 @@ if ($object->fetch($id) >= 0)
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
+		if ($allowaddtarget) {
+			$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
+		}
 
 		print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');
 
@@ -401,7 +411,7 @@ if ($object->fetch($id) >= 0)
 		print_liste_field_titre($langs->trans("OtherInformations"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"],"",$param,"",'align="center"',$sortfield,$sortorder);
 
-		// Date sendinf
+		// Date sending
 		if ($object->statut < 2)
 		{
 			print '<td class="liste_titre">&nbsp;</td>';
@@ -414,6 +424,11 @@ if ($object->fetch($id) >= 0)
 		// Statut
 		print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"mc.statut",$param,'','align="right"',$sortfield,$sortorder);
 
+		//Search Icon
+		print '<td class="liste_titre">';
+		print '&nbsp';
+		print '</td>';
+
 		print '</tr>';
 
 		// Ligne des champs de filtres
@@ -435,7 +450,20 @@ if ($object->fetch($id) >= 0)
 		print '&nbsp';
 		print '</td>';
 		// Source
-		print '<td class="liste_titre" align="right" colspan="3">';
+		print '<td class="liste_titre">';
+		print '&nbsp';
+		print '</td>';
+
+		// Date sending
+		print '<td class="liste_titre">';
+		print '&nbsp';
+		print '</td>';
+		//Statut
+		print '<td class="liste_titre" align="right">';
+		print $formmailing->selectDestinariesStatus($search_dest_status,'search_dest_status',1);
+		print '</td>';
+		//Search Icon
+		print '<td class="liste_titre" align="right">';
 		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 		print '&nbsp; ';
 		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
@@ -497,7 +525,7 @@ if ($object->fetch($id) >= 0)
 				{
 					print '<td align="center">&nbsp;</td>';
 					print '<td align="right" class="nowrap">'.$langs->trans("MailingStatusNotSent");
-					if ($user->rights->mailing->creer) {
+					if ($user->rights->mailing->creer && $allowaddtarget) {
 						print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient"));
 					}
 					print '</td>';
@@ -506,12 +534,12 @@ if ($object->fetch($id) >= 0)
 				{
 					print '<td align="center">'.$obj->date_envoi.'</td>';
 					print '<td align="right" class="nowrap">';
-					if ($obj->statut==-1) print $langs->trans("MailingStatusError").' '.img_error();
-					if ($obj->statut==1) print $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut4');
-					if ($obj->statut==2) print $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
-					if ($obj->statut==3) print $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut5');
+					print $object::libStatutDest($obj->statut,2);
 					print '</td>';
 				}
+
+				//Sreach Icon
+				print '<td></td>';
 				print '</tr>';
 
 				$i++;
diff --git a/htdocs/comm/mailing/class/index.html b/htdocs/comm/mailing/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 99b1a2f4419..2f8f7f18e4e 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -60,6 +60,9 @@ class Mailing extends CommonObject
 	
 	var $extraparams=array();
 
+	public $statut_dest=array();
+	public $statuts=array();
+
 
 	/**
      *  Constructor
@@ -75,6 +78,12 @@ class Mailing extends CommonObject
 		$this->statuts[1] = 'MailingStatusValidated';
 		$this->statuts[2] = 'MailingStatusSentPartialy';
 		$this->statuts[3] = 'MailingStatusSentCompletely';
+		
+		$this->statut_dest[-1] = 'MailingStatusError';
+		$this->statut_dest[1] = 'MailingStatusSent';
+		$this->statut_dest[2] = 'MailingStatusRead';
+		$this->statut_dest[3] = 'MailingStatusNotContact';
+				
 	}
 
 	/**
@@ -109,7 +118,7 @@ class Mailing extends CommonObject
 			$this->titre = $langs->trans("NoTitle");
 		}
 
-		dol_syslog("Mailing::Create sql=".$sql);
+		dol_syslog("Mailing::Create", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -122,7 +131,6 @@ class Mailing extends CommonObject
 			else
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("Mailing::Create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
@@ -132,7 +140,6 @@ class Mailing extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog("Mailing::Create ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -157,7 +164,7 @@ class Mailing extends CommonObject
 		$sql .= ", bgimage = '".($this->bgimage?$this->bgimage:null)."'";
 		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog("Mailing::Update sql=".$sql);
+		dol_syslog("Mailing::Update", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -166,7 +173,6 @@ class Mailing extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog("Mailing::Update ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -192,7 +198,7 @@ class Mailing extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
 		$sql.= " WHERE m.rowid = ".$rowid;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -325,7 +331,7 @@ class Mailing extends CommonObject
 				$sql.= " FROM ".MAIN_DB_PREFIX."mailing_cibles ";
 				$sql.= " WHERE fk_mailing = ".$fromid;
 				
-				dol_syslog(get_class($this)."::createFromClone sql=".$sql);
+				dol_syslog(get_class($this)."::createFromClone", LOG_DEBUG);
 				$result=$this->db->query($sql);
 				if ($result)
 				{
@@ -348,7 +354,6 @@ class Mailing extends CommonObject
 				else
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog("Mailing::createFromClone ".$this->error, LOG_ERR);
 					return -1;
 				}
 				
@@ -384,7 +389,7 @@ class Mailing extends CommonObject
 		$sql .= " SET statut = 1, date_valid = '".$this->db->idate($now)."', fk_user_valid=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog("Mailing::valid sql=".$sql, LOG_DEBUG);
+		dol_syslog("Mailing::valid", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			return 1;
@@ -392,7 +397,6 @@ class Mailing extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog("Mailing::Valid ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -409,7 +413,7 @@ class Mailing extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing";
 		$sql.= " WHERE rowid = ".$rowid;
 
-		dol_syslog("Mailing::delete sql=".$sql, LOG_DEBUG);
+		dol_syslog("Mailing::delete", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -418,7 +422,6 @@ class Mailing extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog("Mailing::Valid ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -436,7 +439,7 @@ class Mailing extends CommonObject
 		$sql.= " SET statut = 0";
 		$sql.= " WHERE fk_mailing = ".$this->id;
 
-		dol_syslog("Mailing::reset_targets_status sql=".$sql, LOG_DEBUG);
+		dol_syslog("Mailing::reset_targets_status", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -445,7 +448,6 @@ class Mailing extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog("Mailing::Valid ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -512,5 +514,60 @@ class Mailing extends CommonObject
 		}
 	}
 
+	
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut        	Id statut
+	 *  @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
+	 */
+	static public function libStatutDest($statut,$mode=0)
+	{
+		global $langs;
+		$langs->load('mails');
+	
+		if ($mode == 0)
+		{
+			return $langs->trans($this->statut_dest[$statut]);
+		}
+		if ($mode == 1)
+		{
+			return $langs->trans($this->statut_dest[$statut]);
+		}
+		if ($mode == 2)
+		{
+			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error();
+			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut4');
+			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
+			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut8');
+		}
+		if ($mode == 3)
+		{
+			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error();
+			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut4');
+			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
+			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut8');
+		}
+		if ($mode == 4)
+		{
+			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error();
+			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut4');
+			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
+			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut8');
+		}
+		if ($mode == 5)
+		{
+			if ($statut==-1) return $langs->trans("MailingStatusError").' '.img_error();
+			if ($statut==1) return $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut4');
+			if ($statut==2) return $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6');
+			if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut8');
+		}
+		
+		
+		
+		
+	}
+
 }
 
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
deleted file mode 100644
index d803de28357..00000000000
--- a/htdocs/comm/mailing/fiche.php
+++ /dev/null
@@ -1,1153 +0,0 @@
-<?php
-/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2005-2012	Laurent Destailleur		<eldy@uers.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/comm/mailing/fiche.php
- *       \ingroup    mailing
- *       \brief      Fiche mailing, onglet general
- */
-
-if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1');
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
-$langs->load("mails");
-
-if (! $user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->societe_id > 0)) accessforbidden();
-
-$id=(GETPOST('mailid','int') ? GETPOST('mailid','int') : GETPOST('id','int'));
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$urlfrom=GETPOST('urlfrom');
-
-$object=new Mailing($db);
-$result=$object->fetch($id);
-
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('mailingcard'));
-
-// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-$object->substitutionarray=array(
-    '__ID__' => 'IdRecord',
-    '__EMAIL__' => 'EMail',
-    '__LASTNAME__' => 'Lastname',
-    '__FIRSTNAME__' => 'Firstname',
-    '__MAILTOEMAIL__' => 'TagMailtoEmail',
-    '__OTHER1__' => 'Other1',
-    '__OTHER2__' => 'Other2',
-    '__OTHER3__' => 'Other3',
-    '__OTHER4__' => 'Other4',
-    '__OTHER5__' => 'Other5',
-    '__SIGNATURE__' => 'TagSignature',
-    '__CHECK_READ__' => 'TagCheckMail',
-	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
-	//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet
-);
-if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-{
-	$object->substitutionarray['__SECUREKEYPAYPAL__']='SecureKeyPaypal';
-	if (! empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $object->substitutionarray['__SECUREKEYPAYPAL_MEMBER__']='SecureKeyPaypalUniquePerMember';
-}
-
-$object->substitutionarrayfortest=array(
-    '__ID__' => 'TESTIdRecord',
-    '__EMAIL__' => 'TESTEMail',
-    '__LASTNAME__' => 'TESTLastname',
-    '__FIRSTNAME__' => 'TESTFirstname',
-    '__MAILTOEMAIL__' => 'TESTMailtoEmail',
-    '__OTHER1__' => 'TESTOther1',
-    '__OTHER2__' => 'TESTOther2',
-    '__OTHER3__' => 'TESTOther3',
-    '__OTHER4__' => 'TESTOther4',
-    '__OTHER5__' => 'TESTOther5',
-	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:''),
-    '__CHECK_READ__' => 'TagCheckMail',
-	'__UNSUBSCRIBE__' => 'TagUnsubscribe'
-	//,'__PERSONALIZED__' => 'TESTPersonalized'	// Not used yet
-);
-
-
-/*
- * Actions
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-// Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes')
-{
-	if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
-	{
-		$mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
-	}
-	else
-	{
-		$result=$object->createFromClone($object->id,$_REQUEST["clone_content"],$_REQUEST["clone_receivers"]);
-		if ($result > 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-			exit;
-		}
-		else
-		{
-			$mesg=$object->error;
-		}
-	}
-    $action='';
-}
-
-// Action send emailing for everybody
-if ($action == 'sendallconfirmed' && $confirm == 'yes')
-{
-	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
-		$mesg='<div class="warning">'.$langs->trans("MailingNeedCommand").'</div>';
-		$mesg.='<br><textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
-		$mesg.='<br><br><div class="warning">'.$langs->trans("MailingNeedCommand2").'</div>';
-		$action='';
-	}
-	else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
-	{
-		$mesg='<div class="warning">'.$langs->trans("NotEnoughPermissions").'</div>';
-		$action='';
-	}
-	else
-	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
-
-		if ($object->statut == 0)
-		{
-			dol_print_error('','ErrorMailIsNotValidated');
-			exit;
-		}
-
-		$id       = $object->id;
-		$subject  = $object->sujet;
-		$message  = $object->body;
-		$from     = $object->email_from;
-		$replyto  = $object->email_replyto;
-		$errorsto = $object->email_errorsto;
-		// Le message est-il en html
-		$msgishtml=-1;	// Unknown by default
-		if (preg_match('/[\s\t]*<html>/i',$message)) $msgishtml=1;
-
-		// Warning, we must not use begin-commit transaction here
-		// because we want to save update for each mail sent.
-
-		$nbok=0; $nbko=0;
-
-		// On choisit les mails non deja envoyes pour ce mailing (statut=0)
-		// ou envoyes en erreur (statut=-1)
-		$sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
-		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-		$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
-
-		dol_syslog("fiche.php: select targets sql=".$sql, LOG_DEBUG);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$num = $db->num_rows($resql);	// nb of possible recipients
-
-			if ($num)
-			{
-				dol_syslog("comm/mailing/fiche.php: nb of targets = ".$num, LOG_DEBUG);
-
-				$now=dol_now();
-
-				// Positionne date debut envoi
-				$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=".$db->idate($now)." WHERE rowid=".$object->id;
-				$resql2=$db->query($sql);
-				if (! $resql2)
-				{
-					dol_print_error($db);
-				}
-
-				// Loop on each email and send it
-				$i = 0;
-
-				while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
-				{
-
-					$res=1;
-
-					$obj = $db->fetch_object($resql);
-
-					// sendto en RFC2822
-					$sendto = str_replace(',',' ',dolGetFirstLastname($obj->firstname, $obj->lastname))." <".$obj->email.">";
-
-					// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
-					$other=explode(';',$obj->other);
-					$tmpfield=explode('=',$other[0],2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-                    $tmpfield=explode('=',$other[1],2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-                    $tmpfield=explode('=',$other[2],2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-                    $tmpfield=explode('=',$other[3],2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-                    $tmpfield=explode('=',$other[4],2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
-                    // Array of possible substitutions (See also fie mailing-send.php that should manage same substitutions)
-					$substitutionarray=array(
-							'__ID__' => $obj->source_id,
-							'__EMAIL__' => $obj->email,
-							'__LASTNAME__' => $obj->lastname,
-							'__FIRSTNAME__' => $obj->firstname,
-							'__MAILTOEMAIL__' => '<a href="mailto:'.$obj->email.'">'.$obj->email.'</a>',
-							'__OTHER1__' => $other1,
-							'__OTHER2__' => $other2,
-							'__OTHER3__' => $other3,
-							'__OTHER4__' => $other4,
-							'__OTHER5__' => $other5,
-							'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
-							'__UNSUBSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>'
-					);
-					if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
-					{
-						$substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-						if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-						else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
-					}
-					$substitutionisok=true;
-                    complete_substitutions_array($substitutionarray, $langs);
-					$newsubject=make_substitutions($subject,$substitutionarray);
-					$newmessage=make_substitutions($message,$substitutionarray);
-
-					$arr_file = array();
-					$arr_mime = array();
-					$arr_name = array();
-					$arr_css  = array();
-
-					$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-					if (count($listofpaths))
-					{
-						foreach($listofpaths as $key => $val)
-						{
-							$arr_file[]=$listofpaths[$key]['fullname'];
-							$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
-							$arr_name[]=$listofpaths[$key]['name'];
-						}
-					}
-
-					// Fabrication du mail
-					$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css);
-
-					if ($mail->error)
-					{
-						$res=0;
-					}
-					if (! $substitutionisok)
-					{
-						$mail->error='Some substitution failed';
-						$res=0;
-					}
-
-					// Send mail
-					if ($res)
-					{
-						$res=$mail->sendfile();
-					}
-
-					if ($res)
-					{
-						// Mail successful
-						$nbok++;
-
-						dol_syslog("comm/mailing/fiche.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
-
-						$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-						$sql.=" SET statut=1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
-						$resql2=$db->query($sql);
-						if (! $resql2)
-						{
-							dol_print_error($db);
-						}
-						else
-						{
-							//if cheack read is use then update prospect contact status
-							if (strpos($message, '__CHECK_READ__') !== false)
-							{
-								//Update status communication of thirdparty prospect
-								$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
-								dol_syslog("fiche.php: set prospect thirdparty status sql=".$sql, LOG_DEBUG);
-								$resql2=$db->query($sql);
-								if (! $resql2)
-								{
-									dol_print_error($db);
-								}
-
-							    //Update status communication of contact prospect
-								$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
-								dol_syslog("fiche.php: set prospect contact status sql=".$sql, LOG_DEBUG);
-
-								$resql2=$db->query($sql);
-								if (! $resql2)
-								{
-									dol_print_error($db);
-								}
-							}
-						}
-
-
-						//test if CHECK READ change statut prospect contact
-					}
-					else
-					{
-						// Mail failed
-						$nbko++;
-
-						dol_syslog("comm/mailing/fiche.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
-
-						$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-						$sql.=" SET statut=-1, date_envoi=".$db->idate($now)." WHERE rowid=".$obj->rowid;
-						$resql2=$db->query($sql);
-						if (! $resql2)
-						{
-							dol_print_error($db);
-						}
-					}
-
-					$i++;
-				}
-			}
-			else
-			{
-				setEventMessage($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"));
-			}
-
-			// Loop finished, set global statut of mail
-			if ($nbko > 0)
-			{
-				$statut=2;	// Status 'sent partially' (because at least one error)
-				if ($nbok > 0) 	setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
-				else setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
-			}
-			else
-			{
-				if ($nbok >= $num)
-				{
-					$statut=3;	// Send to everybody
-					setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
-				}
-				else
-				{
-					$statut=2;	// Status 'sent partially' (because not send to everybody)
-					setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
-				}
-			}
-
-			$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
-			dol_syslog("comm/mailing/fiche.php: update global status sql=".$sql, LOG_DEBUG);
-			$resql2=$db->query($sql);
-			if (! $resql2)
-			{
-				dol_print_error($db);
-			}
-		}
-		else
-		{
-			dol_syslog($db->error());
-			dol_print_error($db);
-		}
-
-		$action = '';
-	}
-}
-
-// Action send test emailing
-if ($action == 'send' && empty($_POST["cancel"]))
-{
-	$error=0;
-
-	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
-
-	$object->sendto = $_POST["sendto"];
-	if (! $object->sendto)
-	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("MailTo")).'</div>';
-		$error++;
-	}
-
-	if (! $error)
-	{
-		// Le message est-il en html
-		$msgishtml=-1;	// Inconnu par defaut
-		if (preg_match('/[\s\t]*<html>/i',$object->body)) $msgishtml=1;
-
-		// Pratique les substitutions sur le sujet et message
-		$tmpsujet=make_substitutions($object->sujet,$object->substitutionarrayfortest);
-		$tmpbody=make_substitutions($object->body,$object->substitutionarrayfortest);
-
-		$arr_file = array();
-		$arr_mime = array();
-		$arr_name = array();
-		$arr_css  = array();
-
-        // Ajout CSS
-        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor;
-        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
-
-        // Attached files
-		$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-		if (count($listofpaths))
-		{
-			foreach($listofpaths as $key => $val)
-			{
-				$arr_file[]=$listofpaths[$key]['fullname'];
-				$arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
-				$arr_name[]=$listofpaths[$key]['name'];
-			}
-		}
-
-		$mailfile = new CMailFile($tmpsujet,$object->sendto,$object->email_from,$tmpbody, $arr_file,$arr_mime,$arr_name,'', '', 0, $msgishtml,$object->email_errorsto,$arr_css);
-
-		$result=$mailfile->sendfile();
-		if ($result)
-		{
-			$mesg='<div class="ok">'.$langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)).'</div>';
-		}
-		else
-		{
-			$mesg='<div class="error">'.$langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result.'</div>';
-		}
-
-		$action='';
-	}
-}
-
-// Action add emailing
-if ($action == 'add')
-{
-	$object->email_from     = trim($_POST["from"]);
-	$object->email_replyto  = trim($_POST["replyto"]);
-	$object->email_errorsto = trim($_POST["errorsto"]);
-	$object->titre          = trim($_POST["titre"]);
-	$object->sujet          = trim($_POST["sujet"]);
-	$object->body           = trim($_POST["body"]);
-	$object->bgcolor        = trim($_POST["bgcolor"]);
-	$object->bgimage        = trim($_POST["bgimage"]);
-
-	if (! $object->titre) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
-	if (! $object->sujet) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
-	if (! $object->body)  $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
-
-	if (! $mesg)
-	{
-		if ($object->create($user) >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		$mesg=$object->error;
-	}
-
-	$mesg='<div class="error">'.$mesg.'</div>';
-	$action="create";
-}
-
-// Action update description of emailing
-if ($action == 'settitre' || $action == 'setemail_from' || $actino == 'setreplyto' || $action == 'setemail_errorsto')
-{
-	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
-
-	if ($action == 'settitre')					$object->titre          = trim(GETPOST('titre','alpha'));
-	else if ($action == 'setemail_from')		$object->email_from     = trim(GETPOST('email_from','alpha'));
-	else if ($action == 'setemail_replyto')		$object->email_replyto  = trim(GETPOST('email_replyto','alpha'));
-	else if ($action == 'setemail_errorsto')	$object->email_errorsto = trim(GETPOST('email_errorsto','alpha'));
-
-	else if ($action == 'settitre' && empty($object->titre))		$mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTitle"));
-	else if ($action == 'setfrom' && empty($object->email_from))	$mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailFrom"));
-
-	if (! $mesg)
-	{
-		if ($object->update($user) >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		$mesg=$object->error;
-	}
-
-	$mesg='<div class="error">'.$mesg.'</div>';
-	$action="";
-}
-
-/*
- * Add file in email form
- */
-if (! empty($_POST['addfile']))
-{
-	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    // Set tmp user directory
-    dol_add_file_process($upload_dir,0,0);
-
-	$action="edit";
-}
-
-// Action remove file
-if (! empty($_POST["removedfile"]))
-{
-	$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    dol_remove_file_process($_POST['removedfile'],0);
-
-	$action="edit";
-}
-
-// Action update emailing
-if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$isupload=0;
-
-	if (! $isupload)
-	{
-		$object->sujet          = trim($_POST["sujet"]);
-		$object->body           = trim($_POST["body"]);
-		$object->bgcolor        = trim($_POST["bgcolor"]);
-		$object->bgimage        = trim($_POST["bgimage"]);
-
-		if (! $object->sujet) $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailTopic"));
-		if (! $object->body)  $mesg.=($mesg?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->transnoentities("MailMessage"));
-
-		if (! $mesg)
-		{
-			if ($object->update($user) >= 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-				exit;
-			}
-			$mesg=$object->error;
-		}
-
-		$mesg='<div class="error">'.$mesg.'</div>';
-		$action="edit";
-	}
-	else
-	{
-		$action="edit";
-	}
-}
-
-// Action confirmation validation
-if ($action == 'confirm_valid' && $confirm == 'yes')
-{
-	if ($object->id > 0)
-	{
-		$object->valid($user);
-		setEventMessage($langs->trans("MailingSuccessfullyValidated"));
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-// Resend
-if ($action == 'confirm_reset' && $confirm == 'yes')
-{
-	if ($object->id > 0)
-	{
-		$db->begin();
-
-		$result=$object->valid($user);
-		if ($result > 0)
-		{
-			$result=$object->reset_targets_status($user);
-		}
-
-		if ($result > 0)
-		{
-			$db->commit();
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			$mesg=$object->error;
-			$db->rollback();
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-// Action confirmation suppression
-if ($action == 'confirm_delete' && $confirm == 'yes')
-{
-	if ($object->delete($object->id))
-	{
-		$url= (! empty($urlfrom) ? $urlfrom : 'liste.php');
-		header("Location: ".$url);
-		exit;
-	}
-}
-
-if (! empty($_POST["cancel"]))
-{
-	$action = '';
-}
-
-
-
-/*
- * View
- */
-
-
-$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing';
-llxHeader('',$langs->trans("Mailing"),$help_url);
-
-$form = new Form($db);
-$htmlother = new FormOther($db);
-
-if ($action == 'create')
-{
-	// EMailing in creation mode
-	print '<form name="new_mailing" action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-
-	print_fiche_titre($langs->trans("NewMailing"));
-
-	dol_htmloutput_mesg($mesg);
-
-	print '<table class="border" width="100%">';
-	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTitle").'</td><td><input class="flat" name="titre" size="40" value="'.$_POST['titre'].'"></td></tr>';
-	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat" name="from" size="40" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
-	print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td><input class="flat" name="errorsto" size="40" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO)?$conf->global->MAILING_EMAIL_ERRORSTO:$conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
-
-	// Other attributes
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		print $object->showOptionals($extrafields,'edit');
-	}
-
-	print '</table>';
-	print '</br><br>';
-
-	print '<table class="border" width="100%">';
-	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTopic").'</td><td><input class="flat" name="sujet" size="60" value="'.$_POST['sujet'].'"></td></tr>';
-	print '<tr><td width="25%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-	print $htmlother->selectColor($_POST['bgcolor'],'bgcolor','new_mailing',0);
-	print '</td></tr>';
-	print '<tr><td width="25%" valign="top"><span class="fieldrequired">'.$langs->trans("MailMessage").'</span><br>';
-	print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
-	foreach($object->substitutionarray as $key => $val)
-	{
-		print $key.' = '.$langs->trans($val).'<br>';
-	}
-	print '</i></td>';
-	print '<td>';
-	// Editeur wysiwyg
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('body',$_POST['body'],'',320,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,70);
-	$doleditor->Create();
-	print '</td></tr>';
-	print '</table>';
-
-	print '<br><center><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></center>';
-
-	print '</form>';
-}
-else
-{
-	if ($object->id > 0)
-	{
-		$upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id,2,0,1);
-
-		$head = emailing_prepare_head($object);
-
-		dol_fiche_head($head, 'card', $langs->trans("Mailing"), 0, 'email');
-
-		// Confirmation de la validation du mailing
-		if ($action == 'valid')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ValidMailing"),$langs->trans("ConfirmValidMailing"),"confirm_valid",'','',1);
-		}
-		// Confirm reset
-		else if ($action == 'reset')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ResetMailing"),$langs->trans("ConfirmResetMailing",$object->ref),"confirm_reset",'','',2);
-		}
-		// Confirm delete
-		else if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(! empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''),$langs->trans("DeleteAMailing"),$langs->trans("ConfirmDeleteMailing"),"confirm_delete",'','',1);
-		}
-
-
-		if ($action != 'edit')
-		{
-			/*
-			 * Mailing en mode visu
-			 */
-			if ($action == 'sendall')
-			{
-                // 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
-
-				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
-				    $mesgembedded.='<div class="warning">'.$langs->trans("MailingNeedCommand").'</div>';
-					$mesgembedded.='<br><textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
-					$mesgembedded.='<br><br><div class="warning">'.$langs->trans("MailingNeedCommand2").'</div>';
-					$_GET["action"]='';
-				}
-				else
-				{
-					$text='';
-                    if ($conf->file->mailing_limit_sendbyweb == 0)
-                    {
-                    	$text.=$langs->trans("MailingNeedCommand");
-                    	$text.='<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>';
-                    	$text.='<br><br>';
-                    }
-				    $text.=$langs->trans('ConfirmSendingEmailing').'<br>';
-					$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 '<table class="border" width="100%">';
-
-			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/liste.php">'.$langs->trans("BackToList").'</a>';
-
-			print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
-			print '<td colspan="3">';
-			print $form->showrefnav($object,'id', $linkback);
-			print '</td></tr>';
-
-			// Description
-			print '<tr><td>'.$form->editfieldkey("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailTitle",'titre',$object->titre,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
-			print '</td></tr>';
-
-			// From
-			print '<tr><td>'.$form->editfieldkey("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailFrom",'email_from',$object->email_from,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
-			print '</td></tr>';
-
-			// Errors to
-			print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string').'</td><td colspan="3">';
-			print $form->editfieldval("MailErrorsTo",'email_errorsto',$object->email_errorsto,$object,$user->rights->mailing->creer && $object->statut < 3,'string');
-			print '</td></tr>';
-
-			// Status
-			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
-
-			// Nb of distinct emails
-			print '<tr><td>';
-			print $langs->trans("TotalNbOfDistinctRecipients");
-			print '</td><td colspan="3">';
-			$nbemail = ($object->nbemail?$object->nbemail:img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>');
-			if ($object->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && is_numeric($nbemail) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
-			{
-				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-				{
-					$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-					print $form->textwithpicto($nbemail,$text,1,'warning');
-				}
-				else
-				{
-					$text=$langs->trans('NotEnoughPermissions');
-					print $form->textwithpicto($nbemail,$text,1,'warning');
-				}
-
-			}
-			else
-			{
-				print $nbemail;
-			}
-			print '</td></tr>';
-
-			// Other attributes
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
-			{
-				print $object->showOptionals($extrafields);
-			}
-
-			print '</table>';
-
-			print "</div>";
-
-
-			// Clone confirmation
-			if ($action == 'clone')
-			{
-				// Create an array for form
-				$formquestion=array(
-					'text' => $langs->trans("ConfirmClone"),
-				array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneContent"),   'value' => 1),
-				array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
-				);
-				// Paiement incomplet. On demande si motif = escompte ou autre
-				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$object->ref),'confirm_clone',$formquestion,'yes',2,240);
-			}
-
-
-			dol_htmloutput_mesg($mesg);
-
-			/*
-			 * Boutons d'action
-			 */
-
-			if (GETPOST("cancel") || $confirm=='no' || $action == '' || in_array($action,array('valid','delete','sendall','clone')))
-			{
-				print "\n\n<div class=\"tabsAction\">\n";
-
-				if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditMailing").'</a>';
-				}
-
-				//print '<a class="butAction" href="fiche.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
-
-				if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
-				{
-					print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
-				}
-				else
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
-				}
-
-				if ($object->statut == 0)
-				{
-					if ($object->nbemail <= 0)
-					{
-						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else if (empty($user->rights->mailing->valider))
-					{
-						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
-					}
-				}
-
-				if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
-				{
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send))
-					{
-						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
-					}
-				}
-
-				if ($user->rights->mailing->creer)
-				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&amp;object=emailing&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
-				}
-
-				if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
-				{
-					if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
-					{
-						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
-					}
-				}
-
-				if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
-				{
-					if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
-					{
-						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(! empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-				}
-
-				print '<br><br></div>';
-			}
-
-			if (! empty($mesgembedded)) 
-			{
-				dol_htmloutput_mesg($mesgembedded,'','warning',1);
-				print '<br>';
-			}
-
-			// Affichage formulaire de TEST
-			if ($action == 'test')
-			{
-				print_titre($langs->trans("TestMailing"));
-
-				// Create l'objet formulaire mail
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				$formmail = new FormMail($db);
-				$formmail->fromname = $object->email_from;
-				$formmail->frommail = $object->email_from;
-				$formmail->withsubstit=1;
-				$formmail->withfrom=0;
-				$formmail->withto=$user->email?$user->email:1;
-				$formmail->withtocc=0;
-				$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-				$formmail->withtopic=0;
-				$formmail->withtopicreadonly=1;
-				$formmail->withfile=0;
-				$formmail->withbody=0;
-				$formmail->withbodyreadonly=1;
-				$formmail->withcancel=1;
-				$formmail->withdeliveryreceipt=0;
-				// Tableau des substitutions
-				$formmail->substit=$object->substitutionarrayfortest;
-				// Tableau des parametres complementaires du post
-				$formmail->param["action"]="send";
-				$formmail->param["models"]="body";
-				$formmail->param["mailid"]=$object->id;
-				$formmail->param["returnurl"]=$_SERVER['PHP_SELF']."?id=".$object->id;
-
-				print $formmail->get_form();
-
-				print '<br>';
-			}
-
-			// Print mail content
-			print_fiche_titre($langs->trans("EMail"),'','');
-			print '<table class="border" width="100%">';
-
-			// Subject
-			print '<tr><td width="25%">'.$langs->trans("MailTopic").'</td><td colspan="3">'.$object->sujet.'</td></tr>';
-
-			// Joined files
-			print '<tr><td>'.$langs->trans("MailFile").'</td><td colspan="3">';
-			// List of files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-			if (count($listofpaths))
-			{
-				foreach($listofpaths as $key => $val)
-				{
-					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
-					print '<br>';
-				}
-			}
-			else
-			{
-				print $langs->trans("NoAttachedFiles").'<br>';
-			}
-			print '</td></tr>';
-
-            // Background color
-            /*print '<tr><td width="15%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-            print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
-            print '</td></tr>';*/
-
-		    // Message
-			print '<tr><td width="25%" valign="top">'.$langs->trans("MailMessage").'<br>';
-			print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
-			foreach($object->substitutionarray as $key => $val)
-			{
-				print $key.' = '.$langs->trans($val).'<br>';
-			}
-			print '</i></td>';
-			print '<td colspan="3" bgcolor="'.($object->bgcolor?(preg_match('/^#/',$object->bgcolor)?'':'#').$object->bgcolor:'white').'">';
-			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')
-			{
-				$readonly=1;
-				// Editeur wysiwyg
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('body',$object->body,'',320,'dolibarr_mailings','',false,true,empty($conf->global->FCKEDITOR_ENABLE_MAILING)?0:1,20,120,$readonly);
-				$doleditor->Create();
-			}
-			else print dol_htmlentitiesbr($object->body);
-			print '</td>';
-			print '</tr>';
-
-			print '</table>';
-			print "<br>";
-		}
-		else
-		{
-			/*
-			 * Mailing en mode edition
-			 */
-
-			dol_htmloutput_mesg($mesg);
-
-			print '<table class="border" width="100%">';
-
-			// Ref
-			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
-			// Topic
-			print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
-			// From
-			print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from,0,0,0,0,1).'</td></tr>';
-			// To
-			print '<tr><td width="25%">'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto,0,0,0,0,1).'</td></tr>';
-
-			// Status
-			print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
-
-			// Nb of distinct emails
-			print '<tr><td width="25%">';
-			print $langs->trans("TotalNbOfDistinctRecipients");
-			print '</td><td colspan="3">';
-			$nbemail = ($object->nbemail?$object->nbemail:img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>');
-			if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && is_numeric($nbemail) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
-			{
-				$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-				print $form->textwithpicto($nbemail,$text,1,'warning');
-			}
-			else
-			{
-				print $nbemail;
-			}
-			print '</td></tr>';
-
-			// Other attributes
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
-			{
-				print $object->showOptionals($extrafields,'edit');
-			}
-
-			print '</table>';
-			print "</div>";
-
-			print "\n";
-			print '<form name="edit_mailing" action="fiche.php" method="post" enctype="multipart/form-data">'."\n";
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="update">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-			// Print mail content
-			print_fiche_titre($langs->trans("EMail"),'','');
-			print '<table class="border" width="100%">';
-
-			// Subject
-			print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat" type="text" size=60 name="sujet" value="'.$object->sujet.'"></td></tr>';
-
-			dol_init_file_process($upload_dir);
-
-			// Joined files
-			$addfileaction='addfile';
-			print '<tr><td>'.$langs->trans("MailFile").'</td>';
-			print '<td colspan="3">';
-			// List of files
-			$listofpaths=dol_dir_list($upload_dir,'all',0,'','','name',SORT_ASC,0);
-			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-			$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-			$out.= '<script type="text/javascript" language="javascript">';
-			$out.= 'jQuery(document).ready(function () {';
-			$out.= '    jQuery(".removedfile").click(function() {';
-			$out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-			$out.= '    });';
-			$out.= '})';
-			$out.= '</script>'."\n";
-			if (count($listofpaths))
-			{
-				foreach($listofpaths as $key => $val)
-				{
-					$out.= '<div id="attachfile_'.$key.'">';
-					$out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
-					$out.= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"),'delete.png','','',1).'" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-					$out.= '<br></div>';
-				}
-			}
-			else
-			{
-				$out.= $langs->trans("NoAttachedFiles").'<br>';
-			}
-			// Add link to add file
-			$out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-			$out.= ' ';
-			$out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
-			print $out;
-			print '</td></tr>';
-
-		    // Background color
-			print '<tr><td width="25%">'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-			print $htmlother->selectColor($object->bgcolor,'bgcolor','edit_mailing',0);
-			print '</td></tr>';
-
-			// Message
-			print '<tr><td width="25%" valign="top">'.$langs->trans("MailMessage").'<br>';
-			print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
-			foreach($object->substitutionarray as $key => $val)
-			{
-				print $key.' = '.$langs->trans($val).'<br>';
-			}
-			print '</i></td>';
-			print '<td colspan="3">';
-			// Editeur wysiwyg
-			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-			$doleditor=new DolEditor('body',$object->body,'',320,'dolibarr_mailings','',true,true,$conf->global->FCKEDITOR_ENABLE_MAILING,20,120);
-			$doleditor->Create();
-			print '</td></tr>';
-
-			print '</table>';
-
-			print '<br><center>';
-			print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="save">';
-			print ' &nbsp; ';
-			print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
-			print '</center>';
-
-			print '</form>';
-			print '<br>';
-		}
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
-	}
-}
-
-llxFooter();
-$db->close();
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index a0175bad448..5c6ae896e42 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -51,7 +51,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Recherche emails
 $var=false;
-print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/liste.php">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAMailing").'</td></tr>';
@@ -162,7 +162,7 @@ if ($result)
   print '<td colspan="2">'.$langs->trans("LastMailings",$limit).'</td>';
   print '<td align="center">'.$langs->trans("DateCreation").'</td>';
   print '<td align="center">'.$langs->trans("NbOfEMails").'</td>';
-  print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/liste.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
+  print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
 
   $num = $db->num_rows($result);
   if ($num > 0)
@@ -176,7 +176,7 @@ if ($result)
 	  $var=!$var;
 
 	  print "<tr ".$bc[$var].">";
-	  print '<td class="nowrap"><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
+	  print '<td class="nowrap"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
 	  print '<td>'.dol_trunc($obj->titre,38).'</td>';
 	  print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>';
 	  print '<td align="center">'.($obj->nbemail?$obj->nbemail:"0").'</td>';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
new file mode 100644
index 00000000000..ef2e2c48bf8
--- /dev/null
+++ b/htdocs/comm/mailing/list.php
@@ -0,0 +1,190 @@
+<?php
+/* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/comm/mailing/list.php
+ *       \ingroup    mailing
+ *       \brief      Liste des mailings
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+
+$langs->load("mails");
+
+// Security check
+$result=restrictedArea($user,'mailing');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="m.date_creat";
+
+$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
+$sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"];
+
+$filteremail=$_REQUEST["filteremail"]?$_REQUEST["filteremail"]:'';
+
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
+
+$form = new Form($db);
+
+if ($filteremail)
+{
+	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
+	$sql.= " mc.statut as sendstatut";
+	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
+	$sql.= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
+	$sql.= " AND mc.email = '".$db->escape($filteremail)."'";
+	if ($sref) $sql.= " AND m.rowid = '".$sref."'";
+	if ($sall) $sql.= " AND (m.titre like '%".$sall."%' OR m.sujet like '%".$sall."%' OR m.body like '%".$sall."%')";
+	if (! $sortorder) $sortorder="ASC";
+	if (! $sortfield) $sortfield="m.rowid";
+	$sql.= $db->order($sortfield,$sortorder);
+	$sql.= $db->plimit($conf->liste_limit +1, $offset);
+}
+else
+{
+	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
+	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
+	$sql.= " WHERE m.entity = ".$conf->entity;
+	if ($sref) $sql.= " AND m.rowid = '".$sref."'";
+	if ($sall) $sql.= " AND (m.titre like '%".$sall."%' OR m.sujet like '%".$sall."%' OR m.body like '%".$sall."%')";
+	if (! $sortorder) $sortorder="ASC";
+	if (! $sortfield) $sortfield="m.rowid";
+	$sql.= $db->order($sortfield,$sortorder);
+	$sql.= $db->plimit($conf->liste_limit +1, $offset);
+}
+
+//print $sql;
+$result = $db->query($sql);
+if ($result)
+{
+	$num = $db->num_rows($result);
+
+	$title=$langs->trans("ListOfEMailings");
+	if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,"",$num);
+
+	$i = 0;
+
+	$param = "&amp;sall=".$sall;
+	if ($filteremail) $param.='&amp;filteremail='.urlencode($filteremail);
+
+	print '<table class="liste">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
+	if (! $filteremail) print_liste_field_titre($langs->trans("NbOfEMails"),$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
+	if (! $filteremail) print_liste_field_titre($langs->trans("DateLastSend"),$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+	else print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="sref" value="'.$sref.'" size="6">';
+	print '</td>';
+	// Title
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="sall" value="'.$sall.'" size="40">';
+	print '</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	if (! $filteremail) print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print "</td>";
+	print "</tr>\n";
+	print '</form>';
+
+	$var=True;
+
+	$email=new Mailing($db);
+
+	while ($i < min($num,$conf->liste_limit))
+	{
+		$obj = $db->fetch_object($result);
+
+		$var=!$var;
+
+		print "<tr ".$bc[$var].">";
+		print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$obj->rowid.'">';
+		print img_object($langs->trans("ShowEMail"),"email").' '.stripslashes($obj->rowid).'</a></td>';
+		print '<td>'.$obj->titre.'</td>';
+		// Date creation
+		print '<td align="center">';
+		print dol_print_date($db->jdate($obj->datec),'day');
+		print '</td>';
+		// Nb of email
+		if (! $filteremail)
+		{
+			print '<td align="center">';
+			$nbemail = $obj->nbemail;
+			if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
+			{
+				$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+				print $form->textwithpicto($nbemail,$text,1,'warning');
+			}
+			else
+			{
+				print $nbemail;
+			}
+			print '</td>';
+		}
+		// Last send
+		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_envoi),'day').'</td>';
+		print '</td>';
+		// Status
+		print '<td align="right" class="nowrap">';
+		if ($filteremail)
+		{
+			if ($obj->sendstatut==-1) print $langs->trans("MailingStatusError").' '.img_error();
+			if ($obj->sendstatut==1) print $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
+		}
+		else
+		{
+			print $email->LibStatut($obj->statut,5);
+		}
+		print '</td>';
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>";
+	$db->free($result);
+}
+else
+{
+	dol_print_error($db);
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php
deleted file mode 100644
index 617096561a3..00000000000
--- a/htdocs/comm/mailing/liste.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/comm/mailing/liste.php
- *       \ingroup    mailing
- *       \brief      Liste des mailings
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
-
-$langs->load("mails");
-
-// Security check
-$result=restrictedArea($user,'mailing');
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="m.date_creat";
-
-$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
-$sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"];
-
-$filteremail=$_REQUEST["filteremail"]?$_REQUEST["filteremail"]:'';
-
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:M&oacute;dulo_Mailing');
-
-$form = new Form($db);
-
-if ($filteremail)
-{
-	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
-	$sql.= " mc.statut as sendstatut";
-	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
-	$sql.= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
-	$sql.= " AND mc.email = '".$db->escape($filteremail)."'";
-	if ($sref) $sql.= " AND m.rowid = '".$sref."'";
-	if ($sall) $sql.= " AND (m.titre like '%".$sall."%' OR m.sujet like '%".$sall."%' OR m.body like '%".$sall."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
-	$sql.= $db->order($sortfield,$sortorder);
-	$sql.= $db->plimit($conf->liste_limit +1, $offset);
-}
-else
-{
-	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
-	$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
-	$sql.= " WHERE m.entity = ".$conf->entity;
-	if ($sref) $sql.= " AND m.rowid = '".$sref."'";
-	if ($sall) $sql.= " AND (m.titre like '%".$sall."%' OR m.sujet like '%".$sall."%' OR m.body like '%".$sall."%')";
-	if (! $sortorder) $sortorder="ASC";
-	if (! $sortfield) $sortfield="m.rowid";
-	$sql.= $db->order($sortfield,$sortorder);
-	$sql.= $db->plimit($conf->liste_limit +1, $offset);
-}
-
-dol_syslog("sql=".$sql);
-//print $sql;
-$result = $db->query($sql);
-if ($result)
-{
-	$num = $db->num_rows($result);
-
-	$title=$langs->trans("ListOfEMailings");
-	if ($filteremail) $title.=' ('.$langs->trans("SentTo",$filteremail).')';
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,"",$num);
-
-	$i = 0;
-
-	$param = "&amp;sall=".$sall;
-	if ($filteremail) $param.='&amp;filteremail='.urlencode($filteremail);
-
-	print '<table class="liste">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"m.rowid",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Title"),$_SERVER["PHP_SELF"],"m.titre",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"m.date_creat",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre($langs->trans("NbOfEMails"),$_SERVER["PHP_SELF"],"m.nbemail",$param,"",'align="center"',$sortfield,$sortorder);
-	if (! $filteremail) print_liste_field_titre($langs->trans("DateLastSend"),$_SERVER["PHP_SELF"],"m.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	else print_liste_field_titre($langs->trans("DateSending"),$_SERVER["PHP_SELF"],"mc.date_envoi",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],($filteremail?"mc.statut":"m.statut"),$param,"",'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="sref" value="'.$sref.'" size="6">';
-	print '</td>';
-	// Title
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="sall" value="'.$sall.'" size="40">';
-	print '</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	if (! $filteremail) print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print "</td>";
-	print "</tr>\n";
-	print '</form>';
-
-	$var=True;
-
-	$email=new Mailing($db);
-
-	while ($i < min($num,$conf->liste_limit))
-	{
-		$obj = $db->fetch_object($result);
-
-		$var=!$var;
-
-		print "<tr ".$bc[$var].">";
-		print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/fiche.php?id='.$obj->rowid.'">';
-		print img_object($langs->trans("ShowEMail"),"email").' '.stripslashes($obj->rowid).'</a></td>';
-		print '<td>'.$obj->titre.'</td>';
-		// Date creation
-		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->datec),'day');
-		print '</td>';
-		// Nb of email
-		if (! $filteremail)
-		{
-			print '<td align="center">';
-			$nbemail = $obj->nbemail;
-			if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
-			{
-				$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
-				print $form->textwithpicto($nbemail,$text,1,'warning');
-			}
-			else
-			{
-				print $nbemail;
-			}
-			print '</td>';
-		}
-		// Last send
-		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_envoi),'day').'</td>';
-		print '</td>';
-		// Status
-		print '<td align="right" class="nowrap">';
-		if ($filteremail)
-		{
-			if ($obj->sendstatut==-1) print $langs->trans("MailingStatusError").' '.img_error();
-			if ($obj->sendstatut==1) print $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut6');
-		}
-		else
-		{
-			print $email->LibStatut($obj->statut,5);
-		}
-		print '</td>';
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table>";
-	$db->free($result);
-}
-else
-{
-	dol_print_error($db);
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 4929ee9c70e..c6a3df01cae 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -5,10 +5,11 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
- * Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2010-2011 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2014 Florian Henry		 <florian.henry@open-concept.pro>
+ * Copyright (C) 2014	   Ferran Marcet		 <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,6 +52,7 @@ $langs->load('bills');
 $langs->load('orders');
 $langs->load('products');
 $langs->load("deliveries");
+$langs->load('sendings');
 if (! empty($conf->margin->enabled))
 	$langs->load('margins');
 
@@ -64,6 +66,7 @@ $origin = GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $lineid = GETPOST('lineid', 'int');
+$contactid = GETPOST('contactid','int');
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -74,8 +77,7 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($co
 $NBLINES = 4;
 
 // Security check
-if (! empty($user->societe_id))
-	$socid = $user->societe_id;
+if (! empty($user->societe_id)) $socid = $user->societe_id;
 $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
@@ -94,7 +96,7 @@ if ($id > 0 || ! empty($ref)) {
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('propalcard'));
+$hookmanager->initHooks(array('propalcard','globalcard'));
 
 $permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
 
@@ -103,16 +105,20 @@ $permissionnote = $user->rights->propale->creer; // Used by the include of actio
  */
 
 $parameters = array('socid' => $socid);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
-                                                                                   // hooks
+$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');
 
 include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes') {
-	if (1 == 0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers')) {
+if ($action == 'confirm_clone' && $confirm == 'yes')
+{
+	if (1 == 0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	{
 		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
-	} else {
+	}
+	else
+	{
 		if ($object->id > 0) {
 			$result = $object->createFromClone($socid);
 			if ($result > 0) {
@@ -127,7 +133,8 @@ if ($action == 'confirm_clone' && $confirm == 'yes') {
 }
 
 // Delete proposal
-else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->propal->supprimer) {
+else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->propal->supprimer)
+{
 	$result = $object->delete($user);
 	if ($result > 0) {
 		header('Location: ' . DOL_URL_ROOT . '/comm/propal/list.php');
@@ -139,7 +146,8 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->prop
 }
 
 // Remove line
-else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->propal->creer) {
+else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->propal->creer)
+{
 	$result = $object->deleteline($lineid);
 	// reorder lines
 	if ($result)
@@ -150,11 +158,11 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
 			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret = $object->fetch($id); // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
@@ -162,19 +170,29 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
 }
 
 // Validation
-else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->propal->valider) {
+else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->propal->valider)
+{
 	$result = $object->valid($user);
-	if ($result >= 0) {
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-			// Define output language
-			$outputlangs = $langs;
-			if (! empty($conf->global->MAIN_MULTILANGS)) {
-				$outputlangs = new Translate("", $conf);
-				$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
-				$outputlangs->setDefaultLang($newlang);
+	if ($result >= 0)
+	{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+		{
+					// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model=$object->modelpdf;
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-			$ret = $object->fetch($id); // Reload to get new records
-			propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	} else {
 		$langs->load("errors");
@@ -183,8 +201,9 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr
 	}
 }
 
-else if ($action == 'setdate' && $user->rights->propal->creer) {
-	$datep = dol_mktime(12, 0, 0, $_POST ['remonth'], $_POST ['reday'], $_POST ['reyear']);
+else if ($action == 'setdate' && $user->rights->propal->creer)
+{
+	$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 
 	if (empty($datep)) {
 		$error ++;
@@ -196,23 +215,29 @@ else if ($action == 'setdate' && $user->rights->propal->creer) {
 		if ($result < 0)
 			dol_print_error($db, $object->error);
 	}
-} else if ($action == 'setecheance' && $user->rights->propal->creer) {
-	$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST ['echmonth'], $_POST ['echday'], $_POST ['echyear']));
+}
+else if ($action == 'setecheance' && $user->rights->propal->creer)
+{
+	$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
 	if ($result < 0)
 		dol_print_error($db, $object->error);
-} else if ($action == 'setdate_livraison' && $user->rights->propal->creer) {
-	$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST ['liv_month'], $_POST ['liv_day'], $_POST ['liv_year']));
+}
+else if ($action == 'setdate_livraison' && $user->rights->propal->creer)
+{
+	$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
 	if ($result < 0)
 		dol_print_error($db, $object->error);
 }
 
 // Positionne ref client
-else if ($action == 'set_ref_client' && $user->rights->propal->creer) {
-	$object->set_ref_client($user, $_POST ['ref_client']);
+else if ($action == 'set_ref_client' && $user->rights->propal->creer)
+{
+	$object->set_ref_client($user, $_POST['ref_client']);
 }
 
 // Create proposal
-else if ($action == 'add' && $user->rights->propal->creer) {
+else if ($action == 'add' && $user->rights->propal->creer)
+{
 	$object->socid = $socid;
 	$object->fetch_thirdparty();
 
@@ -237,11 +262,13 @@ else if ($action == 'add' && $user->rights->propal->creer) {
 		$error ++;
 	}
 
-	if (! $error) {
+	if (! $error)
+	{
 		$db->begin();
 
 		// Si on a selectionne une propal a copier, on realise la copie
-		if (GETPOST('createmode') == 'copy' && GETPOST('copie_propal')) {
+		if (GETPOST('createmode') == 'copy' && GETPOST('copie_propal'))
+		{
 			if ($object->fetch(GETPOST('copie_propal')) > 0) {
 				$object->ref = GETPOST('ref');
 				$object->datep = $datep;
@@ -249,13 +276,15 @@ else if ($action == 'add' && $user->rights->propal->creer) {
 				$object->availability_id = GETPOST('availability_id');
 				$object->demand_reason_id = GETPOST('demand_reason_id');
 				$object->fk_delivery_address = GETPOST('fk_address');
+                $object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 				$object->duree_validite = $duration;
 				$object->cond_reglement_id = GETPOST('cond_reglement_id');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id');
+                $object->fk_account = GETPOST('fk_account', 'int');
 				$object->remise_percent = GETPOST('remise_percent');
 				$object->remise_absolue = GETPOST('remise_absolue');
 				$object->socid = GETPOST('socid');
-				$object->contactid = GETPOST('contactidp');
+				$object->contactid = GETPOST('contactid');
 				$object->fk_project = GETPOST('projectid');
 				$object->modelpdf = GETPOST('model');
 				$object->author = $user->id; // deprecated
@@ -274,11 +303,12 @@ else if ($action == 'add' && $user->rights->propal->creer) {
 			$object->availability_id = GETPOST('availability_id');
 			$object->demand_reason_id = GETPOST('demand_reason_id');
 			$object->fk_delivery_address = GETPOST('fk_address');
+            $object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 			$object->duree_validite = GETPOST('duree_validite');
 			$object->cond_reglement_id = GETPOST('cond_reglement_id');
 			$object->mode_reglement_id = GETPOST('mode_reglement_id');
-
-			$object->contactid = GETPOST('contactidp');
+            $object->fk_account = GETPOST('fk_account', 'int');
+			$object->contactid = GETPOST('contactid');
 			$object->fk_project = GETPOST('projectid');
 			$object->modelpdf = GETPOST('model');
 			$object->author = $user->id; // deprecated
@@ -287,12 +317,13 @@ else if ($action == 'add' && $user->rights->propal->creer) {
 			$object->origin = GETPOST('origin');
 			$object->origin_id = GETPOST('originid');
 
-			for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++) {
-				if ($_POST ['idprod' . $i]) {
+			for($i = 1; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i ++)
+			{
+				if ($_POST['idprod' . $i]) {
 					$xid = 'idprod' . $i;
 					$xqty = 'qty' . $i;
 					$xremise = 'remise' . $i;
-					$object->add_product($_POST [$xid], $_POST [$xqty], $_POST [$xremise]);
+					$object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);
 				}
 			}
 
@@ -304,43 +335,190 @@ else if ($action == 'add' && $user->rights->propal->creer) {
 			}
 		}
 
-		if (! $error) {
-			$id = $object->create($user);
+		if (! $error)
+		{
+			if ($origin && $originid)
+			{
+				// Parse element/subelement (ex: project_task)
+				$element = $subelement = $origin;
+				if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
+					$element = $regs [1];
+					$subelement = $regs [2];
+				}
 
-			if ($id > 0) {
+				// For compatibility
+				if ($element == 'order') {
+					$element = $subelement = 'commande';
+				}
+				if ($element == 'propal') {
+					$element = 'comm/propal';
+					$subelement = 'propal';
+				}
+				if ($element == 'contract') {
+					$element = $subelement = 'contrat';
+				}
+				if ($element == 'inter') {
+					$element = $subelement = 'ficheinter';
+				}
+				if ($element == 'shipping') {
+					$element = $subelement = 'expedition';
+				}
+
+				$object->origin = $origin;
+				$object->origin_id = $originid;
+
+				// Possibility to add external linked objects with hooks
+				$object->linked_objects [$object->origin] = $object->origin_id;
+				if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) {
+					$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
+				}
+
+				$id = $object->create($user);
+				if ($id > 0)
+				{
+						dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+
+						$classname = ucfirst($subelement);
+						$srcobject = new $classname($db);
+
+						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
+						$result = $srcobject->fetch($object->origin_id);
+
+						if ($result > 0)
+						{
+							$lines = $srcobject->lines;
+							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
+							{
+								$srcobject->fetch_lines();
+								$lines = $srcobject->lines;
+							}
+
+							$fk_parent_line=0;
+							$num=count($lines);
+							for ($i=0;$i<$num;$i++)
+							{
+								$label=(! empty($lines[$i]->label)?$lines[$i]->label:'');
+								$desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle);
+
+									// Positive line
+									$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+
+									// Date start
+									$date_start = false;
+									if ($lines[$i]->date_debut_prevue)
+										$date_start = $lines[$i]->date_debut_prevue;
+									if ($lines[$i]->date_debut_reel)
+										$date_start = $lines[$i]->date_debut_reel;
+									if ($lines[$i]->date_start)
+										$date_start = $lines[$i]->date_start;
+
+										// Date end
+									$date_end = false;
+									if ($lines[$i]->date_fin_prevue)
+										$date_end = $lines[$i]->date_fin_prevue;
+									if ($lines[$i]->date_fin_reel)
+										$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;
+									}
+
+									// Extrafields
+									if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
+										$lines[$i]->fetch_optionals($lines[$i]->rowid);
+										$array_option = $lines[$i]->array_options;
+									}
+
+									$tva_tx=get_default_tva($mysoc, $object->thirdparty);
+
+									$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_option);
+
+									if ($result > 0) {
+										$lineid = $result;
+									} else {
+										$lineid = 0;
+										$error ++;
+										break;
+									}
+
+									// Defined the new fk_parent_line
+									if ($result > 0 && $lines[$i]->product_type == 9) {
+										$fk_parent_line = $result;
+									}
+							}
+
+							// Hooks
+							$parameters = array('objFrom' => $srcobject);
+							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
+							                                                                               // modified by hook
+							if ($reshook < 0)
+								$error ++;
+						} else {
+							setEventMessages($srcobject->error, $srcobject->errors, 'errors');
+							$error ++;
+						}
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error ++;
+				}
+			} 			// Standard creation
+			else
+			{
+				$id = $object->create($user);
+			}
+
+			if ($id > 0)
+			{
 				// Insertion contact par defaut si defini
-				if (GETPOST('contactidp') > 0) {
-					$result = $object->add_contact(GETPOST('contactidp'), 'CUSTOMER', 'external');
-					if ($result < 0) {
-						$error ++;
+				if (GETPOST('contactid') > 0)
+				{
+					$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
+					if ($result < 0)
+					{
+						$error++;
 						setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors');
 					}
 				}
 
-				if (! $error) {
+				if (! $error)
+				{
 					$db->commit();
 
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-						// Define output language
-						$outputlangs = $langs;
-						if (! empty($conf->global->MAIN_MULTILANGS)) {
-							$outputlangs = new Translate("", $conf);
-							$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
-							$outputlangs->setDefaultLang($newlang);
-						}
-						$ret = $object->fetch($id); // Reload to get new records
-						propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-					}
+			        // Define output language
+			    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			    	{
+			    		$outputlangs = $langs;
+			    		$newlang = '';
+			    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+			    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+			    		if (! empty($newlang)) {
+			    			$outputlangs = new Translate("", $conf);
+			    			$outputlangs->setDefaultLang($newlang);
+			    		}
+			    		$model=$object->modelpdf;
+
+			    		$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);
+			    	}
 
 					header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);
 					exit();
-				} else {
-					$db->rollback();
 				}
-			} else {
-				dol_print_error($db, $object->error);
+				else
+				{
+					$db->rollback();
+					$action='create';
+				}
+			}
+			else
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
-				exit();
+				$action='create';
 			}
 		}
 	}
@@ -354,7 +532,7 @@ else if ($action == 'classifybilled' && $user->rights->propal->cloturer) {
 // Reopen proposal
 else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel')) {
 	// prevent browser refresh from reopening proposal several times
-	if ($object->statut == 2 || $object->statut == 3) {
+	if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) {
 		$object->reopen($user, 1);
 	}
 }
@@ -372,166 +550,45 @@ else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST(
 	}
 }
 
-// Add file in email form
-if (GETPOST('addfile')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_printipp.inc.php';
 
-	// Set tmp user directory TODO Use a dedicated directory for temp mails files
-	$vardir = $conf->user->dir_output . "/" . $user->id;
-	$upload_dir_tmp = $vardir . '/temp';
-
-	dol_add_file_process($upload_dir_tmp, 0, 0);
-	$action = 'presend';
-}
-
-// Remove file in email form
-if (GETPOST('removedfile')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-	// Set tmp user directory
-	$vardir = $conf->user->dir_output . "/" . $user->id;
-	$upload_dir_tmp = $vardir . '/temp';
-
-	// TODO Delete only files that was uploaded from email form
-	dol_remove_file_process($_POST ['removedfile'], 0);
-	$action = 'presend';
-}
 
 /*
  * Send mail
  */
-if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel')) {
-	$langs->load('mails');
 
-	if ($object->id > 0) {
-		if ($_POST ['sendto']) {
-			// Le destinataire a ete fourni via le champ libre
-			$sendto = $_POST ['sendto'];
-			$sendtoid = 0;
-		} elseif ($_POST ['receiver'] != '-1') {
-			// Recipient was provided from combo list
-			if ($_POST ['receiver'] == 'thirdparty') 			// Id of third party
-			{
-				$sendto = $object->client->email;
-				$sendtoid = 0;
-			} else 			// Id du contact
-			{
-				$sendto = $object->client->contact_get_property($_POST ['receiver'], 'email');
-				$sendtoid = $_POST ['receiver'];
-			}
-		}
+// Actions to send emails
+$actiontypecode='AC_PROP';
+$trigger_name='PROPAL_SENTBYMAIL';
+$paramname='id';
+$mode='emailfromproposal';
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-		if (dol_strlen($sendto)) {
-			$langs->load("commercial");
 
-			$from = $_POST ['fromname'] . ' <' . $_POST ['frommail'] . '>';
-			$replyto = $_POST ['replytoname'] . ' <' . $_POST ['replytomail'] . '>';
-			$message = $_POST ['message'];
-			$sendtocc = $_POST ['sendtocc'];
-			$deliveryreceipt = $_POST ['deliveryreceipt'];
-
-			if (dol_strlen($_POST ['subject']))
-				$subject = $_POST ['subject'];
-			else
-				$subject = $langs->transnoentities('Propal') . ' ' . $object->ref;
-			$actiontypecode = 'AC_PROP';
-			$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
-			if ($message) {
-				$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-				$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-				$actionmsg .= $message;
-			}
-			$actionmsg2 = $langs->transnoentities('Action' . $actiontypecode);
-
-			// Create form object
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-
-			$attachedfiles = $formmail->get_attached_files();
-			$filepath = $attachedfiles ['paths'];
-			$filename = $attachedfiles ['names'];
-			$mimetype = $attachedfiles ['mimes'];
-
-			// Envoi de la propal
-			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, - 1);
-			if ($mailfile->error) {
-				setEventMessage($mailfile->error, 'errors');
-			} else {
-				$result = $mailfile->sendfile();
-				if ($result) {
-					// Initialisation donnees
-					$object->sendtoid = $sendtoid;
-					$object->actiontypecode = $actiontypecode;
-					$object->actionmsg = $actionmsg;
-					$object->actionmsg2 = $actionmsg2;
-					$object->fk_element = $object->id;
-					$object->elementtype = $object->element;
-
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface = new Interfaces($db);
-					$result = $interface->run_triggers('PROPAL_SENTBYMAIL', $object, $user, $langs, $conf);
-					if ($result < 0) {
-						$error++;
-						$object->errors = $interface->errors;
-					}
-					// Fin appel triggers
-
-					if (! $error) {
-						// Redirect here
-						// This avoid sending mail twice if going out and then back to page
-						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
-						setEventMessage($mesg);
-						header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
-						exit();
-					} else {
-						dol_print_error($db);
-					}
-				} else {
-					$langs->load("other");
-					if ($mailfile->error) {
-						$mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
-						$mesg .= '<br>' . $mailfile->error;
-					} else {
-						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-					}
-					setEventMessage($mesg, 'errors');
-				}
-			}
-		} else {
-			$langs->load("other");
-			setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors');
-			dol_syslog($langs->trans('ErrorMailRecipientIsEmpty'));
-		}
-	} else {
-		$langs->load("other");
-		setEventMessage($langs->trans('ErrorFailedToReadEntity', $langs->trans("Proposal")), 'errors');
-		dol_syslog($langs->trans('ErrorFailedToReadEntity', $langs->trans("Proposal")));
-	}
-}
 
 // Go back to draft
-if ($action == 'modif' && $user->rights->propal->creer) {
+if ($action == 'modif' && $user->rights->propal->creer)
+{
 	$object->set_draft($user);
 
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+	{
 		// Define output language
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
 			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret = $object->fetch($id); // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 }
 
 else if ($action == "setabsolutediscount" && $user->rights->propal->creer) {
-	if ($_POST ["remise_id"]) {
+	if ($_POST["remise_id"]) {
 		if ($object->id > 0) {
-			$result = $object->insert_discount($_POST ["remise_id"]);
+			$result = $object->insert_discount($_POST["remise_id"]);
 			if ($result < 0) {
 				setEventMessage($object->error, 'errors');
 			}
@@ -568,7 +625,7 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 	if (is_array($extralabelsline)) {
 		// Get extra fields
 		foreach ($extralabelsline as $key => $value) {
-			unset($_POST ["options_" . $key]);
+			unset($_POST["options_" . $key]);
 		}
 	}
 
@@ -605,18 +662,22 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 			$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
 
 			// If prices fields are update
-				$tva_tx = get_default_tva($mysoc, $object->client, $prod->id);
-				$tva_npr = get_default_npr($mysoc, $object->client, $prod->id);
+				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+				$pu_ht = $prod->price;
+				$pu_ttc = $prod->price_ttc;
+				$price_min = $prod->price_min;
+				$price_base_type = $prod->price_base_type;
 
 				// On defini prix unitaire
-				if (! empty($conf->global->PRODUIT_MULTIPRICES) && $object->client->price_level)
+				if (! empty($conf->global->PRODUIT_MULTIPRICES) && $object->thirdparty->price_level)
 				{
-					$pu_ht = $prod->multiprices[$object->client->price_level];
-					$pu_ttc = $prod->multiprices_ttc[$object->client->price_level];
-					$price_min = $prod->multiprices_min[$object->client->price_level];
-					$price_base_type = $prod->multiprices_base_type[$object->client->price_level];
-					if (isset($prod->multiprices_tva_tx[$object->client->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->client->price_level];
-					if (isset($prod->multiprices_recuperableonly[$object->client->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->client->price_level];
+					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+					if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+					if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 				}
 				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
@@ -627,30 +688,15 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result >= 0) {
+					if ($result) {
 						if (count($prodcustprice->lines) > 0) {
-							$found = true;
-							$pu_ht = price($prodcustprice->lines[0]->price);
-							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-							$price_base_type = $prodcustprice->lines[0]->price_base_type;
-							$prod->tva_tx = $prodcustprice->lines[0]->tva_tx;
-						}else {
-							$pu_ht = $prod->price;
-							$pu_ttc = $prod->price_ttc;
-							$price_min = $prod->price_min;
-							$price_base_type = $prod->price_base_type;
+							$pu_ht = price($prodcustprice->lines [0]->price);
+							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+							$price_base_type = $prodcustprice->lines [0]->price_base_type;
+							$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
 						}
-					}else {
-						setEventMessage($prodcustprice->error,'errors');
 					}
 				}
-				else
-				{
-					$pu_ht = $prod->price;
-					$pu_ttc = $prod->price_ttc;
-					$price_min = $prod->price_min;
-					$price_base_type = $prod->price_base_type;
-				}
 
 				// if price ht is forced (ie: calculated by margin rate and cost price)
 				if (! empty($price_ht)) {
@@ -677,7 +723,7 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 					if (empty($newlang) && GETPOST('lang_id'))
 						$newlang = GETPOST('lang_id');
 					if (empty($newlang))
-						$newlang = $object->client->default_lang;
+						$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -722,8 +768,8 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 		$date_end = dol_mktime(0, 0, 0, GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
 
 		// Local Taxes
-		$localtax1_tx = get_localtax($tva_tx, 1, $object->client);
-		$localtax2_tx = get_localtax($tva_tx, 2, $object->client);
+		$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
+		$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
 		$info_bits = 0;
 		if ($tva_npr)
@@ -744,30 +790,30 @@ else if ($action == 'addline' && $user->rights->propal->creer) {
 					$outputlangs = $langs;
 					if (! empty($conf->global->MAIN_MULTILANGS)) {
 						$outputlangs = new Translate("", $conf);
-						$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+						$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$ret = $object->fetch($id); // Reload to get new records
-					propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
-				unset($_POST ['prod_entry_mode']);
+				unset($_POST['prod_entry_mode']);
 
-				unset($_POST ['qty']);
-				unset($_POST ['type']);
-				unset($_POST ['remise_percent']);
-				unset($_POST ['price_ht']);
-				unset($_POST ['price_ttc']);
-				unset($_POST ['tva_tx']);
-				unset($_POST ['product_ref']);
-				unset($_POST ['product_label']);
-				unset($_POST ['product_desc']);
-				unset($_POST ['fournprice']);
-				unset($_POST ['buying_price']);
-				unset($_POST ['np_marginRate']);
-				unset($_POST ['np_markRate']);
-				unset($_POST ['dp_desc']);
-				unset($_POST ['idprod']);
+				unset($_POST['qty']);
+				unset($_POST['type']);
+				unset($_POST['remise_percent']);
+				unset($_POST['price_ht']);
+				unset($_POST['price_ttc']);
+				unset($_POST['tva_tx']);
+				unset($_POST['product_ref']);
+				unset($_POST['product_label']);
+				unset($_POST['product_desc']);
+				unset($_POST['fournprice']);
+				unset($_POST['buying_price']);
+				unset($_POST['np_marginRate']);
+				unset($_POST['np_markRate']);
+				unset($_POST['dp_desc']);
+				unset($_POST['idprod']);
 
 		    	unset($_POST['date_starthour']);
 		    	unset($_POST['date_startmin']);
@@ -803,8 +849,8 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
 	// Define vat_rate
 	$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 	$vat_rate = str_replace('*', '', $vat_rate);
-	$localtax1_rate = get_localtax($vat_rate, 1, $object->client);
-	$localtax2_rate = get_localtax($vat_rate, 2, $object->client);
+	$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
+	$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
 	$pu_ht = GETPOST('price_ht');
 
 	// Add buying price
@@ -822,7 +868,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
 	if (is_array($extralabelsline)) {
 		// Get extra fields
 		foreach ($extralabelsline as $key => $value) {
-			unset($_POST ["options_" . $key]);
+			unset($_POST["options_" . $key]);
 		}
 	}
 
@@ -839,8 +885,8 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
 		$type = $product->type;
 
 		$price_min = $product->price_min;
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->client->price_level))
-			$price_min = $product->multiprices_min [$object->client->price_level];
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+			$price_min = $product->multiprices_min [$object->thirdparty->price_level];
 
 		$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
@@ -872,25 +918,25 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
 				$outputlangs = $langs;
 				if (! empty($conf->global->MAIN_MULTILANGS)) {
 					$outputlangs = new Translate("", $conf);
-					$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+					$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$ret = $object->fetch($id); // Reload to get new records
-				propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
-			unset($_POST ['qty']);
-			unset($_POST ['type']);
-			unset($_POST ['productid']);
-			unset($_POST ['remise_percent']);
-			unset($_POST ['price_ht']);
-			unset($_POST ['price_ttc']);
-			unset($_POST ['tva_tx']);
-			unset($_POST ['product_ref']);
-			unset($_POST ['product_label']);
-			unset($_POST ['product_desc']);
-			unset($_POST ['fournprice']);
-			unset($_POST ['buying_price']);
+			unset($_POST['qty']);
+			unset($_POST['type']);
+			unset($_POST['productid']);
+			unset($_POST['remise_percent']);
+			unset($_POST['price_ht']);
+			unset($_POST['price_ttc']);
+			unset($_POST['tva_tx']);
+			unset($_POST['product_ref']);
+			unset($_POST['product_label']);
+			unset($_POST['product_desc']);
+			unset($_POST['fournprice']);
+			unset($_POST['buying_price']);
 		} else {
 			$db->rollback();
 
@@ -914,11 +960,11 @@ else if ($action == 'builddoc' && $user->rights->propal->creer) {
 	$outputlangs = $langs;
 	if (! empty($conf->global->MAIN_MULTILANGS)) {
 		$outputlangs = new Translate("", $conf);
-		$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+		$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
 		$outputlangs->setDefaultLang($newlang);
 	}
 	$ret = $object->fetch($id); // Reload to get new records
-	$result = propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 	if ($result <= 0) {
 		dol_print_error($db, $result);
@@ -947,17 +993,17 @@ else if ($action == 'remove_file' && $user->rights->propal->creer) {
 
 // Set project
 else if ($action == 'classin' && $user->rights->propal->creer) {
-	$object->setProject($_POST ['projectid']);
+	$object->setProject($_POST['projectid']);
 }
 
 // Delai de livraison
 else if ($action == 'setavailability' && $user->rights->propal->creer) {
-	$result = $object->availability($_POST ['availability_id']);
+	$result = $object->availability($_POST['availability_id']);
 }
 
 // Origine de la propale
 else if ($action == 'setdemandreason' && $user->rights->propal->creer) {
-	$result = $object->demand_reason($_POST ['demand_reason_id']);
+	$result = $object->demand_reason($_POST['demand_reason_id']);
 }
 
 // Conditions de reglement
@@ -966,11 +1012,11 @@ else if ($action == 'setconditions' && $user->rights->propal->creer) {
 }
 
 else if ($action == 'setremisepercent' && $user->rights->propal->creer) {
-	$result = $object->set_remise_percent($user, $_POST ['remise_percent']);
+	$result = $object->set_remise_percent($user, $_POST['remise_percent']);
 }
 
 else if ($action == 'setremiseabsolue' && $user->rights->propal->creer) {
-	$result = $object->set_remise_absolue($user, $_POST ['remise_absolue']);
+	$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
 }
 
 // Mode de reglement
@@ -978,6 +1024,16 @@ else if ($action == 'setmode' && $user->rights->propal->creer) {
 	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 }
 
+// bank account
+else if ($action == 'setbankaccount' && $user->rights->propal->creer) {
+    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+}
+
+// shipping method
+else if ($action == 'setshippingmethod' && $user->rights->propal->creer) {
+    $result=$object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+}
+
 /*
  * Ordonnancement des lignes
 */
@@ -990,11 +1046,11 @@ else if ($action == 'up' && $user->rights->propal->creer) {
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
 			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret = $object->fetch($id); // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id . '#' . GETPOST('rowid'));
@@ -1009,11 +1065,11 @@ else if ($action == 'down' && $user->rights->propal->creer) {
 		$outputlangs = $langs;
 		if (! empty($conf->global->MAIN_MULTILANGS)) {
 			$outputlangs = new Translate("", $conf);
-			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->client->default_lang);
+			$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret = $object->fetch($id); // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id . '#' . GETPOST('rowid'));
@@ -1046,11 +1102,13 @@ else if ($action == 'down' && $user->rights->propal->creer) {
 		$action = 'edit_extras';
 }
 
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal->creer) {
-	if ($action == 'addcontact') {
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->propal->creer)
+{
+	if ($action == 'addcontact')
+	{
 		if ($object->id > 0) {
 			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, $_POST ["type"], $_POST ["source"]);
+			$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
 		}
 
 		if ($result >= 0) {
@@ -1104,13 +1162,71 @@ $companystatic = new Societe($db);
 $now = dol_now();
 
 // Add new proposal
-if ($action == 'create') {
+if ($action == 'create')
+{
 	print_fiche_titre($langs->trans("NewProp"));
 
 	$soc = new Societe($db);
 	if ($socid > 0)
 		$res = $soc->fetch($socid);
 
+	// Load objectsrc
+	if (! empty($origin) && ! empty($originid))
+	{
+		// Parse element/subelement (ex: project_task)
+		$element = $subelement = $origin;
+		if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
+			$element = $regs [1];
+			$subelement = $regs [2];
+		}
+
+		if ($element == 'project') {
+			$projectid = $originid;
+		} else {
+			// For compatibility
+			if ($element == 'order' || $element == 'commande') {
+				$element = $subelement = 'commande';
+			}
+			if ($element == 'propal') {
+				$element = 'comm/propal';
+				$subelement = 'propal';
+			}
+			if ($element == 'contract') {
+				$element = $subelement = 'contrat';
+			}
+			if ($element == 'shipping') {
+				$element = $subelement = 'expedition';
+			}
+
+			dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+
+			$classname = ucfirst($subelement);
+			$objectsrc = new $classname($db);
+			$objectsrc->fetch($originid);
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
+			{
+				$objectsrc->fetch_lines();
+			}
+			$objectsrc->fetch_thirdparty();
+
+			$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
+			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
+			$ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : '');
+
+			$soc = $objectsrc->thirdparty;
+
+			$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));
+			$remise_percent 	= (! empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(! empty($soc->remise_percent)?$soc->remise_percent:0));
+			$remise_absolue 	= (! empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(! empty($soc->remise_absolue)?$soc->remise_absolue:0));
+			$dateinvoice		= (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice);
+
+			// Replicate extrafields
+			$objectsrc->fetch_optionals($originid);
+			$object->array_options = $objectsrc->array_options;
+		}
+	}
+
 	$object = new Propal($db);
 
 	print '<form name="addprop" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
@@ -1147,12 +1263,16 @@ if ($action == 'create') {
 	}
 	print '</tr>' . "\n";
 
-	// Contacts
-	if ($socid > 0) {
+	// Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice.
+	if ($socid > 0)
+	{
 		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
-		$form->select_contacts($soc->id, $setcontact, 'contactidp', 1, $srccontactslist);
+		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
+	}
 
+	if ($socid > 0)
+	{
 		// Ligne info remises tiers
 		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
 		if ($soc->remise_percent)
@@ -1187,6 +1307,13 @@ if ($action == 'create') {
 	$form->select_types_paiements($soc->mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
+    // Bank Account
+    if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled) {
+        print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+        $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+        print '</td></tr>';
+    }
+
 	// What trigger creation
 	print '<tr><td>' . $langs->trans('Source') . '</td><td>';
 	$form->selectInputReason('', 'demand_reason_id', "SRC_PROP", 1);
@@ -1197,6 +1324,13 @@ if ($action == 'create') {
 	$form->selectAvailabilityDelay('', 'availability_id', '', 1);
 	print '</td></tr>';
 
+    // Shipping Method
+    if (! empty($conf->expedition->enabled)) {
+        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td colspan="2">';
+        print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
+        print '</td></tr>';
+    }
+
 	// Delivery date (or manufacturing)
 	print '<tr><td>' . $langs->trans("DeliveryDate") . '</td>';
 	print '<td colspan="2">';
@@ -1234,7 +1368,7 @@ if ($action == 'create') {
 		$numprojet = $formproject->select_projects($soc->id, $projectid);
 		if ($numprojet == 0) {
 			$langs->load("projects");
-			print ' &nbsp; <a href="../projet/fiche.php?socid=' . $soc->id . '&action=create">' . $langs->trans("AddProject") . '</a>';
+			print ' &nbsp; <a href="../projet/card.php?socid=' . $soc->id . '&action=create">' . $langs->trans("AddProject") . '</a>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -1249,16 +1383,62 @@ if ($action == 'create') {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
-	print "</table>";
+
+	// Lines from source
+	if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
+	{
+		// TODO for compatibility
+		if ($origin == 'contrat') {
+			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
+			$objectsrc->remise_absolue = $remise_absolue;
+			$objectsrc->remise_percent = $remise_percent;
+			$objectsrc->update_price(1, - 1, 1);
+		}
+
+		print "\n<!-- " . $classname . " info -->";
+		print "\n";
+		print '<input type="hidden" name="amount"         value="' . $objectsrc->total_ht . '">' . "\n";
+		print '<input type="hidden" name="total"          value="' . $objectsrc->total_ttc . '">' . "\n";
+		print '<input type="hidden" name="tva"            value="' . $objectsrc->total_tva . '">' . "\n";
+		print '<input type="hidden" name="origin"         value="' . $objectsrc->element . '">';
+		print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';
+
+		$newclassname = $classname;
+		if ($newclassname == 'Propal')
+			$newclassname = 'CommercialProposal';
+		elseif ($newclassname == 'Commande')
+			$newclassname = 'Order';
+		elseif ($newclassname == 'Expedition')
+			$newclassname = 'Sending';
+		elseif ($newclassname == 'Fichinter')
+			$newclassname = 'Intervention';
+
+		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0 ) 		// Localtax1
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1) . "</td></tr>";
+		}
+
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2) . "</td></tr>";
+		}
+		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
+	}
+
+	print "</table>\n";
+
+
 	print '<br>';
 
+
 	/*
 	 * Combobox pour la fonction de copie
  	 */
 
-	if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
-		print '<input type="hidden" name="createmode" value="empty">';
-	}
+	if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) print '<input type="hidden" name="createmode" value="empty">';
 
 	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<table>';
 	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
@@ -1302,7 +1482,8 @@ if ($action == 'create') {
 		print '<td valign="top" colspan="2">' . $langs->trans("CreateEmptyPropal") . '</td></tr>';
 	}
 
-	if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) {
+	if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
+	{
 		print '<tr><td colspan="3">';
 		if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
 			$lib = $langs->trans("ProductsAndServices");
@@ -1331,6 +1512,7 @@ if ($action == 'create') {
 	}
 	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE) || ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '</table><br>';
 
+
 	$langs->load("bills");
 	print '<center>';
 	print '<input type="submit" class="button" value="' . $langs->trans("CreateDraft") . '">';
@@ -1338,6 +1520,22 @@ if ($action == 'create') {
 	print '</center>';
 
 	print "</form>";
+
+
+	// Show origin lines
+	if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
+		print '<br>';
+
+		$title = $langs->trans('ProductsAndServices');
+		print_titre($title);
+
+		print '<table class="noborder" width="100%">';
+
+		$objectsrc->printOriginLinesList();
+
+		print '</table>';
+	}
+
 } else {
 	/*
 	 * Show object in view mode
@@ -1389,7 +1587,7 @@ if ($action == 'create') {
 			$numref = $object->getNextNumRef($soc);
 			if (empty($numref)) {
 				$error ++;
-				dol_htmloutput_errors($object->error);
+				setEventMessage($object->error, 'errors');
 			}
 		} else {
 			$numref = $object->ref;
@@ -1595,6 +1793,25 @@ if ($action == 'create') {
 	print '</td>';
 	print '</tr>';
 
+    // Shipping Method
+    if (! empty($conf->expedition->enabled)) {
+        print '<tr><td>';
+        print '<table width="100%" class="nobordernopadding"><tr><td>';
+        print $langs->trans('SendingMethod');
+        print '</td>';
+        if ($action != 'editshippingmethod' && $user->rights->propal->creer)
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="3">';
+        if ($action == 'editshippingmethod') {
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+        } else {
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+        }
+        print '</td>';
+        print '</tr>';
+    }
+
 	// Origin of demand
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -1652,7 +1869,7 @@ if ($action == 'create') {
 				print '<td colspan="3">';
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
-				print '<a href="../projet/fiche.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+				print '<a href="../projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
 				print $proj->ref;
 				print '</a>';
 				print '</td>';
@@ -1663,7 +1880,8 @@ if ($action == 'create') {
 		print '</tr>';
 	}
 
-	if ($soc->outstanding_limit) {
+	if ($soc->outstanding_limit)
+	{
 		// Outstanding Bill
 		print '<tr><td>';
 		print $langs->trans('OutstandingBill');
@@ -1674,53 +1892,30 @@ if ($action == 'create') {
 		print '</tr>';
 	}
 
-	// Other attributes (TODO Move this into an include)
-	$res = $object->fetch_optionals($object->id, $extralabels);
-	$parameters = array('colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified
-	                                                                                           // by
-	                                                                                           // hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-		foreach ($extrafields->attribute_label as $key => $label) {
-			if ($action == 'edit_extras') {
-				$value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]);
-			} else {
-				$value = $object->array_options ["options_" . $key];
-			}
-			if ($extrafields->attribute_type [$key] == 'separate') {
-				print $extrafields->showSeparator($key);
-			} else {
-				print '<tr><td';
-				if (! empty($extrafields->attribute_required [$key]))
-					print ' class="fieldrequired"';
-				print '>' . $label . '</td><td colspan="5">';
-				// 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 ($action == 'edit_extras' && $user->rights->propal->creer && GETPOST('attribute') == $key) {
-					print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formsoc">';
-					print '<input type="hidden" name="action" value="update_extras">';
-					print '<input type="hidden" name="attribute" value="' . $key . '">';
-					print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-					print '<input type="hidden" name="id" value="' . $object->id . '">';
-
-					print $extrafields->showInputField($key, $value);
-
-					print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-
-					print '</form>';
-				} else {
-					print $extrafields->showOutputField($key, $value);
-					if ($object->statut == 0 && $user->rights->propal->creer)
-						print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . '</a>';
-				}
-				print '</td></tr>' . "\n";
-			}
-		}
+	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && $conf->banque->enabled)
+	{
+	    // Bank Account
+	    print '<tr><td>';
+	    print '<table width="100%" class="nobordernopadding"><tr><td>';
+	    print $langs->trans('BankAccount');
+	    print '</td>';
+	    if ($action != 'editbankaccount' && $user->rights->propal->creer)
+	        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+	    print '</tr></table>';
+	    print '</td><td colspan="3">';
+	    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 '</td>';
+	    print '</tr>';
 	}
 
+	// Other attributes
+	$cols = 3;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
 	// Amount HT
 	print '<tr><td height="10" width="25%">' . $langs->trans('AmountHT') . '</td>';
 	print '<td align="right" class="nowrap"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
@@ -1740,13 +1935,13 @@ if ($action == 'create') {
 	print '<td></td></tr>';
 
 	// Amount Local Taxes
-	if ($mysoc->localtax1_assuj == "1") 	// Localtax1
+	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 	// Localtax1
 	{
 		print '<tr><td height="10">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
 		print '<td align="right" class="nowrap">' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
 		print '<td></td></tr>';
 	}
-	if ($mysoc->localtax2_assuj == "1") 	// Localtax2
+	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 	// Localtax2
 	{
 		print '<tr><td height="10">' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
 		print '<td align="right" class="nowrap">' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
@@ -1805,7 +2000,7 @@ if ($action == 'create') {
 		{
 			$var = true;
 
-			// Add free products/services
+			// Add products/services form
 			$object->formAddObjectLine(1, $mysoc, $soc);
 
 			$parameters = array();
@@ -1871,7 +2066,7 @@ if ($action == 'create') {
 				                                                                                      // else on
 				                                                                                      // page.
 				{
-					print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/fiche.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a>';
+					print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a>';
 				}
 				// Edit
 				if ($object->statut == 1 && $user->rights->propal->creer) {
@@ -1879,7 +2074,7 @@ if ($action == 'create') {
 				}
 
 				// ReOpen
-				if (($object->statut == 2 || $object->statut == 3) && $user->rights->propal->cloturer) {
+				if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->propal->cloturer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=reopen' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"';
 					print '>' . $langs->trans('ReOpen') . '</a></div>';
 				}
@@ -1895,7 +2090,7 @@ if ($action == 'create') {
 				// Create an order
 				if (! empty($conf->commande->enabled) && $object->statut == 2) {
 					if ($user->rights->commande->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/commande/fiche.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddOrder") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/commande/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddOrder") . '</a></div>';
 					}
 				}
 
@@ -1904,18 +2099,20 @@ if ($action == 'create') {
 					$langs->load("contracts");
 
 					if ($user->rights->contrat->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/contrat/fiche.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/contrat/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a></div>';
 					}
 				}
 
 				// 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 '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddBill") . '</a></div>';
 					}
 
-					$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 '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled&amp;socid=' . $object->socid . '">' . $langs->trans("ClassifyBilled") . '</a></div>';
 					}
 				}
@@ -1984,26 +2181,31 @@ if ($action == 'create') {
  	 */
 	if ($action == 'presend')
 	{
+		$object->fetch_projet();
+
 		$ref = dol_sanitizeFileName($object->ref);
 		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 		$fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref, '/'));
 		$file = $fileparams ['fullname'];
 
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->thirdparty->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('commercial');
+		}
+
 		// Build document if it not exists
 		if (! $file || ! is_readable($file)) {
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->client->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-
-			$result = propale_pdf_create($db, $object, GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0) {
 				dol_print_error($db, $result);
 				exit();
@@ -2018,6 +2220,7 @@ if ($action == 'create') {
 		// Create form object
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
 		$formmail->fromtype = 'user';
 		$formmail->fromid = $user->id;
 		$formmail->fromname = $user->getFullName($langs);
@@ -2030,9 +2233,9 @@ if ($action == 'create') {
 		$formmail->withtocc = $liste;
 		$formmail->withtoccc = (! empty($conf->global->MAIN_EMAIL_USECCC) ? $conf->global->MAIN_EMAIL_USECCC : false);
 		if (empty($object->ref_client)) {
-			$formmail->withtopic = $langs->trans('SendPropalRef', '__PROPREF__');
+			$formmail->withtopic = $outputlangs->trans('SendPropalRef', '__PROPREF__');
 		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $langs->trans('SendPropalRef', '__PROPREF__(__REFCLIENT__)');
+			$formmail->withtopic = $outputlangs->trans('SendPropalRef', '__PROPREF__ (__REFCLIENT__)');
 		}
 		$formmail->withfile = 2;
 		$formmail->withbody = 1;
@@ -2040,11 +2243,13 @@ if ($action == 'create') {
 		$formmail->withcancel = 1;
 
 		// Tableau des substitutions
-		$formmail->substit ['__PROPREF__'] = $object->ref;
-		$formmail->substit ['__SIGNATURE__'] = $user->signature;
-		$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
-		$formmail->substit ['__PERSONALIZED__'] = '';
-		$formmail->substit ['__CONTACTCIVNAME__'] = '';
+		$formmail->substit['__PROPREF__'] = $object->ref;
+		$formmail->substit['__SIGNATURE__'] = $user->signature;
+		$formmail->substit['__REFCLIENT__'] = $object->ref_client;
+		$formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name;
+		$formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+		$formmail->substit['__PERSONALIZED__'] = '';
+		$formmail->substit['__CONTACTCIVNAME__'] = '';
 
 		// Find the good contact adress
 		$custcontact = '';
@@ -2053,7 +2258,7 @@ if ($action == 'create') {
 
 		if (is_array($contactarr) && count($contactarr) > 0) {
 			foreach ($contactarr as $contact) {
-				if ($contact ['libelle'] == $langs->trans('TypeContact_propal_external_CUSTOMER')) {
+				if ($contact ['libelle'] == $langs->trans('TypeContact_propal_external_CUSTOMER')) {	// TODO Use code and not label
 					$contactstatic = new Contact($db);
 					$contactstatic->fetch($contact ['id']);
 					$custcontact = $contactstatic->getFullName($langs, 1);
@@ -2061,15 +2266,15 @@ if ($action == 'create') {
 			}
 
 			if (! empty($custcontact)) {
-				$formmail->substit ['__CONTACTCIVNAME__'] = $custcontact;
+				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
 			}
 		}
 
 		// Tableau des parametres complementaires
-		$formmail->param ['action'] = 'send';
-		$formmail->param ['models'] = 'propal_send';
-		$formmail->param ['id'] = $object->id;
-		$formmail->param ['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+		$formmail->param['action'] = 'send';
+		$formmail->param['models'] = 'propal_send';
+		$formmail->param['id'] = $object->id;
+		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
 		// Init list of files
 		if (GETPOST("mode") == 'init') {
 			$formmail->clear_attached_files();
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index ce80783c731..87281e7ea63 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -3,7 +3,8 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014      Frederic France      <frederic.france@free.fr>
  *
  * 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 '<table class="border" width="100%">';
+        print '<table class="border" width="100%">';
 
-		// Ref
-		print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="5">'.$object->ref.'</td></tr>';
+        // Ref
+        print '<tr><td width="25%">'.$langs->trans('Ref').'</td>';
+        print '<td colspan="5">'.$object->ref.'</td>';
+        print '</tr>';
 
-		// Ref client
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
-		print $langs->trans('RefCustomer').'</td><td align="left">';
-		print '</td>';
-		print '</tr></table>';
-		print '</td><td colspan="5">';
-		print $object->ref_client;
-		print '</td>';
-		print '</tr>';
+        // Ref client
+        print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
+        print '<td colspan="5">'.$object->ref_client.'</td>';
+        print '</tr>';
 
-		$rowspan=2;
 
-		// Tiers
-		print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$soc->getNomUrl(1).'</td>';
-		print '</tr>';
+        // Thirdparty
+        print '<tr><td>'.$langs->trans('Company').'</td>';
+        print '<td colspan="5">'.$soc->getNomUrl(1).'</td>';
+        print '</tr>';
 
-		// Ligne info remises tiers
+        // Status
+        print '<tr><td>'.$langs->trans("Status").'</td>';
+        print '<td colspan="5">'.$object->getLibStatut(4).'</td>';
+        print '</tr>';
+
+        // Discount
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
 		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 '</td></tr>';
+        print '.</td>';
+        print '</tr>';
 
-		// ligne
-		// partie Gauche
-		print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
-		print dol_print_date($object->date,'daytext');
-		print '</td>';
+        // Date
+        print '<tr><td>'.$langs->trans('Date').'</td>';
+        print '<td>'.dol_print_date($object->date,'daytext').'</td>';
 
-		// partie Droite sur $rowspan lignes
-		print '<td colspan="2" rowspan="'.$rowspan.'" valign="top" width="50%">';
+        // Right part with $rowspan lines
+        $rowspan=4;
+        print '<td rowspan="'.$rowspan.'" valign="top" width="50%">';
 
-		/*
-		 * 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 '<table class="border" width="100%">';
+            print '<table class="nobordernopadding" width="100%">';
+            print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Documents").'</td></tr>';
 
-			print "<tr ".$bc[$var]."><td>".$langs->trans("Propal")." PDF</td>";
+            print '<tr '.$bc[$var].'><td>'.$langs->trans("Proposal").' PDF</td>';
 
 			print '<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=propal&file='.urlencode($relativepath).'">'.$object->ref.'.pdf</a></td>';
 
@@ -166,13 +159,25 @@ if ($id > 0 || ! empty($ref))
 			}
 		}
 
-		print "</td>";
-		print '</tr>';
+        print '</td>';
+        print '</tr>';
 
-		print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>';
-		print '<td align="right" colspan="2"><b>'.price($object->price).'</b></td>';
-		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-		print '</table>';
+        // Total HT - left part
+        print '<tr><td>'.$langs->trans('AmountHT').'</td>';
+        print '<td align="right" class="nowrap"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
+        print '</tr>';
+
+        // Total VAT - left part
+        print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
+        print '<td align="right" class="nowrap"><b>' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
+        print '</tr>';
+
+        // Total TTC - left part
+        print '<tr><td>'.$langs->trans('AmountTTC').'</td>';
+        print '<td align="right" class="nowrap"><b>' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
+        print '</tr>';
+
+        print '</table>';
 
 		dol_fiche_end();
 	}
@@ -183,10 +188,13 @@ if ($id > 0 || ! empty($ref))
 	}
 }
 
+print '<table class="border" width="100%">';
+print '<tr><td>';
+print '<div class="photolist">';
 // Si fichier png PDF d'1 page trouve
 if (file_exists($fileimage))
 {
-	print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&file='.urlencode($relativepathimage).'">';
+	print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&amp;file='.urlencode($relativepathimage).'">';
 }
 // Si fichier png PDF de plus d'1 page trouve
 elseif (file_exists($fileimagebis))
@@ -199,13 +207,15 @@ elseif (file_exists($fileimagebis))
 
 		if (file_exists($dir_output.$preview))
 		{
-			print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&file='.urlencode($preview).'"><p>';
+			print '<img class="photo photowithmargin" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercupropal&amp;file='.urlencode($preview).'"><p>';
 		}
 	}
 }
-
 print '</div>';
+print '</td></tr>';
+print '</table>';
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/comm/propal/class/index.html b/htdocs/comm/propal/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 846bb5acb10..589afedd00c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -6,10 +6,11 @@
  * Copyright (C) 2005-2013 Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2013 Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2010-2011 Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2014 Christophe Battarel  	<christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Marcos García            <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,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
@@ -79,6 +85,7 @@ class Propal extends CommonObject
 
     var $cond_reglement_id;
     var $cond_reglement_code;
+    var $fk_account;				// Id of bank account
     var $mode_reglement_id;
     var $mode_reglement_code;
     var $remise;
@@ -91,6 +98,7 @@ class Propal extends CommonObject
     var $fk_address;
     var $address_type;
     var $address;
+    var $shipping_method_id;
     var $availability_id;
     var $availability_code;
     var $demand_reason_id;
@@ -355,7 +363,7 @@ class Propal extends CommonObject
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
 
             $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, '', $localtaxes_type);
             $total_ht  = $tabprice[0];
@@ -451,7 +459,6 @@ class Propal extends CommonObject
                 else
                 {
                     $this->error=$this->db->error();
-                    dol_syslog("Error sql=$sql, error=".$this->error,LOG_ERR);
                     $this->db->rollback();
                     return -1;
                 }
@@ -518,7 +525,7 @@ class Propal extends CommonObject
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
 
             $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type,'', $localtaxes_type);
             $total_ht  = $tabprice[0];
@@ -613,7 +620,6 @@ class Propal extends CommonObject
             {
                 $this->error=$this->db->error();
                 $this->db->rollback();
-                dol_syslog(get_class($this)."::updateline Error=".$this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -666,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;
@@ -732,8 +738,10 @@ class Propal extends CommonObject
         $sql.= ", fin_validite";
         $sql.= ", fk_cond_reglement";
         $sql.= ", fk_mode_reglement";
+        $sql.= ", fk_account";
         $sql.= ", ref_client";
         $sql.= ", date_livraison";
+        $sql.= ", fk_shipping_method";
         $sql.= ", fk_availability";
         $sql.= ", fk_input_reason";
         $sql.= ", fk_projet";
@@ -757,15 +765,17 @@ class Propal extends CommonObject
         $sql.= ", ".($this->fin_validite!=''?"'".$this->db->idate($this->fin_validite)."'":"null");
         $sql.= ", ".$this->cond_reglement_id;
         $sql.= ", ".$this->mode_reglement_id;
+        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
         $sql.= ", '".$this->db->escape($this->ref_client)."'";
         $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null");
+        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
         $sql.= ", ".$this->availability_id;
         $sql.= ", ".$this->demand_reason_id;
         $sql.= ", ".($this->fk_project?$this->fk_project:"null");
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -776,7 +786,7 @@ class Propal extends CommonObject
                 $this->ref='(PROV'.$this->id.')';
                 $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->ref."' WHERE rowid=".$this->id;
 
-                dol_syslog(get_class($this)."::create sql=".$sql);
+                dol_syslog(get_class($this)."::create", LOG_DEBUG);
                 $resql=$this->db->query($sql);
                 if (! $resql) $error++;
 
@@ -857,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'));
@@ -877,24 +889,22 @@ class Propal extends CommonObject
 
                         if (! $notrigger)
                         {
-                            // Appel des triggers
-                            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                            $interface=new Interfaces($this->db);
-                            $result=$interface->run_triggers('PROPAL_CREATE',$this,$user,$langs,$conf);
-                            if ($result < 0) {
-                                $error++; $this->errors=$interface->errors;
-                            }
-                            // Fin appel triggers
+                            // Call trigger
+                            $result=$this->call_trigger('PROPAL_CREATE',$user);
+                            if ($result < 0) { $error++; }
+                            // End call triggers
                         }
                     }
                     else
-                    {
+					{
+                        $this->error=$this->db->lasterror();
                         $error++;
                     }
                 }
             }
             else
-            {
+			{
+                $this->error=$this->db->lasterror();
                 $error++;
             }
 
@@ -906,16 +916,13 @@ class Propal extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::create -2 ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
         }
         else
         {
-            $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::create -1 ".$this->error, LOG_ERR);
+            $this->error=$this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -933,7 +940,7 @@ class Propal extends CommonObject
     {
         $this->products=$this->lines;
 
-        return $this->create();
+        return $this->create($user);
     }
 
     /**
@@ -1033,14 +1040,10 @@ class Propal extends CommonObject
                 if ($reshook < 0) $error++;
             }
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('PROPAL_CLONE',$this,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++; $this->errors=$interface->errors;
-            }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('PROPAL_CLONE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
         }
 
         // End
@@ -1083,6 +1086,8 @@ class Propal extends CommonObject
         $sql.= ", p.fk_input_reason";
         $sql.= ", p.fk_cond_reglement";
         $sql.= ", p.fk_mode_reglement";
+        $sql.= ', p.fk_account';
+        $sql.= ", p.fk_shipping_method";
         $sql.= ", c.label as statut_label";
         $sql.= ", ca.code as availability_code, ca.label as availability";
         $sql.= ", dr.code as demand_reason_code, dr.label as demand_reason";
@@ -1098,7 +1103,7 @@ class Propal extends CommonObject
         if ($ref) $sql.= " AND p.ref='".$ref."'";
         else $sql.= " AND p.rowid=".$rowid;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -1136,6 +1141,7 @@ class Propal extends CommonObject
                 $this->datep                = $this->db->jdate($obj->dp);    // deprecated
                 $this->fin_validite         = $this->db->jdate($obj->dfv);
                 $this->date_livraison       = $this->db->jdate($obj->date_livraison);
+                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
                 $this->availability_id      = $obj->fk_availability;
                 $this->availability_code    = $obj->availability_code;
                 $this->availability         = $obj->availability;
@@ -1147,6 +1153,7 @@ class Propal extends CommonObject
                 $this->mode_reglement_id    = $obj->fk_mode_reglement;
                 $this->mode_reglement_code  = $obj->mode_reglement_code;
                 $this->mode_reglement       = $obj->mode_reglement;
+                $this->fk_account           = ($obj->fk_account>0)?$obj->fk_account:null;
                 $this->cond_reglement_id    = $obj->fk_cond_reglement;
                 $this->cond_reglement_code  = $obj->cond_reglement_code;
                 $this->cond_reglement       = $obj->cond_reglement;
@@ -1249,7 +1256,6 @@ class Propal extends CommonObject
                 else
                 {
                     $this->error=$this->db->error();
-                    dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
                     return -1;
                 }
 
@@ -1269,7 +1275,6 @@ class Propal extends CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -1282,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'));
@@ -1344,71 +1351,77 @@ class Propal extends CommonObject
           {
             	$num = $this->ref;
             }
+            $this->newref = $num;
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
             $sql.= " SET ref = '".$num."',";
             $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
             $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-            dol_syslog(get_class($this).'::valid sql='.$sql);
-            if ($this->db->query($sql))
+            dol_syslog(get_class($this)."::valid", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				dol_print_error($this->db);
+				$error++;
+			}
+
+   			// Trigger calls
+			if (! $error && ! $notrigger)
+			{
+                // Call trigger
+                $result=$this->call_trigger('PROPAL_VALIDATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+
+            if (! $error)
             {
-                if (! $notrigger)
-                {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('PROPAL_VALIDATE',$this,$user,$langs,$conf);
-                    if ($result < 0) {
-                        $error++; $this->errors=$interface->errors;
-                    }
-                    // Fin appel triggers
-                }
+            	$this->oldref = $this->ref;
 
-            	if (! $error)
-				{
-					// Rename directory if dir was a temporary ref
-					if (preg_match('/^[\(]?PROV/i', $this->ref))
-					{
-						// Rename of propal directory ($this->ref = old ref, $num = new ref)
-						// to  not lose the linked files
-						$oldref = dol_sanitizeFileName($this->ref);
-						$newref = dol_sanitizeFileName($num);
-						$dirsource = $conf->propal->dir_output.'/'.$oldref;
-						$dirdest = $conf->propal->dir_output.'/'.$newref;
-						if (file_exists($dirsource))
-						{
-							dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
+            	// Rename directory if dir was a temporary ref
+            	if (preg_match('/^[\(]?PROV/i', $this->ref))
+            	{
+            		// Rename of propal directory ($this->ref = old ref, $num = new ref)
+            		// to  not lose the linked files
+            		$oldref = dol_sanitizeFileName($this->ref);
+            		$newref = dol_sanitizeFileName($num);
+            		$dirsource = $conf->propal->dir_output.'/'.$oldref;
+            		$dirdest = $conf->propal->dir_output.'/'.$newref;
 
-							if (@rename($dirsource, $dirdest))
-							{
+            		if (file_exists($dirsource))
+            		{
+            			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
+            			if (@rename($dirsource, $dirdest))
+            			{
+            				dol_syslog("Rename ok");
+            				// Rename docs starting with $oldref with $newref
+            				$listoffiles=dol_dir_list($conf->propal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+            				foreach($listoffiles as $fileentry)
+            				{
+            					$dirsource=$fileentry['name'];
+            					$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+            					$dirsource=$fileentry['path'].'/'.$dirsource;
+            					$dirdest=$fileentry['path'].'/'.$dirdest;
+            					@rename($dirsource, $dirdest);
+            				}
+            			}
+            		}
+            	}
 
-								dol_syslog("Rename ok");
-								// Deleting old PDF in new rep
-								dol_delete_file($conf->propal->dir_output.'/'.$newref.'/'.$oldref.'*.*');
-							}
-						}
-					}
+            	$this->ref=$num;
+            	$this->brouillon=0;
+            	$this->statut = 1;
+            	$this->user_valid_id=$user->id;
+            	$this->datev=$now;
 
-					$this->ref=$num;
-                    $this->brouillon=0;
-                    $this->statut = 1;
-                    $this->user_valid_id=$user->id;
-                    $this->datev=$now;
-
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-				{
-                    $this->db->rollback();
-                    return -2;
-                }
+            	$this->db->commit();
+            	return 1;
             }
             else
 			{
-                $this->db->rollback();
-                return -1;
+            	$this->db->rollback();
+            	return -1;
             }
         }
     }
@@ -1435,7 +1448,7 @@ class Propal extends CommonObject
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
             $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-            dol_syslog(get_class($this)."::set_date sql=".$sql);
+            dol_syslog(get_class($this)."::set_date", LOG_DEBUG);
             if ($this->db->query($sql) )
             {
                 $this->date = $date;
@@ -1445,7 +1458,6 @@ class Propal extends CommonObject
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::set_date ".$this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -1472,7 +1484,6 @@ class Propal extends CommonObject
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::set_echeance Erreur SQL".$this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -1625,7 +1636,6 @@ class Propal extends CommonObject
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::set_remise_percent Error sql=$sql");
                 return -1;
             }
         }
@@ -1660,7 +1670,6 @@ class Propal extends CommonObject
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::set_remise_absolue Error sql=$sql");
                 return -1;
             }
         }
@@ -1692,7 +1701,7 @@ class Propal extends CommonObject
 
     	$this->db->begin();
 
-		dol_syslog(get_class($this)."::reopen sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -1701,25 +1710,24 @@ class Propal extends CommonObject
 		{
 			if (! $notrigger)
 			{
-				// Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('PROPAL_REOPEN',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PROPAL_REOPEN',$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);
-			}
+		    if (!empty($this->errors))
+		    {
+    			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;
 		}
@@ -1756,8 +1764,14 @@ class Propal extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
+        	$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
+        	$trigger_name='PROPAL_CLOSE_REFUSED';
+
             if ($statut == 2)
             {
+            	$trigger_name='PROPAL_CLOSE_SIGNED';
+				$modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+
                 // The connected company is classified as a client
                 $soc=new Societe($this->db);
                 $soc->id = $this->socid;
@@ -1769,59 +1783,41 @@ class Propal extends CommonObject
                     $this->db->rollback();
                     return -2;
                 }
+            }
+            if ($statut == 4)
+            {
+            	$trigger_name='PROPAL_CLASSIFY_BILLED';
+            }
 
-                if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-                {
-                	// Define output language
-                	$outputlangs = $langs;
-                	if (! empty($conf->global->MAIN_MULTILANGS))
-                	{
-                		$outputlangs = new Translate("",$conf);
-                		$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->client->default_lang);
-                		$outputlangs->setDefaultLang($newlang);
-                	}
-                	//$ret=$object->fetch($id);    // Reload to get new records
-                	propale_pdf_create($this->db, $this, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                }
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            {
+             	// Define output language
+              	$outputlangs = $langs;
+               	if (! empty($conf->global->MAIN_MULTILANGS))
+               	{
+               		$outputlangs = new Translate("",$conf);
+               		$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->client->default_lang);
+               		$outputlangs->setDefaultLang($newlang);
+               	}
+               	//$ret=$object->fetch($id);    // Reload to get new records
+	               $this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
 
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('PROPAL_CLOSE_SIGNED',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger($trigger_name,$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+
+            if ( ! $error )
+            {
+                $this->db->commit();
+                return 1;
             }
             else
             {
-
-            	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-            	{
-            		// Define output language
-            		$outputlangs = $langs;
-            		if (! empty($conf->global->MAIN_MULTILANGS))
-            		{
-            			$outputlangs = new Translate("",$conf);
-            			$newlang=(GETPOST('lang_id') ? GETPOST('lang_id') : $this->client->default_lang);
-            			$outputlangs->setDefaultLang($newlang);
-            		}
-            		//$ret=$object->fetch($id);    // Reload to get new records
-            		propale_pdf_create($this->db, $this, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-            	}
-
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('PROPAL_CLOSE_REFUSED',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // Fin appel triggers
+                $this->db->rollback();
+                return -1;
             }
-
-            $this->db->commit();
-            return 1;
         }
         else
         {
@@ -1996,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];
+                        	}
                         }
                     }
                 }
@@ -2018,7 +2017,7 @@ class Propal extends CommonObject
             $sql.= " FROM ".MAIN_DB_PREFIX."facture";
             $sql.= " WHERE rowid IN (".implode(',',$linkedInvoices).")";
 
-            dol_syslog(get_class($this)."::InvoiceArrayList sql=".$sql);
+            dol_syslog(get_class($this)."::InvoiceArrayList", LOG_DEBUG);
             $resql=$this->db->query($sql);
 
             if ($resql)
@@ -2072,15 +2071,11 @@ class Propal extends CommonObject
 
         $this->db->begin();
 
-        if (! $error && ! $notrigger)
+        if (! $notrigger)
         {
-            // Call triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('PROPAL_DELETE',$this,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++; $this->errors=$interface->errors;
-            }
+            // Call trigger
+            $result=$this->call_trigger('PROPAL_DELETE',$user);
+            if ($result < 0) { $error++; }
             // End call triggers
         }
 
@@ -2151,14 +2146,13 @@ 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;
                     }
                     else
                     {
                         $this->error=$this->db->lasterror();
-                        dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
                         $this->db->rollback();
                         return 0;
                     }
@@ -2166,7 +2160,6 @@ class Propal extends CommonObject
                 else
                 {
                     $this->error=$this->db->lasterror();
-                    dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
                     $this->db->rollback();
                     return -3;
                 }
@@ -2174,15 +2167,12 @@ class Propal extends CommonObject
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -2;
             }
         }
         else
         {
-            $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -2560,16 +2550,21 @@ class Propal extends CommonObject
         {
         	$mybool=false;
 
-            $file = $conf->global->PROPALE_ADDON.".php";
-            $classname = $conf->global->PROPALE_ADDON;
+		$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir)
+		{
+	            $file = $conf->global->PROPALE_ADDON.".php";
+	            $classname = $conf->global->PROPALE_ADDON;
+
+	            // Include file with class
+	            foreach ($conf->file->dol_document_root as $dirroot)
+	            {
+	            	$dir = $dirroot.$reldir."/core/modules/propale/";
+	            	// Load file with numbering class (if found)
+	            	$mybool|=@include_once $dir.$file;
+	            }
+		}
 
-            // Include file with class
-            foreach ($conf->file->dol_document_root as $dirroot)
-            {
-            	$dir = $dirroot."/core/modules/propale/";
-            	// Load file with numbering class (if found)
-            	$mybool|=@include_once $dir.$file;
-            }
 
             if (! $mybool)
             {
@@ -2658,7 +2653,7 @@ class Propal extends CommonObject
         $sql.= ' WHERE pt.fk_propal = '.$this->id;
         $sql.= ' ORDER BY pt.rang ASC, pt.rowid';
 
-        dol_syslog(get_class($this).'::getLinesArray sql='.$sql,LOG_DEBUG);
+        dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2709,11 +2704,45 @@ class Propal extends CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::getLinesArray Error sql=$sql, error=".$this->error,LOG_ERR);
             return -1;
         }
     }
 
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 * 	@param	    string		$modele			Force model to use ('' to not force)
+	 * 	@param		Translate	$outputlangs	Object langs to use for output
+	 *  @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,$user,$langs;
+
+		$langs->load("propale");
+
+		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->PROPALE_ADDON_PDF))
+			{
+				$modele = $conf->global->PROPALE_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'azur';
+			}
+		}
+
+		$modelpath = "core/modules/propale/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
+
 }
 
 
@@ -2878,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;
@@ -2946,7 +2975,7 @@ class PropaleLigne  extends CommonObject
         $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
         $sql.= ')';
 
-        dol_syslog(get_class($this).'::insert sql='.$sql, LOG_DEBUG);
+        dol_syslog(get_class($this).'::insert', LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -2964,14 +2993,14 @@ class PropaleLigne  extends CommonObject
 
             if (! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result = $interface->run_triggers('LINEPROPAL_INSERT',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
+                // Call trigger
+                $result=$this->call_trigger('LINEPROPAL_INSERT',$user);
+                if ($result < 0)
+                {
+                    $this->db->rollback();
+                    return -1;
                 }
-                // Fin appel triggers
+                // End call triggers
             }
 
             $this->db->commit();
@@ -2980,7 +3009,6 @@ class PropaleLigne  extends CommonObject
         else
         {
             $this->error=$this->db->error()." sql=".$sql;
-            dol_syslog(get_class($this).'::insert Error '.$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -2999,7 +3027,7 @@ class PropaleLigne  extends CommonObject
         $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
-        dol_syslog("PropaleLigne::delete sql=".$sql, LOG_DEBUG);
+        dol_syslog("PropaleLigne::delete", LOG_DEBUG);
         if ($this->db->query($sql) )
         {
 
@@ -3015,14 +3043,14 @@ class PropaleLigne  extends CommonObject
         		}
         	}
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result = $interface->run_triggers('LINEPROPAL_DELETE',$this,$user,$langs,$conf);
-            if ($result < 0) {
-                $error++; $this->errors=$interface->errors;
+            // Call trigger
+            $result=$this->call_trigger('LINEPROPAL_DELETE',$user);
+            if ($result < 0)
+            {
+                $this->db->rollback();
+                return -1;
             }
-            // Fin appel triggers
+            // End call triggers
 
             $this->db->commit();
 
@@ -3031,7 +3059,6 @@ class PropaleLigne  extends CommonObject
         else
         {
             $this->error=$this->db->error()." sql=".$sql;
-            dol_syslog("PropaleLigne::delete Error ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -3110,7 +3137,7 @@ class PropaleLigne  extends CommonObject
         $sql.= " , date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
         $sql.= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -3126,14 +3153,14 @@ class PropaleLigne  extends CommonObject
 
             if (! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result = $interface->run_triggers('LINEPROPAL_UPDATE',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
+                // Call trigger
+                $result=$this->call_trigger('LINEPROPAL_UPDATE',$user);
+                if ($result < 0)
+                {
+                    $this->db->rollback();
+                    return -1;
                 }
-                // Fin appel triggers
+                // End call triggers
             }
 
             $this->db->commit();
@@ -3142,7 +3169,6 @@ class PropaleLigne  extends CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -2;
         }
@@ -3165,7 +3191,7 @@ class PropaleLigne  extends CommonObject
         $sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
         $sql.= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog("PropaleLigne::update_total sql=$sql");
+        dol_syslog("PropaleLigne::update_total", LOG_DEBUG);
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -3176,7 +3202,6 @@ class PropaleLigne  extends CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog("PropaleLigne::update_total Error ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -2;
         }
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index f89b6bfda86..de51cf63104 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -127,7 +127,7 @@ if ($resql)
             $var=!$var;
             print "<tr ".$bc[$var].">";
             print '<td>'.$propalstatic->LibStatut($status,0).'</td>';
-            print '<td align="right"><a href="liste.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
+            print '<td align="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status])?$vals[$status]:0).'</a></td>';
             print "</tr>\n";
         }
     }
@@ -381,7 +381,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 /*
 if (! empty($conf->propal->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, 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."propal as c";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -399,7 +399,7 @@ if (! empty($conf->propal->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("ProposalsToProcess").' <a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=1">('.$num.')</a></td></tr>';
+		print '<td colspan="3">'.$langs->trans("ProposalsToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1">('.$num.')</a></td></tr>';
 
 		if ($num)
 		{
@@ -433,7 +433,7 @@ if (! empty($conf->propal->enabled))
 
 				print '</td>';
 
-				print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td>';
+				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td>';
 
 				print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
 
@@ -453,7 +453,7 @@ if (! empty($conf->propal->enabled))
  */
 /*if (! empty($conf->propal->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, 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";
@@ -471,7 +471,7 @@ if (! empty($conf->propal->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=2">('.$num.')</a></td></tr>';
+		print '<td colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2">('.$num.')</a></td></tr>';
 
 		if ($num)
 		{
@@ -505,7 +505,7 @@ if (! empty($conf->propal->enabled))
 
 				print '</td>';
 
-				print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
 
 				print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ba0a49f2772..66b36e0320f 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'));
@@ -91,22 +113,8 @@ $hookmanager->initHooks(array('propallist'));
 
 $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='';
-}
 
 
 /*
@@ -131,17 +139,12 @@ $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;
 
 
-$sql = 'SELECT s.rowid, s.nom, s.town, s.client, s.code_client,';
+$sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,';
 $sql.= ' p.rowid as propalid, p.note_private, p.total_ht, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= ' u.login';
@@ -245,7 +248,7 @@ if ($result)
 	if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
 	if ($search_author)  	 $param.='&search_author='.$search_author;
 	if ($search_town)		 $param.='&search_town='.$search_town;
-	print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 
 	// Lignes des champs de filtre
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -321,8 +324,12 @@ if ($result)
 	print '<td class="liste_titre" align="right">';
 	$formpropal->selectProposalStatus($viewstatut,1);
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+
+	print '<td class="liste_titre" align="right">';
+	print '<input type="image" name="button_search" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" name="button_removefilter" class="liste_titre" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
+
 	print "</tr>\n";
 
 	$var=true;
@@ -370,11 +377,11 @@ if ($result)
 		print $objp->ref_client;
 		print '</td>';
 
-		$url = DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->rowid;
+		$url = DOL_URL_ROOT.'/comm/card.php?socid='.$objp->rowid;
 
 		// Company
 		$companystatic->id=$objp->rowid;
-		$companystatic->nom=$objp->nom;
+		$companystatic->name=$objp->name;
 		$companystatic->client=$objp->client;
 		$companystatic->code_client=$objp->code_client;
 		print '<td>';
@@ -388,7 +395,7 @@ if ($result)
 
 		// Date proposal
 		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->dp), 'day');
+		print dol_print_date($db->jdate($objp->dp), 'day');
 		print "</td>\n";
 
 		// Date end validity
diff --git a/htdocs/comm/propal/tpl/index.html b/htdocs/comm/propal/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/comm/prospect/class/index.html b/htdocs/comm/prospect/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 58a384df6d0..3501d94aafd 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -48,7 +48,6 @@ $search_state       = GETPOST("search_state");
 $search_datec       = GETPOST("search_datec");
 $search_categ       = GETPOST("search_categ",'int');
 $search_status		= GETPOST("search_status",'int');
-if ($search_status=='') $search_status=1; // always display activ customer first
 $catid              = GETPOST("catid",'int');
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -154,6 +153,21 @@ $sts = array(-1,0,1,2,3);
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('prospectlist'));
 
+// Do we click on purge search criteria ?
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $socname="";
+	$stcomm="";
+	$search_nom="";
+	$search_zipcode="";
+	$search_town="";
+	$search_state="";
+	$search_datec="";
+	$search_categ="";
+	$search_status="";
+}
+
+if ($search_status=='') $search_status=1; // always display active customer first
 
 /*
  * Actions
@@ -161,6 +175,7 @@ $hookmanager->initHooks(array('prospectlist'));
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if ($action == 'cstc')
 {
@@ -177,7 +192,7 @@ if ($action == 'cstc')
 $formother=new FormOther($db);
 $form=new Form($db);
 
-$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,";
+$sql = "SELECT s.rowid, s.nom as name, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,";
 $sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,";
 $sql.= " d.nom as departement";
 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)
@@ -233,7 +248,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql.= " ORDER BY $sortfield $sortorder, s.nom ASC";
 $sql.= $db->plimit($conf->liste_limit+1, $offset);
 
-dol_syslog('comm/prospect/list.php sql='.$sql,LOG_DEBUG);
+dol_syslog('comm/prospect/list.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -242,7 +257,7 @@ if ($resql)
 	if ($num == 1 && $socname)
 	{
 		$obj = $db->fetch_object($resql);
-		header("Location: fiche.php?socid=".$obj->rowid);
+		header("Location: card.php?socid=".$obj->rowid);
 		exit;
 	}
 	else
@@ -360,7 +375,7 @@ if ($resql)
  	// Print these two select
  	print $langs->trans("From").' <select class="flat" name="search_level_from">'.$options_from.'</select>';
  	print ' ';
- 	print $langs->trans("To").' <select class="flat" name="search_level_to">'.$options_to.'</select>';
+ 	print $langs->trans("to").' <select class="flat" name="search_level_to">'.$options_to.'</select>';
 
     print '</td>';
 
@@ -377,9 +392,9 @@ if ($resql)
     print '</td>';
 
     // Print the search button
-    print '<td class="liste_titre" align="right">';
-	print '<input class="liste_titre" name="button_search" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td>';
+    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print "</td></tr>\n";
 
 	$parameters=array();
 	$formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
@@ -401,7 +416,7 @@ if ($resql)
 		print '<tr '.$bc[$var].'>';
 		print '<td>';
 		$prospectstatic->id=$obj->rowid;
-		$prospectstatic->nom=$obj->nom;
+		$prospectstatic->name=$obj->name;
         $prospectstatic->status=$obj->status;
         $prospectstatic->code_client=$obj->code_client;
         $prospectstatic->client=$obj->client;
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index 1eb30f02b55..5d7358a806e 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -64,8 +64,8 @@ if ($socid > 0)
 
     print '<table class="border" width="100%">';
 
-    // Nom
-    print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
+    // Name
+    print '<tr><td width="20%">'.$langs->trans("Thirdpary").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
 	// Prefix
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index bb079a34169..ec54e553bdb 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -63,8 +63,8 @@ if ($socid > 0)
 
     print '<table class="border" width="100%">';
 
-    // Nom
-    print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
+    // Name
+    print '<tr><td width="20%">'.$langs->trans("Thirdparty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
     // Prefix
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 5fc0c7ec9bb..fe3e39d266d 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -71,7 +71,7 @@ if (GETPOST("action") == 'setremise')
 	}
 	else
 	{
-		$errmesg=$soc->error;
+		setEventMessage($soc->error, 'errors');
 	}
 }
 
@@ -97,8 +97,6 @@ if ($socid > 0)
 	$objsoc->id=$socid;
 	$objsoc->fetch($socid);
 
-	dol_htmloutput_errors($errmesg);
-
 	$head = societe_prepare_head($objsoc);
 
 	dol_fiche_head($head, 'relativediscount', $langs->trans("ThirdParty"),0,'company');
@@ -186,7 +184,7 @@ if ($socid > 0)
 			print '<td>'.dol_print_date($db->jdate($obj->dc),"dayhour").'</td>';
 			print '<td align="center">'.price2num($obj->remise_percent).'%</td>';
 			print '<td align="left">'.$obj->note.'</td>';
-			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
+			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 			print '</tr>';
 			$i++;
 		}
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index db35db04b14..79f952fe7fd 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -65,17 +65,17 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 	if (! $res > 0)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFailedToLoadDiscount").'</div>';
+		setEventMessage($langs->trans("ErrorFailedToLoadDiscount"), 'errors');
 	}
 	if (! $error && price2num($_POST["amount_ttc_1"]+$_POST["amount_ttc_2"]) != $discount->amount_ttc)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("TotalOfTwoDiscountMustEqualsOriginal").'</div>';
+		setEventMessage($langs->trans("TotalOfTwoDiscountMustEqualsOriginal"), 'errors');
 	}
 	if (! $error && $discount->fk_facture_line)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorCantSplitAUsedDiscount").'</div>';
+		setEventMessage($langs->trans("ErrorCantSplitAUsedDiscount"), 'errors');
 	}
 	if (! $error)
 	{
@@ -140,7 +140,7 @@ if ($action == 'setremise')
 		$error=0;
 		if (empty($_POST["desc"]))
 		{
-			$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ReasonDiscount")).'</div>';
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("ReasonDiscount")), 'errors');
 			$error++;
 		}
 
@@ -166,13 +166,13 @@ if ($action == 'setremise')
 			else
 			{
 				$error++;
-				$mesg='<div class="error">'.$soc->error.'</div>';
+				setEventMessage($soc->error, 'errors');
 			}
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")), 'errors');
 	}
 }
 
@@ -194,7 +194,7 @@ if (GETPOST("action") == 'confirm_remove' && GETPOST("confirm")=='yes')
 	}
 	else
 	{
-		$mesg='<div class="error">'.$discount->error.'</div>';
+		setEventMessage($discount->error, 'errors');
 		$db->rollback();
 	}
 }
@@ -211,8 +211,6 @@ llxHeader('',$langs->trans("GlobalDiscount"));
 
 if ($socid > 0)
 {
-	dol_htmloutput_mesg($mesg);
-
 	// On recupere les donnees societes par l'objet
 	$objsoc = new Societe($db);
 	$objsoc->id=$socid;
@@ -369,7 +367,7 @@ if ($socid > 0)
 			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
 			print '<td align="right">'.price($obj->amount_ttc).'</td>';
 			print '<td align="center">';
-			print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
+			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
 			print '</td>';
 			if ($user->rights->societe->creer || $user->rights->facture->creer)
 			{
@@ -526,7 +524,7 @@ if ($socid > 0)
 			print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
 			print '<td align="right">'.price($obj->amount_ttc).'</td>';
 			print '<td align="center">';
-			print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
+			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a>';
 			print '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 97671510bfd..839ca73d5b9 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -167,7 +167,7 @@ if ($id > 0 || ! empty($ref))
         // Client
         print "<tr><td>".$langs->trans("Customer")."</td>";
         print '<td colspan="2">';
-        print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a>';
+        print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->getNomUrl(1).'</a>';
         print '</td>';
         print '</tr>';
 
@@ -206,7 +206,7 @@ if ($id > 0 || ! empty($ref))
 // Si fichier png PDF d'1 page trouve
 if (file_exists($fileimage))
 {
-	print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&file='.urlencode($relativepathimage).'">';
+	print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&file='.urlencode($relativepathimage).'">';
 }
 // Si fichier png PDF de plus d'1 page trouve
 elseif (file_exists($fileimagebis))
@@ -219,13 +219,12 @@ elseif (file_exists($fileimagebis))
 
 		if (file_exists($dir_output.$preview))
 		{
-			print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&file='.urlencode($preview).'"><p>';
+			print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercucommande&file='.urlencode($preview).'"><p>';
 		}
 	}
 }
 
-print '</div>';
-
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
new file mode 100644
index 00000000000..f9f0eed52fd
--- /dev/null
+++ b/htdocs/commande/card.php
@@ -0,0 +1,2375 @@
+<?php
+/* Copyright (C) 2003-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
+ * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
+ * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2013	Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2012		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2014	   Ferran Marcet			<fmarcet@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/commande/card.php
+ * \ingroup commande
+ * \brief Page to show customer order
+ */
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formorder.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
+require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+if (! empty($conf->propal->enabled))
+	require DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+if (! empty($conf->projet->enabled)) {
+	require DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+}
+require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+
+$langs->load('orders');
+$langs->load('sendings');
+$langs->load('companies');
+$langs->load('bills');
+$langs->load('propal');
+$langs->load('deliveries');
+$langs->load('sendings');
+$langs->load('products');
+if (! empty($conf->margin->enabled))
+	$langs->load('margins');
+
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$lineid = GETPOST('lineid', 'int');
+$origin = GETPOST('origin', 'alpha');
+$originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
+
+// PDF
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+
+// Security check
+if (! empty($user->societe_id))
+	$socid = $user->societe_id;
+$result = restrictedArea($user, 'commande', $id);
+
+$object = new Commande($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+if ($id > 0 || ! empty($ref)) {
+	$ret = $object->fetch($id, $ref);
+	$ret = $object->fetch_thirdparty();
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('ordercard','globalcard'));
+
+$permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php
+
+/*
+ * Actions
+ */
+
+$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');
+
+include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
+
+// Action clone object
+if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->commande->creer)
+{
+	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	{
+		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+	}
+	else
+	{
+		if ($object->id > 0)
+		{
+			// Because createFromClone modifies the object, we must clone it so that we can restore it later
+			$orig = dol_clone($object);
+
+			$result=$object->createFromClone($socid);
+			if ($result > 0)
+			{
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+				exit;
+			}
+			else
+			{
+				setEventMessage($object->error, 'errors');
+				$object = $orig;
+				$action='';
+			}
+		}
+	}
+}
+
+// Reopen a closed order
+else if ($action == 'reopen' && $user->rights->commande->creer) {
+	if ($object->statut == 3) {
+		$result = $object->set_reopen($user);
+		if ($result > 0)
+		{
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		}
+		else
+		{
+			setEventMessage($object->error, 'errors');
+		}
+	}
+}
+
+// Suppression de la commande
+else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->commande->supprimer) {
+	$result = $object->delete($user);
+	if ($result > 0) {
+		header('Location: index.php');
+		exit;
+	}
+	else {
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+// Remove a product line
+else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->commande->creer) {
+	$result = $object->deleteline($lineid);
+	if ($result > 0) {
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
+			$newlang = GETPOST('lang_id');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->thirdparty->default_lang;
+		if (! empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			$ret = $object->fetch($object->id); // Reload to get new records
+			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		}
+
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+// Categorisation dans projet
+else if ($action == 'classin' && $user->rights->commande->creer) {
+	$object->setProject(GETPOST('projectid'));
+}
+
+// Add order
+else if ($action == 'add' && $user->rights->commande->creer) {
+	$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+	$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
+
+	if ($datecommande == '') {
+		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), 'errors');
+		$action = 'create';
+		$error ++;
+	}
+
+	if ($socid < 1) {
+		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Customer")), 'errors');
+		$action = 'create';
+		$error ++;
+	}
+
+	if (! $error) {
+		$object->socid = $socid;
+		$object->fetch_thirdparty();
+
+		$db->begin();
+
+		$object->date_commande = $datecommande;
+		$object->note_private = GETPOST('note_private');
+		$object->note_public = GETPOST('note_public');
+		$object->source = GETPOST('source_id');
+		$object->fk_project = GETPOST('projectid');
+		$object->ref_client = GETPOST('ref_client');
+		$object->modelpdf = GETPOST('model');
+		$object->cond_reglement_id = GETPOST('cond_reglement_id');
+		$object->mode_reglement_id = GETPOST('mode_reglement_id');
+        $object->fk_account = GETPOST('fk_account', 'int');
+		$object->availability_id = GETPOST('availability_id');
+		$object->demand_reason_id = GETPOST('demand_reason_id');
+		$object->date_livraison = $datelivraison;
+        $object->shipping_method_id = GETPOST('shipping_method_id', 'int');
+		$object->fk_delivery_address = GETPOST('fk_address');
+		$object->contactid = GETPOST('contactid');
+
+		// If creation from another object of another module (Example: origin=propal, originid=1)
+		if (! empty($origin) && ! empty($originid)) {
+			// Parse element/subelement (ex: project_task)
+			$element = $subelement = $origin;
+			if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
+				$element = $regs [1];
+				$subelement = $regs [2];
+			}
+
+			// For compatibility
+			if ($element == 'order') {
+				$element = $subelement = 'commande';
+			}
+			if ($element == 'propal') {
+				$element = 'comm/propal';
+				$subelement = 'propal';
+			}
+			if ($element == 'contract') {
+				$element = $subelement = 'contrat';
+			}
+
+			$object->origin = $origin;
+			$object->origin_id = $originid;
+
+			// Possibility to add external linked objects with hooks
+			$object->linked_objects [$object->origin] = $object->origin_id;
+			$other_linked_objects = GETPOST('other_linked_objects', 'array');
+			if (! empty($other_linked_objects)) {
+				$object->linked_objects = array_merge($object->linked_objects, $other_linked_objects);
+			}
+
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+			if ($ret < 0)
+				$error ++;
+
+			if (! $error)
+			{
+				$object_id = $object->create($user);
+
+				if ($object_id > 0)
+				{
+					dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+
+					$classname = ucfirst($subelement);
+					$srcobject = new $classname($db);
+
+					dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
+					$result = $srcobject->fetch($object->origin_id);
+					if ($result > 0)
+					{
+						$lines = $srcobject->lines;
+						if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
+						{
+							$srcobject->fetch_lines();
+							$lines = $srcobject->lines;
+						}
+
+						$fk_parent_line = 0;
+						$num = count($lines);
+
+						for($i = 0; $i < $num; $i ++)
+						{
+							$label = (! empty($lines [$i]->label) ? $lines [$i]->label : '');
+							$desc = (! empty($lines [$i]->desc) ? $lines [$i]->desc : $lines [$i]->libelle);
+							$product_type = (! empty($lines [$i]->product_type) ? $lines [$i]->product_type : 0);
+
+							// Dates
+							// TODO mutualiser
+							$date_start = $lines [$i]->date_debut_prevue;
+							if ($lines [$i]->date_debut_reel)
+								$date_start = $lines [$i]->date_debut_reel;
+							if ($lines [$i]->date_start)
+								$date_start = $lines [$i]->date_start;
+							$date_end = $lines [$i]->date_fin_prevue;
+							if ($lines [$i]->date_fin_reel)
+								$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;
+							}
+
+							// Extrafields
+							if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines [$i], 'fetch_optionals')) 							// For avoid conflicts if
+							                                                                                                      // trigger used
+							{
+								$lines [$i]->fetch_optionals($lines [$i]->rowid);
+								$array_option = $lines [$i]->array_options;
+							}
+
+							$result = $object->addline($desc, $lines [$i]->subprice, $lines [$i]->qty, $lines [$i]->tva_tx, $lines [$i]->localtax1_tx, $lines [$i]->localtax2_tx, $lines [$i]->fk_product, $lines [$i]->remise_percent, $lines [$i]->info_bits, $lines [$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines [$i]->rang, $lines [$i]->special_code, $fk_parent_line, $lines [$i]->fk_fournprice, $lines [$i]->pa_ht, $label, $array_option);
+
+							if ($result < 0) {
+								$error ++;
+								break;
+							}
+
+							// Defined the new fk_parent_line
+							if ($result > 0 && $lines [$i]->product_type == 9) {
+								$fk_parent_line = $result;
+							}
+						}
+
+						// Hooks
+						$parameters = array('objFrom' => $srcobject);
+						$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
+						                                                                               // modified by hook
+						if ($reshook < 0)
+							$error ++;
+					} else {
+						setEventMessage($srcobject->error, 'errors');
+						$error ++;
+					}
+				} else {
+					setEventMessage($object->error, 'errors');
+					$error ++;
+				}
+			} else {
+				// Required extrafield left blank, error message already defined by setOptionalsFromPost()
+				$action = 'create';
+			}
+		} else {
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+			if ($ret < 0)
+				$error ++;
+
+			if (! $error) {
+				$object_id = $object->create($user);
+
+				// If some invoice's lines already known
+				$NBLINES = 8;
+				for($i = 1; $i <= $NBLINES; $i ++) {
+					if ($_POST['idprod' . $i]) {
+						$xid = 'idprod' . $i;
+						$xqty = 'qty' . $i;
+						$xremise = 'remise_percent' . $i;
+						$object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]);
+					}
+				}
+			}
+		}
+
+		// Insert default contacts if defined
+		if ($object_id > 0) {
+			if (GETPOST('contactid')) {
+				$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
+				if ($result < 0) {
+					setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors');
+					$error ++;
+				}
+			}
+
+			$id = $object_id;
+			$action = '';
+		}
+
+		// End of object creation, we show it
+		if ($object_id > 0 && ! $error) {
+			$db->commit();
+			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object_id);
+			exit();
+		} else {
+			$db->rollback();
+			$action = 'create';
+			setEventMessage($object->error, 'errors');
+		}
+	}
+}
+
+else if ($action == 'classifybilled' && $user->rights->commande->creer)
+{
+	$ret=$object->classifyBilled();
+
+	if ($ret < 0) {
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+// Positionne ref commande client
+else if ($action == 'set_ref_client' && $user->rights->commande->creer) {
+	$object->set_ref_client($user, GETPOST('ref_client'));
+}
+
+else if ($action == 'setremise' && $user->rights->commande->creer) {
+	$object->set_remise($user, GETPOST('remise'));
+}
+
+else if ($action == 'setabsolutediscount' && $user->rights->commande->creer) {
+	if (GETPOST('remise_id')) {
+		if ($object->id > 0) {
+			$object->insert_discount(GETPOST('remise_id'));
+		} else {
+			dol_print_error($db, $object->error);
+		}
+	}
+}
+
+else if ($action == 'setdate' && $user->rights->commande->creer) {
+	// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+	$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
+
+	$result = $object->set_date($user, $date);
+	if ($result < 0) {
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+else if ($action == 'setdate_livraison' && $user->rights->commande->creer) {
+	// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+	$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
+
+	$result = $object->set_date_livraison($user, $datelivraison);
+	if ($result < 0) {
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+else if ($action == 'setmode' && $user->rights->commande->creer) {
+	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+	if ($result < 0)
+		dol_print_error($db, $object->error);
+}
+
+else if ($action == 'setavailability' && $user->rights->commande->creer) {
+	$result = $object->availability(GETPOST('availability_id'));
+	if ($result < 0)
+		dol_print_error($db, $object->error);
+}
+
+else if ($action == 'setdemandreason' && $user->rights->commande->creer) {
+	$result = $object->demand_reason(GETPOST('demand_reason_id'));
+	if ($result < 0)
+		dol_print_error($db, $object->error);
+}
+
+else if ($action == 'setconditions' && $user->rights->commande->creer) {
+	$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	} else {
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			// Define output language
+			$outputlangs = $langs;
+			$newlang = GETPOST('lang_id', 'alpha');
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+				$newlang = $object->thirdparty->default_lang;
+			if (! empty($newlang)) {
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
+
+			$ret = $object->fetch($object->id); // Reload to get new records
+			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		}
+	}
+}
+
+// bank account
+else if ($action == 'setbankaccount' && $user->rights->commande->creer) {
+    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+}
+
+// shipping method
+else if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
+    $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+}
+
+else if ($action == 'setremisepercent' && $user->rights->commande->creer) {
+	$result = $object->set_remise($user, GETPOST('remise_percent'));
+}
+
+else if ($action == 'setremiseabsolue' && $user->rights->commande->creer) {
+	$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
+}
+
+// Add a new line
+else if ($action == 'addline' && $user->rights->commande->creer) {
+	$langs->load('errors');
+	$error = 0;
+
+	// 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;
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+	}
+	else
+	{
+		$idprod=GETPOST('idprod', 'int');
+		$tva_tx = '';
+	}
+
+	$qty = GETPOST('qty' . $predef);
+	$remise_percent = GETPOST('remise_percent' . $predef);
+
+	// Extrafields
+	$extrafieldsline = new ExtraFields($db);
+	$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+	$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+	// Unset extrafield
+	if (is_array($extralabelsline)) {
+		// Get extra fields
+		foreach ($extralabelsline as $key => $value) {
+			unset($_POST["options_" . $key]);
+		}
+	}
+
+	if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
+		setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), 'errors');
+		$error ++;
+	}
+	if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
+		$error ++;
+	}
+	if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), 'errors');
+		$error ++;
+	}
+	if ($qty == '') {
+		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
+		$error ++;
+	}
+	if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
+		$error ++;
+	}
+
+	if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) {
+		// Clean parameters
+		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), 0, GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+		$date_end=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), 0, GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+		$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
+
+		// Ecrase $pu par celui du produit
+		// Ecrase $desc par celui du produit
+		// Ecrase $txtva par celui du produit
+		// Ecrase $base_price_type par celui du produit
+		if (! empty($idprod)) {
+			$prod = new Product($db);
+			$prod->fetch($idprod);
+
+			$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
+
+			// Update if prices fields are defined
+				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+				$pu_ht = $prod->price;
+				$pu_ttc = $prod->price_ttc;
+				$price_min = $prod->price_min;
+				$price_base_type = $prod->price_base_type;
+
+				// multiprix
+				if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+				{
+					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+					if (isset($prod->multiprices_tva_tx[$object->client->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->client->price_level];
+					if (isset($prod->multiprices_recuperableonly[$object->client->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->client->price_level];
+					$tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+					$tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+				}
+				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+				{
+					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+					$prodcustprice = new Productcustomerprice($db);
+
+					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
+
+					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+					if ($result >= 0)
+					{
+						if (count($prodcustprice->lines) > 0)
+						{
+							$pu_ht = price($prodcustprice->lines [0]->price);
+							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+							$price_base_type = $prodcustprice->lines [0]->price_base_type;
+							$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+						}
+					}
+					else
+					{
+						setEventMessage($prodcustprice->error,'errors');
+					}
+				}
+
+				// if price ht is forced (ie: calculated by margin rate and cost price)
+				if (! empty($price_ht)) {
+					$pu_ht = price2num($price_ht, 'MU');
+					$pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU');
+				}
+
+				// On reevalue prix selon taux tva car taux tva transaction peut etre different
+				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+				elseif ($tva_tx != $prod->tva_tx) {
+					if ($price_base_type != 'HT') {
+						$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU');
+					} else {
+						$pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU');
+					}
+				}
+
+				$desc = '';
+
+				// Define output language
+				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					$outputlangs = $langs;
+					$newlang = '';
+					if (empty($newlang) && GETPOST('lang_id'))
+						$newlang = GETPOST('lang_id');
+					if (empty($newlang))
+						$newlang = $object->thirdparty->default_lang;
+					if (! empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+
+					$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+				} else {
+					$desc = $prod->description;
+				}
+
+				$desc = dol_concatdesc($desc, $product_desc);
+
+				// Add custom code and origin country into description
+				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code))) {
+					$tmptxt = '(';
+					if (! empty($prod->customcode))
+						$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+					if (! empty($prod->customcode) && ! empty($prod->country_code))
+						$tmptxt .= ' - ';
+					if (! empty($prod->country_code))
+						$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+					$tmptxt .= ')';
+					$desc = dol_concatdesc($desc, $tmptxt);
+				}
+
+			$type = $prod->type;
+		} else {
+			$pu_ht = price2num($price_ht, 'MU');
+			$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
+			$tva_tx = str_replace('*', '', $tva_tx);
+			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+			$desc = $product_desc;
+			$type = GETPOST('type');
+		}
+
+		// Margin
+		$fournprice = (GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
+		$buyingprice = (GETPOST('buying_price' . $predef) ? GETPOST('buying_price' . $predef) : '');
+
+		// Local Taxes
+		$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
+		$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
+
+		$desc = dol_htmlcleanlastbr($desc);
+
+		$info_bits = 0;
+		if ($tva_npr)
+			$info_bits |= 0x01;
+
+		if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))) {
+			$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
+			setEventMessage($mesg, 'errors');
+		} else {
+			// Insert line
+			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option);
+
+			if ($result > 0) {
+				$ret = $object->fetch($object->id); // Reload to get new records
+
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					// Define output language
+					$outputlangs = $langs;
+					$newlang = GETPOST('lang_id', 'alpha');
+					if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
+						$newlang = $object->thirdparty->default_lang;
+					if (! empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+
+					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+
+				unset($_POST['prod_entry_mode']);
+
+				unset($_POST['qty']);
+				unset($_POST['type']);
+				unset($_POST['remise_percent']);
+				unset($_POST['price_ht']);
+				unset($_POST['price_ttc']);
+				unset($_POST['tva_tx']);
+				unset($_POST['product_ref']);
+				unset($_POST['product_label']);
+				unset($_POST['product_desc']);
+				unset($_POST['fournprice']);
+				unset($_POST['buying_price']);
+				unset($_POST['np_marginRate']);
+				unset($_POST['np_markRate']);
+				unset($_POST['dp_desc']);
+				unset($_POST['idprod']);
+
+		    	unset($_POST['date_starthour']);
+		    	unset($_POST['date_startmin']);
+		    	unset($_POST['date_startsec']);
+		    	unset($_POST['date_startday']);
+		    	unset($_POST['date_startmonth']);
+		    	unset($_POST['date_startyear']);
+		    	unset($_POST['date_endhour']);
+		    	unset($_POST['date_endmin']);
+		    	unset($_POST['date_endsec']);
+		    	unset($_POST['date_endday']);
+		    	unset($_POST['date_endmonth']);
+		    	unset($_POST['date_endyear']);
+			} else {
+				setEventMessage($object->error, 'errors');
+			}
+		}
+	}
+}
+
+/*
+ *  Mise a jour d'une ligne dans la commande
+*/
+else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('save') == $langs->trans('Save')) {
+	// Clean parameters
+	$date_start='';
+	$date_end='';
+	$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+	$date_end=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+	$description=dol_htmlcleanlastbr(GETPOST('product_desc'));
+	$pu_ht=GETPOST('price_ht');
+	$vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
+
+	// Define info_bits
+	$info_bits = 0;
+	if (preg_match('/\*/', $vat_rate))
+		$info_bits |= 0x01;
+
+		// Define vat_rate
+	$vat_rate = str_replace('*', '', $vat_rate);
+	$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
+	$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
+
+	// Add buying price
+	$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
+	$buyingprice = (GETPOST('buying_price') ? GETPOST('buying_price') : '');
+
+	// Extrafields Lines
+	$extrafieldsline = new ExtraFields($db);
+	$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+	$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+	// Unset extrafield POST Data
+	if (is_array($extralabelsline)) {
+		foreach ($extralabelsline as $key => $value) {
+			unset($_POST["options_" . $key]);
+		}
+	}
+
+	// Check minimum price
+	$productid = GETPOST('productid', 'int');
+	if (! empty($productid)) {
+		$product = new Product($db);
+		$product->fetch($productid);
+
+		$type = $product->type;
+
+		$price_min = $product->price_min;
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+			$price_min = $product->multiprices_min [$object->thirdparty->price_level];
+
+		$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
+
+		if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
+			setEventMessage($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), 'errors');
+			$error ++;
+		}
+	} else {
+		$type = GETPOST('type');
+		$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+
+		// Check parameters
+		if (GETPOST('type') < 0) {
+			setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), 'errors');
+			$error ++;
+		}
+	}
+
+	if (! $error) {
+		$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option);
+
+		if ($result >= 0) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				// Define output language
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
+					$newlang = GETPOST('lang_id');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+					$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+
+				$ret = $object->fetch($object->id); // Reload to get new records
+				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+
+			unset($_POST['qty']);
+			unset($_POST['type']);
+			unset($_POST['productid']);
+			unset($_POST['remise_percent']);
+			unset($_POST['price_ht']);
+			unset($_POST['price_ttc']);
+			unset($_POST['tva_tx']);
+			unset($_POST['product_ref']);
+			unset($_POST['product_label']);
+			unset($_POST['product_desc']);
+			unset($_POST['fournprice']);
+			unset($_POST['buying_price']);
+		} else {
+			setEventMessage($object->error, 'errors');
+		}
+	}
+}
+
+else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('cancel') == $langs->trans('Cancel')) {
+	header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+	exit();
+}
+
+else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->commande->valider) {
+	$idwarehouse = GETPOST('idwarehouse');
+
+    $qualified_for_stock_change=0;
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+	}
+	else
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+	}
+
+	// Check parameters
+	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
+	{
+		if (! $idwarehouse || $idwarehouse == -1)
+		{
+			$error++;
+			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
+			$action='';
+		}
+	}
+
+	if (! $error) {
+		$result = $object->valid($user, $idwarehouse);
+		if ($result >= 0)
+		{
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model=$object->modelpdf;
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+	}
+}
+
+// Go back to draft status
+else if ($action == 'confirm_modif' && $user->rights->commande->creer) {
+	$idwarehouse = GETPOST('idwarehouse');
+
+    $qualified_for_stock_change=0;
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+	}
+	else
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+	}
+
+	// Check parameters
+	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
+	{
+		if (! $idwarehouse || $idwarehouse == -1)
+		{
+			$error++;
+			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
+			$action='';
+		}
+	}
+
+	if (! $error) {
+		$result = $object->set_draft($user, $idwarehouse);
+		if ($result >= 0)
+		{
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model=$object->modelpdf;
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+	}
+}
+
+else if ($action == 'confirm_shipped' && $confirm == 'yes' && $user->rights->commande->cloturer) {
+	$result = $object->cloture($user);
+	if ($result < 0) {
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+else if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->commande->valider) {
+	$idwarehouse = GETPOST('idwarehouse');
+
+    $qualified_for_stock_change=0;
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+	}
+	else
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+	}
+
+	// Check parameters
+	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
+	{
+		if (! $idwarehouse || $idwarehouse == -1)
+		{
+			$error++;
+			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
+			$action='';
+		}
+	}
+
+	if (! $error) {
+		$result = $object->cancel($idwarehouse);
+
+		if ($result < 0) {
+			setEventMessage($object->error, 'errors');
+		}
+	}
+}
+
+/*
+ * Ordonnancement des lignes
+*/
+
+else if ($action == 'up' && $user->rights->commande->creer) {
+	$object->line_up(GETPOST('rowid'));
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang = '';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+		$newlang = $_REQUEST['lang_id'];
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+		$newlang = $object->thirdparty->default_lang;
+	if (! empty($newlang)) {
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
+	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
+	exit();
+}
+
+else if ($action == 'down' && $user->rights->commande->creer) {
+	$object->line_down(GETPOST('rowid'));
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang = '';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+		$newlang = $_REQUEST['lang_id'];
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+		$newlang = $object->thirdparty->default_lang;
+	if (! empty($newlang)) {
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
+	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
+	exit();
+}
+
+else if ($action == 'builddoc') // In get or post
+{
+	/*
+	 * Generate order document
+	 * define into /core/modules/commande/modules_commande.php
+	 */
+
+	// Save last template used to generate document
+	if (GETPOST('model'))
+		$object->setDocModel($user, GETPOST('model', 'alpha'));
+
+		// Define output language
+	$outputlangs = $langs;
+	$newlang = '';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+		$newlang = $_REQUEST['lang_id'];
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+		$newlang = $object->thirdparty->default_lang;
+	if (! empty($newlang)) {
+		$outputlangs = new Translate("", $conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+	if ($result <= 0) {
+		dol_print_error($db, $result);
+		exit();
+	}
+}
+
+// Remove file in doc form
+else if ($action == 'remove_file') {
+	if ($object->id > 0) {
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+		$langs->load("other");
+		$upload_dir = $conf->commande->dir_output;
+		$file = $upload_dir . '/' . GETPOST('file');
+		$ret = dol_delete_file($file, 0, 0, 0, $object);
+		if ($ret)
+			setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+		else
+			setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+		$action = '';
+	}
+}
+
+else if ($action == 'update_extras') {
+	// Fill array 'array_options' with data from update form
+	$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+	if ($ret < 0)
+		$error ++;
+
+	if (! $error) {
+		// 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' => $object->id);
+		$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
+		                                                                                      // some hooks
+		if (empty($reshook)) {
+			$result = $object->insertExtraFields();
+			if ($result < 0) {
+				$error ++;
+			}
+		} else if ($reshook < 0)
+			$error ++;
+	}
+
+	if ($error)
+		$action = 'edit_extras';
+}
+
+include DOL_DOCUMENT_ROOT.'/core/actions_printipp.inc.php';
+
+
+/*
+ * Send mail
+ */
+
+// Actions to send emails
+$actiontypecode='AC_COM';
+$trigger_name='ORDER_SENTBYMAIL';
+$paramname='id';
+$mode='emailfromorder';
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+
+
+if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer) {
+	if ($action == 'addcontact') {
+		if ($object->id > 0) {
+			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+		}
+
+		if ($result >= 0) {
+			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			exit();
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
+			} else {
+				setEventMessage($object->error, 'errors');
+			}
+		}
+	}
+
+	// bascule du statut d'un contact
+	else if ($action == 'swapstatut') {
+		if ($object->id > 0) {
+			$result = $object->swapContactStatus(GETPOST('ligne'));
+		} else {
+			dol_print_error($db);
+		}
+	}
+
+	// Efface un contact
+	else if ($action == 'deletecontact') {
+		$result = $object->delete_contact($lineid);
+
+		if ($result >= 0) {
+			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
+			exit();
+		} else {
+			dol_print_error($db);
+		}
+	}
+}
+
+/*
+ *	View
+ */
+
+llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formorder = new FormOrder($db);
+
+/**
+ * *******************************************************************
+ *
+ * Mode creation
+ *
+ * *******************************************************************
+ */
+if ($action == 'create' && $user->rights->commande->creer) {
+	print_fiche_titre($langs->trans('CreateOrder'));
+
+	$soc = new Societe($db);
+	if ($socid > 0)
+		$res = $soc->fetch($socid);
+
+	if (! empty($origin) && ! empty($originid)) {
+		// Parse element/subelement (ex: project_task)
+		$element = $subelement = $origin;
+		if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
+			$element = $regs [1];
+			$subelement = $regs [2];
+		}
+
+		if ($element == 'project') {
+			$projectid = $originid;
+		} else {
+			// For compatibility
+			if ($element == 'order' || $element == 'commande') {
+				$element = $subelement = 'commande';
+			}
+			if ($element == 'propal') {
+				$element = 'comm/propal';
+				$subelement = 'propal';
+			}
+			if ($element == 'contract') {
+				$element = $subelement = 'contrat';
+			}
+
+			dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+
+			$classname = ucfirst($subelement);
+			$objectsrc = new $classname($db);
+			$objectsrc->fetch($originid);
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
+				$objectsrc->fetch_lines();
+			$objectsrc->fetch_thirdparty();
+
+			// Replicate extrafields
+			$objectsrc->fetch_optionals($originid);
+			$object->array_options = $objectsrc->array_options;
+
+			$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
+			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
+
+			$soc = $objectsrc->client;
+			$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));
+            $fk_account         = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
+			$availability_id	= (!empty($objectsrc->availability_id)?$objectsrc->availability_id:(!empty($soc->availability_id)?$soc->availability_id:0));
+            $shipping_method_id = (! empty($objectsrc->shipping_method_id)?$objectsrc->shipping_method_id:(! empty($soc->shipping_method_id)?$soc->shipping_method_id:0));
+			$demand_reason_id	= (!empty($objectsrc->demand_reason_id)?$objectsrc->demand_reason_id:(!empty($soc->demand_reason_id)?$soc->demand_reason_id:0));
+			$remise_percent		= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
+			$remise_absolue		= (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
+			$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
+
+			$datedelivery = (! empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
+
+			$note_private = (! empty($objectsrc->note_private) ? $objectsrc->note_private : (! empty($objectsrc->note_private) ? $objectsrc->note_private : ''));
+			$note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
+
+			// Object source contacts list
+			$srccontactslist = $objectsrc->liste_contact(- 1, 'external', 1);
+		}
+	}
+	else
+	{
+		$cond_reglement_id  = $soc->cond_reglement_id;
+		$mode_reglement_id  = $soc->mode_reglement_id;
+        $fk_account         = $soc->fk_account;
+		$availability_id    = $soc->availability_id;
+        $shipping_method_id = $soc->shipping_method_id;
+		$demand_reason_id   = $soc->demand_reason_id;
+		$remise_percent     = $soc->remise_percent;
+		$remise_absolue     = 0;
+		$dateinvoice        = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
+		$projectid          = 0;
+	}
+	$absolute_discount=$soc->getAvailableDiscounts();
+
+	$nbrow = 10;
+
+	print '<form name="crea_commande" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="socid" value="' . $soc->id . '">' . "\n";
+	print '<input type="hidden" name="remise_percent" value="' . $soc->remise_percent . '">';
+	print '<input type="hidden" name="origin" value="' . $origin . '">';
+	print '<input type="hidden" name="originid" value="' . $originid . '">';
+
+	print '<table class="border" width="100%">';
+
+	// Reference
+	print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans("Draft") . '</td></tr>';
+
+	// Reference client
+	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
+	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER))
+		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
+	else
+		print '<input type="text" name="ref_client" value=""></td>';
+	print '</tr>';
+
+	// Client
+	print '<tr>';
+	print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
+	if ($socid > 0) {
+		print '<td colspan="2">';
+		print $soc->getNomUrl(1);
+		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+		print '</td>';
+	} else {
+		print '<td colspan="2">';
+		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1);
+		print '</td>';
+	}
+	print '</tr>' . "\n";
+
+	/*
+	 * Contact de la commande
+	*/
+	if ($socid > 0) {
+		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
+		$form->select_contacts($soc->id, $setcontact, 'contactid', 1, $srccontactslist);
+		print '</td></tr>';
+
+		// Ligne info remises tiers
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
+		if ($soc->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+		else
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		print '. ';
+		$absolute_discount = $soc->getAvailableDiscounts();
+		if ($absolute_discount)
+			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency" . $conf->currency));
+		else
+			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		print '.';
+		print '</td></tr>';
+	}
+	// Date
+	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);
+	print '</td></tr>';
+
+	// Date de livraison
+	print "<tr><td>".$langs->trans("DeliveryDate").'</td><td colspan="2">';
+	if (empty($datedelivery))
+	{
+		if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
+		else $datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
+	}
+	$form->select_date($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);
+	print "</td></tr>";
+
+	// Conditions de reglement
+	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
+	print '</td></tr>';
+
+	// Mode de reglement
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
+	print '</td></tr>';
+
+    // Bank Account
+	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
+	{
+		print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+    	$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+    	print '</td></tr>';
+	}
+
+	// Delivery delay
+	print '<tr><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
+	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1);
+	print '</td></tr>';
+
+    // Shipping Method
+    if (! empty($conf->expedition->enabled)) {
+        print '<tr><td>' . $langs->trans('SendingMethod') . '</td><td colspan="2">';
+        print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
+        print '</td></tr>';
+    }
+
+	// What trigger creation
+	print '<tr><td>' . $langs->trans('Source') . '</td><td colspan="2">';
+	$form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1);
+	print '</td></tr>';
+
+	// Project
+	if (! empty($conf->projet->enabled) && $socid > 0) {
+		$formproject = new FormProjets($db);
+
+		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
+		$numprojet = $formproject->select_projects($soc->id, $projectid);
+		if ($numprojet == 0) {
+			print ' &nbsp; <a href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $soc->id . '&action=create">' . $langs->trans("AddProject") . '</a>';
+		}
+		print '</td></tr>';
+	}
+
+	// Other attributes
+	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
+	                                                                                      // hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+		print $object->showOptionals($extrafields, 'edit');
+	}
+
+	// Template to use by default
+	print '<tr><td>' . $langs->trans('Model') . '</td>';
+	print '<td colspan="2">';
+	include_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
+	$liste = ModelePDFCommandes::liste_modeles($db);
+	print $form->selectarray('model', $liste, $conf->global->COMMANDE_ADDON_PDF);
+	print "</td></tr>";
+
+	// Note publique
+	print '<tr>';
+	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
+	print '<td valign="top" colspan="2">';
+
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+	print $doleditor->Create(1);
+	// print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+	print '</td></tr>';
+
+	// Note privee
+	if (empty($user->societe_id)) {
+		print '<tr>';
+		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
+		print '<td valign="top" colspan="2">';
+
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+		print $doleditor->Create(1);
+		// print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+		print '</td></tr>';
+	}
+
+	if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
+		// TODO for compatibility
+		if ($origin == 'contrat') {
+			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
+			$objectsrc->remise_absolue = $remise_absolue;
+			$objectsrc->remise_percent = $remise_percent;
+			$objectsrc->update_price(1);
+		}
+
+		print "\n<!-- " . $classname . " info -->";
+		print "\n";
+		print '<input type="hidden" name="amount"         value="' . $objectsrc->total_ht . '">' . "\n";
+		print '<input type="hidden" name="total"          value="' . $objectsrc->total_ttc . '">' . "\n";
+		print '<input type="hidden" name="tva"            value="' . $objectsrc->total_tva . '">' . "\n";
+		print '<input type="hidden" name="origin"         value="' . $objectsrc->element . '">';
+		print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';
+
+		$newclassname = $classname;
+		if ($newclassname == 'Propal')
+			$newclassname = 'CommercialProposal';
+		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
+		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1) . "</td></tr>";
+		}
+
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2) . "</td></tr>";
+		}
+
+		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
+	} else {
+		if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) {
+			/*
+			 * Services/produits predefinis
+			*/
+			$NBLINES = 8;
+
+			print '<tr><td colspan="3">';
+
+			print '<table class="noborder">';
+			print '<tr><td>' . $langs->trans('ProductsAndServices') . '</td>';
+			print '<td>' . $langs->trans('Qty') . '</td>';
+			print '<td>' . $langs->trans('ReductionShort') . '</td>';
+			print '</tr>';
+			for($i = 1; $i <= $NBLINES; $i ++) {
+				print '<tr><td>';
+				// multiprix
+				if (! empty($conf->global->PRODUIT_MULTIPRICES))
+					print $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size, $soc->price_level);
+				else
+					print $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size);
+				print '</td>';
+				print '<td><input type="text" size="3" name="qty' . $i . '" value="1"></td>';
+				print '<td><input type="text" size="3" name="remise_percent' . $i . '" value="' . $soc->remise_percent . '">%</td></tr>';
+			}
+
+			print '</table>';
+			print '</td></tr>';
+		}
+	}
+
+	print '</table>';
+
+	// Button "Create Draft"
+	print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '"></center>';
+
+	print '</form>';
+
+	// Show origin lines
+	if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
+		$title = $langs->trans('ProductsAndServices');
+		print_titre($title);
+
+		print '<table class="noborder" width="100%">';
+
+		$objectsrc->printOriginLinesList();
+
+		print '</table>';
+	}
+} else {
+	/* *************************************************************************** */
+	/*                                                                             */
+	/* Mode vue et edition                                                         */
+	/*                                                                             */
+	/* *************************************************************************** */
+	$now = dol_now();
+
+	if ($object->id > 0) {
+		$product_static = new Product($db);
+
+		$soc = new Societe($db);
+		$soc->fetch($object->socid);
+
+		$author = new User($db);
+		$author->fetch($object->user_author_id);
+
+		$res = $object->fetch_optionals($object->id, $extralabels);
+
+		$head = commande_prepare_head($object);
+		dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
+
+		$formconfirm = '';
+
+		/*
+		 * Confirmation de la suppression de la commande
+		*/
+		if ($action == 'delete') {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+		}
+
+		/*
+		 * Confirmation de la validation
+		*/
+		if ($action == 'validate') {
+			// on verifie si l'objet est en numerotation provisoire
+			$ref = substr($object->ref, 1, 4);
+			if ($ref == 'PROV') {
+				$numref = $object->getNextNumRef($soc);
+			} else {
+				$numref = $object->ref;
+			}
+
+			$text = $langs->trans('ConfirmValidateOrder', $numref);
+			if (! empty($conf->notification->enabled)) {
+				require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+				$notify = new Notify($db);
+				$text .= '<br>';
+				$text .= $notify->confirmMessage('ORDER_VALIDATE', $object->socid);
+			}
+
+			$qualified_for_stock_change=0;
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+			{
+			   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+			}
+			else
+			{
+			   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+			}
+
+			$formquestion=array();
+			if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$formquestion = array(
+									// 'text' => $langs->trans("ConfirmClone"),
+									// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value'
+									// => 1),
+									// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"),
+									// 'value' => 1),
+									array('type' => 'other','name' => 'idwarehouse','label' => $langs->trans("SelectWarehouseForStockDecrease"),'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
+			}
+
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
+		}
+
+		// Confirm back to draft status
+		if ($action == 'modif')
+		{
+			$qualified_for_stock_change=0;
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+			{
+			   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+			}
+			else
+			{
+			   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+			}
+
+			$text=$langs->trans('ConfirmUnvalidateOrder',$object->ref);
+			$formquestion=array();
+			if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$formquestion = array(
+									// 'text' => $langs->trans("ConfirmClone"),
+									// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value'
+									// => 1),
+									// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"),
+									// 'value' => 1),
+									array('type' => 'other','name' => 'idwarehouse','label' => $langs->trans("SelectWarehouseForStockIncrease"),'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
+			}
+
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('UnvalidateOrder'), $text, 'confirm_modif', $formquestion, "yes", 1, 220);
+		}
+
+		/*
+		 * Confirmation de la cloture
+		*/
+		if ($action == 'shipped') {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_shipped', '', 0, 1);
+		}
+
+		/*
+		 * Confirmation de l'annulation
+		 */
+		if ($action == 'cancel')
+		{
+			$qualified_for_stock_change=0;
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+			{
+			   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+			}
+			else
+			{
+			   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+			}
+
+			$text=$langs->trans('ConfirmCancelOrder',$object->ref);
+			$formquestion=array();
+			if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$formquestion = array(
+									// 'text' => $langs->trans("ConfirmClone"),
+									// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value'
+									// => 1),
+									// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"),
+									// 'value' => 1),
+									array('type' => 'other','name' => 'idwarehouse','label' => $langs->trans("SelectWarehouseForStockIncrease"),'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
+			}
+
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('Cancel'), $text, 'confirm_cancel', $formquestion, 0, 1);
+		}
+
+		/*
+		 * Confirmation de la suppression d'une ligne produit
+		 */
+		if ($action == 'ask_deleteline')
+		{
+			$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
+		}
+
+		// Clone confirmation
+		if ($action == 'clone') {
+			// Create an array for form
+			$formquestion = array(
+								// 'text' => $langs->trans("ConfirmClone"),
+								// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' =>
+								// 1),
+								// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
+								// => 1),
+								array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=3)')));
+			// Paiement incomplet. On demande si motif = escompte ou autre
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneOrder'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+		}
+
+		if (! $formconfirm) {
+			$parameters = array('lineid' => $lineid);
+			$formconfirm = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified
+			                                                                                    // by hook
+		}
+
+		// Print form confirm
+		print $formconfirm;
+
+		/*
+		 *   Commande
+		*/
+		$nbrow = 9;
+		if (! empty($conf->projet->enabled))
+			$nbrow ++;
+
+			// Local taxes
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0)
+			$nbrow++;
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0 )
+			$nbrow++;
+
+		print '<table class="border" width="100%">';
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/list.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+
+		// Ref
+		print '<tr><td width="18%">' . $langs->trans('Ref') . '</td>';
+		print '<td colspan="3">';
+		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+		print '</td>';
+		print '</tr>';
+
+		// Ref commande client
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
+		print $langs->trans('RefCustomer') . '</td><td align="left">';
+		print '</td>';
+		if ($action != 'refcustomer' && $object->brouillon)
+			print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=refcustomer&amp;id=' . $object->id . '">' . img_edit($langs->trans('Modify')) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($user->rights->commande->creer && $action == 'refcustomer') {
+			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
+			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="set_ref_client">';
+			print '<input type="text" class="flat" size="20" name="ref_client" value="' . $object->ref_client . '">';
+			print ' <input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+			print '</form>';
+		} else {
+			print $object->ref_client;
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Third party
+		print '<tr><td>' . $langs->trans('Company') . '</td>';
+		print '<td colspan="3">' . $soc->getNomUrl(1) . '</td>';
+		print '</tr>';
+
+		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final
+			                                                     // invoice
+			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+		} else {
+			$filterabsolutediscount = "fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description='(DEPOSIT)')";
+			$filtercreditnote = "fk_facture_source IS NOT NULL AND description <> '(DEPOSIT)'";
+		}
+
+		// Relative and absolute discounts
+		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
+		$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
+		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
+
+		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="3">';
+		if ($soc->remise_percent)
+			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+		else
+			print $langs->trans("CompanyHasNoRelativeDiscount");
+		print '. ';
+		$absolute_discount = $soc->getAvailableDiscounts('', 'fk_facture_source IS NULL');
+		$absolute_creditnote = $soc->getAvailableDiscounts('', 'fk_facture_source IS NOT NULL');
+		$absolute_discount = price2num($absolute_discount, 'MT');
+		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
+		if ($absolute_discount) {
+			if ($object->statut > 0) {
+				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
+			} else {
+				// Remise dispo de type remise fixe (not credit note)
+				print '<br>';
+				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount);
+			}
+		}
+		if ($absolute_creditnote) {
+			print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
+		}
+		if (! $absolute_discount && ! $absolute_creditnote)
+			print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
+		print '</td></tr>';
+
+		// Date
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Date');
+		print '</td>';
+
+		if ($action != 'editdate' && $object->brouillon)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdate') {
+			print '<form name="setdate" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
+			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="setdate">';
+			$form->select_date($object->date, 'order_', '', '', '', "setdate");
+			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+			print '</form>';
+		} else {
+			print $object->date ? dol_print_date($object->date, 'daytext') : '&nbsp;';
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Delivery date planed
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('DateDeliveryPlanned');
+		print '</td>';
+		if ($action != 'editdate_livraison')
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate_livraison&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDeliveryDate'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdate_livraison') {
+			print '<form name="setdate_livraison" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
+			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+			print '<input type="hidden" name="action" value="setdate_livraison">';
+			$form->select_date($object->date_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison");
+			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+			print '</form>';
+		} else {
+			print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;';
+		}
+		print '</td>';
+		print '</tr>';
+
+        // Shipping Method
+        if (! empty($conf->expedition->enabled)) {
+            print '<tr><td height="10">';
+            print '<table width="100%" class="nobordernopadding"><tr><td>';
+            print $langs->trans('SendingMethod');
+            print '</td>';
+            if ($action != 'editshippingmethod' && $user->rights->commande->creer)
+                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
+            print '</tr></table>';
+            print '</td><td colspan="3">';
+            if ($action == 'editshippingmethod') {
+                $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+            } else {
+                $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
+            }
+            print '</td>';
+            print '</tr>';
+        }
+
+		// Terms of payment
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentConditionsShort');
+		print '</td>';
+		if ($action != 'editconditions' && $object->brouillon)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editconditions') {
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
+		} else {
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->cond_reglement_id, 'none', 1);
+		}
+		print '</td>';
+
+		print '</tr>';
+
+		// Mode of payment
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentMode');
+		print '</td>';
+		if ($action != 'editmode' && $object->brouillon)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editmode') {
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
+		} else {
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none');
+		}
+		print '</td></tr>';
+
+		// Availability
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('AvailabilityPeriod');
+		print '</td>';
+		if ($action != 'editavailability' && $object->brouillon)
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editavailability') {
+			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'availability_id', 1);
+		} else {
+			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'none', 1);
+		}
+		print '</td></tr>';
+
+		// Source
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Source');
+		print '</td>';
+		if ($action != 'editdemandreason' && ! empty($object->brouillon))
+			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editdemandreason') {
+			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
+		} else {
+			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
+		}
+		// Removed because using dictionary is an admin feature, not a user feature. Ther is already the "star" to show info to admin users.
+		// This is to avoid too heavy screens and have an uniform look and feel for all screens.
+		// print '</td><td>';
+		// print '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=22&origin=order&originid='.$object->id.'">'.$langs->trans("DictionarySource").'</a>';
+		print '</td></tr>';
+
+		// Project
+		if (! empty($conf->projet->enabled)) {
+			$langs->load('projects');
+			print '<tr><td height="10">';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('Project');
+			print '</td>';
+			if ($action != 'classify')
+				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetProject')) . '</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="3">';
+			// print "$object->id, $object->socid, $object->fk_project";
+			if ($action == 'classify') {
+				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid');
+			} else {
+				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none');
+			}
+			print '</td></tr>';
+		}
+
+		if ($soc->outstanding_limit) {
+			// Outstanding Bill
+			print '<tr><td>';
+			print $langs->trans('OutstandingBill');
+			print '</td><td align=right colspan=3>';
+			print price($soc->get_OutstandingBill()) . ' / ';
+			print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
+			print '</td>';
+			print '</tr>';
+		}
+
+		// Other attributes
+		$cols = 3;
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+		$rowspan = 4;
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0)
+			$rowspan ++;
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0)
+			$rowspan ++;
+
+        // Bank Account
+		if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled))
+		{
+	        print '<tr><td class="nowrap">';
+        	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+        	print $langs->trans('BankAccount');
+        	print '<td>';
+        	if ($action != 'editbankaccount' && $user->rights->commande->creer)
+        	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+        	print '</tr></table>';
+        	print '</td><td colspan="3">';
+        	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 '</td>';
+        	print '</tr>';
+		}
+
+		// Total HT
+		print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
+		print '<td align="right">' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td>';
+
+		// Margin Infos
+		if (! empty($conf->margin->enabled)) {
+			print '<td valign="top" width="50%" colspan="2" rowspan="' . $rowspan . '">';
+			$object->displayMarginInfos();
+			print '</td>';
+		} else
+			print '<td width="50%" colspan="2" rowspan="' . $rowspan . '"></td>';
+
+		print '</tr>';
+
+		// Total TVA
+		print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td align="right">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+
+		// Amount Local Taxes
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+			print '<td align="right">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		}
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
+		{
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+			print '<td align="right">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+		}
+
+		// Total TTC
+		print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td align="right">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+
+		// Statut
+		print '<tr><td>' . $langs->trans('Status') . '</td><td>' . $object->getLibStatut(4) . '</td></tr>';
+
+		print '</table><br>';
+		print "\n";
+
+		if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+			$blocname = 'contacts';
+			$title = $langs->trans('ContactsAddresses');
+			include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
+		}
+
+		if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+			$blocname = 'notes';
+			$title = $langs->trans('Notes');
+			include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
+		}
+
+		/*
+		 * Lines
+		 */
+		$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
+		<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id . '">
+		';
+
+		if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+
+		// Show object lines
+		if (! empty($object->lines))
+			$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+
+		$numlines = count($object->lines);
+
+		/*
+		 * Form to add new line
+		 */
+		if ($object->statut == 0 && $user->rights->commande->creer)
+		{
+			if ($action != 'editline')
+			{
+				$var = true;
+
+				// Add free products/services
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
+		print '</table>';
+
+		print "</form>\n";
+
+		dol_fiche_end();
+
+		/*
+		 * Boutons actions
+		*/
+		if ($action != 'presend' && $action != 'editline') {
+			print '<div class="tabsAction">';
+
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+			                                                                                          // modified by hook
+			if (empty($reshook)) {
+				// Valid
+				if ($object->statut == 0 && $object->total_ttc >= 0 && $numlines > 0 && $user->rights->commande->valider) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
+				}
+				// Edit
+				if ($object->statut == 1 && $user->rights->commande->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
+				}
+				// Create event
+				if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
+				                                                                                      // "workflow" action so should appears somewhere else on
+				                                                                                      // page.
+				{
+					print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a>';
+				}
+				// Send
+				if ($object->statut > 0) {
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
+					} else
+						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
+				}
+
+				// Ship
+				$numshipping = 0;
+				if (! empty($conf->expedition->enabled)) {
+					$numshipping = $object->nb_expedition();
+
+					if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfProductsLines() > 0) {
+						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)) {
+							if ($user->rights->expedition->creer) {
+								print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/expedition/shipment.php?id=' . $object->id . '">' . $langs->trans('ShipProduct') . '</a></div>';
+							} else {
+								print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('ShipProduct') . '</a></div>';
+							}
+						} else {
+							$langs->load("errors");
+							print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")) . '">' . $langs->trans('ShipProduct') . '</a></div>';
+						}
+					}
+				}
+
+				// Create intervention
+				if ($conf->ficheinter->enabled) {
+					$langs->load("interventions");
+
+					if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfServicesLines() > 0) {
+						if ($user->rights->ficheinter->creer) {
+							print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fichinter/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddIntervention') . '</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('AddIntervention') . '</a></div>';
+						}
+					}
+				}
+
+				// Reopen a closed order
+				if ($object->statut == 3 && $user->rights->commande->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=reopen">' . $langs->trans('ReOpen') . '</a></div>';
+				}
+
+				// Create contract
+				if ($conf->contrat->enabled && ($object->statut == 1 || $object->statut == 2)) {
+					$langs->load("contracts");
+
+					if ($user->rights->contrat->creer) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/contrat/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a></div>';
+					}
+				}
+
+				// Create bill and Classify billed
+				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
+				if ($object->statut > 0 && ! $object->billed) {
+					if (! empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("CreateBill") . '</a></div>';
+					}
+					if ($user->rights->commande->creer && $object->statut > 2 && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled">' . $langs->trans("ClassifyBilled") . '</a></div>';
+					}
+				}
+
+				// Set to shipped
+				if (($object->statut == 1 || $object->statut == 2) && $user->rights->commande->cloturer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=shipped">' . $langs->trans('ClassifyShipped') . '</a></div>';
+				}
+
+				// Clone
+				if ($user->rights->commande->creer) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=order">' . $langs->trans("ToClone") . '</a></div>';
+				}
+
+				// Cancel order
+				if ($object->statut == 1 && $user->rights->commande->annuler) {
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=cancel">' . $langs->trans('Cancel') . '</a></div>';
+				}
+
+				// Delete order
+				if ($user->rights->commande->supprimer) {
+					if ($numshipping == 0) {
+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete">' . $langs->trans('Delete') . '</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("ShippingExist") . '">' . $langs->trans("Delete") . '</a></div>';
+					}
+				}
+			}
+			print '</div>';
+		}
+		print '<br>';
+
+		if ($action != 'presend')
+		{
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			// print '<table width="100%"><tr><td width="50%" valign="top">';
+			// print '<a name="builddoc"></a>'; // ancre
+
+			/*
+			 * Documents generes
+			*/
+			$comref = dol_sanitizeFileName($object->ref);
+			$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
+			$relativepath = $comref . '/' . $comref . '.pdf';
+			$filedir = $conf->commande->dir_output . '/' . $comref;
+			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+			$genallowed = $user->rights->commande->creer;
+			$delallowed = $user->rights->commande->supprimer;
+			$somethingshown = $formfile->show_documents('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+
+			/*
+			 * Linked object block
+			 */
+			$somethingshown = $object->showLinkedObjectBlock();
+
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+			// print '</td><td valign="top" width="50%">';
+
+			// List of actions on element
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, 'order', $socid);
+
+			// print '</td></tr></table>';
+			print '</div></div></div>';
+		}
+
+		/*
+		 * Action presend
+		 */
+		if ($action == 'presend')
+		{
+			$object->fetch_projet();
+
+			$ref = dol_sanitizeFileName($object->ref);
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/'));
+			$file = $fileparams ['fullname'];
+
+			// Define output language
+			$outputlangs = $langs;
+			$newlang = '';
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+				$newlang = $_REQUEST['lang_id'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+				$newlang = $object->thirdparty->default_lang;
+
+			if (!empty($newlang))
+			{
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang($newlang);
+				$outputlangs->load('commercial');
+			}
+
+			// Build document if it not exists
+			if (! $file || ! is_readable($file)) {
+				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($result <= 0) {
+					dol_print_error($db, $result);
+					exit();
+				}
+				$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/'));
+				$file = $fileparams ['fullname'];
+			}
+
+			print '<br>';
+			print_titre($langs->trans('SendOrderByMail'));
+
+			// Cree l'objet formulaire mail
+			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+			$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+			$formmail->fromtype = 'user';
+			$formmail->fromid = $user->id;
+			$formmail->fromname = $user->getFullName($langs);
+			$formmail->frommail = $user->email;
+			$formmail->withfrom = 1;
+			$liste = array();
+			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
+				$liste [$key] = $value;
+			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+			$formmail->withtocc = $liste;
+			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+			if (empty($object->ref_client)) {
+				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
+			} else if (! empty($object->ref_client)) {
+				$formmail->withtopic = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
+			}
+			$formmail->withfile = 2;
+			$formmail->withbody = 1;
+			$formmail->withdeliveryreceipt = 1;
+			$formmail->withcancel = 1;
+			// Tableau des substitutions
+			$formmail->substit ['__ORDERREF__'] = $object->ref;
+			$formmail->substit ['__SIGNATURE__'] = $user->signature;
+			$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
+			$formmail->substit ['__THIRPARTY_NAME__'] = $object->thirdparty->name;
+			$formmail->substit ['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+			$formmail->substit ['__PERSONALIZED__'] = '';
+			$formmail->substit ['__CONTACTCIVNAME__'] = '';
+
+			$custcontact = '';
+			$contactarr = array();
+			$contactarr = $object->liste_contact(- 1, 'external');
+
+			if (is_array($contactarr) && count($contactarr) > 0) {
+				foreach ($contactarr as $contact) {
+					if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+						$contactstatic = new Contact($db);
+						$contactstatic->fetch($contact ['id']);
+						$custcontact = $contactstatic->getFullName($langs, 1);
+					}
+				}
+
+				if (! empty($custcontact)) {
+					$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+				}
+			}
+
+			// Tableau des parametres complementaires
+			$formmail->param['action'] = 'send';
+			$formmail->param['models'] = 'order_send';
+			$formmail->param['orderid'] = $object->id;
+			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+			// Init list of files
+			if (GETPOST("mode") == 'init') {
+				$formmail->clear_attached_files();
+				$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+			}
+
+			// Show form
+			print $formmail->get_form();
+
+			print '<br>';
+		}
+	}
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 52e454bf14e..b7207f0cd42 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3,10 +3,11 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Jean Heimburger      <jean@tiaris.info>
  * Copyright (C) 2012-2014 Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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,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
@@ -60,6 +66,7 @@ class Commande extends CommonOrder
     var $brouillon;
     var $cond_reglement_id;
     var $cond_reglement_code;
+    var $fk_account;
     var $mode_reglement_id;
     var $mode_reglement_code;
     var $availability_id;
@@ -71,6 +78,7 @@ class Commande extends CommonOrder
     var $date;				// Date commande
     var $date_commande;		// Date commande (deprecated)
     var $date_livraison;	// Date livraison souhaitee
+    var $shipping_method_id;
     var $fk_remise_except;
     var $remise_percent;
     var $total_ht;			// Total net of tax
@@ -131,18 +139,21 @@ class Commande extends CommonOrder
 
         if (! empty($conf->global->COMMANDE_ADDON))
         {
-        	$mybool=false;
+		$mybool=false;
+		$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir)
+		{
+	            $file = $conf->global->COMMANDE_ADDON.".php";
+	            $classname = $conf->global->COMMANDE_ADDON;
 
-            $file = $conf->global->COMMANDE_ADDON.".php";
-            $classname = $conf->global->COMMANDE_ADDON;
-
-            // Include file with class
-            foreach ($conf->file->dol_document_root as $dirroot)
-            {
-            	$dir = $dirroot."/core/modules/commande/";
-            	// Load file with numbering class (if found)
-            	$mybool|=@include_once $dir.$file;
-            }
+	            // Include file with class
+	            foreach ($conf->file->dol_document_root as $dirroot)
+	            {
+	            	$dir = $dirroot.$reldir."/core/modules/commande/";
+	            	// Load file with numbering class (if found)
+	            	$mybool|=@include_once $dir.$file;
+	            }
+		}
 
             if (! $mybool)
             {
@@ -177,9 +188,10 @@ class Commande extends CommonOrder
      *
      *	@param		User	$user     		User making status change
      *	@param		int		$idwarehouse	Id of warehouse to use for stock decrease
+     *  @param		int		$notrigger		1=Does not execute triggers, 0= execuete triggers
      *	@return  	int						<=0 if OK, >0 if KO
      */
-    function valid($user, $idwarehouse=0)
+    function valid($user, $idwarehouse=0, $notrigger=0)
     {
         global $conf,$langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -217,9 +229,10 @@ class Commande extends CommonOrder
             $num = $this->getNextNumRef($soc);
         }
         else
-        {
+		{
             $num = $this->ref;
         }
+        $this->newref = $num;
 
         // Validate
         $sql = "UPDATE ".MAIN_DB_PREFIX."commande";
@@ -229,12 +242,12 @@ class Commande extends CommonOrder
         $sql.= " fk_user_valid = ".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::valid() sql=".$sql);
+        dol_syslog(get_class($this)."::valid()", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql)
         {
-            dol_syslog(get_class($this)."::valid Echec update - 10 - sql=".$sql, LOG_ERR);
             dol_print_error($this->db);
+            $this->error=$this->db->lasterror();
             $error++;
         }
 
@@ -256,36 +269,55 @@ class Commande extends CommonOrder
 						$mouvP->origin = &$this;
                         // We decrement stock of product (and sub-products)
                         $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr",$num));
-                        if ($result < 0) { $error++; }
+                        if ($result < 0)
+                        {
+                        	$error++;
+                        	$this->error=$mouvP->error;
+                        }
                     }
+                    if ($error) break;
                 }
             }
         }
 
+        if (! $error && ! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('ORDER_VALIDATE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+        }
+
         if (! $error)
         {
-            $this->oldref='';
+            $this->oldref = $this->ref;
 
             // Rename directory if dir was a temporary ref
             if (preg_match('/^[\(]?PROV/i', $this->ref))
             {
-                // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
+            	// On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref)
                 // in order not to lose the attachments
-                $comref = dol_sanitizeFileName($this->ref);
-                $snum = dol_sanitizeFileName($num);
-                $dirsource = $conf->commande->dir_output.'/'.$comref;
-                $dirdest = $conf->commande->dir_output.'/'.$snum;
+                $oldref = dol_sanitizeFileName($this->ref);
+                $newref = dol_sanitizeFileName($num);
+                $dirsource = $conf->commande->dir_output.'/'.$oldref;
+                $dirdest = $conf->commande->dir_output.'/'.$newref;
                 if (file_exists($dirsource))
                 {
                     dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
 
                     if (@rename($dirsource, $dirdest))
                     {
-                        $this->oldref = $comref;
-
                         dol_syslog("Rename ok");
-                        // Suppression ancien fichier PDF dans nouveau rep
-                        dol_delete_file($conf->commande->dir_output.'/'.$snum.'/'.$comref.'*.*');
+                        // Rename docs starting with $oldref with $newref
+                        $listoffiles=dol_dir_list($conf->commande->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+                        foreach($listoffiles as $fileentry)
+                        {
+                        	$dirsource=$fileentry['name'];
+                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+                        	$dirsource=$fileentry['path'].'/'.$dirsource;
+                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+                        	@rename($dirsource, $dirdest);
+                        }
                     }
                 }
             }
@@ -294,18 +326,8 @@ class Commande extends CommonOrder
         // Set new ref and current status
         if (! $error)
         {
-        	$this->ref = $num;
-        	$this->statut = 1;
-        }
-
-        if (! $error)
-        {
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('ORDER_VALIDATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            $this->ref = $num;
+            $this->statut = 1;
         }
 
         if (! $error)
@@ -314,9 +336,8 @@ class Commande extends CommonOrder
             return 1;
         }
         else
-        {
+		{
             $this->db->rollback();
-            $this->error=$this->db->lasterror();
             return -1;
         }
     }
@@ -352,7 +373,7 @@ class Commande extends CommonOrder
         $sql.= " SET fk_statut = 0";
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::set_draft sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             // If stock is decremented on validate order, we must reincrement it
@@ -395,7 +416,6 @@ class Commande extends CommonOrder
         {
             $this->error=$this->db->error();
             $this->db->rollback();
-            dol_syslog($this->error, LOG_ERR);
             return -1;
         }
     }
@@ -424,16 +444,14 @@ class Commande extends CommonOrder
         $sql.= ' SET fk_statut=1, facture=0';
         $sql.= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::set_reopen sql=".$sql);
+        dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('ORDER_REOPEN',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('ORDER_REOPEN',$user);
+            if ($result < 0) $error++;
+            // End call triggers
         }
         else
         {
@@ -489,12 +507,10 @@ class Commande extends CommonOrder
 
             if ($this->db->query($sql))
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('ORDER_CLOSE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
+	            // Call trigger
+	            $result=$this->call_trigger('ORDER_CLOSE',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
 
                 if (! $error)
                 {
@@ -512,7 +528,6 @@ class Commande extends CommonOrder
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog($this->error, LOG_ERR);
 
                 $this->db->rollback();
                 return -1;
@@ -540,7 +555,7 @@ class Commande extends CommonOrder
 		$sql.= " WHERE rowid = ".$this->id;
 		$sql.= " AND fk_statut = 1";
 
-		dol_syslog(get_class($this)."::cancel sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			// If stock is decremented on validate order, we must reincrement it
@@ -557,8 +572,11 @@ class Commande extends CommonOrder
 						$mouvP = new MouvementStock($this->db);
 						// We increment stock of product (and sub-products)
 						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderCanceledInDolibarr",$this->ref));
-						if ($result < 0) {
+						if ($result < 0)
+						{
 							$error++;
+							$this->error=$mouvP->error;
+							break;
 						}
 					}
 				}
@@ -566,14 +584,10 @@ class Commande extends CommonOrder
 
 			if (! $error)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('ORDER_CANCEL',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
+	            // Call trigger
+	            $result=$this->call_trigger('ORDER_CANCEL',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
 			}
 
 			if (! $error)
@@ -584,8 +598,6 @@ class Commande extends CommonOrder
 			}
 			else
 			{
-				$this->error=$mouvP->error;
-
 				foreach($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
@@ -599,7 +611,6 @@ class Commande extends CommonOrder
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
-			dol_syslog($this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -658,8 +669,9 @@ 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_ext, ref_client, ref_int";
-        $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
+        $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, 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.= ")";
@@ -675,16 +687,18 @@ class Commande extends CommonOrder
         $sql.= ", '".$this->modelpdf."'";
         $sql.= ", ".($this->cond_reglement_id>0?"'".$this->cond_reglement_id."'":"null");
         $sql.= ", ".($this->mode_reglement_id>0?"'".$this->mode_reglement_id."'":"null");
+        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
         $sql.= ", ".($this->availability_id>0?"'".$this->availability_id."'":"null");
         $sql.= ", ".($this->demand_reason_id>0?"'".$this->demand_reason_id."'":"null");
         $sql.= ", ".($this->date_livraison?"'".$this->db->idate($this->date_livraison)."'":"null");
         $sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:'NULL');
+        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
         $sql.= ", ".($this->remise_absolue>0?$this->remise_absolue:'NULL');
         $sql.= ", ".($this->remise_percent>0?$this->remise_percent:0);
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -766,9 +780,10 @@ class Commande extends CommonOrder
                         		if ($origin == 'propal' && $origin_id)
                         		{
                         			// On recupere les differents contact interne et externe
-                        			$prop = new Propal($this->db, $this->socid, $origin_id);
+                        			$prop = new Propal($this->db);
+									$prop->fetch($origin_id);
 
-                        			// On recupere le commercial suivi propale
+                        			// We get ids of sales representatives of proposal
                         			$this->userid = $prop->getIdcontact('internal', 'SALESREPFOLL');
 
                         			if ($this->userid)
@@ -777,7 +792,7 @@ class Commande extends CommonOrder
                         				$this->add_contact($this->userid[0], 'SALESREPFOLL', 'internal');
                         			}
 
-                        			// On recupere le contact client suivi propale
+                        			// We get ids of customer follower of proposal
                         			$this->contactid = $prop->getIdcontact('external', 'CUSTOMER');
 
                         			if ($this->contactid)
@@ -792,6 +807,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'));
@@ -813,12 +830,10 @@ class Commande extends CommonOrder
 
                     if (! $notrigger)
                     {
-                        // Appel des triggers
-                        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                        $interface=new Interfaces($this->db);
-                        $result=$interface->run_triggers('ORDER_CREATE',$this,$user,$langs,$conf);
-                        if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                        // Fin appel triggers
+			            // Call trigger
+			            $result=$this->call_trigger('ORDER_CREATE',$user);
+			            if ($result < 0) $error++;
+			            // End call triggers
                     }
 
 	                if (!$error) {
@@ -921,12 +936,10 @@ class Commande extends CommonOrder
                 if ($reshook < 0) $error++;
             }
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('ORDER_CLONE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('ORDER_CLONE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
         }
 
         // End
@@ -1005,9 +1018,11 @@ class Commande extends CommonOrder
             $this->fk_project           = $object->fk_project;
             $this->cond_reglement_id    = $object->cond_reglement_id;
             $this->mode_reglement_id    = $object->mode_reglement_id;
+            $this->fk_account           = $object->fk_account;
             $this->availability_id      = $object->availability_id;
             $this->demand_reason_id     = $object->demand_reason_id;
             $this->date_livraison       = $object->date_livraison;
+            $this->shipping_method_id   = $object->shipping_method_id;
             $this->fk_delivery_address  = $object->fk_delivery_address;
             $this->contact_id           = $object->contactid;
             $this->ref_client           = $object->ref_client;
@@ -1142,7 +1157,7 @@ class Commande extends CommonOrder
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty,$mysoc);
 
             $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type,'', $localtaxes_type);
             $total_ht  = $tabprice[0];
@@ -1361,8 +1376,10 @@ class Commande extends CommonOrder
 
         $sql = 'SELECT c.rowid, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_statut';
         $sql.= ', c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
+        $sql.= ', c.fk_account';
         $sql.= ', c.date_commande';
         $sql.= ', c.date_livraison';
+        $sql.= ', c.fk_shipping_method';
         $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
         $sql.= ', c.note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
@@ -1380,7 +1397,7 @@ class Commande extends CommonOrder
         if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
         if ($ref_int) $sql.= " AND c.ref_int='".$this->db->escape($ref_int)."'";
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -1420,11 +1437,13 @@ class Commande extends CommonOrder
                 $this->cond_reglement_code	= $obj->cond_reglement_code;
                 $this->cond_reglement		= $obj->cond_reglement_libelle;
                 $this->cond_reglement_doc	= $obj->cond_reglement_libelle_doc;
+                $this->fk_account           = $obj->fk_account;
                 $this->availability_id		= $obj->fk_availability;
                 $this->availability_code	= $obj->availability_code;
                 $this->demand_reason_id		= $obj->fk_input_reason;
                 $this->demand_reason_code	= $obj->demand_reason_code;
                 $this->date_livraison		= $this->db->jdate($obj->date_livraison);
+                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
                 $this->fk_delivery_address	= $obj->fk_delivery_address;
 
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
@@ -1455,13 +1474,11 @@ class Commande extends CommonOrder
             else
             {
                 $this->error='Order with id '.$id.' not found sql='.$sql;
-                dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
             }
         }
         else
         {
-            dol_syslog(get_class($this).'::fetch Error rowid='.$id, LOG_ERR);
             $this->error=$this->db->error();
             return -1;
         }
@@ -1564,7 +1581,7 @@ class Commande extends CommonOrder
         if ($only_product) $sql .= ' AND p.fk_product_type = 0';
         $sql .= ' ORDER BY l.rang';
 
-        dol_syslog(get_class($this)."::fetch_lines sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -1629,7 +1646,6 @@ class Commande extends CommonOrder
         else
         {
             $this->error=$this->db->error();
-            dol_syslog('Commande::fetch_lines: Error '.$this->error, LOG_ERR);
             return -3;
         }
     }
@@ -1691,7 +1707,7 @@ class Commande extends CommonOrder
         $sql.= ' GROUP BY cd.rowid, cd.fk_product';
         //print $sql;
 
-        dol_syslog(get_class($this)."::loadExpeditions sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -1709,7 +1725,6 @@ class Commande extends CommonOrder
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::loadExpeditions ".$this->error,LOG_ERR);
             return -1;
         }
 
@@ -1924,7 +1939,7 @@ class Commande extends CommonOrder
             $sql.= ' SET remise_absolue = '.$remise;
             $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;';
 
-            dol_syslog(get_class($this)."::set_remise_absolue sql=$sql");
+            dol_syslog(get_class($this)."::set_remise_absolue", LOG_DEBUG);
 
             if ($this->db->query($sql))
             {
@@ -1956,7 +1971,7 @@ class Commande extends CommonOrder
             $sql.= " SET date_commande = ".($date ? $this->db->idate($date) : 'null');
             $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-            dol_syslog(get_class($this)."::set_date sql=$sql",LOG_DEBUG);
+            dol_syslog(get_class($this)."::set_date",LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -1966,7 +1981,6 @@ class Commande extends CommonOrder
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::set_date ".$this->error,LOG_ERR);
                 return -1;
             }
         }
@@ -1991,7 +2005,7 @@ class Commande extends CommonOrder
             $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::set_date_livraison sql=".$sql,LOG_DEBUG);
+            dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -2001,7 +2015,6 @@ class Commande extends CommonOrder
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::set_date_livraison ".$this->error,LOG_ERR);
                 return -1;
             }
         }
@@ -2235,7 +2248,6 @@ class Commande extends CommonOrder
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this).'::set_ref_client Erreur '.$this->error.' - '.$sql, LOG_ERR);
                 return -2;
             }
         }
@@ -2259,17 +2271,13 @@ class Commande extends CommonOrder
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
 		$sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		dol_syslog(get_class($this)."::classifyBilled sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('ORDER_CLASSIFY_BILLED',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('ORDER_CLASSIFY_BILLED',$user);
+            if ($result < 0) $error++;
+            // End call triggers
 
 			if (! $error)
 			{
@@ -2281,8 +2289,6 @@ class Commande extends CommonOrder
 			}
 			else
 			{
-				$this->error=$this->db->error();
-
 				foreach($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
@@ -2295,7 +2301,6 @@ class Commande extends CommonOrder
 		else
 		{
 			$this->error=$this->db->error();
-            dol_syslog(get_class($this)."::classifyBilled Error ".$this->error, LOG_ERR);
             $this->db->rollback();
 			return -1;
 		}
@@ -2371,7 +2376,7 @@ class Commande extends CommonOrder
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 
             $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, '', $localtaxes_type);
             $total_ht  = $tabprice[0];
@@ -2496,34 +2501,31 @@ class Commande extends CommonOrder
 
         if (! $error && ! $notrigger)
         {
-        	// Appel des triggers
-        	include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        	$interface=new Interfaces($this->db);
-        	$result=$interface->run_triggers('ORDER_DELETE',$this,$user,$langs,$conf);
-        	if ($result < 0) {
-        		$error++; $this->errors=$interface->errors;
-        	}
-        	// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('ORDER_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
         }
 
+        //TODO: Check for error after each action. If one failed we rollback, don't waste time to do action if previous fail
         if (! $error)
         {
         	// Delete order details
         	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE fk_commande = ".$this->id;
-        	dol_syslog(get_class($this)."::delete sql=".$sql);
+        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         	if (! $this->db->query($sql) )
         	{
-        		dol_syslog(get_class($this)."::delete error", LOG_ERR);
         		$error++;
+        		$this->errors[]=$this->db->lasterror();
         	}
 
         	// Delete order
         	$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande WHERE rowid = ".$this->id;
-        	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         	if (! $this->db->query($sql) )
         	{
-        		dol_syslog(get_class($this)."::delete error", LOG_ERR);
         		$error++;
+        		$this->errors[]=$this->db->lasterror();
         	}
 
         	// Delete linked object
@@ -2583,7 +2585,6 @@ class Commande extends CommonOrder
         }
         else
         {
-            $this->error=$this->db->lasterror();
 	        foreach($this->errors as $errmsg)
 	        {
 		        dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -2753,7 +2754,7 @@ class Commande extends CommonOrder
         $result='';
 
         if (! empty($conf->expedition->enabled) && ($option == 1 || $option == 2)) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
-        else $url = DOL_URL_ROOT.'/commande/fiche.php?id='.$this->id;
+        else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
 
         if ($short) return $url;
 
@@ -2961,6 +2962,8 @@ class Commande extends CommonOrder
      */
     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'));
@@ -3061,11 +3064,44 @@ class Commande extends CommonOrder
         else
         {
             $this->error=$this->db->error();
-            dol_syslog("Error sql=$sql, error=".$this->error,LOG_ERR);
             return -1;
         }
     }
 
+	/**
+	 *  Create a document onto disk accordign to template module.
+	 *
+	 *  @param	    string		$modele			Force le mnodele a utiliser ('' to not force)
+	 *  @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,$user,$langs,$hookmanager;
+
+		$langs->load("orders");
+
+		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->COMMANDE_ADDON_PDF))
+			{
+				$modele = $conf->global->COMMANDE_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'einstein';
+			}
+		}
+
+		$modelpath = "core/modules/commande/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
 }
 
 
@@ -3227,7 +3263,7 @@ class OrderLine extends CommonOrderLine
 
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commandedet WHERE rowid='".$this->rowid."';";
 
-        dol_syslog("OrderLine::delete sql=".$sql);
+        dol_syslog("OrderLine::delete", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -3243,12 +3279,10 @@ class OrderLine extends CommonOrderLine
 				}
 			}
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('LINEORDER_DELETE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('LINEORDER_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
 
 	        if (!$error) {
 		        $this->db->commit();
@@ -3266,7 +3300,6 @@ class OrderLine extends CommonOrderLine
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog("OrderLine::delete ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -3283,7 +3316,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;
@@ -3351,7 +3384,7 @@ class OrderLine extends CommonOrderLine
         $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null");
         $sql.= ')';
 
-        dol_syslog(get_class($this)."::insert sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -3369,12 +3402,10 @@ class OrderLine extends CommonOrderLine
 
             if (! $notrigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('LINEORDER_INSERT',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
+	            // Call trigger
+	            $result=$this->call_trigger('LINEORDER_INSERT',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
             }
 
 	        if (!$error) {
@@ -3393,7 +3424,6 @@ class OrderLine extends CommonOrderLine
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -2;
         }
@@ -3471,7 +3501,7 @@ class OrderLine extends CommonOrderLine
 		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
 		$sql.= " WHERE rowid = ".$this->rowid;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -3487,12 +3517,10 @@ class OrderLine extends CommonOrderLine
 
 			if (! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result = $interface->run_triggers('LINEORDER_UPDATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+	            // Call trigger
+	            $result=$this->call_trigger('LINEORDER_UPDATE',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
 			}
 
 			if (!$error) {
@@ -3511,7 +3539,6 @@ class OrderLine extends CommonOrderLine
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -2;
 		}
@@ -3539,7 +3566,7 @@ class OrderLine extends CommonOrderLine
         $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
         $sql.= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog("OrderLine::update_total sql=$sql");
+        dol_syslog("OrderLine::update_total", LOG_DEBUG);
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -3550,7 +3577,6 @@ class OrderLine extends CommonOrderLine
         else
         {
             $this->error=$this->db->error();
-            dol_syslog("OrderLine::update_total Error ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -2;
         }
diff --git a/htdocs/commande/class/index.html b/htdocs/commande/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index e4b30a6e60d..c36f19c166b 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -69,11 +69,11 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -132,7 +132,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
@@ -153,7 +152,7 @@ if ($id > 0 || ! empty($ref))
 		*/
 		print '<table class="border" width="100%">';
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 		// Ref
 		print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 29812903d12..333ce5f7908 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -67,7 +67,7 @@ $thirdpartystatic=new Societe($db);
  * Mode List
  */
 
-$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea";
+$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
@@ -146,7 +146,7 @@ if ($resql)
 	print '</td>';
 	print "</tr>\n";
 
-	$var=True;
+	$var=true;
 
 	while ($i < min($num,$conf->liste_limit))
 	{
@@ -161,7 +161,7 @@ if ($resql)
         $lien=$lienfin='';
         $lien = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php',1).'?socid='.$obj->rowid.'">';
         $lienfin='</a>';
-        $name=$obj->nom;
+        $name=$obj->name;
         $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
         $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin;
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index d939b106c7f..2d9c80e9d2d 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -106,7 +106,7 @@ if ($id > 0 || ! empty($ref))
 
 		print '<table class="border" width="100%">';
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 		// Ref
 		print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
deleted file mode 100644
index 1c01b975a3b..00000000000
--- a/htdocs/commande/fiche.php
+++ /dev/null
@@ -1,2490 +0,0 @@
-<?php
-/* Copyright (C) 2003-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
- * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
- * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2012-2013	Christophe Battarel		<christophe.battarel@altairis.fr>
- * Copyright (C) 2012		Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/commande/fiche.php
- * \ingroup commande
- * \brief Page to show customer order
- */
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formorder.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
-require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
-require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-if (! empty($conf->propal->enabled))
-	require DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
-if (! empty($conf->projet->enabled)) {
-	require DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
-}
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-
-$langs->load('orders');
-$langs->load('sendings');
-$langs->load('companies');
-$langs->load('bills');
-$langs->load('propal');
-$langs->load('deliveries');
-$langs->load('products');
-if (! empty($conf->margin->enabled))
-	$langs->load('margins');
-
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));
-$ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
-$confirm = GETPOST('confirm', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$origin = GETPOST('origin', 'alpha');
-$originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
-
-$mesg = GETPOST('mesg');
-
-// PDF
-$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
-$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
-
-// Security check
-if (! empty($user->societe_id))
-	$socid = $user->societe_id;
-$result = restrictedArea($user, 'commande', $id);
-
-$object = new Commande($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-if ($id > 0 || ! empty($ref)) {
-	$ret = $object->fetch($id, $ref);
-	$ret = $object->fetch_thirdparty();
-}
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('ordercard'));
-
-$permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php
-
-/*
- * Actions
- */
-
-$parameters = array('socid' => $socid);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-
-include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
-
-// Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->commande->creer)
-{
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
-	{
-		$mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
-	}
-	else
-	{
-		if ($object->id > 0)
-		{
-			// Because createFromClone modifies the object, we must clone it so that we can restore it later
-			$orig = dol_clone($object);
-
-			$result=$object->createFromClone($socid);
-			if ($result > 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-				exit;
-			}
-			else
-			{
-				setEventMessage($object->error, 'errors');
-				$object = $orig;
-				$action='';
-			}
-		}
-	}
-}
-
-// Reopen a closed order
-else if ($action == 'reopen' && $user->rights->commande->creer) {
-	if ($object->statut == 3) {
-		$result = $object->set_reopen($user);
-		if ($result > 0)
-		{
-			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-			exit;
-		}
-		else
-		{
-			setEventMessage($object->error, 'errors');
-		}
-	}
-}
-
-// Suppression de la commande
-else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->commande->supprimer) {
-	$result = $object->delete($user);
-	if ($result > 0) {
-		header('Location: index.php');
-		exit;
-	}
-	else {
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-// Remove a product line
-else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->commande->creer) {
-	$result = $object->deleteline($lineid);
-	if ($result > 0) {
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-			$newlang = GETPOST('lang_id');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->client->default_lang;
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("", $conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-			$ret = $object->fetch($object->id); // Reload to get new records
-			commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		}
-
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-// Categorisation dans projet
-else if ($action == 'classin' && $user->rights->commande->creer) {
-	$object->setProject(GETPOST('projectid'));
-}
-
-// Add order
-else if ($action == 'add' && $user->rights->commande->creer) {
-	$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-	$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
-
-	if ($datecommande == '') {
-		$mesg = '<div class="error">' . $langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')) . '</div>';
-		$action = 'create';
-		$error ++;
-	}
-
-	if ($socid < 1) {
-		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Customer")), 'errors');
-		$action = 'create';
-		$error ++;
-	}
-
-	if (! $error) {
-		$object->socid = $socid;
-		$object->fetch_thirdparty();
-
-		$db->begin();
-
-		$object->date_commande = $datecommande;
-		$object->note_private = GETPOST('note_private');
-		$object->note_public = GETPOST('note_public');
-		$object->source = GETPOST('source_id');
-		$object->fk_project = GETPOST('projectid');
-		$object->ref_client = GETPOST('ref_client');
-		$object->modelpdf = GETPOST('model');
-		$object->cond_reglement_id = GETPOST('cond_reglement_id');
-		$object->mode_reglement_id = GETPOST('mode_reglement_id');
-		$object->availability_id = GETPOST('availability_id');
-		$object->demand_reason_id = GETPOST('demand_reason_id');
-		$object->date_livraison = $datelivraison;
-		$object->fk_delivery_address = GETPOST('fk_address');
-		$object->contactid = GETPOST('contactidp');
-
-		// If creation from another object of another module (Example: origin=propal, originid=1)
-		if (! empty($origin) && ! empty($originid)) {
-			// Parse element/subelement (ex: project_task)
-			$element = $subelement = $origin;
-			if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
-				$element = $regs [1];
-				$subelement = $regs [2];
-			}
-
-			// For compatibility
-			if ($element == 'order') {
-				$element = $subelement = 'commande';
-			}
-			if ($element == 'propal') {
-				$element = 'comm/propal';
-				$subelement = 'propal';
-			}
-			if ($element == 'contract') {
-				$element = $subelement = 'contrat';
-			}
-
-			$object->origin = $origin;
-			$object->origin_id = $originid;
-
-			// Possibility to add external linked objects with hooks
-			$object->linked_objects [$object->origin] = $object->origin_id;
-			$other_linked_objects = GETPOST('other_linked_objects', 'array');
-			if (! empty($other_linked_objects)) {
-				$object->linked_objects = array_merge($object->linked_objects, $other_linked_objects);
-			}
-
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-			if ($ret < 0)
-				$error ++;
-
-			if (! $error)
-			{
-				$object_id = $object->create($user);
-
-				if ($object_id > 0)
-				{
-					dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
-
-					$classname = ucfirst($subelement);
-					$srcobject = new $classname($db);
-
-					dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
-					$result = $srcobject->fetch($object->origin_id);
-					if ($result > 0)
-					{
-						$lines = $srcobject->lines;
-						if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-						{
-							$srcobject->fetch_lines();
-							$lines = $srcobject->lines;
-						}
-
-						$fk_parent_line = 0;
-						$num = count($lines);
-
-						for($i = 0; $i < $num; $i ++)
-						{
-							$label = (! empty($lines [$i]->label) ? $lines [$i]->label : '');
-							$desc = (! empty($lines [$i]->desc) ? $lines [$i]->desc : $lines [$i]->libelle);
-							$product_type = (! empty($lines [$i]->product_type) ? $lines [$i]->product_type : 0);
-
-							// Dates
-							// TODO mutualiser
-							$date_start = $lines [$i]->date_debut_prevue;
-							if ($lines [$i]->date_debut_reel)
-								$date_start = $lines [$i]->date_debut_reel;
-							if ($lines [$i]->date_start)
-								$date_start = $lines [$i]->date_start;
-							$date_end = $lines [$i]->date_fin_prevue;
-							if ($lines [$i]->date_fin_reel)
-								$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;
-							}
-
-							// Extrafields
-							if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines [$i], 'fetch_optionals')) 							// For avoid conflicts if
-							                                                                                                      // trigger used
-							{
-								$lines [$i]->fetch_optionals($lines [$i]->rowid);
-								$array_option = $lines [$i]->array_options;
-							}
-
-							$result = $object->addline($desc, $lines [$i]->subprice, $lines [$i]->qty, $lines [$i]->tva_tx, $lines [$i]->localtax1_tx, $lines [$i]->localtax2_tx, $lines [$i]->fk_product, $lines [$i]->remise_percent, $lines [$i]->info_bits, $lines [$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines [$i]->rang, $lines [$i]->special_code, $fk_parent_line, $lines [$i]->fk_fournprice, $lines [$i]->pa_ht, $label, $array_option);
-
-							if ($result < 0) {
-								$error ++;
-								break;
-							}
-
-							// Defined the new fk_parent_line
-							if ($result > 0 && $lines [$i]->product_type == 9) {
-								$fk_parent_line = $result;
-							}
-						}
-
-						// Hooks
-						$parameters = array('objFrom' => $srcobject);
-						$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
-						                                                                               // modified by hook
-						if ($reshook < 0)
-							$error ++;
-					} else {
-						$mesg = $srcobject->error;
-						$error ++;
-					}
-				} else {
-					$mesg = $object->error;
-					$error ++;
-				}
-			} else {
-				// Required extrafield left blank, error message already defined by setOptionalsFromPost()
-				$action = 'create';
-			}
-		} else {
-			// Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-			if ($ret < 0)
-				$error ++;
-
-			if (! $error) {
-				$object_id = $object->create($user);
-
-				// If some invoice's lines already known
-				$NBLINES = 8;
-				for($i = 1; $i <= $NBLINES; $i ++) {
-					if ($_POST ['idprod' . $i]) {
-						$xid = 'idprod' . $i;
-						$xqty = 'qty' . $i;
-						$xremise = 'remise_percent' . $i;
-						$object->add_product($_POST [$xid], $_POST [$xqty], $_POST [$xremise]);
-					}
-				}
-			}
-		}
-
-		// Insert default contacts if defined
-		if ($object_id > 0) {
-			if (GETPOST('contactidp')) {
-				$result = $object->add_contact(GETPOST('contactidp'), 'CUSTOMER', 'external');
-				if ($result < 0) {
-					$mesg = '<div class="error">' . $langs->trans("ErrorFailedToAddContact") . '</div>';
-					$error ++;
-				}
-			}
-
-			$id = $object_id;
-			$action = '';
-		}
-
-		// End of object creation, we show it
-		if ($object_id > 0 && ! $error) {
-			$db->commit();
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object_id);
-			exit();
-		} else {
-			$db->rollback();
-			$action = 'create';
-			if (! $mesg)
-				$mesg = '<div class="error">' . $object->error . '</div>';
-		}
-	}
-}
-
-else if ($action == 'classifybilled' && $user->rights->commande->creer)
-{
-	$ret=$object->classifyBilled();
-
-	if ($ret < 0) {
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-// Positionne ref commande client
-else if ($action == 'set_ref_client' && $user->rights->commande->creer) {
-	$object->set_ref_client($user, GETPOST('ref_client'));
-}
-
-else if ($action == 'setremise' && $user->rights->commande->creer) {
-	$object->set_remise($user, GETPOST('remise'));
-}
-
-else if ($action == 'setabsolutediscount' && $user->rights->commande->creer) {
-	if (GETPOST('remise_id')) {
-		if ($object->id > 0) {
-			$object->insert_discount(GETPOST('remise_id'));
-		} else {
-			dol_print_error($db, $object->error);
-		}
-	}
-}
-
-else if ($action == 'setdate' && $user->rights->commande->creer) {
-	// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
-
-	$result = $object->set_date($user, $date);
-	if ($result < 0) {
-		$mesg = '<div class="error">' . $object->error . '</div>';
-	}
-}
-
-else if ($action == 'setdate_livraison' && $user->rights->commande->creer) {
-	// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-	$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
-
-	$result = $object->set_date_livraison($user, $datelivraison);
-	if ($result < 0) {
-		$mesg = '<div class="error">' . $object->error . '</div>';
-	}
-}
-
-else if ($action == 'setmode' && $user->rights->commande->creer) {
-	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	if ($result < 0)
-		dol_print_error($db, $object->error);
-}
-
-else if ($action == 'setavailability' && $user->rights->commande->creer) {
-	$result = $object->availability(GETPOST('availability_id'));
-	if ($result < 0)
-		dol_print_error($db, $object->error);
-}
-
-else if ($action == 'setdemandreason' && $user->rights->commande->creer) {
-	$result = $object->demand_reason(GETPOST('demand_reason_id'));
-	if ($result < 0)
-		dol_print_error($db, $object->error);
-}
-
-else if ($action == 'setconditions' && $user->rights->commande->creer) {
-	$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	if ($result < 0) {
-		dol_print_error($db, $object->error);
-	} else {
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = GETPOST('lang_id', 'alpha');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->client->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-
-			$ret = $object->fetch($object->id); // Reload to get new records
-			commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		}
-	}
-}
-
-else if ($action == 'setremisepercent' && $user->rights->commande->creer) {
-	$result = $object->set_remise($user, GETPOST('remise_percent'));
-}
-
-else if ($action == 'setremiseabsolue' && $user->rights->commande->creer) {
-	$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
-}
-
-// Add a new line
-else if ($action == 'addline' && $user->rights->commande->creer) {
-	$langs->load('errors');
-	$error = 0;
-
-	// 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;
-		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-	}
-	else
-	{
-		$idprod=GETPOST('idprod', 'int');
-		$tva_tx = '';
-	}
-
-	$qty = GETPOST('qty' . $predef);
-	$remise_percent = GETPOST('remise_percent' . $predef);
-
-	// Extrafields
-	$extrafieldsline = new ExtraFields($db);
-	$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-	$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
-	// Unset extrafield
-	if (is_array($extralabelsline)) {
-		// Get extra fields
-		foreach ($extralabelsline as $key => $value) {
-			unset($_POST ["options_" . $key]);
-		}
-	}
-
-	if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
-		setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), 'errors');
-		$error ++;
-	}
-	if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
-		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
-		$error ++;
-	}
-	if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), 'errors');
-		$error ++;
-	}
-	if ($qty == '') {
-		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
-		$error ++;
-	}
-	if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
-		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
-		$error ++;
-	}
-
-	if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) {
-		// Clean parameters
-		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), 0, GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-		$date_end=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), 0, GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-		$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
-
-		// Ecrase $pu par celui du produit
-		// Ecrase $desc par celui du produit
-		// Ecrase $txtva par celui du produit
-		// Ecrase $base_price_type par celui du produit
-		if (! empty($idprod)) {
-			$prod = new Product($db);
-			$prod->fetch($idprod);
-
-			$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
-
-			// Update if prices fields are defined
-				$tva_tx = get_default_tva($mysoc, $object->client, $prod->id);
-				$tva_npr = get_default_npr($mysoc, $object->client, $prod->id);
-
-				// multiprix
-				if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->client->price_level))
-				{
-					$pu_ht = $prod->multiprices [$object->client->price_level];
-					$pu_ttc = $prod->multiprices_ttc [$object->client->price_level];
-					$price_min = $prod->multiprices_min [$object->client->price_level];
-					$price_base_type = $prod->multiprices_base_type [$object->client->price_level];
-					if (isset($prod->multiprices_tva_tx[$object->client->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->client->price_level];
-					if (isset($prod->multiprices_recuperableonly[$object->client->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->client->price_level];
-				}
-				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-				{
-					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-					$prodcustprice = new Productcustomerprice($db);
-
-					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
-
-					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result >= 0) {
-						if (count($prodcustprice->lines) > 0) {
-							$found = true;
-							$pu_ht = price($prodcustprice->lines[0]->price);
-							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-							$price_base_type = $prodcustprice->lines[0]->price_base_type;
-							$prod->tva_tx = $prodcustprice->lines[0]->tva_tx;
-						} else {
-							$pu_ht = $prod->price;
-							$pu_ttc = $prod->price_ttc;
-							$price_min = $prod->price_min;
-							$price_base_type = $prod->price_base_type;
-						}
-					} else {
-						setEventMessage($prodcustprice->error,'errors');
-					}
-				}
-				else
-				{
-					$pu_ht = $prod->price;
-					$pu_ttc = $prod->price_ttc;
-					$price_min = $prod->price_min;
-					$price_base_type = $prod->price_base_type;
-				}
-
-				// if price ht is forced (ie: calculated by margin rate and cost price)
-				if (! empty($price_ht)) {
-					$pu_ht = price2num($price_ht, 'MU');
-					$pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU');
-				}
-
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
-				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-				elseif ($tva_tx != $prod->tva_tx) {
-					if ($price_base_type != 'HT') {
-						$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU');
-					} else {
-						$pu_ttc = price2num($pu_ht * (1 + ($tva_tx / 100)), 'MU');
-					}
-				}
-
-				$desc = '';
-
-				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
-					$outputlangs = $langs;
-					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id'))
-						$newlang = GETPOST('lang_id');
-					if (empty($newlang))
-						$newlang = $object->client->default_lang;
-					if (! empty($newlang)) {
-						$outputlangs = new Translate("", $conf);
-						$outputlangs->setDefaultLang($newlang);
-					}
-
-					$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
-				} else {
-					$desc = $prod->description;
-				}
-
-				$desc = dol_concatdesc($desc, $product_desc);
-
-				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code))) {
-					$tmptxt = '(';
-					if (! empty($prod->customcode))
-						$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
-					if (! empty($prod->customcode) && ! empty($prod->country_code))
-						$tmptxt .= ' - ';
-					if (! empty($prod->country_code))
-						$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
-					$tmptxt .= ')';
-					$desc = dol_concatdesc($desc, $tmptxt);
-				}
-
-			$type = $prod->type;
-		} else {
-			$pu_ht = price2num($price_ht, 'MU');
-			$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
-			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
-			$tva_tx = str_replace('*', '', $tva_tx);
-			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
-			$desc = $product_desc;
-			$type = GETPOST('type');
-		}
-
-		// Margin
-		$fournprice = (GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-		$buyingprice = (GETPOST('buying_price' . $predef) ? GETPOST('buying_price' . $predef) : '');
-
-		// Local Taxes
-		$localtax1_tx = get_localtax($tva_tx, 1, $object->client);
-		$localtax2_tx = get_localtax($tva_tx, 2, $object->client);
-
-		$desc = dol_htmlcleanlastbr($desc);
-
-		$info_bits = 0;
-		if ($tva_npr)
-			$info_bits |= 0x01;
-
-		if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))) {
-			$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-			setEventMessage($mesg, 'errors');
-		} else {
-			// Insert line
-			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option);
-
-			if ($result > 0) {
-				$ret = $object->fetch($object->id); // Reload to get new records
-
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-					// Define output language
-					$outputlangs = $langs;
-					$newlang = GETPOST('lang_id', 'alpha');
-					if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
-						$newlang = $object->client->default_lang;
-					if (! empty($newlang)) {
-						$outputlangs = new Translate("", $conf);
-						$outputlangs->setDefaultLang($newlang);
-					}
-
-					commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				}
-
-				unset($_POST ['prod_entry_mode']);
-
-				unset($_POST ['qty']);
-				unset($_POST ['type']);
-				unset($_POST ['remise_percent']);
-				unset($_POST ['price_ht']);
-				unset($_POST ['price_ttc']);
-				unset($_POST ['tva_tx']);
-				unset($_POST ['product_ref']);
-				unset($_POST ['product_label']);
-				unset($_POST ['product_desc']);
-				unset($_POST ['fournprice']);
-				unset($_POST ['buying_price']);
-				unset($_POST ['np_marginRate']);
-				unset($_POST ['np_markRate']);
-				unset($_POST ['dp_desc']);
-				unset($_POST ['idprod']);
-
-		    	unset($_POST['date_starthour']);
-		    	unset($_POST['date_startmin']);
-		    	unset($_POST['date_startsec']);
-		    	unset($_POST['date_startday']);
-		    	unset($_POST['date_startmonth']);
-		    	unset($_POST['date_startyear']);
-		    	unset($_POST['date_endhour']);
-		    	unset($_POST['date_endmin']);
-		    	unset($_POST['date_endsec']);
-		    	unset($_POST['date_endday']);
-		    	unset($_POST['date_endmonth']);
-		    	unset($_POST['date_endyear']);
-			} else {
-				setEventMessage($object->error, 'errors');
-			}
-		}
-	}
-}
-
-/*
- *  Mise a jour d'une ligne dans la commande
-*/
-else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('save') == $langs->trans('Save')) {
-	// Clean parameters
-	$date_start='';
-	$date_end='';
-	$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-	$date_end=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-	$description=dol_htmlcleanlastbr(GETPOST('product_desc'));
-	$pu_ht=GETPOST('price_ht');
-	$vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
-
-	// Define info_bits
-	$info_bits = 0;
-	if (preg_match('/\*/', $vat_rate))
-		$info_bits |= 0x01;
-
-		// Define vat_rate
-	$vat_rate = str_replace('*', '', $vat_rate);
-	$localtax1_rate = get_localtax($vat_rate, 1, $object->client);
-	$localtax2_rate = get_localtax($vat_rate, 2, $object->client);
-
-	// Add buying price
-	$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
-	$buyingprice = (GETPOST('buying_price') ? GETPOST('buying_price') : '');
-
-	// Extrafields Lines
-	$extrafieldsline = new ExtraFields($db);
-	$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-	$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline);
-	// Unset extrafield POST Data
-	if (is_array($extralabelsline)) {
-		foreach ($extralabelsline as $key => $value) {
-			unset($_POST ["options_" . $key]);
-		}
-	}
-
-	// Check minimum price
-	$productid = GETPOST('productid', 'int');
-	if (! empty($productid)) {
-		$product = new Product($db);
-		$product->fetch($productid);
-
-		$type = $product->type;
-
-		$price_min = $product->price_min;
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->client->price_level))
-			$price_min = $product->multiprices_min [$object->client->price_level];
-
-		$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
-
-		if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
-			setEventMessage($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), 'errors');
-			$error ++;
-		}
-	} else {
-		$type = GETPOST('type');
-		$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
-
-		// Check parameters
-		if (GETPOST('type') < 0) {
-			setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), 'errors');
-			$error ++;
-		}
-	}
-
-	if (! $error) {
-		$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option);
-
-		if ($result >= 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				// Define output language
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
-					$newlang = GETPOST('lang_id');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $object->client->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-
-				$ret = $object->fetch($object->id); // Reload to get new records
-				commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-
-			unset($_POST ['qty']);
-			unset($_POST ['type']);
-			unset($_POST ['productid']);
-			unset($_POST ['remise_percent']);
-			unset($_POST ['price_ht']);
-			unset($_POST ['price_ttc']);
-			unset($_POST ['tva_tx']);
-			unset($_POST ['product_ref']);
-			unset($_POST ['product_label']);
-			unset($_POST ['product_desc']);
-			unset($_POST ['fournprice']);
-			unset($_POST ['buying_price']);
-		} else {
-			setEventMessage($object->error, 'errors');
-		}
-	}
-}
-
-else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('cancel') == $langs->trans('Cancel')) {
-	header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
-	exit();
-}
-
-else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->commande->valider) {
-	$idwarehouse = GETPOST('idwarehouse');
-
-    $qualified_for_stock_change=0;
-	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-	}
-	else
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-	}
-
-	// Check parameters
-	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-	{
-		if (! $idwarehouse || $idwarehouse == -1)
-		{
-			$error++;
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).'</div>';
-			$action='';
-		}
-	}
-
-	if (! $error) {
-		$result = $object->valid($user, $idwarehouse);
-		if ($result >= 0) {
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->client->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		}
-	}
-}
-
-// Go back to draft status
-else if ($action == 'confirm_modif' && $user->rights->commande->creer) {
-	$idwarehouse = GETPOST('idwarehouse');
-
-    $qualified_for_stock_change=0;
-	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-	}
-	else
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-	}
-
-	// Check parameters
-	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-	{
-		if (! $idwarehouse || $idwarehouse == -1)
-		{
-			$error++;
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).'</div>';
-			$action='';
-		}
-	}
-
-	if (! $error) {
-		$result = $object->set_draft($user, $idwarehouse);
-		if ($result >= 0) {
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->client->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$ret = $object->fetch($object->id); // Reload to get new records
-				commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-		}
-	}
-}
-
-else if ($action == 'confirm_shipped' && $confirm == 'yes' && $user->rights->commande->cloturer) {
-	$result = $object->cloture($user);
-	if ($result < 0) {
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-else if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->commande->valider) {
-	$idwarehouse = GETPOST('idwarehouse');
-
-    $qualified_for_stock_change=0;
-	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-	}
-	else
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-	}
-
-	// Check parameters
-	if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-	{
-		if (! $idwarehouse || $idwarehouse == -1)
-		{
-			$error++;
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).'</div>';
-			$action='';
-		}
-	}
-
-	if (! $error) {
-		$result = $object->cancel($idwarehouse);
-
-		if ($result < 0) {
-			setEventMessage($object->error, 'errors');
-		}
-	}
-}
-
-/*
- * Ordonnancement des lignes
-*/
-
-else if ($action == 'up' && $user->rights->commande->creer) {
-	$object->line_up(GETPOST('rowid'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-		$newlang = $_REQUEST['lang_id'];
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-		$newlang = $object->client->default_lang;
-	if (! empty($newlang)) {
-		$outputlangs = new Translate("", $conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
-	exit();
-}
-
-else if ($action == 'down' && $user->rights->commande->creer) {
-	$object->line_down(GETPOST('rowid'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-		$newlang = $_REQUEST['lang_id'];
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-		$newlang = $object->client->default_lang;
-	if (! empty($newlang)) {
-		$outputlangs = new Translate("", $conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
-	exit();
-}
-
-else if ($action == 'builddoc') // In get or post
-{
-	/*
-	 * Generate order document
-	 * define into /core/modules/commande/modules_commande.php
-	 */
-
-	// Save last template used to generate document
-	if (GETPOST('model'))
-		$object->setDocModel($user, GETPOST('model', 'alpha'));
-
-		// Define output language
-	$outputlangs = $langs;
-	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-		$newlang = $_REQUEST['lang_id'];
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-		$newlang = $object->client->default_lang;
-	if (! empty($newlang)) {
-		$outputlangs = new Translate("", $conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	$result = commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-	if ($result <= 0) {
-		dol_print_error($db, $result);
-		exit();
-	}
-}
-
-// Remove file in doc form
-else if ($action == 'remove_file') {
-	if ($object->id > 0) {
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-		$langs->load("other");
-		$upload_dir = $conf->commande->dir_output;
-		$file = $upload_dir . '/' . GETPOST('file');
-		$ret = dol_delete_file($file, 0, 0, 0, $object);
-		if ($ret)
-			setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-		else
-			setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-		$action = '';
-	}
-}
-
-// 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);
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-	if ($ret < 0)
-		$error ++;
-
-	if (! $error) {
-		// 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' => $object->id);
-		$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by
-		                                                                                      // some hooks
-		if (empty($reshook)) {
-			$result = $object->insertExtraFields();
-			if ($result < 0) {
-				$error ++;
-			}
-		} else if ($reshook < 0)
-			$error ++;
-	}
-
-	if ($error)
-		$action = 'edit_extras';
-}
-
-/*
- * Add file in email form
-*/
-if (GETPOST('addfile')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-	// Set tmp user directory TODO Use a dedicated directory for temp mails files
-	$vardir = $conf->user->dir_output . "/" . $user->id;
-	$upload_dir_tmp = $vardir . '/temp';
-
-	dol_add_file_process($upload_dir_tmp, 0, 0);
-	$action = 'presend';
-}
-
-/*
- * Remove file in email form
-*/
-if (GETPOST('removedfile')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-	// Set tmp user directory
-	$vardir = $conf->user->dir_output . "/" . $user->id;
-	$upload_dir_tmp = $vardir . '/temp';
-
-	// TODO Delete only files that was uploaded from email form
-	dol_remove_file_process(GETPOST('removedfile'), 0);
-	$action = 'presend';
-}
-
-/*
- * Send mail
-*/
-if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel')) {
-	$langs->load('mails');
-
-	if ($object->id > 0) {
-		// $ref = dol_sanitizeFileName($object->ref);
-		// $file = $conf->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-
-		// if (is_readable($file))
-		// {
-		if (GETPOST('sendto')) {
-			// Le destinataire a ete fourni via le champ libre
-			$sendto = GETPOST('sendto');
-			$sendtoid = 0;
-		} elseif (GETPOST('receiver') != '-1') {
-			// Recipient was provided from combo list
-			if (GETPOST('receiver') == 'thirdparty') 			// Id of third party
-			{
-				$sendto = $object->client->email;
-				$sendtoid = 0;
-			} else 			// Id du contact
-			{
-				$sendto = $object->client->contact_get_property(GETPOST('receiver'), 'email');
-				$sendtoid = GETPOST('receiver');
-			}
-		}
-
-		if (dol_strlen($sendto)) {
-			$langs->load("commercial");
-
-			$from = GETPOST('fromname') . ' <' . GETPOST('frommail') . '>';
-			$replyto = GETPOST('replytoname') . ' <' . GETPOST('replytomail') . '>';
-			$message = GETPOST('message');
-			$sendtocc = GETPOST('sendtocc');
-			$deliveryreceipt = GETPOST('deliveryreceipt');
-
-			if ($action == 'send') {
-				if (dol_strlen(GETPOST('subject')))
-					$subject = GETPOST('subject');
-				else
-					$subject = $langs->transnoentities('Order') . ' ' . $object->ref;
-				$actiontypecode = 'AC_COM';
-				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
-				if ($message) {
-					$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-					$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-					$actionmsg .= $message;
-				}
-				$actionmsg2 = $langs->transnoentities('Action' . $actiontypecode);
-			}
-
-			// Create form object
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-
-			$attachedfiles = $formmail->get_attached_files();
-			$filepath = $attachedfiles ['paths'];
-			$filename = $attachedfiles ['names'];
-			$mimetype = $attachedfiles ['mimes'];
-
-			// Send mail
-			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, - 1);
-			if ($mailfile->error) {
-				$mesg = '<div class="error">' . $mailfile->error . '</div>';
-			} else {
-				$result = $mailfile->sendfile();
-				if ($result) {
-					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)); // Must not
-					                                                                                                                      // contains "
-
-					$error = 0;
-
-					// Initialisation donnees
-					$object->sendtoid = $sendtoid;
-					$object->actiontypecode = $actiontypecode;
-					$object->actionmsg = $actionmsg;
-					$object->actionmsg2 = $actionmsg2;
-					$object->fk_element = $object->id;
-					$object->elementtype = $object->element;
-
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface = new Interfaces($db);
-					$result = $interface->run_triggers('ORDER_SENTBYMAIL', $object, $user, $langs, $conf);
-					if ($result < 0) {
-						$error ++;
-						$this->errors = $interface->errors;
-					}
-					// Fin appel triggers
-
-					if ($error) {
-						dol_print_error($db);
-					} else {
-						// Redirect here
-						// This avoid sending mail twice if going out and then back to page
-						header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&mesg=' . urlencode($mesg));
-						exit();
-					}
-				} else {
-					$langs->load("other");
-					$mesg = '<div class="error">';
-					if ($mailfile->error) {
-						$mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
-						$mesg .= '<br>' . $mailfile->error;
-					} else {
-						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-					}
-					$mesg .= '</div>';
-				}
-			}
-			/*            }
-			 else
-			{
-			$langs->load("other");
-			$mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
-			$action='presend';
-			dol_syslog('Recipient email is empty');
-			}*/
-		} else {
-			$langs->load("errors");
-			$mesg = '<div class="error">' . $langs->trans('ErrorCantReadFile', $file) . '</div>';
-			dol_syslog('Failed to read file: ' . $file);
-		}
-	} else {
-		$langs->load("other");
-		$mesg = '<div class="error">' . $langs->trans('ErrorFailedToReadEntity', $langs->trans("Order")) . '</div>';
-		dol_syslog($langs->trans('ErrorFailedToReadEntity', $langs->trans("Order")));
-	}
-}
-
-if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer) {
-	if ($action == 'addcontact') {
-		if ($object->id > 0) {
-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
-		}
-
-		if ($result >= 0) {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
-			exit();
-		} else {
-			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-				$langs->load("errors");
-				$mesg = '<div class="error">' . $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType") . '</div>';
-			} else {
-				$mesg = '<div class="error">' . $object->error . '</div>';
-			}
-		}
-	}
-
-	// bascule du statut d'un contact
-	else if ($action == 'swapstatut') {
-		if ($object->id > 0) {
-			$result = $object->swapContactStatus(GETPOST('ligne'));
-		} else {
-			dol_print_error($db);
-		}
-	}
-
-	// Efface un contact
-	else if ($action == 'deletecontact') {
-		$result = $object->delete_contact($lineid);
-
-		if ($result >= 0) {
-			header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
-			exit();
-		} else {
-			dol_print_error($db);
-		}
-	}
-}
-
-/*
- *	View
- */
-
-llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$formorder = new FormOrder($db);
-
-/**
- * *******************************************************************
- *
- * Mode creation
- *
- * *******************************************************************
- */
-if ($action == 'create' && $user->rights->commande->creer) {
-	print_fiche_titre($langs->trans('CreateOrder'));
-
-	dol_htmloutput_mesg($mesg, $mesgs, 'error');
-
-	$soc = new Societe($db);
-	if ($socid > 0)
-		$res = $soc->fetch($socid);
-
-	if (! empty($origin) && ! empty($originid)) {
-		// Parse element/subelement (ex: project_task)
-		$element = $subelement = $origin;
-		if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
-			$element = $regs [1];
-			$subelement = $regs [2];
-		}
-
-		if ($element == 'project') {
-			$projectid = $originid;
-		} else {
-			// For compatibility
-			if ($element == 'order' || $element == 'commande') {
-				$element = $subelement = 'commande';
-			}
-			if ($element == 'propal') {
-				$element = 'comm/propal';
-				$subelement = 'propal';
-			}
-			if ($element == 'contract') {
-				$element = $subelement = 'contrat';
-			}
-
-			dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
-
-			$classname = ucfirst($subelement);
-			$objectsrc = new $classname($db);
-			$objectsrc->fetch($originid);
-			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
-				$objectsrc->fetch_lines();
-			$objectsrc->fetch_thirdparty();
-
-			// Replicate extrafields
-			$objectsrc->fetch_optionals($originid);
-			$object->array_options = $objectsrc->array_options;
-
-			$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
-			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
-
-			$soc = $objectsrc->client;
-			$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));
-			$availability_id	= (!empty($objectsrc->availability_id)?$objectsrc->availability_id:(!empty($soc->availability_id)?$soc->availability_id:0));
-			$demand_reason_id	= (!empty($objectsrc->demand_reason_id)?$objectsrc->demand_reason_id:(!empty($soc->demand_reason_id)?$soc->demand_reason_id:0));
-			$remise_percent		= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
-			$remise_absolue		= (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
-			$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
-
-			$datedelivery = (! empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
-
-			$note_private = (! empty($objectsrc->note_private) ? $objectsrc->note_private : (! empty($objectsrc->note_private) ? $objectsrc->note_private : ''));
-			$note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
-
-			// Object source contacts list
-			$srccontactslist = $objectsrc->liste_contact(- 1, 'external', 1);
-		}
-	}
-	else
-	{
-		$cond_reglement_id  = $soc->cond_reglement_id;
-		$mode_reglement_id  = $soc->mode_reglement_id;
-		$availability_id    = $soc->availability_id;
-		$demand_reason_id   = $soc->demand_reason_id;
-		$remise_percent     = $soc->remise_percent;
-		$remise_absolue     = 0;
-		$dateinvoice        = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
-		$projectid          = 0;
-	}
-	$absolute_discount=$soc->getAvailableDiscounts();
-
-	$nbrow = 10;
-
-	print '<form name="crea_commande" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="socid" value="' . $soc->id . '">' . "\n";
-	print '<input type="hidden" name="remise_percent" value="' . $soc->remise_percent . '">';
-	print '<input type="hidden" name="origin" value="' . $origin . '">';
-	print '<input type="hidden" name="originid" value="' . $originid . '">';
-
-	print '<table class="border" width="100%">';
-
-	// Reference
-	print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans("Draft") . '</td></tr>';
-
-	// Reference client
-	print '<tr><td>' . $langs->trans('RefCustomer') . '</td><td colspan="2">';
-	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER))
-		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
-	else
-		print '<input type="text" name="ref_client" value=""></td>';
-	print '</tr>';
-
-	// Client
-	print '<tr>';
-	print '<td class="fieldrequired">' . $langs->trans('Customer') . '</td>';
-	if ($socid > 0) {
-		print '<td colspan="2">';
-		print $soc->getNomUrl(1);
-		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
-		print '</td>';
-	} else {
-		print '<td colspan="2">';
-		print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 1);
-		print '</td>';
-	}
-	print '</tr>' . "\n";
-
-	/*
-	 * Contact de la commande
-	*/
-	if ($socid > 0) {
-		print "<tr><td>" . $langs->trans("DefaultContact") . '</td><td colspan="2">';
-		$form->select_contacts($soc->id, $setcontact, 'contactidp', 1, $srccontactslist);
-		print '</td></tr>';
-
-		// Ligne info remises tiers
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="2">';
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
-		print '. ';
-		$absolute_discount = $soc->getAvailableDiscounts();
-		if ($absolute_discount)
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency" . $conf->currency));
-		else
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print '.';
-		print '</td></tr>';
-	}
-	// Date
-	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
-	$form->select_date('', 're', '', '', '', "crea_commande", 1, 1);
-	print '</td></tr>';
-
-	// Date de livraison
-	print "<tr><td>".$langs->trans("DeliveryDate").'</td><td colspan="2">';
-	if (empty($datedelivery))
-	{
-		if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
-		else $datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
-	}
-	$form->select_date($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);
-	print "</td></tr>";
-
-	// Conditions de reglement
-	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
-	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
-	print '</td></tr>';
-
-	// Mode de reglement
-	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
-	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
-	print '</td></tr>';
-
-	// Delivery delay
-	print '<tr><td>' . $langs->trans('AvailabilityPeriod') . '</td><td colspan="2">';
-	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1);
-	print '</td></tr>';
-
-	// What trigger creation
-	print '<tr><td>' . $langs->trans('Source') . '</td><td colspan="2">';
-	$form->selectInputReason($demand_reason_id, 'demand_reason_id', '', 1);
-	print '</td></tr>';
-
-	// Project
-	if (! empty($conf->projet->enabled) && $socid > 0) {
-		$formproject = new FormProjets($db);
-
-		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
-		$numprojet = $formproject->select_projects($soc->id, $projectid);
-		if ($numprojet == 0) {
-			print ' &nbsp; <a href="' . DOL_URL_ROOT . '/projet/fiche.php?socid=' . $soc->id . '&action=create">' . $langs->trans("AddProject") . '</a>';
-		}
-		print '</td></tr>';
-	}
-
-	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	                                                                                      // hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-		print $object->showOptionals($extrafields, 'edit');
-	}
-
-	// Template to use by default
-	print '<tr><td>' . $langs->trans('Model') . '</td>';
-	print '<td colspan="2">';
-	include_once DOL_DOCUMENT_ROOT . '/core/modules/commande/modules_commande.php';
-	$liste = ModelePDFCommandes::liste_modeles($db);
-	print $form->selectarray('model', $liste, $conf->global->COMMANDE_ADDON_PDF);
-	print "</td></tr>";
-
-	// Note publique
-	print '<tr>';
-	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
-	print '<td valign="top" colspan="2">';
-
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-	print $doleditor->Create(1);
-	// print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-	print '</td></tr>';
-
-	// Note privee
-	if (empty($user->societe_id)) {
-		print '<tr>';
-		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td valign="top" colspan="2">';
-
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-		print $doleditor->Create(1);
-		// print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-		print '</td></tr>';
-	}
-
-	if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
-		// TODO for compatibility
-		if ($origin == 'contrat') {
-			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
-			$objectsrc->remise_absolue = $remise_absolue;
-			$objectsrc->remise_percent = $remise_percent;
-			$objectsrc->update_price(1);
-		}
-
-		print "\n<!-- " . $classname . " info -->";
-		print "\n";
-		print '<input type="hidden" name="amount"         value="' . $objectsrc->total_ht . '">' . "\n";
-		print '<input type="hidden" name="total"          value="' . $objectsrc->total_ttc . '">' . "\n";
-		print '<input type="hidden" name="tva"            value="' . $objectsrc->total_tva . '">' . "\n";
-		print '<input type="hidden" name="origin"         value="' . $objectsrc->element . '">';
-		print '<input type="hidden" name="originid"       value="' . $objectsrc->id . '">';
-
-		$newclassname = $classname;
-		if ($newclassname == 'Propal')
-			$newclassname = 'CommercialProposal';
-		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
-		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
-		if ($mysoc->localtax1_assuj == "1") 		// Localtax1 RE
-		{
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1) . "</td></tr>";
-		}
-
-		if ($mysoc->localtax2_assuj == "1") 		// Localtax2 IRPF
-		{
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2) . "</td></tr>";
-		}
-
-		print '<tr><td>' . $langs->trans('TotalTTC') . '</td><td colspan="2">' . price($objectsrc->total_ttc) . "</td></tr>";
-	} else {
-		if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) {
-			/*
-			 * Services/produits predefinis
-			*/
-			$NBLINES = 8;
-
-			print '<tr><td colspan="3">';
-
-			print '<table class="noborder">';
-			print '<tr><td>' . $langs->trans('ProductsAndServices') . '</td>';
-			print '<td>' . $langs->trans('Qty') . '</td>';
-			print '<td>' . $langs->trans('ReductionShort') . '</td>';
-			print '</tr>';
-			for($i = 1; $i <= $NBLINES; $i ++) {
-				print '<tr><td>';
-				// multiprix
-				if (! empty($conf->global->PRODUIT_MULTIPRICES))
-					print $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size, $soc->price_level);
-				else
-					print $form->select_produits('', 'idprod' . $i, '', $conf->product->limit_size);
-				print '</td>';
-				print '<td><input type="text" size="3" name="qty' . $i . '" value="1"></td>';
-				print '<td><input type="text" size="3" name="remise_percent' . $i . '" value="' . $soc->remise_percent . '">%</td></tr>';
-			}
-
-			print '</table>';
-			print '</td></tr>';
-		}
-	}
-
-	print '</table>';
-
-	// Button "Create Draft"
-	print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '"></center>';
-
-	print '</form>';
-
-	// Show origin lines
-	if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
-		$title = $langs->trans('ProductsAndServices');
-		print_titre($title);
-
-		print '<table class="noborder" width="100%">';
-
-		$objectsrc->printOriginLinesList();
-
-		print '</table>';
-	}
-} else {
-	/* *************************************************************************** */
-	/*                                                                             */
-	/* Mode vue et edition                                                         */
-	/*                                                                             */
-	/* *************************************************************************** */
-	$now = dol_now();
-
-	if ($object->id > 0) {
-		dol_htmloutput_mesg($mesg, $mesgs);
-
-		$product_static = new Product($db);
-
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
-		$author = new User($db);
-		$author->fetch($object->user_author_id);
-
-		$head = commande_prepare_head($object);
-		dol_fiche_head($head, 'order', $langs->trans("CustomerOrder"), 0, 'order');
-
-		$formconfirm = '';
-
-		/*
-		 * Confirmation de la suppression de la commande
-		*/
-		if ($action == 'delete') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
-		}
-
-		/*
-		 * Confirmation de la validation
-		*/
-		if ($action == 'validate') {
-			// on verifie si l'objet est en numerotation provisoire
-			$ref = substr($object->ref, 1, 4);
-			if ($ref == 'PROV') {
-				$numref = $object->getNextNumRef($soc);
-			} else {
-				$numref = $object->ref;
-			}
-
-			$text = $langs->trans('ConfirmValidateOrder', $numref);
-			if (! empty($conf->notification->enabled)) {
-				require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
-				$notify = new Notify($db);
-				$text .= '<br>';
-				$text .= $notify->confirmMessage('ORDER_VALIDATE', $object->socid);
-			}
-
-			$qualified_for_stock_change=0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-			{
-			   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-			}
-			else
-			{
-			   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-			}
-
-			$formquestion=array();
-			if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-			{
-				$langs->load("stocks");
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
-				$formproduct = new FormProduct($db);
-				$formquestion = array(
-									// 'text' => $langs->trans("ConfirmClone"),
-									// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value'
-									// => 1),
-									// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"),
-									// 'value' => 1),
-									array('type' => 'other','name' => 'idwarehouse','label' => $langs->trans("SelectWarehouseForStockDecrease"),'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-			}
-
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
-		}
-
-		// Confirm back to draft status
-		if ($action == 'modif')
-		{
-			$qualified_for_stock_change=0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-			{
-			   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-			}
-			else
-			{
-			   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-			}
-
-			$text=$langs->trans('ConfirmUnvalidateOrder',$object->ref);
-			$formquestion=array();
-			if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-			{
-				$langs->load("stocks");
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
-				$formproduct = new FormProduct($db);
-				$formquestion = array(
-									// 'text' => $langs->trans("ConfirmClone"),
-									// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value'
-									// => 1),
-									// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"),
-									// 'value' => 1),
-									array('type' => 'other','name' => 'idwarehouse','label' => $langs->trans("SelectWarehouseForStockIncrease"),'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-			}
-
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('UnvalidateOrder'), $text, 'confirm_modif', $formquestion, "yes", 1, 220);
-		}
-
-		/*
-		 * Confirmation de la cloture
-		*/
-		if ($action == 'shipped') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_shipped', '', 0, 1);
-		}
-
-		/*
-		 * Confirmation de l'annulation
-		 */
-		if ($action == 'cancel')
-		{
-			$qualified_for_stock_change=0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-			{
-			   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-			}
-			else
-			{
-			   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-			}
-
-			$text=$langs->trans('ConfirmCancelOrder',$object->ref);
-			$formquestion=array();
-			if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-			{
-				$langs->load("stocks");
-				require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
-				$formproduct = new FormProduct($db);
-				$formquestion = array(
-									// 'text' => $langs->trans("ConfirmClone"),
-									// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value'
-									// => 1),
-									// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"),
-									// 'value' => 1),
-									array('type' => 'other','name' => 'idwarehouse','label' => $langs->trans("SelectWarehouseForStockIncrease"),'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1)));
-			}
-
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('Cancel'), $text, 'confirm_cancel', $formquestion, 0, 1);
-		}
-
-		/*
-		 * Confirmation de la suppression d'une ligne produit
-		 */
-		if ($action == 'ask_deleteline')
-		{
-			$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
-		}
-
-		// Clone confirmation
-		if ($action == 'clone') {
-			// Create an array for form
-			$formquestion = array(
-								// 'text' => $langs->trans("ConfirmClone"),
-								// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' =>
-								// 1),
-								// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value'
-								// => 1),
-								array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=3)')));
-			// Paiement incomplet. On demande si motif = escompte ou autre
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneOrder'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-		}
-
-		if (! $formconfirm) {
-			$parameters = array('lineid' => $lineid);
-			$formconfirm = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified
-			                                                                                    // by hook
-		}
-
-		// Print form confirm
-		print $formconfirm;
-
-		/*
-		 *   Commande
-		*/
-		$nbrow = 9;
-		if (! empty($conf->projet->enabled))
-			$nbrow ++;
-
-			// Local taxes
-		if ($mysoc->localtax1_assuj == "1")
-			$nbrow ++;
-		if ($mysoc->localtax2_assuj == "1")
-			$nbrow ++;
-
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="' . DOL_URL_ROOT . '/commande/liste.php' . (! empty($socid) ? '?socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
-
-		// Ref
-		print '<tr><td width="18%">' . $langs->trans('Ref') . '</td>';
-		print '<td colspan="3">';
-		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Ref commande client
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
-		print $langs->trans('RefCustomer') . '</td><td align="left">';
-		print '</td>';
-		if ($action != 'refcustomer' && $object->brouillon)
-			print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=refcustomer&amp;id=' . $object->id . '">' . img_edit($langs->trans('Modify')) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($user->rights->commande->creer && $action == 'refcustomer') {
-			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-			print '<input type="hidden" name="action" value="set_ref_client">';
-			print '<input type="text" class="flat" size="20" name="ref_client" value="' . $object->ref_client . '">';
-			print ' <input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-			print '</form>';
-		} else {
-			print $object->ref_client;
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Third party
-		print '<tr><td>' . $langs->trans('Company') . '</td>';
-		print '<td colspan="3">' . $soc->getNomUrl(1) . '</td>';
-		print '</tr>';
-
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final
-			                                                     // invoice
-			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		} else {
-			$filterabsolutediscount = "fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description='(DEPOSIT)')";
-			$filtercreditnote = "fk_facture_source IS NOT NULL AND description <> '(DEPOSIT)'";
-		}
-
-		// Relative and absolute discounts
-		$addrelativediscount = '<a href="' . DOL_URL_ROOT . '/comm/remise.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditRelativeDiscounts") . '</a>';
-		$addabsolutediscount = '<a href="' . DOL_URL_ROOT . '/comm/remx.php?id=' . $soc->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("EditGlobalDiscounts") . '</a>';
-		$addcreditnote = '<a href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&socid=' . $soc->id . '&type=2&backtopage=' . urlencode($_SERVER["PHP_SELF"]) . '?facid=' . $object->id . '">' . $langs->trans("AddCreditNote") . '</a>';
-
-		print '<tr><td>' . $langs->trans('Discounts') . '</td><td colspan="3">';
-		if ($soc->remise_percent)
-			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
-		else
-			print $langs->trans("CompanyHasNoRelativeDiscount");
-		print '. ';
-		$absolute_discount = $soc->getAvailableDiscounts('', 'fk_facture_source IS NULL');
-		$absolute_creditnote = $soc->getAvailableDiscounts('', 'fk_facture_source IS NOT NULL');
-		$absolute_discount = price2num($absolute_discount, 'MT');
-		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
-		if ($absolute_discount) {
-			if ($object->statut > 0) {
-				print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency));
-			} else {
-				// Remise dispo de type remise fixe (not credit note)
-				print '<br>';
-				$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?id=' . $object->id, 0, 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount);
-			}
-		}
-		if ($absolute_creditnote) {
-			print $langs->trans("CompanyHasCreditNote", price($absolute_creditnote), $langs->transnoentities("Currency" . $conf->currency)) . '. ';
-		}
-		if (! $absolute_discount && ! $absolute_creditnote)
-			print $langs->trans("CompanyHasNoAbsoluteDiscount") . '.';
-		print '</td></tr>';
-
-		// Date
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Date');
-		print '</td>';
-
-		if ($action != 'editdate' && $object->brouillon)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editdate') {
-			print '<form name="setdate" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-			print '<input type="hidden" name="action" value="setdate">';
-			$form->select_date($object->date, 'order_', '', '', '', "setdate");
-			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-			print '</form>';
-		} else {
-			print $object->date ? dol_print_date($object->date, 'daytext') : '&nbsp;';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Delivery date planed
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('DateDeliveryPlanned');
-		print '</td>';
-		if ($action != 'editdate_livraison')
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate_livraison&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDeliveryDate'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editdate_livraison') {
-			print '<form name="setdate_livraison" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-			print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-			print '<input type="hidden" name="action" value="setdate_livraison">';
-			$form->select_date($object->date_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison");
-			print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-			print '</form>';
-		} else {
-			print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Terms of payment
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('PaymentConditionsShort');
-		print '</td>';
-		if ($action != 'editconditions' && $object->brouillon)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editconditions') {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
-		} else {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->cond_reglement_id, 'none', 1);
-		}
-		print '</td>';
-
-		print '</tr>';
-
-		// Mode of payment
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('PaymentMode');
-		print '</td>';
-		if ($action != 'editmode' && $object->brouillon)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editmode') {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
-		} else {
-			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none');
-		}
-		print '</td></tr>';
-
-		// Availability
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('AvailabilityPeriod');
-		print '</td>';
-		if ($action != 'editavailability' && $object->brouillon)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetAvailability'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editavailability') {
-			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'availability_id', 1);
-		} else {
-			$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'none', 1);
-		}
-		print '</td></tr>';
-
-		// Source
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Source');
-		print '</td>';
-		if ($action != 'editdemandreason' && ! empty($object->brouillon))
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetDemandReason'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'editdemandreason') {
-			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
-		} else {
-			$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
-		}
-		// Removed because using dictionary is an admin feature, not a user feature. Ther is already the "star" to show info to admin users.
-		// This is to avoid too heavy screens and have an uniform look and feel for all screens.
-		// print '</td><td>';
-		// print '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=22&origin=order&originid='.$object->id.'">'.$langs->trans("DictionarySource").'</a>';
-		print '</td></tr>';
-
-		// Project
-		if (! empty($conf->projet->enabled)) {
-			$langs->load('projects');
-			print '<tr><td height="10">';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print $langs->trans('Project');
-			print '</td>';
-			if ($action != 'classify')
-				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetProject')) . '</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="3">';
-			// print "$object->id, $object->socid, $object->fk_project";
-			if ($action == 'classify') {
-				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid');
-			} else {
-				$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none');
-			}
-			print '</td></tr>';
-		}
-
-		if ($soc->outstanding_limit) {
-			// Outstanding Bill
-			print '<tr><td>';
-			print $langs->trans('OutstandingBill');
-			print '</td><td align=right colspan=3>';
-			print price($soc->get_OutstandingBill()) . ' / ';
-			print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
-			print '</td>';
-			print '</tr>';
-		}
-
-		// Other attributes (TODO Move this into an include)
-		$res = $object->fetch_optionals($object->id, $extralabels);
-		$parameters = array('colspan' => ' colspan="3"');
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-		                                                                                      // hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-			foreach ($extrafields->attribute_label as $key => $label) {
-				if ($action == 'edit_extras') {
-					$value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]);
-				} else {
-					$value = $object->array_options ["options_" . $key];
-				}
-				if ($extrafields->attribute_type [$key] == 'separate') {
-					print $extrafields->showSeparator($key);
-				} else {
-					print '<tr><td';
-					if (! empty($extrafields->attribute_required [$key]))
-						print ' class="fieldrequired"';
-					print '>' . $label . '</td><td colspan="5">';
-					// 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 ($action == 'edit_extras' && $user->rights->commande->creer && GETPOST('attribute') == $key) {
-						print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formsoc">';
-						print '<input type="hidden" name="action" value="update_extras">';
-						print '<input type="hidden" name="attribute" value="' . $key . '">';
-						print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-						print '<input type="hidden" name="id" value="' . $object->id . '">';
-
-						print $extrafields->showInputField($key, $value);
-
-						print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-						print '</form>';
-					} else {
-						print $extrafields->showOutputField($key, $value);
-						if ($object->statut == 0 && $user->rights->commande->creer)
-							print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . '</a>';
-					}
-					print '</td></tr>' . "\n";
-				}
-			}
-		}
-
-		$rowspan = 4;
-		if ($mysoc->localtax1_assuj == "1")
-			$rowspan ++;
-		if ($mysoc->localtax2_assuj == "1")
-			$rowspan ++;
-
-			// Total HT
-		print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
-		print '<td align="right">' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td>';
-
-		// Margin Infos
-		if (! empty($conf->margin->enabled)) {
-			print '<td valign="top" width="50%" colspan="2" rowspan="' . $rowspan . '">';
-			$object->displayMarginInfos();
-			print '</td>';
-		} else
-			print '<td width="50%" colspan="2" rowspan="' . $rowspan . '"></td>';
-
-		print '</tr>';
-
-		// Total TVA
-		print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td align="right">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-
-		// Amount Local Taxes
-		if ($mysoc->localtax1_assuj == "1") 		// Localtax1 RE
-		{
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td align="right">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-		}
-		if ($mysoc->localtax2_assuj == "1") 		// Localtax2 IRPF
-		{
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-			print '<td align="right">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-		}
-
-		// Total TTC
-		print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td align="right">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-
-		// Statut
-		print '<tr><td>' . $langs->trans('Status') . '</td><td>' . $object->getLibStatut(4) . '</td></tr>';
-
-		print '</table><br>';
-		print "\n";
-
-		if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
-			$blocname = 'contacts';
-			$title = $langs->trans('ContactsAddresses');
-			include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
-		}
-
-		if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
-			$blocname = 'notes';
-			$title = $langs->trans('Notes');
-			include DOL_DOCUMENT_ROOT . '/core/tpl/bloc_showhide.tpl.php';
-		}
-
-		/*
-		 * Lines
-		 */
-		$result = $object->getLinesArray();
-
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
-		<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '">
-		<input type="hidden" name="mode" value="">
-		<input type="hidden" name="id" value="' . $object->id . '">
-		';
-
-		if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-		}
-
-		print '<table id="tablelines" class="noborder noshadow" width="100%">';
-
-		// Show object lines
-		if (! empty($object->lines))
-			$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
-
-		$numlines = count($object->lines);
-
-		/*
-		 * Form to add new line
-		 */
-		if ($object->statut == 0 && $user->rights->commande->creer)
-		{
-			if ($action != 'editline')
-			{
-				$var = true;
-
-				// Add free products/services
-				$object->formAddObjectLine(1, $mysoc, $soc);
-
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			}
-		}
-		print '</table>';
-
-		print "</form>\n";
-
-		dol_fiche_end();
-
-		/*
-		 * Boutons actions
-		*/
-		if ($action != 'presend' && $action != 'editline') {
-			print '<div class="tabsAction">';
-
-			$parameters = array();
-			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-			                                                                                          // modified by hook
-			if (empty($reshook)) {
-				// Valid
-				if ($object->statut == 0 && $object->total_ttc >= 0 && $numlines > 0 && $user->rights->commande->valider) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
-				}
-				// Edit
-				if ($object->statut == 1 && $user->rights->commande->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
-				}
-				// Create event
-				if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
-				                                                                                      // "workflow" action so should appears somewhere else on
-				                                                                                      // page.
-				{
-					print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/fiche.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a>';
-				}
-				// Send
-				if ($object->statut > 0) {
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=presend&amp;mode=init">' . $langs->trans('SendByMail') . '</a></div>';
-					} else
-						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
-				}
-
-				// Ship
-				$numshipping = 0;
-				if (! empty($conf->expedition->enabled)) {
-					$numshipping = $object->nb_expedition();
-
-					if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfProductsLines() > 0) {
-						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)) {
-							if ($user->rights->expedition->creer) {
-								print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/expedition/shipment.php?id=' . $object->id . '">' . $langs->trans('ShipProduct') . '</a></div>';
-							} else {
-								print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('ShipProduct') . '</a></div>';
-							}
-						} else {
-							$langs->load("errors");
-							print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")) . '">' . $langs->trans('ShipProduct') . '</a></div>';
-						}
-					}
-				}
-
-				// Create intervention
-				if ($conf->ficheinter->enabled) {
-					$langs->load("interventions");
-
-					if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfServicesLines() > 0) {
-						if ($user->rights->ficheinter->creer) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fichinter/fiche.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddIntervention') . '</a></div>';
-						} else {
-							print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('AddIntervention') . '</a></div>';
-						}
-					}
-				}
-
-				// Reopen a closed order
-				if ($object->statut == 3 && $user->rights->commande->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=reopen">' . $langs->trans('ReOpen') . '</a></div>';
-				}
-
-				// Create contract
-				if ($conf->contrat->enabled && ($object->statut == 1 || $object->statut == 2)) {
-					$langs->load("contracts");
-
-					if ($user->rights->contrat->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/contrat/fiche.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans('AddContract') . '</a></div>';
-					}
-				}
-
-				// Create bill and Classify billed
-				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
-				if ($object->statut > 0 && ! $object->billed) {
-					if (! empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/compta/facture.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("CreateBill") . '</a></div>';
-					}
-					if ($user->rights->commande->creer && $object->statut > 2 && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled">' . $langs->trans("ClassifyBilled") . '</a></div>';
-					}
-				}
-
-				// Set to shipped
-				if (($object->statut == 1 || $object->statut == 2) && $user->rights->commande->cloturer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=shipped">' . $langs->trans('ClassifyShipped') . '</a></div>';
-				}
-
-				// Clone
-				if ($user->rights->commande->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=order">' . $langs->trans("ToClone") . '</a></div>';
-				}
-
-				// Cancel order
-				if ($object->statut == 1 && $user->rights->commande->annuler) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=cancel">' . $langs->trans('Cancel') . '</a></div>';
-				}
-
-				// Delete order
-				if ($user->rights->commande->supprimer) {
-					if ($numshipping == 0) {
-						print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete">' . $langs->trans('Delete') . '</a></div>';
-					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="' . $langs->trans("ShippingExist") . '">' . $langs->trans("Delete") . '</a></div>';
-					}
-				}
-			}
-			print '</div>';
-		}
-		print '<br>';
-
-		if ($action != 'presend')
-		{
-			print '<div class="fichecenter"><div class="fichehalfleft">';
-			// print '<table width="100%"><tr><td width="50%" valign="top">';
-			// print '<a name="builddoc"></a>'; // ancre
-
-			/*
-			 * Documents generes
-			*/
-			$comref = dol_sanitizeFileName($object->ref);
-			$file = $conf->commande->dir_output . '/' . $comref . '/' . $comref . '.pdf';
-			$relativepath = $comref . '/' . $comref . '.pdf';
-			$filedir = $conf->commande->dir_output . '/' . $comref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->commande->creer;
-			$delallowed = $user->rights->commande->supprimer;
-			$somethingshown = $formfile->show_documents('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-
-			/*
-			 * Linked object block
-			 */
-			$somethingshown = $object->showLinkedObjectBlock();
-
-			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-			// print '</td><td valign="top" width="50%">';
-
-			// List of actions on element
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, 'order', $socid);
-
-			// print '</td></tr></table>';
-			print '</div></div></div>';
-		}
-
-		/*
-		 * Action presend
-		 */
-		if ($action == 'presend')
-		{
-			$ref = dol_sanitizeFileName($object->ref);
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/'));
-			$file = $fileparams ['fullname'];
-
-			// Build document if it not exists
-			if (! $file || ! is_readable($file)) {
-				// Define output language
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-					$newlang = $_REQUEST['lang_id'];
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $object->client->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-
-				$result = commande_pdf_create($db, $object, GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result <= 0) {
-					dol_print_error($db, $result);
-					exit();
-				}
-				$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/'));
-				$file = $fileparams ['fullname'];
-			}
-
-			print '<br>';
-			print_titre($langs->trans('SendOrderByMail'));
-
-			// Cree l'objet formulaire mail
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			$formmail->fromtype = 'user';
-			$formmail->fromid = $user->id;
-			$formmail->fromname = $user->getFullName($langs);
-			$formmail->frommail = $user->email;
-			$formmail->withfrom = 1;
-			$liste = array();
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-				$liste [$key] = $value;
-			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-			$formmail->withtocc = $liste;
-			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-			if (empty($object->ref_client)) {
-				$formmail->withtopic = $langs->trans('SendOrderRef', '__ORDERREF__');
-			} else if (! empty($object->ref_client)) {
-				$formmail->withtopic = $langs->trans('SendOrderRef', '__ORDERREF__(__REFCLIENT__)');
-			}
-			$formmail->withfile = 2;
-			$formmail->withbody = 1;
-			$formmail->withdeliveryreceipt = 1;
-			$formmail->withcancel = 1;
-			// Tableau des substitutions
-			$formmail->substit ['__ORDERREF__'] = $object->ref;
-			$formmail->substit ['__SIGNATURE__'] = $user->signature;
-			$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
-			$formmail->substit ['__PERSONALIZED__'] = '';
-			$formmail->substit ['__CONTACTCIVNAME__'] = '';
-
-			$custcontact = '';
-			$contactarr = array();
-			$contactarr = $object->liste_contact(- 1, 'external');
-
-			if (is_array($contactarr) && count($contactarr) > 0) {
-				foreach ($contactarr as $contact) {
-					if ($contact ['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {
-						$contactstatic = new Contact($db);
-						$contactstatic->fetch($contact ['id']);
-						$custcontact = $contactstatic->getFullName($langs, 1);
-					}
-				}
-
-				if (! empty($custcontact)) {
-					$formmail->substit ['__CONTACTCIVNAME__'] = $custcontact;
-				}
-			}
-
-			// Tableau des parametres complementaires
-			$formmail->param ['action'] = 'send';
-			$formmail->param ['models'] = 'order_send';
-			$formmail->param ['orderid'] = $object->id;
-			$formmail->param ['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-			// Init list of files
-			if (GETPOST("mode") == 'init') {
-				$formmail->clear_attached_files();
-				$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-			}
-
-			// Show form
-			print $formmail->get_form();
-
-			print '<br>';
-		}
-	}
-}
-
-llxFooter();
-$db->close();
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 37e88f37d85..0d2815a6d67 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -63,7 +63,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 // Search customer orders
 $var=false;
 print '<table class="noborder nohover" width="100%">';
-print '<form method="post" action="'.DOL_URL_ROOT.'/commande/liste.php">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchOrder").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
@@ -141,7 +141,7 @@ if ($resql)
             $var=!$var;
             print "<tr ".$bc[$var].">";
             print '<td>'.$commandestatic->LibStatut($status,$bool,0).'</td>';
-            print '<td align="right"><a href="liste.php?viewstatut='.$status.'">'.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' ';
+            print '<td align="right"><a href="list.php?viewstatut='.$status.'">'.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' ';
             print $commandestatic->LibStatut($status,$bool,3);
             print '</a>';
             print '</td>';
@@ -166,7 +166,7 @@ else
  */
 if (! empty($conf->commande->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.ref, 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";
@@ -187,15 +187,15 @@ if (! empty($conf->commande->enabled))
 		if ($num)
 		{
 			$i = 0;
-			$var = True;
+			$var = true;
 			while ($i < $num)
 			{
 				$var=!$var;
 				$obj = $db->fetch_object($resql);
 				print "<tr ".$bc[$var].">";
 				print '<td class="nowrap">';
-				print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
-				print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>';
+				print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
+				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td></tr>';
 				$i++;
 			}
 		}
@@ -215,7 +215,7 @@ $max=5;
  */
 
 $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
-$sql.= " s.nom, s.rowid as socid";
+$sql.= " 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";
@@ -238,7 +238,7 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = True;
+		$var = true;
 		while ($i < $num)
 		{
 			$var=!$var;
@@ -268,7 +268,7 @@ if ($resql)
 
 			print '</td>';
 
-			print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem),'day').'</td>';
 			print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
 			print '</tr>';
@@ -285,7 +285,7 @@ else dol_print_error($db);
  */
 if (! empty($conf->commande->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, 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";
@@ -303,12 +303,12 @@ if (! empty($conf->commande->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=1">('.$num.')</a></td></tr>';
+		print '<td colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1">('.$num.')</a></td></tr>';
 
 		if ($num)
 		{
 			$i = 0;
-			$var = True;
+			$var = true;
 			while ($i < $num)
 			{
 				$var=!$var;
@@ -337,7 +337,7 @@ if (! empty($conf->commande->enabled))
 
 				print '</td>';
 
-				print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td>';
+				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td>';
 
 				print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
 
@@ -356,7 +356,7 @@ if (! empty($conf->commande->enabled))
  */
 if (! empty($conf->commande->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, 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";
@@ -374,12 +374,12 @@ if (! empty($conf->commande->enabled))
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=2">('.$num.')</a></td></tr>';
+		print '<td colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2">('.$num.')</a></td></tr>';
 
 		if ($num)
 		{
 			$i = 0;
-			$var = True;
+			$var = true;
 			while ($i < $num)
 			{
 				$var=!$var;
@@ -408,7 +408,7 @@ if (! empty($conf->commande->enabled))
 
 				print '</td>';
 
-				print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
 
 				print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
new file mode 100644
index 00000000000..2c30f4128c6
--- /dev/null
+++ b/htdocs/commande/list.php
@@ -0,0 +1,492 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville   <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur    <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo  <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin          <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012      Juanjo Menent          <jmenent@2byte.es>
+ * Copyright (C) 2013      Christophe Battarel    <christophe.battarel@altairis.fr>
+ * Copyright (C) 2013      Cédric Salvador        <csalvador@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/commande/list.php
+ *	\ingroup    commande
+ *	\brief      Page to list orders
+ */
+
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
+
+$langs->load('orders');
+$langs->load('deliveries');
+$langs->load('companies');
+
+$orderyear=GETPOST("orderyear","int");
+$ordermonth=GETPOST("ordermonth","int");
+$deliveryyear=GETPOST("deliveryyear","int");
+$deliverymonth=GETPOST("deliverymonth","int");
+$search_ref=GETPOST('search_ref','alpha');
+$search_ref_customer=GETPOST('search_ref_customer','alpha');
+$search_company=GETPOST('search_company','alpha');
+$sall=GETPOST('sall');
+$socid=GETPOST('socid','int');
+$search_user=GETPOST('search_user','int');
+$search_sale=GETPOST('search_sale','int');
+
+// Security check
+$id = (GETPOST('orderid')?GETPOST('orderid'):GETPOST('id','int'));
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'commande', $id,'');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield='c.rowid';
+if (! $sortorder) $sortorder='DESC';
+$limit = $conf->liste_limit;
+
+$viewstatut=GETPOST('viewstatut');
+
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_categ='';
+    $search_user='';
+    $search_sale='';
+    $search_ref='';
+    $search_ref_customer='';
+    $search_company='';
+    $orderyear='';
+    $ordermonth='';
+    $deliverymonth='';
+    $deliveryyear='';
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('orderlist'));
+
+/*
+ * Actions
+ */
+
+$parameters=array('socid'=>$socid);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hook
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+/*
+ * View
+ */
+
+$now=dol_now();
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$formfile = new FormFile($db);
+$companystatic = new Societe($db);
+
+$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
+llxHeader('',$langs->trans("Orders"),$help_url);
+
+$sql = 'SELECT s.nom as name, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
+$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
+// We'll need this table joined to the select in order to filter by sale
+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 ec";
+    $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
+}
+$sql.= ' WHERE c.fk_soc = s.rowid';
+$sql.= ' AND c.entity = '.$conf->entity;
+if ($socid)	$sql.= ' AND s.rowid = '.$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($search_ref) {
+	$sql .= natural_search('c.ref', $search_ref);
+}
+if ($sall)
+{
+	$sql .= natural_search(array('c.ref', 'c.note_private'), $sall);
+}
+if ($viewstatut <> '')
+{
+	if ($viewstatut < 4 && $viewstatut > -3)
+	{
+		if ($viewstatut == 1 && empty($conf->expedition->enabled)) $sql.= ' AND c.fk_statut IN (1,2)';	// If module expedition disabled, we include order with status 'sending in process' into 'validated'
+		else $sql.= ' AND c.fk_statut = '.$viewstatut; // brouillon, validee, en cours, annulee
+		if ($viewstatut == 3)
+		{
+			$sql.= ' AND c.facture = 0'; // need to create invoice
+		}
+	}
+	if ($viewstatut == 4)
+	{
+		$sql.= ' AND c.facture = 1'; // invoice created
+	}
+	if ($viewstatut == -2)	// To process
+	{
+		//$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0';
+		$sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
+	}
+	if ($viewstatut == -3)	// To bill
+	{
+		//$sql.= ' AND c.fk_statut in (1,2,3)';
+		//$sql.= ' AND c.facture = 0'; // invoice not created
+		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
+	}
+}
+if ($ordermonth > 0)
+{
+    if ($orderyear > 0 && empty($day))
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,$ordermonth,false))."' AND '".$db->idate(dol_get_last_day($orderyear,$ordermonth,false))."'";
+    else if ($orderyear > 0 && ! empty($day))
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $ordermonth, $day, $orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $ordermonth, $day, $orderyear))."'";
+    else
+    $sql.= " AND date_format(c.date_commande, '%m') = '".$ordermonth."'";
+}
+else if ($orderyear > 0)
+{
+    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($orderyear,12,false))."'";
+}
+if ($deliverymonth > 0)
+{
+    if ($deliveryyear > 0 && empty($day))
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,$deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,$deliverymonth,false))."'";
+    else if ($deliveryyear > 0 && ! empty($day))
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $deliverymonth, $day, $deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $deliverymonth, $day, $deliveryyear))."'";
+    else
+    $sql.= " AND date_format(c.date_livraison, '%m') = '".$deliverymonth."'";
+}
+else if ($deliveryyear > 0)
+{
+    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,12,false))."'";
+}
+if (!empty($search_company))
+{
+	$sql .= natural_search('s.nom', $search_company);
+}
+if (!empty($search_ref_customer))
+{
+	$sql.= ' AND c.ref_client LIKE \'%'.$db->escape($search_ref_customer).'%\'';
+}
+if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
+if ($search_user > 0)
+{
+    $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
+}
+
+$sql.= ' ORDER BY '.$sortfield.' '.$sortorder;
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
+
+$sql.= $db->plimit($limit + 1,$offset);
+
+//print $sql;
+$resql = $db->query($sql);
+if ($resql)
+{
+	if ($socid)
+	{
+		$soc = new Societe($db);
+		$soc->fetch($socid);
+		$title = $langs->trans('ListOfOrders') . ' - '.$soc->name;
+	}
+	else
+	{
+		$title = $langs->trans('ListOfOrders');
+	}
+	if (strval($viewstatut) == '0')
+	$title.=' - '.$langs->trans('StatusOrderDraftShort');
+	if ($viewstatut == 1)
+	$title.=' - '.$langs->trans('StatusOrderValidatedShort');
+	if ($viewstatut == 2)
+	$title.=' - '.$langs->trans('StatusOrderSentShort');
+	if ($viewstatut == 3)
+	$title.=' - '.$langs->trans('StatusOrderToBillShort');
+	if ($viewstatut == 4)
+	$title.=' - '.$langs->trans('StatusOrderProcessedShort');
+	if ($viewstatut == -1)
+	$title.=' - '.$langs->trans('StatusOrderCanceledShort');
+	if ($viewstatut == -2)
+	$title.=' - '.$langs->trans('StatusOrderToProcessShort');
+	if ($viewstatut == -3)
+	$title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+
+	$param='&socid='.$socid.'&viewstatut='.$viewstatut;
+	if ($ordermonth)      		$param.='&ordermonth='.$ordermonth;
+	if ($orderyear)       		$param.='&orderyear='.$orderyear;
+	if ($deliverymonth)   		$param.='&deliverymonth='.$deliverymonth;
+	if ($deliveryyear)    		$param.='&deliveryyear='.$deliveryyear;
+	if ($search_ref)      		$param.='&search_ref='.$search_ref;
+	if ($search_company)  		$param.='&search_company='.$search_company;
+	if ($search_ref_customer)	$param.='&search_ref_customer='.$search_ref_customer;
+	if ($search_user > 0) 		$param.='&search_user='.$search_user;
+	if ($search_sale > 0) 		$param.='&search_sale='.$search_sale;
+
+	$num = $db->num_rows($resql);
+	print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	$i = 0;
+
+	// Lignes des champs de filtre
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+
+	print '<table class="noborder" width="100%">';
+
+	$moreforfilter='';
+
+ 	// If the user can view prospects other than his'
+ 	if ($user->rights->societe->client->voir || $socid)
+ 	{
+ 		$langs->load("commercial");
+ 		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
+		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
+	 	$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+ 	}
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid)
+	{
+	    $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
+	    $moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
+	}
+	if (! empty($moreforfilter))
+	{
+	    print '<tr class="liste_titre">';
+	    print '<td class="liste_titre" colspan="9">';
+	    print $moreforfilter;
+	    print '</td></tr>';
+	}
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'c.ref','',$param,'width="25%"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('RefCustomerOrder'),$_SERVER["PHP_SELF"],'c.ref_client','',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('OrderDate'),$_SERVER["PHP_SELF"],'c.date_commande','',$param, 'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('DeliveryDate'),$_SERVER["PHP_SELF"],'c.date_livraison','',$param, 'align="center"',$sortfield,$sortorder);
+	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 '</tr>';
+
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.$search_ref_customer.'">';
+	print '</td>';
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" name="search_company" value="'.$search_company.'">';
+	print '</td>';
+	print '<td class="liste_titre" align="center">';
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="orderday" value="'.$orderday.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="ordermonth" value="'.$ordermonth.'">';
+    $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
+	print '</td><td class="liste_titre" align="center">';
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="deliveryday" value="'.$deliveryday.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="deliverymonth" value="'.$deliverymonth.'">';
+    $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5);
+	print '</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print "</td></tr>\n";
+
+	$var=true;
+	$total=0;
+	$subtotal=0;
+
+    $generic_commande = new Commande($db);
+    $generic_product = new Product($db);
+    while ($i < min($num,$limit)) {
+        $objp = $db->fetch_object($resql);
+        $var=!$var;
+        print '<tr '.$bc[$var].'>';
+        print '<td class="nowrap">';
+
+        $generic_commande->id=$objp->rowid;
+        $generic_commande->ref=$objp->ref;
+        $generic_commande->lines=array();
+        $generic_commande->getLinesArray();
+
+        print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+        print '<td class="nobordernopadding nowrap">';
+        print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
+        print '</td>';
+
+        // Shippable Icon
+        if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && ! empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
+            $notshippable=0;
+            $text_info='';
+            $nbprod=0;
+            for ($lig=0; $lig<(count($generic_commande->lines)); $lig++) {
+                if ($generic_commande->lines[$lig]->product_type==0) {
+                    $nbprod++; // order contains real products
+                    $generic_product->id = $generic_commande->lines[$lig]->fk_product;
+                    $generic_product->load_stock();
+                    // stock order and stock order_supplier
+                    $stock_order=0;
+                    $stock_order_supplier=0;
+                    if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+                        if (! empty($conf->commande->enabled)) {
+                            $generic_product->load_stats_commande(0,'1,2');
+                            $stock_order=$generic_product->stats_commande['qty'];
+                        }
+                        if (! empty($conf->fournisseur->enabled)) {
+                            $generic_product->load_stats_commande_fournisseur(0,'3');
+                            $stock_order_supplier=$generic_product->stats_commande_fournisseur['qty'];
+                        }
+                    }
+                    $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+                    $text_stock_reel = $generic_product->stock_reel.'/'.$stock_order;
+                    if ($generic_product->stock_reel<$generic_commande->lines[$lig]->qty) {
+                        $notshippable++;
+                        $text_info.='<span class="warning">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+                    } else {
+                        $text_info.='<span class="ok">'.$langs->trans('Available').'&nbsp;:&nbsp;'.$text_stock_reel.'</span>';
+                    }
+                    if ($stock_order_supplier>0) {
+                        $text_info.= '&nbsp;'.$langs->trans('SupplierOrder').'&nbsp;:&nbsp;'.$stock_order_supplier.'<br>';
+                    } else {
+                        $text_info.= '<br>';
+                    }
+                }
+            }
+            if ($notshippable==0) {
+                $text_icon = img_picto('', 'object_sending');
+                $text_info = $langs->trans('Shippable').'<br>'.$text_info;
+            } else {
+                $text_icon = img_picto('', 'error');
+                $text_info = $langs->trans('NonShippable').'<br>'.$text_info;
+            }
+            if ($nbprod>0) {
+                print '<td>';
+                print $form->textwithtooltip('',$text_info,2,1,$text_icon,'',2);
+                print '</td>';
+            }
+        }
+
+        // warning late icon
+		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay))
+			print img_picto($langs->trans("Late"),"warning");
+		if(!empty($objp->note_private))
+		{
+			print ' <span class="note">';
+			print '<a href="'.DOL_URL_ROOT.'/commande/note.php?id='.$objp->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
+			print '</span>';
+		}
+		print '</td>';
+
+		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+		$filename=dol_sanitizeFileName($objp->ref);
+		$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+		$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid;
+		print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
+		print '</td>';
+		print '</tr></table>';
+
+		print '</td>';
+
+		// Ref customer
+		print '<td>'.$objp->ref_client.'</td>';
+
+		// Company
+		$companystatic->id=$objp->socid;
+		$companystatic->name=$objp->name;
+		$companystatic->client=$objp->client;
+		print '<td>';
+		print $companystatic->getNomUrl(1,'customer');
+
+		// If module invoices enabled and user with invoice creation permissions
+		if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
+		{
+			if ($user->rights->facture->creer)
+			{
+				if (($objp->fk_statut > 0 && $objp->fk_statut < 3) || ($objp->fk_statut == 3 && $objp->facturee == 0))
+				{
+					print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$companystatic->id.'">';
+					print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>';
+				}
+			}
+		}
+		print '</td>';
+
+		// Order date
+		print '<td align="center">';
+		print dol_print_date($db->jdate($objp->date_commande), 'day');
+		print '</td>';
+
+		// Delivery date
+		print '<td align="center">';
+		print dol_print_date($db->jdate($objp->date_livraison), 'day');
+		print '</td>';
+
+		// Amount HT
+		print '<td align="right" class="nowrap">'.price($objp->total_ht).'</td>';
+
+		// Statut
+		print '<td align="right" class="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>';
+
+		print '</tr>';
+
+		$total+=$objp->total_ht;
+		$subtotal+=$objp->total_ht;
+		$i++;
+	}
+
+	if (! empty($conf->global->MAIN_SHOW_TOTAL_FOR_LIMITED_LIST))
+	{
+		$var=!$var;
+		print '<tr '.$bc[$var].'>';
+		print '<td class="nowrap" colspan="5">'.$langs->trans('TotalHT').'</td>';
+		// Total HT
+		print '<td align="right" class="nowrap">'.price($total).'</td>';
+		print '<td class="nowrap">&nbsp;</td>';
+		print '</tr>';
+	}
+
+	print '</table>';
+
+	print '</form>'."\n";
+
+	print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';
+
+	$db->free($resql);
+}
+else
+{
+	print dol_print_error($db);
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
deleted file mode 100644
index 55323b697f9..00000000000
--- a/htdocs/commande/liste.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville   <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur    <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley / Ocebo  <marc@ocebo.com>
- * Copyright (C) 2005-2012 Regis Houssin          <regis.houssin@capnetworks.com>
- * Copyright (C) 2012      Juanjo Menent          <jmenent@2byte.es>
- * Copyright (C) 2013      Christophe Battarel    <christophe.battarel@altairis.fr>
- * Copyright (C) 2013      Cédric Salvador        <csalvador@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/commande/liste.php
- *	\ingroup    commande
- *	\brief      Page to list orders
- */
-
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-$langs->load('orders');
-$langs->load('deliveries');
-$langs->load('companies');
-
-$orderyear=GETPOST("orderyear","int");
-$ordermonth=GETPOST("ordermonth","int");
-$deliveryyear=GETPOST("deliveryyear","int");
-$deliverymonth=GETPOST("deliverymonth","int");
-$sref=GETPOST('sref','alpha');
-$sref_client=GETPOST('sref_client','alpha');
-$snom=GETPOST('snom','alpha');
-$sall=GETPOST('sall');
-$socid=GETPOST('socid','int');
-$search_user=GETPOST('search_user','int');
-$search_sale=GETPOST('search_sale','int');
-
-// Security check
-$id = (GETPOST('orderid')?GETPOST('orderid'):GETPOST('id','int'));
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'commande', $id,'');
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield='c.rowid';
-if (! $sortorder) $sortorder='DESC';
-$limit = $conf->liste_limit;
-
-$viewstatut=GETPOST('viewstatut');
-
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('orderlist'));
-
-/*
- * Actions
- */
-
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hook
-
-// 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='';
-    $orderyear='';
-    $ordermonth='';
-    $deliverymonth='';
-    $deliveryyear='';
-}
-
-
-
-/*
- * View
- */
-
-$now=dol_now();
-
-$form = new Form($db);
-$formother = new FormOther($db);
-$formfile = new FormFile($db);
-$companystatic = new Societe($db);
-
-$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-llxHeader('',$langs->trans("Orders"),$help_url);
-
-$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
-$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
-// We'll need this table joined to the select in order to filter by sale
-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 ec";
-    $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
-}
-$sql.= ' WHERE c.fk_soc = s.rowid';
-$sql.= ' AND c.entity = '.$conf->entity;
-if ($socid)	$sql.= ' AND s.rowid = '.$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($sref) {
-	$sql .= natural_search('c.ref', $sref);
-}
-if ($sall)
-{
-	$sql .= natural_search(array('c.ref', 'c.note_private'), $sall);
-}
-if ($viewstatut <> '')
-{
-	if ($viewstatut < 4 && $viewstatut > -3)
-	{
-		if ($viewstatut == 1 && empty($conf->expedition->enabled)) $sql.= ' AND c.fk_statut IN (1,2)';	// If module expedition disabled, we include order with status 'sending in process' into 'validated'
-		else $sql.= ' AND c.fk_statut = '.$viewstatut; // brouillon, validee, en cours, annulee
-		if ($viewstatut == 3)
-		{
-			$sql.= ' AND c.facture = 0'; // need to create invoice
-		}
-	}
-	if ($viewstatut == 4)
-	{
-		$sql.= ' AND c.facture = 1'; // invoice created
-	}
-	if ($viewstatut == -2)	// To process
-	{
-		//$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0';
-		$sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";    // If status is 2 and facture=1, it must be selected
-	}
-	if ($viewstatut == -3)	// To bill
-	{
-		$sql.= ' AND c.fk_statut in (1,2,3)';
-		$sql.= ' AND c.facture = 0'; // invoice not created
-	}
-}
-if ($ordermonth > 0)
-{
-    if ($orderyear > 0 && empty($day))
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,$ordermonth,false))."' AND '".$db->idate(dol_get_last_day($orderyear,$ordermonth,false))."'";
-    else if ($orderyear > 0 && ! empty($day))
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $ordermonth, $day, $orderyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $ordermonth, $day, $orderyear))."'";
-    else
-    $sql.= " AND date_format(c.date_commande, '%m') = '".$ordermonth."'";
-}
-else if ($orderyear > 0)
-{
-    $sql.= " AND c.date_commande BETWEEN '".$db->idate(dol_get_first_day($orderyear,1,false))."' AND '".$db->idate(dol_get_last_day($orderyear,12,false))."'";
-}
-if ($deliverymonth > 0)
-{
-    if ($deliveryyear > 0 && empty($day))
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,$deliverymonth,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,$deliverymonth,false))."'";
-    else if ($deliveryyear > 0 && ! empty($day))
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $deliverymonth, $day, $deliveryyear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $deliverymonth, $day, $deliveryyear))."'";
-    else
-    $sql.= " AND date_format(c.date_livraison, '%m') = '".$deliverymonth."'";
-}
-else if ($deliveryyear > 0)
-{
-    $sql.= " AND c.date_livraison BETWEEN '".$db->idate(dol_get_first_day($deliveryyear,1,false))."' AND '".$db->idate(dol_get_last_day($deliveryyear,12,false))."'";
-}
-if (!empty($snom))
-{
-	$sql .= natural_search('s.nom', $snom);
-}
-if (!empty($sref_client))
-{
-	$sql.= ' AND c.ref_client LIKE \'%'.$db->escape($sref_client).'%\'';
-}
-if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
-if ($search_user > 0)
-{
-    $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
-}
-
-$sql.= ' ORDER BY '.$sortfield.' '.$sortorder;
-
-$nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}
-
-
-$sql.= $db->plimit($limit + 1,$offset);
-
-//print $sql;
-$resql = $db->query($sql);
-if ($resql)
-{
-	if ($socid)
-	{
-		$soc = new Societe($db);
-		$soc->fetch($socid);
-		$title = $langs->trans('ListOfOrders') . ' - '.$soc->nom;
-	}
-	else
-	{
-		$title = $langs->trans('ListOfOrders');
-	}
-	if (strval($viewstatut) == '0')
-	$title.=' - '.$langs->trans('StatusOrderDraftShort');
-	if ($viewstatut == 1)
-	$title.=' - '.$langs->trans('StatusOrderValidatedShort');
-	if ($viewstatut == 2)
-	$title.=' - '.$langs->trans('StatusOrderOnProcessShort');
-	if ($viewstatut == 3)
-	$title.=' - '.$langs->trans('StatusOrderToBillShort');
-	if ($viewstatut == 4)
-	$title.=' - '.$langs->trans('StatusOrderProcessedShort');
-	if ($viewstatut == -1)
-	$title.=' - '.$langs->trans('StatusOrderCanceledShort');
-	if ($viewstatut == -2)
-	$title.=' - '.$langs->trans('StatusOrderToProcessShort');
-	if ($viewstatut == -3)
-	$title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
-
-	$param='&socid='.$socid.'&viewstatut='.$viewstatut;
-	if ($ordermonth)      $param.='&ordermonth='.$ordermonth;
-	if ($orderyear)       $param.='&orderyear='.$orderyear;
-	if ($deliverymonth)   $param.='&deliverymonth='.$deliverymonth;
-	if ($deliveryyear)    $param.='&deliveryyear='.$deliveryyear;
-	if ($sref)            $param.='&sref='.$sref;
-	if ($snom)            $param.='&snom='.$snom;
-	if ($sref_client)     $param.='&sref_client='.$sref_client;
-	if ($search_user > 0) $param.='&search_user='.$search_user;
-	if ($search_sale > 0) $param.='&search_sale='.$search_sale;
-
-	$num = $db->num_rows($resql);
-	print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
-	$i = 0;
-
-	// Lignes des champs de filtre
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
-
-	print '<table class="noborder" width="100%">';
-
-	$moreforfilter='';
-
- 	// If the user can view prospects other than his'
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
- 		$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-		$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user);
-	 	$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
- 	}
-	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid)
-	{
-	    $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	    $moreforfilter.=$form->select_dolusers($search_user,'search_user',1);
-	}
-	if (! empty($moreforfilter))
-	{
-	    print '<tr class="liste_titre">';
-	    print '<td class="liste_titre" colspan="9">';
-	    print $moreforfilter;
-	    print '</td></tr>';
-	}
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'c.ref','',$param,'width="25%"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('RefCustomerOrder'),$_SERVER["PHP_SELF"],'c.ref_client','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('OrderDate'),$_SERVER["PHP_SELF"],'c.date_commande','',$param, 'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans('DeliveryDate'),$_SERVER["PHP_SELF"],'c.date_livraison','',$param, 'align="right"',$sortfield,$sortorder);
-	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 '</tr>';
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">';
-	print '<input class="flat" size="6" type="text" name="sref" value="'.$sref.'">';
-	print '</td>';
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" size="6" name="sref_client" value="'.$sref_client.'">';
-	print '</td>';
-	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" name="snom" value="'.$snom.'">';
-	print '</td>';
-	print '<td class="liste_titre">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="orderday" value="'.$orderday.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="ordermonth" value="'.$ordermonth.'">';
-    $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
-	print '</td><td class="liste_titre">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="deliveryday" value="'.$deliveryday.'">';
-    print '<input class="flat" type="text" size="1" maxlength="2" name="deliverymonth" value="'.$deliverymonth.'">';
-    $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5);
-	print '</td><td class="liste_titre">&nbsp;';
-	print '</td><td align="right" class="liste_titre">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'"  value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td></tr>';
-
-	$var=true;
-	$total=0;
-	$subtotal=0;
-
-	$generic_commande = new Commande($db);
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
-		print '<td class="nowrap">';
-
-		$generic_commande->id=$objp->rowid;
-		$generic_commande->ref=$objp->ref;
-
-		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-		print '<td class="nobordernopadding nowrap">';
-		print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut));
-		print '</td>';
-
-		print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-		if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay))
-			print img_picto($langs->trans("Late"),"warning");
-		if(!empty($objp->note_private))
-		{
-			print ' <span class="note">';
-			print '<a href="'.DOL_URL_ROOT.'/commande/note.php?id='.$objp->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
-			print '</span>';
-		}
-		print '</td>';
-
-		print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
-		$filename=dol_sanitizeFileName($objp->ref);
-		$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
-		$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid;
-		print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
-		print '</td>';
-		print '</tr></table>';
-
-		print '</td>';
-
-		// Ref customer
-		print '<td>'.$objp->ref_client.'</td>';
-
-		// Company
-		$companystatic->id=$objp->socid;
-		$companystatic->nom=$objp->nom;
-		$companystatic->client=$objp->client;
-		print '<td>';
-		print $companystatic->getNomUrl(1,'customer');
-
-		// If module invoices enabled and user with invoice creation permissions
-		if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
-		{
-			if ($user->rights->facture->creer)
-			{
-				if (($objp->fk_statut > 0 && $objp->fk_statut < 3) || ($objp->fk_statut == 3 && $objp->facturee == 0))
-				{
-					print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$companystatic->id.'">';
-					print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->nom, 'object_bill', 'hideonsmartphone').'</a>';
-				}
-			}
-		}
-		print '</td>';
-
-		// Order date
-		print '<td align="right">';
-		print dol_print_date($db->jdate($objp->date_commande), 'day');
-		print '</td>';
-
-		// Delivery date
-		print '<td align="right">';
-		print dol_print_date($db->jdate($objp->date_delivery), 'day');
-		print '</td>';
-
-		// Amount HT
-		print '<td align="right" class="nowrap">'.price($objp->total_ht).'</td>';
-
-		// Statut
-		print '<td align="right" class="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>';
-
-		print '</tr>';
-
-		$total+=$objp->total_ht;
-		$subtotal+=$objp->total_ht;
-		$i++;
-	}
-
-	if (! empty($conf->global->MAIN_SHOW_TOTAL_FOR_LIMITED_LIST))
-	{
-		$var=!$var;
-		print '<tr '.$bc[$var].'>';
-		print '<td class="nowrap" colspan="5">'.$langs->trans('TotalHT').'</td>';
-		// Total HT
-		print '<td align="right" class="nowrap">'.price($total).'</td>';
-		print '<td class="nowrap">&nbsp;</td>';
-		print '</tr>';
-	}
-
-	print '</table>';
-
-	print '</form>'."\n";
-
-	print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';
-	
-	$db->free($resql);
-}
-else
-{
-	print dol_print_error($db);
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index ae5aab0491b..6f3519e9ced 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -79,7 +79,7 @@ if ($id > 0 || ! empty($ref))
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index bea20200882..1009b030210 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -58,6 +58,8 @@ $sortfield		= GETPOST("sortfield",'alpha');
 $sortorder		= GETPOST("sortorder",'alpha');
 $viewstatut		= GETPOST('viewstatut');
 
+$error = 0;
+
 if (! $sortfield) $sortfield='c.rowid';
 if (! $sortorder) $sortorder='DESC';
 
@@ -71,7 +73,8 @@ if ($action == 'create')
 {
 	if (is_array($selected) == false)
 	{
-		$mesgs = array('<div class="error">'.$langs->trans('Error_OrderNotChecked').'</div>');
+		$error++;
+		setEventMessage($langs->trans('Error_OrderNotChecked'), 'errors');
 	}
 	else
 	{
@@ -90,7 +93,7 @@ $hookmanager->initHooks(array('orderstoinvoice'));
  * Actions
  */
 
-if (($action == 'create' || $action == 'add') && empty($mesgs))
+if (($action == 'create' || $action == 'add') && !$error)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
@@ -248,7 +251,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs))
 										}
 										else
 										{
-											$mesgs[]=$discount->error;
+											setEventMessage($discount->error, 'errors');
 											$error++;
 											break;
 										}
@@ -317,7 +320,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs))
 							}
 							else
 							{
-								$mesgs[]=$objectsrc->error;
+								setEventMessage($objectsrc->error, 'errors');
 								$error++;
 							}
 							$ii++;
@@ -325,7 +328,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs))
 					}
 					else
 					{
-						$mesgs[]=$object->error;
+						setEventMessage($object->error, 'errors');
 						$error++;
 					}
 				}
@@ -345,7 +348,8 @@ if (($action == 'create' || $action == 'add') && empty($mesgs))
 			$action='create';
 			$_GET["origin"]=$_POST["origin"];
 			$_GET["originid"]=$_POST["originid"];
-			$mesgs[]='<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
+			$error++;
 		}
 	}
 }
@@ -361,7 +365,7 @@ $formfile = new FormFile($db);
 $companystatic = new Societe($db);
 
 // Mode creation
-if ($action == 'create' && empty($mesgs))
+if ($action == 'create' && !$error)
 {
 	$facturestatic=new Facture($db);
 
@@ -501,7 +505,7 @@ if ($action == 'create' && empty($mesgs))
 
 
 //Mode liste
-if (($action != 'create' && $action != 'add') || ! empty($mesgs))
+if (($action != 'create' && $action != 'add') || !$error)
 {
 	llxHeader();
 	?>
@@ -569,16 +573,16 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs))
 		{
 			// Company
 			$companystatic->id=$socid;
-			$companystatic->nom=$soc->nom;
+			$companystatic->name=$soc->name;
 			print '<h3>'.$companystatic->getNomUrl(1,'customer').'</h3>';
 		}
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans('Ref'),'orderstoinvoice.php','c.ref','','&amp;socid='.$socid,'',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans('RefCustomerOrder'),'orderstoinvoice.php','c.ref_client','','&amp;socid='.$socid,'',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans('OrderDate'),'orderstoinvoice.php','c.date_commande','','&amp;socid='.$socid, 'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans('DeliveryDate'),'orderstoinvoice.php','c.date_livraison','','&amp;socid='.$socid, 'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'c.ref','','&amp;socid='.$socid,'',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans('RefCustomerOrder'),$_SERVER["PHP_SELF"],'c.ref_client','','&amp;socid='.$socid,'',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans('OrderDate'),$_SERVER["PHP_SELF"],'c.date_commande','','&amp;socid='.$socid, 'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans('DeliveryDate'),$_SERVER["PHP_SELF"],'c.date_livraison','','&amp;socid='.$socid, 'align="center"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans('Status'),'','','','','align="right"');
 		print_liste_field_titre($langs->trans('GenerateBill'),'','','','','align="center"');
 		print '</tr>';
@@ -618,7 +622,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs))
 		print '</form>';
 
 		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
-		$var=True;
+		$var=true;
 		$generic_commande = new Commande($db);
 
 		while ($i < $num)
@@ -697,7 +701,5 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs))
 
 }
 
-dol_htmloutput_mesg($mesg,$mesgs);
-
 llxFooter();
 $db->close();
diff --git a/htdocs/commande/tpl/index.html b/htdocs/commande/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index d2fe19c5b6f..c47aefe0958 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -48,7 +48,7 @@ foreach($linkedObjectBlock as $object)
 	$var=!$var;
 ?>
 <tr <?php echo $GLOBALS['bc'][$var]; ?> ><td>
-	<a href="<?php echo DOL_URL_ROOT.'/commande/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$object->ref; ?></a></td>
+	<a href="<?php echo DOL_URL_ROOT.'/commande/card.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$object->ref; ?></a></td>
 	<td align="center"><?php echo dol_print_date($object->date,'day'); ?></td>
 	<td align="right"><?php
 		if ($user->rights->commande->lire) {
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index 66a1c997be3..27a167bc576 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -32,7 +32,6 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't nee
 //if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 
 $langs->load('compta');
 
@@ -115,4 +114,4 @@ $toJsonArray['result'] = price($result);		// Return value to user format
 $toJsonArray['resultnum'] = price2num($result);	// Return value to numeric format
 
 // Encode to JSON to return
-echo dol_json_encode($toJsonArray);	// Printing the call's result
+echo json_encode($toJsonArray);	// Printing the call's result
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index bd1928f3da4..87b7d3e62c5 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -72,8 +72,6 @@ if ($negpage)
     if ($page > GETPOST("nbpage")) $page = GETPOST("nbpage");
 }
 
-$mesg='';
-
 $object = new Account($db);
 
 /*
@@ -83,6 +81,8 @@ $dateop=-1;
 
 if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banque->modifier)
 {
+	$error = 0;
+
 	if (price2num($_POST["credit"]) > 0)
 	{
 		$amount = price2num($_POST["credit"]);
@@ -98,11 +98,20 @@ if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banqu
 	$label=$_POST["label"];
 	$cat1=$_POST["cat1"];
 
-	if (! $dateop)    $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
-	if (! $operation) $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Type"));
-	if (! $amount)    $mesg=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
+	if (! $dateop) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Date")), 'errors');
+	}
+	if (! $operation) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Type")), 'errors');
+	}
+	if (! $amount) {
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors');
+	}
 
-	if (! $mesg)
+	if (! $error)
 	{
 		$object->fetch($id);
 		$insertid = $object->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
@@ -114,7 +123,7 @@ if ($action == 'add' && $id && ! isset($_POST["cancel"]) && $user->rights->banqu
 		}
 		else
 		{
-			$mesg=$object->error;
+			setEventMessage($object->error, 'errors');
 		}
 	}
 	else
@@ -241,7 +250,7 @@ if ($id > 0 || ! empty($ref))
 	$sql.= " AND ba.entity = ".$conf->entity;
 	$sql.= $sql_rech;
 
-	dol_syslog("account.php count transactions - sql=".$sql, LOG_DEBUG);
+	dol_syslog("account.php count transactions -", LOG_DEBUG);
 	$result=$db->query($sql);
 	if ($result)
 	{
@@ -300,8 +309,6 @@ if ($id > 0 || ! empty($ref))
 
 	print '<br>';
 
-	dol_htmloutput_errors($mesg);
-
 	/**
 	 * Search form
 	 */
@@ -490,7 +497,7 @@ if ($id > 0 || ! empty($ref))
 	$sql.= $db->order("b.datev, b.datec", "ASC");  // We add date of creation to have correct order when everything is done the same day
 	$sql.= $db->plimit($limitsql, 0);
 
-	dol_syslog("account.php get transactions - sql=".$sql, LOG_DEBUG);
+	dol_syslog("account.php get transactions -", LOG_DEBUG);
 	$result = $db->query($sql);
 	if ($result)
 	{
@@ -582,7 +589,7 @@ if ($id > 0 || ! empty($ref))
 					}
 					elseif ($links[$key]['type']=='payment_sc')
 					{
-						print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$links[$key]['url_id'].'">';
+						print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 						print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
 						//print $langs->trans("SocialContributionPayment");
 						print '</a>';
@@ -673,7 +680,7 @@ if ($id > 0 || ! empty($ref))
 					if ($links[$key]['type']=='company')
 					{
 						$societestatic->id=$links[$key]['url_id'];
-						$societestatic->nom=$links[$key]['label'];
+						$societestatic->name=$links[$key]['label'];
 						print $societestatic->getNomUrl(1,'',16);
 					}
 					else if ($links[$key]['type']=='user')
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index e54c501fdab..30cf5b9c5ac 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -289,7 +289,7 @@ if ($result < 0)
 {
 	$langs->load("errors");
 	$error++;
-	$mesg='<div class="error">'.$langs->trans("ErrorFailedToCreateDir").'</div>';
+	setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors');
 }
 else
 {
diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php
index 43666cba5a5..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"]);
@@ -80,7 +79,7 @@ if ($action == 'update' && ! $_POST["cancel"])
 		}
 		else
 		{
-			$message='<div class="error">'.$account->error.'</div>';
+			setEventMessage($account->error, 'errors');
 			$action='edit';     // Force chargement page edition
 		}
 	}
@@ -246,7 +245,7 @@ if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
 		if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
 
 		print '<tr><td valign="top">'.$langs->trans($ibankey).'</td>';
-		print '<td colspan="3">'.$account->iban_prefix.'</td></tr>';
+		print '<td colspan="3">'.$account->iban.'</td></tr>';
 
 		print '<tr><td valign="top">'.$langs->trans($bickey).'</td>';
 		print '<td colspan="3">'.$account->bic.'</td></tr>';
@@ -306,8 +305,6 @@ if ($_GET["id"] && $action == 'edit' && $user->rights->banque->configurer)
 	print_fiche_titre($langs->trans("EditFinancialAccount"));
 	print "<br>";
 
-	dol_htmloutput_mesg($message);
-
 	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -425,7 +422,7 @@ if ($_GET["id"] && $action == 'edit' && $user->rights->banque->configurer)
 
 		// IBAN
 		print '<tr><td valign="top">'.$langs->trans($ibankey).'</td>';
-		print '<td colspan="3"><input size="34" maxlength="34" type="text" class="flat" name="iban_prefix" value="'.$account->iban_prefix.'"></td></tr>';
+		print '<td colspan="3"><input size="34" maxlength="34" type="text" class="flat" name="iban" value="'.$account->iban.'"></td></tr>';
 
 		print '<tr><td valign="top">'.$langs->trans($bickey).'</td>';
 		print '<td colspan="3"><input size="11" maxlength="11" type="text" class="flat" name="bic" value="'.$account->bic.'"></td></tr>';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
new file mode 100644
index 00000000000..b1852785466
--- /dev/null
+++ b/htdocs/compta/bank/card.php
@@ -0,0 +1,662 @@
+<?php
+/* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copytight (C) 2005-2009	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copytight (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/bank/card.php
+ *      \ingroup    banque
+ *		\brief      Page to create/view a bank account
+ */
+
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
+$langs->load("companies");
+$langs->load("compta");
+
+$action=GETPOST("action");
+
+// Security check
+if (isset($_GET["id"]) || isset($_GET["ref"]))
+{
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+}
+$fieldid = isset($_GET["ref"])?'ref':'rowid';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'banque',$id,'bank_account&bank_account','','',$fieldid);
+
+
+/*
+ * Actions
+ */
+if ($_POST["action"] == 'add')
+{
+    $error=0;
+
+    // Create account
+    $account = new Account($db);
+
+    $account->ref           = dol_sanitizeFileName(trim($_POST["ref"]));
+    $account->label         = trim($_POST["label"]);
+    $account->courant       = $_POST["type"];
+    $account->clos          = $_POST["clos"];
+    $account->rappro        = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+    $account->url           = $_POST["url"];
+
+    $account->account_number  = trim($_POST["account_number"]);
+	$account->accountancy_journal  = trim($_POST["accountancy_journal"]);
+
+    $account->solde           = $_POST["solde"];
+    $account->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+
+    $account->currency_code   = trim($_POST["account_currency_code"]);
+
+    $account->state_id  	  = $_POST["account_state_id"];
+    $account->country_id      = $_POST["account_country_id"];
+
+    $account->min_allowed     = $_POST["account_min_allowed"];
+    $account->min_desired     = $_POST["account_min_desired"];
+    $account->comment         = trim($_POST["account_comment"]);
+
+    if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
+    {
+        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error');
+        $action='create';       // Force chargement page en mode creation
+        $error++;
+    }
+    if (empty($account->ref))
+    {
+        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors');
+        $action='create';       // Force chargement page en mode creation
+        $error++;
+    }
+    if (empty($account->label))
+    {
+    	setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
+    	$action='create';       // Force chargement page en mode creation
+    	$error++;
+    }
+
+    if (! $error)
+    {
+        $id = $account->create($user);
+        if ($id > 0)
+        {
+            $_GET["id"]=$id;            // Force chargement page en mode visu
+        }
+        else {
+            setEventMessage($account->error,'errors');
+            $action='create';   // Force chargement page en mode creation
+        }
+    }
+}
+
+if ($_POST["action"] == 'update' && ! $_POST["cancel"])
+{
+    $error=0;
+
+    // Update account
+    $account = new Account($db);
+    $account->fetch($_POST["id"]);
+
+    $account->ref             = dol_string_nospecial(trim($_POST["ref"]));
+    $account->label           = trim($_POST["label"]);
+    $account->courant         = $_POST["type"];
+    $account->clos            = $_POST["clos"];
+    $account->rappro          = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
+    $account->url             = trim($_POST["url"]);
+
+    $account->bank            = trim($_POST["bank"]);
+    $account->code_banque     = trim($_POST["code_banque"]);
+    $account->code_guichet    = trim($_POST["code_guichet"]);
+    $account->number          = trim($_POST["number"]);
+    $account->cle_rib         = trim($_POST["cle_rib"]);
+    $account->bic             = trim($_POST["bic"]);
+    $account->iban            = trim($_POST["iban"]);
+    $account->domiciliation   = trim($_POST["domiciliation"]);
+
+    $account->proprio 	      = trim($_POST["proprio"]);
+    $account->owner_address   = trim($_POST["owner_address"]);
+
+    $account->account_number  = trim($_POST["account_number"]);
+	$account->accountancy_journal = trim($_POST["accountancy_journal"]);
+
+    $account->currency_code   = trim($_POST["account_currency_code"]);
+
+    $account->state_id        = $_POST["account_state_id"];
+    $account->country_id      = $_POST["account_country_id"];
+
+    $account->min_allowed     = $_POST["account_min_allowed"];
+    $account->min_desired     = $_POST["account_min_desired"];
+    $account->comment         = trim($_POST["account_comment"]);
+
+    if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
+    {
+        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error');
+        $action='edit';       // Force chargement page en mode creation
+        $error++;
+    }
+    if (empty($account->ref))
+    {
+        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors');
+        $action='edit';       // Force chargement page en mode creation
+        $error++;
+    }
+    if (empty($account->label))
+    {
+    	setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
+    	$action='edit';       // Force chargement page en mode creation
+    	$error++;
+    }
+
+    if (! $error)
+    {
+        $result = $account->update($user);
+        if ($result >= 0)
+        {
+            $_GET["id"]=$_POST["id"];   // Force chargement page en mode visu
+        }
+        else
+        {
+	        setEventMessage($account->error, 'errors');
+            $action='edit';     // Force chargement page edition
+        }
+    }
+}
+
+if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
+{
+    // Delete
+    $account = new Account($db);
+    $account->fetch($_GET["id"]);
+    $account->delete();
+
+    header("Location: ".DOL_URL_ROOT."/compta/bank/index.php");
+    exit;
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formbank = new FormBank($db);
+$formcompany = new FormCompany($db);
+
+$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+
+llxHeader();
+
+
+// Creation
+
+if ($action == 'create')
+{
+	$account=new Account($db);
+
+	print_fiche_titre($langs->trans("NewFinancialAccount"));
+
+    if ($conf->use_javascript_ajax)
+    {
+        print "\n".'<script type="text/javascript" language="javascript">';
+        print 'jQuery(document).ready(function () {
+                    jQuery("#selectaccount_country_id").change(function() {
+                        document.formsoc.action.value="create";
+                        document.formsoc.submit();
+                    });
+               })';
+        print '</script>'."\n";
+    }
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'" name="formsoc" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="clos" value="0">';
+
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td valign="top" class="fieldrequired"  width="25%">'.$langs->trans("Ref").'</td>';
+	print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$account->ref).'" maxlength="12"></td></tr>';
+
+	// Label
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
+	print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.$_POST["label"].'"></td></tr>';
+
+	// Type
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
+	print '<td colspan="3">';
+	print $formbank->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
+	print '</td></tr>';
+
+	// Currency
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Currency").'</td>';
+	print '<td colspan="3">';
+	$selectedcode=$account->account_currency_code;
+	if (! $selectedcode) $selectedcode=$conf->currency;
+	print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
+	//print $langs->trans("Currency".$conf->currency);
+	//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
+	print '</td></tr>';
+
+	// Status
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Status").'</td>';
+    print '<td colspan="3">';
+    print $form->selectarray("clos",array(0=>$account->status[0],1=>$account->status[1]),(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
+    print '</td></tr>';
+
+	// Country
+	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
+	print '<td colspan="3">';
+	$selectedcode='';
+	if (isset($_POST["account_country_id"]))
+	{
+		$selectedcode=$_POST["account_country_id"]?$_POST["account_country_id"]:$account->country_code;
+	}
+	else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
+	print $form->select_country($selectedcode,'account_country_id');
+	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	print '</td></tr>';
+
+	// State
+	print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+	if ($selectedcode)
+	{
+		$formcompany->select_departement(isset($_POST["account_state_id"])?$_POST["account_state_id"]:'',$selectedcode,'account_state_id');
+	}
+	else
+	{
+		print $countrynotdefined;
+	}
+	print '</td></tr>';
+
+	// Web
+	print '<tr><td valign="top">'.$langs->trans("Web").'</td>';
+	print '<td colspan="3"><input size="50" type="text" class="flat" name="url" value="'.$_POST["url"].'"></td></tr>';
+
+	// Comment
+	print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
+	print '<td colspan="3">';
+    // Editor wysiwyg
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
+	$doleditor->Create();
+	print '</td></tr>';
+
+	print '</table>';
+
+	print '<br>';
+
+	print '<table class="border" width="100%">';
+
+	// Sold
+	print '<tr><td valign="top" width="25%">'.$langs->trans("InitialBankBalance").'</td>';
+	print '<td colspan="3"><input size="12" type="text" class="flat" name="solde" value="'.($_POST["solde"]?$_POST["solde"]:price2num($account->solde)).'"></td></tr>';
+
+	print '<tr><td valign="top">'.$langs->trans("Date").'</td>';
+	print '<td colspan="3">';
+	$form->select_date('', 're', 0, 0, 0, 'formsoc');
+	print '</td></tr>';
+
+	print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
+	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.($_POST["account_min_allowed"]?$_POST["account_min_allowed"]:$account->account_min_allowed).'"></td></tr>';
+
+	print '<tr><td valign="top">'.$langs->trans("BalanceMinimalDesired").'</td>';
+	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.($_POST["account_min_desired"]?$_POST["account_min_desired"]:$account->account_min_desired).'"></td></tr>';
+
+	print '</table>';
+
+	print '<br>';
+
+	print '<table class="border" width="100%">';
+	// Accountancy code
+    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
+    {
+        print '<tr><td valign="top" class="fieldrequired"  width="25%">'.$langs->trans("AccountancyCode").'</td>';
+        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
+    }
+    else
+    {
+        print '<tr><td valign="top"  width="25%">'.$langs->trans("AccountancyCode").'</td>';
+        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
+    }
+
+	// Accountancy journal
+	if (! empty($conf->accounting->enabled))
+	{
+		print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
+	    print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.$account->accountancy_journal.'"></td></tr>';
+	}
+
+	print '</table>';
+
+	print '<center><br><input value="'.$langs->trans("CreateAccount").'" type="submit" class="button"></center>';
+
+	print '</form>';
+}
+/* ************************************************************************** */
+/*                                                                            */
+/* Visu et edition                                                            */
+/*                                                                            */
+/* ************************************************************************** */
+else
+{
+    if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
+	{
+		$account = new Account($db);
+		if ($_GET["id"])
+		{
+			$account->fetch($_GET["id"]);
+		}
+		if ($_GET["ref"])
+		{
+			$account->fetch(0,$_GET["ref"]);
+			$_GET["id"]=$account->id;
+		}
+
+		/*
+		* Affichage onglets
+		*/
+
+		// Onglets
+		$head=bank_prepare_head($account);
+		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"),0,'account');
+
+		/*
+		* Confirmation to delete
+		*/
+		if ($action == 'delete')
+		{
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$account->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete");
+
+		}
+
+		print '<table class="border" width="100%">';
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
+
+		// Ref
+		print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
+		print '<td colspan="3">';
+		print $form->showrefnav($account, 'ref', $linkback, 1, 'ref');
+		print '</td></tr>';
+
+		// Label
+		print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
+		print '<td colspan="3">'.$account->label.'</td></tr>';
+
+		// Type
+		print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
+		print '<td colspan="3">'.$account->type_lib[$account->type].'</td></tr>';
+
+		// Currency
+		print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
+		print '<td colspan="3">';
+		$selectedcode=$account->account_currency_code;
+		if (! $selectedcode) $selectedcode=$conf->currency;
+		print $langs->trans("Currency".$selectedcode);
+		print '</td></tr>';
+
+		// Status
+		print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
+		print '<td colspan="3">'.$account->getLibStatut(4).'</td></tr>';
+
+		// Country
+		print '<tr><td>'.$langs->trans("BankAccountCountry").'</td><td>';
+		if ($account->country_id > 0)
+		{
+			$img=picto_from_langcode($account->country_code);
+			print $img?$img.' ':'';
+			print getCountry($account->getCountryCode(),0,$db);
+		}
+		print '</td></tr>';
+
+		// State
+		print '<tr><td>'.$langs->trans('State').'</td><td>';
+		if ($account->fk_departement > 0) print getState($account->fk_departement);
+		print '</td></tr>';
+
+		// Conciliate
+		print '<tr><td valign="top">'.$langs->trans("Conciliable").'</td>';
+		print '<td colspan="3">';
+		$conciliate=$account->canBeConciliated();
+		if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
+        else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
+		else print ($account->rappro==1 ? $langs->trans("Yes") : ($langs->trans("No").' ('.$langs->trans("ConciliationDisabled").')'));
+		print '</td></tr>';
+
+		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
+		print '<td colspan="3">'.$account->min_allowed.'</td></tr>';
+
+		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalDesired").'</td>';
+		print '<td colspan="3">'.$account->min_desired.'</td></tr>';
+
+		print '<tr><td valign="top">'.$langs->trans("Web").'</td><td colspan="3">';
+		if ($account->url) print '<a href="'.$account->url.'" target="_gobank">';
+		print $account->url;
+		if ($account->url) print '</a>';
+		print "</td></tr>\n";
+
+		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
+		print '<td colspan="3">'.$account->comment.'</td></tr>';
+
+		print '</table>';
+
+		print '<br>';
+		print '<table class="border" width="100%">';
+		// Accountancy code
+		print '<tr><td valign="top" width="25%">'.$langs->trans("AccountancyCode").'</td>';
+		print '<td colspan="3">'.$account->account_number.'</td></tr>';
+
+		// Accountancy journal
+		if (! empty($conf->accounting->enabled))
+		{
+			print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
+			print '<td colspan="3">'.$account->accountancy_journal.'</td></tr>';
+		}
+
+		print '</table>';
+
+		print '</div>';
+
+
+		/*
+		 * Barre d'actions
+		 */
+		print '<div class="tabsAction">';
+
+		if ($user->rights->banque->configurer)
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$account->id.'">'.$langs->trans("Modify").'</a>';
+		}
+
+		$canbedeleted=$account->can_be_deleted();   // Renvoi vrai si compte sans mouvements
+		if ($user->rights->banque->configurer && $canbedeleted)
+		{
+			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$account->id.'">'.$langs->trans("Delete").'</a>';
+		}
+
+		print '</div>';
+
+	}
+
+    /* ************************************************************************** */
+    /*                                                                            */
+    /* Edition                                                                    */
+    /*                                                                            */
+    /* ************************************************************************** */
+
+    if (GETPOST('id','int') && $action == 'edit' && $user->rights->banque->configurer)
+    {
+        $account = new Account($db);
+        $account->fetch(GETPOST('id','int'));
+
+        print_fiche_titre($langs->trans("EditFinancialAccount"));
+
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print 'jQuery(document).ready(function () {
+                        jQuery("#selectaccount_country_id").change(function() {
+                            document.formsoc.action.value="edit";
+                            document.formsoc.submit();
+                        });
+                   })';
+            print '</script>'."\n";
+        }
+
+        print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post" name="formsoc">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="update">';
+        print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">'."\n\n";
+
+        print '<table class="border" width="100%">';
+
+		// Ref
+		print '<tr><td valign="top" class="fieldrequired" width="25%">'.$langs->trans("Ref").'</td>';
+		print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.(isset($_POST["ref"])?$_POST["ref"]:$account->ref).'"></td></tr>';
+
+		// Label
+        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Label").'</td>';
+        print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.(isset($_POST["label"])?$_POST["label"]:$account->label).'"></td></tr>';
+
+        // Type
+        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
+        print '<td colspan="3">';
+		print $formbank->select_type_comptes_financiers((isset($_POST["type"])?$_POST["type"]:$account->type),"type");
+        print '</td></tr>';
+
+		// Currency
+		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Currency");
+		print '<input type="hidden" value="'.$account->currency_code.'">';
+		print '</td>';
+		print '<td colspan="3">';
+		$selectedcode=$account->account_currency_code;
+		if (! $selectedcode) $selectedcode=$conf->currency;
+		print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
+		//print $langs->trans("Currency".$conf->currency);
+		//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
+		print '</td></tr>';
+
+		// Status
+        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Status").'</td>';
+        print '<td colspan="3">';
+        print $form->selectarray("clos",array(0=>$account->status[0],1=>$account->status[1]),(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
+        print '</td></tr>';
+
+		// Country
+		$account->country_id=$account->country_id?$account->country_id:$mysoc->country_id;
+		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Country").'</td>';
+		print '<td colspan="3">';
+		$selectedcode=$account->country_code;
+		if (isset($_POST["account_country_id"])) $selectedcode=$_POST["account_country_id"];
+		else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
+		print $form->select_country($selectedcode,'account_country_id');
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		print '</td></tr>';
+
+		// State
+		print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+		if ($selectedcode)
+		{
+			print $formcompany->select_state(isset($_POST["account_state_id"])?$_POST["account_state_id"]:$account->state_id,$selectedcode,'account_state_id');
+		}
+		else
+		{
+			print $countrynotdefined;
+		}
+		print '</td></tr>';
+
+		// Conciliable
+        print '<tr><td valign="top">'.$langs->trans("Conciliable").'</td>';
+        print '<td colspan="3">';
+        $conciliate=$account->canBeConciliated();
+        if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
+        else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
+        else print '<input type="checkbox" class="flat" name="norappro"'.($account->rappro?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
+        print '</td></tr>';
+
+        // Balance
+		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
+		print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(isset($_POST["account_min_allowed"])?$_POST["account_min_allowed"]:$account->min_allowed).'"></td></tr>';
+
+		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalDesired").'</td>';
+		print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.(isset($_POST["account_min_desired"])?$_POST["account_min_desired"]:$account->min_desired).'"></td></tr>';
+
+		// Web
+        print '<tr><td valign="top">'.$langs->trans("Web").'</td>';
+        print '<td colspan="3"><input size="50" type="text" class="flat" name="url" value="'.(isset($_POST["url"])?$_POST["url"]:$account->url).'">';
+        print '</td></tr>';
+
+		// Comment
+		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
+		print '<td colspan="3">';
+	   // Editor wysiwyg
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
+		$doleditor->Create();
+		print '</td></tr>';
+
+		print '</table>';
+
+		print '<br>';
+		print '<table class="border" width="100%">';
+
+		// Accountancy code
+        if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
+        {
+            print '<tr><td valign="top" class="fieldrequired" width="25%">'.$langs->trans("AccountancyCode").'</td>';
+            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
+        }
+        else
+        {
+            print '<tr><td valign="top" width="25%">'.$langs->trans("AccountancyCode").'</td>';
+            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
+        }
+
+		// Accountancy journal
+		if (! empty($conf->accounting->enabled))
+		{
+	        print '<tr><td valign="top">'.$langs->trans("AccountancyJournal").'</td>';
+	        print '<td colspan="3"><input type="text" name="accountancy_journal" value="'.(isset($_POST["accountancy_journal"])?$_POST["accountancy_journal"]:$account->accountancy_journal).'"></td></tr>';
+		}
+
+		print '</table>';
+
+		print '<center><br><input value="'.$langs->trans("Modify").'" type="submit" class="button">';
+		print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button"></center>';
+
+		print '</form>';
+	}
+
+}
+
+
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 41abab1ace0..5aa72d4c049 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -52,7 +52,6 @@ if (GETPOST('add'))
 		$sql.= ", ".$conf->entity;
 		$sql.= ")";
 
-		dol_syslog("sql=".$sql);
 		$result = $db->query($sql);
 		if (!$result)
 		{
@@ -73,7 +72,6 @@ if (GETPOST('update'))
 		$sql.= " WHERE rowid = '".GETPOST('categid')."'";
 		$sql.= " AND entity = ".$conf->entity;
 
-		dol_syslog("sql=".$sql);
 		$result = $db->query($sql);
 		if (!$result)
 		{
@@ -92,7 +90,6 @@ if ($action == 'delete')
 		$sql.= " WHERE rowid = '".GETPOST('categid')."'";
 		$sql.= " AND entity = ".$conf->entity;
 
-		dol_syslog("sql=".$sql);
 		$result = $db->query($sql);
 		if (!$result)
 		{
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 8bcabf7f17b..4343e2cb921 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;
 
@@ -74,6 +74,7 @@ class Account extends CommonObject
     var $type_lib=array();
 
     var $account_number;
+	var $accountancy_journal;
 
     var $currency_code;
     var $min_allowed;
@@ -146,7 +147,7 @@ class Account extends CommonObject
         $sql.= ", '".$type."'";
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::add_url_line sql=".$sql);
+        dol_syslog(get_class($this)."::add_url_line", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             $rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
@@ -155,7 +156,6 @@ class Account extends CommonObject
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::add_url_line ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -189,7 +189,7 @@ class Account extends CommonObject
         }
         $sql.= " ORDER BY type, label";
 
-        dol_syslog(get_class($this)."::get_url sql=".$sql);
+        dol_syslog(get_class($this)."::get_url", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -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
@@ -302,7 +302,7 @@ class Account extends CommonObject
         $sql.= ", ".($banque?"'".$this->db->escape($banque)."'":"null");
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::addline sql=".$sql);
+        dol_syslog(get_class($this)."::addline", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             $rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank");
@@ -330,7 +330,6 @@ class Account extends CommonObject
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::addline ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -2;
         }
@@ -339,9 +338,10 @@ class Account extends CommonObject
     /**
      *  Create bank account into database
      *
+     *  @param	User	$user		Object user making creation
      *  @return int        			< 0 if KO, > 0 if OK
      */
-    function create()
+    function create($user='')
     {
         global $langs,$conf;
 
@@ -382,6 +382,7 @@ class Account extends CommonObject
         $sql.= ", label";
         $sql.= ", entity";
         $sql.= ", account_number";
+		$sql.= ", accountancy_journal";
         $sql.= ", currency_code";
         $sql.= ", rappro";
         $sql.= ", min_allowed";
@@ -395,6 +396,7 @@ class Account extends CommonObject
         $sql.= ", '".$this->db->escape($this->label)."'";
         $sql.= ", ".$conf->entity;
         $sql.= ", '".$this->db->escape($this->account_number)."'";
+		$sql.= ", '".$this->db->escape($this->accountancy_journal)."'";
         $sql.= ", '".$this->currency_code."'";
         $sql.= ", ".$this->rappro;
         $sql.= ", ".price2num($this->min_allowed);
@@ -404,7 +406,7 @@ class Account extends CommonObject
         $sql.= ", ".$this->country_id;
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -437,7 +439,6 @@ class Account extends CommonObject
                 if (! $resql)
                 {
                     $this->error=$this->db->lasterror();
-                    dol_syslog($this->error, LOG_ERR);
                     return -3;
                 }
             }
@@ -448,12 +449,10 @@ class Account extends CommonObject
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error=$langs->trans("ErrorBankLabelAlreadyExists");
-                dol_syslog($this->error, LOG_ERR);
                 return -1;
             }
             else {
                 $this->error=$this->db->error()." sql=".$sql;
-                dol_syslog($this->error, LOG_ERR);
                 return -2;
             }
         }
@@ -500,6 +499,7 @@ class Account extends CommonObject
         $sql.= ",rappro = ".$this->rappro;
         $sql.= ",url = ".($this->url?"'".$this->url."'":"null");
         $sql.= ",account_number = '".$this->account_number."'";
+		$sql.= ",accountancy_journal = '".$this->accountancy_journal."'";
 
         $sql.= ",currency_code = '".$this->currency_code."'";
 
@@ -513,7 +513,7 @@ class Account extends CommonObject
         $sql.= " WHERE rowid = ".$this->id;
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::update sql=".$sql);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -570,7 +570,7 @@ class Account extends CommonObject
         $sql.= " WHERE rowid = ".$this->id;
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::update_bban sql=$sql");
+        dol_syslog(get_class($this)."::update_bban", LOG_DEBUG);
 
         $result = $this->db->query($sql);
         if ($result)
@@ -606,18 +606,18 @@ class Account extends CommonObject
         $sql = "SELECT ba.rowid, ba.ref, ba.label, ba.bank, ba.number, ba.courant, ba.clos, ba.rappro, ba.url,";
         $sql.= " ba.code_banque, ba.code_guichet, ba.cle_rib, ba.bic, ba.iban_prefix as iban,";
         $sql.= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
-        $sql.= " ba.account_number, ba.currency_code,";
+        $sql.= " ba.account_number, ba.accountancy_journal, ba.currency_code,";
         $sql.= " ba.min_allowed, ba.min_desired, ba.comment,";
-        $sql.= ' p.code as country_code, p.libelle as country,';
+        $sql.= ' c.code as country_code, c.label as country,';
         $sql.= ' d.code_departement as state_code, d.nom as state';
         $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON ba.fk_pays = p.rowid';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON ba.fk_pays = c.rowid';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ba.state_id = d.rowid';
         $sql.= " WHERE entity IN (".getEntity($this->element, 1).")";
         if ($id)  $sql.= " AND ba.rowid  = ".$id;
         if ($ref) $sql.= " AND ba.ref = '".$this->db->escape($ref)."'";
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -642,7 +642,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;
@@ -656,6 +655,7 @@ class Account extends CommonObject
                 $this->country       = $obj->country;
 
                 $this->account_number = $obj->account_number;
+				$this->accountancy_journal = $obj->accountancy_journal;
 
                 $this->currency_code  = $obj->currency_code;
                 $this->account_currency_code  = $obj->currency_code;
@@ -665,10 +665,9 @@ class Account extends CommonObject
                 return 1;
             }
             else
-            {
+			{
                 return 0;
             }
-            $this->db->free($result);
         }
         else
         {
@@ -691,7 +690,7 @@ class Account extends CommonObject
         $sql.= " WHERE rowid  = ".$this->rowid;
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
             return 1;
@@ -882,7 +881,7 @@ class Account extends CommonObject
 
         if (empty($mode))
         {
-            $lien = '<a href="'.DOL_URL_ROOT.'/compta/bank/fiche.php?id='.$this->id.'">';
+            $lien = '<a href="'.DOL_URL_ROOT.'/compta/bank/card.php?id='.$this->id.'">';
             $lienfin='</a>';
         }
         else if ($mode == 'transactions')
@@ -1011,7 +1010,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';
@@ -1091,7 +1089,7 @@ class AccountLine extends CommonObject
         else if ($ref) $sql.= " AND b.rowid='".$this->db->escape($ref)."'";
         else $sql.= " AND b.rowid=".$rowid;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -1145,7 +1143,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;
 
@@ -1166,12 +1164,12 @@ class AccountLine extends CommonObject
         }
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid=".$this->rowid;
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (! $result) $nbko++;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank WHERE rowid=".$this->rowid;
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (! $result) $nbko++;
 
@@ -1194,7 +1192,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;
 
@@ -1208,7 +1206,7 @@ class AccountLine extends CommonObject
         $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank=".$this->rowid;
-        dol_syslog(get_class($this)."::delete_urls sql=".$sql);
+        dol_syslog(get_class($this)."::delete_urls", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (! $result) $nbko++;
 
@@ -1242,7 +1240,7 @@ class AccountLine extends CommonObject
         $sql.= " dateo='".$this->db->idate($this->dateo)."'";
         $sql.= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog(get_class($this)."::update sql=".$sql);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -1253,7 +1251,6 @@ class AccountLine extends CommonObject
         {
             $this->db->rollback();
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -1276,7 +1273,7 @@ class AccountLine extends CommonObject
         $sql.= ", fk_user_rappro = ".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::update_conciliation sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update_conciliation", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -1290,7 +1287,7 @@ class AccountLine extends CommonObject
                 $sql.= ", ".$cat;
                 $sql.= ")";
 
-                dol_syslog(get_class($this)."::update_conciliation sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::update_conciliation", LOG_DEBUG);
                 $resql = $this->db->query($sql);
 
                 // No error check. Can fail if category already affected
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index c4066bae655..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
 {
@@ -84,7 +82,7 @@ class BankCateg // extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -142,7 +140,7 @@ class BankCateg // extends CommonObject
         $sql.= " WHERE t.rowid = ".$id;
         $sql.= " AND t.entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -160,7 +158,6 @@ class BankCateg // extends CommonObject
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -173,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;
@@ -192,7 +189,7 @@ class BankCateg // extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -249,7 +246,7 @@ class BankCateg // extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -301,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/class/index.html b/htdocs/compta/bank/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
deleted file mode 100644
index bdb30e46528..00000000000
--- a/htdocs/compta/bank/fiche.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copytight (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/compta/bank/fiche.php
- *      \ingroup    banque
- *		\brief      Page to create/view a bank account
- */
-
-require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-$langs->load("companies");
-
-$action=GETPOST("action");
-
-// Security check
-if (isset($_GET["id"]) || isset($_GET["ref"]))
-{
-	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
-}
-$fieldid = isset($_GET["ref"])?'ref':'rowid';
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'banque',$id,'bank_account&bank_account','','',$fieldid);
-
-
-/*
- * Actions
- */
-if ($_POST["action"] == 'add')
-{
-    $error=0;
-
-    // Create account
-    $account = new Account($db,0);
-
-    $account->ref           = dol_sanitizeFileName(trim($_POST["ref"]));
-    $account->label         = trim($_POST["label"]);
-    $account->courant       = $_POST["type"];
-    $account->clos          = $_POST["clos"];
-    $account->rappro        = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
-    $account->url           = $_POST["url"];
-
-    $account->account_number  = trim($_POST["account_number"]);
-
-    $account->solde           = $_POST["solde"];
-    $account->date_solde      = dol_mktime(12,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
-
-    $account->currency_code   = trim($_POST["account_currency_code"]);
-
-    $account->state_id  	  = $_POST["account_state_id"];
-    $account->country_id      = $_POST["account_country_id"];
-
-    $account->min_allowed     = $_POST["account_min_allowed"];
-    $account->min_desired     = $_POST["account_min_desired"];
-    $account->comment         = trim($_POST["account_comment"]);
-
-    if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
-    {
-        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error');
-        $action='create';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($account->ref))
-    {
-        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors');
-        $action='create';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($account->label))
-    {
-    	setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
-    	$action='create';       // Force chargement page en mode creation
-    	$error++;
-    }
-
-    if (! $error)
-    {
-        $id = $account->create($user->id);
-        if ($id > 0)
-        {
-            $_GET["id"]=$id;            // Force chargement page en mode visu
-        }
-        else {
-            setEventMessage($account->error,'errors');
-            $action='create';   // Force chargement page en mode creation
-        }
-    }
-}
-
-if ($_POST["action"] == 'update' && ! $_POST["cancel"])
-{
-    $error=0;
-
-    // Update account
-    $account = new Account($db, $_POST["id"]);
-    $account->fetch($_POST["id"]);
-
-    $account->ref             = dol_string_nospecial(trim($_POST["ref"]));
-    $account->label           = trim($_POST["label"]);
-    $account->courant         = $_POST["type"];
-    $account->clos            = $_POST["clos"];
-    $account->rappro          = (isset($_POST["norappro"]) && $_POST["norappro"])?0:1;
-    $account->url             = trim($_POST["url"]);
-
-    $account->bank            = trim($_POST["bank"]);
-    $account->code_banque     = trim($_POST["code_banque"]);
-    $account->code_guichet    = trim($_POST["code_guichet"]);
-    $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->domiciliation   = trim($_POST["domiciliation"]);
-
-    $account->proprio 	      = trim($_POST["proprio"]);
-    $account->owner_address   = trim($_POST["owner_address"]);
-
-    $account->account_number  = trim($_POST["account_number"]);
-
-    $account->currency_code   = trim($_POST["account_currency_code"]);
-
-    $account->state_id        = $_POST["account_state_id"];
-    $account->country_id      = $_POST["account_country_id"];
-
-    $account->min_allowed     = $_POST["account_min_allowed"];
-    $account->min_desired     = $_POST["account_min_desired"];
-    $account->comment         = trim($_POST["account_comment"]);
-
-    if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($account->account_number))
-    {
-        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountancyCode")), 'error');
-        $action='edit';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($account->ref))
-    {
-        setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")), 'errors');
-        $action='edit';       // Force chargement page en mode creation
-        $error++;
-    }
-    if (empty($account->label))
-    {
-    	setEventMessage($langs->transnoentitiesnoconv("ErrorFieldRequired",$langs->transnoentitiesnoconv("LabelBankCashAccount")), 'errors');
-    	$action='edit';       // Force chargement page en mode creation
-    	$error++;
-    }
-
-    if (! $error)
-    {
-        $result = $account->update($user);
-        if ($result >= 0)
-        {
-            $_GET["id"]=$_POST["id"];   // Force chargement page en mode visu
-        }
-        else
-        {
-            $message='<div class="error">'.$account->error.'</div>';
-            $action='edit';     // Force chargement page edition
-        }
-    }
-}
-
-if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
-{
-    // Delete
-    $account = new Account($db);
-    $account->fetch($_GET["id"]);
-    $account->delete();
-
-    header("Location: ".DOL_URL_ROOT."/compta/bank/index.php");
-    exit;
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formbank = new FormBank($db);
-$formcompany = new FormCompany($db);
-
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-
-llxHeader();
-
-
-// Creation
-
-if ($action == 'create')
-{
-	$account=new Account($db);
-
-	print_fiche_titre($langs->trans("NewFinancialAccount"));
-
-	dol_htmloutput_mesg($message);
-
-    if ($conf->use_javascript_ajax)
-    {
-        print "\n".'<script type="text/javascript" language="javascript">';
-        print 'jQuery(document).ready(function () {
-                    jQuery("#selectaccount_country_id").change(function() {
-                        document.formsoc.action.value="create";
-                        document.formsoc.submit();
-                    });
-               })';
-        print '</script>'."\n";
-    }
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'" name="formsoc" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="clos" value="0">';
-
-	print '<table class="border" width="100%">';
-
-	// Ref
-	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$account->ref).'" maxlength="12"></td></tr>';
-
-	// Label
-	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
-	print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.$_POST["label"].'"></td></tr>';
-
-	// Type
-	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
-	print '<td colspan="3">';
-	print $formbank->select_type_comptes_financiers(isset($_POST["type"])?$_POST["type"]:1,"type");
-	print '</td></tr>';
-
-	// Currency
-	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Currency").'</td>';
-	print '<td colspan="3">';
-	$selectedcode=$account->account_currency_code;
-	if (! $selectedcode) $selectedcode=$conf->currency;
-	print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
-	//print $langs->trans("Currency".$conf->currency);
-	//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
-	print '</td></tr>';
-
-	// Status
-    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Status").'</td>';
-    print '<td colspan="3">';
-    print $form->selectarray("clos",array(0=>$account->status[0],1=>$account->status[1]),(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
-    print '</td></tr>';
-
-	// Country
-	print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
-	print '<td colspan="3">';
-	$selectedcode='';
-	if (isset($_POST["account_country_id"]))
-	{
-		$selectedcode=$_POST["account_country_id"]?$_POST["account_country_id"]:$account->country_code;
-	}
-	else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
-	print $form->select_country($selectedcode,'account_country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	print '</td></tr>';
-
-	// State
-	print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
-	if ($selectedcode)
-	{
-		$formcompany->select_departement(isset($_POST["account_state_id"])?$_POST["account_state_id"]:'',$selectedcode,'account_state_id');
-	}
-	else
-	{
-		print $countrynotdefined;
-	}
-	print '</td></tr>';
-
-	// Accountancy code
-    if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
-    {
-        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountancyCode").'</td>';
-        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
-    }
-    else
-    {
-        print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-        print '<td colspan="3"><input type="text" name="account_number" value="'.$account->account_number.'"></td></tr>';
-    }
-
-	// Web
-	print '<tr><td valign="top">'.$langs->trans("Web").'</td>';
-	print '<td colspan="3"><input size="50" type="text" class="flat" name="url" value="'.$_POST["url"].'"></td></tr>';
-
-	// Comment
-	print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
-	print '<td colspan="3">';
-    // Editor wysiwyg
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('account_comment',$account->comment,'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
-	$doleditor->Create();
-	print '</td></tr>';
-
-	// Sold
-	print '<tr><td colspan="4"><b>'.$langs->trans("InitialBankBalance").'...</b></td></tr>';
-
-	print '<tr><td valign="top">'.$langs->trans("InitialBankBalance").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="solde" value="'.($_POST["solde"]?$_POST["solde"]:price2num($account->solde)).'"></td></tr>';
-
-	print '<tr><td valign="top">'.$langs->trans("Date").'</td>';
-	print '<td colspan="3">';
-	$form->select_date('', 're', 0, 0, 0, 'formsoc');
-	print '</td></tr>';
-
-	print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.($_POST["account_min_allowed"]?$_POST["account_min_allowed"]:$account->account_min_allowed).'"></td></tr>';
-
-	print '<tr><td valign="top">'.$langs->trans("BalanceMinimalDesired").'</td>';
-	print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.($_POST["account_min_desired"]?$_POST["account_min_desired"]:$account->account_min_desired).'"></td></tr>';
-
-	print '</table>';
-
-	print '<center><br><input value="'.$langs->trans("CreateAccount").'" type="submit" class="button"></center>';
-
-	print '</form>';
-}
-/* ************************************************************************** */
-/*                                                                            */
-/* Visu et edition                                                            */
-/*                                                                            */
-/* ************************************************************************** */
-else
-{
-    if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
-	{
-		$account = new Account($db);
-		if ($_GET["id"])
-		{
-			$account->fetch($_GET["id"]);
-		}
-		if ($_GET["ref"])
-		{
-			$account->fetch(0,$_GET["ref"]);
-			$_GET["id"]=$account->id;
-		}
-
-		/*
-		* Affichage onglets
-		*/
-
-		// Onglets
-		$head=bank_prepare_head($account);
-		dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"),0,'account');
-
-		/*
-		* Confirmation to delete
-		*/
-		if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$account->id,$langs->trans("DeleteAccount"),$langs->trans("ConfirmDeleteAccount"),"confirm_delete");
-
-		}
-
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
-		print '<td colspan="3">';
-		print $form->showrefnav($account, 'ref', $linkback, 1, 'ref');
-		print '</td></tr>';
-
-		// Label
-		print '<tr><td valign="top">'.$langs->trans("Label").'</td>';
-		print '<td colspan="3">'.$account->label.'</td></tr>';
-
-		// Type
-		print '<tr><td valign="top">'.$langs->trans("AccountType").'</td>';
-		print '<td colspan="3">'.$account->type_lib[$account->type].'</td></tr>';
-
-		// Currency
-		print '<tr><td valign="top">'.$langs->trans("Currency").'</td>';
-		print '<td colspan="3">';
-		$selectedcode=$account->account_currency_code;
-		if (! $selectedcode) $selectedcode=$conf->currency;
-		print $langs->trans("Currency".$selectedcode);
-		print '</td></tr>';
-
-		// Status
-		print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
-		print '<td colspan="3">'.$account->getLibStatut(4).'</td></tr>';
-
-		// Country
-		print '<tr><td>'.$langs->trans("BankAccountCountry").'</td><td>';
-		if ($account->country_id > 0)
-		{
-			$img=picto_from_langcode($account->country_code);
-			print $img?$img.' ':'';
-			print getCountry($account->getCountryCode(),0,$db);
-		}
-		print '</td></tr>';
-
-		// State
-		print '<tr><td>'.$langs->trans('State').'</td><td>';
-		if ($account->fk_departement > 0) print getState($account->fk_departement);
-		print '</td></tr>';
-
-		// Conciliate
-		print '<tr><td valign="top">'.$langs->trans("Conciliable").'</td>';
-		print '<td colspan="3">';
-		$conciliate=$account->canBeConciliated();
-		if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
-        else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
-		else print ($account->rappro==1 ? $langs->trans("Yes") : ($langs->trans("No").' ('.$langs->trans("ConciliationDisabled").')'));
-		print '</td></tr>';
-
-		// Accountancy code
-		print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-		print '<td colspan="3">'.$account->account_number.'</td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
-		print '<td colspan="3">'.$account->min_allowed.'</td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalDesired").'</td>';
-		print '<td colspan="3">'.$account->min_desired.'</td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans("Web").'</td><td colspan="3">';
-		if ($account->url) print '<a href="'.$account->url.'" target="_gobank">';
-		print $account->url;
-		if ($account->url) print '</a>';
-		print "</td></tr>\n";
-
-		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
-		print '<td colspan="3">'.$account->comment.'</td></tr>';
-
-		print '</table>';
-
-		print '</div>';
-
-
-		/*
-		 * Barre d'actions
-		 */
-		print '<div class="tabsAction">';
-
-		if ($user->rights->banque->configurer)
-		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$account->id.'">'.$langs->trans("Modify").'</a>';
-		}
-
-		$canbedeleted=$account->can_be_deleted();   // Renvoi vrai si compte sans mouvements
-		if ($user->rights->banque->configurer && $canbedeleted)
-		{
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$account->id.'">'.$langs->trans("Delete").'</a>';
-		}
-
-		print '</div>';
-
-	}
-
-    /* ************************************************************************** */
-    /*                                                                            */
-    /* Edition                                                                    */
-    /*                                                                            */
-    /* ************************************************************************** */
-
-    if (GETPOST('id','int') && $action == 'edit' && $user->rights->banque->configurer)
-    {
-        $account = new Account($db);
-        $account->fetch(GETPOST('id','int'));
-
-        print_fiche_titre($langs->trans("EditFinancialAccount"));
-        print "<br>";
-
-        if ($message) { print "$message<br>\n"; }
-
-        if ($conf->use_javascript_ajax)
-        {
-            print "\n".'<script type="text/javascript" language="javascript">';
-            print 'jQuery(document).ready(function () {
-                        jQuery("#selectaccount_country_id").change(function() {
-                            document.formsoc.action.value="edit";
-                            document.formsoc.submit();
-                        });
-                   })';
-            print '</script>'."\n";
-        }
-
-        print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$account->id.'" method="post" name="formsoc">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="update">';
-        print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">'."\n\n";
-
-        print '<table class="border" width="100%">';
-
-		// Ref
-		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Ref").'</td>';
-		print '<td colspan="3"><input size="8" type="text" class="flat" name="ref" value="'.(isset($_POST["ref"])?$_POST["ref"]:$account->ref).'"></td></tr>';
-
-		// Label
-        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Label").'</td>';
-        print '<td colspan="3"><input size="30" type="text" class="flat" name="label" value="'.(isset($_POST["label"])?$_POST["label"]:$account->label).'"></td></tr>';
-
-        // Type
-        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountType").'</td>';
-        print '<td colspan="3">';
-		print $formbank->select_type_comptes_financiers((isset($_POST["type"])?$_POST["type"]:$account->type),"type");
-        print '</td></tr>';
-
-		// Currency
-		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Currency");
-		print '<input type="hidden" value="'.$account->currency_code.'">';
-		print '</td>';
-		print '<td colspan="3">';
-		$selectedcode=$account->account_currency_code;
-		if (! $selectedcode) $selectedcode=$conf->currency;
-		print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
-		//print $langs->trans("Currency".$conf->currency);
-		//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
-		print '</td></tr>';
-
-		// Status
-        print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Status").'</td>';
-        print '<td colspan="3">';
-        print $form->selectarray("clos",array(0=>$account->status[0],1=>$account->status[1]),(isset($_POST["clos"])?$_POST["clos"]:$account->clos));
-        print '</td></tr>';
-
-		// Country
-		$account->country_id=$account->country_id?$account->country_id:$mysoc->country_id;
-		print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Country").'</td>';
-		print '<td colspan="3">';
-		$selectedcode=$account->country_code;
-		if (isset($_POST["account_country_id"])) $selectedcode=$_POST["account_country_id"];
-		else if (empty($selectedcode)) $selectedcode=$mysoc->country_code;
-		print $form->select_country($selectedcode,'account_country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		// State
-		print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
-		if ($selectedcode)
-		{
-			print $formcompany->select_state(isset($_POST["account_state_id"])?$_POST["account_state_id"]:$account->state_id,$selectedcode,'account_state_id');
-		}
-		else
-		{
-			print $countrynotdefined;
-		}
-		print '</td></tr>';
-
-		// Conciliable
-        print '<tr><td valign="top">'.$langs->trans("Conciliable").'</td>';
-        print '<td colspan="3">';
-        $conciliate=$account->canBeConciliated();
-        if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
-        else if ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
-        else print '<input type="checkbox" class="flat" name="norappro"'.($account->rappro?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
-        print '</td></tr>';
-
-        // Accountancy code
-        if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED))
-        {
-            print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("AccountancyCode").'</td>';
-            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
-        }
-        else
-        {
-            print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-            print '<td colspan="3"><input type="text" name="account_number" value="'.(isset($_POST["account_number"])?$_POST["account_number"]:$account->account_number).'"></td></tr>';
-        }
-
-		// Balance
-		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalAllowed").'</td>';
-		print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(isset($_POST["account_min_allowed"])?$_POST["account_min_allowed"]:$account->min_allowed).'"></td></tr>';
-
-		print '<tr><td valign="top">'.$langs->trans("BalanceMinimalDesired").'</td>';
-		print '<td colspan="3"><input size="12" type="text" class="flat" name="account_min_desired" value="'.(isset($_POST["account_min_desired"])?$_POST["account_min_desired"]:$account->min_desired).'"></td></tr>';
-
-		// Web
-        print '<tr><td valign="top">'.$langs->trans("Web").'</td>';
-        print '<td colspan="3"><input size="50" type="text" class="flat" name="url" value="'.(isset($_POST["url"])?$_POST["url"]:$account->url).'">';
-        print '</td></tr>';
-
-		// Comment
-		print '<tr><td valign="top">'.$langs->trans("Comment").'</td>';
-		print '<td colspan="3">';
-	   // Editor wysiwyg
-		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor=new DolEditor('account_comment',(isset($_POST["account_comment"])?$_POST["account_comment"]:$account->comment),'',200,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,70);
-		$doleditor->Create();
-		print '</td></tr>';
-
-        print '<tr><td align="center" colspan="4"><input value="'.$langs->trans("Modify").'" type="submit" class="button">';
-        print ' &nbsp; <input name="cancel" value="'.$langs->trans("Cancel").'" type="submit" class="button">';
-        print '</td></tr>';
-        print '</table>';
-
-        print '</form>';
-	}
-
-}
-
-
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 7a7f03c7d98..9351cc5fa9a 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -46,7 +46,6 @@ $result=restrictedArea($user,'banque',$id,'bank_account&bank_account','','',$fie
 $account=$_GET["account"];
 $mode='standard';
 if (isset($_GET["mode"]) && $_GET["mode"] == 'showalltime') $mode='showalltime';
-$mesg = '';
 $error=0;
 
 
@@ -82,7 +81,7 @@ if ($result < 0)
 {
 	$langs->load("errors");
 	$error++;
-	$mesg='<div class="error">'.$langs->trans("ErrorFailedToCreateDir").'</div>';
+	setEventMessage($langs->trans("ErrorFailedToCreateDir"), 'errors');
 }
 else
 {
@@ -756,8 +755,6 @@ else
 $head=bank_prepare_head($acct);
 dol_fiche_head($head,'graph',$langs->trans("FinancialAccount"),0,'account');
 
-if ($mesg) print $mesg.'<br>';
-
 print '<table class="border" width="100%">';
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/index.php">'.$langs->trans("BackToList").'</a>';
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index c9b70e94257..e6961ed97dd 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copytight (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,6 @@ $link='';
 if ($statut == '') $link='<a href="'.$_SERVER["PHP_SELF"].'?statut=all">'.$langs->trans("IncludeClosedAccount").'</a>';
 if ($statut == 'all') $link='<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("OnlyOpenedAccount").'</a>';
 print_fiche_titre($langs->trans("AccountsArea"),$link);
-print '<br>';
 
 
 // On charge tableau des comptes financiers (ouverts par defaut)
@@ -234,7 +233,11 @@ foreach ($accounts as $key=>$type)
 		$total[$acc->currency_code] += $solde;
 	}
 }
-if (! $found) print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
+if (! $found)
+{
+	$var = !$var;
+	print '<tr '.$bc[$var].'><td colspan="6">'.$langs->trans("None").'</td></tr>';
+}
 // Total
 foreach ($total as $key=>$solde)
 {
@@ -251,7 +254,7 @@ print "</table>";
 print '<div class="tabsAction">'."\n";
 if ($user->rights->banque->configurer)
 {
-	print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
+	print '<a class="butAction" href="card.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
 }
 print '</div>';
 
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index fee53c412b8..2be5d4336d6 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -99,7 +99,7 @@ if ($user->rights->banque->modifier && $action == "update")
 
 	if ($ac->courant == 2 && $_POST['value'] != 'LIQ')
 	{
-		$mesg = '<div class="error">'.$langs->trans("ErrorCashAccountAcceptsOnlyCashMoney").'</div>';
+		setEventMessage($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), 'errors');
 		$error++;
 	}
 
@@ -141,7 +141,7 @@ if ($user->rights->banque->modifier && $action == "update")
 		$result = $db->query($sql);
 		if ($result)
 		{
-			$mesg=$langs->trans("RecordSaved");
+			setEventMessage($langs->trans("RecordSaved"));
 			$db->commit();
 		}
 		else
@@ -161,7 +161,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
     // Check parameters
     if ($rappro && empty($num_rel))
     {
-        $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountStatement"));
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("AccountStatement")), 'errors');
         $error++;
     }
 
@@ -175,11 +175,11 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
         else $sql.=", rappro = ".$rappro;
         $sql.= " WHERE rowid = ".$rowid;
 
-        dol_syslog("ligne.php sql=".$sql, LOG_DEBUG);
+        dol_syslog("ligne.php", LOG_DEBUG);
         $result = $db->query($sql);
         if ($result)
         {
-            $mesg=$langs->trans("RecordSaved");
+	        setEventMessage($langs->trans("RecordSaved"));
             $db->commit();
         }
         else
@@ -235,8 +235,6 @@ $tabs = array(
 
 dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account');
 
-dol_htmloutput_mesg($mesg);
-
 $sql = "SELECT b.rowid,b.dateo as do,b.datev as dv, b.amount, b.label, b.rappro,";
 $sql.= " b.num_releve, b.fk_user_author, b.num_chq, b.fk_type, b.fk_account, b.fk_bordereau as receiptid,";
 $sql.= " b.emetteur,b.banque";
@@ -306,13 +304,13 @@ if ($result)
             {
                 if ($key) print '<br>';
                 if ($links[$key]['type']=='payment') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$links[$key]['url_id'].'">';
+                    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowPayment'),'payment').' ';
                     print $langs->trans("Payment");
                     print '</a>';
                 }
                 else if ($links[$key]['type']=='payment_supplier') {
-                    print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$links[$key]['url_id'].'">';
+                    print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowPayment'),'payment').' ';
                     print $langs->trans("Payment");
                     print '</a>';
@@ -330,25 +328,25 @@ if ($result)
                     print '</a>';
                 }
                 else if ($links[$key]['type']=='payment_sc') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$links[$key]['url_id'].'">';
+                    print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowPayment'),'payment').' ';
                     print $langs->trans("SocialContributionPayment");
                     print '</a>';
                 }
                 else if ($links[$key]['type']=='payment_vat') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/tva/fiche.php?id='.$links[$key]['url_id'].'">';
+                    print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowVAT'),'payment').' ';
                     print $langs->trans("VATPayment");
                     print '</a>';
                 }
                 else if ($links[$key]['type']=='payment_salary') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/salaries/fiche.php?id='.$links[$key]['url_id'].'">';
+                    print '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowPaymentSalary'),'payment').' ';
                     print $langs->trans("SalaryPayment");
                     print '</a>';
                 }
                 else if ($links[$key]['type']=='member') {
-                    print '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$links[$key]['url_id'].'">';
+                    print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
                     print img_object($langs->trans('ShowMember'),'user').' ';
                     print $links[$key]['label'];
                     print '</a>';
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index f8d3ccd0bc7..70e2be1cfd4 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -69,7 +69,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
 					$result=$bankline->update_conciliation($user,$_POST["cat"]);
 					if ($result < 0)
 					{
-						$mesg.=$bankline->error;
+						setEventMessage($bankline->error, 'errors');
 						$error++;
 						break;
 					}
@@ -81,7 +81,7 @@ if ($action == 'rappro' && $user->rights->banque->consolidate)
     {
     	$error++;
     	$langs->load("errors");
-        $mesg='<div class="error">'.$langs->trans("ErrorPleaseTypeBankTransactionReportName").'</div>';
+	    setEventMessage($langs->trans("ErrorPleaseTypeBankTransactionReportName"), 'errors');
     }
 
     if (! $error)
@@ -183,8 +183,6 @@ if ($resql)
     print_fiche_titre($langs->trans("Reconciliation").': <a href="account.php?account='.$acct->id.'">'.$acct->label.'</a>');
     print '<br>';
 
-    dol_htmloutput_mesg($mesg);
-
     // Show last bank receipts
     $nbmax=5;
     $liste="";
@@ -265,11 +263,13 @@ if ($resql)
 		{
 			print '<td align="center" class="nowrap">';
 			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv),"day")."</span>";
-			print ' <span>&nbsp; ';
+			print ' &nbsp';
+			print '<span>';
 			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$acct->id.'&amp;rowid='.$objp->rowid.'">';
 			print img_edit_remove() . "</a> ";
 			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$acct->id.'&amp;rowid='.$objp->rowid.'">';
-			print img_edit_add() ."</a></span>";
+			print img_edit_add() ."</a>";
+			print '</span>';
 			print '</td>';
 		}
 		else
@@ -327,7 +327,7 @@ if ($resql)
 			else if ($links[$key]['type']=='payment_sc')
 			{
 			    // We don't show anything because there is 1 payment for 1 social contribution and we already show link to social contribution
-				/*print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$links[$key]['url_id'].'">';
+				/*print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 				print img_object($langs->trans('ShowPayment'),'payment').' ';
 				print $langs->trans("SocialContributionPayment");
 				print '</a>';*/
@@ -347,7 +347,7 @@ if ($resql)
 				print '</a>';
 			}
 			else if ($links[$key]['type']=='member') {
-				print '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$links[$key]['url_id'].'">';
+				print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
 				print img_object($langs->trans('ShowMember'),'user').' ';
 				print $links[$key]['label'];
 				print '</a>';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 0d0246f28e6..e4afe6f2b25 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -189,7 +189,7 @@ else
 		$sql.= " AND b.fk_account = ".$acct->id;
 		$sql.= " ORDER BY b.num_releve DESC";
 
-		dol_syslog("htdocs/compta/bank/releve.php sql=".$sql);
+		dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -211,7 +211,7 @@ else
 		$sql.= " AND b.fk_account = ".$acct->id;
 		$sql.= " ORDER BY b.num_releve ASC";
 
-		dol_syslog("htdocs/compta/bank/releve.php sql=".$sql);
+		dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -277,7 +277,6 @@ else
 	$sql.= " AND b.fk_account = ba.rowid";
 	$sql.= $db->order("b.datev, b.datec", "ASC");  // We add date of creation to have correct order when everything is done the same day
 
-	dol_syslog("sql=".$sql);
 	$result = $db->query($sql);
 	if ($result)
 	{
@@ -350,7 +349,7 @@ else
 				}
 				elseif ($links[$key]['type']=='payment_sc')
 				{
-					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$links[$key]['url_id'].'">';
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
 					print $langs->trans("SocialContributionPayment");
 					print '</a>';
@@ -399,7 +398,7 @@ else
 					$newline=0;
 				}
 				elseif ($links[$key]['type']=='member') {
-					print '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$links[$key]['url_id'].'">';
+					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowMember'),'user').' ';
 					print $links[$key]['label'];
 					print '</a>';
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 71405a54feb..eba7ea9d67b 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2010  Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Vinícius Nogueira    <viniciusvgn@gmail.com>
  * Copyright (C) 2014       Florian Henry    	 <florian.henry@open-cooncept.pro>
- * 
+ *
  * 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
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 $langs->load("banks");
 $langs->load("categories");
 $langs->load("companies");
+$langs->load("margins");
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
@@ -72,6 +73,15 @@ $limit = $conf->liste_limit;
 if (! $sortorder) $sortorder='DESC';
 if (! $sortfield) $sortfield='b.dateo';
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$description="";
+	$type="";
+	$debit="";
+	$credit="";
+	$account="";
+	$bid="";
+}
 
 /*
  * View
@@ -145,7 +155,7 @@ $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1,$offset);
 //print $sql;
 
-dol_syslog('compta/bank/search.php:: sql='.$sql);
+dol_syslog('compta/bank/search.php::', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -158,27 +168,28 @@ if ($resql)
 	if (GETPOST("bid"))
 	{
 		$result=$bankcateg->fetch(GETPOST("bid"));
-		print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->nom:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
+		print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	else
 	{
 		print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 
-	print '<form method="post" action="search.php" name="search_form">';
-	
+	print '<form method="post" action="search.php" name="search_form">'."\n";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\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);
 	$moreforfilter .= $langs->trans('EndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1);
-	
-	
+
+
 	if ($moreforfilter) {
 		print '<div class="liste_titre">';
 		print $moreforfilter;
-		print '</div>';
+		print '</div>'."\n";
 	}
-	
-	print '<table class="liste" width="100%">';
+
+	print '<table class="liste" width="100%">'."\n";
 	print '<tr class="liste_titre">';
 	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);
@@ -192,13 +203,12 @@ if ($resql)
 	print '<td class="liste_titre" align="left"> &nbsp; '.$langs->trans("Account").'</td>';
 	print "</tr>\n";
 
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre" align="center">';
-    $form->select_types_paiements(empty($_REQUEST["type"])?'':$_REQUEST["type"], 'type', '', 2, 0, 1, 8);
+    $form->select_types_paiements(empty($type)?'':$type, 'type', '', 2, 0, 1, 8);
     print '</td>';
     print '<td class="liste_titre"><input type="text" class="flat" name="req_nb" value="'.GETPOST("req_nb").'" size="2"></td>';
     print '<td class="liste_titre">';
@@ -214,9 +224,9 @@ if ($resql)
 	print '<td class="liste_titre" align="right">';
 	print '<input type="hidden" name="action" value="search">';
 	if (! empty($_REQUEST['bid'])) print '<input type="hidden" name="bid" value="'.$_REQUEST["bid"].'">';
-	print '<input type="image" class="liste_titre" name="submit" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td>';
-	print '</tr>';
+	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print "</td></tr>\n";
 
 	// Loop on each record
 	$total_debit=0;
@@ -278,7 +288,7 @@ if ($resql)
 			if ($objp->url_id)
 			{
 				$companystatic->id=$objp->url_id;
-				$companystatic->nom=$objp->labelurl;
+				$companystatic->name=$objp->labelurl;
 				print $companystatic->getNomUrl(1);
 			}
 			else
@@ -320,7 +330,7 @@ if ($resql)
 	}
 
 	print "</table>";
-
+    print '</form>';
 	$db->free($resql);
 }
 else
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index b9274c34eb5..1cb00e3ba51 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -49,10 +49,6 @@ $result=restrictedArea($user,'banque',$id,'bank_account&bank_account','','',$fie
 $vline=isset($_GET["vline"])?$_GET["vline"]:$_POST["vline"];
 $page=isset($_GET["page"])?$_GET["page"]:0;
 
-$mesg='';
-
-
-
 /*
  * View
  */
@@ -115,10 +111,6 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	print '<br>';
 
-
-	if ($mesg) print '<div class="error">'.$mesg.'</div>';
-
-
 	$solde = $acct->solde(0);
 
 	/*
@@ -156,21 +148,23 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	// Customer invoices
 	$sql = "SELECT 'invoice' as family, f.rowid as objid, f.facnumber as ref, f.total_ttc, f.type, f.date_lim_reglement as dlr,";
-	$sql.= " s.rowid as socid, s.nom, s.fournisseur";
+	$sql.= " s.rowid as socid, s.nom as name, s.fournisseur";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
 	$sql.= " WHERE f.entity = ".$conf->entity;
 	$sql.= " AND f.paye = 0 AND f.fk_statut = 1";	// Not paid
-	$sql.= " ORDER BY dlr ASC";
+    $sql.= " AND (f.fk_account IN (0, ".$acct->id.") OR f.fk_account IS NULL)"; // Id bank account of invoice
+    $sql.= " ORDER BY dlr ASC";
 
 	// Supplier invoices
 	$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, s.fournisseur";
+	$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";
 	$sql2.= " WHERE ff.entity = ".$conf->entity;
 	$sql2.= " AND ff.paye = 0 AND fk_statut = 1";	// Not paid
-	$sql2.= " ORDER BY dlr ASC";
+    $sql2.= " AND (ff.fk_account IN (0, ".$acct->id.") OR ff.fk_account IS NULL)"; // Id bank account of supplier invoice
+    $sql2.= " ORDER BY dlr ASC";
 
 	// Social contributions
 	$sql3= " SELECT 'social_contribution' as family, cs.rowid as objid, cs.libelle as ref, (-1*cs.amount) as total_ttc, ccs.libelle as type, cs.date_ech as dlr";
@@ -272,7 +266,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					$ref = $facturefournstatic->getNomUrl(1,'');
 
 					$societestatic->id = $obj->socid;
-					$societestatic->nom = $obj->nom;
+					$societestatic->name = $obj->name;
 					$refcomp=$societestatic->getNomUrl(1,'',24);
 
 					$paiement = -1*$facturefournstatic->getSommePaiement();	// Payment already done
@@ -286,7 +280,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 				$ref = $facturestatic->getNomUrl(1,'');
 
 				$societestatic->id = $obj->socid;
-				$societestatic->nom = $obj->nom;
+				$societestatic->name = $obj->name;
 				$refcomp=$societestatic->getNomUrl(1,'',24);
 
 				$paiement = $facturestatic->getSommePaiement();	// Payment already done
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index d7b082fc65e..601db34c964 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -45,7 +45,6 @@ if ($action == 'add')
 {
 	$langs->load("errors");
 
-	$mesg='';
 	$dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
 	$label = GETPOST('label','alpha');
 	$amount= GETPOST('amount','int');
@@ -53,22 +52,22 @@ if ($action == 'add')
 	if (! $label)
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Description"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Description")), 'errors');
 	}
 	if (! $amount)
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")), 'errors');
 	}
 	if (! GETPOST('account_from','int'))
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferFrom"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferFrom")), 'errors');
 	}
 	if (! GETPOST('account_to','int'))
 	{
 		$error=1;
-		$mesg.="<div class=\"error\">".$langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferTo"))."</div>";
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("TransferTo")), 'errors');
 	}
 	if (! $error)
 	{
@@ -111,20 +110,19 @@ if ($action == 'add')
 
 			if (! $error)
 			{
-				$mesg.="<div class=\"ok\">";
-				$mesg.=$langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency));
-				$mesg.="</div>";
+				$mesgs = $langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency));
+				setEventMessage($mesgs);
 				$db->commit();
 			}
 			else
 			{
-				$mesg.="<div class=\"error\">".$accountfrom->error.' '.$accountto->error."</div>";
+				setEventMessage($accountfrom->error.' '.$accountto->error, 'errors');
 				$db->rollback();
 			}
 		}
 		else
 		{
-			$mesg.="<div class=\"error\">".$langs->trans("ErrorFromToAccountsMustDiffers")."</div>";
+			setEventMessage($langs->trans("ErrorFromToAccountsMustDiffers"), 'errors');
 		}
 	}
 }
@@ -154,8 +152,6 @@ if($error)
 
 print_fiche_titre($langs->trans("BankTransfer"));
 
-dol_htmloutput_mesg($mesg);
-
 print $langs->trans("TransferDesc");
 print "<br><br>";
 
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index a3803e853ba..ca03e11bcba 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
  *
  * 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
@@ -101,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)
@@ -203,11 +204,11 @@ 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;
 
-	dol_syslog("compta/charges/index.php: select payment sql=".$sql);
+	dol_syslog("compta/charges/index.php: select payment", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -294,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)
@@ -353,6 +354,108 @@ if ($conf->tax->enabled)
 		}
 	}
 }
+//localtax
+if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+{
+	$j=1;
+	$numlt=3;
+}
+elseif($mysoc->localtax1_assuj=="1")
+{
+	$j=1;
+	$numlt=2;
+}
+elseif($mysoc->localtax2_assuj=="1")
+{
+	$j=2;
+	$numlt=3;
+}
+else
+{
+	$j=0;
+	$numlt=0;
+}
+
+while($j<$numlt)
+{
+	if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
+	{
+		print "<br>";
+
+		$tva = new Tva($db);
+
+		print_fiche_titre($langs->transcountry(($j==1?"LT1Payments":"LT2Payments"),$mysoc->country_code).($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+
+
+		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
+		$sql.= " FROM ".MAIN_DB_PREFIX."localtax as pv";
+		$sql.= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j ;
+		if ($year > 0)
+		{
+			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+			// 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);
+
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$i = 0;
+			$total = 0 ;
+			print '<table class="noborder" width="100%">';
+			print '<tr class="liste_titre">';
+			print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"pv.datev","",$param,'width="120"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"pv.label","",$param,'',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("ExpectedToPay"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"pv.rowid","",$param,'',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"pv.datep","",$param,'align="center"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"pv.amount","",$param,'align="right"',$sortfield,$sortorder);
+			print "</tr>\n";
+			$var=1;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+
+				$total = $total + $obj->amount;
+
+				$var=!$var;
+				print "<tr ".$bc[$var].">";
+				print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').'</td>'."\n";
+
+				print "<td>".$obj->label."</td>\n";
+
+				print '<td align="right">'.price($obj->amount)."</td>";
+
+				// Ref payment
+				$tva_static->id=$obj->rowid;
+				$tva_static->ref=$obj->rowid;
+				print '<td align="left">'.$tva_static->getNomUrl(1)."</td>\n";
+
+				print '<td align="center">'.dol_print_date($db->jdate($obj->dp),'day')."</td>\n";
+				print '<td align="right">'.price($obj->amount)."</td>";
+				print "</tr>\n";
+
+				$i++;
+			}
+			print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
+			print '<td align="right">'.price($total)."</td>";
+			print '<td align="center">&nbsp;</td>';
+			print '<td align="center">&nbsp;</td>';
+			print '<td align="right">'.price($total)."</td>";
+			print "</tr>";
+
+			print "</table>";
+			$db->free($result);
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+	$j++;
+}
 
 
 llxFooter();
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index dbdc8c72368..14751d308c4 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -73,7 +73,7 @@ if ($action == 'note')
 if ($mode == 'search') {
 	if ($modesearch == 'soc') {
 		$sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
-		$sql.= " WHERE lower(s.nom) LIKE '%".$db->escape(strtolower($socname))."%'";
+		$sql.= " WHERE s.nom LIKE '%".$db->escape(strtolower($socname))."%'";
 		$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
 	}
 
@@ -93,7 +93,7 @@ if ($mode == 'search') {
  * Mode List
  */
 
-$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea";
+$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
@@ -107,13 +107,13 @@ if (dol_strlen($stcomm))
 }
 if ($socname)
 {
-	$sql.= " AND s.nom LIKE '%".$db->escape(strtolower($socname))."%'";
+	$sql.= " AND s.nom LIKE '%".$db->escape($socname)."%'";
 	$sortfield = "s.nom";
 	$sortorder = "ASC";
 }
 if ($_GET["search_nom"])
 {
-	$sql.= " AND s.nom LIKE '%".$db->escape(strtolower($_GET["search_nom"]))."%'";
+	$sql.= " AND s.nom LIKE '%".$db->escape($_GET["search_nom"])."%'";
 }
 if ($_GET["search_compta"])
 {
@@ -141,7 +141,7 @@ if ($resql)
 	$i = 0;
 
 	$langs->load('commercial');
-	
+
 	print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num);
 
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -177,7 +177,7 @@ if ($resql)
 	print '</td>';
 	print "</tr>\n";
 
-	$var=True;
+	$var=true;
 
 	while ($i < min($num,$conf->liste_limit))
 	{
@@ -188,7 +188,7 @@ if ($resql)
 		print "<tr ".$bc[$var].">";
 		print '<td>';
 		$thirdpartystatic->id=$obj->rowid;
-		$thirdpartystatic->nom=$obj->nom;
+		$thirdpartystatic->name=$obj->name;
 		$thirdpartystatic->client=$obj->client;
 		print $thirdpartystatic->getNomUrl(1,'compta');
 		print '</td>';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
new file mode 100644
index 00000000000..20433118bbf
--- /dev/null
+++ b/htdocs/compta/deplacement/card.php
@@ -0,0 +1,573 @@
+<?php
+/* Copyright (C) 2003		Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012		Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       	htdocs/compta/deplacement/card.php
+ *  \brief      	Page to show a trip card
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.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';
+}
+
+$langs->load("trips");
+
+
+// Security check
+$id = GETPOST('id','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'deplacement', $id,'');
+
+$action = GETPOST('action','alpha');
+$confirm = GETPOST('confirm','alpha');
+
+$object = new Deplacement($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('tripsandexpensescard','globalcard'));
+
+$permissionnote=$user->rights->deplacement->creer;	// Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+if ($action == 'validate' && $user->rights->deplacement->creer)
+{
+    $object->fetch($id);
+    if ($object->statut == 0)
+    {
+        $result = $object->setStatut(1);
+        if ($result > 0)
+        {
+            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+            exit;
+        }
+        else
+        {
+	        setEventMessage($object->error, 'errors');
+        }
+    }
+}
+
+else if ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
+{
+    $object->fetch($id);
+    if ($object->statut == 1)
+    {
+        $result = $object->setStatut(2);
+        if ($result > 0)
+        {
+            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+            exit;
+        }
+        else
+        {
+	        setEventMessage($object->error, 'errors');
+        }
+    }
+}
+
+else if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
+{
+    $result=$object->delete($id);
+    if ($result >= 0)
+    {
+        header("Location: index.php");
+        exit;
+    }
+    else
+    {
+	    setEventMessage($object->error, 'errors');
+    }
+}
+
+else if ($action == 'add' && $user->rights->deplacement->creer)
+{
+    if (! GETPOST('cancel','alpha'))
+    {
+        $error=0;
+
+        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
+        $object->km				= GETPOST('km','int');
+        $object->type			= GETPOST('type','alpha');
+        $object->socid			= GETPOST('socid','int');
+        $object->fk_user		= GETPOST('fk_user','int');
+        $object->note_private	= GETPOST('note_private','alpha');
+        $object->note_public	= GETPOST('note_public','alpha');
+        $object->statut     	= 0;
+
+        if (! $object->date)
+        {
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
+            $error++;
+        }
+        if ($object->type == '-1') 	// Otherwise it is TF_LUNCH,...
+        {
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")), 'errors');
+            $error++;
+        }
+        if (! ($object->fk_user > 0))
+        {
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")), 'errors');
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $id = $object->create($user);
+
+            if ($id > 0)
+            {
+                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+                exit;
+            }
+            else
+            {
+	            setEventMessage($object->error, 'errors');
+                $action='create';
+            }
+        }
+        else
+        {
+            $action='create';
+        }
+    }
+    else
+    {
+        header("Location: index.php");
+        exit;
+    }
+}
+
+// Update record
+else if ($action == 'update' && $user->rights->deplacement->creer)
+{
+    if (! GETPOST('cancel','alpha'))
+    {
+        $result = $object->fetch($id);
+
+        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
+        $object->km				= GETPOST('km','int');
+        $object->type			= GETPOST('type','alpha');
+        $object->socid			= GETPOST('socid','int');
+        $object->fk_user		= GETPOST('fk_user','int');
+        $object->note_private	= GETPOST('note_private','alpha');
+        $object->note_public	= GETPOST('note_public','alpha');
+
+        $result = $object->update($user);
+
+        if ($result > 0)
+        {
+            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+            exit;
+        }
+        else
+        {
+	        setEventMessage($object->error, 'errors');
+        }
+    }
+    else
+    {
+        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+        exit;
+    }
+}
+
+// Set into a project
+else if ($action == 'classin' && $user->rights->deplacement->creer)
+{
+    $object->fetch($id);
+    $result=$object->setProject(GETPOST('projectid','int'));
+    if ($result < 0) dol_print_error($db, $object->error);
+}
+
+// Set fields
+else if ($action == 'setdated' && $user->rights->deplacement->creer)
+{
+    $dated=dol_mktime(GETPOST('datedhour','int'), GETPOST('datedmin','int'), GETPOST('datedsec','int'), GETPOST('datedmonth','int'), GETPOST('datedday','int'), GETPOST('datedyear','int'));
+    $object->fetch($id);
+    $result=$object->setValueFrom('dated',$dated,'','','date');
+    if ($result < 0) dol_print_error($db, $object->error);
+}
+else if ($action == 'setkm' && $user->rights->deplacement->creer)
+{
+    $object->fetch($id);
+    $result=$object->setValueFrom('km',GETPOST('km','int'));
+    if ($result < 0) dol_print_error($db, $object->error);
+}
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+/*
+ * Action create
+*/
+if ($action == 'create')
+{
+    //WYSIWYG Editor
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
+    print_fiche_titre($langs->trans("NewTrip"));
+
+    $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
+
+    print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+
+    print '<table class="border" width="100%">';
+
+    print "<tr>";
+    print '<td width="25%" class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+    print $form->select_type_fees(GETPOST('type','int'),'type',1);
+    print '</td></tr>';
+
+    print "<tr>";
+    print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+    print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1);
+    print '</td></tr>';
+
+    print "<tr>";
+    print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+    print $form->select_date($datec?$datec:-1,'','','','','add',1,1);
+    print '</td></tr>';
+
+    // Km
+    print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="' . GETPOST("km") . '"></td></tr>';
+
+    // Company
+    print "<tr>";
+    print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+    print $form->select_company(GETPOST('socid','int'),'socid','',1);
+    print '</td></tr>';
+
+    // Public note
+    print '<tr>';
+    print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
+    print '<td valign="top" colspan="2">';
+
+    $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
+    print $doleditor->Create(1);
+
+    print '</td></tr>';
+
+    // Private note
+    if (empty($user->societe_id))
+    {
+        print '<tr>';
+        print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
+        print '<td valign="top" colspan="2">';
+
+        $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
+        print $doleditor->Create(1);
+
+        print '</td></tr>';
+    }
+
+    // Other attributes
+    $parameters=array('colspan' => ' colspan="2"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+    print '</table>';
+
+    print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; ';
+    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></center';
+
+    print '</form>';
+}
+else if ($id)
+{
+    $result = $object->fetch($id);
+    if ($result > 0)
+    {
+        $head = trip_prepare_head($object);
+
+        dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
+
+        if ($action == 'edit' && $user->rights->deplacement->creer)
+        {
+            //WYSIWYG Editor
+            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
+            $soc = new Societe($db);
+            if ($object->socid)
+            {
+                $soc->fetch($object->socid);
+            }
+
+            print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="id" value="'.$id.'">';
+
+            print '<table class="border" width="100%">';
+
+            // Ref
+            print "<tr>";
+            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
+            print $object->ref;
+            print '</td></tr>';
+
+            // Type
+            print "<tr>";
+            print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+            print $form->select_type_fees(GETPOST('type','int')?GETPOST('type','int'):$object->type,'type',0);
+            print '</td></tr>';
+
+            // Who
+            print "<tr>";
+            print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+            print $form->select_dolusers(GETPOST('fk_user','int')?GETPOST('fk_user','int'):$object->fk_user,'fk_user',0);
+            print '</td></tr>';
+
+            // Date
+            print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+            print $form->select_date($object->date,'','','','','update');
+            print '</td></tr>';
+
+            // Km
+            print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
+            print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
+            print '</td></tr>';
+
+            // Where
+            print "<tr>";
+            print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+            print $form->select_company($soc->id,'socid','',1);
+            print '</td></tr>';
+
+            // Public note
+            print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
+            print '<td valign="top" colspan="3">';
+
+            $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
+            print $doleditor->Create(1);
+
+            print "</td></tr>";
+
+            // Private note
+            if (empty($user->societe_id))
+            {
+                print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
+                print '<td valign="top" colspan="3">';
+
+                $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
+                print $doleditor->Create(1);
+
+                print "</td></tr>";
+            }
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="3"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+            print '</table>';
+
+            print '<br><center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
+            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+            print '</center>';
+
+            print '</form>';
+
+            print '</div>';
+        }
+        else
+        {
+            /*
+             * Confirmation de la suppression du deplacement
+            */
+            if ($action == 'delete')
+            {
+                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete");
+
+            }
+
+            $soc = new Societe($db);
+            if ($object->socid) $soc->fetch($object->socid);
+
+            print '<table class="border" width="100%">';
+
+            $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+            // Ref
+            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
+            print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+            print '</td></tr>';
+
+            // Type
+            print '<tr><td>';
+            print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
+            print '</td><td>';
+            print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
+            print '</td></tr>';
+
+            // Who
+            print '<tr><td>'.$langs->trans("Person").'</td><td>';
+            $userfee=new User($db);
+            $userfee->fetch($object->fk_user);
+            print $userfee->getNomUrl(1);
+            print '</td></tr>';
+
+            // Date
+            print '<tr><td>';
+            print $form->editfieldkey("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
+            print '</td><td>';
+            print $form->editfieldval("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
+            print '</td></tr>';
+
+            // Km/Price
+            print '<tr><td valign="top">';
+            print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
+            print '</td><td>';
+            print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
+            print "</td></tr>";
+
+            // Where
+            print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
+            print '<td>';
+            if ($soc->id) print $soc->getNomUrl(1);
+            print '</td></tr>';
+
+            // Project
+            if (! empty($conf->projet->enabled))
+            {
+                $langs->load('projects');
+                print '<tr>';
+                print '<td>';
+
+                print '<table class="nobordernopadding" width="100%"><tr><td>';
+                print $langs->trans('Project');
+                print '</td>';
+                if ($action != 'classify' && $user->rights->deplacement->creer)
+                {
+                    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+                    print img_edit($langs->trans('SetProject'),1);
+                    print '</a></td>';
+                }
+                print '</tr></table>';
+                print '</td><td colspan="3">';
+                if ($action == 'classify')
+                {
+                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid');
+                }
+                else
+                {
+                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none');
+                }
+                print '</td>';
+                print '</tr>';
+            }
+
+            // Statut
+            print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="3"', 'showblocbydefault' => 1);
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+            print "</table><br>";
+
+            // Notes
+            $blocname = 'notes';
+            $title = $langs->trans('Notes');
+            include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+
+            print '</div>';
+
+            /*
+             * Barre d'actions
+             */
+
+            print '<div class="tabsAction">';
+
+            if ($object->statut < 2) 	// if not refunded
+            {
+	            if ($user->rights->deplacement->creer)
+	            {
+	                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+	            }
+	            else
+	            {
+	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
+	            }
+            }
+
+            if ($object->statut == 0) 	// if draft
+            {
+                if ($user->rights->deplacement->creer)
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
+                }
+                else
+                {
+                    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
+                }
+            }
+
+            if ($object->statut == 1) 	// if validated
+            {
+                if ($user->rights->deplacement->creer)
+                {
+                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
+                }
+                else
+                {
+                    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
+                }
+            }
+
+            if ($user->rights->deplacement->supprimer)
+            {
+                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
+            }
+            else
+            {
+                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
+            }
+
+            print '</div>';
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index f47046e2bdd..4eab354577a 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -64,8 +64,8 @@ class Deplacement extends CommonObject
 	{
 		$this->db = $db;
 
-        $this->statuts_short = array(0 => 'Draft', 1 => 'Validated', 2 => 'Closed');
-        $this->statuts = array(0 => 'Draft', 1 => 'Validated', 2 => 'Closed');
+        $this->statuts_short = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
+        $this->statuts = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
 
 		return 1;
 	}
@@ -120,20 +120,20 @@ class Deplacement extends CommonObject
 		$sql.= ", ".($this->fk_soc > 0? $this->fk_soc : "null");
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."deplacement");
 
-                        // Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('DEPLACEMENT_CREATE',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('DEPLACEMENT_CREATE',$user);
+            if ($result < 0)
+            {
+            	$this->db->rollback();
+            	return -2;
+            }
+            // End call triggers
 
 			$result=$this->update($user);
 			if ($result > 0)
@@ -203,7 +203,7 @@ class Deplacement extends CommonObject
 		$sql .= " , fk_projet = ".($this->fk_project>0?$this->fk_project:0);
 		$sql .= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -222,15 +222,18 @@ class Deplacement extends CommonObject
 	* Load an object from database
 	*
 	* @param	int		$id		Id of record to load
+	* @param	string	$ref	Ref of record
 	* @return	int				<0 if KO, >0 if OK
 	*/
-	function fetch($id)
+	function fetch($id, $ref='')
 	{
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
-		$sql.= " WHERE rowid = ".$id;
+		$sql.= " WHERE entity IN (".getEntity('deplacement').")";
+		if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
+		else $sql.= " AND rowid = ".$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ( $result )
 		{
@@ -271,7 +274,7 @@ class Deplacement extends CommonObject
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."deplacement WHERE rowid = ".$id;
 
-		dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -321,21 +324,25 @@ class Deplacement extends CommonObject
 		{
 			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]);
 		}
 		if ($mode == 3)
 		{
 			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
 			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			if ($statut==2 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 		}
 		if ($mode == 4)
 		{
 			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
 			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==2 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 5)
 		{
 			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut0');
 			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			if ($statut==2 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
 		}
 	}
 
@@ -351,7 +358,7 @@ class Deplacement extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$picto='trip';
@@ -377,11 +384,11 @@ class Deplacement extends CommonObject
 
 	   $ret=array();
 
-        $sql = "SELECT id, code, libelle as label";
+        $sql = "SELECT id, code, label";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees";
         $sql.= " WHERE active = ".$active;
 
-        dol_syslog(get_class($this)."::listOfTypes sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ( $result )
         {
@@ -415,7 +422,7 @@ class Deplacement extends CommonObject
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'deplacement as c';
 		$sql.= ' WHERE c.rowid = '.$id;
 
-		dol_syslog(get_class($this).'::info sql='.$sql);
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
 		if ($result)
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index 196ae560cbe..cf5f7fda45a 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -45,7 +45,7 @@ class DeplacementStats extends Stats
 	 *
 	 * @param 	DoliDB		$db		   Database handler
 	 * @param 	int			$socid	   Id third party
-     * @param   int			$userid    Id user for filter
+     * @param   mixed		$userid    Id user for filter or array of user ids
 	 * @return 	void
 	 */
 	function __construct($db, $socid=0, $userid=0)
@@ -66,7 +66,8 @@ class DeplacementStats extends Stats
 		{
 			$this->where.=" AND fk_soc = ".$this->socid;
 		}
-        if ($this->userid > 0) $this->where.=' AND fk_user = '.$this->userid;
+		if (is_array($this->userid) && count($this->userid) > 0) $this->where.=' AND fk_user IN ('.join(',',$this->userid).')';
+        else if ($this->userid > 0) $this->where.=' AND fk_user = '.$this->userid;
 	}
 
 
@@ -77,7 +78,7 @@ class DeplacementStats extends Stats
 	 */
 	function getNbByYear()
 	{
-		$sql = "SELECT YEAR(datef) as dm, count(*)";
+		$sql = "SELECT YEAR(dated) as dm, count(*)";
 		$sql.= " FROM ".$this->from;
 		$sql.= " GROUP BY dm DESC";
 		$sql.= " WHERE ".$this->where;
diff --git a/htdocs/compta/deplacement/class/index.html b/htdocs/compta/deplacement/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 163242ed08a..b6b1cbfa277 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -88,7 +88,7 @@ if ($object->id)
 {
 	$object->fetch_thirdparty();
 
-	$head=trip_prepare_head($object, $user);
+	$head=trip_prepare_head($object);
 
 	dol_fiche_head($head, 'documents',  $langs->trans("TripCard"), 0, 'trip');
 
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
deleted file mode 100644
index e0183094d23..00000000000
--- a/htdocs/compta/deplacement/fiche.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-/* Copyright (C) 2003		Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012		Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       	htdocs/compta/deplacement/fiche.php
- *  \brief      	Page to show a trip card
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.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';
-}
-
-$langs->load("trips");
-
-
-// Security check
-$id = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'deplacement', $id,'');
-
-$action = GETPOST('action','alpha');
-$confirm = GETPOST('confirm','alpha');
-
-$mesg = '';
-
-$object = new Deplacement($db);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('tripsandexpensescard'));
-
-$permissionnote=$user->rights->deplacement->creer;	// Used by the include of actions_setnotes.inc.php
-
-
-/*
- * Actions
- */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-
-if ($action == 'validate' && $user->rights->deplacement->creer)
-{
-    $object->fetch($id);
-    if ($object->statut == 0)
-    {
-        $result = $object->setStatut(1);
-        if ($result > 0)
-        {
-            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-            exit;
-        }
-        else
-        {
-            $mesg=$object->error;
-        }
-    }
-}
-
-else if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
-{
-    $result=$object->delete($id);
-    if ($result >= 0)
-    {
-        header("Location: index.php");
-        exit;
-    }
-    else
-    {
-        $mesg=$object->error;
-    }
-}
-
-else if ($action == 'add' && $user->rights->deplacement->creer)
-{
-    if (! GETPOST('cancel','alpha'))
-    {
-        $error=0;
-
-        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
-        $object->km				= GETPOST('km','int');
-        $object->type			= GETPOST('type','alpha');
-        $object->socid			= GETPOST('socid','int');
-        $object->fk_user		= GETPOST('fk_user','int');
-        $object->note_private	= GETPOST('note_private','alpha');
-        $object->note_public	= GETPOST('note_public','alpha');
-        $object->statut     	= 0;
-
-        if (! $object->date)
-        {
-            $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date"));
-            $error++;
-        }
-        if ($object->type == '-1') 	// Otherwise it is TF_LUNCH,...
-        {
-            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
-            $error++;
-        }
-        if (! ($object->fk_user > 0))
-        {
-            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Person")).'</div>';
-            $error++;
-        }
-
-        if (! $error)
-        {
-            $id = $object->create($user);
-
-            if ($id > 0)
-            {
-                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-                exit;
-            }
-            else
-            {
-                $mesg=$object->error;
-                $action='create';
-            }
-        }
-        else
-        {
-            $action='create';
-        }
-    }
-    else
-    {
-        header("Location: index.php");
-        exit;
-    }
-}
-
-// Update record
-else if ($action == 'update' && $user->rights->deplacement->creer)
-{
-    if (! GETPOST('cancel','alpha'))
-    {
-        $result = $object->fetch($id);
-
-        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
-        $object->km				= GETPOST('km','int');
-        $object->type			= GETPOST('type','alpha');
-        $object->socid			= GETPOST('socid','int');
-        $object->fk_user		= GETPOST('fk_user','int');
-        $object->note_private	= GETPOST('note_private','alpha');
-        $object->note_public	= GETPOST('note_public','alpha');
-
-        $result = $object->update($user);
-
-        if ($result > 0)
-        {
-            header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-            exit;
-        }
-        else
-        {
-            $mesg=$object->error;
-        }
-    }
-    else
-    {
-        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
-        exit;
-    }
-}
-
-// Set into a project
-else if ($action == 'classin' && $user->rights->deplacement->creer)
-{
-    $object->fetch($id);
-    $result=$object->setProject(GETPOST('projectid','int'));
-    if ($result < 0) dol_print_error($db, $object->error);
-}
-
-// Set fields
-else if ($action == 'setdated' && $user->rights->deplacement->creer)
-{
-    $dated=dol_mktime(GETPOST('datedhour','int'), GETPOST('datedmin','int'), GETPOST('datedsec','int'), GETPOST('datedmonth','int'), GETPOST('datedday','int'), GETPOST('datedyear','int'));
-    $object->fetch($id);
-    $result=$object->setValueFrom('dated',$dated,'','','date');
-    if ($result < 0) dol_print_error($db, $object->error);
-}
-else if ($action == 'setkm' && $user->rights->deplacement->creer)
-{
-    $object->fetch($id);
-    $result=$object->setValueFrom('km',GETPOST('km','int'));
-    if ($result < 0) dol_print_error($db, $object->error);
-}
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$form = new Form($db);
-
-/*
- * Action create
-*/
-if ($action == 'create')
-{
-    //WYSIWYG Editor
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-
-    print_fiche_titre($langs->trans("NewTrip"));
-
-    dol_htmloutput_errors($mesg);
-
-    $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int'));
-
-    print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-
-    print '<table class="border" width="100%">';
-
-    print "<tr>";
-    print '<td width="25%" class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-    print $form->select_type_fees(GETPOST('type','int'),'type',1);
-    print '</td></tr>';
-
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-    print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1);
-    print '</td></tr>';
-
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-    print $form->select_date($datec?$datec:-1,'','','','','add',1,1);
-    print '</td></tr>';
-
-    // Km
-    print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="' . GETPOST("km") . '"></td></tr>';
-
-    // Company
-    print "<tr>";
-    print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-    print $form->select_company(GETPOST('socid','int'),'socid','',1);
-    print '</td></tr>';
-
-    // Public note
-    print '<tr>';
-    print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-    print '<td valign="top" colspan="2">';
-
-    $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
-    print $doleditor->Create(1);
-
-    print '</td></tr>';
-
-    // Private note
-    if (empty($user->societe_id))
-    {
-        print '<tr>';
-        print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-        print '<td valign="top" colspan="2">';
-
-        $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100);
-        print $doleditor->Create(1);
-
-        print '</td></tr>';
-    }
-
-    // Other attributes
-    $parameters=array('colspan' => ' colspan="2"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-    print '</table>';
-
-    print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; ';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></center';
-
-    print '</form>';
-}
-else if ($id)
-{
-    $result = $object->fetch($id);
-    if ($result > 0)
-    {
-        dol_htmloutput_mesg($mesg);
-
-        $head = trip_prepare_head($object);
-
-        dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
-
-        if ($action == 'edit' && $user->rights->deplacement->creer)
-        {
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-
-            $soc = new Societe($db);
-            if ($object->socid)
-            {
-                $soc->fetch($object->socid);
-            }
-
-            print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
-
-            print '<table class="border" width="100%">';
-
-            // Ref
-            print "<tr>";
-            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
-            print $object->ref;
-            print '</td></tr>';
-
-            // Type
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-            print $form->select_type_fees(GETPOST('type','int')?GETPOST('type','int'):$object->type,'type',0);
-            print '</td></tr>';
-
-            // Who
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-            print $form->select_dolusers(GETPOST('fk_user','int')?GETPOST('fk_user','int'):$object->fk_user,'fk_user',0);
-            print '</td></tr>';
-
-            // Date
-            print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-            print $form->select_date($object->date,'','','','','update');
-            print '</td></tr>';
-
-            // Km
-            print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
-            print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
-            print '</td></tr>';
-
-            // Where
-            print "<tr>";
-            print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-            print $form->select_company($soc->id,'socid','',1);
-            print '</td></tr>';
-
-            // Public note
-            print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
-            print '<td valign="top" colspan="3">';
-
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
-            print $doleditor->Create(1);
-
-            print "</td></tr>";
-
-            // Private note
-            if (empty($user->societe_id))
-            {
-                print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
-                print '<td valign="top" colspan="3">';
-
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '100');
-                print $doleditor->Create(1);
-
-                print "</td></tr>";
-            }
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-            print '</table>';
-
-            print '<br><center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
-            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            print '</center>';
-
-            print '</form>';
-
-            print '</div>';
-        }
-        else
-        {
-            /*
-             * Confirmation de la suppression du deplacement
-            */
-            if ($action == 'delete')
-            {
-                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteTrip"),$langs->trans("ConfirmDeleteTrip"),"confirm_delete");
-
-            }
-
-            $soc = new Societe($db);
-            if ($object->socid) $soc->fetch($object->socid);
-
-            print '<table class="border" width="100%">';
-
-            $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-            // Ref
-            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
-            print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-            print '</td></tr>';
-
-            // Type
-            print '<tr><td>';
-            print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
-            print '</td><td>';
-            print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees');
-            print '</td></tr>';
-
-            // Who
-            print '<tr><td>'.$langs->trans("Person").'</td><td>';
-            $userfee=new User($db);
-            $userfee->fetch($object->fk_user);
-            print $userfee->getNomUrl(1);
-            print '</td></tr>';
-
-            // Date
-            print '<tr><td>';
-            print $form->editfieldkey("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
-            print '</td><td>';
-            print $form->editfieldval("Date",'dated',$object->date,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'datepicker');
-            print '</td></tr>';
-
-            // Km/Price
-            print '<tr><td valign="top">';
-            print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
-            print '</td><td>';
-            print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6');
-            print "</td></tr>";
-
-            // Where
-            print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
-            print '<td>';
-            if ($soc->id) print $soc->getNomUrl(1);
-            print '</td></tr>';
-
-            // Project
-            if (! empty($conf->projet->enabled))
-            {
-                $langs->load('projects');
-                print '<tr>';
-                print '<td>';
-
-                print '<table class="nobordernopadding" width="100%"><tr><td>';
-                print $langs->trans('Project');
-                print '</td>';
-                if ($action != 'classify' && $user->rights->deplacement->creer)
-                {
-                    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
-                    print img_edit($langs->trans('SetProject'),1);
-                    print '</a></td>';
-                }
-                print '</tr></table>';
-                print '</td><td colspan="3">';
-                if ($action == 'classify')
-                {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid');
-                }
-                else
-                {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none');
-                }
-                print '</td>';
-                print '</tr>';
-            }
-
-            // Statut
-            print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"', 'showblocbydefault' => 1);
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-            print "</table><br>";
-
-            // Notes
-            $blocname = 'notes';
-            $title = $langs->trans('Notes');
-            include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-
-            print '</div>';
-
-            /*
-             * Barre d'actions
-            */
-
-            print '<div class="tabsAction">';
-
-            if ($object->statut == 0) 	// if blocked...
-            {
-                if ($user->rights->deplacement->creer)
-                {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
-                }
-                else
-                {
-                    print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
-                }
-            }
-
-            if ($user->rights->deplacement->creer)
-            {
-                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
-            }
-            if ($user->rights->deplacement->supprimer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
-            }
-
-            print '</div>';
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index bded8c261e2..37a0f944bb3 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -54,6 +54,9 @@ $limit = $conf->liste_limit;
 
 $tripandexpense_static=new Deplacement($db);
 
+$childids = $user->getAllChildIds();
+$childids[]=$user->id;
+
 //$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones';
 $help_url='';
 llxHeader('',$langs->trans("ListOfFees"),$help_url);
@@ -64,6 +67,7 @@ $totalnb=0;
 $sql = "SELECT count(d.rowid) as nb, sum(d.km) as km, d.type";
 $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d";
 $sql.= " WHERE d.entity = ".$conf->entity;
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
 $sql.= " GROUP BY d.type";
 $sql.= " ORDER BY d.type";
 
@@ -134,6 +138,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE u.rowid = d.fk_user";
 $sql.= " AND d.entity = ".$conf->entity;
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND d.fk_soc = ".$socid;
 $sql.= $db->order("d.tms","DESC");
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 89df2428ca9..e34e7c2b3a6 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -27,6 +27,8 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $langs->load("companies");
 $langs->load("users");
@@ -37,6 +39,10 @@ $socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'deplacement','','');
 
+$search_ref=GETPOST('search_ref','int');
+$search_name=GETPOST('search_name','alpha');
+$search_company=GETPOST('search_company','alpha');
+// $search_amount=GETPOST('search_amount','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -48,16 +54,30 @@ if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="d.dated";
 $limit = $conf->liste_limit;
 
-$search_ref=GETPOST('search_ref','alpha');
+$year=GETPOST("year");
+$month=GETPOST("month");
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_name="";
+	$search_company="";
+	// $search_amount="";
+	$year="";
+	$month="";
+}
 
 /*
  * View
  */
 
+$formother = new FormOther($db);
 $tripandexpense_static=new Deplacement($db);
 $userstatic = new User($db);
 
+$childids = $user->getAllChildIds();
+$childids[]=$user->id;
+
 llxHeader();
 
 $sql = "SELECT s.nom, s.rowid as socid,";				// Ou
@@ -70,12 +90,34 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 $sql.= " WHERE d.fk_user = u.rowid";
 $sql.= " AND d.entity = ".$conf->entity;
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
-if (trim($search_ref) != '')
+
+if ($search_ref)		$sql.=" AND d.rowid=".$search_ref;
+if ($search_name)
 {
-    $sql.= ' AND d.rowid LIKE \'%'.$db->escape(trim($search_ref)) . '%\'';
+    $sql .= natural_search('u.lastname', $search_name);
 }
+if ($search_company)
+{
+    $sql .= natural_search('s.nom', $search_company);
+}
+// if ($search_amount)		$sql.=" AND d.km='".$db->escape(price2num(trim($search_amount)))."'";
+if ($month > 0)
+{
+    if ($year > 0 && empty($day))
+    $sql.= " AND d.dated BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+    else if ($year > 0 && ! empty($day))
+    $sql.= " AND d.dated BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    else
+    $sql.= " AND date_format(d.dated, '%m') = '".$month."'";
+}
+else if ($year > 0)
+{
+	$sql.= " AND d.dated BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+}
+
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
 
@@ -93,7 +135,7 @@ if ($resql)
     print "<tr class=\"liste_titre\">";
     print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","","&socid=$socid",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"d.type","","&socid=$socid",'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'align="center"',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.lastname","","&socid=$socid",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socid=$socid",'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("FeesKilometersOrAmout"),$_SERVER["PHP_SELF"],"d.km","","&socid=$socid",'align="right"',$sortfield,$sortorder);
@@ -103,24 +145,27 @@ if ($resql)
     // Filters lines
     print '<tr class="liste_titre">';
     print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
+    print '<input class="flat" size="4" type="text" name="search_ref" value="'.$search_ref.'">';
     print '</td>';
     print '<td class="liste_titre">';
-    //print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
+    print '&nbsp;';
+    print '</td>';
+    print '<td class="liste_titre" align="center">';
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+    $formother->select_year($year?$year:-1,'year',1, 20, 5);
     print '</td>';
     print '<td class="liste_titre">';
-    //print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
+    print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
     print '</td>';
-    print '<td class="liste_titre" align="left">';
-    print '&nbsp;';
+    print '<td class="liste_titre">';
+    print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    print '&nbsp;';
-    print '</td>';
-    print '<td class="liste_titre" align="right">';
-    print '&nbsp;';
+    // print '<input class="flat" size="10" type="text" name="search_amount" value="'.$search_amount.'">';
     print '</td>';
     print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print "</td></tr>\n";
 
     $var=true;
@@ -134,13 +179,13 @@ if ($resql)
         $var=!$var;
         print '<tr '.$bc[$var].'>';
         // Id
-        print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.'</a></td>';
+        print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowTrip"),"trip").' '.$obj->rowid.'</a></td>';
         // Type
         print '<td>'.$langs->trans($obj->type).'</td>';
         // Date
-        print '<td>'.dol_print_date($db->jdate($obj->dd),'day').'</td>';
+        print '<td align="center">'.dol_print_date($db->jdate($obj->dd),'day').'</td>';
         // User
-        print '<td align="left">';
+        print '<td>';
         $userstatic->id = $obj->rowid;
         $userstatic->lastname = $obj->lastname;
         $userstatic->firstname = $obj->firstname;
@@ -167,6 +212,7 @@ else
 {
     dol_print_error($db);
 }
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 476b0b12790..0d0a32a877c 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -45,6 +45,18 @@ if ($user->societe_id > 0)
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'deplacement', $id,'');
 
+// Other security check
+$childids = $user->getAllChildIds();
+$childids[]=$user->id;
+if ($userid > 0)
+{
+	if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous) && ! in_array($userid, $childids))
+	{
+		accessforbidden();
+		exit;
+	}
+}
+
 $nowyear=strftime("%Y", dol_now());
 $year = GETPOST('year')>0?GETPOST('year'):$nowyear;
 //$startyear=$year-2;
@@ -60,6 +72,7 @@ $mode=GETPOST("mode")?GETPOST("mode"):'customer';
 
 $form=new Form($db);
 
+
 llxHeader();
 
 $title=$langs->trans("TripsAndExpensesStatistics");
@@ -69,7 +82,14 @@ print_fiche_titre($title, $mesg);
 
 dol_mkdir($dir);
 
-$stats = new DeplacementStats($db, $socid, $userid);
+$useridtofilter=$userid;	// Filter from parameters
+if (empty($useridtofilter))
+{
+	$useridtofilter=$childids;
+	if (! empty($user->rights->deplacement->readall) || ! empty($user->rights->deplacement->lire_tous)) $useridtofilter=0;
+}
+
+$stats = new DeplacementStats($db, $socid, $useridtofilter);
 
 
 // Build graphic number of object
@@ -219,8 +239,10 @@ $filter='';
 print $form->select_company($socid,'socid',$filter,1,1);
 print '</td></tr>';
 // User
-print '<tr><td>'.$langs->trans("User").'/'.$langs->trans("SalesRepresentative").'</td><td>';
-print $form->select_dolusers($userid,'userid',1);
+print '<tr><td>'.$langs->trans("User").'</td><td>';
+$include='';
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $include='hierarchy';
+print $form->select_dolusers($userid,'userid',1,'',0,$include);
 print '</td></tr>';
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php
new file mode 100644
index 00000000000..5a4170e74fe
--- /dev/null
+++ b/htdocs/compta/dons/card.php
@@ -0,0 +1,593 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/dons/card.php
+ *		\ingroup    don
+ *		\brief      Page of donation card
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+if (! empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+
+$langs->load("companies");
+$langs->load("donations");
+$langs->load("bills");
+
+$id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
+$action=GETPOST('action','alpha');
+$cancel=GETPOST('cancel');
+$amount=GETPOST('amount');
+
+$don = new Don($db);
+$donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+
+// Security check
+$result = restrictedArea($user, 'don', $id);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('doncard','globalcard'));
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'update')
+{
+	if (! empty($cancel))
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+		exit;
+	}
+
+	$error=0;
+
+    if (empty($donation_date))
+    {
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Date")), 'errors');
+        $action = "create";
+        $error++;
+    }
+
+	if (empty($amount))
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors');
+		$action = "create";
+		$error++;
+	}
+
+	if (! $error)
+	{
+		$don->fetch($id);
+
+		$don->firstname   = $_POST["firstname"];
+		$don->lastname    = $_POST["lastname"];
+		$don->societe     = $_POST["societe"];
+		$don->address     = $_POST["address"];
+		$don->amount      = price2num($_POST["amount"]);
+		$don->town        = $_POST["town"];
+        $don->zip         = $_POST["zipcode"];
+        $don->country     = $_POST["country"];
+		$don->email       = $_POST["email"];
+		$don->date        = $donation_date;
+		$don->note        = $_POST["note"];
+		$don->public      = $_POST["public"];
+		$don->fk_project  = $_POST["projectid"];
+		$don->note_private= GETPOST("note_private");
+		$don->note_public = GETPOST("note_public");
+		$don->modepaiementid = $_POST["modepaiement"];
+
+		if ($don->update($user) > 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$don->id);
+			exit;
+		}
+	}
+}
+
+if ($action == 'add')
+{
+	if (! empty($cancel))
+	{
+		header("Location: index.php");
+		exit;
+	}
+
+	$error=0;
+
+    if (empty($donation_date))
+    {
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Date")), 'errors');
+        $action = "create";
+        $error++;
+    }
+
+	if (empty($amount))
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->trans("Amount")), 'errors');
+		$action = "create";
+		$error++;
+	}
+
+	if (! $error)
+	{
+		$don->firstname   = $_POST["firstname"];
+		$don->lastname    = $_POST["lastname"];
+		$don->societe     = $_POST["societe"];
+		$don->address     = $_POST["address"];
+		$don->amount      = price2num($_POST["amount"]);
+		$don->town        = $_POST["town"];
+        $don->zip         = $_POST["zipcode"];
+        $don->town        = $_POST["town"];
+        $don->country     = $_POST["country"];
+		$don->email       = $_POST["email"];
+		$don->date        = $donation_date;
+		$don->note_private= GETPOST("note_private");
+		$don->note_public = GETPOST("note_public");
+		$don->public      = $_POST["public"];
+		$don->fk_project  = $_POST["projectid"];
+		$don->modepaiementid = $_POST["modepaiement"];
+
+		if ($don->create($user) > 0)
+		{
+			header("Location: index.php");
+			exit;
+		}
+	}
+}
+
+if ($action == 'delete')
+{
+	$don->delete($id);
+	header("Location: list.php");
+	exit;
+}
+if ($action == 'commentaire')
+{
+	$don->fetch($id);
+	$don->update_note($_POST["commentaire"]);
+}
+if ($action == 'valid_promesse')
+{
+	if ($don->valid_promesse($id, $user->id) >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+		exit;
+	}
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
+}
+if ($action == 'set_cancel')
+{
+    if ($don->set_cancel($id) >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+        exit;
+    }
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
+}
+if ($action == 'set_paid')
+{
+	if ($don->set_paye($id, $modepaiement) >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+		exit;
+	}
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
+}
+if ($action == 'set_encaisse')
+{
+	if ($don->set_encaisse($id) >= 0)
+	{
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+		exit;
+	}
+    else {
+	    setEventMessage($don->error, 'errors');
+    }
+}
+
+/*
+ * Build doc
+ */
+if ($action == 'builddoc')
+{
+	$object = new Don($db);
+	$object->fetch($id);
+
+	// Save last template used to generate document
+	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	$result=don_create($db, $object->id, '', $object->modelpdf, $outputlangs);
+	if ($result <= 0)
+	{
+		dol_print_error($db,$result);
+		exit;
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
+
+$form=new Form($db);
+$formfile = new FormFile($db);
+$formcompany = new FormCompany($db);
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation                                                                   */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+	print_fiche_titre($langs->trans("AddDonation"));
+
+	print '<form name="add" action="card.php" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="border" width="100%">';
+
+	print '<input type="hidden" name="action" value="add">';
+
+    $nbrows=11;
+    if (! empty($conf->projet->enabled)) $nbrows++;
+
+    // Date
+	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+	$form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1);
+	print '</td>';
+
+    print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
+    print "<textarea name=\"note_private\" wrap=\"soft\" cols=\"40\" rows=\"15\">".GETPOST("note_private")."</textarea></td>";
+    print "</tr>";
+
+    // Amount
+    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.$_POST["amount"].'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+	print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
+	print "</td></tr>\n";
+
+	print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.$_POST["societe"].'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.$_POST["firstname"].'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.$_POST["lastname"].'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
+	print '<textarea name="address" wrap="soft" cols="40" rows="3">'.$_POST["address"].'</textarea></td></tr>';
+
+    // Zip / Town
+    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+	print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+    print ' ';
+    print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectcountry_id','state_id'));
+    print '</tr>';
+
+	print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="country" value="'.$_POST["country"].'" size="40"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.$_POST["email"].'" size="40"></td></tr>';
+
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
+    $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
+    print "</td></tr>\n";
+
+	if (! empty($conf->projet->enabled))
+    {
+    	
+    	$formproject=new FormProjets($db);
+    	
+        // Si module projet actif
+        print "<tr><td>".$langs->trans("Project")."</td><td>";
+        $formproject->select_projects('',$_POST["projectid"],"projectid");
+        print "</td></tr>\n";
+    }
+
+    // Other attributes
+    $parameters=array('colspan' => ' colspan="1"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action);    // Note that $action and $object may have been modified by hook
+
+	print "</table>\n";
+	print '<br><center><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+	print "</form>\n";
+}
+
+
+/* ************************************************************ */
+/*                                                              */
+/* Fiche don en mode edition                                    */
+/*                                                              */
+/* ************************************************************ */
+
+if (! empty($id) && $action == 'edit')
+{
+	$don->fetch($id);
+
+	$h=0;
+	$head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id;
+	$head[$h][1] = $langs->trans("Card");
+	$hselected=$h;
+	$h++;
+
+	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
+
+	print '<form name="update" action="card.php" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="border" width="100%">';
+
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="rowid" value="'.$don->id.'">';
+
+	// Ref
+	print "<tr>".'<td>'.$langs->trans("Ref").'</td><td colspan="2">';
+	print $don->getNomUrl();
+	print '</td>';
+	print '</tr>';
+
+    $nbrows=12;
+    if (! empty($conf->projet->enabled)) $nbrows++;
+
+    // Date
+	print "<tr>".'<td width="25%" class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+	$form->select_date($don->date,'','','','',"update");
+	print '</td>';
+
+    print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
+    print "<textarea name=\"note_private\" wrap=\"soft\" cols=\"40\" rows=\"15\">".$don->note_private."</textarea></td>";
+    print "</tr>";
+
+	// Amount
+    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+	print $form->selectyesno("public",1,1);
+	print "</td>";
+	print "</tr>\n";
+
+	$langs->load("companies");
+	print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$don->societe.'"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.$don->firstname.'"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.$don->lastname.'"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
+	print '<textarea name="address" wrap="soft" cols="40" rows="'.ROWS_3.'">'.$don->address.'</textarea></td></tr>';
+
+    // Zip / Town
+    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+    print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+    print ' ';
+    print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectcountry_id','state_id'));
+    print '</tr>';
+
+	print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="country" size="40" value="'.$don->country.'"></td></tr>';
+	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>';
+
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
+
+    if ($don->modepaiementid) $selected = $don->modepaiementid;
+    else $selected = '';
+
+    $form->select_types_paiements($selected, 'modepaiement', 'CRDT', 0, 1);
+    print "</td></tr>\n";
+
+	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>';
+
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+    	$formproject=new FormProjets($db);
+    	
+        $langs->load('projects');
+        print '<tr><td>'.$langs->trans('Project').'</td><td>';
+        $formproject->select_projects(-1, (isset($_POST["projectid"])?$_POST["projectid"]:$don->fk_project), 'projectid');
+        print '</td></tr>';
+    }
+
+    // Other attributes
+    $parameters=array('colspan' => ' colspan="1"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action);    // Note that $action and $object may have been modified by hook
+
+	print "</table>\n";
+
+	print '<br><center><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+
+	print "</form>\n";
+
+	print "</div>\n";
+}
+
+
+
+/* ************************************************************ */
+/*                                                              */
+/* Fiche don en mode visu                                       */
+/*                                                              */
+/* ************************************************************ */
+if (! empty($id) && $action != 'edit')
+{
+	$result=$don->fetch($id);
+
+	$h=0;
+	$head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id;
+	$head[$h][1] = $langs->trans("Card");
+	$hselected=$h;
+	$h++;
+
+	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
+
+	print "<form action=\"card.php\" method=\"post\">";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="border" width="100%">';
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/dons/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+    $nbrows=12;
+    if (! empty($conf->projet->enabled)) $nbrows++;
+
+	// Ref
+	print "<tr>".'<td>'.$langs->trans("Ref").'</td><td colspan="2">';
+	print $form->showrefnav($don, 'rowid', $linkback, 1, 'rowid', 'ref', '');
+	print '</td>';
+	print '</tr>';
+
+	// Date
+	print '<tr><td width="25%">'.$langs->trans("Date").'</td><td>';
+	print dol_print_date($don->date,"day");
+	print "</td>";
+
+    print '<td rowspan="'.$nbrows.'" valign="top" width="50%">'.$langs->trans("Comments").' :<br>';
+	print nl2br($don->note_private).'</td></tr>';
+
+    print "<tr>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount,0,$langs,0,0,-1,$conf->currency).'</td></tr>';
+
+	print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
+	print yn($don->public);
+	print "</td></tr>\n";
+
+	print "<tr>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->firstname.'</td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->lastname.'</td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.dol_nl2br($don->address).'</td></tr>';
+
+	// Zip / Town
+	print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->zip.($don->zip && $don->town?' / ':'').$don->town.'</td></tr>';
+
+	// Country
+	print "<tr>".'<td>'.$langs->trans("Country").'</td><td>'.$don->country.'</td></tr>';
+
+	// EMail
+	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($don->email).'</td></tr>';
+
+	// Payment mode
+	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
+	print $form->form_modes_reglement(null, $don->modepaiementid,'none');
+	print "</td></tr>\n";
+
+	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>';
+
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        print "<tr>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>';
+    }
+
+    // Other attributes
+    $parameters=array('colspan' => ' colspan="1"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action);    // Note that $action and $object may have been modified by hook
+
+	print "</table>\n";
+	print "</form>\n";
+
+	print "</div>";
+
+	// TODO Gerer action emettre paiement
+	$resteapayer = 0;
+
+
+	/**
+	 * Barre d'actions
+	 */
+	print '<div class="tabsAction">';
+
+	print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&rowid='.$don->id.'">'.$langs->trans('Modify').'</a></div>';
+
+	if ($don->statut == 0)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$don->id.'&action=valid_promesse">'.$langs->trans("ValidPromess").'</a></div>';
+	}
+
+    if (($don->statut == 0 || $don->statut == 1) && $resteapayer == 0 && $don->paye == 0)
+    {
+        print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$don->id.'&action=set_cancel">'.$langs->trans("ClassifyCanceled")."</a></div>";
+    }
+
+	// TODO Gerer action emettre paiement
+	if ($don->statut == 1 && $resteapayer > 0)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?rowid='.$don->id.'&action=create">'.$langs->trans("DoPayment")."</a></div>";
+	}
+
+	if ($don->statut == 1 && $resteapayer == 0 && $don->paye == 0)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$don->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
+	}
+
+	if ($user->rights->don->supprimer)
+	{
+		print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$don->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
+	}
+	else
+	{
+		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("Delete")."</a></div>";
+	}
+
+	print "</div>";
+
+
+	print '<table width="100%"><tr><td width="50%" valign="top">';
+
+	/*
+	 * Documents generes
+	 */
+	$filename=dol_sanitizeFileName($don->id);
+	$filedir=$conf->don->dir_output . '/' . get_exdir($filename,2);
+	$urlsource=$_SERVER['PHP_SELF'].'?rowid='.$don->id;
+	//            $genallowed=($fac->statut == 1 && ($fac->paye == 0 || $user->admin) && $user->rights->facture->creer);
+	//            $delallowed=$user->rights->facture->supprimer;
+	$genallowed=1;
+	$delallowed=0;
+
+	$var=true;
+
+	print '<br>';
+	$formfile->show_documents('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed);
+
+	print '</td><td>&nbsp;</td>';
+
+	print '</tr></table>';
+
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index f7bd819d969..61e1b9cd926 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Florian Henry		  	<florian.henry@open-concept.pro>
  *
  * 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
@@ -202,45 +202,51 @@ class Don extends CommonObject
 
 
     /**
-     *	Check params
+     *	Check params and init ->errors array.
+     *  TODO This function seems to not be used by core code.
      *
      *	@param	int	$minimum	Minimum
      *	@return	int				0 if KO, >0 if OK
      */
     function check($minimum=0)
     {
+    	global $langs;
+    	$langs->load('main');
+    	$langs->load('companies');
+
+    	$error_string = array();
         $err = 0;
 
         if (dol_strlen(trim($this->societe)) == 0)
         {
             if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
             {
-                $error_string[$err] = "Vous devez saisir vos nom et prenom ou le nom de votre societe.";
+                $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname'));
                 $err++;
             }
         }
 
         if (dol_strlen(trim($this->address)) == 0)
         {
-            $error_string[$err] = "L'adresse saisie est invalide";
+            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Address'));
             $err++;
         }
 
         if (dol_strlen(trim($this->zip)) == 0)
         {
-            $error_string[$err] = "Le code postal saisi est invalide";
+            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip'));
             $err++;
         }
 
         if (dol_strlen(trim($this->town)) == 0)
         {
-            $error_string[$err] = "La ville saisie est invalide";
+            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Town'));
             $err++;
         }
 
         if (dol_strlen(trim($this->email)) == 0)
         {
-            $error_string[$err] = "L'email saisi est invalide";
+            $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail'));
             $err++;
         }
 
@@ -252,7 +258,7 @@ class Don extends CommonObject
         {
             if (!isset($map[substr($this->amount, $i, 1)] ))
             {
-                $error_string[$err] = "Le montant du don contient un/des caractere(s) invalide(s)";
+                $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
                 $err++;
                 $amount_invalid = 1;
                 break;
@@ -263,14 +269,14 @@ class Don extends CommonObject
         {
             if ($this->amount == 0)
             {
-                $error_string[$err] = "Le montant du don est null";
+                $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
                 $err++;
             }
             else
             {
                 if ($this->amount < $minimum && $minimum > 0)
                 {
-                    $error_string[$err] = "Le montant minimum du don est de $minimum";
+                    $error_string[] = $langs->trans('MinimumAmount',$langs->trans('$minimum'));
                     $err++;
                 }
             }
@@ -278,14 +284,13 @@ class Don extends CommonObject
 
         if ($err)
         {
-            $this->error = $error_string;
+            $this->errors = $error_string;
             return 0;
         }
         else
-        {
+		{
             return 1;
         }
-
     }
 
     /**
@@ -308,6 +313,8 @@ class Don extends CommonObject
 
         $now=dol_now();
 
+        $this->db->begin();
+
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."don (";
         $sql.= "datec";
         $sql.= ", entity";
@@ -354,25 +361,23 @@ class Don extends CommonObject
         $sql.= ", '".$this->db->escape($this->phone_mobile)."'";
         $sql.= ")";
 
-        dol_syslog("Don::create sql=".$sql, LOG_DEBUG);
+        dol_syslog("Don::create", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don");
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('DON_CREATE',$this,$user,$langs,$conf);
-            if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-            }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('DON_CREATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 
+            $this->db->commit();
             return $this->id;
         }
         else
         {
+            $this->db->rollback();
             dol_print_error($this->db);
             return -1;
         }
@@ -393,6 +398,8 @@ class Don extends CommonObject
         $this->country_id=($this->country_id>0?$this->country_id:$this->country_id);
         $this->country=($this->country?$this->country:$this->country);
 
+        $this->db->begin();
+
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
         $sql .= "amount = " . price2num($this->amount);
         $sql .= ",fk_paiement = ".($this->modepaiementid?$this->modepaiementid:"null");
@@ -414,14 +421,21 @@ class Don extends CommonObject
         $sql .= ",fk_statut=".$this->statut;
         $sql .= " WHERE rowid = $this->id";
 
-        dol_syslog("Don::update sql=".$sql);
+        dol_syslog("Don::update", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
+            // Call trigger
+            $result=$this->call_trigger('DON_UPDATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
+
+            $this->db->commit();
             return 1;
         }
         else
         {
+            $this->db->rollback();
             dol_print_error($this->db);
             return -1;
         }
@@ -436,6 +450,8 @@ class Don extends CommonObject
     function delete($rowid)
     {
 
+        $this->db-begin();
+
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;";
 
         $resql=$this->db->query($sql);
@@ -443,10 +459,17 @@ class Don extends CommonObject
         {
             if ( $this->db->affected_rows($resql) )
             {
+                // Call trigger
+                $result=$this->call_trigger('DON_DELETE',$user);
+                if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+                // End call triggers
+
+                $this->db->commit();
                 return 1;
             }
             else
             {
+                $this->db->rollback();
                 return -1;
             }
         }
@@ -478,7 +501,7 @@ class Don extends CommonObject
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_paiement";
         $sql.= " WHERE d.rowid = ".$rowid." AND d.entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -535,7 +558,6 @@ class Don extends CommonObject
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = $userid WHERE rowid = $rowid AND fk_statut = 0";
 
-        dol_syslog("sql=".$sql);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -571,7 +593,6 @@ class Don extends CommonObject
         }
         $sql .=  " WHERE rowid = $rowid AND fk_statut = 1";
 
-        dol_syslog("sql=".$sql);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -603,7 +624,6 @@ class Don extends CommonObject
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 3 WHERE rowid = $rowid AND fk_statut = 2";
 
-        dol_syslog("sql=".$sql);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -633,7 +653,6 @@ class Don extends CommonObject
     {
         $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$rowid;
 
-        dol_syslog("sql=".$sql);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -693,7 +712,7 @@ class Don extends CommonObject
 
         $result='';
 
-        $lien = '<a href="'.DOL_URL_ROOT.'/compta/dons/fiche.php?rowid='.$this->id.'">';
+        $lien = '<a href="'.DOL_URL_ROOT.'/compta/dons/card.php?rowid='.$this->id.'">';
         $lienfin='</a>';
 
         $picto='generic';
diff --git a/htdocs/compta/dons/class/index.html b/htdocs/compta/dons/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
deleted file mode 100644
index 9f9f8793ad5..00000000000
--- a/htdocs/compta/dons/fiche.php
+++ /dev/null
@@ -1,590 +0,0 @@
-<?php
-/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/compta/dons/fiche.php
- *		\ingroup    don
- *		\brief      Page of donation card
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-
-$langs->load("companies");
-$langs->load("donations");
-$langs->load("bills");
-
-$id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');
-$action=GETPOST('action','alpha');
-$cancel=GETPOST('cancel');
-$amount=GETPOST('amount');
-
-$mesg="";
-$mesgs=array();
-
-$don = new Don($db);
-$donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-
-// Security check
-$result = restrictedArea($user, 'don', $id);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('doncard'));
-
-
-/*
- * Actions
- */
-
-if ($action == 'update')
-{
-	if (! empty($cancel))
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
-
-	$error=0;
-
-    if (empty($donation_date))
-    {
-        $mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
-        $action = "create";
-        $error++;
-    }
-
-	if (empty($amount))
-	{
-		$mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
-		$action = "create";
-		$error++;
-	}
-
-	if (! $error)
-	{
-		$don->fetch($id);
-
-		$don->firstname   = $_POST["firstname"];
-		$don->lastname    = $_POST["lastname"];
-		$don->societe     = $_POST["societe"];
-		$don->address     = $_POST["address"];
-		$don->amount      = price2num($_POST["amount"]);
-		$don->town        = $_POST["town"];
-        $don->zip         = $_POST["zipcode"];
-        $don->country     = $_POST["country"];
-		$don->email       = $_POST["email"];
-		$don->date        = $donation_date;
-		$don->note        = $_POST["note"];
-		$don->public      = $_POST["public"];
-		$don->fk_project  = $_POST["projectid"];
-		$don->note_private= GETPOST("note_private");
-		$don->note_public = GETPOST("note_public");
-		$don->modepaiementid = $_POST["modepaiement"];
-
-		if ($don->update($user) > 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$don->id);
-			exit;
-		}
-	}
-}
-
-if ($action == 'add')
-{
-	if (! empty($cancel))
-	{
-		header("Location: index.php");
-		exit;
-	}
-
-	$error=0;
-
-    if (empty($donation_date))
-    {
-        $mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Date"));
-        $action = "create";
-        $error++;
-    }
-
-	if (empty($amount))
-	{
-		$mesgs[]=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
-		$action = "create";
-		$error++;
-	}
-
-	if (! $error)
-	{
-		$don->firstname   = $_POST["firstname"];
-		$don->lastname    = $_POST["lastname"];
-		$don->societe     = $_POST["societe"];
-		$don->address     = $_POST["address"];
-		$don->amount      = price2num($_POST["amount"]);
-		$don->town        = $_POST["town"];
-        $don->zip         = $_POST["zipcode"];
-        $don->town        = $_POST["town"];
-        $don->country     = $_POST["country"];
-		$don->email       = $_POST["email"];
-		$don->date        = $donation_date;
-		$don->note_private= GETPOST("note_private");
-		$don->note_public = GETPOST("note_public");
-		$don->public      = $_POST["public"];
-		$don->fk_project  = $_POST["projectid"];
-		$don->modepaiementid = $_POST["modepaiement"];
-
-		if ($don->create($user) > 0)
-		{
-			header("Location: index.php");
-			exit;
-		}
-	}
-}
-
-if ($action == 'delete')
-{
-	$don->delete($id);
-	header("Location: liste.php");
-	exit;
-}
-if ($action == 'commentaire')
-{
-	$don->fetch($id);
-	$don->update_note($_POST["commentaire"]);
-}
-if ($action == 'valid_promesse')
-{
-	if ($don->valid_promesse($id, $user->id) >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
-    else $mesg=$don->error;
-}
-if ($action == 'set_cancel')
-{
-    if ($don->set_cancel($id) >= 0)
-    {
-        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-        exit;
-    }
-    else $mesg=$don->error;
-}
-if ($action == 'set_paid')
-{
-	if ($don->set_paye($id, $modepaiement) >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
-    else $mesg=$don->error;
-}
-if ($action == 'set_encaisse')
-{
-	if ($don->set_encaisse($id) >= 0)
-	{
-        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
-    else $mesg=$don->error;
-}
-
-/*
- * Build doc
- */
-if ($action == 'builddoc')
-{
-	$object = new Don($db);
-	$object->fetch($id);
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	$result=don_create($db, $object->id, '', $object->modelpdf, $outputlangs);
-	if ($result <= 0)
-	{
-		dol_print_error($db,$result);
-		exit;
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
-
-$form=new Form($db);
-$formfile = new FormFile($db);
-$formcompany = new FormCompany($db);
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Creation                                                                   */
-/*                                                                            */
-/* ************************************************************************** */
-
-if ($action == 'create')
-{
-	print_fiche_titre($langs->trans("AddDonation"));
-
-	dol_htmloutput_errors($mesg,$mesgs);
-
-	print '<form name="add" action="fiche.php" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="border" width="100%">';
-
-	print '<input type="hidden" name="action" value="add">';
-
-    $nbrows=11;
-    if (! empty($conf->projet->enabled)) $nbrows++;
-
-    // Date
-	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	$form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1);
-	print '</td>';
-
-    print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
-    print "<textarea name=\"note_private\" wrap=\"soft\" cols=\"40\" rows=\"15\">".GETPOST("note_private")."</textarea></td>";
-    print "</tr>";
-
-    // Amount
-    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.$_POST["amount"].'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
-	print "</td></tr>\n";
-
-	print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.$_POST["societe"].'" size="40"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.$_POST["firstname"].'" size="40"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.$_POST["lastname"].'" size="40"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="address" wrap="soft" cols="40" rows="3">'.$_POST["address"].'</textarea></td></tr>';
-
-    // Zip / Town
-    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-	print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-    print ' ';
-    print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectcountry_id','state_id'));
-    print '</tr>';
-
-	print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="country" value="'.$_POST["country"].'" size="40"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.$_POST["email"].'" size="40"></td></tr>';
-
-    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-    $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
-    print "</td></tr>\n";
-
-	if (! empty($conf->projet->enabled))
-    {
-    	
-    	$formproject=new FormProjets($db);
-    	
-        // Si module projet actif
-        print "<tr><td>".$langs->trans("Project")."</td><td>";
-        $formproject->select_projects('',$_POST["projectid"],"projectid");
-        print "</td></tr>\n";
-    }
-
-    // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action);    // Note that $action and $object may have been modified by hook
-
-	print "</table>\n";
-	print '<br><center><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-	print "</form>\n";
-}
-
-
-/* ************************************************************ */
-/*                                                              */
-/* Fiche don en mode edition                                    */
-/*                                                              */
-/* ************************************************************ */
-
-if (! empty($id) && $action == 'edit')
-{
-	$don->fetch($id);
-
-	$h=0;
-	$head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id;
-	$head[$h][1] = $langs->trans("Card");
-	$hselected=$h;
-	$h++;
-
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
-
-	print '<form name="update" action="fiche.php" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="border" width="100%">';
-
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="rowid" value="'.$don->id.'">';
-
-	// Ref
-	print "<tr>".'<td>'.$langs->trans("Ref").'</td><td colspan="2">';
-	print $don->getNomUrl();
-	print '</td>';
-	print '</tr>';
-
-    $nbrows=12;
-    if (! empty($conf->projet->enabled)) $nbrows++;
-
-    // Date
-	print "<tr>".'<td width="25%" class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-	$form->select_date($don->date,'','','','',"update");
-	print '</td>';
-
-    print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
-    print "<textarea name=\"note_private\" wrap=\"soft\" cols=\"40\" rows=\"15\">".$don->note_private."</textarea></td>";
-    print "</tr>";
-
-	// Amount
-    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",1,1);
-	print "</td>";
-	print "</tr>\n";
-
-	$langs->load("companies");
-	print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" size="40" value="'.$don->societe.'"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" size="40" value="'.$don->firstname.'"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" size="40" value="'.$don->lastname.'"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="address" wrap="soft" cols="40" rows="'.ROWS_3.'">'.$don->address.'</textarea></td></tr>';
-
-    // Zip / Town
-    print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-    print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-    print ' ';
-    print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectcountry_id','state_id'));
-    print '</tr>';
-
-	print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="country" size="40" value="'.$don->country.'"></td></tr>';
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>';
-
-    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-
-    if ($don->modepaiementid) $selected = $don->modepaiementid;
-    else $selected = '';
-
-    $form->select_types_paiements($selected, 'modepaiement', 'CRDT', 0, 1);
-    print "</td></tr>\n";
-
-	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>';
-
-    // Project
-    if (! empty($conf->projet->enabled))
-    {
-    	$formproject=new FormProjets($db);
-    	
-        $langs->load('projects');
-        print '<tr><td>'.$langs->trans('Project').'</td><td>';
-        $formproject->select_projects(-1, (isset($_POST["projectid"])?$_POST["projectid"]:$don->fk_project), 'projectid');
-        print '</td></tr>';
-    }
-
-    // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action);    // Note that $action and $object may have been modified by hook
-
-	print "</table>\n";
-
-	print '<br><center><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-
-	print "</form>\n";
-
-	print "</div>\n";
-}
-
-
-
-/* ************************************************************ */
-/*                                                              */
-/* Fiche don en mode visu                                       */
-/*                                                              */
-/* ************************************************************ */
-if (! empty($id) && $action != 'edit')
-{
-	$result=$don->fetch($id);
-
-	$h=0;
-	$head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id;
-	$head[$h][1] = $langs->trans("Card");
-	$hselected=$h;
-	$h++;
-
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
-
-	print "<form action=\"fiche.php\" method=\"post\">";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<table class="border" width="100%">';
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/dons/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-    $nbrows=12;
-    if (! empty($conf->projet->enabled)) $nbrows++;
-
-	// Ref
-	print "<tr>".'<td>'.$langs->trans("Ref").'</td><td colspan="2">';
-	print $form->showrefnav($don, 'rowid', $linkback, 1, 'rowid', 'ref', '');
-	print '</td>';
-	print '</tr>';
-
-	// Date
-	print '<tr><td width="25%">'.$langs->trans("Date").'</td><td>';
-	print dol_print_date($don->date,"day");
-	print "</td>";
-
-    print '<td rowspan="'.$nbrows.'" valign="top" width="50%">'.$langs->trans("Comments").' :<br>';
-	print nl2br($don->note_private).'</td></tr>';
-
-    print "<tr>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount,0,$langs,0,0,-1,$conf->currency).'</td></tr>';
-
-	print "<tr><td>".$langs->trans("PublicDonation")."</td><td>";
-	print yn($don->public);
-	print "</td></tr>\n";
-
-	print "<tr>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->firstname.'</td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->lastname.'</td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.dol_nl2br($don->address).'</td></tr>';
-
-	// Zip / Town
-	print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->zip.($don->zip && $don->town?' / ':'').$don->town.'</td></tr>';
-
-	// Country
-	print "<tr>".'<td>'.$langs->trans("Country").'</td><td>'.$don->country.'</td></tr>';
-
-	// EMail
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($don->email).'</td></tr>';
-
-	// Payment mode
-	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-	print $form->form_modes_reglement(null, $don->modepaiementid,'none');
-	print "</td></tr>\n";
-
-	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>';
-
-    // Project
-    if (! empty($conf->projet->enabled))
-    {
-        print "<tr>".'<td>'.$langs->trans("Project").'</td><td>'.$don->projet.'</td></tr>';
-    }
-
-    // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action);    // Note that $action and $object may have been modified by hook
-
-	print "</table>\n";
-	print "</form>\n";
-
-	print "</div>";
-
-	// TODO Gerer action emettre paiement
-	$resteapayer = 0;
-
-
-	/**
-	 * Barre d'actions
-	 */
-	print '<div class="tabsAction">';
-
-	print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?action=edit&rowid='.$don->id.'">'.$langs->trans('Modify').'</a></div>';
-
-	if ($don->statut == 0)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$don->id.'&action=valid_promesse">'.$langs->trans("ValidPromess").'</a></div>';
-	}
-
-    if (($don->statut == 0 || $don->statut == 1) && $resteapayer == 0 && $don->paye == 0)
-    {
-        print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$don->id.'&action=set_cancel">'.$langs->trans("ClassifyCanceled")."</a></div>";
-    }
-
-	// TODO Gerer action emettre paiement
-	if ($don->statut == 1 && $resteapayer > 0)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?rowid='.$don->id.'&action=create">'.$langs->trans("DoPayment")."</a></div>";
-	}
-
-	if ($don->statut == 1 && $resteapayer == 0 && $don->paye == 0)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?rowid='.$don->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
-	}
-
-	if ($user->rights->don->supprimer)
-	{
-		print '<div class="inline-block divButAction"><a class="butActionDelete" href="fiche.php?rowid='.$don->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
-	}
-	else
-	{
-		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans("Delete")."</a></div>";
-	}
-
-	print "</div>";
-
-
-	print '<table width="100%"><tr><td width="50%" valign="top">';
-
-	/*
-	 * Documents generes
-	 */
-	$filename=dol_sanitizeFileName($don->id);
-	$filedir=$conf->don->dir_output . '/' . get_exdir($filename,2);
-	$urlsource=$_SERVER['PHP_SELF'].'?rowid='.$don->id;
-	//            $genallowed=($fac->statut == 1 && ($fac->paye == 0 || $user->admin) && $user->rights->facture->creer);
-	//            $delallowed=$user->rights->facture->supprimer;
-	$genallowed=1;
-	$delallowed=0;
-
-	$var=true;
-
-	print '<br>';
-	$formfile->show_documents('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed);
-
-	print '</td><td>&nbsp;</td>';
-
-	print '</tr></table>';
-
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php
index 30b34b6b85b..100380bc128 100644
--- a/htdocs/compta/dons/index.php
+++ b/htdocs/compta/dons/index.php
@@ -118,7 +118,7 @@ foreach ($listofstatus as $status)
 {
     $var=!$var;
     print "<tr ".$bc[$var].">";
-    print '<td><a href="liste.php?statut='.$status.'">'.$donstatic->LibStatut($status,4).'</a></td>';
+    print '<td><a href="list.php?statut='.$status.'">'.$donstatic->LibStatut($status,4).'</a></td>';
     print '<td align="right">'.(! empty($nb[$status])?$nb[$status]:'&nbsp;').'</td>';
     print '<td align="right">'.(! empty($nb[$status])?price($somme[$status],'MT'):'&nbsp;').'</td>';
     print '<td align="right">'.(! empty($nb[$status])?price(price2num($somme[$status]/$nb[$status],'MT')):'&nbsp;').'</td>';
diff --git a/htdocs/compta/dons/list.php b/htdocs/compta/dons/list.php
new file mode 100644
index 00000000000..95011ca0b74
--- /dev/null
+++ b/htdocs/compta/dons/list.php
@@ -0,0 +1,206 @@
+<?php
+/* Copyright (C) 2001-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/dons/list.php
+ *	\ingroup    don
+ *	\brief      Page de liste des dons
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php';
+if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+$langs->load("companies");
+$langs->load("donations");
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="d.datedon";
+$limit = $conf->liste_limit;
+
+$statut=isset($_GET["statut"])?$_GET["statut"]:"-1";
+$search_ref=GETPOST('search_ref','alpha');
+$search_company=GETPOST('search_company','alpha');
+$search_name=GETPOST('search_name','alpha');
+$search_amount = GETPOST('search_amount','alpha');
+
+if (!$user->rights->don->lire) accessforbidden();
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_company="";
+	$search_name="";
+	$search_amount="";
+}
+
+/*
+ * View
+ */
+
+if (! empty($conf->projet->enabled)) $projectstatic=new Project($db);
+
+llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
+
+$donationstatic=new Don($db);
+
+// Genere requete de liste des dons
+$sql = "SELECT d.rowid, d.datedon, d.firstname, d.lastname, d.societe,";
+$sql.= " d.amount, d.fk_statut as statut, ";
+$sql.= " p.rowid as pid, p.ref, p.title, p.public";
+$sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
+$sql.= " ON p.rowid = d.fk_don_projet WHERE 1 = 1";
+if ($statut >= 0)
+{
+	$sql .= " AND d.fk_statut = ".$statut;
+}
+if (trim($search_ref) != '')
+{
+    $sql.= ' AND d.rowid LIKE \'%'.$db->escape(trim($search_ref)) . '%\'';
+}
+if (trim($search_company) != '')
+{
+    $sql .= natural_search('d.societe', $search_company);
+}
+if (trim($search_name) != '')
+{
+    $sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
+}
+if ($search_amount) $sql.=" AND d.amount='".$db->escape(price2num(trim($search_amount)))."'";
+
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit+1, $offset);
+
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$param="&statut=$statut&sortorder=$sortorder&sortfield=$sortfield";
+
+	if ($statut >= 0)
+	{
+	    $donationstatic->statut=$statut;
+	    $label=$donationstatic->getLibStatut(0);
+		print_barre_liste($label, $page, $_SERVER["PHP_SELF"], $param, '', '', '', $num);
+	}
+	else
+	{
+		print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, '', '', '', $num);
+	}
+
+
+    print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	print "<table class=\"noborder\" width=\"100%\">";
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","&page=$page&statut=$statut","","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","&page=$page&statut=$statut","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname","&page=$page&statut=$statut","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","&page=$page&statut=$statut","",'align="center"',$sortfield,$sortorder);
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_don_projet","&page=$page&statut=$statut","","",$sortfield,$sortorder);
+	}
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+    // Filters lines
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre">';
+    print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
+    print '</td>';
+    print '<td class="liste_titre" align="left">';
+    print '&nbsp;';
+    print '</td>';
+    if (! empty($conf->projet->enabled))
+    {
+        print '<td class="liste_titre" align="right">';
+        print '&nbsp;';
+        print '</td>';
+    }
+    print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print "</td></tr>\n";
+
+	$var=True;
+	while ($i < min($num,$limit))
+	{
+		$objp = $db->fetch_object($result);
+		$var=!$var;
+		print "<tr ".$bc[$var].">";
+		$donationstatic->id=$objp->rowid;
+		$donationstatic->ref=$objp->rowid;
+		$donationstatic->lastname=$objp->lastname;
+		$donationstatic->firstname=$objp->firstname;
+		print "<td>".$donationstatic->getNomUrl(1)."</td>\n";
+        print "<td>".$objp->societe."</td>\n";
+		print "<td>".$donationstatic->getFullName($langs)."</td>\n";
+		print '<td align="center">'.dol_print_date($db->jdate($objp->datedon),'day').'</td>';
+		if (! empty($conf->projet->enabled))
+		{
+			print "<td>";
+			if ($objp->pid)
+			{
+				$projectstatic->id=$objp->pid;
+				$projectstatic->ref=$objp->ref;
+				$projectstatic->id=$objp->pid;
+				$projectstatic->public=$objp->public;
+				$projectstatic->title=$objp->title;
+				print $projectstatic->getNomUrl(1);
+			}
+			else print '&nbsp;';
+			print "</td>\n";
+		}
+		print '<td align="right">'.price($objp->amount).'</td>';
+		print '<td align="right">'.$donationstatic->LibStatut($objp->statut,5).'</td>';
+
+		print "</tr>";
+		$i++;
+	}
+	print "</table>";
+    print "</form>\n";
+    $db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php
deleted file mode 100644
index 62700ae5cb0..00000000000
--- a/htdocs/compta/dons/liste.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/compta/dons/liste.php
- *	\ingroup    don
- *	\brief      Page de liste des dons
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php';
-if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-$langs->load("companies");
-$langs->load("donations");
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="d.datedon";
-$limit = $conf->liste_limit;
-
-$statut=isset($_GET["statut"])?$_GET["statut"]:"-1";
-$search_ref=GETPOST('search_ref');
-$search_company=GETPOST('search_company');
-$search_name=GETPOST('search_name');
-
-if (!$user->rights->don->lire) accessforbidden();
-
-
-/*
- * View
- */
-
-if (! empty($conf->projet->enabled)) $projectstatic=new Project($db);
-
-llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
-
-$donationstatic=new Don($db);
-
-// Genere requete de liste des dons
-$sql = "SELECT d.rowid, d.datedon, d.firstname, d.lastname, d.societe,";
-$sql.= " d.amount, d.fk_statut as statut, ";
-$sql.= " p.rowid as pid, p.ref, p.title, p.public";
-$sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
-$sql.= " ON p.rowid = d.fk_don_projet WHERE 1 = 1";
-if ($statut >= 0)
-{
-	$sql .= " AND d.fk_statut = ".$statut;
-}
-if (trim($search_ref) != '')
-{
-    $sql.= ' AND d.rowid LIKE \'%'.$db->escape(trim($search_ref)) . '%\'';
-}
-if (trim($search_company) != '')
-{
-    $sql .= natural_search('d.societe', $search_company);
-}
-if (trim($search_name) != '')
-{
-    $sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
-}
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit+1, $offset);
-
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$param="&statut=$statut&sortorder=$sortorder&sortfield=$sortfield";
-
-	if ($statut >= 0)
-	{
-	    $donationstatic->statut=$statut;
-	    $label=$donationstatic->getLibStatut(0);
-		print_barre_liste($label, $page, $_SERVER["PHP_SELF"], $param, '', '', '', $num);
-	}
-	else
-	{
-		print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, '', '', '', $num);
-	}
-
-
-    print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	print "<table class=\"noborder\" width=\"100%\">";
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","&page=$page&statut=$statut","","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"d.societe","&page=$page&statut=$statut","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"d.lastname","&page=$page&statut=$statut","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.datedon","&page=$page&statut=$statut","",'align="center"',$sortfield,$sortorder);
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_don_projet","&page=$page&statut=$statut","","",$sortfield,$sortorder);
-	}
-	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-    // Filters lines
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_company" value="'.$search_company.'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
-    print '</td>';
-    print '<td class="liste_titre" align="left">';
-    print '&nbsp;';
-    print '</td>';
-    if (! empty($conf->projet->enabled))
-    {
-        print '<td class="liste_titre" align="right">';
-        print '&nbsp;';
-        print '</td>';
-    }
-    print '<td class="liste_titre" align="right">';
-    print '&nbsp;';
-    print '</td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print "</td></tr>\n";
-
-	$var=True;
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($result);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		$donationstatic->id=$objp->rowid;
-		$donationstatic->ref=$objp->rowid;
-		$donationstatic->lastname=$objp->lastname;
-		$donationstatic->firstname=$objp->firstname;
-		print "<td>".$donationstatic->getNomUrl(1)."</td>\n";
-        print "<td>".$objp->societe."</td>\n";
-		print "<td>".$donationstatic->getFullName($langs)."</td>\n";
-		print '<td align="center">'.dol_print_date($db->jdate($objp->datedon),'day').'</td>';
-		if (! empty($conf->projet->enabled))
-		{
-			print "<td>";
-			if ($objp->pid)
-			{
-				$projectstatic->id=$objp->pid;
-				$projectstatic->ref=$objp->ref;
-				$projectstatic->id=$objp->pid;
-				$projectstatic->public=$objp->public;
-				$projectstatic->title=$objp->title;
-				print $projectstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
-			print "</td>\n";
-		}
-		print '<td align="right">'.price($objp->amount).'</td>';
-		print '<td align="right">'.$donationstatic->LibStatut($objp->statut,5).'</td>';
-
-		print "</tr>";
-		$i++;
-	}
-	print "</table>";
-    print "</form>\n";
-    $db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index c6214f449cb..abbffbd5173 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2013      Jean-Francois FERRY   <jfefe@aternatik.fr>
  * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014	   Ferran Marcet		<fmarcet@2byte.es>
  *
  * 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
@@ -100,7 +101,7 @@ if ($id > 0 || ! empty($ref)) {
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('invoicecard'));
+$hookmanager->initHooks(array('invoicecard','globalcard'));
 
 $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
 
@@ -110,14 +111,15 @@ $permissionnote = $user->rights->facture->creer; // Used by the include of actio
 
 $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');
 
 include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->facture->creer) {
-	if (1 == 0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"])) {
-		$mesgs [] = '<div class="error">' . $langs->trans("NoCloneOptionsSpecified") . '</div>';
-	} else {
+//	if (1 == 0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"])) {
+//		$mesgs [] = '<div class="error">' . $langs->trans("NoCloneOptionsSpecified") . '</div>';
+//	} else {
 		if ($object->fetch($id) > 0) {
 			$result = $object->createFromClone($socid);
 			if ($result > 0) {
@@ -128,7 +130,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->facture->c
 				$action = '';
 			}
 		}
-	}
+//	}
 }
 
 // Change status of invoice
@@ -170,11 +172,12 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fact
 }
 
 // Delete line
-else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer) {
+else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$object->fetch_thirdparty();
 
-	$result = $object->deleteline($_GET ['lineid'], $user);
+	$result = $object->deleteline(GETPOST('lineid'));
 	if ($result > 0) {
 		// Define output language
 		$outputlangs = $langs;
@@ -182,14 +185,14 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
 			$newlang = $_REQUEST['lang_id'];
 		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->client->default_lang;
+			$newlang = $object->thirdparty->default_lang;
 		if (! empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			$ret = $object->fetch($id); // Reload to get new records
-			$result = facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 		if ($result >= 0) {
 			header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $id);
@@ -202,33 +205,36 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
 }
 
 // Delete link of credit note to invoice
-else if ($action == 'unlinkdiscount' && $user->rights->facture->creer) {
+else if ($action == 'unlinkdiscount' && $user->rights->facture->creer)
+{
 	$discount = new DiscountAbsolute($db);
-	$result = $discount->fetch($_GET ["discountid"]);
+	$result = $discount->fetch(GETPOST("discountid"));
 	$discount->unlink_invoice();
 }
 
 // Validation
-else if ($action == 'valid' && $user->rights->facture->creer) {
+else if ($action == 'valid' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 
 	// On verifie signe facture
 	if ($object->type == Facture::TYPE_CREDIT_NOTE) {
 		// Si avoir, le signe doit etre negatif
 		if ($object->total_ht >= 0) {
-			$mesgs [] = '<div class="error">' . $langs->trans("ErrorInvoiceAvoirMustBeNegative") . '</div>';
+			setEventMessage($langs->trans("ErrorInvoiceAvoirMustBeNegative"), 'errors');
 			$action = '';
 		}
 	} else {
 		// Si non avoir, le signe doit etre positif
 		if (empty($conf->global->FACTURE_ENABLE_NEGATIVE) && $object->total_ht < 0) {
-			$mesgs [] = '<div class="error">' . $langs->trans("ErrorInvoiceOfThisTypeMustBePositive") . '</div>';
+			setEventMessage($langs->trans("ErrorInvoiceOfThisTypeMustBePositive"), 'errors');
 			$action = '';
 		}
 	}
 }
 
-else if ($action == 'set_thirdparty' && $user->rights->facture->creer) {
+else if ($action == 'set_thirdparty' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$object->setValueFrom('fk_soc', $socid);
 
@@ -236,12 +242,14 @@ else if ($action == 'set_thirdparty' && $user->rights->facture->creer) {
 	exit();
 }
 
-else if ($action == 'classin' && $user->rights->facture->creer) {
+else if ($action == 'classin' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$object->setProject($_POST['projectid']);
 }
 
-else if ($action == 'setmode' && $user->rights->facture->creer) {
+else if ($action == 'setmode' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	if ($result < 0)
@@ -267,7 +275,8 @@ else if ($action == 'setinvoicedate' && $user->rights->facture->creer)
 	if ($result < 0) dol_print_error($db, $object->error);
 }
 
-else if ($action == 'setconditions' && $user->rights->facture->creer) {
+else if ($action == 'setconditions' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$object->cond_reglement_code = 0; // To clean property
 	$object->cond_reglement_id = 0; // To clean property
@@ -282,7 +291,8 @@ else if ($action == 'setconditions' && $user->rights->facture->creer) {
 	if ($result < 0) dol_print_error($db, $object->error);
 }
 
-else if ($action == 'setpaymentterm' && $user->rights->facture->creer) {
+else if ($action == 'setpaymentterm' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
 	if ($object->date_lim_reglement < $object->date) {
@@ -294,7 +304,8 @@ else if ($action == 'setpaymentterm' && $user->rights->facture->creer) {
 		dol_print_error($db, $object->error);
 }
 
-else if ($action == 'setrevenuestamp' && $user->rights->facture->creer) {
+else if ($action == 'setrevenuestamp' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$object->revenuestamp = GETPOST('revenuestamp');
 	$result = $object->update($user);
@@ -303,19 +314,27 @@ else if ($action == 'setrevenuestamp' && $user->rights->facture->creer) {
 		dol_print_error($db, $object->error);
 }
 
-else if ($action == 'setremisepercent' && $user->rights->facture->creer) {
+// bank account
+else if ($action == 'setbankaccount' && $user->rights->facture->creer)
+{
+    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+}
+
+else if ($action == 'setremisepercent' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$result = $object->set_remise($user, $_POST['remise_percent']);
 }
 
-else if ($action == "setabsolutediscount" && $user->rights->facture->creer) {
+else if ($action == "setabsolutediscount" && $user->rights->facture->creer)
+{
 	// POST[remise_id] ou POST[remise_id_for_payment]
 	if (! empty($_POST["remise_id"])) {
 		$ret = $object->fetch($id);
 		if ($ret > 0) {
 			$result = $object->insert_discount($_POST["remise_id"]);
 			if ($result < 0) {
-				$mesgs [] = '<div class="error">' . $object->error . '</div>';
+				setEventMessage($object->error, 'errors');
 			}
 		} else {
 			dol_print_error($db, $object->error);
@@ -328,12 +347,13 @@ else if ($action == "setabsolutediscount" && $user->rights->facture->creer) {
 
 		$result = $discount->link_to_invoice(0, $id);
 		if ($result < 0) {
-			$mesgs [] = '<div class="error">' . $discount->error . '</div>';
+			setEventMessage($discount->error, 'errors');
 		}
 	}
 }
 
-else if ($action == 'set_ref_client' && $user->rights->facture->creer) {
+else if ($action == 'set_ref_client' && $user->rights->facture->creer)
+{
 	$object->fetch($id);
 	$object->set_ref_client($_POST['ref_client']);
 }
@@ -353,7 +373,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
 	{
 		$idprof_mandatory = 'SOCIETE_IDPROF' . ($i) . '_INVOICE_MANDATORY';
 		$idprof = 'idprof' . $i;
-		if (! $object->thirdparty->$idprof && ! empty($conf->global->$idprof_mandatory)) {
+		if (! $object->thirdparty->$idprof && ! empty($conf->global->$idprof_mandatory))
+		{
 			if (! $error)
 				$langs->load("errors");
 			$error ++;
@@ -370,7 +391,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
 	}
 
 	// Check for warehouse
-	if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change) {
+	if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change)
+	{
 		if (! $idwarehouse || $idwarehouse == - 1) {
 			$error ++;
 			setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), 'errors');
@@ -384,21 +406,25 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
 		if ($result >= 0)
 		{
 			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->client->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model=$object->modelpdf;
 				$ret = $object->fetch($id); // Reload to get new records
-				facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    			if ($result < 0) dol_print_error($db,$result);
 			}
-		} else {
+		}
+		else
+		{
 			if (count($object->errors)) setEventMessage($object->errors, 'errors');
 			else setEventMessage($object->error, 'errors');
 		}
@@ -406,7 +432,8 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
 }
 
 // Go back to draft status (unvalidate)
-else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->valider) || $user->rights->facture->invoice_advance->unvalidate)) {
+else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->facture->valider) || $user->rights->facture->invoice_advance->unvalidate))
+{
 	$idwarehouse = GETPOST('idwarehouse');
 
 	$object->fetch($id);
@@ -420,7 +447,8 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
 	}
 
 	// Check parameters
-	if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change) {
+	if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change)
+	{
 		if (! $idwarehouse || $idwarehouse == - 1) {
 			$error ++;
 			setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), 'errors');
@@ -454,36 +482,41 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
 		$ventilExportCompta = $object->getVentilExportCompta();
 
 		// On verifie si aucun paiement n'a ete effectue
-		if ($resteapayer == $object->total_ttc && $object->paye == 0 && $ventilExportCompta == 0) {
+		if ($resteapayer == $object->total_ttc && $object->paye == 0 && $ventilExportCompta == 0)
+		{
 			$result=$object->set_draft($user, $idwarehouse);
 			if ($result<0) setEventMessage($object->error,'errors');
 
+
 			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->client->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model=$object->modelpdf;
 				$ret = $object->fetch($id); // Reload to get new records
-				facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 	}
 }
 
 // Classify "paid"
-else if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->facture->paiement) {
+else if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->facture->paiement)
+{
 	$object->fetch($id);
 	$result = $object->set_paid($user);
 	if ($result<0) setEventMessage($object->error,'errors');
 } // Classif "paid partialy"
-else if ($action == 'confirm_paid_partially' && $confirm == 'yes' && $user->rights->facture->paiement) {
+else if ($action == 'confirm_paid_partially' && $confirm == 'yes' && $user->rights->facture->paiement)
+{
 	$object->fetch($id);
 	$close_code = $_POST["close_code"];
 	$close_note = $_POST["close_note"];
@@ -567,7 +600,6 @@ else if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->righ
 			$result = $object->set_paid($user);
 			if ($result >= 0)
 			{
-				//$mesgs[]='OK'.$discount->id;
 				$db->commit();
 			}
 			else
@@ -600,7 +632,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 	if ($ret < 0) $error ++;
 
-		// Replacement invoice
+	// Replacement invoice
 	if ($_POST['type'] == Facture::TYPE_REPLACEMENT)
 	{
 		$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
@@ -629,6 +661,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 			$object->fk_project			= $_POST['projectid'];
 			$object->cond_reglement_id	= $_POST['cond_reglement_id'];
 			$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+            $object->fk_account         = GETPOST('fk_account', 'int');
 			$object->remise_absolue		= $_POST['remise_absolue'];
 			$object->remise_percent		= $_POST['remise_percent'];
 
@@ -637,8 +670,9 @@ else if ($action == 'add' && $user->rights->facture->creer)
 			$object->type = Facture::TYPE_REPLACEMENT;
 
 			$id = $object->createFromCurrent($user);
-			if ($id <= 0)
-				$mesgs [] = $object->error;
+			if ($id <= 0) {
+				setEventMessage($object->error, 'errors');
+			}
 		}
 	}
 
@@ -671,6 +705,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 			$object->fk_project			= $_POST['projectid'];
 			$object->cond_reglement_id	= 0;
 			$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+            $object->fk_account         = GETPOST('fk_account', 'int');
 			$object->remise_absolue		= $_POST['remise_absolue'];
 			$object->remise_percent		= $_POST['remise_percent'];
 
@@ -708,10 +743,11 @@ else if ($action == 'add' && $user->rights->facture->creer)
 
 			}
 
-            if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0) {
-
+            if(GETPOST('invoiceAvoirWithPaymentRestAmount', 'int')==1 && $id>0)
+            {
                 $facture_source = new Facture($db); // fetch origin object if not previously defined
-                if($facture_source->fetch($object->fk_facture_source)>0) {
+                if ($facture_source->fetch($object->fk_facture_source)>0)
+                {
                     $totalpaye = $facture_source->getSommePaiement();
                     $totalcreditnotes = $facture_source->getSumCreditNotesUsed();
                     $totaldeposits = $facture_source->getSumDepositsUsed();
@@ -737,7 +773,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 	}
 
 	// Standard invoice or Deposit invoice created from a Predefined invoice
-	if (($_POST['type'] == 0 || $_POST['type'] == 3) && $_POST['fac_rec'] > 0)
+	if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT) && $_POST['fac_rec'] > 0)
 	{
 		$dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 		if (empty($dateinvoice))
@@ -766,7 +802,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 	}
 
 	// Standard or deposit or proforma invoice
-	if (($_POST['type'] == 0 || $_POST['type'] == 3 || $_POST['type'] == 4) && $_POST['fac_rec'] <= 0)
+	if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT || $_POST['type'] == Facture::TYPE_PROFORMA) && $_POST['fac_rec'] <= 0)
 	{
 		if (GETPOST('socid', 'int') < 1)
 		{
@@ -796,6 +832,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 			$object->fk_project			= $_POST['projectid'];
 			$object->cond_reglement_id	= ($_POST['type'] == 3?1:$_POST['cond_reglement_id']);
 			$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+            $object->fk_account         = GETPOST('fk_account', 'int');
 			$object->amount				= $_POST['amount'];
 			$object->remise_absolue		= $_POST['remise_absolue'];
 			$object->remise_percent		= $_POST['remise_percent'];
@@ -803,11 +840,11 @@ else if ($action == 'add' && $user->rights->facture->creer)
 			$object->fetch_thirdparty();
 
 			// If creation from another object of another module (Example: origin=propal, originid=1)
-			if ($_POST['origin'] && $_POST['originid'])
+			if ($origin && $originid)
 			{
 				// Parse element/subelement (ex: project_task)
-				$element = $subelement = $_POST['origin'];
-				if (preg_match('/^([^_]+)_([^_]+)/i', $_POST['origin'], $regs)) {
+				$element = $subelement = $origin;
+				if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
 					$element = $regs [1];
 					$subelement = $regs [2];
 				}
@@ -830,12 +867,23 @@ else if ($action == 'add' && $user->rights->facture->creer)
 					$element = $subelement = 'expedition';
 				}
 
-				$object->origin = $_POST['origin'];
-				$object->origin_id = $_POST['originid'];
+				$object->origin = $origin;
+				$object->origin_id = $originid;
 
 				// Possibility to add external linked objects with hooks
-				$object->linked_objects [$object->origin] = $object->origin_id;
-				if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) {
+				$object->linked_objects[$object->origin] = $object->origin_id;
+				// link with order if it is a shipping invoice
+				if ($object->origin == 'shipping')
+				{
+					require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+					$exp = new Expedition($db);
+					$exp->fetch($object->origin_id);
+					$exp->fetchObjectLinked();
+					if (count($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0];
+				}
+
+				if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
+				{
 					$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
 				}
 
@@ -844,7 +892,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 				if ($id > 0)
 				{
 					// If deposit invoice
-					if ($_POST['type'] == 3)
+					if ($_POST['type'] == Facture::TYPE_DEPOSIT)
 					{
 						$typeamount = GETPOST('typedeposit', 'alpha');
 						$valuedeposit = GETPOST('valuedeposit', 'int');
@@ -881,7 +929,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 									$amountdeposit = ($totalamount * $valuedeposit) / 100;
 								}
 							} else {
-								$mesgs [] = $srcobject->error;
+								setEventMessage($srcobject->error, 'errors');
 								$error ++;
 							}
 						}
@@ -890,19 +938,19 @@ else if ($action == 'add' && $user->rights->facture->creer)
 								$langs->trans('Deposit'),
 								$amountdeposit,		 	// subprice
 								1, 						// quantity
-								$lines [$i]->tva_tx, 0, // localtax1_tx
+								$lines[$i]->tva_tx, 0, // localtax1_tx
 								0, 						// localtax2_tx
 								0, 						// fk_product
 								0, 						// remise_percent
 								0, 						// date_start
 								0, 						// date_end
-								0, $lines [$i]->info_bits, // info_bits
+								0, $lines[$i]->info_bits, // info_bits
 								0, 						// info_bits
 								'HT',
 								0,
 								0, 						// product_type
 								1,
-								$lines [$i]->special_code,
+								$lines[$i]->special_code,
 								$object->origin,
 								0,
 								0,
@@ -934,62 +982,65 @@ else if ($action == 'add' && $user->rights->facture->creer)
 							$num=count($lines);
 							for ($i=0;$i<$num;$i++)
 							{
+								// Don't add lines with qty 0 when coming from a shipment including all order lines
+								if($srcobject->element == 'shipping' && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS && $lines[$i]->qty == 0) continue;
+
 								$label=(! empty($lines[$i]->label)?$lines[$i]->label:'');
 								$desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle);
 
-								if ($lines [$i]->subprice < 0)
+								if ($lines[$i]->subprice < 0)
 								{
 									// Negative line, we create a discount line
 									$discount = new DiscountAbsolute($db);
 									$discount->fk_soc = $object->socid;
-									$discount->amount_ht = abs($lines [$i]->total_ht);
-									$discount->amount_tva = abs($lines [$i]->total_tva);
-									$discount->amount_ttc = abs($lines [$i]->total_ttc);
-									$discount->tva_tx = $lines [$i]->tva_tx;
+									$discount->amount_ht = abs($lines[$i]->total_ht);
+									$discount->amount_tva = abs($lines[$i]->total_tva);
+									$discount->amount_ttc = abs($lines[$i]->total_ttc);
+									$discount->tva_tx = $lines[$i]->tva_tx;
 									$discount->fk_user = $user->id;
 									$discount->description = $desc;
 									$discountid = $discount->create($user);
 									if ($discountid > 0) {
 										$result = $object->insert_discount($discountid); // This include link_to_invoice
 									} else {
-										$mesgs [] = $discount->error;
+										setEventMessage($discount->error, 'errors');
 										$error ++;
 										break;
 									}
 								} else {
 									// Positive line
-									$product_type = ($lines [$i]->product_type ? $lines [$i]->product_type : 0);
+									$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 
 									// Date start
 									$date_start = false;
-									if ($lines [$i]->date_debut_prevue)
-										$date_start = $lines [$i]->date_debut_prevue;
-									if ($lines [$i]->date_debut_reel)
-										$date_start = $lines [$i]->date_debut_reel;
-									if ($lines [$i]->date_start)
-										$date_start = $lines [$i]->date_start;
+									if ($lines[$i]->date_debut_prevue)
+										$date_start = $lines[$i]->date_debut_prevue;
+									if ($lines[$i]->date_debut_reel)
+										$date_start = $lines[$i]->date_debut_reel;
+									if ($lines[$i]->date_start)
+										$date_start = $lines[$i]->date_start;
 
 										// Date end
 									$date_end = false;
-									if ($lines [$i]->date_fin_prevue)
-										$date_end = $lines [$i]->date_fin_prevue;
-									if ($lines [$i]->date_fin_reel)
-										$date_end = $lines [$i]->date_fin_reel;
-									if ($lines [$i]->date_end)
-										$date_end = $lines [$i]->date_end;
+									if ($lines[$i]->date_fin_prevue)
+										$date_end = $lines[$i]->date_fin_prevue;
+									if ($lines[$i]->date_fin_reel)
+										$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) {
+									if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
 										$fk_parent_line = 0;
 									}
 
 									// Extrafields
-									if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines [$i], 'fetch_optionals')) {
-										$lines [$i]->fetch_optionals($lines [$i]->rowid);
-										$array_option = $lines [$i]->array_options;
+									if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
+										$lines[$i]->fetch_optionals($lines[$i]->rowid);
+										$array_option = $lines[$i]->array_options;
 									}
 
-									$result = $object->addline($desc, $lines [$i]->subprice, $lines [$i]->qty, $lines [$i]->tva_tx, $lines [$i]->localtax1_tx, $lines [$i]->localtax2_tx, $lines [$i]->fk_product, $lines [$i]->remise_percent, $date_start, $date_end, 0, $lines [$i]->info_bits, $lines [$i]->fk_remise_except, 'HT', 0, $product_type, $lines [$i]->rang, $lines [$i]->special_code, $object->origin, $lines [$i]->rowid, $fk_parent_line, $lines [$i]->fk_fournprice, $lines [$i]->pa_ht, $label, $array_option);
+									$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option);
 
 									if ($result > 0) {
 										$lineid = $result;
@@ -1000,7 +1051,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
 									}
 
 									// Defined the new fk_parent_line
-									if ($result > 0 && $lines [$i]->product_type == 9) {
+									if ($result > 0 && $lines[$i]->product_type == 9) {
 										$fk_parent_line = $result;
 									}
 								}
@@ -1013,12 +1064,12 @@ else if ($action == 'add' && $user->rights->facture->creer)
 							if ($reshook < 0)
 								$error ++;
 						} else {
-							$mesgs [] = $srcobject->error;
+							setEventMessage($srcobject->error, 'errors');
 							$error ++;
 						}
 					}
 				} else {
-					$mesgs [] = $object->error;
+					setEventMessage($object->error, 'errors');
 					$error ++;
 				}
 			} 			// If some invoice's lines already known
@@ -1049,9 +1100,9 @@ else if ($action == 'add' && $user->rights->facture->creer)
 	{
 		$db->rollback();
 		$action = 'create';
-		$_GET ["origin"] = $_POST["origin"];
-		$_GET ["originid"] = $_POST["originid"];
-		$mesgs [] = '<div class="error">' . $object->error . '</div>';
+		$_GET["origin"] = $_POST["origin"];
+		$_GET["originid"] = $_POST["originid"];
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -1112,7 +1163,11 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 		setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
 		$error ++;
 	}
-
+	if ($qty < 0) {
+		$langs->load("errors");
+		setEventMessage($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), 'errors');
+		$error ++;
+	}
 	if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod))) {
 		$ret = $object->fetch($id);
 		if ($ret < 0) {
@@ -1141,18 +1196,22 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 			$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
 
 			// Update if prices fields are defined
-				$tva_tx = get_default_tva($mysoc, $object->client, $prod->id);
-				$tva_npr = get_default_npr($mysoc, $object->client, $prod->id);
+				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+				$pu_ht = $prod->price;
+				$pu_ttc = $prod->price_ttc;
+				$price_min = $prod->price_min;
+				$price_base_type = $prod->price_base_type;
 
 				// We define price for product
-				if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->client->price_level))
+				if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
 				{
-					$pu_ht = $prod->multiprices[$object->client->price_level];
-					$pu_ttc = $prod->multiprices_ttc[$object->client->price_level];
-					$price_min = $prod->multiprices_min[$object->client->price_level];
-					$price_base_type = $prod->multiprices_base_type[$object->client->price_level];
-					if (isset($prod->multiprices_tva_tx[$object->client->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->client->price_level];
-					if (isset($prod->multiprices_recuperableonly[$object->client->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->client->price_level];
+					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+					if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+					if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 				}
 				elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
@@ -1163,30 +1222,15 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 					$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result >= 0) {
+					if ($result) {
 						if (count($prodcustprice->lines) > 0) {
-							$found = true;
-							$pu_ht = price($prodcustprice->lines[0]->price);
-							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-							$price_base_type = $prodcustprice->lines[0]->price_base_type;
-							$prod->tva_tx = $prodcustprice->lines[0]->tva_tx;
-						}else {
-							$pu_ht = $prod->price;
-							$pu_ttc = $prod->price_ttc;
-							$price_min = $prod->price_min;
-							$price_base_type = $prod->price_base_type;
+							$pu_ht = price($prodcustprice->lines [0]->price);
+							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+							$price_base_type = $prodcustprice->lines [0]->price_base_type;
+							$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
 						}
-					} else {
-						setEventMessage($prodcustprice->error,'errors');
 					}
 				}
-				else
-				{
-					$pu_ht = $prod->price;
-					$pu_ttc = $prod->price_ttc;
-					$price_min = $prod->price_min;
-					$price_base_type = $prod->price_base_type;
-				}
 
 				// if price ht is forced (ie: calculated by margin rate and cost price)
 				if (! empty($price_ht)) {
@@ -1213,7 +1257,7 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 					if (empty($newlang) && GETPOST('lang_id'))
 						$newlang = GETPOST('lang_id');
 					if (empty($newlang))
-						$newlang = $object->client->default_lang;
+						$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1255,8 +1299,8 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 		$buyingprice = price2num(GETPOST('buying_price' . $predef) ? GETPOST('buying_price' . $predef) : '');
 
 		// Local Taxes
-		$localtax1_tx = get_localtax($tva_tx, 1, $object->client);
-		$localtax2_tx = get_localtax($tva_tx, 2, $object->client);
+		$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
+		$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
 		$info_bits = 0;
 		if ($tva_npr)
@@ -1269,23 +1313,26 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 			// Insert line
 			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option);
 
-			if ($result > 0) {
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-					// Define output language
+			if ($result > 0)
+			{
+				// Define output language
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+				{
 					$outputlangs = $langs;
-					$newlang = GETPOST('lang_id', 'alpha');
-					if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
-						$newlang = $object->client->default_lang;
+					$newlang = '';
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 					if (! empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-
+					$model=$object->modelpdf;
 					$ret = $object->fetch($id); // Reload to get new records
-					facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
-				unset($_POST ['prod_entry_mode']);
+				unset($_POST['prod_entry_mode']);
 
 				unset($_POST['qty']);
 				unset($_POST['type']);
@@ -1324,9 +1371,9 @@ else if ($action == 'addline' && $user->rights->facture->creer)
 	}
 }
 
-elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('cancel')) {
-	if (! $object->fetch($id) > 0)
-		dol_print_error($db);
+elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('cancel'))
+{
+	if (! $object->fetch($id) > 0)	dol_print_error($db);
 	$object->fetch_thirdparty();
 
 	// Clean parameters
@@ -1337,6 +1384,7 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 	$description = dol_htmlcleanlastbr(GETPOST('product_desc'));
 	$pu_ht = GETPOST('price_ht');
 	$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+	$qty = GETPOST('qty');
 
 	// Define info_bits
 	$info_bits = 0;
@@ -1345,8 +1393,8 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 
 		// Define vat_rate
 	$vat_rate = str_replace('*', '', $vat_rate);
-	$localtax1_rate = get_localtax($vat_rate, 1, $object->client);
-	$localtax2_rate = get_localtax($vat_rate, 2, $object->client);
+	$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
+	$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
 
 	// Add buying price
 	$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
@@ -1373,8 +1421,8 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 		$type = $product->type;
 
 		$price_min = $product->price_min;
-		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->client->price_level))
-			$price_min = $product->multiprices_min [$object->client->price_level];
+		if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+			$price_min = $product->multiprices_min [$object->thirdparty->price_level];
 
 		$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
@@ -1393,10 +1441,15 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 			$error ++;
 		}
 	}
+	if ($qty < 0) {
+		$langs->load("errors");
+		setEventMessage($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), 'errors');
+		$error ++;
+	}
 
 	// Update line
 	if (! $error) {
-		$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option);
+		$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option);
 
 		if ($result >= 0) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -1406,14 +1459,14 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id'))
 					$newlang = GETPOST('lang_id');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-					$newlang = $object->client->default_lang;
+					$newlang = $object->thirdparty->default_lang;
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
 
 				$ret = $object->fetch($id); // Reload to get new records
-				facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
 			unset($_POST['qty']);
@@ -1428,6 +1481,8 @@ elseif ($action == 'updateligne' && $user->rights->facture->creer && ! GETPOST('
 			unset($_POST['product_desc']);
 			unset($_POST['fournprice']);
 			unset($_POST['buying_price']);
+			unset($_POST['np_marginRate']);
+			unset($_POST['np_markRate']);
 		} else {
 			setEventMessage($object->error, 'errors');
 		}
@@ -1451,13 +1506,14 @@ else if ($action == 'up' && $user->rights->facture->creer) {
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
 		$newlang = $_REQUEST['lang_id'];
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-		$newlang = $object->client->default_lang;
+		$newlang = $object->thirdparty->default_lang;
 	if (! empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
 
 	header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '#' . $_GET ['rowid']);
 	exit();
@@ -1473,13 +1529,14 @@ else if ($action == 'down' && $user->rights->facture->creer) {
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
 		$newlang = $_REQUEST['lang_id'];
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-		$newlang = $object->client->default_lang;
+		$newlang = $object->thirdparty->default_lang;
 	if (! empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
 
 	header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '#' . $_GET ['rowid']);
 	exit();
@@ -1492,195 +1549,24 @@ if (GETPOST('linkedOrder')) {
 	$result = $object->add_object_linked('commande', GETPOST('linkedOrder'));
 }
 
-/*
- * Add file in email form
- */
-if (GETPOST('addfile')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-	// Set tmp user directory
-	$vardir = $conf->user->dir_output . "/" . $user->id;
-	$upload_dir_tmp = $vardir . '/temp';
-
-	dol_add_file_process($upload_dir_tmp, 0, 0);
-	$action = 'presend';
-}
-
-/*
- * Remove file in email form
- */
-if (! empty($_POST['removedfile'])) {
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-	// Set tmp user directory
-	$vardir = $conf->user->dir_output . "/" . $user->id;
-	$upload_dir_tmp = $vardir . '/temp';
-
-	// TODO Delete only files that was uploaded from email form
-	dol_remove_file_process($_POST['removedfile'], 0);
-	$action = 'presend';
-}
 
 /*
  * Send mail
  */
-if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel']) {
-	$langs->load('mails');
 
-	$actiontypecode = '';
-	$subject = '';
-	$actionmsg = '';
-	$actionmsg2 = '';
+// Actions to send emails
+if (empty($id)) $id=$facid;
+$actiontypecode='AC_FAC';
+$trigger_name='BILL_SENTBYMAIL';
+$paramname='id';
+$mode='emailfrominvoice';
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-	$result = $object->fetch($id);
-	$result = $object->fetch_thirdparty();
-
-	if ($result > 0) {
-		// $ref = dol_sanitizeFileName($object->ref);
-		// $file = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-
-		// if (is_readable($file))
-		// {
-		if ($_POST['sendto']) {
-			// Le destinataire a ete fourni via le champ libre
-			$sendto = $_POST['sendto'];
-			$sendtoid = 0;
-		} elseif ($_POST['receiver'] != '-1') {
-			// Recipient was provided from combo list
-			if ($_POST['receiver'] == 'thirdparty') 			// Id of third party
-			{
-				$sendto = $object->client->email;
-				$sendtoid = 0;
-			} else 			// Id du contact
-			{
-				$sendto = $object->client->contact_get_property($_POST['receiver'], 'email');
-				$sendtoid = $_POST['receiver'];
-			}
-		}
-
-		if (dol_strlen($sendto)) {
-			$langs->load("commercial");
-
-			$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
-			$replyto = $_POST['replytoname'] . ' <' . $_POST['replytomail'] . '>';
-			$message = $_POST['message'];
-			$sendtocc = $_POST['sendtocc'];
-			$deliveryreceipt = $_POST['deliveryreceipt'];
-
-			if ($action == 'send') {
-				if (dol_strlen($_POST['subject']))
-					$subject = $_POST['subject'];
-				else
-					$subject = $langs->transnoentities('Bill') . ' ' . $object->ref;
-				$actiontypecode = 'AC_FAC';
-				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
-				if ($message) {
-					$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-					$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-					$actionmsg .= $message;
-				}
-				// $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-			}
-			if ($action == 'relance') {
-				if (dol_strlen($_POST['subject']))
-					$subject = $_POST['subject'];
-				else
-					$subject = $langs->transnoentities('Relance facture ' . $object->ref);
-				$actiontypecode = 'AC_FAC';
-				$actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto . ".\n";
-				if ($message) {
-					$actionmsg .= $langs->transnoentities('MailTopic') . ": " . $subject . "\n";
-					$actionmsg .= $langs->transnoentities('TextUsedInTheMessageBody') . ":\n";
-					$actionmsg .= $message;
-				}
-				// $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-			}
-
-			// Create form object
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-
-			$attachedfiles = $formmail->get_attached_files();
-			$filepath = $attachedfiles ['paths'];
-			$filename = $attachedfiles ['names'];
-			$mimetype = $attachedfiles ['mimes'];
-
-			// Send mail
-			require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, - 1);
-			if ($mailfile->error) {
-				$mesgs [] = '<div class="error">' . $mailfile->error . '</div>';
-			} else {
-				$result = $mailfile->sendfile();
-				if ($result) {
-					$error = 0;
-
-					// Initialisation donnees
-					$object->sendtoid = $sendtoid;
-					$object->actiontypecode = $actiontypecode;
-					$object->actionmsg = $actionmsg; // Long text
-					$object->actionmsg2 = $actionmsg2; // Short text
-					$object->fk_element = $object->id;
-					$object->elementtype = $object->element;
-
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface = new Interfaces($db);
-					$result = $interface->run_triggers('BILL_SENTBYMAIL', $object, $user, $langs, $conf);
-					if ($result < 0) {
-						$error++;
-						$object->errors = $interface->errors;
-					}
-					// Fin appel triggers
-
-					if ($error) {
-						dol_print_error($db);
-					} else {
-						// Redirect here
-						// This avoid sending mail twice if going out and then back to page
-						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
-						setEventMessage($mesg);
-						header('Location: ' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id);
-						exit();
-					}
-				} else {
-					$langs->load("other");
-					$mesg = '<div class="error">';
-					if ($mailfile->error) {
-						$mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
-						$mesg .= '<br>' . $mailfile->error;
-					} else {
-						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-					}
-					$mesg .= '</div>';
-					$mesgs [] = $mesg;
-				}
-			}
-			/*            }
-			 else
-			{
-			$langs->load("other");
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').'</div>';
-			dol_syslog('Recipient email is empty');
-			}*/
-		} else {
-			$langs->load("errors");
-			$mesgs [] = '<div class="error">' . $langs->trans('ErrorCantReadFile', $file) . '</div>';
-			dol_syslog('Failed to read file: ' . $file);
-		}
-	} else {
-		$langs->load("other");
-		$mesgs [] = '<div class="error">' . $langs->trans('ErrorFailedToReadEntity', $langs->trans("Invoice")) . '</div>';
-		dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
-	}
-
-	$action = 'presend';
-}
 
 /*
  * Generate document
  */
-else if ($action == 'builddoc') // En get ou en post
+if ($action == 'builddoc') // En get ou en post
 {
 	$object->fetch($id);
 	$object->fetch_thirdparty();
@@ -1695,13 +1581,13 @@ else if ($action == 'builddoc') // En get ou en post
 	$outputlangs = $langs;
 	$newlang = '';
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->client->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang = $object->thirdparty->default_lang;
 	if (! empty($newlang))
 	{
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	$result = facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	if ($result <= 0)
 	{
 		dol_print_error($db, $result);
@@ -1728,17 +1614,12 @@ 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) {
-	if ($action == 'addcontact') {
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer)
+{
+	if ($action == 'addcontact')
+	{
 		$result = $object->fetch($id);
 
 		if ($result > 0 && $id > 0) {
@@ -1752,9 +1633,9 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture-
 		} else {
 			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$langs->load("errors");
-				$mesgs [] = '<div class="error">' . $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType") . '</div>';
+				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 			} else {
-				$mesgs [] = '<div class="error">' . $object->error . '</div>';
+				setEventMessage($object->error, 'errors');
 			}
 		}
 	}
@@ -1844,6 +1725,7 @@ if ($action == 'create')
 	if ($socid > 0)
 		$res = $soc->fetch($socid);
 
+	// Load objectsrc
 	if (! empty($origin) && ! empty($originid))
 	{
 		// Parse element/subelement (ex: project_task)
@@ -1883,13 +1765,14 @@ if ($action == 'create')
 			$projectid = (! empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
 			$ref_client = (! empty($objectsrc->ref_client) ? $objectsrc->ref_client : '');
 			$ref_int = (! empty($objectsrc->ref_int) ? $objectsrc->ref_int : '');
-	
+
 			// 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));
+            $fk_account         = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
 			$remise_percent 	= (! empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(! empty($soc->remise_percent)?$soc->remise_percent:0));
 			$remise_absolue 	= (! empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(! empty($soc->remise_absolue)?$soc->remise_absolue:0));
 			$dateinvoice		= (empty($dateinvoice)?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$dateinvoice);
@@ -1904,6 +1787,7 @@ if ($action == 'create')
 	{
 		$cond_reglement_id 	= $soc->cond_reglement_id;
 		$mode_reglement_id 	= $soc->mode_reglement_id;
+        $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)
@@ -2219,6 +2103,11 @@ if ($action == 'create')
 	$form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id', 'CRDT');
 	print '</td></tr>';
 
+    // Bank Account
+    print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+    $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+    print '</td></tr>';
+
 	// Project
 	if (! empty($conf->projet->enabled) && $socid > 0) {
 		$formproject = new FormProjets($db);
@@ -2257,10 +2146,9 @@ if ($action == 'create')
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
 	print $doleditor->Create(1);
 
-	// print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea></td></tr>';
-
 	// Private note
-	if (empty($user->societe_id)) {
+	if (empty($user->societe_id))
+	{
 		print '<tr>';
 		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
 		print '<td valign="top" colspan="2">';
@@ -2271,10 +2159,13 @@ if ($action == 'create')
 		}
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
 		print $doleditor->Create(1);
-		// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea></td></tr>';
+		// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
+		print '</td></tr>';
 	}
 
-	if (! empty($origin) && ! empty($originid) && is_object($objectsrc)) {
+	// Lines from source
+	if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
+	{
 		// TODO for compatibility
 		if ($origin == 'contrat') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
@@ -2298,16 +2189,27 @@ if ($action == 'create')
 			$newclassname = 'Order';
 		elseif ($newclassname == 'Expedition')
 			$newclassname = 'Sending';
+		elseif ($newclassname == 'Fichinter')
+			$newclassname = 'Intervention';
 
-		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1) . '</td></tr>';
+		print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2">' . $objectsrc->getNomUrl(1);
+		//We check if Origin document has already an invoice attached to it
+		$objectsrc->fetchObjectLinked($originid,'','','facture');
+		$cntinvoice=count($objectsrc->linkedObjects['facture']);
+		if ($cntinvoice>=1)
+		{
+		    setEventMessage('WarningBillExist','warnings');
+		    echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['facture'])->getNomUrl(1).')';
+		}
+		echo '</td></tr>';
 		print '<tr><td>' . $langs->trans('TotalHT') . '</td><td colspan="2">' . price($objectsrc->total_ht) . '</td></tr>';
 		print '<tr><td>' . $langs->trans('TotalVAT') . '</td><td colspan="2">' . price($objectsrc->total_tva) . "</td></tr>";
-		if ($mysoc->localtax1_assuj == "1") 		// Localtax1 RE
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1
 		{
 			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax1) . "</td></tr>";
 		}
 
-		if ($mysoc->localtax2_assuj == "1") 		// Localtax2 IRPF
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2
 		{
 			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td colspan="2">' . price($objectsrc->total_localtax2) . "</td></tr>";
 		}
@@ -2367,7 +2269,10 @@ if ($action == 'create')
 	print "</table>\n";
 
 	// Button "Create Draft"
-	print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '"></center>';
+	print '<br><center>';
+	print '<input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '">';
+	print '&nbsp;<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+	print '</center>';
 
 	print "</form>\n";
 
@@ -2897,16 +2802,16 @@ if ($action == 'create')
 	if ($object->type == Facture::TYPE_CREDIT_NOTE)
 		$sign = - 1;
 
-	$nbrows = 8;
+	$nbrows = 9;
 	$nbcols = 2;
 	if (! empty($conf->projet->enabled))
 		$nbrows ++;
 	if (! empty($conf->banque->enabled))
 		$nbcols ++;
 		// if (! empty($soc->outstandingbill)) $nbrows++;
-	if ($mysoc->localtax1_assuj == "1")
+	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0)
 		$nbrows ++;
-	if ($mysoc->localtax2_assuj == "1")
+	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0)
 		$nbrows ++;
 	if ($selleruserevenustamp)
 		$nbrows ++;
@@ -2950,7 +2855,7 @@ if ($action == 'create')
 				$objp = $db->fetch_object($result);
 				$var = ! $var;
 				print '<tr ' . $bc [$var] . '><td>';
-				print '<a href="' . DOL_URL_ROOT . '/compta/paiement/fiche.php?id=' . $objp->rowid . '">' . img_object($langs->trans('ShowPayment'), 'payment') . ' ';
+				print '<a href="' . DOL_URL_ROOT . '/compta/paiement/card.php?id=' . $objp->rowid . '">' . img_object($langs->trans('ShowPayment'), 'payment') . ' ';
 				print dol_print_date($db->jdate($objp->dp), 'day') . '</a></td>';
 				$label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label;
 				print '<td>' . $label . ' ' . $objp->num_paiement . '</td>';
@@ -3166,6 +3071,26 @@ if ($action == 'create')
 	}
 	print '</td></tr>';
 
+	// Bank Account
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('BankAccount');
+	print '<td>';
+	if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
+	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	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 "</td>";
+	print '</tr>';
+
 	// Amount
 	print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
 	print '<td align="right" colspan="3" nowrap>' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
@@ -3173,12 +3098,12 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Amount Local Taxes
-	if ($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) 	// Localtax1 (example RE)
+	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
 	{
 		print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
 		print '<td align="right" colspan="3" nowrap>' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 	}
-	if ($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) 	// Localtax2 (example IRPF)
+	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
 	{
 		print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
 		print '<td align="right" colspan="3" nowrap>' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
@@ -3242,51 +3167,9 @@ if ($action == 'create')
 		print '</tr>';
 	}
 
-	// Other attributes (TODO Move this into an include)
-	$res = $object->fetch_optionals($object->id, $extralabels);
-	$parameters = array('colspan' => ' colspan="2"');
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-	                                                                                      // hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-
-		foreach ($extrafields->attribute_label as $key => $label) {
-			if ($action == 'edit_extras') {
-				$value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options ["options_" . $key]);
-			} else {
-				$value = $object->array_options ["options_" . $key];
-			}
-			if ($extrafields->attribute_type [$key] == 'separate') {
-				print $extrafields->showSeparator($key);
-			} else {
-				print '<tr><td';
-				if (! empty($extrafields->attribute_required [$key]))
-					print ' class="fieldrequired"';
-				print '>' . $label . '</td><td colspan="5">';
-				// 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 ($action == 'edit_extras' && $user->rights->facture->creer && GETPOST('attribute') == $key) {
-					print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formsoc">';
-					print '<input type="hidden" name="action" value="update_extras">';
-					print '<input type="hidden" name="attribute" value="' . $key . '">';
-					print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-					print '<input type="hidden" name="id" value="' . $object->id . '">';
-
-					print $extrafields->showInputField($key, $value);
-
-					print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-					print '</form>';
-				} else {
-					print $extrafields->showOutputField($key, $value);
-					if ($object->statut == 0 && $user->rights->facture->creer)
-						print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . '</a>';
-				}
-				print '</td></tr>' . "\n";
-			}
-		}
-	}
+	// Other attributes
+	$cols = 5;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
 	print '</table><br>';
 
@@ -3428,7 +3311,7 @@ if ($action == 'create')
 					if ($resteapayer == 0) {
 						print '<div class="inline-block divButAction"><span class="butActionRefused" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid=' . $object->id . '&amp;action=create&amp;accountid='.$object->fk_account.'">' . $langs->trans('DoPayment') . '</a></div>';
 					}
 				}
 			}
@@ -3539,21 +3422,24 @@ if ($action == 'create')
 		// Linked object block
 		$somethingshown = $object->showLinkedObjectBlock();
 
-		if (empty($somethingshown) && ! empty($conf->commande->enabled))
+		$linktoelem='';
+
+		if (! empty($conf->commande->enabled))
 		{
-			print '<br><a href="#" id="linktoorder">' . $langs->trans('LinkedOrder') . '</a>';
+			$linktoelem.=($linktoelem?' &nbsp; ':'').'<a href="#" id="linktoorder">' . $langs->trans('LinkedOrder') . '</a>';
 
 			print '
 				<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery("#linktoorder").click(function() {
-						jQuery("#commande").toggle();
+						jQuery("#orderlist").toggle();
+						jQuery("#linktoorder").toggle();
 					});
 				});
 				</script>
 				';
 
-			print '<div id="commande" style="display:none">';
+			print '<div id="orderlist" style="display:none">';
 
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.client, c.rowid, c.ref, c.ref_client, c.total_ht";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
@@ -3561,11 +3447,12 @@ if ($action == 'create')
 			$sql .= ' WHERE c.fk_soc = s.rowid AND c.fk_soc = ' . $soc->id . '';
 
 			$resqlorderlist = $db->query($sql);
-			if ($resqlorderlist) {
+			if ($resqlorderlist)
+			{
 				$num = $db->num_rows($resqlorderlist);
 				$i = 0;
 
-				print '<form action="" method="POST" name="LinkedOrder">';
+				print '<br><form action="" method="POST" name="LinkedOrder">';
 				print '<table class="noborder">';
 				print '<tr class="liste_titre">';
 				print '<td class="nowrap"></td>';
@@ -3574,7 +3461,8 @@ if ($action == 'create')
 				print '<td align="left">' . $langs->trans("AmountHTShort") . '</td>';
 				print '<td align="left">' . $langs->trans("Company") . '</td>';
 				print '</tr>';
-				while ($i < $num) {
+				while ($i < $num)
+				{
 					$objp = $db->fetch_object($resqlorderlist);
 					if ($objp->socid == $soc->id) {
 						$var = ! $var;
@@ -3592,7 +3480,7 @@ if ($action == 'create')
 					$i ++;
 				}
 				print '</table>';
-				print '<br><center><input type="submit" class="button" value="' . $langs->trans('ToLink') . '"></center>';
+				print '<br><center><input type="submit" class="button" value="' . $langs->trans('ToLink') . '"> &nbsp; <input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></center>';
 				print '</form>';
 				$db->free($resqlorderlist);
 			} else {
@@ -3602,6 +3490,9 @@ if ($action == 'create')
 			print '</div>';
 		}
 
+		// Show link to elements
+		if ($linktoelem) print '<br>'.$linktoelem;
+
 		// Link for paypal payment
 		if (! empty($conf->paypal->enabled) && $object->statut != 0) {
 			include_once DOL_DOCUMENT_ROOT . '/paypal/lib/paypal.lib.php';
@@ -3616,11 +3507,15 @@ if ($action == 'create')
 		$somethingshown = $formactions->showactions($object, 'invoice', $socid);
 
 		print '</div></div></div>';
-	} else {
+	}
+	else
+	{
 		/*
-		 * Affiche formulaire mail
+		 * Action presend (or prerelance)
 		 */
 
+		$object->fetch_projet();
+
 		// By default if $action=='presend'
 		$titreform = 'SendBillByMail';
 		$topicmail = 'SendBillRef';
@@ -3640,21 +3535,24 @@ if ($action == 'create')
 		$fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref, '/'));
 		$file = $fileparams ['fullname'];
 
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->thirdparty->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('bills');
+		}
+
 		// Build document if it not exists
 		if (! $file || ! is_readable($file)) {
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->client->default_lang;
-			if (! empty($newlang)) {
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-
-			$result = facture_pdf_create($db, $object, GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0) {
 				dol_print_error($db, $result);
 				exit();
@@ -3669,6 +3567,7 @@ if ($action == 'create')
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
 		$formmail->fromtype = 'user';
 		$formmail->fromid = $user->id;
 		$formmail->fromname = $user->getFullName($langs);
@@ -3682,10 +3581,11 @@ if ($action == 'create')
 		$formmail->withtocc = $liste; // List suggested for CC
 		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
 		if (empty($object->ref_client)) {
-			$formmail->withtopic = $langs->transnoentities($topicmail, '__FACREF__');
+			$formmail->withtopic = $outputlangs->transnoentities($topicmail, '__FACREF__');
 		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $langs->transnoentities($topicmail, '__FACREF__(__REFCLIENT__)');
+			$formmail->withtopic = $outputlangs->transnoentities($topicmail, '__FACREF__ (__REFCLIENT__)');
 		}
+
 		$formmail->withfile = 2;
 		$formmail->withbody = 1;
 		$formmail->withdeliveryreceipt = 1;
@@ -3694,6 +3594,8 @@ if ($action == 'create')
 		$formmail->substit ['__FACREF__'] = $object->ref;
 		$formmail->substit ['__SIGNATURE__'] = $user->signature;
 		$formmail->substit ['__REFCLIENT__'] = $object->ref_client;
+		$formmail->substit ['__THIRPARTY_NAME__'] = $object->thirdparty->name;
+		$formmail->substit ['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
 		$formmail->substit ['__PERSONALIZED__'] = '';
 		$formmail->substit ['__CONTACTCIVNAME__'] = '';
 
@@ -3704,7 +3606,7 @@ if ($action == 'create')
 
 		if (is_array($contactarr) && count($contactarr) > 0) {
 			foreach ($contactarr as $contact) {
-				if ($contact ['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {
+				if ($contact ['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {	// TODO Use code and not label
 
 					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
 
@@ -3737,7 +3639,5 @@ if ($action == 'create')
 	}
 }
 
-dol_htmloutput_mesg('', $mesgs);
-
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 6da617b740c..6d60180593a 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -37,7 +37,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -70,7 +70,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
 print '<br>';
 
-$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 ccd208c7c6f..fd4284a01dd 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -38,7 +38,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -71,7 +71,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
 print_fiche_titre($langs->trans("BillsSetup"),$linkback,'setup');
 print '<br>';
 
-$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/admin/index.html b/htdocs/compta/facture/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 856640e306e..211d9241a8f 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -375,7 +375,7 @@ if ($id > 0 || ! empty($ref))
             {
                 $project = New Project($db);
                 $project->fetch($object->fk_project);
-                print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$object->fk_project.'">'.$project->title.'</a>';
+                print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'">'.$project->title.'</a>';
             }
             else
             {
@@ -398,7 +398,7 @@ if ($id > 0 || ! empty($ref))
 // Si fichier png PDF d'1 page trouve
 if (file_exists($fileimage))
 {
-    print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($relativepathimage).'">';
+    print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($relativepathimage).'">';
 }
 // Si fichier png PDF de plus d'1 page trouve
 elseif (file_exists($fileimagebis))
@@ -411,12 +411,12 @@ elseif (file_exists($fileimagebis))
 
         if (file_exists($dir_output.$preview))
         {
-            print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($preview).'"><p>';
+            print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufacture&file='.urlencode($preview).'"><p>';
         }
     }
 }
 
 
-$db->close();
-
 llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 7147f51c613..f6c0ab1a481 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -216,7 +216,7 @@ class FactureRec extends Facture
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 		$sql.= ' WHERE f.rowid='.$rowid;
 
-        dol_syslog("FactureRec::Fetch rowid=".$rowid." sql=".$sql, LOG_DEBUG);
+        dol_syslog("FactureRec::Fetch rowid=".$rowid."", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -269,7 +269,6 @@ class FactureRec extends Facture
 				if ($result < 0)
 				{
 					$this->error=$this->db->error();
-					dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 					return -3;
 				}
 				return 1;
@@ -284,7 +283,6 @@ class FactureRec extends Facture
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -359,7 +357,6 @@ class FactureRec extends Facture
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog('Facture::fetch_lines: Error '.$this->error, LOG_ERR);
 			return -3;
 		}
 	}
@@ -497,7 +494,7 @@ class FactureRec extends Facture
 			$sql.= ", ".$rang;
 			$sql.= ", ".$special_code.")";
 
-			dol_syslog(get_class($this)."::addline sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::addline", LOG_DEBUG);
 			if ($this->db->query($sql))
 			{
 				$this->id=$facid;
@@ -507,7 +504,6 @@ class FactureRec extends Facture
 			else
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("FactureRec::addline sql=".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1df0696486c..f81fb37849f 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -7,9 +7,9 @@
  * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
- * Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2012-2014 Christophe Battarel   <christophe.battarel@altairis.fr>
- * Copyright (C) 2012      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2013      Cedric Gross          <c.gross@kreiz-it.fr>
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
  *
@@ -34,9 +34,9 @@
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 
 
 /**
@@ -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;
@@ -103,6 +108,7 @@ class Facture extends CommonInvoice
 	var $cond_reglement_code;		// Code in llx_c_paiement
 	var $mode_reglement_id;			// Id in llx_c_paiement
 	var $mode_reglement_code;		// Code in llx_c_paiement
+    var $fk_account;                // Id of bank account
 	var $fk_bank;					// Field to store bank id to use when payment mode is withdraw
 	var $modelpdf;
 	var $products=array();	// deprecated
@@ -239,6 +245,7 @@ class Facture extends CommonInvoice
 		$sql.= ", note_private";
 		$sql.= ", note_public";
 		$sql.= ", ref_client, ref_int";
+        $sql.= ", fk_account";
 		$sql.= ", fk_facture_source, fk_user_author, fk_projet";
 		$sql.= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql.= ")";
@@ -256,6 +263,7 @@ class Facture extends CommonInvoice
 		$sql.= ",".($this->note_public?"'".$this->db->escape($this->note_public)."'":"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->fk_account>0?$this->fk_account:'NULL');
 		$sql.= ",".($this->fk_facture_source?"'".$this->db->escape($this->fk_facture_source)."'":"null");
 		$sql.= ",".($user->id > 0 ? "'".$user->id."'":"null");
 		$sql.= ",".($this->fk_project?$this->fk_project:"null");
@@ -263,7 +271,7 @@ class Facture extends CommonInvoice
 		$sql.= ",".$this->mode_reglement_id;
 		$sql.= ", '".$this->db->idate($datelim)."', '".$this->modelpdf."')";
 
-		dol_syslog(get_class($this)."::create sql=".$sql);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -273,7 +281,7 @@ class Facture extends CommonInvoice
 			$this->ref='(PROV'.$this->id.')';
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET facnumber='".$this->ref."' WHERE rowid=".$this->id;
 
-			dol_syslog(get_class($this)."::create sql=".$sql);
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql) $error++;
 
@@ -461,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'));
@@ -479,14 +489,10 @@ class Facture extends CommonInvoice
 					}
 					else if ($reshook < 0) $error++;
 
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('BILL_CREATE',$this,$user,$langs,$conf);
-					if ($result < 0) {
-						$error++; $this->errors=$interface->errors;
-					}
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('BILL_CREATE',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
 
 					if (! $error)
 					{
@@ -516,7 +522,6 @@ class Facture extends CommonInvoice
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::create error ".$this->error." sql=".$sql, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -600,6 +605,8 @@ class Facture extends CommonInvoice
 		// Load source object
 		$objFrom = dol_clone($this);
 
+
+
 		// Change socid if needed
 		if (! empty($socid) && $socid != $this->socid)
 		{
@@ -645,6 +652,18 @@ class Facture extends CommonInvoice
 		// Create clone
 		$result=$this->create($user);
 		if ($result < 0) $error++;
+		else {
+			// copy internal contacts
+			if ($this->copy_linked_contact($objFrom, 'internal') < 0)
+				$error++;
+
+			// copy external contacts if same company
+			elseif ($objFrom->socid == $this->socid)
+			{
+				if ($this->copy_linked_contact($objFrom, 'external') < 0)
+					$error++;
+			}
+		}
 
 		if (! $error)
 		{
@@ -657,14 +676,10 @@ class Facture extends CommonInvoice
 				if ($reshook < 0) $error++;
 			}
 
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('BILL_CLONE',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('BILL_CLONE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
 		}
 
 		// End
@@ -823,7 +838,6 @@ class Facture extends CommonInvoice
 		return $result;
 	}
 
-
 	/**
 	 *	Get object and lines from database
 	 *
@@ -849,6 +863,7 @@ class Facture extends CommonInvoice
 		$sql.= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf';
 		$sql.= ', f.fk_facture_source';
 		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet, f.extraparams';
+		$sql.= ', f.fk_account';
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
@@ -860,7 +875,7 @@ class Facture extends CommonInvoice
 		if ($ref_ext) $sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
 		if ($ref_int) $sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -899,6 +914,7 @@ class Facture extends CommonInvoice
 				$this->cond_reglement_code	= $obj->cond_reglement_code;
 				$this->cond_reglement		= $obj->cond_reglement_libelle;
 				$this->cond_reglement_doc	= $obj->cond_reglement_libelle_doc;
+				$this->fk_account           = ($obj->fk_account>0)?$obj->fk_account:null;
 				$this->fk_project			= $obj->fk_projet;
 				$this->fk_facture_source	= $obj->fk_facture_source;
 				$this->note					= $obj->note_private;	// deprecated
@@ -929,7 +945,6 @@ class Facture extends CommonInvoice
 				if ($result < 0)
 				{
 					$this->error=$this->db->error();
-					dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 					return -3;
 				}
 				return 1;
@@ -944,7 +959,6 @@ class Facture extends CommonInvoice
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -970,7 +984,7 @@ class Facture extends CommonInvoice
 		$sql.= ' WHERE l.fk_facture = '.$this->id;
 		$sql.= ' ORDER BY l.rang';
 
-		dol_syslog(get_class($this).'::fetch_lines sql='.$sql, LOG_DEBUG);
+		dol_syslog(get_class($this).'::fetch_lines', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -1030,7 +1044,6 @@ class Facture extends CommonInvoice
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this).'::fetch_lines '.$this->error,LOG_ERR);
 			return -3;
 		}
 	}
@@ -1043,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;
@@ -1103,7 +1116,7 @@ class Facture extends CommonInvoice
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -1113,14 +1126,10 @@ class Facture extends CommonInvoice
 		{
 			if (! $notrigger)
 			{
-				// Call triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('BILL_MODIFY',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// End call triggers
+	            // Call trigger
+	            $result=$this->call_trigger('BILL_MODIFY',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
 			}
 		}
 
@@ -1275,14 +1284,10 @@ class Facture extends CommonInvoice
 
 		if (! $error && ! $notrigger)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('BILL_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('BILL_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
 		}
 
 		// Removed extrafields
@@ -1325,11 +1330,10 @@ class Facture extends CommonInvoice
 				$sql.= ' SET fk_facture = NULL, fk_facture_line = NULL';
 				$sql.= ' WHERE fk_facture_line IN ('.join(',',$list_rowid_det).')';
 
-				dol_syslog(get_class($this)."::delete sql=".$sql);
+				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 				if (! $this->db->query($sql))
 				{
 					$this->error=$this->db->error()." sql=".$sql;
-					dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -5;
 				}
@@ -1358,9 +1362,15 @@ class Facture extends CommonInvoice
 
 			// Delete invoice line
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facturedet WHERE fk_facture = '.$rowid;
+
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+
 			if ($this->db->query($sql) && $this->delete_linked_contact())
 			{
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE rowid = '.$rowid;
+
+				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+
 				$resql=$this->db->query($sql);
 				if ($resql)
 				{
@@ -1398,7 +1408,6 @@ class Facture extends CommonInvoice
 				else
 				{
 					$this->error=$this->db->lasterror()." sql=".$sql;
-					dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -6;
 				}
@@ -1406,15 +1415,12 @@ class Facture extends CommonInvoice
 			else
 			{
 				$this->error=$this->db->lasterror()." sql=".$sql;
-				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -4;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -2;
 		}
@@ -1446,18 +1452,14 @@ class Facture extends CommonInvoice
 			if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'";
 			$sql.= ' WHERE rowid = '.$this->id;
 
-			dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_paid", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('BILL_PAYED',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
+	            // Call trigger
+	            $result=$this->call_trigger('BILL_PAYED',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
 			}
 			else
 			{
@@ -1502,18 +1504,14 @@ class Facture extends CommonInvoice
 		$sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
 		$sql.= ' WHERE rowid = '.$this->id;
 
-		dol_syslog(get_class($this)."::set_unpaid sql=".$sql);
+		dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('BILL_UNPAYED',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('BILL_UNPAYED',$user);
+            if ($result < 0) $error++;
+            // End call triggers
 		}
 		else
 		{
@@ -1573,18 +1571,14 @@ class Facture extends CommonInvoice
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('BILL_CANCEL',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++;
-					$this->errors=$interface->errors;
+	            // Call trigger
+	            $result=$this->call_trigger('BILL_CANCEL',$user);
+	            if ($result < 0)
+	            {
 					$this->db->rollback();
 					return -1;
-
 				}
-				// Fin appel triggers
+	            // End call triggers
 
 				$this->db->commit();
 				return 1;
@@ -1610,10 +1604,11 @@ 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
-	 * @return	int						<0 if KO, >0 if OK
+	 * @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
 	 */
-	function validate($user, $force_number='', $idwarehouse=0)
+	function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
 	{
 		global $conf,$langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -1701,6 +1696,7 @@ class Facture extends CommonInvoice
 		{
 			$num = $this->ref;
 		}
+		$this->newref = $num;
 
 		if ($num)
 		{
@@ -1716,11 +1712,10 @@ class Facture extends CommonInvoice
 			}
 			$sql.= ' WHERE rowid = '.$this->id;
 
-			dol_syslog(get_class($this)."::validate sql=".$sql);
+			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
-				dol_syslog(get_class($this)."::validate Echec update - 10 - sql=".$sql, LOG_ERR);
 				dol_print_error($this->db);
 				$error++;
 			}
@@ -1737,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");
@@ -1761,30 +1756,45 @@ class Facture extends CommonInvoice
 				}
 			}
 
+			// Trigger calls
+			if (! $error && ! $notrigger)
+			{
+	            // Call trigger
+	            $result=$this->call_trigger('BILL_VALIDATE',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
+			}
+
 			if (! $error)
 			{
-				$this->oldref = '';
+				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
 				if (preg_match('/^[\(]?PROV/i', $this->ref))
 				{
 					// Rename of object directory ($this->ref = old ref, $num = new ref)
 					// to  not lose the linked files
-					$facref = dol_sanitizeFileName($this->ref);
-					$snumfa = dol_sanitizeFileName($num);
-					$dirsource = $conf->facture->dir_output.'/'.$facref;
-					$dirdest = $conf->facture->dir_output.'/'.$snumfa;
+					$oldref = dol_sanitizeFileName($this->ref);
+					$newref = dol_sanitizeFileName($num);
+					$dirsource = $conf->facture->dir_output.'/'.$oldref;
+					$dirdest = $conf->facture->dir_output.'/'.$newref;
 					if (file_exists($dirsource))
 					{
 						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
 
 						if (@rename($dirsource, $dirdest))
 						{
-							$this->oldref = $facref;
-
 							dol_syslog("Rename ok");
-							// Suppression ancien fichier PDF dans nouveau rep
-							dol_delete_file($conf->facture->dir_output.'/'.$snumfa.'/'.$facref.'*.*');
+	                        // Rename docs starting with $oldref with $newref
+	                        $listoffiles=dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+	                        foreach($listoffiles as $fileentry)
+	                        {
+	                        	$dirsource=$fileentry['name'];
+	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
+	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+	                        	@rename($dirsource, $dirdest);
+	                        }
 						}
 					}
 				}
@@ -1799,19 +1809,6 @@ class Facture extends CommonInvoice
 				$this->brouillon=0;
 				$this->date_validation=$now;
 			}
-
-			// Trigger calls
-			if (! $error)
-			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('BILL_VALIDATE',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
-			}
 		}
 		else
 		{
@@ -1855,7 +1852,7 @@ class Facture extends CommonInvoice
 		$sql.= " SET fk_statut = 0";
 		$sql.= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::set_draft sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -1884,17 +1881,15 @@ class Facture extends CommonInvoice
 				$old_statut=$this->statut;
 				$this->brouillon = 1;
 				$this->statut = 0;
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('BILL_UNVALIDATE',$this,$user,$langs,$conf);
-				if ($result < 0) {
+	            // Call trigger
+	            $result=$this->call_trigger('BILL_UNVALIDATE',$user);
+	            if ($result < 0)
+				{
 					$error++;
-					$this->errors=$interface->errors;
 					$this->statut=$old_statut;
 					$this->brouillon=0;
 				}
-				// Fin appel triggers
+	            // End call triggers
 			} else {
 				$this->db->rollback();
 				return -1;
@@ -2002,7 +1997,7 @@ class Facture extends CommonInvoice
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 
 			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type);
 
@@ -2090,7 +2085,6 @@ class Facture extends CommonInvoice
 				else
 				{
 					$this->error=$this->db->error();
-					dol_syslog("Error sql=$sql, error=".$this->error,LOG_ERR);
 					$this->db->rollback();
 					return -1;
 				}
@@ -2161,7 +2155,7 @@ class Facture extends CommonInvoice
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty, $mysoc);
 
 			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type,'',$localtaxes_type);
 			$total_ht  = $tabprice[0];
@@ -2278,12 +2272,11 @@ class Facture extends CommonInvoice
 		$sql.= ' SET fk_facture_line = NULL';
 		$sql.= ' WHERE fk_facture_line = '.$rowid;
 
-		dol_syslog(get_class($this)."::deleteline sql=".$sql);
+		dol_syslog(get_class($this)."::deleteline", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if (! $result)
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::deleteline Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -2373,7 +2366,7 @@ class Facture extends CommonInvoice
 			$sql.= ' WHERE rowid = '.$this->id;
 			$sql.= ' AND fk_statut = 0';
 
-			dol_syslog(get_class($this)."::set_remise_absolue sql=$sql");
+			dol_syslog(get_class($this)."::set_remise_absolue", LOG_DEBUG);
 
 			if ($this->db->query($sql))
 			{
@@ -2418,7 +2411,7 @@ class Facture extends CommonInvoice
 		$sql.= ' AND p.fk_paiement = t.id';
 		if ($filtertype) $sql.=" AND t.code='PRE'";
 
-		dol_syslog(get_class($this)."::getListOfPayments sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2490,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
 	 */
@@ -2764,7 +2757,7 @@ class Facture extends CommonInvoice
 		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
 		$sql.= " ORDER BY f.facnumber";
 
-		dol_syslog(get_class($this)."::list_replacable_invoices sql=$sql");
+		dol_syslog(get_class($this)."::list_replacable_invoices", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2780,7 +2773,6 @@ class Facture extends CommonInvoice
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::list_replacable_invoices ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -2814,7 +2806,7 @@ class Facture extends CommonInvoice
 		if ($socid > 0) $sql.=" AND f.fk_soc = ".$socid;
 		$sql.= " ORDER BY f.facnumber";
 
-		dol_syslog(get_class($this)."::list_qualified_avoir_invoices sql=".$sql);
+		dol_syslog(get_class($this)."::list_qualified_avoir_invoices", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2836,7 +2828,6 @@ class Facture extends CommonInvoice
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::list_avoir_invoices ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -2850,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)
@@ -2863,7 +2856,7 @@ class Facture extends CommonInvoice
 			$sql.= ' WHERE fk_facture = '.$this->id;
 			$sql.= ' AND traite = 0';
 
-			dol_syslog(get_class($this)."::demande_prelevement sql=".$sql);
+			dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -2894,22 +2887,33 @@ class Facture extends CommonInvoice
                     $sql .= ",'".$bac->number."'";
                     $sql .= ",'".$bac->cle_rib."')";
 
-                    dol_syslog(get_class($this)."::demande_prelevement sql=".$sql);
-                    if ($this->db->query($sql))
+                    dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
+                    $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
@@ -3208,11 +3212,11 @@ class Facture extends CommonInvoice
 		$sql.= ' p.ref as product_ref, p.fk_product_type, p.label as product_label,';
 		$sql.= ' p.description as product_desc';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product p ON l.fk_product=p.rowid';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid';
 		$sql.= ' WHERE l.fk_facture = '.$this->id;
 		$sql.= ' ORDER BY l.rang ASC, l.rowid';
 
-		dol_syslog(get_class($this).'::getLinesArray sql='.$sql,LOG_DEBUG);
+		dol_syslog(get_class($this).'::getLinesArray',LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3262,21 +3266,55 @@ class Facture extends CommonInvoice
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog("Error sql=".$sql.", error=".$this->error,LOG_ERR);
 			return -1;
 		}
 	}
 
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *	@param	string		$modele			Force template to use ('' to not force)
+	 *	@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, >0 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+	{
+		global $conf,$user,$langs;
+
+		$langs->load("bills");
+
+		// Positionne le modele sur le nom du modele a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->FACTURE_ADDON_PDF))
+			{
+				$modele = $conf->global->FACTURE_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'crabe';
+			}
+		}
+
+		$modelpath = "core/modules/facture/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
+
+
 }
 
 
 
 /**
- *	\class      	FactureLigne
- *	\brief      	Classe permettant la gestion des lignes de factures
- *					Gere des lignes de la table llx_facturedet
+ *	Class to manage invoice lines.
+ *  Saved into database table llx_facturedet
  */
-class FactureLigne  extends CommonInvoiceLine
+class FactureLigne extends CommonInvoiceLine
 {
 	var $db;
 	var $error;
@@ -3485,7 +3523,7 @@ class FactureLigne  extends CommonInvoiceLine
 				return -1;
 			}
 		}
-		
+
 		// 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';
@@ -3534,7 +3572,7 @@ class FactureLigne  extends CommonInvoiceLine
 		$sql.= " ".price2num($this->total_localtax2);
 		$sql.= ')';
 
-		dol_syslog(get_class($this)."::insert sql=".$sql);
+		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -3600,18 +3638,14 @@ class FactureLigne  extends CommonInvoiceLine
 
 			if (! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result = $interface->run_triggers('LINEBILL_INSERT',$this,$user,$langs,$conf);
-				if ($result < 0)
-				{
-					$error++;
-					$this->errors=$interface->errors;
+                // Call trigger
+                $result=$this->call_trigger('LINEBILL_INSERT',$user);
+                if ($result < 0)
+                {
 					$this->db->rollback();
 					return -2;
 				}
-				// Fin appel triggers
+                // End call triggers
 			}
 
 			$this->db->commit();
@@ -3621,7 +3655,6 @@ class FactureLigne  extends CommonInvoiceLine
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -2;
 		}
@@ -3701,7 +3734,7 @@ class FactureLigne  extends CommonInvoiceLine
 		if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
 		$sql.= " WHERE rowid = ".$this->rowid;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -3717,18 +3750,14 @@ class FactureLigne  extends CommonInvoiceLine
 
 			if (! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result = $interface->run_triggers('LINEBILL_UPDATE',$this,$user,$langs,$conf);
-				if ($result < 0)
-				{
-					$error++;
-					$this->errors=$interface->errors;
+                // Call trigger
+                $result=$this->call_trigger('LINEBILL_UPDATE',$user);
+                if ($result < 0)
+ 				{
 					$this->db->rollback();
 					return -2;
 				}
-				// Fin appel triggers
+                // End call triggers
 			}
 			$this->db->commit();
 			return 1;
@@ -3736,7 +3765,6 @@ class FactureLigne  extends CommonInvoiceLine
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -2;
 		}
@@ -3755,31 +3783,26 @@ class FactureLigne  extends CommonInvoiceLine
 
 		$this->db->begin();
 
+		// Call trigger
+		$result=$this->call_trigger('LINEBILL_DELETE',$user);
+		if ($result < 0)
+		{
+			$this->db->rollback();
+			return -1;
+		}
+		// End call triggers
+
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid;
-		dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		if ($this->db->query($sql) )
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result = $interface->run_triggers('LINEBILL_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0)
-			{
-					$error++;
-					$this->errors=$interface->errors;
-					$this->db->rollback();
-					return -1;
-			}
-			// Fin appel triggers
-
 			$this->db->commit();
-
 			return 1;
 		}
 		else
 		{
 			$this->error=$this->db->error()." sql=".$sql;
-			dol_syslog(get_class($this)."::delete Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -3808,7 +3831,7 @@ class FactureLigne  extends CommonInvoiceLine
 		$sql.= ",total_ttc=".price2num($this->total_ttc)."";
 		$sql.= " WHERE rowid = ".$this->rowid;
 
-		dol_syslog(get_class($this)."::update_total sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -3819,7 +3842,6 @@ class FactureLigne  extends CommonInvoiceLine
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::update_total Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -2;
 		}
diff --git a/htdocs/compta/facture/class/index.html b/htdocs/compta/facture/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 62ebcbacdbd..b75bb056e03 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -119,7 +119,7 @@ class PaymentTerm // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -185,7 +185,7 @@ class PaymentTerm // extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
         $sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -213,7 +213,6 @@ class PaymentTerm // extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -235,7 +234,7 @@ class PaymentTerm // extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
         $sql.= " WHERE t.code = 'RECEP'";
 
-    	dol_syslog(get_class($this)."::getDefaultId sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -250,7 +249,6 @@ class PaymentTerm // extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::getDefaultId ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -263,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;
@@ -301,7 +299,7 @@ class PaymentTerm // extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -357,7 +355,7 @@ class PaymentTerm // extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index c3c629bc68d..8fe20cd66f6 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -127,7 +127,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 1929a8a3721..1fd4d2c80fc 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -32,7 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 $langs->load('bills');
 $langs->load('compta');
-$langs->load('products');
 
 // Security check
 $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
@@ -219,15 +218,18 @@ if ($action == 'create')
 			if ($num)
 			{
 				print '<tr class="liste_titre">';
-				print '<td width="54%">'.$langs->trans("Description").'</td>';
-				print '<td width="8%" align="center">'.$langs->trans("VAT").'</td>';
-				print '<td width="8%" align="center">'.$langs->trans("Qty").'</td>';
-				print '<td width="8%" align="right">'.$langs->trans("ReductionShort").'</td>';
-				print '<td width="12%" align="right">'.$langs->trans("PriceU").'</td>';
-				if (empty($conf->global->PRODUIT_MULTIPRICES)) print '<td width="12%" align="right">'.$langs->trans("CurrentProductPrice").'</td>';
+				print '<td>'.$langs->trans("Description").'</td>';
+				print '<td align="center">'.$langs->trans("VAT").'</td>';
+				print '<td align="center">'.$langs->trans("Qty").'</td>';
+				print '<td>'.$langs->trans("ReductionShort").'</td>';
+				print '<td align="right">'.$langs->trans("TotalHT").'</td>';
+				print '<td align="right">'.$langs->trans("TotalVAT").'</td>';
+				print '<td align="right">'.$langs->trans("TotalTTC").'</td>';
+				print '<td align="right">'.$langs->trans("PriceUHT").'</td>';
+				if (empty($conf->global->PRODUIT_MULTIPRICES)) print '<td align="right">'.$langs->trans("CurrentProductPrice").'</td>';
 				print "</tr>\n";
 			}
-			$var=True;
+			$var=true;
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($result);
@@ -290,9 +292,13 @@ if ($action == 'create')
 					print "</td>\n";
 				}
 
-
+				// Vat rate
 				print '<td align="center">'.vatrate($objp->tva_tx).'%</td>';
+
+				// Qty
 				print '<td align="center">'.$objp->qty.'</td>';
+
+				// Percent
 				if ($objp->remise_percent > 0)
 				{
 					print '<td align="right">'.$objp->remise_percent." %</td>\n";
@@ -302,9 +308,19 @@ if ($action == 'create')
 					print '<td>&nbsp;</td>';
 				}
 
+				// Total HT
+				print '<td align="right">'.price($objp->total_ht)."</td>\n";
+
+				// Total VAT
+				print '<td align="right">'.price($objp->total_vat)."</td>\n";
+
+				// Total TTC
+				print '<td align="right">'.price($objp->total_ttc)."</td>\n";
+
+				// Total Unit price
 				print '<td align="right">'.price($objp->subprice)."</td>\n";
 
-				// Price of product
+				// Current price of product
 				if (empty($conf->global->PRODUIT_MULTIPRICES))
 				{
 					if ($objp->fk_product > 0)
@@ -432,7 +448,7 @@ else
 
 			$num = count($object->lines);
 			$i = 0;
-			$var=True;
+			$var=true;
 			while ($i < $num)
 			{
 				$var=!$var;
@@ -507,9 +523,14 @@ else
 			 */
 			print '<div class="tabsAction">';
 
+			if ($object->statut == 0 && $user->rights->facture->creer)
+			{
+			    	echo '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$object->thirdparty->id.'&amp;fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
+			}
+
 			if ($object->statut == 0 && $user->rights->facture->supprimer)
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a>';
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
 			}
 
 			print '</div>';
@@ -524,7 +545,7 @@ else
 		/*
 		 *  List mode
 		 */
-		$sql = "SELECT s.nom, s.rowid as socid, f.titre, f.total, f.rowid as facid";
+		$sql = "SELECT s.nom as name, s.rowid as socid, f.titre, f.total, f.rowid as facid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 		$sql.= " WHERE f.fk_soc = s.rowid";
 		$sql.= " AND f.entity = ".$conf->entity;
@@ -552,7 +573,7 @@ else
 
 			if ($num > 0)
 			{
-				$var=True;
+				$var=true;
 				while ($i < min($num,$limit))
 				{
 					$objp = $db->fetch_object($resql);
@@ -564,28 +585,23 @@ else
 					print "</a></td>\n";
 
 					$companystatic->id=$objp->socid;
-					$companystatic->name=$objp->nom;
+					$companystatic->name=$objp->name;
 					print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
 
 					print '<td align="right">'.price($objp->total).'</td>'."\n";
 
-					if (! $objp->paye)
+					echo '<td align="center">';
+
+					if ($user->rights->facture->creer)
 					{
-						if ($objp->fk_statut == 0)
-						{
-							print '<td align="right">'.$langs->trans("Draft").'</td>';
-						}
-						else
-						{
-							print '<td align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/list.php?filtre=paye:0,fk_statut:1">'.$langs->trans("Validated").'</a></td>';
-						}
+                        echo '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
+                        echo  $langs->trans("CreateBill"),'</a>';
 					}
 					else
 					{
-						print '<td>&nbsp;</td>';
+					    echo "&nbsp;";
 					}
-
-					print "</tr>\n";
+					echo "</td></tr>\n";
 					$i++;
 				}
 			}
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index d009216bc86..a010e7d7401 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -121,6 +121,7 @@ if ($action == 'presend' && GETPOST('sendmail'))
 						$subject = GETPOST('subject');
 						$message = GETPOST('message');
 						$sendtocc = GETPOST('sentocc');
+						$sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO);
 
 						$substitutionarray=array(
 							'__ID__' => $object->id,
@@ -135,12 +136,13 @@ if ($action == 'presend' && GETPOST('sendmail'))
 						$message=make_substitutions($message, $substitutionarray);
 
 						$actiontypecode='AC_FAC';
-						$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+						$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 						if ($message)
 						{
-							$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-							$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-							$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);
 						}
 
 						// Create form object
@@ -151,7 +153,7 @@ if ($action == 'presend' && GETPOST('sendmail'))
 
 						// Send mail
 						require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
-						$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+						$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
 						if ($mailfile->error)
 						{
 							$resultmasssend.='<div class="error">'.$mailfile->error.'</div>';
@@ -366,10 +368,22 @@ $now=dol_now();
 $search_ref = GETPOST("search_ref");
 $search_refcustomer=GETPOST('search_refcustomer');
 $search_societe = GETPOST("search_societe");
+$search_paymentmode = GETPOST("search_paymentmode");
 $search_montant_ht = GETPOST("search_montant_ht");
 $search_montant_ttc = GETPOST("search_montant_ttc");
 $late = GETPOST("late");
 
+// Do we click on purge search criteria ?
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref='';
+    $search_refcustomer='';
+    $search_societe='';
+    $search_paymentmode='';
+    $search_montant_ht='';
+    $search_montant_ttc='';
+}
+
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -382,10 +396,10 @@ if (! $sortorder) $sortorder="ASC";
 
 $limit = $conf->liste_limit;
 
-$sql = "SELECT s.nom, s.rowid as socid, s.email";
+$sql = "SELECT s.nom as name, s.rowid as socid, s.email";
 $sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp";
 $sql.= ", f.datef as df, f.date_lim_reglement as datelimite";
-$sql.= ", f.paye as paye, f.fk_statut, f.type";
+$sql.= ", f.paye as paye, f.fk_statut, f.type, f.fk_mode_reglement";
 $sql.= ", sum(pf.amount) as am";
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -411,10 +425,12 @@ if (GETPOST('filtre'))
 if ($search_ref)         $sql .= " AND f.facnumber LIKE '%".$db->escape($search_ref)."%'";
 if ($search_refcustomer) $sql .= " AND f.ref_client LIKE '%".$db->escape($search_refcustomer)."%'";
 if ($search_societe)     $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'";
+if ($search_paymentmode)     $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
 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);
@@ -440,6 +456,7 @@ if ($resql)
 	if ($search_ref)         $param.='&amp;search_ref='.urlencode($search_ref);
     	if ($search_refcustomer) $param.='&amp;search_ref='.urlencode($search_refcustomer);
 	if ($search_societe)     $param.='&amp;search_societe='.urlencode($search_societe);
+	if ($search_societe)     $param.='&amp;search_paymentmode='.urlencode($search_paymentmode);
 	if ($search_montant_ht)  $param.='&amp;search_montant_ht='.urlencode($search_montant_ht);
 	if ($search_montant_ttc) $param.='&amp;search_montant_ttc='.urlencode($search_montant_ttc);
 	if ($late)               $param.='&amp;late='.urlencode($late);
@@ -447,7 +464,7 @@ if ($resql)
 	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	$urlsource.=str_replace('&amp;','&',$param);
 
-	$titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->nom):$langs->trans("BillsCustomersUnpaid"));
+	$titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid"));
 	if ($option == 'late') $titre.=' ('.$langs->trans("Late").')';
 	else $titre.=' ('.$langs->trans("All").')';
 
@@ -457,8 +474,6 @@ if ($resql)
 	print_fiche_titre($titre,$link);
 	//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0);	// We don't want pagination on this page
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<form id="form_unpaid" method="POST" action="'.$_SERVER["PHP_SELF"].'?sortfield='. $sortfield .'&sortorder='. $sortorder .'">';
 
 	if (! empty($mode) && $action == 'presend')
@@ -527,10 +542,11 @@ if ($resql)
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","",$param,"",$sortfield,$sortorder);
-    	print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'f.ref_client','',$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"f.fk_reglement_mode","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Taxes"),$_SERVER["PHP_SELF"],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
@@ -552,12 +568,15 @@ if ($resql)
 	// Ref
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'"></td>';
-        print '<td class="liste_titre">';
-        print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.$search_refcustomer.'">';
-        print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat" size="6" type="text" name="search_refcustomer" value="'.$search_refcustomer.'">';
+    print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="left"><input class="flat" type="text" size="10" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
+	print '<td class="liste_titre" align="left">';
+	$form->select_types_paiements($search_paymentmode, 'search_paymentmode');
+	print '</td>';
 	print '<td class="liste_titre" align="right"><input class="flat" type="text" size="8" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="right"><input class="flat" type="text" size="8" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'"></td>';
@@ -565,6 +584,7 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="right">';
 	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
 	if (empty($mode))
 	{
@@ -582,7 +602,7 @@ if ($resql)
 
 	if ($num > 0)
 	{
-		$var=True;
+		$var=true;
 		$total_ht=0;
 		$total_tva=0;
 		$total_ttc=0;
@@ -629,15 +649,28 @@ if ($resql)
 
 			print "</td>\n";
 
-	                // Customer ref
-	                print '<td class="nowrap">';
-	                print $objp->ref_client;
-	                print '</td>';
+			// Customer ref
+			print '<td class="nowrap">';
+			print $objp->ref_client;
+			print '</td>';
 
 			print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->df),'day').'</td>'."\n";
 			print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->datelimite),'day').'</td>'."\n";
 
-			print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,28).'</a></td>';
+            print '<td>';
+            $thirdparty=new Societe($db);
+            $thirdparty->id=$objp->socid;
+            $thirdparty->name=$objp->name;
+            $thirdparty->client=$objp->client;
+            $thirdparty->code_client=$objp->code_client;
+            print $thirdparty->getNomUrl(1,'customer');
+            print '</td>';
+
+            // Payment mode
+            print '<td>';
+            $form->form_modes_reglement($_SERVER['PHP_SELF'], $objp->fk_mode_reglement, 'none');
+            print '</td>';
+
 
 			print '<td align="right">'.price($objp->total_ht).'</td>';
 			print '<td align="right">'.price($objp->total_tva);
@@ -691,7 +724,7 @@ if ($resql)
 		}
 
 		print '<tr class="liste_total">';
-		print '<td colspan="5" align="left">'.$langs->trans("Total").'</td>';
+		print '<td colspan="6" align="left">'.$langs->trans("Total").'</td>';
 		print '<td align="right"><b>'.price($total_ht).'</b></td>';
 		print '<td align="right"><b>'.price($total_tva).'</b></td>';
 		print '<td align="right"><b>'.price($total_ttc).'</b></td>';
diff --git a/htdocs/compta/facture/index.html b/htdocs/compta/facture/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/compta/facture/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 3532125ed8e..56bd57c725a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -108,9 +108,10 @@ $now=dol_now();
 
 $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"))
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
     $search_categ='';
     $search_user='';
@@ -143,7 +144,7 @@ else $sql = 'SELECT DISTINCT';
 $sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc,';
 $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
 $sql.= ' f.paye as paye, f.fk_statut,';
-$sql.= ' s.nom, s.rowid as socid, s.code_client, s.client ';
+$sql.= ' s.nom as name, s.rowid as socid, s.code_client, s.client ';
 if (! $sall) $sql.= ', SUM(pf.amount) as am';   // To be able to sort on status
 $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql.= ', '.MAIN_DB_PREFIX.'facture as f';
@@ -264,7 +265,7 @@ if ($resql)
     if ($search_user > 0)    $param.='&search_user=' .$search_user;
     if ($search_montant_ht)  $param.='&search_montant_ht='.$search_montant_ht;
     if ($search_montant_ttc) $param.='&search_montant_ttc='.$search_montant_ttc;
-    print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->nom:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+    print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 
     $i = 0;
     print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -327,11 +328,12 @@ if ($resql)
     print '<td class="liste_titre" align="right"><input class="flat" type="text" size="10" name="search_montant_ttc" value="'.$search_montant_ttc.'"></td>';
     print '<td class="liste_titre" align="right">&nbsp;</td>';
     print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print "</td></tr>\n";
 
     if ($num > 0)
     {
-        $var=True;
+        $var=true;
         $total_ht=0;
         $total_tva=0;
         $total_ttc=0;
@@ -398,7 +400,7 @@ if ($resql)
             print '<td>';
             $thirdparty=new Societe($db);
             $thirdparty->id=$objp->socid;
-            $thirdparty->nom=$objp->nom;
+            $thirdparty->name=$objp->name;
             $thirdparty->client=$objp->client;
             $thirdparty->code_client=$objp->code_client;
             print $thirdparty->getNomUrl(1,'customer');
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 81505af34ee..1b4f440b461 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  *
  * 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
@@ -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 '</td>';
 	print '</tr>';
 
+	// Conditions de reglement
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('PaymentConditionsShort');
+	print '</td>';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	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 '&nbsp;';
+	}
+	print '</td></tr>';
+
 	// Date payment term
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -333,32 +359,7 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';
 
-	// Conditions de reglement
-	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('PaymentConditionsShort');
-	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	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 '&nbsp;';
-	}
-	print '</td></tr>';
-
-	// Mode de reglement
+	// Payment mode
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
@@ -376,6 +377,26 @@ if ($object->id > 0)
 	}
 	print '</td></tr>';
 
+	// Bank Account
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('BankAccount');
+	print '<td>';
+	if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
+	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	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 "</td>";
+	print '</tr>';
+	
 	// Montants
 	print '<tr><td>'.$langs->trans('AmountHT').'</td>';
 	print '<td align="right" colspan="2" nowrap>'.price($object->total_ht).'</td>';
@@ -384,21 +405,19 @@ if ($object->id > 0)
 	print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>';
 
 	// Amount Local Taxes
-	if ($mysoc->country_code=='ES')
+	if ($mysoc->localtax1_assuj=="1") //Localtax1
 	{
-		if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-		{
-			print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-			print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax1).'</td>';
-			print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-		}
-		if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-		{
-			print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-			print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax2).'</td>';
-			print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-		}
+		print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
+		print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax1).'</td>';
+		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 	}
+	if ($mysoc->localtax2_assuj=="1") //Localtax2
+	{
+		print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
+		print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax2).'</td>';
+		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	}
+
 
 	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2" nowrap>'.price($object->total_ttc).'</td>';
 	print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>';
@@ -493,7 +512,7 @@ if ($object->id > 0)
 	print '<td align="center">'.$langs->trans("WithdrawalReceipt").'</td>';
 	print '<td align="center">'.$langs->trans("User").'</td><td>&nbsp;</td><td>&nbsp;</td>';
 	print '</tr>';
-	$var=True;
+	$var=true;
 
 	if ($result_sql)
 	{
@@ -509,7 +528,7 @@ if ($object->id > 0)
 			print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
 			print '<td align="center">'.price($obj->amount).'</td>';
 			print '<td align="center">-</td>';
-			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
+			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 			print '<td>&nbsp;</td>';
 			print '<td>';
 			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;did='.$obj->rowid.'">';
@@ -565,7 +584,7 @@ if ($object->id > 0)
 			print $withdrawreceipt->getNomUrl(1);
 			print "</td>\n";
 
-			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
+			print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 
 			print '<td>&nbsp;</td>';
 			print '<td>&nbsp;</td>';
diff --git a/htdocs/compta/facture/tpl/index.html b/htdocs/compta/facture/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index a8ce6a45714..6252f0f6ef7 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2013-2014 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2013-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2014	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * 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
@@ -38,6 +38,8 @@ $langs->load('users');
 $langs->load('holidays');
 $langs->load('trips');
 
+$socid=GETPOST("socid");
+
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
 
@@ -58,6 +60,8 @@ if ($user->societe_id > 0) accessforbidden();
 $holiday = new Holiday($db);
 $holidaystatic=new Holiday($db);
 
+$childids = $user->getAllChildIds();
+$childids[]=$user->id;
 
 llxHeader(array(),$langs->trans('HRMArea'));
 
@@ -96,9 +100,9 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchATripAndExpense").'</td></tr>';
     print "<tr ".$bc[0].">";
-    print "<td>".$langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="18"></td>';
+    print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
     print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    //print "<tr ".$bc[0]."><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
+    //print "<tr ".$bc[0]."><td><label for=\"sall\">".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
     print '</tr>';
     print "</table></form><br>";
 }
@@ -116,8 +120,9 @@ $sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE u.rowid = d.fk_user";
 $sql.= " AND d.entity = ".$conf->entity;
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',',$childids).')';
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND d.fk_soc = ".$socid;
+if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid;
 $sql.= $db->order("d.tms","DESC");
 $sql.= $db->plimit($max, 0);
 
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 205aba9a778..2359d70d07b 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -97,9 +97,9 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	print '<table class="noborder nohover" width="100%">';
 	print "<tr class=\"liste_titre\">";
 	print '<td colspan="3">'.$langs->trans("SearchACustomerInvoice").'</td></tr>';
-	print "<tr ".$bc[0]."><td>".$langs->trans("Ref").':</td><td><input type="text" name="sf_ref" class="flat" size="18"></td>';
+	print "<tr ".$bc[0]."><td><label for=\"sf_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="sf_ref" id="sf_ref" class="flat" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print "<tr ".$bc[0]."><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
+	print "<tr ".$bc[0]."><td><label for=\"sall\">".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
 	print '</tr>';
 	print "</table></form><br>";
 }
@@ -114,9 +114,9 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASupplierInvoice").'</td></tr>';
 	print "<tr ".$bc[0].">";
-	print "<td>".$langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="18"></td>';
+	print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
 	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-	print "<tr ".$bc[0]."><td>".$langs->trans("RefSupplier").':</td><td><input type="text" name="search_ref_supplier" class="flat" size="18"></td>';
+	print "<tr ".$bc[0]."><td><label for=\"search_ref_supplier\">".$langs->trans("RefSupplier").'</label>:</td><td><input type="text" name="search_ref_supplier" id="search_ref_supplier" class="flat" size="18"></td>';
 	print '</tr>';
 	print "</table></form><br>";
 }
@@ -127,14 +127,14 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
 if (! empty($conf->don->enabled) && $user->rights->don->lire)
 {
 	$langs->load("donations");
-    print '<form method="post" action="'.DOL_URL_ROOT.'/compta/dons/liste.php">';
+    print '<form method="post" action="'.DOL_URL_ROOT.'/compta/dons/list.php">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<table class="noborder nohover" width="100%">';
     print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchADonation").'</td></tr>';
     print "<tr ".$bc[0].">";
-    print "<td>".$langs->trans("Ref").':</td><td><input type="text" name="search_ref" class="flat" size="18"></td>';
+    print "<td><label for=\"search_ref\">".$langs->trans("Ref").'</label>:</td><td><input type="text" name="search_ref" id="search_ref" class="flat" size="18"></td>';
     print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    //print "<tr ".$bc[0]."><td>".$langs->trans("Other").':</td><td><input type="text" name="sall" class="flat" size="18"></td>';
+    //print "<tr ".$bc[0]."><td><label for=\"sall\"".$langs->trans("Other").'</label>:</td><td><input type="text" name="sall" id="sall" class="flat" size="18"></td>';
     print '</tr>';
     print "</table></form><br>";
 }
@@ -145,7 +145,7 @@ if (! empty($conf->don->enabled) && $user->rights->don->lire)
 if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
 	$sql  = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type,";
-	$sql.= " s.nom, s.rowid as socid";
+	$sql.= " s.nom as name, s.rowid as socid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -185,7 +185,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '</td>';
 				print '<td class="nowrap">';
 				$companystatic->id=$obj->socid;
-				$companystatic->nom=$obj->nom;
+				$companystatic->name=$obj->name;
 				$companystatic->client=1;
 				print $companystatic->getNomUrl(1,'',16);
 				print '</td>';
@@ -219,7 +219,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
 {
 	$sql  = "SELECT f.ref, f.rowid, f.total_ttc, f.type,";
-	$sql.= " s.nom, s.rowid as socid";
+	$sql.= " s.nom as name, s.rowid as socid";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0";
@@ -254,7 +254,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 				print '</td>';
 				print '<td>';
 				$companystatic->id=$obj->socid;
-				$companystatic->nom=$obj->nom;
+				$companystatic->name=$obj->name;
 				$companystatic->client=1;
 				print $companystatic->getNomUrl(1,'',16);
 				print '</td>';
@@ -294,7 +294,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 	$sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.total_ttc, f.paye, f.tms,";
 	$sql.= " f.date_lim_reglement as datelimite,";
-	$sql.= " s.nom, s.rowid as socid,";
+	$sql.= " s.nom as name, s.rowid as socid,";
 	$sql.= " sum(pf.amount) as am";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
@@ -351,7 +351,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '</td>';
 				print '<td align="left">';
 				$thirdpartystatic->id=$obj->socid;
-				$thirdpartystatic->nom=$obj->nom;
+				$thirdpartystatic->name=$obj->name;
 				$thirdpartystatic->client=1;
 				print $thirdpartystatic->getNomUrl(1,'customer',44);
 				print '</td>';
@@ -392,7 +392,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 	$facstatic=new FactureFournisseur($db);
 
 	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.tms, ff.paye";
-	$sql.= ", s.nom, s.rowid as socid";
+	$sql.= ", s.nom as name, s.rowid as socid";
 	$sql.= ", SUM(pf.amount) as am";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -432,7 +432,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 				print '</td>';
 				print '<td>';
 				$thirdpartystatic->id=$obj->socid;
-				$thirdpartystatic->nom=$obj->nom;
+				$thirdpartystatic->name=$obj->name;
 				$thirdpartystatic->fournisseur=1;
 				print $thirdpartystatic->getNomUrl(1,'supplier',44);
 				print '</td>';
@@ -494,7 +494,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 		print '</tr>';
 		if ($num)
 		{
-			$var = True;
+			$var = true;
 			$total_ttc = $totalam = $total = 0;
 
 			$var=true;
@@ -613,7 +613,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 	$langs->load("orders");
 
 	$sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc,";
-	$sql.= " s.nom, s.rowid as socid,";
+	$sql.= " s.nom as name, s.rowid as socid,";
 	$sql.= " c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.total_ttc";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -639,7 +639,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 			$i = 0;
 			print '<table class="noborder" width="100%">';
 			print "<tr class=\"liste_titre\">";
-			print '<td colspan="2">'.$langs->trans("OrdersToBill").' <a href="'.DOL_URL_ROOT.'/commande/liste.php?status=3&afacturer=1">('.$num.')</a></td>';
+			print '<td colspan="2">'.$langs->trans("OrdersToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?status=3&afacturer=1">('.$num.')</a></td>';
 			if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.$langs->trans("AmountHT").'</td>';
 			print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
 			print '<td align="right">'.$langs->trans("ToBill").'</td>';
@@ -675,10 +675,10 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 
 				print '<td align="left">';
                 $societestatic->id=$obj->socid;
-                $societestatic->nom=$obj->nom;
+                $societestatic->name=$obj->name;
                 $societestatic->client=1;
                 print $societestatic->getNomUrl(1,'customer',44);
-				print '</a></td>';
+				print '</td>';
 				if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>';
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.price($obj->total_ttc-$obj->tot_fttc).'</td>';
@@ -717,7 +717,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 	$sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.datef, f.type, f.total, f.total_ttc, f.paye, f.tms,";
 	$sql.= " f.date_lim_reglement as datelimite,";
-	$sql.= " s.nom, s.rowid as socid,";
+	$sql.= " s.nom as name, s.rowid as socid,";
 	$sql.= " sum(pf.amount) as am";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
@@ -774,10 +774,10 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '</td>';
 				print '<td align="left">' ;
                 $societestatic->id=$obj->socid;
-                $societestatic->nom=$obj->nom;
+                $societestatic->name=$obj->name;
                 $societestatic->client=1;
 				print $societestatic->getNomUrl(1,'customer',44);
-				print '</a></td>';
+				print '</td>';
 				if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total).'</td>';
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.price($obj->am).'</td>';
@@ -821,7 +821,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 	$facstatic=new FactureFournisseur($db);
 
 	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.paye,";
-	$sql.= " s.nom, s.rowid as socid,";
+	$sql.= " s.nom as name, s.rowid as socid,";
 	$sql.= " sum(pf.amount) as am";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -863,7 +863,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 				print $facstatic->getNomUrl(1,'');
 				print '</td>';
                 $societestatic->id=$obj->socid;
-                $societestatic->nom=$obj->nom;
+                $societestatic->name=$obj->name;
                 $societestatic->client=0;
 				print '<td>'.$societestatic->getNomUrl(1, 'supplier', 44).'</td>';
 				if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>';
@@ -908,7 +908,7 @@ if ($resql)
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("TasksToDo").'</td>';
 	print "</tr>\n";
-	$var = True;
+	$var = true;
 	$i = 0;
 	while ($i < $db->num_rows($resql))
 	{
@@ -916,7 +916,7 @@ if ($resql)
 		$var=!$var;
 
 		print "<tr ".$bc[$var]."><td>".dol_print_date($obj->da,"day")."</td>";
-		print "<td><a href=\"action/fiche.php\">$obj->libelle $obj->label</a></td></tr>";
+		print "<td><a href=\"action/card.php\">$obj->libelle $obj->label</a></td></tr>";
 		$i++;
 	}
 	$db->free($resql);
diff --git a/htdocs/compta/journal/index.html b/htdocs/compta/journal/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 52562ed0244..34cf525104a 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
- * Copyright (C) 2011-2013	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011-2014	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012	Alexandre spangaro	<alexandre.spangaro@gmail.com>
  * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
@@ -104,11 +104,11 @@ $sql.= " fd.total_ttc, fd.tva_tx, fd.total_ht, fd.tva as total_tva, fd.product_t
 $sql.= " s.rowid as socid, s.nom as name, s.code_compta_fournisseur,";
 $sql.= " p.rowid as pid, p.ref as ref, p.accountancy_code_buy,";
 $sql.= " ct.accountancy_code_buy as account_tva, ct.recuperableonly";
-$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det fd";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = fd.fk_product";
-$sql.= " JOIN ".MAIN_DB_PREFIX."facture_fourn f ON f.rowid = fd.fk_facture_fourn";
-$sql.= " JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid = f.fk_soc" ;
+$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva as ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
+$sql.= " JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
+$sql.= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc" ;
 $sql.= " WHERE f.fk_statut > 0 AND f.entity = ".$conf->entity;
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
 else $sql.= " AND f.type IN (0,1,2,3)";
@@ -117,14 +117,13 @@ if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start
 // TODO Find a better trick to avoid problem with some mysql installations
 if (in_array($db->type, array('mysql', 'mysqli'))) $db->query('SET SQL_BIG_SELECTS=1');
 
-dol_syslog("sql=".$sql);
 $result = $db->query($sql);
 if ($result)
 {
 	$num = $db->num_rows($result);
 	// les variables
-	$cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER)?$conf->global->COMPTA_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef"));
-	$cpttva = (! empty($conf->global->COMPTA_VAT_BUY_ACCOUNT)?$conf->global->COMPTA_VAT_BUY_ACCOUNT:$langs->trans("CodeNotDef"));
+	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)?$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef"));
+	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)?$conf->global->ACCOUNTING_VAT_BUY_ACCOUNT:$langs->trans("CodeNotDef"));
 
 	$tabfac = array();
 	$tabht = array();
@@ -143,16 +142,16 @@ if ($result)
 		$compta_prod = $obj->accountancy_code_buy;
 		if (empty($compta_prod))
 		{
-			if($obj->product_type == 0) $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_BUY_ACCOUNT)?$conf->global->COMPTA_PRODUCT_BUY_ACCOUNT:$langs->trans("CodeNotDef"));
-			else $compta_prod = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT)?$conf->global->COMPTA_SERVICE_BUY_ACCOUNT:$langs->trans("CodeNotDef"));
+			if($obj->product_type == 0) $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)?$conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT:$langs->trans("CodeNotDef"));
+			else $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)?$conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT:$langs->trans("CodeNotDef"));
 		}
 		$compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva);
 		$compta_localtax1 = (! empty($obj->account_localtax1)?$obj->account_localtax1:$langs->trans("CodeNotDef"));
 		$compta_localtax2 = (! empty($obj->account_localtax2)?$obj->account_localtax2:$langs->trans("CodeNotDef"));
 
-		$account_localtax1=getLocalTaxesFromRate($obj->tva_tx, 1, $mysoc);
+		$account_localtax1=getLocalTaxesFromRate($obj->tva_tx, 1, $mysoc, $obj->thirdparty);
 		$compta_localtax1= (! empty($account_localtax1[2])?$account_localtax1[2]:$langs->trans("CodeNotDef"));
-		$account_localtax2=getLocalTaxesFromRate($obj->tva_tx, 2, $mysoc);
+		$account_localtax2=getLocalTaxesFromRate($obj->tva_tx, 2, $mysoc, $obj->thirdparty);
 		$compta_localtax2= (! empty($account_localtax2[2])?$account_localtax2[2]:$langs->trans("CodeNotDef"));
 
 		$tabfac[$obj->rowid]["date"] = $obj->datef;
@@ -231,7 +230,6 @@ foreach ($tabfac as $key => $val)
 			if (isset($line['nomtcheck']) || $mt)
 			{
 				print "<tr ".$bc[$var]." >";
-				//print "<td>".$conf->global->COMPTA_JOURNAL_BUY."</td>";
 				print "<td>".dol_print_date($val["date"])."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 931b8757470..e249d3fe554 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2007-2010	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2007-2010	Jean Heimburger		<jean@tiaris.info>
- * Copyright (C) 2011-2013	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011-2014	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012  Alexandre Spangaro	<alexandre.spangaro@gmail.com>
  * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
@@ -105,10 +105,10 @@ $sql.= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd
 $sql.= " s.rowid as socid, s.nom as name, s.code_compta, s.client,";
 $sql.= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell,";
 $sql.= " ct.accountancy_code_sell as account_tva, ct.recuperableonly";
-$sql.= " FROM ".MAIN_DB_PREFIX."facturedet fd";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = fd.fk_product";
-$sql.= " JOIN ".MAIN_DB_PREFIX."facture f ON f.rowid = fd.fk_facture";
-$sql.= " JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid = f.fk_soc";
+$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
+$sql.= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
+$sql.= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'";
 $sql.= " WHERE f.entity = ".$conf->entity;
 $sql.= " AND f.fk_statut > 0";
@@ -121,7 +121,6 @@ $sql.= " ORDER BY f.rowid";
 // TODO Find a better trick to avoid problem with some mysql installations
 if (in_array($db->type, array('mysql', 'mysqli'))) $db->query('SET SQL_BIG_SELECTS=1');
 
-dol_syslog("sql=".$sql);
 $result = $db->query($sql);
 if ($result)
 {
@@ -142,20 +141,20 @@ if ($result)
    	{
    	    $obj = $db->fetch_object($result);
    	    // les variables
-   	    $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER)?$conf->global->COMPTA_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef"));
+   	    $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)?$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef"));
    	    $compta_soc = (! empty($obj->code_compta)?$obj->code_compta:$cptcli);
 		$compta_prod = $obj->accountancy_code_sell;
 		if (empty($compta_prod))
 		{
-			if($obj->product_type == 0) $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT)?$conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT:$langs->trans("CodeNotDef"));
-			else $compta_prod = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT)?$conf->global->COMPTA_SERVICE_SOLD_ACCOUNT:$langs->trans("CodeNotDef"));
+			if($obj->product_type == 0) $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT:$langs->trans("CodeNotDef"));
+			else $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT:$langs->trans("CodeNotDef"));
 		}
-		$cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)?$conf->global->COMPTA_VAT_ACCOUNT:$langs->trans("CodeNotDef"));
+		$cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)?$conf->global->ACCOUNTING_VAT_ACCOUNT:$langs->trans("CodeNotDef"));
 		$compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva);
 
-		$account_localtax1=getLocalTaxesFromRate($obj->tva_tx, 1, $mysoc);
+		$account_localtax1=getLocalTaxesFromRate($obj->tva_tx, 1, $obj->thirdparty, $mysoc);
 		$compta_localtax1= (! empty($account_localtax1[3])?$account_localtax1[3]:$langs->trans("CodeNotDef"));
-		$account_localtax2=getLocalTaxesFromRate($obj->tva_tx, 2, $mysoc);
+		$account_localtax2=getLocalTaxesFromRate($obj->tva_tx, 2, $obj->thirdparty, $mysoc);
 		$compta_localtax2= (! empty($account_localtax2[3])?$account_localtax2[3]:$langs->trans("CodeNotDef"));
 
     	//la ligne facture
@@ -241,7 +240,6 @@ foreach ($tabfac as $key => $val)
 			if (isset($line['nomtcheck']) || $mt)
 			{
 				print "<tr ".$bc[$var]." >";
-				//print "<td>".$conf->global->COMPTA_JOURNAL_SELL."</td>";
 				print "<td>".dol_print_date($val["date"])."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
new file mode 100644
index 00000000000..1b16064ed9e
--- /dev/null
+++ b/htdocs/compta/localtax/card.php
@@ -0,0 +1,272 @@
+<?php
+/* Copyright (C) 2011-2014      Juanjo Menent <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/localtax/card.php
+ *      \ingroup    tax
+ *		\brief      Page of IRPF payments
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("compta");
+$langs->load("banks");
+$langs->load("bills");
+
+$id=$_REQUEST["id"];
+$lttype=GETPOST('localTaxType', 'int');
+$mesg = '';
+
+// Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
+
+/*
+ * Actions
+ */
+
+//add payment of localtax
+if($_POST["cancel"] == $langs->trans("Cancel")){
+	header("Location: reglement.php?localTaxType=".$lttype);
+	exit;
+}
+
+if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
+{
+    $localtax = new Localtax($db);
+
+    $db->begin();
+
+    $datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
+    $datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
+
+    $localtax->accountid=$_POST["accountid"];
+    $localtax->paymenttype=$_POST["paiementtype"];
+    $localtax->datev=$datev;
+    $localtax->datep=$datep;
+    $localtax->amount=$_POST["amount"];
+	$localtax->label=$_POST["label"];
+	$localtax->ltt=$lttype;
+
+    $ret=$localtax->addPayment($user);
+    if ($ret > 0)
+    {
+        $db->commit();
+        header("Location: reglement.php?localTaxType=".$lttype);
+        exit;
+    }
+    else
+    {
+        $db->rollback();
+        $mesg='<div class="error">'.$localtax->error.'</div>';
+        $_GET["action"]="create";
+    }
+}
+
+//delete payment of localtax
+if ($_GET["action"] == 'delete')
+{
+    $localtax = new Localtax($db);
+    $result=$localtax->fetch($_GET['id']);
+
+	if ($localtax->rappro == 0)
+	{
+	    $db->begin();
+
+	    $ret=$localtax->delete($user);
+	    if ($ret > 0)
+	    {
+			if ($localtax->fk_bank)
+			{
+				$accountline=new AccountLine($db);
+				$result=$accountline->fetch($localtax->fk_bank);
+				$result=$accountline->delete($user);
+			}
+
+			if ($result > 0)
+			{
+				$db->commit();
+				header("Location: ".DOL_URL_ROOT.'/compta/localtax/reglement.php');
+				exit;
+			}
+			else
+			{
+				$localtax->error=$accountline->error;
+				$db->rollback();
+				$mesg='<div class="error">'.$localtax->error.'</div>';
+			}
+	    }
+	    else
+	    {
+	        $db->rollback();
+	        $mesg='<div class="error">'.$localtax->error.'</div>';
+	    }
+	}
+	else
+	{
+        $mesg='<div class="error">Error try do delete a line linked to a conciliated bank transaction</div>';
+	}
+}
+
+
+/*
+*	View
+*/
+
+llxHeader();
+
+$form = new Form($db);
+
+if ($id)
+{
+    $vatpayment = new Localtax($db);
+	$result = $vatpayment->fetch($id);
+	if ($result <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+}
+
+
+if ($_GET["action"] == 'create')
+{
+    print "<form name='add' action=\"card.php\" method=\"post\">\n";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="localTaxType" value="'.$lttype.'">';
+    print '<input type="hidden" name="action" value="add">';
+
+    print_fiche_titre($langs->transcountry($lttype==2?"newLT2Payment":"newLT1Payment",$mysoc->country_code));
+    
+    if ($mesg) print $mesg;
+
+    print '<table class="border" width="100%">';
+
+    print "<tr>";
+    print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+    print $form->select_date($datep,"datep",'','','','add');
+    print '</td></tr>';
+
+    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
+    print $form->select_date($datev,"datev",'','','','add');
+    print '</td></tr>';
+
+	// Label
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->transcountry(($lttype==2?"LT2Payment":"LT1Payment"),$mysoc->country_code)).'"></td></tr>';
+
+	// Amount
+	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.$_POST["amount"].'"></td></tr>';
+
+    if (! empty($conf->banque->enabled))
+    {
+		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
+        $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
+        print '</td></tr>';
+
+	    print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+	    $form->select_types_paiements($_POST["paiementtype"], "paiementtype");
+	    print "</td>\n";
+	    print "</tr>";
+	}
+    print '</table>';
+
+	print "<br>";
+
+	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
+    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+
+    print '</form>';
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Barre d'action                                                             */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($id)
+{
+    if ($mesg) print $mesg;
+
+	$h = 0;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/localtax/card.php?id='.$vatpayment->id;
+	$head[$h][1] = $langs->trans('Card');
+	$head[$h][2] = 'card';
+	$h++;
+
+	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
+
+
+	print '<table class="border" width="100%">';
+
+	print "<tr>";
+	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $vatpayment->ref;
+	print '</td></tr>';
+
+	print "<tr>";
+	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print dol_print_date($vatpayment->datep,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print dol_print_date($vatpayment->datev,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($vatpayment->amount).'</td></tr>';
+
+	if (! empty($conf->banque->enabled))
+	{
+		if ($vatpayment->fk_account > 0)
+		{
+ 		   	$bankline=new AccountLine($db);
+    		$bankline->fetch($vatpayment->fk_bank);
+
+	    	print '<tr>';
+	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<td colspan="3">';
+			print $bankline->getNomUrl(1,0,'showall');
+	    	print '</td>';
+	    	print '</tr>';
+		}
+	}
+
+	print '</table>';
+
+	print '</div>';
+
+	/*
+	* Boutons d'actions
+	*/
+	print "<div class=\"tabsAction\">\n";
+	if ($vatpayment->rappro == 0)
+		print '<a class="butActionDelete" href="card.php?id='.$vatpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+	else
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
+	print "</div>";
+}
+
+
+$db->close();
+
+llxFooter();
+
diff --git a/htdocs/compta/localtax/class/index.html b/htdocs/compta/localtax/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index b500a701254..e2c9c94595a 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011	Juanjo Menent	<jmenent@2byte.es>
+/* Copyright (C) 2011-2014	Juanjo Menent	<jmenent@2byte.es>
  *
  * 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 @@ class Localtax extends CommonObject
 {
     var $id;
     var $ref;
+    var $ltt;
 	var $tms;
 	var $datep;
 	var $datev;
@@ -74,6 +75,7 @@ class Localtax extends CommonObject
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax(";
+		$sql.= "localtaxtype,";
 		$sql.= "tms,";
 		$sql.= "datep,";
 		$sql.= "datev,";
@@ -84,6 +86,7 @@ class Localtax extends CommonObject
 		$sql.= "fk_user_creat,";
 		$sql.= "fk_user_modif";
         $sql.= ") VALUES (";
+        $sql.= " ".$this->ltt.",";
 		$sql.= " '".$this->db->idate($this->tms)."',";
 		$sql.= " '".$this->db->idate($this->datep)."',";
 		$sql.= " '".$this->db->idate($this->datev)."',";
@@ -95,25 +98,24 @@ class Localtax extends CommonObject
 		$sql.= " '".$this->fk_user_modif."'";
 		$sql.= ")";
 
-	   	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('LOCALTAX_CREATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('LOCALTAX_CREATE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+
+			//FIXME: Add rollback if trigger fail
 
             return $this->id;
         }
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -125,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;
 
@@ -141,6 +143,7 @@ class Localtax extends CommonObject
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."localtax SET";
+        $sql.= " localtaxtype=".$this->ltt.",";
 		$sql.= " tms=".$this->db->idate($this->tms).",";
 		$sql.= " datep=".$this->db->idate($this->datep).",";
 		$sql.= " datev=".$this->db->idate($this->datev).",";
@@ -152,23 +155,22 @@ class Localtax extends CommonObject
 		$sql.= " fk_user_modif='".$this->fk_user_modif."'";
         $sql.= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql)
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
             return -1;
         }
 
 		if (! $notrigger)
 		{
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('LOCALTAX_MODIFY',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('LOCALTAX_MODIFY',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+
+            //FIXME: Add rollback if trigger fail
     	}
 
         return 1;
@@ -186,6 +188,7 @@ class Localtax extends CommonObject
     	global $langs;
         $sql = "SELECT";
 		$sql.= " t.rowid,";
+		$sql.= " t.localtaxtype,";
 		$sql.= " t.tms,";
 		$sql.= " t.datep,";
 		$sql.= " t.datev,";
@@ -202,7 +205,7 @@ class Localtax extends CommonObject
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
         $sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -212,6 +215,7 @@ class Localtax extends CommonObject
 
                 $this->id    = $obj->rowid;
                 $this->ref   = $obj->rowid;
+                $this->ltt   = $obj->localtaxtype;
 				$this->tms   = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->datev = $this->db->jdate($obj->datev);
@@ -232,7 +236,6 @@ class Localtax extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -250,24 +253,23 @@ class Localtax extends CommonObject
 
 		$error=0;
 
+		// Call trigger
+		$result=$this->call_trigger('LOCALTAX_DELETE',$user);
+		if ($result < 0) return -1;
+		// End call triggers
+
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."localtax";
 		$sql.= " WHERE rowid=".$this->id;
 
-	   	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			return -1;
 		}
 
-        // Appel des triggers
-        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        $interface=new Interfaces($this->db);
-        $result=$interface->run_triggers('LOCALTAX_DELETE',$this,$user,$langs,$conf);
-        if ($result < 0) { $error++; $this->errors=$interface->errors; }
-        // Fin appel triggers
 
 		return 1;
 	}
@@ -285,6 +287,7 @@ class Localtax extends CommonObject
 		$this->id=0;
 
 		$this->tms='';
+		$this->ltt=0;
 		$this->datep='';
 		$this->datev='';
 		$this->amount='';
@@ -323,35 +326,32 @@ class Localtax extends CommonObject
      */
     function localtax_sum_collectee($year = 0)
     {
-
         $sql = "SELECT sum(f.localtax) as amount";
         $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-
         if ($year)
         {
             $sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
         }
 
         $result = $this->db->query($sql);
-
         if ($result)
         {
             if ($this->db->num_rows($result))
             {
                 $obj = $this->db->fetch_object($result);
-                return $obj->amount;
+            	$ret = $obj->amount;
+                $this->db->free($result);
+                return $ret;
             }
             else
-            {
-                return 0;
+			{
+            	$this->db->free($result);
+				return 0;
             }
-
-            $this->db->free($result);
-
         }
         else
-        {
-            print $this->db->error();
+		{
+            print $this->db->lasterror();
             return -1;
         }
     }
@@ -367,31 +367,30 @@ class Localtax extends CommonObject
 
         $sql = "SELECT sum(f.total_localtax) as total_localtax";
         $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-
         if ($year)
         {
             $sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
         }
-        $result = $this->db->query($sql);
 
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
             {
                 $obj = $this->db->fetch_object($result);
-                return $obj->total_localtax;
+            	$ret = $obj->total_localtax;
+                $this->db->free($result);
+                return $ret;
             }
             else
-            {
-                return 0;
+			{
+            	$this->db->free($result);
+            	return 0;
             }
-
-            $this->db->free();
-
         }
         else
         {
-            print $this->db->error();
+            print $this->db->lasterror();
             return -1;
         }
     }
@@ -409,32 +408,30 @@ class Localtax extends CommonObject
 
         $sql = "SELECT sum(f.amount) as amount";
         $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
-
         if ($year)
         {
             $sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
         }
 
         $result = $this->db->query($sql);
-
         if ($result)
         {
             if ($this->db->num_rows($result))
             {
                 $obj = $this->db->fetch_object($result);
-                return $obj->amount;
+                $ret = $obj->amount;
+            	$this->db->free($result);
+                return $ret;
             }
             else
-            {
-                return 0;
+			{
+            	$this->db->free($result);
+				return 0;
             }
-
-            $this->db->free();
-
         }
         else
         {
-            print $this->db->error();
+            print $this->db->lasterror();
             return -1;
         }
     }
@@ -476,19 +473,19 @@ class Localtax extends CommonObject
         }
 
         // Insertion dans table des paiement localtax
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (datep, datev, amount";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
         if ($this->note)  $sql.=", note";
         if ($this->label) $sql.=", label";
         $sql.= ", fk_user_creat, fk_bank";
 		$sql.= ") ";
-        $sql.= " VALUES ('".$this->db->idate($this->datep)."',";
+        $sql.= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
         $sql.= "'".$this->db->idate($this->datev)."'," . $this->amount;
         if ($this->note)  $sql.=", '".$this->db->escape($this->note)."'";
         if ($this->label) $sql.=", '".$this->db->escape($this->label)."'";
         $sql.=", '".$user->id."', NULL";
         $sql.= ")";
 
-		dol_syslog(get_class($this)."::addPayment sql=".$sql);
+		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -519,7 +516,7 @@ class Localtax extends CommonObject
 					}
 
                     // Mise a jour liens
-                    $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/fiche.php?id=', "(VATPayment)", "payment_vat");
+                    $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
                     if ($result < 0)
                     {
                     	$this->error=$acc->error;
@@ -540,14 +537,14 @@ class Localtax extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error=$this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error=$this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -589,7 +586,7 @@ class Localtax extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/compta/localtax/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/compta/localtax/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$picto='payment';
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index cc71b402060..7c34cec1ed4 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2011	Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2014	   Ferran Marcet        <fmarcet@2byte.es>
+/* Copyright (C) 2011-2014	Juanjo Menent 		<jmenent@2byte.es>
+ * Copyright (C) 2014	    Ferran Marcet       <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +33,8 @@ $langs->load("compta");
 $langs->load("companies");
 $langs->load("products");
 
+$local=GETPOST('localTaxType', 'int');
+
 // Date range
 $year=GETPOST("year");
 if (empty($year))
@@ -102,15 +104,17 @@ $fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
 $fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
 $fsearch.='  <input type="text" name="min" id="min" value="'.$min.'" size="6">';
 
+$calc=MAIN_INFO_LOCALTAX_CALC.$local;
 // Affiche en-tete du rapport
-if ($modetax==1)	// Calculate on invoice for goods and services
+if ($conf->global->$calc==0 || $conf->global->$calc==1)	// Calculate on invoice for goods and services
 {
-    $nom=$langs->transcountry("LT2ReportByCustomersInInputOutputMode",$mysoc->country_code);
+    $nom=$langs->transcountry($local==1?"LT1ReportByCustomersInInputOutputMode":"LT2ReportByCustomersInInputOutputMode",$mysoc->country_code);
+    $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT'.$local.'Rec");
+    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
     $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    $description=$langs->trans("RulesVATDue");
     if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
     $description.=$fsearch;
-    $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+    $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
 	$builddate=time();
 
 	$elementcust=$langs->trans("CustomersInvoices");
@@ -120,14 +124,15 @@ if ($modetax==1)	// Calculate on invoice for goods and services
 	$productsup=$langs->trans("Description");
 	$amountsup=$langs->trans("AmountHT");
 }
-if ($modetax==0) 	// Invoice for goods, payment for services
+if ($conf->global->$calc==2) 	// Invoice for goods, payment for services
 {
-    $nom=$langs->transcountry("LT2ReportByCustomersInInputOutputMode",$mysoc->country_code);
+    $nom=$langs->transcountry($local==1?"LT1ReportByCustomersInInputOutputMode":"LT2ReportByCustomersInInputOutputMode",$mysoc->country_code);
+    $calcmode=$langs->trans("CalcModeLT2Debt");
+    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
     $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
-    $description=$langs->trans("RulesVATIn");
     if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
     $description.=$fsearch;
-    $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
+    $description.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
     $builddate=time();
 
 	$elementcust=$langs->trans("CustomersInvoices");
@@ -137,173 +142,180 @@ if ($modetax==0) 	// Invoice for goods, payment for services
 	$productsup=$langs->trans("Description");
 	$amountsup=$langs->trans("AmountHT");
 }
-report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink);
+report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
 
-$vatcust=$langs->transcountry("LT2",$mysoc->country_code);
-$vatsup=$langs->transcountry("LT2",$mysoc->country_code);
+
+$vatcust=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code);
+$vatsup=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code);
 
 // IRPF that the customer has retained me
-
-print "<table class=\"noborder\" width=\"100%\">";
-print "<tr class=\"liste_titre\">";
-print '<td align="left">'.$langs->trans("Num")."</td>";
-print '<td align="left">'.$langs->trans("Customer")."</td>";
-print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>";
-print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
-print "<td align=\"right\">".$vatcust."</td>";
-print "</tr>\n";
-
-$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
-
-$action = "tvaclient";
-$object = &$coll_list;
-$parameters["mode"] = $modetax;
-$parameters["start"] = $date_start;
-$parameters["end"] = $date_end;
-$parameters["direction"] = 'sell';
-// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-$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_list))
+if($conf->global->$calc ==0 || $conf->global->$calc == 2)
 {
-	$var=true;
-	$total = 0;  $totalamount = 0;
-	$i = 1;
-	foreach($coll_list as $coll)
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	print '<td align="left">'.$langs->trans("Num")."</td>";
+	print '<td align="left">'.$langs->trans("Customer")."</td>";
+	print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>";
+	print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
+	print "<td align=\"right\">".$vatcust."</td>";
+	print "</tr>\n";
+
+	$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
+
+	$action = "tvaclient";
+	$object = &$coll_list;
+	$parameters["mode"] = $modetax;
+	$parameters["start"] = $date_start;
+	$parameters["end"] = $date_end;
+	$parameters["direction"] = 'sell';
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$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_list))
 	{
-		if(($min == 0 or ($min > 0 && $coll->amount > $min)) && $coll->localtax2!=0)
+		$var=true;
+		$total = 0;  $totalamount = 0;
+		$i = 1;
+		foreach($coll_list as $coll)
 		{
-			$var=!$var;
-			$intra = str_replace($find,$replace,$coll->tva_intra);
-			if(empty($intra))
+			if(($min == 0 or ($min > 0 && $coll->amount > $min)) && ($local==1?$coll->localtax1:$coll->localtax2) !=0)
 			{
-				if($coll->assuj == '1')
+				$var=!$var;
+				$intra = str_replace($find,$replace,$coll->tva_intra);
+				if(empty($intra))
 				{
-					$intra = $langs->trans('Unknown');
-				}
-				else
-				{
-					$intra = '';
+					if($coll->assuj == '1')
+					{
+						$intra = $langs->trans('Unknown');
+					}
+					else
+					{
+						$intra = '';
+					}
 				}
+				print "<tr ".$bc[$var].">";
+				print '<td class="nowrap">'.$i."</td>";
+				$company_static->id=$coll->socid;
+				$company_static->name=$coll->name;
+				print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
+				$find = array(' ','.');
+				$replace = array('','');
+				print '<td class="nowrap">'.$intra."</td>";
+				print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
+				print "<td class=\"nowrap\" align=\"right\">".price($local==1?$coll->localtax1:$coll->localtax2)."</td>";
+	            $totalamount = $totalamount + $coll->amount;
+				$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
+				print "</tr>\n";
+				$i++;
 			}
-			print "<tr ".$bc[$var].">";
-			print '<td class="nowrap">'.$i."</td>";
-			$company_static->id=$coll->socid;
-			$company_static->nom=$coll->nom;
-			print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
-			$find = array(' ','.');
-			$replace = array('','');
-			print '<td class="nowrap">'.$intra."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->localtax2)."</td>";
-            $totalamount = $totalamount + $coll->amount;
-			$total = $total + $coll->localtax2;
-			print "</tr>\n";
-			$i++;
 		}
-	}
-    $x_coll_sum = $total;
+	    $x_coll_sum = $total;
 
-	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
-	print '<td class="nowrap" align="right">'.price($total).'</td>';
-	print '</tr>';
-}
-else
-{
-	$langs->load("errors");
-	if ($coll_list == -1)
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-	else if ($coll_list == -2)
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
+	    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
+		print '<td class="nowrap" align="right">'.price($total).'</td>';
+		print '</tr>';
+	}
 	else
-		print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+	{
+		$langs->load("errors");
+		if ($coll_list == -1)
+			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		else if ($coll_list == -2)
+			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		else
+			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+	}
 }
 
 // IRPF I retained my supplier
+if($conf->global->$calc ==0 || $conf->global->$calc == 1){
+	print "<table class=\"noborder\" width=\"100%\">";
+	print "<tr class=\"liste_titre\">";
+	print '<td align="left">'.$langs->trans("Num")."</td>";
+	print '<td align="left">'.$langs->trans("Supplier")."</td>";
+	print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>";
+	print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
+	print "<td align=\"right\">".$vatsup."</td>";
+	print "</tr>\n";
 
-print "<tr class=\"liste_titre\">";
-print '<td align="left">'.$langs->trans("Num")."</td>";
-print '<td align="left">'.$langs->trans("Supplier")."</td>";
-print "<td>".$langs->transcountry("ProfId1",$mysoc->country_code)."</td>";
-print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
-print "<td align=\"right\">".$vatsup."</td>";
-print "</tr>\n";
+	$company_static=new Societe($db);
 
-$company_static=new Societe($db);
-
-$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
-$parameters["direction"] = 'buy';
-$reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if (is_array($coll_list))
-{
-	$var=true;
-	$total = 0;  $totalamount = 0;
-	$i = 1;
-	foreach($coll_list as $coll)
+	$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
+	$parameters["direction"] = 'buy';
+	$reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+	if (is_array($coll_list))
 	{
-		if(($min == 0 or ($min > 0 && $coll->amount > $min)) && $coll->localtax2!=0)
+		$var=true;
+		$total = 0;  $totalamount = 0;
+		$i = 1;
+		foreach($coll_list as $coll)
 		{
-			$var=!$var;
-			$intra = str_replace($find,$replace,$coll->tva_intra);
-			if(empty($intra))
+			if(($min == 0 or ($min > 0 && $coll->amount > $min)) && ($local==1?$coll->localtax1:$coll->localtax2) != 0)
 			{
-				if($coll->assuj == '1')
+				$var=!$var;
+				$intra = str_replace($find,$replace,$coll->tva_intra);
+				if(empty($intra))
 				{
-					$intra = $langs->trans('Unknown');
-				}
-				else
-				{
-					$intra = '';
+					if($coll->assuj == '1')
+					{
+						$intra = $langs->trans('Unknown');
+					}
+					else
+					{
+						$intra = '';
+					}
 				}
+				print "<tr ".$bc[$var].">";
+				print '<td class="nowrap">'.$i."</td>";
+				$company_static->id=$coll->socid;
+				$company_static->name=$coll->name;
+				print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
+				$find = array(' ','.');
+				$replace = array('','');
+				print '<td class="nowrap">'.$intra."</td>";
+				print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
+				print "<td class=\"nowrap\" align=\"right\">".price($local==1?$coll->localtax1:$coll->localtax2)."</td>";
+	            $totalamount = $totalamount + $coll->amount;
+				$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
+				print "</tr>\n";
+				$i++;
 			}
-			print "<tr ".$bc[$var].">";
-			print '<td class="nowrap">'.$i."</td>";
-			$company_static->id=$coll->socid;
-			$company_static->nom=$coll->nom;
-			print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
-			$find = array(' ','.');
-			$replace = array('','');
-			print '<td class="nowrap">'.$intra."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
-			print "<td class=\"nowrap\" align=\"right\">".price($coll->localtax2)."</td>";
-            $totalamount = $totalamount + $coll->amount;
-			$total = $total + $coll->localtax2;
-			print "</tr>\n";
-			$i++;
 		}
+	    $x_paye_sum = $total;
+
+		print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
+	    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
+		print '<td class="nowrap" align="right">'.price($total).'</td>';
+		print '</tr>';
+
+		print '</table>';
+
 	}
-    $x_paye_sum = $total;
-
-	print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
-    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
-	print '<td class="nowrap" align="right">'.price($total).'</td>';
-	print '</tr>';
-
-	print '</table>';
-
-    // Total to pay
-    print '<br><br>';
-    print '<table class="noborder" width="100%">';
-    $diff = $x_paye_sum;
-    print '<tr class="liste_total">';
-    print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
-    print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
-    print "</tr>\n";
-
-}
-else
-{
-	$langs->load("errors");
-	if ($coll_list == -1)
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-	else if ($coll_list == -2)
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 	else
-		print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+	{
+		$langs->load("errors");
+		if ($coll_list == -1)
+			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		else if ($coll_list == -2)
+			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		else
+			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+	}
 }
 
+if($conf->global->$calc ==0){
+	// Total to pay
+	print '<br><br>';
+	print '<table class="noborder" width="100%">';
+	$diff = $x_coll_sum - $x_paye_sum ;
+	print '<tr class="liste_total">';
+	print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
+	print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
+	print "</tr>\n";
+
+}
 print '</table>';
 
 
diff --git a/htdocs/compta/localtax/fiche.php b/htdocs/compta/localtax/fiche.php
deleted file mode 100644
index c8849ba07f9..00000000000
--- a/htdocs/compta/localtax/fiche.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/* Copyright (C) 2011      Juanjo Menent <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/compta/localtax/fiche.php
- *      \ingroup    tax
- *		\brief      Page of IRPF payments
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("compta");
-$langs->load("banks");
-$langs->load("bills");
-
-$id=$_REQUEST["id"];
-
-$mesg = '';
-
-// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
-
-
-/*
- * Actions
- */
-
-//add payment of localtax
-if ($_POST["action"] == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
-{
-    $localtax = new Localtax($db);
-
-    $db->begin();
-
-    $datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
-    $datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
-
-    $localtax->accountid=$_POST["accountid"];
-    $localtax->paymenttype=$_POST["paiementtype"];
-    $localtax->datev=$datev;
-    $localtax->datep=$datep;
-    $localtax->amount=$_POST["amount"];
-	$localtax->label=$_POST["label"];
-
-    $ret=$localtax->addPayment($user);
-    if ($ret > 0)
-    {
-        $db->commit();
-        header("Location: reglement.php");
-        exit;
-    }
-    else
-    {
-        $db->rollback();
-        $mesg='<div class="error">'.$localtax->error.'</div>';
-        $_GET["action"]="create";
-    }
-}
-
-//delete payment of localtax
-if ($_GET["action"] == 'delete')
-{
-    $localtax = new Localtax($db);
-    $result=$localtax->fetch($_GET['id']);
-
-	if ($localtax->rappro == 0)
-	{
-	    $db->begin();
-
-	    $ret=$localtax->delete($user);
-	    if ($ret > 0)
-	    {
-			if ($localtax->fk_bank)
-			{
-				$accountline=new AccountLine($db);
-				$result=$accountline->fetch($localtax->fk_bank);
-				$result=$accountline->delete($user);
-			}
-
-			if ($result > 0)
-			{
-				$db->commit();
-				header("Location: ".DOL_URL_ROOT.'/compta/localtax/reglement.php');
-				exit;
-			}
-			else
-			{
-				$localtax->error=$accountline->error;
-				$db->rollback();
-				$mesg='<div class="error">'.$localtax->error.'</div>';
-			}
-	    }
-	    else
-	    {
-	        $db->rollback();
-	        $mesg='<div class="error">'.$localtax->error.'</div>';
-	    }
-	}
-	else
-	{
-        $mesg='<div class="error">Error try do delete a line linked to a conciliated bank transaction</div>';
-	}
-}
-
-
-/*
-*	View
-*/
-
-llxHeader();
-
-$form = new Form($db);
-
-if ($id)
-{
-    $vatpayment = new Localtax($db);
-	$result = $vatpayment->fetch($id);
-	if ($result <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-}
-
-
-if ($_GET["action"] == 'create')
-{
-    print "<form name='add' action=\"fiche.php\" method=\"post\">\n";
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-
-    print_fiche_titre($langs->transcountry("newLT2Payment",$mysoc->country_code));
-
-    if ($mesg) print $mesg;
-
-    print '<table class="border" width="100%">';
-
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-    print $form->select_date($datep,"datep",'','','','add');
-    print '</td></tr>';
-
-    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
-    print $form->select_date($datev,"datev",'','','','add');
-    print '</td></tr>';
-
-	// Label
-	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->transcountry("LT2Payment",$mysoc->country_code)).'"></td></tr>';
-
-	// Amount
-	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.$_POST["amount"].'"></td></tr>';
-
-    if (! empty($conf->banque->enabled))
-    {
-		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
-        $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
-        print '</td></tr>';
-
-	    print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	    $form->select_types_paiements($_POST["paiementtype"], "paiementtype");
-	    print "</td>\n";
-	    print "</tr>";
-	}
-    print '</table>';
-
-	print "<br>";
-
-	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-
-    print '</form>';
-}
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-if ($id)
-{
-    if ($mesg) print $mesg;
-
-	$h = 0;
-	$head[$h][0] = DOL_URL_ROOT.'/compta/localtax/fiche.php?id='.$vatpayment->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
-
-	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
-
-
-	print '<table class="border" width="100%">';
-
-	print "<tr>";
-	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $vatpayment->ref;
-	print '</td></tr>';
-
-	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
-	print dol_print_date($vatpayment->datep,'day');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
-	print dol_print_date($vatpayment->datev,'day');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($vatpayment->amount).'</td></tr>';
-
-	if (! empty($conf->banque->enabled))
-	{
-		if ($vatpayment->fk_account > 0)
-		{
- 		   	$bankline=new AccountLine($db);
-    		$bankline->fetch($vatpayment->fk_bank);
-
-	    	print '<tr>';
-	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td colspan="3">';
-			print $bankline->getNomUrl(1,0,'showall');
-	    	print '</td>';
-	    	print '</tr>';
-		}
-	}
-
-	print '</table>';
-
-	print '</div>';
-
-	/*
-	* Boutons d'actions
-	*/
-	print "<div class=\"tabsAction\">\n";
-	if ($vatpayment->rappro == 0)
-		print '<a class="butActionDelete" href="fiche.php?id='.$vatpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
-	else
-		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
-	print "</div>";
-}
-
-
-$db->close();
-
-llxFooter();
-
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 5a832b7631b..1ee31f5ebbd 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011 		Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2011-2014 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014	   Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $langs->load("other");
+$localTaxType=GETPOST('localTaxType', 'int');
 
 $year=$_GET["year"];
 if ($year == 0 )
@@ -95,24 +96,41 @@ function pt ($db, $sql, $date)
 
 llxHeader();
 
-$tva = new Tva($db);
+if($localTaxType==1)
+{
+	$LT='LT1';
+	$LTSummary='LT1Summary';
+	$LTPaid='LT1Paid';
+	$LTCustomer='LT1Customer';
+	$LTSupplier='LT1Supplier';
+	$CalcLT= $conf->global->MAIN_INFO_LOCALTAX_CALC1;
+}
+else
+{
+	$LT='LT2';
+	$LTSummary='LT2Summary';
+	$LTPaid='LT2Paid';
+	$LTCustomer='LT2Customer';
+	$LTSupplier='LT2Supplier';
+	$CalcLT= $conf->global->MAIN_INFO_LOCALTAX_CALC2;
+}
 
 
-$textprevyear="<a href=\"index.php?year=" . ($year_current-1) . "\">".img_previous()."</a>";
-$textnextyear=" <a href=\"index.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
+$textprevyear="<a href=\"index.php?localTaxType=".$localTaxType."&year=" . ($year_current-1) . "\">".img_previous()."</a>";
+$textnextyear=" <a href=\"index.php?localTaxType=".$localTaxType."&year=" . ($year_current+1) . "\">".img_next()."</a>";
 
-print_fiche_titre($langs->transcountry("LT2",$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
+print_fiche_titre($langs->transcountry($LT,$mysoc->country_code),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
 
-print $langs->trans("VATReportBuildWithOptionDefinedInModule").'<br>';
-print '('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')<br>';
+print $langs->trans("LTReportBuildWithOptionDefinedInModule").'<br>';
+print '('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')<br>';
 print '<br>';
 
 print '<table width="100%" class="nobordernopadding">';
 print '<tr><td>';
-print_titre($langs->transcountry("LT2Summary",$mysoc->country_code));
+print_titre($langs->transcountry($LTSummary,$mysoc->country_code));
 
 print '</td><td width="5">&nbsp;</td><td>';
-print_titre($langs->transcountry("LT2Paid",$mysoc->country_code));
+print_titre($langs->transcountry($LTPaid,$mysoc->country_code));
 print '</td></tr>';
 
 print '<tr><td width="50%" valign="top">';
@@ -120,8 +138,20 @@ print '<tr><td width="50%" valign="top">';
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
 print "<td width=\"30%\">".$langs->trans("Year")." $y</td>";
-print "<td align=\"right\">".$langs->transcountry("LT2Customer",$mysoc->country_code)."</td>";
-print "<td align=\"right\">".$langs->transcountry("LT2Supplier",$mysoc->country_code)."</td>";
+if($CalcLT==0)
+{
+	print "<td align=\"right\">".$langs->transcountry($LTCustomer,$mysoc->country_code)."</td>";
+	print "<td align=\"right\">".$langs->transcountry($LTSupplier,$mysoc->country_code)."</td>";
+}
+if($CalcLT==1)
+{
+	print "<td align=\"right\">".$langs->transcountry($LTSupplier,$mysoc->country_code)."</td><td></td>";
+}
+if($CalcLT==2)
+{
+	print "<td align=\"right\">".$langs->transcountry($LTCustomer,$mysoc->country_code)."</td><td></td>";
+}
+
 print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
@@ -160,24 +190,59 @@ for ($m = 1 ; $m < 13 ; $m++ )
     $var=!$var;
     print "<tr ".$bc[$var].">";
     print '<td class="nowrap">'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'</td>';
-
-    $x_coll = 0;
-    foreach($coll_listsell as $vatrate=>$val)
+    if($CalcLT==0)
     {
-        $x_coll+=$val['localtax2'];
-    }
-    $subtotalcoll = $subtotalcoll + $x_coll;
-    print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td>";
+    	$x_coll = 0;
+	    foreach($coll_listsell as $vatrate=>$val)
+	    {
+	        $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
+	    }
+	    $subtotalcoll = $subtotalcoll + $x_coll;
+	    print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td>";
 
-    $x_paye = 0;
-    foreach($coll_listbuy as $vatrate=>$val)
+	    $x_paye = 0;
+	    foreach($coll_listbuy as $vatrate=>$val)
+	    {
+	        $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
+	    }
+	    $subtotalpaye = $subtotalpaye + $x_paye;
+	    print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td>";
+    }
+    elseif($CalcLT==1)
     {
-        $x_paye+=$val['localtax2'];
+    	$x_paye = 0;
+    	foreach($coll_listbuy as $vatrate=>$val)
+    	{
+    		$x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
+    	}
+    	$subtotalpaye = $subtotalpaye + $x_paye;
+    	print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td><td></td>";
     }
-    $subtotalpaye = $subtotalpaye + $x_paye;
-    print "<td class=\"nowrap\" align=\"right\">".price($x_paye)."</td>";
-
-    $diff = $x_coll - $x_paye;
+    elseif($CalcLT==2)
+    {
+    	$x_coll = 0;
+    	foreach($coll_listsell as $vatrate=>$val)
+    	{
+    		$x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
+    	}
+    	$subtotalcoll = $subtotalcoll + $x_coll;
+    	print "<td class=\"nowrap\" align=\"right\">".price($x_coll)."</td><td></td>";
+    
+    }
+	    
+    if($CalcLT==0)
+    {
+    	$diff= $x_coll - $x_paye;
+    }
+    elseif($CalcLT==1)
+    {
+    	$diff= $x_paye;
+    }
+    elseif($CalcLT==2)
+    {
+    	$diff= $x_coll;
+    }
+    
     $total = $total + $diff;
     $subtotal = $subtotal + $diff;
 
@@ -186,12 +251,26 @@ for ($m = 1 ; $m < 13 ; $m++ )
     print "</tr>\n";
 
     $i++;
-    if ($i > 2) {
+    if ($i > 2)
+    {
         print '<tr class="liste_total">';
         print '<td align="right">'.$langs->trans("SubTotal").':</td>';
-        print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td>';
-        print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>';
-        print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
+        if($CalcLT==0)
+        {
+        	print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td>';
+        	print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>';
+        	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
+        }
+        elseif($CalcLT==1)
+        {
+        	print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td><td></td>';
+        	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
+        }
+        elseif($CalcLT==2)
+        {
+        	print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td><td></td>';
+        	print '<td class="nowrap" align="right">'.price($subtotal).'</td>';
+        }
         print '<td>&nbsp;</td></tr>';
         $i = 0;
         $subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
@@ -214,6 +293,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."localtax as f";
 $sql.= " WHERE f.entity = ".$conf->entity;
 $sql.= " AND f.datev >= '".$db->idate(dol_get_first_day($y,1,false))."'";
 $sql.= " AND f.datev <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+$sql.= " AND localtaxtype=".$localTaxType;
 $sql.= " GROUP BY dm ASC";
 
 pt($db, $sql,$langs->trans("Year")." $y");
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
new file mode 100644
index 00000000000..b1b4aad7722
--- /dev/null
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -0,0 +1,668 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2007 Yannick Warnier      <ywarnier@beeznest.org>
+ * Copyright (C) 2014	   Rosana Romero 		<rromero@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/tva/quadri_detail.php
+ *      \ingroup    tax
+ *		\brief      Trimestrial page - detailed version
+ *		TODO 		Deal with recurrent invoices as well
+ */
+global $mysoc;
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+
+$langs->load("bills");
+$langs->load("compta");
+$langs->load("companies");
+$langs->load("products");
+
+$local=GETPOST('localTaxType', 'int');
+// Date range
+$year=GETPOST("year");
+if (empty($year))
+{
+	$year_current = strftime("%Y",dol_now());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$year_start = $year;
+}
+$date_start=dol_mktime(0,0,0,$_REQUEST["date_startmonth"],$_REQUEST["date_startday"],$_REQUEST["date_startyear"]);
+$date_end=dol_mktime(23,59,59,$_REQUEST["date_endmonth"],$_REQUEST["date_endday"],$_REQUEST["date_endyear"]);
+// Quarter
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+	$q=GETPOST("q");
+	if (empty($q))
+	{
+		if (isset($_REQUEST["month"])) { $date_start=dol_get_first_day($year_start,$_REQUEST["month"],false); $date_end=dol_get_last_day($year_start,$_REQUEST["month"],false); }
+		else
+		{
+            $month_current = strftime("%m",dol_now());
+            if ($month_current >= 10) $q=4;
+            elseif ($month_current >= 7) $q=3;
+            elseif ($month_current >= 4) $q=2;
+            else $q=1;
+		}
+	}
+	if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
+	if ($q==2) { $date_start=dol_get_first_day($year_start,4,false); $date_end=dol_get_last_day($year_start,6,false); }
+	if ($q==3) { $date_start=dol_get_first_day($year_start,7,false); $date_end=dol_get_last_day($year_start,9,false); }
+	if ($q==4) { $date_start=dol_get_first_day($year_start,10,false); $date_end=dol_get_last_day($year_start,12,false); }
+}
+
+$min = GETPOST("min");
+if (empty($min)) $min = 0;
+
+// Define modetax (0 or 1)
+// 0=normal, 1=option vat for services is on debit
+$modetax = $conf->global->TAX_MODE;
+if (isset($_REQUEST["modetax"])) $modetax=$_REQUEST["modetax"];
+if (empty($modetax)) $modetax=0;
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
+
+
+/*
+ * View
+ */
+
+$morequerystring='';
+$listofparams=array('date_startmonth','date_startyear','date_startday','date_endmonth','date_endyear','date_endday');
+foreach($listofparams as $param)
+{
+	if (GETPOST($param)!='') $morequerystring.=($morequerystring?'&':'').$param.'='.GETPOST($param);
+}
+
+llxHeader('','','','',0,0,'','',$morequerystring);
+
+$form=new Form($db);
+
+$company_static=new Societe($db);
+$invoice_customer=new Facture($db);
+$invoice_supplier=new FactureFournisseur($db);
+$product_static=new Product($db);
+$payment_static=new Paiement($db);
+$paymentfourn_static=new PaiementFourn($db);
+
+//print_fiche_titre($langs->trans("VAT"),"");
+
+//$fsearch.='<br>';
+$fsearch.='  <input type="hidden" name="year" value="'.$year.'">';
+$fsearch.='  <input type="hidden" name="modetax" value="'.$modetax.'">';
+//$fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
+//$fsearch.='  <input type="text" name="min" value="'.$min.'">';
+
+$calc=MAIN_INFO_LOCALTAX_CALC.$local;
+// Affiche en-tete du rapport
+if ($conf->global->$calc==0 || $conf->global->$calc==1)	// Calculate on invoice for goods and services
+{
+    $nom=$langs->trans($local==1?"LT1ReportByQuartersInDueDebtMode":"LT2ReportByQuartersInDueDebtMode");
+    $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT'.$local.'Rec");
+    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
+    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+    $prevyear=$year_start; $prevquarter=$q;
+	if ($prevquarter > 1) $prevquarter--;
+	else { $prevquarter=4; $prevyear--; }
+	$nextyear=$year_start; $nextquarter=$q;
+	if ($nextquarter < 4) $nextquarter++;
+	else { $nextquarter=1; $nextyear++; }
+	//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
+    //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
+    //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
+    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.='<br>'.$langs->trans("DepositsAreNotIncluded");
+	else  $description.='<br>'.$langs->trans("DepositsAreIncluded");
+    $description.=$fsearch;
+    $builddate=time();
+    //$exportlink=$langs->trans("NotYetAvailable");
+
+	$elementcust=$langs->trans("CustomersInvoices");
+	$productcust=$langs->trans("ProductOrService");
+	$amountcust=$langs->trans("AmountHT");
+	$vatcust=$langs->trans("VATReceived");
+	if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
+	$elementsup=$langs->trans("SuppliersInvoices");
+	$productsup=$langs->trans("ProductOrService");
+	$amountsup=$langs->trans("AmountHT");
+	$vatsup=$langs->trans("VATPaid");
+	if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+}
+if ($conf->global->$calc==2) 	// Invoice for goods, payment for services
+{
+    $nom=$langs->trans($local==1?"LT1ReportByQuartersInInputOutputMode":"LT2ReportByQuartersInInputOutputMode");
+    $calcmode=$calc==0?$langs->trans("CalcModeLT".$local):$langs->trans("CalcModeLT'.$local.'Rec");
+    $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT",DOL_URL_ROOT.'/admin/company.php').')';
+    $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+    $prevyear=$year_start; $prevquarter=$q;
+	if ($prevquarter > 1) $prevquarter--;
+	else { $prevquarter=4; $prevyear--; }
+	$nextyear=$year_start; $nextquarter=$q;
+	if ($nextquarter < 4) $nextquarter++;
+	else { $nextquarter=1; $nextyear++; }
+	//$periodlink=($prevyear?"<a href='".$_SERVER["PHP_SELF"]."?year=".$prevyear."&q=".$prevquarter."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".$nextyear."&q=".$nextquarter."&modetax=".$modetax."'>".img_next()."</a>":"");
+    if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.=' '.$langs->trans("DepositsAreNotIncluded");
+	else  $description.=' '.$langs->trans("DepositsAreIncluded");
+    //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
+    //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
+    $description.=$fsearch;
+	$builddate=time();
+    //$exportlink=$langs->trans("NotYetAvailable");
+
+	$elementcust=$langs->trans("CustomersInvoices");
+	$productcust=$langs->trans("ProductOrService");
+	$amountcust=$langs->trans("AmountHT");
+	$vatcust=$langs->trans("VATReceived");
+	if ($mysoc->tva_assuj) $vatcust.=' ('.$langs->trans("ToPay").')';
+	$elementsup=$langs->trans("SuppliersInvoices");
+	$productsup=$langs->trans("ProductOrService");
+	$amountsup=$langs->trans("AmountHT");
+	$vatsup=$langs->trans("VATPaid");
+	if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
+}
+report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
+
+
+if($local==1){
+	$vatcust=$langs->transcountry("LocalTax1", $mysoc->country_code);
+	$vatsup=$langs->transcountry("LocalTax1", $mysoc->country_code);
+}else{
+	$vatcust=$langs->transcountry("LocalTax2", $mysoc->country_code);
+	$vatsup=$langs->transcountry("LocalTax2", $mysoc->country_code);
+}
+
+// VAT Received and paid
+
+
+
+$y = $year_current;
+$total = 0;
+$i=0;
+
+// Load arrays of datas
+$x_coll= local_by_date($db, 0, 0, $date_start, $date_end, $modetax, 'sell', $local);
+//$x_coll = vat_by_date($db, 0, 0, $date_start, $date_end, $modetax, 'sell');
+$x_paye = local_by_date($db, 0, 0, $date_start, $date_end, $modetax, 'buy', $local);
+
+
+echo '<table class="noborder" width="100%">';
+
+if (! is_array($x_coll) || ! is_array($x_paye))
+{
+	$langs->load("errors");
+	if ($x_coll == -1)
+		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+	else if ($x_coll == -2)
+		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+	else
+		print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+}
+else
+{
+	$x_both = array();
+	//now, from these two arrays, get another array with one rate per line
+	foreach(array_keys($x_coll) as $my_coll_rate)
+	{
+		//foreach($x_coll[$my_coll_rate][localtax1_list]){
+		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
+		$x_both[$my_coll_rate]['coll']['vat']     = $x_coll[$my_coll_rate]['vat'];
+		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
+		$x_both[$my_coll_rate]['paye']['vat'] = 0;
+		$x_both[$my_coll_rate]['coll']['links'] = '';
+		$x_both[$my_coll_rate]['coll']['detail'] = array();
+		foreach($x_coll[$my_coll_rate]['facid'] as $id=>$dummy)
+		{
+			$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
+			$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
+			$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
+			$x_both[$my_coll_rate]['coll']['detail'][] = array(
+				'id'        =>$x_coll[$my_coll_rate]['facid'][$id],
+				'descr'     =>$x_coll[$my_coll_rate]['descr'][$id],
+				'pid'       =>$x_coll[$my_coll_rate]['pid'][$id],
+				'pref'      =>$x_coll[$my_coll_rate]['pref'][$id],
+				'ptype'     =>$x_coll[$my_coll_rate]['ptype'][$id],
+				'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
+				'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
+				'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
+				'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
+				'dtype'     =>$x_coll[$my_coll_rate]['dtype'][$id],
+				'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
+				'ddate_end'  =>$x_coll[$my_coll_rate]['ddate_end'][$id],
+				'totalht'   =>$x_coll[$my_coll_rate]['totalht_list'][$id],
+				'localtax1'=> $x_coll[$my_coll_rate]['localtax1_list'][$id],
+				'localtax2'=> $x_coll[$my_coll_rate]['localtax2_list'][$id],
+				'vat'       =>$x_coll[$my_coll_rate]['vat_list'][$id],
+				'link'      =>$invoice_customer->getNomUrl(1,'',12));
+		}
+	}
+	// tva paid
+	foreach(array_keys($x_paye) as $my_paye_rate){
+		$x_both[$my_paye_rate]['paye']['totalht'] = $x_paye[$my_paye_rate]['totalht'];
+		$x_both[$my_paye_rate]['paye']['vat'] = $x_paye[$my_paye_rate]['vat'];
+		if(!isset($x_both[$my_paye_rate]['coll']['totalht'])){
+			$x_both[$my_paye_rate]['coll']['totalht'] = 0;
+			$x_both[$my_paye_rate]['coll']['vat'] = 0;
+		}
+		$x_both[$my_paye_rate]['paye']['links'] = '';
+		$x_both[$my_paye_rate]['paye']['detail'] = array();
+
+		foreach($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
+		{
+			$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
+			$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
+			$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
+			$x_both[$my_paye_rate]['paye']['detail'][] = array(
+				'id'        =>$x_paye[$my_paye_rate]['facid'][$id],
+				'descr'     =>$x_paye[$my_paye_rate]['descr'][$id],
+				'pid'       =>$x_paye[$my_paye_rate]['pid'][$id],
+				'pref'      =>$x_paye[$my_paye_rate]['pref'][$id],
+				'ptype'     =>$x_paye[$my_paye_rate]['ptype'][$id],
+				'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
+				'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
+				'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
+				'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
+				'dtype'     =>$x_paye[$my_paye_rate]['dtype'][$id],
+				'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
+				'ddate_end'  =>$x_paye[$my_paye_rate]['ddate_end'][$id],
+				'totalht'   =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
+				'localtax1'=> $x_paye[$my_paye_rate]['localtax1_list'][$id],
+				'localtax2'=> $x_paye[$my_paye_rate]['localtax2_list'][$id],
+				'vat'       =>$x_paye[$my_paye_rate]['vat_list'][$id],
+				'link'      =>$invoice_supplier->getNomUrl(1,'',12));
+		}
+	}
+	//now we have an array (x_both) indexed by rates for coll and paye
+
+
+	//print table headers for this quadri - incomes first
+
+	$x_coll_sum = 0;
+	$x_coll_ht = 0;
+	$x_paye_sum = 0;
+	$x_paye_ht = 0;
+
+	$span=3;
+	if ($modetax == 0) $span+=2;
+
+	//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
+
+	if($conf->global->$calc ==0 || $conf->global->$calc == 2){
+		// Customers invoices
+		print '<tr class="liste_titre">';
+		print '<td align="left">'.$elementcust.'</td>';
+		print '<td align="left">'.$productcust.'</td>';
+		if ($modetax == 0)
+		{
+			print '<td align="right">'.$amountcust.'</td>';
+			print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+		}
+		print '<td align="right">'.$langs->trans("BI").'</td>';
+		print '<td align="right">'.$vatcust.'</td>';
+		print '</tr>';
+
+
+		$LT=0;
+		$sameLT=false;
+		foreach(array_keys($x_coll) as $rate)
+		{
+			$subtot_coll_total_ht = 0;
+			$subtot_coll_vat = 0;
+
+			if (is_array($x_both[$rate]['coll']['detail']))
+			{
+				// VAT Rate
+				$var=true;
+
+				if($rate!=0){
+					print "<tr>";
+					//print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
+					/**/
+					print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
+					print '</tr>'."\n";
+				}
+				foreach($x_both[$rate]['coll']['detail'] as $index => $fields)
+				{
+					if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0)){
+					// Define type
+					$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (! empty($fields['ddate_start'])) $type=1;
+					if (! empty($fields['ddate_end'])) $type=1;
+
+					$var=!$var;
+					print '<tr '.$bc[$var].'>';
+
+					// Ref
+					print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+
+					// Description
+					print '<td align="left">';
+					if ($fields['pid'])
+					{
+						$product_static->id=$fields['pid'];
+						$product_static->ref=$fields['pref'];
+						$product_static->type=$fields['ptype'];
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+					}
+					else
+					{
+						if ($type) $text = img_object($langs->trans('Service'),'service');
+						else $text = img_object($langs->trans('Product'),'product');
+			            if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg))
+			            {
+			                if ($reg[1]=='DEPOSIT') $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+			                elseif ($reg[1]=='CREDIT_NOTE') $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+			                else $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+			            }
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+						// Show range
+						print_date_range($fields['ddate_start'],$fields['ddate_end']);
+					}
+					print '</td>';
+
+					// Total HT
+					if ($modetax == 0)
+					{
+						print '<td class="nowrap" align="right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc']))
+						{
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// Payment
+					$ratiopaymentinvoice=1;
+					if ($modetax == 0)
+					{
+						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+						print '<td class="nowrap" align="right">';
+						//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+						{
+							$payment_static->id=$fields['payment_id'];
+							print $payment_static->getNomUrl(2);
+						}
+						if ($type == 0)
+						{
+							print $langs->trans("NotUsedForGoods");
+						}
+						else {
+							print $fields['payment_amount'];
+							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// Total collected
+					print '<td class="nowrap" align="right">';
+					$temp_ht=$fields['totalht'];
+					if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+					print price(price2num($temp_ht,'MT'));
+					print '</td>';
+
+					// Localtax
+					print '<td class="nowrap" align="right">';
+					$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
+					print price(price2num($temp_vat,'MT'));
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
+
+					$subtot_coll_total_ht += $temp_ht;
+					$subtot_coll_vat      += $temp_vat;
+					$x_coll_sum           += $temp_vat;
+				}
+			}
+			}
+			if($rate!=0){
+		        // Total customers for this vat rate
+		        print '<tr class="liste_total">';
+		        print '<td></td>';
+		        print '<td align="right">'.$langs->trans("Total").':</td>';
+		        if ($modetax == 0)
+		        {
+		            print '<td class="nowrap" align="right">&nbsp;</td>';
+		            print '<td align="right">&nbsp;</td>';
+		        }
+		        print '<td align="right">'.price(price2num($subtot_coll_total_ht,'MT')).'</td>';
+		        print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat,'MT')).'</td>';
+		        print '</tr>';
+			}
+		}
+
+	    if (count($x_coll) == 0)   // Show a total ine if nothing shown
+	    {
+	        print '<tr class="liste_total">';
+	        print '<td>&nbsp;</td>';
+	        print '<td align="right">'.$langs->trans("Total").':</td>';
+	        if ($modetax == 0)
+	        {
+	            print '<td class="nowrap" align="right">&nbsp;</td>';
+	            print '<td align="right">&nbsp;</td>';
+	        }
+	        print '<td align="right">'.price(price2num(0,'MT')).'</td>';
+	        print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
+	        print '</tr>';
+	    }
+
+	    // Blank line
+		print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
+		print '</table>';
+		$diff=$x_coll_sum;
+	}
+
+	if($conf->global->$calc ==0 || $conf->global->$calc == 1){
+		echo '<table class="noborder" width="100%">';
+		//print table headers for this quadri - expenses now
+		//imprime les en-tete de tables pour ce quadri - maintenant les d�penses
+		print '<tr class="liste_titre">';
+		print '<td align="left">'.$elementsup.'</td>';
+		print '<td align="left">'.$productsup.'</td>';
+		if ($modetax == 0)
+		{
+			print '<td align="right">'.$amountsup.'</td>';
+			print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+		}
+		print '<td align="right">'.$langs->trans("BI").'</td>';
+		print '<td align="right">'.$vatsup.'</td>';
+		print '</tr>'."\n";
+
+		foreach(array_keys($x_paye) as $rate)
+		{
+			$subtot_paye_total_ht = 0;
+			$subtot_paye_vat = 0;
+
+			if(is_array($x_both[$rate]['paye']['detail']))
+			{
+				$var=true;
+				if($rate!=0){
+					print "<tr>";
+					print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
+					print '</tr>'."\n";
+				}
+				foreach($x_both[$rate]['paye']['detail'] as $index=>$fields)
+				{
+					if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0)){
+					// Define type
+					$type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+					// Try to enhance type detection using date_start and date_end for free lines where type
+					// was not saved.
+					if (! empty($fields['ddate_start'])) $type=1;
+					if (! empty($fields['ddate_end'])) $type=1;
+
+					$var=!$var;
+					print '<tr '.$bc[$var].'>';
+
+					// Ref
+					print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+
+					// Description
+					print '<td align="left">';
+					if ($fields['pid'])
+					{
+						$product_static->id=$fields['pid'];
+						$product_static->ref=$fields['pref'];
+						$product_static->type=$fields['ptype'];
+						print $product_static->getNomUrl(1);
+						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+					}
+					else
+					{
+						if ($type) $text = img_object($langs->trans('Service'),'service');
+						else $text = img_object($langs->trans('Product'),'product');
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+						// Show range
+						print_date_range($fields['ddate_start'],$fields['ddate_end']);
+					}
+					print '</td>';
+
+					// Total HT
+					if ($modetax == 0)
+					{
+						print '<td class="nowrap" align="right">';
+						print price($fields['totalht']);
+						if (price2num($fields['ftotal_ttc']))
+						{
+							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+							$ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+							//print ' ('.round($ratiolineinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// Payment
+					$ratiopaymentinvoice=1;
+					if ($modetax == 0)
+					{
+						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+						print '<td class="nowrap" align="right">';
+						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+						{
+							$paymentfourn_static->id=$fields['payment_id'];
+							print $paymentfourn_static->getNomUrl(2);
+						}
+						if ($type == 0)
+						{
+							print $langs->trans("NotUsedForGoods");
+						}
+						else
+						{
+							print $fields['payment_amount'];
+							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+						}
+						print '</td>';
+					}
+
+					// VAT paid
+					print '<td class="nowrap" align="right">';
+					$temp_ht=$fields['totalht'];
+					if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+					print price(price2num($temp_ht,'MT'));
+					print '</td>';
+
+					// Localtax
+					print '<td class="nowrap" align="right">';
+					$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
+					print price(price2num($temp_vat,'MT'));
+					//print price($fields['vat']);
+					print '</td>';
+					print '</tr>';
+
+					$subtot_paye_total_ht += $temp_ht;
+					$subtot_paye_vat      += $temp_vat;
+					$x_paye_sum           += $temp_vat;
+				}
+			}
+			}
+			if($rate!=0){
+		        // Total suppliers for this vat rate
+		        print '<tr class="liste_total">';
+		        print '<td>&nbsp;</td>';
+		        print '<td align="right">'.$langs->trans("Total").':</td>';
+		        if ($modetax == 0)
+		        {
+		            print '<td class="nowrap" align="right">&nbsp;</td>';
+		            print '<td align="right">&nbsp;</td>';
+		        }
+		        print '<td align="right">'.price(price2num($subtot_paye_total_ht,'MT')).'</td>';
+		        print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat,'MT')).'</td>';
+		        print '</tr>';
+			}
+		}
+
+		if (count($x_paye) == 0)   // Show a total ine if nothing shown
+		{
+	        print '<tr class="liste_total">';
+	        print '<td>&nbsp;</td>';
+	        print '<td align="right">'.$langs->trans("Total").':</td>';
+	        if ($modetax == 0)
+	        {
+	            print '<td class="nowrap" align="right">&nbsp;</td>';
+	            print '<td align="right">&nbsp;</td>';
+	        }
+	        print '<td align="right">'.price(price2num(0,'MT')).'</td>';
+	        print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
+	        print '</tr>';
+		}
+
+	    print '</table>';
+	    $diff=$x_paye_sum;
+	}
+
+	if($conf->global->$calc ==0){$diff=$x_coll_sum - $x_paye_sum;}
+		echo '<table class="noborder" width="100%">';
+		// Total to pay
+	    print '<br><br>';
+	    print '<table class="noborder" width="100%">';
+	    //$diff = $local==1?$x_coll_sum:$x_paye_sum;
+		print '<tr class="liste_total">';
+		print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
+		print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n";
+		print "</tr>\n";
+
+		echo '</table>';
+
+	$i++;
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php
index 00199dba36f..6d8c1bc7a9c 100644
--- a/htdocs/compta/localtax/reglement.php
+++ b/htdocs/compta/localtax/reglement.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011		Juanjo Menent <jmenent@2byte.es>
+/* Copyright (C) 2011-2014		Juanjo Menent <jmenent@2byte.es>
  *
  * 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 @@ $langs->load("compta");
 $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
+$ltt=$_REQUEST["localTaxType"];
 
 /*
  * View
@@ -40,11 +41,11 @@ llxHeader();
 
 $localtax_static = new Localtax($db);
 
-print_fiche_titre($langs->transcountry("LT2Payments",$mysoc->country_code));
+print_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code));
 
 $sql = "SELECT rowid, amount, label, f.datev as dm";
 $sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
-$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " WHERE f.entity = ".$conf->entity." AND localtaxtype=".$ltt;
 $sql.= " ORDER BY dm DESC";
 
 $result = $db->query($sql);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 3aafa1c165b..56278f15c5d 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,14 +67,17 @@ if ($facid > 0)
 }
 
 // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('paiementcard'));
+$hookmanager->initHooks(array('paiementcard','globalcard'));
 
 $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');
+
 
 /*
  * Actions
  */
+
 if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes'))
 {
     $error = 0;
@@ -236,7 +240,7 @@ if ($action == 'confirm_paiement' && $confirm == 'yes')
             }
         }
         if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture.php?facid='.$invoiceid;
-        else $loc = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$paiement_id;
+        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
         header('Location: '.$loc);
         exit;
     }
@@ -374,19 +378,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						});
 			';
 
-			// Add user helper to input amount on invoices
-			if (! empty($conf->global->MAIN_JS_ON_PAYMENT) && $facture->type != 2)
-			{
-				print '	$("#payment_form").find("img").click(function() {
-							callForResult(jQuery(this).attr("id"));
-						});
-
-						$("#amountpayment").change(function() {
-							callForResult();
-						});';
-			}
-
 			print '	});'."\n";
+			if(!empty($conf->global->FAC_AUTO_FILLJS)){
+				//Add js for AutoFill
+				print ' $(document).ready(function () {';
+				print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+								$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
+							});';
+				print '	});'."\n";
+			}
 			print '	</script>'."\n";
 		}
 
@@ -412,7 +412,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         print '<td>'.$langs->trans('Comments').'</td></tr>';
 
         $rowspan=5;
-        if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT)) $rowspan++;
 
         // Payment mode
         print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
@@ -438,24 +437,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         }
         print "</tr>\n";
 
-        // Payment amount
-        if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT))
-        {
-            print '<tr><td><span class="fieldrequired">'.$langs->trans('AmountPayment').'</span></td>';
-            print '<td>';
-            if ($action == 'add_paiement')
-            {
-                print '<input id="amountpayment" name="amountpaymenthidden" size="8" type="text" value="'.(empty($_POST['amountpayment'])?'':$_POST['amountpayment']).'" disabled="disabled">';
-                print '<input name="amountpayment" type="hidden" value="'.(empty($_POST['amountpayment'])?'':$_POST['amountpayment']).'">';
-            }
-            else
-            {
-                print '<input id="amountpayment" name="amountpayment" size="8" type="text" value="'.(empty($_POST['amountpayment'])?'':$_POST['amountpayment']).'">';
-            }
-            print '</td>';
-            print '</tr>';
-        }
-
         // Cheque number
         print '<tr><td>'.$langs->trans('Numero');
         print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
@@ -528,7 +509,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 print '<td align="right">&nbsp;</td>';
                 print "</tr>\n";
 
-                $var=True;
+                $var=true;
                 $total=0;
                 $totalrecu=0;
                 $totalrecucreditnote=0;
@@ -578,10 +559,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
                     if ($action != 'add_paiement')
                     {
-                        if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT))
-                        {
-                            print img_picto($langs->trans('AddRemind'),'rightarrow.png','id="'.$objp->facid.'"');
-                        }
+						if(!empty($conf->global->FAC_AUTO_FILLJS))
+							print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
                         print '<input type=hidden name="'.$nameRemain.'" value="'.$remaintopay.'">';
                         print '<input type="text" size="8" name="'.$namef.'" value="'.$_POST[$namef].'">';
                     }
@@ -708,15 +687,15 @@ if (! GETPOST('action'))
     {
         $num = $db->num_rows($resql);
         $i = 0;
-        $var=True;
+        $var=true;
 
-        print_barre_liste($langs->trans('Payments'), $page, 'paiement.php','',$sortfield,$sortorder,'',$num);
+        print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num);
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print_liste_field_titre($langs->trans('Invoice'),'paiement.php','facnumber','','','',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Date'),'paiement.php','dp','','','',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Type'),'paiement.php','libelle','','','',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Amount'),'paiement.php','fa_amount','','','align="right"',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'facnumber','','','',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','','','',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Type'),$_SERVER["PHP_SELF"],'libelle','','','',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'fa_amount','','','align="right"',$sortfield,$sortorder);
         print '<td>&nbsp;</td>';
         print "</tr>\n";
 
diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php
index 70e7507b96e..1afdf0e2c80 100644
--- a/htdocs/compta/paiement/avalider.php
+++ b/htdocs/compta/paiement/avalider.php
@@ -80,14 +80,14 @@ if ($resql)
     $i = 0;
     $var=True;
 
-    print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, "avalider.php","",$sortfield,$sortorder,'',$num);
+    print_barre_liste($langs->trans("ReceivedCustomersPaymentsToValid"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num);
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Ref"),"avalider.php","p.rowid","","",'width="60"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Date"),"avalider.php","dp","","",'width="80" align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Type"),"avalider.php","c.libelle","","","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("AmountTTC"),"avalider.php","c.libelle","","",'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.rowid","","",'width="60"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","","",'width="80" align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle","","","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"c.libelle","","",'align="right"',$sortfield,$sortorder);
     print "<td>&nbsp;</td>";
     print "</tr>\n";
 
@@ -96,7 +96,7 @@ if ($resql)
         $objp = $db->fetch_object($resql);
         $var=!$var;
         print "<tr ".$bc[$var].">";
-        print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.'</a></td>';
+        print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.'</a></td>';
         print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
         print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
         print '<td align="right">'.price($objp->amount).'</td>';
@@ -104,7 +104,7 @@ if ($resql)
 
         if ($objp->statut == 0)
         {
-            print '<a href="fiche.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
+            print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
         }
         else
         {
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
new file mode 100644
index 00000000000..d0e15307be5
--- /dev/null
+++ b/htdocs/compta/paiement/card.php
@@ -0,0 +1,399 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/paiement/card.php
+ *		\ingroup    facture
+ *		\brief      Page of a customer payment
+ *		\remarks	Nearly same file than fournisseur/paiement/card.php
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load('bills');
+$langs->load('banks');
+$langs->load('companies');
+
+// Security check
+$id=GETPOST('id','int');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+if ($user->societe_id) $socid=$user->societe_id;
+// TODO ajouter regle pour restreindre acces paiement
+//$result = restrictedArea($user, 'facture', $id,'');
+
+$object = new Paiement($db);
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'setnote' && $user->rights->facture->paiement)
+{
+    $db->begin();
+
+    $object->fetch($id);
+    $result = $object->update_note(GETPOST('note'));
+    if ($result > 0)
+    {
+        $db->commit();
+        $action='';
+    }
+    else
+    {
+	    setEventMessage($object->error, 'errors');
+        $db->rollback();
+    }
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->paiement)
+{
+	$db->begin();
+
+	$object->fetch($id);
+	$result = $object->delete();
+	if ($result > 0)
+	{
+        $db->commit();
+        header("Location: list.php");
+        exit;
+	}
+	else
+	{
+	    $langs->load("errors");
+		setEventMessage($langs->trans($object->error), 'errors');
+        $db->rollback();
+	}
+}
+
+if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->paiement)
+{
+	$db->begin();
+
+    $object->fetch($id);
+	if ($object->valide() > 0)
+	{
+		$db->commit();
+
+		// Loop on each invoice linked to this payment to rebuild PDF
+		$factures=array();
+		foreach($factures as $id)
+		{
+			$fac = new Facture($db);
+			$fac->fetch($id);
+
+			$outputlangs = $langs;
+			if (! empty($_REQUEST['lang_id']))
+			{
+				$outputlangs = new Translate("",$conf);
+				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+			}
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				$fac->generateDocument($fac->modelpdf, $outputlangs);
+			}
+		}
+
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+	    $langs->load("errors");
+		setEventMessage($langs->trans($object->error), 'errors');
+		$db->rollback();
+	}
+}
+
+if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement']))
+{
+	$object->fetch($id);
+    $res = $object->update_num($_POST['num_paiement']);
+	if ($res === 0)
+	{
+		setEventMessage($langs->trans('PaymentNumberUpdateSucceeded'));
+	}
+	else
+	{
+		setEventMessage($langs->trans('PaymentNumberUpdateFailed'), 'errors');
+	}
+}
+
+if ($action == 'setdatep' && ! empty($_POST['datepday']))
+{
+	$object->fetch($id);
+    $datepaye = dol_mktime(12, 0, 0, $_POST['datepmonth'], $_POST['datepday'], $_POST['datepyear']);
+	$res = $object->update_date($datepaye);
+	if ($res === 0)
+	{
+		setEventMessage($langs->trans('PaymentDateUpdateSucceeded'));
+	}
+	else
+	{
+		setEventMessage($langs->trans('PaymentDateUpdateFailed'), 'errors');
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$thirdpartystatic=new Societe($db);
+
+$result=$object->fetch($id);
+if ($result <= 0)
+{
+	dol_print_error($db,'Payement '.$id.' not found in database');
+	exit;
+}
+
+$form = new Form($db);
+
+$head = payment_prepare_head($object);
+
+dol_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), 0, 'payment');
+
+/*
+ * Confirmation de la suppression du paiement
+ */
+if ($action == 'delete')
+{
+	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
+
+}
+
+/*
+ * Confirmation de la validation du paiement
+ */
+if ($action == 'valide')
+{
+	$facid = $_GET['facid'];
+	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
+
+}
+
+print '<table class="border" width="100%">';
+
+// Ref
+print '<tr><td valign="top" width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$object->id.'</td></tr>';
+
+// Date payment
+print '<tr><td valign="top">'.$form->editfieldkey("Date",'datep',$object->date,$object,$user->rights->facture->paiement).'</td><td colspan="3">';
+print $form->editfieldval("Date",'datep',$object->date,$object,$user->rights->facture->paiement,'datepicker','',null,$langs->trans('PaymentDateUpdateSucceeded'));
+print '</td></tr>';
+
+// Payment type (VIR, LIQ, ...)
+$labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->type_libelle;
+print '<tr><td valign="top">'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$labeltype.'</td></tr>';
+
+// Payment numero
+print '<tr><td valign="top">'.$form->editfieldkey("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+print $form->editfieldval("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'string','',null,$langs->trans('PaymentNumberUpdateSucceeded'));
+print '</td></tr>';
+
+// Amount
+print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->montant,'',$langs,0,0,-1,$conf->currency).'</td></tr>';
+
+// Note
+print '<tr><td valign="top">'.$form->editfieldkey("Note",'note',$object->note,$object,$user->rights->facture->paiement).'</td><td colspan="3">';
+print $form->editfieldval("Note",'note',$object->note,$object,$user->rights->facture->paiement,'textarea');
+print '</td></tr>';
+
+// Bank account
+if (! empty($conf->banque->enabled))
+{
+    if ($object->bank_account)
+    {
+    	$bankline=new AccountLine($db);
+    	$bankline->fetch($object->bank_line);
+
+    	print '<tr>';
+    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<td colspan="3">';
+		print $bankline->getNomUrl(1,0,'showconciliated');
+    	print '</td>';
+    	print '</tr>';
+
+    	print '<tr>';
+    	print '<td>'.$langs->trans('BankAccount').'</td>';
+		print '<td colspan="3">';
+		$accountstatic=new Account($db);
+        $accountstatic->id=$bankline->fk_account;
+	    $accountstatic->label=$bankline->bank_account_ref.' - '.$bankline->bank_account_label;
+        print $accountstatic->getNomUrl(0);
+    	print '</td>';
+    	print '</tr>';
+
+		if($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
+			dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
+			$bordereau = new RemiseCheque($db);
+			$bordereau->fetch($bankline->fk_bordereau);
+
+			print '<tr>';
+	    	print '<td>'.$langs->trans('CheckReceipt').'</td>';
+			print '<td colspan="3">';
+			print $bordereau->getNomUrl(1);
+	    	print '</td>';
+	    	print '</tr>';
+		}
+    }
+}
+
+print '</table>';
+
+
+/*
+ * List of invoices
+ */
+
+$disable_delete = 0;
+$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom as name, s.rowid as socid';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
+$sql.= ' WHERE pf.fk_facture = f.rowid';
+$sql.= ' AND f.fk_soc = s.rowid';
+$sql.= ' AND f.entity = '.$conf->entity;
+$sql.= ' AND pf.fk_paiement = '.$object->id;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$i = 0;
+	$total = 0;
+	print '<br><table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans('Bill').'</td>';
+	print '<td>'.$langs->trans('Company').'</td>';
+	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
+    print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
+    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
+    print '<td align="right">'.$langs->trans('Status').'</td>';
+	print "</tr>\n";
+
+	if ($num > 0)
+	{
+		$var=True;
+
+		while ($i < $num)
+		{
+			$objp = $db->fetch_object($resql);
+			$var=!$var;
+			print '<tr '.$bc[$var].'>';
+
+            $invoice=new Facture($db);
+            $invoice->fetch($objp->facid);
+            $paiement = $invoice->getSommePaiement();
+            $creditnotes=$invoice->getSumCreditNotesUsed();
+            $deposits=$invoice->getSumDepositsUsed();
+            $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
+            $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
+
+            // Invoice
+			print '<td>';
+			print $invoice->getNomUrl(1);
+			print "</td>\n";
+
+			// Third party
+			print '<td>';
+			$thirdpartystatic->id=$objp->socid;
+			$thirdpartystatic->name=$objp->name;
+			print $thirdpartystatic->getNomUrl(1);
+			print '</td>';
+
+			// Expected to pay
+			print '<td align="right">'.price($objp->total_ttc).'</td>';
+
+            // Amount payed
+            print '<td align="right">'.price($objp->amount).'</td>';
+
+            // Remain to pay
+            print '<td align="right">'.price($remaintopay).'</td>';
+
+			// Status
+			print '<td align="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
+
+			print "</tr>\n";
+			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
+			{
+				$disable_delete = 1;
+			}
+			$total = $total + $objp->amount;
+			$i++;
+		}
+	}
+	$var=!$var;
+
+	print "</table>\n";
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+print '</div>';
+
+
+/*
+ * Boutons Actions
+ */
+
+print '<div class="tabsAction">';
+
+if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+{
+	if ($user->societe_id == 0 && $object->statut == 0 && $_GET['action'] == '')
+	{
+		if ($user->rights->facture->paiement)
+		{
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+		}
+	}
+}
+
+if ($user->societe_id == 0 && $action == '')
+{
+	if ($user->rights->facture->paiement)
+	{
+		if (! $disable_delete)
+		{
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+		}
+		else
+		{
+			print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
+		}
+	}
+}
+
+print '</div>';
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
new file mode 100644
index 00000000000..0c5eeca3689
--- /dev/null
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -0,0 +1,719 @@
+<?php
+/* Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2007-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013 		Philippe Grand      	<philippe.grand@atoo-net.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/paiement/cheque/card.php
+ *	\ingroup    bank, invoice
+ *	\brief      Page for cheque deposits
+ */
+
+require('../../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
+$langs->load('bills');
+$langs->load('companies');
+$langs->load('compta');
+
+$id =GETPOST('id','int');
+$ref=GETPOST('ref', 'alpha');
+$action=GETPOST('action', 'alpha');
+$confirm=GETPOST('confirm', 'alpha');
+
+// Security check
+$fieldname = (! empty($ref)?'number':'rowid');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque','','',$fieldname);
+
+$sortfield=GETPOST('sortfield', 'alpha');
+$sortorder=GETPOST('sortorder', 'alpha');
+$page=GETPOST('page', 'int');
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="b.dateo,b.rowid";
+if ($page < 0) { $page = 0 ; }
+$limit = $conf->liste_limit;
+$offset = $limit * $page ;
+
+$dir=$conf->banque->dir_output.'/bordereau/';
+$filterdate=dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear'));
+$filteraccountid=GETPOST('accountid');
+
+$object = new RemiseCheque($db);
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'setdate' && $user->rights->banque->cheque)
+{
+    $result = $object->fetch(GETPOST('id','int'));
+    if ($result > 0)
+    {
+        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+        $date=dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
+
+        $result=$object->set_date($user,$date);
+        if ($result < 0)
+        {
+			setEventMessage($object->error, 'errors');
+        }
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+/*
+ * Actions
+ */
+
+if ($action == 'setrefext' && $user->rights->banque->cheque)
+{
+    $result = $object->fetch(GETPOST('id','int'));
+    if ($result > 0)
+    {
+        $ref_ext = GETPOST('ref_ext');
+
+        $result=$object->setValueFrom('ref_ext', $ref_ext);
+        if ($result < 0)
+        {
+            setEventMessage($object->error, 'errors');
+        }
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+if ($action == 'setref' && $user->rights->banque->cheque)
+{
+	$result = $object->fetch(GETPOST('id','int'));
+	if ($result > 0)
+	{
+		$number=GETPOST('number');
+
+		$result=$object->set_number($user,$number);
+		if ($result < 0)
+		{
+			setEventMessage($object->error, 'errors');
+		}
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->cheque)
+{
+	if (is_array($_POST['toRemise']))
+	{
+		$result = $object->create($user, $_POST["accountid"], 0, $_POST['toRemise']);
+		if ($result > 0)
+		{
+	        if ($object->statut == 1)     // If statut is validated, we build doc
+	        {
+	            $object->fetch($object->id);    // To force to reload all properties in correct property name
+	    	    // Define output language
+	    	    $outputlangs = $langs;
+	            $newlang='';
+	            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+	            //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	            if (! empty($newlang))
+	            {
+	                $outputlangs = new Translate("",$conf);
+	                $outputlangs->setDefaultLang($newlang);
+	            }
+	            $result = $object->generatePdf($_POST["model"], $outputlangs);
+	        }
+
+       		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+        	exit;
+		}
+		else
+		{
+			setEventMessage($object->error, 'errors');
+		}
+	}
+	else
+	{
+		setEventMessage($langs->trans("ErrorSelectAtLeastOne"));
+	    $action='new';
+	}
+}
+
+if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banque->cheque)
+{
+	$object->id = $id;
+	$result = $object->removeCheck($_GET["lineid"]);
+	if ($result === 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->cheque)
+{
+	$object->id = $id;
+	$result = $object->delete();
+	if ($result == 0)
+	{
+		header("Location: index.php");
+		exit;
+	}
+	else
+	{
+		setEventMessage($paiement->error, 'errors');
+	}
+}
+
+if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->cheque)
+{
+	$result = $object->fetch($id);
+	$result = $object->validate($user);
+	if ($result >= 0)
+	{
+        // Define output language
+        $outputlangs = $langs;
+        $newlang='';
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+        //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+        if (! empty($newlang))
+        {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang($newlang);
+        }
+        $result = $object->generatePdf(GETPOST('model'), $outputlangs);
+
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($paiement->error, 'errors');
+	}
+}
+
+if ($action == 'builddoc' && $user->rights->banque->cheque)
+{
+	$result = $object->fetch($id);
+
+	// Save last template used to generate document
+	//if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+    $outputlangs = $langs;
+    $newlang='';
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+    //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+    if (! empty($newlang))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang($newlang);
+    }
+	$result = $object->generatePdf($_POST["model"], $outputlangs);
+	if ($result <= 0)
+	{
+		dol_print_error($db,$object->error);
+		exit;
+	}
+	else
+	{
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
+		exit;
+	}
+}
+
+// Remove file in doc form
+else if ($action == 'remove_file' && $user->rights->banque->cheque)
+{
+	if ($object->fetch($id) > 0)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$langs->load("other");
+
+		$file=$dir.get_exdir($object->number,2,1) . GETPOST('file');
+		$ret=dol_delete_file($file,0,0,0,$object);
+		if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('file')));
+		else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), 'errors');
+	}
+}
+
+
+/*
+ * View
+ */
+
+if (GETPOST('removefilter'))
+{
+    $filterdate='';
+    $filteraccountid=0;
+}
+
+llxHeader();
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+
+if ($action == 'new')
+{
+	$h=0;
+	$head[$h][0] = $_SERVER["PHP_SELF"].'?action=new';
+	$head[$h][1] = $langs->trans("MenuChequeDeposits");
+	$hselected = $h;
+	$h++;
+
+	print_fiche_titre($langs->trans("Cheques"));
+}
+else
+{
+	$result = $object->fetch($id, $ref);
+	if ($result < 0)
+	{
+		dol_print_error($db,$object->error);
+		exit;
+	}
+
+	$h=0;
+	$head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id;
+	$head[$h][1] = $langs->trans("CheckReceipt");
+	$hselected = $h;
+	$h++;
+	//  $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/info.php?id='.$object->id;
+	//  $head[$h][1] = $langs->trans("Info");
+	//  $h++;
+
+	dol_fiche_head($head, $hselected, $langs->trans("Cheques"),0,'payment');
+
+	/*
+	 * Confirmation de la suppression du bordereau
+	 */
+	if ($action == 'delete')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("DeleteCheckReceipt"), $langs->trans("ConfirmDeleteCheckReceipt"), 'confirm_delete','','',1);
+		
+	}
+
+	/*
+	 * Confirmation de la validation du bordereau
+	 */
+	if ($action == 'valide')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide','','',1);
+		
+	}
+}
+
+$accounts = array();
+
+if ($action == 'new')
+{
+	$lines = array();
+
+	$now=dol_now();
+
+	print $langs->trans("SelectChequeTransactionAndGenerate").'<br><br>'."\n";
+
+	print '<form class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="action" value="new">';
+    //print '<fieldset><legend>aaa</legend>';
+	print '<table class="border" width="100%">';
+	//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
+	// Filter
+	print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>';
+	print $form->select_date($filterdate,'fd',0,0,1,'',1,1);
+	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
+    print $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
+    print '</td></tr>';
+	print '</table>';
+    print '<center>';
+	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
+    if ($filterdate || $filteraccountid > 0)
+    {
+    	print ' &nbsp; ';
+    	print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    }
+	print '</center>';
+    //print '</fieldset>';
+	print '</form>';
+	print '<br>';
+
+	$sql = "SELECT ba.rowid as bid, b.datec as datec, b.dateo as date, b.rowid as chqid, ";
+	$sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque";
+	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
+	$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
+	$sql.= " WHERE b.fk_type = 'CHQ'";
+	$sql.= " AND b.fk_account = ba.rowid";
+	$sql.= " AND ba.entity = ".$conf->entity;
+	$sql.= " AND b.fk_bordereau = 0";
+	$sql.= " AND b.amount > 0";
+	if ($filterdate)          $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
+    if ($filteraccountid > 0) $sql.=" AND ba.rowid= '".$filteraccountid."'";
+	$sql.= $db->order("b.dateo,b.rowid","ASC");
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		while ( $obj = $db->fetch_object($resql) )
+		{
+			$accounts[$obj->bid] = $obj->label;
+			$lines[$obj->bid][$i]["date"] = $db->jdate($obj->date);
+			$lines[$obj->bid][$i]["amount"] = $obj->amount;
+			$lines[$obj->bid][$i]["emetteur"] = $obj->emetteur;
+			$lines[$obj->bid][$i]["numero"] = $obj->num_chq;
+			$lines[$obj->bid][$i]["banque"] = $obj->banque;
+			$lines[$obj->bid][$i]["id"] = $obj->chqid;
+			$i++;
+		}
+
+		if ($i == 0)
+		{
+			print '<b>'.$langs->trans("NoWaitingChecks").'</b><br>';
+		}
+	}
+
+	foreach ($accounts as $bid => $account_label)
+	{
+
+        print '
+        <script language="javascript" type="text/javascript">
+        jQuery(document).ready(function()
+        {
+            jQuery("#checkall_'.$bid.'").click(function()
+            {
+                jQuery(".checkforremise_'.$bid.'").attr(\'checked\', true);
+            });
+            jQuery("#checknone_'.$bid.'").click(function()
+            {
+                jQuery(".checkforremise_'.$bid.'").attr(\'checked\', false);
+            });
+        });
+        </script>
+        ';
+
+		$num = $db->num_rows($resql);
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="create">';
+		print '<input type="hidden" name="accountid" value="'.$bid.'">';
+
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' ';
+		print "</td>\n";
+		print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
+		print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
+		print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
+		print '<td align="right" width="100px">'.$langs->trans("Amount")."</td>\n";
+		print '<td align="center" width="100px">'.$langs->trans("Select")."<br>";
+		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
+		print '</td>';
+
+		print "</tr>\n";
+
+		$var=true;
+
+		foreach ($lines[$bid] as $lid => $value)
+		{
+			$var=!$var;
+
+			$account_id = $bid;
+			if (! isset($accounts[$bid]))
+				$accounts[$bid]=0;
+			$accounts[$bid] += 1;
+
+			print "<tr ".$bc[$var].">";
+			print '<td>'.dol_print_date($value["date"],'day').'</td>';
+			print '<td>'.$value["numero"]."</td>\n";
+			print '<td>'.$value["emetteur"]."</td>\n";
+			print '<td>'.$value["banque"]."</td>\n";
+			print '<td align="right">'.price($value["amount"]).'</td>';
+			print '<td align="center">';
+			print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked="checked" type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
+			print '</td>' ;
+			print '</tr>';
+
+			$i++;
+		}
+		print "</table>";
+
+		print '<div class="tabsAction">';
+		if ($user->rights->banque->cheque)
+		{
+			print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn',$account_label).'">';
+		}
+		else
+		{
+			print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn',$account_label).'</a>';
+		}
+		print '</div><br>';
+		print '</form>';
+	}
+
+}
+else
+{
+	$linkback='<a href="'.$_SERVER["PHP_SELF"].'?leftmenu=customers_bills_checks&action=new">'.$langs->trans("BackToList").'</a>';
+	$paymentstatic=new Paiement($db);
+	$accountlinestatic=new AccountLine($db);
+	$accountstatic=new Account($db);
+
+	$accountstatic->id=$object->account_id;
+	$accountstatic->label=$object->account_label;
+
+	print '<table class="border" width="100%">';
+	print '<tr><td width=20%>';
+
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('Ref');
+	print '</td>';
+	if ($action != 'editref') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editref&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRef'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editref')
+	{
+		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="setref">';
+		print '<input type="text" name="number" value="'.$object->number.'">';
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+	    print $form->showrefnav($object,'ref',$linkback, 1, 'number');
+	}
+
+	print '</td>';
+	print '</tr>';
+
+	print '<tr><td>';
+
+    print '<table class="nobordernopadding" width="100%"><tr><td>';
+    print $langs->trans('Date');
+    print '</td>';
+    if ($action != 'editdate') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'),1).'</a></td>';
+    print '</tr></table>';
+    print '</td><td colspan="2">';
+    if ($action == 'editdate')
+    {
+        print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="setdate">';
+        $form->select_date($object->date_bordereau,'datecreate_','','','',"setdate");
+        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+        print '</form>';
+    }
+    else
+    {
+        print $object->date_bordereau ? dol_print_date($object->date_bordereau,'day') : '&nbsp;';
+    }
+
+	print '</td>';
+	print '</tr>';
+
+	// External ref
+	print '<tr><td>';
+
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+    print $langs->trans('RefExt');
+    print '</td>';
+    if ($action != 'editrefext') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
+    print '</tr></table>';
+    print '</td><td colspan="2">';
+    if ($action == 'editrefext')
+    {
+        print '<form name="setrefext" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="setrefext">';
+        print '<input type="text" name="ref_ext" value="'.$object->ref_ext.'">';
+        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+        print '</form>';
+    }
+    else
+    {
+        print $object->ref_ext;
+    }
+
+	print '</td>';
+	print '</tr>';
+
+	print '<tr><td>'.$langs->trans('Account').'</td><td colspan="2">';
+	print $accountstatic->getNomUrl(1);
+	print '</td></tr>';
+
+	// Nb of cheques
+	print '<tr><td>'.$langs->trans('NbOfCheques').'</td><td colspan="2">';
+	print $object->nbcheque;
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans('Total').'</td><td colspan="2">';
+	print price($object->amount);
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans('Status').'</td><td colspan="2">';
+	print $object->getLibStatut(4);
+	print '</td></tr>';
+
+	print '</table><br>';
+
+
+	// Liste des cheques
+	$sql = "SELECT b.rowid, b.amount, b.num_chq, b.emetteur,";
+	$sql.= " b.dateo as date, b.datec as datec, b.banque,";
+	$sql.= " p.rowid as pid, ba.rowid as bid";
+	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
+	$sql.= ", ".MAIN_DB_PREFIX."bank as b";
+	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
+	$sql.= " WHERE ba.rowid = b.fk_account";
+	$sql.= " AND ba.entity = ".$conf->entity;
+	$sql.= " AND b.fk_type= 'CHQ'";
+	$sql.= " AND b.fk_bordereau = ".$object->id;
+	$sql.= " ORDER BY $sortfield $sortorder";
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+
+		print '<table class="noborder" width="100%">';
+
+		$param="&amp;id=".$object->id;
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans("Cheques"),'','','','','width="30"');
+		print_liste_field_titre($langs->trans("DateChequeReceived"),$_SERVER["PHP_SELF"],"b.dateo,b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"b.num_chq", "",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("CheckTransmitter"),$_SERVER["PHP_SELF"],"b.emetteur", "",$param,"",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Bank"),$_SERVER["PHP_SELF"],"b.banque", "",$param,"",$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"b.amount", "",$param,'align="right"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("LineRecord"),$_SERVER["PHP_SELF"],"b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre('','','');
+		print "</tr>\n";
+		$i=1;
+		$var=false;
+		while ($objp = $db->fetch_object($resql))
+		{
+			$account_id = $objp->bid;
+			if (! isset($accounts[$objp->bid]))
+				$accounts[$objp->bid]=0;
+			$accounts[$objp->bid] += 1;
+
+			print "<tr ".$bc[$var].">";
+			print '<td align="center">'.$i.'</td>';
+			print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>';	// Date operation
+			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
+			print '<td>'.dol_trunc($objp->emetteur,24).'</td>';
+			print '<td>'.dol_trunc($objp->banque,24).'</td>';
+			print '<td align="right">'.price($objp->amount).'</td>';
+			print '<td align="center">';
+			$accountlinestatic->rowid=$objp->rowid;
+			if ($accountlinestatic->rowid)
+			{
+				print $accountlinestatic->getNomUrl(1);
+			}
+			else
+			{
+				print '&nbsp;';
+			}
+			print '</td>';
+			if ($object->statut == 0)
+			{
+				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a></td>';
+			}
+			else
+			{
+				print '<td>&nbsp;</td>';
+			}
+			print '</tr>';
+			$var=!$var;
+			$i++;
+		}
+		print "</table>";
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+
+    dol_fiche_end();
+}
+
+
+
+
+/*
+ * Boutons Actions
+ */
+
+print '<div class="tabsAction">';
+
+/*if ($user->societe_id == 0 && count($accounts) == 1 && $action == 'new' && $user->rights->banque->cheque)
+{
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create&amp;accountid='.$account_id.'">'.$langs->trans('NewCheckReceipt').'</a>';
+}*/
+
+if ($user->societe_id == 0 && ! empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
+{
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Valid').'</a>';
+}
+
+if ($user->societe_id == 0 && ! empty($object->id) && $user->rights->banque->cheque)
+{
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';
+
+}
+print '</div>';
+
+
+
+if ($action != 'new')
+{
+	if ($object->statut == 1)
+	{
+		$filename=dol_sanitizeFileName($object->ref);
+		$filedir=$dir.get_exdir($object->number,2,1) . dol_sanitizeFileName($object->ref);
+		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+
+		$formfile->show_documents('remisecheque', $filename, $filedir, $urlsource, 1, 1);
+
+		print '<br>';
+	}
+}
+
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/paiement/cheque/class/index.html b/htdocs/compta/paiement/cheque/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 917c88e0743..922ab54ac7c 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -73,7 +73,7 @@ class RemiseCheque extends CommonObject
 		if ($id)  $sql.= " AND bc.rowid = ".$id;
 		if ($ref) $sql.= " AND bc.number = '".$this->db->escape($ref)."'";
 
-		dol_syslog("RemiseCheque::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog("RemiseCheque::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -155,7 +155,7 @@ class RemiseCheque extends CommonObject
 		$sql.= ", ''";
 		$sql.= ")";
 
-		dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+		dol_syslog("RemiseCheque::Create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ( $resql )
 		{
@@ -172,7 +172,7 @@ class RemiseCheque extends CommonObject
 				$sql.= " SET number='(PROV".$this->id.")'";
 				$sql.= " WHERE rowid='".$this->id."';";
 
-				dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+				dol_syslog("RemiseCheque::Create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (! $resql)
 				{
@@ -192,7 +192,7 @@ class RemiseCheque extends CommonObject
 				$sql.= " AND b.fk_account='".$account_id."'";
 				if ($limit) $sql.= $this->db->plimit($limit);
 
-				dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+				dol_syslog("RemiseCheque::Create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
@@ -225,7 +225,7 @@ class RemiseCheque extends CommonObject
 						$sql.= " SET fk_bordereau = ".$this->id;
 						$sql.= " WHERE rowid = ".$lineid;
 
-						dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+						dol_syslog("RemiseCheque::Create", LOG_DEBUG);
 						$resql = $this->db->query($sql);
 						if (!$resql)
 						{
@@ -250,7 +250,6 @@ class RemiseCheque extends CommonObject
 			$this->errno = -1;
 			$this->error=$this->db->lasterror();
 			$this->errno=$this->db->lasterrno();
-			dol_syslog("RemiseCheque::Create Error ".$this->error, LOG_ERR);
 		}
 
 	    if (! $this->errno && ! empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
@@ -351,7 +350,7 @@ class RemiseCheque extends CommonObject
 			$sql.= " AND entity = ".$conf->entity;
 			$sql.= " AND statut = 0";
 
-			dol_syslog("RemiseCheque::Validate sql=".$sql, LOG_DEBUG);
+			dol_syslog("RemiseCheque::Validate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ( $resql )
 			{
@@ -410,7 +409,7 @@ class RemiseCheque extends CommonObject
 		$sql.= " WHERE entity = ".$conf->entity;
 		$sql.= " AND number not like '(%'";
 
-		dol_syslog("Remisecheque::getNextNumber sql=".$sql);
+		dol_syslog("Remisecheque::getNextNumber", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -510,7 +509,7 @@ class RemiseCheque extends CommonObject
 			$sql.= " AND bc.entity = ".$conf->entity;
 			$sql.= " ORDER BY b.dateo ASC, b.rowid ASC";
 
-			dol_syslog("RemiseCheque::generatePdf sql=".$sql, LOG_DEBUG);
+			dol_syslog("RemiseCheque::generatePdf", LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result)
 			{
@@ -705,7 +704,7 @@ class RemiseCheque extends CommonObject
             $sql.= " SET date_bordereau = ".($date ? $this->db->idate($date) : 'null');
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog("RemiseCheque::set_date sql=$sql",LOG_DEBUG);
+            dol_syslog("RemiseCheque::set_date", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -715,7 +714,6 @@ class RemiseCheque extends CommonObject
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog("RemiseCheque::set_date ".$this->error,LOG_ERR);
                 return -1;
             }
         }
@@ -740,7 +738,7 @@ class RemiseCheque extends CommonObject
 			$sql.= " SET number = '".$number."'" ;
 			$sql.= " WHERE rowid = ".$this->id;
 			
-			dol_syslog("RemiseCheque::set_number sql=$sql",LOG_DEBUG);
+			dol_syslog("RemiseCheque::set_number", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -750,7 +748,6 @@ class RemiseCheque extends CommonObject
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog("RemiseCheque::set_number ".$this->error,LOG_ERR);
 				return -1;
 			}
 		}
@@ -773,7 +770,7 @@ class RemiseCheque extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowCheckReceipt"),'payment').$lienfin);
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
deleted file mode 100644
index fe396976f10..00000000000
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-/* Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2007-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013 		Philippe Grand      	<philippe.grand@atoo-net.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/compta/paiement/cheque/fiche.php
- *	\ingroup    bank, invoice
- *	\brief      Page for cheque deposits
- */
-
-require('../../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-$langs->load('bills');
-$langs->load('companies');
-$langs->load('compta');
-
-$id =GETPOST('id','int');
-$ref=GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'alpha');
-$confirm=GETPOST('confirm', 'alpha');
-
-// Security check
-$fieldname = (! empty($ref)?'number':'rowid');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque','','',$fieldname);
-
-$mesg='';
-
-$sortfield=GETPOST('sortfield', 'alpha');
-$sortorder=GETPOST('sortorder', 'alpha');
-$page=GETPOST('page', 'int');
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="b.dateo,b.rowid";
-if ($page < 0) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-$dir=$conf->banque->dir_output.'/bordereau/';
-$filterdate=dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear'));
-$filteraccountid=GETPOST('accountid');
-
-$object = new RemiseCheque($db);
-
-
-/*
- * Actions
- */
-
-if ($action == 'setdate' && $user->rights->banque->cheque)
-{
-    $result = $object->fetch(GETPOST('id','int'));
-    if ($result > 0)
-    {
-        //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-        $date=dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
-
-        $result=$object->set_date($user,$date);
-        if ($result < 0)
-        {
-			setEventMessage($object->error, 'errors');
-        }
-    }
-    else
-    {
-        setEventMessage($object->error, 'errors');
-    }
-}
-
-/*
- * Actions
- */
-
-if ($action == 'setrefext' && $user->rights->banque->cheque)
-{
-    $result = $object->fetch(GETPOST('id','int'));
-    if ($result > 0)
-    {
-        $ref_ext = GETPOST('ref_ext');
-
-        $result=$object->setValueFrom('ref_ext', $ref_ext);
-        if ($result < 0)
-        {
-            setEventMessage($object->error, 'errors');
-        }
-    }
-    else
-    {
-        setEventMessage($object->error, 'errors');
-    }
-}
-
-if ($action == 'setref' && $user->rights->banque->cheque)
-{
-	$result = $object->fetch(GETPOST('id','int'));
-	if ($result > 0)
-	{
-		$number=GETPOST('number');
-
-		$result=$object->set_number($user,$number);
-		if ($result < 0)
-		{
-		    $mesg='<div class="error">'.$object->error.'</div>';
-		}
-	}
-	else
-	{
-	    $mesg='<div class="error">'.$object->error.'</div>';
-	}
-}
-
-if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->cheque)
-{
-	if (is_array($_POST['toRemise']))
-	{
-		$result = $object->create($user, $_POST["accountid"], 0, $_POST['toRemise']);
-		if ($result > 0)
-		{
-	        if ($object->statut == 1)     // If statut is validated, we build doc
-	        {
-	            $object->fetch($object->id);    // To force to reload all properties in correct property name
-	    	    // Define output language
-	    	    $outputlangs = $langs;
-	            $newlang='';
-	            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-	            //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	            if (! empty($newlang))
-	            {
-	                $outputlangs = new Translate("",$conf);
-	                $outputlangs->setDefaultLang($newlang);
-	            }
-	            $result = $object->generatePdf($_POST["model"], $outputlangs);
-	        }
-
-       		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-        	exit;
-		}
-		else
-		{
-			setEventMessage($object->error, 'errors');
-		}
-	}
-	else
-	{
-		setEventMessage($langs->trans("ErrorSelectAtLeastOne"));
-	    $action='new';
-	}
-}
-
-if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banque->cheque)
-{
-	$object->id = $id;
-	$result = $object->removeCheck($_GET["lineid"]);
-	if ($result === 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->cheque)
-{
-	$object->id = $id;
-	$result = $object->delete();
-	if ($result == 0)
-	{
-		header("Location: index.php");
-		exit;
-	}
-	else
-	{
-		setEventMessage($paiement->error, 'errors');
-	}
-}
-
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->cheque)
-{
-	$result = $object->fetch($id);
-	$result = $object->validate($user);
-	if ($result >= 0)
-	{
-        // Define output language
-        $outputlangs = $langs;
-        $newlang='';
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-        //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-        if (! empty($newlang))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($newlang);
-        }
-        $result = $object->generatePdf(GETPOST('model'), $outputlangs);
-
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		setEventMessage($paiement->error, 'errors');
-	}
-}
-
-if ($action == 'builddoc' && $user->rights->banque->cheque)
-{
-	$result = $object->fetch($id);
-
-	// Save last template used to generate document
-	//if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-    $outputlangs = $langs;
-    $newlang='';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-    //if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    if (! empty($newlang))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
-	$result = $object->generatePdf($_POST["model"], $outputlangs);
-	if ($result <= 0)
-	{
-		dol_print_error($db,$object->error);
-		exit;
-	}
-	else
-	{
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
-		exit;
-	}
-}
-
-// Remove file in doc form
-else if ($action == 'remove_file' && $user->rights->banque->cheque)
-{
-	if ($object->fetch($id) > 0)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$langs->load("other");
-
-		$file=$dir.get_exdir($object->number,2,1) . GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('file')));
-		else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), 'errors');
-	}
-}
-
-
-/*
- * View
- */
-
-if (GETPOST('removefilter'))
-{
-    $filterdate='';
-    $filteraccountid=0;
-}
-
-llxHeader();
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-
-
-if ($action == 'new')
-{
-	$h=0;
-	$head[$h][0] = $_SERVER["PHP_SELF"].'?action=new';
-	$head[$h][1] = $langs->trans("MenuChequeDeposits");
-	$hselected = $h;
-	$h++;
-
-	print_fiche_titre($langs->trans("Cheques"));
-}
-else
-{
-	$result = $object->fetch($id, $ref);
-	if ($result < 0)
-	{
-		dol_print_error($db,$object->error);
-		exit;
-	}
-
-	$h=0;
-	$head[$h][0] = $_SERVER["PHP_SELF"].'?id='.$object->id;
-	$head[$h][1] = $langs->trans("CheckReceipt");
-	$hselected = $h;
-	$h++;
-	//  $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/cheque/info.php?id='.$object->id;
-	//  $head[$h][1] = $langs->trans("Info");
-	//  $h++;
-
-	dol_fiche_head($head, $hselected, $langs->trans("Cheques"),0,'payment');
-
-	/*
-	 * Confirmation de la suppression du bordereau
-	 */
-	if ($action == 'delete')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("DeleteCheckReceipt"), $langs->trans("ConfirmDeleteCheckReceipt"), 'confirm_delete','','',1);
-		
-	}
-
-	/*
-	 * Confirmation de la validation du bordereau
-	 */
-	if ($action == 'valide')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide','','',1);
-		
-	}
-}
-
-
-dol_htmloutput_errors($mesg);
-
-$accounts = array();
-
-if ($action == 'new')
-{
-	$lines = array();
-
-	$now=dol_now();
-
-	print $langs->trans("SelectChequeTransactionAndGenerate").'<br><br>'."\n";
-
-	print '<form class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="action" value="new">';
-    //print '<fieldset><legend>aaa</legend>';
-	print '<table class="border" width="100%">';
-	//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
-	// Filter
-	print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>';
-	print $form->select_date($filterdate,'fd',0,0,1,'',1,1);
-	print '</td></tr>';
-    print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
-    print $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
-    print '</td></tr>';
-	print '</table>';
-    print '<center>';
-	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
-    if ($filterdate || $filteraccountid > 0)
-    {
-    	print ' &nbsp; ';
-    	print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-    }
-	print '</center>';
-    //print '</fieldset>';
-	print '</form>';
-	print '<br>';
-
-	$sql = "SELECT ba.rowid as bid, b.datec as datec, b.dateo as date, b.rowid as chqid, ";
-	$sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque";
-	$sql.= " FROM ".MAIN_DB_PREFIX."bank as b,";
-	$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
-	$sql.= " WHERE b.fk_type = 'CHQ'";
-	$sql.= " AND b.fk_account = ba.rowid";
-	$sql.= " AND ba.entity = ".$conf->entity;
-	$sql.= " AND b.fk_bordereau = 0";
-	$sql.= " AND b.amount > 0";
-	if ($filterdate)          $sql.=" AND b.dateo = '".$db->idate($filterdate)."'";
-    if ($filteraccountid > 0) $sql.=" AND ba.rowid= '".$filteraccountid."'";
-	$sql.= $db->order("b.dateo,b.rowid","ASC");
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$i = 0;
-		while ( $obj = $db->fetch_object($resql) )
-		{
-			$accounts[$obj->bid] = $obj->label;
-			$lines[$obj->bid][$i]["date"] = $db->jdate($obj->date);
-			$lines[$obj->bid][$i]["amount"] = $obj->amount;
-			$lines[$obj->bid][$i]["emetteur"] = $obj->emetteur;
-			$lines[$obj->bid][$i]["numero"] = $obj->num_chq;
-			$lines[$obj->bid][$i]["banque"] = $obj->banque;
-			$lines[$obj->bid][$i]["id"] = $obj->chqid;
-			$i++;
-		}
-
-		if ($i == 0)
-		{
-			print '<b>'.$langs->trans("NoWaitingChecks").'</b><br>';
-		}
-	}
-
-	foreach ($accounts as $bid => $account_label)
-	{
-
-        print '
-        <script language="javascript" type="text/javascript">
-        jQuery(document).ready(function()
-        {
-            jQuery("#checkall_'.$bid.'").click(function()
-            {
-                jQuery(".checkforremise_'.$bid.'").attr(\'checked\', true);
-            });
-            jQuery("#checknone_'.$bid.'").click(function()
-            {
-                jQuery(".checkforremise_'.$bid.'").attr(\'checked\', false);
-            });
-        });
-        </script>
-        ';
-
-		$num = $db->num_rows($resql);
-		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="hidden" name="accountid" value="'.$bid.'">';
-
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived").' ';
-		print "</td>\n";
-		print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
-		print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
-		print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
-		print '<td align="right" width="100px">'.$langs->trans("Amount")."</td>\n";
-		print '<td align="center" width="100px">'.$langs->trans("Select")."<br>";
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
-		print '</td>';
-
-		print "</tr>\n";
-
-		$var=true;
-
-		foreach ($lines[$bid] as $lid => $value)
-		{
-			$var=!$var;
-
-			$account_id = $bid;
-			if (! isset($accounts[$bid]))
-				$accounts[$bid]=0;
-			$accounts[$bid] += 1;
-
-			print "<tr ".$bc[$var].">";
-			print '<td>'.dol_print_date($value["date"],'day').'</td>';
-			print '<td>'.$value["numero"]."</td>\n";
-			print '<td>'.$value["emetteur"]."</td>\n";
-			print '<td>'.$value["banque"]."</td>\n";
-			print '<td align="right">'.price($value["amount"]).'</td>';
-			print '<td align="center">';
-			print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked="checked" type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
-			print '</td>' ;
-			print '</tr>';
-
-			$i++;
-		}
-		print "</table>";
-
-		print '<div class="tabsAction">';
-		if ($user->rights->banque->cheque)
-		{
-			print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn',$account_label).'">';
-		}
-		else
-		{
-			print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn',$account_label).'</a>';
-		}
-		print '</div><br>';
-		print '</form>';
-	}
-
-}
-else
-{
-	$linkback='<a href="'.$_SERVER["PHP_SELF"].'?leftmenu=customers_bills_checks&action=new">'.$langs->trans("BackToList").'</a>';
-	$paymentstatic=new Paiement($db);
-	$accountlinestatic=new AccountLine($db);
-	$accountstatic=new Account($db);
-
-	$accountstatic->id=$object->account_id;
-	$accountstatic->label=$object->account_label;
-
-	print '<table class="border" width="100%">';
-	print '<tr><td width=20%>';
-
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('Ref');
-	print '</td>';
-	if ($action != 'editref') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editref&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRef'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="2">';
-	if ($action == 'editref')
-	{
-		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="setref">';
-		print '<input type="text" name="number" value="'.$object->number.'">';
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-		print '</form>';
-	}
-	else
-	{
-	    print $form->showrefnav($object,'ref',$linkback, 1, 'number');
-	}
-
-	print '</td>';
-	print '</tr>';
-
-	print '<tr><td>';
-
-    print '<table class="nobordernopadding" width="100%"><tr><td>';
-    print $langs->trans('Date');
-    print '</td>';
-    if ($action != 'editdate') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'),1).'</a></td>';
-    print '</tr></table>';
-    print '</td><td colspan="2">';
-    if ($action == 'editdate')
-    {
-        print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="setdate">';
-        $form->select_date($object->date_bordereau,'datecreate_','','','',"setdate");
-        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-        print '</form>';
-    }
-    else
-    {
-        print $object->date_bordereau ? dol_print_date($object->date_bordereau,'day') : '&nbsp;';
-    }
-
-	print '</td>';
-	print '</tr>';
-
-	// External ref
-	print '<tr><td>';
-
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-    print $langs->trans('RefExt');
-    print '</td>';
-    if ($action != 'editrefext') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
-    print '</tr></table>';
-    print '</td><td colspan="2">';
-    if ($action == 'editrefext')
-    {
-        print '<form name="setrefext" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="setrefext">';
-        print '<input type="text" name="ref_ext" value="'.$object->ref_ext.'">';
-        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-        print '</form>';
-    }
-    else
-    {
-        print $object->ref_ext;
-    }
-
-	print '</td>';
-	print '</tr>';
-
-	print '<tr><td>'.$langs->trans('Account').'</td><td colspan="2">';
-	print $accountstatic->getNomUrl(1);
-	print '</td></tr>';
-
-	// Nb of cheques
-	print '<tr><td>'.$langs->trans('NbOfCheques').'</td><td colspan="2">';
-	print $object->nbcheque;
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans('Total').'</td><td colspan="2">';
-	print price($object->amount);
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans('Status').'</td><td colspan="2">';
-	print $object->getLibStatut(4);
-	print '</td></tr>';
-
-	print '</table><br>';
-
-
-	// Liste des cheques
-	$sql = "SELECT b.rowid, b.amount, b.num_chq, b.emetteur,";
-	$sql.= " b.dateo as date, b.datec as datec, b.banque,";
-	$sql.= " p.rowid as pid, ba.rowid as bid";
-	$sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
-	$sql.= ", ".MAIN_DB_PREFIX."bank as b";
-	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid";
-	$sql.= " WHERE ba.rowid = b.fk_account";
-	$sql.= " AND ba.entity = ".$conf->entity;
-	$sql.= " AND b.fk_type= 'CHQ'";
-	$sql.= " AND b.fk_bordereau = ".$object->id;
-	$sql.= " ORDER BY $sortfield $sortorder";
-
-	dol_syslog("sql=".$sql);
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-
-		print '<table class="noborder" width="100%">';
-
-		$param="&amp;id=".$object->id;
-		print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("Cheques"),'','','','','width="30"');
-		print_liste_field_titre($langs->trans("DateChequeReceived"),$_SERVER["PHP_SELF"],"b.dateo,b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Numero"),$_SERVER["PHP_SELF"],"b.num_chq", "",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("CheckTransmitter"),$_SERVER["PHP_SELF"],"b.emetteur", "",$param,"",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Bank"),$_SERVER["PHP_SELF"],"b.banque", "",$param,"",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"b.amount", "",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("LineRecord"),$_SERVER["PHP_SELF"],"b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
-		print_liste_field_titre('','','');
-		print "</tr>\n";
-		$i=1;
-		$var=false;
-		while ($objp = $db->fetch_object($resql))
-		{
-			$account_id = $objp->bid;
-			if (! isset($accounts[$objp->bid]))
-				$accounts[$objp->bid]=0;
-			$accounts[$objp->bid] += 1;
-
-			print "<tr ".$bc[$var].">";
-			print '<td align="center">'.$i.'</td>';
-			print '<td align="center">'.dol_print_date($db->jdate($objp->date),'day').'</td>';	// Date operation
-			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
-			print '<td>'.dol_trunc($objp->emetteur,24).'</td>';
-			print '<td>'.dol_trunc($objp->banque,24).'</td>';
-			print '<td align="right">'.price($objp->amount).'</td>';
-			print '<td align="center">';
-			$accountlinestatic->rowid=$objp->rowid;
-			if ($accountlinestatic->rowid)
-			{
-				print $accountlinestatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-			if ($object->statut == 0)
-			{
-				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a></td>';
-			}
-			else
-			{
-				print '<td>&nbsp;</td>';
-			}
-			print '</tr>';
-			$var=!$var;
-			$i++;
-		}
-		print "</table>";
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-    dol_fiche_end();
-}
-
-
-
-
-/*
- * Boutons Actions
- */
-
-print '<div class="tabsAction">';
-
-/*if ($user->societe_id == 0 && count($accounts) == 1 && $action == 'new' && $user->rights->banque->cheque)
-{
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create&amp;accountid='.$account_id.'">'.$langs->trans('NewCheckReceipt').'</a>';
-}*/
-
-if ($user->societe_id == 0 && ! empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
-{
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Valid').'</a>';
-}
-
-if ($user->societe_id == 0 && ! empty($object->id) && $user->rights->banque->cheque)
-{
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';
-
-}
-print '</div>';
-
-
-
-if ($action != 'new')
-{
-	if ($object->statut == 1)
-	{
-		$filename=dol_sanitizeFileName($object->ref);
-		$filedir=$dir.get_exdir($object->number,2,1) . dol_sanitizeFileName($object->ref);
-		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-
-		$formfile->show_documents('remisecheque', $filename, $filedir, $urlsource, 1, 1);
-
-		print '<br>';
-	}
-}
-
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 4e1d6190a4f..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;
@@ -77,7 +79,7 @@ if ($resql)
   print "<tr ".$bc[$var].">";
   print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
   print '<td align="right">';
-  print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/fiche.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
+  print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
   print '</td></tr>';
   print "</table>\n";
 }
@@ -90,6 +92,7 @@ else
 //print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
+$max=10;
 
 $sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.number as ref";
 $sql.= ", bc.statut, bc.nbcheque";
@@ -98,8 +101,8 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
 $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql.= " WHERE ba.rowid = bc.fk_bank_account";
 $sql.= " AND bc.entity = ".$conf->entity;
-$sql.= " ORDER BY bc.rowid";
-$sql.= " DESC LIMIT 10";
+$sql.= " ORDER BY bc.date_bordereau DESC, rowid DESC";
+$sql.= $db->plimit($max);
 
 $resql = $db->query($sql);
 
@@ -107,7 +110,7 @@ if ($resql)
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("CheckReceiptShort").'</td>';
+	print '<td>'.$langs->trans("LastCheckReceiptShort",$max).'</td>';
 	print '<td>'.$langs->trans("Date")."</td>";
 	print '<td>'.$langs->trans("Account").'</td>';
 	print '<td align="right">'.$langs->trans("NbOfCheques").'</td>';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
new file mode 100644
index 00000000000..fdfe86ec178
--- /dev/null
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -0,0 +1,197 @@
+<?php
+/* Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2007-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   \file       htdocs/compta/paiement/cheque/list.php
+ *   \ingroup    compta
+ *   \brief      Page list of cheque deposits
+ */
+
+require('../../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+$langs->load("banks");
+$langs->load("categories");
+$langs->load("bills");
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'banque', '','');
+
+$search_ref = GETPOST('search_ref','int');
+$search_account = GETPOST('search_account','int');
+$search_amount = GETPOST('search_amount','alpha');
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$limit = $conf->liste_limit;
+if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="dp";
+
+$year=GETPOST("year");
+$month=GETPOST("month");
+
+$form=new Form($db);
+$formother = new FormOther($db);
+$checkdepositstatic=new RemiseCheque($db);
+$accountstatic=new Account($db);
+
+// If click on purge search criteria ?
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref='';
+    $search_amount='';
+    $search_account='';
+    $year='';
+    $month='';
+}
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans("ChequesReceipts"));
+
+$sql = "SELECT bc.rowid, bc.number as ref, bc.date_bordereau as dp,";
+$sql.= " bc.nbcheque, bc.amount, bc.statut,";
+$sql.= " ba.rowid as bid, ba.label";
+$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc,";
+$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
+$sql.= " WHERE bc.fk_bank_account = ba.rowid";
+$sql.= " AND bc.entity = ".$conf->entity;
+
+// Search criteria
+if ($search_ref)			$sql.=" AND bc.number=".$search_ref;
+if ($search_account > 0)	$sql.=" AND bc.fk_bank_account=".$search_account;
+if ($search_amount)			$sql.=" AND bc.amount='".$db->escape(price2num(trim($search_amount)))."'";
+if ($month > 0)
+{
+    if ($year > 0 && empty($day))
+    $sql.= " AND bc.date_bordereau BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+    else if ($year > 0 && ! empty($day))
+    $sql.= " AND bc.date_bordereau BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    else
+    $sql.= " AND date_format(bc.date_bordereau, '%m') = '".$month."'";
+}
+else if ($year > 0)
+{
+	$sql.= " AND bc.date_bordereau BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+}
+
+$sql.= " ORDER BY $sortfield $sortorder";
+$sql.= $db->plimit($limit+1, $offset);
+//print "$sql";
+
+$resql = $db->query($sql);
+
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+	$params='';
+
+	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num);
+
+	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<table class="liste" width="100%">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"bc.number","",$params,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","",$params,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Account"),$_SERVER["PHP_SELF"],"ba.label","",$params,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("NbOfCheques"),$_SERVER["PHP_SELF"],"bc.nbcheque","",$params,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"bc.amount","",$params,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"bc.statut","",$params,'align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+	// Lignes des champs de filtre
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
+    print '</td>';
+	print '<td class="liste_titre" align="center">';
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+    print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
+    $formother->select_year($year?$year:-1,'year',1, 20, 5);
+    print '</td>';
+    print '<td>';
+    $form->select_comptes($search_account,'search_account',0,'',1);
+    print '</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre" align="right">';
+	print '<input class="flat" type="text" size="6" name="search_amount" value="'.$search_amount.'">';
+	print '</td>';
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print "</td></tr>\n";
+
+	$var=true;
+	while ($i < min($num,$limit))
+	{
+		$objp = $db->fetch_object($resql);
+		$var=!$var;
+		print "<tr ".$bc[$var].">";
+
+		// Num ref cheque
+		print '<td width="80">';
+		$checkdepositstatic->id=$objp->rowid;
+		$checkdepositstatic->ref=($objp->ref?$objp->ref:$objp->rowid);
+		$checkdepositstatic->statut=$objp->statut;
+		print $checkdepositstatic->getNomUrl(1);
+		print '</td>';
+
+		// Date
+		print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>';
+
+		// Bank
+		print '<td>';
+		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
+		else print '&nbsp;';
+		print '</td>';
+
+		// Number of cheques
+		print '<td align="right">'.$objp->nbcheque.'</td>';
+
+		// Amount
+		print '<td align="right">'.price($objp->amount).'</td>';
+
+		// Statut
+		print '<td align="right">';
+		print $checkdepositstatic->LibStatut($objp->statut,5);
+		print "</td></tr>\n";
+		$i++;
+	}
+	print "</table>";
+	print "</form>\n";
+}
+else
+{
+	dol_print_error($db);
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php
deleted file mode 100644
index 474b4531295..00000000000
--- a/htdocs/compta/paiement/cheque/liste.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/* Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2007-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   \file       htdocs/compta/paiement/cheque/liste.php
- *   \ingroup    compta
- *   \brief      Page liste des bordereau de remise de cheque
- */
-
-require('../../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-$langs->load("bills");
-
-// Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'banque', '','');
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-$limit = $conf->liste_limit;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="bc.number";
-
-$checkdepositstatic=new RemiseCheque($db);
-$accountstatic=new Account($db);
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("ChequesReceipts"));
-
-$sql = "SELECT bc.rowid, bc.number as ref, bc.date_bordereau as dp,";
-$sql.= " bc.nbcheque, bc.amount, bc.statut,";
-$sql.= " ba.rowid as bid, ba.label";
-$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc,";
-$sql.= " ".MAIN_DB_PREFIX."bank_account as ba";
-$sql.= " WHERE bc.fk_bank_account = ba.rowid";
-$sql.= " AND bc.entity = ".$conf->entity;
-if (GETPOST('search_montant'))
-{
-	$sql.=" AND bc.amount=".price2num(GETPOST('search_montant'));
-}
-$sql.= " ORDER BY $sortfield $sortorder";
-$sql.= $db->plimit($limit+1, $offset);
-//print "$sql";
-
-$resql = $db->query($sql);
-
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-	$params='';
-
-	print_barre_liste($langs->trans("MenuChequeDeposits"), $page, 'liste.php', $params, $sortfield, $sortorder, '', $num);
-
-	print '<form method="get" action="liste.php">';
-	print '<table class="liste" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),"liste.php","bc.number","",$params,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Date"),"liste.php","dp","",$params,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Account"),"liste.php","ba.label","",$params,"",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("NbOfCheques"),"liste.php","bc.nbcheque","",$params,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Amount"),"liste.php","bc.amount","",$params,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),"liste.php","bc.statut","",$params,'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input class="fat" type="text" size="6" name="search_montant" value="'.GETPOST('search_montant').'">';
-	print '</td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td>';
-	print "</tr>\n";
-
-	$var=true;
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-
-		// Num ref cheque
-		print '<td width="80">';
-		$checkdepositstatic->id=$objp->rowid;
-		$checkdepositstatic->ref=($objp->ref?$objp->ref:$objp->rowid);
-		$checkdepositstatic->statut=$objp->statut;
-		print $checkdepositstatic->getNomUrl(1);
-		print '</td>';
-
-		// Date
-		print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>';
-
-		// Banque
-		print '<td>';
-		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"),'account').' '.$objp->label.'</a>';
-		else print '&nbsp;';
-		print '</td>';
-
-		// Nb of cheques
-		print '<td align="right">'.$objp->nbcheque.'</td>';
-
-		// Montant
-		print '<td align="right">'.price($objp->amount).'</td>';
-
-		// Statut
-		print '<td align="right">';
-		print $checkdepositstatic->LibStatut($objp->statut,5);
-		print "</td></tr>\n";
-		$i++;
-	}
-	print "</table>";
-	print "</form>\n";
-}
-else
-{
-	dol_print_error($db);
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/paiement/class/index.html b/htdocs/compta/paiement/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 0eea10bf510..2fce476af78 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -81,7 +81,7 @@ class Paiement extends CommonObject
 		$sql.= ' WHERE p.fk_paiement = c.id';
 		$sql.= ' AND p.rowid = '.$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 
 		if ($result)
@@ -161,7 +161,7 @@ class Paiement extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)";
 		$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$totalamount."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
 
-		dol_syslog(get_class($this)."::Create insert paiement sql=".$sql);
+		dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -177,7 +177,7 @@ class Paiement extends CommonObject
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount)';
 					$sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\')';
 
-					dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture sql='.$sql);
+					dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
 					$resql=$this->db->query($sql);
 					if ($resql)
 					{
@@ -221,7 +221,7 @@ class Paiement extends CommonObject
                             if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice. We do nothing more.");
                             else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
                             else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
-                            else 
+                            else
                             {
                                 $result=$invoice->set_paid($user,'','');
                                 if ($result<0)
@@ -235,7 +235,6 @@ class Paiement extends CommonObject
 					else
 					{
 						$this->error=$this->db->lasterror();
-						dol_syslog(get_class($this).'::Create insert paiement_facture error='.$this->error, LOG_ERR);
 						$error++;
 					}
 				}
@@ -248,17 +247,14 @@ class Paiement extends CommonObject
 			if (! $error)
 			{
 				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PAYMENT_CUSTOMER_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				$result=$this->call_trigger('PAYMENT_CUSTOMER_CREATE', $user);
+				if ($result < 0) { $error++; }
 				// Fin appel triggers
 			}
 		}
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this).'::Create insert paiement error='.$this->error, LOG_ERR);
 			$error++;
 		}
 
@@ -363,11 +359,13 @@ class Paiement extends CommonObject
 			if (! $notrigger)
 			{
 				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PAYMENT_DELETE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+				$result=$this->call_trigger('PAYMENT_DELETE', $user);
+				if ($result < 0)
+				{
+				    $this->db->rollback();
+				    return -1;
+				 }
+			    // Fin appel triggers
 			}
 
 			$this->db->commit();
@@ -424,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
@@ -455,8 +452,8 @@ class Paiement extends CommonObject
                 if ( ! $error)
                 {
                     $url='';
-                    if ($mode == 'payment') $url=DOL_URL_ROOT.'/compta/paiement/fiche.php?id=';
-                    if ($mode == 'payment_supplier') $url=DOL_URL_ROOT.'/fourn/paiement/fiche.php?id=';
+                    if ($mode == 'payment') $url=DOL_URL_ROOT.'/compta/paiement/card.php?id=';
+                    if ($mode == 'payment_supplier') $url=DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
                     if ($url)
                     {
                         $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
@@ -484,8 +481,8 @@ class Paiement extends CommonObject
                                 $result=$acc->add_url_line(
                                     $bank_line_id,
                                     $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/comm/fiche.php?socid=',
-                                    $fac->thirdparty->nom,
+                                    DOL_URL_ROOT.'/comm/card.php?socid=',
+                                    $fac->thirdparty->name,
                                     'company'
                                 );
                                 if ($result <= 0) dol_print_error($this->db);
@@ -502,8 +499,8 @@ class Paiement extends CommonObject
                                 $result=$acc->add_url_line(
                                     $bank_line_id,
                                     $fac->thirdparty->id,
-                                    DOL_URL_ROOT.'/fourn/fiche.php?socid=',
-                                    $fac->thirdparty->nom,
+                                    DOL_URL_ROOT.'/fourn/card.php?socid=',
+                                    $fac->thirdparty->name,
                                     'company'
                                 );
                                 if ($result <= 0) dol_print_error($this->db);
@@ -516,11 +513,9 @@ class Paiement extends CommonObject
 	            if (! $error && ! $notrigger)
 				{
 					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('PAYMENT_ADD_TO_BANK',$this,$user,$langs,$conf);
-					if ($result < 0) { $error++; $this->errors=$interface->errors; }
-					// Fin appel triggers
+					$result=$this->call_trigger('PAYMENT_ADD_TO_BANK', $user);
+				    if ($result < 0) { $error++; }
+				    // Fin appel triggers
 				}
             }
             else
@@ -561,7 +556,7 @@ class Paiement extends CommonObject
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' set fk_bank = '.$id_bank;
 		$sql.= ' WHERE rowid = '.$this->id;
 
-		dol_syslog(get_class($this).'::update_fk_bank sql='.$sql);
+		dol_syslog(get_class($this).'::update_fk_bank', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -589,7 +584,7 @@ class Paiement extends CommonObject
             $sql.= " SET datep = '".$this->db->idate($date)."'";
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::update_date sql=".$sql);
+            dol_syslog(get_class($this)."::update_date", LOG_DEBUG);
             $result = $this->db->query($sql);
             if ($result)
             {
@@ -600,7 +595,6 @@ class Paiement extends CommonObject
             else
             {
                 $this->error='Error -1 '.$this->db->error();
-                dol_syslog(get_class($this)."::update_date ".$this->error, LOG_ERR);
                 return -2;
             }
         }
@@ -621,7 +615,7 @@ class Paiement extends CommonObject
             $sql.= " SET num_paiement = '".$this->db->escape($num)."'";
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::update_num sql=".$sql);
+            dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
             $result = $this->db->query($sql);
             if ($result)
             {
@@ -631,7 +625,6 @@ class Paiement extends CommonObject
             else
             {
                 $this->error='Error -1 '.$this->db->error();
-                dol_syslog(get_class($this)."::update_num ".$this->error, LOG_ERR);
                 return -2;
             }
         }
@@ -647,7 +640,7 @@ class Paiement extends CommonObject
 	{
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id;
 
-		dol_syslog(get_class($this).'::valide sql='.$sql);
+		dol_syslog(get_class($this).'::valide', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -671,7 +664,7 @@ class Paiement extends CommonObject
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p';
 		$sql.= ' WHERE p.rowid = '.$id;
 
-		dol_syslog(get_class($this).'::info sql='.$sql);
+		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
 		if ($result)
@@ -734,7 +727,7 @@ class Paiement extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' - sql='.$sql);
+			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
 		}
 	}
@@ -753,7 +746,7 @@ class Paiement extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"),'payment').$lienfin);
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
deleted file mode 100644
index 97f3fb9d47c..00000000000
--- a/htdocs/compta/paiement/fiche.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-/* Copyright (C) 2004      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur   <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
- * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/compta/paiement/fiche.php
- *		\ingroup    facture
- *		\brief      Page of a customer payment
- *		\remarks	Nearly same file than fournisseur/paiement/fiche.php
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load('bills');
-$langs->load('banks');
-$langs->load('companies');
-
-// Security check
-$id=GETPOST('id','int');
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
-// TODO ajouter regle pour restreindre acces paiement
-//$result = restrictedArea($user, 'facture', $id,'');
-
-$mesg='';
-
-$object = new Paiement($db);
-
-
-/*
- * Actions
- */
-
-if ($action == 'setnote' && $user->rights->facture->paiement)
-{
-    $db->begin();
-
-    $object->fetch($id);
-    $result = $object->update_note(GETPOST('note'));
-    if ($result > 0)
-    {
-        $db->commit();
-        $action='';
-    }
-    else
-    {
-        $mesg='<div class="error">'.$object->error.'</div>';
-        $db->rollback();
-    }
-}
-
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->paiement)
-{
-	$db->begin();
-
-	$object->fetch($id);
-	$result = $object->delete();
-	if ($result > 0)
-	{
-        $db->commit();
-        header("Location: liste.php");
-        exit;
-	}
-	else
-	{
-	    $langs->load("errors");
-		$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-        $db->rollback();
-	}
-}
-
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->paiement)
-{
-	$db->begin();
-
-    $object->fetch($id);
-	if ($object->valide() > 0)
-	{
-		$db->commit();
-
-		// Loop on each invoice linked to this payment to rebuild PDF
-		$factures=array();
-		foreach($factures as $id)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
-
-			$outputlangs = $langs;
-			if (! empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs);
-		}
-
-		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-	    $langs->load("errors");
-		$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-		$db->rollback();
-	}
-}
-
-if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement']))
-{
-	$object->fetch($id);
-    $res = $object->update_num($_POST['num_paiement']);
-	if ($res === 0)
-	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentNumberUpdateSucceeded').'</div>';
-	}
-	else
-	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentNumberUpdateFailed').'</div>';
-	}
-}
-
-if ($action == 'setdatep' && ! empty($_POST['datepday']))
-{
-	$object->fetch($id);
-    $datepaye = dol_mktime(12, 0, 0, $_POST['datepmonth'], $_POST['datepday'], $_POST['datepyear']);
-	$res = $object->update_date($datepaye);
-	if ($res === 0)
-	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentDateUpdateSucceeded').'</div>';
-	}
-	else
-	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentDateUpdateFailed').'</div>';
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$thirdpartystatic=new Societe($db);
-
-$result=$object->fetch($id);
-if ($result <= 0)
-{
-	dol_print_error($db,'Payement '.$id.' not found in database');
-	exit;
-}
-
-$form = new Form($db);
-
-$head = payment_prepare_head($object);
-
-dol_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), 0, 'payment');
-
-/*
- * Confirmation de la suppression du paiement
- */
-if ($action == 'delete')
-{
-	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
-
-}
-
-/*
- * Confirmation de la validation du paiement
- */
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
-
-}
-
-
-dol_htmloutput_mesg($mesg);
-
-
-print '<table class="border" width="100%">';
-
-// Ref
-print '<tr><td valign="top" width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$object->id.'</td></tr>';
-
-// Date payment
-print '<tr><td valign="top">'.$form->editfieldkey("Date",'datep',$object->date,$object,$user->rights->facture->paiement).'</td><td colspan="3">';
-print $form->editfieldval("Date",'datep',$object->date,$object,$user->rights->facture->paiement,'datepicker','',null,$langs->trans('PaymentDateUpdateSucceeded'));
-print '</td></tr>';
-
-// Payment type (VIR, LIQ, ...)
-$labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->type_libelle;
-print '<tr><td valign="top">'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$labeltype.'</td></tr>';
-
-// Payment numero
-print '<tr><td valign="top">'.$form->editfieldkey("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
-print $form->editfieldval("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'string','',null,$langs->trans('PaymentNumberUpdateSucceeded'));
-print '</td></tr>';
-
-// Amount
-print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->montant,'',$langs,0,0,-1,$conf->currency).'</td></tr>';
-
-// Note
-print '<tr><td valign="top">'.$form->editfieldkey("Note",'note',$object->note,$object,$user->rights->facture->paiement).'</td><td colspan="3">';
-print $form->editfieldval("Note",'note',$object->note,$object,$user->rights->facture->paiement,'textarea');
-print '</td></tr>';
-
-// Bank account
-if (! empty($conf->banque->enabled))
-{
-    if ($object->bank_account)
-    {
-    	$bankline=new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
-
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-		print '<td colspan="3">';
-		print $bankline->getNomUrl(1,0,'showconciliated');
-    	print '</td>';
-    	print '</tr>';
-
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankAccount').'</td>';
-		print '<td colspan="3">';
-		$accountstatic=new Account($db);
-        $accountstatic->id=$bankline->fk_account;
-	    $accountstatic->label=$bankline->bank_account_ref.' - '.$bankline->bank_account_label;
-        print $accountstatic->getNomUrl(0);
-    	print '</td>';
-    	print '</tr>';
-
-		if($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
-			dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
-			$bordereau = new RemiseCheque($db);
-			$bordereau->fetch($bankline->fk_bordereau);
-
-			print '<tr>';
-	    	print '<td>'.$langs->trans('CheckReceipt').'</td>';
-			print '<td colspan="3">';
-			print $bordereau->getNomUrl(1);
-	    	print '</td>';
-	    	print '</tr>';
-		}
-    }
-}
-
-print '</table>';
-
-
-/*
- * List of invoices
- */
-
-$disable_delete = 0;
-$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom, s.rowid as socid';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
-$sql.= ' WHERE pf.fk_facture = f.rowid';
-$sql.= ' AND f.fk_soc = s.rowid';
-$sql.= ' AND f.entity = '.$conf->entity;
-$sql.= ' AND pf.fk_paiement = '.$object->id;
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-
-	$i = 0;
-	$total = 0;
-	print '<br><table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans('Bill').'</td>';
-	print '<td>'.$langs->trans('Company').'</td>';
-	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
-    print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
-    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
-    print '<td align="right">'.$langs->trans('Status').'</td>';
-	print "</tr>\n";
-
-	if ($num > 0)
-	{
-		$var=True;
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
-
-            $invoice=new Facture($db);
-            $invoice->fetch($objp->facid);
-            $paiement = $invoice->getSommePaiement();
-            $creditnotes=$invoice->getSumCreditNotesUsed();
-            $deposits=$invoice->getSumDepositsUsed();
-            $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
-            $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
-
-            // Invoice
-			print '<td>';
-			print $invoice->getNomUrl(1);
-			print "</td>\n";
-
-			// Third party
-			print '<td>';
-			$thirdpartystatic->id=$objp->socid;
-			$thirdpartystatic->nom=$objp->nom;
-			print $thirdpartystatic->getNomUrl(1);
-			print '</td>';
-
-			// Expected to pay
-			print '<td align="right">'.price($objp->total_ttc).'</td>';
-
-            // Amount payed
-            print '<td align="right">'.price($objp->amount).'</td>';
-
-            // Remain to pay
-            print '<td align="right">'.price($remaintopay).'</td>';
-
-			// Status
-			print '<td align="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
-
-			print "</tr>\n";
-			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
-			{
-				$disable_delete = 1;
-			}
-			$total = $total + $objp->amount;
-			$i++;
-		}
-	}
-	$var=!$var;
-
-	print "</table>\n";
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-print '</div>';
-
-
-/*
- * Boutons Actions
- */
-
-print '<div class="tabsAction">';
-
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->societe_id == 0 && $object->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-		}
-	}
-}
-
-if ($user->societe_id == 0 && $action == '')
-{
-	if ($user->rights->facture->paiement)
-	{
-		if (! $disable_delete)
-		{
-			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
-			print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
-		}
-	}
-}
-
-print '</div>';
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index 8cc06397e62..84ef52c3a80 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 $langs->load("bills");
 $langs->load("companies");
 
+$id=GETPOST('id');
+
 
 /*
  * View
@@ -39,8 +41,8 @@ $langs->load("companies");
 llxHeader();
 
 $paiement = new Paiement($db);
-$paiement->fetch($_GET["id"], $user);
-$paiement->info($_GET["id"]);
+$paiement->fetch($id);
+$paiement->info($id);
 
 $head = payment_prepare_head($paiement);
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
new file mode 100644
index 00000000000..c7fd426babf
--- /dev/null
+++ b/htdocs/compta/paiement/list.php
@@ -0,0 +1,256 @@
+<?php
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/paiement/list.php
+ *  \ingroup    compta
+ *  \brief      Page liste des paiements des factures clients
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("bills");
+$langs->load("compta");
+
+// Security check
+$facid =GETPOST('facid','int');
+$socid =GETPOST('socid','int');
+$userid=GETPOST('userid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'facture',$facid,'');
+
+$paymentstatic=new Paiement($db);
+$accountstatic=new Account($db);
+$companystatic=new Societe($db);
+
+$search_ref=GETPOST("search_ref","int");
+$search_account=GETPOST("search_account","int");
+$search_paymenttype=GETPOST("search_paymenttype");
+$search_amount=GETPOST("search_amount");
+$search_company=GETPOST("search_company");
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$limit = $conf->liste_limit;
+if (! $sortorder) $sortorder="DESC";
+if (! $sortfield) $sortfield="p.rowid";
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_account="";
+	$search_amount="";
+    $search_paymenttype="";
+	$search_company="";
+}
+
+/*
+ * 	View
+ */
+
+llxHeader('', $langs->trans('ListPayment'));
+
+$form=new Form($db);
+
+if (GETPOST("orphelins"))
+{
+    // Paiements lies a aucune facture (pour aide au diagnostic)
+    $sql = "SELECT p.rowid, p.datep as dp, p.amount,";
+    $sql.= " p.statut, p.num_paiement,";
+    //$sql.= " c.libelle as paiement_type";
+    $sql.= " c.code as paiement_code";
+    $sql.= " FROM (".MAIN_DB_PREFIX."paiement as p,";
+    $sql.= " ".MAIN_DB_PREFIX."c_paiement as c)";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+    $sql.= " WHERE p.fk_paiement = c.id";
+    $sql.= " AND p.entity = ".$conf->entity;
+    $sql.= " AND pf.fk_facture IS NULL";
+}
+else
+{
+    $sql = "SELECT DISTINCT p.rowid, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
+    $sql.= " p.statut, p.num_paiement,";
+    //$sql.= " c.libelle as paiement_type,";
+    $sql.= " c.code as paiement_code,";
+    $sql.= " ba.rowid as bid, ba.label,";
+    $sql.= " s.rowid as socid, s.nom as name";
+    //$sql.= " f.facnumber";
+    $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement as p)";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+    if (!$user->rights->societe->client->voir && !$socid)
+    {
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+    }
+    $sql.= " WHERE p.fk_paiement = c.id";
+    $sql.= " AND p.entity = ".$conf->entity;
+    if (! $user->rights->societe->client->voir && ! $socid)
+    {
+        $sql.= " AND sc.fk_user = " .$user->id;
+    }
+    if ($socid > 0) $sql.= " AND f.fk_soc = ".$socid;
+    if ($userid)
+    {
+        if ($userid == -1) $sql.= " AND f.fk_user_author IS NULL";
+        else  $sql.= " AND f.fk_user_author = ".$userid;
+    }
+    // Search criteria
+    if ($search_ref)         		$sql .=" AND p.rowid=".$search_ref;
+    if ($search_account > 0)      	$sql .=" AND b.fk_account=".$search_account;
+    if ($search_paymenttype != "")  $sql .=" AND c.code='".$search_paymenttype."'";
+    if ($search_amount)      		$sql .=" AND p.amount='".price2num($search_amount)."'";
+    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+}
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit+1, $offset);
+//print "$sql";
+
+$resql = $db->query($sql);
+
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    $paramlist='';
+    $paramlist.=(GETPOST("orphelins")?"&orphelins=1":"");
+    $paramlist.=($search_ref?"&search_ref=".$search_ref:"");
+    $paramlist.=($search_company?"&search_company=".$search_company:"");
+    $paramlist.=($search_amount?"&search_amount=".$search_amount:"");
+
+    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num);
+
+    print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"p.rowid","",$paramlist,"",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","",$paramlist,'align="center"',$sortfield,$sortorder);
+    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"],"p.amount","",$paramlist,'align="right"',$sortfield,$sortorder);
+    //print_liste_field_titre($langs->trans("Invoices"),"","","",$paramlist,'align="left"',$sortfield,$sortorder);
+    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+    {
+        print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$paramlist,'align="right"',$sortfield,$sortorder);
+    }
+    print '<td class="liste_titre">&nbsp;</td>';
+	print "</tr>\n";
+
+    // Lines for filters fields
+    print '<tr class="liste_titre">';
+    print '<td align="left">';
+    print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
+    print '</td>';
+    print '<td>&nbsp;</td>';
+    print '<td align="left">';
+    print '<input class="flat" type="text" size="6" name="search_company" value="'.$search_company.'">';
+    print '</td>';
+    print '<td>';
+    $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1);
+    print '</td>';
+    print '<td>';
+    $form->select_comptes($search_account,'search_account',0,'',1);
+    print '</td>';
+    print '<td align="right">';
+    print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
+	print '</td><td align="right">';
+    print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print '</td>';
+    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+    {
+        print '<td align="right">';
+        print '</td>';
+    }
+    print "</tr>\n";
+
+    $var=true;
+    while ($i < min($num,$limit))
+    {
+        $objp = $db->fetch_object($resql);
+        $var=!$var;
+        print "<tr ".$bc[$var].">";
+
+        print '<td width="40">';
+        $paymentstatic->id=$objp->rowid;
+        $paymentstatic->ref=$objp->rowid;
+        print $paymentstatic->getNomUrl(1);
+        print '</td>';
+
+        print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>';
+
+        // Company
+        print '<td>';
+        if ($objp->socid)
+        {
+            $companystatic->id=$objp->socid;
+            $companystatic->name=$objp->name;
+            print $companystatic->getNomUrl(1,'',24);
+        }
+        else print '&nbsp;';
+        print '</td>';
+
+        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.'</td>';
+        print '<td>';
+        if ($objp->bid)
+        {
+            $accountstatic->id=$objp->bid;
+            $accountstatic->label=$objp->label;
+            print $accountstatic->getNomUrl(1);
+        }
+        else print '&nbsp;';
+        print '</td>';
+        print '<td align="right">'.price($objp->amount).'</td>';
+
+        if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+        {
+            print '<td align="right">';
+            if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
+            print $paymentstatic->LibStatut($objp->statut,5);
+            if ($objp->statut == 0) print '</a>';
+            print '</td>';
+        }
+		
+		print '<td>&nbsp;</td>';
+        print '</tr>';
+
+        $i++;
+    }
+    print "</table>\n";
+    print "</form>\n";
+}
+else
+{
+    dol_print_error($db);
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php
deleted file mode 100644
index 6e3e1bc54ff..00000000000
--- a/htdocs/compta/paiement/liste.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/compta/paiement/liste.php
- *  \ingroup    compta
- *  \brief      Page liste des paiements des factures clients
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("bills");
-$langs->load("compta");
-
-// Security check
-$facid =GETPOST('facid','int');
-$socid =GETPOST('socid','int');
-$userid=GETPOST('userid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'facture',$facid,'');
-
-$paymentstatic=new Paiement($db);
-$accountstatic=new Account($db);
-$companystatic=new Societe($db);
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-$limit = $conf->liste_limit;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="p.rowid";
-
-
-
-
-/*
- * 	View
- */
-
-llxHeader('', $langs->trans('ListPayment'));
-
-$form=new Form($db);
-
-if (GETPOST("orphelins"))
-{
-    // Paiements lies a aucune facture (pour aide au diagnostic)
-    $sql = "SELECT p.rowid, p.datep as dp, p.amount,";
-    $sql.= " p.statut, p.num_paiement,";
-    //$sql.= " c.libelle as paiement_type";
-    $sql.= " c.code as paiement_code";
-    $sql.= " FROM (".MAIN_DB_PREFIX."paiement as p,";
-    $sql.= " ".MAIN_DB_PREFIX."c_paiement as c)";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql.= " WHERE p.fk_paiement = c.id";
-    $sql.= " AND p.entity = ".$conf->entity;
-    $sql.= " AND pf.fk_facture IS NULL";
-}
-else
-{
-    $sql = "SELECT DISTINCT p.rowid, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
-    $sql.= " p.statut, p.num_paiement,";
-    //$sql.= " c.libelle as paiement_type,";
-    $sql.= " c.code as paiement_code,";
-    $sql.= " ba.rowid as bid, ba.label,";
-    $sql.= " s.rowid as socid, s.nom";
-    //$sql.= " f.facnumber";
-    $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement as p)";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-    if (!$user->rights->societe->client->voir && !$socid)
-    {
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-    }
-    $sql.= " WHERE p.fk_paiement = c.id";
-    $sql.= " AND p.entity = ".$conf->entity;
-    if (! $user->rights->societe->client->voir && ! $socid)
-    {
-        $sql.= " AND sc.fk_user = " .$user->id;
-    }
-    if ($socid > 0) $sql.= " AND f.fk_soc = ".$socid;
-    if ($userid)
-    {
-        if ($userid == -1) $sql.= " AND f.fk_user_author IS NULL";
-        else  $sql.= " AND f.fk_user_author = ".$userid;
-    }
-    // Search criteria
-    if (GETPOST("search_ref"))         		$sql .=" AND p.rowid=".GETPOST("search_ref",'int');
-    if (GETPOST("search_account") > 0)      $sql .=" AND b.fk_account=".GETPOST("search_account",'int');
-    if (GETPOST("search_paymenttype") != "")  $sql .=" AND c.code='".GETPOST("search_paymenttype")."'";
-    if (GETPOST("search_amount"))      		$sql .=" AND p.amount=".price2num(GETPOST("search_amount"));
-    if (GETPOST("search_company"))     		$sql .= natural_search('s.nom', GETPOST('search_company'));
-}
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit+1, $offset);
-//print "$sql";
-
-$resql = $db->query($sql);
-
-if ($resql)
-{
-    $num = $db->num_rows($resql);
-    $i = 0;
-
-    $paramlist='';
-    $paramlist.=(GETPOST("orphelins")?"&orphelins=1":"");
-    $paramlist.=($_REQUEST["search_ref"]?"&search_ref=".$_REQUEST["search_ref"]:"");
-    $paramlist.=($_REQUEST["search_company"]?"&search_company=".$_REQUEST["search_company"]:"");
-    $paramlist.=($_REQUEST["search_amount"]?"&search_amount=".$_REQUEST["search_amount"]:"");
-
-    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num);
-
-    print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("RefPayment"),$_SERVER["PHP_SELF"],"p.rowid","",$paramlist,"",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"dp","",$paramlist,'align="center"',$sortfield,$sortorder);
-    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"],"p.amount","",$paramlist,'align="right"',$sortfield,$sortorder);
-    //print_liste_field_titre($langs->trans("Invoices"),"","","",$paramlist,'align="left"',$sortfield,$sortorder);
-    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-    {
-        print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut","",$paramlist,'align="right"',$sortfield,$sortorder);
-    }
-    print "</tr>\n";
-
-    // Lines for filters fields
-    print '<tr class="liste_titre">';
-    print '<td align="left">';
-    print '<input class="fat" type="text" size="4" name="search_ref" value="'.$_REQUEST["search_ref"].'">';
-    print '</td>';
-    print '<td>&nbsp;</td>';
-    print '<td align="left">';
-    print '<input class="fat" type="text" size="6" name="search_company" value="'.$_REQUEST["search_company"].'">';
-    print '</td>';
-    print '<td>';
-    $form->select_types_paiements($_REQUEST["search_paymenttype"],'search_paymenttype','',2,1,1);
-    print '</td>';
-    print '<td>';
-    $form->select_comptes($_REQUEST["search_account"],'search_account',0,'',1);
-    print '</td>';
-    print '<td align="right">';
-    print '<input class="fat" type="text" size="4" name="search_amount" value="'.$_REQUEST["search_amount"].'">';
-    print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print '</td>';
-    if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-    {
-        print '<td align="right">';
-        print '</td>';
-    }
-    print "</tr>\n";
-
-    $var=true;
-    while ($i < min($num,$limit))
-    {
-        $objp = $db->fetch_object($resql);
-        $var=!$var;
-        print "<tr ".$bc[$var].">";
-
-        print '<td width="40">';
-        $paymentstatic->id=$objp->rowid;
-        $paymentstatic->ref=$objp->rowid;
-        print $paymentstatic->getNomUrl(1);
-        print '</td>';
-
-        print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day').'</td>';
-
-        // Company
-        print '<td>';
-        if ($objp->socid)
-        {
-            $companystatic->id=$objp->socid;
-            $companystatic->nom=$objp->nom;
-            print $companystatic->getNomUrl(1,'',24);
-        }
-        else print '&nbsp;';
-        print '</td>';
-
-        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).' '.$objp->num_paiement.'</td>';
-        print '<td>';
-        if ($objp->bid)
-        {
-            $accountstatic->id=$objp->bid;
-            $accountstatic->label=$objp->label;
-            print $accountstatic->getNomUrl(1);
-        }
-        else print '&nbsp;';
-        print '</td>';
-        print '<td align="right">'.price($objp->amount).'</td>';
-
-        if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-        {
-            print '<td align="right">';
-            if ($objp->statut == 0) print '<a href="fiche.php?id='.$objp->rowid.'&amp;action=valide">';
-            print $paymentstatic->LibStatut($objp->statut,5);
-            if ($objp->statut == 0) print '</a>';
-            print '</td>';
-        }
-
-        print '</tr>';
-
-        $i++;
-    }
-    print "</table>\n";
-    print "</form>\n";
-}
-else
-{
-    dol_print_error($db);
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index a54a0bcd935..7e26fa5789f 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -253,7 +253,7 @@ if ($_GET["action"] == 'create')
 	print '<td align="center">'.$langs->trans("Amount").'</td>';
 	print "</tr>\n";
 
-	$var=True;
+	$var=true;
 	$total=0;
 	$totalrecu=0;
 
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
new file mode 100644
index 00000000000..dc2fad6d35d
--- /dev/null
+++ b/htdocs/compta/payment_sc/card.php
@@ -0,0 +1,323 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/payment_sc/card.php
+ *		\ingroup    facture
+ *		\brief      Onglet payment of a social contribution
+ *		\remarks	Fichier presque identique a fournisseur/paiement/card.php
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load('bills');
+$langs->load('banks');
+$langs->load('companies');
+
+// Security check
+$id=GETPOST("id");
+$action=GETPOST("action");
+$confirm=GETPOST('confirm');
+if ($user->societe_id) $socid=$user->societe_id;
+// TODO ajouter regle pour restreindre acces paiement
+//$result = restrictedArea($user, 'facture', $id,'');
+
+$paiement = new PaymentSocialContribution($db);
+if ($id > 0) 
+{
+	$result=$paiement->fetch($id);
+	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
+}
+
+
+/*
+ * Actions
+ */
+
+// Delete payment
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer)
+{
+	$db->begin();
+
+	$result = $paiement->delete($user);
+	if ($result > 0)
+	{
+        $db->commit();
+        header("Location: ".DOL_URL_ROOT."/compta/charges/index.php?mode=sconly");
+        exit;
+	}
+	else
+	{
+		setEventMessage($paiement->error, 'errors');
+        $db->rollback();
+	}
+}
+
+// Create payment
+if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->charges->creer)
+{
+	$db->begin();
+
+	$result=$paiement->valide();
+	
+	if ($result > 0)
+	{
+		$db->commit();
+
+		$factures=array();	// TODO Get all id of invoices linked to this payment
+		foreach($factures as $id)
+		{
+			$fac = new Facture($db);
+			$fac->fetch($id);
+
+			$outputlangs = $langs;
+			if (! empty($_REQUEST['lang_id']))
+			{
+				$outputlangs = new Translate("",$conf);
+				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+			}
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				$fac->generateDocument($fac->modelpdf, $outputlangs);
+			}
+		}
+
+		header('Location: card.php?id='.$paiement->id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($paiement->error);
+		$db->rollback();
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$socialcontrib=new ChargeSociales($db);
+
+$form = new Form($db);
+
+$h=0;
+
+$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$_GET["id"];
+$head[$h][1] = $langs->trans("Card");
+$hselected = $h;
+$h++;
+
+/*$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/info.php?id='.$_GET["id"];
+$head[$h][1] = $langs->trans("Info");
+$h++;
+*/
+
+
+dol_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), 0, 'payment');
+
+/*
+ * Confirmation de la suppression du paiement
+ */
+if ($action == 'delete')
+{
+	print $form->formconfirm('card.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
+	
+}
+
+/*
+ * Confirmation de la validation du paiement
+ */
+if ($action == 'valide')
+{
+	$facid = $_GET['facid'];
+	print $form->formconfirm('card.php?id='.$paiement->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
+	
+}
+
+
+print '<table class="border" width="100%">';
+
+// Ref
+print '<tr><td valign="top" width="140">'.$langs->trans('Ref').'</td>';
+print '<td colspan="3">';
+print $form->showrefnav($paiement,'id','',1,'rowid','id');
+print '</td></tr>';
+
+// Date
+print '<tr><td valign="top" width="120">'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($paiement->datep,'day').'</td></tr>';
+
+// Mode
+print '<tr><td valign="top">'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$paiement->type_code).'</td></tr>';
+
+// Numero
+print '<tr><td valign="top">'.$langs->trans('Numero').'</td><td colspan="3">'.$paiement->num_paiement.'</td></tr>';
+
+// Montant
+print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($paiement->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+
+// Note
+print '<tr><td valign="top">'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($paiement->note).'</td></tr>';
+
+// Bank account
+if (! empty($conf->banque->enabled))
+{
+    if ($paiement->bank_account)
+    {
+    	$bankline=new AccountLine($db);
+    	$bankline->fetch($paiement->bank_line);
+
+    	print '<tr>';
+    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<td colspan="3">';
+		print $bankline->getNomUrl(1,0,'showall');
+    	print '</td>';
+    	print '</tr>';
+    }
+}
+
+print '</table>';
+
+
+/*
+ * List of social contributions payed
+ */
+
+$disable_delete = 0;
+$sql = 'SELECT f.rowid as scid, f.libelle, f.paye, f.amount as sc_amount, pf.amount, pc.libelle as sc_type';
+$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementcharge as pf,'.MAIN_DB_PREFIX.'chargesociales as f, '.MAIN_DB_PREFIX.'c_chargesociales as pc';
+$sql.= ' WHERE pf.fk_charge = f.rowid AND f.fk_type = pc.id';
+$sql.= ' AND f.entity = '.$conf->entity;
+$sql.= ' AND pf.rowid = '.$paiement->id;
+
+dol_syslog("compta/payment_sc/card.php", LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$i = 0;
+	$total = 0;
+	print '<br><table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans('SocialContribution').'</td>';
+    print '<td>'.$langs->trans('Type').'</td>';
+	print '<td>'.$langs->trans('Label').'</td>';
+	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
+	print '<td align="center">'.$langs->trans('Status').'</td>';
+	print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
+	print "</tr>\n";
+
+	if ($num > 0)
+	{
+		$var=True;
+
+		while ($i < $num)
+		{
+			$objp = $db->fetch_object($resql);
+
+			$var=!$var;
+			print '<tr '.$bc[$var].'>';
+			// Ref
+			print '<td>';
+			$socialcontrib->fetch($objp->scid);
+			print $socialcontrib->getNomUrl(1);
+			print "</td>\n";
+			// Type
+            print '<td>';
+            print $socialcontrib->type_libelle;
+            /*print $socialcontrib->type;*/
+            print "</td>\n";
+			// Label
+			print '<td>'.$objp->libelle.'</td>';
+			// Expected to pay
+			print '<td align="right">'.price($objp->sc_amount).'</td>';
+			// Status
+			print '<td align="center">'.$socialcontrib->getLibStatut(4,$objp->amount).'</td>';
+			// Amount payed
+			print '<td align="right">'.price($objp->amount).'</td>';
+			print "</tr>\n";
+			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
+			{
+				$disable_delete = 1;
+			}
+			$total = $total + $objp->amount;
+			$i++;
+		}
+	}
+	$var=!$var;
+
+	print "</table>\n";
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+print '</div>';
+
+
+/*
+ * Boutons Actions
+ */
+print '<div class="tabsAction">';
+
+/*
+if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+{
+	if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET['action'] == '')
+	{
+		if ($user->rights->facture->paiement)
+		{
+			print '<a class="butAction" href="card.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+		}
+	}
+}
+*/
+
+if ($_GET['action'] == '')
+{
+	if ($user->rights->tax->charges->supprimer)
+	{
+		if (! $disable_delete)
+		{
+			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+		}
+		else
+		{
+			print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
+		}
+	}
+}
+
+print '</div>';
+
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
deleted file mode 100644
index 3a010bcae37..00000000000
--- a/htdocs/compta/payment_sc/fiche.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-/* Copyright (C) 2004      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/compta/payment_sc/fiche.php
- *		\ingroup    facture
- *		\brief      Onglet payment of a social contribution
- *		\remarks	Fichier presque identique a fournisseur/paiement/fiche.php
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load('bills');
-$langs->load('banks');
-$langs->load('companies');
-
-// Security check
-$id=GETPOST("id");
-$action=GETPOST("action");
-$confirm=GETPOST('confirm');
-if ($user->societe_id) $socid=$user->societe_id;
-// TODO ajouter regle pour restreindre acces paiement
-//$result = restrictedArea($user, 'facture', $id,'');
-
-$paiement = new PaymentSocialContribution($db);
-if ($id > 0) 
-{
-	$result=$paiement->fetch($id);
-	if (! $result) dol_print_error($db,'Failed to get payment id '.$id);
-}
-
-
-/*
- * Actions
- */
-
-// Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer)
-{
-	$db->begin();
-
-	$result = $paiement->delete($user);
-	if ($result > 0)
-	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/compta/charges/index.php?mode=sconly");
-        exit;
-	}
-	else
-	{
-		setEventMessage($paiement->error, 'errors');
-        $db->rollback();
-	}
-}
-
-// Create payment
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->charges->creer)
-{
-	$db->begin();
-
-	$result=$paiement->valide();
-	
-	if ($result > 0)
-	{
-		$db->commit();
-
-		$factures=array();	// TODO Get all id of invoices linked to this payment
-		foreach($factures as $id)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
-
-			$outputlangs = $langs;
-			if (! empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs);
-		}
-
-		header('Location: fiche.php?id='.$paiement->id);
-		exit;
-	}
-	else
-	{
-		setEventMessage($paiement->error);
-		$db->rollback();
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$socialcontrib=new ChargeSociales($db);
-
-$form = new Form($db);
-
-$h=0;
-
-$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$_GET["id"];
-$head[$h][1] = $langs->trans("Card");
-$hselected = $h;
-$h++;
-
-/*$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/info.php?id='.$_GET["id"];
-$head[$h][1] = $langs->trans("Info");
-$h++;
-*/
-
-
-dol_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), 0, 'payment');
-
-/*
- * Confirmation de la suppression du paiement
- */
-if ($action == 'delete')
-{
-	print $form->formconfirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
-	
-}
-
-/*
- * Confirmation de la validation du paiement
- */
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm('fiche.php?id='.$paiement->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
-	
-}
-
-
-print '<table class="border" width="100%">';
-
-// Ref
-print '<tr><td valign="top" width="140">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($paiement,'id','',1,'rowid','id');
-print '</td></tr>';
-
-// Date
-print '<tr><td valign="top" width="120">'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($paiement->datep,'day').'</td></tr>';
-
-// Mode
-print '<tr><td valign="top">'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$paiement->type_code).'</td></tr>';
-
-// Numero
-print '<tr><td valign="top">'.$langs->trans('Numero').'</td><td colspan="3">'.$paiement->num_paiement.'</td></tr>';
-
-// Montant
-print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($paiement->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
-
-// Note
-print '<tr><td valign="top">'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($paiement->note).'</td></tr>';
-
-// Bank account
-if (! empty($conf->banque->enabled))
-{
-    if ($paiement->bank_account)
-    {
-    	$bankline=new AccountLine($db);
-    	$bankline->fetch($paiement->bank_line);
-
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-		print '<td colspan="3">';
-		print $bankline->getNomUrl(1,0,'showall');
-    	print '</td>';
-    	print '</tr>';
-    }
-}
-
-print '</table>';
-
-
-/*
- * List of social contributions payed
- */
-
-$disable_delete = 0;
-$sql = 'SELECT f.rowid as scid, f.libelle, f.paye, f.amount as sc_amount, pf.amount, pc.libelle as sc_type';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementcharge as pf,'.MAIN_DB_PREFIX.'chargesociales as f, '.MAIN_DB_PREFIX.'c_chargesociales as pc';
-$sql.= ' WHERE pf.fk_charge = f.rowid AND f.fk_type = pc.id';
-$sql.= ' AND f.entity = '.$conf->entity;
-$sql.= ' AND pf.rowid = '.$paiement->id;
-
-dol_syslog("compta/payment_sc/fiche.php sql=".$sql);
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-
-	$i = 0;
-	$total = 0;
-	print '<br><table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans('SocialContribution').'</td>';
-    print '<td>'.$langs->trans('Type').'</td>';
-	print '<td>'.$langs->trans('Label').'</td>';
-	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
-	print '<td align="center">'.$langs->trans('Status').'</td>';
-	print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
-	print "</tr>\n";
-
-	if ($num > 0)
-	{
-		$var=True;
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			$var=!$var;
-			print '<tr '.$bc[$var].'>';
-			// Ref
-			print '<td>';
-			$socialcontrib->fetch($objp->scid);
-			print $socialcontrib->getNomUrl(1);
-			print "</td>\n";
-			// Type
-            print '<td>';
-            print $socialcontrib->type_libelle;
-            /*print $socialcontrib->type;*/
-            print "</td>\n";
-			// Label
-			print '<td>'.$objp->libelle.'</td>';
-			// Expected to pay
-			print '<td align="right">'.price($objp->sc_amount).'</td>';
-			// Status
-			print '<td align="center">'.$socialcontrib->getLibStatut(4,$objp->amount).'</td>';
-			// Amount payed
-			print '<td align="right">'.price($objp->amount).'</td>';
-			print "</tr>\n";
-			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
-			{
-				$disable_delete = 1;
-			}
-			$total = $total + $objp->amount;
-			$i++;
-		}
-	}
-	$var=!$var;
-
-	print "</table>\n";
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-print '</div>';
-
-
-/*
- * Boutons Actions
- */
-print '<div class="tabsAction">';
-
-/*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
-			print '<a class="butAction" href="fiche.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-		}
-	}
-}
-*/
-
-if ($_GET['action'] == '')
-{
-	if ($user->rights->tax->charges->supprimer)
-	{
-		if (! $disable_delete)
-		{
-			print '<a class="butActionDelete" href="fiche.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
-			print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
-		}
-	}
-}
-
-print '</div>';
-
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/payment_sc/index.html b/htdocs/compta/payment_sc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
deleted file mode 100644
index 20d60c3a55b..00000000000
--- a/htdocs/compta/prelevement/bon.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/* Copyright (C) 2005 	   Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005 	   Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012 Juanjo Menent 	    <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/compta/prelevement/bon.php
- *      \ingroup    prelevement
- *      \brief      Fiche apercu du bon de prelevement
- */
-
-require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-$langs->load("bills");
-$langs->load("categories");
-
-// Security check
-$socid=0;
-$id = GETPOST('id','int');
-$ref = GETPOST('ref','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'prelevement', $id);
-
-
-llxHeader('','Bon de prelevement');
-
-$form = new Form($db);
-
-if ($id > 0 || ! empty($ref))
-{
-	$object = new BonPrelevement($db,"");
-
-	if ($object->fetch($id) == 0)
-    {
-		$head = prelevement_prepare_head($object);
-		dol_fiche_head($head, 'preview', 'Prelevement : '. $object->ref);
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$object->ref.'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-
-		$relativepath = 'bon/'.$object->ref;
-
-		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$object->ref.'</a>';
-
-		print '</td></tr>';
-		print '</table><br>';
-
-		$fileimage = $conf->prelevement->dir_output.'/receipts/'.$object->ref.'.ps.png.0';
-		$fileps = $conf->prelevement->dir_output.'/receipts/'.$object->ref.'.ps';
-
-		// Conversion du PDF en image png si fichier png non existant
-		if (!file_exists($fileimage))
-        {
-			if (class_exists("Imagick"))
-			{
-				$ret = dol_convert_file($file,'png',$fileimage);
-				if ($ret < 0) $error++;
-			}
-			else
-			{
-				$langs->load("errors");
-				print '<font class="error">'.$langs->trans("ErrorNoImagickReadimage").'</font>';
-			}
-		}
-
-		if (file_exists($fileimage))
-		{
-			print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=prelevement&file='.urlencode(basename($fileimage)).'">';
-
-		}
-
-		dol_fiche_end();
-	}
-	else
-	{
-		dol_print_error($db);
-    }
-}
-
-llxFooter();
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php
index 97e4401ec27..c2d67b4551b 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/bons.php
@@ -73,14 +73,14 @@ if ($result)
 
   $urladd= "&amp;statut=".$statut;
 
-  print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, "bons.php", $urladd, $sortfield, $sortorder, '', $num);
+  print_barre_liste($langs->trans("WithdrawalsReceipts"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
 
   print"\n<!-- debut table -->\n";
   print '<table class="liste" width="100%">';
 
   print '<tr class="liste_titre">';
-  print_liste_field_titre($langs->trans("WithdrawalsReceipts"),"bons.php","p.ref",'','','class="liste_titre"');
-  print_liste_field_titre($langs->trans("Date"),"bons.php","p.datec","","",'class="liste_titre" align="center"');
+  print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref",'','','class="liste_titre"');
+  print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'class="liste_titre" align="center"');
   print '<td class="liste_titre" align="right">'.$langs->trans("Amount").'</td>';
   print '</tr>';
 
@@ -104,7 +104,7 @@ if ($result)
       print $bon->LibStatut($obj->statut,2);
       print "&nbsp;";
 
-      print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
+      print '<a href="card.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
 
       print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
new file mode 100644
index 00000000000..e2a5e846b0a
--- /dev/null
+++ b/htdocs/compta/prelevement/card.php
@@ -0,0 +1,267 @@
+<?php
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2012 Juanjo Menent 		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/prelevement/card.php
+ *	\ingroup    prelevement
+ *	\brief      Fiche prelevement
+ */
+
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("categories");
+
+if (!$user->rights->prelevement->bons->lire)
+accessforbidden();
+
+$langs->load("bills");
+$langs->load("withdrawals");
+
+
+// Security check
+if ($user->societe_id > 0) accessforbidden();
+
+// Get supervariables
+$action = GETPOST('action','alpha');
+$id = GETPOST('id','int');
+
+
+/*
+ * Actions
+ */
+if ( $action == 'confirm_delete' )
+{
+	$bon = new BonPrelevement($db,"");
+	$bon->fetch($id);
+
+	$res=$bon->delete();
+	if ($res > 0)
+	{
+		header("Location: index.php");
+		exit;
+	}
+}
+
+if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes')
+{
+	$bon = new BonPrelevement($db,"");
+	$bon->fetch($id);
+
+	$bon->set_credite();
+
+	header("Location: card.php?id=".$id);
+	exit;
+}
+
+if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	$bon = new BonPrelevement($db,"");
+	$bon->fetch($id);
+
+	$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
+
+	/*
+	if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $bon->ref)
+	{
+		$dir = $conf->prelevement->dir_output.'/receipts';
+
+		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
+		{
+			$bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+		}
+
+		header("Location: card.php?id=".$id);
+        exit;
+	}
+	else
+	{
+		dol_syslog("Fichier invalide",LOG_WARNING);
+		$mesg='BadFile';
+	}*/
+
+	$error = $bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+
+	if ($error)
+	{
+		header("Location: card.php?id=".$id."&error=$error");
+		exit;
+	}
+}
+
+if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
+{
+	$bon = new BonPrelevement($db,"");
+	$bon->fetch($id);
+	$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
+
+	$error = $bon->set_infocredit($user, $dt);
+
+	if ($error)
+	{
+		header("Location: card.php?id=".$id."&error=$error");
+		exit;
+	}
+}
+
+
+/*
+ * View
+ */
+
+$bon = new BonPrelevement($db,"");
+$form = new Form($db);
+
+llxHeader('',$langs->trans("WithdrawalsReceipts"));
+
+
+if ($id > 0)
+{
+	$bon->fetch($id);
+
+	$head = prelevement_prepare_head($bon);
+	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), '', 'payment');
+
+	if (GETPOST('error','alpha')!='')
+	{
+		print '<div class="error">'.$bon->ReadError(GETPOST('error','alpha')).'</div>';
+	}
+
+	/*if ($action == 'credite')
+	{
+		print $form->formconfirm("card.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
+
+	}*/
+
+	print '<table class="border" width="100%">';
+
+	print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+
+	// Status
+	print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
+	print '<td>'.$bon->getLibStatut(1).'</td>';
+	print '</tr>';
+
+	if($bon->date_trans <> 0)
+	{
+		$muser = new User($db);
+		$muser->fetch($bon->user_trans);
+
+		print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+		print dol_print_date($bon->date_trans,'day');
+		print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+		print $bon->methodes_trans[$bon->method_trans];
+		print '</td></tr>';
+	}
+	if($bon->date_credit <> 0)
+	{
+		print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+		print dol_print_date($bon->date_credit,'day');
+		print '</td></tr>';
+	}
+
+	print '</table>';
+
+	print '<br>';
+
+	print '<table class="border" width="100%"><tr><td width="20%">';
+	print $langs->trans("WithdrawalFile").'</td><td>';
+	$relativepath = 'receipts/'.$bon->ref;
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+	print '</td></tr></table>';
+
+	dol_fiche_end();
+
+
+
+
+	if (empty($bon->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted')
+	{
+		print '<form method="post" name="userfile" action="card.php?id='.$bon->id.'" enctype="multipart/form-data">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="infotrans">';
+		print '<table class="border" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+		print $form->select_date('','','','','',"userfile",1,1);
+		print '</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+		print $form->selectarray("methode",$bon->methodes_trans);
+		print '</td></tr>';
+/*			print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
+		print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
+		print '<input class="flat" type="file" name="userfile"><br>';
+		print '</td></tr>';*/
+		print '</table><br>';
+		print '<center><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("SetToStatusSent")).'">';
+		print '</form>';
+	}
+
+	if (! empty($bon->date_trans) && $bon->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited')
+	{
+		print '<form name="infocredit" method="post" action="card.php?id='.$bon->id.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="infocredit">';
+		print '<table class="border" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+		print $form->select_date('','','','','',"infocredit",1,1);
+		print '</td></tr>';
+		print '</table>';
+		print '<br>'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice");
+		print '<center><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("ClassCredited")).'">';
+		print '</form>';
+	}
+
+
+	// Actions
+	if ($action != 'settransmitted' && $action != 'setcredited')
+	{
+		print "\n<div class=\"tabsAction\">\n";
+
+		if (empty($bon->date_trans) && $user->rights->prelevement->bons->send)
+		{
+			print "<a class=\"butAction\" href=\"card.php?action=settransmitted&id=".$bon->id."\">".$langs->trans("SetToStatusSent")."</a>";
+		}
+
+		if (! empty($bon->date_trans) && $bon->date_credit == 0)
+		{
+			print "<a class=\"butAction\" href=\"card.php?action=setcredited&id=".$bon->id."\">".$langs->trans("ClassCredited")."</a>";
+		}
+
+		print "<a class=\"butActionDelete\" href=\"card.php?action=confirm_delete&id=".$bon->id."\">".$langs->trans("Delete")."</a>";
+
+		print "</div>";
+	}
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 3a83d9c3dba..497d690072b 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
@@ -280,7 +282,7 @@ class BonPrelevement extends CommonObject
         $sql.= " WHERE p.rowid = ".$rowid;
         $sql.= " AND p.entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
@@ -315,7 +317,6 @@ class BonPrelevement extends CommonObject
         }
         else
         {
-            dol_syslog(get_class($this)."::Fetch Erreur sql=".$sql, LOG_ERR);
             return -2;
         }
     }
@@ -558,8 +559,6 @@ class BonPrelevement extends CommonObject
             }
             else
            {
-                dol_syslog(get_class($this)."::set_infotrans Erreur 1", LOG_ERR);
-                dol_syslog($this->db->error());
                 $error++;
             }
 
@@ -706,6 +705,7 @@ class BonPrelevement extends CommonObject
         //if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
         //if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
 
+	    dol_syslog(get_class($this)."::SommeAPrelever");
         $resql = $this->db->query($sql);
 
         if ( $resql )
@@ -719,7 +719,6 @@ class BonPrelevement extends CommonObject
         else
         {
             $this->error=get_class($this)."::SommeAPrelever Erreur -1 sql=".$this->db->error();
-            dol_syslog($this->error, LOG_ERR);
             return -1;
         }
     }
@@ -758,13 +757,15 @@ class BonPrelevement extends CommonObject
         $factures = array();
         $factures_prev = array();
         $factures_result = array();
+        $factures_prev_id=array();
+        $factures_errors=array();
 
         if (! $error)
         {
             $sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc";
             $sql.= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
             $sql.= ", pfd.amount";
-            $sql.= ", s.nom";
+            $sql.= ", s.nom as name";
             $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
             $sql.= ", ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
@@ -780,7 +781,7 @@ class BonPrelevement extends CommonObject
             //if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
             //if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
 
-            dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::Create", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
             {
@@ -824,7 +825,9 @@ class BonPrelevement extends CommonObject
                         {
                         	$bac = new CompanyBankAccount($this->db);
                         	$bac->fetch(0,$soc->id);
+
                             if ($bac->verif() >= 1)
+                            //if (true)
                             {
                                 $factures_prev[$i] = $fac;
                                 /* second tableau necessaire pour BonPrelevement */
@@ -833,8 +836,8 @@ class BonPrelevement extends CommonObject
                             }
                             else
 							{
-								dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->nom, LOG_ERR);
-                                $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->nom;
+								dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
+                                $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
@@ -897,7 +900,7 @@ class BonPrelevement extends CommonObject
                 $sql.= " WHERE ref LIKE '".$ref."%'";
                 $sql.= " AND entity = ".$conf->entity;
 
-                dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::Create", LOG_DEBUG);
                 $resql = $this->db->query($sql);
 
                 if ($resql)
@@ -923,7 +926,7 @@ class BonPrelevement extends CommonObject
                 $sql.= ", '".$this->db->idate($now)."'";
                 $sql.= ")";
 
-                dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::Create", LOG_DEBUG);
                 $resql = $this->db->query($sql);
 
                 if ($resql)
@@ -984,7 +987,7 @@ class BonPrelevement extends CommonObject
                         $sql.= ", fk_prelevement_bons = ".$prev_id;
                         $sql.= " WHERE rowid = ".$fac[1];
 
-                        dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+                        dol_syslog(get_class($this)."::Create", LOG_DEBUG);
                         $resql=$this->db->query($sql);
                         if (! $resql)
                         {
@@ -1041,7 +1044,7 @@ class BonPrelevement extends CommonObject
             $sql.= " WHERE rowid = ".$prev_id;
             $sql.= " AND entity = ".$conf->entity;
 
-            dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::Create", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
             {
@@ -1122,12 +1125,12 @@ class BonPrelevement extends CommonObject
 
         $result='';
 
-        $lien = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$this->id.'">';
+        $lien = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id.'">';
         $lienfin='</a>';
 
         if ($option == 'xxx')
         {
-            $lien = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$this->id.'">';
+            $lien = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id.'">';
             $lienfin='</a>';
         }
 
@@ -1229,92 +1232,24 @@ class BonPrelevement extends CommonObject
      *	@return		int			0 if OK, <0 if KO
      */
     //TODO: Optimize code to read lines in a single function
-    function Generate()
+    function generate()
     {
         global $conf,$langs,$mysoc;
 
         $result = 0;
 
-        dol_syslog(get_class($this)."::Generate build file ".$this->filename);
+        dol_syslog(get_class($this)."::generate build file ".$this->filename);
 
         $this->file = fopen($this->filename,"w");
 
-        // TODO Move code for es and fr into an external module file with selection into setup of prelevement module
-
         $found=0;
 
-        // Build file for Spain
-        if ($mysoc->country_code=='ES')
-        {
-        	if (! empty($conf->esaeb->enabled))
-            {
-            	$found++;
-
-            	dol_include_once('/esaeb/class/esaeb19.class.php');
-
-                //Head
-                $esaeb19 = new AEB19DocWritter;
-                $esaeb19->configuraPresentador($this->numero_national_emetteur,$conf->global->ESAEB_SUFIX_PRESENTADOR,$this->raison_sociale,$this->emetteur_code_banque,$this->emetteur_code_guichet);
-                $idOrdenante = $esaeb19->agregaOrdenante($this->numero_national_emetteur,$conf->global->ESAEB_SUFIX_ORDENANTE,$this->raison_sociale,$this->emetteur_code_banque,$this->emetteur_code_guichet, $this->emetteur_number_key, $this->emetteur_numero_compte);
-                $this->total = 0;
-                $sql = "SELECT pl.rowid, pl.fk_soc, pl.client_nom, pl.code_banque, pl.code_guichet, pl.cle_rib, pl.number, pl.amount,";
-	        	$sql.= " f.facnumber, pf.fk_facture";
-	        	$sql.= " FROM";
-	        	$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
-	        	$sql.= " ".MAIN_DB_PREFIX."facture as f,";
-	        	$sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
-	        	$sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
-	        	$sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
-	        	$sql.= " AND pf.fk_facture = f.rowid";
-
-                //Lines
-                $i = 0;
-                $resql=$this->db->query($sql);
-                if ($resql)
-                {
-                    $num = $this->db->num_rows($resql);
-
-					$client = new Societe($this->db);
-
-                    while ($i < $num)
-                    {
-                    	$obj = $this->db->fetch_object($resql);
-						$client->fetch($obj->fk_soc);
-
-                        $esaeb19->agregaRecibo(
-                            $idOrdenante,
-							$client->idprof1,
-                            $obj->client_nom,
-                            $obj->code_banque,
-                            $obj->code_guichet,
-                            $obj->cle_rib,
-                            $obj->number,
-                            $obj->amount,
-                            "Fra.".$obj->facnumber." ".$obj->amount
-                        );
-
-                        $this->total = $this->total + $obj->amount;
-
-                        $i++;
-                    }
-                }
-                else
-              {
-                    $result = -2;
-                }
-
-                fputs($this->file, $esaeb19->generaRemesa());
-            }
-        }
-
         // Build file for European countries
-        if (! $found && $mysoc->isInEEC())
+        if ($mysoc->isInEEC())
         {
         	$found++;
 
 			/**
-			 * SECTION CREATION FICHIER SEPA
-			 * SECTION CREATION FICHIER SEPA
 			 * SECTION CREATION FICHIER SEPA
 			 */
 			// SEPA Initialisation
@@ -1331,20 +1266,20 @@ class BonPrelevement extends CommonObject
 			/*
 			 * section Debiteur (sepa Debiteurs bloc lines)
 			 */
-			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, p.code as country_code,";
-			$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
+			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, c.code as country_code,";
+			$sql.= " pl.client_nom as name, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
 			$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
 			$sql.= " FROM";
 			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
 			$sql.= " ".MAIN_DB_PREFIX."facture as f,";
 			$sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf,";
 			$sql.= " ".MAIN_DB_PREFIX."societe as soc,";
-			$sql.= " ".MAIN_DB_PREFIX."c_pays as p,";
+			$sql.= " ".MAIN_DB_PREFIX."c_country as c,";
 			$sql.= " ".MAIN_DB_PREFIX."societe_rib as rib";
 			$sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
 			$sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
 			$sql.= " AND pf.fk_facture = f.rowid";
-			$sql.= " AND soc.fk_pays = p.rowid";
+			$sql.= " AND soc.fk_pays = c.rowid";
 			$sql.= " AND soc.rowid = f.fk_soc";
 			$sql.= " AND rib.fk_soc = f.fk_soc";
 			$sql.= " AND rib.default_rib = 1";
@@ -1356,7 +1291,7 @@ class BonPrelevement extends CommonObject
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
+					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->name, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
 					$this->total = $this->total + $obj->somme;
 					$i++;
 				}
@@ -1377,8 +1312,6 @@ class BonPrelevement extends CommonObject
 			}
 
 			/**
-			 * SECTION CREATION FICHIER SEPA
-			 * SECTION CREATION FICHIER SEPA
 			 * SECTION CREATION FICHIER SEPA
 			 */
 			// SEPA File Header
@@ -1470,11 +1403,14 @@ class BonPrelevement extends CommonObject
                 }
             }
             else
-            {
+			{
                 $result = -2;
             }
+
             $langs->load('withdrawals');
-            fputs($this->file, $langs->trans('WithdrawalFileNotCapable'));
+
+            // TODO Add here code to generate a generic file
+            fputs($this->file, $langs->trans('WithdrawalFileNotCapable', $mysoc->country_code));
         }
 
         fclose($this->file);
@@ -1560,11 +1496,11 @@ class BonPrelevement extends CommonObject
      *	Write recipient of request (customer)
      *
      *	@param	string		$row_code_client	soc.code_client as code,
-     *	@param	string		$row_nom			pl.client_nom AS nom,
+     *	@param	string		$row_nom			pl.client_nom AS name,
      *	@param	string		$row_address		soc.address AS adr,
      *	@param	string		$row_zip			soc.zip
      *  @param	string		$row_town			soc.town
-     *	@param	string		$row_country_code	p.code AS pays,
+     *	@param	string		$row_country_code	c.code AS country,
      *	@param	string		$row_cb				pl.code_banque AS cb,
      *	@param	string		$row_cg				pl.code_guichet AS cg,
      *	@param	string		$row_cc				pl.number AS cc,
@@ -1698,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
@@ -1720,7 +1656,7 @@ class BonPrelevement extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 
 			// DONNEES BRUTES : par la suite Rows['XXX'] de la requete au dessus
-			$pays = explode(':', $configuration->global->MAIN_INFO_SOCIETE_COUNTRY);
+			$country = explode(':', $configuration->global->MAIN_INFO_SOCIETE_COUNTRY);
 			$IdBon  = sprintf("%05d", $obj->rowid);
 			$RefBon = $obj->ref;
 			$type = ($nombre == 1) ? 'FRST' : 'RCUR' ;
@@ -1745,7 +1681,7 @@ class BonPrelevement extends CommonObject
 			$XML_SEPA_INFO .= '			<Cdtr>'.$CrLf;
 			$XML_SEPA_INFO .= '				<Nm>'.$configuration->global->PRELEVEMENT_RAISON_SOCIALE.'</Nm>'.$CrLf;
 			$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
-			$XML_SEPA_INFO .= '					<Ctry>'.$pays[1].'</Ctry>'.$CrLf;
+			$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 			$XML_SEPA_INFO .= '					<AdrLine>'.$configuration->global->MAIN_INFO_SOCIETE_ADDRESS.'</AdrLine>'.$CrLf;
 			$XML_SEPA_INFO .= '					<AdrLine>'.$configuration->global->MAIN_INFO_SOCIETE_ZIP.' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN.'</AdrLine>'.$CrLf;
 			$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
@@ -1763,7 +1699,7 @@ class BonPrelevement extends CommonObject
 /*			$XML_SEPA_INFO .= '			<UltmtCdtr>'.$CrLf;
 			$XML_SEPA_INFO .= '				<Nm>'.$configuration->global->PRELEVEMENT_RAISON_SOCIALE.'</Nm>'.$CrLf;
 			$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
-			$XML_SEPA_INFO .= '					<Ctry>'.$pays[1].'</Ctry>'.$CrLf;
+			$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 			$XML_SEPA_INFO .= '					<AdrLine>'.$conf->global->MAIN_INFO_SOCIETE_ADDRESS.'</AdrLine>'.$CrLf;
 			$XML_SEPA_INFO .= '					<AdrLine>'.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.'</AdrLine>'.$CrLf;
 			$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
@@ -1880,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/index.html b/htdocs/compta/prelevement/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 51f9a83ed3c..d0b467f294b 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -173,7 +173,8 @@ class RejetPrelevement
 			}
 			//Tag invoice as unpaid
 			dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref);
-			$fac->set_unpaid($fac->id, $user);
+
+			$fac->set_unpaid($user);
 
 			//TODO: Must be managed by notifications module
 			// Send email to sender of the standing order request
@@ -194,7 +195,7 @@ class RejetPrelevement
 	}
 
 	/**
-	 *  Envoi mail
+	 *  Send email to all users that has asked the withdraw request
 	 *
 	 * 	@param	Facture		$fac			Invoice object
 	 * 	@return	void
@@ -244,7 +245,7 @@ class RejetPrelevement
 			$arr_mime = array();
 			$arr_name = array();
 			$facref = $fac->ref;
-			$socname = $soc->nom;
+			$socname = $soc->name;
 			$amount = price($fac->total_ttc);
 			$userinfo = $this->user->getFullName($langs);
 
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index a3f7ca2ace8..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='<div class="error">'.$langs->trans("NoInvoiceCouldBeWithdrawed").'</div>';
+        foreach($bprev->invoice_in_error as $key => $val)
+        {
+        	$mesg.=$val."<br>\n";
+        }
     }
 }
 
@@ -156,7 +160,7 @@ print '<br>';
  * Invoices waiting for withdraw
  */
 
-$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.rowid as socid,";
+$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,";
 $sql.= " pfd.date_demande";
 $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s,";
@@ -179,6 +183,7 @@ if ($resql)
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Invoice").'</td>';
     print '<td>'.$langs->trans("ThirdParty").'</td>';
+    print '<td>'.$langs->trans("RIB").'</td>';
     print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
     print '<td align="right">'.$langs->trans("DateRequest").'</td>';
     print '</tr>';
@@ -190,16 +195,22 @@ if ($resql)
         {
             $obj = $db->fetch_object($resql);
             $var=!$var;
-            print '<tr '.$bc[$var].'><td>';
+            print '<tr '.$bc[$var].'>';
+            print '<td>';
             $invoicestatic->id=$obj->rowid;
             $invoicestatic->ref=$obj->facnumber;
             print $invoicestatic->getNomUrl(1,'withdraw');
             print '</td>';
+            // Thirdparty
             print '<td>';
-            $thirdpartystatic->id=$obj->socid;
-            $thirdpartystatic->nom=$obj->nom;
-            print $thirdpartystatic->getNomUrl(1,'customer');
+            $thirdpartystatic->fetch($obj->socid);
+            print $thirdpartystatic->getNomUrl(1,'card');
             print '</td>';
+            // RIB
+            print '<td>';
+            print $thirdpartystatic->display_rib();
+            print '</td>';
+            // Amount
             print '<td align="right">';
             print price($obj->total_ttc,0,$langs,0,0,-1,$conf->currency);
             print '</td>';
@@ -211,7 +222,7 @@ if ($resql)
             $i++;
         }
     }
-    else print '<tr><td colspan="4">'.$langs->trans("None").'</td></tr>';
+    else print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("None").'</td></tr>';
     print "</table>";
     print "<br>\n";
 }
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 4cd3098bfc3..364e073676b 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 $langs->load("banks");
 $langs->load("categories");
-$langs->load("widthdrawals");
+$langs->load("withdrawals");
 $langs->load("companies");
 
 // Security check
@@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="f.facnumber";
  */
 
 $sql= "SELECT f.facnumber, f.rowid, f.total_ttc,";
-$sql.= " s.nom, s.rowid as socid,";
+$sql.= " s.nom as name, s.rowid as socid,";
 $sql.= " pfd.date_demande as date_demande,";
 $sql.= " pfd.fk_user_demande";
 $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
@@ -112,8 +112,8 @@ if ($resql)
 	print '</tr>';
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_facture" size="12" value="'.GETPOST('search_facture','alpha').'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_societe" size="18" value="'.GETPOST('search_societe','alpha').'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_facture" size="12" value="'.dol_escape_htmltag(GETPOST('search_facture','alpha')).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_societe" size="18" value="'.dol_escape_htmltag(GETPOST('search_societe','alpha')).'"></td>';
 	print '<td colspan="2" class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
 	print '</tr>';
 	print '</form>';
@@ -137,7 +137,7 @@ if ($resql)
 
 		print '<td>';
 		$thirdpartystatic->id=$obj->socid;
-		$thirdpartystatic->nom=$obj->nom;
+		$thirdpartystatic->name=$obj->name;
 		print $thirdpartystatic->getNomUrl(1,'customer');
 		print '</td>';
 
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 92cd8c4c6a9..d11fefbb6cb 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -63,17 +63,17 @@ if ($prev_id)
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-	
+
 		// Status
 		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
 		print '<td>'.$bon->getLibStatut(1).'</td>';
 		print '</tr>';
-	
+
 		if($bon->date_trans <> 0)
 		{
 			$muser = new User($db);
 			$muser->fetch($bon->user_trans);
-	
+
 			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($bon->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
@@ -87,19 +87,19 @@ if ($prev_id)
 			print dol_print_date($bon->date_credit,'day');
 			print '</td></tr>';
 		}
-	
+
 		print '</table>';
-	
+
 		print '<br>';
-	
+
 		print '<table class="border" width="100%"><tr><td width="20%">';
 		print $langs->trans("WithdrawalFile").'</td><td>';
 		$relativepath = 'receipts/'.$bon->ref;
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
-	
+
 		dol_fiche_end();
-      	
+
     }
   	else
     {
@@ -114,7 +114,7 @@ $offset = $conf->liste_limit * $page ;
  */
 $sql = "SELECT pf.rowid";
 $sql.= ",f.rowid as facid, f.facnumber as ref, f.total_ttc";
-$sql.= ", s.rowid as socid, s.nom, pl.statut";
+$sql.= ", s.rowid as socid, s.nom as name, pl.statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql.= ", ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 $sql.= ", ".MAIN_DB_PREFIX."prelevement_facture as pf";
@@ -144,9 +144,9 @@ if ($result)
   	print"\n<!-- debut table -->\n";
   	print '<table class="liste" width="100%">';
   	print '<tr class="liste_titre">';
-  	print_liste_field_titre($langs->trans("Bill"),"factures.php","p.ref",'',$urladd,'class="liste_titre"',$sortfield,$sortorder);
-  	print_liste_field_titre($langs->trans("ThirdParty"),"factures.php","s.nom",'',$urladd,'class="liste_titre"',$sortfield,$sortorder);
-  	print_liste_field_titre($langs->trans("Amount"),"factures.php","f.total_ttc","",$urladd,'class="liste_titre" align="center"',$sortfield,$sortorder);
+  	print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"p.ref",'',$urladd,'class="liste_titre"',$sortfield,$sortorder);
+  	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd,'class="liste_titre"',$sortfield,$sortorder);
+  	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"f.total_ttc","",$urladd,'class="liste_titre" align="center"',$sortfield,$sortorder);
   	print '<td class="liste_titre" colspan="2">&nbsp;</td></tr>';
 
   	$var=false;
@@ -165,8 +165,8 @@ if ($result)
 
       	print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
 
-      	print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">';
-      	print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
+      	print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
+      	print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."</a></td>\n";
 
       	print '<td align="center">'.price($obj->total_ttc)."</td>\n";
 
@@ -213,6 +213,7 @@ else
 	dol_print_error($db);
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 905ab6f6bf1..161227aa121 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -62,17 +62,17 @@ if ($prev_id)
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-	
+
 		// Status
 		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
 		print '<td>'.$bon->getLibStatut(1).'</td>';
 		print '</tr>';
-	
+
 		if($bon->date_trans <> 0)
 		{
 			$muser = new User($db);
 			$muser->fetch($bon->user_trans);
-	
+
 			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($bon->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
@@ -86,19 +86,19 @@ if ($prev_id)
 			print dol_print_date($bon->date_credit,'day');
 			print '</td></tr>';
 		}
-	
+
 		print '</table>';
-	
+
 		print '<br>';
-	
+
 		print '<table class="border" width="100%"><tr><td width="20%">';
 		print $langs->trans("WithdrawalFile").'</td><td>';
 		$relativepath = 'receipts/'.$bon->ref;
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
-	
+
 		dol_fiche_end();
-      	
+
     }
   	else
     {
@@ -112,7 +112,7 @@ $rej = new RejetPrelevement($db, $user);
  * Liste des factures
  */
 $sql = "SELECT pl.rowid, pl.amount, pl.statut";
-$sql.= " , s.rowid as socid, s.nom";
+$sql.= " , s.rowid as socid, s.nom as name";
 $sql.= " , pr.motif, pr.afacturer, pr.fk_facture";
 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -152,7 +152,7 @@ if ($resql)
 		print img_picto('', 'statut'.$obj->statut).' ';
 		print substr('000000'.$obj->rowid, -6);
 		print '</a></td>';
-		print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
+		print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
 
 		print '<td align="right">'.price($obj->amount)."</td>\n";
 		print '<td>'.$rej->motifs[$obj->motif].'</td>';
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<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
deleted file mode 100644
index e594beae1d6..00000000000
--- a/htdocs/compta/prelevement/fiche.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012 Juanjo Menent 		<jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/compta/prelevement/fiche.php
- *	\ingroup    prelevement
- *	\brief      Fiche prelevement
- */
-
-require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("categories");
-
-if (!$user->rights->prelevement->bons->lire)
-accessforbidden();
-
-$langs->load("bills");
-$langs->load("withdrawals");
-
-
-// Security check
-if ($user->societe_id > 0) accessforbidden();
-
-// Get supervariables
-$action = GETPOST('action','alpha');
-$id = GETPOST('id','int');
-
-
-/*
- * Actions
- */
-if ( $action == 'confirm_delete' )
-{
-	$bon = new BonPrelevement($db,"");
-	$bon->fetch($id);
-
-	$res=$bon->delete();
-	if ($res > 0)
-	{
-		header("Location: index.php");
-		exit;
-	}
-}
-
-if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes')
-{
-	$bon = new BonPrelevement($db,"");
-	$bon->fetch($id);
-
-	$bon->set_credite();
-
-	header("Location: fiche.php?id=".$id);
-	exit;
-}
-
-if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$bon = new BonPrelevement($db,"");
-	$bon->fetch($id);
-
-	$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
-
-	/*
-	if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $bon->ref)
-	{
-		$dir = $conf->prelevement->dir_output.'/receipts';
-
-		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
-		{
-			$bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
-		}
-
-		header("Location: fiche.php?id=".$id);
-        exit;
-	}
-	else
-	{
-		dol_syslog("Fichier invalide",LOG_WARNING);
-		$mesg='BadFile';
-	}*/
-
-	$error = $bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
-
-	if ($error)
-	{
-		header("Location: fiche.php?id=".$id."&error=$error");
-		exit;
-	}
-}
-
-if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
-{
-	$bon = new BonPrelevement($db,"");
-	$bon->fetch($id);
-	$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
-
-	$error = $bon->set_infocredit($user, $dt);
-
-	if ($error)
-	{
-		header("Location: fiche.php?id=".$id."&error=$error");
-		exit;
-	}
-}
-
-
-/*
- * View
- */
-
-$bon = new BonPrelevement($db,"");
-$form = new Form($db);
-
-llxHeader('',$langs->trans("WithdrawalsReceipts"));
-
-
-if ($id > 0)
-{
-	$bon->fetch($id);
-
-	$head = prelevement_prepare_head($bon);
-	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), '', 'payment');
-
-	if (GETPOST('error','alpha')!='')
-	{
-		print '<div class="error">'.$bon->ReadError(GETPOST('error','alpha')).'</div>';
-	}
-
-	/*if ($action == 'credite')
-	{
-		print $form->formconfirm("fiche.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
-
-	}*/
-
-	print '<table class="border" width="100%">';
-
-	print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
-	print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
-	print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-
-	// Status
-	print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
-	print '<td>'.$bon->getLibStatut(1).'</td>';
-	print '</tr>';
-
-	if($bon->date_trans <> 0)
-	{
-		$muser = new User($db);
-		$muser->fetch($bon->user_trans);
-
-		print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
-		print dol_print_date($bon->date_trans,'day');
-		print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
-		print $bon->methodes_trans[$bon->method_trans];
-		print '</td></tr>';
-	}
-	if($bon->date_credit <> 0)
-	{
-		print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
-		print dol_print_date($bon->date_credit,'day');
-		print '</td></tr>';
-	}
-
-	print '</table>';
-
-	print '<br>';
-
-	print '<table class="border" width="100%"><tr><td width="20%">';
-	print $langs->trans("WithdrawalFile").'</td><td>';
-	$relativepath = 'receipts/'.$bon->ref;
-	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
-	print '</td></tr></table>';
-
-	dol_fiche_end();
-
-
-
-
-	if (empty($bon->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted')
-	{
-		print '<form method="post" name="userfile" action="fiche.php?id='.$bon->id.'" enctype="multipart/form-data">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="infotrans">';
-		print '<table class="border" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
-		print $form->select_date('','','','','',"userfile",1,1);
-		print '</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
-		print $form->selectarray("methode",$bon->methodes_trans);
-		print '</td></tr>';
-/*			print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-		print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
-		print '<input class="flat" type="file" name="userfile"><br>';
-		print '</td></tr>';*/
-		print '</table><br>';
-		print '<center><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("SetToStatusSent")).'">';
-		print '</form>';
-	}
-
-	if (! empty($bon->date_trans) && $bon->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited')
-	{
-		print '<form name="infocredit" method="post" action="fiche.php?id='.$bon->id.'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="infocredit">';
-		print '<table class="border" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
-		print $form->select_date('','','','','',"infocredit",1,1);
-		print '</td></tr>';
-		print '</table>';
-		print '<br>'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice");
-		print '<center><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("ClassCredited")).'">';
-		print '</form>';
-	}
-
-
-	// Actions
-	if ($action != 'settransmitted' && $action != 'setcredited')
-	{
-		print "\n<div class=\"tabsAction\">\n";
-
-		if (empty($bon->date_trans) && $user->rights->prelevement->bons->send)
-		{
-			print "<a class=\"butAction\" href=\"fiche.php?action=settransmitted&id=".$bon->id."\">".$langs->trans("SetToStatusSent")."</a>";
-		}
-
-		if (! empty($bon->date_trans) && $bon->date_credit == 0)
-		{
-			print "<a class=\"butAction\" href=\"fiche.php?action=setcredited&id=".$bon->id."\">".$langs->trans("ClassCredited")."</a>";
-		}
-
-		print "<a class=\"butActionDelete\" href=\"fiche.php?action=confirm_delete&id=".$bon->id."\">".$langs->trans("Delete")."</a>";
-
-		print "</div>";
-	}
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 911ffde6f99..1abc421cf46 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -96,7 +96,7 @@ print '</td></tr></table><br>';
  */
 $sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
 $sql.= " pfd.date_demande,";
-$sql.= " s.nom, s.rowid as socid";
+$sql.= " s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
 $sql.= " ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -137,7 +137,7 @@ if ($resql)
 
             print '<td>';
             $thirdpartystatic->id=$obj->socid;
-            $thirdpartystatic->nom=$obj->nom;
+            $thirdpartystatic->name=$obj->name;
             print $thirdpartystatic->getNomUrl(1,'customer');
             print '</td>';
 
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index ebf5180eb0e..3e7cb5b6bd7 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -105,10 +105,13 @@ if ($action == 'confirm_rejet')
 	}
 }
 
+
 /*
  * View
  */
 
+$invoicestatic=new Facture($db);
+
 llxHeader('',$langs->trans("StandingOrder"));
 
 $h = 0;
@@ -131,12 +134,10 @@ if ($id)
 		print '<table class="border" width="100%">';
 
 		print '<tr><td width="20%">'.$langs->trans("WithdrawalsReceipts").'</td><td>';
-		print '<a href="fiche.php?id='.$lipre->bon_rowid.'">'.$lipre->bon_ref.'</a></td></tr>';
+		print $bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>';
-
-		print $lipre->LibStatut($lipre->statut,1).'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("Status").'</td><td>'.$lipre->LibStatut($lipre->statut,1).'</td></tr>';
 
 		if ($lipre->statut == 3)
 		{
@@ -190,7 +191,7 @@ if ($id)
 		print '<td colspan="3">'.$langs->trans("WithdrawalRefused").'</td></tr>';
 
 		//Select yes/no
-		print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?</td>';
+		print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->name.' ?</td>';
 		print '<td colspan="2" class="valid">';
 		print $form->selectyesno("confirm",1,0);
 		print '</td></tr>';
@@ -215,7 +216,7 @@ if ($id)
 		print '</table><br>';
 
 		//Confirm Button
-		print '<center><input type="submit" class="valid" value='.$langs->trans("Confirm").'><center>';
+		print '<center><input type="submit" class="button" value='.$langs->trans("Confirm").'><center>';
 		print '</form>';
 	}
 
@@ -229,13 +230,20 @@ if ($id)
 
 	if ($action == '')
 	{
-		if ($bon->statut == 2 && $lipre->statut == 2 && $user->rights->prelevement->bons->credit)
+		if ($bon->statut == 2 && $lipre->statut == 2)
 		{
-	  		print "<a class=\"butAction\" href=\"ligne.php?action=rejet&amp;id=$lipre->id\">".$langs->trans("StandingOrderReject")."</a>";
+			if ($user->rights->prelevement->bons->credit)
+			{
+	  			print "<a class=\"butAction\" href=\"ligne.php?action=rejet&amp;id=$lipre->id\">".$langs->trans("StandingOrderReject")."</a>";
+			}
+			else
+			{
+				print "<a class=\"butActionRefused\" href=\"#\" title=\"".$langs->trans("NotAllowed")."\">".$langs->trans("StandingOrderReject")."</a>";
+			}
 		}
 		else
 		{
-			print "<a class=\"butActionRefused\" href=\"#\">".$langs->trans("StandingOrderReject")."</a>";
+			print "<a class=\"butActionRefused\" href=\"#\" title=\"".$langs->trans("NotPossibleForThisStatusOfWithdrawReceiptORLine")."\">".$langs->trans("StandingOrderReject")."</a>";
 		}
 	}
 
@@ -256,8 +264,8 @@ if ($id)
 	 * Liste des factures
 	 */
 	$sql = "SELECT pf.rowid";
-	$sql.= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc";
-	$sql.= " , s.rowid as socid, s.nom";
+	$sql.= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc, f.paye, f.fk_statut";
+	$sql.= " , s.rowid as socid, s.nom as name";
 	$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 	$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 	$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
@@ -287,7 +295,7 @@ if ($id)
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
+		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">'.$langs->trans("Status").'</td>';
 		print '</tr>';
 
 		$var=True;
@@ -307,11 +315,16 @@ if ($id)
 
 			print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
 
-			print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">';
-			print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
+			print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."</a></td>\n";
 
 			print '<td align="right">'.price($obj->total_ttc)."</td>\n";
 
+			print '<td align="right">';
+			$invoicestatic->fetch($obj->facid);
+			print $invoicestatic->getLibStatut(5);
+			print "</td>\n";
+
 			print "</tr>\n";
 
 			$i++;
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index d7dac30b3af..c4724824f36 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -106,7 +106,7 @@ if ($prev_id)
 		print '</td></tr></table>';
 
 		dol_fiche_end();
-		
+
 	}
 	else
 	{
@@ -124,11 +124,9 @@ $pagenext = $page + 1;
 
 /*
  * Liste des lignes de prelevement
- *
- *
  */
 $sql = "SELECT pl.rowid, pl.statut, pl.amount";
-$sql.= ", s.rowid as socid, s.nom";
+$sql.= ", s.rowid as socid, s.nom as name";
 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 $sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -149,13 +147,13 @@ if ($result)
 
 	$urladd = "&amp;id=".$prev_id;
 
-	print_barre_liste("", $page, "lignes.php", $urladd, $sortfield, $sortorder, '', $num);
+	print_barre_liste("", $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
 	print"\n<!-- debut table -->\n";
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Lines"),"lignes.php","pl.rowid",'',$urladd);
-	print_liste_field_titre($langs->trans("ThirdParty"),"lignes.php","s.nom",'',$urladd);
-	print_liste_field_titre($langs->trans("Amount"),"lignes.php","pl.amount","",$urladd,'align="center"');
+	print_liste_field_titre($langs->trans("Lines"),$_SERVER["PHP_SELF"],"pl.rowid",'',$urladd);
+	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd);
+	print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","",$urladd,'align="center"');
 	print '<td colspan="2">&nbsp;</td></tr>';
 
 	$var=false;
@@ -175,7 +173,11 @@ if ($result)
 		print substr('000000'.$obj->rowid, -6);
 		print '</a></td>';
 
-		print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
+		$thirdparty=new Societe($db);
+		$thirdparty->fetch($obj->socid);
+		print '<td>';
+		print $thirdparty->getNomUrl(1);
+		print "</td>\n";
 
 		print '<td align="center">'.price($obj->amount)."</td>\n";
 
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
new file mode 100644
index 00000000000..921736faedf
--- /dev/null
+++ b/htdocs/compta/prelevement/list.php
@@ -0,0 +1,198 @@
+<?php
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/compta/prelevement/list.php
+ *      \ingroup    prelevement
+ *      \brief      Page liste des prelevements
+ */
+require('../../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("banks");
+$langs->load("withdrawals");
+$langs->load("companies");
+$langs->load("categories");
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'prelevement','','','bons');
+
+// Get supervariables
+$page = GETPOST('page','int');
+$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
+$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.datec" : GETPOST('sortfield','alpha');
+$search_line = GETPOST('search_line','alpha');
+$search_bon = GETPOST('search_bon','alpha');
+$search_code = GETPOST('search_code','alpha');
+$search_company = GETPOST('search_company','alpha');
+$statut = GETPOST('statut','int');
+
+$bon=new BonPrelevement($db,"");
+$ligne=new LignePrelevement($db,$user);
+
+$offset = $conf->liste_limit * $page ;
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_line="";
+	$search_bon="";
+	$search_code="";
+    $search_company="";
+	$statut="";
+}
+
+/*
+ *  View
+ */
+
+llxHeader('',$langs->trans("WithdrawalsLines"));
+
+$sql = "SELECT p.rowid, p.ref, p.statut, p.datec";
+$sql.= " ,f.rowid as facid, f.facnumber, f.total_ttc";
+$sql.= " , s.rowid as socid, s.nom as name, s.code_client";
+$sql.= " , pl.amount, pl.statut as statut_ligne, pl.rowid as rowid_ligne";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
+$sql.= " , ".MAIN_DB_PREFIX."facture as f";
+$sql.= " , ".MAIN_DB_PREFIX."societe as s";
+$sql.= " WHERE pl.fk_prelevement_bons = p.rowid";
+$sql.= " AND pf.fk_prelevement_lignes = pl.rowid";
+$sql.= " AND pf.fk_facture = f.rowid";
+$sql.= " AND f.fk_soc = s.rowid";
+$sql.= " AND f.entity = ".$conf->entity;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+if ($search_line)
+{
+    $sql.= " AND pl.rowid = '".$db->escape($search_line)."'";
+}
+if ($search_bon)
+{
+    $sql.= " AND p.ref LIKE '%".$db->escape($search_bon)."%'";
+}
+if ($search_code)
+{
+    $sql.= " AND s.code_client LIKE '%".$db->escape($search_code)."%'";
+}
+if ($search_company)
+{
+    $sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
+}
+$sql.=$db->order($sortfield,$sortorder);
+$sql.=$db->plimit($conf->liste_limit+1, $offset);
+
+$result = $db->query($sql);
+if ($result)
+{
+    $num = $db->num_rows($result);
+    $i = 0;
+
+    $urladd = "&amp;statut=".$statut;
+    $urladd .= "&amp;search_bon=".$search_bon;
+
+    print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
+
+    print"\n<!-- debut table -->\n";
+    print '<table class="liste" width="100%">';
+
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre">'.$langs->trans("Line").'</td>';
+    print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref");
+    print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd);
+    print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom");
+    print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"');
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'align="center"');
+    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","","",'align="right"');
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '</tr>';
+
+    print '<form action="list.php" method="GET">';
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_line" value="'. dol_escape_htmltag($search_line).'" size="6"></td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. dol_escape_htmltag($search_bon).'" size="8"></td>';
+    print '<td>&nbsp;</td>';
+    print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'. dol_escape_htmltag($search_company).'" size="12"></td>';
+    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="8"></td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    print '<td class="liste_titre" align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+    print '</form>';
+
+    $var=True;
+
+    while ($i < min($num,$conf->liste_limit))
+    {
+        $obj = $db->fetch_object($result);
+
+        $var=!$var;
+
+        print "<tr ".$bc[$var]."><td>";
+
+        print $ligne->LibStatut($obj->statut_ligne,2);
+        print "&nbsp;";
+
+        print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid_ligne.'">';
+        print substr('000000'.$obj->rowid_ligne, -6);
+        print '</a></td>';
+
+        print '<td>';
+
+        print $bon->LibStatut($obj->statut,2);
+        print "&nbsp;";
+
+        print '<a href="card.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
+
+        print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
+        print img_object($langs->trans("ShowBill"),"bill");
+          print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
+        print '</a></td>';
+
+        print '<td><a href="card.php?id='.$obj->rowid.'">'.$obj->name."</a></td>\n";
+
+        print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
+
+        print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
+
+        print '<td align="right">'.price($obj->amount)."</td>\n";
+
+        print '<td>&nbsp;</td>';
+
+        print "</tr>\n";
+        $i++;
+    }
+    print "</table>";
+    $db->free($result);
+}
+else
+{
+    dol_print_error($db);
+}
+
+$db->close();
+
+
+llxFooter();
diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php
deleted file mode 100644
index a9fb6024992..00000000000
--- a/htdocs/compta/prelevement/liste.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/compta/prelevement/liste.php
- *      \ingroup    prelevement
- *      \brief      Page liste des prelevements
- */
-require('../../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("banks");
-$langs->load("withdrawals");
-$langs->load("companies");
-$langs->load("categories");
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'prelevement','','','bons');
-
-// Get supervariables
-$page = GETPOST('page','int');
-$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
-$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.datec" : GETPOST('sortfield','alpha');
-$search_line = GETPOST('search_ligne','alpha');
-$search_bon = GETPOST('search_bon','alpha');
-$search_code = GETPOST('search_code','alpha');
-$search_societe = GETPOST('search_societe','alpha');
-$statut = GETPOST('statut','int');
-
-$bon=new BonPrelevement($db,"");
-$ligne=new LignePrelevement($db,$user);
-
-$offset = $conf->liste_limit * $page ;
-
-
-
-/*
- *  View
- */
-
-llxHeader('',$langs->trans("WithdrawalsLines"));
-
-$sql = "SELECT p.rowid, p.ref, p.statut, p.datec";
-$sql.= " ,f.rowid as facid, f.facnumber, f.total_ttc";
-$sql.= " , s.rowid as socid, s.nom, s.code_client";
-$sql.= " , pl.amount, pl.statut as statut_ligne, pl.rowid as rowid_ligne";
-$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
-$sql.= " , ".MAIN_DB_PREFIX."facture as f";
-$sql.= " , ".MAIN_DB_PREFIX."societe as s";
-$sql.= " WHERE pl.fk_prelevement_bons = p.rowid";
-$sql.= " AND pf.fk_prelevement_lignes = pl.rowid";
-$sql.= " AND pf.fk_facture = f.rowid";
-$sql.= " AND f.fk_soc = s.rowid";
-$sql.= " AND f.entity = ".$conf->entity;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-if ($search_line)
-{
-    $sql.= " AND pl.rowid = '".$db->escape($search_line)."'";
-}
-if ($search_bon)
-{
-    $sql.= " AND p.ref LIKE '%".$db->escape($search_bon)."%'";
-}
-if ($search_code)
-{
-    $sql.= " AND s.code_client LIKE '%".$db->escape($search_code)."%'";
-}
-if ($search_societe)
-{
-    $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'";
-}
-$sql.=$db->order($sortfield,$sortorder);
-$sql.=$db->plimit($conf->liste_limit+1, $offset);
-
-$result = $db->query($sql);
-if ($result)
-{
-    $num = $db->num_rows($result);
-    $i = 0;
-
-    $urladd = "&amp;statut=".$statut;
-    $urladd .= "&amp;search_bon=".$search_bon;
-
-    print_barre_liste($langs->trans("WithdrawalsLines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
-
-    print"\n<!-- debut table -->\n";
-    print '<table class="liste" width="100%">';
-
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre">'.$langs->trans("Line").'</td>';
-    print_liste_field_titre($langs->trans("WithdrawalsReceipts"),$_SERVER["PHP_SELF"],"p.ref");
-    print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"f.facnumber",'',$urladd);
-    print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom");
-    print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client",'','','align="center"');
-    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"p.datec","","",'align="center"');
-    print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","","",'align="right"');
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '</tr>';
-
-    print '<form action="liste.php" method="GET">';
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_ligne" value="'. $search_line.'" size="6"></td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'. $search_bon.'" size="8"></td>';
-    print '<td>&nbsp;</td>';
-    print '<td class="liste_titre"><input type="text" class="flat" name="search_societe" value="'. $search_societe.'" size="12"></td>';
-    print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. $search_code.'" size="8"></td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
-    print '</tr>';
-    print '</form>';
-
-    $var=True;
-
-    while ($i < min($num,$conf->liste_limit))
-    {
-        $obj = $db->fetch_object($result);
-
-        $var=!$var;
-
-        print "<tr ".$bc[$var]."><td>";
-
-        print $ligne->LibStatut($obj->statut_ligne,2);
-        print "&nbsp;";
-
-        print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid_ligne.'">';
-        print substr('000000'.$obj->rowid_ligne, -6);
-        print '</a></td>';
-
-        print '<td>';
-
-        print $bon->LibStatut($obj->statut,2);
-        print "&nbsp;";
-
-        print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
-
-        print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
-        print img_object($langs->trans("ShowBill"),"bill");
-          print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
-        print '</a></td>';
-
-        print '<td><a href="fiche.php?id='.$obj->rowid.'">'.$obj->nom."</a></td>\n";
-
-        print '<td align="center"><a href="fiche.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
-
-        print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
-
-        print '<td align="right">'.price($obj->amount)."</td>\n";
-
-        print '<td>&nbsp;</td>';
-
-        print "</tr>\n";
-        $i++;
-    }
-    print "</table>";
-    $db->free($result);
-}
-else
-{
-    dol_print_error($db);
-}
-
-$db->close();
-
-
-llxFooter();
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 30b36a59775..0582e4f4091 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -85,13 +85,13 @@ if ($result)
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	print_barre_liste($langs->trans("WithdrawsRefused"), $page, "rejets.php", $urladd, $sortfield, $sortorder, '', $num);
+	print_barre_liste($langs->trans("WithdrawsRefused"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
 	print"\n<!-- debut table -->\n";
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Line"),"rejets.php","p.ref",'',$urladd);
-	print_liste_field_titre($langs->trans("ThirdParty"),"rejets.php","s.nom",'',$urladd);
-	print_liste_field_titre($langs->trans("Reason"),"rejets.php","pr.motif","",$urladd);
+	print_liste_field_titre($langs->trans("Line"),$_SERVER["PHP_SELF"],"p.ref",'',$urladd);
+	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd);
+	print_liste_field_titre($langs->trans("Reason"),$_SERVER["PHP_SELF"],"pr.motif","",$urladd);
 	print '</tr>';
 
 	$var=True;
@@ -108,7 +108,7 @@ if ($result)
 
 		print substr('000000'.$obj->rowid, -6)."</a></td>";
 
-		print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
+		print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
 
 		print '<td>'.$rej->motifs[$obj->motif].'</td>';
 		print "</tr>\n";
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 2c8607a9a56..c3667f8b69f 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -21,7 +21,7 @@
 /**
  *		\file       htdocs/compta/prelevement/stats.php
  *      \ingroup    prelevement
- *      \brief      Page de stats des prelevements
+ *      \brief      Page with statistics on withdrawals
  */
 
 require('../../main.inc.php');
@@ -96,7 +96,7 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
 	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
 
-	$var=True;
+	$var=false;
 
 	while ($i < $num)
 	{
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 42f91e3132b..59599e93dc6 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -64,8 +64,8 @@ if ($socid > 0)
 
 	print '<table class="border" width="100%">';
 
-	// Nom
-	print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
+	// Name
+	print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->name.'</td></tr>';
 
 	// Prefix
 	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -181,7 +181,7 @@ if ($socid > 0)
 						print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 						print '<td>';
 						print '&nbsp; &nbsp; &nbsp; '; // Decalage
-						print '<a href="paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
+						print '<a href="paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
 						print "<td>&nbsp;</td>\n";
 						print "<td>&nbsp;</td>\n";
 						print '<td align="right">'.price($objp->amount).'</td>';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 26589be3c5d..9122ece2ed9 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2014	   Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,6 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 $langs->load("bills");
+$langs->load("donation");
+$langs->load("salaries");
 
 $date_startmonth=GETPOST('date_startmonth');
 $date_startday=GETPOST('date_startday');
@@ -96,7 +99,7 @@ else
 }
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->COMPTA_MODE);
+$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->ACCOUNTING_MODE);
 
 
 /*
@@ -117,7 +120,7 @@ $total_ttc=0;
 // Affiche en-tete de rapport
 if ($modecompta=="CREANCES-DETTES")
 {
-    $nom=$langs->trans("AnnualByCompaniesDueDebtMode");
+    $name=$langs->trans("AnnualByCompaniesDueDebtMode");
 	$calcmode=$langs->trans("CalcModeDebt");
     $calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month")>0?'&month='.GETPOST("month"):'').'&modecompta=RECETTES-DEPENSES">','</a>').')';
     $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
@@ -129,7 +132,7 @@ if ($modecompta=="CREANCES-DETTES")
     //$exportlink=$langs->trans("NotYetAvailable");
 }
 else {
-    $nom=$langs->trans("AnnualByCompaniesInputOutputMode");
+    $name=$langs->trans("AnnualByCompaniesInputOutputMode");
 	$calcmode=$langs->trans("CalcModeEngagement");
     $calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month")>0?'&month='.GETPOST("month"):'').'&modecompta=CREANCES-DETTES">','</a>').')';
     //$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',1,1,0,'',1,0,1);
@@ -139,7 +142,7 @@ else {
     $builddate=time();
     //$exportlink=$langs->trans("NotYetAvailable");
 }
-report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode);
+report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode);
 
 // Show report array
 print '<table class="noborder" width="100%">';
@@ -157,7 +160,7 @@ print '<tr><td colspan="4">'.$langs->trans("CustomersInvoices").'</td></tr>';
 
 if ($modecompta == 'CREANCES-DETTES')
 {
-    $sql = "SELECT s.nom, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
+    $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
     $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
     $sql.= ", ".MAIN_DB_PREFIX."facture as f";
     $sql.= " WHERE f.fk_soc = s.rowid";
@@ -175,7 +178,7 @@ else
      * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
      * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
      */
-    $sql = "SELECT s.nom as nom, s.rowid as socid, sum(pf.amount) as amount_ttc";
+    $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
     $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
     $sql.= ", ".MAIN_DB_PREFIX."facture as f";
     $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
@@ -191,7 +194,7 @@ if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 $sql.= " GROUP BY s.nom, s.rowid";
 $sql.= " ORDER BY s.nom, s.rowid";
 
-dol_syslog("get customer invoices sql=".$sql);
+dol_syslog("get customer invoices", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
     $num = $db->num_rows($result);
@@ -203,7 +206,7 @@ if ($result) {
         $var=!$var;
 
         print "<tr ".$bc[$var]."><td>&nbsp;</td>";
-        print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->nom."</td>\n";
+        print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
         if ($modecompta == 'CREANCES-DETTES')
         	print "<td align=\"right\">".price($objp->amount_ht)."</td>\n";
@@ -222,7 +225,7 @@ if ($result) {
 // On ajoute les paiements clients anciennes version, non lie par paiement_facture
 if ($modecompta != 'CREANCES-DETTES')
 {
-    $sql = "SELECT 'Autres' as nom, '0' as idp, sum(p.amount) as amount_ttc";
+    $sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc";
     $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
     $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
     $sql.= ", ".MAIN_DB_PREFIX."paiement as p";
@@ -233,10 +236,10 @@ if ($modecompta != 'CREANCES-DETTES')
     $sql.= " AND ba.entity = ".$conf->entity;
     if (! empty($date_start) && ! empty($date_end))
     	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    $sql.= " GROUP BY nom, idp";
-    $sql.= " ORDER BY nom";
+    $sql.= " GROUP BY name, idp";
+    $sql.= " ORDER BY name";
 
-    dol_syslog("get old customer payments not linked to invoices sql=".$sql);
+    dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG);
     $result = $db->query($sql);
     if ($result) {
         $num = $db->num_rows($result);
@@ -287,7 +290,7 @@ print '</tr>';
  */
 if ($modecompta == 'CREANCES-DETTES')
 {
-    $sql = "SELECT s.nom, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
+    $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
     $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
     $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
     $sql.= " WHERE f.fk_soc = s.rowid";
@@ -321,7 +324,7 @@ print '<tr><td colspan="4">'.$langs->trans("SuppliersInvoices").'</td></tr>';
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-dol_syslog("get suppliers invoices sql=".$sql);
+dol_syslog("get suppliers invoices", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
     $num = $db->num_rows($result);
@@ -335,7 +338,7 @@ if ($result) {
             $var=!$var;
 
             print "<tr ".$bc[$var]."><td>&nbsp;</td>";
-            print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->nom."</a></td>\n";
+            print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
 
             if ($modecompta == 'CREANCES-DETTES')
             	print "<td align=\"right\">".price(-$objp->amount_ht)."</td>\n";
@@ -378,7 +381,7 @@ print '<tr><td colspan="4">'.$langs->trans("SocialContributions").' ('.$langs->t
 
 if ($modecompta == 'CREANCES-DETTES')
 {
-    $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount";
+    $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
     $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
     $sql.= " WHERE cs.fk_type = c.id";
@@ -388,7 +391,7 @@ if ($modecompta == 'CREANCES-DETTES')
 }
 else
 {
-    $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount";
+    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
     $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
     $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -402,7 +405,7 @@ $sql.= " AND cs.entity = ".$conf->entity;
 $sql.= " GROUP BY c.libelle, c.id";
 $sql.= " ORDER BY c.libelle, c.id";
 
-dol_syslog("get social contributions deductible=0 sql=".$sql);
+dol_syslog("get social contributions deductible=0", LOG_DEBUG);
 $result=$db->query($sql);
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
@@ -421,7 +424,7 @@ if ($result) {
 
             $var = !$var;
             print "<tr ".$bc[$var]."><td>&nbsp;</td>";
-            print '<td>'.$obj->nom.'</td>';
+            print '<td>'.$obj->label.'</td>';
             if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
             print '<td align="right">'.price(-$obj->amount).'</td>';
             print '</tr>';
@@ -452,7 +455,7 @@ print '<tr><td colspan="4">'.$langs->trans("SocialContributions").' ('.$langs->t
 
 if ($modecompta == 'CREANCES-DETTES')
 {
-    $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount";
+    $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
     $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
     $sql.= " WHERE cs.fk_type = c.id";
@@ -465,7 +468,7 @@ if ($modecompta == 'CREANCES-DETTES')
 }
 else
 {
-    $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount";
+    $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
     $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
     $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
     $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -479,7 +482,7 @@ else
     $sql.= " ORDER BY c.libelle, c.id";
 }
 
-dol_syslog("get social contributions deductible=1 sql=".$sql);
+dol_syslog("get social contributions deductible=1", LOG_DEBUG);
 $result=$db->query($sql);
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
@@ -498,7 +501,7 @@ if ($result) {
 
             $var = !$var;
             print "<tr ".$bc[$var]."><td>&nbsp;</td>";
-            print '<td>'.$obj->nom.'</td>';
+            print '<td>'.$obj->label.'</td>';
             if ($modecompta == 'CREANCES-DETTES')
             	print '<td align="right">'.price(-$obj->amount).'</td>';
             print '<td align="right">'.price(-$obj->amount).'</td>';
@@ -539,69 +542,140 @@ if ($mysoc->tva_assuj == 'franchise')	// Non assujeti
     print '</tr>';
 }
 
+
 /*
  * Salaries
  */
 
-print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';    
-$sql = "SELECT p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount, u.firstname, u.lastname, p.fk_user";
-$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
-$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
-$sql.= " WHERE p.entity = ".$conf->entity;
-if (! empty($date_start) && ! empty($date_end))
-	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-	
-$sql.= " GROUP BY u.rowid";
-$sql.= " ORDER BY u.firstname";
-    
-dol_syslog("get payment salaries sql=".$sql);
-$result=$db->query($sql);
-$subtotal_ht = 0;
-$subtotal_ttc = 0;
-if ($result)
+if ($conf->salaries->enabled)
 {
-    $num = $db->num_rows($result);
-    $var=true;
-    $i = 0;
-    if ($num)
-    {
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($result);
+	print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
+	$sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as label, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
+	$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
+	$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
+	$sql.= " WHERE p.entity = ".$conf->entity;
+	if (! empty($date_start) && ! empty($date_end))
+		$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 
-            $total_ht -= $obj->amount;
-            $total_ttc -= $obj->amount;
-            $subtotal_ht += $obj->amount;
-            $subtotal_ttc += $obj->amount;
+	$sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
+	$sql.= " ORDER BY u.firstname";
 
-            $var = !$var;
-            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
-            
-            print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
-            
-            if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
-            print '<td align="right">'.price(-$obj->amount).'</td>';
-            print '</tr>';
-            $i++;
-        }
-    }
-    else
-    {
-        $var = !$var;
-        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
-        print '<td colspan="3">'.$langs->trans("None").'</td>';
-        print '</tr>';
-    }
+	dol_syslog("get payment salaries");
+	$result=$db->query($sql);
+	$subtotal_ht = 0;
+	$subtotal_ttc = 0;
+	if ($result)
+	{
+	    $num = $db->num_rows($result);
+	    $var=true;
+	    $i = 0;
+	    if ($num)
+	    {
+	        while ($i < $num)
+	        {
+	            $obj = $db->fetch_object($result);
+
+	            $total_ht -= $obj->amount;
+	            $total_ttc -= $obj->amount;
+	            $subtotal_ht += $obj->amount;
+	            $subtotal_ttc += $obj->amount;
+
+	            $var = !$var;
+	            print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+
+	            print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
+
+	            if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
+	            print '<td align="right">'.price(-$obj->amount).'</td>';
+	            print '</tr>';
+	            $i++;
+	        }
+	    }
+	    else
+	    {
+	        $var = !$var;
+	        print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+	        print '<td colspan="3">'.$langs->trans("None").'</td>';
+	        print '</tr>';
+	    }
+	}
+	else
+	{
+	    dol_print_error($db);
+	}
+	print '<tr class="liste_total">';
+	if ($modecompta == 'CREANCES-DETTES')
+		print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+	print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+	print '</tr>';
 }
-else
+
+
+/*
+ * Donation
+ */
+
+if ($conf->donation->enabled)
 {
-    dol_print_error($db);
+	print '<tr><td colspan="4">'.$langs->trans("Donation").'</td></tr>';
+	$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+	$sql.= " FROM ".MAIN_DB_PREFIX."don as p";
+	$sql.= " WHERE p.entity = ".$conf->entity;
+	$sql.= " AND fk_statut=2";
+	if (! empty($date_start) && ! empty($date_end))
+		$sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+	$sql.= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+	$sql.= " ORDER BY p.societe, p.firstname, p.lastname, dm";
+
+	dol_syslog("get dunning");
+	$result=$db->query($sql);
+	$subtotal_ht = 0;
+	$subtotal_ttc = 0;
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$var=true;
+		$i = 0;
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
+
+				$total_ht += $obj->amount;
+				$total_ttc += $obj->amount;
+				$subtotal_ht += $obj->amount;
+				$subtotal_ttc += $obj->amount;
+
+				$var = !$var;
+				print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+
+				print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/compta/dons/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
+
+				if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price($obj->amount).'</td>';
+				print '<td align="right">'.price($obj->amount).'</td>';
+				print '</tr>';
+				$i++;
+			}
+		}
+		else
+		{
+			$var = !$var;
+			print "<tr ".$bc[$var]."><td>&nbsp;</td>";
+			print '<td colspan="3">'.$langs->trans("None").'</td>';
+			print '</tr>';
+		}
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+	print '<tr class="liste_total">';
+	if ($modecompta == 'CREANCES-DETTES')
+		print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
+	print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
+	print '</tr>';
 }
-print '<tr class="liste_total">';
-if ($modecompta == 'CREANCES-DETTES')
-	print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
-print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
-print '</tr>';
 
 /*
  * VAT
@@ -628,7 +702,7 @@ if ($modecompta == 'CREANCES-DETTES')
     $sql.= " GROUP BY dm";
     $sql.= " ORDER BY dm";
 
-    dol_syslog("get vat to pay sql=".$sql);
+    dol_syslog("get vat to pay", LOG_DEBUG);
     $result=$db->query($sql);
     if ($result)
     {
@@ -673,7 +747,7 @@ if ($modecompta == 'CREANCES-DETTES')
     $sql.= " GROUP BY dm";
     $sql.= " ORDER BY dm";
 
-    dol_syslog("get vat received back sql=".$sql);
+    dol_syslog("get vat received back", LOG_DEBUG);
     $result=$db->query($sql);
     if ($result)
     {
@@ -717,7 +791,7 @@ else
     $sql.= " GROUP BY dm";
     $sql.= " ORDER BY dm";
 
-    dol_syslog("get vat really paid sql=".$sql);
+    dol_syslog("get vat really paid", LOG_DEBUG);
     $result=$db->query($sql);
     if ($result) {
         $num = $db->num_rows($result);
@@ -758,7 +832,7 @@ else
     $sql.= " GROUP BY dm";
     $sql.= " ORDER BY dm";
 
-    dol_syslog("get vat really received back sql=".$sql);
+    dol_syslog("get vat really received back", LOG_DEBUG);
     $result=$db->query($sql);
     if ($result) {
         $num = $db->num_rows($result);
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index fdc9b0472f0..b586241c11e 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2014	   Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014	   Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,7 +48,7 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accountin
 
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->COMPTA_MODE);
+$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->ACCOUNTING_MODE);
 
 
 /*
@@ -124,7 +125,7 @@ $sql.= " GROUP BY dm";
 $sql.= " ORDER BY dm";
 
 //print $sql;
-dol_syslog("get customers invoices sql=".$sql);
+dol_syslog("get customers invoices", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
@@ -158,7 +159,7 @@ if ($modecompta != 'CREANCES-DETTES')
 	$sql.= " GROUP BY dm";
 	$sql.= " ORDER BY dm";
 
-	dol_syslog("get old customers payments not linked to invoices sql=".$sql);
+	dol_syslog("get old customers payments not linked to invoices", LOG_DEBUG);
 	$result = $db->query($sql);
 	if ($result) {
 		$num = $db->num_rows($result);
@@ -209,7 +210,7 @@ $sql.= " AND f.entity = ".$conf->entity;
 if ($socid) $sql.= " AND f.fk_soc = ".$socid;
 $sql.= " GROUP BY dm";
 
-dol_syslog("get suppliers invoices sql=".$sql);
+dol_syslog("get suppliers invoices", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
@@ -250,7 +251,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql.= " AND f.entity = ".$conf->entity;
 	$sql.= " GROUP BY dm";
 
-	dol_syslog("get vat to pay sql=".$sql);
+	dol_syslog("get vat to pay", LOG_DEBUG);
 	$result=$db->query($sql);
 	if ($result) {
 		$num = $db->num_rows($result);
@@ -281,7 +282,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql.= " AND f.entity = ".$conf->entity;
 	$sql.= " GROUP BY dm";
 
-	dol_syslog("get vat to receive back sql=".$sql);
+	dol_syslog("get vat to receive back", LOG_DEBUG);
 	$result=$db->query($sql);
 	if ($result) {
 		$num = $db->num_rows($result);
@@ -312,7 +313,7 @@ else {
 	$sql.= " AND t.entity = ".$conf->entity;
 	$sql.= " GROUP BY dm";
 
-	dol_syslog("get vat really paid sql=".$sql);
+	dol_syslog("get vat really paid", LOG_DEBUG);
 	$result=$db->query($sql);
 	if ($result) {
 		$num = $db->num_rows($result);
@@ -341,7 +342,7 @@ else {
 	$sql.= " AND t.entity = ".$conf->entity;
 	$sql.= " GROUP BY dm";
 
-	dol_syslog("get vat really received back sql=".$sql);
+	dol_syslog("get vat really received back", LOG_DEBUG);
 	$result=$db->query($sql);
 	if ($result) {
 		$num = $db->num_rows($result);
@@ -391,7 +392,7 @@ else
 $sql.= " AND cs.entity = ".$conf->entity;
 $sql.= " GROUP BY c.libelle, dm";
 
-dol_syslog("get social contributions deductible=0  sql=".$sql);
+dol_syslog("get social contributions deductible=0 ", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
@@ -441,7 +442,7 @@ else
 $sql.= " AND cs.entity = ".$conf->entity;
 $sql.= " GROUP BY c.libelle, dm";
 
-dol_syslog("get social contributions paid deductible=1 sql=".$sql);
+dol_syslog("get social contributions paid deductible=1", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
@@ -480,7 +481,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
 $sql.= " WHERE p.entity = ".$conf->entity;
 $sql.= " GROUP BY p.label, dm";
 
-dol_syslog("get social salaries payments  sql=".$sql);
+dol_syslog("get social salaries payments");
 $result=$db->query($sql);
 if ($result)
 {
@@ -508,6 +509,45 @@ else
 	dol_print_error($db);
 }
 
+/*
+ * get dunning paiement
+*/
+$subtotal_ht = 0;
+$subtotal_ttc = 0;
+$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+$sql.= " FROM ".MAIN_DB_PREFIX."don as p";
+$sql.= " WHERE p.entity = ".$conf->entity;
+$sql.= " AND fk_statut=2";
+$sql.= " GROUP BY p.societe,  p.firstname, p.lastname, dm";
+
+dol_syslog("get social salaries payments");
+$result=$db->query($sql);
+if ($result)
+{
+	$num = $db->num_rows($result);
+	$var=false;
+	$i = 0;
+	if ($num)
+	{
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
+
+			if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
+			$encaiss[$obj->dm] += $obj->amount;
+
+			if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
+			$encaiss_ttc[$obj->dm] += $obj->amount;
+
+			$i++;
+		}
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
 /*
  * Show result array
  */
@@ -520,7 +560,7 @@ print '<tr class="liste_titre"><td class="liste_titre">&nbsp;</td>';
 
 for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
-	print '<td align="center" colspan="2">';
+	print '<td align="center" colspan="2" class="borderrightlight">';
 	print '<a href="clientfourn.php?year='.$annee.'">';
 	print $annee;
 	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
@@ -531,7 +571,7 @@ print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").
 for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
 	print '<td align="right">'.$langs->trans("Outcome").'</td>';
-	print '<td align="right">'.$langs->trans("Income").'</td>';
+	print '<td align="right" class="borderrightlight">'.$langs->trans("Income").'</td>';
 }
 print '</tr>';
 
@@ -561,7 +601,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 		}
 		print "</td>";
 
-		print '<td align="right">&nbsp;';
+		print '<td align="right" class="borderrightlight">&nbsp;';
 		//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
 		if (isset($encaiss_ttc[$case]))
 		{
@@ -583,7 +623,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
 	$nbcols+=2;
 	print '<td align="right">'.(isset($totsorties[$annee])?price(price2num($totsorties[$annee],'MT')):'&nbsp;').'</td>';
-	print '<td align="right">'.(isset($totentrees[$annee])?price(price2num($totentrees[$annee],'MT')):'&nbsp;').'</td>';
+	print '<td align="right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee])?price(price2num($totentrees[$annee],'MT')):'&nbsp;').'</td>';
 }
 print "</tr>\n";
 
@@ -597,7 +637,7 @@ $var=!$var;
 print '<tr class="liste_total"><td>'.$langs->trans("Profit").'</td>';
 for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
-	print '<td align="right" colspan="2"> ';
+	print '<td align="right" colspan="2" class="borderrightlight"> ';
 	if (isset($totentrees[$annee]) || isset($totsorties[$annee]))
 	{
 		$in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
new file mode 100644
index 00000000000..3ee796c6134
--- /dev/null
+++ b/htdocs/compta/salaries/card.php
@@ -0,0 +1,388 @@
+<?php
+/* Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/salaries/card.php
+ *      \ingroup    salaries
+ *		\brief      Page of salaries payments
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("compta");
+$langs->load("banks");
+$langs->load("bills");
+$langs->load("users");
+$langs->load("salaries");
+
+$id=GETPOST("id",'int');
+$action=GETPOST('action');
+
+// Security check
+$socid = GETPOST("socid","int");
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'salaries', '', '', '');
+
+$sal = new PaymentSalary($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('salarycard','globalcard'));
+
+
+
+/**
+ * Actions
+ */
+
+if ($_POST["cancel"] == $langs->trans("Cancel"))
+{
+	header("Location: index.php");
+	exit;
+}
+
+if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
+{
+	$error=0;
+
+	$datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
+	$datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
+	$datesp=dol_mktime(12,0,0, $_POST["datespmonth"], $_POST["datespday"], $_POST["datespyear"]);
+	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
+
+	$sal->accountid=GETPOST("accountid");
+	$sal->fk_user=GETPOST("fk_user");
+	$sal->datev=$datev;
+	$sal->datep=$datep;
+	$sal->amount=price2num(GETPOST("amount"));
+	$sal->label=GETPOST("label");
+	$sal->datesp=$datesp;
+	$sal->dateep=$dateep;
+	$sal->note=GETPOST("note");
+	$sal->type_payment=GETPOST("paymenttype");
+	$sal->num_payment=GETPOST("num_payment");
+	$sal->fk_user_creat=$user->id;
+
+	if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep))
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")),'errors');
+		$error++;
+	}
+	if (empty($sal->fk_user) || $sal->fk_user < 0)
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Employee")),'errors');
+		$error++;
+	}
+	if (empty($sal->type_payment) || $sal->type_payment < 0)
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentMode")),'errors');
+		$error++;
+	}
+	if (empty($sal->amount))
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount")),'errors');
+		$error++;
+	}
+
+	if (! $error)
+	{
+		$db->begin();
+
+		$ret=$sal->create($user);
+		if ($ret > 0)
+		{
+			$db->commit();
+			header("Location: index.php");
+			exit;
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessage($sal->error, 'errors');
+			$action="create";
+		}
+	}
+
+	$action='create';
+}
+
+if ($action == 'delete')
+{
+	$result=$sal->fetch($id);
+
+	if ($sal->rappro == 0)
+	{
+		$db->begin();
+
+		$ret=$sal->delete($user);
+		if ($ret > 0)
+		{
+			if ($sal->fk_bank)
+			{
+				$accountline=new AccountLine($db);
+				$result=$accountline->fetch($sal->fk_bank);
+				if ($result > 0) $result=$accountline->delete($user);	// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+			}
+
+			if ($result >= 0)
+			{
+				$db->commit();
+				header("Location: ".DOL_URL_ROOT.'/compta/salaries/index.php');
+				exit;
+			}
+			else
+			{
+				$sal->error=$accountline->error;
+				$db->rollback();
+				setEventMessage($sal->error,'errors');
+			}
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessage($sal->error,'errors');
+		}
+	}
+	else
+	{
+		setEventMessage('Error try do delete a line linked to a conciliated bank transaction','errors');
+	}
+}
+
+
+/*
+ *	View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+if ($id)
+{
+	$salpayment = new PaymentSalary($db);
+	$result = $salpayment->fetch($id);
+	if ($result <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+}
+
+// Formulaire saisie salaire
+if ($action == 'create')
+{
+	$year_current = strftime("%Y",dol_now());
+	$pastmonth = strftime("%m",dol_now()) - 1;
+	$pastmonthyear = $year_current;
+	if ($pastmonth == 0)
+	{
+		$pastmonth = 12;
+		$pastmonthyear--;
+	}
+
+	$datesp=dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear);
+	$dateep=dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
+
+	if (empty($datesp) || empty($dateep)) // We define date_start and date_end
+	{
+		$datesp=dol_get_first_day($pastmonthyear,$pastmonth,false); $dateep=dol_get_last_day($pastmonthyear,$pastmonth,false);
+	}
+
+	print "<form name='add' action=\"card.php\" method=\"post\">\n";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+
+	print_fiche_titre($langs->trans("NewSalaryPayment"));
+
+	print '<table class="border" width="100%">';
+
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+	print $form->select_date((empty($datep)?-1:$datep),"datep",'','','','add',1,1);
+	print '</td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
+	print $form->select_date((empty($datev)?-1:$datev),"datev",'','','','add',1,1);
+	print '</td></tr>';
+
+	// Employee
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Employee").'</td><td>';
+	print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1);
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("SalaryPayment")).'"></td></tr>';
+
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("DateStartPeriod").'</td><td>';
+	print $form->select_date($datesp,"datesp",'','','','add');
+	print '</td></tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("DateEndPeriod").'</td><td>';
+	print $form->select_date($dateep,"dateep",'','','','add');
+	print '</td></tr>';
+
+	// Amount
+	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
+
+	// Bank
+	if (! empty($conf->banque->enabled))
+	{
+		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
+		$form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
+		print '</td></tr>';
+	}
+
+	// Type payment
+	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+	$form->select_types_paiements(GETPOST("paymenttype"), "paymenttype");
+	print "</td>\n";
+	print "</tr>";
+
+	if (! empty($conf->banque->enabled))
+	{
+		// Number
+		print '<tr><td>'.$langs->trans('Numero');
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
+	}
+
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="1"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+	print '</table>';
+
+	print "<br>";
+
+	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+
+	print '</form>';
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Barre d'action                                                             */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($id)
+{
+	$h = 0;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$salpayment->id;
+	$head[$h][1] = $langs->trans('Card');
+	$head[$h][2] = 'card';
+	$h++;
+
+	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), 0, 'payment');
+
+
+	print '<table class="border" width="100%">';
+
+	print "<tr>";
+	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $salpayment->ref;
+	print '</td></tr>';
+
+	// Person
+	print '<tr><td>'.$langs->trans("Person").'</td><td>';
+	$usersal=new User($db);
+	$usersal->fetch($salpayment->fk_user);
+	print $usersal->getNomUrl(1);
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$salpayment->label.'</td></tr>';
+
+	print "<tr>";
+	print '<td>'.$langs->trans("DateStartPeriod").'</td><td colspan="3">';
+	print dol_print_date($salpayment->datesp,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("DateEndPeriod").'</td><td colspan="3">';
+	print dol_print_date($salpayment->dateep,'day');
+	print '</td></tr>';
+
+	print "<tr>";
+	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print dol_print_date($salpayment->datep,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print dol_print_date($salpayment->datev,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($salpayment->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+
+	if (! empty($conf->banque->enabled))
+	{
+		if ($salpayment->fk_account > 0)
+		{
+			$bankline=new AccountLine($db);
+			$bankline->fetch($salpayment->fk_bank);
+
+			print '<tr>';
+			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<td colspan="3">';
+			print $bankline->getNomUrl(1,0,'showall');
+			print '</td>';
+			print '</tr>';
+		}
+	}
+
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="3"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$salpayment,$action);    // Note that $action and $object may have been modified by hook
+
+	print '</table>';
+
+	print '</div>';
+
+	/*
+	 * Boutons d'actions
+	*/
+	print "<div class=\"tabsAction\">\n";
+	if ($salpayment->rappro == 0)
+	{
+		if (! empty($user->rights->tax->charges->supprimer))
+		{
+			print '<a class="butActionDelete" href="card.php?id='.$salpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+		}
+		else
+		{
+			print '<a class="butActionRefused" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a>';
+		}
+	}
+	else
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
+	}
+	print "</div>";
+}
+
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/salaries/class/index.html b/htdocs/compta/salaries/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php
index ecf4b16212b..5e60b76ee13 100644
--- a/htdocs/compta/salaries/class/paymentsalary.class.php
+++ b/htdocs/compta/salaries/class/paymentsalary.class.php
@@ -1,19 +1,20 @@
 <?php
 /* Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  *
-* 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 <http://www.gnu.org/licenses/>.
-*/
+ * 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 <http://www.gnu.org/licenses/>.
+ */
 
 /**
  *      \file       htdocs/compta/salaries/class/paymentsalary.class.php
@@ -72,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;
 
@@ -114,25 +115,22 @@ class PaymentSalary extends CommonObject
 
 		$sql.= " WHERE rowid=".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			return -1;
 		}
 
 		if (! $notrigger)
 		{
-			// Start triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('PAYMENT_SALARY_MODIFY',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// End triggers
+            // Call trigger
+            $result=$this->call_trigger('PAYMENT_SALARY_MODIFY',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+
+			//FIXME: Add rollback if trigger fail
 		}
 
 		return 1;
@@ -146,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";
@@ -174,7 +172,7 @@ class PaymentSalary extends CommonObject
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
 		$sql.= " WHERE s.rowid = ".$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -209,7 +207,6 @@ class PaymentSalary extends CommonObject
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -227,27 +224,23 @@ class PaymentSalary extends CommonObject
 
 		$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;
 
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			return -1;
 		}
 
-		// Start triggers
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($this->db);
-		$result=$interface->run_triggers('PAYMENT_SALARY_DELETE',$this,$user,$langs,$conf);
-		if ($result < 0) {
-			$error++; $this->errors=$interface->errors;
-		}
-		// End triggers
-
 		return 1;
 	}
 
@@ -287,6 +280,8 @@ class PaymentSalary extends CommonObject
 	{
 		global $conf,$langs;
 
+		$error=0;
+
 		// Clean parameters
 		$this->amount=price2num(trim($this->amount));
 		$this->label=trim($this->label);
@@ -355,11 +350,10 @@ class PaymentSalary extends CommonObject
 		$sql.= ", ".$conf->entity;
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$ok=1;
 
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
 
@@ -395,19 +389,19 @@ class PaymentSalary extends CommonObject
 					else
 					{
 						$this->error=$acc->error;
-						$ok=0;
+						$error++;
 					}
 
-					if ($ok)
+					if (! $error)
 					{
 						// Add link 'payment_salary' in bank_url between payment and bank transaction
-						$url=DOL_URL_ROOT.'/compta/salaries/fiche.php?id=';
+						$url=DOL_URL_ROOT.'/compta/salaries/card.php?id=';
 
 						$result=$acc->add_url_line($bank_line_id, $this->id, $url, "(SalaryPayment)", "payment_salary");
 						if ($result <= 0)
 						{
 							$this->error=$acc->error;
-							$ok=0;
+							$error++;
 						}
 					}
 
@@ -418,47 +412,33 @@ class PaymentSalary extends CommonObject
 					$result=$acc->add_url_line(
 						$bank_line_id,
 						$this->fk_user,
-						DOL_URL_ROOT.'/user/fiche.php?id=',
+						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'
 					);
 
 					if ($result <= 0)
 					{
 						$this->error=$acc->error;
-						$ok=0;
+						$error++;
 					}
 				}
 
-				// Start triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PAYMENT_SALARY_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// End triggers
+	            // Call trigger
+	            $result=$this->call_trigger('PAYMENT_SALARY_CREATE',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
 
 			}
-			else $ok=0;
+			else $error++;
 
-			if ($ok)
+			if (! $error)
 			{
-				if ($ok)
-				{
-					$this->db->commit();
-					return $this->id;
-				}
-				else
-				{
-					$this->db->rollback();
-					return -3;
-				}
+				$this->db->commit();
+				return $this->id;
 			}
 			else
 			{
-				$this->error=$this->db->error();
 				$this->db->rollback();
 				return -2;
 			}
@@ -507,7 +487,7 @@ class PaymentSalary extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/compta/salaries/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$picto='payment';
diff --git a/htdocs/compta/salaries/fiche.php b/htdocs/compta/salaries/fiche.php
deleted file mode 100644
index c46f83dd6fb..00000000000
--- a/htdocs/compta/salaries/fiche.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-/* Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/compta/salaries/fiche.php
- *      \ingroup    salaries
- *		\brief      Page of salaries payments
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("compta");
-$langs->load("banks");
-$langs->load("bills");
-$langs->load("users");
-$langs->load("salaries");
-
-$id=GETPOST("id",'int');
-$action=GETPOST('action');
-
-// Security check
-$socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'salaries', '', '', '');
-
-$sal = new PaymentSalary($db);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('salarycard'));
-
-
-
-/**
- * Actions
- */
-
-if ($_POST["cancel"] == $langs->trans("Cancel"))
-{
-	header("Location: index.php");
-	exit;
-}
-
-if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
-{
-	$error=0;
-
-	$datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
-	$datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
-	$datesp=dol_mktime(12,0,0, $_POST["datespmonth"], $_POST["datespday"], $_POST["datespyear"]);
-	$dateep=dol_mktime(12,0,0, $_POST["dateepmonth"], $_POST["dateepday"], $_POST["dateepyear"]);
-
-	$sal->accountid=GETPOST("accountid");
-	$sal->fk_user=GETPOST("fk_user");
-	$sal->datev=$datev;
-	$sal->datep=$datep;
-	$sal->amount=price2num(GETPOST("amount"));
-	$sal->label=GETPOST("label");
-	$sal->datesp=$datesp;
-	$sal->dateep=$dateep;
-	$sal->note=GETPOST("note");
-	$sal->type_payment=GETPOST("paymenttype");
-	$sal->num_payment=GETPOST("num_payment");
-	$sal->fk_user_creat=$user->id;
-
-	if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep))
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")),'errors');
-		$error++;
-	}
-	if (empty($sal->fk_user) || $sal->fk_user < 0)
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Employee")),'errors');
-		$error++;
-	}
-	if (empty($sal->type_payment) || $sal->type_payment < 0)
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentMode")),'errors');
-		$error++;
-	}
-	if (empty($sal->amount))
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount")),'errors');
-		$error++;
-	}
-
-	if (! $error)
-	{
-		$db->begin();
-
-		$ret=$sal->create($user);
-		if ($ret > 0)
-		{
-			$db->commit();
-			header("Location: index.php");
-			exit;
-		}
-		else
-		{
-			$db->rollback();
-			setEventMessage($sal->error, 'errors');
-			$action="create";
-		}
-	}
-
-	$action='create';
-}
-
-if ($action == 'delete')
-{
-	$result=$sal->fetch($id);
-
-	if ($sal->rappro == 0)
-	{
-		$db->begin();
-
-		$ret=$sal->delete($user);
-		if ($ret > 0)
-		{
-			if ($sal->fk_bank)
-			{
-				$accountline=new AccountLine($db);
-				$result=$accountline->fetch($sal->fk_bank);
-				if ($result > 0) $result=$accountline->delete($user);	// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
-			}
-
-			if ($result >= 0)
-			{
-				$db->commit();
-				header("Location: ".DOL_URL_ROOT.'/compta/salaries/index.php');
-				exit;
-			}
-			else
-			{
-				$sal->error=$accountline->error;
-				$db->rollback();
-				setEventMessage($sal->error,'errors');
-			}
-		}
-		else
-		{
-			$db->rollback();
-			setEventMessage($sal->error,'errors');
-		}
-	}
-	else
-	{
-		setEventMessage('Error try do delete a line linked to a conciliated bank transaction','errors');
-	}
-}
-
-
-/*
- *	View
- */
-
-llxHeader();
-
-$form = new Form($db);
-
-if ($id)
-{
-	$salpayment = new PaymentSalary($db);
-	$result = $salpayment->fetch($id);
-	if ($result <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-}
-
-// Formulaire saisie salaire
-if ($action == 'create')
-{
-	$year_current = strftime("%Y",dol_now());
-	$pastmonth = strftime("%m",dol_now()) - 1;
-	$pastmonthyear = $year_current;
-	if ($pastmonth == 0)
-	{
-		$pastmonth = 12;
-		$pastmonthyear--;
-	}
-
-	$datesp=dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear);
-	$dateep=dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
-
-	if (empty($datesp) || empty($dateep)) // We define date_start and date_end
-	{
-		$datesp=dol_get_first_day($pastmonthyear,$pastmonth,false); $dateep=dol_get_last_day($pastmonthyear,$pastmonth,false);
-	}
-
-	print "<form name='add' action=\"fiche.php\" method=\"post\">\n";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-
-	print_fiche_titre($langs->trans("NewSalaryPayment"));
-
-	print '<table class="border" width="100%">';
-
-	print "<tr>";
-	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-	print $form->select_date((empty($datep)?-1:$datep),"datep",'','','','add',1,1);
-	print '</td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
-	print $form->select_date((empty($datev)?-1:$datev),"datev",'','','','add',1,1);
-	print '</td></tr>';
-
-	// Employee
-	print "<tr>";
-	print '<td class="fieldrequired">'.$langs->trans("Employee").'</td><td>';
-	print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1);
-	print '</td></tr>';
-
-	// Label
-	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("SalaryPayment")).'"></td></tr>';
-
-	print "<tr>";
-	print '<td class="fieldrequired">'.$langs->trans("DateStartPeriod").'</td><td>';
-	print $form->select_date($datesp,"datesp",'','','','add');
-	print '</td></tr>';
-
-	print '<tr><td class="fieldrequired">'.$langs->trans("DateEndPeriod").'</td><td>';
-	print $form->select_date($dateep,"dateep",'','','','add');
-	print '</td></tr>';
-
-	// Amount
-	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
-
-	// Bank
-	if (! empty($conf->banque->enabled))
-	{
-		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
-		$form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
-		print '</td></tr>';
-	}
-
-	// Type payment
-	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	$form->select_types_paiements(GETPOST("paymenttype"), "paymenttype");
-	print "</td>\n";
-	print "</tr>";
-
-	if (! empty($conf->banque->enabled))
-	{
-		// Number
-		print '<tr><td>'.$langs->trans('Numero');
-		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
-	}
-
-	// Other attributes
-	$parameters=array('colspan' => ' colspan="1"');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-	print '</table>';
-
-	print "<br>";
-
-	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-
-	print '</form>';
-}
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-if ($id)
-{
-	$h = 0;
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/fiche.php?id='.$salpayment->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
-
-	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), 0, 'payment');
-
-
-	print '<table class="border" width="100%">';
-
-	print "<tr>";
-	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $salpayment->ref;
-	print '</td></tr>';
-
-	// Person
-	print '<tr><td>'.$langs->trans("Person").'</td><td>';
-	$usersal=new User($db);
-	$usersal->fetch($salpayment->fk_user);
-	print $usersal->getNomUrl(1);
-	print '</td></tr>';
-
-	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$salpayment->label.'</td></tr>';
-
-	print "<tr>";
-	print '<td>'.$langs->trans("DateStartPeriod").'</td><td colspan="3">';
-	print dol_print_date($salpayment->datesp,'day');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("DateEndPeriod").'</td><td colspan="3">';
-	print dol_print_date($salpayment->dateep,'day');
-	print '</td></tr>';
-
-	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
-	print dol_print_date($salpayment->datep,'day');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
-	print dol_print_date($salpayment->datev,'day');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($salpayment->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
-
-	if (! empty($conf->banque->enabled))
-	{
-		if ($salpayment->fk_account > 0)
-		{
-			$bankline=new AccountLine($db);
-			$bankline->fetch($salpayment->fk_bank);
-
-			print '<tr>';
-			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td colspan="3">';
-			print $bankline->getNomUrl(1,0,'showall');
-			print '</td>';
-			print '</tr>';
-		}
-	}
-
-	// Other attributes
-	$parameters=array('colspan' => ' colspan="3"');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$salpayment,$action);    // Note that $action and $object may have been modified by hook
-
-	print '</table>';
-
-	print '</div>';
-
-	/*
-	 * Boutons d'actions
-	*/
-	print "<div class=\"tabsAction\">\n";
-	if ($salpayment->rappro == 0)
-	{
-		if (! empty($user->rights->tax->charges->supprimer))
-		{
-			print '<a class="butActionDelete" href="fiche.php?id='.$salpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
-		}
-		else
-		{
-			print '<a class="butActionRefused" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a>';
-		}
-	}
-	else
-	{
-		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
-	}
-	print "</div>";
-}
-
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index 3567263e802..678b3bfaa2e 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -33,6 +33,9 @@ $socid = GETPOST("socid","int");
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'salaries', '', '', '');
 
+$search_ref = GETPOST('search_ref','int');
+$search_label = GETPOST('search_label','alpha');
+$search_amount = GETPOST('search_amount','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -61,6 +64,14 @@ else
 	$typeid=$_REQUEST['typeid'];
 }
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_label="";
+	$search_amount="";
+    $typeid="";
+}
+
 /*
  * View
  */
@@ -78,8 +89,11 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst
 $sql.= " ".MAIN_DB_PREFIX."user as u";
 $sql.= " WHERE u.rowid = s.fk_user";
 $sql.= " AND s.entity = ".$conf->entity;
-if (GETPOST("search_label")) $sql.=" AND s.label LIKE '%".$db->escape(GETPOST("search_label"))."%'";
-if (GETPOST("search_amount")) $sql.=" AND s.amount = ".price2num(GETPOST("search_amount"));
+
+// Search criteria
+if ($search_ref)	$sql.=" AND s.rowid=".$search_ref;
+if ($search_label) 	$sql.=" AND s.label LIKE '%".$db->escape($search_label)."%'";
+if ($search_amount) $sql.=" AND s.amount='".$db->escape(price2num(trim($search_amount)))."'";
 if ($filtre) {
     $filtre=str_replace(":","=",$filtre);
     $sql .= " AND ".$filtre;
@@ -104,8 +118,6 @@ if ($result)
 
 	print_barre_liste($langs->trans("SalariesPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
 
-	dol_htmloutput_mesg($mesg);
-
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 
     print '<table class="noborder" width="100%">';
@@ -120,19 +132,23 @@ if ($result)
     print "</tr>\n";
 
 	print '<tr class="liste_titre">';
+	// Ref
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
+	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="14" name="search_label" value="'.GETPOST("search_label").'"></td>';
+	// Label
+	print '<td class="liste_titre"><input type="text" class="flat" size="14" name="search_label" value="'.$search_label.'"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Type
 	print '<td class="liste_titre" align="left">';
 	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.GETPOST("search_amount").'"></td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td>';
-	print "</tr>\n";
+	// Amount
+	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print "</td></tr>\n";
 
     while ($i < min($num,$limit))
     {
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 4ea2af2c20f..afe2c27a3be 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -69,7 +69,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 	}
 	else
 	{
-		$mesg='<div class="error">'.$chargesociales->error.'</div>';
+		setEventMessage($chargesociales->error, 'errors');
 	}
 }
 
@@ -81,22 +81,22 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	$dateperiod=@dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
 	if (! $dateech)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors');
 		$action = 'create';
 	}
 	elseif (! $dateperiod)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors');
 		$action = 'create';
 	}
 	elseif (! $_POST["actioncode"] > 0)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")), 'errors');
 		$action = 'create';
 	}
 	elseif (! $_POST["amount"])
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")), 'errors');
 		$action = 'create';
 	}
 	else
@@ -110,13 +110,9 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 		$chargesociales->amount=$_POST["amount"];
 
 		$id=$chargesociales->create($user);
-		if ($id > 0)
+		if ($id <= 0)
 		{
-			//$mesg='<div class="ok">'.$langs->trans("SocialContributionAdded").'</div>';
-		}
-		else
-		{
-			$mesg='<div class="error">'.$chargesociales->error.'</div>';
+			setEventMessage($chargesociales->error, 'errors');
 		}
 	}
 }
@@ -128,12 +124,12 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
 	$dateperiod=dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
 	if (! $dateech)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors');
 		$action = 'edit';
 	}
 	elseif (! $dateperiod)
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors');
 		$action = 'edit';
 	}
 	else
@@ -146,17 +142,64 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
 		$chargesociales->periode=$dateperiod;
 
 		$result=$chargesociales->update($user);
-		if ($result > 0)
+		if ($result <= 0)
 		{
-			//$mesg='<div class="ok">'.$langs->trans("SocialContributionAdded").'</div>';
-		}
-		else
-		{
-			$mesg='<div class="error">'.$chargesociales->error.'</div>';
+			setEventMessage($chargesociales->error, 'errors');
 		}
 	}
 }
 
+ // Action clone object
+if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer))
+{
+	$db->begin();
+
+	$originalId = $id;
+
+	$object = new ChargeSociales($db);
+	$object->fetch($id);
+
+	if ($object->id > 0)
+	{
+		$object->paye = 0;
+		$object->id = $object->ref = null;
+
+		if(GETPOST('clone_for_next_month') != '') {
+
+			$object->date_ech = strtotime('+1month', $object->date_ech);
+			$object->periode = strtotime('+1month', $object->periode);
+		}
+
+		if ($object->check())
+		{
+			$id = $object->create($user);
+			if ($id > 0)
+			{
+				$db->commit();
+				$db->close();
+
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			}
+			else
+			{
+				$id=$originalId;
+				$db->rollback();
+
+				setEventMessages($object->error,$object->errors, 'errors');
+			}
+		}
+	}
+	else
+	{
+		$db->rollback();
+		dol_print_error($db,$object->error);
+	}
+}
+
+
+
 
 
 /*
@@ -176,8 +219,6 @@ if ($action == 'create')
 	print_fiche_titre($langs->trans("NewSocialContribution"));
 	print "<br>\n";
 
-	dol_htmloutput_mesg($mesg);
-
     $var=false;
 
     print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -246,12 +287,21 @@ if ($id > 0)
 
 	if ($result > 0)
 	{
-		dol_htmloutput_mesg($mesg);
-
 		$head=tax_prepare_head($object);
 
 		dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill');
 
+		// Clone confirmation
+		if ($action === 'clone')
+		{
+			$formclone=array(
+				array('type' => 'checkbox', 'name' => 'clone_for_next_month','label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1),
+
+			);
+
+		    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes');
+		}
+
 		// Confirmation de la suppression de la charge
 		if ($action == 'paid')
 		{
@@ -331,7 +381,7 @@ if ($id > 0)
 				$objp = $db->fetch_object($resql);
 				$var=!$var;
 				print "<tr ".$bc[$var]."><td>";
-				print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
+				print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 			        $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;				
                                 print "<td>".$labeltype.' '.$objp->num_paiement."</td>\n";
@@ -433,6 +483,12 @@ if ($id > 0)
 				print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&amp;action=paid\">".$langs->trans("ClassifyPaid")."</a>";
 			}
 
+			// Clone
+			if ($user->rights->tax->charges->creer)
+			{
+				print "<a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/charges.php",1). "?id=$object->id&amp;action=clone\">".$langs->trans("ToClone")."</a>";
+			}
+
 			// Delete
 			if ($user->rights->tax->charges->supprimer)
 			{
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 6404d9f26c8..1d684c65552 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -34,6 +34,11 @@ class ChargeSociales extends CommonObject
     public $table='chargesociales';
     public $table_element='chargesociales';
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $table_ref_field = 'ref';
+
     var $id;
     var $ref;
     var $date_ech;
@@ -62,19 +67,21 @@ 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 sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -107,6 +114,24 @@ class ChargeSociales extends CommonObject
         }
     }
 
+	/**
+	 * Check if a social contribution can be created into database
+	 *
+	 * @return	boolean		True or false
+	 */
+	function check()
+	{
+		$newamount=price2num($this->amount,'MT');
+
+        // Validation parametres
+        if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode))
+        {
+            return false;
+        }
+
+
+		return true;
+	}
 
     /**
      *      Create a social contribution into database
@@ -121,12 +146,12 @@ class ChargeSociales extends CommonObject
         // Nettoyage parametres
         $newamount=price2num($this->amount,'MT');
 
-        // Validation parametres
-        if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode))
-        {
-            $this->error="ErrorBadParameter";
-            return -2;
-        }
+		if (!$this->check())
+		{
+			 $this->error="ErrorBadParameter";
+			 return -2;
+		}
+
 
         $this->db->begin();
 
@@ -137,7 +162,7 @@ class ChargeSociales extends CommonObject
         $sql.= " ".$conf->entity;
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -192,7 +217,7 @@ class ChargeSociales extends CommonObject
         if (! $error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge where fk_charge='".$this->id."'";
-            dol_syslog(get_class($this)."::delete sql=".$sql);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
             {
@@ -204,7 +229,7 @@ class ChargeSociales extends CommonObject
         if (! $error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$this->id."'";
-            dol_syslog(get_class($this)."::delete sql=".$sql);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql)
             {
@@ -243,7 +268,7 @@ class ChargeSociales extends CommonObject
         $sql.= " periode='".$this->db->idate($this->periode)."'";
         $sql.= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update sql=".$sql);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -341,7 +366,7 @@ class ChargeSociales extends CommonObject
         global $langs;
         $langs->load('customers');
         $langs->load('bills');
-        
+
         if ($mode == 0)
         {
             if ($statut ==  0) return $langs->trans("Unpaid");
@@ -419,7 +444,7 @@ class ChargeSociales extends CommonObject
         $sql.= ' FROM '.MAIN_DB_PREFIX.$table;
         $sql.= ' WHERE '.$field.' = '.$this->id;
 
-        dol_syslog(get_class($this)."::getSommePaiement sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -449,7 +474,7 @@ class ChargeSociales extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
         $sql.= " WHERE e.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::info sql=".$sql);
+        dol_syslog(get_class($this)."::info", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
diff --git a/htdocs/compta/sociales/class/index.html b/htdocs/compta/sociales/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index e89f2a273f8..395932de69f 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -116,7 +116,7 @@ class PaymentSocialContribution extends CommonObject
 			$sql.= " ".$this->paiementtype.", '".$this->db->escape($this->num_paiement)."', '".$this->db->escape($this->note)."', ".$user->id.",";
 			$sql.= " 0)";
 
-			dol_syslog(get_class($this)."::create sql=".$sql);
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -139,7 +139,6 @@ class PaymentSocialContribution extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -173,7 +172,7 @@ class PaymentSocialContribution extends CommonObject
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
 		$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepaiement = pt.id";
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -209,7 +208,6 @@ class PaymentSocialContribution extends CommonObject
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -222,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;
@@ -263,7 +261,7 @@ class PaymentSocialContribution extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -321,7 +319,7 @@ class PaymentSocialContribution extends CommonObject
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
             $sql.= " WHERE type='payment_sc' AND url_id=".$this->id;
 
-            dol_syslog(get_class($this)."::delete sql=".$sql);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
         }
@@ -331,7 +329,7 @@ class PaymentSocialContribution extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge";
 			$sql.= " WHERE rowid=".$this->id;
 
-			dol_syslog(get_class($this)."::delete sql=".$sql);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
@@ -508,7 +506,7 @@ class PaymentSocialContribution extends CommonObject
 
                 // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
                 $url='';
-                if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id=';
+                if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
                 if ($url)
                 {
                     $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
@@ -560,7 +558,7 @@ class PaymentSocialContribution extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::update_fk_bank sql=".$sql);
+		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -569,7 +567,6 @@ class PaymentSocialContribution extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::update_fk_bank ".$this->error, LOG_ERR);
 			return 0;
 		}
 	}
@@ -591,7 +588,7 @@ class PaymentSocialContribution extends CommonObject
 
 		if (!empty($this->id))
 		{
-			$lien = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$this->id.'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'">';
 			$lienfin='</a>';
 
 			if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' ');
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index e7f0d3a2b1b..31e98370003 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -36,6 +36,9 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
+$search_ref = GETPOST('search_ref','int');
+$search_label = GETPOST('search_label','alpha');
+$search_amount = GETPOST('search_amount','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -65,6 +68,15 @@ else
 	$typeid=$_REQUEST['typeid'];
 }
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_label="";
+	$search_amount="";
+    $typeid="";
+	$year="";
+	$month="";
+}
 
 /*
  *	View
@@ -85,7 +97,11 @@ $sql.= " ".MAIN_DB_PREFIX."chargesociales as cs";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
 $sql.= " WHERE cs.fk_type = c.id";
 $sql.= " AND cs.entity = ".$conf->entity;
-if (GETPOST("search_label")) $sql.=" AND cs.libelle LIKE '%".$db->escape(GETPOST("search_label"))."%'";
+
+// Search criteria
+if ($search_ref)	$sql.=" AND cs.rowid=".$search_ref;
+if ($search_label) 	$sql.=" AND cs.libelle LIKE '%".$db->escape($search_label)."%'";
+if ($search_amount) $sql.=" AND cs.amount='".$db->escape(price2num(trim($search_amount)))."'";
 if ($year > 0)
 {
     $sql .= " AND (";
@@ -127,10 +143,6 @@ if ($resql)
 		print_barre_liste($langs->trans("SocialContributions"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
 	}
 
-
-	dol_htmloutput_mesg($mesg);
-
-
 	if (empty($mysoc->country_id) && empty($mysoc->country_code))
 	{
 		print '<div class="error">';
@@ -143,10 +155,8 @@ if ($resql)
 	{
 
 		print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
-
-		print "<table class=\"noborder\" width=\"100%\">";
-
-		print "<tr class=\"liste_titre\">";
+		print '<table class="liste" width="100%">';
+		print '<tr class="liste_titre">';
 		print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder);
 		print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
@@ -157,20 +167,26 @@ if ($resql)
 		print "</tr>\n";
 
 		print '<tr class="liste_titre">';
-		print '<td class="liste_titre">&nbsp;</td>';
-		print '<td class="liste_titre"><input type="text" class="flat" size="8" name="search_label" value="'.GETPOST("search_label").'"></td>';
+		// Ref
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
+		print '</td>';
+		// Label
+		print '<td class="liste_titre"><input type="text" class="flat" size="8" name="search_label" value="'.$search_label.'"></td>';
 		// Type
 		print '<td class="liste_titre" align="left">';
 	    $formsocialcontrib->select_type_socialcontrib($typeid,'typeid',1,16,0);
 	    print '</td>';
 		// Period end date
 		print '<td class="liste_titre">&nbsp;</td>';
-	    print '<td class="liste_titre">&nbsp;</td>';
-		print '<td class="liste_titre">&nbsp;</td>';
+	    // Amount
 		print '<td class="liste_titre" align="right">';
-		print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+		print '<input class="flat" type="text" size="6" name="search_amount" value="'.$search_amount.'">';
 		print '</td>';
-		print "</tr>\n";
+		print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+		print "</td></tr>\n";
 
 		while ($i < min($num,$limit))
 		{
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 2b2ad5be02f..8263dc76cb8 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -39,7 +39,7 @@ if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta'
 if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport');
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->COMPTA_MODE;
+$modecompta = $conf->global->ACCOUNTING_MODE;
 if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
 
 $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
@@ -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,10 +211,10 @@ 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 sql=".$sql);
+    dol_syslog("cabyprodserv", LOG_DEBUG);
     $result = $db->query($sql);
     if ($result) {
 	$num = $db->num_rows($result);
@@ -336,7 +338,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		    // Product
 		     $fullname=$name[$key];
 		    if ($key >= 0) {
-			$linkname='<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$key.'">'.img_object($langs->trans("ShowProduct"),'product').' '.$fullname.'</a>';
+			$linkname='<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$key.'">'.img_object($langs->trans("ShowProduct"),'product').' '.$fullname.'</a>';
 		    } else {
 			$linkname=$langs->trans("PaymentsNotLinkedToProduct");
 		    }
@@ -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 '<br>'.$langs->trans("TurnoverPerProductInCommitmentAccountingNotRelevant") . '<br>';
 }
 
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 708c77708cf..e88d370a0c6 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -36,7 +36,7 @@ if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta'
 if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport');
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->COMPTA_MODE;
+$modecompta = $conf->global->ACCOUNTING_MODE;
 if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
 
 $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
@@ -348,7 +348,7 @@ if (count($amount)) {
         // Third party
         $fullname=$name[$key];
         if ($key >= 0) {
-            $linkname='<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$key.'">'.img_object($langs->trans("ShowUser"),'user').' '.$fullname.'</a>';
+            $linkname='<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$key.'">'.img_object($langs->trans("ShowUser"),'user').' '.$fullname.'</a>';
         } else {
             $linkname=$langs->trans("PaymentsNotLinkedToUser");
         }
@@ -359,9 +359,9 @@ if (count($amount)) {
         if ($modecompta != 'CREANCES-DETTES')
         {
             if ($key > 0) {
-		print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?userid='.$key.'">';
+		print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?userid=-1">';
+		    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
 		}
         } else {
             if ($key > 0) {
@@ -377,9 +377,9 @@ if (count($amount)) {
         print '<td align="right">';
         if ($modecompta != 'CREANCES-DETTES') {
             if ($key > 0) {
-		print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?userid='.$key.'">';
+		print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid='.$key.'">';
 		} else {
-		    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?userid=-1">';
+		    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
 		}
         } else {
             if ($key > 0) {
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index fd4afbfdf01..1d34f78a181 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -34,7 +34,7 @@ $langs->load("companies");
 $langs->load("categories");
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->COMPTA_MODE;
+$modecompta = $conf->global->ACCOUNTING_MODE;
 if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta");
 
 $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
@@ -250,7 +250,7 @@ $sql.= " GROUP BY s.rowid, s.nom";
 $sql.= " ORDER BY s.rowid";
 //echo $sql;
 
-dol_syslog("casoc sql=".$sql);
+dol_syslog("casoc", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
@@ -429,9 +429,9 @@ if (count($amount)) {
 		print '<td align="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
                     if ($key > 0) {
-			print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?socid='.$key.'">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
 		    } else {
-			print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?socid=-1">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid=-1">';
 		    }
 		} else {
 		    if ($key > 0) {
@@ -447,9 +447,9 @@ if (count($amount)) {
 		print '<td align="right">';
 		if ($modecompta != 'CREANCES-DETTES') {
                     if ($key > 0) {
-                        print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?socid='.$key.'">';
+                        print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?socid='.$key.'">';
 		    } else {
-			print '<a href="'.DOL_URL_ROOT.'/compta/paiement/liste.php?orphelins=1">';
+			print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?orphelins=1">';
 		    }
 		} else {
                     if ($key > 0) {
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 59a7e478f9b..cfd816c29b6 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -38,7 +38,7 @@ else {
 $userid=GETPOST('userid','int');
 $socid = GETPOST('socid','int');
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->COMPTA_MODE;
+$modecompta = $conf->global->ACCOUNTING_MODE;
 if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
 
 // Security check
@@ -184,7 +184,7 @@ print '<tr class="liste_titre"><td>&nbsp;</td>';
 for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
 	if ($modecompta == 'CREANCES-DETTES') print '<td align="center" width="10%" colspan="3">';
-	else print '<td align="center" width="10%" colspan="2">';
+	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
 	print '<a href="casoc.php?year='.$annee.'">';
 	print $annee;
     if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
@@ -198,7 +198,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 {
 	if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.$langs->trans("AmountHT").'</td>';
 	print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
-	print '<td align="right">'.$langs->trans("Delta").'</td>';
+	print '<td align="right" class="borderrightlight">'.$langs->trans("Delta").'</td>';
 	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
 }
 print '</tr>';
@@ -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 "<tr ".$bc[$var].">";
 
 	print "<td>".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,2000),"%B")."</td>";
-	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 '<td align="right">';
+				if ($cum_ht[$case])
+				{
+					$now_show_delta=1;  // On a trouve le premier mois de la premiere annee generant du chiffre.
+					print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum_ht[$case],1).'</a>';
+				}
+				else
+				{
+					if ($minyearmonth < $case && $case <= max($maxyearmonth,$nowyearmonth)) { print '0'; }
+					else { print '&nbsp;'; }
+				}
+				print "</td>";
+			}
+
+			// Valeur CA du mois
 			print '<td align="right">';
-			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 '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum_ht[$case],1).'</a>';
+				print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum[$case],1).'</a>';
 			}
 			else
 			{
@@ -243,60 +260,46 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
 				else { print '&nbsp;'; }
 			}
 			print "</td>";
-		}
-		
-		// Valeur CA du mois
-		print '<td align="right">';
-		if ($cum[$case])
-		{
-			$now_show_delta=1;  // On a trouve le premier mois de la premiere annee generant du chiffre.
-			print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta?'&modecompta='.$modecompta:'').'">'.price($cum[$case],1).'</a>';
-		}
-		else
-		{
-			if ($minyearmonth < $case && $case <= max($maxyearmonth,$nowyearmonth)) { print '0'; }
-			else { print '&nbsp;'; }
-		}
-		print "</td>";
 
-		// 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 '<td align="right">'.($percent>=0?"+$percent":"$percent").'%</td>';
+				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 '<td align="right" class="borderrightlight">'.($percent>=0?"+$percent":"$percent").'%</td>';
+				}
+				if ($cum[$caseprev] && ! $cum[$case])
+				{
+					print '<td align="right" class="borderrightlight">-100%</td>';
+				}
+				if (! $cum[$caseprev] && $cum[$case])
+				{
+					//print '<td align="right">+Inf%</td>';
+					print '<td align="right" class="borderrightlight">-</td>';
+				}
+				if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case])
+				{
+					print '<td align="right" class="borderrightlight">+0%</td>';
+				}
+				if (! isset($cum[$caseprev]) && ! $cum[$case])
+				{
+					print '<td align="right" class="borderrightlight">-</td>';
+				}
 			}
-			if ($cum[$caseprev] && ! $cum[$case])
+			else
 			{
-				print '<td align="right">-100%</td>';
+				print '<td align="right" class="borderrightlight">';
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
+				else { print '&nbsp;'; }
+				print '</td>';
 			}
-			if (! $cum[$caseprev] && $cum[$case])
-			{
-				//print '<td align="right">+Inf%</td>';
-				print '<td align="right">-</td>';
-			}
-			if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case])
-			{
-				print '<td align="right">+0%</td>';
-			}
-			if (! isset($cum[$caseprev]) && ! $cum[$case])
-			{
-				print '<td align="right">-</td>';
-			}
-		}
-		else
-		{
-			print '<td align="right">';
-			if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-			else { print '&nbsp;'; }
-			print '</td>';
+			if ($annee_decalage != $year_end) print '<td width="15">&nbsp;</td>';
 		}
 
 		$total_ht[$annee]+=!empty($cum_ht[$case]) ? $cum_ht[$case] : 0;;
 		$total[$annee]+=$cum[$case];
-		if ($annee_decalage != $year_end) print '<td width="15">&nbsp;</td>';
 	}
 
 	print '</tr>';
@@ -382,7 +385,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 			print '<td>&nbsp;</td>';
 		}
 	}
-	
+
 	// Montant total
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear,$maxyear)))
 	{
@@ -398,24 +401,24 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
 	{
 		if ($total[$annee-1] && $total[$annee]) {
 			$percent=(round(($total[$annee]-$total[$annee-1])/$total[$annee-1],4)*100);
-			print '<td align="right" class="nowrap">'.($percent>=0?"+$percent":"$percent").'%</td>';
+			print '<td align="right" class="nowrap borderrightlight">'.($percent>=0?"+$percent":"$percent").'%</td>';
 		}
 		if ($total[$annee-1] && ! $total[$annee])
 		{
-			print '<td align="right">-100%</td>';
+			print '<td align="right" class="borderrightlight">-100%</td>';
 		}
 		if (! $total[$annee-1] && $total[$annee])
 		{
-			print '<td align="right">+Inf%</td>';
+			print '<td align="right" class="borderrightlight">+zzzz'.$total[$annee-1].$langs->trans('Inf').'%</td>';
 		}
 		if (! $total[$annee-1] && ! $total[$annee])
 		{
-			print '<td align="right">+0%</td>';
+			print '<td align="right" class="borderrightlight">+0%</td>';
 		}
 	}
 	else
 	{
-		print '<td align="right">';
+		print '<td align="right" class="borderrightlight">';
 		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear,$maxyear))) { print '-'; }
 		else { print '&nbsp;'; }
 		print '</td>';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
new file mode 100644
index 00000000000..268a1af8e66
--- /dev/null
+++ b/htdocs/compta/tva/card.php
@@ -0,0 +1,327 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/tva/card.php
+ *      \ingroup    tax
+ *		\brief      Page of VAT payments
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->load("compta");
+$langs->load("banks");
+$langs->load("bills");
+
+$id=GETPOST("id",'int');
+$action=GETPOST('action');
+
+// Security check
+$socid = isset($_GET["socid"])?$_GET["socid"]:'';
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
+$tva = new Tva($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('taxvatcard','globalcard'));
+
+
+
+/**
+ * Actions
+ */
+
+if ($_POST["cancel"] == $langs->trans("Cancel"))
+{
+	header("Location: reglement.php");
+	exit;
+}
+
+if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
+{
+    $error=0;
+
+	$datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
+    $datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
+
+    $tva->accountid=GETPOST("accountid");
+    $tva->type_payment=GETPOST("type_payment");
+	$tva->num_payment=GETPOST("num_payment");
+    $tva->datev=$datev;
+    $tva->datep=$datep;
+    $tva->amount=GETPOST("amount");
+	$tva->label=GETPOST("label");
+	$tva->note=GETPOST("note");
+	
+	if (empty($tva->datev))
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateValue")),'errors');
+		$error++;
+	}
+	if (empty($tva->datep))
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DatePayment")),'errors');
+		$error++;
+	}
+	if (empty($tva->type_payment) || $tva->type_payment < 0)
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentMode")),'errors');
+		$error++;
+	}
+	if (empty($tva->amount))
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount")),'errors');
+		$error++;
+	}
+
+	if (! $error)
+	{
+		$db->begin();
+
+    	$ret=$tva->addPayment($user);
+		if ($ret > 0)
+		{
+			$db->commit();
+			header("Location: reglement.php");
+			exit;
+		}
+		else
+		{
+			$db->rollback();
+			setEventMessage($tva->error, 'errors');
+			$action="create";
+		}
+	}
+
+	$action='create';
+}
+
+if ($action == 'delete')
+{
+    $result=$tva->fetch($id);
+
+	if ($tva->rappro == 0)
+	{
+	    $db->begin();
+
+	    $ret=$tva->delete($user);
+	    if ($ret > 0)
+	    {
+			if ($tva->fk_bank)
+			{
+				$accountline=new AccountLine($db);
+				$result=$accountline->fetch($tva->fk_bank);
+				if ($result > 0) $result=$accountline->delete($user);	// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+			}
+
+			if ($result >= 0)
+			{
+				$db->commit();
+				header("Location: ".DOL_URL_ROOT.'/compta/tva/reglement.php');
+				exit;
+			}
+			else
+			{
+				$tva->error=$accountline->error;
+				$db->rollback();
+				setEventMessage($tva->error,'errors');
+			}
+	    }
+	    else
+	    {
+	        $db->rollback();
+	        setEventMessage($tva->error,'errors');
+	    }
+	}
+	else
+	{
+        setEventMessage('Error try do delete a line linked to a conciliated bank transaction','errors');
+	}
+}
+
+
+/*
+*	View
+*/
+
+llxHeader();
+
+$form = new Form($db);
+
+if ($id)
+{
+    $vatpayment = new Tva($db);
+	$result = $vatpayment->fetch($id);
+	if ($result <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+}
+
+// Formulaire saisie tva
+if ($action == 'create')
+{
+    print "<form name='add' action=\"card.php\" method=\"post\">\n";
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+
+    print_fiche_titre($langs->trans("NewVATPayment"));
+
+    print '<table class="border" width="100%">';
+
+    print "<tr>";
+    print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+    print $form->select_date($datep,"datep",'','','','add');
+    print '</td></tr>';
+
+    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
+    print $form->select_date($datev,"datev",'','','','add');
+    print '</td></tr>';
+
+	// Label
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("VATPayment")).'"></td></tr>';
+
+	// Amount
+	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.$_POST["amount"].'"></td></tr>';
+
+    if (! empty($conf->banque->enabled))
+    {
+		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
+        $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
+        print '</td></tr>';
+
+		// Type payment
+		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+		$form->select_types_paiements(GETPOST("type_payment"), "type_payment");
+		print "</td>\n";
+		print "</tr>";
+		
+		// Number
+		print '<tr><td>'.$langs->trans('Numero');
+		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
+	}
+
+    // Other attributes
+    $parameters=array('colspan' => ' colspan="1"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+    print '</table>';
+
+	print "<br>";
+
+	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
+    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+
+    print '</form>';
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Barre d'action                                                             */
+/*                                                                            */
+/* ************************************************************************** */
+
+if ($id)
+{
+	$h = 0;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$vatpayment->id;
+	$head[$h][1] = $langs->trans('Card');
+	$head[$h][2] = 'card';
+	$h++;
+
+	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
+
+
+	print '<table class="border" width="100%">';
+
+	print "<tr>";
+	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $vatpayment->ref;
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$vatpayment->label.'</td></tr>';
+
+	print "<tr>";
+	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
+	print dol_print_date($vatpayment->datep,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
+	print dol_print_date($vatpayment->datev,'day');
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($vatpayment->amount).'</td></tr>';
+
+	if (! empty($conf->banque->enabled))
+	{
+		if ($vatpayment->fk_account > 0)
+		{
+ 		   	$bankline=new AccountLine($db);
+    		$bankline->fetch($vatpayment->fk_bank);
+
+	    	print '<tr>';
+	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+			print '<td colspan="3">';
+			print $bankline->getNomUrl(1,0,'showall');
+	    	print '</td>';
+	    	print '</tr>';
+		}
+	}
+
+        // Other attributes
+        $parameters=array('colspan' => ' colspan="3"');
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action);    // Note that $action and $object may have been modified by hook
+
+	print '</table>';
+
+	print '</div>';
+
+	/*
+	* Boutons d'actions
+	*/
+	print "<div class=\"tabsAction\">\n";
+	if ($vatpayment->rappro == 0)
+	{
+		if (! empty($user->rights->tax->charges->supprimer))
+		{
+			print '<a class="butActionDelete" href="card.php?id='.$vatpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+		}
+		else
+		{
+			print '<a class="butActionRefused" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a>';
+		}
+	}
+	else
+	{
+		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
+	}
+	print "</div>";
+}
+
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/tva/class/index.html b/htdocs/compta/tva/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index c605c97fed9..a300579fc1f 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -115,37 +115,35 @@ class Tva extends CommonObject
 
 		$sql.= ")";
 
-	   	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
 
-            // Start triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('TVA_CREATE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // End triggers
+            // Call trigger
+            $result=$this->call_trigger('TVA_CREATE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
 
+            //FIXME: Add rollback if trigger fail
             return $this->id;
         }
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
     }
 
     /**
      * Update database
-     * 
+     *
      * @param   User	$user        	User that modify
      * @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;
 
@@ -178,23 +176,22 @@ class Tva extends CommonObject
 
         $sql.= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql)
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
             return -1;
         }
 
 		if (! $notrigger)
 		{
-            // Start triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('TVA_MODIFY',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // End triggers
+            // Call trigger
+            $result=$this->call_trigger('TVA_MODIFY',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+
+            //FIXME: Add rollback if trigger fail
     	}
 
         return 1;
@@ -203,12 +200,12 @@ class Tva extends CommonObject
 
     /**
      *  Load object in memory from database
-     *  
+     *
      *  @param	int		$id         id object
      *  @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";
@@ -233,7 +230,7 @@ class Tva extends CommonObject
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
         $sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -265,7 +262,6 @@ class Tva extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -273,7 +269,7 @@ class Tva extends CommonObject
 
  	/**
 	 *  Delete object in database
-	 *  
+	 *
      *	@param	User	$user       User that delete
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
@@ -283,24 +279,22 @@ class Tva extends CommonObject
 
 		$error=0;
 
+		// Call trigger
+		$result=$this->call_trigger('TVA_DELETE',$user);
+		if ($result < 0) return -1;
+		// End call triggers
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."tva";
 		$sql.= " WHERE rowid=".$this->id;
 
-	   	dol_syslog(get_class($this)."::delete sql=".$sql);
+	   	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			return -1;
 		}
 
-        // Start triggers
-        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        $interface=new Interfaces($this->db);
-        $result=$interface->run_triggers('TVA_DELETE',$this,$user,$langs,$conf);
-        if ($result < 0) { $error++; $this->errors=$interface->errors; }
-        // End triggers
 
 		return 1;
 	}
@@ -331,7 +325,7 @@ class Tva extends CommonObject
 
     /**
      *  Balance of VAT
-     *  
+     *
      *	@param	int		$year		Year
      *	@return	double				Amount
      */
@@ -349,8 +343,8 @@ 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
      */
@@ -359,32 +353,30 @@ class Tva extends CommonObject
 
         $sql = "SELECT sum(f.tva) as amount";
         $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-
         if ($year)
         {
             $sql .= " AND f.datef >= '".$year."-01-01' AND f.datef <= '".$year."-12-31' ";
         }
 
         $result = $this->db->query($sql);
-
         if ($result)
         {
             if ($this->db->num_rows($result))
             {
                 $obj = $this->db->fetch_object($result);
-                return $obj->amount;
+				$ret = $obj->amount;
+                $this->db->free($result);
+                return $ret;
             }
             else
-            {
-                return 0;
+			{
+                $this->db->free($result);
+				return 0;
             }
-
-            $this->db->free($result);
-
         }
         else
         {
-            print $this->db->error();
+            print $this->db->lasterror();
             return -1;
         }
     }
@@ -400,31 +392,30 @@ class Tva extends CommonObject
 
         $sql = "SELECT sum(f.total_tva) as total_tva";
         $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-
         if ($year)
         {
             $sql .= " WHERE f.datef >= '".$year."-01-01' AND f.datef <= '".$year."-12-31' ";
         }
-        $result = $this->db->query($sql);
 
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
             {
                 $obj = $this->db->fetch_object($result);
-                return $obj->total_tva;
+                $ret = $obj->total_tva;
+            	$this->db->free($result);
+                return $ret;
             }
             else
-            {
-                return 0;
+			{
+            	$this->db->free($result);
+				return 0;
             }
-
-            $this->db->free();
-
         }
         else
         {
-            print $this->db->error();
+            print $this->db->lasterror();
             return -1;
         }
     }
@@ -448,25 +439,24 @@ class Tva extends CommonObject
         }
 
         $result = $this->db->query($sql);
-
         if ($result)
         {
             if ($this->db->num_rows($result))
             {
                 $obj = $this->db->fetch_object($result);
-                return $obj->amount;
+                $ret = $obj->amount;
+            	$this->db->free($result);
+                return $ret;
             }
             else
-            {
-                return 0;
+			{
+            	$this->db->free($result);
+				return 0;
             }
-
-            $this->db->free();
-
         }
         else
         {
-            print $this->db->error();
+            print $this->db->lasterror();
             return -1;
         }
     }
@@ -491,7 +481,7 @@ class Tva extends CommonObject
 		$this->fk_bank=trim($this->fk_bank);
 		$this->fk_user_creat=trim($this->fk_user_creat);
 		$this->fk_user_modif=trim($this->fk_user_modif);
-		
+
         // Check parameters
 		if (! $this->label)
 		{
@@ -539,18 +529,21 @@ class Tva extends CommonObject
 		$sql.= ", ".$conf->entity;
         $sql.= ")";
 
-		dol_syslog(get_class($this)."::addPayment sql=".$sql);
+		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");    // TODO should be called paiementtva
 
-            // Start triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('TVA_ADDPAYMENT',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // End triggers
+            // Call trigger
+            //XXX: Should be done just befor commit no ?
+            $result=$this->call_trigger('TVA_ADDPAYMENT',$user);
+            if ($result < 0)
+            {
+            	$this->id = 0;
+            	$ok = 0;
+            }
+            // End call triggers
 
             if ($this->id > 0)
             {
@@ -578,7 +571,7 @@ class Tva extends CommonObject
 					}
 
                     // Update links
-                    $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/fiche.php?id=', "(VATPayment)", "payment_vat");
+                    $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
                     if ($result < 0)
                     {
                     	$this->error=$acc->error;
@@ -599,7 +592,6 @@ class Tva extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
                 $this->db->rollback();
                 return -2;
             }
@@ -647,7 +639,7 @@ class Tva extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/compta/tva/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$picto='payment';
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 422354ee7c3..c2620fd34df 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -110,10 +110,10 @@ $fsearch.='  <input type="text" name="min" id="min" value="'.$min.'" size="6">';
 // Affiche en-tete du rapport
 if ($modetax==1)	// Calculate on invoice for goods and services
 {
-    $nom=$langs->trans("VATReportByCustomersInDueDebtMode");
+    $name=$langs->trans("VATReportByCustomersInDueDebtMode");
 	$calcmode=$langs->trans("CalcModeVATDebt");
     $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
-    //$nom.='<br>('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
+    //$name.='<br>('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
     $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
     //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
     $description=$langs->trans("RulesVATDueServices");
@@ -138,10 +138,10 @@ if ($modetax==1)	// Calculate on invoice for goods and services
 }
 if ($modetax==0) 	// Invoice for goods, payment for services
 {
-    $nom=$langs->trans("VATReportByCustomersInInputOutputMode");
+    $name=$langs->trans("VATReportByCustomersInInputOutputMode");
     $calcmode=$langs->trans("CalcModeVATEngagement");
     $calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
-    //$nom.='<br>('.$langs->trans("SeeVATReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=1">','</a>').')';
+    //$name.='<br>('.$langs->trans("SeeVATReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=1">','</a>').')';
     $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
     //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
     $description=$langs->trans("RulesVATInServices");
@@ -165,7 +165,7 @@ if ($modetax==0) 	// Invoice for goods, payment for services
 	$amountsup=$langs->trans("AmountHT");
 	if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
 }
-report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
+report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
 
 $vatcust=$langs->trans("VATReceived");
 $vatsup=$langs->trans("VATPaid");
@@ -223,7 +223,7 @@ if (is_array($coll_list))
 			print "<tr ".$bc[$var].">";
 			print '<td class="nowrap">'.$i."</td>";
 			$company_static->id=$coll->socid;
-			$company_static->nom=$coll->nom;
+			$company_static->name=$coll->name;
 			$company_static->client=1;
 			print '<td class="nowrap">'.$company_static->getNomUrl(1,'customer').'</td>';
 			$find = array(' ','.');
@@ -304,7 +304,7 @@ if (is_array($coll_list))
 			print "<tr ".$bc[$var].">";
 			print '<td class="nowrap">'.$i."</td>";
 			$company_static->id=$coll->socid;
-			$company_static->nom=$coll->nom;
+			$company_static->name=$coll->name;
 			$company_static->fournisseur=1;
 			print '<td class="nowrap">'.$company_static->getNomUrl(1,'supplier').'</td>';
 			$find = array(' ','.');
diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php
deleted file mode 100644
index a4a5a8831c4..00000000000
--- a/htdocs/compta/tva/fiche.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/compta/tva/fiche.php
- *      \ingroup    tax
- *		\brief      Page of VAT payments
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-$langs->load("compta");
-$langs->load("banks");
-$langs->load("bills");
-
-$id=GETPOST("id",'int');
-$action=GETPOST('action');
-
-// Security check
-$socid = isset($_GET["socid"])?$_GET["socid"]:'';
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
-
-$tva = new Tva($db);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('taxvatcard'));
-
-
-
-/**
- * Actions
- */
-
-if ($_POST["cancel"] == $langs->trans("Cancel"))
-{
-	header("Location: reglement.php");
-	exit;
-}
-
-if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
-{
-    $error=0;
-
-	$datev=dol_mktime(12,0,0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
-    $datep=dol_mktime(12,0,0, $_POST["datepmonth"], $_POST["datepday"], $_POST["datepyear"]);
-
-    $tva->accountid=GETPOST("accountid");
-    $tva->type_payment=GETPOST("type_payment");
-	$tva->num_payment=GETPOST("num_payment");
-    $tva->datev=$datev;
-    $tva->datep=$datep;
-    $tva->amount=GETPOST("amount");
-	$tva->label=GETPOST("label");
-	$tva->note=GETPOST("note");
-	
-	if (empty($tva->datev))
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateValue")),'errors');
-		$error++;
-	}
-	if (empty($tva->datep))
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DatePayment")),'errors');
-		$error++;
-	}
-	if (empty($tva->type_payment) || $tva->type_payment < 0)
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("PaymentMode")),'errors');
-		$error++;
-	}
-	if (empty($tva->amount))
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Amount")),'errors');
-		$error++;
-	}
-
-	if (! $error)
-	{
-		$db->begin();
-
-    	$ret=$tva->addPayment($user);
-		if ($ret > 0)
-		{
-			$db->commit();
-			header("Location: reglement.php");
-			exit;
-		}
-		else
-		{
-			$db->rollback();
-			setEventMessage($tva->error, 'errors');
-			$action="create";
-		}
-	}
-
-	$action='create';
-}
-
-if ($action == 'delete')
-{
-    $result=$tva->fetch($id);
-
-	if ($tva->rappro == 0)
-	{
-	    $db->begin();
-
-	    $ret=$tva->delete($user);
-	    if ($ret > 0)
-	    {
-			if ($tva->fk_bank)
-			{
-				$accountline=new AccountLine($db);
-				$result=$accountline->fetch($tva->fk_bank);
-				if ($result > 0) $result=$accountline->delete($user);	// $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
-			}
-
-			if ($result >= 0)
-			{
-				$db->commit();
-				header("Location: ".DOL_URL_ROOT.'/compta/tva/reglement.php');
-				exit;
-			}
-			else
-			{
-				$tva->error=$accountline->error;
-				$db->rollback();
-				setEventMessage($tva->error,'errors');
-			}
-	    }
-	    else
-	    {
-	        $db->rollback();
-	        setEventMessage($tva->error,'errors');
-	    }
-	}
-	else
-	{
-        setEventMessage('Error try do delete a line linked to a conciliated bank transaction','errors');
-	}
-}
-
-
-/*
-*	View
-*/
-
-llxHeader();
-
-$form = new Form($db);
-
-if ($id)
-{
-    $vatpayment = new Tva($db);
-	$result = $vatpayment->fetch($id);
-	if ($result <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-}
-
-// Formulaire saisie tva
-if ($action == 'create')
-{
-    print "<form name='add' action=\"fiche.php\" method=\"post\">\n";
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-
-    print_fiche_titre($langs->trans("NewVATPayment"));
-
-    print '<table class="border" width="100%">';
-
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-    print $form->select_date($datep,"datep",'','','','add');
-    print '</td></tr>';
-
-    print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
-    print $form->select_date($datev,"datev",'','','','add');
-    print '</td></tr>';
-
-	// Label
-	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("VATPayment")).'"></td></tr>';
-
-	// Amount
-	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.$_POST["amount"].'"></td></tr>';
-
-    if (! empty($conf->banque->enabled))
-    {
-		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
-        $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1);  // Affiche liste des comptes courant
-        print '</td></tr>';
-
-		// Type payment
-		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-		$form->select_types_paiements(GETPOST("type_payment"), "type_payment");
-		print "</td>\n";
-		print "</tr>";
-		
-		// Number
-		print '<tr><td>'.$langs->trans('Numero');
-		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
-	}
-
-    // Other attributes
-    $parameters=array('colspan' => ' colspan="1"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-    print '</table>';
-
-	print "<br>";
-
-	print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; ';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-
-    print '</form>';
-}
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-if ($id)
-{
-	$h = 0;
-	$head[$h][0] = DOL_URL_ROOT.'/compta/tva/fiche.php?id='.$vatpayment->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
-
-	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
-
-
-	print '<table class="border" width="100%">';
-
-	print "<tr>";
-	print '<td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $vatpayment->ref;
-	print '</td></tr>';
-
-	// Label
-	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$vatpayment->label.'</td></tr>';
-
-	print "<tr>";
-	print '<td>'.$langs->trans("DatePayment").'</td><td colspan="3">';
-	print dol_print_date($vatpayment->datep,'day');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("DateValue").'</td><td colspan="3">';
-	print dol_print_date($vatpayment->datev,'day');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="3">'.price($vatpayment->amount).'</td></tr>';
-
-	if (! empty($conf->banque->enabled))
-	{
-		if ($vatpayment->fk_account > 0)
-		{
- 		   	$bankline=new AccountLine($db);
-    		$bankline->fetch($vatpayment->fk_bank);
-
-	    	print '<tr>';
-	    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td colspan="3">';
-			print $bankline->getNomUrl(1,0,'showall');
-	    	print '</td>';
-	    	print '</tr>';
-		}
-	}
-
-        // Other attributes
-        $parameters=array('colspan' => ' colspan="3"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action);    // Note that $action and $object may have been modified by hook
-
-	print '</table>';
-
-	print '</div>';
-
-	/*
-	* Boutons d'actions
-	*/
-	print "<div class=\"tabsAction\">\n";
-	if ($vatpayment->rappro == 0)
-	{
-		if (! empty($user->rights->tax->charges->supprimer))
-		{
-			print '<a class="butActionDelete" href="fiche.php?id='.$vatpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
-		}
-		else
-		{
-			print '<a class="butActionRefused" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a>';
-		}
-	}
-	else
-	{
-		print '<a class="butActionRefused" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
-	}
-	print "</div>";
-}
-
-
-$db->close();
-
-llxFooter();
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/quadri.php b/htdocs/compta/tva/quadri.php
index 0e22dc77f1b..f5d0065e7f3 100644
--- a/htdocs/compta/tva/quadri.php
+++ b/htdocs/compta/tva/quadri.php
@@ -60,7 +60,7 @@ function tva_coll($db,$y,$q)
 {
 	global $conf;
 
-    if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
+    if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
     {
         // if vat paid on due invoices
         $sql = "SELECT d.fk_facture as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.total_tva as amount";
@@ -128,7 +128,7 @@ function tva_paye($db, $y,$q)
 {
 	global $conf;
 
-    if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
+    if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
     {
         // Si on paye la tva sur les factures dues (non brouillon)
         $sql = "SELECT d.fk_facture_fourn as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.tva as amount";
@@ -212,7 +212,7 @@ print "<td align=\"right\">".$langs->trans("Invoices")."</td>";
 print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
 print "</tr>\n";
 
-if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
+if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES")
 {
 	$y = $year_current;
 
@@ -250,7 +250,7 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES")
 			}
 			$x_both[$my_paye_rate]['paye']['links'] = '';
 			foreach($x_paye[$my_paye_rate]['facid'] as $id=>$dummy){
-				$x_both[$my_paye_rate]['paye']['links'] .= '<a href="../../fourn/facture/fiche.php?facid='.$x_paye[$my_paye_rate]['facid'][$id].'" title="'.$x_paye[$my_paye_rate]['facnum'][$id].'">..'.substr($x_paye[$my_paye_rate]['facnum'][$id],-2).'</a> ';
+				$x_both[$my_paye_rate]['paye']['links'] .= '<a href="../../fourn/facture/card.php?facid='.$x_paye[$my_paye_rate]['facid'][$id].'" title="'.$x_paye[$my_paye_rate]['facnum'][$id].'">..'.substr($x_paye[$my_paye_rate]['facnum'][$id],-2).'</a> ';
 			}
 		}
 		//now we have an array (x_both) indexed by rates for coll and paye
diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php
index c10f7f4509c..45a69076492 100644
--- a/htdocs/compta/tva/reglement.php
+++ b/htdocs/compta/tva/reglement.php
@@ -35,6 +35,9 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
+$search_ref = GETPOST('search_ref','int');
+$search_label = GETPOST('search_label','alpha');
+$search_amount = GETPOST('search_amount','alpha');
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
@@ -63,6 +66,14 @@ else
 	$typeid=$_REQUEST['typeid'];
 }
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_label="";
+	$search_amount="";
+    $typeid="";
+}
+
 /*
  * View
  */
@@ -76,8 +87,9 @@ $sql = "SELECT t.rowid, t.amount, t.label, t.datev as dm, t.fk_typepayment as ty
 $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
 $sql.= " WHERE t.entity = ".$conf->entity;
-if (GETPOST("search_label")) $sql.=" AND t.label LIKE '%".$db->escape(GETPOST("search_label"))."%'";
-if (GETPOST("search_amount")) $sql.=" AND t.amount = ".price2num(GETPOST("search_amount"));
+if ($search_ref)	$sql.=" AND t.rowid=".$search_ref;
+if ($search_label) 	$sql.=" AND t.label LIKE '%".$db->escape($search_label)."%'";
+if ($search_amount) $sql.=" AND t.amount='".$db->escape(price2num(trim($search_amount)))."'";
 if ($filtre) {
     $filtre=str_replace(":","=",$filtre);
     $sql .= " AND ".$filtre;
@@ -85,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);
 
@@ -99,51 +110,48 @@ if ($result)
 
 	$param='';
 	if ($typeid) $param.='&amp;typeid='.$typeid;
-	
+
 	print_barre_liste($langs->trans("VATPayments"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines);
 
-	dol_htmloutput_mesg($mesg);
-	
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-		print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
-		print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
-		print_liste_field_titre("");
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre("");
 	print "</tr>\n";
-	
+
 	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre"><input type="text" class="flat" size="14" name="search_label" value="'.GETPOST("search_label").'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.$search_ref.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Type
 	print '<td class="liste_titre" align="left">';
 	$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.GETPOST("search_amount").'"></td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td>';
-	print "</tr>\n";
-    
+	print '<td class="liste_titre" align="right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print "</td></tr>\n";
+
 	while ($i < min($num,$limit))
     {
         $obj = $db->fetch_object($result);
         $var=!$var;
-		
+
 		if ($obj->payment_code <> '')
 		{
-			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';  
+			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
 		}
 		else
 		{
 			$type = '<td>&nbsp;</td>';
 		}
-		
+
         print "<tr ".$bc[$var].">";
 
 		$tva_static->id=$obj->rowid;
@@ -163,12 +171,12 @@ if ($result)
     }
     print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
     print "<td align=\"right\"><b>".price($total)."</b></td>";
-	print "<td>&nbsp;</td></tr>"; 
+	print "<td>&nbsp;</td></tr>";
 
     print "</table>";
-	
+
 	print '</form>';
-	
+
     $db->free($result);
 }
 else
@@ -177,6 +185,6 @@ else
 }
 
 
-$db->close();
-
 llxFooter();
+
+$db->close();
diff --git a/htdocs/compta/ventilation/card.php b/htdocs/compta/ventilation/card.php
new file mode 100644
index 00000000000..7201dfe9e29
--- /dev/null
+++ b/htdocs/compta/ventilation/card.php
@@ -0,0 +1,165 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ *     \file       htdocs/compta/ventilation/card.php
+ *     \ingroup    compta
+ *     \brief      Page fiche ventilation
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+$langs->load("bills");
+
+$mesg = '';
+
+if (!$user->rights->compta->ventilation->creer) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+if ($_POST["action"] == 'ventil' && $user->rights->compta->ventilation->creer)
+{
+  $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
+  $sql .= " SET fk_code_ventilation = ".$_POST["codeventil"];
+  $sql .= " WHERE rowid = ".$_GET["id"];
+
+  $db->query($sql);
+}
+
+llxHeader("","","Fiche ventilation");
+
+if ($cancel == $langs->trans("Cancel"))
+{
+  $action = '';
+}
+/*
+ *
+ *
+ */
+
+$sql = "SELECT rowid, numero, intitule";
+$sql .= " FROM ".MAIN_DB_PREFIX."compta_compte_generaux";
+$sql .= " ORDER BY numero ASC";
+
+$result = $db->query($sql);
+if ($result)
+{
+  $num = $db->num_rows($result);
+  $i = 0;
+
+  while ($i < $num)
+    {
+      $row = $db->fetch_row($result);
+      $cgs[$row[0]] = $row[1] . ' ' . $row[2];
+      $i++;
+    }
+}
+
+/*
+ * Cr�ation
+ *
+ */
+$form = new Form($db);
+$facture_static=new Facture($db);
+
+if($_GET["id"])
+{
+    $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,";
+    $sql .= " l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,";
+    $sql .= " l.date_start as date_start, l.date_end as date_end,";
+    $sql .= " l.fk_code_ventilation ";
+    $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l";
+    $sql .= " , ".MAIN_DB_PREFIX."facture as f";
+    $sql .= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND l.rowid = ".$_GET["id"];
+
+    $result = $db->query($sql);
+    if ($result)
+    {
+        $num_lignes = $db->num_rows($result);
+        $i = 0;
+
+        if ($num_lignes)
+        {
+
+            $objp = $db->fetch_object($result);
+
+
+            if($objp->fk_code_ventilation == 0)
+            {
+                print '<form action="card.php?id='.$_GET["id"].'" method="post">'."\n";
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="ventil">';
+            }
+
+
+            print_fiche_titre("Ventilation");
+
+            print '<table class="border" width="100%">';
+
+			// Ref facture
+            print '<tr><td>'.$langs->trans("Invoice").'</td>';
+			$facture_static->ref=$objp->facnumber;
+			$facture_static->id=$objp->facid;
+			print '<td>'.$facture_static->getNomUrl(1).'</td>';
+            print '</tr>';
+
+            print '<tr><td width="20%">Ligne</td>';
+            print '<td>'.nl2br($objp->description).'</td></tr>';
+            print '<tr><td width="20%">Ventiler dans le compte :</td><td>';
+
+            if($objp->fk_code_ventilation == 0)
+            {
+                print $form->selectarray("codeventil",$cgs, $objp->fk_code_ventilation);
+            }
+            else
+            {
+                print $cgs[$objp->fk_code_ventilation];
+            }
+
+            print '</td></tr>';
+
+            if($objp->fk_code_ventilation == 0)
+            {
+                print '<tr><td>&nbsp;</td><td><input type="submit" class="button" value="'.$langs->trans("Ventiler").'"></td></tr>';
+            }
+            print '</table>';
+            print '</form>';
+        }
+        else
+        {
+            print "Error";
+        }
+    }
+    else
+    {
+        print "Error";
+    }
+}
+else
+{
+    print "Error ID incorrect";
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/ventilation/fiche.php b/htdocs/compta/ventilation/fiche.php
deleted file mode 100644
index b55f2b59475..00000000000
--- a/htdocs/compta/ventilation/fiche.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *     \file       htdocs/compta/ventilation/fiche.php
- *     \ingroup    compta
- *     \brief      Page fiche ventilation
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-$langs->load("bills");
-
-$mesg = '';
-
-if (!$user->rights->compta->ventilation->creer) accessforbidden();
-
-
-/*
- * Actions
- */
-
-if ($_POST["action"] == 'ventil' && $user->rights->compta->ventilation->creer)
-{
-  $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
-  $sql .= " SET fk_code_ventilation = ".$_POST["codeventil"];
-  $sql .= " WHERE rowid = ".$_GET["id"];
-
-  $db->query($sql);
-}
-
-llxHeader("","","Fiche ventilation");
-
-if ($cancel == $langs->trans("Cancel"))
-{
-  $action = '';
-}
-/*
- *
- *
- */
-
-$sql = "SELECT rowid, numero, intitule";
-$sql .= " FROM ".MAIN_DB_PREFIX."compta_compte_generaux";
-$sql .= " ORDER BY numero ASC";
-
-$result = $db->query($sql);
-if ($result)
-{
-  $num = $db->num_rows($result);
-  $i = 0;
-
-  while ($i < $num)
-    {
-      $row = $db->fetch_row($result);
-      $cgs[$row[0]] = $row[1] . ' ' . $row[2];
-      $i++;
-    }
-}
-
-/*
- * Cr�ation
- *
- */
-$form = new Form($db);
-$facture_static=new Facture($db);
-
-if($_GET["id"])
-{
-    $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.price,";
-    $sql .= " l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice,";
-    $sql .= " l.date_start as date_start, l.date_end as date_end,";
-    $sql .= " l.fk_code_ventilation ";
-    $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l";
-    $sql .= " , ".MAIN_DB_PREFIX."facture as f";
-    $sql .= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND l.rowid = ".$_GET["id"];
-
-    $result = $db->query($sql);
-    if ($result)
-    {
-        $num_lignes = $db->num_rows($result);
-        $i = 0;
-
-        if ($num_lignes)
-        {
-
-            $objp = $db->fetch_object($result);
-
-
-            if($objp->fk_code_ventilation == 0)
-            {
-                print '<form action="fiche.php?id='.$_GET["id"].'" method="post">'."\n";
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="action" value="ventil">';
-            }
-
-
-            print_fiche_titre("Ventilation");
-
-            print '<table class="border" width="100%">';
-
-			// Ref facture
-            print '<tr><td>'.$langs->trans("Invoice").'</td>';
-			$facture_static->ref=$objp->facnumber;
-			$facture_static->id=$objp->facid;
-			print '<td>'.$facture_static->getNomUrl(1).'</td>';
-            print '</tr>';
-
-            print '<tr><td width="20%">Ligne</td>';
-            print '<td>'.nl2br($objp->description).'</td></tr>';
-            print '<tr><td width="20%">Ventiler dans le compte :</td><td>';
-
-            if($objp->fk_code_ventilation == 0)
-            {
-                print $form->selectarray("codeventil",$cgs, $objp->fk_code_ventilation);
-            }
-            else
-            {
-                print $cgs[$objp->fk_code_ventilation];
-            }
-
-            print '</td></tr>';
-
-            if($objp->fk_code_ventilation == 0)
-            {
-                print '<tr><td>&nbsp;</td><td><input type="submit" class="button" value="'.$langs->trans("Ventiler").'"></td></tr>';
-            }
-            print '</table>';
-            print '</form>';
-        }
-        else
-        {
-            print "Error";
-        }
-    }
-    else
-    {
-        print "Error";
-    }
-}
-else
-{
-    print "Error ID incorrect";
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/ventilation/fournisseur/card.php b/htdocs/compta/ventilation/fournisseur/card.php
new file mode 100644
index 00000000000..d62694512fc
--- /dev/null
+++ b/htdocs/compta/ventilation/fournisseur/card.php
@@ -0,0 +1,149 @@
+<?php
+/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ *      \file       htdocs/compta/ventilation/fournisseur/card.php
+ *      \ingroup    compta
+ *      \brief      Page fiche ventilation
+ */
+
+require '../../../main.inc.php';
+
+$mesg = '';
+
+if (!$user->rights->compta->ventilation->creer) accessforbidden();
+
+if ($_POST["action"] == 'ventil' && $user->rights->compta->ventilation->creer)
+{
+  $sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
+  $sql .= " SET fk_code_ventilation = ".$_POST["codeventil"];
+  $sql .= " WHERE rowid = ".$_GET["id"];
+
+  $db->query($sql);
+}
+
+llxHeader("","","Fiche ventilation");
+
+if ($cancel == $langs->trans("Cancel"))
+{
+  $action = '';
+}
+/*
+ *
+ *
+ */
+
+$sql = "SELECT rowid, numero, intitule";
+$sql .= " FROM ".MAIN_DB_PREFIX."compta_compte_generaux";
+$sql .= " ORDER BY numero ASC";
+
+$result = $db->query($sql);
+if ($result)
+{
+  $num = $db->num_rows($result);
+  $i = 0;
+
+  while ($i < $num)
+    {
+      $row = $db->fetch_row($result);
+      $cgs[$row[0]] = $row[1] . ' ' . $row[2];
+      $i++;
+    }
+}
+
+/*
+ * Creation
+ *
+ */
+$form = new Form($db);
+
+if($_GET["id"])
+{
+  $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc, l.qty, l.rowid, l.tva_tx, l.fk_code_ventilation ";
+  $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
+  $sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f";
+  $sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND l.rowid = ".$_GET["id"];
+
+  $result = $db->query($sql);
+
+  if ($result)
+    {
+      $num_lignes = $db->num_rows($result);
+      $i = 0;
+
+      if ($num_lignes)
+	{
+
+	  $objp = $db->fetch_object($result);
+
+
+	  if($objp->fk_code_ventilation == 0)
+	    {
+	      print '<form action="card.php?id='.$_GET["id"].'" method="post">'."\n";
+	      print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	      print '<input type="hidden" name="action" value="ventil">';
+	    }
+
+
+	  print_titre("Ventilation");
+
+	  print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
+	  print '<tr><td>Facture</td>';
+      print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a></td></tr>';
+
+	  print '<tr><td width="20%">Ligne</td>';
+	  print '<td>'.stripslashes(nl2br($objp->description)).'</td></tr>';
+	  print '<tr><td width="20%">Ventiler dans le compte :</td><td>';
+
+	  if($objp->fk_code_ventilation == 0)
+	    {
+	      print $form->selectarray("codeventil",$cgs, $objp->fk_code_ventilation);
+	    }
+	  else
+	    {
+	      print $cgs[$objp->fk_code_ventilation];
+	    }
+
+	  print '</td></tr>';
+
+	  if($objp->fk_code_ventilation == 0)
+	    {
+	      print '<tr><td>&nbsp;</td><td><input type="submit" value="'.$langs->trans("Ventiler").'"></td></tr>';
+	    }
+	  print '</table>';
+	  print '</form>';
+	}
+      else
+	{
+	  print "Error";
+	}
+    }
+  else
+    {
+      print "Error";
+    }
+}
+else
+{
+  print "Error ID incorrect";
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/ventilation/fournisseur/fiche.php b/htdocs/compta/ventilation/fournisseur/fiche.php
deleted file mode 100644
index 168b99eea35..00000000000
--- a/htdocs/compta/ventilation/fournisseur/fiche.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *      \file       htdocs/compta/ventilation/fournisseur/fiche.php
- *      \ingroup    compta
- *      \brief      Page fiche ventilation
- */
-
-require '../../../main.inc.php';
-
-$mesg = '';
-
-if (!$user->rights->compta->ventilation->creer) accessforbidden();
-
-if ($_POST["action"] == 'ventil' && $user->rights->compta->ventilation->creer)
-{
-  $sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
-  $sql .= " SET fk_code_ventilation = ".$_POST["codeventil"];
-  $sql .= " WHERE rowid = ".$_GET["id"];
-
-  $db->query($sql);
-}
-
-llxHeader("","","Fiche ventilation");
-
-if ($cancel == $langs->trans("Cancel"))
-{
-  $action = '';
-}
-/*
- *
- *
- */
-
-$sql = "SELECT rowid, numero, intitule";
-$sql .= " FROM ".MAIN_DB_PREFIX."compta_compte_generaux";
-$sql .= " ORDER BY numero ASC";
-
-$result = $db->query($sql);
-if ($result)
-{
-  $num = $db->num_rows($result);
-  $i = 0;
-
-  while ($i < $num)
-    {
-      $row = $db->fetch_row($result);
-      $cgs[$row[0]] = $row[1] . ' ' . $row[2];
-      $i++;
-    }
-}
-
-/*
- * Creation
- *
- */
-$form = new Form($db);
-
-if($_GET["id"])
-{
-  $sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc, l.qty, l.rowid, l.tva_tx, l.fk_code_ventilation ";
-  $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
-  $sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f";
-  $sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND l.rowid = ".$_GET["id"];
-
-  $result = $db->query($sql);
-
-  if ($result)
-    {
-      $num_lignes = $db->num_rows($result);
-      $i = 0;
-
-      if ($num_lignes)
-	{
-
-	  $objp = $db->fetch_object($result);
-
-
-	  if($objp->fk_code_ventilation == 0)
-	    {
-	      print '<form action="fiche.php?id='.$_GET["id"].'" method="post">'."\n";
-	      print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	      print '<input type="hidden" name="action" value="ventil">';
-	    }
-
-
-	  print_titre("Ventilation");
-
-	  print '<table class="border" width="100%" cellspacing="0" cellpadding="4">';
-	  print '<tr><td>Facture</td>';
-      print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a></td></tr>';
-
-	  print '<tr><td width="20%">Ligne</td>';
-	  print '<td>'.stripslashes(nl2br($objp->description)).'</td></tr>';
-	  print '<tr><td width="20%">Ventiler dans le compte :</td><td>';
-
-	  if($objp->fk_code_ventilation == 0)
-	    {
-	      print $form->selectarray("codeventil",$cgs, $objp->fk_code_ventilation);
-	    }
-	  else
-	    {
-	      print $cgs[$objp->fk_code_ventilation];
-	    }
-
-	  print '</td></tr>';
-
-	  if($objp->fk_code_ventilation == 0)
-	    {
-	      print '<tr><td>&nbsp;</td><td><input type="submit" value="'.$langs->trans("Ventiler").'"></td></tr>';
-	    }
-	  print '</table>';
-	  print '</form>';
-	}
-      else
-	{
-	  print "Error";
-	}
-    }
-  else
-    {
-      print "Error";
-    }
-}
-else
-{
-  print "Error ID incorrect";
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/ventilation/fournisseur/index.php b/htdocs/compta/ventilation/fournisseur/index.php
deleted file mode 100644
index ebd4d2c4af5..00000000000
--- a/htdocs/compta/ventilation/fournisseur/index.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *    \file       htdocs/compta/ventilation/fournisseur/index.php
- *    \ingroup    compta
- *    \brief      Page accueil ventilation
- */
-
-require '../../../main.inc.php';
-$langs->load("suppliers");
-
-
-llxHeader('','Compta - Ventilation');
-
-print_titre("Ventilation Comptable");
-
-print '<table border="0" width="100%">';
-
-print '<tr><td valign="top" width="30%">';
-
-
-
-$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet";
-$sql .= " WHERE fk_code_ventilation = 0";
-$result = $db->query($sql);
-if ($result)
-{
-  $row = $db->fetch_row($result);
-  $nbfac = $row[0];
-
-  $db->free($result);
-}
-
-$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."paiement";
-$sql .= " WHERE fk_code_ventilation = 0";
-
-$result = $db->query($sql);
-if ($result)
-{
-  $row = $db->fetch_row($result);
-  $nbp = $row[0];
-
-  $db->free($result);
-}
-
-$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facture_fourn_det";
-$sql .= " WHERE fk_code_ventilation = 0";
-$result = $db->query($sql);
-if ($result)
-{
-  $row = $db->fetch_row($result);
-  $nbfacfourn = $row[0];
-
-  $db->free($result);
-}
-
-/*$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."paiementfourn";
-$sql .= " WHERE fk_code_ventilation = 0";
-
-$result = $db->query($sql);
-if ($result)
-{
-  $row = $db->fetch_row($result);
-  $nbpfourn = $row[0];
-
-  $db->free($result);
-}*/
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td colspan="2">Lignes a ventiler</tr>';
-print '<tr class="liste_titre"><td>Type</td><td align="center">Nb</td></tr>';
-print '<tr><td>Factures clients</td><td align="center">'.$nbfac.'</td></tr>';
-print '<tr><td>Paiements clients</td><td align="center">'.$nbp.'</td></tr>';
-print '<tr><td>Factures fournisseurs</td><td align="center">'.$nbfacfourn.'</td></tr>';
-//print '<tr><td>Paiements fournisseurs</td><td align="center">'.$nbpfourn.'</td></tr>';
-print "</table>\n";
-
-print '</td><td valign="top">';
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td>Type</td><td align="center">Nb de lignes</td></tr>';
-
-$sql = "SELECT count(*), ccg.intitule FROM ".MAIN_DB_PREFIX."facturedet as fd";
-$sql .= " ,".MAIN_DB_PREFIX."compta_compte_generaux as ccg";
-$sql .= " WHERE fd.fk_code_ventilation = ccg.rowid";
-$sql .= " GROUP BY ccg.rowid";
-
-$resql = $db->query($sql);
-if ($resql)
-{
-  $i = 0;
-  $num = $db->num_rows($resql);
-
-  while ($i < $num)
-    {
-
-      $row = $db->fetch_row($resql);
-
-      print '<tr><td>'.$row[1].'</td><td align="center">'.$row[0].'</td></tr>';
-      $i++;
-    }
-  $db->free($resql);
-}
-print "</table>\n";
-
-print '</td></tr></table>';
-
-llxFooter();
-
diff --git a/htdocs/compta/ventilation/fournisseur/lignes.php b/htdocs/compta/ventilation/fournisseur/lignes.php
deleted file mode 100644
index cb2a0e1439a..00000000000
--- a/htdocs/compta/ventilation/fournisseur/lignes.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2005		Simon TOSSER			<simon@kornog-computing.com>
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *   \file       htdocs/compta/ventilation/fournisseur/lignes.php
- *   \ingroup    facture
- *   \brief      Page de detail des lignes de ventilation d'une facture
- */
-
-require '../../../main.inc.php';
-
-$langs->load("bills");
-
-if (!$user->rights->facture->lire) accessforbidden();
-if (!$user->rights->compta->ventilation->creer) accessforbidden();
-/*
- * Securite acces client
- */
-if ($user->societe_id > 0) accessforbidden();
-
-llxHeader('');
-
-/*
- * Lignes de factures
- *
- */
-$page = $_GET["page"];
-if ($page < 0) $page = 0;
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc as price, l.qty, l.rowid, l.tva_tx, l.fk_code_ventilation, c.intitule, c.numero ";
-$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
-$sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f";
-$sql .= " , ".MAIN_DB_PREFIX."compta_compte_generaux as c";
-
-$sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND l.fk_code_ventilation <> 0 ";
-$sql .= " AND c.rowid = l.fk_code_ventilation";
-
-if (dol_strlen(trim($_GET["search_facture"])))
-{
-  $sql .= " AND f.facnumber like '%".$_GET["search_facture"]."%'";
-}
-
-$sql .= " ORDER BY l.rowid DESC";
-$sql .= $db->plimit($limit+1,$offset);
-
-$result = $db->query($sql);
-
-if ($result)
-{
-  $num_lignes = $db->num_rows($result);
-  $i = 0;
-
-  print_barre_liste("Lignes de facture ventilées",$page,"lignes.php","",$sortfield,$sortorder,'',$num_lignes);
-
-  print '<form method="GET" action="lignes.php">';
-  print '<table class="noborder" width="100%">';
-  print "<tr class=\"liste_titre\"><td>Facture</td>";
-  print '<td>'.$langs->trans("Description").'</td>';
-  print '<td align="right">'.$langs->trans("Montant").'</td>';
-  print '<td colspan="2" align="center">'.$langs->trans("Compte").'</td>';
-  print "</tr>\n";
-
-  print '<tr class="liste_titre"><td><input name="search_facture" size="8" value="'.$_GET["search_facture"].'"></td>';
-  print '<td><input type="submit"></td>';
-  print '<td align="right">&nbsp;</td>';
-  print '<td align="center">&nbsp;</td>';
-  print '<td align="center">&nbsp;</td>';
-  print "</tr>\n";
-
-  $var=True;
-  while ($i < min($num_lignes, $limit))
-    {
-      $objp = $db->fetch_object($result);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-
-      print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a></td>';
-
-      print '<td>'.stripslashes(nl2br($objp->description)).'</td>';
-      print '<td align="right">'.price($objp->price).'</td>';
-      print '<td align="right">'.$objp->numero.'</td>';
-      print '<td align="left">'.stripslashes($objp->intitule).'</td>';
-
-      print "</tr>";
-      $i++;
-    }
-}
-else
-{
-  print $db->error();
-}
-
-print "</table></form>";
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/ventilation/fournisseur/list.php b/htdocs/compta/ventilation/fournisseur/list.php
new file mode 100644
index 00000000000..5213a4686be
--- /dev/null
+++ b/htdocs/compta/ventilation/fournisseur/list.php
@@ -0,0 +1,105 @@
+<?php
+/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+/**
+ *   \file       htdocs/compta/ventilation/list.php
+ *   \ingroup    compta
+ *   \brief      Page de ventilation des lignes de facture
+ */
+
+require '../../../main.inc.php';
+
+$langs->load("bills");
+
+if (!$user->rights->facture->lire) accessforbidden();
+if (!$user->rights->compta->ventilation->creer) accessforbidden();
+/*
+ * Securite acces client
+ */
+if ($user->societe_id > 0) accessforbidden();
+
+
+llxHeader('','Ventilation');
+
+/*
+ * Lignes de factures
+ *
+ */
+$page = $_GET["page"];
+if ($page < 0) $page = 0;
+$limit = $conf->liste_limit;
+$offset = $limit * $page ;
+
+$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc as price, l.rowid, l.fk_code_ventilation ";
+$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
+$sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f";
+$sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND fk_code_ventilation = 0";
+$sql .= " ORDER BY l.rowid DESC ".$db->plimit($limit+1,$offset);
+
+$result = $db->query($sql);
+if ($result)
+{
+  $num_lignes = $db->num_rows($result);
+  $i = 0;
+
+  print_barre_liste("Lignes de facture à ventiler",$page,"list.php","",$sortfield,$sortorder,'',$num_lignes);
+
+  print '<table class="noborder" width="100%">';
+  print '<tr class="liste_titre"><td>Facture</td>';
+  print '<td>'.$langs->trans("Description").'</td>';
+  print '<td align="right">&nbsp;</td>';
+  print '<td>&nbsp;</td>';
+  print "</tr>\n";
+
+  $var=True;
+  while ($i < min($num_lignes, $limit))
+    {
+      $objp = $db->fetch_object($result);
+      $var=!$var;
+      print "<tr ".$bc[$var].">";
+
+      print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a></td>';
+      print '<td>'.stripslashes(nl2br($objp->description)).'</td>';
+
+      print '<td align="right">';
+      print price($objp->price);
+      print '</td>';
+
+      print '<td align="right"><a href="card.php?id='.$objp->rowid.'">';
+      print img_edit();
+      print '</a></td>';
+
+      print "</tr>";
+      $i++;
+    }
+
+print "</table>";
+
+
+
+}
+else
+{
+  print $db->error();
+}
+$db->close();
+
+llxFooter();
diff --git a/htdocs/compta/ventilation/fournisseur/liste.php b/htdocs/compta/ventilation/fournisseur/liste.php
deleted file mode 100644
index e3eb4cf487d..00000000000
--- a/htdocs/compta/ventilation/fournisseur/liste.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-
-/**
- *   \file       htdocs/compta/ventilation/liste.php
- *   \ingroup    compta
- *   \brief      Page de ventilation des lignes de facture
- */
-
-require '../../../main.inc.php';
-
-$langs->load("bills");
-
-if (!$user->rights->facture->lire) accessforbidden();
-if (!$user->rights->compta->ventilation->creer) accessforbidden();
-/*
- * Securite acces client
- */
-if ($user->societe_id > 0) accessforbidden();
-
-
-llxHeader('','Ventilation');
-
-/*
- * Lignes de factures
- *
- */
-$page = $_GET["page"];
-if ($page < 0) $page = 0;
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, l.total_ttc as price, l.rowid, l.fk_code_ventilation ";
-$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
-$sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f";
-$sql .= " WHERE f.rowid = l.fk_facture_fourn AND f.fk_statut = 1 AND fk_code_ventilation = 0";
-$sql .= " ORDER BY l.rowid DESC ".$db->plimit($limit+1,$offset);
-
-$result = $db->query($sql);
-if ($result)
-{
-  $num_lignes = $db->num_rows($result);
-  $i = 0;
-
-  print_barre_liste("Lignes de facture à ventiler",$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes);
-
-  print '<table class="noborder" width="100%">';
-  print '<tr class="liste_titre"><td>Facture</td>';
-  print '<td>'.$langs->trans("Description").'</td>';
-  print '<td align="right">&nbsp;</td>';
-  print '<td>&nbsp;</td>';
-  print "</tr>\n";
-
-  $var=True;
-  while ($i < min($num_lignes, $limit))
-    {
-      $objp = $db->fetch_object($result);
-      $var=!$var;
-      print "<tr ".$bc[$var].">";
-
-      print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a></td>';
-      print '<td>'.stripslashes(nl2br($objp->description)).'</td>';
-
-      print '<td align="right">';
-      print price($objp->price);
-      print '</td>';
-
-      print '<td align="right"><a href="fiche.php?id='.$objp->rowid.'">';
-      print img_edit();
-      print '</a></td>';
-
-      print "</tr>";
-      $i++;
-    }
-
-print "</table>";
-
-
-
-}
-else
-{
-  print $db->error();
-}
-$db->close();
-
-llxFooter();
diff --git a/htdocs/compta/ventilation/index.php b/htdocs/compta/ventilation/index.php
deleted file mode 100644
index 8b9710844a7..00000000000
--- a/htdocs/compta/ventilation/index.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- *   \file       htdocs/compta/ventilation/index.php
- *   \ingroup    compta
- *   \brief      Page accueil ventilation
- */
-
-require '../../main.inc.php';
-
-$langs->load("compta");
-$langs->load("bills");
-
-llxHeader('','Compta - Ventilation');
-
-print_fiche_titre("Ventilation Comptable");
-
-//print '<table border="0" width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
-print '<div class="fichecenter"><div class="fichethirdleft">';
-
-$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet as fd";
-$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";
-
-$result = $db->query($sql);
-if ($result)
-{
-  $row = $db->fetch_row($result);
-  $nbfac = $row[0];
-
-  $db->free($result);
-}
-
-$var=true;
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Lines").'</tr>';
-print '<tr class="liste_titre"><td>'.$langs->trans("Type").'</td><td align="right">'.$langs->trans("Nb").'</td></tr>';
-$var=!$var;
-print "<tr ".$bc[$var].">".'<td>'.$langs->trans("Invoices").'</td><td align="right">'.$nbfac.'</td></tr>';
-$var=!$var;
-print "</table>\n";
-
-
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
-
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Type").'</td><td align="center">'.$langs->trans("NbOfLines").'</td><td align="center">'.$langs->trans("AccountNumber").'</td><td align="center">'.$langs->trans("TransID").'</td></tr>';
-
-$sql = "SELECT count(*), ccg.intitule, ccg.rowid,ccg.numero FROM ".MAIN_DB_PREFIX."facturedet as fd";
-$sql.= " ,".MAIN_DB_PREFIX."compta_compte_generaux as ccg";
-$sql.= " WHERE fd.fk_code_ventilation = ccg.rowid";
-$sql.= " GROUP BY ccg.rowid";
-
-$resql = $db->query($sql);
-if ($resql)
-{
-    $i = 0;
-    $num = $db->num_rows($resql);
-    $var=true;
-
-    while ($i < $num)
-    {
-
-        $row = $db->fetch_row($resql);
-        $var=!$var;
-        print '<tr '.$bc[$var].'><td>'.$row[1].'</td><td align="center">'.$row[0].'</td>';
-        print '<td align="center">'.$row[3].'</td><td align="center">'.$row[2].'</td></tr>';
-        $i++;
-    }
-    $db->free($resql);
-}
-print "</table>\n";
-
-//print '</td></tr></table>';
-print '</div></div></div>';
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php
deleted file mode 100644
index 46276937afe..00000000000
--- a/htdocs/compta/ventilation/lignes.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005	Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006		Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * 		\file       htdocs/compta/ventilation/lignes.php
- * 		\ingroup    facture
- * 		\brief      Page de detail des lignes de ventilation d'une facture
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-$langs->load("bills");
-$langs->load("compta");
-
-if (!$user->rights->facture->lire) accessforbidden();
-if (!$user->rights->compta->ventilation->creer) accessforbidden();
-
-// Securite acces client
-if ($user->societe_id > 0) accessforbidden();
-
-
-llxHeader('');
-
-/*
-* Lignes de factures
-*
-*/
-$page = $_GET["page"];
-if ($page < 0) $page = 0;
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, f.total_ttc as price, l.qty, l.rowid, l.tva_tx, l.fk_code_ventilation, c.intitule, c.numero,";
-$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
-$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-$sql.= " , ".MAIN_DB_PREFIX."compta_compte_generaux as c";
-$sql.= " , ".MAIN_DB_PREFIX."facturedet as l";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-$sql.= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND l.fk_code_ventilation <> 0 ";
-$sql.= " AND f.entity = ".$conf->entity;
-$sql.= " AND c.rowid = l.fk_code_ventilation";
-if (dol_strlen(trim($_GET["search_facture"])))
-{
-	$sql .= " AND f.facnumber LIKE '%".$_GET["search_facture"]."%'";
-}
-
-$sql .= " ORDER BY l.rowid DESC";
-$sql .= $db->plimit($limit+1,$offset);
-
-$result = $db->query($sql);
-
-if ($result)
-{
-	$num_lignes = $db->num_rows($result);
-	$i = 0;
-
-	print_barre_liste($langs->trans("InvoiceDispatched"),$page,"lignes.php","",$sortfield,$sortorder,'',$num_lignes);
-
-	print '<form method="GET" action="lignes.php">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Invoice").'</td>';
-	print '<td>'.$langs->trans("Ref").'</td>';
-	print '<td>'.$langs->trans("Label").'</td>';
-	print '<td>'.$langs->trans("Description").'</td>';
-	print '<td align="left">'.$langs->trans("Montant").'</td>';
-	print '<td colspan="2" align="left">'.$langs->trans("Compte").'</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre"><td><input name="search_facture" size="8" value="'.$_GET["search_facture"].'"></td>';
-	print '<td>&nbsp;</td>';
-	print '<td align="right">&nbsp;</td>';
-	print '<td align="right">&nbsp;</td>';
-	print '<td align="center">&nbsp;</td>';
-	print '<td align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td>';
-	print "</tr>\n";
-
-	$facture_static=new Facture($db);
-	$product_static=new Product($db);
-
-	$var=True;
-	while ($i < min($num_lignes, $limit))
-	{
-		$objp = $db->fetch_object($result);
-		$var=!$var;
-		$codeCompta = $objp->numero.' '.$objp->intitule;
-
-		print "<tr ".$bc[$var].">";
-
-		// Ref facture
-		$facture_static->ref=$objp->facnumber;
-		$facture_static->id=$objp->facid;
-		print '<td>'.$facture_static->getNomUrl(1).'</td>';
-
-		// Ref produit
-		$product_static->ref=$objp->product_ref;
-		$product_static->id=$objp->product_id;
-		$product_static->type=$objp->type;
-		print '<td>';
-		if ($product_static->id) print $product_static->getNomUrl(1);
-		else print '&nbsp;';
-		print '</td>';
-
-		print '<td>'.dol_trunc($objp->product_label,24).'</td>';
-		print '<td>'.nl2br(dol_trunc($objp->description,32)).'</td>';
-		print '<td align="left">'.price($objp->price).'</td>';
-		print '<td align="left">'.$codeCompta.'</td>';
-
-		print "</tr>";
-		$i++;
-	}
-}
-else
-{
-	print $db->error();
-}
-
-print "</table></form>";
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/compta/ventilation/list.php b/htdocs/compta/ventilation/list.php
new file mode 100644
index 00000000000..03a1b658cd2
--- /dev/null
+++ b/htdocs/compta/ventilation/list.php
@@ -0,0 +1,129 @@
+<?php
+/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+/**
+ * 		\file       htdocs/compta/ventilation/list.php
+ * 		\ingroup    compta
+ * 		\brief      Page de ventilation des lignes de facture
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+$langs->load("compta");
+$langs->load("bills");
+
+if (!$user->rights->facture->lire) accessforbidden();
+if (!$user->rights->compta->ventilation->creer) accessforbidden();
+
+// Securite acces client
+if ($user->societe_id > 0) accessforbidden();
+
+
+llxHeader('','Ventilation');
+
+/*
+ * Lignes de factures
+ */
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$limit = $conf->liste_limit;
+
+$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, f.total as price, l.rowid, l.fk_code_ventilation,";
+$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
+$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+$sql.= " , ".MAIN_DB_PREFIX."facturedet as l";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
+$sql.= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND fk_code_ventilation = 0";
+$sql.= " AND f.entity = ".$conf->entity;
+$sql.= " ORDER BY l.rowid DESC ".$db->plimit($limit+1,$offset);
+
+$result = $db->query($sql);
+if ($result)
+{
+	$num_lignes = $db->num_rows($result);
+	$i = 0;
+
+	print_barre_liste($langs->trans("InvoiceLinesToDispatch"),$page,"list.php","",$sortfield,$sortorder,'',$num_lignes);
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Invoice").'</td>';
+	print '<td>'.$langs->trans("Ref").'</td>';
+	print '<td>'.$langs->trans("Label").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td align="right">'.$langs->trans("Montant").'</td>';
+	print '<td>&nbsp;</td>';
+	print "</tr>\n";
+
+	$facture_static=new Facture($db);
+	$product_static=new Product($db);
+
+	$var=True;
+	while ($i < min($num_lignes, $limit))
+	{
+		$objp = $db->fetch_object($result);
+		$var=!$var;
+		print "<tr ".$bc[$var].">";
+
+		// Ref facture
+		$facture_static->ref=$objp->facnumber;
+		$facture_static->id=$objp->facid;
+		print '<td>'.$facture_static->getNomUrl(1).'</td>';
+
+		// Ref produit
+		$product_static->ref=$objp->product_ref;
+		$product_static->id=$objp->product_id;
+		$product_static->type=$objp->type;
+		print '<td>';
+		if ($product_static->id) print $product_static->getNomUrl(1);
+		else print '&nbsp;';
+		print '</td>';
+
+		print '<td>'.dol_trunc($objp->product_label,24).'</td>';
+		print '<td>'.nl2br(dol_trunc($objp->description,32)).'</td>';
+
+		print '<td align="right">';
+		print price($objp->price);
+		print '</td>';
+
+		print '<td align="right"><a href="card.php?id='.$objp->rowid.'">';
+		print img_edit();
+		print '</a></td>';
+
+		print "</tr>";
+		$i++;
+	}
+	print "</table>";
+}
+else
+{
+	print $db->error();
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php
deleted file mode 100644
index effa7689821..00000000000
--- a/htdocs/compta/ventilation/liste.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-
-/**
- * 		\file       htdocs/compta/ventilation/liste.php
- * 		\ingroup    compta
- * 		\brief      Page de ventilation des lignes de facture
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-$langs->load("compta");
-$langs->load("bills");
-
-if (!$user->rights->facture->lire) accessforbidden();
-if (!$user->rights->compta->ventilation->creer) accessforbidden();
-
-// Securite acces client
-if ($user->societe_id > 0) accessforbidden();
-
-
-llxHeader('','Ventilation');
-
-/*
- * Lignes de factures
- */
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-$limit = $conf->liste_limit;
-
-$sql = "SELECT f.facnumber, f.rowid as facid, l.fk_product, l.description, f.total as price, l.rowid, l.fk_code_ventilation,";
-$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type";
-$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-$sql.= " , ".MAIN_DB_PREFIX."facturedet as l";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-$sql.= " WHERE f.rowid = l.fk_facture AND f.fk_statut = 1 AND fk_code_ventilation = 0";
-$sql.= " AND f.entity = ".$conf->entity;
-$sql.= " ORDER BY l.rowid DESC ".$db->plimit($limit+1,$offset);
-
-$result = $db->query($sql);
-if ($result)
-{
-	$num_lignes = $db->num_rows($result);
-	$i = 0;
-
-	print_barre_liste($langs->trans("InvoiceLinesToDispatch"),$page,"liste.php","",$sortfield,$sortorder,'',$num_lignes);
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Invoice").'</td>';
-	print '<td>'.$langs->trans("Ref").'</td>';
-	print '<td>'.$langs->trans("Label").'</td>';
-	print '<td>'.$langs->trans("Description").'</td>';
-	print '<td align="right">'.$langs->trans("Montant").'</td>';
-	print '<td>&nbsp;</td>';
-	print "</tr>\n";
-
-	$facture_static=new Facture($db);
-	$product_static=new Product($db);
-
-	$var=True;
-	while ($i < min($num_lignes, $limit))
-	{
-		$objp = $db->fetch_object($result);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-
-		// Ref facture
-		$facture_static->ref=$objp->facnumber;
-		$facture_static->id=$objp->facid;
-		print '<td>'.$facture_static->getNomUrl(1).'</td>';
-
-		// Ref produit
-		$product_static->ref=$objp->product_ref;
-		$product_static->id=$objp->product_id;
-		$product_static->type=$objp->type;
-		print '<td>';
-		if ($product_static->id) print $product_static->getNomUrl(1);
-		else print '&nbsp;';
-		print '</td>';
-
-		print '<td>'.dol_trunc($objp->product_label,24).'</td>';
-		print '<td>'.nl2br(dol_trunc($objp->description,32)).'</td>';
-
-		print '<td align="right">';
-		print price($objp->price);
-		print '</td>';
-
-		print '<td align="right"><a href="fiche.php?id='.$objp->rowid.'">';
-		print img_edit();
-		print '</a></td>';
-
-		print "</tr>";
-		$i++;
-	}
-	print "</table>";
-}
-else
-{
-	print $db->error();
-}
-
-llxFooter();
-$db->close();
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 990a10c2500..67147a6d06b 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -12,8 +12,8 @@
 //###################
 
 // dolibarr_main_url_root
-// This parameter defines the root URL of your Dolibarr index.php page.
-// It must link to the htdocs directory htdocs.
+// This parameter defines the root URL of your Dolibarr index.php page without ending "/".
+// It must link to the directory htdocs.
 // In most cases, this is autodetected but it's still required 
 // * to show full url bookmarks for some services (ie: agenda rss export url, ...)
 // * or when using Apache dir aliases (autodetect fails)
@@ -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/conf/index.html b/htdocs/conf/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 50b45918f9c..9e6624dda72 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -450,7 +450,7 @@ abstract class ActionsContactCardCommon
         // We set country_id, and country_code label of the chosen country
         if ($this->object->country_id)
         {
-            $sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_pays WHERE rowid = ".$this->object->country_id;
+            $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -460,9 +460,9 @@ abstract class ActionsContactCardCommon
             {
                 dol_print_error($this->db);
             }
-            $this->object->country_id	=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
+            $this->object->country_id	=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
             $this->object->country_code	=	$obj->code;
-            $this->object->country		=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle;
+            $this->object->country		=	$langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label;
         }
     }
 
diff --git a/htdocs/contact/canvas/default/index.html b/htdocs/contact/canvas/default/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contact/canvas/default/index.php b/htdocs/contact/canvas/default/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/contact/canvas/default/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
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']; ?>
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans("Company"); ?></td>
+	<td><?php echo $langs->trans("ThirdParty"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['company']; ?></td>
 </tr>
 
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'];
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans("Company"); ?></td>
+	<td><?php echo $langs->trans("ThirdParty"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['company']; ?></td>
 </tr>
 
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']
 </tr>
 
 <tr>
-	<td><?php echo $langs->trans("Company"); ?></td>
+	<td><?php echo $langs->trans("ThirdParty"); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['company']; ?></td>
 </tr>
 
diff --git a/htdocs/contact/canvas/default/tpl/index.html b/htdocs/contact/canvas/default/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contact/canvas/default/tpl/index.php b/htdocs/contact/canvas/default/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/contact/canvas/default/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/contact/canvas/index.html b/htdocs/contact/canvas/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contact/canvas/index.php b/htdocs/contact/canvas/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/contact/canvas/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
new file mode 100644
index 00000000000..af07cbb9a62
--- /dev/null
+++ b/htdocs/contact/card.php
@@ -0,0 +1,1147 @@
+<?php
+/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
+ * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Alexandre Spangaro 	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Juanjo Menent	 	<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/contact/card.php
+ *       \ingroup    societe
+ *       \brief      Card of a contact
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+$langs->load("companies");
+$langs->load("users");
+$langs->load("other");
+$langs->load("commercial");
+
+$mesg=''; $error=0; $errors=array();
+
+$action		= (GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view');
+$confirm	= GETPOST('confirm','alpha');
+$backtopage = GETPOST('backtopage','alpha');
+$id			= GETPOST('id','int');
+$socid		= GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+
+$object = new Contact($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$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($id);
+$objcanvas=null;
+$canvas = (! empty($object->canvas)?$object->canvas:GETPOST("canvas"));
+if (! empty($canvas))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+    $objcanvas = new Canvas($db, $action);
+    $objcanvas->getCanvas('contact', 'contactcard', $canvas);
+}
+
+// Security check
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('contactcard','globalcard'));
+
+
+/*
+ *	Actions
+ */
+
+$parameters=array('id'=>$id, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Cancel
+    if (GETPOST("cancel") && ! empty($backtopage))
+    {
+        header("Location: ".$backtopage);
+        exit;
+    }
+
+	// Creation utilisateur depuis contact
+    if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
+    {
+        // Recuperation contact actuel
+        $result = $object->fetch($id);
+
+        if ($result > 0)
+        {
+            $db->begin();
+
+            // Creation user
+            $nuser = new User($db);
+            $result=$nuser->create_from_contact($object,GETPOST("login"));	// Do not use GETPOST(alpha)
+
+            if ($result > 0)
+            {
+                $result2=$nuser->setPassword($user,GETPOST("password"),0,0,1);	// Do not use GETPOST(alpha)
+                if ($result2)
+                {
+                    $db->commit();
+                }
+                else
+                {
+                    $error=$nuser->error; $errors=$nuser->errors;
+                    $db->rollback();
+                }
+            }
+            else
+            {
+                $error=$nuser->error; $errors=$nuser->errors;
+                $db->rollback();
+            }
+        }
+        else
+        {
+            $error=$object->error; $errors=$object->errors;
+        }
+    }
+
+
+    // Confirmation desactivation
+    if ($action == 'disable')
+    {
+    	$object->fetch($id);
+    	if ($object->setstatus(0)<0)
+    	{
+    	    setEventMessage($object->error,'errors');
+    	}
+    	else
+    	{
+        	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+        	exit;
+    	}
+    }
+
+    // Confirmation activation
+    if ($action == 'enable')
+    {
+    	$object->fetch($id);
+        	if ($object->setstatus(1)<0)
+    	{
+    	    setEventMessage($object->error,'errors');
+    	}
+    	else
+    	{
+        	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+        	exit;
+    	}
+    }
+
+    // Add contact
+    if ($action == 'add' && $user->rights->societe->contact->creer)
+    {
+        $db->begin();
+
+        if ($canvas) $object->canvas=$canvas;
+
+        $object->socid			= GETPOST("socid",'int');
+        $object->lastname		= GETPOST("lastname");
+        $object->firstname		= GETPOST("firstname");
+        $object->civility_id	= GETPOST("civility_id",'alpha');
+        $object->poste			= GETPOST("poste");
+        $object->address		= GETPOST("address");
+        $object->zip			= GETPOST("zipcode");
+        $object->town			= GETPOST("town");
+        $object->country_id		= GETPOST("country_id",'int');
+        $object->state_id       = GETPOST("state_id",'int');
+        $object->skype			= GETPOST("skype");
+        $object->email			= GETPOST("email",'alpha');
+        $object->phone_pro		= GETPOST("phone_pro");
+        $object->phone_perso	= GETPOST("phone_perso");
+        $object->phone_mobile	= GETPOST("phone_mobile");
+        $object->fax			= GETPOST("fax");
+        $object->jabberid		= GETPOST("jabberid",'alpha');
+		$object->no_email		= GETPOST("no_email",'int');
+        $object->priv			= GETPOST("priv",'int');
+        $object->note_public	= GETPOST("note_public");
+        $object->note_private	= GETPOST("note_private");
+        $object->statut			= 1; //Defult status to Actif
+
+        // Note: Correct date should be completed with location to have exact GM time of birth.
+        $object->birthday = dol_mktime(0,0,0,GETPOST("birthdaymonth",'int'),GETPOST("birthdayday",'int'),GETPOST("birthdayyear",'int'));
+        $object->birthday_alert = GETPOST("birthday_alert",'alpha');
+
+        // Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+        if (! GETPOST("lastname"))
+        {
+            $error++; $errors[]=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label"));
+            $action = 'create';
+        }
+
+        if (! $error)
+        {
+            $id =  $object->create($user);
+            if ($id <= 0)
+            {
+                $error++; $errors=array_merge($errors,($object->error?array($object->error):$object->errors));
+                $action = 'create';
+            }
+        }
+
+        if (! $error && $id > 0)
+        {
+            $db->commit();
+            if (! empty($backtopage)) $url=$backtopage;
+            else $url='card.php?id='.$id;
+            header("Location: ".$url);
+            exit;
+        }
+        else
+        {
+            $db->rollback();
+        }
+    }
+
+    if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->contact->supprimer)
+    {
+        $result=$object->fetch($id);
+
+        $object->old_lastname      = GETPOST("old_lastname");
+        $object->old_firstname = GETPOST("old_firstname");
+
+        $result = $object->delete();
+        if ($result > 0)
+        {
+        	if ($backtopage)
+        	{
+        		header("Location: ".$backtopage);
+        		exit;
+        	}
+        	else
+        	{
+        		header("Location: ".DOL_URL_ROOT.'/contact/list.php');
+        		exit;
+        	}
+        }
+        else
+        {
+            setEventMessage($object->error,$object->errors,'errors');
+        }
+    }
+
+    if ($action == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact->creer)
+    {
+        if (empty($_POST["lastname"]))
+        {
+            $error++; $errors=array($langs->trans("ErrorFieldRequired",$langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
+            $action = 'edit';
+        }
+
+        if (! $error)
+        {
+        	$contactid=GETPOST("contactid",'int');
+
+            $object->fetch($contactid);
+
+            $object->oldcopy=dol_clone($object);
+
+            $object->old_lastname	= GETPOST("old_lastname");
+            $object->old_firstname	= GETPOST("old_firstname");
+
+            $object->socid			= GETPOST("socid",'int');
+            $object->lastname		= GETPOST("lastname");
+            $object->firstname		= GETPOST("firstname");
+            $object->civility_id	= GETPOST("civility_id",'alpha');
+            $object->poste			= GETPOST("poste");
+
+            $object->address		= GETPOST("address");
+            $object->zip			= GETPOST("zipcode");
+            $object->town			= GETPOST("town");
+            $object->state_id   	= GETPOST("state_id",'int');
+            $object->country_id		= GETPOST("country_id",'int');
+
+            $object->email			= GETPOST("email",'alpha');
+            $object->skype			= GETPOST("skype",'alpha');
+            $object->phone_pro		= GETPOST("phone_pro");
+            $object->phone_perso	= GETPOST("phone_perso");
+            $object->phone_mobile	= GETPOST("phone_mobile");
+            $object->fax			= GETPOST("fax");
+            $object->jabberid		= GETPOST("jabberid",'alpha');
+			$object->no_email		= GETPOST("no_email",'int');
+            $object->priv			= GETPOST("priv",'int');
+        	$object->note_public	= GETPOST("note_public");
+       		$object->note_private	= GETPOST("note_private");
+
+            // Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+            $result = $object->update($contactid, $user);
+
+            if ($result > 0)
+            {
+                $object->old_lastname='';
+                $object->old_firstname='';
+                $action = 'view';
+            }
+            else
+            {
+                setEventMessage($object->error,'errors');
+                setEventMessage($object->errors,'errors');
+                $action = 'edit';
+            }
+        }
+    }
+}
+
+
+/*
+ *	View
+ */
+
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$langs->trans("ContactsAddresses"),$help_url);
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+
+$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+
+if ($socid > 0)
+{
+    $objsoc = new Societe($db);
+    $objsoc->fetch($socid);
+}
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+    // -----------------------------------------
+    // When used with CANVAS
+    // -----------------------------------------
+    if (empty($object->error) && $id)
+ 	{
+ 		$object = new Contact($db);
+ 		$result=$object->fetch($id);
+		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
+}
+else
+{
+    // -----------------------------------------
+    // When used in standard mode
+    // -----------------------------------------
+
+    // Confirm deleting contact
+    if ($user->rights->societe->contact->supprimer)
+    {
+        if ($action == 'delete')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage?'&backtopage='.$backtopage:''),$langs->trans("DeleteContact"),$langs->trans("ConfirmDeleteContact"),"confirm_delete",'',0,1);
+        }
+    }
+
+    /*
+     * Onglets
+     */
+    if ($id > 0)
+    {
+        // Si edition contact deja existant
+        $object = new Contact($db);
+        $res=$object->fetch($id, $user);
+        if ($res < 0) { dol_print_error($db,$object->error); exit; }
+        $res=$object->fetch_optionals($object->id,$extralabels);
+
+        // Show tabs
+        $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)
+    {
+        if ($action == 'create')
+        {
+            /*
+             * Fiche en mode creation
+             */
+            $object->canvas=$canvas;
+
+            $object->state_id = $_POST["state_id"];
+
+            // We set country_id, country_code and label for the selected country
+            $object->country_id=$_POST["country_id"]?$_POST["country_id"]:(empty($objsoc->country_id)?$mysoc->country_id:$objsoc->country_id);
+            if ($object->country_id)
+            {
+            	$tmparray=getCountry($object->country_id,'all');
+                $object->country_code = $tmparray['code'];
+                $object->country      = $tmparray['label'];
+            }
+
+            $title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
+            print_fiche_titre($title);
+
+            // Affiche les erreurs
+            dol_htmloutput_errors(is_numeric($error)?'':$error,$errors);
+
+            if ($conf->use_javascript_ajax)
+            {
+				print "\n".'<script type="text/javascript" language="javascript">'."\n";
+				print 'jQuery(document).ready(function () {
+							jQuery("#selectcountry_id").change(function() {
+								document.formsoc.action.value="create";
+								document.formsoc.submit();
+							});
+
+							$("#copyaddressfromsoc").click(function() {
+								$(\'textarea[name="address"]\').val("'.dol_escape_js($objsoc->address).'");
+								$(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
+								$(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
+								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
+								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
+								$(\'input[name="email"]\').val("'.dol_escape_js($objsoc->email).'");
+            			});
+						})'."\n";
+				print '</script>'."\n";
+            }
+
+            print '<br>';
+            print '<form method="post" name="formsoc" action="'.$_SERVER["PHP_SELF"].'">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="add">';
+            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+            print '<table class="border" width="100%">';
+
+            // Name
+            print '<tr><td width="20%" class="fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
+	        print '<td width="30%"><input name="lastname" id="lastname" type="text" size="30" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname")?GETPOST("lastname"):$object->lastname).'" autofocus="autofocus"></td>';
+            print '<td width="20%"><label for="firstname">'.$langs->trans("Firstname").'</label></td>';
+	        print '<td width="30%"><input name="firstname" id="firstname"type="text" size="30" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname")?GETPOST("firstname"):$object->firstname).'"></td></tr>';
+
+            // Company
+            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+            {
+                if ($socid > 0)
+                {
+                    print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
+                    print '<td colspan="3" class="maxwidthonsmartphone">';
+                    print $objsoc->getNomUrl(1);
+                    print '</td>';
+                    print '<input type="hidden" name="socid" id="socid" value="'.$objsoc->id.'">';
+                    print '</td></tr>';
+                }
+                else {
+                    print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+                    print $form->select_company($socid,'socid','',1);
+                    print '</td></tr>';
+                }
+            }
+
+            // Civility
+            print '<tr><td width="15%"><label for="civility_id">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+            print $formcompany->select_civility(GETPOST("civility_id",'alpha')?GETPOST("civility_id",'alpha'):$object->civility_id);
+            print '</td></tr>';
+
+            print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
+	        print '<td colspan="3"><input name="poste" id="title" type="text" size="50" maxlength="80" value="'.dol_escape_htmltag(GETPOST("poste",'alpha')?GETPOST("poste",'alpha'):$object->poste).'"></td>';
+
+            $colspan=3;
+            if ($conf->use_javascript_ajax && $socid > 0) $colspan=2;
+
+            // Address
+            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) $object->address = $objsoc->address;	// Predefined with third party
+            print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
+            print '<td colspan="'.$colspan.'"><textarea class="flat" name="address" id="address" cols="70">'.(GETPOST("address",'alpha')?GETPOST("address",'alpha'):$object->address).'</textarea></td>';
+
+            if ($conf->use_javascript_ajax && $socid > 0)
+            {
+	            $rowspan=3;
+	    		if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
+
+	            print '<td valign="middle" align="center" rowspan="'.$rowspan.'">';
+		        print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
+	            print '</td>';
+            }
+            print '</tr>';
+
+            // Zip / Town
+            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) $object->zip = $objsoc->zip;			// Predefined with third party
+            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) $object->town = $objsoc->town;	// Predefined with third party
+            print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+            print $formcompany->select_ziptown((GETPOST("zipcode")?GETPOST("zipcode"):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6).'&nbsp;';
+            print $formcompany->select_ziptown((GETPOST("town")?GETPOST("town"):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+            print '</td></tr>';
+
+            // Country
+            print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+            print $form->select_country((GETPOST("country_id",'alpha')?GETPOST("country_id",'alpha'):$object->country_id),'country_id');
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print '</td></tr>';
+
+            // State
+            if (empty($conf->global->SOCIETE_DISABLE_STATE))
+            {
+                print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+                if ($object->country_id)
+                {
+                    print $formcompany->select_state(GETPOST("state_id",'alpha')?GETPOST("state_id",'alpha'):$object->state_id,$object->country_code,'state_id');
+                }
+                else
+              {
+                    print $countrynotdefined;
+                }
+                print '</td></tr>';
+            }
+
+            // Phone / Fax
+            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) $object->phone_pro = $objsoc->phone;	// Predefined with third party
+            print '<tr><td><label for="phone_pro">'.$langs->trans("PhonePro").'</label></td>';
+	        print '<td><input name="phone_pro" id="phone_pro" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("phone_pro")?GETPOST("phone_pro"):$object->phone_pro).'"></td>';
+            print '<td><label for="phone_perso">'.$langs->trans("PhonePerso").'</label></td>';
+	        print '<td><input name="phone_perso" id="phone_perso" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("phone_perso")?GETPOST("phone_perso"):$object->phone_perso).'"></td></tr>';
+
+            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax;	// Predefined with third party
+            print '<tr><td><label for="phone_mobile">'.$langs->trans("PhoneMobile").'</label></td>';
+	        print '<td><input name="phone_mobile" id="phone_mobile" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("phone_mobile")?GETPOST("phone_mobile"):$object->phone_mobile).'"></td>';
+            print '<td><label for="fax">'.$langs->trans("Fax").'</label></td>';
+	        print '<td><input name="fax" id="fax" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("fax",'alpha')?GETPOST("fax",'alpha'):$object->fax).'"></td></tr>';
+
+            // EMail
+            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email;	// Predefined with third party
+            print '<tr><td><label for="email">'.$langs->trans("Email").'</label></td>';
+	        print '<td><input name="email" id="email" type="text" size="50" maxlength="80" value="'.(GETPOST("email",'alpha')?GETPOST("email",'alpha'):$object->email).'"></td>';
+            if (! empty($conf->mailing->enabled))
+            {
+            	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+	            print '<td>'.$form->selectyesno('no_email',(GETPOST("no_email",'alpha')?GETPOST("no_email",'alpha'):$object->no_email), 1).'</td>';
+            }
+            else
+			      {
+          		print '<td colspan="2">&nbsp;</td>';
+            }
+            print '</tr>';
+
+            // Instant message and no email
+            print '<tr><td><label for="jabberid">'.$langs->trans("IM").'</label></td>';
+	        print '<td colspan="3"><input name="jabberid" id="jabberid" type="text" size="50" maxlength="80" value="'.(GETPOST("jabberid",'alpha')?GETPOST("jabberid",'alpha'):$object->jabberid).'"></td></tr>';
+
+            // Skype
+            if (! empty($conf->skype->enabled))
+            {
+                print '<tr><td><label for="skype">'.$langs->trans("Skype").'</label></td>';
+	            print '<td colspan="3"><input name="skype" id="skype" type="text" size="50" maxlength="80" value="'.(GETPOST("skype",'alpha')?GETPOST("skype",'alpha'):$object->skype).'"></td></tr>';
+            }
+
+            // Visibility
+            print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
+            $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate"));
+            print $form->selectarray('priv',$selectarray,(GETPOST("priv",'alpha')?GETPOST("priv",'alpha'):$object->priv),0);
+            print '</td></tr>';
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="3"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	print $object->showOptionals($extrafields,'edit');
+            }
+
+            print "</table><br>";
+
+
+            // Add personnal information
+            print_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
+
+            print '<table class="border" width="100%">';
+
+            // Date To Birth
+            print '<tr><td width="20%"><label for="birthday">'.$langs->trans("DateToBirth").'</label></td><td width="30%">';
+            $form=new Form($db);
+            if ($object->birthday)
+            {
+                print $form->select_date($object->birthday,'birthday',0,0,0,"perso");
+            }
+            else
+            {
+                print $form->select_date('','birthday',0,0,1,"perso");
+            }
+            print '</td>';
+
+            print '<td colspan="2"><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
+            if ($object->birthday_alert)
+            {
+                print '<input type="checkbox" name="birthday_alert" id="birthday_aler" checked></td>';
+            }
+            else
+            {
+                print '<input type="checkbox" name="birthday_alert" id="birthday_alert"></td>';
+            }
+            print '</tr>';
+
+            print "</table><br><br>";
+
+
+            print '<center>';
+            print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
+            if (! empty($backtopage))
+            {
+                print ' &nbsp; &nbsp; ';
+                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+            }
+            print '</center>';
+
+            print "</form>";
+        }
+        elseif ($action == 'edit' && ! empty($id))
+        {
+            /*
+             * Fiche en mode edition
+             */
+
+            // We set country_id, and country_code label of the chosen country
+            if (isset($_POST["country_id"]) || $object->country_id)
+            {
+	            $tmparray=getCountry($object->country_id,'all');
+	            $object->country_code =	$tmparray['code'];
+	            $object->country      =	$tmparray['label'];
+            }
+
+			$objsoc = new Societe($db);
+			$objsoc->fetch($object->socid);
+
+            // Affiche les erreurs
+            dol_htmloutput_errors($error,$errors);
+
+            if ($conf->use_javascript_ajax)
+            {
+				print "\n".'<script type="text/javascript" language="javascript">'."\n";
+				print 'jQuery(document).ready(function () {
+							jQuery("#selectcountry_id").change(function() {
+								document.formsoc.action.value="edit";
+								document.formsoc.submit();
+							});
+
+							$("#copyaddressfromsoc").click(function() {
+								$(\'textarea[name="address"]\').text("'.dol_escape_js($objsoc->address).'");
+								$(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
+								$(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
+								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
+								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
+            				});
+						})'."\n";
+				print '</script>'."\n";
+            }
+
+            print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" name="formsoc">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="id" value="'.$id.'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="contactid" value="'.$object->id.'">';
+            print '<input type="hidden" name="old_lastname" value="'.$object->lastname.'">';
+            print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
+            if (! empty($backtopage)) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+            print '<table class="border" width="100%">';
+
+            // Ref
+            print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="3">';
+            print $object->ref;
+            print '</td></tr>';
+
+            // Lastname
+            print '<tr><td width="20%" class="fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
+            print '<td width="30%"><input name="lastname" id="lastname" type="text" size="20" maxlength="80" value="'.(isset($_POST["lastname"])?$_POST["lastname"]:$object->lastname).'" autofocus="autofocus"></td>';
+            print '<td width="20%"><label for="firstname">'.$langs->trans("Firstname").'</label></td>';
+	        print '<td width="30%"><input name="firstname" id="firstname" type="text" size="20" maxlength="80" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td></tr>';
+
+            // Company
+            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+            {
+                print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
+                print '<td colspan="3" class="maxwidthonsmartphone">';
+                print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):($object->socid?$object->socid:-1),'socid','',1);
+                print '</td>';
+                print '</tr>';
+            }
+
+            // Civility
+            print '<tr><td><label for="civility_id">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+            print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id);
+            print '</td></tr>';
+
+            print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
+	        print '<td colspan="3"><input name="poste" id="title" type="text" size="50" maxlength="80" value="'.(isset($_POST["poste"])?$_POST["poste"]:$object->poste).'"></td></tr>';
+
+            // Address
+            print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
+            print '<td colspan="2"><textarea class="flat" name="address" id="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>';
+
+            $rowspan=3;
+    		if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
+
+            print '<td valign="middle" align="center" rowspan="'.$rowspan.'">';
+            if ($conf->use_javascript_ajax) print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
+            print '</td></tr>';
+
+            // Zip / Town
+            print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="2" class="maxwidthonsmartphone">';
+            print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6).'&nbsp;';
+            print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+            print '</td></tr>';
+
+            // Country
+            print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="2" class="maxwidthonsmartphone">';
+            print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print '</td></tr>';
+
+            // State
+            if (empty($conf->global->SOCIETE_DISABLE_STATE))
+            {
+                print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="2" class="maxwidthonsmartphone">';
+                print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'state_id');
+                print '</td></tr>';
+            }
+
+            // Phone
+            print '<tr><td><label for="phone_pro">'.$langs->trans("PhonePro").'</label></td>';
+	        print '<td><input name="phone_pro" id="phone_pro" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_pro"])?$_POST["phone_pro"]:$object->phone_pro).'"></td>';
+            print '<td><label for="phone_perso">'.$langs->trans("PhonePerso").'</label></td>';
+	        print '<td><input name="phone_perso" id="phone_perso" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$object->phone_perso).'"></td></tr>';
+
+            print '<tr><td><label for="phone_mobile">'.$langs->trans("PhoneMobile").'</label></td>';
+	        print '<td><input name="phone_mobile" id="phone_mobile" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td>';
+            print '<td><label for="fax">'.$langs->trans("Fax").'</label></td>';
+	        print '<td><input name="fax" id="fax" type="text" size="18" maxlength="80" value="'.(isset($_POST["fax"])?$_POST["fax"]:$object->fax).'"></td></tr>';
+
+            // EMail
+            print '<tr><td><label for="email">'.$langs->trans("EMail").'</label></td>';
+	        print '<td><input name="email" id="email" type="text" size="40" maxlength="80" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td>';
+            if (! empty($conf->mailing->enabled))
+            {
+                $langs->load("mails");
+                print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
+                print '<td>'.$object->getNbOfEMailings().'</td>';
+            }
+            else
+			{
+				print '<td colspan="2">&nbsp;</td>';
+            }
+            print '</tr>';
+
+            // Jabberid
+            print '<tr><td><label for="jabberid">'.$langs->trans("Jabberid").'</label></td>';
+	        print '<td><input name="jabberid" id="jabberid" type="text" size="40" maxlength="80" value="'.(isset($_POST["jabberid"])?$_POST["jabberid"]:$object->jabberid).'"></td>';
+            if (! empty($conf->mailing->enabled))
+            {
+            	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+	            print '<td>'.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email), 1).'</td>';
+            }
+            else
+			{
+				print '<td colspan="2">&nbsp;</td>';
+			}
+            print '</tr>';
+
+            // Skype
+            if (! empty($conf->skype->enabled))
+            {
+                print '<tr><td><label for="skype">'.$langs->trans("Skype").'</label></td>';
+	            print '<td><input name="skype" id="skype" type="text" size="40" maxlength="80" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
+            }
+
+            // Visibility
+            print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
+            $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate"));
+            print $form->selectarray('priv',$selectarray,$object->priv,0);
+            print '</td></tr>';
+
+             // Note Public
+            print '<tr><td valign="top"><label for="note_public">'.$langs->trans("NotePublic").'</label></td><td colspan="3">';
+            $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+            print $doleditor->Create(1);
+            print '</td></tr>';
+
+            // Note Private
+            print '<tr><td valign="top"><label for="note_private">'.$langs->trans("NotePrivate").'</label></td><td colspan="3">';
+            $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+            print $doleditor->Create(1);
+            print '</td></tr>';
+
+            // Statut
+            print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
+            print '<td>';
+            print $object->getLibStatut(5);
+            print '</td></tr>';
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="3"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	print $object->showOptionals($extrafields,'edit');
+            }
+
+            $object->load_ref_elements();
+
+            if (! empty($conf->commande->enabled))
+            {
+                print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
+                print $object->ref_commande?$object->ref_commande:$langs->trans("NoContactForAnyOrder");
+                print '</td></tr>';
+            }
+
+            if (! empty($conf->propal->enabled))
+            {
+                print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
+                print $object->ref_propal?$object->ref_propal:$langs->trans("NoContactForAnyProposal");
+                print '</td></tr>';
+            }
+
+            if (! empty($conf->contrat->enabled))
+            {
+                print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
+                print $object->ref_contrat?$object->ref_contrat:$langs->trans("NoContactForAnyContract");
+                print '</td></tr>';
+            }
+
+            if (! empty($conf->facture->enabled))
+            {
+                print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
+                print $object->ref_facturation?$object->ref_facturation:$langs->trans("NoContactForAnyInvoice");
+                print '</td></tr>';
+            }
+
+            // Login Dolibarr
+            print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
+            if ($object->user_id)
+            {
+                $dolibarr_user=new User($db);
+                $result=$dolibarr_user->fetch($object->user_id);
+                print $dolibarr_user->getLoginUrl(1);
+            }
+            else print $langs->trans("NoDolibarrAccess");
+            print '</td></tr>';
+
+            print '</table><br>';
+
+            print '<center>';
+            print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+            print ' &nbsp; ';
+            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+            print '</center>';
+
+            print "</form>";
+        }
+    }
+
+    if (! empty($id) && $action != 'edit' && $action != 'create')
+    {
+        $objsoc = new Societe($db);
+
+        /*
+         * Fiche en mode visualisation
+         */
+
+        dol_htmloutput_errors($error,$errors);
+
+        if ($action == 'create_user')
+        {
+            // Full firstname and lastname separated with a dot : firstname.lastname
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+            $login=dol_buildlogin($object->lastname,$object->firstname);
+
+            $generated_password='';
+            if (! $ldap_sid) // TODO ldap_sid ?
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+                $generated_password=getRandomPassword(false);
+            }
+            $password=$generated_password;
+
+            // Create a form array
+            $formquestion=array(
+            array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
+            array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password),
+            //array('label' => $form->textwithpicto($langs->trans("Type"),$langs->trans("InternalExternalDesc")), 'type' => 'select', 'name' => 'intern', 'default' => 1, 'values' => array(0=>$langs->trans('Internal'),1=>$langs->trans('External')))
+            );
+            $text=$langs->trans("ConfirmCreateContact").'<br>';
+            if (! empty($conf->societe->enabled))
+            {
+                if ($object->socid > 0) $text.=$langs->trans("UserWillBeExternalUser");
+                else $text.=$langs->trans("UserWillBeInternalUser");
+            }
+            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
+
+        }
+
+        print '<table class="border" width="100%">';
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+
+        // Ref
+        print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
+        print $form->showrefnav($object, 'id', $linkback);
+        print '</td></tr>';
+
+        // Name
+        print '<tr><td width="20%">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td width="30%">'.$object->lastname.'</td>';
+        print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$object->firstname.'</td></tr>';
+
+        // Company
+        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+        {
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
+            if ($object->socid > 0)
+            {
+                $objsoc->fetch($object->socid);
+                print $objsoc->getNomUrl(1);
+            }
+            else
+            {
+                print $langs->trans("ContactNotLinkedToCompany");
+            }
+            print '</td></tr>';
+        }
+
+        // Civility
+        print '<tr><td width="15%">'.$langs->trans("UserTitle").'</td><td colspan="3">';
+        print $object->getCivilityLabel();
+        print '</td></tr>';
+
+        // Role
+        print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td colspan="3">'.$object->poste.'</td>';
+
+        // Address
+        print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3">';
+        dol_print_address($object->address,'gmap','contact',$object->id);
+        print '</td></tr>';
+
+        // Zip/Town
+        print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">';
+        print $object->zip;
+        if ($object->zip) print '&nbsp;';
+        print $object->town.'</td></tr>';
+
+        // Country
+        print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
+        $img=picto_from_langcode($object->country_code);
+        if ($img) print $img.' ';
+        print $object->country;
+        print '</td></tr>';
+
+        // State
+        if (empty($conf->global->SOCIETE_DISABLE_STATE))
+        {
+            print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'.$object->state.'</td>';
+        }
+
+        // Phone
+        print '<tr><td>'.$langs->trans("PhonePro").'</td><td>'.dol_print_phone($object->phone_pro,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td>';
+        print '<td>'.$langs->trans("PhonePerso").'</td><td>'.dol_print_phone($object->phone_perso,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td></tr>';
+
+        print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td>'.dol_print_phone($object->phone_mobile,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td>';
+        print '<td>'.$langs->trans("Fax").'</td><td>'.dol_print_phone($object->fax,$object->country_code,$object->id,$object->socid,'AC_FAX').'</td></tr>';
+
+        // Email
+        print '<tr><td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($object->email,$object->id,$object->socid,'AC_EMAIL').'</td>';
+        if (! empty($conf->mailing->enabled))
+        {
+            $langs->load("mails");
+            print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
+            print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td>';
+        }
+        else
+        {
+            print '<td colspan="2">&nbsp;</td>';
+        }
+        print '</tr>';
+
+        // Instant message and no email
+        print '<tr><td>'.$langs->trans("IM").'</td><td>'.$object->jabberid.'</td>';
+        if (!empty($conf->mailing->enabled))
+        {
+        	print '<td>'.$langs->trans("No_Email").'</td><td>'.yn($object->no_email).'</td>';
+        }
+        else
+       {
+	       	print '<td colspan="2">&nbsp;</td>';
+        }
+        print '</tr>';
+
+        // Skype
+        if (! empty($conf->skype->enabled))
+        {
+            print '<tr><td>'.$langs->trans("Skype").'</td><td colspan="3">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
+        }
+
+        print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td colspan="3">';
+        print $object->LibPubPriv($object->priv);
+        print '</td></tr>';
+
+        // Note Public
+        print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td><td colspan="3">';
+        print nl2br($object->note_public);
+        print '</td></tr>';
+
+        // Note Private
+        print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td><td colspan="3">';
+        print nl2br($object->note_private);
+
+	 	// Statut
+		print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
+		print '<td>';
+		print $object->getLibStatut(5);
+		print '</td>';
+		print '</tr>'."\n";
+        // Other attributes
+        $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        {
+        	print $object->showOptionals($extrafields);
+        }
+
+        $object->load_ref_elements();
+
+        if (! empty($conf->commande->enabled))
+        {
+            print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
+            print $object->ref_commande?$object->ref_commande:$langs->trans("NoContactForAnyOrder");
+            print '</td></tr>';
+        }
+
+        if (! empty($conf->propal->enabled))
+        {
+            print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
+            print $object->ref_propal?$object->ref_propal:$langs->trans("NoContactForAnyProposal");
+            print '</td></tr>';
+        }
+
+        if (! empty($conf->contrat->enabled))
+        {
+            print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
+            print $object->ref_contrat?$object->ref_contrat:$langs->trans("NoContactForAnyContract");
+            print '</td></tr>';
+        }
+
+        if (! empty($conf->facture->enabled))
+        {
+            print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
+            print $object->ref_facturation?$object->ref_facturation:$langs->trans("NoContactForAnyInvoice");
+            print '</td></tr>';
+        }
+
+        print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
+        if ($object->user_id)
+        {
+            $dolibarr_user=new User($db);
+            $result=$dolibarr_user->fetch($object->user_id);
+            print $dolibarr_user->getLoginUrl(1);
+        }
+        else print $langs->trans("NoDolibarrAccess");
+        print '</td></tr>';
+
+        print "</table>";
+
+        print "</div>";
+
+        // Barre d'actions
+        print '<div class="tabsAction">';
+
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook))
+		{
+        	if ($user->rights->societe->contact->creer)
+            {
+                print '<a class="butAction" href="card.php?id='.$object->id.'&action=edit">'.$langs->trans('Modify').'</a>';
+            }
+
+            if (! $object->user_id && $user->rights->user->user->creer)
+            {
+                print '<a class="butAction" href="card.php?id='.$object->id.'&action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a>';
+            }
+
+            if ($user->rights->societe->contact->supprimer)
+            {
+                print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete'.($backtopage?'&backtopage='.urlencode($backtopage):'').'">'.$langs->trans('Delete').'</a>';
+            }
+            // Activer
+            if ($object->statut == 0 && $user->rights->societe->contact->creer)
+            {
+                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable">'.$langs->trans("Reactivate").'</a>';
+            }
+            // Desactiver
+            if ($object->statut == 1 && $user->rights->societe->contact->creer)
+            {
+                print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
+            }
+        }
+
+        print "</div><br>";
+
+		if (! empty($conf->agenda->enabled))
+		{
+			$objthirdparty=$objsoc;
+			$objcon=$object;
+
+		    $out='';
+		    $permok=$user->rights->agenda->myactions->create;
+		    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+		    {
+		        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+		        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+		    	$out.=$langs->trans("AddAnAction").' ';
+		    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		    	$out.="</a>";
+			}
+
+        	print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),$out,'');
+
+        	print show_actions_todo($conf,$langs,$db,$objsoc,$object);
+
+        	print show_actions_done($conf,$langs,$db,$objsoc,$object);
+		}
+    }
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 4187de7136c..6a7776b27bd 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -155,7 +155,7 @@ class Contact extends CommonObject
         $sql.= " ".(! empty($this->import_key)?"'".$this->import_key."'":"null");
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -183,12 +183,10 @@ class Contact extends CommonObject
 
             if (! $error)
             {
-    			// Appel des triggers
-    			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-    			$interface=new Interfaces($this->db);
-    			$result=$interface->run_triggers('CONTACT_CREATE',$this,$user,$langs,$conf);
-    			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-    			// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('CONTACT_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
             }
 
             if (! $error)
@@ -222,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;
 
@@ -251,7 +249,7 @@ class Contact extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
 		if ($this->socid > 0) $sql .= " fk_soc='".$this->db->escape($this->socid)."',";
 		else if ($this->socid == -1) $sql .= " fk_soc=null,";
-		$sql .= "  civilite='".$this->db->escape($this->civility_id)."'";
+		$sql .= "  civility='".$this->db->escape($this->civility_id)."'";
 		$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname='".$this->db->escape($this->firstname)."'";
 		$sql .= ", address='".$this->db->escape($this->address)."'";
@@ -276,7 +274,7 @@ class Contact extends CommonObject
 		$sql .= ", no_email=".($this->no_email?"'".$this->no_email."'":"0");
 		$sql .= " WHERE rowid=".$this->db->escape($id);
 
-		dol_syslog(get_class($this)."::update sql=".$sql,LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -285,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);
@@ -304,12 +304,10 @@ class Contact extends CommonObject
 
 			if (! $error && ! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('CONTACT_MODIFY',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('CONTACT_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
 			if (! $error)
@@ -319,7 +317,6 @@ class Contact extends CommonObject
 			}
 			else
 			{
-				$this->error=join(',',$this->errors);
 				dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
 				$this->db->rollback();
 				return -$error;
@@ -328,7 +325,6 @@ class Contact extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror().' sql='.$sql;
-			dol_syslog(get_class($this)."::update Error ".$this->error,LOG_ERR);
             $this->db->rollback();
 			return -1;
 		}
@@ -380,7 +376,7 @@ class Contact extends CommonObject
 			$soc = new Societe($this->db);
 			$soc->fetch($this->socid);
 
-			$info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->nom;
+			$info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->name;
 			if ($soc->client == 1)      $info["businessCategory"] = "Customers";
 			if ($soc->client == 2)      $info["businessCategory"] = "Prospects";
 			if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
@@ -433,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;
@@ -444,7 +440,7 @@ class Contact extends CommonObject
 		if ($user) $sql .= ", fk_user_modif=".$user->id;
 		$sql.= " WHERE rowid=".$this->db->escape($id);
 
-		dol_syslog(get_class($this)."::update_perso this->birthday=".$this->birthday." - sql=".$sql);
+		dol_syslog(get_class($this)."::update_perso this->birthday=".$this->birthday." -", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
@@ -498,13 +494,13 @@ 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;
 
 		$langs->load("companies");
 
-		$sql = "SELECT c.rowid, c.fk_soc, c.ref_ext, c.civilite as civility_id, c.lastname, c.firstname,";
+		$sql = "SELECT c.rowid, c.fk_soc, c.ref_ext, c.civility as civility_id, c.lastname, c.firstname,";
 		$sql.= " c.address, c.statut, c.zip, c.town,";
 		$sql.= " c.fk_pays as country_id,";
 		$sql.= " c.fk_departement,";
@@ -512,18 +508,18 @@ class Contact extends CommonObject
 		$sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid, c.skype,";
 		$sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.no_email, c.canvas,";
 		$sql.= " c.import_key,";
-		$sql.= " p.libelle as country, p.code as country_code,";
+		$sql.= " co.label as country, co.code as country_code,";
 		$sql.= " d.nom as state, d.code_departement as state_code,";
 		$sql.= " u.rowid as user_id, u.login as user_login,";
 		$sql.= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON c.fk_pays = co.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		$sql.= " WHERE c.rowid = ". $id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -599,7 +595,6 @@ class Contact extends CommonObject
 				else
 				{
 					$this->error=$this->db->error();
-					dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 					return -1;
 				}
 
@@ -624,7 +619,6 @@ class Contact extends CommonObject
 					else
 					{
 						$this->error=$this->db->error();
-						dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 						return -1;
 					}
 				}
@@ -640,7 +634,6 @@ class Contact extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -664,7 +657,7 @@ class Contact extends CommonObject
 		$sql.=" AND fk_socpeople = ". $this->id;
 		$sql.=" GROUP BY tc.element";
 
-		dol_syslog(get_class($this)."::load_ref_elements sql=".$sql);
+		dol_syslog(get_class($this)."::load_ref_elements", LOG_DEBUG);
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -685,7 +678,6 @@ class Contact extends CommonObject
 		else
 		{
 			$this->error=$this->db->error()." - ".$sql;
-			dol_syslog(get_class($this)."::load_ref_elements Error ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -716,7 +708,7 @@ class Contact extends CommonObject
 			$sql.= " WHERE ec.fk_socpeople=".$this->id;
 			$sql.= " AND ec.fk_c_type_contact=tc.rowid";
 			$sql.= " AND tc.source='external'";
-			dol_syslog(get_class($this)."::delete sql=".$sql);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
@@ -729,7 +721,7 @@ class Contact extends CommonObject
 
 					$sqldel = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 					$sqldel.=" WHERE rowid = ".$obj->rowid;
-					dol_syslog(get_class($this)."::delete sql=".$sqldel);
+					dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 					$result = $this->db->query($sqldel);
 					if (! $result)
 					{
@@ -751,14 +743,13 @@ class Contact extends CommonObject
 		{
 			// Remove category
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact WHERE fk_socpeople = ".$this->id;
-			dol_syslog(get_class($this)."::delete sql=".$sql);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
 				$error++;
 				$this->error .= $this->db->lasterror();
 				$errorflag=-1;
-				dol_syslog(get_class($this)."::delete error ".$errorflag." ".$this->error, LOG_ERR);
 			}
 		}
 
@@ -766,7 +757,7 @@ class Contact extends CommonObject
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
 			$sql .= " WHERE rowid=".$this->id;
-			dol_syslog(get_class($this)."::delete sql=".$sql);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if (! $result)
 			{
@@ -783,14 +774,10 @@ class Contact extends CommonObject
 
 		if (! $error && ! $notrigger)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CONTACT_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-
-			if ($error) $this->error=join(',',$this->errors);
+            // Call trigger
+            $result=$this->call_trigger('CONTACT_DELETE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
 		}
 
 		if (! $error)
@@ -866,7 +853,7 @@ class Contact extends CommonObject
 		$sql.= " WHERE mc.email = '".$this->db->escape($this->email)."'";
 		$sql.= " AND mc.statut NOT IN (-1,0)";      // -1 erreur, 0 non envoye, 1 envoye avec succes
 
-		dol_syslog(get_class($this)."::getNbOfEMailings sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getNbOfEMailings", LOG_DEBUG);
 
 		$resql=$this->db->query($sql);
 
@@ -892,20 +879,21 @@ class Contact extends CommonObject
 	 *	@param		int			$withpicto		Include picto with link
 	 *	@param		string		$option			Where the link point to
 	 *	@param		int			$maxlen			Max length of
+	 *  @param		string		$moreparam		Add more param into URL
 	 *	@return		string						String with URL
 	 */
-	function getNomUrl($withpicto=0,$option='',$maxlen=0)
+	function getNomUrl($withpicto=0,$option='',$maxlen=0,$moreparam='')
 	{
 		global $langs;
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'">';
 		$lienfin='</a>';
 
 		if ($option == 'xxx')
 		{
-			$lien = '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$this->id.'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'">';
 			$lienfin='</a>';
 		}
 
@@ -924,9 +912,9 @@ 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_civilite", "code", "civilite", $code);
+        return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
 	}
 
 	/**
@@ -1070,15 +1058,13 @@ class Contact extends CommonObject
 		$sql.= " WHERE rowid = ".$this->id;
 		$result = $this->db->query($sql);
 
-		dol_syslog(get_class($this)."::setstatus sql=".$sql);
+		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
 		if ($result)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CONTACT_ENABLEDISABLE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
 		}
 
 		if ($error)
diff --git a/htdocs/contact/class/index.html b/htdocs/contact/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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 '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+    	print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
     }
     else
     {
-    	print '<tr><td width="15%">'.$langs->trans("Company").'</td><td colspan="3">';
+    	print '<tr><td width="15%">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
     	print $langs->trans("ContactNotLinkedToCompany");
     	print '</td></tr>';
     }
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
deleted file mode 100644
index 9cb52738bb8..00000000000
--- a/htdocs/contact/fiche.php
+++ /dev/null
@@ -1,1088 +0,0 @@
-<?php
-/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
- * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2013      Alexandre Spangaro 	<alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Juanjo Menent	 	<jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/contact/fiche.php
- *       \ingroup    societe
- *       \brief      Card of a contact
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-$langs->load("companies");
-$langs->load("users");
-$langs->load("other");
-$langs->load("commercial");
-
-$mesg=''; $error=0; $errors=array();
-
-$action		= (GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view');
-$confirm	= GETPOST('confirm','alpha');
-$backtopage = GETPOST('backtopage','alpha');
-$id			= GETPOST('id','int');
-$socid		= GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-
-$object = new Contact($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$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($id);
-$objcanvas=null;
-$canvas = (! empty($object->canvas)?$object->canvas:GETPOST("canvas"));
-if (! empty($canvas))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('contact', 'contactcard', $canvas);
-}
-
-// Security check
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('contactcard'));
-
-
-/*
- *	Actions
- */
-
-$parameters=array('id'=>$id, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
-
-if (empty($reshook))
-{
-    // Cancel
-    if (GETPOST("cancel") && ! empty($backtopage))
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
-
-	// Creation utilisateur depuis contact
-    if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-    {
-        // Recuperation contact actuel
-        $result = $object->fetch($id);
-
-        if ($result > 0)
-        {
-            $db->begin();
-
-            // Creation user
-            $nuser = new User($db);
-            $result=$nuser->create_from_contact($object,GETPOST("login"));	// Do not use GETPOST(alpha)
-
-            if ($result > 0)
-            {
-                $result2=$nuser->setPassword($user,GETPOST("password"),0,0,1);	// Do not use GETPOST(alpha)
-                if ($result2)
-                {
-                    $db->commit();
-                }
-                else
-                {
-                    $error=$nuser->error; $errors=$nuser->errors;
-                    $db->rollback();
-                }
-            }
-            else
-            {
-                $error=$nuser->error; $errors=$nuser->errors;
-                $db->rollback();
-            }
-        }
-        else
-        {
-            $error=$object->error; $errors=$object->errors;
-        }
-    }
-
-
-    // Confirmation desactivation
-    if ($action == 'disable')
-    {
-    	$object->fetch($id);
-    	$object->setstatus(0);
-    	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-    	exit;
-    }
-
-    // Confirmation activation
-    if ($action == 'enable')
-    {
-    	$object->fetch($id);
-    	$object->setstatus(1);
-    	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-    	exit;
-
-    }
-
-    // Add contact
-    if ($action == 'add' && $user->rights->societe->contact->creer)
-    {
-        $db->begin();
-
-        if ($canvas) $object->canvas=$canvas;
-
-        $object->socid			= GETPOST("socid",'int');
-        $object->lastname		= GETPOST("lastname");
-        $object->firstname		= GETPOST("firstname");
-        $object->civility_id	= GETPOST("civility_id",'alpha');
-        $object->poste			= GETPOST("poste");
-        $object->address		= GETPOST("address");
-        $object->zip			= GETPOST("zipcode");
-        $object->town			= GETPOST("town");
-        $object->country_id		= GETPOST("country_id",'int');
-        $object->state_id       = GETPOST("state_id",'int');
-        $object->skype			= GETPOST("skype");
-        $object->email			= GETPOST("email",'alpha');
-        $object->phone_pro		= GETPOST("phone_pro");
-        $object->phone_perso	= GETPOST("phone_perso");
-        $object->phone_mobile	= GETPOST("phone_mobile");
-        $object->fax			= GETPOST("fax");
-        $object->jabberid		= GETPOST("jabberid",'alpha');
-		$object->no_email		= GETPOST("no_email",'int');
-        $object->priv			= GETPOST("priv",'int');
-        $object->note_public	= GETPOST("note_public");
-        $object->note_private	= GETPOST("note_private");
-        $object->statut			= 1; //Defult status to Actif
-
-        // Note: Correct date should be completed with location to have exact GM time of birth.
-        $object->birthday = dol_mktime(0,0,0,GETPOST("birthdaymonth",'int'),GETPOST("birthdayday",'int'),GETPOST("birthdayyear",'int'));
-        $object->birthday_alert = GETPOST("birthday_alert",'alpha');
-
-        // Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-        if (! GETPOST("lastname"))
-        {
-            $error++; $errors[]=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label"));
-            $action = 'create';
-        }
-
-        if (! $error)
-        {
-            $id =  $object->create($user);
-            if ($id <= 0)
-            {
-                $error++; $errors=array_merge($errors,($object->error?array($object->error):$object->errors));
-                $action = 'create';
-            }
-        }
-
-        if (! $error && $id > 0)
-        {
-            $db->commit();
-            if (! empty($backtopage)) $url=$backtopage;
-            else $url='fiche.php?id='.$id;
-            header("Location: ".$url);
-            exit;
-        }
-        else
-        {
-            $db->rollback();
-        }
-    }
-
-    if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->contact->supprimer)
-    {
-        $result=$object->fetch($id);
-
-        $object->old_lastname      = GETPOST("old_lastname");
-        $object->old_firstname = GETPOST("old_firstname");
-
-        $result = $object->delete();
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT.'/contact/list.php');
-            exit;
-        }
-        else
-        {
-            $error=$object->error; $errors=$object->errors;
-        }
-    }
-
-    if ($action == 'update' && ! $_POST["cancel"] && $user->rights->societe->contact->creer)
-    {
-        if (empty($_POST["lastname"]))
-        {
-            $error++; $errors=array($langs->trans("ErrorFieldRequired",$langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
-            $action = 'edit';
-        }
-
-        if (! $error)
-        {
-        	$contactid=GETPOST("contactid",'int');
-
-            $object->fetch($contactid);
-
-            $object->oldcopy=dol_clone($object);
-
-            $object->old_lastname	= GETPOST("old_lastname");
-            $object->old_firstname	= GETPOST("old_firstname");
-
-            $object->socid			= GETPOST("socid",'int');
-            $object->lastname		= GETPOST("lastname");
-            $object->firstname		= GETPOST("firstname");
-            $object->civility_id	= GETPOST("civility_id",'alpha');
-            $object->poste			= GETPOST("poste");
-
-            $object->address		= GETPOST("address");
-            $object->zip			= GETPOST("zipcode");
-            $object->town			= GETPOST("town");
-            $object->state_id   	= GETPOST("state_id",'int');
-            $object->country_id		= GETPOST("country_id",'int');
-
-            $object->email			= GETPOST("email",'alpha');
-            $object->skype			= GETPOST("skype",'alpha');
-            $object->phone_pro		= GETPOST("phone_pro");
-            $object->phone_perso	= GETPOST("phone_perso");
-            $object->phone_mobile	= GETPOST("phone_mobile");
-            $object->fax			= GETPOST("fax");
-            $object->jabberid		= GETPOST("jabberid",'alpha');
-			$object->no_email		= GETPOST("no_email",'int');
-            $object->priv			= GETPOST("priv",'int');
-        	$object->note_public	= GETPOST("note_public");
-       		$object->note_private	= GETPOST("note_private");
-
-            // Fill array 'array_options' with data from add form
-			$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-            $result = $object->update($contactid, $user);
-
-            if ($result > 0)
-            {
-                $object->old_lastname='';
-                $object->old_firstname='';
-                $action = 'view';
-            }
-            else
-            {
-                $error=$object->error; $errors=$object->errors;
-                $action = 'edit';
-            }
-        }
-    }
-}
-
-
-/*
- *	View
- */
-
-
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ContactsAddresses"),$help_url);
-
-$form = new Form($db);
-$formcompany = new FormCompany($db);
-
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-
-if ($socid > 0)
-{
-    $objsoc = new Societe($db);
-    $objsoc->fetch($socid);
-}
-
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
-    // -----------------------------------------
-    // When used with CANVAS
-    // -----------------------------------------
-    if (empty($object->error) && $id)
- 	{
- 		$object = new Contact($db);
- 		$result=$object->fetch($id);
-		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
-}
-else
-{
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
-
-    // Confirm deleting contact
-    if ($user->rights->societe->contact->supprimer)
-    {
-        if ($action == 'delete')
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id,$langs->trans("DeleteContact"),$langs->trans("ConfirmDeleteContact"),"confirm_delete",'',0,1);
-        }
-    }
-
-    /*
-     * Onglets
-     */
-    if ($id > 0)
-    {
-        // Si edition contact deja existant
-        $object = new Contact($db);
-        $res=$object->fetch($id, $user);
-        if ($res < 0) { dol_print_error($db,$object->error); exit; }
-        $res=$object->fetch_optionals($object->id,$extralabels);
-
-        // Show tabs
-        $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');
-    }
-
-    if ($user->rights->societe->contact->creer)
-    {
-        if ($action == 'create')
-        {
-            /*
-             * Fiche en mode creation
-             */
-            $object->canvas=$canvas;
-
-            $object->state_id = $_POST["state_id"];
-
-            // We set country_id, country_code and label for the selected country
-            $object->country_id=$_POST["country_id"]?$_POST["country_id"]:(empty($objsoc->country_id)?$mysoc->country_id:$objsoc->country_id);
-            if ($object->country_id)
-            {
-            	$tmparray=getCountry($object->country_id,'all');
-                $object->country_code = $tmparray['code'];
-                $object->country      = $tmparray['label'];
-            }
-
-            $title = $addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
-            print_fiche_titre($title);
-
-            // Affiche les erreurs
-            dol_htmloutput_errors(is_numeric($error)?'':$error,$errors);
-
-            if ($conf->use_javascript_ajax)
-            {
-				print "\n".'<script type="text/javascript" language="javascript">'."\n";
-				print 'jQuery(document).ready(function () {
-							jQuery("#selectcountry_id").change(function() {
-								document.formsoc.action.value="create";
-								document.formsoc.submit();
-							});
-
-							$("#copyaddressfromsoc").click(function() {
-								$(\'textarea[name="address"]\').val("'.dol_escape_js($objsoc->address).'");
-								$(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
-								$(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
-								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
-								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
-								$(\'input[name="email"]\').val("'.dol_escape_js($objsoc->email).'");
-            			});
-						})'."\n";
-				print '</script>'."\n";
-            }
-
-            print '<br>';
-            print '<form method="post" name="formsoc" action="'.$_SERVER["PHP_SELF"].'">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="add">';
-            print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-            print '<table class="border" width="100%">';
-
-            // Name
-            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td width="30%"><input name="lastname" type="text" size="30" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname")?GETPOST("lastname"):$object->lastname).'"></td>';
-            print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%"><input name="firstname" type="text" size="30" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname")?GETPOST("firstname"):$object->firstname).'"></td></tr>';
-
-            // Company
-            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-            {
-                if ($socid > 0)
-                {
-                    print '<tr><td>'.$langs->trans("Company").'</td>';
-                    print '<td colspan="3" class="maxwidthonsmartphone">';
-                    print $objsoc->getNomUrl(1);
-                    print '</td>';
-                    print '<input type="hidden" name="socid" value="'.$objsoc->id.'">';
-                    print '</td></tr>';
-                }
-                else {
-                    print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3" class="maxwidthonsmartphone">';
-                    print $form->select_company($socid,'socid','',1);
-                    print '</td></tr>';
-                }
-            }
-
-            // Civility
-            print '<tr><td width="15%">'.$langs->trans("UserTitle").'</td><td colspan="3">';
-            print $formcompany->select_civility(GETPOST("civility_id",'alpha')?GETPOST("civility_id",'alpha'):$object->civility_id);
-            print '</td></tr>';
-
-            print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td colspan="3"><input name="poste" type="text" size="50" maxlength="80" value="'.dol_escape_htmltag(GETPOST("poste",'alpha')?GETPOST("poste",'alpha'):$object->poste).'"></td>';
-
-            $colspan=3;
-            if ($conf->use_javascript_ajax && $socid > 0) $colspan=2;
-
-            // Address
-            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) $object->address = $objsoc->address;	// Predefined with third party
-            print '<tr><td>'.$langs->trans("Address");
-            print '</td><td colspan="'.$colspan.'"><textarea class="flat" name="address" cols="70">'.(GETPOST("address",'alpha')?GETPOST("address",'alpha'):$object->address).'</textarea></td>';
-
-            if ($conf->use_javascript_ajax && $socid > 0)
-            {
-	            $rowspan=3;
-	    		if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
-
-	            print '<td valign="middle" align="center" rowspan="'.$rowspan.'">';
-		        print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
-	            print '</td>';
-            }
-            print '</tr>';
-
-            // Zip / Town
-            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) $object->zip = $objsoc->zip;			// Predefined with third party
-            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) $object->town = $objsoc->town;	// Predefined with third party
-            print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-            print $formcompany->select_ziptown((GETPOST("zipcode")?GETPOST("zipcode"):$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6).'&nbsp;';
-            print $formcompany->select_ziptown((GETPOST("town")?GETPOST("town"):$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-            print '</td></tr>';
-
-            // Country
-            print '<tr><td>'.$langs->trans("Country").'</td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-            print $form->select_country((GETPOST("country_id",'alpha')?GETPOST("country_id",'alpha'):$object->country_id),'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print '</td></tr>';
-
-            // State
-            if (empty($conf->global->SOCIETE_DISABLE_STATE))
-            {
-                print '<tr><td>'.$langs->trans('State').'</td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-                if ($object->country_id)
-                {
-                    print $formcompany->select_state(GETPOST("state_id",'alpha')?GETPOST("state_id",'alpha'):$object->state_id,$object->country_code,'state_id');
-                }
-                else
-              {
-                    print $countrynotdefined;
-                }
-                print '</td></tr>';
-            }
-
-            // Phone / Fax
-            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) $object->phone_pro = $objsoc->phone;	// Predefined with third party
-            print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input name="phone_pro" id="phone_pro" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("phone_pro")?GETPOST("phone_pro"):$object->phone_pro).'"></td>';
-            print '<td>'.$langs->trans("PhonePerso").'</td><td><input name="phone_perso" id="phone_perso" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("phone_perso")?GETPOST("phone_perso"):$object->phone_perso).'"></td></tr>';
-
-            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax;	// Predefined with third party
-            print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input name="phone_mobile" id="phone_mobile" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("phone_mobile")?GETPOST("phone_mobile"):$object->phone_mobile).'"></td>';
-            print '<td>'.$langs->trans("Fax").'</td><td><input name="fax" id="fax" type="text" size="18" maxlength="80" value="'.dol_escape_htmltag(GETPOST("fax",'alpha')?GETPOST("fax",'alpha'):$object->fax).'"></td></tr>';
-
-            // EMail
-            if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email;	// Predefined with third party
-            print '<tr><td>'.$langs->trans("Email").'</td><td><input name="email" id="email" type="text" size="50" maxlength="80" value="'.(GETPOST("email",'alpha')?GETPOST("email",'alpha'):$object->email).'"></td>';
-            if (! empty($conf->mailing->enabled))
-            {
-            	print '<td>'.$langs->trans("No_Email").'</td><td>'.$form->selectyesno('no_email',(GETPOST("no_email",'alpha')?GETPOST("no_email",'alpha'):$object->no_email), 1).'</td>';
-            }
-            else
-			      {
-          		print '<td colspan="2">&nbsp;</td>';
-            }
-            print '</tr>';
-
-            // Instant message and no email
-            print '<tr><td>'.$langs->trans("IM").'</td><td colspan="3"><input name="jabberid" type="text" size="50" maxlength="80" value="'.(GETPOST("jabberid",'alpha')?GETPOST("jabberid",'alpha'):$object->jabberid).'"></td></tr>';
-
-            // Skype
-            if (! empty($conf->skype->enabled))
-            {
-                print '<tr><td>'.$langs->trans("Skype").'</td><td colspan="3"><input name="skype" type="text" size="50" maxlength="80" value="'.(GETPOST("skype",'alpha')?GETPOST("skype",'alpha'):$object->skype).'"></td></tr>';
-            }
-
-            // Visibility
-            print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td colspan="3">';
-            $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate"));
-            print $form->selectarray('priv',$selectarray,(GETPOST("priv",'alpha')?GETPOST("priv",'alpha'):$object->priv),0);
-            print '</td></tr>';
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields,'edit');
-            }
-
-            print "</table><br>";
-
-
-            // Add personnal information
-            print_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>','','');
-
-            print '<table class="border" width="100%">';
-
-            // Date To Birth
-            print '<tr><td width="20%">'.$langs->trans("DateToBirth").'</td><td width="30%">';
-            $form=new Form($db);
-            if ($object->birthday)
-            {
-                print $form->select_date($object->birthday,'birthday',0,0,0,"perso");
-            }
-            else
-            {
-                print $form->select_date('','birthday',0,0,1,"perso");
-            }
-            print '</td>';
-
-            print '<td colspan="2">'.$langs->trans("Alert").': ';
-            if ($object->birthday_alert)
-            {
-                print '<input type="checkbox" name="birthday_alert" checked></td>';
-            }
-            else
-            {
-                print '<input type="checkbox" name="birthday_alert"></td>';
-            }
-            print '</tr>';
-
-            print "</table><br><br>";
-
-
-            print '<center>';
-            print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
-            if (! empty($backtopage))
-            {
-                print ' &nbsp; &nbsp; ';
-                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-            }
-            print '</center>';
-
-            print "</form>";
-        }
-        elseif ($action == 'edit' && ! empty($id))
-        {
-            /*
-             * Fiche en mode edition
-             */
-
-            // We set country_id, and country_code label of the chosen country
-            if (isset($_POST["country_id"]) || $object->country_id)
-            {
-	            $tmparray=getCountry($object->country_id,'all');
-	            $object->country_code =	$tmparray['code'];
-	            $object->country      =	$tmparray['label'];
-            }
-
-			$objsoc = new Societe($db);
-			$objsoc->fetch($object->socid);
-
-            // Affiche les erreurs
-            dol_htmloutput_errors($error,$errors);
-
-            if ($conf->use_javascript_ajax)
-            {
-				print "\n".'<script type="text/javascript" language="javascript">'."\n";
-				print 'jQuery(document).ready(function () {
-							jQuery("#selectcountry_id").change(function() {
-								document.formsoc.action.value="edit";
-								document.formsoc.submit();
-							});
-
-							$("#copyaddressfromsoc").click(function() {
-								$(\'textarea[name="address"]\').text("'.dol_escape_js($objsoc->address).'");
-								$(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
-								$(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
-								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
-								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
-            				});
-						})'."\n";
-				print '</script>'."\n";
-            }
-
-            print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" name="formsoc">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="contactid" value="'.$object->id.'">';
-            print '<input type="hidden" name="old_lastname" value="'.$object->lastname.'">';
-            print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
-            if (! empty($backtopage)) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-            print '<table class="border" width="100%">';
-
-            // Ref
-            print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="3">';
-            print $object->ref;
-            print '</td></tr>';
-
-            // Lastname
-            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td width="30%"><input name="lastname" type="text" size="20" maxlength="80" value="'.(isset($_POST["lastname"])?$_POST["lastname"]:$object->lastname).'"></td>';
-            print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%"><input name="firstname" type="text" size="20" maxlength="80" value="'.(isset($_POST["firstname"])?$_POST["firstname"]:$object->firstname).'"></td></tr>';
-
-            // Company
-            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-            {
-                print '<tr><td>'.$langs->trans("Company").'</td>';
-                print '<td colspan="3" class="maxwidthonsmartphone">';
-                print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):($object->socid?$object->socid:-1),'socid','',1);
-                print '</td>';
-                print '</tr>';
-            }
-
-            // Civility
-            print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
-            print $formcompany->select_civility(isset($_POST["civility_id"])?$_POST["civility_id"]:$object->civility_id);
-            print '</td></tr>';
-
-            print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td colspan="3"><input name="poste" type="text" size="50" maxlength="80" value="'.(isset($_POST["poste"])?$_POST["poste"]:$object->poste).'"></td></tr>';
-
-            // Address
-            print '<tr><td>'.$langs->trans("Address");
-            print '</td><td colspan="2"><textarea class="flat" name="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>';
-
-            $rowspan=3;
-    		if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
-
-            print '<td valign="middle" align="center" rowspan="'.$rowspan.'">';
-            if ($conf->use_javascript_ajax) print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
-            print '</td></tr>';
-
-            // Zip / Town
-            print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="2" class="maxwidthonsmartphone">';
-            print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6).'&nbsp;';
-            print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-            print '</td></tr>';
-
-            // Country
-            print '<tr><td>'.$langs->trans("Country").'</td><td colspan="2" class="maxwidthonsmartphone">';
-            print $form->select_country(isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'country_id');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print '</td></tr>';
-
-            // State
-            if (empty($conf->global->SOCIETE_DISABLE_STATE))
-            {
-                print '<tr><td>'.$langs->trans('State').'</td><td colspan="2" class="maxwidthonsmartphone">';
-                print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id,'state_id');
-                print '</td></tr>';
-            }
-
-            // Phone
-            print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input name="phone_pro" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_pro"])?$_POST["phone_pro"]:$object->phone_pro).'"></td>';
-            print '<td>'.$langs->trans("PhonePerso").'</td><td><input name="phone_perso" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_perso"])?$_POST["phone_perso"]:$object->phone_perso).'"></td></tr>';
-
-            print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td><input name="phone_mobile" type="text" size="18" maxlength="80" value="'.(isset($_POST["phone_mobile"])?$_POST["phone_mobile"]:$object->phone_mobile).'"></td>';
-            print '<td>'.$langs->trans("Fax").'</td><td><input name="fax" type="text" size="18" maxlength="80" value="'.(isset($_POST["fax"])?$_POST["fax"]:$object->fax).'"></td></tr>';
-
-            // EMail
-            print '<tr><td>'.$langs->trans("EMail").'</td><td><input name="email" type="text" size="40" maxlength="80" value="'.(isset($_POST["email"])?$_POST["email"]:$object->email).'"></td>';
-            if (! empty($conf->mailing->enabled))
-            {
-                $langs->load("mails");
-                print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
-                print '<td>'.$object->getNbOfEMailings().'</td>';
-            }
-            else
-			{
-				print '<td colspan="2">&nbsp;</td>';
-            }
-            print '</tr>';
-
-            // Jabberid
-            print '<tr><td>'.$langs->trans("Jabberid").'</td><td><input name="jabberid" type="text" size="40" maxlength="80" value="'.(isset($_POST["jabberid"])?$_POST["jabberid"]:$object->jabberid).'"></td>';
-            if (! empty($conf->mailing->enabled))
-            {
-            	print '<td>'.$langs->trans("No_Email").'</td><td>'.$form->selectyesno('no_email',(isset($_POST["no_email"])?$_POST["no_email"]:$object->no_email), 1).'</td>';
-            }
-            else
-			{
-				print '<td colspan="2">&nbsp;</td>';
-			}
-            print '</tr>';
-
-            // Skype
-            if (! empty($conf->skype->enabled))
-            {
-                print '<tr><td>'.$langs->trans("Skype").'</td><td><input name="skype" type="text" size="40" maxlength="80" value="'.(isset($_POST["skype"])?$_POST["skype"]:$object->skype).'"></td></tr>';
-            }
-
-            // Visibility
-            print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td colspan="3">';
-            $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate"));
-            print $form->selectarray('priv',$selectarray,$object->priv,0);
-            print '</td></tr>';
-
-             // Note Public
-            print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td><td colspan="3">';
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-            print $doleditor->Create(1);
-            print '</td></tr>';
-
-            // Note Private
-            print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td><td colspan="3">';
-            $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-            print $doleditor->Create(1);
-            print '</td></tr>';
-
-            // Statut
-            print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
-            print '<td>';
-            print $object->getLibStatut(5);
-            print '</td></tr>';
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields,'edit');
-            }
-
-            $object->load_ref_elements();
-
-            if (! empty($conf->commande->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
-                print $object->ref_commande?$object->ref_commande:$langs->trans("NoContactForAnyOrder");
-                print '</td></tr>';
-            }
-
-            if (! empty($conf->propal->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
-                print $object->ref_propal?$object->ref_propal:$langs->trans("NoContactForAnyProposal");
-                print '</td></tr>';
-            }
-
-            if (! empty($conf->contrat->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
-                print $object->ref_contrat?$object->ref_contrat:$langs->trans("NoContactForAnyContract");
-                print '</td></tr>';
-            }
-
-            if (! empty($conf->facture->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
-                print $object->ref_facturation?$object->ref_facturation:$langs->trans("NoContactForAnyInvoice");
-                print '</td></tr>';
-            }
-
-            // Login Dolibarr
-            print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
-            if ($object->user_id)
-            {
-                $dolibarr_user=new User($db);
-                $result=$dolibarr_user->fetch($object->user_id);
-                print $dolibarr_user->getLoginUrl(1);
-            }
-            else print $langs->trans("NoDolibarrAccess");
-            print '</td></tr>';
-
-            print '</table><br>';
-
-            print '<center>';
-            print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-            print ' &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-            print '</center>';
-
-            print "</form>";
-        }
-    }
-
-    if (! empty($id) && $action != 'edit' && $action != 'create')
-    {
-        $objsoc = new Societe($db);
-
-        /*
-         * Fiche en mode visualisation
-         */
-
-        dol_htmloutput_errors($error,$errors);
-
-        if ($action == 'create_user')
-        {
-            // Full firstname and lastname separated with a dot : firstname.lastname
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            $login=dol_buildlogin($object->lastname,$object->firstname);
-
-            $generated_password='';
-            if (! $ldap_sid) // TODO ldap_sid ?
-            {
-                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-                $generated_password=getRandomPassword(false);
-            }
-            $password=$generated_password;
-
-            // Create a form array
-            $formquestion=array(
-            array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login),
-            array('label' => $langs->trans("Password"), 'type' => 'text', 'name' => 'password', 'value' => $password),
-            //array('label' => $form->textwithpicto($langs->trans("Type"),$langs->trans("InternalExternalDesc")), 'type' => 'select', 'name' => 'intern', 'default' => 1, 'values' => array(0=>$langs->trans('Internal'),1=>$langs->trans('External')))
-            );
-            $text=$langs->trans("ConfirmCreateContact").'<br>';
-            if (! empty($conf->societe->enabled))
-            {
-                if ($object->socid > 0) $text.=$langs->trans("UserWillBeExternalUser");
-                else $text.=$langs->trans("UserWillBeInternalUser");
-            }
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
-
-        }
-
-        print '<table class="border" width="100%">';
-
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
-
-        // Ref
-        print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
-        print $form->showrefnav($object, 'id', $linkback);
-        print '</td></tr>';
-
-        // Name
-        print '<tr><td width="20%">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</td><td width="30%">'.$object->lastname.'</td>';
-        print '<td width="20%">'.$langs->trans("Firstname").'</td><td width="30%">'.$object->firstname.'</td></tr>';
-
-        // Company
-        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-        {
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
-            if ($object->socid > 0)
-            {
-                $objsoc->fetch($object->socid);
-                print $objsoc->getNomUrl(1);
-            }
-            else
-            {
-                print $langs->trans("ContactNotLinkedToCompany");
-            }
-            print '</td></tr>';
-        }
-
-        // Civility
-        print '<tr><td width="15%">'.$langs->trans("UserTitle").'</td><td colspan="3">';
-        print $object->getCivilityLabel();
-        print '</td></tr>';
-
-        // Role
-        print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td colspan="3">'.$object->poste.'</td>';
-
-        // Address
-        print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3">';
-        dol_print_address($object->address,'gmap','contact',$object->id);
-        print '</td></tr>';
-
-        // Zip/Town
-        print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">';
-        print $object->zip;
-        if ($object->zip) print '&nbsp;';
-        print $object->town.'</td></tr>';
-
-        // Country
-        print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
-        $img=picto_from_langcode($object->country_code);
-        if ($img) print $img.' ';
-        print $object->country;
-        print '</td></tr>';
-
-        // State
-        if (empty($conf->global->SOCIETE_DISABLE_STATE))
-        {
-            print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'.$object->state.'</td>';
-        }
-
-        // Phone
-        print '<tr><td>'.$langs->trans("PhonePro").'</td><td>'.dol_print_phone($object->phone_pro,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td>';
-        print '<td>'.$langs->trans("PhonePerso").'</td><td>'.dol_print_phone($object->phone_perso,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td></tr>';
-
-        print '<tr><td>'.$langs->trans("PhoneMobile").'</td><td>'.dol_print_phone($object->phone_mobile,$object->country_code,$object->id,$object->socid,'AC_TEL').'</td>';
-        print '<td>'.$langs->trans("Fax").'</td><td>'.dol_print_phone($object->fax,$object->country_code,$object->id,$object->socid,'AC_FAX').'</td></tr>';
-
-        // Email
-        print '<tr><td>'.$langs->trans("EMail").'</td><td>'.dol_print_email($object->email,$object->id,$object->socid,'AC_EMAIL').'</td>';
-        if (! empty($conf->mailing->enabled))
-        {
-            $langs->load("mails");
-            print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
-            print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/liste.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td>';
-        }
-        else
-        {
-            print '<td colspan="2">&nbsp;</td>';
-        }
-        print '</tr>';
-
-        // Instant message and no email
-        print '<tr><td>'.$langs->trans("IM").'</td><td>'.$object->jabberid.'</td>';
-        if (!empty($conf->mailing->enabled))
-        {
-        	print '<td>'.$langs->trans("No_Email").'</td><td>'.yn($object->no_email).'</td>';
-        }
-        else
-       {
-	       	print '<td colspan="2">&nbsp;</td>';
-        }
-        print '</tr>';
-
-        // Skype
-        if (! empty($conf->skype->enabled))
-        {
-            print '<tr><td>'.$langs->trans("Skype").'</td><td colspan="3">'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
-        }
-
-        print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td colspan="3">';
-        print $object->LibPubPriv($object->priv);
-        print '</td></tr>';
-
-        // Note Public
-        print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td><td colspan="3">';
-        print nl2br($object->note_public);
-        print '</td></tr>';
-
-        // Note Private
-        print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td><td colspan="3">';
-        print nl2br($object->note_private);
-
-	 	// Statut
-		print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
-		print '<td>';
-		print $object->getLibStatut(5);
-		print '</td>';
-		print '</tr>'."\n";
-        // Other attributes
-        $parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields);
-        }
-
-        $object->load_ref_elements();
-
-        if (! empty($conf->commande->enabled))
-        {
-            print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
-            print $object->ref_commande?$object->ref_commande:$langs->trans("NoContactForAnyOrder");
-            print '</td></tr>';
-        }
-
-        if (! empty($conf->propal->enabled))
-        {
-            print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
-            print $object->ref_propal?$object->ref_propal:$langs->trans("NoContactForAnyProposal");
-            print '</td></tr>';
-        }
-
-        if (! empty($conf->contrat->enabled))
-        {
-            print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
-            print $object->ref_contrat?$object->ref_contrat:$langs->trans("NoContactForAnyContract");
-            print '</td></tr>';
-        }
-
-        if (! empty($conf->facture->enabled))
-        {
-            print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
-            print $object->ref_facturation?$object->ref_facturation:$langs->trans("NoContactForAnyInvoice");
-            print '</td></tr>';
-        }
-
-        print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
-        if ($object->user_id)
-        {
-            $dolibarr_user=new User($db);
-            $result=$dolibarr_user->fetch($object->user_id);
-            print $dolibarr_user->getLoginUrl(1);
-        }
-        else print $langs->trans("NoDolibarrAccess");
-        print '</td></tr>';
-
-        print "</table>";
-
-        print "</div>";
-
-        // Barre d'actions
-        print '<div class="tabsAction">';
-
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
-        	if ($user->rights->societe->contact->creer)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
-            }
-
-            if (! $object->user_id && $user->rights->user->user->creer)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a>';
-            }
-
-            if ($user->rights->societe->contact->supprimer)
-            {
-                print '<a class="butActionDelete" href="fiche.php?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-            }
-            // Activer
-            if ($object->statut == 0 && $user->rights->societe->contact->creer)
-            {
-                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
-            }
-            // Desactiver
-            if ($object->statut == 1 && $user->rights->societe->contact->creer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
-            }
-        }
-
-        print "</div><br>";
-
-		if (! empty($conf->agenda->enabled))
-		{
-        	print load_fiche_titre($langs->trans("TasksHistoryForThisContact"),'','');
-
-        	print show_actions_todo($conf,$langs,$db,$objsoc,$object);
-
-        	print show_actions_done($conf,$langs,$db,$objsoc,$object);
-		}
-    }
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/contact/index.html b/htdocs/contact/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/contact/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 1681324323a..170ed039904 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -49,8 +49,6 @@ $contact->fetch($id, $user);
 
 if ($action == 'dolibarr2ldap')
 {
-	$message="";
-
 	$db->begin();
 
 	$ldap=new Ldap();
@@ -64,12 +62,12 @@ if ($action == 'dolibarr2ldap')
 
 	if ($result >= 0)
 	{
-		$message.='<div class="ok">'.$langs->trans("ContactSynchronized").'</div>';
+		setEventMessage($langs->trans("ContactSynchronized"));
 		$db->commit();
 	}
 	else
 	{
-		$message.='<div class="error">'.$ldap->error.'</div>';
+		setEventMessage($ldap->error, 'errors');
 		$db->rollback();
 	}
 }
@@ -107,11 +105,11 @@ if ($contact->socid > 0)
 	$objsoc = new Societe($db);
 	$objsoc->fetch($contact->socid);
 
-	print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
 }
 else
 {
-	print '<tr><td width="20%">'.$langs->trans("Company").'</td><td colspan="3">';
+	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
 	print $langs->trans("ContactNotLinkedToCompany");
 	print '</td></tr>';
 }
@@ -136,10 +134,6 @@ print '</table>';
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fadabea88c1..4413b721fc9 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -39,6 +39,7 @@ $contactid = GETPOST('id','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contact', $contactid,'');
 
+$search_firstlast_only=GETPOST("search_firstlast_only");
 $search_lastname=GETPOST("search_lastname");
 $search_firstname=GETPOST("search_firstname");
 $search_societe=GETPOST("search_societe");
@@ -51,8 +52,8 @@ $search_fax=GETPOST("search_fax");
 $search_email=GETPOST("search_email");
 $search_skype=GETPOST("search_skype");
 $search_priv=GETPOST("search_priv");
-$search_categ = GETPOST("search_categ",'int');
-$search_status		= GETPOST("search_status",'int');
+$search_categ=GETPOST("search_categ",'int');
+$search_status=GETPOST("search_status",'int');
 if ($search_status=='') $search_status=1; // always display activ customer first
 
 
@@ -74,15 +75,20 @@ $offset = $limit * $page;
 
 $langs->load("companies");
 $titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-if ($type == "c" || $type=="p")
+if ($type == "p")
+{
+	$titre.='  ('.$langs->trans("ThirdPartyProspects").')';
+	$urlfiche="card.php";
+}
+if ($type == "c")
 {
 	$titre.='  ('.$langs->trans("ThirdPartyCustomers").')';
-	$urlfiche="fiche.php";
+	$urlfiche="card.php";
 }
 else if ($type == "f")
 {
 	$titre.=' ('.$langs->trans("ThirdPartySuppliers").')';
-	$urlfiche="fiche.php";
+	$urlfiche="card.php";
 }
 else if ($type == "o")
 {
@@ -90,8 +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_lastname="";
     $search_firstname="";
     $search_societe="";
@@ -124,9 +131,9 @@ $formother=new FormOther($db);
 $sql = "SELECT s.rowid as socid, s.nom as name,";
 $sql.= " p.rowid as cidp, p.lastname as lastname, p.statut, p.firstname, p.poste, p.email, p.skype,";
 $sql.= " p.phone, p.phone_mobile, p.fax, p.fk_pays, p.priv, p.tms,";
-$sql.= " cp.code as country_code";
+$sql.= " co.code as country_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as cp ON cp.rowid = p.fk_pays";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cs ON p.rowid = cs.fk_socpeople"; // We need this table joined to the select in order to filter by categ
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
@@ -154,6 +161,9 @@ else
 if ($search_categ > 0)   $sql.= " AND cs.fk_categorie = ".$search_categ;
 if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
 
+if ($search_firstlast_only) {
+    $sql .= natural_search(array('p.lastname','p.firstname'), $search_firstlast_only);
+}
 if ($search_lastname) {      // filter on lastname
     $sql .= natural_search('p.lastname', $search_lastname);
 }
@@ -213,7 +223,7 @@ else if ($type == "p")        // filtre sur type
 }
 if ($sall)
 {
-    $sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email'), $sall);
+    $sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email', 's.nom'), $sall);
 }
 if (! empty($socid))
 {
@@ -239,7 +249,7 @@ else
 }
 
 //print $sql;
-dol_syslog("contact/list.php sql=".$sql);
+dol_syslog("contact/list.php", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
@@ -277,9 +287,12 @@ if ($result)
 
     if ($sall)
     {
-        print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall;
+        print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("ThirdParty")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall;
     }
-
+	if ($search_firstlast_only)
+	{
+        print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")."): ".$search_firstlast_only;
+	}
     print '<table class="liste" width="100%">';
 
     // Ligne des titres
@@ -287,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); }
@@ -343,9 +356,8 @@ if ($result)
     print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    print '<input type="image" value="button_search" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print '&nbsp; ';
-    print '<input type="image" value="button_removefilter" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print '<input type="image" name="button_search" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+    print '<input type="image" name="button_removefilter" class="liste_titre" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print '</td>';
     print '</tr>';
 
@@ -378,7 +390,7 @@ if ($result)
     		print '<td>';
             if ($obj->socid)
             {
-                print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">';
+                print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
                 print img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,20).'</a>';
             }
             else
@@ -410,7 +422,7 @@ if ($result)
 
 		// Links Add action and Export vcard
         print '<td align="right">';
-        print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>';
+        print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->socid.'">'.img_object($langs->trans("AddAction"),"action").'</a>';
         print ' &nbsp; ';
         print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$obj->cidp.'">';
         print img_picto($langs->trans("VCard"),'vcard.png').' ';
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 '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+    		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
     	}
 
     	else
     	{
-    		print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+    		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
     		print $langs->trans("ContactNotLinkedToCompany");
     		print '</td></tr>';
     	}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 92ba03e9861..6ec43320e54 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 '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
         }
         else
         {
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
         }
@@ -179,12 +179,12 @@ else
             $objsoc = new Societe($db);
             $objsoc->fetch($object->socid);
 
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
         }
 
         else
         {
-            print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
         }
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index e78c298c541..77abf31ac89 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -75,7 +75,7 @@ if ($company->id)
 	if (! $contact->zip)        $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country_code, "WORK;POSTAL");
 	if ($company->email != $contact->email) $v->setEmail($company->email,'internet');
 	// Si contact lie a un tiers non de type "particulier"
-	if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->nom);
+	if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
 }
 
 // Personal informations
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 227ef23f741..afb86224151 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -39,7 +39,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/contrat/admin/index.html b/htdocs/contrat/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
new file mode 100644
index 00000000000..f27d47f2dd5
--- /dev/null
+++ b/htdocs/contrat/card.php
@@ -0,0 +1,1863 @@
+<?php
+/* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
+ * Copyright (C) 2013-2014  Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2014		Ferran Marcet		  	<fmarcet@2byte.es>
+ * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/contrat/card.php
+ *       \ingroup    contrat
+ *       \brief      Page of a contract
+ */
+
+require ("../main.inc.php");
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.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';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+
+$langs->load("contracts");
+$langs->load("orders");
+$langs->load("companies");
+$langs->load("bills");
+$langs->load("products");
+$langs->load('compta');
+
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+$socid = GETPOST('socid','int');
+$id = GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+
+$datecontrat='';
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'contrat',$id);
+
+$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('contractcard','globalcard'));
+
+$object = new Contrat($db);
+$extrafields = new ExtraFields($db);
+
+// Load object
+if ($id > 0 || ! empty($ref)) {
+	$ret = $object->fetch($id, $ref);
+	if ($ret > 0)
+		$ret = $object->fetch_thirdparty();
+	if ($ret < 0)
+		dol_print_error('', $object->error);
+}
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+$permissionnote=$user->rights->contrat->creer;	// Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer)
+{
+    $result = $object->active_line($user, GETPOST('ligne'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
+
+    if ($result > 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else {
+        setEventMessage($object->error,'errors');
+    }
+}
+
+else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
+{
+	if (! GETPOST('dateend'))
+	{
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")),'errors');
+	}
+	if (! $error)
+	{
+	    $result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment')));
+	    if ($result > 0)
+	    {
+	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+	        exit;
+	    }
+	    else {
+	        setEventMessage($object->error,'errors');
+	    }
+	}
+}
+
+// Si ajout champ produit predefini
+if (GETPOST('mode')=='predefined')
+{
+    $date_start='';
+    $date_end='';
+    if (GETPOST('date_startmonth') && GETPOST('date_startday') && GETPOST('date_startyear'))
+    {
+        $date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+    }
+    if (GETPOST('date_endmonth') && GETPOST('date_endday') && GETPOST('date_endyear'))
+    {
+        $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+    }
+}
+
+// Si ajout champ produit libre
+if (GETPOST('mode')=='libre')
+{
+    $date_start_sl='';
+    $date_end_sl='';
+    if (GETPOST('date_start_slmonth') && GETPOST('date_start_slday') && GETPOST('date_start_slyear'))
+    {
+        $date_start_sl=dol_mktime(GETPOST('date_start_slhour'), GETPOST('date_start_slmin'), 0, GETPOST('date_start_slmonth'), GETPOST('date_start_slday'), GETPOST('date_start_slyear'));
+    }
+    if (GETPOST('date_end_slmonth') && GETPOST('date_end_slday') && GETPOST('date_end_slyear'))
+    {
+        $date_end_sl=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
+    }
+}
+
+// Param dates
+$date_contrat='';
+$date_start_update='';
+$date_end_update='';
+$date_start_real_update='';
+$date_end_real_update='';
+if (GETPOST('date_start_updatemonth') && GETPOST('date_start_updateday') && GETPOST('date_start_updateyear'))
+{
+    $date_start_update=dol_mktime(GETPOST('date_start_updatehour'), GETPOST('date_start_updatemin'), 0, GETPOST('date_start_updatemonth'), GETPOST('date_start_updateday'), GETPOST('date_start_updateyear'));
+}
+if (GETPOST('date_end_updatemonth') && GETPOST('date_end_updateday') && GETPOST('date_end_updateyear'))
+{
+    $date_end_update=dol_mktime(GETPOST('date_end_updatehour'), GETPOST('date_end_updatemin'), 0, GETPOST('date_end_updatemonth'), GETPOST('date_end_updateday'), GETPOST('date_end_updateyear'));
+}
+if (GETPOST('date_start_real_updatemonth') && GETPOST('date_start_real_updateday') && GETPOST('date_start_real_updateyear'))
+{
+    $date_start_real_update=dol_mktime(GETPOST('date_start_real_updatehour'), GETPOST('date_start_real_updatemin'), 0, GETPOST('date_start_real_updatemonth'), GETPOST('date_start_real_updateday'), GETPOST('date_start_real_updateyear'));
+}
+if (GETPOST('date_end_real_updatemonth') && GETPOST('date_end_real_updateday') && GETPOST('date_end_real_updateyear'))
+{
+    $date_end_real_update=dol_mktime(GETPOST('date_end_real_updatehour'), GETPOST('date_end_real_updatemin'), 0, GETPOST('date_end_real_updatemonth'), GETPOST('date_end_real_updateday'), GETPOST('date_end_real_updateyear'));
+}
+if (GETPOST('remonth') && GETPOST('reday') && GETPOST('reyear'))
+{
+    $datecontrat = dol_mktime(GETPOST('rehour'), GETPOST('remin'), 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+}
+
+// Add contract
+if ($action == 'add' && $user->rights->contrat->creer)
+{
+	// Check
+	if (empty($datecontrat))
+	{
+		$error++;
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")),'errors');
+		$action='create';
+	}
+
+	if ($socid<1)
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Customer")),'errors');
+		$action='create';
+		$error++;
+	}
+
+	if (! $error)
+	{
+		$object->socid						= $socid;
+    	$object->date_contrat				= $datecontrat;
+
+    	$object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
+    	$object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
+
+    	$object->note_private				= GETPOST('note_private','alpha');
+    	$object->note_public				= GETPOST('note_public','alpha');
+    	$object->fk_project					= GETPOST('projectid','int');
+    	$object->remise_percent				= GETPOST('remise_percent','alpha');
+    	$object->ref						= GETPOST('ref','alpha');
+    	$object->ref_supplier				= GETPOST('ref_supplier','alpha');
+
+	    // If creation from another object of another module (Example: origin=propal, originid=1)
+	    if ($_POST['origin'] && $_POST['originid'])
+	    {
+	        // Parse element/subelement (ex: project_task)
+	        $element = $subelement = $_POST['origin'];
+	        if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
+	        {
+	            $element = $regs[1];
+	            $subelement = $regs[2];
+	        }
+
+	        // For compatibility
+	        if ($element == 'order')    { $element = $subelement = 'commande'; }
+	        if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
+
+	        $object->origin    = $_POST['origin'];
+	        $object->origin_id = $_POST['originid'];
+
+	        // Possibility to add external linked objects with hooks
+	        $object->linked_objects[$object->origin] = $object->origin_id;
+	        if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
+	        {
+	        	$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
+	        }
+
+	        $id = $object->create($user);
+	        if ($id < 0) {
+	        	setEventMessage($object->error,'errors');
+	        }
+
+	        if ($id > 0)
+	        {
+	            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+	            $classname = ucfirst($subelement);
+	            $srcobject = new $classname($db);
+
+	            dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
+	            $result=$srcobject->fetch($object->origin_id);
+	            if ($result > 0)
+	            {
+	                $srcobject->fetch_thirdparty();
+					$lines = $srcobject->lines;
+	                if (empty($lines) && method_exists($srcobject,'fetch_lines'))
+	                {
+	                	$srcobject->fetch_lines();
+	                	$lines = $srcobject->lines;
+	                }
+
+	                $fk_parent_line=0;
+	                $num=count($lines);
+
+	                for ($i=0;$i<$num;$i++)
+	                {
+	                    $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+
+						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)
+							{
+								$product_static = new Product($db);
+
+								// Define output language
+								if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+								{
+									$prod = new Product($db);
+									$prod->id=$lines[$i]->fk_product;
+									$prod->getMultiLangs();
+
+									$outputlangs = $langs;
+									$newlang='';
+									if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+									if (empty($newlang)) $newlang=$srcobject->thirdparty->default_lang;
+									if (! empty($newlang))
+									{
+										$outputlangs = new Translate("",$conf);
+										$outputlangs->setDefaultLang($newlang);
+									}
+
+									$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
+								}
+								else
+								{
+									$label = $lines[$i]->product_label;
+								}
+
+								if ($conf->global->PRODUIT_DESC_IN_FORM)
+									$desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
+							}
+							else {
+							    $desc = dol_htmlentitiesbr($lines[$i]->desc);
+					        }
+
+		                    $result = $object->addline(
+				                $desc,
+				                $lines[$i]->subprice,
+				                $lines[$i]->qty,
+				                $lines[$i]->tva_tx,
+				                $lines[$i]->localtax1_tx,
+				                $lines[$i]->localtax2_tx,
+				                $lines[$i]->fk_product,
+				                $lines[$i]->remise_percent,
+				                $lines[$i]->date_start,
+				                $lines[$i]->date_end,
+				                'HT',
+				                0,
+				                $lines[$i]->info_bits,
+			                    $lines[$i]->fk_fournprice,
+			                    $lines[$i]->pa_ht
+		                    );
+
+		                    if ($result < 0)
+		                    {
+		                        $error++;
+		                        break;
+		                    }
+
+						}
+	                }
+	            }
+	            else
+	            {
+	                setEventMessage($srcobject->error,'errors');
+	                $error++;
+	            }
+	        }
+	        else
+	        {
+	            setEventMessage($object->error,'errors');
+	            $error++;
+	        }
+	    }
+	    else
+	    {
+
+	    	// Fill array 'array_options' with data from add form
+	    	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+
+	        $result = $object->create($user);
+	        if ($result > 0)
+	        {
+	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+	            exit;
+	        }
+	        else {
+	        	setEventMessage($object->error,'errors');
+	        }
+	        $action='create';
+		}
+    }
+}
+
+else if ($action == 'classin' && $user->rights->contrat->creer)
+{
+    $object->setProject(GETPOST('projectid'));
+}
+
+// Add a new line
+else if ($action == 'addline' && $user->rights->contrat->creer)
+{
+	// Set if we used free entry or predefined product
+	$predef='';
+	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	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 = '';
+	}
+
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
+
+    if ($qty == '')
+    {
+    	setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")),'errors');
+    	$error++;
+    }
+    if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc))
+    {
+    	setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")),'errors');
+    	$error++;
+    }
+
+    if (! $error)
+    {
+		// Clean parameters
+		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
+		$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
+
+        // Ecrase $pu par celui du produit
+        // Ecrase $desc par celui du produit
+        // Ecrase $txtva par celui du produit
+        // Ecrase $base_price_type par celui du produit
+        if ($idprod > 0)
+        {
+            $prod = new Product($db);
+            $prod->fetch($idprod);
+
+            $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
+            $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
+            $pu_ht = $prod->price;
+            $pu_ttc = $prod->price_ttc;
+            $price_min = $prod->price_min;
+            $price_base_type = $prod->price_base_type;
+
+            // On defini prix unitaire
+            if ($conf->global->PRODUIT_MULTIPRICES && $object->thirdparty->price_level)
+            {
+                $pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+                $pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+                $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+                $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+            }
+        	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+			{
+				require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+				$prodcustprice = new Productcustomerprice($db);
+
+				$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
+
+				$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+				if ($result) {
+					if (count($prodcustprice->lines) > 0) {
+						$pu_ht = price($prodcustprice->lines [0]->price);
+						$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+						$price_base_type = $prodcustprice->lines [0]->price_base_type;
+						$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+					}
+				}
+			}
+
+            // On reevalue prix selon taux tva car taux tva transaction peut etre different
+            // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+            if ($tva_tx != $prod->tva_tx)
+            {
+                if ($price_base_type != 'HT')
+                {
+                    $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
+                }
+                else
+              {
+                    $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
+                }
+            }
+
+           	$desc=$prod->description;
+           	$desc=dol_concatdesc($desc,$product_desc);
+        }
+        else
+		{
+            $pu_ht=GETPOST('price_ht');
+            $price_base_type = 'HT';
+            $tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0;		// tva_tx field may be disabled, so we use vat rate 0
+            $tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0;
+            $desc=$product_desc;
+        }
+
+        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty);
+        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty);
+
+		// ajout prix achat
+		$fk_fournprice = $_POST['fournprice'];
+		if ( ! empty($_POST['buying_price']) )
+		  $pa_ht = $_POST['buying_price'];
+		else
+		  $pa_ht = null;
+
+        $info_bits=0;
+        if ($tva_npr) $info_bits |= 0x01;
+
+        if($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))
+        {
+            $object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
+            $result = -1 ;
+        }
+        else
+		{
+            // Insert line
+            $result = $object->addline(
+                $desc,
+                $pu_ht,
+                $qty,
+                $tva_tx,
+                $localtax1_tx,
+                $localtax2_tx,
+                $idprod,
+                $remise_percent,
+                $date_start,
+                $date_end,
+                $price_base_type,
+                $pu_ttc,
+                $info_bits,
+      			$fk_fournprice,
+      			$pa_ht
+            );
+        }
+
+        if ($result > 0)
+        {
+        	// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+
+			unset($_POST ['prod_entry_mode']);
+
+			unset($_POST['qty']);
+			unset($_POST['type']);
+			unset($_POST['remise_percent']);
+			unset($_POST['price_ht']);
+			unset($_POST['price_ttc']);
+			unset($_POST['tva_tx']);
+			unset($_POST['product_ref']);
+			unset($_POST['product_label']);
+			unset($_POST['product_desc']);
+			unset($_POST['fournprice']);
+			unset($_POST['buying_price']);
+			unset($_POST ['np_marginRate']);
+			unset($_POST ['np_markRate']);
+			unset($_POST['dp_desc']);
+			unset($_POST['idprod']);
+
+	    	unset($_POST['date_starthour']);
+	    	unset($_POST['date_startmin']);
+	    	unset($_POST['date_startsec']);
+	    	unset($_POST['date_startday']);
+	    	unset($_POST['date_startmonth']);
+	    	unset($_POST['date_startyear']);
+	    	unset($_POST['date_endhour']);
+	    	unset($_POST['date_endmin']);
+	    	unset($_POST['date_endsec']);
+	    	unset($_POST['date_endday']);
+	    	unset($_POST['date_endmonth']);
+	    	unset($_POST['date_endyear']);
+        }
+        else
+        {
+        	setEventMessage($object->error,'errors');
+        }
+    }
+}
+
+else if ($action == 'updateligne' && $user->rights->contrat->creer && ! GETPOST('cancel'))
+{
+    $objectline = new ContratLigne($db);
+    if ($objectline->fetch(GETPOST('elrowid')))
+    {
+        $db->begin();
+
+        if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
+        if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
+
+		$localtax1_tx=get_localtax(GETPOST('eltva_tx'),1,$object->thirdparty);
+        $localtax2_tx=get_localtax(GETPOST('eltva_tx'),2,$object->thirdparty);
+
+	  	// ajout prix d'achat
+	  	$fk_fournprice = $_POST['fournprice'];
+	  	if ( ! empty($_POST['buying_price']) )
+	  	  $pa_ht = $_POST['buying_price'];
+	  	else
+	  	  $pa_ht = null;
+
+        $objectline->description=GETPOST('product_desc');
+        $objectline->price_ht=GETPOST('elprice');
+        $objectline->subprice=GETPOST('elprice');
+        $objectline->qty=GETPOST('elqty');
+        $objectline->remise_percent=GETPOST('elremise_percent');
+        $objectline->tva_tx=GETPOST('eltva_tx')?GETPOST('eltva_tx'):0;	// Field may be disabled, so we use vat rate 0
+        $objectline->localtax1_tx=$localtax1_tx;
+        $objectline->localtax2_tx=$localtax2_tx;
+        $objectline->date_ouverture_prevue=$date_start_update;
+        $objectline->date_ouverture=$date_start_real_update;
+        $objectline->date_fin_validite=$date_end_update;
+        $objectline->date_cloture=$date_end_real_update;
+        $objectline->fk_user_cloture=$user->id;
+        $objectline->fk_fournprice=$fk_fournprice;
+        $objectline->pa_ht=$pa_ht;
+
+        // TODO verifier price_min si fk_product et multiprix
+
+        $result=$objectline->update($user);
+        if ($result > 0)
+        {
+            $db->commit();
+        }
+        else
+        {
+        	setEventMessage($objectline->error,'errors');
+            $db->rollback();
+        }
+    }
+    else
+    {
+    	setEventMessage($objectline->error,'errors');
+    }
+}
+
+else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
+{
+    $result = $object->deleteline(GETPOST('lineid'),$user);
+
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+    	setEventMessage($object->error,'errors');
+    }
+}
+
+else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
+{
+    $result = $object->validate($user);
+}
+
+// Close all lines
+else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
+{
+    $result = $object->cloture($user);
+}
+
+else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
+{
+	$result=$object->delete($user);
+	if ($result >= 0)
+	{
+		header("Location: index.php");
+		return;
+	}
+	else
+	{
+		setEventMessage($object->error,'errors');
+	}
+}
+
+else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
+{
+	if (GETPOST('newcid') > 0)
+	{
+		$contractline = new ContratLigne($db);
+		$result=$contractline->fetch(GETPOST('lineid'));
+		$contractline->fk_contrat = GETPOST('newcid');
+		$result=$contractline->update($user,1);
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+			return;
+		}
+		else
+		{
+			setEventMessage($object->error,'errors');
+		}
+	}
+	else
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefNewContract")),'errors');
+	}
+} else if ($action == 'update_extras') {
+	// Fill array 'array_options' with data from update form
+	$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+	if ($ret < 0)
+		$error ++;
+
+	if (! $error) {
+
+			$result = $object->insertExtraFields();
+			if ($result < 0) {
+				$error ++;
+			}
+		} else if ($reshook < 0)
+			$error ++;
+
+	if ($error) {
+		$action = 'edit_extras';
+		setEventMessage($object->error,'errors');
+	}
+} elseif ($action=='setref_supplier') {
+
+	$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');
+
+	$result = $object->update($user);
+	if ($result < 0) {
+		setEventMessage($object->errors,'errors');
+		$action='editref';
+	} else {
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+}
+
+// Generation doc (depuis lien ou depuis cartouche doc)
+else if ($action == 'builddoc' && $user->rights->contrat->creer) {
+	if (GETPOST('model')) {
+		$object->setDocModel($user, GETPOST('model'));
+	}
+
+	// Define output language
+	$outputlangs = $langs;
+	if (! empty($conf->global->MAIN_MULTILANGS)) {
+		$outputlangs = new Translate("", $conf);
+		$newlang = (GETPOST('lang_id') ? GETPOST('lang_id') : $object->thirdparty->default_lang);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	$ret = $object->fetch($id); // Reload to get new records
+	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+	if ($result <= 0) {
+		dol_print_error($db, $result);
+		exit();
+	} else {
+		header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
+		exit();
+	}
+}
+
+// Remove file in doc form
+else if ($action == 'remove_file' && $user->rights->contrat->creer) {
+	if ($object->id > 0) {
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+		$langs->load("other");
+		$upload_dir = $conf->contrat->dir_output;
+		$file = $upload_dir . '/' . GETPOST('file');
+		$ret = dol_delete_file($file, 0, 0, 0, $object);
+		if ($ret)
+			setEventMessage($langs->trans("FileWasRemoved", GETPOST('file')));
+		else
+			setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), 'errors');
+	}
+}
+
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
+{
+	if ($action == 'addcontact')
+	{
+		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+		$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else
+		{
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$langs->load("errors");
+				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"),'errors');
+			}
+			else
+			{
+				setEventMessage($object->error,'errors');
+			}
+		}
+	}
+
+	// bascule du statut d'un contact
+	else if ($action == 'swapstatut')
+	{
+		$result=$object->swapContactStatus(GETPOST('ligne'));
+	}
+
+	// Efface un contact
+	else if ($action == 'deletecontact')
+	{
+		$result = $object->delete_contact(GETPOST('lineid'));
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else {
+			setEventMessage($object->error,'errors');
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans("ContractCard"),"Contrat");
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+$objectlignestatic=new ContratLigne($db);
+
+// Load object modContract
+$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);
+}
+$result=dol_include_once('/core/modules/contract/'.$module.'.php');
+if ($result > 0)
+{
+	$modCodeContract = new $module();
+}
+
+
+/*********************************************************************
+ *
+ * Mode creation
+ *
+ *********************************************************************/
+if ($action == 'create')
+{
+	print_fiche_titre($langs->trans('AddContract'));
+
+    $soc = new Societe($db);
+    if ($socid>0) $soc->fetch($socid);
+
+    if (GETPOST('origin') && GETPOST('originid'))
+    {
+        // Parse element/subelement (ex: project_task)
+        $element = $subelement = GETPOST('origin');
+        if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
+        {
+            $element = $regs[1];
+            $subelement = $regs[2];
+        }
+
+        if ($element == 'project')
+        {
+            $projectid=GETPOST('originid');
+        }
+        else
+        {
+            // For compatibility
+            if ($element == 'order' || $element == 'commande')    { $element = $subelement = 'commande'; }
+            if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
+
+            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+            $classname = ucfirst($subelement);
+            $objectsrc = new $classname($db);
+            $objectsrc->fetch(GETPOST('originid'));
+            if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
+            $objectsrc->fetch_thirdparty();
+
+            $projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
+
+            $soc = $objectsrc->client;
+
+            $note_private		= (! empty($objectsrc->note_private) ? $objectsrc->note_private : '');
+            $note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
+
+            // Object source contacts list
+            $srccontactslist = $objectsrc->liste_contact(-1,'external',1);
+        }
+    }
+    else {
+		$projectid = GETPOST('projectid','int');
+		$note_private = GETPOST("note_private");
+		$note_public = GETPOST("note_public");
+	}
+
+    $object->date_contrat = dol_now();
+
+    print '<form name="form_contract" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+    print '<input type="hidden" name="action" value="add">';
+    print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
+    print '<input type="hidden" name="remise_percent" value="0">';
+
+    print '<table class="border" width="100%">';
+
+    // Ref
+    if (! empty($modCodeContract->code_auto)) {
+    	$tmpcode=$langs->trans("Draft");
+    } else {
+    	$tmpcode='<input name="ref" size="20" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+    }
+	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$tmpcode.'</td></tr>';
+
+	// Ref supplier
+	print '<tr><td>'.$langs->trans('RefSupplier').'</td>';
+	print '<td colspan="2"><input type="text" size="5" name="ref_supplier" id="ref_supplier" value="'.GETPOST('ref_supplier','alpha').'"></td></tr>';
+
+    // Customer
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
+	if($socid>0)
+	{
+		print '<td colspan="2">';
+		print $soc->getNomUrl(1);
+		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
+		print '</td>';
+	}
+	else
+	{
+		print '<td colspan="2">';
+		print $form->select_company('','socid','s.client = 1 OR s.client = 3',1);
+		print '</td>';
+	}
+	print '</tr>'."\n";
+
+	if($socid>0)
+	{
+		// Ligne info remises tiers
+		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
+		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
+		else print $langs->trans("CompanyHasNoRelativeDiscount");
+		print '. ';
+		$absolute_discount=$soc->getAvailableDiscounts();
+		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		print '.';
+		print '</td></tr>';
+	}
+
+    // Commercial suivi
+    print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
+    print $form->select_dolusers(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,'');
+    print '</td></tr>';
+
+    // Commercial signature
+    print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
+    print $form->select_dolusers(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,'');
+    print '</td></tr>';
+
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
+    $form->select_date($datecontrat,'',0,0,'',"contrat");
+    print "</td></tr>";
+
+    if (! empty($conf->projet->enabled))
+    {
+    	$formproject=new FormProjets($db);
+
+        print '<tr><td>'.$langs->trans("Project").'</td><td>';
+        $formproject->select_projects($soc->id,$projectid,"projectid");
+        print "</td></tr>";
+    }
+
+    print '<tr><td>'.$langs->trans("NotePublic").'</td><td valign="top">';
+
+
+    $doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
+    print $doleditor->Create(1);
+
+
+    if (empty($user->societe_id))
+    {
+        print '<tr><td>'.$langs->trans("NotePrivate").'</td><td valign="top">';
+        $doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
+        print $doleditor->Create(1);
+        print '</td></tr>';
+    }
+
+    // Other attributes
+    $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+    // Other attributes
+    if (empty($reshook) && ! empty($extrafields->attribute_label)) {
+    	print $object->showOptionals($extrafields, 'edit');
+    }
+
+    print "</table>\n";
+
+    print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+
+    if (is_object($objectsrc))
+    {
+        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+
+        if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))
+        {
+        	print '<br>'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
+        }
+	}
+
+    print "</form>\n";
+
+    dol_fiche_end();
+}
+else
+/* *************************************************************************** */
+/*                                                                             */
+/* Mode vue et edition                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+{
+    $now=dol_now();
+
+    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);
+
+        $nbofservices=count($object->lines);
+
+        $author = new User($db);
+        $author->fetch($object->user_author_id);
+
+        $commercial_signature = new User($db);
+        $commercial_signature->fetch($object->commercial_signature_id);
+
+        $commercial_suivi = new User($db);
+        $commercial_suivi->fetch($object->commercial_suivi_id);
+
+        $head = contract_prepare_head($object);
+
+        $hselected = 0;
+
+        dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract');
+
+
+        /*
+         * Confirmation de la suppression du contrat
+         */
+        if ($action == 'delete')
+        {
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("DeleteAContract"),$langs->trans("ConfirmDeleteAContract"),"confirm_delete",'',0,1);
+
+        }
+
+        /*
+         * Confirmation de la validation
+         */
+        if ($action == 'valid')
+        {
+        	$ref = substr($object->ref, 1, 4);
+        	if ($ref == 'PROV' && !empty($modCodeContract->code_auto))
+        	{
+        		$numref = $object->getNextNumRef($soc);
+        	}
+        	else
+        	{
+        		$numref = $object->ref;
+        	}
+
+        	$text=$langs->trans('ConfirmValidateContract',$numref);
+
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ValidateAContract"),$text,"confirm_valid",'',0,1);
+
+        }
+
+        /*
+         * Confirmation de la fermeture
+         */
+        if ($action == 'close')
+        {
+            print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("CloseAContract"),$langs->trans("ConfirmCloseContract"),"confirm_close",'',0,1);
+
+        }
+
+        /*
+         *   Contrat
+         */
+        if (! empty($object->brouillon) && $user->rights->contrat->creer)
+        {
+            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="setremise">';
+        }
+
+        print '<table class="border" width="100%">';
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+        // Ref du contrat
+        if (!empty($modCodeContract->code_auto)) {
+	        print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	        print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+	        print "</td></tr>";
+        } else {
+        	print '<tr>';
+        	print '<td  width="20%">';
+        	print $form->editfieldkey("Ref",'ref',$object->ref,$object,$user->rights->contrat->creer);
+        	print '</td><td>';
+        	print $form->editfieldval("Ref",'ref',$object->ref,$object,$user->rights->contrat->creer);
+        	print '</td>';
+        	print '</tr>';
+        }
+
+        print '<tr>';
+		print '<td  width="20%">';
+		print $form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
+		print '</td><td>';
+		print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
+		print '</td>';
+		print '</tr>';
+
+        // Customer
+        print "<tr><td>".$langs->trans("Customer")."</td>";
+        print '<td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';
+
+        // Ligne info remises tiers
+        print '<tr><td>'.$langs->trans('Discount').'</td><td colspan="3">';
+        if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
+        else print $langs->trans("CompanyHasNoRelativeDiscount");
+        $absolute_discount=$object->thirdparty->getAvailableDiscounts();
+        print '. ';
+        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+        else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+        print '.';
+        print '</td></tr>';
+
+        // Statut contrat
+        print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
+        if ($object->statut==0) print $object->getLibStatut(2);
+        else print $object->getLibStatut(4);
+        print "</td></tr>";
+
+        // Date
+        print '<tr><td>'.$langs->trans("Date").'</td>';
+        print '<td colspan="3">'.dol_print_date($object->date_contrat,"dayhour")."</td></tr>\n";
+
+        // Projet
+        if (! empty($conf->projet->enabled))
+        {
+            $langs->load("projects");
+            print '<tr><td>';
+            print '<table width="100%" class="nobordernopadding"><tr><td>';
+            print $langs->trans("Project");
+            print '</td>';
+            if ($action != "classify" && $user->rights->projet->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->trans("SetProject")).'</a></td>';
+            print '</tr></table>';
+            print '</td><td colspan="3">';
+            if ($action == "classify")
+            {
+                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id,$object->socid,$object->fk_project,"projectid");
+            }
+            else
+            {
+                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id,$object->socid,$object->fk_project,"none");
+            }
+            print "</td></tr>";
+        }
+
+        // Other attributes
+        $cols = 3;
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+        print "</table>";
+
+        if (! empty($object->brouillon) && $user->rights->contrat->creer)
+        {
+            print '</form>';
+        }
+
+        echo '<br>';
+
+        if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+        {
+        	$blocname = 'contacts';
+        	$title = $langs->trans('ContactsAddresses');
+        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+        }
+
+        if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+        {
+        	$blocname = 'notes';
+        	$title = $langs->trans('Notes');
+        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+        }
+
+
+        $colorb='666666';
+
+        $arrayothercontracts=$object->getListOfContracts('others');
+
+        /*
+         * Lines of contracts
+         */
+
+	    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;
+
+        // Title line for service
+        $cursorline=1;
+        while ($cursorline <= $nbofservices)
+        {
+            print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="updateligne">';
+            print '<input type="hidden" name="elrowid" value="'.GETPOST('rowid').'">';
+            print '<input type="hidden" name="idprod" value="'.($objp->fk_product?$objp->fk_product:'0').'">';
+            print '<input type="hidden" name="fournprice" value="'.($objp->fk_fournprice?$objp->fk_fournprice:'0').'">';
+
+            // Area with common detail of line
+            print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';
+
+            $sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.description, cd.price_ht, cd.qty,";
+            $sql.= " cd.tva_tx, cd.remise_percent, cd.info_bits, cd.subprice,";
+            $sql.= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,";
+            $sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
+            $sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
+            $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype";
+            $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+            $sql.= " WHERE cd.rowid = ".$object->lines[$cursorline-1]->id;
+
+            $result = $db->query($sql);
+            if ($result)
+            {
+                $total = 0;
+
+                print '<tr class="liste_titre">';
+                print '<td>'.$langs->trans("ServiceNb",$cursorline).'</td>';
+                print '<td width="50" align="center">'.$langs->trans("VAT").'</td>';
+                print '<td width="50" align="right">'.$langs->trans("PriceUHT").'</td>';
+                print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
+                print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
+				if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
+                print '<td width="30">&nbsp;</td>';
+                print "</tr>\n";
+
+                $var=true;
+
+                $objp = $db->fetch_object($result);
+
+                $var=!$var;
+
+                if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
+                {
+                    print '<tr '.$bc[$var].' valign="top">';
+                    // Libelle
+                    if ($objp->fk_product > 0)
+                    {
+                        print '<td>';
+                        $productstatic->id=$objp->fk_product;
+                        $productstatic->type=$objp->ptype;
+                        $productstatic->ref=$objp->pref;
+                        print $productstatic->getNomUrl(1,'',20);
+                        if ($objp->label)
+                        {
+                        	print ' - ';
+                        	$productstatic->ref=$objp->label;
+                        	print $productstatic->getNomUrl(0,'',16);
+                        }
+                        if (! empty($conf->global->PRODUIT_DESC_IN_FORM) and $objp->description)
+                            print '<br>'.dol_nl2br($objp->description);
+                        print '</td>';
+                    }
+                    else
+                    {
+                        print "<td>".dol_htmlentitiesbr($objp->description)."</td>\n";
+                    }
+                    // TVA
+                    print '<td align="center">'.vatrate($objp->tva_tx,'%',$objp->info_bits).'</td>';
+                    // Prix
+                    print '<td align="right">'.price($objp->subprice)."</td>\n";
+                    // Quantite
+                    print '<td align="center">'.$objp->qty.'</td>';
+                    // Remise
+                    if ($objp->remise_percent > 0)
+                    {
+                        print '<td align="right">'.$objp->remise_percent."%</td>\n";
+                    }
+                    else
+                    {
+                        print '<td>&nbsp;</td>';
+                    }
+
+					// Margin
+					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
+
+                    // Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
+                    print '<td align="right" class="nowrap">';
+                    if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
+                    {
+                        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
+                        print img_picto($langs->trans("MoveToAnotherContract"),'uparrow');
+                        print '</a>';
+                    }
+                    else {
+                        print '&nbsp;';
+                    }
+                    if ($user->rights->contrat->creer && ($object->statut >= 0))
+                    {
+                        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
+                        print img_edit();
+                        print '</a>';
+                    }
+                    else {
+                        print '&nbsp;';
+                    }
+                    if ( $user->rights->contrat->creer && ($object->statut >= 0))
+                    {
+                        print '&nbsp;';
+                        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
+                        print img_delete();
+                        print '</a>';
+                    }
+                    print '</td>';
+
+                    print "</tr>\n";
+
+                    // Dates de en service prevues et effectives
+                    if ($objp->subprice >= 0)
+                    {
+                        print '<tr '.$bc[$var].'>';
+                        print '<td colspan="'.($conf->margin->enabled?7:6).'">';
+
+                        // Date planned
+                        print $langs->trans("DateStartPlanned").': ';
+                        if ($objp->date_debut)
+                        {
+                            print dol_print_date($db->jdate($objp->date_debut));
+                            // Warning si date prevu passee et pas en service
+                            if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) { print " ".img_warning($langs->trans("Late")); }
+                        }
+                        else print $langs->trans("Unknown");
+                        print ' &nbsp;-&nbsp; ';
+                        print $langs->trans("DateEndPlanned").': ';
+                        if ($objp->date_fin)
+                        {
+                            print dol_print_date($db->jdate($objp->date_fin));
+                            if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) { print " ".img_warning($langs->trans("Late")); }
+                        }
+                        else print $langs->trans("Unknown");
+
+                        print '</td>';
+                        print '</tr>';
+                    }
+                }
+                // Ligne en mode update
+                else
+              {
+                    // Ligne carac
+                    print "<tr ".$bc[$var].">";
+                    print '<td>';
+                    if ($objp->fk_product)
+                    {
+                        $productstatic->id=$objp->fk_product;
+                        $productstatic->type=$objp->ptype;
+                        $productstatic->ref=$objp->pref;
+                        print $productstatic->getNomUrl(1,'',20);
+                        print $objp->label?' - '.dol_trunc($objp->label,16):'';
+                        print '<br>';
+                    }
+                    else
+                    {
+                        print $objp->label?$objp->label.'<br>':'';
+                    }
+
+                    // editeur wysiwyg
+                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                    $nbrows=ROWS_2;
+                    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+                    $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
+                    $doleditor=new DolEditor('product_desc',$objp->description,'',92,'dolibarr_details','',false,true,$enable,$nbrows,70);
+                    $doleditor->Create();
+
+                    print '</td>';
+                    print '<td align="right">';
+                    print $form->load_tva("eltva_tx",$objp->tva_tx,$mysoc,$object->thirdparty);
+                    print '</td>';
+                    print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
+                    print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
+                    print '<td align="right" class="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
+					if (! empty($usemargins))
+					{
+					    print '<td align="right">';
+					    if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
+						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
+					}
+                    print '<td align="center" rowspan="2" valign="middle"><input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
+                    print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                    print '</td>';
+
+                    $colspan=5;
+                    if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
+
+                    // Ligne dates prevues
+                    print "<tr ".$bc[$var].">";
+                    print '<td colspan="'.$colspan.'">';
+                    print $langs->trans("DateStartPlanned").' ';
+                    $form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update");
+                    print '<br>'.$langs->trans("DateEndPlanned").' ';
+                    $form->select_date($db->jdate($objp->date_fin),"date_end_update",$usehm,$usehm,($db->jdate($objp->date_fin)>0?0:1),"update");
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                $db->free($result);
+            }
+            else
+			{
+                dol_print_error($db);
+            }
+
+            if ($object->statut > 0)
+            {
+                print '<tr '.$bc[false].'>';
+                print '<td colspan="'.($conf->margin->enabled?7:6).'"><hr></td>';
+                print "</tr>\n";
+            }
+
+            print "</table>";
+
+            print "</form>\n";
+
+
+            /*
+             * Confirmation to delete service line of contract
+             */
+            if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
+            {
+                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
+                if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
+            }
+
+            /*
+             * Confirmation to move service toward another contract
+             */
+            if ($action == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
+            {
+                $arraycontractid=array();
+                foreach($arrayothercontracts as $contractcursor)
+                {
+                    $arraycontractid[$contractcursor->id]=$contractcursor->ref;
+                }
+                //var_dump($arraycontractid);
+                // Cree un tableau formulaire
+                $formquestion=array(
+				'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
+                array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
+
+                $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
+                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
+            }
+
+            /*
+             * Confirmation de la validation activation
+             */
+            if ($action == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                $comment      = GETPOST('comment');
+                $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
+                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
+            }
+
+            /*
+             * Confirmation de la validation fermeture
+             */
+            if ($action == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                $comment      = GETPOST('comment');
+                $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
+            }
+
+
+            // Area with status and activation info of line
+            if ($object->statut > 0)
+            {
+                print '<table class="notopnoleftnoright tableforservicepart2" width="100%">';
+
+                print '<tr '.$bc[false].'>';
+                print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
+                print '<td width="30" align="right">';
+                if ($user->societe_id == 0)
+                {
+                    if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
+                    {
+                        $tmpaction='activateline';
+                        if ($objp->statut == 4) $tmpaction='unactivateline';
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'&amp;action='.$tmpaction.'">';
+                        print img_edit();
+                        print '</a>';
+                    }
+                }
+                print '</td>';
+                print "</tr>\n";
+
+                print '<tr '.$bc[false].'>';
+
+                print '<td>';
+                // Si pas encore active
+                if (! $objp->date_debut_reelle) {
+                    print $langs->trans("DateStartReal").': ';
+                    if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle);
+                    else print $langs->trans("ContractStatusNotRunning");
+                }
+                // Si active et en cours
+                if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
+                    print $langs->trans("DateStartReal").': ';
+                    print dol_print_date($objp->date_debut_reelle);
+                }
+                // Si desactive
+                if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
+                    print $langs->trans("DateStartReal").': ';
+                    print dol_print_date($objp->date_debut_reelle);
+                    print ' &nbsp;-&nbsp; ';
+                    print $langs->trans("DateEndReal").': ';
+                    print dol_print_date($objp->date_fin_reelle);
+                }
+                if (! empty($objp->comment)) print "<br>".$objp->comment;
+                print '</td>';
+
+                print '<td align="center">&nbsp;</td>';
+
+                print '</tr>';
+                print '</table>';
+            }
+
+            if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                /**
+                 * Activer la ligne de contrat
+                 */
+                print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+                print '<table class="notopnoleftnoright" width="100%">';
+
+                // Definie date debut et fin par defaut
+                $dateactstart = $objp->date_debut;
+                if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                elseif (! $dateactstart) $dateactstart = time();
+
+                $dateactend = $objp->date_fin;
+                if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                elseif (! $dateactend)
+                {
+                    if ($objp->fk_product > 0)
+                    {
+                        $product=new Product($db);
+                        $product->fetch($objp->fk_product);
+                        $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
+                    }
+                }
+
+                print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>';
+                print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active");
+                print '</td>';
+
+                print '<td>'.$langs->trans("DateEndPlanned").'</td><td>';
+                print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active");
+                print '</td>';
+
+                print '<td align="center" rowspan="2" valign="middle">';
+                print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"><br>';
+                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td>';
+
+                print '</tr>';
+
+                print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td></tr>';
+
+                print '</table>';
+
+                print '</form>';
+            }
+
+            if ($user->rights->contrat->activer && $action == 'unactivateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
+            {
+                /**
+                 * Desactiver la ligne de contrat
+                 */
+                print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'&amp;action=closeline" method="post">';
+
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+                print '<table class="noborder" width="100%">';
+
+                // Definie date debut et fin par defaut
+                $dateactstart = $objp->date_debut_reelle;
+                if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+                elseif (! $dateactstart) $dateactstart = time();
+
+                $dateactend = $objp->date_fin_reelle;
+                if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+                elseif (! $dateactend)
+                {
+                    if ($objp->fk_product > 0)
+                    {
+                        $product=new Product($db);
+                        $product->fetch($objp->fk_product);
+                        $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
+                    }
+                }
+                $now=dol_now();
+                if ($dateactend > $now) $dateactend=$now;
+
+                print '<tr '.$bc[$var].'><td colspan="2">';
+                if ($objp->statut >= 4)
+                {
+                    if ($objp->statut == 4)
+                    {
+                        print $langs->trans("DateEndReal").' ';
+                        $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1);
+                    }
+                }
+                print '</td>';
+
+                print '<td align="right" rowspan="2"><input type="submit" class="button" name="close" value="'.$langs->trans("Close").'"><br>';
+                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td></tr>';
+
+                print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td><input size="70" type="text" class="flat" name="comment" value="'.GETPOST('comment').'"></td></tr>';
+                print '</table>';
+
+                print '</form>';
+            }
+
+            $cursorline++;
+        }
+
+		// Form to add new line
+        if ($user->rights->contrat->creer && ($object->statut == 0))
+        {
+        	$dateSelector=1;
+
+			print "\n";
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+			<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+			<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateligne').'">
+			<input type="hidden" name="mode" value="">
+			<input type="hidden" name="id" value="'.$object->id.'">
+			';
+
+			print '<br>';
+            print '<table id="tablelines" class="noborder noshadow" width="100%">';	// Array with (n*2)+1 lines
+
+            // Trick to not show product entries
+            $savproductenabled=$conf->product->enabled;
+            if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $conf->product->enabled = 0;
+
+        	// Form to add new line
+       		if ($action != 'editline')
+			{
+				$var = true;
+
+				// Add free products/services
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+
+        	// Restore correct setup
+        	$conf->product->enabled = $savproductenabled;
+
+            print '</table>';
+
+            print '</form>';
+        }
+
+		dol_fiche_end();
+
+
+        /*
+         * Buttons
+         */
+
+        if ($user->societe_id == 0)
+        {
+            print '<div class="tabsAction">';
+
+            if ($object->statut == 0 && $nbofservices)
+            {
+                if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
+                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+            }
+
+            if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
+            {
+                $langs->load("bills");
+                if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
+                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+            }
+
+            if ($object->nbofservicesclosed < $nbofservices)
+            {
+                //if (! $numactive)
+                //{
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
+                //}
+                //else
+                //{
+                //	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
+                //}
+            }
+
+            // On peut supprimer entite si
+            // - Droit de creer + mode brouillon (erreur creation)
+            // - Droit de supprimer
+            if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
+            {
+                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
+            }
+            else
+            {
+            	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
+            }
+
+            print "</div>";
+        }
+
+        print '<div class="fichecenter"><div class="fichehalfleft">';
+
+        /*
+         * Documents generes
+        */
+        $filename = dol_sanitizeFileName($object->ref);
+        $filedir = $conf->contrat->dir_output . "/" . dol_sanitizeFileName($object->ref);
+        $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+        $genallowed = $user->rights->contrat->creer;
+        $delallowed = $user->rights->contrat->supprimer;
+
+        $var = true;
+
+        $somethingshown = $formfile->show_documents('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+
+        /*
+         * Linked object block
+         */
+        $somethingshown=$object->showLinkedObjectBlock();
+
+        print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+        print '</div></div></div>';
+    }
+}
+
+
+llxFooter();
+
+$db->close();
+?>
+
+<?php
+if ($conf->margin->enabled && $action == 'editline')
+{
+?>
+
+<script type="text/javascript">
+$(document).ready(function() {
+  var idprod = $("input[name='idprod']").val();
+  var fournprice = $("input[name='fournprice']").val();
+  if (idprod > 0) {
+	  $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': idprod}, function(data) {
+	    if (data.length > 0) {
+	      var options = '';
+	      var trouve=false;
+	      $(data).each(function() {
+	        options += '<option value="'+this.id+'" price="'+this.price+'"';
+	        if (fournprice > 0) {
+		        if (this.id == fournprice) {
+		          options += ' selected';
+		          $("#buying_price").val(this.price);
+		          trouve = true;
+		        }
+	        }
+	        options += '>'+this.label+'</option>';
+	      });
+	      options += '<option value=null'+(trouve?'':' selected')+'><?php echo $langs->trans("InputPrice"); ?></option>';
+	      $("#fournprice").html(options);
+	      if (trouve) {
+	        $("#buying_price").hide();
+	        $("#fournprice").show();
+	      }
+	      else {
+	        $("#buying_price").show();
+	      }
+	      $("#fournprice").change(function() {
+	        var selval = $(this).find('option:selected').attr("price");
+	        if (selval)
+	          $("#buying_price").val(selval).hide();
+	        else
+	          $('#buying_price').show();
+	      });
+	    }
+	    else {
+	      $("#fournprice").hide();
+	      $('#buying_price').show();
+	    }
+	  },
+	  'json');
+	}
+    else {
+      $("#fournprice").hide();
+      $('#buying_price').show();
+    }
+});
+</script>
+
+<?php
+}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 6cf04c10522..58a89dad013 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -4,9 +4,10 @@
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2008		Raphael Bertrand		<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013		Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ * Copyright (C) 2014		Marcos García			<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,9 +29,9 @@
  *	\brief      File of class to manage contracts
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-require_once(DOL_DOCUMENT_ROOT ."/margin/lib/margins.lib.php");
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php';
 
 /**
  *	Class to manage contracts
@@ -43,31 +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
-	var $note_private;
-	var $note_public;
+	/**
+	 * @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();
 
 
@@ -84,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)
@@ -134,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
 	 */
@@ -155,16 +274,14 @@ class Contrat extends CommonObject
 		$sql.= " commentaire = '".$this->db->escape($comment)."'";
 		$sql.= " WHERE rowid = ".$line_id . " AND (statut = 0 OR statut = 3 OR statut = 5)";
 
-		dol_syslog(get_class($this)."::active_line sql=".$sql);
+		dol_syslog(get_class($this)."::active_line", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CONTRACT_SERVICE_ACTIVATE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('CONTRACT_SERVICE_ACTIVATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 
 			$this->db->commit();
 			return 1;
@@ -172,7 +289,6 @@ class Contrat extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::active_line error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -184,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
 	 */
@@ -207,12 +323,10 @@ class Contrat extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CONTRACT_SERVICE_CLOSE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('CONTRACT_SERVICE_CLOSE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 
 			$this->db->commit();
 			return 1;
@@ -220,7 +334,6 @@ class Contrat extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::close_line error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -280,9 +393,10 @@ class Contrat extends CommonObject
 	 *
 	 * @param	User	$user      		Objet User
 	 * @param   string	$force_number	Reference to force on contract (not implemented yet)
+     * @param	int		$notrigger		1=Does not execute triggers, 0= execuete triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
-	function validate($user, $force_number='')
+	function validate($user, $force_number='', $notrigger=0)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		global $langs, $conf;
@@ -309,6 +423,7 @@ class Contrat extends CommonObject
 		{
 			$num = $this->ref;
 		}
+        $this->newref = $num;
 
 		if ($num)
 		{
@@ -316,39 +431,54 @@ class Contrat extends CommonObject
 			//$sql.= ", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
 			$sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
 
-			dol_syslog(get_class($this)."::validate sql=".$sql);
+			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (! $resql)
 			{
-				dol_syslog(get_class($this)."::validate Echec update - 10 - sql=".$sql, LOG_ERR);
 				dol_print_error($this->db);
 				$error++;
+				$this->error=$this->db->lasterror();
+			}
+
+			// Trigger calls
+			if (! $error && ! $notrigger)
+			{
+                // Call trigger
+                $result=$this->call_trigger('CONTRACT_VALIDATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
 			if (! $error)
 			{
-				$this->oldref = '';
+            	$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
 				if (preg_match('/^[\(]?PROV/i', $this->ref))
 				{
 					// Rename of object directory ($this->ref = old ref, $num = new ref)
 					// to  not lose the linked files
-					$facref = dol_sanitizeFileName($this->ref);
-					$snumfa = dol_sanitizeFileName($num);
-					$dirsource = $conf->contract->dir_output.'/'.$facref;
-					$dirdest = $conf->contract->dir_output.'/'.$snumfa;
+					$oldref = dol_sanitizeFileName($this->ref);
+					$newref = dol_sanitizeFileName($num);
+					$dirsource = $conf->contract->dir_output.'/'.$oldref;
+					$dirdest = $conf->contract->dir_output.'/'.$newref;
 					if (file_exists($dirsource))
 					{
 						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
 
 						if (@rename($dirsource, $dirdest))
 						{
-							$this->oldref = $facref;
-
 							dol_syslog("Rename ok");
-							// Deleting old PDF in new rep
-							dol_delete_file($conf->contract->dir_output.'/'.$snumfa.'/'.$facref.'*.*');
+						    // Rename docs starting with $oldref with $newref
+            				$listoffiles=dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+            				foreach($listoffiles as $fileentry)
+            				{
+            					$dirsource=$fileentry['name'];
+            					$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+            					$dirsource=$fileentry['path'].'/'.$dirsource;
+            					$dirdest=$fileentry['path'].'/'.$dirdest;
+            					@rename($dirsource, $dirdest);
+            				}
 						}
 					}
 				}
@@ -362,17 +492,6 @@ class Contrat extends CommonObject
 				$this->brouillon=0;
 				$this->date_validation=$now;
 			}
-
-			// Trigger calls
-			if (! $error)
-			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('CONTRACT_VALIDATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
-			}
 		}
 		else
 		{
@@ -387,7 +506,6 @@ class Contrat extends CommonObject
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->lasterror();
 			return -1;
 		}
 
@@ -408,7 +526,9 @@ class Contrat extends CommonObject
 		$sql.= " fk_user_author,";
 		$sql.= " fk_projet,";
 		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
-		$sql.= " note_private, note_public, extraparams";
+		$sql.= " note_private, note_public, model_pdf, extraparams";
+		$sql.= " ,ref_supplier";
+		$sql.= " ,ref_ext";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
 		if ($ref)
 		{
@@ -417,7 +537,7 @@ class Contrat extends CommonObject
 		}
 		else $sql.= " WHERE rowid=".$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -427,9 +547,13 @@ class Contrat extends CommonObject
 			{
 				$this->id						= $result["rowid"];
 				$this->ref						= (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"];
+				$this->ref_supplier				= $result["ref_supplier"];
+				$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"];
 
@@ -439,6 +563,7 @@ class Contrat extends CommonObject
 				$this->note						= $result["note_private"];	// deprecated
 				$this->note_private				= $result["note_private"];
 				$this->note_public				= $result["note_public"];
+				$this->modelpdf					= $result["model_pdf"];
 
 				$this->fk_projet				= $result["fk_projet"]; // deprecated
 				$this->fk_project				= $result["fk_projet"];
@@ -457,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;
 			}
@@ -479,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()
 	{
@@ -514,7 +651,7 @@ class Contrat extends CommonObject
 		$sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = p.rowid";
 		$sql.= " ORDER by d.rowid ASC";
 
-		dol_syslog(get_class($this)."::fetch_lines sql=".$sql);
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -727,7 +864,7 @@ class Contrat extends CommonObject
 		// Insert contract
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
 		$sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
-		$sql.= " ref, entity, note_private, note_public)";
+		$sql.= " ref, entity, note_private, note_public, ref_supplier, ref_ext)";
 		$sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
 		$sql.= ", '".$this->db->idate($this->date_contrat)."'";
 		$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
@@ -737,6 +874,8 @@ class Contrat extends CommonObject
 		$sql.= ", ".$conf->entity;
 		$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
 		$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
+		$sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL");
+		$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
 		$sql.= ")";
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -745,13 +884,28 @@ class Contrat extends CommonObject
 
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
 
-			// Mise a jour ref
-			$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
-			if ($this->db->query($sql))
+
+			// Load object modContract
+			$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_olive');
+			if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php')
 			{
-				if ($this->id)
+				$module = substr($module, 0, dol_strlen($module)-4);
+			}
+			$result=dol_include_once('/core/modules/contract/'.$module.'.php');
+			if ($result > 0)
+			{
+				$modCodeContract = new $module();
+			}
+
+			if (!empty($modCodeContract->code_auto)) {
+				// Mise a jour ref
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
+				if ($this->db->query($sql))
 				{
-					$this->ref="(PROV".$this->id.")";
+					if ($this->id)
+					{
+						$this->ref="(PROV".$this->id.")";
+					}
 				}
 			}
 
@@ -778,12 +932,10 @@ class Contrat extends CommonObject
 
 			if (! $error)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('CONTRACT_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('CONTRACT_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 
 				if (! $error)
 				{
@@ -798,7 +950,6 @@ class Contrat extends CommonObject
 				}
 				else
 				{
-					$this->error=$interface->error;
 					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
 
 					$this->db->rollback();
@@ -816,8 +967,7 @@ class Contrat extends CommonObject
 		}
 		else
 		{
-			$this->error=$langs->trans("UnknownError: ".$this->db->error()." - sql=".$sql);
-			dol_syslog(get_class($this)."::create - 10 - ".$this->error, LOG_ERR);
+			$this->error=$langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
 			$this->db->rollback();
 			return -1;
@@ -840,6 +990,11 @@ class Contrat extends CommonObject
 
 		$this->db->begin();
 
+	    // Call trigger
+	    $result=$this->call_trigger('CONTRACT_DELETE',$user);
+	    if ($result < 0) { $error++; }
+	    // End call triggers
+
 		if (! $error)
 		{
 			// Delete linked contacts
@@ -863,7 +1018,7 @@ class Contrat extends CommonObject
 			$sql.= " FROM ".MAIN_DB_PREFIX."contratdet_log as cdl, ".MAIN_DB_PREFIX."contratdet as cd";
 			$sql.= " WHERE cdl.fk_contratdet=cd.rowid AND cd.fk_contrat=".$this->id;
 
-			dol_syslog(get_class($this)."::delete contratdet_log sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
@@ -884,7 +1039,7 @@ class Contrat extends CommonObject
 				$sql= "DELETE FROM ".MAIN_DB_PREFIX."contratdet_log ";
 				$sql.= " WHERE ".MAIN_DB_PREFIX."contratdet_log.rowid IN (".implode(",",$tab_resql).")";
 
-				dol_syslog(get_class($this)."::delete contratdet_log sql=".$sql, LOG_DEBUG);
+				dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if (! $resql)
 				{
@@ -900,7 +1055,7 @@ class Contrat extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
 			$sql.= " WHERE fk_contrat=".$this->id;
 
-			dol_syslog(get_class($this)."::delete contratdet sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::delete contratdet", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
@@ -915,7 +1070,7 @@ class Contrat extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contrat";
 			$sql.= " WHERE rowid=".$this->id;
 
-			dol_syslog(get_class($this)."::delete contrat sql=".$sql);
+			dol_syslog(get_class($this)."::delete contrat", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
@@ -924,18 +1079,6 @@ class Contrat extends CommonObject
 			}
 		}
 
-		if (! $error)
-		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('CONTRACT_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
-		}
-
 		if (! $error)
 		{
 			// We remove directory
@@ -962,13 +1105,110 @@ class Contrat extends CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::delete ERROR ".$this->error, LOG_ERR);
+			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			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=null, $notrigger=0)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+
+		if (isset($this->ref)) $this->ref=trim($this->ref);
+		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
+		if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
+		if (isset($this->entity)) $this->entity=trim($this->entity);
+		if (isset($this->statut)) $this->statut=trim($this->statut);
+		if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
+		if (isset($this->fk_projet)) $this->fk_projet=trim($this->fk_projet);
+		if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature);
+		if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
+		if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
+		if (isset($this->fk_user_cloture)) $this->fk_user_cloture=trim($this->fk_user_cloture);
+		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
+		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->extraparams)) $this->extraparams=trim($this->extraparams);
+
+
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
+
+		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
+		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
+		$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
+		$sql.= " entity=".$conf->entity.",";
+		$sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";
+		$sql.= " statut=".(isset($this->statut)?$this->statut:"null").",";
+		$sql.= " mise_en_service=".(dol_strlen($this->mise_en_service)!=0 ? "'".$this->db->idate($this->mise_en_service)."'" : 'null').",";
+		$sql.= " fin_validite=".(dol_strlen($this->fin_validite)!=0 ? "'".$this->db->idate($this->fin_validite)."'" : 'null').",";
+		$sql.= " date_cloture=".(dol_strlen($this->date_cloture)!=0 ? "'".$this->db->idate($this->date_cloture)."'" : 'null').",";
+		$sql.= " fk_soc=".(isset($this->fk_soc)?$this->fk_soc:"null").",";
+		$sql.= " fk_projet=".(isset($this->fk_projet)?$this->fk_projet:"null").",";
+		$sql.= " fk_commercial_signature=".(isset($this->fk_commercial_signature)?$this->fk_commercial_signature:"null").",";
+		$sql.= " fk_commercial_suivi=".(isset($this->fk_commercial_suivi)?$this->fk_commercial_suivi:"null").",";
+		$sql.= " fk_user_mise_en_service=".(isset($this->fk_user_mise_en_service)?$this->fk_user_mise_en_service:"null").",";
+		$sql.= " fk_user_cloture=".(isset($this->fk_user_cloture)?$this->fk_user_cloture:"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.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null").",";
+		$sql.= " extraparams=".(isset($this->extraparams)?"'".$this->db->escape($this->extraparams)."'":"null")."";
+
+
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		$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;
+			}
+		}
+
 
 	/**
 	 *  Ajoute une ligne de contrat en base
@@ -981,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;
 
@@ -1031,7 +1271,7 @@ class Contrat extends CommonObject
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-			$localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
 
 			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,'', $localtaxes_type);
 			$total_ht  = $tabprice[0];
@@ -1090,7 +1330,7 @@ class Contrat extends CommonObject
 			if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
 			$sql.= ")";
 
-			dol_syslog(get_class($this)."::addline sql=".$sql);
+			dol_syslog(get_class($this)."::addline", LOG_DEBUG);
 
 			$resql=$this->db->query($sql);
 			if ($resql)
@@ -1098,12 +1338,20 @@ class Contrat extends CommonObject
 				$result=$this->update_statut($user);
 				if ($result > 0)
 				{
+				    // Call trigger
+				    $result=$this->call_trigger('LINECONTRACT_CREATE',$user);
+				    if ($result < 0)
+				    {
+				        $this->db->rollback();
+				        return -1;
+				    }
+				    // End call triggers
+
 					$this->db->commit();
 					return 1;
 				}
 				else
 				{
-					dol_syslog("Error sql=$sql, error=".$this->error,LOG_ERR);
 					$this->db->rollback();
 					return -1;
 				}
@@ -1112,7 +1360,6 @@ class Contrat extends CommonObject
 			{
 				$this->db->rollback();
 				$this->error=$this->db->error()." sql=".$sql;
-				dol_syslog(get_class($this)."::addline ".$this->error,LOG_ERR);
 				return -1;
 			}
 		}
@@ -1131,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;
 
@@ -1179,9 +1426,9 @@ class Contrat extends CommonObject
 		// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 		// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-		$localtaxes_type=getLocalTaxesFromRate($tvatx,0,$mysoc);
+		$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];
@@ -1194,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)."'";
@@ -1237,13 +1484,22 @@ class Contrat extends CommonObject
 		else { $sql.=",date_cloture=null"; }
 		$sql .= " WHERE rowid = ".$rowid;
 
-		dol_syslog(get_class($this)."::updateline sql=".$sql);
+		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$result=$this->update_statut($user);
 			if ($result >= 0)
 			{
+		        // Call trigger
+		        $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+		        if ($result < 0)
+		        {
+		            $this->db->rollback();
+		            return -3;
+		        }
+		        // End call triggers
+
 				$this->db->commit();
 				return 1;
 			}
@@ -1278,25 +1534,27 @@ class Contrat extends CommonObject
 
 		if ($this->statut >= 0)
 		{
+
+		    // Call trigger
+		    $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
+		    if ($result < 0) return -1;
+		    // End call triggers
+
+		    $this->db->begin();
+
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
 			$sql.= " WHERE rowid=".$idline;
 
-			dol_syslog(get_class($this)."::delete sql=".$sql);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (! $resql)
 			{
 				$this->error="Error ".$this->db->lasterror();
-				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+				$this->db->rollback();
 				return -1;
 			}
 
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('LINECONTRACT_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-
+            $this->db->commit();
 			return 1;
 		}
 		else
@@ -1311,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)
 	{
@@ -1414,7 +1673,7 @@ class Contrat extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$picto='contract';
@@ -1491,7 +1750,7 @@ class Contrat extends CommonObject
 		$sql.= " WHERE fk_contrat =".$this->id;
 		if ($statut >= 0) $sql.= " AND statut = '$statut'";
 
-		dol_syslog(get_class($this)."::array_detail() sql=".$sql,LOG_DEBUG);
+		dol_syslog(get_class($this)."::array_detail()", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1527,7 +1786,7 @@ class Contrat extends CommonObject
 		$sql.= " WHERE fk_soc =".$this->socid;
 		if ($option == 'others') $sql.= " AND c.rowid != ".$this->id;
 
-		dol_syslog(get_class($this)."::getOtherContracts() sql=".$sql,LOG_DEBUG);
+		dol_syslog(get_class($this)."::getOtherContracts()", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1728,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;
@@ -1748,19 +2006,48 @@ class Contrat extends CommonObject
 		$this->total_tva      = $xnbp*19.6;
 		$this->total_ttc      = $xnbp*119.6;
 	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 * 	@param	    string		$modele			Force model to use ('' to not force)
+	 * 	@param		Translate	$outputlangs	Object langs to use for output
+	 *  @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,$user,$langs;
+
+		$langs->load("contracts");
+
+		// Positionne le modele sur le nom du modele 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);
+	}
 }
 
 
 /**
  *	Classe permettant la gestion des lignes de contrats
  */
-class ContratLigne
+class ContratLigne extends CommonObject
 {
-	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 $element='contratdet';			//!< Id that identify managed objects
-	//var $table_element='contratdet';	//!< Name of table without prefix where object is stored
 
 	var $id;
 	var $ref;
@@ -1769,6 +2056,13 @@ class ContratLigne
 	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
@@ -1786,6 +2080,13 @@ class ContratLigne
 	var $fk_remise_except;
 
 	var $subprice;					// Unit price HT
+
+	/**
+	 * @var float
+	 * @deprecated Use $price_ht instead
+	 */
+	public $price;
+
 	var $price_ht;
 
 	var $total_ht;
@@ -1901,7 +2202,7 @@ class ContratLigne
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$this->fk_contrat.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'">';
 		$lienfin='</a>';
 
 		$picto='contract';
@@ -1967,7 +2268,7 @@ class ContratLigne
 		if ($id)  $sql.= " WHERE t.rowid = ".$id;
 		if ($ref) $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2020,7 +2321,6 @@ class ContratLigne
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -2087,6 +2387,8 @@ class ContratLigne
 				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
 		}
 
+		$this->db->begin();
+
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
 		$sql.= " fk_contrat='".$this->fk_contrat."',";
@@ -2122,7 +2424,7 @@ class ContratLigne
 		$sql.= " commentaire='".$this->db->escape($this->commentaire)."'";
 		$sql.= " WHERE rowid=".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2133,20 +2435,19 @@ class ContratLigne
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
+			$this->db->rollback();
 			return -1;
 		}
 
 		if (! $notrigger)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('LINECONTRACT_UPDATE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 		}
 
+        $this->db->commit();
 		return 1;
 	}
 
@@ -2168,9 +2469,9 @@ class ContratLigne
 		$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 sql=".$sql);
+		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -2181,7 +2482,6 @@ class ContratLigne
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::update_total Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -2;
 		}
@@ -2203,7 +2503,7 @@ class ContratLigne
 		if (! $sql) return -1;
 
 		//print $sql;
-		dol_syslog(get_class($this)."::get_element_list sql=" . $sql);
+		dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -2229,5 +2529,3 @@ class ContratLigne
 	}
 
 }
-
-
diff --git a/htdocs/contrat/class/index.html b/htdocs/contrat/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index dcec3598e7f..1528e472cbe 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -67,15 +67,14 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 	}
 	else
 	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+		} else {
+			$mesg = $object->error;
 		}
+
+		setEventMessage($mesg, 'errors');
 	}
 }
 
@@ -117,8 +116,6 @@ $formcompany= new FormCompany($db);
 $contactstatic=new Contact($db);
 $userstatic=new User($db);
 
-dol_htmloutput_mesg($mesg);
-
 /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
@@ -129,8 +126,6 @@ if ($id > 0 || ! empty($ref))
 {
 	if ($object->fetch($id, $ref) > 0)
 	{
-		dol_htmloutput_mesg($mesg);
-
 		$object->fetch_thirdparty();
 
 	    $head = contract_prepare_head($object);
@@ -144,7 +139,7 @@ if ($id > 0 || ! empty($ref))
 		 */
 		print '<table class="border" width="100%">';
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 		// Reference du contrat
 		print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index e17a0c67389..6c520105c36 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -107,7 +107,7 @@ if ($object->id)
 
     print '<table class="border" width="100%">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
     // Reference
 	print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">'.$form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '').'</td></tr>';
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
deleted file mode 100644
index 38a2b3f1095..00000000000
--- a/htdocs/contrat/fiche.php
+++ /dev/null
@@ -1,1803 +0,0 @@
-<?php
-/* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
- * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2014  Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2014		Ferran Marcet		  	<fmarcet@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/contrat/fiche.php
- *       \ingroup    contrat
- *       \brief      Page of a contract
- */
-
-require ("../main.inc.php");
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.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';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-
-$langs->load("contracts");
-$langs->load("orders");
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("products");
-
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$socid = GETPOST('socid','int');
-$id = GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-
-$datecontrat='';
-
-// Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'contrat',$id);
-
-$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('contractcard'));
-
-$object = new Contrat($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-
-$permissionnote=$user->rights->contrat->creer;	// Used by the include of actions_setnotes.inc.php
-
-
-/*
- * Actions
- */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-
-if ($action == 'confirm_active' && $confirm == 'yes' && $user->rights->contrat->activer)
-{
-    $object->fetch($id);
-    $result = $object->active_line($user, GETPOST('ligne'), GETPOST('date'), GETPOST('dateend'), GETPOST('comment'));
-
-    if ($result > 0)
-    {
-        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-        exit;
-    }
-    else {
-        setEventMessage($object->error,'errors');
-    }
-}
-
-else if ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
-{
-	if (! GETPOST('dateend'))
-	{
-		$error++;
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("DateEnd")),'errors');
-	}
-	if (! $error)
-	{
-	    $object->fetch($id);
-	    $result = $object->close_line($user, GETPOST('ligne'), GETPOST('dateend'), urldecode(GETPOST('comment')));
-	    if ($result > 0)
-	    {
-	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	        exit;
-	    }
-	    else {
-	        setEventMessage($object->error,'errors');
-	    }
-	}
-}
-
-// Si ajout champ produit predefini
-if (GETPOST('mode')=='predefined')
-{
-    $date_start='';
-    $date_end='';
-    if (GETPOST('date_startmonth') && GETPOST('date_startday') && GETPOST('date_startyear'))
-    {
-        $date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-    }
-    if (GETPOST('date_endmonth') && GETPOST('date_endday') && GETPOST('date_endyear'))
-    {
-        $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-    }
-}
-
-// Si ajout champ produit libre
-if (GETPOST('mode')=='libre')
-{
-    $date_start_sl='';
-    $date_end_sl='';
-    if (GETPOST('date_start_slmonth') && GETPOST('date_start_slday') && GETPOST('date_start_slyear'))
-    {
-        $date_start_sl=dol_mktime(GETPOST('date_start_slhour'), GETPOST('date_start_slmin'), 0, GETPOST('date_start_slmonth'), GETPOST('date_start_slday'), GETPOST('date_start_slyear'));
-    }
-    if (GETPOST('date_end_slmonth') && GETPOST('date_end_slday') && GETPOST('date_end_slyear'))
-    {
-        $date_end_sl=dol_mktime(GETPOST('date_end_slhour'), GETPOST('date_end_slmin'), 0, GETPOST('date_end_slmonth'), GETPOST('date_end_slday'), GETPOST('date_end_slyear'));
-    }
-}
-
-// Param dates
-$date_contrat='';
-$date_start_update='';
-$date_end_update='';
-$date_start_real_update='';
-$date_end_real_update='';
-if (GETPOST('date_start_updatemonth') && GETPOST('date_start_updateday') && GETPOST('date_start_updateyear'))
-{
-    $date_start_update=dol_mktime(GETPOST('date_start_updatehour'), GETPOST('date_start_updatemin'), 0, GETPOST('date_start_updatemonth'), GETPOST('date_start_updateday'), GETPOST('date_start_updateyear'));
-}
-if (GETPOST('date_end_updatemonth') && GETPOST('date_end_updateday') && GETPOST('date_end_updateyear'))
-{
-    $date_end_update=dol_mktime(GETPOST('date_end_updatehour'), GETPOST('date_end_updatemin'), 0, GETPOST('date_end_updatemonth'), GETPOST('date_end_updateday'), GETPOST('date_end_updateyear'));
-}
-if (GETPOST('date_start_real_updatemonth') && GETPOST('date_start_real_updateday') && GETPOST('date_start_real_updateyear'))
-{
-    $date_start_real_update=dol_mktime(GETPOST('date_start_real_updatehour'), GETPOST('date_start_real_updatemin'), 0, GETPOST('date_start_real_updatemonth'), GETPOST('date_start_real_updateday'), GETPOST('date_start_real_updateyear'));
-}
-if (GETPOST('date_end_real_updatemonth') && GETPOST('date_end_real_updateday') && GETPOST('date_end_real_updateyear'))
-{
-    $date_end_real_update=dol_mktime(GETPOST('date_end_real_updatehour'), GETPOST('date_end_real_updatemin'), 0, GETPOST('date_end_real_updatemonth'), GETPOST('date_end_real_updateday'), GETPOST('date_end_real_updateyear'));
-}
-if (GETPOST('remonth') && GETPOST('reday') && GETPOST('reyear'))
-{
-    $datecontrat = dol_mktime(GETPOST('rehour'), GETPOST('remin'), 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-}
-
-// Add contract
-if ($action == 'add' && $user->rights->contrat->creer)
-{
-	// Check
-	if (empty($datecontrat))
-	{
-		$error++;
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")),'errors');
-		$action='create';
-	}
-
-	if ($socid<1)
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Customer")),'errors');
-		$action='create';
-		$error++;
-	}
-
-	if (! $error)
-	{
-		$object->socid						= $socid;
-    	$object->date_contrat				= $datecontrat;
-
-    	$object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
-    	$object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
-
-    	$object->note_private				= GETPOST('note_private','alpha');
-    	$object->note_public				= GETPOST('note_public','alpha');
-    	$object->fk_project					= GETPOST('projectid','int');
-    	$object->remise_percent				= GETPOST('remise_percent','alpha');
-    	$object->ref						= GETPOST('ref','alpha');
-
-	    // If creation from another object of another module (Example: origin=propal, originid=1)
-	    if ($_POST['origin'] && $_POST['originid'])
-	    {
-	        // Parse element/subelement (ex: project_task)
-	        $element = $subelement = $_POST['origin'];
-	        if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
-	        {
-	            $element = $regs[1];
-	            $subelement = $regs[2];
-	        }
-
-	        // For compatibility
-	        if ($element == 'order')    { $element = $subelement = 'commande'; }
-	        if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
-
-	        $object->origin    = $_POST['origin'];
-	        $object->origin_id = $_POST['originid'];
-
-	        // Possibility to add external linked objects with hooks
-	        $object->linked_objects[$object->origin] = $object->origin_id;
-	        if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
-	        {
-	        	$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
-	        }
-
-	        $id = $object->create($user);
-	        if ($id < 0) {
-	        	setEventMessage($object->error,'errors');
-	        }
-
-	        if ($id > 0)
-	        {
-	            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-	            $classname = ucfirst($subelement);
-	            $srcobject = new $classname($db);
-
-	            dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-	            $result=$srcobject->fetch($object->origin_id);
-	            if ($result > 0)
-	            {
-	                $srcobject->fetch_thirdparty();
-					$lines = $srcobject->lines;
-	                if (empty($lines) && method_exists($srcobject,'fetch_lines'))
-	                {
-	                	$srcobject->fetch_lines();
-	                	$lines = $srcobject->lines;
-	                }
-
-	                $fk_parent_line=0;
-	                $num=count($lines);
-
-	                for ($i=0;$i<$num;$i++)
-	                {
-	                    $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-
-						if ($product_type == 1) { //only services	// TODO Exclude also deee
-							// service prédéfini
-							if ($lines[$i]->fk_product > 0)
-							{
-								$product_static = new Product($db);
-
-								// Define output language
-								if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-								{
-									$prod = new Product($db);
-									$prod->id=$lines[$i]->fk_product;
-									$prod->getMultiLangs();
-
-									$outputlangs = $langs;
-									$newlang='';
-									if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
-									if (empty($newlang)) $newlang=$srcobject->client->default_lang;
-									if (! empty($newlang))
-									{
-										$outputlangs = new Translate("",$conf);
-										$outputlangs->setDefaultLang($newlang);
-									}
-
-									$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-								}
-								else
-								{
-									$label = $lines[$i]->product_label;
-								}
-
-								if ($conf->global->PRODUIT_DESC_IN_FORM)
-									$desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
-							}
-							else {
-							    $desc = dol_htmlentitiesbr($lines[$i]->desc);
-					        }
-
-		                    $result = $object->addline(
-				                $desc,
-				                $lines[$i]->subprice,
-				                $lines[$i]->qty,
-				                $lines[$i]->tva_tx,
-				                $lines[$i]->localtax1_tx,
-				                $lines[$i]->localtax2_tx,
-				                $lines[$i]->fk_product,
-				                $lines[$i]->remise_percent,
-				                $lines[$i]->date_start,
-				                $lines[$i]->date_end,
-				                'HT',
-				                0,
-				                $lines[$i]->info_bits,
-			                    $lines[$i]->fk_fournprice,
-			                    $lines[$i]->pa_ht
-		                    );
-
-		                    if ($result < 0)
-		                    {
-		                        $error++;
-		                        break;
-		                    }
-
-						}
-	                }
-	            }
-	            else
-	            {
-	                setEventMessage($srcobject->error,'errors');
-	                $error++;
-	            }
-	        }
-	        else
-	        {
-	            setEventMessage($object->error,'errors');
-	            $error++;
-	        }
-	    }
-	    else
-	    {
-
-	    	// Fill array 'array_options' with data from add form
-	    	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-
-	        $result = $object->create($user);
-	        if ($result > 0)
-	        {
-	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	            exit;
-	        }
-	        else {
-	        	setEventMessage($object->error,'errors');
-	        }
-	        $action='create';
-		}
-    }
-}
-
-else if ($action == 'classin' && $user->rights->contrat->creer)
-{
-    $object->fetch($id);
-    $object->setProject(GETPOST('projectid'));
-}
-
-// Add a new line
-else if ($action == 'addline' && $user->rights->contrat->creer)
-{
-	// Set if we used free entry or predefined product
-	$predef='';
-	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
-	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 = '';
-	}
-
-	$qty = GETPOST('qty'.$predef);
-	$remise_percent=GETPOST('remise_percent'.$predef);
-
-    if ($qty == '')
-    {
-    	setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")),'errors');
-    	$error++;
-    }
-    if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc))
-    {
-    	setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")),'errors');
-    	$error++;
-    }
-
-    if (! $error)
-    {
-        $ret=$object->fetch($id);
-        if ($ret < 0)
-        {
-        	setEventMessage($object->error,'errors');
-            exit;
-        }
-        $ret=$object->fetch_thirdparty();
-
-		// Clean parameters
-		$date_start=dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
-		$date_end=dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-		$price_base_type = (GETPOST('price_base_type', 'alpha')?GETPOST('price_base_type', 'alpha'):'HT');
-
-        // Ecrase $pu par celui du produit
-        // Ecrase $desc par celui du produit
-        // Ecrase $txtva par celui du produit
-        // Ecrase $base_price_type par celui du produit
-        if ($idprod > 0)
-        {
-            $prod = new Product($db);
-            $prod->fetch($idprod);
-
-            $tva_tx = get_default_tva($mysoc,$object->thirdparty,$prod->id);
-            $tva_npr = get_default_npr($mysoc,$object->thirdparty,$prod->id);
-            $pu_ht = $prod->price;
-            $pu_ttc = $prod->price_ttc;
-            $price_min = $prod->price_min;
-            $price_base_type = $prod->price_base_type;
-
-            // On defini prix unitaire
-            if ($conf->global->PRODUIT_MULTIPRICES && $object->thirdparty->price_level)
-            {
-                $pu_ht = $prod->multiprices[$object->thirdparty->price_level];
-                $pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
-                $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
-                $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-            }
-        	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-			{
-				require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-				$prodcustprice = new Productcustomerprice($db);
-
-				$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->client->id);
-
-				$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-				if ($result) {
-					if (count($prodcustprice->lines) > 0) {
-						$pu_ht = price($prodcustprice->lines [0]->price);
-						$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-						$price_base_type = $prodcustprice->lines [0]->price_base_type;
-						$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
-					}
-				}
-			}
-
-            // On reevalue prix selon taux tva car taux tva transaction peut etre different
-            // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-            if ($tva_tx != $prod->tva_tx)
-            {
-                if ($price_base_type != 'HT')
-                {
-                    $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
-                }
-                else
-              {
-                    $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
-                }
-            }
-
-           	$desc=$prod->description;
-           	$desc=dol_concatdesc($desc,$product_desc);
-        }
-        else
-		{
-            $pu_ht=GETPOST('price_ht');
-            $price_base_type = 'HT';
-            $tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0;		// tva_tx field may be disabled, so we use vat rate 0
-            $tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0;
-            $desc=$product_desc;
-        }
-
-        $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty);
-        $localtax2_tx=get_localtax($tva_tx,2,$object->thirdparty);
-
-		// ajout prix achat
-		$fk_fournprice = $_POST['fournprice'];
-		if ( ! empty($_POST['buying_price']) )
-		  $pa_ht = $_POST['buying_price'];
-		else
-		  $pa_ht = null;
-
-        $info_bits=0;
-        if ($tva_npr) $info_bits |= 0x01;
-
-        if($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min)))
-        {
-            $object->error = $langs->trans("CantBeLessThanMinPrice",price(price2num($price_min,'MU'),0,$langs,0,0,-1,$conf->currency));
-            $result = -1 ;
-        }
-        else
-		{
-            // Insert line
-            $result = $object->addline(
-                $desc,
-                $pu_ht,
-                $qty,
-                $tva_tx,
-                $localtax1_tx,
-                $localtax2_tx,
-                $idprod,
-                $remise_percent,
-                $date_start,
-                $date_end,
-                $price_base_type,
-                $pu_ttc,
-                $info_bits,
-      			$fk_fournprice,
-      			$pa_ht
-            );
-        }
-
-        if ($result > 0)
-        {
-            /*
-             // Define output language
-             $outputlangs = $langs;
-             $newlang='';
-             if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-             if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-             if (! empty($newlang))
-             {
-             $outputlangs = new Translate("",$conf);
-             $outputlangs->setDefaultLang($newlang);
-             }
-             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-             {
-	            $ret=$object->fetch($id);    // Reload to get new records
-             	contrat_pdf_create($db, $object->id, $object->modelpdf, $outputlangs);
-             }
-             */
-
-			unset($_POST ['prod_entry_mode']);
-
-			unset($_POST['qty']);
-			unset($_POST['type']);
-			unset($_POST['remise_percent']);
-			unset($_POST['price_ht']);
-			unset($_POST['price_ttc']);
-			unset($_POST['tva_tx']);
-			unset($_POST['product_ref']);
-			unset($_POST['product_label']);
-			unset($_POST['product_desc']);
-			unset($_POST['fournprice']);
-			unset($_POST['buying_price']);
-			unset($_POST ['np_marginRate']);
-			unset($_POST ['np_markRate']);
-			unset($_POST['dp_desc']);
-			unset($_POST['idprod']);
-
-	    	unset($_POST['date_starthour']);
-	    	unset($_POST['date_startmin']);
-	    	unset($_POST['date_startsec']);
-	    	unset($_POST['date_startday']);
-	    	unset($_POST['date_startmonth']);
-	    	unset($_POST['date_startyear']);
-	    	unset($_POST['date_endhour']);
-	    	unset($_POST['date_endmin']);
-	    	unset($_POST['date_endsec']);
-	    	unset($_POST['date_endday']);
-	    	unset($_POST['date_endmonth']);
-	    	unset($_POST['date_endyear']);
-        }
-        else
-        {
-        	setEventMessage($object->error,'errors');
-        }
-    }
-}
-
-else if ($action == 'updateligne' && $user->rights->contrat->creer && ! GETPOST('cancel'))
-{
-	$ret=$object->fetch($id);
-	if ($ret < 0)
-	{
-		dol_print_error($db,$object->error);
-		exit;
-	}
-
-	$object->fetch_thirdparty();
-    $objectline = new ContratLigne($db);
-    if ($objectline->fetch(GETPOST('elrowid')))
-    {
-        $db->begin();
-
-        if ($date_start_real_update == '') $date_start_real_update=$objectline->date_ouverture;
-        if ($date_end_real_update == '')   $date_end_real_update=$objectline->date_cloture;
-
-		$localtax1_tx=get_localtax(GETPOST('eltva_tx'),1,$object->thirdparty);
-        $localtax2_tx=get_localtax(GETPOST('eltva_tx'),2,$object->thirdparty);
-
-	  	// ajout prix d'achat
-	  	$fk_fournprice = $_POST['fournprice'];
-	  	if ( ! empty($_POST['buying_price']) )
-	  	  $pa_ht = $_POST['buying_price'];
-	  	else
-	  	  $pa_ht = null;
-
-        $objectline->description=GETPOST('product_desc');
-        $objectline->price_ht=GETPOST('elprice');
-        $objectline->subprice=GETPOST('elprice');
-        $objectline->qty=GETPOST('elqty');
-        $objectline->remise_percent=GETPOST('elremise_percent');
-        $objectline->tva_tx=GETPOST('eltva_tx')?GETPOST('eltva_tx'):0;	// Field may be disabled, so we use vat rate 0
-        $objectline->localtax1_tx=$localtax1_tx;
-        $objectline->localtax2_tx=$localtax2_tx;
-        $objectline->date_ouverture_prevue=$date_start_update;
-        $objectline->date_ouverture=$date_start_real_update;
-        $objectline->date_fin_validite=$date_end_update;
-        $objectline->date_cloture=$date_end_real_update;
-        $objectline->fk_user_cloture=$user->id;
-        $objectline->fk_fournprice=$fk_fournprice;
-        $objectline->pa_ht=$pa_ht;
-
-        // TODO verifier price_min si fk_product et multiprix
-
-        $result=$objectline->update($user);
-        if ($result > 0)
-        {
-            $db->commit();
-        }
-        else
-        {
-        	setEventMessage($objectline->error,'errors');
-            $db->rollback();
-        }
-    }
-    else
-    {
-    	setEventMessage($objectline->error,'errors');
-    }
-}
-
-else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
-{
-    $object->fetch($id);
-    $result = $object->deleteline(GETPOST('lineid'),$user);
-
-    if ($result >= 0)
-    {
-        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-        exit;
-    }
-    else
-    {
-    	setEventMessage($object->error,'errors');
-    }
-}
-
-else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
-{
-    $object->fetch($id);
-    $result = $object->validate($user);
-}
-
-// Close all lines
-else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
-{
-    $object->fetch($id);
-    $result = $object->cloture($user);
-}
-
-else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
-{
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-	$result=$object->delete($user);
-	if ($result >= 0)
-	{
-		header("Location: index.php");
-		return;
-	}
-	else
-	{
-		setEventMessage($object->error,'errors');
-	}
-}
-
-else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
-{
-	if (GETPOST('newcid') > 0)
-	{
-		$contractline = new ContratLigne($db);
-		$result=$contractline->fetch(GETPOST('lineid'));
-		$contractline->fk_contrat = GETPOST('newcid');
-		$result=$contractline->update($user,1);
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-			return;
-		}
-		else
-		{
-			setEventMessage($object->error,'errors');
-		}
-	}
-	else
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefNewContract")),'errors');
-	}
-} else if ($action == 'update_extras') {
-	// Fill array 'array_options' with data from update form
-	$object->fetch($id);
-	$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-	if ($ret < 0)
-		$error ++;
-
-	if (! $error) {
-
-			$result = $object->insertExtraFields();
-			if ($result < 0) {
-				$error ++;
-			}
-		} else if ($reshook < 0)
-			$error ++;
-
-	if ($error) {
-		$action = 'edit_extras';
-		setEventMessage($object->error,'errors');
-	}
-}
-
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
-{
-	if ($action == 'addcontact')
-	{
-		$result = $object->fetch($id);
-
-		if ($result > 0 && $id > 0)
-		{
-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
-		}
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
-				$langs->load("errors");
-				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"),'errors');
-			}
-			else
-			{
-				setEventMessage($object->error,'errors');
-			}
-		}
-	}
-
-	// bascule du statut d'un contact
-	else if ($action == 'swapstatut')
-	{
-		if ($object->fetch($id))
-		{
-			$result=$object->swapContactStatus(GETPOST('ligne'));
-		}
-		else
-		{
-			setEventMessage($object->error,'errors');
-		}
-	}
-
-	// Efface un contact
-	else if ($action == 'deletecontact')
-	{
-		$object->fetch($id);
-		$result = $object->delete_contact(GETPOST('lineid'));
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else {
-			setEventMessage($object->error,'errors');
-		}
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("ContractCard"),"Contrat");
-
-$form = new Form($db);
-
-$objectlignestatic=new ContratLigne($db);
-
-
-/*********************************************************************
- *
- * Mode creation
- *
- *********************************************************************/
-if ($action == 'create')
-{
-	print_fiche_titre($langs->trans('AddContract'));
-
-    $soc = new Societe($db);
-    if ($socid>0) $soc->fetch($socid);
-
-    if (GETPOST('origin') && GETPOST('originid'))
-    {
-        // Parse element/subelement (ex: project_task)
-        $element = $subelement = GETPOST('origin');
-        if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
-        {
-            $element = $regs[1];
-            $subelement = $regs[2];
-        }
-
-        if ($element == 'project')
-        {
-            $projectid=GETPOST('originid');
-        }
-        else
-        {
-            // For compatibility
-            if ($element == 'order' || $element == 'commande')    { $element = $subelement = 'commande'; }
-            if ($element == 'propal')   { $element = 'comm/propal'; $subelement = 'propal'; }
-
-            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-            $classname = ucfirst($subelement);
-            $objectsrc = new $classname($db);
-            $objectsrc->fetch(GETPOST('originid'));
-            if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
-            $objectsrc->fetch_thirdparty();
-
-            $projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
-
-            $soc = $objectsrc->client;
-
-            $note_private		= (! empty($objectsrc->note_private) ? $objectsrc->note_private : '');
-            $note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
-
-            // Object source contacts list
-            $srccontactslist = $objectsrc->liste_contact(-1,'external',1);
-        }
-    }
-    else {
-		$projectid = GETPOST('projectid','int');
-		$note_private = GETPOST("note_private");
-		$note_public = GETPOST("note_public");
-	}
-
-    $object->date_contrat = dol_now();
-
-    $numct = $object->getNextNumRef($soc);
-
-    print '<form name="form_contract" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-    print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
-    print '<input type="hidden" name="remise_percent" value="0">';
-
-    print '<table class="border" width="100%">';
-
-    // Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
-
-    // Customer
-	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
-	if($socid>0)
-	{
-		print '<td colspan="2">';
-		print $soc->getNomUrl(1);
-		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
-		print '</td>';
-	}
-	else
-	{
-		print '<td colspan="2">';
-		print $form->select_company('','socid','s.client = 1 OR s.client = 3',1);
-		print '</td>';
-	}
-	print '</tr>'."\n";
-
-	if($socid>0)
-	{
-		// Ligne info remises tiers
-		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
-		if ($soc->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_percent);
-		else print $langs->trans("CompanyHasNoRelativeDiscount");
-		print '. ';
-		$absolute_discount=$soc->getAvailableDiscounts();
-		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-		print '.';
-		print '</td></tr>';
-	}
-
-    // Commercial suivi
-    print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
-    print $form->select_dolusers(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,'');
-    print '</td></tr>';
-
-    // Commercial signature
-    print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
-    print $form->select_dolusers(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,'');
-    print '</td></tr>';
-
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
-    $form->select_date($datecontrat,'',0,0,'',"contrat");
-    print "</td></tr>";
-
-    if (! empty($conf->projet->enabled))
-    {
-    	$formproject=new FormProjets($db);
-
-        print '<tr><td>'.$langs->trans("Project").'</td><td>';
-        $formproject->select_projects($soc->id,$projectid,"projectid");
-        print "</td></tr>";
-    }
-
-    print '<tr><td>'.$langs->trans("NotePublic").'</td><td valign="top">';
-
-
-    $doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
-    print $doleditor->Create(1);
-
-
-    if (empty($user->societe_id))
-    {
-        print '<tr><td>'.$langs->trans("NotePrivate").'</td><td valign="top">';
-        $doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);
-        print $doleditor->Create(1);
-        print '</td></tr>';
-    }
-
-    // Other attributes
-    $parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-    // Other attributes
-    if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-    	print $object->showOptionals($extrafields, 'edit');
-    }
-
-    print "</table>\n";
-
-    if (is_object($objectsrc))
-    {
-        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-	}
-
-    print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
-
-    print "</form>\n";
-
-    dol_fiche_end();
-}
-else
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-{
-    $now=dol_now();
-
-    if ($id > 0 || ! empty($ref))
-    {
-        $result=$object->fetch($id,$ref);
-        if ($result < 0) dol_print_error($db,$object->error);
-        $result=$object->fetch_lines();	// This also init $this->nbofserviceswait, $this->nbofservicesopened, $this->nbofservicesexpired=, $this->nbofservicesclosed
-        if ($result < 0) dol_print_error($db,$object->error);
-        $result=$object->fetch_thirdparty();
-        if ($result < 0) dol_print_error($db,$object->error);
-
-        $nbofservices=count($object->lines);
-
-        $author = new User($db);
-        $author->fetch($object->user_author_id);
-
-        $commercial_signature = new User($db);
-        $commercial_signature->fetch($object->commercial_signature_id);
-
-        $commercial_suivi = new User($db);
-        $commercial_suivi->fetch($object->commercial_suivi_id);
-
-        $head = contract_prepare_head($object);
-
-        $hselected = 0;
-
-        dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract');
-
-
-        /*
-         * Confirmation de la suppression du contrat
-         */
-        if ($action == 'delete')
-        {
-            print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("DeleteAContract"),$langs->trans("ConfirmDeleteAContract"),"confirm_delete",'',0,1);
-
-        }
-
-        /*
-         * Confirmation de la validation
-         */
-        if ($action == 'valid')
-        {
-        	$ref = substr($object->ref, 1, 4);
-        	if ($ref == 'PROV')
-        	{
-        		$numref = $object->getNextNumRef($soc);
-        	}
-        	else
-        	{
-        		$numref = $object->ref;
-        	}
-
-        	$text=$langs->trans('ConfirmValidateContract',$numref);
-
-            print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ValidateAContract"),$text,"confirm_valid",'',0,1);
-
-        }
-
-        /*
-         * Confirmation de la fermeture
-         */
-        if ($action == 'close')
-        {
-            print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("CloseAContract"),$langs->trans("ConfirmCloseContract"),"confirm_close",'',0,1);
-
-        }
-
-        /*
-         *   Contrat
-         */
-        if (! empty($object->brouillon) && $user->rights->contrat->creer)
-        {
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="setremise">';
-        }
-
-        print '<table class="border" width="100%">';
-
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-        // Ref du contrat
-        print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-        print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-        print "</td></tr>";
-
-        // Customer
-        print "<tr><td>".$langs->trans("Customer")."</td>";
-        print '<td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';
-
-        // Ligne info remises tiers
-        print '<tr><td>'.$langs->trans('Discount').'</td><td colspan="3">';
-        if ($object->thirdparty->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
-        else print $langs->trans("CompanyHasNoRelativeDiscount");
-        $absolute_discount=$object->thirdparty->getAvailableDiscounts();
-        print '. ';
-        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-        else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-        print '.';
-        print '</td></tr>';
-
-        // Statut contrat
-        print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
-        if ($object->statut==0) print $object->getLibStatut(2);
-        else print $object->getLibStatut(4);
-        print "</td></tr>";
-
-        // Date
-        print '<tr><td>'.$langs->trans("Date").'</td>';
-        print '<td colspan="3">'.dol_print_date($object->date_contrat,"dayhour")."</td></tr>\n";
-
-        // Projet
-        if (! empty($conf->projet->enabled))
-        {
-            $langs->load("projects");
-            print '<tr><td>';
-            print '<table width="100%" class="nobordernopadding"><tr><td>';
-            print $langs->trans("Project");
-            print '</td>';
-            if ($action != "classify" && $user->rights->projet->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->trans("SetProject")).'</a></td>';
-            print '</tr></table>';
-            print '</td><td colspan="3">';
-            if ($action == "classify")
-            {
-                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id,$object->socid,$object->fk_project,"projectid");
-            }
-            else
-            {
-                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id,$object->socid,$object->fk_project,"none");
-            }
-            print "</td></tr>";
-        }
-
-        // Other attributes
-        $parameters=array('colspan' => ' colspan="3"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-        $res = $object->fetch_optionals($object->id, $extralabels);
-        if (empty($reshook) && ! empty($extrafields->attribute_label)) {
-        	foreach ($extrafields->attribute_label as $key => $label) {
-        		if ($action == 'edit_extras') {
-        			$value = (isset($_POST ["options_" . $key]) ? $_POST ["options_" . $key] : $object->array_options ["options_" . $key]);
-        		} else {
-        			$value = $object->array_options ["options_" . $key];
-        		}
-        		if ($extrafields->attribute_type [$key] == 'separate') {
-        			print $extrafields->showSeparator($key);
-        		} else {
-        			print '<tr><td';
-        			if (! empty($extrafields->attribute_required [$key]))
-        				print ' class="fieldrequired"';
-        			print '>' . $label . '</td><td colspan="5">';
-        			// 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 ($action == 'edit_extras' && $user->rights->commande->creer && GETPOST('attribute') == $key) {
-        				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formcontract">';
-        				print '<input type="hidden" name="action" value="update_extras">';
-        				print '<input type="hidden" name="attribute" value="' . $key . '">';
-        				print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-        				print '<input type="hidden" name="id" value="' . $object->id . '">';
-
-        				print $extrafields->showInputField($key, $value);
-
-        				print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
-        				print '</form>';
-        			} else {
-        				print $extrafields->showOutputField($key, $value);
-        				if ($object->statut == 0 && $user->rights->commande->creer)
-        					print '<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_picto('', 'edit') . ' ' . $langs->trans('Modify') . '</a>';
-        			}
-        			print '</td></tr>' . "\n";
-        		}
-        	}
-        }
-
-
-
-
-        print "</table>";
-
-        if (! empty($object->brouillon) && $user->rights->contrat->creer)
-        {
-            print '</form>';
-        }
-
-        echo '<br>';
-
-        if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-        {
-        	$blocname = 'contacts';
-        	$title = $langs->trans('ContactsAddresses');
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-        }
-
-        if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-        {
-        	$blocname = 'notes';
-        	$title = $langs->trans('Notes');
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-        }
-
-
-        $colorb='666666';
-
-        $arrayothercontracts=$object->getListOfContracts('others');
-
-        /*
-         * Lines of contracts
-         */
-        $productstatic=new Product($db);
-
-
-        $usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
-
-        // Title line for service
-        $cursorline=1;
-        while ($cursorline <= $nbofservices)
-        {
-            print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="updateligne">';
-            print '<input type="hidden" name="elrowid" value="'.GETPOST('rowid').'">';
-            print '<input type="hidden" name="idprod" value="'.($objp->fk_product?$objp->fk_product:'0').'">';
-            print '<input type="hidden" name="fournprice" value="'.($objp->fk_fournprice?$objp->fk_fournprice:'0').'">';
-
-            // Area with common detail of line
-            print '<table class="notopnoleftnoright allwidth tableforservicepart1" width="100%">';
-
-            $sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.description, cd.price_ht, cd.qty,";
-            $sql.= " cd.tva_tx, cd.remise_percent, cd.info_bits, cd.subprice,";
-            $sql.= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,";
-            $sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
-            $sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
-            $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype";
-            $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-            $sql.= " WHERE cd.rowid = ".$object->lines[$cursorline-1]->id;
-
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $total = 0;
-
-                print '<tr class="liste_titre">';
-                print '<td>'.$langs->trans("ServiceNb",$cursorline).'</td>';
-                print '<td width="50" align="center">'.$langs->trans("VAT").'</td>';
-                print '<td width="50" align="right">'.$langs->trans("PriceUHT").'</td>';
-                print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
-                print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
-				if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
-                print '<td width="30">&nbsp;</td>';
-                print "</tr>\n";
-
-                $var=true;
-
-                $objp = $db->fetch_object($result);
-
-                $var=!$var;
-
-                if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
-                {
-                    print '<tr '.$bc[$var].' valign="top">';
-                    // Libelle
-                    if ($objp->fk_product > 0)
-                    {
-                        print '<td>';
-                        $productstatic->id=$objp->fk_product;
-                        $productstatic->type=$objp->ptype;
-                        $productstatic->ref=$objp->pref;
-                        print $productstatic->getNomUrl(1,'',20);
-                        if ($objp->label)
-                        {
-                        	print ' - ';
-                        	$productstatic->ref=$objp->label;
-                        	print $productstatic->getNomUrl(0,'',16);
-                        }
-                        if ($objp->description) print '<br>'.dol_nl2br($objp->description);
-                        print '</td>';
-                    }
-                    else
-                    {
-                        print "<td>".dol_htmlentitiesbr($objp->description)."</td>\n";
-                    }
-                    // TVA
-                    print '<td align="center">'.vatrate($objp->tva_tx,'%',$objp->info_bits).'</td>';
-                    // Prix
-                    print '<td align="right">'.price($objp->subprice)."</td>\n";
-                    // Quantite
-                    print '<td align="center">'.$objp->qty.'</td>';
-                    // Remise
-                    if ($objp->remise_percent > 0)
-                    {
-                        print '<td align="right">'.$objp->remise_percent."%</td>\n";
-                    }
-                    else
-                    {
-                        print '<td>&nbsp;</td>';
-                    }
-
-					// Margin
-					if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>';
-
-                    // Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
-                    print '<td align="right" class="nowrap">';
-                    if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
-                    {
-                        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=move&amp;rowid='.$objp->rowid.'">';
-                        print img_picto($langs->trans("MoveToAnotherContract"),'uparrow');
-                        print '</a>';
-                    }
-                    else {
-                        print '&nbsp;';
-                    }
-                    if ($user->rights->contrat->creer && ($object->statut >= 0))
-                    {
-                        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'">';
-                        print img_edit();
-                        print '</a>';
-                    }
-                    else {
-                        print '&nbsp;';
-                    }
-                    if ( $user->rights->contrat->creer && ($object->statut >= 0))
-                    {
-                        print '&nbsp;';
-                        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
-                        print img_delete();
-                        print '</a>';
-                    }
-                    print '</td>';
-
-                    print "</tr>\n";
-
-                    // Dates de en service prevues et effectives
-                    if ($objp->subprice >= 0)
-                    {
-                        print '<tr '.$bc[$var].'>';
-                        print '<td colspan="'.($conf->margin->enabled?7:6).'">';
-
-                        // Date planned
-                        print $langs->trans("DateStartPlanned").': ';
-                        if ($objp->date_debut)
-                        {
-                            print dol_print_date($db->jdate($objp->date_debut));
-                            // Warning si date prevu passee et pas en service
-                            if ($objp->statut == 0 && $db->jdate($objp->date_debut) < ($now - $conf->contrat->services->inactifs->warning_delay)) { print " ".img_warning($langs->trans("Late")); }
-                        }
-                        else print $langs->trans("Unknown");
-                        print ' &nbsp;-&nbsp; ';
-                        print $langs->trans("DateEndPlanned").': ';
-                        if ($objp->date_fin)
-                        {
-                            print dol_print_date($db->jdate($objp->date_fin));
-                            if ($objp->statut == 4 && $db->jdate($objp->date_fin) < ($now - $conf->contrat->services->expires->warning_delay)) { print " ".img_warning($langs->trans("Late")); }
-                        }
-                        else print $langs->trans("Unknown");
-
-                        print '</td>';
-                        print '</tr>';
-                    }
-                }
-                // Ligne en mode update
-                else
-              {
-                    // Ligne carac
-                    print "<tr ".$bc[$var].">";
-                    print '<td>';
-                    if ($objp->fk_product)
-                    {
-                        $productstatic->id=$objp->fk_product;
-                        $productstatic->type=$objp->ptype;
-                        $productstatic->ref=$objp->pref;
-                        print $productstatic->getNomUrl(1,'',20);
-                        print $objp->label?' - '.dol_trunc($objp->label,16):'';
-                        print '<br>';
-                    }
-                    else
-                    {
-                        print $objp->label?$objp->label.'<br>':'';
-                    }
-
-                    // editeur wysiwyg
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                    $nbrows=ROWS_2;
-                    if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-                    $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-                    $doleditor=new DolEditor('product_desc',$objp->description,'',92,'dolibarr_details','',false,true,$enable,$nbrows,70);
-                    $doleditor->Create();
-
-                    print '</td>';
-                    print '<td align="right">';
-                    print $form->load_tva("eltva_tx",$objp->tva_tx,$mysoc,$object->thirdparty);
-                    print '</td>';
-                    print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
-                    print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
-                    print '<td align="right" class="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
-					if (! empty($usemargins))
-					{
-					    print '<td align="right">';
-					    if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
-						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
-					}
-                    print '<td align="center" rowspan="2" valign="middle"><input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
-                    print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-                    print '</td>';
-
-                    $colspan=5;
-                    if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++;
-
-                    // Ligne dates prevues
-                    print "<tr ".$bc[$var].">";
-                    print '<td colspan="'.$colspan.'">';
-                    print $langs->trans("DateStartPlanned").' ';
-                    $form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update");
-                    print '<br>'.$langs->trans("DateEndPlanned").' ';
-                    $form->select_date($db->jdate($objp->date_fin),"date_end_update",$usehm,$usehm,($db->jdate($objp->date_fin)>0?0:1),"update");
-                    print '</td>';
-                    print '</tr>';
-                }
-
-                $db->free($result);
-            }
-            else
-			{
-                dol_print_error($db);
-            }
-
-            if ($object->statut > 0)
-            {
-                print '<tr '.$bc[false].'>';
-                print '<td colspan="'.($conf->margin->enabled?7:6).'"><hr></td>';
-                print "</tr>\n";
-            }
-
-            print "</table>";
-
-            print "</form>\n";
-
-
-            /*
-             * Confirmation to delete service line of contract
-             */
-            if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
-            {
-                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
-                if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
-            }
-
-            /*
-             * Confirmation to move service toward another contract
-             */
-            if ($action == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid'))
-            {
-                $arraycontractid=array();
-                foreach($arrayothercontracts as $contractcursor)
-                {
-                    $arraycontractid[$contractcursor->id]=$contractcursor->ref;
-                }
-                //var_dump($arraycontractid);
-                // Cree un tableau formulaire
-                $formquestion=array(
-				'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
-                array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
-
-                $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
-            }
-
-            /*
-             * Confirmation de la validation activation
-             */
-            if ($action == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-            {
-                $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-                $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-                $comment      = GETPOST('comment');
-                $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
-            }
-
-            /*
-             * Confirmation de la validation fermeture
-             */
-            if ($action == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-            {
-                $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-                $dateactend   = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-                $comment      = GETPOST('comment');
-                $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
-                print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
-            }
-
-
-            // Area with status and activation info of line
-            if ($object->statut > 0)
-            {
-                print '<table class="notopnoleftnoright tableforservicepart2" width="100%">';
-
-                print '<tr '.$bc[false].'>';
-                print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
-                print '<td width="30" align="right">';
-                if ($user->societe_id == 0)
-                {
-                    if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
-                    {
-                        $tmpaction='activateline';
-                        if ($objp->statut == 4) $tmpaction='unactivateline';
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'&amp;action='.$tmpaction.'">';
-                        print img_edit();
-                        print '</a>';
-                    }
-                }
-                print '</td>';
-                print "</tr>\n";
-
-                print '<tr '.$bc[false].'>';
-
-                print '<td>';
-                // Si pas encore active
-                if (! $objp->date_debut_reelle) {
-                    print $langs->trans("DateStartReal").': ';
-                    if ($objp->date_debut_reelle) print dol_print_date($objp->date_debut_reelle);
-                    else print $langs->trans("ContractStatusNotRunning");
-                }
-                // Si active et en cours
-                if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
-                    print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($objp->date_debut_reelle);
-                }
-                // Si desactive
-                if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
-                    print $langs->trans("DateStartReal").': ';
-                    print dol_print_date($objp->date_debut_reelle);
-                    print ' &nbsp;-&nbsp; ';
-                    print $langs->trans("DateEndReal").': ';
-                    print dol_print_date($objp->date_fin_reelle);
-                }
-                if (! empty($objp->comment)) print "<br>".$objp->comment;
-                print '</td>';
-
-                print '<td align="center">&nbsp;</td>';
-
-                print '</tr>';
-                print '</table>';
-            }
-
-            if ($user->rights->contrat->activer && $action == 'activateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-            {
-                /**
-                 * Activer la ligne de contrat
-                 */
-                print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.GETPOST('ligne').'&amp;action=active" method="post">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-                print '<table class="notopnoleftnoright" width="100%">';
-
-                // Definie date debut et fin par defaut
-                $dateactstart = $objp->date_debut;
-                if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-                elseif (! $dateactstart) $dateactstart = time();
-
-                $dateactend = $objp->date_fin;
-                if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-                elseif (! $dateactend)
-                {
-                    if ($objp->fk_product > 0)
-                    {
-                        $product=new Product($db);
-                        $product->fetch($objp->fk_product);
-                        $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
-                    }
-                }
-
-                print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>';
-                print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active");
-                print '</td>';
-
-                print '<td>'.$langs->trans("DateEndPlanned").'</td><td>';
-                print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active");
-                print '</td>';
-
-                print '<td align="center" rowspan="2" valign="middle">';
-                print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"><br>';
-                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-                print '</td>';
-
-                print '</tr>';
-
-                print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td></tr>';
-
-                print '</table>';
-
-                print '</form>';
-            }
-
-            if ($user->rights->contrat->activer && $action == 'unactivateline' && $object->lines[$cursorline-1]->id == GETPOST('ligne'))
-            {
-                /**
-                 * Desactiver la ligne de contrat
-                 */
-                print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline-1]->id.'&amp;action=closeline" method="post">';
-
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-                print '<table class="noborder" width="100%">';
-
-                // Definie date debut et fin par defaut
-                $dateactstart = $objp->date_debut_reelle;
-                if (GETPOST('remonth')) $dateactstart = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-                elseif (! $dateactstart) $dateactstart = time();
-
-                $dateactend = $objp->date_fin_reelle;
-                if (GETPOST('endmonth')) $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-                elseif (! $dateactend)
-                {
-                    if ($objp->fk_product > 0)
-                    {
-                        $product=new Product($db);
-                        $product->fetch($objp->fk_product);
-                        $dateactend = dol_time_plus_duree(time(), $product->duration_value, $product->duration_unit);
-                    }
-                }
-                $now=dol_now();
-                if ($dateactend > $now) $dateactend=$now;
-
-                print '<tr '.$bc[$var].'><td colspan="2">';
-                if ($objp->statut >= 4)
-                {
-                    if ($objp->statut == 4)
-                    {
-                        print $langs->trans("DateEndReal").' ';
-                        $form->select_date($dateactend,"end",$usehm,$usehm,($objp->date_fin_reelle>0?0:1),"closeline",1,1);
-                    }
-                }
-                print '</td>';
-
-                print '<td align="right" rowspan="2"><input type="submit" class="button" name="close" value="'.$langs->trans("Close").'"><br>';
-                print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-                print '</td></tr>';
-
-                print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td><input size="70" type="text" class="flat" name="comment" value="'.GETPOST('comment').'"></td></tr>';
-                print '</table>';
-
-                print '</form>';
-            }
-
-            $cursorline++;
-        }
-
-		// Form to add new line
-        if ($user->rights->contrat->creer && ($object->statut >= 0))
-        {
-        	$dateSelector=1;
-
-			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
-			<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
-			<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateligne').'">
-			<input type="hidden" name="mode" value="">
-			<input type="hidden" name="id" value="'.$object->id.'">
-			';
-
-			print '<br>';
-            print '<table id="tablelines" class="noborder noshadow" width="100%">';	// Array with (n*2)+1 lines
-
-            // Trick to not show product entries
-            $savproductenabled=$conf->product->enabled;
-            if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $conf->product->enabled = 0;
-
-        	// Form to add new line
-       		if ($action != 'editline')
-			{
-				$var = true;
-
-				// Add free products/services
-				$object->formAddObjectLine(1, $mysoc, $soc);
-
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			}
-
-        	// Restore correct setup
-        	$conf->product->enabled = $savproductenabled;
-
-            print '</table>';
-
-            print '</form>';
-        }
-
-		dol_fiche_end();
-
-
-        /*
-         * Buttons
-         */
-
-        if ($user->societe_id == 0)
-        {
-            print '<div class="tabsAction">';
-
-            if ($object->statut == 0 && $nbofservices)
-            {
-                if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
-                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
-            }
-
-            if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
-            {
-                $langs->load("bills");
-                if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
-                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
-            }
-
-            if ($object->nbofservicesclosed < $nbofservices)
-            {
-                //if (! $numactive)
-                //{
-                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-                //}
-                //else
-                //{
-                //	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
-                //}
-            }
-
-            // On peut supprimer entite si
-            // - Droit de creer + mode brouillon (erreur creation)
-            // - Droit de supprimer
-            if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
-            {
-                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
-            }
-            else
-            {
-            	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
-            }
-
-            print "</div>";
-        }
-
-
-        print '<table width="100%"><tr><td width="50%" valign="top">';
-
-        /*
-         * Linked object block
-         */
-        $somethingshown=$object->showLinkedObjectBlock();
-
-        print '</td><td valign="top" width="50%">';
-        print '</td></tr></table>';
-    }
-}
-
-
-llxFooter();
-
-$db->close();
-?>
-
-<?php
-if ($conf->margin->enabled && $action == 'editline')
-{
-?>
-
-<script type="text/javascript">
-$(document).ready(function() {
-  var idprod = $("input[name='idprod']").val();
-  var fournprice = $("input[name='fournprice']").val();
-  if (idprod > 0) {
-	  $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': idprod}, function(data) {
-	    if (data.length > 0) {
-	      var options = '';
-	      var trouve=false;
-	      $(data).each(function() {
-	        options += '<option value="'+this.id+'" price="'+this.price+'"';
-	        if (fournprice > 0) {
-		        if (this.id == fournprice) {
-		          options += ' selected';
-		          $("#buying_price").val(this.price);
-		          trouve = true;
-		        }
-	        }
-	        options += '>'+this.label+'</option>';
-	      });
-	      options += '<option value=null'+(trouve?'':' selected')+'><?php echo $langs->trans("InputPrice"); ?></option>';
-	      $("#fournprice").html(options);
-	      if (trouve) {
-	        $("#buying_price").hide();
-	        $("#fournprice").show();
-	      }
-	      else {
-	        $("#buying_price").show();
-	      }
-	      $("#fournprice").change(function() {
-	        var selval = $(this).find('option:selected').attr("price");
-	        if (selval)
-	          $("#buying_price").val(selval).hide();
-	        else
-	          $('#buying_price').show();
-	      });
-	    }
-	    else {
-	      $("#fournprice").hide();
-	      $('#buying_price').show();
-	    }
-	  },
-	  'json');
-	}
-    else {
-      $("#fournprice").hide();
-      $('#buying_price').show();
-    }
-});
-</script>
-
-<?php
-}
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 772b0e1ecdc..02a580174c3 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -75,7 +75,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 if (! empty($conf->contrat->enabled))
 {
 	$var=false;
-	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/liste.php">';
+	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder nohover" width="100%">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAContract").'</td></tr>';
@@ -227,7 +227,7 @@ print "</table><br>";
 if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
 	$sql  = "SELECT c.rowid as ref, c.rowid,";
-	$sql.= " s.nom, s.rowid as socid";
+	$sql.= " s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE s.rowid = c.fk_soc";
@@ -262,7 +262,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 				print '</td>';
 				print '<td>';
 				$companystatic->id=$obj->socid;
-				$companystatic->nom=$obj->nom;
+				$companystatic->name=$obj->name;
 				$companystatic->client=1;
 				print $companystatic->getNomUrl(1,'',16);
 				print '</td>';
@@ -298,7 +298,7 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.d
 $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.tms, c.statut, s.nom, s.rowid as socid";
+$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid";
 $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";
@@ -312,7 +312,7 @@ $sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid";
 $sql.= " ORDER BY c.tms DESC";
 $sql.= " LIMIT ".$max;
 
-dol_syslog("contrat/index.php sql=".$sql, LOG_DEBUG);
+dol_syslog("contrat/index.php", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
@@ -342,7 +342,7 @@ if ($result)
 		print '</td>';
 		print '<td>';
 		$staticcompany->id=$obj->socid;
-		$staticcompany->nom=$obj->nom;
+		$staticcompany->name=$obj->name;
 		print $staticcompany->getNomUrl(1,'',20);
 		print '</td>';
 		print '<td align="center">'.dol_print_date($obj->tms,'dayhour').'</td>';
@@ -369,7 +369,7 @@ print '<br>';
 // Last modified services
 $sql = "SELECT c.ref, c.fk_soc, ";
 $sql.= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
-$sql.= " s.nom,";
+$sql.= " s.nom as name,";
 $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -416,17 +416,17 @@ if ($resql)
 		}
 		else
 		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
             if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
             else print '</a> '.dol_trunc($obj->note,20);
 		}
 		print '</td>';
 		print '<td>';
 		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->nom=$obj->nom;
+		$staticcompany->name=$obj->name;
 		print $staticcompany->getNomUrl(1,'',20);
 		print '</td>';
-		print '<td class="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
+		print '<td class="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
 		$dateend=$db->jdate($obj->date_fin_validite);
 		print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0);
 		print '</a></td>';
@@ -447,7 +447,7 @@ print '<br>';
 
 // Not activated services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql.= " s.nom,";
+$sql.= " s.nom as name,";
 $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -496,14 +496,14 @@ if ($resql)
 		}
 		else
 		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
             if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
             else print '</a> '.dol_trunc($obj->note,20);
 		}
         print '</td>';
 		print '<td>';
 		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->nom=$obj->nom;
+		$staticcompany->name=$obj->name;
 		print $staticcompany->getNomUrl(1,'',20);
 		print '</td>';
 		print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
@@ -526,7 +526,7 @@ print '<br>';
 
 // Expired services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql.= " s.nom,";
+$sql.= " s.nom as name,";
 $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -576,14 +576,14 @@ if ($resql)
 		}
 		else
 		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
             if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
             else print '</a> '.dol_trunc($obj->note,20);
 		}
 		print '</td>';
 		print '<td>';
 		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->nom=$obj->nom;
+		$staticcompany->name=$obj->name;
 		print $staticcompany->getNomUrl(1,'',20);
 		print '</td>';
 		print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
new file mode 100644
index 00000000000..debe18e995e
--- /dev/null
+++ b/htdocs/contrat/list.php
@@ -0,0 +1,191 @@
+<?php
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/contrat/list.php
+ *       \ingroup    contrat
+ *       \brief      Page liste des contrats
+ */
+
+require ("../main.inc.php");
+require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
+
+$langs->load("contracts");
+$langs->load("products");
+$langs->load("companies");
+$langs->load("compta");
+
+$sortfield=GETPOST('sortfield','alpha');
+$sortorder=GETPOST('sortorder','alpha');
+$page=GETPOST('page','int');
+if ($page == -1) { $page = 0 ; }
+$limit = $conf->liste_limit;
+$offset = $limit * $page ;
+
+$search_name=GETPOST('search_name');
+$search_contract=GETPOST('search_contract');
+$search_ref_supplier=GETPOST('search_ref_supplier','alpha');
+$sall=GETPOST('sall');
+$search_status=GETPOST('search_status');
+$socid=GETPOST('socid');
+
+if (! $sortfield) $sortfield="c.rowid";
+if (! $sortorder) $sortorder="DESC";
+
+// Security check
+$id=GETPOST('id','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'contrat', $id);
+
+$staticcontrat=new Contrat($db);
+$staticcontratligne=new ContratLigne($db);
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_name="";
+	$search_contract="";
+	$search_ref_supplier="";
+	$sall="";
+	$search_status="";
+}
+
+if ($search_status == '') $search_status=1;
+
+
+/*
+ * View
+ */
+
+$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.= " 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";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
+$sql.= " WHERE c.fk_soc = s.rowid ";
+$sql.= " AND c.entity = ".$conf->entity;
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($search_name) {
+    $sql .= natural_search('s.nom', $search_name);
+}
+if ($search_contract) {
+    $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
+}
+if (!empty($search_ref_supplier)) {
+	$sql .= natural_search(array('c.ref_supplier'), $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, c.ref_supplier, s.nom, s.rowid";
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($conf->liste_limit + 1, $offset);
+
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_name='.$search_name, $sortfield, $sortorder,'',$num);
+
+    print '<table class="liste" width="100%">';
+
+    print '<tr class="liste_titre">';
+    $param='&amp;search_contract='.$search_contract;
+    $param.='&amp;search_name='.$search_name;
+    $param.='&amp;search_ref_supplier='.$search_ref_supplier;
+    print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
+    //print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
+    //print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "c.statut","","$param",'align="center"',$sortfield,$sortorder);
+    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(0,3).'</td>';
+    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(4,3,0).'</td>';
+    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(4,3,1).'</td>';
+    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(5,3).'</td>';
+    print "</tr>\n";
+
+    print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<tr class="liste_titre">';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="3" name="search_contract" value="'.$search_contract.'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="7" name="search_ref_supplier value="'.$search_ref_supplier.'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="24" name="search_name" value="'.$search_name.'">';
+    print '</td>';
+    print '<td class="liste_titre">&nbsp;</td>';
+    //print '<td class="liste_titre">&nbsp;</td>';
+    print '<td colspan="4" class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print "</td></tr>\n";
+    print '</form>';
+
+    $var=true;
+    while ($i < min($num,$limit))
+    {
+        $obj = $db->fetch_object($resql);
+        $var=!$var;
+        print '<tr '.$bc[$var].'>';
+        print '<td class="nowrap"><a href="card.php?id='.$obj->cid.'">';
+        print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .'</a>';
+        if ($obj->nb_late) print img_warning($langs->trans("Late"));
+        print '</td>';
+        print '<td>'.$obj->ref_supplier.'</td>';
+        print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
+        //print '<td align="center">'.dol_print_date($obj->datec).'</td>';
+        print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat)).'</td>';
+        //print '<td align="center">'.$staticcontrat->LibStatut($obj->statut,3).'</td>';
+        print '<td align="center">'.($obj->nb_initial>0?$obj->nb_initial:'').'</td>';
+        print '<td align="center">'.($obj->nb_running>0?$obj->nb_running:'').'</td>';
+        print '<td align="center">'.($obj->nb_expired>0?$obj->nb_expired:'').'</td>';
+        print '<td align="center">'.($obj->nb_closed>0 ?$obj->nb_closed:'').'</td>';
+        print "</tr>\n";
+        $i++;
+    }
+    $db->free($resql);
+
+    print "</table>";
+}
+else
+{
+    dol_print_error($db);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php
deleted file mode 100644
index e1e49a5d7fd..00000000000
--- a/htdocs/contrat/liste.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/contrat/liste.php
- *       \ingroup    contrat
- *       \brief      Page liste des contrats
- */
-
-require ("../main.inc.php");
-require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
-
-$langs->load("contracts");
-$langs->load("products");
-$langs->load("companies");
-
-$sortfield=GETPOST('sortfield','alpha');
-$sortorder=GETPOST('sortorder','alpha');
-$page=GETPOST('page','int');
-if ($page == -1) { $page = 0 ; }
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-$search_nom=GETPOST('search_nom');
-$search_contract=GETPOST('search_contract');
-$sall=GETPOST('sall');
-$statut=GETPOST('statut')?GETPOST('statut'):1;
-$socid=GETPOST('socid');
-
-if (! $sortfield) $sortfield="c.rowid";
-if (! $sortorder) $sortorder="DESC";
-
-// Security check
-$id=GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'contrat', $id);
-
-$staticcontrat=new Contrat($db);
-$staticcontratligne=new ContratLigne($db);
-
-
-/*
- * View
- */
-
-$now=dol_now();
-
-llxHeader();
-
-$sql = 'SELECT';
-$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, s.rowid as socid";
-$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";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
-$sql.= " WHERE c.fk_soc = s.rowid ";
-$sql.= " AND c.entity = ".$conf->entity;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($search_nom) {
-    $sql .= natural_search('s.nom', $search_nom);
-}
-if ($search_contract) {
-    $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
-}
-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,";
-$sql.= " s.nom, s.rowid";
-$sql.= " ORDER BY $sortfield $sortorder";
-$sql.= $db->plimit($conf->liste_limit + 1, $offset);
-
-$resql=$db->query($sql);
-if ($resql)
-{
-    $num = $db->num_rows($resql);
-    $i = 0;
-
-    print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], '&search_contract='.$search_contract.'&search_nom='.$search_nom, $sortfield, $sortorder,'',$num);
-
-    print '<table class="liste" width="100%">';
-
-    print '<tr class="liste_titre">';
-    $param='&amp;search_contract='.$search_contract;
-    $param.='&amp;search_nom='.$search_nom;
-    print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
-    //print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
-    //print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "c.statut","","$param",'align="center"',$sortfield,$sortorder);
-    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(0,3).'</td>';
-    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(4,3,0).'</td>';
-    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(4,3,1).'</td>';
-    print '<td class="liste_titre" width="16">'.$staticcontratligne->LibStatut(5,3).'</td>';
-    print "</tr>\n";
-
-    print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<tr class="liste_titre">';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" size="3" name="search_contract" value="'.$search_contract.'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" size="24" name="search_nom" value="'.$search_nom.'">';
-    print '</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-    //print '<td class="liste_titre">&nbsp;</td>';
-    print '<td colspan="4" class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print "</td>";
-    print "</tr>\n";
-    print '</form>';
-
-    $var=true;
-    while ($i < min($num,$limit))
-    {
-        $obj = $db->fetch_object($resql);
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
-        print '<td class="nowrap"><a href="fiche.php?id='.$obj->cid.'">';
-        print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .'</a>';
-        if ($obj->nb_late) print img_warning($langs->trans("Late"));
-        print '</td>';
-        print '<td><a href="../comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
-        //print '<td align="center">'.dol_print_date($obj->datec).'</td>';
-        print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat)).'</td>';
-        //print '<td align="center">'.$staticcontrat->LibStatut($obj->statut,3).'</td>';
-        print '<td align="center">'.($obj->nb_initial>0?$obj->nb_initial:'').'</td>';
-        print '<td align="center">'.($obj->nb_running>0?$obj->nb_running:'').'</td>';
-        print '<td align="center">'.($obj->nb_expired>0?$obj->nb_expired:'').'</td>';
-        print '<td align="center">'.($obj->nb_closed>0 ?$obj->nb_closed:'').'</td>';
-        print "</tr>\n";
-        $i++;
-    }
-    $db->free($resql);
-
-    print "</table>";
-}
-else
-{
-    dol_print_error($db);
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 3ac3ca47496..502b354ee69 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -64,8 +64,6 @@ $form = new Form($db);
 
 if ($id > 0 || ! empty($ref))
 {
-	dol_htmloutput_mesg($mesg);
-
     $object->fetch_thirdparty();
 
     $head = contract_prepare_head($object);
@@ -77,7 +75,7 @@ if ($id > 0 || ! empty($ref))
 
     print '<table class="border" width="100%">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
     // Reference
 	print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="5">'.$form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '').'</td></tr>';
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 382dcad5e93..22ae64ef9cd 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -44,7 +44,7 @@ if (! $sortfield) $sortfield="c.rowid";
 if (! $sortorder) $sortorder="ASC";
 
 $filter=GETPOST("filter");
-$search_nom=GETPOST("search_nom");
+$search_name=GETPOST("search_name");
 $search_contract=GETPOST("search_contract");
 $search_service=GETPOST("search_service");
 $statut=GETPOST('statut')?GETPOST('statut'):1;
@@ -69,6 +69,21 @@ $staticcontrat=new Contrat($db);
 $staticcontratligne=new ContratLigne($db);
 $companystatic=new Societe($db);
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_name="";
+	$search_contract="";
+	$search_service="";
+	$op1month="";
+	$op1day="";
+	$op1year="";
+	$filter_op1="";
+	$op2month="";
+	$op2day="";
+	$op2year="";
+	$filter_op2="";
+}
+
 /*
  * View
  */
@@ -80,7 +95,7 @@ $form=new Form($db);
 llxHeader();
 
 $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,";
-$sql.= " s.rowid as socid, s.nom,";
+$sql.= " s.rowid as socid, s.nom as name,";
 $sql.= " cd.rowid, cd.description, cd.statut,";
 $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype,";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
@@ -101,7 +116,7 @@ if ($mode == "0") $sql.= " AND cd.statut = 0";
 if ($mode == "4") $sql.= " AND cd.statut = 4";
 if ($mode == "5") $sql.= " AND cd.statut = 5";
 if ($filter == "expired") $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
-if ($search_nom)      $sql.= " AND s.nom LIKE '%".$db->escape($search_nom)."%'";
+if ($search_name)     $sql.= " AND s.nom LIKE '%".$db->escape($search_name)."%'";
 if ($search_contract) $sql.= " AND c.rowid = '".$db->escape($search_contract)."'";
 if ($search_service)  $sql.= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')";
 if ($socid > 0)       $sql.= " AND s.rowid = ".$socid;
@@ -113,7 +128,7 @@ $sql .= $db->order($sortfield,$sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
-dol_syslog("contrat/services.php sql=".$sql);
+dol_syslog("contrat/services.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -122,7 +137,7 @@ if ($resql)
 
 	$param='';
 	if ($search_contract) $param.='&amp;search_contract='.urlencode($search_contract);
-	if ($search_nom)      $param.='&amp;search_nom='.urlencode($search_nom);
+	if ($search_name)      $param.='&amp;search_name='.urlencode($search_name);
 	if ($search_service)  $param.='&amp;search_service='.urlencode($search_service);
 	if ($mode)            $param.='&amp;mode='.$mode;
 	if ($filter)          $param.='&amp;filter='.$filter;
@@ -136,24 +151,24 @@ if ($resql)
 	if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices");
 	if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices");
 	if ($mode == "5") $title=$langs->trans("ListOfClosedServices");
-	print_barre_liste($title, $page, "services.php", $param, $sortfield, $sortorder,'',$num);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
 
 	print '<table class="liste" width="100%">';
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Contract"),"services.php", "c.rowid",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Service"),"services.php", "p.description",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Company"),"services.php", "s.nom",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Contract"),$_SERVER["PHP_SELF"], "c.rowid",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Service"),$_SERVER["PHP_SELF"], "p.description",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"], "s.nom",$param,"","",$sortfield,$sortorder);
 	// Date debut
-	if ($mode == "0") print_liste_field_titre($langs->trans("DateStartPlannedShort"),"services.php", "cd.date_ouverture_prevue",$param,'',' align="center"',$sortfield,$sortorder);
-	if ($mode == "" || $mode > 0) print_liste_field_titre($langs->trans("DateStartRealShort"),"services.php", "cd.date_ouverture",$param,'',' align="center"',$sortfield,$sortorder);
+	if ($mode == "0") print_liste_field_titre($langs->trans("DateStartPlannedShort"),$_SERVER["PHP_SELF"], "cd.date_ouverture_prevue",$param,'',' align="center"',$sortfield,$sortorder);
+	if ($mode == "" || $mode > 0) print_liste_field_titre($langs->trans("DateStartRealShort"),$_SERVER["PHP_SELF"], "cd.date_ouverture",$param,'',' align="center"',$sortfield,$sortorder);
 	// Date fin
-	if ($mode == "" || $mode < 5) print_liste_field_titre($langs->trans("DateEndPlannedShort"),"services.php", "cd.date_fin_validite",$param,'',' align="center"',$sortfield,$sortorder);
-	else print_liste_field_titre($langs->trans("DateEndRealShort"),"services.php", "cd.date_cloture",$param,'',' align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),"services.php", "cd.statut,c.statut",$param,"","align=\"right\"",$sortfield,$sortorder);
+	if ($mode == "" || $mode < 5) print_liste_field_titre($langs->trans("DateEndPlannedShort"),$_SERVER["PHP_SELF"], "cd.date_fin_validite",$param,'',' align="center"',$sortfield,$sortorder);
+	else print_liste_field_titre($langs->trans("DateEndRealShort"),$_SERVER["PHP_SELF"], "cd.date_cloture",$param,'',' align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "cd.statut,c.statut",$param,"","align=\"right\"",$sortfield,$sortorder);
 	print "</tr>\n";
 
-	print '<form method="POST" action="services.php">';
+	print '<form method="POST" action="'. $_SERVER["PHP_SELF"] .'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 	print '<tr class="liste_titre">';
@@ -168,7 +183,7 @@ if ($resql)
 	print '</td>';
 	// Third party
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="24" name="search_nom" value="'.dol_escape_htmltag($search_nom).'">';
+	print '<input type="text" class="flat" size="24" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
 	$arrayofoperators=array('<'=>'<','>'=>'>');
@@ -184,9 +199,9 @@ if ($resql)
 	$filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year);
 	print $form->select_date($filter_date2,'op2',0,0,1);
 	print '</td>';
-	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print "</td>";
-	print "</tr>\n";
+    print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print "</td></tr>\n";
 	print '</form>';
 
 	$contractstatic=new Contrat($db);
@@ -225,7 +240,7 @@ if ($resql)
 		// Third party
 		print '<td>';
 		$companystatic->id=$obj->socid;
-		$companystatic->nom=$obj->nom;
+		$companystatic->name=$obj->name;
 		$companystatic->client=1;
 		print $companystatic->getNomUrl(1,'customer',28);
 		print '</td>';
diff --git a/htdocs/contrat/tpl/index.html b/htdocs/contrat/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 702ed8d81ff..d94d45489fd 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -43,7 +43,7 @@ foreach($linkedObjectBlock as $object)
 	$var=!$var;
 ?>
 <tr <?php echo $bc[$var]; ?> ><td>
-	<a href="<?php echo DOL_URL_ROOT.'/contrat/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowContract"),"contract").' '.$object->ref; ?></a></td>
+	<a href="<?php echo DOL_URL_ROOT.'/contrat/card.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowContract"),"contract").' '.$object->ref; ?></a></td>
 	<td align="center"><?php echo dol_print_date($object->date_contrat,'day'); ?></td>
 	<td align="right">&nbsp;</td>
 	<td align="right"><?php echo $object->getLibStatut(6); ?></td>
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 89edfcbae8e..d5f8ea7c18c 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -141,7 +141,7 @@ if ($action == 'add')
     				}
     			}
 
-                $result=$extrafields->addExtraField($_POST['attrname'],$_POST['label'],$_POST['type'],$_POST['pos'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$default_value,$params);
+                $result=$extrafields->addExtraField($_POST['attrname'],$_POST['label'],$_POST['type'],$_POST['pos'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$default_value,$params,(GETPOST('alwayseditable')?1:0));
     			if ($result > 0)
     			{
     				setEventMessage($langs->trans('SetupSaved'));
@@ -278,7 +278,7 @@ if ($action == 'update')
     					$params['options'][$key] = $value;
     				}
     			}
-    			$result=$extrafields->update($_POST['attrname'],$_POST['label'],$_POST['type'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$pos,$params);
+    			$result=$extrafields->update($_POST['attrname'],$_POST['label'],$_POST['type'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$pos,$params,(GETPOST('alwayseditable')?1:0));
     			if ($result > 0)
     			{
     				setEventMessage($langs->trans('SetupSaved'));
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 @@
+<?php
+/* Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * 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 3af164abfab..49de1529321 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -26,7 +26,8 @@
 
 // $id must be defined
 // $actiontypecode must be defined
-
+// $paramname must be defined
+// $mode must be defined
 
 /*
  * Add file in email form
@@ -86,10 +87,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 	if ($result > 0)
 	{
-		if ($_POST['sendto'])
+		if (trim($_POST['sendto']))
 		{
 			// Recipient is provided into free text
-			$sendto = $_POST['sendto'];
+			$sendto = trim($_POST['sendto']);
 			$sendtoid = 0;
 		}
 		elseif ($_POST['receiver'] != '-1')
@@ -106,6 +107,22 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				$sendtoid = $_POST['receiver'];
 			}
 		}
+		if (trim($_POST['sendtocc']))
+		{
+			$sendtocc = trim($_POST['sendtocc']);
+		}
+		elseif ($_POST['receivercc'] != '-1')
+		{
+			// Recipient was provided from combo list
+			if ($_POST['receivercc'] == 'thirdparty')	// Id of third party
+			{
+				$sendtocc = $thirdparty->email;
+			}
+			else	// Id du contact
+			{
+				$sendtocc = $thirdparty->contact_get_property($_POST['receivercc'],'email');
+			}
+		}
 
 		if (dol_strlen($sendto))
 		{
@@ -114,19 +131,24 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
 			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
 			$message = $_POST['message'];
-			$sendtocc = $_POST['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);
+			if ($mode == 'emailfrominvoice')  $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO);
+
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
 			if ($action == 'send' || $action == 'relance')
 			{
 				if (dol_strlen($_POST['subject'])) $subject = $_POST['subject'];
-				$actionmsg2=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+				$actionmsg2=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 				if ($message)
 				{
-					$actionmsg=$langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
-					$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-					$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-					$actionmsg.=$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);
 				}
 			}
 
@@ -141,7 +163,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 
 			// Send mail
 			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+			$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$sendtobcc,$deliveryreceipt,-1);
 			if ($mailfile->error)
 			{
 				$mesgs[]='<div class="error">'.$mailfile->error.'</div>';
@@ -165,7 +187,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					// Appel des triggers
 					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 					$interface=new Interfaces($db);
-					$result=$interface->run_triggers('COMPANY_SENTBYMAIL',$object,$user,$langs,$conf);
+					$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
 					if ($result < 0) {
 						$error++; $this->errors=$interface->errors;
 					}
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index d1a64f6b256..997e27adb20 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -153,7 +153,7 @@ if ($type == 'directory')
     $sorting = (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC);
 
     // Right area. If module is defined, we are in automatic ecm.
-    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project');
+    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user');
 
     // TODO change for multicompany sharing
     // Auto area for suppliers invoices
@@ -184,6 +184,10 @@ if ($type == 'directory')
     else if ($module == 'tax') $upload_dir = $conf->tax->dir_output;
     // Auto area for projects
     else if ($module == 'project') $upload_dir = $conf->projet->dir_output;
+    // Auto area for interventions
+    else if ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
+    // Auto area for users
+    else if ($module == 'user') $upload_dir = $conf->user->dir_output;
 
     if (in_array($module, $automodules))
     {
@@ -203,7 +207,6 @@ if ($type == 'directory')
         if ($section === '0')
         {
             $filearray=array();
-            $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
         }
         else $filearray=dol_dir_list($upload_dir,"files",0,'',array('^\.','(\.meta|_preview\.png)$','^temp$','^CVS$'),$sortfield, $sorting,1);
 
@@ -212,6 +215,7 @@ if ($type == 'directory')
             $param.='&section='.$section;
             $textifempty = $langs->trans('NoFileFound');
         }
+        else if ($section === '0') $textifempty='<br><div align="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
         else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
 
         $formfile->list_of_documents($filearray,'','ecm',$param,1,$relativepath,$user->rights->ecm->upload,1,$textifempty,$maxlengthname,'',$url);
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index b4ceaeaced1..ae70d1a418a 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -145,7 +145,8 @@ if (file_exists($fullpathselecteddir))
     		    {
 					if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
 					{
-    		    		$val['fullrelativename']=$file; $val['id']=0;
+    		    		$val['fullrelativename']=$file;
+    		    		$val['id']=0;
     		    		$val['label']=$file;
     		    		$val['description']='';
     		    		$nboffilesinsubdir=$langs->trans("Unknown");
diff --git a/htdocs/core/ajax/index.html b/htdocs/core/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/ajax/index.php b/htdocs/core/ajax/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/ajax/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index 69a0bbc72c7..de3a4e57d19 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2012 Regis Houssin  <regis.houssin@capnetworks.com>
+/* Copyright (C) 2011-2014 Regis Houssin  <regis.houssin@capnetworks.com>
  *
  * 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
@@ -98,7 +98,7 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
 				dol_include_once('/'.$module.'/class/actions_'.$subelement.'.class.php');
 				$classname = 'Actions'.ucfirst($subelement);
 				$object = new $classname($db);
-				$ret = $object->$methodname();
+				$ret = $object->$methodname($fk_element);
 				if ($ret > 0) echo json_encode($object->$cachename);
 			}
 		}
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
new file mode 100644
index 00000000000..6ac5abd3bbb
--- /dev/null
+++ b/htdocs/core/ajax/objectonoff.php
@@ -0,0 +1,49 @@
+<?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 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/core/ajax/productonoff.php
+ *       \brief      File to set tosell and tobuy for product
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+
+$action=GETPOST('action','alpha');
+$id=GETPOST('id', 'int');
+$value=GETPOST('value', 'int');
+$field=GETPOST('field', 'alpha');
+$element=GETPOST('element', 'alpha');
+
+$object = new GenericObject($db);
+/*
+ * View
+ */
+
+top_httphead();
+
+print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+
+// Registering new values
+if (($action == 'set') && ! empty($id))
+    $object->setValueFrom($field, $value, $element, $id);
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 291d7a6647d..30e0211ece1 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -63,14 +63,14 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
 	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
 	{
     	$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
-    	$sql.= ", p.rowid as fk_country, p.code as country_code, p.libelle as country";
+    	$sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
     	$sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
     	$sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
-    	$sql.= " ".MAIN_DB_PREFIX."c_pays as p";
-    	$sql.= " WHERE z.fk_pays = p.rowid";
-    	$sql.= " AND z.active = 1 AND p.active = 1";
+    	$sql.= " ".MAIN_DB_PREFIX."c_country as c";
+    	$sql.= " WHERE z.fk_pays = c.rowid";
+    	$sql.= " AND z.active = 1 AND c.active = 1";
     	if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
     	if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
     	$sql.= " ORDER BY z.zip, z.town";
@@ -79,11 +79,11 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
 	else                                               // Use table of third parties
 	{
         $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
-        $sql.= ", p.code as country_code, p.libelle as country";
+        $sql.= ", c.code as country_code, c.label as country";
         $sql.= ", d.code_departement as county_code , d.nom as county";
         $sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON s.fk_departement = d.rowid";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid';
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
         $sql.= " WHERE";
         if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
         if ($town)    $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php
index c3bc217e100..a16844dd715 100644
--- a/htdocs/core/antispamimage.php
+++ b/htdocs/core/antispamimage.php
@@ -51,8 +51,6 @@ for($i = 0; $i < $length; $i++)
 $sessionkey='dol_antispam_value';
 $_SESSION[$sessionkey]=$string;
 
-header("Content-type: image/png");
-
 $img = imagecreate(80,32);
 if (empty($img))
 {
@@ -60,6 +58,8 @@ if (empty($img))
     exit;
 }
 
+header("Content-type: image/png");
+
 $background_color = imagecolorallocate($img, 250, 250, 250);
 $ecriture_color = imagecolorallocate($img, 0, 0, 0);
 imagestring($img, 4, 24, 8, $string, $ecriture_color);
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index ff63927b526..89d05b92b79 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014 	   Charles-Fr BENKE        <charles.fr@benke.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,8 +63,8 @@ class box_actions extends ModeleBoxes
 		if ($user->rights->agenda->myactions->read)
 		{
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage,";
-			$sql.= " ta.code,";
-			$sql.= " s.nom, s.rowid as socid";
+			$sql.= " ta.code, ta.libelle as type_label,";
+			$sql.= " s.nom as name, s.rowid as socid";
 			$sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
 			$sql.= MAIN_DB_PREFIX."actioncomm AS a)";
 			if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
@@ -77,7 +78,7 @@ class box_actions extends ModeleBoxes
 			$sql.= " ORDER BY a.datec DESC";
 			$sql.= $db->plimit($max, 0);
 
-			dol_syslog("Box_actions::loadBox sql=".$sql, LOG_DEBUG);
+			dol_syslog("Box_actions::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
 			if ($result)
 			{
@@ -95,23 +96,23 @@ class box_actions extends ModeleBoxes
 					if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite  < ($now - $delay_warning)) $late=img_warning($langs->trans("Late"));
 
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
-					$label=$objp->label;
+					$label=empty($objp->label)?$objp->type_label:$objp->label;
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
 					'logo' => ("action"),
-					'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id);
+					'url' => DOL_URL_ROOT."/comm/action/card.php?id=".$objp->id);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
 					'text' => dol_trunc($label,32),
 					'text2'=> $late,
-					'url' => DOL_URL_ROOT."/comm/action/fiche.php?id=".$objp->id);
+					'url' => DOL_URL_ROOT."/comm/action/card.php?id=".$objp->id);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
                     'logo' => ($objp->socid?'company':''),
                     'url' => ($objp->socid?DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid:''));
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-					'text' => dol_trunc($objp->nom,24),
+					'text' => dol_trunc($objp->name,24),
 					'url' => DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'align="left" class="nowrap"',
@@ -151,7 +152,71 @@ class box_actions extends ModeleBoxes
 	 */
 	function showBox($head = null, $contents = null)
 	{
+		global $langs, $conf;
 		parent::showBox($this->info_box_head, $this->info_box_contents);
+				if ($conf->global->SHOW_DIALOG_HOMEPAGE)
+		{
+			$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"))
+			{
+				print '<div id="dialog" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
+				print '<table width=100%>';
+				for ($i=0, $n=$nblines; $i < $n; $i++)
+				{
+					if (isset($contents[$i]))
+					{
+						// on affiche que les évènement du jours ou passé
+						// qui ne sont pas à 100%
+						$actioncejour=true;
+						$var=!$var;
+						// TR
+						$logo=$contents[$i][0]['logo'];
+						$label=$contents[$i][1]['text'];
+						$urlevent=$contents[$i][1]['url'];
+						$logosoc=$contents[$i][2]['logo'];
+						$nomsoc=$contents[$i][3]['text'];
+						$urlsoc=$contents[$i][3]['url'];
+						$dateligne=$contents[$i][4]['text'];
+						$percentage=$contents[$i][5]['text'];
+						print '<tr '.$bcx[$var].'>';
+						print '<td align=center>';
+						print img_object("",$logo);
+						print '</td>';
+						print '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
+						print '<td align=center><a href="'.$urlsoc.'">'.img_object("",$logosoc)." ".$nomsoc.'</a></td>';
+						print '<td align=center>'.$dateligne.'</td>';
+						print '<td align=center>'.$percentage.'</td>';
+						print '</tr>';
+					}
+				}
+				print '</table>';
+
+			}
+			print '</div>';
+			if ($actioncejour)
+			{
+				print '<script>';
+				print '$( "#dialog" ).dialog({ autoOpen: true });';
+				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1)
+				{
+					print 'setTimeout(function(){';
+					print '$("#dialog").dialog("close");';
+					print '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE*1000).');';
+				}
+				print '</script>';
+			}
+			else
+			{
+				print '<script>';
+				print '$( "#dialog" ).dialog({ autoOpen: false });';
+				print '</script>';
+			}
+		}
 	}
 
 }
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 773bb13a3cb..d118bc8a4bc 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -214,7 +214,7 @@ class box_activity extends ModeleBoxes
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
 					'text' => $objp->nb,
-					'url' => DOL_URL_ROOT."/commande/liste.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$objp->fk_statut
+					'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$objp->fk_statut
 					);
 					$totalnb += $objp->nb;
 
@@ -283,7 +283,7 @@ class box_activity extends ModeleBoxes
 
 		// Add the sum in the bottom of the boxes
 		$this->info_box_contents[$i][1] = array('td' => 'align="left" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
-		$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => price($totalnb,1,$langs,0,0,-1,$conf->currency));
+		$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => $totalnb);
 		$this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => price($totalMnt,1,$langs,0,0,-1,$conf->currency));
 		$this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => "");
 		$this->info_box_contents[$i][5] = array('td' => 'align="right"', 'text' => "");
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 5cb1e3ddad4..968eefef4b9 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -53,7 +53,7 @@ class box_bookmarks extends ModeleBoxes
 		$this->max=$max;
 
 		$this->info_box_head = array('text' => $langs->trans("BoxMyLastBookmarks",$max),
-                                     'sublink' => DOL_URL_ROOT.'/bookmarks/liste.php');
+                                     'sublink' => DOL_URL_ROOT.'/bookmarks/list.php');
 		if ($user->rights->bookmark->creer)
 		{
 			$this->info_box_head['subpicto']='object_bookmark';
@@ -101,7 +101,7 @@ class box_bookmarks extends ModeleBoxes
 				{
 					$mytxt=$langs->trans("NoRecordedBookmarks");
 					if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
-					$this->info_box_contents[$i][0] = array('td' => 'align="center" colspan="2"', 'url'=> DOL_URL_ROOT.'/bookmarks/liste.php', 'text'=>$mytxt);
+					$this->info_box_contents[$i][0] = array('td' => 'align="center" colspan="2"', 'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt);
 				}
 
 				$db->free($result);
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index b65702b643f..4e651e8bdcc 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -79,7 +79,7 @@ class box_clients extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status";
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE s.client IN (1, 3)";
@@ -89,12 +89,12 @@ class box_clients extends ModeleBoxes
 			$sql.= " ORDER BY s.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
-			dol_syslog(get_class($this)."::loadBox sql=".$sql,LOG_DEBUG);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-                if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url= DOL_URL_ROOT."/comm/fiche.php?socid=";
+                if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url= DOL_URL_ROOT."/comm/card.php?socid=";
                 else $url= DOL_URL_ROOT."/societe/soc.php?socid=";
 
 				$i = 0;
@@ -109,7 +109,7 @@ class box_clients extends ModeleBoxes
                     'url' => $url.$objp->socid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
+                    'text' => $objp->name,
                     'url' => $url.$objp->socid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 1b7de3cca7f..1bb6fe9b27a 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -58,22 +58,25 @@ class box_commandes extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
         $commandestatic=new Commande($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerOrders",$max));
+        $userstatic = new User($db);
+
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerOrders",$max));
 
         if ($user->rights->commande->lire)
         {
-
-            $sql = "SELECT s.nom, s.rowid as socid,";
-            $sql.= " c.ref, c.tms, c.rowid,";
-            $sql.= " c.fk_statut, c.facture";
+            $sql = "SELECT s.nom as name, s.rowid as socid,";
+            $sql.= " c.ref, c.tms, c.rowid, c.date_commande,";
+            $sql.= " c.fk_statut, c.fk_user_valid, c.facture, c.total_ht";
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."commande as c";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE c.fk_soc = s.rowid";
             $sql.= " AND c.entity = ".$conf->entity;
+            if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql.=" AND c.fk_statut = 1";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
             if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
             $sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
@@ -86,29 +89,43 @@ class box_commandes extends ModeleBoxes
                 while ($i < $num)
                 {
                     $objp = $db->fetch_object($result);
+                    $date=$db->jdate($objp->date_commande);
 					$datem=$db->jdate($objp->tms);
 
-                    $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+                    $this->info_box_contents[$i][] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/commande/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/commande/card.php?id=".$objp->rowid);
 
-                    $this->info_box_contents[$i][1] = array('td' => 'align="left"',
+                    $this->info_box_contents[$i][] = array('td' => 'align="left"',
                     'text' => $objp->ref,
-                    'url' => DOL_URL_ROOT."/commande/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/commande/card.php?id=".$objp->rowid);
 
-					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
+					$this->info_box_contents[$i][] = array('td' => 'align="left" width="16"',
                     'logo' => 'company',
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-					$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+					$this->info_box_contents[$i][] = array('td' => 'align="left"',
+                    'text' => $objp->name,
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-                    $this->info_box_contents[$i][4] = array('td' => 'align="right"',
-                    'text' => dol_print_date($datem,'day'),
+					$this->info_box_contents[$i][] = array('td' => 'align="right"',
+                    'text' => price($objp->total_ht),
+					);
+
+					if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER))
+					{
+						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						$this->info_box_contents[$i][] = array('td' => 'align="right"',
+    	                'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
+						'url' => (($objp->fk_user_valid > 0)?DOL_URL_ROOT.'/user/card.php?id='.$objp->fk_user_valid:'')
+						);
+					}
+
+					$this->info_box_contents[$i][] = array('td' => 'align="right"',
+                    'text' => dol_print_date($date,'day'),
                     );
 
-                    $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"',
+                    $this->info_box_contents[$i][] = array('td' => 'align="right" width="18"',
                     'text' => $commandestatic->LibStatut($objp->fk_statut,$objp->facture,3));
 
                     $i++;
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 8fdc4aff39e..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";
@@ -90,7 +90,7 @@ class box_comptes extends ModeleBoxes
 			$sql.= " ORDER BY label";
 			$sql.= $db->plimit($max, 0);
 
-			dol_syslog(get_class($this)."::loadBox sql=".$sql);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $db->query($sql);
 			if ($result)
 			{
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 1afc0d09e41..e10c9ae7ed9 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -61,7 +61,7 @@ class box_contacts extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT sp.rowid, sp.lastname, sp.firstname, sp.civilite as civility_id, sp.datec, sp.tms, sp.fk_soc,";
+			$sql = "SELECT sp.rowid, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc,";
 			$sql.= " s.nom as socname";
 			$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
@@ -96,11 +96,11 @@ class box_contacts extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/contact/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/contact/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
                     'text' => $contactstatic->getFullName($langs,0),
-                    'url' => DOL_URL_ROOT."/contact/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/contact/card.php?id=".$objp->rowid);
 
                     $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
     				'logo' => ($objp->fk_soc > 0?'company':''),
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 26c3f269f3d..dc0ff8e5382 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -60,7 +60,7 @@ class box_contracts extends ModeleBoxes
 
     	if ($user->rights->contrat->lire)
     	{
-    		$sql = "SELECT s.nom, s.rowid as socid,";
+    		$sql = "SELECT s.nom as name, s.rowid as socid,";
     		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
     		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
     		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -96,20 +96,20 @@ class box_contracts extends ModeleBoxes
 
     				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
     				'logo' => $this->boximg,
-    				'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid);
+    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
     				$this->info_box_contents[$i][1] = array('td' => 'align="left"',
     				'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
     				'text2'=> $late,
-    				'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid);
+    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
     				$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
     				'logo' => 'company',
-    				'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
     				$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-    				'text' => dol_trunc($objp->nom,40),
-    				'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+    				'text' => dol_trunc($objp->name,40),
+    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
     				$this->info_box_contents[$i][4] = array('td' => 'align="right"',
     				'text' => dol_print_date($datec,'day'));
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 18d276b0130..b0fdd6d9d09 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -24,7 +24,6 @@
  */
 include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
-
 /**
  * Class to manage the box to show last invoices
  */
@@ -57,7 +56,7 @@ class box_factures extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$facturestatic=new Facture($db);
 
-		$text = $langs->trans("BoxTitleLastCustomerBills",$max);
+		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."CustomerBills",$max);
 		$this->info_box_head = array(
 				'text' => $text,
 				'limit'=> dol_strlen($text)
@@ -65,9 +64,9 @@ class box_factures extends ModeleBoxes
 
 		if ($user->rights->facture->lire)
 		{
-			$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.datef as df";
+			$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.total as total_ht, f.datef as df";
 			$sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
-			$sql.= ", s.nom, s.rowid as socid";
+			$sql.= ", s.nom as name, s.rowid as socid";
 			$sql.= ", f.date_lim_reglement as datelimite";
 			$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -76,7 +75,8 @@ class box_factures extends ModeleBoxes
 			$sql.= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= " ORDER BY f.tms DESC";
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.facnumber DESC ";
+            else $sql.= " ORDER BY f.tms DESC, f.facnumber DESC ";
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -92,7 +92,8 @@ class box_factures extends ModeleBoxes
 				{
 					$objp = $db->fetch_object($result);
 					$datelimite=$db->jdate($objp->datelimite);
-					$datec=$db->jdate($objp->datec);
+					$date=$db->jdate($objp->df);
+					$datem=$db->jdate($objp->tms);
 
 					$picto='bill';
 					if ($objp->type == 1) $picto.='r';
@@ -111,18 +112,22 @@ class box_factures extends ModeleBoxes
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
                     'logo' => 'company',
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
+                    'text' => $objp->name,
                     'maxlength'=>40,
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'align="right"',
-                    'text' => dol_print_date($datec,'day'),
+                    'text' => price($objp->total_ht),
 					);
 
-					$this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"',
+					$this->info_box_contents[$i][5] = array('td' => 'align="right"',
+                    'text' => dol_print_date($date,'day'),
+					);
+
+					$this->info_box_contents[$i][6] = array('td' => 'align="right" width="18"',
                     'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3));
 
 					$i++;
@@ -159,4 +164,3 @@ class box_factures extends ModeleBoxes
 	}
 
 }
-
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index d9cfa9bf5cd..914f442bea4 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -58,13 +58,13 @@ class box_factures_fourn extends ModeleBoxes
 		$facturestatic=new FactureFournisseur($db);
 
 		$this->info_box_head = array(
-				'text' => $langs->trans("BoxTitleLastSupplierBills",$max)
+				'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierBills",$max)
 		);
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
-			$sql = "SELECT s.nom, s.rowid as socid,";
-			$sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.amount,";
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
+			$sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.total_ht,";
 			$sql.= " f.paye, f.fk_statut,";
 			$sql.= ' f.datef as df,';
 			$sql.= ' f.datec as datec,';
@@ -76,7 +76,8 @@ class box_factures_fourn extends ModeleBoxes
 			$sql.= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-			$sql.= " ORDER BY f.tms DESC";
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY f.datef DESC, f.ref DESC ";
+            else $sql.= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -92,34 +93,35 @@ class box_factures_fourn extends ModeleBoxes
 				{
 					$objp = $db->fetch_object($result);
 					$datelimite=$db->jdate($objp->datelimite);
-					$datec=$db->jdate($objp->datec);
+					$date=$db->jdate($objp->df);
+					$datem=$db->jdate($objp->tms);
 
 					$late = '';
 					if ($objp->paye == 0 && $datelimite && $datelimite < ($now - $conf->facture->fournisseur->warning_delay)) $late=img_warning(sprintf($l_due_date, dol_print_date($datelimite,'day')));
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid);
+                    'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
                     'text' => ($objp->ref?$objp->ref:$objp->facid),
                     'text2'=> $late,
-                    'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid);
+                    'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left"',
                     'text' => $objp->ref_supplier,
-                    'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid);
+                    'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid);
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="left" width="16"',
                     'logo' => 'company',
-                    'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
-                    'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid);
+                    'text' => $objp->name,
+                    'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][5] = array('td' => 'align="right"',
-                    'text' => dol_print_date($datec,'day'));
+                    'text' => dol_print_date($date,'day'));
 
 					$fac = new FactureFournisseur($db);
 					$fac->fetch($objp->facid);
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 742bd04cf82..aa217f1c436 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -60,7 +60,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 		if ($user->rights->fournisseur->facture->lire)
 		{
-			$sql = "SELECT s.nom, s.rowid as socid,";
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
 			$sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,";
 			$sql.= " f.amount, f.datef as df,";
 			$sql.= " f.paye, f.fk_statut, f.type";
@@ -95,24 +95,24 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid);
+                    'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
                     'text' => ($objp->ref?$objp->ref:$objp->facid),
 					'text2'=> $late,
-                    'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid);
+                    'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left"',
                     'text' => $objp->ref_supplier,
-                    'url' => DOL_URL_ROOT."/fourn/facture/fiche.php?facid=".$objp->facid);
+                    'url' => DOL_URL_ROOT."/fourn/facture/card.php?facid=".$objp->facid);
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="left" width="16"',
                     'logo' => 'company',
-                    'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
-                    'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid);
+                    'text' => $objp->name,
+                    'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][5] = array('td' => 'align="right"',
                     'text' => dol_print_date($datelimite,'day'));
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 72c34dee559..e6df1530f8d 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -63,7 +63,7 @@ class box_factures_imp extends ModeleBoxes
 
 		if ($user->rights->facture->lire)
 		{
-			$sql = "SELECT s.nom, s.rowid as socid,";
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
 			$sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
 			$sql.= " f.amount, f.datef as df,";
 			$sql.= " f.paye, f.fk_statut, f.rowid as facid";
@@ -107,12 +107,12 @@ class box_factures_imp extends ModeleBoxes
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
                     'logo' => 'company',
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
+                    'text' => $objp->name,
                     'maxlength'=>44,
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'align="right"',
                     'text' => dol_print_date($datelimite,'day'),
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 3413548c1fd..9cce737eb9a 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -65,21 +65,18 @@ class box_ficheinter extends ModeleBoxes
 			$sql.= " f.datec,";
 			$sql.= " f.date_valid as datev,";
 			$sql.= " f.tms as datem,";
-			$sql.= " s.nom, s.rowid as socid, s.client";
+			$sql.= " s.nom as name, s.rowid as socid, s.client";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (! $user->rights->societe->client->voir)
-				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (! $user->rights->societe->client->voir) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= ", ".MAIN_DB_PREFIX."fichinter as f";
 			$sql.= " WHERE f.fk_soc = s.rowid ";
 			$sql.= " AND f.entity = ".$conf->entity;
-			if (! $user->rights->societe->client->voir && !$user->societe_id)
-				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+			if (! $user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if($user->societe_id)	$sql.= " AND s.rowid = ".$user->societe_id;
-
 			$sql.= " ORDER BY f.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
-			dol_syslog(get_class($this).'::loadBox sql='.$sql,LOG_DEBUG);
+			dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
 			$resql = $db->query($sql);
 			if ($resql)
 			{
@@ -98,19 +95,19 @@ class box_ficheinter extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
 					'logo' => $this->boximg,
-					'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid);
+					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
 					'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some interventions have no ref
-					'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid);
+					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
 					'logo' => 'company',
-					'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-					'text' => dol_trunc($objp->nom,40),
-					'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+					'text' => dol_trunc($objp->name,40),
+					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'align="right"',
 					'text' => dol_print_date($datec,'day'));
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 0157e5acada..f233221ccaa 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -62,7 +62,7 @@ class box_fournisseurs extends ModeleBoxes
 
         if ($user->rights->societe->lire)
         {
-            $sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status";
+            $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status";
             $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql.= " WHERE s.fournisseur = 1";
@@ -86,11 +86,11 @@ class box_fournisseurs extends ModeleBoxes
 
                     $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
 
                     $this->info_box_contents[$i][1] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
-                    'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid);
+                    'text' => $objp->name,
+                    'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
 
                     $this->info_box_contents[$i][2] = array('td' => 'align="right"',
 					'text' => dol_print_date($datem, "day"));
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index ad7cbc0e29c..9b2a5437b8a 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -104,8 +104,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			}
 			else
 			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-				$tmparray=dol_json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 				$endyear=$tmparray['year'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
@@ -115,11 +114,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			if (empty($endyear)) $endyear=$nowarray['year'];
 			$startyear=$endyear-1;
 			$mode='customer';
-			$userid=0;
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
 			$HEIGHT='192';
 
-			$stats = new FactureStats($this->db, 0, $mode, ($userid>0?$userid:0));
+			$stats = new FactureStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
@@ -217,12 +215,12 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'"> '.$langs->trans("NumberOfBillsByMonth");
+				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'> '.$langs->trans("NumberOfBillsByMonth");
 				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfBillsByMonthHT");
+				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 58d3a27f834..7c2aa53da97 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -103,8 +103,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			}
 			else
 			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-				$tmparray=dol_json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 				$endyear=$tmparray['year'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
@@ -114,11 +113,10 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			if (empty($endyear)) $endyear=$nowarray['year'];
 			$startyear=$endyear-1;
 			$mode='supplier';
-			$userid=0;
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
 			$HEIGHT='192';
 
-			$stats = new FactureStats($this->db, 0, $mode, ($userid>0?$userid:0));
+			$stats = new FactureStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
@@ -216,12 +214,12 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'"> '.$langs->trans("NumberOfBillsByMonth");
+				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'> '.$langs->trans("NumberOfBillsByMonth");
 				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfBillsByMonthHT");
+				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'> '.$langs->trans("AmountOfBillsByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 81c9185c68f..75f0f60660f 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -104,8 +104,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			}
 			else
 			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-				$tmparray=dol_json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 				$endyear=$tmparray['year'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
@@ -115,11 +114,10 @@ class box_graph_orders_permonth extends ModeleBoxes
 			if (empty($endyear)) $endyear=$nowarray['year'];
 			$startyear=$endyear-1;
 			$mode='customer';
-			$userid=0;
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
 			$HEIGHT='192';
 
-			$stats = new CommandeStats($this->db, 0, $mode, ($userid>0?$userid:0));
+			$stats = new CommandeStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
@@ -217,12 +215,12 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'"> '.$langs->trans("NumberOfOrdersByMonth");
+				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'> '.$langs->trans("NumberOfOrdersByMonth");
 				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfOrdersByMonthHT");
+				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'> '.$langs->trans("AmountOfOrdersByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 98779836576..70d62cac348 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -103,8 +103,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			}
 			else
 			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-				$tmparray=dol_json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 				$endyear=$tmparray['year'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
@@ -114,11 +113,10 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			if (empty($endyear)) $endyear=$nowarray['year'];
 			$startyear=$endyear-1;
 			$mode='supplier';
-			$userid=0;
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
 			$HEIGHT='192';
 
-			$stats = new CommandeStats($this->db, 0, $mode, ($userid>0?$userid:0));
+			$stats = new CommandeStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
@@ -216,12 +214,12 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'"> '.$langs->trans("NumberOfOrdersByMonth");
+				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'> '.$langs->trans("NumberOfOrdersByMonth");
 				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfOrdersByMonthHT");
+				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'> '.$langs->trans("AmountOfOrdersByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 0029866b75a..74d106b7f69 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -96,8 +96,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		}
 		else
 		{
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-			$tmparray=dol_json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+			$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 			$year=$tmparray['year'];
 			$showinvoicenb=$tmparray['showinvoicenb'];
 			$showpropalnb=$tmparray['showpropalnb'];
@@ -337,7 +336,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 			$stringtoshow.='<br>';
 			$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
-			$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+			$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto('','refresh.png','','',1).'">';
 			$stringtoshow.='</form>';
 			$stringtoshow.='</div>';
 
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 61e83f3cd60..fd866f5df89 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -104,8 +104,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			}
 			else
 			{
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
-				$tmparray=dol_json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
+				$tmparray=json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode],true);
 				$endyear=$tmparray['year'];
 				$shownb=$tmparray['shownb'];
 				$showtot=$tmparray['showtot'];
@@ -114,12 +113,10 @@ class box_graph_propales_permonth extends ModeleBoxes
 			$nowarray=dol_getdate(dol_now(),true);
 			if (empty($endyear)) $endyear=$nowarray['year'];
 			$startyear=$endyear-1;
-			$mode='customer';
-			$userid=0;
 			$WIDTH=(($shownb && $showtot) || ! empty($conf->dol_optimize_smallscreen))?'256':'320';
 			$HEIGHT='192';
 
-			$stats = new PropaleStats($this->db, 0, $mode, ($userid>0?$userid:0));
+			$stats = new PropaleStats($this->db, $socid, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb)
@@ -128,8 +125,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$datatype1 = array_pad(array(), ($endyear-$startyear+1), 'bars');
 
 				$filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsnbinyear-'.$endyear.'.png';
+				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsnbinyear-'.$endyear.'.png';
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
@@ -222,12 +218,12 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$stringtoshow.='<form class="flat formboxfilter" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 				$stringtoshow.='<input type="hidden" name="action" value="'.$refreshaction.'">';
 				$stringtoshow.='<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,shownb,showtot">';
-				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'"> '.$langs->trans("NumberOfProposalsByMonth");
+				$stringtoshow.='<input type="checkbox" name="'.$param_shownb.'"'.($shownb?' checked="true"':'').'> '.$langs->trans("NumberOfProposalsByMonth");
 				$stringtoshow.=' &nbsp; ';
-				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'"> '.$langs->trans("AmountOfProposalsByMonthHT");
+				$stringtoshow.='<input type="checkbox" name="'.$param_showtot.'"'.($showtot?' checked="true"':'').'> '.$langs->trans("AmountOfProposalsByMonthHT");
 				$stringtoshow.='<br>';
 				$stringtoshow.=$langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$endyear.'">';
-				$stringtoshow.='<input type="image" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
+				$stringtoshow.='<input type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"),'refresh.png','','',1).'">';
 				$stringtoshow.='</form>';
 				$stringtoshow.='</div>';
 				if ($shownb && $showtot)
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 966a8ab7d10..4760a3aaf89 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -115,11 +115,11 @@ class box_members extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/adherents/fiche.php?rowid=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
                     'text' => $memberstatic->getFullName($langs),
-                    'url' => DOL_URL_ROOT."/adherents/fiche.php?rowid=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
 					'text' => dol_print_date($datem, "day"));
diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php
deleted file mode 100644
index 956811ea4e3..00000000000
--- a/htdocs/core/boxes/box_osc_client.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file       htdocs/core/boxes/box_osc_client.php
- * \ingroup    osc
- * \brief      Module to generate box of shop customers
- */
-
-include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
-
-
-/**
- * Class to manage the box to show last customers of shop
- */
-class box_osc_clients extends ModeleBoxes
-{
-    var $boxcode="nbofcustomers";
-    var $boximg="object_company";
-    var $boxlabel="BoxNbOfCustomers";
-    var $depends = array("boutique");
-
-	var $db;
-	var $param;
-
-    var $info_box_head = array();
-    var $info_box_contents = array();
-
-
-    /**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
-     *  @return	void
-     */
-    function loadBox($max=5)
-    {
-        global $conf, $user, $langs, $db;
-        $langs->load("boxes");
-
-		$this->max=$max;
-
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleNbOfCustomers",$max));
-
-        if ($user->rights->boutique->lire)
-        {
-            $sql = "SELECT count(*) as cus FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."customers";
-
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                $num = $db->num_rows($resql);
-
-                $i = 0;
-
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($resql);
-
-                    $this->info_box_contents[$i][0] = array('td' => 'align="center" width="16"',
-                    'logo' => $this->boximg,
-                    'url' => DOL_URL_ROOT."/boutique/client/index.php");
-                    $this->info_box_contents[$i][1] = array('td' => 'align="center"',
-                    'text' => $objp->cus,
-                    'url' => DOL_URL_ROOT."/boutique/client/index.php");
-                    $i++;
-                }
-
-				$db->free($resql);
-            }
-            else {
-                $this->info_box_contents[0][0] = array( 'td' => 'align="left"',
-                                                        'maxlength'=>500,
-                                                        'text' => ($db->error().' sql='.$sql));
-            }
-        }
-        else {
-            $this->info_box_contents[0][0] = array('td' => 'align="left"',
-            'text' => $langs->trans("ReadPermissionNotAllowed"));
-        }
-
-    }
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *	@return	void
-	 */
-    function showBox($head = null, $contents = null)
-    {
-        parent::showBox($this->info_box_head, $this->info_box_contents);
-    }
-
-}
-
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 30669c4f392..d3772ff65f1 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -101,11 +101,11 @@ class box_produits extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => ($objp->fk_product_type==1?'object_service':'object_product'),
-                    'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
                     'text' => $objp->label,
-                    'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
 
 					if ($objp->price_base_type == 'HT')
 					{
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index ec526a76492..1079f623492 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -108,11 +108,11 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => ($objp->fk_product_type==1?'object_service':'object_product'),
-                    'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
                     'text' => $objp->label,
-                    'url' => DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
 
 					if ($objp->price_base_type == 'HT')
 					{
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
new file mode 100644
index 00000000000..57863100999
--- /dev/null
+++ b/htdocs/core/boxes/box_project.php
@@ -0,0 +1,152 @@
+<?php
+/* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2014      Marcos García          <marcosgdf@gmail.com>
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\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");
+
+/**
+ * Class to manage the box to show last projet
+ */
+class box_project extends ModeleBoxes
+{
+	var $boxcode="project";
+	var $boximg="object_projectpub";
+	var $boxlabel;
+	//var $depends = array("projet");
+	var $db;
+	var $param;
+
+	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");
+
+		$this->boxlabel="Projects";
+	}
+
+	/**
+	*  Load data for box to show them later
+	*
+	*  @param	int		$max        Maximum number of records to load
+	*  @return	void
+	*/
+	function loadBox($max=5)
+	{
+		global $conf, $user, $langs, $db;
+
+		$this->max=$max;
+
+		$totalMnt = 0;
+		$totalnb = 0;
+		$totalnbTask=0;
+
+		$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)
+		{
+
+			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut ";
+			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+			$sql.= " WHERE p.entity = ".$conf->entity;
+			$sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
+			$sql.= " ORDER BY p.datec DESC";
+			$sql.= $db->plimit($max, 0);
+
+			$result = $db->query($sql);
+
+			if ($result)
+			{
+				$num = $db->num_rows($result);
+				$i = 0;
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($result);
+
+					$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' => $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
+					);
+
+					$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)
+					{
+						$objTask = $db->fetch_object($resultTask);
+						$this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format($objTask->nb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
+						if ($objTask->nb  > 0 )
+							$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')."%");
+						else
+							$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A&nbsp;");
+						$totalnbTask += $objTask->nb;
+					}
+					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&nbsp;");
+					}
+
+					$i++;
+				}
+			}
+		}
+
+
+		// Add the sum à the bottom of the boxes
+		$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
+		$this->info_box_contents[$i][1] = array('td' => '', 'text' => "");
+		$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($num, 0, ',', ' ')."&nbsp;".$langs->trans("Projects"));
+		$this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => number_format($totalnbTask, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
+		$this->info_box_contents[$i][4] = array('td' => '', 'text' => "");
+
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *	@return	void
+	 */
+	function showBox($head = null, $contents = null)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents);
+	}
+}
+
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 73e554de2b6..e9bd47b2a9e 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -56,84 +56,93 @@ class box_propales extends ModeleBoxes
     	$this->max=$max;
 
     	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-      $propalstatic=new Propal($db);
+    	$propalstatic=new Propal($db);
 
-      $this->info_box_head = array('text' => $langs->trans("BoxTitleLastPropals",$max));
+    	$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."Propals",$max));
 
-      if ($user->rights->propale->lire)
-      {
-      	$sql = "SELECT s.nom, s.rowid as socid,";
-        $sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql.= ", ".MAIN_DB_PREFIX."propal as p";
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE p.fk_soc = s.rowid";
-        $sql.= " AND p.entity = ".$conf->entity;
-        if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-        if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-        $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
-        $sql.= $db->plimit($max, 0);
+    	if ($user->rights->propale->lire)
+    	{
+    		$sql = "SELECT s.nom as name, s.rowid as socid,";
+    		$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.tms";
+    		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+    		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    		$sql.= " WHERE p.fk_soc = s.rowid";
+    		$sql.= " AND p.entity = ".$conf->entity;
+    		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY p.datep DESC, p.ref DESC ";
+            else $sql.= " ORDER BY p.tms DESC, p.ref DESC ";
+    		$sql.= $db->plimit($max, 0);
 
-        $result = $db->query($sql);
-        if ($result)
-        {
-        	$num = $db->num_rows($result);
-        	$now=dol_now();
+    		$result = $db->query($sql);
+    		if ($result)
+    		{
+    			$num = $db->num_rows($result);
+    			$now=dol_now();
 
-        	$i = 0;
+    			$i = 0;
 
-        	while ($i < $num)
-        	{
-        		$objp = $db->fetch_object($result);
-        		$datec=$db->jdate($objp->datec);
-        		$dateterm=$db->jdate($objp->fin_validite);
-        		$dateclose=$db->jdate($objp->date_cloture);
+    			while ($i < $num)
+    			{
+    				$objp = $db->fetch_object($result);
+    				$date=$db->jdate($objp->dp);
+    				$datec=$db->jdate($objp->datec);
+    				$datem=$db->jdate($objp->tms);
+    				$dateterm=$db->jdate($objp->fin_validite);
+    				$dateclose=$db->jdate($objp->date_cloture);
 
-        		$late = '';
-        		if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
+    				$late = '';
+    				if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->propal->cloture->warning_delay)) {
+    					$late = img_warning($langs->trans("Late"));
+    				}
 
-        		$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
-        		'logo' => $this->boximg,
-        		'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid);
+    				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
+    				'logo' => $this->boximg,
+    				'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid);
 
-        		$this->info_box_contents[$i][1] = array('td' => 'align="left"',
-        		'text' => $objp->ref,
-        		'text2'=> $late,
-        		'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid);
+    				$this->info_box_contents[$i][1] = array('td' => 'align="left"',
+    				'text' => $objp->ref,
+    				'text2'=> $late,
+    				'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid);
 
-				$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
-                'logo' => 'company',
-                'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+    				$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
+    				'logo' => 'company',
+    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-				$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-        		'text' => dol_trunc($objp->nom,40),
-        		'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+    				$this->info_box_contents[$i][3] = array('td' => 'align="left"',
+    				'text' => dol_trunc($objp->name,40),
+    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-        		$this->info_box_contents[$i][4] = array('td' => 'align="right"',
-        		'text' => dol_print_date($datec,'day'));
+					$this->info_box_contents[$i][4] = array('td' => 'align="right"',
+                    'text' => price($objp->total_ht),
+					);
 
-        		$this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"',
-        		'text' => $propalstatic->LibStatut($objp->fk_statut,3));
+    				$this->info_box_contents[$i][5] = array('td' => 'align="right"',
+    				'text' => dol_print_date($date,'day'));
 
-        		$i++;
-        	}
+    				$this->info_box_contents[$i][6] = array('td' => 'align="right" width="18"',
+    				'text' => $propalstatic->LibStatut($objp->fk_statut,3));
 
-        	if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProposals"));
+    				$i++;
+    			}
 
-			$db->free($result);
-        }
-        else
-        {
-        	$this->info_box_contents[0][0] = array(    'td' => 'align="left"',
-                                                        'maxlength'=>500,
-                                                        'text' => ($db->error().' sql='.$sql));
-        }
-      }
-      else
-      {
-      	$this->info_box_contents[0][0] = array('td' => 'align="left"',
-      	'text' => $langs->trans("ReadPermissionNotAllowed"));
-      }
+    			if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedProposals"));
+
+    			$db->free($result);
+    		}
+    		else
+    		{
+    			$this->info_box_contents[0][0] = array(    'td' => 'align="left"',
+    			'maxlength'=>500,
+    			'text' => ($db->error().' sql='.$sql));
+    		}
+    	}
+    	else
+    	{
+    		$this->info_box_contents[0][0] = array('td' => 'align="left"',
+    		'text' => $langs->trans("ReadPermissionNotAllowed"));
+    	}
     }
 
 	/**
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 6d62989727b..3020f12f0c4 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -80,7 +80,7 @@ class box_prospect extends ModeleBoxes
 
 		if ($user->rights->societe->lire)
 		{
-			$sql = "SELECT s.nom, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status";
+			$sql = "SELECT s.nom as name, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status";
 			$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 			if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			$sql.= " WHERE s.client IN (2, 3)";
@@ -90,7 +90,7 @@ class box_prospect extends ModeleBoxes
 			$sql.= " ORDER BY s.tms DESC";
 			$sql.= $db->plimit($max, 0);
 
-			dol_syslog(get_class($this)."::loadBox sql=".$sql,LOG_DEBUG);
+			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$resql = $db->query($sql);
 			if ($resql)
 			{
@@ -106,11 +106,11 @@ class box_prospect extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
 			            'logo' => $this->boximg,
-			            'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+			            'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
-			            'text' => $objp->nom,
-			            'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+			            'text' => $objp->name,
+			            'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
  			           'text' => dol_print_date($datem, "day"));
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 264178cc3ea..eb48fc83d2b 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -62,7 +62,7 @@ class box_services_contracts extends ModeleBoxes
 
 		if ($user->rights->service->lire && $user->rights->contrat->lire)
 		{
-			$sql = "SELECT s.nom, s.rowid as socid,";
+			$sql = "SELECT s.nom as name, s.rowid as socid,";
 			$sql.= " c.rowid,";
 			$sql.= " cd.rowid as cdid, cd.tms as datem, cd.statut,";
 			$sql.= " p.rowid as pid, p.label, p.fk_product_type";
@@ -113,21 +113,21 @@ class box_services_contracts extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => ($objp->fk_product_type==1?'object_service':'object_product'),
-                    'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
                     'text' => $objp->label,
                     'maxlength' => 16,
-                    'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid);
+                    'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
                     'logo' => 'company',
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
+                    'text' => $objp->name,
                     'maxlength' => 28,
-                    'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+                    'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][4] = array('td' => 'align="right"',
                     'text' => dol_print_date($datem,'day'));
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 5e488b3c6db..52f3777e2af 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -63,7 +63,7 @@ class box_services_expired extends ModeleBoxes
     	    // Select contracts with at least one expired service
 			$sql = "SELECT ";
     		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,";
-			$sql.= " s.nom, s.rowid as socid,";
+			$sql.= " s.nom as name, s.rowid as socid,";
 			$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
     		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -93,19 +93,19 @@ class box_services_expired extends ModeleBoxes
 
     				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
     				'logo' => $this->boximg,
-    				'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid);
+    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
     				$this->info_box_contents[$i][1] = array('td' => 'align="left"',
     				'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
-    				'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid);
+    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
 
     				$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
     				'logo' => 'company',
-    				'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
     				$this->info_box_contents[$i][3] = array('td' => 'align="left"',
-    				'text' => dol_trunc($objp->nom,40),
-    				'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
+    				'text' => dol_trunc($objp->name,40),
+    				'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
     				$this->info_box_contents[$i][4] = array('td' => 'align="center"',
     				'text' => dol_print_date($dateline,'day'),
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index a976112c1ad..d14bf1a539f 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -58,12 +58,12 @@ class box_supplier_orders extends ModeleBoxes
         include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
         $supplierorderstatic=new CommandeFournisseur($db);
 
-        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatestSupplierOrders", $max));
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE?"":"Modified")."SupplierOrders", $max));
 
         if ($user->rights->fournisseur->commande->lire)
         {
-            $sql = "SELECT s.nom, s.rowid as socid,";
-            $sql.= " c.ref, c.tms, c.rowid,";
+            $sql = "SELECT s.nom as name, s.rowid as socid,";
+            $sql.= " c.ref, c.tms, c.rowid, c.date_commande,";
             $sql.= " c.fk_statut";
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
@@ -72,7 +72,8 @@ class box_supplier_orders extends ModeleBoxes
             $sql.= " AND c.entity = ".$conf->entity;
             if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
             if ($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
-            $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+            else $sql.= " ORDER BY c.tms DESC, c.ref DESC ";
             $sql.= $db->plimit($max, 0);
 
             $result = $db->query($sql);
@@ -84,10 +85,11 @@ class box_supplier_orders extends ModeleBoxes
                 while ($i < $num)
                 {
                     $objp = $db->fetch_object($result);
-                    $datem=$db->jdate($objp->tms);
+                    $date=$db->jdate($objp->date_commande);
+					$datem=$db->jdate($objp->tms);
 
-                    $urlo = DOL_URL_ROOT."/fourn/commande/fiche.php?id=".$objp->rowid;
-                    $urls = DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid;
+                    $urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid;
+                    $urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid;
 
                     $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
                     'logo' => $this->boximg,
@@ -102,11 +104,11 @@ class box_supplier_orders extends ModeleBoxes
                     'url' => $urls);
 
                     $this->info_box_contents[$i][3] = array('td' => 'align="left"',
-                    'text' => $objp->nom,
+                    'text' => $objp->name,
                     'url' => $urls);
 
                     $this->info_box_contents[$i][4] = array('td' => 'align="right"',
-                    'text' => dol_print_date($datem,'day'),
+                    'text' => dol_print_date($date,'day'),
                     );
 
                     $this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"',
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
new file mode 100644
index 00000000000..c15bc9831ce
--- /dev/null
+++ b/htdocs/core/boxes/box_task.php
@@ -0,0 +1,143 @@
+<?php
+/* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\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");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
+
+/**
+ * Class to manage the box to show last task
+ */
+class box_task extends ModeleBoxes
+{
+	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();
+
+	/**
+	*      \brief      Constructeur de la classe
+	*
+	*  @return	void
+	*/
+	function box_task()
+	{
+		global $langs;
+		$langs->load("boxes");
+		$langs->load("projects");
+		$this->boxlabel="Tasks";
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	function loadBox($max=5)
+	{
+		global $conf, $user, $langs, $db;
+
+		$this->max=$max;
+
+		$totalMnt = 0;
+		$totalnb = 0;
+		$totalDuree=0;
+		include_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php");
+		$taskstatic=new Task($db);
+
+
+		$textHead = $langs->trans("Tasks")."&nbsp;".date("Y");
+		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+
+		// list the summary of the orders
+		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";
+			$sql.= " WHERE DATE_FORMAT(pt.datec,'%Y') = ".date("Y")." ";
+			$sql.= " AND pt.rowid = ptt.fk_task";
+			$sql.= " GROUP BY pt.fk_statut ";
+			$sql.= " ORDER BY pt.fk_statut DESC";
+			$sql.= $db->plimit($max, 0);
+
+			$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_projecttask');
+
+					$objp = $db->fetch_object($result);
+					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
+					'text' =>$langs->trans("Task")."&nbsp;".$taskstatic->LibStatut($objp->fk_statut,0)
+					);
+
+					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
+					'text' => $objp->nb."&nbsp;".$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;
+					$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
+					$totaldurationtot += $objp->durationtot;
+
+					$this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
+
+					$i++;
+				}
+			}
+		}
+
+
+		// Add the sum à the bottom of the boxes
+		$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
+		$this->info_box_contents[$i][1] = array('td' => '', 'text' => "");
+		$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
+		$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' => "");
+		
+	}
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *	@return	void
+	 */
+	function showBox($head = null, $contents = null)
+	{
+		parent::showBox($this->info_box_head, $this->info_box_contents);
+	}
+}
diff --git a/htdocs/core/boxes/index.html b/htdocs/core/boxes/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/boxes/index.php b/htdocs/core/boxes/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/boxes/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 7b54f0440a0..c6b6dad7acb 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@capnetworks.com>
+/* Copyright (C) 2004-2013  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,31 +26,88 @@
 
 
 /**
- *		Parent class of boxes
+ * Class ModeleBoxes
+ *
+ * Boxes parent class
  */
 class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty" boxes
 {
-	var $db;
-	var $error='';
-	var $max=5;
-	var $enabled=1;
-
-	var $rowid;
-	var $id;
-	var $position;
-	var $box_order;
-	var $fk_user;
-	var $sourcefile;
-	var $class;
-	var $box_id;
-	var $note;
-
+	/**
+	 * @var DoliDB Database handler
+	 */
+	public $db;
 
 	/**
-	 *	Constructor
+	 * @var string Error message
+	 */
+	public $error = '';
+
+	/**
+	 * @var int Maximum lines
+	 */
+	public $max = 5;
+
+	/**
+	 * @var int Status
+	 */
+	public $enabled=1;
+
+	/**
+	 * @var int Box definition database ID
+	 */
+	public $rowid;
+
+	/**
+	 * @var int ID
+	 * @deprecated Same as box_id?
+	 */
+	public $id;
+
+	/**
+	 * @var int Position?
+	 */
+	public $position;
+
+	/**
+	 * @var string Display order
+	 */
+	public $box_order;
+
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user;
+
+	/**
+	 * @var string Source file
+	 */
+	public $sourcefile;
+
+	/**
+	 * @var string Class name
+	 */
+	public $class;
+
+	/**
+	 * @var string ID
+	 */
+	public $box_id;
+
+	/**
+	 * @var string Alphanumeric ID
+	 */
+	public $boxcode;
+
+	/**
+	 * @var string Note
+	 */
+	public $note;
+
+	/**
+	 * Constructor
 	 *
-	 *	@param	DoliDB	$db			Database handler
-     *  @param	string	$param		More parameters
+	 * @param   DoliDB  $db     Database handler
+     * @param   string  $param  More parameters
 	 */
 	function __construct($db,$param='')
 	{
@@ -57,9 +115,9 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 	}
 
 	/**
-	 *  Return last error message
+	 * Return last error message
 	 *
-	 *  @return	string				Error message
+	 * @return  string  Error message
 	 */
 	function error()
 	{
@@ -68,10 +126,11 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 
 
 	/**
-	 *  Load a box line from its rowid
+	 * Load a box line from its rowid
 	 *
-	 *  @param	int		$rowid		Row id to load
-	 *  @return	int					<0 if KO, >0 if OK
+	 * @param   int $rowid  Row id to load
+	 *
+	 * @return  int         <0 if KO, >0 if OK
 	 */
 	function fetch($rowid)
 	{
@@ -110,17 +169,19 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 
 
 	/**
-	 *	Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
+	 *Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
 	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *	@return	void
+	 * @param   array   $head       Array with properties of box title
+	 * @param   array   $contents   Array with properties of box lines
+	 *
+	 * @return  void
 	 */
 	function showBox($head, $contents)
 	{
 		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;
@@ -162,12 +223,12 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
 			if (! empty($head['sublink'])) print '<a href="'.$head['sublink'].'"'.(empty($head['target'])?' target="_blank"':'').'>';
 			if (! empty($head['subpicto'])) print img_picto($head['subtext'], $head['subpicto'], 'class="'.(empty($head['subclass'])?'':$head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
 			if (! empty($head['sublink'])) '</a>';
-			if ($conf->use_javascript_ajax)
+			if (! empty($conf->use_javascript_ajax))
 			{
 				print '</td><td class="nocellnopadd boxclose nowrap">';
 				// 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 '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 322d7f7ddcb..5288dc635cb 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -118,10 +118,10 @@ class CMailFile
 		$this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
 
 		// On defini related_boundary
-		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"));
+		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
 
 		// On defini alternative_boundary
-		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"));
+		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
 
 		// If ending method not defined
 		if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail';
@@ -170,7 +170,7 @@ class CMailFile
 			}
 		}
 
-		// Add autocopy to
+		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
 		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 
 		// Action according to choosed sending method
@@ -657,6 +657,7 @@ class CMailFile
 		{
 			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
 		}
+		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
 		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
 		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
 		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
@@ -970,7 +971,7 @@ class CMailFile
 						}
 
 						// cid
-						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()));
+						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
 						$this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
 					}
 					$i++;
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
new file mode 100644
index 00000000000..59980cea7a9
--- /dev/null
+++ b/htdocs/core/class/ccountry.class.php
@@ -0,0 +1,313 @@
+<?php
+/* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/class/ccountry.class.php
+ *      \ingroup    core
+ *      \brief      This file is a CRUD class file (Create/Read/Update/Delete) for c_country dictionary
+ */
+
+// Put here all includes required by your class file
+//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+
+/**
+ * 	Class to manage dictionary Countries (used by imports)
+ */
+class Ccountry // extends CommonObject
+{
+	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 $element='ccountry';			//!< Id that identify managed objects
+	//var $table_element='ccountry';	//!< Name of table without prefix where object is stored
+
+    var $id;
+	var $code;
+	var $code_iso;
+	var $label;
+	var $active;
+
+
+
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDb		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        return 1;
+    }
+
+
+    /**
+     *  Create object into database
+     *
+     *  @param      User	$user        User that create
+     *  @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)
+    {
+    	global $conf, $langs;
+		$error=0;
+
+		// Clean parameters
+		if (isset($this->code)) $this->code=trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
+		if (isset($this->label)) $this->label=trim($this->label);
+		if (isset($this->active)) $this->active=trim($this->active);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+        // Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
+		$sql.= "rowid,";
+		$sql.= "code,";
+		$sql.= "code_iso,";
+		$sql.= "label,";
+		$sql.= "active";
+        $sql.= ") VALUES (";
+		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->rowid."'").",";
+		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
+		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
+		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
+		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->active."'")."";
+		$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."c_country");
+
+			if (! $notrigger)
+			{
+	            // Uncomment this and change MYOBJECT to your own tag if you
+	            // want this action call a trigger.
+
+	            //// Call triggers
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //// End call triggers
+			}
+        }
+
+        // Commit or rollback
+        if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::create ".$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 database
+     *
+     *  @param      int		$id    	Id object
+     *  @param		string	$code	Code
+     *  @return     int          	<0 if KO, >0 if OK
+     */
+    function fetch($id,$code='')
+    {
+    	global $langs;
+        $sql = "SELECT";
+		$sql.= " t.rowid,";
+		$sql.= " t.code,";
+		$sql.= " t.code_iso,";
+		$sql.= " t.label,";
+		$sql.= " t.active";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
+        if ($id)   $sql.= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id    = $obj->rowid;
+				$this->code = $obj->code;
+				$this->code_iso = $obj->code_iso;
+				$this->label = $obj->label;
+				$this->active = $obj->active;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+      	    $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Update object into 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->code)) $this->code=trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
+		if (isset($this->label)) $this->label=trim($this->label);
+		if (isset($this->active)) $this->active=trim($this->active);
+
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
+		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
+		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
+		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
+		$sql.= " active=".(isset($this->active)?$this->active:"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)
+			{
+	            // Uncomment this and change MYOBJECT to your own tag if you
+	            // want this action call a trigger.
+
+	            //// Call triggers
+	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	            //$interface=new Interfaces($this->db);
+	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	            //// End call triggers
+	    	}
+		}
+
+        // 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  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)
+	{
+		global $conf, $langs;
+		$error=0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
+		$sql.= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$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 call a trigger.
+
+		        //// Call triggers
+		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+		        //$interface=new Interfaces($this->db);
+		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+		        //// End call triggers
+			}
+		}
+
+        // 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;
+		}
+	}
+
+}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 882e0780ed4..fbf5363b753 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -27,8 +27,7 @@
 
 
 /**
- *	\class      CommonDocGenerator
- *	\brief      Parent class for documents generators
+ *	Parent class for documents generators
  */
 abstract class CommonDocGenerator
 {
@@ -119,10 +118,9 @@ abstract class CommonDocGenerator
             'mycompany_idprof5'=>$mysoc->idprof5,
             'mycompany_idprof6'=>$mysoc->idprof6,
         	'mycompany_vatnumber'=>$mysoc->tva_intra,
-            // Only private not exists for "mysoc"
-        	'mycompany_note'=>$mysoc->note_private
-            //'mycompany_note_private'=>$mysoc->note_private,
-        	//'mycompany_note_public'=>$mysoc->note_public,
+        	// Only private not exists for "mysoc"
+            'mycompany_note_private'=>$mysoc->note_private,
+
         );
     }
 
@@ -167,6 +165,7 @@ abstract class CommonDocGenerator
             'company_customeraccountancycode'=>$object->code_compta,
             'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
             'company_juridicalstatus'=>$object->forme_juridique,
+            'company_outstanding_limit'=>$object->outstanding_limit,
             'company_capital'=>$object->capital,
             'company_idprof1'=>$object->idprof1,
             'company_idprof2'=>$object->idprof2,
@@ -291,6 +290,10 @@ abstract class CommonDocGenerator
    			'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
    			'current_server_date'=>dol_print_date($now,'day','tzserver'),
    			'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
+   			'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
+   			'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
+   			'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
+   			'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
     	);
 
     	return $array_other;
@@ -358,7 +361,8 @@ abstract class CommonDocGenerator
 		$array_key.'_total_discount_ht' => price2num($object->getTotalDiscount()),
 
 		$array_key.'_note_private'=>$object->note,
-		$array_key.'_note'=>$object->note_public,
+		$array_key.'_note_public'=>$object->note_public,
+		$array_key.'_note'=>$object->note_public,			// For backward compatibility
 		// Payments
 		$array_key.'_already_payed_locale'=>price($alreadypayed, 0, $outputlangs),
 		$array_key.'_remain_to_pay_locale'=>price($object->total_ttc - $sumpayed, 0, $outputlangs),
@@ -384,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/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 6d657f0c36c..90ad3e196e3 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -47,7 +47,7 @@ abstract class CommonInvoice extends CommonObject
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
 		$sql.= ' WHERE '.$field.' = '.$this->id;
 
-		dol_syslog(get_class($this)."::getSommePaiement sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -154,9 +154,9 @@ abstract class CommonInvoice extends CommonObject
 	/**
 	 *  Return label of object status
 	 *
-	 *  @param      int		$mode            0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
-	 *  @param      double	$alreadypaid     0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-	 *  @return     string			         Label
+	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
+	 *  @param      double	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @return     string			        Label
 	 */
 	function getLibStatut($mode=0,$alreadypaid=-1)
 	{
@@ -308,7 +308,7 @@ abstract class CommonInvoice extends CommonObject
 		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
 		else $sqltemp.= " WHERE c.code='".$this->db->escape($cond_reglement)."'";
 
-		dol_syslog(get_class($this).'::calculate_date_lim_reglement sql='.$sqltemp);
+		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
 		$resqltemp=$this->db->query($sqltemp);
 		if ($resqltemp)
 		{
@@ -358,10 +358,14 @@ abstract class CommonInvoice extends CommonObject
 	}
 }
 
+
+
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
+
 /**
  *	Parent class of all other business classes for details of elements (invoices, contracts, proposals, orders, ...)
  */
-abstract class CommonInvoiceLine extends CommonObject
+abstract class CommonInvoiceLine extends CommonObjectLine
 {
 }
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e0bab998982..3e58e7b5c7d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012-2013 Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2011-2014 Philippe Grand	    <philippe.grand@atoo-net.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Marcos García        <marcosgdf@gmail.com>
  *
  * 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,7 +34,7 @@
  */
 abstract class CommonObject
 {
-    protected $db;
+    public $db;
     public $error;
     public $errors;
     public $canvas;                // Contains canvas name if it is
@@ -47,11 +47,22 @@ abstract class CommonObject
 
     public $array_options=array();
 
+    /**
+     * @var Societe
+     */
+    public $thirdparty;
+
     public $linkedObjectsIds;	// Loaded by ->fetchObjectLinked
     public $linkedObjects;		// Loaded by ->fetchObjectLinked
 
     // 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
@@ -78,7 +89,7 @@ abstract class CommonObject
 			return -1;
 		}
 
-		dol_syslog(get_class()."::isExistingObject sql=".$sql);
+		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -116,7 +127,6 @@ abstract class CommonObject
         $lastname=$this->lastname;
         $firstname=$this->firstname;
         if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:'')));
-        if (empty($firstname)) $firstname=$this->firstname;
 
         $ret='';
         if ($option && $this->civility_id)
@@ -155,7 +165,7 @@ abstract class CommonObject
      *  Add a link between element $this->element and a contact
      *
      *  @param	int		$fk_socpeople       Id of contact to link
-     *  @param 	int		$type_contact 		Type of contact (code or id)
+     *  @param 	int		$type_contact 		Type of contact (code or id). For example: SALESREPFOLL
      *  @param  int		$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
      *  @param  int		$notrigger			Disable all triggers
      *  @return int                 		<0 if KO, >0 if OK
@@ -164,7 +174,6 @@ abstract class CommonObject
     {
         global $user,$conf,$langs;
 
-		$error=0;
 
         dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source");
 
@@ -192,9 +201,10 @@ abstract class CommonObject
             // On recherche id type_contact
             $sql = "SELECT tc.rowid";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-            $sql.= " WHERE element='".$this->element."'";
-            $sql.= " AND source='".$source."'";
-            $sql.= " AND code='".$type_contact."' AND active=1";
+            $sql.= " WHERE tc.element='".$this->element."'";
+            $sql.= " AND tc.source='".$source."'";
+            $sql.= " AND tc.code='".$type_contact."' AND tc.active=1";
+			//print $sql;
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -205,6 +215,8 @@ abstract class CommonObject
 
         $datecreate = dol_now();
 
+        $this->db->begin();
+
         // Insertion dans la base
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
         $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
@@ -212,23 +224,18 @@ abstract class CommonObject
         $sql.= "'".$this->db->idate($datecreate)."'";
         $sql.= ", 4, '". $id_type_contact . "' ";
         $sql.= ")";
-        dol_syslog(get_class($this)."::add_contact sql=".$sql);
+        dol_syslog(get_class($this)."::add_contact", LOG_DEBUG);
 
         $resql=$this->db->query($sql);
         if ($resql)
         {
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers(strtoupper($this->element).'_ADD_CONTACT',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // End call triggers
+            	$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
+	            if ($result < 0) { $this->db->rollback(); return -1; }
             }
 
+            $this->db->commit();
             return 1;
         }
         else
@@ -236,12 +243,13 @@ abstract class CommonObject
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error=$this->db->errno();
+            	$this->db->rollback();
                 return -2;
             }
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog($this->error,LOG_ERR);
+                $this->db->rollback();
                 return -1;
             }
         }
@@ -264,7 +272,6 @@ abstract class CommonObject
             if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::copy_contact error=".$this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -311,32 +318,28 @@ abstract class CommonObject
     {
         global $user,$langs,$conf;
 
-		$error=0;
+
+        $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
         $sql.= " WHERE rowid =".$rowid;
 
-        dol_syslog(get_class($this)."::delete_contact sql=".$sql);
+        dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers(strtoupper($this->element).'_DELETE_CONTACT',$this,$user,$langs,$conf);
-                if ($result < 0) {
-                    $error++; $this->errors=$interface->errors;
-                }
-                // End call triggers
+            	$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
+	            if ($result < 0) { $this->db->rollback(); return -1; }
             }
 
+            $this->db->commit();
             return 1;
         }
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete_contact error=".$this->error, LOG_ERR);
+            $this->db->rollback();
             return -1;
         }
     }
@@ -344,12 +347,14 @@ abstract class CommonObject
     /**
      *    Delete all links between an object $this and all its contacts
      *
-     *    @return     int	>0 if OK, <0 if KO
+     *	  @param	string	$source		'' or 'internal' or 'external'
+     *	  @param	string	$code		Type of contact (code or id)
+     *    @return   int					>0 if OK, <0 if KO
      */
-    function delete_linked_contact()
+    function delete_linked_contact($source='',$code='')
     {
         $temp = array();
-        $typeContact = $this->liste_type_contact('');
+        $typeContact = $this->liste_type_contact($source,'',0,0,$code);
 
         foreach($typeContact as $key => $value)
         {
@@ -358,18 +363,17 @@ abstract class CommonObject
         $listId = implode(",", $temp);
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-        $sql.= " WHERE element_id =".$this->id;
+        $sql.= " WHERE element_id = ".$this->id;
         $sql.= " AND fk_c_type_contact IN (".$listId.")";
 
-        dol_syslog(get_class($this)."::delete_linked_contact sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             return 1;
         }
         else
-        {
+		{
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete_linked_contact error=".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -391,7 +395,7 @@ abstract class CommonObject
         $sql = "SELECT ec.rowid, ec.statut, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
         if ($source == 'internal') $sql.=", '-1' as socid";
         if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid";
-        $sql.= ", t.civilite as civility, t.lastname as lastname, t.firstname, t.email";
+        $sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
         $sql.= ", tc.source, tc.element, tc.code, tc.libelle";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
         $sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
@@ -406,7 +410,7 @@ abstract class CommonObject
         if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
         $sql.=" ORDER BY t.lastname ASC";
 
-        dol_syslog(get_class($this)."::liste_contact sql=".$sql);
+        dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -461,7 +465,7 @@ abstract class CommonObject
         $sql.= " AND ec.fk_c_type_contact=tc.rowid";
         $sql.= " AND tc.element = '".$this->element."'";
 
-        dol_syslog(get_class($this)."::swapContactStatus sql=".$sql);
+        dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -486,21 +490,23 @@ abstract class CommonObject
      *      @param	string	$source     'internal', 'external' or 'all'
      *      @param	string	$order		Sort order by : 'code' or 'rowid'
      *      @param  string	$option     0=Return array id->label, 1=Return array code->label
-     *      @param  string	$activeonly    0=all type of contact, 1=only the active
+     *      @param  string	$activeonly 0=all status of contact, 1=only the active
+     *		@param	string	$code		Type of contact (Example: 'CUSTOMER', 'SERVICE')
      *      @return array       		Array list of type of contacts (id->label if option=0, code->label if option=1)
      */
-    function liste_type_contact($source='internal', $order='code', $option=0, $activeonly=0)
+    function liste_type_contact($source='internal', $order='', $option=0, $activeonly=0, $code='')
     {
         global $langs;
 
+        if (empty($order)) $order='code';
+
         $tab = array();
         $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
         $sql.= " WHERE tc.element='".$this->element."'";
-        if ($activeonly == 1)
-        	$sql.= " AND tc.active=1"; // only the active type
-
-        if (! empty($source)) $sql.= " AND tc.source='".$source."'";
+        if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active type
+        if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$source."'";
+        if (! empty($code)) $sql.= " AND tc.code='".$code."'";
         $sql.= " ORDER by tc.".$order;
 
         //print "sql=".$sql;
@@ -563,7 +569,7 @@ abstract class CommonObject
         $sql.= " AND tc.active = 1";
         if ($status) $sql.= " AND ec.statut = ".$status;
 
-        dol_syslog(get_class($this)."::getIdContact sql=".$sql);
+        dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -576,7 +582,6 @@ abstract class CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::getIdContact ".$this->error, LOG_ERR);
             return null;
         }
 
@@ -586,11 +591,15 @@ abstract class CommonObject
     /**
      *		Charge le contact d'id $id dans this->contact
      *
-     *		@param	int		$contactid      Id du contact
+     *		@param	int		$contactid      Id du contact. Use this->contactid if empty.
      *		@return	int						<0 if KO, >0 if OK
      */
-    function fetch_contact($contactid)
+    function fetch_contact($contactid='')
     {
+    	if (empty($contactid)) $contactid=$this->contactid;
+
+    	if (empty($contactid)) return 0;
+
         require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         $contact = new Contact($this->db);
         $result=$contact->fetch($contactid);
@@ -599,20 +608,24 @@ abstract class CommonObject
     }
 
     /**
-     *    	Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdpary
+     *    	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)) 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:$this->fk_soc);
+        $result=$thirdparty->fetch($idtofetch);
         $this->client = $thirdparty;  // deprecated
         $this->thirdparty = $thirdparty;
 
@@ -627,9 +640,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)
@@ -655,7 +694,7 @@ abstract class CommonObject
                 $sql = "SELECT rowid, code, libelle as label, coder";
                 $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
                 $sql.= " WHERE rowid = ".$idtype;
-                dol_syslog(get_class($this).'::fetch_barcode sql='.$sql);
+                dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
                 $resql = $this->db->query($sql);
             	if ($resql)
                 {
@@ -741,7 +780,7 @@ abstract class CommonObject
         $sql.= " WHERE ".$field." = '".$key."'";
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this).'::fetchObjectFrom sql='.$sql);
+        dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -767,7 +806,7 @@ abstract class CommonObject
         $sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE rowid = ".$id;
 
-        dol_syslog(get_class($this).'::getValueFrom sql='.$sql);
+        dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -807,7 +846,7 @@ abstract class CommonObject
         if (is_object($user)) $sql.=", fk_user_modif = ".$user->id;
         $sql.= " WHERE ".$id_field." = ".$id;
 
-        dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -933,7 +972,7 @@ abstract class CommonObject
         else $sql.= ' SET fk_projet = NULL';
         $sql.= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setProject sql=".$sql);
+        dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             $this->fk_project = $projectid;
@@ -1054,6 +1093,37 @@ abstract class CommonObject
     	}
     }
 
+
+    /**
+     *  Change the shipping method
+     *
+     *  @param      int     $shipping_method_id     Id of shipping method
+     *  @return     int              1 if OK, 0 if KO
+     */
+    function setShippingMethod($shipping_method_id)
+    {
+        if (! $this->table_element) {
+            dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+        if ($shipping_method_id<0) $shipping_method_id='NULL';
+        dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET fk_shipping_method = ".$shipping_method_id;
+        $sql.= " WHERE rowid=".$this->id;
+
+        if ($this->db->query($sql)) {
+            $this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
+            return 1;
+        } else {
+            dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
+            $this->error=$this->db->error();
+            return 0;
+        }
+    }
+
+
     /**
      *		Set last model used by doc generator
      *
@@ -1077,7 +1147,7 @@ abstract class CommonObject
         // if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
         // if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
 
-        dol_syslog(get_class($this)."::setDocModel sql=".$sql);
+        dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -1091,6 +1161,36 @@ abstract class CommonObject
         }
     }
 
+
+    /**
+     *  Change the bank account
+     *
+     *  @param		int		$fk_account		Id of bank account
+     *  @return		int				1 if OK, 0 if KO
+     */
+    function setBankAccount($fk_account)
+    {
+        if (! $this->table_element) {
+            dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+        if ($fk_account<0) $fk_account='NULL';
+        dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+        $sql.= " SET fk_account = ".$fk_account;
+        $sql.= " WHERE rowid=".$this->id;
+
+        if ($this->db->query($sql)) {
+            $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
+            return 1;
+        } else {
+            dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
+            $this->error=$this->db->error();
+            return 0;
+        }
+    }
+
     /**
      *  Save a new position (field rang) for details lines.
      *  You can choose to set position for lines with already a position or lines without any position defined.
@@ -1120,7 +1220,7 @@ abstract class CommonObject
 		if (! $renum) $sql.= ' AND rang = 0';
 		if ($renum) $sql.= ' AND rang <> 0';
 
-		dol_syslog(get_class($this)."::line_order sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1140,7 +1240,7 @@ abstract class CommonObject
 			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
 			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
-			dol_syslog(get_class($this)."::line_order search all parent lines sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
@@ -1192,7 +1292,7 @@ abstract class CommonObject
 		$sql.= ' AND fk_parent_line = '.$id;
 		$sql.= ' ORDER BY rang ASC';
 
-		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id." sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1260,7 +1360,7 @@ abstract class CommonObject
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET rang  = '.$rang;
 		$sql.= ' WHERE rowid = '.$rowid;
 
-		dol_syslog(get_class($this)."::updateRangOfLine sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
 		if (! $this->db->query($sql))
 		{
 			dol_print_error($this->db);
@@ -1354,7 +1454,7 @@ abstract class CommonObject
         $sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
         $sql.= ' WHERE rowid ='.$rowid;
 
-        dol_syslog(get_class($this)."::getRangOfLine sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -1397,7 +1497,7 @@ abstract class CommonObject
             $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
             $sql.= ' AND fk_parent_line = '.$fk_parent_line;
 
-            dol_syslog(get_class($this)."::line_max sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
             {
@@ -1418,7 +1518,7 @@ abstract class CommonObject
             $sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
             $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
 
-            dol_syslog(get_class($this)."::line_max sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
             {
@@ -1446,7 +1546,7 @@ abstract class CommonObject
         $sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
         $sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;
 
-        dol_syslog(get_class($this)."::update_ref_ext sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             $this->ref_ext = $ref_ext;
@@ -1455,7 +1555,6 @@ abstract class CommonObject
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::update_ref_ext error=".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -1484,7 +1583,7 @@ abstract class CommonObject
     	$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
     	$sql.= " WHERE rowid =". $this->id;
 
-    	dol_syslog(get_class($this)."::update_note sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
     	if ($this->db->query($sql))
     	{
     		if ($suffix == '_public') $this->note_public = $note;
@@ -1495,7 +1594,6 @@ abstract class CommonObject
     	else
     	{
     		$this->error=$this->db->lasterror();
-    		dol_syslog(get_class($this)."::update_note error=".$this->error, LOG_ERR);
     		return -1;
     	}
     }
@@ -1559,7 +1657,7 @@ abstract class CommonObject
         }
         $sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
-        dol_syslog(get_class($this)."::update_price sql=".$sql);
+        dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -1659,13 +1757,12 @@ abstract class CommonObject
                 $sql .= ' WHERE rowid = '.$this->id;
 
                 //print "xx".$sql;
-                dol_syslog(get_class($this)."::update_price sql=".$sql);
+                dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
                 $resql=$this->db->query($sql);
                 if (! $resql)
                 {
                     $error++;
                     $this->error=$this->db->error();
-                    dol_syslog(get_class($this)."::update_price error=".$this->error,LOG_ERR);
                 }
             }
 
@@ -1691,6 +1788,7 @@ abstract class CommonObject
      *	@param		string	$origin		Linked element type
      *	@param		int		$origin_id	Linked element id
      *	@return		int					<=0 if KO, >0 if OK
+     *	@see		fetchObjectLinked, updateObjectLinked, deleteObjectLinked
      */
     function add_object_linked($origin=null, $origin_id=null)
     {
@@ -1711,7 +1809,7 @@ abstract class CommonObject
         $sql.= ", '".$this->element."'";
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::add_object_linked sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
 		if ($this->db->query($sql))
 	  	{
 	  		$this->db->commit();
@@ -1734,6 +1832,7 @@ abstract class CommonObject
      *	@param  string	$targettype		Object target type
      *	@param  string	$clause			'OR' or 'AND' clause used when both source id and target id are provided
      *	@return	void
+     *  @see	add_object_linked, updateObjectLinked, deleteObjectLinked
      */
 	function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype='',$clause='OR')
     {
@@ -1763,6 +1862,12 @@ abstract class CommonObject
         $sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
         $targettype = (! empty($targettype) ? $targettype : $this->element);
 
+        if (empty($sourceid) && empty($targetid))
+        {
+        	dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERROR);
+        	return -1;
+        }
+
         // Links beetween objects are stored in this table
         $sql = 'SELECT fk_source, sourcetype, fk_target, targettype';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';
@@ -1781,14 +1886,14 @@ abstract class CommonObject
             }
         }
         else
-        {
+		{
             $sql.= "(fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."')";
             $sql.= " ".$clause." (fk_target = '".$targetid."' AND targettype = '".$targettype."')";
         }
         $sql .= ' ORDER BY sourcetype';
         //print $sql;
 
-        dol_syslog(get_class($this)."::fetchObjectLink sql=".$sql);
+        dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -1888,6 +1993,7 @@ abstract class CommonObject
      *	@param  int		$targetid		Object target id
      *	@param  string	$targettype		Object target type
      *	@return							int	>0 if OK, <0 if KO
+     *	@see	add_object_linked, fetObjectLinked, deleteObjectLinked
      */
     function updateObjectLinked($sourceid='', $sourcetype='', $targetid='', $targettype='')
     {
@@ -1913,7 +2019,7 @@ abstract class CommonObject
     		$sql.= " AND sourcetype = '".$this->element."'";
     	}
 
-    	dol_syslog(get_class($this)."::updateObjectLinked sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
     	if ($this->db->query($sql))
     	{
     		return 1;
@@ -1921,7 +2027,6 @@ abstract class CommonObject
     	else
     	{
     		$this->error=$this->db->lasterror();
-    		dol_syslog(get_class($this)."::updateObjectLinked error=".$this->error, LOG_ERR);
     		return -1;
     	}
     }
@@ -1934,6 +2039,7 @@ abstract class CommonObject
      *	@param  int		$targetid		Object target id
      *	@param  string	$targettype		Object target type
 	 *	@return     int	>0 if OK, <0 if KO
+	 *	@see	add_object_linked, updateObjectLinked, fetchObjectLinked
 	 */
 	function deleteObjectLinked($sourceid='', $sourcetype='', $targetid='', $targettype='')
 	{
@@ -1967,7 +2073,7 @@ abstract class CommonObject
 			$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->element."')";
 		}
 
-		dol_syslog(get_class($this)."::deleteObjectLinked sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			return 1;
@@ -1975,7 +2081,6 @@ abstract class CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::deleteObjectLinked error=".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -1990,6 +2095,8 @@ abstract class CommonObject
      */
     function setStatut($status,$elementId='',$elementType='')
     {
+    	global $user,$langs,$conf;
+
         $elementId = (!empty($elementId)?$elementId:$this->id);
         $elementTable = (!empty($elementType)?$elementType:$this->table_element);
 
@@ -2002,17 +2109,43 @@ abstract class CommonObject
         $sql.= " SET ".$fieldstatus." = ".$status;
         $sql.= " WHERE rowid=".$elementId;
 
-        dol_syslog(get_class($this)."::setStatut sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
         if ($this->db->query($sql))
         {
-        	$this->db->commit();
-        	$this->statut = $status;
-        	return 1;
+            $error = 0;
+
+            $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)
+			{
+				$this->db->commit();
+        		$this->statut = $status;
+				return 1;
+			}
+			else
+			{
+				$this->db->rollback();
+				dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);
+				return -1;
+			}
         }
         else
         {
         	$this->error=$this->db->lasterror();
-        	dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR);
         	$this->db->rollback();
         	return -1;
         }
@@ -2080,328 +2213,6 @@ abstract class CommonObject
         }
     }
 
-
-    /**
-     *  Function to get extra fields of a member into $this->array_options
-     *  This method is in most cases called by method fetch of objects but you can call it separately.
-     *
-     *  @param	int		$rowid			Id of line
-     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label()
-     *  @return	int						<0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded
-     */
-    function fetch_optionals($rowid,$optionsArray='')
-    {
-        if (! is_array($optionsArray))
-        {
-            // optionsArray not already loaded, so we load it
-            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-            $extrafields = new ExtraFields($this->db);
-            $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
-        }
-
-
-        // Request to get complementary values
-        if (count($optionsArray) > 0)
-        {
-            $sql = "SELECT rowid";
-            foreach ($optionsArray as $name => $label)
-            {
-                $sql.= ", ".$name;
-            }
-            $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
-            $sql.= " WHERE fk_object = ".$rowid;
-
-            dol_syslog(get_class($this)."::fetch_optionals sql=".$sql, LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if ($resql)
-            {
-            	$numrows=$this->db->num_rows($resql);
-                if ($numrows)
-                {
-                    $tab = $this->db->fetch_array($resql);
-
-                    foreach ($tab as $key => $value)
-                    {
-                    	// Test fetch_array ! is_int($key) because fetch_array result is a mix table with some key as alpha and some key as int (depend db engine)
-                        if ($key != 'rowid' && $key != 'tms' && ! is_int($key))
-                        {
-                            // we can add this attribute to object properties
-                            $this->array_options["options_".$key]=$value;
-                        }
-                    }
-                }
-
-                $this->db->free($resql);
-
-                if ($numrows) return $numrows;
-                else return 0;
-            }
-            else
-            {
-                dol_print_error($this->db);
-                return -1;
-            }
-        }
-        return 0;
-    }
-
-    /**
-     *	Delete all extra fields values for the current object.
-     *
-     *  @return	int		<0 if KO, >0 if OK
-     */
-	function deleteExtraFields()
-	{
-		global $langs;
-
-		$error=0;
-
-		$this->db->begin();
-
-		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
-		dol_syslog(get_class($this)."::deleteExtraFields delete sql=".$sql_del);
-		$resql=$this->db->query($sql_del);
-		if (! $resql)
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::deleteExtraFields ".$this->error,LOG_ERR);
-			$this->db->rollback();
-			return -1;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-    /**
-     *	Add/Update all extra fields values for the current object.
-     *  All data to describe values to insert are stored into $this->array_options=array('keyextrafield'=>'valueextrafieldtoadd')
-     *
-     *  @return int -1=error, O=did nothing, 1=OK
-     */
-    function insertExtraFields()
-    {
-        global $conf,$langs;
-
-		$error=0;
-
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
-
-        if (! empty($this->array_options))
-        {
-            // Check parameters
-            $langs->load('admin');
-            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-            $extrafields = new ExtraFields($this->db);
-            $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
-
-            foreach($this->array_options as $key => $value)
-            {
-               	$attributeKey = substr($key,8);   // Remove 'options_' prefix
-               	$attributeType  = $extrafields->attribute_type[$attributeKey];
-               	$attributeSize  = $extrafields->attribute_size[$attributeKey];
-               	$attributeLabel = $extrafields->attribute_label[$attributeKey];
-               	switch ($attributeType)
-               	{
-               		case 'int':
-              			if (!is_numeric($value) && $value!='')
-               			{
-               				$error++; $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
-               				return -1;
-              			}
-               			elseif ($value=='')
-               			{
-               				$this->array_options[$key] = null;
-               			}
-             			break;
-            		case 'price':
-            			$this->array_options[$key] = price2num($this->array_options[$key]);
-            			break;
-            		case 'date':
-            			if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
-            			break;
-            		case 'datetime':
-            			if (is_numeric($this->array_options[$key])) $this->array_options[$key]=$this->db->idate($this->array_options[$key]);
-            			break;
-               	}
-            }
-            $this->db->begin();
-
-            $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
-            dol_syslog(get_class($this)."::insertExtraFields delete sql=".$sql_del);
-            $this->db->query($sql_del);
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object";
-            foreach($this->array_options as $key => $value)
-            {
-            	$attributeKey = substr($key,8);   // Remove 'options_' prefix
-                // Add field of attribut
-            	if (isset($extrafields->attribute_type[$attributeKey]) && $extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate
-                	$sql.=",".$attributeKey;
-            }
-            $sql .= ") VALUES (".$this->id;
-            foreach($this->array_options as $key => $value)
-            {
-            	$attributeKey = substr($key,8);   // Remove 'options_' prefix
-                // Add field o fattribut
-            	if(isset($extrafields->attribute_type[$attributeKey]) && $extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate)
-            	{
-	                if ($this->array_options[$key] != '')
-	                {
-	                    $sql.=",'".$this->db->escape($this->array_options[$key])."'";
-	                }
-	                else
-	                {
-	                    $sql.=",null";
-	                }
-            	}
-            }
-            $sql.=")";
-
-            dol_syslog(get_class($this)."::insertExtraFields insert sql=".$sql);
-            $resql = $this->db->query($sql);
-            if (! $resql)
-            {
-                $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
-                $this->db->rollback();
-                return -1;
-            }
-            else
-            {
-                $this->db->commit();
-                return 1;
-            }
-        }
-        else return 0;
-    }
-
-   /**
-     * Function to show lines of extrafields with output datas
-     *
-     * @param	object	$extrafields	Extrafield Object
-     * @param	string	$mode			Show output (view) or input (edit) for extrafield
-	 * @param	array	$params			Optionnal parameters
-	 * @param	string	$keyprefix		Prefix string to add into name and id of field (can be used to avoid duplicate names)
-     *
-     * @return string
-     */
-    function showOptionals($extrafields, $mode='view', $params=0, $keyprefix='')
-    {
-		global $_POST, $conf;
-
-		$out = '';
-
-		if (count($extrafields->attribute_label) > 0)
-		{
-			$out .= "\n";
-			$out .= '<!-- showOptionalsInput --> ';
-			$out .= "\n";
-
-			$e = 0;
-			foreach($extrafields->attribute_label as $key=>$label)
-			{
-				if (is_array($params) && count($params)>0) {
-					if (array_key_exists('colspan',$params)) {
-						$colspan=$params['colspan'];
-					}
-				}else {
-					$colspan='3';
-				}
-				switch($mode) {
-					case "view":
-						$value=$this->array_options["options_".$key];
-						break;
-					case "edit":
-						$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$this->array_options["options_".$key]);
-						break;
-				}
-				if ($extrafields->attribute_type[$key] == 'separate')
-				{
-					$out .= $extrafields->showSeparator($key);
-				}
-				else
-				{
-					$csstyle='';
-					if (is_array($params) && count($params)>0) {
-						if (array_key_exists('style',$params)) {
-							$csstyle=$params['style'];
-						}
-					}
-					if ( !empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
-					{
-						$out .= '<tr '.$csstyle.'>';
-						$colspan='0';
-					}
-					else
-					{
-						$out .= '<tr '.$csstyle.'>';
-					}
-					// 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"]):$this->db->jdate($this->array_options['options_'.$key]);
-					}
-
-					if($extrafields->attribute_required[$key])
-						$label = '<span class="fieldrequired">'.$label.'</span>';
-
-					$out .= '<td>'.$label.'</td>';
-					$out .='<td'.($colspan?' colspan="'.$colspan.'"':'').'>';
-
-					switch($mode) {
-					case "view":
-						$out .= $extrafields->showOutputField($key,$value);
-						break;
-					case "edit":
-						$out .= $extrafields->showInputField($key,$value,'',$keyprefix);
-						break;
-					}
-
-					$out .= '</td>'."\n";
-
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-					else $out .= '</tr>';
-					$e++;
-				}
-			}
-			$out .= "\n";
-			$out .= '<!-- /showOptionalsInput --> ';
-			$out .= '
-				<script type="text/javascript">
-				    jQuery(document).ready(function() {
-				    	function showOptions(child_list, parent_list)
-				    	{
-				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
-				    		var parentVal = parent_list + ":" + val;
-							if(val > 0) {
-					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
-					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
-							} else {
-								$("select[name=\""+child_list+"\"] option").show();
-							}
-				    	}
-						function setListDependencies() {
-					    	jQuery("select option[parent]").parent().each(function() {
-					    		var child_list = $(this).attr("name");
-								var parent = $(this).find("option[parent]:first").attr("parent");
-								var infos = parent.split(":");
-								var parent_list = infos[0];
-								$("select[name=\"options_"+parent_list+"\"]").change(function() {
-									showOptions(child_list, parent_list);
-								});
-					    	});
-						}
-
-						setListDependencies();
-				    });
-				</script>';
-		}
-		return $out;
-	}
-
-
     /**
      *  Function to check if an object is used by others.
      *  Check is done into this->childtables. There is no check into llx_element_element.
@@ -2437,7 +2248,6 @@ abstract class CommonObject
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::delete error -1 ".$this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -2486,7 +2296,7 @@ abstract class CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
         $sql.= " WHERE ".$this->fk_element." = ".$this->id;
 
-        dol_syslog(get_class($this).'::getTotalDiscount sql='.$sql);
+        dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2507,7 +2317,6 @@ abstract class CommonObject
         		$i++;
         	}
         }
-        else dol_syslog(get_class($this).'::getTotalDiscount '.$this->db->lasterror(), LOG_ERR);
 
         //print $total_discount; exit;
         return price2num($total_discount);
@@ -2528,12 +2337,11 @@ abstract class CommonObject
     	$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
     	$sql.= " WHERE rowid = ".$this->id;
 
-    	dol_syslog(get_class($this)."::setExtraParameters sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
     	$resql = $this->db->query($sql);
     	if (! $resql)
     	{
     		$this->error=$this->db->lasterror();
-    		dol_syslog(get_class($this)."::setExtraParameters ".$this->error, LOG_ERR);
     		$this->db->rollback();
     		return -1;
     	}
@@ -2736,33 +2544,33 @@ abstract class CommonObject
 		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td align="center" width="5">&nbsp;</td>';
 
 		// Description
-		print '<td>'.$langs->trans('Description').'</td>';
+		print '<td><label for="">'.$langs->trans('Description').'</label></td>';
 
 		// VAT
-		print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
+		print '<td align="right" width="50"><label for="tva_tx">'.$langs->trans('VAT').'</label></td>';
 
 		// Price HT
-		print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
+		print '<td align="right" width="80"><label for="price_ht">'.$langs->trans('PriceUHT').'</label></td>';
 
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1) print '<td align="right" width="80">&nbsp;</td>';
+		if ($inputalsopricewithtax) print '<td align="right" width="80">&nbsp;</td>';
 
 		// Qty
-		print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
+		print '<td align="right" width="50"><label for="qty">'.$langs->trans('Qty').'</label></td>';
 
 		// Reduction short
-		print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+		print '<td align="right" width="50"><label for="remise_percent">'.$langs->trans('ReductionShort').'</label></td>';
 
 		if (! empty($conf->margin->enabled) && empty($user->societe_id))
 		{
 			if ($conf->global->MARGIN_TYPE == "1")
-				print '<td align="right" width="80">'.$langs->trans('BuyingPrice').'</td>';
+				print '<td align="right" class="margininfos" width="80">'.$langs->trans('BuyingPrice').'</td>';
 			else
-				print '<td align="right" width="80">'.$langs->trans('CostPrice').'</td>';
+				print '<td align="right" class="margininfos" width="80">'.$langs->trans('CostPrice').'</td>';
 
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
-				print '<td align="right" width="50">'.$langs->trans('MarginRate').'</td>';
+				print '<td align="right" class="margininfos" width="50">'.$langs->trans('MarginRate').'</td>';
 			if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
-				print '<td align="right" width="50">'.$langs->trans('MarkRate').'</td>';
+				print '<td align="right" class="margininfos" width="50">'.$langs->trans('MarkRate').'</td>';
 		}
 
 		// Total HT
@@ -2799,6 +2607,11 @@ abstract class CommonObject
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
 					$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
+				else
+				{
+					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
+					$reshook=$hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+				}
 			}
 			else
 			{
@@ -3233,24 +3046,37 @@ abstract class CommonObject
 
     	if (! $user->rights->margins->liretous) return;
 
-        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 		$marginInfo = $this->getMarginInfos($force_price);
 
-		print '<table class="nobordernopadding" width="100%">';
+		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 '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
+	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
 
+    	    print '<script>$(document).ready(function() {
+        	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
+        	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
+      	        });</script>';
+    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+		}
+
+		print '<table class="noborder margintable" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td width="30%">'.$langs->trans('Margins').'</td>';
-		print '<td width="20%" align="right">'.$langs->trans('SellingPrice').'</td>';
+		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
+		print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
 		if ($conf->global->MARGIN_TYPE == "1")
-			print '<td width="20%" align="right">'.$langs->trans('BuyingPrice').'</td>';
+			print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
 		else
-			print '<td width="20%" align="right">'.$langs->trans('CostPrice').'</td>';
-		print '<td width="20%" align="right">'.$langs->trans('Margin').'</td>';
+			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
 		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-			print '<td align="right">'.$langs->trans('MarginRate').'</td>';
+			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
 		if (! empty($conf->global->DISPLAY_MARK_RATES))
-			print '<td align="right">'.$langs->trans('MarkRate').'</td>';
+			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
 		print '</tr>';
 
 		if (! empty($conf->product->enabled))
@@ -3329,7 +3155,7 @@ abstract class CommonObject
 		$sql.= ", '".$mandatory."'";
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::add_element_resource sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 			$this->db->commit();
@@ -3355,24 +3181,19 @@ abstract class CommonObject
 	{
 	    global $user,$langs,$conf;
 
-	    $error=0;
+
+	    $this->db->begin();
 
 	    $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
 	    $sql.= " WHERE rowid =".$rowid;
 
-	    dol_syslog(get_class($this)."::delete_resource sql=".$sql);
+	    dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
 	    if ($this->db->query($sql))
 	    {
 	        if (! $notrigger)
 	        {
-	            // Call triggers
-	            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            $interface=new Interfaces($this->db);
-	            $result=$interface->run_triggers(strtoupper($element).'_DELETE_RESOURCE',$this,$user,$langs,$conf);
-	            if ($result < 0) {
-	                $error++; $this->errors=$interface->errors;
-	            }
-	            // End call triggers
+	            $result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
+	            if ($result < 0) { $this->db->rollback(); return -1; }
 	        }
 
 	        return 1;
@@ -3380,7 +3201,7 @@ abstract class CommonObject
 	    else
 	    {
 	        $this->error=$this->db->lasterror();
-	        dol_syslog(get_class($this)."::delete_resource error=".$this->error, LOG_ERR);
+	        $this->db->rollback();
 	        return -1;
 	    }
 	}
@@ -3404,4 +3225,458 @@ abstract class CommonObject
         }
     }
 
+	/**
+	 * Common function for all objects extending CommonObject for generating documents
+	 *
+	 * @param string $modelspath Relative folder where models are placed
+	 * @param string $modele Model to use
+	 * @param Translate $outputlangs Language to use
+	 * @param int $hidedetails 1 to hide details. 0 by default
+	 * @param int $hidedesc 1 to hide product description. 0 by default
+	 * @param int $hideref 1 to hide product reference. 0 by default
+	 * @return int 1 if OK -1 if not OK
+	 */
+	protected function commonGenerateDocument($modelspath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref)
+	{
+		global $conf, $langs;
+
+		$srctemplatepath='';
+
+		// Increase limit for PDF build
+		$err=error_reporting();
+		error_reporting(0);
+		@set_time_limit(120);
+		error_reporting($err);
+
+		// If selected modele is a filename template (then $modele="modelname:filename")
+		$tmp=explode(':',$modele,2);
+		if (! empty($tmp[1]))
+		{
+			$modele=$tmp[0];
+			$srctemplatepath=$tmp[1];
+		}
+
+		// Search template files
+		$file=''; $classname=''; $filefound=0;
+		$dirmodels=array('/');
+		if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
+		foreach($dirmodels as $reldir)
+		{
+			foreach(array('doc','pdf') as $prefix)
+			{
+				$file = $prefix."_".$modele.".modules.php";
+
+				// On verifie l'emplacement du modele
+				$file=dol_buildpath($reldir.$modelspath.$file,0);
+				if (file_exists($file))
+				{
+					$filefound=1;
+					$classname=$prefix.'_'.$modele;
+					break;
+				}
+			}
+			if ($filefound) break;
+		}
+
+		// Charge le modele
+		if ($filefound)
+		{
+			require_once $file;
+
+			$obj = new $classname($this->db);
+			//$obj->message = $message;
+
+			// We save charset_output to restore it because write_file can change it if needed for
+			// output format that does not support UTF8.
+			$sav_charset_output=$outputlangs->charset_output;
+			if ($obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
+			{
+				$outputlangs->charset_output=$sav_charset_output;
+
+				// We delete old preview
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+				dol_delete_preview($this);
+
+				// Success in building document. We build meta file.
+				dol_meta_create($this);
+
+				return 1;
+			}
+			else
+			{
+				$outputlangs->charset_output=$sav_charset_output;
+				dol_print_error($this->db,"Error generating document for ".__CLASS__.". Error: ".$obj->error);
+				return -1;
+			}
+
+		}
+		else
+		{
+			dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
+			return -1;
+		}
+	}
+
+
+	/* Functions common to commonobject and commonobjectline */
+
+
+	/* For triggers */
+
+
+    /**
+     * Call trigger based on this instance
+     * NB: Error from trigger are stacked in interface->errors
+     * NB2: If return code of triggers are < 0, action calling trigger should cancel all transaction.
+     *
+     * @param   string    $trigger_name   trigger's name to execute
+     * @param   User      $user           Object user
+     * @return  int                       Result of run_triggers
+     */
+    function call_trigger($trigger_name, $user)
+    {
+    	global $langs,$conf;
+
+    	include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+    	$interface=new Interfaces($this->db);
+    	$result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
+
+    	if ($result < 0)
+    	{
+    		if (!empty($this->errors))
+    		{
+    			$this->errors=array_merge($this->errors,$interface->errors);
+    		}
+    		else
+    		{
+    			$this->errors=$interface->errors;
+    		}
+    	}
+
+    	return $result;
+    }
+
+
+    /* Functions for extrafields */
+
+
+    /**
+     *  Function to get extra fields of a member into $this->array_options
+     *  This method is in most cases called by method fetch of objects but you can call it separately.
+     *
+     *  @param	int		$rowid			Id of line
+     *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label()
+     *  @return	int						<0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded
+     */
+    function fetch_optionals($rowid='',$optionsArray='')
+    {
+    	if (empty($rowid)) $rowid=$this->id;
+
+        if (! is_array($optionsArray))
+        {
+            // optionsArray not already loaded, so we load it
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
+        }
+
+        // Request to get complementary values
+        if (count($optionsArray) > 0)
+        {
+            $sql = "SELECT rowid";
+            foreach ($optionsArray as $name => $label)
+            {
+                $sql.= ", ".$name;
+            }
+            $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
+            $sql.= " WHERE fk_object = ".$rowid;
+
+            dol_syslog(get_class($this)."::fetch_optionals", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+            	$numrows=$this->db->num_rows($resql);
+                if ($numrows)
+                {
+                    $tab = $this->db->fetch_array($resql);
+
+                    foreach ($tab as $key => $value)
+                    {
+                    	// Test fetch_array ! is_int($key) because fetch_array seult is a mix table with Key as alpha and Key as int (depend db engine)
+                        if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
+                        {
+                            // we can add this attribute to adherent object
+                            $this->array_options["options_".$key]=$value;
+                        }
+                    }
+                }
+
+                $this->db->free($resql);
+
+                if ($numrows) return $numrows;
+                else return 0;
+            }
+            else
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     *	Delete all extra fields values for the current object.
+     *
+     *  @return	int		<0 if KO, >0 if OK
+     */
+	function deleteExtraFields()
+	{
+		global $langs;
+
+		$error=0;
+
+		$this->db->begin();
+
+		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
+		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
+		$resql=$this->db->query($sql_del);
+		if (! $resql)
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+    /**
+     *	Add/Update all extra fields values for the current object.
+     *  All data to describe values to insert are stored into $this->array_options=array('keyextrafield'=>'valueextrafieldtoadd')
+     *
+     *  @return int -1=error, O=did nothing, 1=OK
+     */
+    function insertExtraFields()
+    {
+        global $conf,$langs;
+
+		$error=0;
+
+		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+
+        if (! empty($this->array_options))
+        {
+            // Check parameters
+            $langs->load('admin');
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
+
+            foreach($this->array_options as $key => $value)
+            {
+               	$attributeKey = substr($key,8);   // Remove 'options_' prefix
+               	$attributeType  = $extrafields->attribute_type[$attributeKey];
+               	$attributeSize  = $extrafields->attribute_size[$attributeKey];
+               	$attributeLabel = $extrafields->attribute_label[$attributeKey];
+               	switch ($attributeType)
+               	{
+               		case 'int':
+              			if (!is_numeric($value) && $value!='')
+               			{
+               				$error++; $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel);
+               				return -1;
+              			}
+               			elseif ($value=='')
+               			{
+               				$this->array_options[$key] = null;
+               			}
+             			break;
+            		case 'price':
+            			$this->array_options[$key] = price2num($this->array_options[$key]);
+            			break;
+            		case 'date':
+            			$this->array_options[$key]=$this->db->idate($this->array_options[$key]);
+            			break;
+            		case 'datetime':
+            			$this->array_options[$key]=$this->db->idate($this->array_options[$key]);
+            			break;
+               	}
+            }
+            $this->db->begin();
+
+            $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
+            dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
+            $this->db->query($sql_del);
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object";
+            foreach($this->array_options as $key => $value)
+            {
+            	$attributeKey = substr($key,8);   // Remove 'options_' prefix
+                // Add field of attribut
+            	if ($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate
+                	$sql.=",".$attributeKey;
+            }
+            $sql .= ") VALUES (".$this->id;
+            foreach($this->array_options as $key => $value)
+            {
+            	$attributeKey = substr($key,8);   // Remove 'options_' prefix
+                // Add field o fattribut
+            	if($extrafields->attribute_type[$attributeKey] != 'separate') // Only for other type of separate)
+            	{
+	                if ($this->array_options[$key] != '')
+	                {
+	                    $sql.=",'".$this->db->escape($this->array_options[$key])."'";
+	                }
+	                else
+	                {
+	                    $sql.=",null";
+	                }
+            	}
+            }
+            $sql.=")";
+
+            dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if (! $resql)
+            {
+                $this->error=$this->db->lasterror();
+                $this->db->rollback();
+                return -1;
+            }
+            else
+            {
+                $this->db->commit();
+                return 1;
+            }
+        }
+        else return 0;
+    }
+
+   /**
+     * Function to show lines of extrafields with output datas
+     *
+     * @param	object	$extrafields	Extrafield Object
+     * @param	string	$mode			Show output (view) or input (edit) for extrafield
+	 * @param	array	$params			Optionnal parameters
+	 * @param	string	$keyprefix		Prefix string to add into name and id of field (can be used to avoid duplicate names)
+     *
+     * @return string
+     */
+    function showOptionals($extrafields, $mode='view', $params=0, $keyprefix='')
+    {
+		global $_POST, $conf;
+
+		$out = '';
+
+		if (count($extrafields->attribute_label) > 0)
+		{
+			$out .= "\n";
+			$out .= '<!-- showOptionalsInput --> ';
+			$out .= "\n";
+
+			$e = 0;
+			foreach($extrafields->attribute_label as $key=>$label)
+			{
+				if (is_array($params) && count($params)>0) {
+					if (array_key_exists('colspan',$params)) {
+						$colspan=$params['colspan'];
+					}
+				}else {
+					$colspan='3';
+				}
+				switch($mode) {
+					case "view":
+						$value=$this->array_options["options_".$key];
+						break;
+					case "edit":
+						$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$this->array_options["options_".$key]);
+						break;
+				}
+				if ($extrafields->attribute_type[$key] == 'separate')
+				{
+					$out .= $extrafields->showSeparator($key);
+				}
+				else
+				{
+					$csstyle='';
+					if (is_array($params) && count($params)>0) {
+						if (array_key_exists('style',$params)) {
+							$csstyle=$params['style'];
+						}
+					}
+					if ( !empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0)
+					{
+						$out .= '<tr '.$csstyle.'>';
+						$colspan='0';
+					}
+					else
+					{
+						$out .= '<tr '.$csstyle.'>';
+					}
+					// 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"]):$this->db->jdate($this->array_options['options_'.$key]);
+					}
+
+					if($extrafields->attribute_required[$key])
+						$label = '<span class="fieldrequired">'.$label.'</span>';
+
+					$out .= '<td>'.$label.'</td>';
+					$out .='<td'.($colspan?' colspan="'.$colspan.'"':'').'>';
+
+					switch($mode) {
+					case "view":
+						$out .= $extrafields->showOutputField($key,$value);
+						break;
+					case "edit":
+						$out .= $extrafields->showInputField($key,$value,'',$keyprefix);
+						break;
+					}
+
+					$out .= '</td>'."\n";
+
+					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
+					else $out .= '</tr>';
+					$e++;
+				}
+			}
+			$out .= "\n";
+			$out .= '<!-- /showOptionalsInput --> ';
+			$out .= '
+				<script type="text/javascript">
+				    jQuery(document).ready(function() {
+				    	function showOptions(child_list, parent_list)
+				    	{
+				    		var val = $("select[name=\"options_"+parent_list+"\"]").val();
+				    		var parentVal = parent_list + ":" + val;
+							if(val > 0) {
+					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
+					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
+							} else {
+								$("select[name=\""+child_list+"\"] option").show();
+							}
+				    	}
+						function setListDependencies() {
+					    	jQuery("select option[parent]").parent().each(function() {
+					    		var child_list = $(this).attr("name");
+								var parent = $(this).find("option[parent]:first").attr("parent");
+								var infos = parent.split(":");
+								var parent_list = infos[0];
+								$("select[name=\"options_"+parent_list+"\"]").change(function() {
+									showOptions(child_list, parent_list);
+								});
+					    	});
+						}
+
+						setListDependencies();
+				    });
+				</script>';
+		}
+		return $out;
+	}
+
 }
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index bb253d2eded..c3c8d823a34 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -26,8 +26,12 @@
  *  Parent class for class inheritance lines of business objects
  *  This class is useless for the moment so no inherit are done on it
  */
-abstract class CommonObjectLine
+abstract class CommonObjectLine extends CommonObject
 {
+	// TODO
 
+	// Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code.
+
+	// For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits.
 }
 
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index b6225de2913..9127ed614b3 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -366,12 +366,25 @@ class Conf
 			unset($this->global->CONTACT_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;
+		}
+
 		// conf->currency
 		if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR';
 		$this->currency=$this->global->MAIN_MONNAIE;
 
-		// conf->global->COMPTA_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
-        if (empty($this->global->COMPTA_MODE)) $this->global->COMPTA_MODE='RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
+		// 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 objects 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;
diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/cpays.class.php
deleted file mode 100644
index e6db8e4b2e9..00000000000
--- a/htdocs/core/class/cpays.class.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-/* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/core/class/cpays.class.php
- *      \ingroup    core
- *      \brief      This file is a CRUD class file (Create/Read/Update/Delete) for c_pays dictionary
- */
-
-// Put here all includes required by your class file
-//require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-
-/**
- * 	Class to manage dictionary Countries (used by imports)
- */
-class Cpays // extends CommonObject
-{
-	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 $element='cpays';			//!< Id that identify managed objects
-	//var $table_element='cpays';	//!< Name of table without prefix where object is stored
-
-    var $id;
-	var $code;
-	var $code_iso;
-	var $libelle;
-	var $active;
-
-
-
-
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param      User	$user        User that create
-     *  @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)
-    {
-    	global $conf, $langs;
-		$error=0;
-
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-        // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_pays(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "code_iso,";
-		$sql.= "libelle,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->rowid."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
-		$sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->active."'")."";
-		$sql.= ")";
-
-		$this->db->begin();
-
-	   	dol_syslog(get_class($this)."::create sql=".$sql, 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."c_pays");
-
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-			}
-        }
-
-        // Commit or rollback
-        if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::create ".$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 database
-     *
-     *  @param      int		$id    	Id object
-     *  @param		string	$code	Code
-     *  @return     int          	<0 if KO, >0 if OK
-     */
-    function fetch($id,$code='')
-    {
-    	global $langs;
-        $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.code_iso,";
-		$sql.= " t.libelle,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_pays as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id    = $obj->rowid;
-				$this->code = $obj->code;
-				$this->code_iso = $obj->code_iso;
-				$this->libelle = $obj->libelle;
-				$this->active = $obj->active;
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
-
-
-    /**
-     *  Update object into 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=0, $notrigger=0)
-    {
-    	global $conf, $langs;
-		$error=0;
-
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->libelle)) $this->libelle=trim($this->libelle);
-		if (isset($this->active)) $this->active=trim($this->active);
-
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."c_pays SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
-		$sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
-        $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 call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
-		}
-
-        // 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     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)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_pays";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::delete sql=".$sql);
-		$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 call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
-			}
-		}
-
-        // 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;
-		}
-	}
-
-}
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 33070f83412..027dda53dd3 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -102,7 +102,7 @@ class Ctypent // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -156,14 +156,15 @@ class Ctypent // extends CommonObject
         $sql = "SELECT";
 		$sql.= " t.id,";
 		$sql.= " t.code,";
-		$sql.= " t.libelle,";
+		$sql.= " t.libelle as label,";
+		$sql.= " t.fk_country as country_id,";
 		$sql.= " t.active,";
 		$sql.= " t.module";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_typent as t";
         if ($id)   $sql.= " WHERE t.id = ".$id;
         elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -173,7 +174,8 @@ class Ctypent // extends CommonObject
 
                 $this->id    = $obj->id;
 				$this->code = $obj->code;
-				$this->libelle = $obj->libelle;
+				$this->libelle = $obj->label;
+				$this->country_id = $obj->country_id;
 				$this->active = $obj->active;
 				$this->module = $obj->module;
             }
@@ -184,7 +186,6 @@ class Ctypent // extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -197,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;
@@ -222,7 +223,7 @@ class Ctypent // extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -278,7 +279,7 @@ class Ctypent // extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 23ce9f97f6d..f0291c9d567 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -85,7 +85,7 @@ class DiscountAbsolute
         if ($rowid) $sql.= " sr.rowid=".$rowid;
         if ($fk_facture_source) $sql.= " sr.fk_facture_source=".$fk_facture_source;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -159,7 +159,7 @@ class DiscountAbsolute
         $sql.= " ".($this->fk_facture_source?"'".$this->fk_facture_source."'":"null");
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -169,7 +169,6 @@ class DiscountAbsolute
         else
         {
             $this->error=$this->db->lasterror().' - sql='.$sql;
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -195,7 +194,7 @@ class DiscountAbsolute
             $sql.=" AND fk_facture_source = ".$this->fk_facture_source;
             //$sql.=" AND rowid != ".$this->id;
 
-            dol_syslog(get_class($this)."::delete Check if we can remove discount sql=".$sql);
+            dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -222,7 +221,7 @@ class DiscountAbsolute
         $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
         $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
 
-        dol_syslog(get_class($this)."::delete Delete discount sql=".$sql);
+        dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
@@ -233,7 +232,7 @@ class DiscountAbsolute
                 $sql.=" set paye=0, fk_statut=1";
                 $sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
 
-                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut sql=".$sql);
+                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
                 $result=$this->db->query($sql);
                 if ($result)
                 {
@@ -291,7 +290,7 @@ class DiscountAbsolute
         if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
         $sql.=" WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::link_to_invoice sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -302,7 +301,6 @@ class DiscountAbsolute
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::link_to_invoice ".$this->error,LOG_ERR);
             return -3;
         }
     }
@@ -320,7 +318,7 @@ class DiscountAbsolute
         $sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
         $sql.=" WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::unlink_invoice sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -329,7 +327,6 @@ class DiscountAbsolute
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::unlink_invoice ".$this->error,LOG_ERR);
             return -3;
         }
     }
@@ -355,7 +352,7 @@ class DiscountAbsolute
         if ($filter)   $sql.=' AND ('.$filter.')';
         if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
 
-        dol_syslog(get_class($this)."::getAvailableDiscounts sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -384,7 +381,7 @@ class DiscountAbsolute
         $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
         $sql.= ' AND f.type = 2';
 
-        dol_syslog(get_class($this)."::getSumCreditNotesUsed sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -410,7 +407,7 @@ class DiscountAbsolute
         $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
         $sql.= ' AND f.type = 3';
 
-        dol_syslog(get_class($this)."::getSumDepositsUsed sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
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 b344a0c4059..299026a84bb 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -111,7 +111,7 @@ class Events // extends CommonObject
 		$this->description=trim($this->description);
 
 		// Check parameters
-		if (! $this->description) { $this->error='ErrorBadValueForParameter'; return -1; }
+		if (empty($this->description)) { $this->error='ErrorBadValueForParameter'; return -1; }
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
@@ -129,10 +129,10 @@ class Events // extends CommonObject
 		$sql.= " ".($_SERVER['HTTP_USER_AGENT']?"'".dol_trunc($_SERVER['HTTP_USER_AGENT'],250)."'":'NULL').",";
 		$sql.= " '".$this->db->idate($this->dateevent)."',";
 		$sql.= " ".($user->id?"'".$user->id."'":'NULL').",";
-		$sql.= " '".$this->db->escape($this->description)."'";
+		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -142,7 +142,6 @@ class Events // extends CommonObject
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -155,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;
 
@@ -174,12 +173,11 @@ class Events // extends CommonObject
 		$sql.= " description='".$this->db->escape($this->description)."'";
 		$sql.= " WHERE rowid=".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			return -1;
 		}
 		return 1;
@@ -193,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;
 
@@ -209,7 +207,7 @@ class Events // extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
 		$sql.= " WHERE t.rowid = ".$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -233,7 +231,6 @@ class Events // extends CommonObject
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -252,12 +249,11 @@ class Events // extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
 		$sql.= " WHERE rowid=".$this->id;
 
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 8ce0a1b3b45..30c97e9f1ef 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -50,11 +50,13 @@ class ExtraFields
 	var $attribute_param;
 	// Int to store position of attribute
 	var $attribute_pos;
+	// Int to store if attribute is editable regardless of the document status
+	var $attribute_alwayseditable;
 
 	var $error;
 	var $errno;
 
-	static $type2label=array(
+	public static $type2label=array(
 	'varchar'=>'String',
 	'text'=>'TextLong',
 	'int'=>'Int',
@@ -103,9 +105,10 @@ class ExtraFields
 	 *  @param	int		$required			Is field required or not
 	 *  @param	string	$default_value		Defaulted value
 	 *  @param  array	$param				Params for field
+	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @return int      					<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0,$default_value='', $param=0)
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0)
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -119,7 +122,7 @@ class ExtraFields
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param);
+			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -217,9 +220,10 @@ class ExtraFields
 	 *  @param	int				$unique			Is field unique or not
 	 *  @param	int				$required		Is field required or not
 	 *  @param  array||string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
+	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='')
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0)
 	{
 		global $conf;
 
@@ -241,7 +245,7 @@ class ExtraFields
 				$params='';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -251,10 +255,11 @@ class ExtraFields
 			$sql.= " '".$elementtype."',";
 			$sql.= " '".$unique."',";
 			$sql.= " '".$required."',";
-			$sql.= " '".$params."'";
+			$sql.= " '".$params."',";
+			$sql.= " '".$alwayseditable."'";
 			$sql.=')';
 
-			dol_syslog(get_class($this)."::create_label sql=".$sql);
+			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
 			if ($this->db->query($sql))
 			{
 				return 1;
@@ -285,7 +290,6 @@ class ExtraFields
 			if ($result < 0)
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			}
 
 			$result=$this->delete_label($attrname,$elementtype);
@@ -317,7 +321,7 @@ class ExtraFields
 			$sql.= " AND entity IN  (0,".$conf->entity.')';
 			$sql.= " AND elementtype = '".$elementtype."'";
 
-			dol_syslog(get_class($this)."::delete_label sql=".$sql);
+			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -348,9 +352,10 @@ class ExtraFields
 	 *  @param	int		$required			Is field required or not
 	 *  @param	int		$pos				Position of attribute
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
+	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='')
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0)
 	{
 		$table=$elementtype.'_extrafields';
 
@@ -385,7 +390,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable);
 				}
 				if ($result > 0)
 				{
@@ -398,7 +403,7 @@ class ExtraFields
 					{
 						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
-					dol_syslog(get_class($this).'::update sql='.$sql);
+					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql=$this->db->query($sql,1,'dml');
 					return 1;
 				}
@@ -433,9 +438,10 @@ class ExtraFields
 	 *  @param	int		$required			Is field required or not
 	 *  @param	int		$pos				Position of attribute
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
+	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='')
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0)
 	{
 		global $conf;
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required);
@@ -453,7 +459,7 @@ class ExtraFields
 			$sql_del.= " WHERE name = '".$attrname."'";
 			$sql_del.= " AND entity = ".$conf->entity;
 			$sql_del.= " AND elementtype = '".$elementtype."'";
-			dol_syslog(get_class($this)."::update_label sql=".$sql_del);
+			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
 			$resql1=$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
@@ -466,6 +472,7 @@ class ExtraFields
 			$sql.= " fieldunique,";
 			$sql.= " fieldrequired,";
 			$sql.= " pos,";
+			$sql.= " alwayseditable,";
 			$sql.= " param";
 			$sql.= ") VALUES (";
 			$sql.= "'".$attrname."',";
@@ -477,9 +484,10 @@ class ExtraFields
 			$sql.= " '".$unique."',";
 			$sql.= " '".$required."',";
 			$sql.= " '".$pos."',";
+			$sql.= " '".$alwayseditable."',";
 			$sql.= " '".$param."'";
 			$sql.= ")";
-			dol_syslog(get_class($this)."::update_label sql=".$sql);
+			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
 			$resql2=$this->db->query($sql);
 
 			if ($resql1 && $resql2)
@@ -503,40 +511,28 @@ class ExtraFields
 
 
 	/**
-	 *  Load array of labels
-	 *
-	 *  @return	void
-	 */
-	function fetch_optionals()
-	{
-		$this->fetch_name_optionals_label();
-	}
-
-
-	/**
-	 * 	Load array this->attribute_label
+	 * 	Load array this->attribute_xxx like attribute_label, attribute_type, ...
 	 *
 	 * 	@param	string		$elementtype		Type of element ('adherent', 'commande', societe', 'facture', 'propal', 'product', ...)
 	 * 	@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";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
 		$sql.= " ORDER BY pos";
 
-		dol_syslog(get_class($this)."::fetch_name_optionals_label sql=".$sql);
+		dol_syslog(get_class($this)."::fetch_name_optionals_label", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -558,15 +554,16 @@ class ExtraFields
 					$this->attribute_required[$tab->name]=$tab->fieldrequired;
 					$this->attribute_param[$tab->name]=unserialize($tab->param);
 					$this->attribute_pos[$tab->name]=$tab->pos;
+					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
 				}
 			}
-
-			return $array_name_label;
 		}
 		else
 		{
 			print dol_print_error($this->db);
 		}
+
+		return $array_name_label;
 	}
 
 
@@ -673,7 +670,7 @@ class ExtraFields
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
+			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
 				$out.= ajax_combobox('options_'.$key.$keyprefix, array(), $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
@@ -756,7 +753,7 @@ class ExtraFields
 				//$sql.=preg_replace('/^ AND /','',$sqlwhere);
 				//print $sql;
 
-				dol_syslog(get_class($this).'::showInputField type=sellist sql='.$sql);
+				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
@@ -966,7 +963,7 @@ class ExtraFields
 			$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			//$sql.= ' AND entity = '.$conf->entity;
 
-			dol_syslog(get_class($this).':showOutputField:$type=sellist sql='.$sql);
+			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
new file mode 100644
index 00000000000..1abde51c263
--- /dev/null
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -0,0 +1,327 @@
+<?php
+/* Copyright (C) 2014		Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/class/fiscalyear.php
+ *		\ingroup    fiscal year
+ *		\brief      File of class to manage fiscal years
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+
+/**
+ * Class to manage fiscal year
+ */
+class Fiscalyear
+{
+	public $element='fiscalyear';
+	public $table_element='accounting_fiscalyear';
+	public $table_element_line = '';
+	public $fk_element = '';
+	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+
+	var $id;
+	var $rowid;
+
+	var $label;
+	var $date_start;
+	var $date_end;
+	var $statut;		// 0=open, 1=closed
+	var $entity;
+
+	var $statuts=array();
+	var $statuts_short=array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB		$db		Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->statuts_short = array(0 => 'Opened', 1 => 'Closed');
+        $this->statuts = array(0 => 'Opened', 1 => 'Closed');
+
+		return 1;
+	}
+
+	/**
+	 *	Create object in database
+	 *
+	 *	@param		User	$user   User making creation
+	 *	@return 	int				<0 if KO, >0 if OK
+	 */
+	function create($user)
+	{
+		global $conf;
+
+		$error = 0;
+
+		$now=dol_now();
+
+		$this->db->begin();
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_fiscalyear (";
+		$sql.= "label";
+		$sql.= ", date_start";
+		$sql.= ", date_end";
+		$sql.= ", statut";
+		$sql.= ", entity";
+		$sql.= ", datec";
+		$sql.= ", fk_user_author";
+		$sql.= ") VALUES (";
+		$sql.= " '".$this->label."'";
+		$sql.= ", '".$this->db->idate($this->date_start)."'";
+		$sql.= ", ".($this->date_end ? "'".$this->db->idate($this->date_end)."'":"null");
+		$sql.= ", ".$this->statut;
+		$sql.= ", ".$conf->entity;
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ", ". $user->id;
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
+
+			$result=$this->update($user);
+			if ($result > 0)
+			{
+				$this->db->commit();
+				return $this->id;
+			}
+			else
+			{
+				$this->error=$this->db->lasterror();
+				$this->db->rollback();
+				return $result;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update record
+	 *
+	 *	@param	User	$user		User making update
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function update($user)
+	{
+		global $langs;
+
+		// Check parameters
+		if (empty($this->date_start) && empty($this->date_end))
+        {
+            $this->error='ErrorBadParameter';
+            return -1;
+        }
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_fiscalyear";
+		$sql .= " SET label = '".$this->label."'";
+		$sql .= ", date_start = '".$this->db->idate($this->date_start)."'";
+		$sql .= ", date_end = ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= ", statut = '".$this->statut."'";
+		$sql .= ", datec = " . ($this->datec != '' ? "'".$this->db->idate($this->datec)."'" : 'null');
+		$sql .= ", fk_user_modif = " . $user->id;
+		$sql .= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			dol_syslog($this->error, LOG_ERR);
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	* Load an object from database
+	*
+	* @param	int		$id		Id of record to load
+	* @return	int				<0 if KO, >0 if OK
+	*/
+	function fetch($id)
+	{
+		$sql = "SELECT rowid, label, date_start, date_end, statut";
+		$sql.= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear";
+		$sql.= " WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ( $result )
+		{
+			$obj = $this->db->fetch_object($result);
+
+			$this->id			= $obj->rowid;
+			$this->ref			= $obj->rowid;
+			$this->date_start	= $this->db->jdate($obj->date_start);
+			$this->date_end		= $this->db->jdate($obj->date_end);
+			$this->label		= $obj->label;
+			$this->statut	    = $obj->statut;
+
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
+
+   /**
+	*	Delete record
+	*
+	*	@param	int		$id		Id of record to delete
+	*	@return	int				<0 if KO, >0 if OK
+	*/
+	function delete($id)
+	{
+		$this->db->begin();
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Give a label from a status
+	 *
+	 * @param	int		$mode   	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 * @return  string   		   	Label
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->statut,$mode);
+	}
+
+	/**
+	 *  Give a label from a status
+	 *
+	 *  @param	int		$statut     Id status
+	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *  @return string      		Label
+	 */
+	function LibStatut($statut,$mode=0)
+	{
+		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]),'statut4').' '.$langs->trans($this->statuts_short[$statut]);
+			if ($statut==1) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts_short[$statut]);
+		}
+		if ($mode == 3)
+		{
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+		}
+		if ($mode == 4)
+		{
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return img_picto($langs->trans($this->statuts_short[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]);
+		}
+		if ($mode == 5)
+		{
+			if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
+			if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+		}
+	}
+
+	/**
+	 * Information on record
+	 *
+	 * @param	int		$id      Id of record
+	 * @return	void
+	 */
+	function info($id)
+	{
+		$sql = 'SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,';
+		$sql.= ' fy.tms';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'accounting_fiscalyear as fy';
+		$sql.= ' WHERE fy.rowid = '.$id;
+
+		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
+		$result = $this->db->query($sql);
+
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				if ($obj->fk_user_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->tms);
+			}
+			$this->db->free($result);
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 906c1e6c4ae..d1fc6e4662d 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2014 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -114,8 +114,8 @@ class HookManager
      *
      * 		@param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
      * 	    @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'...)
+     * 		@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.
      * 											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.
@@ -145,7 +145,8 @@ class HookManager
 		        'moveUploadedFile',
 		        'pdf_writelinedesc',
 		        'paymentsupplierinvoices',
-		        'printSearchForm'
+		        'printSearchForm',
+        		'formatEvent'
         		)
         	)) $hooktype='addreplace';
 
@@ -153,7 +154,7 @@ class HookManager
         $modulealreadyexecuted=array();
         $resaction=0; $error=0; $result='';
 		$this->resPrint=''; $this->resArray=array();
-        foreach($this->hooks as $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,27 +162,29 @@ class HookManager
                 {
                 	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
 
-                	//print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action;
-                	// jump to next class if method does not exists
+                	// jump to next module/class if method does not exists
                     if (! method_exists($actionclassinstance,$method)) continue;
-                	// test to avoid to run twice a hook, when a module implements several active contexts
+
+                    // test to avoid to run twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
-                    $modulealreadyexecuted[$module]=$module;
+                    $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method for avoid to run twice
+
+                    // Clean class (an error may have been set into 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;
+                    $parameters['currentcontext'] = $context;
                     // Hooks that must return int (hooks with type 'addreplace')
                     if ($hooktype == 'addreplace')
                     {
+                    	dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
                     	if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
                     	{
                     		$error++;
                     		$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		// TODO dead code to remove (do not enable this, but fix hook instead)
-                    		/* Change must be inside the method of hook if required. Only hook must decide if $action must be modified or not.
-                    		if ($method == 'doActions')
-                    		{
-                    			if ($action=='add')    $action='create';
-                    			if ($action=='update') $action='edit';
-                    		}*/
+                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
                     	}
 
                     	if (is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
@@ -193,6 +196,7 @@ class HookManager
                     	// TODO. this should be done into the method of hook by returning nothing
                     	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
+                    	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$result = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
                     	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ee28ec6a495..7d2851f1b31 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Benoit Mortier        <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien Di Cintio   <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2006      Marc Barilley/Ocebo   <marc@ocebo.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
@@ -12,8 +12,9 @@
  * Copyright (C) 2010      Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2010-2014 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2011      Herve Prot            <herve.prot@symeos.com>
- * Copyright (C) 2012      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014 Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2013      Raphaël Doursenaud    <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2014      Alexandre Spangaro    <alexandre.spangaro@gmail.com>
  *
  * 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
@@ -124,11 +125,11 @@ class Form
      * @param	string	$typeofdata		Type of data ('string' by default, 'amount', 'email', 'numeric:99', 'text' or 'textarea:rows:cols', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...)
      * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value
      * @param	object	$extObject		External object
-     * @param	string	$success		Success message
+     * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
      * @param	string	$moreparam		More param to add on a href URL
      * @return  string					HTML edit field
      */
-    function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='string', $editvalue='', $extObject=null, $success=null, $moreparam='')
+    function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='string', $editvalue='', $extObject=null, $custommsg=null, $moreparam='')
     {
         global $conf,$langs,$db;
 
@@ -140,7 +141,7 @@ class Form
         // When option to edit inline is activated
         if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/',$typeofdata)) // TODO add jquery timepicker
         {
-            $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $success);
+            $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
         }
         else
         {
@@ -193,7 +194,7 @@ class Form
                 {
                 	$ret.='<td align="left">';
                 	$ret.='<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'">';
-                	$ret.='<br>'."\n";
+                	if (preg_match('/ckeditor|textarea/',$typeofdata)) $ret.='<br>'."\n";
                 	$ret.='<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
                 	$ret.='</td>';
                 }
@@ -244,10 +245,10 @@ class Form
      * @param	string	$inputType		Type of input ('numeric', 'datepicker', 'textarea:rows:cols', 'ckeditor:dolibarr_zzz:width:height:?:1:rows:cols', 'select:xxx')
      * @param	string	$editvalue		When in edit mode, use this value as $value instead of value
      * @param	object	$extObject		External object
-     * @param	string	$success		Success message
+     * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
      * @return	string   		      	HTML edit in place
      */
-    private function editInPlace($object, $value, $htmlname, $condition, $inputType='textarea', $editvalue=null, $extObject=null, $success=null)
+    private function editInPlace($object, $value, $htmlname, $condition, $inputType='textarea', $editvalue=null, $extObject=null, $custommsg=null)
     {
         global $conf;
 
@@ -334,7 +335,18 @@ class Form
             $out.= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";
             if (! empty($savemethod))	$out.= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";
             if (! empty($ext_element))	$out.= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";
-            if (! empty($success))		$out.= '<input id="success_'.$htmlname.'" value="'.$success.'" type="hidden"/>'."\n";
+            if (! empty($custommsg))
+            {
+            	if (is_array($custommsg))
+            	{
+            		if (!empty($custommsg['success']))
+            			$out.= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
+            		if (!empty($custommsg['error']))
+            			$out.= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
+            	}
+            	else
+            		$out.= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+            }
             if ($inputType == 'textarea') {
             	$out.= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
             	$out.= '<input id="textarea_'.$htmlname.'_cols" value="'.$cols.'" type="hidden"/>'."\n";
@@ -388,14 +400,26 @@ class Form
         else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
         $s="";
         if (empty($notabs))	$s.='<table class="nobordernopadding" summary=""><tr>';
-        if ($direction < 0)	$s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'</'.$tag.'>';
+        if ($direction < 0)	{
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') {
+                $s .= 'valign="top" ';
+            }
+            $s.= 'width="14">'.$img.'</'.$tag.'>';
+        }
         // 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)?'&nbsp;':'').$text.(($direction > 0)?'&nbsp;':'').'</'.$tag.'>';
         $paramfortooltiptd.= (($direction < 0)?' style="padding-left: 3px !important;"':'');
         $paramfortooltiptd.= (($direction > 0)?' style="padding-right: 3px !important;"':'');
         if ((string) $text != '')	$s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
-        if ($direction > 0)	$s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'</'.$tag.'>';
+        if ($direction > 0)	{
+            $s.='<'.$tag.$paramfortooltipimg;
+            if ($tag == 'td') {
+                $s .= 'valign="top" ';
+            }
+            $s.= 'width="14">'.$img.'</'.$tag.'>';
+        }
         if (empty($notabs))	$s.='</tr></table>';
 
         return $s;
@@ -449,19 +473,6 @@ class Form
         return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext);
     }
 
-    /**
-     *  Return combo list of activated countries, into language of user
-     *
-     *  @param	string	$selected       Id or Code or Label of preselected country
-     *  @param  string	$htmlname       Name of html select object
-     *  @param  string	$htmloption     Options html on select object
-     *  @return	void
-     */
-    function select_pays($selected='',$htmlname='country_id',$htmloption='')
-    {
-        print $this->select_country($selected,$htmlname,$htmloption);
-    }
-
     /**
      *  Return combo list of activated countries, into language of user
      *
@@ -479,18 +490,20 @@ class Form
 
         $out='';
         $countryArray=array();
+		$favorite=array();
         $label=array();
+		$atleastonefavorite=0;
 
-        $sql = "SELECT rowid, code as code_iso, libelle as label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+        $sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_country";
         $sql.= " WHERE active = 1";
         //$sql.= " ORDER BY code ASC";
 
-        dol_syslog(get_class($this)."::select_country sql=".$sql);
+        dol_syslog(get_class($this)."::select_country", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
-            $out.= '<select id="select'.$htmlname.'" class="flat selectpays" name="'.$htmlname.'" '.$htmloption.'>';
+            $out.= '<select id="select'.$htmlname.'" class="flat selectcountry" name="'.$htmlname.'" '.$htmloption.'>';
             $num = $this->db->num_rows($resql);
             $i = 0;
             if ($num)
@@ -502,17 +515,25 @@ class Form
                     $obj = $this->db->fetch_object($resql);
                     $countryArray[$i]['rowid'] 		= $obj->rowid;
                     $countryArray[$i]['code_iso'] 	= $obj->code_iso;
+                    $countryArray[$i]['code_iso3'] 	= $obj->code_iso3;
                     $countryArray[$i]['label']		= ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:''));
-                    $label[$i] = dol_string_unaccent($countryArray[$i]['label']);
+                    $countryArray[$i]['favorite']   = $obj->favorite;
+                    $favorite[$i]					= $obj->favorite;
+					$label[$i] = dol_string_unaccent($countryArray[$i]['label']);
                     $i++;
                 }
 
-                array_multisort($label, SORT_ASC, $countryArray);
+                array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
 
                 foreach ($countryArray as $row)
                 {
-                    //print 'rr'.$selected.'-'.$row['label'].'-'.$row['code_iso'].'<br>';
-                    if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['label']) )
+                	if ($row['favorite'] && $row['code_iso']) $atleastonefavorite++;
+					if (empty($row['favorite']) && $atleastonefavorite)
+					{
+						$atleastonefavorite=0;
+						$out.= '<option value="" disabled="disabled">----------------------</option>';
+					}
+                    if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) )
                     {
                         $foundselected=true;
                         $out.= '<option value="'.$row['rowid'].'" selected="selected">';
@@ -543,7 +564,7 @@ class Form
      *	@param  string	$selected       Preselected type
      *	@param  string	$htmlname       Name of field in html form
      * 	@param	int		$showempty		Add an empty field
-     * 	@param	int		$hidetext		Do not show label before combo box
+     * 	@param	int		$hidetext		Do not show label 'Type' before combo box (used only if there is at least 2 choices to select)
      * 	@param	string	$forceall		1=Force to show products and services in combo list, whatever are activated modules, 0=No force, -1=Force none (and set hidden field to 'service')
      *  @return	void
      */
@@ -575,15 +596,20 @@ class Form
             print '</select>';
             //if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
         }
-        if (! $forceall && empty($conf->product->enabled) && ! empty($conf->service->enabled))
+        if (empty($forceall) && empty($conf->product->enabled) && ! empty($conf->service->enabled))
         {
+        	print $langs->trans("Service");
             print '<input type="hidden" name="'.$htmlname.'" value="1">';
         }
-        if (! $forceall && ! empty($conf->product->enabled) && empty($conf->service->enabled))
+        if (empty($forceall) && ! empty($conf->product->enabled) && empty($conf->service->enabled))
         {
+        	print $langs->trans("Product");
             print '<input type="hidden" name="'.$htmlname.'" value="0">';
         }
-
+		if ($forceall < 0)	// This should happened only for contracts when both predefined product and service are disabled.
+		{
+            print '<input type="hidden" name="'.$htmlname.'" value="1">';	// By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1
+		}
     }
 
     /**
@@ -600,11 +626,11 @@ class Form
 
         if (count($this->cache_types_fees)) return 0;    // Cache already load
 
-        $sql = "SELECT c.code, c.libelle as label";
+        $sql = "SELECT c.code, c.label";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-        $sql.= " ORDER BY lower(c.libelle) ASC";
+        //$sql.= " ORDER BY c.label ASC";				  // No sort here, sort must be done after translation
 
-        dol_syslog(get_class($this).'::load_cache_types_fees sql='.$sql, LOG_DEBUG);
+        dol_syslog(get_class($this).'::load_cache_types_fees', LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -620,6 +646,9 @@ class Form
                 $this->cache_types_fees[$obj->code] = $label;
                 $i++;
             }
+
+			asort($this->cache_types_fees);
+
             return $num;
         }
         else
@@ -671,14 +700,14 @@ class Form
      *  Return HTML code to select a company.
      *
      *  @param		int			$selected				Preselected products
-     *  @param		string		$htmlname				Name of HTML seletc field (must be unique in page)
+     *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
      *  @param		int			$filter					Filter on thirdparty
      *  @param		int			$limit					Limit on number of returned lines
      *  @param		array		$ajaxoptions			Options for ajax_autocompleter
      * 	@param		int			$forcecombo				Force to use combo box
      *  @return		string								Return select box for thirdparty.
      */
-    function select_thirdparty($selected='', $htmlname='productid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
+    function select_thirdparty($selected='', $htmlname='socid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
     {
     	global $langs,$conf;
 
@@ -729,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
@@ -762,7 +791,7 @@ class Form
         $outarray=array();
 
         // On recherche les societes
-        $sql = "SELECT s.rowid, s.nom, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+        $sql = "SELECT s.rowid, s.nom as name, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
         $sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
         if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
         $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
@@ -795,19 +824,82 @@ class Form
         $sql.=$this->db->order("nom","ASC");
 		if ($limit > 0) $sql.=$this->db->plimit($limit);
 
-        dol_syslog(get_class($this)."::select_thirdparty_list sql=".$sql);
+        dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
-            if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
+            if (! empty($conf->use_javascript_ajax))
             {
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-            	$out.= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+            	if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
+	            {
+					include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+	            	$out.= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+	            }
+	            else
+				{
+					if (count($events))		// Add management of event
+					{
+						$out.='<script type="text/javascript">
+								$(document).ready(function() {
+									jQuery("#'.$htmlname.'").change(function () {
+										var obj = '.json_encode($events).';
+							   			$.each(obj, function(key,values) {
+						    				if (values.method.length) {
+						    					runJsCodeForEvent'.$htmlname.'(values);
+						    				}
+										});
+									});
+
+								function runJsCodeForEvent'.$htmlname.'(obj) {
+									var id = $("#'.$htmlname.'").val();
+									var method = obj.method;
+									var url = obj.url;
+									var htmlname = obj.htmlname;
+									var showempty = obj.showempty;
+						    		$.getJSON(url,
+											{
+												action: method,
+												id: id,
+												htmlname: htmlname,
+												showempty: showempty
+											},
+											function(response) {
+												$.each(obj.params, function(key,action) {
+													if (key.length) {
+														var num = response.num;
+														if (num > 0) {
+															$("#" + key).removeAttr(action);
+														} else {
+															$("#" + key).attr(action, action);
+														}
+													}
+												});
+												$("select#" + htmlname).html(response.value);
+												if (response.num) {
+													var selecthtml_str = response.value;
+													var selecthtml_dom=$.parseHTML(selecthtml_str);
+													$("#inputautocomplete"+htmlname).val(selecthtml_dom[0][0].innerHTML);
+												} else {
+													$("#inputautocomplete"+htmlname).val("");
+												}
+												$("select#" + htmlname).change();	/* Trigger event change */
+											});
+								}
+							})
+							</script>';
+					}
+	            }
             }
 
             // Construct $out and $outarray
             $out.= '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">'."\n";
-            if ($showempty) $out.= '<option value="-1"></option>'."\n";
+
+            $textifempty='';
+            // Do not use textempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
+            //$textifempty=' ';
+            //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+            if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n";
+
             $num = $this->db->num_rows($resql);
             $i = 0;
             if ($num)
@@ -823,11 +915,11 @@ class Form
                     	if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) {
                     		$label .= $obj->code_fournisseur. ' - ';
                     	}
-                    	$label.=' '.$obj->nom;
+                    	$label.=' '.$obj->name;
                     }
                     else
                     {
-                    	$label=$obj->nom;
+                    	$label=$obj->name;
                     }
 
                     if ($showtype)
@@ -889,7 +981,7 @@ class Form
         if ($filter) $sql.= " AND ".$filter;
         $sql.= " ORDER BY re.description ASC";
 
-        dol_syslog(get_class($this)."::select_remises sql=".$sql);
+        dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -983,19 +1075,15 @@ class Form
 
         // On recherche les societes
         $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
-        if ($showsoc > 0) {
-        	$sql.= " , s.nom as company";
-        }
+        if ($showsoc > 0) $sql.= " , s.nom as company";
         $sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
-        if ($showsoc > 0) {
-        	$sql.= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc ";
-        }
+        if ($showsoc > 0) $sql.= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc";
         $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
         if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid;
-        if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0 ";
+        if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0";
         $sql.= " ORDER BY sp.lastname ASC";
 
-        dol_syslog(get_class($this)."::select_contacts sql=".$sql);
+        dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -1003,6 +1091,7 @@ class Form
 
             if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $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);
             }
 
@@ -1109,24 +1198,43 @@ class Form
      *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
      *  @param  array	$exclude        Array list of users id to exclude
      * 	@param	int		$disabled		If select list must be disabled
-     *  @param  array	$include        Array list of users id to include
+     *  @param  array	$include        Array list of users id to include or 'hierarchy' to have only supervised users
      * 	@param	array	$enableonly		Array list of users id to be enabled. All other must be disabled
      *  @param	int		$force_entity	0 or Id of environment to force
      *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
      *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+     *  @param	string	$morefilter		Add more filters into sql request
      * 	@return	string					HTML select string
+     *  @see select_dolgroups
      */
-    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0)
+    function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='')
     {
         global $conf,$user,$langs;
 
         // If no preselected user defined, we take current user
         if ((is_numeric($selected) && ($selected < -1 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id;
 
+        $excludeUsers=null;
+        $includeUsers=null;
+
         // Permettre l'exclusion d'utilisateurs
         if (is_array($exclude))	$excludeUsers = implode("','",$exclude);
         // Permettre l'inclusion d'utilisateurs
         if (is_array($include))	$includeUsers = implode("','",$include);
+		else if ($include == 'hierarchy')
+		{
+			// Build list includeUsers to have only hierarchy
+			$userid=$user->id;
+			$include=array();
+			if (empty($user->users) || ! is_array($user->users)) $user->get_full_tree();
+			foreach($user->users as $key => $val)
+			{
+				if (preg_match('/_'.$userid.'/',$val['fullpath'])) $include[]=$val['id'];
+			}
+			$includeUsers = implode("','",$include);
+			//var_dump($includeUsers);exit;
+			//var_dump($user->users);exit;
+		}
 
         $out='';
 
@@ -1159,10 +1267,11 @@ class Form
         if (! empty($user->societe_id)) $sql.= " AND u.fk_societe = ".$user->societe_id;
         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($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut <> 0";
+        if (! empty($morefilter)) $sql.=" ".$morefilter;
         $sql.= " ORDER BY u.lastname ASC";
 
-        dol_syslog(get_class($this)."::select_dolusers sql=".$sql);
+        dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -1245,6 +1354,12 @@ class Form
                 $out.= '<option value="">'.$langs->trans("None").'</option>';
             }
             $out.= '</select>';
+
+       		if (! empty($conf->use_javascript_ajax) && ! $show_empty)	// ajaxcombo works only on list with no empty value because of &nbsp;
+			{
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				$out.= ajax_combobox($htmlname);
+			}
         }
         else
         {
@@ -1255,6 +1370,71 @@ class Form
     }
 
 
+    /**
+     *	Return select list of users. Selected users are stored into session.
+     *  List of users are provided into $_SESSION['assignedtouser'].
+     *
+     *  @param  string	$action         Value for $action
+     *  @param  string	$htmlname       Field name in form
+     *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
+     *  @param  array	$exclude        Array list of users id to exclude
+     * 	@param	int		$disabled		If select list must be disabled
+     *  @param  array	$include        Array list of users id to include or 'hierarchy' to have only supervised users
+     * 	@param	array	$enableonly		Array list of users id to be enabled. All other must be disabled
+     *  @param	int		$force_entity	0 or Id of environment to force
+     *  @param	int		$maxlength		Maximum length of string into list (0=no limit)
+     *  @param	int		$showstatus		0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+     *  @param	string	$morefilter		Add more filters into sql request
+     * 	@return	string					HTML select string
+     *  @see select_dolgroups
+     */
+    function select_dolusers_forevent($action='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='')
+    {
+        global $conf,$user,$langs;
+
+        $userstatic=new User($this->db);
+		$out='';
+
+        // Method with no ajax
+        //$out.='<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+        if ($action == 'view')
+        {
+			$out.='';
+        }
+		else
+		{
+			$out.='<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
+			$out.='<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
+			$out.=$this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
+			$out.='<input type="submit" class="button" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+		}
+		$assignedtouser=array();
+		if (!empty($_SESSION['assignedtouser']))
+		{
+			$assignedtouser=dol_json_decode($_SESSION['assignedtouser'], true);
+		}
+		$nbassignetouser=count($assignedtouser);
+
+		if ($nbassignetouser && $action != 'view') $out.='<br>';
+		$i=0; $ownerid=0;
+		foreach($assignedtouser as $key => $value)
+		{
+			if ($value['id'] == $ownerid) continue;
+			$userstatic->fetch($value['id']);
+			$out.=$userstatic->getNomUrl(1);
+			if ($i == 0) { $ownerid = $value['id']; $out.=' ('.$langs->trans("Owner").')'; }
+			if ($nbassignetouser > 1 && $action != 'view') $out.=' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';
+			//$out.=' '.($value['mandatory']?$langs->trans("Mandatory"):$langs->trans("Optional"));
+			//$out.=' '.($value['transparency']?$langs->trans("Busy"):$langs->trans("NotBusy"));
+			$out.='<br>';
+			$i++;
+		}
+
+		//$out.='</form>';
+        return $out;
+    }
+
+
     /**
      *  Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
      *
@@ -1412,7 +1592,7 @@ class Form
         $sql.= $db->plimit($limit);
 
         // Build output string
-        dol_syslog(get_class($this)."::select_produits_list search product sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
@@ -1435,7 +1615,7 @@ class Form
 					$sql.= " WHERE fk_product_price=".$objp->price_rowid;
 					$sql.= " ORDER BY quantity ASC";
 
-					dol_syslog(get_class($this)."::select_produits_list search price by qty sql=".$sql);
+					dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);
 					$result2 = $this->db->query($sql);
 					if ($result2)
 					{
@@ -1516,6 +1696,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','<strong>$1</strong>',$label,1);
@@ -1535,11 +1717,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','<strong>$1</strong>',$objRef,1);
-        $outval.=$objRef.' - '.dol_trunc($label,32).' - ';
+        $outval.=$objRef.' - '.dol_trunc($label,$maxlengtharticle).' - ';
 
         $found=0;
 
@@ -1554,7 +1736,7 @@ class Form
             $sql.= " ORDER BY date_price";
             $sql.= " DESC LIMIT 1";
 
-            dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.' sql='.$sql);
+            dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG);
             $result2 = $this->db->query($sql);
             if ($result2)
             {
@@ -1585,7 +1767,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;
@@ -1730,11 +1912,12 @@ class Form
      *	@param  string	$filterkey      Filtre des produits
      *  @param  int		$statut         -1=Return all products, 0=Products not on sell, 1=Products on sell
      *  @param  int		$outputmode     0=HTML select string, 1=Array
+     *  @param  int     $limit          Limit of line number
      *  @return array           		Array of keys for json
      */
-    function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0)
+    function select_produits_fournisseurs_list($socid,$selected='',$htmlname='productid',$filtertype='',$filtre='',$filterkey='',$statut=-1,$outputmode=0,$limit=100)
     {
-        global $langs,$conf;
+        global $langs,$conf,$db;
 
         $out='';
         $outarray=array();
@@ -1743,7 +1926,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";
+        $sql.= " 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;
@@ -1772,10 +1955,11 @@ class Form
         	$sql.=')';
         }
         $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
+        $sql.= $db->plimit($limit);
 
         // Build output string
 
-        dol_syslog(get_class($this)."::select_produits_fournisseurs_list sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
@@ -1855,8 +2039,8 @@ class Form
                     }
                     if (! $socid)
                     {
-                        $opt .= " - ".dol_trunc($objp->nom,8);
-                        $outval.=" - ".dol_trunc($objp->nom,8);
+                        $opt .= " - ".dol_trunc($objp->name,8);
+                        $outval.=" - ".dol_trunc($objp->name,8);
                     }
                 }
                 else
@@ -1911,7 +2095,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";
+        $sql.= " 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";
@@ -1921,7 +2105,7 @@ class Form
         $sql.= " AND p.rowid = ".$productid;
         $sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
 
-        dol_syslog(get_class($this)."::select_product_fourn_price sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);
         $result=$this->db->query($sql);
 
         if ($result)
@@ -1948,7 +2132,7 @@ class Form
                     if($num == 1) {
                         $opt .= ' selected="selected"';
                     }
-                    $opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - ';
+                    $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
 
                     if ($objp->quantity == 1)
                     {
@@ -2005,7 +2189,7 @@ class Form
         $sql .= " WHERE a.fk_soc = ".$socid;
         $sql .= " ORDER BY a.label ASC";
 
-        dol_syslog(get_class($this)."::select_address sql=".$sql);
+        dol_syslog(get_class($this)."::select_address", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -2055,7 +2239,7 @@ class Form
         $sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
         $sql.= " WHERE active=1";
         $sql.= " ORDER BY sortorder";
-        dol_syslog(get_class($this).'::load_cache_conditions_paiements sql='.$sql,LOG_DEBUG);
+        dol_syslog(get_class($this).'::load_cache_conditions_paiements', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2094,7 +2278,7 @@ class Form
         $sql.= " FROM ".MAIN_DB_PREFIX.'c_availability';
         $sql.= " WHERE active=1";
         $sql.= " ORDER BY rowid";
-        dol_syslog(get_class($this).'::load_cache_availability sql='.$sql,LOG_DEBUG);
+        dol_syslog(get_class($this).'::load_cache_availability', LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2167,7 +2351,7 @@ class Form
         $sql.= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
         $sql.= " WHERE active=1";
         $sql.= " ORDER BY rowid";
-        dol_syslog(get_class($this)."::loadCacheInputReason sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::loadCacheInputReason", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2248,7 +2432,7 @@ class Form
         $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
         $sql.= " WHERE active > 0";
         $sql.= " ORDER BY id";
-        dol_syslog(get_class($this)."::load_cache_types_paiements sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::load_cache_types_paiements", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2413,6 +2597,95 @@ class Form
         return $return;
     }
 
+    /**
+     *  Return a HTML select list of shipping mode
+     *
+     *  @param	string	$selected          Id shipping mode pre-selected
+     *  @param  string	$htmlname          Name of select zone
+     *  @param  string	$filtre            To filter list
+     *  @param  int		$useempty          1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+     *  @param  string	$moreattrib        To add more attribute on select
+     * 	@return	void
+     */
+    function selectShippingMethod($selected='',$htmlname='shipping_method_id',$filtre='',$useempty=0,$moreattrib='')
+    {
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+        $langs->load("deliveries");
+
+        $sql = "SELECT rowid, code, libelle";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";
+        $sql.= " WHERE active = 1";
+        if ($filtre) $sql.=" AND ".$filtre;
+        $sql.= " ORDER BY libelle ASC";
+
+        dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            if ($num) {
+                print '<select id="select'.$htmlname.'" class="flat selectshippingmethod" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+                if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
+                    print '<option value="-1">&nbsp;</option>';
+                }
+                while ($i < $num) {
+                    $obj = $this->db->fetch_object($result);
+                    if ($selected == $obj->rowid) {
+                        print '<option value="'.$obj->rowid.'" selected="selected">';
+                    } else {
+                        print '<option value="'.$obj->rowid.'">';
+                    }
+                    print $langs->trans("SendingMethod".strtoupper($obj->code));
+                    print '</option>';
+                    $i++;
+                }
+                print "</select>";
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            } else {
+                print $langs->trans("NoShippingMethodDefined");
+            }
+        } else {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     *    Display form to select shipping mode
+     *
+     *    @param	string	$page        Page
+     *    @param    int		$selected    Id of shipping mode
+     *    @param    string	$htmlname    Name of select html field
+     *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+     *    @return	void
+     */
+    function formSelectShippingMethod($page, $selected='', $htmlname='shipping_method_id', $addempty=0)
+    {
+        global $langs, $db;
+
+        $langs->load("deliveries");
+
+        if ($htmlname != "none") {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setshippingmethod">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            $this->selectShippingMethod($selected, $htmlname, '', $addempty);
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            print '</tr></table></form>';
+        } else {
+            if ($selected) {
+                $code=$langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');
+                print $langs->trans("SendingMethod".strtoupper($code));
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
     /**
      *  Return a HTML select list of bank accounts
      *
@@ -2437,7 +2710,7 @@ class Form
         if ($filtre) $sql.=" AND ".$filtre;
         $sql.= " ORDER BY label";
 
-        dol_syslog(get_class($this)."::select_comptes sql=".$sql);
+        dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -2479,6 +2752,40 @@ class Form
         }
     }
 
+    /**
+     *    Display form to select bank account
+     *
+     *    @param	string	$page        Page
+     *    @param    int		$selected    Id of bank account
+     *    @param    string	$htmlname    Name of select html field
+     *    @param    int		$addempty    1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+     *    @return	void
+     */
+    function formSelectAccount($page, $selected='', $htmlname='fk_account', $addempty=0)
+    {
+        global $langs;
+        if ($htmlname != "none") {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setbankaccount">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            $this->select_comptes($selected, $htmlname, 0, '', $addempty);
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            print '</tr></table></form>';
+        } else {
+            if ($selected) {
+                require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
+                $bankstatic=new Account($this->db);
+                $bankstatic->fetch($selected);
+                print $this->textwithpicto($bankstatic->label,$langs->trans("AccountCurrency").'&nbsp;'.$bankstatic->currency_code);
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
     /**
      *    Return list of categories having choosed type
      *
@@ -2488,6 +2795,7 @@ class Form
      *    @param    int		$maxlength      	Maximum length for labels
      *    @param    int		$excludeafterid 	Exclude all categories after this leaf in category tree.
      *    @return	void
+     *    @see select_categories
      */
     function select_all_categories($type, $selected='', $htmlname="parent", $maxlength=64, $excludeafterid=0)
     {
@@ -2611,8 +2919,8 @@ class Form
                     }
                     else if ($input['type'] == 'select')
                     {
-                        $more.='<tr><td valign="top" style="padding: 4px !important;">';
-                        if (! empty($input['label'])) $more.=$input['label'].'</td><td valign="top" colspan="2" align="left" style="padding: 4px !important;">';
+                        $more.='<tr><td valign="top">';
+                        if (! empty($input['label'])) $more.=$input['label'].'</td><td valign="top" colspan="2" align="left">';
                         $more.=$this->selectarray($input['name'],$input['values'],$input['default'],1);
                         $more.='</td></tr>'."\n";
                     }
@@ -2659,7 +2967,7 @@ class Form
 
 		// JQUI method dialog is broken with jmobile, we use standard HTML.
 		// Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx
-		// See page product/fiche.php for example
+		// See page product/card.php for example
         if (! empty($conf->dol_use_jmobile)) $useajax=0;
 		if (empty($conf->use_javascript_ajax)) $useajax=0;
 
@@ -2808,13 +3116,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;
 
@@ -2831,8 +3140,7 @@ class Form
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
             print '<tr><td>';
-            //print "$socid,$selected,$htmlname";
-            $formproject->select_projects($socid,$selected,$htmlname);
+            $formproject->select_projects($socid,$selected,$htmlname,20,0,1,$discard_closed);
             print '</td>';
             print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
             print '</tr></table></form>';
@@ -2843,7 +3151,7 @@ class Form
             {
                 $projet = new Project($this->db);
                 $projet->fetch($selected);
-                //print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$selected.'">'.$projet->title.'</a>';
+                //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
                 print $projet->getNomUrl(0,'',1);
             }
             else
@@ -2859,7 +3167,7 @@ class Form
      *  @param	int		$page        	Page
      *  @param  string	$selected    	Id condition pre-selectionne
      *  @param  string	$htmlname    	Name of select html field
-     *	@param	int		$addempty		Ajoute entree vide
+     *	@param	int		$addempty		Add empty entry
      *  @return	void
      */
     function form_conditions_reglement($page, $selected='', $htmlname='cond_reglement_id', $addempty=0)
@@ -3160,7 +3468,7 @@ class Form
      *    @param    string	$htmlname    	Nom du formulaire select
      *    @return	void
      */
-    function form_contacts($page, $societe, $selected='', $htmlname='contactidp')
+    function form_contacts($page, $societe, $selected='', $htmlname='contactid')
     {
         global $langs, $conf;
 
@@ -3176,7 +3484,7 @@ class Form
             {
             	$addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
                 print '<font class="error">Cette societe n\'a pas de contact, veuillez en cr�er un avant de faire votre proposition commerciale</font><br>';
-                print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';
+                print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';
             }
             print '</td>';
             print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
@@ -3272,7 +3580,7 @@ class Form
 
         if ($selected=='euro' || $selected=='euros') $selected='EUR';   // Pour compatibilite
 
-        $out.= '<select class="flat" name="'.$htmlname.'">';
+        $out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
         foreach ($langs->cache_currencies as $code_iso => $currency)
         {
         	if ($selected && $selected == $code_iso)
@@ -3307,10 +3615,10 @@ class Form
     	if ($num > 0) return $num;    // Cache deja charge
 
     	$sql  = "SELECT DISTINCT t.taux, t.recuperableonly";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-    	$sql.= " WHERE t.fk_pays = p.rowid";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+    	$sql.= " WHERE t.fk_pays = c.rowid";
     	$sql.= " AND t.active = 1";
-    	$sql.= " AND p.code IN (".$country_code.")";
+    	$sql.= " AND c.code IN (".$country_code.")";
     	$sql.= " ORDER BY t.taux ASC, t.recuperableonly ASC";
 
     	$resql=$this->db->query($sql);
@@ -3394,14 +3702,14 @@ class Form
         //exit;
 
         // Define list of countries to use to search VAT rates to show
-        // First we defined code_pays to use to find list
+        // First we defined code_country to use to find list
         if (is_object($societe_vendeuse))
         {
-            $code_pays="'".$societe_vendeuse->country_code."'";
+            $code_country="'".$societe_vendeuse->country_code."'";
         }
         else
        {
-            $code_pays="'".$mysoc->country_code."'";   // Pour compatibilite ascendente
+            $code_country="'".$mysoc->country_code."'";   // Pour compatibilite ascendente
         }
         if (! empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
         {
@@ -3412,12 +3720,12 @@ class Form
                 {
                     if ($type == 1) // We know product is a service
                     {
-                        $code_pays.=",'".$societe_acheteuse->country_code."'";
+                        $code_country.=",'".$societe_acheteuse->country_code."'";
                     }
                 }
                 else if (! $idprod)  // We don't know type of product
                 {
-                    $code_pays.=",'".$societe_acheteuse->country_code."'";
+                    $code_country.=",'".$societe_acheteuse->country_code."'";
                 }
                 else
                 {
@@ -3425,14 +3733,14 @@ class Form
                     $prodstatic->fetch($idprod);
                     if ($prodstatic->type == 1)   // We know product is a service
                     {
-                        $code_pays.=",'".$societe_acheteuse->country_code."'";
+                        $code_country.=",'".$societe_acheteuse->country_code."'";
                     }
                 }
             }
         }
 
         // Now we get list
-        $num = $this->load_cache_vatrates($code_pays);
+        $num = $this->load_cache_vatrates($code_country);
         if ($num > 0)
         {
         	// Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
@@ -3504,7 +3812,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"
@@ -3523,9 +3831,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
@@ -3547,8 +3859,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
         {
@@ -3610,7 +3925,7 @@ class Form
                 // Day
                 $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat" name="'.$prefix.'day">';
 
-                if ($empty || $set_time == -1)
+                if ($emptydate || $set_time == -1)
                 {
                     $retstring.='<option value="0" selected="selected">&nbsp;</option>';
                 }
@@ -3623,7 +3938,7 @@ class Form
                 $retstring.="</select>";
 
                 $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat" name="'.$prefix.'month">';
-                if ($empty || $set_time == -1)
+                if ($emptydate || $set_time == -1)
                 {
                     $retstring.='<option value="0" selected="selected">&nbsp;</option>';
                 }
@@ -3638,7 +3953,7 @@ class Form
                 $retstring.="</select>";
 
                 // Year
-                if ($empty || $set_time == -1)
+                if ($emptydate || $set_time == -1)
                 {
                     $retstring.='<input'.($disabled?' disabled="disabled"':'').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat" type="text" size="3" maxlength="4" name="'.$prefix.'year" value="'.$syear.'">';
                 }
@@ -3661,7 +3976,7 @@ class Form
         {
             // Show hour
             $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat '.($fullday?$fullday.'hour':'').'" name="'.$prefix.'hour">';
-            if ($empty) $retstring.='<option value="-1">&nbsp;</option>';
+            if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
             for ($hour = 0; $hour < 24; $hour++)
             {
                 if (strlen($hour) < 2) $hour = "0" . $hour;
@@ -3675,7 +3990,7 @@ class Form
         {
             // Show minutes
             $retstring.='<select'.($disabled?' disabled="disabled"':'').' class="flat '.($fullday?$fullday.'min':'').'" name="'.$prefix.'min">';
-            if ($empty) $retstring.='<option value="-1">&nbsp;</option>';
+            if ($emptyhours) $retstring.='<option value="-1">&nbsp;</option>';
             for ($min = 0; $min < 60 ; $min++)
             {
                 if (strlen($min) < 2) $min = "0" . $min;
@@ -3734,18 +4049,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';
@@ -3756,67 +4075,101 @@ class Form
 
         if ($typehour=='select')
         {
-	        print '<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').'>';
+	        $retstring.='<select class="flat" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').'>';
 	        for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
 	        {
-	            print '<option value="'.$hour.'"';
+	            $retstring.='<option value="'.$hour.'"';
 	            if ($hourSelected == $hour)
 	            {
-	                print " selected=\"true\"";
+	                $retstring.=" selected=\"true\"";
 	            }
-	            print ">".$hour."</option>";
+	            $retstring.=">".$hour."</option>";
 	        }
-	        print "</select>";
+	        $retstring.="</select>";
         }
         elseif ($typehour=='text')
         {
-        	print '<input type="text" size="3" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.((int) $hourSelected).'">';
+        	$retstring.='<input type="text" size="2" name="'.$prefix.'hour"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.($hourSelected?((int) $hourSelected):'').'">';
         }
-        print $langs->trans('Hours');
+        else return 'BadValueForParameterTypeHour';
 
-        if ($minunderhours) print '<br>';
-        else print "&nbsp;";
+        $retstring.=' '.$langs->trans('HourShort');
 
-        print '<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').'>';
-        for ($min = 0; $min <= 55; $min=$min+5)
+        if ($minunderhours) $retstring.='<br>';
+        else $retstring.="&nbsp;";
+
+        if ($typehour=='select')
         {
-            print '<option value="'.$min.'"';
-            if ($minSelected == $min) print ' selected="selected"';
-            print '>'.$min.'</option>';
+	        $retstring.='<select class="flat" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').'>';
+	        for ($min = 0; $min <= 55; $min=$min+5)
+	        {
+	            $retstring.='<option value="'.$min.'"';
+	            if ($minSelected == $min) $retstring.=' selected="selected"';
+	            $retstring.='>'.$min.'</option>';
+	        }
+	        $retstring.="</select>";
         }
-        print "</select>";
-        print $langs->trans('Minutes'). "&nbsp;";
+        elseif ($typehour=='text')
+        {
+        	$retstring.='<input type="text" size="2" name="'.$prefix.'min"'.($disabled?' disabled="disabled"':'').' class="flat" value="'.($minSelected?((int) $minSelected):'').'">';
+        }
+        $retstring.=' '.$langs->trans('MinuteShort');
+        $retstring.="&nbsp;";
+
+        if (! empty($nooutput)) return $retstring;
+
+        print $retstring;
+        return;
     }
 
 
     /**
      *	Return a HTML select string, built from an array of key+value.
+     *  Note: Do not use returned string into a langs->trans function, content may be entity encoded twice.
      *
      *	@param	string	$htmlname       Name of html select area
      *	@param	array	$array          Array with key+value
      *	@param	string	$id             Preselected key
-     *	@param	int		$show_empty     1 si il faut ajouter une valeur vide dans la liste, 0 sinon
+     *	@param	int		$show_empty     0 no empty value allowed, 1 to add an empty value into list (value is '' or '&nbsp;').
      *	@param	int		$key_in_label   1 pour afficher la key dans la valeur "[key] value"
      *	@param	int		$value_as_key   1 to use value as key
-     *	@param  string	$option         Valeur de l'option en fonction du type choisi
+     *	@param  string	$moreparam      Add more parameters onto the select tag
      *	@param  int		$translate		Translate and encode value
      * 	@param	int		$maxlen			Length maximum for labels
      * 	@param	int		$disabled		Html select box is disabled
-     *  @param	int		$sort			'ASC' or 'DESC' =Sort on label, '' or 'NONE'=Do not sort
+     *  @param	int		$sort			'ASC' or 'DESC' = Sort on label, '' or 'NONE' = Do not sort
      *  @param	string	$morecss		Add more class to css styles
-     * 	@return	string					HTML select string
+     * 	@return	string					HTML select string.
+     *  @see multiselectarray
      */
-    static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $option='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='')
+    static function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $moreparam='', $translate=0, $maxlen=0, $disabled=0, $sort='', $morecss='')
     {
-        global $langs;
+        global $conf, $langs;
 
         if ($value_as_key) $array=array_combine($array, $array);
 
-        $out='<select id="'.$htmlname.'" '.($disabled?'disabled="disabled" ':'').'class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" '.($option != ''?$option:'').'>';
+        $out='';
+
+        // Add code for jquery to use multiselect
+        if (empty($conf->dol_use_jmobile) && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))
+        {
+        	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+        	$out='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+        			<script type="text/javascript">
+        				$(document).ready(function () {
+        					$(\'#'.$htmlname.'\').'.$tmpplugin.'({
+        				});
+        			});
+        		   </script>';
+        }
+
+        $out.='<select id="'.$htmlname.'" '.($disabled?'disabled="disabled" ':'').'class="flat'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'" '.($moreparam?$moreparam:'').'>';
 
         if ($show_empty)
         {
-            $out.='<option value="-1"'.($id==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
+        	$textforempty=' ';
+        	if (! empty($conf->use_javascript_ajax)) $textforempty='&nbsp;';	// If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
+            $out.='<option value="-1"'.($id==-1?' selected="selected"':'').'>'.$textforempty.'</option>'."\n";
         }
 
         if (is_array($array))
@@ -3839,11 +4192,11 @@ class Form
 
                 if ($key_in_label)
                 {
-                    $selectOptionValue = dol_htmlentitiesbr($key.' - '.($maxlen?dol_trunc($value,$maxlen):$value));
+                    $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen?dol_trunc($value,$maxlen):$value));
                 }
                 else
                 {
-                    $selectOptionValue = dol_htmlentitiesbr($maxlen?dol_trunc($value,$maxlen):$value);
+                    $selectOptionValue = dol_escape_htmltag($maxlen?dol_trunc($value,$maxlen):$value);
                     if ($value == '' || $value == '-') $selectOptionValue='&nbsp;';
                 }
                 $out.=$selectOptionValue;
@@ -3860,54 +4213,41 @@ class Form
      *
      *	@param	string	$htmlname		Name of select
      *	@param	array	$array			Array with key+value
-     *	@param	array	$selected		Preselected keys
+     *	@param	array	$selected		Array with key+value preselected
      *	@param	int		$key_in_label   1 pour afficher la key dans la valeur "[key] value"
      *	@param	int		$value_as_key   1 to use value as key
      *	@param  string	$option         Valeur de l'option en fonction du type choisi
      *	@param  int		$translate		Translate and encode value
+     *  @param	int		$width			Force width of select box. May be used only when using jquery couch.
      *	@return	string					HTML multiselect string
+     *  @see selectarray
      */
-    function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $option='', $translate=0)
+    static function multiselectarray($htmlname, $array, $selected=array(), $key_in_label=0, $value_as_key=0, $option='', $translate=0, $width=0)
     {
     	global $conf, $langs;
 
-    	$out = '<select id="'.$htmlname.'" class="multiselect" multiple="multiple" name="'.$htmlname.'[]"'.$option.'>'."\n";
+    	// Add code for jquery to use multiselect
+    	if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
+    	{
+    		$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+   			print '<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+    			<script type="text/javascript">
+	    			$(document).ready(function () {
+    					$(\'#'.$htmlname.'\').'.$tmpplugin.'({
+    					});
+    				});
+    			</script>';
+    	}
+
+    	// Try also magic suggest
+
+    	// Add data-role="none" to diable jmobile decoration
+    	$out = '<select data-role="none" id="'.$htmlname.'" class="multiselect" multiple="multiple" name="'.$htmlname.'[]"'.$option.($width?' style="width: '.$width.'px"':'').'>'."\n";
     	if (is_array($array) && ! empty($array))
     	{
     		if ($value_as_key) $array=array_combine($array, $array);
 
-    		if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && is_array($selected) && ! empty($selected))
-    		{
-    			foreach ($selected as $selected_value)
-    			{
-    				foreach($array as $key => $value)
-    				{
-    					if ($selected_value == $key)
-    					{
-    						$value=$array[$selected_value];
-    						$out.= '<option value="'.$key.'" selected="selected">';
-    						$newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
-    						$newval = ($key_in_label ? $key.' - '.$newval : $newval);
-    						$out.= dol_htmlentitiesbr($newval);
-    						$out.= '</option>'."\n";
-    						unset($array[$key]);
-    					}
-    				}
-    			}
-
-    			if (! empty($array))
-    			{
-    				foreach ($array as $key => $value)
-    				{
-    					$out.= '<option value="'.$key.'">';
-    					$newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
-    					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
-    					$out.= dol_htmlentitiesbr($newval);
-    					$out.= '</option>'."\n";
-    				}
-    			}
-    		}
-    		else
+    		if (! empty($array))
     		{
     			foreach ($array as $key => $value)
     			{
@@ -3918,7 +4258,7 @@ class Form
     				}
     				$out.= '>';
 
-    				$newval = ($translate ? $langs->trans(ucfirst($value)) : $value);
+    				$newval = ($translate ? $langs->trans($value) : $value);
     				$newval = ($key_in_label ? $key.' - '.$newval : $newval);
     				$out.= dol_htmlentitiesbr($newval);
     				$out.= '</option>'."\n";
@@ -3934,18 +4274,18 @@ class Form
     /**
      *	Return an html string with a select combo box to choose yes or no
      *
-     *	@param	string	$htmlname		Name of html select field
-     *	@param	string	$value			Pre-selected value
-     *	@param	int		$option			0 return yes/no, 1 return 1/0
-     *	@param	bool	$disabled		true or false
-     *	@return	mixed					See option
+     *	@param	string		$htmlname		Name of html select field
+     *	@param	string		$value			Pre-selected value
+     *	@param	int			$option			0 return yes/no, 1 return 1/0
+     *	@param	bool		$disabled		true or false
+     *  @param	useempty	$useempty		1=Add empty line
+     *	@return	mixed						See option
      */
-    function selectyesno($htmlname,$value='',$option=0,$disabled=false)
+    function selectyesno($htmlname,$value='',$option=0,$disabled=false,$useempty='')
     {
         global $langs;
 
         $yes="yes"; $no="no";
-
         if ($option)
         {
             $yes="1";
@@ -3955,15 +4295,17 @@ class Form
         $disabled = ($disabled ? ' disabled="disabled"' : '');
 
         $resultyesno = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
+        if ($useempty) $resultyesno .= '<option value="-1"'.(($value < 0)?' selected="selected"':'').'></option>'."\n";
         if (("$value" == 'yes') || ($value == 1))
         {
             $resultyesno .= '<option value="'.$yes.'" selected="selected">'.$langs->trans("Yes").'</option>'."\n";
             $resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
         }
         else
-        {
+       {
+       		$selected=($useempty?'':' selected="selected"');
             $resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
-            $resultyesno .= '<option value="'.$no.'" selected="selected">'.$langs->trans("No").'</option>'."\n";
+            $resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
         }
         $resultyesno .= '</select>'."\n";
         return $resultyesno;
@@ -4033,7 +4375,7 @@ class Form
      *    @param   string	$morehtmlref  	Code html supplementaire a afficher apres ref
      *    @param   string	$moreparam  	More param to add in nav link url.
      *	  @param	int		$nodbprefix		Do not include DB prefix to forge table name
-     * 	  @return  tring    				Portion HTML avec ref + boutons nav
+     * 	  @return  string    				Portion HTML avec ref + boutons nav
      */
     function showrefnav($object,$paramid,$morehtml='',$shownav=1,$fieldid='rowid',$fieldref='ref',$morehtmlref='',$moreparam='',$nodbprefix=0)
     {
@@ -4054,7 +4396,7 @@ class Form
             $ret.='<table class="nobordernopadding" width="100%"><tr class="nobordernopadding"><td class="nobordernopadding">';
         }
 
-        $ret.=$object->$fieldref;
+        $ret.=dol_htmlentities($object->$fieldref);
         if ($morehtmlref)
         {
             $ret.=' '.$morehtmlref;
@@ -4172,7 +4514,7 @@ class Form
                 {
                     global $dolibarr_main_url_root;
                     $ret.='<!-- Put link to gravatar -->';
-                    $ret.='<img alt="Photo found on Gravatar" title="Photo Gravatar.com - email '.$email.'" border="0" width="'.$width.'" src="http://www.gravatar.com/avatar/'.dol_hash($email).'?s='.$width.'&d='.urlencode(dol_buildpath('/theme/common/nophoto.jpg',2)).'">';
+                    $ret.='<img alt="Photo found on Gravatar" title="Photo Gravatar.com - email '.$email.'" border="0" width="'.$width.'" src="http://www.gravatar.com/avatar/'.dol_hash($email,3).'?s='.$width.'&d='.urlencode(dol_buildpath('/theme/common/nophoto.jpg',2)).'">';	// gravatar need md5 hash
                 }
                 else
                 {
@@ -4197,6 +4539,7 @@ class Form
      * 	@param	int		$enableonly		Array list of groups id to be enabled. All other must be disabled
      * 	@param	int		$force_entity	0 or Id of environment to force
      *  @return	void
+     *  @see select_dolusers
      */
     function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0)
     {
@@ -4210,7 +4553,7 @@ class Form
         $out='';
 
         // On recherche les groupes
-        $sql = "SELECT ug.rowid, ug.nom ";
+        $sql = "SELECT ug.rowid, ug.nom as name";
         if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
         {
             $sql.= ", e.label";
@@ -4230,7 +4573,7 @@ class Form
         if (is_array($include) && $includeGroups) $sql.= " AND ug.rowid IN ('".$includeGroups."')";
         $sql.= " ORDER BY ug.nom ASC";
 
-        dol_syslog(get_class($this)."::select_dolgroups sql=".$sql);
+        dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -4238,7 +4581,7 @@ class Form
             $i = 0;
             if ($num)
             {
-                $out.= '<select class="flat" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').'>';
+                $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').'>';
                 if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
 
                 while ($i < $num)
@@ -4255,7 +4598,7 @@ class Form
                     }
                     $out.= '>';
 
-                    $out.= $obj->nom;
+                    $out.= $obj->name;
                     if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
                     {
                         $out.= " (".$obj->label.")";
@@ -4267,10 +4610,17 @@ class Form
             }
             else
             {
-                $out.= '<select class="flat" name="'.$htmlname.'" disabled="disabled">';
-                $out.= '<option value="">'.$langs->trans("None").'</option>';
+                $out.= '<select class="flat" name="'.$htmlname.'"'.($show_empty?'':' disabled="disabled"').'>';
+                if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'></option>'."\n";
+                $out.= '<option value="" disabled="disabled">'.$langs->trans("NoUserGroupDefined").'</option>';
             }
             $out.= '</select>';
+
+            if (! empty($conf->use_javascript_ajax) && ! $show_empty)	// ajax combo works only when no empty value
+			{
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				$out.= ajax_combobox($htmlname);
+			}
         }
         else
         {
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 522b2c30662..333969fc3b3 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -48,13 +48,15 @@ class FormActions
     /**
      *  Show list of action status
      *
-     * 	@param	string	$formname	Name of form where select in included
-     * 	@param	string	$selected	Preselected value (-1..100)
-     * 	@param	int		$canedit	1=can edit, 0=read only
-     *  @param  string	$htmlname   Name of html prefix for html fields (selectX and valX)
+     * 	@param	string	$formname		Name of form where select is included
+     * 	@param	string	$selected		Preselected value (-1..100)
+     * 	@param	int		$canedit		1=can edit, 0=read only
+     *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)
+     *  @param	string	$showempty		Show an empty line if select is used
+     *  @param	string	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)
      * 	@return	void
      */
-    function form_select_status_action($formname,$selected,$canedit=1,$htmlname='complete')
+    function form_select_status_action($formname,$selected,$canedit=1,$htmlname='complete',$showempty=0,$onlyselect=0)
     {
         global $langs,$conf;
 
@@ -64,6 +66,7 @@ class FormActions
             '50' => $langs->trans("ActionRunningShort"),
             '100' => $langs->trans("ActionDoneShort")
         );
+		// +ActionUncomplete
 
         if (! empty($conf->use_javascript_ajax))
         {
@@ -112,18 +115,32 @@ class FormActions
                     }
                 }
                 </script>\n";
-            print '<select '.($canedit?'':'disabled="disabled" ').'name="status" id="select'.$htmlname.'" class="flat">';
+        }
+        if (! empty($conf->use_javascript_ajax) || $onlyselect)
+        {
+        	//var_dump($selected);
+        	if ($selected == 'done') $selected='100';
+            print '<select '.($canedit?'':'disabled="disabled" ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat">';
+            if ($showempty) print '<option value=""'.($selected == ''?' selected="selected"':'').'></option>';
             foreach($listofstatus as $key => $val)
             {
-                print '<option value="'.$key.'"'.(($selected == $key) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected="selected"' : '').'>'.$val.'</option>';
+                print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected="selected"' : '').'>'.$val.'</option>';
+                if ($key == '50' && $onlyselect == 2)
+                {
+                	print '<option value="todo"'.($selected == 'todo' ? ' selected="selected"' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionRunningNotStarted")."+".$langs->trans("ActionRunningShort").')</option>';
+                }
             }
             print '</select>';
             if ($selected == 0 || $selected == 100) $canedit=0;
-            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled="disabled"').'>';
-            print '<span class="hideifna">%</span>';
+
+            if (empty($onlyselect))
+            {
+	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled="disabled"').'>';
+    	        print '<span class="hideifna">%</span>';
+            }
         }
         else
-        {
+		{
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled="disabled"').'>%';
         }
     }
@@ -170,6 +187,7 @@ class FormActions
         	print '<th class="liste_titre">'.$langs->trans('Action').'</th>';
         	print '<th class="liste_titre">'.$langs->trans('Date').'</th>';
         	print '<th class="liste_titre">'.$langs->trans('By').'</th>';
+        	print '<th class="liste_titre" align="right">'.$langs->trans('Status').'</th>';
         	print '</tr>';
         	print "\n";
 
@@ -187,7 +205,15 @@ class FormActions
         		print '<tr '.$bc[$var].'>';
 				print '<td>'.$ref.'</td>';
         		print '<td>'.$label.'</td>';
-        		print '<td>'.dol_print_date($action->datep,'day').'</td>';
+        		print '<td>'.dol_print_date($action->datep,'dayhour');
+        		if ($action->datef)
+        		{
+	        		$tmpa=dol_getdate($action->datep);
+	        		$tmpb=dol_getdate($action->datef);
+	        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) print '-'.dol_print_date($action->datef,'hour');
+	        		else print '-'.dol_print_date($action->datef,'dayhour');
+        		}
+        		print '</td>';
         		print '<td>';
         		if (! empty($action->author->id))
         		{
@@ -197,6 +223,12 @@ class FormActions
         			print $userstatic->getNomUrl(1);
         		}
         		print '</td>';
+        		print '<td align="right">';
+        		if (! empty($action->author->id))
+        		{
+        			print $action->getLibStatut(3);
+        		}
+        		print '</td>';
         		print '</tr>';
         	}
         	print '</table>';
@@ -209,18 +241,19 @@ class FormActions
     /**
      *  Output list of type of event
      *
-     *  @param	string		$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'
+     *  @param	string		$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx')
      *  @param  string		$htmlname       Nom champ formulaire
      *  @param	string		$excludetype	Type to exclude
      *  @param	string		$onlyautoornot	Group list by auto events or not: We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
+     *  @param	int			$hideinfohelp	1=Do not show info help
      * 	@return	void
      */
-    function select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0)
+    function select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0, $hideinfohelp=0)
     {
-        global $langs,$user,$form;
+        global $langs,$user,$form,$conf;
 
         if (! is_object($form)) $form=new Form($db);
-        
+
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
         $caction=new CActionComm($this->db);
@@ -233,8 +266,10 @@ class FormActions
        	if ($selected == 'manual') $selected='AC_OTH';
        	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
 
+       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+
         print $form->selectarray($htmlname, $arraylist, $selected);
-        if ($user->admin && empty($onlyautoornot)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        if ($user->admin && empty($onlyautoornot) && empty($hideinfohelp)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
     }
 
 }
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index f7a6154706f..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.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').'>';
 		if ($showempty)
 		{
 			$out.= '<option value=""';
@@ -180,7 +181,7 @@ class FormAdmin
 			$newprefix=$tab[0];
 			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
 			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
-			if (! empty($conf->browser->firefox) && $newprefix != $oldprefix)	// Add separators
+			if ($newprefix != $oldprefix)	// Add separators
 			{
 				// Affiche titre
 				print '<option value="-1" disabled="disabled">';
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index a22f0b38c10..e45fffff759 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Juanjo Menent		<jmenent@2byte.es>
  *
  * 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
@@ -56,16 +57,16 @@ class FormCompany
 	 */
 	function typent_array($mode=0, $filter='')
 	{
-		global $langs;
+		global $langs,$mysoc;
 
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_typent";
-		$sql.= " WHERE active = 1";
+		$sql.= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id)?'0':$mysoc->country_id).")";
 		if ($filter) $sql.=" ".$filter;
 		$sql.= " ORDER by id";
-		dol_syslog(get_class($this).'::typent_array sql='.$sql,LOG_DEBUG);
+		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -104,7 +105,7 @@ class FormCompany
 		$sql.= " WHERE active = 1";
 		if ($filter) $sql.=" ".$filter;
 		$sql .= " ORDER BY id ASC";
-		dol_syslog(get_class($this).'::effectif_array sql='.$sql,LOG_DEBUG);
+		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -221,15 +222,15 @@ class FormCompany
 		$out='';
 
 		// On recherche les departements/cantons/province active d'une region et pays actif
-		$sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, p.libelle as country, p.code as country_code FROM";
-		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_pays as p";
-		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=p.rowid";
-		$sql .= " AND d.active = 1 AND r.active = 1 AND p.active = 1";
-		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND p.rowid = '".$country_codeid."'";
-		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND p.code = '".$country_codeid."'";
-		$sql .= " ORDER BY p.code, d.code_departement";
+		$sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code FROM";
+		$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
+		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
+		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$country_codeid."'";
+		if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND c.code = '".$country_codeid."'";
+		$sql .= " ORDER BY c.code, d.code_departement";
 
-		dol_syslog(get_class($this)."::select_departement sql=".$sql);
+		dol_syslog(get_class($this)."::select_departement", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -269,7 +270,7 @@ class FormCompany
 							$out.= '<option value="'.$obj->rowid.'">';
 						}
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-						$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:''));
+						$out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
 						$out.= '</option>';
 					}
 					$i++;
@@ -291,7 +292,7 @@ class FormCompany
 	 *   Retourne la liste deroulante des regions actives dont le pays est actif
 	 *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
 	 *   un code donnee mais dans ce cas, le champ pays et lang differe).
-	 *   Ainsi les liens avec les regions se font sur une region independemment de son nom.
+	 *   Ainsi les liens avec les regions se font sur une region independemment de son name.
 	 *
 	 *   @param		string		$selected		Preselected value
 	 *   @param		string		$htmlname		Name of HTML select field
@@ -302,11 +303,12 @@ class FormCompany
 		global $conf,$langs;
 		$langs->load("dict");
 
-		$sql = "SELECT r.rowid, r.code_region as code, r.nom as libelle, r.active, p.code as country_code, p.libelle as country FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p";
-		$sql.= " WHERE r.fk_pays=p.rowid AND r.active = 1 and p.active = 1";
-		$sql.= " ORDER BY p.code, p.libelle ASC";
+		$sql = "SELECT r.rowid, r.code_region as code, r.nom as label, r.active, c.code as country_code, c.label as country";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c";
+		$sql.= " WHERE r.fk_pays=c.rowid AND r.active = 1 and c.active = 1";
+		$sql.= " ORDER BY c.code, c.label ASC";
 
-		dol_syslog(get_class($this)."::select_region sql=".$sql);
+		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -334,11 +336,11 @@ class FormCompany
 
 						if ($selected > 0 && $selected == $obj->code)
 						{
-							print '<option value="'.$obj->code.'" selected="selected">'.$obj->libelle.'</option>';
+							print '<option value="'.$obj->code.'" selected="selected">'.$obj->label.'</option>';
 						}
 						else
 						{
-							print '<option value="'.$obj->code.'">'.$obj->libelle.'</option>';
+							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
 					}
 					$i++;
@@ -366,14 +368,14 @@ class FormCompany
 
 		$out='';
 
-		$sql = "SELECT rowid, code, civilite as civility_label, active FROM ".MAIN_DB_PREFIX."c_civilite";
+		$sql = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_civility";
 		$sql.= " WHERE active = 1";
 
-		dol_syslog("Form::select_civility sql=".$sql);
+		dol_syslog("Form::select_civility", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
-			$out.= '<select class="flat" name="'.$htmlname.'">';
+			$out.= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
 			$out.= '<option value="">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -391,7 +393,7 @@ class FormCompany
 						$out.= '<option value="'.$obj->code.'">';
 					}
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-					$out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civility_label!='-'?$obj->civility_label:''));
+					$out.= ($langs->trans("Civility".$obj->code)!="Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label!='-'?$obj->label:''));
 					$out.= '</option>';
 					$i++;
 				}
@@ -439,20 +441,20 @@ class FormCompany
 		$out='';
 
 		// On recherche les formes juridiques actives des pays actifs
-		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, p.libelle as country, p.code as country_code";
-		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_pays as p";
-		$sql .= " WHERE f.fk_pays=p.rowid";
-		$sql .= " AND f.active = 1 AND p.active = 1";
-		if ($country_codeid) $sql .= " AND p.code = '".$country_codeid."'";
+		$sql  = "SELECT f.rowid, f.code as code , f.libelle as label, f.active, c.label as country, c.code as country_code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE f.fk_pays=c.rowid";
+		$sql .= " AND f.active = 1 AND c.active = 1";
+		if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";
 		if ($filter) $sql .= " ".$filter;
-		$sql .= " ORDER BY p.code";
+		$sql .= " ORDER BY c.code";
 
-		dol_syslog(get_class($this)."::select_juridicalstatus sql=".$sql);
+		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
 			$out.= '<div id="particulier2" class="visible">';
-			$out.= '<select class="flat" name="forme_juridique_code">';
+			$out.= '<select class="flat" name="forme_juridique_code" id="legal_form">';
 			if ($country_codeid) $out.= '<option value="0">&nbsp;</option>';
 
 			$num = $this->db->num_rows($resql);
@@ -518,7 +520,7 @@ class FormCompany
 	 *  @param  string		$htmlname       Name of HTML form
 	 * 	@param	array		$limitto		Disable answers that are not id in this array list
 	 *  @param	int			$forceid		This is to force another object id than object->id
-     *  @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			More js events option. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
      *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
 	 * 	@return int 						The selected third party ID
 	 */
@@ -527,25 +529,25 @@ class FormCompany
 		global $conf, $langs;
 
 		// On recherche les societes
-		$sql = "SELECT s.rowid, s.nom FROM";
+		$sql = "SELECT s.rowid, s.nom as name FROM";
 		$sql.= " ".MAIN_DB_PREFIX."societe as s";
 		$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
-		if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND rowid = ".$selected;
+		if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND s.rowid = ".$selected;
 		else
 		{
 			// For ajax search we limit here. For combo list, we limit later
 			if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT
 			&& is_array($limitto) && count($limitto))
 			{
-				$sql.= " AND rowid IN (".join(',',$limitto).")";
+				$sql.= " AND s.rowid IN (".join(',',$limitto).")";
 			}
 		}
-		$sql.= " ORDER BY nom ASC";
+		$sql.= " ORDER BY s.nom ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			if ($conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
+			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
 			{
 				// Use Ajax search
 				$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
@@ -571,13 +573,13 @@ class FormCompany
 								var obj = '.json_encode($events).';
 				    			$.each(obj, function(key,values) {
 				    				if (values.method.length) {
-				    					getMethod'.$htmlname.'(values);
+				    					runJsCodeForEvent'.$htmlname.'(values);
 				    				}
 								});
                 			});
 
 							// Function used to execute events when search_htmlname change
-							function getMethod'.$htmlname.'(obj) {
+							function runJsCodeForEvent'.$htmlname.'(obj) {
 								var id = $("#'.$htmlname.'").val();
 								var method = obj.method;
 								var url = obj.url;
@@ -610,21 +612,21 @@ class FormCompany
                 }
 
 				print "\n".'<!-- Input text for third party with Ajax.Autocompleter (selectCompaniesForNewContact) -->'."\n";
-				print '<table class="nobordernopadding"><tr class="nobordernopadding">';
-				print '<td class="nobordernopadding">';
+				//print '<table class="nobordernopadding"><tr class="nobordernopadding">';
+				//print '<td class="nobordernopadding">';
 				if ($obj->rowid == 0)
 				{
 					print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="" '.$htmloption.' />';
 				}
 				else
 				{
-					print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$obj->nom.'" '.$htmloption.' />';
+					print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$obj->name.'" '.$htmloption.' />';
 				}
 				print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php','',$minLength);
-				print '</td>';
-				print '</tr>';
-				print '</table>';
-				print "\n";
+				//print '</td>';
+				//print '</tr>';
+				//print '</table>';
+				//print "\n";
 				return $socid;
 			}
 			else
@@ -651,14 +653,14 @@ class FormCompany
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled="disabled"';
-							print ' selected="selected">'.dol_trunc($obj->nom,24).'</option>';
+							print ' selected="selected">'.dol_trunc($obj->name,24).'</option>';
 							$firstCompany = $obj->rowid;
 						}
 						else
 						{
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled="disabled"';
-							print '>'.dol_trunc($obj->nom,24).'</option>';
+							print '>'.dol_trunc($obj->name,24).'</option>';
 						}
 						$i ++;
 					}
@@ -680,22 +682,21 @@ class FormCompany
      *  @param  string		$selected       Default selected value
      *  @param  string		$htmlname		HTML select name
      *  @param  string		$source			Source ('internal' or 'external')
-     *  @param  string		$order			Sort criteria
+     *  @param  string		$sortorder		Sort criteria
      *  @param  int			$showempty      1=Add en empty line
      *  @return	void
      */
-	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $order='code', $showempty=0)
+	function selectTypeContact($object, $selected, $htmlname = 'type', $source='internal', $sortorder='code', $showempty=0)
 	{
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
-			$lesTypes = $object->liste_type_contact($source, $order, 0, 1);
+			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
 			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
 			if ($showempty) print '<option value="0"></option>';
 			foreach($lesTypes as $key=>$value)
 			{
 				print '<option value="'.$key.'"';
-				if ($key == $selected)
-					print ' selected';
+				if ($key == $selected) print ' selected';
 				print '>'.$value.'</option>';
 			}
 			print "</select>\n";
@@ -771,10 +772,51 @@ class FormCompany
         $maxlength=$formlength;
         if (empty($formlength)) { $formlength=24; $maxlength=128; }
 
-        $out = '<input type="text" name="'.$htmlname.'" size="'.($formlength+1).'" maxlength="'.$maxlength.'" value="'.$selected.'">';
+        $out = '<input type="text" name="'.$htmlname.'" id="'.$htmlname.'" size="'.($formlength+1).'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 
         return $out;
     }
 
+    /**
+     * Return a HTML select with localtax values for thirdparties
+     *
+     * @param 	int 		$local			LocalTax
+     * @param 	int 		$selected		Preselected value
+     * @param 	string      $htmlname		HTML select name
+     * @return	void
+     */
+    function select_localtax($local, $selected, $htmlname)
+    {
+    	$tax=get_localtax_by_third($local);
+
+    	$num = $this->db->num_rows($tax);
+    	$i = 0;
+    	if ($num)
+    	{
+    		$valors=explode(":", $tax);
+
+    		if (count($valors) > 1)
+    		{
+    			//montar select
+    			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+    			while ($i <= (count($valors))-1)
+    			{
+    				if ($selected == $valors[$i])
+    				{
+    					print '<option value="'.$valors[$i].'" selected="selected">';
+    				}
+    				else
+    				{
+    					print '<option value="'.$valors[$i].'">';
+    				}
+    				print $valors[$i];
+    				print '</option>';
+    				$i++;
+    			}
+    			print'</select>';
+    		}
+    	}
+    }
+
 }
 
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index cfc5be29b92..0eb2d4d4b26 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -65,9 +65,9 @@ class FormContract
 		$sql.= " WHERE c.entity = ".$conf->entity;
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
 		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
-		else $sql.= " AND c.fk_soc = ".$socid;
+		if ($socid > 0)  $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
 
-		dol_syslog(get_class($this)."::select_contract sql=".$sql);
+		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
 		$resql=$db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1cdf6fd194e..34f6418de34 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -73,12 +73,12 @@ class FormFile
         global $conf,$langs, $hookmanager;
         $hookmanager->initHooks(array('formfile'));
 
-        if (! empty($conf->browser->phone)) return 0;
+        if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') return 0;
 
 		if ((! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax==2))
         {
-        	// TODO: Cheeck this works with 2 forms on same page
-        	// TODO: Cheeck this works with GED module, otherwise, force useajax to 0
+        	// TODO: Check this works with 2 forms on same page
+        	// TODO: Check this works with GED module, otherwise, force useajax to 0
         	// TODO: This does not support option savingdocmask
         	// TODO: This break feature to upload links too
         	return $this->_formAjaxFileUpload($object);
@@ -133,9 +133,10 @@ class FormFile
                 if ($perm)
                 {
                 	$langs->load('other');
-                    $out .= ' ('.$langs->trans("MaxSize").': '.$max.' '.$langs->trans("Kb");
-                    $out .= ' '.info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
-                    $out .= ')';
+                    //$out .= ' ('.$langs->trans("MaxSize").': '.$max.' '.$langs->trans("Kb");
+                    $out .= ' ';
+                    $out.=info_admin($langs->trans("ThisLimitIsDefinedInSetup",$max,$maxphp),1);
+                    //$out .= ')';
                 }
             }
             else
@@ -270,7 +271,13 @@ class FormFile
         if (! empty($iconPDF)) {
         	return $this->getDocumentsLink($modulepart, $modulesubdir, $filedir);
         }
-        $printer = (!empty($user->rights->printipp->read) && !empty($conf->printipp->enabled))?true:false;
+
+        $printer=0;
+        if (in_array($modulepart,array('facture','propal','proposal','order','commande')))	// This feature is implemented only for such elements
+        {
+        	$printer = (!empty($user->rights->printipp->read) && !empty($conf->printipp->enabled))?true:false;
+        }
+
         $hookmanager->initHooks(array('formfile'));
         $forname='builddoc';
         $out='';
@@ -300,6 +307,10 @@ class FormFile
                     include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
                     $modellist=ModeleThirdPartyDoc::liste_modeles($this->db);
                 }
+            }
+        	else if ($modulepart == 'agenda')
+            {
+               null;
             }
             else if ($modulepart == 'propal')
             {
@@ -355,6 +366,15 @@ class FormFile
                     $modellist=ModelePDFFactures::liste_modeles($this->db);
                 }
             }
+            elseif ($modulepart == 'contract')
+            {
+            	if (is_array($genallowed)) $modellist=$genallowed;
+            	else
+            	{
+            		include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+            		$modellist=ModelePDFContract::liste_modeles($this->db);
+            	}
+            }
             elseif ($modulepart == 'project')
             {
                 if (is_array($genallowed)) $modellist=$genallowed;
@@ -465,14 +485,14 @@ class FormFile
             // Model
             if (! empty($modellist))
             {
-                $out.= '<th align="center" class="formdoc liste_titre">';
+                $out.= '<th align="center" class="formdoc liste_titre maxwidthonsmartphone">';
                 $out.= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
                 if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
                 {
                     $arraykeys=array_keys($modellist);
                     $modelselected=$arraykeys[0];
                 }
-                $out.= $form->selectarray('model',$modellist,$modelselected,$showempty,0,0);
+                $out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', '');
                 $out.= '</th>';
             }
             else
@@ -483,7 +503,7 @@ class FormFile
             }
 
             // Language code (if multilang)
-            $out.= '<th align="center" class="formdoc liste_titre">';
+            $out.= '<th align="center" class="formdoc liste_titre maxwidthonsmartphone">';
             if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang && (! empty($modellist) || $showempty))
             {
                 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@@ -499,7 +519,7 @@ class FormFile
 
             // Button
             $addcolumforpicto=($delallowed || $printer || $morepicto);
-            $out.= '<th align="center" colspan="'.($addcolumforpicto?'2':'1').'" class="formdocbutton liste_titre">';
+            $out.= '<th align="center" colspan="'.($addcolumforpicto?'2':'1').'" class="formdocbutton liste_titre maxwidthonsmartphone">';
             $genbutton = '<input class="button" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
             $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
             if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled="disabled"';
@@ -620,7 +640,7 @@ class FormFile
 
 			 	if (count($file_list) == 0 && $headershown)
 	            {
-    	        	$out.='<tr><td colspan="3">'.$langs->trans("None").'</td></tr>';
+    	        	$out.='<tr '.$bc[0].'><td colspan="3">'.$langs->trans("None").'</td></tr>';
         	    }
 
                 $this->numoffiles++;
@@ -835,7 +855,7 @@ class FormFile
 			}
 			if ($nboffiles == 0)
 			{
-				print '<tr '.$bc[$var].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
+				print '<tr '.$bc[false].'><td colspan="'.(empty($useinecm)?'5':'4').'">';
 				if (empty($textifempty)) print $langs->trans("NoFileFound");
 				else print $textifempty;
 				print '</td></tr>';
@@ -936,6 +956,16 @@ class FormFile
         	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
         	$object_instance=new Project($this->db);
         }
+        else if ($modulepart == 'fichinter')
+        {
+        	include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+        	$object_instance=new Fichinter($this->db);
+        }
+        else if ($modulepart == 'user')
+        {
+        	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+        	$object_instance=new User($this->db);
+        }
 
         $var=true;
         foreach($filearray as $key => $file)
@@ -962,10 +992,11 @@ class FormFile
                 if ($modulepart == 'contract')         { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
                 if ($modulepart == 'product')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:''); }
                 if ($modulepart == 'tax')              { preg_match('/(\d+)\/[^\/]+$/',$relativefile,$reg); $id=(isset($reg[1])?$reg[1]:''); }
-                if ($modulepart == 'project')            { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'project')          { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'fichinter')        { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $ref=(isset($reg[1])?$reg[1]:'');}
+                if ($modulepart == 'user')             { preg_match('/(.*)\/[^\/]+$/',$relativefile,$reg);  $id=(isset($reg[1])?$reg[1]:'');}
 
                 if (! $id && ! $ref) continue;
-
                 $found=0;
                 if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
                 {
@@ -974,7 +1005,19 @@ class FormFile
                 else
                 {
                     //print 'Fetch '.$id." - ".$ref.'<br>';
-                    $result=$object_instance->fetch($id,$ref);
+
+                    if ($id) {
+                        $result = $object_instance->fetch($id);
+                    } else {
+                        //fetchOneLike looks for objects with wildcards in its reference.
+                        //It is useful for those masks who get underscores instead of their actual symbols
+                        //fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
+                        //that's why we look only look fetchOneLike when fetch returns 0
+                        if (!$result = $object_instance->fetch('', $ref)) {
+                            $result = $object_instance->fetchOneLike($ref);
+                        }
+                    }
+
                     if ($result > 0)  { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]=dol_clone($object_instance); }    // Save object into a cache
                     if ($result == 0) { $found=1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]='notfound'; unset($filearray[$key]); }
                 }
@@ -1011,7 +1054,7 @@ class FormFile
 
         if (count($filearray) == 0)
         {
-            print '<tr '.$bc[$var].'><td colspan="4">';
+            print '<tr '.$bc[false].'><td colspan="4">';
             if (empty($textifempty)) print $langs->trans("NoFileFound");
             else print $textifempty;
             print '</td></tr>';
@@ -1068,6 +1111,8 @@ class FormFile
         global $bc;
         global $sortfield, $sortorder;
 
+        $langs->load("link");
+
         require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
         $link = new Link($this->db);
         $links = array();
@@ -1176,7 +1221,7 @@ class FormFile
         }
         if ($nboflinks == 0)
         {
-            print '<tr ' . $bc[$var] . '><td colspan="5">';
+            print '<tr ' . $bc[false] . '><td colspan="5">';
             print $langs->trans("NoLinkFound");
             print '</td></tr>';
         }
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
new file mode 100644
index 00000000000..2caeb30a6dc
--- /dev/null
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -0,0 +1,139 @@
+<?php
+/* Copyright (C) 2012-2013  Charles-Fr BENKE		<charles.fr@benke.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/class/html.formintervention.class.php
+ * \ingroup    core
+ * \brief      File of class with all html predefined components
+ */
+
+/**
+ *	Class to manage generation of HTML components for contract module
+ */
+class FormIntervention
+{
+    var $db;
+    var $error;
+
+
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+	/**
+	 *	Show a combo list with contracts qualified for a third party
+	 *
+	 *	@param	int		$socid      Id third party (-1=all, 0=only interventions not linked to a third party, id=intervention not linked or linked to third party id)
+	 *	@param  int		$selected   Id intervention preselected
+	 *	@param  string	$htmlname   Nom de la zone html
+	 *	@param	int		$maxlength	Maximum length of label
+	 *	@param	int		$showempty	Show empty line
+	 *	@return int         		Nbre of project if OK, <0 if KO
+	 */
+	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
+	{
+		global $db,$user,$conf,$langs;
+
+		$out='';
+
+		$hideunselectables=false;
+
+		// Search all contacts
+		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
+		$sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
+		$sql.= " WHERE f.entity = ".$conf->entity;
+		if ($socid != '')
+		{
+			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+			else $sql.= " AND f.fk_soc = ".$socid;
+		}
+
+		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
+			if ($showempty) $out.='<option value="0">&nbsp;</option>';
+			$num = $db->num_rows($resql);
+			$i = 0;
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					{
+						// Do nothing
+					}
+					else
+					{
+						$labeltoshow=dol_trunc($obj->ref,18);
+						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
+						{
+							$out.='<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.'</option>';
+						}
+						else
+						{
+							$disabled=0;
+							if (! $obj->fk_statut > 0)
+							{
+								$disabled=1;
+								$labeltoshow.=' ('.$langs->trans("Draft").')';
+							}
+							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							}
+
+							if ($hideunselectables && $disabled)
+							{
+								$resultat='';
+							}
+							else
+							{
+								$resultat='<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat.=' disabled="disabled"';
+								$resultat.='>'.$labeltoshow;
+								$resultat.='</option>';
+							}
+							$out.=$resultat;
+						}
+					}
+					$i++;
+				}
+			}
+			$out.='</select>';
+			$db->free($resql);
+			return $out;
+		}
+		else
+		{
+			dol_print_error($db);
+			return '';
+		}
+	}
+}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 9d80ced54e3..308534f3ebf 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -250,6 +250,21 @@ class FormMail
         	if (! empty($_SESSION["listofnames"])) $listofnames=explode(';',$_SESSION["listofnames"]);
         	if (! empty($_SESSION["listofmimes"])) $listofmimes=explode(';',$_SESSION["listofmimes"]);
 
+       		// Define output language
+			$outputlangs = $langs;
+			$newlang = '';
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
+			if (! empty($newlang))
+			{
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
+				$outputlangs->load('other');
+			}
+
+        	// Get message template
+        	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs);
+
+
         	$out.= "\n<!-- Debut form mail -->\n";
         	if ($this->withform == 1)
         	{
@@ -459,7 +474,12 @@ class FormMail
         				$out.= $form->selectarray("receiverccc", $this->withtoccc, GETPOST("receiverccc"), 1);
         			}
         		}
-        		//if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
+
+        		$showinfobcc='';
+        		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
+        		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
+        		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $showinfobcc=$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
+        		if ($showinfobcc) $out.=' + '.$showinfobcc;
         		$out.= "</td></tr>\n";
         	}
 
@@ -474,7 +494,11 @@ class FormMail
         		}
         		else
         		{
-        			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0), 1);
+        			$defaultvaluefordeliveryreceipt=0;
+        			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && ! empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt=1;
+        			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && ! empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt=1;
+        			if (! empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && ! empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt=1;
+        			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:$defaultvaluefordeliveryreceipt), 1);
         		}
 
         		$out.= "</td></tr>\n";
@@ -483,19 +507,23 @@ class FormMail
         	// Topic
         	if (! empty($this->withtopic))
         	{
-        		$this->withtopic=make_substitutions($this->withtopic,$this->substit);
+        		$defaulttopic="";
+        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['topic']) $defaulttopic=$arraydefaultmessage['topic'];
+        		elseif (! is_numeric($this->withtopic))	 $defaulttopic=$this->withtopic;
+
+        		$defaulttopic=make_substitutions($defaulttopic,$this->substit);
 
         		$out.= '<tr>';
         		$out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
         		$out.= '<td>';
         		if ($this->withtopicreadonly)
         		{
-        			$out.= $this->withtopic;
-        			$out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$this->withtopic.'" />';
+        			$out.= $defaulttopic;
+        			$out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$defaulttopic.'" />';
         		}
         		else
         		{
-        			$out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:(is_numeric($this->withtopic)?'':$this->withtopic)) .'" />';
+        			$out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:($defaulttopic?$defaulttopic:'')) .'" />';
         		}
         		$out.= "</td></tr>\n";
         	}
@@ -554,18 +582,8 @@ class FormMail
         	if (! empty($this->withbody))
         	{
         		$defaultmessage="";
-
-        		// TODO    A partir du type, proposer liste de messages dans table llx_c_email_template
-        		if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-        		elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-        		elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-        		elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-        		elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-        		elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-        		elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-        		elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
-        	    elseif ($this->param["models"]=='thirdparty')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentThirdparty"); }
-        		elseif (! is_numeric($this->withbody))						{ $defaultmessage=$this->withbody; }
+        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) $defaultmessage=$arraydefaultmessage['content'];
+        		elseif (! is_numeric($this->withbody))	$defaultmessage=$this->withbody;
 
         		// Complete substitution array
         		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
@@ -657,5 +675,70 @@ class FormMail
         	return $out;
         }
     }
+
+
+
+	/**
+	 *      Return template of email
+	 *      Search into table c_email_templates
+	 *
+	 * 		@param	DoliDB		$db				Database handler
+	 * 		@param	string		$type_template	Get message for key module
+	 *      @param	string		$user			Use template public or limited to this user
+	 *      @param	Translate	$outputlangs	Output lang object
+	 *      @return array						array('topic'=>,'content'=>,..)
+	 */
+	private function getEMailTemplate($db, $type_template, $user, $outputlangs)
+	{
+		$ret=array();
+
+		$sql = "SELECT label, topic, content, lang";
+		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
+		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
+		$sql.= " AND entity IN (".getEntity("c_email_templates").")";
+		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
+		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		$sql.= $db->order("lang,label","ASC");
+		//print $sql;
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);	// Get first found
+			if ($obj)
+			{
+				$ret['label']=$obj->label;
+				$ret['topic']=$obj->topic;
+				$ret['content']=$obj->content;
+				$ret['lang']=$obj->lang;
+			}
+			else
+			{
+				$defaultmessage='';
+				if     ($type_template=='facture_send')	            { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
+	        	elseif ($type_template=='facture_relance')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+	        	elseif ($type_template=='propal_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
+	        	elseif ($type_template=='order_send')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
+	        	elseif ($type_template=='order_supplier_send')		{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+	        	elseif ($type_template=='invoice_supplier_send')	{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+	        	elseif ($type_template=='shipping_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
+	        	elseif ($type_template=='fichinter_send')			{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
+	        	elseif ($type_template=='thirdparty')				{ $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
+
+	        	$ret['label']='default';
+	        	$ret['topic']='';
+	        	$ret['content']=$defaultmessage;
+	        	$ret['lang']=$outputlangs->defaultlang;
+			}
+
+			$db->free($resql);
+			return $ret;
+		}
+		else
+		{
+			dol_print_error($db);
+			return -1;
+		}
+	}
 }
 
diff --git a/htdocs/core/class/html.formmailing.class.php b/htdocs/core/class/html.formmailing.class.php
new file mode 100644
index 00000000000..98a76c84686
--- /dev/null
+++ b/htdocs/core/class/html.formmailing.class.php
@@ -0,0 +1,84 @@
+<?php
+/* Copyright (C) 2014 Florian Henry florian.henry@open-concept.pro
+ *
+* 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 <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ *	\file       htdocs/core/class/html.formmailing.class.php
+ *  \ingroup    core
+ *	\brief      File of predefined functions for HTML forms for mailing module
+ */
+require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+
+/**
+ *	Class to offer components to list and upload files
+ */
+class FormMailing  extends Form
+{
+	public $db;
+	public $error;
+	public $errors=array();
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	*/
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+	/**
+	 * Output a select with destinaries status
+	 * 
+	 * @param string $selectedid the selected id
+	 * @param string $htmlname name of controm
+	 * @param number $show_empty show empty option
+	 * @return string HTML select
+	 */
+	public function selectDestinariesStatus($selectedid='',$htmlname='dest_status', $show_empty=0) {
+
+		global $langs;
+		$langs->load("mails");
+
+		require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
+		$mailing = new Mailing($this->db);
+
+
+		$array = $mailing->statut_dest;
+		//Cannot use form->selectarray because empty value is defaulted to -1 in this method and we use here status -1...
+
+		$out = '<select name="'.$htmlname.'" class="flat">';
+
+		if ($show_empty) {
+			$out .= '<option value=""></option>';
+		}
+
+		foreach($mailing->statut_dest as $id=>$status) {
+			if ($selectedid==$id)  {
+				$selected=" selected=selected ";
+			}else {
+				$selected="";
+			}
+			$out .= '<option '.$selected.' value="'.$id.'">'.$langs->trans($status).'</option>';
+		}
+
+		$out .= '</select>';
+		return $out;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 6bc626b13f3..5ea5b33c1f4 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -116,7 +116,7 @@ class FormOrder
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
 		$sql.= " WHERE active = 1";
 
-		dol_syslog(get_class($this)."::selectInputMethod sql=".$sql);
+		dol_syslog(get_class($this)."::selectInputMethod", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 05d7a36b6f9..4f0439d7b3c 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -164,12 +164,12 @@ class FormOther
         global $langs;
 
         $sql = "SELECT e.rowid, e.code, e.libelle, e.price, e.organization,";
-        $sql.= " p.libelle as pays";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_pays as p";
-        $sql.= " WHERE e.active = 1 AND e.fk_pays = p.rowid";
-        $sql.= " ORDER BY pays, e.organization ASC, e.code ASC";
+        $sql.= " c.label as country";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
+        $sql.= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
+        $sql.= " ORDER BY country, e.organization ASC, e.code ASC";
 
-    	dol_syslog(get_class($this).'::select_ecotaxes sql='.$sql);
+    	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -223,11 +223,11 @@ class FormOther
     	$out='';
 
     	$sql = "SELECT r.taux";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_pays as p";
-    	$sql.= " WHERE r.active = 1 AND r.fk_pays = p.rowid";
-    	$sql.= " AND p.code = '".$country_code."'";
+    	$sql.= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
+    	$sql.= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
+    	$sql.= " AND c.code = '".$country_code."'";
 
-    	dol_syslog(get_class($this).'::select_revenue_stamp sql='.$sql);
+    	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
     	$resql=$this->db->query($sql);
     	if ($resql)
     	{
@@ -307,6 +307,7 @@ class FormOther
      * @param  string	$htmlname      	Name of combo list
      * @param	int		$nocateg		Show also an entry "Not categorized"
      * @return string		        	Html combo list code
+     * @see	select_all_categories
      */
     function select_categories($type,$selected=0,$htmlname='search_categ',$nocateg=0)
     {
@@ -318,7 +319,7 @@ class FormOther
         $tab_categs = $static_categs->get_full_arbo($type);
 
         // Print a select with each of them
-        $moreforfilter ='<select class="flat" name="'.$htmlname.'">';
+        $moreforfilter ='<select class="flat" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
         $moreforfilter.='<option value="">&nbsp;</option>';	// Should use -1 to say nothing
 
         if (is_array($tab_categs))
@@ -355,9 +356,18 @@ class FormOther
         global $conf,$langs;
         $langs->load('users');
 
+        $out = '';
+        $nodatarole = '';
+        // Enhance with select2
+        if ($conf->use_javascript_ajax)
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            $out.= ajax_combobox($htmlname);
+            $nodatarole=' data-role="none"';
+        }
         // Select each sales and print them in a select input
-        $moreforfilter ='<select class="flat" name="'.$htmlname.'">';
-        $moreforfilter.='<option value="">&nbsp;</option>';
+        $out.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.$nodatarole.'>';
+        $out.='<option value="">&nbsp;</option>';
 
         // Get list of users allowed to be viewed
         $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
@@ -382,34 +392,35 @@ class FormOther
         {
             while ($obj_usr = $this->db->fetch_object($resql_usr))
             {
-                $moreforfilter.='<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $moreforfilter.=' selected="selected"';
+                $out.='<option value="'.$obj_usr->rowid.'"';
 
-                $moreforfilter.='>';
-                $moreforfilter.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
+                if ($obj_usr->rowid == $selected) $out.=' selected="selected"';
+
+                $out.='>';
+                $out.=dolGetFirstLastname($obj_usr->firstname,$obj_usr->lastname);
                 // Complete name with more info
                 $moreinfo=0;
                 if (! empty($conf->global->MAIN_SHOW_LOGIN))
                 {
-                	$moreforfilter.=($moreinfo?' - ':' (').$obj_usr->login;
-                	$moreinfo++;
+                    $out.=($moreinfo?' - ':' (').$obj_usr->login;
+                    $moreinfo++;
                 }
                 if ($showstatus >= 0)
                 {
 					if ($obj_usr->statut == 1 && $showstatus == 1)
 					{
-						$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Enabled');
+						$out.=($moreinfo?' - ':' (').$langs->trans('Enabled');
 	                	$moreinfo++;
 					}
 					if ($obj_usr->statut == 0)
 					{
-						$moreforfilter.=($moreinfo?' - ':' (').$langs->trans('Disabled');
+						$out.=($moreinfo?' - ':' (').$langs->trans('Disabled');
                 		$moreinfo++;
 					}
 				}
-				$moreforfilter.=($moreinfo?')':'');
-                $moreforfilter.='</option>';
+				$out.=($moreinfo?')':'');
+                $out.='</option>';
             }
             $this->db->free($resql_usr);
         }
@@ -417,9 +428,9 @@ class FormOther
         {
             dol_print_error($this->db);
         }
-        $moreforfilter.='</select>';
+        $out.='</select>';
 
-        return $moreforfilter;
+        return $out;
     }
 
     /**
@@ -491,7 +502,7 @@ class FormOther
                 {
                     if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
                     {
-                        if ($i > 0 && $conf->browser->firefox) print '<option value="0" disabled="disabled">----------</option>';
+                        if ($i > 0) print '<option value="0" disabled="disabled">----------</option>';
                         print '<option value="'.$lines[$i]->fk_project.'_0"';
                         if ($selectedproject == $lines[$i]->fk_project) print ' selected="selected"';
                         print '>';	// Project -> Task
@@ -559,13 +570,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);
     }
@@ -575,13 +586,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;
 
@@ -760,7 +771,7 @@ class FormOther
 
         $montharray = monthArray($langs);	// Get array
 
-        $select_month = '<select class="flat" name="'.$htmlname.'">';
+        $select_month = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
         if ($useempty)
         {
             $select_month .= '<option value="0">&nbsp;</option>';
@@ -1139,7 +1150,7 @@ class FormOther
         $sql.= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
         $sql.= " ORDER BY ".$labelfield;
 
-        dol_syslog(get_class($this)."::select_dictionary sql=".$sql);
+        dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 8d479e89e44..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;
 
@@ -80,7 +81,7 @@ class FormProjets
 		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 		$sql.= " ORDER BY p.ref ASC";
 
-		dol_syslog(get_class($this)."::select_projects sql=".$sql,LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_projects", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -104,23 +105,34 @@ 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").')';
 						if (!empty($selected) && $selected == $obj->rowid && $obj->fk_statut > 0)
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.' - '.dol_trunc($obj->title,$maxlength).'</option>';
+							$out.= '<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.' '.dol_trunc($obj->title,$maxlength).'</option>';
 						}
 						else
 						{
 							$disabled=0;
 							$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
-							if (! $obj->fk_statut > 0)
+							if ($obj->fk_statut == 0)
 							{
 								$disabled=1;
 								$labeltoshow.=' - '.$langs->trans("Draft");
 							}
-							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							else if ($obj->fk_statut == 2)
+							{
+								$disabled=1;
+								$labeltoshow.=' - '.$langs->trans("Closed");
+							}
+							else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled=1;
 								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
@@ -162,15 +174,15 @@ class FormProjets
 	}
 
 	/**
-	 *    Build Select List of element associable to a project
+	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
-	 *    @param	string	$table_element		Table of the element to update
-	 *    @param	int		$socid				socid to filter
-	 *    @return	string						The HTML select list of element
+	 *    @param	string		$table_element		Table of the element to update
+	 *    @param	int			$socid				socid to filter
+	 *    @return	string							The HTML select list of element
 	 */
 	function select_element($table_element,$socid=0)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$projectkey="fk_projet";
 		switch ($table_element)
@@ -179,7 +191,10 @@ class FormProjets
 				$sql = "SELECT rowid, facnumber as ref";
 				break;
 			case "facture_fourn":
-				$sql = "SELECT rowid, ref";
+				$sql = "SELECT rowid, ref, ref_supplier";
+				break;
+			case "commande_fourn":
+				$sql = "SELECT rowid, ref, ref_supplier";
 				break;
 			case "facture_rec":
 				$sql = "SELECT rowid, titre as ref";
@@ -201,7 +216,7 @@ class FormProjets
 		$sql.= ' AND entity='.getEntity('project');
 		$sql.= " ORDER BY ref DESC";
 
-		dol_syslog(get_class($this).'::select_element sql='.$sql,LOG_DEBUG);
+		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -214,14 +229,22 @@ class FormProjets
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$sellist .='<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
+					$ref=$obj->ref?$obj->ref:$obj->rowid;
+					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
+					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
 				$sellist .='</select>';
 			}
-			return $sellist ;
-
+			/*else
+			{
+				$sellist = '<select class="flat" name="elementselect">';
+				$sellist.= '<option value="0" disabled="disabled">'.$langs->trans("None").'</option>';
+				$sellist.= '</select>';
+			}*/
 			$this->db->free($resql);
+
+			return $sellist ;
 		}else {
 			$this->error=$this->db->lasterror();
 			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index fcbe46ab51b..df0f2d644dd 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -56,7 +56,7 @@ class FormPropal
         $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
         $sql .= " WHERE active = 1";
 
-        dol_syslog(get_class($this)."::selectProposalStatus sql=".$sql);
+        dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 2b70053cb28..941cef40be6 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);
 
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index f84f14c1446..abf453cf426 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -73,13 +73,13 @@ class FormSocialContrib
         else
         {
             $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_pays as p";
-            $sql.= " WHERE c.active = 1 AND c.fk_pays = p.rowid";
-            $sql.= " AND p.code = '".$mysoc->country_code."'";
+            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+            $sql.= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
+            $sql.= " AND co.code = '".$mysoc->country_code."'";
             $sql.= " ORDER BY c.libelle ASC";
         }
 
-        dol_syslog("Form::select_type_socialcontrib sql=".$sql, LOG_DEBUG);
+        dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/core/class/index.html b/htdocs/core/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/class/index.php b/htdocs/core/class/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/class/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index c01d2d1f0f5..14d1bec0841 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -23,31 +23,38 @@
  */
 
 /**
- *	Class to manage boxes on pages
+ *	Class to manage boxes on pages. This is an utility class (all is static)
  */
 class InfoBox
 {
-	static $listOfPages = array(0=>'Home');       // Nom des positions 0=Home, 1=...
-
+	/**
+	 * Name of positions 0=Home, 1=...
+	 *
+	 * @return	array		Array with list of zones
+	 */
+	static function getListOfPagesForBoxes()
+	{
+		return array(0=>'Home');
+	}
 
     /**
      *  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;
 
         $boxes=array();
 
         $confuserzone='MAIN_BOXES_'.$zone;
-        if ($mode == 'activated')
+        if ($mode == 'activated')	// activated
         {
             $sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
             $sql.= " d.rowid as box_id, d.file, d.note, d.tms";
@@ -59,21 +66,14 @@ class InfoBox
             else $sql.= " AND b.fk_user = 0";
             $sql.= " ORDER BY b.box_order";
         }
-        else
+        else	// available
 		{
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-            if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
-            {
-            	$sql.= " WHERE entity IN (1,".$conf->entity.")"; // TODO add method for define another master entity
-            }
-            else
-			{
-            	$sql.= " WHERE entity = ".$conf->entity;
-            }
+           	$sql.= " WHERE d.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
         }
 
-        dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')." sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
         {
@@ -85,6 +85,7 @@ class InfoBox
 
                 if (! in_array($obj->box_id, $excludelist))
                 {
+
                     if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
                     {
                         $boxname = preg_replace('/\.php$/i','',$regs[1]);
@@ -97,9 +98,11 @@ class InfoBox
                         $relsourcefile = "/core/boxes/".$boxname.".php";
 					}
 
+					//print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
+
 					// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
                     // the "enabled" condition for modules forbidden for external users and the depends condition can be done.
-                    // Goal is to avoid making a new instance for each boxes returned by select.
+                    // Goal is to avoid making a "new" done for each boxes returned by select.
                     dol_include_once($relsourcefile);
                     if (class_exists($boxname))
                     {
@@ -137,12 +140,12 @@ class InfoBox
                             	$arrayelem=explode('|',$moduleelem);
                             	$tmpenabled=0;	// $tmpenabled is used for the '|' test (OR)
                             	foreach($arrayelem as $module)
-                            	{ 
+                            	{
     	                        	$tmpmodule=preg_replace('/@[^@]+/','',$module);
-    	                        	if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1; 
+    	                        	if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1;
                             		//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
                             	}
-                            	if (empty($tmpenabled))	// We found at least one module required that disabled 
+                            	if (empty($tmpenabled))	// We found at least one module required that disabled
         	                    {
         	                    	$enabled=0;
         	                    	break;
@@ -150,20 +153,23 @@ class InfoBox
                             }
                         }
                         //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
-                        
+
                         //print 'xx module='.$module.' enabled='.$enabled;
                         if ($enabled) $boxes[]=$box;
                         else unset($box);
-                        }
+                    }
+                    else
+					{
+                    	dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
+					}
                 }
                 $j++;
             }
         }
         else
-        {
-            //dol_print_error($db);
-            $error=$db->lasterror();
-            dol_syslog(get_class()."::listBoxes Error ".$error, LOG_ERR);
+		{
+			dol_syslog($db->lasterror(),LOG_ERR);
+            return array('error'=>$db->lasterror());
         }
 
         return $boxes;
@@ -196,7 +202,8 @@ class InfoBox
 
         $db->begin();
 
-        // Sauve parametre indiquant que le user a une config dediee
+        // Save parameters to say user has a dedicated setup
+        $tab=array();
         $confuserzone='MAIN_BOXES_'.$zone;
         $tab[$confuserzone]=1;
         if (dol_set_user_param($db, $conf, $user, $tab) < 0)
@@ -212,7 +219,7 @@ class InfoBox
         $sql.= " AND fk_user = ".$userid;
         $sql.= " AND position = ".$zone;
 
-        dol_syslog(get_class()."::saveboxorder sql=".$sql);
+        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
         $result = $db->query($sql);
         if ($result)
         {
@@ -243,7 +250,7 @@ class InfoBox
                         $sql.= " ".$conf->entity;
                         $sql.= ")";
 
-                        dol_syslog(get_class()."::saveboxorder sql=".$sql);
+                        dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
                         $result = $db->query($sql);
                         if ($result < 0)
                         {
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 51d5456ec28..199c342020d 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -23,14 +23,16 @@
  *   \brief			Fichier de la classe de gestion des triggers
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
 
 /**
  *   Class to manage triggers
  */
-
 class Interfaces
 {
-    var $dir;				// Directory with all core and external triggers files
+    var $db;
+	var $dir;				// Directory with all core and external triggers files
     var $errors	= array();	// Array for errors
 
     /**
@@ -59,7 +61,9 @@ class Interfaces
         // Check parameters
         if (! is_object($object) || ! is_object($conf))	// Error
         {
-            dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_ERR);
+        	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+            dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
+        	$this->errors[]=$this->error;
             return -1;
         }
         if (! is_object($user) || ! is_object($langs))	// Warning
@@ -148,9 +152,23 @@ class Interfaces
             $objMod = new $modName($this->db);
             if ($objMod)
             {
-                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch triggers for file '".$files[$key]."'", LOG_INFO);
+            	$result=0;
+
+				if (method_exists($objMod, 'runTrigger'))	// New method to implement
+				{
+	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_INFO);
+	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
+				}
+				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+				{
+	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_trigger for file '".$files[$key]."'", LOG_INFO);
+					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+				}
+				else
+				{
+	                dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
+				}
 
-                $result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
                 if ($result > 0)
                 {
                     // Action OK
@@ -172,7 +190,7 @@ class Interfaces
                 }
             }
             else
-            {
+			{
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
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 02924d86668..0cdc6a8c4a8 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -93,21 +93,16 @@ class Link extends CommonObject
         $sql .= ", '" . $this->objecttype . "'";
         $sql .= ", " . $this->objectid . ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "links");
 
             if ($this->id > 0) {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('LINK_CREATE', $this, $user, $langs, $conf);
-                if ($result < 0) {
-                    $error++;
-                    $this->errors = $interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('LINK_CREATE',$user);
+                if ($result < 0) $error++;            
+                // End call triggers
             } else {
                 $error++;
             }
@@ -136,7 +131,6 @@ class Link extends CommonObject
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::Create fails insert sql=".$sql, LOG_ERR);
                 $result=-2;
             }
             $this->db->rollback();
@@ -191,15 +185,10 @@ class Link extends CommonObject
         {
             if ($call_trigger)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface = new Interfaces($this->db);
-                $result = $interface->run_triggers('LINK_MODIFY', $this, $user, $langs, $conf);
-                if ($result < 0) {
-                    $error++;
-                    $this->errors = $interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('LINK_MODIFY',$user);
+                if ($result < 0) $error++;
+                // End call triggers
             }
 
             if (! $error)
@@ -208,6 +197,7 @@ class Link extends CommonObject
                 $this->db->commit();
                 return 1;
             } else {
+                setEventMessages('', $this->errors, 'errors');
                 $this->db->rollback();
                 return -1;
             }
@@ -223,7 +213,6 @@ class Link extends CommonObject
             else
             {
                 $this->error = $langs->trans("Error sql = " . $sql);
-                dol_syslog(get_class($this) . "::Update fails update = " . $this->error, LOG_ERR);
                 $result =  -2;
             }
             $this->db->rollback();
@@ -256,7 +245,7 @@ class Link extends CommonObject
             $sql .= " ORDER BY " . $sortfield . " " . $sortorder;
         }
 
-        dol_syslog(get_class($this)."::fetchAll sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -281,7 +270,6 @@ class Link extends CommonObject
                 return 0;
             }
         } else {
-            dol_syslog(get_class($this) . "::FetchAll fails sql=" . $sql, LOG_ERR);
             return -1;
         }
     }
@@ -305,7 +293,7 @@ class Link extends CommonObject
         $sql .= " WHERE rowid = " . $rowid;
         if($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -326,7 +314,6 @@ class Link extends CommonObject
             }
         } else {
             $this->error=$this->db->lasterror();
-            dol_syslog($this->error, LOG_ERR);
             return -1;
         }
     }
@@ -343,33 +330,25 @@ class Link extends CommonObject
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $error = 0;
 
+        // Call trigger
+        $result=$this->call_trigger('LINK_DELETE',$user);
+        if ($result < 0) return -1;            
+        // End call triggers         
+        
         $this->db->begin();
 
         // Remove link
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "links";
         $sql.= " WHERE rowid = " . $this->id;
 
-        dol_syslog(get_class($this)."::delete sql=" . $sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         if (! $this->db->query($sql))
         {
             $error++;
             $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this)."::delete error -4 " . $this->error, LOG_ERR);
         }
 
 
-        if (! $error) {
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result = $interface->run_triggers('LINK_DELETE', $this, $user, $langs, $conf);
-            if ($result < 0) {
-                $error++;
-                $this->errors = $interface->errors;
-            }
-            // Fin appel triggers
-        }
-
         if (! $error) {
             $this->db->commit();
 
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index c04697acd39..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;
 
@@ -162,7 +162,7 @@ class Menubase
         $sql.= " '".$this->user."'";
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -174,7 +174,6 @@ class Menubase
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -186,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;
 
@@ -232,12 +231,11 @@ class Menubase
         $sql.= " usertype='".$this->user."'";
         $sql.= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql)
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
             return -1;
         }
 
@@ -252,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;
 
@@ -277,7 +275,7 @@ class Menubase
         $sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
         $sql.= " WHERE t.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -311,7 +309,6 @@ class Menubase
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -330,12 +327,11 @@ class Menubase
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
         $sql.= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql)
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
             return -1;
         }
 
@@ -516,7 +512,7 @@ class Menubase
 
 //$tmp1=dol_microtime_float();
 //print '>>> 1 0<br>';
-        dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)." sql=".$sql);
+        dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php
new file mode 100644
index 00000000000..72d192a7614
--- /dev/null
+++ b/htdocs/core/class/mobiledetect.class.php
@@ -0,0 +1,1257 @@
+<?php
+/**
+ * Mobile Detect Library
+ * =====================
+ *
+ * Motto: "Every business should have a mobile detection script to detect mobile readers"
+ *
+ * Mobile_Detect is a lightweight PHP class for detecting mobile devices (including tablets).
+ * It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.
+ *
+ * @author      Current authors: Serban Ghita <serbanghita@gmail.com>, Nick Ilyin <nick.ilyin@gmail.com>
+ *              Original author: Victor Stanciu <vic.stanciu@gmail.com>
+ *
+ * @license     Code and contributions have 'MIT License'
+ *              More details: https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt
+ *
+ * @link        Homepage:     http://mobiledetect.net
+ *              GitHub Repo:  https://github.com/serbanghita/Mobile-Detect
+ *              Google Code:  http://code.google.com/p/php-mobile-detect/
+ *              README:       https://github.com/serbanghita/Mobile-Detect/blob/master/README.md
+ *              HOWTO:        https://github.com/serbanghita/Mobile-Detect/wiki/Code-examples
+ *
+ * @version     2.8.3
+ */
+
+/**
+ *  Class to manage detection of type of terminal (classic, tablet, mobile)
+ */
+class MobileDetect
+{
+    /**
+     * Mobile detection type.
+     *
+     * @deprecated since version 2.6.9
+     */
+    const DETECTION_TYPE_MOBILE     = 'mobile';
+
+    /**
+     * Extended detection type.
+     *
+     * @deprecated since version 2.6.9
+     */
+    const DETECTION_TYPE_EXTENDED   = 'extended';
+
+    /**
+     * A frequently used regular expression to extract version #s.
+     *
+     * @deprecated since version 2.6.9
+     */
+    const VER                       = '([\w._\+]+)';
+
+    /**
+     * Top-level device.
+     */
+    const MOBILE_GRADE_A            = 'A';
+
+    /**
+     * Mid-level device.
+     */
+    const MOBILE_GRADE_B            = 'B';
+
+    /**
+     * Low-level device.
+     */
+    const MOBILE_GRADE_C            = 'C';
+
+    /**
+     * Stores the version number of the current release.
+     */
+    const VERSION                   = '2.8.3';
+
+    /**
+     * A type for the version() method indicating a string return value.
+     */
+    const VERSION_TYPE_STRING       = 'text';
+
+    /**
+     * A type for the version() method indicating a float return value.
+     */
+    const VERSION_TYPE_FLOAT        = 'float';
+
+    /**
+     * The User-Agent HTTP header is stored in here.
+     * @var string
+     */
+    protected $userAgent = null;
+
+    /**
+     * HTTP headers in the PHP-flavor. So HTTP_USER_AGENT and SERVER_SOFTWARE.
+     * @var array
+     */
+    protected $httpHeaders = array();
+
+    /**
+     * The detection type, using self::DETECTION_TYPE_MOBILE or self::DETECTION_TYPE_EXTENDED.
+     *
+     * @deprecated since version 2.6.9
+     *
+     * @var string
+     */
+    protected $detectionType = self::DETECTION_TYPE_MOBILE;
+
+    /**
+     * HTTP headers that trigger the 'isMobile' detection
+     * to be true.
+     *
+     * @var array
+     */
+    protected static $mobileHeaders = array(
+
+            'HTTP_ACCEPT'                  => array('matches' => array(
+                                                                        // Opera Mini; @reference: http://dev.opera.com/articles/view/opera-binary-markup-language/
+                                                                        'application/x-obml2d',
+                                                                        // BlackBerry devices.
+                                                                        'application/vnd.rim.html',
+                                                                        'text/vnd.wap.wml',
+                                                                        'application/vnd.wap.xhtml+xml'
+                                            )),
+            'HTTP_X_WAP_PROFILE'           => null,
+            'HTTP_X_WAP_CLIENTID'          => null,
+            'HTTP_WAP_CONNECTION'          => null,
+            'HTTP_PROFILE'                 => null,
+            // Reported by Opera on Nokia devices (eg. C3).
+            'HTTP_X_OPERAMINI_PHONE_UA'    => null,
+            'HTTP_X_NOKIA_GATEWAY_ID'      => null,
+            'HTTP_X_ORANGE_ID'             => null,
+            'HTTP_X_VODAFONE_3GPDPCONTEXT' => null,
+            'HTTP_X_HUAWEI_USERID'         => null,
+            // Reported by Windows Smartphones.
+            'HTTP_UA_OS'                   => null,
+            // Reported by Verizon, Vodafone proxy system.
+            'HTTP_X_MOBILE_GATEWAY'        => null,
+            // Seend this on HTC Sensation. @ref: SensationXE_Beats_Z715e.
+            'HTTP_X_ATT_DEVICEID'          => null,
+            // Seen this on a HTC.
+            'HTTP_UA_CPU'                  => array('matches' => array('ARM')),
+    );
+
+    /**
+     * List of mobile devices (phones).
+     *
+     * @var array
+     */
+    protected static $phoneDevices = array(
+        'iPhone'        => '\biPhone.*(Mobile|PhoneGap)|\biPod', // |\biTunes
+        'BlackBerry'    => 'BlackBerry|\bBB10\b|rim[0-9]+',
+        'HTC'           => 'HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\bEVO\b|T-Mobile G1|Z520m',
+        'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile',
+        // @todo: Is 'Dell Streak' a tablet or a phone? ;)
+        'Dell'          => 'Dell.*Streak|Dell.*Aero|Dell.*Venue|DELL.*Venue Pro|Dell Flash|Dell Smoke|Dell Mini 3iX|XCD28|XCD35|\b001DL\b|\b101DL\b|\bGS01\b',
+        'Motorola'      => 'Motorola|DROIDX|DROID BIONIC|\bDroid\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925',
+        'Samsung'       => 'Samsung|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E',
+        'LG'            => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802)',
+        'Sony'          => 'SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i',
+        'Asus'          => 'Asus.*Galaxy|PadFone.*Mobile',
+        // @ref: http://www.micromaxinfo.com/mobiles/smartphones
+        // Added because the codes might conflict with Acer Tablets.
+        'Micromax'      => 'Micromax.*\bA\d+\b',
+        'Palm'          => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ; @todo - complete the regex.
+        'Vertu'         => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
+        // @ref: http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA (PANTECH)
+        // Most of the VEGA devices are legacy. PANTECH seem to be newer devices based on Android.
+        'Pantech'       => 'PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790',
+        // @ref: http://www.fly-phone.com/devices/smartphones/ ; Included only smartphones.
+        'Fly'           => 'IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250',
+       'iMobile'        => 'i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)',
+        // Added simvalley mobile just for fun. They have some interesting devices.
+        // @ref: http://www.simvalley.fr/telephonie---gps-_22_telephonie-mobile_telephones_.html
+        'SimValley'     => '\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\b',
+        // @Tapatalk is a mobile app; @ref: http://support.tapatalk.com/threads/smf-2-0-2-os-and-browser-detection-plugin-and-tapatalk.15565/#post-79039
+        'GenericPhone'  => 'Tapatalk|PDA;|SAGEM|\bmmp\b|pocket|\bpsp\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\bwap\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser'
+    );
+
+    /**
+     * List of tablet devices.
+     *
+     * @var array
+     */
+    protected static $tabletDevices = array(
+        'iPad'              => 'iPad|iPad.*Mobile', // @todo: check for mobile friendly emails topic.
+        'NexusTablet'       => 'Android.*Nexus[\s]+(7|10)|^.*Android.*Nexus(?:(?!Mobile).)*$',
+        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P\d+|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-N8000|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-N8010|GT-N8005|GT-N8020|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-I9205|SM-T\d+|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-P6000|SM-T3100|SGH-I467|XE500|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|XE500T1C|SM-P605V|SM-P905V|SM-P600X|SM-P900X', // SCH-P709|SCH-P729|SM-T2558 - Samsung Mega - treat them like a regular phone.
+        // @reference: http://www.labnol.org/software/kindle-user-agent-string/20378/
+        'Kindle'            => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE)\b',
+        // Only the Surface tablets with Windows RT are considered mobile.
+        // @ref: http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx
+        'SurfaceTablet'     => 'Windows NT [0-9.]+; ARM;',
+        // @ref: http://shopping1.hp.com/is-bin/INTERSHOP.enfinity/WFS/WW-USSMBPublicStore-Site/en_US/-/USD/ViewStandardCatalog-Browse?CatalogCategoryID=JfIQ7EN5lqMAAAEyDcJUDwMT
+        'HPTablet'          => 'HP Slate 7|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8',
+        // @note: watch out for PadFone, see #132
+        'AsusTablet'        => '^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\bK00F\b|TX201LA',
+        'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
+        'HTCtablet'         => 'HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200',
+        'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
+        'NookTablet'        => 'Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2',
+        // @ref: http://www.acer.ro/ac/ro/RO/content/drivers
+        // @ref: http://www.packardbell.co.uk/pb/en/GB/content/download (Packard Bell is part of Acer)
+        // @ref: http://us.acer.com/ac/en/US/content/group/tablets
+        // @note: Can conflict with Micromax and Motorola phones codes.
+        'AcerTablet'        => 'Android.*; \b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-830)\b|W3-810|\bA3-A10\b',
+        // @ref: http://eu.computers.toshiba-europe.com/innovation/family/Tablets/1098744/banner_id/tablet_footerlink/
+        // @ref: http://us.toshiba.com/tablets/tablet-finder
+        // @ref: http://www.toshiba.co.jp/regza/tablet/
+        'ToshibaTablet'     => 'Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO',
+        // @ref: http://www.nttdocomo.co.jp/english/service/developer/smart_phone/technical_info/spec/index.html
+        // @ref: http://www.lg.com/us/tablets
+        'LGTablet'          => '\bL-06C|LG-V900|LG-V500|LG-V909|LG-V500|LG-V510|LG-VK810\b',
+        'FujitsuTablet'     => 'Android.*\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\b',
+        // Prestigio Tablets http://www.prestigio.com/support
+        'PrestigioTablet'   => 'PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD',
+        // @ref: http://support.lenovo.com/en_GB/downloads/default.page?#
+        'LenovoTablet'      => 'IdeaTab|ThinkPad([ ]+)?Tablet|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A1000|A2107|A2109|A1107|B6000|B8000|B8080-F)',
+        // @ref: http://www.yarvik.com/en/matrix/tablets/
+        'YarvikTablet'      => 'Android.*\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\b',
+        'MedionTablet'      => 'Android.*\bOYO\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB',
+        'ArnovaTablet'      => 'AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT',
+        // http://www.intenso.de/kategorie_en.php?kategorie=33
+        // @todo: http://www.nbhkdz.com/read/b8e64202f92a2df129126bff.html - investigate
+        'IntensoTablet'     => 'INM8002KP|INM1010FP|INM805ND|Intenso Tab',
+        // IRU.ru Tablets http://www.iru.ru/catalog/soho/planetable/
+        'IRUTablet'         => 'M702pro',
+        'MegafonTablet'     => 'MegaFon V9|\bZTE V9\b|Android.*\bMT7A\b',
+        // @ref: http://www.e-boda.ro/tablete-pc.html
+        'EbodaTablet'       => 'E-Boda (Supreme|Impresspeed|Izzycomm|Essential)',
+        // @ref: http://www.allview.ro/produse/droseries/lista-tablete-pc/
+        'AllViewTablet'           => 'Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)',
+        // @reference: http://wiki.archosfans.com/index.php?title=Main_Page
+        'ArchosTablet'      => '\b(101G9|80G9|A101IT)\b|Qilive 97R|ARCHOS 101G10|Archos 101 Neon',
+        // @ref: http://www.ainol.com/plugin.php?identifier=ainol&module=product
+        'AinolTablet'       => 'NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark',
+        // @todo: inspect http://esupport.sony.com/US/p/select-system.pl?DIRECTOR=DRIVER
+        // @ref: Readers http://www.atsuhiro-me.net/ebook/sony-reader/sony-reader-web-browser
+        // @ref: http://www.sony.jp/support/tablet/
+        'SonyTablet'        => 'Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551',
+        // @ref: db + http://www.cube-tablet.com/buy-products.html
+        'CubeTablet'        => 'Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT',
+        // @ref: http://www.cobyusa.com/?p=pcat&pcat_id=3001
+        'CobyTablet'        => 'MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010',
+        // @ref: http://www.match.net.cn/products.asp
+        'MIDTablet'         => 'M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733',
+        // @ref: http://pdadb.net/index.php?m=pdalist&list=SMiT (NoName Chinese Tablets)
+        // @ref: http://www.imp3.net/14/show.php?itemid=20454
+        'SMiTTablet'        => 'Android.*(\bMID\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)',
+        // @ref: http://www.rock-chips.com/index.php?do=prod&pid=2
+        'RockChipTablet'    => 'Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A',
+        // @ref: http://www.fly-phone.com/devices/tablets/ ; http://www.fly-phone.com/service/
+        'FlyTablet'         => 'IQ310|Fly Vision',
+        // @ref: http://www.bqreaders.com/gb/tablets-prices-sale.html
+        'bqTablet'          => 'bq.*(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant)|Maxwell.*Lite|Maxwell.*Plus',
+        // @ref: http://www.huaweidevice.com/worldwide/productFamily.do?method=index&directoryId=5011&treeId=3290
+        // @ref: http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index&directoryId=3372&treeId=0&tb=1&type=software (including legacy tablets)
+        'HuaweiTablet'      => 'MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim',
+        // Nec or Medias Tab
+        'NecTablet'         => '\bN-06D|\bN-08D',
+        // Pantech Tablets: http://www.pantechusa.com/phones/
+        'PantechTablet'     => 'Pantech.*P4100',
+        // Broncho Tablets: http://www.broncho.cn/ (hard to find)
+        'BronchoTablet'     => 'Broncho.*(N701|N708|N802|a710)',
+        // @ref: http://versusuk.com/support.html
+        'VersusTablet'      => 'TOUCHPAD.*[78910]|\bTOUCHTAB\b',
+        // @ref: http://www.zync.in/index.php/our-products/tablet-phablets
+        'ZyncTablet'        => 'z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900',
+        // @ref: http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/
+        'PositivoTablet'    => 'TB07STA|TB10STA|TB07FTA|TB10FTA',
+        // @ref: https://www.nabitablet.com/
+        'NabiTablet'        => 'Android.*\bNabi',
+        'KoboTablet'        => 'Kobo Touch|\bK080\b|\bVox\b Build|\bArc\b Build',
+        // French Danew Tablets http://www.danew.com/produits-tablette.php
+        'DanewTablet'       => 'DSlide.*\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\b',
+        // Texet Tablets and Readers http://www.texet.ru/tablet/
+        'TexetTablet'       => 'NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE',
+        // @note: Avoid detecting 'PLAYSTATION 3' as mobile.
+        'PlaystationTablet' => 'Playstation.*(Portable|Vita)',
+        // @ref: http://www.trekstor.de/surftabs.html
+        'TrekstorTablet'    => 'ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A',
+        // @ref: http://www.pyleaudio.com/Products.aspx?%2fproducts%2fPersonal-Electronics%2fTablets
+        'PyleAudioTablet'   => '\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\b',
+        // @ref: http://www.advandigital.com/index.php?link=content-product&jns=JP001
+        // @Note: because of the short codenames we have to include whitespaces to reduce the possible conflicts.
+        'AdvanTablet'       => 'Android.* \b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\b ',
+        // @ref: http://www.danytech.com/category/tablet-pc
+        'DanyTechTablet' => 'Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1',
+        // @ref: http://www.galapad.net/product.html
+        'GalapadTablet'     => 'Android.*\bG1\b',
+        // @ref: http://www.micromaxinfo.com/tablet/funbook
+        'MicromaxTablet'    => 'Funbook|Micromax.*\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\b',
+        // http://www.karbonnmobiles.com/products_tablet.php
+        'KarbonnTablet'     => 'Android.*\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\b',
+        // @ref: http://www.myallfine.com/Products.asp
+        'AllFineTablet'     => 'Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide',
+        // @ref: http://www.proscanvideo.com/products-search.asp?itemClass=TABLET&itemnmbr=
+        'PROSCANTablet'     => '\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\b',
+        // @ref: http://www.yonesnav.com/products/products.php
+        'YONESTablet' => 'BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026',
+        // @ref: http://www.cjshowroom.com/eproducts.aspx?classcode=004001001
+        // China manufacturer makes tablets for different small brands (eg. http://www.zeepad.net/index.html)
+        'ChangJiaTablet'    => 'TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503',
+        // @ref: http://www.gloryunion.cn/products.asp
+        // @ref: http://www.allwinnertech.com/en/apply/mobile.html
+        // @ref: http://www.ptcl.com.pk/pd_content.php?pd_id=284 (EVOTAB)
+        // @todo: Softwiner tablets?
+        // aka. Cute or Cool tablets. Not sure yet, must research to avoid collisions.
+        'GUTablet'          => 'TX-A1301|TX-M9002|Q702|kf026', // A12R|D75A|D77|D79|R83|A95|A106C|R15|A75|A76|D71|D72|R71|R73|R77|D82|R85|D92|A97|D92|R91|A10F|A77F|W71F|A78F|W78F|W81F|A97F|W91F|W97F|R16G|C72|C73E|K72|K73|R96G
+        // @ref: http://www.pointofview-online.com/showroom.php?shop_mode=product_listing&category_id=118
+        'PointOfViewTablet' => 'TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10',
+        // @ref: http://www.overmax.pl/pl/katalog-produktow,p8/tablety,c14/
+        // @todo: add more tests.
+        'OvermaxTablet'     => 'OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)',
+        // @ref: http://hclmetablet.com/India/index.php
+        'HCLTablet'         => 'HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync',
+        // @ref: http://www.edigital.hu/Tablet_es_e-book_olvaso/Tablet-c18385.html
+        'DPSTablet'         => 'DPS Dream 9|DPS Dual 7',
+        // @ref: http://www.visture.com/index.asp
+        'VistureTablet'     => 'V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10',
+        // @ref: http://www.mijncresta.nl/tablet
+        'CrestaTablet'     => 'CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989',
+        // MediaTek - http://www.mediatek.com/_en/01_products/02_proSys.php?cata_sn=1&cata1_sn=1&cata2_sn=309
+        'MediatekTablet' => '\bMT8125|MT8389|MT8135|MT8377\b',
+        // Concorde tab
+        'ConcordeTablet' => 'Concorde([ ]+)?Tab|ConCorde ReadMan',
+        // GoClever Tablets - http://www.goclever.com/uk/products,c1/tablet,c5/
+        'GoCleverTablet' => 'GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042',
+        // Modecom Tablets - http://www.modecom.eu/tablets/portal/
+        'ModecomTablet' => 'FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003',
+        // Vonino Tablets - http://www.vonino.eu/tablets
+        'VoninoTablet'  => '\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\bQ8\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\b',
+        // ECS Tablets - http://www.ecs.com.tw/ECSWebSite/Product/Product_Tablet_List.aspx?CategoryID=14&MenuID=107&childid=M_107&LanID=0
+        'ECSTablet'     => 'V07OT2|TM105A|S10OT1|TR10CS1',
+        // Storex Tablets - http://storex.fr/espace_client/support.html
+        // @note: no need to add all the tablet codes since they are guided by the first regex.
+        'StorexTablet'  => 'eZee[_\']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab',
+        // Generic Vodafone tablets.
+        'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10',
+        // French tablets - Essentiel B http://www.boulanger.fr/tablette_tactile_e-book/tablette_tactile_essentiel_b/cl_68908.htm?multiChoiceToDelete=brand&mc_brand=essentielb
+        // Aka: http://www.essentielb.fr/
+        'EssentielBTablet' => 'Smart[ \']?TAB[ ]+?[0-9]+|Family[ \']?TAB2',
+        // Ross & Moor - http://ross-moor.ru/
+        'RossMoorTablet' => 'RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711',
+        // i-mobile http://product.i-mobilephone.com/Mobile_Device
+        'iMobileTablet'        => 'i-mobile i-note',
+        // @ref: http://www.tolino.de/de/vergleichen/
+        'TolinoTablet'  => 'tolino tab [0-9.]+|tolino shine',
+        // AudioSonic - a Kmart brand
+        // http://www.kmart.com.au/webapp/wcs/stores/servlet/Search?langId=-1&storeId=10701&catalogId=10001&categoryId=193001&pageSize=72&currentPage=1&searchCategory=193001%2b4294965664&sortBy=p_MaxPrice%7c1
+        'AudioSonicTablet' => '\bC-22Q|T7-QC|T-17B|T-17P\b',
+        // AMPE Tablets - http://www.ampe.com.my/product-category/tablets/
+        // @todo: add them gradually to avoid conflicts.
+        'AMPETablet' => 'Android.* A78 ',
+        // Skk Mobile - http://skkmobile.com.ph/product_tablets.php
+        'SkkTablet' => 'Android.* (SKYPAD|PHOENIX|CYCLOPS)',
+        // Tecno Mobile (only tablet) - http://www.tecno-mobile.com/index.php/product?filterby=smart&list_order=all&page=1
+        'TecnoTablet' => 'TECNO P9',
+        // JXD (consoles & tablets) - http://jxd.hk/products.asp?selectclassid=009008&clsid=3
+        'JXDTablet' => 'Android.*\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\b',
+        // i-Joy tablets - http://www.i-joy.es/en/cat/products/tablets/
+        'iJoyTablet' => 'Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)',
+        // http://www.intracon.eu/tablet
+        'FX2Tablet' => 'FX2 PAD7|FX2 PAD10',
+        // http://www.xoro.de/produkte/
+        // @note: Might be the same brand with 'Simply tablets'
+        'XoroTablet'        => 'KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151',
+        // http://www1.viewsonic.com/products/computing/tablets/
+        'ViewsonicTablet'   => 'ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a',
+        // http://www.odys.de/web/internet-tablet_en.html
+        'OdysTablet'        => 'LOOX|XENO10|ODYS Space',
+        // http://www.captiva-power.de/products.html#tablets-en
+        'CaptivaTablet'     => 'CAPTIVA PAD',
+        // IconBIT - http://www.iconbit.com/products/tablets/
+        'IconbitTablet' => 'NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S',
+        // @ref: http://www.tesco.com/direct/hudl/
+        'Hudl'              => 'Hudl HT7S3',
+        // @ref: http://www.telstra.com.au/home-phone/thub-2/
+        'TelstraTablet'     => 'T-Hub2',
+        'GenericTablet'     => 'Android.*\b97D\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b|rk30sdk|\bEVOTAB\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4',
+    );
+
+    /**
+     * List of mobile Operating Systems.
+     *
+     * @var array
+     */
+    protected static $operatingSystems = array(
+        'AndroidOS'         => 'Android',
+        'BlackBerryOS'      => 'blackberry|\bBB10\b|rim tablet os',
+        'PalmOS'            => 'PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino',
+        'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\bS60\b',
+        // @reference: http://en.wikipedia.org/wiki/Windows_Mobile
+        'WindowsMobileOS'   => 'Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Window Mobile|Windows Phone [0-9.]+|WCE;',
+        // @reference: http://en.wikipedia.org/wiki/Windows_Phone
+        // http://wifeng.cn/?r=blog&a=view&id=106
+        // http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx
+        'WindowsPhoneOS'   => 'Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7',
+        'iOS'               => '\biPhone.*Mobile|\biPod|\biPad',
+        // http://en.wikipedia.org/wiki/MeeGo
+        // @todo: research MeeGo in UAs
+        'MeeGoOS'           => 'MeeGo',
+        // http://en.wikipedia.org/wiki/Maemo
+        // @todo: research Maemo in UAs
+        'MaemoOS'           => 'Maemo',
+        'JavaOS'            => 'J2ME/|\bMIDP\b|\bCLDC\b', // '|Java/' produces bug #135
+        'webOS'             => 'webOS|hpwOS',
+        'badaOS'            => '\bBada\b',
+        'BREWOS'            => 'BREW',
+    );
+
+    /**
+     * List of mobile User Agents.
+     *
+     * @var array
+     */
+    protected static $browsers = array(
+        // @reference: https://developers.google.com/chrome/mobile/docs/user-agent
+        'Chrome'          => '\bCrMo\b|CriOS|Android.*Chrome/[.0-9]* (Mobile)?',
+        'Dolfin'          => '\bDolfin\b',
+        'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR/[0-9.]+|Coast/[0-9.]+',
+        'Skyfire'         => 'Skyfire',
+        'IE'              => 'IEMobile|MSIEMobile', // |Trident/[.0-9]+
+        'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile',
+        'Bolt'            => 'bolt',
+        'TeaShark'        => 'teashark',
+        'Blazer'          => 'Blazer',
+        // @reference: http://developer.apple.com/library/safari/#documentation/AppleApplications/Reference/SafariWebContent/OptimizingforSafarioniPhone/OptimizingforSafarioniPhone.html#//apple_ref/doc/uid/TP40006517-SW3
+        'Safari'          => 'Version.*Mobile.*Safari|Safari.*Mobile',
+        // @ref: http://en.wikipedia.org/wiki/Midori_(web_browser)
+        //'Midori'          => 'midori',
+        'Tizen'           => 'Tizen',
+        'UCBrowser'       => 'UC.*Browser|UCWEB',
+        // @ref: https://github.com/serbanghita/Mobile-Detect/issues/7
+        'DiigoBrowser'    => 'DiigoBrowser',
+        // http://www.puffinbrowser.com/index.php
+        'Puffin'            => 'Puffin',
+        // @ref: http://mercury-browser.com/index.html
+        'Mercury'          => '\bMercury\b',
+        // @reference: http://en.wikipedia.org/wiki/Minimo
+        // http://en.wikipedia.org/wiki/Vision_Mobile_Browser
+        'GenericBrowser'  => 'NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger'
+    );
+
+    /**
+     * Utilities.
+     *
+     * @var array
+     */
+    protected static $utilities = array(
+        // Experimental. When a mobile device wants to switch to 'Desktop Mode'.
+        // @ref: http://scottcate.com/technology/windows-phone-8-ie10-desktop-or-mobile/
+        // @ref: https://github.com/serbanghita/Mobile-Detect/issues/57#issuecomment-15024011
+        'DesktopMode' => 'WPDesktop',
+        'TV'          => 'SonyDTV|HbbTV', // experimental
+        'WebKit'      => '(webkit)[ /]([\w.]+)',
+        'Bot'         => 'Googlebot|DoCoMo|YandexBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|facebookexternalhit',
+        'MobileBot'   => 'Googlebot-Mobile|DoCoMo|YahooSeeker/M1A1-R2D2',
+        // @todo: Include JXD consoles.
+        'Console'     => '\b(Nintendo|Nintendo WiiU|PLAYSTATION|Xbox)\b',
+        'Watch'       => 'SM-V700',
+    );
+
+    /**
+     * All possible HTTP headers that represent the
+     * User-Agent string.
+     *
+     * @var array
+     */
+    protected static $uaHttpHeaders = array(
+        // The default User-Agent string.
+        'HTTP_USER_AGENT',
+        // Header can occur on devices using Opera Mini.
+        'HTTP_X_OPERAMINI_PHONE_UA',
+        // Vodafone specific header: http://www.seoprinciple.com/mobile-web-community-still-angry-at-vodafone/24/
+        'HTTP_X_DEVICE_USER_AGENT',
+        'HTTP_X_ORIGINAL_USER_AGENT',
+        'HTTP_X_SKYFIRE_PHONE',
+        'HTTP_X_BOLT_PHONE_UA',
+        'HTTP_DEVICE_STOCK_UA',
+        'HTTP_X_UCBROWSER_DEVICE_UA'
+    );
+
+    /**
+     * The individual segments that could exist in a User-Agent string. VER refers to the regular
+     * expression defined in the constant self::VER.
+     *
+     * @var array
+     */
+    protected static $properties = array(
+
+        // Build
+        'Mobile'        => 'Mobile/[VER]',
+        'Build'         => 'Build/[VER]',
+        'Version'       => 'Version/[VER]',
+        'VendorID'      => 'VendorID/[VER]',
+
+        // Devices
+        'iPad'          => 'iPad.*CPU[a-z ]+[VER]',
+        'iPhone'        => 'iPhone.*CPU[a-z ]+[VER]',
+        'iPod'          => 'iPod.*CPU[a-z ]+[VER]',
+        //'BlackBerry'    => array('BlackBerry[VER]', 'BlackBerry [VER];'),
+        'Kindle'        => 'Kindle/[VER]',
+
+        // Browser
+        'Chrome'        => array('Chrome/[VER]', 'CriOS/[VER]', 'CrMo/[VER]'),
+        'Coast'         => array('Coast/[VER]'),
+        'Dolfin'        => 'Dolfin/[VER]',
+        // @reference: https://developer.mozilla.org/en-US/docs/User_Agent_Strings_Reference
+        'Firefox'       => 'Firefox/[VER]',
+        'Fennec'        => 'Fennec/[VER]',
+        // @reference: http://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx
+        'IE'      => array('IEMobile/[VER];', 'IEMobile [VER]', 'MSIE [VER];'),
+        // http://en.wikipedia.org/wiki/NetFront
+        'NetFront'      => 'NetFront/[VER]',
+        'NokiaBrowser'  => 'NokiaBrowser/[VER]',
+        'Opera'         => array( ' OPR/[VER]', 'Opera Mini/[VER]', 'Version/[VER]' ),
+        'Opera Mini'    => 'Opera Mini/[VER]',
+        'Opera Mobi'    => 'Version/[VER]',
+        'UC Browser'    => 'UC Browser[VER]',
+        'MQQBrowser'    => 'MQQBrowser/[VER]',
+        'MicroMessenger' => 'MicroMessenger/[VER]',
+        // @note: Safari 7534.48.3 is actually Version 5.1.
+        // @note: On BlackBerry the Version is overwriten by the OS.
+        'Safari'        => array( 'Version/[VER]', 'Safari/[VER]' ),
+        'Skyfire'       => 'Skyfire/[VER]',
+        'Tizen'         => 'Tizen/[VER]',
+        'Webkit'        => 'webkit[ /][VER]',
+
+        // Engine
+        'Gecko'         => 'Gecko/[VER]',
+        'Trident'       => 'Trident/[VER]',
+        'Presto'        => 'Presto/[VER]',
+
+        // OS
+        'iOS'              => ' \bOS\b [VER] ',
+        'Android'          => 'Android [VER]',
+        'BlackBerry'       => array('BlackBerry[\w]+/[VER]', 'BlackBerry.*Version/[VER]', 'Version/[VER]'),
+        'BREW'             => 'BREW [VER]',
+        'Java'             => 'Java/[VER]',
+        // @reference: http://windowsteamblog.com/windows_phone/b/wpdev/archive/2011/08/29/introducing-the-ie9-on-windows-phone-mango-user-agent-string.aspx
+        // @reference: http://en.wikipedia.org/wiki/Windows_NT#Releases
+        'Windows Phone OS' => array( 'Windows Phone OS [VER]', 'Windows Phone [VER]'),
+        'Windows Phone'    => 'Windows Phone [VER]',
+        'Windows CE'       => 'Windows CE/[VER]',
+        // http://social.msdn.microsoft.com/Forums/en-US/windowsdeveloperpreviewgeneral/thread/6be392da-4d2f-41b4-8354-8dcee20c85cd
+        'Windows NT'       => 'Windows NT [VER]',
+        'Symbian'          => array('SymbianOS/[VER]', 'Symbian/[VER]'),
+        'webOS'            => array('webOS/[VER]', 'hpwOS/[VER];'),
+    );
+
+    /**
+     * Construct an instance of this class.
+     *
+     * @param array $headers Specify the headers as injection. Should be PHP _SERVER flavored.
+     *                       If left empty, will use the global _SERVER['HTTP_*'] vars instead.
+     * @param string $userAgent Inject the User-Agent header. If null, will use HTTP_USER_AGENT
+     *                          from the $headers array instead.
+     */
+    public function __construct(array $headers = null, $userAgent = null)
+    {
+        $this->setHttpHeaders($headers);
+        $this->setUserAgent($userAgent);
+    }
+
+    /**
+     * Get the current script version.
+     * This is useful for the demo.php file,
+     * so people can check on what version they are testing
+     * for mobile devices.
+     *
+     * @return string The version number in semantic version format.
+     */
+    public static function getScriptVersion()
+    {
+        return self::VERSION;
+    }
+
+    /**
+     * Set the HTTP Headers. Must be PHP-flavored. This method will reset existing headers.
+     *
+     * @param 	array 	$httpHeaders The headers to set. If null, then using PHP's _SERVER to extract
+     *                  	         the headers. The default null is left for backwards compatibilty.
+     * @return	void
+     */
+    public function setHttpHeaders($httpHeaders = null)
+    {
+        //use global _SERVER if $httpHeaders aren't defined
+        if (!is_array($httpHeaders) || !count($httpHeaders)) {
+            $httpHeaders = $_SERVER;
+        }
+
+        //clear existing headers
+        $this->httpHeaders = array();
+
+        //Only save HTTP headers. In PHP land, that means only _SERVER vars that
+        //start with HTTP_.
+        foreach ($httpHeaders as $key => $value) {
+            if (substr($key,0,5) == 'HTTP_') {
+                $this->httpHeaders[$key] = $value;
+            }
+        }
+    }
+
+    /**
+     * Retrieves the HTTP headers.
+     *
+     * @return array
+     */
+    public function getHttpHeaders()
+    {
+        return $this->httpHeaders;
+    }
+
+    /**
+     * Retrieves a particular header. If it doesn't exist, no exception/error is caused.
+     * Simply null is returned.
+     *
+     * @param string $header The name of the header to retrieve. Can be HTTP compliant such as
+     *                       "User-Agent" or "X-Device-User-Agent" or can be php-esque with the
+     *                       all-caps, HTTP_ prefixed, underscore seperated awesomeness.
+     *
+     * @return string|null The value of the header.
+     */
+    public function getHttpHeader($header)
+    {
+        //are we using PHP-flavored headers?
+        if (strpos($header, '_') === false) {
+            $header = str_replace('-', '_', $header);
+            $header = strtoupper($header);
+        }
+
+        //test the alternate, too
+        $altHeader = 'HTTP_' . $header;
+
+        //Test both the regular and the HTTP_ prefix
+        if (isset($this->httpHeaders[$header])) {
+            return $this->httpHeaders[$header];
+        } elseif (isset($this->httpHeaders[$altHeader])) {
+            return $this->httpHeaders[$altHeader];
+        }
+
+        return null;
+    }
+
+    public function getMobileHeaders()
+    {
+        return self::$mobileHeaders;
+    }
+
+    /**
+     * Get all possible HTTP headers that
+     * can contain the User-Agent string.
+     *
+     * @return array List of HTTP headers.
+     */
+    public function getUaHttpHeaders()
+    {
+        return self::$uaHttpHeaders;
+    }
+
+    /**
+     * Set the User-Agent to be used.
+     *
+     * @param string $userAgent The user agent string to set.
+     *
+     * @return string|null
+     */
+    public function setUserAgent($userAgent = null)
+    {
+        if (!empty($userAgent)) {
+            return $this->userAgent = $userAgent;
+        } else {
+
+            $this->userAgent = null;
+
+            foreach($this->getUaHttpHeaders() as $altHeader){
+                if(!empty($this->httpHeaders[$altHeader])){ // @todo: should use getHttpHeader(), but it would be slow. (Serban)
+                    $this->userAgent .= $this->httpHeaders[$altHeader] . " ";
+                }
+            }
+
+            return $this->userAgent = (!empty($this->userAgent) ? trim($this->userAgent) : null);
+
+        }
+    }
+
+    /**
+     * Retrieve the User-Agent.
+     *
+     * @return string|null The user agent if it's set.
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
+
+    /**
+     * Set the detection type. Must be one of self::DETECTION_TYPE_MOBILE or
+     * self::DETECTION_TYPE_EXTENDED. Otherwise, nothing is set.
+     *
+     * @param 	string 	$type 	The type. Must be a self::DETECTION_TYPE_* constant. The default
+     *                     		parameter is null which will default to self::DETECTION_TYPE_MOBILE.
+     * @return	void
+     *
+     * @deprecated since version 2.6.9
+     */
+    public function setDetectionType($type = null)
+    {
+        if ($type === null) {
+            $type = self::DETECTION_TYPE_MOBILE;
+        }
+
+        if ($type != self::DETECTION_TYPE_MOBILE && $type != self::DETECTION_TYPE_EXTENDED) {
+            return;
+        }
+
+        $this->detectionType = $type;
+    }
+
+    /**
+     * Retrieve the list of known phone devices.
+     *
+     * @return array List of phone devices.
+     */
+    public static function getPhoneDevices()
+    {
+        return self::$phoneDevices;
+    }
+
+    /**
+     * Retrieve the list of known tablet devices.
+     *
+     * @return array List of tablet devices.
+     */
+    public static function getTabletDevices()
+    {
+        return self::$tabletDevices;
+    }
+
+    /**
+     * Alias for getBrowsers() method.
+     *
+     * @return array List of user agents.
+     */
+    public static function getUserAgents()
+    {
+        return self::getBrowsers();
+    }
+
+    /**
+     * Retrieve the list of known browsers. Specifically, the user agents.
+     *
+     * @return array List of browsers / user agents.
+     */
+    public static function getBrowsers()
+    {
+        return self::$browsers;
+    }
+
+    /**
+     * Retrieve the list of known utilities.
+     *
+     * @return array List of utilities.
+     */
+    public static function getUtilities()
+    {
+        return self::$utilities;
+    }
+
+    /**
+     * Method gets the mobile detection rules. This method is used for the magic methods $detect->is*().
+     *
+     * @deprecated since version 2.6.9
+     *
+     * @return array All the rules (but not extended).
+     */
+    public static function getMobileDetectionRules()
+    {
+        static $rules;
+
+        if (!$rules) {
+            $rules = array_merge(
+                self::$phoneDevices,
+                self::$tabletDevices,
+                self::$operatingSystems,
+                self::$browsers
+            );
+        }
+
+        return $rules;
+
+    }
+
+    /**
+     * Method gets the mobile detection rules + utilities.
+     * The reason this is separate is because utilities rules
+     * don't necessary imply mobile. This method is used inside
+     * the new $detect->is('stuff') method.
+     *
+     * @deprecated since version 2.6.9
+     *
+     * @return array All the rules + extended.
+     */
+    public function getMobileDetectionRulesExtended()
+    {
+        static $rules;
+
+        if (!$rules) {
+            // Merge all rules together.
+            $rules = array_merge(
+                self::$phoneDevices,
+                self::$tabletDevices,
+                self::$operatingSystems,
+                self::$browsers,
+                self::$utilities
+            );
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Retrieve the current set of rules.
+     *
+     * @deprecated since version 2.6.9
+     *
+     * @return array
+     */
+    public function getRules()
+    {
+        if ($this->detectionType == self::DETECTION_TYPE_EXTENDED) {
+            return self::getMobileDetectionRulesExtended();
+        } else {
+            return self::getMobileDetectionRules();
+        }
+    }
+
+    /**
+     * Retrieve the list of mobile operating systems.
+     *
+     * @return array The list of mobile operating systems.
+     */
+    public static function getOperatingSystems()
+    {
+        return self::$operatingSystems;
+    }
+
+    /**
+     * Check the HTTP headers for signs of mobile.
+     * This is the fastest mobile check possible; it's used
+     * inside isMobile() method.
+     *
+     * @return bool
+     */
+    public function checkHttpHeadersForMobile()
+    {
+
+        foreach($this->getMobileHeaders() as $mobileHeader => $matchType){
+            if( isset($this->httpHeaders[$mobileHeader]) ){
+                if( is_array($matchType['matches']) ){
+                    foreach($matchType['matches'] as $_match){
+                        if( strpos($this->httpHeaders[$mobileHeader], $_match) !== false ){
+                            return true;
+                        }
+                    }
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Magic overloading method.
+     *
+     * @param  string                 $name			Name
+     * @param  array                  $arguments	Arguments
+     * @return mixed
+     *
+     * @throws BadMethodCallException when the method doesn't exist and doesn't start with 'is'
+     * @method boolean is[...]()
+     */
+    public function __call($name, $arguments)
+    {
+        //make sure the name starts with 'is', otherwise
+        if (substr($name, 0, 2) != 'is') {
+            throw new BadMethodCallException("No such method exists: $name");
+        }
+
+        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
+
+        $key = substr($name, 2);
+
+        return $this->matchUAAgainstKey($key);
+    }
+
+    /**
+     * Find a detection rule that matches the current User-agent.
+     *
+     * @param null $userAgent deprecated
+     * @return boolean
+     */
+    protected function matchDetectionRulesAgainstUA($userAgent = null)
+    {
+        // Begin general search.
+        foreach ($this->getRules() as $_regex) {
+            if (empty($_regex)) {
+                continue;
+            }
+            if ($this->match($_regex, $userAgent)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Search for a certain key in the rules array.
+     * If the key is found the try to match the corresponding
+     * regex agains the User-Agent.
+     *
+     * @param 	string 	$key		Key
+     * @param 	string 	$userAgent 	deprecated
+     * @return 	mixed
+     */
+    protected function matchUAAgainstKey($key, $userAgent = null)
+    {
+        // Make the keys lowercase so we can match: isIphone(), isiPhone(), isiphone(), etc.
+        $key = strtolower($key);
+
+        //change the keys to lower case
+        $_rules = array_change_key_case($this->getRules());
+
+        if (array_key_exists($key, $_rules)) {
+            if (empty($_rules[$key])) {
+                return null;
+            }
+
+            return $this->match($_rules[$key], $userAgent);
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if the device is mobile.
+     * Returns true if any type of mobile device detected, including special ones
+     *
+     * @param 	string	$userAgent 		deprecated
+     * @param 	string	$httpHeaders 	deprecated
+     * @return bool
+     */
+    public function isMobile($userAgent = null, $httpHeaders = null)
+    {
+
+        if ($httpHeaders) {
+            $this->setHttpHeaders($httpHeaders);
+        }
+
+        if ($userAgent) {
+            $this->setUserAgent($userAgent);
+        }
+
+        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
+
+        if ($this->checkHttpHeadersForMobile())
+        {
+        	//print "Found it's a mobile from http header";
+            return true;
+        }
+        else
+		{
+        	//print "Check into user agent ".$this->getUserAgent();
+        	return $this->matchDetectionRulesAgainstUA();
+        }
+
+    }
+
+    /**
+     * Check if the device is a tablet.
+     * Return true if any type of tablet device is detected.
+     *
+     * @param  string $userAgent   deprecated
+     * @param  array  $httpHeaders deprecated
+     * @return bool
+     */
+    public function isTablet($userAgent = null, $httpHeaders = null)
+    {
+        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
+
+        foreach (self::$tabletDevices as $_regex) {
+            if ($this->match($_regex, $userAgent)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * This method checks for a certain property in the
+     * userAgent.
+     *
+     * @param string 		$key			key
+     * @param string        $userAgent   	deprecated
+     * @param string        $httpHeaders 	deprecated
+     * @return bool|int|null
+     *
+     * @todo: The httpHeaders part is not yet used.
+     */
+    public function is($key, $userAgent = null, $httpHeaders = null)
+    {
+        // Set the UA and HTTP headers only if needed (eg. batch mode).
+        if ($httpHeaders) {
+            $this->setHttpHeaders($httpHeaders);
+        }
+
+        if ($userAgent) {
+            $this->setUserAgent($userAgent);
+        }
+
+        $this->setDetectionType(self::DETECTION_TYPE_EXTENDED);
+
+        return $this->matchUAAgainstKey($key);
+    }
+
+    /**
+     * Some detection rules are relative (not standard),
+     * because of the diversity of devices, vendors and
+     * their conventions in representing the User-Agent or
+     * the HTTP headers.
+     * This method will be used to check custom regexes against
+     * the User-Agent string.
+     *
+     * @param 	string	$regex		Regex
+     * @param  	string 	$userAgent	User agent
+     * @return 	bool
+     *
+     * @todo: search in the HTTP headers too.
+     */
+    public function match($regex, $userAgent = null)
+    {
+        // Escape the special character which is the delimiter.
+        $regex = str_replace('/', '\/', $regex);
+
+        return (bool) preg_match('/'.$regex.'/is', (!empty($userAgent) ? $userAgent : $this->userAgent));
+    }
+
+    /**
+     * Get the properties array.
+     *
+     * @return array
+     */
+    public static function getProperties()
+    {
+        return self::$properties;
+    }
+
+    /**
+     * Prepare the version number.
+     *
+     * @param 	string 	$ver 	The string version, like "2.6.21.2152";
+     * @return float
+     *
+     * @todo Remove the error supression from str_replace() call.
+     */
+    public function prepareVersionNo($ver)
+    {
+        $ver = str_replace(array('_', ' ', '/'), '.', $ver);
+        $arrVer = explode('.', $ver, 2);
+
+        if (isset($arrVer[1])) {
+            $arrVer[1] = @str_replace('.', '', $arrVer[1]); // @todo: treat strings versions.
+        }
+
+        return (float) implode('.', $arrVer);
+    }
+
+    /**
+     * Check the version of the given property in the User-Agent.
+     * Will return a string or float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+     *
+     * @param string $propertyName 	The name of the property. See self::getProperties() array keys for all possible properties (Ex: 'iPad', 'Android', ...).
+     * @param string $type 			Either self::VERSION_TYPE_STRING to get a string value or
+     *                      		self::VERSION_TYPE_FLOAT indicating a float value. This parameter
+     *                      		is optional and defaults to self::VERSION_TYPE_STRING. Passing an
+     *                      		invalid parameter will default to this type as well.
+     *
+     * @return string|float|boolean The version of the property we are trying to extract.
+     */
+    public function version($propertyName, $type = self::VERSION_TYPE_STRING)
+    {
+        if (empty($propertyName)) return false;
+
+        //set the $type to the default if we don't recognize the type
+        if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT)
+        {
+            $type = self::VERSION_TYPE_STRING;
+        }
+
+        $properties = self::getProperties();
+
+        // Check if the property exists in the properties array.
+        if (array_key_exists($propertyName, $properties))
+        {
+            // Prepare the pattern to be matched.
+            // Make sure we always deal with an array (string is converted).
+            $properties[$propertyName] = (array) $properties[$propertyName];
+
+            foreach ($properties[$propertyName] as $propertyMatchString)
+            {
+                $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
+
+                // Escape the special character which is the delimiter.
+                $propertyPattern = str_replace('/', '\/', $propertyPattern);
+
+                // Identify and extract the version.
+                preg_match('/'.$propertyPattern.'/is', $this->userAgent, $match);
+
+                if (!empty($match[1]))
+                {
+                    $version = ( $type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1] );
+
+                    return $version;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieve the mobile grading, using self::MOBILE_GRADE_* constants.
+     *
+     * @return string 		One of the self::MOBILE_GRADE_* constants.
+     */
+    public function mobileGrade()
+    {
+        $isMobile = $this->isMobile();
+
+        if (
+            // Apple iOS 3.2-5.1 - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), iPad 3 (5.1), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), 4 (4.3 / 5.0), and 4S (5.1)
+            $this->isIOS() && $this->version('iPad', self::VERSION_TYPE_FLOAT)>=4.3 ||
+            $this->isIOS() && $this->version('iPhone', self::VERSION_TYPE_FLOAT)>=3.1 ||
+            $this->isIOS() && $this->version('iPod', self::VERSION_TYPE_FLOAT)>=3.1 ||
+
+            // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
+            // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
+            // Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
+            // Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
+            ( $this->version('Android', self::VERSION_TYPE_FLOAT)>2.1 && $this->is('Webkit') ) ||
+
+            // Windows Phone 7-7.5 - Tested on the HTC Surround (7.0) HTC Trophy (7.5), LG-E900 (7.5), Nokia Lumia 800
+            $this->version('Windows Phone OS', self::VERSION_TYPE_FLOAT)>=7.0 ||
+
+            // Blackberry 7 - Tested on BlackBerry Torch 9810
+            // Blackberry 6.0 - Tested on the Torch 9800 and Style 9670
+            $this->is('BlackBerry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)>=6.0 ||
+            // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
+            $this->match('Playbook.*Tablet') ||
+
+            // Palm WebOS (1.4-2.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0)
+            ( $this->version('webOS', self::VERSION_TYPE_FLOAT)>=1.4 && $this->match('Palm|Pre|Pixi') ) ||
+            // Palm WebOS 3.0  - Tested on HP TouchPad
+            $this->match('hp.*TouchPad') ||
+
+            // Firefox Mobile (12 Beta) - Tested on Android 2.3 device
+            ( $this->is('Firefox') && $this->version('Firefox', self::VERSION_TYPE_FLOAT)>=12 ) ||
+
+            // Chrome for Android - Tested on Android 4.0, 4.1 device
+            ( $this->is('Chrome') && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT)>=4.0 ) ||
+
+            // Skyfire 4.1 - Tested on Android 2.3 device
+            ( $this->is('Skyfire') && $this->version('Skyfire', self::VERSION_TYPE_FLOAT)>=4.1 && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT)>=2.3 ) ||
+
+            // Opera Mobile 11.5-12: Tested on Android 2.3
+            ( $this->is('Opera') && $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT)>11 && $this->is('AndroidOS') ) ||
+
+            // Meego 1.2 - Tested on Nokia 950 and N9
+            $this->is('MeeGoOS') ||
+
+            // Tizen (pre-release) - Tested on early hardware
+            $this->is('Tizen') ||
+
+            // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
+            // @todo: more tests here!
+            $this->is('Dolfin') && $this->version('Bada', self::VERSION_TYPE_FLOAT)>=2.0 ||
+
+            // UC Browser - Tested on Android 2.3 device
+            ( ($this->is('UC Browser') || $this->is('Dolfin')) && $this->version('Android', self::VERSION_TYPE_FLOAT)>=2.3 ) ||
+
+            // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
+            ( $this->match('Kindle Fire') ||
+            $this->is('Kindle') && $this->version('Kindle', self::VERSION_TYPE_FLOAT)>=3.0 ) ||
+
+            // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
+            $this->is('AndroidOS') && $this->is('NookTablet') ||
+
+            // Chrome Desktop 11-21 - Tested on OS X 10.7 and Windows 7
+            $this->version('Chrome', self::VERSION_TYPE_FLOAT)>=11 && !$isMobile ||
+
+            // Safari Desktop 4-5 - Tested on OS X 10.7 and Windows 7
+            $this->version('Safari', self::VERSION_TYPE_FLOAT)>=5.0 && !$isMobile ||
+
+            // Firefox Desktop 4-13 - Tested on OS X 10.7 and Windows 7
+            $this->version('Firefox', self::VERSION_TYPE_FLOAT)>=4.0 && !$isMobile ||
+
+            // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
+            $this->version('MSIE', self::VERSION_TYPE_FLOAT)>=7.0 && !$isMobile ||
+
+            // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
+            // @reference: http://my.opera.com/community/openweb/idopera/
+            $this->version('Opera', self::VERSION_TYPE_FLOAT)>=10 && !$isMobile
+
+        )
+        {
+            return self::MOBILE_GRADE_A;
+        }
+
+        if (
+            $this->isIOS() && $this->version('iPad', self::VERSION_TYPE_FLOAT)<4.3 ||
+            $this->isIOS() && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<3.1 ||
+            $this->isIOS() && $this->version('iPod', self::VERSION_TYPE_FLOAT)<3.1 ||
+
+            // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
+            $this->is('Blackberry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)>=5 && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<6 ||
+
+            //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
+            ( $this->version('Opera Mini', self::VERSION_TYPE_FLOAT)>=5.0 && $this->version('Opera Mini', self::VERSION_TYPE_FLOAT)<=6.5 &&
+            ($this->version('Android', self::VERSION_TYPE_FLOAT)>=2.3 || $this->is('iOS')) ) ||
+
+            // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
+            $this->match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
+
+            // @todo: report this (tested on Nokia N71)
+            $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT)>=11 && $this->is('SymbianOS')
+        )
+        {
+            return self::MOBILE_GRADE_B;
+        }
+
+        if (
+            // Blackberry 4.x - Tested on the Curve 8330
+            $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<5.0 ||
+            // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
+            $this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT)<=5.2
+
+        )
+        {
+            return self::MOBILE_GRADE_C;
+        }
+
+        //All older smartphone platforms and featurephones - Any device that doesn't support media queries
+        //will receive the basic, C grade experience.
+        return self::MOBILE_GRADE_C;
+    }
+}
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 317b00dd33a..db88671f7ff 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +33,7 @@ class Notify
     var $id;
     var $db;
     var $error;
+    var $errors=array();
 
     var $author;
     var $ref;
@@ -84,34 +86,50 @@ class Notify
 	{
 		global $conf;
 
-        $num=-1;
+		$error=0;
+        $num=0;
 
-        $sql = "SELECT n.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
-        $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-        $sql.= " ".MAIN_DB_PREFIX."societe as s";
-        $sql.= " WHERE n.fk_contact = c.rowid";
-        $sql.= " AND a.rowid = n.fk_action";
-        $sql.= " AND n.fk_soc = s.rowid";
-        if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action;	// Old usage
-        else $sql.= " AND a.code = '".$action."'";	// New usage
-        $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
-        $sql.= " AND s.rowid = ".$socid;
-
-		dol_syslog("Notify.class::countDefinedNotifications ".$action.", ".$socid." sql=".$sql);
-
-        $resql = $this->db->query($sql);
-        if ($resql)
+        if (! $error)
         {
-            $num = $this->db->num_rows($resql);
-		}
-		else
+	        $sql = "SELECT n.rowid";
+	        $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,";
+	        $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
+	        $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	        $sql.= " ".MAIN_DB_PREFIX."societe as s";
+	        $sql.= " WHERE n.fk_contact = c.rowid";
+	        $sql.= " AND a.rowid = n.fk_action";
+	        $sql.= " AND n.fk_soc = s.rowid";
+	        if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action;	// Old usage
+	        else $sql.= " AND a.code = '".$action."'";	// New usage
+	        $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+	        $sql.= " AND s.rowid = ".$socid;
+
+			dol_syslog(get_class($this)."::countDefinedNotifications ".$action.", ".$socid."", LOG_DEBUG);
+
+	        $resql = $this->db->query($sql);
+	        if ($resql)
+	        {
+	            $num = $this->db->num_rows($resql);
+			}
+			else
+			{
+				$error++;
+				$this->error=$this->db->error.' sql='.$sql;
+			}
+        }
+
+		if (! $error)
 		{
-			$this->error=$this->db->error.' sql='.$sql;
-			return -1;
+		    // List of notifications enabled for fixed email
+		    foreach($conf->global as $key => $val)
+		    {
+		    	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$action.'/', $key, $reg)) continue;
+		    	$num++;
+		    }
 		}
 
+		// TODO return array with list of email instead of number, + type of notification (contacts or fixed email)
+		if ($error) return -1;
 		return $num;
 	}
 
@@ -120,23 +138,43 @@ class Notify
      * 	If yes, send mail and save trace into llx_notify.
      *
      * 	@param	string	$action		Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage)
-     * 	@param	int		$socid		Id of third party
-     * 	@param	string	$texte		Message to send
-     * 	@param	string	$objet_type	Type of object the notification deals on (facture, order, propal, order_supplier...). Just for log in llx_notify.
-     * 	@param	int		$objet_id	Id of object the notification deals on
-     * 	@param	string	$file		Attach a file
+     * 	@param	Object	$object		Object the notification deals on
      *	@return	int					<0 if KO, or number of changes if OK
      */
-    function send($action, $socid, $texte, $objet_type, $objet_id, $file="")
+    function send($action, $object)
     {
         global $conf,$langs,$mysoc,$dolibarr_main_url_root;
 
-        $langs->load("other");
+	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		dol_syslog(get_class($this)."::send action=".$action.", socid=".$socid.", texte=".$texte.", objet_type=".$objet_type.", objet_id=".$objet_id.", file=".$file);
+		dol_syslog(get_class($this)."::send action=".$action.", object=".$object->id);
 
-		$sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname,";
-		$sql.= " a.rowid as adid, a.label, a.code, n.rowid";
+    	$langs->load("other");
+
+		// Define $urlwithroot
+	    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
+
+		// Define some vars
+	    $application = $mysoc->name;
+	    //if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $application = $conf->global->MAIN_APPLICATION_TITLE;
+	    $replyto = $conf->notification->email_from;
+	    $filename = basename($file);
+        $mimefile = dol_mimetype($file);
+		$object_type = '';
+        $link = '';
+		$num = 0;
+
+		if (! in_array($action, array('BILL_VALIDATE', 'ORDER_VALIDATE', 'PROPAL_VALIDATE', 'FICHINTER_VALIDATE', 'ORDER_SUPPLIER_APPROVE', 'ORDER_SUPPLIER_REFUSE', 'SHIPPING_VALIDATE')))
+		{
+			return 0;
+		}
+
+
+		// Check notification per third party
+		$sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,";
+		$sql.= " a.rowid as adid, a.label, a.code, n.rowid, n.type";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
         $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
         $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
@@ -145,109 +183,262 @@ class Notify
         $sql.= " AND n.fk_soc = s.rowid";
         if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action;	// Old usage
         else $sql.= " AND a.code = '".$action."'";	// New usage
-        $sql .= " AND s.rowid = ".$socid;
+        $sql .= " AND s.rowid = ".$object->socid;
 
-		dol_syslog("Notify::send sql=".$sql);
         $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)	// For each notification couple defined (third party/actioncode)
+
+            if ($num > 0)
             {
-                $obj = $this->db->fetch_object($result);
+	            $i = 0;
+	            while ($i < $num && ! $error)	// For each notification couple defined (third party/actioncode)
+	            {
+	                $obj = $this->db->fetch_object($result);
 
-                $sendto = $obj->firstname . " " . $obj->lastname . " <".$obj->email.">";
-				$actiondefid = $obj->adid;
+	                $sendto = $obj->firstname . " " . $obj->lastname . " <".$obj->email.">";
+					$actiondefid = $obj->adid;
 
-                if (dol_strlen($sendto))
-                {
-                	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-                	$application=($conf->global->MAIN_APPLICATION_TITLE?$conf->global->MAIN_APPLICATION_TITLE:'Dolibarr ERP/CRM');
+	                if (dol_strlen($obj->email))
+	                {
+	                	// Set output language
+	                	$outputlangs = $langs;
+	                	if ($obj->default_lang && $obj->default_lang != $langs->defaultlang)
+	                	{
+	                		$outputlangs = new Translate('', $conf);
+	                		$outputlangs->setDefaultLang($obj->default_lang);
+	                	}
 
-                	$subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");
+	                    switch ($action) {
+							case 'BILL_VALIDATE':
+								$link='/compta/facture.php?facid='.$object->id;
+								$dir_output = $conf->facture->dir_output;
+								$object_type = 'facture';
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref);
+								break;
+							case 'ORDER_VALIDATE':
+								$link='/commande/card.php?id='.$object->id;
+								$dir_output = $conf->commande->dir_output;
+								$object_type = 'order';
+								$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref);
+								break;
+							case 'PROPAL_VALIDATE':
+								$link='/comm/propal.php?id='.$object->id;
+								$dir_output = $conf->propal->dir_output;
+								$object_type = 'propal';
+								$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref);
+								break;
+							case 'FICHINTER_VALIDATE':
+								$link='/fichinter/card.php?id='.$object->id;
+								$dir_output = $conf->facture->dir_output;
+								$object_type = 'ficheinter';
+								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref);
+								break;
+							case 'ORDER_SUPPLIER_APPROVE':
+								$link='/fourn/commande/card.php?id='.$object->id;
+								$dir_output = $conf->fournisseur->dir_output.'/commande/';
+								$object_type = 'order_supplier';
+								$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs));
+								$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+								break;
+							case 'ORDER_SUPPLIER_REFUSE':
+								$link='/fourn/commande/card.php?id='.$object->id;
+								$dir_output = $conf->fournisseur->dir_output.'/commande/';
+								$object_type = 'order_supplier';
+								$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+								$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs));
+								$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+								break;
+							case 'SHIPPING_VALIDATE':
+								$dir_output = $conf->expedition->dir_output.'/sending/';
+								$object_type = 'order_supplier';
+								$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref);
+								break;
+						}
+                    	$ref = dol_sanitizeFileName($object->ref);
+						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
+						if (! dol_is_file($pdf_path))
+						{
+							// We can't add PDF as it is not generated yet.
+							$filepdf = '';
+						}
+						else
+						{
+							$filepdf = $pdf_path;
+						}
 
-                	$message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
-                	$message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
-                	$message.= "\n";
-                    $message.= $texte;
-                    // Add link
-                    $link='';
-                    switch($objet_type)
-                    {
-                    	case 'ficheinter':
-						    $link='/fichinter/fiche.php?id='.$objet_id;
-    						break;
-                    	case 'propal':
-						    $link='/comm/propal.php?id='.$objet_id;
-    						break;
-    					case 'facture':
-						    $link='/compta/facture.php?facid='.$objet_id;
-    						break;
-                    	case 'order':
-						    $link='/commande/fiche.php?id='.$objet_id;
-    						break;
-    					case 'order_supplier':
-						    $link='/fourn/commande/fiche.php?id='.$objet_id;
-    						break;
-                    }
-					// Define $urlwithroot
-                    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-					$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;			// This is to use external domain name found into config file
-					//$urlwithroot=DOL_MAIN_URL_ROOT;						// This is to use same domain name than current
-                    if ($link) $message.="\n".$urlwithroot.$link;
+	    				$subject = '['.$application.'] '.$outputlangs->transnoentitiesnoconv("DolibarrNotification");
 
-                    $filename = basename($file);
+	                	$message = $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
+	                	$message.= $outputlangs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
+	                	$message.= "\n";
+	                    $message.= $mesg;
+	                    if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
 
-                    $mimefile=dol_mimetype($file);
+	                    $mailfile = new CMailFile(
+	                        $subject,
+	                        $sendto,
+	                        $replyto,
+	                        $message,
+	                        array($file),
+	                        array($mimefile),
+	                        array($filename[count($filename)-1]),
+	                        '',
+	                        '',
+	                        0,
+	                        -1
+	                    );
 
-                    $msgishtml=0;
-
-                    $replyto = $conf->notification->email_from;
-
-                    $mailfile = new CMailFile(
-                        $subject,
-                        $sendto,
-                        $replyto,
-                        $message,
-                        array($file),
-                        array($mimefile),
-                        array($filename[count($filename)-1]),
-                        '',
-                        '',
-                        0,
-                        $msgishtml
-                    );
-
-                    if ($mailfile->sendfile())
-                    {
-                    	$now=dol_now();
-                        $sendto = htmlentities($sendto);
-
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_contact, objet_type, objet_id, email)";
-                        $sql.= " VALUES ('".$this->db->idate($now)."', ".$actiondefid.", ".$obj->cid.", '".$objet_type."', ".$objet_id.", '".$this->db->escape($obj->email)."')";
-                        dol_syslog("Notify::send sql=".$sql);
-                        if (! $this->db->query($sql) )
-                        {
-                            dol_print_error($this->db);
-                        }
-                    }
-                    else
-                    {
-                        $this->error=$mailfile->error;
-                        //dol_syslog("Notify::send ".$this->error, LOG_ERR);
-                    }
-                }
-                $i++;
+	                    if ($mailfile->sendfile())
+	                    {
+	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)";
+	                        $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", ".$obj->cid.", '".$obj->type."', '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')";
+	                        if (! $this->db->query($sql))
+	                        {
+	                            dol_print_error($this->db);
+	                        }
+	                    }
+	                    else
+						{
+							$error++;
+	                        $this->errors[]=$mailfile->error;
+	                    }
+	                }
+	                else
+	              {
+	                	dol_syslog("No notification sent for ".$sendto." because email is empty");
+	                }
+	                $i++;
+	            }
             }
-            return $i;
+            else
+			{
+	            dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
+			}
         }
         else
-        {
-            $this->error=$this->db->error();
+       {
+       		$error++;
+            $this->errors[]=$this->db->lasterror();
             return -1;
         }
 
+        // Check notification using fixed email
+        if (! $error)
+        {
+	        $param='NOTIFICATION_FIXEDEMAIL_'.$action;
+	        if (! empty($conf->global->$param))
+	        {
+				$sendto = $conf->global->$param;
+				$actiondefid = dol_getIdFromCode($this->db, $action, 'c_action_trigger', 'code', 'rowid');
+				if ($actiondefid <= 0) dol_print_error($this->db, 'Failed to get id from code');
+
+				$object_type = '';
+		        $link = '';
+        		$num++;
+
+				switch ($action) {
+					case 'BILL_VALIDATE':
+						$link='/compta/facture.php?facid='.$object->id;
+						$dir_output = $conf->facture->dir_output;
+						$object_type = 'facture';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref);
+						break;
+					case 'ORDER_VALIDATE':
+						$link='/commande/card.php?id='.$object->id;
+						$dir_output = $conf->commande->dir_output;
+						$object_type = 'order';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref);
+						break;
+					case 'PROPAL_VALIDATE':
+						$link='/comm/propal.php?id='.$object->id;
+						$dir_output = $conf->propal->dir_output;
+						$object_type = 'propal';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref);
+						break;
+					case 'FICHINTER_VALIDATE':
+						$link='/fichinter/card.php?id='.$object->id;
+						$dir_output = $conf->facture->dir_output;
+						$object_type = 'ficheinter';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref);
+						break;
+					case 'ORDER_SUPPLIER_APPROVE':
+						$link='/fourn/commande/card.php?id='.$object->id;
+						$dir_output = $conf->fournisseur->dir_output.'/commande/';
+						$object_type = 'order_supplier';
+						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs));
+						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						break;
+					case 'ORDER_SUPPLIER_REFUSE':
+						$link='/fourn/commande/card.php?id='.$object->id;
+						$dir_output = $conf->fournisseur->dir_output.'/commande/';
+						$object_type = 'order_supplier';
+						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
+						$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs));
+						$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
+						break;
+					case 'SHIPPING_VALIDATE':
+						$dir_output = $conf->expedition->dir_output.'/sending/';
+						$object_type = 'order_supplier';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref);
+						break;
+				}
+				$ref = dol_sanitizeFileName($object->ref);
+				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
+				if (! dol_is_file($pdf_path))
+				{
+					// We can't add PDF as it is not generated yet.
+					$filepdf = '';
+				}
+				else
+				{
+					$filepdf = $pdf_path;
+				}
+
+				$subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");
+
+				$message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n";
+				$message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n";
+				$message.= "\n";
+				$message.= $mesg;
+				if ($link) $message=dol_concatdesc($message,$urlwithroot.$link);
+
+				$mailfile = new CMailFile(
+					$subject,
+					$sendto,
+					$replyto,
+					$message,
+					array($file),
+					array($mimefile),
+					array($filename[count($filename)-1]),
+					'',
+					'',
+					0,
+					-1
+				);
+
+				if ($mailfile->sendfile())
+				{
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)";
+					$sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", null, '".$obj->type."', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')";
+					if (! $this->db->query($sql))
+					{
+						dol_print_error($this->db);
+					}
+				}
+				else
+				{
+					$error++;
+					$this->errors[]=$mailfile->error;
+				}
+	        }
+        }
+
+		if (! $error) return $num;
+		else return -1 * $error;
     }
 
 }
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index d9a7d8348d6..5a156b1eda7 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -194,7 +194,7 @@ class RssParser
         }
 
         $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS);
+        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
         $newmask='0644';
 
         //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 61a098330c2..5c7d73eb136 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1159,7 +1159,7 @@ class SMTPs
 		$this->_msgContent[$strType]['data']     = $strContent;
 
 		if ( $this->getMD5flag() )
-		$this->_msgContent[$strType]['md5']      = dol_hash($strContent);
+		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
 		//}
 	}
 
@@ -1329,7 +1329,7 @@ class SMTPs
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
 			if ( $this->getMD5flag() )
-			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent);
+			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
 
@@ -1356,7 +1356,7 @@ class SMTPs
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
 			if ( $this->getMD5flag() )
-			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent);
+			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
 	// END DOL_CHANGE LDR
@@ -1487,8 +1487,8 @@ class SMTPs
 	function _setBoundary()
 	{
 		$this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
-		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"));
-		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"));
+		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
+		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
 	}
 
 	/**
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 5018d63cecf..8a4ffd29d68 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -81,7 +81,7 @@ abstract class Stats
 		if ($foundintocache)    // Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-			$data = dol_json_decode(file_get_contents($newpathofdestfile), true);
+			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		}
 		else
 		{
@@ -112,7 +112,7 @@ abstract class Stats
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
 			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, dol_json_encode($data));
+			fwrite($fp, json_encode($data));
 			fclose($fp);
 			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
 			@chmod($newpathofdestfile, octdec($newmask));
@@ -172,7 +172,7 @@ abstract class Stats
         if ($foundintocache)    // Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = dol_json_decode(file_get_contents($newpathofdestfile), true);
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
         else
 		{
@@ -203,7 +203,7 @@ abstract class Stats
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
 			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, dol_json_encode($data));
+			fwrite($fp, json_encode($data));
 			fclose($fp);
 			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
 			@chmod($newpathofdestfile, octdec($newmask));
@@ -295,7 +295,7 @@ abstract class Stats
         if ($foundintocache)    // Cache file found and is not too old
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
-        	$data = dol_json_decode(file_get_contents($newpathofdestfile), true);
+        	$data = json_decode(file_get_contents($newpathofdestfile), true);
         }
         else
 		{
@@ -309,7 +309,7 @@ abstract class Stats
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
 			if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
 			$fp = fopen($newpathofdestfile, 'w');
-			fwrite($fp, dol_json_encode($data));
+			fwrite($fp, json_encode($data));
 			fclose($fp);
 			if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
 			@chmod($newpathofdestfile, octdec($newmask));
@@ -334,7 +334,7 @@ abstract class Stats
 	{
 		$result = array();
 
-		dol_syslog(get_class($this).'::'.__FUNCTION__." sql=".$sql);
+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -364,7 +364,7 @@ abstract class Stats
 	{
 		$result = array();
 
-		dol_syslog(get_class($this).'::'.__FUNCTION__." sql=".$sql);
+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -400,7 +400,7 @@ abstract class Stats
 		$result=array();
 		$res=array();
 
-		dol_syslog(get_class($this).'::'.__FUNCTION__." sql=".$sql);
+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -451,7 +451,7 @@ abstract class Stats
 		$result=array();
 		$res=array();
 
-		dol_syslog(get_class($this).'::'.__FUNCTION__." sql=".$sql);
+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -499,7 +499,7 @@ abstract class Stats
 		$result=array();
 		$res=array();
 
-		dol_syslog(get_class($this).'::'.__FUNCTION__." sql=".$sql);
+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -548,7 +548,7 @@ abstract class Stats
 		$result=array();
 		$res=array();
 
-		dol_syslog(get_class($this).'::'.__FUNCTION__." sql=".$sql);
+		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index c076cc3e874..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
@@ -154,7 +153,7 @@ class Translate
  	 *										If $domain is "file@module" instead of "file" then we look for module lang file
 	 *										in htdocs/custom/modules/mymodule/langs/code_CODE/file.lang
 	 *										then in htdocs/module/langs/code_CODE/file.lang instead of htdocs/langs/code_CODE/file.lang
-	 *  @param	string	$alt         		0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US or fr_FR or es_ES)
+	 *  @param	string	$alt         		0 (try xx_ZZ then 1), 1 (try xx_XX then 2), 2 (try en_US)
 	 * 	@param	int		$stopafterdirection	Stop when the DIRECTION tag is found (optimize speed)
 	 * 	@param	int		$forcelangdir		To force a different lang directory
 	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
@@ -196,7 +195,13 @@ class Translate
 		// Redefine alt
 		$langarray=explode('_',$langofdir);
 		if ($alt < 1 && isset($langarray[1]) && strtolower($langarray[0]) == strtolower($langarray[1])) $alt=1;
-		if ($alt < 2 && (strtolower($langofdir) == 'en_us' || strtolower($langofdir) == 'fr_fr' || strtolower($langofdir) == 'es_es')) $alt=2;
+		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)
 		{
@@ -312,8 +317,8 @@ class Translate
 			// This function MUST NOT contains call to syslog
 			//dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);
 			$langofdir='en_US';
-			if (preg_match('/^fr/i',$langarray[0])) $langofdir='fr_FR';
-			if (preg_match('/^es/i',$langarray[0])) $langofdir='es_ES';
+			//if (preg_match('/^fr/i',$langarray[0])) $langofdir='fr_FR';
+			//if (preg_match('/^es/i',$langarray[0])) $langofdir='es_ES';
 			$this->load($domain,$alt+1,$stopafterdirection,$langofdir);
 		}
 
@@ -335,11 +340,12 @@ class Translate
 	 * Return translated value of key. Search in lang file, then into database.
 	 * Key must be any complete entry into lang file: CurrencyEUR, ...
 	 * If not found, return key.
-	 * WARNING: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey), getLabelFromKey must
-	 * not be called with same value than input.
+	 * The string return is not formated (translated with transnoentitiesnoconv)
+	 * NOTE: To avoid infinite loop (getLabelFromKey->transnoentities->getTradFromKey), if you modify this function,
+	 * check that getLabelFromKey is not called with same value than input.
 	 *
 	 * @param	string		$key		Key to translate
-	 * @return 	string					Translated string
+	 * @return 	string					Translated string (translated with transnoentitiesnoconv)
 	 */
 	private function getTradFromKey($key)
 	{
@@ -347,7 +353,6 @@ class Translate
 
 		if (! is_string($key)) return 'ErrorBadValueForParamNotAString';	// Avoid multiple errors with code not using function correctly.
 
-		//print 'xx'.$key;
 		$newstr=$key;
 		if (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i',$key,$reg))
 		{
@@ -363,7 +368,7 @@ class Translate
         }
         else if (preg_match('/^Civility([0-9A-Z]+)$/i',$key,$reg))
         {
-            $newstr=$this->getLabelFromKey($db,$reg[1],'c_civilite','code','civilite');
+            $newstr=$this->getLabelFromKey($db,$reg[1],'c_civility','code','label');
         }
         else if (preg_match('/^OrderSource([0-9A-Z]+)$/i',$key,$reg))
         {
@@ -592,7 +597,7 @@ class Translate
 			{
 				// Test si fichier dans repertoire de la langue alternative
 				if ($this->defaultlang != "en_US") $filenamealt = $searchdir."/langs/en_US/".$filename;
-				else $filenamealt = $searchdir."/langs/fr_FR/".$filename;
+				//else $filenamealt = $searchdir."/langs/fr_FR/".$filename;
 				if (is_readable(dol_osencode($filenamealt))) return true;
 			}
 		}
@@ -676,7 +681,7 @@ class Translate
 		$sql = "SELECT ".$fieldlabel." as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
 		$sql.= " WHERE ".$fieldkey." = '".($keyforselect?$keyforselect:$key)."'";
-		dol_syslog(get_class($this).'::getLabelFromKey sql='.$sql,LOG_DEBUG);
+		dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -690,7 +695,6 @@ class Translate
 		else
 		{
 			$this->error=$db->lasterror();
-			dol_syslog(get_class($this).'::getLabelFromKey error='.$this->error,LOG_ERR);
 			return -1;
 		}
 	}
@@ -702,6 +706,7 @@ class Translate
 	 *  @param	string	$currency_code		Currency Code
 	 *  @param	string	$amount				If not '', show currency + amount according to langs ($10, 10€).
 	 *  @return	string						Amount + Currency symbol encoded into UTF8
+	 *  @deprecated							Use method price to output a price
 	 */
 	function getCurrencyAmount($currency_code, $amount)
 	{
@@ -756,7 +761,7 @@ class Translate
 		if (! empty($currency_code)) $sql.=" AND code_iso = '".$currency_code."'";
 		//$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later
 
-		dol_syslog(get_class($this).'::loadCacheCurrencies sql='.$sql, LOG_DEBUG);
+		dol_syslog(get_class($this).'::loadCacheCurrencies', LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 67af3c7e083..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  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * This file is a modified version of datepicker.php from phpBSM to fix some
  * bugs, to add new features and to dramatically increase speed.
@@ -184,6 +185,19 @@ function displayBox($selectedDate,$month,$year)
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
 	</tr>
 	<tr class="dpDayNames">
+	<?php
+	$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
+	if($startday==1)
+	{?>
+		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
+		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>     
+	<?php
+	}else {?>	
 		<td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
 		<td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
@@ -191,6 +205,8 @@ function displayBox($selectedDate,$month,$year)
 		<td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
 		<td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+		<?php
+	}?>
 	</tr>
 	<?php
 	//print "x ".$thedate." y";
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 8b5f2c86810..0fbf22b0745 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -121,9 +121,9 @@ interface Database
 	/**
 	 *  List tables into a database
 	 *
-	 * @param    string $database Name of database
-	 * @param    string $table Nmae of table filter ('xxx%')
-	 * @return    resource                Resource
+	 *  @param	string		$database	Name of database
+	 *  @param	string		$table		Nmae of table filter ('xxx%')
+	 *  @return	array					List of tables in an array
 	 */
 	function DDLListTables($database, $table = '');
 
@@ -386,9 +386,9 @@ interface Database
      * 	19700101020000 -> 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 65b136a7a9c..baf38bd9a39 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -32,14 +32,10 @@ abstract class DoliDB implements Database
     public $db;
     //! Database type
     public $type;
-    //! Database label
-    static $label;
     //! Charset used to force charset when creating database
     public $forcecharset='utf8';
     //! Collate used to force collate when creating database
     public $forcecollate='utf8_general_ci';
-    //! Min database version
-    static $versionmin;
     //! Resultset of last query
     private $_results;
     //! 1 if connected, else 0
@@ -50,6 +46,10 @@ abstract class DoliDB implements Database
     public $database_name;
     //! Database username
     public $database_user;
+    //! Database host
+    public $database_host;
+    //! Database port
+    public $database_port;
     //! >=1 if a transaction is opened, 0 otherwise
     public $transaction_opened;
     //! Last successful query
@@ -141,8 +141,12 @@ abstract class DoliDB implements Database
 			{
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+				return 1;
+			}
+			else
+			{
+				return 0;
 			}
-			return $ret;
 		}
 		else
 		{
@@ -154,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='')
 	{
@@ -252,7 +256,7 @@ abstract class DoliDB implements Database
 	/**
 	 *	Return last error label
 	 *
-	 *	@return	    string	lasterror
+	 *	@return	    string		Last error
 	 */
 	function lasterror()
 	{
@@ -264,9 +268,9 @@ abstract class DoliDB implements Database
 	 * 	19700101020000 -> 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/index.html b/htdocs/core/db/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/db/index.php b/htdocs/core/db/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/db/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index bf67bd7d8b3..a8f9e9aff50 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -33,13 +33,13 @@ class DoliDBMssql extends DoliDB
 	//! Database type
 	public $type='mssql';
 	//! Database label
-	static $label='MSSQL';
+	const LABEL='MSSQL';
 	//! Charset used to force charset when creating database
 	var $forcecharset='latin1';      // Can't be static as it may be forced with a dynamic value
 	//! Collate used to force collate when creating database
 	var $forcecollate='latin1_swedish_ci';      // Can't be static as it may be forced with a dynamic value
 	//! Version min database
-	static $versionmin=array(2000);
+	const VERSIONMIN='2000';
 	//! Resultset of last query
 	private $_results;
 
@@ -60,6 +60,8 @@ class DoliDBMssql extends DoliDB
 		global $conf,$langs;
 
 		$this->database_user=$user;
+        $this->database_host=$host;
+        $this->database_port=$port;
 		$this->transaction_opened=0;
 
 		if (! function_exists("mssql_connect"))
@@ -255,8 +257,12 @@ class DoliDBMssql extends DoliDB
 			{
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction",LOG_DEBUG);
+				return 1;
+			}
+			else
+			{
+				return 0;
 			}
-			return $ret;
 		}
 		else
 		{
@@ -349,6 +355,8 @@ class DoliDBMssql extends DoliDB
 
 		//print "<!--".$query."-->";
 
+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+
 		if (! $this->database_name)
 		{
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
@@ -370,7 +378,9 @@ class DoliDBMssql extends DoliDB
                 $this->lastqueryerror = $query;
 				$this->lasterror = $this->error();
 				$this->lasterrno = $row["code"];
-                dol_syslog(get_class($this)."::query SQL error: ".$query, LOG_WARNING);
+
+				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 			}
 			$this->lastquery=$query;
 			$this->_results = $ret;
@@ -668,7 +678,7 @@ class DoliDBMssql extends DoliDB
 	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
-	 *  @return	resource				Resource
+     *  @return	array					List of tables in an array
 	 */
 	function DDLListTables($database,$table='')
 	{
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index bfd7c55b4c2..dc0cbb1cb1b 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -34,9 +34,9 @@ class DoliDBMysql extends DoliDB
 	//! Database type
 	public $type='mysql';
 	//! Database label
-	static $label='MySQL';
+	const LABEL='MySQL';
 	//! Version min database
-	static $versionmin=array(4,1,0);
+	const VERSIONMIN='4.1.0';
 	//! Resultset of last query
 	private $_results;
 
@@ -61,6 +61,8 @@ class DoliDBMysql extends DoliDB
 		if (! empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
 
 		$this->database_user=$user;
+        $this->database_host=$host;
+        $this->database_port=$port;
 
 		$this->transaction_opened=0;
 
@@ -252,6 +254,8 @@ class DoliDBMysql extends DoliDB
 	{
 		$query = trim($query);
 
+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+
 		if (! $this->database_name)
 		{
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
@@ -271,7 +275,8 @@ class DoliDBMysql extends DoliDB
 				$this->lastqueryerror = $query;
 				$this->lasterror = $this->error();
 				$this->lasterrno = $this->errno();
-                dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno." ".$this->lasterror, LOG_WARNING);
+
+                dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
 			}
 			$this->lastquery=$query;
 			$this->_results = $ret;
@@ -582,7 +587,7 @@ class DoliDBMysql extends DoliDB
 	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
-	 *  @return	resource				Resource
+	 *  @return	array					List of tables in an array
 	 */
 	function DDLListTables($database, $table='')
 	{
@@ -827,11 +832,10 @@ class DoliDBMysql extends DoliDB
         {
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
-        		dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
 	            return -1;
             }
             else
-            {
+			{
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
@@ -841,17 +845,15 @@ class DoliDBMysql extends DoliDB
         $resql=$this->query($sql);
         if (! $resql)
         {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
             return -1;
         }
 
         $sql="FLUSH Privileges";
 
-        dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql);
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
 	    $resql=$this->query($sql);
 		if (! $resql)
 		{
-			dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index f768a1115bd..6ebbc541a30 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -34,9 +34,9 @@ class DoliDBMysqli extends DoliDB
     //! Database type
     public $type='mysqli';
     //! Database label
-    static $label='MySQL';
+    const LABEL='MySQL';
     //! Version min database
-    static $versionmin=array(4,1,0);
+    const VERSIONMIN='4.1.0';
 	//! Resultset of last query
 	private $_results;
 
@@ -61,6 +61,8 @@ class DoliDBMysqli extends DoliDB
         if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
 
         $this->database_user=$user;
+        $this->database_host=$host;
+        $this->database_port=$port;
 
         $this->transaction_opened=0;
 
@@ -255,6 +257,9 @@ class DoliDBMysqli extends DoliDB
     function query($query,$usesavepoint=0,$type='auto')
     {
         $query = trim($query);
+
+	    if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+
         if (! $this->database_name)
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
@@ -273,7 +278,8 @@ class DoliDBMysqli extends DoliDB
                 $this->lastqueryerror = $query;
                 $this->lasterror = $this->error();
                 $this->lasterrno = $this->errno();
-                dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno." ".$this->lasterror, LOG_WARNING);
+
+                dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
             }
             $this->lastquery=$query;
             $this->_results = $ret;
@@ -585,7 +591,7 @@ class DoliDBMysqli extends DoliDB
 	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
-	 *  @return	resource				Resource
+	 *  @return	array					List of tables in an array
      */
     function DDLListTables($database, $table='')
     {
@@ -830,11 +836,10 @@ class DoliDBMysqli extends DoliDB
         {
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
             	return -1;
             }
             else
-            {
+			{
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
@@ -844,17 +849,15 @@ class DoliDBMysqli extends DoliDB
         $resql=$this->query($sql);
         if (! $resql)
         {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
             return -1;
         }
 
         $sql="FLUSH Privileges";
 
-        dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql);
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
         $resql=$this->query($sql);
         if (! $resql)
         {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
             return -1;
         }
 
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 6f494cb6f48..7381fd77b93 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001		Fabien Seisen			<seisen@linuxfr.org>
  * Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
@@ -37,13 +37,13 @@ class DoliDBPgsql extends DoliDB
     //! Database type
 	public $type='pgsql';            // Name of manager
     //! Database label
-	static $label='PostgreSQL';      // Label of manager
+	const LABEL='PostgreSQL';      // Label of manager
 	//! Charset
 	var $forcecharset='UTF8';       // Can't be static as it may be forced with a dynamic value
     //! Collate used to force collate when creating database
     var $forcecollate='';			// Can't be static as it may be forced with a dynamic value
 	//! Version min database
-	static $versionmin=array(8,4,0);	// Version min database
+	const VERSIONMIN='8.4.0';	// Version min database
 	//! Resultset of last query
 	private $_results;
 
@@ -71,6 +71,8 @@ class DoliDBPgsql extends DoliDB
 		if (! empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
 
 		$this->database_user=$user;
+        $this->database_host=$host;
+        $this->database_port=$port;
 
 		$this->transaction_opened=0;
 
@@ -494,7 +496,10 @@ class DoliDBPgsql extends DoliDB
 			@pg_query($this->db, 'SAVEPOINT mysavepoint');
 		}
 
+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+
 		$ret = @pg_query($this->db, $query);
+
 		//print $query;
 		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
 		{
@@ -506,9 +511,10 @@ class DoliDBPgsql extends DoliDB
     				$this->lasterror = $this->error();
     				$this->lasterrno = $this->errno();
 			    }
-				dol_syslog(get_class($this)."::query SQL error usesavepoint = ".$usesavepoint." - ".$query." - ".pg_last_error($this->db)." => ".$this->errno(), LOG_WARNING);
-				//print "\n>> ".$query."<br>\n";
-				//print '>> '.$this->lasterrno.' - '.$this->lasterror.' - '.$this->lastqueryerror."<br>\n";
+
+				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
+				dol_syslog(get_class($this)."::query SQL error usesavepoint = ".$usesavepoint, LOG_ERR);
 
 				if ($usesavepoint && $this->transaction_opened)	// Warning, after that errno will be erased
 				{
@@ -663,7 +669,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()
 	{
@@ -729,7 +735,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()
 	{
@@ -842,8 +848,8 @@ class DoliDBPgsql extends DoliDB
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
-	 *  @return	resource				Resource
+	 *  @param	string		$table		Name of table filter ('xxx%')
+	 *  @return	array					List of tables in an array
 	 */
 	function DDLListTables($database, $table='')
 	{
@@ -856,7 +862,7 @@ class DoliDBPgsql extends DoliDB
 		{
 			$listtables[] = $row[0];
 		}
-		return  $listtables;
+		return $listtables;
 	}
 
 	/**
@@ -1205,11 +1211,14 @@ class DoliDBPgsql extends DoliDB
      */
 	function getPathOfRestore()
 	{
-		$fullpathofdump='/pathtopgrestore/pg_restore';
+		//$tool='pg_restore';
+		$tool='psql';
 
-        if (file_exists('/usr/bin/pg_restore'))
+		$fullpathofdump='/pathtopgrestore/'.$tool;
+
+        if (file_exists('/usr/bin/'.$tool))
         {
-            $fullpathofdump='/usr/bin/pg_restore';
+            $fullpathofdump='/usr/bin/'.$tool;
         }
         else
         {
@@ -1219,7 +1228,7 @@ class DoliDBPgsql extends DoliDB
             {
                 $liste=$this->fetch_array($resql);
                 $basedir=$liste['data_directory'];
-                $fullpathofdump=preg_replace('/data$/','bin',$basedir).'/pg_restore';
+                $fullpathofdump=preg_replace('/data$/','bin',$basedir).'/'.$tool;
             }
         }
 
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index ad5c6532c9e..88efde86394 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -34,9 +34,9 @@ class DoliDBSqlite extends DoliDB
     //! Database type
     public $type='sqlite';
     //! Database label
-    static $label='PDO Sqlite';
+    const LABEL='PDO Sqlite';
     //! Version min database
-    static $versionmin=array(3,0,0);
+    const VERSIONMIN='3.0.0';
 	//! Resultset of last query
 	private $_results;
 
@@ -61,6 +61,8 @@ class DoliDBSqlite extends DoliDB
         if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
 
         $this->database_user=$user;
+        $this->database_host=$host;
+        $this->database_port=$port;
 
         $this->transaction_opened=0;
 
@@ -389,7 +391,9 @@ class DoliDBSqlite extends DoliDB
 		$query=$this->convertSQLFromMysql($query,$type);
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
-		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+	    dol_syslog('sql='.$query, LOG_DEBUG);
+
+	    // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
         try {
             //$ret = $this->db->exec($query);
             $ret = $this->db->query($query);        // $ret is a PDO object
@@ -407,8 +411,16 @@ class DoliDBSqlite extends DoliDB
                 $this->lastqueryerror = $query;
                 $this->lasterror = $this->error();
                 $this->lasterrno = $this->errno();
-                if (preg_match('/[0-9]/',$this->lasterrno)) dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno." ".$this->lasterror, LOG_WARNING);
-                else dol_syslog(get_class($this)."::query SQL error: ".$query." ".$this->lasterrno, LOG_WARNING);
+
+	            dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+
+	            $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
+
+				if (preg_match('/[0-9]/',$this->lasterrno)) {
+                    $errormsg .= ' ('.$this->lasterrno.')';
+                }
+
+	            dol_syslog($errormsg, LOG_ERR);
             }
             $this->lastquery=$query;
             $this->_results = $ret;
@@ -524,7 +536,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()
     {
@@ -586,7 +598,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()
     {
@@ -727,8 +739,8 @@ class DoliDBSqlite extends DoliDB
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
-	 *  @return	resource				Resource
+	 *  @param	string		$table		Name of table filter ('xxx%')
+	 *  @return	array					List of tables in an array
      */
     function DDLListTables($database, $table='')
     {
@@ -970,7 +982,6 @@ class DoliDBSqlite extends DoliDB
         $resql=$this->query($sql);
         if (! $resql)
         {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
             return -1;
         }
 
@@ -979,21 +990,19 @@ class DoliDBSqlite extends DoliDB
         $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
         $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
 
-        dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql);
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
         $resql=$this->query($sql);
         if (! $resql)
         {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
             return -1;
         }
 
         $sql="FLUSH Privileges";
 
-        dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql);
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
         $resql=$this->query($sql);
         if (! $resql)
         {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_ERR);
             return -1;
         }
 
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/32/index.html b/htdocs/core/filemanagerdol/browser/default/images/icons/32/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/browser/default/images/icons/index.html b/htdocs/core/filemanagerdol/browser/default/images/icons/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/browser/default/images/index.html b/htdocs/core/filemanagerdol/browser/default/images/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/browser/default/index.html b/htdocs/core/filemanagerdol/browser/default/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/browser/default/js/index.html b/htdocs/core/filemanagerdol/browser/default/js/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/browser/index.html b/htdocs/core/filemanagerdol/browser/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/connectors/index.html b/htdocs/core/filemanagerdol/connectors/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 439353b4e26..72c36761386 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -101,6 +101,13 @@ function SendError($number, $text)
 	exit ;
 }
 
+/**
+ * SendErrorNode
+ *
+ * @param 	integer $number		Number
+ * @param	string	$text		Text of error
+ * @return 	string				Error node
+ */
 function SendErrorNode($number, $text)
 {
 	if ($text)
diff --git a/htdocs/core/filemanagerdol/connectors/php/index.html b/htdocs/core/filemanagerdol/connectors/php/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 50ce4a33f05..4183b0e0573 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -70,6 +70,14 @@ function GetResourceTypeDirectory($resourceType, $sCommand)
 	}
 }
 
+/**
+ * GetUrlFromPath
+ *
+ * @param	string 	$resourceType	Resource type
+ * @param 	string 	$folderPath		Path
+ * @param	string	$sCommand		Command
+ * @return	string					Full url
+ */
 function GetUrlFromPath($resourceType, $folderPath, $sCommand)
 {
 	return CombinePaths(GetResourceTypePath($resourceType, $sCommand), $folderPath);
diff --git a/htdocs/core/filemanagerdol/index.html b/htdocs/core/filemanagerdol/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/filemanagerdol/index.php b/htdocs/core/filemanagerdol/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/filemanagerdol/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/index.html b/htdocs/core/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/index.php b/htdocs/core/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js
index 4fe29e4b4fb..17d70220b31 100644
--- a/htdocs/core/js/editinplace.js
+++ b/htdocs/core/js/editinplace.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+// Copyright (C) 2011-2014	Regis Houssin		<regis.houssin@capnetworks.com>
 // Copyright (C) 2011		Laurent Destailleur	<eldy@users.sourceforge.net>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -358,12 +358,19 @@ $(document).ready(function() {
 		var res = $.parseJSON(result);
 		if (res.error) {
 			$(obj).html(obj.revert);
-			$.jnotify(res.error, "error", true);
+			var htmlname = $(obj).attr('id').substr(8);
+			var errormsg = $( '#errormsg_' + htmlname ).val();
+			if (errormsg != undefined) {
+				$.jnotify(errormsg, "error", true);
+			} else {
+				$.jnotify(res.error, "error", true);
+			}
+			
 		} else {
 			var htmlname = $(obj).attr('id').substr(8);
-			var success = $( '#success_' + htmlname ).val();
-			if (success != undefined) {
-				$.jnotify(success, "ok");
+			var successmsg = $( '#successmsg_' + htmlname ).val();
+			if (successmsg != undefined) {
+				$.jnotify(successmsg, "ok");
 			}
 			$(obj).html(res.value);
 			$(obj).hide();
diff --git a/htdocs/core/js/index.html b/htdocs/core/js/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/js/index.php b/htdocs/core/js/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/js/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index 40b1473698e..962e4c39f47 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -631,7 +631,7 @@ function hideMessage(fieldId,message) {
 
 
 /*
- * TODO Used by admin page only ? 
+ * Used by button to set on/off 
  */
 function setConstant(url, code, input, entity, strict) {
 	$.get( url, {
@@ -689,7 +689,7 @@ function setConstant(url, code, input, entity, strict) {
 }
 
 /*
- * TODO Used by admin page only ? 
+ * Used by button to set on/off  
  */
 function delConstant(url, code, input, entity, strict) {
 	$.get( url, {
@@ -743,7 +743,7 @@ function delConstant(url, code, input, entity, strict) {
 }
 
 /*
- * TODO Used by admin page only ? 
+ * Used by button to set on/off  
  */
 function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict) {
 	var boxConfirm = box;
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
new file mode 100644
index 00000000000..ea098ba10bb
--- /dev/null
+++ b/htdocs/core/lib/accounting.lib.php
@@ -0,0 +1,193 @@
+<?php
+/* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 		\file			htdocs/core/lib/account.lib.php
+ * 		\ingroup		Accounting Expert
+ * 		\brief			Library of accountancy functions
+ */
+
+/**
+ *	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($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;
+}
+
+/**
+ *	Prepare array with list of tabs
+ *
+ *	@param	Object	$object		Accounting account
+ *	@return	array				Array of tabs to show
+ */
+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;
+}
+
+/**
+ * Return general accounting account with defined length
+ *
+ * @param 	string	$account		General accounting account
+ * @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;
+		}
+	} else {
+		return $account;
+	}
+}
+
+/**
+ * Return auxiliary accounting account with defined length
+ *
+ * @param 	string	$accounta		Auxiliary accounting account
+ * @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;
+		}
+	} else {
+		return $accounta;
+	}
+}
+
+/**
+ * Return accounting account with defined length for Sage Export Software
+ *
+ * @param 	string		$txt		Accounting account
+ * @param	int			$len		Length
+ * @param	int			$end		Number of characters
+ *
+ * @return	string          		Formated string
+ */
+function length_exportsage($txt, $len, $end)
+{
+	// $txt = utf8_decode($txt);
+	// 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) {
+			$res = $txt;
+		} else {
+			$res = "";
+		}
+		for($i = strlen($txt); $i <= ($len - 1); $i ++) {
+			$res .= " ";
+		}
+		if ($end == 0) {
+			$res .= $txt;
+		}
+	}
+	return $res;
+}
\ No newline at end of file
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 155415f59c3..dd1615d7427 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -70,7 +70,7 @@ function versioncompare($versionarray1,$versionarray2)
         if ($operande1 < $operande2) { $ret = -$level; break; }
         if ($operande1 > $operande2) { $ret = $level; break; }
     }
-    //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret;
+    //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
     return $ret;
 }
 
@@ -215,7 +215,6 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
                 }
                 else
                 {
-                    dol_syslog('Admin.lib::run_sql Failed to get max rowid for '.$table.' '.$db->lasterror().' sql='.$sqlgetrowid, LOG_ERR);
                     if (! $silent) print '<tr><td valign="top" colspan="2">';
                     if (! $silent) print '<div class="error">'.$langs->trans("Failed to get max rowid for ".$table)."</div></td>";
                     if (! $silent) print '</tr>';
@@ -226,7 +225,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
             $from='__+MAX_'.$table.'__';
             $to='+'.$listofmaxrowid[$table];
             $newsql=str_replace($from,$to,$newsql);
-            dol_syslog('Admin.lib::run_sql New Request '.($i+1).' (replacing '.$from.' to '.$to.') sql='.$newsql, LOG_DEBUG);
+            dol_syslog('Admin.lib::run_sql New Request '.($i+1).' (replacing '.$from.' to '.$to.')', LOG_DEBUG);
 
             $arraysql[$i]=$newsql;
         }
@@ -251,7 +250,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
 
             // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
             if (! $silent) print '<tr><td valign="top">'.$langs->trans("Request").' '.($i+1)." sql='".dol_htmlentities($newsql,ENT_NOQUOTES)."'</td></tr>\n";
-            dol_syslog('Admin.lib::run_sql Request '.($i+1).' sql='.$newsql, LOG_DEBUG);
+            dol_syslog('Admin.lib::run_sql Request '.($i+1), LOG_DEBUG);
 			$sqlmodified=0;
 
             // Replace for encrypt data
@@ -300,7 +299,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
                 $sqlmodified++;
             }
 
-            if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i+1).' sql='.$newsql, LOG_DEBUG);
+            if ($sqlmodified) dol_syslog('Admin.lib::run_sql New Request '.($i+1), LOG_DEBUG);
 
             $result=$db->query($newsql,$usesavepoint);
             if ($result)
@@ -393,7 +392,7 @@ function dolibarr_del_const($db, $name, $entity=1)
     $sql.= ")";
     if ($entity >= 0) $sql.= " AND entity = ".$entity;
 
-    dol_syslog("admin.lib::dolibarr_del_const sql=".$sql);
+    dol_syslog("admin.lib::dolibarr_del_const", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -427,7 +426,7 @@ function dolibarr_get_const($db, $name, $entity=1)
     $sql.= " WHERE name = ".$db->encrypt($name,1);
     $sql.= " AND entity = ".$entity;
 
-    dol_syslog("admin.lib::dolibarr_get_const sql=".$sql);
+    dol_syslog("admin.lib::dolibarr_get_const", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -474,7 +473,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
     $sql.= " WHERE name = ".$db->encrypt($name,1);
     if ($entity >= 0) $sql.= " AND entity = ".$entity;
 
-    dol_syslog("admin.lib::dolibarr_set_const sql=".$sql, LOG_DEBUG);
+    dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
     $resql=$db->query($sql);
 
     if (strcmp($value,''))	// true if different. Must work for $value='0' or $value=0
@@ -487,7 +486,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
 
         //print "sql".$value."-".pg_escape_string($value)."-".$sql;exit;
         //print "xx".$db->escape($value);
-        dol_syslog("admin.lib::dolibarr_set_const sql=".$sql, LOG_DEBUG);
+        dol_syslog("admin.lib::dolibarr_set_const", LOG_DEBUG);
         $resql=$db->query($sql);
     }
 
@@ -500,7 +499,6 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
     else
     {
         $error=$db->lasterror();
-        dol_syslog("admin.lib::dolibarr_set_const ".$error, LOG_ERR);
         $db->rollback();
         return -1;
     }
@@ -510,7 +508,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
 /**
  * Prepare array with list of tabs
  *
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function security_prepare_head()
 {
@@ -714,7 +712,7 @@ function activateModule($value,$withdeps=1)
     // Test if Dolibarr version ok
     $verdol=versiondolibarrarray();
     $vermin=isset($objMod->need_dolibarr_version)?$objMod->need_dolibarr_version:0;
-    //print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit;
+    //print 'eee '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;
     if (is_array($vermin) && versioncompare($verdol,$vermin) < 0)
     {
         return $langs->trans("ErrorModuleRequireDolibarrVersion",versiontostring($vermin));
@@ -855,18 +853,19 @@ function unActivateModule($value, $requiredby=1)
  *
  * 	@param		array		$taborder			Taborder
  * 	@param		array		$tabname			Tabname
- * 	@param		array		$tablib			Tablib
- * 	@param		array		$tabsql			Tabsql
- * 	@param		array		$tabsqlsort		Tabsqlsort
+ * 	@param		array		$tablib				Tablib
+ * 	@param		array		$tabsql				Tabsql
+ * 	@param		array		$tabsqlsort			Tabsqlsort
  * 	@param		array		$tabfield			Tabfield
  * 	@param		array		$tabfieldvalue		Tabfieldvalue
- * 	@param		array		$tabfieldinsert	Tabfieldinsert
+ * 	@param		array		$tabfieldinsert		Tabfieldinsert
  * 	@param		array		$tabrowid			Tabrowid
  * 	@param		array		$tabcond			Tabcond
  * 	@param		array		$tabhelp			Tabhelp
+ *  @param		array		$tabfieldcheck		Tabfieldcheck
  * 	@return		int			1
  */
-function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp)
+function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp,&$tabfieldcheck)
 {
     global $db, $modules, $conf, $langs;
 
@@ -966,6 +965,7 @@ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql
                             {
                                 //var_dump($objMod->dictionaries['tabname']);
                                 $taborder[] = 0;
+                                $tabfieldcheck[] = array(); $tabhelp[] = array();
                                 foreach($objMod->dictionaries['tabname'] as $val)
                                 {
                                     $taborder[] = count($tabname)+1;
@@ -979,6 +979,7 @@ function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql
                                 foreach($objMod->dictionaries['tabfieldinsert'] as $val) $tabfieldinsert[] = $val;
                                 foreach($objMod->dictionaries['tabrowid'] as $val) $tabrowid[] = $val;
                                 foreach($objMod->dictionaries['tabcond'] as $val) $tabcond[] = $val;
+                                if (! empty($objMod->dictionaries['tabfieldcheck'])) foreach($objMod->dictionaries['tabfieldcheck'] as $val) $tabfieldcheck[] = $val;
                                 if (! empty($objMod->dictionaries['tabhelp'])) foreach($objMod->dictionaries['tabhelp'] as $val) $tabhelp[] = $val;
                                 //foreach($objMod->dictionaries['tabsqlsort'] as $val) $tablib[] = $val;
                                 //$tabname = array_merge ($tabname, $objMod->dictionaries['tabname']);
@@ -1043,7 +1044,7 @@ function form_constantes($tableau,$strictw3c=0)
         $sql.= " ORDER BY name ASC, entity DESC";
         $result = $db->query($sql);
 
-        dol_syslog("List params sql=".$sql);
+        dol_syslog("List params", LOG_DEBUG);
         if ($result)
         {
             $obj = $db->fetch_object($result);	// Take first result of select
@@ -1192,7 +1193,7 @@ function showModulesExludedForExternal($modules)
 			$text .= $langs->trans('Module'.$module->numero.'Name');
 		}
 	}
-	return img_picto($langs->trans('InfoAdmin'), 'star').' '.$text;
+	return $text;
 }
 
 
@@ -1217,7 +1218,7 @@ function addDocumentModel($name, $type, $label='', $description='')
     $sql.= (! empty($description)?"'".$db->escape($description)."'":"null");
     $sql.= ")";
 
-    dol_syslog("admin.lib::addDocumentModel sql=".$sql);
+    dol_syslog("admin.lib::addDocumentModel", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -1250,7 +1251,7 @@ function delDocumentModel($name, $type)
 	$sql.= " AND type = '".$type."'";
 	$sql.= " AND entity = ".$conf->entity;
 
-	dol_syslog("admin.lib::delDocumentModel sql=".$sql);
+	dol_syslog("admin.lib::delDocumentModel", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index e730a1ed45b..23a17534ccf 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  *
@@ -39,25 +39,30 @@
  * @param 	string	$filterd		Filter of done by user
  * @param 	int		$pid			Product id
  * @param 	int		$socid			Third party id
+ * @param	string	$action			Action string
  * @param	array	$showextcals	Array with list of external calendars (used to show links to select calendar), or -1 to show no legend
  * @param	string	$actioncode		Preselected value of actioncode for filter on type
+ * @param	int		$usergroupid	Id of group to filter on users
  * @return	void
  */
-function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $showextcals=array(), $actioncode='') {
-
-	global $conf, $user, $langs, $db;
+function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals=array(), $actioncode='', $usergroupid='')
+{
+	global $conf, $user, $langs, $db, $hookmanager;
+	global $begin_h, $end_h, $begin_d, $end_d;
 
 	// Filters
 	print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
 	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-	print '<input type="hidden" name="status" value="' . $status . '">';
 	print '<input type="hidden" name="year" value="' . $year . '">';
 	print '<input type="hidden" name="month" value="' . $month . '">';
 	print '<input type="hidden" name="day" value="' . $day . '">';
+	print '<input type="hidden" name="action" value="' . $action . '">';
 	print '<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
-	print '<table class="nobordernopadding" width="100%">';
 
-	print '<tr><td class="nowrap">';
+	print '<div class="fichecenter">';
+
+	if (! empty($conf->browser->phone)) print '<div class="fichehalfleft">';
+	else print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 
 	print '<table class="nobordernopadding">';
 
@@ -65,35 +70,38 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	{
 		print '<tr>';
 		print '<td class="nowrap">';
-		print $langs->trans("ActionsAskedBy");
-		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
-		print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit);
-		print '</td>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("or") . ' ' . $langs->trans("ActionsToDoBy");
-		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
+		print $langs->trans("ActionsOwnedBy").' &nbsp; ';
+		print '</td><td class="nowrap maxwidthonsmartphone">';
 		print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
+		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("Group").' &nbsp; ';
+		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
 		print '</td></tr>';
 
-		/*print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("or") . ' ' . $langs->trans("ActionsDoneBy");
-		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
-		print $form->select_dolusers($filterd, 'userdone', 1, '', ! $canedit);
-		print '</td></tr>';*/
-
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions=new FormActions($db);
+
 		print '<tr>';
 		print '<td class="nowrap">';
 		print $langs->trans("Type");
 		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
-
 		print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0));
+		print '</td></tr>';
 
+		print '<tr>';
+		print '<td class="nowrap">';
+		print $langs->trans("Status");
+		print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
+		$formactions->form_select_status_action('formaction',$status,1,'status',1,2);
+		print '</td></tr>';
+	}
+
+	if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
+	{
+		print '<tr>';
+		print '<td class="nowrap">';
+		print $langs->trans("ThirdParty").' &nbsp; ';
+		print '</td><td class="nowrap maxwidthonsmartphone">';
+		print $form->select_thirdparty($socid, 'socid');
 		print '</td></tr>';
 	}
 
@@ -110,62 +118,53 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '</td></tr>';
 	}
 
-	print '</table>';
-	print '</td>';
-
-	// Buttons
-	print '<td align="center" valign="middle" class="nowrap">';
-	print img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewcal" value="' . $langs->trans("ViewCal") . '">';
-	print '<br>';
-	print img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewweek" value="' . $langs->trans("ViewWeek") . '">';
-	print '<br>';
-	print img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewday" value="' . $langs->trans("ViewDay") . '">';
-	print '<br>';
-	print img_picto($langs->trans("ViewList"), 'object_list', 'class="hideonsmartphone"') . ' <input type="submit" class="button" style="min-width:120px" name="viewlist" value="' . $langs->trans("ViewList") . '">';
-	print '</td>';
-
-	// Legend
-	if ($conf->use_javascript_ajax && is_array($showextcals))
+	if ($canedit && $action == 'show_peruser')
 	{
-		print '<td align="center" valign="middle" class="nowrap">';
-		print '<script type="text/javascript">' . "\n";
-		print 'jQuery(document).ready(function () {' . "\n";
-		print 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
-		print 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
-		print 'jQuery(".family_birthday").toggle();' . "\n";
-		print '});' . "\n";
-		print '</script>' . "\n";
-		print '<table>';
-		if (! empty($conf->use_javascript_ajax))
-		{
-			if (count($showextcals) > 0)
-			{
-				print '<tr><td><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans("LocalAgenda") . '</td></tr>';
-				foreach ($showextcals as $val)
-				{
-					$htmlname = dol_string_nospecial($val['name']);
-					print '<tr><td>';
-					print '<script type="text/javascript">' . "\n";
-					print 'jQuery(document).ready(function () {' . "\n";
-					print '		jQuery("#check_' . $htmlname . '").click(function() {';
-					print ' 		/* alert("'.$htmlname.'"); */';
-					print ' 		jQuery(".family_' . $htmlname . '").toggle();';
-					print '		});' . "\n";
-					print '});' . "\n";
-					print '</script>' . "\n";
-					print '<input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'];
-					print '</td></tr>';
-				}
-			}
-		}
-		print '<tr><td>'.$langs->trans("AgendaShowBirthdayEvents").' <input type="checkbox" id="check_birthday" name="check_birthday"></td></tr>';
-		print '</table>';
-		print '</td>';
+		// Filter on hours
+		print '<tr>';
+		print '<td class="nowrap">'.$langs->trans("WorkingTimeRange").'</td>';
+		print "<td class='nowrap maxwidthonsmartphone'>";
+		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
+		if (empty($conf->dol_use_jmobile)) print ' - ';
+		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
+		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+		print '</td></tr>';
+
+		// Filter on days
+		print '<tr>';
+		print '<td class="nowrap">'.$langs->trans("WorkingDaysRange").'</td>';
+		print "<td class='nowrap maxwidthonsmartphone'>";
+		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
+		if (empty($conf->dol_use_jmobile)) print ' - ';
+		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
+		print '</td></tr>';
 	}
 
-	print '</tr>';
+	// Hooks
+	$parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid);
+	$reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been
 
 	print '</table>';
+
+	if (! empty($conf->browser->phone)) print '</div>';
+	else print '</td>';
+
+	if (! empty($conf->browser->phone)) print '<div class="fichehalfright">';
+	else print '<td align="center" valign="middle" class="nowrap">';
+
+	print '<table><tr><td align="center">';
+	print '<div class="formleftzone">';
+	print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="' . $langs->trans("Refresh") . '">';
+	print '</div>';
+	print '</td></tr>';
+	print '</table>';
+
+	if (! empty($conf->browser->phone)) print '</div>';
+	else print '</td></tr></table>';
+
+	print '</div>';	// Close fichecenter
+	print '<div style="clear:both"></div>';
+
 	print '</form>';
 }
 
@@ -186,7 +185,7 @@ function show_array_actions_to_do($max=5)
 	include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
 	$sql = "SELECT a.id, a.label, a.datep as dp, a.datep2 as dp2, a.fk_user_author, a.percent,";
-	$sql.= " c.code, c.libelle,";
+	$sql.= " c.code, c.libelle as type_label,";
 	$sql.= " s.nom as sname, s.rowid, s.client";
 	$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c LEFT JOIN ";
 	$sql.= " ".MAIN_DB_PREFIX."actioncomm as a ON c.id = a.fk_action";
@@ -223,7 +222,7 @@ function show_array_actions_to_do($max=5)
             print '<tr '.$bc[$var].'>';
 
             $staticaction->type_code=$obj->code;
-            $staticaction->libelle=$obj->label;
+            $staticaction->label=($obj->label?$obj->label:$obj->type_label);
             $staticaction->id=$obj->id;
             print '<td>'.$staticaction->getNomUrl(1,34).'</td>';
 
@@ -361,7 +360,7 @@ function show_array_last_actions_done($max=5)
 /**
  * Prepare array with list of tabs
  *
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function agenda_prepare_head()
 {
@@ -369,6 +368,11 @@ function agenda_prepare_head()
 	$h = 0;
 	$head = array();
 
+	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_other.php";
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'other';
+	$h++;
+
 	$head[$h][0] = DOL_URL_ROOT."/admin/agenda.php";
 	$head[$h][1] = $langs->trans("AutoActions");
 	$head[$h][2] = 'autoactions';
@@ -384,11 +388,6 @@ function agenda_prepare_head()
 	$head[$h][2] = 'extsites';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_other.php";
-	$head[$h][1] = $langs->trans("Other");
-	$head[$h][2] = 'other';
-	$h++;
-
 	complete_head_from_modules($conf,$langs,null,$head,$h,'agenda_admin');
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/agenda_extrafields.php";
@@ -406,7 +405,7 @@ function agenda_prepare_head()
  * Prepare array with list of tabs
  *
  * @param   object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function actions_prepare_head($object)
 {
@@ -415,26 +414,18 @@ function actions_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/action/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/action/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("CardAction");
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (! empty($conf->global->AGENDA_USE_SEVERAL_CONTACTS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/comm/action/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Contacts");
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
     // Attached files
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     $upload_dir = $conf->agenda->dir_output . "/" . $object->id;
     $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].= ' <span class="badge">'.$nbFiles.'</span>';
     $head[$h][2] = 'documents';
     $h++;
 
@@ -464,9 +455,31 @@ function calendars_prepare_head($param)
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php'.($param?'?'.$param:'');
-    $head[$h][1] = $langs->trans("Agenda");
-    $head[$h][2] = 'card';
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_month'.($param?'&'.$param:'');
+    $head[$h][1] = $langs->trans("ViewCal");
+    $head[$h][2] = 'cardmonth';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_week'.($param?'&'.$param:'');
+    $head[$h][1] = $langs->trans("ViewWeek");
+    $head[$h][2] = 'cardweek';
+    $h++;
+
+	//$paramday=$param;
+	//if (preg_match('/&month=\d+/',$paramday) && ! preg_match('/&day=\d+/',$paramday)) $paramday.='&day=1';
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/index.php?action=show_day'.($param?'&'.$param:'');
+    $head[$h][1] = $langs->trans("ViewDay");
+    $head[$h][2] = 'cardday';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($param?'?'.$param:'');
+    $head[$h][1] = $langs->trans("ViewPerUser");
+    $head[$h][2] = 'cardperuser';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/listactions.php'.($param?'?'.$param:'');
+    $head[$h][1] = $langs->trans("ViewList");
+    $head[$h][2] = 'cardlist';
     $h++;
 
 	$object=new stdClass();
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index e0b1bba891d..74e715f7b4a 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -25,16 +25,17 @@
 
 
 /**
- *	Get value of an HTML field, do Ajax process and show result.
+ *	Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: /societe/ajaxcompanies.php).
  *  The HTML field must be an input text with id=search_$htmlname.
+ *  This use the jQuery "autocomplete" function.
  *
  *  @param	string	$selected           Preselecte value
  *	@param	string	$htmlname           HTML name of input field
- *	@param	string	$url                Url for request: /chemin/fichier.php
+ *	@param	string	$url                Url for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
  *  @param	string	$urloption			More parameters on URL request
  *  @param	int		$minLength			Minimum number of chars to trigger that Ajax search
  *  @param	int		$autoselect			Automatic selection if just one value
- *  @param	array	$ajaxoptions		Multiple options array (Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
+ *  @param	array	$ajaxoptions		Multiple options array (Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done)
  *	@return string              		Script
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLength=2, $autoselect=0, $ajaxoptions=array())
@@ -97,26 +98,30 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
     				$("input#search_'.$htmlname.'").autocomplete({
     					source: function( request, response ) {
     						$.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){
-								response($.map( data, function( item ) {
-									if (autoselect == 1 && data.length == 1) {
-										$("#search_'.$htmlname.'").val(item.value);
-										$("#'.$htmlname.'").val(item.key).trigger("change");
-									}
-									var label = item.label.toString();
-									var update = {};
-									if (options.update) {
-										$.each(options.update, function(key, value) {
-											update[key] = item[value];
-										});
-									}
-									var textarea = {};
-									if (options.update_textarea) {
-										$.each(options.update_textarea, function(key, value) {
-											textarea[key] = item[value];
-										});
-									}
-									return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
-								}));
+								if (data != null)
+								{
+									response($.map( data, function(item) {
+										if (autoselect == 1 && data.length == 1) {
+											$("#search_'.$htmlname.'").val(item.value);
+											$("#'.$htmlname.'").val(item.key).trigger("change");
+										}
+										var label = item.label.toString();
+										var update = {};
+										if (options.update) {
+											$.each(options.update, function(key, value) {
+												update[key] = item[value];
+											});
+										}
+										var textarea = {};
+										if (options.update_textarea) {
+											$.each(options.update_textarea, function(key, value) {
+												textarea[key] = item[value];
+											});
+										}
+										return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
+									}));
+								}
+								else console.error("Error: Ajax url '.$url.($urloption?'?'.$urloption:'').' has returned an empty page. Should be an empty json array.");
 							}, "json");
 						},
 						dataType: "json",
@@ -168,6 +173,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
     						}
     						$("#search_'.$htmlname.'").trigger("change");	// To tell that input text field was modified
     					}
+    					,delay: 500
 					}).data( "autocomplete" )._renderItem = function( ul, item ) {
 						return $( "<li></li>" )
 						.data( "item.autocomplete", item )
@@ -182,25 +188,28 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 }
 
 /**
- *	Get value of field, do Ajax process and return result
+ *	Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: core/ajax/ziptown.php).
+ *  The Ajax page can also returns several values (json format) to fill several input fields.
+ *  The HTML field must be an input text with id=$htmlname.
+ *  This use the jQuery "autocomplete" function.
  *
- *	@param	string	$htmlname           Name of field
- *	@param	string	$fields				other fields to autocomplete
- *	@param	string	$url                Chemin du fichier de reponse : /chemin/fichier.php
+ *	@param	string	$htmlname           HTML name of input field
+ *	@param	string	$fields				Other fields to autocomplete
+ *	@param	string	$url                URL for ajax request : /chemin/fichier.php
  *	@param	string	$option				More parameters on URL request
  *	@param	int		$minLength			Minimum number of chars to trigger that Ajax search
  *	@param	int		$autoselect			Automatic selection if just one value
  *	@return string              		Script
  */
-function ajax_multiautocompleter($htmlname,$fields,$url,$option='',$minLength=2,$autoselect=0)
+function ajax_multiautocompleter($htmlname, $fields, $url, $option='', $minLength=2, $autoselect=0)
 {
 	$script = '<!-- Autocomplete -->'."\n";
 	$script.= '<script type="text/javascript">';
 	$script.= 'jQuery(document).ready(function() {
 					var fields = '.json_encode($fields).';
-					var length = fields.length;
+					var nboffields = fields.length;
 					var autoselect = '.$autoselect.';
-					//alert(fields + " " + length);
+					//alert(fields + " " + nboffields);
 
     				jQuery("input#'.$htmlname.'").autocomplete({
     					dataType: "json",
@@ -214,7 +223,7 @@ function ajax_multiautocompleter($htmlname,$fields,$url,$option='',$minLength=2,
 										if (item.states) {
 											jQuery("#state_id").html(item.states);
 										}
-										for (i=0;i<length;i++) {
+										for (i=0;i<nboffields;i++) {
 											if (item[fields[i]]) {   // If defined
                                                 //alert(item[fields[i]]);
 											    jQuery("#" + fields[i]).val(item[fields[i]]);
@@ -226,8 +235,7 @@ function ajax_multiautocompleter($htmlname,$fields,$url,$option='',$minLength=2,
 							});
     					},
     					select: function( event, ui ) {
-
-    						for (i=0;i<length;i++) {
+    						for (i=0;i<nboffields;i++) {
     							//alert(fields[i] + " = " + ui.item[fields[i]]);
 								if (fields[i]=="selectcountry_id")
 								{
@@ -304,7 +312,7 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * TODO: It is used when COMPANY_USE_SEARCH_TO_SELECT and CONTACT_USE_SEARCH_TO_SELECT are set by html.formcompany.class.php. Should use ajax_autocompleter instead like done by html.form.class.php for select_produits.
  *
  * @param	string	$htmlname					Name of html select field
- * @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						More events option. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
  * @param  	int		$minLengthToAutocomplete	Minimum length of input string to start autocomplete
  * @return	string								Return html string to convert a select field into a combo
  */
@@ -313,8 +321,10 @@ 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->dol_use_jmobile)) return '';	// combobox with jmobile (does not works)
 	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
-
+	if (empty($conf->use_javascript_ajax)) return ''; 
+	
 	/* Some properties for combobox:
 	minLengthToAutocomplete: 2,
 	comboboxContainerClass: "comboboxContainer",
@@ -330,20 +340,20 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0)
 	width: "500px" */
 
 	$msg = '<script type="text/javascript">
-    $(function() {
+	$(document).ready(function() {
     	$("#'.$htmlname.'").combobox({
     		minLengthToAutocomplete : '.$minLengthToAutocomplete.',
     		selected : function(event,ui) {
     			var obj = '.json_encode($events).';
     			$.each(obj, function(key,values) {
     				if (values.method.length) {
-    					getMethod(values);
+    					runJsCodeForEvent'.$htmlname.'(values);
     				}
 				});
 			}
 		});
 
-		function getMethod(obj) {
+		function runJsCodeForEvent'.$htmlname.'(obj) {
 			var id = $("#'.$htmlname.'").val();
 			var method = obj.method;
 			var url = obj.url;
@@ -375,6 +385,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0)
 						} else {
 							$("#inputautocomplete"+htmlname).val("");
 						}
+						$("select#" + htmlname).change();	/* Trigger event change */
 					});
 		}
 
@@ -400,46 +411,140 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0,
 
 	$entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
 
-	$out= "\n<!-- Ajax code to switch constant ".$code." -->".'
-	<script type="text/javascript">
-		$(document).ready(function() {
-			var input = '.json_encode($input).';
-			var url = \''.DOL_URL_ROOT.'/core/ajax/constantonoff.php\';
-			var code = \''.$code.'\';
-			var entity = \''.$entity.'\';
-			var strict = \''.$strict.'\';
-			var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'";
-			var noButton = "'.dol_escape_js($langs->transnoentities("No")).'";
+	if (empty($conf->use_javascript_ajax))
+	{
+		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+	}
+	else
+	{
+		$out= "\n<!-- Ajax code to switch constant ".$code." -->".'
+		<script type="text/javascript">
+			$(document).ready(function() {
+				var input = '.json_encode($input).';
+				var url = \''.DOL_URL_ROOT.'/core/ajax/constantonoff.php\';
+				var code = \''.$code.'\';
+				var entity = \''.$entity.'\';
+				var strict = \''.$strict.'\';
+				var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'";
+				var noButton = "'.dol_escape_js($langs->transnoentities("No")).'";
 
-			// Set constant
-			$("#set_" + code).click(function() {
-				if (input.alert && input.alert.set) {
-					if (input.alert.set.yesButton) yesButton = input.alert.set.yesButton;
-					if (input.alert.set.noButton)  noButton = input.alert.set.noButton;
-					confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict);
-				} else {
-					setConstant(url, code, input, entity, strict);
-				}
+				// Set constant
+				$("#set_" + code).click(function() {
+					if (input.alert && input.alert.set) {
+						if (input.alert.set.yesButton) yesButton = input.alert.set.yesButton;
+						if (input.alert.set.noButton)  noButton = input.alert.set.noButton;
+						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict);
+					} else {
+						setConstant(url, code, input, entity);
+					}
+				});
+
+				// Del constant
+				$("#del_" + code).click(function() {
+					if (input.alert && input.alert.del) {
+						if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton;
+						if (input.alert.del.noButton)  noButton = input.alert.del.noButton;
+						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict);
+					} else {
+						delConstant(url, code, input, entity);
+					}
+				});
 			});
+		</script>'."\n";
 
-			// Del constant
-			$("#del_" + code).click(function() {
-				if (input.alert && input.alert.del) {
-					if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton;
-					if (input.alert.del.noButton)  noButton = input.alert.del.noButton;
-					confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict);
-				} else {
-					delConstant(url, code, input, entity, strict);
-				}
-			});
-		});
-	</script>'."\n";
-
-	$out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
-	$out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>';
-	$out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>';
-	$out.="\n";
+		$out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
+		$out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>';
+		$out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>';
+		$out.="\n";
+	}
 
 	return $out;
 }
 
+/**
+ *  On/off button for object
+ *
+ *  @param  int     $object     Id product to set
+ *  @param  string  $code       Name of constant : status or status_buy for product by example
+ *  @param  string  $field      Name of database field : tosell or tobuy for product by example
+ *  @param  string  $text_on    Text if on
+ *  @param  string  $text_off   Text if off
+ *  @param  array   $input      Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid'))
+ *  @return void
+ */
+function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=array())
+{
+    global $langs;
+
+    $out= '<script type="text/javascript">
+        $(function() {
+            var input = '.json_encode($input).';
+
+            // Set constant
+            $("#set_'.$code.'_'.$object->id.'").click(function() {
+                $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
+                    action: \'set\',
+                    field: \''.$field.'\',
+                    value: \'1\',
+                    element: \''.$object->element.'\',
+                    id: \''.$object->id.'\'
+                },
+                function() {
+                    $("#set_'.$code.'_'.$object->id.'").hide();
+                    $("#del_'.$code.'_'.$object->id.'").show();
+                    // Enable another element
+                    if (input.disabled && input.disabled.length > 0) {
+                        $.each(input.disabled, function(key,value) {
+                            $("#" + value).removeAttr("disabled");
+                            if ($("#" + value).hasClass("butActionRefused") == true) {
+                                $("#" + value).removeClass("butActionRefused");
+                                $("#" + value).addClass("butAction");
+                            }
+                        });
+                    // Show another element
+                    } else if (input.showhide && input.showhide.length > 0) {
+                        $.each(input.showhide, function(key,value) {
+                            $("#" + value).show();
+                        });
+                    }
+                });
+            });
+
+            // Del constant
+            $("#del_'.$code.'_'.$object->id.'").click(function() {
+                $.get( "'.DOL_URL_ROOT.'/core/ajax/objectonoff.php", {
+                    action: \'set\',
+                    field: \''.$field.'\',
+                    value: \'0\',
+                    element: \''.$object->element.'\',
+                    id: \''.$object->id.'\'
+                },
+                function() {
+                    $("#del_'.$code.'_'.$object->id.'").hide();
+                    $("#set_'.$code.'_'.$object->id.'").show();
+                    // Disable another element
+                    if (input.disabled && input.disabled.length > 0) {
+                        $.each(input.disabled, function(key,value) {
+                            $("#" + value).attr("disabled", true);
+                            if ($("#" + value).hasClass("butAction") == true) {
+                                $("#" + value).removeClass("butAction");
+                                $("#" + value).addClass("butActionRefused");
+                            }
+                        });
+                    // Hide another element
+                    } else if (input.showhide && input.showhide.length > 0) {
+                        $.each(input.showhide, function(key,value) {
+                            $("#" + value).hide();
+                        });
+                    }
+                });
+            });
+        });
+    </script>';
+    $out.= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'hideobject':'').'">'.img_picto($langs->trans($text_off),'switch_off').'</span>';
+    $out.= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code==1?'':'hideobject').'">'.img_picto($langs->trans($text_on),'switch_on').'</span>';
+
+    return $out;
+}
+
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index c17c78bc8e1..488a4c3a530 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -28,7 +28,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function bank_prepare_head($object)
 {
@@ -36,7 +36,7 @@ function bank_prepare_head($object)
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT . '/compta/bank/fiche.php?id=' . $object->id;
+    $head[$h][0] = DOL_URL_ROOT . '/compta/bank/card.php?id=' . $object->id;
     $head[$h][1] = $langs->trans("AccountCard");
     $head[$h][2] = 'bankname';
     $h++;
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/categories.lib.php b/htdocs/core/lib/categories.lib.php
index fb3a0210ef6..4d020526e44 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -27,7 +27,7 @@
  *
  * @param   Object	$object		Object related to tabs
  * @param	string	$type		Type of category
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function categories_prepare_head($object,$type)
 {
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 0851fb0b7c1..5a906298312 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2007		    Patrick Raguin			  <patrick.raguin@gmail.com>
  * Copyright (C) 2010-2012	Regis Houssin			    <regis.houssin@capnetworks.com>
  * Copyright (C) 2013-2014  Florian Henry		  	  <florian.henry@open-concept.pro>
- * Copyright (C) 2013       Juanjo Menent		  	  <jmenent@2byte.es>
+ * Copyright (C) 2013-2014  Juanjo Menent		  	  <jmenent@2byte.es>
  * Copyright (C) 2013       Christophe Battarel		<contact@altairis.fr>
  * Copyright (C) 2013       Alexandre Spangaro    <alexandre.spangaro@gmail.com>
  *
@@ -37,7 +37,7 @@
  */
 function societe_prepare_head($object)
 {
-    global $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
     $h = 0;
     $head = array();
 
@@ -48,7 +48,7 @@ function societe_prepare_head($object)
 
     if ($object->client==1 || $object->client==2 || $object->client==3)
     {
-        $head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$object->id;
+        $head[$h][0] = DOL_URL_ROOT.'/comm/card.php?socid='.$object->id;
         $head[$h][1] = '';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($object->client==2 || $object->client==3)) $head[$h][1] .= $langs->trans("Prospect");
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client==3) $head[$h][1] .= '/';
@@ -58,19 +58,19 @@ function societe_prepare_head($object)
     }
     if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
     {
-        $head[$h][0] = DOL_URL_ROOT.'/fourn/fiche.php?socid='.$object->id;
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;
         $head[$h][1] = $langs->trans("Supplier");
         $head[$h][2] = 'supplier';
         $h++;
     }
 
-	if (($object->localtax1_assuj || $object->localtax2_assuj) && (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) )
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/societe/localtaxes.php?socid='.$object->id;
-		$head[$h][1] = $langs->trans("LocalTaxes");
-		$head[$h][2] = 'localtaxes';
-		$h++;
-	}
+    if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
+        $head[$h][1] = $langs->trans("ContactsAddresses");
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
      {
@@ -98,7 +98,7 @@ function societe_prepare_head($object)
 
     if ($user->societe_id == 0)
     {
-        if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fournisseur->enabled))
+        if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->fichinter->enabled) || ! empty($conf->fournisseur->enabled))
         {
 	        $head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
 	        $head[$h][1] = $langs->trans("Referers");
@@ -109,8 +109,29 @@ function societe_prepare_head($object)
         // Notifications
         if (! empty($conf->notification->enabled))
         {
-        	$head[$h][0] = DOL_URL_ROOT.'/societe/notify/fiche.php?socid='.$object->id;
+        	$nbNote = 0;
+        	$sql = "SELECT COUNT(n.rowid) as nb";
+        	$sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+        	$sql.= " WHERE fk_soc = ".$object->id;
+        	$resql=$db->query($sql);
+        	if ($resql)
+        	{
+        		$num = $db->num_rows($resql);
+        		$i = 0;
+        		while ($i < $num)
+        		{
+        			$obj = $db->fetch_object($resql);
+        			$nbNote=$obj->nb;
+        			$i++;
+        		}
+        	}
+        	else {
+        		dol_print_error($db);
+        	}
+
+        	$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;
         	$head[$h][1] = $langs->trans("Notifications");
+			if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
         	$head[$h][2] = 'notify';
         	$h++;
         }
@@ -121,7 +142,7 @@ function societe_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
         $head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.$object->id;
         $head[$h][1] = $langs->trans("Note");
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
         $head[$h][2] = 'note';
         $h++;
 
@@ -131,7 +152,7 @@ function societe_prepare_head($object)
         $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
         $head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$object->id;
         $head[$h][1] = $langs->trans("Documents");
-		if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+		if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
         $head[$h][2] = 'document';
         $h++;
     }
@@ -196,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;
 
@@ -215,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");
@@ -227,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;
 }
@@ -262,19 +282,19 @@ function getCountry($searchkey,$withcode='',$dbtouse=0,$outputlangs='',$entconv=
     if (! is_object($dbtouse)) $dbtouse=$db;
     if (! is_object($outputlangs)) $outputlangs=$langs;
 
-    $sql = "SELECT rowid, code, libelle FROM ".MAIN_DB_PREFIX."c_pays";
+    $sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";
     if (is_numeric($searchkey)) $sql.= " WHERE rowid=".$searchkey;
     elseif (! empty($searchkey)) $sql.= " WHERE code='".$db->escape($searchkey)."'";
-    else $sql.= " WHERE libelle='".$db->escape($searchlabel)."'";
+    else $sql.= " WHERE label='".$db->escape($searchlabel)."'";
 
-    dol_syslog("Company.lib::getCountry sql=".$sql);
+    dol_syslog("Company.lib::getCountry", LOG_DEBUG);
     $resql=$dbtouse->query($sql);
     if ($resql)
     {
         $obj = $dbtouse->fetch_object($resql);
         if ($obj)
         {
-            $label=((! empty($obj->libelle) && $obj->libelle!='-')?$obj->libelle:'');
+            $label=((! empty($obj->label) && $obj->label!='-')?$obj->label:'');
             if (is_object($outputlangs))
             {
                 $outputlangs->load("dict");
@@ -317,7 +337,7 @@ function getState($id,$withcode='',$dbtouse=0)
     $sql = "SELECT rowid, code_departement as code, nom as label FROM ".MAIN_DB_PREFIX."c_departements";
     $sql.= " WHERE rowid=".$id;
 
-    dol_syslog("Company.lib::getState sql=".$sql);
+    dol_syslog("Company.lib::getState", LOG_DEBUG);
     $resql=$dbtouse->query($sql);
     if ($resql)
     {
@@ -394,7 +414,7 @@ function getFormeJuridiqueLabel($code)
     $sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."c_forme_juridique";
     $sql.= " WHERE code='$code'";
 
-    dol_syslog("Company.lib::getFormeJuridiqueLabel sql=".$sql);
+    dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -440,8 +460,8 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
         $buttoncreate='';
         if (! empty($conf->projet->enabled) && $user->rights->projet->creer)
         {
-            //$buttoncreate='<a class="butAction" href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$object->id.'&action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
-			$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject");
+            //$buttoncreate='<a class="butAction" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
+			$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject");
 			if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($langs->trans("AddProject"),'filenew');
 			$buttoncreate.='</a>'."\n";
         }
@@ -471,7 +491,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
                 $projectstatic = new Project($db);
 
                 $i=0;
-                $var=true;
+                $var=false;
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($result);
@@ -486,7 +506,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
                         print "<tr ".$bc[$var].">";
 
                         // Ref
-                        print '<td><a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.'</a></td>';
+                        print '<td><a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.'</a></td>';
                         // Label
                         print '<td>'.$obj->title.'</td>';
                         // Date start
@@ -500,8 +520,9 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
                 }
             }
             else
-            {
-                print '<tr><td colspan="3">'.$langs->trans("None").'</td></tr>';
+			{
+                $var = false;
+            	print '<tr '.$bc[$var].'><td colspan="4">'.$langs->trans("None").'</td></tr>';
             }
             $db->free($result);
         }
@@ -557,7 +578,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     if ($user->rights->societe->contact->creer)
     {
     	$addcontact = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
-		$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$addcontact;
+		$buttoncreate='<a class="addnewrecord" href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage).'">'.$addcontact;
 		if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($addcontact,'filenew');
 		$buttoncreate.='</a>'."\n";
     }
@@ -626,7 +647,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     // Status
     print '<td class="liste_titre maxwidthonsmartphone">';
-    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
+    print $form->selectarray('search_status', array('-1'=>'','0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
 
     // Copy to clipboard
@@ -648,18 +669,18 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
 
     $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 .= ", p.civilite as civility_id, p.address, p.zip, p.town";
+    $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;
-    if ($search_status!='') $sql .= " AND p.statut = ".$db->escape($search_status);
+    if ($search_status!='' && $search_status != '-1') $sql .= " AND p.statut = ".$db->escape($search_status);
     if ($search_name)       $sql .= " AND (p.lastname LIKE '%".$db->escape($search_name)."%' OR p.firstname LIKE '%".$db->escape($search_name)."%')";
     $sql.= " ORDER BY $sortfield $sortorder";
 
-    dol_syslog('core/lib/company.lib.php :: show_contacts sql='.$sql,LOG_DEBUG);
+    dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);
     $result = $db->query($sql);
     $num = $db->num_rows($result);
 
-	$var=true;
+	$var=false;
 	if ($num)
     {
         $i=0;
@@ -676,7 +697,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             $contactstatic->lastname = $obj->lastname;
             $contactstatic->firstname = $obj->firstname;
             $contactstatic->civility_id = $obj->civility_id;
-            print $contactstatic->getNomUrl(1);
+            print $contactstatic->getNomUrl(1,'',0,'&backtopage='.urlencode($backtopage));
             print '</td>';
 
             print '<td>'.$obj->poste.'</td>';
@@ -739,13 +760,13 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
             {
                 print '<td align="center">';
-                if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-                {
-                	print '<a class="hideonsmartphone" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
-                	print img_object($langs->trans("Rendez-Vous"),"action_rdv");
-                	print '</a> ';
-                }
-                print '<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
+                //if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+                //{
+                //	print '<a class="hideonsmartphone" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=AC_RDV&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
+                //	print img_object($langs->trans("Rendez-Vous"),"action_rdv");
+                //	print '</a> ';
+                //}
+                print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
                 print img_object($langs->trans("Event"),"action");
                 print '</a></td>';
             }
@@ -754,7 +775,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             if ($user->rights->societe->contact->creer)
             {
                 print '<td align="right">';
-                print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?action=edit&amp;id='.$obj->rowid.'&amp;backtopage='.urlencode($backtopage).'">';
+                print '<a href="'.DOL_URL_ROOT.'/contact/card.php?action=edit&amp;id='.$obj->rowid.'&amp;backtopage='.urlencode($backtopage).'">';
                 print img_edit();
                 print '</a></td>';
             }
@@ -914,22 +935,12 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
         if (get_class($object) == 'Societe') $out.='</a>';
         $out.='</td>';
         $out.='<td colspan="5" align="right">';
-		$permok=$user->rights->agenda->myactions->create;
-        if (($object->id || $objcon->id) && $permok)
-		{
-            $out.='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create';
-            if (get_class($object) == 'Societe') $out.='&amp;socid='.$object->id;
-            $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
-    		$out.=$langs->trans("AddAnAction").' ';
-    		$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    		$out.="</a>";
-		}
         $out.='</td>';
         $out.='</tr>';
 
         $sql = "SELECT a.id, a.label,";
         $sql.= " a.datep as dp,";
-        $sql.= " a.datea as da,";
+        $sql.= " a.datep2 as dp2,";
         $sql.= " a.percent,";
         $sql.= " a.fk_user_author, a.fk_contact,";
         $sql.= " a.fk_element, a.elementtype,";
@@ -953,7 +964,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
         $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
         $sql.= " ORDER BY a.datep DESC, a.id DESC";
 
-        dol_syslog("company.lib::show_actions_todo sql=".$sql);
+        dol_syslog("company.lib::show_actions_todo", LOG_DEBUG);
         $result=$db->query($sql);
         if ($result)
         {
@@ -970,10 +981,20 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
                     $obj = $db->fetch_object($result);
 
                     $datep=$db->jdate($obj->dp);
+                    $datep2=$db->jdate($obj->dp2);
 
                     $out.="<tr ".$bc[$var].">";
 
-                    $out.='<td width="120" align="left" class="nowrap">'.dol_print_date($datep,'dayhour')."</td>\n";
+                    $out.='<td width="120" align="left" class="nowrap">';
+                    $out.=dol_print_date($datep,'dayhour');
+                    if ($datep2 && $datep2 != $datep)
+	        		{
+		        		$tmpa=dol_getdate($datep,true);
+		        		$tmpb=dol_getdate($datep2,true);
+		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out.='-'.dol_print_date($datep2,'hour');
+		        		else $out.='-'.dol_print_date($datep2,'dayhour');
+	        		}
+                    $out.="</td>\n";
 
                     // Picto warning
                     $out.='<td width="16">';
@@ -1089,7 +1110,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
         $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
         $sql.= " ORDER BY a.datep DESC, a.id DESC";
 
-        dol_syslog("company.lib::show_actions_done sql=".$sql, LOG_DEBUG);
+        dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
@@ -1103,7 +1124,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
                 		'type'=>'action',
                 		'id'=>$obj->id,
                 		'datestart'=>$db->jdate($obj->dp),
-                		'date'=>$db->jdate($obj->dp2),
+                		'dateend'=>$db->jdate($obj->dp2),
                 		'note'=>$obj->label,
                 		'percent'=>$obj->percent,
                 		'acode'=>$obj->acode,
@@ -1141,7 +1162,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
         $sql.= " AND mc.fk_mailing=m.rowid";
         $sql.= " ORDER BY mc.date_envoi DESC, m.rowid DESC";
 
-        dol_syslog("company.lib::show_actions_done sql=".$sql, LOG_DEBUG);
+        dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
@@ -1154,7 +1175,8 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
                 $histo[$numaction]=array(
                 		'type'=>'mailing',
                 		'id'=>$obj->id,
-                		'date'=>$db->jdate($obj->da),
+                		'datestart'=>$db->jdate($obj->da),
+                		'dateend'=>$db->jdate($obj->da),
                 		'note'=>$obj->note,
                 		'percent'=>$obj->percentage,
                 		'acode'=>$obj->acode,
@@ -1197,16 +1219,6 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
         if (get_class($object) == 'Societe') $out.='</a>';
         $out.='</td>';
         $out.='<td colspan="5" align="right">';
-		$permok=$user->rights->agenda->myactions->create;
-        if ((! empty($object->id) || ! empty($objcon->id)) && $permok)
-		{
-            $out.='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create';
-            if (get_class($object) == 'Societe') $out.='&amp;socid='.$object->id;
-            $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
-    		$out.=$langs->trans("AddAnAction").' ';
-    		$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-    		$out.="</a>";
-		}
         $out.='</td>';
         $out.='</tr>';
 
@@ -1217,8 +1229,14 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
 
             // Champ date
             $out.='<td width="120" class="nowrap">';
-            if ($histo[$key]['date']) $out.=dol_print_date($histo[$key]['date'],'dayhour');
-            else if ($histo[$key]['datestart']) $out.=dol_print_date($histo[$key]['datestart'],'dayhour');
+            $out.=dol_print_date($histo[$key]['datestart'],'dayhour');
+            if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
+            {
+        		$tmpa=dol_getdate($histo[$key]['datestart'],true);
+        		$tmpb=dol_getdate($histo[$key]['dateend'],true);
+        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out.='-'.dol_print_date($histo[$key]['dateend'],'hour');
+        		else $out.='-'.dol_print_date($histo[$key]['dateend'],'dayhour');
+            }
             $out.="</td>\n";
 
             // Picto
@@ -1238,7 +1256,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
             }
             if (isset($histo[$key]['type']) && $histo[$key]['type']=='mailing')
             {
-                $out.='<a href="'.DOL_URL_ROOT.'/comm/mailing/fiche.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"),"email").' ';
+                $out.='<a href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"),"email").' ';
                 $transcode=$langs->trans("Action".$histo[$key]['acode']);
                 $libelle=($transcode!="Action".$histo[$key]['acode']?$transcode:'Send mass mailing');
                 $out.=dol_trunc($libelle,40);
@@ -1251,6 +1269,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
             // Objet lie
             // TODO uniformize
             $out.='<td>';
+            //var_dump($histo[$key]['elementtype']);
             if (isset($histo[$key]['elementtype']))
             {
             	if ($histo[$key]['elementtype'] == 'propal' && ! empty($conf->propal->enabled))
@@ -1259,13 +1278,13 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
             		$propalstatic->id=$histo[$key]['fk_element'];
             		$out.=$propalstatic->getNomUrl(1);
             	}
-            	elseif ($histo[$key]['elementtype'] == 'commande' && ! empty($conf->commande->enabled))
+            	elseif (($histo[$key]['elementtype'] == 'order' || $histo[$key]['elementtype'] == 'commande') && ! empty($conf->commande->enabled))
             	{
             		$orderstatic->ref=$langs->trans("Order");
             		$orderstatic->id=$histo[$key]['fk_element'];
             		$out.=$orderstatic->getNomUrl(1);
             	}
-            	elseif ($histo[$key]['elementtype'] == 'facture' && ! empty($conf->facture->enabled))
+            	elseif (($histo[$key]['elementtype'] == 'invoice' || $histo[$key]['elementtype'] == 'facture') && ! empty($conf->facture->enabled))
             	{
             		$facturestatic->ref=$langs->trans("Invoice");
             		$facturestatic->id=$histo[$key]['fk_element'];
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index b729aae2589..8d9ba9296a4 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -26,7 +26,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function contact_prepare_head($object)
 {
@@ -35,7 +35,7 @@ function contact_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/contact/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index 1086d4dcd14..b7e82c6dbf2 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -26,7 +26,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function contract_prepare_head($object)
 {
@@ -34,7 +34,7 @@ function contract_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/contrat/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/contrat/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("ContractCard");
 	$head[$h][2] = 'card';
 	$h++;
@@ -60,7 +60,7 @@ function contract_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Notes");
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -70,7 +70,7 @@ function contract_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 924d3da2259..d2c6ce4bd4f 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -131,12 +131,13 @@ function getServerTimeZoneInt($refgmtdate='now')
  *
  *  @param      int			$time               Date timestamp (or string with format YYYY-MM-DD)
  *  @param      int			$duration_value     Value of delay to add
- *  @param      int			$duration_unit      Unit of added delay (d, m, y, w)
- *  @return     int      			        New timestamp
+ *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h)
+ *  @return     int      			        	New timestamp
  */
 function dol_time_plus_duree($time,$duration_value,$duration_unit)
 {
 	if ($duration_value == 0)  return $time;
+	if ($duration_unit == 'h') return $time + (3600*$duration_value);
 	if ($duration_unit == 'w') return $time + (3600*24*7*$duration_value);
 	if ($duration_value > 0) $deltastring="+".abs($duration_value);
 	if ($duration_value < 0) $deltastring="-".abs($duration_value);
@@ -168,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)
@@ -442,10 +443,11 @@ function dol_get_next_week($day, $week, $month, $year)
  * 	@param		mixed		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
  *                          			Exemple: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, after a dol_print_date will return 1970-01-01 00:00:00
  *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, after a dol_print_date will return 1970-01-01 00:00:00
- *  @return		int						Date for first day
+ *  @return		int						Date for first day, '' if error
  */
 function dol_get_first_day($year,$month=1,$gm=false)
 {
+	if ($year > 9999) return '';
 	return dol_mktime(0,0,0,$month,1,$year,$gm);
 }
 
@@ -455,10 +457,11 @@ function dol_get_first_day($year,$month=1,$gm=false)
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
  * 	@param		boolean		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
- *	@return		int						Date for first day
+ *	@return		int						Date for first day, '' if error
  */
 function dol_get_last_day($year,$month=12,$gm=false)
 {
+	if ($year > 9999) return '';
 	if ($month == 12)
 	{
 		$month = 1;
@@ -525,7 +528,7 @@ function dol_get_first_day_week($day,$month,$year,$gm=false)
 	$tmpmonth = $prev_month;
 	$tmpyear = $prev_year;
 
-    //Get first day of next week
+	//Get first day of next week
 	$tmptime=dol_mktime(12,0,0,$month,$tmpday,$year,1,0);
 	$tmptime-=24*60*60*7;
 	$tmparray=dol_getdate($tmptime,true);
@@ -662,6 +665,49 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR')
 			//Samedi (6) et dimanche (0)
 		}
 
+		if ($countrycode == 'ES')
+		{
+			$countryfound=1;
+
+			// Definition des dates feriees fixes
+			if($jour == 1 && $mois == 1)   $ferie=true; // Año nuevo
+			if($jour == 6 && $mois == 1)   $ferie=true; // Día Reyes
+			if($jour == 1 && $mois == 5)   $ferie=true; // 1 Mayo
+			if($jour == 15 && $mois == 8)  $ferie=true; // 15 Agosto
+			if($jour == 12 && $mois == 10)  $ferie=true; // Día Hispanidad
+			if($jour == 1 && $mois == 11)  $ferie=true; // 1 noviembre
+			if($jour == 6 && $mois == 12) $ferie=true; // Constitución
+			if($jour == 8 && $mois == 12)  $ferie=true; // Inmaculada
+			if($jour == 25 && $mois == 12) $ferie=true; // 25 diciembre
+
+			// Calcul día de Pascua
+			$date_paques = easter_date($annee);
+			$jour_paques = date("d", $date_paques);
+			$mois_paques = date("m", $date_paques);
+			if($jour_paques == $jour && $mois_paques == $mois) $ferie=true;
+			// Paques
+
+			// Viernes Santo
+            $date_viernes = mktime(
+                date("H", $date_paques),
+                date("i", $date_paques),
+                date("s", $date_paques),
+                date("m", $date_paques),
+                date("d", $date_paques) -2,
+                date("Y", $date_paques)
+            );
+			$jour_viernes = date("d", $date_viernes);
+			$mois_viernes = date("m", $date_viernes);
+			if($jour_viernes == $jour && $mois_viernes == $mois) $ferie=true;
+			//Viernes Santo
+
+			// Calul des samedis et dimanches
+			$jour_julien = unixtojd($timestampStart);
+			$jour_semaine = jddayofweek($jour_julien, 0);
+			if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true;
+			//Samedi (6) et dimanche (0)
+		}
+
 		// Cas pays non defini
 		if (! $countryfound)
 		{
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 1257d6a9bd1..1debd4e3892 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -27,11 +27,13 @@
  * Prepare array with list of different ecm main dashboard
  *
  * @param   object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function ecm_prepare_dasboard_head($object)
 {
 	global $langs, $conf, $user;
+	global $helptext1, $helptext2;
+
 	$h = 0;
 	$head = array();
 
@@ -64,7 +66,7 @@ function ecm_prepare_dasboard_head($object)
  * Prepare array with list of tabs
  *
  * @param   object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function ecm_prepare_head($object)
 {
@@ -84,7 +86,7 @@ function ecm_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function ecm_file_prepare_head($object)
 {
@@ -104,7 +106,7 @@ function ecm_file_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param   object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function ecm_prepare_head_fm($object)
 {
diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index 6c06a1eccb2..239f36721ee 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -25,7 +25,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function emailing_prepare_head($object)
 {
@@ -34,7 +34,7 @@ function emailing_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/fiche.php?id=".$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/comm/mailing/card.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("MailCard");
 	$head[$h][2] = 'card';
 	$h++;
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 01d79cdcabe..89f685590b3 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -28,7 +28,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function fichinter_prepare_head($object)
 {
@@ -38,7 +38,7 @@ function fichinter_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -72,7 +72,7 @@ function fichinter_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -82,7 +82,7 @@ function fichinter_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -126,6 +126,11 @@ function fichinter_admin_prepare_head()
     $head[$h][2] = 'attributes';
     $h++;
 
+	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributesdet';
+    $h++;
+
 
 
 	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin','remove');
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index bcc6c165472..4b9e7eb520f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -139,6 +139,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 								$level1name=(isset($reg[1])?$reg[1]:'');
 								$file_list[] = array(
 										"name" => $file,
+										"path" => $path,
 										"level1name" => $level1name,
 										"fullname" => $path.'/'.$file,
 										"date" => $filedate,
@@ -166,6 +167,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 							$level1name=(isset($reg[1])?$reg[1]:'');
 							$file_list[] = array(
 									"name" => $file,
+									"path" => $path,
 									"level1name" => $level1name,
 									"fullname" => $path.'/'.$file,
 									"date" => $filedate,
@@ -807,14 +809,15 @@ function dol_delete_dir($dir,$nophperrors=0)
 }
 
 /**
- *  Remove a directory $dir and its subdirectories
+ *  Remove a directory $dir and its subdirectories (or only files and subdirectories)
  *
  *  @param	string	$dir            Dir to delete
  *  @param  int		$count          Counter to count nb of deleted elements
  *  @param  int		$nophperrors    Disable all PHP output errors
+ *  @param	int		$onlysub		Delete only files and subdir, not main directory
  *  @return int             		Number of files and directory removed
  */
-function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0)
+function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0,$onlysub=0)
 {
     dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
     if (dol_is_dir($dir))
@@ -841,9 +844,13 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0)
                 }
             }
             closedir($handle);
-            dol_delete_dir($dir,$nophperrors);
-            $count++;
-            //echo "removing $dir<br>\n";
+
+            if (empty($onlysub))
+            {
+	            dol_delete_dir($dir,$nophperrors);
+    	        $count++;
+        	    //echo "removing $dir<br>\n";
+            }
         }
     }
 
@@ -949,7 +956,7 @@ function dol_meta_create($object)
 		if (is_dir($dir))
 		{
 			$nblignes = count($object->lines);
-			$client = $object->client->nom . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town;
+			$client = $object->client->name . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town;
 			$meta = "REFERENCE=\"" . $object->ref . "\"
 			DATE=\"" . dol_print_date($object->date,'') . "\"
 			NB_ITEMS=\"" . $nblignes . "\"
@@ -1587,6 +1594,16 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		$original_file=$conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
+	// Wrapping for interventions
+	else if ($modulepart == 'fichinter')
+	{
+		if ($fuser->rights->ficheinter->lire || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->ficheinter->dir_output.'/'.$original_file;
+		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
+	}
 
 	// Wrapping pour les commandes fournisseurs
 	else if ($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier')
@@ -1621,14 +1638,14 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
 		else $original_file=$conf->facture->dir_output.'/payments/'.$original_file;
 	}
 
-	// Wrapping pour les exports de compta
+	// Wrapping for accounting exports
 	else if ($modulepart == 'export_compta')
 	{
-		if ($fuser->rights->compta->ventilation->creer || preg_match('/^specimen/i',$original_file))
+		if ($fuser->rights->accounting->ventilation->dispatch || preg_match('/^specimen/i',$original_file))
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->compta->dir_output.'/'.$original_file;
+		$original_file=$conf->accounting->dir_output.'/'.$original_file;
 	}
 
 	// Wrapping pour les expedition
diff --git a/htdocs/core/lib/fiscalyear.lib.php b/htdocs/core/lib/fiscalyear.lib.php
new file mode 100644
index 00000000000..5d27760b41f
--- /dev/null
+++ b/htdocs/core/lib/fiscalyear.lib.php
@@ -0,0 +1,56 @@
+<?php
+/* Copyright (C) 2014	Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	    \file       htdocs/core/lib/fiscalyear.lib.php
+ *		\brief		Set basic functions for fiscal years
+ */
+
+/**
+ * Prepare array with list of tabs
+ *
+ * @param   Object	$object		Object related to tabs
+ * @return  array				Array of tabs to show
+ */
+function fiscalyear_prepare_head($object)
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_card.php?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,'fiscalyear');
+
+	$head[$h][0] = DOL_URL_ROOT . '/accountancy/admin/fiscalyear_info.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'fiscalyear','remove');
+
+	return $head;
+}
\ No newline at end of file
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 171eda67a90..e4e7b04b057 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -29,7 +29,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function facturefourn_prepare_head($object)
 {
@@ -37,7 +37,7 @@ function facturefourn_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('CardBill');
 	$head[$h][2] = 'card';
 	$h++;
@@ -63,7 +63,7 @@ function facturefourn_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -73,7 +73,7 @@ function facturefourn_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -92,7 +92,7 @@ function facturefourn_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function ordersupplier_prepare_head($object)
 {
@@ -100,7 +100,7 @@ function ordersupplier_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("OrderCard");
 	$head[$h][2] = 'card';
 	$h++;
@@ -135,7 +135,7 @@ function ordersupplier_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Notes");
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -145,7 +145,7 @@ function ordersupplier_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -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 f6f09dd1567..4afe2d7917a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7,9 +7,11 @@
  * Copyright (C) 2004      Christophe Combelles <ccomb@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand (Resultic)       <raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2014      Cédric GROSS         <c.gross@kreiz-it.fr>
  *
  * 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,11 +34,7 @@
  *					This file contains all frequently used functions.
  */
 
-
-if (! function_exists('json_encode'))
-{
-	include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
-}
+include_once DOL_DOCUMENT_ROOT .'/core/lib/json.lib.php';
 
 /**
  * Function to return value of a static property when class
@@ -49,23 +47,30 @@ if (! function_exists('json_encode'))
  */
 function getStaticMember($class, $member)
 {
-	if (is_object($class)) $class = get_class($class);
-	$classObj = new ReflectionClass($class);
-	$result = null;
-
-	$found=0;
-	foreach($classObj->getStaticProperties() as $prop => $value)
+	// This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member
+	/*if (version_compare(phpversion(), '5.3.0', '<'))
 	{
-		if ($prop == $member)
-		{
-			$result = $value;
-			$found++;
-			break;
-		}
-	}
+		if (is_object($class)) $class = get_class($class);
+		$classObj = new ReflectionClass($class);
+		$result = null;
 
-	if (! $found) dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');
-	return $result;
+		$found=0;
+		foreach($classObj->getStaticProperties() as $prop => $value)
+		{
+			if ($prop == $member)
+			{
+				$result = $value;
+				$found++;
+				break;
+			}
+		}
+
+		if ($found) return $result;
+	}*/
+
+	if (isset($class::$member)) return $class::$member;
+	dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');
+	return null;
 }
 
 
@@ -120,11 +125,11 @@ function getEntity($element=false, $shared=false)
 /**
  * Return information about user browser
  *
- * @return	array		Array of information ('browsername'=>,'browseros'=>,'phone'=>,'browserfirefox'=>)
+ * @return	array		Array of information ('browsername'=>,'browseros'=>,'browserversion'=>,'layout'=>(classic|phone|tablet))
  */
 function getBrowserInfo()
 {
-	$name='unknown'; $version=''; $os='unknown'; $phone='';
+	$name='unknown'; $version=''; $os='unknown'; $phone=''; $tablet='';
 
 	// If phone/smartphone, we set phone os name.
 	if (preg_match('/android/i',$_SERVER["HTTP_USER_AGENT"]))			{ $os=$phone='android'; }
@@ -138,6 +143,11 @@ function getBrowserInfo()
 	// MS products at end
 	elseif (preg_match('/iemobile/i',$_SERVER["HTTP_USER_AGENT"]))		{ $os='windows'; $phone='unkown'; }
 	elseif (preg_match('/windows ce/i',$_SERVER["HTTP_USER_AGENT"]))	{ $os='windows'; $phone='unkown'; }
+
+	// OS
+	if (preg_match('/android/i',$_SERVER["HTTP_USER_AGENT"]))	{ $os='android'; }
+	elseif (preg_match('/linux/i',$_SERVER["HTTP_USER_AGENT"]))	{ $os='linux'; }
+
 	// Name
 	if (preg_match('/firefox(\/|\s)([\d\.]*)/i',    $_SERVER["HTTP_USER_AGENT"], $reg))  { $name='firefox';   $version=$reg[2]; }
 	elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $_SERVER["HTTP_USER_AGENT"], $reg))  { $name='chrome';    $version=$reg[2]; }    // we can have 'chrome (Mozilla...) chrome x.y' in one string
@@ -151,7 +161,13 @@ function getBrowserInfo()
 	$firefox=0;
 	if (in_array($name,array('firefox','iceweasel'))) $firefox=1;
 
-	return array('browsername'=>$name, 'browserversion'=>$version, 'browseros'=>$os, 'phone'=>$phone, 'browserfirefox'=>$firefox);
+	include_once DOL_DOCUMENT_ROOT.'/core/class/mobiledetect.class.php';
+	$detectmobile=new MobileDetect();
+	$phone=$detectmobile->isMobile();
+	$tablet=$detectmobile->isTablet();
+	unset($detectmobile);	// free memory
+
+	return array('browsername'=>$name, 'browserversion'=>$version, 'browseros'=>$os, 'browserfirefox'=>$firefox, 'layout'=> ($tablet?'tablet':($phone?'phone':'classic')), 'phone'=>$phone, 'tablet'=>$tablet);
 }
 
 /**
@@ -172,11 +188,13 @@ function dol_shutdown()
  *  Return value of a param into GET or POST supervariable
  *
  *  @param	string	$paramname   Name of parameter to found
- *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array)
+ *  @param	string	$check	     Type of check (''=no check,  'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'= Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string), 'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie)
- *  @return string||string[]      		 Value found, or '' if check fails
+ *  @param  int     $filter      Filter to apply when $check is set to custom. (See http://php.net/manual/en/filter.filters.php for détails)
+ *  @param  mixed   $options     Options to pass to filter_var when $check is set to custom
+ *  @return string||string[]     Value found (string or array), or '' if check fails
  */
-function GETPOST($paramname,$check='',$method=0)
+function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
 {
 	if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:'');
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
@@ -187,28 +205,33 @@ function GETPOST($paramname,$check='',$method=0)
 
 	if (! empty($check))
 	{
-		// Check if numeric
-		if ($check == 'int' && ! is_numeric($out)) $out='';
-		// Check if alpha
-		elseif ($check == 'alpha')
-		{
-			$out=trim($out);
-			// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-			// '../' is dangerous because it allows dir transversals
-			if (preg_match('/"/',$out)) $out='';
-			else if (preg_match('/\.\.\//',$out)) $out='';
-		}
-		elseif ($check == 'aZ')
-		{
-			$out=trim($out);
-			// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-			// '../' is dangerous because it allows dir transversals
-			if (preg_match('/[^a-z]+/i',$out)) $out='';
-		}
-		elseif ($check == 'array')
-		{
-			if (! is_array($out) || empty($out)) $out=array();
-		}
+	    switch ($check)
+	    {
+	        case 'int':
+	            if (! is_numeric($out)) { $out=''; }
+	            break;
+	        case 'alpha':
+	            $out=trim($out);
+	            // '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+	            // '../' is dangerous because it allows dir transversals
+	            if (preg_match('/"/',$out)) $out='';
+	            else if (preg_match('/\.\.\//',$out)) $out='';
+	            break;
+	        case 'san_alpha':
+	            $out=filter_var($out,FILTER_SANITIZE_STRING);
+	            break;
+	        case 'aZ':
+	            $out=trim($out);
+	            if (preg_match('/[^a-z]+/i',$out)) $out='';
+	            break;
+	        case 'array':
+	            if (! is_array($out) || empty($out)) $out=array();
+	            break;
+	        case 'custom':
+	            if (empty($filter)) return 'BadFourthParameterForGETPOST';
+	            $out=filter_var($out, $filter, $options);
+	            break;
+	    }
 	}
 
 	return $out;
@@ -224,7 +247,12 @@ function GETPOST($paramname,$check='',$method=0)
  */
 function dol_getprefix()
 {
-	if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+	if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
+	{
+		return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+		// Use this for a "clear" cookie name
+		//return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+	}
 	else return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 }
 
@@ -236,16 +264,23 @@ function dol_getprefix()
  *
  * 	@param	string	$relpath	Relative path to file (Ie: mydir/myfile, ../myfile, ...)
  * 	@param	string	$classname	Class name
- *  @return int					false if include fails.
+ *  @return bool
  */
 function dol_include_once($relpath, $classname='')
 {
-	global $conf,$langs,$user,$mysoc;   // Other global var must be retreived with $GLOBALS['var']
+	global $conf,$langs,$user,$mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']
+
+	$fullpath = dol_buildpath($relpath);
+
+	if (!file_exists($fullpath)) {
+		dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);
+		return false;
+	}
 
 	if (! empty($classname) && ! class_exists($classname)) {
-		return @include dol_buildpath($relpath);			// Remove @ to find error into php log file if you have problems
+		return include $fullpath;
 	} else {
-		return @include_once dol_buildpath($relpath);		// Remove @ to find error into php log file if you have problems
+		return include_once $fullpath;
 	}
 }
 
@@ -436,6 +471,18 @@ function dol_string_nospecial($str,$newstr='_',$badchars='')
 	return str_replace($forbidden_chars_to_replace,$newstr,str_replace($forbidden_chars_to_remove,"",$str));
 }
 
+
+/**
+ * Encode string for xml usage
+ *
+ * @param 	string	$string		String to encode
+ * @return	string				String encoded
+ */
+function dolEscapeXML($string)
+{
+	return strtr($string, array('\''=>'&apos;','"'=>'&quot;','&'=>'&amp;','<'=>'&lt;','>'=>'&gt;'));
+}
+
 /**
  *  Returns text escaped for inclusion into javascript code
  *
@@ -641,7 +688,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
 	{
 		$isactive=(is_numeric($active) && $i == $active) || (! is_numeric($active) && $active == $links[$i][2]);
 
-		$out.='<div class="inline-block tabsElem'.((! $isactive && ! empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT))?' hideonprint':'').'">';
+		$out.='<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((! $isactive && ! empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT))?' hideonprint':'').'">';
 		if (isset($links[$i][2]) && $links[$i][2] == 'image')
 		{
 			if (!empty($links[$i][0]))
@@ -981,6 +1028,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
@@ -992,6 +1041,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;
@@ -1010,7 +1072,7 @@ function dol_getdate($timestamp,$fast=false)
  *	@param	int			$year			Year
  *	@param	mixed		$gm				True or 1 or 'gmt'=Input informations are GMT values, False or 0 or 'server' = local to server TZ, 'user' = local to user TZ
  *	@param	int			$check			0=No check on parameters (Can use day 32, etc...)
- *	@return	int							Date as a timestamp, '' if error
+ *	@return	timestamp|string			Date as a timestamp, '' if error
  * 	@see 								dol_print_date, dol_stringtotime, dol_getdate
  */
 function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
@@ -1054,15 +1116,16 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
 				$default_timezone=@date_default_timezone_get();
 			}
 		}
-		
+
 		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);
 		$date=$dt->getTimestamp();	// should include daylight saving time
+		return $date;
 	}
 	else
 	{
@@ -1080,8 +1143,8 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
 		{
 			$date=mktime($hour,$minute,$second,$month,$day,$year);
 		}*/
+		return '';
 	}
-	return $date;
 }
 
 
@@ -1215,7 +1278,7 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_EMAIL'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			if (! empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
 			$newemail='<table class="nobordernopadding"><tr><td>'.$newemail.' </td><td>&nbsp;'.$link.'</td></tr></table>';
 		}
 	}
@@ -1234,11 +1297,11 @@ function dol_print_email($email,$cid=0,$socid=0,$addlink=0,$max=64,$showinvalid=
  * 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)
 {
@@ -1253,17 +1316,17 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64)
 		$newskype='<a href="skype:';
 		$newskype.=dol_trunc($skype,$max);
 		$newskype.='?call" alt="'.$langs->trans("Call").'&nbsp;'.$skype.'" title="'.$langs->trans("Call").'&nbsp;'.$skype.'">';
-    $newskype.='<img src="../theme/common/skype_callbutton.png" border="0">&nbsp;';
-		$newskype.='</a>&nbsp;<a href="skype:';
+		$newskype.='<img src="../theme/common/skype_callbutton.png" border="0">';
+		$newskype.='</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="skype:';
 		$newskype.=dol_trunc($skype,$max);
 		$newskype.='?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$skype.'" title="'.$langs->trans("Chat").'&nbsp;'.$skype.'">';
-    $newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">&nbsp;';
+		$newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">';
 		$newskype.='</a>';
 
 		if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		{
 			$type='AC_SKYPE'; $link='';
-			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			if (! empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
 			$newskype='<table class="nobordernopadding"><tr><td>'.$newskype.' </td><td>&nbsp;'.$link.'</td></tr></table>';
 		}
 	}
@@ -1361,7 +1424,7 @@ 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='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
+			if (! empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid?'&amp;contactid='.$cid:'').($socid?'&amp;socid='.$socid:'').'">'.img_object($langs->trans("AddAction"),"calendar").'</a>';
 			if ($link) $newphone='<table class="nobordernopadding"><tr><td>'.$newphone.' </td><td>&nbsp;'.$link.'</td></tr></table>';
 		}
 	}
@@ -1488,19 +1551,11 @@ function dol_print_address($address, $htmlid, $mode, $id)
  */
 function isValidEmail($address)
 {
-	if (preg_match("/.*<(.+)>/i", $address, $regs)) {
-		$address = $regs[1];
-	}
-	// 2 letters domains extensions are for countries
-	// 3 letters domains extensions: biz|com|edu|gov|int|mil|net|org|pro|...
-	if (preg_match("/^[^@\s\t]+@([a-zA-Z0-9\-]+\.)+([a-zA-Z0-9\-]{2,3}|asso|aero|coop|info|name)\$/i",$address))
-	{
+	if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
 		return true;
 	}
-	else
-	{
-		return false;
-	}
+
+	return false;
 }
 
 /**
@@ -1733,6 +1788,8 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 {
 	global $conf;
 
+	if (empty($stringencoding)) $stringencoding='UTF-8';
+
 	if ($size==0 || ! empty($conf->global->MAIN_DISABLE_TRUNC)) return $string;
 
 	// We go always here
@@ -1778,7 +1835,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
 /**
  *	Show picto whatever it's its name (generic function)
  *
- *	@param      string		$alt         		Text on alt and title of image (alt only if param notitle is set to 1)
+ *	@param      string		$titlealt         	Text on title and alt. If text is "TextA:TextB", use Text A on alt and Text B on title. Alt only if param notitle is set to 1.
  *	@param      string		$picto       		Name of image file to show ('filenew', ...)
  *												If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.
  *                                  			Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
@@ -1791,7 +1848,7 @@ function dol_trunc($string,$size=40,$trunc='right',$stringencoding='UTF-8',$nodo
  *  @return     string       				    Return img tag
  *  @see        #img_object, #img_picto_common
  */
-function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
+function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $srconly=0, $notitle=0)
 {
 	global $conf;
 
@@ -1804,13 +1861,15 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
 	}
 	else
 	{
-		// By default, we search $url/theme/$theme/img/$picto
+		// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 		$url = DOL_URL_ROOT;
 		$theme = $conf->theme;
 
 		$path = 'theme/'.$theme;
-		if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;
-		//if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path;	// TODO What if there is both FORCETHEMDIR and OVERWRITE_THEM_RES
+		if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme;	// If the theme does not have the same name as the module
+		else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme
+		else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme;	// If the theme have the same name as the module
+
 		// If we ask an image into $url/$mymodule/img (instead of default path)
 		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
 		{
@@ -1820,10 +1879,10 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
 		// Clean parameters
 		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png';
 		// If alt path are defined, define url where img file is, according to physical path
-		foreach ($conf->file->dol_document_root as $type => $dirroot)	// ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir/htdocs", ...)
+		foreach ($conf->file->dol_document_root as $type => $dirroot)	// ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...)
 		{
 			if ($type == 'main') continue;
-			if (file_exists($dirroot.'/'.$path.'/img/'.$picto))
+			if (file_exists($dirroot.'/'.$path.'/img/'.$picto))	// This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded
 			{
 				$url=DOL_URL_ROOT.$conf->file->dol_url_root[$type];
 				break;
@@ -1835,13 +1894,20 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
 	}
 
 	if ($srconly) return $fullpathpicto;
-	else return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($alt).'"').($options?' '.$options:'').'>';
+	else
+	{
+		$tmparray=array(0=>$titlealt);
+		if (preg_match('/:[^\s]/',$titlealt)) $tmparray=explode(':',$titlealt);		// We explode if we have TextA:TextB. Not if we have TextA: TextB
+		$title=$tmparray[0];
+		$alt=empty($tmparray[1])?'':$tmparray[1];
+		return '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($options?' '.$options:'').'>';	// Alt is used for accessibility, title for popup
+	}
 }
 
 /**
  *	Show a picto called object_picto (generic function)
  *
- *	@param	string	$alt				Text of alt on image
+ *	@param	string	$titlealt			Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param	string	$picto				Name of image to show object_picto (example: user, group, action, bill, contract, propal, product, ...)
  *										For external modules use imagename@mymodule to search into directory "img" of module.
  *	@param	string	$options			Add more attribute on img tag (ie: class="datecallink")
@@ -1849,22 +1915,22 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
  *	@return	string						Return img tag
  *	@see	#img_picto, #img_picto_common
  */
-function img_object($alt, $picto, $options = '', $pictoisfullpath = false)
+function img_object($titlealt, $picto, $options = '', $pictoisfullpath = false)
 {
-	return img_picto($alt, 'object_'.$picto, $options, $pictoisfullpath);
+	return img_picto($titlealt, 'object_'.$picto, $options, $pictoisfullpath);
 }
 
 /**
  *	Show picto (generic function)
  *
- *	@param      string		$alt         		Text on alt and title of image
+ *	@param      string		$titlealt         	Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param      string		$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
  *	@param		string		$options			Add more attribute on img tag
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
  *	@return     string      					Return img tag
  *  @see        #img_object, #img_picto
  */
-function img_picto_common($alt, $picto, $options = '', $pictoisfullpath = 0)
+function img_picto_common($titlealt, $picto, $options = '', $pictoisfullpath = 0)
 {
 	global $conf;
 
@@ -1883,141 +1949,143 @@ function img_picto_common($alt, $picto, $options = '', $pictoisfullpath = 0)
 		}
 	}
 
-	return img_picto($alt, $path, $options, 1);
+	return img_picto($titlealt, $path, $options, 1);
 }
 
 /**
  *	Show logo action
  *
- *	@param	string	$alt         	Text for image alt and title ('default', ...)
+ *	@param	string	$titlealt       Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$numaction   	Action to show
  *	@return string      			Return an img tag
  */
-function img_action($alt, $numaction)
+function img_action($titlealt, $numaction)
 {
 	global $conf, $langs;
 
-	if ($alt == 'default')
+	if ($titlealt == 'default')
 	{
-		if ($numaction == -1) $alt = $langs->transnoentitiesnoconv('ChangeDoNotContact');
-		if ($numaction == 0) $alt = $langs->transnoentitiesnoconv('ChangeNeverContacted');
-		if ($numaction == 1) $alt = $langs->transnoentitiesnoconv('ChangeToContact');
-		if ($numaction == 2) $alt = $langs->transnoentitiesnoconv('ChangeContactInProcess');
-		if ($numaction == 3) $alt = $langs->transnoentitiesnoconv('ChangeContactDone');
+		if ($numaction == -1) $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact');
+		if ($numaction == 0) $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted');
+		if ($numaction == 1) $titlealt = $langs->transnoentitiesnoconv('ChangeToContact');
+		if ($numaction == 2) $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess');
+		if ($numaction == 3) $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');
 	}
 
-	return img_picto($alt, 'stcomm'.$numaction.'.png');
+	return img_picto($titlealt, 'stcomm'.$numaction.'.png');
 }
 
 /**
  *  Show pdf logo
  *
- *  @param	string		$alt        Texte sur le alt de l'image
+ *  @param	string		$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *  @param  int		    $size       Taille de l'icone : 3 = 16x16px , 2 = 14x14px
  *  @return string      			Retourne tag img
  */
-function img_pdf($alt = 'default', $size = 3)
+function img_pdf($titlealt = 'default', $size = 3)
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Show');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Show');
 
-	return img_picto($alt, 'pdf'.$size.'.png');
+	return img_picto($titlealt, 'pdf'.$size.'.png');
 }
 
 /**
  *	Show logo +
  *
- *	@param	string	$alt        Texte sur le alt de l'image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param  string	$other      Add more attributes on img
  *	@return string      		Return tag img
  */
-function img_edit_add($alt = 'default')
+function img_edit_add($titlealt = 'default', $other = '')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Add');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Add');
 
-	return img_picto($alt, 'edit_add.png');
+	return img_picto($titlealt, 'edit_add.png', $other);
 }
 /**
  *	Show logo -
  *
- *	@param	string	$alt         Texte sur le alt de l'image
- *	@return string      Retourne tag img
+ *	@param	string	$titlealt	Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param  string	$other      Add more attributes on img
+ *	@return string      		Return tag img
  */
-function img_edit_remove($alt = 'default')
+function img_edit_remove($titlealt = 'default', $other='')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Remove');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Remove');
 
-	return img_picto($alt, 'edit_remove.png');
+	return img_picto($titlealt, 'edit_remove.png', $other);
 }
 
 /**
  *	Show logo editer/modifier fiche
  *
- *	@param  string	$alt        Texte sur le alt de l'image
+ *	@param  string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  float	$float      Si il faut y mettre le style "float: right"
  *	@param  string	$other		Add more attributes on img
- *	@return string      		Retourne tag img
+ *	@return string      		Return tag img
  */
-function img_edit($alt = 'default', $float = 0, $other = '')
+function img_edit($titlealt = 'default', $float = 0, $other = '')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Modify');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
 
-	return img_picto($alt, 'edit.png', ($float ? 'style="float: right"' : $other));
+	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: right"' : $other));
 }
 
 /**
  *	Show logo view card
  *
- *	@param	string	$alt         Texte sur le alt de l'image
- *	@param  float	$float       Si il faut y mettre le style "float: right"
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param  float	$float      Si il faut y mettre le style "float: right"
  *	@param  string	$other		Add more attributes on img
- *	@return string      Retourne tag img
+ *	@return string      		Return tag img
  */
-function img_view($alt = 'default', $float = 0, $other = '')
+function img_view($titlealt = 'default', $float = 0, $other = '')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('View');
+	if ($titlealt == 'default') $titlealt = $langs->trans('View');
 
 	$options = ($float ? 'style="float: right" ' : '').$other;
 
-	return img_picto($alt, 'view.png', $options);
+	return img_picto($titlealt, 'view.png', $options);
 }
 
 /**
  *  Show delete logo
  *
- *  @param	string	$alt        Text on alt image
+ *  @param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  string	$other      Add more attributes on img
  *  @return string      		Retourne tag img
  */
-function img_delete($alt = 'default', $other = '')
+function img_delete($titlealt = 'default', $other = '')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Delete');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
 
-	return img_picto($alt, 'delete.png', $other);
+	return img_picto($titlealt, 'delete.png', $other);
 }
 
 /**
  *  Show printer logo
  *
- *  @param  string  $alt        Text on alt image
+ *  @param  string  $titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *  @param  string  $other      Add more attributes on img
  *  @return string              Retourne tag img
  */
-function img_printer($alt = "default", $other='')
+function img_printer($titlealt = "default", $other='')
 {
     global $conf,$langs;
-    if ($alt=="default") $alt=$langs->trans("Print");
-    return img_picto($alt,'printer.png',$other);
+    if ($titlealt=="default") $titlealt=$langs->trans("Print");
+    return img_picto($titlealt,'printer.png',$other);
 }
 
 /**
@@ -2043,159 +2111,159 @@ function img_help($usehelpcursor = 1, $usealttitle = 1)
 /**
  *	Show info logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@return string      		Return img tag
  */
-function img_info($alt = 'default')
+function img_info($titlealt = 'default')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Informations');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Informations');
 
-	return img_picto($alt, 'info.png');
+	return img_picto($titlealt, 'info.png');
 }
 
 /**
  *	Show warning logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$float      If we must add style "float: right"
  *	@return string      		Return img tag
  */
-function img_warning($alt = 'default', $float = 0)
+function img_warning($titlealt = 'default', $float = 0)
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Warning');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
 
-	return img_picto($alt, 'warning.png', ($float ? 'style="float: right"' : ''));
+	return img_picto($titlealt, 'warning.png', ($float ? 'style="float: right"' : ''));
 }
 
 /**
  *  Show error logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@return string      		Return img tag
  */
-function img_error($alt = 'default')
+function img_error($titlealt = 'default')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Error');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Error');
 
-	return img_picto($alt, 'error.png');
+	return img_picto($titlealt, 'error.png');
 }
 
 /**
  *	Show next logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@return string      		Return img tag
  */
-function img_next($alt = 'default')
+function img_next($titlealt = 'default')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Next');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
 
-	return img_picto($alt, 'next.png');
+	return img_picto($titlealt, 'next.png');
 }
 
 /**
  *	Show previous logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@return string      		Return img tag
  */
-function img_previous($alt = 'default')
+function img_previous($titlealt = 'default')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Previous');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
 
-	return img_picto($alt, 'previous.png');
+	return img_picto($titlealt, 'previous.png');
 }
 
 /**
  *	Show down arrow logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$selected   Selected
  *	@return string      		Return img tag
  */
-function img_down($alt = 'default', $selected = 0)
+function img_down($titlealt = 'default', $selected = 0)
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Down');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Down');
 
-	return img_picto($alt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown"');
+	return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown"');
 }
 
 /**
  *	Show top arrow logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$selected	Selected
  *	@return string      		Return img tag
  */
-function img_up($alt = 'default', $selected = 0)
+function img_up($titlealt = 'default', $selected = 0)
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Up');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Up');
 
-	return img_picto($alt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup"');
+	return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup"');
 }
 
 /**
  *	Show left arrow logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$selected	Selected
  *	@param	string	$options	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_left($alt = 'default', $selected = 0, $options='')
+function img_left($titlealt = 'default', $selected = 0, $options='')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Left');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Left');
 
-	return img_picto($alt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $options);
+	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $options);
 }
 
 /**
  *	Show right arrow logo
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$selected	Selected
  *	@param	string	$options	Add more attribute on img tag (For example 'style="float: right"')
  *	@return string      		Return img tag
  */
-function img_right($alt = 'default', $selected = 0, $options='')
+function img_right($titlealt = 'default', $selected = 0, $options='')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Right');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Right');
 
-	return img_picto($alt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $options);
+	return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $options);
 }
 
 /**
  *	Show tick logo if allowed
  *
  *	@param	string	$allow		Allow
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@return string      		Return img tag
  */
-function img_allow($allow, $alt = 'default')
+function img_allow($allow, $titlealt = 'default')
 {
 	global $conf, $langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Active');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Active');
 
-	if ($allow == 1) return img_picto($alt, 'tick.png');
+	if ($allow == 1) return img_picto($titlealt, 'tick.png');
 
 	return '-';
 }
@@ -2205,19 +2273,19 @@ function img_allow($allow, $alt = 'default')
  *	Show MIME img of a file
  *
  *	@param	string	$file		Filename
- * 	@param	string	$alt		Alternate text to show on img mous hover
+ * 	@param	string	$titlealt	Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@return string     			Return img tag
  */
-function img_mime($file, $alt = '')
+function img_mime($file, $titlealt = '')
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	$mimetype = dol_mimetype($file, '', 1);
 	$mimeimg = dol_mimetype($file, '', 2);
 
-	if (empty($alt)) $alt = 'Mime type: '.$mimetype;
+	if (empty($titlealt)) $titlealt = 'Mime type: '.$mimetype;
 
-	return img_picto_common($alt, 'mime/'.$mimeimg);
+	return img_picto_common($titlealt, 'mime/'.$mimeimg);
 }
 
 
@@ -2225,23 +2293,64 @@ function img_mime($file, $alt = '')
  *	Show phone logo.
  *  Use img_picto instead.
  *
- *	@param	string	$alt        Text to show on alt image
+ *	@param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  int		$option		Option
  *	@return string      		Return img tag
  *  @deprecated
  */
-function img_phone($alt = 'default', $option = 0)
+function img_phone($titlealt = 'default', $option = 0)
 {
 	global $conf,$langs;
 
-	if ($alt == 'default') $alt = $langs->trans('Call');
+	if ($titlealt == 'default') $titlealt = $langs->trans('Call');
 
 	if ($option == 1) $img = 'call';
 	else $img = 'call_out';
 
-	return img_picto($alt, $img);
+	return img_picto($titlealt, $img);
 }
 
+/**
+ *  Show search logo
+ *
+ *  @param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param  string	$other      Add more attributes on img
+ *  @return string      		Retourne tag img
+ */
+function img_search($titlealt = 'default', $other = '')
+{
+	global $conf, $langs;
+
+	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+
+	$img = img_picto($titlealt, 'search.png', $other, false, 1);
+
+	$input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';
+	$input.= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
+
+	return $input;
+}
+
+/**
+ *  Show search logo
+ *
+ *  @param	string	$titlealt   Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
+ *	@param  string	$other      Add more attributes on img
+ *  @return string      		Retourne tag img
+ */
+function img_searchclear($titlealt = 'default', $other = '')
+{
+	global $conf, $langs;
+
+	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+
+	$img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
+
+	$input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';
+	$input.= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';
+
+	return $input;
+}
 
 /**
  *	Show information for admin users
@@ -2320,7 +2429,7 @@ function dol_print_error($db='',$error='')
 	else                              // Mode CLI
 	{
 		$out.='> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
-		$syslog.="pid=".getmypid();
+		$syslog.="pid=".dol_getmypid();
 	}
 
 	if (is_object($db))
@@ -2498,10 +2607,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)
 {
@@ -2570,10 +2680,11 @@ function load_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath
  *	@param	int		$num				number of records found by select with limit+1
  *	@param	int		$totalnboflines		Total number of records/lines for all pages (if known)
  *	@param	string	$picto				Icon to use before title (should be a 32x32 transparent png file)
- *	@param	int		$pictoisfullpath		1=Icon name is a full absolute url of image
+ *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
+ *  @param	string	$morehtml			More html to show
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title.png', $pictoisfullpath=0)
+function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title.png', $pictoisfullpath=0, $morehtml='')
 {
 	global $conf,$langs;
 
@@ -2649,6 +2760,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 		}
 	}
 	print_fleche_navigation($page,$file,$options,$nextpage,$pagelist);
+	if ($morehtml) print $morehtml;
 	print '</td>';
 
 	print '</tr></table>'."\n";
@@ -2790,7 +2902,11 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
 
 		$listofcurrenciesbefore=array('USD');
 		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
-		else $cursymbolafter.=$outlangs->getCurrencySymbol($currency_code);
+		else
+		{
+			$tmpcur=$outlangs->getCurrencySymbol($currency_code);
+			$cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
+		}
 	}
 	$output=$cursymbolbefore.$output.$end.$cursymbolafter;
 
@@ -2808,7 +2924,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
  */
@@ -2905,11 +3021,16 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 
 	dol_syslog("get_localtax tva=".$tva." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')."/country_code=".(is_object($thirdparty_buyer)?$thirdparty_buyer->country_code:'')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
 
+	if($thirdparty_buyer->country_code!=$thirdparty_seller->country_code)
+	{
+		return 0;
+	}
 	// Some test to guess with no need to make database access
 	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe
 	{
 		if ($local == 1)
 		{
+			if(! $mysoc->localtax1_assuj) return 0;
 			if ($thirdparty_seller->id==$mysoc->id)
 			{
 				if (! $thirdparty_buyer->localtax1_assuj) return 0;
@@ -2922,8 +3043,8 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 
 		if ($local == 2)
 		{
-
-			if ($thirdparty_seller->id==$mysoc->id)
+			if(! $mysoc->localtax2_assuj) return 0;
+			if ($thirdparty_seller->id==$mysoc->id )
 			{
 				if (! $thirdparty_buyer->localtax2_assuj) return 0;
 			}
@@ -2949,12 +3070,49 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 	}*/
 
 	// Search local taxes
+	if ($local==1)
+	{
+		if($thirdparty_seller!=$mysoc )
+		{
+			if(!isOnlyOneLocalTax($local))
+			{
+				return $thirdparty_seller->localtax1_value;
+			}
+		}
+		else
+		{
+			if(!isOnlyOneLocalTax($local))
+			{
+				return $conf->global->MAIN_INFO_VALUE_LOCALTAX1;
+			}
+		}
+	}
+	if ($local==2)
+	{
+		if($thirdparty_seller!=$mysoc)
+		{
+			if(!isOnlyOneLocalTax($local))
+			{
+				return $thirdparty_seller->localtax2_value;
+			}
+		}
+		else
+		{
+			if(!isOnlyOneLocalTax($local))
+			{
+				return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
+			}
+		}
+	}
+
+
+
 	$sql  = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$thirdparty_seller->country_code."'";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
 	$sql .= " AND t.taux = ".$tva." AND t.active = 1";
 
-	dol_syslog("get_localtax sql=".$sql);
+	dol_syslog("get_localtax", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -2966,6 +3124,57 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 	return 0;
 }
 
+
+/**
+ * Return true if LocalTax is unique
+ *
+ * @param int 	$local	Local taxt to test
+ * @return boolean 		True if LocalTax have multiple values, False if not
+ */
+function isOnlyOneLocalTax($local)
+{
+	$tax=get_localtax_by_third($local);
+
+	$valors=explode(":", $tax);
+
+	if(count($valors)>1)
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+/**
+ * Get values of localtaxes
+ *
+ * @param	int		$local 	LocalTax to get
+ * @return	number			Values of localtax
+ */
+function get_localtax_by_third($local)
+{
+	global $db, $mysoc;
+	$sql ="SELECT t.localtax1, t.localtax2 ";
+	$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";
+	$sql.=" WHERE c.code = '".$mysoc->country_code."' AND t.taux=(SELECT max(tt.taux)";
+	$sql.=" FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";
+	$sql.=" WHERE c.code = '".$mysoc->country_code."')";
+
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($local==1) return $obj->localtax1;
+		elseif ($local==2) return $obj->localtax2;
+	}
+
+	return 0;
+
+}
+
+
 /**
  *  Get type and rate of localtaxes for a particular vat rate/country fo thirdparty
  *  TODO
@@ -2975,10 +3184,11 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
  *
  *  @param		float	$vatrate			VAT Rate
  *  @param		int		$local              Number of localtax (1 or 2, or 0 to return 1 & 2)
- *  @param		int		$thirdparty         Company object
+ *  @param		int		$buyer         		Company object
+ *  @param		int		$seller        		Company object
  *  @return		array    	  				array(localtax_type1(1-6 / 0 if not found), rate of localtax1, ...)
  */
-function getLocalTaxesFromRate($vatrate, $local, $thirdparty)
+function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller)
 {
 	global $db;
 
@@ -2986,17 +3196,85 @@ function getLocalTaxesFromRate($vatrate, $local, $thirdparty)
 
 	// Search local taxes
 	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
-	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$thirdparty->country_code."'";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";
 	$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
 
 	$resql=$db->query($sql);
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($local == 1) return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
-		elseif ($local == 2) return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
-		else return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+		if ($local == 1)
+		{
+			if (! isOnlyOneLocalTax(1))
+			{
+				return array($obj->localtax1_type, get_localtax($vatrate, $local, $buyer, $seller), $obj->accountancy_code_sell,$obj->accountancy_code_buy);
+			}
+			else
+			{
+				return array($obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+			}
+		}
+		elseif ($local == 2)
+		{
+			if (! isOnlyOneLocalTax(2))
+			{
+				return array($obj->localtax2_type, get_localtax($vatrate, $local, $buyer, $seller),$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+			}
+			else
+			{
+				return array($obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+			}
+		}
+		else
+		{
+			if(! isOnlyOneLocalTax(1))
+			{
+				if(! isOnlyOneLocalTax(2))
+				{
+					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller),$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+				else
+				{
+					return array($obj->localtax1_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+			}
+			else
+			{
+				if(! isOnlyOneLocalTax(2))
+				{
+					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type,get_localtax($vatrate, 2, $buyer, $seller) ,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+				else
+				{
+					return array($obj->localtax1_type, $obj->localtax1, $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+			}
+
+			if(! isOnlyOneLocalTax(2))
+			{
+				if(! isOnlyOneLocalTax(1))
+				{
+					return array($obj->localtax2_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vatrate, 2, $buyer, $seller),$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+				else
+				{
+					return array($obj->localtax2_type, get_localtax($vatrate, 1, $buyer, $seller), $obj->localtax2_type, $obj->localtax2,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+			}
+			else
+			{
+				if(! isOnlyOneLocalTax(1))
+				{
+					return array($obj->localtax2_type, $obj->localtax2, $obj->localtax1_type,get_localtax($vatrate, 1, $buyer, $seller) ,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+				else
+				{
+					return array($obj->localtax2_type, $obj->localtax2, $obj->localtax1_type, $obj->localtax1,$obj->accountancy_code_sell,$obj->accountancy_code_buy);
+				}
+			}
+
+		}
 	}
 
 	return 0;
@@ -3053,8 +3331,8 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 		{
 			// If vat of product for the country not found or not defined, we return higher vat of country.
 			$sql = "SELECT taux as vat_rate";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-			$sql.= " WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$thirdparty_seller->country_code."'";
+			$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
 			$sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC";
 			$sql.= $db->plimit(1);
 
@@ -3123,8 +3401,8 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 	{
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-		$sql.= " WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$thirdparty_seller->country_code."'";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+		$sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
 		$sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC";
 		$sql.= $db->plimit(1);
 
@@ -3479,28 +3757,24 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
 
 
 /**
- *	Replace CRLF in string with a HTML BR tag
+ * Replace CRLF in string with a HTML BR tag
  *
- *	@param	string	$stringtoencode		String to encode
- *	@param	string	$nl2brmode			0=Adding br before \n, 1=Replacing \n by br
- *  @param  string	$forxml             false=Use <br>, true=Use <br />
- *	@return	string						String encoded
+ * @param	string	$stringtoencode		String to encode
+ * @param	int     $nl2brmode			0=Adding br before \n, 1=Replacing \n by br
+ * @param   bool	$forxml             false=Use <br>, true=Use <br />
+ * @return	string						String encoded
  */
 function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false)
 {
-	if (! $nl2brmode)
-	{
-		// We use @ to avoid warning on PHP4 that does not support entity encoding from UTF8;
-		if (version_compare(PHP_VERSION, '5.3.0') < 0) return @nl2br($stringtoencode);
-		else return @nl2br($stringtoencode,$forxml);
-	}
-	else
-	{
-		$ret=preg_replace('/(\r\n|\r|\n)/i',($forxml?'<br />':'<br>'),$stringtoencode);
+	if (!$nl2brmode) {
+		return nl2br($stringtoencode, $forxml);
+	} else {
+		$ret=preg_replace('/(\r\n|\r|\n)/i', ($forxml?'<br />':'<br>'), $stringtoencode);
 		return $ret;
 	}
 }
 
+
 /**
  *	This function is called to encode a string into a HTML string but differs from htmlentities because
  * 	all entities but &,<,> are converted. This permits to encode special chars to entities with no double
@@ -3586,18 +3860,18 @@ 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.
  */
 function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encode=false)
 {
-	// We use @ to avoid warning on PHP4 that does not support entity decoding to UTF8;
-	$ret=@htmlentities($string, $flags, $encoding, $double_encode);
-	return $ret;
+	return htmlentities($string, $flags, $encoding, $double_encode);
 }
 
 
@@ -3628,8 +3902,9 @@ function dol_string_is_good_iso($s)
  *	Return nb of lines of a clear text
  *
  *	@param	string	$s			String to check
- * 	@param	string	$maxchar	Not yet used
+ * 	@param	int     $maxchar	Not yet used
  *	@return	int					Number of lines
+ *  @see	dol_nboflines_bis
  */
 function dol_nboflines($s,$maxchar=0)
 {
@@ -3648,6 +3923,7 @@ function dol_nboflines($s,$maxchar=0)
  *	@param	int		$maxlinesize  	Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
  * 	@param	string	$charset		Give the charset used to encode the $text variable in memory.
  *	@return int						Number of lines
+ *	@see	dol_nboflines
  */
 function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
 {
@@ -3683,12 +3959,12 @@ function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
 /**
  *	 Same function than microtime in PHP 5 but compatible with PHP4
  *
- *	 @return		float		Time (millisecondes) with microsecondes in decimal part
+ * @return		float		Time (millisecondes) with microsecondes in decimal part
+ * @deprecated Dolibarr does not support PHP4, you should use native function
  */
 function dol_microtime_float()
 {
-	list($usec, $sec) = explode(" ", microtime());
-	return ((float) $usec + (float) $sec);
+	return microtime(true);
 }
 
 /**
@@ -3746,10 +4022,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
@@ -3896,16 +4169,17 @@ function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)
 
 
 /**
- *	Set event message in dol_events session
+ *	Set event message in dol_events session object. Will be output by calling dol_htmloutput_events.
+ *  Note: Calling dol_htmloutput_events is done into pages by standard llxFooter() function.
  *
  *	@param	mixed	$mesgs			Message string or array
- *  @param  string	$style      	Which style to use ('mesgs', 'warnings', 'errors')
+ *  @param  string	$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')
  *  @return	void
  *  @see	dol_htmloutput_events
+ *  @deprecated	Use setEventMessages instead
  */
 function setEventMessage($mesgs, $style='mesgs')
 {
-	if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('','Bad parameter for setEventMessage');
 	if (! is_array($mesgs))		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
@@ -3919,8 +4193,31 @@ function setEventMessage($mesgs, $style='mesgs')
 	}
 }
 
+/**
+ *	Set event messages in dol_events session object. Will be output by calling dol_htmloutput_events.
+ *  Note: Calling dol_htmloutput_events is done into pages by standard llxFooter() function.
+ *
+ *	@param	string	$mesg			Message string
+ *	@param	array	$mesgs			Message array
+ *  @param  string	$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')
+ *  @return	void
+ *  @see	dol_htmloutput_events
+ */
+function setEventMessages($mesg, $mesgs, $style='mesgs')
+{
+	if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('','Bad parameter for setEventMessage');
+	if (empty($mesgs)) setEventMessage($mesg, $style);
+	else
+	{
+		if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style);	// Add message string if not already into array
+		setEventMessage($mesgs, $style);
+	}
+}
+
 /**
  *	Print formated messages to output (Used to show messages on html output).
+ *  Note: Calling dol_htmloutput_events is done into pages by standard llxFooter() function, so there is
+ *  no need to call it explicitely.
  *
  *  @return	void
  *  @see    dol_htmloutput_mesg
@@ -4219,7 +4516,7 @@ function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 	$sql = "SELECT ".$fieldid." as id";
 	$sql.= " FROM ".MAIN_DB_PREFIX.$tablename;
 	$sql.= " WHERE ".$fieldkey." = '".$key."'";
-	dol_syslog('dol_getIdFromCode sql='.$sql, LOG_DEBUG);
+	dol_syslog('dol_getIdFromCode', LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -4231,7 +4528,6 @@ function dol_getIdFromCode($db,$key,$tablename,$fieldkey='code',$fieldid='id')
 	}
 	else
 	{
-		dol_syslog("dol_getIdFromCode error=".$db->lasterror(), LOG_ERR);
 		return -1;
 	}
 }
@@ -4305,6 +4601,8 @@ function picto_from_langcode($codelang)
 {
 	global $langs;
 
+	if (empty($codelang)) return '';
+
 	if ($codelang == 'auto')
 	{
 		return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png');
@@ -4332,26 +4630,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')
@@ -4540,19 +4838,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
  *
@@ -4566,18 +4851,20 @@ function dol_set_focus($selector)
 }
 
 
-if (! function_exists('getmypid'))
+/**
+ * Return getmypid() or random PID when function is disabled
+ * Some web hosts disable this php function for security reasons
+ * and sometimes we can't redeclare function
+ *
+ * @return	int
+ */
+function dol_getmypid()
 {
-	/**
-	 * Return random PID
-	 * Some web hosts disable this php function for security reasons
-	 *
-	 * @return	int
-	 */
-	function getmypid()
-	{
-		return rand(1,32768);
-	}
+    if (! function_exists('getmypid')) {
+        return rand(1,32768);
+    } else {
+        return getmypid();
+    }
 }
 
 
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 4c2dd6e5189..54014d907b1 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2008-2011	Laurent Destailleur			<eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2014	Laurent Destailleur			<eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012	Regis Houssin				<regis.houssin@capnetworks.com>
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
+ * Copyright (C) 2014       Marcos García               <marcosgdf@gmail.com>
  *
  * 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
@@ -394,12 +395,12 @@ function isValidMailDomain($mail)
  *  <http[s]> :// [user[:pass]@] hostname [port] [/path] [?getquery] [anchor]
  *
  *	@param	string	$url		Url
- *  @param  int		$http		1: verify http, 0: not verify http
- *  @param  int		$pass		1: verify user and pass, 0: not verify user and pass
- *  @param  int		$port		1: verify port, 0: not verify port
- *  @param  int		$path		1: verify path, 0: not verify path
- *  @param  int		$query		1: verify query, 0: not verify query
- *  @param  int		$anchor		1: verify anchor, 0: not verify anchor
+ *  @param  int		$http		1: verify http is provided, 0: not verify http
+ *  @param  int		$pass		1: verify user and pass is provided, 0: not verify user and pass
+ *  @param  int		$port		1: verify port is provided, 0: not verify port
+ *  @param  int		$path		1: verify a path is provided "/" or "/..." or "/.../", 0: not verify path
+ *  @param  int		$query		1: verify query is provided, 0: not verify query
+ *  @param  int		$anchor		1: verify anchor is provided, 0: not verify anchor
  *	@return int					1=Check is OK, 0=Check is KO
  */
 function isValidUrl($url,$http=0,$pass=0,$port=0,$path=0,$query=0,$anchor=0)
@@ -414,9 +415,9 @@ function isValidUrl($url,$http=0,$pass=0,$port=0,$path=0,$query=0,$anchor=0)
     if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
 
     // HOSTNAME OR IP
-    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // http://x = allowed (ex. http://localhost, http://routerlogin)
-    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // http://x.x = minimum
-    $urlregex .= "([a-z0-9+\$_-]+\.)*[a-z0-9+\$_-]{2,3}";  // http://x.xx(x) = minimum
+    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
+    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x
+    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*";  // x ou x.xx (2 x ou plus)
     //use only one of the above
 
     // PORT
@@ -433,7 +434,7 @@ function isValidUrl($url,$http=0,$pass=0,$port=0,$path=0,$query=0,$anchor=0)
     {
         $ValidUrl = 1;
     }
-    //print $urlregex.' - '.$url.' - '.$ValidUrl;exit;
+    //print $urlregex.' - '.$url.' - '.$ValidUrl;
 
     return $ValidUrl;
 }
@@ -478,6 +479,50 @@ function clean_url($url,$http=1)
     else return $url;
 }
 
+
+
+/**
+ * 	Returns an email value with obfuscated parts.
+ *
+ * 	@param 		string		$mail				Email
+ * 	@param 		string		$replace			Replacement character (defaul : *)
+ * 	@param 		int			$nbreplace			Number of replacement character (default : 8)
+ * 	@param 		int			$nbdisplaymail		Number of character unchanged (default: 4)
+ * 	@param 		int			$nbdisplaydomain	Number of character unchanged of domain (default: 3)
+ * 	@param 		bool		$displaytld			Display tld (default: true)
+ * 	@return		string							Return email with hidden parts or '';
+ */
+function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
+{
+	if(!isValidEmail($mail))return '';
+	$tab = explode('@', $mail);
+	$tab2 = explode('.',$tab[1]);
+	$string_replace = '';
+	$mail_name = $tab[0];
+	$mail_domaine = $tab2[0];
+	$mail_tld = '';
+
+	for($i=1; $i < count($tab2) && $displaytld ;$i++)
+	{
+		$mail_tld .= '.'.$tab2[$i];
+	}
+
+	for($i=0; $i < $nbreplace; $i++){
+		$string_replace .= $replace;
+	}
+
+	if(strlen($mail_name) > $nbdisplaymail){
+		$mail_name = substr($mail_name, 0, $nbdisplaymail);
+	}
+
+	if(strlen($mail_domaine) > $nbdisplaydomain){
+		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
+	}
+
+	return $mail_name . $string_replace . $mail_domaine . $mail_tld;
+}
+
+
 /**
  * 	Return lines of an html table from an array
  * 	Used by array2table function only
@@ -528,17 +573,18 @@ 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
  * @param   string		$where			To add a filter on selection (for exemple to filter on invoice types)
  * @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
- * @return 	string					    New value (numeric) or error message
+ * @param   string		$mode			'next' for next value or 'last' for last value
+ * @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')
+function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$mode='next', $bentityon=true)
 {
     global $conf;
 
@@ -738,13 +784,14 @@ 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 entity IN (".getEntity($table, 1).")";
+	$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;
 
     //print $sql.'<br>';
-    dol_syslog("functions2::get_next_value mode=".$mode." sql=".$sql, LOG_DEBUG);
+    dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -779,11 +826,12 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
     	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-        $sql.= " AND entity IN (".getEntity($table, 1).")";
+    	if ($bentityon) // only if entity enable
+        	$sql.= " AND entity IN (".getEntity($table, 1).")";
         if ($where) $sql.=$where;
         if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
-        dol_syslog("functions2::get_next_value sql=".$sql);
+        dol_syslog("functions2::get_next_value", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
@@ -832,12 +880,13 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
             $maskrefclient_sql.= " FROM ".MAIN_DB_PREFIX.$table;
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
-            $maskrefclient_sql.= " AND entity IN (".getEntity($table, 1).")";
+            if ($bentityon) // only if entity enable
+            	$maskrefclient_sql.= " AND entity IN (".getEntity($table, 1).")";
             if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
             if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
 
-            dol_syslog("functions2::get_next_value maskrefclient_sql=".$maskrefclient_sql, LOG_DEBUG);
+            dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
             $maskrefclient_resql=$db->query($maskrefclient_sql);
             if ($maskrefclient_resql)
             {
@@ -1142,8 +1191,8 @@ function weight_convert($weight,&$from_unit,$to_unit)
  *
  *	@param	DoliDB	$db         Handler database
  *	@param	Conf	$conf		Object conf
- *	@param	User	$user      Object user
- *	@param	array	$tab        Tableau (cle=>valeur) des parametres a sauvegarder
+ *	@param	User	$user      	Object user
+ *	@param	array	$tab        Array (key=>value) with all parameters to save
  *	@return int         		<0 if KO, >0 if OK
  *
  *	@see		dolibarr_get_const, dolibarr_set_const, dolibarr_del_const
@@ -1168,7 +1217,7 @@ function dol_set_user_param($db, $conf, &$user, $tab)
         $i++;
     }
     $sql.= ")";
-    dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
+    dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
 
     $resql=$db->query($sql);
     if (! $resql)
@@ -1187,7 +1236,7 @@ function dol_set_user_param($db, $conf, &$user, $tab)
             $sql.= " VALUES (".$user->id.",".$conf->entity.",";
             $sql.= " '".$key."','".$db->escape($value)."')";
 
-            dol_syslog("functions2.lib::dol_set_user_param sql=".$sql, LOG_DEBUG);
+            dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
             $result=$db->query($sql);
             if (! $result)
             {
@@ -1292,8 +1341,9 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
     $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
     $sql.= " WHERE type = '".$type."'";
     $sql.= " AND entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
+    $sql.= " ORDER BY description DESC";
 
-    dol_syslog('/core/lib/function2.lib.php::getListOfModels sql='.$sql, LOG_DEBUG);
+    dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
     $resql = $db->query($sql);
     if ($resql)
     {
@@ -1363,20 +1413,24 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
 /**
  * This function evaluates a string that should be a valid IPv4
  *
- * @param	string		$ip			IP Address
- * @return	It returns 0 if $ip is not a valid IPv4
- * 			It returns 1 if $ip is a valid IPv4 and is a public IP
- * 			It returns 2 if $ip is a valid IPv4 and is a private lan IP
+ * @param	string $ip IP Address
+ * @return	int 0 if not valid or reserved range, 1 if valid and public IP, 2 if valid and private range IP
  */
 function is_ip($ip)
 {
-    if (!preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", $ip)) return 0;
-    if (sprintf("%u",ip2long($ip)) == sprintf("%u",ip2long('255.255.255.255'))) return 0;
-    if (sprintf("%u",ip2long('10.0.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('10.255.255.255'))) return 2;
-    if (sprintf("%u",ip2long('172.16.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('172.31.255.255'))) return 2;
-    if (sprintf("%u",ip2long('192.168.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('192.168.255.255'))) return 2;
-    if (sprintf("%u",ip2long('169.254.0.0')) <= sprintf("%u",ip2long($ip)) and sprintf("%u",ip2long($ip)) <= sprintf("%u",ip2long('169.254.255.255'))) return 2;
-    return 1;
+	// First we test if it is a valid IPv4
+	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+
+		// Then we test if it is a private range
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+
+		// Then we test if it is a reserved range
+		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+
+		return 1;
+	}
+
+	return 0;
 }
 
 /**
@@ -1582,7 +1636,6 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 
 		// Check loops on each other
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
-		dol_syslog("sql=".$sql);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -1623,7 +1676,6 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
 		$sql.= " SET ".$fieldfkparent." = 0";
 		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
-		dol_syslog("sql=".$sql);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -1643,7 +1695,6 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
 		$sql.= " SET ".$fieldfkparent." = 0";
 		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
-		dol_syslog("sql=".$sql);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -1785,3 +1836,42 @@ function fetchObjectByElement($element_id,$element_type) {
 	}
 	return 0;
 }
+
+
+/**
+ *	Convert an array with RGB value into hex RGB value
+ *
+ *  @param	array	$arraycolor			Array
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorStringToArray
+ */
+function colorArrayToHex($arraycolor,$colorifnotfound='888888')
+{
+	if (! is_array($arraycolor)) return $colorifnotfound;
+	return dechex($arraycolor[0]).dechex($arraycolor[1]).dechex($arraycolor[2]);
+}
+
+
+/**
+ *	Convert a string RGB value ('FFFFFF', '255,255,255') into an array RGB array(255,255,255)
+ *
+ *  @param	string	$stringcolor		String with hex (FFFFFF) or comma RGB ('255,255,255')
+ *  @param	string	$colorifnotfound	Color code to return if entry not defined
+ *  @return	string						RGB hex value (without # before). For example: FF00FF
+ *  @see	Make the opposite of colorArrayToHex
+ */
+function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
+{
+	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+	$tmp=preg_match('/^([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+	if (! $tmp)
+	{
+		$tmp=explode(',',$stringcolor);
+		if (count($tmp) < 3) return $colorifnotfound;
+		return $tmp;
+	}
+	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+}
+
+
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 8a9ac1385be..50c02125fb7 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -72,6 +72,13 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     	curl_setopt($ch, CURLOPT_POST, 1);	// POST
     	curl_setopt($ch, CURLOPT_POSTFIELDS, $param);	// Setting param x=a&y=z as POST fields
     }
+    else if ($postorget == 'PUT')
+    {
+    	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
+    	if ( ! is_array($param) )
+		parse_str($param, $array_param);
+    	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param));	// Setting param x=a&y=z as PUT fields	
+    }
     else if ($postorget == 'HEAD')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index 6b4877b14b2..bb42f2e0760 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -34,7 +34,7 @@ function holiday_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT . '/holiday/fiche.php?id='.$object->id;
+    $head[$h][0] = DOL_URL_ROOT . '/holiday/card.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'card';
     $h++;
@@ -49,4 +49,3 @@ function holiday_prepare_head($object)
 
 	return $head;
 }
-
diff --git a/htdocs/core/lib/index.html b/htdocs/core/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/lib/index.php b/htdocs/core/lib/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/lib/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 2afb4686162..ac9da88bdc2 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -79,7 +79,7 @@ function facture_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
     	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
     	$head[$h][1] = $langs->trans('Notes');
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
     	$head[$h][2] = 'note';
     	$h++;
     }
@@ -89,7 +89,7 @@ function facture_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -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/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index fb9d8f90f70..866cf004ca6 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -42,12 +42,13 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
  * @param 	date		$paymentdatebefore		Payment before date (must includes hour)
  * @param	int			$usestdout				Add information onto standard output
  * @param	int			$regenerate				''=Use existing PDF files, 'nameofpdf'=Regenerate all PDF files using the template
- * @param	string		$option					Suffix to add into file name of generated PDF
+ * @param	string		$filesuffix				Suffix to add into file name of generated PDF
  * @param	string		$paymentbankid			Only if payment on this bank account id
  * @param	array		$thirdpartiesid			List of thirdparties id when using filter excludethirdpartiesid	or onlythirdpartiesid
+ * @param	string		$fileprefix				Prefix to add into filename of generated PDF
  * @return	int									Error code
  */
-function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $option='', $paymentbankid='', $thirdpartiesid='')
+function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf')
 {
 	$sql = "SELECT DISTINCT f.rowid, f.facnumber";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -129,7 +130,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	if ($sqlorder) $sql.=$sqlorder;
 
 	//print $sql; exit;
-	dol_syslog("scripts/invoices/rebuild_merge.php: sql=".$sql);
+	dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
 
 	if ($usestdout) print '--- start'."\n";
 
@@ -140,7 +141,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	$result = 0;
 	$files = array() ;		// liste les fichiers
 
-	dol_syslog("scripts/invoices/rebuild_merge.php sql=".$sql);
+	dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
 	if ( $resql=$db->query($sql) )
 	{
 	    $num = $db->num_rows($resql);
@@ -175,7 +176,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 					if ($regenerate || ! dol_is_file($filename))
 					{
 	            	    if ($usestdout) print "Build PDF for invoice ".$obj->facnumber." - Lang = ".$outputlangs->defaultlang."\n";
-	    				$result=facture_pdf_create($db, $fac, $regenerate?$regenerate:$fac->modelpdf, $outputlangs);
+	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
 					}
 					else {
 					    if ($usestdout) print "PDF for invoice ".$obj->facnumber." already exists\n";
@@ -221,13 +222,6 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 			//$pdf->SetCompression(false);
 
-
-			//$pdf->Open();
-			//$pdf->AddPage();
-			//$title=$langs->trans("BillsCustomersUnpaid");
-			//if ($option=='late') $title=$langs->trans("BillsCustomersUnpaid");
-			//$pdf->MultiCell(100, 3, $title, 0, 'J');
-
 			// Add all others
 			foreach($files as $file)
 			{
@@ -249,9 +243,9 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			dol_mkdir($diroutputpdf);
 
 			// Save merged file
-			$filename='mergedpdf';
-
-			if (! empty($option)) $filename.='_'.$option;
+			$filename=$fileprefix;
+			if (empty($filename)) $filename='mergedpdf';
+			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
 			$file=$diroutputpdf.'/'.$filename.'.pdf';
 
 			if (! $error && $pagecount)
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 69dbb4eba1a..ba7f4cd3f90 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -254,7 +254,7 @@ function dol_json_decode($json, $assoc=false)
 
 			foreach ($array as $key => $value)
 			{
-				$object->{$key} = $value;
+				if ($key) $object->{$key} = $value;
 			}
 
 			return $object;
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/member.lib.php b/htdocs/core/lib/member.lib.php
index 67b6794f3a3..879478daf8d 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -34,7 +34,7 @@ function member_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/card.php?rowid='.$object->id;
 	$head[$h][1] = $langs->trans("MemberCard");
 	$head[$h][2] = 'general';
 	$h++;
@@ -88,7 +88,7 @@ function member_prepare_head($object)
     $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
-    if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 	$h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
@@ -174,7 +174,7 @@ function member_stats_prepare_head($object)
     $head[$h][1] = $langs->trans("Country");
     $head[$h][2] = 'statscountry';
     $h++;
-    
+
     $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion';
     $head[$h][1] = $langs->trans("Region");
     $head[$h][2] = 'statsregion';
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index c6a70180df6..24e2e05693a 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -28,7 +28,7 @@ $shmkeys=array('main'=>1,'admin'=>2,'dict'=>3,'companies'=>4,'suppliers'=>5,'pro
 				'propal'=>13,'boxes'=>14,'banks'=>15,'other'=>16,'errors'=>17,'members'=>18,'ecm'=>19,
 				'orders'=>20,'users'=>21,'help'=>22,'stocks'=>23,'interventions'=>24,
 				'donations'=>25,'contracts'=>26);
-$shmoffset=100;
+$shmoffset=1000;	// Max number of entries found into a language file. If too low, some entries will be overwritten.
 
 
 
@@ -156,7 +156,7 @@ function dol_getcache($memoryid)
 /**
  * 	Return shared memory address used to store dataset with key memoryid
  *
- *  @param	string	$memoryid		Memory id of shared area
+ *  @param	string	$memoryid		Memory id of shared area ('main', 'agenda', ...)
  * 	@return	int						<0 if KO, Memoy address of shared memory for key
  */
 function dol_getshmopaddress($memoryid)
@@ -187,7 +187,7 @@ function dol_listshmop()
 /**
  * 	Save data into a memory area shared by all users, all sessions on server
  *
- *  @param	int		$memoryid		Memory id of shared area
+ *  @param	int		$memoryid		Memory id of shared area ('main', 'agenda', ...)
  * 	@param	string	$data			Data to save
  * 	@return	int						<0 if KO, Nb of bytes written if OK
  */
@@ -223,7 +223,7 @@ function dol_setshmop($memoryid,$data)
 /**
  * 	Read a memory area shared by all users, all sessions on server
  *
- *  @param	string	$memoryid		Memory id of shared area
+ *  @param	string	$memoryid		Memory id of shared area ('main', 'agenda', ...)
  * 	@return	int						<0 if KO, data if OK
  */
 function dol_getshmop($memoryid)
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 948bd74281c..abdf1b648a5 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -29,7 +29,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function commande_prepare_head($object)
 {
@@ -42,7 +42,7 @@ function commande_prepare_head($object)
 
 	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/commande/fiche.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("OrderCard");
 		$head[$h][2] = 'order';
 		$h++;
@@ -89,7 +89,7 @@ function commande_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -99,7 +99,7 @@ function commande_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
     $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -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/payments.lib.php b/htdocs/core/lib/payments.lib.php
index f4d3b80ee8c..591956bbffc 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -32,7 +32,7 @@ function payment_prepare_head(Paiement $object) {
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'payment';
 	$h++;
@@ -67,7 +67,7 @@ function payment_supplier_prepare_head(Paiement $object) {
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'payment';
 	$h++;
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 8b0091a6f6d..129d32fc7d9 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1,11 +1,12 @@
 <?php
-/* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
- * Copyright (C) 2010-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
- * Copyright (C) 2014		Cedric GROSS		<c.gross@kreiz-it.fr>
+/* Copyright (C) 2006-2011	Laurent Destailleur 	<eldy@users.sourceforge.net>
+ * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2007		Patrick Raguin      	<patrick.raguin@gmail.com>
+ * Copyright (C) 2010-2012	Regis Houssin       	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2010		Juanjo Menent       	<jmenent@2byte.es>
+ * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>
+ * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
  * 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
@@ -166,7 +167,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 		 *	This class is an enhanced FPDI class that support method writeHTMLCell
 		 */
 		class FPDI_DolExtended extends FPDI
-        {
+		{
 			/**
 			 * __call
 			 *
@@ -269,7 +270,9 @@ function pdf_getPDFFontSize($outputlangs)
  */
 function pdf_getHeightForLogo($logo, $url = false)
 {
-	$height=22; $maxwidth=130;
+	global $conf;
+	$height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
+	$maxwidth=130;
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 	$tmp=dol_getImageSize($logo, $url);
 	if ($tmp['height'])
@@ -435,9 +438,9 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 	// Add a background image on document
 	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation beeing crazy and some content disappeared behin the image
 	{
-        $pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
+		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
 		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
-        $pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
+		$pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
 	}
 }
 
@@ -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
  */
@@ -499,7 +502,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 
 	$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
 	$diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT);
-
 	$pdf->SetXY($curx, $cury);
 
 	if (empty($onlynumber))
@@ -511,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;
@@ -589,7 +595,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 		}
 
 		$curx=$savcurx;
-		$cury+=10;
+		$cury+=9;
 	}
 	else
 	{
@@ -606,12 +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
-	$ibankey="IBANNumber";
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $ibankey="IFSC";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
 	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
 
 	if (empty($onlynumber) && ! empty($account->domiciliation))
@@ -626,15 +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).': ' . $outputlangs->convToOutputCharset($account->iban), 0, 'L', 0);
+		$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);
 	}
@@ -642,7 +656,6 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
 	return $pdf->getY();
 }
 
-
 /**
  *  Show footer of page for PDF generation
  *
@@ -654,7 +667,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
  * 	@param	int			$marge_gauche	Margin left (no more used)
  * 	@param	int			$page_hauteur	Page height (no more used)
  * 	@param	Object		$object			Object shown in PDF
- * 	@param	int			$showdetails	Show company details into footer. This param seems to not be used by standard version.
+ * 	@param	int			$showdetails	Show company details into footer. This param seems to not be used by standard version. (1=Show address, 2=Show managers, 3=Both)
  *  @param	int			$hidefreetext	1=Hide free text, 0=Show free text
  * 	@return	int							Return height of bottom margin including footer text
  */
@@ -672,11 +685,11 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	{
 		// Make substitution
 		$substitutionarray=array(
-		'__FROM_NAME__' => $fromcompany->nom,
-		'__FROM_EMAIL__' => $fromcompany->email,
-		'__TOTAL_TTC__' => $object->total_ttc,
-		'__TOTAL_HT__' => $object->total_ht,
-		'__TOTAL_VAT__' => $object->total_vat
+			'__FROM_NAME__' => $fromcompany->name,
+			'__FROM_EMAIL__' => $fromcompany->email,
+			'__TOTAL_TTC__' => $object->total_ttc,
+			'__TOTAL_HT__' => $object->total_ht,
+			'__TOTAL_VAT__' => $object->total_vat
 		);
 		complete_substitutions_array($substitutionarray,$outputlangs,$object);
 		$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
@@ -684,10 +697,10 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	}
 
 	// First line of company infos
+	$line1=""; $line2=""; $line3=""; $line4="";
 
-	if ($showdetails)
+	if ($showdetails && 1)
 	{
-		$line1="";
 		// Company name
 		if ($fromcompany->name)
 		{
@@ -719,7 +732,6 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 			$line1.=($line1?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
 		}
 
-		$line2="";
 		// URL
 		if ($fromcompany->url)
 		{
@@ -731,9 +743,16 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 			$line2.=($line2?" - ":"").$fromcompany->email;
 		}
 	}
+	if (($showdetails && 2) || ($fromcompany->country_code == 'DE'))
+	{
+		// Managers
+		if ($fromcompany->managers)
+		{
+			$line2.=($line2?" - ":"").$fromcompany->managers;
+		}
+	}
 
 	// Line 3 of company infos
-	$line3="";
 	// Juridical status
 	if ($fromcompany->forme_juridique_code)
 	{
@@ -742,7 +761,9 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	// Capital
 	if ($fromcompany->capital)
 	{
-		$line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$fromcompany->capital)." ".$outputlangs->transnoentities("Currency".$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))
@@ -760,7 +781,6 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	}
 
 	// Line 4 of company infos
-	$line4="";
 	// Prof Id 3
 	if ($fromcompany->idprof3)
 	{
@@ -1253,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
  */
@@ -1586,11 +1606,22 @@ function pdf_getLinkedObjects($object,$outputlangs)
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($objects[$i]->date,'day','',$outputlangs);
 			}
 		}
+		else if ($objecttype == 'contrat')
+		{
+			$outputlangs->load('contracts');
+			$num=count($objects);
+			for ($i=0;$i<$num;$i++)
+			{
+				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
+				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($objects[$i]->ref);
+				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
+				$linkedobjects[$objecttype]['date_value'] = dol_print_date($objects[$i]->date_contrat,'day','',$outputlangs);
+			}
+		}
 		else if ($objecttype == 'shipping')
 		{
 			$outputlangs->load('orders');
 			$outputlangs->load('sendings');
-
 			$num=count($objects);
 			for ($i=0;$i<$num;$i++)
 			{
@@ -1605,18 +1636,6 @@ function pdf_getLinkedObjects($object,$outputlangs)
 				$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($objects[$i]->date_delivery,'day','',$outputlangs);
 			}
 		}
-		else if ($objecttype == 'contrat')
-		{
-			$outputlangs->load('contracts');
-			$num=count($objects);
-			for ($i=0;$i<$num;$i++)
-			{
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($objects[$i]->ref);
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($objects[$i]->date_contrat,'day','',$outputlangs);
-			}
-		}
 	}
 
 	// For add external linked objects
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index c6305423a96..53f54d66f70 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -29,7 +29,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function prelevement_prepare_head($object)
 {
@@ -39,19 +39,11 @@ function prelevement_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'prelevement';
 	$h++;
 
-	if (! empty($conf->global->MAIN_USE_PREVIEW_TABS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/bon.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Preview");
-		$head[$h][2] = 'preview';
-		$h++;
-	}
-
 	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Lines");
 	$head[$h][2] = 'lines';
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index ac9845f22a1..00144db74e5 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -111,7 +111,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
 		$sql.= " WHERE cv.taux = ".$txtva;
 		$sql.= " AND cv.fk_pays = ".$countryid;
-		dol_syslog("calcul_price_total search vat information sql=".$sql);
+		dol_syslog("calcul_price_total search vat information", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a252b361dcf..741dd98de6d 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -29,7 +29,7 @@
  *
  * @param   Object	$object		Object related to tabs
  * @param	User	$user		Object user
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function product_prepare_head($object, $user)
 {
@@ -39,7 +39,7 @@ function product_prepare_head($object, $user)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/product/card.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
@@ -83,13 +83,13 @@ function product_prepare_head($object, $user)
 	// Sub products
 	if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
 	{
-		$head[$h][0] = DOL_URL_ROOT."/product/composition/fiche.php?id=".$object->id;
+		$head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id;
 		$head[$h][1] = $langs->trans('AssociatedProducts');
 		$head[$h][2] = 'subproduct';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$object->id;
 	$head[$h][1] = $langs->trans('Statistics');
 	$head[$h][2] = 'stats';
 	$h++;
@@ -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 a564a312ac2..a2c6cca18eb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2006-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  *
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function project_prepare_head($object)
 {
@@ -38,7 +38,7 @@ function project_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Project");
 	$head[$h][2] = 'project';
 	$h++;
@@ -71,7 +71,7 @@ function project_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
 		$h++;
     }
@@ -81,7 +81,7 @@ function project_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -113,7 +113,7 @@ function project_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function task_prepare_head($object)
 {
@@ -149,7 +149,7 @@ function task_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');;
 		$head[$h][1] = $langs->trans('Notes');
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'task_notes';
 		$h++;
     }
@@ -170,7 +170,7 @@ function task_prepare_head($object)
 /**
  * Prepare array with list of tabs
  *
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function project_admin_prepare_head()
 {
@@ -357,7 +357,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				print '</td>';
 
 				// Planned Workload (in working hours)
-				print '<td align="center">';
+				print '<td align="right">';
 				$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 '</a>';
 				print '</td>';
 
-				// Progress calculated
-				// Note: ->duration is in fact time spent i think
+				// Progress calculated (Note: ->duration is time spent)
 				print '<td align="right">';
-				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 '</td>';
 
 				// Tick to drag and drop
@@ -422,7 +425,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
-		print '<td align="center" class="nowrap liste_total">';
+		print '<td align="right" class="nowrap liste_total">';
 		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
 		print '</td>';
 		print '<td></td>';
@@ -430,7 +433,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
 		print '</td>';
 		print '<td align="right" class="nowrap liste_total">';
-		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 '</td>';
 		if ($addordertick) print '<td class="hideonsmartphone"></td>';
 		print '</tr>';
@@ -445,7 +448,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
  *
  * @param	string	   	$inc					?
  * @param   string		$parent					?
- * @param   Object		$lines					?
+ * @param   Task[]		$lines					?
  * @param   int			$level					?
  * @param   string		$projectsrole			?
  * @param   string		$tasksrole				?
@@ -455,8 +458,14 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
  */
 function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0)
 {
-	global $user, $bc, $langs;
-	global $form, $projectstatic, $taskstatic;
+	global $db, $user, $bc, $langs;
+	global $form, $formother, $projectstatic, $taskstatic;
+
+	if (! is_object($formother))
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+		$formother = new FormOther($db);
+	}
 
 	$lastprojectid=0;
 
@@ -526,7 +535,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
 
 				// Progress declared %
 				print '<td align="right">';
-				print $lines[$i]->progress.' %';
+				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
 				print '</td>';
 
 				// Time spent
@@ -556,13 +565,16 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
 					$disabledtask=1;
 				}
 
-				print '<td class="nowrap">';
-				$s =$form->select_date('',$lines[$i]->id,'','','',"addtime",1,0,1,$disabledtask);
+				// Form to add new time
+				print '<td class="nowrap" align="right">';
+				$s='';
+				$s.=$form->select_date('',$lines[$i]->id,0,0,2,"addtime",1,0,1,$disabledtask);
 				$s.='&nbsp;&nbsp;&nbsp;';
-				$s.=$form->select_duration($lines[$i]->id,'',$disabledtask,'text');
+				$s.=$form->select_duration($lines[$i]->id,'',$disabledtask,'text',0,1);
 				$s.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled="disabled"':'').' value="'.$langs->trans("Add").'">';
 				print $s;
 				print '</td>';
+
 				print '<td align="right">';
 				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject"));
 				else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou"));
@@ -629,9 +641,10 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
  * @param   int		$socid				Id thirdparty
  * @param   int		$projectsListId     Id of project i have permission on
  * @param   int		$mytasks            Limited to task i am contact to
+ * @param	int		$statut				-1=No filter on statut, 0 or 1 = Filter on status
  * @return	void
  */
-function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0)
+function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0, $statut=-1)
 {
 	global $langs,$conf,$user,$bc;
 
@@ -641,10 +654,15 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0)
 
 	$sortfield='';
 	$sortorder='';
+	$project_year_filter=0;
+
+	$title=$langs->trans("Project");
+	if ($statut == 0) $title=$langs->trans("ProjectDraft");
+	if ($statut == 1) $title=$langs->trans("Project").' ('.$langs->trans("Validated").')';
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Project"),"index.php","","","","",$sortfield,$sortorder);
+	print_liste_field_titre($title,"index.php","","","","",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder);
 	print "</tr>\n";
@@ -672,6 +690,21 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0)
 		$sql.= " AND ctc.element = 'project_task'";
 		$sql.= " AND ec.fk_socpeople = ".$user->id;
 	}
+	if ($statut >= 0)
+	{
+		$sql.= " AND p.fk_statut = ".$statut;
+	}
+	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) {
+		$project_year_filter = GETPOST("project_year_filter");
+		//Check if empty or invalid year. Wildcard ignores the sql check
+		if ($project_year_filter != "*") {
+			if (empty($project_year_filter) || !ctype_digit($project_year_filter)) { //
+				$project_year_filter = date("Y");
+			}
+			$sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
+			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
+		}
+	}
 	$sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut";
 	$sql.= " ORDER BY p.title, p.ref";
 
@@ -715,6 +748,19 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0)
 	{
 		dol_print_error($db);
 	}
+
 	print "</table>";
+
+	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) {
+		//Add the year filter input
+		print '<table width="100%">';
+		print '<tr>';
+		print '<td>'.$langs->trans("Year").'</td>';
+		print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<td style="text-align:right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
+		print '</form>';
+		print "</tr>\n";
+		print '</table>';
+	}
 }
 
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 3a5b25da295..fd227d512b7 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -27,7 +27,7 @@
  * Prepare array with list of tabs
  *
  * @param   object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function propal_prepare_head($object)
 {
@@ -83,7 +83,7 @@ function propal_prepare_head($object)
 		if(!empty($object->note_public)) $nbNote++;
 	    $head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if($nbNote > 0) $head[$h][1].= ' ('.$nbNote.')';
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
 		$head[$h][2] = 'note';
 		$h++;
     }
@@ -93,7 +93,7 @@ function propal_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')';
+	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -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 '</td>';
 		print '</tr>';
 	}
-		
+
 	// Ligne de la periode d'analyse du rapport
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 7416d564a1a..f00abaa339f 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -70,11 +70,11 @@ function dol_decode($chain)
 
 /**
  * 	Returns a hash of a string.
- *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function (md5 by default)
- *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt
+ *  If constant MAIN_SECURITY_HASH_ALGO is defined, we use this function as hashing function.
+ *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt.
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		int			$type		Type of hash (0:auto, 1:sha1, 2:sha1+md5)
+ * 	@param		int			$type		Type of hash (0:auto, 1:sha1, 2:sha1+md5, 3:md5)
  * 	@return		string					Hash of string
  */
 function dol_hash($chain,$type=0)
@@ -86,9 +86,12 @@ function dol_hash($chain,$type=0)
 
 	if ($type == 1) return sha1($chain);
 	else if ($type == 2) return sha1(md5($chain));
+	else if ($type == 3) return md5($chain);
 	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
 	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
-	else return md5($chain);
+
+	// No enconding defined
+	return md5($chain);
 }
 
 
@@ -100,7 +103,7 @@ function dol_hash($chain,$type=0)
  *	@param  string	$features	    Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
  *	@param  int		$objectid      	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
  *	@param  string	$dbtablename    'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional)
- *	@param  string	$feature2		Feature to check, second level of permission (optional)
+ *	@param  string	$feature2		Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
  *  @param  string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
  *  @param  string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
  *  @param	Canvas	$objcanvas		Object canvas
@@ -140,7 +143,7 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
 
 	// Check read permission from module
     $readok=1; $nbko=0;
-    foreach ($featuresarray as $feature)
+    foreach ($featuresarray as $feature)	// first we check nb of test ko
     {
     	if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($feature,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
     	{
@@ -174,7 +177,7 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
         }
         else if (! empty($feature2))	// This should be used for future changes
         {
-           	$tmpreadok=1;
+        	$tmpreadok=1;
         	foreach($feature2 as $subfeature)
         	{
         		if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
@@ -476,7 +479,6 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
                 }
                 else
                 {
-                    dol_syslog("security.lib:restrictedArea sql=".$sql, LOG_ERR);
                     accessforbidden();
                 }
             }
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 40dd2c03ac3..fe0c9809296 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -440,7 +440,7 @@ function encodedecode_dbpassconf($level=0)
 /**
  * Return a generated password using default module
  *
- * @param		boolean		$generic		true=Create generic password (a MD5 string), false=Use the configured password generation module
+ * @param		boolean		$generic		true=Create generic password (use default crypt function), false=Use the configured password generation module
  * @return		string						New value for password
  */
 function getRandomPassword($generic=false)
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 2bfb2ba7c17..dd08c8b6c79 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function shipping_prepare_head($object)
 {
@@ -41,7 +41,7 @@ function shipping_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/expedition/fiche.php?id=".$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("SendingCard");
 	$head[$h][2] = 'shipping';
 	$h++;
@@ -52,7 +52,7 @@ function shipping_prepare_head($object)
 		$object->fetchObjectLinked($object->id,$object->element);
 		if (! empty($object->linkedObjectsIds['delivery'][0]))		// If there is a delivery
 		{
-			$head[$h][0] = DOL_URL_ROOT."/livraison/fiche.php?id=".$object->linkedObjectsIds['delivery'][0];
+			$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->linkedObjectsIds['delivery'][0];
 			$head[$h][1] = $langs->trans("DeliveryCard");
 			$head[$h][2] = 'delivery';
 			$h++;
@@ -85,7 +85,7 @@ function shipping_prepare_head($object)
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function delivery_prepare_head($object)
 {
@@ -99,13 +99,13 @@ function delivery_prepare_head($object)
 
 	if ($conf->expedition_bon->enabled && $user->rights->expedition->lire)
 	{
-		$head[$h][0] = DOL_URL_ROOT."/expedition/fiche.php?id=".$object->origin_id;
+		$head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->origin_id;
 		$head[$h][1] = $langs->trans("SendingCard");
 		$head[$h][2] = 'shipping';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/livraison/fiche.php?id=".$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("DeliveryCard");
 	$head[$h][2] = 'delivery';
 	$h++;
@@ -171,7 +171,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 
 	$sql.= " ORDER BY obj.fk_product";
 
-	dol_syslog("show_list_sending_receive sql=".$sql, LOG_DEBUG);
+	dol_syslog("show_list_sending_receive", LOG_DEBUG);
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -207,7 +207,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 				print "<tr ".$bc[$var].">";
 
 				// Sending id
-				print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a></td>';
+				print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a></td>';
 
 				// Description
 				if ($objp->fk_product > 0)
@@ -310,7 +310,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='')
 						// Ref
 						print '<td>';
 						print $receiving->getNomUrl($db);
-						//print '<a href="'.DOL_URL_ROOT.'/livraison/fiche.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';
+						//print '<a href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';
 						print '</td>';
 						// Qty received
 						//print '<td align="center">';
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 2ebbb529407..758b2e96582 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -25,7 +25,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function stock_prepare_head($object)
 {
@@ -34,7 +34,7 @@ function stock_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("WarehouseCard");
 	$head[$h][2] = 'card';
 	$h++;
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index a52aeb37345..cc9478f5d61 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -29,7 +29,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function tax_prepare_head($object)
 {
@@ -124,7 +124,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
         }
         if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
         {
-            $sql = "SELECT s.rowid as socid, s.nom as nom, s.siren as tva_intra, s.tva_assuj as assuj,";
+            $sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,";
             $sql.= " sum(fd.total_ht) as amount, sum(fd.".$total_tva.") as tva,";
             $sql.= " sum(fd.".$total_localtax1.") as localtax1,";
             $sql.= " sum(fd.".$total_localtax2.") as localtax2";
@@ -194,7 +194,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
     if ($sql == 'TODO') return -2;
     if ($sql != 'TODO')
     {
-        dol_syslog("Tax.lib:thirdparty sql=".$sql);
+        dol_syslog("Tax.lib:thirdparty", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
         {
@@ -366,7 +366,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
     if ($sql == 'TODO') return -2;
     if ($sql != 'TODO')
     {
-        dol_syslog("Tax.lib.php::vat_by_date sql=".$sql);
+        dol_syslog("Tax.lib.php::vat_by_date", LOG_DEBUG);
 
         $resql = $db->query($sql);
         if ($resql)
@@ -531,7 +531,7 @@ function vat_by_date($db, $y, $q, $date_start, $date_end, $modetax, $direction,
     if ($sql == 'TODO') return -2; // -2 = Feature not yet available
     if ($sql != 'TODO')
     {
-        dol_syslog("Tax.lib.php::vat_by_date sql=".$sql);
+        dol_syslog("Tax.lib.php::vat_by_date", LOG_DEBUG);
         $resql = $db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index 7d58e9e01b1..45619b10d6f 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -25,7 +25,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function trip_prepare_head($object)
 {
@@ -34,7 +34,7 @@ function trip_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/fiche.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 75a78627f52..0abec31b6fd 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -27,7 +27,7 @@
  * Prepare array with list of tabs
  *
  * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function user_prepare_head($object)
 {
@@ -44,7 +44,7 @@ function user_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/fiche.php?id='.$object->id;
+    $head[$h][0] = DOL_URL_ROOT.'/user/card.php?id='.$object->id;
     $head[$h][1] = $langs->trans("UserCard");
     $head[$h][2] = 'user';
     $h++;
@@ -71,6 +71,14 @@ function user_prepare_head($object)
     $head[$h][2] = 'guisetup';
     $h++;
 
+    if (! empty($conf->agenda->enabled))
+    {
+	    $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
+	    $head[$h][1] = $langs->trans("ExtSites");
+	    $head[$h][2] = 'extsites';
+	    $h++;
+    }
+
     if (! empty($conf->clicktodial->enabled))
     {
         $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id;
@@ -88,10 +96,24 @@ function user_prepare_head($object)
     //Info on users is visible only by internal user
     if (empty($user->societe_id))
     {
-    	$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Note");
-    	$head[$h][2] = 'note';
-    	$h++;
+		// Notes
+        $nbNote = 0;
+        if(!empty($object->note)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Note");
+		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
+
+        // Attached files
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        $upload_dir = $conf->user->dir_output . "/" . $object->id;
+        $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$'));
+        $head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
+        $head[$h][1] = $langs->trans("Documents");
+        if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
+        $head[$h][2] = 'document';
+        $h++;
 
     	$head[$h][0] = DOL_URL_ROOT.'/user/info.php?id='.$object->id;
     	$head[$h][1] = $langs->trans("Info");
@@ -118,7 +140,7 @@ function group_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/user/group/fiche.php?id='.$object->id;
+    $head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
     $head[$h][1] = $langs->trans("GroupCard");
     $head[$h][2] = 'group';
     $h++;
@@ -156,7 +178,7 @@ function group_prepare_head($object)
 /**
  * Prepare array with list of tabs
  *
- * @return  array				Array of tabs to shoc
+ * @return  array				Array of tabs to show
  */
 function user_admin_prepare_head()
 {
@@ -173,6 +195,11 @@ function user_admin_prepare_head()
     $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
     $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
+    $h++;
+
+   $head[$h][0] = DOL_URL_ROOT.'/user/admin/group_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups");
+    $head[$h][2] = 'attributes_group';
     $h++;
 
 	// Show more tabs from modules
@@ -215,9 +242,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)
@@ -238,7 +265,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 400b5765719..8e5a8b13ea9 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011 Juanjo Menent		<jmenent@2byte.es>
  *
@@ -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,15 +50,17 @@ 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 sql=".$sql);
+		dol_syslog("functions_dolibarr::check_user_password_dolibarr", LOG_DEBUG);
 		$resql=$db->query($sql);
 		if ($resql)
 		{
@@ -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/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index 2470567d596..83543c43dd5 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -79,7 +79,7 @@ function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)
             $sql.=" WHERE openid = '".$db->escape($_GET['openid_identity'])."'";
             $sql.=" AND entity IN (0," . ($_SESSION["dol_entity"] ? $_SESSION["dol_entity"] : 1) . ")";
 
-            dol_syslog("functions_openid::check_user_password_openid sql=".$sql);
+            dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
             $resql=$db->query($sql);
             if ($resql)
             {
diff --git a/htdocs/core/login/index.html b/htdocs/core/login/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/login/index.php b/htdocs/core/login/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/login/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/menus/index.html b/htdocs/core/menus/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/menus/index.php b/htdocs/core/menus/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/menus/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index cf05e461e35..2758ff5ecbd 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -16,7 +16,6 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools',       '', 0, '/core/tools.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read', '', 2, 90, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('boutique', '! empty($conf->boutique->enabled)', 11__+MAX_llx_menu__, __HANDLER__, 'top', 'shop',        '', 0, '/boutique/index.php?mainmenu=shop&amp;leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 100, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__);
 insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('hrm', '$conf->holiday->enabled || $conf->deplacement->enabled', 15__+MAX_llx_menu__, __HANDLER__, 'top', 'hrm', '', 0, '/compta/hrm.php?mainmenu=hrm&amp;leftmenu=', 'HRM', -1, 'holiday', '$user->rights->holiday->write || $user->rights->deplacement->lire', '', 0, 80, __ENTITY__);
 
@@ -25,44 +24,45 @@ 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', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __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', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?leftmenu=setup', 'Boxes', 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 ('', '$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, 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', 108__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/proxy.php?leftmenu=setup', 'Security', 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', 110__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/limits.php?leftmenu=setup', 'MenuLimits', 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', 107__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/pdf.php?leftmenu=setup', 'PDF', 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', 109__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/mails.php?leftmenu=setup', 'Emails', 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', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'SMS', 1, 'admin', '', '', 2, 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'Dictionary', 1, 'admin', '', '', 2, 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 13, __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', 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__);
+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', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?leftmenu=setup', 'SMS', 1, 'admin', '', '', 2, 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?leftmenu=setup', 'Dictionary', 1, 'admin', '', '', 2, 13, __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', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 14, __ENTITY__);
 -- Home - Sytem info
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', 'admintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/dolibarr.php?leftmenu=admintools', 'InfoDolibarr', 1, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 208__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/modules.php?leftmenu=admintools', 'Modules', 2, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 207__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/triggers.php?leftmenu=admintools', 'Triggers', 2, '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=="admintools"', __HANDLER__, 'left', 204__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/os.php?leftmenu=admintools', 'InfoOS', 1, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 205__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/web.php?leftmenu=admintools', 'InfoWebServer', 1, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 206__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/phpinfo.php?leftmenu=admintools', 'InfoPHP', 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=="admintools"', __HANDLER__, 'left', 210__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/database.php?leftmenu=admintools', 'InfoDatabase', 1, 'admin', '', '', 2, 4, __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=="admintools"', __HANDLER__, 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php?leftmenu=admintools', 'Backup', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php?leftmenu=admintools', 'Restore', 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=="admintools"', __HANDLER__, 'left', 305__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/update.php?leftmenu=admintools', 'MenuUpgrade', 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=="admintools" && function_exists("eaccelerator_info")', __HANDLER__, 'left', 304__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/eaccelerator.php?leftmenu=admintools', 'EAccelerator', 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=="admintools"', __HANDLER__, 'left', 306__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 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=="admintools"', __HANDLER__, 'left', 308__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listsessions.php?leftmenu=admintools', 'Sessions', 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=="admintools"', __HANDLER__, 'left', 303__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 203__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 13, __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=="admintools"', __HANDLER__, 'left', 202__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/system/modules.php?leftmenu=admintools', 'Modules', 2, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 203__+MAX_llx_menu__, 'home', '', 201__+MAX_llx_menu__, '/admin/triggers.php?leftmenu=admintools', 'Triggers', 2, '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=="admintools"', __HANDLER__, 'left', 204__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/browser.php?leftmenu=admintools', 'InfoBrowser', 1, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 205__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/os.php?leftmenu=admintools', 'InfoOS', 1, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 206__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/web.php?leftmenu=admintools', 'InfoWebServer', 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=="admintools"', __HANDLER__, 'left', 207__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/phpinfo.php?leftmenu=admintools', 'InfoPHP', 1, 'admin', '', '', 2, 4, __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=="admintools"', __HANDLER__, 'left', 210__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/database.php?leftmenu=admintools', 'InfoDatabase', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php?leftmenu=admintools', 'Backup', 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=="admintools"', __HANDLER__, 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php?leftmenu=admintools', 'Restore', 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=="admintools"', __HANDLER__, 'left', 305__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/update.php?leftmenu=admintools', 'MenuUpgrade', 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=="admintools" && function_exists("eaccelerator_info")', __HANDLER__, 'left', 306__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/eaccelerator.php?leftmenu=admintools', 'EAccelerator', 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=="admintools"', __HANDLER__, 'left', 307__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listevents.php?leftmenu=admintools', 'Audit', 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=="admintools"', __HANDLER__, 'left', 308__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/listsessions.php?leftmenu=admintools', 'Sessions', 1, 'admin', '', '', 2, 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 309__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/purge.php?leftmenu=admintools', 'Purge', 1, 'admin', '', '', 2, 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 310__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/support/index.php?leftmenu=admintools', 'HelpCenter', 1, 'help', '', '_blank', 2, 13, __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=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?leftmenu=admintools', 'About', 1, 'admin', '', '', 2, 14, __ENTITY__);
 -- Home - Menu users and groups
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 400__+MAX_llx_menu__, 'home', 'users', 1__+MAX_llx_menu__, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 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=="users"', __HANDLER__, 'left', 401__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/index.php?leftmenu=users', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 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 ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/fiche.php?leftmenu=users&amp;action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 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 ('', '$leftmenu=="users"', __HANDLER__, 'left', 402__+MAX_llx_menu__, 'home', '', 401__+MAX_llx_menu__, '/user/card.php?leftmenu=users&amp;action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 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 ('', '$leftmenu=="users"', __HANDLER__, 'left', 403__+MAX_llx_menu__, 'home', '', 400__+MAX_llx_menu__, '/user/group/index.php?leftmenu=users', 'Groups', 1, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin', '', 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 ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/fiche.php?leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin', '', 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 ('', '$leftmenu=="users"', __HANDLER__, 'left', 404__+MAX_llx_menu__, 'home', '', 403__+MAX_llx_menu__, '/user/group/card.php?leftmenu=users&amp;action=create', 'NewGroup', 2, 'users', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin', '', 2, 0, __ENTITY__);
 -- Third parties
 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->societe->enabled', __HANDLER__, 'left', 500__+MAX_llx_menu__, 'companies', 'thirdparties', 2__+MAX_llx_menu__, '/societe/index.php?leftmenu=thirdparties', 'ThirdParty', 0, 'companies', '$user->rights->societe->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->societe->enabled', __HANDLER__, 'left', 501__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->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->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/fourn/liste.php?leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 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->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 503__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/fourn/list.php?leftmenu=suppliers', 'ListSuppliersShort', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 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->societe->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 504__+MAX_llx_menu__, 'companies', '', 503__+MAX_llx_menu__, '/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->creer', '', 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->societe->enabled', __HANDLER__, 'left', 506__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/comm/prospect/list.php?leftmenu=prospects', 'ListProspectsShort', 1, 'companies', '$user->rights->societe->lire', '', 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 ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
@@ -70,7 +70,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->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
 -- Third parties - Contacts
 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->societe->enabled', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->lire', '', 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->societe->enabled', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/fiche.php?leftmenu=contacts&amp;action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 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->societe->enabled', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/card.php?leftmenu=contacts&amp;action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 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->societe->enabled', __HANDLER__, 'left', 602__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts', 'List', 1, 'companies', '$user->rights->societe->lire', '', 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->societe->enabled', __HANDLER__, 'left', 604__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts&amp;type=p', 'ThirdPartyProspects', 2, 'companies', '$user->rights->societe->contact->lire', '', 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->societe->enabled', __HANDLER__, 'left', 605__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts&amp;type=c', 'ThirdPartyCustomers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 2, __ENTITY__);
@@ -78,40 +78,39 @@ 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->societe->enabled', __HANDLER__, 'left', 607__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?leftmenu=contacts&amp;type=o', 'Others', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 4, __ENTITY__);
 -- Third parties - Category customer
 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->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 650__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=1', 'SuppliersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 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 ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 651__+MAX_llx_menu__, 'companies', '', 650__+MAX_llx_menu__, '/categories/fiche.php?action=create&amp;type=1', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 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->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 651__+MAX_llx_menu__, 'companies', '', 650__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=1', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- Third parties - Category supplier
 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->fournisseur->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 660__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=2', 'CustomersProspectsCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __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->fournisseur->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 661__+MAX_llx_menu__, 'companies', '', 660__+MAX_llx_menu__, '/categories/fiche.php?action=create&amp;type=2', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 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->fournisseur->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 661__+MAX_llx_menu__, 'companies', '', 660__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=2', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- Third parties - Category contact
 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->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 670__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=4', 'ContactCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 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 ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 671__+MAX_llx_menu__, 'companies', '', 670__+MAX_llx_menu__, '/categories/fiche.php?action=create&amp;type=4', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 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->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 671__+MAX_llx_menu__, 'companies', '', 670__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=4', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- Product - Product
 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->product->enabled', __HANDLER__, 'left', 2800__+MAX_llx_menu__, 'products', 'product', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=product&amp;type=0', 'Products', 0, 'products', '$user->rights->produit->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->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/fiche.php?leftmenu=product&amp;action=create&amp;type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 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->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/liste.php?leftmenu=product&amp;type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 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->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/card.php?leftmenu=product&amp;action=create&amp;type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 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->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/list.php?leftmenu=product&amp;type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 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->product->enabled', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 4, __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->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&amp;type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 5, __ENTITY__);
 -- Product - Services
 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->service->enabled', __HANDLER__, 'left', 2900__+MAX_llx_menu__, 'products', 'service', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=service&amp;type=1', 'Services', 0, 'products', '$user->rights->service->lire', '', 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->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/fiche.php?leftmenu=service&amp;action=create&amp;type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 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->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/liste.php?leftmenu=service&amp;type=1', 'List', 1, 'products', '$user->rights->service->lire', '', 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->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/card.php?leftmenu=service&amp;action=create&amp;type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 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->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/list.php?leftmenu=service&amp;type=1', 'List', 1, 'products', '$user->rights->service->lire', '', 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->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&amp;type=1', 'Statistics', 1, 'main', '$user->rights->service->lire', '', 2, 5, __ENTITY__);
 -- Product - Stocks
 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->stock->enabled', __HANDLER__, 'left', 3100__+MAX_llx_menu__, 'products', 'stock', 3__+MAX_llx_menu__, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 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 ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/fiche.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 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->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/liste.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 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->stock->enabled', __HANDLER__, 'left', 3103__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/valo.php', 'EnhancedValue', 1, 'stocks', '$user->rights->stock->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->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 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->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 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->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 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 ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __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->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__);
 
 -- Product - Categories
 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->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __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->categorie->enabled', __HANDLER__, 'left', 3201__+MAX_llx_menu__, 'products', '', 3200__+MAX_llx_menu__, '/categories/fiche.php?action=create&amp;type=0', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 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->categorie->enabled', __HANDLER__, 'left', 3201__+MAX_llx_menu__, 'products', '', 3200__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=0', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- Product - Shipment
 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->expedition->enabled', __HANDLER__, 'left', 1300__+MAX_llx_menu__, 'commercial', 'sendings', 3__+MAX_llx_menu__, '/expedition/index.php?leftmenu=sendings', 'Shipments', 0, 'sendings', '$user->rights->expedition->lire', '', 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 ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/fiche.php?action=create2&leftmenu=sendings', 'NewSending', 1, 'sendings', '$user->rights->expedition->creer', '', 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->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/liste.php?leftmenu=sendings', 'List', 1, 'sendings', '$user->rights->expedition->lire', '', 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->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/card.php?action=create2&leftmenu=sendings', 'NewSending', 1, 'sendings', '$user->rights->expedition->creer', '', 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->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/list.php?leftmenu=sendings', 'List', 1, 'sendings', '$user->rights->expedition->lire', '', 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->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1303__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/stats/index.php?leftmenu=sendings', 'Statistics', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 2, __ENTITY__);
 
 -- Commercial - Proposals
@@ -126,24 +125,24 @@ 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->propal->enabled', __HANDLER__, 'left', 1110__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal/stats/index.php?leftmenu=propals', 'Statistics', 1, 'propal', '$user->rights->propale->lire', '', 2, 4, __ENTITY__);
 -- Commercial - Customer's orders
 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->commande->enabled', __HANDLER__, 'left', 1200__+MAX_llx_menu__, 'commercial', 'orders', 5__+MAX_llx_menu__, '/commande/index.php?leftmenu=orders', 'CustomersOrders', 0, 'orders', '$user->rights->commande->lire', '', 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->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/fiche.php?action=create&amp;leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 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->commande->enabled', __HANDLER__, 'left', 1202__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders', 'List', 1, 'orders', '$user->rights->commande->lire', '', 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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1203__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1204__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 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 ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1205__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=2', 'StatusOrderOnProcessShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1206__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=3', 'StatusOrderToBill', 1, 'orders', '$user->rights->commande->lire', '', 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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 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 ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 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 ('', '$conf->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/card.php?action=create&amp;leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 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->commande->enabled', __HANDLER__, 'left', 1202__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders', 'List', 1, 'orders', '$user->rights->commande->lire', '', 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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1203__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1204__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 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 ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1205__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=2', 'StatusOrderOnProcessShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1206__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=3', 'StatusOrderToBill', 1, 'orders', '$user->rights->commande->lire', '', 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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 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 ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 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 ('', '$conf->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__);
 -- Commercial - Supplier's orders
 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->fournisseur->enabled', __HANDLER__, 'left', 5100__+MAX_llx_menu__, 'commercial', 'orders_suppliers', 5__+MAX_llx_menu__, '/fourn/commande/index.php?leftmenu=orders_suppliers', 'SuppliersOrders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 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 ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/fiche.php?action=create&amp;leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 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->fournisseur->enabled', __HANDLER__, 'left', 5102__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/liste.php?leftmenu=orders_suppliers&amp;viewstatut=0', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 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->fournisseur->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 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->fournisseur->enabled', __HANDLER__, 'left', 5102__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/list.php?leftmenu=orders_suppliers&amp;viewstatut=0', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 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->fournisseur->enabled', __HANDLER__, 'left', 5108__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier', 'Statistics', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 7, __ENTITY__);
 -- Commercial - Contracts
 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->contrat->enabled', __HANDLER__, 'left', 1400__+MAX_llx_menu__, 'commercial', 'contracts', 5__+MAX_llx_menu__, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 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 ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/fiche.php?&action=create&amp;leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 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->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/liste.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 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->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/card.php?&action=create&amp;leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 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->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/list.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 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->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->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->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->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->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
@@ -151,11 +150,11 @@ 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->contrat->enabled&&$leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
 -- Commercial - Interventions
 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->ficheinter->enabled', __HANDLER__, 'left', 1500__+MAX_llx_menu__, 'commercial', 'ficheinter', 5__+MAX_llx_menu__, '/fichinter/list.php?leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 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 ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1501__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/fiche.php?action=create&amp;leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 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->ficheinter->enabled', __HANDLER__, 'left', 1501__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/card.php?action=create&amp;leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 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->ficheinter->enabled', __HANDLER__, 'left', 1502__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/list.php?leftmenu=ficheinter', 'List', 1, 'interventions', '$user->rights->ficheinter->lire', '', 2, 1, __ENTITY__);
 -- Accountancy - Supplier invoice
 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->fournisseur->enabled', __HANDLER__, 'left', 1600__+MAX_llx_menu__, 'accountancy', 'supplier_bills', 6__+MAX_llx_menu__, '/fourn/facture/list.php?leftmenu=suppliers_bills', 'BillsSuppliers', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 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 ('', '$conf->fournisseur->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/fiche.php?action=create&amp;leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 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->fournisseur->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 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->fournisseur->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/impayees.php?leftmenu=suppliers_bills', 'Unpaid', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 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->fournisseur->enabled', __HANDLER__, 'left', 1603__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/fourn/facture/paiement.php?leftmenu=suppliers_bills', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->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->fournisseur->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'accountancy', '', 1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
@@ -164,75 +163,80 @@ 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->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture.php?action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 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 ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __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->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/impayees.php?action=facturer&amp;leftmenu=customers_bills', 'Unpaid', 1, 'bills', '$user->rights->facture->lire', '', 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->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/liste.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 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 ('', '$conf->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 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 ('', '$conf->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'accountancy', '', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 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->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
 -- Accountancy - Orders to bill
-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->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/liste.php?leftmenu=orders&amp;viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->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->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&amp;viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__);
 -- Donations
 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->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/compta/dons/index.php?leftmenu=donations&amp;mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __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->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/fiche.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 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->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/liste.php?leftmenu=donations&amp;mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 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->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 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->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/list.php?leftmenu=donations&amp;mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 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->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/stats.php?leftmenu=donations&amp;mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__);
 -- Special expenses
 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 || $conf->salaries->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)', '', 0, 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 ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->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->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/fiche.php?leftmenu=tax_salary&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 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->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 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->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->read', '', 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->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'accountancy', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 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 && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'accountancy', 'tax_vat', 2200__+MAX_llx_menu__, '/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 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 ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/fiche.php?leftmenu=tax_vat&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 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->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/card.php?leftmenu=tax_vat&amp;action=create', 'NewPayment', 2, 'companies', '$user->rights->tax->charges->creer', '', 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->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'accountancy', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'Payments', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, '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/liste.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/liste.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/fiche.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/liste.php', 'List', 2, '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->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&amp;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&amp;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/fiche.php?leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->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 ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 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 ('', '! 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&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->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 ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/list.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__);
 -- Withdrawal
 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->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->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 ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2503__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/bons.php?leftmenu=withdraw', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2504__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/liste.php?leftmenu=withdraw', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 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 ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2504__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/list.php?leftmenu=withdraw', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 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 ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2506__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/rejets.php?leftmenu=withdraw', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2507__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/stats.php?leftmenu=withdraw', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
 -- Bank
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled', __HANDLER__, 'left', 2600__+MAX_llx_menu__, 'accountancy', 'bank', 14__+MAX_llx_menu__, '/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2601__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/fiche.php?action=create&amp;leftmenu=bank', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 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->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2601__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/card.php?action=create&amp;leftmenu=bank', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 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->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2602__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/categ.php?leftmenu=bank', 'Rubriques', 1, 'categories', '$user->rights->banque->configurer', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/search.php?leftmenu=bank', 'ListTransactions', 1, 'banks', '$user->rights->banque->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->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php?leftmenu=bank', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/virement.php?leftmenu=bank', 'BankTransfers', 1, 'banks', '$user->rights->banque->transfer', '', 0, 5, __ENTITY__);
 -- Project
 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', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects', 'Projects', 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', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/fiche.php?leftmenu=projects&amp;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/liste.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', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?leftmenu=projects&amp;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&amp;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/fiche.php?leftmenu=projects&amp;action=create&amp;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/liste.php?leftmenu=projects&amp;mode=mine', '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', 'myprojects', 7__+MAX_llx_menu__, '/projet/index.php?leftmenu=projects&amp;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&amp;action=create&amp;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&amp;mode=mine', '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', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 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', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
@@ -243,27 +247,27 @@ 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', 3801__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&amp;action=create&amp;mode=mine', 'NewTask', 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', 3802__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/tasks/index.php?leftmenu=projects&amp;mode=mine', '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', 3803__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/activity/list.php?leftmenu=projects&amp;mode=mine', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
-
+-- Tools
 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->mailing->enabled', __HANDLER__, 'left', 3900__+MAX_llx_menu__, 'tools', 'mailing', 8__+MAX_llx_menu__, '/comm/mailing/index.php?leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->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->mailing->enabled', __HANDLER__, 'left', 3901__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/fiche.php?leftmenu=mailing&amp;action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 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->mailing->enabled', __HANDLER__, 'left', 3902__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/liste.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->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->mailing->enabled', __HANDLER__, 'left', 3901__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/card.php?leftmenu=mailing&amp;action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 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->mailing->enabled', __HANDLER__, 'left', 3902__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/list.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->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->export->enabled', __HANDLER__, 'left', 4100__+MAX_llx_menu__, 'tools', 'export', 8__+MAX_llx_menu__, '/exports/index.php?leftmenu=export', 'FormatedExport', 0, 'exports', '$user->rights->export->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->export->enabled', __HANDLER__, 'left', 4101__+MAX_llx_menu__, 'tools', '', 4100__+MAX_llx_menu__, '/exports/export.php?leftmenu=export', 'NewExport', 1, 'exports', '$user->rights->export->creer', '', 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->import->enabled', __HANDLER__, 'left', 4130__+MAX_llx_menu__, 'tools', 'import', 8__+MAX_llx_menu__, '/imports/index.php?leftmenu=import', 'FormatedImport', 0, 'exports', '$user->rights->import->run', '', 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->import->enabled', __HANDLER__, 'left', 4131__+MAX_llx_menu__, 'tools', '', 4130__+MAX_llx_menu__, '/imports/import.php?leftmenu=import', 'NewImport', 1, 'exports', '$user->rights->import->run', '', 2, 0, __ENTITY__);
 -- Members
 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->adherent->enabled', __HANDLER__, 'left', 4200__+MAX_llx_menu__, 'members', 'members', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=members&amp;mainmenu=members', 'Members', 0, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4201__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/fiche.php?leftmenu=members&amp;action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 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->adherent->enabled', __HANDLER__, 'left', 4202__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/liste.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 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->adherent->enabled', __HANDLER__, 'left', 4203__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=-1', 'MenuMembersToValidate', 2, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4204__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=1', 'MenuMembersValidated', 2, 'members', '$user->rights->adherent->lire', '', 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 ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __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->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 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->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/liste.php?leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 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 ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4201__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/card.php?leftmenu=members&amp;action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 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->adherent->enabled', __HANDLER__, 'left', 4202__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/list.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 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->adherent->enabled', __HANDLER__, 'left', 4203__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&amp;statut=-1', 'MenuMembersToValidate', 2, 'members', '$user->rights->adherent->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->adherent->enabled', __HANDLER__, 'left', 4204__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&amp;statut=1', 'MenuMembersValidated', 2, 'members', '$user->rights->adherent->lire', '', 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 ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4205__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate', 'MenuMembersNotUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 2, 4, __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->adherent->enabled', __HANDLER__, 'left', 4206__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate', 'MenuMembersUpToDate', 2, 'members', '$user->rights->adherent->lire', '', 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->adherent->enabled', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->rights->adherent->lire', '', 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 ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__);
 -- Members - Subscriptions
 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->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=members&amp;mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 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->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/liste.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 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->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 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->adherent->enabled', __HANDLER__, 'left', 4302__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/cotisations.php?leftmenu=members', 'List', 1, 'compta', '$user->rights->adherent->cotisation->lire', '', 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->adherent->enabled', __HANDLER__, 'left', 4303__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/stats/index.php?leftmenu=members', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 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 ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4500__+MAX_llx_menu__, 'members', 'export', 13__+MAX_llx_menu__, '/adherents/index.php?leftmenu=export&amp;mainmenu=members', 'Exports', 0, 'members', '$user->rights->adherent->export', '', 2, 3, __ENTITY__);
@@ -275,16 +279,16 @@ 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->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?leftmenu=setup&amp;mainmenu=members', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__);
 -- Members - Category member
 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->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5200__+MAX_llx_menu__, 'members', 'cat', 13__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&amp;type=3', 'MembersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 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 ('', '$conf->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5201__+MAX_llx_menu__, 'members', '', 5200__+MAX_llx_menu__, '/categories/fiche.php?action=create&amp;type=3', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 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->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5201__+MAX_llx_menu__, 'members', '', 5200__+MAX_llx_menu__, '/categories/card.php?action=create&amp;type=3', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- HRM - Holiday
 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->holiday->enabled', __HANDLER__, 'left', 5000__+MAX_llx_menu__, 'hrm', 'hrm', 15__+MAX_llx_menu__, '/holiday/index.php?&leftmenu=hrm', 'CPTitreMenu', 0, 'holiday', '$user->rights->holiday->write', '', 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->holiday->enabled', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/fiche.php?&action=request', 'MenuAddCP', 1, 'holiday', '$user->rights->holiday->write', '', 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->holiday->enabled', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?&action=request', 'MenuAddCP', 1, 'holiday', '$user->rights->holiday->write', '', 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->holiday->enabled', __HANDLER__, 'left', 5002__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/define_holiday.php?&action=request', 'MenuConfCP', 1, 'holiday', '$user->rights->holiday->define_holiday', '', 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->holiday->enabled', __HANDLER__, 'left', 5003__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/view_log.php?&action=request', 'MenuLogCP', 1, 'holiday', '$user->rights->holiday->view_log', '', 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->holiday->enabled', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/month_report.php?&action=request', 'MenuReportMonth', 1, 'holiday', '$user->rights->holiday->month_report', '', 0, 4, __ENTITY__);
 -- HRM - Trips and expenses
 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->deplacement->enabled', __HANDLER__, 'left', 2100__+MAX_llx_menu__, 'accountancy', 'tripsandexpenses', 15__+MAX_llx_menu__, '/compta/deplacement/index.php?leftmenu=tripsandexpenses', 'TripsAndExpenses', 0, 'trips', '$user->rights->deplacement->lire', '', 0, 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->deplacement->enabled', __HANDLER__, 'left', 2101__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/fiche.php?action=create&amp;leftmenu=tripsandexpenses', 'New', 1, 'trips', '$user->rights->deplacement->creer', '', 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->deplacement->enabled', __HANDLER__, 'left', 2101__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses', 'New', 1, 'trips', '$user->rights->deplacement->creer', '', 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->deplacement->enabled', __HANDLER__, 'left', 2102__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/list.php?leftmenu=tripsandexpenses', 'List', 1, 'trips', '$user->rights->deplacement->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->deplacement->enabled', __HANDLER__, 'left', 2103__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses', 'Statistics', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__);
 
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index e8d71496820..d732de547ab 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -262,7 +262,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 			while ($i < $numr)
 			{
 				$objp = $db->fetch_object($resql);
-				$newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
 				if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
 				{
 					$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
@@ -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/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index ddb28c58648..88052f380c0 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -211,7 +211,6 @@ class MenuManager
 						// We add sub entry
 						print str_pad('',1).'<li data-role="list-dividerxxx" class="lilevel1 ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-						print str_pad('',12,'&nbsp;');
 						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") print $langs->trans("Access");	// No translation
 						else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
@@ -228,7 +227,6 @@ class MenuManager
         				if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">';	 // ui-btn to highlight on clic
         				else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">';	 // ui-btn to highlight on clic
         				if ($relurl2) print '<a href="'.$relurl2.'">';
-        				print str_pad('',($val2['level']+1)*12,'&nbsp;');
         				print $val2['titre'];
         				if ($relurl2) print '</a>';
         				print '</li>'."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index b42fc258c6d..74d6b95df73 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2012-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -236,26 +236,6 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0)
 		$menu->add('/core/tools.php?mainmenu=tools&amp;leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", '');
 	}
 
-	// OSCommerce 1
-	$tmpentry=array('enabled'=>(! empty($conf->boutique->enabled)),
-	'perms'=>1,
-	'module'=>'boutique');
-	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
-	if ($showmode)
-	{
-		$langs->load("shop");
-
-		$classname="";
-		if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
-		else $classname = 'class="tmenu"';
-		$idsel='shop';
-
-		if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode);
-		if (empty($noout)) print_text_menu_entry($langs->trans("OSCommerce"), $showmode, DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu=', $id, $idsel, $classname, $atarget);
-		if (empty($noout)) print_end_menu_entry($showmode);
-		$menu->add('/boutique/index.php?mainmenu=shop&amp;leftmenu=', $langs->trans("OSCommerce"), 0, $showmode, $atarget, "shop", '');
-	}
-
 	// Members
 	$tmpentry=array('enabled'=>(! empty($conf->adherent->enabled)),
 	'perms'=>(! empty($user->rights->adherent->lire)),
@@ -523,6 +503,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
 					if (empty($leftmenu) || $leftmenu=='admintools_info') $newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
 					if (empty($leftmenu) || $leftmenu=='admintools_info') $newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
+					$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);
 					$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
 					$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
 					$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoPHP'), 1);
@@ -561,9 +542,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (empty($leftmenu) || $leftmenu=="users")
 			{
 				$newmenu->add("/user/index.php", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
-				$newmenu->add("/user/fiche.php?action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin);
+				$newmenu->add("/user/card.php?action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin);
 				$newmenu->add("/user/group/index.php", $langs->trans("Groups"), 1, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin);
-				$newmenu->add("/user/group/fiche.php?action=create", $langs->trans("NewGroup"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin);
+				$newmenu->add("/user/group/card.php?action=create", $langs->trans("NewGroup"), 2, ($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin);
 			}
 		}
 
@@ -616,15 +597,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->societe->enabled) && ! empty($conf->fournisseur->enabled))
 			{
 				$langs->load("suppliers");
-				$newmenu->add("/fourn/liste.php?leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, $user->rights->fournisseur->lire, '', $mainmenu, 'suppliers');
+				$newmenu->add("/fourn/list.php?leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, $user->rights->fournisseur->lire, '', $mainmenu, 'suppliers');
 				$newmenu->add("/societe/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire);
-				//$newmenu->add("/fourn/liste.php?leftmenu=suppliers", $langs->trans("List"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire);
+				//$newmenu->add("/fourn/list.php?leftmenu=suppliers", $langs->trans("List"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire);
 				//$newmenu->add("/contact/list.php?leftmenu=suppliers&amp;type=f",$langs->trans("Contacts"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire && $user->rights->societe->contact->lire);
 			}
 
 			// Contacts
-			$newmenu->add("/contact/list.php?leftmenu=contacts", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
-			$newmenu->add("/contact/fiche.php?leftmenu=contacts&amp;action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
+			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ThirdParty") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
+			$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
 			$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
 			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
 			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
@@ -640,18 +621,18 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 					// Categories prospects/customers
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $langs->trans("CustomersProspectsCategoriesShort"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-					$newmenu->add("/categories/fiche.php?action=create&amp;type=2", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
+					$newmenu->add("/categories/card.php?action=create&amp;type=2", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
 				}
 				// Categories Contact
 				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=4", $langs->trans("ContactCategoriesShort"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				$newmenu->add("/categories/fiche.php?action=create&amp;type=4", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
+				$newmenu->add("/categories/card.php?action=create&amp;type=4", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
 				// Categories suppliers
 				if (! empty($conf->fournisseur->enabled))
 				{
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 0, $user->rights->categorie->lire);
-					$newmenu->add("/categories/fiche.php?action=create&amp;type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
+					$newmenu->add("/categories/card.php?action=create&amp;type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
 				}
-				//if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+				//if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
 			}
 
 		}
@@ -684,14 +665,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
             {
                 $langs->load("orders");
                 $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
-                $newmenu->add("/commande/fiche.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
-                $newmenu->add("/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire);  // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later
-                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
+                $newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
+                $newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire);  // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later
+                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
                 $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
             }
 
@@ -700,17 +681,17 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers",$langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers');
-				$newmenu->add("/fourn/commande/fiche.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
-				$newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
 
-				if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcess"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartially"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
-                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/liste.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
+				if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcess"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartially"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
+                if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
 
 
 				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
@@ -721,8 +702,8 @@ 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/fiche.php?&action=create&amp;leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
-				$newmenu->add("/contrat/liste.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
+				$newmenu->add("/contrat/card.php?&action=create&amp;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&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
 				if (empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
@@ -735,7 +716,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("interventions");
 				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter');
-				$newmenu->add("/fichinter/fiche.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer);
+				$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer);
 				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire);
 			}
 
@@ -759,7 +740,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				$newmenu->add("/compta/facture/impayees.php?leftmenu=customers_bills",$langs->trans("Unpaid"),1,$user->rights->facture->lire);
 
-				$newmenu->add("/compta/paiement/liste.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),1,$user->rights->facture->lire);
+				$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),1,$user->rights->facture->lire);
 
 				if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 				{
@@ -775,7 +756,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("bills");
 				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),0,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
-				$newmenu->add("/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer);
+				$newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer);
 				$newmenu->add("/fourn/facture/impayees.php", $langs->trans("Unpaid"),1,$user->rights->fournisseur->facture->lire);
 				$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire);
 
@@ -786,17 +767,29 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->commande->enabled))
 			{
 				$langs->load("orders");
-				if (! empty($conf->facture->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&amp;viewstatut=-3", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+				if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&amp;viewstatut=-3", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
 				//                  if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 			}
 
+			// Supplier Orders
+			if (! empty($conf->fournisseur->enabled))
+			{
+				if (! empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE))
+				{
+					$langs->load("supplier");
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+					//                  if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
+				}
+			}
+
+
 			// Donations
 			if (! empty($conf->don->enabled))
 			{
 				$langs->load("donations");
 				$newmenu->add("/compta/dons/index.php?leftmenu=donations&amp;mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');
-				if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/fiche.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer);
-				if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/liste.php",$langs->trans("List"), 1, $user->rights->don->lire);
+				if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/card.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer);
+				if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/list.php",$langs->trans("List"), 1, $user->rights->don->lire);
 				//if ($leftmenu=="donations") $newmenu->add("/compta/dons/stats.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);
 			}
 
@@ -813,7 +806,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 					$langs->load("salaries");
 					$newmenu->add("/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy",$langs->trans("Salaries"),1,$user->rights->salaries->read, '', $mainmenu, 'tax_salary');
-					if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/fiche.php?leftmenu=tax_salary&action=create",$langs->trans("NewPayment"),2,$user->rights->salaries->write);
+					if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/card.php?leftmenu=tax_salary&action=create",$langs->trans("NewPayment"),2,$user->rights->salaries->write);
 					if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/index.php?leftmenu=tax_salary",$langs->trans("Payments"),2,$user->rights->salaries->read);
 				}
 
@@ -827,38 +820,50 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 					if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
 					{
 						$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy",$langs->trans("VAT"),1,$user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
-						if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
+						if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
 						if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/reglement.php?leftmenu=tax_vat",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
 						if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
 						if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
 						global $mysoc;
 
 						//Local Taxes
-						if($mysoc->country_code=='ES' && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj=="1"))
+						//Local Taxes 1
+						if($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj=="1"))
 						{
-							if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy",$langs->transcountry("LT2",$mysoc->country_code),1,$user->rights->tax->charges->lire);
-							if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
-							if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
-							if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
-							//if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy&amp;localTaxType=1",$langs->transcountry("LT1",$mysoc->country_code),1,$user->rights->tax->charges->lire);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/card.php?leftmenu=tax_vat&action=create&amp;localTaxType=1",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat&amp;localTaxType=1",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat&amp;localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+						}
+						//Local Taxes 2
+						if($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj=="1"))
+						{
+							$newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy&amp;localTaxType=2",$langs->transcountry("LT2",$mysoc->country_code),1,$user->rights->tax->charges->lire);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/card.php?leftmenu=tax_vat&action=create&amp;localTaxType=2",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat&amp;localTaxType=2",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat&amp;localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+							if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
 						}
-
 					}
 				}
 			}
 
-			// Compta simple
-			if (! empty($conf->comptabilite->enabled) && ($conf->global->MAIN_FEATURES_LEVEL >= 2))
-			{
-				$newmenu->add("/compta/ventilation/index.php?leftmenu=ventil",$langs->trans("Dispatch"),0,$user->rights->compta->ventilation->lire, '', $mainmenu, 'ventil');
-				if (empty($leftmenu) || $leftmenu=="ventil") $newmenu->add("/compta/ventilation/liste.php",$langs->trans("ToDispatch"),1,$user->rights->compta->ventilation->lire);
-				if (empty($leftmenu) || $leftmenu=="ventil") $newmenu->add("/compta/ventilation/lignes.php",$langs->trans("Dispatched"),1,$user->rights->compta->ventilation->lire);
-			}
-
-			// Compta expert
+			// Accounting Expert
 			if (! empty($conf->accounting->enabled))
 			{
+				$langs->load("accountancy");
 
+				$newmenu->add("/accountancy/customer/index.php?leftmenu=ventil_customer",$langs->trans("CustomersVentilation"),0,$user->rights->accounting->ventilation->read, '', $mainmenu, 'ventil_customer');
+				if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/customer/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->dispatch);
+				if (empty($leftmenu) || $leftmenu=="ventil_customer") $newmenu->add("/accountancy/customer/lines.php",$langs->trans("Dispatched"),1,$user->rights->accounting->ventilation->read);
+
+				if (! empty($conf->fournisseur->enabled))
+				{
+					$newmenu->add("/accountancy/supplier/index.php?leftmenu=ventil_supplier",$langs->trans("SuppliersVentilation"),0,$user->rights->accounting->ventilation->read, '', $mainmenu, 'ventil_supplier');
+					if (empty($leftmenu) || $leftmenu=="ventil_supplier") $newmenu->add("/accountancy/supplier/list.php",$langs->trans("ToDispatch"),1,$user->rights->accounting->ventilation->dispatch);
+					if (empty($leftmenu) || $leftmenu=="ventil_supplier") $newmenu->add("/accountancy/supplier/lines.php",$langs->trans("Dispatched"),1,$user->rights->accounting->ventilation->read);
+				}
 			}
 
 			// Rapports
@@ -867,33 +872,90 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("compta");
 
 				// Bilan, resultats
-				$newmenu->add("/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
+				$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy",$langs->trans("Reportings"),0,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
 
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/resultat/index.php?leftmenu=ca",$langs->trans("ReportInOut"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/resultat/index.php?leftmenu=report",$langs->trans("ReportInOut"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
 				/* On verra ca avec module compabilite expert
-				 if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/resultat/compteres.php?leftmenu=ca","Compte de resultat",2,$user->rights->compta->resultat->lire);
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/resultat/bilan.php?leftmenu=ca","Bilan",2,$user->rights->compta->resultat->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
 				*/
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/index.php?leftmenu=ca",$langs->trans("ReportTurnover"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/index.php?leftmenu=report",$langs->trans("ReportTurnover"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
 
 				/*
-				 if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/cumul.php?leftmenu=ca","Cumule",2,$user->rights->compta->resultat->lire);
+				 if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
 				if (! empty($conf->propal->enabled)) {
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/prev.php?leftmenu=ca","Previsionnel",2,$user->rights->compta->resultat->lire);
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/comp.php?leftmenu=ca","Transforme",2,$user->rights->compta->resultat->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
 				}
 				*/
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/casoc.php?leftmenu=ca",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/cabyuser.php?leftmenu=ca",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=ca", $langs->trans("ByProductsAndServices"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/casoc.php?leftmenu=report",$langs->trans("ByCompanies"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report",$langs->trans("ByUsers"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"),2,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
 
+				if (! empty($conf->comptabilite->enabled))
+				{
+					// Journaux
+					//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+					//journaux
+					if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report",$langs->trans("SellsJournal"),1,$user->rights->compta->resultat->lire);
+					if (empty($leftmenu) || preg_match('/report/',$leftmenu)) $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report",$langs->trans("PurchasesJournal"),1,$user->rights->compta->resultat->lire);
+				}
 
-				// Journaux
-				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-				//journaux
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=ca",$langs->trans("SellsJournal"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-				if (empty($leftmenu) || $leftmenu=="ca") $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=ca",$langs->trans("PurchasesJournal"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				// Report expert
+				if (! empty($conf->accounting->enabled))
+				{
+					$langs->load("accountancy");
+
+					// Grand livre
+					$newmenu->add("/accountancy/bookkeeping/list.php?leftmenu=bookkeeping",$langs->trans("Bookkeeping"),0,$user->rights->accounting->mouvements->lire, '', $mainmenu, 'bookkeeping');
+					if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/listbyyear.php",$langs->trans("ByYear"),1,$user->rights->accounting->mouvements->lire);
+					if (empty($leftmenu) || preg_match('/bookkeeping/',$leftmenu)) $newmenu->add("/accountancy/bookkeeping/balancebymonth.php",$langs->trans("AccountBalanceByMonth"),1,$user->rights->accounting->mouvements->lire);
+
+					// Accountancy journals
+					if (! empty($conf->accounting->enabled) && !empty($user->rights->accounting->mouvements->lire) && $mainmenu == 'accountancy')
+					{
+						$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);
+						}
+					}
+				}
+			}
+
+			// Setup
+			if (! empty($conf->accounting->enabled))
+			{
+				$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy", $langs->trans("Fiscalyear"),0,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');
+				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy", $langs->trans("Chartofaccounts"),0,$user->rights->accounting->chartofaccount, '', $mainmenu, 'chartofaccount');
 			}
 		}
 
@@ -912,7 +974,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$newmenu->add("/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank",$langs->trans("MenuBankCash"),0,$user->rights->banque->lire, '', $mainmenu, 'bank');
 
-				$newmenu->add("/compta/bank/fiche.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
+				$newmenu->add("/compta/bank/card.php?action=create",$langs->trans("MenuNewFinancialAccount"),1,$user->rights->banque->configurer);
 				$newmenu->add("/compta/bank/categ.php",$langs->trans("Rubriques"),1,$user->rights->banque->configurer);
 
 				$newmenu->add("/compta/bank/search.php",$langs->trans("ListTransactions"),1,$user->rights->banque->lire);
@@ -932,7 +994,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 
 				if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/bons.php?mainmenu=bank",$langs->trans("WithdrawalsReceipts"),1,$user->rights->prelevement->bons->lire);
-				if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/liste.php?mainmenu=bank",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire);
+				if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/list.php?mainmenu=bank",$langs->trans("WithdrawalsLines"),1,$user->rights->prelevement->bons->lire);
 				if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank",$langs->trans("Rejects"),1,$user->rights->prelevement->bons->lire);
 				if (empty($leftmenu) || $leftmenu=="withdraw") $newmenu->add("/compta/prelevement/stats.php?mainmenu=bank",$langs->trans("Statistics"),1,$user->rights->prelevement->bons->lire);
 
@@ -943,8 +1005,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))
 			{
 				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks');
-				$newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&amp;action=new&amp;mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);
-				$newmenu->add("/compta/paiement/cheque/liste.php?leftmenu=checks&amp;mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->cheque);
+				$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new&amp;mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque);
+				$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks&amp;mainmenu=bank",$langs->trans("List"),1,$user->rights->banque->cheque);
 			}
 
 		}
@@ -958,8 +1020,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->product->enabled))
 			{
 				$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');
-				$newmenu->add("/product/fiche.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
-				$newmenu->add("/product/liste.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
+				$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
+				$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
 				if (! empty($conf->propal->enabled))
 				{
 					$newmenu->add("/product/popuprop.php?leftmenu=stats&amp;type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
@@ -974,8 +1036,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			if (! empty($conf->service->enabled))
 			{
 				$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service');
-				$newmenu->add("/product/fiche.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);
-				$newmenu->add("/product/liste.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
+				$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);
+				$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
 				if (! empty($conf->propal->enabled))
 				{
 					$newmenu->add("/product/popuprop.php?leftmenu=stats&amp;type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);
@@ -987,21 +1049,20 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				$newmenu->add("/categories/fiche.php?action=create&amp;type=0", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
-				//if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+				$newmenu->add("/categories/card.php?action=create&amp;type=0", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
+				//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/fiche.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);
-				if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/liste.php", $langs->trans("List"), 1, $user->rights->stock->lire);
-				if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/valo.php", $langs->trans("EnhancedValue"), 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
@@ -1009,8 +1070,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("sendings");
 				$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');
-				$newmenu->add("/expedition/fiche.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
-				$newmenu->add("/expedition/liste.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
+				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
+				$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
 				$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
 			}
 
@@ -1030,7 +1091,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 
 				// Security check
 				$newmenu->add("/societe/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("NewSupplier"), 1, $user->rights->societe->creer && $user->rights->fournisseur->lire);
-				$newmenu->add("/fourn/liste.php",$langs->trans("List"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire);
+				$newmenu->add("/fourn/list.php",$langs->trans("List"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire);
 				$newmenu->add("/contact/list.php?leftmenu=suppliers&amp;type=f",$langs->trans("Contacts"), 1, $user->rights->societe->contact->lire && $user->rights->fournisseur->lire);
 				$newmenu->add("/fourn/stats.php",$langs->trans("Statistics"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire);
 			}
@@ -1039,7 +1100,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("bills");
 				$newmenu->add("/fourn/facture/list.php?leftmenu=orders", $langs->trans("Bills"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'orders');
-				$newmenu->add("/fourn/facture/fiche.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer);
+				$newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer);
 				$newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire);
 			}
 
@@ -1048,15 +1109,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=suppliers",$langs->trans("Orders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'suppliers');
 				$newmenu->add("/societe/societe.php?leftmenu=supplier", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
-				$newmenu->add("/fourn/commande/liste.php?leftmenu=suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
 			}
 
 			if (! empty($conf->categorie->enabled))
 			{
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=1", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				$newmenu->add("/categories/fiche.php?action=create&amp;type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
-				//if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+				$newmenu->add("/categories/card.php?action=create&amp;type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
+				//if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
 			}
 
 		}
@@ -1071,14 +1132,14 @@ 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/fiche.php?leftmenu=projects&action=create&mode=mine", $langs->trans("NewProject"), 1, $user->rights->projet->creer);
-				$newmenu->add("/projet/liste.php?leftmenu=projects&mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire);
+				$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/fiche.php?leftmenu=projects&action=create", $langs->trans("NewProject"), 1, $user->rights->projet->creer && $user->rights->projet->creer);
-				$newmenu->add("/projet/liste.php?leftmenu=projects", $langs->trans("List"), 1, $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);
 
 				// Project affected to user
 				$newmenu->add("/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire);
@@ -1105,7 +1166,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("holiday");
 
 				$newmenu->add("/holiday/index.php?&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->write, '', $mainmenu, 'hrm');
-				$newmenu->add("/holiday/fiche.php?&action=request", $langs->trans("MenuAddCP"), 1,$user->rights->holiday->write);
+				$newmenu->add("/holiday/card.php?&action=request", $langs->trans("MenuAddCP"), 1,$user->rights->holiday->write);
 				$newmenu->add("/holiday/define_holiday.php?&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->define_holiday);
 				$newmenu->add("/holiday/view_log.php?&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->view_log);
 				$newmenu->add("/holiday/month_report.php?&action=request", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->month_report);
@@ -1116,7 +1177,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("trips");
 				$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');
-				$newmenu->add("/compta/deplacement/fiche.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);
+				$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);
 				$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);
 				$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire);
 			}
@@ -1134,8 +1195,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("mails");
 
 				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');
-				$newmenu->add("/comm/mailing/fiche.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);
-				$newmenu->add("/comm/mailing/liste.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
+				$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);
+				$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
 			}
 
 			if (! empty($conf->export->enabled))
@@ -1165,17 +1226,17 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$langs->load("compta");
 
 				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members",$langs->trans("Members"),0,$user->rights->adherent->lire, '', $mainmenu, 'members');
-				$newmenu->add("/adherents/fiche.php?leftmenu=members&amp;action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer);
-				$newmenu->add("/adherents/liste.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->lire);
-				$newmenu->add("/adherents/liste.php?leftmenu=members&amp;statut=-1",$langs->trans("MenuMembersToValidate"),2,$user->rights->adherent->lire);
-				$newmenu->add("/adherents/liste.php?leftmenu=members&amp;statut=1",$langs->trans("MenuMembersValidated"),2,$user->rights->adherent->lire);
-				$newmenu->add("/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=uptodate",$langs->trans("MenuMembersUpToDate"),2,$user->rights->adherent->lire);
-				$newmenu->add("/adherents/liste.php?leftmenu=members&amp;statut=1&amp;filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),2,$user->rights->adherent->lire);
-				$newmenu->add("/adherents/liste.php?leftmenu=members&amp;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/card.php?leftmenu=members&amp;action=create",$langs->trans("NewMember"),1,$user->rights->adherent->creer);
+				$newmenu->add("/adherents/list.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1",$langs->trans("MenuMembersToValidate"),2,$user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1",$langs->trans("MenuMembersValidated"),2,$user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate",$langs->trans("MenuMembersUpToDate"),2,$user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate",$langs->trans("MenuMembersNotUpToDate"),2,$user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0",$langs->trans("MenuMembersResiliated"),2,$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&amp;mainmenu=members",$langs->trans("Subscriptions"),0,$user->rights->adherent->cotisation->lire);
-				$newmenu->add("/adherents/liste.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members",$langs->trans("NewSubscription"),1,$user->rights->adherent->cotisation->creer);
 				$newmenu->add("/adherents/cotisations.php?leftmenu=members",$langs->trans("List"),1,$user->rights->adherent->cotisation->lire);
 				$newmenu->add("/adherents/stats/index.php?leftmenu=members",$langs->trans("MenuMembersStats"),1,$user->rights->adherent->lire);
 
@@ -1184,8 +1245,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				{
 					$langs->load("categories");
 					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-					$newmenu->add("/categories/fiche.php?action=create&amp;type=3", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
-					//if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/liste.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+					$newmenu->add("/categories/card.php?action=create&amp;type=3", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
+					//if (empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
 				}
 
 				$newmenu->add("/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Exports"),0,$user->rights->adherent->export, '', $mainmenu, 'export');
@@ -1208,7 +1269,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		// We update newmenu for special dynamic menus
 		if (!empty($user->rights->banque->lire) && $mainmenu == 'bank')	// Entry for each bank account
 		{
-			$sql = "SELECT rowid, label, courant, rappro, courant";
+			$sql = "SELECT rowid, label, courant, rappro";
 			$sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
 			$sql.= " WHERE entity = ".$conf->entity;
 			$sql.= " AND clos = 0";
@@ -1225,7 +1286,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				while ($i < $numr)
 				{
 					$objp = $db->fetch_object($resql);
-					$newmenu->add('/compta/bank/fiche.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
+					$newmenu->add('/compta/bank/card.php?id='.$objp->rowid,$objp->label,1,$user->rights->banque->lire);
 					if ($objp->rappro && $objp->courant != 2 && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
 					{
 						$newmenu->add('/compta/bank/rappro.php?account='.$objp->rowid,$langs->trans("Conciliate"),2,$user->rights->banque->consolidate);
@@ -1236,6 +1297,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			else dol_print_error($db);
 			$db->free($resql);
 		}
+
 		if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp')	// Entry for FTP
 		{
 			$MAXFTP=20;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index e7e76ed7669..af85537d455 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -177,7 +177,6 @@ class MenuManager
         				print '<a href="'.$relurl.'"';
         				//print ' data-ajax="false"';
         				print '>';
-        				print str_pad('',12,'&nbsp;');
         				if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") print $langs->trans("Access");	// No translation
         				else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
@@ -199,7 +198,6 @@ class MenuManager
         					//print ' data-ajax="false"';
         					print '>';
         				}
-						print str_pad('',($val2['level']+1)*12,'&nbsp;');
         				print $val2['titre'];
         				if ($relurl2) print '</a>';
         				print '</li>'."\n";
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index f316d334928..83f54c050d6 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -115,6 +115,7 @@ class MenuManager
 			$this->menu->add("/admin/modules.php", $langs->trans("Modules"),1);
 			$this->menu->add("/admin/menus.php", $langs->trans("Menus"),1);
 			$this->menu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+			$this->menu->add("/admin/fiscalyear.php", $langs->trans("Fiscalyear"),1);
 			$this->menu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
 			$this->menu->add("/admin/delais.php",$langs->trans("Alerts"),1);
 			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
@@ -123,6 +124,7 @@ class MenuManager
 			$this->menu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
 			$this->menu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
 			$this->menu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"),1);
+			if (! empty($conf->accounting->enabled)) $this->menu->add("/accountancy/admin/account.php", $langs->trans("Chartofaccounts"),1);
 			$this->menu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
 
 			// ***** END *****
diff --git a/htdocs/core/menus/standard/index.html b/htdocs/core/menus/standard/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/menus/standard/index.php b/htdocs/core/menus/standard/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/menus/standard/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index e25f4d0c715..e4d1f834b4a 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1,10 +1,11 @@
 <?php
-/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004       Sebastien Di Cintio     <sdicintio@ressource-toi.org>
+ * Copyright (C) 2004       Benoit Mortier          <benoit.mortier@opensides.be>
+ * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  *
  * 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,48 +22,184 @@
  */
 
 /**
- *  \file           htdocs/core/modules/DolibarrModules.class.php
- *  \brief          File of parent class of module descriptor class files
+ * \file           htdocs/core/modules/DolibarrModules.class.php
+ * \brief          File of parent class of module descriptor class files
  */
 
 
 /**
- *  Parent class of module descriptor class files
+ * Class DolibarrModules
+ *
+ * Parent class for module descriptor class files
  */
 abstract class DolibarrModules
 {
-    //! Database handler
-    var $db;
-    //! Relative path to module style sheet
-    var $style_sheet = ''; // deprecated
-    //! Path to create when module activated
-    var $dirs = array();
-    //! Tableau des boites
-    var $boxes;
-    //! Tableau des constantes
-    var $const;
-    //! Tableau des droits
-    var $rights;
-    //! Tableau des menus
-    var $menu=array();
-    //! Module parts array
-    var $module_parts=array();
-    //! Tableau des documents ???
-    var $docs;
-
-    var $dbversion = "-";
-
-
     /**
-     *  Method to enable a module. Insert into database all constants, boxes of module
-     *
-     *  @param      array	$array_sql  	Array of SQL requests to execute when enabling module
-     *  @param      string	$options    	String with options when disabling module ('newboxdefonly|noboxes')
-     *  @return     int              		1 if OK, 0 if KO
+     * @var DoliDb Database handler
      */
+    public $db;
+
+	/**
+	 * @var string Relative path to module style sheet
+	 * @deprecated
+	 */
+	public $style_sheet = '';
+
+	/**
+	 * @var array Paths to create when module is activated
+	 */
+	public $dirs = array();
+
+	/**
+	 * @var array Module boxes
+	 */
+	public $boxes = array();
+
+	/**
+	 * @var array Module constants
+	 */
+	public $const = array();
+
+	/**
+	 * @var array Module access rights
+	 */
+	public $rights;
+
+	/**
+	 * @var string Module access rights family
+	 */
+	public $rights_class;
+
+	/**
+	 * @var array Module menu entries
+	 */
+	public $menu = array();
+
+	/**
+	 * @var array Module parts
+	 *  array(
+	 *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
+	 *      'triggers' => 0,
+	 *      // Set this to 1 if module has its own login method directory (/mymodule/core/login)
+	 *  	'login' => 0,
+	 *      // Set this to 1 if module has its own substitution function file (/mymodule/core/substitutions)
+	 *	    'substitutions' => 0,
+	 *      // Set this to 1 if module has its own menus handler directory (/mymodule/core/menus)
+	 *	    'menus' => 0,
+	 *      // Set this to 1 if module has its own theme directory (/mymodule/theme)
+	 *	    'theme' => 0,
+	 *      // Set this to 1 if module overwrite template dir (/mymodule/core/tpl)
+	 *      'tpl' => 0,
+	 *      // Set this to 1 if module has its own barcode directory (/mymodule/core/modules/barcode)
+	 *	    'barcode' => 0,
+	 *      // Set this to 1 if module has its own models directory (/mymodule/core/modules/xxx)
+	 *	    'models' => 0,
+	 *      // Set this to relative path of css file if module has its own css file
+	 *	    'css' => '/mymodule/css/mymodule.css.php',
+	 *      // Set this to relative path of js file if module must load a js on all pages
+	 *	    'js' => '/mymodule/js/mymodule.js',
+	 *      // Set here all hooks context managed by module
+	 *	    'hooks' => array('hookcontext1','hookcontext2'),
+	 *      // Set here all workflow context managed by module
+	 *	    'workflow' => array(
+	 *          'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' = >array(
+	 *              'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
+	 *              'picto'=>'yourpicto@mymodule'
+	 *          )
+	 *      )
+	 *  )
+	 */
+	public $module_parts = array();
+
+	/**
+	 * @var string Module documents ?
+	 * @deprecated Seems unused anywhere
+	 */
+	public $docs;
+
+	/**
+	 * @var string ?
+	 * @deprecated Seems unused anywhere
+	 */
+	public $dbversion = "-";
+
+	/**
+	 * @var string Error message
+	 */
+	public $error;
+
+	/**
+	 * @var int Module unique ID
+	 */
+	public $numero;
+
+	/**
+	 * @var string Module name
+	 */
+	public $name;
+
+	/**
+	 * @var string Module version
+	 */
+	public $version;
+
+	/**
+	 * @var string Module description
+	 */
+	public $description;
+
+	/**
+	 * @var string[] Module language files
+	 */
+	public $langfiles;
+
+	/**
+	 * @var string Module export code
+	 */
+	public $export_code;
+
+	/**
+	 * @var string Module export label
+	 */
+	public $export_label;
+
+	/**
+	 * @var string Module import code
+	 */
+	public $import_code;
+
+	/**
+	 * @var string Module import label
+	 */
+	public $import_label;
+
+	/**
+	 * @var string Module constant name
+	 */
+	public $const_name;
+
+	/**
+	 * @var bool Module can't be disabled
+	 */
+	public $always_enabled;
+
+	/**
+	 * @var bool Module is enabled globally (Multicompany support)
+	 */
+	public $core_enabled;
+
+	/**
+	 * Enables a module.
+	 * Inserts all informations into database
+	 *
+	 * @param   string[]    $array_sql  SQL requests to be executed when enabling module
+	 * @param   string      $options    String with options when disabling module ('newboxdefonly|noboxes')
+	 *
+	 * @return  int                     1 if OK, 0 if KO
+	 */
     function _init($array_sql, $options='')
     {
-        global $conf, $langs;
+        global $conf;
         $err=0;
 
         $this->db->begin();
@@ -98,29 +235,23 @@ abstract class DolibarrModules
             if (! $err)
             {
                 $val=$array_sql[$i];
-                $sql='';
+	            $sql=$val;
                 $ignoreerror=0;
                 if (is_array($val))
                 {
                     $sql=$val['sql'];
                     $ignoreerror=$val['ignoreerror'];
                 }
-                else
-                {
-                    $sql=$val;
-                }
-
                 // Add current entity id
                 $sql=str_replace('__ENTITY__', $conf->entity, $sql);
 
-                dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror." sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror."", LOG_DEBUG);
                 $result=$this->db->query($sql, $ignoreerror);
                 if (! $result)
                 {
                     if (! $ignoreerror)
                     {
                         $this->error=$this->db->lasterror();
-                        dol_syslog(get_class($this)."::_init Error ".$this->error, LOG_ERR);
                         $err++;
                     }
                     else
@@ -145,15 +276,15 @@ abstract class DolibarrModules
     }
 
     /**
-     *  Fonction de desactivation. Supprime de la base les constantes et boites du module
+     * Disable function. Deletes the module constant and boxes from the database.
      *
-     *  @param      array	$array_sql      Array of SQL requests to execute when disable module
-     *  @param      string	$options		String with options when disabling module ('newboxdefonly|noboxes')
-     *  @return     int      		       	1 if OK, 0 if KO
+     * @param   string[]    $array_sql  SQL requests to be executed when module is disabled
+     * @param   string      $options	Options when disabling module ('newboxdefonly|noboxes')
+     *
+     * @return  int                     1 if OK, 0 if KO
      */
     function _remove($array_sql, $options='')
     {
-        global $langs;
         $err=0;
 
         $this->db->begin();
@@ -188,12 +319,11 @@ abstract class DolibarrModules
         {
             if (! $err)
             {
-                dol_syslog(get_class($this)."::_remove sql=".$array_sql[$i], LOG_DEBUG);
+                dol_syslog(get_class($this)."::_remove", LOG_DEBUG);
                 $result=$this->db->query($array_sql[$i]);
                 if (! $result)
                 {
                     $this->error=$this->db->error();
-                    dol_syslog(get_class($this)."::_remove Error ".$this->error, LOG_ERR);
                     $err++;
                 }
             }
@@ -214,10 +344,9 @@ abstract class DolibarrModules
 
 
     /**
-     *  Retourne le nom traduit du module si la traduction existe dans admin.lang,
-     *  sinon le nom defini par defaut dans le module.
+     * Gives the translated module name if translation exists in admin.lang or the default module name.
      *
-     *  @return     string      Nom du module traduit
+     * @return  string  Translated module name
      */
     function getName()
     {
@@ -226,22 +355,21 @@ abstract class DolibarrModules
 
         if ($langs->trans("Module".$this->numero."Name") != ("Module".$this->numero."Name"))
         {
-            // Si traduction du nom du module existe
+            // If module name translation exists
             return $langs->trans("Module".$this->numero."Name");
         }
         else
         {
-            // If translation of module with its numero does not exists, we take its name
+            // If module name translation using it's unique id does not exists, we take its name
             return $this->name;
         }
     }
 
 
     /**
-     *  Retourne la description traduite du module si la traduction existe dans admin.lang,
-     *  sinon la description definie par defaut dans le module
+     * Gives the translated module description if translation exists in admin.lang or the default module description
      *
-     *  @return     string      Nom du module traduit
+     * @return  string  Translated module description
      */
     function getDesc()
     {
@@ -250,24 +378,23 @@ abstract class DolibarrModules
 
         if ($langs->trans("Module".$this->numero."Desc") != ("Module".$this->numero."Desc"))
         {
-            // Si traduction de la description du module existe
+	        // If module description translation exists
             return $langs->trans("Module".$this->numero."Desc");
         }
         else
         {
-            // Si traduction de la description du module n'existe pas, on prend definition en dur dans module
+	        // If module description translation using it's unique id does not exists, we take its description
             return $this->description;
         }
     }
 
 
     /**
-     *  Return module version.
-     *  Pour les modules a l'etat 'experimental', retourne la traduction de 'experimental'
-     *  Pour les modules 'dolibarr', retourne la version de Dolibarr
-     *  Pour les autres modules, retourne la version du module
+     * Gives module version
+     * For 'experimental' modules, gives 'experimental' translation
+     * For 'dolibarr' modules, gives Dolibarr version
      *
-     *  @return     string      Version du module
+     * @return  string  Module version
      */
     function getVersion()
     {
@@ -283,9 +410,9 @@ abstract class DolibarrModules
 
 
     /**
-     *  Return if a module is a core or external module
+     * Tells if module is core or external
      *
-     *  @return     string      'core', 'external' or 'unknown'
+     * @return  string  'core', 'external' or 'unknown'
      */
     function isCoreOrExternalModule()
     {
@@ -297,9 +424,9 @@ abstract class DolibarrModules
 
 
     /**
-     *  Return list of lang files related to module
+     * Gives module related language files list
      *
-     *  @return     array       Array of lang files
+     * @return  string[]    Language files list
      */
     function getLangFilesArray()
     {
@@ -307,10 +434,11 @@ abstract class DolibarrModules
     }
 
     /**
-     *  Return translated label of a export dataset
+     * Gives translated label of an export dataset
      *
-     *	@param	int		$r		Index of dataset
-     *  @return string      	Label of databaset
+     * @param   int     $r  Dataset index
+     *
+     * @return string       Translated databaset label
      */
     function getExportDatasetLabel($r)
     {
@@ -331,10 +459,11 @@ abstract class DolibarrModules
 
 
     /**
-     *  Return translated label of an import dataset
+     * Gives translated label of an import dataset
      *
-     *  @param	int		$r		Index of dataset
-     *  @return	string    		Label of databaset
+     * @param   int     $r  Dataset index
+     *
+     * @return  string      Translated dataset label
      */
     function getImportDatasetLabel($r)
     {
@@ -356,9 +485,9 @@ abstract class DolibarrModules
 
 
     /**
-     *      Insert constant to activate module
+     * Insert constants for module activation
      *
-     *      @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function _active()
     {
@@ -373,7 +502,7 @@ abstract class DolibarrModules
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
         $sql.= " AND entity IN (0, ".$entity.")";
 
-        dol_syslog(get_class($this)."::_active sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::_active", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
@@ -382,7 +511,7 @@ abstract class DolibarrModules
         $sql.= ",".$this->db->encrypt('1',1);
         $sql.= ",0,".$entity.")";
 
-        dol_syslog(get_class($this)."::_active sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::_active", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) $err++;
 
@@ -391,10 +520,10 @@ abstract class DolibarrModules
 
 
     /**
-     *      Remove activation line
+     * Module deactivation
      *
-     *      @return     int     Nb of errors (0 if OK)
-     **/
+     * @return  int Error count (0 if OK)
+     */
     function _unactive()
     {
         global $conf;
@@ -408,7 +537,7 @@ abstract class DolibarrModules
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
         $sql.= " AND entity IN (0, ".$entity.")";
 
-        dol_syslog(get_class($this)."::_unactive sql=".$sql);
+        dol_syslog(get_class($this)."::_unactive", LOG_DEBUG);
         $this->db->query($sql);
 
         return $err;
@@ -416,24 +545,24 @@ abstract class DolibarrModules
 
 
     /**
-     *  Create tables and keys required by module.
-     *  Files module.sql and module.key.sql with create table and create keys
-     *  commands must be stored in directory reldir='/module/sql/'
-     *  This function is called by this->init
+     * Create tables and keys required by module.
+     * Files module.sql and module.key.sql with create table and create keys
+     * commands must be stored in directory reldir='/module/sql/'
+     * This function is called by this->init
      *
-     *  @param	string	$reldir		Relative directory where to scan files
-     *  @return	int     			<=0 if KO, >0 if OK
+     * @param   string  $reldir Relative directory where to scan files
+     * @return  int             <=0 if KO, >0 if OK
      */
     function _load_tables($reldir)
     {
-        global $db,$conf;
+        global $conf;
 
         $error=0;
 		$dirfound=0;
 
 		if (empty($reldir)) return 1;
 
-        include_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
+        include_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 
         $ok = 1;
         foreach($conf->file->dol_document_root as $dirroot)
@@ -510,14 +639,15 @@ abstract class DolibarrModules
 
 
     /**
-     *  Insert boxes into llx_boxes_def
+     * Adds boxes
      *
-     *	@param		string	$option		String with options when disabling module ('newboxdefonly'=insert only boxes definition)
-     *  @return     int     			Nb of errors (0 if OK)
+     * @param   string  $option Options when disabling module ('newboxdefonly'=insert only boxes definition)
+     *
+     * @return  int             Error count (0 if OK)
      */
     function insert_boxes($option='')
     {
-		require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
 
     	global $conf;
 
@@ -525,8 +655,10 @@ abstract class DolibarrModules
 
         if (is_array($this->boxes))
         {
-            foreach ($this->boxes as $key => $value)
-            {
+            $pos_name = InfoBox::getListOfPagesForBoxes();
+
+			foreach ($this->boxes as $key => $value)
+			{
                 $file  = isset($this->boxes[$key]['file'])?$this->boxes[$key]['file']:'';
                 $note  = isset($this->boxes[$key]['note'])?$this->boxes[$key]['note']:'';
                 $enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton'])?$this->boxes[$key]['enabledbydefaulton']:'Home';
@@ -540,7 +672,7 @@ abstract class DolibarrModules
                 $sql.= " AND entity = ".$conf->entity;
                 if ($note) $sql.=" AND note ='".$this->db->escape($note)."'";
 
-                dol_syslog(get_class($this)."::insert_boxes sql=".$sql);
+                dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
                 $result=$this->db->query($sql);
                 if ($result)
                 {
@@ -557,7 +689,7 @@ abstract class DolibarrModules
                             $sql.= $note?"'".$this->db->escape($note)."'":"null";
                             $sql.= ")";
 
-                            dol_syslog(get_class($this)."::insert_boxes sql=".$sql);
+                            dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
                             $resql=$this->db->query($sql);
                             if (! $resql) $err++;
 
@@ -566,7 +698,6 @@ abstract class DolibarrModules
                         {
                             $lastid=$this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def","rowid");
 
-                            $pos_name = getStaticMember('InfoBox','listOfPages');
                             foreach ($pos_name as $key2 => $val2)
                             {
                             	//print 'key2='.$key2.'-val2='.$val2."<br>\n";
@@ -575,7 +706,7 @@ abstract class DolibarrModules
 	                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
     	                        $sql.= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
 
-    	                        dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2." sql=".$sql);
+    	                        dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
                             	$resql=$this->db->query($sql);
                             	if (! $resql) $err++;
                             }
@@ -588,7 +719,6 @@ abstract class DolibarrModules
                         else
 						{
                             $this->error=$this->db->lasterror();
-                            dol_syslog(get_class($this)."::insert_boxes ".$this->error, LOG_ERR);
                             $this->db->rollback();
                         }
                     }
@@ -597,7 +727,6 @@ abstract class DolibarrModules
                 else
               {
                     $this->error=$this->db->lasterror();
-                    dol_syslog(get_class($this)."::insert_boxes ".$this->error, LOG_ERR);
                     $err++;
                 }
             }
@@ -608,9 +737,9 @@ abstract class DolibarrModules
 
 
     /**
-     *  Delete boxes
+     * Removes boxes
      *
-     *  @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function delete_boxes()
     {
@@ -634,12 +763,11 @@ abstract class DolibarrModules
                 $sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
                 $sql.= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
 
-                dol_syslog(get_class($this)."::delete_boxes sql=".$sql);
+                dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
                 $resql=$this->db->query($sql);
                 if (! $resql)
                 {
                     $this->error=$this->db->lasterror();
-                    dol_syslog(get_class($this)."::delete_boxes ".$this->error, LOG_ERR);
                     $err++;
                 }
 
@@ -647,12 +775,11 @@ abstract class DolibarrModules
                 $sql.= " WHERE file = '".$this->db->escape($file)."'";
                 $sql.= " AND entity = ".$conf->entity;
 
-                dol_syslog(get_class($this)."::delete_boxes sql=".$sql);
+                dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
                 $resql=$this->db->query($sql);
                 if (! $resql)
                 {
                     $this->error=$this->db->lasterror();
-                    dol_syslog(get_class($this)."::delete_boxes ".$this->error, LOG_ERR);
                     $err++;
                 }
             }
@@ -662,9 +789,9 @@ abstract class DolibarrModules
     }
 
     /**
-     *  Remove links to new module page present in llx_const
+     * Removes tabs
      *
-     *  @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function delete_tabs()
     {
@@ -676,11 +803,10 @@ abstract class DolibarrModules
         $sql.= " WHERE ".$this->db->decrypt('name')." like '".$this->const_name."_TABS_%'";
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::delete_tabs sql=".$sql);
+        dol_syslog(get_class($this)."::delete_tabs", LOG_DEBUG);
         if (! $this->db->query($sql))
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete_tabs ".$this->error, LOG_ERR);
             $err++;
         }
 
@@ -688,9 +814,9 @@ abstract class DolibarrModules
     }
 
     /**
-     *  Add links of new pages from modules in llx_const
+     * Adds tabs
      *
-     *  @return     int     Number of errors (0 if ok)
+     * @return int  Error count (0 if ok)
      */
     function insert_tabs()
     {
@@ -722,14 +848,8 @@ abstract class DolibarrModules
                     $sql.= ", ".$conf->entity;
                     $sql.= ")";
 
-                    dol_syslog(get_class($this)."::insert_tabs sql=".$sql);
-                    $resql=$this->db->query($sql);
-                    /* Allow duplicate key
-                     if (! $resql)
-                     {
-                        $err++;
-                        }
-                        */
+                    dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
+                    $this->db->query($sql);
                 }
                 $i++;
             }
@@ -738,9 +858,9 @@ abstract class DolibarrModules
     }
 
     /**
-     *  Insert constants defined into $this->const array into table llx_const
+     * Adds constants
      *
-     *  @return     int     Number of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function insert_const()
     {
@@ -784,10 +904,9 @@ abstract class DolibarrModules
                     $sql.= ")";
 
 
-                    dol_syslog(get_class($this)."::insert_const sql=".$sql);
+                    dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
                     if (! $this->db->query($sql) )
                     {
-                        dol_syslog(get_class($this)."::insert_const ".$this->db->lasterror(), LOG_ERR);
                         $err++;
                     }
                 }
@@ -806,9 +925,9 @@ abstract class DolibarrModules
     }
 
     /**
-     * Remove constants with tags deleteonunactive
+     * Removes constants tagged 'deleteonunactive'
      *
-     * @return     int     <0 if KO, 0 if OK
+     * @return  int <0 if KO, 0 if OK
      */
     function delete_const()
     {
@@ -826,11 +945,10 @@ abstract class DolibarrModules
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
                 $sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
                 $sql.= " AND entity in (0, ".$conf->entity.")";
-                dol_syslog(get_class($this)."::delete_const sql=".$sql);
+                dol_syslog(get_class($this)."::delete_const", LOG_DEBUG);
                 if (! $this->db->query($sql))
                 {
                     $this->error=$this->db->lasterror();
-                    dol_syslog(get_class($this)."::delete_const ".$this->error, LOG_ERR);
                     $err++;
                 }
             }
@@ -840,11 +958,12 @@ abstract class DolibarrModules
     }
 
     /**
-     *  Insert permissions definitions related to the module into llx_rights_def
+     * Adds access rights
      *
-     *  @param	int		$reinitadminperms   If 1, we also grant them to all admin users
-     *  @param	int		$force_entity		Force current entity
-     *  @return int                 		Number of error (0 if OK)
+     * @param   int $reinitadminperms   If 1, we also grant them to all admin users
+     * @param   int $force_entity       Force current entity
+     *
+     * @return  int                     Error count (0 if OK)
      */
     function insert_permissions($reinitadminperms=0, $force_entity=null)
     {
@@ -859,8 +978,9 @@ abstract class DolibarrModules
         $sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
         $sql_del.= " AND entity IN (0,".$entity.")";
 
-        dol_syslog(get_class($this)."::insert_permissions sql=".$sql_del);
+        dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
         $resql=$this->db->query($sql_del);
+
         if ($resql)
         {
             $obj=$this->db->fetch_object($resql);
@@ -879,55 +999,66 @@ abstract class DolibarrModules
 
                     if (empty($r_type)) $r_type='w';
 
-                    if (dol_strlen($r_perms) )
+	                // Search if perm already present
+    	            $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
+        	        $sql.= " WHERE id = ".$r_id." AND entity = ".$entity;
+					$resqlselect=$this->db->query($sql);
+
+					$obj = $this->db->fetch_object($resqlselect);
+                    if ($obj->nb == 0)
                     {
-                        if (dol_strlen($r_subperms) )
-                        {
-                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-                            $sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
-                            $sql.= " VALUES ";
-                            $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
-                        }
-                        else
-                        {
-                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-                            $sql.= " (id, entity, libelle, module, type, bydefault, perms)";
-                            $sql.= " VALUES ";
-                            $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
-                        }
-                    }
-                    else
-                    {
-                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
-                        $sql .= " (id, entity, libelle, module, type, bydefault)";
-                        $sql .= " VALUES ";
-                        $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
+	                    if (dol_strlen($r_perms) )
+	                    {
+	                        if (dol_strlen($r_subperms) )
+	                        {
+	                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
+	                            $sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
+	                            $sql.= " VALUES ";
+	                            $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
+	                        }
+	                        else
+	                        {
+	                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
+	                            $sql.= " (id, entity, libelle, module, type, bydefault, perms)";
+	                            $sql.= " VALUES ";
+	                            $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
+	                        }
+	                    }
+	                    else
+						{
+	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
+	                        $sql .= " (id, entity, libelle, module, type, bydefault)";
+	                        $sql .= " VALUES ";
+	                        $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
+	                    }
+
+                    	$resqlinsert=$this->db->query($sql,1);
+
+	                    if (! $resqlinsert)
+	                    {
+	                        if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS")
+	                        {
+	                            $this->error=$this->db->lasterror();
+	                            $err++;
+	                            break;
+	                        }
+	                        else dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
+
+	                    }
+
+	                    $this->db->free($resqlinsert);
                     }
 
-                    dol_syslog(get_class($this)."::insert_permissions sql=".$sql, LOG_DEBUG);
-                    $resqlinsert=$this->db->query($sql,1);
-                    if (! $resqlinsert)
-                    {
-                        if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS")
-                        {
-                            $this->error=$this->db->lasterror();
-                            dol_syslog(get_class($this)."::insert_permissions errno = ".$this->db->errno()." error ".$this->error, LOG_ERR);
-                            $err++;
-                            break;
-                        }
-                        else dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
-
-                    }
-                    $this->db->free($resqlinsert);
+                    $this->db->free($resqlselect);
 
                     // If we want to init permissions on admin users
                     if ($reinitadminperms)
                     {
                     	if (! class_exists('User')) {
-                    		require DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+							require DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
                     	}
                         $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
-                        dol_syslog(get_class($this)."::insert_permissions Search all admin users sql=".$sql);
+                        dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);
                         $resqlseladmin=$this->db->query($sql,1);
                         if ($resqlseladmin)
                         {
@@ -960,7 +1091,6 @@ abstract class DolibarrModules
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::insert_permissions ".$this->error, LOG_ERR);
             $err++;
         }
 
@@ -969,9 +1099,9 @@ abstract class DolibarrModules
 
 
     /**
-     * Delete permissions
+     * Removes access rights
      *
-     * @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function delete_permissions()
     {
@@ -982,11 +1112,10 @@ abstract class DolibarrModules
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
         $sql.= " WHERE module = '".$this->rights_class."'";
         $sql.= " AND entity = ".$conf->entity;
-        dol_syslog(get_class($this)."::delete_permissions sql=".$sql);
+        dol_syslog(get_class($this)."::delete_permissions", LOG_DEBUG);
         if (! $this->db->query($sql))
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete_permissions ".$this->error, LOG_ERR);
             $err++;
         }
 
@@ -995,15 +1124,15 @@ abstract class DolibarrModules
 
 
     /**
-     *  Insert menus entries found into $this->menu into llx_menu*
+     * Adds menu entries
      *
-     *  @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function insert_menus()
     {
     	global $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+        require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
 
         $err=0;
 
@@ -1099,9 +1228,9 @@ abstract class DolibarrModules
 
 
     /**
-     *  Remove menus entries
+     * Removes menu entries
      *
-     *  @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function delete_menus()
     {
@@ -1113,12 +1242,11 @@ abstract class DolibarrModules
         $sql.= " WHERE module = '".$this->db->escape($this->rights_class)."'";
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::delete_menus sql=".$sql);
+        dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql)
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete_menus ".$this->error, LOG_ERR);
             $err++;
         }
 
@@ -1126,9 +1254,9 @@ abstract class DolibarrModules
     }
 
     /**
-     *  Create directories required by module
+     * Creates directories
      *
-     *  @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function create_dirs()
     {
@@ -1184,11 +1312,12 @@ abstract class DolibarrModules
 
 
     /**
-     *  Insert directories in llx_const
+     * Adds directories definitions
      *
-     *  @param	string	$name		Name
-     *  @param	string	$dir		Directory
-     *  @return	int     			Nb of errors (0 if OK)
+     * @param   string  $name   Name
+     * @param   string  $dir    Directory
+     *
+     * @return  int             Error count (0 if OK)
      */
     function insert_dirs($name,$dir)
     {
@@ -1201,7 +1330,7 @@ abstract class DolibarrModules
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::insert_dirs sql=".$sql);
+        dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
@@ -1212,14 +1341,13 @@ abstract class DolibarrModules
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
                 $sql.= " VALUES (".$this->db->encrypt($name,1).",'chaine',".$this->db->encrypt($dir,1).",'Directory for module ".$this->name."','0',".$conf->entity.")";
 
-                dol_syslog(get_class($this)."::insert_dirs sql=".$sql);
-                $resql=$this->db->query($sql);
+                dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
+                $this->db->query($sql);
             }
         }
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::insert_dirs ".$this->error, LOG_ERR);
             $err++;
         }
 
@@ -1228,9 +1356,9 @@ abstract class DolibarrModules
 
 
     /**
-     *  Remove directory entries
+     * Removes directories
      *
-     *  @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function delete_dirs()
     {
@@ -1242,11 +1370,10 @@ abstract class DolibarrModules
         $sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->const_name."_DIR_%'";
         $sql.= " AND entity = ".$conf->entity;
 
-        dol_syslog(get_class($this)."::delete_dirs sql=".$sql);
+        dol_syslog(get_class($this)."::delete_dirs", LOG_DEBUG);
         if (! $this->db->query($sql))
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete_dirs ".$this->error, LOG_ERR);
             $err++;
         }
 
@@ -1254,23 +1381,9 @@ abstract class DolibarrModules
     }
 
     /**
-     * Insert activation of generic parts from modules in llx_const
-	 * Input entry use $this->module_parts = array(
-	 *                        	'triggers' => 0,                                 // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
-	 *							'login' => 0,                                    // Set this to 1 if module has its own login method directory (/mymodule/core/login)
-	 *							'substitutions' => 0,                            // Set this to 1 if module has its own substitution function file (/mymodule/core/substitutions)
-	 *							'menus' => 0,                                    // Set this to 1 if module has its own menus handler directory (/mymodule/core/menus)
-	 *							'theme' => 0,                                    // Set this to 1 if module has its own theme directory (/mymodule/theme)
-	 *                        	'tpl' => 0,                                      // Set this to 1 if module overwrite template dir (/mymodule/core/tpl)
-	 *							'barcode' => 0,                                  // Set this to 1 if module has its own barcode directory (/mymodule/core/modules/barcode)
-	 *							'models' => 0,                                   // Set this to 1 if module has its own models directory (/mymodule/core/modules/xxx)
-	 *							'css' => '/mymodule/css/mymodule.css.php',       // Set this to relative path of css file if module has its own css file
-	 *							'js' => '/mymodule/js/mymodule.js',              // Set this to relative path of js file if module must load a js on all pages
-	 *							'hooks' => array('hookcontext1','hookcontext2')  // Set here all hooks context managed by module
-	 *							'workflow' => array('WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2'=>array('enabled'=>'! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)', 'picto'=>'yourpicto@mymodule') // Set here all workflow context managed by module
-	 * )
+     * Adds generic parts
      *
-     * @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function insert_module_parts()
     {
@@ -1319,7 +1432,7 @@ abstract class DolibarrModules
     			$sql.= ", ".$entity;
     			$sql.= ")";
 
-    			dol_syslog(get_class($this)."::insert_const_".$key." sql=".$sql);
+    			dol_syslog(get_class($this)."::insert_const_".$key."", LOG_DEBUG);
     			$resql=$this->db->query($sql,1);
     			if (! $resql)
     			{
@@ -1327,7 +1440,6 @@ abstract class DolibarrModules
     			    {
         			    $error++;
         				$this->error=$this->db->lasterror();
-        				dol_syslog(get_class($this)."::insert_const_".$key." ".$this->error, LOG_ERR);
     			    }
     			    else
     			    {
@@ -1340,9 +1452,9 @@ abstract class DolibarrModules
     }
 
     /**
-     * Remove activation of generic parts of modules from llx_const
+     * Removes generic parts
      *
-     * @return     int     Nb of errors (0 if OK)
+     * @return  int Error count (0 if OK)
      */
     function delete_module_parts()
     {
@@ -1362,16 +1474,14 @@ abstract class DolibarrModules
     			$sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->const_name."_".strtoupper($key)."'";
     			$sql.= " AND entity = ".$entity;
 
-    			dol_syslog(get_class($this)."::delete_const_".$key." sql=".$sql);
+    			dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
     			if (! $this->db->query($sql))
     			{
     				$this->error=$this->db->lasterror();
-    				dol_syslog(get_class($this)."::delete_const_".$key." ".$this->error, LOG_ERR);
     				$err++;
     			}
     		}
     	}
-
     	return $err;
     }
 
diff --git a/htdocs/core/modules/action/index.html b/htdocs/core/modules/action/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 59f8fbfb129..464a01120ec 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -27,6 +27,8 @@
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 /**
  *	Class to generate event report
@@ -59,6 +61,7 @@ class CommActionRapport
 	{
 		global $conf,$langs;
 		$langs->load("commercial");
+		$langs->load("projects");
 
 		$this->db = $db;
 		$this->description = "";
@@ -91,7 +94,7 @@ class CommActionRapport
 	 */
 	function write_file($socid = 0, $catid = 0, $outputlangs='')
 	{
-		global $user,$conf,$langs;
+		global $user,$conf,$langs,$hookmanager;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -117,6 +120,17 @@ class CommActionRapport
 
 		if (file_exists($dir))
 		{
+			// Add pdfgeneration hook
+			if (! is_object($hookmanager))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+				$hookmanager=new HookManager($this->db);
+			}
+			$hookmanager->initHooks(array('pdfgeneration'));
+			$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+			global $action;
+			$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
             $pdf=pdf_getInstance($this->format);
             $heightforinfotot = 50;	// Height reserved to output the info and total part
             $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
@@ -149,6 +163,18 @@ class CommActionRapport
 			$pdf->Close();
 
 			$pdf->Output($file,'F');
+
+			// Add pdfgeneration hook
+			if (! is_object($hookmanager))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+				$hookmanager=new HookManager($this->db);
+			}
+			$hookmanager->initHooks(array('pdfgeneration'));
+			$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+			global $action;
+			$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 			if (! empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
@@ -174,9 +200,9 @@ class CommActionRapport
 		$y++;
 		$pdf->SetFont('','',8);
 
-		$sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
+		$sql = "SELECT s.nom as thirdparty, s.rowid as socid, s.client,";
 		$sql.= " a.id, a.datep as dp, a.datep2 as dp2,";
-		$sql.= " a.fk_contact, a.note, a.percent as percent, a.label,";
+		$sql.= " a.fk_contact, a.note, a.percent as percent, a.label, a.fk_project,";
 		$sql.= " c.code, c.libelle,";
 		$sql.= " u.login";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."user as u, ".MAIN_DB_PREFIX."actioncomm as a";
@@ -187,7 +213,10 @@ class CommActionRapport
 		$sql.= " AND a.entity = ".$conf->entity;
 		$sql.= " ORDER BY a.datep DESC";
 
-		dol_syslog(get_class($this)."::_page sql=".$sql);
+		$eventstatic=new ActionComm($this->db);
+		$projectstatic=new Project($this->db);
+
+		dol_syslog(get_class($this)."::_page", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -199,6 +228,11 @@ class CommActionRapport
 			{
 				$obj = $this->db->fetch_object($resql);
 
+				$eventstatic->id=$obj->id;
+				$eventstatic->percentage=$obj->percentage;
+				$eventstatic->fulldayevent=$obj->fulldayevent;
+				$eventstatic->punctual=$obj->punctual;
+
 				$y = max($y, $pdf->GetY(), $y0, $y1, $y2, $y3);
 
 				// Calculate height of text
@@ -206,6 +240,16 @@ class CommActionRapport
 				if (! preg_match('/^'.preg_quote($obj->label).'/',$obj->note)) $text=$obj->label."\n";
 				$text.=$obj->note;
 				$text=dol_trunc(dol_htmlentitiesbr_decode($text),150);
+				// Add status to text
+				$text.="\n";
+				$status=dol_htmlentitiesbr_decode($eventstatic->getLibStatut(1,1));
+				$text.=$status;
+				if ($obj->fk_project > 0)
+				{
+					$projectstatic->fetch($obj->fk_project);
+					$text.=($status?' - ':'').$outputlangs->transnoentitiesnoconv("Project").": ".dol_htmlentitiesbr_decode($projectstatic->getNomUrl(0, 'nolink'));
+				}
+
 				//print 'd'.$text; exit;
 				$nboflines=dol_nboflines($text);
 				$heightlinemax=max(2*$height,$nboflines*$height);
@@ -227,7 +271,7 @@ class CommActionRapport
 
 				// Third party
 				$pdf->SetXY(26, $y);
-				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($obj->societe),32), 0, 'L', 0);
+				$pdf->MultiCell(32, $height, dol_trunc($outputlangs->convToOutputCharset($obj->thirdparty),32), 0, 'L', 0);
 				$y1 = $pdf->GetY();
 
 				// Action code
diff --git a/htdocs/core/modules/barcode/doc/index.html b/htdocs/core/modules/barcode/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/barcode/index.html b/htdocs/core/modules/barcode/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 28fa03ee4f3..0bd7a262a9c 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php'
  */
 class mod_barcode_product_standard extends ModeleNumRefBarCode
 {
-	var $nom='Standard';				// Model Name
+	var $name='Standard';				// Model Name
 	var $code_modifiable;				// Editable code
 	var $code_modifiable_invalide;		// Modified code if it is invalid
 	var $code_modifiable_null;			// Modified code if it is null
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 5305ad53cd2..d03302f36b7 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -62,7 +62,7 @@ abstract class ModeleNumRefBarCode
         $langs->load("bills");
         return $langs->trans("NoDescription");
     }
-	
+
     /**     Return model name
      *
      *		@param	Translate	$langs		Object langs
@@ -70,10 +70,10 @@ abstract class ModeleNumRefBarCode
      */
     function getNom($langs)
     {
-        return $this->nom;
+        return empty($this->name)?$this->nom:$this->name;
     }
-	
-    /**     Return a numbering example 
+
+    /**     Return a numbering example
      *
      *		@param	Translate	$langs		Object langs
      *      @return string      			Example
@@ -96,7 +96,7 @@ abstract class ModeleNumRefBarCode
         global $langs;
         return $langs->trans("Function_getNextValue_InModuleNotWorking");
     }
-	
+
 	/**     Return version of module
      *
      *      @return     string      Version
@@ -109,9 +109,10 @@ abstract class ModeleNumRefBarCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
-	
+
     /**
      *      Return description of module parameters
      *
@@ -127,7 +128,7 @@ abstract class ModeleNumRefBarCode
         $langs->load("admin");
 
         $s='';
-        $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+        $s.=$langs->trans("Name").': <b>'.$this->name.'</b><br>';
         $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
         if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
         $s.='<br>';
@@ -170,6 +171,6 @@ abstract class ModeleNumRefBarCode
 
         return $s;
     }
-    
+
 }
 
diff --git a/htdocs/core/modules/cheque/index.html b/htdocs/core/modules/cheque/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/cheque/pdf/index.html b/htdocs/core/modules/cheque/pdf/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
index 04ba6a57174..aa61f5eb7aa 100644
--- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
@@ -85,7 +85,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	 */
 	function write_file($_dir, $number, $outputlangs)
 	{
-		global $user,$conf,$langs;
+		global $user,$conf,$langs,$hookmanager;
 
         if (! is_object($outputlangs)) $outputlangs=$langs;
         // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -113,6 +113,17 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		$_file = $dir . "/bordereau-".$number.".pdf";
 
+		// Add pdfgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('pdfgeneration'));
+		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		global $action;
+		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 		// Create PDF instance
         $pdf=pdf_getInstance($this->format);
         $heightforinfotot = 50;	// Height reserved to output the info and total part
@@ -141,6 +152,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
 		$nboflines=count($this->lines);
+
 		// Define nb of page
 		$pages = intval($nboflines / $this->line_per_page);
 		if (($nboflines % $this->line_per_page)>0)
@@ -166,6 +178,18 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$pdf->Close();
 
 		$pdf->Output($_file,'F');
+
+		// Add pdfgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('pdfgeneration'));
+		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		global $action;
+		$reshook=$hookmanager->executeHooks('adterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 		if (! empty($conf->global->MAIN_UMASK))
 			@chmod($_file, octdec($conf->global->MAIN_UMASK));
 
@@ -352,7 +376,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		//return pdf_pagefoot($pdf,$outputlangs,'BANK_CHEQUERECEIPT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object);
+		//$showdetails=0;
+		//return pdf_pagefoot($pdf,$outputlangs,'BANK_CHEQUERECEIPT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 		$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
 		$marge_basse=$this->marge_basse;
 		$marge_gauche=$this->marge_gauche;
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 67d45c39bb3..1b7da875073 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -277,7 +277,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 				// Make substitution
 				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->nom,
+				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
@@ -329,73 +329,19 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				{
 				}
 
-				// Make substitutions into odt of user info
-				$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Make substitutions into odt of mysoc
-				$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Make substitutions into odt of thirdparty
-				$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Replace tags of object + external modules
-				$tmparray=$this->get_substitutionarray_object($object,$outputlangs);
+				// Make substitutions into odt
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+
+				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
 				$reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				foreach($tmparray as $key=>$value)
 				{
 					try {
@@ -482,6 +428,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					}
 				}
 
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
diff --git a/htdocs/core/modules/commande/doc/index.html b/htdocs/core/modules/commande/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 2f569f1e47f..510a1bd88a1 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -184,6 +184,17 @@ class pdf_einstein extends ModelePDFCommandes
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$nblignes = count($object->lines);
 
 				// Create pdf instance
@@ -403,7 +414,7 @@ class pdf_einstein extends ModelePDFCommandes
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
 					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
 					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
@@ -1222,12 +1233,12 @@ class pdf_einstein extends ModelePDFCommandes
 			{
 				// 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->nom;
+				else $socname = $object->client->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
@@ -1271,7 +1282,8 @@ class pdf_einstein extends ModelePDFCommandes
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'COMMANDE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'COMMANDE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index cf5a562e2ef..2b8aaa21818 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -183,6 +183,17 @@ class pdf_proforma extends ModelePDFCommandes
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$nblignes = count($object->lines);
 
 				// Create pdf instance
@@ -402,7 +413,7 @@ class pdf_proforma extends ModelePDFCommandes
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
 					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
 					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0, $object->thirdparty,$mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
@@ -1179,12 +1190,12 @@ class pdf_proforma extends ModelePDFCommandes
 			{
 				// 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->nom;
+				else $socname = $object->client->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
@@ -1228,7 +1239,8 @@ class pdf_proforma extends ModelePDFCommandes
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'COMMANDE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'COMMANDE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/commande/index.html b/htdocs/core/modules/commande/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 8075099cdd6..92c8f55581c 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -119,7 +119,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		}
 		else
 		{
-			dol_syslog("mod_commande_marbre::getNextValue sql=".$sql);
+			dol_syslog("mod_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index 1146b1cc181..18a586d3b63 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -142,6 +143,7 @@ abstract class ModeleNumRefCommandes
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -158,101 +160,9 @@ abstract class ModeleNumRefCommandes
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
  *  @return     int         				0 if KO, 1 if OK
+ * @deprecated Use the new function generateDocument of Commande class
  */
-function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function commande_pdf_create(DoliDB $db, Commande $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf,$user,$langs,$hookmanager;
-	$langs->load("orders");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
-	{
-	    if (! empty($conf->global->COMMANDE_ADDON_PDF))
-	    {
-	        $modele = $conf->global->COMMANDE_ADDON_PDF;
-	    }
-	    else
-	    {
-	        $modele = 'einstein';
-	    }
-	}
-
-    // If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/commande/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-		//$obj->message = $message;
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// We delete old preview
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Success in building document. We build meta file.
-			dol_meta_create($object);
-
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('ORDER_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $obj->errors=$interface->errors; }
-			// Fin appel triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"order_pdf_create Error: ".$obj->error);
-			return -1;
-		}
-
-	}
-	else
-	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
-		return -1;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
diff --git a/htdocs/core/modules/contract/doc/index.html b/htdocs/core/modules/contract/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 88645973f6c..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
 	 *
@@ -106,7 +118,7 @@ class pdf_strato extends ModelePDFContract
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $user,$langs,$conf,$hookmanager,$mysoc;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -145,6 +157,17 @@ class pdf_strato extends ModelePDFContract
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
@@ -216,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.
 
@@ -262,7 +265,20 @@ class pdf_strato extends ModelePDFContract
 						$pageposbefore=$pdf->getPage();
 
 						// Description of product line
-						$txt='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration),1,$outputlangs->charset_output).'</strong>';
+
+						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='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".$datei." - ".$outputlangs->transnoentities("Duration")." : ".$durationi,1,$outputlangs->charset_output).'</strong>';
 						$desc=dol_htmlentitiesbr($objectligne->desc,1);
 
 						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txt,$desc), 0, 1, 0);
@@ -334,6 +350,18 @@ class pdf_strato extends ModelePDFContract
 				$pdf->Close();
 
 				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
@@ -498,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)
 		{
@@ -558,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->nom;
-				$this->recipient->name=$outputlangs->convToOutputCharset($socname);
+				else $socname = $object->client->name;
+				$this->recipient->name = $outputlangs->convToOutputCharset($socname);
 			}
-			else
-			{
-				$this->recipient->name=$outputlangs->convToOutputCharset($object->client->nom);
+			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');
@@ -610,7 +638,8 @@ class pdf_strato extends ModelePDFContract
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'CONTRACT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'CONTRACT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/contract/index.html b/htdocs/core/modules/contract/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index 8281552b459..289b474de5e 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -32,6 +32,7 @@ class mod_contract_magre extends ModelNumRefContracts
 	var $version='dolibarr';
 	var $error = '';
 	var $nom = 'Magre';
+	var $code_auto=1;
 
 	/**
 	 *	Return default description of numbering model
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
new file mode 100644
index 00000000000..6d22aebeb3d
--- /dev/null
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -0,0 +1,106 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014	   Floran Henry  <florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/contract/mod_contract_olive.php
+ *  \ingroup    contract
+ *  \brief      File of class to manage contract numbering rules Olive
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/modules/contract/modules_contract.php';
+
+
+/**
+ * 	Class to manage contract numbering rules Olive
+ */
+class mod_contract_olive extends ModelNumRefContracts
+{
+
+
+	var $nom='Olive';					// Nom du modele
+	var $code_modifiable = 1;				// Code modifiable
+	var $code_modifiable_invalide = 1;		// Code modifiable si il est invalide
+	var $code_modifiable_null = 1;			// Code modifiables si il est null
+	var $code_null = 1;						// Code facultatif
+	var $version='dolibarr';    		// 'development', 'experimental', 'dolibarr'
+	var $code_auto = 0; 	                // Numerotation automatique
+
+
+	/**
+	 *	Return description of module
+	 *
+	 *	@return string      		Description of module
+	 */
+	function info()
+	{
+		global $langs;
+
+		$langs->load("companies");
+		return $langs->trans("LeopardNumRefModelDesc");
+	}
+
+	/**
+	 * Return an example of result returned by getNextValue
+	 *
+	 * @param	Societe		$objsoc		Object thirdparty
+	 * @param	Contrat		$contract	Object contract
+	 * @return	string					Return next value
+	 */
+	function getNextValue($objsoc,$contract)
+	{
+		global $langs;
+		return '';
+	}
+
+
+	/**
+	 * 	Check validity of code according to its rules
+	 *
+	 *	@param	DoliDB		$db		Database handler
+	 *	@param	string		$code	Code to check/correct
+	 *	@param	Product		$product	Object product
+	 *  @param  int		  	$type   0 = product , 1 = service
+	 *  @return int					0 if OK
+	 * 								-1 ErrorBadProductCodeSyntax
+	 * 								-2 ErrorProductCodeRequired
+	 * 								-3 ErrorProductCodeAlreadyUsed
+	 * 								-4 ErrorPrefixRequired
+	 */
+	function verif($db, &$code, $product, $type)
+	{
+		global $conf;
+
+		$result=0;
+		$code = strtoupper(trim($code));
+
+		if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED))
+		{
+			$result=0;
+		}
+		else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)) )
+		{
+			$result=-2;
+		}
+
+		dol_syslog("mod_contract_olive::verif type=".$type." result=".$result);
+		return $result;
+	}
+}
+
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index a07f3261133..b909b762541 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -32,6 +32,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	var $prefix='CT';
 	var $error='';
 	var $nom='Serpis';
+	var $code_auto=1;
 
 
 	/**
@@ -116,7 +117,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 		}
 		else
 		{
-			dol_syslog("mod_contract_serpis::getNextValue sql=".$sql);
+			dol_syslog("mod_contract_serpis::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 9c54ed4a460..9ffd5d93881 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013      Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -138,6 +139,7 @@ class ModelNumRefContracts
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -153,99 +155,9 @@ class ModelNumRefContracts
  *  @param  int			$hidedesc       Hide description
  *  @param  int			$hideref        Hide ref
  *  @return int         				0 if KO, 1 if OK
+ * @deprecated Use the new function generateDocument of Contrat class
  */
-function contract_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function contract_pdf_create(DoliDB $db, Contrat $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf,$langs,$user,$hookmanager;
-	$langs->load("contracts");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// 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';
-		}
-	}
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/contract/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// We delete old preview
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-			
-			// Success in building document. We build meta file.
-			dol_meta_create($object);
-
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('CONTRACT_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $obj->errors=$interface->errors; }
-			// Fin appel triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"contract_pdf_create Error: ".$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		return 0;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html
index cd4c06e763c..2dc9c72968c 100644
--- a/htdocs/core/modules/dons/html_cerfafr.html
+++ b/htdocs/core/modules/dons/html_cerfafr.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>__DonationReceipt__</title>
+    <title>__DonationTitle__</title>
   </head>
   <body topmargin="10" marginheight="10" marginwidth="10">
 
@@ -11,10 +11,10 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor="#ffffff">
   <tr>
 
-    <td width="15%" class="nowrap" valign="middle">Cerfa No 11580 01</td>
+    <td width="15%" class="nowrap" valign="middle">Cerfa N° 11580*03</td>
 
     <td class="nowrap" align="center" valign="middle">
-	<font size="+2">__DonationReceipt__</font><br>
+	<font size="+2"><b>__DonationReceipt__</b></font><br>
 	__FrenchArticle__
     </td>
 
@@ -25,7 +25,6 @@
 	  <td class="nowrap">
 		<table border="0" cellspacing="0" cellpadding="1">
 		  <tr>
-		    <td width="40" class="nowrap">No:</td>
 		    <td align="center">__REF__ </td>
 		  </tr>
 		</table>
@@ -37,9 +36,6 @@
     </tr>
 </table>
 
-<br>
-<br>
-
 <table width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor="#000000">
   <tr>
     <td valign="bottom">
@@ -74,6 +70,10 @@
       </td>
     </tr>
 </table>
+
+<br>
+<br>
+
 <table width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor="#000000">
   <tr>
     <td valign="bottom">
@@ -93,25 +93,29 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor="#000000">
     <tr>
       <td valign="bottom">
-	
-	<table width="100%" border="0" bgcolor="#ffffff" cellspacing="0" cellpadding="3">
-	  <tr>
-	    <td>
-	      <b>__Name__ :</b><br>
-	      __DONATOR_FIRSTNAME__ __DONATOR_LASTNAME__<br>
-	      <b>__Address__ :</b><br>
-	      __DONATOR_ADDRESS__<br>
-	      <b>__Zip__ :</b> __DONATOR_ZIP__<br>
-	      <b>__Town__ :</b> __DONATOR_TOWN__<br>
-	    </td>
-	  </tr>
-	</table>
-
-      </td>
+		<table width="100%" border="0" bgcolor="#ffffff" cellspacing="0" cellpadding="3">
+		  <tr>
+			<td>
+			  <b>__Name__ :</b><br>
+			  __DONATOR_FIRSTNAME__ __DONATOR_LASTNAME__<br>
+			  <b>__Address__ :</b><br>
+			  __DONATOR_ADDRESS__<br>
+			  <b>__Zip__ :</b> __DONATOR_ZIP__<br>
+			  <b>__Town__ :</b> __DONATOR_TOWN__<br>
+			</td>
+		  </tr>
+		</table>
+	  </td>
     </tr>
+</table>
 
+<br>
+<br>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor="#000000">
     <tr>
       <td valign="bottom">
+	  
 	<table width="100%" border="0" bgcolor="#ffffff" cellspacing="0" cellpadding="3">
 	  <tr>
 	    <td>
@@ -119,20 +123,31 @@
 	      <table width="100%">
 		<tr align="center">
 		  <td>
-		    __AMOUNT__ __CURRENCY__
+			<font size="+1">
+		    <b>__AMOUNT__ __CURRENCY__<b/>
+			</font>
 		  </td>
 		</tr>
 	      </table>
-	        <b>__DatePayment__</b> : __DATE__ <br>
+	        <b>__DonationDatePayment__</b> : __DATE__ <br>
 	        <b>__PaymentMode__</b> : __PAYMENTMODE_LIB__ <br>
 
-	      <table width="100%">
+		<table width="100%" border="0" bgcolor="#ffffff" cellspacing="0" cellpadding="3">
+	  	<tr>
+			<td valign="top">
+		    <br>
+			<b>__Message__ :</b>
+			  __DonationMessage__<br>
+			</td>
+		</tr>
+		</table>
+			
+	    <table width="100%">
 		<tr align="center">
 
-		  <td valign="top">
-		    <br><br>
-                   __ThankYou__
-
+		  <td align="left">
+			__FrenchEligibility__<br>
+			__ARTICLE200__     __ARTICLE238__     __ARTICLE885__
 		  </td>
 		  
 		  <td align="right">
@@ -142,8 +157,8 @@
 			  <table border="0" bgcolor="#ffffff" cellspacing="0" cellpadding="3">
 			    <tr>
 			      <td width="160" height="100" valign="top">
-				<center>__Date__ __Signature__</center>
-				__NOW__
+				<center>__Date__ & __Signature__</center>
+				<center>__NOW__</center>
 			      </td>
 			    </tr>
 			  </table>
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index e999124300e..b4cc2795c1a 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2006	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2014       Alexandre Spangaro		<alexandre.spangaro@gmail.com> 
  *
  * 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 +20,9 @@
  */
 
 /**
- * \file       htdocs/core/modules/dons/html_cerfafr.modules.php
- * \ingroup    don
- * \brief      Formulaire de don
+ *	\file       htdocs/core/modules/dons/html_cerfafr.modules.php
+ *	\ingroup    don
+ *	\brief      Form of donation
  */
 require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php';
@@ -44,9 +45,9 @@ class html_cerfafr extends ModeleDon
 
         $this->db = $db;
         $this->name = "cerfafr";
-        $this->description = $langs->trans('DonationsReceiptModel');
+        $this->description = $langs->trans('DonationsReceiptModel').' - fr_FR - Cerfa 11580*03';
 
-        // Dimension page pour format A4
+        // Dimension page for size A4
         $this->type = 'html';
     }
 
@@ -87,7 +88,7 @@ class html_cerfafr extends ModeleDon
 
         if (! empty($conf->don->dir_output))
         {
-			// Definition de l'objet $don (pour compatibilite ascendante)
+			// Definition of the object don (for upward compatibility)
         	if (! is_object($don))
         	{
 	            $don = new Don($this->db);
@@ -95,7 +96,7 @@ class html_cerfafr extends ModeleDon
 	            $id=$don->id;
 			}
 
-			// Definition de $dir et $file
+			// Definition of $dir and $file
 			if (! empty($don->specimen))
 			{
 				$dir = $conf->don->dir_output;
@@ -121,8 +122,8 @@ class html_cerfafr extends ModeleDon
             {
             	$formclass = new Form($this->db);
 
-            	//This is not the proper way to do it but $formclass->form_modes_reglement
-            	//prints the translation instead of returning it
+            	// This is not the proper way to do it but $formclass->form_modes_reglement
+            	// prints the translation instead of returning it
             	if ($don->modepaiementid)
             	{
             		$formclass->load_cache_types_paiements();
@@ -130,7 +131,7 @@ class html_cerfafr extends ModeleDon
             	}
             	else $paymentmode = '';
 
-		        // Defini contenu
+		        // Define contents
 		        $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html";
 		        $form = implode('', file($donmodel));
 		        $form = str_replace('__REF__',$don->id,$form);
@@ -143,32 +144,79 @@ class html_cerfafr extends ModeleDon
 		        $form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__',$mysoc->address,$form);
 		        $form = str_replace('__MAIN_INFO_SOCIETE_ZIP__',$mysoc->zip,$form);
 		        $form = str_replace('__MAIN_INFO_SOCIETE_TOWN__',$mysoc->town,$form);
-		        $form = str_replace('__DONATOR_FIRSTNAME__',$don->firstname,$form);
+				$form = str_replace('__DONATOR_FIRSTNAME__',$don->firstname,$form);
             	$form = str_replace('__DONATOR_LASTNAME__',$don->lastname,$form);
 		        $form = str_replace('__DONATOR_ADDRESS__',$don->address,$form);
 		        $form = str_replace('__DONATOR_ZIP__',$don->zip,$form);
 		        $form = str_replace('__DONATOR_TOWN__',$don->town,$form);
 		        $form = str_replace('__PAYMENTMODE_LIB__ ', $paymentmode,$form);
-		        $form = str_replace('__NOW__',dol_print_date($now,'',false,$outputlangs),$form);
+		        $form = str_replace('__NOW__',dol_print_date($now,'day',false,$outputlangs),$form);
 		        $form = str_replace('__DonationRef__',$outputlangs->trans("DonationRef"),$form);
+				$form = str_replace('__DonationTitle__',$outputlangs->trans("DonationTitle"),$form);
 		        $form = str_replace('__DonationReceipt__',$outputlangs->trans("DonationReceipt"),$form);
 		        $form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form);
-		        $form = str_replace('__DatePayment__',$outputlangs->trans("DatePayment"),$form);
-		        $form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form);
+		        $form = str_replace('__DonationDatePayment__',$outputlangs->trans("DonationDatePayment"),$form);
+				$form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form);
 		        $form = str_replace('__Name__',$outputlangs->trans("Name"),$form);
 		        $form = str_replace('__Address__',$outputlangs->trans("Address"),$form);
 		        $form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form);
 		        $form = str_replace('__Town__',$outputlangs->trans("Town"),$form);
+				$form = str_replace('__Object__',$outputlangs->trans("Object"),$form);
 		        $form = str_replace('__Donor__',$outputlangs->trans("Donor"),$form);
 		        $form = str_replace('__Date__',$outputlangs->trans("Date"),$form);
 		        $form = str_replace('__Signature__',$outputlangs->trans("Signature"),$form);
-		        $form = str_replace('__ThankYou__',$outputlangs->trans("ThankYou"),$form);
+		        $form = str_replace('__Message__',$outputlangs->trans("Message"),$form);
 		        $form = str_replace('__IConfirmDonationReception__',$outputlangs->trans("IConfirmDonationReception"),$form);
-		        $frencharticle='';
-		        if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencharticle='<font size="+1"><b>(Article 200-5 du Code Général des Impôts)</b></font><br>+ article 238 bis';
+		        $form = str_replace('__DonationMessage__',$conf->global->DONATION_MESSAGE,$form);
+				
+				$frencharticle='';
+		        if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencharticle='<font size="+1">Article 200, 238 bis et 885-0 V bis A du code général des impôts (CGI)</font>';
 				$form = str_replace('__FrenchArticle__',$frencharticle,$form);
+				
+				$frencheligibility='';
+				if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencheligibility='Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
+				$form = str_replace('__FrenchEligibility__',$frencheligibility,$form);
+				
+				$art200='';
+				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+					if ($conf->global->DONATION_ART200 >= 1) 
+					{
+						$art200='<input type="checkbox" checked="checked">200 du CGI';
+					}
+					else
+					{
+						$art200='<input type="checkbox">200 du CGI';
+					}
+				}
+				$form = str_replace('__ARTICLE200__',$art200,$form);
 
-		        // Sauve fichier sur disque
+				$art238='';
+				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+					if ($conf->global->DONATION_ART238 >= 1) 
+					{
+						$art238='<input type="checkbox" checked="checked">238 bis du CGI';
+					}
+					else
+					{
+						$art238='<input type="checkbox">238 bis du CGI';
+					}
+				}
+				$form = str_replace('__ARTICLE238__',$art238,$form);
+				
+				$art885='';
+				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+					if ($conf->global->DONATION_ART885 >= 1) 
+					{
+						$art885='<input type="checkbox" checked="checked">885-0 V bis du CGI';
+					}
+					else
+					{
+						$art885='<input type="checkbox">885-0 V bis du CGI';
+					}
+				}
+				$form = str_replace('__ARTICLE885__',$art885,$form);
+				
+				// Save file on disk
 		        dol_syslog("html_cerfafr::write_file $file");
 		        $handle=fopen($file,"w");
 		        fwrite($handle,$form);
@@ -190,7 +238,7 @@ class html_cerfafr extends ModeleDon
             return 0;
 		}
         $this->error=$langs->trans("ErrorUnknown");
-        return 0;   // Erreur par defaut
+        return 0;   // Error by default
     }
 }
 
diff --git a/htdocs/core/modules/dons/index.html b/htdocs/core/modules/dons/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
index c06494fc501..d676d2c6f70 100644
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -134,6 +134,7 @@ abstract class ModeleNumRefDons
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 }
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index beed6fb5cdb..aaddbc1d748 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -277,7 +277,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 				// Make substitution
 				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->nom,
+				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
@@ -482,6 +482,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					}
 				}
 
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
diff --git a/htdocs/core/modules/expedition/doc/index.html b/htdocs/core/modules/expedition/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index cc9d884a831..145eeafcdde 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -143,6 +143,17 @@ class pdf_merou extends ModelePdfExpedition
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$nblignes = count($object->lines);
 
 				$pdf=pdf_getInstance($this->format,'mm','l');
@@ -329,6 +340,18 @@ class pdf_merou extends ModelePdfExpedition
 				$pdf->Close();
 
 				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
                 if (! empty($conf->global->MAIN_UMASK))
                     @chmod($file, octdec($conf->global->MAIN_UMASK));
 
@@ -594,12 +617,12 @@ class pdf_merou extends ModelePdfExpedition
 		{
 			// 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->nom;
+			else $socname = $object->client->name;
 			$carac_client_name=$outputlangs->convToOutputCharset($socname);
 		}
 		else
 		{
-			$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+			$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 		}
 
 		$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails');
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index eedc4b91827..ea6601b8396 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -129,6 +129,17 @@ class pdf_rouget extends ModelePdfExpedition
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$nblignes = count($object->lines);
 
 				$pdf=pdf_getInstance($this->format);
@@ -331,6 +342,18 @@ class pdf_rouget extends ModelePdfExpedition
 				$pdf->Close();
 
 				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
@@ -608,12 +631,12 @@ class pdf_rouget extends ModelePdfExpedition
 			{
 				// 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->nom;
+				else $socname = $object->client->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails');
@@ -657,7 +680,8 @@ class pdf_rouget extends ModelePdfExpedition
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'SHIPPING_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'SHIPPING_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/expedition/index.html b/htdocs/core/modules/expedition/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index ba779658051..581657c6547 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -116,7 +116,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		}
 		else
 		{
-			dol_syslog("mod_expedition_safor::getNextValue sql=".$sql);
+			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index ceddd5064e1..43292ae95c4 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2011-2013 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -136,6 +137,7 @@ abstract class ModelNumRefExpedition
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -148,109 +150,9 @@ abstract class ModelNumRefExpedition
  * 	@param	string		$modele			Force le modele a utiliser ('' to not force)
  * 	@param	Translate	$outputlangs	Objet lang a utiliser pour traduction
  *  @return int             			<=0 if KO, >0 if OK
+ * @deprecated Use the new function generateDocument of Expedition class
  */
-function expedition_pdf_create($db, $object, $modele, $outputlangs)
+function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs)
 {
-	global $conf,$user,$langs;
-
-	$langs->load("sendings");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Sets the model on the model name to use
-	if (! dol_strlen($modele))
-	{
-	    if (! empty($conf->global->EXPEDITION_ADDON_PDF))
-	    {
-	        $modele = $conf->global->EXPEDITION_ADDON_PDF;
-	    }
-	    else
-	    {
-	        $modele = 'rouget';
-	    }
-	}
-
-	// If selected model is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// We check the model location 
-	        $file=dol_buildpath($reldir."core/modules/expedition/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Load the model
-	if ($filefound)
-	{
-	    require_once $file;
-
-		$obj = new $classname($db);
-
-		$result=$object->fetch_origin();
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// we delete preview files
-        	//require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			//dol_delete_preview($object);
-
-			// Calls triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('SHIPPING_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $obj->errors=$interface->errors;
-			}
-			// End calls triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_syslog("Erreur dans expedition_pdf_create");
-			dol_print_error($db,$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		if (! $conf->global->EXPEDITION_ADDON_PDF)
-		{
-			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_PDF_NotDefined");
-		}
-		else
-		{
-			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		}
-		return 0;
-    }
+	return $object->generateDocument($modele, $outputlangs);
 }
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index 46ab465f42e..87923b4cb9c 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -66,7 +66,7 @@ class ExportExcel extends ModeleExports
 
 		// If driver use an external library, put its name here
 		$this->label_lib='PhpExcel';
-		$this->version_lib='1.7.2';
+		$this->version_lib='1.7.8';
 
 		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 
@@ -190,6 +190,14 @@ class ExportExcel extends ModeleExports
 	            	return -1;
 	            }
 		    }
+		    
+		    if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+			    $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+			    $cacheSettings = array (
+			    		'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+			    );
+			    PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+		    }
 
             $this->workbook = new PHPExcel();
             $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 9d704ce8fbe..bf70c30ab1c 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -66,7 +66,7 @@ class ExportExcel2007 extends ExportExcel
 
 		// If driver use an external library, put its name here
 		$this->label_lib='PhpExcel';
-		$this->version_lib='1.7.2';
+		$this->version_lib='1.7.8';
 
 		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 
diff --git a/htdocs/core/modules/export/index.html b/htdocs/core/modules/export/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 9b89555a9ff..2ca90b13ace 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -285,7 +285,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 				// Make substitution
 				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->nom,
+				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
@@ -337,15 +337,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				{
 				}
 
-				// Make substitutions into odt of user info
+				// Make substitutions into odt
 				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
 				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
 				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
 				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
 				$array_propal=is_object($propal_object)?$this->get_substitutionarray_object($propal_object,$outputlangs,'propal'):array();
-				$array_other=$this->get_substitutionarray_other($user,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
 
-				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal);
+				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal,$array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
@@ -439,6 +439,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 					}
 				}
 
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
diff --git a/htdocs/core/modules/facture/doc/index.html b/htdocs/core/modules/facture/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e8ea460fb9b..6d1f5636b85 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2013	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2010-2014	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -153,6 +153,36 @@ class pdf_crabe extends ModelePDFFactures
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
 
+		$nblignes = count($object->lines);
+
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray=array();
+		if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
+		{
+			for ($i = 0 ; $i < $nblignes ; $i++)
+			{
+				if (empty($object->lines[$i]->fk_product)) continue;
+
+				$objphoto = new Product($this->db);
+				$objphoto->fetch($object->lines[$i]->fk_product);
+
+				$pdir = get_exdir($object->lines[$i]->fk_product,2) . $object->lines[$i]->fk_product ."/photos/";
+				$dir = $conf->product->dir_output.'/'.$pdir;
+
+				$realpath='';
+				foreach ($objphoto->liste_photos($dir,1) as $key => $obj)
+				{
+					$filename=$obj['photo'];
+					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
+					$realpath = $dir.$filename;
+					break;
+				}
+
+				if ($realpath) $realpatharray[$i]=$realpath;
+			}
+		}
+		if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+
 		if ($conf->facture->dir_output)
 		{
 			$object->fetch_thirdparty();
@@ -184,9 +214,19 @@ class pdf_crabe extends ModelePDFFactures
 
 			if (file_exists($dir))
 			{
-				$nblignes = count($object->lines);
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
-                $pdf=pdf_getInstance($this->format);
+				// Create pdf instance
+				$pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
 				$heightforinfotot = 50;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
@@ -298,17 +338,43 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
 					$pdf->SetTextColor(0,0,0);
 
+					// Define size of image if we need it
+					$imglinesize=array();
+					if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
 					$pageposbefore=$pdf->getPage();
 
+					$showpricebeforepagebreak=1;
+					$posYAfterImage=0;
+					$posYAfterDescription=0;
+
+					// We start with Photo of product line
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur-($heightforfooter+$heightforfreetext+$heightforinfotot)))	// If photo too high, we moved completely on new page
+					{
+						$pdf->AddPage('','',true);
+						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$pdf->setPage($pageposbefore+1);
+
+						$curY = $tab_top_newpage;
+						$showpricebeforepagebreak=0;
+					}
+
+					if (isset($imglinesize['width']) && isset($imglinesize['height']))
+					{
+						$curX = $this->posxpicture-1;
+						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva-$this->posxpicture-$imglinesize['width'])/2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300);	// Use 300 dpi
+						// $pdf->Image does not increase value return by getY, so we save it manually
+						$posYAfterImage=$curY+$imglinesize['height'];
+					}
+
 					// Description of product line
 					$curX = $this->posxdesc-1;
 
-					$showpricebeforepagebreak=1;
-
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
@@ -316,7 +382,7 @@ class pdf_crabe extends ModelePDFFactures
 						$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_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxpicture-$curX,3,$curX,$curY,$hideref,$hidedesc);
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
@@ -340,6 +406,7 @@ class pdf_crabe extends ModelePDFFactures
 					{
 						$pdf->commitTransaction();
 					}
+					$posYAfterDescription=$pdf->GetY();
 
 					$nexY = $pdf->GetY();
 					$pageposafter=$pdf->getPage();
@@ -347,7 +414,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
 
-					// We suppose that a too long description is moved completely on next page
+					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
@@ -404,7 +471,7 @@ class pdf_crabe extends ModelePDFFactures
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
 					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
 					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0, $object->thirdparty, $mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
@@ -419,6 +486,8 @@ class pdf_crabe extends ModelePDFFactures
 					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
 					$this->tva[$vatrate] += $tvaligne;
 
+					if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
+
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
@@ -501,11 +570,6 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->Output($file,'F');
 
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('pdfgeneration'));
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
 				global $action;
@@ -624,7 +688,6 @@ class pdf_crabe extends ModelePDFFactures
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog($this->db,$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -663,7 +726,6 @@ class pdf_crabe extends ModelePDFFactures
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog($this->db,$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -885,7 +947,7 @@ class pdf_crabe extends ModelePDFFactures
 				//{
 					foreach( $this->localtax1 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5','7'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
@@ -918,7 +980,7 @@ class pdf_crabe extends ModelePDFFactures
 				//{
 					foreach( $this->localtax2 as $localtax_type => $localtax_rate )
 					{
-						if (in_array((string) $localtax_type, array('1','3','5','7'))) continue;
+						if (in_array((string) $localtax_type, array('1','3','5'))) continue;
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
@@ -1112,7 +1174,6 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
 
-			// Fin
 			$pdf->SetFont('','', $default_font_size - 1);
 			$pdf->SetTextColor(0,0,0);
 		}
@@ -1171,6 +1232,16 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
 		}
 
+		if (! empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
+		{
+			$pdf->line($this->posxpicture-1, $tab_top, $this->posxpicture-1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
+				//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
+			}
+		}
+
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 		{
 			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
@@ -1408,12 +1479,12 @@ class pdf_crabe extends ModelePDFFactures
 			{
 				// 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->nom;
+				else $socname = $object->client->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
@@ -1457,7 +1528,8 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'FACTURE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'FACTURE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/facture/index.html b/htdocs/core/modules/facture/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index f1a46913e25..25c6d2cd2ad 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -144,7 +144,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
-		dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
@@ -153,7 +153,6 @@ class mod_facture_mars extends ModeleNumRefFactures
 		}
 		else
 		{
-			dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
 			return -1;
 		}
 
@@ -168,7 +167,7 @@ class mod_facture_mars extends ModeleNumRefFactures
             $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
             $sql.= " AND entity = ".$conf->entity;
 
-            dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+            dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
             $resql=$db->query($sql);
             if ($resql)
             {
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 9a8b5feaed7..dc06c6202ec 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -160,7 +160,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
-		dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
@@ -169,7 +169,6 @@ class mod_facture_terre extends ModeleNumRefFactures
 		}
 		else
 		{
-			dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
 			return -1;
 		}
 
@@ -184,7 +183,7 @@ class mod_facture_terre extends ModeleNumRefFactures
             $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
             $sql.= " AND entity = ".$conf->entity;
 
-            dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+            dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
             $resql=$db->query($sql);
             if ($resql)
             {
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 3253ed00ef9..bca513e3fd6 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -137,6 +138,7 @@ abstract class ModeleNumRefFactures
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -153,108 +155,10 @@ abstract class ModeleNumRefFactures
  *  @param  int			$hidedesc       Hide description
  *  @param  int			$hideref        Hide ref
  *	@return int        					<0 if KO, >0 if OK
+ * @deprecated Use the new function generateDocument of Facture class
  */
-function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function facture_pdf_create(DoliDB $db, Facture $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf,$user,$langs;
-
-	$langs->load("bills");
-
-	$error=0;
-
-	// Increase limit for PDF build
-    $err=error_reporting();
-    error_reporting(0);
-    @set_time_limit(120);
-    error_reporting($err);
-
-    $srctemplatepath='';
-
-	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->FACTURE_ADDON_PDF))
-		{
-			$modele = $conf->global->FACTURE_ADDON_PDF;
-		}
-		else
-		{
-			$modele = 'crabe';
-		}
-	}
-
-    // If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/facture/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// We delete old preview
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Success in building document. We build meta file.
-			dol_meta_create($object);
-
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('BILL_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $errors=$interface->errors; }
-			// Fin appel triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"facture_pdf_create Error: ".$obj->error);
-			return -1;
-		}
-
-	}
-	else
-	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
-		return -1;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
diff --git a/htdocs/core/modules/fichinter/doc/index.html b/htdocs/core/modules/fichinter/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index a8595eb68db..bd6ec1b60e9 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -82,7 +82,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		$this->option_modereg = 0;                 // Affiche mode reglement
 		$this->option_condreg = 0;                 // Affiche conditions reglement
 		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 0;               // Dispo en plusieurs langues
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
 		$this->option_draft_watermark = 1;		   //Support add of a watermark on drafts
 
 		// Get source company
@@ -137,6 +137,18 @@ class pdf_soleil extends ModelePDFFicheinter
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$pdf=pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
 				$heightforinfotot = 50;	// Height reserved to output the info and total part
@@ -210,22 +222,22 @@ class pdf_soleil extends ModelePDFFicheinter
 				$nexY = $tab_top + 7;
 
 				$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->MultiCell(190,5,$outputlangs->transnoentities("Description"),0,'L',0);
+				$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur-$this->marge_droite, $tab_top + 5);
 
 				$pdf->SetFont('', '', $default_font_size - 1);
 
-				$pdf->SetXY($this->marge_gauche, $tab_top + 8);
+				$pdf->SetXY($this->marge_gauche, $tab_top + 5);
 				$text=$object->description;
 				if ($object->duree > 0)
 				{
-				    $totaltime=convertSecondToTime($object->duree,'all',$conf->global->MAIN_DURATION_OF_WORKDAY);
+				    $totaltime=convertSecondToTime($object->duration,'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);
+				$pdf->writeHTMLCell(180, 3, 10, $tab_top + 5, $outputlangs->convToOutputCharset($desc), 0, 1);
 				$nexY = $pdf->GetY();
 
 				$pdf->line($this->marge_gauche, $nexY, $this->page_largeur-$this->marge_droite, $nexY);
@@ -250,7 +262,12 @@ class pdf_soleil extends ModelePDFFicheinter
 						$pageposbefore=$pdf->getPage();
 
 						// Description of product line
-						$txt='<strong>'.dol_htmlentitiesbr($outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true)." - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration),1,$outputlangs->charset_output).'</strong>';
+						$txt=$outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true);
+						if ($objectligne->duration > 0)
+						{
+							$txt.=" - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration);
+						}
+						$txt='<strong>'.dol_htmlentitiesbr($txt,1,$outputlangs->charset_output).'</strong>';
 						$desc=dol_htmlentitiesbr($objectligne->desc,1);
 
 						$pdf->startTransaction();
@@ -573,12 +590,12 @@ class pdf_soleil extends ModelePDFFicheinter
 			{
 				// 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->nom;
+				else $socname = $object->client->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target');
@@ -620,7 +637,8 @@ class pdf_soleil extends ModelePDFFicheinter
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'FICHINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'FICHINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/fichinter/index.html b/htdocs/core/modules/fichinter/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 51084d7b313..dbcdab37530 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -136,6 +136,7 @@ abstract class ModeleNumRefFicheinter
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -223,13 +224,6 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_delete_preview($object);
 
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('FICHINTER_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $obj->errors=$interface->errors; }
-			// Fin appel triggers
-
 			return 1;
 		}
 		else
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index e83f812e8c4..c8d77040a9d 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -256,15 +256,7 @@ class ImportCsv extends ModeleImports
 	{
 		global $conf;
 
-		$arrayres=array();
-		if (version_compare(phpversion(), '5.3') < 0)
-		{
-			$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure);
-		}
-		else
-		{
-			$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
-		}
+		$arrayres=fgetcsv($this->handle,100000,$this->separator,$this->enclosure,$this->escape);
 
 		// End of file
 		if ($arrayres === false) return false;
@@ -621,7 +613,7 @@ class ImportCsv extends ModeleImports
 						}
 						if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$user->id;
 						$sql.=')';
-						dol_syslog("import_csv.modules sql=".$sql);
+						dol_syslog("import_csv.modules", LOG_DEBUG);
 
 						//print '> '.join(',',$arrayrecord);
 						//print 'sql='.$sql;
diff --git a/htdocs/core/modules/import/index.html b/htdocs/core/modules/import/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/index.html b/htdocs/core/modules/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/index.php b/htdocs/core/modules/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/modules/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/modules/livraison/doc/index.html b/htdocs/core/modules/livraison/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
similarity index 94%
rename from htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
rename to htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index ba58279c8ec..e3e9be99411 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2008      Chiptronik
  * Copyright (C) 2011-2012 Philippe Grand        <philippe.grand@atoo-net.com>
@@ -21,7 +21,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+ *	\file       htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
  *	\ingroup    livraison
  *	\brief      File of class to manage receving receipts with template Typhon
  *	\author	    Laurent Destailleur
@@ -100,7 +100,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$this->posxcomm=112;
 		//$this->posxtva=112;
 		//$this->posxup=126;
-		$this->posxqty=174;
+		$this->posxqty=165;
+		$this->posxremainingqty=185;
 		//$this->posxdiscount=162;
 		//$this->postotalht=174;
 		if ($this->page_largeur < 210) // To work with US executive format
@@ -174,6 +175,17 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$nblines = count($object->lines);
 
 				// Create pdf instance
@@ -207,6 +219,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$commande->fetch($expedition->origin_id);
 				}
 				$object->commande=$commande;	// We set order of shipment onto delivery.
+				$object->commande->loadExpeditions();
 
 
 				$pdf->Open();
@@ -355,7 +368,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					// Quantity
 					//$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
-					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxqty, 3, $object->lines[$i]->qty_shipped, 0, 'R');
+					$pdf->MultiCell($this->posxremainingqty - $this->posxqty, 3, $object->lines[$i]->qty_shipped, 0, 'R');
+
+					// Remaining to ship
+					$pdf->SetXY($this->posxremainingqty, $curY);
+					$qtyRemaining = $object->lines[$i]->qty_asked - $object->commande->expeditions[$object->lines[$i]->fk_origin_line];
+					$pdf->MultiCell($this->page_largeur-$this->marge_droite - $this->posxremainingqty, 3, $qtyRemaining, 0, 'R');
 					/*
 					 // Remise sur ligne
 					 $pdf->SetXY($this->posxdiscount, $curY);
@@ -615,12 +633,18 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		}
 
 		// Qty
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		$pdf->line($this->posxqty, $tab_top, $this->posxqty, $tab_top + $tab_height);
 		if (empty($hidetop)) {
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxqty, 2, $outputlangs->transnoentities("QtyShipped"),'','R');
+			$pdf->SetXY($this->posxqty, $tab_top+1);
+			$pdf->MultiCell($this->posxremainingqty - $this->posxqty, 2, $outputlangs->transnoentities("QtyShipped"),'','R');
 		}
 
+		// Remain to ship
+		$pdf->line($this->posxremainingqty, $tab_top, $this->posxremainingqty, $tab_top + $tab_height);
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxremainingqty, $tab_top+1);
+			$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxremainingqty, 2, $outputlangs->transnoentities("KeepToShip"),'','R');
+		}
 	}
 
 	/**
@@ -749,7 +773,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		if ($showaddress)
 		{
 			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client);
+			$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
 
 			// Show sender
 			$posy=42;
@@ -801,12 +825,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			{
 				// 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->nom;
+				else $socname = $object->client->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
@@ -850,7 +874,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'DELIVERY_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'DELIVERY_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/livraison/index.html b/htdocs/core/modules/livraison/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index 77ca85f8e6c..3480bb6d609 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -118,7 +118,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
         $sql.= " AND entity = ".$conf->entity;
 
         $resql=$db->query($sql);
-        dol_syslog("mod_livraison_jade::getNextValue sql=".$sql);
+        dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
         if ($resql)
         {
             $obj = $db->fetch_object($resql);
@@ -127,7 +127,6 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
         }
         else
         {
-            dol_syslog("mod_livraison_jade::getNextValue sql=".$sql, LOG_ERR);
             return -1;
         }
 
diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php
index 89b226ec066..22c25bcfd5f 100644
--- a/htdocs/core/modules/livraison/modules_livraison.php
+++ b/htdocs/core/modules/livraison/modules_livraison.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2006-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -139,6 +140,7 @@ abstract class ModeleNumRefDeliveryOrder
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -153,101 +155,10 @@ abstract class ModeleNumRefDeliveryOrder
  *	@param	string		$modele			force le modele a utiliser ('' to not force)
  *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
  *  @return int         				0 if KO, 1 if OK
+ * @deprecated Use the new function generateDocument of Livraison class
  */
-function delivery_order_pdf_create($db, $object, $modele, $outputlangs='')
+function delivery_order_pdf_create(DoliDB $db, Livraison $object, $modele, $outputlangs='')
 {
-	global $conf,$user,$langs;
-
-	$langs->load("deliveries");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Positionne modele sur le nom du modele de bon de livraison a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->LIVRAISON_ADDON_PDF))
-		{
-			$modele = $conf->global->LIVRAISON_ADDON_PDF;
-		}
-		else
-		{
-			$modele = 'typhon';
-		}
-	}
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/livraison/pdf/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object,$outputlangs) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// we delete preview files
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('DELIVERY_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $obj->errors=$interface->errors;
-			}
-			// Fin appel triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_syslog("Erreur dans delivery_order_pdf_create");
-			dol_print_error($db,$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		return 0;
-	}
+	return $object->generateDocument($modele, $outputlangs);
 }
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 3d0b0946b8f..3f8df87cd7a 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -158,7 +158,7 @@ class mailing_contacts1 extends MailingTargets
 	 */
 	function url($id)
 	{
-		return '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$id.'">'.img_object('',"contact").'</a>';
+		return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('',"contact").'</a>';
 	}
 
 
@@ -197,7 +197,7 @@ class mailing_contacts1 extends MailingTargets
 
 		// La requete doit retourner: id, email, fk_contact, name, firstname, other
 		$sql = "SELECT c.rowid as id, c.email as email, c.rowid as fk_contact,";
-		$sql.= " c.lastname, c.firstname, c.civilite as civility_id,";
+		$sql.= " c.lastname, c.firstname, c.civility as civility_id,";
 		$sql.= " s.nom as companyname";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
@@ -239,7 +239,7 @@ class mailing_contacts1 extends MailingTargets
                     		'firstname' => $obj->firstname,
                     		'other' =>
                                 ($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
-                                ($langs->transnoentities("UserTitle").'='.($obj->civilite_id?$langs->transnoentities("Civility".$obj->civilite_id):'')),
+                                ($langs->transnoentities("UserTitle").'='.($obj->civility_id?$langs->transnoentities("Civility".$obj->civility_id):'')),
                             'source_url' => $this->url($obj->id),
                             'source_id' => $obj->id,
                             'source_type' => 'contact'
diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php
index 7f07cc7fa0a..fe49ce56b35 100644
--- a/htdocs/core/modules/mailings/contacts2.modules.php
+++ b/htdocs/core/modules/mailings/contacts2.modules.php
@@ -61,7 +61,7 @@ class mailing_contacts2 extends MailingTargets
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$id.'">'.img_object('',"contact").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('',"contact").'</a>';
     }
 
     /**
@@ -79,7 +79,7 @@ class mailing_contacts2 extends MailingTargets
 
         // La requete doit retourner: id, email, fk_contact, name, firstname, other
         $sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact,";
-        $sql.= " sp.lastname, sp.firstname as firstname, sp.civilite as civility_id,";
+        $sql.= " sp.lastname, sp.firstname as firstname, sp.civility as civility_id,";
         $sql.= " s.nom as companyname";
     	$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
index 4c6480b8812..92640291088 100644
--- a/htdocs/core/modules/mailings/contacts3.modules.php
+++ b/htdocs/core/modules/mailings/contacts3.modules.php
@@ -59,7 +59,7 @@ class mailing_contacts3 extends MailingTargets
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$id.'">'.img_object('',"contact").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('',"contact").'</a>';
     }
 
     /**
@@ -77,7 +77,7 @@ class mailing_contacts3 extends MailingTargets
 
         // La requete doit retourner: id, email, fk_contact, name, firstname, other
         $sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact,";
-        $sql.= " sp.lastname, sp.firstname, sp.civilite as civility_id,";
+        $sql.= " sp.lastname, sp.firstname, sp.civility as civility_id,";
         $sql.= " s.nom as companyname";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
@@ -92,7 +92,6 @@ class mailing_contacts3 extends MailingTargets
     	if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$this->db->escape($filtersarray[0])."'";
     	$sql.= " ORDER BY sp.lastname, sp.firstname";
 
-    	dol_syslog("sql=".$sql);
     	$resql = $this->db->query($sql);
     	if ($resql)
     	{
diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php
index acf4a316660..59355b372fe 100644
--- a/htdocs/core/modules/mailings/contacts4.modules.php
+++ b/htdocs/core/modules/mailings/contacts4.modules.php
@@ -59,7 +59,7 @@ class mailing_contacts4 extends MailingTargets
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$id.'">'.img_object('',"contact").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$id.'">'.img_object('',"contact").'</a>';
     }
 
     /**
@@ -77,7 +77,7 @@ class mailing_contacts4 extends MailingTargets
 
         // La requete doit retourner: id, email, fk_contact, name, firstname, other
         $sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact,";
-        $sql.= " sp.lastname, sp.firstname, sp.civilite as civility_id,";
+        $sql.= " sp.lastname, sp.firstname, sp.civility as civility_id,";
         $sql.= " s.nom as companyname";
         $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
         if ($filtersarray[0] <> 'all')$sql.= " INNER JOIN ".MAIN_DB_PREFIX."categorie_contact as cs ON cs.fk_socpeople=sp.rowid";
@@ -89,7 +89,7 @@ class mailing_contacts4 extends MailingTargets
     	if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$this->db->escape($filtersarray[0])."'";
     	$sql.= " ORDER BY sp.lastname, sp.firstname";
 
-    	dol_syslog(get_class($this).':: add_to_target sql='.$sql,LOG_DEBUG);
+    	dol_syslog(get_class($this).':: add_to_target',LOG_DEBUG);
     	$resql = $this->db->query($sql);
     	if ($resql)
     	{
@@ -115,7 +115,6 @@ class mailing_contacts4 extends MailingTargets
 			}
 		}else {
 			$this->error=$this->db->lasterrno();
-			dol_syslog(get_class($this)."Error sql=".$sql." ".$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -215,7 +214,7 @@ class mailing_contacts4 extends MailingTargets
 
         $resql = $this->db->query($sql);
 
-        dol_syslog(get_class($this).':: formFilter sql='.$sql,LOG_DEBUG);
+        dol_syslog(get_class($this).':: formFilter',LOG_DEBUG);
 		if ($resql) {
 	        $s='';
 	        $s.='<select name="filter" class="flat">';
@@ -236,7 +235,6 @@ class mailing_contacts4 extends MailingTargets
 		}
 		else {
 			$this->error=$this->db->lasterrno();
-			dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 0e79a1f6e91..dd6e18dfa91 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -140,7 +140,7 @@ class mailing_fraise extends MailingTargets
      */
     function url($id)
     {
-        return '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$id.'">'.img_object('',"user").'</a>';
+        return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('',"user").'</a>';
     }
 
 
@@ -166,7 +166,7 @@ class mailing_fraise extends MailingTargets
         // La requete doit retourner: id, email, fk_contact, name, firstname
         $sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
         $sql.= " a.lastname, a.firstname,";
-        $sql.= " a.datefin, a.civilite as civility_id, a.login, a.societe";	// Other fields
+        $sql.= " a.datefin, a.civility as civility_id, a.login, a.societe";	// Other fields
         $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
         $sql.= " WHERE a.email <> ''";     // Note that null != '' is false
         $sql.= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
@@ -180,7 +180,7 @@ class mailing_fraise extends MailingTargets
         //print $sql;
 
         // Add targets into table
-        dol_syslog(get_class($this)."::add_to_target sql=".$sql);
+        dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php
index 27ea5592b21..c647466e796 100644
--- a/htdocs/core/modules/mailings/framboise.modules.php
+++ b/htdocs/core/modules/mailings/framboise.modules.php
@@ -59,12 +59,12 @@ class mailing_framboise extends MailingTargets
 		global $conf, $langs;
 		$langs->load("members");
 		$langs->load("companies");
-		
+
 		$cibles = array();
 
 		// Select the members from category
 		$sql = "SELECT a.rowid as id, a.email as email, a.lastname, null as fk_contact, a.firstname,";
-		$sql.= " a.datefin, a.civilite as civility_id, a.login, a.societe,";	// Other fields
+		$sql.= " a.datefin, a.civility as civility_id, a.login, a.societe,";	// Other fields
 		if ($_POST['filter']) $sql.= " c.label";
 		else $sql.=" null as label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
@@ -229,11 +229,7 @@ class mailing_framboise extends MailingTargets
 	 */
 	function url($id)
 	{
-		//$companystatic=new Societe($this->db);
-		//$companystatic->id=$id;
-		//$companystatic->nom='';
-		//return $companystatic->getNomUrl(1);	// Url too long
-		return '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$id.'">'.img_object('',"user").'</a>';
+		return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('',"user").'</a>';
 	}
 
 }
diff --git a/htdocs/core/modules/mailings/index.html b/htdocs/core/modules/mailings/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 3c0238da902..2c93b588524 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -129,7 +129,7 @@ class mailing_pomme extends MailingTargets
 	 */
 	function url($id)
 	{
-		return '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$id.'">'.img_object('',"user").'</a>';
+		return '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$id.'">'.img_object('',"user").'</a>';
 	}
 
 
@@ -144,12 +144,12 @@ class mailing_pomme extends MailingTargets
 	{
 		global $conf, $langs;
 		$langs->load("companies");
-		
+
 		$cibles = array();
 
 		// La requete doit retourner: id, email, fk_contact, lastname, firstname
 		$sql = "SELECT u.rowid as id, u.email as email, null as fk_contact,";
-		$sql.= " u.lastname as lastname, u.firstname as firstname, u.civilite as civility_id, u.login, u.office_phone";
+		$sql.= " u.lastname, u.firstname as firstname, u.civility as civility_id, u.login, u.office_phone";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 		$sql.= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test
 		$sql.= " AND u.entity IN (0,".$conf->entity.")";
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 9d7fb16aaab..df8ec79f988 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -240,10 +240,6 @@ class mailing_thirdparties extends MailingTargets
 	 */
 	function url($id)
 	{
-		//$companystatic=new Societe($this->db);
-		//$companystatic->id=$id;
-		//$companystatic->nom='';
-		//return $companystatic->getNomUrl(1);	// Url too long
 		return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
 	}
 
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index a907ad0ec3f..5837329a476 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -40,7 +40,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
     function __construct($db)
     {
     	global $conf;
-    	
+
         $this->db=$db;
 
         $this->arrayofproducts=array();
@@ -233,10 +233,6 @@ class mailing_thirdparties_services_expired extends MailingTargets
      */
     function url($id)
     {
-        //$companystatic=new Societe($this->db);
-        //$companystatic->id=$id;
-        //$companystatic->nom='';
-        //return $companystatic->getNomUrl(1);	// Url too long
         return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
     }
 
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 3ed72bd2034..777621fa432 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -137,8 +137,6 @@ class mailing_xinputfile extends MailingTargets
 			{
 				$cpt=0;
 
-				//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-				//print_r($_FILES);
 				$file=$upload_dir . "/" . $_FILES['username']['name'];
 				$handle = @fopen($file, "r");
 				if ($handle)
diff --git a/htdocs/core/modules/member/doc/index.html b/htdocs/core/modules/member/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/member/index.html b/htdocs/core/modules/member/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 489f07378a9..e074bfe82f1 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -1,9 +1,8 @@
 <?php
-/* Copyright (C) 2003		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
- * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014      Ari Elbaz (elarifr)	<github@accedinfo.com>
+ * Copyright (C) 2014 	   Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,100 +19,189 @@
  */
 
 /**
- * 	\defgroup   accounting 			Module accounting
- * 	\brief      Module to include accounting features
- *	\file       htdocs/core/modules/modAccounting.class.php
- *	\ingroup    accounting
- * 	\brief      Fichier de description et activation du module Comptabilite Expert
+ * \file		accountingex/core/modules/modAccounting.class.php
+ * \ingroup		Accounting Expert
+ * \brief		Module to activate Accounting Expert module
  */
-
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
-
 /**
- *	Classe de description et activation du module Comptabilite Expert
+ * \class	modAccountingExpert
+ * \brief	Description and activation class for module accounting expert
  */
 class modAccounting extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-	 */
+     */
 	function __construct($db)
 	{
 		global $conf;
 
-		$this->db = $db;
-		$this->numero = 50400 ;
+        $this->db = $db;
+		$this->numero = 50400;
 
 		$this->family = "financial";
 		// 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 = "Gestion complete de comptabilite (doubles parties)";
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Advanced accounting management";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		//$this->version = 'dolibarr';
-		$this->version = "development";
+		$this->version = 'development';
 
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
 		$this->special = 0;
+		$this->picto = 'accounting';
 
-		// Config pages
-		$this->config_page_url = array("accounting.php");
-
-		// Dependancies
-		$this->depends = array("modFacture","modBanque","modTax");
-		$this->requiredby = array();
-		$this->conflictwith = array("modComptabilite");
-		$this->langfiles = array("compta");
-
-		// Constants
-		$this->const = array(0=>array('MAIN_COMPANY_CODE_ALWAYS_REQUIRED','chaine','1','With this constants on, third party code is always required whatever is numbering module behaviour',0,'current',1),
-							 1=>array('MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED','chaine','1','With this constants on, bank account number is always required',0,'current',1),
-
-		);			// List of particular constants to add when module is enabled
+		// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
+		// $this->triggers = 1;
 
 		// Data directories to create when module is enabled
-		$this->dirs = array("/accounting/temp");
+		$this->dirs = array('/accounting/temp');
+
+		// Config pages
+		$this->config_page_url = array('index.php@accountancy');
+
+		// Dependencies
+		$this->depends = array("modFacture","modBanque","modTax"); // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of modules id to disable if this one is disabled
+		$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
+		$this->phpmin = array(5, 2); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 6); // Minimum version of Dolibarr required by module
+		$this->langfiles = array("accountancy");
+
+		// Constants
+		$this->const = array();
+		$this->const[1] = array(
+				"MAIN_COMPANY_CODE_ALWAYS_REQUIRED",
+				"chaine",
+				"1",
+				"With this constants on, third party code is always required whatever is numbering module behaviour"
+		);
+		$this->const[2] = array(
+				"MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED",
+				"chaine",
+				"1",
+				"With this constants on, bank account number is always required"
+		);
+		$this->const[1] = array(
+				"ACCOUNTING_SEPARATORCSV",
+				"string",
+				","
+		);
+		$this->const[2] = array(
+				"ACCOUNTING_ACCOUNT_SUSPENSE",
+				"chaine",
+				"471"
+		);
+		$this->const[3] = array(
+				"ACCOUNTING_SELL_JOURNAL",
+				"chaine",
+				"VTE"
+		);
+		$this->const[4] = array(
+				"ACCOUNTING_PURCHASE_JOURNAL",
+				"chaine",
+				"ACH"
+		);
+		$this->const[5] = array(
+				"ACCOUNTING_SOCIAL_JOURNAL",
+				"chaine",
+				"SOC"
+		);
+		$this->const[6] = array(
+				"ACCOUNTING_CASH_JOURNAL",
+				"chaine",
+				"CAI"
+		);
+		$this->const[7] = array(
+				"ACCOUNTING_MISCELLANEOUS_JOURNAL",
+				"chaine",
+				"OD"
+		);
+		$this->const[8] = array(
+				"ACCOUNTING_BANK_JOURNAL",
+				"chaine",
+				"BQ"
+		); // Deprecated Move into llx_bank_account
+		$this->const[9] = array(
+				"ACCOUNTING_ACCOUNT_TRANSFER_CASH",
+				"chaine",
+				"58"
+		);
+		$this->const[10] = array(
+				"CHARTOFACCOUNTS",
+				"chaine",
+				"2"
+		);
+		$this->const[11] = array(
+				"ACCOUNTING_MODELCSV",
+				"chaine",
+				"0"
+		);
+		$this->const[12] = array(
+				"ACCOUNTING_LENGTH_GACCOUNT",
+				"chaine",
+				""
+		);
+		$this->const[13] = array(
+				"ACCOUNTING_LENGTH_AACCOUNT",
+				"chaine",
+				""
+		);
+		$this->const[14] = array(
+				"ACCOUNTING_LIMIT_LIST_VENTILATION",
+				"chaine",
+				"50"
+		);
+		$this->const[15] = array(
+				"ACCOUNTING_LIST_SORT_VENTILATION_TODO",
+				"yesno",
+				"1"
+		);
+		$this->const[16] = array(
+				"ACCOUNTING_LIST_SORT_VENTILATION_DONE",
+				"yesno",
+				"1"
+		);
+
+		// Tabs
+		$this->tabs = array();
+
+		// Css
+		$this->module_parts = array();
 
 		// Boxes
 		$this->boxes = array();
 
 		// Permissions
-		$this->rights = array();
 		$this->rights_class = 'accounting';
-		$r=0;
+
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 		$this->rights[$r][0] = 50401;
-		$this->rights[$r][1] = 'Lire le plan de compte';
+		$this->rights[$r][1] = 'Read ventilation';
 		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 1;
-		$this->rights[$r][4] = 'plancompte';
-		$this->rights[$r][5] = 'lire';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'ventilation';
+		$this->rights[$r][5] = 'read';
 		$r++;
 
 		$this->rights[$r][0] = 50402;
-		$this->rights[$r][1] = 'Creer/modifier un plan de compte';
-		$this->rights[$r][2] = 'w';
+		$this->rights[$r][1] = 'Dispatched ventilation';
+		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'plancompte';
-		$this->rights[$r][5] = 'creer';
-		$r++;
-
-		$this->rights[$r][0] = 50403;
-		$this->rights[$r][1] = 'Cloturer plan de compte';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'plancompte';
-		$this->rights[$r][5] = 'cloturer';
+		$this->rights[$r][4] = 'ventilation';
+		$this->rights[$r][5] = 'dispatch';
 		$r++;
 
 		$this->rights[$r][0] = 50411;
 		$this->rights[$r][1] = 'Lire les mouvements comptables';
 		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 1;
+		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'mouvements';
 		$this->rights[$r][5] = 'lire';
 		$r++;
@@ -126,48 +214,63 @@ class modAccounting extends DolibarrModules
 		$this->rights[$r][5] = 'creer';
 		$r++;
 
-		$this->rights[$r][0] = 50415;
+		$this->rights[$r][0] = 50420;
 		$this->rights[$r][1] = 'Lire CA, bilans, resultats, journaux, grands livres';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'comptarapport';
 		$this->rights[$r][5] = 'lire';
 		$r++;
+
+		$this->rights[$r][0] = 50430;
+		$this->rights[$r][1] = 'Define and close a fiscal year';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'fiscalyear';
+		$this->rights[$r][5] = '';
+		$r++;
+		
+		$this->rights[$r][0] = 50440;
+		$this->rights[$r][1] = 'Manage chart of accounts';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'chartofaccount';
+		$this->rights[$r][5] = '';
+		$r++;
+
+		// Main menu entries
+		$this->menus = array();
+		$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);
+     */
+    function init($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->_init($sql,$options);
-	}
-
-	/**
-	 *		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 remove($options='')
-	{
-		global $conf;
-
-		$sql = array("DELETE FROM ".MAIN_DB_PREFIX."const where name='MAIN_COMPANY_CODE_ALWAYS_REQUIRED' and entity IN ('0','".$conf->entity."')");
-
 		return $this->_remove($sql,$options);
-	}
+    }
 }
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 40da5f73db8..8cec64f2d20 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -173,9 +173,10 @@ class modAdherent extends DolibarrModules
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='MembersAndSubscriptions';
         $this->export_permission[$r]=array(array("adherent","export"));
-        $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civilite'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'p.code'=>"CountryCode",'p.libelle'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount');
-        $this->export_TypeFields_array[$r]=array('a.civilite'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'p.code'=>'Text','p.libelle'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number');
-        $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civilite'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'p.code'=>"member",'p.libelle'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription');
+        $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount');
+        $this->export_TypeFields_array[$r]=array('a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number');
+        $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription');
+
 		// Add extra fields
 		$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity = ".$conf->entity;
 		$resql=$this->db->query($sql);
@@ -192,7 +193,7 @@ class modAdherent extends DolibarrModules
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'cotisation as c ON c.fk_adherent = a.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.country = p.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid';
         $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid';
         $this->export_dependencies_array[$r]=array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
@@ -210,7 +211,7 @@ class modAdherent extends DolibarrModules
         $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
         $this->import_tables_array[$r]=array('a'=>MAIN_DB_PREFIX.'adherent','extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
         $this->import_tables_creator_array[$r]=array('a'=>'fk_user_author');    // Fields to store import user id
-        $this->import_fields_array[$r]=array('a.civilite'=>"UserTitle",'a.lastname'=>"Lastname*",'a.firstname'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'a.state_id'=>'StateId','a.country'=>"CountryId",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription');
+        $this->import_fields_array[$r]=array('a.civility'=>"UserTitle",'a.lastname'=>"Lastname*",'a.firstname'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'a.state_id'=>'StateId','a.country'=>"CountryId",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription');
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity = ".$conf->entity;
 		$resql=$this->db->query($sql);
@@ -225,8 +226,8 @@ class modAdherent extends DolibarrModules
 		}
 		// End add extra fields
 		$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_regex_array[$r]=array('a.civilite'=>'code@'.MAIN_DB_PREFIX.'c_civilite','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)','a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-        $this->import_examplevalues_array[$r]=array('a.civilite'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1','a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note'=>"This is a comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d'));
+		$this->import_regex_array[$r]=array('a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)','a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
+        $this->import_examplevalues_array[$r]=array('a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1','a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note'=>"This is a comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d'));
     }
 
 
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index ec53754440f..c633734b227 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
@@ -214,7 +214,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'NewAction',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/fiche.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create',
+													'url'=>'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create',
 													'langs'=>'commercial',
 													'position'=>101,
 													'perms'=>'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)',
@@ -371,20 +371,20 @@ class modAgenda extends DolibarrModules
 			'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"durationp",
 			'cac.libelle'=>"ActionType",
 			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town',
-			'cp.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4',
+			'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4',
 			's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra');
 		$this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date",
 			'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Number",
 			'ac.durationp'=>"Duree",
 			'cac.libelle'=>"List:c_actioncomm:libelle:rowid",
 			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text',
-			'cp.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text',
+			'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text',
 			's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text');
 		$this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action",
 			'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action",
 			'cac.libelle'=>"action",
 			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company',
-			'cp.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company',
+			'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company',
 			's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',);
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
@@ -392,9 +392,9 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as cp on s.fk_pays = cp.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' Where ac.entity = '.$conf->entity;
-		$this->export_sql_end[$r] .=' ORDER BY datep';
+		$this->export_sql_end[$r] .=' ORDER BY ac.datep';
 
 	}
 
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 43fbe916c47..0d383603a06 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -182,7 +182,7 @@ class modBanque extends DolibarrModules
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON f.rowid = pf.fk_facture';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' WHERE ba.rowid = b.fk_account AND bch.rowid = b.fk_bordereau and bch.fk_bank_account=ba.rowid';
-		$this->export_sql_end[$r] .=' AND b.fk_type = "CHQ"';
+		$this->export_sql_end[$r] .=" AND b.fk_type = 'CHQ'";
 		$this->export_sql_end[$r] .=' AND p.fk_paiement = 7';
 		$this->export_sql_end[$r] .=' AND ba.entity = '.$conf->entity;
 		$this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve';
diff --git a/htdocs/core/modules/modBoutique.class.php b/htdocs/core/modules/modBoutique.class.php
deleted file mode 100644
index 837dd8c6c24..00000000000
--- a/htdocs/core/modules/modBoutique.class.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
- * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- * 	\defgroup   oscommerce     Module oscommerce
- *	\brief      Module pour gerer une boutique et interface avec OSCommerce
- *  \file       htdocs/core/modules/modBoutique.class.php
- *  \ingroup    oscommerce
- *  \brief      Fichier de description et activation du module OSCommerce
- */
-
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
-/**
- *	Classe de description et activation du module OSCommerce
- */
-class modBoutique extends DolibarrModules
-{
-
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 800;
-
-		$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 = "Interface de visualisation d'une boutique OSCommerce ou OSCSS";
-		$this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 1;
-
-		// Data directories to create when module is enabled
-		$this->dirs = array();
-
-		// Config pages
-//		$this->config_page_url = array("boutique.php","osc-languages.php");
-		$this->config_page_url = array("boutique.php@boutique");
-
-		// Dependancies
-		$this->depends = array();
-		$this->requiredby = array();
-	    $this->conflictwith = array("modOSCommerceWS");
-	   	$this->langfiles = array("shop");
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "OSC_DB_HOST";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "localhost";
-		$this->const[$r][3] = "Host for OSC database for OSCommerce module 1";
-		$this->const[$r][4] = 0;
-		$r++;
-
-	    // Boites
-	    $this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'boutique';
-	}
-
-    /**
-     *      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='')
-	{
-		$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/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 24a9ee5ef94..327608c8814 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -116,11 +116,11 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r]='category';
 		$this->export_enabled[$r]='$conf->fournisseur->enabled';
 		$this->export_permission[$r]=array(array("categorie","lire"),array("fournisseur","lire"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic");
-		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text");
-		$this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company");	// We define here only fields that use another picto
+		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic");
+		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text");
+		$this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company");	// We define here only fields that use another picto
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_fournisseur as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_fournisseur as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_societe = s.rowid';
 		$this->export_sql_end[$r] .=' AND u.entity = '.$conf->entity;
 		$this->export_sql_end[$r] .=' AND u.type = 1';	// Supplier categories
@@ -131,11 +131,11 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r]='category';
         $this->export_enabled[$r]='$conf->societe->enabled';
 		$this->export_permission[$r]=array(array("categorie","lire"),array("societe","lire"));
-		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus');
-		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code');
-		$this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company','s.fk_stcomm'=>'company');	// We define here only fields that use another picto
+		$this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus');
+		$this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code');
+		$this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company','s.fk_stcomm'=>'company');	// We define here only fields that use another picto
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_societe as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_societe as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
 		$this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_societe = s.rowid';
 		$this->export_sql_end[$r] .=' AND u.entity = '.$conf->entity;
 		$this->export_sql_end[$r] .=' AND u.type = 2';	// Customer/Prospect categories
@@ -181,14 +181,14 @@ class modCategorie extends DolibarrModules
 			'u.label' => "Label",
 			'u.description' => "Description",
 			'p.rowid' => 'ContactId',
-			'p.civilite' => 'Civility',
+			'p.civility' => 'Civility',
 			'p.lastname' => 'LastName',
 			'p.firstname' => 'Firstname',
 			'p.address' => 'Address',
 			'p.zip' => 'Zip',
 			'p.town' => 'Town',
 			'country.code' => 'CountryCode',
-			'country.libelle' => 'Country',
+			'country.label' => 'Country',
 			'p.birthday' => 'DateToBirth',
 			'p.poste' => 'PostOrFunction',
 			'p.phone' => 'Phone',
@@ -211,14 +211,14 @@ class modCategorie extends DolibarrModules
 			'u.label' => "category",
 			'u.description' => "category",
 			'p.rowid' => 'contact',
-			'p.civilite' => 'contact',
+			'p.civility' => 'contact',
 			'p.lastname' => 'contact',
 			'p.firstname' => 'contact',
 			'p.address' => 'contact',
 			'p.zip' => 'contact',
 			'p.town' => 'contact',
 			'country.code' => 'contact',
-			'country.libelle' => 'contact',
+			'country.label' => 'contact',
 			'p.birthday' => 'contact',
 			'p.poste' => 'contact',
 			'p.phone' => 'contact',
@@ -231,7 +231,7 @@ class modCategorie extends DolibarrModules
 		); // We define here only fields that use another picto
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'categorie as u, '.MAIN_DB_PREFIX . 'categorie_contact as cp, '.MAIN_DB_PREFIX . 'socpeople as p';
-		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_pays as country ON p.fk_pays = country.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as country ON p.fk_pays = country.rowid';
 		$this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity = ' . $conf->entity;
 		$this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories
 
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 22197c9beff..4a2f0bc20b4 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -98,8 +98,10 @@ class modCommande extends DolibarrModules
 		$this->const[$r][4] = 0;
 
 		// Boxes
-		$this->boxes = array();
-		$this->boxes = array(0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'),2=>array('file'=>'box_graph_orders_permonth.php','enabledbydefaulton'=>'Home'));
+		$this->boxes = array(
+			0=>array('file'=>'box_commandes.php','enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_graph_orders_permonth.php','enabledbydefaulton'=>'Home')
+		);
 
 		// Permissions
 		$this->rights = array();
@@ -173,16 +175,20 @@ class modCommande extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='CustomersOrdersAndOrdersLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("commande","commande","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.libelle'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.libelle'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
 		$this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'commande as c, '.MAIN_DB_PREFIX.'societe as s';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commandedet as cd';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande as c';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uc.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_extrafields as extra ON c.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity;
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index f4f943bc3cc..74002f0065f 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -93,30 +93,6 @@ class modComptabilite extends DolibarrModules
 		$this->rights[$r][3] = 1;
 		$this->rights[$r][4] = 'resultat';
 		$this->rights[$r][5] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 96;
-		$this->rights[$r][1] = 'Parametrer la ventilation';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'ventilation';
-		$this->rights[$r][5] = 'parametrer';
-
-		$r++;
-		$this->rights[$r][0] = 97;
-		$this->rights[$r][1] = 'Lire les ventilations de factures';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 1;
-		$this->rights[$r][4] = 'ventilation';
-		$this->rights[$r][5] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 98;
-		$this->rights[$r][1] = 'Ventiler les lignes de factures';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'ventilation';
-		$this->rights[$r][5] = 'creer';
 	}
 
 
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index b1a4e7e63cf..4906d9e3954 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
  * This program is free software; you can redistribute it and/or modify
@@ -41,6 +41,8 @@ class modContrat extends DolibarrModules
 	 */
 	function __construct($db)
 	{
+		global $conf;
+		
 		$this->db = $db;
 		$this->numero = 54;
 
@@ -60,7 +62,7 @@ class modContrat extends DolibarrModules
 		$this->dirs = array("/contract/temp");
 
 		// Dependances
-		$this->depends = array("modSociete","modService");
+		$this->depends = array("modSociete");
 		$this->requiredby = array();
 
 		// Config pages
@@ -114,6 +116,53 @@ class modContrat extends DolibarrModules
 		$this->rights[5][3] = 0;
 		$this->rights[5][4] = 'supprimer';
 
+		// Exports
+		//--------
+		$r=1;
+
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='ContractAndServices';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='contract';
+		$this->export_permission[$r]=array(array("contrat","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode',
+		's.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+		's.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra',
+		'co.rowid'=>"contractId",'co.ref'=>"contactRef",'co.datec'=>"contractDateCreation",'co.date_contrat'=>"DateContract",'co.mise_en_service'=>"DateMiseService",
+		'co.fin_validite'=>"EndValidity",'co.date_cloture'=>"Cloture",'co.note_private'=>"NotePrivate",'co.note_public'=>"NotePublic",
+		'cod.rowid'=>'LineId','cod.label'=>"LineLabel",'cod.description'=>"LineDescription",'cod.price_ht'=>"LineUnitPrice",'cod.tva_tx'=>"LineVATRate",
+		'cod.qty'=>"LineQty",'cod.total_ht'=>"LineTotalHT",'cod.total_tva'=>"LineTotalVAT",'cod.total_ttc'=>"LineTotalTTC",
+		'cod.date_ouverture'=>"DateStart",'cod.date_ouverture_prevue'=>"DateStartPrevis",'cod.date_fin_validite'=>"EndValidity",'cod.date_cloture'=>"DateEnd",
+		'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company',
+		's.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company',
+		's.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',
+		'co.rowid'=>"Contract",'co.ref'=>"Contract",'co.datec'=>"Contract",'co.date_contrat'=>"Contract",'co.mise_en_service'=>"Contract",
+		'co.fin_validite'=>"Contract",'co.date_cloture'=>"Contract",'co.note_private'=>"Contract",'co.note_public'=>"Contract",
+		'cod.rowid'=>'contract_line','cod.label'=>"contract_line",'cod.description'=>"contract_line",'cod.price_ht'=>"contract_line",'cod.tva_tx'=>"contract_line",
+		'cod.qty'=>"contract_line",'cod.total_ht'=>"contract_line",'cod.total_tva'=>"contract_line",'cod.total_ttc'=>"contract_line",
+		'cod.date_ouverture'=>"contract_line",'cod.date_ouverture_prevue'=>"contract_line",'cod.date_fin_validite'=>"contract_line",'cod.date_cloture'=>"contract_line",
+		'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
+
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text',
+		's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text',
+		's.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text',
+		'co.ref'=>"Text",'co.datec'=>"Date",'co.date_contrat'=>"Date",'co.mise_en_service'=>"Date",
+		'co.fin_validite'=>"Date",'co.date_cloture'=>"Date",'co.note_private'=>"Text",'co.note_public'=>"Text",
+		'cod.label'=>"Text",'cod.description'=>"Text",'cod.price_ht'=>"Numeric",'cod.tva_tx'=>"Numeric",
+		'cod.qty'=>"Numeric",'cod.total_ht'=>"Numeric",'cod.total_tva'=>"Numeric",'cod.total_ttc'=>"Numeric",
+		'cod.date_ouverture'=>"Date",'cod.date_ouverture_prevue'=>"Date",'cod.date_fin_validite'=>"Date",'cod.date_cloture'=>"Date",
+		'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+
+
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contrat as co,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'contratdet as cod';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cod.fk_product = p.rowid)';	
+		$this->export_sql_end[$r] .=' WHERE co.fk_soc = s.rowid and co.rowid = cod.fk_contrat';
+		$this->export_sql_end[$r] .=' AND co.entity = '.$conf->entity;
 	}
 
 
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 24536bc5a68..75d3ab328c8 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -78,25 +78,31 @@ class modDeplacement extends DolibarrModules
 		$this->rights_class = 'deplacement';
 
 		$this->rights[1][0] = 171;
-		$this->rights[1][1] = 'Lire les deplacements';
+		$this->rights[1][1] = 'Lire ses notes de frais et deplacements et celles de sa hierarchy';
 		$this->rights[1][2] = 'r';
 		$this->rights[1][3] = 1;
 		$this->rights[1][4] = 'lire';
 
 		$this->rights[2][0] = 172;
-		$this->rights[2][1] = 'Creer/modifier les deplacements';
+		$this->rights[2][1] = 'Creer/modifier une note de frais et deplacements';
 		$this->rights[2][2] = 'w';
 		$this->rights[2][3] = 0;
 		$this->rights[2][4] = 'creer';
 
     	$this->rights[3][0] = 173;
-		$this->rights[3][1] = 'Supprimer les deplacements';
+		$this->rights[3][1] = 'Supprimer les notes de frais et deplacements';
 		$this->rights[3][2] = 'd';
 		$this->rights[3][3] = 0;
 		$this->rights[3][4] = 'supprimer';
 
+    	$this->rights[3][0] = 174;
+		$this->rights[3][1] = 'Lire toutes les notes de frais';
+		$this->rights[3][2] = 'd';
+		$this->rights[3][3] = 0;
+		$this->rights[3][4] = 'readall';
+
 		$this->rights[6][0] = 178;
-		$this->rights[6][1] = 'Exporter les deplacements';
+		$this->rights[6][1] = 'Exporter les notes de frais et deplacements';
 		$this->rights[6][2] = 'd';
 		$this->rights[6][3] = 0;
 		$this->rights[6][4] = 'export';
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 931aa2ec325..b1b265146a4 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2003,2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2011	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
  *
  * 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,17 +20,17 @@
 
 /**
  *	\defgroup   don     Module donation
- *	\brief      Module pour gerer le suivi des dons
+ *	\brief      Module to manage the follow-up of the donations
  *	\file       htdocs/core/modules/modDon.class.php
  *	\ingroup    don
- *	\brief      Fichier de description et activation du module Don
+ *	\brief      Description and activation file for module Donation
  */
 
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *	Classe de description et activation du module Don
+ *	Class to describe and enable module Donation
  */
 class modDon  extends DolibarrModules
 {
@@ -66,15 +67,43 @@ class modDon  extends DolibarrModules
 		$this->config_page_url = array("dons.php");
 
 		// Constants
-		$this->const = array();
-		$r=0;
+		$this->const = array ();
 
-		$this->const[$r][0] = "DON_ADDON_MODEL";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "html_cerfafr";
-		$this->const[$r][3] = 'Nom du gestionnaire de generation de recu de dons';
-		$this->const[$r][4] = 0;
-		$r++;
+		$this->const[0] = array (
+				"DON_ADDON_MODEL",
+				"chaine",
+				"html_cerfafr",
+				"Nom du gestionnaire de generation de recu de dons",
+				"0"
+		);
+		$this->const[1] = array (
+				"DONATION_ART200",
+				"yesno",
+				"0",
+				"Option Française - Eligibilité Art200 du CGI",
+				"0"
+		);
+		$this->const[2] = array (
+				"DONATION_ART238",
+				"yesno",
+				"0",
+				"Option Française - Eligibilité Art238 bis du CGI",
+				"0"
+		);
+		$this->const[3] = array (
+				"DONATION_ART885",
+				"yesno",
+				"0",
+				"Option Française - Eligibilité Art885-0 V bis du CGI",
+				"0"
+		);
+		$this->const[4] = array (
+				"DONATION_MESSAGE",
+				"chaine",
+				"Thank you",
+				"Message affiché sur le récépissé de versements ou dons",
+				"0"
+		);
 
 		// Boxes
 		$this->boxes = array();
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 0d39edd40fa..20c679556e7 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -216,15 +216,15 @@ class modExpedition extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Shipments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("expedition","shipment","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.libelle'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Number",'c.height'=>"Number",'c.width'=>"Number",'c.weight'=>"Number",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Number");
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Number",'c.height'=>"Number",'c.width'=>"Number",'c.weight'=>"Number",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Number");
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
 		$this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'expedition as c, '.MAIN_DB_PREFIX.'societe as s';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed, '.MAIN_DB_PREFIX.'commandedet as cd';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 7b8d8d355ff..5bb85dea7db 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -177,11 +177,11 @@ class modFacture extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='bill';
-		$this->export_permission[$r]=array(array("facture","facture","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'fd.rowid'=>'LineId','fd.label'=>"Label",'fd.description'=>"LineDescription",'fd.subprice'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalVAT",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.special_code'=>'SpecialCode','fd.product_type'=>"TypeOfLineServiceOrProduct",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_sell'=>'ProductAccountancySellCode');
+		$this->export_permission[$r]=array(array("facture","facture","export","other"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','fd.rowid'=>'LineId','fd.label'=>"Label",'fd.description'=>"LineDescription",'fd.subprice'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalVAT",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",'fd.date_end'=>"DateEnd",'fd.special_code'=>'SpecialCode','fd.product_type'=>"TypeOfLineServiceOrProduct",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_sell'=>'ProductAccountancySellCode');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.price'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.product_type'=>"Numeric",'fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
 		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Numeric",'f.total_ttc'=>"Numeric",'f.tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'fd.description'=>"Text",'fd.subprice'=>"Numeric",'fd.tva_tx'=>"Numeric",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_tva'=>"Numeric",'fd.total_ttc'=>"Numeric",'fd.date_start'=>"Date",'fd.date_end'=>"Date",'fd.special_code'=>'Numeric','fd.product_type'=>"Numeric",'fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text','p.accountancy_code_sell'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.label'=>"invoice_line",'fd.description'=>"invoice_line",'fd.subprice'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.special_code'=>'invoice_line','fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_sell'=>'product');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.label'=>"invoice_line",'fd.description'=>"invoice_line",'fd.subprice'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.special_code'=>'invoice_line','fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_sell'=>'product','f.fk_user_author'=>'user','uc.login'=>'user','f.fk_user_valid'=>'user','uv.login'=>'user');
 		$this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture'";
@@ -219,8 +219,10 @@ class modFacture extends DolibarrModules
 		// End add axtra fields
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c on s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uc.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facturedet as fd';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
@@ -232,10 +234,10 @@ class modFacture extends DolibarrModules
 		$this->export_label[$r]='CustomersInvoicesAndPayments';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='bill';
 		$this->export_permission[$r]=array(array("facture","facture","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.facnumber'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.date_lim_reglement'=>"DateDue",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_private'=>"NotePrivate",'f.note_public'=>"NotePublic",'f.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','f.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
 		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text','f.rowid'=>"List:facture:facnumber",'f.facnumber'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.date_lim_reglement'=>"Date",'f.total'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_private'=>"Text",'f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.facnumber'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.date_lim_reglement'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_private'=>"invoice",'f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment','f.fk_user_author'=>'user','uc.login'=>'user','f.fk_user_valid'=>'user','uv.login'=>'user');
 		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture'";
@@ -273,8 +275,10 @@ class modFacture extends DolibarrModules
 		// End add axtra fields
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c on s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uc.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_extrafields as extra ON f.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiement as p ON pf.fk_paiement = p.rowid';
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index f54e4fef497..45d8a0fa7bc 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -139,8 +139,8 @@ class modFicheinter extends DolibarrModules
         $this->export_label[$r]='InterventionCardsAndInterventionLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
         $this->export_permission[$r]=array(array("ficheinter","export"));
         $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InterId",'f.ref'=>"InterRef",'f.datec'=>"InterDateCreation",'f.duree'=>"InterDuration",'f.fk_statut'=>'InterStatus','f.description'=>"InterNote",'fd.rowid'=>'InterLineId','fd.date'=>"InterLineDate",'fd.duree'=>"InterLineDuration",'fd.description'=>"InterLineDesc");
-        //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric");
-        $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric");
+        //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric");
+        $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric");
         $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"intervention",'f.ref'=>"intervention",'f.datec'=>"intervention",'f.duree'=>"intervention",'f.fk_statut'=>"intervention",'f.description'=>"intervention",'fd.rowid'=>"inter_line",'fd.date'=>"inter_line",'fd.duree'=>'inter_line','fd.description'=>'inter_line');
         $this->export_dependencies_array[$r]=array('inter_line'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 92c27bb11f9..1f1a8072e1e 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -291,7 +291,7 @@ class modFournisseur extends DolibarrModules
 		// End add axtra fields
             $this->export_sql_start[$r]='SELECT DISTINCT ';
             $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c ON s.fk_pays = c.rowid,';
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
             $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
             $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facture_fourn_det as fd';
@@ -345,7 +345,7 @@ class modFournisseur extends DolibarrModules
 		// End add axtra fields
             $this->export_sql_start[$r]='SELECT DISTINCT ';
             $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c ON s.fk_pays = c.rowid,';
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
             $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
@@ -365,7 +365,7 @@ class modFournisseur extends DolibarrModules
 
             $this->export_sql_start[$r]='SELECT DISTINCT ';
             $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c ON s.fk_pays = c.rowid,';
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
             $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f, '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
             $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index eadfa84ba6c..e45b40a3f57 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -213,7 +213,7 @@ class modHoliday extends DolibarrModules
 								'titre'=>'MenuAddCP',
 								'mainmenu'=>'holiday',
 								'leftmenu'=>'holiday_add',
-								'url'=>'/holiday/fiche.php?mainmenu=holiday&action=request',
+								'url'=>'/holiday/card.php?mainmenu=holiday&action=request',
 								'langs'=>'holiday',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 								'position'=>101,
 								'enabled'=>'$conf->holiday->enabled',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
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/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 87dbc3e6dde..a23fc59a2d0 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -198,7 +198,7 @@ class modProduct extends DolibarrModules
 		        $this->export_entities_array[$r][$fieldname]='product';
 		    }
 		}
-		// End add axtra fields
+		// End add extra fields
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
@@ -210,14 +210,14 @@ class modProduct extends DolibarrModules
 		{
 			// Exports product multiprice
 			$r++;
-			$this->export_code[$r]=$this->rights_class.'_'.$key;
+			$this->export_code[$r]=$this->rights_class.'_'.$r;
 			$this->export_label[$r]="ProductsMultiPrice";	// Translation key (used only if key ExportDataset_xxx_z not found)
 			$this->export_permission[$r]=array(array("produit","export"));
 			$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",
-				'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel",
-				'pr.price'=>"HT",'pr.price_ttc'=>"TTC",
-				'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC",
-				'pr.tva_tx'=>'VATRate',
+				'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
+				'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
+				'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
+				'pr.tva_tx'=>'PriceLevelVATRate',
 				'pr.date_price'=>'DateCreation');
 			//$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Number",'p.surface'=>"Number",'p.volume'=>"Number",'p.weight'=>"Number",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Number",'p.price_ttc'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
 			$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",
@@ -304,11 +304,11 @@ class modProduct extends DolibarrModules
 			$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 			$this->import_tables_array[$r]=array('pr'=>MAIN_DB_PREFIX.'product_price');
 			$this->import_tables_creator_array[$r]=array('pr'=>'fk_user_author');	// Fields to store import user id
-			$this->import_fields_array[$r]=array('pr.fk_product'=>"Id*",
-				'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel",
-				'pr.price'=>"HT",'pr.price_ttc'=>"TTC",
-				'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC",
-				'pr.tva_tx'=>'VATRate',
+			$this->import_fields_array[$r]=array('pr.fk_product'=>"ProductRowid*",
+				'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
+				'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
+				'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
+				'pr.tva_tx'=>'PriceLevelVATRate',
 				'pr.date_price'=>'DateCreation*');
 			$this->import_regex_array[$r]=array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
 			$this->import_examplevalues_array[$r]=array('pr.fk_product'=>"1",
@@ -332,7 +332,6 @@ class modProduct extends DolibarrModules
 	 */
 	function init($options='')
 	{
-		// Permissions
 		$this->remove($options);
 
 		$sql = array();
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 2209fffb4ad..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
@@ -78,13 +78,13 @@ class modProductBatch extends DolibarrModules
 
         $this->tabs = array();
 
-        // Dictionnaries
+        // Dictionaries
 	    if (! isset($conf->productbatch->enabled))
         {
         	$conf->productbatch=new stdClass();
         	$conf->productbatch->enabled=0;
         }
-		$this->dictionnaries=array();
+		$this->dictionaries=array();
 
         // Boxes
         $this->boxes = array();			// List of boxes
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 0d8a09aa7e5..97ddc6afaba 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014	   Charles-Fr BENKE	<charles.fr@benke.fr>
  *
  * 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,6 +117,11 @@ class modProjet extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array();
+		$r=0;
+		$this->boxes[$r][1] = "box_project.php";
+		$r++;
+		$this->boxes[$r][1] = "box_task.php";
+		$r++;
 
 		// Permissions
 		$this->rights = array();
@@ -184,7 +190,7 @@ class modProjet extends DolibarrModules
 		$this->export_permission[$r]=array(array("projet","export"));
 		$this->export_dependencies_array[$r]=array('task_time'=>'ppt.rowid');
 		
-		$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle',
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label',
 		's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text',
 		'p.rowid'=>"List:projet:ref",'p.ref'=>"Text",'p.datec'=>"Date",'p.dateo'=>"Date",'p.datee'=>"Date",'p.fk_statut'=>'Status','p.description'=>"Text",
 		'pt.dateo'=>"Date",'pt.datee'=>"Date",'pt.duration_effective'=>"Duree",'pt.planned_workload'=>"Number",'pt.progress'=>"Number",'pt.description'=>"Text",
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 5e81edc87f5..2a390118b72 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -169,16 +169,20 @@ class modPropale extends DolibarrModules
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='ProposalsAndProposalsLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r]=array(array("propale","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','cp.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','cp.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','cp.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','cp.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
 		$this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as cp ON s.fk_pays = cp.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c, '.MAIN_DB_PREFIX.'propaldet as cd';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uc.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .=' AND c.entity = '.$conf->entity;
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 5ecadcc9792..35f5a145bee 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004		Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2014		Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014		Alexandre Spangaro	 <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,7 +67,7 @@ class modSalaries extends DolibarrModules
 		$this->dirs = array("/salaries/temp");
 
 		// Config pages
-		$this->config_page_url = array();
+		$this->config_page_url = array('salaries.php');
 
 		// Dependances
 		$this->depends = array();
@@ -76,6 +77,16 @@ class modSalaries extends DolibarrModules
 
 		// Constants
 		$this->const = array();
+		$this->const[0] = array(
+				"SALARIES_ACCOUNTING_ACCOUNT_PAYMENT",
+				"chaine",
+				"421"
+		);
+		$this->const[1] = array(
+				"SALARIES_ACCOUNTING_ACCOUNT_CHARGE",
+				"chaine",
+				"641"
+		);
 
 		// Boxes
 		$this->boxes = array();
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 13fe1ed47d5..839d50709c7 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -60,11 +60,11 @@ class modService extends DolibarrModules
 		$this->picto='service';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array("/produit/temp");
+		$this->dirs = array("/product/temp");
 
 		// Dependancies
 		$this->depends = array();
-		$this->requiredby = array("modContrat");
+		$this->requiredby = array();
 
 		// Config pages
 		$this->config_page_url = array("product.php@product");
@@ -147,7 +147,7 @@ class modService extends DolibarrModules
 		if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'service'));
 		if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'service'));
 		// Add extra fields
-		$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
+		$sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -155,8 +155,28 @@ class modService extends DolibarrModules
 		    {
 		        $fieldname='extra.'.$obj->name;
 		        $fieldlabel=ucfirst($obj->label);
-		        $this->export_fields_array[$r][$fieldname]=$fieldlabel;
-		        $this->export_entities_array[$r][$fieldname]='product';
+		    	$typeFilter="Text";
+				switch($obj->type)
+				{
+					case 'int':
+					case 'double':
+					case 'price':
+						$typeFilter="Numeric";
+						break;
+					case 'date':
+					case 'datetime':
+						$typeFilter="Date";
+						break;
+					case 'boolean':
+						$typeFilter="Boolean";
+						break;
+					case 'sellist':
+						$typeFilter="List:".$obj->param;
+						break;
+				}
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+				$this->export_entities_array[$r][$fieldname]='product';
 		    }
 		}
 		// End add extra fields
@@ -164,7 +184,8 @@ class modService extends DolibarrModules
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'product as p';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')';
+		if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
+        $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')';
 
 
 		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@@ -186,7 +207,7 @@ class modService extends DolibarrModules
 				$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",
 					'pr.price_base_type'=>"product",'pr.price_level'=>"product",'pr.price'=>"product",
 					'pr.price_ttc'=>"product",
-					'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
+					'pr.price_min'=>"product",'pr.price_min_ttc'=>"product",
 					'pr.tva_tx'=>'product',
 					'pr.date_price'=>"product");
 				$this->export_sql_start[$r]='SELECT DISTINCT ';
@@ -208,10 +229,10 @@ class modService extends DolibarrModules
 		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields');
 		$this->import_tables_creator_array[$r]=array('p'=>'fk_user_author');	// Fields to store import user id
-        $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
+        $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
 		if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
         // Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
+		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity = ".$conf->entity;
 		$resql=$this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
@@ -225,7 +246,7 @@ class modService extends DolibarrModules
 		// End add extra fields
 		$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r]=array('p.ref'=>'[^ ]','p.tosell'=>'^[0|1]$','p.tobuy'=>'^[0|1]$','p.fk_product_type'=>'^[0|1]$','p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-		$this->import_examplevalues_array[$r]=array('p.ref'=>"PR123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31');
+		$this->import_examplevalues_array[$r]=array('p.ref'=>"PREF123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31');
 
 
 		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@@ -297,7 +318,6 @@ class modService extends DolibarrModules
 	 */
 	function init($options='')
 	{
-		// Permissions et valeurs par defaut
 		$this->remove($options);
 
 		$sql = array();
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 4367aae3789..63cb9c610b4 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -124,7 +124,7 @@ class modSociete extends DolibarrModules
 		$this->const[$r][4] = 1;
 		$r++;
 		*/
-		
+
 		$this->const[$r][0] = "SOCIETE_ADD_REF_IN_LIST";
 		$this->const[$r][1] = "yesno";
 		$this->const[$r][2] = "0";
@@ -264,10 +264,10 @@ class modSociete extends DolibarrModules
 		$this->export_label[$r]='ExportDataset_company_1';
 		$this->export_icon[$r]='company';
 		$this->export_permission[$r]=array(array("societe","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','st.code'=>'ProspectStatus','d.nom'=>'State');
+		$this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','st.code'=>'ProspectStatus','d.nom'=>'State');
 		if (! empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix']='Prefix';
-		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
-		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Number",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Number",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text');
 		$this->export_entities_array[$r]=array();	// We define here only fields that use another picto
         // Add extra fields
         $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
@@ -307,7 +307,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
         $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
@@ -320,9 +320,9 @@ class modSociete extends DolibarrModules
 		$this->export_label[$r]='ExportDataset_company_2';
 		$this->export_icon[$r]='contact';
 		$this->export_permission[$r]=array(array("societe","contact","export"));
-		$this->export_fields_array[$r]=array('c.rowid'=>"IdContact",'c.civilite'=>"CivilityCode",'c.lastname'=>'Lastname','c.firstname'=>'Firstname','c.poste'=>'PostOrFunction','c.datec'=>"DateCreation",'c.tms'=>"DateLastModification",'c.priv'=>"ContactPrivate",'c.address'=>"Address",'c.zip'=>"Zip",'c.town'=>"Town",'d.nom'=>'State','p.libelle'=>"Country",'p.code'=>"CountryCode",'c.phone'=>"Phone",'c.fax'=>"Fax",'c.phone_mobile'=>"Mobile",'c.email'=>"EMail",'s.rowid'=>"IdCompany",'s.nom'=>"CompanyName",'s.status'=>"Status",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode");
-		$this->export_TypeFields_array[$r]=array('c.civilite'=>"List:c_civilite:civilite:code",'c.lastname'=>'Text','c.firstname'=>'Text','c.poste'=>'Text','c.datec'=>"Date",'c.priv'=>"Boolean",'c.address'=>"Text",'c.cp'=>"Text",'c.ville'=>"Text",'d.nom'=>'Text','p.libelle'=>"List:c_pays:libelle:rowid",'p.code'=>"Text",'c.phone'=>"Text",'c.fax'=>"Text",'c.email'=>"Text",'s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Status",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text");
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>"company",'s.code_client'=>"company",'s.code_fournisseur'=>"company");	// We define here only fields that use another picto
+		$this->export_fields_array[$r]=array('c.rowid'=>"IdContact",'c.civility'=>"CivilityCode",'c.lastname'=>'Lastname','c.firstname'=>'Firstname','c.poste'=>'PostOrFunction','c.datec'=>"DateCreation",'c.tms'=>"DateLastModification",'c.priv'=>"ContactPrivate",'c.address'=>"Address",'c.zip'=>"Zip",'c.town'=>"Town",'d.nom'=>'State','co.label'=>"Country",'co.code'=>"CountryCode",'c.phone'=>"Phone",'c.fax'=>"Fax",'c.phone_mobile'=>"Mobile",'c.email'=>"EMail",'s.rowid'=>"IdCompany",'s.nom'=>"CompanyName",'s.status'=>"Status",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode", 's.client'=>'Customer 0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'Supplier 0 or 1');
+		$this->export_TypeFields_array[$r]=array('c.civility'=>"List:c_civility:label:code",'c.lastname'=>'Text','c.firstname'=>'Text','c.poste'=>'Text','c.datec'=>"Date",'c.priv'=>"Boolean",'c.address'=>"Text",'c.cp'=>"Text",'c.ville'=>"Text",'d.nom'=>'Text','co.label'=>"List:c_country:label:rowid",'co.code'=>"Text",'c.phone'=>"Text",'c.fax'=>"Text",'c.email'=>"Text",'s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Status",'s.client'=>"Text",'s.fournisseur'=>"Text");
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>"company",'s.code_client'=>"company",'s.code_fournisseur'=>"company", 's.client'=>"company",  's.fournisseur'=>"company");	// We define here only fields that use another picto
         if (empty($conf->fournisseur->enabled))
         {
             unset($this->export_fields_array[$r]['s.code_fournisseur']);
@@ -366,7 +366,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'socpeople as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON c.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON c.fk_pays = p.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
 		$this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')';
 
@@ -399,7 +399,7 @@ class modSociete extends DolibarrModules
 		$this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'societe');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
 			's.fk_typent'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ctypent.class.php','class'=>'Ctypent','method'=>'fetch','dict'=>'DictionaryCompanyType'),
-			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionaryCountry'),
+			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
 			's.fk_stcomm'=>array('rule'=>'zeroifnull'),
 		    's.code_client'=>array('rule'=>'getcustomercodeifauto'),
 		    's.code_fournisseur'=>array('rule'=>'getsuppliercodeifauto'),
@@ -417,7 +417,7 @@ class modSociete extends DolibarrModules
 		$this->import_icon[$r]='contact';
 		$this->import_entities_array[$r]=array('s.fk_soc'=>'company');	// We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r]=array('s'=>MAIN_DB_PREFIX.'socpeople','extra'=>MAIN_DB_PREFIX.'socpeople_extrafields');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array('s.fk_soc'=>'ThirdPartyName','s.civilite'=>'UserTitle','s.lastname'=>"Lastname*",'s.firstname'=>"Firstname",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'s.fk_pays'=>"CountryCode",'s.birthday'=>"BirthdayDate",'s.poste'=>"Role",'s.phone'=>"Phone",'s.phone_perso'=>"PhonePerso",'s.phone_mobile'=>"PhoneMobile",'s.fax'=>"Fax",'s.email'=>"Email",'s.note_private'=>"Note",'s.note_public'=>"Note",'s.datec'=>"DateCreation");
+		$this->import_fields_array[$r]=array('s.fk_soc'=>'ThirdPartyName','s.civility'=>'UserTitle','s.lastname'=>"Lastname*",'s.firstname'=>"Firstname",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'s.fk_pays'=>"CountryCode",'s.birthday'=>"BirthdayDate",'s.poste'=>"Role",'s.phone'=>"Phone",'s.phone_perso'=>"PhonePerso",'s.phone_mobile'=>"PhoneMobile",'s.fax'=>"Fax",'s.email'=>"Email",'s.note_private'=>"Note",'s.note_public'=>"Note",'s.datec'=>"DateCreation");
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity = ".$conf->entity;
 		$resql=$this->db->query($sql);
@@ -434,11 +434,11 @@ class modSociete extends DolibarrModules
 		$this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'socpeople');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
 			's.fk_soc'=>array('rule'=>'fetchidfromref','file'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'),
-			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionaryCountry'),
+			's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r]=array('s.birthday'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-		$this->import_examplevalues_array[$r]=array('s.fk_soc'=>'MyBigCompany','s.civilite'=>"MR",'s.lastname'=>"Smith",'s.firstname'=>'John','s.address'=>'61 jump street','s.zip'=>'75000','s.town'=>'Bigtown','s.fk_pays'=>'US, FR, DE...','s.datec'=>'1972-10-10','s.poste'=>"Director",'s.phone'=>"5551122",'s.phone_perso'=>"5551133",'s.phone_mobile'=>"5551144",'s.fax'=>"5551155",'s.email'=>"johnsmith@email.com",'s.note_private'=>"My private note",'s.note_public'=>"My public note");
+		$this->import_examplevalues_array[$r]=array('s.fk_soc'=>'MyBigCompany','s.civility'=>"MR",'s.lastname'=>"Smith",'s.firstname'=>'John','s.address'=>'61 jump street','s.zip'=>'75000','s.town'=>'Bigtown','s.fk_pays'=>'US, FR, DE...','s.datec'=>'1972-10-10','s.poste'=>"Director",'s.phone'=>"5551122",'s.phone_perso'=>"5551133",'s.phone_mobile'=>"5551144",'s.fax'=>"5551155",'s.email'=>"johnsmith@email.com",'s.note_private'=>"My private note",'s.note_public'=>"My public note");
 
 		// Import Bank Accounts
 		$r++;
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 8a13fff5bc9..43c7cec6fb3 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -154,7 +154,7 @@ class modStock extends DolibarrModules
 		);
 
 		$this->import_convertvalue_array[$r]=array(
-				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionaryCountry')
+				'e.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry')
 		);
 		$this->import_regex_array[$r]=array('e.statut'=>'^[0|1]');
 		$this->import_examplevalues_array[$r]=array('e.label'=>"ALM001",
diff --git a/htdocs/core/modules/modSyncSupplierWebServices.class.php b/htdocs/core/modules/modSyncSupplierWebServices.class.php
new file mode 100644
index 00000000000..c17892ee217
--- /dev/null
+++ b/htdocs/core/modules/modSyncSupplierWebServices.class.php
@@ -0,0 +1,121 @@
+<?php
+/* Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \defgroup   webservices     Module webservices
+ *      \brief      Module to enable client for supplier WebServices
+ *       \file       htdocs/core/modules/modSyncSupplierWebServices.class.php
+ *       \ingroup    webservices
+ *       \brief      File to describe client for supplier webservices module
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+/**
+ *	Class to describe a WebServices module
+ */
+class modSyncSupplierWebServices extends DolibarrModules
+{
+
+    /**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 2650;
+
+        $this->family = "technic";
+        // 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 client for external supplier web services";
+        $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 = 1;
+        // 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("webservices.php@webservices");
+
+        // 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 = 'syncsupplierwebservices';
+        $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/printsheet/doc/index.html b/htdocs/core/modules/printsheet/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/printsheet/index.html b/htdocs/core/modules/printsheet/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/product/index.html b/htdocs/core/modules/product/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 37383474c2d..5a041fd31ce 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'
 class mod_codeproduct_elephant extends ModeleProductCode
 {
 	var $nom='Elephant';				// Nom du modele
+	var $name='Elephant';				// Nom du modele
 	var $code_modifiable;				// Code modifiable
 	var $code_modifiable_invalide;		// Code modifiable si il est invalide
 	var $code_modifiable_null;			// Code modifiables si il est null
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index a3df52f682f..3b850e1ba91 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -40,6 +40,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 	 */
 
 	var $nom='Leopard';					// Nom du modele
+	var $name='Leopard';					// Nom du modele
 	var $code_modifiable;				// Code modifiable
 	var $code_modifiable_invalide;		// Code modifiable si il est invalide
 	var $code_modifiable_null;			// Code modifiables si il est null
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index e708b89b82a..0bfd3f8f03e 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -46,7 +46,7 @@ abstract class ModeleProductCode
      */
     function getNom($langs)
     {
-        return $this->nom;
+        return empty($this->name)?$this->nom:$this->name;
     }
 
 
@@ -97,6 +97,7 @@ abstract class ModeleProductCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 
@@ -146,7 +147,7 @@ abstract class ModeleProductCode
         $langs->load("admin");
 
         $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
         if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
         if ($type == 0)  $s.=$langs->trans("ProductCodeDesc").'<br>';
         if ($type == 1)  $s.=$langs->trans("ServiceCodeDesc").'<br>';
diff --git a/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
similarity index 94%
rename from htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
rename to htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 75b06755b80..f19d8a0e3a0 100644
--- a/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
+ *	\file       htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
  *	\ingroup    project
  *	\brief      File of class to build ODT documents for third parties
  */
@@ -113,7 +113,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 	{
 		global $conf;
 
-		return array(
+		$resarray=array(
 		'object_id'=>$object->id,
 		'object_ref'=>$object->ref,
 		'object_title'=>$object->title,
@@ -127,6 +127,21 @@ class doc_generic_project_odt extends ModelePDFProjects
 		'object_public'=>$object->public,
 		'object_statut'=>$object->getLibStatut()
 		);
+
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$extrafieldkey=$object->element;
+
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields = new ExtraFields($this->db);
+			$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,$outputlangs);
+		}
+
+		return $resarray;
 	}
 
 	/**
@@ -339,7 +354,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
 		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
 		$texte.= '<br></div></div>';
-		
+
 		// Scan directories
 		if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
@@ -452,7 +467,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 				// Make substitution
 				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->nom,
+				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
@@ -485,69 +500,13 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 
 				// Make substitutions into odt of user info
-				$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Make substitutions into odt of mysoc
-				$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
 
-				// Make substitutions into odt of thirdparty
-				$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-
-				// Replace tags of object + external modules
-				$tmparray=$this->get_substitutionarray_object($object,$outputlangs);
+				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
@@ -1019,6 +978,8 @@ class doc_generic_project_odt extends ModelePDFProjects
 					}
 				}
 
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
diff --git a/htdocs/core/modules/project/doc/index.html b/htdocs/core/modules/project/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
similarity index 92%
rename from htdocs/core/modules/project/pdf/pdf_baleine.modules.php
rename to htdocs/core/modules/project/doc/pdf_baleine.modules.php
index d8f2d744e78..6ce839daf99 100644
--- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/project/pdf/pdf_baleine.modules.php
+ *	\file       htdocs/core/modules/project/doc/pdf_baleine.modules.php
  *	\ingroup    project
  *	\brief      Fichier de la classe permettant de generer les projets au modele Baleine
  *	\author	    Regis Houssin
@@ -31,8 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 
 /**
- *	\class      pdf_baleine
- *	\brief      Classe permettant de generer les projets au modele Baleine
+ *	Classe permettant de generer les projets au modele Baleine
  */
 
 class pdf_baleine extends ModelePDFProjects
@@ -124,6 +123,17 @@ class pdf_baleine extends ModelePDFProjects
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
@@ -295,6 +305,18 @@ class pdf_baleine extends ModelePDFProjects
 				$pdf->Close();
 
 				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
@@ -442,7 +464,8 @@ class pdf_baleine extends ModelePDFProjects
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/project/index.html b/htdocs/core/modules/project/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index da1c914f484..49e4586d07b 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -35,11 +35,12 @@ class mod_project_simple extends ModeleNumRefProjects
 	var $prefix='PJ';
     var $error='';
 	var $nom = "Simple";
+	var $name = "Simple";
 
 
-    /** 
+    /**
      *  Return description of numbering module
-     * 
+     *
      *  @return     string      Text with description
      */
     function info()
@@ -49,9 +50,9 @@ class mod_project_simple extends ModeleNumRefProjects
     }
 
 
-    /** 
+    /**
      *  Return an example of numbering module values
-     * 
+     *
      * 	@return     string      Example
      */
     function getExample()
@@ -62,7 +63,7 @@ class mod_project_simple extends ModeleNumRefProjects
 
     /**  Test si les numeros deja en vigueur dans la base ne provoquent pas de
      *   de conflits qui empechera cette numerotation de fonctionner.
-     * 
+     *
      *   @return     boolean     false si conflit, true si ok
      */
     function canBeActivated()
@@ -97,7 +98,7 @@ class mod_project_simple extends ModeleNumRefProjects
 
    /**
 	*  Return next value
-	* 
+	*
 	*  @param   Societe	$objsoc		Object third party
 	*  @param   Project	$project	Object project
 	*  @return	string				Value if OK, 0 if KO
@@ -122,7 +123,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		}
 		else
 		{
-			dol_syslog("mod_project_simple::getNextValue sql=".$sql);
+			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
@@ -130,7 +131,7 @@ class mod_project_simple extends ModeleNumRefProjects
 
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m",$date);
-		
+
 		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
 		else $num = sprintf("%04s",$max+1);
 
@@ -139,9 +140,9 @@ class mod_project_simple extends ModeleNumRefProjects
     }
 
 
-    /** 
+    /**
      * 	Return next reference not yet used as a reference
-     * 
+     *
      *  @param	Societe	$objsoc     Object third party
      *  @param  Project	$project	Object project
      *  @return string      		Next not used reference
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 5633a61f8ac..e76ed349b46 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -33,11 +33,12 @@ class mod_project_universal extends ModeleNumRefProjects
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Universal';
+	var $name = 'Universal';
 
 
     /**
      *  Renvoi la description du modele de numerotation
-     * 
+     *
      *  @return     string      Texte descripif
      */
 	function info()
@@ -78,7 +79,7 @@ class mod_project_universal extends ModeleNumRefProjects
 
     /**
      *  Renvoi un exemple de numerotation
-     * 
+     *
      *  @return     string      Example
      */
     function getExample()
@@ -99,7 +100,7 @@ class mod_project_universal extends ModeleNumRefProjects
 
    /**
 	*  Return next value
-	* 
+	*
 	*  @param	Societe		$objsoc		Object third party
 	*  @param   Project		$project	Object project
 	*  @return  string					Value if OK, 0 if KO
@@ -126,9 +127,9 @@ class mod_project_universal extends ModeleNumRefProjects
 	}
 
 
-    /**   
+    /**
      *  Return next reference not yet used as a reference
-     * 
+     *
      *  @param	Societe		$objsoc     Object third party
      *  @param  Project		$project	Object project
      *  @return string      			Next not used reference
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 706a10fc474..54d981e51a4 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2010-2014	Regis Houssin	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014       Marcos García   <marcosgdf@gmail.com>
  *
  * 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
@@ -134,6 +135,7 @@ abstract class ModeleNumRefProjects
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -150,100 +152,10 @@ abstract class ModeleNumRefProjects
  *  @param  int			$hidedesc       Hide description
  *  @param  int			$hideref        Hide ref
  *  @return int         				0 if KO, 1 if OK
+ * @deprecated Use the new function generateDocument of Project class
  */
-function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function project_pdf_create(DoliDB $db, Project $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf,$langs;
-	$langs->load("projects");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Positionne modele sur le nom du modele de projet a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->PROJECT_ADDON_PDF))
-		{
-			$modele = $conf->global->PROJECT_ADDON_PDF;
-		}
-		else
-		{
-			$modele='baleine';
-		}
-	}
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/project/pdf/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// we delete preview files
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Success in building document. We build meta file.
-			dol_meta_create($object);
-
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('PROJECT_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"project_pdf_create Error: ".$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		return 0;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
diff --git a/htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
similarity index 89%
rename from htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
rename to htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 2c0bdc4f53b..c074cba31e5 100644
--- a/htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -1,28 +1,28 @@
 <?php
 /* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
-* Copyright (C) 2013		Florian Henry		<florian.henry@ope-concept.pro>
-*
-* 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 <http://www.gnu.org/licenses/>.
-* or see http://www.gnu.org/
-*/
+ * Copyright (C) 2013		Florian Henry		<florian.henry@ope-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
 
 /**
- *	\file       htdocs/core/modules/project/task/pdf/doc_generic_task_odt.modules.php
+ *	\file       htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
  *	\ingroup    project
  *	\brief      File of class to build ODT documents for third parties
-*/
+ */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
@@ -114,7 +114,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	{
 		global $conf;
 
-		return array(
+		$resarray=array(
 		'object_id'=>$object->id,
 		'object_ref'=>$object->ref,
 		'object_title'=>$object->title,
@@ -128,6 +128,21 @@ class doc_generic_task_odt extends ModelePDFTask
 		'object_public'=>$object->public,
 		'object_statut'=>$object->getLibStatut()
 		);
+
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$extrafieldkey=$object->element;
+
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields = new ExtraFields($this->db);
+			$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,$outputlangs);
+		}
+
+		return $resarray;
 	}
 
 	/**
@@ -304,7 +319,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		$texte = $this->description.".<br>\n";
 		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptionsTask">';
+		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte.= '<input type="hidden" name="param1" value="PROJECT_TASK_ADDON_PDF_ODT_PATH">';
 		$texte.= '<table class="nobordernopadding" width="100%">';
 
@@ -367,7 +382,7 @@ class doc_generic_task_odt extends ModelePDFTask
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $user,$langs,$conf,$mysoc,$hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -438,7 +453,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 				// Make substitution
 				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->nom,
+				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
@@ -471,70 +486,13 @@ class doc_generic_task_odt extends ModelePDFTask
 
 
 				// Make substitutions into odt of user info
-				$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Make substitutions into odt of mysoc
-				$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_objet=$this->get_substitutionarray_object($project,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
 
-				// Make substitutions into odt of thirdparty
-				$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-
-				// Replace tags of object + external modules
-				$tmparray=$this->get_substitutionarray_object($project,$outputlangs);
+				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				foreach($tmparray as $key=>$value)
 				{
@@ -816,8 +774,30 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 
 
+				// Call the beforeODTSave hook
+				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+
 				// Write new file
-				$odfHandler->saveToDisk($file);
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+				else {
+					try {
+						$odfHandler->saveToDisk($file);
+					}catch (Exception $e){
+						$this->error=$e->getMessage();
+						return -1;
+					}
+				}
+
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
 				if (! empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
diff --git a/htdocs/core/modules/project/task/doc/index.html b/htdocs/core/modules/project/task/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/project/task/index.html b/htdocs/core/modules/project/task/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index afc17d663c0..0e7b416d72e 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -35,11 +35,12 @@ class mod_task_simple extends ModeleNumRefTask
 	var $prefix='TK';
     var $error='';
 	var $nom = "Simple";
+	var $name = "Simple";
 
 
-    /** 
+    /**
      *  Return description of numbering module
-     * 
+     *
      *  @return     string      Text with description
      */
     function info()
@@ -49,9 +50,9 @@ class mod_task_simple extends ModeleNumRefTask
     }
 
 
-    /** 
+    /**
      *  Return an example of numbering module values
-     * 
+     *
      * 	@return     string      Example
      */
     function getExample()
@@ -62,7 +63,7 @@ class mod_task_simple extends ModeleNumRefTask
 
     /**  Test si les numeros deja en vigueur dans la base ne provoquent pas de
      *   de conflits qui empechera cette numerotation de fonctionner.
-     * 
+     *
      *   @return     boolean     false si conflit, true si ok
      */
     function canBeActivated()
@@ -98,7 +99,7 @@ class mod_task_simple extends ModeleNumRefTask
 
    /**
 	*  Return next value
-	* 
+	*
 	*  @param   Societe	$objsoc		Object third party
 	*  @param   Task	$task		Object Task
 	*  @return	string				Value if OK, 0 if KO
@@ -122,7 +123,7 @@ class mod_task_simple extends ModeleNumRefTask
 		}
 		else
 		{
-			dol_syslog("mod_task_simple::getNextValue sql=".$sql);
+			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
@@ -130,7 +131,7 @@ class mod_task_simple extends ModeleNumRefTask
 
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m",$date);
-		
+
 		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
 		else $num = sprintf("%04s",$max+1);
 
@@ -139,9 +140,9 @@ class mod_task_simple extends ModeleNumRefTask
     }
 
 
-    /** 
+    /**
      * 	Return next reference not yet used as a reference
-     * 
+     *
      *  @param	Societe	$objsoc     Object third party
      *  @param  Task	$task		Object task
      *  @return string      		Next not used reference
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 1e99f904116..529814079c1 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -33,11 +33,12 @@ class mod_task_universal extends ModeleNumRefTask
 	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Universal';
+	var $name = 'Universal';
 
 
     /**
      *  Renvoi la description du modele de numerotation
-     * 
+     *
      *  @return     string      Texte descripif
      */
 	function info()
@@ -78,7 +79,7 @@ class mod_task_universal extends ModeleNumRefTask
 
     /**
      *  Renvoi un exemple de numerotation
-     * 
+     *
      *  @return     string      Example
      */
     function getExample()
@@ -99,7 +100,7 @@ class mod_task_universal extends ModeleNumRefTask
 
    /**
 	*  Return next value
-	* 
+	*
 	*  @param	Societe		$objsoc		Object third party
 	*  @param   Project		$project	Object project
 	*  @return  string					Value if OK, 0 if KO
@@ -126,9 +127,9 @@ class mod_task_universal extends ModeleNumRefTask
 	}
 
 
-    /**   
+    /**
      *  Return next reference not yet used as a reference
-     * 
+     *
      *  @param	Societe		$objsoc     Object third party
      *  @param  Project		$project	Object project
      *  @return string      			Next not used reference
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 8aacc535b7e..f861b1bf002 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010 Regis Houssin  <regis.houssin@capnetworks.com>
  * Copyright (C) 2010 Florian Henry  <florian.henry<àopen-concept.pro>
+ * Copyright (C) 2014 Marcos García  <marcosgdf@gmail.com>
  *
  * 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
@@ -152,99 +153,10 @@ abstract class ModeleNumRefTask
  *  @param  int			$hideref        Hide ref
  *  @param  HookManager	$hookmanager	Hook manager instance
  *  @return int         				0 if KO, 1 if OK
+ * @deprecated Use the new function generateDocument of Task class
  */
-function task_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function task_pdf_create(DoliDB $db, Task $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
 {
-	global $conf,$langs;
-	$langs->load("projects");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Positionne modele sur le nom du modele de projet a utiliser
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->PROJECT_TASK_ADDON_PDF))
-		{
-			$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
-		}
-		else
-		{
-			$modele='nodefault';
-		}
-	}
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/project/task/pdf/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// we delete preview files
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Success in building document. We build meta file.
-			dol_meta_create($object);
-
-			// Appel des triggers
-			/*include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('PROJECT_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }*/
-			// Fin appel triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"task_pdf_create Error: ".$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		return 0;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
 }
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 9b03ecd1070..8f79094befc 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -311,7 +311,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 				// Make substitution
 				$substitutionarray=array(
-				'__FROM_NAME__' => $this->emetteur->nom,
+				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
 				'__TOTAL_HT__' => $object->total_ht,
@@ -363,70 +363,14 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				{
 				}
 
-				// Make substitutions into odt of user info
-				$tmparray=$this->get_substitutionarray_user($user,$outputlangs);
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key)) // Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Make substitutions into odt of mysoc
-				$tmparray=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
-				//var_dump($tmparray); exit;
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Make substitutions into odt of thirdparty
-				$tmparray=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
-				foreach($tmparray as $key=>$value)
-				{
-					try {
-						if (preg_match('/logo$/',$key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
-						{
-							$odfHandler->setVars($key, $value, true, 'UTF-8');
-						}
-					}
-					catch(OdfException $e)
-					{
-					}
-				}
-				// Replace tags of object + external modules
-				$tmparray=$this->get_substitutionarray_object($object,$outputlangs);
-				//print_r($tmparray); exit;
+				// Make substitutions into odt
+				$array_user=$this->get_substitutionarray_user($user,$outputlangs);
+				$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
+				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
+				$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
+				$array_other=$this->get_substitutionarray_other($outputlangs);
+
+				$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 				// Call the ODTSubstitution hook
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
@@ -517,6 +461,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					}
 				}
 
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				if (! empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
diff --git a/htdocs/core/modules/propale/doc/index.html b/htdocs/core/modules/propale/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index d7d4b3150cf..35953b8521f 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Raphael Bertrand     <raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2013 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -205,13 +205,24 @@ class pdf_azur extends ModelePDFPropales
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 					return 0;
 				}
 			}
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				// Create pdf instance
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
@@ -372,6 +383,7 @@ class pdf_azur extends ModelePDFPropales
 
 						$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 == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
@@ -458,7 +470,7 @@ class pdf_azur extends ModelePDFPropales
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
 					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
 					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
@@ -540,12 +552,11 @@ class pdf_azur extends ModelePDFPropales
 				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Affiche zone totaux
-				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 				$posy=$this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
 				/*
-				if ($deja_regle)
+				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
 				{
 					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
 				}
@@ -718,20 +729,22 @@ class pdf_azur extends ModelePDFPropales
 				// Si mode reglement non force ou si force a CHQ
 				if (! empty($conf->global->FACTURE_CHQ_NUMBER))
 				{
+					$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+
 					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
 					{
 						$account = new Account($this->db);
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - 3);
+						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
 						$posy=$pdf->GetY()+1;
 
 			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 			            {
 							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - 3);
+							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy=$pdf->GetY()+2;
 			            }
@@ -739,14 +752,14 @@ class pdf_azur extends ModelePDFPropales
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 					{
 						$pdf->SetXY($this->marge_gauche, $posy);
-						$pdf->SetFont('','B', $default_font_size - 3);
+						$pdf->SetFont('','B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
 						$posy=$pdf->GetY()+1;
 
 			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 			            {
 							$pdf->SetXY($this->marge_gauche, $posy);
-							$pdf->SetFont('','', $default_font_size - 3);
+							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
 							$posy=$pdf->GetY()+2;
 			            }
@@ -757,10 +770,11 @@ class pdf_azur extends ModelePDFPropales
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (! empty($conf->global->FACTURE_RIB_NUMBER))
+				if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
 				{
+					$bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
 					$account = new Account($this->db);
-					$account->fetch($conf->global->FACTURE_RIB_NUMBER);
+					$account->fetch($bankid);
 
 					$curx=$this->marge_gauche;
 					$cury=$posy;
@@ -960,6 +974,7 @@ class pdf_azur extends ModelePDFPropales
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
+						    // retrieve global local tax
 							if ($tvakey != 0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
@@ -1080,7 +1095,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 6, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128,128,128);
@@ -1091,7 +1106,7 @@ class pdf_azur extends ModelePDFPropales
 
 		if (empty($hidetop))
 		{
-			$pdf->line($this->marge_gauche, $tab_top+6, $this->page_largeur-$this->marge_droite, $tab_top+6);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
 
 			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
 			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
@@ -1224,11 +1239,11 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
 
 		$posy+=1;
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('','', $default_font_size - 2);
 
 		if ($object->ref_client)
 		{
-			$posy+=5;
+			$posy+=4;
 			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
@@ -1313,12 +1328,12 @@ class pdf_azur extends ModelePDFPropales
 			{
 				// 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->nom;
+				else $socname = $object->client->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
@@ -1362,7 +1377,8 @@ class pdf_azur extends ModelePDFPropales
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'PROPALE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'PROPALE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/propale/index.html b/htdocs/core/modules/propale/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index aa2959691e6..28260de97d8 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -26,8 +26,8 @@
 require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php';
 
 
-/**	    \class      mod_propale_marbre
- *		\brief      Class to manage customer order numbering rules Marbre
+/**
+ *	Class to manage customer order numbering rules Marbre
  */
 class mod_propale_marbre extends ModeleNumRefPropales
 {
@@ -124,7 +124,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		}
 		else
 		{
-			dol_syslog("mod_propale_marbre::getNextValue sql=".$sql);
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
@@ -134,7 +134,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
 		else $num = sprintf("%04s",$max+1);
 
-		dol_syslog("mod_propale_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
+		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
 
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 5838000382c..503d8754684 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -29,8 +29,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/propale/modules_propale.php';
 
 
 /**
- * \class      mod_propale_saphir
- * \brief      Class of file that contains the numbering module rules Saphir
+ * Class of file that contains the numbering module rules Saphir
  */
 class mod_propale_saphir extends ModeleNumRefPropales
 {
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index 8e45f3b86f2..9b0cc1d82a2 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -138,6 +139,7 @@ abstract class ModeleNumRefPropales
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -154,102 +156,10 @@ abstract class ModeleNumRefPropales
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
  * 	@return     int         				0 if KO, 1 if OK
+ * @deprecated Use the new function generateDocument of Propal class
  */
-function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function propale_pdf_create(DoliDB $db, Propal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf,$user,$langs;
-	$langs->load("propale");
-
-	$error=0;
-
-	$srctemplatepath='';
-
-	// Positionne le modele sur le nom du modele a utiliser
-	if (! dol_strlen($modele))
-	{
-	    if (! empty($conf->global->PROPALE_ADDON_PDF))
-	    {
-	        $modele = $conf->global->PROPALE_ADDON_PDF;
-	    }
-	    else
-	    {
-	        $modele = 'azur';
-	    }
-	}
-
-    // If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-    	foreach(array('doc','pdf') as $prefix)
-    	{
-    	    $file = $prefix."_".$modele.".modules.php";
-
-    		// On verifie l'emplacement du modele
-	        $file=dol_buildpath($reldir."core/modules/propale/doc/".$file,0);
-    		if (file_exists($file))
-    		{
-    			$filefound=1;
-    			$classname=$prefix.'_'.$modele;
-    			break;
-    		}
-    	}
-    	if ($filefound) break;
-    }
-
-	// Charge le modele
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db);
-		//$obj->message = $message;
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// We delete old preview
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Success in building document. We build meta file.
-			dol_meta_create($object);
-
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('PROPAL_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $obj->errors=$interface->errors; }
-			// Fin appel triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_print_error($db,"propal_pdf_create Error: ".$obj->error);
-			return -1;
-		}
-
-	}
-	else
-	{
-		dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file));
-		return -1;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
diff --git a/htdocs/core/modules/rapport/index.html b/htdocs/core/modules/rapport/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 3bfb6f6b60c..63be8703a22 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -119,6 +119,17 @@ class pdf_paiement
 		$year = sprintf("%04d",$year);
 		$file = $dir . "/payments-".$year."-".$month.".pdf";
 
+		// Add pdfgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('pdfgeneration'));
+		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		global $action;
+		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
         $pdf=pdf_getInstance($this->format);
         $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
 
@@ -156,7 +167,7 @@ class pdf_paiement
 		if (! empty($socid)) $sql .= " AND s.rowid = ".$socid;
 		$sql.= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
 
-		dol_syslog(get_class($this)."::write_file sql=".$sql);
+		dol_syslog(get_class($this)."::write_file", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -228,6 +239,18 @@ class pdf_paiement
 		$pdf->Close();
 
 		$pdf->Output($file,'F');
+
+		// Add pdfgeneration hook
+		if (! is_object($hookmanager))
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('pdfgeneration'));
+		$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+		global $action;
+		$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 		if (! empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
diff --git a/htdocs/core/modules/security/generate/index.html b/htdocs/core/modules/security/generate/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
new file mode 100644
index 00000000000..7440a357ea8
--- /dev/null
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -0,0 +1,219 @@
+<?php
+/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+ *      \ingroup    core
+ *      \brief      File to manage no password generation.
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/modules/security/generate/modules_genpassword.php';
+
+
+/**
+ *	    \class      modGeneratePassPerso
+ *		\brief      Class to generate a password according to personal rules
+ */
+class modGeneratePassPerso extends ModeleGenPassword
+{
+	var $id;
+	var $length;
+	var $length2; // didn't overright display
+	var $NbMaj;
+	var $NbNum;
+	var $NbSpe;
+	var $NbRepeat;
+	var $WithoutAmbi;
+
+	var $db;
+	var $conf;
+	var $lang;
+	var $user;
+
+	var $Maj;
+	var $Min;
+	var $Nb;
+	var $Spe;
+	var $Ambi;
+	var $All;
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db			Database handler
+	 *	@param		Conf		$conf		Handler de conf
+	 *	@param		Translate	$langs		Handler de langue
+	 *	@param		User		$user		Handler du user connecte
+	 */
+	function __construct($db, $conf, $langs, $user)
+	{
+		$this->id = "Perso";
+		$this->length = $langs->trans("SetupPerso");
+
+		$this->db=$db;
+		$this->conf=$conf;
+		$this->langs=$langs;
+		$this->user=$user;
+
+		if(empty($conf->global->USER_PASSWORD_PATTERN)){
+			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
+			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1','chaine',0,'',$conf->entity);
+		}
+
+		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+		$this->Min = strtolower($this->Maj);
+		$this->Nb = "0123456789";
+		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
+		$this->Ambi = array("1","I","l","|","O","0");
+
+		$tabConf = explode(";",$conf->global->USER_PASSWORD_PATTERN);
+		$this->length2 = $tabConf[0];
+		$this->NbMaj = $tabConf[1];
+		$this->NbNum = $tabConf[2];
+		$this->NbSpe = $tabConf[3];
+		$this->NbRepeat = $tabConf[4];
+		$this->WithoutAmbi = $tabConf[5];
+
+		if ($this->WithoutAmbi)
+		{
+			$this->Maj = str_replace($this->Ambi,"",$this->Maj);
+			$this->Min = str_replace($this->Ambi,"",$this->Min);
+			$this->Nb  = str_replace($this->Ambi,"",$this->Nb);
+			$this->Spe = str_replace($this->Ambi,"",$this->Spe);
+		}
+
+		$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe);
+		//$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe;
+		//$this->All =  $this->Spe;
+
+	}
+
+	/**
+	 *		Return description of module
+	 *
+	 *      @return     string      Description of text
+	 */
+	function getDescription()
+	{
+		global $langs;
+		return $langs->trans("PasswordGenerationPerso");
+	}
+
+	/**
+	 * 		Return an example of password generated by this module
+	 *
+	 *      @return     string      Example of password
+	 */
+	function getExample()
+	{
+		return $this->getNewGeneratedPassword();
+	}
+
+	/**
+	 * 		Build new password
+	 *
+	 *      @return     string      Return a new generated password
+	 */
+	function getNewGeneratedPassword()
+	{
+		$pass = "";
+		for($i=0; $i<$this->NbMaj; $i++){ // Y
+			$pass .= $this->Maj[rand(0,strlen($this->Maj) - 1)];
+		}
+
+		for($i=0; $i<$this->NbNum; $i++){ // X
+			$pass .= $this->Nb[rand(0,strlen($this->Nb) - 1)];
+		}
+
+		for($i=0; $i<$this->NbSpe; $i++){ // @
+			$pass .= $this->Spe[rand(0,strlen($this->Spe) - 1)];
+		}
+
+		for($i=strlen($pass);$i<$this->length2; $i++){ // y
+			$pass .= $this->All[rand(0,strlen($this->All) -1)];
+		}
+
+		$pass = str_shuffle($pass);
+
+		if ($this->validatePassword($pass))
+		{
+			return $pass;
+		}
+
+		return $this->getNewGeneratedPassword();
+	}
+
+	/**
+	 * 		Validate a password
+	 *
+	 *		@param		string	$password	Password to check
+	 *      @return     int					0 if KO, >0 if OK
+	 */
+	function validatePassword($password)
+	{
+		$password_a = str_split($password);
+		$maj = str_split($this->Maj);
+		$num = str_split($this->Nb);
+		$spe = str_split($this->Spe);
+
+		if(count(array_intersect($password_a, $maj)) < $this->NbMaj){
+			return 0;
+		}
+
+		if(count(array_intersect($password_a, $num)) < $this->NbNum){
+			return 0;
+		}
+
+		if(count(array_intersect($password_a, $spe)) < $this->NbSpe){
+			return 0;
+		}
+
+		if(!$this->consecutiveInterationSameCharacter($password)){
+			return 0;
+		}
+
+		return 1;
+	}
+
+	/**
+	 * 		consecutive iterations of the same character
+	 *
+	 *		@param		string	$password	Password to check
+	 *      @return     int					0 if KO, >0 if OK
+	 */
+	function consecutiveInterationSameCharacter($password){
+		$last = "";
+		$count = 0;
+		$char = str_split($password);
+		foreach($char as $c){
+			if($c != $last){
+				$last = $c;
+				$count = 0;
+			}else{
+				$count++;
+			}
+
+			if($count >= $this->NbRepeat) {
+				return 0;
+			}
+		}
+		return 1;
+	}
+}
+
diff --git a/htdocs/core/modules/security/index.html b/htdocs/core/modules/security/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 323f54b1630..90ced6322b7 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -302,7 +302,6 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
                 $sql .= " WHERE p.fk_soc = ".$object->id;
 
-                dol_syslog('doc_generic_odt :: sql='.$sql,LOG_DEBUG);
                 $result = $this->db->query($sql);
                 $num = $this->db->num_rows($result);
 
@@ -417,6 +416,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 					}
 				}
 
+				$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				
 				if (! empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
diff --git a/htdocs/core/modules/societe/doc/index.html b/htdocs/core/modules/societe/doc/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/societe/index.html b/htdocs/core/modules/societe/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 88b6e65bf01..c24070c2e23 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -30,12 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
 
 
 /**
- *       \class 		mod_codeclient_elephant
- *       \brief 		Class to manage third party code with elephant rule
+ *	Class to manage third party code with elephant rule
  */
 class mod_codeclient_elephant extends ModeleThirdPartyCode
 {
 	var $nom='Elephant';				// Nom du modele
+	var $name='Elephant';				// Nom du modele
 	var $code_modifiable;				// Code modifiable
 	var $code_modifiable_invalide;		// Code modifiable si il est invalide
 	var $code_modifiable_null;			// Code modifiables si il est null
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 27155847bf0..94c9c04d2e2 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -39,6 +39,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 	 */
 
 	var $nom='Leopard';					// Nom du modele
+	var $name='Leopard';				// Nom du modele
 	var $code_modifiable;				// Code modifiable
 	var $code_modifiable_invalide;		// Code modifiable si il est invalide
 	var $code_modifiable_null;			// Code modifiables si il est null
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 2933a09de8e..88ec1a6e8db 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -28,12 +28,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
 
 
 /**
- *	\class 		mod_codeclient_monkey
- *	\brief 		Classe permettant la gestion monkey des codes tiers
+ *	Classe permettant la gestion monkey des codes tiers
  */
 class mod_codeclient_monkey extends ModeleThirdPartyCode
 {
 	var $nom='Monkey';					// Nom du modele
+	var $name='Monkey';					// Nom du modele
 	var $code_modifiable;				// Code modifiable
 	var $code_modifiable_invalide;		// Code modifiable si il est invalide
 	var $code_modifiable_null;			// Code modifiables si il est null
@@ -52,6 +52,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 	function __construct()
 	{
 		$this->nom = "Monkey";
+		$this->name = "Monkey";
 		$this->version = "dolibarr";
 		$this->code_null = 1;
 		$this->code_modifiable = 1;
@@ -124,6 +125,8 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		$sql.= " WHERE ".$field." LIKE '".$prefix."____-%'";
 		$sql.= " AND entity IN (".getEntity('societe', 1).")";
 
+		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+
 		$resql=$db->query($sql);
 		if ($resql)
 		{
@@ -133,7 +136,6 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		}
 		else
 		{
-			dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
 			return -1;
 		}
 
@@ -225,7 +227,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		$sql.= " AND entity IN (".getEntity('societe', 1).")";
 		if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
 
-		dol_syslog(get_class($this)."::verif_dispo sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
 		$resql=$db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index a191c727ebf..1efc062ab2c 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -32,7 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
 class mod_codecompta_aquarium extends ModeleAccountancyCode
 {
 	var $nom='Aquarium';
-    var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
+	var $name='Aquarium';
+	var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
 
 	var	$prefixcustomeraccountancycode;
 	var	$prefixsupplieraccountancycode;
@@ -73,7 +74,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$texte.= '<table class="nobordernopadding" width="100%">';
 		$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
 		$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
-		$texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->nom,$s1,$s2)."<br>\n";
+		$texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->name,$s1,$s2)."<br>\n";
 		$texte.= '</td>';
 		$texte.= '<td align="left">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
         $texte.= '</tr></table>';
@@ -109,7 +110,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$i = 0;
 		$this->db = $db;
 
-		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->nom)?$societe->nom:''));
+		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
 
 		// Regle gestion compte compta
 		$codetouse='';
@@ -178,7 +179,6 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		else
 		{
 			$this->error=$db->error()." sql=".$sql;
-			dol_syslog("mod_codecompta_aquarium::verif error".$this->error, LOG_ERR);
 			return -1;		// Erreur
 		}
 	}
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index b2240f7a9fc..15099eb0538 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -26,13 +26,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
 
 
 /**
- *      \class 		mod_codecompta_panicum
- *		\brief 		Class to manage accountancy code of thirdparties with Panicum rules
+ *		Class to manage accountancy code of thirdparties with Panicum rules
  */
 class mod_codecompta_panicum extends ModeleAccountancyCode
 {
 	var $nom='Panicum';
-    var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
+	var $name='Panicum';
+	var $version='dolibarr';        // 'development', 'experimental', 'dolibarr'
 
 
 	/**
@@ -51,7 +51,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 	 */
 	function info($langs)
 	{
-		return $langs->trans("ModuleCompanyCode".$this->nom);
+		return $langs->trans("ModuleCompanyCode".$this->name);
 	}
 
 	/**
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 3bff1f41985..f1fc05d29db 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -134,6 +134,7 @@ abstract class ModeleThirdPartyCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 
@@ -183,7 +184,7 @@ abstract class ModeleThirdPartyCode
         $langs->load("admin");
 
         $s='';
-        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+        if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
         if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
         if ($type == 0)  $s.=$langs->trans("CustomerCodeDesc").'<br>';
         if ($type == 1)  $s.=$langs->trans("SupplierCodeDesc").'<br>';
@@ -303,6 +304,7 @@ abstract class ModeleAccountancyCode
         if ($this->version == 'development') return $langs->trans("VersionDevelopment");
         if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
         if ($this->version == 'dolibarr') return DOL_VERSION;
+        if ($this->version) return $this->version;
         return $langs->trans("NotAvailable");
     }
 
@@ -420,15 +422,6 @@ function thirdparty_doc_create($db, $object, $message, $modele, $outputlangs)
         {
             $outputlangs->charset_output=$sav_charset_output;
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($db);
-            $result=$interface->run_triggers('COMPANY_BUILDDOC',$object,$user,$langs,$conf);
-            if ($result < 0) {
-            	$error++; $obj->errors=$interface->errors;
-            }
-            // Fin appel triggers
-
             return 1;
         }
         else
diff --git a/htdocs/core/modules/supplier_invoice/index.html b/htdocs/core/modules/supplier_invoice/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 049c312e1ef..ea0456bc3ff 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -118,7 +118,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         $sql.= " AND entity = ".$conf->entity;
 
         $resql=$db->query($sql);
-        dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+        dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
         if ($resql)
         {
         	$obj = $db->fetch_object($resql);
@@ -127,7 +127,6 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         }
         else
         {
-        	dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
         	return -1;
         }
 
@@ -142,7 +141,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	$sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
         	$sql.= " AND entity = ".$conf->entity;
 
-        	dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+        	dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
         	$resql=$db->query($sql);
         	if ($resql)
         	{
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index fef936cb100..51eb675057e 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010	Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2012	Regis Houssin	<regis.houssin@capnetworks.com>
  * Copyright (C) 2013   Philippe Grand  <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014   Marcos García   <marcosgdf@gmail.com>
  *
  * 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
@@ -127,6 +128,7 @@ abstract class ModeleNumRefSuppliersInvoices
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -142,112 +144,10 @@ abstract class ModeleNumRefSuppliersInvoices
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
  *  @return     int         				0 if KO, 1 if OK
+ *
  */
 function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf, $user, $langs;
-
-	$langs->load("suppliers");
-
-	$error=0;
-
-	// Increase limit for PDF build
-    $err=error_reporting();
-    error_reporting(0);
-    @set_time_limit(120);
-    error_reporting($err);
-
-    $srctemplatepath='';
-
-	// Set the model on the model name to use
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
-		{
-			$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
-		}
-		else
-		{
-		    $modele = 'canelle';
-		}
-	}
-
-    // If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-    if (! empty($tmp[1]))
-    {
-        $modele=$tmp[0];
-        $srctemplatepath=$tmp[1];
-    }
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-		foreach(array('doc','pdf') as $prefix)
-		{
-			$file = $prefix."_".$modele.".modules.php";
-
-			// We checked the location of the model
-			$file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/".$file,0);
-			if (file_exists($file))
-			{
-				$filefound=1;
-				$classname=$prefix.'_'.$modele;
-				break;
-			}
-		}
-		if ($filefound) break;
-	}
-
-	// Load the model
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db,$object);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// we delete preview files
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Calls triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('BILL_SUPPLIER_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { $error++; $obj->errors=$interface->errors; }
-			// End calls triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_syslog("Erreur dans supplier_invoice_pdf_create");
-			dol_print_error($db,$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		if (! $conf->global->INVOICE_SUPPLIER_ADDON_PDF)
-		{
-			print $langs->trans("Error")." ".$langs->trans("Error_INVOICE_SUPPLIER_ADDON_PDF_NotDefined");
-		}
-		else
-		{
-			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		}
-		return 0;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
diff --git a/htdocs/core/modules/supplier_invoice/pdf/index.html b/htdocs/core/modules/supplier_invoice/pdf/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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 4124d4745f6..6b57b961da4 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -58,9 +58,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *	Constructor
 	 *
 	 *  @param	DoliDB		$db     	Database handler
-	 *  @param	Object		$object		Supplier invoice
 	 */
-	function __construct($db,$object)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
@@ -91,12 +90,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		$this->franchise=!$mysoc->tva_assuj;
 
-        // Get source company
-        if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
-        if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc;	// If fetch_thirdparty fails, object has no socid (specimen)
-        $this->emetteur=$object->thirdparty;
-        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
-
         // Defini position des colonnes
 		$this->posxdesc=$this->marge_gauche+1;
 		$this->posxtva=112;
@@ -139,6 +132,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	{
 		global $user,$langs,$conf,$mysoc,$hookmanager;
 
+		// Get source company
+		if (! is_object($object->thirdparty)) $object->fetch_thirdparty();
+		if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc;	// If fetch_thirdparty fails, object has no socid (specimen)
+		$this->emetteur=$object->thirdparty;
+		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
@@ -184,6 +183,17 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$nblignes = count($object->lines);
 
                 $pdf=pdf_getInstance($this->format);
@@ -861,7 +871,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog($this->db,$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -1006,12 +1015,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			{
 				// 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 = $mysoc->nom;
+				else $socname = $mysoc->name;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);
 			}
 			else
 			{
-				$carac_client_name=$outputlangs->convToOutputCharset($mysoc->nom);
+				$carac_client_name=$outputlangs->convToOutputCharset($mysoc->name);
 			}
 
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target');
@@ -1053,7 +1062,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 */
 	function _pagefoot(&$pdf, $object, $outputlangs,$hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/supplier_order/index.html b/htdocs/core/modules/supplier_order/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index f7e6b75adc2..bc544363b39 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2011-2013 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -120,7 +121,7 @@ abstract class ModeleNumRefSuppliersOrders
 		return $langs->trans("NotAvailable");
 	}
 
-	/**   Returns version of the numbering model 
+	/**   Returns version of the numbering model
 	 *
 	 *    @return     string      Value
 	 */
@@ -132,6 +133,7 @@ abstract class ModeleNumRefSuppliersOrders
 		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
 		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
 		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -148,113 +150,10 @@ abstract class ModeleNumRefSuppliersOrders
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
  *  @return     int          				0 if KO, 1 if OK
+ * @deprecated Use the new function generateDocument of CommandeFournisseur class
  */
-function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
+function supplier_order_pdf_create(DoliDB $db, CommandeFournisseur $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf, $user, $langs;
-	$langs->load("suppliers");
-
-	$error=0;
-
-	// Increase limit for PDF build
-	$err=error_reporting();
-	error_reporting(0);
-	@set_time_limit(120);
-	error_reporting($err);
-
-	$srctemplatepath='';
-
-	// Sets the model on the model name to use
-	if (! dol_strlen($modele))
-	{
-		if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF))
-		{
-			$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
-		}
-		else
-		{
-			$modele = 'muscadet';
-		}
-	}
-
-	// If selected model is a filename template (then $modele="modelname:filename")
-	$tmp=explode(':',$modele,2);
-	if (! empty($tmp[1]))
-	{
-		$modele=$tmp[0];
-		$srctemplatepath=$tmp[1];
-	}
-
-	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels,$conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
-	{
-		foreach(array('doc','pdf') as $prefix)
-		{
-			$file = $prefix."_".$modele.".modules.php";
-
-			// We check the model location 
-			$file=dol_buildpath($reldir."core/modules/supplier_order/pdf/".$file,0);
-			if (file_exists($file))
-			{
-				$filefound=1;
-				$classname=$prefix.'_'.$modele;
-				break;
-			}
-		}
-		if ($filefound) break;
-	}
-
-	// Load the model
-	if ($filefound)
-	{
-		require_once $file;
-
-		$obj = new $classname($db,$object);
-
-		// We save charset_output to restore it because write_file can change it if needed for
-		// output format that does not support UTF8.
-		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-
-			// we delete preview files
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			// Calls triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('ORDER_SUPPLIER_BUILDDOC',$object,$user,$langs,$conf);
-			if ($result < 0) { 
-				$error++; $obj->errors=$interface->errors;
-			}
-			// End calls triggers
-
-			return 1;
-		}
-		else
-		{
-			$outputlangs->charset_output=$sav_charset_output;
-			dol_syslog("Erreur dans supplier_order_pdf_create");
-			dol_print_error($db,$obj->error);
-			return 0;
-		}
-	}
-	else
-	{
-		if (! $conf->global->COMMANDE_SUPPLIER_ADDON_PDF)
-		{
-			print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_SUPPLIER_ADDON_PDF_NotDefined");
-		}
-		else
-		{
-			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file);
-		}
-		return 0;
-	}
+	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 }
 
diff --git a/htdocs/core/modules/supplier_order/pdf/index.html b/htdocs/core/modules/supplier_order/pdf/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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 83d1aac952b..29bd483b39b 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
- * Copyright (C) 2010-2013 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  *
  * 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
@@ -61,9 +61,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *	Constructor
 	 *
 	 *  @param	DoliDB		$db      	Database handler
-	 *  @param	Object		$object		Supplier order
 	 */
-	function __construct($db,$object)
+	function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
@@ -192,6 +191,17 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			if (file_exists($dir))
 			{
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
 				$nblignes = count($object->lines);
 
                 $pdf=pdf_getInstance($this->format);
@@ -393,7 +403,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
 					&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
 					{
-						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc,$object->thirdparty);
 						$localtax1_type = $localtaxtmp_array[0];
 						$localtax2_type = $localtaxtmp_array[2];
 					}
@@ -490,7 +500,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				$pdf->Output($file,'F');
 
-
 				// Add pdfgeneration hook
 				$hookmanager->initHooks(array('pdfgeneration'));
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
@@ -698,7 +707,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
     			//Local tax 1
-			    foreach( $this->localtax1 as $tvakey => $tvaval )
+			foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+			{
+				if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+				foreach( $localtax_rate as $tvakey => $tvaval )
 				{
 					if ($tvakey != 0)    // On affiche pas taux 0
 					{
@@ -718,15 +731,19 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 					}
 				}
-			//}
+			}
 
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
     			//Local tax 2
-			    foreach( $this->localtax2 as $tvakey => $tvaval )
+			foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+			{
+				if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+				foreach( $localtax_rate as $tvakey => $tvaval )
 				{
 					if ($tvakey != 0)    // On affiche pas taux 0
 					{
@@ -749,7 +766,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
 					}
 				}
-			//}
+			}
 		}
 
 		// Total TTC
@@ -1097,7 +1114,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 */
 	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext=0)
 	{
-		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_ORDER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+		$showdetails=0;
+		return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_ORDER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 
 }
diff --git a/htdocs/core/modules/syslog/index.html b/htdocs/core/modules/syslog/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/syslog/logHandlerInterface.php b/htdocs/core/modules/syslog/logHandlerInterface.php
index 7b5a4aa1bdd..47807d8f8f6 100644
--- a/htdocs/core/modules/syslog/logHandlerInterface.php
+++ b/htdocs/core/modules/syslog/logHandlerInterface.php
@@ -44,7 +44,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/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index ddb30df4e45..331b7331194 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -49,7 +49,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	 */
 	public function isActive()
 	{
-		return 1;
+		return true;
 	}
 
 	/**
diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
index 8ff2a52fa05..31a3fb13431 100644
--- a/htdocs/core/modules/syslog/mod_syslog_firephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php
@@ -53,7 +53,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 		    restore_include_path();
 		    if ($res)
 		    {
-		        return 1;
+		        return true;
 		    }
 		}
 		catch(Exception $e)
@@ -61,7 +61,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
 		    print '<!-- FirePHP not available into PHP -->'."\n";
 		}
 
-		return -1;
+		return false;
 	}
 
 	///**
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 9b0d854e2e8..58ac241695c 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -47,12 +47,9 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	public function isActive()
 	{
 		// This function does not exists on some ISP (Ex: Free in France)
-		if (!function_exists('openlog'))
-		{
-			return 0;
-		}
+		if (!function_exists('openlog')) return false;
 
-		return 1;
+		return true;
 	}
 
 	/**
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index c83fdafcf7e..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/liste.php', DOL_URL_ROOT.'/product/liste.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++;
 }
 
@@ -93,14 +93,14 @@ if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! em
 	&& ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
 {
 	$langs->load("products");
-	$searchform.=printSearchForm(DOL_URL_ROOT.'/fourn/product/liste.php', DOL_URL_ROOT.'/fourn/product/liste.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');
 	$nbofsearch++;
 }
 
 if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
 {
 	$langs->load("members");
-	$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/liste.php', DOL_URL_ROOT.'/adherents/liste.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/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index e4c4d75c85e..56cca5af04f 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -87,8 +87,8 @@
 </td>
 <td>
 <table class="nobordernopadding">
-<tr><td width="30%">
-	<textarea name="param" id="param"><?php echo GETPOST('param'); ?></textarea>
+<tr><td>
+	<textarea name="param" id="param" cols="80" rwos="<?php echo ROWS_4 ?>"><?php echo GETPOST('param'); ?></textarea>
 </td><td id="helpselect"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"),1,0)?></td>
 <td id="helpsellist"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"),1,0)?></td></tr>
 </table>
@@ -101,6 +101,8 @@
 <tr><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique" <?php echo (GETPOST('unique')?' checked="true"':''); ?>></td></tr>
 <!-- Required -->
 <tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required" <?php echo (GETPOST('required')?' checked="true"':''); ?>></td></tr>
+<!-- Always editable -->
+<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable" <?php echo (GETPOST('alwayseditable')?' checked="true"':''); ?>></td></tr>
 </table>
 
 <div align="center"><br><input type="submit" name="button" class="button" value="<?php echo $langs->trans("Save"); ?>"> &nbsp;
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index e24a3e86948..493634c84a5 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -54,6 +54,7 @@ $size=$extrafields->attribute_size[$attrname];
 $unique=$extrafields->attribute_unique[$attrname];
 $required=$extrafields->attribute_required[$attrname];
 $pos=$extrafields->attribute_pos[$attrname];
+$alwayseditable=$extrafields->attribute_alwayseditable[$attrname];
 $param=$extrafields->attribute_param[$attrname];
 
 if((($type == 'select') || ($type == 'checkbox') ||(($type == 'radio'))) && is_array($param))
@@ -97,8 +98,8 @@ if(($type == 'select') || ($type == 'sellist') || ($type == 'checkbox') ||(($typ
 </td>
 <td>
 <table class="nobordernopadding">
-<tr><td width="30%">
-	<textarea name="param" id="param"><?php echo $param_chain; ?></textarea>
+<tr><td>
+	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo $param_chain; ?></textarea>
 </td><td><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelp".$type),1,0)?></td></tr>
 </table>
 </td>
@@ -110,6 +111,8 @@ if(($type == 'select') || ($type == 'sellist') || ($type == 'checkbox') ||(($typ
 <tr><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique" <?php echo ($unique?' checked="true"':''); ?>></td></tr>
 <!-- Required -->
 <tr><td><?php echo $langs->trans("Required"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required" <?php echo ($required?' checked="true"':''); ?>></td></tr>
+<!-- Always editable -->
+<tr><td><?php echo $langs->trans("AlwaysEditable"); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable" <?php echo ($alwayseditable?' checked="true"':''); ?>></td></tr>
 
 </table>
 
diff --git a/htdocs/core/tpl/ajax/index.html b/htdocs/core/tpl/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 35849720e7d..acc0cd6b502 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2012 Regis Houssin       <regis.houssin@capnetworks.com>
- * Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2012      Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * 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
@@ -60,9 +60,13 @@ $userstatic=new User($db);
 		<div class="tagtd">&nbsp;</div>
 	</form>
 
-	<?php $var=false; ?>
-
+	<?php
 
+	$var=true;
+	if (empty($hideaddcontactforuser))
+	{
+		$var=!$var;
+	?>
 	<form class="tagtr impair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
@@ -77,7 +81,13 @@ $userstatic=new User($db);
 		<div class="tagtd" align="right"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
 	</form>
 
-	<?php $var=!$var; ?>
+	<?php
+	}
+
+	if (empty($hideaddcontactforthirdparty))
+	{
+		$var=!$var;
+	?>
 
 	<form class="tagtr pair" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@@ -109,7 +119,8 @@ $userstatic=new User($db);
 		</div>
 	</form>
 
-<?php } ?>
+<?php }
+	} ?>
 
 	<form class="tagtr liste_titre">
 		<div class="tagtd"><?php echo $langs->trans("Source"); ?></div>
@@ -123,7 +134,8 @@ $userstatic=new User($db);
 	<?php $var=true; ?>
 
 	<?php
-	foreach(array('internal','external') as $source) {
+	$arrayofsource=array('internal','external');	// Show both link to user and thirdparties contacts
+	foreach($arrayofsource as $source) {
 
 		$tmpobject=$object;
 		if ($object->element == 'shipping' && is_object($objectsrc)) $tmpobject=$objectsrc;
@@ -197,7 +209,7 @@ $userstatic=new User($db);
 			?>
 			<?php if ($object->statut >= 0) echo '</a>'; ?>
 		</div>
-		<div class="tagtd nowrap" align="center">
+		<div class="tagtd nowrap" align="right">
 			<?php if ($permission) { ?>
 				&nbsp;<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deletecontact&amp;lineid='.$tab[$i]['rowid']; ?>"><?php echo img_delete(); ?></a>
 			<?php } ?>
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index a662bd5be3d..d1a1cedca61 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -41,6 +41,21 @@ if ($action == 'delete')
 
 $formfile=new FormFile($db);
 
+// We define var to enable the feature to add prefix of uploaded files
+$savingdocmask='';
+if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
+{
+	//var_dump($modulepart);
+	if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','ficheinter','contract','project','project_task')))
+	{
+		$savingdocmask=$object->ref.'___file__';
+	}
+	/*if (in_array($modulepart,array('member')))
+	{
+		$savingdocmask=$object->login.'___file__';
+	}*/
+}
+
 // Show upload form (document and links)
 $formfile->form_attach_new_file(
     $_SERVER["PHP_SELF"].'?id='.$object->id.(empty($withproject)?'':'&withproject=1'),
@@ -49,7 +64,10 @@ $formfile->form_attach_new_file(
     0,
     $permission,
     50,
-    $object
+    $object,
+	'',
+	1,
+	$savingdocmask
 );
 
 // List of document
diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
index b386391cec2..36b6ce75fe1 100644
--- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
@@ -19,12 +19,17 @@
 // Variable $upload_dir must be defined when entering here
 
 // Send file/link
-if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) {
-    if ($object->id) {
-        dol_add_file_process($upload_dir, 0, 1, 'userfile');
+if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
+{
+    if ($object->id)
+    {
+        dol_add_file_process($upload_dir, 0, 1, 'userfile', GETPOST('savingdocmask'));
     }
-} elseif (GETPOST('linkit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) {
-    if ($object->id) {
+}
+elseif (GETPOST('linkit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
+{
+    if ($object->id)
+    {
         $link = GETPOST('link', 'alpha');
         if ($link)
         {
@@ -67,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
new file mode 100644
index 00000000000..7f0115b83bc
--- /dev/null
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -0,0 +1,97 @@
+<?php
+/* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
+ * Copyright (C) 2014	Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $conf
+ * $langs
+ *
+ * $cols
+ */
+
+//$res = $object->fetch_optionals($object->id, $extralabels);
+$parameters = array('colspan' => ' colspan="'.$cols.'"', 'cols' => $cols, 'socid' => $object->fk_soc);
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+
+if (empty($reshook) && ! empty($extrafields->attribute_label))
+{
+	foreach ($extrafields->attribute_label as $key => $label)
+	{
+		if ($action == 'edit_extras')
+		{
+			$value = (isset($_POST["options_" . $key]) ? $_POST["options_" . $key] : $object->array_options["options_" . $key]);
+		}
+		else
+		{
+			$value = $object->array_options["options_" . $key];
+		}
+		if ($extrafields->attribute_type[$key] == 'separate')
+		{
+			print $extrafields->showSeparator($key);
+		}
+		else
+		{
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td';
+			//var_dump($action);exit;
+			if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+			print '>' . $label . '</td>';
+
+			//TODO Improve element and rights detection
+			//var_dump($user->rights);
+			$permok=false;
+			$keyforperm=$object->element;
+			if ($object->element == 'fichinter') $keyforperm='ficheinter';
+			if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write;
+			if ($object->element=='order_supplier') $permok=$user->rights->fournisseur->commande->creer;
+			if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer;
+
+			if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key])
+				&& $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key))
+				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+
+			print '</tr></table>';
+			print '<td colspan="5">';
+
+			// 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]);
+			}
+
+			//TODO Improve element and rights detection
+			if ($action == 'edit_extras' && $permok && GETPOST('attribute') == $key)
+			{
+				print '<form enctype="multipart/form-data" action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formextra">';
+				print '<input type="hidden" name="action" value="update_extras">';
+				print '<input type="hidden" name="attribute" value="' . $key . '">';
+				print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+				print '<input type="hidden" name="id" value="' . $object->id . '">';
+
+				print $extrafields->showInputField($key, $value);
+
+				print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
+
+				print '</form>';
+			}
+			else
+			{
+				print $extrafields->showOutputField($key, $value);
+			}
+			print '</td></tr>' . "\n";
+		}
+	}
+}
diff --git a/htdocs/core/tpl/index.html b/htdocs/core/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/tpl/index.php b/htdocs/core/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 82748a69b05..23d8dd4f326 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -30,6 +30,7 @@ if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
 
 $arrayofjs=array('/core/js/dst.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION)));					// Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second
 $titleofloginpage=$langs->trans('Login').' '.$title;	// title is defined by dol_loginfunction in security2.lib.php
+
 print top_htmlhead('',$titleofloginpage,0,0,$arrayofjs);
 ?>
 <!-- BEGIN PHP TEMPLATE LOGIN.TPL.PHP -->
@@ -46,6 +47,8 @@ $(document).ready(function () {
 <?php } ?>
 
 <center>
+<div class="login_vertical_align">
+
 
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@@ -65,7 +68,7 @@ $(document).ready(function () {
 <input type="hidden" name="dol_use_jmobile" id="dol_use_jmobile" value="<?php echo $dol_use_jmobile; ?>" />
 
 <table class="login_table_title center" summary="<?php echo dol_escape_htmltag($title); ?>">
-<tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>
+<tr class="vmenu"><td align="center"><?php echo dol_escape_htmltag($title); ?></td></tr>
 </table>
 <br>
 
@@ -80,13 +83,17 @@ $(document).ready(function () {
 <tr>
 <td valign="middle" class="loginfield"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td>
 <td valign="middle" class="nowrap">
-<input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
+<span class="span-icon-user">
+<input type="text" id="username" name="username" class="flat input-icon-user" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
+</span>
 </td>
 </tr>
 <!-- Password -->
 <tr><td valign="middle" class="loginfield nowrap"><strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong></td>
 <td valign="middle" class="nowrap">
-<input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
+<span class="span-icon-password">
+<input id="password" name="password" class="flat input-icon-password" type="password" size="15" maxlength="30" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
+</span>
 </td></tr>
 <?php
 if (! empty($hookmanager->resArray['options'])) {
@@ -99,13 +106,20 @@ if (! empty($hookmanager->resArray['options'])) {
 	}
 }
 ?>
-<?php if ($captcha) { ?>
+<?php
+	if ($captcha) {
+		// TODO: provide accessible captha variants
+?>
 	<!-- Captcha -->
-	<tr><td valign="middle" class="loginfield nowrap"><b><?php echo $langs->trans('SecurityCode'); ?></b></td>
+	<tr><td valign="middle" class="loginfield nowrap"><label for="securitycode"><b><?php echo $langs->trans('SecurityCode'); ?></b></label></td>
 	<td valign="top" class="nowrap none" align="left">
 
 	<table class="login_table_securitycode" style="width: 100px;"><tr>
-	<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="4" /></td>
+	<td>
+	<span class="span-icon-security">
+	<input id="securitycode" class="flat input-icon-security" type="text" size="6" maxlength="5" name="code" tabindex="4" />
+	</span>
+	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
 	<td><a href="<?php echo $php_self; ?>"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
@@ -193,7 +207,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
 <?php if (! empty($_SESSION['dol_loginmesg']))
 {
 ?>
-	<div class="center" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error">
+	<div class="center login_main_message" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error">
 	<?php echo $_SESSION['dol_loginmesg']; ?>
 	</div></div>
 <?php
@@ -264,8 +278,11 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
 }
 ?>
 
+
+</div>
 </center>	<!-- end of center -->
 
+
 </body>
 </html>
 <!-- END PHP TEMPLATE -->
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 0cce9a3e3b4..66b310da69d 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -22,6 +22,7 @@ $note_public = 'note_public';
 $note_private = 'note_private';
 
 $colwidth=(isset($colwidth)?$colwidth:25);
+
 $permission=(isset($permission)?$permission:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0));    // If already defined by caller page
 $moreparam=(isset($moreparam)?$moreparam:'');
 $value_public=$object->note_public;
@@ -59,8 +60,9 @@ elseif ($module == 'contact')    		{ $permission=$user->rights->societe->creer;}
 elseif ($module == 'shipping')    		{ $permission=$user->rights->expedition->creer;}
 //else dol_print_error('','Bad value '.$module.' for param module');
 
-if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100';
+if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100';	// Rem: This var is for all notes, not only thirdparties note.
 else $typeofdata='textarea:12:100';
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE NOTES -->
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index a51a6505416..6037f6c77c9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -61,7 +61,7 @@ if (in_array($object->element,array('propal','facture','invoice','commande','ord
 	if (! empty($usemargins))
 	{
 		?>
-		<td align="right">
+		<td align="right" class="margininfos">
 		<?php
 		if ($conf->global->MARGIN_TYPE == "1")
 			echo $langs->trans('BuyingPrice');
@@ -70,8 +70,8 @@ if (in_array($object->element,array('propal','facture','invoice','commande','ord
 		?>
 		</td>
 		<?php
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
-		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td align="right" class="margininfos"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
+		if ($user->rights->margins->creer && ! empty($conf->global->DISPLAY_MARK_RATES)) 	echo '<td align="right" class="margininfos"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
 	}
 	?>
 	<td colspan="<?php echo $colspan; ?>">&nbsp;</td>
@@ -89,41 +89,50 @@ else {
 
 	<?php
 
+	$forceall=1;	// We always force all type for free lines (module product or service means we use predefined product or service)
+	if ($object->element == 'contrat')
+	{
+		if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1;	// With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
+		else $forceall=0;
+	}
+
 	// Free line
 	echo '<span>';
 	// Show radio free line
-	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+	if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled)))
 	{
+		echo '<label for="prod_entry_mode_free">';
 		echo '<input type="radio" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
 		//echo (GETPOST('prod_entry_mode')=='free' ? ' checked="true"' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked="true"':'') );
 		echo (GETPOST('prod_entry_mode')=='free' ? ' checked="true"' : '');
 		echo '> ';
-	}
-	else echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
-	// Show type selector
-/*	if (empty($conf->product->enabled) && empty($conf->service->enabled))
-	{
-		// If module product and service disabled, by default this is a product except for contracts it is a service
-		print '<input type="hidden" name="type" value="'.((! empty($object->element) && $object->element == 'contrat')?'1':'0').'">';
-	}
-	else {*/
+		// Show type selector
 		echo $langs->trans("FreeLineOfType");
-		/*
-		if (empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans("Type");
-		else if (! empty($forceall) || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))) echo $langs->trans("FreeLineOfType");
-		else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans("FreeLineOfType").' '.$langs->trans("Service");
-		else if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans("FreeLineOfType").' '.$langs->trans("Product");*/
+		echo '</label>';
 		echo ' ';
-		echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,1,1);
-//	}
+	}
+	else
+	{
+		echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
+		// Show type selector
+		if ($forceall >= 0)
+		{
+			echo $langs->trans("FreeLineOfType");
+			echo ' ';
+		}
+	}
+
+	echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,1,$forceall);
+
 	echo '</span>';
 
 	// Predefined product/service
 	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 	{
-		echo '<br><span>';
+		if ($forceall >= 0) echo '<br>';
+		echo '<span>';
+		echo '<label for="prod_entry_mode_predef">';
 		echo '<input type="radio" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode')=='predef'?' checked="true"':'').'> ';
-
 		if (empty($senderissupplier))
 		{
 			if (! empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
@@ -136,6 +145,7 @@ else {
 			else if (empty($conf->product->enabled) && ! empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
 			else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
 		}
+		echo '</label>';
 		echo ' ';
 
 		$filtertype='';
@@ -152,7 +162,7 @@ else {
 					'option_disabled' => 'addPredefinedProductButton',	// html id to disable once select is done
 					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'error'
 			);
-			$form->select_produits_fournisseurs($object->fourn_id, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1);
+			$form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1);
 		}
 		echo '</span>';
 	}
@@ -184,7 +194,7 @@ else {
 	<td align="right"><?php
 	if (GETPOST('prod_entry_mode') != 'predef')
 	{
-		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" value="0">0';
+		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">0';
 		else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
 	}
 	?>
@@ -201,15 +211,15 @@ else {
 	<?php } ?>
 	</td>
 	<?php } ?>
-	<td align="right"><input type="text" size="2" name="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>">
+	<td align="right"><input type="text" size="2" name="qty" id="qty" class="flat" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>">
 	</td>
-	<td align="right" class="nowrap"><input type="text" size="1" class="flat" value="<?php echo (isset($_POST["remise_percent"])?$_POST["remise_percent"]:$buyer->remise_percent); ?>" name="remise_percent"><span class="hideonsmartphone">%</span></td>
+	<td align="right" class="nowrap"><input type="text" size="1" name="remise_percent" id="remise_percent" class="flat" value="<?php echo (isset($_POST["remise_percent"])?$_POST["remise_percent"]:$buyer->remise_percent); ?>"><span class="hideonsmartphone">%</span></td>
 
 	<?php
 	if (! empty($usemargins))
 	{
 		?>
-		<td align="right">
+		<td align="right" class="margininfos">
 			<!-- For predef product -->
 			<?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
 			<select id="fournprice_predef" name="fournprice_predef" class="flat" style="display: none;"></select>
@@ -224,12 +234,12 @@ else {
 		{
 			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
 			{
-				echo '<td align="right" class="nowrap"><input type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:'').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
+				echo '<td align="right" class="nowrap margininfos"><input type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:'').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 			if (! empty($conf->global->DISPLAY_MARK_RATES))
 			{
-				echo '<td align="right" class="nowrap"><input type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?$_POST["np_markRate"]:'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
+				echo '<td align="right" class="nowrap margininfos"><input type="text" size="2" id="np_markRate" name="np_markRate" value="'.(isset($_POST["np_markRate"])?$_POST["np_markRate"]:'').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}
@@ -263,7 +273,7 @@ else {
 </tr>
 
 <?php
-if (! empty($conf->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;
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 95402139f7e..fbe2870a6a4 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -60,7 +60,7 @@ $coldisplay=-1; // We remove first td
 
 	<?php if ($line->fk_product > 0) { ?>
 
-		<a href="<?php echo DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product; ?>">
+		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 		<?php
 		if ($line->product_type==1) echo img_object($langs->trans('ShowService'),'service');
 		else print img_object($langs->trans('ShowProduct'),'product');
@@ -96,7 +96,7 @@ $coldisplay=-1; // We remove first td
 	<td align="right"><?php $coldisplay++; ?><?php echo $form->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type); ?></td>
 
 	<td align="right"><?php $coldisplay++; ?><input type="text" class="flat" size="8" id="price_ht" name="price_ht" value="<?php echo price($line->subprice,0,'',0); ?>"></td>
-	<?php if ($conf->global->MAIN_FEATURES_LEVEL > 1) { ?>
+	<?php if ($inputalsopricewithtax) { ?>
 	<td align="right"><?php $coldisplay++; ?><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="<?php echo price($pu_ttc,0,'',0); ?>"></td>
 	<?php } ?>
 
@@ -107,7 +107,7 @@ $coldisplay=-1; // We remove first td
 		// must also not be output for most entities (proposal, intervention, ...)
 		//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 	?>
-		<input size="3" type="text" class="flat" name="qty" value="<?php echo $line->qty; ?>">
+		<input size="3" type="text" class="flat" name="qty" id="qty" value="<?php echo $line->qty; ?>">
 	<?php } else { ?>
 		&nbsp;
 	<?php } ?>
@@ -115,7 +115,7 @@ $coldisplay=-1; // We remove first td
 
 	<td align="right" nowrap><?php $coldisplay++; ?>
 	<?php if (($line->info_bits & 2) != 2) { ?>
-		<input size="1" type="text" class="flat" name="remise_percent" value="<?php echo $line->remise_percent; ?>">%
+		<input size="1" type="text" class="flat" name="remise_percent" id="remise_percent" value="<?php echo $line->remise_percent; ?>">%
 	<?php } else { ?>
 		&nbsp;
 	<?php } ?>
@@ -125,7 +125,7 @@ $coldisplay=-1; // We remove first td
 	if (! empty($usemargins))
 	{
 	?>
-		<td align="right"><?php $coldisplay++; ?>
+		<td align="right" class="margininfos"><?php $coldisplay++; ?>
 			<!-- For predef product -->
 			<?php if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { ?>
 			<select id="fournprice_predef" name="fournprice_predef" class="flat" style="display: none;"></select>
@@ -139,9 +139,9 @@ $coldisplay=-1; // We remove first td
 				    $margin_rate = (isset($_POST["np_marginRate"])?$_POST["np_marginRate"]:(($line->pa_ht == 0)?'':price($line->marge_tx)));
 				    // if credit note, dont allow to modify margin
 					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
+						echo '<td align="right" class="nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
 					else
-						echo '<td align="right" class="nowrap"><input type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+						echo '<td align="right" class="nowrap margininfos"><input type="text" size="2" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 					$coldisplay++;
 				  }
 				elseif (! empty($conf->global->DISPLAY_MARK_RATES))
@@ -149,9 +149,9 @@ $coldisplay=-1; // We remove first td
 				    $mark_rate = (isset($_POST["np_markRate"])?$_POST["np_markRate"]:price($line->marque_tx));
 				    // if credit note, dont allow to modify margin
 					if ($line->subprice < 0)
-						echo '<td align="right" class="nowrap">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
+						echo '<td align="right" class="nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
 					else
-						echo '<td align="right" class="nowrap"><input type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+						echo '<td align="right" class="nowrap margininfos"><input type="text" size="2" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
 					$coldisplay++;
 				  }
 			  }
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 948a61bae2c..1c8bb07f560 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -17,9 +17,27 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * To use this template, the following var must be defined
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $conf
+ * $langs
+ * $dateSelector
+ * $forceall (0 by default, 1 for supplier invoices/orders)
+ * $senderissupplier (0 by default, 1 for supplier invoices/orders)
+ * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)
+ *
  * $type, $text, $description, $line
  */
+
+$usemargins=0;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+
+global $forceall, $senderissupplier, $inputalsopricewithtax;
+if (empty($dateSelector)) $dateSelector=0;
+if (empty($forceall)) $forceall=0;
+if (empty($senderissupplier)) $senderissupplier=0;
+if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
+
 ?>
 <?php $coldisplay=0; ?>
 <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
@@ -100,7 +118,7 @@
 
 	<td align="right" class="nowrap"><?php $coldisplay++; ?><?php echo price($line->subprice); ?></td>
 
-	<?php if ($conf->global->MAIN_FEATURES_LEVEL > 1) { ?>
+	<?php if ($inputalsopricewithtax) { ?>
 	<td align="right" class="nowrap"><?php $coldisplay++; ?>&nbsp;</td>
 	<?php } ?>
 
@@ -123,13 +141,13 @@
   if (! empty($conf->margin->enabled) && empty($user->societe_id)) {
 	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
   ?>
-  	<td align="right" class="nowrap"><?php $coldisplay++; ?><?php echo price($line->pa_ht); ?></td>
+  	<td align="right" class="nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->pa_ht); ?></td>
   	<?php if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {?>
-  	  <td align="right" class="nowrap"><?php $coldisplay++; ?><?php echo (($line->pa_ht == 0)?'n/a':price($line->marge_tx, null, null, null, null, $rounding).'%'); ?></td>
+  	  <td align="right" class="nowrap margininfos"><?php $coldisplay++; ?><?php echo (($line->pa_ht == 0)?'n/a':price($line->marge_tx, null, null, null, null, $rounding).'%'); ?></td>
   	<?php
   }
   if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
-  	  <td align="right" class="nowrap"><?php $coldisplay++; ?><?php echo price($line->marque_tx, null, null, null, null, $rounding).'%'; ?></td>
+  	  <td align="right" class="nowrap margininfos"><?php $coldisplay++; ?><?php echo price($line->marque_tx, null, null, null, null, $rounding).'%'; ?></td>
   <?php } } ?>
 
 	<?php if ($line->special_code == 3)	{ ?>
@@ -176,7 +194,8 @@
 
 <?php
 //Line extrafield
-if (!empty($extrafieldsline)) {
+if (!empty($extrafieldsline))
+{
 	print $line->showOptionals($extrafieldsline,'view',array('style'=>$bcdd[$var],'colspan'=>$coldisplay));
 }
 ?>
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 7331a81ead0..af27aff944b 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -43,7 +43,10 @@ $(document).ready(function () {
 </script>
 <?php } ?>
 
+
 <center>
+<div class="login_vertical_align">
+
 
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
@@ -66,7 +69,9 @@ $(document).ready(function () {
 <tr>
 <td valign="bottom" class="loginfield nowrap"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td>
 <td valign="bottom" class="nowrap">
-<input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
+<span class="span-icon-user">
+<input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
+</span>
 </td>
 </tr>
 
@@ -88,7 +93,11 @@ if (! empty($hookmanager->resArray['options'])) {
 	<td valign="top" class="nowrap none" align="left">
 
 	<table class="login_table_securitycode" style="width: 100px;"><tr>
-	<td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="4" /></td>
+	<td>
+	<span class="span-icon-security">
+	<input id="securitycode" class="flat input-icon-security" type="text" size="6" maxlength="5" name="code" tabindex="4" />
+	</span>
+	</td>
 	<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
 	<td><a href="<?php echo $php_self; ?>"><?php echo $captcha_refresh; ?></a></td>
 	</tr></table>
@@ -132,7 +141,7 @@ if (! empty($hookmanager->resArray['options'])) {
 </form>
 
 
-<div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
+<div class="center login_main_home" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
 <?php if ($mode == 'dolibarr' || ! $disabled) { ?>
 	<font style="font-size: 12px;">
 	<?php echo $langs->trans('SendNewPasswordDesc'); ?>
@@ -148,16 +157,16 @@ if (! empty($hookmanager->resArray['options'])) {
 <br>
 
 <?php if ($message) { ?>
-	<div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
+	<div class="center login_main_message" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
 	<?php echo dol_htmloutput_mesg($message,'','',1); ?>
 	</div>
 <?php } ?>
 
+
+</div>
 </center>	<!-- end of center -->
 
-<br>
 
 </body>
 </html>
-
 <!-- END PHP TEMPLATE -->
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 '<div class="tagtd">'.$langs->trans('Resource').'</div>';
 		print '<div class="tagtd">'.$langs->trans('Busy').'</div>';
 		print '<div class="tagtd">'.$langs->trans('Mandatory').'</div>';
-		print '<div class="tagtd">'.$langs->trans('Edit').'</div>';
+		print '<div class="tagtd">'.$langs->trans('Action').'</div>';
 		print '</form>';
 		//print '</div>';
 
@@ -86,8 +86,13 @@ if( (array) $linked_resources && count($linked_resources) > 0)
 			print '</div>';
 
 			print '<div class="tagtd">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">'.$langs->trans('Delete').'</a>';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?mode=edit&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">'.$langs->trans('Edit').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?mode=edit&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
+			print img_edit();
+			print '</a>';
+			print '&nbsp;';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';			
+			print img_delete();
+			print '</a>';
 			print '</div>';
 
 			print '</div>';
@@ -105,4 +110,4 @@ else {
 	print '<div class="warning">'.$langs->trans('NoResourceLinked').'</div>';
 
 }
-// FIN DU TPL
+// FIN DU TPL
\ No newline at end of file
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
new file mode 100644
index 00000000000..0682bb76a71
--- /dev/null
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -0,0 +1,148 @@
+<?php
+/* Copyright (C) 2014 Marcos García         <marcosgdf@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Class that all the triggers must extend
+ */
+abstract class DolibarrTriggers
+{
+
+	/**
+	 * Database handler
+	 * @var DoliDB
+	 */
+	protected $db;
+
+	/**
+	 * Name of the trigger
+	 * @var mixed|string
+	 */
+	public $name = '';
+
+	/**
+	 * Description of the trigger
+	 * @var string
+	 */
+	public $description = '';
+
+	/**
+	 * Version of the trigger
+	 * @var string
+	 */
+	public $version = self::VERSION_DEVELOPMENT;
+
+	/**
+	 * Image of the trigger
+	 * @var string
+	 */
+	public $picto = 'technic';
+
+	/**
+	 * Category of the trigger
+	 * @var string
+	 */
+	public $family = '';
+
+	/**
+	 * Error reported by the trigger
+	 * @var string
+	 * @deprecated Use $this->errors
+	 */
+	public $error = '';
+
+	/**
+	 * Errors reported by the trigger
+	 * @var array
+	 */
+	public $errors = array();
+
+	const VERSION_DEVELOPMENT = 'development';
+	const VERSION_EXPERIMENTAL = 'experimental';
+	const VERSION_DOLIBARR = 'dolibarr';
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct(DoliDB $db) {
+
+		$this->db = $db;
+
+		if (empty($this->name)) 
+		{
+			$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		}
+	}
+
+	/**
+	 * Returns the name of the trigger file
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Returns the description of trigger file
+	 *
+	 * @return string
+	 */
+	public function getDesc()
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Returns the version of the trigger file
+	 *
+	 * @return string Version of trigger file
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == self::VERSION_DEVELOPMENT) {
+			return $langs->trans("Development");
+		} elseif ($this->version == self::VERSION_EXPERIMENTAL) {
+			return $langs->trans("Experimental");
+		} elseif ($this->version == self::VERSION_DOLIBARR) {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("Unknown");
+		}
+	}
+
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
+
+}
\ No newline at end of file
diff --git a/htdocs/core/triggers/index.html b/htdocs/core/triggers/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/triggers/index.php b/htdocs/core/triggers/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/core/triggers/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index df6242a20d9..34bd187adbf 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  *
  * 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,85 +23,31 @@
  *  \brief      Trigger file for
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
 
 /**
  *  Class of triggers for security events
  */
-class InterfaceLogevents
+class InterfaceLogevents extends DolibarrTriggers
 {
-    var $db;
-    var $error;
+	public $picto = 'technic';
+	public $family = 'core';
+	public $description = "Triggers of this module allows to add security event records inside Dolibarr.";
+	public $version = self::VERSION_DOLIBARR;
 
-    var $date;
-    var $duree;
-    var $texte;
-    var $desc;
-
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "core";
-        $this->description = "Triggers of this module allows to add security event records inside Dolibarr.";
-        $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-        $this->picto = 'technic';
-    }
-
-    /**
-     *   Return name of trigger file
-     *
-     *   @return     string      Name of trigger file
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     *   Return description of trigger file
-     *
-     *   @return     string      Description of trigger file
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     *   Return version of trigger file
-     *
-     *   @return     string      Version of trigger file
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-
-    /**
-     *      Function called when a Dolibarrr business event is done.
-     *      All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers
-     *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @param  string		$entity     Value for instance of data (Always 1 except if module MultiCompany is installed)
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-    function run_trigger($action,$object,$user,$langs,$conf,$entity=1)
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User			$user       Object user
+	 * @param Translate		$langs      Object langs
+	 * @param conf			$conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
     	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
 
@@ -110,8 +57,7 @@ class InterfaceLogevents
 
     	if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
 
-        $this->date=dol_now();
-        $this->duree=0;
+        $date = dol_now();
 
         // Actions
         if ($action == 'USER_LOGIN')
@@ -119,24 +65,26 @@ class InterfaceLogevents
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte="(UserLogged,".$object->login.")";
-            $this->desc="(UserLogged,".$object->login.")";
+            $text="(UserLogged,".$object->login.")";
+            $text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
+            $desc="(UserLogged,".$object->login.")";
+            $desc.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
         }
         if ($action == 'USER_LOGIN_FAILED')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$object->trigger_mesg;	// Message direct
-            $this->desc=$object->trigger_mesg;	// Message direct
+            $text=$object->trigger_mesg;	// Message direct
+            $desc=$object->trigger_mesg;	// Message direct
         }
         if ($action == 'USER_LOGOUT')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte="(UserLogoff,".$object->login.")";
-            $this->desc="(UserLogoff,".$object->login.")";
+            $text="(UserLogoff,".$object->login.")";
+            $desc="(UserLogoff,".$object->login.")";
         }
         if ($action == 'USER_CREATE')
         {
@@ -144,8 +92,8 @@ class InterfaceLogevents
             $langs->load("users");
 
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$langs->transnoentities("NewUserCreated",$object->login);
-            $this->desc=$langs->transnoentities("NewUserCreated",$object->login);
+            $text=$langs->transnoentities("NewUserCreated",$object->login);
+            $desc=$langs->transnoentities("NewUserCreated",$object->login);
 		}
         elseif ($action == 'USER_MODIFY')
         {
@@ -153,8 +101,8 @@ class InterfaceLogevents
             $langs->load("users");
 
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$langs->transnoentities("EventUserModified",$object->login);
-            $this->desc=$langs->transnoentities("EventUserModified",$object->login);
+            $text=$langs->transnoentities("EventUserModified",$object->login);
+            $desc=$langs->transnoentities("EventUserModified",$object->login);
         }
         elseif ($action == 'USER_NEW_PASSWORD')
         {
@@ -162,8 +110,8 @@ class InterfaceLogevents
             $langs->load("users");
 
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$langs->transnoentities("NewUserPassword",$object->login);
-            $this->desc=$langs->transnoentities("NewUserPassword",$object->login);
+            $text=$langs->transnoentities("NewUserPassword",$object->login);
+            $desc=$langs->transnoentities("NewUserPassword",$object->login);
         }
         elseif ($action == 'USER_ENABLEDISABLE')
         {
@@ -172,13 +120,13 @@ class InterfaceLogevents
             // Initialisation donnees (date,duree,texte,desc)
 			if ($object->statut == 0)
 			{
-				$this->texte=$langs->transnoentities("UserEnabled",$object->login);
-				$this->desc=$langs->transnoentities("UserEnabled",$object->login);
+				$text=$langs->transnoentities("UserEnabled",$object->login);
+				$desc=$langs->transnoentities("UserEnabled",$object->login);
 			}
 			if ($object->statut == 1)
 			{
-				$this->texte=$langs->transnoentities("UserDisabled",$object->login);
-				$this->desc=$langs->transnoentities("UserDisabled",$object->login);
+				$text=$langs->transnoentities("UserDisabled",$object->login);
+				$desc=$langs->transnoentities("UserDisabled",$object->login);
 			}
         }
         elseif ($action == 'USER_DELETE')
@@ -186,8 +134,8 @@ class InterfaceLogevents
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$langs->transnoentities("UserDeleted",$object->login);
-            $this->desc=$langs->transnoentities("UserDeleted",$object->login);
+            $text=$langs->transnoentities("UserDeleted",$object->login);
+            $desc=$langs->transnoentities("UserDeleted",$object->login);
         }
 
 		// Groupes
@@ -196,24 +144,24 @@ class InterfaceLogevents
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$langs->transnoentities("NewGroupCreated",$object->nom);
-            $this->desc=$langs->transnoentities("NewGroupCreated",$object->nom);
+            $text=$langs->transnoentities("NewGroupCreated",$object->name);
+            $desc=$langs->transnoentities("NewGroupCreated",$object->name);
 		}
         elseif ($action == 'GROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$langs->transnoentities("GroupModified",$object->nom);
-            $this->desc=$langs->transnoentities("GroupModified",$object->nom);
+            $text=$langs->transnoentities("GroupModified",$object->name);
+            $desc=$langs->transnoentities("GroupModified",$object->name);
 		}
         elseif ($action == 'GROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
-            $this->texte=$langs->transnoentities("GroupDeleted",$object->nom);
-            $this->desc=$langs->transnoentities("GroupDeleted",$object->nom);
+            $text=$langs->transnoentities("GroupDeleted",$object->name);
+            $desc=$langs->transnoentities("GroupDeleted",$object->name);
 		}
 
 		// If not found
@@ -226,30 +174,27 @@ class InterfaceLogevents
 */
 
         // Add entry in event table
-        if ($this->date)
+		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
+
+		$event=new Events($this->db);
+        $event->type=$action;
+        $event->dateevent=$date;
+        $event->label=$text;
+        $event->description=$desc;
+		$event->user_agent=$_SERVER["HTTP_USER_AGENT"];
+
+        $result=$event->create($user);
+        if ($result > 0)
         {
-			include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
+            return 1;
+        }
+        else
+        {
+            $error ="Failed to insert security event: ".$event->error;
+            $this->error=$error;
 
-			$event=new Events($this->db);
-            $event->type=$action;
-            $event->dateevent=$this->date;
-            $event->label=$this->texte;
-            $event->description=$this->desc;
-			$event->user_agent=$_SERVER["HTTP_USER_AGENT"];
-
-            $result=$event->create($user);
-            if ($result > 0)
-            {
-                return 1;
-            }
-            else
-            {
-                $error ="Failed to insert security event: ".$event->error;
-                $this->error=$error;
-
-                dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
-                return -1;
-            }
+            dol_syslog(get_class($this).": ".$this->error, LOG_ERR);
+            return -1;
         }
 
 		return 0;
diff --git a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
index 4401a0ebcfa..1d57f598d57 100644
--- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
+++ b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2011-2012  Regis Houssin  <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  *
  * 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,80 +22,31 @@
  *      \brief      Trigger file for paypal workflow
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
 
 /**
  *  Class of triggers for paypal module
  */
-class InterfacePaypalWorkflow
+class InterfacePaypalWorkflow extends DolibarrTriggers
 {
-    var $db;
+	public $picto = 'paypal@paypal';
+	public $family = 'paypal';
+	public $description = "Triggers of this module allows to manage paypal workflow";
+	public $version = self::VERSION_DOLIBARR;
 
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "paypal";
-        $this->description = "Triggers of this module allows to manage paypal workflow";
-        $this->version = 'dolibarr';            // 'development', 'experimental', 'dolibarr' or version
-        $this->picto = 'paypal@paypal';
-    }
-
-
-    /**
-     *  Renvoi nom du lot de triggers
-     *
-     *  @return     string      Nom du lot de triggers
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     *  Renvoi descriptif du lot de triggers
-     *
-     *  @return     string      Descriptif du lot de triggers
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     *  Renvoi version du lot de triggers
-     *
-     *  @return     string      Version du lot de triggers
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'development') return $langs->trans("Development");
-        elseif ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-
-    /**
-     *  Fonction appelee lors du declenchement d'un evenement Dolibarr.
-     *  D'autres fonctions run_trigger peuvent etre presentes dans core/triggers
-     *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-	function run_trigger($action,$object,$user,$langs,$conf)
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User			$user       Object user
+	 * @param Translate		$langs      Object langs
+	 * @param conf			$conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
         // Mettre ici le code a executer en reaction de l'action
         // Les donnees de l'action sont stockees dans $object
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index adca98768d3..d144f365533 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010 Regis Houssin       <regis.houssin@capnetworks.com>
  * Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  *
  * 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,81 +23,32 @@
  *  \brief      Trigger file for workflows
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
 
 /**
  *  Class of triggers for workflow module
  */
 
-class InterfaceWorkflowManager
+class InterfaceWorkflowManager extends DolibarrTriggers
 {
-    var $db;
+	public $picto = 'paypal@paypal';
+	public $family = 'core';
+	public $description = "Triggers of this module allows to manage workflows";
+	public $version = self::VERSION_DOLIBARR;
 
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "core";
-        $this->description = "Triggers of this module allows to manage workflows";
-        $this->version = 'dolibarr';            // 'development', 'experimental', 'dolibarr' or version
-        $this->picto = 'technic';
-    }
-
-
-    /**
-     *   Return name of trigger file
-     *
-     *   @return     string      Name of trigger file
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     *   Return description of trigger file
-     *
-     *   @return     string      Description of trigger file
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     *   Return version of trigger file
-     *
-     *   @return     string      Version of trigger file
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'development') return $langs->trans("Development");
-        elseif ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-
-    /**
-     *      Function called when a Dolibarrr business event is done.
-     *      All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers
-     *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-	function run_trigger($action,$object,$user,$langs,$conf)
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
         if (empty($conf->workflow->enabled)) return 0;     // Module not active, we do nothing
 
@@ -166,7 +118,7 @@ class InterfaceWorkflowManager
         		return $ret;
         	}
         }
-        
+
         // classify billed order
         if ($action == 'BILL_VALIDATE')
         {
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 7b3cbe15f9a..346932ec61e 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013	   Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  *
  * 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
@@ -24,127 +25,73 @@
  *  \brief      Trigger file for agenda module
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+
 
 /**
  *  Class of triggered functions for agenda module
  */
-class InterfaceActionsAuto
+class InterfaceActionsAuto extends DolibarrTriggers
 {
-    var $db;
-    var $error;
+	public $family = 'agenda';
+	public $description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
+	public $version = self::VERSION_DOLIBARR;
+	public $picto = 'action';
 
-    var $date;
-    var $duree;
-    var $texte;
-    var $desc;
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * Following properties must be filled:
+	 *      $object->actiontypecode (translation action code: AC_OTH, ...)
+	 *      $object->actionmsg (note, long text)
+	 *      $object->actionmsg2 (label, short text)
+	 *      $object->sendtoid (id of contact)
+	 *      $object->socid
+	 *      Optionnal:
+	 *      $object->fk_element
+	 *      $object->elementtype
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		// Module not active, we do nothing
+        if (empty($conf->agenda->enabled)) {
+	        return 0;
+        }
 
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
+		$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
 
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "agenda";
-        $this->description = "Triggers of this module add actions in agenda according to setup made in agenda setup.";
-        $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-        $this->picto = 'action';
-    }
+		// Do not log events not enabled for this action
+		if (empty($conf->global->$key)) {
+			return 0;
+		}
 
-    /**
-     *   Return name of trigger file
-     *
-     *   @return     string      Name of trigger file
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     *   Return description of trigger file
-     *
-     *   @return     string      Description of trigger file
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     *   Return version of trigger file
-     *
-     *   @return     string      Version of trigger file
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-
-    /**
-     *      Function called when a Dolibarrr business event is done.
-     *      All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers
-     *
-     *      Following properties must be filled:
-     *      $object->actiontypecode (translation action code: AC_OTH, ...)
-     *      $object->actionmsg (note, long text)
-     *      $object->actionmsg2 (label, short text)
-     *      $object->sendtoid (id of contact)
-     *      $object->socid
-     *      Optionnal:
-     *      $object->fk_element
-     *      $object->elementtype
-     *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-    function run_trigger($action,$object,$user,$langs,$conf)
-    {
-		$key='MAIN_AGENDA_ACTIONAUTO_'.$action;
-        //dol_syslog("xxxxxxxxxxx".$key);
-
-        if (empty($conf->agenda->enabled)) return 0;     // Module not active, we do nothing
-		if (empty($conf->global->$key)) return 0;	// Log events not enabled for this action
-
-		$ok=0;
+		$langs->load("agenda");
 
 		// Actions
 		if ($action == 'COMPANY_CREATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->nom);
-            $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->nom);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
+            $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
             if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
-            //$this->desc.="\n".$langs->transnoentities("Customer").': '.yn($object->client);
-            //$this->desc.="\n".$langs->transnoentities("Supplier").': '.yn($object->fournisseur);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
 			$object->socid=$object->id;
-			$ok=1;
         }
         elseif ($action == 'COMPANY_SENTBYMAIL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("orders");
-            $langs->load("agenda");
 
             if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
@@ -152,42 +99,33 @@ class InterfaceActionsAuto
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
 		}
         elseif ($action == 'CONTRACT_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("contracts");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
-			$ok=1;
 		}
 		elseif ($action == 'PROPAL_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("propal");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
         elseif ($action == 'PROPAL_SENTBYMAIL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("propal");
-            $langs->load("agenda");
 
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
@@ -199,13 +137,10 @@ class InterfaceActionsAuto
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
 		}
 		elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("propal");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
@@ -213,13 +148,21 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
+		}
+		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
+        {
+            $langs->load("propal");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+			$object->sendtoid=0;
 		}
 		elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("propal");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
@@ -227,27 +170,21 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
 		elseif ($action == 'ORDER_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("orders");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
         elseif ($action == 'ORDER_SENTBYMAIL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("orders");
-            $langs->load("agenda");
 
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
@@ -259,29 +196,23 @@ class InterfaceActionsAuto
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
 		}
 		elseif ($action == 'BILL_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
 		elseif ($action == 'BILL_UNVALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
@@ -289,14 +220,11 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
         elseif ($action == 'BILL_SENTBYMAIL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
@@ -308,14 +236,11 @@ class InterfaceActionsAuto
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
 		}
 		elseif ($action == 'BILL_PAYED')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
             // Values for this action can't be defined by caller.
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -324,14 +249,11 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
-			$ok=1;
 		}
 		elseif ($action == 'BILL_CANCEL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
@@ -339,66 +261,119 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
-			$ok=1;
 		}
-		elseif ($action == 'FICHINTER_VALIDATE')
+		elseif ($action == 'FICHINTER_CREATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            $langs->load("other");
+        	$langs->load("other");
             $langs->load("interventions");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
 			$object->fk_element=0;
 			$object->elementtype='';
-			$ok=1;
 		}
-        elseif ($action == 'FICHINTER_SENTBYMAIL')
+		elseif ($action == 'FICHINTER_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("interventions");
-            $langs->load("agenda");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+            $object->sendtoid=0;
+			$object->fk_element=0;
+			$object->elementtype='';
+		}
+		elseif ($action == 'FICHINTER_MODIFY')
+        {
+        	$langs->load("other");
+            $langs->load("interventions");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+            $object->sendtoid=0;
+			$object->fk_element=0;
+			$object->elementtype='';
+		}
+		elseif ($action == 'FICHINTER_SENTBYMAIL')
+        {
+        	$langs->load("other");
+            $langs->load("interventions");
 
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
-
-            // Parameters $object->sendotid defined by caller
+            // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
         }
-    	elseif ($action == 'SHIPPING_VALIDATE')
+        elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
+        {
+            $langs->load("other");
+            $langs->load("interventions");
+
+            $object->actiontypecode='AC_OTH_AUTO';
+           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+            $object->sendtoid=0;
+        }
+	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+        {
+            $langs->load("other");
+            $langs->load("interventions");
+
+            $object->actiontypecode='AC_OTH_AUTO';
+           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+            $object->sendtoid=0;
+        }
+        elseif ($action == 'FICHINTER_DELETE')
+        {
+            $langs->load("other");
+            $langs->load("interventions");
+
+			$object->actiontypecode='AC_OTH_AUTO';
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
+            $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
+            $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
+            $object->sendtoid=0;
+			$object->fk_element=0;
+			$object->elementtype='';
+		}
+        elseif ($action == 'SHIPPING_VALIDATE')
         {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         	$langs->load("other");
         	$langs->load("sendings");
-        	$langs->load("agenda");
 
         	$object->actiontypecode='AC_OTH_AUTO';
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",$object->ref);
+        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
         	if (empty($object->actionmsg))
         	{
-        		$object->actionmsg=$langs->transnoentities("ShippingValidated",$object->ref);
+        		$object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
         		$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
         	}
 
         	// Parameters $object->sendtoid defined by caller
         	//$object->sendtoid=0;
-        	$ok=1;
         }
 		elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("sendings");
-            $langs->load("agenda");
 
             $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
@@ -410,27 +385,21 @@ class InterfaceActionsAuto
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("orders");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
-            $ok=1;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$langs->load("orders");
-			$langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
@@ -438,13 +407,10 @@ class InterfaceActionsAuto
 			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$langs->load("orders");
-			$langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
@@ -452,14 +418,11 @@ class InterfaceActionsAuto
 			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
         elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
             $langs->load("orders");
 
             $object->actiontypecode='AC_OTH_AUTO';
@@ -470,31 +433,25 @@ class InterfaceActionsAuto
                 $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
             }
 
-            // Parameters $object->sendotid defined by caller
+            // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
         }
 		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
             $object->sendtoid=0;
-            $ok=1;
 		}
         elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
             $langs->load("orders");
 
             $object->actiontypecode='AC_OTH_AUTO';
@@ -507,14 +464,11 @@ class InterfaceActionsAuto
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
-            $ok=1;
         }
 		elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
@@ -522,14 +476,11 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
 		elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("bills");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
@@ -537,33 +488,27 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
 		}
 
         // Members
         elseif ($action == 'MEMBER_VALIDATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("members");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
             $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("members");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref);
@@ -575,18 +520,11 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
-        }
-        elseif ($action == 'MEMBER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         }
         elseif ($action == 'MEMBER_RESILIATE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("members");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
@@ -596,14 +534,11 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
         }
         elseif ($action == 'MEMBER_DELETE')
         {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("other");
             $langs->load("members");
-            $langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
@@ -613,32 +548,27 @@ class InterfaceActionsAuto
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
 			$object->sendtoid=0;
-			$ok=1;
         }
 
         // Projects
         elseif ($action == 'PROJECT_CREATE')
         {
-        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
         	$langs->load("other");
         	$langs->load("projects");
-        	$langs->load("agenda");
 
         	$object->actiontypecode='AC_OTH_AUTO';
         	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
         	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
         	$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+
         	$object->sendtoid=0;
-        	$ok=1;
         }
 
 		// Project tasks
 		elseif($action == 'TASK_CREATE') {
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$langs->load("other");
 			$langs->load("projects");
-			$langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
 
@@ -647,14 +577,12 @@ class InterfaceActionsAuto
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
-			$ok=1;
+			$object->sendtoid=0;
 		}
 
 		elseif($action == 'TASK_MODIFY') {
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$langs->load("other");
 			$langs->load("projects");
-			$langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
@@ -662,14 +590,12 @@ class InterfaceActionsAuto
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
-			$ok=1;
+			$object->sendtoid=0;
 		}
 
 		elseif($action == 'TASK_DELETE') {
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$langs->load("other");
 			$langs->load("projects");
-			$langs->load("agenda");
 
 			$object->actiontypecode='AC_OTH_AUTO';
 			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
@@ -677,7 +603,7 @@ class InterfaceActionsAuto
 			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
 			$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
 
-			$ok=1;
+			$object->sendtoid=0;
 		}
 
 		// The trigger was enabled but we are missing the implementation, let the log know
@@ -687,63 +613,65 @@ class InterfaceActionsAuto
 			return 0;
 		}
 
+		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
         // Add entry in event table
-        if ($ok)
-        {
-			$now=dol_now();
+		$now=dol_now();
 
-			if(isset($_SESSION['listofnames']))
+		if(isset($_SESSION['listofnames']))
+		{
+			$attachs=$_SESSION['listofnames'];
+			if($attachs && strpos($action,'SENTBYMAIL'))
 			{
-				$attachs=$_SESSION['listofnames'];
-				if($attachs && strpos($action,'SENTBYMAIL'))
-				{
-					 $object->actionmsg.="\n".$langs->transnoentities("AttachedFiles").': '.$attachs;
-				}
+				 $object->actionmsg.="\n".$langs->transnoentities("AttachedFiles").': '.$attachs;
 			}
+		}
 
-            require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-            require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-			$contactforaction=new Contact($this->db);
-            $societeforaction=new Societe($this->db);
-            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
-            if ($object->socid > 0)    $societeforaction->fetch($object->socid);
+        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		$contactforaction=new Contact($this->db);
+        $societeforaction=new Societe($this->db);
+        if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+        if ($object->socid > 0)    $societeforaction->fetch($object->socid);
 
-			// Insertion action
-			require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-			$actioncomm = new ActionComm($this->db);
-			$actioncomm->type_code   = $object->actiontypecode;		// code of parent table llx_c_actioncomm (will be deprecated)
-			$actioncomm->code='AC_'.$action;
-			$actioncomm->label       = $object->actionmsg2;
-			$actioncomm->note        = $object->actionmsg;
-			$actioncomm->datep       = $now;
-			$actioncomm->datef       = $now;
-			$actioncomm->durationp   = 0;
-			$actioncomm->punctual    = 1;
-			$actioncomm->percentage  = -1;   // Not applicable
-			$actioncomm->contact     = $contactforaction;
-			$actioncomm->societe     = $societeforaction;
-			$actioncomm->author      = $user;   // User saving action
-			$actioncomm->usertodo    = $user;	// User action is assigned to (owner of action)
-			$actioncomm->userdone    = $user;	// User doing action (deprecated, not used anymore)
+		// Insertion action
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		$actioncomm = new ActionComm($this->db);
+		$actioncomm->type_code   = $object->actiontypecode;		// code of parent table llx_c_actioncomm (will be deprecated)
+		$actioncomm->code='AC_'.$action;
+		$actioncomm->label       = $object->actionmsg2;
+		$actioncomm->note        = $object->actionmsg;
+		$actioncomm->datep       = $now;
+		$actioncomm->datef       = $now;
+		$actioncomm->durationp   = 0;
+		$actioncomm->punctual    = 1;
+		$actioncomm->percentage  = -1;   // Not applicable
+		$actioncomm->societe     = $societeforaction;
+		$actioncomm->contact     = $contactforaction;
+		$actioncomm->socid       = $societeforaction->id;
+		$actioncomm->contactid   = $contactforaction->id;
+		$actioncomm->authorid    = $user->id;   // User saving action
+		$actioncomm->userownerid = $user->id;	// Owner of action
+		//$actioncomm->userdone    = $user;	    // User doing action (not used anymore)
+		//$actioncomm->userdoneid  = $user->id;	// User doing action (not used anymore)
 
-			$actioncomm->fk_element  = $object->id;
-			$actioncomm->elementtype = $object->element;
+		$actioncomm->fk_element  = $object->id;
+		$actioncomm->elementtype = $object->element;
 
-			$ret=$actioncomm->add($user);       // User qui saisit l'action
-			if ($ret > 0)
-			{
-				$_SESSION['LAST_ACTION_CREATED'] = $ret;
-				return 1;
-			}
-			else
-			{
-                $error ="Failed to insert event : ".$actioncomm->error." ".join(',',$actioncomm->errors);
-                $this->error=$error;
-                $this->errors=$actioncomm->errors;
+		$ret=$actioncomm->add($user);       // User qui saisit l'action
+		if ($ret > 0)
+		{
+			$_SESSION['LAST_ACTION_CREATED'] = $ret;
+			return 1;
+		}
+		else
+		{
+            $error ="Failed to insert event : ".$actioncomm->error." ".join(',',$actioncomm->errors);
+            $this->error=$error;
+            $this->errors=$actioncomm->errors;
 
-                dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
-                return -1;
-			}
+            dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
+            return -1;
 		}
 
 		return 0;
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 7bc742d3a26..652a1ec8d6b 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,83 +21,34 @@
  *  \ingroup    core
  *  \brief      Fichier de gestion des triggers LDAP
  */
-require_once (DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
-require_once (DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
+
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT."/core/class/ldap.class.php";
+require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
 
 /**
  *  Class of triggers for ldap module
  */
-class InterfaceLdapsynchro
+class InterfaceLdapsynchro extends DolibarrTriggers
 {
-    var $db;
-    var $error;
+	public $family = 'ldap';
+	public $description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
+	public $version = self::VERSION_DOLIBARR;
+	public $picto = 'technic';
 
-
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "ldap";
-        $this->description = "Triggers of this module allows to synchronize Dolibarr toward a LDAP database.";
-        $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-        $this->picto = 'technic';
-    }
-
-    /**
-     *   Return name of trigger file
-     *
-     *   @return     string      Name of trigger file
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     *   Return description of trigger file
-     *
-     *   @return     string      Description of trigger file
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     *   Return version of trigger file
-     *
-     *   @return     string      Version of trigger file
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-
-    /**
-     *      Function called when a Dolibarrr business event is done.
-     *      All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers
-     *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-	function run_trigger($action,$object,$user,$langs,$conf)
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
         if (empty($conf->ldap->enabled)) return 0;     // Module not active, we do nothing
 
@@ -215,7 +167,7 @@ class InterfaceLdapsynchro
 				$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);
 
-	    	    $result=$ldap->delete($dn,$info,$user);
+	    	    $result=$ldap->delete($dn);
 				if ($result < 0)
 				{
 					$this->error="ErrorLDAP ".$ldap->error;
@@ -372,7 +324,7 @@ class InterfaceLdapsynchro
 				$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);
 
-	    	    $result=$ldap->delete($dn,$info,$user);
+	    	    $result=$ldap->delete($dn);
 				if ($result < 0)
 				{
 					$this->error="ErrorLDAP ".$ldap->error;
@@ -449,7 +401,7 @@ class InterfaceLdapsynchro
 				$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);
 
-	    	    $result=$ldap->delete($dn,$info,$user);
+	    	    $result=$ldap->delete($dn);
 				if ($result < 0)
 				{
 					$this->error="ErrorLDAP ".$ldap->error;
@@ -626,7 +578,7 @@ class InterfaceLdapsynchro
 				$info=$object->_load_ldap_info();
 				$dn=$object->_load_ldap_dn($info);
 
-				$result=$ldap->delete($dn,$info,$user);
+				$result=$ldap->delete($dn);
 				if ($result < 0)
 				{
 					$this->error="ErrorLDAP ".$ldap->error;
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index 01ce1f7e539..467cf678c07 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,84 +21,34 @@
  *  \ingroup    core
  *  \brief      File to manage triggers Mailman and Spip
  */
-require_once (DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php");
-require_once (DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
+require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
 
 
 /**
  *  Class of triggers for MailmanSpip module
  */
-class InterfaceMailmanSpipsynchro
+class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 {
-    var $db;
-    var $error;
+	public $family = 'ldap';
+	public $description = "Triggers of this module allows to synchronize Mailman an Spip.";
+	public $version = self::VERSION_DOLIBARR;
+	public $picto = 'technic';
 
-
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "ldap";
-        $this->description = "Triggers of this module allows to synchronize Mailman an Spip.";
-        $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-        $this->picto = 'technic';
-    }
-
-    /**
-     *   Return name of trigger file
-     *
-     *   @return     string      Name of trigger file
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     *   Return description of trigger file
-     *
-     *   @return     string      Description of trigger file
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     *   Return version of trigger file
-     *
-     *   @return     string      Version of trigger file
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-
-    /**
-     *      Function called when a Dolibarrr business event is done.
-     *      All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers
-     *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-	function run_trigger($action,$object,$user,$langs,$conf)
-    {
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
         if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
 
         if (! function_exists('ldap_connect'))
@@ -106,38 +57,7 @@ class InterfaceMailmanSpipsynchro
         	return 0;
         }
 
-        // Users
-        if ($action == 'USER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-        }
-        elseif ($action == 'USER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_SETINGROUP')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_REMOVEFROMGROUP')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-
-        elseif ($action == 'CATEGORY_LINK')
+        if ($action == 'CATEGORY_LINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -211,10 +131,6 @@ class InterfaceMailmanSpipsynchro
 
 			return $return;
         }
-        elseif ($action == 'MEMBER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		}
         elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -231,16 +147,10 @@ class InterfaceMailmanSpipsynchro
 			{
 				$return=1;
 			}
+
+	        return $return;
         }
 
-		// If not found
-/*
-        else
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
-			return -1;
-        }
-*/
 		return 0;
     }
 
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index c035acac207..940e3a1712d 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2013-2014 Marcos García        <marcosgdf@gmail.com>
  *
  * 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 +22,19 @@
  *  \ingroup    notification
  *  \brief      File of class of triggers for notification module
  */
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 
 
 /**
  *  Class of triggers for notification module
  */
-class InterfaceNotification
+class InterfaceNotification extends DolibarrTriggers
 {
-    var $db;
+	public $family = 'notification';
+	public $description = "Triggers of this module send email notifications according to Notification module setup.";
+	public $version = self::VERSION_DOLIBARR;
+	public $picto = 'email';
+
     var $listofmanagedevents=array(
     	'BILL_VALIDATE',
     	'ORDER_VALIDATE',
@@ -40,187 +45,29 @@ class InterfaceNotification
         'SHIPPING_VALIDATE'
    	);
 
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "notification";
-        $this->description = "Triggers of this module send email notifications according to Notification module setup.";
-        $this->version = 'dolibarr';                        // 'experimental' or 'dolibarr' or version
-        $this->picto = 'email';
-    }
-
-    /**
-     *   Return name of trigger file
-     *
-     *   @return     string      Name of trigger file
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     *   Return description of trigger file
-     *
-     *   @return     string      Description of trigger file
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     *   Return version of trigger file
-     *
-     *   @return     string      Version of trigger file
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-
-    /**
-     *      Function called when a Dolibarrr business event is done.
-     *      All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers
-     *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-	function run_trigger($action,$object,$user,$langs,$conf)
-    {
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
+	 *
+	 * @param string		$action		Event action code
+	 * @param Object		$object     Object
+	 * @param User		    $user       Object user
+	 * @param Translate 	$langs      Object langs
+	 * @param conf		    $conf       Object conf
+	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
 		if (empty($conf->notification->enabled)) return 0;     // Module not active, we do nothing
 
+		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
 		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
 
-		if ($action == 'BILL_VALIDATE')
-		{
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		$notify = new Notify($this->db);
+		$notify->send($action, $object);
 
-            $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-            if (! file_exists($filepdf)) $filepdf='';
-            $filepdf='';	// We can't add PDF as it is not generated yet.
-            $langs->load("other");
-			$mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref);
-
-            $notify = new Notify($this->db);
-            $notify->send($action, $object->socid, $mesg, 'facture', $object->id, $filepdf);
-		}
-
-		elseif ($action == 'ORDER_VALIDATE')
-		{
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-            if (! file_exists($filepdf)) $filepdf='';
-            $filepdf='';	// We can't add PDF as it is not generated yet.
-            $langs->load("other");
-			$mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref);
-
-            $notify = new Notify($this->db);
-            $notify->send($action, $object->socid, $mesg, 'order', $object->id, $filepdf);
-		}
-
-		elseif ($action == 'PROPAL_VALIDATE')
-		{
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->propal->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-            if (! file_exists($filepdf)) $filepdf='';
-            $filepdf='';	// We can't add PDF as it is not generated yet.
-            $langs->load("other");
-			$mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref);
-
-            $notify = new Notify($this->db);
-            $notify->send($action, $object->socid, $mesg, 'propal', $object->id, $filepdf);
-		}
-
-		elseif ($action == 'FICHINTER_VALIDATE')
-		{
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-            if (! file_exists($filepdf)) $filepdf='';
-            $filepdf='';	// We can't add PDF as it is not generated yet.
-            $langs->load("other");
-			$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref);
-
-            $notify = new Notify($this->db);
-            $notify->send($action, $object->socid, $mesg, 'ficheinter', $object->id, $filepdf);
-		}
-
-		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
-		{
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf';
-            if (! file_exists($filepdf)) $filepdf='';
-            $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-			$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs));
-			$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
-
-            $notify = new Notify($this->db);
-            $notify->send($action, $object->socid, $mesg, 'order_supplier', $object->id, $filepdf);
-		}
-
-		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
-		{
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->fournisseur->dir_output . '/commande/' . $ref . '/' . $ref . '.pdf';
-            if (! file_exists($filepdf)) $filepdf='';
-			$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-			$mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs));
-			$mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
-
-            $notify = new Notify($this->db);
-            $notify->send($action, $object->socid, $mesg, 'order_supplier', $object->id, $filepdf);
-		}
-        elseif ($action == 'SHIPPING_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-            $ref = dol_sanitizeFileName($object->ref);
-            $filepdf = $conf->expedition->dir_output . '/sending/' . $ref . '/' . $ref . '.pdf';
-            if (! file_exists($filepdf)) $filepdf='';
-            $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref);
-
-
-            $notify = new Notify($this->db);
-            $notify->send($action, $object->socid, $mesg, 'expedition', $object->id, $filepdf);
-        }
-
-		// If not found
-/*
-        else
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
-			return -1;
-        }
-*/
-		return 0;
+		return 1;
     }
 
 
@@ -231,14 +78,14 @@ class InterfaceNotification
      */
     function getListOfManagedEvents()
     {
-        global $conf,$langs;
+        global $conf;
 
         $ret=array();
 
         $sql = "SELECT rowid, code, label, description, elementtype";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
         $sql.= $this->db->order("elementtype, code");
-        dol_syslog("Get list of notifications sql=".$sql);
+        dol_syslog("Get list of notifications", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index be0ec9346ae..d3abf17501d 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2005-2014 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014      Marcos García		<marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,615 +28,225 @@
  *              - Le nom de la classe doit etre InterfaceMytrigger
  *              - Le nom de la propriete name doit etre Mytrigger
  */
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
 
 
 /**
  *  Class of triggers for demo module
  */
-class InterfaceDemo
+class InterfaceDemo extends DolibarrTriggers
 {
-    var $db;
-    
-    /**
-     *   Constructor
-     *
-     *   @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-    
-        $this->name = preg_replace('/^Interface/i','',get_class($this));
-        $this->family = "demo";
-        $this->description = "Triggers of this module are empty functions. They have no effect. They are provided for tutorial purpose only.";
-        $this->version = 'dolibarr';            // 'development', 'experimental', 'dolibarr' or version
-        $this->picto = 'technic';
-    }
-    
-    
-    /**
-     *   Return name of trigger file
-     *
-     *   @return     string      Name of trigger file
-     */
-    function getName()
-    {
-        return $this->name;
-    }
-    
-    /**
-     *   Return description of trigger file
-     *
-     *   @return     string      Description of trigger file
-     */
-    function getDesc()
-    {
-        return $this->description;
-    }
 
-    /**
-     *   Return version of trigger file
-     *
-     *   @return     string      Version of trigger file
-     */
-    function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
+	public $family = 'demo';
+	public $picto = 'technic';
+	public $description = "Triggers of this module are empty functions. They have no effect. They are provided for tutorial purpose only.";
+	public $version = self::VERSION_DOLIBARR;
 
-        if ($this->version == 'development') return $langs->trans("Development");
-        elseif ($this->version == 'experimental') return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else return $langs->trans("Unknown");
-    }
-    
-    /**
-     *      Function called when a Dolibarrr business event is done.
-     *      All functions "run_trigger" are triggered if file is inside directory htdocs/core/triggers
+	/**
+     * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers or htdocs/module/code/triggers (and declared)
      *
-     *      @param	string		$action		Event action code
-     *      @param  Object		$object     Object
-     *      @param  User		$user       Object user
-     *      @param  Translate	$langs      Object langs
-     *      @param  conf		$conf       Object conf
-     *      @return int         			<0 if KO, 0 if no triggered ran, >0 if OK
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
      */
-	function run_trigger($action,$object,$user,$langs,$conf)
+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-        // Put here code you want to execute when a Dolibarr business events occurs.
+		// Put here code you want to execute when a Dolibarr business events occurs.
         // Data and type of action are stored into $object and $action
-    
-        // Users
-        if ($action == 'USER_LOGIN')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_UPDATE_SESSION')
-        {
-            // Warning: To increase performances, this action is triggered only if 
-            // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_CREATE_FROM_CONTACT')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_LOGOUT')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_SETINGROUP')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'USER_REMOVEFROMGROUP')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+	    
+	    switch ($action) {
+		    
+		    // Users
+		    case 'USER_LOGIN':
+		    case 'USER_UPDATE_SESSION':
+		    case 'USER_CREATE':
+		    case 'USER_CREATE_FROM_CONTACT':
+		    case 'USER_LOGIN':
+			// Warning: To increase performances, this action is triggered only if
+			// constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
+		    case 'USER_UPDATE_SESSION':
+		    case 'USER_CREATE':
+		    case 'USER_CREATE_FROM_CONTACT':
+		    case 'USER_MODIFY':
+		    case 'USER_NEW_PASSWORD':
+		    case 'USER_ENABLEDISABLE':
+		    case 'USER_DELETE':
+		    case 'USER_LOGOUT':
+		    case 'USER_SETINGROUP':
+		    case 'USER_REMOVEFROMGROUP':
+				
+		    // Actions
+		    case 'ACTION_MODIFY':
+		    case 'ACTION_CREATE':
+		    case 'ACTION_DELETE':
 
-		// Groups
-		elseif ($action == 'GROUP_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'GROUP_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'GROUP_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		
-        // Companies
-        elseif ($action == 'COMPANY_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'COMPANY_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'COMPANY_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+		    // Groups
+		    case 'GROUP_CREATE':
+		    case 'GROUP_MODIFY':
+		    case 'GROUP_DELETE':
 
-        // Contacts
-        elseif ($action == 'CONTACT_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CONTACT_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CONTACT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			// Companies
+		    case 'COMPANY_CREATE':
+		    case 'COMPANY_MODIFY':
+		    case 'COMPANY_DELETE':
 
-        // Products
-        elseif ($action == 'PRODUCT_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PRODUCT_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PRODUCT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			// Contacts
+		    case 'CONTACT_CREATE':
+		    case 'CONTACT_MODIFY':
+		    case 'CONTACT_DELETE':
+		    case 'CONTACT_ENABLEDISABLE':
 
-		// Customer orders
-        elseif ($action == 'ORDER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_CLONE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_BUILDDOC')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SENTBYMAIL')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_CLASSIFY_BILLED')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEORDER_INSERT')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEORDER_UPDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEORDER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			// Products
+		    case 'PRODUCT_CREATE':
+		    case 'PRODUCT_MODIFY':
+		    case 'PRODUCT_DELETE':
+		    case 'PRODUCT_PRICE_MODIFY':
 
-		// Supplier orders
-        elseif ($action == 'ORDER_SUPPLIER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SUPPLIER_CLONE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }      
-        elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SUPPLIER_DELETE')
-        {   
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SUPPLIER_APPROVE')
-        {   
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SUPPLIER_REFUSE')
-        {   
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SUPPLIER_CANCEL')
-        {   
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'ORDER_SUPPLIER_BUILDDOC')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEORDER_SUPPLIER_DISPATCH')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEORDER_SUPPLIER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEORDER_SUPPLIER_UPDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			//Stock mouvement
+		    case 'STOCK_MOVEMENT':
 
-        // Proposals
-        elseif ($action == 'PROPAL_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_CLONE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_BUILDDOC')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_SENTBYMAIL')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_CLOSE_SIGNED')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_CLOSE_REFUSED')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROPAL_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEPROPAL_INSERT')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEPROPAL_UPDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINEPROPAL_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			//MYECMDIR
+		    case 'MYECMDIR_DELETE':
+		    case 'MYECMDIR_CREATE':
+		    case 'MYECMDIR_MODIFY':
 
-        // Contracts
-        elseif ($action == 'CONTRACT_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CONTRACT_ACTIVATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CONTRACT_CANCEL')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CONTRACT_CLOSE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CONTRACT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINECONTRACT_UPDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'LINECONTRACT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			// Customer orders
+		    case 'ORDER_CREATE':
+		    case 'ORDER_CLONE':
+		    case 'ORDER_VALIDATE':
+		    case 'ORDER_DELETE':
+		    case 'ORDER_SENTBYMAIL':
+		    case 'ORDER_CLASSIFY_BILLED':
+		    case 'LINEORDER_INSERT':
+		    case 'LINEORDER_UPDATE':
+		    case 'LINEORDER_DELETE':
 
-        // Bills
-        elseif ($action == 'BILL_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_CLONE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'BILL_UNVALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_BUILDDOC')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_SENTBYMAIL')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_CANCEL')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'BILL_PAYED')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'LINEBILL_INSERT')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'LINEBILL_UPDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'LINEBILL_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			// Supplier orders
+		    case 'ORDER_SUPPLIER_CREATE':
+		    case 'ORDER_SUPPLIER_CLONE':
+		    case 'ORDER_SUPPLIER_VALIDATE':
+		    case 'ORDER_SUPPLIER_DELETE':
+		    case 'ORDER_SUPPLIER_APPROVE':
+		    case 'ORDER_SUPPLIER_REFUSE':
+		    case 'ORDER_SUPPLIER_CANCEL':
+		    case 'ORDER_SUPPLIER_SENTBYMAIL':
+		    case 'LINEORDER_SUPPLIER_DISPATCH':
+		    case 'LINEORDER_SUPPLIER_CREATE':
+		    case 'LINEORDER_SUPPLIER_UPDATE':
 
-		//Supplier Bill
-		elseif ($action == 'BILL_SUPPLIER_CREATE')
-        {
-             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'BILL_SUPPLIER_DELETE')
-        {
-             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'BILL_SUPPLIER_PAYED')
-        {
-             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'BILL_SUPPLIER_UNPAYED')
-        {
-             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
-        {
-             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'LINEBILL_SUPPLIER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'LINEBILL_SUPPLIER_UPDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-		elseif ($action == 'LINEBILL_SUPPLIER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
- 
-        // Payments
-        elseif ($action == 'PAYMENT_CUSTOMER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PAYMENT_SUPPLIER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PAYMENT_ADD_TO_BANK')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PAYMENT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			// Proposals
+		    case 'PROPAL_CREATE':
+		    case 'PROPAL_CLONE':
+		    case 'PROPAL_MODIFY':
+		    case 'PROPAL_VALIDATE':
+		    case 'PROPAL_SENTBYMAIL':
+		    case 'PROPAL_CLOSE_SIGNED':
+		    case 'PROPAL_CLOSE_REFUSED':
+		    case 'PROPAL_DELETE':
+		    case 'LINEPROPAL_INSERT':
+		    case 'LINEPROPAL_UPDATE':
+		    case 'LINEPROPAL_DELETE':
 
-		// Interventions
-		elseif ($action == 'FICHINTER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'FICHINTER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'FICHINTER_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-	    elseif ($action == 'FICHINTER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-	    elseif ($action == 'LINEFICHINTER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-	    elseif ($action == 'LINEFICHINTER_UPDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-	    elseif ($action == 'LINEFICHINTER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        
-        // Members
-        elseif ($action == 'MEMBER_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'MEMBER_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'MEMBER_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'MEMBER_NEW_PASSWORD')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'MEMBER_RESILIATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'MEMBER_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        
-        // Categories
-        elseif ($action == 'CATEGORY_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CATEGORY_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'CATEGORY_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        
-        // Projects
-        elseif ($action == 'PROJECT_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROJECT_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROJECT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'PROJECT_BUILDDOC')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        
-        // Project tasks
-        elseif ($action == 'TASK_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'TASK_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'TASK_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        
-        // Task time spent
-        elseif ($action == 'TASK_TIMESPENT_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'TASK_TIMESPENT_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'TASK_TIMESPENT_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        
-        // Shipping
-        elseif ($action == 'SHIPPING_CREATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'SHIPPING_MODIFY')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'SHIPPING_VALIDATE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'SHIPPING_SENTBYMAIL')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'SHIPPING_DELETE')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
-        elseif ($action == 'SHIPPING_BUILDDOC')
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        }
+			// Contracts
+		    case 'CONTRACT_CREATE':
+		    case 'CONTRACT_ACTIVATE':
+		    case 'CONTRACT_CANCEL':
+		    case 'CONTRACT_CLOSE':
+		    case 'CONTRACT_DELETE':
+		    case 'LINECONTRACT_CREATE':
+		    case 'LINECONTRACT_UPDATE':
+		    case 'LINECONTRACT_DELETE':
 
-		return 0;
-    }
+			// Bills
+		    case 'BILL_CREATE':
+		    case 'BILL_CLONE':
+		    case 'BILL_MODIFY':
+		    case 'BILL_VALIDATE':
+		    case 'BILL_UNVALIDATE':
+		    case 'BILL_SENTBYMAIL':
+		    case 'BILL_CANCEL':
+		    case 'BILL_DELETE':
+		    case 'BILL_PAYED':
+		    case 'LINEBILL_INSERT':
+		    case 'LINEBILL_UPDATE':
+		    case 'LINEBILL_DELETE':
+
+			//Supplier Bill
+		    case 'BILL_SUPPLIER_CREATE':
+		    case 'BILL_SUPPLIER_UPDATE':
+		    case 'BILL_SUPPLIER_DELETE':
+		    case 'BILL_SUPPLIER_PAYED':
+		    case 'BILL_SUPPLIER_UNPAYED':
+		    case 'BILL_SUPPLIER_VALIDATE':
+		    case 'LINEBILL_SUPPLIER_CREATE':
+		    case 'LINEBILL_SUPPLIER_UPDATE':
+		    case 'LINEBILL_SUPPLIER_DELETE':
+
+			// Payments
+		    case 'PAYMENT_CUSTOMER_CREATE':
+		    case 'PAYMENT_SUPPLIER_CREATE':
+		    case 'PAYMENT_ADD_TO_BANK':
+		    case 'PAYMENT_DELETE':
+
+			//Donation
+		    case 'DON_CREATE':
+		    case 'DON_UPDATE':
+		    case 'DON_DELETE':
+
+			// Interventions
+		    case 'FICHINTER_CREATE':
+		    case 'FICHINTER_MODIFY':
+		    case 'FICHINTER_VALIDATE':
+		    case 'FICHINTER_DELETE':
+		    case 'LINEFICHINTER_CREATE':
+		    case 'LINEFICHINTER_UPDATE':
+		    case 'LINEFICHINTER_DELETE':
+
+			// Members
+		    case 'MEMBER_CREATE':
+		    case 'MEMBER_VALIDATE':
+		    case 'MEMBER_SUBSCRIPTION':
+		    case 'MEMBER_MODIFY':
+		    case 'MEMBER_NEW_PASSWORD':
+		    case 'MEMBER_RESILIATE':
+		    case 'MEMBER_DELETE':
+
+			// Categories
+		    case 'CATEGORY_CREATE':
+		    case 'CATEGORY_MODIFY':
+		    case 'CATEGORY_DELETE':
+
+			// Projects
+		    case 'PROJECT_CREATE':
+		    case 'PROJECT_MODIFY':
+		    case 'PROJECT_DELETE':
+
+			// Project tasks
+		    case 'TASK_CREATE':
+		    case 'TASK_MODIFY':
+		    case 'TASK_DELETE':
+
+			// Task time spent
+		    case 'TASK_TIMESPENT_CREATE':
+		    case 'TASK_TIMESPENT_MODIFY':
+		    case 'TASK_TIMESPENT_DELETE':
+
+			// Shipping
+		    case 'SHIPPING_CREATE':
+		    case 'SHIPPING_MODIFY':
+		    case 'SHIPPING_VALIDATE':
+		    case 'SHIPPING_SENTBYMAIL':
+		    case 'SHIPPING_DELETE':
+		        dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			    break;
+			    
+	    }
+
+        return 0;
+	}
 
 }
-?>
diff --git a/htdocs/cron/admin/index.html b/htdocs/cron/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 0a68ca211b9..17704972170 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -278,7 +278,7 @@ if ($action == 'execute'){
 
 if (empty($object->status) && $action != 'create')
 {
-	dol_htmloutput_mesg($langs->trans("CronTaskInactive"),'','warning',1);
+	setEventMessage($langs->trans("CronTaskInactive"), 'warnings');
 }
 
 if (($action=="create") || ($action=="edit"))
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index f1fc788a198..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);
@@ -224,7 +224,7 @@ class Cronjob extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -309,7 +309,7 @@ class Cronjob extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
         $sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -356,7 +356,6 @@ class Cronjob extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -429,7 +428,7 @@ class Cronjob extends CommonObject
     		$sql.= " WHERE ".implode(' AND ',$sqlwhere);
     	}
 
-    	dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
     	$resql=$this->db->query($sql);
     	if ($resql)
     	{
@@ -490,7 +489,6 @@ class Cronjob extends CommonObject
     	else
     	{
     		$this->error="Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
     		return -1;
     	}
     }
@@ -503,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;
 
@@ -609,7 +607,7 @@ class Cronjob extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -683,7 +681,7 @@ class Cronjob extends CommonObject
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
     		$sql.= " WHERE rowid=".$this->id;
 
-    		dol_syslog(get_class($this)."::delete sql=".$sql);
+    		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
     		$resql = $this->db->query($sql);
         	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
@@ -816,7 +814,7 @@ class Cronjob extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as f";
 		$sql.= " WHERE f.rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -836,7 +834,6 @@ class Cronjob extends CommonObject
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
diff --git a/htdocs/cron/class/index.html b/htdocs/cron/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cron/index.html b/htdocs/cron/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 95dd669d023..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;
@@ -165,17 +165,17 @@ print '<input type="hidden" name="status" value="'.$status.'" >';
 print '<table width="100%" class="noborder">';
 print '<tr class="liste_titre">';
 $arg_url='&page='.$page.'&status='.$status.'&search_label='.$search_label;
-print_liste_field_titre($langs->trans("CronLabel"),$_SERVEUR['PHP_SELF'],"t.label","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronLabel"),$_SERVER["PHP_SELF"],"t.label","",$arg_url,'',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("CronTask"),'','',"",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtStart"),$_SERVEUR['PHP_SELF'],"t.datestart","",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVEUR['PHP_SELF'],"t.dateend","",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVEUR['PHP_SELF'],"t.datelastrun","",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVEUR['PHP_SELF'],"t.datenextrun","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtStart"),$_SERVER["PHP_SELF"],"t.datestart","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVER["PHP_SELF"],"t.dateend","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVER["PHP_SELF"],"t.datelastrun","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVER["PHP_SELF"],"t.datenextrun","",$arg_url,'',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("CronFrequency"),'',"","",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Enabled"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronNbRun"),$_SERVER["PHP_SELF"],"t.nbrun","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronLastResult"),$_SERVER["PHP_SELF"],"t.lastresult","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVER["PHP_SELF"],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("Enabled"),$_SERVER["PHP_SELF"],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder);
 print '<td></td>';
 print '</tr>';
 
diff --git a/htdocs/ecm/ajax/index.html b/htdocs/ecm/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index ea29d822102..6c0de13d15b 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -142,7 +142,7 @@ class EcmDirectory // extends CommonObject
 			$sql.= " '".$this->fk_user_c."'";
 			$sql.= ")";
 
-			dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -152,12 +152,10 @@ class EcmDirectory // extends CommonObject
 				$result=dol_mkdir($dir);
 				if ($result < 0) { $error++; $this->error="ErrorFailedToCreateDir"; }
 
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('MYECMDIR_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('MYECMDIR_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 
 				if (! $error)
 				{
@@ -173,7 +171,6 @@ class EcmDirectory // extends CommonObject
 			else
 			{
 				$this->error="Error ".$this->db->lasterror();
-				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
@@ -187,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;
 
@@ -210,23 +207,20 @@ class EcmDirectory // extends CommonObject
 		$sql.= " description='".$this->db->escape($this->description)."'";
 		$sql.= " WHERE rowid=".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$error++;
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog("EcmDirectories::update ".$this->error, LOG_ERR);
 		}
 
 		if (! $error && ! $notrigger)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('MYECMDIR_MODIFY',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('MYECMDIR_MODIFY',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
 		}
 
 		if (! $error)
@@ -257,12 +251,11 @@ class EcmDirectory // extends CommonObject
 		$sql.= " cachenbofdoc = cachenbofdoc ".$sign." 1";
 		$sql.= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::changeNbOfFiles sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::changeNbOfFiles", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::changeNbOfFiles ".$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -291,7 +284,7 @@ class EcmDirectory // extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."ecm_directories as t";
 		$sql.= " WHERE t.rowid = ".$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -318,7 +311,6 @@ class EcmDirectory // extends CommonObject
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -348,15 +340,25 @@ class EcmDirectory // extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_directories";
 		$sql.= " WHERE rowid=".$this->id;
 
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql)
 		{
 			$this->db->rollback();
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			return -2;
 		}
+		else
+		{
+            // Call trigger
+            $result=$this->call_trigger('MYECMDIR_DELETE',$user);
+            if ($result < 0)
+            {
+            	$this->db->rollback();
+            	return -2;
+            }
+            // End call triggers
+		}
 
 		if ($mode != 'databaseonly')
 		{
@@ -376,16 +378,6 @@ class EcmDirectory // extends CommonObject
 			$error++;
 		}
 
-		if (! $error)
-		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('MYECMDIR_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-		}
-
 		if (! $error) return 1;
 		else return -1;
 	}
@@ -499,7 +491,7 @@ class EcmDirectory // extends CommonObject
 		$sql.= " WHERE fk_parent != 0";
 		$sql.= " AND entity = ".$conf->entity;
 
-		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
+		dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -519,7 +511,7 @@ class EcmDirectory // extends CommonObject
 
 
 	/**
-	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau
+	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau à partir de la base de donnée
 	 *	Renvoi un tableau de tableau('id','id_mere',...) trie selon arbre et avec:
 	 *				id                  Id de la categorie
 	 *				id_mere             Id de la categorie mere
@@ -563,7 +555,7 @@ class EcmDirectory // extends CommonObject
 		$sql.= " AND c.entity = ".$conf->entity;
 		$sql.= " ORDER BY c.label, c.rowid";
 
-		dol_syslog(get_class($this)."::get_full_arbo sql=".$sql);
+		dol_syslog(get_class($this)."::get_full_arbo", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -688,7 +680,7 @@ class EcmDirectory // extends CommonObject
 			$sql.= " WHERE entity = ".$conf->entity;
 		}
 
-		dol_syslog(get_class($this)."::refreshcachenboffile sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::refreshcachenboffile", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -698,9 +690,41 @@ class EcmDirectory // extends CommonObject
 		else
 		{
 			$this->error="Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::refreshcachenboffile ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
 
+	/**
+     * Call trigger based on this instance
+     *
+     *  NB: Error from trigger are stacked in errors
+     *  NB2: if trigger fail, action should be canceled.
+     *  NB3: Should be deleted if EcmDirectory extend CommonObject
+     *
+     * @param   string    $trigger_name   trigger's name to execute
+     * @param   User      $user           Object user
+     * @return  int                       Result of run_triggers
+     */
+    function call_trigger($trigger_name, $user)
+    {
+        global $langs,$conf;
+
+        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+        $interface=new Interfaces($this->db);
+        $result=$interface->run_triggers($trigger_name,$this,$user,$langs,$conf);
+        if ($result < 0) {
+            if (!empty($this->errors))
+            {
+                $this->errors=array_merge($this->errors,$interface->errors);
+            }
+            else
+            {
+                $this->errors=$interface->errors;
+            }
+        }
+        return $result;
+
+    }
+
+
 }
diff --git a/htdocs/ecm/class/index.html b/htdocs/ecm/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index f219e352c64..d1fda6b793a 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -104,8 +104,6 @@ print_fiche_titre($langs->trans("ECMAutoOrg"));
 //$head = societe_prepare_head($societe);
 
 
-//dol_fiche_head($head, 'document', $societe->nom);
-
 
 /*
  * Confirmation de la suppression d'une ligne produit
@@ -113,7 +111,7 @@ print_fiche_titre($langs->trans("ECMAutoOrg"));
 if ($_GET['action'] == 'delete_file')
 {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&amp;urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
-	
+
 }
 
 // Construit liste des fichiers
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index e46011c45ba..8f9bd5573bf 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -110,8 +110,6 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 			$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0, 0, $_FILES['userfile']['error']);
 			if (is_numeric($resupload) && $resupload > 0)
 			{
-				//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-				//print_r($_FILES);
 				$result=$ecmdir->changeNbOfFiles('+');
 			}
 			else
@@ -134,7 +132,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		else
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorFailToCreateDir",$upload_dir).'</div>';
+			setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
 		}
 	}
 }
@@ -156,7 +154,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	}
 	else
 	{
-		$mesg='<div class="error">Error '.$langs->trans($ecmdir->error).'</div>';
+		setEventMessage('Error '.$langs->trans($ecmdir->error), 'errors');
 		$action = "create";
 	}
 
@@ -198,7 +196,7 @@ if ($action == 'confirm_deletefile')
 if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 {
 	$result=$ecmdir->delete($user);
-	$mesg = '<div class="ok">'.$langs->trans("ECMSectionWasRemoved", $ecmdir->label).'</div>';
+	setEventMessage($langs->trans("ECMSectionWasRemoved", $ecmdir->label));
 
     clearstatcache();
 }
@@ -324,7 +322,6 @@ if ($action == 'refreshmanual')
     	$dirtotest=$conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (! dol_is_dir($dirtotest))
 		{
-			$mesg.=$dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
 			$ecmdirtmp->id=$dirdesc['id'];
 			$ecmdirtmp->delete($user,'databaseonly');
 			//exit;
@@ -440,9 +437,6 @@ if ($action == 'delete' && empty($conf->use_javascript_ajax))
 
 }
 
-dol_htmloutput_mesg($mesg);
-
-
 if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
 else $classviewhide='visible';
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 9c4ab7e0e2f..7626774b24c 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -110,8 +110,6 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 			$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0, 0, $_FILES['userfile']['error']);
 			if (is_numeric($resupload) && $resupload > 0)
 			{
-				//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-				//print_r($_FILES);
 				$result=$ecmdir->changeNbOfFiles('+');
 			}
 			else
@@ -134,7 +132,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		else
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorFailToCreateDir",$upload_dir).'</div>';
+			setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
 		}
 	}
 }
@@ -156,7 +154,8 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	}
 	else
 	{
-		$mesg='<div class="error">Error '.$langs->trans($ecmdir->error).'</div>';
+		//TODO: Translate
+		setEventMessage('Error '.$langs->trans($ecmdir->error), 'errors');
 		$action = "create";
 	}
 
@@ -198,7 +197,7 @@ if ($action == 'confirm_deletefile')
 if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 {
 	$result=$ecmdir->delete($user);
-	$mesg = '<div class="ok">'.$langs->trans("ECMSectionWasRemoved", $ecmdir->label).'</div>';
+	setEventMessage($langs->trans("ECMSectionWasRemoved", $ecmdir->label));
 
     clearstatcache();
 }
@@ -324,7 +323,6 @@ if ($action == 'refreshmanual')
     	$dirtotest=$conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
 		if (! dol_is_dir($dirtotest))
 		{
-			$mesg.=$dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
 			$ecmdirtmp->id=$dirdesc['id'];
 			$ecmdirtmp->delete($user,'databaseonly');
 			//exit;
@@ -411,6 +409,9 @@ 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))      { $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"));
+	
 }
 
 print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
@@ -436,9 +437,6 @@ if ($action == 'delete' && empty($conf->use_javascript_ajax))
 
 }
 
-dol_htmloutput_mesg($mesg);
-
-
 if (! empty($conf->use_javascript_ajax)) $classviewhide='hidden';
 else $classviewhide='visible';
 
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 301fa5f955b..b348cb03c72 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -42,7 +42,7 @@ $(document).ready(function() {
 		},
 		// Called if we click on a dir (not a file)
 		function(elem) {
-			id=elem.attr('id').substr(12);
+			id=elem.attr('id').substr(12);	// We get id that is 'fmdirlia_id_xxx' (id we want is xxx)
 			jQuery("#formuserfile_section_dir").val(elem.attr('rel'));
    			jQuery("#formuserfile_section_id").val(id);
 			jQuery('#formuserfile').show();
@@ -65,6 +65,9 @@ $(document).ready(function() {
 function loadandshowpreview(filedirname,section)
 {
 	//alert('filedirname='+filedirname);
+	//console.log(filedirname);
+	//console.log(section);
+
 	$('#ecmfileview').empty();
 
 	var url = '<?php echo dol_buildpath('/core/ajax/ajaxdirpreview.php',1); ?>?action=preview&module=ecm&section='+section+'&file='+urlencode(filedirname);
diff --git a/htdocs/ecm/tpl/index.html b/htdocs/ecm/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
new file mode 100644
index 00000000000..423d1565f8c
--- /dev/null
+++ b/htdocs/expedition/card.php
@@ -0,0 +1,1745 @@
+<?php
+/* Copyright (C) 2003-2008	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005		Simon TOSSER			<simon@kornog-computing.com>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
+ * Copyright (C) 2014		Francis Appels			<francis.appels@yahoo.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/expedition/card.php
+ *	\ingroup    expedition
+ *	\brief      Fiche descriptive d'une expedition
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.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 (! empty($conf->stock->enabled))    require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+
+$langs->load("sendings");
+$langs->load("companies");
+$langs->load("bills");
+$langs->load('deliveries');
+$langs->load('orders');
+$langs->load('stocks');
+$langs->load('other');
+$langs->load('propal');
+if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
+
+$origin		= GETPOST('origin','alpha')?GETPOST('origin','alpha'):'expedition';   // Example: commande, propal
+$origin_id 	= GETPOST('id','int')?GETPOST('id','int'):'';
+$id = $origin_id;
+if (empty($origin_id)) $origin_id  = GETPOST('origin_id','int');    // Id of order or propal
+if (empty($origin_id)) $origin_id  = GETPOST('object_id','int');    // Id of order or propal
+$ref=GETPOST('ref','alpha');
+
+// Security check
+$socid='';
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user, $origin, $origin_id);
+
+$action		= GETPOST('action','alpha');
+$confirm	= GETPOST('confirm','alpha');
+
+//PDF
+$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
+$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+
+$object = new Expedition($db);
+
+// Load object
+if ($id > 0 || ! empty($ref))
+{
+	$ret=$object->fetch($id, $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');
+
+if ($action == 'add')
+{
+    $error=0;
+
+    $db->begin();
+
+    $object->note				= GETPOST('note','alpha');
+    $object->origin				= $origin;
+    $object->origin_id			= $origin_id;
+    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
+    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
+    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
+    $object->sizeS				= GETPOST('sizeS','int')==''?"NULL":GETPOST('sizeS','int');
+    $object->size_units			= GETPOST('size_units','int');
+    $object->weight_units		= GETPOST('weight_units','int');
+
+    $date_delivery = dol_mktime(GETPOST('date_deliveryhour','int'), GETPOST('date_deliverymin','int'), 0, GETPOST('date_deliverymonth','int'), GETPOST('date_deliveryday','int'), GETPOST('date_deliveryyear','int'));
+
+    // On va boucler sur chaque ligne du document d'origine pour completer objet expedition
+    // avec info diverses + qte a livrer
+    $classname = ucfirst($object->origin);
+    $objectsrc = new $classname($db);
+    $objectsrc->fetch($object->origin_id);
+
+    $object->socid					= $objectsrc->socid;
+    $object->ref_customer			= $objectsrc->ref_client;
+    $object->date_delivery			= $date_delivery;	// Date delivery planed
+    $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
+    $object->shipping_method_id		= GETPOST('shipping_method_id','int');
+    $object->tracking_number		= GETPOST('tracking_number','alpha');
+    $object->ref_int				= GETPOST('ref_int','alpha');
+    $object->note_private			= GETPOST('note_private');
+    $object->note_public			= GETPOST('note_public');
+
+    $num=count($objectsrc->lines);
+    $totalqty=0;
+    for ($i = 0; $i < $num; $i++)
+    {
+        $qty = "qtyl".$i;
+		$j=0;
+		$sub_qty=array();
+		$subtotalqty=0;
+		$idl="idl".$i;
+		$batch="batchl".$i."_0";
+		if (isset($_POST[$batch])) {
+			//shipment line with batch-enable product
+			$qty .= '_'.$j;
+			while (isset($_POST[$batch])) {
+				$sub_qty[$j]['q']=GETPOST($qty,'int');
+				$sub_qty[$j]['id_batch']=GETPOST($batch,'int');
+				$subtotalqty+=$sub_qty[$j]['q'];
+				$j++;
+				$batch="batchl".$i."_".$j;
+				$qty = "qtyl".$i.'_'.$j;
+
+			}
+			$batch_line[$i]['detail']=$sub_qty;
+			$batch_line[$i]['qty']=$subtotalqty;
+			$batch_line[$i]['ix_l']=GETPOST($idl,'int');
+			$totalqty+=$subtotalqty;
+		} else {
+			//Standard product
+			if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
+		}
+    }
+
+    if ($totalqty > 0)
+    {
+        //var_dump($_POST);exit;
+        for ($i = 0; $i < $num; $i++)
+        {
+            $qty = "qtyl".$i;
+			if (! isset($batch_line[$i])) {
+				if (GETPOST($qty,'int') > 0 || (GETPOST($qty,'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
+				{
+					$ent = "entl".$i;
+					$idl = "idl".$i;
+					$entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
+					if ($entrepot_id < 0) $entrepot_id='';
+
+					$ret=$object->addline($entrepot_id,GETPOST($idl,'int'),GETPOST($qty,'int'));
+					if ($ret < 0)
+					{
+						$mesg='<div class="error">'.$object->error.'</div>';
+						$error++;
+					}
+				}
+			} else {
+				if ($batch_line[$i]['qty']>0) {
+					$ret=$object->addline_batch($batch_line[$i]);
+					if ($ret < 0)
+					{
+						$mesg='<div class="error">'.$object->error.'</div>';
+						$error++;
+					}
+				}
+			}
+        }
+
+        if (! $error)
+        {
+            $ret=$object->create($user);
+            if ($ret <= 0)
+            {
+                $mesg='<div class="error">'.$object->error.'</div>';
+                $error++;
+            }
+        }
+    }
+    else
+    {
+        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Qty")).'</div>';
+        $error++;
+    }
+
+    if (! $error)
+    {
+        $db->commit();
+        header("Location: card.php?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        $db->rollback();
+        $_GET["commande_id"]=GETPOST('commande_id','int');
+        $action='create';
+    }
+}
+
+/*
+ * Build a receiving receipt
+ */
+else if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
+{
+    $result = $object->create_delivery($user);
+    if ($result > 0)
+    {
+        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?id='.$result);
+        exit;
+    }
+    else
+    {
+        $mesg=$object->error;
+    }
+}
+
+else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->valider)
+{
+    $object->fetch_thirdparty();
+
+    $result = $object->valid($user);
+
+    if ($result < 0)
+    {
+		$langs->load("errors");
+        setEventMessage($langs->trans($object->error),'errors');
+    }
+    else
+    {
+    	// Define output language
+    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    	{
+    		$outputlangs = $langs;
+    		$newlang = '';
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    		if (! empty($newlang)) {
+    			$outputlangs = new Translate("", $conf);
+    			$outputlangs->setDefaultLang($newlang);
+    		}
+    		$model=$object->modelpdf;
+    		$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);
+    	}
+    }
+}
+
+else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+{
+    $result = $object->delete();
+    if ($result > 0)
+    {
+        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
+        exit;
+    }
+    else
+	{
+		$langs->load("errors");
+        setEventMessage($langs->trans($object->error),'errors');
+    }
+}
+
+else if ($action == 'reopen' && $user->rights->expedition->valider)
+{
+    $result = $object->setStatut(0);
+    if ($result < 0)
+    {
+        $mesg = $object->error;
+    }
+}
+
+else if ($action == 'setdate_livraison' && $user->rights->expedition->creer)
+{
+    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
+
+    $object->fetch($id);
+    $result=$object->set_date_livraison($user,$datedelivery);
+    if ($result < 0)
+    {
+        $mesg='<div class="error">'.$object->error.'</div>';
+    }
+}
+
+// Action update description of emailing
+else if ($action == 'settrackingnumber' || $action == 'settrackingurl'
+|| $action == 'settrueWeight'
+|| $action == 'settrueWidth'
+|| $action == 'settrueHeight'
+|| $action == 'settrueDepth'
+|| $action == 'setshipping_method_id')
+{
+    $error=0;
+
+    if ($action == 'settrackingnumber')		$object->tracking_number = trim(GETPOST('trackingnumber','alpha'));
+    if ($action == 'settrackingurl')		$object->tracking_url = trim(GETPOST('trackingurl','int'));
+    if ($action == 'settrueWeight')	{
+    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
+		$object->weight_units = GETPOST('weight_units','int');
+    }
+    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
+    if ($action == 'settrueHeight'){
+    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
+					$object->size_units = GETPOST('size_units','int');
+	}
+    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
+    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
+
+    if (! $error)
+    {
+        if ($object->update($user) >= 0)
+        {
+            header("Location: card.php?id=".$object->id);
+            exit;
+        }
+        setEventMessage($object->error,'errors');
+    }
+
+    $action="";
+}
+
+// Build document
+else if ($action == 'builddoc')	// En get ou en post
+{
+
+	// Save last template used to generate document
+	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+    // Define output language
+    $outputlangs = $langs;
+    $newlang='';
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$shipment->client->default_lang;
+    if (! empty($newlang))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang($newlang);
+    }
+	$result = $object->generateDocument($object->modelpdf, $outputlangs);
+    if ($result <= 0)
+    {
+        dol_print_error($db,$result);
+        exit;
+    }
+}
+
+// Delete file in doc form
+elseif ($action == 'remove_file')
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	$upload_dir =	$conf->expedition->dir_output . "/sending";
+	$file =	$upload_dir	. '/' .	GETPOST('file');
+	$ret=dol_delete_file($file,0,0,0,$object);
+	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+}
+
+/*
+ * Add file in email form
+*/
+if (GETPOST('addfile','alpha'))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    // Set tmp user directory TODO Use a dedicated directory for temp mails files
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';
+
+    dol_add_file_process($upload_dir_tmp,0,0);
+    $action ='presend';
+}
+
+/*
+ * Remove file in email form
+*/
+if (GETPOST('removedfile','alpha'))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    // Set tmp user directory
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';
+
+    // TODO Delete only files that was uploaded from email form
+    dol_remove_file_process(GETPOST('removedfile','int'),0);
+    $action ='presend';
+}
+
+/*
+ * Send mail
+*/
+if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile','alpha') && ! GETPOST('cancel','alpha'))
+{
+    $langs->load('mails');
+
+//        $ref = dol_sanitizeFileName($object->ref);
+//        $file = $conf->expedition->dir_output . '/sending/' . $ref . '/' . $ref . '.pdf';
+
+//        if (is_readable($file))
+//        {
+            if (GETPOST('sendto','alpha'))
+            {
+                // Le destinataire a ete fourni via le champ libre
+                $sendto = GETPOST('sendto','alpha');
+                $sendtoid = 0;
+            }
+            elseif (GETPOST('receiver','alpha') != '-1')
+            {
+                // Recipient was provided from combo list
+                if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
+                {
+                    $sendto = $object->client->email;
+                    $sendtoid = 0;
+                }
+                else	// Id du contact
+                {
+                    $sendto = $object->client->contact_get_property(GETPOST('receiver','alpha'),'email');
+                    $sendtoid = GETPOST('receiver','alpha');
+                }
+            }
+
+            if (dol_strlen($sendto))
+            {
+                $langs->load("commercial");
+
+                $from = GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
+                $replyto = GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
+                $message = GETPOST('message');
+                $sendtocc = GETPOST('sendtocc','alpha');
+                $deliveryreceipt = GETPOST('deliveryreceipt','alpha');
+
+                if ($action == 'send')
+                {
+                    if (dol_strlen(GETPOST('subject','alpha'))) $subject=GETPOST('subject','alpha');
+                    else $subject = $langs->transnoentities('Shipping').' '.$object->ref;
+                    $actiontypecode='AC_SHIP';
+                    $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);
+                    }
+                    $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
+                }
+
+                // Create form object
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+
+                $attachedfiles=$formmail->get_attached_files();
+                $filepath = $attachedfiles['paths'];
+                $filename = $attachedfiles['names'];
+                $mimetype = $attachedfiles['mimes'];
+
+                // Send mail
+                require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+                if ($mailfile->error)
+                {
+                    $mesg='<div class="error">'.$mailfile->error.'</div>';
+                }
+                else
+                {
+                    $result=$mailfile->sendfile();
+                    if ($result)
+                    {
+                        $error=0;
+
+                        // Initialisation donnees
+                        $object->sendtoid		= $sendtoid;
+                        $object->actiontypecode	= $actiontypecode;
+                        $object->actionmsg		= $actionmsg;
+                        $object->actionmsg2		= $actionmsg2;
+                        $object->fk_element		= $object->id;
+                        $object->elementtype	= $object->element;
+
+                        // Appel des triggers
+                        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                        $interface=new Interfaces($db);
+                        $result=$interface->run_triggers('SHIPPING_SENTBYMAIL',$object,$user,$langs,$conf);
+                        if ($result < 0) {
+                            $error++; $object->errors=$interface->errors;
+                        }
+                        // Fin appel triggers
+
+                        if ($error)
+                        {
+                            dol_print_error($db);
+                        }
+                        else
+                        {
+                            // Redirect here
+                            // This avoid sending mail twice if going out and then back to page
+                        	$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+                            setEventMessage($mesg);
+                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+                            exit;
+                        }
+                    }
+                    else
+                    {
+                        $langs->load("other");
+                        $mesg='<div class="error">';
+                        if ($mailfile->error)
+                        {
+                            $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+                            $mesg.='<br>'.$mailfile->error;
+                        }
+                        else
+                        {
+                            $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+                        }
+                        $mesg.='</div>';
+                    }
+                }
+            }
+            else
+            {
+                $langs->load("other");
+                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
+                $action='presend';
+                dol_syslog('Recipient email is empty');
+            }
+/*        }
+        else
+        {
+            $langs->load("errors");
+            $mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
+            dol_syslog('Failed to read file: '.$file);
+        }*/
+}
+
+else if ($action == 'classifybilled')
+{
+    $object->fetch($id);
+    $object->set_billed();
+}
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans('Shipment'),'Expedition');
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproduct = new FormProduct($db);
+$product_static = new Product($db);
+
+if ($action == 'create2')
+{
+    print_fiche_titre($langs->trans("CreateASending")).'<br>';
+    print $langs->trans("ShipmentCreationIsDoneFromOrder");
+    $action=''; $id=''; $ref='';
+}
+
+// Mode creation
+if ($action == 'create')
+{
+    $expe = new Expedition($db);
+
+    print_fiche_titre($langs->trans("CreateASending"));
+    if (! $origin)
+    {
+        setEventMessage($langs->trans("ErrorBadParameters"),'errors');
+    }
+
+    dol_htmloutput_mesg($mesg);
+
+    if ($origin)
+    {
+        $classname = ucfirst($origin);
+
+        $object = new $classname($db);
+
+        if ($object->fetch($origin_id))	// This include the fetch_lines
+        {
+            //var_dump($object);
+
+            $soc = new Societe($db);
+            $soc->fetch($object->socid);
+
+            $author = new User($db);
+            $author->fetch($object->user_author_id);
+
+            if (! empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+
+            /*
+             *   Document source
+            */
+            print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="add">';
+            print '<input type="hidden" name="origin" value="'.$origin.'">';
+            print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
+            print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
+            if (GETPOST('entrepot_id','int'))
+            {
+                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id','int').'">';
+            }
+
+            print '<table class="border" width="100%">';
+
+            // Ref
+            print '<tr><td width="30%" class="fieldrequired">';
+            if ($origin == 'commande' && ! empty($conf->commande->enabled))
+            {
+                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$object->ref;
+            }
+            if ($origin == 'propal' && ! empty($conf->propal->enabled))
+            {
+                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/card.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref;
+            }
+            print '</a></td>';
+            print "</tr>\n";
+
+            // Ref client
+            print '<tr><td>';
+            if ($origin == 'commande') print $langs->trans('RefCustomerOrder');
+            else if ($origin == 'propal') print $langs->trans('RefCustomerOrder');
+            else print $langs->trans('RefCustomer');
+            print '</td><td colspan="3">';
+            print $object->ref_client;
+            print '</td>';
+            print '</tr>';
+
+            // Tiers
+            print '<tr><td class="fieldrequired">'.$langs->trans('Company').'</td>';
+            print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
+            print '</tr>';
+
+            // Date delivery planned
+            print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
+            print '<td colspan="3">';
+            //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);
+            print "</td>\n";
+            print '</tr>';
+
+            // Note Public
+            print '<tr><td>'.$langs->trans("NotePublic").'</td>';
+            print '<td colspan="3">';
+            $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+            print $doleditor->Create(1);
+            print "</td></tr>";
+
+            // Note Private
+            if ($object->note_private && ! $user->societe_id)
+            {
+                print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
+                print '<td colspan="3">';
+                $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+        		print $doleditor->Create(1);
+                print "</td></tr>";
+            }
+
+            // Weight
+            print '<tr><td>';
+            print $langs->trans("Weight");
+            print '</td><td width="90px"><input name="weight" size="5" value="'.GETPOST('weight','int').'"></td><td>';
+            print $formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
+            print '</td></tr><tr><td>';
+            print $langs->trans("Width");
+            print ' </td><td><input name="sizeW" size="5" value="'.GETPOST('sizeW','int').'"></td><td rowspan="3">';
+            print $formproduct->select_measuring_units("size_units","size");
+            print '</td></tr><tr><td>';
+            print $langs->trans("Height");
+            print '</td><td><input name="sizeH" size="5" value="'.GETPOST('sizeH','int').'"></td>';
+            print '</tr><tr><td>';
+            print $langs->trans("Depth");
+            print '</td><td><input name="sizeS" size="5" value="'.GETPOST('sizeS','int').'"></td>';
+            print '</tr>';
+
+            // Delivery method
+            print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
+            print '<td colspan="3">';
+            $expe->fetch_delivery_methods();
+            print $form->selectarray("shipping_method_id",$expe->meths,GETPOST('shipping_method_id','int'),1,0,0,"",1);
+            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            print "</td></tr>\n";
+
+            // Tracking number
+            print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
+            print '<td colspan="3">';
+            print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">';
+            print "</td></tr>\n";
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="3"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
+
+            print "</table>";
+
+            /*
+             * Lignes de commandes
+             */
+
+            $numAsked = count($object->lines);
+
+            print '<script type="text/javascript" language="javascript">
+            jQuery(document).ready(function() {
+	            jQuery("#autofill").click(function() {';
+    	    	$i=0;
+    	    	while($i < $numAsked)
+    	    	{
+    	    		print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+    	    		$i++;
+    	    	}
+        		print '});
+	            jQuery("#autoreset").click(function() {';
+    	    	$i=0;
+    	    	while($i < $numAsked)
+    	    	{
+    	    		print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
+    	    		$i++;
+    	    	}
+        		print '});
+        	});
+            </script>';
+
+
+            print '<br>';
+            print '<table class="noborder" width="100%">';
+
+
+            /* Lecture des expeditions deja effectuees */
+            $object->loadExpeditions();
+
+            if ($numAsked)
+            {
+                print '<tr class="liste_titre">';
+                print '<td>'.$langs->trans("Description").'</td>';
+                print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+                print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
+                print '<td align="center">'.$langs->trans("QtyToShip");
+				if (empty($conf->productbatch->enabled)) {
+                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
+                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
+				}
+                print '</td>';
+                if (! empty($conf->stock->enabled))
+                {
+					if (empty($conf->productbatch->enabled))
+					{
+                    	print '<td align="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
+					}
+					else
+					{
+						print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
+					}
+                }
+                print "</tr>\n";
+            }
+
+            $var=true;
+            $indiceAsked = 0;
+            while ($indiceAsked < $numAsked)
+            {
+                $product = new Product($db);
+
+                $line = $object->lines[$indiceAsked];
+                $var=!$var;
+
+                // Show product and description
+                $type=$line->product_type?$line->product_type:$line->fk_product_type;
+                // Try to enhance type detection using date_start and date_end for free lines where type
+                // was not saved.
+                if (! empty($line->date_start)) $type=1;
+                if (! empty($line->date_end)) $type=1;
+
+                print "<tr ".$bc[$var].">\n";
+
+                // Product label
+                if ($line->fk_product > 0)
+                {
+                    $product->fetch($line->fk_product);
+                    $product->load_stock();
+
+                    print '<td>';
+                    print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
+
+                    // Show product and description
+                    $product_static->type=$line->fk_product_type;
+                    $product_static->id=$line->fk_product;
+                    $product_static->ref=$line->ref;
+                    $text=$product_static->getNomUrl(1);
+                    $text.= ' - '.(! empty($line->label)?$line->label:$line->product_label);
+                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
+                    print $form->textwithtooltip($text,$description,3,'','',$i);
+
+                    // Show range
+                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+
+                    // Add description in form
+                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                    {
+                        print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
+                    }
+
+                    print '</td>';
+                }
+                else
+				{
+                    print "<td>";
+                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
+                    else $text = img_object($langs->trans('Product'),'product');
+
+                    if (! empty($line->label)) {
+                    	$text.= ' <strong>'.$line->label.'</strong>';
+                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
+                    } else {
+                    	print $text.' '.nl2br($line->desc);
+                    }
+
+                    // Show range
+                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
+                    print "</td>\n";
+                }
+
+                // Qty
+                print '<td align="center">'.$line->qty;
+                print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
+                print '</td>';
+                $qtyProdCom=$line->qty;
+
+                // Qty already sent
+                print '<td align="center">';
+                $quantityDelivered = $object->expeditions[$line->id];
+                print $quantityDelivered;
+                print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
+                print '</td>';
+
+                $quantityAsked = $line->qty;
+                $quantityToBeDelivered = $quantityAsked - $quantityDelivered;
+
+                $warehouse_id = GETPOST('entrepot_id','int');
+
+                $defaultqty=0;
+                if ($warehouse_id > 0)
+                {
+                    //var_dump($product);
+                    $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[$warehouse_id])))
+				{
+	                // Quantity to send
+	                print '<td align="center">';
+	                if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	                {
+	                    print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+	                    print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$defaultqty.'">';
+	                }
+	                else print $langs->trans("NA");
+	                print '</td>';
+
+	                // Stock
+	                if (! empty($conf->stock->enabled))
+	                {
+	                    print '<td align="left">';
+	                    if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	                    {
+	                        // Show warehouse combo list
+	                    	$ent = "entl".$indiceAsked;
+	                    	$idl = "idl".$indiceAsked;
+	                    	$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 == $warehouse_id)
+	                        {
+	                            //print $stock.' '.$quantityToBeDelivered;
+	                            if ($stock < $quantityToBeDelivered)
+	                            {
+	                                print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for this $warehouse_id but you can change warehouse
+	                            }
+	                        }
+	                    }
+	                    else
+	                    {
+	                        print $langs->trans("Service");
+	                    }
+	                    print '</td>';
+	                }
+
+	                print "</tr>\n";
+
+	                // Show subproducts of product
+					if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
+					{
+						$product->get_sousproduits_arbo();
+						$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
+						if(count($prods_arbo) > 0)
+						{
+							foreach($prods_arbo as $key => $value)
+							{
+								//print $value[0];
+								$img='';
+								if ($value['stock'] < $value['stock_alert'])
+								{
+									$img=img_warning($langs->trans("StockTooLow"));
+								}
+								print "<tr ".$bc[$var]."><td>&nbsp; &nbsp; &nbsp; ->
+									<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
+									</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
+									<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
+							}
+						}
+					}
+				}
+				else
+				{
+					print '<td></td><td></td></tr>';
+					$subj=0;
+					print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+					foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
+					{
+						//var_dump($dbatch);
+						$substock=$dbatch->qty +0 ;
+						print '<tr><td colspan="3" ></td><td align="center">';
+						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.min($defaultqty,$substock).'">';
+						print '</td>';
+
+						print '<td align="left">';
+
+						$staticwarehouse=new Entrepot($db);
+						$staticwarehouse->fetch($warehouse_id);
+						print $staticwarehouse->getNomUrl(0).' / ';
+
+						print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
+						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 {
+							$defaultqty -=min($defaultqty,$substock);
+						}
+						$subj++;
+					}
+				}
+
+                $indiceAsked++;
+            }
+
+            print "</table>";
+
+            print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+
+            print '</form>';
+
+            print '<br>';
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+    }
+}
+else if ($id || $ref)
+/* *************************************************************************** */
+/*                                                                             */
+/* Edit and view mode                                                          */
+/*                                                                             */
+/* *************************************************************************** */
+{
+	$lines = $object->lines;
+	$num_prod = count($lines);
+
+	if ($object->id > 0)
+	{
+		dol_htmloutput_mesg($mesg);
+
+		if (!empty($object->origin))
+		{
+			$typeobject = $object->origin;
+			$origin = $object->origin;
+			$object->fetch_origin();
+		}
+
+		$soc = new Societe($db);
+		$soc->fetch($object->socid);
+
+		$head=shipping_prepare_head($object);
+		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending');
+
+		dol_htmloutput_mesg($mesg);
+
+		/*
+		 * Confirmation de la suppression
+		*/
+		if ($action == 'delete')
+		{
+			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
+
+		}
+
+		/*
+		 * Confirmation de la validation
+		*/
+		if ($action == 'valid')
+		{
+			$objectref = substr($object->ref, 1, 4);
+			if ($objectref == 'PROV')
+			{
+				$numref = $object->getNextNumRef($soc);
+			}
+			else
+			{
+				$numref = $object->ref;
+			}
+
+			$text = $langs->trans("ConfirmValidateSending",$numref);
+
+			if (! empty($conf->notification->enabled))
+			{
+				require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+				$notify=new Notify($db);
+				$text.='<br>';
+				$text.=$notify->confirmMessage('SHIPPING_VALIDATE',$object->socid);
+			}
+
+			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1);
+
+		}
+		/*
+		 * Confirmation de l'annulation
+		 */
+		if ($action == 'annuler')
+		{
+			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
+
+		}
+
+		// Calculate true totalWeight and totalVolume for all products
+		// by adding weight and volume of each product line.
+		$totalWeight = '';
+		$totalVolume = '';
+		$weightUnit=0;
+		$volumeUnit=0;
+		for ($i = 0 ; $i < $num_prod ; $i++)
+		{
+			$weightUnit=0;
+			$volumeUnit=0;
+			if (! empty($lines[$i]->weight_units)) $weightUnit = $lines[$i]->weight_units;
+			if (! empty($lines[$i]->volume_units)) $volumeUnit = $lines[$i]->volume_units;
+
+			// TODO Use a function addvalueunits(val1,unit1,val2,unit2)=>(val,unit)
+			if ($lines[$i]->weight_units < 50)
+			{
+				$trueWeightUnit=pow(10,$weightUnit);
+				$totalWeight += $lines[$i]->weight*$lines[$i]->qty_shipped*$trueWeightUnit;
+			}
+			else
+			{
+				$trueWeightUnit=$weightUnit;
+				$totalWeight += $lines[$i]->weight*$lines[$i]->qty_shipped;
+			}
+			if ($lines[$i]->volume_units < 50)
+			{
+				//print $lines[$i]->volume."x".$lines[$i]->volume_units."x".($lines[$i]->volume_units < 50)."x".$volumeUnit;
+				$trueVolumeUnit=pow(10,$volumeUnit);
+				//print $lines[$i]->volume;
+				$totalVolume += $lines[$i]->volume*$lines[$i]->qty_shipped*$trueVolumeUnit;
+			}
+			else
+			{
+				$trueVolumeUnit=$volumeUnit;
+				$totalVolume += $lines[$i]->volume*$lines[$i]->qty_shipped;
+			}
+		}
+
+		print '<table class="border" width="100%">';
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
+
+		// Ref
+		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
+		print '<td colspan="3">';
+		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+		print '</td></tr>';
+
+		// Customer
+		print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
+		print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
+		print "</tr>";
+
+		// Linked documents
+		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
+		{
+			print '<tr><td>';
+			$objectsrc=new Commande($db);
+			$objectsrc->fetch($object->$typeobject->id);
+			print $langs->trans("RefOrder").'</td>';
+			print '<td colspan="3">';
+			print $objectsrc->getNomUrl(1,'commande');
+			print "</td>\n";
+			print '</tr>';
+		}
+		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
+		{
+			print '<tr><td>';
+			$objectsrc=new Propal($db);
+			$objectsrc->fetch($object->$typeobject->id);
+			print $langs->trans("RefProposal").'</td>';
+			print '<td colspan="3">';
+			print $objectsrc->getNomUrl(1,'expedition');
+			print "</td>\n";
+			print '</tr>';
+		}
+
+		// Ref customer
+		print '<tr><td>'.$langs->trans("RefCustomer").'</td>';
+		print '<td colspan="3">'.$object->ref_customer."</a></td>\n";
+		print '</tr>';
+
+		// Date creation
+		print '<tr><td>'.$langs->trans("DateCreation").'</td>';
+		print '<td colspan="3">'.dol_print_date($object->date_creation,"day")."</td>\n";
+		print '</tr>';
+
+		// Delivery date planned
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('DateDeliveryPlanned');
+		print '</td>';
+
+		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editdate_livraison')
+		{
+			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="setdate_livraison">';
+			$form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
+			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '</form>';
+		}
+		else
+		{
+			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Weight
+		print '<tr><td>'.$form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+
+		if($action=='edittrueWeight') {
+
+			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input name="action" value="settrueWeight" type="hidden">';
+			print '<input name="id" value="'.$object->id.'" type="hidden">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
+			print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
+			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+			print '</form>';
+
+		}
+		else {
+			print $object->trueWeight;
+			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
+		}
+
+		if ($totalWeight > 0)
+		{
+			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
+			print $totalWeight.' '.measuring_units_string(0,"weight");
+			if (!empty($object->trueWeight)) print ')';
+		}
+		print '</td></tr>';
+
+		// Width
+		print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+		print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer);
+		print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
+		print '</td></tr>';
+
+		// Height
+		print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+		if($action=='edittrueHeight') {
+
+			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input name="action" value="settrueHeight" type="hidden">';
+			print '<input name="id" value="'.$object->id.'" type="hidden">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
+			print $formproduct->select_measuring_units("size_units","size",$object->size_units);
+			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
+			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
+			print '</form>';
+
+		}
+		else {
+			print $object->trueHeight;
+			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
+
+		}
+
+
+		print '</td></tr>';
+
+		// Depth
+		print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+		print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer);
+		print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
+		print '</td></tr>';
+
+		// Volume
+		print '<tr><td>';
+		print $langs->trans("Volume");
+		print '</td>';
+		print '<td colspan="3">';
+		$calculatedVolume=0;
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		// If sending volume not defined we use sum of products
+		if ($calculatedVolume > 0)
+		{
+			print $calculatedVolume.' ';
+			if ($volumeUnit < 50) print measuring_units_string(0,"volume");
+			else print measuring_units_string($volumeUnit,"volume");
+		}
+		if ($totalVolume > 0)
+		{
+			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
+			print $totalVolume.' '.measuring_units_string(0,"volume");
+			if ($calculatedVolume) print ')';
+		}
+		print "</td>\n";
+		print '</tr>';
+
+		// Status
+		print '<tr><td>'.$langs->trans("Status").'</td>';
+		print '<td colspan="3">'.$object->getLibStatut(4)."</td>\n";
+		print '</tr>';
+
+		// Sending method
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('SendingMethod');
+		print '</td>';
+
+		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editshipping_method_id')
+		{
+			print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="setshipping_method_id">';
+			$object->fetch_delivery_methods();
+			print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+			print '</form>';
+		}
+		else
+		{
+			if ($object->shipping_method_id > 0)
+			{
+				// Get code using getLabelFromKey
+				$code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
+				print $langs->trans("SendingMethod".strtoupper($code));
+			}
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Tracking Number
+		print '<tr><td>'.$form->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
+		print $form->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
+		print '</td></tr>';
+
+		// Other attributes
+		$parameters=array('colspan' => ' colspan="3"');
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+
+		print "</table>\n";
+
+		/*
+		 * Lignes produits
+		*/
+		print '<br><table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+		{
+			print '<td width="5" align="center">&nbsp;</td>';
+		}
+		print '<td>'.$langs->trans("Products").'</td>';
+		print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+		if ($object->statut <= 1)
+		{
+			print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
+		}
+		else
+		{
+			print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
+		}
+
+		print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
+		print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
+		//print '<td align="center">'.$langs->trans("Size").'</td>';
+
+		if (! empty($conf->stock->enabled))
+		{
+			print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
+		}
+
+		if (! empty($conf->productbatch->enabled))
+		{
+			print '<td align="left">'.$langs->trans("Batch").'</td>';
+		}
+
+		print "</tr>\n";
+
+		$var=false;
+
+		if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+		{
+			$object->fetch_thirdparty();
+			$outputlangs = $langs;
+			$newlang='';
+			if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
+			if (empty($newlang)) $newlang=$object->client->default_lang;
+			if (! empty($newlang))
+			{
+				$outputlangs = new Translate("",$conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
+		}
+
+		for ($i = 0 ; $i < $num_prod ; $i++)
+		{
+			print "<tr ".$bc[$var].">";
+
+			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+			{
+				print '<td align="center">'.($i+1).'</td>';
+			}
+
+			// Predefined product or service
+			if ($lines[$i]->fk_product > 0)
+			{
+				// Define output language
+				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+				{
+					$prod = new Product($db);
+					$prod->fetch($lines[$i]->fk_product);
+					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
+				}
+				else
+					$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
+
+				print '<td>';
+
+				// Show product and description
+				$product_static->type=$lines[$i]->fk_product_type;
+				$product_static->id=$lines[$i]->fk_product;
+				$product_static->ref=$lines[$i]->ref;
+				$text=$product_static->getNomUrl(1);
+				$text.= ' - '.$label;
+				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->description));
+				print $form->textwithtooltip($text,$description,3,'','',$i);
+				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+				{
+					print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
+				}
+			}
+			else
+			{
+				print "<td>";
+				if ($lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
+				else $text = img_object($langs->trans('Product'),'product');
+
+				if (! empty($lines[$i]->label)) {
+					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
+					print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
+				} else {
+					print $text.' '.nl2br($lines[$i]->description);
+				}
+
+				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+				print "</td>\n";
+			}
+
+			// Qte commande
+			print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
+
+			// Qte a expedier ou expedier
+			print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
+
+			// Weight
+			print '<td align="center">';
+			if ($lines[$i]->fk_product_type == 0) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
+			else print '&nbsp;';
+			print '</td>';
+
+			// Volume
+			print '<td align="center">';
+			if ($lines[$i]->fk_product_type == 0) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
+			else print '&nbsp;';
+			print '</td>';
+
+			// Size
+			//print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
+
+			// Entrepot source
+			if (! empty($conf->stock->enabled))
+			{
+				print '<td align="left">';
+				if ($lines[$i]->entrepot_id > 0)
+				{
+					$entrepot = new Entrepot($db);
+					$entrepot->fetch($lines[$i]->entrepot_id);
+					print $entrepot->getNomUrl(1);
+				}
+				else if (count($lines[$i]->details_entrepot) > 1)
+				{
+					$detail = '';
+					foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+						if ($detail_entrepot->entrepot_id > 0) {
+							$entrepot = new Entrepot($db);
+							$entrepot->fetch($detail_entrepot->entrepot_id);
+							$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
+						}
+					}
+					print $form->textwithtooltip($langs->trans("DetailWarehouseNumber"),$detail);
+				}
+				print '</td>';
+			}
+
+			// Batch number managment
+			if (! empty($conf->productbatch->enabled))
+			{
+				if (isset($lines[$i]->detail_batch))
+				{
+					print '<td>';
+					$detail = '';
+					foreach ($lines[$i]->detail_batch as $dbatch) {
+						$detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).'<br/>';
+					}
+					print $form->textwithtooltip($langs->trans("DetailBatchNumber"),$detail);
+					print '</td>';
+				} else {
+					print '<td></td>';
+				}
+			}
+			print "</tr>";
+
+			$var=!$var;
+		}
+	}
+
+	print "</table>\n";
+
+	print "\n</div>\n";
+
+
+	$object->fetchObjectLinked($object->id,$object->element);
+
+	/*
+	 *    Boutons actions
+	*/
+
+	if (($user->societe_id == 0) && ($action!='presend'))
+	{
+		print '<div class="tabsAction">';
+
+		if ($object->statut == 0 && $num_prod > 0)
+		{
+			if ($user->rights->expedition->valider)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+			}
+			else
+			{
+				print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
+			}
+		}
+
+		// TODO add alternative status
+		/* if ($object->statut == 1 && $user->rights->expedition->valider)
+		{
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+		}*/
+
+		// Send
+		if ($object->statut > 0)
+		{
+			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+			}
+			else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+		}
+
+		// Create bill and Close shipment
+		if (! empty($conf->facture->enabled) && $object->statut > 0)
+		{
+			if ($user->rights->facture->creer)
+			{
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+			}
+		}
+
+		// This is just to generate a delivery receipt
+		if ($conf->livraison_bon->enabled && ($object->statut == 1 || $object->statut == 2) && $user->rights->expedition->livraison->creer && empty($object->linkedObjectsIds['delivery'][0]))
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
+		}
+
+		// Close
+		if (! empty($conf->facture->enabled) && $object->statut > 0)
+		{
+			if ($user->rights->expedition->creer && $object->statut > 0 && ! $object->billed)
+			{
+				$label="Close";
+				// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
+				if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $label="ClassifyBilled";
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans($label).'</a>';
+			}
+		}
+
+		if ($user->rights->expedition->supprimer)
+		{
+			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+		}
+
+		print '</div>';
+		print "<br>\n";
+	}
+
+
+	/*
+	 * Documents generated
+	*/
+	if ($action != 'presend')
+	{
+		print '<table width="100%"><tr><td width="50%" valign="top">';
+
+		$objectref = dol_sanitizeFileName($object->ref);
+		$filedir = $conf->expedition->dir_output . "/sending/" .$objectref;
+
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+
+		$genallowed=$user->rights->expedition->lire;
+		$delallowed=$user->rights->expedition->supprimer;
+
+		$somethingshown=$formfile->show_documents('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+
+		/*
+		 * Linked object block
+		*/
+		$somethingshown=$object->showLinkedObjectBlock();
+
+		if ($genallowed && ! $somethingshown) $somethingshown=1;
+
+		print '</td><td valign="top" width="50%">';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions=new FormActions($db);
+		$somethingshown=$formactions->showactions($object,'shipping',$socid);
+
+		print '</td></tr></table>';
+	}
+
+	/*
+	 * Action presend
+	*/
+	if ($action == 'presend')
+	{
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($ref,'/'));
+		$file=$fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->client->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('sendings');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file))
+		{
+			$result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0)
+			{
+				dol_print_error($db,$result);
+				exit;
+			}
+			$fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($ref,'/'));
+			$file=$fileparams['fullname'];
+		}
+
+		print '<br>';
+		print_titre($langs->trans('SendShippingByEMail'));
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+		$formmail->fromtype = 'user';
+		$formmail->fromid   = $user->id;
+		$formmail->fromname = $user->getFullName($langs);
+		$formmail->frommail = $user->email;
+		$formmail->withfrom=1;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
+		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+		$formmail->withtopic=$outputlangs->trans('SendShippingRef','__SHIPPINGREF__');
+		$formmail->withfile=2;
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+		// Tableau des substitutions
+		$formmail->substit['__SHIPPINGREF__']=$object->ref;
+		$formmail->substit['__SIGNATURE__']=$user->signature;
+		$formmail->substit['__PERSONALIZED__']='';
+		$formmail->substit['__CONTACTCIVNAME__']='';
+
+		//Find the good contact adress
+		//Find the good contact adress
+		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))	{
+			$objectsrc=new Commande($db);
+			$objectsrc->fetch($object->$typeobject->id);
+		}
+		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))	{
+			$objectsrc=new Propal($db);
+			$objectsrc->fetch($object->$typeobject->id);
+		}
+		$custcontact='';
+		$contactarr=array();
+		$contactarr=$objectsrc->liste_contact(-1,'external');
+
+		if (is_array($contactarr) && count($contactarr)>0) {
+			foreach($contactarr as $contact) {
+
+				if ($contact['libelle']==$langs->trans('TypeContact_commande_external_CUSTOMER')) {
+
+					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+
+					$contactstatic=new Contact($db);
+					$contactstatic->fetch($contact['id']);
+					$custcontact=$contactstatic->getFullName($langs,1);
+				}
+			}
+
+			if (!empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action']='send';
+		$formmail->param['models']='shipping_send';
+		$formmail->param['shippingid']=$object->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+
+		// Init list of files
+		if (GETPOST("mode")=='init')
+		{
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+		}
+
+		// Show form
+		print $formmail->get_form();
+
+		print '<br>';
+	}
+
+	if ($action != 'presend' && ! empty($origin) && $object->$origin->id)
+	{
+		print '<br>';
+		//show_list_sending_receive($object->origin,$object->origin_id," AND e.rowid <> ".$object->id);
+		show_list_sending_receive($object->origin,$object->origin_id);
+	}
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index b6cdf5457d3..f9484c1175e 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -6,6 +6,8 @@
  * Copyright (C) 2011-2013	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
+ * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2014       Francis Appels          <francis.appels@yahoo.com>
  *
  * 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
@@ -111,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)
@@ -227,7 +229,7 @@ class Expedition extends CommonObject
 		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -237,7 +239,7 @@ class Expedition extends CommonObject
 			$sql.= " SET ref = '(PROV".$this->id.")'";
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			if ($this->db->query($sql))
 			{
 				// Insertion des lignes
@@ -275,12 +277,10 @@ class Expedition extends CommonObject
 
 				if (! $error)
 				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('SHIPPING_CREATE',$this,$user,$langs,$conf);
-					if ($result < 0) { $error++; $this->errors=$interface->errors; }
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('SHIPPING_CREATE',$user);
+                    if ($result < 0) { $error++; }
+                    // End call triggers
 
 					if (! $error)
 					{
@@ -348,7 +348,7 @@ class Expedition extends CommonObject
 		$sql.= ", ".$qty;
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create_line sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
 		if (! $this->db->query($sql))
 		{
 			$error++;
@@ -413,7 +413,7 @@ class Expedition extends CommonObject
         if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
         if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -487,14 +487,13 @@ class Expedition extends CommonObject
 			}
 			else
 			{
-				dol_syslog(get_class($this).'::Fetch Error -2');
+				dol_syslog(get_class($this).'::Fetch Error -2', LOG_ERR);
 				$this->error='Delivery with id '.$id.' not found sql='.$sql;
 				return -2;
 			}
 		}
 		else
 		{
-			dol_syslog(get_class($this).'::Fetch Error -1');
 			$this->error=$this->db->error();
 			return -1;
 		}
@@ -504,9 +503,10 @@ class Expedition extends CommonObject
 	 *  Validate object and update stock if option enabled
 	 *
 	 *  @param      User		$user       Object user that validate
+     *  @param		int			$notrigger	1=Does not execute triggers, 0= execuete triggers
 	 *  @return     int						<0 if OK, >0 if KO
 	 */
-	function valid($user)
+	function valid($user, $notrigger=0)
 	{
 		global $conf, $langs;
 
@@ -548,6 +548,7 @@ class Expedition extends CommonObject
 		{
 			$numref = "EXP".$this->id;
 		}
+        $this->newref = $numref;
 
 		$now=dol_now();
 
@@ -559,11 +560,10 @@ class Expedition extends CommonObject
 		$sql.= ", fk_user_valid = ".$user->id;
 		$sql.= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::valid update expedition sql=".$sql);
+		dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if (! $resql)
 		{
-			dol_syslog(get_class($this)."::valid Echec update - 10 - sql=".$sql, LOG_ERR);
 			$this->error=$this->db->lasterror();
 			$error++;
 		}
@@ -583,15 +583,16 @@ class Expedition extends CommonObject
 			$sql.= " WHERE ed.fk_expedition = ".$this->id;
 			$sql.= " AND cd.rowid = ed.fk_origin_line";
 
-			dol_syslog(get_class($this)."::valid select details sql=".$sql);
+			dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
 			    $cpt = $this->db->num_rows($resql);
                 for ($i = 0; $i < $cpt; $i++)
 				{
-					dol_syslog(get_class($this)."::valid movement index ".$i);
 					$obj = $this->db->fetch_object($resql);
+					if($obj->qty <= 0) continue;
+					dol_syslog(get_class($this)."::valid movement index ".$i);
 
 					//var_dump($this->lines[$i]);
 					$mouvS = new MouvementStock($this->db);
@@ -600,12 +601,14 @@ class Expedition extends CommonObject
 					// We use warehouse selected for each line
 					$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref));
 					if ($result < 0) { $error++; break; }
-					
+
 					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; }
+							}
 						}
 					}
 				}
@@ -614,14 +617,21 @@ class Expedition extends CommonObject
 			{
 				$this->db->rollback();
 				$this->error=$this->db->error();
-				dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 				return -2;
 			}
 		}
 
+		if (! $error && ! $notrigger)
+		{
+            // Call trigger
+            $result=$this->call_trigger('SHIPPING_VALIDATE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
+		}
+
 		if (! $error)
 		{
-			$this->oldref='';
+            $this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -638,11 +648,17 @@ class Expedition extends CommonObject
 
 					if (@rename($dirsource, $dirdest))
 					{
-						$this->oldref = $oldref;
-
-						dol_syslog("Rename ok");
-						// Suppression ancien fichier PDF dans nouveau rep
-						dol_delete_file($dirdest.'/'.$oldref.'*.*');
+					    dol_syslog("Rename ok");
+                        // Rename docs starting with $oldref with $newref
+                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+                        foreach($listoffiles as $fileentry)
+                        {
+                        	$dirsource=$fileentry['name'];
+                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+                        	$dirsource=$fileentry['path'].'/'.$dirsource;
+                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+                        	@rename($dirsource, $dirdest);
+                        }
 					}
 				}
 			}
@@ -655,16 +671,6 @@ class Expedition extends CommonObject
 			$this->statut = 1;
 		}
 
-		if (! $error)
-		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('SHIPPING_VALIDATE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
-		}
-
 		if (! $error)
 		{
 			$this->db->commit();
@@ -727,25 +733,25 @@ class Expedition extends CommonObject
 	function addline($entrepot_id, $id, $qty)
 	{
 		global $conf, $langs;
-		
+
 		$num = count($this->lines);
 		$line = new ExpeditionLigne($this->db);
 
 		$line->entrepot_id = $entrepot_id;
 		$line->origin_line_id = $id;
 		$line->qty = $qty;
-		
+
 		if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT) {
 			$orderline = new OrderLine($this->db);
 			$orderline->fetch($id);
 			$fk_product = $orderline->fk_product;
-			
+
 			if (!empty($orderline->fk_product))
 			{
 				$product=new Product($this->db);
 				$result=$product->fetch($fk_product);
 				$product_type=$product->type;
-				
+
 				if($product_type == 0 && $product->stock_reel < $qty) {
 					$this->error=$langs->trans('ErrorStockIsNotEnough');
 					$this->db->rollback();
@@ -796,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;
@@ -860,7 +866,7 @@ class Expedition extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -868,12 +874,10 @@ class Expedition extends CommonObject
 		{
 			if (! $notrigger)
 			{
-	            // Call triggers
-	            include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-	            $interface=new Interfaces($this->db);
-	            $result=$interface->run_triggers('SHIPPING_MODIFY',$this,$user,$langs,$conf);
-	            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            // End call triggers
+                // Call trigger
+                $result=$this->call_trigger('SHIPPING_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 	    	}
 		}
 
@@ -920,7 +924,7 @@ class Expedition extends CommonObject
 
 		if ($conf->productbatch->enabled) {
             require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-			if ( ExpeditionLigneBatch::deletefromexp($this->db,$this->id)<0) 
+			if ( ExpeditionLigneBatch::deletefromexp($this->db,$this->id)<0)
 			{$error++;$this->errors[]="Error ".$this->db->lasterror();}
 		}
 		// Stock control
@@ -937,7 +941,7 @@ class Expedition extends CommonObject
 			$sql.= " WHERE ed.fk_expedition = ".$this->id;
 			$sql.= " AND cd.rowid = ed.fk_origin_line";
 
-			dol_syslog(get_class($this)."::delete select details sql=".$sql);
+			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -984,12 +988,10 @@ class Expedition extends CommonObject
 
 					if ($this->db->query($sql))
 					{
-						// Call triggers
-			            include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-			            $interface=new Interfaces($this->db);
-			            $result=$interface->run_triggers('SHIPPING_DELETE',$this,$user,$langs,$conf);
-			            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			            // End call triggers
+                        // Call trigger
+                        $result=$this->call_trigger('SHIPPING_DELETE',$user);
+                        if ($result < 0) { $error++; }
+                        // End call triggers
 
 			            if (! $error)
 			            {
@@ -1076,8 +1078,9 @@ class Expedition extends CommonObject
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql.= " WHERE ed.fk_expedition = ".$this->id;
 		$sql.= " AND ed.fk_origin_line = cd.rowid";
+		$sql.= " ORDER BY cd.rang, ed.fk_origin_line";
 
-		dol_syslog(get_class($this)."::fetch_lines sql=".$sql);
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1085,6 +1088,8 @@ class Expedition extends CommonObject
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
+			$lineindex = 0;
+			$originline = 0;
 
 			$this->total_ht = 0;
 			$this->total_tva = 0;
@@ -1094,13 +1099,25 @@ class Expedition extends CommonObject
 
 			while ($i < $num)
 			{
-				$line = new ExpeditionLigne($this->db);
 				$obj = $this->db->fetch_object($resql);
 
+			    if ($originline == $obj->fk_origin_line) {
+			        $line->entrepot_id       = 0; // entrepod_id in details_entrepot
+				    $line->qty_shipped    	+= $obj->qty_shipped;
+				} else {
+				    $line = new ExpeditionLigne($this->db);
+				    $line->entrepot_id    	= $obj->fk_entrepot;
+				    $line->qty_shipped    	= $obj->qty_shipped;
+				}
+
+				$detail_entrepot              = new stdClass;
+				$detail_entrepot->entrepot_id = $obj->fk_entrepot;
+				$detail_entrepot->qty_shipped = $obj->qty_shipped;
+				$line->details_entrepot[]     = $detail_entrepot;
+
                 $line->line_id          = $obj->line_id;
 				$line->fk_origin_line 	= $obj->fk_origin_line;
 				$line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
-				$line->entrepot_id    	= $obj->fk_entrepot;
 				$line->fk_product     	= $obj->fk_product;
 				$line->fk_product_type	= $obj->fk_product_type;
 				$line->ref				= $obj->product_ref;		// TODO deprecated
@@ -1110,7 +1127,6 @@ class Expedition extends CommonObject
 				$line->label			= $obj->custom_label;
 				$line->description    	= $obj->description;
 				$line->qty_asked      	= $obj->qty_asked;
-				$line->qty_shipped    	= $obj->qty_shipped;
 				$line->weight         	= $obj->weight;
 				$line->weight_units   	= $obj->weight_units;
 				$line->length         	= $obj->length;
@@ -1123,7 +1139,7 @@ class Expedition extends CommonObject
 				// For invoicing
 				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type);	// We force type to 0
 				$line->desc	         	= $obj->description;		// We need ->desc because some code into CommonObject use desc (property defined for other elements)
-				$line->qty 				= $obj->qty_shipped;
+				$line->qty 				= $line->qty_shipped;
 				$line->total_ht			= $tabprice[0];
 				$line->total_localtax1 	= $tabprice[9];
 				$line->total_localtax2 	= $tabprice[10];
@@ -1145,14 +1161,28 @@ class Expedition extends CommonObject
 				// Eat-by date
 				if (! empty($conf->productbatch->enabled)) {
                     /* test on conf at begining of file sometimes doesn't include expeditionbatch
-                     * May be conf is not well initialized for dark reason 
+                     * May be conf is not well initialized for dark reason
                      */
                     require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-					$line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
+                    if ($originline != $obj->fk_origin_line) {
+                        $line->detail_batch = ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
+                    } else {
+                        $line->detail_batch = array_merge($line->detail_batch,ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id));
+                    }
+				}
+				if ($originline != $obj->fk_origin_line) {
+				    $this->lines[$lineindex] = $line;
+				    $lineindex++;
+				} else {
+				    $line->total_ht			+= $tabprice[0];
+				    $line->total_localtax1 	+= $tabprice[9];
+				    $line->total_localtax2 	+= $tabprice[10];
+				    $line->total_ttc	 	+= $tabprice[2];
+				    $line->total_tva	 	+= $tabprice[1];
 				}
-				$this->lines[$i] = $line;
 
 				$i++;
+				$originline = $obj->fk_origin_line;
 			}
 			$this->db->free($resql);
 			return 1;
@@ -1160,7 +1190,6 @@ class Expedition extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this).'::fetch_lines: Error '.$this->error, LOG_ERR);
 			return -3;
 		}
 	}
@@ -1180,7 +1209,7 @@ class Expedition extends CommonObject
 
 		$result='';
 
-		$url = DOL_URL_ROOT.'/expedition/fiche.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
 
 		if ($short) return $url;
 
@@ -1344,7 +1373,7 @@ class Expedition extends CommonObject
 			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::set_date_livraison sql=".$sql,LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -1354,7 +1383,6 @@ class Expedition extends CommonObject
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog(get_class($this)."::set_date_livraison ".$this->error,LOG_ERR);
 				return -1;
 			}
 		}
@@ -1529,10 +1557,14 @@ class Expedition extends CommonObject
 		global $conf;
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2';
-		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;';
-		if ($this->db->query($sql) )
+		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
+
+		$resql=$this->db->query($sql);
+		if ($resql)
 		{
 			//TODO: Option to set order billed if 100% of order is shipped
+			$this->statut=2;
+			$this->billed=1;
 			return 1;
 		}
 		else
@@ -1542,6 +1574,39 @@ class Expedition extends CommonObject
 		}
 	}
 
+	/**
+	 * 	Cree un bon d'expedition sur disque
+	 *
+	 * 	@param	string		$modele			Force le modele a utiliser ('' to not force)
+	 * 	@param	Translate	$outputlangs	Objet lang a utiliser pour traduction
+	 *  @return int             			<=0 if KO, >0 if OK
+	 */
+	public function generateDocument($modele, $outputlangs)
+	{
+		global $conf,$user,$langs;
+
+		$langs->load("sendings");
+
+		// Sets the model on the model name to use
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->EXPEDITION_ADDON_PDF))
+			{
+				$modele = $conf->global->EXPEDITION_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'rouget';
+			}
+		}
+
+		$modelpath = "core/modules/expedition/doc/";
+
+		$this->fetch_origin();
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0);
+	}
+
 }
 
 
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 7bbd99706bd..62d23aaa7ff 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -69,7 +69,7 @@ class ExpeditionLigneBatch extends CommonObject
         $sql.= MAIN_DB_PREFIX."product_stock as e on t.fk_product_stock=e.rowid ";
         $sql.= " WHERE t.rowid = ".(int) $id_stockdluo;
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -91,7 +91,6 @@ class ExpeditionLigneBatch extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(__METHOD__ .$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -123,7 +122,7 @@ class ExpeditionLigneBatch extends CommonObject
 		$sql.= " ".(! isset($this->fk_origin_stock)?'NULL':$this->fk_origin_stock);
 		$sql.= ")";
 
-		dol_syslog(__METHOD__ ." sql=".$sql, LOG_DEBUG);
+		dol_syslog(__METHOD__ ."", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 
 		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -157,7 +156,7 @@ class ExpeditionLigneBatch extends CommonObject
 		$sql="DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element;
 		$sql.=" WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".$id_expedition.")";
 		
-		dol_syslog(__METHOD__ ." sql=".$sql, LOG_DEBUG);
+		dol_syslog(__METHOD__ ."", LOG_DEBUG);
 		if ( $db->query($sql) )
 		{
 			return 1;
@@ -185,7 +184,7 @@ class ExpeditionLigneBatch extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element;
 		$sql.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
 
-		dol_syslog(__METHOD__ ." sql=".$sql, LOG_DEBUG);
+		dol_syslog(__METHOD__ ."", LOG_DEBUG);
         $resql=$db->query($sql);
         if ($resql)
         {
diff --git a/htdocs/expedition/class/index.html b/htdocs/expedition/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index facca267160..c09b3e415cd 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -87,15 +87,14 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 	}
 	else
 	{
-		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$objectsrc->error.'</div>';
+			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+		} else {
+			$mesg = $objectsrc->error;
 		}
+
+		setEventMessage($mesg, 'errors');
 	}
 }
 
@@ -146,7 +145,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
@@ -161,7 +159,7 @@ if ($id > 0 || ! empty($ref))
 	*/
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
deleted file mode 100644
index c11c1d549a9..00000000000
--- a/htdocs/expedition/fiche.php
+++ /dev/null
@@ -1,1688 +0,0 @@
-<?php
-/* Copyright (C) 2003-2008	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2005-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005		Simon TOSSER			<simon@kornog-computing.com>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- * Copyright (C) 2013       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/expedition/fiche.php
- *	\ingroup    expedition
- *	\brief      Fiche descriptive d'une expedition
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.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 (! empty($conf->stock->enabled))    require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-
-$langs->load("sendings");
-$langs->load("companies");
-$langs->load("bills");
-$langs->load('deliveries');
-$langs->load('orders');
-$langs->load('stocks');
-$langs->load('other');
-$langs->load('propal');
-if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
-
-$origin		= GETPOST('origin','alpha')?GETPOST('origin','alpha'):'expedition';   // Example: commande, propal
-$origin_id 	= GETPOST('id','int')?GETPOST('id','int'):'';
-$id = $origin_id;
-if (empty($origin_id)) $origin_id  = GETPOST('origin_id','int');    // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('object_id','int');    // Id of order or propal
-$ref=GETPOST('ref','alpha');
-
-// Security check
-$socid='';
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user, $origin, $origin_id);
-
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-
-//PDF
-$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
-
-$object = new Expedition($db);
-
-// Load object
-if ($id > 0 || ! empty($ref))
-{
-	$ret=$object->fetch($id, $ref);
-}
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('expeditioncard'));
-
-/*
- * Actions
- */
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-if ($action == 'add')
-{
-    $error=0;
-
-    $db->begin();
-
-    $object->note				= GETPOST('note','alpha');
-    $object->origin				= $origin;
-    $object->origin_id			= $origin_id;
-    $object->weight				= GETPOST('weight','int')==''?"NULL":GETPOST('weight','int');
-    $object->sizeH				= GETPOST('sizeH','int')==''?"NULL":GETPOST('sizeH','int');
-    $object->sizeW				= GETPOST('sizeW','int')==''?"NULL":GETPOST('sizeW','int');
-    $object->sizeS				= GETPOST('sizeS','int')==''?"NULL":GETPOST('sizeS','int');
-    $object->size_units			= GETPOST('size_units','int');
-    $object->weight_units		= GETPOST('weight_units','int');
-
-    $date_delivery = dol_mktime(GETPOST('date_deliveryhour','int'), GETPOST('date_deliverymin','int'), 0, GETPOST('date_deliverymonth','int'), GETPOST('date_deliveryday','int'), GETPOST('date_deliveryyear','int'));
-
-    // On va boucler sur chaque ligne du document d'origine pour completer objet expedition
-    // avec info diverses + qte a livrer
-    $classname = ucfirst($object->origin);
-    $objectsrc = new $classname($db);
-    $objectsrc->fetch($object->origin_id);
-
-    $object->socid					= $objectsrc->socid;
-    $object->ref_customer			= $objectsrc->ref_client;
-    $object->date_delivery			= $date_delivery;	// Date delivery planed
-    $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
-    $object->shipping_method_id		= GETPOST('shipping_method_id','int');
-    $object->tracking_number		= GETPOST('tracking_number','alpha');
-    $object->ref_int				= GETPOST('ref_int','alpha');
-    $object->note_private			= GETPOST('note_private');
-    $object->note_public			= GETPOST('note_public');
-
-    $num=count($objectsrc->lines);
-    $totalqty=0;
-    for ($i = 0; $i < $num; $i++)
-    {
-        $qty = "qtyl".$i;
-		$j=0;
-		$sub_qty=array();
-		$subtotalqty=0;
-		$idl="idl".$i;
-		$batch="batchl".$i."_0";
-		if (isset($_POST[$batch])) {
-			//shipment line with batch-enable product
-			$qty .= '_'.$j;
-			while (isset($_POST[$batch])) {
-				$sub_qty[$j]['q']=GETPOST($qty,'int');
-				$sub_qty[$j]['id_batch']=GETPOST($batch,'int');
-				$subtotalqty+=$sub_qty[$j]['q'];
-				$j++;
-				$batch="batchl".$i."_".$j;
-				$qty = "qtyl".$i.'_'.$j;
-
-			}
-			$batch_line[$i]['detail']=$sub_qty;
-			$batch_line[$i]['qty']=$subtotalqty;
-			$batch_line[$i]['ix_l']=GETPOST($idl,'int');
-			$totalqty+=$subtotalqty;
-		} else {
-			//Standard product
-			if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int');
-		}
-    }
-
-    if ($totalqty > 0)
-    {
-        //var_dump($_POST);exit;
-        for ($i = 0; $i < $num; $i++)
-        {
-            $qty = "qtyl".$i;
-			if (! isset($batch_line[$i])) {
-				if (GETPOST($qty,'int') > 0)
-				{
-					$ent = "entl".$i;
-					$idl = "idl".$i;
-					$entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
-					if ($entrepot_id < 0) $entrepot_id='';
-
-					$ret=$object->addline($entrepot_id,GETPOST($idl,'int'),GETPOST($qty,'int'));
-					if ($ret < 0)
-					{
-						$mesg='<div class="error">'.$object->error.'</div>';
-						$error++;
-					}
-				}
-			} else {
-				if ($batch_line[$i]['qty']>0) {
-					$ret=$object->addline_batch($batch_line[$i]);
-					if ($ret < 0)
-					{
-						$mesg='<div class="error">'.$object->error.'</div>';
-						$error++;
-					}
-				}
-			}
-        }
-
-        if (! $error)
-        {
-            $ret=$object->create($user);
-            if ($ret <= 0)
-            {
-                $mesg='<div class="error">'.$object->error.'</div>';
-                $error++;
-            }
-        }
-    }
-    else
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Qty")).'</div>';
-        $error++;
-    }
-
-    if (! $error)
-    {
-        $db->commit();
-        header("Location: fiche.php?id=".$object->id);
-        exit;
-    }
-    else
-    {
-        $db->rollback();
-        $_GET["commande_id"]=GETPOST('commande_id','int');
-        $action='create';
-    }
-}
-
-/*
- * Build a receiving receipt
- */
-else if ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
-{
-    $result = $object->create_delivery($user);
-    if ($result > 0)
-    {
-        header("Location: ".DOL_URL_ROOT.'/livraison/fiche.php?id='.$result);
-        exit;
-    }
-    else
-    {
-        $mesg=$object->error;
-    }
-}
-
-else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->valider)
-{
-    $object->fetch_thirdparty();
-
-    $result = $object->valid($user);
-
-    // Define output language
-    $outputlangs = $langs;
-    $newlang='';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    if (! empty($newlang))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-    {
-        $ret=$object->fetch($id);    // Reload to get new records
-        $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
-    }
-    if ($result < 0)
-    {
-        dol_print_error($db,$result);
-        exit;
-    }
-}
-
-else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
-{
-    $result = $object->delete();
-    if ($result > 0)
-    {
-        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
-        exit;
-    }
-    else
-	{
-		$langs->load("errors");
-        setEventMessage($langs->trans($object->error),'errors');
-    }
-}
-
-else if ($action == 'reopen' && $user->rights->expedition->valider)
-{
-    $result = $object->setStatut(0);
-    if ($result < 0)
-    {
-        $mesg = $object->error;
-    }
-}
-
-else if ($action == 'setdate_livraison' && $user->rights->expedition->creer)
-{
-    //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
-
-    $object->fetch($id);
-    $result=$object->set_date_livraison($user,$datedelivery);
-    if ($result < 0)
-    {
-        $mesg='<div class="error">'.$object->error.'</div>';
-    }
-}
-
-// Action update description of emailing
-else if ($action == 'settrackingnumber' || $action == 'settrackingurl'
-|| $action == 'settrueWeight'
-|| $action == 'settrueWidth'
-|| $action == 'settrueHeight'
-|| $action == 'settrueDepth'
-|| $action == 'setshipping_method_id')
-{
-    $error=0;
-
-    if ($action == 'settrackingnumber')		$object->tracking_number = trim(GETPOST('trackingnumber','alpha'));
-    if ($action == 'settrackingurl')		$object->tracking_url = trim(GETPOST('trackingurl','int'));
-    if ($action == 'settrueWeight')	{
-    	$object->trueWeight = trim(GETPOST('trueWeight','int'));
-		$object->weight_units = GETPOST('weight_units','int');
-    }
-    if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth','int'));
-    if ($action == 'settrueHeight'){
-    				$object->trueHeight = trim(GETPOST('trueHeight','int'));
-					$object->size_units = GETPOST('size_units','int');
-	}
-    if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth','int'));
-    if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id','int'));
-
-    if (! $error)
-    {
-        if ($object->update($user) >= 0)
-        {
-            header("Location: fiche.php?id=".$object->id);
-            exit;
-        }
-        setEventMessage($object->error,'errors');
-    }
-
-    $action="";
-}
-
-// Build document
-else if ($action == 'builddoc')	// En get ou en post
-{
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-    // Define output language
-    $outputlangs = $langs;
-    $newlang='';
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$shipment->client->default_lang;
-    if (! empty($newlang))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
-    $result=expedition_pdf_create($db,$object,$object->modelpdf,$outputlangs);
-    if ($result <= 0)
-    {
-        dol_print_error($db,$result);
-        exit;
-    }
-}
-
-// Delete file in doc form
-elseif ($action == 'remove_file')
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$upload_dir =	$conf->expedition->dir_output . "/sending";
-	$file =	$upload_dir	. '/' .	GETPOST('file');
-	$ret=dol_delete_file($file,0,0,0,$object);
-	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-}
-
-/*
- * Add file in email form
-*/
-if (GETPOST('addfile','alpha'))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    // Set tmp user directory TODO Use a dedicated directory for temp mails files
-    $vardir=$conf->user->dir_output."/".$user->id;
-    $upload_dir_tmp = $vardir.'/temp';
-
-    dol_add_file_process($upload_dir_tmp,0,0);
-    $action ='presend';
-}
-
-/*
- * Remove file in email form
-*/
-if (GETPOST('removedfile','alpha'))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    // Set tmp user directory
-    $vardir=$conf->user->dir_output."/".$user->id;
-    $upload_dir_tmp = $vardir.'/temp';
-
-    // TODO Delete only files that was uploaded from email form
-    dol_remove_file_process(GETPOST('removedfile','int'),0);
-    $action ='presend';
-}
-
-/*
- * Send mail
-*/
-if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile','alpha') && ! GETPOST('cancel','alpha'))
-{
-    $langs->load('mails');
-
-//        $ref = dol_sanitizeFileName($object->ref);
-//        $file = $conf->expedition->dir_output . '/sending/' . $ref . '/' . $ref . '.pdf';
-
-//        if (is_readable($file))
-//        {
-            if (GETPOST('sendto','alpha'))
-            {
-                // Le destinataire a ete fourni via le champ libre
-                $sendto = GETPOST('sendto','alpha');
-                $sendtoid = 0;
-            }
-            elseif (GETPOST('receiver','alpha') != '-1')
-            {
-                // Recipient was provided from combo list
-                if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
-                {
-                    $sendto = $object->client->email;
-                    $sendtoid = 0;
-                }
-                else	// Id du contact
-                {
-                    $sendto = $object->client->contact_get_property(GETPOST('receiver','alpha'),'email');
-                    $sendtoid = GETPOST('receiver','alpha');
-                }
-            }
-
-            if (dol_strlen($sendto))
-            {
-                $langs->load("commercial");
-
-                $from = GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
-                $replyto = GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
-                $message = GETPOST('message');
-                $sendtocc = GETPOST('sendtocc','alpha');
-                $deliveryreceipt = GETPOST('deliveryreceipt','alpha');
-
-                if ($action == 'send')
-                {
-                    if (dol_strlen(GETPOST('subject','alpha'))) $subject=GETPOST('subject','alpha');
-                    else $subject = $langs->transnoentities('Shipping').' '.$object->ref;
-                    $actiontypecode='AC_SHIP';
-                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
-                    if ($message)
-                    {
-                        $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-                        $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-                        $actionmsg.=$message;
-                    }
-                    $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-                }
-
-                // Create form object
-                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-                $formmail = new FormMail($db);
-
-                $attachedfiles=$formmail->get_attached_files();
-                $filepath = $attachedfiles['paths'];
-                $filename = $attachedfiles['names'];
-                $mimetype = $attachedfiles['mimes'];
-
-                // Send mail
-                require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
-                if ($mailfile->error)
-                {
-                    $mesg='<div class="error">'.$mailfile->error.'</div>';
-                }
-                else
-                {
-                    $result=$mailfile->sendfile();
-                    if ($result)
-                    {
-                        $error=0;
-
-                        // Initialisation donnees
-                        $object->sendtoid		= $sendtoid;
-                        $object->actiontypecode	= $actiontypecode;
-                        $object->actionmsg		= $actionmsg;
-                        $object->actionmsg2		= $actionmsg2;
-                        $object->fk_element		= $object->id;
-                        $object->elementtype	= $object->element;
-
-                        // Appel des triggers
-                        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                        $interface=new Interfaces($db);
-                        $result=$interface->run_triggers('SHIPPING_SENTBYMAIL',$object,$user,$langs,$conf);
-                        if ($result < 0) {
-                            $error++; $object->errors=$interface->errors;
-                        }
-                        // Fin appel triggers
-
-                        if ($error)
-                        {
-                            dol_print_error($db);
-                        }
-                        else
-                        {
-                            // Redirect here
-                            // This avoid sending mail twice if going out and then back to page
-                        	$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
-                            setEventMessage($mesg);
-                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                            exit;
-                        }
-                    }
-                    else
-                    {
-                        $langs->load("other");
-                        $mesg='<div class="error">';
-                        if ($mailfile->error)
-                        {
-                            $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-                            $mesg.='<br>'.$mailfile->error;
-                        }
-                        else
-                        {
-                            $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-                        }
-                        $mesg.='</div>';
-                    }
-                }
-            }
-            else
-            {
-                $langs->load("other");
-                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
-                $action='presend';
-                dol_syslog('Recipient email is empty');
-            }
-/*        }
-        else
-        {
-            $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
-            dol_syslog('Failed to read file: '.$file);
-        }*/
-}
-
-else if ($action == 'classifybilled')
-{
-    $object->fetch($id);
-    $object->set_billed();
-}
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans('Shipment'),'Expedition');
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$formproduct = new FormProduct($db);
-$product_static = new Product($db);
-
-if ($action == 'create2')
-{
-    print_fiche_titre($langs->trans("CreateASending")).'<br>';
-    print $langs->trans("ShipmentCreationIsDoneFromOrder");
-    $action=''; $id=''; $ref='';
-}
-
-// Mode creation
-if ($action == 'create')
-{
-    $expe = new Expedition($db);
-
-    print_fiche_titre($langs->trans("CreateASending"));
-    if (! $origin)
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorBadParameters").'</div>';
-    }
-
-    dol_htmloutput_mesg($mesg);
-
-    if ($origin)
-    {
-        $classname = ucfirst($origin);
-
-        $object = new $classname($db);
-
-        if ($object->fetch($origin_id))	// This include the fetch_lines
-        {
-            //var_dump($object);
-
-            $soc = new Societe($db);
-            $soc->fetch($object->socid);
-
-            $author = new User($db);
-            $author->fetch($object->user_author_id);
-
-            if (! empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
-
-            /*
-             *   Document source
-            */
-            print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="add">';
-            print '<input type="hidden" name="origin" value="'.$origin.'">';
-            print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
-            print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
-            if (GETPOST('entrepot_id','int'))
-            {
-                print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id','int').'">';
-            }
-
-            print '<table class="border" width="100%">';
-
-            // Ref
-            print '<tr><td width="30%" class="fieldrequired">';
-            if ($origin == 'commande' && ! empty($conf->commande->enabled))
-            {
-                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$object->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$object->ref;
-            }
-            if ($origin == 'propal' && ! empty($conf->propal->enabled))
-            {
-                print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/fiche.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref;
-            }
-            print '</a></td>';
-            print "</tr>\n";
-
-            // Ref client
-            print '<tr><td>';
-            if ($origin == 'commande') print $langs->trans('RefCustomerOrder');
-            else if ($origin == 'propal') print $langs->trans('RefCustomerOrder');
-            else print $langs->trans('RefCustomer');
-            print '</td><td colspan="3">';
-            print $object->ref_client;
-            print '</td>';
-            print '</tr>';
-
-            // Tiers
-            print '<tr><td class="fieldrequired">'.$langs->trans('Company').'</td>';
-            print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
-            print '</tr>';
-
-            // Date delivery planned
-            print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-            print '<td colspan="3">';
-            //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);
-            print "</td>\n";
-            print '</tr>';
-
-            // Note Public
-            print '<tr><td>'.$langs->trans("NotePublic").'</td>';
-            print '<td colspan="3">';
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-            print $doleditor->Create(1);
-            print "</td></tr>";
-
-            // Note Private
-            if ($object->note_private && ! $user->societe_id)
-            {
-                print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
-                print '<td colspan="3">';
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-        		print $doleditor->Create(1);
-                print "</td></tr>";
-            }
-
-            // Weight
-            print '<tr><td>';
-            print $langs->trans("Weight");
-            print '</td><td width="90px"><input name="weight" size="5" value="'.GETPOST('weight','int').'"></td><td>';
-            print $formproduct->select_measuring_units("weight_units","weight",GETPOST('weight_units','int'));
-            print '</td></tr><tr><td>';
-            print $langs->trans("Width");
-            print ' </td><td><input name="sizeW" size="5" value="'.GETPOST('sizeW','int').'"></td><td rowspan="3">';
-            print $formproduct->select_measuring_units("size_units","size");
-            print '</td></tr><tr><td>';
-            print $langs->trans("Height");
-            print '</td><td><input name="sizeH" size="5" value="'.GETPOST('sizeH','int').'"></td>';
-            print '</tr><tr><td>';
-            print $langs->trans("Depth");
-            print '</td><td><input name="sizeS" size="5" value="'.GETPOST('sizeS','int').'"></td>';
-            print '</tr>';
-
-            // Delivery method
-            print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
-            print '<td colspan="3">';
-            $expe->fetch_delivery_methods();
-            print $form->selectarray("shipping_method_id",$expe->meths,GETPOST('shipping_method_id','int'),1,0,0,"",1);
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            print "</td></tr>\n";
-
-            // Tracking number
-            print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
-            print '<td colspan="3">';
-            print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number','alpha').'">';
-            print "</td></tr>\n";
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action);    // Note that $action and $object may have been modified by hook
-
-            print "</table>";
-
-            /*
-             * Lignes de commandes
-             */
-
-            $numAsked = count($object->lines);
-
-            print '<script type="text/javascript" language="javascript">
-            jQuery(document).ready(function() {
-	            jQuery("#autofill").click(function() {';
-    	    	$i=0;
-    	    	while($i < $numAsked)
-    	    	{
-    	    		print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-    	    		$i++;
-    	    	}
-        		print '});
-	            jQuery("#autoreset").click(function() {';
-    	    	$i=0;
-    	    	while($i < $numAsked)
-    	    	{
-    	    		print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
-    	    		$i++;
-    	    	}
-        		print '});
-        	});
-            </script>';
-
-
-            print '<br>';
-            print '<table class="noborder" width="100%">';
-
-
-            /* Lecture des expeditions deja effectuees */
-            $object->loadExpeditions();
-
-            if ($numAsked)
-            {
-                print '<tr class="liste_titre">';
-                print '<td>'.$langs->trans("Description").'</td>';
-                print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-                print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
-                print '<td align="center">'.$langs->trans("QtyToShip");
-				if (empty($conf->productbatch->enabled)) {
-                print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
-                print ' / <a href="#" id="autoreset">'.$langs->trans("Reset").'</a>)';
-				}
-                print '</td>';
-                if (! empty($conf->stock->enabled))
-                {
-					if (empty($conf->productbatch->enabled)) {
-                    print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Stock").'</td>';
-					} else {
-						print '<td align="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' / '.$langs->trans("Stock").'</td>';
-					}
-                }
-                print "</tr>\n";
-            }
-
-            $var=true;
-            $indiceAsked = 0;
-            while ($indiceAsked < $numAsked)
-            {
-                $product = new Product($db);
-
-                $line = $object->lines[$indiceAsked];
-                $var=!$var;
-
-                // Show product and description
-                $type=$line->product_type?$line->product_type:$line->fk_product_type;
-                // Try to enhance type detection using date_start and date_end for free lines where type
-                // was not saved.
-                if (! empty($line->date_start)) $type=1;
-                if (! empty($line->date_end)) $type=1;
-
-                print "<tr ".$bc[$var].">\n";
-
-                // Product label
-                if ($line->fk_product > 0)
-                {
-                    $product->fetch($line->fk_product);
-                    $product->load_stock();
-
-                    print '<td>';
-                    print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
-
-                    // Show product and description
-                    $product_static->type=$line->fk_product_type;
-                    $product_static->id=$line->fk_product;
-                    $product_static->ref=$line->ref;
-                    $text=$product_static->getNomUrl(1);
-                    $text.= ' - '.(! empty($line->label)?$line->label:$line->product_label);
-                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
-                    print $form->textwithtooltip($text,$description,3,'','',$i);
-
-                    // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
-
-                    // Add description in form
-                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-                    {
-                        print ($line->desc && $line->desc!=$line->product_label)?'<br>'.dol_htmlentitiesbr($line->desc):'';
-                    }
-
-                    print '</td>';
-                }
-                else
-                {
-                    print "<td>";
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
-
-                    if (! empty($line->label)) {
-                    	$text.= ' <strong>'.$line->label.'</strong>';
-                    	print $form->textwithtooltip($text,$line->desc,3,'','',$i);
-                    } else {
-                    	print $text.' '.nl2br($line->desc);
-                    }
-
-                    // Show range
-                    print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
-                    print "</td>\n";
-                }
-
-                // Qty
-                print '<td align="center">'.$line->qty;
-                print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
-                print '</td>';
-                $qtyProdCom=$line->qty;
-
-                // Qty already sent
-                print '<td align="center">';
-                $quantityDelivered = $object->expeditions[$line->id];
-                print $quantityDelivered;
-                print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
-                print '</td>';
-
-                $quantityAsked = $line->qty;
-                $quantityToBeDelivered = $quantityAsked - $quantityDelivered;
-
-                $defaultqty=0;
-                if (GETPOST('entrepot_id','int') > 0)
-                {
-                    //var_dump($product);
-                    $stock = $product->stock_warehouse[GETPOST('entrepot_id','int')]->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')])))
-				{
-	                // Quantity to send
-	                print '<td align="center">';
-	                if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	                {
-	                    print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-	                    print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$defaultqty.'">';
-	                }
-	                else print $langs->trans("NA");
-	                print '</td>';
-
-	                // Stock
-	                if (! empty($conf->stock->enabled))
-	                {
-	                    print '<td align="left">';
-	                    if ($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	                    {
-	                        // Show warehouse combo list
-	                    	$ent = "entl".$indiceAsked;
-	                    	$idl = "idl".$indiceAsked;
-	                    	$tmpentrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int');
-	                        print $formproduct->selectWarehouses($tmpentrepot_id,'entl'.$indiceAsked,'',1,0,$line->fk_product);
-	                    	if ($tmpentrepot_id > 0 && $tmpentrepot_id == GETPOST('entrepot_id','int'))
-	                        {
-	                            //print $stock.' '.$quantityToBeDelivered;
-	                            if ($stock < $quantityToBeDelivered)
-	                            {
-	                                print ' '.img_warning($langs->trans("StockTooLow"));	// Stock too low for entrepot_id but we may have change warehouse
-	                            }
-	                        }
-	                    }
-	                    else
-	                    {
-	                        print $langs->trans("Service");
-	                    }
-	                    print '</td>';
-	                }
-
-	                print "</tr>\n";
-
-	                // Show subproducts of product
-					if (! empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
-					{
-						$product->get_sousproduits_arbo();
-						$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-						if(count($prods_arbo) > 0)
-						{
-							foreach($prods_arbo as $key => $value)
-							{
-								//print $value[0];
-								$img='';
-								if ($value['stock'] < $value['stock_alert'])
-								{
-									$img=img_warning($langs->trans("StockTooLow"));
-								}
-								print "<tr ".$bc[$var]."><td>&nbsp; &nbsp; &nbsp; ->
-									<a href=\"".DOL_URL_ROOT."/product/fiche.php?id=".$value['id']."\">".$value['fullpath']."
-									</a> (".$value['nb'].")</td><td align=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
-									<td align=\"center\">".$value['stock']." ".$img."</td></tr>";
-							}
-						}
-					}
-				} else {
-					print '<td></td><td></td></tr>';
-					$subj=0;
-					print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-					foreach ($product->stock_warehouse[GETPOST('entrepot_id','int')]->detail_batch as $dbatch) {
-						//var_dump($dbatch);
-						$substock=$dbatch->qty +0 ;
-						print '<tr><td colspan="3" ></td><td align="center">';
-						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.min($defaultqty,$substock).'">';
-						print '</td>';
-
-						print '<td align="left">';
-						print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
-						print $langs->trans("DetailBatchFormat", dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->batch, $dbatch->qty);
-						if ($defaultqty<=0) {
-							$defaultqty=0;
-						} else {
-							$defaultqty -=min($defaultqty,$substock);
-						}
-						$subj++;
-					}
-				}
-
-                $indiceAsked++;
-            }
-
-            print "</table>";
-
-            print '<br><center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
-
-            print '</form>';
-
-            print '<br>';
-        }
-        else
-        {
-            dol_print_error($db);
-        }
-    }
-}
-else if ($id || $ref)
-/* *************************************************************************** */
-/*                                                                             */
-/* Edit and view mode                                                          */
-/*                                                                             */
-/* *************************************************************************** */
-{
-	$lines = $object->lines;
-	$num_prod = count($lines);
-
-	if ($object->id > 0)
-	{
-		dol_htmloutput_mesg($mesg);
-
-		if (!empty($object->origin))
-		{
-			$typeobject = $object->origin;
-			$origin = $object->origin;
-			$object->fetch_origin();
-		}
-
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
-		$head=shipping_prepare_head($object);
-		dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending');
-
-		dol_htmloutput_mesg($mesg);
-
-		/*
-		 * Confirmation de la suppression
-		*/
-		if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
-
-		}
-
-		/*
-		 * Confirmation de la validation
-		*/
-		if ($action == 'valid')
-		{
-			$objectref = substr($object->ref, 1, 4);
-			if ($objectref == 'PROV')
-			{
-				$numref = $object->getNextNumRef($soc);
-			}
-			else
-			{
-				$numref = $object->ref;
-			}
-
-			$text = $langs->trans("ConfirmValidateSending",$numref);
-
-			if (! empty($conf->notification->enabled))
-			{
-				require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-				$notify=new Notify($db);
-				$text.='<br>';
-				$text.=$notify->confirmMessage('SHIPPING_VALIDATE',$object->socid);
-			}
-
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1);
-
-		}
-		/*
-		 * Confirmation de l'annulation
-		*/
-		if ($action == 'annuler')
-		{
-			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
-
-		}
-
-		// Calculate true totalWeight and totalVolume for all products
-		// by adding weight and volume of each product line.
-		$totalWeight = '';
-		$totalVolume = '';
-		$weightUnit=0;
-		$volumeUnit=0;
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-			$weightUnit=0;
-			$volumeUnit=0;
-			if (! empty($lines[$i]->weight_units)) $weightUnit = $lines[$i]->weight_units;
-			if (! empty($lines[$i]->volume_units)) $volumeUnit = $lines[$i]->volume_units;
-
-			// TODO Use a function addvalueunits(val1,unit1,val2,unit2)=>(val,unit)
-			if ($lines[$i]->weight_units < 50)
-			{
-				$trueWeightUnit=pow(10,$weightUnit);
-				$totalWeight += $lines[$i]->weight*$lines[$i]->qty_shipped*$trueWeightUnit;
-			}
-			else
-			{
-				$trueWeightUnit=$weightUnit;
-				$totalWeight += $lines[$i]->weight*$lines[$i]->qty_shipped;
-			}
-			if ($lines[$i]->volume_units < 50)
-			{
-				//print $lines[$i]->volume."x".$lines[$i]->volume_units."x".($lines[$i]->volume_units < 50)."x".$volumeUnit;
-				$trueVolumeUnit=pow(10,$volumeUnit);
-				//print $lines[$i]->volume;
-				$totalVolume += $lines[$i]->volume*$lines[$i]->qty_shipped*$trueVolumeUnit;
-			}
-			else
-			{
-				$trueVolumeUnit=$volumeUnit;
-				$totalVolume += $lines[$i]->volume*$lines[$i]->qty_shipped;
-			}
-		}
-
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-		print '<td colspan="3">';
-		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-		print '</td></tr>';
-
-		// Customer
-		print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
-		print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
-		print "</tr>";
-
-		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
-		{
-			print '<tr><td>';
-			$objectsrc=new Commande($db);
-			$objectsrc->fetch($object->$typeobject->id);
-			print $langs->trans("RefOrder").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'commande');
-			print "</td>\n";
-			print '</tr>';
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))
-		{
-			print '<tr><td>';
-			$objectsrc=new Propal($db);
-			$objectsrc->fetch($object->$typeobject->id);
-			print $langs->trans("RefProposal").'</td>';
-			print '<td colspan="3">';
-			print $objectsrc->getNomUrl(1,'expedition');
-			print "</td>\n";
-			print '</tr>';
-		}
-
-		// Ref customer
-		print '<tr><td>'.$langs->trans("RefCustomer").'</td>';
-		print '<td colspan="3">'.$object->ref_customer."</a></td>\n";
-		print '</tr>';
-
-		// Date creation
-		print '<tr><td>'.$langs->trans("DateCreation").'</td>';
-		print '<td colspan="3">'.dol_print_date($object->date_creation,"day")."</td>\n";
-		print '</tr>';
-
-		// Delivery date planned
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('DateDeliveryPlanned');
-		print '</td>';
-
-		if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editdate_livraison')
-		{
-			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="setdate_livraison">';
-			$form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		}
-		else
-		{
-			print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhour') : '&nbsp;';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Weight
-		print '<tr><td>'.$form->editfieldkey("Weight",'trueWeight',$object->trueWeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-
-		if($action=='edittrueWeight') {
-
-			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueWeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input id="trueWeight" name="trueWeight" value="'.$object->trueWeight.'" type="text">';
-			print $formproduct->select_measuring_units("weight_units","weight",$object->weight_units);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-
-		}
-		else {
-			print $object->trueWeight;
-			print ($object->trueWeight && $object->weight_units!='')?' '.measuring_units_string($object->weight_units,"weight"):'';
-		}
-
-		if ($totalWeight > 0)
-		{
-			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
-			print $totalWeight.' '.measuring_units_string(0,"weight");
-			if (!empty($object->trueWeight)) print ')';
-		}
-		print '</td></tr>';
-
-		// Width
-		print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Width",'trueWidth',$object->trueWidth,$object,$user->rights->expedition->creer);
-		print ($object->trueWidth && $object->width_units!='')?' '.measuring_units_string($object->width_units,"size"):'';
-		print '</td></tr>';
-
-		// Height
-		print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		if($action=='edittrueHeight') {
-
-			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-			print '<input name="action" value="settrueHeight" type="hidden">';
-			print '<input name="id" value="'.$object->id.'" type="hidden">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input id="trueHeight" name="trueHeight" value="'.$object->trueHeight.'" type="text">';
-			print $formproduct->select_measuring_units("size_units","size",$object->size_units);
-			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
-			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
-			print '</form>';
-
-		}
-		else {
-			print $object->trueHeight;
-			print ($object->trueHeight && $object->height_units!='')?' '.measuring_units_string($object->height_units,"size"):'';
-
-		}
-
-
-		print '</td></tr>';
-
-		// Depth
-		print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,$object,$user->rights->expedition->creer);
-		print ($object->trueDepth && $object->depth_units!='')?' '.measuring_units_string($object->depth_units,"size"):'';
-		print '</td></tr>';
-
-		// Volume
-		print '<tr><td>';
-		print $langs->trans("Volume");
-		print '</td>';
-		print '<td colspan="3">';
-		$calculatedVolume=0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		// If sending volume not defined we use sum of products
-		if ($calculatedVolume > 0)
-		{
-			print $calculatedVolume.' ';
-			if ($volumeUnit < 50) print measuring_units_string(0,"volume");
-			else print measuring_units_string($volumeUnit,"volume");
-		}
-		if ($totalVolume > 0)
-		{
-			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
-			print $totalVolume.' '.measuring_units_string(0,"volume");
-			if ($calculatedVolume) print ')';
-		}
-		print "</td>\n";
-		print '</tr>';
-
-		// Status
-		print '<tr><td>'.$langs->trans("Status").'</td>';
-		print '<td colspan="3">'.$object->getLibStatut(4)."</td>\n";
-		print '</tr>';
-
-		// Sending method
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('SendingMethod');
-		print '</td>';
-
-		if ($action != 'editshipping_method_id') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editshipping_method_id')
-		{
-			print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="setshipping_method_id">';
-			$object->fetch_delivery_methods();
-			print $form->selectarray("shipping_method_id",$object->meths,$object->shipping_method_id,1,0,0,"",1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-			print '</form>';
-		}
-		else
-		{
-			if ($object->shipping_method_id > 0)
-			{
-				// Get code using getLabelFromKey
-				$code=$langs->getLabelFromKey($db,$object->shipping_method_id,'c_shipment_mode','rowid','code');
-				print $langs->trans("SendingMethod".strtoupper($code));
-			}
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Tracking Number
-		print '<tr><td>'.$form->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
-		print $form->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
-		print '</td></tr>';
-
-		// Other attributes
-		$parameters=array('colspan' => ' colspan="3"');
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-
-		print "</table>\n";
-
-		/*
-		 * Lignes produits
-		*/
-		print '<br><table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-		{
-			print '<td width="5" align="center">&nbsp;</td>';
-		}
-		print '<td>'.$langs->trans("Products").'</td>';
-		print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-		if ($object->statut <= 1)
-		{
-			print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
-		}
-		else
-		{
-			print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
-		}
-
-		print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
-		print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
-		//print '<td align="center">'.$langs->trans("Size").'</td>';
-
-		if (! empty($conf->stock->enabled))
-		{
-			print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
-		}
-
-		if (! empty($conf->productbatch->enabled))
-		{
-			print '<td align="left">'.$langs->trans("Batch").'</td>';
-		}
-
-		print "</tr>\n";
-
-		$var=false;
-
-		if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-		{
-			$object->fetch_thirdparty();
-			$outputlangs = $langs;
-			$newlang='';
-			if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id','alpha');
-			if (empty($newlang)) $newlang=$object->client->default_lang;
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-		}
-
-		for ($i = 0 ; $i < $num_prod ; $i++)
-		{
-			print "<tr ".$bc[$var].">";
-
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-			{
-				print '<td align="center">'.($i+1).'</td>';
-			}
-
-			// Predefined product or service
-			if ($lines[$i]->fk_product > 0)
-			{
-				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-				{
-					$prod = new Product($db);
-					$prod->fetch($lines[$i]->fk_product);
-					$label = ( ! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
-				}
-				else
-					$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
-
-				print '<td>';
-
-				// Show product and description
-				$product_static->type=$lines[$i]->fk_product_type;
-				$product_static->id=$lines[$i]->fk_product;
-				$product_static->ref=$lines[$i]->ref;
-				$text=$product_static->getNomUrl(1);
-				$text.= ' - '.$label;
-				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($lines[$i]->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-				{
-					print (! empty($lines[$i]->description) && $lines[$i]->description!=$lines[$i]->product)?'<br>'.dol_htmlentitiesbr($lines[$i]->description):'';
-				}
-			}
-			else
-			{
-				print "<td>";
-				if ($lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
-
-				if (! empty($lines[$i]->label)) {
-					$text.= ' <strong>'.$lines[$i]->label.'</strong>';
-					print $form->textwithtooltip($text,$lines[$i]->description,3,'','',$i);
-				} else {
-					print $text.' '.nl2br($lines[$i]->description);
-				}
-
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				print "</td>\n";
-			}
-
-			// Qte commande
-			print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
-
-			// Qte a expedier ou expedier
-			print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
-
-			// Weight
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == 0) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
-			else print '&nbsp;';
-			print '</td>';
-
-			// Volume
-			print '<td align="center">';
-			if ($lines[$i]->fk_product_type == 0) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume");
-			else print '&nbsp;';
-			print '</td>';
-
-			// Size
-			//print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
-
-			// Entrepot source
-			if (! empty($conf->stock->enabled))
-			{
-				print '<td align="left">';
-				if ($lines[$i]->entrepot_id > 0)
-				{
-					$entrepot = new Entrepot($db);
-					$entrepot->fetch($lines[$i]->entrepot_id);
-					print $entrepot->getNomUrl(1);
-				}
-				print '</td>';
-			}
-
-			// Batch number managment
-			if (! empty($conf->productbatch->enabled)) {
-				if (isset($lines[$i]->detail_batch) ) {
-					print '<td align="center">';
-					$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).'<br/>';
-					}
-					print $form->textwithtooltip($langs->trans("DetailBatchNumber"),$detail);
-					print '</td>';
-				} else {
-					print '<td></td>';
-				}
-			}
-			print "</tr>";
-
-			$var=!$var;
-		}
-	}
-
-	print "</table>\n";
-
-	print "\n</div>\n";
-
-
-	$object->fetchObjectLinked($object->id,$object->element);
-
-	/*
-	 *    Boutons actions
-	*/
-
-	if (($user->societe_id == 0) && ($action!='presend'))
-	{
-		print '<div class="tabsAction">';
-
-		if ($object->statut == 0 && $num_prod > 0)
-		{
-			if ($user->rights->expedition->valider)
-			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-			}
-			else
-			{
-				print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
-			}
-		}
-
-		// TODO add alternative status
-		/* if ($object->statut == 1 && $user->rights->expedition->valider)
-		{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-		}*/
-
-		// Send
-		if ($object->statut > 0)
-		{
-			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
-			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
-			}
-			else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
-		}
-
-		// Create bill and Close shipment
-		if (! empty($conf->facture->enabled) && $object->statut > 0)
-		{
-			if ($user->rights->facture->creer)
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
-			}
-		}
-
-		// This is just to generate a delivery receipt
-		if ($conf->livraison_bon->enabled && ($object->statut == 1 || $object->statut == 2) && $user->rights->expedition->livraison->creer && empty($object->linkedObjectsIds['delivery'][0]))
-		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
-		}
-
-		// Close
-		if (! empty($conf->facture->enabled) && $object->statut > 0)
-		{
-			if ($user->rights->expedition->creer && $object->statut > 0 && ! $object->billed)
-			{
-				$label="Close";
-				// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
-				if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $label="ClassifyBilled";
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans($label).'</a>';
-			}
-		}
-
-		if ($user->rights->expedition->supprimer)
-		{
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-		}
-
-		print '</div>';
-		print "<br>\n";
-	}
-
-
-	/*
-	 * Documents generated
-	*/
-	if ($action != 'presend')
-	{
-		print '<table width="100%"><tr><td width="50%" valign="top">';
-
-		$objectref = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->expedition->dir_output . "/sending/" .$objectref;
-
-		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-
-		$genallowed=$user->rights->expedition->lire;
-		$delallowed=$user->rights->expedition->supprimer;
-
-		$somethingshown=$formfile->show_documents('expedition',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
-
-		/*
-		 * Linked object block
-		*/
-		$somethingshown=$object->showLinkedObjectBlock();
-
-		if ($genallowed && ! $somethingshown) $somethingshown=1;
-
-		print '</td><td valign="top" width="50%">';
-
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-		$somethingshown=$formactions->showactions($object,'shipping',$socid);
-
-		print '</td></tr></table>';
-	}
-
-	/*
-	 * Action presend
-	*/
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($ref,'/'));
-		$file=$fileparams['fullname'];
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			// Define output language
-			$outputlangs = $langs;
-			$newlang='';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-
-			$result=expedition_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($ref,'/'));
-			$file=$fileparams['fullname'];
-		}
-
-		print '<br>';
-		print_titre($langs->trans('SendShippingByEMail'));
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->fromtype = 'user';
-		$formmail->fromid   = $user->id;
-		$formmail->fromname = $user->getFullName($langs);
-		$formmail->frommail = $user->email;
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$langs->trans('SendShippingRef','__SHIPPINGREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-		// Tableau des substitutions
-		$formmail->substit['__SHIPPINGREF__']=$object->ref;
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
-
-		//Find the good contact adress
-		//Find the good contact adress
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))	{
-			$objectsrc=new Commande($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))	{
-			$objectsrc=new Propal($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$objectsrc->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-
-				if ($contact['libelle']==$langs->trans('TypeContact_commande_external_CUSTOMER')) {
-
-					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='shipping_send';
-		$formmail->param['shippingid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		print '<br>';
-	}
-
-	if ($action != 'presend' && ! empty($origin) && $object->$origin->id)
-	{
-		print '<br>';
-		//show_list_sending_receive($object->origin,$object->origin_id," AND e.rowid <> ".$object->id);
-		show_list_sending_receive($object->origin,$object->origin_id);
-	}
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 5ce833e5e3f..2b41a939c7b 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -44,14 +44,12 @@ llxHeader('',$langs->trans("Shipment"),$helpurl);
 print_fiche_titre($langs->trans("SendingsArea"));
 
 
-//print '<table class="notopnoleftnoright" width="100%">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
 $var=false;
 print '<table class="noborder nohover" width="100%">';
-print '<form method="post" action="liste.php">';
+print '<form method="post" action="list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASending").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
@@ -64,7 +62,7 @@ print "</form></table><br>\n";
 $clause = " WHERE ";
 
 $sql = "SELECT e.rowid, e.ref";
-$sql.= ", s.nom, s.rowid as socid";
+$sql.= ", s.nom as name, s.rowid as socid";
 $sql.= ", c.ref as commande_ref, c.rowid as commande_id";
 $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
@@ -101,10 +99,10 @@ if ($resql)
 			print $shipment->getNomUrl(1);
 			print "</td>";
 			print '<td>';
-			print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.$obj->nom.'</a>';
+			print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
 			print '</td>';
 			print '<td>';
-			if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
+			if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
 			print '</td></tr>';
 			$i++;
 		}
@@ -116,7 +114,7 @@ if ($resql)
 /*
  * Commandes a traiter
  */
-$sql = "SELECT c.rowid, c.ref, s.nom, 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";
@@ -138,7 +136,7 @@ if ($resql)
 		$i = 0;
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>';
+		print '<td colspan="3">'.$langs->trans("OrdersToProcess").'</td></tr>';
 		$var = True;
 		while ($i < $num)
 		{
@@ -148,13 +146,19 @@ if ($resql)
 			print '<td class="nowrap">';
 			$orderstatic->id=$obj->rowid;
 			$orderstatic->ref=$obj->ref;
+			$orderstatic->statut=$obj->fk_statut;
+			$orderstatic->facturee=0;
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
-			$companystatic->nom=$obj->nom;
+			$companystatic->name=$obj->name;
 			$companystatic->id=$obj->socid;
 			print $companystatic->getNomUrl(1,'customer',32);
-			print '</td></tr>';
+			print '</td>';
+			print '<td align="right">';
+			print $orderstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
 			$i++;
 		}
 		print "</table><br>";
@@ -169,7 +173,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 /*
  * Commandes en traitement
  */
-$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, 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";
@@ -202,7 +206,7 @@ if ( $resql )
 			print $orderstatic->getNomUrl(1);
 			print '</td>';
 			print '<td>';
-			$companystatic->nom=$obj->nom;
+			$companystatic->name=$obj->name;
 			$companystatic->id=$obj->socid;
 			print $companystatic->getNomUrl(1,'customer');
 			print '</td>';
@@ -224,7 +228,7 @@ else dol_print_error($db);
  * Last shipments
  */
 $sql = "SELECT e.rowid, e.ref";
-$sql.= ", s.nom, s.rowid as socid";
+$sql.= ", s.nom as name, s.rowid as socid";
 $sql.= ", c.ref as commande_ref, c.rowid as commande_id";
 $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
@@ -253,9 +257,9 @@ if ($resql)
 		{
 			$var=!$var;
 			$obj = $db->fetch_object($resql);
-			print '<tr '.$bc[$var].'><td width="20%"><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowSending"),"sending").' ';
+			print '<tr '.$bc[$var].'><td width="20%"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowSending"),"sending").' ';
 			print $obj->ref.'</a></td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
 			print '<td>';
 			if ($obj->commande_id)
 			{
@@ -274,7 +278,6 @@ if ($resql)
 else dol_print_error($db);
 
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
new file mode 100644
index 00000000000..0722dedddf4
--- /dev/null
+++ b/htdocs/expedition/list.php
@@ -0,0 +1,210 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/expedition/list.php
+ *      \ingroup    expedition
+ *      \brief      Page to list all shipments
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+
+$langs->load("sendings");
+$langs->load('companies');
+
+// Security check
+$expeditionid = GETPOST('id','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'expedition',$expeditionid,'');
+
+$search_ref_exp = GETPOST("search_ref_exp");
+$search_ref_liv = GETPOST('search_ref_liv');
+$search_company = GETPOST("search_company");
+
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$limit = $conf->liste_limit;
+if (! $sortfield) $sortfield="e.ref";
+if (! $sortorder) $sortorder="DESC";
+$limit = $conf->liste_limit;
+
+// 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_company='';
+}
+
+/*
+ * View
+ */
+
+$companystatic=new Societe($db);
+$shipment=new Expedition($db);
+
+$helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
+llxHeader('',$langs->trans('ListOfSendings'),$helpurl);
+
+$sql = "SELECT e.rowid, e.ref, e.date_delivery as date_expedition, l.date_delivery as date_livraison, e.fk_statut";
+$sql.= ", s.nom as socname, s.rowid as socid";
+$sql.= " FROM (".MAIN_DB_PREFIX."expedition as e";
+if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+{
+	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+$sql.= ")";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping'";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target AND ee.targettype = 'delivery'";
+$sql.= " WHERE e.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
+{
+	$sql.= " AND e.fk_soc = sc.fk_soc";
+	$sql.= " AND sc.fk_user = " .$user->id;
+}
+if ($socid)
+{
+	$sql.= " AND e.fk_soc = ".$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_company) $sql .= natural_search('s.nom', $search_company);
+
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit + 1,$offset);
+
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$expedition = new Expedition($db);
+
+	$param="";
+	if ($search_ref_exp) $param.= "&amp;search_ref_exp=".$search_ref_exp;
+	if ($search_ref_liv) $param.= "&amp;search_ref_liv=".$search_ref_liv;
+	if ($search_company) $param.= "&amp;search_company=".$search_company;
+
+	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num);
+
+
+	$i = 0;
+    print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	print '<table class="noborder" width="100%">';
+
+	print '<tr class="liste_titre">';
+	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);
+	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("Status"),"ship2bill.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	print '<td class="liste_titre">&nbsp;</td>';
+	print "</tr>\n";
+
+	// Lignes des champs de filtre
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" size="10" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
+    print '</td>';
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat" type="text" size="10" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	if($conf->livraison_bon->enabled) {
+		print '<td class="liste_titre">';
+		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
+		print '</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
+	}
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print '</td>';
+	print '<td class="liste_titre" align="center">';
+	print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
+	print '</td>';
+
+	print "</tr>\n";
+
+	$var=True;
+
+	while ($i < min($num,$limit))
+	{
+		$objp = $db->fetch_object($resql);
+
+		$var=!$var;
+		
+		// Ref
+		print "<tr ".$bc[$var].">";
+		print "<td>";
+		$shipment->id=$objp->rowid;
+		$shipment->ref=$objp->ref;
+		print $shipment->getNomUrl(1);
+		print "</td>\n";
+
+		// Third party
+		print '<td>';
+		$companystatic->id=$objp->socid;
+		$companystatic->ref=$objp->socname;
+		$companystatic->name=$objp->socname;
+		print $companystatic->getNomUrl(1);
+		print '</td>';
+
+		// Date delivery planed
+		print "<td align=\"center\">";
+		print dol_print_date($db->jdate($objp->date_expedition),"day");
+		/*$now = time();
+		if ( ($now - $db->jdate($objp->date_expedition)) > $conf->warnings->lim && $objp->statutid == 1 )
+		{
+		}*/
+		print "</td>\n";
+		if($conf->livraison_bon->enabled) {
+			// Date real
+			print "<td align=\"center\">";
+			print dol_print_date($db->jdate($objp->date_livraison),"day");
+			print "</td>\n";
+		}
+
+		print '<td align="right">'.$expedition->LibStatut($objp->fk_statut,5).'</td>';
+		print "</tr>\n";
+
+		$i++;
+	}
+
+	print "</table>";
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php
deleted file mode 100644
index 29ab105ee91..00000000000
--- a/htdocs/expedition/liste.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/expedition/liste.php
- *      \ingroup    expedition
- *      \brief      Page to list all shipments
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-
-$langs->load("sendings");
-$langs->load('companies');
-
-// Security check
-$expeditionid = GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'expedition',$expeditionid,'');
-
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
-
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-$limit = $conf->liste_limit;
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="DESC";
-$limit = $conf->liste_limit;
-
-
-/*
- * View
- */
-
-$companystatic=new Societe($db);
-$shipment=new Expedition($db);
-
-$helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
-llxHeader('',$langs->trans('ListOfSendings'),$helpurl);
-
-$sql = "SELECT e.rowid, e.ref, e.date_delivery as date_expedition, l.date_delivery as date_livraison, e.fk_statut";
-$sql.= ", s.nom as socname, s.rowid as socid";
-$sql.= " FROM (".MAIN_DB_PREFIX."expedition as e";
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
-{
-	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
-$sql.= ")";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping'";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target AND ee.targettype = 'delivery'";
-$sql.= " WHERE e.entity = ".$conf->entity;
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
-{
-	$sql.= " AND e.fk_soc = sc.fk_soc";
-	$sql.= " AND sc.fk_user = " .$user->id;
-}
-if ($socid)
-{
-	$sql.= " AND e.fk_soc = ".$socid;
-}
-if (GETPOST('sf_ref','alpha'))
-{
-	$sql.= " AND e.ref like '%".$db->escape(GETPOST('sf_ref','alpha'))."%'";
-}
-
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit + 1,$offset);
-
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-
-	$expedition = new Expedition($db);
-
-	$param="&amp;socid=$socid";
-
-	print_barre_liste($langs->trans('ListOfSendings'), $page, "liste.php",$param,$sortfield,$sortorder,'',$num);
-
-
-	$i = 0;
-	print '<table class="noborder" width="100%">';
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),"liste.php","e.ref","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom", "", $param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateDeliveryPlanned"),"liste.php","e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
-	if($conf->livraison_bon->enabled) {
-		print_liste_field_titre($langs->trans("DateReceived"),"liste.php","e.date_expedition","",$param, 'align="center"',$sortfield,$sortorder);
-	}
-	print_liste_field_titre($langs->trans("Status"),"liste.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-	$var=True;
-
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($resql);
-
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		print "<td>";
-		$shipment->id=$objp->rowid;
-		$shipment->ref=$objp->ref;
-		print $shipment->getNomUrl(1);
-		print "</td>\n";
-		// Third party
-		print '<td>';
-		$companystatic->id=$objp->socid;
-		$companystatic->ref=$objp->socname;
-		$companystatic->nom=$objp->socname;
-		print $companystatic->getNomUrl(1);
-		print '</td>';
-		// Date delivery  planed
-		print "<td align=\"center\">";
-		print dol_print_date($db->jdate($objp->date_expedition),"day");
-		/*$now = time();
-		if ( ($now - $db->jdate($objp->date_expedition)) > $conf->warnings->lim && $objp->statutid == 1 )
-		{
-		}*/
-		print "</td>\n";
-		if($conf->livraison_bon->enabled) {
-			// Date real
-			print "<td align=\"center\">";
-			print dol_print_date($db->jdate($objp->date_livraison),"day");
-			print "</td>\n";
-		}
-
-		print '<td align="right">'.$expedition->LibStatut($objp->fk_statut,5).'</td>';
-		print "</tr>\n";
-
-		$i++;
-	}
-
-	print "</table>";
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 27d53b03cd6..01a341d7ab5 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref))
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index fce9c3bf6a5..bce365447e1 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -116,6 +116,13 @@ if ($action == 'setconditions' && $user->rights->commande->creer)
 	if ($result < 0) dol_print_error($db,$commande->error);
 }
 
+// shipping method
+if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
+    $commande = new Commande($db);
+    $commande->fetch($id);
+    $result=$commande->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+}
+
 
 
 /*
@@ -157,7 +164,7 @@ if ($id > 0 || ! empty($ref))
 		}
 
 		// Onglet commande
-		$nbrow=7;
+		$nbrow=8;
 		if (! empty($conf->projet->enabled)) $nbrow++;
 
 		print '<table class="border" width="100%">';
@@ -257,11 +264,29 @@ if ($id > 0 || ! empty($ref))
 			print dol_print_date($commande->date_livraison,'daytext');
 		}
 		print '</td>';
+		// Note on several rows
 		print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('NotePublic').' :<br>';
 		print nl2br($commande->note_public);
 		print '</td>';
 		print '</tr>';
 
+        // Shipping Method
+        print '<tr><td>';
+        print '<table width="100%" class="nobordernopadding"><tr><td>';
+        print $langs->trans('SendingMethod');
+        print '</td>';
+        if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$commande->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="2">';
+        if ($action == 'editshippingmethod') {
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->shipping_method_id, 'shipping_method_id', 1);
+        } else {
+            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->shipping_method_id, 'none');
+        }
+        print '</td>';
+        print '</tr>';
+
 		// Terms of payment
 		print '<tr><td height="10">';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -325,16 +350,16 @@ if ($id > 0 || ! empty($ref))
 
 		// Total HT
 		print '<tr><td>'.$langs->trans('AmountHT').'</td>';
-		print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
-		print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>';
+		print '<td>'.price($commande->total_ht, 0, '', 1, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
 
 		// Total TVA
-		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($commande->total_tva).'</td>';
-		print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($commande->total_tva, 0, '', 1, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
 
 		// Total TTC
-		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right">'.price($commande->total_ttc).'</td>';
-		print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($commande->total_ttc, 0, '', 1, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
 
 		// Statut
 		print '<tr><td>'.$langs->trans('Status').'</td>';
@@ -363,7 +388,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= " ORDER BY cd.rang, cd.rowid";
 
 		//print $sql;
-		dol_syslog("shipment.php sql=".$sql, LOG_DEBUG);
+		dol_syslog("shipment.php", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -539,7 +564,7 @@ if ($id > 0 || ! empty($ref))
 							{
 								$img=img_warning($langs->trans("StockTooLow"));
 							}
-							print '<tr><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/fiche.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
+							print '<tr><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
 							print '<td align="center"> '.$value['nb_total'].'</td>';
 							print '<td>&nbsp</td>';
 							print '<td>&nbsp</td>';
@@ -582,7 +607,7 @@ if ($id > 0 || ! empty($ref))
 			{
 				if ($user->rights->expedition->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/fiche.php?action=create&amp;origin=commande&amp;object_id='.$id.'">'.$langs->trans("NewSending").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create&amp;origin=commande&amp;object_id='.$id.'">'.$langs->trans("NewSending").'</a>';
 					if ($toBeShippedTotal <= 0)
 					{
 						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
@@ -604,9 +629,10 @@ if ($id > 0 || ! empty($ref))
 			{
 				print_titre($langs->trans("NewSending"));
 
-				print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/fiche.php">';
+				print '<form method="GET" action="'.DOL_URL_ROOT.'/expedition/card.php">';
 				print '<input type="hidden" name="action" value="create">';
 				print '<input type="hidden" name="id" value="'.$commande->id.'">';
+                print '<input type="hidden" name="shipping_method_id" value="'.$commande->shipping_method_id.'">';
 				print '<input type="hidden" name="origin" value="commande">';
 				print '<input type="hidden" name="origin_id" value="'.$commande->id.'">';
 				print '<table class="border" width="100%">';
@@ -617,12 +643,15 @@ if ($id > 0 || ! empty($ref))
 
 				if (! empty($conf->stock->enabled))
 				{
-					print '<td>'.$langs->trans("WarehouseSource").'</td>';
+					$warehousecanbeselectedlater=1;
+					if (! empty($conf->productbatch->enabled)) $warehousecanbeselectedlater=0;
+
+					print '<td'.($warehousecanbeselectedlater?'':' class="fieldrequired"').'>'.$langs->trans("WarehouseSource").'</td>';
 					print '<td>';
 					print $formproduct->selectWarehouses(-1,'entrepot_id','',1);
 					if (count($formproduct->cache_warehouses) <= 0)
 					{
-						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?action=create">'.$langs->trans("AddOne").'</a>';
+						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';
 					}
 					print '</td>';
 				}
diff --git a/htdocs/expedition/tpl/index.html b/htdocs/expedition/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 364afb92177..72206c13e2b 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -47,7 +47,7 @@ foreach($linkedObjectBlock as $object)
 	$var=!$var;
 ?>
 <tr <?php echo $GLOBALS['bc'][$var]; ?> ><td>
-	<a href="<?php echo DOL_URL_ROOT.'/expedition/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowShipping"),"sending").' '.$object->ref; ?></a></td>
+	<a href="<?php echo DOL_URL_ROOT.'/expedition/card.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowShipping"),"sending").' '.$object->ref; ?></a></td>
 	<td align="center"><?php echo dol_print_date($object->date_creation,'day'); ?></td>
 	<td align="center"><?php echo dol_print_date($object->date_delivery,'day'); ?></td>
 	<td align="right"><?php
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index fda062952d1..d332592da6d 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -519,7 +519,7 @@ class Export
 
 		// Run the sql
 		$this->sqlusedforexport=$sql;
-		dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql);
+		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -592,7 +592,6 @@ class Export
 		else
 		{
 			$this->error=$this->db->error()." - sql=".$sql;
-			dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -628,7 +627,7 @@ class Export
 		$sql.= (! empty($filter)?"'".$filter."'":"null");
 		$sql.= ")";
 
-		dol_syslog("Export::create sql=".$sql, LOG_DEBUG);
+		dol_syslog("Export::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -639,7 +638,6 @@ class Export
 		{
 			$this->error=$this->db->lasterror();
 			$this->errno=$this->db->lasterrno();
-			dol_syslog("Export::create error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -657,7 +655,7 @@ class Export
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
 		$sql.= ' WHERE em.rowid = '.$id;
 
-		dol_syslog("Export::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog("Export::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -706,7 +704,7 @@ class Export
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
diff --git a/htdocs/exports/class/index.html b/htdocs/exports/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index a6d82b10a86..45e78b2ecd3 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -166,6 +166,8 @@ if ($action=='selectfield')
         }
 	    //print_r($array_selected);
 	    $_SESSION["export_selected_fields"]=$array_selected;
+
+	    setEventMessage($warnings, 'warnings');
     }
 
 }
@@ -488,9 +490,6 @@ if ($step == 2 && $datatoexport)
     print '</table>';
     print '<br>';
 
-
-    if ($warnings) dol_htmloutput_mesg('',$warnings,'warning');
-
     // Combo list of export models
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -733,7 +732,7 @@ if ($step == 3 && $datatoexport)
 
 		// Filter value
 		print '<td>';
-		if (! empty($Typefieldsarray[$code]))	// Example: Text, List:c_pays:libelle:rowid, Number, Boolean
+		if (! empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
 		{
 			$szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]);
 			if ($szInfoFiltre)	// Is there an info help for this filter ?
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 9c59a7bf4ff..93595b2cb9f 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -59,12 +59,12 @@ if ($action == 'update')
     if ($i >= 2)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg="<div class=\"error\">".$db->lasterror()."</div>";
+	    setEventMessage($db->lasterror(), 'errors');
     }
 }
 
@@ -99,7 +99,7 @@ $var=!$var;
 print "<tr ".$bc[$var].">";
 print '<td class="fieldrequired">'.$langs->trans("Label")."</td>";
 print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_LABEL\" value=\"". (GETPOST('EXTERNALSITE_LABEL','alpha')?GETPOST('EXTERNALSITE_LABEL','alpha'):((empty($conf->global->EXTERNALSITE_LABEL) || $conf->global->EXTERNALSITE_LABEL=='ExternalSite')?'':$conf->global->EXTERNALSITE_LABEL)) . "\" size=\"12\"></td>";
-print "<td>My menu entry</td>";
+print "<td>".$langs->trans("ExampleMyMenuEntry")."</td>";
 print "</tr>";
 
 $var=!$var;
@@ -120,10 +120,6 @@ print "</center>";
 
 print "</form>\n";
 
-
-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/externalsite/admin/index.html b/htdocs/externalsite/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/externalsite/index.html b/htdocs/externalsite/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/externalsite/index.php b/htdocs/externalsite/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/externalsite/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 23c39533e19..8cb95a30f63 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -39,7 +39,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -92,6 +92,7 @@ print '<td>'.$langs->trans("Type").'</td>';
 print '<td align="right">'.$langs->trans("Size").'</td>';
 print '<td align="center">'.$langs->trans("Unique").'</td>';
 print '<td align="center">'.$langs->trans("Required").'</td>';
+print '<td align="center">'.$langs->trans("AlwaysEditable").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
@@ -107,6 +108,7 @@ foreach($extrafields->attribute_type as $key => $value)
     print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
     print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
     print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_alwayseditable[$key])."</td>\n";	 // TODO This must be generalised into all page to admin extrafield. Mutualize code here is easy and will save a lot of code
     print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
     print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
     print "</tr>";
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
new file mode 100644
index 00000000000..7f8b5193631
--- /dev/null
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -0,0 +1,159 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/fichinter/admin/fichinter_extrafields.php
+ *		\ingroup    fichinter
+ *		\brief      Page to setup extra fields of ficheinter
+ */
+
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("companies");
+$langs->load("admin");
+$langs->load("members");
+$langs->load('interventions');
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='fichinterdet';  //Must be the $element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+
+llxHeader();
+
+$textobject=$langs->transnoentitiesnoconv("Interventions");
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
+
+
+$head=fichinter_admin_prepare_head();
+
+dol_fiche_head($head, 'attributesdet', $langs->trans("Interventions"), 0, 'intervention');
+
+
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print '<br>';
+
+// Load attribute_label
+$extrafields->fetch_name_optionals_label($elementtype);
+
+print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
+
+print '<tr class="liste_titre">';
+print '<td align="center">'.$langs->trans("Position").'</td>';
+print '<td>'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("AttributeCode").'</td>';
+print '<td>'.$langs->trans("Type").'</td>';
+print '<td align="right">'.$langs->trans("Size").'</td>';
+print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td align="center">'.$langs->trans("Required").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+$var=True;
+foreach($extrafields->attribute_type as $key => $value)
+{
+    $var=!$var;
+    print "<tr ".$bc[$var].">";
+    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
+    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+    print "<td>".$key."</td>\n";
+    print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+    print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+    print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
+    print "</tr>";
+    //      $i++;
+}
+
+print "</table>";
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+    print '<div class="tabsAction">';
+    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+    print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation d'un champ optionnel
+ /*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+    print "<br>";
+    print_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition d'un champ optionnel                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+    print "<br>";
+    print_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/fichinter/admin/index.html b/htdocs/fichinter/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index 753a74a3ed6..0d4d3421538 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -40,6 +40,11 @@ $ref = GETPOST('ref','alpha');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
+
+/*
+ * View
+ */
+
 llxHeader();
 
 $form = new Form($db);
@@ -139,7 +144,7 @@ if ($id > 0 || ! empty($ref))
 		// Client
 		print "<tr><td>".$langs->trans("Customer")."</td>";
 		print '<td colspan="2">';
-		print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a>';
 		print '</td>';
 		print '</tr>';
 
@@ -150,10 +155,12 @@ if ($id > 0 || ! empty($ref))
 
 		// Date
 		print '<tr><td>'.$langs->trans("Date").'</td>';
-		print "<td colspan=\"2\">".dol_print_date($object->date,"daytext")."</td>\n";
+		print "<td colspan=\"2\">".dol_print_date($object->datec,"daytext")."</td>\n";
 		print '</tr>';
 
 		print '</table>';
+
+		dol_fiche_end();
 	}
 	else
 	{
@@ -165,7 +172,7 @@ if ($id > 0 || ! empty($ref))
 // Si fichier png PDF d'1 page trouve
 if (file_exists($fileimage))
 {
-	print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($relativepathimage).'">';
+	print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($relativepathimage).'">';
 }
 // Si fichier png PDF de plus d'1 page trouve
 elseif (file_exists($fileimagebis))
@@ -178,13 +185,12 @@ elseif (file_exists($fileimagebis))
 
 		if (file_exists($dir_output.$preview))
 		{
-			print '<img src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($preview).'"><p>';
+			print '<img style="background: #FFF" src="'.DOL_URL_ROOT . '/viewimage.php?modulepart=apercufichinter&file='.urlencode($preview).'"><p>';
 		}
 	}
 }
 
-print '</div>';
-
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
new file mode 100644
index 00000000000..4ffc31c9cab
--- /dev/null
+++ b/htdocs/fichinter/card.php
@@ -0,0 +1,1835 @@
+<?php
+/* Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2013  Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/fichinter/card.php
+ *	\brief      Page of intervention
+ *	\ingroup    ficheinter
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+if (! empty($conf->projet->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+
+if ($conf->contrat->enabled)
+{
+	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
+	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
+}
+if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"))
+{
+	require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.'.php';
+}
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("bills");
+$langs->load("companies");
+$langs->load("interventions");
+
+$id			= GETPOST('id','int');
+$ref		= GETPOST('ref','alpha');
+$socid		= GETPOST('socid','int');
+$contratid	= GETPOST('contratid','int');
+$action		= GETPOST('action','alpha');
+$confirm	= GETPOST('confirm','alpha');
+$mesg		= GETPOST('msg','alpha');
+$origin=GETPOST('origin','alpha');
+$originid=(GETPOST('originid','int')?GETPOST('originid','int'):GETPOST('origin_id','int')); // For backward compatibility
+$note_public = GETPOST('note_public');
+$lineid = GETPOST('line_id','int');
+
+//PDF
+$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
+$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('interventioncard','globalcard'));
+
+$object = new Fichinter($db);
+$extrafields = new ExtraFields($db);
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+if ($id > 0 || ! empty($ref))
+{
+	$ret=$object->fetch($id, $ref);
+	if ($ret > 0) $ret=$object->fetch_thirdparty();
+	if ($ret < 0) dol_print_error('',$object->error);
+}
+
+$permissionnote=$user->rights->ficheinter->creer;	// Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+$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');
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not include_once
+
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+{
+	$result = $object->setValid($user);
+	if ($result >= 0)
+	{
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
+
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		$mesg='<div class="error">'.$object->error.'</div>';
+	}
+}
+
+else if ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+{
+	$result = $object->setDraft($user);
+	if ($result >= 0)
+	{
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=fichinter_create($db, $object, (!GETPOST('model','alpha'))?$object->model:GETPOST('model','apha'), $outputlangs);
+
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		$mesg='<div class="error">'.$object->error.'</div>';
+	}
+}
+
+else if ($action == 'add' && $user->rights->ficheinter->creer)
+{
+    $object->socid			= $socid;
+    $object->duree			= GETPOST('duree','int');
+    $object->fk_project		= GETPOST('projectid','int');
+    $object->fk_contrat		= GETPOST('contratid','int');
+    $object->author			= $user->id;
+    $object->description	= GETPOST('description');
+    $object->ref			= $ref;
+    $object->modelpdf		= GETPOST('model','alpha');
+    $object->note_private	= GETPOST('note_private');
+    $object->note_public	= GETPOST('note_public');
+
+	if ($object->socid > 0)
+	{
+		// If creation from another object of another module (Example: origin=propal, originid=1)
+		if (!empty($origin) && !empty($originid) )
+		{
+			// Parse element/subelement (ex: project_task)
+			$element = $subelement = $_POST['origin'];
+			if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
+			{
+				$element = $regs[1];
+				$subelement = $regs[2];
+			}
+
+			// For compatibility
+			if ($element == 'order')    {
+				$element = $subelement = 'commande';
+			}
+			if ($element == 'propal')   {
+				$element = 'comm/propal'; $subelement = 'propal';
+			}
+			if ($element == 'contract') {
+				$element = $subelement = 'contrat';
+			}
+
+			$object->origin    = $origin;
+			$object->origin_id = $originid;
+
+			// Possibility to add external linked objects with hooks
+			$object->linked_objects[$object->origin] = $object->origin_id;
+			if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
+			{
+				$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
+			}
+
+			// Extrafields
+			$extrafields = new ExtraFields($db);
+			$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+			$array_option = $extrafields->getOptionalsFromPost($extralabels);
+
+	        $object->array_options = $array_option;
+
+			$id = $object->create($user);
+
+			if ($id > 0)
+			{
+				dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+				$classname = ucfirst($subelement);
+				$srcobject = new $classname($db);
+
+				dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
+				$result=$srcobject->fetch($object->origin_id);
+				if ($result > 0)
+				{
+					$srcobject->fetch_thirdparty();
+					$lines = $srcobject->lines;
+					if (empty($lines) && method_exists($srcobject,'fetch_lines'))
+					{
+						$srcobject->fetch_lines();
+						$lines = $srcobject->lines;
+					}
+
+					$fk_parent_line=0;
+					$num=count($lines);
+
+					for ($i=0;$i<$num;$i++)
+					{
+						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+
+						if ($product_type == 1 || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
+							// service prédéfini
+							if ($lines[$i]->fk_product > 0)
+							{
+								// Define output language
+								if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+								{
+									$prod = new Product($db);
+									$prod->id=$lines[$i]->fk_product;
+									$prod->getMultiLangs();
+
+									$outputlangs = $langs;
+									$newlang='';
+									if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+									if (empty($newlang)) $newlang=$srcobject->client->default_lang;
+									if (! empty($newlang))
+									{
+										$outputlangs = new Translate("",$conf);
+										$outputlangs->setDefaultLang($newlang);
+									}
+
+									$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
+								}
+								else
+								{
+									$label = $lines[$i]->product_label;
+								}
+
+								$desc = $label;
+								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
+							}
+							else {
+								$desc = dol_htmlentitiesbr($lines[$i]->desc);
+								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
+							}
+							$timearray=dol_getdate(mktime());
+							$date_intervention=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
+							if ($product_type == 1)
+							{ //service
+								$duration = 3600;
+							}
+							else
+							{ //product
+							    $duration = 0;
+							}
+
+							$predef = '';
+							// Extrafields
+							$extrafieldsline = new ExtraFields($db);
+							$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+							$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+
+
+		                    $result = $object->addline(
+								$user,
+		                        $id,
+		                        $desc,
+					            $date_intervention,
+                 				$duration,
+                 				$array_option
+		                    );
+
+							if ($result < 0)
+							{
+								$error++;
+								break;
+							}
+
+						}
+					}
+
+	            }
+	            else
+	            {
+	                $mesg=$srcobject->error;
+	                $error++;
+	            }
+	        }
+	        else
+	        {
+	            $mesg=$object->error;
+	            $error++;
+	        }
+	    }
+	    else
+	    {
+	    	// Extrafields
+			$extrafields = new ExtraFields($db);
+			$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+			$array_option = $extrafields->getOptionalsFromPost($extralabels);
+
+	        $object->array_options = $array_option;
+
+			$result = $object->create($user);
+	        if ($result > 0)
+	        {
+	            $id=$result;      // Force raffraichissement sur fiche venant d'etre cree
+	        }
+	        else
+	        {
+	            $langs->load("errors");
+	            setEventMessages($object->error, $object->errors, 'errors');
+	            $action = 'create';
+	        }
+        }
+    }
+    else
+    {
+        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ThirdParty")).'</div>';
+        $action = 'create';
+    }
+}
+
+else if ($action == 'update' && $user->rights->ficheinter->creer)
+{
+	$object->socid			= $socid;
+	$object->fk_project		= GETPOST('projectid','int');
+	$object->fk_contrat		= GETPOST('contratid','int');
+	$object->author			= $user->id;
+	$object->description	= GETPOST('description','alpha');
+	$object->ref			= $ref;
+
+	$result=$object->update($user);
+	if ($result<0) {
+		setEventMessage($object->error,'errors');
+	}
+}
+
+/*
+ * Build doc
+ */
+else if ($action == 'builddoc' && $user->rights->ficheinter->creer)	// En get ou en post
+{
+	$object->fetch_lines();
+
+	// Save last template used to generate document
+	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	$result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
+	if ($result <= 0)
+	{
+		dol_print_error($db,$result);
+		exit;
+	}
+}
+
+// Remove file in doc form
+else if ($action == 'remove_file')
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	$object->fetch_thirdparty();
+
+	$langs->load("other");
+	$upload_dir = $conf->ficheinter->dir_output;
+	$file = $upload_dir . '/' . GETPOST('file');
+	$ret=dol_delete_file($file,0,0,0,$object);
+	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+}
+
+// Set into a project
+else if ($action == 'classin' && $user->rights->ficheinter->creer)
+{
+	$result=$object->setProject(GETPOST('projectid','int'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+// Set into a contract
+else if ($action == 'setcontrat' && $user->rights->contrat->creer)
+{
+	$result=$object->set_contrat($user,GETPOST('contratid','int'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
+{
+	$result=$object->delete($user);
+	if ($result<0) {
+		setEventMessage($object->error,'errors');
+	}
+
+	header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter');
+	exit;
+}
+
+else if ($action == 'setdescription' && $user->rights->ficheinter->creer)
+{
+	$result=$object->set_description($user,GETPOST('description'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+// Add line
+else if ($action == "addline" && $user->rights->ficheinter->creer)
+{
+	if (!GETPOST('np_desc'))
+	{
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'</div>';
+		$error++;
+	}
+	if (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))
+	{
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'</div>';
+		$error++;
+	}
+	if (GETPOST('durationhour','int') >= 24 && GETPOST('durationmin','int') > 0)
+	{
+		$mesg='<div class="error">'.$langs->trans("ErrorValueTooHigh").'</div>';
+		$error++;
+	}
+	if (! $error)
+	{
+		$db->begin();
+
+		$desc=GETPOST('np_desc');
+		$date_intervention = dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
+		$duration = convertTime2Seconds(GETPOST('durationhour','int'), GETPOST('durationmin','int'));
+
+
+		// Extrafields
+		$extrafieldsline = new ExtraFields($db);
+		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+		$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+
+        $result=$object->addline(
+			$user,
+            $id,
+            $desc,
+            $date_intervention,
+            $duration,
+            $array_option
+        );
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang='';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+		if (! empty($newlang))
+		{
+			$outputlangs = new Translate("",$conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+
+		if ($result >= 0)
+		{
+			$db->commit();
+
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		}
+		else
+		{
+			$mesg=$object->error;
+			$db->rollback();
+		}
+	}
+}
+
+// Classify Billed
+else if ($action == 'classifybilled' && $user->rights->ficheinter->creer)
+{
+	$result=$object->setStatut(2);
+	if ($result > 0)
+	{
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
+// Classify Billed
+else if ($action == 'classifyunbilled' && $user->rights->ficheinter->creer)
+{
+	$result=$object->setStatut(1);
+	if ($result > 0)
+	{
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		$mesg='<div class="error">'.$object->error.'</div>';
+	}
+}
+
+/*
+ *  Mise a jour d'une ligne d'intervention
+ */
+else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save','alpha') == $langs->trans("Save"))
+{
+	$objectline = new FichinterLigne($db);
+	if ($objectline->fetch($lineid) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	if ($object->fetch($objectline->fk_fichinter) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+	$object->fetch_thirdparty();
+
+	$desc		= GETPOST('np_desc');
+	$date_inter	= dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
+	$duration	= convertTime2Seconds(GETPOST('durationhour','int'),GETPOST('durationmin','int'));
+
+    $objectline->datei		= $date_inter;
+    $objectline->desc		= $desc;
+    $objectline->duration	= $duration;
+
+	// Extrafields
+	$extrafieldsline = new ExtraFields($db);
+	$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+	$array_option = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+	$objectline->array_options = $array_option;
+
+	$result = $objectline->update($user);
+    if ($result < 0)
+    {
+        dol_print_error($db);
+        exit;
+    }
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+	exit;
+}
+
+/*
+ *  Supprime une ligne d'intervention AVEC confirmation
+*/
+else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+{
+	$objectline = new FichinterLigne($db);
+	if ($objectline->fetch($lineid) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+	$result=$objectline->deleteline($user);
+
+	if ($object->fetch($objectline->fk_fichinter) <= 0)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+}
+
+/*
+ * Ordonnancement des lignes
+*/
+
+else if ($action == 'up' && $user->rights->ficheinter->creer)
+{
+	$object->line_up($lineid);
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
+	exit;
+}
+
+else if ($action == 'down' && $user->rights->ficheinter->creer)
+{
+	$object->line_down($lineid);
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
+	exit;
+}
+
+
+/*
+ * Add file in email form
+*/
+if (GETPOST('addfile','alpha'))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	// Set tmp user directory TODO Use a dedicated directory for temp mails files
+	$vardir=$conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp';
+
+	dol_add_file_process($upload_dir_tmp,0,0);
+	$action='presend';
+}
+
+/*
+ * Remove file in email form
+*/
+if (GETPOST('removedfile','alpha'))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	// Set tmp user directory
+	$vardir=$conf->user->dir_output."/".$user->id;
+	$upload_dir_tmp = $vardir.'/temp';
+
+	// TODO Delete only files that was uploaded from email form
+	dol_remove_file_process(GETPOST('removedfile','alpha'),0);
+	$action='presend';
+}
+
+/*
+ * Send mail
+*/
+if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send))
+{
+	$langs->load('mails');
+
+	if (GETPOST('sendto','alpha'))
+	{
+		// Le destinataire a ete fourni via le champ libre
+		$sendto = GETPOST('sendto','alpha');
+		$sendtoid = 0;
+	}
+	elseif (GETPOST('receiver','alpha') != '-1')
+	{
+		// Recipient was provided from combo list
+		if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
+		{
+			$sendto = $object->client->email;
+			$sendtoid = 0;
+		}
+		else    // Id du contact
+		{
+			$sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
+			$sendtoid = GETPOST('receiver','alpha');
+		}
+	}
+
+	if (dol_strlen($sendto))
+	{
+		$langs->load("commercial");
+
+		$from				= GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
+		$replyto			= GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
+		$message			= GETPOST('message');
+		$sendtocc			= GETPOST('sendtocc','alpha');
+		$deliveryreceipt	= GETPOST('deliveryreceipt','alpha');
+
+		if ($action == 'send')
+		{
+			if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha');
+			else $subject = $langs->transnoentities('Intervention').' '.$object->ref;
+			$actiontypecode='AC_OTH_AUTO';
+			$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);
+			}
+			$actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+		}
+
+		// Create form object
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+
+		$attachedfiles=$formmail->get_attached_files();
+		$filepath = $attachedfiles['paths'];
+		$filename = $attachedfiles['names'];
+		$mimetype = $attachedfiles['mimes'];
+
+		// Send by email
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+		if ($mailfile->error)
+		{
+			$mesg='<div class="error">'.$mailfile->error.'</div>';
+		}
+		else
+		{
+			$result=$mailfile->sendfile();
+			if ($result)
+			{
+				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
+				setEventMessage($mesg);
+				$error=0;
+
+				// Initialisation donnees
+				$object->sendtoid		= $sendtoid;
+				$object->actiontypecode	= $actiontypecode;
+				$object->actionmsg 		= $actionmsg;
+				$object->actionmsg2		= $actionmsg2;
+				$object->fk_element		= $object->id;
+				$object->elementtype	= $object->element;
+
+				// Appel des triggers
+				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				$interface=new Interfaces($db);
+				$result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
+				if ($result < 0) {
+					$error++; $object->errors=$interface->errors;
+				}
+				// Fin appel triggers
+
+				if ($error)
+				{
+					dol_print_error($db);
+				}
+				else
+				{
+					// Redirect here
+					// This avoid sending mail twice if going out and then back to page
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				}
+			}
+			else
+			{
+				$langs->load("other");
+				$mesg='<div class="error">';
+				if ($mailfile->error)
+				{
+					$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+					$mesg.='<br>'.$mailfile->error;
+				}
+				else
+				{
+					$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+				}
+				$mesg.='</div>';
+			}
+		}
+	}
+	else
+	{
+		$langs->load("other");
+		$mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
+		dol_syslog('Recipient email is empty');
+	}
+
+    $action='presend';
+}
+
+else if ($action == 'update_extras')
+{
+	// Fill array 'array_options' with data from update form
+	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
+	if ($ret < 0) $error++;
+
+	if (! $error)
+	{
+		// Actions on extra fields (by external module or standard code)
+		// FIXME le hook fait double emploi avec le trigger !!
+		$hookmanager->initHooks(array('interventiondao'));
+		$parameters=array('id'=>$object->id);
+		$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		if (empty($reshook))
+		{
+			$result=$object->insertExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
+		else if ($reshook < 0) $error++;
+	}
+
+	if ($error) $action = 'edit_extras';
+}
+
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
+{
+	if ($action == 'addcontact')
+	{
+		if ($result > 0 && $id > 0)
+		{
+			$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+			$result = $object->add_contact($contactid, GETPOST('type','int'), GETPOST('source','alpha'));
+		}
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else
+		{
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$langs->load("errors");
+				$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			}
+			else
+			{
+				$mesg = '<div class="error">'.$object->error.'</div>';
+			}
+		}
+	}
+
+	// bascule du statut d'un contact
+	else if ($action == 'swapstatut')
+	{
+		$result=$object->swapContactStatus(GETPOST('ligne','int'));
+	}
+
+	// Efface un contact
+	else if ($action == 'deletecontact')
+	{
+		$result = $object->delete_contact(GETPOST('lineid','int'));
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else {
+			dol_print_error($db);
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+if ($conf->contrat->enabled)
+	$formcontract = new FormContract($db);
+
+llxHeader('',$langs->trans("Fichinter"));
+
+if ($action == 'create')
+{
+	/*
+	 * Mode creation
+	 * Creation d'une nouvelle fiche d'intervention
+	 */
+
+	$soc=new Societe($db);
+
+	print_fiche_titre($langs->trans("AddIntervention"));
+
+	dol_htmloutput_mesg($mesg);
+
+	if ($socid) $res=$soc->fetch($socid);
+
+	if (GETPOST('origin') && GETPOST('originid'))
+	{
+		// Parse element/subelement (ex: project_task)
+		$element = $subelement = GETPOST('origin');
+		if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
+		{
+			$element = $regs[1];
+			$subelement = $regs[2];
+		}
+
+        if ($element == 'project')
+        {
+            $projectid=GETPOST('originid');
+        }
+        else
+		{
+            // For compatibility
+			if ($element == 'order' || $element == 'commande')    {
+				$element = $subelement = 'commande';
+			}
+			if ($element == 'propal')   {
+				$element = 'comm/propal'; $subelement = 'propal';
+			}
+			if ($element == 'contract') {
+				$element = $subelement = 'contrat';
+			}
+
+			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+			$classname = ucfirst($subelement);
+			$objectsrc = new $classname($db);
+			$objectsrc->fetch(GETPOST('originid'));
+			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))
+			{
+				$objectsrc->fetch_lines();
+				$lines = $objectsrc->lines;
+			}
+			$objectsrc->fetch_thirdparty();
+
+			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
+
+			$soc = $objectsrc->client;
+
+			$note_private		= (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : GETPOST('note_private')));
+			$note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : GETPOST('note_public'));
+
+			// Object source contacts list
+			$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
+		}
+	}
+	else {
+		$projectid = GETPOST('projectid','int');
+	}
+
+	if (! $conf->global->FICHEINTER_ADDON)
+	{
+		dol_print_error($db,$langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined"));
+		exit;
+	}
+
+	$object->date = dol_now();
+
+	$obj = $conf->global->FICHEINTER_ADDON;
+	$obj = "mod_".$obj;
+
+	//$modFicheinter = new $obj;
+	//$numpr = $modFicheinter->getNextValue($soc, $object);
+
+	if ($socid > 0)
+	{
+		$soc->fetch($socid);
+
+		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+		print '<table class="border" width="100%">';
+
+		print '<input type="hidden" name="socid" value='.$soc->id.'>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
+
+		print '<input type="hidden" name="action" value="add">';
+
+		// Ref
+		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
+
+		// Description (must be a textarea and not html must be allowed (used in list view)
+		print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
+		print '<td>';
+		print '<textarea name="description" cols="80" rows="'.ROWS_3.'">'.GETPOST('description').'</textarea>';
+		print '</td></tr>';
+
+		// Project
+		if (! empty($conf->projet->enabled))
+		{
+			$formproject=new FormProjets($db);
+
+			$langs->load("project");
+
+            print '<tr><td valign="top">'.$langs->trans("Project").'</td><td>';
+            /* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
+            if ($societe->fournisseur==1)
+            	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
+            else
+            	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
+            	*/
+            $numprojet=$formproject->select_projects($soc->id,GETPOST('projectid','int'),'projectid');
+            if ($numprojet==0)
+            {
+                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
+            }
+            print '</td></tr>';
+        }
+
+		// Contract
+		if ($conf->contrat->enabled)
+		{
+			$langs->load("contracts");
+			print '<tr><td valign="top">'.$langs->trans("Contract").'</td><td>';
+			$numcontrat=$formcontract->select_contract($soc->id,GETPOST('contratid','int'),'contratid',0,1);
+			if ($numcontrat==0)
+			{
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddContract").'</a>';
+			}
+			print '</td></tr>';
+		}
+
+        // Model
+        print '<tr>';
+        print '<td>'.$langs->trans("DefaultModel").'</td>';
+        print '<td colspan="2">';
+        $liste=ModelePDFFicheinter::liste_modeles($db);
+        print $form->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
+        print "</td></tr>";
+
+        // Public note
+        print '<tr>';
+        print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
+        print '<td valign="top" colspan="2">';
+        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+        print $doleditor->Create(1);
+        //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+        print '</td></tr>';
+
+        // Private note
+        if (!empty($user->societe_id))
+        {
+        	print '<tr>';
+        	print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
+        	print '<td valign="top" colspan="2">';
+        	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+        	print $doleditor->Create(1);
+        	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+        	print '</td></tr>';
+        }
+
+        // Other attributes
+        $parameters=array('colspan' => ' colspan="2"');
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		if (empty($reshook) && ! empty($extrafields->attribute_label))
+		{
+			print $object->showOptionals($extrafields,'edit');
+		}
+
+        // Show link to origin object
+        if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
+        {
+        	$newclassname=$classname;
+        	if ($newclassname=='Propal') $newclassname='CommercialProposal';
+        	print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+        }
+
+        print '</table>';
+
+	    if (is_object($objectsrc))
+	    {
+	        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		}
+
+		print '<center><br>';
+		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
+		print '</center>';
+
+		print '</form>';
+	}
+	else
+	{
+		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+		print '<table class="border" width="100%">';
+		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
+		print $form->select_company('','socid','',1,1);
+		print '</td></tr>';
+		print '</table>';
+
+		print '<br><center>';
+		print '<input type="hidden" name="action" value="create">';
+		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
+		print '</center>';
+
+		print '</form>';
+	}
+
+}
+else if ($id > 0 || ! empty($ref))
+{
+	/*
+	 * Affichage en mode visu
+	*/
+
+	$object->fetch($id, $ref);
+	$object->fetch_thirdparty();
+
+	$soc=new Societe($db);
+	$soc->fetch($object->socid);
+
+	dol_htmloutput_mesg($mesg);
+
+	$head = fichinter_prepare_head($object);
+
+	dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), 0, 'intervention');
+
+	$formconfirm='';
+
+	// Confirm deletion of intervention
+	if ($action == 'delete')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1);
+	}
+
+	// Confirm validation
+	if ($action == 'validate')
+	{
+		// on verifie si l'objet est en numerotation provisoire
+		$ref = substr($object->ref, 1, 4);
+		if ($ref == 'PROV')
+		{
+			$numref = $object->getNextNumRef($soc);
+			if (empty($numref))
+			{
+				$error++;
+				setEventMessage($object->error, 'errors');
+			}
+		}
+		else
+		{
+			$numref = $object->ref;
+		}
+		$text=$langs->trans('ConfirmValidateIntervention',$numref);
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',1,1);
+	}
+
+	// Confirm back to draft
+	if ($action == 'modify')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1);
+	}
+
+	// Confirm deletion of line
+	if ($action == 'ask_deleteline')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1);
+	}
+
+	if (!$formconfirm)
+	{
+		$parameters=array('lineid'=>$lineid);
+		$formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST" name="formfichinter">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($action == 'edit_extras') print '<input type="hidden" name="action" value="update_extras">';
+	if ($action == 'contrat')     print '<input type="hidden" name="action" value="setcontrat">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+	print '<table class="border" width="100%">';
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+	print '</td></tr>';
+
+	// Third party
+	print "<tr><td>".$langs->trans("Company").'</td><td colspan="3">'.$object->client->getNomUrl(1)."</td></tr>";
+
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+	{
+		// Duration
+		print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
+		print '<td colspan="3">'.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+		print '</tr>';
+	}
+
+	// Description (must be a textarea and not html must be allowed (used in list view)
+	print '<tr><td valign="top">';
+	print $form->editfieldkey("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea');
+	print '</td><td colspan="3">';
+	print $form->editfieldval("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea:8:80');
+	print '</td>';
+	print '</tr>';
+
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load('projects');
+		print '<tr>';
+		print '<td>';
+
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Project');
+		print '</td>';
+		if ($action != 'classify')
+		{
+			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+			print img_edit($langs->trans('SetProject'),1);
+			print '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'classify')
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid');
+		}
+		else
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none');
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Contrat
+	if ($conf->contrat->enabled)
+	{
+		$langs->load('contrat');
+		print '<tr>';
+		print '<td>';
+
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Contract');
+		print '</td>';
+		if ($action != 'contrat')
+		{
+			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=contrat&amp;id='.$object->id.'">';
+			print img_edit($langs->trans('SetContract'),1);
+			print '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'contrat')
+		{
+			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+			print '<tr><td>';
+			$htmlcontract= new Formcontract($db);
+			//print "$socid,$selected,$htmlname";
+			$htmlcontract->select_contract($object->socid,$object->fk_contrat,'contratid');
+
+			print '</td>';
+			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+			print '</tr></table>';
+		}
+		else
+		{
+			if ($object->fk_contrat)
+            {
+                $contratstatic = new Contrat($db);
+                $contratstatic->fetch($object->fk_contrat);
+                //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
+                print $contratstatic->getNomUrl(0,'',1);
+            }
+            else
+            {
+                print "&nbsp;";
+            }
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Statut
+	print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+
+    // Other attributes
+    $cols = 3;
+    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+	print "</table>";
+
+	print '</form>';
+
+	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+		$blocname = 'contacts';
+		$title = $langs->trans('ContactsAddresses');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+
+	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$blocname = 'notes';
+		$title = $langs->trans('Notes');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+
+ 	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+ 	{
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+		if ($action == 'editline')
+		{
+			print '<input type="hidden" name="action" value="updateline">';
+			print '<input type="hidden" name="line_id" value="'.GETPOST('line_id','int').'">';
+		}
+		else
+		{
+			print '<input type="hidden" name="action" value="addline">';
+		}
+
+		// Intervention lines
+		$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,';
+		$sql.= ' ft.date as date_intervention';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
+		$sql.= ' WHERE ft.fk_fichinter = '.$object->id;
+		$sql.= ' ORDER BY ft.rang ASC, ft.rowid';
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+
+			if ($num)
+			{
+				print '<br>';
+				print '<table class="noborder" width="100%">';
+
+				print '<tr class="liste_titre">';
+				print '<td>'.$langs->trans('Description').'</td>';
+				print '<td align="center">'.$langs->trans('Date').'</td>';
+				print '<td align="right">'.$langs->trans('Duration').'</td>';
+				print '<td width="48" colspan="3">&nbsp;</td>';
+				print "</tr>\n";
+			}
+			$var=true;
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+				$var=!$var;
+
+				// Ligne en mode visu
+				if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid)
+				{
+					print '<tr '.$bc[$var].'>';
+					print '<td>';
+					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
+					print dol_htmlentitiesbr($objp->description);
+
+					// Date
+					print '<td align="center" width="150">'.dol_print_date($db->jdate($objp->date_intervention),'dayhour').'</td>';
+
+					// Duration
+					print '<td align="right" width="150">'.convertSecondToTime($objp->duree).'</td>';
+
+					print "</td>\n";
+
+
+					// Icone d'edition et suppression
+					if ($object->statut == 0  && $user->rights->ficheinter->creer)
+					{
+						print '<td align="center">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
+						print img_edit();
+						print '</a>';
+						print '</td>';
+						print '<td align="center">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
+						print img_delete();
+						print '</a></td>';
+						if ($num > 1)
+						{
+							print '<td align="center">';
+							if ($i > 0)
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
+								print img_up();
+								print '</a>';
+							}
+							if ($i < $num-1)
+							{
+								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
+								print img_down();
+								print '</a>';
+							}
+							print '</td>';
+						}
+					}
+					else
+					{
+						print '<td colspan="3">&nbsp;</td>';
+					}
+
+					print '</tr>';
+
+					$line = new FichinterLigne($db);
+					$line->fetch($objp->rowid);
+
+					$extrafieldsline = new ExtraFields($db);
+					$extralabelslines=$extrafieldsline->fetch_name_optionals_label($line->table_element);
+
+					$line->fetch_optionals($line->rowid, $extralabelslines);
+
+					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>5));
+
+
+				}
+
+				// Line in update mode
+				if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id','int') == $objp->rowid)
+				{
+					print '<tr '.$bc[$var].'>';
+					print '<td>';
+					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
+
+					// Editeur wysiwyg
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					$doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
+					$doleditor->Create();
+					print '</td>';
+
+					// Date d'intervention
+					print '<td align="center" class="nowrap">';
+					$form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention");
+					print '</td>';
+
+					// Duration
+					print '<td align="right">';
+					$form->select_duration('duration',$objp->duree);
+					print '</td>';
+
+					print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+					print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
+					print '</tr>' . "\n";
+
+					$line = new FichinterLigne($db);
+					$line->fetch($objp->rowid);
+
+					$extrafieldsline = new ExtraFields($db);
+					$extralabelslines=$extrafieldsline->fetch_name_optionals_label($line->table_element);
+					$line->fetch_optionals($line->rowid, $extralabelslines);
+
+					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>5));
+
+
+				}
+
+				$i++;
+			}
+
+			$db->free($resql);
+
+			// Add new line
+			if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS))
+			{
+				if (! $num) print '<br><table class="noborder" width="100%">';
+
+				print '<tr class="liste_titre">';
+				print '<td>';
+				print '<a name="add"></a>'; // ancre
+				print $langs->trans('Description').'</td>';
+				print '<td align="center">'.$langs->trans('Date').'</td>';
+				print '<td align="right">'.$langs->trans('Duration').'</td>';
+
+				print '<td colspan="4">&nbsp;</td>';
+				print "</tr>\n";
+
+				$var=false;
+
+				print '<tr '.$bc[$var].">\n";
+				print '<td>';
+				// editeur wysiwyg
+				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+				$doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
+				$doleditor->Create();
+				print '</td>';
+
+				// Date intervention
+				print '<td align="center" class="nowrap">';
+				$now=dol_now();
+				$timearray=dol_getdate($now);
+				if (! GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
+				else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int'));
+				$form->select_date($timewithnohour,'di',1,1,0,"addinter");
+				print '</td>';
+
+				// Duration
+				print '<td align="right">';
+				$selectmode='select';
+				if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text';
+				$form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode, 1);
+				print '</td>';
+
+				print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
+				print '</tr>';
+
+				//Line extrafield
+
+				$lineadd = new FichinterLigne($db);
+
+				$extrafieldsline = new ExtraFields($db);
+				$extralabelslines=$extrafieldsline->fetch_name_optionals_label($lineadd->table_element);
+
+				print $lineadd->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>5));
+
+				if (! $num) print '</table>';
+			}
+
+			if ($num) print '</table>';
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+
+		print '</form>'."\n";
+ 	}
+
+	dol_fiche_end();
+
+	print "\n";
+
+
+	/*
+	 * Actions buttons
+	 */
+
+	print '<div class="tabsAction">';
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+		                                                                                          // modified by hook
+	if (empty($reshook))
+	{
+		if ($user->societe_id == 0)
+		{
+			if ($action != 'editdescription' && ($action != 'presend'))
+			{
+				// Validate
+				if ($object->statut == 0 && $user->rights->ficheinter->creer && (count($object->lines) > 0 || ! empty($conf->global->FICHINTER_DISABLE_DETAILS)))
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
+					print '>'.$langs->trans("Validate").'</a></div>';
+				}
+
+				// Modify
+				if ($object->statut == 1 && $user->rights->ficheinter->creer)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modify">';
+					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify");
+					else print $langs->trans("SetToDraft");
+					print '</a></div>';
+				}
+
+				// Send
+				if ($object->statut > 0)
+				{
+					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
+					}
+					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
+				}
+
+				// Event agenda
+				if (! empty($conf->global->FICHINTER_ADDLINK_TO_EVENT))
+				{
+					if (! empty($conf->agenda->enabled) && $object->statut > 0)
+					{
+						$langs->load("agenda");
+						if ($object->statut < 2)
+						{
+							if ($user->rights->agenda->myactions->create) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'&amp;backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddEvent").'</a></div>';
+							else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddEvent").'</a></div>';
+						}
+					}
+				}
+
+				// Proposal
+				if (! empty($conf->propal->enabled) && $object->statut > 0)
+				{
+					$langs->load("propal");
+					if ($object->statut < 2)
+					{
+						if ($user->rights->propal->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddProp").'</a></div>';
+						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddProp").'</a></div>';
+					}
+				}
+
+				// Invoicing
+				if (! empty($conf->facture->enabled) && $object->statut > 0)
+				{
+					$langs->load("bills");
+					if ($object->statut < 2)
+					{
+						if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a></div>';
+						else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddBill").'</a></div>';
+					}
+
+					if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED))
+					{
+						if ($object->statut != 2)
+						{
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
+						}
+						else
+						{
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
+						}
+					}
+				}
+
+				// Delete
+				if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
+				{
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
+					print '>'.$langs->trans('Delete').'</a></div>';
+				}
+
+			}
+		}
+	}
+
+	print '</div>';
+	print '<br>';
+
+	if ($action != 'presend')
+	{
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		//print '<table width="100%"><tr><td width="50%" valign="top">';
+
+		/*
+		 * Built documents
+		 */
+		$filename=dol_sanitizeFileName($object->ref);
+		$filedir=$conf->ficheinter->dir_output . "/".$object->ref;
+		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed=$user->rights->ficheinter->creer;
+		$delallowed=$user->rights->ficheinter->supprimer;
+		$genallowed=1;
+		$delallowed=1;
+
+		$var=true;
+
+		//print "<br>\n";
+		$somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+
+		/*
+		 * Linked object block
+		*/
+		$somethingshown=$object->showLinkedObjectBlock();
+
+		//print '</td><td valign="top" width="50%">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions=new FormActions($db);
+		$somethingshown=$formactions->showactions($object,'fichinter',$socid);
+
+		print '</div></div></div>';
+		//print "</td></tr></table>\n";
+	}
+
+
+	/*
+	 * Action presend
+	 */
+	if ($action == 'presend')
+	{
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
+		$file=$fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->client->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('interventions');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file))
+		{
+			$result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0)
+			{
+				dol_print_error($db,$result);
+				exit;
+			}
+			$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
+			$file=$fileparams['fullname'];
+		}
+
+		print '<br>';
+		print_titre($langs->trans('SendInterventionByMail'));
+
+		// Create form object
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+		$formmail->fromtype = 'user';
+		$formmail->fromid   = $user->id;
+		$formmail->fromname = $user->getFullName($langs);
+		$formmail->frommail = $user->email;
+		$formmail->withfrom=1;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
+		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+		$formmail->withtopic=$outputlangs->trans('SendInterventionRef','__FICHINTERREF__');
+		$formmail->withfile=2;
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+
+		// Tableau des substitutions
+		$formmail->substit['__FICHINTERREF__']=$object->ref;
+		$formmail->substit['__SIGNATURE__']=$user->signature;
+		$formmail->substit['__PERSONALIZED__']='';
+		$formmail->substit['__CONTACTCIVNAME__']='';
+
+		//Find the good contact adress
+		$custcontact='';
+		$contactarr=array();
+		$contactarr=$object->liste_contact(-1,'external');
+
+		if (is_array($contactarr) && count($contactarr)>0) {
+			foreach($contactarr as $contact) {
+				if ($contact['libelle']==$langs->trans('TypeContact_fichinter_external_CUSTOMER')) {
+					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+					$contactstatic=new Contact($db);
+					$contactstatic->fetch($contact['id']);
+					$custcontact=$contactstatic->getFullName($langs,1);
+				}
+			}
+
+			if (!empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action']='send';
+		$formmail->param['models']='fichinter_send';
+		$formmail->param['fichinter_id']=$object->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+
+		// Init list of files
+		if (GETPOST("mode")=='init')
+		{
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+		}
+
+		print $formmail->get_form();
+
+		print '<br>';
+	}
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 5c556ff2356..4ab0cfdb96b 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent        <jmenent@2byte.es>
  *
@@ -24,10 +24,11 @@
  * 	\brief      Fichier de la classe des gestion des fiches interventions
  */
 require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
 
 
 /**
- *	Classe des gestion des fiches interventions
+ *	Class to manage interventions
  */
 class Fichinter extends CommonObject
 {
@@ -36,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
@@ -151,7 +157,7 @@ class Fichinter extends CommonObject
 		$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -162,10 +168,21 @@ class Fichinter extends CommonObject
 				$this->ref='(PROV'.$this->id.')';
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->ref."' WHERE rowid=".$this->id;
 
-				dol_syslog(get_class($this)."::create sql=".$sql);
+				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if (! $resql) $error++;
 			}
+
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            {
+
+            	$result=$this->insertExtraFields();
+            	if ($result < 0)
+            	{
+            		$error++;
+            	}
+            }
+
 			// Add linked object
 			if (! $error && $this->origin && $this->origin_id)
 			{
@@ -176,13 +193,10 @@ class Fichinter extends CommonObject
 
             if (! $notrigger)
             {
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('FICHINTER_CREATE',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
+                // Call trigger
+                $result=$this->call_trigger('FICHINTER_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
             }
 
 			if (! $error)
@@ -201,7 +215,6 @@ class Fichinter extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -232,22 +245,19 @@ class Fichinter extends CommonObject
 		$sql.= ", fk_projet = ".$this->fk_project;
 		$sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
 		$sql.= ", note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
+		$sql.= ", fk_user_modif = ".$user->id;
 		$sql.= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
 
 			if (! $notrigger)
 			{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('FICHINTER_MODIFY',$this,$user,$langs,$conf);
-			if ($result < 0) {
-				$error++; $this->errors=$interface->errors;
-			}
-			// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('FICHINTER_MODIFY',$user);
+                if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+                // End call triggers
 			}
 
 			$this->db->commit();
@@ -256,7 +266,6 @@ class Fichinter extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::update error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -275,12 +284,12 @@ class Fichinter extends CommonObject
 		$sql.= " f.datec,";
 		$sql.= " f.date_valid as datev,";
 		$sql.= " f.tms as datem,";
-		$sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams";
+		$sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
 		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 		if ($ref) $sql.= " WHERE f.ref='".$this->db->escape($ref)."'";
 		else $sql.= " WHERE f.rowid=".$rowid;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -301,6 +310,7 @@ class Fichinter extends CommonObject
 				$this->note_public  = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->modelpdf     = $obj->model_pdf;
+				$this->fk_contrat	= $obj->fk_contrat;
 
 				$this->extraparams	= (array) json_decode($obj->extraparams, true);
 
@@ -326,7 +336,6 @@ class Fichinter extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::fetch ".$this->error,LOG_ERR);
 			return -1;
 		}
 	}
@@ -350,7 +359,7 @@ class Fichinter extends CommonObject
 			$sql.= " WHERE rowid = ".$this->id;
 			$sql.= " AND entity = ".$conf->entity;
 
-			dol_syslog("Fichinter::setDraft sql=".$sql);
+			dol_syslog("Fichinter::setDraft", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -361,7 +370,6 @@ class Fichinter extends CommonObject
 			{
 				$this->db->rollback();
 				$this->error=$this->db->lasterror();
-				dol_syslog("Fichinter::setDraft ".$this->error,LOG_ERR);
 				return -1;
 			}
 		}
@@ -371,11 +379,12 @@ class Fichinter extends CommonObject
 	 *	Validate a intervention
 	 *
 	 *	@param		User		$user		User that validate
-	 *	@return		int			<0 if KO, >0 if OK
+     *  @param		int			$notrigger	1=Does not execute triggers, 0= execuete triggers
+	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	function setValid($user)
+	function setValid($user, $notrigger=0)
 	{
-		global $langs, $conf;
+		global $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$error=0;
@@ -395,6 +404,7 @@ class Fichinter extends CommonObject
 			{
 				$num = $this->ref;
 			}
+            $this->newref = $num;
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
 			$sql.= " SET fk_statut = 1";
@@ -405,18 +415,25 @@ class Fichinter extends CommonObject
 			$sql.= " AND entity = ".$conf->entity;
 			$sql.= " AND fk_statut = 0";
 
-			dol_syslog(get_class($this)."::setValid sql=".$sql);
+			dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
-				dol_syslog(get_class($this)."::setValid Echec update - 10 - sql=".$sql, LOG_ERR);
 				dol_print_error($this->db);
 				$error++;
 			}
 
+			if (! $error && ! $notrigger)
+			{
+                // Call trigger
+                $result=$this->call_trigger('FICHINTER_VALIDATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+			}
+
 			if (! $error)
 			{
-				$this->oldref = '';
+				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
 				if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -424,20 +441,26 @@ class Fichinter extends CommonObject
 					// Rename of object directory ($this->ref = old ref, $num = new ref)
 					// to  not lose the linked files
 					$oldref = dol_sanitizeFileName($this->ref);
-					$snum = dol_sanitizeFileName($num);
+					$newref = dol_sanitizeFileName($num);
 					$dirsource = $conf->ficheinter->dir_output.'/'.$oldref;
-					$dirdest = $conf->ficheinter->dir_output.'/'.$snum;
+					$dirdest = $conf->ficheinter->dir_output.'/'.$newref;
 					if (file_exists($dirsource))
 					{
-						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
+						dol_syslog(get_class($this)."::setValid rename dir ".$dirsource." into ".$dirdest);
 
 						if (@rename($dirsource, $dirdest))
 						{
-							$this->oldref = $oldref;
-
-							dol_syslog("Rename ok");
-							// Suppression ancien fichier PDF dans nouveau rep
-							dol_delete_file($conf->ficheinter->dir_output.'/'.$snum.'/'.$oldref.'*.*');
+	                        dol_syslog("Rename ok");
+	                        // Rename docs starting with $oldref with $newref
+	                        $listoffiles=dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+	                        foreach($listoffiles as $fileentry)
+	                        {
+	                        	$dirsource=$fileentry['name'];
+	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
+	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+	                        	@rename($dirsource, $dirdest);
+	                        }
 						}
 					}
 				}
@@ -452,18 +475,6 @@ class Fichinter extends CommonObject
 				$this->date_validation=$now;
 			}
 
-			if (! $error)
-			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('FICHINTER_VALIDATE',$this,$user,$langs,$conf);
-	 			if ($result < 0) {
-	 				$error++; $this->errors=$interface->errors;
-	 			}
-				// Fin appel triggers
-			}
-
 			if (! $error)
 			{
 				$this->db->commit();
@@ -478,31 +489,6 @@ class Fichinter extends CommonObject
 		}
 	}
 
-	/**
-	 * 	Set intervetnion as billed
-	 *
-	 *  @return int     <0 si ko, >0 si ok
-	 */
-	function setBilled()
-	{
-		global $conf;
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'fichinter SET fk_statut = 2';
-		$sql.= ' WHERE rowid = '.$this->id;
-		$sql.= " AND entity = ".$conf->entity;
-		$sql.= " AND fk_statut = 1";
-
-		if ($this->db->query($sql) )
-		{
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
 
 	/**
 	 *	Returns the label status
@@ -573,7 +559,7 @@ class Fichinter extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/fichinter/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$picto='intervention';
@@ -591,7 +577,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)
@@ -647,9 +633,11 @@ class Fichinter extends CommonObject
 		global $conf;
 
 		$sql = "SELECT f.rowid,";
-		$sql.= " datec,";
+		$sql.= " f.datec,";
+		$sql.= " f.tms as date_modification,";
 		$sql.= " f.date_valid as datev,";
 		$sql.= " f.fk_user_author,";
+		$sql.= " f.fk_user_modif as fk_user_modification,";
 		$sql.= " f.fk_user_valid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 		$sql.= " WHERE f.rowid = ".$id;
@@ -665,6 +653,7 @@ class Fichinter extends CommonObject
 				$this->id                = $obj->rowid;
 
 				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
 				$this->date_validation   = $this->db->jdate($obj->datev);
 
 				$cuser = new User($this->db);
@@ -677,6 +666,13 @@ class Fichinter extends CommonObject
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation     = $vuser;
 				}
+				if ($obj->fk_user_modification)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modification);
+					$this->user_modification   = $muser;
+				}
+
 			}
 			$this->db->free($resql);
 		}
@@ -723,14 +719,14 @@ class Fichinter extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet";
 		$sql.= " WHERE fk_fichinter = ".$this->id;
 
-		dol_syslog("Fichinter::delete sql=".$sql);
+		dol_syslog("Fichinter::delete", LOG_DEBUG);
 		if ( $this->db->query($sql) )
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter";
 			$sql.= " WHERE rowid = ".$this->id;
 			$sql.= " AND entity = ".$conf->entity;
 
-			dol_syslog("Fichinter::delete sql=".$sql);
+			dol_syslog("Fichinter::delete", LOG_DEBUG);
 			if ( $this->db->query($sql) )
 			{
 
@@ -762,14 +758,10 @@ class Fichinter extends CommonObject
 
 				if (! $notrigger)
 				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('FICHINTER_DELETE',$this,$user,$langs,$conf);
-					if ($result < 0) {
-						$error++; $this->errors=$interface->errors;
-					}
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('FICHINTER_DELETE',$user);
+                    if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+                    // End call triggers
 				}
 
 				$this->db->commit();
@@ -828,7 +820,7 @@ class Fichinter extends CommonObject
 	 *
 	 *	@param      User	$user			Object user who modify
 	 *	@param      string	$description    description
-	 *	@return     int						<0 if ko, >0 if ok
+	 *	@return     int						<0 if KO, >0 if OK
 	 */
 	function set_description($user, $description)
 	{
@@ -837,10 +829,10 @@ class Fichinter extends CommonObject
 		if ($user->rights->ficheinter->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
-			$sql.= " SET description = '".$this->db->escape($description)."'";
+			$sql.= " SET description = '".$this->db->escape($description)."',";
+			$sql.= " fk_user_modif = ".$user->id;
 			$sql.= " WHERE rowid = ".$this->id;
 			$sql.= " AND entity = ".$conf->entity;
-			$sql.= " AND fk_statut = 0";
 
 			if ($this->db->query($sql))
 			{
@@ -875,7 +867,6 @@ class Fichinter extends CommonObject
 			$sql.= " WHERE rowid = ".$this->id;
 			$sql.= " AND entity = ".$conf->entity;
 
-			dol_syslog("sql=".$sql);
 			if ($this->db->query($sql))
 			{
 				$this->fk_contrat = $contractid;
@@ -884,7 +875,6 @@ class Fichinter extends CommonObject
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog($this->error, LOG_ERR);
 				return -1;
 			}
 		}
@@ -899,11 +889,12 @@ class Fichinter extends CommonObject
 	 *	@param    	string	$desc					Line description
 	 *	@param      date	$date_intervention  	Intervention date
 	 *	@param      int		$duration            	Intervention duration
+	 *  @param		array	$array_option			Array option
 	 *	@return    	int             				>0 if ok, <0 if ko
 	 */
-	function addline($user,$fichinterid, $desc, $date_intervention, $duration)
+	function addline($user,$fichinterid, $desc, $date_intervention, $duration, $array_option='')
 	{
-		dol_syslog("Fichinter::Addline $fichinterid, $desc, $date_intervention, $duration");
+		dol_syslog(get_class($this)."::addline $fichinterid, $desc, $date_intervention, $duration");
 
 		if ($this->statut == 0)
 		{
@@ -917,8 +908,13 @@ class Fichinter extends CommonObject
 			$line->datei        = $date_intervention;
 			$line->duration     = $duration;
 
+			if (is_array($array_option) && count($array_option)>0) {
+				$line->array_options=$array_option;
+			}
+
 			$result=$line->insert($user);
-			if ($result > 0)
+
+			if ($result >= 0)
 			{
 				$this->db->commit();
 				return 1;
@@ -926,7 +922,6 @@ class Fichinter extends CommonObject
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog("Error sql=$sql, error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
@@ -981,9 +976,9 @@ class Fichinter extends CommonObject
 	{
 		$sql = 'SELECT rowid, description, duree, date, rang';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
-		$sql.= ' WHERE fk_fichinter = '.$this->id;
+		$sql.=' WHERE fk_fichinter = '.$this->id .' ORDER BY rang ASC' ;
 
-		dol_syslog(get_class($this)."::fetch_lines sql=".$sql);
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1021,7 +1016,7 @@ class Fichinter extends CommonObject
 /**
  *	Classe permettant la gestion des lignes d'intervention
  */
-class FichinterLigne
+class FichinterLigne extends CommonObjectLine
 {
 	var $db;
 	var $error;
@@ -1034,6 +1029,9 @@ class FichinterLigne
 	var $duration;        // Duree de l'intervention
 	var $rang = 0;
 
+	public $element='fichinterdet';
+	public $table_element='fichinterdet';
+	public $fk_element='fk_fichinter';
 
 	/**
 	 *	Constructor
@@ -1058,12 +1056,13 @@ class FichinterLigne
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
 		$sql.= ' WHERE ft.rowid = '.$rowid;
 
-		dol_syslog("FichinterLigne::fetch sql=".$sql);
+		dol_syslog("FichinterLigne::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$objp = $this->db->fetch_object($result);
 			$this->rowid          	= $objp->rowid;
+			$this->id 				= $objp->rowid;
 			$this->fk_fichinter   	= $objp->fk_fichinter;
 			$this->datei			= $this->db->jdate($objp->datei);
 			$this->desc           	= $objp->description;
@@ -1076,7 +1075,6 @@ class FichinterLigne
 		else
 		{
 			$this->error=$this->db->error().' sql='.$sql;
-			dol_print_error($this->db,$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -1126,25 +1124,35 @@ class FichinterLigne
 		$sql.= ' '.$rangToUse;
 		$sql.= ')';
 
-		dol_syslog("FichinterLigne::insert sql=".$sql);
+		dol_syslog("FichinterLigne::insert", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
+			$this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
+
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+            {
+            	$this->id=$this->rowid;
+            	$result=$this->insertExtraFields();
+            	if ($result < 0)
+            	{
+            		$error++;
+            	}
+            }
+
+
 			$result=$this->update_total();
+
 			if ($result > 0)
 			{
 				$this->rang=$rangToUse;
 
 				if (! $notrigger)
 				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$resulttrigger=$interface->run_triggers('LINEFICHINTER_CREATE',$this,$user,$langs,$conf);
-					if ($resulttrigger < 0) {
-						$error++; $this->errors=$interface->errors;
-					}
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('LINEFICHINTER_CREATE',$user);
+                    if ($result < 0) { $error++; }
+                    // End call triggers
 				}
 			}
 
@@ -1161,7 +1169,6 @@ class FichinterLigne
 		else
 		{
 			$this->error=$this->db->error()." sql=".$sql;
-			dol_syslog("FichinterLigne::insert Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -1189,24 +1196,31 @@ class FichinterLigne
 		$sql.= ",rang='".$this->rang."'";
 		$sql.= " WHERE rowid = ".$this->rowid;
 
-		dol_syslog("FichinterLigne::update sql=".$sql);
+		dol_syslog("FichinterLigne::update", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
+
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+        	{
+        		$this->id=$this->rowid;
+        		$result=$this->insertExtraFields();
+        		if ($result < 0)
+        		{
+        			$error++;
+        		}
+        	}
+
 			$result=$this->update_total();
 			if ($result > 0)
 			{
 
 				if (! $notrigger)
 				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$resulttrigger=$interface->run_triggers('LINEFICHINTER_UPDATE',$this,$user,$langs,$conf);
-					if ($resulttrigger < 0) {
-						$error++; $this->errors=$interface->errors;
-					}
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('LINEFICHINTER_UPDATE',$user);
+                    if ($result < 0) { $error++; }
+                    // End call triggers
 				}
 			}
 
@@ -1218,7 +1232,6 @@ class FichinterLigne
 			else
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog("FichinterLigne::update Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
@@ -1226,7 +1239,6 @@ class FichinterLigne
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog("FichinterLigne::update Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -1247,7 +1259,7 @@ class FichinterLigne
 		$sql.= " FROM ".MAIN_DB_PREFIX."fichinterdet";
 		$sql.= " WHERE fk_fichinter=".$this->fk_fichinter;
 
-		dol_syslog("FichinterLigne::update_total sql=".$sql);
+		dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1260,7 +1272,7 @@ class FichinterLigne
 			$sql.= " WHERE rowid = ".$this->fk_fichinter;
 			$sql.= " AND entity = ".$conf->entity;
 
-			dol_syslog("FichinterLigne::update_total sql=".$sql);
+			dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -1270,7 +1282,6 @@ class FichinterLigne
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog("FichinterLigne::update_total Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
@@ -1278,7 +1289,6 @@ class FichinterLigne
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog("FichinterLigne::update Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -1302,28 +1312,22 @@ class FichinterLigne
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet WHERE rowid = ".$this->rowid;
 			$resql = $this->db->query($sql);
-			dol_syslog(get_class($this)."::deleteline sql=".$sql);
 
 			if ($resql)
 			{
 				$result = $this->update_total();
 				if ($result > 0)
 				{
-					$this->db->commit();
-
 					if (! $notrigger)
 					{
-						// Appel des triggers
-						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-						$interface=new Interfaces($this->db);
-						$resulttrigger=$interface->run_triggers('LINEFICHINTER_DELETE',$this,$user,$langs,$conf);
-						if ($resulttrigger < 0) {
-							$error++; $this->errors=$interface->errors;
-						}
-						// Fin appel triggers
+                        // Call trigger
+                        $result=$this->call_trigger('LINEFICHINTER_DELETE',$user);
+                        if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+                        // End call triggers
 					}
 
-					return $result;
+                    $this->db->commit();
+                    return $result;
 				}
 				else
 				{
@@ -1334,7 +1338,6 @@ class FichinterLigne
 			else
 			{
 				$this->error=$this->db->error()." sql=".$sql;
-				dol_syslog(get_class($this)."::deleteline Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
diff --git a/htdocs/fichinter/class/index.html b/htdocs/fichinter/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index f5f355b315a..b0f9ada3af7 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -64,15 +64,14 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 	}
 	else
 	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+		} else {
+			$mesg = $object->error;
 		}
+
+		setEventMessage($mesg, 'errors');
 	}
 }
 
@@ -109,9 +108,7 @@ $userstatic=new User($db);
 
 llxHeader();
 
-
 // Mode vue et edition
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
@@ -147,6 +144,9 @@ if ($id > 0 || ! empty($ref))
 
 	print '<br>';
 
+	if (! empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_USER))     $hideaddcontactforuser=1;
+	if (! empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_THIPARTY)) $hideaddcontactforthirdparty=1;
+
 	// Contacts lines
 	include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
 }
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
deleted file mode 100644
index 9be7d67115e..00000000000
--- a/htdocs/fichinter/fiche.php
+++ /dev/null
@@ -1,1734 +0,0 @@
-<?php
-/* Copyright (C) 2002-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2013  Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/fichinter/fiche.php
- *	\brief      Fichier fiche intervention
- *	\ingroup    ficheinter
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
-if (! empty($conf->projet->enabled))
-{
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-
-if ($conf->contrat->enabled)
-{
-	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
-	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
-}
-if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"))
-{
-	require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.'.php';
-}
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
-$langs->load("bills");
-$langs->load("companies");
-$langs->load("interventions");
-
-$id			= GETPOST('id','int');
-$ref		= GETPOST('ref','alpha');
-$socid		= GETPOST('socid','int');
-$contratid	= GETPOST('contratid','int');
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-$mesg		= GETPOST('msg','alpha');
-$origin=GETPOST('origin','alpha');
-$originid=(GETPOST('originid','int')?GETPOST('originid','int'):GETPOST('origin_id','int')); // For backward compatibility
-$note_public = GETPOST('note_public');
-
-//PDF
-$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
-
-// Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('interventioncard'));
-
-$object = new Fichinter($db);
-$extrafields = new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-if ($id > 0 || ! empty($ref))
-{
-	$ret=$object->fetch($id, $ref);
-	if ($ret > 0) $ret=$object->fetch_thirdparty();
-	if ($ret < 0) dol_print_error('',$object->error);
-}
-
-$permissionnote=$user->rights->ficheinter->creer;	// Used by the include of actions_setnotes.inc.php
-
-
-/*
- * Actions
- */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-
-if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-{
-	$result = $object->setValid($user);
-	if ($result >= 0)
-	{
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
-
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-	}
-}
-
-else if ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-{
-	$result = $object->setDraft($user);
-	if ($result >= 0)
-	{
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) $result=fichinter_create($db, $object, (!GETPOST('model','alpha'))?$object->model:GETPOST('model','apha'), $outputlangs);
-
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-	}
-}
-
-else if ($action == 'add' && $user->rights->ficheinter->creer)
-{
-	// Fill array 'array_options' with data from add form
-	$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-	if ($ret < 0) $error ++;
-
-    $object->socid			= $socid;
-    $object->duree			= GETPOST('duree','int');
-    $object->fk_project		= GETPOST('projectid','int');
-    $object->fk_contrat		= GETPOST('contratid','int');
-    $object->author			= $user->id;
-    $object->description	= GETPOST('description');
-    $object->ref			= $ref;
-    $object->modelpdf		= GETPOST('model','alpha');
-    $object->note_private	= GETPOST('note_private');
-    $object->note_public	= GETPOST('note_public');
-
-	if ($object->socid > 0)
-	{
-		// If creation from another object of another module (Example: origin=propal, originid=1)
-		if (!empty($origin) && !empty($originid) )
-		{
-			// Parse element/subelement (ex: project_task)
-			$element = $subelement = $_POST['origin'];
-			if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
-			{
-				$element = $regs[1];
-				$subelement = $regs[2];
-			}
-
-			// For compatibility
-			if ($element == 'order')    {
-				$element = $subelement = 'commande';
-			}
-			if ($element == 'propal')   {
-				$element = 'comm/propal'; $subelement = 'propal';
-			}
-			if ($element == 'contract') {
-				$element = $subelement = 'contrat';
-			}
-
-			$object->origin    = $origin;
-			$object->origin_id = $originid;
-
-			// Possibility to add external linked objects with hooks
-			$object->linked_objects[$object->origin] = $object->origin_id;
-			if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
-			{
-				$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
-			}
-
-			$id = $object->create($user);
-
-			if ($id > 0)
-			{
-				dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-				$classname = ucfirst($subelement);
-				$srcobject = new $classname($db);
-
-				dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-				$result=$srcobject->fetch($object->origin_id);
-				if ($result > 0)
-				{
-					$srcobject->fetch_thirdparty();
-					$lines = $srcobject->lines;
-					if (empty($lines) && method_exists($srcobject,'fetch_lines'))
-					{
-						$srcobject->fetch_lines();
-						$lines = $srcobject->lines;
-					}
-
-					$fk_parent_line=0;
-					$num=count($lines);
-
-					for ($i=0;$i<$num;$i++)
-					{
-						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-
-						if ($product_type == 1 || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
-							// service prédéfini
-							if ($lines[$i]->fk_product > 0)
-							{
-								// Define output language
-								if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-								{
-									$prod = new Product($db);
-									$prod->id=$lines[$i]->fk_product;
-									$prod->getMultiLangs();
-
-									$outputlangs = $langs;
-									$newlang='';
-									if (empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
-									if (empty($newlang)) $newlang=$srcobject->client->default_lang;
-									if (! empty($newlang))
-									{
-										$outputlangs = new Translate("",$conf);
-										$outputlangs->setDefaultLang($newlang);
-									}
-
-									$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-								}
-								else
-								{
-									$label = $lines[$i]->product_label;
-								}
-
-								$desc = $label;
-								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
-							}
-							else {
-								$desc = dol_htmlentitiesbr($lines[$i]->desc);
-								$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
-							}
-							$timearray=dol_getdate(mktime());
-							$date_intervention=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
-							if ($product_type == 1)
-							{ //service
-								$duration = 3600;
-							}
-							else
-							{ //product
-							    $duration = 0;
-							}
-
-		                    $result = $object->addline(
-								$user,
-		                        $id,
-		                        $desc,
-					            $date_intervention,
-                 				$duration
-		                    );
-
-							if ($result < 0)
-							{
-								$error++;
-								break;
-							}
-
-						}
-					}
-
-	            }
-	            else
-	            {
-	                $mesg=$srcobject->error;
-	                $error++;
-	            }
-	        }
-	        else
-	        {
-	            $mesg=$object->error;
-	            $error++;
-	        }
-	    }
-	    else
-	    {
-			$result = $object->create($user);
-	        if ($result > 0)
-	        {
-	            $id=$result;      // Force raffraichissement sur fiche venant d'etre cree
-	        }
-	        else
-	        {
-	            $langs->load("errors");
-	            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-	            $action = 'create';
-	        }
-        }
-    }
-    else
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ThirdParty")).'</div>';
-        $action = 'create';
-    }
-}
-
-else if ($action == 'update' && $user->rights->ficheinter->creer)
-{
-	$object->socid			= $socid;
-	$object->fk_project		= GETPOST('projectid','int');
-	$object->fk_contrat		= GETPOST('contratid','int');
-	$object->author			= $user->id;
-	$object->description	= GETPOST('description','alpha');
-	$object->ref			= $ref;
-
-	$result=$object->update($user);
-	if ($result<0) {
-		setEventMessage($object->error,'errors');
-	}
-}
-
-/*
- * Build doc
- */
-else if ($action == 'builddoc' && $user->rights->ficheinter->creer)	// En get ou en post
-{
-	$object->fetch_lines();
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	$result=fichinter_create($db, $object, GETPOST('model','alpha'), $outputlangs);
-	if ($result <= 0)
-	{
-		dol_print_error($db,$result);
-		exit;
-	}
-}
-
-// Remove file in doc form
-else if ($action == 'remove_file')
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$object->fetch_thirdparty();
-
-	$langs->load("other");
-	$upload_dir = $conf->ficheinter->dir_output;
-	$file = $upload_dir . '/' . GETPOST('file');
-	$ret=dol_delete_file($file,0,0,0,$object);
-	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-}
-
-// Set into a project
-else if ($action == 'classin' && $user->rights->ficheinter->creer)
-{
-	$result=$object->setProject(GETPOST('projectid','int'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-
-// Set into a contract
-else if ($action == 'setcontrat' && $user->rights->contrat->creer)
-{
-	$result=$object->set_contrat($user,GETPOST('contratid','int'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-
-else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
-{
-	$result=$object->delete($user);
-	if ($result<0) {
-		setEventMessage($object->error,'errors');
-	}
-
-	header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter');
-	exit;
-}
-
-else if ($action == 'setdescription' && $user->rights->ficheinter->creer)
-{
-	$result=$object->set_description($user,GETPOST('description'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-
-// Add line
-else if ($action == "addline" && $user->rights->ficheinter->creer)
-{
-	if (!GETPOST('np_desc'))
-	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'</div>';
-		$error++;
-	}
-	if (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))
-	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'</div>';
-		$error++;
-	}
-	if (GETPOST('durationhour','int') >= 24 && GETPOST('durationmin','int') > 0)
-	{
-		$mesg='<div class="error">'.$langs->trans("ErrorValueTooHigh").'</div>';
-		$error++;
-	}
-	if (! $error)
-	{
-		$db->begin();
-
-		$desc=GETPOST('np_desc');
-		$date_intervention = dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
-		$duration = convertTime2Seconds(GETPOST('durationhour','int'), GETPOST('durationmin','int'));
-
-        $result=$object->addline(
-			$user,
-            $id,
-            $desc,
-            $date_intervention,
-            $duration
-        );
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang='';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-		if (! empty($newlang))
-		{
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-
-		if ($result >= 0)
-		{
-			$db->commit();
-
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-			exit;
-		}
-		else
-		{
-			$mesg=$object->error;
-			$db->rollback();
-		}
-	}
-}
-
-// Classify Billed
-else if ($action == 'classifybilled' && $user->rights->ficheinter->creer)
-{
-	$result=$object->setBilled();
-	if ($result > 0)
-	{
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-	}
-}
-
-/*
- *  Mise a jour d'une ligne d'intervention
-*/
-else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save','alpha') == $langs->trans("Save"))
-{
-	$objectline = new FichinterLigne($db);
-	if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-
-	if ($object->fetch($objectline->fk_fichinter) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-	$object->fetch_thirdparty();
-
-	$desc		= GETPOST('np_desc');
-	$date_inter	= dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int'));
-	$duration	= convertTime2Seconds(GETPOST('durationhour','int'),GETPOST('durationmin','int'));
-
-    $objectline->datei		= $date_inter;
-    $objectline->desc		= $desc;
-    $objectline->duration	= $duration;
-	$result = $objectline->update($user);
-    if ($result < 0)
-    {
-        dol_print_error($db);
-        exit;
-    }
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-
-	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	exit;
-}
-
-/*
- *  Supprime une ligne d'intervention AVEC confirmation
-*/
-else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-{
-	$objectline = new FichinterLigne($db);
-	if ($objectline->fetch(GETPOST('line_id','int')) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-	$result=$objectline->deleteline($user);
-
-	if ($object->fetch($objectline->fk_fichinter) <= 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-}
-
-/*
- * Ordonnancement des lignes
-*/
-
-else if ($action == 'up' && $user->rights->ficheinter->creer)
-{
-	$object->line_up(GETPOST('line_id','int'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-
-	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int'));
-	exit;
-}
-
-else if ($action == 'down' && $user->rights->ficheinter->creer)
-{
-	$object->line_down(GETPOST('line_id','int'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','alpha')) $newlang=GETPOST('lang_id','alpha');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
-
-	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('line_id','int'));
-	exit;
-}
-
-
-/*
- * Add file in email form
-*/
-if (GETPOST('addfile','alpha'))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	// Set tmp user directory TODO Use a dedicated directory for temp mails files
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';
-
-	dol_add_file_process($upload_dir_tmp,0,0);
-	$action='presend';
-}
-
-/*
- * Remove file in email form
-*/
-if (GETPOST('removedfile','alpha'))
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	// Set tmp user directory
-	$vardir=$conf->user->dir_output."/".$user->id;
-	$upload_dir_tmp = $vardir.'/temp';
-
-	// TODO Delete only files that was uploaded from email form
-	dol_remove_file_process(GETPOST('removedfile','alpha'),0);
-	$action='presend';
-}
-
-/*
- * Send mail
-*/
-if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send))
-{
-	$langs->load('mails');
-
-	if (GETPOST('sendto','alpha'))
-	{
-		// Le destinataire a ete fourni via le champ libre
-		$sendto = GETPOST('sendto','alpha');
-		$sendtoid = 0;
-	}
-	elseif (GETPOST('receiver','alpha') != '-1')
-	{
-		// Recipient was provided from combo list
-		if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
-		{
-			$sendto = $object->client->email;
-			$sendtoid = 0;
-		}
-		else    // Id du contact
-		{
-			$sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
-			$sendtoid = GETPOST('receiver','alpha');
-		}
-	}
-
-	if (dol_strlen($sendto))
-	{
-		$langs->load("commercial");
-
-		$from				= GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
-		$replyto			= GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
-		$message			= GETPOST('message');
-		$sendtocc			= GETPOST('sendtocc','alpha');
-		$deliveryreceipt	= GETPOST('deliveryreceipt','alpha');
-
-		if ($action == 'send')
-		{
-			if (strlen(GETPOST('subject','alphs'))) $subject = GETPOST('subject','alpha');
-			else $subject = $langs->transnoentities('Intervention').' '.$object->ref;
-			$actiontypecode='AC_OTH_AUTO';
-			$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
-			if ($message)
-			{
-				$actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-				$actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-				$actionmsg.=$message;
-			}
-			$actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-		}
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-
-		$attachedfiles=$formmail->get_attached_files();
-		$filepath = $attachedfiles['paths'];
-		$filename = $attachedfiles['names'];
-		$mimetype = $attachedfiles['mimes'];
-
-		// Envoi de la propal
-		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		$mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
-		if ($mailfile->error)
-		{
-			$mesg='<div class="error">'.$mailfile->error.'</div>';
-		}
-		else
-		{
-			$result=$mailfile->sendfile();
-			if ($result)
-			{
-				$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
-				setEventMessage($mesg);
-				$error=0;
-
-				// Initialisation donnees
-				$object->sendtoid		= $sendtoid;
-				$object->actiontypecode	= $actiontypecode;
-				$object->actionmsg 		= $actionmsg;
-				$object->actionmsg2		= $actionmsg2;
-				$object->fk_element		= $object->id;
-				$object->elementtype	= $object->element;
-
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $object->errors=$interface->errors;
-				}
-				// Fin appel triggers
-
-				if ($error)
-				{
-					dol_print_error($db);
-				}
-				else
-				{
-					// Redirect here
-					// This avoid sending mail twice if going out and then back to page
-					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-					exit;
-				}
-			}
-			else
-			{
-				$langs->load("other");
-				$mesg='<div class="error">';
-				if ($mailfile->error)
-				{
-					$mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-					$mesg.='<br>'.$mailfile->error;
-				}
-				else
-				{
-					$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-				}
-				$mesg.='</div>';
-			}
-		}
-	}
-	else
-	{
-		$langs->load("other");
-		$mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
-		dol_syslog('Recipient email is empty');
-	}
-
-    $action='presend';
-}
-
-else if ($action == 'update_extras')
-{
-	// Fill array 'array_options' with data from update form
-	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object,GETPOST('attribute'));
-	if ($ret < 0) $error++;
-
-	if (! $error)
-	{
-		// Actions on extra fields (by external module or standard code)
-		// FIXME le hook fait double emploi avec le trigger !!
-		$hookmanager->initHooks(array('interventiondao'));
-		$parameters=array('id'=>$object->id);
-		$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook))
-		{
-			$result=$object->insertExtraFields();
-			if ($result < 0)
-			{
-				$error++;
-			}
-		}
-		else if ($reshook < 0) $error++;
-	}
-
-	if ($error) $action = 'edit_extras';
-}
-
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
-{
-	if ($action == 'addcontact')
-	{
-		if ($result > 0 && $id > 0)
-		{
-			$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-			$result = $object->add_contact($contactid, GETPOST('type','int'), GETPOST('source','alpha'));
-		}
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
-				$langs->load("errors");
-				$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-			}
-			else
-			{
-				$mesg = '<div class="error">'.$object->error.'</div>';
-			}
-		}
-	}
-
-	// bascule du statut d'un contact
-	else if ($action == 'swapstatut')
-	{
-		$result=$object->swapContactStatus(GETPOST('ligne','int'));
-	}
-
-	// Efface un contact
-	else if ($action == 'deletecontact')
-	{
-		$result = $object->delete_contact(GETPOST('lineid','int'));
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else {
-			dol_print_error($db);
-		}
-	}
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-if ($conf->contrat->enabled)
-	$formcontract = new FormContract($db);
-
-llxHeader('',$langs->trans("Fichinter"));
-
-if ($action == 'create')
-{
-	/*
-	 * Mode creation
-	 * Creation d'une nouvelle fiche d'intervention
-	 */
-
-	$soc=new Societe($db);
-
-	print_fiche_titre($langs->trans("AddIntervention"));
-
-	dol_htmloutput_mesg($mesg);
-
-	if ($socid) $res=$soc->fetch($socid);
-
-	if (GETPOST('origin') && GETPOST('originid'))
-	{
-		// Parse element/subelement (ex: project_task)
-		$element = $subelement = GETPOST('origin');
-		if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs))
-		{
-			$element = $regs[1];
-			$subelement = $regs[2];
-		}
-
-        if ($element == 'project')
-        {
-            $projectid=GETPOST('originid');
-        }
-        else
-		{
-            // For compatibility
-			if ($element == 'order' || $element == 'commande')    {
-				$element = $subelement = 'commande';
-			}
-			if ($element == 'propal')   {
-				$element = 'comm/propal'; $subelement = 'propal';
-			}
-			if ($element == 'contract') {
-				$element = $subelement = 'contrat';
-			}
-
-			dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
-
-			$classname = ucfirst($subelement);
-			$objectsrc = new $classname($db);
-			$objectsrc->fetch(GETPOST('originid'));
-			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))
-			{
-				$objectsrc->fetch_lines();
-				$lines = $objectsrc->lines;
-			}
-			$objectsrc->fetch_thirdparty();
-
-			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
-
-			$soc = $objectsrc->client;
-
-			$note_private		= (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : GETPOST('note_private')));
-			$note_public		= (! empty($objectsrc->note_public) ? $objectsrc->note_public : GETPOST('note_public'));
-
-			// Object source contacts list
-			$srccontactslist = $objectsrc->liste_contact(-1,'external',1);
-		}
-	}
-	else {
-		$projectid = GETPOST('projectid','int');
-	}
-
-	if (! $conf->global->FICHEINTER_ADDON)
-	{
-		dol_print_error($db,$langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined"));
-		exit;
-	}
-
-	$object->date = dol_now();
-
-	$obj = $conf->global->FICHEINTER_ADDON;
-	$obj = "mod_".$obj;
-
-	//$modFicheinter = new $obj;
-	//$numpr = $modFicheinter->getNextValue($soc, $object);
-
-	if ($socid > 0)
-	{
-		$soc->fetch($socid);
-
-		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-		print '<table class="border" width="100%">';
-
-		print '<input type="hidden" name="socid" value='.$soc->id.'>';
-		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
-
-		print '<input type="hidden" name="action" value="add">';
-
-		// Ref
-		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
-
-		// Description (must be a textarea and not html must be allowed (used in list view)
-		print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
-		print '<td>';
-		print '<textarea name="description" cols="80" rows="'.ROWS_3.'">'.GETPOST('description').'</textarea>';
-		print '</td></tr>';
-
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-			$formproject=new FormProjets($db);
-
-			$langs->load("project");
-
-            print '<tr><td valign="top">'.$langs->trans("Project").'</td><td>';
-            /* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
-            if ($societe->fournisseur==1)
-            	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
-            else
-            	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
-            	*/
-            $numprojet=$formproject->select_projects($soc->id,GETPOST('projectid','int'),'projectid');
-            if ($numprojet==0)
-            {
-                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
-            }
-            print '</td></tr>';
-        }
-
-		// Contract
-		if ($conf->contrat->enabled)
-		{
-			$langs->load("contracts");
-			print '<tr><td valign="top">'.$langs->trans("Contract").'</td><td>';
-			$numcontrat=$formcontract->select_contract($soc->id,GETPOST('contratid','int'),'contratid',0,1);
-			if ($numcontrat==0)
-			{
-				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddContract").'</a>';
-			}
-			print '</td></tr>';
-		}
-
-        // Model
-        print '<tr>';
-        print '<td>'.$langs->trans("DefaultModel").'</td>';
-        print '<td colspan="2">';
-        $liste=ModelePDFFicheinter::liste_modeles($db);
-        print $form->selectarray('model',$liste,$conf->global->FICHEINTER_ADDON_PDF);
-        print "</td></tr>";
-
-        // Public note
-        print '<tr>';
-        print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-        print '<td valign="top" colspan="2">';
-        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-        print $doleditor->Create(1);
-        //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-        print '</td></tr>';
-
-        // Private note
-        if (!empty($user->societe_id))
-        {
-        	print '<tr>';
-        	print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-        	print '<td valign="top" colspan="2">';
-        	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-        	print $doleditor->Create(1);
-        	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-        	print '</td></tr>';
-        }
-
-        // Other attributes
-        $parameters=array('colspan' => ' colspan="2"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && ! empty($extrafields->attribute_label))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-        // Show link to origin object
-        if (! empty($origin) && ! empty($originid) && is_object($objectsrc))
-        {
-        	$newclassname=$classname;
-        	if ($newclassname=='Propal') $newclassname='CommercialProposal';
-        	print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
-        }
-
-        print '</table>';
-
-	    if (is_object($objectsrc))
-	    {
-	        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-		}
-
-		print '<center><br>';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-		print '</center>';
-
-		print '</form>';
-	}
-	else
-	{
-		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-		print '<table class="border" width="100%">';
-		print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
-		print $form->select_company('','socid','',1,1);
-		print '</td></tr>';
-		print '</table>';
-
-		print '<br><center>';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-		print '</center>';
-
-		print '</form>';
-	}
-
-}
-else if ($id > 0 || ! empty($ref))
-{
-	/*
-	 * Affichage en mode visu
-	*/
-
-	$object->fetch($id, $ref);
-	$object->fetch_thirdparty();
-
-	$soc=new Societe($db);
-	$soc->fetch($object->socid);
-
-	dol_htmloutput_mesg($mesg);
-
-	$head = fichinter_prepare_head($object);
-
-	dol_fiche_head($head, 'card', $langs->trans("InterventionCard"), 0, 'intervention');
-
-	// Confirmation de la suppression de la fiche d'intervention
-	if ($action == 'delete')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete','',0,1);
-
-	}
-
-	// Confirmation validation
-	if ($action == 'validate')
-	{
-		// on verifie si l'objet est en numerotation provisoire
-		$ref = substr($object->ref, 1, 4);
-		if ($ref == 'PROV')
-		{
-			$numref = $object->getNextNumRef($soc);
-			if (empty($numref))
-			{
-				$error++;
-				dol_htmloutput_errors($object->error);
-			}
-		}
-		else
-		{
-			$numref = $object->ref;
-		}
-		$text=$langs->trans('ConfirmValidateIntervention',$numref);
-
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateIntervention'), $text, 'confirm_validate','',0,1);
-
-	}
-
-	// Confirmation de la validation de la fiche d'intervention
-	if ($action == 'modify')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify','',0,1);
-
-	}
-
-	// Confirmation de la suppression d'une ligne d'intervention
-	if ($action == 'ask_deleteline')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.GETPOST('line_id','int'), $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline','',0,1);
-
-	}
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST" name="formfichinter">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($action == 'edit_extras') print '<input type="hidden" name="action" value="update_extras">';
-	if ($action == 'contrat')     print '<input type="hidden" name="action" value="setcontrat">';
-
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-	print '<table class="border" width="100%">';
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/fichinter/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-	// Ref
-	print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-	print '</td></tr>';
-
-	// Third party
-	print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
-
-	// Duration
-	print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
-	print '<td>'.convertSecondToTime($object->duree, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
-	print '</tr>';
-
-	// Description (must be a textarea and not html must be allowed (used in list view)
-	print '<tr><td valign="top">';
-	print $form->editfieldkey("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea');
-	print '</td><td colspan="3">';
-	print $form->editfieldval("Description",'description',$object->description,$object,$user->rights->ficheinter->creer,'textarea:8:80');
-	print '</td>';
-	print '</tr>';
-
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load('projects');
-		print '<tr>';
-		print '<td>';
-
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Project');
-		print '</td>';
-		if ($action != 'classify')
-		{
-			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
-			print img_edit($langs->trans('SetProject'),1);
-			print '</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'classify')
-		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'projectid');
-		}
-		else
-		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project,'none');
-		}
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Contrat
-	if ($conf->contrat->enabled)
-	{
-		$langs->load('contrat');
-		print '<tr>';
-		print '<td>';
-
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Contract');
-		print '</td>';
-		if ($action != 'contrat')
-		{
-			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=contrat&amp;id='.$object->id.'">';
-			print img_edit($langs->trans('SetContract'),1);
-			print '</a></td>';
-		}
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'contrat')
-		{
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-			print '<tr><td>';
-			$htmlcontract= new Formcontract($db);
-			//print "$socid,$selected,$htmlname";
-			$htmlcontract->select_contract($object->socid,$object->fk_contrat,'contratid');
-
-			print '</td>';
-			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			print '</tr></table>';
-		}
-		else
-		{
-			if ($object->fk_contrat)
-            {
-                $contratstatic = new Contrat($db);
-                $contratstatic->fetch($object->fk_contrat);
-                //print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$selected.'">'.$projet->title.'</a>';
-                print $contratstatic->getNomUrl(0,'',1);
-            }
-            else
-            {
-                print "&nbsp;";
-            }
-		}
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Statut
-	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-
-    // Other attributes (TODO Move this into an include)
-    $parameters=array('colspan' => ' colspan="3"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		foreach($extrafields->attribute_label as $key=>$label)
-		{
-			if ($action == 'edit_extras') {
-				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
-			} else {
-				$value=$object->array_options["options_".$key];
-			}
-			if ($extrafields->attribute_type[$key] == 'separate')
-			{
-				print $extrafields->showSeparator($key);
-			}
-			else
-			{
-				print '<tr><td';
-				if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-				print '>'.$label.'</td><td colspan="3">';
-				// 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 ($action == 'edit_extras' && $user->rights->ficheinter->creer && GETPOST('attribute') == $key)
-				{
-					print '<input type="hidden" name="attribute" value="'.$key.'">';
-
-					print $extrafields->showInputField($key,$value);
-
-					print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-				}
-				else
-				{
-					print $extrafields->showOutputField($key,$value);
-					if ($object->statut == 0 && $user->rights->ficheinter->creer) print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit_extras&attribute='.$key.'">'.img_picto('','edit').' '.$langs->trans('Modify').'</a>';
-				}
-				print '</td></tr>'."\n";
-			}
-		}
-	}
-
-	print "</table><br>";
-	print '</form>';
-
-	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-		$blocname = 'contacts';
-		$title = $langs->trans('ContactsAddresses');
-		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-	}
-
-	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$blocname = 'notes';
-		$title = $langs->trans('Notes');
-		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-	}
-
-
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($action == 'editline')
-	{
-		print '<input type="hidden" name="action" value="updateline">';
-		print '<input type="hidden" name="line_id" value="'.GETPOST('line_id','int').'">';
-	}
-	else
-	{
-		print '<input type="hidden" name="action" value="addline">';
-	}
-
-	// Intervention lines
-	$sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,';
-	$sql.= ' ft.date as date_intervention';
-	$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
-	$sql.= ' WHERE ft.fk_fichinter = '.$object->id;
-	$sql.= ' ORDER BY ft.rang ASC, ft.rowid';
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		if ($num)
-		{
-			print '<table class="noborder" width="100%">';
-
-			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans('Description').'</td>';
-			print '<td align="center">'.$langs->trans('Date').'</td>';
-			print '<td align="right">'.$langs->trans('Duration').'</td>';
-			print '<td width="48" colspan="3">&nbsp;</td>';
-			print "</tr>\n";
-		}
-		$var=true;
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-			$var=!$var;
-
-			// Ligne en mode visu
-			if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid)
-			{
-				print '<tr '.$bc[$var].'>';
-				print '<td>';
-				print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
-				print dol_htmlentitiesbr($objp->description);
-
-				// Date
-				print '<td align="center" width="150">'.dol_print_date($db->jdate($objp->date_intervention),'dayhour').'</td>';
-
-				// Duration
-				print '<td align="right" width="150">'.convertSecondToTime($objp->duree).'</td>';
-
-				print "</td>\n";
-
-
-				// Icone d'edition et suppression
-				if ($object->statut == 0  && $user->rights->ficheinter->creer)
-				{
-					print '<td align="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
-					print img_edit();
-					print '</a>';
-					print '</td>';
-					print '<td align="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=ask_deleteline&amp;line_id='.$objp->rowid.'">';
-					print img_delete();
-					print '</a></td>';
-					if ($num > 1)
-					{
-						print '<td align="center">';
-						if ($i > 0)
-						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
-							print img_up();
-							print '</a>';
-						}
-						if ($i < $num-1)
-						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
-							print img_down();
-							print '</a>';
-						}
-						print '</td>';
-					}
-				}
-				else
-				{
-					print '<td colspan="3">&nbsp;</td>';
-				}
-
-				print '</tr>';
-			}
-
-			// Line in update mode
-			if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id','int') == $objp->rowid)
-			{
-				print '<tr '.$bc[$var].'>';
-				print '<td>';
-				print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
-
-				// Editeur wysiwyg
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
-				$doleditor->Create();
-				print '</td>';
-
-				// Date d'intervention
-				print '<td align="center" class="nowrap">';
-				$form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention");
-				print '</td>';
-
-				// Duration
-				print '<td align="right">';
-				$form->select_duration('duration',$objp->duree);
-				print '</td>';
-
-				print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-				print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
-				print '</tr>' . "\n";
-			}
-
-			$i++;
-		}
-
-		$db->free($resql);
-
-		// Add new line
-		if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline')
-		{
-			if (! $num) print '<br><table class="noborder" width="100%">';
-
-			print '<tr class="liste_titre">';
-			print '<td>';
-			print '<a name="add"></a>'; // ancre
-			print $langs->trans('Description').'</td>';
-			print '<td align="center">'.$langs->trans('Date').'</td>';
-			print '<td align="right">'.$langs->trans('Duration').'</td>';
-
-			print '<td colspan="4">&nbsp;</td>';
-			print "</tr>\n";
-
-			$var=false;
-
-			print '<tr '.$bc[$var].">\n";
-			print '<td>';
-			// editeur wysiwyg
-			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-			$doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70);
-			$doleditor->Create();
-			print '</td>';
-
-			// Date intervention
-			print '<td align="center" class="nowrap">';
-			$now=dol_now();
-			$timearray=dol_getdate($now);
-			if (! GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']);
-			else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int'));
-			$form->select_date($timewithnohour,'di',1,1,0,"addinter");
-			print '</td>';
-
-			// Duration
-			print '<td align="right">';
-			$selectmode='select';
-			if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text';
-			$form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode, 1);
-			print '</td>';
-
-			print '<td align="center" valign="middle" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
-			print '</tr>';
-
-			if (! $num) print '</table>';
-		}
-
-		if ($num) print '</table>';
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	print '</form>'."\n";
-
-	print '</div>';
-	print "\n";
-
-
-	/*
-	 * Actions buttons
-	 */
-	print '<div class="tabsAction">';
-
-	if ($user->societe_id == 0)
-	{
-		if ($action != 'editdescription' && ($action != 'presend'))
-		{
-			// Validate
-			if ($object->statut == 0 && $user->rights->ficheinter->creer && count($object->lines) > 0)
-			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=validate"';
-				print '>'.$langs->trans("Valid").'</a></div>';
-			}
-
-			// Modify
-			if ($object->statut == 1 && $user->rights->ficheinter->creer)
-			{
-				print '<div class="inline-block divButAction"><a class="butAction" href="fiche.php?id='.$object->id.'&action=modify"';
-				print '>'.$langs->trans("Modify").'</a></div>';
-			}
-
-			// Send
-			if ($object->statut > 0)
-			{
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
-				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a></div>';
-				}
-				else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a></div>';
-			}
-
-			// Invoicing
-			if (! empty($conf->facture->enabled) && $object->statut > 0)
-			{
-				$langs->load("bills");
-				if ($object->statut < 2)
-				{
-					if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a></div>';
-					else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-
-				if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED))
-				{
-					if ($object->statut != 2)
-					{
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a></div>';
-					}
-				}
-			}
-
-			// Delete
-			if (($object->statut == 0 && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
-			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
-				print '>'.$langs->trans('Delete').'</a></div>';
-			}
-
-		}
-	}
-
-	print '</div>';
-	print '<br>';
-
-	if ($action != 'presend')
-	{
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		//print '<table width="100%"><tr><td width="50%" valign="top">';
-
-		/*
-		 * Built documents
-		*/
-		$filename=dol_sanitizeFileName($object->ref);
-		$filedir=$conf->ficheinter->dir_output . "/".$object->ref;
-		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed=$user->rights->ficheinter->creer;
-		$delallowed=$user->rights->ficheinter->supprimer;
-		$genallowed=1;
-		$delallowed=1;
-
-		$var=true;
-
-		//print "<br>\n";
-		$somethingshown=$formfile->show_documents('ficheinter',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
-
-		/*
-		 * Linked object block
-		*/
-		$somethingshown=$object->showLinkedObjectBlock();
-
-		//print '</td><td valign="top" width="50%">';
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-		$somethingshown=$formactions->showactions($object,'fichinter',$socid);
-
-		print '</div></div></div>';
-		//print "</td></tr></table>\n";
-	}
-
-
-	/*
-	 * Action presend
-	*/
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
-		$file=$fileparams['fullname'];
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			// Define output language
-			$outputlangs = $langs;
-			$newlang='';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-
-			$result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref,'/'));
-			$file=$fileparams['fullname'];
-		}
-
-		print '<br>';
-		print_titre($langs->trans('SendInterventionByMail'));
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->fromtype = 'user';
-		$formmail->fromid   = $user->id;
-		$formmail->fromname = $user->getFullName($langs);
-		$formmail->frommail = $user->email;
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$langs->trans('SendInterventionRef','__FICHINTERREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-
-		// Tableau des substitutions
-		$formmail->substit['__FICHINTERREF__']=$object->ref;
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_fichinter_external_CUSTOMER')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='fichinter_send';
-		$formmail->param['fichinter_id']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		print '<br>';
-	}
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/fichinter/index.html b/htdocs/fichinter/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/fichinter/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index aa18223c0c5..851077b510f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $langs->load("companies");
+$langs->load("bills");
 $langs->load("interventions");
 
 $socid=GETPOST('socid','int');
@@ -48,30 +49,45 @@ $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="fd.date";
+if (! $sortfield)
+{
+ 	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sortfield="fd.date";
+ 	else $sortfield="f.ref";
+}
 $limit = $conf->liste_limit;
 
-$search_ref=GETPOST('search_ref','alpha');
+$search_ref=GETPOST('search_ref')?GETPOST('search_ref','alpha'):GETPOST('search_inter','alpha');
 $search_company=GETPOST('search_company','alpha');
 $search_desc=GETPOST('search_desc','alpha');
+$search_status=GETPOST('search_status');
+$sall=GETPOST('sall');
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_company="";
+	$search_desc="";
+	$search_status="";
+}
 
 /*
  *	View
  */
 
-llxHeader();
+$form = new Form($db);
+$interventionstatic=new Fichinter($db);
+
+llxHeader('', $langs->trans("Intervention"));
 
 
 $sql = "SELECT";
 $sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description,";
-$sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,";
-$sql.= " s.nom, s.rowid as socid, s.client";
+if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,";
+$sql.= " s.nom as name, s.rowid as socid, s.client";
 $sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
-if (! $user->rights->societe->client->voir && empty($socid))
-	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (! $user->rights->societe->client->voir && empty($socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= ", ".MAIN_DB_PREFIX."fichinter as f)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
+if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
 $sql.= " WHERE f.fk_soc = s.rowid ";
 $sql.= " AND f.entity = ".$conf->entity;
 if ($search_ref) {
@@ -81,36 +97,54 @@ if ($search_company) {
     $sql .= natural_search('s.nom', $search_company);
 }
 if ($search_desc) {
-    $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
+    if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
+    else $sql .= natural_search(array('f.description'), $search_desc);
+}
+if ($search_status != '' && $search_status >= 0) {
+    $sql .= ' AND f.fk_statut = '.$search_status;
 }
 if (! $user->rights->societe->client->voir && empty($socid))
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($socid)
 	$sql.= " AND s.rowid = " . $socid;
-$sql.= " ORDER BY ".$sortfield." ".$sortorder;
+if ($sall) {
+	$arraytosearch=array('f.ref', 'f.description', 's.nom');
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $arraytosearch=array('f.ref', 'f.description', 's.nom', 'fd.description');
+	$sql .= natural_search($arraytosearch, $sall);
+}
+$sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit+1, $offset);
+//print $sql;
 
 $result=$db->query($sql);
 if ($result)
 {
 	$num = $db->num_rows($result);
 
-	$interventionstatic=new Fichinter($db);
+	$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);
 
-	$urlparam="&amp;socid=$socid";
 	print_barre_liste($langs->trans("ListOfInterventions"), $page, $_SERVER['PHP_SELF'], $urlparam, $sortfield, $sortorder, '', $num);
 
-	print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	print '<table class="noborder" width="100%">';
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.ref","",$urlparam,'width="15%"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$urlparam,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$urlparam,'',$sortfield,$sortorder);
-	print_liste_field_titre('',$_SERVER["PHP_SELF"],'');
-	print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$urlparam,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder);
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+	{
+		print_liste_field_titre('',$_SERVER["PHP_SELF"],'');
+		print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$urlparam,'align="center"',$sortfield,$sortorder);
+		print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder);
+	}
 	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('',$_SERVER["PHP_SELF"], '');
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
@@ -121,11 +155,20 @@ if ($result)
 	print '</td><td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_desc" value="'.$search_desc.'" size="12">';
 	print '</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
-	print "</tr>\n";
+    if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+	{
+		// Desc of line
+		print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
+	}
+	print '<td class="liste_titre" align="right">';
+	$liststatus=$interventionstatic->statuts_short;
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
+	print '</td>';
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print "</td></tr>\n";
 
 	$companystatic=new Societe($db);
 
@@ -143,25 +186,33 @@ if ($result)
 		print $interventionstatic->getNomUrl(1);
 		print "</td>\n";
 		print '<td>';
-		$companystatic->nom=$objp->nom;
+		$companystatic->name=$objp->name;
 		$companystatic->id=$objp->socid;
 		$companystatic->client=$objp->client;
 		print $companystatic->getNomUrl(1,'',44);
 		print '</td>';
         print '<td>'.dol_htmlentitiesbr(dol_trunc($objp->description,20)).'</td>';
-		print '<td>'.dol_htmlentitiesbr(dol_trunc($objp->descriptiondetail,20)).'</td>';
-		print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'dayhour')."</td>\n";
-		print '<td align="right">'.convertSecondToTime($objp->duree).'</td>';
+		if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+		{
+			print '<td>'.dol_htmlentitiesbr(dol_trunc($objp->descriptiondetail,20)).'</td>';
+			print '<td align="center">'.dol_print_date($db->jdate($objp->dp),'dayhour')."</td>\n";
+			print '<td align="right">'.convertSecondToTime($objp->duree).'</td>';
+		}
 		print '<td align="right">'.$interventionstatic->LibStatut($objp->fk_statut,5).'</td>';
 
+		print '<td>&nbsp;</td>';
 		print "</tr>\n";
 
 		$total += $objp->duree;
 		$i++;
 	}
-	print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>';
-	print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td>&nbsp;</td>';
-	print '</tr>';
+	$rowspan=3;
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+	{
+		print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>';
+		print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td>&nbsp;</td><td>&nbsp;</td>';
+		print '</tr>';
+	}
 
 	print '</table>';
 	print "</form>\n";
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index d263620ae47..3c5fce7caa2 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -60,8 +60,6 @@ $form = new Form($db);
 
 if ($id > 0 || ! empty($ref))
 {
-	dol_htmloutput_mesg($mesg);
-
 	$societe = new Societe($db);
 	if ($societe->fetch($object->socid))
 	{
diff --git a/htdocs/fichinter/tpl/index.html b/htdocs/fichinter/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index e104bea2a7a..4e0d6b753e7 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -42,7 +42,7 @@ foreach($linkedObjectBlock as $object)
 	$var=!$var;
 ?>
 <tr <?php echo $GLOBALS['bc'][$var]; ?> ><td>
-	<a href="<?php echo DOL_URL_ROOT.'/fichinter/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowIntervention"),"intervention").' '.$object->ref; ?></a></td>
+	<a href="<?php echo DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowIntervention"),"intervention").' '.$object->ref; ?></a></td>
 	<td align="center"><?php echo dol_print_date($object->datev,'day'); ?></td>
 	<td align="right"><?php echo $object->getLibStatut(3); ?></td>
 </tr>
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 5ef76717d72..b04e3abaa88 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.6.3');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.7.0');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants
@@ -92,7 +92,7 @@ if (! empty($dolibarr_main_prod)) ini_set('display_errors','Off');
 
 // Clean parameters
 $dolibarr_main_data_root=trim($dolibarr_main_data_root);
-$dolibarr_main_url_root=trim($dolibarr_main_url_root);
+$dolibarr_main_url_root=trim(preg_replace('/\/+$/','',$dolibarr_main_url_root));
 $dolibarr_main_url_root_alt=(empty($dolibarr_main_url_root_alt)?'':trim($dolibarr_main_url_root_alt));
 $dolibarr_main_document_root=trim($dolibarr_main_document_root);
 $dolibarr_main_document_root_alt=(empty($dolibarr_main_document_root_alt)?'':trim($dolibarr_main_document_root_alt));
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index bbe3aeba4dc..a6695dc694d 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -13,7 +13,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 /**
@@ -49,7 +48,7 @@ if (! empty($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";
+	$sql.= " 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";
@@ -58,7 +57,7 @@ if (! empty($idprod))
 	$sql.= " AND s.fournisseur = 1";
 	$sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
 
-	dol_syslog("Ajax::getSupplierPrices sql=".$sql, LOG_DEBUG);
+	dol_syslog("Ajax::getSupplierPrices", LOG_DEBUG);
 	$result=$db->query($sql);
 
 	if ($result)
@@ -75,7 +74,7 @@ if (! empty($idprod))
 				$price = $objp->fprice * (1 - $objp->remise_percent / 100);
 				$unitprice = $objp->unitprice * (1 - $objp->remise_percent / 100);
 
-				$title = $objp->nom.' - '.$objp->ref_fourn.' - ';
+				$title = $objp->name.' - '.$objp->ref_fourn.' - ';
 
 				if ($objp->quantity == 1)
 				{
diff --git a/htdocs/fourn/ajax/index.html b/htdocs/fourn/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
new file mode 100644
index 00000000000..8511a3e1a48
--- /dev/null
+++ b/htdocs/fourn/card.php
@@ -0,0 +1,530 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014      Jean Heimburger		<jean@tiaris.info>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/fourn/card.php
+ *	\ingroup    fournisseur, facture
+ *	\brief      Page for supplier third party card (view, edit)
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+$langs->load('suppliers');
+$langs->load('products');
+$langs->load('bills');
+$langs->load('orders');
+$langs->load('companies');
+$langs->load('commercial');
+
+$action	= GETPOST('action');
+
+// Security check
+$id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
+if ($user->societe_id) $id=$user->societe_id;
+$result = restrictedArea($user, 'societe&fournisseur', $id, '&societe');
+
+$object = new Fournisseur($db);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('suppliercard','globalcard'));
+
+/*
+ * Action
+ */
+
+$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');
+
+if ($action == 'setsupplieraccountancycode')
+{
+	$cancelbutton = GETPOST('cancel');
+	if (! $cancelbutton) 
+	{
+		$result=$object->fetch($id);
+   		$object->code_compta_fournisseur=$_POST["supplieraccountancycode"];
+	    $result=$object->update($object->id,$user,1,0,1);
+	    if ($result < 0)
+	    {
+	        $mesg=join(',',$object->errors);
+	    }
+	}
+    $action="";
+}
+// conditions de reglement
+if ($action == 'setconditions' && $user->rights->societe->creer)
+{
+	$object->fetch($id);
+	$result=$object->setPaymentTerms(GETPOST('cond_reglement_supplier_id','int'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+// mode de reglement
+if ($action == 'setmode' && $user->rights->societe->creer)
+{
+	$object->fetch($id);
+	$result=$object->setPaymentMethods(GETPOST('mode_reglement_supplier_id','int'));
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+
+/*
+ * View
+ */
+
+$contactstatic = new Contact($db);
+$form = new Form($db);
+
+if ($object->fetch($id))
+{
+	llxHeader('',$langs->trans('SupplierCard'));
+
+	/*
+	 * Affichage onglets
+	 */
+	$head = societe_prepare_head($object);
+
+	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"),0,'company');
+
+
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+
+	print '<table width="100%" class="border">';
+	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
+	$object->next_prev_filter="te.fournisseur = 1";
+	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
+	print '</td></tr>';
+
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+	if ($object->fournisseur)
+	{
+		print '<tr>';
+        print '<td class="nowrap">'.$langs->trans("SupplierCode"). '</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td>';
+        print '</tr>';
+
+		$langs->load('compta');
+        print '<tr>';
+        print '<td>';
+        print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
+        print '</td><td colspan="3">';
+        print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
+        print '</td>';
+        print '</tr>';
+	}
+
+	// Address
+	print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">';
+	dol_print_address($object->address,'gmap','thirdparty',$object->id);
+	print '</td></tr>';
+
+	// Zip / Town
+	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>';
+	print '</tr>';
+
+	// Country
+	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
+	$img=picto_from_langcode($object->country_code);
+	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
+	else print ($img?$img.' ':'').$object->country;
+	print '</td></tr>';
+
+    // EMail
+	print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
+
+	// Web
+	print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($object->url).'</td></tr>';
+
+	// Phone
+	print '<tr><td>'.$langs->trans("Phone").'</td><td style="min-width: 25%;">'.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').'</td>';
+
+	// Fax
+	print '<td>'.$langs->trans("Fax").'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
+
+	// Assujetti a TVA ou pas
+	print '<tr>';
+	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
+	print yn($object->tva_assuj);
+	print '</td>';
+	print '</tr>';
+
+	// Local Taxes
+	if ($mysoc->useLocalTax(1))
+	{
+		print '<tr><td class="nowrap">'.$langs->trans("LocalTax1IsUsed").'</td><td colspan="3">';
+		print yn($object->localtax1_assuj);
+		print '</td></tr>';
+	}
+	if ($mysoc->useLocalTax(2))
+	{
+		print '<tr><td class="nowrap">'.$langs->trans("LocalTax2IsUsed").'</td><td colspan="3">';
+		print yn($object->localtax2_assuj);
+		print '</td></tr>';
+	}
+
+    // TVA Intra
+    print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td colspan="3">';
+    print $object->tva_intra;
+    print '</td></tr>';
+
+	// Conditions de reglement par defaut
+	$langs->load('bills');
+	$form = new Form($db);
+	print '<tr><td>';
+	print '<table width="100%" class="nobordernopadding"><tr><td>';
+	print $langs->trans('PaymentConditions');
+	print '<td>';
+	if (($action != 'editconditions') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editconditions')
+	{
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_supplier_id,'cond_reglement_supplier_id',-1,1);
+	}
+	else
+	{
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_supplier_id,'none');
+	}
+	print "</td>";
+	print '</tr>';
+
+	// Mode de reglement par defaut
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('PaymentMode');
+	print '<td>';
+	if (($action != 'editmode') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editmode')
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_supplier_id,'mode_reglement_supplier_id');
+	}
+	else
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_supplier_id,'none');
+	}
+	print "</td>";
+	print '</tr>';
+
+    // Module Adherent
+    if (! empty($conf->adherent->enabled))
+    {
+        $langs->load("members");
+        $langs->load("users");
+        print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+        print '<td colspan="3">';
+        $adh=new Adherent($db);
+        $result=$adh->fetch('','',$object->id);
+        if ($result > 0)
+        {
+            $adh->ref=$adh->getFullName($langs);
+            print $adh->getNomUrl(1);
+        }
+        else
+        {
+            print $langs->trans("ThirdpartyNotLinkedToMember");
+        }
+        print '</td>';
+        print "</tr>\n";
+    }
+
+	print '</table>';
+
+
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+	$var=true;
+
+	$MAXLIST=5;
+
+	// Lien recap
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
+	print '<td align="right"><a href="'.DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id.'">'.$langs->trans("ShowSupplierPreview").'</a></td></tr></table></td>';
+	print '</tr>';
+	print '</table>';
+
+	/*
+	 * List of products
+	 */
+	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+	{
+		$langs->load("products");
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("ProductsAndServices").'</td><td align="right">';
+		print '<a href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("All").' ('.$object->nbOfProductRefs().')';
+		print '</a></td></tr></table>';
+	}
+
+
+	print '<br>';
+
+	/*
+	 * Last orders
+	 */
+	$orderstatic = new CommandeFournisseur($db);
+
+	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,';
+		$sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
+		$sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$sql2.= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
+		$sql2.= ' WHERE c.fk_soc = s.rowid';
+		$sql2.= ' AND s.rowid = '.$object->id;
+		// Show orders with status validated, shipping started and delivered (well any order we can bill)
+		$sql2.= " AND c.fk_statut IN (5)";
+		// Find order that are not already invoiced
+		$sql2 .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
+		$resql2=$db->query($sql2);
+		if ($resql2) {
+			$orders2invoice = $db->num_rows($resql2);
+			$db->free($resql2);
+		} 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 ";
+		$sql.= " WHERE p.fk_soc =".$object->id;
+		$sql.= " AND p.entity =".$conf->entity;
+		$sql.= " ORDER BY p.date_commande DESC";
+		$sql.= " ".$db->plimit($MAXLIST);
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$i = 0 ;
+			$num = $db->num_rows($resql);
+
+			if ($num > 0)
+			{
+			    print '<table class="noborder" width="100%">';
+
+			    print '<tr class="liste_titre">';
+    			print '<td colspan="3">';
+    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastOrders",($num<$MAXLIST?"":$MAXLIST)).'</td>';
+    			print '<td align="right"><a href="commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").' ('.$num.')</td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
+    			print '</tr></table>';
+    			print '</td></tr>';
+			}
+
+			while ($i < $num && $i <= $MAXLIST)
+			{
+				$obj = $db->fetch_object($resql);
+				$var=!$var;
+
+				print "<tr ".$bc[$var].">";
+				print '<td><a href="commande/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref.'</a></td>';
+				print '<td align="center" width="80">';
+				if ($obj->dc)
+				{
+					print dol_print_date($db->jdate($obj->dc),'day');
+				}
+				else
+				{
+					print "-";
+				}
+				print '</td>';
+				print '<td align="right" class="nowrap">'.$orderstatic->LibStatut($obj->fk_statut,5).'</td>';
+				print '</tr>';
+				$i++;
+			}
+			$db->free($resql);
+
+			if ($num >0) print "</table>";
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	/*
+	 * Last invoices
+	 */
+	$MAXLIST=5;
+
+	$langs->load('bills');
+	$facturestatic = new FactureFournisseur($db);
+
+	if ($user->rights->fournisseur->facture->lire)
+	{
+		// TODO move to DAO class
+		$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,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)
+		{
+			$i = 0 ;
+			$num = $db->num_rows($resql);
+			if ($num > 0)
+			{
+			    print '<table class="noborder" width="100%">';
+
+			    print '<tr class="liste_titre">';
+    			print '<td colspan="4">';
+    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills',($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').' ('.$num.')</td>';
+                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
+    			print '</tr></table>';
+    			print '</td></tr>';
+			}
+			while ($i < min($num,$MAXLIST))
+			{
+				$obj = $db->fetch_object($resql);
+				$var=!$var;
+				print '<tr '.$bc[$var].'>';
+				print '<td>';
+				print '<a href="facture/card.php?facid='.$obj->rowid.'">';
+				$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.'</a>';
+				print ' '.dol_trunc($obj->libelle,14);
+				print '</td>';
+				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->df),'day').'</td>';
+				print '<td align="right" class="nowrap">'.price($obj->amount).'</td>';
+				print '<td align="right" class="nowrap">';
+				print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$obj->am);
+				print '</td>';
+				print '</tr>';
+				$i++;
+			}
+			$db->free($resql);
+			if ($num > 0) print '</table>';
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	print '</div></div></div>';
+	print '<div style="clear:both"></div>';
+
+	dol_fiche_end();
+
+
+	/*
+	 * Barre d'actions
+	 */
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+	// modified by hook
+	if (empty($reshook))
+	{
+
+	print '<div class="tabsAction">';
+
+	if ($user->rights->fournisseur->commande->creer)
+	{
+		$langs->load("orders");
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
+	}
+
+	if ($user->rights->fournisseur->facture->creer)
+	{
+		$langs->load("bills");
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
+	}
+
+	if ($user->rights->fournisseur->facture->creer)
+	{
+		if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+		else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+	}
+
+    // Add action
+    if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+    {
+        if ($user->rights->agenda->myactions->create)
+        {
+            print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
+        }
+        else
+        {
+            print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
+        }
+    }
+
+	print '</div>';
+	print '<br>';
+
+    if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
+    {
+        print '<br>';
+        // List of contacts
+        show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+    }
+
+    // Addresses list
+    if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
+    {
+    	$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+    }
+
+    if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+    {
+        print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
+
+        // List of todo actions
+        show_actions_todo($conf,$langs,$db,$object);
+
+        // List of done actions
+        show_actions_done($conf,$langs,$db,$object);
+    }
+}
+}
+else
+{
+	dol_print_error($db);
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index f557573fdfc..35620bf91fb 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -157,7 +157,7 @@ class Fournisseur extends Societe
 		$sql.= " VALUES ";
 		$sql.= " ('".$this->db->escape($name)."',1,1)";
 
-		dol_syslog("Fournisseur::CreateCategory sql=".$sql);
+		dol_syslog("Fournisseur::CreateCategory", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -184,7 +184,7 @@ class Fournisseur extends Societe
 
 		$arr = array();
 
-		$sql = "SELECT s.rowid, s.nom";
+		$sql = "SELECT s.rowid, s.nom as name";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE s.fournisseur = 1";
@@ -196,16 +196,14 @@ class Fournisseur extends Societe
 		if ($resql)
 		{
 			while ($obj=$this->db->fetch_object($resql))
-	  {
-	  	$arr[$obj->rowid] = stripslashes($obj->nom);
-	  }
-
+			{
+				$arr[$obj->rowid] = $obj->name;
+			}
 		}
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->error();
-
+			$this->error=$this->db->lasterror();
 		}
 		return $arr;
 	}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3aa9d77f5de..4fe4675f5d8 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3,9 +3,9 @@
  * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2007		Franky Van Liedekerke	<franky.van.liedekerke@telenet.be>
- * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2010-2014	Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2012       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2012-2014  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  *
@@ -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
@@ -74,6 +79,7 @@ class CommandeFournisseur extends CommonOrder
     var $fk_project;
     var $cond_reglement_id;
     var $cond_reglement_code;
+    var $fk_account;
     var $mode_reglement_id;
     var $mode_reglement_code;
     var $user_author_id;
@@ -126,6 +132,7 @@ class CommandeFournisseur extends CommonOrder
         $sql.= " c.date_creation, c.date_valid, c.date_approve,";
         $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve,";
         $sql.= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
+        $sql.= " c.fk_account,";
         $sql.= " c.note_private, c.note_public, c.model_pdf, c.extraparams,";
         $sql.= " cm.libelle as methode_commande,";
         $sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
@@ -138,14 +145,14 @@ class CommandeFournisseur extends CommonOrder
         if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'";
         else $sql.= " AND c.rowid=".$id;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
             if (! $obj)
             {
-                $this->error='Bill with id '.$id.' not found sql='.$sql;
+                $this->error='Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
             }
@@ -180,6 +187,7 @@ class CommandeFournisseur extends CommonOrder
             $this->cond_reglement_code	= $obj->cond_reglement_code;
             $this->cond_reglement		= $obj->cond_reglement_libelle;
             $this->cond_reglement_doc	= $obj->cond_reglement_libelle;
+            $this->fk_account           = $obj->fk_account;
             $this->mode_reglement_id	= $obj->fk_mode_reglement;
             $this->mode_reglement_code	= $obj->mode_reglement_code;
             $this->mode_reglement		= $obj->mode_reglement_libelle;
@@ -191,7 +199,7 @@ class CommandeFournisseur extends CommonOrder
             $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
             $this->db->free($resql);
-            
+
             // Retreive all extrafield
             // fetch optionals attributes and labels
             require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
@@ -207,14 +215,15 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " l.tva_tx, l.remise_percent, l.subprice,";
             $sql.= " l.localtax1_tx, l. localtax2_tx, l.total_localtax1, l.total_localtax2,";
             $sql.= " l.total_ht, l.total_tva, l.total_ttc,";
-            $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc";
+            $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
+            $sql.= " l.date_start, l.date_end";
             $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
             $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
             $sql.= " WHERE l.fk_commande = ".$this->id;
             $sql.= " ORDER BY l.rowid";
             //print $sql;
 
-            dol_syslog(get_class($this)."::fetch get lines sql=".$sql,LOG_DEBUG);
+            dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
             $result = $this->db->query($sql);
             if ($result)
             {
@@ -255,6 +264,9 @@ class CommandeFournisseur extends CommonOrder
                     $line->ref_fourn           = $objp->ref_supplier;    // TODO deprecated
                     $line->ref_supplier        = $objp->ref_supplier;    // Reference supplier
 
+                    $line->date_start          = $this->db->jdate($objp->date_start);
+                    $line->date_end            = $this->db->jdate($objp->date_end);
+
                     $this->lines[$i]      = $line;
 
                     $i++;
@@ -266,14 +278,12 @@ class CommandeFournisseur extends CommonOrder
             else
             {
                 $this->error=$this->db->error()." sql=".$sql;
-                dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
                 return -1;
             }
         }
         else
         {
             $this->error=$this->db->error()." sql=".$sql;
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -295,7 +305,7 @@ class CommandeFournisseur extends CommonOrder
         $sql.= ($comment?"'".$this->db->escape($comment)."'":'null');
         $sql.= ")";
 
-        dol_syslog("FournisseurCommande::log sql=".$sql, LOG_DEBUG);
+        dol_syslog("FournisseurCommande::log", LOG_DEBUG);
         if ( $this->db->query($sql) )
         {
             return 1;
@@ -303,7 +313,6 @@ class CommandeFournisseur extends CommonOrder
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::log ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -313,9 +322,10 @@ class CommandeFournisseur extends CommonOrder
      *
      *	@param	User	$user			Validator User
      *	@param	int		$idwarehouse	Id of warehouse to use for stock decrease
+     *  @param	int		$notrigger		1=Does not execute triggers, 0= execuete triggers
      *	@return	int						<0 if KO, >0 if OK
      */
-    function valid($user,$idwarehouse=0)
+    function valid($user,$idwarehouse=0,$notrigger=0)
     {
         global $langs,$conf;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -338,12 +348,13 @@ class CommandeFournisseur extends CommonOrder
                 $num = $this->getNextNumRef($soc);
             }
             else
-            {
+			{
                 $num = $this->ref;
             }
+            $this->newref = $num;
 
             $sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET ref='".$num."',";
+            $sql.= " SET ref='".$this->db->escape($num)."',";
             $sql.= " fk_statut = 1,";
             $sql.= " date_valid='".$this->db->idate(dol_now())."',";
             $sql.= " fk_user_valid = ".$user->id;
@@ -353,14 +364,21 @@ class CommandeFournisseur extends CommonOrder
             $resql=$this->db->query($sql);
             if (! $resql)
             {
-                dol_syslog(get_class($this)."::valid Echec update - 10 - sql=".$sql, LOG_ERR);
                 dol_print_error($this->db);
                 $error++;
             }
 
+            if (! $error && ! $notrigger)
+            {
+				// Call trigger
+				$result=$this->call_trigger('ORDER_SUPPLIER_VALIDATE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
+            }
+
             if (! $error)
             {
-            	$this->oldref='';
+	            $this->oldref = $this->ref;
 
                 // Rename directory if dir was a temporary ref
                 if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -377,11 +395,17 @@ class CommandeFournisseur extends CommonOrder
 
                         if (@rename($dirsource, $dirdest))
                         {
-                        	$this->oldref = $oldref;
-
                             dol_syslog("Rename ok");
-                            // Suppression ancien fichier PDF dans nouveau rep
-                            dol_delete_file($dirdest.'/'.$oldref.'*.*');
+                            // Rename docs starting with $oldref with $newref
+	                        $listoffiles=dol_dir_list($conf->fournisseur->dir_output.'/commande/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+	                        foreach($listoffiles as $fileentry)
+	                        {
+	                        	$dirsource=$fileentry['name'];
+	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
+	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+	                        	@rename($dirsource, $dirdest);
+	                        }
                         }
                     }
                 }
@@ -394,22 +418,6 @@ class CommandeFournisseur extends CommonOrder
                 $this->ref = $num;
             }
 
-            if (! $error)
-            {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('ORDER_SUPPLIER_VALIDATE',$this,$user,$langs,$conf);
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->errors=$interface->errors;
-                    $this->db->rollback();
-                    return -1;
-                }
-                // Fin appel triggers
-            }
-
             if (! $error)
             {
                 $this->db->commit();
@@ -417,8 +425,6 @@ class CommandeFournisseur extends CommonOrder
             }
             else
             {
-                $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -1;
             }
@@ -434,8 +440,8 @@ class CommandeFournisseur extends CommonOrder
     /**
      *  Return label of the status of object
      *
-     *  @param	int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label
-     *  @return string        		Label
+	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
+     *  @return 	string        			Label
      */
     function getLibStatut($mode=0)
     {
@@ -526,7 +532,7 @@ class CommandeFournisseur extends CommonOrder
 
         $result='';
 
-        $lien = '<a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$this->id.'">';
+        $lien = '<a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id.'">';
         $lienfin='</a>';
 
         $picto='order';
@@ -622,9 +628,10 @@ class CommandeFournisseur extends CommonOrder
                 $num = $this->getNextNumRef($soc);
             }
             else
-            {
+			{
                 $num = $this->ref;
             }
+            $this->newref = $num;
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 			$sql.= " SET ref='".$this->db->escape($num)."',";
@@ -663,12 +670,10 @@ class CommandeFournisseur extends CommonOrder
 
                 if (! $error)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('ORDER_SUPPLIER_APPROVE',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+					// Call trigger
+					$result=$this->call_trigger('ORDER_SUPPLIER_APPROVE',$user);
+					if ($result < 0) $error++;
+					// End call triggers
                 }
 
                 if (! $error)
@@ -686,7 +691,6 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->db->rollback();
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::approve Error ",$this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -709,43 +713,32 @@ class CommandeFournisseur extends CommonOrder
 
 		$error=0;
 
+        dol_syslog(get_class($this)."::refuse");
         $result = 0;
         if ($user->rights->fournisseur->commande->approuver)
         {
             $this->db->begin();
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 9";
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::refuse sql=".$sql);
-            $resql=$this->db->query($sql);
-
-            if ($resql)
+            if ($this->db->query($sql))
             {
                 $result = 0;
                 $this->log($user, 9, time());
 
-                if (! $error)
+                if ($error == 0)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('ORDER_SUPPLIER_REFUSE',$this,$user,$langs,$conf);
-                    if ($result < 0)
+					// Call trigger
+					$result=$this->call_trigger('ORDER_SUPPLIER_REFUSE',$user);
+					if ($result < 0)
                     {
                         $error++;
-                        $this->errors=$interface->errors;
+                        $this->db->rollback();
                     }
-                    // Fin appel triggers
-                }
-
-                if (! $error)
-                {
-                	$this->db->commit();
-                }
-                else
-              {
-	                $this->db->rollback();
+                    else
+                    	$this->db->commit();
+					// End call triggers
                 }
             }
             else
@@ -760,7 +753,7 @@ class CommandeFournisseur extends CommonOrder
         {
             dol_syslog(get_class($this)."::refuse Not Authorized");
         }
-        return $result;
+        return $result ;
     }
 
     /**
@@ -787,18 +780,16 @@ class CommandeFournisseur extends CommonOrder
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
             $sql .= " WHERE rowid = ".$this->id;
-            dol_syslog(get_class($this)."::cancel sql=".$sql);
+            dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
             if ($this->db->query($sql))
             {
                 $result = 0;
                 $this->log($user, $statut, time());
 
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('ORDER_SUPPLIER_CANCEL',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
+				// Call trigger
+				$result=$this->call_trigger('ORDER_SUPPLIER_CANCEL',$user);
+				if ($result < 0) $error++;
+				// End call triggers
 
                 if ($error == 0)
                 {
@@ -842,10 +833,10 @@ 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 sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::commande", LOG_DEBUG);
             if ($this->db->query($sql))
             {
                 $result = 1;
@@ -853,7 +844,6 @@ class CommandeFournisseur extends CommonOrder
             }
             else
             {
-                dol_syslog(get_class($this)."::cCommande Error -1", LOG_ERR);
                 $result = -1;
             }
         }
@@ -901,6 +891,7 @@ class CommandeFournisseur extends CommonOrder
         $sql.= ", model_pdf";
         $sql.= ", fk_mode_reglement";
 		$sql.= ", fk_cond_reglement";
+        $sql.= ", fk_account";
         $sql.= ") ";
         $sql.= " VALUES (";
         $sql.= "''";
@@ -917,9 +908,10 @@ class CommandeFournisseur extends CommonOrder
         $sql.= ", '".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."'";
         $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
         $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
+        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
@@ -958,7 +950,7 @@ class CommandeFournisseur extends CommonOrder
 	            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 	            $sql.= " SET ref='(PROV".$this->id.")'";
 	            $sql.= " WHERE rowid=".$this->id;
-	            dol_syslog(get_class($this)."::create sql=".$sql);
+	            dol_syslog(get_class($this)."::create", LOG_DEBUG);
 	            if ($this->db->query($sql))
 	            {
 	                // On logue creation pour historique
@@ -966,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'));
@@ -987,18 +981,14 @@ class CommandeFournisseur extends CommonOrder
 
 					if (! $notrigger)
 	                {
-	                    // Appel des triggers
-	                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	                    $interface=new Interfaces($this->db);
-	                    $result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
-	                    if ($result < 0)
+						// Call trigger
+						$result=$this->call_trigger('ORDER_SUPPLIER_CREATE',$user);
+						if ($result < 0)
 	                    {
-	                        $error++;
-	                        $this->errors=$interface->errors;
 	                        $this->db->rollback();
 	                        return -1;
 	                    }
-	                    // Fin appel triggers
+						// End call triggers
 	                }
 
 	                $this->db->commit();
@@ -1007,7 +997,6 @@ class CommandeFournisseur extends CommonOrder
 	            else
 	            {
 	                $this->error=$this->db->error();
-	                dol_syslog(get_class($this)."::create: Failed -2 - ".$this->error, LOG_ERR);
 	                $this->db->rollback();
 	                return -2;
 	            }
@@ -1016,7 +1005,6 @@ class CommandeFournisseur extends CommonOrder
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::create: Failed -1 - ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -1063,12 +1051,10 @@ class CommandeFournisseur extends CommonOrder
                 if ($reshook < 0) $error++;
             }
 
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('ORDER_SUPPLIER_CLONE',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+			// Call trigger
+			$result=$this->call_trigger('ORDER_SUPPLIER_CLONE',$user);
+			if ($result < 0) $error++;
+			// End call triggers
         }
 
         // End
@@ -1195,7 +1181,7 @@ class CommandeFournisseur extends CommonOrder
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty);
+            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
 
             $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type);
             $total_ht  = $tabprice[0];
@@ -1234,7 +1220,7 @@ class CommandeFournisseur extends CommonOrder
             $sql.= "'".price2num($total_ttc)."'";
             $sql.= ")";
 
-            dol_syslog(get_class($this)."::addline sql=".$sql);
+            dol_syslog(get_class($this)."::addline", LOG_DEBUG);
             $resql=$this->db->query($sql);
             //print $sql;
             if ($resql)
@@ -1244,18 +1230,14 @@ class CommandeFournisseur extends CommonOrder
                 if (! $notrigger)
                 {
                     global $conf, $langs, $user;
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('LINEORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
-                    if ($result < 0)
+					// Call trigger
+					$result=$this->call_trigger('LINEORDER_SUPPLIER_CREATE',$user);
+					if ($result < 0)
                     {
-                        $error++;
-                        $this->errors=$interface->errors;
                         $this->db->rollback();
                         return -1;
                     }
-                    // Fin appel triggers
+					// End call triggers
                 }
 
                 $this->update_price('','auto');
@@ -1267,7 +1249,6 @@ class CommandeFournisseur extends CommonOrder
             {
                 $this->error=$this->db->error();
                 $this->db->rollback();
-                dol_syslog(get_class($this)."::addline ".$this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -1311,25 +1292,21 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " (fk_commande,fk_product, qty, fk_entrepot, fk_user, datec) VALUES ";
             $sql.= " ('".$this->id."','".$product."','".$qty."',".($entrepot>0?"'".$entrepot."'":"null").",'".$user->id."','".$this->db->idate($now)."')";
 
-            dol_syslog(get_class($this)."::DispatchProduct sql=".$sql);
+            dol_syslog(get_class($this)."::DispatchProduct", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
             {
                 if (! $notrigger)
                 {
                     global $conf, $langs, $user;
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('LINEORDER_SUPPLIER_DISPATCH',$this,$user,$langs,$conf);
-                    if ($result < 0)
+					// Call trigger
+					$result=$this->call_trigger('LINEORDER_SUPPLIER_DISPATCH',$user);
+					if ($result < 0)
                     {
-                        $error++;
-                        $this->errors=$interface->errors;
                         $this->db->rollback();
                         return -1;
                     }
-                    // Fin appel triggers
+					// End call triggers
                 }
 
                 $this->db->commit();
@@ -1393,15 +1370,10 @@ class CommandeFournisseur extends CommonOrder
 
 			if (! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$result = 0;
-				$interface=new Interfaces($this->db);
-				$result = $interface->run_triggers('LINEORDER_SUPPLIER_DELETE',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
+				// Call trigger
+				$result=$this->call_trigger('LINEORDER_SUPPLIER_DELETE',$user);
+				if ($result < 0) $error++;
+				// End call triggers
 			}
 
 			if (! $error)
@@ -1449,17 +1421,27 @@ class CommandeFournisseur extends CommonOrder
 
         $error = 0;
 
+        // Call trigger
+        $result=$this->call_trigger('ORDER_SUPPLIER_DELETE',$user);
+        if ($result < 0)
+        {
+        	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+        	return -1;
+        }
+        // End call triggers
+
+
         $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ;
-        dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         if (! $this->db->query($sql) )
         {
             $error++;
         }
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
-        dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         if ($resql = $this->db->query($sql) )
         {
             if ($this->db->affected_rows($resql) < 1)
@@ -1485,18 +1467,6 @@ class CommandeFournisseur extends CommonOrder
         	}
         }
 
-        if (! $error)
-        {
-        	// Appel des triggers
-        	include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        	$interface=new Interfaces($this->db);
-        	$result=$interface->run_triggers('ORDER_SUPPLIER_DELETE',$this,$user,$langs,$conf);
-        	if ($result < 0) {
-        		$error++; $this->errors=$interface->errors;
-        	}
-        	// Fin appel triggers
-        }
-
         if (! $error)
         {
         	// We remove directory
@@ -1603,7 +1573,7 @@ class CommandeFournisseur extends CommonOrder
                 $sql.= " WHERE rowid = ".$this->id;
                 $sql.= " AND fk_statut IN (3,4)";	// Process running or Partially received
 
-                dol_syslog(get_class($this)."::Livraison sql=".$sql);
+                dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
                 $resql=$this->db->query($sql);
                 if ($resql)
                 {
@@ -1616,7 +1586,6 @@ class CommandeFournisseur extends CommonOrder
                 {
                     $this->db->rollback();
                     $this->error=$this->db->lasterror();
-                    dol_syslog(get_class($this)."::Livraison Error ".$this->error, LOG_ERR);
                     $result = -1;
                 }
             }
@@ -1649,7 +1618,7 @@ class CommandeFournisseur extends CommonOrder
             $sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::set_date_livraison sql=".$sql,LOG_DEBUG);
+            dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -1659,7 +1628,6 @@ class CommandeFournisseur extends CommonOrder
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::set_date_livraison ".$this->error,LOG_ERR);
                 return -1;
             }
         }
@@ -1729,7 +1697,7 @@ class CommandeFournisseur extends CommonOrder
         $sql.= ' SET fk_statut='.$status;
         $sql.= ' WHERE rowid = '.$this->id;
 
-        dol_syslog(get_class($this)."::setStatus sql=".$sql);
+        dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -1769,10 +1737,13 @@ class CommandeFournisseur extends CommonOrder
      *	@param		int		$info_bits			Miscellaneous informations
      *	@param		int		$type				Type of line (0=product, 1=service)
      *  @param		int		$notrigger			Disable triggers
+     *  @param      timestamp   $date_start     Date start of service
+     *  @param      timestamp   $date_end       Date end of service
      *	@return    	int             			< 0 if error, > 0 if ok
      */
-    function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false)
+    function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='')
     {
+    	global $mysoc;
         dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -1805,7 +1776,7 @@ class CommandeFournisseur extends CommonOrder
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty);
+            $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc, $this->thirdparty);
 
             $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
             $total_ht  = $tabprice[0];
@@ -1831,10 +1802,8 @@ class CommandeFournisseur extends CommonOrder
 			$sql.= ",localtax1_type='".$localtax1_type."'";
 			$sql.= ",localtax2_type='".$localtax2_type."'";
             $sql.= ",qty='".price2num($qty)."'";
-            /*if ($date_end) { $sql.= ",date_start='$date_end'"; }
-            else { $sql.=',date_start=null'; }
-            if ($date_end) { $sql.= ",date_end='$date_end'"; }
-            else { $sql.=',date_end=null'; }*/
+            $sql.= ",date_start=".(! empty($date_start)?"'".$this->db->idate($date_start)."'":"null");
+            $sql.= ",date_end=".(! empty($date_end)?"'".$this->db->idate($date_end)."'":"null");
             $sql.= ",info_bits='".$info_bits."'";
             $sql.= ",total_ht='".price2num($total_ht)."'";
             $sql.= ",total_tva='".price2num($total_tva)."'";
@@ -1844,7 +1813,7 @@ class CommandeFournisseur extends CommonOrder
             $sql.= ",product_type=".$type;
             $sql.= " WHERE rowid = ".$rowid;
 
-            dol_syslog(get_class($this)."::updateline sql=".$sql);
+            dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
             $result = $this->db->query($sql);
             if ($result > 0)
             {
@@ -1853,18 +1822,14 @@ class CommandeFournisseur extends CommonOrder
                 if (! $notrigger)
                 {
                     global $conf, $langs, $user;
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('LINEORDER_SUPPLIER_UPDATE',$this,$user,$langs,$conf);
-                    if ($result < 0)
+					// Call trigger
+					$result=$this->call_trigger('LINEORDER_SUPPLIER_UPDATE',$user);
+					if ($result < 0)
                     {
-                        $error++;
-                        $this->errors=$interface->errors;
                         $this->db->rollback();
                         return -1;
                     }
-                    // Fin appel triggers
+					// End call triggers
                 }
 
                 // Mise a jour info denormalisees au niveau facture
@@ -1876,7 +1841,6 @@ class CommandeFournisseur extends CommonOrder
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -1;
             }
@@ -1971,6 +1935,47 @@ class CommandeFournisseur extends CommonOrder
         }
     }
 
+    /**
+     *	Charge indicateurs this->nb de tableau de bord
+     *
+     *	@return     int         <0 si ko, >0 si ok
+     */
+    function load_state_board()
+    {
+        global $conf, $user;
+
+        $this->nb=array();
+        $clause = "WHERE";
+
+        $sql = "SELECT count(co.rowid) as nb";
+        $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
+        if (!$user->rights->societe->client->voir && !$user->societe_id)
+        {
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $clause = "AND";
+        }
+        $sql.= " ".$clause." co.entity = ".$conf->entity;
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            while ($obj=$this->db->fetch_object($resql))
+            {
+                $this->nb["supplier_orders"]=$obj->nb;
+            }
+            $this->db->free($resql);
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            $this->error=$this->db->error();
+            return -1;
+        }
+    }
+
     /**
      *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -1986,7 +1991,7 @@ class CommandeFournisseur extends CommonOrder
         $this->nbtodo=$this->nbtodolate=0;
         $clause = " WHERE";
 
-        $sql = "SELECT c.rowid, c.date_creation as datec, c.fk_statut";
+        $sql = "SELECT c.rowid, c.date_creation as datec, c.fk_statut,c.date_livraison as delivery_date";
         $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
@@ -2004,7 +2009,9 @@ class CommandeFournisseur extends CommonOrder
             while ($obj=$this->db->fetch_object($resql))
             {
                 $this->nbtodo++;
-                if ($obj->fk_statut != 3 && $this->db->jdate($obj->datec) < ($now - $conf->commande->fournisseur->warning_delay)) $this->nbtodolate++;
+
+				$date_to_test = empty($obj->delivery_date) ? $obj->datec : $obj->delivery_date;
+                if ($obj->fk_statut != 3 && $this->db->jdate($date_to_test) < ($now - $conf->commande->fournisseur->warning_delay)) $this->nbtodolate++;
             }
             return 1;
         }
@@ -2050,6 +2057,42 @@ class CommandeFournisseur extends CommonOrder
 
         return '';
     }
+
+	/**
+	 *  Create a document onto disk according to template model.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	Object lang to use for 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, $user, $langs;
+
+		$langs->load("suppliers");
+
+		// Sets the model on the model name to use
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF))
+			{
+				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'muscadet';
+			}
+		}
+
+		$modelpath = "core/modules/supplier_order/pdf/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
+
 }
 
 
@@ -2057,7 +2100,7 @@ class CommandeFournisseur extends CommonOrder
 /**
  *  Classe de gestion des lignes de commande
  */
-class CommandeFournisseurLigne
+class CommandeFournisseurLigne extends CommonOrderLine
 {
     // From llx_commandedet
     var $qty;
@@ -2078,6 +2121,8 @@ class CommandeFournisseurLigne
     var $total_ttc;
     var $info_bits;
     var $special_code;
+    var $date_start;
+    var $date_end;
 
     // From llx_product
     var $libelle;       // Label produit
@@ -2110,7 +2155,8 @@ class CommandeFournisseurLigne
         $sql.= ' cd.remise, cd.remise_percent, cd.subprice,';
         $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
         $sql.= ' cd.total_localtax1, cd.total_localtax2,';
-        $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
+        $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
+        $sql.= ' cd.date_start, cd.date_end';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
         $sql.= ' WHERE cd.rowid = '.$rowid;
@@ -2141,6 +2187,9 @@ class CommandeFournisseurLigne
             $this->product_libelle  = $objp->product_libelle;
             $this->product_desc     = $objp->product_desc;
 
+            $this->date_start       = $this->db->jdate($objp->date_start);
+            $this->date_end         = $this->db->jdate($objp->date_end);
+
             $this->db->free($result);
             return 1;
         }
@@ -2169,7 +2218,7 @@ class CommandeFournisseurLigne
         $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
         $sql.= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog("CommandeFournisseurLigne.class.php::update_total sql=$sql");
+        dol_syslog("CommandeFournisseurLigne.class.php::update_total", LOG_DEBUG);
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -2180,7 +2229,6 @@ class CommandeFournisseurLigne
         else
         {
             $this->error=$this->db->error();
-            dol_syslog("CommandeFournisseurLigne.class.php::update_total Error ".$this->error, LOG_ERR);
             $this->db->rollback();
             return -2;
         }
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 786d619665e..d9a4469481f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -4,9 +4,10 @@
  * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
  * Copyright (C) 2005		Marc Barilley			<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  *
  * 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
@@ -42,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;
@@ -79,6 +85,7 @@ class FactureFournisseur extends CommonInvoice
     var $propalid;
     var $cond_reglement_id;
     var $cond_reglement_code;
+    var $fk_account;
     var $mode_reglement_id;
     var $mode_reglement_code;
 
@@ -144,7 +151,7 @@ class FactureFournisseur extends CommonInvoice
      */
     function create($user)
     {
-        global $langs,$conf;
+        global $langs,$conf,$hookmanager;
 
 		$error=0;
         $now=dol_now();
@@ -174,6 +181,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql.= ", fk_projet";
 		$sql.= ", fk_cond_reglement";
 		$sql.= ", fk_mode_reglement";
+        $sql.= ", fk_account";
         $sql.= ", note_private";
         $sql.= ", note_public";
         $sql.= ", fk_user_author";
@@ -190,13 +198,14 @@ class FactureFournisseur extends CommonInvoice
 		$sql.= ", ".(isset($this->fk_project)?$this->fk_project:"null");
 		$sql.= ", ".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null");
 		$sql.= ", ".(isset($this->mode_reglement_id)?$this->mode_reglement_id:"null");
+        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
         $sql.= ", '".$this->db->escape($this->note_private)."'";
         $sql.= ", '".$this->db->escape($this->note_public)."'";
         $sql.= ", ".$user->id.",";
         $sql.= $this->date_echeance!=''?"'".$this->db->idate($this->date_echeance)."'":"null";
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -206,7 +215,7 @@ class FactureFournisseur extends CommonInvoice
             $this->ref='(PROV'.$this->id.')';
             $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->ref."' WHERE rowid=".$this->id;
 
-            dol_syslog(get_class($this)."::create sql=".$sql);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if (! $resql) $error++;
 
@@ -226,7 +235,7 @@ class FactureFournisseur extends CommonInvoice
                 $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
                 $sql .= ' VALUES ('.$this->id.');';
 
-                dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::create", LOG_DEBUG);
                 $resql_insert=$this->db->query($sql);
                 if ($resql_insert)
                 {
@@ -251,12 +260,29 @@ class FactureFournisseur extends CommonInvoice
             $result=$this->update_price();
             if ($result > 0)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('BILL_SUPPLIER_CREATE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel 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('supplierinvoicedao'));
+				$parameters=array('socid'=>$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++;
+                // Call trigger
+                $result=$this->call_trigger('BILL_SUPPLIER_CREATE',$user);
+                if ($result < 0) $error++;
+                // End call triggers
 
                 if (! $error)
                 {
@@ -333,7 +359,8 @@ class FactureFournisseur extends CommonInvoice
         $sql.= " t.fk_facture_source,";
         $sql.= " t.fk_projet,";
         $sql.= " t.fk_cond_reglement,";
-		$sql.= " t.fk_mode_reglement,";
+        $sql.= " t.fk_account,";
+        $sql.= " t.fk_mode_reglement,";
         $sql.= " t.date_lim_reglement,";
         $sql.= " t.note_private,";
         $sql.= " t.note_public,";
@@ -350,7 +377,7 @@ class FactureFournisseur extends CommonInvoice
         if ($id)  $sql.= " WHERE t.rowid=".$id;
         if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -394,6 +421,7 @@ class FactureFournisseur extends CommonInvoice
 	            $this->cond_reglement_code	= $obj->cond_reglement_code;
 	            $this->cond_reglement		= $obj->cond_reglement_libelle;
 	            $this->cond_reglement_doc	= $obj->cond_reglement_libelle;
+                $this->fk_account           = $obj->fk_account;
 	            $this->mode_reglement_id	= $obj->fk_mode_reglement;
 	            $this->mode_reglement_code	= $obj->mode_reglement_code;
 	            $this->mode_reglement		= $obj->mode_reglement_libelle;
@@ -410,18 +438,26 @@ class FactureFournisseur extends CommonInvoice
                 $this->socid  = $obj->socid;
                 $this->socnom = $obj->socnom;
 
+                // Retreive all extrafield
+                // fetch optionals attributes and labels
+                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+                $extrafields=new ExtraFields($this->db);
+                $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+                $this->fetch_optionals($this->id,$extralabels);
+
+                if ($this->statut == 0) $this->brouillon = 1;
+
                 $result=$this->fetch_lines();
                 if ($result < 0)
                 {
                     $this->error=$this->db->error();
-                    dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
                     return -3;
                 }
 
             }
             else
             {
-                $this->error='Bill with id '.$id.' not found sql='.$sql;
+                $this->error='Bill with id '.$id.' not found';
                 dol_syslog(get_class($this).'::fetch '.$this->error);
                 return 0;
             }
@@ -432,7 +468,6 @@ class FactureFournisseur extends CommonInvoice
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -453,7 +488,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
         $sql.= ' WHERE fk_facture_fourn='.$this->id;
 
-        dol_syslog(get_class($this)."::fetch_lines sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
         $resql_rows = $this->db->query($sql);
         if ($resql_rows)
         {
@@ -499,7 +534,6 @@ class FactureFournisseur extends CommonInvoice
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this).'::fetch_lines: Error '.$this->error,LOG_ERR);
             return -3;
         }
     }
@@ -512,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;
@@ -591,7 +625,7 @@ class FactureFournisseur extends CommonInvoice
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -599,11 +633,9 @@ class FactureFournisseur extends CommonInvoice
         {
             if (! $notrigger)
             {
-                // Call triggers
-                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                //$interface=new Interfaces($this->db);
-                //$result=$interface->run_triggers('BILL_SUPPLIER_MODIFY',$this,$user,$langs,$conf);
-                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                // Call trigger
+                $result=$this->call_trigger('BILL_SUPPLIER_UPDATE',$user);
+                if ($result < 0) $error++;
                 // End call triggers
             }
         }
@@ -647,12 +679,12 @@ class FactureFournisseur extends CommonInvoice
         $this->db->begin();
 
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
-        dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
             $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
-            dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             $resql2 = $this->db->query($sql);
             if (! $resql2) {
             	$error++;
@@ -671,15 +703,12 @@ class FactureFournisseur extends CommonInvoice
 
         if (! $error)
         {
-        	// Appel des triggers
-        	include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-        	$interface=new Interfaces($this->db);
-        	$result=$interface->run_triggers('BILL_SUPPLIER_DELETE',$this,$user,$langs,$conf);
-        	if ($result < 0) {
-        		$error++;
-        		$this->errors=$interface->errors;
+            // Call trigger
+            $result=$this->call_trigger('BILL_SUPPLIER_DELETE',$user);
+            if ($result < 0)
+            {
         		$this->db->rollback();
-        	    return -1;      		
+        	    return -1;
         	}
         	// Fin appel triggers
         }
@@ -742,7 +771,6 @@ class FactureFournisseur extends CommonInvoice
         else
         {
         	$this->error=$this->db->lasterror();
-        	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
         	$this->db->rollback();
         	return -$error;
         }
@@ -766,16 +794,14 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ' SET paye = 1, fk_statut=2';
         $sql.= ' WHERE rowid = '.$this->id;
 
-        dol_syslog("FactureFournisseur::set_paid sql=".$sql);
+        dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('BILL_SUPPLIER_PAYED',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('BILL_SUPPLIER_PAYED',$user);
+            if ($result < 0) $error++;
+            // End call triggers
         }
         else
         {
@@ -816,16 +842,14 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
         $sql.= ' WHERE rowid = '.$this->id;
 
-        dol_syslog("FactureFournisseur::set_unpaid sql=".$sql);
+        dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            // Appel des triggers
-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-            $interface=new Interfaces($this->db);
-            $result=$interface->run_triggers('BILL_SUPPLIER_UNPAYED',$this,$user,$langs,$conf);
-            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-            // Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('BILL_SUPPLIER_UNPAYED',$user);
+            if ($result < 0) $error++;
+            // End call triggers
         }
         else
         {
@@ -852,9 +876,10 @@ class FactureFournisseur extends CommonInvoice
      *	@param	User	$user           Object user that validate
      *	@param  string	$force_number   Reference to force on invoice
      *	@param	int		$idwarehouse	Id of warehouse for stock change
+     *  @param	int		$notrigger		1=Does not execute triggers, 0= execuete triggers
      *	@return int 			        <0 if KO, =0 if nothing to do, >0 if OK
      */
-    function validate($user, $force_number='', $idwarehouse=0)
+    function validate($user, $force_number='', $idwarehouse=0, $notrigger=0)
     {
         global $conf,$langs;
 
@@ -886,15 +911,16 @@ class FactureFournisseur extends CommonInvoice
             $num = $this->getNextNumRef($this->client);
         }
         else
-        {
+		{
             $num = $this->ref;
         }
+        $this->newref = $num;
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
         $sql.= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id;
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::validate sql=".$sql);
+        dol_syslog(get_class($this)."::validate", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -920,31 +946,46 @@ class FactureFournisseur extends CommonInvoice
                 }
             }
 
+            // Triggers call
+            if (! $error && $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('BILL_SUPPLIER_VALIDATE',$user);
+                if ($result < 0) $error++;
+                // End call triggers
+            }
+
             if (! $error)
             {
-            	$this->oldref = '';
+	            $this->oldref = $this->ref;
 
             	// Rename directory if dir was a temporary ref
             	if (preg_match('/^[\(]?PROV/i', $this->ref))
             	{
             		// On renomme repertoire facture ($this->ref = ancienne ref, $num = nouvelle ref)
             		// in order not to lose the attached files
-            		$facref = dol_sanitizeFileName($this->ref);
-            		$snumfa = dol_sanitizeFileName($num);
+            		$oldref = dol_sanitizeFileName($this->ref);
+            		$newref = dol_sanitizeFileName($num);
 
-            		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$facref;
-            		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$snumfa;
+            		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$oldref;
+            		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$newref;
             		if (file_exists($dirsource))
             		{
             			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
 
             			if (@rename($dirsource, $dirdest))
             			{
-            				$this->oldref = $facref;
-
             				dol_syslog("Rename ok");
-            				// Suppression ancien fichier PDF dans nouveau rep
-            				dol_delete_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$snumfa.'/'.$facref.'*.*');
+                            // Rename docs starting with $oldref with $newref
+	                        $listoffiles=dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id,2).$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+	                        foreach($listoffiles as $fileentry)
+	                        {
+	                        	$dirsource=$fileentry['name'];
+	                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+	                        	$dirsource=$fileentry['path'].'/'.$dirsource;
+	                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+	                        	@rename($dirsource, $dirdest);
+	                        }
             			}
             		}
             	}
@@ -958,17 +999,6 @@ class FactureFournisseur extends CommonInvoice
             	//$this->date_validation=$now; this is stored into log table
             }
 
-            // Triggers call
-            if (! $error)
-            {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('BILL_SUPPLIER_VALIDATE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
-            }
-
             if (! $error)
             {
                 $this->db->commit();
@@ -1014,7 +1044,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= " SET fk_statut = 0";
         $sql.= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::set_draft sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
         $result=$this->db->query($sql);
         if ($result)
         {
@@ -1113,7 +1143,7 @@ class FactureFournisseur extends CommonInvoice
 
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
         $sql.= ' VALUES ('.$this->id.')';
-        dol_syslog(get_class($this)."::addline sql=".$sql);
+        dol_syslog(get_class($this)."::addline", LOG_DEBUG);
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -1128,18 +1158,14 @@ class FactureFournisseur extends CommonInvoice
                 if (! $notrigger)
                 {
                     global $conf, $langs, $user;
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('LINEBILL_SUPPLIER_CREATE',$this,$user,$langs,$conf);
-                    if ($result < 0) 
-                    { 
-                        $error++;
-                        $this->errors=$interface->errors;
+                    // Call trigger
+                    $result=$this->call_trigger('LINEBILL_SUPPLIER_CREATE',$user);
+                    if ($result < 0)
+                    {
                         $this->db->rollback();
                         return -1;
                     }
-                    // Fin appel triggers
+                    // End call triggers
                 }
 
                 $this->db->commit();
@@ -1180,6 +1206,7 @@ class FactureFournisseur extends CommonInvoice
      */
     function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false)
     {
+    	global $mysoc;
         dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent", LOG_DEBUG);
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -1204,7 +1231,7 @@ class FactureFournisseur extends CommonInvoice
         // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
         // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-        $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$this->thirdparty);
+        $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc, $this->thirdparty);
 
         $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
         $total_ht  = $tabprice[0];
@@ -1229,7 +1256,7 @@ class FactureFournisseur extends CommonInvoice
         }
 
         $this->db->begin();
-        
+
         $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
         $sql.= " description ='".$this->db->escape($desc)."'";
         $sql.= ", pu_ht = ".price2num($pu_ht);
@@ -1252,7 +1279,7 @@ class FactureFournisseur extends CommonInvoice
         $sql.= ", info_bits = ".$info_bits;
         $sql.= " WHERE rowid = ".$id;
 
-        dol_syslog(get_class($this)."::updateline sql=".$sql);
+        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -1261,32 +1288,27 @@ class FactureFournisseur extends CommonInvoice
             if (! $notrigger)
             {
                 global $conf, $langs, $user;
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('LINEBILL_SUPPLIER_UPDATE',$this,$user,$langs,$conf);
-                if ($result < 0) 
+                // Call trigger
+                $result=$this->call_trigger('LINEBILL_SUPPLIER_UPDATE',$user);
+                if ($result < 0)
                 {
-                    $error++;
-                    $this->errors=$interface->errors;
                     $this->db->rollback();
                     return -1;
                 }
-                // Fin appel triggers
+                // End call triggers
             }
 
             // Update total price into invoice record
             $result=$this->update_price('','auto');
 
             $this->db->commit();
-            
+
             return $result;
         }
         else
         {
             $this->db->rollback();
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::updateline error=".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -1311,14 +1333,10 @@ class FactureFournisseur extends CommonInvoice
 
 		if (! $error && ! $notrigger)
         {
-	    	// Appel des triggers
-	    	include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-	    	$interface=new Interfaces($this->db);
-	    	$result=$interface->run_triggers('LINEBILL_SUPPLIER_DELETE',$this,$user,$langs,$conf);
-	    	if ($result < 0) {
-	    		$error++; $this->errors=$interface->errors;
-	    	}
-        	// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('LINEBILL_SUPPLIER_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
         }
 
     	if (! $error)
@@ -1326,13 +1344,12 @@ class FactureFournisseur extends CommonInvoice
 	        // Supprime ligne
 	        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';
 	        $sql.= ' WHERE rowid = '.$rowid;
-        	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+        	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 	        $resql = $this->db->query($sql);
 	        if (! $resql)
 	        {
 	        	$error++;
 	        	$this->error=$this->db->lasterror();
-	        	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 	        }
     	}
 
@@ -1463,7 +1480,7 @@ class FactureFournisseur extends CommonInvoice
         }
         else
         {
-            $lien = '<a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$this->id.'">';
+            $lien = '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id.'">';
             $lienfin='</a>';
         }
         $label=$langs->trans("ShowInvoice").': '.$this->ref;
@@ -1481,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
       */
@@ -1621,6 +1638,48 @@ class FactureFournisseur extends CommonInvoice
         $this->total_ttc      = $xnbp*119.6;
     }
 
+	/**
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @return         int     <0 if KO, >0 if OK
+	 */
+	function load_state_board()
+	{
+		global $conf, $user;
+
+		$this->nb=array();
+
+		$clause = "WHERE";
+
+		$sql = "SELECT count(f.rowid) as nb";
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+		if (!$user->rights->societe->client->voir && !$user->societe_id)
+		{
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$clause = "AND";
+		}
+		$sql.= " ".$clause." f.entity = ".$conf->entity;
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->db->fetch_object($resql))
+			{
+				$this->nb["supplier_invoices"]=$obj->nb;
+			}
+            $this->db->free($resql);
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
     /**
      *	Load an object from its id and create a new one in database
      *
@@ -1695,4 +1754,38 @@ class FactureFournisseur extends CommonInvoice
         }
     }
 
+	/**
+	 *	Create a document onto disk according to template model.
+	 *
+	 *	@param	    string		$modele			Force template to use ('' to not force)
+	 *	@param		Translate	$outputlangs	Object 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, $user, $langs;
+
+		$langs->load("suppliers");
+
+		// Set the model on the model name to use
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
+			{
+				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'canelle';
+			}
+		}
+
+		$modelpath = "core/modules/supplier_invoice/pdf/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
 }
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index b642926f802..75ac674e877 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1,9 +1,9 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2006-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2009-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>
  *
  * 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
@@ -83,12 +83,11 @@ class ProductFournisseur extends Product
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
         $sql.= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn;
 
-        dol_syslog(get_class($this)."::remove_fournisseur sql=".$sql);
+        dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
         $resql2=$this->db->query($sql);
         if (! $resql2)
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::remove_fournisseur ".$this->error, LOG_ERR);
             $ok=0;
         }
 
@@ -120,7 +119,7 @@ class ProductFournisseur extends Product
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
         $sql.= " WHERE rowid = ".$rowid;
 
-        dol_syslog(get_class($this)."::remove_product_fournisseur_price sql=".$sql);
+        dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -130,7 +129,6 @@ class ProductFournisseur extends Product
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::remove_product_fournisseur_price ".$this->error,LOG_ERR);
             $this->db->rollback();
             return -1;
         }
@@ -156,7 +154,7 @@ class ProductFournisseur extends Product
      */
     function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0)
     {
-        global $conf,$mysoc;
+        global $conf;
 
         // Clean parameter
         if (empty($qty)) $qty=0;
@@ -201,18 +199,14 @@ class ProductFournisseur extends Product
 			$sql.= " WHERE rowid = ".$this->product_fourn_price_id;
 			// TODO Add price_base_type and price_ttc
 
-			dol_syslog(get_class($this).'::update_buyprice sql='.$sql);
+			dol_syslog(get_class($this).'::update_buyprice', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				// Appel des triggers
-				include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('SUPPLIER_PRODUCT_BUYPRICE_UPDATE',$this,$user,$langs,$conf);
-				if ($result < 0)
-				{
-					$error++; $this->error=$interface->errors;
-				}
+                // Call trigger
+                $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE',$user);
+                if ($result < 0) $error++;
+                // End call triggers
 
 				if (empty($error))
 				{
@@ -238,7 +232,7 @@ class ProductFournisseur extends Product
 	        	// Delete price for this quantity
 	        	$sql = "DELETE FROM  ".MAIN_DB_PREFIX."product_fournisseur_price";
           		$sql.= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity;
-				dol_syslog(get_class($this).'::update_buyprice sql='.$sql);
+				dol_syslog(get_class($this).'::update_buyprice', LOG_DEBUG);
 	        	$resql=$this->db->query($sql);
 				if ($resql)
 		  		{
@@ -263,15 +257,15 @@ class ProductFournisseur extends Product
 		            $sql.= $conf->entity;
 		            $sql.=")";
 
-		            dol_syslog(get_class($this)."::update_buyprice sql=".$sql);
+		            dol_syslog(get_class($this)."::update_buyprice", LOG_DEBUG);
 		            if (! $this->db->query($sql))
 		            {
 		                $error++;
 		            }
 
-		            /*if (! $error)
+		            if (! $error  && !empty($cong->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
 		            {
-		                // Ajoute modif dans table log
+		                // Add record into log table
 		                $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log(";
 		                $sql.= "datec, fk_product_fournisseur,fk_user,price,quantity)";
 		                $sql.= "values('".$this->db->idate($now)."',";
@@ -287,18 +281,14 @@ class ProductFournisseur extends Product
 		                    $error++;
 		                }
 		            }
-					*/
+
 
 		            if (! $error)
 		            {
-        				// Appel des triggers
-        				include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-        				$interface=new Interfaces($this->db);
-        				$result=$interface->run_triggers('SUPPLIER_PRODUCT_BUYPRICE_CREATE',$this,$user,$langs,$conf);
-        				if ($result < 0)
-        				{
-        					$error++; $this->error=$interface->errors;
-        				}
+                        // Call trigger
+                        $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE',$user);
+                        if ($result < 0) $error++;
+                        // End call triggers
 
         				if (empty($error))
         				{
@@ -340,7 +330,7 @@ class ProductFournisseur extends Product
         $sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
         $sql.= " WHERE pfp.rowid = ".$rowid;
 
-        dol_syslog(get_class($this)."::fetch_product_fournisseur_price sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -371,7 +361,6 @@ class ProductFournisseur extends Product
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::fetch_product_fournisseur_price error=".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -399,7 +388,7 @@ class ProductFournisseur extends Product
         $sql.= " AND pfp.fk_product = ".$prodid;
         if (empty($sortfield)) $sql.= " ORDER BY s.nom, pfp.quantity, pfp.price";
         else $sql.= $this->db->order($sortfield,$sortorder);
-        dol_syslog(get_class($this)."::list_product_fournisseur_price sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::list_product_fournisseur_price", LOG_DEBUG);
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -449,7 +438,6 @@ class ProductFournisseur extends Product
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::list_product_fournisseur_price error=".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -479,7 +467,8 @@ 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.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges, ";
+        $sql.= " pfp.remise, pfp.remise_percent";
         $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;
@@ -488,7 +477,7 @@ class ProductFournisseur extends Product
         $sql.= " ORDER BY pfp.unitprice";
         $sql.= $this->db->plimit(1);
 
-        dol_syslog(get_class($this)."::find_min_price_product_fournisseur sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -513,7 +502,6 @@ class ProductFournisseur extends Product
         else
         {
             $this->error=$this->db->error();
-            dol_syslog(get_class($this)."::find_min_price_product_fournisseur error=".$this->error, LOG_ERR);
             return -1;
         }
     }
diff --git a/htdocs/fourn/class/index.html b/htdocs/fourn/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 0f70dc6bafc..59dc5dab3d1 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -163,7 +163,7 @@ class PaiementFourn extends Paiement
 			$sql.= " VALUES ('".$this->db->idate($now)."',";
 			$sql.= " '".$this->db->idate($this->datepaye)."', '".$this->total."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.", 0)";
 
-			dol_syslog("PaiementFourn::create sql=".$sql);
+			dol_syslog("PaiementFourn::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
@@ -215,18 +215,15 @@ class PaiementFourn extends Paiement
 
 				if (! $error)
 				{
-		            // Appel des triggers
-		            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		            $interface=new Interfaces($this->db);
-		            $result=$interface->run_triggers('PAYMENT_SUPPLIER_CREATE',$this,$user,$langs,$conf);
-					if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		            // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('PAYMENT_SUPPLIER_CREATE',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
 				}
 			}
 			else
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR);
 				$error++;
 			}
 		}
@@ -272,7 +269,7 @@ class PaiementFourn extends Paiement
 		{
 			if (count($billsarray))
 			{
-				$this->error='Can\'t delete a payment shared by at least one invoice with status payed';
+				$this->error="ErrorCantDeletePaymentSharedWithPayedInvoice";
 				$this->db->rollback();
 				return -1;
 			}
@@ -291,7 +288,7 @@ class PaiementFourn extends Paiement
 			$accline->fetch($bank_line_id);
 			if ($accline->rappro)
 			{
-				$this->error='Impossible de supprimer un paiement qui a genere une ecriture qui a ete rapprochee';
+				$this->error="ErrorCantDeletePaymentReconciliated";
 				$this->db->rollback();
 				return -3;
 			}
@@ -300,13 +297,11 @@ class PaiementFourn extends Paiement
 		// Efface la ligne de paiement (dans paiement_facture et paiement)
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
 		$sql.= ' WHERE fk_paiementfourn = '.$this->id;
-		dol_syslog("sql=".$sql);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn';
 			$sql.= ' WHERE rowid = '.$this->id;
-		    dol_syslog("sql=".$sql);
 			$result = $this->db->query($sql);
 			if (! $result)
 			{
@@ -398,7 +393,7 @@ class PaiementFourn extends Paiement
 		$sql.= ' WHERE pf.fk_facturefourn = f.rowid AND fk_paiementfourn = '.$this->id;
 		if ($filter) $sql.= ' AND '.$filter;
 
-		dol_syslog(get_class($this).'::getBillsArray sql='.$sql,LOG_DEBUG);
+		dol_syslog(get_class($this).'::getBillsArray', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -493,7 +488,7 @@ class PaiementFourn extends Paiement
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$text=$this->ref;	// Sometimes ref contains label
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
new file mode 100644
index 00000000000..09556bd9125
--- /dev/null
+++ b/htdocs/fourn/commande/card.php
@@ -0,0 +1,2407 @@
+<?php
+/* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Eric	Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file		htdocs/fourn/commande/card.php
+ *	\ingroup	supplier, order
+ *	\brief		Card supplier order
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+if (!empty($conf->produit->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->projet->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once NUSOAP_PATH.'/nusoap.php';     // Include SOAP
+
+$langs->load('admin');
+$langs->load('orders');
+$langs->load('sendings');
+$langs->load('companies');
+$langs->load('bills');
+$langs->load('propal');
+$langs->load('deliveries');
+$langs->load('products');
+$langs->load('stocks');
+
+$id 			= GETPOST('id','int');
+$ref 			= GETPOST('ref','alpha');
+$action 		= GETPOST('action','alpha');
+$confirm		= GETPOST('confirm','alpha');
+$comclientid 	= GETPOST('comid','int');
+$socid			= GETPOST('socid','int');
+$projectid		= GETPOST('projectid','int');
+
+//PDF
+$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
+$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('ordersuppliercard','globalcard'));
+
+$object = new CommandeFournisseur($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+//Date prefix
+$date_pf = '';
+
+// Load object
+if ($id > 0 || ! empty($ref))
+{
+	$ret = $object->fetch($id, $ref);
+	if ($ret < 0) dol_print_error($db,$object->error);
+	$ret = $object->fetch_thirdparty();
+	if ($ret < 0) dol_print_error($db,$object->error);
+}
+else if (! empty($socid) && $socid > 0)
+{
+	$fourn = new Fournisseur($db);
+	$ret=$fourn->fetch($socid);
+	if ($ret < 0) dol_print_error($db,$object->error);
+	$object->socid = $fourn->id;
+	$ret = $object->fetch_thirdparty();
+	if ($ret < 0) dol_print_error($db,$object->error);
+}
+
+$permissionnote=$user->rights->fournisseur->commande->creer;	// Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+$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');
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
+{
+    $result=$object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
+    if ($result < 0) dol_print_error($db, $object->error);
+}
+
+// conditions de reglement
+if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
+{
+    $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
+}
+
+// mode de reglement
+else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
+{
+    $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
+}
+
+// bank account
+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)
+{
+	$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
+
+	$result=$object->set_date_livraison($user,$datelivraison);
+	if ($result < 0)
+	{
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+// Set project
+else if ($action ==	'classin' && $user->rights->fournisseur->commande->creer)
+{
+    $object->setProject($projectid);
+}
+
+else if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer)
+{
+    $result = $object->set_remise($user, $_POST['remise_percent']);
+}
+
+else if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver)
+{
+    if (in_array($object->statut, array(1, 2, 5, 6, 7, 9)))
+    {
+        if ($object->statut == 1) $newstatus=0;	// Validated->Draft
+        else if ($object->statut == 2) $newstatus=0;	// Approved->Draft
+        else if ($object->statut == 5) $newstatus=4;	// Received->Received partially
+        else if ($object->statut == 6) $newstatus=2;	// Canceled->Approved
+        else if ($object->statut == 7) $newstatus=3;	// Canceled->Process running
+        else if ($object->statut == 9) $newstatus=1;	// Refused->Validated
+
+        $result = $object->setStatus($user, $newstatus);
+        if ($result > 0)
+        {
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+            exit;
+        }
+        else
+        {
+        	setEventMessage($object->error, 'errors');
+        }
+    }
+}
+
+/*
+ *	Add a line into product
+ */
+else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
+{
+    $langs->load('errors');
+    $error = 0;
+
+	// Set if we used free entry or predefined product
+	$predef='';
+	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	$date_start=dol_mktime(GETPOST('date_start'.$date_pf.'hour'), GETPOST('date_start'.$date_pf.'min'), 0, GETPOST('date_start'.$date_pf.'month'), GETPOST('date_start'.$date_pf.'day'), GETPOST('date_start'.$date_pf.'year'));
+	$date_end=dol_mktime(GETPOST('date_end'.$date_pf.'hour'), GETPOST('date_end'.$date_pf.'min'), 0, GETPOST('date_end'.$date_pf.'month'), GETPOST('date_end'.$date_pf.'day'), GETPOST('date_end'.$date_pf.'year'));
+	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 = '';
+	}
+
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
+
+    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht') < 0 && $qty < 0)
+    {
+        setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), 'errors');
+        $error++;
+    }
+    if (GETPOST('prod_entry_mode')=='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
+    {
+        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
+        $error++;
+    }
+    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
+    {
+        setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
+        $error++;
+    }
+    if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('dp_desc'))
+    {
+        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
+        $error++;
+    }
+    if (! GETPOST('qty'))
+    {
+        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
+        $error++;
+    }
+
+    // Ecrase $pu par celui	du produit
+    // Ecrase $desc	par	celui du produit
+    // Ecrase $txtva  par celui du produit
+    if ((GETPOST('prod_entry_mode') != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+    {
+    	$idprod=0;
+    	$productsupplier = new ProductFournisseur($db);
+
+    	if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-2;	// Same behaviour than with combolist. When not select idprodfournprice is now -2 (to avoid conflict with next action that may return -1)
+
+    	if (GETPOST('idprodfournprice') > 0)
+    	{
+    		$idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), $qty);    // Just to see if a price exists for the quantity. Not used to found vat.
+    	}
+
+    	if ($idprod > 0)
+    	{
+    		$res=$productsupplier->fetch($idprod);
+
+    		$label = $productsupplier->libelle;
+
+    		$desc = $productsupplier->description;
+    		if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
+
+    		$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
+    		$type = $productsupplier->type;
+
+    		// Local Taxes
+    		$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
+    		$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+
+    		$result=$object->addline(
+    			$desc,
+    			$productsupplier->fourn_pu,
+    			$qty,
+    			$tva_tx,
+    			$localtax1_tx,
+    			$localtax2_tx,
+    			$productsupplier->id,
+    			GETPOST('idprodfournprice'),
+    			$productsupplier->fourn_ref,
+    			$remise_percent,
+    			'HT',
+    			$pu_ttc,
+    			$type,
+    			'',
+    			'',
+    			$date_start,
+    			$date_end
+    		);
+    	}
+    	if ($idprod == -2 || $idprod == 0)
+    	{
+    		// Product not selected
+    		$error++;
+    		$langs->load("errors");
+    		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")), 'errors');
+    	}
+    	if ($idprod == -1)
+    	{
+    		// Quantity too low
+    		$error++;
+    		$langs->load("errors");
+    		setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
+    	}
+    }
+    else if((GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='') && empty($error))
+	{
+		$pu_ht = price2num($price_ht, 'MU');
+		$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+		$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
+		$tva_tx = str_replace('*', '', $tva_tx);
+		$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+		$desc = $product_desc;
+		$type = GETPOST('type');
+
+    	$tva_tx = price2num($tva_tx);	// When vat is text input field
+
+    	// Local Taxes
+    	$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
+    	$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+
+    	if (!empty($_POST['price_ht']))
+    	{
+    		$price_base_type = 'HT';
+    		$ht = price2num($_POST['price_ht']);
+    		$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, 0, $type,'','', $date_start, $date_end);
+    	}
+    	else
+    	{
+    		$ttc = price2num($_POST['price_ttc']);
+    		$ht = $ttc / (1 + ($tauxtva / 100));
+    		$price_base_type = 'HT';
+    		$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end);
+    	}
+	}
+
+    //print "xx".$tva_tx; exit;
+    if (! $error && $result > 0)
+    {
+    	$ret=$object->fetch($object->id);    // Reload to get new records
+
+        // Define output language
+    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    	{
+    		$outputlangs = $langs;
+    		$newlang = '';
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    		if (! empty($newlang)) {
+    			$outputlangs = new Translate("", $conf);
+    			$outputlangs->setDefaultLang($newlang);
+    		}
+    		$model=$object->modelpdf;
+    		$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);
+    	}
+
+		unset($_POST ['prod_entry_mode']);
+
+    	unset($_POST['qty']);
+    	unset($_POST['type']);
+    	unset($_POST['remise_percent']);
+    	unset($_POST['pu']);
+    	unset($_POST['price_ht']);
+    	unset($_POST['price_ttc']);
+    	unset($_POST['tva_tx']);
+    	unset($_POST['label']);
+    	unset($localtax1_tx);
+    	unset($localtax2_tx);
+		unset($_POST['np_marginRate']);
+		unset($_POST['np_markRate']);
+    	unset($_POST['dp_desc']);
+		unset($_POST['idprodfournprice']);
+
+    	unset($_POST['date_starthour']);
+    	unset($_POST['date_startmin']);
+    	unset($_POST['date_startsec']);
+    	unset($_POST['date_startday']);
+    	unset($_POST['date_startmonth']);
+    	unset($_POST['date_startyear']);
+    	unset($_POST['date_endhour']);
+    	unset($_POST['date_endmin']);
+    	unset($_POST['date_endsec']);
+    	unset($_POST['date_endday']);
+    	unset($_POST['date_endmonth']);
+    	unset($_POST['date_endyear']);
+    }
+    else
+	{
+    	setEventMessage($object->error, 'errors');
+    }
+}
+
+/*
+ *	Mise a jour	d'une ligne	dans la	commande
+ */
+else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer &&	! GETPOST('cancel'))
+{
+    if ($_POST["elrowid"])
+    {
+        $line = new CommandeFournisseurLigne($db);
+        $res = $line->fetch($_POST["elrowid"]);
+        if (!$res) dol_print_error($db);
+    }
+
+    $date_start=dol_mktime(GETPOST('date_start'.$date_pf.'hour'), GETPOST('date_start'.$date_pf.'min'), 0, GETPOST('date_start'.$date_pf.'month'), GETPOST('date_start'.$date_pf.'day'), GETPOST('date_start'.$date_pf.'year'));
+    $date_end=dol_mktime(GETPOST('date_end'.$date_pf.'hour'), GETPOST('date_end'.$date_pf.'min'), 0, GETPOST('date_end'.$date_pf.'month'), GETPOST('date_end'.$date_pf.'day'), GETPOST('date_end'.$date_pf.'year'));
+
+    $localtax1_tx=get_localtax($_POST['tva_tx'],1,$mysoc,$object->thirdparty);
+    $localtax2_tx=get_localtax($_POST['tva_tx'],2,$mysoc,$object->thirdparty);
+
+    $result	= $object->updateline(
+        $_POST['elrowid'],
+        $_POST['eldesc'],
+        $_POST['pu'],
+        $_POST['qty'],
+        $_POST['remise_percent'],
+        $_POST['tva_tx'],
+        $localtax1_tx,
+        $localtax2_tx,
+        'HT',
+        0,
+        isset($_POST["type"])?$_POST["type"]:$line->product_type,
+        false,
+        $date_start,
+        $date_end
+    );
+    unset($_POST['qty']);
+    unset($_POST['type']);
+    unset($_POST['idprodfournprice']);
+    unset($_POST['remmise_percent']);
+    unset($_POST['dp_desc']);
+    unset($_POST['np_desc']);
+    unset($_POST['pu']);
+    unset($_POST['tva_tx']);
+    unset($_POST['date_start']);
+    unset($_POST['date_end']);
+    unset($localtax1_tx);
+    unset($localtax2_tx);
+
+    if ($result	>= 0)
+    {
+        // Define output language
+    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    	{
+    		$outputlangs = $langs;
+    		$newlang = '';
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    		if (! empty($newlang)) {
+    			$outputlangs = new Translate("", $conf);
+    			$outputlangs->setDefaultLang($newlang);
+    		}
+    		$model=$object->modelpdf;
+    		$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);
+    	}
+    }
+    else
+    {
+        dol_print_error($db,$object->error);
+        exit;
+    }
+}
+
+else if ($action == 'confirm_deleteproductline' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
+{
+
+    $result = $object->deleteline(GETPOST('lineid'));
+    if ($result	>= 0)
+    {
+        $outputlangs = $langs;
+        if (GETPOST('lang_id'))
+        {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang(GETPOST('lang_id'));
+        }
+        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+        {
+            $ret=$object->fetch($object->id);    // Reload to get new records
+	        $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+        }
+    }
+    else
+    {
+        $error++;
+        setEventMessage($object->error, 'errors');
+    }
+
+    if (! $error)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+        exit;
+    }
+}
+
+else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fournisseur->commande->valider)
+{
+    $object->date_commande=dol_now();
+    $result = $object->valid($user);
+    if ($result	>= 0)
+    {
+        // Define output language
+    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    	{
+    		$outputlangs = $langs;
+    		$newlang = '';
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    		if (! empty($newlang)) {
+    			$outputlangs = new Translate("", $conf);
+    			$outputlangs->setDefaultLang($newlang);
+    		}
+    		$model=$object->modelpdf;
+    		$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);
+    	}
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+
+    // If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
+    if ($user->rights->fournisseur->commande->approuver && ! (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)))
+    {
+        $action='confirm_approve';
+    }
+}
+
+else if ($action == 'confirm_approve' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
+{
+    $idwarehouse=GETPOST('idwarehouse', 'int');
+
+    $qualified_for_stock_change=0;
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+	}
+	else
+	{
+	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+	}
+
+    // Check parameters
+    if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)
+    {
+        if (! $idwarehouse || $idwarehouse == -1)
+        {
+            $error++;
+            setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
+            $action='';
+        }
+    }
+
+    if (! $error)
+    {
+        $result	= $object->approve($user, $idwarehouse);
+        if ($result > 0)
+        {
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	            $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
+            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+            exit;
+        }
+        else
+        {
+            setEventMessage($object->error, 'errors');
+        }
+    }
+}
+
+else if ($action == 'confirm_refuse' &&	$confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
+{
+    $result = $object->refuse($user);
+    if ($result > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+else if ($action == 'confirm_commande' && $confirm	== 'yes' &&	$user->rights->fournisseur->commande->commander)
+{
+    $result	= $object->commande($user, $_REQUEST["datecommande"],	$_REQUEST["methode"], $_REQUEST['comment']);
+    if ($result > 0)
+    {
+        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	        $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+        }
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+
+else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->commande->supprimer)
+{
+    $result=$object->delete($user);
+    if ($result > 0)
+    {
+        header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php');
+        exit;
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+// Action clone object
+else if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
+{
+	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	{
+		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+	}
+	else
+	{
+		if ($object->id > 0)
+		{
+			$result=$object->createFromClone();
+			if ($result > 0)
+			{
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+				exit;
+			}
+			else
+			{
+				setEventMessage($object->error, 'errors');
+				$action='';
+			}
+		}
+	}
+}
+
+// Receive
+else if ($action == 'livraison' && $user->rights->fournisseur->commande->receptionner)
+{
+
+    if ($_POST["type"])
+    {
+        $date_liv = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+
+        $result	= $object->Livraison($user, $date_liv, $_POST["type"], $_POST["comment"]);
+        if ($result > 0)
+        {
+            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+            exit;
+        }
+        else if($result == -3)
+        {
+        	setEventMessage($langs->trans("NotAuthorized"), 'errors');
+        }
+        else
+        {
+            dol_print_error($db,$object->error);
+            exit;
+        }
+    }
+    else
+    {
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")), 'errors');
+    }
+}
+
+else if ($action == 'confirm_cancel' && $confirm == 'yes' &&	$user->rights->fournisseur->commande->commander)
+{
+    $result	= $object->cancel($user);
+    if ($result > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        setEventMessage($object->error, 'errors');
+    }
+}
+
+// Line ordering
+else if ($action == 'up'	&& $user->rights->fournisseur->commande->creer)
+{
+    $object->line_up($_GET['rowid']);
+
+    $outputlangs = $langs;
+    if (! empty($_REQUEST['lang_id']))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+    }
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	    $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    }
+    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
+    exit;
+}
+else if ($action == 'down' && $user->rights->fournisseur->commande->creer)
+{
+    $object->line_down($_GET['rowid']);
+
+    $outputlangs = $langs;
+    if (! empty($_REQUEST['lang_id']))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+    }
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	    $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    }
+    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
+    exit;
+}
+
+else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer)	// En get ou en	post
+{
+    // Build document
+
+	// Save last template used to generate document
+	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+    $outputlangs = $langs;
+    if (GETPOST('lang_id'))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang(GETPOST('lang_id'));
+    }
+    $result= $object->generateDocument($object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
+    if ($result	<= 0)
+    {
+        dol_print_error($db,$result);
+        exit;
+    }
+}
+
+// Delete file in doc form
+else if ($action == 'remove_file' && $object->id > 0 && $user->rights->fournisseur->commande->creer)
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    $langs->load("other");
+    $upload_dir =	$conf->fournisseur->commande->dir_output;
+    $file =	$upload_dir	. '/' .	GETPOST('file');
+    $ret=dol_delete_file($file,0,0,0,$object);
+    if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+    else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+}
+
+elseif ($action == 'update_extras')
+{
+	// Fill array 'array_options' with data from add form
+	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	if($ret < 0) $error++;
+
+	if (!$error)
+	{
+		// Actions on extra fields (by external module or standard code)
+		// FIXME le hook fait double emploi avec le trigger !!
+		$hookmanager->initHooks(array('supplierorderdao'));
+		$parameters=array('id'=>$object->id);
+
+		$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$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=$object->insertExtraFields();
+
+				if ($result < 0)
+				{
+					$error++;
+				}
+
+			}
+		}
+		else if ($reshook < 0) $error++;
+	}
+	else
+	{
+		$action = 'edit_extras';
+	}
+}
+
+/*
+ * Create an order
+ */
+else if ($action == 'add' && $user->rights->fournisseur->commande->creer)
+{
+ 	$error=0;
+
+    if ($socid <1)
+    {
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')), 'errors');
+    	$action='create';
+    	$error++;
+    }
+
+    if (! $error)
+    {
+        $db->begin();
+
+        // Creation commande
+        $object->ref_supplier  	= GETPOST('refsupplier');
+        $object->socid         	= $socid;
+		$object->cond_reglement_id = GETPOST('cond_reglement_id');
+        $object->mode_reglement_id = GETPOST('mode_reglement_id');
+        $object->fk_account        = GETPOST('fk_account', 'int');
+        $object->note_private	= GETPOST('note_private');
+        $object->note_public   	= GETPOST('note_public');
+
+		// Fill array 'array_options' with data from add form
+        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+        $id = $object->create($user);
+		if ($id < 0)
+		{
+			$error++;
+		}
+
+        if ($error)
+        {
+            $langs->load("errors");
+            $db->rollback();
+	        setEventMessage($langs->trans($object->error), 'errors');
+            $action='create';
+            $_GET['socid']=$_POST['socid'];
+        }
+        else
+		{
+            $db->commit();
+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+            exit;
+        }
+    }
+}
+
+/*
+ * Add file in email form
+ */
+if (GETPOST('addfile'))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    // Set tmp user directory TODO Use a dedicated directory for temp mails files
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';
+
+    dol_add_file_process($upload_dir_tmp,0,0);
+    $action='presend';
+}
+
+/*
+ * Remove file in email form
+ */
+if (GETPOST('removedfile'))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    // Set tmp user directory
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';
+
+	// TODO Delete only files that was uploaded from email form
+    dol_remove_file_process($_POST['removedfile'],0);
+    $action='presend';
+}
+
+/*
+ * Send mail
+ */
+if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel'))
+{
+    $langs->load('mails');
+
+    if ($object->id > 0)
+    {
+//        $ref = dol_sanitizeFileName($object->ref);
+//        $file = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
+
+//        if (is_readable($file))
+//        {
+            if (GETPOST('sendto','alpha'))
+            {
+                // Le destinataire a ete fourni via le champ libre
+                $sendto = GETPOST('sendto','alpha');
+                $sendtoid = 0;
+            }
+            elseif (GETPOST('receiver','alpha') != '-1')
+            {
+                // Recipient was provided from combo list
+                if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
+                {
+                    $sendto = $object->client->email;
+                    $sendtoid = 0;
+                }
+                else	// Id du contact
+                {
+                    $sendto = $object->client->contact_get_property(GETPOST('receiver','alpha'),'email');
+                    $sendtoid = GETPOST('receiver','alpha');
+                }
+            }
+
+            if (dol_strlen($sendto))
+            {
+                $langs->load("commercial");
+
+                $from = GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
+                $replyto = GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
+                $message = GETPOST('message');
+                $sendtocc = GETPOST('sendtocc','alpha');
+                $deliveryreceipt = GETPOST('deliveryreceipt','alpha');
+
+                if ($action == 'send')
+                {
+                    if (dol_strlen(GETPOST('subject'))) $subject=GETPOST('subject');
+                    else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
+                    $actiontypecode='AC_SUP_ORD';
+                    $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);
+                    }
+                    $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
+                }
+
+                // Create form object
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+
+                $attachedfiles=$formmail->get_attached_files();
+                $filepath = $attachedfiles['paths'];
+                $filename = $attachedfiles['names'];
+                $mimetype = $attachedfiles['mimes'];
+
+                // Send mail
+                require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+                if ($mailfile->error)
+                {
+                	setEventMessage($mailfile->error, 'errors');
+                }
+                else
+                {
+                    $result=$mailfile->sendfile();
+                    if ($result)
+                    {
+                    	$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));		// Must not contain "
+                    	setEventMessage($mesg);
+
+                        $error=0;
+
+                        // Initialisation donnees
+                        $object->sendtoid		= $sendtoid;
+                        $object->actiontypecode	= $actiontypecode;
+                        $object->actionmsg 		= $actionmsg;
+                        $object->actionmsg2		= $actionmsg2;
+                        $object->fk_element		= $object->id;
+                        $object->elementtype	= $object->element;
+
+                        // Appel des triggers
+                        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                        $interface=new Interfaces($db);
+                        $result=$interface->run_triggers('ORDER_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
+                        if ($result < 0) { $error++; $errors=$interface->errors; }
+                        // Fin appel triggers
+
+                        if ($error)
+                        {
+                            setEventMessage($object->error, 'errors');
+                        }
+                        else
+                        {
+                            // Redirect here
+                            // This avoid sending mail twice if going out and then back to page
+                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+                            exit;
+                        }
+                    }
+                    else
+                    {
+                        $langs->load("other");
+                        if ($mailfile->error)
+                        {
+                            $mesg = $langs->trans('ErrorFailedToSendMail',$from,$sendto);
+                            $mesg.= '<br>'.$mailfile->error;
+                        }
+                        else
+                        {
+                            $mesg = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+                        }
+
+                        setEventMessage($mesg, 'errors');
+                    }
+                }
+/*            }
+            else
+            {
+                $langs->load("other");
+                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
+                $action='presend';
+                dol_syslog('Recipient email is empty');
+            }*/
+        }
+        else
+        {
+            $langs->load("errors");
+            setEventMessage($langs->trans('ErrorCantReadFile',$file), 'errors');
+            dol_syslog('Failed to read file: '.$file);
+        }
+    }
+    else
+    {
+        $langs->load("other");
+        setEventMessage($langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")), 'errors');
+        dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
+    }
+}
+
+if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel'))
+{
+    $ws_url         = $object->thirdparty->webservices_url;
+    $ws_key         = $object->thirdparty->webservices_key;
+    $ws_user        = GETPOST('ws_user','alpha');
+    $ws_password    = GETPOST('ws_password','alpha');
+    $ws_entity      = GETPOST('ws_entity','int');
+    $ws_thirdparty  = GETPOST('ws_thirdparty','int');
+
+    // NS and Authentication parameters
+    $ws_ns='http://www.dolibarr.org/ns/';
+    $ws_authentication=array(
+        'dolibarrkey'=>$ws_key,
+        'sourceapplication'=>'DolibarrWebServiceClient',
+        'login'=>$ws_user,
+        'password'=>$ws_password,
+        'entity'=>$ws_entity
+    );
+
+    //Is sync supplier web services module activated? and everything filled?
+    if (empty($conf->syncsupplierwebservices->enabled)) {
+        setEventMessage($langs->trans("WarningModuleNotActive",$langs->transnoentities("Module2650Name")));
+    } else if (empty($ws_url) || empty($ws_key)) {
+        setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors');
+    } else if (empty($ws_user) || empty($ws_password) || empty($ws_thirdparty)) {
+        setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors');
+    }
+    else
+    {
+        //Create SOAP client and connect it to order
+        $soapclient_order = new nusoap_client($ws_url."/webservices/server_order.php");
+        $soapclient_order->soap_defencoding='UTF-8';
+        $soapclient_order->decodeUTF8(false);
+
+        //Create SOAP client and connect it to product/service
+        $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
+        $soapclient_product->soap_defencoding='UTF-8';
+        $soapclient_product->decodeUTF8(false);
+
+        //Prepare the order lines from order
+        $order_lines = array();
+        foreach ($object->lines as $line)
+        {
+            $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $line->ref_supplier);
+            $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
+
+            if ($result_product["result"]["result_code"] == "OK")
+            {
+                $order_lines[] = array(
+                    'desc'          => $line->product_desc,
+                    'type'          => $line->product_type,
+                    'product_id'    => $result_product["product"]["id"],
+                    'vat_rate'      => $line->tva_tx,
+                    'qty'           => $line->qty,
+                    'price'         => $line->price,
+                    'unitprice'     => $line->subprice,
+                    'total_net'     => $line->total_ht,
+                    'total_vat'     => $line->total_tva,
+                    'total'         => $line->total_ttc,
+                    'date_start'    => $line->date_start,
+                    'date_end'      => $line->date_end,
+                );
+            }
+        }
+
+        //Prepare the order header
+        $order = array(
+            'thirdparty_id' => $ws_thirdparty,
+            'date'          => dol_print_date(dol_now(),'dayrfc'),
+            'total_net'     => $object->total_ht,
+            'total_var'     => $object->total_tva,
+            'total'         => $object->total_ttc,
+            'lines'         => $order_lines
+        );
+
+        $ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order);
+        $result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, '');
+
+        if (empty($result_order["result"]["result_code"])) //No result, check error str
+        {
+            setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors');
+        }
+        else if ($result_order["result"]["result_code"] != "OK") //Something went wrong
+        {
+            setEventMessage($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors');
+        }
+        else
+        {
+            setEventMessage($langs->trans("RemoteOrderRef")." ".$result_order["ref"], 'mesgs');
+        }
+    }
+}
+
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer)
+{
+	if ($action == 'addcontact')
+	{
+		if ($object->id > 0)
+		{
+			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+			$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		}
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else
+		{
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$langs->load("errors");
+				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
+			}
+			else
+			{
+				setEventMessage($object->error, 'errors');
+			}
+		}
+	}
+
+	// bascule du statut d'un contact
+	else if ($action == 'swapstatut' && $object->id > 0)
+	{
+		$result=$object->swapContactStatus(GETPOST('ligne'));
+	}
+
+	// Efface un contact
+	else if ($action == 'deletecontact' && $object->id > 0)
+	{
+		$result = $object->delete_contact($_GET["lineid"]);
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else {
+			dol_print_error($db);
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
+
+$form =	new	Form($db);
+$formfile = new FormFile($db);
+$formorder = new FormOrder($db);
+$productstatic = new Product($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* Mode vue et edition                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+$now=dol_now();
+if ($action=="create")
+{
+	print_fiche_titre($langs->trans('NewOrder'));
+
+	dol_htmloutput_events();
+
+	$societe='';
+	if ($socid>0)
+	{
+		$societe=new Societe($db);
+		$societe->fetch($socid);
+	}
+
+	$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
+	$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
+
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
+
+	// Third party
+	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
+	print '<td>';
+
+	if ($socid > 0)
+	{
+		print $societe->getNomUrl(1);
+		print '<input type="hidden" name="socid" value="'.$socid.'">';
+	}
+	else
+	{
+		print $form->select_company((empty($socid)?'':$socid),'socid','s.fournisseur = 1',1);
+	}
+	print '</td>';
+
+	// Ref supplier
+	print '<tr><td>'.$langs->trans('RefSupplier').'</td><td><input name="refsupplier" type="text"></td>';
+	print '</tr>';
+
+	print '</td></tr>';
+
+	// Payment term
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	$form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
+	print '</td></tr>';
+
+	// Payment mode
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	$form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
+	print '</td></tr>';
+
+    // Bank Account
+    if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
+    {
+    	$langs->load("bank");
+	    print '<tr><td>' . $langs->trans('BankAccount') . '</td><td colspan="2">';
+	    $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+	    print '</td></tr>';
+    }
+    
+	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
+	print '<td>';
+	$doleditor = new DolEditor('note_public', GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+	print $doleditor->Create(1);
+	print '</td>';
+	//print '<textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea>';
+	print '</tr>';
+
+	print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
+	print '<td>';
+	$doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+	print $doleditor->Create(1);
+	print '</td>';
+	//print '<td><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
+	print '</tr>';
+
+
+
+	// Other options
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+    {
+		print $object->showOptionals($extrafields,'edit');
+    }
+
+	// Bouton "Create Draft"
+    print "</table>\n";
+
+	print '<br><center><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'"></center>';
+
+	print "</form>\n";
+}
+elseif (! empty($object->id))
+{
+    $societe = new Fournisseur($db);
+    $result=$societe->fetch($object->socid);
+    if ($result < 0) dol_print_error($db);
+
+	$author	= new User($db);
+	$author->fetch($object->user_author_id);
+
+	$res=$object->fetch_optionals($object->id,$extralabels);
+
+	$head = ordersupplier_prepare_head($object);
+
+	$title=$langs->trans("SupplierOrder");
+	dol_fiche_head($head, 'card', $title, 0, 'order');
+
+
+	/*
+	 * Confirmation de la suppression de la commande
+	 */
+	if ($action	== 'delete')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
+
+	}
+
+	// Clone confirmation
+	if ($action == 'clone')
+	{
+		// Create an array for form
+		$formquestion=array(
+				//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1)
+		);
+		// Paiement incomplet. On demande si motif = escompte ou autre
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1);
+
+	}
+
+	/*
+	 * Confirmation de la validation
+	 */
+	if ($action	== 'valid')
+	{
+		$object->date_commande=dol_now();
+
+		// We check if number is temporary number
+		if (preg_match('/^[\(]?PROV/i',$object->ref)) $newref = $object->getNextNumRef($object->thirdparty);
+		else $newref = $object->ref;
+
+		$text=$langs->trans('ConfirmValidateOrder',$newref);
+		if (! empty($conf->notification->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+			$notify=new	Notify($db);
+			$text.='<br>';
+			$text.=$notify->confirmMessage('ORDER_SUPPLIER_APPROVE', $object->socid);
+		}
+
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
+
+	}
+
+	/*
+	 * Confirmation de l'approbation
+	 */
+	if ($action	== 'approve')
+	{
+        $qualified_for_stock_change=0;
+	    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+	    {
+	    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+	    }
+	    else
+	    {
+	    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+	    }
+
+		$formquestion=array();
+		if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)
+		{
+			$langs->load("stocks");
+			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+			$formproduct=new FormProduct($db);
+			$formquestion=array(
+					//'text' => $langs->trans("ConfirmClone"),
+					//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
+					//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
+					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockIncrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
+			);
+		}
+
+		print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", $formquestion, 1, 1, 240);
+
+	}
+
+	/*
+	 * Confirmation de la desapprobation
+	 */
+	if ($action	== 'refuse')
+	{
+		print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
+
+	}
+
+	/*
+	 * Confirmation de l'annulation
+	 */
+	if ($action	== 'cancel')
+	{
+		print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
+
+	}
+
+	/*
+	 * Confirmation de l'envoi de la commande
+	 */
+	if ($action	== 'commande')
+	{
+		$date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+		print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
+
+	}
+
+	/*
+	 * Confirmation de la suppression d'une ligne produit
+	 */
+	if ($action == 'delete_product_line')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
+
+	}
+
+	/*
+	 *	Commande
+	*/
+	$nbrow=8;
+	if (! empty($conf->projet->enabled))	$nbrow++;
+
+	//Local taxes
+	if($mysoc->localtax1_assuj=="1") $nbrow++;
+	if($mysoc->localtax2_assuj=="1") $nbrow++;
+
+	print '<table class="border" width="100%">';
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
+	print '<td colspan="2">';
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+	print '</td>';
+	print '</tr>';
+
+	// Ref supplier
+	print '<tr><td>';
+	print $form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->fournisseur->commande->creer);
+	print '</td><td colspan="2">';
+	print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->fournisseur->commande->creer);
+	print '</td></tr>';
+
+	// Fournisseur
+	print '<tr><td>'.$langs->trans("Supplier")."</td>";
+	print '<td colspan="2">'.$object->thirdparty->getNomUrl(1,'supplier').'</td>';
+	print '</tr>';
+
+	// Statut
+	print '<tr>';
+	print '<td>'.$langs->trans("Status").'</td>';
+	print '<td colspan="2">';
+	print $object->getLibStatut(4);
+	print "</td></tr>";
+
+	// Date
+	if ($object->methode_commande_id > 0)
+	{
+		print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">';
+		if ($object->date_commande)
+		{
+			print dol_print_date($object->date_commande,"dayhourtext")."\n";
+		}
+		print "</td></tr>";
+
+		if ($object->methode_commande)
+		{
+			print '<tr><td>'.$langs->trans("Method").'</td><td colspan="2">'.$object->getInputMethod().'</td></tr>';
+		}
+	}
+
+	// Author
+	print '<tr><td>'.$langs->trans("AuthorRequest").'</td>';
+	print '<td colspan="2">'.$author->getNomUrl(1).'</td>';
+	print '</tr>';
+
+	// Conditions de reglement par defaut
+	$langs->load('bills');
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('PaymentConditions');
+	print '<td>';
+	if ($action != 'editconditions') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	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');
+	}
+	print "</td>";
+	print '</tr>';
+
+	// Mode of payment
+	$langs->load('bills');
+	print '<tr><td class="nowrap">';
+	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	print $langs->trans('PaymentMode');
+	print '</td>';
+	if ($action != 'editmode') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editmode')
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+	}
+	else
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+	}
+	print '</td></tr>';
+
+    // Bank Account
+	if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled))
+	{
+	    print '<tr><td class="nowrap">';
+	    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	    print $langs->trans('BankAccount');
+	    print '<td>';
+	    if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer)
+	        print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+	    print '</tr></table>';
+	    print '</td><td colspan="3">';
+	    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 '</td>';
+	    print '</tr>';
+	}
+	
+	// Delivery date planed
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('DateDeliveryPlanned');
+	print '</td>';
+
+	if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editdate_livraison')
+	{
+		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="setdate_livraison">';
+		$form->select_date($object->date_livraison?$object->date_livraison:-1,'liv_','','','',"setdate_livraison");
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+		print $object->date_livraison ? dol_print_date($object->date_livraison,'daytext') : '&nbsp;';
+	}
+	print '</td></tr>';
+
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load('projects');
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Project');
+		print '</td>';
+		if ($action != 'classify') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		//print "$object->id, $object->socid, $object->fk_project";
+		if ($action == 'classify')
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
+		}
+		else
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Other attributes
+	$cols = 3;
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+	// Ligne de	3 colonnes
+	print '<tr><td>'.$langs->trans("AmountHT").'</td>';
+	print '<td align="right"><b>'.price($object->total_ht).'</b></td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+
+	print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($object->total_tva).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+
+	// Amount Local Taxes
+	if ($mysoc->localtax1_assuj=="1" || $object->total_localtax1 != 0) //Localtax1
+	{
+		print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
+		print '<td align="right">'.price($object->total_localtax1).'</td>';
+		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	}
+	if ($mysoc->localtax2_assuj=="1" || $object->total_localtax2 != 0) //Localtax2
+	{
+		print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
+		print '<td align="right">'.price($object->total_localtax2).'</td>';
+		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	}
+
+	print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($object->total_ttc).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+
+	print "</table><br>";
+
+	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+		$blocname = 'contacts';
+		$title = $langs->trans('ContactsAddresses');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+
+	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$blocname = 'notes';
+		$title = $langs->trans('Notes');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+
+	/*
+	 * Lines
+	 */
+
+
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?etat=1&id='.$object->id.(($action != 'edit_line')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+	<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+	<input type="hidden" name="action" value="'.(($action != 'edit_line')?'addline':'update_line').'">
+	<input type="hidden" name="mode" value="">
+	<input type="hidden" name="id" value="'.$object->id.'">
+    <input type="hidden" name="facid" value="'.$object->id.'">
+    <input type="hidden" name="socid" value="'.$societe->id.'">
+	';
+
+
+	print '<table id="tablelines" class="noborder noshadow" width="100%">';
+
+	$num = count($object->lines);
+	$i = 0;	$total = 0;
+
+	if ($num)
+	{
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans('Label').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
+		print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
+		print '<td width="48" colspan="3">&nbsp;</td>';
+		print "</tr>\n";
+	}
+	$var=true;
+	while ($i <	$num)
+	{
+		$line =	$object->lines[$i];
+		$var=!$var;
+
+		// Show product and description
+		$type=(! empty($line->product_type)?$line->product_type:(! empty($line->fk_product_type)?$line->fk_product_type:0));
+		// Try to enhance type detection using date_start and date_end for free lines where type
+		// was not saved.
+		$date_start='';
+		$date_end='';
+		if (! empty($line->date_start))
+		{
+			$date_start=$line->date_start;
+			$type=1;
+		}
+		if (! empty($line->date_end))
+		{
+			$date_end=$line->date_end;
+			$type=1;
+		}
+
+		// Edit line
+		if ($action != 'edit_line' || $_GET['rowid'] != $line->id)
+		{
+			print '<tr id="row-'.$line->id.'" '.$bc[$var].'>';
+
+			// Show product and description
+			print '<td>';
+			if ($line->fk_product > 0)
+			{
+				print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+
+				$product_static=new ProductFournisseur($db);
+				$product_static->fetch($line->fk_product);
+				$text=$product_static->getNomUrl(1,'supplier');
+				$text.= ' - '.$product_static->libelle;
+				$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
+				print $form->textwithtooltip($text,$description,3,'','',$i);
+
+				// Show range
+				print_date_range($date_start,$date_end);
+
+				// Add description in form
+				if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) print ($line->description && $line->description!=$product_static->libelle)?'<br>'.dol_htmlentitiesbr($line->description):'';
+			}
+
+			// Description - Editor wysiwyg
+			if (! $line->fk_product)
+			{
+				if ($type==1) $text = img_object($langs->trans('Service'),'service');
+				else $text = img_object($langs->trans('Product'),'product');
+				print $text.' '.nl2br($line->description);
+
+				// Show range
+				print_date_range($date_start,$date_end);
+			}
+
+			print '</td>';
+
+			print '<td align="right" class="nowrap">'.vatrate($line->tva_tx).'%</td>';
+
+			print '<td align="right" class="nowrap">'.price($line->subprice)."</td>\n";
+
+			print '<td align="right" class="nowrap">'.$line->qty.'</td>';
+
+			if ($line->remise_percent >	0)
+			{
+				print '<td align="right" class="nowrap">'.dol_print_reduction($line->remise_percent,$langs)."</td>\n";
+			}
+			else
+			{
+				print '<td>&nbsp;</td>';
+			}
+
+			print '<td align="right" class="nowrap">'.price($line->total_ht).'</td>';
+
+			if (is_object($hookmanager))
+			{
+				$parameters=array('line'=>$line,'num'=>$num,'i'=>$i);
+				$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
+			}
+
+			if ($object->statut == 0	&& $user->rights->fournisseur->commande->creer)
+			{
+				print '<td align="center" width="16"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;rowid='.$line->id.'#'.$line->id.'">';
+				print img_edit();
+				print '</a></td>';
+
+				$actiondelete='delete_product_line';
+				print '<td align="center" width="16"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$actiondelete.'&amp;lineid='.$line->id.'">';
+				print img_delete();
+				print '</a></td>';
+			}
+			else
+			{
+				print '<td>&nbsp;</td><td>&nbsp;</td>';
+			}
+			print "</tr>";
+		}
+
+		// Edit line
+		if ($action	== 'edit_line' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
+		{
+			print "\n";
+			print '<tr '.$bc[$var].'>';
+			print '<td>';
+
+			print '<input type="hidden" name="elrowid" value="'.$_GET['rowid'].'">';
+
+			print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+			if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $line->fk_product > 0)
+			{
+				$product_static=new ProductFournisseur($db);
+				$product_static->fetch($line->fk_product);
+				$text=$product_static->getNomUrl(1,'supplier');
+				$text.= ' - '.$product_static->libelle;
+				$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
+				print $form->textwithtooltip($text,$description,3,'','',$i);
+
+				// Show range
+				print_date_range($date_start,$date_end);
+				print '<br>';
+			}
+			else
+			{
+                $forceall=1;	// For suppliers, we always show all types
+                print $form->select_type_of_lines($line->product_type,'type',1,0,$forceall);
+                if ($forceall || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+                || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
+			}
+
+			if (is_object($hookmanager))
+			{
+				$parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i);
+				$reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
+			}
+
+			$nbrows=ROWS_2;
+			if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+			$doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+			$doleditor->Create();
+
+            print '<br>';
+            print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
+            print $form->select_date($date_start,'date_start'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'');
+            print ' '.$langs->trans('to').' ';
+            print $form->select_date($date_end,'date_end'.$date_pf,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,'');
+
+			print '</td>';
+			print '<td>';
+			print $form->load_tva('tva_tx',$line->tva_tx,$object->thirdparty,$mysoc);
+			print '</td>';
+			print '<td align="right"><input	size="5" type="text" name="pu"	value="'.price($line->subprice).'"></td>';
+			print '<td align="right"><input size="2" type="text" name="qty" value="'.$line->qty.'"></td>';
+			print '<td align="right" class="nowrap"><input size="1" type="text" name="remise_percent" value="'.$line->remise_percent.'"><span class="hideonsmartphone">%</span></td>';
+			print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
+			print '</tr>' .	"\n";
+		}
+		$i++;
+	}
+
+	// Form to add new line
+	if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action != 'edit_line')
+	{
+		// Add free products/services form
+		global $forceall, $senderissupplier, $dateSelector;
+		$forceall=1; $senderissupplier=1; $dateSelector=0;
+
+		$var = true;
+
+		// Add free products/services
+		$object->formAddObjectLine(1, $societe, $mysoc);
+
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	}
+	print '</table>';
+
+	print '</form>';
+
+	dol_fiche_end();
+
+
+	/*
+	 * Action presend
+	 */
+	if ($action == 'presend')
+	{
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
+		$file=$fileparams['fullname'];
+
+		// Define output language
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+			$newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			$newlang = $object->client->default_lang;
+
+		if (!empty($newlang))
+		{
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang($newlang);
+			$outputlangs->load('commercial');
+		}
+
+		// Build document if it not exists
+		if (! $file || ! is_readable($file))
+		{
+			$result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			if ($result <= 0)
+			{
+				dol_print_error($db,$result);
+				exit;
+			}
+			$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
+			$file=$fileparams['fullname'];
+		}
+
+		print '<br>';
+
+		print_titre($langs->trans('SendOrderByMail'));
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+		$formmail->fromtype = 'user';
+		$formmail->fromid   = $user->id;
+		$formmail->fromname = $user->getFullName($langs);
+		$formmail->frommail = $user->email;
+		$formmail->withfrom=1;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
+		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
+		$formmail->withtopic=$outputlangs->trans('SendOrderRef','__ORDERREF__');
+		$formmail->withfile=2;
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+		// Tableau des substitutions
+		$formmail->substit['__ORDERREF__']=$object->ref;
+		$formmail->substit['__SIGNATURE__']=$user->signature;
+		$formmail->substit['__PERSONALIZED__']='';
+		$formmail->substit['__CONTACTCIVNAME__']='';
+
+		//Find the good contact adress
+		$custcontact='';
+		$contactarr=array();
+		$contactarr=$object->liste_contact(-1,'external');
+
+		if (is_array($contactarr) && count($contactarr)>0) {
+			foreach($contactarr as $contact) {
+				if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
+					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+					$contactstatic=new Contact($db);
+					$contactstatic->fetch($contact['id']);
+					$custcontact=$contactstatic->getFullName($langs,1);
+				}
+			}
+
+			if (!empty($custcontact)) {
+				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+			}
+		}
+
+		// Tableau des parametres complementaires
+		$formmail->param['action']='send';
+		$formmail->param['models']='order_supplier_send';
+		$formmail->param['orderid']=$object->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+
+		// Init list of files
+		if (GETPOST("mode")=='init')
+		{
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+		}
+
+		// Show form
+		print $formmail->get_form();
+
+		print '<br>';
+	}
+	/*
+	 * Action webservice
+	 */
+	elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel'))
+	{
+		$mode        = GETPOST('mode', 'alpha');
+		$ws_url      = $object->thirdparty->webservices_url;
+		$ws_key      = $object->thirdparty->webservices_key;
+		$ws_user     = GETPOST('ws_user','alpha');
+		$ws_password = GETPOST('ws_password','alpha');
+        
+        // NS and Authentication parameters
+        $ws_ns = 'http://www.dolibarr.org/ns/';
+        $ws_authentication = array(
+            'dolibarrkey'=>$ws_key,
+            'sourceapplication'=>'DolibarrWebServiceClient',
+            'login'=>$ws_user,
+            'password'=>$ws_password,
+            'entity'=>''
+        );
+
+        print_titre($langs->trans('CreateRemoteOrder'));
+
+        //Is everything filled?
+        if (empty($ws_url) || empty($ws_key)) {
+            setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors');
+            $mode = "init";
+            $error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled
+        } else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) {
+            setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors'); 
+            $mode = "init";
+        }
+
+        if ($mode == "init") 
+        {
+            //Table/form header
+            print '<table class="border" width="100%">';
+            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="webservice">';
+            print '<input type="hidden" name="mode" value="check">';
+
+            if ($error_occurred)
+            {
+                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
+                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+            }
+            else
+            {
+                $textinput_size = "50";
+                // Webservice url
+                print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
+                //Remote User
+                print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
+                //Remote Password
+                print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
+                //Submit button
+                print '<tr><td align="center" colspan="2">';
+                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
+                print ' &nbsp; &nbsp; ';
+                //Cancel button
+                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+                print '</td></tr>';
+            }
+
+            //End table/form
+            print '</form>';
+            print '</table>';
+        }
+        elseif ($mode == "check")
+        {
+            $ws_entity = '';
+            $ws_thirdparty = '';
+            $error_occurred = false;
+
+            //Create SOAP client and connect it to user
+            $soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php");
+            $soapclient_user->soap_defencoding='UTF-8';
+            $soapclient_user->decodeUTF8(false);
+
+            //Get the thirdparty associated to user
+            $ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
+            $result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
+            $user_status_code = $result_user["result"]["result_code"];
+
+            if ($user_status_code == "OK")
+            {
+                //Fill the variables
+                $ws_entity = $result_user["user"]["entity"];
+                $ws_authentication['entity'] = $ws_entity;
+                $ws_thirdparty = $result_user["user"]["fk_thirdparty"];
+                if (empty($ws_thirdparty))
+                {
+                    setEventMessage($langs->trans("RemoteUserMissingAssociatedSoc"), 'errors');
+                    $error_occurred = true;
+                }
+                else
+                {
+                    //Create SOAP client and connect it to product/service
+                    $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
+                    $soapclient_product->soap_defencoding='UTF-8';
+                    $soapclient_product->decodeUTF8(false);
+
+                    // Iterate each line and get the reference that uses the supplier of that product/service
+                    $i = 0;
+                    foreach ($object->lines as $line) {
+                        $i = $i + 1;
+                        $ref_supplier = $line->ref_supplier;
+                        $line_id = $i."º) ".$line->product_ref.": ";
+                        if (empty($ref_supplier)) {
+                            continue;
+                        }
+                        $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
+                        $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
+                        if (!$result_product)
+                        {
+                            setEventMessage($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, 'errors');
+                            $error_occurred = true;
+                            break;
+                        }
+
+                        // Check the result code
+                        $status_code = $result_product["result"]["result_code"];
+                        if (empty($status_code)) //No result, check error str
+                        {
+                            setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors');
+                        }
+                        else if ($status_code != "OK") //Something went wrong
+                        {
+                            if ($status_code == "NOT_FOUND")
+                            {
+                                setEventMessage($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", 'warnings');
+                            }
+                            else
+                            {
+                                setEventMessage($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", 'errors');
+                                $error_occurred = true;
+                                break;
+                            }
+                        }
+
+                        
+                        // Ensure that price is equal and warn user if it's not
+                        $supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
+                        $local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
+
+                        $product_fourn = new ProductFournisseur($db);
+                        $product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
+                        if (count($product_fourn_list)>0)
+                        {
+                            foreach($product_fourn_list as $product_fourn_line)
+                            {
+                                //Only accept the line where the supplier is the same at this order and has the same ref
+                                if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
+                                    $local_price = price($product_fourn_line->fourn_price);
+                                }
+                            }
+                        }
+
+                        if ($local_price != NULL && $local_price != $supplier_price) {
+                            setEventMessage($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, 'warnings');
+                        }
+
+                        // Check if is in sale
+                        if (empty($result_product["product"]["status_tosell"])) {
+                            setEventMessage($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", 'warnings');
+                        }
+                    }
+                }
+
+            }
+            elseif ($user_status_code == "PERMISSION_DENIED")
+            {
+                setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors');
+                $error_occurred = true;
+            }
+            elseif ($user_status_code == "BAD_CREDENTIALS")
+            {
+                setEventMessage($langs->trans("RemoteUserBadCredentials"), 'errors');
+                $error_occurred = true;
+            }
+            else
+            {
+                setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors');
+                $error_occurred = true;
+            }
+
+            //Form
+            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="webservice">';
+            print '<input type="hidden" name="mode" value="send">';
+            print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
+            print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
+            print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
+            print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
+            if ($error_occurred)
+            {
+                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
+            }
+            else
+            {
+                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
+                print ' &nbsp; &nbsp; ';
+            }
+            print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+            print '</form>';
+        }
+	}
+	/*
+	 * Show buttons
+	 */
+	else
+	{
+		/**
+		 * Boutons actions
+		 */
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+		// modified by hook
+		if (empty($reshook))
+		{
+			if ($user->societe_id == 0 && $action != 'edit_line' && $action != 'delete')
+			{
+				print '<div	 class="tabsAction">';
+
+				// Validate
+				if ($object->statut == 0 && $num > 0)
+				{
+					if ($user->rights->fournisseur->commande->valider)
+					{
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+						print '>'.$langs->trans('Validate').'</a>';
+					}
+				}
+
+				// Modify
+				if ($object->statut == 1)
+				{
+					if ($user->rights->fournisseur->commande->commander)
+					{
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a>';
+					}
+				}
+
+				// Approve
+				if ($object->statut == 1)
+				{
+					if ($user->rights->fournisseur->commande->approuver)
+					{
+						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
+						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
+					}
+					else
+					{
+						print '<a class="butActionRefused" href="#">'.$langs->trans("ApproveOrder").'</a>';
+						print '<a class="butActionRefused" href="#">'.$langs->trans("RefuseOrder").'</a>';
+					}
+				}
+
+				// Send
+				if (in_array($object->statut, array(2, 3, 4, 5)))
+				{
+					if ($user->rights->fournisseur->commande->commander)
+					{
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+					}
+				}
+
+				// Reopen
+				if (in_array($object->statut, array(2, 5, 6, 7, 9)))
+				{
+					if ($user->rights->fournisseur->commande->commander)
+					{
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+					}
+				}
+
+				// Create bill
+				if (! empty($conf->fournisseur->enabled) && $object->statut >= 2)  // 2 means accepted
+				{
+					if ($user->rights->fournisseur->facture->creer)
+					{
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+					}
+
+					//if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
+					//{
+					//	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+					//}
+				}
+
+
+				// Create a remote order using WebService only if module is activated
+				if (! empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) // 2 means accepted
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=webservice&amp;mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
+				}
+
+				// Cancel
+				if ($object->statut == 2)
+				{
+					if ($user->rights->fournisseur->commande->commander)
+					{
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
+					}
+				}
+
+				// Clone
+				if ($user->rights->fournisseur->commande->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
+				}
+
+				// Delete
+				if ($user->rights->fournisseur->commande->supprimer)
+				{
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+				}
+
+				print "</div>";
+			}
+		}
+		print "<br>";
+
+
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+
+		/*
+		 * Documents generes
+		 */
+		$comfournref = dol_sanitizeFileName($object->ref);
+		$file =	$conf->fournisseur->dir_output . '/commande/' . $comfournref .	'/'	. $comfournref . '.pdf';
+		$relativepath =	$comfournref.'/'.$comfournref.'.pdf';
+		$filedir = $conf->fournisseur->dir_output	. '/commande/' .	$comfournref;
+		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed=$user->rights->fournisseur->commande->creer;
+		$delallowed=$user->rights->fournisseur->commande->supprimer;
+
+		print $formfile->showdocuments('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,0,0,'','','',$object->thirdparty->default_lang);
+		$somethingshown=$formfile->numoffiles;
+
+		/*
+		 * Linked object block
+		 */
+		$somethingshown=$object->showLinkedObjectBlock();
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+
+        // List of actions on element
+        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+        $formactions=new FormActions($db);
+        $somethingshown=$formactions->showactions($object,'order_supplier',$socid);
+
+
+		if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
+		{
+			/*
+			 * Commander (action=commande)
+			 */
+			print '<br>';
+			print '<form name="commande" action="card.php?id='.$object->id.'&amp;action=commande" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden"	name="action" value="commande">';
+			print '<table class="border" width="100%">';
+			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
+			print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
+			$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+			print $form->select_date($date_com,'','','','',"commande");
+			print '</td></tr>';
+
+			print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
+			$formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1);
+			print '</td></tr>';
+
+			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
+			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("ToOrder").'"></td></tr>';
+			print '</table>';
+			print '</form>';
+		}
+
+		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
+		{
+			/*
+			 * Receptionner (action=livraison)
+			 */
+			print '<br>';
+			print '<form action="card.php?id='.$object->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden"	name="action" value="livraison">';
+			print '<table class="border" width="100%">';
+			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
+			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
+			print $form->select_date('','','','','',"commande");
+			print "</td></tr>\n";
+
+			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
+			$liv = array();
+			$liv[''] = '&nbsp;';
+			$liv['tot']	= $langs->trans("TotalWoman");
+			$liv['par']	= $langs->trans("PartialWoman");
+			$liv['nev']	= $langs->trans("NeverReceived");
+			$liv['can']	= $langs->trans("Canceled");
+
+			print $form->selectarray("type",$liv);
+
+			print '</td></tr>';
+			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
+			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+			print "</table>\n";
+			print "</form>\n";
+		}
+
+		// List of actions on element
+		/* Hidden because" available into "Log" tab
+		print '<br>';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions=new FormActions($db);
+		$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
+		*/
+
+		print '</div></div></div>';
+	}
+
+	print '</td></tr></table>';
+}
+
+// End of page
+llxFooter();
+
+$db->close();
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 8311e8bfc9f..b8eabb9be6c 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -69,11 +69,11 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -126,7 +126,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
@@ -147,7 +146,7 @@ if ($id > 0 || ! empty($ref))
 		*/
 		print '<table class="border" width="100%">';
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 		// Ref
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 02666e1c855..bea467340e6 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -120,12 +120,9 @@ if ($_POST["action"] ==	'dispatch' && $user->rights->fournisseur->commande->rece
 	if (! $notrigger)
 	{
 		global $conf, $langs, $user;
-		// Appel des triggers
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($db);
-		$result_trigger=$interface->run_triggers('ORDER_SUPPLIER_DISPATCH',$commande,$user,$langs,$conf);
-		if ($result_trigger < 0) { $error++; $commande->errors=$interface->errors; }
-		// Fin appel triggers
+        // Call trigger
+        $result=$commande->call_trigger('ORDER_SUPPLIER_DISPATCH',$user);
+        // End call triggers
 	}
 
 	if ($result > 0)
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index a3681b8fc02..2949aedcf14 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -110,7 +110,7 @@ if ($object->id > 0)
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="35%">'.$langs->trans("Ref").'</td>';
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
deleted file mode 100644
index 00884d368f6..00000000000
--- a/htdocs/fourn/commande/fiche.php
+++ /dev/null
@@ -1,2087 +0,0 @@
-<?php
-/* Copyright (C) 2004-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Eric	Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2012      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
- */
-
-/**
- *	\file		htdocs/fourn/commande/fiche.php
- *	\ingroup	supplier, order
- *	\brief		Card supplier order
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->produit->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->projet->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-$langs->load('orders');
-$langs->load('sendings');
-$langs->load('companies');
-$langs->load('bills');
-$langs->load('propal');
-$langs->load('deliveries');
-$langs->load('products');
-$langs->load('stocks');
-
-$id 			= GETPOST('id','int');
-$ref 			= GETPOST('ref','alpha');
-$action 		= GETPOST('action','alpha');
-$confirm		= GETPOST('confirm','alpha');
-$comclientid 	= GETPOST('comid','int');
-$socid			= GETPOST('socid','int');
-$projectid		= GETPOST('projectid','int');
-
-//PDF
-$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
-
-
-// Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('ordersuppliercard'));
-
-$object = new CommandeFournisseur($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Load object
-if ($id > 0 || ! empty($ref))
-{
-	$ret = $object->fetch($id, $ref);
-	if ($ret < 0) dol_print_error($db,$object->error);
-	$ret = $object->fetch_thirdparty();
-	if ($ret < 0) dol_print_error($db,$object->error);
-}
-else if (! empty($socid) && $socid > 0)
-{
-	$fourn = new Fournisseur($db);
-	$ret=$fourn->fetch($socid);
-	if ($ret < 0) dol_print_error($db,$object->error);
-	$object->socid = $fourn->id;
-	$ret = $object->fetch_thirdparty();
-	if ($ret < 0) dol_print_error($db,$object->error);
-}
-
-$permissionnote=$user->rights->fournisseur->commande->creer;	// Used by the include of actions_setnotes.inc.php
-
-
-/*
- * Actions
- */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-
-if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
-{
-    $result=$object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
-    if ($result < 0) dol_print_error($db, $object->error);
-}
-
-// conditions de reglement
-if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
-{
-    $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
-}
-
-// mode de reglement
-else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
-{
-    $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
-}
-
-// date de livraison
-if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer)
-{
-	$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
-
-	$result=$object->set_date_livraison($user,$datelivraison);
-	if ($result < 0)
-	{
-		setEventMessage($object->error, 'errors');
-	}
-}
-
-// Set project
-else if ($action ==	'classin' && $user->rights->fournisseur->commande->creer)
-{
-    $object->setProject($projectid);
-}
-
-else if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer)
-{
-    $result = $object->set_remise($user, $_POST['remise_percent']);
-}
-
-else if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver)
-{
-    if (in_array($object->statut, array(1, 5, 6, 7, 9)))
-    {
-        if ($object->statut == 1) $newstatus=0;	// Validated->Draft
-    	else if ($object->statut == 5) $newstatus=4;	// Received->Received partially
-        else if ($object->statut == 6) $newstatus=2;	// Canceled->Approved
-        else if ($object->statut == 7) $newstatus=3;	// Canceled->Process running
-        else if ($object->statut == 9) $newstatus=1;	// Refused->Validated
-
-        $result = $object->setStatus($user, $newstatus);
-        if ($result > 0)
-        {
-            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-            exit;
-        }
-        else
-        {
-        	setEventMessage($object->error, 'errors');
-        }
-    }
-}
-
-/*
- *	Add a line into product
- */
-else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
-{
-    $langs->load('errors');
-    $error = 0;
-
-	// Set if we used free entry or predefined product
-	$predef='';
-	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
-	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 = '';
-	}
-
-	$qty = GETPOST('qty'.$predef);
-	$remise_percent=GETPOST('remise_percent'.$predef);
-
-    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht') < 0 && $qty < 0)
-    {
-        setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), 'errors');
-        $error++;
-    }
-    if (GETPOST('prod_entry_mode')=='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
-    {
-        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
-        $error++;
-    }
-    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
-    {
-        setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
-        $error++;
-    }
-    if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('dp_desc'))
-    {
-        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
-        $error++;
-    }
-    if (! GETPOST('qty'))
-    {
-        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
-        $error++;
-    }
-
-    // Ecrase $pu par celui	du produit
-    // Ecrase $desc	par	celui du produit
-    // Ecrase $txtva  par celui du produit
-    if ((GETPOST('prod_entry_mode') != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
-    {
-    	$idprod=0;
-    	$productsupplier = new ProductFournisseur($db);
-
-    	if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-2;	// Same behaviour than with combolist. When not select idprodfournprice is now -2 (to avoid conflict with next action that may return -1)
-
-    	if (GETPOST('idprodfournprice') > 0)
-    	{
-    		$idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), $qty);    // Just to see if a price exists for the quantity. Not used to found vat.
-    	}
-
-    	if ($idprod > 0)
-    	{
-    		$res=$productsupplier->fetch($idprod);
-
-    		$label = $productsupplier->libelle;
-
-    		$desc = $productsupplier->description;
-    		if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
-
-    		$tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
-    		$type = $productsupplier->type;
-
-    		// Local Taxes
-    		$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
-    		$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
-
-    		$result=$object->addline(
-    			$desc,
-    			$productsupplier->fourn_pu,
-    			$qty,
-    			$tva_tx,
-    			$localtax1_tx,
-    			$localtax2_tx,
-    			$productsupplier->id,
-    			GETPOST('idprodfournprice'),
-    			$productsupplier->fourn_ref,
-    			$remise_percent,
-    			'HT',
-    			$type
-    		);
-    	}
-    	if ($idprod == -2 || $idprod == 0)
-    	{
-    		// Product not selected
-    		$error++;
-    		$langs->load("errors");
-    		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")), 'errors');
-    	}
-    	if ($idprod == -1)
-    	{
-    		// Quantity too low
-    		$error++;
-    		$langs->load("errors");
-    		setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
-    	}
-    }
-    else if((GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='') && empty($error))
-	{
-		$pu_ht = price2num($price_ht, 'MU');
-		$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
-		$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
-		$tva_tx = str_replace('*', '', $tva_tx);
-		$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
-		$desc = $product_desc;
-		$type = GETPOST('type');
-
-    	$tva_tx = price2num($tva_tx);	// When vat is text input field
-
-    	// Local Taxes
-    	$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
-    	$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
-
-    	if (!empty($_POST['price_ht']))
-    	{
-    		$price_base_type = 'HT';
-    		$ht = price2num($_POST['price_ht']);
-    		$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, 0, $type);
-    	}
-    	else
-    	{
-    		$ttc = price2num($_POST['price_ttc']);
-    		$ht = $ttc / (1 + ($tauxtva / 100));
-    		$price_base_type = 'HT';
-    		$result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type);
-    	}
-	}
-
-    //print "xx".$tva_tx; exit;
-    if (! $error && $result > 0)
-    {
-    	$ret=$object->fetch($object->id);    // Reload to get new records
-
-    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-    	{
-    		// Define output language
-    		$outputlangs = $langs;
-    		$newlang=GETPOST('lang_id','alpha');
-    		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    		if (! empty($newlang))
-    		{
-    			$outputlangs = new Translate("",$conf);
-    			$outputlangs->setDefaultLang($newlang);
-    		}
-
-    		supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-    	}
-
-		unset($_POST ['prod_entry_mode']);
-
-    	unset($_POST['qty']);
-    	unset($_POST['type']);
-    	unset($_POST['remise_percent']);
-    	unset($_POST['pu']);
-    	unset($_POST['price_ht']);
-    	unset($_POST['price_ttc']);
-    	unset($_POST['tva_tx']);
-    	unset($_POST['label']);
-    	unset($localtax1_tx);
-    	unset($localtax2_tx);
-		unset($_POST['np_marginRate']);
-		unset($_POST['np_markRate']);
-    	unset($_POST['dp_desc']);
-		unset($_POST['idprodfournprice']);
-
-    	unset($_POST['date_starthour']);
-    	unset($_POST['date_startmin']);
-    	unset($_POST['date_startsec']);
-    	unset($_POST['date_startday']);
-    	unset($_POST['date_startmonth']);
-    	unset($_POST['date_startyear']);
-    	unset($_POST['date_endhour']);
-    	unset($_POST['date_endmin']);
-    	unset($_POST['date_endsec']);
-    	unset($_POST['date_endday']);
-    	unset($_POST['date_endmonth']);
-    	unset($_POST['date_endyear']);
-    }
-    else
-	{
-    	setEventMessage($object->error, 'errors');
-    }
-}
-
-/*
- *	Mise a jour	d'une ligne	dans la	commande
- */
-else if ($action == 'update_line' && $user->rights->fournisseur->commande->creer &&	! GETPOST('cancel'))
-{
-    if ($_POST["elrowid"])
-    {
-        $line = new CommandeFournisseurLigne($db);
-        $res = $line->fetch($_POST["elrowid"]);
-        if (!$res) dol_print_error($db);
-    }
-
-    $localtax1_tx=get_localtax($_POST['tva_tx'],1,$mysoc,$object->thirdparty);
-    $localtax2_tx=get_localtax($_POST['tva_tx'],2,$mysoc,$object->thirdparty);
-
-    $result	= $object->updateline(
-        $_POST['elrowid'],
-        $_POST['eldesc'],
-        $_POST['pu'],
-        $_POST['qty'],
-        $_POST['remise_percent'],
-        $_POST['tva_tx'],
-        $localtax1_tx,
-        $localtax2_tx,
-        'HT',
-        0,
-        isset($_POST["type"])?$_POST["type"]:$line->product_type
-    );
-    unset($_POST['qty']);
-    unset($_POST['type']);
-    unset($_POST['idprodfournprice']);
-    unset($_POST['remmise_percent']);
-    unset($_POST['dp_desc']);
-    unset($_POST['np_desc']);
-    unset($_POST['pu']);
-    unset($_POST['tva_tx']);
-    unset($localtax1_tx);
-    unset($localtax2_tx);
-    if ($result	>= 0)
-    {
-        $outputlangs = $langs;
-        if (GETPOST('lang_id'))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang(GETPOST('lang_id'));
-        }
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-        {
-            $ret=$object->fetch($object->id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        }
-    }
-    else
-    {
-        dol_print_error($db,$object->error);
-        exit;
-    }
-}
-
-else if ($action == 'confirm_deleteproductline' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
-{
-
-    $result = $object->deleteline(GETPOST('lineid'));
-    if ($result	>= 0)
-    {
-        $outputlangs = $langs;
-        if (GETPOST('lang_id'))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang(GETPOST('lang_id'));
-        }
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-        {
-            $ret=$object->fetch($object->id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        }
-    }
-    else
-    {
-        $error++;
-        setEventMessage($object->error, 'errors');
-    }
-
-    if (! $error)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-        exit;
-    }
-}
-
-else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fournisseur->commande->valider)
-{
-    $object->date_commande=dol_now();
-    $result = $object->valid($user);
-    if ($result	>= 0)
-    {
-        $outputlangs = $langs;
-        if (GETPOST('lang_id'))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang(GETPOST('lang_id'));
-        }
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-        {
-            $ret=$object->fetch($object->id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        }
-    }
-    else
-    {
-        setEventMessage($object->error, 'errors');
-    }
-
-    // If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
-    if ($user->rights->fournisseur->commande->approuver && ! (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)))
-    {
-        $action='confirm_approve';
-    }
-}
-
-else if ($action == 'confirm_approve' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
-{
-    $idwarehouse=GETPOST('idwarehouse', 'int');
-
-    $qualified_for_stock_change=0;
-	if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-	}
-	else
-	{
-	   	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-	}
-
-    // Check parameters
-    if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)
-    {
-        if (! $idwarehouse || $idwarehouse == -1)
-        {
-            $error++;
-            setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
-            $action='';
-        }
-    }
-
-    if (! $error)
-    {
-        $result	= $object->approve($user, $idwarehouse);
-        if ($result > 0)
-        {
-            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-                supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-            }
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-            exit;
-        }
-        else
-        {
-            setEventMessage($object->error, 'errors');
-        }
-    }
-}
-
-else if ($action == 'confirm_refuse' &&	$confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
-{
-    $result = $object->refuse($user);
-    if ($result > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-        exit;
-    }
-    else
-    {
-        setEventMessage($object->error, 'errors');
-    }
-}
-
-else if ($action == 'confirm_commande' && $confirm	== 'yes' &&	$user->rights->fournisseur->commande->commander)
-{
-    $result	= $object->commande($user, $_REQUEST["datecommande"],	$_REQUEST["methode"], $_REQUEST['comment']);
-    if ($result > 0)
-    {
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        }
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-        exit;
-    }
-    else
-    {
-        setEventMessage($object->error, 'errors');
-    }
-}
-
-
-else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->commande->supprimer)
-{
-    $result=$object->delete($user);
-    if ($result > 0)
-    {
-        header("Location: ".DOL_URL_ROOT.'/fourn/commande/liste.php');
-        exit;
-    }
-    else
-    {
-        setEventMessage($object->error, 'errors');
-    }
-}
-
-// Action clone object
-else if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
-{
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
-	{
-		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
-	}
-	else
-	{
-		if ($object->id > 0)
-		{
-			$result=$object->createFromClone();
-			if ($result > 0)
-			{
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-				exit;
-			}
-			else
-			{
-				setEventMessage($object->error, 'errors');
-				$action='';
-			}
-		}
-	}
-}
-
-// Receive
-else if ($action == 'livraison' && $user->rights->fournisseur->commande->receptionner)
-{
-
-    if ($_POST["type"])
-    {
-        $date_liv = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
-
-        $result	= $object->Livraison($user, $date_liv, $_POST["type"], $_POST["comment"]);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-            exit;
-        }
-        else if($result == -3)
-        {
-        	setEventMessage($langs->trans("NotAuthorized"), 'errors');
-        }
-        else
-        {
-            dol_print_error($db,$object->error);
-            exit;
-        }
-    }
-    else
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Delivery")).'</div>';
-    }
-}
-
-else if ($action == 'confirm_cancel' && $confirm == 'yes' &&	$user->rights->fournisseur->commande->commander)
-{
-    $result	= $object->cancel($user);
-    if ($result > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-        exit;
-    }
-    else
-    {
-        setEventMessage($object->error, 'errors');
-    }
-}
-
-// Line ordering
-else if ($action == 'up'	&& $user->rights->fournisseur->commande->creer)
-{
-    $object->line_up($_GET['rowid']);
-
-    $outputlangs = $langs;
-    if (! empty($_REQUEST['lang_id']))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($_REQUEST['lang_id']);
-    }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
-    exit;
-}
-else if ($action == 'down' && $user->rights->fournisseur->commande->creer)
-{
-    $object->line_down($_GET['rowid']);
-
-    $outputlangs = $langs;
-    if (! empty($_REQUEST['lang_id']))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($_REQUEST['lang_id']);
-    }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
-    exit;
-}
-
-else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer)	// En get ou en	post
-{
-    // Build document
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-    $outputlangs = $langs;
-    if (GETPOST('lang_id'))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang(GETPOST('lang_id'));
-    }
-    $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
-    if ($result	<= 0)
-    {
-        dol_print_error($db,$result);
-        exit;
-    }
-}
-
-// Delete file in doc form
-else if ($action == 'remove_file' && $object->id > 0 && $user->rights->fournisseur->commande->creer)
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    $langs->load("other");
-    $upload_dir =	$conf->fournisseur->commande->dir_output;
-    $file =	$upload_dir	. '/' .	GETPOST('file');
-    $ret=dol_delete_file($file,0,0,0,$object);
-    if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-    else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-}
-
-elseif ($action == 'update_extras')
-{
-	// Fill array 'array_options' with data from add form
-	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-	if($ret < 0) $error++;
-
-	if (!$error)
-	{
-		// Actions on extra fields (by external module or standard code)
-		// FIXME le hook fait double emploi avec le trigger !!
-		$hookmanager->initHooks(array('supplierorderdao'));
-		$parameters=array('id'=>$object->id);
-
-		$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$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=$object->insertExtraFields();
-
-				if ($result < 0)
-				{
-					$error++;
-				}
-
-			}
-		}
-		else if ($reshook < 0) $error++;
-	}
-	else
-	{
-		$action = 'edit_extras';
-	}
-}
-
-/*
- * Create an order
- */
-else if ($action == 'add' && $user->rights->fournisseur->commande->creer)
-{
- 	$error=0;
-
-    if ($socid <1)
-    {
-    	$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')).'</div>';
-    	$action='create';
-    	$error++;
-    }
-
-    if (! $error)
-    {
-        $db->begin();
-
-        // Creation commande
-        $object->ref_supplier  	= GETPOST('refsupplier');
-        $object->socid         	= $socid;
-		$object->cond_reglement_id = GETPOST('cond_reglement_id');
-        $object->mode_reglement_id = GETPOST('mode_reglement_id');
-        $object->note_private	= GETPOST('note_private');
-        $object->note_public   	= GETPOST('note_public');
-
-		// Fill array 'array_options' with data from add form
-        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-        $id = $object->create($user);
-		if ($id < 0)
-		{
-			$error++;
-		}
-
-        if ($error)
-        {
-            $langs->load("errors");
-            $db->rollback();
-            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-            $action='create';
-            $_GET['socid']=$_POST['socid'];
-        }
-        else
-		{
-            $db->commit();
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-            exit;
-        }
-    }
-}
-
-/*
- * Add file in email form
- */
-if (GETPOST('addfile'))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    // Set tmp user directory TODO Use a dedicated directory for temp mails files
-    $vardir=$conf->user->dir_output."/".$user->id;
-    $upload_dir_tmp = $vardir.'/temp';
-
-    dol_add_file_process($upload_dir_tmp,0,0);
-    $action='presend';
-}
-
-/*
- * Remove file in email form
- */
-if (GETPOST('removedfile'))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    // Set tmp user directory
-    $vardir=$conf->user->dir_output."/".$user->id;
-    $upload_dir_tmp = $vardir.'/temp';
-
-	// TODO Delete only files that was uploaded from email form
-    dol_remove_file_process($_POST['removedfile'],0);
-    $action='presend';
-}
-
-/*
- * Send mail
- */
-if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel'))
-{
-    $langs->load('mails');
-
-    if ($object->id > 0)
-    {
-//        $ref = dol_sanitizeFileName($object->ref);
-//        $file = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-
-//        if (is_readable($file))
-//        {
-            if (GETPOST('sendto','alpha'))
-            {
-                // Le destinataire a ete fourni via le champ libre
-                $sendto = GETPOST('sendto','alpha');
-                $sendtoid = 0;
-            }
-            elseif (GETPOST('receiver','alpha') != '-1')
-            {
-                // Recipient was provided from combo list
-                if (GETPOST('receiver','alpha') == 'thirdparty') // Id of third party
-                {
-                    $sendto = $object->client->email;
-                    $sendtoid = 0;
-                }
-                else	// Id du contact
-                {
-                    $sendto = $object->client->contact_get_property(GETPOST('receiver','alpha'),'email');
-                    $sendtoid = GETPOST('receiver','alpha');
-                }
-            }
-
-            if (dol_strlen($sendto))
-            {
-                $langs->load("commercial");
-
-                $from = GETPOST('fromname','alpha') . ' <' . GETPOST('frommail','alpha') .'>';
-                $replyto = GETPOST('replytoname','alpha'). ' <' . GETPOST('replytomail','alpha').'>';
-                $message = GETPOST('message');
-                $sendtocc = GETPOST('sendtocc','alpha');
-                $deliveryreceipt = GETPOST('deliveryreceipt','alpha');
-
-                if ($action == 'send')
-                {
-                    if (dol_strlen(GETPOST('subject'))) $subject=GETPOST('subject');
-                    else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
-                    $actiontypecode='AC_SUP_ORD';
-                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
-                    if ($message)
-                    {
-                        $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-                        $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-                        $actionmsg.=$message;
-                    }
-                    $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-                }
-
-                // Create form object
-                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-                $formmail = new FormMail($db);
-
-                $attachedfiles=$formmail->get_attached_files();
-                $filepath = $attachedfiles['paths'];
-                $filename = $attachedfiles['names'];
-                $mimetype = $attachedfiles['mimes'];
-
-                // Send mail
-                require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
-                if ($mailfile->error)
-                {
-                	setEventMessage($mailfile->error, 'errors');
-                }
-                else
-                {
-                    $result=$mailfile->sendfile();
-                    if ($result)
-                    {
-                    	$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));		// Must not contain "
-                    	setEventMessage($mesg);
-
-                        $error=0;
-
-                        // Initialisation donnees
-                        $object->sendtoid		= $sendtoid;
-                        $object->actiontypecode	= $actiontypecode;
-                        $object->actionmsg 		= $actionmsg;
-                        $object->actionmsg2		= $actionmsg2;
-                        $object->fk_element		= $object->id;
-                        $object->elementtype	= $object->element;
-
-                        // Appel des triggers
-                        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                        $interface=new Interfaces($db);
-                        $result=$interface->run_triggers('ORDER_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
-                        if ($result < 0) { $error++; $errors=$interface->errors; }
-                        // Fin appel triggers
-
-                        if ($error)
-                        {
-                            setEventMessage($object->error, 'errors');
-                        }
-                        else
-                        {
-                            // Redirect here
-                            // This avoid sending mail twice if going out and then back to page
-                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                            exit;
-                        }
-                    }
-                    else
-                    {
-                        $langs->load("other");
-                        if ($mailfile->error)
-                        {
-                            $mesg = $langs->trans('ErrorFailedToSendMail',$from,$sendto);
-                            $mesg.= '<br>'.$mailfile->error;
-                        }
-                        else
-                        {
-                            $mesg = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-                        }
-
-                        setEventMessage($mesg, 'errors');
-                    }
-                }
-/*            }
-            else
-            {
-                $langs->load("other");
-                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
-                $action='presend';
-                dol_syslog('Recipient email is empty');
-            }*/
-        }
-        else
-        {
-            $langs->load("errors");
-            setEventMessage($langs->trans('ErrorCantReadFile',$file), 'errors');
-            dol_syslog('Failed to read file: '.$file);
-        }
-    }
-    else
-    {
-        $langs->load("other");
-        setEventMessage($langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")), 'errors');
-        dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
-    }
-}
-
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer)
-{
-	if ($action == 'addcontact')
-	{
-		if ($object->id > 0)
-		{
-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-		}
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
-				$langs->load("errors");
-				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
-			}
-			else
-			{
-				setEventMessage($object->error, 'errors');
-			}
-		}
-	}
-
-	// bascule du statut d'un contact
-	else if ($action == 'swapstatut' && $object->id > 0)
-	{
-		$result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-
-	// Efface un contact
-	else if ($action == 'deletecontact' && $object->id > 0)
-	{
-		$result = $object->delete_contact($_GET["lineid"]);
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else {
-			dol_print_error($db);
-		}
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
-
-$form =	new	Form($db);
-$formfile = new FormFile($db);
-$formorder = new FormOrder($db);
-$productstatic = new Product($db);
-
-
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-
-$now=dol_now();
-if ($action=="create")
-{
-	print_fiche_titre($langs->trans('NewOrder'));
-
-	dol_htmloutput_mesg($mesg);
-	dol_htmloutput_events();
-
-	$societe='';
-	if ($socid>0)
-	{
-		$societe=new Societe($db);
-		$societe->fetch($socid);
-	}
-
-	$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
-	$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
-
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<table class="border" width="100%">';
-
-	// Ref
-	print '<tr><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
-
-	// Third party
-	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
-	print '<td>';
-
-	if ($socid > 0)
-	{
-		print $societe->getNomUrl(1);
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-	}
-	else
-	{
-		print $form->select_company((empty($socid)?'':$socid),'socid','s.fournisseur = 1',1);
-	}
-	print '</td>';
-
-	// Ref supplier
-	print '<tr><td>'.$langs->trans('RefSupplier').'</td><td><input name="refsupplier" type="text"></td>';
-	print '</tr>';
-
-	print '</td></tr>';
-
-	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
-	$form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
-	print '</td></tr>';
-
-	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
-	$form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
-	print '<td>';
-	$doleditor = new DolEditor('note_public', GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-	print $doleditor->Create(1);
-	print '</td>';
-	//print '<textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea>';
-	print '</tr>';
-
-	print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
-	print '<td>';
-	$doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-	print $doleditor->Create(1);
-	print '</td>';
-	//print '<td><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
-	print '</tr>';
-
-
-
-	// Other options
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-    {
-		print $object->showOptionals($extrafields,'edit');
-    }
-
-	// Bouton "Create Draft"
-    print "</table>\n";
-
-	print '<br><center><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'"></center>';
-
-	print "</form>\n";
-}
-elseif (! empty($object->id))
-{
-	$author	= new User($db);
-	$author->fetch($object->user_author_id);
-
-    $societe = new Fournisseur($db);
-    $result=$societe->fetch($object->socid);
-    if ($result < 0) dol_print_error($db);
-
-	$head = ordersupplier_prepare_head($object);
-
-	$title=$langs->trans("SupplierOrder");
-	dol_fiche_head($head, 'card', $title, 0, 'order');
-
-	$res=$object->fetch_optionals($object->id,$extralabels);
-
-	/*
-	 * Confirmation de la suppression de la commande
-	 */
-	if ($action	== 'delete')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
-
-	}
-
-	// Clone confirmation
-	if ($action == 'clone')
-	{
-		// Create an array for form
-		$formquestion=array(
-				//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1)
-		);
-		// Paiement incomplet. On demande si motif = escompte ou autre
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1);
-
-	}
-
-	/*
-	 * Confirmation de la validation
-	 */
-	if ($action	== 'valid')
-	{
-		$object->date_commande=dol_now();
-
-		// We check if number is temporary number
-		if (preg_match('/^[\(]?PROV/i',$object->ref)) $newref = $object->getNextNumRef($object->thirdparty);
-		else $newref = $object->ref;
-
-		$text=$langs->trans('ConfirmValidateOrder',$newref);
-		if (! empty($conf->notification->enabled))
-		{
-			require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-			$notify=new	Notify($db);
-			$text.='<br>';
-			$text.=$notify->confirmMessage('ORDER_SUPPLIER_APPROVE', $object->socid);
-		}
-
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
-
-	}
-
-	/*
-	 * Confirmation de l'approbation
-	 */
-	if ($action	== 'approve')
-	{
-        $qualified_for_stock_change=0;
-	    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	    {
-	    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-	    }
-	    else
-	    {
-	    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-	    }
-
-		$formquestion=array();
-		if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)
-		{
-			$langs->load("stocks");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$formproduct=new FormProduct($db);
-			$formquestion=array(
-					//'text' => $langs->trans("ConfirmClone"),
-					//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
-					//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
-					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockIncrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
-			);
-		}
-
-		print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", $formquestion, 1, 1, 240);
-
-	}
-
-	/*
-	 * Confirmation de la desapprobation
-	 */
-	if ($action	== 'refuse')
-	{
-		print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
-
-	}
-
-	/*
-	 * Confirmation de l'annulation
-	 */
-	if ($action	== 'cancel')
-	{
-		print $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
-
-	}
-
-	/*
-	 * Confirmation de l'envoi de la commande
-	 */
-	if ($action	== 'commande')
-	{
-		$date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
-		print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
-
-	}
-
-	/*
-	 * Confirmation de la suppression d'une ligne produit
-	 */
-	if ($action == 'delete_product_line')
-	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
-
-	}
-
-	/*
-	 *	Commande
-	*/
-	$nbrow=8;
-	if (! empty($conf->projet->enabled))	$nbrow++;
-
-	//Local taxes
-	//TODO: Place into a function to control showing by country or study better option
-	if ($mysoc->country_code=='ES')
-	{
-		if($mysoc->localtax1_assuj=="1") $nbrow++;
-		if($object->thirdparty->localtax2_assuj=="1") $nbrow++;
-	}
-	else
-	{
-		if($mysoc->localtax1_assuj=="1") $nbrow++;
-		if($mysoc->localtax2_assuj=="1") $nbrow++;
-	}
-	print '<table class="border" width="100%">';
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-	// Ref
-	print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="2">';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-	print '</td>';
-	print '</tr>';
-
-	// Ref supplier
-	print '<tr><td>';
-	print $form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->fournisseur->commande->creer);
-	print '</td><td colspan="2">';
-	print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,$user->rights->fournisseur->commande->creer);
-	print '</td></tr>';
-
-	// Fournisseur
-	print '<tr><td>'.$langs->trans("Supplier")."</td>";
-	print '<td colspan="2">'.$object->thirdparty->getNomUrl(1,'supplier').'</td>';
-	print '</tr>';
-
-	// Statut
-	print '<tr>';
-	print '<td>'.$langs->trans("Status").'</td>';
-	print '<td colspan="2">';
-	print $object->getLibStatut(4);
-	print "</td></tr>";
-
-	// Date
-	if ($object->methode_commande_id > 0)
-	{
-		print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">';
-		if ($object->date_commande)
-		{
-			print dol_print_date($object->date_commande,"dayhourtext")."\n";
-		}
-		print "</td></tr>";
-
-		if ($object->methode_commande)
-		{
-			print '<tr><td>'.$langs->trans("Method").'</td><td colspan="2">'.$object->getInputMethod().'</td></tr>';
-		}
-	}
-
-	// Author
-	print '<tr><td>'.$langs->trans("AuthorRequest").'</td>';
-	print '<td colspan="2">'.$author->getNomUrl(1).'</td>';
-	print '</tr>';
-
-	// Conditions de reglement par defaut
-	$langs->load('bills');
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	print $langs->trans('PaymentConditions');
-	print '<td>';
-	if ($action != 'editconditions') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="2">';
-	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');
-	}
-	print "</td>";
-	print '</tr>';
-
-	// Mode of payment
-	$langs->load('bills');
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	print $langs->trans('PaymentMode');
-	print '</td>';
-	if ($action != 'editmode') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="2">';
-	if ($action == 'editmode')
-	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
-	}
-	else
-	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
-	}
-	print '</td></tr>';
-
-	// Delivery date planed
-	print '<tr><td height="10">';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('DateDeliveryPlanned');
-	print '</td>';
-
-	if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="2">';
-	if ($action == 'editdate_livraison')
-	{
-		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="setdate_livraison">';
-		$form->select_date($object->date_livraison?$object->date_livraison:-1,'liv_','','','',"setdate_livraison");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-		print '</form>';
-	}
-	else
-	{
-		print $object->date_livraison ? dol_print_date($object->date_livraison,'daytext') : '&nbsp;';
-	}
-	print '</td>';
-
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load('projects');
-		print '<tr><td height="10">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Project');
-		print '</td>';
-		if ($action != 'classify') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		//print "$object->id, $object->socid, $object->fk_project";
-		if ($action == 'classify')
-		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
-		}
-		else
-		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
-		}
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Other attributes
-	$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	if (empty($reshook) && ! empty($extrafields->attribute_label))
-	{
-		if ($action == 'edit_extras')
-		{
-			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">';
-			print '<input type="hidden" name="action" value="update_extras">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-		}
-
-		foreach($extrafields->attribute_label as $key=>$label)
-		{
-			if ($action == 'edit_extras') {
-				$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
-			} else {
-				$value=$object->array_options["options_".$key];
-			}
-
-			if ($extrafields->attribute_type[$key] == 'separate')
-			{
-				print $extrafields->showSeparator($key);
-			}
-			else
-			{
-				print '<tr><td';
-				if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-				print '>'.$label.'</td><td colspan="5">';
-				// 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 ($action == 'edit_extras' && $user->rights->fournisseur->commande->creer)
-				{
-		  			print $extrafields->showInputField($key,$value);
-				}
-				else
-				{
-		  			print $extrafields->showOutputField($key,$value);
-				}
-
-				print '</td></tr>'."\n";
-		  	}
-		}
-
-		if(count($extrafields->attribute_label) > 0)
-		{
-			if ($action == 'edit_extras' && $user->rights->fournisseur->commande->creer)
-			{
-				print '<tr><td></td><td colspan="5">';
-				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-				print '</form>';
-				print '</td></tr>';
-			}
-			else
-			{
-				if ($object->statut == 0 && $user->rights->fournisseur->commande->creer)
-				{
-					print '<tr><td></td><td><a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit_extras">'.img_picto('','edit').' '.$langs->trans('Modify').'</a></td></tr>';
-				}
-			}
-		}
-	}
-
-	// Ligne de	3 colonnes
-	print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-	print '<td align="right"><b>'.price($object->total_ht).'</b></td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-
-	print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($object->total_tva).'</td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-
-	// Amount Local Taxes
-	//TODO: Place into a function to control showing by country or study better option
-	if ($mysoc->country_code=='ES')
-	{
-		if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-		{
-			print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-			print '<td align="right">'.price($object->total_localtax1).'</td>';
-			print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-		}
-		if ($object->thirdparty->localtax2_assuj=="1") //Localtax2 IRPF
-		{
-			print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-			print '<td align="right">'.price($object->total_localtax2).'</td>';
-			print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-		}
-	}
-	else
-	{
-		if ($mysoc->localtax1_assuj=="1") //Localtax1
-		{
-			print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-			print '<td align="right">'.price($object->total_localtax1).'</td>';
-			print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-		}
-		if ($mysoc->localtax2_assuj=="1") //Localtax2
-		{
-			print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-			print '<td align="right">'.price($object->total_localtax2).'</td>';
-			print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-		}
-	}
-	print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($object->total_ttc).'</td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-
-	print "</table><br>";
-
-	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-		$blocname = 'contacts';
-		$title = $langs->trans('ContactsAddresses');
-		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-	}
-
-	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$blocname = 'notes';
-		$title = $langs->trans('Notes');
-		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-	}
-
-	/*
-	 * Lines
-	 */
-
-
-	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?etat=1&id='.$object->id.(($action != 'edit_line')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
-	<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
-	<input type="hidden" name="action" value="'.(($action != 'edit_line')?'addline':'update_line').'">
-	<input type="hidden" name="mode" value="">
-	<input type="hidden" name="id" value="'.$object->id.'">
-    <input type="hidden" name="facid" value="'.$object->id.'">
-    <input type="hidden" name="socid" value="'.$societe->id.'">
-	';
-
-
-	print '<table id="tablelines" class="noborder noshadow" width="100%">';
-
-	$num = count($object->lines);
-	$i = 0;	$total = 0;
-
-	if ($num)
-	{
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Label').'</td>';
-		print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
-		print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
-		print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
-		print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
-		print '<td align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
-		print '<td width="48" colspan="3">&nbsp;</td>';
-		print "</tr>\n";
-	}
-	$var=true;
-	while ($i <	$num)
-	{
-		$line =	$object->lines[$i];
-		$var=!$var;
-
-		// Show product and description
-		$type=(! empty($line->product_type)?$line->product_type:(! empty($line->fk_product_type)?$line->fk_product_type:0));
-		// Try to enhance type detection using date_start and date_end for free lines where type
-		// was not saved.
-		$date_start='';
-		$date_end='';
-		if (! empty($line->date_start))
-		{
-			$date_start=$line->date_start;
-			$type=1;
-		}
-		if (! empty($line->date_end))
-		{
-			$date_end=$line->date_end;
-			$type=1;
-		}
-
-		// Edit line
-		if ($action != 'edit_line' || $_GET['rowid'] != $line->id)
-		{
-			print '<tr id="row-'.$line->id.'" '.$bc[$var].'>';
-
-			// Show product and description
-			print '<td>';
-			if ($line->fk_product > 0)
-			{
-				print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
-
-				$product_static=new ProductFournisseur($db);
-				$product_static->fetch($line->fk_product);
-				$text=$product_static->getNomUrl(1,'supplier');
-				$text.= ' - '.$product_static->libelle;
-				$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-
-				// Show range
-				print_date_range($date_start,$date_end);
-
-				// Add description in form
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) print ($line->description && $line->description!=$product_static->libelle)?'<br>'.dol_htmlentitiesbr($line->description):'';
-			}
-
-			// Description - Editor wysiwyg
-			if (! $line->fk_product)
-			{
-				if ($type==1) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
-				print $text.' '.nl2br($line->description);
-
-				// Show range
-				print_date_range($date_start,$date_end);
-			}
-
-			print '</td>';
-
-			print '<td align="right" class="nowrap">'.vatrate($line->tva_tx).'%</td>';
-
-			print '<td align="right" class="nowrap">'.price($line->subprice)."</td>\n";
-
-			print '<td align="right" class="nowrap">'.$line->qty.'</td>';
-
-			if ($line->remise_percent >	0)
-			{
-				print '<td align="right" class="nowrap">'.dol_print_reduction($line->remise_percent,$langs)."</td>\n";
-			}
-			else
-			{
-				print '<td>&nbsp;</td>';
-			}
-
-			print '<td align="right" class="nowrap">'.price($line->total_ht).'</td>';
-
-			if (is_object($hookmanager))
-			{
-				$parameters=array('line'=>$line,'num'=>$num,'i'=>$i);
-				$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
-			}
-
-			if ($object->statut == 0	&& $user->rights->fournisseur->commande->creer)
-			{
-				print '<td align="center" width="16"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;rowid='.$line->id.'#'.$line->id.'">';
-				print img_edit();
-				print '</a></td>';
-
-				$actiondelete='delete_product_line';
-				print '<td align="center" width="16"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$actiondelete.'&amp;lineid='.$line->id.'">';
-				print img_delete();
-				print '</a></td>';
-			}
-			else
-			{
-				print '<td>&nbsp;</td><td>&nbsp;</td>';
-			}
-			print "</tr>";
-		}
-
-		// Edit line
-		if ($action	== 'edit_line' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
-		{
-			print "\n";
-			print '<tr '.$bc[$var].'>';
-			print '<td>';
-
-			print '<input type="hidden" name="elrowid" value="'.$_GET['rowid'].'">';
-
-			print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
-			if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $line->fk_product > 0)
-			{
-				$product_static=new ProductFournisseur($db);
-				$product_static->fetch($line->fk_product);
-				$text=$product_static->getNomUrl(1,'supplier');
-				$text.= ' - '.$product_static->libelle;
-				$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
-				print $form->textwithtooltip($text,$description,3,'','',$i);
-
-				// Show range
-				print_date_range($date_start,$date_end);
-				print '<br>';
-			}
-			else
-			{
-                $forceall=1;	// For suppliers, we always show all types
-                print $form->select_type_of_lines($line->product_type,'type',1,0,$forceall);
-                if ($forceall || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
-                || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
-			}
-
-			if (is_object($hookmanager))
-			{
-				$parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i);
-				$reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
-			}
-
-			$nbrows=ROWS_2;
-			if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-			$doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
-			$doleditor->Create();
-
-			print '</td>';
-			print '<td>';
-			print $form->load_tva('tva_tx',$line->tva_tx,$object->thirdparty,$mysoc);
-			print '</td>';
-			print '<td align="right"><input	size="5" type="text" name="pu"	value="'.price($line->subprice).'"></td>';
-			print '<td align="right"><input size="2" type="text" name="qty" value="'.$line->qty.'"></td>';
-			print '<td align="right" class="nowrap"><input size="1" type="text" name="remise_percent" value="'.$line->remise_percent.'"><span class="hideonsmartphone">%</span></td>';
-			print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-			print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
-			print '</tr>' .	"\n";
-		}
-		$i++;
-	}
-
-	// Form to add new line
-	if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action != 'edit_line')
-	{
-		// Add free products/services form
-		global $forceall, $senderissupplier, $dateSelector;
-		$forceall=1; $senderissupplier=1; $dateSelector=0;
-
-		$var = true;
-
-		// Add free products/services
-		$object->formAddObjectLine(1, $societe, $mysoc);
-
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-
-	}
-	print '</table>';
-
-	print '</form>';
-
-	dol_fiche_end();
-
-
-	if ($action != 'presend')
-	{
-		/**
-		 * Boutons actions
-		 */
-		if ($user->societe_id == 0 && $action != 'edit_line' && $action != 'delete')
-		{
-			print '<div	 class="tabsAction">';
-
-			// Validate
-			if ($object->statut == 0 && $num > 0)
-			{
-				if ($user->rights->fournisseur->commande->valider)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
-					print '>'.$langs->trans('Validate').'</a>';
-				}
-			}
-
-			// Modify
-			if ($object->statut == 1)
-			{
-				if ($user->rights->fournisseur->commande->commander)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a>';
-				}
-			}
-
-			// Approve
-			if ($object->statut == 1)
-			{
-				if ($user->rights->fournisseur->commande->approuver)
-				{
-					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
-					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
-				}
-				else
-				{
-					print '<a class="butActionRefused" href="#">'.$langs->trans("ApproveOrder").'</a>';
-					print '<a class="butActionRefused" href="#">'.$langs->trans("RefuseOrder").'</a>';
-				}
-			}
-
-			// Send
-			if (in_array($object->statut, array(2, 3, 4, 5)))
-			{
-				if ($user->rights->fournisseur->commande->commander)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
-				}
-			}
-
-			// Reopen
-			if (in_array($object->statut, array(5, 6, 7, 9)))
-			{
-				if ($user->rights->fournisseur->commande->commander)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-				}
-			}
-
-			// Create bill
-			if (! empty($conf->fournisseur->enabled) && $object->statut >= 2)  // 2 means accepted
-			{
-				if ($user->rights->fournisseur->facture->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
-				}
-
-				//if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
-				//{
-				//	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
-				//}
-			}
-
-			// Cancel
-			if ($object->statut == 2)
-			{
-				if ($user->rights->fournisseur->commande->commander)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
-				}
-			}
-
-			// Clone
-			if ($user->rights->fournisseur->commande->creer)
-			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
-			}
-
-			// Delete
-			if ($user->rights->fournisseur->commande->supprimer)
-			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-			}
-
-			print "</div>";
-		}
-		print "<br>";
-
-
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-
-		/*
-		 * Documents generes
-		 */
-		$comfournref = dol_sanitizeFileName($object->ref);
-		$file =	$conf->fournisseur->dir_output . '/commande/' . $comfournref .	'/'	. $comfournref . '.pdf';
-		$relativepath =	$comfournref.'/'.$comfournref.'.pdf';
-		$filedir = $conf->fournisseur->dir_output	. '/commande/' .	$comfournref;
-		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed=$user->rights->fournisseur->commande->creer;
-		$delallowed=$user->rights->fournisseur->commande->supprimer;
-
-		print $formfile->showdocuments('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,0,0,'','','',$object->thirdparty->default_lang);
-		$somethingshown=$formfile->numoffiles;
-
-		/*
-		 * Linked object block
-		 */
-		$somethingshown=$object->showLinkedObjectBlock();
-
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-        // List of actions on element
-        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-        $formactions=new FormActions($db);
-        $somethingshown=$formactions->showactions($object,'order_supplier',$socid);
-
-
-		if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
-		{
-			/*
-			 * Commander (action=commande)
-			 */
-			print '<br>';
-			print '<form name="commande" action="fiche.php?id='.$object->id.'&amp;action=commande" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden"	name="action" value="commande">';
-			print '<table class="border" width="100%">';
-			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
-			print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
-			$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-			print $form->select_date($date_com,'','','','',"commande");
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
-			$formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1);
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
-			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("ToOrder").'"></td></tr>';
-			print '</table>';
-			print '</form>';
-		}
-
-		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
-		{
-			/*
-			 * Receptionner (action=livraison)
-			 */
-			print '<br>';
-			print '<form action="fiche.php?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden"	name="action" value="livraison">';
-			print '<table class="border" width="100%">';
-			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
-			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-			print $form->select_date('','','','','',"commande");
-			print "</td></tr>\n";
-
-			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
-			$liv = array();
-			$liv[''] = '&nbsp;';
-			$liv['tot']	= $langs->trans("TotalWoman");
-			$liv['par']	= $langs->trans("PartialWoman");
-			$liv['nev']	= $langs->trans("NeverReceived");
-			$liv['can']	= $langs->trans("Canceled");
-
-			print $form->selectarray("type",$liv);
-
-			print '</td></tr>';
-			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
-			print "</table>\n";
-			print "</form>\n";
-		}
-
-		// List of actions on element
-		/* Hidden because" available into "Log" tab
-		print '<br>';
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-		$formactions=new FormActions($db);
-		$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
-		*/
-
-		print '</div></div></div>';
-	}
-
-	/*
-	 * Action presend
-	 */
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
-		$file=$fileparams['fullname'];
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			// Define output language
-			$outputlangs = $langs;
-			$newlang='';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-			if (! empty($newlang))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($newlang);
-			}
-
-			$result=supplier_order_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
-			$file=$fileparams['fullname'];
-		}
-
-		print '<br>';
-
-		print_titre($langs->trans('SendOrderByMail'));
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->fromtype = 'user';
-		$formmail->fromid   = $user->id;
-		$formmail->fromname = $user->getFullName($langs);
-		$formmail->frommail = $user->email;
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-		$formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-		// Tableau des substitutions
-		$formmail->substit['__ORDERREF__']=$object->ref;
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='order_supplier_send';
-		$formmail->param['orderid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		print '<br>';
-	}
-
-	print '</td></tr></table>';
-}
-
-// End of page
-llxFooter();
-
-$db->close();
diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php
index e53b3974cf4..c864dce3b88 100644
--- a/htdocs/fourn/commande/history.php
+++ b/htdocs/fourn/commande/history.php
@@ -76,7 +76,7 @@ if ($id > 0 || ! empty($ref))
 
 		print '<table class="border" width="100%">';
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 		// Ref
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
@@ -160,7 +160,7 @@ if ($id > 0 || ! empty($ref))
 				print '<td class="nowrap">'.$commande->LibStatut($obj->fk_statut,4)."</td>\n";
 
 				// User
-				print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">';
+				print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
 				print img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>';
 
 				// Comment
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 85557877d76..0f04ee91eaa 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -59,7 +59,7 @@ print '<tr valign="top"><td class="notopnoleft" width="30%">';
 */
 $var=false;
 print '<table class="noborder nohover" width="100%">';
-print '<form method="post" action="liste.php">';
+print '<form method="post" action="list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchOrder").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
@@ -125,7 +125,7 @@ if ($resql)
             $var=!$var;
             print "<tr ".$bc[$var].">";
             print '<td>'.$commandestatic->LibStatut($statut,0).'</td>';
-            print '<td align="right"><a href="liste.php?statut='.$statut.'">'.(isset($vals[$statut])?$vals[$statut]:0).'</a></td>';
+            print '<td align="right"><a href="list.php?statut='.$statut.'">'.(isset($vals[$statut])?$vals[$statut]:0).'</a></td>';
             print "</tr>\n";
         }
     }
@@ -184,7 +184,7 @@ if ($resql)
 
         print "<tr ".$bc[$var].">";
         print '<td>'.$langs->trans($commandestatic->statuts[$row[1]]).'</td>';
-        print '<td align="right"><a href="liste.php?statut='.$row[1].'">'.$row[0].' '.$commandestatic->LibStatut($row[1],3).'</a></td>';
+        print '<td align="right"><a href="list.php?statut='.$row[1].'">'.$row[0].' '.$commandestatic->LibStatut($row[1],3).'</a></td>';
 
         print "</tr>\n";
         $i++;
@@ -204,7 +204,7 @@ else
 
 if (! empty($conf->fournisseur->enabled))
 {
-    $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
+    $sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
     $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
     $sql.= ", ".MAIN_DB_PREFIX."societe as s";
     if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -232,8 +232,8 @@ if (! empty($conf->fournisseur->enabled))
                 $obj = $db->fetch_object($resql);
                 print "<tr ".$bc[$var].">";
                 print '<td class="nowrap">';
-                print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
-                print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>';
+                print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
+                print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td></tr>';
                 $i++;
             }
         }
@@ -300,7 +300,7 @@ print '</td><td width="70%" valign="top" class="notopnoleftnoright">';
 */
 $max=5;
 
-$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -353,7 +353,7 @@ if ($resql)
 
             print '</td>';
 
-            print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+            print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
             print '<td>'.dol_print_date($db->jdate($obj->tms),'day').'</td>';
             print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,5).'</td>';
             print '</tr>';
@@ -369,7 +369,7 @@ else dol_print_error($db);
  * Orders to process
 */
 /*
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, 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_fournisseur as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -387,7 +387,7 @@ $num = $db->num_rows($resql);
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=1">('.$num.')</a></td></tr>';
+print '<td colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1">('.$num.')</a></td></tr>';
 
 if ($num)
 {
@@ -421,7 +421,7 @@ print '</td></tr></table>';
 
 print '</td>';
 
-print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td>';
 
 print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
new file mode 100644
index 00000000000..4f0974abd10
--- /dev/null
+++ b/htdocs/fourn/commande/list.php
@@ -0,0 +1,283 @@
+<?php
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   \file       htdocs/fourn/commande/list.php
+ *   \ingroup    fournisseur
+ *   \brief      List of suppliers orders
+ */
+
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
+
+$langs->load("orders");
+$langs->load("sendings");
+
+
+$search_ref=GETPOST('search_ref');
+$search_refsupp=GETPOST('search_refsupp');
+$search_company=GETPOST('search_company');
+$search_user=GETPOST('search_user');
+$search_ttc=GETPOST('search_ttc');
+$sall=GETPOST('search_all');
+$search_status=GETPOST('search_status','int');
+
+$page  = GETPOST('page','int');
+$socid = GETPOST('socid','int');
+$sortorder = GETPOST('sortorder','alpha');
+$sortfield = GETPOST('sortfield','alpha');
+
+$viewstatut=GETPOST('viewstatut');
+
+// Security check
+$orderid = GETPOST('orderid');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
+
+// Purge search criteria
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+    $search_ref='';
+    $search_refsupp='';
+    $search_company='';
+	$search_user='';
+	$search_ttc='';
+	$search_status='';
+}
+
+if ($search_status == '') $search_status=-1;
+
+/*
+ *	View
+ */
+
+$title = $langs->trans("SuppliersOrders");
+if ($socid > 0)
+{
+	$fourn = new Fournisseur($db);
+	$fourn->fetch($socid);
+	$title .= ' ('.$fourn->name.')';
+}
+
+llxHeader('',$title);
+
+$commandestatic=new CommandeFournisseur($db);
+$formfile = new FormFile($db);
+$formorder = new FormOrder($db);
+
+
+if ($sortorder == "") $sortorder="DESC";
+if ($sortfield == "") $sortfield="cf.date_creation";
+$offset = $conf->liste_limit * $page ;
+
+
+/*
+ * Mode Liste
+ */
+
+$sql = "SELECT s.rowid as socid, s.nom as name, cf.date_commande as dc,";
+$sql.= " cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc, cf.fk_user_author,cf.date_livraison,";
+$sql.= " u.login";
+$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,";
+$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur as cf";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= ")";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid";
+$sql.= " WHERE cf.fk_soc = s.rowid ";
+$sql.= " AND cf.entity = ".$conf->entity;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($search_ref)
+{
+	$sql .= natural_search('cf.ref', $search_ref);
+}
+if ($search_company)
+{
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_user)
+{
+	$sql.= " AND u.login LIKE '%".$db->escape($search_user)."%'";
+}
+if ($search_ttc)
+{
+	$sql .= " AND total_ttc = '".$db->escape(price2num($search_ttc))."'";
+}
+if ($sall)
+{
+	$sql .= natural_search(array('cf.ref', 'cf.note_public', 'cf.note_private'), $sall);
+}
+if ($socid) $sql.= " AND s.rowid = ".$socid;
+
+//Required triple check because statut=0 means draft filter
+if (GETPOST('statut', 'int') !== '')
+{
+	$sql .= " AND fk_statut IN (".GETPOST('statut').")";
+}
+if ($search_refsupp)
+{
+	$sql.= " AND (cf.ref_supplier LIKE '%".$db->escape($search_refsupp)."%')";
+}
+if ($search_status >= 0)
+{
+	if ($search_status == 6 || $search_status == 7) $sql.=" AND fk_statut IN (6,7)";
+	else $sql.=" AND fk_statut = ".$search_status;
+}
+
+$sql.= $db->order($sortfield,$sortorder);
+
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+$resql = $db->query($sql);
+if ($resql)
+{
+
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$param="";
+	if ($search_ref)			$param.="&search_ref=".$search_ref;
+	if ($search_company)		$param.="&search_company=".$search_company;
+	if ($search_user)			$param.="&search_user=".$search_user;
+	if ($search_ttc)			$param.="&search_ttc=".$search_ttc;
+	if ($search_refsupp) 		$param.="&search_refsupp=".$search_refsupp;
+	if ($socid)					$param.="&socid=".$socid;
+	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
+	
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"cf.ref_supplier","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.login","",$param,'',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"total_ttc","",$param,$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans('DateDeliveryPlanned'),$_SERVER["PHP_SELF"],'cf.date_livraison','',$param, 'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cf.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_ref" value="'.$search_ref.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_refsupp" value="'.$search_refsupp.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'.$search_company.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_user" value="'.$search_user.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" name="search_ttc" value="'.$search_ttc.'"></td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre" align="right">';
+	$formorder->selectSupplierOrderStatus($search_status,1,'search_status');
+	print '</td>';
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print "</td></tr>\n";
+
+	$var=true;
+
+	$userstatic = new User($db);
+	$objectstatic=new CommandeFournisseur($db);
+
+	while ($i < min($num,$conf->liste_limit))
+	{
+		$obj = $db->fetch_object($resql);
+		$var=!$var;
+
+		print "<tr ".$bc[$var].">";
+
+		// Ref
+		print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a>';
+		$filename=dol_sanitizeFileName($obj->ref);
+		$filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref);
+		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		print '</td>'."\n";
+
+		// Ref Supplier
+		print '<td>'.$obj->ref_supplier.'</td>'."\n";
+
+
+		// Company
+		print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' ';
+		print $obj->name.'</a></td>'."\n";
+
+		// Author
+		$userstatic->id=$obj->fk_user_author;
+		$userstatic->login=$obj->login;
+		print "<td>";
+		if ($userstatic->id) print $userstatic->getLoginUrl(1);
+		else print "&nbsp;";
+		print "</td>";
+
+		// Amount
+		print '<td align="right" width="100">'.price($obj->total_ttc)."</td>";
+
+		// Date
+		print "<td align=\"center\" width=\"100\">";
+		if ($obj->dc)
+		{
+			print dol_print_date($db->jdate($obj->dc),"day");
+		}
+		else
+		{
+			print "-";
+		}
+		print '</td>';
+
+		// Delivery date
+		print '<td align="right">';
+		print dol_print_date($db->jdate($obj->date_livraison), 'day');
+		print '</td>';
+
+
+		// Statut
+		print '<td align="right" colspan="2">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
+
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>\n";
+	print "</form>\n";
+	
+	print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';
+
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
deleted file mode 100644
index 4b005a88724..00000000000
--- a/htdocs/fourn/commande/liste.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   \file       htdocs/fourn/commande/liste.php
- *   \ingroup    fournisseur
- *   \brief      List of suppliers orders
- */
-
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
-
-$langs->load("orders");
-
-
-$search_ref=GETPOST('search_ref');
-$search_refsupp=GETPOST('search_refsupp');
-$search_nom=GETPOST('search_nom');
-$search_user=GETPOST('search_user');
-$search_ttc=GETPOST('search_ttc');
-$sall=GETPOST('search_all');
-$search_status=GETPOST('search_status','int');
-if ($search_status == '') $search_status=-1;
-
-$page  = GETPOST('page','int');
-$socid = GETPOST('socid','int');
-$sortorder = GETPOST('sortorder','alpha');
-$sortfield = GETPOST('sortfield','alpha');
-
-// Security check
-$orderid = GETPOST('orderid');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
-
-
-/*
- *	View
- */
-
-$title = $langs->trans("SuppliersOrders");
-if ($socid > 0)
-{
-	$fourn = new Fournisseur($db);
-	$fourn->fetch($socid);
-	$title .= ' ('.$fourn->nom.')';
-}
-
-llxHeader('',$title);
-
-$commandestatic=new CommandeFournisseur($db);
-$formfile = new FormFile($db);
-$formorder = new FormOrder($db);
-
-
-if ($sortorder == "") $sortorder="DESC";
-if ($sortfield == "") $sortfield="cf.date_creation";
-$offset = $conf->liste_limit * $page ;
-
-
-/*
- * Mode Liste
- */
-
-$sql = "SELECT s.rowid as socid, s.nom, cf.date_commande as dc,";
-$sql.= " cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc, cf.fk_user_author,";
-$sql.= " u.login";
-$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,";
-$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ")";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid";
-$sql.= " WHERE cf.fk_soc = s.rowid ";
-$sql.= " AND cf.entity = ".$conf->entity;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($search_ref)
-{
-	$sql .= natural_search('cf.ref', $search_ref);
-}
-if ($search_nom)
-{
-	$sql .= natural_search('s.nom', $search_nom);
-}
-if ($search_user)
-{
-	$sql.= " AND u.login LIKE '%".$db->escape($search_user)."%'";
-}
-if ($search_ttc)
-{
-	$sql .= " AND total_ttc = ".price2num($search_ttc);
-}
-if ($sall)
-{
-	$sql .= natural_search(array('cf.ref', 'cf.note_public', 'cf.note_private'), $sall);
-}
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-
-//Required triple check because statut=0 means draft filter
-if (GETPOST('statut', 'int') !== '')
-{
-	$sql .= " AND fk_statut IN (".GETPOST('statut').")";
-}
-if ($search_refsupp)
-{
-	$sql.= " AND (cf.ref_supplier LIKE '%".$db->escape($search_refsupp)."%')";
-}
-if ($search_status >= 0)
-{
-	if ($search_status == 6 || $search_status == 7) $sql.=" AND fk_statut IN (6,7)";
-	else $sql.=" AND fk_statut = ".$search_status;
-}
-
-$sql.= $db->order($sortfield,$sortorder);
-
-$nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}
-
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
-
-$resql = $db->query($sql);
-if ($resql)
-{
-
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$param="";
-	if ($search_ref)	$param.="&search_ref=".$search_ref;
-	if ($search_nom)	$param.="&search_nom=".$search_nom;
-	if ($search_user)	$param.="&search_user=".$search_user;
-	if ($search_ttc)	$param.="&search_ttc=".$search_ttc;
-	if ($search_refsupp) $param.="&search_refsupp=".$search_refsupp;
-	if ($socid)			$param.="&socid=".$socid;
-	if ($search_status >= 0)  $param.="&search_status=".$search_status;
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"cf.ref_supplier","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"],"u.login","",$param,'',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"total_ttc","",$param,$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cf.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_ref" value="'.$search_ref.'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_refsupp" value="'.$search_refsupp.'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_nom" value="'.$search_nom.'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_user" value="'.$search_user.'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_ttc" value="'.$search_ttc.'"></td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
-	$formorder->selectSupplierOrderStatus($search_status,1,'search_status');
-	print '</td>';
-	print '<td class="liste_titre" align="right">';
-	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '</td>';
-	print '</tr>';
-
-	$var=true;
-
-	$userstatic = new User($db);
-	$objectstatic=new CommandeFournisseur($db);
-
-	while ($i < min($num,$conf->liste_limit))
-	{
-		$obj = $db->fetch_object($resql);
-		$var=!$var;
-
-		print "<tr ".$bc[$var].">";
-
-		// Ref
-		print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a>';
-		$filename=dol_sanitizeFileName($obj->ref);
-		$filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref);
-		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		print '</td>'."\n";
-
-		// Ref Supplier
-		print '<td>'.$obj->ref_supplier.'</td>'."\n";
-
-
-		// Company
-		print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' ';
-		print $obj->nom.'</a></td>'."\n";
-
-		// Author
-		$userstatic->id=$obj->fk_user_author;
-		$userstatic->login=$obj->login;
-		print "<td>";
-		if ($userstatic->id) print $userstatic->getLoginUrl(1);
-		else print "&nbsp;";
-		print "</td>";
-
-		// Amount
-		print '<td align="right" width="100">'.price($obj->total_ttc)."</td>";
-
-		// Date
-		print "<td align=\"center\" width=\"100\">";
-		if ($obj->dc)
-		{
-			print dol_print_date($db->jdate($obj->dc),"day");
-		}
-		else
-		{
-			print "-";
-		}
-		print '</td>';
-
-		// Statut
-		print '<td align="right" colspan="2">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
-
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table>\n";
-	print "</form>\n";
-
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index b9cbf6e33b7..6a1c6cfe80e 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref))
          */
         print '<table class="border" width="100%">';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
         // Ref
         print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
new file mode 100644
index 00000000000..3397b18a30b
--- /dev/null
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -0,0 +1,594 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville   	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur   	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo  	<marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin          	<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012	   Andreu Bisquerra Gaya  	<jove@bisquerra.com>
+ * Copyright (C) 2012	   David Rodriguez Martinez <davidrm146@gmail.com>
+ * Copyright (C) 2012	   Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2014	   Florian Henry			<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/fourn/commande/orderstoinvoice.php
+ * \ingroup commande
+ * \brief Page to invoice multiple supplier orders
+ */
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+if (! empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+}
+
+$langs->load('orders');
+$langs->load('deliveries');
+$langs->load('companies');
+
+if (! $user->rights->facture->creer)
+	accessforbidden();
+
+$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$sref = GETPOST('sref');
+$sref_client = GETPOST('sref_client');
+$sall = GETPOST('sall');
+$socid = GETPOST('socid', 'int');
+$selected = GETPOST('orders_to_invoice');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$viewstatut = GETPOST('viewstatut');
+
+if (! $sortfield)
+	$sortfield = 'c.rowid';
+if (! $sortorder)
+	$sortorder = 'DESC';
+
+$now = dol_now();
+$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
+$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
+$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
+$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
+
+if ($action == 'create') {
+	if (is_array($selected) == false) {
+		$mesgs = array (
+				'<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>'
+		);
+	} else {
+		$origin = GETPOST('origin');
+		$originid = GETPOST('originid');
+	}
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('orderstoinvoicesupplier'));
+
+/*
+ * Actions
+ */
+
+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');
+	if (isset($_GET['orders_to_invoice'])) {
+		$orders_id = $_GET['orders_to_invoice'];
+		$n = count($orders_id);
+		$i = 0;
+
+		$originid = $orders_id[0];
+		$_GET['originid'] = $orders_id[0];
+	}
+	if (isset($_POST['orders_to_invoice'])) {
+		$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)) {
+			$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+		}
+		if (! $error) {
+			$object->ref = $_POST['ref'];
+			$object->ref_supplier = $_POST['ref_supplier'];
+			$object->socid = $_POST['socid'];
+			$object->libelle = $_POST['libelle'];
+			$object->date = $datefacture;
+			$object->date_echeance = $datedue;
+			$object->note_public = GETPOST('note_public');
+			$object->note_private = GETPOST('note_private');
+			$object->cond_reglement_id = GETPOST('cond_reglement_id');
+			$object->mode_reglement_id = GETPOST('mode_reglement_id');
+			$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);
+						$db->begin();
+						$sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
+						$sql .= "fk_source";
+						$sql .= ", sourcetype";
+						$sql .= ", fk_target";
+						$sql .= ", targettype";
+						$sql .= ") VALUES (";
+						$sql .= $origin_id;
+						$sql .= ", '" . $object->origin . "'";
+						$sql .= ", " . $id;
+						$sql .= ", '" . $object->element . "'";
+						$sql .= ")";
+
+						if ($db->query($sql)) {
+							$db->commit();
+						} else {
+							$db->rollback();
+						}
+					}
+
+					while ( $ii < $nn ) {
+						$objectsrc = new CommandeFournisseur($db);
+						dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
+						$result = $objectsrc->fetch($orders_id[$ii]);
+						if ($result > 0) {
+							$lines = $objectsrc->lines;
+							if (empty($lines) && method_exists($objectsrc, 'fetch_lines')) {
+								$objectsrc->fetch_lines();
+								$lines = $objectsrc->lines;
+							}
+							$fk_parent_line = 0;
+							$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;
+								if ($lines[$i]->date_debut_reel)
+									$date_start = $lines[$i]->date_debut_reel;
+								if ($lines[$i]->date_start)
+									$date_start = $lines[$i]->date_start;
+								$date_end = $lines[$i]->date_fin_prevue;
+								if ($lines[$i]->date_fin_reel)
+									$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 {
+									$lineid = 0;
+									$error ++;
+									break;
+								}
+								// Defined the new fk_parent_line
+								if ($result > 0 && $lines[$i]->product_type == 9) {
+									$fk_parent_line = $result;
+								}
+							}
+						} else {
+							$mesgs[] = $objectsrc->error;
+							$error ++;
+						}
+						$ii ++;
+					}
+				} else {
+					$mesgs[] = $object->error;
+					$error ++;
+				}
+			}
+		}
+
+		// End of object creation, we show it
+		if ($id > 0 && ! $error) {
+			$db->commit();
+			header('Location: ' . DOL_URL_ROOT . '/fourn/facture/card.php?facid=' . $id);
+			exit();
+		} else {
+			$db->rollback();
+			$action = 'create';
+			$_GET["origin"] = $_POST["origin"];
+			$_GET["originid"] = $_POST["originid"];
+			$mesgs[] = '<div class="error">' . $object->error . '</div>';
+		}
+	}
+}
+
+/*
+ * View
+ */
+
+$html = new Form($db);
+$htmlother = new FormOther($db);
+$formfile = new FormFile($db);
+$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);
+	if ($res) {
+		$cond_reglement_id = $soc->cond_reglement_id;
+		$mode_reglement_id = $soc->mode_reglement_id;
+	}
+	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
+
+	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="socid" value="' . $soc->id . '">' . "\n";
+	print '<input name="facnumber" type="hidden" value="provisoire">';
+	print '<input name="ref_client" type="hidden" value="' . $ref_client . '">';
+	print '<input name="ref_int" type="hidden" value="' . $ref_int . '">';
+	print '<input type="hidden" name="origin" value="' . GETPOST('origin') . '">';
+	print '<input type="hidden" name="originid" value="' . GETPOST('originid') . '">';
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
+
+	// Ref supplier
+	print '<tr><td class="fieldrequired">' . $langs->trans('RefSupplier') . '</td><td><input name="ref_supplier" value="' . (isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : '') . '" type="text"></td>';
+	print '</tr>';
+
+	// Third party
+	print '<tr><td class="fieldrequired">' . $langs->trans('Customer') . '</td><td colspan="2">';
+	print $soc->getNomUrl(1);
+	print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+	print '</td>';
+	print '</tr>' . "\n";
+
+	// Date invoice
+	print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+	$html->select_date('', '', '', '', '', "add", 1, 1);
+	print '</td></tr>';
+	// Payment term
+	print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+	$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
+	print '</td></tr>';
+	// Payment mode
+	print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+	$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
+	print '</td></tr>';
+	// Project
+	if (! empty($conf->projet->enabled)) {
+		$formproject = new FormProjets($db);
+
+		$langs->load('projects');
+		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
+		$formproject->select_projects($soc->id, $projectid, 'projectid');
+		print '</td></tr>';
+	}
+
+	$objectsrc = new CommandeFournisseur($db);
+	$listoforders = array ();
+	foreach ( $selected as $sel ) {
+		$result = $objectsrc->fetch($sel);
+		if ($result > 0) {
+			$listoforders[] = $objectsrc->ref;
+		}
+	}
+
+	// Other attributes
+	$parameters = array (
+			'objectsrc' => $objectsrc,
+			'idsrc' => $listoforders,
+			'colspan' => ' colspan="3"'
+	);
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
+	// Modele PDF
+	print '<tr><td>' . $langs->trans('Model') . '</td>';
+	print '<td>';
+	$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
+	print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
+	print "</td></tr>";
+
+	// Public note
+	print '<tr>';
+	print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
+	print '<td valign="top" colspan="2">';
+	print '<textarea name="note_public" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
+
+	print $langs->trans("Orders") . ": " . implode(', ', $listoforders);
+
+	print '</textarea></td></tr>';
+	// Private note
+	if (empty($user->societe_id)) {
+		print '<tr>';
+		print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
+		print '<td valign="top" colspan="2">';
+		print '<textarea name="note" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
+
+		print '</textarea></td></tr>';
+	}
+
+	print '</table>';
+
+	while ( $i < $n ) {
+		print '<input type="hidden" name="orders_to_invoice[]" value="' . $orders_id[$i] . '">';
+
+		$i ++;
+	}
+
+	// Button "Create Draft"
+	print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '" /></center>';
+	print "</form>\n";
+
+	print '</td></tr>';
+	print "</table>\n";
+}
+
+// Mode liste
+if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
+	llxHeader();
+	?>
+<script type="text/javascript">
+		jQuery(document).ready(function() {
+		jQuery("#checkall").click(function() {
+			jQuery(".checkformerge").attr('checked', true);
+		});
+		jQuery("#checknone").click(function() {
+			jQuery(".checkformerge").attr('checked', false);
+		});
+	});
+	</script>
+<?php
+
+	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
+	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
+	$sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
+	$sql .= ', ' . MAIN_DB_PREFIX . 'commande_fournisseur as c';
+	if (! $user->rights->societe->client->voir && ! $socid)
+		$sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+	$sql .= ' WHERE c.entity = ' . $conf->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)
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+	if ($sref) {
+		$sql .= " AND c.ref LIKE '%" . $db->escape($sref) . "%'";
+	}
+	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);
+			$soc->fetch($socid);
+		}
+		$title = $langs->trans('ListOfSupplierOrders');
+		$title .= ' - ' . $langs->trans('StatusOrderReceivedAllShort');
+		$num = $db->num_rows($resql);
+		print_fiche_titre($title);
+		$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 '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
+		}
+
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('RefSupplier'), 'orderstoinvoice.php', 'c.ref_supplier', '', '&amp;socid=' . $socid, '', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('OrderDate'), 'orderstoinvoice.php', 'c.date_commande', '', '&amp;socid=' . $socid, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('DeliveryDate'), 'orderstoinvoice.php', 'c.date_livraison', '', '&amp;socid=' . $socid, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
+		print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
+		print '</tr>';
+
+		// Lignes des champs de filtre
+		print '<form method="get" action="orderstoinvoice.php">';
+		print '<input type="hidden" name="socid" value="' . $socid . '">';
+		print '<tr class="liste_titre">';
+		print '<td class="liste_titre">';
+		// REF
+		print '<input class="flat" size="10" type="text" name="sref" value="' . $sref . '">';
+		print '</td>';
+		// print '<td class="liste_titre">';
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
+
+		// DATE ORDER
+		print '<td class="liste_titre" align="center">';
+		print $period;
+		print '</td>';
+
+		// DATE DELIVERY
+		print '<td class="liste_titre" align="center">';
+		print $periodely;
+		print '</td>';
+
+		// SEARCH BUTTON
+		print '</td><td align="right" class="liste_titre">';
+		print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '"  value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+
+		// ALL/NONE
+		print '<td class="liste_titre" align="center">';
+		if ($conf->use_javascript_ajax)
+			print '<a href="#" id="checkall">' . $langs->trans("All") . '</a> / <a href="#" id="checknone">' . $langs->trans("None") . '</a>';
+		print '</td>';
+
+		print '</td></tr>';
+		print '</form>';
+
+		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
+		$var = True;
+		$generic_commande = new CommandeFournisseur($db);
+
+		while ( $i < $num ) {
+			$objp = $db->fetch_object($resql);
+			$var = ! $var;
+			print '<tr ' . $bc[$var] . '>';
+			print '<td class="nowrap">';
+
+			$generic_commande->id = $objp->rowid;
+			$generic_commande->ref = $objp->ref;
+
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			print '<td class="nobordernopadding nowrap">';
+			print $generic_commande->getNomUrl(1, $objp->fk_statut);
+			print '</td>';
+
+			print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+			$filename = dol_sanitizeFileName($objp->ref);
+			$filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+			$urlsource = $_SERVER['PHP_SELF'] . '?id=' . $objp->rowid;
+			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
+			print '</td></tr></table>';
+			print '</td>';
+
+			print '<td>' . $objp->ref_supplier . '</td>';
+
+			// Order date
+			print '<td align="center" nowrap>';
+			print dol_print_date($db->jdate($objp->date_commande), 'day');
+			print '</td>';
+
+			// Delivery date
+			print '<td align="center" nowrap>';
+			print dol_print_date($db->jdate($objp->date_livraison), 'day');
+			print '</td>';
+
+			// Statut
+			print '<td align="right" class="nowrap">' . $generic_commande->LibStatut($objp->fk_statut, 5) . '</td>';
+
+			// Checkbox
+			print '<td align="center">';
+			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="' . $objp->rowid . '">';
+			print '</td>';
+
+			print '</tr>';
+
+			$total = $total + $objp->price;
+			$subtotal = $subtotal + $objp->price;
+			$i ++;
+		}
+		print '</table>';
+
+		/*
+		 * Boutons actions
+		*/
+		print '<center>';
+		print '<div align="right">';
+		print '<input type="hidden" name="socid" value="' . $socid . '">';
+		print '<input type="hidden" name="action" value="create">';
+		print '<input type="hidden" name="origin" value="commande"><br>';
+		// print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
+		print '<input type="submit" class="butAction" value="' . $langs->trans("GenerateBill") . '">';
+		print '</div>';
+		print '</form>';
+		$db->free($resql);
+	} else {
+		print dol_print_error($db);
+	}
+}
+
+dol_htmloutput_mesg($mesg, $mesgs);
+
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/commande/tpl/index.html b/htdocs/fourn/commande/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index fc1942e0f61..3a9d8f5bebe 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -45,7 +45,7 @@ foreach($linkedObjectBlock as $object)
 	$var=!$var;
 ?>
 <tr <?php echo $bc[$var]; ?> ><td>
-	<a href="<?php echo DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$object->ref; ?></a></td>
+	<a href="<?php echo DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$object->ref; ?></a></td>
 	<td align="center"><?php echo dol_print_date($object->date,'day'); ?></td>
 	<td align="right"><?php
 		if ($user->rights->fournisseur->commande->lire) {
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 70748c8bd57..acdac3ab9a1 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -94,13 +94,13 @@ if ($result)
     $num = $db->num_rows($result);
 
     $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-    print_barre_liste($title." (".$langs->trans("Suppliers").")",$page, "contact.php", "",$sortfield,$sortorder,"",$num);
+    print_barre_liste($title." (".$langs->trans("Suppliers").")",$page, $_SERVER["PHP_SELF"], "",$sortfield,$sortorder,"",$num);
 
     print '<table class="liste" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Lastname"),"contact.php","p.name", $begin, "", "", $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Firstname"),"contact.php","p.firstname", $begin, "", "", $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Company"),"contact.php","s.nom", $begin, "", "", $sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin, "", "", $sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, "", "", $sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, "", "", $sortfield,$sortorder);
     print '<td class="liste_titre">'.$langs->trans("Email").'</td>';
     print '<td class="liste_titre">'.$langs->trans("Phone").'</td>';
     print "</tr>\n";
@@ -114,9 +114,9 @@ if ($result)
 
         print "<tr ".$bc[$var].">";
 
-        print '<td><a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$obj->lastname.'</a></td>';
+        print '<td><a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$obj->cidp.'">'.img_object($langs->trans("ShowContact"),"contact").' '.$obj->lastname.'</a></td>';
         print '<td>'.$obj->firstname.'</td>';
-        print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
+        print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
         print '<td>'.$obj->email.'</td>';
         print '<td>'.$obj->phone.'</td>';
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
new file mode 100644
index 00000000000..9542fc062e7
--- /dev/null
+++ b/htdocs/fourn/facture/card.php
@@ -0,0 +1,2503 @@
+<?php
+/* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013	Laurent Destailleur 	<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
+ * Copyright (C) 2005		Marc Barilley			<marc@ocebo.fr>
+ * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/fourn/facture/card.php
+ *	\ingroup    facture, fournisseur
+ *	\brief      Page for supplier invoice card (view, edit, validate)
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+if (!empty($conf->produit->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+
+
+$langs->load('bills');
+$langs->load('compta');
+$langs->load('suppliers');
+$langs->load('companies');
+$langs->load('products');
+$langs->load('banks');
+
+$id			= (GETPOST('facid','int') ? GETPOST('facid','int') : GETPOST('id','int'));
+$action		= GETPOST("action");
+$confirm	= GETPOST("confirm");
+$ref		= GETPOST('ref','alpha');
+
+//PDF
+$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
+$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+
+// Security check
+$socid='';
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('invoicesuppliercard','globalcard'));
+
+$object=new FactureFournisseur($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+if ($id > 0 || ! empty($ref))
+{
+	$ret=$object->fetch($id, $ref);
+}
+
+$permissionnote=$user->rights->fournisseur->facture->creer;	// Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+$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');
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+// Action clone object
+if ($action == 'confirm_clone' && $confirm == 'yes')
+{
+//    if (1==0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
+//    {
+//        $mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
+//    }
+//    else
+//    {
+        $result=$object->createFromClone($id);
+        if ($result > 0)
+        {
+            header("Location: ".$_SERVER['PHP_SELF'].'?action=editref_supplier&id='.$result);
+            exit;
+        }
+        else
+        {
+            $langs->load("errors");
+	        setEventMessage($langs->trans($object->error), 'errors');
+            $action='';
+        }
+//    }
+}
+
+elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fournisseur->facture->valider)
+{
+    $idwarehouse=GETPOST('idwarehouse');
+
+    $object->fetch($id);
+    $object->fetch_thirdparty();
+
+    $qualified_for_stock_change=0;
+    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+    {
+    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+    }
+    else
+    {
+    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+    }
+
+    // Check parameters
+    if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+    {
+        $langs->load("stocks");
+        if (! $idwarehouse || $idwarehouse == -1)
+        {
+            $error++;
+	        setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
+            $action='';
+        }
+    }
+
+    if (! $error)
+    {
+        $result = $object->validate($user,'',$idwarehouse);
+        if ($result < 0)
+        {
+            setEventMessage($object->error,'errors');
+            setEventMessage($object->errors,'errors');
+        }
+    }
+}
+
+elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->facture->supprimer)
+{
+    $object->fetch($id);
+    $object->fetch_thirdparty();
+    $result=$object->delete($id);
+    if ($result > 0)
+    {
+        header('Location: list.php');
+        exit;
+    }
+    else
+    {
+	    setEventMessage($object->error, 'errors');
+    }
+}
+
+elseif ($action == 'confirm_delete_line' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+{
+	$object->fetch($id);
+	$ret = $object->deleteline(GETPOST('lineid'));
+	if ($ret > 0)
+	{
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+		/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
+		$action='';
+	}
+}
+
+elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+{
+    $object->fetch($id);
+    $result=$object->set_paid($user);
+    if ($result<0)
+    {
+        setEventMessage($object->error,'errors');
+    }
+}
+
+// Set supplier ref
+if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
+{
+    $result=$object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
+    if ($result < 0) dol_print_error($db, $object->error);
+}
+
+// conditions de reglement
+if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
+{
+    $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
+}
+
+// mode de reglement
+else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
+{
+    $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
+}
+
+// bank account
+else if ($action == 'setbankaccount' && $user->rights->fournisseur->facture->creer) {
+    $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+}
+
+// Set label
+elseif ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
+{
+    $object->fetch($id);
+    $object->label=$_POST['label'];
+    $result=$object->update($user);
+    if ($result < 0) dol_print_error($db);
+}
+elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
+{
+    $object->fetch($id);
+    $object->date=dol_mktime(12,0,0,$_POST['datefmonth'],$_POST['datefday'],$_POST['datefyear']);
+    if ($object->date_echeance && $object->date_echeance < $object->date) $object->date_echeance=$object->date;
+    $result=$object->update($user);
+    if ($result < 0) dol_print_error($db,$object->error);
+}
+elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
+{
+    $object->fetch($id);
+    $object->date_echeance=dol_mktime(12,0,0,$_POST['date_lim_reglementmonth'],$_POST['date_lim_reglementday'],$_POST['date_lim_reglementyear']);
+    if (! empty($object->date_echeance) && $object->date_echeance < $object->date)
+    {
+    	$object->date_echeance=$object->date;
+    	setEventMessage($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"),'warnings');
+    }
+    $result=$object->update($user);
+    if ($result < 0) dol_print_error($db,$object->error);
+}
+
+// Delete payment
+elseif ($action == 'deletepaiement' && $user->rights->fournisseur->facture->creer)
+{
+    $object->fetch($id);
+    if ($object->statut == 1 && $object->paye == 0)
+    {
+    	$paiementfourn = new PaiementFourn($db);
+        $result=$paiementfourn->fetch(GETPOST('paiement_id'));
+        if ($result > 0) $result=$paiementfourn->delete(); // If fetch ok and found
+        if ($result < 0) {
+	        setEventMessage($paiementfourn->error, 'errors');
+        }
+    }
+}
+
+// Create
+elseif ($action == 'add' && $user->rights->fournisseur->facture->creer)
+{
+    $error=0;
+
+    $datefacture=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
+    $datedue=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
+
+    if (GETPOST('socid','int')<1)
+    {
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')), 'errors');
+    	$action='create';
+    	$error++;
+    }
+
+    if ($datefacture == '')
+    {
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('DateInvoice')), 'errors');
+        $action='create';
+        $_GET['socid']=$_POST['socid'];
+        $error++;
+    }
+    if (! GETPOST('ref_supplier'))
+    {
+	    setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('RefSupplier')), 'errors');
+        $action='create';
+        $_GET['socid']=$_POST['socid'];
+        $error++;
+    }
+    
+    // Fill array 'array_options' with data from add form
+    
+    if (! $error)
+    {
+        $db->begin();
+        
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+		if ($ret < 0) $error ++;
+
+        $tmpproject = GETPOST('projectid', 'int');
+
+        // Creation facture
+        $object->ref           = $_POST['ref'];
+		$object->ref_supplier  = $_POST['ref_supplier'];
+        $object->socid         = $_POST['socid'];
+        $object->libelle       = $_POST['libelle'];
+        $object->date          = $datefacture;
+        $object->date_echeance = $datedue;
+        $object->note_public   = GETPOST('note_public');
+        $object->note_private  = GETPOST('note_private');
+		$object->cond_reglement_id = GETPOST('cond_reglement_id');
+        $object->mode_reglement_id = GETPOST('mode_reglement_id');
+        $object->fk_account        = GETPOST('fk_account', 'int');
+        $object->fk_project    = ($tmpproject > 0) ? $tmpproject : null;
+
+		// Auto calculation of date due if not filled by user
+		if(empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();
+
+        // If creation from another object of another module
+        if ($_POST['origin'] && $_POST['originid'])
+        {
+            // Parse element/subelement (ex: project_task)
+            $element = $subelement = $_POST['origin'];
+            /*if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
+             {
+            $element = $regs[1];
+            $subelement = $regs[2];
+            }*/
+
+            // For compatibility
+            if ($element == 'order')    {
+                $element = $subelement = 'commande';
+            }
+            if ($element == 'propal')   {
+                $element = 'comm/propal'; $subelement = 'propal';
+            }
+            if ($element == 'contract') {
+                $element = $subelement = 'contrat';
+            }
+            if ($element == 'order_supplier') {
+                $element = 'fourn'; $subelement = 'fournisseur.commande';
+            }
+            if ($element == 'project')
+            {
+            	$element = 'projet';
+            }
+            $object->origin    = $_POST['origin'];
+            $object->origin_id = $_POST['originid'];
+
+            $id = $object->create($user);
+
+            // Add lines
+            if ($id > 0)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
+                $classname = ucfirst($subelement);
+                if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur';
+                $srcobject = new $classname($db);
+
+                $result=$srcobject->fetch($_POST['originid']);
+                if ($result > 0)
+                {
+                    $lines = $srcobject->lines;
+                    if (empty($lines) && method_exists($srcobject,'fetch_lines'))
+                    {
+                    	$srcobject->fetch_lines();
+                    	$lines = $srcobject->lines;
+                    }
+
+                    $num=count($lines);
+                    for ($i = 0; $i < $num; $i++)
+                    {
+                        $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;
+                        if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+                        if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+                        $date_end=$lines[$i]->date_fin_prevue;
+                        if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+                        if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+
+                        // 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)
+                        {
+                            $error++;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    $error++;
+                }
+            }
+            else
+            {
+                $error++;
+            }
+        }
+        // If some invoice's lines already known
+        else
+        {
+            $id = $object->create($user);
+            if ($id < 0)
+            {
+                $error++;
+            }
+
+            if (! $error)
+            {
+                for ($i = 1 ; $i < 9 ; $i++)
+                {
+                    $label = $_POST['label'.$i];
+                    $amountht  = price2num($_POST['amount'.$i]);
+                    $amountttc = price2num($_POST['amountttc'.$i]);
+                    $tauxtva   = price2num($_POST['tauxtva'.$i]);
+                    $qty = $_POST['qty'.$i];
+                    $fk_product = $_POST['fk_product'.$i];
+                    if ($label)
+                    {
+                        if ($amountht)
+                        {
+                            $price_base='HT'; $amount=$amountht;
+                        }
+                        else
+                        {
+                            $price_base='TTC'; $amount=$amountttc;
+                        }
+                        $atleastoneline=1;
+
+                        $product=new Product($db);
+                        $product->fetch($_POST['idprod'.$i]);
+
+                        $ret=$object->addline($label, $amount, $tauxtva, $product->localtax1_tx, $product->localtax2_tx, $qty, $fk_product, $remise_percent, '', '', '', 0, $price_base);
+                        if ($ret < 0) $error++;
+                    }
+                }
+            }
+        }
+
+        if ($error)
+        {
+            $langs->load("errors");
+            $db->rollback();
+	        setEventMessage($langs->trans($object->error), 'errors');
+            $action='create';
+            $_GET['socid']=$_POST['socid'];
+        }
+        else
+        {
+            $db->commit();
+
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	            $outputlangs = $langs;
+	            $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            	if ($result	<= 0)
+            	{
+            		dol_print_error($db,$result);
+            		exit;
+            	}
+            }
+
+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+            exit;
+        }
+    }
+}
+
+// Edit line
+elseif ($action == 'update_line' && $user->rights->fournisseur->facture->creer)
+{
+	// TODO Missing transaction
+    if (GETPOST('etat') == '1' && ! GETPOST('cancel')) // si on valide la modification
+    {
+        $object->fetch($id);
+        $object->fetch_thirdparty();
+
+        if ($_POST['puht'])
+        {
+            $pu=$_POST['puht'];
+            $price_base_type='HT';
+        }
+        if ($_POST['puttc'])
+        {
+            $pu=$_POST['puttc'];
+            $price_base_type='TTC';
+        }
+
+        if (GETPOST('idprod'))
+        {
+            $prod = new Product($db);
+            $prod->fetch($_POST['idprod']);
+            $label = $prod->description;
+            if (trim($_POST['desc']) != trim($label)) $label=$_POST['desc'];
+
+            $type = $prod->type;
+        }
+        else
+        {
+
+            $label = $_POST['desc'];
+            $type = $_POST["type"]?$_POST["type"]:0;
+
+        }
+
+        $localtax1_tx= get_localtax($_POST['tauxtva'], 1, $mysoc,$object->thirdparty);
+        $localtax2_tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty);
+        $remise_percent=GETPOST('remise_percent');
+
+        $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent);
+        if ($result >= 0)
+        {
+            unset($_POST['label']);
+        }
+        else
+        {
+            setEventMessage($object->error,'errors');
+        }
+    }
+}
+
+elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
+{
+	$db->begin();
+
+    $ret=$object->fetch($id);
+    if ($ret < 0)
+    {
+        dol_print_error($db,$object->error);
+        exit;
+    }
+    $ret=$object->fetch_thirdparty();
+
+    $langs->load('errors');
+	$error=0;
+
+	// Set if we used free entry or predefined product
+	$predef='';
+	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+	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 = '';
+	}
+
+	$qty = GETPOST('qty'.$predef);
+	$remise_percent=GETPOST('remise_percent'.$predef);
+
+    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht') < 0 && $qty < 0)
+    {
+        setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), 'errors');
+        $error++;
+    }
+    if (GETPOST('prod_entry_mode')=='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
+    {
+        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
+        $error++;
+    }
+    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
+    {
+        setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
+        $error++;
+    }
+    if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('dp_desc'))
+    {
+        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
+        $error++;
+    }
+    if (! GETPOST('qty'))
+    {
+        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
+        $error++;
+    }
+
+    if (GETPOST('prod_entry_mode') != 'free')	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+    {
+    	$idprod=0;
+    	$productsupplier=new ProductFournisseur($db);
+
+        if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-2;	// Same behaviour than with combolist. When not select idprodfournprice is now -2 (to avoid conflict with next action that may return -1)
+
+    	if (GETPOST('idprodfournprice') > 0)
+    	{
+    		$idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), $qty);    // Just to see if a price exists for the quantity. Not used to found vat.
+    	}
+
+        if ($idprod > 0)
+        {
+            $result=$productsupplier->fetch($idprod);
+
+            $label = $productsupplier->libelle;
+
+            $desc = $productsupplier->description;
+            if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
+
+            $tvatx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+            $npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+
+            $localtax1_tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty);
+            $localtax2_tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty);
+
+            $type = $productsupplier->type;
+
+            // TODO Save the product supplier ref into database into field ref_supplier (must rename field ref into ref_supplier first)
+            $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, '', '', 0, $npr);
+        }
+    	if ($idprod == -2 || $idprod == 0)
+        {
+            // Product not selected
+            $error++;
+            $langs->load("errors");
+	        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")), 'errors');
+        }
+        if ($idprod == -1)
+        {
+            // Quantity too low
+            $error++;
+            $langs->load("errors");
+	        setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
+        }
+    }
+    else if( GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='' )
+	{
+		$pu_ht = price2num($price_ht, 'MU');
+		$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+		$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
+		$tva_tx = str_replace('*', '', $tva_tx);
+		$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+		$desc = $product_desc;
+		$type = GETPOST('type');
+
+    	$tva_tx = price2num($tva_tx);	// When vat is text input field
+
+    	// Local Taxes
+    	$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
+    	$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
+
+    	if (!empty($_POST['price_ht']))
+    	{
+    		$ht = price2num($_POST['price_ht']);
+            $price_base_type = 'HT';
+
+            //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
+            $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
+        }
+        else
+		{
+    		$ttc = price2num($_POST['price_ttc']);
+            $ht = $ttc / (1 + ($tva_tx / 100));
+            $price_base_type = 'HT';
+            //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
+            $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
+        }
+    }
+
+    //print "xx".$tva_tx; exit;
+    if (! $error && $result > 0)
+    {
+    	$db->commit();
+
+        // Define output language
+    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    	{
+    		$outputlangs = $langs;
+    		$newlang = '';
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    		if (! empty($newlang)) {
+    			$outputlangs = new Translate("", $conf);
+    			$outputlangs->setDefaultLang($newlang);
+    		}
+    		$model=$object->modelpdf;
+    		$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);
+    	}
+
+		unset($_POST ['prod_entry_mode']);
+
+    	unset($_POST['qty']);
+    	unset($_POST['type']);
+    	unset($_POST['remise_percent']);
+    	unset($_POST['pu']);
+    	unset($_POST['price_ht']);
+    	unset($_POST['price_ttc']);
+    	unset($_POST['tva_tx']);
+    	unset($_POST['label']);
+    	unset($localtax1_tx);
+    	unset($localtax2_tx);
+		unset($_POST['np_marginRate']);
+		unset($_POST['np_markRate']);
+    	unset($_POST['dp_desc']);
+		unset($_POST['idprodfournprice']);
+
+    	unset($_POST['date_starthour']);
+    	unset($_POST['date_startmin']);
+    	unset($_POST['date_startsec']);
+    	unset($_POST['date_startday']);
+    	unset($_POST['date_startmonth']);
+    	unset($_POST['date_startyear']);
+    	unset($_POST['date_endhour']);
+    	unset($_POST['date_endmin']);
+    	unset($_POST['date_endsec']);
+    	unset($_POST['date_endday']);
+    	unset($_POST['date_endmonth']);
+    	unset($_POST['date_endyear']);
+    }
+    else
+	{
+    	$db->rollback();
+	    setEventMessage($object->error, 'errors');
+    }
+
+    $action = '';
+}
+
+elseif ($action == 'classin')
+{
+    $object->fetch($id);
+    $result=$object->setProject($_POST['projectid']);
+}
+
+
+// Set invoice to draft status
+elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer)
+{
+    $object->fetch($id);
+
+    $totalpaye = $object->getSommePaiement();
+    $resteapayer = $object->total_ttc - $totalpaye;
+
+    // On verifie si les lignes de factures ont ete exportees en compta et/ou ventilees
+    //$ventilExportCompta = $object->getVentilExportCompta();
+
+    // On verifie si aucun paiement n'a ete effectue
+    if ($resteapayer == $object->total_ttc	&& $object->paye == 0 && $ventilExportCompta == 0)
+    {
+        $object->set_draft($user);
+
+        // Define output language
+    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    	{
+    		$outputlangs = $langs;
+    		$newlang = '';
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+    		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+    		if (! empty($newlang)) {
+    			$outputlangs = new Translate("", $conf);
+    			$outputlangs->setDefaultLang($newlang);
+    		}
+    		$model=$object->modelpdf;
+    		$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);
+    	}
+
+        $action='';
+    }
+}
+
+// Set invoice to validated/unpaid status
+elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
+{
+    $result = $object->fetch($id);
+    if ($object->statut == 2
+    || ($object->statut == 3 && $object->close_code != 'replaced'))
+    {
+        $result = $object->set_unpaid($user);
+        if ($result > 0)
+        {
+            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+            exit;
+        }
+        else
+        {
+	        setEventMessage($object->error, 'errors');
+        }
+    }
+}
+
+// Link invoice to order
+if (GETPOST('linkedOrder')) {
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+	$result = $object->add_object_linked('commande', GETPOST('linkedOrder'));
+}
+
+// Add file in email form
+if (GETPOST('addfile'))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    // Set tmp user directory TODO Use a dedicated directory for temp mails files
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';
+
+    dol_add_file_process($upload_dir_tmp,0,0);
+    $action='presend';
+}
+
+// Remove file in email form
+if (! empty($_POST['removedfile']))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    // Set tmp user directory
+    $vardir=$conf->user->dir_output."/".$user->id;
+    $upload_dir_tmp = $vardir.'/temp';
+
+	// TODO Delete only files that was uploaded from email form
+    dol_remove_file_process($_POST['removedfile'],0);
+    $action='presend';
+}
+
+// Send mail
+if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel'])
+{
+    $langs->load('mails');
+
+    $object->fetch($id);
+    $result=$object->fetch_thirdparty();
+    if ($result > 0)
+    {
+//        $ref = dol_sanitizeFileName($object->ref);
+//        $file = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref.'/'.$ref.'.pdf';
+
+//        if (is_readable($file))
+//        {
+            if ($_POST['sendto'])
+            {
+                // Le destinataire a ete fourni via le champ libre
+                $sendto = $_POST['sendto'];
+                $sendtoid = 0;
+            }
+            elseif ($_POST['receiver'] != '-1')
+            {
+                // Recipient was provided from combo list
+                if ($_POST['receiver'] == 'thirdparty') // Id of third party
+                {
+                    $sendto = $object->client->email;
+                    $sendtoid = 0;
+                }
+                else	// Id du contact
+                {
+                    $sendto = $object->client->contact_get_property($_POST['receiver'],'email');
+                    $sendtoid = $_POST['receiver'];
+                }
+            }
+
+            if (dol_strlen($sendto))
+            {
+                $langs->load("commercial");
+
+                $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+                $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
+                $message = $_POST['message'];
+                $sendtocc = $_POST['sendtocc'];
+                $deliveryreceipt = $_POST['deliveryreceipt'];
+
+                if ($action == 'send')
+                {
+                    if (dol_strlen($_POST['subject'])) $subject=$_POST['subject'];
+                    else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
+                    $actiontypecode='AC_SUP_INV';
+                    $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);
+                    }
+                    $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
+                }
+
+                // Create form object
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                $formmail = new FormMail($db);
+
+                $attachedfiles=$formmail->get_attached_files();
+                $filepath = $attachedfiles['paths'];
+                $filename = $attachedfiles['names'];
+                $mimetype = $attachedfiles['mimes'];
+
+                // Send mail
+                require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
+                if ($mailfile->error)
+                {
+                    setEventMessage($mailfile->error,'errors');
+                }
+                else
+                {
+                    $result=$mailfile->sendfile();
+                    if ($result)
+                    {
+                        $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));		// Must not contain "
+                        setEventMessage($mesg);
+
+                        $error=0;
+
+                        // Initialisation donnees
+                        $object->sendtoid		= $sendtoid;
+                        $object->actiontypecode	= $actiontypecode;
+                        $object->actionmsg		= $actionmsg;
+                        $object->actionmsg2		= $actionmsg2;
+                        $object->fk_element		= $object->id;
+                        $object->elementtype	= $object->element;
+
+                        // Appel des triggers
+                        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                        $interface=new Interfaces($db);
+                        $result=$interface->run_triggers('BILL_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
+                        if ($result < 0) {
+                            $error++; $object->errors=$interface->errors;
+                        }
+                        // Fin appel triggers
+
+                        if ($error)
+                        {
+                            dol_print_error($db);
+                        }
+                        else
+                        {
+                            // Redirect here
+                            // This avoid sending mail twice if going out and then back to page
+                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+                            exit;
+                        }
+                    }
+                    else
+                    {
+                        $langs->load("other");
+                        if ($mailfile->error)
+                        {
+                            $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+                            $mesg.='<br>'.$mailfile->error;
+                        }
+                        else
+                        {
+                            $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+                        }
+	                    setEventMessage($mesg, 'errors');
+                    }
+                }
+            }
+
+            else
+            {
+                $langs->load("other");
+	            setEventMessage($langs->trans('ErrorMailRecipientIsEmpty'), 'errors');
+                dol_syslog('Recipient email is empty');
+            }
+/*        }
+        else
+        {
+            $langs->load("errors");
+            $mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
+            dol_syslog('Failed to read file: '.$file);
+        }*/
+    }
+    else
+    {
+        $langs->load("other");
+	    setEventMessage($langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")), 'errors');
+        dol_syslog('Unable to read data from the invoice. The invoice file has perhaps not been generated.');
+    }
+
+    //$action = 'presend';
+}
+
+// Build document
+elseif ($action == 'builddoc')
+{
+	// Save modele used
+    $object->fetch($id);
+    $object->fetch_thirdparty();
+
+	// Save last template used to generate document
+	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+    $outputlangs = $langs;
+    $newlang=GETPOST('lang_id','alpha');
+    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+    if (! empty($newlang))
+    {
+        $outputlangs = new Translate("",$conf);
+        $outputlangs->setDefaultLang($newlang);
+    }
+	$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+    if ($result	<= 0)
+    {
+        dol_print_error($db,$result);
+        exit;
+    }
+}
+// Make calculation according to calculationrule
+elseif ($action == 'calculate')
+{
+	$calculationrule=GETPOST('calculationrule');
+
+    $object->fetch($id);
+    $object->fetch_thirdparty();
+	$result=$object->update_price(0, (($calculationrule=='totalofround')?'0':'1'), 0, $object->thirdparty);
+    if ($result	<= 0)
+    {
+        dol_print_error($db,$result);
+        exit;
+    }
+}
+// Delete file in doc form
+elseif ($action == 'remove_file')
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    if ($object->fetch($id))
+    {
+    	$object->fetch_thirdparty();
+        $upload_dir =	$conf->fournisseur->facture->dir_output . "/";
+        $file =	$upload_dir	. '/' .	GETPOST('file');
+        $ret=dol_delete_file($file,0,0,0,$object);
+        if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+        else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+    }
+}
+
+elseif ($action == 'update_extras')
+{
+	// Fill array 'array_options' with data from add form
+	$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	if($ret < 0) $error++;
+
+	if (!$error)
+	{
+		// Actions on extra fields (by external module or standard code)
+		// FIXME le hook fait double emploi avec le trigger !!
+		$hookmanager->initHooks(array('supplierinvoicedao'));
+		$parameters=array('id'=>$object->id);
+
+		$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$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=$object->insertExtraFields();
+
+				if ($result < 0)
+				{
+					$error++;
+				}
+
+			}
+		}
+		else if ($reshook < 0) $error++;
+	}
+	else
+	{
+		$action = 'edit_extras';
+	}
+}
+
+if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->facture->creer)
+{
+	if ($action == 'addcontact')
+	{
+		$result = $object->fetch($id);
+
+		if ($result > 0 && $id > 0)
+		{
+			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+			$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		}
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else
+		{
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$langs->load("errors");
+				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
+			}
+			else
+			{
+				setEventMessage($object->error, 'errors');
+			}
+		}
+	}
+
+	// bascule du statut d'un contact
+	else if ($action == 'swapstatut')
+	{
+		if ($object->fetch($id))
+		{
+			$result=$object->swapContactStatus(GETPOST('ligne'));
+		}
+		else
+		{
+			dol_print_error($db);
+		}
+	}
+
+	// Efface un contact
+	else if ($action == 'deletecontact')
+	{
+		$object->fetch($id);
+		$result = $object->delete_contact($_GET["lineid"]);
+
+		if ($result >= 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+		else {
+			dol_print_error($db);
+		}
+	}
+}
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$bankaccountstatic=new Account($db);
+
+llxHeader('','','');
+
+// Mode creation
+if ($action == 'create')
+{
+	$facturestatic = new FactureFournisseur($db);
+	$extralabels = $extrafields->fetch_name_optionals_label($facturestatic->table_element);
+	
+    print_fiche_titre($langs->trans('NewBill'));
+
+    dol_htmloutput_events();
+
+    $societe='';
+    if ($_GET['socid'])
+    {
+        $societe=new Societe($db);
+        $societe->fetch($_GET['socid']);
+    }
+
+    if (GETPOST('origin') && GETPOST('originid'))
+    {
+        // Parse element/subelement (ex: project_task)
+        $element = $subelement = GETPOST('origin');
+
+        if ($element == 'project')
+        {
+            $projectid=GETPOST('originid');
+            $element = 'projet';
+        }
+        else if (in_array($element,array('order_supplier')))
+        {
+            // For compatibility
+            if ($element == 'order')    {
+                $element = $subelement = 'commande';
+            }
+            if ($element == 'propal')   {
+                $element = 'comm/propal'; $subelement = 'propal';
+            }
+            if ($element == 'contract') {
+                $element = $subelement = 'contrat';
+            }
+            if ($element == 'order_supplier') {
+                $element = 'fourn'; $subelement = 'fournisseur.commande';
+            }
+
+            require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
+            $classname = ucfirst($subelement);
+            if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur';
+            $objectsrc = new $classname($db);
+            $objectsrc->fetch(GETPOST('originid'));
+            $objectsrc->fetch_thirdparty();
+
+            $projectid			= (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
+            //$ref_client			= (!empty($objectsrc->ref_client)?$object->ref_client:'');
+
+            $soc = $objectsrc->thirdparty;
+            $cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_supplier_id)?$soc->cond_reglement_supplier_id:1));
+            $mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_supplier_id)?$soc->mode_reglement_supplier_id:0));
+            $fk_account         = (! empty($objectsrc->fk_account)?$objectsrc->fk_account:(! empty($soc->fk_account)?$soc->fk_account:0));
+            $remise_percent 	= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
+            $remise_absolue 	= (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
+            $dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
+
+            $datetmp=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
+            $dateinvoice=($datetmp==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datetmp);
+            $datetmp=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
+            $datedue=($datetmp==''?-1:$datetmp);
+        }
+    }
+    else
+    {
+		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
+		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
+        $fk_account         = $societe->fk_account;
+        $datetmp=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
+        $dateinvoice=($datetmp==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datetmp);
+        $datetmp=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
+        $datedue=($datetmp==''?-1:$datetmp);
+    }
+
+    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+    print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
+    print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
+
+    print '<table class="border" width="100%">';
+
+    // Ref
+    print '<tr><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
+
+    // Third party
+    print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
+    print '<td>';
+
+    if ($_REQUEST['socid'] > 0)
+    {
+        print $societe->getNomUrl(1);
+        print '<input type="hidden" name="socid" value="'.$_GET['socid'].'">';
+    }
+    else
+    {
+        print $form->select_company((empty($_GET['socid'])?'':$_GET['socid']),'socid','s.fournisseur = 1',1);
+    }
+    print '</td></tr>';
+
+    // Ref supplier
+    print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier'])?$_POST['ref_supplier']:'').'" type="text"></td>';
+    print '</tr>';
+
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans('Type').'</td><td colspan="2">';
+    print '<table class="nobordernopadding">'."\n";
+
+    // Standard invoice
+    print '<tr height="18"><td width="16px" valign="middle">';
+    print '<input type="radio" name="type" value="0"'.($_POST['type']==0?' checked="checked"':'').'>';
+    print '</td><td valign="middle">';
+    $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
+    print $desc;
+    print '</td></tr>'."\n";
+
+    /*
+     // Deposit
+    print '<tr height="18"><td width="16px" valign="middle">';
+    print '<input type="radio" name="type" value="3"'.($_POST['type']==3?' checked="checked"':'').'>';
+    print '</td><td valign="middle">';
+    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
+    print $desc;
+    print '</td></tr>'."\n";
+
+    // Proforma
+    if (! empty($conf->global->FACTURE_USE_PROFORMAT))
+    {
+    print '<tr height="18"><td width="16px" valign="middle">';
+    print '<input type="radio" name="type" value="4"'.($_POST['type']==4?' checked="checked"':'').'>';
+    print '</td><td valign="middle">';
+    $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
+    print $desc;
+    print '</td></tr>'."\n";
+    }
+
+    // Replacement
+    print '<tr height="18"><td valign="middle">';
+    print '<input type="radio" name="type" value="1"'.($_POST['type']==1?' checked="checked"':'');
+    if (! $options) print ' disabled="disabled"';
+    print '>';
+    print '</td><td valign="middle">';
+    $text=$langs->trans("InvoiceReplacementAsk").' ';
+    $text.='<select class="flat" name="fac_replacement"';
+    if (! $options) $text.=' disabled="disabled"';
+    $text.='>';
+    if ($options)
+    {
+    $text.='<option value="-1">&nbsp;</option>';
+    $text.=$options;
+    }
+    else
+    {
+    $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
+    }
+    $text.='</select>';
+    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+    print $desc;
+    print '</td></tr>';
+
+    // Credit note
+    print '<tr height="18"><td valign="middle">';
+    print '<input type="radio" name="type" value="2"'.($_POST['type']==2?' checked=true':'');
+    if (! $optionsav) print ' disabled="disabled"';
+    print '>';
+    print '</td><td valign="middle">';
+    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
+    //	$text.='<input type="text" value="">';
+    $text.='<select class="flat" name="fac_avoir"';
+    if (! $optionsav) $text.=' disabled="disabled"';
+    $text.='>';
+    if ($optionsav)
+    {
+    $text.='<option value="-1">&nbsp;</option>';
+    $text.=$optionsav;
+    }
+    else
+    {
+    $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
+    }
+    $text.='</select>';
+    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+    print $desc;
+    print '</td></tr>'."\n";
+    */
+    print '</table>';
+    print '</td></tr>';
+
+    // Label
+    print '<tr><td>'.$langs->trans('Label').'</td><td><input size="30" name="libelle" value="'.(isset($_POST['libelle'])?$_POST['libelle']:'').'" type="text"></td></tr>';
+
+    // Date invoice
+    print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td>';
+    $form->select_date($dateinvoice,'','','','',"add",1,1);
+    print '</td></tr>';
+
+    // Due date
+    print '<tr><td>'.$langs->trans('DateMaxPayment').'</td><td>';
+    $form->select_date($datedue,'ech','','','',"add",1,1);
+    print '</td></tr>';
+
+	// Payment term
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	$form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id, 'cond_reglement_id');
+	print '</td></tr>';
+
+	// Payment mode
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	$form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id, 'mode_reglement_id', 'DBIT');
+	print '</td></tr>';
+
+	// Project
+	if (! empty($conf->projet->enabled)) {
+		$formproject = new FormProjets($db);
+
+		$langs->load('projects');
+		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
+		$formproject->select_projects($soc->id, $projectid, 'projectid');
+		print '</td></tr>';
+	}
+
+    // Bank Account
+    print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
+    $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+    print '</td></tr>';
+
+	// Public note
+	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
+    print '<td>';
+    $doleditor = new DolEditor('note_public', GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+    print $doleditor->Create(1);
+    print '</td>';
+   // print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
+    print '</tr>';
+
+    // Private note
+    print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
+    print '<td>';
+    $doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+    print $doleditor->Create(1);
+    print '</td>';
+    // print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
+    print '</tr>';
+    
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $object->showOptionals($extrafields, 'edit');
+	}
+
+    if (is_object($objectsrc))
+    {
+        print "\n<!-- ".$classname." info -->";
+        print "\n";
+        print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";
+        print '<input type="hidden" name="total"          value="'.$objectsrc->total_ttc.'">'."\n";
+        print '<input type="hidden" name="tva"            value="'.$objectsrc->total_tva.'">'."\n";
+        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+
+        $txt=$langs->trans($classname);
+        if ($classname=='CommandeFournisseur') {
+	        $langs->load('orders');
+	        $txt=$langs->trans("SupplierOrder");
+        }
+        print '<tr><td>'.$txt.'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+        print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
+        print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
+        if ($mysoc->country_code=='ES')
+        {
+            if ($mysoc->localtax1_assuj=="1" || $object->total_localtax1 != 0) //Localtax1
+            {
+                print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
+            }
+
+            if ($mysoc->localtax2_assuj=="1" || $object->total_localtax2 != 0) //Localtax2
+            {
+                print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
+            }
+        }
+        print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
+    }
+    else
+    {
+    	// TODO more bugs
+        if (1==2 && ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
+        {
+            print '<tr class="liste_titre">';
+            print '<td>&nbsp;</td>';
+            print '<td>'.$langs->trans('Label').'</td>';
+            print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
+            print '<td align="right">'.$langs->trans('VAT').'</td>';
+            print '<td align="right">'.$langs->trans('Qty').'</td>';
+            print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
+            print '</tr>';
+
+            for ($i = 1 ; $i < 9 ; $i++)
+            {
+                $value_qty = '1';
+                $value_tauxtva = '';
+                print '<tr><td>'.$i.'</td>';
+                print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>';
+                print '<td align="right"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>';
+                print '<td align="right">';
+                print $form->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
+                print '</td>';
+                print '<td align="right"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td>';
+                print '<td align="right"><input type="text" size="8" name="amountttc'.$i.'" value=""></td></tr>';
+            }
+        }
+    }
+
+    // Other options
+    $parameters=array('colspan' => ' colspan="6"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+
+    // Bouton "Create Draft"
+    print "</table>\n";
+
+    print '<br><center><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'"></center>';
+
+    print "</form>\n";
+
+
+    // Show origin lines
+    if (is_object($objectsrc))
+    {
+        print '<br>';
+
+        $title=$langs->trans('ProductsAndServices');
+        print_titre($title);
+
+        print '<table class="noborder" width="100%">';
+
+        $objectsrc->printOriginLinesList();
+
+        print '</table>';
+    }
+}
+else
+{
+    if ($id > 0 || ! empty($ref))
+    {
+        /* *************************************************************************** */
+        /*                                                                             */
+        /* Fiche en mode visu ou edition                                               */
+        /*                                                                             */
+        /* *************************************************************************** */
+
+        $now=dol_now();
+
+        $productstatic = new Product($db);
+
+        $object->fetch($id,$ref);
+        $result=$object->fetch_thirdparty();
+        if ($result < 0) dol_print_error($db);
+
+        $societe = new Fournisseur($db);
+        $result=$societe->fetch($object->socid);
+        if ($result < 0) dol_print_error($db);
+        
+        // fetch optionals attributes and labels
+		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+
+        /*
+         *	View card
+         */
+        $head = facturefourn_prepare_head($object);
+        $titre=$langs->trans('SupplierInvoice');
+
+        dol_fiche_head($head, 'card', $titre, 0, 'bill');
+
+        // Confirmation de la suppression d'une ligne produit
+        if ($action == 'confirm_delete_line')
+        {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_delete_line', '', 1, 1);
+        }
+
+        // Clone confirmation
+        if ($action == 'clone')
+        {
+            // Create an array for form
+            $formquestion=array(
+            //'text' => $langs->trans("ConfirmClone"),
+            //array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1)
+            );
+            // Paiement incomplet. On demande si motif = escompte ou autre
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$object->ref),'confirm_clone',$formquestion,'yes', 1);
+        }
+
+        // Confirmation de la validation
+        if ($action == 'valid')
+        {
+			 // on verifie si l'objet est en numerotation provisoire
+            $objectref = substr($object->ref, 1, 4);
+            if ($objectref == 'PROV')
+            {
+                $savdate=$object->date;
+                if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))
+                {
+                    $object->date=dol_now();
+                    //TODO: Possibly will have to control payment information into suppliers
+                    //$object->date_lim_reglement=$object->calculate_date_lim_reglement();
+                }
+                $numref = $object->getNextNumRef($societe);
+            }
+            else
+            {
+                $numref = $object->ref;
+            }
+
+            $text=$langs->trans('ConfirmValidateBill',$numref);
+            /*if (! empty($conf->notification->enabled))
+            {
+            	require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+            	$notify=new Notify($db);
+            	$text.='<br>';
+            	$text.=$notify->confirmMessage('BILL_SUPPLIER_VALIDATE',$object->socid);
+            }*/
+            $formquestion=array();
+
+            $qualified_for_stock_change=0;
+		    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+		    {
+		    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
+		    }
+		    else
+		    {
+		    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
+		    }
+
+            if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+            {
+                $langs->load("stocks");
+                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+                $formproduct=new FormProduct($db);
+                $formquestion=array(
+                //'text' => $langs->trans("ConfirmClone"),
+                //array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
+                //array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
+                array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockIncrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)));
+            }
+
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, 1, 1, 240);
+
+        }
+
+        // Confirmation set paid
+        if ($action == 'paid')
+        {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
+
+        }
+
+        // Confirmation de la suppression de la facture fournisseur
+        if ($action == 'delete')
+        {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
+
+        }
+
+		if (!$formconfirm) {
+			$parameters=array('lineid'=>$lineid);
+			$formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		}
+
+		// Print form confirm
+		print $formconfirm;
+
+
+        /**
+         * 	Invoice
+         */
+        print '<table class="border" width="100%">';
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+        // Ref
+        print '<tr><td class="nowrap" width="20%">'.$langs->trans("Ref").'</td><td colspan="4">';
+        print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+        print '</td>';
+        print "</tr>\n";
+
+        // Ref supplier
+        print '<tr><td>'.$form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'</td><td colspan="4">';
+        print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer));
+        print '</td></tr>';
+
+        // Third party
+        print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="4">'.$societe->getNomUrl(1,'supplier');
+        print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->socid.'">'.$langs->trans('OtherBills').'</a>)</td>';
+        print '</tr>';
+
+        // Type
+        print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
+        print $object->getLibType();
+        if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
+        {
+            $facreplaced=new FactureFournisseur($db);
+            $facreplaced->fetch($object->fk_facture_source);
+            print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
+        }
+        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+        {
+            $facusing=new FactureFournisseur($db);
+            $facusing->fetch($object->fk_facture_source);
+            print ' ('.$langs->transnoentities("CorrectInvoice",$facusing->getNomUrl(1)).')';
+        }
+
+        $facidavoir=$object->getListIdAvoirFromInvoice();
+        if (count($facidavoir) > 0)
+        {
+            print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+            $i=0;
+            foreach($facidavoir as $id)
+            {
+                if ($i==0) print ' ';
+                else print ',';
+                $facavoir=new FactureFournisseur($db);
+                $facavoir->fetch($id);
+                print $facavoir->getNomUrl(1);
+            }
+            print ')';
+        }
+        if (isset($facidnext) && $facidnext > 0)
+        {
+            $facthatreplace=new FactureFournisseur($db);
+            $facthatreplace->fetch($facidnext);
+            print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
+        }
+        print '</td></tr>';
+
+        // Label
+        print '<tr><td>'.$form->editfieldkey("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'</td>';
+        print '<td colspan="3">'.$form->editfieldval("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'</td>';
+
+        /*
+         * List of payments
+         */
+        $nbrows=9; $nbcols=2;
+        if (! empty($conf->projet->enabled)) $nbrows++;
+        if (! empty($conf->banque->enabled)) { $nbrows++; $nbcols++; }
+
+        // Local taxes
+        if ($societe->localtax1_assuj=="1") $nbrows++;
+        if ($societe->localtax2_assuj=="1") $nbrows++;
+
+        print '<td rowspan="'.$nbrows.'" valign="top">';
+
+        $sql = 'SELECT p.datep as dp, p.num_paiement, p.rowid, p.fk_bank,';
+        $sql.= ' c.id as paiement_type,';
+        $sql.= ' pf.amount,';
+        $sql.= ' ba.rowid as baid, ba.ref, ba.label';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_paiementfourn = p.rowid';
+        $sql.= ' WHERE pf.fk_facturefourn = '.$object->id;
+        $sql.= ' ORDER BY p.datep, p.tms';
+
+        $result = $db->query($sql);
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            $i = 0; $totalpaye = 0;
+            print '<table class="nobordernopadding" width="100%">';
+            print '<tr class="liste_titre">';
+            print '<td>'.$langs->trans('Payments').'</td>';
+            print '<td>'.$langs->trans('Type').'</td>';
+            if (! empty($conf->banque->enabled)) print '<td align="right">'.$langs->trans('BankAccount').'</td>';
+            print '<td align="right">'.$langs->trans('Amount').'</td>';
+            print '<td width="18">&nbsp;</td>';
+            print '</tr>';
+
+            $var=true;
+            if ($num > 0)
+            {
+                while ($i < $num)
+                {
+                    $objp = $db->fetch_object($result);
+                    $var=!$var;
+                    print '<tr '.$bc[$var].'>';
+                    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."</a></td>\n";
+                    print '<td>';
+                    print $form->form_modes_reglement(null, $objp->paiement_type,'none').' '.$objp->num_paiement;
+                    print '</td>';
+                    if (! empty($conf->banque->enabled))
+                    {
+                        $bankaccountstatic->id=$objp->baid;
+                        $bankaccountstatic->ref=$objp->ref;
+                        $bankaccountstatic->label=$objp->ref;
+                        print '<td align="right">';
+                        if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions');
+                        print '</td>';
+                    }
+                    print '<td align="right">'.price($objp->amount).'</td>';
+                    print '<td align="center">';
+                    if ($object->statut == 1 && $object->paye == 0 && $user->societe_id == 0)
+                    {
+                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepaiement&paiement_id='.$objp->rowid.'">';
+                        print img_delete();
+                        print '</a>';
+                    }
+                    print '</td>';
+                    print '</tr>';
+                    $totalpaye += $objp->amount;
+                    $i++;
+                }
+            }
+            else
+            {
+                 print '<tr '.$bc[$var].'><td colspan="'.$nbcols.'">'.$langs->trans("None").'</td><td></td><td></td></tr>';
+            }
+
+            if ($object->paye == 0)
+            {
+                print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans('AlreadyPaid').' :</td><td align="right"><b>'.price($totalpaye).'</b></td><td></td></tr>';
+                print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("Billed").' :</td><td align="right" style="border: 1px solid;">'.price($object->total_ttc).'</td><td></td></tr>';
+
+                $resteapayer = $object->total_ttc - $totalpaye;
+
+                print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans('RemainderToPay').' :</td>';
+                print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($resteapayer).'</b></td><td></td></tr>';
+            }
+            print '</table>';
+            $db->free($result);
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+        print '</td>';
+
+        print '</tr>';
+
+        // Date
+        print '<tr><td>'.$form->editfieldkey("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').'</td><td colspan="3">';
+        print $form->editfieldval("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker');
+        print '</td>';
+
+        // Due date
+        print '<tr><td>'.$form->editfieldkey("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').'</td><td colspan="3">';
+        print $form->editfieldval("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker');
+        if ($action != 'editdate_lim_reglement' && $object->statut < 2 && $object->date_echeance && $object->date_echeance < ($now - $conf->facture->fournisseur->warning_delay)) print img_warning($langs->trans('Late'));
+        print '</td>';
+
+		// Conditions de reglement par defaut
+		$langs->load('bills');
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('PaymentConditions');
+		print '<td>';
+		if ($action != 'editconditions') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		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');
+		}
+		print "</td>";
+		print '</tr>';
+
+		// Mode of payment
+		$langs->load('bills');
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('PaymentMode');
+		print '</td>';
+		if ($action != 'editmode') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		if ($action == 'editmode')
+		{
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT');
+		}
+		else
+		{
+			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', 'DBIT');
+		}
+		print '</td></tr>';
+
+        // Bank Account
+        print '<tr><td class="nowrap">';
+        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+        print $langs->trans('BankAccount');
+        print '<td>';
+        if ($action != 'editbankaccount' && $user->rights->fournisseur->facture->creer)
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="3">';
+        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 "</td>";
+        print '</tr>';
+
+        // Status
+        $alreadypaid=$object->getSommePaiement();
+        print '<tr><td>'.$langs->trans('Status').'</td><td colspan="3">'.$object->getLibStatut(4,$alreadypaid).'</td></tr>';
+
+        print '<tr><td>'.$langs->trans('AmountHT').'</td><td align="right">'.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'</td><td colspan="2" align="left">&nbsp;</td></tr>';
+        print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'</td><td colspan="2" align="left">';
+        if (GETPOST('calculationrule')) $calculationrule=GETPOST('calculationrule','alpha');
+        else $calculationrule=(empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)?'totalofround':'roundoftotal');
+        if ($calculationrule == 'totalofround') $calculationrulenum=1;
+        else  $calculationrulenum=2;
+        $s=$langs->trans("ReCalculate").' ';
+        $s.='<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
+        $s.=' / ';
+        $s.='<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").'</a>';
+        print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc",$calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('','help'));
+        print '</td></tr>';
+
+        // Amount Local Taxes
+        //TODO: Place into a function to control showing by country or study better option
+        if ($societe->localtax1_assuj=="1") //Localtax1
+        {
+            print '<tr><td>'.$langs->transcountry("AmountLT1",$societe->country_code).'</td>';
+            print '<td align="right">'.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'</td>';
+            print '<td colspan="2">&nbsp;</td></tr>';
+        }
+        if ($societe->localtax2_assuj=="1") //Localtax2
+        {
+            print '<tr><td>'.$langs->transcountry("AmountLT2",$societe->country_code).'</td>';
+            print '<td align="right">'.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'</td>';
+            print '<td colspan="2">&nbsp;</td></tr>';
+        }
+        print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right">'.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'</td><td colspan="2" align="left">&nbsp;</td></tr>';
+
+        // Project
+        if (! empty($conf->projet->enabled))
+        {
+            $langs->load('projects');
+            print '<tr>';
+            print '<td>';
+
+            print '<table class="nobordernopadding" width="100%"><tr><td>';
+            print $langs->trans('Project');
+            print '</td>';
+            if ($action != 'classify')
+            {
+                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+                print img_edit($langs->trans('SetProject'),1);
+                print '</a></td>';
+            }
+            print '</tr></table>';
+
+            print '</td><td colspan="3">';
+            if ($action == 'classify')
+            {
+                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
+            }
+            else
+            {
+                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+            }
+            print '</td>';
+            print '</tr>';
+        }
+
+        // Other attributes
+        $cols = 4;
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+        print '</table>';
+
+        if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+        {
+        	print '<br>';
+        	$blocname = 'contacts';
+        	$title = $langs->trans('ContactsAddresses');
+        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+        }
+
+        if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+        {
+        	$colwidth=20;
+        	$blocname = 'notes';
+        	$title = $langs->trans('Notes');
+        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+        }
+
+
+        /*
+         * Lines
+         */
+
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?etat=1&id='.$object->id.(($action != 'edit_line')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+		<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
+		<input type="hidden" name="action" value="'.(($action != 'edit_line')?'addline':'update_line').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="'.$object->id.'">
+        <input type="hidden" name="facid" value="'.$object->id.'">
+        <input type="hidden" name="socid" value="'.$societe->id.'">
+
+		';
+
+
+        print '<br>';
+        print '<table id="tablelines" class="noborder noshadow" width="100%">';
+        $var=1;
+        $num=count($object->lines);
+        for ($i = 0; $i < $num; $i++)
+        {
+            if ($i == 0)
+            {
+                print '<tr class="liste_titre"><td>'.$langs->trans('Label').'</td>';
+                print '<td align="right">'.$langs->trans('VAT').'</td>';
+                print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
+                print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
+                print '<td align="right">'.$langs->trans('Qty').'</td>';
+                print '<td align="right">'.$langs->trans('ReductionShort').'</td>';
+                print '<td align="right">'.$langs->trans('TotalHTShort').'</td>';
+                print '<td align="right">'.$langs->trans('TotalTTCShort').'</td>';
+                print '<td>&nbsp;</td>';
+                print '<td>&nbsp;</td>';
+                print '</tr>';
+            }
+
+            // Show product and description
+            $type=(! empty($object->lines[$i]->product_type)?$object->lines[$i]->product_type:(! empty($object->lines[$i]->fk_product_type)?$object->lines[$i]->fk_product_type:0));
+            // Try to enhance type detection using date_start and date_end for free lines where type was not saved.
+            $date_start='';
+            $date_end='';
+            if (! empty($object->lines[$i]->date_start))
+            {
+            	$date_start=$object->lines[$i]->date_start;
+            	$type=1;
+            }
+            if (! empty($object->lines[$i]->date_end))
+            {
+            	$date_end=$object->lines[$i]->date_end;
+            	$type=1;
+            }
+
+            $var=!$var;
+
+            // Edit line
+            if ($object->statut == 0 && $action == 'edit_line' && $_GET['etat'] == '0' && $_GET['lineid'] == $object->lines[$i]->rowid)
+            {
+                print '<tr '.$bc[$var].'>';
+
+                // Show product and description
+                print '<td>';
+
+                print '<input type="hidden" name="lineid" value="'.$object->lines[$i]->rowid.'">';
+
+                if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $object->lines[$i]->fk_product > 0)
+                {
+                    print '<input type="hidden" name="idprod" value="'.$object->lines[$i]->fk_product.'">';
+                    $product_static=new ProductFournisseur($db);
+                    $product_static->fetch($object->lines[$i]->fk_product);
+                    $text=$product_static->getNomUrl(1);
+                    $text.= ' - '.$product_static->libelle;
+                    print $text;
+                    print '<br>';
+                }
+                else
+				{
+                    $forceall=1;	// For suppliers, we always show all types
+                    print $form->select_type_of_lines($object->lines[$i]->product_type,'type',1,0,$forceall);
+                    if ($forceall || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+                    || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
+                }
+
+                if (is_object($hookmanager))
+                {
+                    $parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$object->lines[$i],'var'=>$var,'num'=>$num,'i'=>$i);
+                    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
+                }
+
+                $nbrows=ROWS_2;
+                if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+                $doleditor=new DolEditor('desc',$object->lines[$i]->description,'',128,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+                $doleditor->Create();
+                print '</td>';
+
+                // VAT
+                print '<td align="right">';
+                print $form->load_tva('tauxtva',$object->lines[$i]->tva_tx,$societe,$mysoc);
+                print '</td>';
+
+                // Unit price
+                print '<td align="right" class="nowrap"><input size="4" name="puht" type="text" value="'.price($object->lines[$i]->pu_ht).'"></td>';
+
+                print '<td align="right" class="nowrap"><input size="4" name="puttc" type="text" value=""></td>';
+
+                print '<td align="right"><input size="1" name="qty" type="text" value="'.$object->lines[$i]->qty.'"></td>';
+
+                print '<td align="right" class="nowrap"><input size="1" name="remise_percent" type="text" value="'.$object->lines[$i]->remise_percent.'"><span class="hideonsmartphone">%</span></td>';
+
+                print '<td align="right" class="nowrap">&nbsp;</td>';
+
+                print '<td align="right" class="nowrap">&nbsp;</td>';
+
+                print '<td align="center" colspan="2"><input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
+                print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
+
+                print '</tr>';
+            }
+            else // Affichage simple de la ligne
+            {
+                print '<tr id="row-'.$object->lines[$i]->rowid.'" '.$bc[$var].'>';
+
+                // Show product and description
+                print '<td>';
+                if ($object->lines[$i]->fk_product)
+                {
+                    print '<a name="'.$object->lines[$i]->rowid.'"></a>'; // ancre pour retourner sur la ligne
+
+                    $product_static=new ProductFournisseur($db);
+                    $product_static->fetch($object->lines[$i]->fk_product);
+                    $text=$product_static->getNomUrl(1);
+                    $text.= ' - '.$product_static->libelle;
+                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($object->lines[$i]->description));
+                    print $form->textwithtooltip($text,$description,3,'','',$i);
+
+                    // Show range
+                    print_date_range($date_start,$date_end);
+
+                    // Add description in form
+                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) print ($object->lines[$i]->description && $object->lines[$i]->description!=$product_static->libelle)?'<br>'.dol_htmlentitiesbr($object->lines[$i]->description):'';
+                }
+
+                // Description - Editor wysiwyg
+                if (! $object->lines[$i]->fk_product)
+                {
+                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
+                    else $text = img_object($langs->trans('Product'),'product');
+                    print $text.' '.nl2br($object->lines[$i]->description);
+
+                    // Show range
+                    print_date_range($date_start,$date_end);
+                }
+
+                if (is_object($hookmanager))
+                {
+                	$parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$object->lines[$i],'var'=>$var,'num'=>$num,'i'=>$i);
+                	$reshook=$hookmanager->executeHooks('formViewProductSupplierOptions',$parameters,$object,$action);
+                }
+                print '</td>';
+
+                // VAT
+                print '<td align="right">'.vatrate($object->lines[$i]->tva_tx, true, $object->lines[$i]->info_bits).'</td>';
+
+                // Unit price
+                print '<td align="right" class="nowrap">'.price($object->lines[$i]->pu_ht,'MU').'</td>';
+
+                print '<td align="right" class="nowrap">'.($object->lines[$i]->pu_ttc?price($object->lines[$i]->pu_ttc,'MU'):'&nbsp;').'</td>';
+
+                print '<td align="right">'.$object->lines[$i]->qty.'</td>';
+
+                print '<td align="right">'.(($object->lines[$i]->remise_percent > 0)?$object->lines[$i]->remise_percent.'%':'').'</td>';
+
+                print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ht).'</td>';
+
+                print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ttc).'</td>';
+
+				if (is_object($hookmanager))
+				{
+					$parameters=array('line'=>$object->lines[$i],'num'=>$num,'i'=>$i);
+					$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
+				}
+
+                print '<td align="center" width="16">';
+                if ($object->statut == 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;etat=0&amp;lineid='.$object->lines[$i]->rowid.'">'.img_edit().'</a>';
+                else print '&nbsp;';
+                print '</td>';
+
+                print '<td align="center" width="16">';
+                if ($object->statut == 0)
+                {
+                	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=confirm_delete_line&amp;lineid='.$object->lines[$i]->rowid.'">'.img_delete().'</a>';
+                }
+                else print '&nbsp;';
+                print '</td>';
+
+                print '</tr>';
+            }
+
+        }
+
+		// Form to add new line
+        if ($object->statut == 0 && $action != 'edit_line')
+        {
+       		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
+			$forceall=1; $senderissupplier=1; $dateSelector=0; $inputalsopricewithtax=1;
+			if ($object->statut == 0 && $user->rights->fournisseur->facture->creer)
+			{
+				if ($action != 'editline')
+				{
+					$var = true;
+
+					// Add free products/services
+					$object->formAddObjectLine(1, $societe, $mysoc);
+
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				}
+			}
+        }
+
+        print '</table>';
+
+        print '</form>';
+
+        dol_fiche_end();
+
+
+        if ($action != 'presend')
+        {
+            /*
+             * Boutons actions
+             */
+
+            print '<div class="tabsAction">';
+
+		    // Modify a validated invoice with no payments
+			if ($object->statut == 1 && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+			}
+
+ 	 		// Reopen a standard paid invoice
+            if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT) && ($object->statut == 2 || $object->statut == 3))				// A paid invoice (partially or completely)
+            {
+                if (! $facidnext && $object->close_code != 'replaced')	// Not replaced by another invoice
+                {
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
+                }
+                else
+                {
+                    print '<span class="butActionRefused" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
+                }
+            }
+
+            // Send by mail
+            if (($object->statut == 1 || $object->statut == 2))
+            {
+                if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
+                {
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+                }
+                else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+            }
+
+
+            // Make payments
+            if ($action != 'edit' && $object->statut == 1 && $object->paye == 0  && $user->societe_id == 0)
+            {
+                print '<a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create &amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPayment').'</a>';	// must use facid because id is for payment id not invoice
+            }
+
+            // Classify paid
+            if ($action != 'edit' && $object->statut == 1 && $object->paye == 0  && $user->societe_id == 0)
+            {
+                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
+                print '>'.$langs->trans('ClassifyPaid').'</a>';
+
+                //print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
+            }
+
+            // Validate
+            if ($action != 'edit' && $object->statut == 0)
+            {
+                if (count($object->lines))
+                {
+                    if ($user->rights->fournisseur->facture->valider)
+                    {
+                        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+                        print '>'.$langs->trans('Validate').'</a>';
+                    }
+                    else
+                    {
+                        print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
+                        print '>'.$langs->trans('Validate').'</a>';
+                    }
+                }
+            }
+
+            // Clone
+            if ($action != 'edit' && $user->rights->fournisseur->facture->creer)
+            {
+                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=clone&amp;socid='.$object->socid.'">'.$langs->trans('ToClone').'</a>';
+            }
+
+            // Delete
+            if ($action != 'edit' && $user->rights->fournisseur->facture->supprimer)
+            {
+                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+            }
+            print '</div>';
+            print '<br>';
+
+            if ($action != 'edit')
+            {
+				print '<div class="fichecenter"><div class="fichehalfleft">';
+            	//print '<table width="100%"><tr><td width="50%" valign="top">';
+                //print '<a name="builddoc"></a>'; // ancre
+
+                /*
+                 * Documents generes
+                */
+
+                $ref=dol_sanitizeFileName($object->ref);
+                $subdir = get_exdir($object->id,2).$ref;
+                $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref;
+                $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
+                $genallowed=$user->rights->fournisseur->facture->creer;
+                $delallowed=$user->rights->fournisseur->facture->supprimer;
+                $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)?'':$conf->global->INVOICE_SUPPLIER_ADDON_PDF));
+
+                print $formfile->showdocuments('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang);
+                $somethingshown=$formfile->numoffiles;
+
+                /*
+                 * Linked object block
+                 */
+                $somethingshown=$object->showLinkedObjectBlock();
+
+                $linktoelem='';
+
+                if (empty($somethingshown) && ! empty($conf->fournisseur->enabled))
+                {
+                	$linktoelem.=($linktoelem?' &nbsp; ':'').'<a href="#" id="linktoorder">' . $langs->trans('LinkedOrder') . '</a>';
+
+                	print '
+						<script type="text/javascript" language="javascript">
+						jQuery(document).ready(function() {
+							jQuery("#linktoorder").click(function() {
+								jQuery("#orderlist").toggle();
+								jQuery("#linktoorder").toggle();
+                			});
+						});
+						</script>
+						';
+
+                	print '<div id="orderlist" style="display:none">';
+
+                	$sql = "SELECT s.rowid as socid, s.nom as name, s.client, c.rowid, c.ref, c.ref_supplier, c.total_ht";
+                	$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+                	$sql .= ", " . MAIN_DB_PREFIX . "commande_fournisseur as c";
+                	$sql .= ' WHERE c.fk_soc = s.rowid AND c.fk_soc = ' . $societe->id;
+
+                	$resqlorderlist = $db->query($sql);
+                	if ($resqlorderlist) {
+                		$num = $db->num_rows($resqlorderlist);
+                		$i = 0;
+
+                		print '<br><form action="" method="POST" name="LinkedOrder">';
+                		print '<table class="noborder">';
+                		print '<tr class="liste_titre">';
+                		print '<td class="nowrap"></td>';
+                		print '<td align="center">' . $langs->trans("Ref") . '</td>';
+                		print '<td align="left">' . $langs->trans("RefSupplier") . '</td>';
+                		print '<td align="left">' . $langs->trans("AmountHTShort") . '</td>';
+                		print '<td align="left">' . $langs->trans("Company") . '</td>';
+                		print '</tr>';
+                		while ($i < $num) {
+                			$objp = $db->fetch_object($resqlorderlist);
+                			if ($objp->socid == $societe->id) {
+                				$var = ! $var;
+                				print '<tr ' . $bc [$var] . '>';
+                				print '<td aling="left">';
+                				print '<input type="radio" name="linkedOrder" value=' . $objp->rowid . '>';
+                				print '<td align="center">' . $objp->ref . '</td>';
+                				print '<td>' . $objp->ref_supplier . '</td>';
+                				print '<td>' . price($objp->total_ht) . '</td>';
+                				print '<td>' . $objp->name . '</td>';
+                				print '</td>';
+                				print '</tr>';
+                			}
+
+                			$i ++;
+                		}
+                		print '</table>';
+                		print '<br><center><input type="submit" class="button" value="' . $langs->trans('ToLink') . '"> &nbsp; <input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></center>';
+                		print '</form>';
+                		$db->free($resqlorderlist);
+                	} else {
+                		dol_print_error($db);
+                	}
+
+                	print '</div>';
+                }
+
+				// Show link to elements
+				if ($linktoelem) print '<br>'.$linktoelem;
+
+				print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+                //print '</td><td valign="top" width="50%">';
+                //print '<br>';
+
+                // List of actions on element
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+                $formactions=new FormActions($db);
+                $somethingshown=$formactions->showactions($object,'invoice_supplier',$socid);
+
+				print '</div></div></div>';
+                //print '</td></tr></table>';
+            }
+        }
+        /*
+         * Show mail form
+        */
+        if ($action == 'presend')
+        {
+            $ref = dol_sanitizeFileName($object->ref);
+            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref, preg_quote($ref,'/'));
+            $file=$fileparams['fullname'];
+
+            // Define output language
+            $outputlangs = $langs;
+            $newlang = '';
+            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+            	$newlang = $_REQUEST['lang_id'];
+            if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+            	$newlang = $object->client->default_lang;
+
+            if (!empty($newlang))
+            {
+                $outputlangs = new Translate('', $conf);
+                $outputlangs->setDefaultLang($newlang);
+                $outputlangs->load('bills');
+            }
+
+            // Build document if it not exists
+            if (! $file || ! is_readable($file))
+            {
+	            $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+                if ($result <= 0)
+                {
+                    dol_print_error($db,$result);
+                    exit;
+                }
+                $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref, preg_quote($ref,'/'));
+                $file=$fileparams['fullname'];
+            }
+
+            print '<br>';
+            print_titre($langs->trans('SendBillByMail'));
+
+            // Cree l'objet formulaire mail
+            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+            $formmail = new FormMail($db);
+            $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+            $formmail->fromtype = 'user';
+            $formmail->fromid   = $user->id;
+            $formmail->fromname = $user->getFullName($langs);
+            $formmail->frommail = $user->email;
+            $formmail->withfrom=1;
+			$liste=array();
+			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+			$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
+			$formmail->withtocc=$liste;
+            $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
+            $formmail->withtopic=$outputlangs->trans('SendBillRef','__FACREF__');
+            $formmail->withfile=2;
+            $formmail->withbody=1;
+            $formmail->withdeliveryreceipt=1;
+            $formmail->withcancel=1;
+            // Tableau des substitutions
+            $formmail->substit['__FACREF__']=$object->ref;
+            $formmail->substit['__SIGNATURE__']=$user->signature;
+            $formmail->substit['__PERSONALIZED__']='';
+            $formmail->substit['__CONTACTCIVNAME__']='';
+
+            //Find the good contact adress
+            $custcontact='';
+            $contactarr=array();
+            $contactarr=$object->liste_contact(-1,'external');
+
+            if (is_array($contactarr) && count($contactarr)>0) {
+            	foreach($contactarr as $contact) {
+            		if ($contact['libelle']==$langs->trans('TypeContact_invoice_supplier_external_BILLING')) {
+            			require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+            			$contactstatic=new Contact($db);
+            			$contactstatic->fetch($contact['id']);
+            			$custcontact=$contactstatic->getFullName($langs,1);
+            		}
+            	}
+
+            	if (!empty($custcontact)) {
+            		$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
+            	}
+            }
+
+            // Tableau des parametres complementaires
+            $formmail->param['action']='send';
+            $formmail->param['models']='invoice_supplier_send';
+            $formmail->param['facid']=$object->id;
+            $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+
+            // Init list of files
+            if (GETPOST("mode")=='init')
+            {
+                $formmail->clear_attached_files();
+                $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+            }
+
+            // Show form
+            print $formmail->get_form();
+
+            print '<br>';
+        }
+    }
+}
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 25361746869..aaee42e9add 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Patrick Rouillon	<patrick@rouillon.net>
- * Copyright (C) 2005-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -69,11 +69,11 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -125,7 +125,6 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
@@ -156,9 +155,54 @@ if ($id > 0 || ! empty($ref))
 		// Third party
 		print "<tr><td>".$langs->trans("Supplier")."</td>";
 		print '<td colspan="3">'.$object->thirdparty->getNomUrl(1,'supplier').'</td></tr>';
+
+		// Type
+		print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
+		print $object->getLibType();
+		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
+		{
+			$facreplaced=new FactureFournisseur($db);
+			$facreplaced->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
+		}
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+		{
+			$facusing=new FactureFournisseur($db);
+			$facusing->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("CorrectInvoice",$facusing->getNomUrl(1)).')';
+		}
+
+		$facidavoir=$object->getListIdAvoirFromInvoice();
+		if (count($facidavoir) > 0)
+		{
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+			$i=0;
+			foreach($facidavoir as $fid)
+			{
+				if ($i==0) print ' ';
+				else print ',';
+				$facavoir=new FactureFournisseur($db);
+				$facavoir->fetch($fid);
+				print $facavoir->getNomUrl(1);
+			}
+			print ')';
+		}
+		if ($facidnext > 0)
+		{
+			$facthatreplace=new FactureFournisseur($db);
+			$facthatreplace->fetch($facidnext);
+			print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
+		}
+		print '</td></tr>';
+
+		// Label
+		print '<tr><td>'.$form->editfieldkey("Label",'label',$object->label,$object,0).'</td><td colspan="3">';
+		print $form->editfieldval("Label",'label',$object->label,$object,0);
+		print '</td></tr>';
+
 		print "</table>";
 
-		print '</div>';
+		dol_fiche_end();
 
 		print '<br>';
 
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 79c826a85e9..c7219c6e415 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -168,8 +168,12 @@ if ($object->id > 0)
 	print $form->editfieldval("Label",'label',$object->label,$object,0);
 	print '</td>';
 
+	print '</table><br>';
+
+	print '<table class="border" width="100%">';
+
 	// Nb of files
-	print '<tr><td>'.$langs->trans('NbOfAttachedFiles').'</td><td colspan="3">'.count($filearray).'</td></tr>';
+	print '<tr><td width="30%" class="nowrap">'.$langs->trans('NbOfAttachedFiles').'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 	print '<tr><td>'.$langs->trans('TotalSizeOfAttachedFiles').'</td><td colspan="3">'.$totalsize.' '.$langs->trans('bytes').'</td></tr>';
 
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
deleted file mode 100644
index 98522e21342..00000000000
--- a/htdocs/fourn/facture/fiche.php
+++ /dev/null
@@ -1,2351 +0,0 @@
-<?php
-/* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013	Laurent Destailleur 	<eldy@users.sourceforge.net>
- * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
- * Copyright (C) 2005		Marc Barilley			<marc@ocebo.fr>
- * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013		Philippe Grand			<philippe.grand@atoo-net.com>
- * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/fourn/facture/fiche.php
- *	\ingroup    facture, fournisseur
- *	\brief      Page for supplier invoice card (view, edit, validate)
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->produit->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-
-
-$langs->load('bills');
-$langs->load('compta');
-$langs->load('suppliers');
-$langs->load('companies');
-$langs->load('products');
-$langs->load('banks');
-
-$mesg='';
-$errors=array();
-$id			= (GETPOST('facid','int') ? GETPOST('facid','int') : GETPOST('id','int'));
-$action		= GETPOST("action");
-$confirm	= GETPOST("confirm");
-$ref		= GETPOST('ref','alpha');
-
-//PDF
-$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-$hidedesc 	 = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ?  1 : 0));
-$hideref 	 = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
-
-// Security check
-$socid='';
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('invoicesuppliercard'));
-
-$object=new FactureFournisseur($db);
-
-// Load object
-if ($id > 0 || ! empty($ref))
-{
-	$ret=$object->fetch($id, $ref);
-}
-
-$permissionnote=$user->rights->fournisseur->facture->creer;	// Used by the include of actions_setnotes.inc.php
-
-
-/*
- * Actions
- */
-
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
-
-// Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes')
-{
-    if (1==0 && empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
-    {
-        $mesg='<div class="error">'.$langs->trans("NoCloneOptionsSpecified").'</div>';
-    }
-    else
-    {
-        $result=$object->createFromClone($id);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER['PHP_SELF'].'?action=editref_supplier&id='.$result);
-            exit;
-        }
-        else
-        {
-            $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-            $action='';
-        }
-    }
-}
-
-elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fournisseur->facture->valider)
-{
-    $idwarehouse=GETPOST('idwarehouse');
-
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-
-    $qualified_for_stock_change=0;
-    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-    {
-    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-    }
-    else
-    {
-    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-    }
-
-    // Check parameters
-    if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-    {
-        $langs->load("stocks");
-        if (! $idwarehouse || $idwarehouse == -1)
-        {
-            $error++;
-            $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
-            $action='';
-        }
-    }
-
-    if (! $error)
-    {
-        $result = $object->validate($user,'',$idwarehouse);
-        if ($result < 0)
-        {
-            setEventMessage($object->error,'errors');
-            setEventMessage($object->errors,'errors');
-        }
-    }
-}
-
-elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->facture->supprimer)
-{
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-    $result=$object->delete($id);
-    if ($result > 0)
-    {
-        header('Location: list.php');
-        exit;
-    }
-    else
-    {
-        $mesg='<div class="error">'.$object->error.'</div>';
-    }
-}
-
-elseif ($action == 'confirm_delete_line' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
-{
-	$object->fetch($id);
-	$ret = $object->deleteline(GETPOST('lineid'));
-	if ($ret > 0)
-	{
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-		/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
-		$action='';
-	}
-}
-
-elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
-{
-    $object->fetch($id);
-    $result=$object->set_paid($user);
-    if ($result<0)
-    {
-        setEventMessage($object->error,'errors');
-    }
-}
-
-// Set supplier ref
-if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
-{
-    $result=$object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
-    if ($result < 0) dol_print_error($db, $object->error);
-}
-
-// conditions de reglement
-if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
-{
-    $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
-}
-
-// mode de reglement
-else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
-{
-    $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
-}
-
-
-// Set label
-elseif ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
-{
-    $object->fetch($id);
-    $object->label=$_POST['label'];
-    $result=$object->update($user);
-    if ($result < 0) dol_print_error($db);
-}
-elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
-{
-    $object->fetch($id);
-    $object->date=dol_mktime(12,0,0,$_POST['datefmonth'],$_POST['datefday'],$_POST['datefyear']);
-    if ($object->date_echeance && $object->date_echeance < $object->date) $object->date_echeance=$object->date;
-    $result=$object->update($user);
-    if ($result < 0) dol_print_error($db,$object->error);
-}
-elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
-{
-    $object->fetch($id);
-    $object->date_echeance=dol_mktime(12,0,0,$_POST['date_lim_reglementmonth'],$_POST['date_lim_reglementday'],$_POST['date_lim_reglementyear']);
-    if (! empty($object->date_echeance) && $object->date_echeance < $object->date)
-    {
-    	$object->date_echeance=$object->date;
-    	setEventMessage($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"),'warnings');
-    }
-    $result=$object->update($user);
-    if ($result < 0) dol_print_error($db,$object->error);
-}
-
-// Delete payment
-elseif ($action == 'deletepaiement' && $user->rights->fournisseur->facture->creer)
-{
-    $object->fetch($id);
-    if ($object->statut == 1 && $object->paye == 0)
-    {
-    	$paiementfourn = new PaiementFourn($db);
-        $result=$paiementfourn->fetch(GETPOST('paiement_id'));
-        if ($result > 0) $result=$paiementfourn->delete(); // If fetch ok and found
-        if ($result < 0) $mesg='<div class="error">'.$paiementfourn->error.'</div>';
-    }
-}
-
-// Create
-elseif ($action == 'add' && $user->rights->fournisseur->facture->creer)
-{
-    $error=0;
-
-    $datefacture=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
-    $datedue=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
-
-    if (GETPOST('socid','int')<1)
-    {
-    	$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('Supplier')).'</div>';
-    	$action='create';
-    	$error++;
-    }
-
-    if ($datefacture == '')
-    {
-        $mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('DateInvoice')).'</div>';
-        $action='create';
-        $_GET['socid']=$_POST['socid'];
-        $error++;
-    }
-    if (! GETPOST('ref_supplier'))
-    {
-        $mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentities('RefSupplier')).'</div>';
-        $action='create';
-        $_GET['socid']=$_POST['socid'];
-        $error++;
-    }
-
-    if (! $error)
-    {
-        $db->begin();
-
-        $tmpproject = GETPOST('projectid', 'int');
-
-        // Creation facture
-        $object->ref           = $_POST['ref'];
-		$object->ref_supplier  = $_POST['ref_supplier'];
-        $object->socid         = $_POST['socid'];
-        $object->libelle       = $_POST['libelle'];
-        $object->date          = $datefacture;
-        $object->date_echeance = $datedue;
-        $object->note_public   = GETPOST('note_public');
-        $object->note_private  = GETPOST('note_private');
-		$object->cond_reglement_id = GETPOST('cond_reglement_id');
-        $object->mode_reglement_id = GETPOST('mode_reglement_id');
-        $object->fk_project    = ($tmpproject > 0) ? $tmpproject : null;
-
-		// Auto calculation of date due if not filled by user
-		if(empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();
-
-        // If creation from another object of another module
-        if ($_POST['origin'] && $_POST['originid'])
-        {
-            // Parse element/subelement (ex: project_task)
-            $element = $subelement = $_POST['origin'];
-            /*if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
-             {
-            $element = $regs[1];
-            $subelement = $regs[2];
-            }*/
-
-            // For compatibility
-            if ($element == 'order')    {
-                $element = $subelement = 'commande';
-            }
-            if ($element == 'propal')   {
-                $element = 'comm/propal'; $subelement = 'propal';
-            }
-            if ($element == 'contract') {
-                $element = $subelement = 'contrat';
-            }
-            if ($element == 'order_supplier') {
-                $element = 'fourn'; $subelement = 'fournisseur.commande';
-            }
-            if ($element == 'project')
-            {
-            	$element = 'projet';
-            }
-            $object->origin    = $_POST['origin'];
-            $object->origin_id = $_POST['originid'];
-
-            $id = $object->create($user);
-
-            // Add lines
-            if ($id > 0)
-            {
-                require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
-                $classname = ucfirst($subelement);
-                if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur';
-                $srcobject = new $classname($db);
-
-                $result=$srcobject->fetch($_POST['originid']);
-                if ($result > 0)
-                {
-                    $lines = $srcobject->lines;
-                    if (empty($lines) && method_exists($srcobject,'fetch_lines'))
-                    {
-                    	$srcobject->fetch_lines();
-                    	$lines = $srcobject->lines;
-                    }
-
-                    $num=count($lines);
-                    for ($i = 0; $i < $num; $i++)
-                    {
-                        $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;
-                        if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-                        if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
-                        $date_end=$lines[$i]->date_fin_prevue;
-                        if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-                        if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
-
-                        // 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)
-                        {
-                            $error++;
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    $error++;
-                }
-            }
-            else
-            {
-                $error++;
-            }
-        }
-        // If some invoice's lines already known
-        else
-        {
-            $id = $object->create($user);
-            if ($id < 0)
-            {
-                $error++;
-            }
-
-            if (! $error)
-            {
-                for ($i = 1 ; $i < 9 ; $i++)
-                {
-                    $label = $_POST['label'.$i];
-                    $amountht  = price2num($_POST['amount'.$i]);
-                    $amountttc = price2num($_POST['amountttc'.$i]);
-                    $tauxtva   = price2num($_POST['tauxtva'.$i]);
-                    $qty = $_POST['qty'.$i];
-                    $fk_product = $_POST['fk_product'.$i];
-                    if ($label)
-                    {
-                        if ($amountht)
-                        {
-                            $price_base='HT'; $amount=$amountht;
-                        }
-                        else
-                        {
-                            $price_base='TTC'; $amount=$amountttc;
-                        }
-                        $atleastoneline=1;
-
-                        $product=new Product($db);
-                        $product->fetch($_POST['idprod'.$i]);
-
-                        $ret=$object->addline($label, $amount, $tauxtva, $product->localtax1_tx, $product->localtax2_tx, $qty, $fk_product, $remise_percent, '', '', '', 0, $price_base);
-                        if ($ret < 0) $error++;
-                    }
-                }
-            }
-        }
-
-        if ($error)
-        {
-            $langs->load("errors");
-            $db->rollback();
-            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-            $action='create';
-            $_GET['socid']=$_POST['socid'];
-        }
-        else
-        {
-            $db->commit();
-
-            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-	            $outputlangs = $langs;
-            	$result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-            	if ($result	<= 0)
-            	{
-            		dol_print_error($db,$result);
-            		exit;
-            	}
-            }
-
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-            exit;
-        }
-    }
-}
-
-// Edit line
-elseif ($action == 'update_line' && $user->rights->fournisseur->facture->creer)
-{
-	// TODO Missing transaction
-    if (GETPOST('etat') == '1' && ! GETPOST('cancel')) // si on valide la modification
-    {
-        $object->fetch($id);
-        $object->fetch_thirdparty();
-
-        if ($_POST['puht'])
-        {
-            $pu=$_POST['puht'];
-            $price_base_type='HT';
-        }
-        if ($_POST['puttc'])
-        {
-            $pu=$_POST['puttc'];
-            $price_base_type='TTC';
-        }
-
-        if (GETPOST('idprod'))
-        {
-            $prod = new Product($db);
-            $prod->fetch($_POST['idprod']);
-            $label = $prod->description;
-            if (trim($_POST['desc']) != trim($label)) $label=$_POST['desc'];
-
-            $type = $prod->type;
-        }
-        else
-        {
-
-            $label = $_POST['desc'];
-            $type = $_POST["type"]?$_POST["type"]:0;
-
-        }
-
-        $localtax1_tx= get_localtax($_POST['tauxtva'], 1, $mysoc,$object->thirdparty);
-        $localtax2_tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty);
-        $remise_percent=GETPOST('remise_percent');
-
-        $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent);
-        if ($result >= 0)
-        {
-            unset($_POST['label']);
-        }
-        else
-        {
-            setEventMessage($object->error,'errors');
-        }
-    }
-}
-
-elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
-{
-	$db->begin();
-
-    $ret=$object->fetch($id);
-    if ($ret < 0)
-    {
-        dol_print_error($db,$object->error);
-        exit;
-    }
-    $ret=$object->fetch_thirdparty();
-
-    $langs->load('errors');
-	$error=0;
-
-	// Set if we used free entry or predefined product
-	$predef='';
-	$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
-	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 = '';
-	}
-
-	$qty = GETPOST('qty'.$predef);
-	$remise_percent=GETPOST('remise_percent'.$predef);
-
-    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht') < 0 && $qty < 0)
-    {
-        setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), 'errors');
-        $error++;
-    }
-    if (GETPOST('prod_entry_mode')=='free'  && ! GETPOST('idprodfournprice') && GETPOST('type') < 0)
-    {
-        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
-        $error++;
-    }
-    if (GETPOST('prod_entry_mode')=='free' && GETPOST('price_ht')==='' && GETPOST('price_ttc')==='') // Unit price can be 0 but not ''
-    {
-        setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
-        $error++;
-    }
-    if (GETPOST('prod_entry_mode')=='free' && ! GETPOST('dp_desc'))
-    {
-        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
-        $error++;
-    }
-    if (! GETPOST('qty'))
-    {
-        setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
-        $error++;
-    }
-
-    if (GETPOST('prod_entry_mode') != 'free')	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
-    {
-    	$idprod=0;
-    	$productsupplier=new ProductFournisseur($db);
-
-        if (GETPOST('idprodfournprice') == -1 || GETPOST('idprodfournprice') == '') $idprod=-2;	// Same behaviour than with combolist. When not select idprodfournprice is now -2 (to avoid conflict with next action that may return -1)
-
-    	if (GETPOST('idprodfournprice') > 0)
-    	{
-    		$idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), $qty);    // Just to see if a price exists for the quantity. Not used to found vat.
-    	}
-
-        if ($idprod > 0)
-        {
-            $result=$productsupplier->fetch($idprod);
-
-            $label = $productsupplier->libelle;
-
-            $desc = $productsupplier->description;
-            if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc);
-
-            $tvatx=get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
-            $npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
-
-            $localtax1_tx= get_localtax($tvatx, 1, $mysoc,$object->thirdparty);
-            $localtax2_tx= get_localtax($tvatx, 2, $mysoc,$object->thirdparty);
-
-            $type = $productsupplier->type;
-
-            // TODO Save the product supplier ref into database into field ref_supplier (must rename field ref into ref_supplier first)
-            $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, '', '', 0, $npr);
-        }
-    	if ($idprod == -2 || $idprod == 0)
-        {
-            // Product not selected
-            $error++;
-            $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ProductOrService")).'</div>';
-        }
-        if ($idprod == -1)
-        {
-            // Quantity too low
-            $error++;
-            $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans("ErrorQtyTooLowForThisSupplier").'</div>';
-        }
-    }
-    else if( GETPOST('price_ht')!=='' || GETPOST('price_ttc')!=='' )
-	{
-		$pu_ht = price2num($price_ht, 'MU');
-		$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
-		$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
-		$tva_tx = str_replace('*', '', $tva_tx);
-		$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
-		$desc = $product_desc;
-		$type = GETPOST('type');
-
-    	$tva_tx = price2num($tva_tx);	// When vat is text input field
-
-    	// Local Taxes
-    	$localtax1_tx= get_localtax($tva_tx, 1,$mysoc,$object->thirdparty);
-    	$localtax2_tx= get_localtax($tva_tx, 2,$mysoc,$object->thirdparty);
-
-    	if (!empty($_POST['price_ht']))
-    	{
-    		$ht = price2num($_POST['price_ht']);
-            $price_base_type = 'HT';
-
-            //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
-            $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
-        }
-        else
-		{
-    		$ttc = price2num($_POST['price_ttc']);
-            $ht = $ttc / (1 + ($tva_tx / 100));
-            $price_base_type = 'HT';
-            //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
-            $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
-        }
-    }
-
-    //print "xx".$tva_tx; exit;
-    if (! $error && $result > 0)
-    {
-    	$db->commit();
-
-    	// Define output language
-    	$outputlangs = $langs;
-        $newlang=GETPOST('lang_id','alpha');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    	if (! empty($newlang))
-    	{
-    		$outputlangs = new Translate("",$conf);
-    		$outputlangs->setDefaultLang($newlang);
-    	}
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-        {
-        	$result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        	if ($result	<= 0)
-        	{
-        		dol_print_error($db,$result);
-        		exit;
-        	}
-        }
-
-		unset($_POST ['prod_entry_mode']);
-
-    	unset($_POST['qty']);
-    	unset($_POST['type']);
-    	unset($_POST['remise_percent']);
-    	unset($_POST['pu']);
-    	unset($_POST['price_ht']);
-    	unset($_POST['price_ttc']);
-    	unset($_POST['tva_tx']);
-    	unset($_POST['label']);
-    	unset($localtax1_tx);
-    	unset($localtax2_tx);
-		unset($_POST['np_marginRate']);
-		unset($_POST['np_markRate']);
-    	unset($_POST['dp_desc']);
-		unset($_POST['idprodfournprice']);
-
-    	unset($_POST['date_starthour']);
-    	unset($_POST['date_startmin']);
-    	unset($_POST['date_startsec']);
-    	unset($_POST['date_startday']);
-    	unset($_POST['date_startmonth']);
-    	unset($_POST['date_startyear']);
-    	unset($_POST['date_endhour']);
-    	unset($_POST['date_endmin']);
-    	unset($_POST['date_endsec']);
-    	unset($_POST['date_endday']);
-    	unset($_POST['date_endmonth']);
-    	unset($_POST['date_endyear']);
-    }
-    else
-	{
-    	$db->rollback();
-		if (empty($mesg))
-	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
-	    }
-    }
-
-    $action = '';
-}
-
-elseif ($action == 'classin')
-{
-    $object->fetch($id);
-    $result=$object->setProject($_POST['projectid']);
-}
-
-
-// Set invoice to draft status
-elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer)
-{
-    $object->fetch($id);
-
-    $totalpaye = $object->getSommePaiement();
-    $resteapayer = $object->total_ttc - $totalpaye;
-
-    // On verifie si les lignes de factures ont ete exportees en compta et/ou ventilees
-    //$ventilExportCompta = $object->getVentilExportCompta();
-
-    // On verifie si aucun paiement n'a ete effectue
-    if ($resteapayer == $object->total_ttc	&& $object->paye == 0 && $ventilExportCompta == 0)
-    {
-        $object->set_draft($user);
-
-        $outputlangs = $langs;
-        if (! empty($_REQUEST['lang_id']))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($_REQUEST['lang_id']);
-        }
-        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-        	$result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        	if ($result	<= 0)
-        	{
-        		dol_print_error($db,$result);
-        		exit;
-        	}
-        }
-
-        $action='';
-    }
-}
-
-// Set invoice to validated/unpaid status
-elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
-{
-    $result = $object->fetch($id);
-    if ($object->statut == 2
-    || ($object->statut == 3 && $object->close_code != 'replaced'))
-    {
-        $result = $object->set_unpaid($user);
-        if ($result > 0)
-        {
-            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
-            exit;
-        }
-        else
-        {
-            $mesg='<div class="error">'.$object->error.'</div>';
-        }
-    }
-}
-
-// Add file in email form
-if (GETPOST('addfile'))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    // Set tmp user directory TODO Use a dedicated directory for temp mails files
-    $vardir=$conf->user->dir_output."/".$user->id;
-    $upload_dir_tmp = $vardir.'/temp';
-
-    dol_add_file_process($upload_dir_tmp,0,0);
-    $action='presend';
-}
-
-// Remove file in email form
-if (! empty($_POST['removedfile']))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    // Set tmp user directory
-    $vardir=$conf->user->dir_output."/".$user->id;
-    $upload_dir_tmp = $vardir.'/temp';
-
-	// TODO Delete only files that was uploaded from email form
-    dol_remove_file_process($_POST['removedfile'],0);
-    $action='presend';
-}
-
-// Send mail
-if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel'])
-{
-    $langs->load('mails');
-
-    $object->fetch($id);
-    $result=$object->fetch_thirdparty();
-    if ($result > 0)
-    {
-//        $ref = dol_sanitizeFileName($object->ref);
-//        $file = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref.'/'.$ref.'.pdf';
-
-//        if (is_readable($file))
-//        {
-            if ($_POST['sendto'])
-            {
-                // Le destinataire a ete fourni via le champ libre
-                $sendto = $_POST['sendto'];
-                $sendtoid = 0;
-            }
-            elseif ($_POST['receiver'] != '-1')
-            {
-                // Recipient was provided from combo list
-                if ($_POST['receiver'] == 'thirdparty') // Id of third party
-                {
-                    $sendto = $object->client->email;
-                    $sendtoid = 0;
-                }
-                else	// Id du contact
-                {
-                    $sendto = $object->client->contact_get_property($_POST['receiver'],'email');
-                    $sendtoid = $_POST['receiver'];
-                }
-            }
-
-            if (dol_strlen($sendto))
-            {
-                $langs->load("commercial");
-
-                $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
-                $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
-                $message = $_POST['message'];
-                $sendtocc = $_POST['sendtocc'];
-                $deliveryreceipt = $_POST['deliveryreceipt'];
-
-                if ($action == 'send')
-                {
-                    if (dol_strlen($_POST['subject'])) $subject=$_POST['subject'];
-                    else $subject = $langs->transnoentities('CustomerOrder').' '.$object->ref;
-                    $actiontypecode='AC_SUP_INV';
-                    $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
-                    if ($message)
-                    {
-                        $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
-                        $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
-                        $actionmsg.=$message;
-                    }
-                    $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
-                }
-
-                // Create form object
-                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-                $formmail = new FormMail($db);
-
-                $attachedfiles=$formmail->get_attached_files();
-                $filepath = $attachedfiles['paths'];
-                $filename = $attachedfiles['names'];
-                $mimetype = $attachedfiles['mimes'];
-
-                // Send mail
-                require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-                $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt,-1);
-                if ($mailfile->error)
-                {
-                    setEventMessage($mailfile->error,'errors');
-                }
-                else
-                {
-                    $result=$mailfile->sendfile();
-                    if ($result)
-                    {
-                        $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));		// Must not contain "
-                        setEventMessage($mesg);
-
-                        $error=0;
-
-                        // Initialisation donnees
-                        $object->sendtoid		= $sendtoid;
-                        $object->actiontypecode	= $actiontypecode;
-                        $object->actionmsg		= $actionmsg;
-                        $object->actionmsg2		= $actionmsg2;
-                        $object->fk_element		= $object->id;
-                        $object->elementtype	= $object->element;
-
-                        // Appel des triggers
-                        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                        $interface=new Interfaces($db);
-                        $result=$interface->run_triggers('BILL_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf);
-                        if ($result < 0) {
-                            $error++; $object->errors=$interface->errors;
-                        }
-                        // Fin appel triggers
-
-                        if ($error)
-                        {
-                            dol_print_error($db);
-                        }
-                        else
-                        {
-                            // Redirect here
-                            // This avoid sending mail twice if going out and then back to page
-                            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-                            exit;
-                        }
-                    }
-                    else
-                    {
-                        $langs->load("other");
-                        $mesg='<div class="error">';
-                        if ($mailfile->error)
-                        {
-                            $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-                            $mesg.='<br>'.$mailfile->error;
-                        }
-                        else
-                        {
-                            $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-                        }
-                        $mesg.='</div>';
-                    }
-                }
-            }
-
-            else
-            {
-                $langs->load("other");
-                $mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').'</div>';
-                dol_syslog('Recipient email is empty');
-            }
-/*        }
-        else
-        {
-            $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
-            dol_syslog('Failed to read file: '.$file);
-        }*/
-    }
-    else
-    {
-        $langs->load("other");
-        $mesg='<div class="error">'.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'</div>';
-        dol_syslog('Unable to read data from the invoice. The invoice file has perhaps not been generated.');
-    }
-
-    //$action = 'presend';
-}
-
-// Build document
-elseif ($action == 'builddoc')
-{
-	// Save modele used
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-    $outputlangs = $langs;
-    $newlang=GETPOST('lang_id','alpha');
-    if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-    if (! empty($newlang))
-    {
-        $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($newlang);
-    }
-    $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-    if ($result	<= 0)
-    {
-        dol_print_error($db,$result);
-        exit;
-    }
-}
-// Make calculation according to calculationrule
-elseif ($action == 'calculate')
-{
-	$calculationrule=GETPOST('calculationrule');
-
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-	$result=$object->update_price(0, (($calculationrule=='totalofround')?'0':'1'), 0, $object->thirdparty);
-    if ($result	<= 0)
-    {
-        dol_print_error($db,$result);
-        exit;
-    }
-}
-// Delete file in doc form
-elseif ($action == 'remove_file')
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    if ($object->fetch($id))
-    {
-    	$object->fetch_thirdparty();
-        $upload_dir =	$conf->fournisseur->facture->dir_output . "/";
-        $file =	$upload_dir	. '/' .	GETPOST('file');
-        $ret=dol_delete_file($file,0,0,0,$object);
-        if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-        else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-    }
-}
-
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->facture->creer)
-{
-	if ($action == 'addcontact')
-	{
-		$result = $object->fetch($id);
-
-		if ($result > 0 && $id > 0)
-		{
-			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
-		}
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else
-		{
-			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
-				$langs->load("errors");
-				$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-			}
-			else
-			{
-				$mesg = '<div class="error">'.$object->error.'</div>';
-			}
-		}
-	}
-
-	// bascule du statut d'un contact
-	else if ($action == 'swapstatut')
-	{
-		if ($object->fetch($id))
-		{
-			$result=$object->swapContactStatus(GETPOST('ligne'));
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	// Efface un contact
-	else if ($action == 'deletecontact')
-	{
-		$object->fetch($id);
-		$result = $object->delete_contact($_GET["lineid"]);
-
-		if ($result >= 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-		else {
-			dol_print_error($db);
-		}
-	}
-}
-
-
-/*
- *	View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$bankaccountstatic=new Account($db);
-
-llxHeader('','','');
-
-// Mode creation
-if ($action == 'create')
-{
-    print_fiche_titre($langs->trans('NewBill'));
-
-    dol_htmloutput_mesg($mesg);
-    dol_htmloutput_events();
-
-    $societe='';
-    if ($_GET['socid'])
-    {
-        $societe=new Societe($db);
-        $societe->fetch($_GET['socid']);
-    }
-
-    if (GETPOST('origin') && GETPOST('originid'))
-    {
-        // Parse element/subelement (ex: project_task)
-        $element = $subelement = GETPOST('origin');
-
-        if ($element == 'project')
-        {
-            $projectid=GETPOST('originid');
-            $element = 'projet';
-        }
-        else if (in_array($element,array('order_supplier')))
-        {
-            // For compatibility
-            if ($element == 'order')    {
-                $element = $subelement = 'commande';
-            }
-            if ($element == 'propal')   {
-                dol_htmloutput_errors('',$errors);
-                $element = 'comm/propal'; $subelement = 'propal';
-            }
-            if ($element == 'contract') {
-                $element = $subelement = 'contrat';
-            }
-            if ($element == 'order_supplier') {
-                $element = 'fourn'; $subelement = 'fournisseur.commande';
-            }
-
-            require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
-            $classname = ucfirst($subelement);
-            if ($classname == 'Fournisseur.commande') $classname='CommandeFournisseur';
-            $objectsrc = new $classname($db);
-            $objectsrc->fetch(GETPOST('originid'));
-            $objectsrc->fetch_thirdparty();
-
-            $projectid			= (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
-            //$ref_client			= (!empty($objectsrc->ref_client)?$object->ref_client:'');
-
-            $soc = $objectsrc->thirdparty;
-            $cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_supplier_id)?$soc->cond_reglement_supplier_id:1));
-            $mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_supplier_id)?$soc->mode_reglement_supplier_id:0));
-            $remise_percent 	= (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
-            $remise_absolue 	= (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
-            $dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'';
-
-            $datetmp=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
-            $dateinvoice=($datetmp==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datetmp);
-            $datetmp=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
-            $datedue=($datetmp==''?-1:$datetmp);
-        }
-    }
-    else
-    {
-		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
-		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
-        $datetmp=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
-        $dateinvoice=($datetmp==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datetmp);
-        $datetmp=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
-        $datedue=($datetmp==''?-1:$datetmp);
-    }
-
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
-    print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
-
-    print '<table class="border" width="100%">';
-
-    // Ref
-    print '<tr><td>'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
-
-    // Third party
-    print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
-    print '<td>';
-
-    if ($_REQUEST['socid'] > 0)
-    {
-        print $societe->getNomUrl(1);
-        print '<input type="hidden" name="socid" value="'.$_GET['socid'].'">';
-    }
-    else
-    {
-        print $form->select_company((empty($_GET['socid'])?'':$_GET['socid']),'socid','s.fournisseur = 1',1);
-    }
-    print '</td></tr>';
-
-    // Ref supplier
-    print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier'])?$_POST['ref_supplier']:'').'" type="text"></td>';
-    print '</tr>';
-
-    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans('Type').'</td><td colspan="2">';
-    print '<table class="nobordernopadding">'."\n";
-
-    // Standard invoice
-    print '<tr height="18"><td width="16px" valign="middle">';
-    print '<input type="radio" name="type" value="0"'.($_POST['type']==0?' checked="checked"':'').'>';
-    print '</td><td valign="middle">';
-    $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
-
-    /*
-     // Deposit
-    print '<tr height="18"><td width="16px" valign="middle">';
-    print '<input type="radio" name="type" value="3"'.($_POST['type']==3?' checked="checked"':'').'>';
-    print '</td><td valign="middle">';
-    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
-
-    // Proforma
-    if (! empty($conf->global->FACTURE_USE_PROFORMAT))
-    {
-    print '<tr height="18"><td width="16px" valign="middle">';
-    print '<input type="radio" name="type" value="4"'.($_POST['type']==4?' checked="checked"':'').'>';
-    print '</td><td valign="middle">';
-    $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
-    }
-
-    // Replacement
-    print '<tr height="18"><td valign="middle">';
-    print '<input type="radio" name="type" value="1"'.($_POST['type']==1?' checked="checked"':'');
-    if (! $options) print ' disabled="disabled"';
-    print '>';
-    print '</td><td valign="middle">';
-    $text=$langs->trans("InvoiceReplacementAsk").' ';
-    $text.='<select class="flat" name="fac_replacement"';
-    if (! $options) $text.=' disabled="disabled"';
-    $text.='>';
-    if ($options)
-    {
-    $text.='<option value="-1">&nbsp;</option>';
-    $text.=$options;
-    }
-    else
-    {
-    $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
-    }
-    $text.='</select>';
-    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
-    print $desc;
-    print '</td></tr>';
-
-    // Credit note
-    print '<tr height="18"><td valign="middle">';
-    print '<input type="radio" name="type" value="2"'.($_POST['type']==2?' checked=true':'');
-    if (! $optionsav) print ' disabled="disabled"';
-    print '>';
-    print '</td><td valign="middle">';
-    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
-    //	$text.='<input type="text" value="">';
-    $text.='<select class="flat" name="fac_avoir"';
-    if (! $optionsav) $text.=' disabled="disabled"';
-    $text.='>';
-    if ($optionsav)
-    {
-    $text.='<option value="-1">&nbsp;</option>';
-    $text.=$optionsav;
-    }
-    else
-    {
-    $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
-    }
-    $text.='</select>';
-    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
-    */
-    print '</table>';
-    print '</td></tr>';
-
-    // Label
-    print '<tr><td>'.$langs->trans('Label').'</td><td><input size="30" name="libelle" value="'.(isset($_POST['libelle'])?$_POST['libelle']:'').'" type="text"></td></tr>';
-
-    // Date invoice
-    print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td>';
-    $form->select_date($dateinvoice,'','','','',"add",1,1);
-    print '</td></tr>';
-
-    // Due date
-    print '<tr><td>'.$langs->trans('DateMaxPayment').'</td><td>';
-    $form->select_date($datedue,'ech','','','',"add",1,1);
-    print '</td></tr>';
-
-	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
-	$form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id, 'cond_reglement_id');
-	print '</td></tr>';
-
-	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
-	$form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id, 'mode_reglement_id', 'DBIT');
-	print '</td></tr>';
-
-	// Project
-	if (! empty($conf->projet->enabled)) {
-		$formproject = new FormProjets($db);
-
-		$langs->load('projects');
-		print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
-		$formproject->select_projects($soc->id, $projectid, 'projectid');
-		print '</td></tr>';
-	}
-
-	// Public note
-	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
-    print '<td>';
-    $doleditor = new DolEditor('note_public', GETPOST('note_public'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-    print $doleditor->Create(1);
-    print '</td>';
-   // print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
-    print '</tr>';
-
-    // Private note
-    print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
-    print '<td>';
-    $doleditor = new DolEditor('note_private', GETPOST('note_private'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-    print $doleditor->Create(1);
-    print '</td>';
-    // print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
-    print '</tr>';
-
-    if (is_object($objectsrc))
-    {
-        print "\n<!-- ".$classname." info -->";
-        print "\n";
-        print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";
-        print '<input type="hidden" name="total"          value="'.$objectsrc->total_ttc.'">'."\n";
-        print '<input type="hidden" name="tva"            value="'.$objectsrc->total_tva.'">'."\n";
-        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
-
-        $txt=$langs->trans($classname);
-        if ($classname=='CommandeFournisseur') {
-	        $langs->load('orders');
-	        $txt=$langs->trans("SupplierOrder");
-        }
-        print '<tr><td>'.$txt.'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
-        print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
-        print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
-        if ($mysoc->country_code=='ES')
-        {
-            if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-            {
-                print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
-            }
-
-            if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-            {
-                print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
-            }
-        }
-        print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
-    }
-    else
-    {
-    	// TODO more bugs
-        if (1==2 && ! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
-        {
-            print '<tr class="liste_titre">';
-            print '<td>&nbsp;</td>';
-            print '<td>'.$langs->trans('Label').'</td>';
-            print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
-            print '<td align="right">'.$langs->trans('VAT').'</td>';
-            print '<td align="right">'.$langs->trans('Qty').'</td>';
-            print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
-            print '</tr>';
-
-            for ($i = 1 ; $i < 9 ; $i++)
-            {
-                $value_qty = '1';
-                $value_tauxtva = '';
-                print '<tr><td>'.$i.'</td>';
-                print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>';
-                print '<td align="right"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>';
-                print '<td align="right">';
-                print $form->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
-                print '</td>';
-                print '<td align="right"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td>';
-                print '<td align="right"><input type="text" size="8" name="amountttc'.$i.'" value=""></td></tr>';
-            }
-        }
-    }
-
-    // Other options
-    $parameters=array('colspan' => ' colspan="6"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-
-    // Bouton "Create Draft"
-    print "</table>\n";
-
-    print '<br><center><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'"></center>';
-
-    print "</form>\n";
-
-
-    // Show origin lines
-    if (is_object($objectsrc))
-    {
-        print '<br>';
-
-        $title=$langs->trans('ProductsAndServices');
-        print_titre($title);
-
-        print '<table class="noborder" width="100%">';
-
-        $objectsrc->printOriginLinesList();
-
-        print '</table>';
-    }
-}
-else
-{
-    if ($id > 0 || ! empty($ref))
-    {
-        /* *************************************************************************** */
-        /*                                                                             */
-        /* Fiche en mode visu ou edition                                               */
-        /*                                                                             */
-        /* *************************************************************************** */
-
-        $now=dol_now();
-
-        $productstatic = new Product($db);
-
-        $object->fetch($id,$ref);
-        $result=$object->fetch_thirdparty();
-        if ($result < 0) dol_print_error($db);
-
-        $societe = new Fournisseur($db);
-        $result=$societe->fetch($object->socid);
-        if ($result < 0) dol_print_error($db);
-
-        /*
-         *	View card
-         */
-        $head = facturefourn_prepare_head($object);
-        $titre=$langs->trans('SupplierInvoice');
-
-        dol_fiche_head($head, 'card', $titre, 0, 'bill');
-
-        dol_htmloutput_mesg($mesg);
-        dol_htmloutput_errors('',$errors);
-
-        // Confirmation de la suppression d'une ligne produit
-        if ($action == 'confirm_delete_line')
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_delete_line', '', 1, 1);
-        }
-
-        // Clone confirmation
-        if ($action == 'clone')
-        {
-            // Create an array for form
-            $formquestion=array(
-            //'text' => $langs->trans("ConfirmClone"),
-            //array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1)
-            );
-            // Paiement incomplet. On demande si motif = escompte ou autre
-            print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$object->ref),'confirm_clone',$formquestion,'yes', 1);
-        }
-
-        // Confirmation de la validation
-        if ($action == 'valid')
-        {
-			 // on verifie si l'objet est en numerotation provisoire
-            $objectref = substr($object->ref, 1, 4);
-            if ($objectref == 'PROV')
-            {
-                $savdate=$object->date;
-                if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION))
-                {
-                    $object->date=dol_now();
-                    //TODO: Possibly will have to control payment information into suppliers
-                    //$object->date_lim_reglement=$object->calculate_date_lim_reglement();
-                }
-                $numref = $object->getNextNumRef($societe);
-            }
-            else
-            {
-                $numref = $object->ref;
-            }
-
-            $text=$langs->trans('ConfirmValidateBill',$numref);
-            /*if (! empty($conf->notification->enabled))
-            {
-            	require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-            	$notify=new Notify($db);
-            	$text.='<br>';
-            	$text.=$notify->confirmMessage('BILL_SUPPLIER_VALIDATE',$object->socid);
-            }*/
-            $formquestion=array();
-
-            $qualified_for_stock_change=0;
-		    if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-		    {
-		    	$qualified_for_stock_change=$object->hasProductsOrServices(2);
-		    }
-		    else
-		    {
-		    	$qualified_for_stock_change=$object->hasProductsOrServices(1);
-		    }
-
-            if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct=new FormProduct($db);
-                $formquestion=array(
-                //'text' => $langs->trans("ConfirmClone"),
-                //array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
-                //array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
-                array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockIncrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)));
-            }
-
-            print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, 1, 1, 240);
-
-        }
-
-        // Confirmation set paid
-        if ($action == 'paid')
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
-
-        }
-
-        // Confirmation de la suppression de la facture fournisseur
-        if ($action == 'delete')
-        {
-            print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
-
-        }
-
-
-        /**
-         * 	Invoice
-         */
-        print '<table class="border" width="100%">';
-
-        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-        // Ref
-        print '<tr><td class="nowrap" width="20%">'.$langs->trans("Ref").'</td><td colspan="4">';
-        print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-        print '</td>';
-        print "</tr>\n";
-
-        // Ref supplier
-        print '<tr><td>'.$form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'</td><td colspan="4">';
-        print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer));
-        print '</td></tr>';
-
-        // Third party
-        print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="4">'.$societe->getNomUrl(1,'supplier');
-        print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->socid.'">'.$langs->trans('OtherBills').'</a>)</td>';
-        print '</tr>';
-
-        // Type
-        print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
-        print $object->getLibType();
-        if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-        {
-            $facreplaced=new FactureFournisseur($db);
-            $facreplaced->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')';
-        }
-        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-        {
-            $facusing=new FactureFournisseur($db);
-            $facusing->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("CorrectInvoice",$facusing->getNomUrl(1)).')';
-        }
-
-        $facidavoir=$object->getListIdAvoirFromInvoice();
-        if (count($facidavoir) > 0)
-        {
-            print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-            $i=0;
-            foreach($facidavoir as $id)
-            {
-                if ($i==0) print ' ';
-                else print ',';
-                $facavoir=new FactureFournisseur($db);
-                $facavoir->fetch($id);
-                print $facavoir->getNomUrl(1);
-            }
-            print ')';
-        }
-        if (isset($facidnext) && $facidnext > 0)
-        {
-            $facthatreplace=new FactureFournisseur($db);
-            $facthatreplace->fetch($facidnext);
-            print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
-        }
-        print '</td></tr>';
-
-        // Label
-        print '<tr><td>'.$form->editfieldkey("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'</td>';
-        print '<td colspan="3">'.$form->editfieldval("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'</td>';
-
-        /*
-         * List of payments
-         */
-        $nbrows=9; $nbcols=2;
-        if (! empty($conf->projet->enabled)) $nbrows++;
-        if (! empty($conf->banque->enabled)) $nbcols++;
-
-        // Local taxes
-        if ($mysoc->country_code=='ES')
-        {
-        	if($mysoc->localtax1_assuj=="1") $nbrows++;
-        	if($societe->localtax2_assuj=="1") $nbrows++;
-        }
-        else
-       {
-        	if ($societe->localtax1_assuj=="1") $nbrows++;
-        	if ($societe->localtax2_assuj=="1") $nbrows++;
-        }
-        print '<td rowspan="'.$nbrows.'" valign="top">';
-
-        $sql = 'SELECT p.datep as dp, p.num_paiement, p.rowid, p.fk_bank,';
-        $sql.= ' c.id as paiement_type,';
-        $sql.= ' pf.amount,';
-        $sql.= ' ba.rowid as baid, ba.ref, ba.label';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_paiementfourn = p.rowid';
-        $sql.= ' WHERE pf.fk_facturefourn = '.$object->id;
-        $sql.= ' ORDER BY p.datep, p.tms';
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $i = 0; $totalpaye = 0;
-            print '<table class="nobordernopadding" width="100%">';
-            print '<tr class="liste_titre">';
-            print '<td>'.$langs->trans('Payments').'</td>';
-            print '<td>'.$langs->trans('Type').'</td>';
-            if (! empty($conf->banque->enabled)) print '<td align="right">'.$langs->trans('BankAccount').'</td>';
-            print '<td align="right">'.$langs->trans('Amount').'</td>';
-            print '<td width="18">&nbsp;</td>';
-            print '</tr>';
-
-            $var=true;
-            if ($num > 0)
-            {
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($result);
-                    $var=!$var;
-                    print '<tr '.$bc[$var].'>';
-                    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."</a></td>\n";
-                    print '<td>';
-                    print $form->form_modes_reglement(null, $objp->paiement_type,'none').' '.$objp->num_paiement;
-                    print '</td>';
-                    if (! empty($conf->banque->enabled))
-                    {
-                        $bankaccountstatic->id=$objp->baid;
-                        $bankaccountstatic->ref=$objp->ref;
-                        $bankaccountstatic->label=$objp->ref;
-                        print '<td align="right">';
-                        if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1,'transactions');
-                        print '</td>';
-                    }
-                    print '<td align="right">'.price($objp->amount).'</td>';
-                    print '<td align="center">';
-                    if ($object->statut == 1 && $object->paye == 0 && $user->societe_id == 0)
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepaiement&paiement_id='.$objp->rowid.'">';
-                        print img_delete();
-                        print '</a>';
-                    }
-                    print '</td>';
-                    print '</tr>';
-                    $totalpaye += $objp->amount;
-                    $i++;
-                }
-            }
-            else
-            {
-                 print '<tr '.$bc[$var].'><td colspan="'.$nbcols.'">'.$langs->trans("None").'</td><td></td><td></td></tr>';
-            }
-
-            if ($object->paye == 0)
-            {
-                print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans('AlreadyPaid').' :</td><td align="right"><b>'.price($totalpaye).'</b></td><td></td></tr>';
-                print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("Billed").' :</td><td align="right" style="border: 1px solid;">'.price($object->total_ttc).'</td><td></td></tr>';
-
-                $resteapayer = $object->total_ttc - $totalpaye;
-
-                print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans('RemainderToPay').' :</td>';
-                print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($resteapayer).'</b></td><td></td></tr>';
-            }
-            print '</table>';
-            $db->free($result);
-        }
-        else
-        {
-            dol_print_error($db);
-        }
-        print '</td>';
-
-        print '</tr>';
-
-        // Date
-        print '<tr><td>'.$form->editfieldkey("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').'</td><td colspan="3">';
-        print $form->editfieldval("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker');
-        print '</td>';
-
-        // Due date
-        print '<tr><td>'.$form->editfieldkey("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').'</td><td colspan="3">';
-        print $form->editfieldval("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker');
-        if ($action != 'editdate_lim_reglement' && $object->statut < 2 && $object->date_echeance && $object->date_echeance < ($now - $conf->facture->fournisseur->warning_delay)) print img_warning($langs->trans('Late'));
-        print '</td>';
-
-		// Conditions de reglement par defaut
-		$langs->load('bills');
-		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-		print $langs->trans('PaymentConditions');
-		print '<td>';
-		if ($action != 'editconditions') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		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');
-		}
-		print "</td>";
-		print '</tr>';
-
-		// Mode of payment
-		$langs->load('bills');
-		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-		print $langs->trans('PaymentMode');
-		print '</td>';
-		if ($action != 'editmode') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="2">';
-		if ($action == 'editmode')
-		{
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT');
-		}
-		else
-		{
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', 'DBIT');
-		}
-		print '</td></tr>';
-
-        // Status
-        $alreadypaid=$object->getSommePaiement();
-        print '<tr><td>'.$langs->trans('Status').'</td><td colspan="3">'.$object->getLibStatut(4,$alreadypaid).'</td></tr>';
-
-        print '<tr><td>'.$langs->trans('AmountHT').'</td><td align="right">'.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'</td><td colspan="2" align="left">&nbsp;</td></tr>';
-        print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'</td><td colspan="2" align="left">';
-        if (GETPOST('calculationrule')) $calculationrule=GETPOST('calculationrule','alpha');
-        else $calculationrule=(empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)?'totalofround':'roundoftotal');
-        if ($calculationrule == 'totalofround') $calculationrulenum=1;
-        else  $calculationrulenum=2;
-        $s=$langs->trans("ReCalculate").' ';
-        $s.='<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
-        $s.=' / ';
-        $s.='<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").'</a>';
-        print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc",$calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('','help'));
-        print '</td></tr>';
-
-        // Amount Local Taxes
-        //TODO: Place into a function to control showing by country or study better option
-        if ($mysoc->country_code=='ES')
-        {
-        	if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-	        {
-	            print '<tr><td>'.$langs->transcountry("AmountLT1",$societe->country_code).'</td>';
-	            print '<td align="right">'.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'</td>';
-	            print '<td colspan="2">&nbsp;</td></tr>';
-	        }
-	        if ($societe->localtax2_assuj=="1") //Localtax2 IRPF
-	        {
-	            print '<tr><td>'.$langs->transcountry("AmountLT2",$societe->country_code).'</td>';
-	            print '<td align="right">'.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'</td>';
-	            print '<td colspan="2">&nbsp;</td></tr>';
-	        }
-        }
-        else
-       {
-	        if ($societe->localtax1_assuj=="1") //Localtax1 RE
-	        {
-	            print '<tr><td>'.$langs->transcountry("AmountLT1",$societe->country_code).'</td>';
-	            print '<td align="right">'.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'</td>';
-	            print '<td colspan="2">&nbsp;</td></tr>';
-	        }
-	        if ($societe->localtax2_assuj=="1") //Localtax2 IRPF
-	        {
-	            print '<tr><td>'.$langs->transcountry("AmountLT2",$societe->country_code).'</td>';
-	            print '<td align="right">'.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'</td>';
-	            print '<td colspan="2">&nbsp;</td></tr>';
-	        }
-        }
-        print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right">'.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'</td><td colspan="2" align="left">&nbsp;</td></tr>';
-
-        // Project
-        if (! empty($conf->projet->enabled))
-        {
-            $langs->load('projects');
-            print '<tr>';
-            print '<td>';
-
-            print '<table class="nobordernopadding" width="100%"><tr><td>';
-            print $langs->trans('Project');
-            print '</td>';
-            if ($action != 'classify')
-            {
-                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
-                print img_edit($langs->trans('SetProject'),1);
-                print '</a></td>';
-            }
-            print '</tr></table>';
-
-            print '</td><td colspan="3">';
-            if ($action == 'classify')
-            {
-                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
-            }
-            else
-            {
-                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
-            }
-            print '</td>';
-            print '</tr>';
-        }
-
-        // Other options
-        $parameters=array('colspan' => ' colspan="4"');
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-
-        print '</table>';
-
-        if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-        {
-        	print '<br>';
-        	$blocname = 'contacts';
-        	$title = $langs->trans('ContactsAddresses');
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-        }
-
-        if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-        {
-        	$colwidth=20;
-        	$blocname = 'notes';
-        	$title = $langs->trans('Notes');
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-        }
-
-
-        /*
-         * Lines
-         */
-
-
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?etat=1&id='.$object->id.(($action != 'edit_line')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
-		<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
-		<input type="hidden" name="action" value="'.(($action != 'edit_line')?'addline':'update_line').'">
-		<input type="hidden" name="mode" value="">
-		<input type="hidden" name="id" value="'.$object->id.'">
-        <input type="hidden" name="facid" value="'.$object->id.'">
-        <input type="hidden" name="socid" value="'.$societe->id.'">
-
-		';
-
-
-        print '<br>';
-        print '<table id="tablelines" class="noborder noshadow" width="100%">';
-        $var=1;
-        $num=count($object->lines);
-        for ($i = 0; $i < $num; $i++)
-        {
-            if ($i == 0)
-            {
-                print '<tr class="liste_titre"><td>'.$langs->trans('Label').'</td>';
-                print '<td align="right">'.$langs->trans('VAT').'</td>';
-                print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
-                print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
-                print '<td align="right">'.$langs->trans('Qty').'</td>';
-                print '<td align="right">'.$langs->trans('ReductionShort').'</td>';
-                print '<td align="right">'.$langs->trans('TotalHTShort').'</td>';
-                print '<td align="right">'.$langs->trans('TotalTTCShort').'</td>';
-                print '<td>&nbsp;</td>';
-                print '<td>&nbsp;</td>';
-                print '</tr>';
-            }
-
-            // Show product and description
-            $type=(! empty($object->lines[$i]->product_type)?$object->lines[$i]->product_type:(! empty($object->lines[$i]->fk_product_type)?$object->lines[$i]->fk_product_type:0));
-            // Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-            $date_start='';
-            $date_end='';
-            if (! empty($object->lines[$i]->date_start))
-            {
-            	$date_start=$object->lines[$i]->date_start;
-            	$type=1;
-            }
-            if (! empty($object->lines[$i]->date_end))
-            {
-            	$date_end=$object->lines[$i]->date_end;
-            	$type=1;
-            }
-
-            $var=!$var;
-
-            // Edit line
-            if ($object->statut == 0 && $action == 'edit_line' && $_GET['etat'] == '0' && $_GET['lineid'] == $object->lines[$i]->rowid)
-            {
-                print '<tr '.$bc[$var].'>';
-
-                // Show product and description
-                print '<td>';
-
-                print '<input type="hidden" name="lineid" value="'.$object->lines[$i]->rowid.'">';
-
-                if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $object->lines[$i]->fk_product > 0)
-                {
-                    print '<input type="hidden" name="idprod" value="'.$object->lines[$i]->fk_product.'">';
-                    $product_static=new ProductFournisseur($db);
-                    $product_static->fetch($object->lines[$i]->fk_product);
-                    $text=$product_static->getNomUrl(1);
-                    $text.= ' - '.$product_static->libelle;
-                    print $text;
-                    print '<br>';
-                }
-                else
-				{
-                    $forceall=1;	// For suppliers, we always show all types
-                    print $form->select_type_of_lines($object->lines[$i]->product_type,'type',1,0,$forceall);
-                    if ($forceall || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
-                    || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
-                }
-
-                if (is_object($hookmanager))
-                {
-                    $parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$object->lines[$i],'var'=>$var,'num'=>$num,'i'=>$i);
-                    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
-                }
-
-                $nbrows=ROWS_2;
-                if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-                $doleditor=new DolEditor('desc',$object->lines[$i]->description,'',128,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
-                $doleditor->Create();
-                print '</td>';
-
-                // VAT
-                print '<td align="right">';
-                print $form->load_tva('tauxtva',$object->lines[$i]->tva_tx,$societe,$mysoc);
-                print '</td>';
-
-                // Unit price
-                print '<td align="right" class="nowrap"><input size="4" name="puht" type="text" value="'.price($object->lines[$i]->pu_ht).'"></td>';
-
-                print '<td align="right" class="nowrap"><input size="4" name="puttc" type="text" value=""></td>';
-
-                print '<td align="right"><input size="1" name="qty" type="text" value="'.$object->lines[$i]->qty.'"></td>';
-
-                print '<td align="right" class="nowrap"><input size="1" name="remise_percent" type="text" value="'.$object->lines[$i]->remise_percent.'"><span class="hideonsmartphone">%</span></td>';
-
-                print '<td align="right" class="nowrap">&nbsp;</td>';
-
-                print '<td align="right" class="nowrap">&nbsp;</td>';
-
-                print '<td align="center" colspan="2"><input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
-                print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
-
-                print '</tr>';
-            }
-            else // Affichage simple de la ligne
-            {
-                print '<tr id="row-'.$object->lines[$i]->rowid.'" '.$bc[$var].'>';
-
-                // Show product and description
-                print '<td>';
-                if ($object->lines[$i]->fk_product)
-                {
-                    print '<a name="'.$object->lines[$i]->rowid.'"></a>'; // ancre pour retourner sur la ligne
-
-                    $product_static=new ProductFournisseur($db);
-                    $product_static->fetch($object->lines[$i]->fk_product);
-                    $text=$product_static->getNomUrl(1);
-                    $text.= ' - '.$product_static->libelle;
-                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($object->lines[$i]->description));
-                    print $form->textwithtooltip($text,$description,3,'','',$i);
-
-                    // Show range
-                    print_date_range($date_start,$date_end);
-
-                    // Add description in form
-                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) print ($object->lines[$i]->description && $object->lines[$i]->description!=$product_static->libelle)?'<br>'.dol_htmlentitiesbr($object->lines[$i]->description):'';
-                }
-
-                // Description - Editor wysiwyg
-                if (! $object->lines[$i]->fk_product)
-                {
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
-                    print $text.' '.nl2br($object->lines[$i]->description);
-
-                    // Show range
-                    print_date_range($date_start,$date_end);
-                }
-
-                if (is_object($hookmanager))
-                {
-                	$parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$object->lines[$i],'var'=>$var,'num'=>$num,'i'=>$i);
-                	$reshook=$hookmanager->executeHooks('formViewProductSupplierOptions',$parameters,$object,$action);
-                }
-                print '</td>';
-
-                // VAT
-                print '<td align="right">'.vatrate($object->lines[$i]->tva_tx, true, $object->lines[$i]->info_bits).'</td>';
-
-                // Unit price
-                print '<td align="right" class="nowrap">'.price($object->lines[$i]->pu_ht,'MU').'</td>';
-
-                print '<td align="right" class="nowrap">'.($object->lines[$i]->pu_ttc?price($object->lines[$i]->pu_ttc,'MU'):'&nbsp;').'</td>';
-
-                print '<td align="right">'.$object->lines[$i]->qty.'</td>';
-
-                print '<td align="right">'.(($object->lines[$i]->remise_percent > 0)?$object->lines[$i]->remise_percent.'%':'').'</td>';
-
-                print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ht).'</td>';
-
-                print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ttc).'</td>';
-
-				if (is_object($hookmanager))
-				{
-					$parameters=array('line'=>$object->lines[$i],'num'=>$num,'i'=>$i);
-					$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$object,$action);
-				}
-
-                print '<td align="center" width="16">';
-                if ($object->statut == 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_line&amp;etat=0&amp;lineid='.$object->lines[$i]->rowid.'">'.img_edit().'</a>';
-                else print '&nbsp;';
-                print '</td>';
-
-                print '<td align="center" width="16">';
-                if ($object->statut == 0)
-                {
-                	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=confirm_delete_line&amp;lineid='.$object->lines[$i]->rowid.'">'.img_delete().'</a>';
-                }
-                else print '&nbsp;';
-                print '</td>';
-
-                print '</tr>';
-            }
-
-        }
-
-		// Form to add new line
-        if ($object->statut == 0 && $action != 'edit_line')
-        {
-       		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
-			$forceall=1; $senderissupplier=1; $dateSelector=0; $inputalsopricewithtax=1;
-			if ($object->statut == 0 && $user->rights->fournisseur->facture->creer)
-			{
-				if ($action != 'editline')
-				{
-					$var = true;
-
-					// Add free products/services
-					$object->formAddObjectLine(1, $societe, $mysoc);
-
-					$parameters = array();
-					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-				}
-			}
-        }
-
-        print '</table>';
-
-        print '</form>';
-
-        dol_fiche_end();
-
-
-        if ($action != 'presend')
-        {
-            /*
-             * Boutons actions
-             */
-
-            print '<div class="tabsAction">';
-
-		    // Modify a validated invoice with no payments
-			if ($object->statut == 1 && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer)
-			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
-			}
-
- 	 		// Reopen a standard paid invoice
-            if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT) && ($object->statut == 2 || $object->statut == 3))				// A paid invoice (partially or completely)
-            {
-                if (! $facidnext && $object->close_code != 'replaced')	// Not replaced by another invoice
-                {
-                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
-                }
-                else
-                {
-                    print '<span class="butActionRefused" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
-                }
-            }
-
-            // Send by mail
-            if (($object->statut == 1 || $object->statut == 2))
-            {
-                if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
-                {
-                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
-                }
-                else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
-            }
-
-
-            // Make payments
-            if ($action != 'edit' && $object->statut == 1 && $object->paye == 0  && $user->societe_id == 0)
-            {
-                print '<a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';	// must use facid because id is for payment id not invoice
-            }
-
-            // Classify paid
-            if ($action != 'edit' && $object->statut == 1 && $object->paye == 0  && $user->societe_id == 0)
-            {
-                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
-                print '>'.$langs->trans('ClassifyPaid').'</a>';
-
-                //print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
-            }
-
-            // Validate
-            if ($action != 'edit' && $object->statut == 0)
-            {
-                if (count($object->lines))
-                {
-                    if ($user->rights->fournisseur->facture->valider)
-                    {
-                        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
-                        print '>'.$langs->trans('Validate').'</a>';
-                    }
-                    else
-                    {
-                        print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
-                        print '>'.$langs->trans('Validate').'</a>';
-                    }
-                }
-            }
-
-            // Clone
-            if ($action != 'edit' && $user->rights->fournisseur->facture->creer)
-            {
-                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=clone&amp;socid='.$object->socid.'">'.$langs->trans('ToClone').'</a>';
-            }
-
-            // Delete
-            if ($action != 'edit' && $user->rights->fournisseur->facture->supprimer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-            }
-            print '</div>';
-            print '<br>';
-
-            if ($action != 'edit')
-            {
-				print '<div class="fichecenter"><div class="fichehalfleft">';
-            	//print '<table width="100%"><tr><td width="50%" valign="top">';
-                //print '<a name="builddoc"></a>'; // ancre
-
-                /*
-                 * Documents generes
-                */
-
-                $ref=dol_sanitizeFileName($object->ref);
-                $subdir = get_exdir($object->id,2).$ref;
-                $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref;
-                $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
-                $genallowed=$user->rights->fournisseur->facture->creer;
-                $delallowed=$user->rights->fournisseur->facture->supprimer;
-                $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)?'':$conf->global->INVOICE_SUPPLIER_ADDON_PDF));
-
-                print $formfile->showdocuments('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang);
-                $somethingshown=$formfile->numoffiles;
-
-                /*
-                 * Linked object block
-                 */
-                $somethingshown=$object->showLinkedObjectBlock();
-
-				print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-                //print '</td><td valign="top" width="50%">';
-                //print '<br>';
-
-                // List of actions on element
-                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-                $formactions=new FormActions($db);
-                $somethingshown=$formactions->showactions($object,'invoice_supplier',$socid);
-
-				print '</div></div></div>';
-                //print '</td></tr></table>';
-            }
-        }
-        /*
-         * Show mail form
-        */
-        if ($action == 'presend')
-        {
-            $ref = dol_sanitizeFileName($object->ref);
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref, preg_quote($ref,'/'));
-            $file=$fileparams['fullname'];
-
-            // Build document if it not exists
-            if (! $file || ! is_readable($file))
-            {
-                // Define output language
-                $outputlangs = $langs;
-                $newlang='';
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-                if (! empty($newlang))
-                {
-                    $outputlangs = new Translate("",$conf);
-                    $outputlangs->setDefaultLang($newlang);
-                }
-
-                $result=supplier_invoice_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                if ($result <= 0)
-                {
-                    dol_print_error($db,$result);
-                    exit;
-                }
-                $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$ref, preg_quote($ref,'/'));
-                $file=$fileparams['fullname'];
-            }
-
-            print '<br>';
-            print_titre($langs->trans('SendBillByMail'));
-
-            // Cree l'objet formulaire mail
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            $formmail = new FormMail($db);
-            $formmail->fromtype = 'user';
-            $formmail->fromid   = $user->id;
-            $formmail->fromname = $user->getFullName($langs);
-            $formmail->frommail = $user->email;
-            $formmail->withfrom=1;
-			$liste=array();
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-			$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-			$formmail->withtocc=$liste;
-            $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-            $formmail->withtopic=$langs->trans('SendBillRef','__FACREF__');
-            $formmail->withfile=2;
-            $formmail->withbody=1;
-            $formmail->withdeliveryreceipt=1;
-            $formmail->withcancel=1;
-            // Tableau des substitutions
-            $formmail->substit['__FACREF__']=$object->ref;
-            $formmail->substit['__SIGNATURE__']=$user->signature;
-            $formmail->substit['__PERSONALIZED__']='';
-            $formmail->substit['__CONTACTCIVNAME__']='';
-
-            //Find the good contact adress
-            $custcontact='';
-            $contactarr=array();
-            $contactarr=$object->liste_contact(-1,'external');
-
-            if (is_array($contactarr) && count($contactarr)>0) {
-            	foreach($contactarr as $contact) {
-            		if ($contact['libelle']==$langs->trans('TypeContact_invoice_supplier_external_BILLING')) {
-            			require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-            			$contactstatic=new Contact($db);
-            			$contactstatic->fetch($contact['id']);
-            			$custcontact=$contactstatic->getFullName($langs,1);
-            		}
-            	}
-
-            	if (!empty($custcontact)) {
-            		$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-            	}
-            }
-
-            // Tableau des parametres complementaires
-            $formmail->param['action']='send';
-            $formmail->param['models']='invoice_supplier_send';
-            $formmail->param['facid']=$object->id;
-            $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-            // Init list of files
-            if (GETPOST("mode")=='init')
-            {
-                $formmail->clear_attached_files();
-                $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-            }
-
-            // Show form
-            print $formmail->get_form();
-
-            print '<br>';
-        }
-    }
-}
-
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 4b2c61c02a5..83d4b830c5f 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -47,6 +47,31 @@ if ($user->societe_id > 0)
 	$socid = $user->societe_id;
 }
 
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+
+$search_ref = GETPOST('search_ref','alpha');
+$search_ref_supplier = GETPOST('search_ref_supplier','alpha');
+$search_company = GETPOST('search_company','alpha');
+$search_amount_no_tax = GETPOST('search_amount_no_tax','alpha');
+$search_amount_all_tax = GETPOST('search_amount_all_tax','alpha');
+
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="f.date_lim_reglement";
+if (! $sortorder) $sortorder="ASC";
+
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$search_ref_supplier="";
+	$search_company="";
+	$search_amount_no_tax="";
+	$search_amount_all_tax="";
+}
 
 /*
  * View
@@ -61,34 +86,9 @@ $title=$langs->trans("BillsSuppliersUnpaid");
 $facturestatic=new FactureFournisseur($db);
 $companystatic=new Societe($db);
 
-
-/***************************************************************************
-*                                                                         *
-*                      Mode Liste                                         *
-*                                                                         *
-***************************************************************************/
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-
-$search_ref = GETPOST('search_ref','alpha');
-$search_ref_supplier = GETPOST('search_ref_supplier','alpha');
-$search_societe = GETPOST('search_societe','alpha');
-$search_montant_ht = GETPOST('search_montant_ht','int');
-$search_montant_ttc = GETPOST('search_montant_ttc','int');
-
-
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="f.date_lim_reglement";
-if (! $sortorder) $sortorder="ASC";
-
 if ($user->rights->fournisseur->facture->lire)
 {
-	$sql = "SELECT s.rowid as socid, s.nom,";
+	$sql = "SELECT s.rowid as socid, s.nom as name,";
 	$sql.= " f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc,";
 	$sql.= " f.datef as df, f.date_lim_reglement as datelimite, ";
 	$sql.= " f.paye as paye, f.rowid as facid, f.fk_statut";
@@ -117,26 +117,26 @@ 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)
 	{
 		$sql .= " AND f.ref_supplier LIKE '%".$search_ref_supplier."%'";
 	}
 
-	if ($search_societe)
+	if ($search_company)
 	{
-		$sql .= " AND s.nom LIKE '%".$search_societe."%'";
+		$sql .= " AND s.nom LIKE '%".$search_company."%'";
 	}
 
-	if ($search_montant_ht)
+	if ($search_amount_no_tax)
 	{
-		$sql .= " AND f.total_ht = '".$search_montant_ht."'";
+		$sql .= " AND f.total_ht = '".$search_amount_no_tax."'";
 	}
 
-	if ($search_montant_ttc)
+	if ($search_amount_all_tax)
 	{
-		$sql .= " AND f.total_ttc = '".$search_montant_ttc."'";
+		$sql .= " AND f.total_ttc = '".$search_amount_all_tax."'";
 	}
 
 	if (dol_strlen(GETPOST('sf_re')) > 0)
@@ -144,7 +144,7 @@ if ($user->rights->fournisseur->facture->lire)
 		$sql .= " AND f.ref_supplier LIKE '%".GETPOST('sf_re')."%'";
 	}
 
-	$sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut, s.rowid, s.nom";
+	$sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut";
 	if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
 	$sql.=$db->order($sortfield,$sortorder);
 	if (! in_array("f.ref_supplier",explode(',',$sortfield))) $sql.= ", f.ref_supplier DESC";
@@ -165,15 +165,15 @@ if ($user->rights->fournisseur->facture->lire)
 
 		if ($search_ref)         	$param.='&amp;search_ref='.urlencode($search_ref);
 		if ($search_ref_supplier)	$param.='&amp;search_ref_supplier='.urlencode($search_ref_supplier);
-		if ($search_societe)     	$param.='&amp;search_societe='.urlencode($search_societe);
-		if ($search_montant_ht)  	$param.='&amp;search_montant_ht='.urlencode($search_montant_ht);
-		if ($search_montant_ttc) 	$param.='&amp;search_montant_ttc='.urlencode($search_montant_ttc);
+		if ($search_company)     	$param.='&amp;search_company='.urlencode($search_company);
+		if ($search_amount_no_tax)	$param.='&amp;search_amount_no_tax='.urlencode($search_amount_no_tax);
+		if ($search_amount_all_tax) $param.='&amp;search_amount_all_tax='.urlencode($search_amount_all_tax);
 
 		$param.=($option?"&option=".$option:"");
 		if (! empty($late)) $param.='&late='.urlencode($late);
 		$urlsource=str_replace('&amp;','&',$param);
 
-		$titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->nom):$langs->trans("BillsSuppliersUnpaid"));
+		$titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->name):$langs->trans("BillsSuppliersUnpaid"));
 
 		if ($option == 'late') $titre.=' ('.$langs->trans("Late").')';
 	    else $titre.=' ('.$langs->trans("All").')';
@@ -209,15 +209,15 @@ if ($user->rights->fournisseur->facture->lire)
 		print '<td class="liste_titre">&nbsp;</td>';
 		print '<td class="liste_titre">&nbsp;</td>';
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="6" name="search_societe" value="'.$search_societe.'">';
+		print '<input class="flat" type="text" size="6" name="search_company" value="'.$search_company.'">';
 		print '</td><td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="8" name="search_montant_ht" value="'.$search_montant_ht.'">';
+		print '<input class="flat" type="text" size="8" name="search_amount_no_tax" value="'.$search_amount_no_tax.'">';
 		print '</td><td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="8" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
+		print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 		print '</td><td class="liste_titre" colspan="2" align="right">';
 		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-		print '</td>';
-		print "</tr>\n";
+		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+		print "</td></tr>\n";
 
 		if ($num > 0)
 		{
@@ -241,7 +241,7 @@ if ($user->rights->fournisseur->facture->lire)
 				print $facturestatic->getNomUrl(1);
 				print "</td>\n";
 
-				print '<td class="nowrap">'.dol_trunc($objp->ref_supplier,12)."</td>\n";
+				print '<td class="nowrap">'.dol_trunc($objp->ref_supplier,12).'</td>';
 
 				print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->df),'day')."</td>\n";
 				print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->datelimite),'day');
@@ -250,7 +250,7 @@ if ($user->rights->fournisseur->facture->lire)
 
 				print '<td>';
 				$companystatic->id=$objp->socid;
-				$companystatic->nom=$objp->nom;
+				$companystatic->name=$objp->name;
 				print $companystatic->getNomUrl(1,'supplier',32);
 				print '</td>';
 
@@ -258,7 +258,7 @@ if ($user->rights->fournisseur->facture->lire)
 				print "<td align=\"right\">".price($objp->total_ttc)."</td>";
 				print "<td align=\"right\">".price($objp->am)."</td>";
 
-				// Affiche statut de la facture
+				// Show invoice status
 				print '<td align="right" class="nowrap">';
 				print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am);
 				print '</td>';
diff --git a/htdocs/fourn/facture/index.html b/htdocs/fourn/facture/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/fourn/facture/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 673ac3fea6f..2a01602eadc 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 if (!$user->rights->fournisseur->facture->lire) accessforbidden();
 
@@ -63,9 +64,28 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="fac.datef,fac.rowid";
 
-$month    = GETPOST('month','int');
-$year     = GETPOST('year','int');
+$search_ref = GETPOST("search_ref","int");
+$search_ref_supplier = GETPOST("search_ref_supplier","alpha");
+$search_label = GETPOST("search_label","alpha");
+$search_company = GETPOST("search_company","alpha");
+$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_x") || GETPOST("button_removefilter"))		// Both test must be present to be compatible with all browsers
+{
+	$search_ref="";
+	$search_ref_supplier="";
+	$search_label="";
+	$search_company="";
+	$search_amount_no_tax="";
+	$search_amount_all_tax="";
+	$year="";
+	$month="";
+	$filter="";
+}
 
 /*
  * Actions
@@ -92,9 +112,6 @@ if ($mode == 'search')
 	}
 }
 
-
-
-
 /*
  * View
  */
@@ -106,11 +123,13 @@ $formfile = new FormFile($db);
 
 llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
-$sql = "SELECT s.rowid as socid, s.nom, ";
+$sql = "SELECT s.rowid as socid, s.nom as name, ";
 $sql.= " fac.rowid as facid, fac.ref, fac.ref_supplier, fac.datef, fac.date_lim_reglement as date_echeance,";
 $sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle";
+if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) $sql.=", p.rowid as project_id, p.ref as project_ref";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as fac";
+if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = fac.fk_projet";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE fac.entity = ".$conf->entity;
 $sql.= " AND fac.fk_soc = s.rowid";
@@ -119,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);
@@ -129,14 +148,14 @@ if (GETPOST('filtre') && GETPOST('filtre') != -1)		// GETPOST('filtre') may be a
 	}
 }
 
-if (GETPOST("search_ref"))
+if ($search_ref)
 {
-	if (is_numeric(GETPOST("search_ref"))) $sql .= natural_search(array('fac.rowid', 'fac.ref'), GETPOST('search_ref'));// For backward compatibility
-	else $sql .= natural_search('fac.ref', GETPOST("search_ref"));
+	if (is_numeric($search_ref)) $sql .= natural_search(array('fac.ref'), $search_ref);
+	else $sql .= natural_search('fac.ref', $search_ref);
 }
-if (GETPOST("search_ref_supplier"))
+if (search_ref_supplier)
 {
-	$sql .= natural_search('fac.ref_supplier', GETPOST('search_ref_supplier'));
+	$sql .= natural_search('fac.ref_supplier', $search_ref_supplier);
 }
 if ($month > 0)
 {
@@ -149,24 +168,24 @@ else if ($year > 0)
 {
 	$sql.= " AND fac.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
-if (GETPOST("search_libelle"))
+if ($search_label)
 {
-    $sql .= natural_search('fac.libelle', GETPOST('search_libelle'));
+    $sql .= natural_search('fac.libelle', $search_label);
 }
 
-if (GETPOST("search_societe"))
+if ($search_company)
 {
-    $sql .= natural_search('s.nom', GETPOST('search_societe'));
+    $sql .= natural_search('s.nom', $search_company);
 }
 
-if (GETPOST("search_montant_ht"))
+if ($search_amount_no_tax)
 {
-	$sql .= " AND fac.total_ht = '".$db->escape(price2num(GETPOST("search_montant_ht")))."'";
+	$sql .= " AND fac.total_ht = '".$db->escape(price2num($search_amount_no_tax))."'";
 }
 
-if (GETPOST("search_montant_ttc"))
+if ($search_amount_all_tax)
 {
-	$sql .= " AND fac.total_ttc = '".$db->escape(price2num(GETPOST("search_montant_ttc")))."'";
+	$sql .= " AND fac.total_ttc = '".$db->escape(price2num($search_amount_all_tax))."'";
 }
 
 $nbtotalofrecords = 0;
@@ -192,17 +211,17 @@ if ($resql)
 	}
 
 	$param='&socid='.$socid;
-	if ($month) $param.='&month='.urlencode($month);
-	if ($year)  $param.='&year=' .urlencode($year);
-	if (GETPOST("search_ref"))          $param.='&search_ref='.urlencode(GETPOST("search_ref"));
-	if (GETPOST("search_ref_supplier")) $param.='&search_ref_supplier'.urlencode(GETPOST("search_ref_supplier"));
-	if (GETPOST("search_libelle"))      $param.='&search_libelle='.urlencode(GETPOST("search_libelle"));
-	if (GETPOST("search_societe"))      $param.='&search_societe='.urlencode(GETPOST("search_societe"));
-	if (GETPOST("search_montant_ht"))   $param.='&search_montant_ht='.urlencode(GETPOST("search_montant_ht"));
-	if (GETPOST("search_montant_ttc"))  $param.='&search_montant_ttc='.urlencode(GETPOST("search_montant_ttc"));
-	if (GETPOST("filtre") && GETPOST('filtre') != -1) $param.='&filtre='.urlencode(GETPOST("filtre"));
+	if ($month) 				$param.='&month='.urlencode($month);
+	if ($year)  				$param.='&year=' .urlencode($year);
+	if ($search_ref)          	$param.='&search_ref='.urlencode($search_ref);
+	if ($search_ref_supplier) 	$param.='&search_ref_supplier'.urlencode($search_ref_supplier);
+	if ($search_label)      	$param.='&search_label='.urlencode($search_label);
+	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 ($filter && $filter != -1) $param.='&filtre='.urlencode($filter);
 
-	print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->nom":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+	print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<table class="liste" width="100%">';
 	print '<tr class="liste_titre">';
@@ -212,19 +231,21 @@ if ($resql)
 	print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"fac.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"fac.libelle","",$param,"",$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+	if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"p.ref","",$param,'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"fac.total_ht","",$param,'align="right"',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"fac.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","",$param,'align="right"',$sortfield,$sortorder);
+	print '<td class="liste_titre">&nbsp;</td>';
 	print "</tr>\n";
 
 	// Lignes des champs de filtre
 
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" size="6" type="text" name="search_ref" value="'.GETPOST("search_ref").'">';
+	print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
 	print '</td>';
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.GETPOST("search_ref_supplier").'">';
+	print '<input class="flat" size="6" type="text" name="search_ref_supplier" value="'.$search_ref_supplier.'">';
 	print '</td>';
 	print '<td class="liste_titre" colspan="1" align="center">';
 	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
@@ -235,23 +256,32 @@ if ($resql)
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" size="16" type="text" name="search_libelle" value="'.GETPOST("search_libelle").'">';
+	print '<input class="flat" size="16" type="text" name="search_label" value="'.$search_label.'">';
 	print '</td>';
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" size="8" name="search_societe" value="'.GETPOST("search_societe").'">';
+	print '<input class="flat" type="text" size="8" name="search_company" value="'.$search_company.'">';
+	print '</td>';
+	if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	print '<td class="liste_titre" align="right">';
+	print '<input class="flat" type="text" size="8" name="search_amount_no_tax" value="'.$search_amount_no_tax.'">';
 	print '</td><td class="liste_titre" align="right">';
-	print '<input class="flat" type="text" size="8" name="search_montant_ht" value="'.GETPOST("search_montant_ht").'">';
+	print '<input class="flat" type="text" size="8" name="search_amount_all_tax" value="'.$search_amount_all_tax.'">';
 	print '</td><td class="liste_titre" align="right">';
-	print '<input class="flat" type="text" size="8" name="search_montant_ttc" value="'.GETPOST("search_montant_ttc").'">';
-	print '</td><td class="liste_titre" align="center">';
-	$liststatus=array('paye:0'=>$langs->trans("Unpayed"), 'paye:1'=>$langs->trans("Payed"));
-	print $form->selectarray('filtre', $liststatus, GETPOST('filtre'), 1);
-	print '<input type="image" class="liste_titre" align="right" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	$liststatus=array('paye:0'=>$langs->trans("Unpaid"), 'paye:1'=>$langs->trans("Paid"));
+	print $form->selectarray('filtre', $liststatus, $filter, 1);
+	print '</td><td class="liste_titre" align="right">';
+	print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	print '</td>';
 	print "</tr>\n";
 
 	$facturestatic=new FactureFournisseur($db);
 	$supplierstatic=new Fournisseur($db);
+	$projectstatic=new Project($db);
 
 	$var=true;
 	$total=0;
@@ -279,8 +309,17 @@ if ($resql)
 		print '<td>'.dol_trunc($obj->libelle,36).'</td>';
 		print '<td>';
 		$supplierstatic->id=$obj->socid;
-		$supplierstatic->nom=$obj->nom;
+		$supplierstatic->name=$obj->name;
 		print $supplierstatic->getNomUrl(1,'',12);
+		print '</td>';
+		if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS))
+		{
+			$projectstatic->id=$obj->project_id;
+			$projectstatic->ref=$obj->project_ref;
+			print '<td>';
+			if ($obj->project_id > 0) print $projectstatic->getNomUrl(1);
+			print '</td>';
+		}
 		print '<td align="right">'.price($obj->total_ht).'</td>';
 		print '<td align="right">'.price($obj->total_ttc).'</td>';
 		$total+=$obj->total_ht;
@@ -293,6 +332,8 @@ if ($resql)
 		print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5);
 		print '</td>';
 
+		print '<td align="center">&nbsp;</td>';
+
 		print "</tr>\n";
 		$i++;
 
@@ -301,9 +342,11 @@ if ($resql)
 			// Print total
 			print '<tr class="liste_total">';
 			print '<td class="liste_total" colspan="6" align="left">'.$langs->trans("Total").'</td>';
+			if (! empty($conf->global->PROJECT_SHOW_REF_INTO_LISTS)) print '<td></td>';
 			print '<td class="liste_total" align="right">'.price($total).'</td>';
 			print '<td class="liste_total" align="right">'.price($total_ttc).'</td>';
 			print '<td class="liste_total" align="center">&nbsp;</td>';
+			print '<td class="liste_total" align="center">&nbsp;</td>';
 			print "</tr>\n";
 		}
 	}
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index d5654c9215c..7d68a3c5a95 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -21,8 +21,8 @@
 /**
  *      \file       htdocs/fourn/facture/note.php
  *      \ingroup    facture
-*      \brief      Fiche de notes sur une facture fournisseur
-*/
+ *      \brief      Fiche de notes sur une facture fournisseur
+ */
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
@@ -137,7 +137,7 @@ if ($object->id > 0)
 	// Label
 	print '<tr><td>'.$form->editfieldkey("Label",'label',$object->label,$object,0).'</td><td colspan="3">';
 	print $form->editfieldval("Label",'label',$object->label,$object,0);
-	print '</td>';
+	print '</td></tr>';
 
 	print "</table>";
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index bb84e279ba9..65428cd138e 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
  * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
  * 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
@@ -67,10 +68,13 @@ $hookmanager->initHooks(array('paymentsupplier'));
 
 $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');
+
 
 /*
  * Actions
  */
+
 if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes'))
 {
     $error = 0;
@@ -212,8 +216,8 @@ if ($action == 'confirm_paiement' && $confirm == 'yes')
                     else $invoiceid=$facid;
                 }
             }
-            if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$invoiceid;
-            else $loc = DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$paiement_id;
+            if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid;
+            else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
             header('Location: '.$loc);
             exit;
         }
@@ -245,7 +249,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
     $datefacture=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
     $dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datefacture);
 
-    $sql = 'SELECT s.nom, s.rowid as socid,';
+    $sql = 'SELECT s.nom as name, s.rowid as socid,';
     $sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total';
     if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
     $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
@@ -270,14 +274,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             print '<input type="hidden" name="facid" value="'.$facid.'">';
             print '<input type="hidden" name="ref_supplier" value="'.$obj->ref_supplier.'">';
             print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
-            print '<input type="hidden" name="societe" value="'.$obj->nom.'">';
+            print '<input type="hidden" name="societe" value="'.$obj->name.'">';
 
             print '<table class="border" width="100%">';
 
             print '<tr class="liste_titre"><td colspan="3">'.$langs->trans('Payment').'</td>';
             print '<tr><td>'.$langs->trans('Company').'</td><td colspan="2">';
             $supplierstatic->id=$obj->socid;
-            $supplierstatic->name=$obj->nom;
+            $supplierstatic->name=$obj->name;
             print $supplierstatic->getNomUrl(1,'supplier');
             print '</td></tr>';
             print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
@@ -328,9 +332,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                {
 	                    $i = 0;
 	                    print '<br>';
-
 	                    print $langs->trans('Invoices').'<br>';
-	                    print '<table class="noborder" width="100%">';
+
+						if(!empty($conf->global->FAC_AUTO_FILLJS)){
+							//Add js for AutoFill
+							print "\n".'<script type="text/javascript" language="javascript">';
+							print ' $(document).ready(function () {';
+							print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+											$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value"));
+										});';
+							print '	});'."\n";
+							print '	</script>'."\n";
+						}
+						print '<table class="noborder" width="100%">';
 	                    print '<tr class="liste_titre">';
 	                    print '<td>'.$langs->trans('Ref').'</td>';
 	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
@@ -370,8 +384,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        print '<td align="right">'.price($objp->total_ttc - $objp->am).'</td>';
 	                        print '<td align="center">';
 	                        $namef = 'amount_'.$objp->facid;
+							if(!empty($conf->global->FAC_AUTO_FILLJS))
+								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->total_ttc - $objp->am)."'");
 	                        print '<input type="text" size="8" name="'.$namef.'" value="'.GETPOST($namef).'">';
-	                        print "</td></tr>\n";
+							print "</td></tr>\n";
 	                        $total+=$objp->total_ht;
 	                        $total_ttc+=$objp->total_ttc;
 	                        $totalrecu+=$objp->am;
@@ -442,9 +458,18 @@ if (empty($action))
     $search_paymenttype=GETPOST('search_paymenttype');
     $search_amount=GETPOST('search_amount');
     $search_company=GETPOST('search_company');
+	
+	if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+	{
+		$search_ref="";
+		$search_account="";
+		$search_paymenttype="";
+		$search_amount="";
+		$search_company="";
+	}
 
     $sql = 'SELECT p.rowid as pid, p.datep as dp, p.amount as pamount, p.num_paiement,';
-    $sql.= ' s.rowid as socid, s.nom,';
+    $sql.= ' s.rowid as socid, s.nom as name,';
     $sql.= ' c.libelle as paiement_type,';
     $sql.= ' ba.rowid as bid, ba.label,';
     if (!$user->rights->societe->client->voir) $sql .= ' sc.fk_soc, sc.fk_user,';
@@ -478,7 +503,7 @@ if (empty($action))
     }
     if (! empty($search_amount))
     {
-        $sql .= " AND p.amount=".price2num($search_amount);
+        $sql .= " AND p.amount='".price2num($search_amount)."'";
     }
     if (! empty($search_company))
     {
@@ -499,33 +524,31 @@ if (empty($action))
         $paramlist='';
         $paramlist.=(! empty($search_ref)?"&search_ref=".$search_ref:"");
         $paramlist.=(! empty($search_company)?"&search_company=".$search_company:"");
-        $paramlist.=(! empty($search_amount)?"&search_amount=".$search_amount:"");
+        $paramlist.=(! empty($search_amount)?"&search_amount='".$search_amount:"");
 
-        print_barre_liste($langs->trans('SupplierPayments'), $page, 'paiement.php',$paramlist,$sortfield,$sortorder,'',$num);
-
-        if ($mesg) dol_htmloutput_mesg($mesg);
-        if ($errmsg) dol_htmloutput_errors($errmsg);
+        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"],$paramlist,$sortfield,$sortorder,'',$num);
 
         print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print_liste_field_titre($langs->trans('RefPayment'),'paiement.php','p.rowid','',$paramlist,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Date'),'paiement.php','dp','',$paramlist,'align="center"',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('ThirdParty'),'paiement.php','s.nom','',$paramlist,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Type'),'paiement.php','c.libelle','',$paramlist,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Account'),'paiement.php','ba.label','',$paramlist,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('Amount'),'paiement.php','f.amount','',$paramlist,'align="right"',$sortfield,$sortorder);
-        //print_liste_field_titre($langs->trans('Invoice'),'paiement.php','ref_supplier','',$paramlist,'',$sortfield,$sortorder);
-        print "</tr>\n";
+        print_liste_field_titre($langs->trans('RefPayment'),$_SERVER["PHP_SELF"],'p.rowid','',$paramlist,'',$sortfield,$sortorder);
+        print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'dp','',$paramlist,'align="center"',$sortfield,$sortorder);
+        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"],'p.amount','',$paramlist,'align="right"',$sortfield,$sortorder);
+        //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder);
+        print '<td class="liste_titre">&nbsp;</td>';
+		print "</tr>\n";
 
         // Lines for filters fields
         print '<tr class="liste_titre">';
         print '<td align="left">';
-        print '<input class="fat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
+        print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
         print '</td>';
         print '<td>&nbsp;</td>';
         print '<td align="left">';
-        print '<input class="fat" type="text" size="6" name="search_company" value="'.$search_company.'">';
+        print '<input class="flat" type="text" size="6" name="search_company" value="'.$search_company.'">';
         print '</td>';
         print '<td>';
         $form->select_types_paiements($search_paymenttype,'search_paymenttype','',2,1,1);
@@ -534,9 +557,11 @@ if (empty($action))
         $form->select_comptes($search_account,'search_account',0,'',1);
         print '</td>';
         print '<td align="right">';
-        print '<input class="fat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
-        print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" alt="'.$langs->trans("Search").'">';
-        print '</td>';
+        print '<input class="flat" type="text" size="4" name="search_amount" value="'.$search_amount.'">';
+        print '</td><td align="right">';
+		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+        print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+		print '</td>';
         print "</tr>\n";
 
         while ($i < min($num,$limit))
@@ -546,13 +571,13 @@ if (empty($action))
             print '<tr '.$bc[$var].'>';
 
             // Ref payment
-            print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->pid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.'</a></td>';
+            print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$objp->pid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.'</a></td>';
 
             // Date
             print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
 
             print '<td>';
-            if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->nom,32).'</a>';
+            if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->name,32).'</a>';
             else print '&nbsp;';
             print '</td>';
 
@@ -571,7 +596,8 @@ if (empty($action))
             print '<td class="nowrap">';
             print $invoicesupplierstatic->getNomUrl(1);
             print '</td>';*/
-
+			
+			print '<td>&nbsp;</td>';
             print '</tr>';
             $i++;
         }
diff --git a/htdocs/fourn/facture/tpl/index.html b/htdocs/fourn/facture/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index c10fea8bb8a..a6d9164a91c 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -32,6 +32,7 @@ echo '<br>';
 if ($num > 1) print_titre($langs->trans("RelatedBills"));
 else print_titre($langs->trans("RelatedBill"));
 ?>
+
 <table class="noborder allwidth">
 <tr class="liste_titre">
 	<td><?php echo $langs->trans("Ref"); ?></td>
@@ -46,7 +47,7 @@ foreach($linkedObjectBlock as $object)
 	$var=!$var;
 ?>
 <tr <?php echo $bc[$var]; ?> ><td>
-	<a href="<?php echo DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$object->id ?>"><?php echo img_object($langs->trans("ShowBill"),"bill").' '.$object->ref; ?></a></td>
+	<a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id ?>"><?php echo img_object($langs->trans("ShowBill"),"bill").' '.$object->ref; ?></a></td>
 	<td align="center"><?php echo dol_print_date($object->date,'day'); ?></td>
 	<td align="right"><?php
 		if ($user->rights->fournisseur->facture->lire) {
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
deleted file mode 100644
index b4ceb2ae1b0..00000000000
--- a/htdocs/fourn/fiche.php
+++ /dev/null
@@ -1,516 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/fourn/fiche.php
- *	\ingroup    fournisseur, facture
- *	\brief      Page for supplier third party card (view, edit)
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-
-$langs->load('suppliers');
-$langs->load('products');
-$langs->load('bills');
-$langs->load('orders');
-$langs->load('companies');
-$langs->load('commercial');
-
-$action	= GETPOST('action');
-
-// Security check
-$id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
-if ($user->societe_id) $id=$user->societe_id;
-$result = restrictedArea($user, 'societe&fournisseur', $id, '&societe');
-
-$object = new Fournisseur($db);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('suppliercard'));
-
-$parameters = array('id' => $id);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-
-/*
- * Action
- */
-
-if ($action == 'setsupplieraccountancycode')
-{
-	$cancelbutton = GETPOST('cancel');
-
-	if (!$cancelbutton) {
-
-		$result = $object->fetch($id);
-		$object->code_compta_fournisseur = $_POST["supplieraccountancycode"];
-		$result = $object->update($object->id, $user, 1, 0, 1);
-		if ($result < 0) {
-			$mesg = join(',', $object->errors);
-		}
-		$action = "";
-	}
-}
-// conditions de reglement
-if ($action == 'setconditions' && $user->rights->societe->creer)
-{
-	$object->fetch($id);
-	$result=$object->setPaymentTerms(GETPOST('cond_reglement_supplier_id','int'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-// mode de reglement
-if ($action == 'setmode' && $user->rights->societe->creer)
-{
-	$object->fetch($id);
-	$result=$object->setPaymentMethods(GETPOST('mode_reglement_supplier_id','int'));
-	if ($result < 0) dol_print_error($db,$object->error);
-}
-
-
-/*
- * View
- */
-
-$contactstatic = new Contact($db);
-$form = new Form($db);
-
-if ($object->fetch($id))
-{
-	llxHeader('',$langs->trans('SupplierCard'));
-
-	/*
-	 * Affichage onglets
-	 */
-	$head = societe_prepare_head($object);
-
-	dol_fiche_head($head, 'supplier', $langs->trans("ThirdParty"),0,'company');
-
-
-	print '<div class="fichecenter"><div class="fichehalfleft">';
-
-	print '<table width="100%" class="border">';
-	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
-	$object->next_prev_filter="te.fournisseur = 1";
-	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
-	print '</td></tr>';
-
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
-
-	if ($object->fournisseur)
-	{
-		print '<tr>';
-        print '<td class="nowrap">'.$langs->trans("SupplierCode"). '</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td>';
-        print '</tr>';
-
-		$langs->load('compta');
-        print '<tr>';
-        print '<td>';
-        print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
-        print '</td><td colspan="3">';
-        print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
-        print '</td>';
-        print '</tr>';
-	}
-
-	// Address
-	print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">';
-	dol_print_address($object->address,'gmap','thirdparty',$object->id);
-	print '</td></tr>';
-
-	// Zip / Town
-	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>';
-	print '</tr>';
-
-	// Country
-	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
-	$img=picto_from_langcode($object->country_code);
-	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
-	else print ($img?$img.' ':'').$object->country;
-	print '</td></tr>';
-
-    // EMail
-	print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
-
-	// Web
-	print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($object->url).'</td></tr>';
-
-	// Phone
-	print '<tr><td>'.$langs->trans("Phone").'</td><td style="min-width: 25%;">'.dol_print_phone($object->phone,$object->country_code,0,$object->id,'AC_TEL').'</td>';
-
-	// Fax
-	print '<td>'.$langs->trans("Fax").'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code,0,$object->id,'AC_FAX').'</td></tr>';
-
-	// Assujetti a TVA ou pas
-	print '<tr>';
-	print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">';
-	print yn($object->tva_assuj);
-	print '</td>';
-	print '</tr>';
-
-	// Local Taxes
-	//TODO: Place into a function to control showing by country or study better option
-	if($mysoc->country_code=='ES')
-	{
-		if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-		{
-			print '<tr><td class="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">';
-			print yn($object->localtax1_assuj);
-			print '</td></tr>';
-			print '<tr><td class="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">';
-			print yn($object->localtax2_assuj);
-			print '</td></tr>';
-		}
-		elseif($mysoc->localtax1_assuj=="1")
-		{
-			print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-			print yn($object->localtax1_assuj);
-			print '</td></tr>';
-		}
-		elseif($mysoc->localtax2_assuj=="1")
-		{
-			print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-			print yn($object->localtax2_assuj);
-			print '</td></tr>';
-		}
-
-		if ($mysoc->localtax2_assuj!="1")
-		{
-			print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
-			print yn($object->localtax2_assuj);
-			print '</td><tr>';
-		}
-
-	}
-
-    // TVA Intra
-    print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td colspan="3">';
-    print $object->tva_intra;
-    print '</td></tr>';
-
-	// Conditions de reglement par defaut
-	$langs->load('bills');
-	$form = new Form($db);
-	print '<tr><td>';
-	print '<table width="100%" class="nobordernopadding"><tr><td>';
-	print $langs->trans('PaymentConditions');
-	print '<td>';
-	if (($action != 'editconditions') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($action == 'editconditions')
-	{
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_supplier_id,'cond_reglement_supplier_id',-1,1);
-	}
-	else
-	{
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->cond_reglement_supplier_id,'none');
-	}
-	print "</td>";
-	print '</tr>';
-
-	// Mode de reglement par defaut
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	print $langs->trans('PaymentMode');
-	print '<td>';
-	if (($action != 'editmode') && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($action == 'editmode')
-	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_supplier_id,'mode_reglement_supplier_id');
-	}
-	else
-	{
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->mode_reglement_supplier_id,'none');
-	}
-	print "</td>";
-	print '</tr>';
-
-    // Module Adherent
-    if (! empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
-        print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td colspan="3">';
-        $adh=new Adherent($db);
-        $result=$adh->fetch('','',$object->id);
-        if ($result > 0)
-        {
-            $adh->ref=$adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        }
-        else
-        {
-            print $langs->trans("ThirdpartyNotLinkedToMember");
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
-
-	print '</table>';
-
-
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
-	$var=true;
-
-	$MAXLIST=5;
-
-	// Lien recap
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
-	print '<td align="right"><a href="'.DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id.'">'.$langs->trans("ShowSupplierPreview").'</a></td></tr></table></td>';
-	print '</tr>';
-	print '</table>';
-
-	/*
-	 * List of products
-	 */
-	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
-	{
-		$langs->load("products");
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("ProductsAndServices").'</td><td align="right">';
-		print '<a href="'.DOL_URL_ROOT.'/fourn/product/liste.php?fourn_id='.$object->id.'">'.$langs->trans("All").' ('.$object->nbOfProductRefs().')';
-		print '</a></td></tr></table>';
-	}
-
-
-	print '<br>';
-
-	/*
-	 * Last orders
-	 */
-	$orderstatic = new CommandeFournisseur($db);
-
-	if ($user->rights->fournisseur->commande->lire)
-	{
-		// 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 ";
-		$sql.= " WHERE p.fk_soc =".$object->id;
-		$sql.= " AND p.entity =".$conf->entity;
-		$sql.= " ORDER BY p.date_commande DESC";
-		$sql.= " ".$db->plimit($MAXLIST);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$i = 0 ;
-			$num = $db->num_rows($resql);
-
-			if ($num > 0)
-			{
-			    print '<table class="noborder" width="100%">';
-
-			    print '<tr class="liste_titre">';
-    			print '<td colspan="3">';
-    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans("LastOrders",($num<$MAXLIST?"":$MAXLIST)).'</td>';
-    			print '<td align="right"><a href="commande/liste.php?socid='.$object->id.'">'.$langs->trans("AllOrders").' ('.$num.')</td>';
-                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
-    			print '</tr></table>';
-    			print '</td></tr>';
-			}
-
-			while ($i < $num && $i <= $MAXLIST)
-			{
-				$obj = $db->fetch_object($resql);
-				$var=!$var;
-
-				print "<tr ".$bc[$var].">";
-				print '<td><a href="commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref.'</a></td>';
-				print '<td align="center" width="80">';
-				if ($obj->dc)
-				{
-					print dol_print_date($db->jdate($obj->dc),'day');
-				}
-				else
-				{
-					print "-";
-				}
-				print '</td>';
-				print '<td align="right" class="nowrap">'.$orderstatic->LibStatut($obj->fk_statut,5).'</td>';
-				print '</tr>';
-				$i++;
-			}
-			$db->free($resql);
-
-			if ($num >0) print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	/*
-	 * Last invoices
-	 */
-	$MAXLIST=5;
-
-	$langs->load('bills');
-	$facturestatic = new FactureFournisseur($db);
-
-	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.= ' 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.= ' ORDER BY f.datef DESC';
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$i = 0 ;
-			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
-			    print '<table class="noborder" width="100%">';
-
-			    print '<tr class="liste_titre">';
-    			print '<td colspan="4">';
-    			print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('LastSuppliersBills',($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id.'">'.$langs->trans('AllBills').' ('.$num.')</td>';
-                print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
-    			print '</tr></table>';
-    			print '</td></tr>';
-			}
-			while ($i < min($num,$MAXLIST))
-			{
-				$obj = $db->fetch_object($resql);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
-				print '<td>';
-				print '<a href="facture/fiche.php?facid='.$obj->rowid.'">';
-				print img_object($langs->trans('ShowBill'),'bill').' '.$obj->ref_supplier.'</a> '.dol_trunc($obj->libelle,14).'</td>';
-				print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->df),'day').'</td>';
-				print '<td align="right" class="nowrap">'.price($obj->amount).'</td>';
-				print '<td align="right" class="nowrap">';
-				print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$obj->am);
-				print '</td>';
-				print '</tr>';
-				$i++;
-			}
-			$db->free($resql);
-			if ($num > 0) print '</table>';
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-
-	print '</div></div></div>';
-	print '<div style="clear:both"></div>';
-
-	dol_fiche_end();
-
-
-	/*
-	 * Barre d'actions
-	 */
-
-	
-	print '<div class="tabsAction">';
-	
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		// modified by hook
-		if (empty($reshook)) {
-	
-		if ($user->rights->fournisseur->commande->creer)
-		{
-			$langs->load("orders");
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
-		}
-	
-		if ($user->rights->fournisseur->facture->creer)
-		{
-			$langs->load("bills");
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
-		}
-	
-	    // Add action
-	    if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-	    {
-	        if ($user->rights->agenda->myactions->create)
-	        {
-	            print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-	        }
-	        else
-	        {
-	            print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
-	        }
-	    }
-	
-		print '</div>';
-	}
-	print '<br>';
-
-    if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
-    {
-        print '<br>';
-        // List of contacts
-        show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-    }
-
-    // Addresses list
-    if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
-    {
-    	$result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-    }
-
-    if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
-
-        // List of todo actions
-        show_actions_todo($conf,$langs,$db,$object);
-
-        // List of done actions
-        show_actions_done($conf,$langs,$db,$object);
-    }
-}
-else
-{
-	dol_print_error($db);
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index bfdf1b1ce45..9da28281779 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -86,7 +86,7 @@ if ($resql)
 		print "<tr ".$bc[$var].">";
 		print '<td>'.$langs->trans($commande->statuts[$row[1]]).'</td>';
 		print '<td align="center">'.$row[0].'</td>';
-		print '<td align="center"><a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php?statut='.$row[1].'">'.$commande->LibStatut($row[1],3).'</a></td>';
+		print '<td align="center"><a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?statut='.$row[1].'">'.$commande->LibStatut($row[1],3).'</a></td>';
 
 		print "</tr>\n";
 		$i++;
@@ -106,8 +106,8 @@ if (! empty($conf->fournisseur->enabled))
 {
 	$langs->load("orders");
 
-	$sql = "SELECT cf.rowid, cf.ref, cf.total_ttc";
-	$sql.= ", s.nom, s.rowid as socid";
+	$sql = "SELECT cf.rowid, cf.ref, cf.total_ttc,";
+	$sql.= " s.nom as name, s.rowid as socid";
 	$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
@@ -141,7 +141,7 @@ if (! empty($conf->fournisseur->enabled))
 				print '</td>';
 				print '<td  class="nowrap">';
 				$companystatic->id=$obj->socid;
-				$companystatic->nom=$obj->nom;
+				$companystatic->name=$obj->name;
 				$companystatic->client=0;
 				print $companystatic->getNomUrl(1,'',16);
 				print '</td>';
@@ -164,7 +164,7 @@ if (! empty($conf->fournisseur->enabled))
 if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
 {
 	$sql = "SELECT ff.ref_supplier, ff.rowid, ff.total_ttc, ff.type";
-	$sql.= ", s.nom, s.rowid as socid";
+	$sql.= ", s.nom as name, s.rowid as socid";
 	$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
@@ -199,7 +199,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
 				print '</td>';
 				print '<td class="nowrap">';
 				$companystatic->id=$obj->socid;
-				$companystatic->nom=$obj->nom;
+				$companystatic->name=$obj->name;
 				$companystatic->client=0;
 				print $companystatic->getNomUrl(1,'',16);
 				print '</td>';
@@ -233,7 +233,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
  * List last modified supliers
  */
 $max=10;
-$sql = "SELECT s.rowid as socid, s.nom, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur";
+$sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur";
 $sql.= ", st.libelle as stcomm";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
@@ -266,8 +266,8 @@ if ($resql)
 		$var=!$var;
 
 		print "<tr ".$bc[$var].">";
-		print '<td><a href="fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowSupplier"),"company").'</a>';
-		print "&nbsp;<a href=\"fiche.php?socid=".$obj->socid."\">".$obj->nom."</a></td>\n";
+		print '<td><a href="card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowSupplier"),"company").'</a>';
+		print "&nbsp;<a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
 		print '<td align="left">'.$obj->code_fournisseur.'&nbsp;</td>';
 		print '<td align="right">'.dol_print_date($db->jdate($obj->tms),'day').'</td>';
 		print "</tr>\n";
diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php
new file mode 100644
index 00000000000..b0d7caf8695
--- /dev/null
+++ b/htdocs/fourn/list.php
@@ -0,0 +1,252 @@
+<?php
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/fourn/list.php
+ *       \ingroup    fournisseur
+ *       \brief      Home page of supplier area
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+$langs->load("suppliers");
+$langs->load("orders");
+$langs->load("companies");
+
+$socname					= GETPOST("socname");
+$search_name				= GETPOST("search_name");
+$search_zipcode				= GETPOST("search_zipcode");
+$search_town				= GETPOST("search_town");
+$search_supplier_code		= GETPOST("search_supplier_code");
+$search_supplier_accounting = GETPOST("search_supplier_accounting");
+$search_datec				= GETPOST("search_datec");
+$search_categ				= GETPOST('search_categ','int');
+$catid						= GETPOST("catid",'int');
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user,'societe',$socid,'');
+
+$page = GETPOST('page','int');
+$sortorder = GETPOST('sortorder','alpha');
+$sortfield = GETPOST('sortfield','alpha');
+if ($page == -1) { $page = 0 ; }
+$offset = $conf->liste_limit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+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") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$socname="";
+	$search_name="";
+	$search_zipcode="";
+	$search_town="";
+	$search_supplier_code="";
+	$search_supplier_accounting="";
+	$search_datec="";
+	$search_categ="";
+	$catid="";
+}
+
+/*
+ * 	Actions
+ */
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+/*
+ *	View
+ */
+
+$htmlother=new FormOther($db);
+$thirdpartystatic=new Societe($db);
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$langs->trans("ThirdParty"),$help_url);
+
+$sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
+$sql.= "code_fournisseur, code_compta_fournisseur";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cf ON s.rowid = cf.fk_societe"; // We need this table joined to the select in order to filter by categ
+$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur = 1";
+$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc";
+if ($socid) $sql .= " AND s.rowid = ".$socid;
+if ($socname) {
+	$sql .= natural_search('s.nom', $socname);
+	$sortfield = "s.nom";
+	$sortorder = "ASC";
+}
+if ($search_name) {
+	$sql .= natural_search('s.nom', $search_name);
+}
+if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape($search_zipcode)."%'";
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_supplier_code)   $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_supplier_code)."%'";
+if ($search_supplier_accounting) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_supplier_accounting)."%'";
+if ($search_datec)   $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'";
+if ($catid > 0)          $sql.= " AND cf.fk_categorie = ".$catid;
+if ($catid == -2)        $sql.= " AND cf.fk_categorie IS NULL";
+if ($search_categ > 0)   $sql.= " AND cf.fk_categorie = ".$search_categ;
+if ($search_categ == -2) $sql.= " AND cf.fk_categorie IS NULL";
+// Count total nb of records
+$nbtotalofrecords = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+dol_syslog('fourn/list.php:', LOG_DEBUG);
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$param = "&amp;search_name=".$search_name."&amp;search_supplier_code=".$search_supplier_code."&amp;search_zipcode=".$search_zipcode."&amp;search_town=".$search_town;
+ 	if ($search_categ != '') $param.='&amp;search_categ='.$search_categ;
+
+	print_barre_liste($langs->trans("ListOfSuppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+
+	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+
+	// Filter on categories
+	$moreforfilter='';
+	if (! empty($conf->categorie->enabled))
+	{
+		$moreforfilter.=$langs->trans('Categories'). ': ';
+		$moreforfilter.=$htmlother->select_categories(1,$search_categ,'search_categ',1);
+		$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+	}
+	if ($moreforfilter)
+	{
+		print '<div class="liste_titre">';
+		print $moreforfilter;
+		print '</div>';
+	}
+
+	print '<table class="liste" width="100%">';
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'valign="middle"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,'valign="middle"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,'valign="middle"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
+
+    $parameters=array();
+    $formconfirm=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+
+	print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+
+	print '<td class="liste_titre"><input type="text" size="10" class="flat" name="search_name" value="'.$search_name.'"></td>';
+
+	print '<td class="liste_titre"><input type="text" size="10" class="flat" name="search_zipcode" value="'.$search_zipcode.'"></td>';
+
+	print '<td class="liste_titre"><input type="text" size="10" class="flat" name="search_town" value="'.$search_town.'"></td>';
+
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_supplier_code" value="'.$search_supplier_code.'">';
+	print '</td>';
+
+	print '<td align="left" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_supplier_accounting" value="'.$search_supplier_accounting.'">';
+	print '</td>';
+
+	print '<td align="right" class="liste_titre">';
+	print '<input class="flat" type="text" size="10" name="search_datec" value="'.$search_datec.'">';
+	print '</td>';
+
+	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    print "</td></tr>\n";
+	
+	$parameters=array();
+	$formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+
+	print '</tr>';
+
+	$var=True;
+
+	while ($i < min($num,$conf->liste_limit))
+	{
+		$obj = $db->fetch_object($resql);
+		$var=!$var;
+
+        $thirdpartystatic->id=$obj->socid;
+        $thirdpartystatic->name=$obj->name;
+        $thirdpartystatic->status=$obj->status;
+
+		print "<tr ".$bc[$var].">";
+		print '<td>';
+        print $thirdpartystatic->getNomUrl(1,'supplier');
+		print "</td>\n";
+		print '<td>'.$obj->zip.'</td>'."\n";
+		print '<td>'.$obj->town.'</td>'."\n";
+		print '<td align="left">'.$obj->code_fournisseur.'&nbsp;</td>';
+		print '<td align="left">'.$obj->code_compta_fournisseur.'&nbsp;</td>';
+		print '<td align="right">';
+		print dol_print_date($db->jdate($obj->datec),'day').'</td>';
+		print '<td align="right">'.$thirdpartystatic->getLibStatut(3).'</td>';
+
+		$parameters=array('obj' => $obj);
+		$formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table>\n";
+	print "</form>\n";
+	$db->free($resql);
+
+	$parameters=array('sql' => $sql);
+	$formconfirm=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
+}
+else
+{
+	dol_print_error($db);
+}
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php
deleted file mode 100644
index 81837feb41f..00000000000
--- a/htdocs/fourn/liste.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/fourn/liste.php
- *       \ingroup    fournisseur
- *       \brief      Home page of supplier area
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-
-$langs->load("suppliers");
-$langs->load("orders");
-$langs->load("companies");
-
-$socname                   = GETPOST("socname");
-$search_nom                = GETPOST("search_nom");
-$search_zipcode            = GETPOST("search_zipcode");
-$search_town               = GETPOST("search_town");
-$search_code_fournisseur   = GETPOST("search_code_fournisseur");
-$search_compta_fournisseur = GETPOST("search_compta_fournisseur");
-$search_datec              = GETPOST("search_datec");
-$search_categ              = GETPOST('search_categ','int');
-$catid                     = GETPOST("catid",'int');
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user,'societe',$socid,'');
-
-$page = GETPOST('page','int');
-$sortorder = GETPOST('sortorder','alpha');
-$sortfield = GETPOST('sortfield','alpha');
-if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="nom";
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('supplierlist'));
-
-/*
- * 	Actions
- */
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
-
-
-/*
- *	View
- */
-
-$htmlother=new FormOther($db);
-$thirdpartystatic=new Societe($db);
-
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
-
-$sql = "SELECT s.rowid as socid, s.nom, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
-$sql.= "code_fournisseur, code_compta_fournisseur";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cf ON s.rowid = cf.fk_societe"; // We need this table joined to the select in order to filter by categ
-$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE s.fk_stcomm = st.id AND s.fournisseur = 1";
-$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc";
-if ($socid) $sql .= " AND s.rowid = ".$socid;
-if ($socname) {
-	$sql .= natural_search('s.nom', $socname);
-	$sortfield = "s.nom";
-	$sortorder = "ASC";
-}
-if ($search_nom) {
-	$sql .= natural_search('s.nom', $search_nom);
-}
-if ($search_zipcode) $sql .= " AND s.zip LIKE '".$db->escape($search_zipcode)."%'";
-if ($search_town) {
-	$sql .= natural_search('s.town', $search_town);
-}
-if ($search_code_fournisseur)   $sql .= " AND s.code_fournisseur LIKE '%".$db->escape($search_code_fournisseur)."%'";
-if ($search_compta_fournisseur) $sql .= " AND s.code_compta_fournisseur LIKE '%".$db->escape($search_compta_fournisseur)."%'";
-if ($search_datec)   $sql .= " AND s.datec LIKE '%".$db->escape($search_datec)."%'";
-if ($catid > 0)          $sql.= " AND cf.fk_categorie = ".$catid;
-if ($catid == -2)        $sql.= " AND cf.fk_categorie IS NULL";
-if ($search_categ > 0)   $sql.= " AND cf.fk_categorie = ".$search_categ;
-if ($search_categ == -2) $sql.= " AND cf.fk_categorie IS NULL";
-// Count total nb of records
-$nbtotalofrecords = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-}
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
-
-dol_syslog('fourn/liste.php: sql='.$sql,LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$param = "&amp;search_nom=".$search_nom."&amp;search_code_fournisseur=".$search_code_fournisseur."&amp;search_zipcode=".$search_zipcode."&amp;search_town=".$search_town;
- 	if ($search_categ != '') $param.='&amp;search_categ='.$search_categ;
-
-	print_barre_liste($langs->trans("ListOfSuppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
-
-	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-
-	// Filter on categories
-	$moreforfilter='';
-	if (! empty($conf->categorie->enabled))
-	{
-		$moreforfilter.=$langs->trans('Categories'). ': ';
-		$moreforfilter.=$htmlother->select_categories(1,$search_categ,'search_categ',1);
-		$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
-	}
-	if ($moreforfilter)
-	{
-		print '<div class="liste_titre">';
-		print $moreforfilter;
-		print '</div>';
-	}
-
-	print '<table class="liste" width="100%">';
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,'valign="middle"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Zip"),$_SERVER["PHP_SELF"],"s.zip","",$param,'valign="middle"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$param,'valign="middle"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder);
-
-    $parameters=array();
-    $formconfirm=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_nom" value="'.$search_nom.'"></td>';
-
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_zipcode" value="'.$search_zipcode.'"></td>';
-
-	print '<td class="liste_titre"><input type="text" class="flat" name="search_town" value="'.$search_town.'"></td>';
-
-	print '<td align="left" class="liste_titre">';
-	print '<input class="flat" type="text" size="10" name="search_code_fournisseur" value="'.$search_code_fournisseur.'">';
-	print '</td>';
-
-	print '<td align="left" class="liste_titre">';
-	print '<input class="flat" type="text" size="10" name="search_compta_fournisseur" value="'.$search_compta_fournisseur.'">';
-	print '</td>';
-
-	print '<td align="right" class="liste_titre">';
-	print '<input class="flat" type="text" size="10" name="search_datec" value="'.$search_datec.'">';
-	print '</td>';
-
-	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
-
-	$parameters=array();
-	$formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-
-	print '</tr>';
-
-	$var=True;
-
-	while ($i < min($num,$conf->liste_limit))
-	{
-		$obj = $db->fetch_object($resql);
-		$var=!$var;
-
-        $thirdpartystatic->id=$obj->socid;
-        $thirdpartystatic->nom=$obj->nom;
-        $thirdpartystatic->status=$obj->status;
-
-		print "<tr ".$bc[$var].">";
-		print '<td>';
-        print $thirdpartystatic->getNomUrl(1,'supplier');
-		print "</td>\n";
-		print '<td>'.$obj->zip.'</td>'."\n";
-		print '<td>'.$obj->town.'</td>'."\n";
-		print '<td align="left">'.$obj->code_fournisseur.'&nbsp;</td>';
-		print '<td align="left">'.$obj->code_compta_fournisseur.'&nbsp;</td>';
-		print '<td align="right">';
-		print dol_print_date($db->jdate($obj->datec),'day').'</td>';
-		print '<td align="right">'.$thirdpartystatic->getLibStatut(3).'</td>';
-
-		$parameters=array('obj' => $obj);
-		$formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table>\n";
-	print "</form>\n";
-	$db->free($resql);
-
-	$parameters=array('sql' => $sql);
-	$formconfirm=$hookmanager->executeHooks('printFieldListFooter',$parameters);    // Note that $action and $object may have been modified by hook
-}
-else
-{
-	dol_print_error($db);
-}
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
new file mode 100644
index 00000000000..179e810d182
--- /dev/null
+++ b/htdocs/fourn/paiement/card.php
@@ -0,0 +1,343 @@
+<?php
+/* Copyright (C) 2005      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2006-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2014      Marcos García         <marcosgdf@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/fourn/paiement/card.php
+ *	\ingroup    facture, fournisseur
+ *	\brief      Tab to show a payment of a supplier invoice
+ *	\remarks	Fichier presque identique a compta/paiement/card.php
+ */
+
+require '../../main.inc.php';
+require DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+$langs->load('bills');
+$langs->load('banks');
+$langs->load('companies');
+$langs->load("suppliers");
+
+$id			= GETPOST('id','int');
+$action		= GETPOST('action','alpha');
+$confirm	= GETPOST('confirm','alpha');
+
+$object = new PaiementFourn($db);
+
+/*
+ * Actions
+ */
+
+if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
+{
+    $db->begin();
+
+    $object->fetch($id);
+    $result = $object->update_note(GETPOST('note'));
+    if ($result > 0)
+    {
+        $db->commit();
+        $action='';
+    }
+    else
+    {
+	    setEventMessage($object->error, 'errors');
+        $db->rollback();
+    }
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->facture->supprimer)
+{
+	$db->begin();
+
+	$object->fetch($id);
+	$result = $object->delete();
+	if ($result > 0)
+	{
+		$db->commit();
+		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+		$db->rollback();
+	}
+}
+
+if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->fournisseur->facture->valider)
+{
+	$db->begin();
+
+	$object->fetch($id);
+	if ($object->valide() >= 0)
+	{
+		$db->commit();
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+		$db->rollback();
+	}
+}
+
+if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement']))
+{
+	$object->fetch($id);
+    $res = $object->update_num($_POST['num_paiement']);
+	if ($res === 0)
+	{
+		setEventMessage($langs->trans('PaymentNumberUpdateSucceeded'));
+	}
+	else
+	{
+		setEventMessage($langs->trans('PaymentNumberUpdateFailed'), 'errors');
+	}
+}
+
+if ($action == 'setdatep' && ! empty($_POST['datepday']))
+{
+	$object->fetch($id);
+    $datepaye = dol_mktime(12, 0, 0, $_POST['datepmonth'], $_POST['datepday'], $_POST['datepyear']);
+	$res = $object->update_date($datepaye);
+	if ($res === 0)
+	{
+		setEventMessage($langs->trans('PaymentDateUpdateSucceeded'));
+	}
+	else
+	{
+		setEventMessage($langs->trans('PaymentDateUpdateFailed'), 'errors');
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$result=$object->fetch($id);
+
+$form = new Form($db);
+
+$head = payment_supplier_prepare_head($object);
+
+dol_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), 0, 'payment');
+
+if ($result > 0)
+{
+	/*
+	 * Confirmation de la suppression du paiement
+	 */
+	if ($action == 'delete')
+	{
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete');
+
+	}
+
+	/*
+	 * Confirmation de la validation du paiement
+	 */
+	if ($action == 'valide')
+	{
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide');
+
+	}
+
+	print '<table class="border" width="100%">';
+
+	print '<tr>';
+	print '<td valign="top" width="20%" colspan="2">'.$langs->trans('Ref').'</td><td colspan="3">';
+    print $form->showrefnav($object,'id','',1,'rowid','ref');
+	print '</td></tr>';
+
+	// Date payment
+    print '<tr><td valign="top" colspan="2">'.$form->editfieldkey("Date",'datep',$object->date,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+    print $form->editfieldval("Date",'datep',$object->date,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'datepicker','',null,$langs->trans('PaymentDateUpdateSucceeded'));
+    print '</td></tr>';
+
+	// Payment mode
+	$labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->type_libelle;
+	print '<tr><td valign="top" colspan="2">'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$labeltype.'</td></tr>';
+
+	// Payment numero
+    print '<tr><td valign="top" colspan="2">'.$form->editfieldkey("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+    print $form->editfieldval("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'string','',null,$langs->trans('PaymentNumberUpdateSucceeded'));
+    print '</td></tr>';
+
+	// Amount
+	print '<tr><td valign="top" colspan="2">'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->montant,'',$langs,0,0,-1,$conf->currency).'</td></tr>';
+
+	if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+	{
+		print '<tr><td valign="top" colspan="2">'.$langs->trans('Status').'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+	}
+
+	// Note
+    print '<tr><td valign="top"" colspan="2">'.$form->editfieldkey("Note",'note',$object->note,$object,$user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+    print $form->editfieldval("Note",'note',$object->note,$object,$user->rights->fournisseur->facture->creer,'textarea');
+    print '</td></tr>';
+
+    // Bank account
+	if (! empty($conf->banque->enabled))
+	{
+		if ($object->bank_account)
+		{
+            $bankline=new AccountLine($db);
+            $bankline->fetch($object->bank_line);
+
+            print '<tr>';
+            print '<td colspan="2">'.$langs->trans('BankTransactionLine').'</td>';
+            print '<td colspan="3">';
+            print $bankline->getNomUrl(1,0,'showconciliated');
+            print '</td>';
+            print '</tr>';
+
+	    	print '<tr>';
+	    	print '<td colspan="2">'.$langs->trans('BankAccount').'</td>';
+			print '<td colspan="3">';
+			$accountstatic=new Account($db);
+	        $accountstatic->id=$bankline->fk_account;
+	        $accountstatic->label=$bankline->bank_account_ref.' - '.$bankline->bank_account_label;
+	        print $accountstatic->getNomUrl(0);
+	    	print '</td>';
+	    	print '</tr>';
+        }
+    }
+
+	print '</table>';
+
+	print '<br>';
+
+	/**
+	 *	Liste des factures
+	 */
+	$allow_delete = 1 ;
+	$sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom as name, s.rowid as socid';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
+	$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
+	$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+
+		$i = 0;
+		$total = 0;
+		print '<b>'.$langs->trans("Invoices").'</b><br>';
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans('Ref').'</td>';
+		print '<td>'.$langs->trans('RefSupplier').'</td>';
+		print '<td>'.$langs->trans('Company').'</td>';
+		print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
+		print '<td align="center">'.$langs->trans('Status').'</td>';
+		print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
+		print "</tr>\n";
+
+		if ($num > 0)
+		{
+			$var=True;
+
+			$facturestatic=new FactureFournisseur($db);
+
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+				$var=!$var;
+				print '<tr '.$bc[$var].'>';
+				// Ref
+				print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.img_object($langs->trans('ShowBill'),'bill').' ';
+				print ($objp->ref?$objp->ref:$objp->rowid);
+				print "</a></td>\n";
+				// Ref supplier
+				print '<td>'.$objp->ref_supplier."</td>\n";
+				// Third party
+				print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->name.'</a></td>';
+				// Expected to pay
+				print '<td align="right">'.price($objp->total_ttc).'</td>';
+				// Status
+				print '<td align="center">'.$facturestatic->LibStatut($objp->paye,$objp->fk_statut,2,1).'</td>';
+				// Payed
+				print '<td align="right">'.price($objp->amount).'</td>';
+				print "</tr>\n";
+				if ($objp->paye == 1)
+				{
+					$allow_delete = 0;
+				}
+				$total = $total + $objp->amount;
+				$i++;
+			}
+		}
+		$var=!$var;
+
+		print "</table>\n";
+		$db->free($resql);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+
+	print '</div>';
+
+
+	/*
+	 * Boutons Actions
+	 */
+
+	print '<div class="tabsAction">';
+	if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+	{
+		if ($user->societe_id == 0 && $object->statut == 0 && $action == '')
+		{
+			if ($user->rights->fournisseur->facture->valider)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+
+			}
+		}
+	}
+	if ($user->societe_id == 0 && $allow_delete && $object->statut == 0 && $action == '')
+	{
+		if ($user->rights->fournisseur->facture->supprimer)
+		{
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+
+		}
+	}
+	print '</div>';
+
+}
+else
+{
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
+}
+
+dol_fiche_end();
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php
deleted file mode 100644
index 0a2f3ad207f..00000000000
--- a/htdocs/fourn/paiement/fiche.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-/* Copyright (C) 2005      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2006-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
- * Copyright (C) 2014      Marcos García         <marcosgdf@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/fourn/paiement/fiche.php
- *	\ingroup    facture, fournisseur
- *	\brief      Tab to show a payment of a supplier invoice
- *	\remarks	Fichier presque identique a compta/paiement/fiche.php
- */
-
-require '../../main.inc.php';
-require DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
-require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-
-$langs->load('bills');
-$langs->load('banks');
-$langs->load('companies');
-$langs->load("suppliers");
-
-$mesg='';
-
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-
-$object = new PaiementFourn($db);
-
-/*
- * Actions
- */
-
-if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
-{
-    $db->begin();
-
-    $object->fetch($id);
-    $result = $object->update_note(GETPOST('note'));
-    if ($result > 0)
-    {
-        $db->commit();
-        $action='';
-    }
-    else
-    {
-        $mesg='<div class="error">'.$object->error.'</div>';
-        $db->rollback();
-    }
-}
-
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->facture->supprimer)
-{
-	$db->begin();
-
-	$object->fetch($id);
-	$result = $object->delete();
-	if ($result > 0)
-	{
-		$db->commit();
-		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-		$db->rollback();
-	}
-}
-
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->fournisseur->facture->valider)
-{
-	$db->begin();
-
-	$object->fetch($id);
-	if ($object->valide() >= 0)
-	{
-		$db->commit();
-		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-		$db->rollback();
-	}
-}
-
-if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement']))
-{
-	$object->fetch($id);
-    $res = $object->update_num($_POST['num_paiement']);
-	if ($res === 0)
-	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentNumberUpdateSucceeded').'</div>';
-	}
-	else
-	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentNumberUpdateFailed').'</div>';
-	}
-}
-
-if ($action == 'setdatep' && ! empty($_POST['datepday']))
-{
-	$object->fetch($id);
-    $datepaye = dol_mktime(12, 0, 0, $_POST['datepmonth'], $_POST['datepday'], $_POST['datepyear']);
-	$res = $object->update_date($datepaye);
-	if ($res === 0)
-	{
-		$mesg = '<div class="ok">'.$langs->trans('PaymentDateUpdateSucceeded').'</div>';
-	}
-	else
-	{
-		$mesg = '<div class="error">'.$langs->trans('PaymentDateUpdateFailed').'</div>';
-	}
-}
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$result=$object->fetch($id);
-
-$form = new Form($db);
-
-$head = payment_supplier_prepare_head($object);
-
-dol_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), 0, 'payment');
-
-if ($result > 0)
-{
-	/*
-	 * Confirmation de la suppression du paiement
-	 */
-	if ($action == 'delete')
-	{
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete');
-
-	}
-
-	/*
-	 * Confirmation de la validation du paiement
-	 */
-	if ($action == 'valide')
-	{
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide');
-
-	}
-
-	print '<table class="border" width="100%">';
-
-	print '<tr>';
-	print '<td valign="top" width="20%" colspan="2">'.$langs->trans('Ref').'</td><td colspan="3">';
-    print $form->showrefnav($object,'id','',1,'rowid','ref');
-	print '</td></tr>';
-
-	// Date payment
-    print '<tr><td valign="top" colspan="2">'.$form->editfieldkey("Date",'datep',$object->date,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
-    print $form->editfieldval("Date",'datep',$object->date,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'datepicker','',null,$langs->trans('PaymentDateUpdateSucceeded'));
-    print '</td></tr>';
-
-	// Payment mode
-	$labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->type_libelle;
-	print '<tr><td valign="top" colspan="2">'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$labeltype.'</td></tr>';
-
-	// Payment numero
-    print '<tr><td valign="top" colspan="2">'.$form->editfieldkey("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
-    print $form->editfieldval("Numero",'num_paiement',$object->numero,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'string','',null,$langs->trans('PaymentNumberUpdateSucceeded'));
-    print '</td></tr>';
-
-	// Amount
-	print '<tr><td valign="top" colspan="2">'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->montant,'',$langs,0,0,-1,$conf->currency).'</td></tr>';
-
-	if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-	{
-		print '<tr><td valign="top" colspan="2">'.$langs->trans('Status').'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
-	}
-
-	// Note
-    print '<tr><td valign="top"" colspan="2">'.$form->editfieldkey("Note",'note',$object->note,$object,$user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
-    print $form->editfieldval("Note",'note',$object->note,$object,$user->rights->fournisseur->facture->creer,'textarea');
-    print '</td></tr>';
-
-    // Bank account
-	if (! empty($conf->banque->enabled))
-	{
-		if ($object->bank_account)
-		{
-            $bankline=new AccountLine($db);
-            $bankline->fetch($object->bank_line);
-
-            print '<tr>';
-            print '<td colspan="2">'.$langs->trans('BankTransactionLine').'</td>';
-            print '<td colspan="3">';
-            print $bankline->getNomUrl(1,0,'showconciliated');
-            print '</td>';
-            print '</tr>';
-
-	    	print '<tr>';
-	    	print '<td colspan="2">'.$langs->trans('BankAccount').'</td>';
-			print '<td colspan="3">';
-			$accountstatic=new Account($db);
-	        $accountstatic->id=$bankline->fk_account;
-	        $accountstatic->label=$bankline->bank_account_ref.' - '.$bankline->bank_account_label;
-	        print $accountstatic->getNomUrl(0);
-	    	print '</td>';
-	    	print '</tr>';
-        }
-    }
-
-	print '</table>';
-
-	dol_htmloutput_mesg($mesg);
-
-	print '<br>';
-
-	/**
-	 *	Liste des factures
-	 */
-	$allow_delete = 1 ;
-	$sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.rowid as socid';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
-	$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
-	$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-
-		$i = 0;
-		$total = 0;
-		print '<b>'.$langs->trans("Invoices").'</b><br>';
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Ref').'</td>';
-		print '<td>'.$langs->trans('RefSupplier').'</td>';
-		print '<td>'.$langs->trans('Company').'</td>';
-		print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
-		print '<td align="center">'.$langs->trans('Status').'</td>';
-		print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
-		print "</tr>\n";
-
-		if ($num > 0)
-		{
-			$var=True;
-
-			$facturestatic=new FactureFournisseur($db);
-
-			while ($i < $num)
-			{
-				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print '<tr '.$bc[$var].'>';
-				// Ref
-				print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$objp->facid.'">'.img_object($langs->trans('ShowBill'),'bill').' ';
-				print ($objp->ref?$objp->ref:$objp->rowid);
-				print "</a></td>\n";
-				// Ref supplier
-				print '<td>'.$objp->ref_supplier."</td>\n";
-				// Third party
-				print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.'</a></td>';
-				// Expected to pay
-				print '<td align="right">'.price($objp->total_ttc).'</td>';
-				// Status
-				print '<td align="center">'.$facturestatic->LibStatut($objp->paye,$objp->fk_statut,2,1).'</td>';
-				// Payed
-				print '<td align="right">'.price($objp->amount).'</td>';
-				print "</tr>\n";
-				if ($objp->paye == 1)
-				{
-					$allow_delete = 0;
-				}
-				$total = $total + $objp->amount;
-				$i++;
-			}
-		}
-		$var=!$var;
-
-		print "</table>\n";
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	print '</div>';
-
-
-	/*
-	 * Boutons Actions
-	 */
-
-	print '<div class="tabsAction">';
-	if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-	{
-		if ($user->societe_id == 0 && $object->statut == 0 && $action == '')
-		{
-			if ($user->rights->fournisseur->facture->valider)
-			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-
-			}
-		}
-	}
-	if ($user->societe_id == 0 && $allow_delete && $object->statut == 0 && $action == '')
-	{
-		if ($user->rights->fournisseur->facture->supprimer)
-		{
-			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-
-		}
-	}
-	print '</div>';
-
-}
-else
-{
-	$langs->load("errors");
-	print $langs->trans("ErrorRecordNotFound");
-}
-
-dol_fiche_end();
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/fourn/paiement/index.html b/htdocs/fourn/paiement/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/fourn/paiement/index.php b/htdocs/fourn/paiement/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/fourn/paiement/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/fourn/product/categorie.php b/htdocs/fourn/product/categorie.php
index ad46210ed3b..448cf19e61e 100644
--- a/htdocs/fourn/product/categorie.php
+++ b/htdocs/fourn/product/categorie.php
@@ -52,14 +52,14 @@ if ($_GET["id"])
   //on veut supprimer une cat�gorie
   if ($_REQUEST["cat"])
     {
-      $cat = new Categorie($db,$_REQUEST["cat"]);
+      $cat = new Categorie($db);
       $cat->del_product($product);
     }
 
   //on veut ajouter une cat�gorie
   if (isset($_REQUEST["add_cat"]) && $_REQUEST["add_cat"]>=0)
     {
-      $cat = new Categorie($db,$_REQUEST["add_cat"]);
+      $cat = new Categorie($db);
       $cat->add_product($product);
     }
 
@@ -72,7 +72,7 @@ if ($_GET["id"])
 
       $h=0;
 
-      $head[$h][0] = DOL_URL_ROOT."/fourn/product/fiche.php?id=".$product->id;
+      $head[$h][0] = DOL_URL_ROOT."/fourn/product/card.php?id=".$product->id;
       $head[$h][1] = $langs->trans("Card");
       $h++;
 
@@ -95,7 +95,7 @@ if ($_GET["id"])
       $head[$h][1] = $langs->trans("Photos");
       $h++;
 
-      $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id;
+      $head[$h][0] = DOL_URL_ROOT."/product/stats/card.php?id=".$product->id;
       $head[$h][1] = $langs->trans('Statistics');
       $h++;
 
diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php
index 14f4790f5af..28e84e30f6a 100644
--- a/htdocs/fourn/product/index.php
+++ b/htdocs/fourn/product/index.php
@@ -43,7 +43,7 @@ print '<tr><td valign="top" width="30%">';
 /*
  * Zone recherche produit/service
  */
-print '<form method="post" action="liste.php">';
+print '<form method="post" action="list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
 print "<tr class=\"liste_titre\">\n";
@@ -81,13 +81,13 @@ print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</
 if (! empty($conf->product->enabled))
 {
     print "<tr $bc[0]>";
-    print '<td><a href="liste.php?type=0">'.$langs->trans("Products").'</a></td><td>'.round($prodser[0]).'</td>';
+    print '<td><a href="list.php?type=0">'.$langs->trans("Products").'</a></td><td>'.round($prodser[0]).'</td>';
     print "</tr>";
 }
 if (! empty($conf->service->enabled))
 {
     print "<tr $bc[1]>";
-    print '<td><a href="liste.php?type=1">'.$langs->trans("Services").'</a></td><td>'.round($prodser[1]).'</td>';
+    print '<td><a href="list.php?type=1">'.$langs->trans("Services").'</a></td><td>'.round($prodser[1]).'</td>';
     print "</tr>";
 }
 print '</table>';
@@ -125,10 +125,10 @@ if ($resql)
 	  $objp = $db->fetch_object($resql);
 	  $var=!$var;
 	  print "<tr ".$bc[$var].">";
-	  print "<td><a href=\"fiche.php?id=$objp->rowid\">";
+	  print "<td><a href=\"card.php?id=$objp->rowid\">";
 	  if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service");
 	  else print img_object($langs->trans("ShowProduct"),"product");
-	  print "</a> <a href=\"fiche.php?id=$objp->rowid\">$objp->ref</a></td>\n";
+	  print "</a> <a href=\"card.php?id=$objp->rowid\">$objp->ref</a></td>\n";
 	  print "<td>$objp->label</td>";
 	  print "<td>";
 	  if ($objp->fk_product_type==1) print $langs->trans('ShowService');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
new file mode 100644
index 00000000000..afaf4c8e796
--- /dev/null
+++ b/htdocs/fourn/product/list.php
@@ -0,0 +1,251 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
+ * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/fourn/product/list.php
+ *		\ingroup    produit
+ *		\brief      Page liste des produits ou services
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+
+$langs->load("products");
+$langs->load("suppliers");
+
+if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden();
+
+$sref = GETPOST('sref');
+$sRefSupplier = GETPOST('srefsupplier');
+$snom = GETPOST('snom');
+$type = GETPOST('type');
+
+$sortfield = GETPOST('sortfield');
+$sortorder = GETPOST('sortorder');
+$page = GETPOST('page');
+if ($page < 0) {
+    $page = 0 ;
+}
+
+$limit = $conf->liste_limit;
+$offset = $limit * $page ;
+
+if (! $sortfield) $sortfield = 'p.ref';
+if (! $sortorder) $sortorder = 'DESC';
+
+if (GETPOST('button_removefilter'))
+{
+	$sref = '';
+	$sRefSupplier = '';
+	$snom = '';
+}
+
+$fourn_id = GETPOST('fourn_id', 'int');
+
+if (isset($_REQUEST['catid']))
+{
+	$catid = $_REQUEST['catid'];
+}
+
+
+
+/*
+* Mode Liste
+*
+*/
+
+$productstatic = new Product($db);
+$companystatic = new Societe($db);
+
+$title=$langs->trans("ProductsAndServices");
+
+if ($fourn_id)
+{
+	$supplier = new Fournisseur($db);
+	$supplier->fetch($fourn_id);
+}
+
+$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type,";
+$sql.= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,";
+$sql.= " s.rowid as socid, s.nom as name";
+$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
+if ($catid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid";
+$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
+if ($sRefSupplier)
+{
+	$sql .= natural_search('ppf.ref_fourn', $sRefSupplier);
+}
+if (GETPOST('type'))
+{
+	$sql .= " AND p.fk_product_type = " . GETPOST('type','int');
+}
+if ($sref)
+{
+	$sql .= natural_search('p.ref', $sref);
+}
+if ($snom)
+{
+	$sql .= natural_search('s.nom', $snom);
+}
+if($catid)
+{
+	$sql .= " AND cp.fk_categorie = ".$catid;
+}
+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);
+
+dol_syslog("fourn/product/list.php:", LOG_DEBUG);
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$i = 0;
+
+	if ($num == 1 && (GETPOST("mode") == 'search'))
+	{
+		$objp = $db->fetch_object($resql);
+		header("Location: ".DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
+		exit;
+	}
+
+	if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->name);
+	else $texte = $langs->trans("List");
+
+	llxHeader("","",$texte);
+
+
+	$param="&tobuy=".$tobuy."&sref=".$sref."&snom=".$snom."&fourn_id=".$fourn_id.(isset($type)?"&amp;type=".$type:"").(empty($sRefSupplier)?"":"&amp;srefsupplier=".$sRefSupplier);
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+
+
+	if (isset($catid))
+	{
+		print "<div id='ways'>";
+		$c = new Categorie($db);
+		$ways = $c->print_all_ways(' &gt; ','fourn/product/list.php');
+		print " &gt; ".$ways[0]."<br>\n";
+		print "</div><br>";
+	}
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
+
+	print '<table class="liste" width="100%">';
+
+	// Lignes des titres
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("RefSupplierShort"),$_SERVER["PHP_SELF"], "ppf.ref_fourn",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Supplier"),$_SERVER["PHP_SELF"], "ppf.fk_soc",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"], "ppf.price",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"], "ppf.quantity",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("UnitPrice"),$_SERVER["PHP_SELF"], "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+	// Lignes des champs de filtre
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" name="sref" value="'.$sref.'" size="12">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" name="srefsupplier" value="'.$sRefSupplier.'" size="12">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" name="snom" value="'.$snom.'">';
+	print '</td>';
+	print '<td class="liste_titre" colspan="4" align="right">';
+	print '<input type="image" class="liste_titre" value="button_search" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '&nbsp; ';
+	print '<input type="image" class="liste_titre" value="button_removefilter" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+	print '</td>';
+	print '</tr>';
+
+	$oldid = '';
+	$var=True;
+	while ($i < min($num,$limit))
+	{
+		$objp = $db->fetch_object($resql);
+		$var=!$var;
+		print "<tr ".$bc[$var].">";
+
+		print '<td>';
+		$productstatic->id=$objp->rowid;
+		$productstatic->ref=$objp->ref;
+		$productstatic->type=$objp->fk_product_type;
+		print $productstatic->getNomUrl(1,'supplier');
+		print '</td>';
+
+		print '<td>'.$objp->ref_fourn.'</td>';
+
+		print '<td>'.$objp->label.'</td>'."\n";
+
+		$companystatic->name=$objp->name;
+		$companystatic->id=$objp->socid;
+		print '<td>';
+		if ($companystatic->id > 0) print $companystatic->getNomUrl(1,'supplier');
+		print '</td>';
+
+		print '<td align="right">'.price($objp->price).'</td>';
+
+		print '<td align="right">'.$objp->qty.'</td>';
+
+		print '<td align="right">'.price($objp->unitprice).'</td>';
+
+		print "</tr>\n";
+		$i++;
+	}
+	$db->free($resql);
+
+	print "</table>";
+
+	print '</form>';
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+$db->close();
+
+llxFooter();
diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php
deleted file mode 100644
index ffd413cbf2f..00000000000
--- a/htdocs/fourn/product/liste.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010	   Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
- * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *		\file       htdocs/fourn/product/liste.php
- *		\ingroup    produit
- *		\brief      Page liste des produits ou services
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-
-$langs->load("products");
-$langs->load("suppliers");
-
-if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden();
-
-$sref = GETPOST('sref');
-$sRefSupplier = GETPOST('srefsupplier');
-$snom = GETPOST('snom');
-$type = GETPOST('type');
-
-$sortfield = GETPOST('sortfield');
-$sortorder = GETPOST('sortorder');
-$page = GETPOST('page');
-if ($page < 0) {
-    $page = 0 ;
-}
-
-$limit = $conf->liste_limit;
-$offset = $limit * $page ;
-
-if (! $sortfield) $sortfield = 'p.ref';
-if (! $sortorder) $sortorder = 'DESC';
-
-if (GETPOST('button_removefilter'))
-{
-	$sref = '';
-	$sRefSupplier = '';
-	$snom = '';
-}
-
-$fourn_id = GETPOST('fourn_id', 'int');
-
-if (isset($_REQUEST['catid']))
-{
-	$catid = $_REQUEST['catid'];
-}
-
-
-
-/*
-* Mode Liste
-*
-*/
-
-$productstatic = new Product($db);
-$companystatic = new Societe($db);
-
-$title=$langs->trans("ProductsAndServices");
-
-if ($fourn_id)
-{
-	$supplier = new Fournisseur($db);
-	$supplier->fetch($fourn_id);
-}
-
-$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type,";
-$sql.= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,";
-$sql.= " s.rowid as socid, s.nom";
-$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
-if ($catid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid";
-$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
-if ($sRefSupplier)
-{
-	$sql .= natural_search('ppf.ref_fourn', $sRefSupplier);
-}
-if (GETPOST('type'))
-{
-	$sql .= " AND p.fk_product_type = " . GETPOST('type','int');
-}
-if ($sref)
-{
-	$sql .= natural_search('p.ref', $sref);
-}
-if ($snom)
-{
-	$sql .= natural_search('p.label', $snom);
-}
-if($catid)
-{
-	$sql .= " AND cp.fk_categorie = ".$catid;
-}
-if ($fourn_id > 0)
-{
-	$sql .= " AND ppf.fk_soc = ".$fourn_id;
-}
-$sql .= " ORDER BY ".$sortfield." ".$sortorder;
-$sql .= $db->plimit($limit + 1, $offset);
-
-dol_syslog("fourn/product/liste.php: sql=".$sql);
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-
-	$i = 0;
-
-	if ($num == 1 && (GETPOST("mode") == 'search'))
-	{
-		$objp = $db->fetch_object($resql);
-		header("Location: ".DOL_URL_ROOT."/product/fiche.php?id=".$objp->rowid);
-		exit;
-	}
-
-	if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->nom);
-	else $texte = $langs->trans("List");
-
-	llxHeader("","",$texte);
-
-
-	$param="&tobuy=".$tobuy."&sref=".$sref."&snom=".$snom."&fourn_id=".$fourn_id.(isset($type)?"&amp;type=".$type:"").(empty($sRefSupplier)?"":"&amp;srefsupplier=".$sRefSupplier);
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
-
-
-	if (isset($catid))
-	{
-		print "<div id='ways'>";
-		$c = new Categorie($db, $catid);
-		$ways = $c->print_all_ways(' &gt; ','fourn/product/liste.php');
-		print " &gt; ".$ways[0]."<br>\n";
-		print "</div><br>";
-	}
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="type" value="'.$type.'">';
-
-	print '<table class="liste" width="100%">';
-
-	// Lignes des titres
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("RefSupplierShort"),$_SERVER["PHP_SELF"], "ppf.ref_fourn",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Supplier"),$_SERVER["PHP_SELF"], "ppf.fk_soc",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"], "ppf.price",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"], "ppf.quantity",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("UnitPrice"),$_SERVER["PHP_SELF"], "ppf.unitprice",$param,"",'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	// Lignes des champs de filtre
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="sref" value="'.$sref.'" size="12">';
-	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="srefsupplier" value="'.$sRefSupplier.'" size="12">';
-	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="snom" value="'.$snom.'">';
-	print '</td>';
-	print '<td class="liste_titre" colspan="4" align="right">';
-	print '<input type="image" class="liste_titre" value="button_search" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-	print '&nbsp; ';
-	print '<input type="image" class="liste_titre" value="button_removefilter" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
-	print '</td>';
-	print '</tr>';
-
-	$oldid = '';
-	$var=True;
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($resql);
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-
-		print '<td>';
-		$productstatic->id=$objp->rowid;
-		$productstatic->ref=$objp->ref;
-		$productstatic->type=$objp->fk_product_type;
-		print $productstatic->getNomUrl(1,'supplier');
-		print '</td>';
-
-		print '<td>'.$objp->ref_fourn.'</td>';
-
-		print '<td>'.$objp->label.'</td>'."\n";
-
-		$companystatic->nom=$objp->nom;
-		$companystatic->id=$objp->socid;
-		print '<td>';
-		if ($companystatic->id > 0) print $companystatic->getNomUrl(1,'supplier');
-		print '</td>';
-
-		print '<td align="right">'.price($objp->price).'</td>';
-
-		print '<td align="right">'.$objp->qty.'</td>';
-
-		print '<td align="right">'.price($objp->unitprice).'</td>';
-
-		print "</tr>\n";
-		$i++;
-	}
-	$db->free($resql);
-
-	print "</table>";
-
-	print '</form>';
-}
-else
-{
-	dol_print_error($db);
-}
-
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php
index d60a4aab4d0..f20c360de6c 100644
--- a/htdocs/fourn/product/photos.php
+++ b/htdocs/fourn/product/photos.php
@@ -65,7 +65,7 @@ if ($id)
 
 		$h=0;
 
-		$head[$h][0] = DOL_URL_ROOT."/fourn/product/fiche.php?id=".$object->id;
+		$head[$h][0] = DOL_URL_ROOT."/fourn/product/card.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("Card");
 		$h++;
 
@@ -89,7 +89,7 @@ if ($id)
 			$h++;
 		}
 
-		$head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$object->id;
+		$head[$h][0] = DOL_URL_ROOT."/product/card.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("CommercialCard");
 		$h++;
 
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 3d3fd9f2dcb..c09f52b8407 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -139,7 +139,7 @@ if ($socid > 0)
                 print "<tr ".$bc[$var].">";
 
                 print "<td align=\"center\">".dol_print_date($fac->date)."</td>\n";
-                print "<td><a href=\"facture/fiche.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n";
+                print "<td><a href=\"facture/card.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."</a></td>\n";
 
                 print '<td aling="left">'.$fac->getLibStatut(2,$totalpaye).'</td>';
                 print '<td align="right">'.price($fac->total_ttc)."</td>\n";
@@ -149,7 +149,7 @@ if ($socid > 0)
                 print '<td align="right">'.price($solde)."</td>\n";
 
                 // Author
-                print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.'</a></td>';
+                print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.'</a></td>';
 
                 print "</tr>\n";
 
@@ -176,7 +176,7 @@ if ($socid > 0)
                         print '<td align="center">'.dol_print_date($db->jdate($objp->dp))."</td>\n";
                         print '<td>';
                         print '&nbsp; &nbsp; &nbsp; '; // Decalage
-                        print '<a href="paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
+                        print '<a href="paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$langs->trans("Payment").' '.$objp->rowid.'</td>';
                         print "<td>&nbsp;</td>\n";
                         print "<td>&nbsp;</td>\n";
                         print '<td align="right">'.price($objp->amount).'</td>';
@@ -184,7 +184,7 @@ if ($socid > 0)
                         print '<td align="right">'.price($solde)."</td>\n";
 
                         // Auteur
-                        print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.'</a></td>';
+                        print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.'</a></td>';
 
                         print '</tr>';
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 1ff142f7be7..1b252c480af 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -58,18 +58,17 @@ if ($action == 'add' || GETPOST('modify','alpha'))
 	$ftp_server = "FTP_SERVER_" . $entry; //$_POST["numero_entry"];
 
 	$error=0;
-	$mesg='';
 
 	if (! GETPOST("$ftp_name",'alpha'))
 	{
 		$error=1;
-		$mesg.='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Label")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Label")), 'errors');
 	}
 
 	if (! GETPOST("$ftp_server",'alpha'))
 	{
 		$error=1;
-		$mesg.='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Server")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Server")), 'errors');
 	}
 
     if (! $error)
@@ -91,7 +90,6 @@ if ($action == 'add' || GETPOST('modify','alpha'))
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
@@ -119,7 +117,6 @@ if (GETPOST('delete','alpha'))
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
-	  		//$mesg='<div class="ok">'.$langs->trans("Success").'</div>';
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
         }
@@ -218,7 +215,7 @@ else
 	$sql.=" WHERE name like 'FTP_SERVER_%'";
 	$sql.=" ORDER BY name";
 
-	dol_syslog("ftpclient select ftp setup sql=".$sql,LOG_DEBUG);
+	dol_syslog("ftpclient select ftp setup", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
@@ -301,9 +298,6 @@ else
 
 }
 
-dol_htmloutput_mesg($mesg);
-
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/ftp/admin/index.html b/htdocs/ftp/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 0c72bcc1b1a..f1a051bcf2a 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -100,8 +100,6 @@ if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
 		if (is_numeric($resupload) && $resupload > 0)
 		{
-			//$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
-			//print_r($_FILES);
 			$result=$ecmdir->changeNbOfFiles('+');
 		}
 		else {
@@ -124,7 +122,7 @@ if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 	{
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
-		$mesg = '<div class="error">'.$langs->trans("ErrorFailToCreateDir",$upload_dir).'</div>';
+		setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
 	}
 }
 
@@ -143,7 +141,8 @@ if ($_POST["action"] == 'add' && $user->rights->ftp->setup)
 	}
 	else
 	{
-		$mesg='<div class="error">Error '.$langs->trans($ecmdir->error).'</div>';
+		//TODO: Translate
+		setEventMessage('Error '.$langs->trans($ecmdir->error));
 		$_GET["action"] = "create";
 	}
 }
@@ -175,12 +174,12 @@ if ($_REQUEST['action'] == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes'
 		$result=@ftp_delete($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved",$file).'</div>';
+			setEventMessage($langs->trans("FileWasRemoved",$file));
 		}
 		else
 		{
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-			$mesg = '<div class="error">'.$langs->trans("FTPFailedToRemoveFile",$file).'</div>';
+			setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
@@ -225,12 +224,12 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 				$result=@ftp_delete($conn_id, $newremotefileiso);
 				if ($result)
 				{
-					$mesg .= '<div class="ok">'.$langs->trans("FileWasRemoved",$file).'</div>';
+					setEventMessage($langs->trans("FileWasRemoved",$file));
 				}
 				else
 				{
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-					$mesg .= '<div class="error">'.$langs->trans("FTPFailedToRemoveFile",$file).'</div>';
+					setEventMessage($langs->trans("FTPFailedToRemoveFile",$file), 'errors');
 				}
 
 				//ftp_close($conn_id);	Close later
@@ -269,11 +268,11 @@ if ($_REQUEST['action'] == 'confirm_deletesection' && $_REQUEST['confirm'] == 'y
 		$result=@ftp_rmdir($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			$mesg = '<div class="ok">'.$langs->trans("DirWasRemoved",$file).'</div>';
+			setEventMessage($langs->trans("DirWasRemoved",$file));
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$langs->trans("FTPFailedToRemoveDir",$file).'</div>';
+			setEventMessage($langs->trans("FTPFailedToRemoveDir",$file), 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
@@ -340,7 +339,8 @@ if ($_REQUEST['action'] == 'download')
 		}
 		else
 		{
-			$mesg='<div class="error">Failed to get file '.$remotefile.'</div>';
+			//TODO: Translate
+			setEventMessage('Failed to get file '.$remotefile, 'errors');
 		}
 
 	}
@@ -444,9 +444,6 @@ else
 		print '<br>';
 		print "<br>\n";
 
-		if ($mesg) { print $mesg."<br>"; }
-
-
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
         print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -596,9 +593,6 @@ else
 
 		print "</table>";
 
-
-		if (! $ok && $mesg) print $mesg;
-
 		// Actions
 		/*
 		if ($user->rights->ftp->write && ! empty($section))
diff --git a/htdocs/holiday/admin/holiday.php b/htdocs/holiday/admin/holiday.php
index 2b265711fa1..1986ae1cdf7 100644
--- a/htdocs/holiday/admin/holiday.php
+++ b/htdocs/holiday/admin/holiday.php
@@ -59,7 +59,6 @@ $cp = new Holiday($db);
 // Contrôle du formulaire
 if ($action == "add")
 {
-    $message = '';
     $error = 0;
 
     // Option du groupe de validation
@@ -142,9 +141,9 @@ if ($action == "add")
 
     if ($error)
     {
-        $message = '<div class="error">'.$langs->trans('ErrorUpdateConfCP').'</div>';
+	    setEventMessage($langs->trans('ErrorUpdateConfCP'), 'errors');
     } else {
-        $message = '<div class="ok">'.$langs->trans('UpdateConfCPOK').'</div>';
+	    setEventMessage($langs->trans('UpdateConfCPOK'));
     }
 
     // Si première mise à jour, prévenir l'utilisateur de mettre à jour le solde des congés payés
@@ -156,12 +155,9 @@ if ($action == "add")
     if($num < 1)
     {
         $cp->createCPusers();
-        $message.= '<br /><div class="warning">'.$langs->trans('AddCPforUsers').'</div>';
+	    setEventMessage($langs->trans('AddCPforUsers'), 'warnings');
     }
 
-    dol_htmloutput_mesg($message);
-
-
     // Si il s'agit de créer un event
 }
 elseif ($action == 'create_event')
@@ -173,12 +169,12 @@ elseif ($action == 'create_event')
 
     if (! $optName)
     {
-    	$message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), 'errors');
         $error++;
     }
     if (! $optValue > 0)
     {
-    	$message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Value")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Value")), 'errors');
     	$error++;
     }
 
@@ -190,17 +186,15 @@ elseif ($action == 'create_event')
         $result = $cp->createEventCP($user);
         if($result > 0)
         {
-            $message = 'OkCreateEventCP';
+	        setEventMessage('OkCreateEventCP');
             $optName='';
             $optValue='';
         }
         else
         {
-            $message = '<div class="error">'.$cp->error.'</div>';
+	        setEventMessage($cp->error, 'errors');
         }
     }
-
-    dol_htmloutput_mesg($message);
 }
 elseif($action == 'event' && isset($_POST['update_event']))
 {
@@ -234,15 +228,13 @@ elseif($action == 'event' && isset($_POST['update_event']))
         // Mise à jour des congés de l'utilisateur
         $update = $cp->updateEventCP($eventId,$eventName,$eventValue);
         if(!$update) {
-            $message='ErrorUpdateEventCP';
+	        setEventMessage('ErrorUpdateEventCP', 'errors');
         } else {
-            $message='UpdateEventOkCP';
+	        setEventMessage('UpdateEventOkCP');
         }
     } else {
-        $message='ErrorUpdateEventCP';
+	    setEventMessage('ErrorUpdateEventCP', 'errors');
     }
-
-    dol_htmloutput_mesg($message);
 }
 elseif($action && isset($_POST['delete_event']))
 {
@@ -365,15 +357,15 @@ if($cp_events == 1) {
 
     print '</tr>'."\n";
 
-    foreach($cp->events as $infos_event) {
-
+    foreach($cp->events as $infos_event)
+    {
         $var=!$var;
 
         print '<tr '.$bc[$var].'>'."\n";
         print '<td><input class="flat" type="text" size="40" name="optName['.$infos_event['rowid'].']" value="'.$infos_event['name'].'" /></td>'."\n";
         print '<td><input class="flat" type="text" size="2" name="optValue['.$infos_event['rowid'].']" value="'.$infos_event['value'].'" /> '.$langs->trans('DurationDays').'</td>'."\n";
         print '<td><input type="submit" class="button" name="update_event['.$infos_event['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'"/></td>'."\n";
-        print '<td width="20px" align="right"><input type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n";
+        print '<td width="20px" align="right"><input type="image" alt="'.$langs->trans("Delete").'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" name="delete_event['.$infos_event['rowid'].']" style="border:0;"/></td>'."\n";
         print '</tr>';
 
         $i++;
diff --git a/htdocs/holiday/admin/index.html b/htdocs/holiday/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/holiday/admin/tomergewithholiday.php b/htdocs/holiday/admin/tomergewithholiday.php
new file mode 100644
index 00000000000..c301e1ba348
--- /dev/null
+++ b/htdocs/holiday/admin/tomergewithholiday.php
@@ -0,0 +1,225 @@
+<?php
+/* Copyright (C) 2012-2103 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	Page module configuration paid holiday.
+ *
+ *  \file       holiday.php
+ *	\ingroup    holiday
+ *	\brief      Page module configuration paid holiday.
+ */
+
+require '../../main.inc.php';
+require DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+require_once DOL_DOCUMENT_ROOT. '/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT. '/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT. '/user/class/usergroup.class.php';
+
+// Si pas administrateur
+if (! $user->admin) accessforbidden();
+
+
+/*
+ * View
+ */
+
+// Vérification si module activé
+if (empty($conf->holiday->enabled)) print $langs->trans('NotActiveModCP');
+
+llxheader('',$langs->trans('TitleAdminCP'));
+
+print_fiche_titre($langs->trans('MenuCPTypes'));
+
+echo '<div id="types">';
+
+echo '<table class="noborder" style="width: 100%;">';
+echo '<tr class="liste_titre">';
+echo '<td style="width: 150px">' . $langs->trans('TypeLabel') . '</td>';
+echo '<td>' . $langs->trans('TypeDescription') . '</td>';
+echo '<td style="text-align: center; width: 100px">' . $langs->trans('TypeAffect') . '</td>';
+echo '<td style="text-align: center; width: 50px">' . $langs->trans('TypeDelay') . '</td>';
+echo '<td style="text-align: center;">' . $langs->trans('nbCongesDeductedCPMini') . '</td>';
+echo '<td style="text-align: center;">' . $langs->trans('nbCongesEveryMonthCPMini') . '</td>';
+echo '<td style="width: 40px"></td>';
+echo '</tr>';
+
+$types = $db->query(
+	"SELECT *
+   FROM llx_congespayes_types
+   WHERE deleteAt IS NULL
+   ORDER BY label"
+);
+
+while($type = $db->fetch_array($types))
+{
+   echo'
+      <tr id="row_'.$type['rowid'].'" '.$bc[$var=!$var].'>
+         <td>'.$type['label'].'</td>
+         <td>'.($type['description']?$type['description']:'N/A').'</td>
+         <td style="font-weight: bold; text-align: center">
+         '.($type['affect']?$langs->trans('TypeAffectYes'):$langs->trans('TypeAffectNo')).'
+         </td>
+         <td style="text-align: center">'.$type['delay'].'</td>
+         <td style="text-align: center">'.$type['nbCongesDeducted'].'</td>
+         <td style="text-align: center">'.$type['nbCongesEveryMonth'].'</td>
+         <td>
+            <img class="btn edit" data-rowid="'.$type['rowid'].'" src="../img/edit.png" title="'.$langs->trans('TypeBtnEdit').'">
+            <img class="btn delete" data-rowid="'.$type['rowid'].'" src="../img/delete.png" title="'.$langs->trans('TypeBtnDelete').'">
+         </td>
+      </tr>
+      <tr id="form_'.$type['rowid'].'" '.$bc[$var].' style="display: none">
+         <td colspan="7">
+            <form>
+               <input type="hidden" name="rowid" value="'.$type['rowid'].'">
+               <div>
+                  <label>' . $langs->trans('TypeLabel') . '</label>
+                  <input class="text" maxlength="45" name="label" type="text" value="'.$type['label'].'">
+               </div>
+               <div>
+                  <label>' . $langs->trans('TypeDescription') . '</label>
+                  <textarea name="description">'.$type['description'].'</textarea>
+               </div>
+               <div>
+                  <label>' . $langs->trans('TypeDelay') . '</label>
+                  <input class="text" maxlength="2" name="delay" type="text" value="'.$type['delay'].'" style="width: 50px">
+               </div>
+               <div>
+                  <label>' . $langs->trans('TypeAffect') . '</label>
+                  <select name="affect">
+                     <option value="1"'.($type['affect']?' selected="selected"':'').'>
+                        '.$langs->trans('TypeAffectYes').'
+                     </option>
+                     <option value="0"'.($type['affect']?'':' selected="selected"').'>
+                        '.$langs->trans('TypeAffectNo').'
+                     </option>
+                  </select>
+               </div>
+               <div>
+                  <label>' . $langs->trans('nbCongesDeductedCPMini') . '</label>
+                  <input class="text" maxlength="5" name="nbCongesDeducted" type="text"
+                        value="'.$type['nbCongesDeducted'].'" style="width: 50px">
+               </div>
+               <div>
+                  <label>' . $langs->trans('nbCongesEveryMonthCPMini') . '</label>
+                  <input class="text" maxlength="5" name="nbCongesEveryMonth" type="text"
+                        value="'.$type['nbCongesEveryMonth'].'" style="width: 50px">
+               </div>
+               <div style="text-align: right">
+                  <input class="btn btn-primary button " type="submit" value="'.$langs->trans('TypeBtnApply').'">
+                  <input data-rowid="'.$type['rowid'].'" class="btn cancel button" type="button" value="'.$langs->trans('TypeBtnCancel').'">
+               </div>
+            </form>
+         </td>
+      </tr>
+   ';
+}
+
+echo '
+   <tr id="row_new" '.$bc[!$var].'>
+      <td colspan="7" style="text-align: right;">
+         <img class="btn" id="new" src="../img/add.png" title="'.$langs->trans('TypeBtnAdd').'">
+      </td>
+   </tr>
+   <tr id="form_new" '.$bc[!$var].' style="display:none">
+      <td colspan="7">
+         <form>
+            <div>
+               <label>' . $langs->trans('TypeLabel') . '</label>
+               <input class="text" maxlength="45" name="label" type="text">
+            </div>
+            <div>
+               <label>' . $langs->trans('TypeDescription') . '</label>
+               <textarea name="description"></textarea>
+            </div>
+            <div>
+               <label>' . $langs->trans('TypeDelay') . '</label>
+               <input class="text" maxlength="2" name="delay" type="text" value="0" style="width: 50px">
+            </div>
+            <div>
+               <label>' . $langs->trans('TypeAffect') . '</label>
+               <select name="affect">
+                  <option value="1">'.$langs->trans('TypeAffectYes').'</option>
+                  <option value="0">'.$langs->trans('TypeAffectNo').'</option>
+               </select>
+            </div>
+            <div>
+               <label>' . $langs->trans('nbCongesDeductedCPMini') . '</label>
+               <input class="text" maxlength="5" name="nbCongesDeducted" type="text"
+                     value="0" style="width: 50px">
+            </div>
+            <div>
+               <label>' . $langs->trans('nbCongesEveryMonthCPMini') . '</label>
+               <input class="text" maxlength="5" name="nbCongesEveryMonth" type="text"
+                     value="0" style="width: 50px">
+            </div>
+            <div style="text-align: right">
+               <input class="btn btn-primary" type="submit" value="'.$langs->trans('TypeBtnAdd').'">
+               <input class="btn cancel" type="button" value="'.$langs->trans('TypeBtnCancel').'">
+            </div>
+         </form>
+      </td>
+   </tr>
+</table>
+<script>
+   $(function(){
+      $(".cancel", "#types").click(function(){
+         var rowid = false;
+         if(rowid = $(this).data("rowid")) {
+             $("#row_"+rowid, "#types").show();
+             $("#form_"+rowid, "#types").hide();
+         } else {
+             $("#row_new", "#types").show();
+             $("#form_new", "#types").hide();
+         }
+      });
+      $(".edit", "#types").click(function(){
+         var rowid = $(this).data("rowid");
+         $("#row_"+rowid, "#types").hide();
+         $("#form_"+rowid, "#types").show();
+      });
+      $("#new", "#types").click(function(){
+         $("#row_new", "#types").hide();
+         $("#form_new", "#types").show();
+      });
+      $("form", "#types").submit(function(){
+         $.post("ajax/types_editor.php", $(this).serialize(), function(response) {
+            if(response.status) window.location.reload();
+            else alert(response.content);
+         }, "json");
+         return false;
+      });
+      $(".delete", "#types").click(function(){
+         if(confirm("'.$langs->trans('TypeBtnDeleteConfirmation').'")) {
+            $.post("ajax/types_delete.php", {
+               rowid: $(this).data("rowid")
+            }, function(response) {
+               if(response.status) window.location.reload();
+               else alert(response.content);
+            }, "json");
+         }
+      });
+   });
+</script>
+';
+
+echo '</div>';
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
new file mode 100644
index 00000000000..bbffe26cf9c
--- /dev/null
+++ b/htdocs/holiday/card.php
@@ -0,0 +1,1175 @@
+<?php
+/* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2012-2013 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2013	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014	   Ferran Marcet		<fmarcet@2byte.es>
+ *
+ * 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, orwrite
+ * (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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       htdocs/holiday/card.php
+ *		\ingroup    holiday
+ *		\brief      Form and file creation of paid holiday.
+ */
+
+require('../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+
+// Get parameters
+$myparam = GETPOST("myparam");
+$action=GETPOST('action', 'alpha');
+$id=GETPOST('id', 'int');
+$userid = GETPOST('userid')?GETPOST('userid'):$user->id;
+
+// Protection if external user
+if ($user->societe_id > 0) accessforbidden();
+
+$now=dol_now();
+
+
+/*
+ * Actions
+ */
+
+// Si création de la demande
+if ($action == 'create')
+{
+	$cp = new Holiday($db);
+
+    // Si pas le droit de créer une demande
+    if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
+    {
+    	$error++;
+    	setEventMessage($langs->trans('CantCreateCP'));
+    	$action='request';
+    }
+
+    if (! $error)
+    {
+	    $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
+	    $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
+	    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
+	    $date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
+	    $starthalfday=GETPOST('starthalfday');
+	    $endhalfday=GETPOST('endhalfday');
+	    $halfday=0;
+	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
+	    else if ($starthalfday == 'afternoon') $halfday=-1;
+	    else if ($endhalfday == 'morning') $halfday=1;
+
+	    $valideur = GETPOST('valideur');
+	    $description = trim(GETPOST('description'));
+	    $userID = GETPOST('userID');
+
+	    // Si pas de date de début
+	    if (empty($date_debut))
+	    {
+	        header('Location: card.php?action=request&error=nodatedebut');
+	        exit;
+	    }
+
+	    // Si pas de date de fin
+	    if (empty($date_fin))
+	    {
+	        header('Location: card.php?action=request&error=nodatefin');
+	        exit;
+	    }
+
+	    // Si date de début après la date de fin
+	    if ($date_debut > $date_fin)
+	    {
+	        header('Location: card.php?action=request&error=datefin');
+	        exit;
+	    }
+
+	    // Check if there is already holiday for this period
+	    $verifCP = $cp->verifDateHolidayCP($userID, $date_debut, $date_fin, $halfday);
+	    if (! $verifCP)
+	    {
+	        header('Location: card.php?action=request&error=alreadyCP');
+	        exit;
+	    }
+
+	    // Si aucun jours ouvrés dans la demande
+	    $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+	    if($nbopenedday < 0.5)
+	    {
+	        header('Location: card.php?action=request&error=DureeHoliday');
+	        exit;
+	    }
+
+	    // Si pas de validateur choisi
+	    if ($valideur < 1)
+	    {
+	        header('Location: card.php?action=request&error=Valideur');
+	        exit;
+	    }
+
+	    $cp->fk_user = $userid;
+	    $cp->description = $description;
+	    $cp->date_debut = $date_debut;
+	    $cp->date_fin = $date_fin;
+	    $cp->fk_validator = $valideur;
+		$cp->halfday = $halfday;
+
+	    $verif = $cp->create($userid);
+
+	    // Si pas d'erreur SQL on redirige vers la fiche de la demande
+	    if ($verif > 0)
+	    {
+	        header('Location: card.php?id='.$verif);
+	        exit;
+	    }
+	    else
+	    {
+	        // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
+	        header('Location: card.php?action=request&error=SQL_Create&msg='.$cp->error);
+	        exit;
+	    }
+    }
+}
+
+if ($action == 'update')
+{
+	$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
+	$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
+	$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
+	$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
+	$starthalfday=GETPOST('starthalfday');
+	$endhalfday=GETPOST('endhalfday');
+	$halfday=0;
+	if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
+	else if ($starthalfday == 'afternoon') $halfday=-1;
+	else if ($endhalfday == 'morning') $halfday=1;
+
+    // Si pas le droit de modifier une demande
+    if (! $user->rights->holiday->write)
+    {
+        header('Location: card.php?action=request&error=CantUpdate');
+        exit;
+    }
+
+    $cp = new Holiday($db);
+    $cp->fetch($_POST['holiday_id']);
+
+	$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
+
+	// Si en attente de validation
+    if ($cp->statut == 1)
+    {
+        // Si c'est le créateur ou qu'il a le droit de tout lire / modifier
+        if ($canedit)
+        {
+            $valideur = $_POST['valideur'];
+            $description = trim($_POST['description']);
+
+            // Si pas de date de début
+            if (empty($_POST['date_debut_'])) {
+                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatedebut');
+                exit;
+            }
+
+            // Si pas de date de fin
+            if (empty($_POST['date_fin_'])) {
+                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatefin');
+                exit;
+            }
+
+            // Si date de début après la date de fin
+            if ($date_debut > $date_fin) {
+                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=datefin');
+                exit;
+            }
+
+            // Si pas de valideur choisi
+            if ($valideur < 1) {
+                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=Valideur');
+                exit;
+            }
+
+            // Si pas de jours ouvrés dans la demande
+            $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+            if ($nbopenedday < 0.5)
+            {
+                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=DureeHoliday');
+                exit;
+            }
+
+            $cp->description = $description;
+            $cp->date_debut = $date_debut;
+            $cp->date_fin = $date_fin;
+            $cp->fk_validator = $valideur;
+			$cp->halfday = $halfday;
+
+			// Update
+			$verif = $cp->update($user->id);
+            if ($verif > 0)
+            {
+                header('Location: card.php?id='.$_POST['holiday_id']);
+                exit;
+            }
+            else
+           {
+                // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
+                header('Location: card.php?id='.$_POST['holiday_id'].'&action=edit&error=SQL_Create&msg='.$cp->error);
+                exit;
+            }
+        }
+    } else {
+        header('Location: card.php?id='.$_POST['holiday_id']);
+        exit;
+    }
+}
+
+// Si suppression de la demande
+if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes')
+{
+    if($user->rights->holiday->delete)
+    {
+    	$error=0;
+
+    	$db->begin();
+
+        $cp = new Holiday($db);
+        $cp->fetch($id);
+
+        $canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
+
+        // Si c'est bien un brouillon
+        if ($cp->statut == 1 || $cp->statut == 3)
+        {
+            // Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
+            if ($canedit)
+            {
+                $result=$cp->delete($id);
+            }
+            else
+            {
+                $error = $langs->trans('ErrorCantDeleteCP');
+            }
+        }
+
+       	if (! $error)
+        {
+          	$db->commit();
+           	header('Location: index.php');
+           	exit;
+        }
+        else
+        {
+        	$db->rollback();
+        }
+    }
+}
+
+// Si envoi de la demande
+if ($action == 'confirm_send')
+{
+    $cp = new Holiday($db);
+    $cp->fetch($id);
+
+    // Si brouillon et créateur
+    if($cp->statut == 1 && $user->id == $cp->fk_user)
+    {
+        $cp->statut = 2;
+
+        $verif = $cp->update($user->id);
+
+        // Si pas d'erreur SQL on redirige vers la fiche de la demande
+        if ($verif > 0)
+        {
+            // To
+            $destinataire = new User($db);
+            $destinataire->fetch($cp->fk_validator);
+            $emailTo = $destinataire->email;
+
+            if (!$emailTo)
+            {
+                header('Location: card.php?id='.$_GET['id']);
+                exit;
+            }
+
+            // From
+            $expediteur = new User($db);
+            $expediteur->fetch($cp->fk_user);
+            $emailFrom = $expediteur->email;
+
+            // Subject
+			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+
+            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
+
+            // Content
+            $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+            $message.= "\n";
+            $message.= $langs->transnoentities("HolidaysToValidateBody")."\n";
+
+            $delayForRequest = $cp->getConfCP('delayForRequest');
+            //$delayForRequest = $delayForRequest * (60*60*24);
+
+            $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
+
+            // Si l'option pour avertir le valideur en cas de délai trop court
+            if($cp->getConfCP('AlertValidatorDelay'))
+            {
+                if($cp->date_debut < $nextMonth)
+                {
+                    $message.= "\n";
+                    $message.= $langs->transnoentities("HolidaysToValidateDelay",$cp->getConfCP('delayForRequest'))."\n";
+                }
+            }
+
+            // Si l'option pour avertir le valideur en cas de solde inférieur à la demande
+            if ($cp->getConfCP('AlertValidatorSolde'))
+            {
+            	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
+                if ($nbopenedday > $cp->getCPforUser($cp->fk_user))
+                {
+                    $message.= "\n";
+                    $message.= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
+                }
+            }
+
+            $message.= "\n";
+            $message.= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+            $message.= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($cp->date_debut,'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($cp->date_fin,'day')."\n";
+            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+            $message.= "\n";
+
+            $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
+
+            // Envoi du mail
+            $result=$mail->sendfile();
+
+            if (!$result)
+            {
+                header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                exit;
+            }
+            header('Location: card.php?id='.$_GET['id']);
+            exit;
+        }
+        else
+        {
+            // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
+            header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+            exit;
+        }
+    }
+}
+
+
+// Si Validation de la demande
+if($action == 'confirm_valid')
+{
+    $cp = new Holiday($db);
+    $cp->fetch($id);
+
+    // Si statut en attente de validation et valideur = utilisateur
+    if ($cp->statut == 2 && $user->id == $cp->fk_validator)
+    {
+        $cp->date_valid = dol_now();
+        $cp->fk_user_valid = $user->id;
+        $cp->statut = 3;
+
+        $verif = $cp->update($user->id);
+
+        // Si pas d'erreur SQL on redirige vers la fiche de la demande
+        if ($verif > 0)
+        {
+            // Calculcate number of days consummed
+            $nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
+
+            $soldeActuel = $cp->getCpforUser($cp->fk_user);
+            $newSolde = $soldeActuel - ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
+
+            // On ajoute la modification dans le LOG
+            $cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde);
+
+            // Mise à jour du solde
+            $cp->updateSoldeCP($cp->fk_user, $newSolde);
+
+            // To
+            $destinataire = new User($db);
+            $destinataire->fetch($cp->fk_user);
+            $emailTo = $destinataire->email;
+
+            if (!$emailTo)
+            {
+                header('Location: card.php?id='.$_GET['id']);
+                exit;
+            }
+
+            // From
+            $expediteur = new User($db);
+            $expediteur->fetch($cp->fk_validator);
+            $emailFrom = $expediteur->email;
+
+            // Subject
+			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+
+            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
+
+            // Content
+            $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+            $message.= "\n";
+            $message.=  $langs->transnoentities("HolidaysValidatedBody", dol_print_date($cp->date_debut,'day'),dol_print_date($cp->date_fin,'day'))."\n";
+
+            $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+
+            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+            $message.= "\n";
+
+            $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
+
+            // Envoi du mail
+            $result=$mail->sendfile();
+
+            if(!$result) {
+                header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                exit;
+            }
+
+            header('Location: card.php?id='.$_GET['id']);
+            exit;
+        } else {
+            // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
+            header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+            exit;
+        }
+
+    }
+
+}
+
+if ($action == 'confirm_refuse')
+{
+    if (!empty($_POST['detail_refuse']))
+    {
+        $cp = new Holiday($db);
+        $cp->fetch($_GET['id']);
+
+        // Si statut en attente de validation et valideur = utilisateur
+        if ($cp->statut == 2 && $user->id == $cp->fk_validator)
+        {
+            $cp->date_refuse = date('Y-m-d H:i:s', time());
+            $cp->fk_user_refuse = $user->id;
+            $cp->statut = 5;
+            $cp->detail_refuse = $_POST['detail_refuse'];
+
+            $verif = $cp->update($user->id);
+
+            // Si pas d'erreur SQL on redirige vers la fiche de la demande
+            if ($verif > 0)
+            {
+                // To
+                $destinataire = new User($db);
+                $destinataire->fetch($cp->fk_user);
+                $emailTo = $destinataire->email;
+
+                if (!$emailTo)
+                {
+                    header('Location: card.php?id='.$_GET['id']);
+                    exit;
+                }
+
+                // From
+                $expediteur = new User($db);
+                $expediteur->fetch($cp->fk_validator);
+                $emailFrom = $expediteur->email;
+
+	            // Subject
+				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+	            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+
+	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
+
+                // Content
+            	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+	            $message.= "\n";
+                $message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n";
+                $message.= GETPOST('detail_refuse','alpha')."\n\n";
+
+	            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+
+	            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+                $message.= "\n";
+
+                $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
+
+                // Envoi du mail
+                $result=$mail->sendfile();
+
+                if(!$result) {
+                    header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                    exit;
+                }
+
+                header('Location: card.php?id='.$_GET['id']);
+                exit;
+            } else {
+                // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
+                header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+                exit;
+            }
+
+        }
+
+    } else {
+        header('Location: card.php?id='.$_GET['id'].'&error=NoMotifRefuse');
+        exit;
+    }
+}
+
+// Si Validation de la demande
+if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
+{
+    $cp = new Holiday($db);
+    $cp->fetch($_GET['id']);
+
+    // Si statut en attente de validation et valideur = utilisateur
+    if (($cp->statut == 2 || $cp->statut == 3) && ($user->id == $cp->fk_validator || $user->id == $cp->fk_user))
+    {
+    	$db->begin();
+
+    	$oldstatus = $cp->statut;
+        $cp->date_cancel = dol_now();
+        $cp->fk_user_cancel = $user->id;
+        $cp->statut = 4;
+
+        $result = $cp->update($user->id);
+
+        if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
+        {
+        	// Calculcate number of days consummed
+        	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
+
+        	$soldeActuel = $cp->getCpforUser($cp->fk_user);
+        	$newSolde = $soldeActuel + ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
+
+        	// On ajoute la modification dans le LOG
+        	$result1=$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde);
+
+        	// Mise à jour du solde
+        	$result2=$cp->updateSoldeCP($cp->fk_user, $newSolde);
+
+        	if ($result1 < 0 || $result2 < 0)
+        	{
+        		$error = $langs->trans('ErrorCantDeleteCP');
+        	}
+        }
+
+        if (! $error)
+        {
+        	$db->commit();
+        }
+        else
+        {
+        	$db->rollback();
+        }
+
+        // Si pas d'erreur SQL on redirige vers la fiche de la demande
+        if (! $error && $result > 0)
+        {
+            // To
+            $destinataire = new User($db);
+            $destinataire->fetch($cp->fk_user);
+            $emailTo = $destinataire->email;
+
+            if (!$emailTo)
+            {
+                header('Location: card.php?id='.$_GET['id']);
+                exit;
+            }
+
+            // From
+            $expediteur = new User($db);
+            $expediteur->fetch($cp->fk_validator);
+            $emailFrom = $expediteur->email;
+
+            // Subject
+			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+
+            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
+
+            // Content
+           	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+            $message.= "\n";
+
+            $message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n";
+            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+
+            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$cp->rowid."\n\n";
+            $message.= "\n";
+
+            $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
+
+            // Envoi du mail
+            $result=$mail->sendfile();
+
+            if(!$result)
+            {
+                header('Location: card.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
+                exit;
+            }
+
+            header('Location: card.php?id='.$_GET['id']);
+            exit;
+        }
+        else
+        {
+            // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
+            header('Location: card.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
+            exit;
+        }
+
+    }
+
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$cp = new Holiday($db);
+
+$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
+
+llxHeader(array(),$langs->trans('CPTitreMenu'));
+
+if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create')
+{
+    // Si l'utilisateur n'a pas le droit de faire une demande
+    if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
+    {
+        $errors[]=$langs->trans('CantCreateCP');
+    }
+    else
+    {
+        // Formulaire de demande de congés payés
+        print_fiche_titre($langs->trans('MenuAddCP'));
+
+        // Si il y a une erreur
+        if (GETPOST('error')) {
+
+            switch(GETPOST('error')) {
+                case 'datefin' :
+                    $errors[] = $langs->trans('ErrorEndDateCP');
+                    break;
+                case 'SQL_Create' :
+                    $errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
+                    break;
+                case 'CantCreate' :
+                    $errors[] = $langs->trans('CantCreateCP');
+                    break;
+                case 'Valideur' :
+                    $errors[] = $langs->trans('InvalidValidatorCP');
+                    break;
+                case 'nodatedebut' :
+                    $errors[] = $langs->trans('NoDateDebut');
+                    break;
+                case 'nodatefin' :
+                    $errors[] = $langs->trans('NoDateFin');
+                    break;
+                case 'DureeHoliday' :
+                    $errors[] = $langs->trans('ErrorDureeCP');
+                    break;
+                case 'alreadyCP' :
+                    $errors[] = $langs->trans('alreadyCPexist');
+                    break;
+            }
+
+	        setEventMessage($errors, 'errors');
+        }
+
+
+        $delayForRequest = $cp->getConfCP('delayForRequest');
+        //$delayForRequest = $delayForRequest * (60*60*24);
+
+        $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
+
+		print '<script type="text/javascript">
+	    function valider()
+	    {
+    	    if(document.demandeCP.date_debut_.value != "")
+    	    {
+	           	if(document.demandeCP.date_fin_.value != "")
+	           	{
+	               if(document.demandeCP.valideur.value != "-1") {
+	                 return true;
+	               }
+	               else {
+	                 alert("'.dol_escape_js($langs->transnoentities('InvalidValidatorCP')).'");
+	                 return false;
+	               }
+	            }
+	            else
+	            {
+	              alert("'.dol_escape_js($langs->transnoentities('NoDateFin')).'");
+	              return false;
+	            }
+	        }
+	        else
+	        {
+	           alert("'.dol_escape_js($langs->transnoentities('NoDateDebut')).'");
+	           return false;
+	        }
+       	}
+       </script>'."\n";
+
+        // Formulaire de demande
+        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
+        print '<input type="hidden" name="action" value="create" />'."\n";
+        print '<input type="hidden" name="userID" value="'.$userid.'" />'."\n";
+        print '<div class="tabBar">';
+        print '<span>'.$langs->trans('DelayToRequestCP',$cp->getConfCP('delayForRequest')).'</span><br /><br />';
+
+        print '<table class="border" width="100%">';
+        print '<tbody>';
+        print '<tr>';
+        print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
+        print '<td>';
+        if (empty($user->rights->holiday->write_all))
+        {
+        	print $form->select_users($userid,'useridbis',0,'',1);
+        	print '<input type="hidden" name="userid" value="'.$userid.'">';
+        }
+        else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
+        $nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted');
+        print ' &nbsp; <span>'.$langs->trans('SoldeCPUser', round($nb_holiday,2)).'</span>';
+        print '</td>';
+        print '</tr>';
+        print '<tr>';
+        print '<td class="fieldrequired">'.$langs->trans("DateDebCP").' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+        print '<td>';
+        // Si la demande ne vient pas de l'agenda
+        if(!isset($_GET['datep'])) {
+            $form->select_date(-1,'date_debut_');
+        } else {
+            $tmpdate = dol_mktime(0, 0, 0, GETPOST('datepmonth'), GETPOST('datepday'), GETPOST('datepyear'));
+            $form->select_date($tmpdate,'date_debut_');
+        }
+        print ' &nbsp; &nbsp; ';
+        print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):'morning'));
+        print '</td>';
+        print '</tr>';
+        print '<tr>';
+        print '<td class="fieldrequired">'.$langs->trans("DateFinCP").' ('.$langs->trans("LastDayOfHoliday").')</td>';
+        print '<td>';
+        // Si la demande ne vient pas de l'agenda
+        if(!isset($_GET['datep'])) {
+            $form->select_date(-1,'date_fin_');
+        } else {
+            $tmpdate = dol_mktime(0, 0, 0, GETPOST('datefmonth'), GETPOST('datefday'), GETPOST('datefyear'));
+            $form->select_date($tmpdate,'date_fin_');
+        }
+        print ' &nbsp; &nbsp; ';
+        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):'afternoon'));
+        print '</td>';
+        print '</tr>';
+
+        // Approved by
+        print '<tr>';
+        print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
+        // Liste des utiliseurs du groupe choisi dans la config
+        $validator = new UserGroup($db);
+        $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
+        $valideurobjects = $validator->listUsersForGroup($excludefilter);
+        $valideurarray = array();
+        foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
+        print '<td>';
+        print $form->select_dolusers($user->fk_user, "valideur", 1, "", 0, $valideurarray);	// By default, hierarchical parent
+        print '</td>';
+        print '</tr>';
+
+        // Description
+        print '<tr>';
+        print '<td>'.$langs->trans("DescCP").'</td>';
+        print '<td>';
+        print '<textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70"></textarea>';
+        print '</td>';
+        print '</tr>';
+
+        print '</tbody>';
+        print '</table>';
+        print '<div style="clear: both;"></div>';
+        print '</div>';
+        print '</from>'."\n";
+
+        print '<center>';
+        print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
+        print '&nbsp; &nbsp; ';
+        print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)">';
+        print '</center>';
+    }
+
+}
+else
+{
+    if ($error)
+    {
+        print '<div class="tabBar">';
+        print $error;
+        print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+        print '</div>';
+    }
+    else
+    {
+        // Affichage de la fiche d'une demande de congés payés
+        if ($id > 0)
+        {
+            $cp->fetch($id);
+
+			$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
+
+            $valideur = new User($db);
+            $valideur->fetch($cp->fk_validator);
+
+            $userRequest = new User($db);
+            $userRequest->fetch($cp->fk_user);
+
+            //print_fiche_titre($langs->trans('TitreRequestCP'));
+
+            // Si il y a une erreur
+            if (GETPOST('error'))
+            {
+                switch(GETPOST('error'))
+                {
+                    case 'datefin' :
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
+                        break;
+                    case 'SQL_Create' :
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
+                        break;
+                    case 'CantCreate' :
+                        $errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
+                        break;
+                    case 'Valideur' :
+                        $errors[] = $langs->transnoentitiesnoconv('InvalidValidatorCP');
+                        break;
+                    case 'nodatedebut' :
+                        $errors[] = $langs->transnoentitiesnoconv('NoDateDebut');
+                        break;
+                    case 'nodatefin' :
+                        $errors[] = $langs->transnoentitiesnoconv('NoDateFin');
+                        break;
+                    case 'DureeHoliday' :
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorDureeCP');
+                        break;
+                    case 'NoMotifRefuse' :
+                        $errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
+                        break;
+                    case 'mail' :
+                        $errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
+                        break;
+                }
+
+	            setEventMessage($errors, 'errors');
+            }
+
+            // On vérifie si l'utilisateur à le droit de lire cette demande
+            if ($canedit)
+            {
+                if ($action == 'delete')
+                {
+                    if($user->rights->holiday->delete)
+                    {
+                        print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
+                    }
+                }
+
+                // Si envoi en validation
+                if ($action == 'sendToValidate' && $cp->statut == 1 && $user->id == $cp->fk_user)
+                {
+                    print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
+                }
+
+                // Si validation de la demande
+                if ($action == 'valid')
+                {
+                    print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
+                }
+
+                // Si refus de la demande
+                if ($action == 'refuse')
+                {
+                    $array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
+                    print $form->formconfirm("card.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
+                }
+
+                // Si annulation de la demande
+                if ($action == 'cancel')
+                {
+                    print $form->formconfirm("card.php?id=".$id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
+                }
+
+                $head=holiday_prepare_head($cp);
+
+                dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
+
+                if ($action == 'edit' && $cp->statut == 1)
+                {
+                    $edit = true;
+                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$_GET['id'].'">'."\n";
+                    print '<input type="hidden" name="action" value="update"/>'."\n";
+                    print '<input type="hidden" name="holiday_id" value="'.$_GET['id'].'" />'."\n";
+                }
+
+                print '<table class="border" width="100%">';
+                print '<tbody>';
+
+                $linkback='';
+
+                print '<tr>';
+                print '<td width="25%">'.$langs->trans("Ref").'</td>';
+                print '<td>';
+                print $form->showrefnav($cp, 'id', $linkback, 1, 'rowid', 'ref');
+                print '</td>';
+                print '</tr>';
+
+                print '<td>'.$langs->trans("User").'</td>';
+        		print '<td>';
+        		print $userRequest->getNomUrl(1);
+        		print '</td></tr>';
+
+			    $starthalfday=($cp->halfday == -1 || $cp->halfday == 2)?'afternoon':'morning';
+			    $endhalfday=($cp->halfday == 1 || $cp->halfday == 2)?'morning':'afternoon';
+
+                if(!$edit)
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+                    print '<td>'.dol_print_date($cp->date_debut,'day');
+			        print ' &nbsp; &nbsp; ';
+                    print $langs->trans($listhalfday[$starthalfday]);
+                    print '</td>';
+                    print '</tr>';
+                }
+                else
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+                    print '<td>';
+                    $form->select_date($cp->date_debut,'date_debut_');
+			        print ' &nbsp; &nbsp; ';
+        			print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                if (!$edit)
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+                    print '<td>'.dol_print_date($cp->date_fin,'day');
+                    print ' &nbsp; &nbsp; ';
+                    print $langs->trans($listhalfday[$endhalfday]);
+                    print '</td>';
+                    print '</tr>';
+                }
+                else
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+                    print '<td>';
+                    $form->select_date($cp->date_fin,'date_fin_');
+			        print ' &nbsp; &nbsp; ';
+        			print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
+                    print '</td>';
+                    print '</tr>';
+                }
+                print '<tr>';
+                print '<td>'.$langs->trans('NbUseDaysCP').'</td>';
+                print '<td>'.num_open_day($cp->date_debut_gmt, $cp->date_fin_gmt, 0, 1, $cp->halfday).'</td>';
+                print '</tr>';
+
+                // Status
+                print '<tr>';
+                print '<td>'.$langs->trans('StatutCP').'</td>';
+                print '<td>'.$cp->getLibStatut(2).'</td>';
+                print '</tr>';
+                if ($cp->statut == 5)
+                {
+                	print '<tr>';
+                	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
+                	print '<td>'.$cp->detail_refuse.'</td>';
+                	print '</tr>';
+                }
+
+                // Description
+                if (!$edit)
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DescCP').'</td>';
+                    print '<td>'.nl2br($cp->description).'</td>';
+                    print '</tr>';
+                }
+                else
+                {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DescCP').'</td>';
+                    print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$cp->description.'</textarea></td>';
+                    print '</tr>';
+                }
+                print '</tbody>';
+                print '</table>'."\n";
+
+                print '<br><br>';
+
+				// Info workflow
+                print '<table class="border" width="50%">'."\n";
+                print '<tbody>';
+                print '<tr class="liste_titre">';
+                print '<td colspan="2">'.$langs->trans("InfosWorkflowCP").'</td>';
+                print '</tr>';
+
+                if (! empty($cp->fk_user_create))
+                {
+                	$userCreate=new User($db);
+                	$userCreate->fetch($cp->fk_user_create);
+	                print '<tr>';
+	                print '<td>'.$langs->trans('RequestByCP').'</td>';
+	                print '<td>'.$userCreate->getNomUrl(1).'</td>';
+	                print '</tr>';
+                }
+
+                if (!$edit) {
+                    print '<tr>';
+                    print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
+                    print '<td>'.$valideur->getNomUrl(1).'</td>';
+                    print '</tr>';
+                } else {
+                    print '<tr>';
+                    print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
+                    // Liste des utiliseurs du groupes choisi dans la config
+                    $idGroupValid = $cp->getConfCP('userGroup');
+
+                    $validator = new UserGroup($db);
+                    $valideur = $validator->listUsersForGroup('',1);
+
+                    print '<td>';
+                    $form->select_users($cp->fk_validator,"valideur",1,"",0,$valideur,'');
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                print '<tr>';
+                print '<td>'.$langs->trans('DateCreateCP').'</td>';
+                print '<td>'.dol_print_date($cp->date_create,'dayhour').'</td>';
+                print '</tr>';
+                if($cp->statut == 3) {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DateValidCP').'</td>';
+                    print '<td>'.dol_print_date($cp->date_valid,'dayhour').'</td>';
+                    print '</tr>';
+                }
+                if($cp->statut == 4) {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DateCancelCP').'</td>';
+                    print '<td>'.dol_print_date($cp->date_cancel,'dayhour').'</td>';
+                    print '</tr>';
+                }
+                if($cp->statut == 5) {
+                    print '<tr>';
+                    print '<td>'.$langs->trans('DateRefusCP').'</td>';
+                    print '<td>'.dol_print_date($cp->date_refuse,'dayhour').'</td>';
+                    print '</tr>';
+                }
+                print '</tbody>';
+                print '</table>';
+
+                if ($action == 'edit' && $cp->statut == 1)
+                {
+                    print '<br><div align="center">';
+                    if ($canedit && $cp->statut == 1)
+                    {
+                        print '<input type="submit" value="'.$langs->trans("UpdateButtonCP").'" class="button">';
+                    }
+                    print '</div>';
+
+                    print '</form>';
+                }
+
+                dol_fiche_end();
+
+                if (! $edit)
+                {
+		            print '<div class="tabsAction">';
+
+                    // Boutons d'actions
+                    if ($canedit && $cp->statut == 1)
+                    {
+                        print '<a href="card.php?id='.$_GET['id'].'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
+                    }
+                    if ($canedit && $cp->statut == 1)
+                    {
+                        print '<a href="card.php?id='.$_GET['id'].'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
+                    }
+                    if ($user->rights->holiday->delete && $cp->statut == 1)	// If draft
+                    {
+                    	print '<a href="card.php?id='.$_GET['id'].'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
+                    }
+
+                    if ($user->id == $cp->fk_validator && $cp->statut == 2)
+                    {
+                        print '<a href="card.php?id='.$_GET['id'].'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
+                        print '<a href="card.php?id='.$_GET['id'].'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
+                    }
+
+                    if (($user->id == $cp->fk_validator || $user->id == $cp->fk_user) && ($cp->statut == 2 || $cp->statut == 3))	// Status validated or approved
+                    {
+                    	if (($cp->date_debut > dol_now()) || $user->admin) print '<a href="card.php?id='.$_GET['id'].'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
+                    	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
+                    }
+
+                    print '</div>';
+                }
+
+            } else {
+                print '<div class="tabBar">';
+                print $langs->trans('ErrorUserViewCP');
+                print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+                print '</div>';
+            }
+
+        } else {
+            print '<div class="tabBar">';
+            print $langs->trans('ErrorIDFicheCP');
+            print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+            print '</div>';
+        }
+
+    }
+
+}
+
+// End of page
+llxFooter();
+
+if (is_object($db)) $db->close();
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 5398b398e6c..2ecf8edfce3 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -137,7 +137,7 @@ class Holiday extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) {
             $error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -200,7 +200,7 @@ class Holiday extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp";
         $sql.= " WHERE cp.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -238,7 +238,6 @@ class Holiday extends CommonObject
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -294,7 +293,7 @@ class Holiday extends CommonObject
             $sql.= $order;
         }
 
-        dol_syslog(get_class($this)."::fetchByUser sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchByUser", LOG_DEBUG);
         $resql=$this->db->query($sql);
 
         // Si pas d'erreur SQL
@@ -351,7 +350,6 @@ class Holiday extends CommonObject
         {
             // Erreur SQL
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetchByUser ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -405,7 +403,7 @@ class Holiday extends CommonObject
             $sql.= $order;
         }
 
-        dol_syslog(get_class($this)."::fetchAll sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
         $resql=$this->db->query($sql);
 
         // Si pas d'erreur SQL
@@ -461,7 +459,6 @@ class Holiday extends CommonObject
         {
             // Erreur SQL
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetchAll ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -473,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;
@@ -544,7 +541,7 @@ class Holiday extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) {
             $error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -591,7 +588,7 @@ class Holiday extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) {
             $error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -662,7 +659,7 @@ class Holiday extends CommonObject
 
     	$result='';
 
-    	$lien = '<a href="'.DOL_URL_ROOT.'/holiday/fiche.php?id='.$this->id.'">';
+    	$lien = '<a href="'.DOL_URL_ROOT.'/holiday/card.php?id='.$this->id.'">';
     	$lienfin='</a>';
 
     	$picto='holiday';
@@ -783,11 +780,11 @@ class Holiday extends CommonObject
         $groupe = $objet->value;
 
         // On liste les groupes de Dolibarr
-        $sql = "SELECT u.rowid, u.nom";
+        $sql = "SELECT u.rowid, u.nom as name";
         $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as u";
         $sql.= " ORDER BY u.rowid";
 
-        dol_syslog(get_class($this)."::selectUserGroup sql=".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::selectUserGroup", LOG_DEBUG);
         $result = $this->db->query($sql);
 
         // Si pas d'erreur SQL
@@ -801,9 +798,9 @@ class Holiday extends CommonObject
             while ($obj = $this->db->fetch_object($result))
             {
                 if($groupe==$obj->rowid) {
-                    $selectGroup.= '<option value="'.$obj->rowid.'" selected="selected">'.$obj->nom.'</option>'."\n";
+                    $selectGroup.= '<option value="'.$obj->rowid.'" selected="selected">'.$obj->name.'</option>'."\n";
                 } else {
-                    $selectGroup.= '<option value="'.$obj->rowid.'">'.$obj->nom.'</option>'."\n";
+                    $selectGroup.= '<option value="'.$obj->rowid.'">'.$obj->name.'</option>'."\n";
                 }
             }
             $selectGroup.= '</select>'."\n";
@@ -813,7 +810,6 @@ class Holiday extends CommonObject
         {
             // Erreur SQL
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::selectUserGroup ".$this->error, LOG_ERR);
             return -1;
         }
 
@@ -824,7 +820,7 @@ class Holiday extends CommonObject
     /**
      *  Met à jour une option du module Holiday Payés
      *
-     *  @param	string	$name       nom du paramètre de configuration
+     *  @param	string	$name       name du paramètre de configuration
      *  @param	string	$value      vrai si mise à jour OK sinon faux
      *  @return boolean				ok or ko
      */
@@ -834,7 +830,7 @@ class Holiday extends CommonObject
         $sql.= " value = '".$value."'";
         $sql.= " WHERE name = '".$name."'";
 
-        dol_syslog(get_class($this).'::updateConfCP name='.$name.' sql='.$sql);
+        dol_syslog(get_class($this).'::updateConfCP name='.$name.'', LOG_DEBUG);
         $result = $this->db->query($sql);
         if($result) {
             return true;
@@ -846,7 +842,7 @@ class Holiday extends CommonObject
     /**
      *  Retourne la valeur d'un paramètre de configuration
      *
-     *  @param	string	$name       nom du paramètre de configuration
+     *  @param	string	$name       name du paramètre de configuration
      *  @return string      		retourne la valeur du paramètre
      */
     function getConfCP($name)
@@ -855,7 +851,7 @@ class Holiday extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
         $sql.= " WHERE name = '".$name."'";
 
-        dol_syslog(get_class($this).'::getConfCP name='.$name.' sql='.$sql);
+        dol_syslog(get_class($this).'::getConfCP name='.$name.'', LOG_DEBUG);
         $result = $this->db->query($sql);
 
         // Si pas d'erreur
@@ -869,7 +865,6 @@ class Holiday extends CommonObject
 
             // Erreur SQL
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::getConfCP ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -903,7 +898,7 @@ class Holiday extends CommonObject
                 $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
                 $sql.= " WHERE name = 'lastUpdate'";
 
-                dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql);
+                dol_syslog(get_class($this).'::updateSoldeCP', LOG_DEBUG);
                 $result = $this->db->query($sql);
 
                 // On ajoute x jours à chaque utilisateurs
@@ -929,7 +924,7 @@ class Holiday extends CommonObject
                 $sql2 = "UPDATE ".MAIN_DB_PREFIX."holiday_users SET";
                 $sql2.= " nb_holiday = nb_holiday + ".$nb_holiday;
 
-                dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql2);
+                dol_syslog(get_class($this).'::updateSoldeCP', LOG_DEBUG);
                 $result= $this->db->query($sql2);
 
 	            if ($result) return 1;
@@ -948,7 +943,7 @@ class Holiday extends CommonObject
             $sql.= " nb_holiday = ".$nbHoliday;
             $sql.= " WHERE fk_user = '".$userID."'";
 
-			dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql);
+			dol_syslog(get_class($this).'::updateSoldeCP', LOG_DEBUG);
             $result = $this->db->query($sql);
 
             if ($result) return 1;
@@ -960,7 +955,7 @@ class Holiday extends CommonObject
     /**
      *	Retourne un checked si vrai
      *
-     *  @param	string	$name       nom du paramètre de configuration
+     *  @param	string	$name       name du paramètre de configuration
      *  @return string      		retourne checked si > 0
      */
     function getCheckOption($name) {
@@ -1046,11 +1041,12 @@ class Holiday extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users";
         $sql.= " WHERE fk_user = '".$user_id."'";
 
-        dol_syslog(get_class($this).'::getCPforUser sql='.$sql);
+        dol_syslog(get_class($this).'::getCPforUser', LOG_DEBUG);
         $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';
         }
@@ -1077,7 +1073,7 @@ class Holiday extends CommonObject
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE statut > 0";
 
-                dol_syslog(get_class($this)."::fetchUsers sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1107,7 +1103,6 @@ class Holiday extends CommonObject
                 {
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
-                    dol_syslog(get_class($this)."::fetchUsers ".$this->error, LOG_ERR);
                     return -1;
                 }
 
@@ -1115,7 +1110,7 @@ class Holiday extends CommonObject
                 $sql = "SELECT u.fk_user";
                 $sql.= " FROM ".MAIN_DB_PREFIX."holiday_users as u";
 
-                dol_syslog(get_class($this)."::fetchUsers sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1145,7 +1140,6 @@ class Holiday extends CommonObject
                 {
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
-                    dol_syslog(get_class($this)."::fetchUsers ".$this->error, LOG_ERR);
                     return -1;
                 }
             }
@@ -1159,7 +1153,7 @@ class Holiday extends CommonObject
                 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE statut > 0";
 
-                dol_syslog(get_class($this)."::fetchUsers sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1187,7 +1181,6 @@ class Holiday extends CommonObject
                 {
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
-                    dol_syslog(get_class($this)."::fetchUsers ".$this->error, LOG_ERR);
                     return -1;
                 }
 
@@ -1199,7 +1192,7 @@ class Holiday extends CommonObject
                 $sql.= " ".MAIN_DB_PREFIX."user as u";
                 $sql.= " WHERE cpu.fk_user = u.rowid";
 
-                dol_syslog(get_class($this)."::fetchUsers sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::fetchUsers", LOG_DEBUG);
                 $resql=$this->db->query($sql);
 
                 // Si pas d'erreur SQL
@@ -1227,7 +1220,6 @@ class Holiday extends CommonObject
                 {
                     // Erreur SQL
                     $this->error="Error ".$this->db->lasterror();
-                    dol_syslog(get_class($this)."::fetchUsers ".$this->error, LOG_ERR);
                     return -1;
                 }
             }
@@ -1382,7 +1374,7 @@ class Holiday extends CommonObject
 
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday_events as cpe";
 
-        dol_syslog(get_class($this)."::fetchEventsCP sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchEventsCP", LOG_DEBUG);
         $resql=$this->db->query($sql);
 
         // Si pas d'erreur SQL
@@ -1416,7 +1408,6 @@ class Holiday extends CommonObject
         {
             // Erreur SQL
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetchEventsCP ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -1447,7 +1438,7 @@ class Holiday extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::createEventCP sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::createEventCP", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) {
             $error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -1640,7 +1631,7 @@ class Holiday extends CommonObject
 
         $this->db->begin();
 
-   	   	dol_syslog(get_class($this)."::addLogCP sql=".$sql, LOG_DEBUG);
+   	   	dol_syslog(get_class($this)."::addLogCP", LOG_DEBUG);
    	   	$resql=$this->db->query($sql);
        	if (! $resql) {
        	    $error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -1703,7 +1694,7 @@ class Holiday extends CommonObject
             $sql.= " ".$order;
         }
 
-        dol_syslog(get_class($this)."::fetchLog sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchLog", LOG_DEBUG);
         $resql=$this->db->query($sql);
 
         // Si pas d'erreur SQL
@@ -1741,11 +1732,34 @@ class Holiday extends CommonObject
   		{
   		    // Erreur SQL
   		    $this->error="Error ".$this->db->lasterror();
-  		    dol_syslog(get_class($this)."::fetchLog ".$this->error, LOG_ERR);
   		    return -1;
   		}
     }
 
+
+    /**
+     *  Tous les types
+     *
+     *  @return     boolean    Return array with list of types
+     */
+    function getTypes()
+    {
+    	$result = $this->db->query("SELECT rowid, type, affect FROM " . MAIN_DB_PREFIX . "holiday_types");
+    	$num = $this->db->num_rows($result);
+    	if ($num)
+    	{
+    		while ($obj = $this->db->fetch_object($result))
+    		{
+    			$types[] = array('rowid'=> $obj->rowid, 'type'=> $obj->type, 'affect'=>$obj->affect);
+    		}
+
+    		return $types;
+    	}
+
+    	return array();
+    }
+
+
     /**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
diff --git a/htdocs/holiday/class/index.html b/htdocs/holiday/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index c432d37007b..fa3f745de81 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -84,13 +84,10 @@ if ($action == 'update' && isset($_POST['update_cp']))
     $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
     $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
     $sql.= " WHERE name = 'lastUpdate' and value IS NULL";	// Add value IS NULL to be sure to update only at init.
-    dol_syslog('define_holiday update lastUpdate entry sql='.$sql);
+    dol_syslog('define_holiday update lastUpdate entry', LOG_DEBUG);
     $result = $db->query($sql);
 
-    $mesg='<div class="ok">'.$langs->trans('UpdateConfCPOK').'</div>';
-
-    dol_htmloutput_mesg($mesg);
-
+	setEventMessage($langs->trans('UpdateConfCPOK'));
 }
 elseif($action == 'add_event')
 {
@@ -108,7 +105,7 @@ elseif($action == 'add_event')
 
     if ($error)
     {
-        $message = '<div class="error">'.$langs->trans('ErrorAddEventToUserCP').'</div>';
+	    setEventMessage($langs->trans('ErrorAddEventToUserCP'), 'errors');
     }
     else
 	{
@@ -121,10 +118,8 @@ elseif($action == 'add_event')
 
         $holiday->updateSoldeCP($userCP,$new_holiday);
 
-        $message = $langs->trans('AddEventToUserOkCP');
+		setEventMessage($langs->trans('AddEventToUserOkCP'));
     }
-
-    dol_htmloutput_mesg($message);
 }
 
 $langs->load('users');
@@ -149,17 +144,14 @@ if($cp_events == 1)
 	print '</form><br>';
 }
 
-dol_fiche_head();
-
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 print '<input type="hidden" name="action" value="update" />';
 print '<table class="noborder" width="100%;">';
 print "<tr class=\"liste_titre\">";
-print '<td width="5%">'.$langs->trans('ID').'</td>';
-print '<td width="50%">'.$langs->trans('Employee').'</td>';
+print '<td width="55%">'.$langs->trans('Employee').'</td>';
 print '<td width="20%" style="text-align:center">'.$langs->trans('Available').'</td>';
 print '<td width="20%" style="text-align:center">'.$langs->trans('Note').'</td>';
-print '<td style="text-align:center">'.$langs->trans('UpdateButtonCP').'</td>';
+print '<td></td>';
 print '</tr>';
 
 foreach($listUsers as $users)
@@ -168,7 +160,6 @@ foreach($listUsers as $users)
     $var=!$var;
 
     print '<tr '.$bc[$var].' style="height: 20px;">';
-    print '<td>'.$users['rowid'].'</td>';
     print '<td>';
     $userstatic->id=$users['rowid'];
     $userstatic->lastname=$users['name'];
@@ -188,10 +179,6 @@ foreach($listUsers as $users)
 print '</table>';
 print '</form>';
 
-dol_fiche_end();
-
-
 llxFooter();
 
 $db->close();
-
diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php
deleted file mode 100644
index d66d1c8cfbd..00000000000
--- a/htdocs/holiday/fiche.php
+++ /dev/null
@@ -1,1174 +0,0 @@
-<?php
-/* Copyright (C) 2011	   Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2012-2013 Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2012	   Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2013	   Juanjo Menent		<jmenent@2byte.es>
- *
- * 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, orwrite
- * (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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *   	\file       htdocs/holiday/fiche.php
- *		\ingroup    holiday
- *		\brief      Form and file creation of paid holiday.
- */
-
-require('../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
-
-// Get parameters
-$myparam = GETPOST("myparam");
-$action=GETPOST('action', 'alpha');
-$id=GETPOST('id', 'int');
-$userid = GETPOST('userid')?GETPOST('userid'):$user->id;
-
-// Protection if external user
-if ($user->societe_id > 0) accessforbidden();
-
-$now=dol_now();
-
-
-/*
- * Actions
- */
-
-// Si création de la demande
-if ($action == 'create')
-{
-	$cp = new Holiday($db);
-
-    // Si pas le droit de créer une demande
-    if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
-    {
-    	$error++;
-    	setEventMessage($langs->trans('CantCreateCP'));
-    	$action='request';
-    }
-
-    if (! $error)
-    {
-	    $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
-	    $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
-	    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
-	    $date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
-	    $starthalfday=GETPOST('starthalfday');
-	    $endhalfday=GETPOST('endhalfday');
-	    $halfday=0;
-	    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
-	    else if ($starthalfday == 'afternoon') $halfday=-1;
-	    else if ($endhalfday == 'morning') $halfday=1;
-
-	    $valideur = GETPOST('valideur');
-	    $description = trim(GETPOST('description'));
-	    $userID = GETPOST('userID');
-
-	    // Si pas de date de début
-	    if (empty($date_debut))
-	    {
-	        header('Location: fiche.php?action=request&error=nodatedebut');
-	        exit;
-	    }
-
-	    // Si pas de date de fin
-	    if (empty($date_fin))
-	    {
-	        header('Location: fiche.php?action=request&error=nodatefin');
-	        exit;
-	    }
-
-	    // Si date de début après la date de fin
-	    if ($date_debut > $date_fin)
-	    {
-	        header('Location: fiche.php?action=request&error=datefin');
-	        exit;
-	    }
-
-	    // Check if there is already holiday for this period
-	    $verifCP = $cp->verifDateHolidayCP($userID, $date_debut, $date_fin, $halfday);
-	    if (! $verifCP)
-	    {
-	        header('Location: fiche.php?action=request&error=alreadyCP');
-	        exit;
-	    }
-
-	    // Si aucun jours ouvrés dans la demande
-	    $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
-	    if($nbopenedday < 1)
-	    {
-	        header('Location: fiche.php?action=request&error=DureeHoliday');
-	        exit;
-	    }
-
-	    // Si pas de validateur choisi
-	    if ($valideur < 1)
-	    {
-	        header('Location: fiche.php?action=request&error=Valideur');
-	        exit;
-	    }
-
-	    $cp->fk_user = $userid;
-	    $cp->description = $description;
-	    $cp->date_debut = $date_debut;
-	    $cp->date_fin = $date_fin;
-	    $cp->fk_validator = $valideur;
-		$cp->halfday = $halfday;
-
-	    $verif = $cp->create($userid);
-
-	    // Si pas d'erreur SQL on redirige vers la fiche de la demande
-	    if ($verif > 0)
-	    {
-	        header('Location: fiche.php?id='.$verif);
-	        exit;
-	    }
-	    else
-	    {
-	        // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-	        header('Location: fiche.php?action=request&error=SQL_Create&msg='.$cp->error);
-	        exit;
-	    }
-    }
-}
-
-if ($action == 'update')
-{
-	$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
-	$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
-	$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
-	$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
-	$starthalfday=GETPOST('starthalfday');
-	$endhalfday=GETPOST('endhalfday');
-	$halfday=0;
-	if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday=2;
-	else if ($starthalfday == 'afternoon') $halfday=-1;
-	else if ($endhalfday == 'morning') $halfday=1;
-
-    // Si pas le droit de modifier une demande
-    if (! $user->rights->holiday->write)
-    {
-        header('Location: fiche.php?action=request&error=CantUpdate');
-        exit;
-    }
-
-    $cp = new Holiday($db);
-    $cp->fetch($_POST['holiday_id']);
-
-	$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
-
-	// Si en attente de validation
-    if ($cp->statut == 1)
-    {
-        // Si c'est le créateur ou qu'il a le droit de tout lire / modifier
-        if ($canedit)
-        {
-            $valideur = $_POST['valideur'];
-            $description = trim($_POST['description']);
-
-            // Si pas de date de début
-            if (empty($_POST['date_debut_'])) {
-                header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatedebut');
-                exit;
-            }
-
-            // Si pas de date de fin
-            if (empty($_POST['date_fin_'])) {
-                header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=nodatefin');
-                exit;
-            }
-
-            // Si date de début après la date de fin
-            if ($date_debut > $date_fin) {
-                header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=datefin');
-                exit;
-            }
-
-            // Si pas de valideur choisi
-            if ($valideur < 1) {
-                header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=Valideur');
-                exit;
-            }
-
-            // Si pas de jours ouvrés dans la demande
-            $nbopenedday=num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
-            if ($nbopenedday < 1)
-            {
-                header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=DureeHoliday');
-                exit;
-            }
-
-            $cp->description = $description;
-            $cp->date_debut = $date_debut;
-            $cp->date_fin = $date_fin;
-            $cp->fk_validator = $valideur;
-			$cp->halfday = $halfday;
-
-			// Update
-			$verif = $cp->update($user->id);
-            if ($verif > 0)
-            {
-                header('Location: fiche.php?id='.$_POST['holiday_id']);
-                exit;
-            }
-            else
-           {
-                // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-                header('Location: fiche.php?id='.$_POST['holiday_id'].'&action=edit&error=SQL_Create&msg='.$cp->error);
-                exit;
-            }
-        }
-    } else {
-        header('Location: fiche.php?id='.$_POST['holiday_id']);
-        exit;
-    }
-}
-
-// Si suppression de la demande
-if ($action == 'confirm_delete' && GETPOST('confirm') == 'yes')
-{
-    if($user->rights->holiday->delete)
-    {
-    	$error=0;
-
-    	$db->begin();
-
-        $cp = new Holiday($db);
-        $cp->fetch($id);
-
-        $canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
-
-        // Si c'est bien un brouillon
-        if ($cp->statut == 1 || $cp->statut == 3)
-        {
-            // Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
-            if ($canedit)
-            {
-                $result=$cp->delete($id);
-            }
-            else
-            {
-                $error = $langs->trans('ErrorCantDeleteCP');
-            }
-        }
-
-       	if (! $error)
-        {
-          	$db->commit();
-           	header('Location: index.php');
-           	exit;
-        }
-        else
-        {
-        	$db->rollback();
-        }
-    }
-}
-
-// Si envoi de la demande
-if ($action == 'confirm_send')
-{
-    $cp = new Holiday($db);
-    $cp->fetch($id);
-
-    // Si brouillon et créateur
-    if($cp->statut == 1 && $user->id == $cp->fk_user)
-    {
-        $cp->statut = 2;
-
-        $verif = $cp->update($user->id);
-
-        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-        if ($verif > 0)
-        {
-            // To
-            $destinataire = new User($db);
-            $destinataire->fetch($cp->fk_validator);
-            $emailTo = $destinataire->email;
-
-            if (!$emailTo)
-            {
-                header('Location: fiche.php?id='.$_GET['id']);
-                exit;
-            }
-
-            // From
-            $expediteur = new User($db);
-            $expediteur->fetch($cp->fk_user);
-            $emailFrom = $expediteur->email;
-
-            // Subject
-			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
-
-            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
-
-            // Content
-            $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
-            $message.= $langs->transnoentities("HolidaysToValidateBody")."\n";
-
-            $delayForRequest = $cp->getConfCP('delayForRequest');
-            //$delayForRequest = $delayForRequest * (60*60*24);
-
-            $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
-
-            // Si l'option pour avertir le valideur en cas de délai trop court
-            if($cp->getConfCP('AlertValidatorDelay'))
-            {
-                if($cp->date_debut < $nextMonth)
-                {
-                    $message.= "\n";
-                    $message.= $langs->transnoentities("HolidaysToValidateDelay",$cp->getConfCP('delayForRequest'))."\n";
-                }
-            }
-
-            // Si l'option pour avertir le valideur en cas de solde inférieur à la demande
-            if ($cp->getConfCP('AlertValidatorSolde'))
-            {
-            	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
-                if ($nbopenedday > $cp->getCPforUser($cp->fk_user))
-                {
-                    $message.= "\n";
-                    $message.= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
-                }
-            }
-
-            $message.= "\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($cp->date_debut,'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($cp->date_fin,'day')."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
-            $message.= "\n";
-
-            $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
-
-            // Envoi du mail
-            $result=$mail->sendfile();
-
-            if (!$result)
-            {
-                header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
-                exit;
-            }
-            header('Location: fiche.php?id='.$_GET['id']);
-            exit;
-        }
-        else
-        {
-            // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-            header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
-            exit;
-        }
-    }
-}
-
-
-// Si Validation de la demande
-if($action == 'confirm_valid')
-{
-    $cp = new Holiday($db);
-    $cp->fetch($id);
-
-    // Si statut en attente de validation et valideur = utilisateur
-    if ($cp->statut == 2 && $user->id == $cp->fk_validator)
-    {
-        $cp->date_valid = dol_now();
-        $cp->fk_user_valid = $user->id;
-        $cp->statut = 3;
-
-        $verif = $cp->update($user->id);
-
-        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-        if ($verif > 0)
-        {
-            // Calculcate number of days consummed
-            $nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1);
-
-            $soldeActuel = $cp->getCpforUser($cp->fk_user);
-            $newSolde = $soldeActuel - ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
-
-            // On ajoute la modification dans le LOG
-            $cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde);
-
-            // Mise à jour du solde
-            $cp->updateSoldeCP($cp->fk_user, $newSolde);
-
-            // To
-            $destinataire = new User($db);
-            $destinataire->fetch($cp->fk_user);
-            $emailTo = $destinataire->email;
-
-            if (!$emailTo)
-            {
-                header('Location: fiche.php?id='.$_GET['id']);
-                exit;
-            }
-
-            // From
-            $expediteur = new User($db);
-            $expediteur->fetch($cp->fk_validator);
-            $emailFrom = $expediteur->email;
-
-            // Subject
-			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
-
-            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
-
-            // Content
-            $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
-            $message.=  $langs->transnoentities("HolidaysValidatedBody", dol_print_date($cp->date_debut,'day'),dol_print_date($cp->date_fin,'day'))."\n";
-
-            $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
-            $message.= "\n";
-
-            $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
-
-            // Envoi du mail
-            $result=$mail->sendfile();
-
-            if(!$result) {
-                header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
-                exit;
-            }
-
-            header('Location: fiche.php?id='.$_GET['id']);
-            exit;
-        } else {
-            // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-            header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
-            exit;
-        }
-
-    }
-
-}
-
-if ($action == 'confirm_refuse')
-{
-    if (!empty($_POST['detail_refuse']))
-    {
-        $cp = new Holiday($db);
-        $cp->fetch($_GET['id']);
-
-        // Si statut en attente de validation et valideur = utilisateur
-        if ($cp->statut == 2 && $user->id == $cp->fk_validator)
-        {
-            $cp->date_refuse = date('Y-m-d H:i:s', time());
-            $cp->fk_user_refuse = $user->id;
-            $cp->statut = 5;
-            $cp->detail_refuse = $_POST['detail_refuse'];
-
-            $verif = $cp->update($user->id);
-
-            // Si pas d'erreur SQL on redirige vers la fiche de la demande
-            if ($verif > 0)
-            {
-                // To
-                $destinataire = new User($db);
-                $destinataire->fetch($cp->fk_user);
-                $emailTo = $destinataire->email;
-
-                if (!$emailTo)
-                {
-                    header('Location: fiche.php?id='.$_GET['id']);
-                    exit;
-                }
-
-                // From
-                $expediteur = new User($db);
-                $expediteur->fetch($cp->fk_validator);
-                $emailFrom = $expediteur->email;
-
-	            // Subject
-				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
-
-	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
-
-                // Content
-            	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-	            $message.= "\n";
-                $message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n";
-                $message.= GETPOST('detail_refuse','alpha')."\n\n";
-
-	            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-
-	            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
-                $message.= "\n";
-
-                $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
-
-                // Envoi du mail
-                $result=$mail->sendfile();
-
-                if(!$result) {
-                    header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
-                    exit;
-                }
-
-                header('Location: fiche.php?id='.$_GET['id']);
-                exit;
-            } else {
-                // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-                header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
-                exit;
-            }
-
-        }
-
-    } else {
-        header('Location: fiche.php?id='.$_GET['id'].'&error=NoMotifRefuse');
-        exit;
-    }
-}
-
-// Si Validation de la demande
-if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
-{
-    $cp = new Holiday($db);
-    $cp->fetch($_GET['id']);
-
-    // Si statut en attente de validation et valideur = utilisateur
-    if (($cp->statut == 2 || $cp->statut == 3) && ($user->id == $cp->fk_validator || $user->id == $cp->fk_user))
-    {
-    	$db->begin();
-
-    	$oldstatus = $cp->statut;
-        $cp->date_cancel = dol_now();
-        $cp->fk_user_cancel = $user->id;
-        $cp->statut = 4;
-
-        $result = $cp->update($user->id);
-
-        if ($result >= 0 && $oldstatus == 3)	// holiday was already validated, status 3, so we must increase back sold
-        {
-        	// Calculcate number of days consummed
-        	$nbopenedday=num_open_day($cp->date_debut_gmt,$cp->date_fin_gmt,0,1,$cp->halfday);
-
-        	$soldeActuel = $cp->getCpforUser($cp->fk_user);
-        	$newSolde = $soldeActuel + ($nbopenedday * $cp->getConfCP('nbHolidayDeducted'));
-
-        	// On ajoute la modification dans le LOG
-        	$result1=$cp->addLogCP($user->id, $cp->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde);
-
-        	// Mise à jour du solde
-        	$result2=$cp->updateSoldeCP($cp->fk_user, $newSolde);
-
-        	if ($result1 < 0 || $result2 < 0)
-        	{
-        		$error = $langs->trans('ErrorCantDeleteCP');
-        	}
-        }
-
-        if (! $error)
-        {
-        	$db->commit();
-        }
-        else
-        {
-        	$db->rollback();
-        }
-
-        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-        if (! $error && $result > 0)
-        {
-            // To
-            $destinataire = new User($db);
-            $destinataire->fetch($cp->fk_user);
-            $emailTo = $destinataire->email;
-
-            if (!$emailTo)
-            {
-                header('Location: fiche.php?id='.$_GET['id']);
-                exit;
-            }
-
-            // From
-            $expediteur = new User($db);
-            $expediteur->fetch($cp->fk_validator);
-            $emailFrom = $expediteur->email;
-
-            // Subject
-			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-            if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
-
-            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
-
-            // Content
-           	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-            $message.= "\n";
-
-            $message.= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($cp->date_debut,'day'), dol_print_date($cp->date_fin,'day'))."\n";
-            $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-
-            $message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
-            $message.= "\n";
-
-            $mail = new CMailFile($subject,$emailTo,$emailFrom,$message);
-
-            // Envoi du mail
-            $result=$mail->sendfile();
-
-            if(!$result)
-            {
-                header('Location: fiche.php?id='.$_GET['id'].'&error=mail&error_content='.$mail->error);
-                exit;
-            }
-
-            header('Location: fiche.php?id='.$_GET['id']);
-            exit;
-        }
-        else
-        {
-            // Sinon on affiche le formulaire de demande avec le message d'erreur SQL
-            header('Location: fiche.php?id='.$_GET['id'].'&error=SQL_Create&msg='.$cp->error);
-            exit;
-        }
-
-    }
-
-}
-
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$cp = new Holiday($db);
-
-$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
-
-llxHeader(array(),$langs->trans('CPTitreMenu'));
-
-if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create')
-{
-    // Si l'utilisateur n'a pas le droit de faire une demande
-    if (($userid == $user->id && empty($user->rights->holiday->write)) || ($userid != $user->id && empty($user->rights->holiday->write_all)))
-    {
-        $errors[]=$langs->trans('CantCreateCP');
-    }
-    else
-    {
-        // Formulaire de demande de congés payés
-        print_fiche_titre($langs->trans('MenuAddCP'));
-
-        // Si il y a une erreur
-        if (GETPOST('error')) {
-
-            switch(GETPOST('error')) {
-                case 'datefin' :
-                    $errors[] = $langs->trans('ErrorEndDateCP');
-                    break;
-                case 'SQL_Create' :
-                    $errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
-                    break;
-                case 'CantCreate' :
-                    $errors[] = $langs->trans('CantCreateCP');
-                    break;
-                case 'Valideur' :
-                    $errors[] = $langs->trans('InvalidValidatorCP');
-                    break;
-                case 'nodatedebut' :
-                    $errors[] = $langs->trans('NoDateDebut');
-                    break;
-                case 'nodatefin' :
-                    $errors[] = $langs->trans('NoDateFin');
-                    break;
-                case 'DureeHoliday' :
-                    $errors[] = $langs->trans('ErrorDureeCP');
-                    break;
-                case 'alreadyCP' :
-                    $errors[] = $langs->trans('alreadyCPexist');
-                    break;
-            }
-
-            dol_htmloutput_mesg('',$errors,'error');
-        }
-
-
-        $delayForRequest = $cp->getConfCP('delayForRequest');
-        //$delayForRequest = $delayForRequest * (60*60*24);
-
-        $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
-
-		print '<script type="text/javascript">
-	    function valider()
-	    {
-    	    if(document.demandeCP.date_debut_.value != "")
-    	    {
-	           	if(document.demandeCP.date_fin_.value != "")
-	           	{
-	               if(document.demandeCP.valideur.value != "-1") {
-	                 return true;
-	               }
-	               else {
-	                 alert("'.dol_escape_js($langs->transnoentities('InvalidValidatorCP')).'");
-	                 return false;
-	               }
-	            }
-	            else
-	            {
-	              alert("'.dol_escape_js($langs->transnoentities('NoDateFin')).'");
-	              return false;
-	            }
-	        }
-	        else
-	        {
-	           alert("'.dol_escape_js($langs->transnoentities('NoDateDebut')).'");
-	           return false;
-	        }
-       	}
-       </script>'."\n";
-
-        // Formulaire de demande
-        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
-        print '<input type="hidden" name="action" value="create" />'."\n";
-        print '<input type="hidden" name="userID" value="'.$userid.'" />'."\n";
-        print '<div class="tabBar">';
-        print '<span>'.$langs->trans('DelayToRequestCP',$cp->getConfCP('delayForRequest')).'</span><br /><br />';
-
-        print '<table class="border" width="100%">';
-        print '<tbody>';
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
-        print '<td>';
-        if (empty($user->rights->holiday->write_all))
-        {
-        	print $form->select_users($userid,'useridbis',0,'',1);
-        	print '<input type="hidden" name="userid" value="'.$userid.'">';
-        }
-        else print $form->select_users(GETPOST('userid')?GETPOST('userid'):$user->id,'userid',0,'',0);
-        $nb_holiday = $cp->getCPforUser($user->id) / $cp->getConfCP('nbHolidayDeducted');
-        print ' &nbsp; <span>'.$langs->trans('SoldeCPUser', round($nb_holiday,0)).'</span>';
-        print '</td>';
-        print '</tr>';
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("DateDebCP").' ('.$langs->trans("FirstDayOfHoliday").')</td>';
-        print '<td>';
-        // Si la demande ne vient pas de l'agenda
-        if(!isset($_GET['datep'])) {
-            $form->select_date(-1,'date_debut_');
-        } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('datepmonth'), GETPOST('datepday'), GETPOST('datepyear'));
-            $form->select_date($tmpdate,'date_debut_');
-        }
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):'morning'));
-        print '</td>';
-        print '</tr>';
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("DateFinCP").' ('.$langs->trans("LastDayOfHoliday").')</td>';
-        print '<td>';
-        // Si la demande ne vient pas de l'agenda
-        if(!isset($_GET['datep'])) {
-            $form->select_date(-1,'date_fin_');
-        } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('datefmonth'), GETPOST('datefday'), GETPOST('datefyear'));
-            $form->select_date($tmpdate,'date_fin_');
-        }
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):'afternoon'));
-        print '</td>';
-        print '</tr>';
-
-        // Approved by
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
-        // Liste des utiliseurs du groupe choisi dans la config
-        $validator = new UserGroup($db);
-        $excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
-        $valideurobjects = $validator->listUsersForGroup($excludefilter);
-        $valideurarray = array();
-        foreach($valideurobjects as $val) $valideurarray[$val->id]=$val->id;
-        print '<td>';
-        print $form->select_dolusers($user->fk_user, "valideur", 1, "", 0, $valideurarray);	// By default, hierarchical parent
-        print '</td>';
-        print '</tr>';
-
-        // Description
-        print '<tr>';
-        print '<td>'.$langs->trans("DescCP").'</td>';
-        print '<td>';
-        print '<textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70"></textarea>';
-        print '</td>';
-        print '</tr>';
-
-        print '</tbody>';
-        print '</table>';
-        print '<div style="clear: both;"></div>';
-        print '</div>';
-        print '</from>'."\n";
-
-        print '<center>';
-        print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
-        print '&nbsp; &nbsp; ';
-        print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)">';
-        print '</center>';
-    }
-
-}
-else
-{
-    if ($error)
-    {
-        print '<div class="tabBar">';
-        print $error;
-        print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-        print '</div>';
-    }
-    else
-    {
-        // Affichage de la fiche d'une demande de congés payés
-        if ($id > 0)
-        {
-            $cp->fetch($id);
-
-			$canedit=(($user->id == $cp->fk_user && $user->rights->holiday->write) || ($user->id != $cp->fk_user && $user->rights->holiday->write_all));
-
-            $valideur = new User($db);
-            $valideur->fetch($cp->fk_validator);
-
-            $userRequest = new User($db);
-            $userRequest->fetch($cp->fk_user);
-
-            //print_fiche_titre($langs->trans('TitreRequestCP'));
-
-            // Si il y a une erreur
-            if (GETPOST('error'))
-            {
-                switch(GETPOST('error'))
-                {
-                    case 'datefin' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
-                        break;
-                    case 'SQL_Create' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
-                        break;
-                    case 'CantCreate' :
-                        $errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
-                        break;
-                    case 'Valideur' :
-                        $errors[] = $langs->transnoentitiesnoconv('InvalidValidatorCP');
-                        break;
-                    case 'nodatedebut' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoDateDebut');
-                        break;
-                    case 'nodatefin' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoDateFin');
-                        break;
-                    case 'DureeHoliday' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorDureeCP');
-                        break;
-                    case 'NoMotifRefuse' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
-                        break;
-                    case 'mail' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
-                        break;
-                }
-
-                dol_htmloutput_mesg('',$errors,'error');
-            }
-
-            // On vérifie si l'utilisateur à le droit de lire cette demande
-            if ($canedit)
-            {
-                if ($action == 'delete')
-                {
-                    if($user->rights->holiday->delete)
-                    {
-                        print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleDeleteCP"),$langs->trans("ConfirmDeleteCP"),"confirm_delete", '', 0, 1);
-                    }
-                }
-
-                // Si envoi en validation
-                if ($action == 'sendToValidate' && $cp->statut == 1 && $user->id == $cp->fk_user)
-                {
-                    print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleToValidCP"),$langs->trans("ConfirmToValidCP"),"confirm_send", '', 1, 1);
-                }
-
-                // Si validation de la demande
-                if ($action == 'valid')
-                {
-                    print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleValidCP"),$langs->trans("ConfirmValidCP"),"confirm_valid", '', 1, 1);
-                }
-
-                // Si refus de la demande
-                if ($action == 'refuse')
-                {
-                    $array_input = array(array('type'=>"text",'label'=> $langs->trans('DetailRefusCP'),'name'=>"detail_refuse",'size'=>"50",'value'=>""));
-                    print $form->formconfirm("fiche.php?id=".$id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
-                }
-
-                // Si annulation de la demande
-                if ($action == 'cancel')
-                {
-                    print $form->formconfirm("fiche.php?id=".$id,$langs->trans("TitleCancelCP"),$langs->trans("ConfirmCancelCP"),"confirm_cancel", '', 1, 1);
-                }
-
-                $head=holiday_prepare_head($cp);
-
-                dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
-
-                if ($action == 'edit' && $cp->statut == 1)
-                {
-                    $edit = true;
-                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$_GET['id'].'">'."\n";
-                    print '<input type="hidden" name="action" value="update"/>'."\n";
-                    print '<input type="hidden" name="holiday_id" value="'.$_GET['id'].'" />'."\n";
-                }
-
-                print '<table class="border" width="100%">';
-                print '<tbody>';
-
-                $linkback='';
-
-                print '<tr>';
-                print '<td width="25%">'.$langs->trans("Ref").'</td>';
-                print '<td>';
-                print $form->showrefnav($cp, 'id', $linkback, 1, 'rowid', 'ref');
-                print '</td>';
-                print '</tr>';
-
-                print '<td>'.$langs->trans("User").'</td>';
-        		print '<td>';
-        		print $userRequest->getNomUrl(1);
-        		print '</td></tr>';
-
-			    $starthalfday=($cp->halfday == -1 || $cp->halfday == 2)?'afternoon':'morning';
-			    $endhalfday=($cp->halfday == 1 || $cp->halfday == 2)?'morning':'afternoon';
-
-                if(!$edit)
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
-                    print '<td>'.dol_print_date($cp->date_debut,'day');
-			        print ' &nbsp; &nbsp; ';
-                    print $langs->trans($listhalfday[$starthalfday]);
-                    print '</td>';
-                    print '</tr>';
-                }
-                else
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
-                    print '<td>';
-                    $form->select_date($cp->date_debut,'date_debut_');
-			        print ' &nbsp; &nbsp; ';
-        			print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday')?GETPOST('starthalfday'):$starthalfday));
-                    print '</td>';
-                    print '</tr>';
-                }
-
-                if (!$edit)
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
-                    print '<td>'.dol_print_date($cp->date_fin,'day');
-                    print ' &nbsp; &nbsp; ';
-                    print $langs->trans($listhalfday[$endhalfday]);
-                    print '</td>';
-                    print '</tr>';
-                }
-                else
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
-                    print '<td>';
-                    $form->select_date($cp->date_fin,'date_fin_');
-			        print ' &nbsp; &nbsp; ';
-        			print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday')?GETPOST('endhalfday'):$endhalfday));
-                    print '</td>';
-                    print '</tr>';
-                }
-                print '<tr>';
-                print '<td>'.$langs->trans('NbUseDaysCP').'</td>';
-                print '<td>'.num_open_day($cp->date_debut_gmt, $cp->date_fin_gmt, 0, 1, $cp->halfday).'</td>';
-                print '</tr>';
-
-                // Status
-                print '<tr>';
-                print '<td>'.$langs->trans('StatutCP').'</td>';
-                print '<td>'.$cp->getLibStatut(2).'</td>';
-                print '</tr>';
-                if ($cp->statut == 5)
-                {
-                	print '<tr>';
-                	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
-                	print '<td>'.$cp->detail_refuse.'</td>';
-                	print '</tr>';
-                }
-
-                // Description
-                if (!$edit)
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DescCP').'</td>';
-                    print '<td>'.nl2br($cp->description).'</td>';
-                    print '</tr>';
-                }
-                else
-                {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DescCP').'</td>';
-                    print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$cp->description.'</textarea></td>';
-                    print '</tr>';
-                }
-                print '</tbody>';
-                print '</table>'."\n";
-
-                print '<br><br>';
-
-				// Info workflow
-                print '<table class="border" width="50%">'."\n";
-                print '<tbody>';
-                print '<tr class="liste_titre">';
-                print '<td colspan="2">'.$langs->trans("InfosWorkflowCP").'</td>';
-                print '</tr>';
-
-                if (! empty($cp->fk_user_create))
-                {
-                	$userCreate=new User($db);
-                	$userCreate->fetch($cp->fk_user_create);
-	                print '<tr>';
-	                print '<td>'.$langs->trans('RequestByCP').'</td>';
-	                print '<td>'.$userCreate->getNomUrl(1).'</td>';
-	                print '</tr>';
-                }
-
-                if (!$edit) {
-                    print '<tr>';
-                    print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
-                    print '<td>'.$valideur->getNomUrl(1).'</td>';
-                    print '</tr>';
-                } else {
-                    print '<tr>';
-                    print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
-                    // Liste des utiliseurs du groupes choisi dans la config
-                    $idGroupValid = $cp->getConfCP('userGroup');
-
-                    $validator = new UserGroup($db,$idGroupValid);
-                    $valideur = $validator->listUsersForGroup('',1);
-
-                    print '<td>';
-                    $form->select_users($cp->fk_validator,"valideur",1,"",0,$valideur,'');
-                    print '</td>';
-                    print '</tr>';
-                }
-
-                print '<tr>';
-                print '<td>'.$langs->trans('DateCreateCP').'</td>';
-                print '<td>'.dol_print_date($cp->date_create,'dayhour').'</td>';
-                print '</tr>';
-                if($cp->statut == 3) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateValidCP').'</td>';
-                    print '<td>'.dol_print_date($cp->date_valid,'dayhour').'</td>';
-                    print '</tr>';
-                }
-                if($cp->statut == 4) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateCancelCP').'</td>';
-                    print '<td>'.dol_print_date($cp->date_cancel,'dayhour').'</td>';
-                    print '</tr>';
-                }
-                if($cp->statut == 5) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateRefusCP').'</td>';
-                    print '<td>'.dol_print_date($cp->date_refuse,'dayhour').'</td>';
-                    print '</tr>';
-                }
-                print '</tbody>';
-                print '</table>';
-
-                if ($action == 'edit' && $cp->statut == 1)
-                {
-                    print '<br><div align="center">';
-                    if ($canedit && $cp->statut == 1)
-                    {
-                        print '<input type="submit" value="'.$langs->trans("UpdateButtonCP").'" class="button">';
-                    }
-                    print '</div>';
-
-                    print '</form>';
-                }
-
-                dol_fiche_end();
-
-                if (! $edit)
-                {
-		            print '<div class="tabsAction">';
-
-                    // Boutons d'actions
-                    if ($canedit && $cp->statut == 1)
-                    {
-                        print '<a href="fiche.php?id='.$_GET['id'].'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
-                    }
-                    if ($canedit && $cp->statut == 1)
-                    {
-                        print '<a href="fiche.php?id='.$_GET['id'].'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
-                    }
-                    if ($user->rights->holiday->delete && $cp->statut == 1)	// If draft
-                    {
-                    	print '<a href="fiche.php?id='.$_GET['id'].'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
-                    }
-
-                    if ($user->id == $cp->fk_validator && $cp->statut == 2)
-                    {
-                        print '<a href="fiche.php?id='.$_GET['id'].'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
-                        print '<a href="fiche.php?id='.$_GET['id'].'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
-                    }
-
-                    if (($user->id == $cp->fk_validator || $user->id == $cp->fk_user) && ($cp->statut == 2 || $cp->statut == 3))	// Status validated or approved
-                    {
-                    	if (($cp->date_debut > dol_now()) || $user->admin) print '<a href="fiche.php?id='.$_GET['id'].'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
-                    	else print '<a href="#" class="butActionRefused" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
-                    }
-
-                    print '</div>';
-                }
-
-            } else {
-                print '<div class="tabBar">';
-                print $langs->trans('ErrorUserViewCP');
-                print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-                print '</div>';
-            }
-
-        } else {
-            print '<div class="tabBar">';
-            print $langs->trans('ErrorIDFicheCP');
-            print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-            print '</div>';
-        }
-
-    }
-
-}
-
-// End of page
-llxFooter();
-
-if (is_object($db)) $db->close();
diff --git a/htdocs/holiday/img/add.png b/htdocs/holiday/img/add.png
new file mode 100755
index 00000000000..d15cb50d835
Binary files /dev/null and b/htdocs/holiday/img/add.png differ
diff --git a/htdocs/holiday/img/delete.png b/htdocs/holiday/img/delete.png
new file mode 100755
index 00000000000..e22ed6f43fc
Binary files /dev/null and b/htdocs/holiday/img/delete.png differ
diff --git a/htdocs/holiday/img/edit.png b/htdocs/holiday/img/edit.png
new file mode 100755
index 00000000000..c74571fde8a
Binary files /dev/null and b/htdocs/holiday/img/edit.png differ
diff --git a/htdocs/holiday/img/index.html b/htdocs/holiday/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index 26f413a4e43..86c4eca49eb 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -64,6 +64,19 @@ $search_employe  = GETPOST('search_employe');
 $search_valideur = GETPOST('search_valideur');
 $search_statut   = GETPOST('select_statut');
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
+{
+	$search_ref="";
+	$month_create="";
+	$year_create="";
+    $month_start="";
+	$year_start="";
+	$month_end="";
+	$year_end="";
+	$search_employe="";
+	$search_valideur="";
+	$search_statut="";
+}
 
 /*
  * Actions
@@ -71,8 +84,6 @@ $search_statut   = GETPOST('select_statut');
 
 // None
 
-
-
 /*
  * View
  */
@@ -257,7 +268,7 @@ print_liste_field_titre($langs->trans("Employe"),$_SERVER["PHP_SELF"],"cp.fk_use
 print_liste_field_titre($langs->trans("ValidatorCP"),$_SERVER["PHP_SELF"],"cp.fk_validator","",'','',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder);
-print_liste_field_titre($langs->trans("Duration"));
+print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="center"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder);
 print '<td></td>';
 print "</tr>\n";
@@ -323,7 +334,8 @@ print '</td>';
 
 // ACTION
 print '<td align="right">';
-print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" alt="'.$langs->trans('Search').'">';
+print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 print '</td>';
 
 print "</tr>\n";
@@ -386,7 +398,7 @@ if ($user_id == $user->id)
 {
 	print '<br>';
 	print '<div style="float: right; margin-top: 8px;">';
-	print '<a href="./fiche.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>';
+	print '<a href="./card.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>';
 	print '</div>';
 }
 
diff --git a/htdocs/holiday/tomergewithdefine_holiday.php b/htdocs/holiday/tomergewithdefine_holiday.php
new file mode 100644
index 00000000000..46dde3028a4
--- /dev/null
+++ b/htdocs/holiday/tomergewithdefine_holiday.php
@@ -0,0 +1,125 @@
+<?php
+/* Copyright (C) 2007-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2011      Dimitri Mouillard <dmouillard@teclib.com>
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ *      \file       define_congespayes.php
+ *      \ingroup    congespayes
+ *      \brief      File that defines the balance of paid leave of users.
+ *      \version    $Id: define_congespayes.php,v 1.00 2011/09/15 11:00:00 dmouillard Exp $
+ *      \author      dmouillard@teclib.com <Dimitri Mouillard>
+ *      \remarks      File that defines the balance of paid leave of users.
+ */
+
+require('../main.inc.php');
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+
+// Protection if external user
+if ($user->societe_id > 0) accessforbidden();
+
+// If the user does not have perm to read the page
+if(!$user->rights->holiday->define_holiday) accessforbidden();
+
+
+/*
+ * View
+ */
+
+llxHeader(array(),$langs->trans('CPTitreMenu'));
+
+
+print_fiche_titre($langs->trans('MenuConfCP'));
+
+$congespayes = new Holiday($db);
+$listUsers = $congespayes->fetchUsers(false, true);
+
+// Si il y a une action de mise à jour
+if (isset($_POST['action']) && $_POST['action'] == 'update') {
+
+   $fk_type = $_POST['fk_type'];
+
+   foreach ($_POST['nb_conges'] as $user_id => $compteur) {
+      if (!empty($compteur)) {
+         $userValue = str_replace(',', '.', $compteur);
+         $userValue = number_format($userValue, 2, '.', '');
+      } else {
+         $userValue = '0.00';
+      }
+      $congespayes->updateSoldeCP($user_id,$userValue,$fk_type);
+   }
+
+   print '<div class="tabBar">';
+   print $langs->trans('UpdateConfCPOK');
+   print '</div>';
+
+}
+
+$var = true;
+$i = 0;
+
+foreach($congespayes->getTypes() as $type)
+{
+   if($type['affect']==1)
+   {
+      print '<div class="tabBar" style="float:left;width:300px;margin-right:10px;">';
+
+         print '<h3>'.$type['label'].'</h3>';
+
+         print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">' . "\n";
+         print '<input type="hidden" name="action" value="update" />';
+         print '<input type="hidden" name="fk_type" value="'.$type['rowid'].'" />';
+
+         print '<table class="noborder" width="100%;">';
+            print "<tr class=\"liste_titre\">";
+               print '<td width="50%">' . $langs->trans('Employee') . '</td>';
+               print '<td width="30%">' . $langs->trans('Counter') . '</td>';
+            print '</tr>';
+
+         foreach ($listUsers as $users) {
+            $var = !$var;
+            print '<tr ' . $bc[$var] . '>';
+               print '<td>' . $users['name'] . ' ' . $users['firstname'] . '</td>';
+               print '<td>';
+               print '<input type="text" value="' .
+                              $congespayes->getCPforUser($users['rowid'],$type['rowid']) .
+                           '" name="nb_conges[' . $users['rowid'] . ']"
+                           size="5" style="text-align: center;"/>';
+               print ' jours</td>' . "\n";
+            print '</tr>';
+
+            $i++;
+         }
+
+         echo "<tr>";
+            print '<td colspan="2"><input type="submit" value="'
+                           . $langs->trans("UpdateEventOptionCP") .
+                           ' ' . $type['label'] .
+                           '" name="bouton" class="button" style="margin: 10px;"></td>';
+         echo "</tr>";
+
+         print '</table>';
+         print '</form>';
+
+      print '</div>';
+   }
+}
+
+// Fin de page
+$db->close();
+llxFooter();
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index dba8969adca..5f18a524acc 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -26,6 +26,7 @@
 require('../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
@@ -33,6 +34,12 @@ if ($user->societe_id > 0) accessforbidden();
 // Si l'utilisateur n'a pas le droit de lire cette page
 if(!$user->rights->holiday->view_log) accessforbidden();
 
+$year=GETPOST('year');
+if (empty($year))
+{
+	$tmpdate=dol_getdate(dol_now());
+	$year=$tmpdate['year'];
+}
 
 
 /*
@@ -41,14 +48,14 @@ if(!$user->rights->holiday->view_log) accessforbidden();
 
 $langs->load('users');
 
-llxHeader(array(),$langs->trans('CPTitreMenu'));
+llxHeader(array(),$langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
 
 
 $cp = new Holiday($db);
 // Recent changes are more important than old changes
-$log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC','');
+$log_holiday = $cp->fetchLog('ORDER BY cpl.rowid DESC', " AND date_action BETWEEN '".$db->idate(dol_get_first_day($year,1,1))."' AND '".$db->idate(dol_get_last_day($year,12,1))."'");	// Load $cp->logs
 
-print_fiche_titre($langs->trans('LogCP'));
+print_fiche_titre($langs->trans('LogCP'),'<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'">'.img_previous().'</a> '.$langs->trans("Year").':'.$year.' <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'">'.img_next().'</a>');
 
 print '<table class="noborder" width="100%">';
 print '<tbody>';
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index b1fa3552d9a..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
 {
@@ -233,7 +232,7 @@ class Import
 		$sql.= ')';
 		$sql.= " VALUES (".($user->id > 0 ? $user->id : 0).", '".$this->db->escape($this->model_name)."', '".$this->datatoimport."', '".$this->hexa."')";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -244,7 +243,6 @@ class Import
 		{
 			$this->error=$this->db->lasterror();
 			$this->errno=$this->db->lasterrno();
-			dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -262,7 +260,7 @@ class Import
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'import_model as em';
 		$sql.= ' WHERE em.rowid = '.$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -306,7 +304,7 @@ class Import
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -314,12 +312,12 @@ class Import
 		{
 			if (! $notrigger)
 			{
-				// Call triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('IMPORT_DELETE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// End call triggers
+				/* 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++;
+                // End call triggers
+                 */
 			}
 		}
 
diff --git a/htdocs/imports/class/index.html b/htdocs/imports/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index f40bcd3e061..125b8dc0285 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -138,11 +138,11 @@ if ($action == 'builddoc')
 	$result=$objimport->build_file($user, GETPOST('model','alpha'), $datatoimport, $array_match_file_to_database);
 	if ($result < 0)
 	{
-		$mesg='<div class="error">'.$objimport->error.'</div>';
+		setEventMessage($objimport->error, 'errors');
 	}
 	else
 	{
-		$mesg='<div class="ok">'.$langs->trans("FileSuccessfullyBuilt").'</div>';
+		setEventMessage($langs->trans("FileSuccessfullyBuilt"));
 	}
 }
 
@@ -175,21 +175,23 @@ if ($action == 'add_import_model')
 		$result = $objimport->create($user);
 		if ($result >= 0)
 		{
-			$mesg='<div class="ok">'.$langs->trans("ImportModelSaved",$objimport->model_name).'</div>';
+			setEventMessage($langs->trans("ImportModelSaved",$objimport->model_name));
 		}
 		else
 		{
 			$langs->load("errors");
 			if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
-				$mesg='<div class="error">'.$langs->trans("ErrorImportDuplicateProfil").'</div>';
+				setEventMessage($langs->trans("ErrorImportDuplicateProfil"), 'errors');
+			}
+			else {
+				setEventMessage($objimport->error, 'errors');
 			}
-			else $mesg='<div class="error">'.$objimport->error.'</div>';
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("ImportModelName")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("ImportModelName")), 'errors');
 	}
 }
 
@@ -385,8 +387,6 @@ if ($step == 1 || ! $datatoimport)
 
     dol_fiche_end();
 
-	if ($mesg) print $mesg;
-
 }
 
 
@@ -461,7 +461,6 @@ if ($step == 2 && $datatoimport)
 
     dol_fiche_end();
 
-	if ($mesg) print $mesg;
 }
 
 
@@ -597,10 +596,7 @@ if ($step == 3 && $datatoimport)
 
 	print '</table></form>';
 
-
     dol_fiche_end();
-
-	if ($mesg) print $mesg;
 }
 
 
@@ -1010,9 +1006,6 @@ if ($step == 4 && $datatoimport)
         print '</script>'."\n";
 	}
 
-
-	if ($mesg) print $mesg;
-
 	/*
 	 * Barre d'action
 	 */
@@ -1438,8 +1431,6 @@ if ($step == 5 && $datatoimport)
         }
         print '</center>';
     }
-
-    if ($mesg) print $mesg;
 }
 
 
@@ -1679,8 +1670,6 @@ if ($step == 6 && $datatoimport)
 	print $langs->trans("FileWasImported",$importid).'<br>';
 	print $langs->trans("YouCanUseImportIdToFindRecord",$importid).'<br>';
 	print '</center>';
-
-	if ($mesg) print $mesg;
 }
 
 
diff --git a/htdocs/includes/adodbtime/index.html b/htdocs/includes/adodbtime/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/includes/adodbtime/index.php b/htdocs/includes/adodbtime/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/includes/adodbtime/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/includes/index.html b/htdocs/includes/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/includes/index.php b/htdocs/includes/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/includes/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt b/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
deleted file mode 100644
index 1076f8b4b2b..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009 Michael Aufreiter, http://www.quasipartikel.at
-
-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/multiselect/css/ui.multiselect.css b/htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
deleted file mode 100644
index 7d3a44801d2..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/css/ui.multiselect.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Multiselect
-----------------------------------*/
-
-.ui-multiselect { border: solid 1px; font-size: 0.8em; }
-.ui-multiselect ul { -moz-user-select: none; }
-.ui-multiselect li { margin: 0; padding: 0; cursor: default; line-height: 20px; height: 20px; font-size: 11px; list-style: none; padding-right: 18px; overflow: hidden; }
-.ui-multiselect li a { color: #999; text-decoration: none; padding: 0; display: block; float: left; cursor: pointer;}
-.ui-multiselect li.ui-draggable-dragging { padding-left: 10px; }
-
-.ui-multiselect div.selected { position: relative; padding: 0; margin: 0; border: 0; float:left; }
-.ui-multiselect ul.selected { position: relative; padding: 0; overflow: auto; overflow-x: hidden; background: #fff; margin: 0; list-style: none; border: 0; position: relative; width: 100%; }
-
-.ui-multiselect div.available { position: relative; padding: 0; margin: 0; border: 0; float:left; }
-.ui-multiselect ul.available { position: relative; padding: 0; overflow: auto; overflow-x: hidden; background: #fff; margin: 0; list-style: none; border: 0; width: 100%; }
-.ui-multiselect ul.available li { padding-left: 10px; }
-
-.ui-multiselect div.right-column { border-left: 1px solid; }
-
-.ui-multiselect .ui-state-default { border: none; margin-bottom: 1px; position: relative; padding-left: 20px;}
-.ui-multiselect .ui-state-hover { border: none; }
-.ui-multiselect .ui-widget-header {border: none; font-size: 11px; margin-bottom: 1px;}
-
-.ui-multiselect .add-all { float: right; padding: 7px;}
-.ui-multiselect .remove-all { float: right; padding: 7px;}
-.ui-multiselect .search { float: left; padding: 4px;}
-.ui-multiselect .count { float: left; padding: 7px;}
-
-.ui-multiselect li span.ui-icon-arrowthick-2-n-s { position: absolute; left: 2px; }
-.ui-multiselect li a.action { position: absolute; right: 2px; top: 2px; }
-
-.ui-multiselect input.search { height: 14px; padding: 1px; opacity: 0.5; margin: 4px; width: 100px; }
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js b/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
deleted file mode 100644
index eb4578fc782..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/js/ui.multiselect.js
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * jQuery UI Multiselect
- *
- * Authors:
- *  Michael Aufreiter (quasipartikel.at)
- *  Yanick Rochon (yanick.rochon[at]gmail[dot]com)
- *
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://www.quasipartikel.at/multiselect/
- *
- *
- * Depends:
- *	ui.core.js
- *	ui.sortable.js
- *
- * Optional:
- * localization (http://plugins.jquery.com/project/localisation)
- * scrollTo (http://plugins.jquery.com/project/ScrollTo)
- *
- * Todo:
- *  Make batch actions faster
- *  Implement dynamic insertion through remote calls
- */
-
-
-(function($) {
-
-$.widget("ui.multiselect", {
-  options: {
-		sortable: true,
-		dragToAdd: true,
-		searchable: true,
-		doubleClickable: true,
-		animated: 'fast',
-		show: 'slideDown',
-		hide: 'slideUp',
-		dividerLocation: 0.6,
-		selectedContainerOnLeft: true,
-		width: null,
-		height: null,
-		nodeComparator: function(node1,node2) {
-			var text1 = node1.text(),
-			    text2 = node2.text();
-			return text1 == text2 ? 0 : (text1 < text2 ? -1 : 1);
-		},
-		includeRemoveAll: true,
-		includeAddAll: true,
-		pressEnterKeyToAddAll: false
-	},
-	_create: function() {
-		this.element.hide();
-		this.id = this.element.attr("id");
-		this.container = $('<div class="ui-multiselect ui-helper-clearfix ui-widget"></div>').insertAfter(this.element);
-		this.count = 0; // number of currently selected options
-		this.selectedContainer = $('<div class="selected"></div>');
-		if (this.options.selectedContainerOnLeft) {
-			this.selectedContainer.appendTo(this.container);
-			this.availableContainer = $('<div class="available"></div>').appendTo(this.container);
-			this.availableContainer.addClass('right-column');
-		}
-		else
-		{
-			this.availableContainer = $('<div class="available"></div>').appendTo(this.container);
-			this.selectedContainer.appendTo(this.container);
-			this.selectedContainer.addClass('right-column');
-		}
-		this.selectedActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><span class="count">0 '+$.ui.multiselect.locale.itemsCount+'</span>'+(this.options.includeRemoveAll?'<a href="#" class="remove-all">'+$.ui.multiselect.locale.removeAll+'</a>':'<span class="remove-all">&nbsp;</span>')+'</div>').appendTo(this.selectedContainer);
-		this.availableActions = $('<div class="actions ui-widget-header ui-helper-clearfix"><input type="text" class="search empty ui-widget-content ui-corner-all"/>'+(this.options.includeAddAll?'<a href="#" class="add-all">'+$.ui.multiselect.locale.addAll+'</a>':'<span class="add-all">&nbsp;</span>')+'</div>').appendTo(this.availableContainer);
-		this.selectedList = $('<ul class="selected connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.selectedContainer);
-		this.availableList = $('<ul class="available connected-list"><li class="ui-helper-hidden-accessible"></li></ul>').bind('selectstart', function(){return false;}).appendTo(this.availableContainer);
-
-		var that = this;
-
-		var width = this.options.width;
-		if (!width) {
-			width = this.element.width();
-		}
-		var height = this.options.height;
-		if (!height) {
-			height = this.element.height();
-		}
-
-		// set dimensions
-		this.container.width(width-2);
-		if (this.options.selectedContainerOnLeft) {
-			this.selectedContainer.width(Math.floor(width*this.options.dividerLocation)-1);
-			this.availableContainer.width(Math.floor(width*(1-this.options.dividerLocation))-2);
-		}
-		else
-		{
-			this.selectedContainer.width(Math.floor(width*this.options.dividerLocation)-2);
-			this.availableContainer.width(Math.floor(width*(1-this.options.dividerLocation))-1);
-		}
-
-		// fix list height to match <option> depending on their individual header's heights
-		this.selectedList.height(Math.max(height-this.selectedActions.height(),1));
-		this.availableList.height(Math.max(height-this.availableActions.height(),1));
-
-		if ( !this.options.animated ) {
-			this.options.show = 'show';
-			this.options.hide = 'hide';
-		}
-
-		// init lists
-		this._populateLists(this.element.find('option'));
-
-		// make selection sortable
-		if (this.options.sortable) {
-			this.selectedList.sortable({
-				placeholder: 'ui-state-highlight',
-				axis: 'y',
-				update: function(event, ui) {
-					// apply the new sort order to the original selectbox
-					that.selectedList.find('li').each(function() {
-						if ($(this).data('optionLink'))
-							$(this).data('optionLink').remove().appendTo(that.element);
-					});
-				},
-				beforeStop: function (event, ui) {
-					// This lets us recognize which item was just added to
-					// the list in receive, per the workaround for not being
-					// able to reference the new element.
-					ui.item.addClass('dropped');
-				},
-				receive: function(event, ui) {
-					ui.item.data('optionLink').attr('selected', true);
-					// increment count
-					that.count += 1;
-					that._updateCount();
-					// workaround, because there's no way to reference
-					// the new element, see http://dev.jqueryui.com/ticket/4303
-					that.selectedList.children('.dropped').each(function() {
-						$(this).removeClass('dropped');
-						$(this).data('optionLink', ui.item.data('optionLink'));
-						$(this).data('idx', ui.item.data('idx'));
-						that._applyItemState($(this), true);
-					});
-
-					// workaround according to http://dev.jqueryui.com/ticket/4088
-					setTimeout(function() { ui.item.remove(); }, 1);
-				},
-				stop: function (event, ui) { that.element.change(); }
-			});
-		}
-
-		// set up livesearch
-		if (this.options.searchable) {
-			this._registerSearchEvents(this.availableContainer.find('input.search'));
-		} else {
-			$('.search').hide();
-		}
-
-		// batch actions
-		this.container.find(".remove-all").click(function() {
-			that._populateLists(that.element.find('option').removeAttr('selected'));
-			that.element.trigger('change');
-			return false;
-		});
-
-		this.container.find(".add-all").click(function() {
-			var options = that.element.find('option').not(":selected");
-			if (that.availableList.children('li:hidden').length > 1) {
-				that.availableList.children('li').each(function(i) {
-					if ($(this).is(":visible")) $(options[i-1]).attr('selected', 'selected');
-				});
-			} else {
-				options.attr('selected', 'selected');
-			}
-			that._populateLists(that.element.find('option'));
-			that.element.trigger('change');
-			if (that.options.pressEnterKeyToAddAll) {
-                    //clear input after add all
-                    $('input.search').val("");
-                }
-			
-			return false;
-		});
-	},
-	destroy: function() {
-		this.element.show();
-		this.container.remove();
-
-		$.Widget.prototype.destroy.apply(this, arguments);
-	},
-	addOption: function(option) {
-		// Append the option
-		option = $(option);
-		var select = this.element;
-		select.append(option);
-
-		var item = this._getOptionNode(option).appendTo(option.attr('selected') ? this.selectedList : this.availableList).show();
-
-		if (option.attr('selected')) {
-			this.count += 1;
-		}
-		this._applyItemState(item, option.attr('selected'));
-		item.data('idx', this.count);
-
-		// update count
-		this._updateCount();
-		this._filter.apply(this.availableContainer.find('input.search'), [this.availableList]);
-	},
-    // Redisplay the lists of selected/available options.
-    // Call this after you've selected/unselected some options programmatically.
-    // GRIPE This is O(n) where n is the length of the list - seems like
-    // there must be a smarter way of doing this, but I have not been able
-    // to come up with one. I see no way to detect programmatic setting of
-    // the option's selected property, and without that, it seems like we
-    // can't have a general-case listener that does its thing every time an
-    // option is selected.
-    refresh: function() {
-		// Redisplay our lists.
-		this._populateLists(this.element.find('option'));
-    },
-	_populateLists: function(options) {
-		this.selectedList.children('.ui-element').remove();
-		this.availableList.children('.ui-element').remove();
-		this.count = 0;
-
-		var that = this;
-		var groups = $(this.element).find("optgroup").map(function(i) {
-			return that._getOptionGroup($(this));
-		});
-		groups.appendTo(this.selectedList.add(this.availableList));
-		
-		var items = $(options.map(function(i) {
-		  var item = that._getOptionNode(this).appendTo(that._getOptionList(this)).show();
-
-			if (this.selected) that.count += 1;
-			that._applyItemState(item, this.selected);
-			item.data('idx', i);
-			return item[0];
-    }));
-
-		// update count
-		this._updateCount();
-		that._filter.apply(this.availableContainer.find('input.search'), [that.availableList]);
-  },
-	_getOptionList: function(option) {
-		var selected = option.selected;
-		option = $(option);
-		var $list = selected ? this.selectedList : this.availableList;
-		var $group = option.closest("optgroup");
-		if ($group.length === 0) {
-			return $list;
-		} else {
-			var $groupList = $list.find("ul[title='" + $group.attr("label") + "']");
-			if ($groupList.length === 0) {
-				$groupList = $("<ul class='ui-state-default ui-element available' title='" + $group.attr("label") + "'>" + $group.attr("label") + "</ul>").appendTo($list);
-			}
-			$groupList.show();
-			return $groupList;
-		}
-	},
-	_getOptionGroup : function(optgroup) {
-		var groupNode = $("<ul class='ui-state-default ui-element available' title='" + optgroup.attr("label") + "'>" + optgroup.attr("label") + "</ul>").hide();
-		return groupNode[0];
-	},
-	_updateCount: function() {
-		this.selectedContainer.find('span.count').text(this.count+" "+$.ui.multiselect.locale.itemsCount);
-	},
-	_getOptionNode: function(option) {
-		option = $(option);
-		var node = $('<li class="ui-state-default ui-element" title="'+option.text()+'"><span class="ui-icon"/>'+option.text()+'<a href="#" class="action"><span class="ui-corner-all ui-icon"/></a></li>').hide();
-		node.data('optionLink', option);
-		return node;
-	},
-	// clones an item with associated data
-	// didn't find a smarter away around this
-	_cloneWithData: function(clonee) {
-		var clone = clonee.clone(false,false);
-		clone.data('optionLink', clonee.data('optionLink'));
-		clone.data('idx', clonee.data('idx'));
-		return clone;
-	},
-	_setSelected: function(item, selected) {
-		var temp = item.data('optionLink').attr('selected', selected);
-		var parent = temp.parent();
-		temp.detach().appendTo(parent);
-		this.element.trigger('change');
-
-		if (selected) {
-			var selectedItem = this._cloneWithData(item);
-			item[this.options.hide](this.options.animated, function() { 
-				if (item.siblings().length === 0) {
-					item.closest("ul[title]").hide();
-				}
-				$(this).remove(); 
-			});
-			// get group to add it to...
-			var $list = this._getOptionList(selectedItem.data("optionLink")[0]);
-			selectedItem.appendTo($list).hide()[this.options.show](this.options.animated);
-
-			this._applyItemState(selectedItem, true);
-			return selectedItem;
-		} else {
-
-			// look for successor based on initial option index
-			var items = this.availableList.find('li'), comparator = this.options.nodeComparator;
-			var succ = null, i = item.data('idx'), direction = comparator(item, $(items[i]));
-
-			// TODO: test needed for dynamic list populating
-			if ( direction ) {
-				while (i>=0 && i<items.length) {
-					direction > 0 ? i++ : i--;
-					if ( direction != comparator(item, $(items[i])) ) {
-						// going up, go back one item down, otherwise leave as is
-						succ = items[direction > 0 ? i : i+1];
-						var group1 = item.closest("ul[title]"),
-							group2 = $(succ).closest("ul[title]");
-						if (group1.length !== 0 && group2.length !== 0) {
-							if (group1.attr("title") !== group2.attr("title")) {
-								succ = null;
-							}
-						}
-						break;
-					}
-				}
-			} else {
-				succ = items[i];
-			}
-
-			var availableItem = this._cloneWithData(item);
-			var $list = this._getOptionList(availableItem.data("optionLink")[0]);
-			succ ? availableItem.insertBefore($(succ)) : availableItem.appendTo($list);
-			item[this.options.hide](this.options.animated, function() { 
-				if (item.siblings().length === 0) {
-					item.closest("ul[title]").hide();
-				}
-				$(this).remove(); 
-			});
-			availableItem.hide()[this.options.show](this.options.animated);
-
-			this._applyItemState(availableItem, false);
-			return availableItem;
-		}
-	},
-	_applyItemState: function(item, selected) {
-		if (selected) {
-			if (this.options.sortable)
-				item.children('span').addClass('ui-icon-arrowthick-2-n-s').removeClass('ui-helper-hidden').addClass('ui-icon');
-			else
-				item.children('span').removeClass('ui-icon-arrowthick-2-n-s').addClass('ui-helper-hidden').removeClass('ui-icon');
-			item.find('a.action span').addClass('ui-icon-minus').removeClass('ui-icon-plus');
-			this._registerRemoveEvents(item.find('a.action'));
-
-		} else {
-			item.children('span').removeClass('ui-icon-arrowthick-2-n-s').addClass('ui-helper-hidden').removeClass('ui-icon');
-			item.find('a.action span').addClass('ui-icon-plus').removeClass('ui-icon-minus');
-			this._registerAddEvents(item.find('a.action'));
-		}
-
-		this._registerDoubleClickEvents(item);
-		this._registerHoverEvents(item);
-	},
-	// taken from John Resig's liveUpdate script
-	_filter: function(list) {
-		var input = $(this);
-		var rows = list.find('li'),
-			cache = rows.map(function(){
-
-				return $(this).text().toLowerCase();
-			});
-
-		var term = $.trim(input.val().toLowerCase()), scores = [];
-
-		if (!term) {
-			rows.show();
-		} else {
-			rows.hide();
-
-			cache.each(function(i) {
-				if (this.indexOf(term)>-1) { scores.push(i); }
-			});
-
-			$.each(scores, function() {
-				$(rows[this]).show();
-			});
-		}
-	},
-	_registerDoubleClickEvents: function(elements) {
-		if (!this.options.doubleClickable) return;
-		elements.dblclick(function() {
-			elements.find('a.action').click();
-		});
-	},
-	_registerHoverEvents: function(elements) {
-		elements.removeClass('ui-state-hover');
-		elements.mouseover(function() {
-			$(this).addClass('ui-state-hover');
-		});
-		elements.mouseout(function() {
-			$(this).removeClass('ui-state-hover');
-		});
-	},
-	_registerAddEvents: function(elements) {
-		var that = this;
-		elements.click(function() {
-			var item = that._setSelected($(this).parent(), true);
-			that.count += 1;
-			that._updateCount();
-
-			// Prevent extra clicks from triggering bogus add events, if a user
-			// tries clicking during the removal process.
-			$(this).unbind('click');
-
-			return false;
-		});
-
-		// make draggable
-		if (this.options.sortable && this.options.dragToAdd) {
-  		elements.each(function() {
-  			$(this).parent().draggable({
-  	      connectToSortable: that.selectedList,
-  				helper: function() {
-  					var selectedItem = that._cloneWithData($(this)).width($(this).width() - 50);
-  					selectedItem.width($(this).width());
-  					return selectedItem;
-  				},
-  				appendTo: that.container,
-  				containment: that.container,
-  				revert: 'invalid'
-  	    });
-  		});
-		}
-	},
-	_registerRemoveEvents: function(elements) {
-		var that = this;
-		elements.click(function() {
-			that._setSelected($(this).parent(), false);
-			that.count -= 1;
-			that._updateCount();
-
-			// Prevent extra clicks from triggering bogus remove events, if a
-			// user tries clicking during the removal process.
-			$(this).unbind('click');
-
-			return false;
-		});
- 	},
-	_registerSearchEvents: function(input) {
-		var that = this;
-
-		input.focus(function() {
-			$(this).addClass('ui-state-active');
-		})
-		.blur(function() {
-			$(this).removeClass('ui-state-active');
-		})
-		.keypress(function(e) {
-			if (e.keyCode == 13) {
-				if (that.options.pressEnterKeyToAddAll) {
-		            //on Enter, if a filter is present add all, then clear the input
-		            var str = $('input.search').val();
-		            if (str !== undefined && str !== null && str !== "") {
-		                $('a.add-all').click();
-		                $('input.search').val("");
-		            }
-		        }
-				return false;
-			}
-		})
-		.keyup(function() {
-			that._filter.apply(this, [that.availableList]);
-		});
-	}
-});
-
-$.extend($.ui.multiselect, {
-	locale: {
-		addAll:'Add all',
-		removeAll:'Remove all',
-		itemsCount:'items selected'
-	}
-});
-
-
-})(jQuery);
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]**  &mdash; Check if the issue
+   has already been reported.
+2. **Check if the issue has been fixed**  &mdash; Try to reproduce the problem
+   using the code in the `master` branch.
+3. **Isolate the problem**  &mdash; 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..7590b822953
--- /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 = "<div class='select2-measure-scrollbar'></div>",
+
+    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("<span class='select2-match'>");
+        markup.push(escapeMarkup(text.substring(match, match + tl)));
+        markup.push("</span>");
+        markup.push(escapeMarkup(text.substring(match + tl, text.length)));
+    }
+
+    function defaultEscapeMarkup(markup) {
+        var replace_map = {
+            '\\': '&#92;',
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '&quot;',
+            "'": '&#39;',
+            "/": '&#47;'
+        };
+
+        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 = $("<span>", {
+                        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 <select> element.");
+                    }
+                });
+            }
+
+            opts = $.extend({}, {
+                populateResults: function(container, results, query) {
+                    var populate, id=this.opts.id, liveRegion=this.liveRegion;
+
+                    populate=function(results, container, depth) {
+
+                        var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted;
+
+                        results = opts.sortResults(results, container, query);
+
+                        // collect the created nodes for bulk append
+                        var nodes = [];
+                        for (i = 0, l = results.length; i < l; i = i + 1) {
+
+                            result=results[i];
+
+                            disabled = (result.disabled === true);
+                            selectable = (!disabled) && (id(result) !== undefined);
+
+                            compound=result.children && result.children.length > 0;
+
+                            node=$("<li></li>");
+                            node.addClass("select2-results-dept-"+depth);
+                            node.addClass("select2-result");
+                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
+                            if (disabled) { node.addClass("select2-disabled"); }
+                            if (compound) { node.addClass("select2-result-with-children"); }
+                            node.addClass(self.opts.formatResultCssClass(result));
+                            node.attr("role", "presentation");
+
+                            label=$(document.createElement("div"));
+                            label.addClass("select2-result-label");
+                            label.attr("id", "select2-result-label-" + nextUid());
+                            label.attr("role", "option");
+
+                            formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
+                            if (formatted!==undefined) {
+                                label.html(formatted);
+                                node.append(label);
+                            }
+
+
+                            if (compound) {
+
+                                innerContainer=$("<ul></ul>");
+                                innerContainer.addClass("select2-result-sub");
+                                populate(result.children, innerContainer, depth+1);
+                                node.append(innerContainer);
+                            }
+
+                            node.data("select2-data", result);
+                            nodes.push(node[0]);
+                        }
+
+                        // bulk append the created nodes
+                        container.append(nodes);
+                        liveRegion.text(opts.formatMatches(results.length));
+                    };
+
+                    populate(results, container, 0);
+                }
+            }, $.fn.select2.defaults, opts);
+
+            if (typeof(opts.id) !== "function") {
+                idKey = opts.id;
+                opts.id = function (e) { return e[idKey]; };
+            }
+
+            if ($.isArray(opts.element.data("select2Tags"))) {
+                if ("tags" in opts) {
+                    throw "tags specified as both an attribute 'data-select2-tags' and in options of Select2 " + opts.element.attr("id");
+                }
+                opts.tags=opts.element.data("select2Tags");
+            }
+
+            if (select) {
+                opts.query = this.bind(function (query) {
+                    var data = { results: [], more: false },
+                        term = query.term,
+                        children, placeholderOption, process;
+
+                    process=function(element, collection) {
+                        var group;
+                        if (element.is("option")) {
+                            if (query.matcher(term, element.text(), element)) {
+                                collection.push(self.optionToData(element));
+                            }
+                        } else if (element.is("optgroup")) {
+                            group=self.optionToData(element);
+                            element.children().each2(function(i, elm) { process(elm, group.children); });
+                            if (group.children.length>0) {
+                                collection.push(group);
+                            }
+                        }
+                    };
+
+                    children=element.children();
+
+                    // ignore the placeholder option if there is one
+                    if (this.getPlaceholder() !== undefined && children.length > 0) {
+                        placeholderOption = this.getPlaceholderOption();
+                        if (placeholderOption) {
+                            children=children.not(placeholderOption);
+                        }
+                    }
+
+                    children.each2(function(i, elm) { process(elm, data.results); });
+
+                    query.callback(data);
+                });
+                // this is needed because inside val() we construct choices from options and their id is hardcoded
+                opts.id=function(e) { return e.id; };
+            } else {
+                if (!("query" in opts)) {
+
+                    if ("ajax" in opts) {
+                        ajaxUrl = opts.element.data("ajax-url");
+                        if (ajaxUrl && ajaxUrl.length > 0) {
+                            opts.ajax.url = ajaxUrl;
+                        }
+                        opts.query = ajax.call(opts.element, opts.ajax);
+                    } else if ("data" in opts) {
+                        opts.query = local(opts.data);
+                    } else if ("tags" in opts) {
+                        opts.query = tags(opts.tags);
+                        if (opts.createSearchChoice === undefined) {
+                            opts.createSearchChoice = function (term) { return {id: $.trim(term), text: $.trim(term)}; };
+                        }
+                        if (opts.initSelection === undefined) {
+                            opts.initSelection = function (element, callback) {
+                                var data = [];
+                                $(splitVal(element.val(), opts.separator, opts.transformVal)).each(function () {
+                                    var obj = { id: this, text: this },
+                                        tags = opts.tags;
+                                    if ($.isFunction(tags)) tags=tags();
+                                    $(tags).each(function() { if (equal(this.id, obj.id)) { obj = this; return false; } });
+                                    data.push(obj);
+                                });
+
+                                callback(data);
+                            };
+                        }
+                    }
+                }
+            }
+            if (typeof(opts.query) !== "function") {
+                throw "query function not defined for Select2 " + opts.element.attr("id");
+            }
+
+            if (opts.createSearchChoicePosition === 'top') {
+                opts.createSearchChoicePosition = function(list, item) { list.unshift(item); };
+            }
+            else if (opts.createSearchChoicePosition === 'bottom') {
+                opts.createSearchChoicePosition = function(list, item) { list.push(item); };
+            }
+            else if (typeof(opts.createSearchChoicePosition) !== "function")  {
+                throw "invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";
+            }
+
+            return opts;
+        },
+
+        /**
+         * Monitor the original element for changes and update select2 accordingly
+         */
+        // abstract
+        monitorSource: function () {
+            var el = this.opts.element, observer, self = this;
+
+            el.on("change.select2", this.bind(function (e) {
+                if (this.opts.element.data("select2-change-triggered") !== true) {
+                    this.initSelection();
+                }
+            }));
+
+            this._sync = this.bind(function () {
+
+                // sync enabled state
+                var disabled = el.prop("disabled");
+                if (disabled === undefined) disabled = false;
+                this.enable(!disabled);
+
+                var readonly = el.prop("readonly");
+                if (readonly === undefined) readonly = false;
+                this.readonly(readonly);
+
+                if (this.container) {
+                    syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
+                    this.container.addClass(evaluate(this.opts.containerCssClass, this.opts.element));
+                }
+
+                if (this.dropdown) {
+                    syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
+                    this.dropdown.addClass(evaluate(this.opts.dropdownCssClass, this.opts.element));
+                }
+
+            });
+
+            // IE8-10 (IE9/10 won't fire propertyChange via attachEventListener)
+            if (el.length && el[0].attachEvent) {
+                el.each(function() {
+                    this.attachEvent("onpropertychange", self._sync);
+                });
+            }
+
+            // safari, chrome, firefox, IE11
+            observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver;
+            if (observer !== undefined) {
+                if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
+                this.propertyObserver = new observer(function (mutations) {
+                    $.each(mutations, self._sync);
+                });
+                this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
+            }
+        },
+
+        // abstract
+        triggerSelect: function(data) {
+            var evt = $.Event("select2-selecting", { val: this.id(data), object: data, choice: data });
+            this.opts.element.trigger(evt);
+            return !evt.isDefaultPrevented();
+        },
+
+        /**
+         * Triggers the change event on the source element
+         */
+        // abstract
+        triggerChange: function (details) {
+
+            details = details || {};
+            details= $.extend({}, details, { type: "change", val: this.val() });
+            // prevents recursive triggering
+            this.opts.element.data("select2-change-triggered", true);
+            this.opts.element.trigger(details);
+            this.opts.element.data("select2-change-triggered", false);
+
+            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
+            // so here we trigger the click event manually
+            this.opts.element.click();
+
+            // ValidationEngine ignores the change event and listens instead to blur
+            // so here we trigger the blur event manually if so desired
+            if (this.opts.blurOnChange)
+                this.opts.element.blur();
+        },
+
+        //abstract
+        isInterfaceEnabled: function()
+        {
+            return this.enabledInterface === true;
+        },
+
+        // abstract
+        enableInterface: function() {
+            var enabled = this._enabled && !this._readonly,
+                disabled = !enabled;
+
+            if (enabled === this.enabledInterface) return false;
+
+            this.container.toggleClass("select2-container-disabled", disabled);
+            this.close();
+            this.enabledInterface = enabled;
+
+            return true;
+        },
+
+        // abstract
+        enable: function(enabled) {
+            if (enabled === undefined) enabled = true;
+            if (this._enabled === enabled) return;
+            this._enabled = enabled;
+
+            this.opts.element.prop("disabled", !enabled);
+            this.enableInterface();
+        },
+
+        // abstract
+        disable: function() {
+            this.enable(false);
+        },
+
+        // abstract
+        readonly: function(enabled) {
+            if (enabled === undefined) enabled = false;
+            if (this._readonly === enabled) return;
+            this._readonly = enabled;
+
+            this.opts.element.prop("readonly", enabled);
+            this.enableInterface();
+        },
+
+        // abstract
+        opened: function () {
+            return (this.container) ? this.container.hasClass("select2-dropdown-open") : false;
+        },
+
+        // abstract
+        positionDropdown: function() {
+            var $dropdown = this.dropdown,
+                container = this.container,
+                offset = container.offset(),
+                height = container.outerHeight(false),
+                width = container.outerWidth(false),
+                dropHeight = $dropdown.outerHeight(false),
+                $window = $(window),
+                windowWidth = $window.width(),
+                windowHeight = $window.height(),
+                viewPortRight = $window.scrollLeft() + windowWidth,
+                viewportBottom = $window.scrollTop() + windowHeight,
+                dropTop = offset.top + height,
+                dropLeft = offset.left,
+                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
+                enoughRoomAbove = (offset.top - dropHeight) >= $window.scrollTop(),
+                dropWidth = $dropdown.outerWidth(false),
+                enoughRoomOnRight = function() {
+                    return dropLeft + dropWidth <= viewPortRight;
+                },
+                enoughRoomOnLeft = function() {
+                    return offset.left + viewPortRight + container.outerWidth(false)  > dropWidth;
+                },
+                aboveNow = $dropdown.hasClass("select2-drop-above"),
+                bodyOffset,
+                above,
+                changeDirection,
+                css,
+                resultsListNode;
+
+            // always prefer the current above/below alignment, unless there is not enough room
+            if (aboveNow) {
+                above = true;
+                if (!enoughRoomAbove && enoughRoomBelow) {
+                    changeDirection = true;
+                    above = false;
+                }
+            } else {
+                above = false;
+                if (!enoughRoomBelow && enoughRoomAbove) {
+                    changeDirection = true;
+                    above = true;
+                }
+            }
+
+            //if we are changing direction we need to get positions when dropdown is hidden;
+            if (changeDirection) {
+                $dropdown.hide();
+                offset = this.container.offset();
+                height = this.container.outerHeight(false);
+                width = this.container.outerWidth(false);
+                dropHeight = $dropdown.outerHeight(false);
+                viewPortRight = $window.scrollLeft() + windowWidth;
+                viewportBottom = $window.scrollTop() + windowHeight;
+                dropTop = offset.top + height;
+                dropLeft = offset.left;
+                dropWidth = $dropdown.outerWidth(false);
+                $dropdown.show();
+
+                // fix so the cursor does not move to the left within the search-textbox in IE
+                this.focusSearch();
+            }
+
+            if (this.opts.dropdownAutoWidth) {
+                resultsListNode = $('.select2-results', $dropdown)[0];
+                $dropdown.addClass('select2-drop-auto-width');
+                $dropdown.css('width', '');
+                // Add scrollbar width to dropdown if vertical scrollbar is present
+                dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width);
+                dropWidth > width ? width = dropWidth : dropWidth = width;
+                dropHeight = $dropdown.outerHeight(false);
+            }
+            else {
+                this.container.removeClass('select2-drop-auto-width');
+            }
+
+            //console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
+            //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body.scrollTop(), "enough?", enoughRoomAbove);
+
+            // fix positioning when body has an offset and is not position: static
+            if (this.body.css('position') !== 'static') {
+                bodyOffset = this.body.offset();
+                dropTop -= bodyOffset.top;
+                dropLeft -= bodyOffset.left;
+            }
+
+            if (!enoughRoomOnRight() && enoughRoomOnLeft()) {
+                dropLeft = offset.left + this.container.outerWidth(false) - dropWidth;
+            }
+
+            css =  {
+                left: dropLeft,
+                width: width
+            };
+
+            if (above) {
+                css.top = offset.top - dropHeight;
+                css.bottom = 'auto';
+                this.container.addClass("select2-drop-above");
+                $dropdown.addClass("select2-drop-above");
+            }
+            else {
+                css.top = dropTop;
+                css.bottom = 'auto';
+                this.container.removeClass("select2-drop-above");
+                $dropdown.removeClass("select2-drop-above");
+            }
+            css = $.extend(css, evaluate(this.opts.dropdownCss, this.opts.element));
+
+            $dropdown.css(css);
+        },
+
+        // abstract
+        shouldOpen: function() {
+            var event;
+
+            if (this.opened()) return false;
+
+            if (this._enabled === false || this._readonly === true) return false;
+
+            event = $.Event("select2-opening");
+            this.opts.element.trigger(event);
+            return !event.isDefaultPrevented();
+        },
+
+        // abstract
+        clearDropdownAlignmentPreference: function() {
+            // clear the classes used to figure out the preference of where the dropdown should be opened
+            this.container.removeClass("select2-drop-above");
+            this.dropdown.removeClass("select2-drop-above");
+        },
+
+        /**
+         * Opens the dropdown
+         *
+         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
+         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
+         */
+        // abstract
+        open: function () {
+
+            if (!this.shouldOpen()) return false;
+
+            this.opening();
+
+            // Only bind the document mousemove when the dropdown is visible
+            $document.on("mousemove.select2Event", function (e) {
+                lastMousePosition.x = e.pageX;
+                lastMousePosition.y = e.pageY;
+            });
+
+            return true;
+        },
+
+        /**
+         * Performs the opening of the dropdown
+         */
+        // abstract
+        opening: function() {
+            var cid = this.containerEventName,
+                scroll = "scroll." + cid,
+                resize = "resize."+cid,
+                orient = "orientationchange."+cid,
+                mask;
+
+            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
+
+            this.clearDropdownAlignmentPreference();
+
+            if(this.dropdown[0] !== this.body.children().last()[0]) {
+                this.dropdown.detach().appendTo(this.body);
+            }
+
+            // create the dropdown mask if doesn't already exist
+            mask = $("#select2-drop-mask");
+            if (mask.length === 0) {
+                mask = $(document.createElement("div"));
+                mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
+                mask.hide();
+                mask.appendTo(this.body);
+                mask.on("mousedown touchstart click", function (e) {
+                    // Prevent IE from generating a click event on the body
+                    reinsertElement(mask);
+
+                    var dropdown = $("#select2-drop"), self;
+                    if (dropdown.length > 0) {
+                        self=dropdown.data("select2");
+                        if (self.opts.selectOnBlur) {
+                            self.selectHighlighted({noFocus: true});
+                        }
+                        self.close();
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                });
+            }
+
+            // ensure the mask is always right before the dropdown
+            if (this.dropdown.prev()[0] !== mask[0]) {
+                this.dropdown.before(mask);
+            }
+
+            // move the global id to the correct dropdown
+            $("#select2-drop").removeAttr("id");
+            this.dropdown.attr("id", "select2-drop");
+
+            // show the elements
+            mask.show();
+
+            this.positionDropdown();
+            this.dropdown.show();
+            this.positionDropdown();
+
+            this.dropdown.addClass("select2-drop-active");
+
+            // attach listeners to events that can change the position of the container and thus require
+            // the position of the dropdown to be updated as well so it does not come unglued from the container
+            var that = this;
+            this.container.parents().add(window).each(function () {
+                $(this).on(resize+" "+scroll+" "+orient, function (e) {
+                    if (that.opened()) that.positionDropdown();
+                });
+            });
+
+
+        },
+
+        // abstract
+        close: function () {
+            if (!this.opened()) return;
+
+            var cid = this.containerEventName,
+                scroll = "scroll." + cid,
+                resize = "resize."+cid,
+                orient = "orientationchange."+cid;
+
+            // unbind event listeners
+            this.container.parents().add(window).each(function () { $(this).off(scroll).off(resize).off(orient); });
+
+            this.clearDropdownAlignmentPreference();
+
+            $("#select2-drop-mask").hide();
+            this.dropdown.removeAttr("id"); // only the active dropdown has the select2-drop id
+            this.dropdown.hide();
+            this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active");
+            this.results.empty();
+
+            // Now that the dropdown is closed, unbind the global document mousemove event
+            $document.off("mousemove.select2Event");
+
+            this.clearSearch();
+            this.search.removeClass("select2-active");
+            this.opts.element.trigger($.Event("select2-close"));
+        },
+
+        /**
+         * Opens control, sets input value, and updates results.
+         */
+        // abstract
+        externalSearch: function (term) {
+            this.open();
+            this.search.val(term);
+            this.updateResults(false);
+        },
+
+        // abstract
+        clearSearch: function () {
+
+        },
+
+        //abstract
+        getMaximumSelectionSize: function() {
+            return evaluate(this.opts.maximumSelectionSize, this.opts.element);
+        },
+
+        // abstract
+        ensureHighlightVisible: function () {
+            var results = this.results, children, index, child, hb, rb, y, more, topOffset;
+
+            index = this.highlight();
+
+            if (index < 0) return;
+
+            if (index == 0) {
+
+                // if the first element is highlighted scroll all the way to the top,
+                // that way any unselectable headers above it will also be scrolled
+                // into view
+
+                results.scrollTop(0);
+                return;
+            }
+
+            children = this.findHighlightableChoices().find('.select2-result-label');
+
+            child = $(children[index]);
+
+            topOffset = (child.offset() || {}).top || 0;
+
+            hb = topOffset + child.outerHeight(true);
+
+            // if this is the last child lets also make sure select2-more-results is visible
+            if (index === children.length - 1) {
+                more = results.find("li.select2-more-results");
+                if (more.length > 0) {
+                    hb = more.offset().top + more.outerHeight(true);
+                }
+            }
+
+            rb = results.offset().top + results.outerHeight(false);
+            if (hb > rb) {
+                results.scrollTop(results.scrollTop() + (hb - rb));
+            }
+            y = topOffset - results.offset().top;
+
+            // make sure the top of the element is visible
+            if (y < 0 && child.css('display') != 'none' ) {
+                results.scrollTop(results.scrollTop() + y); // y is negative
+            }
+        },
+
+        // abstract
+        findHighlightableChoices: function() {
+            return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)");
+        },
+
+        // abstract
+        moveHighlight: function (delta) {
+            var choices = this.findHighlightableChoices(),
+                index = this.highlight();
+
+            while (index > -1 && index < choices.length) {
+                index += delta;
+                var choice = $(choices[index]);
+                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled") && !choice.hasClass("select2-selected")) {
+                    this.highlight(index);
+                    break;
+                }
+            }
+        },
+
+        // abstract
+        highlight: function (index) {
+            var choices = this.findHighlightableChoices(),
+                choice,
+                data;
+
+            if (arguments.length === 0) {
+                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
+            }
+
+            if (index >= choices.length) index = choices.length - 1;
+            if (index < 0) index = 0;
+
+            this.removeHighlight();
+
+            choice = $(choices[index]);
+            choice.addClass("select2-highlighted");
+
+            // ensure assistive technology can determine the active choice
+            this.search.attr("aria-activedescendant", choice.find(".select2-result-label").attr("id"));
+
+            this.ensureHighlightVisible();
+
+            this.liveRegion.text(choice.text());
+
+            data = choice.data("select2-data");
+            if (data) {
+                this.opts.element.trigger({ type: "select2-highlight", val: this.id(data), choice: data });
+            }
+        },
+
+        removeHighlight: function() {
+            this.results.find(".select2-highlighted").removeClass("select2-highlighted");
+        },
+
+        touchMoved: function() {
+            this._touchMoved = true;
+        },
+
+        clearTouchMoved: function() {
+          this._touchMoved = false;
+        },
+
+        // abstract
+        countSelectableResults: function() {
+            return this.findHighlightableChoices().length;
+        },
+
+        // abstract
+        highlightUnderEvent: function (event) {
+            var el = $(event.target).closest(".select2-result-selectable");
+            if (el.length > 0 && !el.is(".select2-highlighted")) {
+                var choices = this.findHighlightableChoices();
+                this.highlight(choices.index(el));
+            } else if (el.length == 0) {
+                // if we are over an unselectable item remove all highlights
+                this.removeHighlight();
+            }
+        },
+
+        // abstract
+        loadMoreIfNeeded: function () {
+            var results = this.results,
+                more = results.find("li.select2-more-results"),
+                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
+                page = this.resultsPage + 1,
+                self=this,
+                term=this.search.val(),
+                context=this.context;
+
+            if (more.length === 0) return;
+            below = more.offset().top - results.offset().top - results.height();
+
+            if (below <= this.opts.loadMorePadding) {
+                more.addClass("select2-active");
+                this.opts.query({
+                        element: this.opts.element,
+                        term: term,
+                        page: page,
+                        context: context,
+                        matcher: this.opts.matcher,
+                        callback: this.bind(function (data) {
+
+                    // ignore a response if the select2 has been closed before it was received
+                    if (!self.opened()) return;
+
+
+                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
+                    self.postprocessResults(data, false, false);
+
+                    if (data.more===true) {
+                        more.detach().appendTo(results).html(self.opts.escapeMarkup(evaluate(self.opts.formatLoadMore, self.opts.element, page+1)));
+                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                    } else {
+                        more.remove();
+                    }
+                    self.positionDropdown();
+                    self.resultsPage = page;
+                    self.context = data.context;
+                    this.opts.element.trigger({ type: "select2-loaded", items: data });
+                })});
+            }
+        },
+
+        /**
+         * Default tokenizer function which does nothing
+         */
+        tokenize: function() {
+
+        },
+
+        /**
+         * @param initial whether or not this is the call to this method right after the dropdown has been opened
+         */
+        // abstract
+        updateResults: function (initial) {
+            var search = this.search,
+                results = this.results,
+                opts = this.opts,
+                data,
+                self = this,
+                input,
+                term = search.val(),
+                lastTerm = $.data(this.container, "select2-last-term"),
+                // sequence number used to drop out-of-order responses
+                queryNumber;
+
+            // prevent duplicate queries against the same term
+            if (initial !== true && lastTerm && equal(term, lastTerm)) return;
+
+            $.data(this.container, "select2-last-term", term);
+
+            // if the search is currently hidden we do not alter the results
+            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
+                return;
+            }
+
+            function postRender() {
+                search.removeClass("select2-active");
+                self.positionDropdown();
+                if (results.find('.select2-no-results,.select2-selection-limit,.select2-searching').length) {
+                    self.liveRegion.text(results.text());
+                }
+                else {
+                    self.liveRegion.text(self.opts.formatMatches(results.find('.select2-result-selectable:not(".select2-selected")').length));
+                }
+            }
+
+            function render(html) {
+                results.html(html);
+                postRender();
+            }
+
+            queryNumber = ++this.queryCount;
+
+            var maxSelSize = this.getMaximumSelectionSize();
+            if (maxSelSize >=1) {
+                data = this.data();
+                if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
+                    render("<li class='select2-selection-limit'>" + evaluate(opts.formatSelectionTooBig, opts.element, maxSelSize) + "</li>");
+                    return;
+                }
+            }
+
+            if (search.val().length < opts.minimumInputLength) {
+                if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
+                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooShort, opts.element, search.val(), opts.minimumInputLength) + "</li>");
+                } else {
+                    render("");
+                }
+                if (initial && this.showSearch) this.showSearch(true);
+                return;
+            }
+
+            if (opts.maximumInputLength && search.val().length > opts.maximumInputLength) {
+                if (checkFormatter(opts.formatInputTooLong, "formatInputTooLong")) {
+                    render("<li class='select2-no-results'>" + evaluate(opts.formatInputTooLong, opts.element, search.val(), opts.maximumInputLength) + "</li>");
+                } else {
+                    render("");
+                }
+                return;
+            }
+
+            if (opts.formatSearching && this.findHighlightableChoices().length === 0) {
+                render("<li class='select2-searching'>" + evaluate(opts.formatSearching, opts.element) + "</li>");
+            }
+
+            search.addClass("select2-active");
+
+            this.removeHighlight();
+
+            // give the tokenizer a chance to pre-process the input
+            input = this.tokenize();
+            if (input != undefined && input != null) {
+                search.val(input);
+            }
+
+            this.resultsPage = 1;
+
+            opts.query({
+                element: opts.element,
+                    term: search.val(),
+                    page: this.resultsPage,
+                    context: null,
+                    matcher: opts.matcher,
+                    callback: this.bind(function (data) {
+                var def; // default choice
+
+                // ignore old responses
+                if (queryNumber != this.queryCount) {
+                  return;
+                }
+
+                // ignore a response if the select2 has been closed before it was received
+                if (!this.opened()) {
+                    this.search.removeClass("select2-active");
+                    return;
+                }
+
+                // handle ajax error
+                if(data.hasError !== undefined && checkFormatter(opts.formatAjaxError, "formatAjaxError")) {
+                    render("<li class='select2-ajax-error'>" + evaluate(opts.formatAjaxError, opts.element, data.jqXHR, data.textStatus, data.errorThrown) + "</li>");
+                    return;
+                }
+
+                // save context, if any
+                this.context = (data.context===undefined) ? null : data.context;
+                // create a default choice and prepend it to the list
+                if (this.opts.createSearchChoice && search.val() !== "") {
+                    def = this.opts.createSearchChoice.call(self, search.val(), data.results);
+                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
+                        if ($(data.results).filter(
+                            function () {
+                                return equal(self.id(this), self.id(def));
+                            }).length === 0) {
+                            this.opts.createSearchChoicePosition(data.results, def);
+                        }
+                    }
+                }
+
+                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
+                    render("<li class='select2-no-results'>" + evaluate(opts.formatNoMatches, opts.element, search.val()) + "</li>");
+                    return;
+                }
+
+                results.empty();
+                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
+
+                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
+                    results.append("<li class='select2-more-results'>" + opts.escapeMarkup(evaluate(opts.formatLoadMore, opts.element, this.resultsPage)) + "</li>");
+                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                }
+
+                this.postprocessResults(data, initial);
+
+                postRender();
+
+                this.opts.element.trigger({ type: "select2-loaded", items: data });
+            })});
+        },
+
+        // abstract
+        cancel: function () {
+            this.close();
+        },
+
+        // abstract
+        blur: function () {
+            // if selectOnBlur == true, select the currently highlighted option
+            if (this.opts.selectOnBlur)
+                this.selectHighlighted({noFocus: true});
+
+            this.close();
+            this.container.removeClass("select2-container-active");
+            // synonymous to .is(':focus'), which is available in jquery >= 1.6
+            if (this.search[0] === document.activeElement) { this.search.blur(); }
+            this.clearSearch();
+            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+        },
+
+        // abstract
+        focusSearch: function () {
+            focus(this.search);
+        },
+
+        // abstract
+        selectHighlighted: function (options) {
+            if (this._touchMoved) {
+              this.clearTouchMoved();
+              return;
+            }
+            var index=this.highlight(),
+                highlighted=this.results.find(".select2-highlighted"),
+                data = highlighted.closest('.select2-result').data("select2-data");
+
+            if (data) {
+                this.highlight(index);
+                this.onSelect(data, options);
+            } else if (options && options.noFocus) {
+                this.close();
+            }
+        },
+
+        // abstract
+        getPlaceholder: function () {
+            var placeholderOption;
+            return this.opts.element.attr("placeholder") ||
+                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
+                this.opts.element.data("placeholder") ||
+                this.opts.placeholder ||
+                ((placeholderOption = this.getPlaceholderOption()) !== undefined ? placeholderOption.text() : undefined);
+        },
+
+        // abstract
+        getPlaceholderOption: function() {
+            if (this.select) {
+                var firstOption = this.select.children('option').first();
+                if (this.opts.placeholderOption !== undefined ) {
+                    //Determine the placeholder option based on the specified placeholderOption setting
+                    return (this.opts.placeholderOption === "first" && firstOption) ||
+                           (typeof this.opts.placeholderOption === "function" && this.opts.placeholderOption(this.select));
+                } else if ($.trim(firstOption.text()) === "" && firstOption.val() === "") {
+                    //No explicit placeholder option specified, use the first if it's blank
+                    return firstOption;
+                }
+            }
+        },
+
+        /**
+         * Get the desired width for the container element.  This is
+         * derived first from option `width` passed to select2, then
+         * the inline 'style' on the original element, and finally
+         * falls back to the jQuery calculated element width.
+         */
+        // abstract
+        initContainerWidth: function () {
+            function resolveContainerWidth() {
+                var style, attrs, matches, i, l, attr;
+
+                if (this.opts.width === "off") {
+                    return null;
+                } else if (this.opts.width === "element"){
+                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
+                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
+                    // check if there is inline style on the element that contains width
+                    style = this.opts.element.attr('style');
+                    if (style !== undefined) {
+                        attrs = style.split(';');
+                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
+                            attr = attrs[i].replace(/\s/g, '');
+                            matches = attr.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
+                            if (matches !== null && matches.length >= 1)
+                                return matches[1];
+                        }
+                    }
+
+                    if (this.opts.width === "resolve") {
+                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
+                        // when attached to input type=hidden or elements hidden via css
+                        style = this.opts.element.css('width');
+                        if (style.indexOf("%") > 0) return style;
+
+                        // finally, fallback on the calculated width of the element
+                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
+                    }
+
+                    return null;
+                } else if ($.isFunction(this.opts.width)) {
+                    return this.opts.width();
+                } else {
+                    return this.opts.width;
+               }
+            };
+
+            var width = resolveContainerWidth.call(this);
+            if (width !== null) {
+                this.container.css("width", width);
+            }
+        }
+    });
+
+    SingleSelect2 = clazz(AbstractSelect2, {
+
+        // single
+
+        createContainer: function () {
+            var container = $(document.createElement("div")).attr({
+                "class": "select2-container"
+            }).html([
+                "<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>",
+                "   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>",
+                "   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>",
+                "</a>",
+                "<label for='' class='select2-offscreen'></label>",
+                "<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />",
+                "<div class='select2-drop select2-display-none'>",
+                "   <div class='select2-search'>",
+                "       <label for='' class='select2-offscreen'></label>",
+                "       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'",
+                "       aria-autocomplete='list' />",
+                "   </div>",
+                "   <ul class='select2-results' role='listbox'>",
+                "   </ul>",
+                "</div>"].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([
+                "<ul class='select2-choices'>",
+                "  <li class='select2-search-field'>",
+                "    <label for='' class='select2-offscreen'></label>",
+                "    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>",
+                "  </li>",
+                "</ul>",
+                "<div class='select2-drop select2-drop-multi select2-display-none'>",
+                "   <ul class='select2-results'>",
+                "   </ul>",
+                "</div>"].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 = $(
+                    "<li class='select2-search-choice'>" +
+                    "    <div></div>" +
+                    "    <a href='#' class='select2-search-choice-close' tabindex='-1'></a>" +
+                    "</li>"),
+                disabledItem = $(
+                    "<li class='select2-search-choice select2-locked'>" +
+                    "<div></div>" +
+                    "</li>");
+            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($("<div></div>").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("<li class='select2-no-results'>" + evaluate(self.opts.formatNoMatches, self.opts.element, self.search.val()) + "</li>");
+                    }
+                }
+            }
+
+        },
+
+        // 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 <select>. Attach to <input type='hidden'/> 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;++d<e&&(c.context=c[0]=this[d])&&b.call(c[0],d,c)!==!1;);return this}})}(jQuery),function(a,b){"use strict";function n(b){var c=a(document.createTextNode(""));b.before(c),c.before(b),c.remove()}function o(a){function b(a){return m[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function p(a,b){for(var c=0,d=b.length;d>c;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("<span class='select2-match'>"),c.push(d(a.substring(e,e+f))),c.push("</span>"),c.push(d(a.substring(e+f,a.length))),void 0)}function F(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};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="<div class='select2-measure-scrollbar'></div>",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("<span>",{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 <select> element.")}),c=a.extend({},{populateResults:function(d,e,g){var h,j=this.opts.id,k=this.liveRegion;h=function(d,e,l){var m,n,o,p,q,r,s,t,u,v;d=c.sortResults(d,e,g);var w=[];for(m=0,n=d.length;n>m;m+=1)o=d[m],q=o.disabled===!0,p=!q&&j(o)!==b,r=o.children&&o.children.length>0,s=a("<li></li>"),s.addClass("select2-results-dept-"+l),s.addClass("select2-result"),s.addClass(p?"select2-result-selectable":"select2-result-unselectable"),q&&s.addClass("select2-disabled"),r&&s.addClass("select2-result-with-children"),s.addClass(i.opts.formatResultCssClass(o)),s.attr("role","presentation"),t=a(document.createElement("div")),t.addClass("select2-result-label"),t.attr("id","select2-result-label-"+f()),t.attr("role","option"),v=c.formatResult(o,t,g,i.opts.escapeMarkup),v!==b&&(t.html(v),s.append(t)),r&&(u=a("<ul></ul>"),u.addClass("select2-result-sub"),h(o.children,u,l+1),s.append(u)),s.data("select2-data",o),w.push(s[0]);e.append(w),k.text(c.formatMatches(d.length))},h(e,d,0)}},a.fn.select2.defaults,c),"function"!=typeof c.id&&(g=c.id,c.id=function(a){return a[g]}),a.isArray(c.element.data("select2Tags"))){if("tags"in c)throw"tags specified as both an attribute 'data-select2-tags' and in options of Select2 "+c.element.attr("id");c.tags=c.element.data("select2Tags")}if(e?(c.query=this.bind(function(a){var f,g,h,c={results:[],more:!1},e=a.term;h=function(b,c){var d;b.is("option")?a.matcher(e,b.text(),b)&&c.push(i.optionToData(b)):b.is("optgroup")&&(d=i.optionToData(b),b.children().each2(function(a,b){h(b,d.children)}),d.children.length>0&&c.push(d))},f=d.children(),this.getPlaceholder()!==b&&f.length>0&&(g=this.getPlaceholderOption(),g&&(f=f.not(g))),f.each2(function(a,b){h(b,c.results)}),a.callback(c)}),c.id=function(a){return a.id}):"query"in c||("ajax"in c?(h=c.element.data("ajax-url"),h&&h.length>0&&(c.ajax.url=h),c.query=G.call(c.element,c.ajax)):"data"in c?c.query=H(c.data):"tags"in c&&(c.query=I(c.tags),c.createSearchChoice===b&&(c.createSearchChoice=function(b){return{id:a.trim(b),text:a.trim(b)}}),c.initSelection===b&&(c.initSelection=function(b,d){var e=[];a(s(b.val(),c.separator,c.transformVal)).each(function(){var b={id:this,text:this},d=c.tags;a.isFunction(d)&&(d=d()),a(d).each(function(){return r(this.id,b.id)?(b=this,!1):void 0}),e.push(b)}),d(e)}))),"function"!=typeof c.query)throw"query function not defined for Select2 "+c.element.attr("id");if("top"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.unshift(b)};else if("bottom"===c.createSearchChoicePosition)c.createSearchChoicePosition=function(a,b){a.push(b)};else if("function"!=typeof c.createSearchChoicePosition)throw"invalid createSearchChoicePosition option must be 'top', 'bottom' or a custom function";return c},monitorSource:function(){var d,c=this.opts.element,e=this;c.on("change.select2",this.bind(function(){this.opts.element.data("select2-change-triggered")!==!0&&this.initSelection()})),this._sync=this.bind(function(){var a=c.prop("disabled");a===b&&(a=!1),this.enable(!a);var d=c.prop("readonly");d===b&&(d=!1),this.readonly(d),this.container&&(D(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.addClass(K(this.opts.containerCssClass,this.opts.element))),this.dropdown&&(D(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(K(this.opts.dropdownCssClass,this.opts.element)))}),c.length&&c[0].attachEvent&&c.each(function(){this.attachEvent("onpropertychange",e._sync)}),d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver,d!==b&&(this.propertyObserver&&(delete this.propertyObserver,this.propertyObserver=null),this.propertyObserver=new d(function(b){a.each(b,e._sync)}),this.propertyObserver.observe(c.get(0),{attributes:!0,subtree:!1}))},triggerSelect:function(b){var c=a.Event("select2-selecting",{val:this.id(b),object:b,choice:b});return this.opts.element.trigger(c),!c.isDefaultPrevented()},triggerChange:function(b){b=b||{},b=a.extend({},b,{type:"change",val:this.val()}),this.opts.element.data("select2-change-triggered",!0),this.opts.element.trigger(b),this.opts.element.data("select2-change-triggered",!1),this.opts.element.click(),this.opts.blurOnChange&&this.opts.element.blur()},isInterfaceEnabled:function(){return this.enabledInterface===!0},enableInterface:function(){var a=this._enabled&&!this._readonly,b=!a;return a===this.enabledInterface?!1:(this.container.toggleClass("select2-container-disabled",b),this.close(),this.enabledInterface=a,!0)},enable:function(a){a===b&&(a=!0),this._enabled!==a&&(this._enabled=a,this.opts.element.prop("disabled",!a),this.enableInterface())},disable:function(){this.enable(!1)},readonly:function(a){a===b&&(a=!1),this._readonly!==a&&(this._readonly=a,this.opts.element.prop("readonly",a),this.enableInterface())},opened:function(){return this.container?this.container.hasClass("select2-dropdown-open"):!1},positionDropdown:function(){var v,w,x,y,z,b=this.dropdown,c=this.container,d=c.offset(),e=c.outerHeight(!1),f=c.outerWidth(!1),g=b.outerHeight(!1),h=a(window),i=h.width(),k=h.height(),l=h.scrollLeft()+i,m=h.scrollTop()+k,n=d.top+e,o=d.left,p=m>=n+g,q=d.top-g>=h.scrollTop(),r=b.outerWidth(!1),s=function(){return l>=o+r},t=function(){return d.left+l+c.outerWidth(!1)>r},u=b.hasClass("select2-drop-above");u?(w=!0,!q&&p&&(x=!0,w=!1)):(w=!1,!p&&q&&(x=!0,w=!0)),x&&(b.hide(),d=this.container.offset(),e=this.container.outerHeight(!1),f=this.container.outerWidth(!1),g=b.outerHeight(!1),l=h.scrollLeft()+i,m=h.scrollTop()+k,n=d.top+e,o=d.left,r=b.outerWidth(!1),b.show(),this.focusSearch()),this.opts.dropdownAutoWidth?(z=a(".select2-results",b)[0],b.addClass("select2-drop-auto-width"),b.css("width",""),r=b.outerWidth(!1)+(z.scrollHeight===z.clientHeight?0:j.width),r>f?f=r:r=f,g=b.outerHeight(!1)):this.container.removeClass("select2-drop-auto-width"),"static"!==this.body.css("position")&&(v=this.body.offset(),n-=v.top,o-=v.left),!s()&&t()&&(o=d.left+this.container.outerWidth(!1)-r),y={left:o,width:f},w?(y.top=d.top-g,y.bottom="auto",this.container.addClass("select2-drop-above"),b.addClass("select2-drop-above")):(y.top=n,y.bottom="auto",this.container.removeClass("select2-drop-above"),b.removeClass("select2-drop-above")),y=a.extend(y,K(this.opts.dropdownCss,this.opts.element)),b.css(y)},shouldOpen:function(){var b;return this.opened()?!1:this._enabled===!1||this._readonly===!0?!1:(b=a.Event("select2-opening"),this.opts.element.trigger(b),!b.isDefaultPrevented())},clearDropdownAlignmentPreference:function(){this.container.removeClass("select2-drop-above"),this.dropdown.removeClass("select2-drop-above")},open:function(){return this.shouldOpen()?(this.opening(),i.on("mousemove.select2Event",function(a){h.x=a.pageX,h.y=a.pageY}),!0):!1},opening:function(){var f,b=this.containerEventName,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.addClass("select2-dropdown-open").addClass("select2-container-active"),this.clearDropdownAlignmentPreference(),this.dropdown[0]!==this.body.children().last()[0]&&this.dropdown.detach().appendTo(this.body),f=a("#select2-drop-mask"),0===f.length&&(f=a(document.createElement("div")),f.attr("id","select2-drop-mask").attr("class","select2-drop-mask"),f.hide(),f.appendTo(this.body),f.on("mousedown touchstart click",function(b){n(f);var d,c=a("#select2-drop");c.length>0&&(d=c.data("select2"),d.opts.selectOnBlur&&d.selectHighlighted({noFocus:!0}),d.close(),b.preventDefault(),b.stopPropagation())})),this.dropdown.prev()[0]!==f[0]&&this.dropdown.before(f),a("#select2-drop").removeAttr("id"),this.dropdown.attr("id","select2-drop"),f.show(),this.positionDropdown(),this.dropdown.show(),this.positionDropdown(),this.dropdown.addClass("select2-drop-active");var g=this;this.container.parents().add(window).each(function(){a(this).on(d+" "+c+" "+e,function(){g.opened()&&g.positionDropdown()})})},close:function(){if(this.opened()){var b=this.containerEventName,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.parents().add(window).each(function(){a(this).off(c).off(d).off(e)}),this.clearDropdownAlignmentPreference(),a("#select2-drop-mask").hide(),this.dropdown.removeAttr("id"),this.dropdown.hide(),this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active"),this.results.empty(),i.off("mousemove.select2Event"),this.clearSearch(),this.search.removeClass("select2-active"),this.opts.element.trigger(a.Event("select2-close"))}},externalSearch:function(a){this.open(),this.search.val(a),this.updateResults(!1)},clearSearch:function(){},getMaximumSelectionSize:function(){return K(this.opts.maximumSelectionSize,this.opts.element)},ensureHighlightVisible:function(){var c,d,e,f,g,h,i,j,b=this.results;if(d=this.highlight(),!(0>d)){if(0==d)return b.scrollTop(0),void 0;c=this.findHighlightableChoices().find(".select2-result-label"),e=a(c[d]),j=(e.offset()||{}).top||0,f=j+e.outerHeight(!0),d===c.length-1&&(i=b.find("li.select2-more-results"),i.length>0&&(f=i.offset().top+i.outerHeight(!0))),g=b.offset().top+b.outerHeight(!1),f>g&&b.scrollTop(b.scrollTop()+(f-g)),h=j-b.offset().top,0>h&&"none"!=e.css("display")&&b.scrollTop(b.scrollTop()+h)}},findHighlightableChoices:function(){return this.results.find(".select2-result-selectable:not(.select2-disabled):not(.select2-selected)")},moveHighlight:function(b){for(var c=this.findHighlightableChoices(),d=this.highlight();d>-1&&d<c.length;){d+=b;
+var e=a(c[d]);if(e.hasClass("select2-result-selectable")&&!e.hasClass("select2-disabled")&&!e.hasClass("select2-selected")){this.highlight(d);break}}},highlight:function(b){var d,e,c=this.findHighlightableChoices();return 0===arguments.length?p(c.filter(".select2-highlighted")[0],c.get()):(b>=c.length&&(b=c.length-1),0>b&&(b=0),this.removeHighlight(),d=a(c[b]),d.addClass("select2-highlighted"),this.search.attr("aria-activedescendant",d.find(".select2-result-label").attr("id")),this.ensureHighlightVisible(),this.liveRegion.text(d.text()),e=d.data("select2-data"),e&&this.opts.element.trigger({type:"select2-highlight",val:this.id(e),choice:e}),void 0)},removeHighlight:function(){this.results.find(".select2-highlighted").removeClass("select2-highlighted")},touchMoved:function(){this._touchMoved=!0},clearTouchMoved:function(){this._touchMoved=!1},countSelectableResults:function(){return this.findHighlightableChoices().length},highlightUnderEvent:function(b){var c=a(b.target).closest(".select2-result-selectable");if(c.length>0&&!c.is(".select2-highlighted")){var d=this.findHighlightableChoices();this.highlight(d.index(c))}else 0==c.length&&this.removeHighlight()},loadMoreIfNeeded:function(){var c,a=this.results,b=a.find("li.select2-more-results"),d=this.resultsPage+1,e=this,f=this.search.val(),g=this.context;0!==b.length&&(c=b.offset().top-a.offset().top-a.height(),c<=this.opts.loadMorePadding&&(b.addClass("select2-active"),this.opts.query({element:this.opts.element,term:f,page:d,context:g,matcher:this.opts.matcher,callback:this.bind(function(c){e.opened()&&(e.opts.populateResults.call(this,a,c.results,{term:f,page:d,context:g}),e.postprocessResults(c,!1,!1),c.more===!0?(b.detach().appendTo(a).html(e.opts.escapeMarkup(K(e.opts.formatLoadMore,e.opts.element,d+1))),window.setTimeout(function(){e.loadMoreIfNeeded()},10)):b.remove(),e.positionDropdown(),e.resultsPage=d,e.context=c.context,this.opts.element.trigger({type:"select2-loaded",items:c}))})})))},tokenize:function(){},updateResults:function(c){function m(){d.removeClass("select2-active"),h.positionDropdown(),e.find(".select2-no-results,.select2-selection-limit,.select2-searching").length?h.liveRegion.text(e.text()):h.liveRegion.text(h.opts.formatMatches(e.find('.select2-result-selectable:not(".select2-selected")').length))}function n(a){e.html(a),m()}var g,i,l,d=this.search,e=this.results,f=this.opts,h=this,j=d.val(),k=a.data(this.container,"select2-last-term");if((c===!0||!k||!r(j,k))&&(a.data(this.container,"select2-last-term",j),c===!0||this.showSearchInput!==!1&&this.opened())){l=++this.queryCount;var o=this.getMaximumSelectionSize();if(o>=1&&(g=this.data(),a.isArray(g)&&g.length>=o&&J(f.formatSelectionTooBig,"formatSelectionTooBig")))return n("<li class='select2-selection-limit'>"+K(f.formatSelectionTooBig,f.element,o)+"</li>"),void 0;if(d.val().length<f.minimumInputLength)return J(f.formatInputTooShort,"formatInputTooShort")?n("<li class='select2-no-results'>"+K(f.formatInputTooShort,f.element,d.val(),f.minimumInputLength)+"</li>"):n(""),c&&this.showSearch&&this.showSearch(!0),void 0;if(f.maximumInputLength&&d.val().length>f.maximumInputLength)return J(f.formatInputTooLong,"formatInputTooLong")?n("<li class='select2-no-results'>"+K(f.formatInputTooLong,f.element,d.val(),f.maximumInputLength)+"</li>"):n(""),void 0;f.formatSearching&&0===this.findHighlightableChoices().length&&n("<li class='select2-searching'>"+K(f.formatSearching,f.element)+"</li>"),d.addClass("select2-active"),this.removeHighlight(),i=this.tokenize(),i!=b&&null!=i&&d.val(i),this.resultsPage=1,f.query({element:f.element,term:d.val(),page:this.resultsPage,context:null,matcher:f.matcher,callback:this.bind(function(g){var i;if(l==this.queryCount){if(!this.opened())return this.search.removeClass("select2-active"),void 0;if(g.hasError!==b&&J(f.formatAjaxError,"formatAjaxError"))return n("<li class='select2-ajax-error'>"+K(f.formatAjaxError,f.element,g.jqXHR,g.textStatus,g.errorThrown)+"</li>"),void 0;if(this.context=g.context===b?null:g.context,this.opts.createSearchChoice&&""!==d.val()&&(i=this.opts.createSearchChoice.call(h,d.val(),g.results),i!==b&&null!==i&&h.id(i)!==b&&null!==h.id(i)&&0===a(g.results).filter(function(){return r(h.id(this),h.id(i))}).length&&this.opts.createSearchChoicePosition(g.results,i)),0===g.results.length&&J(f.formatNoMatches,"formatNoMatches"))return n("<li class='select2-no-results'>"+K(f.formatNoMatches,f.element,d.val())+"</li>"),void 0;e.empty(),h.opts.populateResults.call(this,e,g.results,{term:d.val(),page:this.resultsPage,context:null}),g.more===!0&&J(f.formatLoadMore,"formatLoadMore")&&(e.append("<li class='select2-more-results'>"+f.escapeMarkup(K(f.formatLoadMore,f.element,this.resultsPage))+"</li>"),window.setTimeout(function(){h.loadMoreIfNeeded()},10)),this.postprocessResults(g,c),m(),this.opts.element.trigger({type:"select2-loaded",items:g})}})})}},cancel:function(){this.close()},blur:function(){this.opts.selectOnBlur&&this.selectHighlighted({noFocus:!0}),this.close(),this.container.removeClass("select2-container-active"),this.search[0]===document.activeElement&&this.search.blur(),this.clearSearch(),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus")},focusSearch:function(){y(this.search)},selectHighlighted:function(a){if(this._touchMoved)return this.clearTouchMoved(),void 0;var b=this.highlight(),c=this.results.find(".select2-highlighted"),d=c.closest(".select2-result").data("select2-data");d?(this.highlight(b),this.onSelect(d,a)):a&&a.noFocus&&this.close()},getPlaceholder:function(){var a;return this.opts.element.attr("placeholder")||this.opts.element.attr("data-placeholder")||this.opts.element.data("placeholder")||this.opts.placeholder||((a=this.getPlaceholderOption())!==b?a.text():b)},getPlaceholderOption:function(){if(this.select){var c=this.select.children("option").first();if(this.opts.placeholderOption!==b)return"first"===this.opts.placeholderOption&&c||"function"==typeof this.opts.placeholderOption&&this.opts.placeholderOption(this.select);if(""===a.trim(c.text())&&""===c.val())return c}},initContainerWidth:function(){function c(){var c,d,e,f,g,h;if("off"===this.opts.width)return null;if("element"===this.opts.width)return 0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px";if("copy"===this.opts.width||"resolve"===this.opts.width){if(c=this.opts.element.attr("style"),c!==b)for(d=c.split(";"),f=0,g=d.length;g>f;f+=1)if(h=d[f].replace(/\s/g,""),e=h.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i),null!==e&&e.length>=1)return e[1];return"resolve"===this.opts.width?(c=this.opts.element.css("width"),c.indexOf("%")>0?c:0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px"):null}return a.isFunction(this.opts.width)?this.opts.width():this.opts.width}var d=c.call(this);null!==d&&this.container.css("width",d)}}),d=O(c,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container"}).html(["<a href='javascript:void(0)' class='select2-choice' tabindex='-1'>","   <span class='select2-chosen'>&#160;</span><abbr class='select2-search-choice-close'></abbr>","   <span class='select2-arrow' role='presentation'><b role='presentation'></b></span>","</a>","<label for='' class='select2-offscreen'></label>","<input class='select2-focusser select2-offscreen' type='text' aria-haspopup='true' role='button' />","<div class='select2-drop select2-display-none'>","   <div class='select2-search'>","       <label for='' class='select2-offscreen'></label>","       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input' role='combobox' aria-expanded='true'","       aria-autocomplete='list' />","   </div>","   <ul class='select2-results' role='listbox'>","   </ul>","</div>"].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(["<ul class='select2-choices'>","  <li class='select2-search-field'>","    <label for='' class='select2-offscreen'></label>","    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>","  </li>","</ul>","<div class='select2-drop select2-drop-multi select2-display-none'>","   <ul class='select2-results'>","   </ul>","</div>"].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;c<e.length;c++)for(var g=e[c],h=0;h<f.length;h++){var i=f[h];if(r(g,b.id(i))){a.push(i),f.splice(h,1);break}}d(a)}:a.noop})}),b},selectChoice:function(a){var b=this.container.find(".select2-search-choice-focus");b.length&&a&&a[0]==b[0]||(b.length&&this.opts.element.trigger("choice-deselected",b),b.removeClass("select2-search-choice-focus"),a&&a.length&&(this.close(),a.addClass("select2-search-choice-focus"),this.opts.element.trigger("choice-selected",a)))},destroy:function(){a("label[for='"+this.search.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments),N.call(this,"searchContainer","selection")},initContainer:function(){var c,b=".select2-choices";this.searchContainer=this.container.find(".select2-search-field"),this.selection=c=this.container.find(b);var d=this;this.selection.on("click",".select2-container:not(.select2-container-disabled) .select2-search-choice:not(.select2-locked)",function(){d.search[0].focus(),d.selectChoice(a(this))}),this.search.attr("id","s2id_autogen"+f()),this.search.prev().text(a("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(){this.search.attr("placeholder")&&0==this.search.val().length||this.isInterfaceEnabled()&&(this.opened()||this.open())})),this.search.attr("tabindex",this.elementTabIndex),this.keydowns=0,this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()){++this.keydowns;var b=c.find(".select2-search-choice-focus"),d=b.prev(".select2-search-choice:not(.select2-locked)"),e=b.next(".select2-search-choice:not(.select2-locked)"),f=z(this.search);if(b.length&&(a.which==k.LEFT||a.which==k.RIGHT||a.which==k.BACKSPACE||a.which==k.DELETE||a.which==k.ENTER)){var g=b;return a.which==k.LEFT&&d.length?g=d:a.which==k.RIGHT?g=e.length?e:null:a.which===k.BACKSPACE?this.unselect(b.first())&&(this.search.width(10),g=d.length?d:e):a.which==k.DELETE?this.unselect(b.first())&&(this.search.width(10),g=e.length?e:null):a.which==k.ENTER&&(g=null),this.selectChoice(g),A(a),g&&g.length||this.open(),void 0}if((a.which===k.BACKSPACE&&1==this.keydowns||a.which==k.LEFT)&&0==f.offset&&!f.length)return this.selectChoice(c.find(".select2-search-choice:not(.select2-locked)").last()),A(a),void 0;if(this.selectChoice(null),this.opened())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}),this.close(),void 0;case k.ESC:return this.cancel(a),A(a),void 0}if(a.which!==k.TAB&&!k.isControl(a)&&!k.isFunctionKey(a)&&a.which!==k.BACKSPACE&&a.which!==k.ESC){if(a.which===k.ENTER){if(this.opts.openOnEnter===!1)return;if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return}this.open(),(a.which===k.PAGE_UP||a.which===k.PAGE_DOWN)&&A(a),a.which===k.ENTER&&A(a)}}})),this.search.on("keyup",this.bind(function(){this.keydowns=0,this.resizeSearch()})),this.search.on("blur",this.bind(function(b){this.container.removeClass("select2-container-active"),this.search.removeClass("select2-focused"),this.selectChoice(null),this.opened()||this.clearSearch(),b.stopImmediatePropagation(),this.opts.element.trigger(a.Event("select2-blur"))})),this.container.on("click",b,this.bind(function(b){this.isInterfaceEnabled()&&(a(b.target).closest(".select2-search-choice").length>0||(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("<li class='select2-search-choice'>    <div></div>    <a href='#' class='select2-search-choice-close' tabindex='-1'></a></li>"),f=a("<li class='select2-search-choice select2-locked'><div></div></li>"),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("<div></div>").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("<li class='select2-no-results'>"+K(g.opts.formatNoMatches,g.opts.element,g.search.val())+"</li>")},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;c<b.length;c++)for(var d=0;d<a.length;d++)r(this.opts.id(b[c]),this.opts.id(a[d]))&&(b.splice(c,1),c>0&&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 <select>. Attach to <input type='hidden'/> 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 <adel@kedjour.com>
+ */
+(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 <farhad.safarov@gmail.com>
+ */
+(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 <lubomirvikev@gmail.com>
+ * @author  Uriy Efremochkin <efremochkin@uriy.me>
+ */
+(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 <david.planella@gmail.com>
+ */
+(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 <ahoj@michal-marek.cz>
+ * Author - sklonovani: David Vallner <david@vallner.net>
+ */
+(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 <anders@jenbo.dk>
+ */
+(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 <efremochkin@uriy.me>
+ */
+(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 <Language> translation.
+ *
+ * Author: Your Name <your@email>
+ */
+(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 <kuldar@kalvik.ee>
+ */
+(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 <julenx at gmail dot com>
+ */
+(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 <choopan@arsh.co>
+ * Author: Ebrahim Byagowi <ebrahim@gnu.org>
+ */
+(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 <leandro.regueiro@gmail.com>
+ */
+(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 <http://www.yakirs.net/>
+*/
+(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ć <edi.modric@gmail.com>
+ * @author  Uriy Efremochkin <efremochkin@uriy.me>
+ */
+(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 <ibrahim7usuf@gmail.com>
+ */
+(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 <longfinfunnel@gmail.com>
+ */
+(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 <cronus dot karmalakas at gmail dot com>
+ * @author  Uriy Efremochkin <efremochkin@uriy.me>
+ */
+(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 <efremochkin@uriy.me>
+ */
+(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 <psybaron@gmail.com>
+ */
+(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 <kepoweran@gmail.com>
+ */
+(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 <torgeir.veimo@gmail.com>
+ * Author: Bjørn Johansen <post@bjornjohansen.no>
+ */
+(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 <jan@kondratowicz.pl>
+ * @author  Uriy Efremochkin <efremochkin@uriy.me>
+ * @author  Michał Połtyn <mike@poltyn.com>
+ * @author  Damian Zajkowski <damian.zajkowski@gmail.com>
+ */
+(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 <limon.monte@gmail.com>
+ */
+(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 <efremochkin@uriy.me>
+ */
+(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 <david@vallner.net>
+ */
+(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 <jens.rantil@telavox.com>
+ */
+(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 <joke@nakhon.net>
+ */
+(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 <salim.kayabasi@gmail.com>
+ */
+(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 <bigmihail@bigmir.net>
+ * @author  Uriy Efremochkin <efremochkin@uriy.me>
+ */
+(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 <olragon@gmail.com>
+ */
+(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/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 225466ca453..d4b79af8013 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -610,6 +610,21 @@ IMG;
 			closedir($handle);
 		}
 	}
+
+	/**
+	 * return the value present on odt in [valuename][/valuename]
+	 * @param string $value name balise in the template
+	 * @return string the value inside the balise
+	 *
+	 */
+	public function getvalue($valuename)
+	{
+		$searchreg="/\\[".$valuename."\\](.*)\\[\\/".$valuename."\\]/";
+		preg_match($searchreg, $this->contentXml, $matches); 
+		$this->contentXml = preg_replace($searchreg, "", $this->contentXml);
+		return  $matches[1];
+	}
+
 }
 
 ?>
diff --git a/htdocs/includes/phpexcel/PHPExcel.php b/htdocs/includes/phpexcel/PHPExcel.php
index cdb4ab95012..f0b39e7961a 100644
--- a/htdocs/includes/phpexcel/PHPExcel.php
+++ b/htdocs/includes/phpexcel/PHPExcel.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -38,7 +38,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel
 {
@@ -127,6 +127,11 @@ class PHPExcel
 	}
 
 
+	/**
+	 * Disconnect all worksheets from this PHPExcel workbook object,
+	 *    typically so that the PHPExcel object can be unset
+	 *
+	 */
 	public function disconnectWorksheets() {
 		foreach($this->_workSheetCollection as $k => &$worksheet) {
 			$worksheet->disconnectCells();
@@ -189,15 +194,28 @@ class PHPExcel
     /**
      * Create sheet and add it to this workbook
      *
+	 * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
      * @return PHPExcel_Worksheet
+     * @throws Exception
      */
-    public function createSheet($iSheetIndex = null)
+    public function createSheet($iSheetIndex = NULL)
     {
         $newSheet = new PHPExcel_Worksheet($this);
         $this->addSheet($newSheet, $iSheetIndex);
         return $newSheet;
     }
 
+    /**
+     * Chech if a sheet with a specified name already exists
+     *
+     * @param string $pSheetName  Name of the worksheet to check
+     * @return boolean
+     */
+    public function sheetNameExists($pSheetName)
+    {
+		return ($this->getSheetByName($pSheetName) !== NULL);
+    }
+
     /**
      * Add sheet
      *
@@ -206,14 +224,18 @@ class PHPExcel
      * @return PHPExcel_Worksheet
      * @throws Exception
      */
-    public function addSheet(PHPExcel_Worksheet $pSheet = null, $iSheetIndex = null)
+    public function addSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = NULL)
     {
-        if(is_null($iSheetIndex))
-        {
+		if ($this->sheetNameExists($pSheet->getTitle())) {
+			throw new Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename this worksheet first.");
+		}
+
+        if($iSheetIndex === NULL) {
+            if ($this->_activeSheetIndex < 0) {
+            	$this->_activeSheetIndex = 0;
+            }
             $this->_workSheetCollection[] = $pSheet;
-        }
-        else
-        {
+        } else {
             // Insert the sheet at the requested index
             array_splice(
                 $this->_workSheetCollection,
@@ -226,7 +248,6 @@ class PHPExcel
 			if ($this->_activeSheetIndex >= $iSheetIndex) {
 				++$this->_activeSheetIndex;
 			}
-
         }
 		return $pSheet;
     }
@@ -244,6 +265,12 @@ class PHPExcel
 		} else {
 			array_splice($this->_workSheetCollection, $pIndex, 1);
 		}
+		// Adjust active sheet index if necessary
+		if (($this->_activeSheetIndex >= $pIndex) &&
+			($pIndex > count($this->_workSheetCollection) - 1)) {
+			--$this->_activeSheetIndex;
+		}
+
 	}
 
 	/**
@@ -379,7 +406,7 @@ class PHPExcel
 	public function setActiveSheetIndexByName($pValue = '')
 	{
 		if (($worksheet = $this->getSheetByName($pValue)) instanceof PHPExcel_Worksheet) {
-			$this->setActiveSheetIndex($worksheet->getParent()->getIndex($worksheet));
+			$this->setActiveSheetIndex($this->getIndex($worksheet));
 			return $worksheet;
 		}
 
@@ -396,7 +423,7 @@ class PHPExcel
 		$returnValue = array();
 		$worksheetCount = $this->getSheetCount();
 		for ($i = 0; $i < $worksheetCount; ++$i) {
-			array_push($returnValue, $this->getSheet($i)->getTitle());
+			$returnValue[] = $this->getSheet($i)->getTitle();
 		}
 
 		return $returnValue;
@@ -411,7 +438,7 @@ class PHPExcel
 	 * @return PHPExcel_Worksheet
 	 */
 	public function addExternalSheet(PHPExcel_Worksheet $pSheet, $iSheetIndex = null) {
-		if (!is_null($this->getSheetByName($pSheet->getTitle()))) {
+		if ($this->sheetNameExists($pSheet->getTitle())) {
 			throw new Exception("Workbook already contains a worksheet named '{$pSheet->getTitle()}'. Rename the external sheet first.");
 		}
 
@@ -471,14 +498,14 @@ class PHPExcel
 	public function getNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
 		$returnValue = null;
 
-		if ($namedRange != '' && !is_null($namedRange)) {
+		if ($namedRange != '' && ($namedRange !== NULL)) {
 			// first look for global defined name
 			if (isset($this->_namedRanges[$namedRange])) {
 				$returnValue = $this->_namedRanges[$namedRange];
 			}
 
 			// then look for local defined name (has priority over global defined name if both names exist)
-			if (!is_null($pSheet) && isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
+			if (($pSheet !== NULL) && isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
 				$returnValue = $this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange];
 			}
 		}
@@ -489,12 +516,12 @@ class PHPExcel
 	/**
 	 * Remove named range
 	 *
-	 * @param string $namedRange
-	 * @param PHPExcel_Worksheet|null $pSheet. Scope. Use null for global scope.
+	 * @param  string  $namedRange
+	 * @param  PHPExcel_Worksheet|null  $pSheet  Scope: use null for global scope.
 	 * @return PHPExcel
 	 */
 	public function removeNamedRange($namedRange, PHPExcel_Worksheet $pSheet = null) {
-		if (is_null($pSheet)) {
+		if ($pSheet === NULL) {
 			if (isset($this->_namedRanges[$namedRange])) {
 				unset($this->_namedRanges[$namedRange]);
 			}
@@ -556,7 +583,7 @@ class PHPExcel
 	/**
 	 * Get cellXf by index
 	 *
-	 * @param int $index
+	 * @param int $pIndex
 	 * @return PHPExcel_Style
 	 */
 	public function getCellXfByIndex($pIndex = 0)
@@ -597,7 +624,7 @@ class PHPExcel
 	/**
 	 * Add a cellXf to the workbook
 	 *
-	 * @param PHPExcel_Style
+	 * @param PHPExcel_Style $style
 	 */
 	public function addCellXf(PHPExcel_Style $style)
 	{
@@ -761,7 +788,7 @@ class PHPExcel
 		}
 
 		// make sure there is always at least one cellXf (there should be)
-		if (count($this->_cellXfCollection) == 0) {
+		if (empty($this->_cellXfCollection)) {
 			$this->_cellXfCollection[] = new PHPExcel_Style();
 		}
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Autoloader.php b/htdocs/includes/phpexcel/PHPExcel/Autoloader.php
index 1164cf1f7cd..15193278b63 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Autoloader.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Autoloader.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,41 +20,66 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
+ * @version    1.7.8, 2012-10-12
  */
 
 PHPExcel_Autoloader::Register();
+//	As we always try to run the autoloader before anything else, we can use it to do a few
+//		simple checks and initialisations
 PHPExcel_Shared_ZipStreamWrapper::register();
 // check mbstring.func_overload
 if (ini_get('mbstring.func_overload') & 2) {
-	throw new Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
+    throw new Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
 }
 PHPExcel_Shared_String::buildCharacterSets();
 
 
+/**
+ * PHPExcel_Autoloader
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
 class PHPExcel_Autoloader
 {
+	/**
+	 * Register the Autoloader with SPL
+	 *
+	 */
 	public static function Register() {
+		if (function_exists('__autoload')) {
+			//	Register any existing autoloader function with SPL, so we don't get any clashes
+			spl_autoload_register('__autoload');
+		}
+		//	Register ourselves with SPL
 		return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'));
 	}	//	function Register()
 
 
-	public static function Load($pObjectName){
-		if ((class_exists($pObjectName)) || (strpos($pObjectName, 'PHPExcel') === False)) {
-			return false;
+	/**
+	 * Autoload a class identified by name
+	 *
+	 * @param	string	$pClassName		Name of the object to load
+	 */
+	public static function Load($pClassName){
+		if ((class_exists($pClassName,FALSE)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
+			//	Either already loaded, or not a PHPExcel class request
+			return FALSE;
 		}
 
-		$pObjectFilePath =	PHPEXCEL_ROOT.
-							str_replace('_',DIRECTORY_SEPARATOR,$pObjectName).
-							'.php';
+		$pClassFilePath = PHPEXCEL_ROOT .
+						  str_replace('_',DIRECTORY_SEPARATOR,$pClassName) .
+						  '.php';
 
-		if ((file_exists($pObjectFilePath) === false) || (is_readable($pObjectFilePath) === false)) {
-			return false;
+		if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
+			//	Can't load
+			return FALSE;
 		}
 
-		require($pObjectFilePath);
+		require($pClassFilePath);
 	}	//	function Load()
 
 }
\ No newline at end of file
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/APC.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/APC.php
index 64262c0a847..9dab5581480 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/APC.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/APC.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,33 +31,57 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
+	/**
+	 * Prefix used to uniquely identify cache data for this worksheet
+	 *
+	 * @access	private
+	 * @var string
+	 */
 	private $_cachePrefix = null;
 
+	/**
+	 * Cache timeout
+	 *
+	 * @access	private
+	 * @var integer
+	 */
 	private $_cacheTime = 600;
 
 
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @access	private
+	 * @return	void
+     * @throws	Exception
+     */
 	private function _storeData() {
-		$this->_currentObject->detach();
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
 
-		if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) {
-			$this->__destruct();
-			throw new Exception('Failed to store cell '.$cellID.' in APC');
+			if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) {
+				$this->__destruct();
+				throw new Exception('Failed to store cell '.$this->_currentObjectID.' in APC');
+			}
+			$this->_currentCellIsDirty = false;
 		}
 		$this->_currentObjectID = $this->_currentObject = null;
 	}	//	function _storeData()
 
 
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+	 * @access	public
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@@ -67,17 +91,19 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 
 		$this->_currentObjectID = $pCoord;
 		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
 
 		return $cell;
 	}	//	function addCacheData()
 
 
 	/**
-	 *	Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
 	 *
-	 *	@param	string		$pCoord		Coordinate address of the cell to check
-	 *	@return	void
-	 *	@return	boolean
+	 * @access	public
+	 * @param	string		$pCoord		Coordinate address of the cell to check
+	 * @return	void
+	 * @return	boolean
 	 */
 	public function isDataSet($pCoord) {
 		//	Check if the requested entry is the current object, or exists in the cache
@@ -90,7 +116,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 			if ($success === false) {
 				//	Entry no longer exists in APC, so clear it from the cache array
 				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$cellID.' no longer exists in APC');
+				throw new Exception('Cell entry '.$pCoord.' no longer exists in APC');
 			}
 			return true;
 		}
@@ -101,6 +127,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
     /**
      * Get cell at a specific coordinate
      *
+	 * @access	public
      * @param 	string 			$pCoord		Coordinate of the cell
      * @throws 	Exception
      * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
@@ -117,7 +144,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 			if ($obj === false) {
 				//	Entry no longer exists in APC, so clear it from the cache array
 				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$cellID.' no longer exists in APC');
+				throw new Exception('Cell entry '.$pCoord.' no longer exists in APC');
 			}
 		} else {
 			//	Return null if requested entry doesn't exist in cache
@@ -136,10 +163,11 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 
 
     /**
-     *	Delete a cell in cache identified by coordinate address
+     * Delete a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to delete
-     *	@throws	Exception
+	 * @access	public
+     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @throws	Exception
      */
 	public function deleteCacheData($pCoord) {
 		//	Delete the entry from APC
@@ -151,9 +179,11 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 
 
 	/**
-	 *	Clone the cell collection
+	 * Clone the cell collection
 	 *
-	 *	@return	void
+	 * @access	public
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		parent::copyCellCollection($parent);
@@ -179,8 +209,13 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 	}	//	function copyCellCollection()
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
+		if ($this->_currentObject !== NULL) {
 			$this->_currentObject->detach();
 			$this->_currentObject = $this->_currentObjectID = null;
 		}
@@ -195,10 +230,16 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 	}	//	function unsetWorksheetCells()
 
 
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 * @param	array of mixed		$arguments	Additional initialisation arguments
+	 */
 	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
 		$cacheTime	= (isset($arguments['cacheTime']))	? $arguments['cacheTime']	: 600;
 
-		if (is_null($this->_cachePrefix)) {
+		if ($this->_cachePrefix === NULL) {
 			$baseUnique = $this->_getUniqueID();
 			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
 			$this->_cacheTime = $cacheTime;
@@ -208,6 +249,9 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 	}	//	function __construct()
 
 
+	/**
+	 * Destroy this cell collection
+	 */
 	public function __destruct() {
 		$cacheList = $this->getCellList();
 		foreach($cacheList as $cellID) {
@@ -215,4 +259,22 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
 		}
 	}	//	function __destruct()
 
+
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable() {
+		if (!function_exists('apc_store')) {
+			return false;
+		}
+		if (apc_sma_info() === false) {
+			return false;
+		}
+
+		return true;
+	}
+
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
index 0430be9093e..d2eea08bb97 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,41 +31,53 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class PHPExcel_CachedObjectStorage_CacheBase {
+abstract class PHPExcel_CachedObjectStorage_CacheBase {
 
 	/**
-	 *	Parent worksheet
+	 * Parent worksheet
 	 *
-	 *	@var PHPExcel_Worksheet
+	 * @var PHPExcel_Worksheet
 	 */
 	protected $_parent;
 
 	/**
-	 *	The currently active Cell
+	 * The currently active Cell
 	 *
-	 *	@var PHPExcel_Cell
+	 * @var PHPExcel_Cell
 	 */
 	protected $_currentObject = null;
 
 	/**
-	 *	Coordinate address of the currently active Cell
+	 * Coordinate address of the currently active Cell
 	 *
-	 *	@var string
+	 * @var string
 	 */
 	protected $_currentObjectID = null;
 
 
 	/**
-	 *	An array of cells or cell pointers for the worksheet cells held in this cache,
+	 * Flag indicating whether the currently active Cell requires saving
+	 *
+	 * @var boolean
+	 */
+	protected $_currentCellIsDirty = true;
+
+	/**
+	 * An array of cells or cell pointers for the worksheet cells held in this cache,
 	 *		and indexed by their coordinate address within the worksheet
 	 *
-	 *	@var array of mixed
+	 * @var array of mixed
 	 */
 	protected $_cellCache = array();
 
 
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 */
 	public function __construct(PHPExcel_Worksheet $parent) {
 		//	Set our parent worksheet.
 		//	This is maintained within the cache controller to facilitate re-attaching it to PHPExcel_Cell objects when
@@ -75,11 +87,10 @@ class PHPExcel_CachedObjectStorage_CacheBase {
 
 
 	/**
-	 *	Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
 	 *
-	 *	@param	string		$pCoord		Coordinate address of the cell to check
-	 *	@return	void
-	 *	@return	boolean
+	 * @param	string		$pCoord		Coordinate address of the cell to check
+	 * @return	boolean
 	 */
 	public function isDataSet($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
@@ -91,11 +102,11 @@ class PHPExcel_CachedObjectStorage_CacheBase {
 
 
     /**
-     *	Add or Update a cell in cache
+     * Add or Update a cell in cache
      *
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function updateCacheData(PHPExcel_Cell $cell) {
 		return $this->addCacheData($cell->getCoordinate(),$cell);
@@ -103,10 +114,10 @@ class PHPExcel_CachedObjectStorage_CacheBase {
 
 
     /**
-     *	Delete a cell in cache identified by coordinate address
+     * Delete a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to delete
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @throws	Exception
      */
 	public function deleteCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
@@ -118,13 +129,14 @@ class PHPExcel_CachedObjectStorage_CacheBase {
 			$this->_cellCache[$pCoord]->detach();
 			unset($this->_cellCache[$pCoord]);
 		}
+		$this->_currentCellIsDirty = false;
 	}	//	function deleteCacheData()
 
 
 	/**
-	 *	Get a list of all cell addresses currently held in cache
+	 * Get a list of all cell addresses currently held in cache
 	 *
-	 *	@return	array of string
+	 * @return	array of string
 	 */
 	public function getCellList() {
 		return array_keys($this->_cellCache);
@@ -132,13 +144,13 @@ class PHPExcel_CachedObjectStorage_CacheBase {
 
 
 	/**
-	 *	Sort the list of all cell addresses currently held in cache by row and column
+	 * Sort the list of all cell addresses currently held in cache by row and column
 	 *
-	 *	@return	void
+	 * @return	void
 	 */
 	public function getSortedCellList() {
 		$sortKeys = array();
-		foreach (array_keys($this->_cellCache) as $coord) {
+		foreach ($this->getCellList() as $coord) {
 			list($column,$row) = sscanf($coord,'%[A-Z]%d');
 			$sortKeys[sprintf('%09d%3s',$row,$column)] = $coord;
 		}
@@ -148,6 +160,62 @@ class PHPExcel_CachedObjectStorage_CacheBase {
 	}	//	function sortCellList()
 
 
+
+	/**
+	 * Get highest worksheet column and highest row that have cell records
+	 *
+	 * @return array Highest column name and highest row number
+	 */
+	public function getHighestRowAndColumn()
+	{
+		// Lookup highest column and highest row
+		$col = array('A' => '1A');
+		$row = array(1);
+		foreach ($this->getCellList() as $coord) {
+			list($c,$r) = sscanf($coord,'%[A-Z]%d');
+			$row[$r] = $r;
+			$col[$c] = strlen($c).$c;
+		}
+		if (!empty($row)) {
+			// Determine highest column and row
+			$highestRow = max($row);
+			$highestColumn = substr(max($col),1);
+		}
+
+		return array( 'row'	   => $highestRow,
+					  'column' => $highestColumn
+					);
+	}
+
+
+	/**
+	 * Get highest worksheet column
+	 *
+	 * @return string Highest column name
+	 */
+	public function getHighestColumn()
+	{
+		$colRow = $this->getHighestRowAndColumn();
+		return $colRow['column'];
+	}
+
+	/**
+	 * Get highest worksheet row
+	 *
+	 * @return int Highest row number
+	 */
+	public function getHighestRow()
+	{
+		$colRow = $this->getHighestRowAndColumn();
+		return $colRow['row'];
+	}
+
+
+	/**
+	 * Generate a unique ID for cache referencing
+	 *
+	 * @return string Unique Reference
+	 */
 	protected function _getUniqueID() {
 		if (function_exists('posix_getpid')) {
 			$baseUnique = posix_getpid();
@@ -158,15 +226,27 @@ class PHPExcel_CachedObjectStorage_CacheBase {
 	}
 
 	/**
-	 *	Clone the cell collection
+	 * Clone the cell collection
 	 *
-	 *	@return	void
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		$this->_parent = $parent;
-		if ((!is_null($this->_currentObject)) && (is_object($this->_currentObject))) {
+		if (($this->_currentObject !== NULL) && (is_object($this->_currentObject))) {
 			$this->_currentObject->attach($parent);
 		}
 	}	//	function copyCellCollection()
 
+
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable() {
+		return true;
+	}
+
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
index e3116543a1e..805dc063ace 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,34 +31,62 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
+	/**
+	 * Name of the file for this cache
+	 *
+	 * @var string
+	 */
 	private $_fileName = null;
+
+	/**
+	 * File handle for this cache file
+	 *
+	 * @var resource
+	 */
 	private $_fileHandle = null;
 
+	/**
+	 * Directory/Folder where the cache file is located
+	 *
+	 * @var string
+	 */
+	private $_cacheDirectory = NULL;
 
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
 	private function _storeData() {
-		$this->_currentObject->detach();
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
 
-		fseek($this->_fileHandle,0,SEEK_END);
-		$offset = ftell($this->_fileHandle);
-		fwrite($this->_fileHandle, serialize($this->_currentObject));
-		$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
-															'sz'  => ftell($this->_fileHandle) - $offset
-														   );
+			fseek($this->_fileHandle,0,SEEK_END);
+			$offset = ftell($this->_fileHandle);
+			fwrite($this->_fileHandle, serialize($this->_currentObject));
+			$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
+																'sz'  => ftell($this->_fileHandle) - $offset
+															   );
+			$this->_currentCellIsDirty = false;
+		}
 		$this->_currentObjectID = $this->_currentObject = null;
 	}	//	function _storeData()
 
 
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@@ -67,6 +95,7 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
 
 		$this->_currentObjectID = $pCoord;
 		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
 
 		return $cell;
 	}	//	function addCacheData()
@@ -104,15 +133,16 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
 
 
 	/**
-	 *	Clone the cell collection
+	 * Clone the cell collection
 	 *
-	 *	@return	void
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		parent::copyCellCollection($parent);
 		//	Get a new id for the new file name
 		$baseUnique = $this->_getUniqueID();
-		$newFileName = PHPExcel_Shared_File::sys_get_temp_dir().'/PHPExcel.'.$baseUnique.'.cache';
+		$newFileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
 		//	Copy the existing cell cache file
 		copy ($this->_fileName,$newFileName);
 		$this->_fileName = $newFileName;
@@ -121,6 +151,11 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
 	}	//	function copyCellCollection()
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
 		if(!is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
@@ -136,16 +171,29 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
 	}	//	function unsetWorksheetCells()
 
 
-	public function __construct(PHPExcel_Worksheet $parent) {
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 * @param	array of mixed		$arguments	Additional initialisation arguments
+	 */
+	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
+		$this->_cacheDirectory	= ((isset($arguments['dir'])) && ($arguments['dir'] !== NULL))
+									? $arguments['dir']
+									: PHPExcel_Shared_File::sys_get_temp_dir();
+
 		parent::__construct($parent);
 		if (is_null($this->_fileHandle)) {
 			$baseUnique = $this->_getUniqueID();
-			$this->_fileName = PHPExcel_Shared_File::sys_get_temp_dir().'/PHPExcel.'.$baseUnique.'.cache';
+			$this->_fileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
 			$this->_fileHandle = fopen($this->_fileName,'a+');
 		}
 	}	//	function __construct()
 
 
+	/**
+	 * Destroy this cell collection
+	 */
 	public function __destruct() {
 		if (!is_null($this->_fileHandle)) {
 			fclose($this->_fileHandle);
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/ICache.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
index 35215a0f645..56f621a597b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,74 +31,82 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_CachedObjectStorage_ICache
 {
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell);
 
     /**
-     *	Add or Update a cell in cache
+     * Add or Update a cell in cache
      *
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function updateCacheData(PHPExcel_Cell $cell);
 
     /**
-     *	Fetch a cell from cache identified by coordinate address
+     * Fetch a cell from cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to retrieve
-     *	@return PHPExcel_Cell 	Cell that was found, or null if not found
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to retrieve
+     * @return PHPExcel_Cell 	Cell that was found, or null if not found
+     * @throws	Exception
      */
 	public function getCacheData($pCoord);
 
     /**
-     *	Delete a cell in cache identified by coordinate address
+     * Delete a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to delete
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @throws	Exception
      */
 	public function deleteCacheData($pCoord);
 
 	/**
-	 *	Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
 	 *
-	 *	@param	string		$pCoord		Coordinate address of the cell to check
-	 *	@return	void
-	 *	@return	boolean
+	 * @param	string		$pCoord		Coordinate address of the cell to check
+	 * @return	boolean
 	 */
 	public function isDataSet($pCoord);
 
 	/**
-	 *	Get a list of all cell addresses currently held in cache
+	 * Get a list of all cell addresses currently held in cache
 	 *
-	 *	@return	array of string
+	 * @return	array of string
 	 */
 	public function getCellList();
 
 	/**
-	 *	Get the list of all cell addresses currently held in cache sorted by column and row
+	 * Get the list of all cell addresses currently held in cache sorted by column and row
 	 *
-	 *	@return	void
+	 * @return	void
 	 */
 	public function getSortedCellList();
 
 	/**
-	 *	Clone the cell collection
+	 * Clone the cell collection
 	 *
-	 *	@return	void
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent);
 
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable();
+
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
new file mode 100644
index 00000000000..fc2f1129917
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_CachedObjectStorage_Igbinary
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
+	private function _storeData() {
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
+
+			$this->_cellCache[$this->_currentObjectID] = igbinary_serialize($this->_currentObject);
+			$this->_currentCellIsDirty = false;
+		}
+		$this->_currentObjectID = $this->_currentObject = null;
+	}	//	function _storeData()
+
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
+     */
+	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+			$this->_storeData();
+		}
+
+		$this->_currentObjectID = $pCoord;
+		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
+
+		return $cell;
+	}	//	function addCacheData()
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param 	string 			$pCoord		Coordinate of the cell
+     * @throws 	Exception
+     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     */
+	public function getCacheData($pCoord) {
+		if ($pCoord === $this->_currentObjectID) {
+			return $this->_currentObject;
+		}
+		$this->_storeData();
+
+		//	Check if the entry that has been requested actually exists
+		if (!isset($this->_cellCache[$pCoord])) {
+			//	Return null if requested entry doesn't exist in cache
+			return null;
+		}
+
+		//	Set current entry to the requested entry
+		$this->_currentObjectID = $pCoord;
+		$this->_currentObject = igbinary_unserialize($this->_cellCache[$pCoord]);
+		//	Re-attach the parent worksheet
+		$this->_currentObject->attach($this->_parent);
+
+		//	Return requested entry
+		return $this->_currentObject;
+	}	//	function getCacheData()
+
+
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
+	public function unsetWorksheetCells() {
+		if(!is_null($this->_currentObject)) {
+			$this->_currentObject->detach();
+			$this->_currentObject = $this->_currentObjectID = null;
+		}
+		$this->_cellCache = array();
+
+		//	detach ourself from the worksheet, so that it can then delete this object successfully
+		$this->_parent = null;
+	}	//	function unsetWorksheetCells()
+
+
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable() {
+		if (!function_exists('igbinary_serialize')) {
+			return false;
+		}
+
+		return true;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
index ce8ef9c2a32..23d6957281f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,38 +31,63 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
+	/**
+	 * Prefix used to uniquely identify cache data for this worksheet
+	 *
+	 * @var string
+	 */
 	private $_cachePrefix = null;
 
+	/**
+	 * Cache timeout
+	 *
+	 * @var integer
+	 */
 	private $_cacheTime = 600;
 
+	/**
+	 * Memcache interface
+	 *
+	 * @var resource
+	 */
 	private $_memcache = null;
 
 
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
 	private function _storeData() {
-		$this->_currentObject->detach();
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
 
-		$obj = serialize($this->_currentObject);
-		if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-			if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-				$this->__destruct();
-				throw new Exception('Failed to store cell '.$cellID.' in MemCache');
+			$obj = serialize($this->_currentObject);
+			if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
+				if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
+					$this->__destruct();
+					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache');
+				}
 			}
+			$this->_currentCellIsDirty = false;
 		}
 		$this->_currentObjectID = $this->_currentObject = null;
 	}	//	function _storeData()
 
 
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@@ -72,17 +97,18 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 
 		$this->_currentObjectID = $pCoord;
 		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
 
 		return $cell;
 	}	//	function addCacheData()
 
 
 	/**
-	 *	Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
 	 *
-	 *	@param	string		$pCoord		Coordinate address of the cell to check
-	 *	@return	void
-	 *	@return	boolean
+	 * @param	string		$pCoord		Coordinate address of the cell to check
+	 * @return	void
+	 * @return	boolean
 	 */
 	public function isDataSet($pCoord) {
 		//	Check if the requested entry is the current object, or exists in the cache
@@ -95,7 +121,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 			if ($success === false) {
 				//	Entry no longer exists in Memcache, so clear it from the cache array
 				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache');
+				throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
 			}
 			return true;
 		}
@@ -122,7 +148,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 			if ($obj === false) {
 				//	Entry no longer exists in Memcache, so clear it from the cache array
 				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache');
+				throw new Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
 			}
 		} else {
 			//	Return null if requested entry doesn't exist in cache
@@ -141,10 +167,10 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 
 
     /**
-     *	Delete a cell in cache identified by coordinate address
+     * Delete a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to delete
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @throws	Exception
      */
 	public function deleteCacheData($pCoord) {
 		//	Delete the entry from Memcache
@@ -156,9 +182,10 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 
 
 	/**
-	 *	Clone the cell collection
+	 * Clone the cell collection
 	 *
-	 *	@return	void
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		parent::copyCellCollection($parent);
@@ -184,6 +211,11 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 	}	//	function copyCellCollection()
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
 		if(!is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
@@ -200,6 +232,12 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 	}	//	function unsetWorksheetCells()
 
 
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 * @param	array of mixed		$arguments	Additional initialisation arguments
+	 */
 	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
 		$memcacheServer	= (isset($arguments['memcacheServer']))	? $arguments['memcacheServer']	: 'localhost';
 		$memcachePort	= (isset($arguments['memcachePort']))	? $arguments['memcachePort']	: 11211;
@@ -221,11 +259,21 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 	}	//	function __construct()
 
 
+	/**
+	 * Memcache error handler
+	 *
+	 * @param	string	$host		Memcache server
+	 * @param	integer	$port		Memcache port
+     * @throws	Exception
+	 */
 	public function failureCallback($host, $port) {
 		throw new Exception('memcache '.$host.':'.$port.' failed');
 	}
 
 
+	/**
+	 * Destroy this cell collection
+	 */
 	public function __destruct() {
 		$cacheList = $this->getCellList();
 		foreach($cacheList as $cellID) {
@@ -233,4 +281,18 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
 		}
 	}	//	function __destruct()
 
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable() {
+		if (!function_exists('memcache_add')) {
+			return false;
+		}
+
+		return true;
+	}
+
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memory.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
index c0d0b5da927..36f42fb6ccf 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,17 +31,17 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		$this->_cellCache[$pCoord] = $cell;
@@ -68,6 +68,12 @@ class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_C
 	}	//	function getCacheData()
 
 
+	/**
+	 * Clone the cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
+	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		parent::copyCellCollection($parent);
 
@@ -81,6 +87,11 @@ class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_C
 	}
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
 		//	Because cells are all stored as intact objects in memory, we need to detach each one from the parent
 		foreach($this->_cellCache as $k => &$cell) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
index e9ff3c4f43f..ee8e95eb2b5 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,25 +31,35 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
 	private function _storeData() {
-		$this->_currentObject->detach();
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
 
-		$this->_cellCache[$this->_currentObjectID] = gzdeflate(serialize($this->_currentObject));
+			$this->_cellCache[$this->_currentObjectID] = gzdeflate(serialize($this->_currentObject));
+			$this->_currentCellIsDirty = false;
+		}
 		$this->_currentObjectID = $this->_currentObject = null;
 	}	//	function _storeData()
 
 
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@@ -58,6 +68,7 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
 
 		$this->_currentObjectID = $pCoord;
 		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
 
 		return $cell;
 	}	//	function addCacheData()
@@ -93,6 +104,11 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
 	}	//	function getCacheData()
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
 		if(!is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
index 0c3f3bd9ebb..d6b09b530e8 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,25 +31,35 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
 	private function _storeData() {
-		$this->_currentObject->detach();
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
 
-		$this->_cellCache[$this->_currentObjectID] = serialize($this->_currentObject);
+			$this->_cellCache[$this->_currentObjectID] = serialize($this->_currentObject);
+			$this->_currentCellIsDirty = false;
+		}
 		$this->_currentObjectID = $this->_currentObject = null;
 	}	//	function _storeData()
 
 
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@@ -58,6 +68,7 @@ class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjec
 
 		$this->_currentObjectID = $pCoord;
 		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
 
 		return $cell;
 	}	//	function addCacheData()
@@ -93,6 +104,11 @@ class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjec
 	}	//	function getCacheData()
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
 		if(!is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
index aedb8140c99..8dbbe92e8c2 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,35 +31,54 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
+	/**
+	 * Name of the file for this cache
+	 *
+	 * @var string
+	 */
 	private $_fileHandle = null;
 
-
+	/**
+	 * Memory limit to use before reverting to file cache
+	 *
+	 * @var integer
+	 */
 	private $_memoryCacheSize = null;
 
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
 	private function _storeData() {
-		$this->_currentObject->detach();
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
 
-		fseek($this->_fileHandle,0,SEEK_END);
-		$offset = ftell($this->_fileHandle);
-		fwrite($this->_fileHandle, serialize($this->_currentObject));
-		$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
-															'sz'  => ftell($this->_fileHandle) - $offset
-														   );
+			fseek($this->_fileHandle,0,SEEK_END);
+			$offset = ftell($this->_fileHandle);
+			fwrite($this->_fileHandle, serialize($this->_currentObject));
+			$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
+																'sz'  => ftell($this->_fileHandle) - $offset
+															   );
+			$this->_currentCellIsDirty = false;
+		}
 		$this->_currentObjectID = $this->_currentObject = null;
 	}	//	function _storeData()
 
 
     /**
-     *	Add or Update a cell in cache identified by coordinate address
+     * Add or Update a cell in cache identified by coordinate address
      *
-     *	@param	string			$pCoord		Coordinate address of the cell to update
-     *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-     *	@throws	Exception
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@@ -68,6 +87,7 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
 
 		$this->_currentObjectID = $pCoord;
 		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
 
 		return $cell;
 	}	//	function addCacheData()
@@ -105,9 +125,10 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
 
 
 	/**
-	 *	Clone the cell collection
+	 * Clone the cell collection
 	 *
-	 *	@return	void
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		parent::copyCellCollection($parent);
@@ -122,6 +143,11 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
 	}	//	function copyCellCollection()
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
 		if(!is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
@@ -137,7 +163,13 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
 	}	//	function unsetWorksheetCells()
 
 
-	public function __construct(PHPExcel_Worksheet $parent, $memoryCacheSize = '1MB') {
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 * @param	array of mixed		$arguments	Additional initialisation arguments
+	 */
+	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
 		$this->_memoryCacheSize	= (isset($arguments['memoryCacheSize']))	? $arguments['memoryCacheSize']	: '1MB';
 
 		parent::__construct($parent);
@@ -147,6 +179,9 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
 	}	//	function __construct()
 
 
+	/**
+	 * Destroy this cell collection
+	 */
 	public function __destruct() {
 		if (!is_null($this->_fileHandle)) {
 			fclose($this->_fileHandle);
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
new file mode 100644
index 00000000000..e4bf469e0fc
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_CachedObjectStorage_SQLite
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
+
+	/**
+	 * Database table name
+	 *
+	 * @var string
+	 */
+	private $_TableName = null;
+
+	/**
+	 * Database handle
+	 *
+	 * @var resource
+	 */
+	private $_DBHandle = null;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
+	private function _storeData() {
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
+
+			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
+				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+			$this->_currentCellIsDirty = false;
+		}
+		$this->_currentObjectID = $this->_currentObject = null;
+	}	//	function _storeData()
+
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
+     */
+	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+			$this->_storeData();
+		}
+
+		$this->_currentObjectID = $pCoord;
+		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
+
+		return $cell;
+	}	//	function addCacheData()
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param 	string 			$pCoord		Coordinate of the cell
+     * @throws 	Exception
+     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     */
+	public function getCacheData($pCoord) {
+		if ($pCoord === $this->_currentObjectID) {
+			return $this->_currentObject;
+		}
+		$this->_storeData();
+
+		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
+		if ($cellResultSet === false) {
+			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		} elseif ($cellResultSet->numRows() == 0) {
+			//	Return null if requested entry doesn't exist in cache
+			return null;
+		}
+
+		//	Set current entry to the requested entry
+		$this->_currentObjectID = $pCoord;
+
+		$cellResult = $cellResultSet->fetchSingle();
+		$this->_currentObject = unserialize($cellResult);
+		//	Re-attach the parent worksheet
+		$this->_currentObject->attach($this->_parent);
+
+		//	Return requested entry
+		return $this->_currentObject;
+	}	//	function getCacheData()
+
+
+	/**
+	 * Is a value set for an indexed cell?
+	 *
+	 * @param	string		$pCoord		Coordinate address of the cell to check
+	 * @return	boolean
+	 */
+	public function isDataSet($pCoord) {
+		if ($pCoord === $this->_currentObjectID) {
+			return true;
+		}
+
+		//	Check if the requested entry exists in the cache
+		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
+		if ($cellResultSet === false) {
+			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		} elseif ($cellResultSet->numRows() == 0) {
+			//	Return null if requested entry doesn't exist in cache
+			return false;
+		}
+		return true;
+	}	//	function isDataSet()
+
+
+    /**
+     * Delete a cell in cache identified by coordinate address
+     *
+     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @throws	Exception
+     */
+	public function deleteCacheData($pCoord) {
+		if ($pCoord === $this->_currentObjectID) {
+			$this->_currentObject->detach();
+			$this->_currentObjectID = $this->_currentObject = null;
+		}
+
+		//	Check if the requested entry exists in the cache
+		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+		if (!$this->_DBHandle->queryExec($query))
+			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+
+		$this->_currentCellIsDirty = false;
+	}	//	function deleteCacheData()
+
+
+	/**
+	 * Get a list of all cell addresses currently held in cache
+	 *
+	 * @return	array of string
+	 */
+	public function getCellList() {
+		$query = "SELECT id FROM kvp_".$this->_TableName;
+		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
+		if ($cellIdsResult === false)
+			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+
+		$cellKeys = array();
+		foreach($cellIdsResult as $row) {
+			$cellKeys[] = $row['id'];
+		}
+
+		return $cellKeys;
+	}	//	function getCellList()
+
+
+	/**
+	 * Clone the cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
+	 */
+	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+		//	Get a new id for the new table name
+		$tableName = str_replace('.','_',$this->_getUniqueID());
+		if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+													AS SELECT * FROM kvp_'.$this->_TableName))
+			throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+
+		//	Copy the existing cell cache file
+		$this->_TableName = $tableName;
+	}	//	function copyCellCollection()
+
+
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
+	public function unsetWorksheetCells() {
+		if(!is_null($this->_currentObject)) {
+			$this->_currentObject->detach();
+			$this->_currentObject = $this->_currentObjectID = null;
+		}
+		//	detach ourself from the worksheet, so that it can then delete this object successfully
+		$this->_parent = null;
+
+		//	Close down the temporary cache file
+		$this->__destruct();
+	}	//	function unsetWorksheetCells()
+
+
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 */
+	public function __construct(PHPExcel_Worksheet $parent) {
+		parent::__construct($parent);
+		if (is_null($this->_DBHandle)) {
+			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
+			$_DBName = ':memory:';
+
+			$this->_DBHandle = new SQLiteDatabase($_DBName);
+			if ($this->_DBHandle === false)
+				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
+				throw new Exception(sqlite_error_string($this->_DBHandle->lastError()));
+		}
+	}	//	function __construct()
+
+
+	/**
+	 * Destroy this cell collection
+	 */
+	public function __destruct() {
+		$this->_DBHandle = null;
+	}	//	function __destruct()
+
+
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable() {
+		if (!function_exists('sqlite_open')) {
+			return false;
+		}
+
+		return true;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
new file mode 100644
index 00000000000..ead6e91f87f
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_CachedObjectStorage_SQLite3
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_CachedObjectStorage
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
+
+	/**
+	 * Database table name
+	 *
+	 * @var string
+	 */
+	private $_TableName = null;
+
+	/**
+	 * Database handle
+	 *
+	 * @var resource
+	 */
+	private $_DBHandle = null;
+
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
+	private function _storeData() {
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
+
+			$query = $this->_DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES(:id,:data)");
+			$query->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
+			$query->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
+			$result = $query->execute();
+			if ($result === false)
+				throw new Exception($this->_DBHandle->lastErrorMsg());
+			$this->_currentCellIsDirty = false;
+		}
+		$this->_currentObjectID = $this->_currentObject = null;
+	}	//	function _storeData()
+
+
+    /**
+     * Add or Update a cell in cache identified by coordinate address
+     *
+     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+     * @throws	Exception
+     */
+	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+			$this->_storeData();
+		}
+
+		$this->_currentObjectID = $pCoord;
+		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
+
+		return $cell;
+	}	//	function addCacheData()
+
+
+    /**
+     * Get cell at a specific coordinate
+     *
+     * @param 	string 			$pCoord		Coordinate of the cell
+     * @throws 	Exception
+     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     */
+	public function getCacheData($pCoord) {
+		if ($pCoord === $this->_currentObjectID) {
+			return $this->_currentObject;
+		}
+		$this->_storeData();
+
+		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+		$cellResult = $this->_DBHandle->querySingle($query);
+		if ($cellResult === false) {
+			throw new Exception($this->_DBHandle->lastErrorMsg());
+		} elseif (is_null($cellResult)) {
+			//	Return null if requested entry doesn't exist in cache
+			return null;
+		}
+
+		//	Set current entry to the requested entry
+		$this->_currentObjectID = $pCoord;
+
+		$this->_currentObject = unserialize($cellResult);
+		//	Re-attach the parent worksheet
+		$this->_currentObject->attach($this->_parent);
+
+		//	Return requested entry
+		return $this->_currentObject;
+	}	//	function getCacheData()
+
+
+	/**
+	 *	Is a value set for an indexed cell?
+	 *
+	 * @param	string		$pCoord		Coordinate address of the cell to check
+	 * @return	boolean
+	 */
+	public function isDataSet($pCoord) {
+		if ($pCoord === $this->_currentObjectID) {
+			return true;
+		}
+
+		//	Check if the requested entry exists in the cache
+		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+		$cellResult = $this->_DBHandle->querySingle($query);
+		if ($cellResult === false) {
+			throw new Exception($this->_DBHandle->lastErrorMsg());
+		} elseif (is_null($cellResult)) {
+			//	Return null if requested entry doesn't exist in cache
+			return false;
+		}
+		return true;
+	}	//	function isDataSet()
+
+
+    /**
+     *	Delete a cell in cache identified by coordinate address
+     *
+     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @throws	Exception
+     */
+	public function deleteCacheData($pCoord) {
+		if ($pCoord === $this->_currentObjectID) {
+			$this->_currentObject->detach();
+			$this->_currentObjectID = $this->_currentObject = null;
+		}
+
+		//	Check if the requested entry exists in the cache
+		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+		$result = $this->_DBHandle->exec($query);
+		if ($result === false)
+			throw new Exception($this->_DBHandle->lastErrorMsg());
+
+		$this->_currentCellIsDirty = false;
+	}	//	function deleteCacheData()
+
+
+	/**
+	 * Get a list of all cell addresses currently held in cache
+	 *
+	 * @return	array of string
+	 */
+	public function getCellList() {
+		$query = "SELECT id FROM kvp_".$this->_TableName;
+		$cellIdsResult = $this->_DBHandle->query($query);
+		if ($cellIdsResult === false)
+			throw new Exception($this->_DBHandle->lastErrorMsg());
+
+		$cellKeys = array();
+		while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
+			$cellKeys[] = $row['id'];
+		}
+
+		return $cellKeys;
+	}	//	function getCellList()
+
+
+	/**
+	 * Clone the cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
+	 */
+	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+		//	Get a new id for the new table name
+		$tableName = str_replace('.','_',$this->_getUniqueID());
+		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+		                                       AS SELECT * FROM kvp_'.$this->_TableName))
+			throw new Exception($this->_DBHandle->lastErrorMsg());
+
+		//	Copy the existing cell cache file
+		$this->_TableName = $tableName;
+	}	//	function copyCellCollection()
+
+
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
+	public function unsetWorksheetCells() {
+		if(!is_null($this->_currentObject)) {
+			$this->_currentObject->detach();
+			$this->_currentObject = $this->_currentObjectID = null;
+		}
+		//	detach ourself from the worksheet, so that it can then delete this object successfully
+		$this->_parent = null;
+
+		//	Close down the temporary cache file
+		$this->__destruct();
+	}	//	function unsetWorksheetCells()
+
+
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 */
+	public function __construct(PHPExcel_Worksheet $parent) {
+		parent::__construct($parent);
+		if (is_null($this->_DBHandle)) {
+			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
+			$_DBName = ':memory:';
+
+			$this->_DBHandle = new SQLite3($_DBName);
+			if ($this->_DBHandle === false)
+				throw new Exception($this->_DBHandle->lastErrorMsg());
+			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
+				throw new Exception($this->_DBHandle->lastErrorMsg());
+		}
+	}	//	function __construct()
+
+
+	/**
+	 * Destroy this cell collection
+	 */
+	public function __destruct() {
+		if (!is_null($this->_DBHandle)) {
+			$this->_DBHandle->close();
+		}
+		$this->_DBHandle = null;
+	}	//	function __destruct()
+
+
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable() {
+		if (!class_exists('SQLite3',FALSE)) {
+			return false;
+		}
+
+		return true;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
index a223a516e3a..ba8b0458062 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,29 +31,49 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
+	/**
+	 * Prefix used to uniquely identify cache data for this worksheet
+	 *
+	 * @var string
+	 */
 	private $_cachePrefix = null;
 
+	/**
+	 * Cache timeout
+	 *
+	 * @var integer
+	 */
 	private $_cacheTime = 600;
 
 
+    /**
+     * Store cell data in cache for the current cell object if it's "dirty",
+     *     and the 'nullify' the current cell object
+     *
+	 * @return	void
+     * @throws	Exception
+     */
 	private function _storeData() {
-		$this->_currentObject->detach();
+		if ($this->_currentCellIsDirty) {
+			$this->_currentObject->detach();
 
-		$obj = serialize($this->_currentObject);
-		if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
-			if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-				$this->__destruct();
-				throw new Exception('Failed to store cell '.$cellID.' in WinCache');
-			}
-		} else {
-			if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
-				$this->__destruct();
-				throw new Exception('Failed to store cell '.$cellID.' in WinCache');
+			$obj = serialize($this->_currentObject);
+			if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
+				if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
+					$this->__destruct();
+					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
+				}
+			} else {
+				if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
+					$this->__destruct();
+					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
+				}
 			}
+			$this->_currentCellIsDirty = false;
 		}
 
 		$this->_currentObjectID = $this->_currentObject = null;
@@ -61,12 +81,12 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 
 
 	/**
-	 *	Add or Update a cell in cache identified by coordinate address
+	 * Add or Update a cell in cache identified by coordinate address
 	 *
-	 *	@param	string			$pCoord		Coordinate address of the cell to update
-	 *	@param	PHPExcel_Cell	$cell		Cell to update
-	 *	@return	void
-	 *	@throws	Exception
+	 * @param	string			$pCoord		Coordinate address of the cell to update
+	 * @param	PHPExcel_Cell	$cell		Cell to update
+	 * @return	void
+	 * @throws	Exception
 	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
@@ -76,17 +96,17 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 
 		$this->_currentObjectID = $pCoord;
 		$this->_currentObject = $cell;
+		$this->_currentCellIsDirty = true;
 
 		return $cell;
 	}	//	function addCacheData()
 
 
 	/**
-	 *	Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
 	 *
-	 *	@param	string		$pCoord		Coordinate address of the cell to check
-	 *	@return	void
-	 *	@return	boolean
+	 * @param	string		$pCoord		Coordinate address of the cell to check
+	 * @return	boolean
 	 */
 	public function isDataSet($pCoord) {
 		//	Check if the requested entry is the current object, or exists in the cache
@@ -99,7 +119,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 			if ($success === false) {
 				//	Entry no longer exists in Wincache, so clear it from the cache array
 				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$cellID.' no longer exists in WinCache');
+				throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
 			}
 			return true;
 		}
@@ -128,7 +148,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 			if ($success === false) {
 				//	Entry no longer exists in WinCache, so clear it from the cache array
 				parent::deleteCacheData($pCoord);
-				throw new Exception('Cell entry '.$cellID.' no longer exists in WinCache');
+				throw new Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
 			}
 		} else {
 			//	Return null if requested entry doesn't exist in cache
@@ -147,10 +167,10 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 
 
 	/**
-	 *	Delete a cell in cache identified by coordinate address
+	 * Delete a cell in cache identified by coordinate address
 	 *
-	 *	@param	string			$pCoord		Coordinate address of the cell to delete
-	 *	@throws	Exception
+	 * @param	string			$pCoord		Coordinate address of the cell to delete
+	 * @throws	Exception
 	 */
 	public function deleteCacheData($pCoord) {
 		//	Delete the entry from Wincache
@@ -162,9 +182,10 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 
 
 	/**
-	 *	Clone the cell collection
+	 * Clone the cell collection
 	 *
-	 *	@return	void
+	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
 		parent::copyCellCollection($parent);
@@ -191,6 +212,11 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 	}	//	function copyCellCollection()
 
 
+	/**
+	 * Clear the cell collection and disconnect from our parent
+	 *
+	 * @return	void
+	 */
 	public function unsetWorksheetCells() {
 		if(!is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
@@ -207,6 +233,12 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 	}	//	function unsetWorksheetCells()
 
 
+	/**
+	 * Initialise this new cell collection
+	 *
+	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+	 * @param	array of mixed		$arguments	Additional initialisation arguments
+	 */
 	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
 		$cacheTime	= (isset($arguments['cacheTime']))	? $arguments['cacheTime']	: 600;
 
@@ -220,6 +252,9 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 	}	//	function __construct()
 
 
+	/**
+	 * Destroy this cell collection
+	 */
 	public function __destruct() {
 		$cacheList = $this->getCellList();
 		foreach($cacheList as $cellID) {
@@ -227,4 +262,19 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
 		}
 	}	//	function __destruct()
 
+
+	/**
+	 * Identify whether the caching method is currently available
+	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+	 *
+	 * @return	boolean
+	 */
+	public static function cacheMethodIsAvailable() {
+		if (!function_exists('wincache_ucache_add')) {
+			return false;
+		}
+
+		return true;
+	}
+
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorageFactory.php b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorageFactory.php
index 1486ad11a94..51019f7bdc5 100644
--- a/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorageFactory.php
+++ b/htdocs/includes/phpexcel/PHPExcel/CachedObjectStorageFactory.php
@@ -1,33 +1,94 @@
 <?php
 
-class PHPExcel_CachedObjectStorageFactory {
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_CachedObjectStorageFactory
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_CachedObjectStorage
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_CachedObjectStorageFactory
+{
 	const cache_in_memory				= 'Memory';
 	const cache_in_memory_gzip			= 'MemoryGZip';
 	const cache_in_memory_serialized	= 'MemorySerialized';
+	const cache_igbinary				= 'Igbinary';
 	const cache_to_discISAM				= 'DiscISAM';
 	const cache_to_apc					= 'APC';
 	const cache_to_memcache				= 'Memcache';
 	const cache_to_phpTemp				= 'PHPTemp';
 	const cache_to_wincache				= 'Wincache';
+	const cache_to_sqlite				= 'SQLite';
+	const cache_to_sqlite3				= 'SQLite3';
 
 
-	private static $_cacheStorageMethod = null;
+	/**
+	 * Name of the method used for cell cacheing
+	 *
+	 * @var string
+	 */
+	private static $_cacheStorageMethod = NULL;
 
-	private static $_cacheStorageClass = null;
+	/**
+	 * Name of the class used for cell cacheing
+	 *
+	 * @var string
+	 */
+	private static $_cacheStorageClass = NULL;
 
 
+	/**
+	 * List of all possible cache storage methods
+	 *
+	 * @var string[]
+	 */
 	private static $_storageMethods = array(
 		self::cache_in_memory,
 		self::cache_in_memory_gzip,
 		self::cache_in_memory_serialized,
+		self::cache_igbinary,
 		self::cache_to_phpTemp,
 		self::cache_to_discISAM,
 		self::cache_to_apc,
 		self::cache_to_memcache,
 		self::cache_to_wincache,
+		self::cache_to_sqlite,
+		self::cache_to_sqlite3,
 	);
 
 
+	/**
+	 * Default arguments for each cache storage method
+	 *
+	 * @var array of mixed array
+	 */
 	private static $_storageMethodDefaultParameters = array(
 		self::cache_in_memory				=> array(
 													),
@@ -35,9 +96,11 @@ class PHPExcel_CachedObjectStorageFactory {
 													),
 		self::cache_in_memory_serialized	=> array(
 													),
+		self::cache_igbinary				=> array(
+													),
 		self::cache_to_phpTemp				=> array( 'memoryCacheSize'	=> '1MB'
 													),
-		self::cache_to_discISAM				=> array(
+		self::cache_to_discISAM				=> array( 'dir'				=> NULL
 													),
 		self::cache_to_apc					=> array( 'cacheTime'		=> 600
 													),
@@ -46,58 +109,91 @@ class PHPExcel_CachedObjectStorageFactory {
 													  'cacheTime'		=> 600
 													),
 		self::cache_to_wincache				=> array( 'cacheTime'		=> 600
-													)
+													),
+		self::cache_to_sqlite				=> array(
+													),
+		self::cache_to_sqlite3				=> array(
+													),
 	);
 
 
+	/**
+	 * Arguments for the active cache storage method
+	 *
+	 * @var array of mixed array
+	 */
 	private static $_storageMethodParameters = array();
 
 
-	public static function getCacheStorageMethod() {
-		if (!is_null(self::$_cacheStorageMethod)) {
-			return self::$_cacheStorageMethod;
-		}
-		return null;
+	/**
+	 * Return the current cache storage method
+	 *
+	 * @return string|NULL
+	 **/
+	public static function getCacheStorageMethod()
+	{
+		return self::$_cacheStorageMethod;
 	}	//	function getCacheStorageMethod()
 
 
-	public static function getCacheStorageClass() {
-		if (!is_null(self::$_cacheStorageClass)) {
-			return self::$_cacheStorageClass;
-		}
-		return null;
+	/**
+	 * Return the current cache storage class
+	 *
+	 * @return PHPExcel_CachedObjectStorage_ICache|NULL
+	 **/
+	public static function getCacheStorageClass()
+	{
+		return self::$_cacheStorageClass;
 	}	//	function getCacheStorageClass()
 
 
-	public static function getCacheStorageMethods() {
+	/**
+	 * Return the list of all possible cache storage methods
+	 *
+	 * @return string[]
+	 **/
+	public static function getAllCacheStorageMethods()
+	{
 		return self::$_storageMethods;
 	}	//	function getCacheStorageMethods()
 
 
-	public static function initialize($method = self::cache_in_memory, $arguments = array()) {
+	/**
+	 * Return the list of all available cache storage methods
+	 *
+	 * @return string[]
+	 **/
+	public static function getCacheStorageMethods()
+	{
+		$activeMethods = array();
+		foreach(self::$_storageMethods as $storageMethod) {
+			$cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $storageMethod;
+			if (call_user_func(array($cacheStorageClass, 'cacheMethodIsAvailable'))) {
+				$activeMethods[] = $storageMethod;
+			}
+		}
+		return $activeMethods;
+	}	//	function getCacheStorageMethods()
+
+
+	/**
+	 * Identify the cache storage method to use
+	 *
+	 * @param	string			$method		Name of the method to use for cell cacheing
+	 * @param	array of mixed	$arguments	Additional arguments to pass to the cell caching class
+	 *										when instantiating
+	 * @return boolean
+	 **/
+	public static function initialize($method = self::cache_in_memory, $arguments = array())
+	{
 		if (!in_array($method,self::$_storageMethods)) {
-			return false;
+			return FALSE;
 		}
 
-		switch($method) {
-			case self::cache_to_apc	:
-				if (!function_exists('apc_store')) {
-					return false;
-				}
-				if (apc_sma_info() === false) {
-					return false;
-				}
-				break;
-			case self::cache_to_memcache :
-				if (!function_exists('memcache_add')) {
-					return false;
-				}
-				break;
-			case self::cache_to_wincache :
-				if (!function_exists('wincache_ucache_add')) {
-					return false;
-				}
-				break;
+		$cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
+		if (!call_user_func(array( $cacheStorageClass,
+								   'cacheMethodIsAvailable'))) {
+			return FALSE;
 		}
 
 		self::$_storageMethodParameters[$method] = self::$_storageMethodDefaultParameters[$method];
@@ -107,25 +203,37 @@ class PHPExcel_CachedObjectStorageFactory {
 			}
 		}
 
-		if (is_null(self::$_cacheStorageMethod)) {
-			self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
+		if (self::$_cacheStorageMethod === NULL) {
+			self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
 			self::$_cacheStorageMethod = $method;
 		}
-		return true;
+		return TRUE;
 	}	//	function initialize()
 
 
-	public static function getInstance(PHPExcel_Worksheet $parent) {
-		if (is_null(self::$_cacheStorageMethod)) {
-			self::initialize();
+	/**
+	 * Initialise the cache storage
+	 *
+	 * @param	PHPExcel_Worksheet 	$parent		Enable cell caching for this worksheet
+	 * @return	PHPExcel_CachedObjectStorage_ICache
+	 **/
+	public static function getInstance(PHPExcel_Worksheet $parent)
+	{
+		$cacheMethodIsAvailable = TRUE;
+		if (self::$_cacheStorageMethod === NULL) {
+			$cacheMethodIsAvailable = self::initialize();
 		}
 
-		$instance = new self::$_cacheStorageClass($parent,self::$_storageMethodParameters[self::$_cacheStorageMethod]);
-		if (!is_null($instance)) {
-			return $instance;
+		if ($cacheMethodIsAvailable) {
+			$instance = new self::$_cacheStorageClass( $parent,
+													   self::$_storageMethodParameters[self::$_cacheStorageMethod]
+													 );
+			if ($instance !== NULL) {
+				return $instance;
+			}
 		}
 
-		return false;
+		return FALSE;
 	}	//	function getInstance()
 
 }
\ No newline at end of file
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation.php b/htdocs/includes/phpexcel/PHPExcel/Calculation.php
index 0833129cfbb..65d4f3d1027 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -57,12 +57,12 @@ if (!defined('CALCULATION_REGEXP_CELLREF')) {
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation {
 
-	/**	Constants				*/
-	/**	Regular Expressions		*/
+	/** Constants				*/
+	/** Regular Expressions		*/
 	//	Numeric operand
 	const CALCULATION_REGEXP_NUMBER		= '[-+]?\d*\.?\d+(e[-+]?\d+)?';
 	//	String operand
@@ -79,7 +79,7 @@ class PHPExcel_Calculation {
 	const CALCULATION_REGEXP_ERROR		= '\#[A-Z][A-Z0_\/]*[!\?]?';
 
 
-	/**	constants */
+	/** constants */
 	const RETURN_ARRAY_AS_ERROR = 'error';
 	const RETURN_ARRAY_AS_VALUE = 'value';
 	const RETURN_ARRAY_AS_ARRAY = 'array';
@@ -88,47 +88,47 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Instance of this class
+	 * Instance of this class
 	 *
-	 *	@access	private
-	 *	@var PHPExcel_Calculation
+	 * @access	private
+	 * @var PHPExcel_Calculation
 	 */
 	private static $_instance;
 
 
 	/**
-	 *	Calculation cache
+	 * Calculation cache
 	 *
-	 *	@access	private
-	 *	@var array
+	 * @access	private
+	 * @var array
 	 */
 	private static $_calculationCache = array ();
 
 
 	/**
-	 *	Calculation cache enabled
+	 * Calculation cache enabled
 	 *
-	 *	@access	private
-	 *	@var boolean
+	 * @access	private
+	 * @var boolean
 	 */
 	private static $_calculationCacheEnabled = true;
 
 
 	/**
-	 *	Calculation cache expiration time
+	 * Calculation cache expiration time
 	 *
-	 *	@access	private
-	 *	@var float
+	 * @access	private
+	 * @var float
 	 */
 	private static $_calculationCacheExpirationTime = 15;
 
 
 	/**
-	 *	List of operators that can be used within formulae
-	 *	The true/false value indicates whether it is a binary operator or a unary operator
+	 * List of operators that can be used within formulae
+	 * The true/false value indicates whether it is a binary operator or a unary operator
 	 *
-	 *	@access	private
-	 *	@var array
+	 * @access	private
+	 * @var array
 	 */
 	private static $_operators			= array('+' => true,	'-' => true,	'*' => true,	'/' => true,
 												'^' => true,	'&' => true,	'%' => false,	'~' => false,
@@ -138,10 +138,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	List of binary operators (those that expect two operands)
+	 * List of binary operators (those that expect two operands)
 	 *
-	 *	@access	private
-	 *	@var array
+	 * @access	private
+	 * @var array
 	 */
 	private static $_binaryOperators	= array('+' => true,	'-' => true,	'*' => true,	'/' => true,
 												'^' => true,	'&' => true,	'>' => true,	'<' => true,
@@ -150,63 +150,63 @@ class PHPExcel_Calculation {
 											   );
 
 	/**
-	 *	Flag to determine how formula errors should be handled
+	 * Flag to determine how formula errors should be handled
 	 *		If true, then a user error will be triggered
 	 *		If false, then an exception will be thrown
 	 *
-	 *	@access	public
-	 *	@var boolean
+	 * @access	public
+	 * @var boolean
 	 *
 	 */
 	public $suppressFormulaErrors = false;
 
 	/**
-	 *	Error message for any error that was raised/thrown by the calculation engine
+	 * Error message for any error that was raised/thrown by the calculation engine
 	 *
-	 *	@access	public
-	 *	@var string
+	 * @access	public
+	 * @var string
 	 *
 	 */
 	public $formulaError = null;
 
 	/**
-	 *	Flag to determine whether a debug log should be generated by the calculation engine
+	 * Flag to determine whether a debug log should be generated by the calculation engine
 	 *		If true, then a debug log will be generated
 	 *		If false, then a debug log will not be generated
 	 *
-	 *	@access	public
-	 *	@var boolean
+	 * @access	public
+	 * @var boolean
 	 *
 	 */
 	public $writeDebugLog = false;
 
 	/**
-	 *	Flag to determine whether a debug log should be echoed by the calculation engine
+	 * Flag to determine whether a debug log should be echoed by the calculation engine
 	 *		If true, then a debug log will be echoed
 	 *		If false, then a debug log will not be echoed
-	 *	A debug log can only be echoed if it is generated
+	 * A debug log can only be echoed if it is generated
 	 *
-	 *	@access	public
-	 *	@var boolean
+	 * @access	public
+	 * @var boolean
 	 *
 	 */
 	public $echoDebugLog = false;
 
 
 	/**
-	 *	An array of the nested cell references accessed by the calculation engine, used for the debug log
+	 * An array of the nested cell references accessed by the calculation engine, used for the debug log
 	 *
-	 *	@access	private
-	 *	@var array of string
+	 * @access	private
+	 * @var array of string
 	 *
 	 */
 	private $debugLogStack = array();
 
 	/**
-	 *	The debug log generated by the calculation engine
+	 * The debug log generated by the calculation engine
 	 *
-	 *	@access	public
-	 *	@var array of string
+	 * @access	public
+	 * @var array of string
 	 *
 	 */
 	public $debugLog = array();
@@ -543,7 +543,7 @@ class PHPExcel_Calculation {
 												 'argumentCount'	=>	'1'
 												),
 				'DAVERAGE'				=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATABASE,
-												 'functionCall'		=>	'PHPExcel_Calculation_Functions::DUMMY',
+												 'functionCall'		=>	'PHPExcel_Calculation_Database::DAVERAGE',
 												 'argumentCount'	=>	'3'
 												),
 				'DAY'					=> array('category'			=>	PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
@@ -1698,17 +1698,19 @@ class PHPExcel_Calculation {
 
 
 	public function __destruct() {
-		ini_set('precision',$this->_savedPrecision);
+		if ($this->_savedPrecision != ini_get('precision')) {
+			ini_set('precision',$this->_savedPrecision);
+		}
 	}
 
 	/**
-	 *	Get an instance of this class
+	 * Get an instance of this class
 	 *
-	 *	@access	public
-	 *	@return PHPExcel_Calculation
+	 * @access	public
+	 * @return PHPExcel_Calculation
 	 */
 	public static function getInstance() {
-		if (!isset(self::$_instance) || is_null(self::$_instance)) {
+		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
 			self::$_instance = new PHPExcel_Calculation();
 		}
 
@@ -1717,24 +1719,24 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Flush the calculation cache for any existing instance of this class
+	 * Flush the calculation cache for any existing instance of this class
 	 *		but only if a PHPExcel_Calculation instance exists
 	 *
-	 *	@access	public
-	 *	@return null
+	 * @access	public
+	 * @return null
 	 */
 	public static function flushInstance() {
-		if (isset(self::$_instance) && !is_null(self::$_instance)) {
+		if (isset(self::$_instance) && (self::$_instance !== NULL)) {
 			self::$_instance->clearCalculationCache();
 		}
 	}	//	function flushInstance()
 
 
 	/**
-	 *	__clone implementation. Cloning should not be allowed in a Singleton!
+	 * __clone implementation. Cloning should not be allowed in a Singleton!
 	 *
-	 *	@access	public
-	 *	@throws	Exception
+	 * @access	public
+	 * @throws	Exception
 	 */
 	public final function __clone() {
 		throw new Exception ('Cloning a Singleton is not allowed!');
@@ -1742,31 +1744,31 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Return the locale-specific translation of TRUE
+	 * Return the locale-specific translation of TRUE
 	 *
-	 *	@access	public
-	 *	@return	 string		locale-specific translation of TRUE
+	 * @access	public
+	 * @return	 string		locale-specific translation of TRUE
 	 */
 	public static function getTRUE() {
 		return self::$_localeBoolean['TRUE'];
 	}
 
 	/**
-	 *	Return the locale-specific translation of FALSE
+	 * Return the locale-specific translation of FALSE
 	 *
-	 *	@access	public
-	 *	@return	 string		locale-specific translation of FALSE
+	 * @access	public
+	 * @return	 string		locale-specific translation of FALSE
 	 */
 	public static function getFALSE() {
 		return self::$_localeBoolean['FALSE'];
 	}
 
 	/**
-	 *	Set the Array Return Type (Array or Value of first element in the array)
+	 * Set the Array Return Type (Array or Value of first element in the array)
 	 *
-	 *	@access	public
-	 *	@param	 string	$returnType			Array return type
-	 *	@return	 boolean					Success or failure
+	 * @access	public
+	 * @param	 string	$returnType			Array return type
+	 * @return	 boolean					Success or failure
 	 */
 	public static function setArrayReturnType($returnType) {
 		if (($returnType == self::RETURN_ARRAY_AS_VALUE) ||
@@ -1780,10 +1782,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Return the Array Return Type (Array or Value of first element in the array)
+	 * Return the Array Return Type (Array or Value of first element in the array)
 	 *
-	 *	@access	public
-	 *	@return	 string		$returnType			Array return type
+	 * @access	public
+	 * @return	 string		$returnType			Array return type
 	 */
 	public static function getArrayReturnType() {
 		return self::$returnArrayAsType;
@@ -1791,10 +1793,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Is calculation caching enabled?
+	 * Is calculation caching enabled?
 	 *
-	 *	@access	public
-	 *	@return boolean
+	 * @access	public
+	 * @return boolean
 	 */
 	public function getCalculationCacheEnabled() {
 		return self::$_calculationCacheEnabled;
@@ -1802,10 +1804,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Enable/disable calculation cache
+	 * Enable/disable calculation cache
 	 *
-	 *	@access	public
-	 *	@param boolean $pValue
+	 * @access	public
+	 * @param boolean $pValue
 	 */
 	public function setCalculationCacheEnabled($pValue = true) {
 		self::$_calculationCacheEnabled = $pValue;
@@ -1814,7 +1816,7 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Enable calculation cache
+	 * Enable calculation cache
 	 */
 	public function enableCalculationCache() {
 		$this->setCalculationCacheEnabled(true);
@@ -1822,7 +1824,7 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Disable calculation cache
+	 * Disable calculation cache
 	 */
 	public function disableCalculationCache() {
 		$this->setCalculationCacheEnabled(false);
@@ -1830,7 +1832,7 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Clear calculation cache
+	 * Clear calculation cache
 	 */
 	public function clearCalculationCache() {
 		self::$_calculationCache = array();
@@ -1838,9 +1840,9 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Get calculation cache expiration time
+	 * Get calculation cache expiration time
 	 *
-	 *	@return float
+	 * @return float
 	 */
 	public function getCalculationCacheExpirationTime() {
 		return self::$_calculationCacheExpirationTime;
@@ -1848,9 +1850,9 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Set calculation cache expiration time
+	 * Set calculation cache expiration time
 	 *
-	 *	@param float $pValue
+	 * @param float $pValue
 	 */
 	public function setCalculationCacheExpirationTime($pValue = 15) {
 		self::$_calculationCacheExpirationTime = $pValue;
@@ -1860,9 +1862,9 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Get the currently defined locale code
+	 * Get the currently defined locale code
 	 *
-	 *	@return string
+	 * @return string
 	 */
 	public function getLocale() {
 		return self::$_localeLanguage;
@@ -1870,9 +1872,9 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Set the locale code
+	 * Set the locale code
 	 *
-	 *	@return boolean
+	 * @return boolean
 	 */
 	public function setLocale($locale='en_us') {
 		//	Identify our locale and language
@@ -1890,10 +1892,10 @@ class PHPExcel_Calculation {
 			//	Default is English, if user isn't requesting english, then read the necessary data from the locale files
 			if ($locale != 'en_us') {
 				//	Search for a file with a list of function names for locale
-				$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel/locale/'.str_replace('_','/',$locale).'/functions';
+				$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'functions';
 				if (!file_exists($functionNamesFile)) {
 					//	If there isn't a locale specific function file, look for a language specific function file
-					$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel/locale/'.$language.'/functions';
+					$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'functions';
 					if (!file_exists($functionNamesFile)) {
 						return false;
 					}
@@ -1915,9 +1917,9 @@ class PHPExcel_Calculation {
 				if (isset(self::$_localeFunctions['TRUE'])) { self::$_localeBoolean['TRUE'] = self::$_localeFunctions['TRUE']; }
 				if (isset(self::$_localeFunctions['FALSE'])) { self::$_localeBoolean['FALSE'] = self::$_localeFunctions['FALSE']; }
 
-				$configFile = PHPEXCEL_ROOT . 'PHPExcel/locale/'.str_replace('_','/',$locale).'/config';
+				$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'config';
 				if (!file_exists($configFile)) {
-					$configFile = PHPEXCEL_ROOT . 'PHPExcel/locale/'.$language.'/config';
+					$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'config';
 				}
 				if (file_exists($configFile)) {
 					$localeSettings = file($configFile,FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
@@ -1998,7 +2000,7 @@ class PHPExcel_Calculation {
 	private static $functionReplaceToLocale		= null;
 
 	public function _translateFormulaToLocale($formula) {
-		if (is_null(self::$functionReplaceFromExcel)) {
+		if (self::$functionReplaceFromExcel === NULL) {
 			self::$functionReplaceFromExcel = array();
 			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
 				self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelFunctionName).'([\s]*\()/Ui';
@@ -2009,7 +2011,7 @@ class PHPExcel_Calculation {
 
 		}
 
-		if (is_null(self::$functionReplaceToLocale)) {
+		if (self::$functionReplaceToLocale === NULL) {
 			self::$functionReplaceToLocale = array();
 			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
 				self::$functionReplaceToLocale[] = '$1'.trim($localeFunctionName).'$2';
@@ -2027,7 +2029,7 @@ class PHPExcel_Calculation {
 	private static $functionReplaceToExcel		= null;
 
 	public function _translateFormulaToEnglish($formula) {
-		if (is_null(self::$functionReplaceFromLocale)) {
+		if (self::$functionReplaceFromLocale === NULL) {
 			self::$functionReplaceFromLocale = array();
 			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
 				self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($localeFunctionName).'([\s]*\()/Ui';
@@ -2037,7 +2039,7 @@ class PHPExcel_Calculation {
 			}
 		}
 
-		if (is_null(self::$functionReplaceToExcel)) {
+		if (self::$functionReplaceToExcel === NULL) {
 			self::$functionReplaceToExcel = array();
 			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
 				self::$functionReplaceToExcel[] = '$1'.trim($excelFunctionName).'$2';
@@ -2067,10 +2069,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Wrap string values in quotes
+	 * Wrap string values in quotes
 	 *
-	 *	@param mixed $value
-	 *	@return mixed
+	 * @param mixed $value
+	 * @return mixed
 	 */
 	public static function _wrapResult($value) {
 		if (is_string($value)) {
@@ -2091,10 +2093,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Remove quotes used as a wrapper to identify string values
+	 * Remove quotes used as a wrapper to identify string values
 	 *
-	 *	@param mixed $value
-	 *	@return mixed
+	 * @param mixed $value
+	 * @return mixed
 	 */
 	public static function _unwrapResult($value) {
 		if (is_string($value)) {
@@ -2112,13 +2114,13 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Calculate cell value (using formula from a cell ID)
-	 *	Retained for backward compatibility
+	 * Calculate cell value (using formula from a cell ID)
+	 * Retained for backward compatibility
 	 *
-	 *	@access	public
-	 *	@param	PHPExcel_Cell	$pCell	Cell to calculate
-	 *	@return	mixed
-	 *	@throws	Exception
+	 * @access	public
+	 * @param	PHPExcel_Cell	$pCell	Cell to calculate
+	 * @return	mixed
+	 * @throws	Exception
 	 */
 	public function calculate(PHPExcel_Cell $pCell = null) {
 		try {
@@ -2130,13 +2132,13 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Calculate the value of a cell formula
+	 * Calculate the value of a cell formula
 	 *
-	 *	@access	public
-	 *	@param	PHPExcel_Cell	$pCell		Cell to calculate
-	 *	@param	Boolean			$resetLog	Flag indicating whether the debug log should be reset or not
-	 *	@return	mixed
-	 *	@throws	Exception
+	 * @access	public
+	 * @param	PHPExcel_Cell	$pCell		Cell to calculate
+	 * @param	Boolean			$resetLog	Flag indicating whether the debug log should be reset or not
+	 * @return	mixed
+	 * @throws	Exception
 	 */
 	public function calculateCellValue(PHPExcel_Cell $pCell = null, $resetLog = true) {
 		if ($resetLog) {
@@ -2150,8 +2152,8 @@ class PHPExcel_Calculation {
 		}
 
 		//	Read the formula from the cell
-		if (is_null($pCell)) {
-			return null;
+		if ($pCell === NULL) {
+			return NULL;
 		}
 
 		if ($resetLog) {
@@ -2186,7 +2188,7 @@ class PHPExcel_Calculation {
 			$result = array_shift($testResult);
 		}
 
-		if (is_null($result)) {
+		if ($result === NULL) {
 			return 0;
 		} elseif((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
 			return PHPExcel_Calculation_Functions::NaN();
@@ -2196,11 +2198,11 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Validate and parse a formula string
+	 * Validate and parse a formula string
 	 *
-	 *	@param	string		$formula		Formula to parse
-	 *	@return	array
-	 *	@throws	Exception
+	 * @param	string		$formula		Formula to parse
+	 * @return	array
+	 * @throws	Exception
 	 */
 	public function parseFormula($formula) {
 		//	Basic validation that this is indeed a formula
@@ -2216,11 +2218,11 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Calculate the value of a formula
+	 * Calculate the value of a formula
 	 *
-	 *	@param	string		$formula		Formula to parse
-	 *	@return	mixed
-	 *	@throws	Exception
+	 * @param	string		$formula		Formula to parse
+	 * @return	mixed
+	 * @throws	Exception
 	 */
 	public function calculateFormula($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
 		//	Initialise the logging settings
@@ -2246,13 +2248,13 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Parse a cell formula and calculate its value
+	 * Parse a cell formula and calculate its value
 	 *
-	 *	@param	string			$formula	The formula to parse and calculate
-	 *	@param	string			$cellID		The ID (e.g. A3) of the cell that we are calculating
-	 *	@param	PHPExcel_Cell	$pCell		Cell to calculate
-	 *	@return	mixed
-	 *	@throws	Exception
+	 * @param	string			$formula	The formula to parse and calculate
+	 * @param	string			$cellID		The ID (e.g. A3) of the cell that we are calculating
+	 * @param	PHPExcel_Cell	$pCell		Cell to calculate
+	 * @return	mixed
+	 * @throws	Exception
 	 */
 	public function _calculateFormulaValue($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
 //		echo '<b>'.$cellID.'</b><br />';
@@ -2266,14 +2268,14 @@ class PHPExcel_Calculation {
 		if (!isset($formula{0})) return self::_wrapResult($formula);
 
 		$wsTitle = "\x00Wrk";
-		if (!is_null($pCell)) {
+		if ($pCell !== NULL) {
 			$pCellParent = $pCell->getParent();
-			if (!is_null($pCellParent)) {
+			if ($pCellParent !== NULL) {
 				$wsTitle = $pCellParent->getTitle();
 			}
 		}
 		// Is calculation cacheing enabled?
-		if (!is_null($cellID)) {
+		if ($cellID !== NULL) {
 			if (self::$_calculationCacheEnabled) {
 				// Is the value present in calculation cache?
 //				echo 'Testing cache value<br />';
@@ -2326,7 +2328,7 @@ class PHPExcel_Calculation {
 		array_pop($this->debugLogStack);
 
 		// Save to calculation cache
-		if (!is_null($cellID)) {
+		if ($cellID !== NULL) {
 			if (self::$_calculationCacheEnabled) {
 				self::$_calculationCache[$wsTitle][$cellID]['time'] = microtime(true);
 				self::$_calculationCache[$wsTitle][$cellID]['data'] = $cellValue;
@@ -2339,11 +2341,11 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Ensure that paired matrix operands are both matrices and of the same size
+	 * Ensure that paired matrix operands are both matrices and of the same size
 	 *
-	 *	@param	mixed		&$operand1	First matrix operand
-	 *	@param	mixed		&$operand2	Second matrix operand
-	 *	@param	integer		$resize		Flag indicating whether the matrices should be resized to match
+	 * @param	mixed		&$operand1	First matrix operand
+	 * @param	mixed		&$operand2	Second matrix operand
+	 * @param	integer		$resize		Flag indicating whether the matrices should be resized to match
 	 *										and (if so), whether the smaller dimension should grow or the
 	 *										larger should shrink.
 	 *											0 = no resize
@@ -2381,10 +2383,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0
+	 * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0
 	 *
-	 *	@param	mixed		&$matrix		matrix operand
-	 *	@return	array		An array comprising the number of rows, and number of columns
+	 * @param	mixed		&$matrix		matrix operand
+	 * @return	array		An array comprising the number of rows, and number of columns
 	 */
 	public static function _getMatrixDimensions(&$matrix) {
 		$matrixRows = count($matrix);
@@ -2403,10 +2405,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Ensure that paired matrix operands are both matrices of the same size
+	 * Ensure that paired matrix operands are both matrices of the same size
 	 *
-	 *	@param	mixed		&$matrix1	First matrix operand
-	 *	@param	mixed		&$matrix2	Second matrix operand
+	 * @param	mixed		&$matrix1	First matrix operand
+	 * @param	mixed		&$matrix2	Second matrix operand
 	 */
 	private static function _resizeMatricesShrink(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
 		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
@@ -2442,10 +2444,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Ensure that paired matrix operands are both matrices of the same size
+	 * Ensure that paired matrix operands are both matrices of the same size
 	 *
-	 *	@param	mixed		&$matrix1	First matrix operand
-	 *	@param	mixed		&$matrix2	Second matrix operand
+	 * @param	mixed		&$matrix1	First matrix operand
+	 * @param	mixed		&$matrix2	Second matrix operand
 	 */
 	private static function _resizeMatricesExtend(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
 		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
@@ -2485,10 +2487,10 @@ class PHPExcel_Calculation {
 
 
 	/**
-	 *	Format details of an operand for display in the log (based on operand type)
+	 * Format details of an operand for display in the log (based on operand type)
 	 *
-	 *	@param	mixed		$value	First matrix operand
-	 *	@return	mixed
+	 * @param	mixed		$value	First matrix operand
+	 * @return	mixed
 	 */
 	private function _showValue($value) {
 		if ($this->writeDebugLog) {
@@ -2502,26 +2504,28 @@ class PHPExcel_Calculation {
 				$pad = $rpad = ', ';
 				foreach($value as $row) {
 					if (is_array($row)) {
-						$returnMatrix[] = implode($pad,$row);
+						$returnMatrix[] = implode($pad,array_map(array($this,'_showValue'),$row));
 						$rpad = '; ';
 					} else {
-						$returnMatrix[] = $row;
+						$returnMatrix[] = $this->_showValue($row);
 					}
 				}
 				return '{ '.implode($rpad,$returnMatrix).' }';
+			} elseif(is_string($value) && (trim($value,'"') == $value)) {
+				return '"'.$value.'"';
 			} elseif(is_bool($value)) {
 				return ($value) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
 			}
 		}
-		return $value;
+		return PHPExcel_Calculation_Functions::flattenSingleValue($value);
 	}	//	function _showValue()
 
 
 	/**
-	 *	Format type and details of an operand for display in the log (based on operand type)
+	 * Format type and details of an operand for display in the log (based on operand type)
 	 *
-	 *	@param	mixed		$value	First matrix operand
-	 *	@return	mixed
+	 * @param	mixed		$value	First matrix operand
+	 * @return	mixed
 	 */
 	private function _showTypeDetails($value) {
 		if ($this->writeDebugLog) {
@@ -2530,8 +2534,8 @@ class PHPExcel_Calculation {
 				$value = array_pop($testArray);
 			}
 
-			if (is_null($value)) {
-				return 'a null value';
+			if ($value === NULL) {
+				return 'a NULL value';
 			} elseif (is_float($value)) {
 				$typeString = 'a floating point number';
 			} elseif(is_int($value)) {
@@ -2613,12 +2617,12 @@ class PHPExcel_Calculation {
 	// Convert infix to postfix notation
 	private function _parseFormula($formula, PHPExcel_Cell $pCell = null) {
 		if (($formula = self::_convertMatrixReferences(trim($formula))) === false) {
-			return false;
+			return FALSE;
 		}
 
 		//	If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
 		//		so we store the parent worksheet so that we can re-attach it when necessary
-		$pCellParent = (!is_null($pCell)) ? $pCell->getParent() : null;
+		$pCellParent = ($pCell !== NULL) ? $pCell->getParent() : NULL;
 
 		//	Binary Operators
 		//	These operators always work on two values
@@ -2659,7 +2663,7 @@ class PHPExcel_Calculation {
 
 		//	Start with initialisation
 		$index = 0;
-		$stack = new PHPExcel_Token_Stack;
+		$stack = new PHPExcel_Calculation_Token_Stack;
 		$output = array();
 		$expectingOperator = false;					//	We use this test in syntax-checking the expression to determine when a
 													//		- is a negation or + is a positive operator rather than an operation
@@ -2711,7 +2715,7 @@ class PHPExcel_Calculation {
 //				echo 'Element is a Closing bracket<br />';
 				$expectingOperand = false;
 				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if (is_null($o2)) return $this->_raiseFormulaError('Formula Error: Unexpected closing brace ")"');
+					if ($o2 === NULL) return $this->_raiseFormulaError('Formula Error: Unexpected closing brace ")"');
 					else $output[] = $o2;
 				}
 				$d = $stack->last(2);
@@ -2790,7 +2794,7 @@ class PHPExcel_Calculation {
 			} elseif ($opCharacter == ',') {			//	Is this the separator for function arguments?
 //				echo 'Element is a Function argument separator<br />';
 				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if (is_null($o2)) return $this->_raiseFormulaError("Formula Error: Unexpected ,");
+					if ($o2 === NULL) return $this->_raiseFormulaError("Formula Error: Unexpected ,");
 					else $output[] = $o2;	// pop the argument expression stuff and push onto the output
 				}
 				//	If we've a comma when we're expecting an operand, then what we actually have is a null operand;
@@ -2828,10 +2832,10 @@ class PHPExcel_Calculation {
 						$stack->push('Function', strtoupper($val));
 						$ax = preg_match('/^\s*(\s*\))/i', substr($formula, $index+$length), $amatch);
 						if ($ax) {
-							$stack->push('Operand Count for Function '.self::_localeFunc(strtoupper($val)).')', 0);
+							$stack->push('Operand Count for Function '.strtoupper($val).')', 0);
 							$expectingOperator = true;
 						} else {
-							$stack->push('Operand Count for Function '.self::_localeFunc(strtoupper($val)).')', 1);
+							$stack->push('Operand Count for Function '.strtoupper($val).')', 1);
 							$expectingOperator = false;
 						}
 						$stack->push('Brace', '(');
@@ -2881,13 +2885,13 @@ class PHPExcel_Calculation {
 						if ((is_integer($startRowColRef)) && (ctype_digit($val)) &&
 							($startRowColRef <= 1048576) && ($val <= 1048576)) {
 							//	Row range
-							$endRowColRef = (!is_null($pCellParent)) ? $pCellParent->getHighestColumn() : 'XFD';	//	Max 16,384 columns for Excel2007
+							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestColumn() : 'XFD';	//	Max 16,384 columns for Excel2007
 							$output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef;
 							$val = $rangeWS2.$endRowColRef.$val;
 						} elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
 							(strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
 							//	Column range
-							$endRowColRef = (!is_null($pCellParent)) ? $pCellParent->getHighestRow() : 1048576;		//	Max 1,048,576 rows for Excel2007
+							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestRow() : 1048576;		//	Max 1,048,576 rows for Excel2007
 							$output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
 							$val = $rangeWS2.$val.$endRowColRef;
 						}
@@ -2925,7 +2929,7 @@ class PHPExcel_Calculation {
 				++$index;
 			} elseif ($opCharacter == ')') {	// miscellaneous error checking
 				if ($expectingOperand) {
-					$output[] = array('type' => 'Null Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => null);
+					$output[] = array('type' => 'NULL Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => null);
 					$expectingOperand = false;
 					$expectingOperator = true;
 				} else {
@@ -2972,22 +2976,38 @@ class PHPExcel_Calculation {
 			}
 		}
 
-		while (!is_null($op = $stack->pop())) {	// pop everything off the stack and push onto output
-			if ($opCharacter['value'] == '(') return $this->_raiseFormulaError("Formula Error: Expecting ')'");	// if there are any opening braces on the stack, then braces were unbalanced
+		while (($op = $stack->pop()) !== NULL) {	// pop everything off the stack and push onto output
+			if ((is_array($opCharacter) && $opCharacter['value'] == '(') || ($opCharacter === '('))
+				return $this->_raiseFormulaError("Formula Error: Expecting ')'");	// if there are any opening braces on the stack, then braces were unbalanced
 			$output[] = $op;
 		}
 		return $output;
 	}	//	function _parseFormula()
 
 
+	private static function _dataTestReference(&$operandData)
+	{
+		$operand = $operandData['value'];
+		if (($operandData['reference'] === NULL) && (is_array($operand))) {
+			$rKeys = array_keys($operand);
+			$rowKey = array_shift($rKeys);
+			$cKeys = array_keys(array_keys($operand[$rowKey]));
+			$colKey = array_shift($cKeys);
+			if (ctype_upper($colKey)) {
+				$operandData['reference'] = $colKey.$rowKey;
+			}
+		}
+		return $operand;
+	}
+
 	// evaluate postfix notation
 	private function _processTokenStack($tokens, $cellID = null, PHPExcel_Cell $pCell = null) {
 		if ($tokens == false) return false;
 
 		//	If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
 		//		so we store the parent worksheet so that we can re-attach it when necessary
-		$pCellParent = (!is_null($pCell)) ? $pCell->getParent() : null;
-		$stack = new PHPExcel_Token_Stack;
+		$pCellParent = ($pCell !== NULL) ? $pCell->getParent() : null;
+		$stack = new PHPExcel_Calculation_Token_Stack;
 
 		//	Loop through each token in turn
 		foreach ($tokens as $tokenData) {
@@ -2999,16 +3019,19 @@ class PHPExcel_Calculation {
 			if (isset(self::$_binaryOperators[$token])) {
 //				echo 'Token is a binary operator<br />';
 				//	We must have two operands, error if we don't
-				if (is_null($operand2Data = $stack->pop())) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-				if (is_null($operand1Data = $stack->pop())) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				if (($operand2Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				if (($operand1Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+
+				$operand1 = self::_dataTestReference($operand1Data);
+				$operand2 = self::_dataTestReference($operand2Data);
+
 				//	Log what we're doing
-				$operand1 = $operand1Data['value'];
-				$operand2 = $operand2Data['value'];
 				if ($token == ':') {
 					$this->_writeDebug('Evaluating Range '.$this->_showValue($operand1Data['reference']).$token.$this->_showValue($operand2Data['reference']));
 				} else {
 					$this->_writeDebug('Evaluating '.$this->_showValue($operand1).' '.$token.' '.$this->_showValue($operand2));
 				}
+
 				//	Process the operation in the appropriate manner
 				switch ($token) {
 					//	Comparison (Boolean) Operators
@@ -3026,7 +3049,7 @@ class PHPExcel_Calculation {
 						if (strpos($operand1Data['reference'],'!') !== false) {
 							list($sheet1,$operand1Data['reference']) = explode('!',$operand1Data['reference']);
 						} else {
-							$sheet1 = (!is_null($pCellParent)) ? $pCellParent->getTitle() : '';
+							$sheet1 = ($pCellParent !== NULL) ? $pCellParent->getTitle() : '';
 						}
 						if (strpos($operand2Data['reference'],'!') !== false) {
 							list($sheet2,$operand2Data['reference']) = explode('!',$operand2Data['reference']);
@@ -3034,7 +3057,7 @@ class PHPExcel_Calculation {
 							$sheet2 = $sheet1;
 						}
 						if ($sheet1 == $sheet2) {
-							if (is_null($operand1Data['reference'])) {
+							if ($operand1Data['reference'] === NULL) {
 								if ((trim($operand1Data['value']) != '') && (is_numeric($operand1Data['value']))) {
 									$operand1Data['reference'] = $pCell->getColumn().$operand1Data['value'];
 								} elseif (trim($operand1Data['reference']) == '') {
@@ -3043,7 +3066,7 @@ class PHPExcel_Calculation {
 									$operand1Data['reference'] = $operand1Data['value'].$pCell->getRow();
 								}
 							}
-							if (is_null($operand2Data['reference'])) {
+							if ($operand2Data['reference'] === NULL) {
 								if ((trim($operand2Data['value']) != '') && (is_numeric($operand2Data['value']))) {
 									$operand2Data['reference'] = $pCell->getColumn().$operand2Data['value'];
 								} elseif (trim($operand2Data['reference']) == '') {
@@ -3061,7 +3084,7 @@ class PHPExcel_Calculation {
 								$oRow[] = $oCR[1];
 							}
 							$cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
-							if (!is_null($pCellParent)) {
+							if ($pCellParent !== NULL) {
 								$cellValue = $this->extractCellRange($cellRef, $pCellParent->getParent()->getSheetByName($sheet1), false);
 							} else {
 								return $this->_raiseFormulaError('Unable to access Cell Reference');
@@ -3135,7 +3158,7 @@ class PHPExcel_Calculation {
 			// if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
 			} elseif (($token === '~') || ($token === '%')) {
 //				echo 'Token is a unary operator<br />';
-				if (is_null($arg = $stack->pop())) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				if (($arg = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
 				$arg = $arg['value'];
 				if ($token === '~') {
 //					echo 'Token is a negation operator<br />';
@@ -3167,16 +3190,21 @@ class PHPExcel_Calculation {
 //				echo 'Element '.$token.' is a Cell reference<br />';
 				if (isset($matches[8])) {
 //					echo 'Reference is a Range of cells<br />';
-					if (is_null($pCell)) {
+					if ($pCell === NULL) {
 //						We can't access the range, so return a REF error
 						$cellValue = PHPExcel_Calculation_Functions::REF();
 					} else {
 						$cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10];
 						if ($matches[2] > '') {
 							$matches[2] = trim($matches[2],"\"'");
+							if ((strpos($matches[2],'[') !== false) || (strpos($matches[2],']') !== false)) {
+								//	It's a Reference to an external workbook (not currently supported)
+								return $this->_raiseFormulaError('Unable to access External Workbook');
+							}
+							$matches[2] = trim($matches[2],"\"'");
 //							echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
 							$this->_writeDebug('Evaluating Cell Range '.$cellRef.' in worksheet '.$matches[2]);
-							if (!is_null($pCellParent)) {
+							if ($pCellParent !== NULL) {
 								$cellValue = $this->extractCellRange($cellRef, $pCellParent->getParent()->getSheetByName($matches[2]), false);
 							} else {
 								return $this->_raiseFormulaError('Unable to access Cell Reference');
@@ -3186,7 +3214,7 @@ class PHPExcel_Calculation {
 						} else {
 //							echo '$cellRef='.$cellRef.' in current worksheet<br />';
 							$this->_writeDebug('Evaluating Cell Range '.$cellRef.' in current worksheet');
-							if (!is_null($pCellParent)) {
+							if ($pCellParent !== NULL) {
 								$cellValue = $this->extractCellRange($cellRef, $pCellParent, false);
 							} else {
 								return $this->_raiseFormulaError('Unable to access Cell Reference');
@@ -3196,16 +3224,20 @@ class PHPExcel_Calculation {
 					}
 				} else {
 //					echo 'Reference is a single Cell<br />';
-					if (is_null($pCell)) {
+					if ($pCell === NULL) {
 //						We can't access the cell, so return a REF error
 						$cellValue = PHPExcel_Calculation_Functions::REF();
 					} else {
 						$cellRef = $matches[6].$matches[7];
 						if ($matches[2] > '') {
 							$matches[2] = trim($matches[2],"\"'");
+							if ((strpos($matches[2],'[') !== false) || (strpos($matches[2],']') !== false)) {
+								//	It's a Reference to an external workbook (not currently supported)
+								return $this->_raiseFormulaError('Unable to access External Workbook');
+							}
 //							echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
 							$this->_writeDebug('Evaluating Cell '.$cellRef.' in worksheet '.$matches[2]);
-							if (!is_null($pCellParent)) {
+							if ($pCellParent !== NULL) {
 								if ($pCellParent->getParent()->getSheetByName($matches[2])->cellExists($cellRef)) {
 									$cellValue = $this->extractCellRange($cellRef, $pCellParent->getParent()->getSheetByName($matches[2]), false);
 									$pCell->attach($pCellParent);
@@ -3260,7 +3292,7 @@ class PHPExcel_Calculation {
 						if (($passByReference) &&
 							(isset(self::$_PHPExcelFunctions[$functionName]['passByReference'][$a])) &&
 							(self::$_PHPExcelFunctions[$functionName]['passByReference'][$a])) {
-							if (is_null($arg['reference'])) {
+							if ($arg['reference'] === NULL) {
 								$args[] = $cellID;
 								if ($functionName != 'MKMATRIX') { $argArrayVals[] = $this->_showValue($cellID); }
 							} else {
@@ -3337,7 +3369,7 @@ class PHPExcel_Calculation {
 //					echo 'Token is a PHPExcel constant: '.$excelConstant.'<br />';
 					$stack->push('Constant Value',self::$_ExcelConstants[$excelConstant]);
 					$this->_writeDebug('Evaluating Constant '.$excelConstant.' as '.$this->_showTypeDetails(self::$_ExcelConstants[$excelConstant]));
-				} elseif ((is_numeric($token)) || (is_null($token)) || (is_bool($token)) || ($token == '') || ($token{0} == '"') || ($token{0} == '#')) {
+				} elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token{0} == '"') || ($token{0} == '#')) {
 //					echo 'Token is a number, boolean, string, null or an Excel error<br />';
 					$stack->push('Value',$token);
 				// if the token is a named range, push the named range name onto the stack
@@ -3400,14 +3432,14 @@ class PHPExcel_Calculation {
 			$result = array();
 			if ((is_array($operand1)) && (!is_array($operand2))) {
 				foreach($operand1 as $x => $operandData) {
-					$this->_writeDebug('Evaluating '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2));
+					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2));
 					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2,$operation,$stack);
 					$r = $stack->pop();
 					$result[$x] = $r['value'];
 				}
 			} elseif ((!is_array($operand1)) && (is_array($operand2))) {
 				foreach($operand2 as $x => $operandData) {
-					$this->_writeDebug('Evaluating '.$this->_showValue($operand1).' '.$operation.' '.$this->_showValue($operandData));
+					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operand1).' '.$operation.' '.$this->_showValue($operandData));
 					$this->_executeBinaryComparisonOperation($cellID,$operand1,$operandData,$operation,$stack);
 					$r = $stack->pop();
 					$result[$x] = $r['value'];
@@ -3415,14 +3447,14 @@ class PHPExcel_Calculation {
 			} else {
 				if (!$recursingArrays) { self::_checkMatrixOperands($operand1,$operand2,2); }
 				foreach($operand1 as $x => $operandData) {
-					$this->_writeDebug('Evaluating '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2[$x]));
+					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2[$x]));
 					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2[$x],$operation,$stack,true);
 					$r = $stack->pop();
 					$result[$x] = $r['value'];
 				}
 			}
 			//	Log the result details
-			$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
+			$this->_writeDebug('Comparison Evaluation Result is '.$this->_showTypeDetails($result));
 			//	And push the result onto the stack
 			$stack->push('Array',$result);
 			return true;
@@ -3562,6 +3594,7 @@ class PHPExcel_Calculation {
 	// trigger an error, but nicely, if need be
 	protected function _raiseFormulaError($errorMessage) {
 		$this->formulaError = $errorMessage;
+		$this->debugLogStack = array();
 		if (!$this->suppressFormulaErrors) throw new Exception($errorMessage);
 		trigger_error($errorMessage, E_USER_ERROR);
 	}	//	function _raiseFormulaError()
@@ -3580,7 +3613,7 @@ class PHPExcel_Calculation {
 		$returnValue = array ();
 
 //		echo 'extractCellRange('.$pRange.')<br />';
-		if (!is_null($pSheet)) {
+		if ($pSheet !== NULL) {
 //			echo 'Passed sheet name is '.$pSheet->getTitle().'<br />';
 //			echo 'Range reference is '.$pRange.'<br />';
 			if (strpos ($pRange, '!') !== false) {
@@ -3636,7 +3669,7 @@ class PHPExcel_Calculation {
 		$returnValue = array ();
 
 //		echo 'extractNamedRange('.$pRange.')<br />';
-		if (!is_null($pSheet)) {
+		if ($pSheet !== NULL) {
 //			echo 'Current sheet name is '.$pSheet->getTitle().'<br />';
 //			echo 'Range reference is '.$pRange.'<br />';
 			if (strpos ($pRange, '!') !== false) {
@@ -3650,7 +3683,7 @@ class PHPExcel_Calculation {
 
 			// Named range?
 			$namedRange = PHPExcel_NamedRange::resolveRange($pRange, $pSheet);
-			if (!is_null($namedRange)) {
+			if ($namedRange !== NULL) {
 				$pSheet = $namedRange->getWorksheet();
 //				echo 'Named Range '.$pRange.' (';
 				$pRange = $namedRange->getRange();
@@ -3776,52 +3809,3 @@ class PHPExcel_Calculation {
 
 }	//	class PHPExcel_Calculation
 
-
-
-
-// for internal use
-class PHPExcel_Token_Stack {
-
-	private $_stack = array();
-	private $_count = 0;
-
-
-	public function count() {
-		return $this->_count;
-	}	//	function count()
-
-
-	public function push($type,$value,$reference=null) {
-		$this->_stack[$this->_count++] = array('type'		=> $type,
-											   'value'		=> $value,
-											   'reference'	=> $reference
-											  );
-		if ($type == 'Function') {
-			$localeFunction = PHPExcel_Calculation::_localeFunc($value);
-			if ($localeFunction != $value) {
-				$this->_stack[($this->_count - 1)]['localeValue'] = $localeFunction;
-			}
-		}
-	}	//	function push()
-
-
-	public function pop() {
-		if ($this->_count > 0) {
-			return $this->_stack[--$this->_count];
-		}
-		return null;
-	}	//	function pop()
-
-
-	public function last($n=1) {
-		if ($this->_count-$n < 0) {
-			return null;
-		}
-		return $this->_stack[$this->_count-$n];
-	}	//	function last()
-
-
-	function __construct() {
-	}
-
-}	//	class PHPExcel_Token_Stack
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Database.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Database.php
index 8696d225b3a..4a6c8f72c9a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Database.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Database.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -41,11 +41,29 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Database {
 
 
+	/**
+	 * __fieldExtract
+	 *
+	 * Extracts the column ID to use for the data field.
+	 *
+	 * @access	private
+	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	mixed		$field			Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @return	string|NULL
+	 *
+	 */
 	private static function __fieldExtract($database,$field) {
 		$field = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($field));
 		$fieldNames = array_map('strtoupper',array_shift($database));
@@ -55,9 +73,28 @@ class PHPExcel_Calculation_Database {
 			return $keys[$field-1];
 		}
 		$key = array_search($field,$fieldNames);
-		return ($key) ? $key : null;
+		return ($key) ? $key : NULL;
 	}
 
+	/**
+	 * __filter
+	 *
+	 * Parses the selection criteria, extracts the database rows that match those criteria, and
+	 * returns that subset of rows.
+	 *
+	 * @access	private
+	 * @param	mixed[]		$database		The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	mixed[]		$criteria		The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	array of mixed
+	 *
+	 */
 	private static function __filter($database,$criteria) {
 		$fieldNames = array_shift($database);
 		$criteriaNames = array_shift($criteria);
@@ -82,6 +119,7 @@ class PHPExcel_Calculation_Database {
 				$testConditionsCount++;
 			}
 		}
+
 		if ($testConditionsCount > 1) {
 			$testConditionSet = 'AND('.implode(',',$testConditions).')';
 		} elseif($testConditionsCount == 1) {
@@ -113,7 +151,30 @@ class PHPExcel_Calculation_Database {
 
 
 	/**
-	 *	DAVERAGE
+	 * DAVERAGE
+	 *
+	 * Averages the values in a column of a list or database that match conditions you specify.
+	 *
+	 * Excel Function:
+	 *		DAVERAGE(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DAVERAGE($database,$field,$criteria) {
@@ -121,7 +182,6 @@ class PHPExcel_Calculation_Database {
 		if (is_null($field)) {
 			return NULL;
 		}
-
 		//	reduce the database to a set of rows that match all the criteria
 		$database = self::__filter($database,$criteria);
 		//	extract an array of values for the requested column
@@ -134,8 +194,39 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::AVERAGE($colData);
 	}	//	function DAVERAGE()
 
+
 	/**
-	 *	DCOUNT
+	 * DCOUNT
+	 *
+	 * Counts the cells that contain numbers in a column of a list or database that match conditions
+	 * that you specify.
+	 *
+	 * Excel Function:
+	 *		DCOUNT(database,[field],criteria)
+	 *
+	 * Excel Function:
+	 *		DAVERAGE(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	integer
+	 *
+	 * @TODO	The field argument is optional. If field is omitted, DCOUNT counts all records in the
+	 *			database that match the criteria.
 	 *
 	 */
 	public static function DCOUNT($database,$field,$criteria) {
@@ -156,8 +247,35 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::COUNT($colData);
 	}	//	function DCOUNT()
 
+
 	/**
-	 *	DCOUNTA
+	 * DCOUNTA
+	 *
+	 * Counts the nonblank cells in a column of a list or database that match conditions that you specify.
+	 *
+	 * Excel Function:
+	 *		DCOUNTA(database,[field],criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	integer
+	 *
+	 * @TODO	The field argument is optional. If field is omitted, DCOUNTA counts all records in the
+	 *			database that match the criteria.
 	 *
 	 */
 	public static function DCOUNTA($database,$field,$criteria) {
@@ -178,8 +296,33 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::COUNTA($colData);
 	}	//	function DCOUNTA()
 
+
 	/**
-	 *	DGET
+	 * DGET
+	 *
+	 * Extracts a single value from a column of a list or database that matches conditions that you
+	 * specify.
+	 *
+	 * Excel Function:
+	 *		DGET(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	mixed
 	 *
 	 */
 	public static function DGET($database,$field,$criteria) {
@@ -204,8 +347,33 @@ class PHPExcel_Calculation_Database {
 		return $colData[0];
 	}	//	function DGET()
 
+
 	/**
-	 *	DMAX
+	 * DMAX
+	 *
+	 * Returns the largest number in a column of a list or database that matches conditions you that
+	 * specify.
+	 *
+	 * Excel Function:
+	 *		DMAX(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DMAX($database,$field,$criteria) {
@@ -226,8 +394,33 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::MAX($colData);
 	}	//	function DMAX()
 
+
 	/**
-	 *	DMIN
+	 * DMIN
+	 *
+	 * Returns the smallest number in a column of a list or database that matches conditions you that
+	 * specify.
+	 *
+	 * Excel Function:
+	 *		DMIN(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DMIN($database,$field,$criteria) {
@@ -248,8 +441,32 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::MIN($colData);
 	}	//	function DMIN()
 
+
 	/**
-	 *	DPRODUCT
+	 * DPRODUCT
+	 *
+	 * Multiplies the values in a column of a list or database that match conditions that you specify.
+	 *
+	 * Excel Function:
+	 *		DPRODUCT(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DPRODUCT($database,$field,$criteria) {
@@ -270,8 +487,33 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_MathTrig::PRODUCT($colData);
 	}	//	function DPRODUCT()
 
+
 	/**
-	 *	DSTDEV
+	 * DSTDEV
+	 *
+	 * Estimates the standard deviation of a population based on a sample by using the numbers in a
+	 * column of a list or database that match conditions that you specify.
+	 *
+	 * Excel Function:
+	 *		DSTDEV(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DSTDEV($database,$field,$criteria) {
@@ -292,8 +534,33 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::STDEV($colData);
 	}	//	function DSTDEV()
 
+
 	/**
-	 *	DSTDEVP
+	 * DSTDEVP
+	 *
+	 * Calculates the standard deviation of a population based on the entire population by using the
+	 * numbers in a column of a list or database that match conditions that you specify.
+	 *
+	 * Excel Function:
+	 *		DSTDEVP(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DSTDEVP($database,$field,$criteria) {
@@ -314,8 +581,32 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::STDEVP($colData);
 	}	//	function DSTDEVP()
 
+
 	/**
-	 *	DSUM
+	 * DSUM
+	 *
+	 * Adds the numbers in a column of a list or database that match conditions that you specify.
+	 *
+	 * Excel Function:
+	 *		DSUM(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DSUM($database,$field,$criteria) {
@@ -336,8 +627,33 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_MathTrig::SUM($colData);
 	}	//	function DSUM()
 
+
 	/**
-	 *	DVAR
+	 * DVAR
+	 *
+	 * Estimates the variance of a population based on a sample by using the numbers in a column
+	 * of a list or database that match conditions that you specify.
+	 *
+	 * Excel Function:
+	 *		DVAR(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DVAR($database,$field,$criteria) {
@@ -358,8 +674,33 @@ class PHPExcel_Calculation_Database {
 		return PHPExcel_Calculation_Statistical::VARFunc($colData);
 	}	//	function DVAR()
 
+
 	/**
-	 *	DVARP
+	 * DVARP
+	 *
+	 * Calculates the variance of a population based on the entire population by using the numbers
+	 * in a column of a list or database that match conditions that you specify.
+	 *
+	 * Excel Function:
+	 *		DVARP(database,field,criteria)
+	 *
+	 * @access	public
+	 * @category Database Functions
+	 * @param	mixed[]			$database	The range of cells that makes up the list or database.
+	 *										A database is a list of related data in which rows of related
+	 *										information are records, and columns of data are fields. The
+	 *										first row of the list contains labels for each column.
+	 * @param	string|integer	$field		Indicates which column is used in the function. Enter the
+	 *										column label enclosed between double quotation marks, such as
+	 *										"Age" or "Yield," or a number (without quotation marks) that
+	 *										represents the position of the column within the list: 1 for
+	 *										the first column, 2 for the second column, and so on.
+	 * @param	mixed[]			$criteria	The range of cells that contains the conditions you specify.
+	 *										You can use any range for the criteria argument, as long as it
+	 *										includes at least one column label and at least one cell below
+	 *										the column label in which you specify a condition for the
+	 *										column.
+	 * @return	float
 	 *
 	 */
 	public static function DVARP($database,$field,$criteria) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/DateTime.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/DateTime.php
index e32de01ebe0..3b5dc45aaaa 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/DateTime.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/DateTime.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -41,10 +41,16 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_DateTime {
 
+	/**
+	 * Identify if a year is a leap year or not
+	 *
+	 * @param	integer	$year	The year to test
+	 * @return	boolean			TRUE if the year is a leap year, otherwise FALSE
+	 */
 	public static function _isLeapYear($year) {
 		return ((($year % 4) == 0) && (($year % 100) != 0) || (($year % 400) == 0));
 	}	//	function _isLeapYear()
@@ -82,7 +88,8 @@ class PHPExcel_Calculation_DateTime {
 	 */
 	public static function _getDateValue($dateValue) {
 		if (!is_numeric($dateValue)) {
-			if ((is_string($dateValue)) && (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
+			if ((is_string($dateValue)) &&
+				(PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
 				return PHPExcel_Calculation_Functions::VALUE();
 			}
 			if ((is_object($dateValue)) && ($dateValue instanceof PHPExcel_Shared_Date::$dateTimeObjectType)) {
@@ -142,6 +149,19 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DATETIMENOW
 	 *
+	 * Returns the current date and time.
+	 * The NOW function is useful when you need to display the current date and time on a worksheet or
+	 * calculate a value based on the current date and time, and have that value updated each time you
+	 * open the worksheet.
+	 *
+	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+	 * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
+	 *
+	 * Excel Function:
+	 *		NOW()
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
 	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
 	 *						depending on the value of the ReturnDateType flag
 	 */
@@ -169,6 +189,19 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DATENOW
 	 *
+	 * Returns the current date.
+	 * The NOW function is useful when you need to display the current date and time on a worksheet or
+	 * calculate a value based on the current date and time, and have that value updated each time you
+	 * open the worksheet.
+	 *
+	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+	 * and time format of your regional settings. PHPExcel does not change cell formatting in this way.
+	 *
+	 * Excel Function:
+	 *		TODAY()
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
 	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
 	 *						depending on the value of the ReturnDateType flag
 	 */
@@ -182,7 +215,7 @@ class PHPExcel_Calculation_DateTime {
 					$retValue = (float) $excelDateTime;
 					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					$retValue = (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateTime) - 3600;
+					$retValue = (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateTime);
 					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 					$retValue = PHPExcel_Shared_Date::ExcelToPHPObject($excelDateTime);
@@ -197,16 +230,65 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DATE
 	 *
-	 * @param	long	$year
-	 * @param	long	$month
-	 * @param	long	$day
+	 * The DATE function returns a value that represents a particular date.
+	 *
+	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
+	 *
+	 * Excel Function:
+	 *		DATE(year,month,day)
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	integer		$year	The value of the year argument can include one to four digits.
+	 *								Excel interprets the year argument according to the configured
+	 *								date system: 1900 or 1904.
+	 *								If year is between 0 (zero) and 1899 (inclusive), Excel adds that
+	 *								value to 1900 to calculate the year. For example, DATE(108,1,2)
+	 *								returns January 2, 2008 (1900+108).
+	 *								If year is between 1900 and 9999 (inclusive), Excel uses that
+	 *								value as the year. For example, DATE(2008,1,2) returns January 2,
+	 *								2008.
+	 *								If year is less than 0 or is 10000 or greater, Excel returns the
+	 *								#NUM! error value.
+	 * @param	integer		$month	A positive or negative integer representing the month of the year
+	 *								from 1 to 12 (January to December).
+	 *								If month is greater than 12, month adds that number of months to
+	 *								the first month in the year specified. For example, DATE(2008,14,2)
+	 *								returns the serial number representing February 2, 2009.
+	 *								If month is less than 1, month subtracts the magnitude of that
+	 *								number of months, plus 1, from the first month in the year
+	 *								specified. For example, DATE(2008,-3,2) returns the serial number
+	 *								representing September 2, 2007.
+	 * @param	integer		$day	A positive or negative integer representing the day of the month
+	 *								from 1 to 31.
+	 *								If day is greater than the number of days in the month specified,
+	 *								day adds that number of days to the first day in the month. For
+	 *								example, DATE(2008,1,35) returns the serial number representing
+	 *								February 4, 2008.
+	 *								If day is less than 1, day subtracts the magnitude that number of
+	 *								days, plus one, from the first day of the month specified. For
+	 *								example, DATE(2008,1,-15) returns the serial number representing
+	 *								December 16, 2007.
 	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
 	 *						depending on the value of the ReturnDateType flag
 	 */
 	public static function DATE($year = 0, $month = 1, $day = 1) {
-		$year	= (integer) PHPExcel_Calculation_Functions::flattenSingleValue($year);
-		$month	= (integer) PHPExcel_Calculation_Functions::flattenSingleValue($month);
-		$day	= (integer) PHPExcel_Calculation_Functions::flattenSingleValue($day);
+		$year	= PHPExcel_Calculation_Functions::flattenSingleValue($year);
+		$month	= PHPExcel_Calculation_Functions::flattenSingleValue($month);
+		$day	= PHPExcel_Calculation_Functions::flattenSingleValue($day);
+
+		$year	= ($year !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($year) : 0;
+		$month	= ($month !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($month) : 0;
+		$day	= ($day !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($day) : 0;
+		if ((!is_numeric($year)) ||
+			(!is_numeric($month)) ||
+			(!is_numeric($day))) {
+			return PHPExcel_Calculation_Functions::VALUE();
+		}
+		$year	= (integer) $year;
+		$month	= (integer) $month;
+		$day	= (integer) $day;
 
 		$baseYear = PHPExcel_Shared_Date::getExcelCalendar();
 		// Validate parameters
@@ -242,13 +324,10 @@ class PHPExcel_Calculation_DateTime {
 		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
 			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
 					return (float) $excelDateValue;
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
 					return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 					return PHPExcel_Shared_Date::ExcelToPHPObject($excelDateValue);
-					break;
 		}
 	}	//	function DATE()
 
@@ -256,9 +335,27 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * TIME
 	 *
-	 * @param	long	$hour
-	 * @param	long	$minute
-	 * @param	long	$second
+	 * The TIME function returns a value that represents a particular time.
+	 *
+	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
+	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
+	 *
+	 * Excel Function:
+	 *		TIME(hour,minute,second)
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	integer		$hour		A number from 0 (zero) to 32767 representing the hour.
+	 *									Any value greater than 23 will be divided by 24 and the remainder
+	 *									will be treated as the hour value. For example, TIME(27,0,0) =
+	 *									TIME(3,0,0) = .125 or 3:00 AM.
+	 * @param	integer		$minute		A number from 0 to 32767 representing the minute.
+	 *									Any value greater than 59 will be converted to hours and minutes.
+	 *									For example, TIME(0,750,0) = TIME(12,30,0) = .520833 or 12:30 PM.
+	 * @param	integer		$second		A number from 0 to 32767 representing the second.
+	 *									Any value greater than 59 will be converted to hours, minutes,
+	 *									and seconds. For example, TIME(0,0,2000) = TIME(0,33,22) = .023148
+	 *									or 12:33:20 AM
 	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
 	 *						depending on the value of the ReturnDateType flag
 	 */
@@ -310,10 +407,8 @@ class PHPExcel_Calculation_DateTime {
 						$date = 1;
 					}
 					return (float) PHPExcel_Shared_Date::FormattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
-					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::FormattedPHPToExcel(1970, 1, 1, $hour-1, $minute, $second));	// -2147468400; //	-2147472000 + 3600
-					break;
+					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::FormattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));	// -2147468400; //	-2147472000 + 3600
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 					$dayAdjust = 0;
 					if ($hour < 0) {
@@ -329,7 +424,6 @@ class PHPExcel_Calculation_DateTime {
 						$phpDateObject->modify($dayAdjust.' days');
 					}
 					return $phpDateObject;
-					break;
 		}
 	}	//	function TIME()
 
@@ -337,7 +431,26 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DATEVALUE
 	 *
-	 * @param	string	$dateValue
+	 * Returns a value that represents a particular date.
+	 * Use DATEVALUE to convert a date represented by a text string to an Excel or PHP date/time stamp
+	 * value.
+	 *
+	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the date
+	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
+	 *
+	 * Excel Function:
+	 *		DATEVALUE(dateValue)
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	string	$dateValue		Text that represents a date in a Microsoft Excel date format.
+	 *									For example, "1/30/2008" or "30-Jan-2008" are text strings within
+	 *									quotation marks that represent dates. Using the default date
+	 *									system in Excel for Windows, date_text must represent a date from
+	 *									January 1, 1900, to December 31, 9999. Using the default date
+	 *									system in Excel for the Macintosh, date_text must represent a date
+	 *									from January 1, 1904, to December 31, 9999. DATEVALUE returns the
+	 *									#VALUE! error value if date_text is out of this range.
 	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
 	 *						depending on the value of the ReturnDateType flag
 	 */
@@ -402,6 +515,8 @@ class PHPExcel_Calculation_DateTime {
 		if (($PHPDateArray !== False) && ($PHPDateArray['error_count'] == 0)) {
 			// Execute function
 			if ($PHPDateArray['year'] == '')	{ $PHPDateArray['year'] = strftime('%Y'); }
+			if ($PHPDateArray['year'] < 1900)
+				return PHPExcel_Calculation_Functions::VALUE();
 			if ($PHPDateArray['month'] == '')	{ $PHPDateArray['month'] = strftime('%m'); }
 			if ($PHPDateArray['day'] == '')		{ $PHPDateArray['day'] = strftime('%d'); }
 			$excelDateValue = floor(PHPExcel_Shared_Date::FormattedPHPToExcel($PHPDateArray['year'],$PHPDateArray['month'],$PHPDateArray['day'],$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']));
@@ -409,13 +524,10 @@ class PHPExcel_Calculation_DateTime {
 			switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
 				case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
 						return (float) $excelDateValue;
-						break;
 				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
 						return (integer) PHPExcel_Shared_Date::ExcelToPHP($excelDateValue);
-						break;
 				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 						return new DateTime($PHPDateArray['year'].'-'.$PHPDateArray['month'].'-'.$PHPDateArray['day'].' 00:00:00');
-						break;
 			}
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
@@ -425,7 +537,22 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * TIMEVALUE
 	 *
-	 * @param	string	$timeValue
+	 * Returns a value that represents a particular time.
+	 * Use TIMEVALUE to convert a time represented by a text string to an Excel or PHP date/time stamp
+	 * value.
+	 *
+	 * NOTE: When used in a Cell Formula, MS Excel changes the cell format so that it matches the time
+	 * format of your regional settings. PHPExcel does not change cell formatting in this way.
+	 *
+	 * Excel Function:
+	 *		TIMEVALUE(timeValue)
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	string	$timeValue		A text string that represents a time in any one of the Microsoft
+	 *									Excel time formats; for example, "6:45 PM" and "18:45" text strings
+	 *									within quotation marks that represent time.
+	 *									Date information in time_text is ignored.
 	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
 	 *						depending on the value of the ReturnDateType flag
 	 */
@@ -444,13 +571,10 @@ class PHPExcel_Calculation_DateTime {
 			switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
 				case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
 						return (float) $excelDateValue;
-						break;
 				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
 						return (integer) $phpDateValue = PHPExcel_Shared_Date::ExcelToPHP($excelDateValue+25569) - 3600;;
-						break;
 				case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 						return new DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
-						break;
 			}
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
@@ -460,10 +584,12 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DATEDIF
 	 *
-	 * @param	long	$startDate		Excel date serial value or a standard date string
-	 * @param	long	$endDate		Excel date serial value or a standard date string
+	 * @param	mixed	$startDate		Excel date serial value, PHP date/time stamp, PHP DateTime object
+	 *									or a standard date string
+	 * @param	mixed	$endDate		Excel date serial value, PHP date/time stamp, PHP DateTime object
+	 *									or a standard date string
 	 * @param	string	$unit
-	 * @return	long	Interval between the dates
+	 * @return	integer	Interval between the dates
 	 */
 	public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D') {
 		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
@@ -547,6 +673,8 @@ class PHPExcel_Calculation_DateTime {
 					if ($retVal < 0) { $retVal += 365; }
 				}
 				break;
+			default:
+				$retVal = PHPExcel_Calculation_Functions::NaN();
 		}
 		return $retVal;
 	}	//	function DATEDIF()
@@ -555,10 +683,31 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DAYS360
 	 *
-	 * @param	long	$startDate		Excel date serial value or a standard date string
-	 * @param	long	$endDate		Excel date serial value or a standard date string
-	 * @param	boolean	$method			US or European Method
-	 * @return	long	PHP date/time serial
+	 * Returns the number of days between two dates based on a 360-day year (twelve 30-day months),
+	 * which is used in some accounting calculations. Use this function to help compute payments if
+	 * your accounting system is based on twelve 30-day months.
+	 *
+	 * Excel Function:
+	 *		DAYS360(startDate,endDate[,method])
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	mixed		$startDate		Excel date serial value (float), PHP date timestamp (integer),
+	 *										PHP DateTime object, or a standard date string
+	 * @param	mixed		$endDate		Excel date serial value (float), PHP date timestamp (integer),
+	 *										PHP DateTime object, or a standard date string
+	 * @param	boolean		$method			US or European Method
+	 *										FALSE or omitted: U.S. (NASD) method. If the starting date is
+	 *										the last day of a month, it becomes equal to the 30th of the
+	 *										same month. If the ending date is the last day of a month and
+	 *										the starting date is earlier than the 30th of a month, the
+	 *										ending date becomes equal to the 1st of the next month;
+	 *										otherwise the ending date becomes equal to the 30th of the
+	 *										same month.
+	 *										TRUE: European method. Starting dates and ending dates that
+	 *										occur on the 31st of a month become equal to the 30th of the
+	 *										same month.
+	 * @return	integer		Number of days between start date and end date
 	 */
 	public static function DAYS360($startDate = 0, $endDate = 0, $method = false) {
 		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
@@ -587,21 +736,29 @@ class PHPExcel_Calculation_DateTime {
 
 
 	/**
-	 *	YEARFRAC
+	 * YEARFRAC
 	 *
-	 *	Calculates the fraction of the year represented by the number of whole days between two dates (the start_date and the
-	 *	end_date). Use the YEARFRAC worksheet function to identify the proportion of a whole year's benefits or obligations
-	 *	to assign to a specific term.
+	 * Calculates the fraction of the year represented by the number of whole days between two dates
+	 * (the start_date and the end_date).
+	 * Use the YEARFRAC worksheet function to identify the proportion of a whole year's benefits or
+	 * obligations to assign to a specific term.
 	 *
-	 *	@param	mixed	$startDate		Excel date serial value (float), PHP date timestamp (integer) or date object, or a standard date string
-	 *	@param	mixed	$endDate		Excel date serial value (float), PHP date timestamp (integer) or date object, or a standard date string
-	 *	@param	integer	$method			Method used for the calculation
+	 * Excel Function:
+	 *		YEARFRAC(startDate,endDate[,method])
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	mixed	$startDate		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard date string
+	 * @param	mixed	$endDate		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard date string
+	 * @param	integer	$method			Method used for the calculation
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float	fraction of the year
+	 * @return	float	fraction of the year
 	 */
 	public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0) {
 		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
@@ -619,7 +776,6 @@ class PHPExcel_Calculation_DateTime {
 			switch($method) {
 				case 0	:
 					return self::DAYS360($startDate,$endDate) / 360;
-					break;
 				case 1	:
 					$days = self::DATEDIF($startDate,$endDate);
 					$startYear = self::YEAR($startDate);
@@ -664,16 +820,12 @@ class PHPExcel_Calculation_DateTime {
 						$leapDays /= $years;
 					}
 					return $days / (365 + $leapDays);
-					break;
 				case 2	:
 					return self::DATEDIF($startDate,$endDate) / 360;
-					break;
 				case 3	:
 					return self::DATEDIF($startDate,$endDate) / 365;
-					break;
 				case 4	:
 					return self::DAYS360($startDate,$endDate,True) / 360;
-					break;
 			}
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
@@ -683,10 +835,25 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * NETWORKDAYS
 	 *
-	 * @param	mixed				Start date
-	 * @param	mixed				End date
-	 * @param	array of mixed		Optional Date Series
-	 * @return	long	Interval between the dates
+	 * Returns the number of whole working days between start_date and end_date. Working days
+	 * exclude weekends and any dates identified in holidays.
+	 * Use NETWORKDAYS to calculate employee benefits that accrue based on the number of days
+	 * worked during a specific term.
+	 *
+	 * Excel Function:
+	 *		NETWORKDAYS(startDate,endDate[,holidays[,holiday[,...]]])
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	mixed			$startDate		Excel date serial value (float), PHP date timestamp (integer),
+	 *											PHP DateTime object, or a standard date string
+	 * @param	mixed			$endDate		Excel date serial value (float), PHP date timestamp (integer),
+	 *											PHP DateTime object, or a standard date string
+	 * @param	mixed			$holidays,...	Optional series of Excel date serial value (float), PHP date
+	 *											timestamp (integer), PHP DateTime object, or a standard date
+	 *											strings that will be excluded from the working calendar, such
+	 *											as state and federal holidays and floating holidays.
+	 * @return	integer			Interval between the dates
 	 */
 	public static function NETWORKDAYS($startDate,$endDate) {
 		//	Retrieve the mandatory start and end date that are referenced in the function definition
@@ -748,15 +915,32 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * WORKDAY
 	 *
-	 * @param	mixed				Start date
-	 * @param	mixed				number of days for adjustment
-	 * @param	array of mixed		Optional Date Series
-	 * @return	long	Interval between the dates
+	 * Returns the date that is the indicated number of working days before or after a date (the
+	 * starting date). Working days exclude weekends and any dates identified as holidays.
+	 * Use WORKDAY to exclude weekends or holidays when you calculate invoice due dates, expected
+	 * delivery times, or the number of days of work performed.
+	 *
+	 * Excel Function:
+	 *		WORKDAY(startDate,endDays[,holidays[,holiday[,...]]])
+	 *
+	 * @access	public
+	 * @category Date/Time Functions
+	 * @param	mixed		$startDate		Excel date serial value (float), PHP date timestamp (integer),
+	 *										PHP DateTime object, or a standard date string
+	 * @param	integer		$endDays		The number of nonweekend and nonholiday days before or after
+	 *										startDate. A positive value for days yields a future date; a
+	 *										negative value yields a past date.
+	 * @param	mixed		$holidays,...	Optional series of Excel date serial value (float), PHP date
+	 *										timestamp (integer), PHP DateTime object, or a standard date
+	 *										strings that will be excluded from the working calendar, such
+	 *										as state and federal holidays and floating holidays.
+	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+	 *						depending on the value of the ReturnDateType flag
 	 */
 	public static function WORKDAY($startDate,$endDays) {
 		//	Retrieve the mandatory start date and days that are referenced in the function definition
 		$startDate	= PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
-		$endDays	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($endDays);
+		$endDays	= PHPExcel_Calculation_Functions::flattenSingleValue($endDays);
 		//	Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
 		$dateArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
 		array_shift($dateArgs);
@@ -766,6 +950,7 @@ class PHPExcel_Calculation_DateTime {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		$startDate = (float) floor($startDate);
+		$endDays = (int) floor($endDays);
 		//	If endDays is 0, we always return startDate
 		if ($endDays == 0) { return $startDate; }
 
@@ -789,10 +974,10 @@ class PHPExcel_Calculation_DateTime {
 		}
 
 		//	Test any extra holiday parameters
-		if (count($dateArgs) > 0) {
+		if (!empty($dateArgs)) {
 			$holidayCountedArray = $holidayDates = array();
 			foreach ($dateArgs as $holidayDate) {
-				if ((!is_null($holidayDate)) && (trim($holidayDate) > '')) {
+				if (($holidayDate !== NULL) && (trim($holidayDate) > '')) {
 					if (is_string($holidayDate = self::_getDateValue($holidayDate))) {
 						return PHPExcel_Calculation_Functions::VALUE();
 					}
@@ -834,13 +1019,10 @@ class PHPExcel_Calculation_DateTime {
 		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
 			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
 					return (float) $endDate;
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
 					return (integer) PHPExcel_Shared_Date::ExcelToPHP($endDate);
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 					return PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
-					break;
 		}
 	}	//	function WORKDAY()
 
@@ -848,8 +1030,15 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DAYOFMONTH
 	 *
-	 * @param	long	$dateValue		Excel date serial value or a standard date string
-	 * @return	int		Day
+	 * Returns the day of the month, for a specified date. The day is given as an integer
+	 * ranging from 1 to 31.
+	 *
+	 * Excel Function:
+	 *		DAY(dateValue)
+	 *
+	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard date string
+	 * @return	int		Day of the month
 	 */
 	public static function DAYOFMONTH($dateValue = 1) {
 		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
@@ -872,12 +1061,30 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * DAYOFWEEK
 	 *
-	 * @param	long	$dateValue		Excel date serial value or a standard date string
-	 * @return	int		Day
+	 * Returns the day of the week for a specified date. The day is given as an integer
+	 * ranging from 0 to 7 (dependent on the requested style).
+	 *
+	 * Excel Function:
+	 *		WEEKDAY(dateValue[,style])
+	 *
+	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard date string
+	 * @param	int		$style			A number that determines the type of return value
+	 *										1 or omitted	Numbers 1 (Sunday) through 7 (Saturday).
+	 *										2				Numbers 1 (Monday) through 7 (Sunday).
+	 *										3				Numbers 0 (Monday) through 6 (Sunday).
+	 * @return	int		Day of the week value
 	 */
 	public static function DAYOFWEEK($dateValue = 1, $style = 1) {
 		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$style		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($style));
+		$style		= PHPExcel_Calculation_Functions::flattenSingleValue($style);
+
+		if (!is_numeric($style)) {
+			return PHPExcel_Calculation_Functions::VALUE();
+		} elseif (($style < 1) || ($style > 3)) {
+			return PHPExcel_Calculation_Functions::NaN();
+		}
+		$style = floor($style);
 
 		if (is_string($dateValue = self::_getDateValue($dateValue))) {
 			return PHPExcel_Calculation_Functions::VALUE();
@@ -899,7 +1106,6 @@ class PHPExcel_Calculation_DateTime {
 					$firstDay = 0;
 					--$DoW;
 					break;
-			default:
 		}
 		if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL) {
 			//	Test for Excel's 1900 leap year, and introduce the error as required
@@ -918,19 +1124,33 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * WEEKOFYEAR
 	 *
-	 * @param	long	$dateValue		Excel date serial value or a standard date string
+	 * Returns the week of the year for a specified date.
+	 * The WEEKNUM function considers the week containing January 1 to be the first week of the year.
+	 * However, there is a European standard that defines the first week as the one with the majority
+	 * of days (four or more) falling in the new year. This means that for years in which there are
+	 * three days or less in the first week of January, the WEEKNUM function returns week numbers
+	 * that are incorrect according to the European standard.
+	 *
+	 * Excel Function:
+	 *		WEEKNUM(dateValue[,style])
+	 *
+	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard date string
 	 * @param	boolean	$method			Week begins on Sunday or Monday
+	 *										1 or omitted	Week begins on Sunday.
+	 *										2				Week begins on Monday.
 	 * @return	int		Week Number
 	 */
 	public static function WEEKOFYEAR($dateValue = 1, $method = 1) {
 		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$method		= floor(PHPExcel_Calculation_Functions::flattenSingleValue($method));
+		$method		= PHPExcel_Calculation_Functions::flattenSingleValue($method);
 
 		if (!is_numeric($method)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		} elseif (($method < 1) || ($method > 2)) {
 			return PHPExcel_Calculation_Functions::NaN();
 		}
+		$method = floor($method);
 
 		if (is_string($dateValue = self::_getDateValue($dateValue))) {
 			return PHPExcel_Calculation_Functions::VALUE();
@@ -955,8 +1175,15 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * MONTHOFYEAR
 	 *
-	 * @param	long	$dateValue		Excel date serial value or a standard date string
-	 * @return	int		Month
+	 * Returns the month of a date represented by a serial number.
+	 * The month is given as an integer, ranging from 1 (January) to 12 (December).
+	 *
+	 * Excel Function:
+	 *		MONTH(dateValue)
+	 *
+	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard date string
+	 * @return	int		Month of the year
 	 */
 	public static function MONTHOFYEAR($dateValue = 1) {
 		$dateValue	= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
@@ -977,7 +1204,14 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * YEAR
 	 *
-	 * @param	long	$dateValue		Excel date serial value or a standard date string
+	 * Returns the year corresponding to a date.
+	 * The year is returned as an integer in the range 1900-9999.
+	 *
+	 * Excel Function:
+	 *		YEAR(dateValue)
+	 *
+	 * @param	mixed	$dateValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard date string
 	 * @return	int		Year
 	 */
 	public static function YEAR($dateValue = 1) {
@@ -999,7 +1233,14 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * HOUROFDAY
 	 *
-	 * @param	mixed	$timeValue		Excel time serial value or a standard time string
+	 * Returns the hour of a time value.
+	 * The hour is given as an integer, ranging from 0 (12:00 A.M.) to 23 (11:00 P.M.).
+	 *
+	 * Excel Function:
+	 *		HOUR(timeValue)
+	 *
+	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard time string
 	 * @return	int		Hour
 	 */
 	public static function HOUROFDAY($timeValue = 0) {
@@ -1032,7 +1273,14 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * MINUTEOFHOUR
 	 *
-	 * @param	long	$timeValue		Excel time serial value or a standard time string
+	 * Returns the minutes of a time value.
+	 * The minute is given as an integer, ranging from 0 to 59.
+	 *
+	 * Excel Function:
+	 *		MINUTE(timeValue)
+	 *
+	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard time string
 	 * @return	int		Minute
 	 */
 	public static function MINUTEOFHOUR($timeValue = 0) {
@@ -1065,7 +1313,14 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * SECONDOFMINUTE
 	 *
-	 * @param	long	$timeValue		Excel time serial value or a standard time string
+	 * Returns the seconds of a time value.
+	 * The second is given as an integer in the range 0 (zero) to 59.
+	 *
+	 * Excel Function:
+	 *		SECOND(timeValue)
+	 *
+	 * @param	mixed	$timeValue		Excel date serial value (float), PHP date timestamp (integer),
+	 *									PHP DateTime object, or a standard time string
 	 * @return	int		Second
 	 */
 	public static function SECONDOFMINUTE($timeValue = 0) {
@@ -1098,20 +1353,30 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * EDATE
 	 *
-	 * Returns the serial number that represents the date that is the indicated number of months before or after a specified date
-	 * (the start_date). Use EDATE to calculate maturity dates or due dates that fall on the same day of the month as the date of issue.
+	 * Returns the serial number that represents the date that is the indicated number of months
+	 * before or after a specified date (the start_date).
+	 * Use EDATE to calculate maturity dates or due dates that fall on the same day of the month
+	 * as the date of issue.
 	 *
-	 * @param	long	$dateValue				Excel date serial value or a standard date string
-	 * @param	int		$adjustmentMonths		Number of months to adjust by
-	 * @return	long	Excel date serial value
+	 * Excel Function:
+	 *		EDATE(dateValue,adjustmentMonths)
+	 *
+	 * @param	mixed	$dateValue			Excel date serial value (float), PHP date timestamp (integer),
+	 *										PHP DateTime object, or a standard date string
+	 * @param	int		$adjustmentMonths	The number of months before or after start_date.
+	 *										A positive value for months yields a future date;
+	 *										a negative value yields a past date.
+	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+	 *						depending on the value of the ReturnDateType flag
 	 */
 	public static function EDATE($dateValue = 1, $adjustmentMonths = 0) {
 		$dateValue			= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$adjustmentMonths	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths));
+		$adjustmentMonths	= PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
 
 		if (!is_numeric($adjustmentMonths)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
+		$adjustmentMonths = floor($adjustmentMonths);
 
 		if (is_string($dateValue = self::_getDateValue($dateValue))) {
 			return PHPExcel_Calculation_Functions::VALUE();
@@ -1123,13 +1388,10 @@ class PHPExcel_Calculation_DateTime {
 		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
 			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
 					return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
 					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 					return $PHPDateObject;
-					break;
 		}
 	}	//	function EDATE()
 
@@ -1137,20 +1399,29 @@ class PHPExcel_Calculation_DateTime {
 	/**
 	 * EOMONTH
 	 *
-	 * Returns the serial number for the last day of the month that is the indicated number of months before or after start_date.
+	 * Returns the date value for the last day of the month that is the indicated number of months
+	 * before or after start_date.
 	 * Use EOMONTH to calculate maturity dates or due dates that fall on the last day of the month.
 	 *
-	 * @param	long	$dateValue			Excel date serial value or a standard date string
-	 * @param	int		$adjustmentMonths	Number of months to adjust by
-	 * @return	long	Excel date serial value
+	 * Excel Function:
+	 *		EOMONTH(dateValue,adjustmentMonths)
+	 *
+	 * @param	mixed	$dateValue			Excel date serial value (float), PHP date timestamp (integer),
+	 *										PHP DateTime object, or a standard date string
+	 * @param	int		$adjustmentMonths	The number of months before or after start_date.
+	 *										A positive value for months yields a future date;
+	 *										a negative value yields a past date.
+	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+	 *						depending on the value of the ReturnDateType flag
 	 */
 	public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0) {
 		$dateValue			= PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
-		$adjustmentMonths	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths));
+		$adjustmentMonths	= PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
 
 		if (!is_numeric($adjustmentMonths)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
+		$adjustmentMonths = floor($adjustmentMonths);
 
 		if (is_string($dateValue = self::_getDateValue($dateValue))) {
 			return PHPExcel_Calculation_Functions::VALUE();
@@ -1165,14 +1436,12 @@ class PHPExcel_Calculation_DateTime {
 		switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
 			case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL :
 					return (float) PHPExcel_Shared_Date::PHPToExcel($PHPDateObject);
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC :
 					return (integer) PHPExcel_Shared_Date::ExcelToPHP(PHPExcel_Shared_Date::PHPToExcel($PHPDateObject));
-					break;
 			case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT :
 					return $PHPDateObject;
-					break;
 		}
 	}	//	function EOMONTH()
 
 }	//	class PHPExcel_Calculation_DateTime
+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Engineering.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Engineering.php
index 9adc2ecdf14..cfaffafbab5 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Engineering.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Engineering.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -45,10 +45,15 @@ define('EULER', 2.71828182845904523536);
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Engineering {
 
+	/**
+	 * Details of the Units of measure that can be used in CONVERTUOM()
+	 *
+	 * @var mixed[]
+	 */
 	private static $_conversionUnits = array( 'g'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Gram',						'AllowPrefix'	=> True		),
 											  'sg'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Slug',						'AllowPrefix'	=> False	),
 											  'lbm'		=> array(	'Group'	=> 'Mass',			'Unit Name'	=> 'Pound mass (avoirdupois)',	'AllowPrefix'	=> False	),
@@ -114,6 +119,11 @@ class PHPExcel_Calculation_Engineering {
 											  'lt'		=> array(	'Group'	=> 'Liquid',		'Unit Name'	=> 'Litre',						'AllowPrefix'	=> True		)
 											);
 
+	/**
+	 * Details of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
+	 *
+	 * @var mixed[]
+	 */
 	private static $_conversionMultipliers = array(	'Y'	=> array(	'multiplier'	=> 1E24,	'name'	=> 'yotta'	),
 													'Z'	=> array(	'multiplier'	=> 1E21,	'name'	=> 'zetta'	),
 													'E'	=> array(	'multiplier'	=> 1E18,	'name'	=> 'exa'	),
@@ -136,6 +146,11 @@ class PHPExcel_Calculation_Engineering {
 													'y'	=> array(	'multiplier'	=> 1E-24,	'name'	=> 'yocto'	)
 												 );
 
+	/**
+	 * Details of the Units of measure conversion factors, organised by group
+	 *
+	 * @var mixed[]
+	 */
 	private static $_unitConversions = array(	'Mass'		=> array(	'g'		=> array(	'g'		=> 1.0,
 																							'sg'	=> 6.85220500053478E-05,
 																							'lbm'	=> 2.20462291469134E-03,
@@ -670,6 +685,14 @@ class PHPExcel_Calculation_Engineering {
 											);
 
 
+	/**
+	 * _parseComplex
+	 *
+	 * Parses a complex number into its real and imaginary parts, and an I or J suffix
+	 *
+	 * @param	string		$complexNumber	The complex number
+	 * @return	string[]	Indexed on "real", "imaginary" and "suffix"
+	 */
 	public static function _parseComplex($complexNumber) {
 		$workString = (string) $complexNumber;
 
@@ -717,6 +740,14 @@ class PHPExcel_Calculation_Engineering {
 	}	//	function _parseComplex()
 
 
+	/**
+	 * _cleanComplex
+	 *
+	 * Cleans the leading characters in a complex number string
+	 *
+	 * @param	string		$complexNumber	The complex number to clean
+	 * @return	string		The "cleaned" complex number
+	 */
 	private static function _cleanComplex($complexNumber) {
 		if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1);
 		if ($complexNumber{0} == '0') $complexNumber = substr($complexNumber,1);
@@ -740,88 +771,108 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * BESSELI
+	 *	BESSELI
 	 *
-	 * Returns the modified Bessel function, which is equivalent to the Bessel function evaluated for purely imaginary arguments
+	 *	Returns the modified Bessel function In(x), which is equivalent to the Bessel function evaluated
+	 *		for purely imaginary arguments
+	 *
+	 *	Excel Function:
+	 *		BESSELI(x,ord)
+	 *
+	 *	@access	public
+	 *	@category Engineering Functions
+	 *	@param	float		$x		The value at which to evaluate the function.
+	 *								If x is nonnumeric, BESSELI returns the #VALUE! error value.
+	 *	@param	integer		$ord	The order of the Bessel function.
+	 *								If ord is not an integer, it is truncated.
+	 *								If $ord is nonnumeric, BESSELI returns the #VALUE! error value.
+	 *								If $ord < 0, BESSELI returns the #NUM! error value.
+	 *	@return	float
 	 *
-	 * @param	float		$x
-	 * @param	float		$n
-	 * @return	int
 	 */
-	public static function BESSELI($x, $n) {
+	public static function BESSELI($x, $ord) {
 		$x	= (is_null($x))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$n	= (is_null($n))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($n);
+		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
 
-		if ((is_numeric($x)) && (is_numeric($n))) {
-			$n	= floor($n);
-			if ($n < 0) {
+		if ((is_numeric($x)) && (is_numeric($ord))) {
+			$ord	= floor($ord);
+			if ($ord < 0) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
-			$f_2_PI = 2 * M_PI;
 
 			if (abs($x) <= 30) {
-				$fTerm = pow($x / 2, $n) / PHPExcel_Calculation_MathTrig::FACT($n);
-				$nK = 1;
-				$fResult = $fTerm;
+				$fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
+				$ordK = 1;
 				$fSqrX = ($x * $x) / 4;
 				do {
 					$fTerm *= $fSqrX;
-					$fTerm /= ($nK * ($nK + $n));
+					$fTerm /= ($ordK * ($ordK + $ord));
 					$fResult += $fTerm;
-				} while ((abs($fTerm) > 1e-10) && (++$nK < 100));
+				} while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
 			} else {
+				$f_2_PI = 2 * M_PI;
+
 				$fXAbs = abs($x);
 				$fResult = exp($fXAbs) / sqrt($f_2_PI * $fXAbs);
-				if (($n && 1) && ($x < 0)) {
+				if (($ord & 1) && ($x < 0)) {
 					$fResult = -$fResult;
 				}
 			}
-			return $fResult;
+			return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function BESSELI()
 
 
 	/**
-	 * BESSELJ
+	 *	BESSELJ
 	 *
-	 * Returns the Bessel function
+	 *	Returns the Bessel function
+	 *
+	 *	Excel Function:
+	 *		BESSELJ(x,ord)
+	 *
+	 *	@access	public
+	 *	@category Engineering Functions
+	 *	@param	float		$x		The value at which to evaluate the function.
+	 *								If x is nonnumeric, BESSELJ returns the #VALUE! error value.
+	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
+	 *								If $ord is nonnumeric, BESSELJ returns the #VALUE! error value.
+	 *								If $ord < 0, BESSELJ returns the #NUM! error value.
+	 *	@return	float
 	 *
-	 * @param	float		$x
-	 * @param	float		$n
-	 * @return	int
 	 */
-	public static function BESSELJ($x, $n) {
+	public static function BESSELJ($x, $ord) {
 		$x	= (is_null($x))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
-		$n	= (is_null($n))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($n);
+		$ord	= (is_null($ord))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($ord);
 
-		if ((is_numeric($x)) && (is_numeric($n))) {
-			$n	= floor($n);
-			if ($n < 0) {
+		if ((is_numeric($x)) && (is_numeric($ord))) {
+			$ord	= floor($ord);
+			if ($ord < 0) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
-			$f_PI_DIV_2 = M_PI / 2;
-			$f_PI_DIV_4 = M_PI / 4;
 
 			$fResult = 0;
 			if (abs($x) <= 30) {
-				$fTerm = pow($x / 2, $n) / PHPExcel_Calculation_MathTrig::FACT($n);
-				$nK = 1;
-				$fResult = $fTerm;
+				$fResult = $fTerm = pow($x / 2, $ord) / PHPExcel_Calculation_MathTrig::FACT($ord);
+				$ordK = 1;
 				$fSqrX = ($x * $x) / -4;
 				do {
 					$fTerm *= $fSqrX;
-					$fTerm /= ($nK * ($nK + $n));
+					$fTerm /= ($ordK * ($ordK + $ord));
 					$fResult += $fTerm;
-				} while ((abs($fTerm) > 1e-10) && (++$nK < 100));
+				} while ((abs($fTerm) > 1e-12) && (++$ordK < 100));
 			} else {
+				$f_PI_DIV_2 = M_PI / 2;
+				$f_PI_DIV_4 = M_PI / 4;
+
 				$fXAbs = abs($x);
-				$fResult = sqrt(M_2DIVPI / $fXAbs) * cos($fXAbs - $n * $f_PI_DIV_2 - $f_PI_DIV_4);
-				if (($n && 1) && ($x < 0)) {
+				$fResult = sqrt(M_2DIVPI / $fXAbs) * cos($fXAbs - $ord * $f_PI_DIV_2 - $f_PI_DIV_4);
+				if (($ord & 1) && ($x < 0)) {
 					$fResult = -$fResult;
 				}
 			}
-			return $fResult;
+			return (is_nan($fResult)) ? PHPExcel_Calculation_Functions::NaN() : $fResult;
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function BESSELJ()
@@ -862,13 +913,23 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * BESSELK
+	 *	BESSELK
 	 *
-	 * Returns the modified Bessel function, which is equivalent to the Bessel functions evaluated for purely imaginary arguments.
+	 *	Returns the modified Bessel function Kn(x), which is equivalent to the Bessel functions evaluated
+	 *		for purely imaginary arguments.
+	 *
+	 *	Excel Function:
+	 *		BESSELK(x,ord)
+	 *
+	 *	@access	public
+	 *	@category Engineering Functions
+	 *	@param	float		$x		The value at which to evaluate the function.
+	 *								If x is nonnumeric, BESSELK returns the #VALUE! error value.
+	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
+	 *								If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
+	 *								If $ord < 0, BESSELK returns the #NUM! error value.
+	 *	@return	float
 	 *
-	 * @param	float		$x
-	 * @param	float		$ord
-	 * @return	float
 	 */
 	public static function BESSELK($x, $ord) {
 		$x		= (is_null($x))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
@@ -893,7 +954,7 @@ class PHPExcel_Calculation_Engineering {
 								$fBk	= $fBkp;
 							}
 			}
-			return $fBk;
+			return (is_nan($fBk)) ? PHPExcel_Calculation_Functions::NaN() : $fBk;
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function BESSELK()
@@ -904,14 +965,14 @@ class PHPExcel_Calculation_Engineering {
 			$y = ($fNum * $fNum);
 			$f1 = -2957821389.0 + $y * (7062834065.0 + $y * (-512359803.6 + $y * (10879881.29 + $y * (-86327.92757 + $y * 228.4622733))));
 			$f2 = 40076544269.0 + $y * (745249964.8 + $y * (7189466.438 + $y * (47447.26470 + $y * (226.1030244 + $y))));
-			$fRet = $f1 / $f2 + M_2DIVPI * self::BESSELJ($fNum, 0) * log($fNum);
+			$fRet = $f1 / $f2 + 0.636619772 * self::BESSELJ($fNum, 0) * log($fNum);
 		} else {
 			$z = 8.0 / $fNum;
 			$y = ($z * $z);
 			$xx = $fNum - 0.785398164;
 			$f1 = 1 + $y * (-0.1098628627e-2 + $y * (0.2734510407e-4 + $y * (-0.2073370639e-5 + $y * 0.2093887211e-6)));
 			$f2 = -0.1562499995e-1 + $y * (0.1430488765e-3 + $y * (-0.6911147651e-5 + $y * (0.7621095161e-6 + $y * (-0.934945152e-7))));
-			$fRet = sqrt(M_2DIVPI / $fNum) * (sin($xx) * $f1 + $z * cos($xx) * $f2);
+			$fRet = sqrt(0.636619772 / $fNum) * (sin($xx) * $f1 + $z * cos($xx) * $f2);
 		}
 		return $fRet;
 	}	//	function _Bessely0()
@@ -924,29 +985,31 @@ class PHPExcel_Calculation_Engineering {
 				(-0.4237922726e7 + $y * 0.8511937935e4)))));
 			$f2 = 0.2499580570e14 + $y * (0.4244419664e12 + $y * (0.3733650367e10 + $y * (0.2245904002e8 + $y *
 				(0.1020426050e6 + $y * (0.3549632885e3 + $y)))));
-			$fRet = $f1 / $f2 + M_2DIVPI * ( self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum);
+			$fRet = $f1 / $f2 + 0.636619772 * ( self::BESSELJ($fNum, 1) * log($fNum) - 1 / $fNum);
 		} else {
-			$z = 8.0 / $fNum;
-			$y = ($z * $z);
-			$xx = $fNum - 2.356194491;
-			$f1 = 1 + $y * (0.183105e-2 + $y * (-0.3516396496e-4 + $y * (0.2457520174e-5 + $y * (-0.240337019e6))));
-			$f2 = 0.04687499995 + $y * (-0.2002690873e-3 + $y * (0.8449199096e-5 + $y * (-0.88228987e-6 + $y * 0.105787412e-6)));
-			$fRet = sqrt(M_2DIVPI / $fNum) * (sin($xx) * $f1 + $z * cos($xx) * $f2);
-			#i12430# ...but this seems to work much better.
-//			$fRet = sqrt(M_2DIVPI / $fNum) * sin($fNum - 2.356194491);
+			$fRet = sqrt(0.636619772 / $fNum) * sin($fNum - 2.356194491);
 		}
 		return $fRet;
 	}	//	function _Bessely1()
 
 
 	/**
-	 * BESSELY
+	 *	BESSELY
 	 *
-	 * Returns the Bessel function, which is also called the Weber function or the Neumann function.
+	 *	Returns the Bessel function, which is also called the Weber function or the Neumann function.
 	 *
-	 * @param	float		$x
-	 * @param	float		$n
-	 * @return	int
+	 *	Excel Function:
+	 *		BESSELY(x,ord)
+	 *
+	 *	@access	public
+	 *	@category Engineering Functions
+	 *	@param	float		$x		The value at which to evaluate the function.
+	 *								If x is nonnumeric, BESSELK returns the #VALUE! error value.
+	 *	@param	integer		$ord	The order of the Bessel function. If n is not an integer, it is truncated.
+	 *								If $ord is nonnumeric, BESSELK returns the #VALUE! error value.
+	 *								If $ord < 0, BESSELK returns the #NUM! error value.
+	 *
+	 *	@return	float
 	 */
 	public static function BESSELY($x, $ord) {
 		$x		= (is_null($x))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($x);
@@ -971,7 +1034,7 @@ class PHPExcel_Calculation_Engineering {
 								$fBy	= $fByp;
 							}
 			}
-			return $fBy;
+			return (is_nan($fBy)) ? PHPExcel_Calculation_Functions::NaN() : $fBy;
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
 	}	//	function BESSELY()
@@ -980,9 +1043,19 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * BINTODEC
 	 *
-	 * Return a binary value as Decimal.
+	 * Return a binary value as decimal.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		BIN2DEC(x)
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
+	 *								cannot contain more than 10 characters (10 bits). The most significant
+	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+	 *								Negative numbers are represented using two's-complement notation.
+	 *								If number is not a valid binary number, or if number contains more than
+	 *								10 characters (10 bits), BIN2DEC returns the #NUM! error value.
 	 * @return	string
 	 */
 	public static function BINTODEC($x) {
@@ -1016,13 +1089,29 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * BINTOHEX
 	 *
-	 * Return a binary value as Hex.
+	 * Return a binary value as hex.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		BIN2HEX(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
+	 *								cannot contain more than 10 characters (10 bits). The most significant
+	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+	 *								Negative numbers are represented using two's-complement notation.
+	 *								If number is not a valid binary number, or if number contains more than
+	 *								10 characters (10 bits), BIN2HEX returns the #NUM! error value.
+	 * @param	integer		$places	The number of characters to use. If places is omitted, BIN2HEX uses the
+	 *								minimum number of characters necessary. Places is useful for padding the
+	 *								return value with leading 0s (zeros).
+	 *								If places is not an integer, it is truncated.
+	 *								If places is nonnumeric, BIN2HEX returns the #VALUE! error value.
+	 *								If places is negative, BIN2HEX returns the #NUM! error value.
 	 * @return	string
 	 */
-	public static function BINTOHEX($x, $places=null) {
-		$x	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($x));
+	public static function BINTOHEX($x, $places=NULL) {
+		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
 		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
 
 		if (is_bool($x)) {
@@ -1054,13 +1143,29 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * BINTOOCT
 	 *
-	 * Return a binary value as Octal.
+	 * Return a binary value as octal.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		BIN2OCT(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The binary number (as a string) that you want to convert. The number
+	 *								cannot contain more than 10 characters (10 bits). The most significant
+	 *								bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+	 *								Negative numbers are represented using two's-complement notation.
+	 *								If number is not a valid binary number, or if number contains more than
+	 *								10 characters (10 bits), BIN2OCT returns the #NUM! error value.
+	 * @param	integer		$places	The number of characters to use. If places is omitted, BIN2OCT uses the
+	 *								minimum number of characters necessary. Places is useful for padding the
+	 *								return value with leading 0s (zeros).
+	 *								If places is not an integer, it is truncated.
+	 *								If places is nonnumeric, BIN2OCT returns the #VALUE! error value.
+	 *								If places is negative, BIN2OCT returns the #NUM! error value.
 	 * @return	string
 	 */
-	public static function BINTOOCT($x, $places=null) {
-		$x	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($x));
+	public static function BINTOOCT($x, $places=NULL) {
+		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
 		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
 
 		if (is_bool($x)) {
@@ -1092,12 +1197,32 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * DECTOBIN
 	 *
-	 * Return an octal value as binary.
+	 * Return a decimal value as binary.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		DEC2BIN(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
+	 *								valid place values are ignored and DEC2BIN returns a 10-character
+	 *								(10-bit) binary number in which the most significant bit is the sign
+	 *								bit. The remaining 9 bits are magnitude bits. Negative numbers are
+	 *								represented using two's-complement notation.
+	 *								If number < -512 or if number > 511, DEC2BIN returns the #NUM! error
+	 *								value.
+	 *								If number is nonnumeric, DEC2BIN returns the #VALUE! error value.
+	 *								If DEC2BIN requires more than places characters, it returns the #NUM!
+	 *								error value.
+	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2BIN uses
+	 *								the minimum number of characters necessary. Places is useful for
+	 *								padding the return value with leading 0s (zeros).
+	 *								If places is not an integer, it is truncated.
+	 *								If places is nonnumeric, DEC2BIN returns the #VALUE! error value.
+	 *								If places is zero or negative, DEC2BIN returns the #NUM! error value.
 	 * @return	string
 	 */
-	public static function DECTOBIN($x, $places=null) {
+	public static function DECTOBIN($x, $places=NULL) {
 		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
 		$places	= PHPExcel_Calculation_Functions::flattenSingleValue($places);
 
@@ -1128,9 +1253,29 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * DECTOHEX
 	 *
-	 * Return an octal value as binary.
+	 * Return a decimal value as hex.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		DEC2HEX(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
+	 *								places is ignored and DEC2HEX returns a 10-character (40-bit)
+	 *								hexadecimal number in which the most significant bit is the sign
+	 *								bit. The remaining 39 bits are magnitude bits. Negative numbers
+	 *								are represented using two's-complement notation.
+	 *								If number < -549,755,813,888 or if number > 549,755,813,887,
+	 *								DEC2HEX returns the #NUM! error value.
+	 *								If number is nonnumeric, DEC2HEX returns the #VALUE! error value.
+	 *								If DEC2HEX requires more than places characters, it returns the
+	 *								#NUM! error value.
+	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2HEX uses
+	 *								the minimum number of characters necessary. Places is useful for
+	 *								padding the return value with leading 0s (zeros).
+	 *								If places is not an integer, it is truncated.
+	 *								If places is nonnumeric, DEC2HEX returns the #VALUE! error value.
+	 *								If places is zero or negative, DEC2HEX returns the #NUM! error value.
 	 * @return	string
 	 */
 	public static function DECTOHEX($x, $places=null) {
@@ -1162,9 +1307,29 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * DECTOOCT
 	 *
-	 * Return an octal value as binary.
+	 * Return an decimal value as octal.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		DEC2OCT(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The decimal integer you want to convert. If number is negative,
+	 *								places is ignored and DEC2OCT returns a 10-character (30-bit)
+	 *								octal number in which the most significant bit is the sign bit.
+	 *								The remaining 29 bits are magnitude bits. Negative numbers are
+	 *								represented using two's-complement notation.
+	 *								If number < -536,870,912 or if number > 536,870,911, DEC2OCT
+	 *								returns the #NUM! error value.
+	 *								If number is nonnumeric, DEC2OCT returns the #VALUE! error value.
+	 *								If DEC2OCT requires more than places characters, it returns the
+	 *								#NUM! error value.
+	 * @param	integer		$places	The number of characters to use. If places is omitted, DEC2OCT uses
+	 *								the minimum number of characters necessary. Places is useful for
+	 *								padding the return value with leading 0s (zeros).
+	 *								If places is not an integer, it is truncated.
+	 *								If places is nonnumeric, DEC2OCT returns the #VALUE! error value.
+	 *								If places is zero or negative, DEC2OCT returns the #NUM! error value.
 	 * @return	string
 	 */
 	public static function DECTOOCT($x, $places=null) {
@@ -1198,7 +1363,30 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Return a hex value as binary.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		HEX2BIN(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x			the hexadecimal number you want to convert. Number cannot
+	 *									contain more than 10 characters. The most significant bit of
+	 *									number is the sign bit (40th bit from the right). The remaining
+	 *									9 bits are magnitude bits. Negative numbers are represented
+	 *									using two's-complement notation.
+	 *									If number is negative, HEX2BIN ignores places and returns a
+	 *									10-character binary number.
+	 *									If number is negative, it cannot be less than FFFFFFFE00, and
+	 *									if number is positive, it cannot be greater than 1FF.
+	 *									If number is not a valid hexadecimal number, HEX2BIN returns
+	 *									the #NUM! error value.
+	 *									If HEX2BIN requires more than places characters, it returns
+	 *									the #NUM! error value.
+	 * @param	integer		$places		The number of characters to use. If places is omitted,
+	 *									HEX2BIN uses the minimum number of characters necessary. Places
+	 *									is useful for padding the return value with leading 0s (zeros).
+	 *									If places is not an integer, it is truncated.
+	 *									If places is nonnumeric, HEX2BIN returns the #VALUE! error value.
+	 *									If places is negative, HEX2BIN returns the #NUM! error value.
 	 * @return	string
 	 */
 	public static function HEXTOBIN($x, $places=null) {
@@ -1221,9 +1409,20 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * HEXTODEC
 	 *
-	 * Return a hex value as octal.
+	 * Return a hex value as decimal.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		HEX2DEC(x)
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The hexadecimal number you want to convert. This number cannot
+	 *								contain more than 10 characters (40 bits). The most significant
+	 *								bit of number is the sign bit. The remaining 39 bits are magnitude
+	 *								bits. Negative numbers are represented using two's-complement
+	 *								notation.
+	 *								If number is not a valid hexadecimal number, HEX2DEC returns the
+	 *								#NUM! error value.
 	 * @return	string
 	 */
 	public static function HEXTODEC($x) {
@@ -1245,7 +1444,31 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Return a hex value as octal.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		HEX2OCT(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x			The hexadecimal number you want to convert. Number cannot
+	 *									contain more than 10 characters. The most significant bit of
+	 *									number is the sign bit. The remaining 39 bits are magnitude
+	 *									bits. Negative numbers are represented using two's-complement
+	 *									notation.
+	 *									If number is negative, HEX2OCT ignores places and returns a
+	 *									10-character octal number.
+	 *									If number is negative, it cannot be less than FFE0000000, and
+	 *									if number is positive, it cannot be greater than 1FFFFFFF.
+	 *									If number is not a valid hexadecimal number, HEX2OCT returns
+	 *									the #NUM! error value.
+	 *									If HEX2OCT requires more than places characters, it returns
+	 *									the #NUM! error value.
+	 * @param	integer		$places		The number of characters to use. If places is omitted, HEX2OCT
+	 *									uses the minimum number of characters necessary. Places is
+	 *									useful for padding the return value with leading 0s (zeros).
+	 *									If places is not an integer, it is truncated.
+	 *									If places is nonnumeric, HEX2OCT returns the #VALUE! error
+	 *									value.
+	 *									If places is negative, HEX2OCT returns the #NUM! error value.
 	 * @return	string
 	 */
 	public static function HEXTOOCT($x, $places=null) {
@@ -1270,7 +1493,33 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Return an octal value as binary.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		OCT2BIN(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x			The octal number you want to convert. Number may not
+	 *									contain more than 10 characters. The most significant
+	 *									bit of number is the sign bit. The remaining 29 bits
+	 *									are magnitude bits. Negative numbers are represented
+	 *									using two's-complement notation.
+	 *									If number is negative, OCT2BIN ignores places and returns
+	 *									a 10-character binary number.
+	 *									If number is negative, it cannot be less than 7777777000,
+	 *									and if number is positive, it cannot be greater than 777.
+	 *									If number is not a valid octal number, OCT2BIN returns
+	 *									the #NUM! error value.
+	 *									If OCT2BIN requires more than places characters, it
+	 *									returns the #NUM! error value.
+	 * @param	integer		$places		The number of characters to use. If places is omitted,
+	 *									OCT2BIN uses the minimum number of characters necessary.
+	 *									Places is useful for padding the return value with
+	 *									leading 0s (zeros).
+	 *									If places is not an integer, it is truncated.
+	 *									If places is nonnumeric, OCT2BIN returns the #VALUE!
+	 *									error value.
+	 *									If places is negative, OCT2BIN returns the #NUM! error
+	 *									value.
 	 * @return	string
 	 */
 	public static function OCTTOBIN($x, $places=null) {
@@ -1293,9 +1542,20 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * OCTTODEC
 	 *
-	 * Return an octal value as binary.
+	 * Return an octal value as decimal.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		OCT2DEC(x)
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x		The octal number you want to convert. Number may not contain
+	 *								more than 10 octal characters (30 bits). The most significant
+	 *								bit of number is the sign bit. The remaining 29 bits are
+	 *								magnitude bits. Negative numbers are represented using
+	 *								two's-complement notation.
+	 *								If number is not a valid octal number, OCT2DEC returns the
+	 *								#NUM! error value.
 	 * @return	string
 	 */
 	public static function OCTTODEC($x) {
@@ -1317,7 +1577,28 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Return an octal value as hex.
 	 *
-	 * @param	string		$x
+	 * Excel Function:
+	 *		OCT2HEX(x[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$x			The octal number you want to convert. Number may not contain
+	 *									more than 10 octal characters (30 bits). The most significant
+	 *									bit of number is the sign bit. The remaining 29 bits are
+	 *									magnitude bits. Negative numbers are represented using
+	 *									two's-complement notation.
+	 *									If number is negative, OCT2HEX ignores places and returns a
+	 *									10-character hexadecimal number.
+	 *									If number is not a valid octal number, OCT2HEX returns the
+	 *									#NUM! error value.
+	 *									If OCT2HEX requires more than places characters, it returns
+	 *									the #NUM! error value.
+	 * @param	integer		$places		The number of characters to use. If places is omitted, OCT2HEX
+	 *									uses the minimum number of characters necessary. Places is useful
+	 *									for padding the return value with leading 0s (zeros).
+	 *									If places is not an integer, it is truncated.
+	 *									If places is nonnumeric, OCT2HEX returns the #VALUE! error value.
+	 *									If places is negative, OCT2HEX returns the #NUM! error value.
 	 * @return	string
 	 */
 	public static function OCTTOHEX($x, $places=null) {
@@ -1340,20 +1621,29 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * COMPLEX
 	 *
-	 * returns a complex number of the form x + yi or x + yj.
+	 * Converts real and imaginary coefficients into a complex number of the form x + yi or x + yj.
 	 *
-	 * @param	float		$realNumber
-	 * @param	float		$imaginary
-	 * @param	string		$suffix
+	 * Excel Function:
+	 *		COMPLEX(realNumber,imaginary[,places])
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	float		$realNumber		The real coefficient of the complex number.
+	 * @param	float		$imaginary		The imaginary coefficient of the complex number.
+	 * @param	string		$suffix			The suffix for the imaginary component of the complex number.
+	 *										If omitted, the suffix is assumed to be "i".
 	 * @return	string
 	 */
 	public static function COMPLEX($realNumber=0.0, $imaginary=0.0, $suffix='i') {
-		$realNumber	= (is_null($realNumber))	? 0.0 :	(float) PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
-		$imaginary	= (is_null($imaginary))		? 0.0 :	(float) PHPExcel_Calculation_Functions::flattenSingleValue($imaginary);
+		$realNumber	= (is_null($realNumber))	? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($realNumber);
+		$imaginary	= (is_null($imaginary))		? 0.0 :	PHPExcel_Calculation_Functions::flattenSingleValue($imaginary);
 		$suffix		= (is_null($suffix))		? 'i' :	PHPExcel_Calculation_Functions::flattenSingleValue($suffix);
 
 		if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
 			(($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))) {
+			$realNumber	= (float) $realNumber;
+			$imaginary	= (float) $imaginary;
+
 			if ($suffix == '') $suffix = 'i';
 			if ($realNumber == 0.0) {
 				if ($imaginary == 0.0) {
@@ -1384,16 +1674,19 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the imaginary coefficient of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
-	 * @return	real
+	 * Excel Function:
+	 *		IMAGINARY(complexNumber)
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$complexNumber	The complex number for which you want the imaginary
+	 * 										coefficient.
+	 * @return	float
 	 */
 	public static function IMAGINARY($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 		return $parsedComplex['imaginary'];
 	}	//	function IMAGINARY()
 
@@ -1403,16 +1696,18 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the real coefficient of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
-	 * @return	real
+	 * Excel Function:
+	 *		IMREAL(complexNumber)
+	 *
+	 * @access	public
+	 * @category Engineering Functions
+	 * @param	string		$complexNumber	The complex number for which you want the real coefficient.
+	 * @return	float
 	 */
 	public static function IMREAL($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 		return $parsedComplex['real'];
 	}	//	function IMREAL()
 
@@ -1422,16 +1717,17 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
-	 * @return	real
+	 * Excel Function:
+	 *		IMABS(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the absolute value.
+	 * @return	float
 	 */
 	public static function IMABS($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
+
 		return sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary']));
 	}	//	function IMABS()
 
@@ -1439,18 +1735,19 @@ class PHPExcel_Calculation_Engineering {
 	/**
 	 * IMARGUMENT
 	 *
-	 * Returns the argument theta of a complex number, i.e. the angle in radians from the real axis to the representation of the number in polar coordinates.
+	 * Returns the argument theta of a complex number, i.e. the angle in radians from the real
+	 * axis to the representation of the number in polar coordinates.
 	 *
-	 * @param	string		$complexNumber
-	 * @return	string
+	 * Excel Function:
+	 *		IMARGUMENT(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the argument theta.
+	 * @return	float
 	 */
 	public static function IMARGUMENT($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		if ($parsedComplex['real'] == 0.0) {
 			if ($parsedComplex['imaginary'] == 0.0) {
@@ -1475,7 +1772,10 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the complex conjugate of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
+	 * Excel Function:
+	 *		IMCONJUGATE(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the conjugate.
 	 * @return	string
 	 */
 	public static function IMCONJUGATE($complexNumber) {
@@ -1483,14 +1783,14 @@ class PHPExcel_Calculation_Engineering {
 
 		$parsedComplex = self::_parseComplex($complexNumber);
 
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
-
 		if ($parsedComplex['imaginary'] == 0.0) {
 			return $parsedComplex['real'];
 		} else {
-			return self::_cleanComplex(self::COMPLEX($parsedComplex['real'], 0 - $parsedComplex['imaginary'], $parsedComplex['suffix']));
+			return self::_cleanComplex( self::COMPLEX( $parsedComplex['real'],
+													   0 - $parsedComplex['imaginary'],
+													   $parsedComplex['suffix']
+													 )
+									  );
 		}
 	}	//	function IMCONJUGATE()
 
@@ -1500,16 +1800,16 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the cosine of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
-	 * @return	string
+	 * Excel Function:
+	 *		IMCOS(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the cosine.
+	 * @return	string|float
 	 */
 	public static function IMCOS($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		if ($parsedComplex['imaginary'] == 0.0) {
 			return cos($parsedComplex['real']);
@@ -1524,16 +1824,16 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the sine of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
-	 * @return	string
+	 * Excel Function:
+	 *		IMSIN(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the sine.
+	 * @return	string|float
 	 */
 	public static function IMSIN($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		if ($parsedComplex['imaginary'] == 0.0) {
 			return sin($parsedComplex['real']);
@@ -1548,16 +1848,16 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the square root of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
+	 * Excel Function:
+	 *		IMSQRT(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the square root.
 	 * @return	string
 	 */
 	public static function IMSQRT($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		$theta = self::IMARGUMENT($complexNumber);
 		$d1 = cos($theta / 2);
@@ -1577,16 +1877,16 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the natural logarithm of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
+	 * Excel Function:
+	 *		IMLN(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the natural logarithm.
 	 * @return	string
 	 */
 	public static function IMLN($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
 			return PHPExcel_Calculation_Functions::NaN();
@@ -1608,16 +1908,16 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
+	 * Excel Function:
+	 *		IMLOG10(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the common logarithm.
 	 * @return	string
 	 */
 	public static function IMLOG10($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
 			return PHPExcel_Calculation_Functions::NaN();
@@ -1634,16 +1934,16 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the common logarithm (base 10) of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
+	 * Excel Function:
+	 *		IMLOG2(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the base-2 logarithm.
 	 * @return	string
 	 */
 	public static function IMLOG2($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
 			return PHPExcel_Calculation_Functions::NaN();
@@ -1660,16 +1960,16 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the exponential of a complex number in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber
+	 * Excel Function:
+	 *		IMEXP(complexNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number for which you want the exponential.
 	 * @return	string
 	 */
 	public static function IMEXP($complexNumber) {
 		$complexNumber	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber);
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		if (($parsedComplex['real'] == 0.0) && ($parsedComplex['imaginary'] == 0.0)) {
 			return '1';
@@ -1692,7 +1992,11 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns a complex number in x + yi or x + yj text format raised to a power.
 	 *
-	 * @param	string		$complexNumber
+	 * Excel Function:
+	 *		IMPOWER(complexNumber,realNumber)
+	 *
+	 * @param	string		$complexNumber	The complex number you want to raise to a power.
+	 * @param	float		$realNumber		The power to which you want to raise the complex number.
 	 * @return	string
 	 */
 	public static function IMPOWER($complexNumber,$realNumber) {
@@ -1704,9 +2008,6 @@ class PHPExcel_Calculation_Engineering {
 		}
 
 		$parsedComplex = self::_parseComplex($complexNumber);
-		if (!is_array($parsedComplex)) {
-			return $parsedComplex;
-		}
 
 		$r = sqrt(($parsedComplex['real'] * $parsedComplex['real']) + ($parsedComplex['imaginary'] * $parsedComplex['imaginary']));
 		$rPower = pow($r,$realNumber);
@@ -1726,23 +2027,19 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the quotient of two complex numbers in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexDividend
-	 * @param	string		$complexDivisor
-	 * @return	real
+	 * Excel Function:
+	 *		IMDIV(complexDividend,complexDivisor)
+	 *
+	 * @param	string		$complexDividend	The complex numerator or dividend.
+	 * @param	string		$complexDivisor		The complex denominator or divisor.
+	 * @return	string
 	 */
 	public static function IMDIV($complexDividend,$complexDivisor) {
 		$complexDividend	= PHPExcel_Calculation_Functions::flattenSingleValue($complexDividend);
 		$complexDivisor	= PHPExcel_Calculation_Functions::flattenSingleValue($complexDivisor);
 
 		$parsedComplexDividend = self::_parseComplex($complexDividend);
-		if (!is_array($parsedComplexDividend)) {
-			return $parsedComplexDividend;
-		}
-
 		$parsedComplexDivisor = self::_parseComplex($complexDivisor);
-		if (!is_array($parsedComplexDivisor)) {
-			return $parsedComplexDividend;
-		}
 
 		if (($parsedComplexDividend['suffix'] != '') && ($parsedComplexDivisor['suffix'] != '') &&
 			($parsedComplexDividend['suffix'] != $parsedComplexDivisor['suffix'])) {
@@ -1774,23 +2071,19 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the difference of two complex numbers in x + yi or x + yj text format.
 	 *
-	 * @param	string		$complexNumber1
-	 * @param	string		$complexNumber2
-	 * @return	real
+	 * Excel Function:
+	 *		IMSUB(complexNumber1,complexNumber2)
+	 *
+	 * @param	string		$complexNumber1		The complex number from which to subtract complexNumber2.
+	 * @param	string		$complexNumber2		The complex number to subtract from complexNumber1.
+	 * @return	string
 	 */
 	public static function IMSUB($complexNumber1,$complexNumber2) {
 		$complexNumber1	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber1);
 		$complexNumber2	= PHPExcel_Calculation_Functions::flattenSingleValue($complexNumber2);
 
 		$parsedComplex1 = self::_parseComplex($complexNumber1);
-		if (!is_array($parsedComplex1)) {
-			return $parsedComplex1;
-		}
-
 		$parsedComplex2 = self::_parseComplex($complexNumber2);
-		if (!is_array($parsedComplex2)) {
-			return $parsedComplex2;
-		}
 
 		if ((($parsedComplex1['suffix'] != '') && ($parsedComplex2['suffix'] != '')) &&
 			($parsedComplex1['suffix'] != $parsedComplex2['suffix'])) {
@@ -1811,8 +2104,11 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the sum of two or more complex numbers in x + yi or x + yj text format.
 	 *
-	 * @param	array of mixed		Data Series
-	 * @return	real
+	 * Excel Function:
+	 *		IMSUM(complexNumber[,complexNumber[,...]])
+	 *
+	 * @param	string		$complexNumber,...	Series of complex numbers to add
+	 * @return	string
 	 */
 	public static function IMSUM() {
 		// Return value
@@ -1823,9 +2119,6 @@ class PHPExcel_Calculation_Engineering {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
 		foreach ($aArgs as $arg) {
 			$parsedComplex = self::_parseComplex($arg);
-			if (!is_array($parsedComplex)) {
-				return $parsedComplex;
-			}
 
 			if ($activeSuffix == '') {
 				$activeSuffix = $parsedComplex['suffix'];
@@ -1847,8 +2140,11 @@ class PHPExcel_Calculation_Engineering {
 	 *
 	 * Returns the product of two or more complex numbers in x + yi or x + yj text format.
 	 *
-	 * @param	array of mixed		Data Series
-	 * @return	real
+	 * Excel Function:
+	 *		IMPRODUCT(complexNumber[,complexNumber[,...]])
+	 *
+	 * @param	string		$complexNumber,...	Series of complex numbers to multiply
+	 * @return	string
 	 */
 	public static function IMPRODUCT() {
 		// Return value
@@ -1859,9 +2155,7 @@ class PHPExcel_Calculation_Engineering {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
 		foreach ($aArgs as $arg) {
 			$parsedComplex = self::_parseComplex($arg);
-			if (!is_array($parsedComplex)) {
-				return $parsedComplex;
-			}
+
 			$workValue = $returnValue;
 			if (($parsedComplex['suffix'] != '') && ($activeSuffix == '')) {
 				$activeSuffix = $parsedComplex['suffix'];
@@ -1878,13 +2172,19 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * DELTA
+	 *	DELTA
 	 *
-	 * Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
+	 *	Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise.
+	 *	Use this function to filter a set of values. For example, by summing several DELTA
+	 *	functions you calculate the count of equal pairs. This function is also known as the
+	 *	Kronecker Delta function.
 	 *
-	 * @param	float		$a
-	 * @param	float		$b
-	 * @return	int
+	 *	Excel Function:
+	 *		DELTA(a[,b])
+	 *
+	 *	@param	float		$a	The first number.
+	 *	@param	float		$b	The second number. If omitted, b is assumed to be zero.
+	 *	@return	int
 	 */
 	public static function DELTA($a, $b=0) {
 		$a	= PHPExcel_Calculation_Functions::flattenSingleValue($a);
@@ -1895,13 +2195,19 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * GESTEP
+	 *	GESTEP
 	 *
-	 * Returns 1 if number = step; returns 0 (zero) otherwise
+	 *	Excel Function:
+	 *		GESTEP(number[,step])
 	 *
-	 * @param	float		$number
-	 * @param	float		$step
-	 * @return	int
+	 *	Returns 1 if number >= step; returns 0 (zero) otherwise
+	 *	Use this function to filter a set of values. For example, by summing several GESTEP
+	 *	functions you calculate the count of values that exceed a threshold.
+	 *
+	 *	@param	float		$number		The value to test against step.
+	 *	@param	float		$step		The threshold value.
+	 *									If you omit a value for step, GESTEP uses zero.
+	 *	@return	int
 	 */
 	public static function GESTEP($number, $step=0) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
@@ -1939,30 +2245,32 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * ERF
+	 *	ERF
 	 *
-	 * Returns the error function integrated between lower_limit and upper_limit
+	 *	Returns the error function integrated between the lower and upper bound arguments.
 	 *
-	 * @param	float		$lower	lower bound for integrating ERF
-	 * @param	float		$upper	upper bound for integrating ERF.
+	 *	Note: In Excel 2007 or earlier, if you input a negative value for the upper or lower bound arguments,
+	 *			the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
+	 *			improved, so that it can now calculate the function for both positive and negative ranges.
+	 *			PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
+	 *
+	 *	Excel Function:
+	 *		ERF(lower[,upper])
+	 *
+	 *	@param	float		$lower	lower bound for integrating ERF
+	 *	@param	float		$upper	upper bound for integrating ERF.
 	 *								If omitted, ERF integrates between zero and lower_limit
-	 * @return	int
+	 *	@return	float
 	 */
-	public static function ERF($lower, $upper = null) {
+	public static function ERF($lower, $upper = NULL) {
 		$lower	= PHPExcel_Calculation_Functions::flattenSingleValue($lower);
 		$upper	= PHPExcel_Calculation_Functions::flattenSingleValue($upper);
 
 		if (is_numeric($lower)) {
-			if ($lower < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
 			if (is_null($upper)) {
 				return self::_erfVal($lower);
 			}
 			if (is_numeric($upper)) {
-				if ($upper < 0) {
-					return PHPExcel_Calculation_Functions::NaN();
-				}
 				return self::_erfVal($upper) - self::_erfVal($lower);
 			}
 		}
@@ -2003,20 +2311,25 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * ERFC
+	 *	ERFC
 	 *
-	 * Returns the complementary ERF function integrated between x and infinity
+	 *	Returns the complementary ERF function integrated between x and infinity
 	 *
-	 * @param	float		$x		The lower bound for integrating ERF
-	 * @return	int
+	 *	Note: In Excel 2007 or earlier, if you input a negative value for the lower bound argument,
+	 *		the function would return a #NUM! error. However, in Excel 2010, the function algorithm was
+	 *		improved, so that it can now calculate the function for both positive and negative x values.
+	 *			PHPExcel follows Excel 2010 behaviour, and accepts nagative arguments.
+	 *
+	 *	Excel Function:
+	 *		ERFC(x)
+	 *
+	 *	@param	float	$x	The lower bound for integrating ERFC
+	 *	@return	float
 	 */
 	public static function ERFC($x) {
-		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
+		$x = PHPExcel_Calculation_Functions::flattenSingleValue($x);
 
 		if (is_numeric($x)) {
-			if ($x < 0) {
-				return PHPExcel_Calculation_Functions::NaN();
-			}
 			return self::_erfcVal($x);
 		}
 		return PHPExcel_Calculation_Functions::VALUE();
@@ -2024,9 +2337,10 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * getConversionGroups
+	 *	getConversionGroups
+	 *	Returns a list of the different conversion groups for UOM conversions
 	 *
-	 * @return	array
+	 *	@return	array
 	 */
 	public static function getConversionGroups() {
 		$conversionGroups = array();
@@ -2038,9 +2352,12 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * getConversionGroupUnits
+	 *	getConversionGroupUnits
+	 *	Returns an array of units of measure, for a specified conversion group, or for all groups
 	 *
-	 * @return	array
+	 *	@param	string	$group	The group whose units of measure you want to retrieve
+	 *
+	 *	@return	array
 	 */
 	public static function getConversionGroupUnits($group = NULL) {
 		$conversionGroups = array();
@@ -2054,9 +2371,9 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * getConversionGroupUnitDetails
+	 *	getConversionGroupUnitDetails
 	 *
-	 * @return	array
+	 *	@return	array
 	 */
 	public static function getConversionGroupUnitDetails($group = NULL) {
 		$conversionGroups = array();
@@ -2072,9 +2389,10 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * getConversionGroups
+	 *	getConversionMultipliers
+	 *	Returns an array of the Multiplier prefixes that can be used with Units of Measure in CONVERTUOM()
 	 *
-	 * @return	array
+	 *	@return	array of mixed
 	 */
 	public static function getConversionMultipliers() {
 		return self::$_conversionMultipliers;
@@ -2082,12 +2400,20 @@ class PHPExcel_Calculation_Engineering {
 
 
 	/**
-	 * CONVERTUOM
+	 *	CONVERTUOM
 	 *
-	 * @param	float		$value
-	 * @param	string		$fromUOM
-	 * @param	string		$toUOM
-	 * @return	float
+	 *	Converts a number from one measurement system to another.
+	 *	For example, CONVERT can translate a table of distances in miles to a table of distances
+	 *	in kilometers.
+	 *
+	 *	Excel Function:
+	 *		CONVERT(value,fromUOM,toUOM)
+	 *
+	 *	@param	float		$value		The value in fromUOM to convert.
+	 *	@param	string		$fromUOM	The units for value.
+	 *	@param	string		$toUOM		The units for the result.
+	 *
+	 *	@return	float
 	 */
 	public static function CONVERTUOM($value, $fromUOM, $toUOM) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -2097,7 +2423,7 @@ class PHPExcel_Calculation_Engineering {
 		if (!is_numeric($value)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
-		$fromMultiplier = 1;
+		$fromMultiplier = 1.0;
 		if (isset(self::$_conversionUnits[$fromUOM])) {
 			$unitGroup1 = self::$_conversionUnits[$fromUOM]['Group'];
 		} else {
@@ -2116,7 +2442,7 @@ class PHPExcel_Calculation_Engineering {
 		}
 		$value *= $fromMultiplier;
 
-		$toMultiplier = 1;
+		$toMultiplier = 1.0;
 		if (isset(self::$_conversionUnits[$toUOM])) {
 			$unitGroup2 = self::$_conversionUnits[$toUOM]['Group'];
 		} else {
@@ -2137,12 +2463,14 @@ class PHPExcel_Calculation_Engineering {
 			return PHPExcel_Calculation_Functions::NA();
 		}
 
-		if ($fromUOM == $toUOM) {
-			return 1.0;
+		if (($fromUOM == $toUOM) && ($fromMultiplier == $toMultiplier)) {
+			//	We've already factored $fromMultiplier into the value, so we need
+			//		to reverse it again
+			return $value / $fromMultiplier;
 		} elseif ($unitGroup1 == 'Temperature') {
 			if (($fromUOM == 'F') || ($fromUOM == 'fah')) {
 				if (($toUOM == 'F') || ($toUOM == 'fah')) {
-					return 1.0;
+					return $value;
 				} else {
 					$value = (($value - 32) / 1.8);
 					if (($toUOM == 'K') || ($toUOM == 'kel')) {
@@ -2152,10 +2480,10 @@ class PHPExcel_Calculation_Engineering {
 				}
 			} elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) &&
 					  (($toUOM == 'K') || ($toUOM == 'kel'))) {
-						return 1.0;
+						return $value;
 			} elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) &&
 					  (($toUOM == 'C') || ($toUOM == 'cel'))) {
-					return 1.0;
+					return $value;
 			}
 			if (($toUOM == 'F') || ($toUOM == 'fah')) {
 				if (($fromUOM == 'K') || ($fromUOM == 'kel')) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Exception.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Exception.php
index 6c09d5a1653..31aa287a2a4 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Exception.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Exception.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Exception extends Exception {
 	/**
@@ -48,5 +48,5 @@ class PHPExcel_Calculation_Exception extends Exception {
 		$e->line = $line;
 		$e->file = $file;
 		throw $e;
-	}	
+	}
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/ExceptionHandler.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
index cc0caa8a29b..8b89a8fd6f7 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_ExceptionHandler {
 	/**
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Financial.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Financial.php
index bd82ae2595e..8534258e863 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Financial.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Financial.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -48,24 +48,40 @@ define('FINANCIAL_PRECISION', 1.0e-08);
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Financial {
 
-	private static function _lastDayOfMonth($testDate) {
-		$date = clone $testDate;
-		$date->modify('+1 day');
-		return ($date->format('d') == 1);
+	/**
+	 * _lastDayOfMonth
+	 *
+	 * Returns a boolean TRUE/FALSE indicating if this date is the last date of the month
+	 *
+	 * @param	DateTime	$testDate	The date for testing
+	 * @return	boolean
+	 */
+	private static function _lastDayOfMonth($testDate)
+	{
+		return ($testDate->format('d') == $testDate->format('t'));
 	}	//	function _lastDayOfMonth()
 
 
-	private static function _firstDayOfMonth($testDate) {
-		$date = clone $testDate;
-		return ($date->format('d') == 1);
-	}	//	function _lastDayOfMonth()
+	/**
+	 * _firstDayOfMonth
+	 *
+	 * Returns a boolean TRUE/FALSE indicating if this date is the first date of the month
+	 *
+	 * @param	DateTime	$testDate	The date for testing
+	 * @return	boolean
+	 */
+	private static function _firstDayOfMonth($testDate)
+	{
+		return ($testDate->format('d') == 1);
+	}	//	function _firstDayOfMonth()
 
 
-	private static function _coupFirstPeriodDate($settlement, $maturity, $frequency, $next) {
+	private static function _coupFirstPeriodDate($settlement, $maturity, $frequency, $next)
+	{
 		$months = 12 / $frequency;
 
 		$result = PHPExcel_Shared_Date::ExcelToPHPObject($maturity);
@@ -86,7 +102,8 @@ class PHPExcel_Calculation_Financial {
 	}	//	function _coupFirstPeriodDate()
 
 
-	private static function _validFrequency($frequency) {
+	private static function _validFrequency($frequency)
+	{
 		if (($frequency == 1) || ($frequency == 2) || ($frequency == 4)) {
 			return true;
 		}
@@ -98,7 +115,22 @@ class PHPExcel_Calculation_Financial {
 	}	//	function _validFrequency()
 
 
-	private static function _daysPerYear($year,$basis) {
+	/**
+	 * _daysPerYear
+	 *
+	 * Returns the number of days in a specified year, as defined by the "basis" value
+	 *
+	 * @param	integer		$year	The year against which we're testing
+	 * @param   integer		$basis	The type of day count:
+	 *									0 or omitted US (NASD)	360
+	 *									1						Actual (365 or 366 in a leap year)
+	 *									2						360
+	 *									3						365
+	 *									4						European 360
+	 * @return	integer
+	 */
+	private static function _daysPerYear($year, $basis=0)
+	{
 		switch ($basis) {
 			case 0 :
 			case 2 :
@@ -109,11 +141,7 @@ class PHPExcel_Calculation_Financial {
 				$daysPerYear = 365;
 				break;
 			case 1 :
-				if (PHPExcel_Calculation_DateTime::_isLeapYear($year)) {
-					$daysPerYear = 366;
-				} else {
-					$daysPerYear = 365;
-				}
+				$daysPerYear = (PHPExcel_Calculation_DateTime::_isLeapYear($year)) ? 366 : 365;
 				break;
 			default	:
 				return PHPExcel_Calculation_Functions::NaN();
@@ -122,7 +150,8 @@ class PHPExcel_Calculation_Financial {
 	}	//	function _daysPerYear()
 
 
-	private static function _interestAndPrincipal($rate=0, $per=0, $nper=0, $pv=0, $fv=0, $type=0) {
+	private static function _interestAndPrincipal($rate=0, $per=0, $nper=0, $pv=0, $fv=0, $type=0)
+	{
 		$pmt = self::PMT($rate, $nper, $pv, $fv, $type);
 		$capital = $pv;
 		for ($i = 1; $i<= $per; ++$i) {
@@ -135,34 +164,54 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	ACCRINT
+	 * ACCRINT
 	 *
-	 *	Returns the discount rate for a security.
+	 * Returns the accrued interest for a security that pays periodic interest.
 	 *
-	 *	@param	mixed	issue		The security's issue date.
-	 *	@param	mixed	firstinter	The security's first interest date.
-	 *	@param	mixed	settlement	The security's settlement date.
-	 *	@param	float	rate		The security's annual coupon rate.
-	 *	@param	float	par			The security's par value.
-	 *	@param	int		basis		The type of day count to use.
+	 * Excel Function:
+	 *		ACCRINT(issue,firstinterest,settlement,rate,par,frequency[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	$issue			The security's issue date.
+	 * @param	mixed	$firstinterest	The security's first interest date.
+	 * @param	mixed	$settlement		The security's settlement date.
+	 *									The security settlement date is the date after the issue date
+	 *									when the security is traded to the buyer.
+	 * @param	float	$rate			The security's annual coupon rate.
+	 * @param	float	$par			The security's par value.
+	 *									If you omit par, ACCRINT uses $1,000.
+	 * @param	integer	$frequency		the number of coupon payments per year.
+	 *									Valid frequency values are:
+	 *										1	Annual
+	 *										2	Semi-Annual
+	 *										4	Quarterly
+	 *									If working in Gnumeric Mode, the following frequency options are
+	 *									also available
+	 *										6	Bimonthly
+	 *										12	Monthly
+	 * @param	integer	$basis			The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
-	public static function ACCRINT($issue, $firstinter, $settlement, $rate, $par=1000, $frequency=1, $basis=0) {
+	public static function ACCRINT($issue, $firstinterest, $settlement, $rate, $par=1000, $frequency=1, $basis=0)
+	{
 		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
-		$firstinter	= PHPExcel_Calculation_Functions::flattenSingleValue($firstinter);
+		$firstinterest	= PHPExcel_Calculation_Functions::flattenSingleValue($firstinterest);
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$rate		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$par		= (is_null($par))		? 1000 :	(float) PHPExcel_Calculation_Functions::flattenSingleValue($par);
-		$frequency	= (is_null($frequency))	? 1	: 		(int) PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
-		$basis		= (is_null($basis))		? 0	:		(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+		$par		= (is_null($par))		? 1000 :	PHPExcel_Calculation_Functions::flattenSingleValue($par);
+		$frequency	= (is_null($frequency))	? 1	: 		PHPExcel_Calculation_Functions::flattenSingleValue($frequency);
+		$basis		= (is_null($basis))		? 0	:		PHPExcel_Calculation_Functions::flattenSingleValue($basis);
 
 		//	Validate
 		if ((is_numeric($rate)) && (is_numeric($par))) {
+			$rate	= (float) $rate;
+			$par	= (float) $par;
 			if (($rate <= 0) || ($par <= 0)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
@@ -179,31 +228,39 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	ACCRINTM
+	 * ACCRINTM
 	 *
-	 *	Returns the discount rate for a security.
+	 * Returns the accrued interest for a security that pays interest at maturity.
 	 *
-	 *	@param	mixed	issue		The security's issue date.
-	 *	@param	mixed	settlement	The security's settlement date.
-	 *	@param	float	rate		The security's annual coupon rate.
-	 *	@param	float	par			The security's par value.
-	 *	@param	int		basis		The type of day count to use.
+	 * Excel Function:
+	 *		ACCRINTM(issue,settlement,rate[,par[,basis]])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	issue		The security's issue date.
+	 * @param	mixed	settlement	The security's settlement (or maturity) date.
+	 * @param	float	rate		The security's annual coupon rate.
+	 * @param	float	par			The security's par value.
+	 *									If you omit par, ACCRINT uses $1,000.
+	 * @param	integer	basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function ACCRINTM($issue, $settlement, $rate, $par=1000, $basis=0) {
 		$issue		= PHPExcel_Calculation_Functions::flattenSingleValue($issue);
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
-		$rate		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($rate);
-		$par		= (is_null($par))	? 1000 :	(float) PHPExcel_Calculation_Functions::flattenSingleValue($par);
-		$basis		= (is_null($basis))	? 0 :		(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+		$rate		= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
+		$par		= (is_null($par))	? 1000 :	PHPExcel_Calculation_Functions::flattenSingleValue($par);
+		$basis		= (is_null($basis))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($basis);
 
 		//	Validate
 		if ((is_numeric($rate)) && (is_numeric($par))) {
+			$rate	= (float) $rate;
+			$par	= (float) $par;
 			if (($rate <= 0) || ($par <= 0)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
@@ -218,6 +275,37 @@ class PHPExcel_Calculation_Financial {
 	}	//	function ACCRINTM()
 
 
+	/**
+	 * AMORDEGRC
+	 *
+	 * Returns the depreciation for each accounting period.
+	 * This function is provided for the French accounting system. If an asset is purchased in
+	 * the middle of the accounting period, the prorated depreciation is taken into account.
+	 * The function is similar to AMORLINC, except that a depreciation coefficient is applied in
+	 * the calculation depending on the life of the assets.
+	 * This function will return the depreciation until the last period of the life of the assets
+	 * or until the cumulated value of depreciation is greater than the cost of the assets minus
+	 * the salvage value.
+	 *
+	 * Excel Function:
+	 *		AMORDEGRC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	cost		The cost of the asset.
+	 * @param	mixed	purchased	Date of the purchase of the asset.
+	 * @param	mixed	firstPeriod	Date of the end of the first period.
+	 * @param	mixed	salvage		The salvage value at the end of the life of the asset.
+	 * @param	float	period		The period.
+	 * @param	float	rate		Rate of depreciation.
+	 * @param	integer	basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	float
+	 */
 	public static function AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis=0) {
 		$cost			= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
 		$purchased		= PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
@@ -227,8 +315,13 @@ class PHPExcel_Calculation_Financial {
 		$rate			= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
 		$basis			= (is_null($basis))	? 0 :	(int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
 
+		//	The depreciation coefficients are:
+		//	Life of assets (1/rate)		Depreciation coefficient
+		//	Less than 3 years			1
+		//	Between 3 and 4 years		1.5
+		//	Between 5 and 6 years		2
+		//	More than 6 years			2.5
 		$fUsePer = 1.0 / $rate;
-
 		if ($fUsePer < 3.0) {
 			$amortiseCoeff = 1.0;
 		} elseif ($fUsePer < 5.0) {
@@ -251,7 +344,7 @@ class PHPExcel_Calculation_Financial {
 			if ($fRest < 0.0) {
 				switch ($period - $n) {
 					case 0	:
-					case 1	: return round($cost * 0.5,0);
+					case 1	: return round($cost * 0.5, 0);
 							  break;
 					default	: return 0.0;
 							  break;
@@ -263,6 +356,32 @@ class PHPExcel_Calculation_Financial {
 	}	//	function AMORDEGRC()
 
 
+	/**
+	 * AMORLINC
+	 *
+	 * Returns the depreciation for each accounting period.
+	 * This function is provided for the French accounting system. If an asset is purchased in
+	 * the middle of the accounting period, the prorated depreciation is taken into account.
+	 *
+	 * Excel Function:
+	 *		AMORLINC(cost,purchased,firstPeriod,salvage,period,rate[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	cost		The cost of the asset.
+	 * @param	mixed	purchased	Date of the purchase of the asset.
+	 * @param	mixed	firstPeriod	Date of the end of the first period.
+	 * @param	mixed	salvage		The salvage value at the end of the life of the asset.
+	 * @param	float	period		The period.
+	 * @param	float	rate		Rate of depreciation.
+	 * @param	integer	basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	float
+	 */
 	public static function AMORLINC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis=0) {
 		$cost			= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
 		$purchased		= PHPExcel_Calculation_Functions::flattenSingleValue($purchased);
@@ -297,6 +416,38 @@ class PHPExcel_Calculation_Financial {
 	}	//	function AMORLINC()
 
 
+	/**
+	 * COUPDAYBS
+	 *
+	 * Returns the number of days from the beginning of the coupon period to the settlement date.
+	 *
+	 * Excel Function:
+	 *		COUPDAYBS(settlement,maturity,frequency[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	settlement	The security's settlement date.
+	 *								The security settlement date is the date after the issue
+	 *								date when the security is traded to the buyer.
+	 * @param	mixed	maturity	The security's maturity date.
+	 *								The maturity date is the date when the security expires.
+	 * @param	mixed	frequency	the number of coupon payments per year.
+	 *									Valid frequency values are:
+	 *										1	Annual
+	 *										2	Semi-Annual
+	 *										4	Quarterly
+	 *									If working in Gnumeric Mode, the following frequency options are
+	 *									also available
+	 *										6	Bimonthly
+	 *										12	Monthly
+	 * @param	integer		basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	float
+	 */
 	public static function COUPDAYBS($settlement, $maturity, $frequency, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
@@ -323,6 +474,38 @@ class PHPExcel_Calculation_Financial {
 	}	//	function COUPDAYBS()
 
 
+	/**
+	 * COUPDAYS
+	 *
+	 * Returns the number of days in the coupon period that contains the settlement date.
+	 *
+	 * Excel Function:
+	 *		COUPDAYS(settlement,maturity,frequency[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	settlement	The security's settlement date.
+	 *								The security settlement date is the date after the issue
+	 *								date when the security is traded to the buyer.
+	 * @param	mixed	maturity	The security's maturity date.
+	 *								The maturity date is the date when the security expires.
+	 * @param	mixed	frequency	the number of coupon payments per year.
+	 *									Valid frequency values are:
+	 *										1	Annual
+	 *										2	Semi-Annual
+	 *										4	Quarterly
+	 *									If working in Gnumeric Mode, the following frequency options are
+	 *									also available
+	 *										6	Bimonthly
+	 *										12	Monthly
+	 * @param	integer		basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	float
+	 */
 	public static function COUPDAYS($settlement, $maturity, $frequency, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
@@ -361,6 +544,38 @@ class PHPExcel_Calculation_Financial {
 	}	//	function COUPDAYS()
 
 
+	/**
+	 * COUPDAYSNC
+	 *
+	 * Returns the number of days from the settlement date to the next coupon date.
+	 *
+	 * Excel Function:
+	 *		COUPDAYSNC(settlement,maturity,frequency[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	settlement	The security's settlement date.
+	 *								The security settlement date is the date after the issue
+	 *								date when the security is traded to the buyer.
+	 * @param	mixed	maturity	The security's maturity date.
+	 *								The maturity date is the date when the security expires.
+	 * @param	mixed	frequency	the number of coupon payments per year.
+	 *									Valid frequency values are:
+	 *										1	Annual
+	 *										2	Semi-Annual
+	 *										4	Quarterly
+	 *									If working in Gnumeric Mode, the following frequency options are
+	 *									also available
+	 *										6	Bimonthly
+	 *										12	Monthly
+	 * @param	integer		basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	float
+	 */
 	public static function COUPDAYSNC($settlement, $maturity, $frequency, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
@@ -387,6 +602,39 @@ class PHPExcel_Calculation_Financial {
 	}	//	function COUPDAYSNC()
 
 
+	/**
+	 * COUPNCD
+	 *
+	 * Returns the next coupon date after the settlement date.
+	 *
+	 * Excel Function:
+	 *		COUPNCD(settlement,maturity,frequency[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	settlement	The security's settlement date.
+	 *								The security settlement date is the date after the issue
+	 *								date when the security is traded to the buyer.
+	 * @param	mixed	maturity	The security's maturity date.
+	 *								The maturity date is the date when the security expires.
+	 * @param	mixed	frequency	the number of coupon payments per year.
+	 *									Valid frequency values are:
+	 *										1	Annual
+	 *										2	Semi-Annual
+	 *										4	Quarterly
+	 *									If working in Gnumeric Mode, the following frequency options are
+	 *									also available
+	 *										6	Bimonthly
+	 *										12	Monthly
+	 * @param	integer		basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+	 *						depending on the value of the ReturnDateType flag
+	 */
 	public static function COUPNCD($settlement, $maturity, $frequency, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
@@ -410,6 +658,39 @@ class PHPExcel_Calculation_Financial {
 	}	//	function COUPNCD()
 
 
+	/**
+	 * COUPNUM
+	 *
+	 * Returns the number of coupons payable between the settlement date and maturity date,
+	 * rounded up to the nearest whole coupon.
+	 *
+	 * Excel Function:
+	 *		COUPNUM(settlement,maturity,frequency[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	settlement	The security's settlement date.
+	 *								The security settlement date is the date after the issue
+	 *								date when the security is traded to the buyer.
+	 * @param	mixed	maturity	The security's maturity date.
+	 *								The maturity date is the date when the security expires.
+	 * @param	mixed	frequency	the number of coupon payments per year.
+	 *									Valid frequency values are:
+	 *										1	Annual
+	 *										2	Semi-Annual
+	 *										4	Quarterly
+	 *									If working in Gnumeric Mode, the following frequency options are
+	 *									also available
+	 *										6	Bimonthly
+	 *										12	Monthly
+	 * @param	integer		basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	integer
+	 */
 	public static function COUPNUM($settlement, $maturity, $frequency, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
@@ -448,6 +729,39 @@ class PHPExcel_Calculation_Financial {
 	}	//	function COUPNUM()
 
 
+	/**
+	 * COUPPCD
+	 *
+	 * Returns the previous coupon date before the settlement date.
+	 *
+	 * Excel Function:
+	 *		COUPPCD(settlement,maturity,frequency[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	settlement	The security's settlement date.
+	 *								The security settlement date is the date after the issue
+	 *								date when the security is traded to the buyer.
+	 * @param	mixed	maturity	The security's maturity date.
+	 *								The maturity date is the date when the security expires.
+	 * @param	mixed	frequency	the number of coupon payments per year.
+	 *									Valid frequency values are:
+	 *										1	Annual
+	 *										2	Semi-Annual
+	 *										4	Quarterly
+	 *									If working in Gnumeric Mode, the following frequency options are
+	 *									also available
+	 *										6	Bimonthly
+	 *										12	Monthly
+	 * @param	integer		basis		The type of day count to use.
+	 *										0 or omitted	US (NASD) 30/360
+	 *										1				Actual/actual
+	 *										2				Actual/360
+	 *										3				Actual/365
+	 *										4				European 30/360
+	 * @return	mixed	Excel date/time serial value, PHP date/time serial value or PHP date/time object,
+	 *						depending on the value of the ReturnDateType flag
+	 */
 	public static function COUPPCD($settlement, $maturity, $frequency, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
@@ -472,18 +786,25 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	CUMIPMT
+	 * CUMIPMT
 	 *
-	 *	Returns the cumulative interest paid on a loan between start_period and end_period.
+	 * Returns the cumulative interest paid on a loan between the start and end periods.
 	 *
-	 *	@param	float	$rate	Interest rate per period
-	 *	@param	int		$nper	Number of periods
-	 *	@param	float	$pv		Present Value
-	 *	@param	int		start	The first period in the calculation.
-	 *								Payment periods are numbered beginning with 1.
-	 *	@param	int		end		The last period in the calculation.
-	 *	@param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 *	@return	float
+	 * Excel Function:
+	 *		CUMIPMT(rate,nper,pv,start,end[,type])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	$rate	The Interest rate
+	 * @param	integer	$nper	The total number of payment periods
+	 * @param	float	$pv		Present Value
+	 * @param	integer	$start	The first period in the calculation.
+	 *							Payment periods are numbered beginning with 1.
+	 * @param	integer	$end	The last period in the calculation.
+	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
+	 *								0 or omitted	At the end of the period.
+	 *								1				At the beginning of the period.
+	 * @return	float
 	 */
 	public static function CUMIPMT($rate, $nper, $pv, $start, $end, $type = 0) {
 		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
@@ -512,18 +833,25 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	CUMPRINC
+	 * CUMPRINC
 	 *
-	 *	Returns the cumulative principal paid on a loan between start_period and end_period.
+	 * Returns the cumulative principal paid on a loan between the start and end periods.
 	 *
-	 *	@param	float	$rate	Interest rate per period
-	 *	@param	int		$nper	Number of periods
-	 *	@param	float	$pv		Present Value
-	 *	@param	int		start	The first period in the calculation.
-	 *								Payment periods are numbered beginning with 1.
-	 *	@param	int		end		The last period in the calculation.
-	 *	@param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 *	@return	float
+	 * Excel Function:
+	 *		CUMPRINC(rate,nper,pv,start,end[,type])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	$rate	The Interest rate
+	 * @param	integer	$nper	The total number of payment periods
+	 * @param	float	$pv		Present Value
+	 * @param	integer	$start	The first period in the calculation.
+	 *							Payment periods are numbered beginning with 1.
+	 * @param	integer	$end	The last period in the calculation.
+	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
+	 *								0 or omitted	At the end of the period.
+	 *								1				At the beginning of the period.
+	 * @return	float
 	 */
 	public static function CUMPRINC($rate, $nper, $pv, $start, $end, $type = 0) {
 		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
@@ -552,29 +880,45 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	DB
+	 * DB
 	 *
-	 *	Returns the depreciation of an asset for a specified period using the fixed-declining balance method.
-	 *	This form of depreciation is used if you want to get a higher depreciation value at the beginning of the depreciation
-	 *		(as opposed to linear depreciation). The depreciation value is reduced with every depreciation period by the
-	 *		depreciation already deducted from the initial cost.
+	 * Returns the depreciation of an asset for a specified period using the
+	 * fixed-declining balance method.
+	 * This form of depreciation is used if you want to get a higher depreciation value
+	 * at the beginning of the depreciation (as opposed to linear depreciation). The
+	 * depreciation value is reduced with every depreciation period by the depreciation
+	 * already deducted from the initial cost.
 	 *
-	 *	@param	float	cost		Initial cost of the asset.
-	 *	@param	float	salvage		Value at the end of the depreciation. (Sometimes called the salvage value of the asset)
-	 *	@param	int		life		Number of periods over which the asset is depreciated. (Sometimes called the useful life of the asset)
-	 *	@param	int		period		The period for which you want to calculate the depreciation. Period must use the same units as life.
-	 *	@param	float	month		Number of months in the first year. If month is omitted, it defaults to 12.
-	 *	@return	float
+	 * Excel Function:
+	 *		DB(cost,salvage,life,period[,month])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	cost		Initial cost of the asset.
+	 * @param	float	salvage		Value at the end of the depreciation.
+	 *								(Sometimes called the salvage value of the asset)
+	 * @param	integer	life		Number of periods over which the asset is depreciated.
+	 *								(Sometimes called the useful life of the asset)
+	 * @param	integer	period		The period for which you want to calculate the
+	 *								depreciation. Period must use the same units as life.
+	 * @param	integer	month		Number of months in the first year. If month is omitted,
+	 *								it defaults to 12.
+	 * @return	float
 	 */
 	public static function DB($cost, $salvage, $life, $period, $month=12) {
-		$cost		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$month		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($month);
+		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
+		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
+		$month		= PHPExcel_Calculation_Functions::flattenSingleValue($month);
 
 		//	Validate
 		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($month))) {
+			$cost		= (float) $cost;
+			$salvage	= (float) $salvage;
+			$life		= (int) $life;
+			$period		= (int) $period;
+			$month		= (int) $month;
 			if ($cost == 0) {
 				return 0.0;
 			} elseif (($cost < 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($month < 1)) {
@@ -606,27 +950,42 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	DDB
+	 * DDB
 	 *
-	 *	Returns the depreciation of an asset for a specified period using the double-declining balance method or some other method you specify.
+	 * Returns the depreciation of an asset for a specified period using the
+	 * double-declining balance method or some other method you specify.
 	 *
-	 *	@param	float	cost		Initial cost of the asset.
-	 *	@param	float	salvage		Value at the end of the depreciation. (Sometimes called the salvage value of the asset)
-	 *	@param	int		life		Number of periods over which the asset is depreciated. (Sometimes called the useful life of the asset)
-	 *	@param	int		period		The period for which you want to calculate the depreciation. Period must use the same units as life.
-	 *	@param	float	factor		The rate at which the balance declines.
-	 *								If factor is omitted, it is assumed to be 2 (the double-declining balance method).
-	 *	@return	float
+	 * Excel Function:
+	 *		DDB(cost,salvage,life,period[,factor])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	cost		Initial cost of the asset.
+	 * @param	float	salvage		Value at the end of the depreciation.
+	 *								(Sometimes called the salvage value of the asset)
+	 * @param	integer	life		Number of periods over which the asset is depreciated.
+	 *								(Sometimes called the useful life of the asset)
+	 * @param	integer	period		The period for which you want to calculate the
+	 *								depreciation. Period must use the same units as life.
+	 * @param	float	factor		The rate at which the balance declines.
+	 *								If factor is omitted, it is assumed to be 2 (the
+	 *								double-declining balance method).
+	 * @return	float
 	 */
 	public static function DDB($cost, $salvage, $life, $period, $factor=2.0) {
-		$cost		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($cost);
-		$salvage	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
-		$life		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($life);
-		$period		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($period);
-		$factor		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($factor);
+		$cost		= PHPExcel_Calculation_Functions::flattenSingleValue($cost);
+		$salvage	= PHPExcel_Calculation_Functions::flattenSingleValue($salvage);
+		$life		= PHPExcel_Calculation_Functions::flattenSingleValue($life);
+		$period		= PHPExcel_Calculation_Functions::flattenSingleValue($period);
+		$factor		= PHPExcel_Calculation_Functions::flattenSingleValue($factor);
 
 		//	Validate
 		if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($factor))) {
+			$cost		= (float) $cost;
+			$salvage	= (float) $salvage;
+			$life		= (int) $life;
+			$period		= (int) $period;
+			$factor		= (float) $factor;
 			if (($cost <= 0) || (($salvage / $cost) < 0) || ($life <= 0) || ($period < 1) || ($factor <= 0.0) || ($period > $life)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
@@ -650,33 +1009,42 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	DISC
+	 * DISC
 	 *
-	 *	Returns the discount rate for a security.
+	 * Returns the discount rate for a security.
 	 *
-	 *	@param	mixed	settlement	The security's settlement date.
-	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 *	@param	mixed	maturity	The security's maturity date.
+	 * Excel Function:
+	 *		DISC(settlement,maturity,price,redemption[,basis])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	mixed	settlement	The security's settlement date.
+	 *								The security settlement date is the date after the issue
+	 *								date when the security is traded to the buyer.
+	 * @param	mixed	maturity	The security's maturity date.
 	 *								The maturity date is the date when the security expires.
-	 *	@param	int		price		The security's price per $100 face value.
-	 *	@param	int		redemption	the security's redemption value per $100 face value.
-	 *	@param	int		basis		The type of day count to use.
+	 * @param	integer	price		The security's price per $100 face value.
+	 * @param	integer	redemption	The security's redemption value per $100 face value.
+	 * @param	integer	basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function DISC($settlement, $maturity, $price, $redemption, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$price		= (float) PHPExcel_Calculation_Functions::flattenSingleValue($price);
-		$redemption	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+		$price		= PHPExcel_Calculation_Functions::flattenSingleValue($price);
+		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
+		$basis		= PHPExcel_Calculation_Functions::flattenSingleValue($basis);
 
 		//	Validate
 		if ((is_numeric($price)) && (is_numeric($redemption)) && (is_numeric($basis))) {
+			$price		= (float) $price;
+			$redemption	= (float) $redemption;
+			$basis		= (int) $basis;
 			if (($price <= 0) || ($redemption <= 0)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
@@ -695,11 +1063,17 @@ class PHPExcel_Calculation_Financial {
 	/**
 	 * DOLLARDE
 	 *
-	 * Converts a dollar price expressed as an integer part and a fraction part into a dollar price expressed as a decimal number.
+	 * Converts a dollar price expressed as an integer part and a fraction
+	 *		part into a dollar price expressed as a decimal number.
 	 * Fractional dollar numbers are sometimes used for security prices.
 	 *
+	 * Excel Function:
+	 *		DOLLARDE(fractional_dollar,fraction)
+	 *
+	 * @access	public
+	 * @category Financial Functions
 	 * @param	float	$fractional_dollar	Fractional Dollar
-	 * @param	int		$fraction			Fraction
+	 * @param	integer	$fraction			Fraction
 	 * @return	float
 	 */
 	public static function DOLLARDE($fractional_dollar = Null, $fraction = 0) {
@@ -725,11 +1099,17 @@ class PHPExcel_Calculation_Financial {
 	/**
 	 * DOLLARFR
 	 *
-	 * Converts a dollar price expressed as a decimal number into a dollar price expressed as a fraction.
+	 * Converts a dollar price expressed as a decimal number into a dollar price
+	 *		expressed as a fraction.
 	 * Fractional dollar numbers are sometimes used for security prices.
 	 *
+	 * Excel Function:
+	 *		DOLLARFR(decimal_dollar,fraction)
+	 *
+	 * @access	public
+	 * @category Financial Functions
 	 * @param	float	$decimal_dollar		Decimal Dollar
-	 * @param	int		$fraction			Fraction
+	 * @param	integer	$fraction			Fraction
 	 * @return	float
 	 */
 	public static function DOLLARFR($decimal_dollar = Null, $fraction = 0) {
@@ -755,10 +1135,16 @@ class PHPExcel_Calculation_Financial {
 	/**
 	 * EFFECT
 	 *
-	 * Returns the effective interest rate given the nominal rate and the number of compounding payments per year.
+	 * Returns the effective interest rate given the nominal rate and the number of
+	 *		compounding payments per year.
 	 *
+	 * Excel Function:
+	 *		EFFECT(nominal_rate,npery)
+	 *
+	 * @access	public
+	 * @category Financial Functions
 	 * @param	float	$nominal_rate		Nominal interest rate
-	 * @param	int		$npery				Number of compounding payments per year
+	 * @param	integer	$npery				Number of compounding payments per year
 	 * @return	float
 	 */
 	public static function EFFECT($nominal_rate = 0, $npery = 0) {
@@ -779,11 +1165,21 @@ class PHPExcel_Calculation_Financial {
 	 *
 	 * Returns the Future Value of a cash flow with constant payments and interest rate (annuities).
 	 *
-	 * @param	float	$rate	Interest rate per period
-	 * @param	int		$nper	Number of periods
-	 * @param	float	$pmt	Periodic payment (annuity)
-	 * @param	float	$pv		Present Value
-	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+	 * Excel Function:
+	 *		FV(rate,nper,pmt[,pv[,type]])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	$rate	The interest rate per period
+	 * @param	int		$nper	Total number of payment periods in an annuity
+	 * @param	float	$pmt	The payment made each period: it cannot change over the
+	 *							life of the annuity. Typically, pmt contains principal
+	 *							and interest but no other fees or taxes.
+	 * @param	float	$pv		Present Value, or the lump-sum amount that a series of
+	 *							future payments is worth right now.
+	 * @param	integer	$type	A number 0 or 1 and indicates when payments are due:
+	 *								0 or omitted	At the end of the period.
+	 *								1				At the beginning of the period.
 	 * @return	float
 	 */
 	public static function FV($rate = 0, $nper = 0, $pmt = 0, $pv = 0, $type = 0) {
@@ -824,33 +1220,39 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	INTRATE
+	 * INTRATE
 	 *
-	 *	Returns the interest rate for a fully invested security.
+	 * Returns the interest rate for a fully invested security.
 	 *
-	 *	@param	mixed	settlement	The security's settlement date.
+	 * Excel Function:
+	 *		INTRATE(settlement,maturity,investment,redemption[,basis])
+	 *
+	 * @param	mixed	settlement	The security's settlement date.
 	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 *	@param	mixed	maturity	The security's maturity date.
+	 * @param	mixed	maturity	The security's maturity date.
 	 *								The maturity date is the date when the security expires.
-	 *	@param	int		investment	The amount invested in the security.
-	 *	@param	int		redemption	The amount to be received at maturity.
-	 *	@param	int		basis		The type of day count to use.
+	 * @param	integer	investment	The amount invested in the security.
+	 * @param	integer	redemption	The amount to be received at maturity.
+	 * @param	integer	basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function INTRATE($settlement, $maturity, $investment, $redemption, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
 		$maturity	= PHPExcel_Calculation_Functions::flattenSingleValue($maturity);
-		$investment	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($investment);
-		$redemption	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
-		$basis		= (int) PHPExcel_Calculation_Functions::flattenSingleValue($basis);
+		$investment	= PHPExcel_Calculation_Functions::flattenSingleValue($investment);
+		$redemption	= PHPExcel_Calculation_Functions::flattenSingleValue($redemption);
+		$basis		= PHPExcel_Calculation_Functions::flattenSingleValue($basis);
 
 		//	Validate
 		if ((is_numeric($investment)) && (is_numeric($redemption)) && (is_numeric($basis))) {
+			$investment	= (float) $investment;
+			$redemption	= (float) $redemption;
+			$basis		= (int) $basis;
 			if (($investment <= 0) || ($redemption <= 0)) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
@@ -867,17 +1269,17 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	IPMT
+	 * IPMT
 	 *
-	 *	Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
+	 * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
 	 *
-	 *	@param	float	$rate	Interest rate per period
-	 *	@param	int		$per	Period for which we want to find the interest
-	 *	@param	int		$nper	Number of periods
-	 *	@param	float	$pv		Present Value
-	 *	@param	float	$fv		Future Value
-	 *	@param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 *	@return	float
+	 * @param	float	$rate	Interest rate per period
+	 * @param	int		$per	Period for which we want to find the interest
+	 * @param	int		$nper	Number of periods
+	 * @param	float	$pv		Present Value
+	 * @param	float	$fv		Future Value
+	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+	 * @return	float
 	 */
 	public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0) {
 		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
@@ -1040,12 +1442,12 @@ class PHPExcel_Calculation_Financial {
 	 *
 	 * Returns the number of periods for a cash flow with constant periodic payments (annuities), and interest rate.
 	 *
-	 *	@param	float	$rate	Interest rate per period
-	 *	@param	int		$pmt	Periodic payment (annuity)
-	 *	@param	float	$pv		Present Value
-	 *	@param	float	$fv		Future Value
-	 *	@param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 *	@return	float
+	 * @param	float	$rate	Interest rate per period
+	 * @param	int		$pmt	Periodic payment (annuity)
+	 * @param	float	$pv		Present Value
+	 * @param	float	$fv		Future Value
+	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+	 * @return	float
 	 */
 	public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0) {
 		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
@@ -1138,17 +1540,17 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	PPMT
+	 * PPMT
 	 *
-	 *	Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
+	 * Returns the interest payment for a given period for an investment based on periodic, constant payments and a constant interest rate.
 	 *
-	 *	@param	float	$rate	Interest rate per period
-	 *	@param	int		$per	Period for which we want to find the interest
-	 *	@param	int		$nper	Number of periods
-	 *	@param	float	$pv		Present Value
-	 *	@param	float	$fv		Future Value
-	 *	@param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
-	 *	@return	float
+	 * @param	float	$rate	Interest rate per period
+	 * @param	int		$per	Period for which we want to find the interest
+	 * @param	int		$nper	Number of periods
+	 * @param	float	$pv		Present Value
+	 * @param	float	$fv		Future Value
+	 * @param	int		$type	Payment type: 0 = at the end of each period, 1 = at the beginning of each period
+	 * @return	float
 	 */
 	public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0) {
 		$rate	= PHPExcel_Calculation_Functions::flattenSingleValue($rate);
@@ -1214,23 +1616,23 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	PRICEDISC
+	 * PRICEDISC
 	 *
-	 *	Returns the price per $100 face value of a discounted security.
+	 * Returns the price per $100 face value of a discounted security.
 	 *
-	 *	@param	mixed	settlement	The security's settlement date.
+	 * @param	mixed	settlement	The security's settlement date.
 	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 *	@param	mixed	maturity	The security's maturity date.
+	 * @param	mixed	maturity	The security's maturity date.
 	 *								The maturity date is the date when the security expires.
-	 *	@param	int		discount	The security's discount rate.
-	 *	@param	int		redemption	The security's redemption value per $100 face value.
-	 *	@param	int		basis		The type of day count to use.
+	 * @param	int		discount	The security's discount rate.
+	 * @param	int		redemption	The security's redemption value per $100 face value.
+	 * @param	int		basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function PRICEDISC($settlement, $maturity, $discount, $redemption, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
@@ -1257,24 +1659,24 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	PRICEMAT
+	 * PRICEMAT
 	 *
-	 *	Returns the price per $100 face value of a security that pays interest at maturity.
+	 * Returns the price per $100 face value of a security that pays interest at maturity.
 	 *
-	 *	@param	mixed	settlement	The security's settlement date.
+	 * @param	mixed	settlement	The security's settlement date.
 	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 *	@param	mixed	maturity	The security's maturity date.
+	 * @param	mixed	maturity	The security's maturity date.
 	 *								The maturity date is the date when the security expires.
-	 *	@param	mixed	issue		The security's issue date.
-	 *	@param	int		rate		The security's interest rate at date of issue.
-	 *	@param	int		yield		The security's annual yield.
-	 *	@param	int		basis		The type of day count to use.
+	 * @param	mixed	issue		The security's issue date.
+	 * @param	int		rate		The security's interest rate at date of issue.
+	 * @param	int		yield		The security's annual yield.
+	 * @param	int		basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
@@ -1356,6 +1758,32 @@ class PHPExcel_Calculation_Financial {
 	/**
 	 * RATE
 	 *
+	 * Returns the interest rate per period of an annuity.
+	 * RATE is calculated by iteration and can have zero or more solutions.
+	 * If the successive results of RATE do not converge to within 0.0000001 after 20 iterations,
+	 * RATE returns the #NUM! error value.
+	 *
+	 * Excel Function:
+	 *		RATE(nper,pmt,pv[,fv[,type[,guess]]])
+	 *
+	 * @access	public
+	 * @category Financial Functions
+	 * @param	float	nper		The total number of payment periods in an annuity.
+	 * @param	float	pmt			The payment made each period and cannot change over the life
+	 *									of the annuity.
+	 *								Typically, pmt includes principal and interest but no other
+	 *									fees or taxes.
+	 * @param	float	pv			The present value - the total amount that a series of future
+	 *									payments is worth now.
+	 * @param	float	fv			The future value, or a cash balance you want to attain after
+	 *									the last payment is made. If fv is omitted, it is assumed
+	 *									to be 0 (the future value of a loan, for example, is 0).
+	 * @param	integer	type		A number 0 or 1 and indicates when payments are due:
+	 *										0 or omitted	At the end of the period.
+	 *										1				At the beginning of the period.
+	 * @param	float	guess		Your guess for what the rate will be.
+	 *									If you omit guess, it is assumed to be 10 percent.
+	 * @return	float
 	 **/
 	public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1) {
 		$nper	= (int) PHPExcel_Calculation_Functions::flattenSingleValue($nper);
@@ -1382,6 +1810,8 @@ class PHPExcel_Calculation_Financial {
 			$rate = ($y1 * $x0 - $y0 * $x1) / ($y1 - $y0);
 			$x0 = $x1;
 			$x1 = $rate;
+			if (($nper * abs($pmt)) > ($pv - $fv))
+				$x1 = abs($x1);
 
 			if (abs($rate) < FINANCIAL_PRECISION) {
 				$y = $pv * (1 + $nper * $rate) + $pmt * (1 + $rate * $type) * $nper + $fv;
@@ -1399,23 +1829,23 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	RECEIVED
+	 * RECEIVED
 	 *
-	 *	Returns the price per $100 face value of a discounted security.
+	 * Returns the price per $100 face value of a discounted security.
 	 *
-	 *	@param	mixed	settlement	The security's settlement date.
+	 * @param	mixed	settlement	The security's settlement date.
 	 *								The security settlement date is the date after the issue date when the security is traded to the buyer.
-	 *	@param	mixed	maturity	The security's maturity date.
+	 * @param	mixed	maturity	The security's maturity date.
 	 *								The maturity date is the date when the security expires.
-	 *	@param	int		investment	The amount invested in the security.
-	 *	@param	int		discount	The security's discount rate.
-	 *	@param	int		basis		The type of day count to use.
+	 * @param	int		investment	The amount invested in the security.
+	 * @param	int		discount	The security's discount rate.
+	 * @param	int		basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function RECEIVED($settlement, $maturity, $investment, $discount, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
@@ -1496,16 +1926,16 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	TBILLEQ
+	 * TBILLEQ
 	 *
-	 *	Returns the bond-equivalent yield for a Treasury bill.
+	 * Returns the bond-equivalent yield for a Treasury bill.
 	 *
-	 *	@param	mixed	settlement	The Treasury bill's settlement date.
+	 * @param	mixed	settlement	The Treasury bill's settlement date.
 	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 *	@param	mixed	maturity	The Treasury bill's maturity date.
+	 * @param	mixed	maturity	The Treasury bill's maturity date.
 	 *								The maturity date is the date when the Treasury bill expires.
-	 *	@param	int		discount	The Treasury bill's discount rate.
-	 *	@return	float
+	 * @param	int		discount	The Treasury bill's discount rate.
+	 * @return	float
 	 */
 	public static function TBILLEQ($settlement, $maturity, $discount) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
@@ -1534,16 +1964,16 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	TBILLPRICE
+	 * TBILLPRICE
 	 *
-	 *	Returns the yield for a Treasury bill.
+	 * Returns the yield for a Treasury bill.
 	 *
-	 *	@param	mixed	settlement	The Treasury bill's settlement date.
+	 * @param	mixed	settlement	The Treasury bill's settlement date.
 	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 *	@param	mixed	maturity	The Treasury bill's maturity date.
+	 * @param	mixed	maturity	The Treasury bill's maturity date.
 	 *								The maturity date is the date when the Treasury bill expires.
-	 *	@param	int		discount	The Treasury bill's discount rate.
-	 *	@return	float
+	 * @param	int		discount	The Treasury bill's discount rate.
+	 * @return	float
 	 */
 	public static function TBILLPRICE($settlement, $maturity, $discount) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
@@ -1586,16 +2016,16 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	TBILLYIELD
+	 * TBILLYIELD
 	 *
-	 *	Returns the yield for a Treasury bill.
+	 * Returns the yield for a Treasury bill.
 	 *
-	 *	@param	mixed	settlement	The Treasury bill's settlement date.
+	 * @param	mixed	settlement	The Treasury bill's settlement date.
 	 *								The Treasury bill's settlement date is the date after the issue date when the Treasury bill is traded to the buyer.
-	 *	@param	mixed	maturity	The Treasury bill's maturity date.
+	 * @param	mixed	maturity	The Treasury bill's maturity date.
 	 *								The maturity date is the date when the Treasury bill expires.
-	 *	@param	int		price		The Treasury bill's price per $100 face value.
-	 *	@return	float
+	 * @param	int		price		The Treasury bill's price per $100 face value.
+	 * @return	float
 	 */
 	public static function TBILLYIELD($settlement, $maturity, $price) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
@@ -1672,18 +2102,18 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	XNPV
+	 * XNPV
 	 *
-	 *	Returns the net present value for a schedule of cash flows that is not necessarily periodic.
-	 *	To calculate the net present value for a series of cash flows that is periodic, use the NPV function.
+	 * Returns the net present value for a schedule of cash flows that is not necessarily periodic.
+	 * To calculate the net present value for a series of cash flows that is periodic, use the NPV function.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=XNPV(rate,values,dates)
 	 *
-	 *	@param	float			$rate		The discount rate to apply to the cash flows.
-	 *	@param	array of float	$values		A series of cash flows that corresponds to a schedule of payments in dates. The first payment is optional and corresponds to a cost or payment that occurs at the beginning of the investment. If the first value is a cost or payment, it must be a negative value. All succeeding payments are discounted based on a 365-day year. The series of values must contain at least one positive value and one negative value.
-	 *	@param	array of mixed	$dates		A schedule of payment dates that corresponds to the cash flow payments. The first payment date indicates the beginning of the schedule of payments. All other dates must be later than this date, but they may occur in any order.
-	 *	@return	float
+	 * @param	float			$rate		The discount rate to apply to the cash flows.
+	 * @param	array of float	$values		A series of cash flows that corresponds to a schedule of payments in dates. The first payment is optional and corresponds to a cost or payment that occurs at the beginning of the investment. If the first value is a cost or payment, it must be a negative value. All succeeding payments are discounted based on a 365-day year. The series of values must contain at least one positive value and one negative value.
+	 * @param	array of mixed	$dates		A schedule of payment dates that corresponds to the cash flow payments. The first payment date indicates the beginning of the schedule of payments. All other dates must be later than this date, but they may occur in any order.
+	 * @return	float
 	 */
 	public static function XNPV($rate, $values, $dates) {
 		$rate = PHPExcel_Calculation_Functions::flattenSingleValue($rate);
@@ -1705,23 +2135,23 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	YIELDDISC
+	 * YIELDDISC
 	 *
-	 *	Returns the annual yield of a security that pays interest at maturity.
+	 * Returns the annual yield of a security that pays interest at maturity.
 	 *
-	 *	@param	mixed	settlement	The security's settlement date.
+	 * @param	mixed	settlement	The security's settlement date.
 	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 *	@param	mixed	maturity	The security's maturity date.
+	 * @param	mixed	maturity	The security's maturity date.
 	 *								The maturity date is the date when the security expires.
-	 *	@param	int		price		The security's price per $100 face value.
-	 *	@param	int		redemption	The security's redemption value per $100 face value.
-	 *	@param	int		basis		The type of day count to use.
+	 * @param	int		price		The security's price per $100 face value.
+	 * @param	int		redemption	The security's redemption value per $100 face value.
+	 * @param	int		basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
@@ -1753,24 +2183,24 @@ class PHPExcel_Calculation_Financial {
 
 
 	/**
-	 *	YIELDMAT
+	 * YIELDMAT
 	 *
-	 *	Returns the annual yield of a security that pays interest at maturity.
+	 * Returns the annual yield of a security that pays interest at maturity.
 	 *
-	 *	@param	mixed	settlement	The security's settlement date.
+	 * @param	mixed	settlement	The security's settlement date.
 	 *								The security's settlement date is the date after the issue date when the security is traded to the buyer.
-	 *	@param	mixed	maturity	The security's maturity date.
+	 * @param	mixed	maturity	The security's maturity date.
 	 *								The maturity date is the date when the security expires.
-	 *	@param	mixed	issue		The security's issue date.
-	 *	@param	int		rate		The security's interest rate at date of issue.
-	 *	@param	int		price		The security's price per $100 face value.
-	 *	@param	int		basis		The type of day count to use.
+	 * @param	mixed	issue		The security's issue date.
+	 * @param	int		rate		The security's interest rate at date of issue.
+	 * @param	int		price		The security's price per $100 face value.
+	 * @param	int		basis		The type of day count to use.
 	 *										0 or omitted	US (NASD) 30/360
 	 *										1				Actual/actual
 	 *										2				Actual/360
 	 *										3				Actual/365
 	 *										4				European 30/360
-	 *	@return	float
+	 * @return	float
 	 */
 	public static function YIELDMAT($settlement, $maturity, $issue, $rate, $price, $basis=0) {
 		$settlement	= PHPExcel_Calculation_Functions::flattenSingleValue($settlement);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaParser.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaParser.php
index f8ffe579f45..7318a5b74b4 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaParser.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaParser.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -54,7 +54,7 @@ PARTLY BASED ON:
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_FormulaParser {
 	/* Character constants */
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaToken.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaToken.php
index 3045a9a8938..b8a2571aebf 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaToken.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/FormulaToken.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -55,7 +55,7 @@ PARTLY BASED ON:
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_FormulaToken {
 	/* Token types */
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Function.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Function.php
index 14c9294f258..88f8c3b5471 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Function.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Function.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Function {
 	/* Function categories */
@@ -76,9 +76,9 @@ class PHPExcel_Calculation_Function {
      * @param 	string		$pPHPExcelName	PHPExcel function mapping
      * @throws 	Exception
      */
-    public function __construct($pCategory = null, $pExcelName = null, $pPHPExcelName = null)
+    public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
     {
-    	if (!is_null($pCategory) && !is_null($pExcelName) && !is_null($pPHPExcelName)) {
+    	if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
     		// Initialise values
     		$this->_category 		= $pCategory;
     		$this->_excelName 		= $pExcelName;
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Functions.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Functions.php
index beab5a6ab5c..e0a5629559d 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Functions.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Functions.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -54,7 +54,7 @@ define('PRECISION', 8.88E-016);
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Functions {
 
@@ -69,26 +69,26 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Compatibility mode to use for error checking and responses
+	 * Compatibility mode to use for error checking and responses
 	 *
-	 *	@access	private
-	 *	@var string
+	 * @access	private
+	 * @var string
 	 */
 	protected static $compatibilityMode	= self::COMPATIBILITY_EXCEL;
 
 	/**
-	 *	Data Type to use when returning date values
+	 * Data Type to use when returning date values
 	 *
-	 *	@access	private
-	 *	@var string
+	 * @access	private
+	 * @var string
 	 */
 	protected static $ReturnDateType	= self::RETURNDATE_EXCEL;
 
 	/**
-	 *	List of error codes
+	 * List of error codes
 	 *
-	 *	@access	private
-	 *	@var array
+	 * @access	private
+	 * @var array
 	 */
 	protected static $_errorCodes	= array( 'null'				=> '#NULL!',
 											 'divisionbyzero'	=> '#DIV/0!',
@@ -102,16 +102,16 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Set the Compatibility Mode
+	 * Set the Compatibility Mode
 	 *
-	 *	@access	public
-	 *	@category Function Configuration
-	 *	@param	 string		$compatibilityMode		Compatibility Mode
+	 * @access	public
+	 * @category Function Configuration
+	 * @param	 string		$compatibilityMode		Compatibility Mode
 	 *												Permitted values are:
 	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
 	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
 	 *													PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE	'OpenOfficeCalc'
-	 *	@return	 boolean	(Success or Failure)
+	 * @return	 boolean	(Success or Failure)
 	 */
 	public static function setCompatibilityMode($compatibilityMode) {
 		if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
@@ -125,11 +125,11 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Return the current Compatibility Mode
+	 * Return the current Compatibility Mode
 	 *
-	 *	@access	public
-	 *	@category Function Configuration
-	 *	@return	 string		Compatibility Mode
+	 * @access	public
+	 * @category Function Configuration
+	 * @return	 string		Compatibility Mode
 	 *							Possible Return values are:
 	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_EXCEL			'Excel'
 	 *								PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC		'Gnumeric'
@@ -141,16 +141,16 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
+	 * Set the Return Date Format used by functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
 	 *
-	 *	@access	public
-	 *	@category Function Configuration
-	 *	@param	 string	$returnDateType			Return Date Format
+	 * @access	public
+	 * @category Function Configuration
+	 * @param	 string	$returnDateType			Return Date Format
 	 *												Permitted values are:
 	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
 	 *													PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
 	 *													PHPExcel_Calculation_Functions::RETURNDATE_EXCEL			'E'
-	 *	@return	 boolean							Success or failure
+	 * @return	 boolean							Success or failure
 	 */
 	public static function setReturnDateType($returnDateType) {
 		if (($returnDateType == self::RETURNDATE_PHP_NUMERIC) ||
@@ -164,11 +164,11 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
+	 * Return the current Return Date Format for functions that return a date/time (Excel, PHP Serialized Numeric or PHP Object)
 	 *
-	 *	@access	public
-	 *	@category Function Configuration
-	 *	@return	 string		Return Date Format
+	 * @access	public
+	 * @category Function Configuration
+	 * @return	 string		Return Date Format
 	 *							Possible Return values are:
 	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC		'P'
 	 *								PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT		'O'
@@ -180,11 +180,11 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	DUMMY
+	 * DUMMY
 	 *
-	 *	@access	public
-	 *	@category Error Returns
-	 *	@return	string	#Not Yet Implemented
+	 * @access	public
+	 * @category Error Returns
+	 * @return	string	#Not Yet Implemented
 	 */
 	public static function DUMMY() {
 		return '#Not Yet Implemented';
@@ -192,11 +192,11 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	DIV0
+	 * DIV0
 	 *
-	 *	@access	public
-	 *	@category Error Returns
-	 *	@return	string	#Not Yet Implemented
+	 * @access	public
+	 * @category Error Returns
+	 * @return	string	#Not Yet Implemented
 	 */
 	public static function DIV0() {
 		return self::$_errorCodes['divisionbyzero'];
@@ -204,17 +204,17 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	NA
+	 * NA
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=NA()
 	 *
-	 *	Returns the error value #N/A
+	 * Returns the error value #N/A
 	 *		#N/A is the error value that means "no value is available."
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@return	string	#N/A!
+	 * @access	public
+	 * @category Logical Functions
+	 * @return	string	#N/A!
 	 */
 	public static function NA() {
 		return self::$_errorCodes['na'];
@@ -222,13 +222,13 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	NaN
+	 * NaN
 	 *
-	 *	Returns the error value #NUM!
+	 * Returns the error value #NUM!
 	 *
-	 *	@access	public
-	 *	@category Error Returns
-	 *	@return	string	#NUM!
+	 * @access	public
+	 * @category Error Returns
+	 * @return	string	#NUM!
 	 */
 	public static function NaN() {
 		return self::$_errorCodes['num'];
@@ -236,13 +236,13 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	NAME
+	 * NAME
 	 *
-	 *	Returns the error value #NAME?
+	 * Returns the error value #NAME?
 	 *
-	 *	@access	public
-	 *	@category Error Returns
-	 *	@return	string	#NAME?
+	 * @access	public
+	 * @category Error Returns
+	 * @return	string	#NAME?
 	 */
 	public static function NAME() {
 		return self::$_errorCodes['name'];
@@ -250,13 +250,13 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	REF
+	 * REF
 	 *
-	 *	Returns the error value #REF!
+	 * Returns the error value #REF!
 	 *
-	 *	@access	public
-	 *	@category Error Returns
-	 *	@return	string	#REF!
+	 * @access	public
+	 * @category Error Returns
+	 * @return	string	#REF!
 	 */
 	public static function REF() {
 		return self::$_errorCodes['reference'];
@@ -264,13 +264,13 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	NULL
+	 * NULL
 	 *
-	 *	Returns the error value #NULL!
+	 * Returns the error value #NULL!
 	 *
-	 *	@access	public
-	 *	@category Error Returns
-	 *	@return	string	#REF!
+	 * @access	public
+	 * @category Error Returns
+	 * @return	string	#REF!
 	 */
 	public static function NULL() {
 		return self::$_errorCodes['null'];
@@ -278,13 +278,13 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	VALUE
+	 * VALUE
 	 *
-	 *	Returns the error value #VALUE!
+	 * Returns the error value #VALUE!
 	 *
-	 *	@access	public
-	 *	@category Error Returns
-	 *	@return	string	#VALUE!
+	 * @access	public
+	 * @category Error Returns
+	 * @return	string	#VALUE!
 	 */
 	public static function VALUE() {
 		return self::$_errorCodes['value'];
@@ -321,32 +321,32 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	ERROR_TYPE
+	 * ERROR_TYPE
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
 	public static function ERROR_TYPE($value = '') {
 		$value	= self::flattenSingleValue($value);
 
 		$i = 1;
 		foreach(self::$_errorCodes as $errorCode) {
-			if ($value == $errorCode) {
+			if ($value === $errorCode) {
 				return $i;
 			}
 			++$i;
 		}
-		return self::$_errorCodes['na'];
+		return self::NA();
 	}	//	function ERROR_TYPE()
 
 
 	/**
-	 *	IS_BLANK
+	 * IS_BLANK
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
-	public static function IS_BLANK($value=null) {
+	public static function IS_BLANK($value = NULL) {
 		if (!is_null($value)) {
 			$value	= self::flattenSingleValue($value);
 		}
@@ -356,10 +356,10 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	IS_ERR
+	 * IS_ERR
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
 	public static function IS_ERR($value = '') {
 		$value		= self::flattenSingleValue($value);
@@ -369,70 +369,74 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	IS_ERROR
+	 * IS_ERROR
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
 	public static function IS_ERROR($value = '') {
 		$value		= self::flattenSingleValue($value);
 
+		if (!is_string($value))
+			return false;
 		return in_array($value, array_values(self::$_errorCodes));
 	}	//	function IS_ERROR()
 
 
 	/**
-	 *	IS_NA
+	 * IS_NA
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
 	public static function IS_NA($value = '') {
 		$value		= self::flattenSingleValue($value);
 
-		return ($value === self::$_errorCodes['na']);
+		return ($value === self::NA());
 	}	//	function IS_NA()
 
 
 	/**
-	 *	IS_EVEN
+	 * IS_EVEN
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
-	public static function IS_EVEN($value = 0) {
-		$value		= self::flattenSingleValue($value);
+	public static function IS_EVEN($value = NULL) {
+		$value = self::flattenSingleValue($value);
 
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
-			return self::$_errorCodes['value'];
-		}
+		if ($value === NULL)
+			return self::NAME();
+		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
+			return self::VALUE();
 		return ($value % 2 == 0);
 	}	//	function IS_EVEN()
 
 
 	/**
-	 *	IS_ODD
+	 * IS_ODD
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
-	public static function IS_ODD($value = null) {
-		$value	= self::flattenSingleValue($value);
+	public static function IS_ODD($value = NULL) {
+		$value = self::flattenSingleValue($value);
 
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
-			return self::$_errorCodes['value'];
-		}
+		if ($value === NULL)
+			return self::NAME();
+		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
+			return self::VALUE();
 		return (abs($value) % 2 == 1);
 	}	//	function IS_ODD()
 
 
 	/**
-	 *	IS_NUMBER
+	 * IS_NUMBER
 	 *
-	 *	@param	mixed	$value		Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value		Value to check
+	 * @return	boolean
 	 */
-	public static function IS_NUMBER($value = 0) {
+	public static function IS_NUMBER($value = NULL) {
 		$value		= self::flattenSingleValue($value);
 
 		if (is_string($value)) {
@@ -443,12 +447,12 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	IS_LOGICAL
+	 * IS_LOGICAL
 	 *
-	 *	@param	mixed	$value		Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value		Value to check
+	 * @return	boolean
 	 */
-	public static function IS_LOGICAL($value = true) {
+	public static function IS_LOGICAL($value = NULL) {
 		$value		= self::flattenSingleValue($value);
 
 		return is_bool($value);
@@ -456,46 +460,46 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	IS_TEXT
+	 * IS_TEXT
 	 *
-	 *	@param	mixed	$value		Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value		Value to check
+	 * @return	boolean
 	 */
-	public static function IS_TEXT($value = '') {
+	public static function IS_TEXT($value = NULL) {
 		$value		= self::flattenSingleValue($value);
 
-		return is_string($value);
+		return (is_string($value) && !self::IS_ERROR($value));
 	}	//	function IS_TEXT()
 
 
 	/**
-	 *	IS_NONTEXT
+	 * IS_NONTEXT
 	 *
-	 *	@param	mixed	$value		Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value		Value to check
+	 * @return	boolean
 	 */
-	public static function IS_NONTEXT($value = '') {
+	public static function IS_NONTEXT($value = NULL) {
 		return !self::IS_TEXT($value);
 	}	//	function IS_NONTEXT()
 
 
 	/**
-	 *	VERSION
+	 * VERSION
 	 *
-	 *	@return	string	Version information
+	 * @return	string	Version information
 	 */
 	public static function VERSION() {
-		return 'PHPExcel 1.7.6, 2011-02-27';
+		return 'PHPExcel 1.7.8, 2012-10-12';
 	}	//	function VERSION()
 
 
 	/**
-	 *	N
+	 * N
 	 *
-	 *	Returns a value converted to a number
+	 * Returns a value converted to a number
 	 *
-	 *	@param	value		The value you want converted
-	 *	@return	number		N converts values listed in the following table
+	 * @param	value		The value you want converted
+	 * @return	number		N converts values listed in the following table
 	 *		If value is or refers to N returns
 	 *		A number			That number
 	 *		A date				The serial number of that date
@@ -504,7 +508,7 @@ class PHPExcel_Calculation_Functions {
 	 *		An error value		The error value
 	 *		Anything else		0
 	 */
-	public static function N($value) {
+	public static function N($value = NULL) {
 		while (is_array($value)) {
 			$value = array_shift($value);
 		}
@@ -530,12 +534,12 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	TYPE
+	 * TYPE
 	 *
-	 *	Returns a number that identifies the type of a value
+	 * Returns a number that identifies the type of a value
 	 *
-	 *	@param	value		The value you want tested
-	 *	@return	number		N converts values listed in the following table
+	 * @param	value		The value you want tested
+	 * @return	number		N converts values listed in the following table
 	 *		If value is or refers to N returns
 	 *		A number			1
 	 *		Text				2
@@ -543,7 +547,7 @@ class PHPExcel_Calculation_Functions {
 	 *		An error value		16
 	 *		Array or Matrix		64
 	 */
-	public static function TYPE($value) {
+	public static function TYPE($value = NULL) {
 		$value	= self::flattenArrayIndexed($value);
 		if (is_array($value) && (count($value) > 1)) {
 			$a = array_keys($value);
@@ -555,13 +559,13 @@ class PHPExcel_Calculation_Functions {
 			} elseif (self::isMatrixValue($a)) {
 				return 64;
 			}
-		} elseif(count($value) == 0) {
+		} elseif(empty($value)) {
 			//	Empty Cell
 			return 1;
 		}
 		$value	= self::flattenSingleValue($value);
 
-		if ((is_float($value)) || (is_int($value))) {
+		if (($value === NULL) || (is_float($value)) || (is_int($value))) {
 				return 1;
 		} elseif(is_bool($value)) {
 				return 4;
@@ -580,10 +584,10 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Convert a multi-dimensional array to a simple 1-dimensional array
+	 * Convert a multi-dimensional array to a simple 1-dimensional array
 	 *
-	 *	@param	array	$array	Array to be flattened
-	 *	@return	array	Flattened array
+	 * @param	array	$array	Array to be flattened
+	 * @return	array	Flattened array
 	 */
 	public static function flattenArray($array) {
 		if (!is_array($array)) {
@@ -612,10 +616,10 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing
+	 * Convert a multi-dimensional array to a simple 1-dimensional array, but retain an element of indexing
 	 *
-	 *	@param	array	$array	Array to be flattened
-	 *	@return	array	Flattened array
+	 * @param	array	$array	Array to be flattened
+	 * @return	array	Flattened array
 	 */
 	public static function flattenArrayIndexed($array) {
 		if (!is_array($array)) {
@@ -644,10 +648,10 @@ class PHPExcel_Calculation_Functions {
 
 
 	/**
-	 *	Convert an array to a single scalar value by extracting the first element
+	 * Convert an array to a single scalar value by extracting the first element
 	 *
-	 *	@param	mixed		$value		Array or scalar value
-	 *	@return	mixed
+	 * @param	mixed		$value		Array or scalar value
+	 * @return	mixed
 	 */
 	public static function flattenSingleValue($value = '') {
 		while (is_array($value)) {
@@ -746,6 +750,12 @@ if (!function_exists('money_format')) {
 		}
 		$space = $locale["{$letter}_sep_by_space"] ? ' ' : '';
 
+		if (!isset($locale['mon_decimal_point']) || empty($locale['mon_decimal_point'])) {
+			$locale['mon_decimal_point'] = (!isset($locale['decimal_point']) || empty($locale['decimal_point'])) ?
+											$locale['decimal_point'] :
+											'.';
+		}
+
 		$number = number_format($number, $right, $locale['mon_decimal_point'], $flags['nogroup'] ? '' : $locale['mon_thousands_sep'] );
 		$number = explode($locale['mon_decimal_point'], $number);
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Logical.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Logical.php
index 427cc343afa..80f2a2650d9 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Logical.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Logical.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -41,50 +41,50 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Logical {
 
 	/**
-	 *	TRUE
+	 * TRUE
 	 *
-	 *	Returns the boolean TRUE.
+	 * Returns the boolean TRUE.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=TRUE()
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@return	boolean		True
+	 * @access	public
+	 * @category Logical Functions
+	 * @return	boolean		True
 	 */
 	public static function TRUE() {
-		return true;
+		return TRUE;
 	}	//	function TRUE()
 
 
 	/**
-	 *	FALSE
+	 * FALSE
 	 *
-	 *	Returns the boolean FALSE.
+	 * Returns the boolean FALSE.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=FALSE()
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@return	boolean		False
+	 * @access	public
+	 * @category Logical Functions
+	 * @return	boolean		False
 	 */
 	public static function FALSE() {
-		return false;
+		return FALSE;
 	}	//	function FALSE()
 
 
 	/**
-	 *	LOGICAL_AND
+	 * LOGICAL_AND
 	 *
-	 *	Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
+	 * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=AND(logical1[,logical2[, ...]])
 	 *
 	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
@@ -95,19 +95,19 @@ class PHPExcel_Calculation_Logical {
 	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
 	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	boolean		The logical AND of the arguments.
+	 * @access	public
+	 * @category Logical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	boolean		The logical AND of the arguments.
 	 */
 	public static function LOGICAL_AND() {
 		// Return value
-		$returnValue = True;
+		$returnValue = TRUE;
 
 		// Loop through the arguments
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = 0;
-		foreach ($aArgs as $arg) {
+		$argCount = -1;
+		foreach ($aArgs as $argCount => $arg) {
 			// Is it a boolean value?
 			if (is_bool($arg)) {
 				$returnValue = $returnValue && $arg;
@@ -116,19 +116,18 @@ class PHPExcel_Calculation_Logical {
 			} elseif (is_string($arg)) {
 				$arg = strtoupper($arg);
 				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = true;
+					$arg = TRUE;
 				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = false;
+					$arg = FALSE;
 				} else {
 					return PHPExcel_Calculation_Functions::VALUE();
 				}
 				$returnValue = $returnValue && ($arg != 0);
 			}
-			++$argCount;
 		}
 
 		// Return
-		if ($argCount == 0) {
+		if ($argCount < 0) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		return $returnValue;
@@ -136,11 +135,11 @@ class PHPExcel_Calculation_Logical {
 
 
 	/**
-	 *	LOGICAL_OR
+	 * LOGICAL_OR
 	 *
-	 *	Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
+	 * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=OR(logical1[,logical2[, ...]])
 	 *
 	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
@@ -151,19 +150,19 @@ class PHPExcel_Calculation_Logical {
 	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
 	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	boolean		The logical OR of the arguments.
+	 * @access	public
+	 * @category Logical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	boolean		The logical OR of the arguments.
 	 */
 	public static function LOGICAL_OR() {
 		// Return value
-		$returnValue = False;
+		$returnValue = FALSE;
 
 		// Loop through the arguments
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = 0;
-		foreach ($aArgs as $arg) {
+		$argCount = -1;
+		foreach ($aArgs as $argCount => $arg) {
 			// Is it a boolean value?
 			if (is_bool($arg)) {
 				$returnValue = $returnValue || $arg;
@@ -172,19 +171,18 @@ class PHPExcel_Calculation_Logical {
 			} elseif (is_string($arg)) {
 				$arg = strtoupper($arg);
 				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = true;
+					$arg = TRUE;
 				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = false;
+					$arg = FALSE;
 				} else {
 					return PHPExcel_Calculation_Functions::VALUE();
 				}
 				$returnValue = $returnValue || ($arg != 0);
 			}
-			++$argCount;
 		}
 
 		// Return
-		if ($argCount == 0) {
+		if ($argCount < 0) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
 		return $returnValue;
@@ -192,11 +190,11 @@ class PHPExcel_Calculation_Logical {
 
 
 	/**
-	 *	NOT
+	 * NOT
 	 *
-	 *	Returns the boolean inverse of the argument.
+	 * Returns the boolean inverse of the argument.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=NOT(logical)
 	 *
 	 *		The argument must evaluate to a logical value such as TRUE or FALSE
@@ -206,19 +204,19 @@ class PHPExcel_Calculation_Logical {
 	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
 	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@param	mixed		$logical	A value or expression that can be evaluated to TRUE or FALSE
-	 *	@return	boolean		The boolean inverse of the argument.
+	 * @access	public
+	 * @category Logical Functions
+	 * @param	mixed		$logical	A value or expression that can be evaluated to TRUE or FALSE
+	 * @return	boolean		The boolean inverse of the argument.
 	 */
-	public static function NOT($logical) {
+	public static function NOT($logical=FALSE) {
 		$logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
 		if (is_string($logical)) {
 			$logical = strtoupper($logical);
 			if (($logical == 'TRUE') || ($logical == PHPExcel_Calculation::getTRUE())) {
-				return false;
+				return FALSE;
 			} elseif (($logical == 'FALSE') || ($logical == PHPExcel_Calculation::getFALSE())) {
-				return true;
+				return TRUE;
 			} else {
 				return PHPExcel_Calculation_Functions::VALUE();
 			}
@@ -228,11 +226,11 @@ class PHPExcel_Calculation_Logical {
 	}	//	function NOT()
 
 	/**
-	 *	STATEMENT_IF
+	 * STATEMENT_IF
 	 *
-	 *	Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
+	 * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=IF(condition[,returnIfTrue[,returnIfFalse]])
 	 *
 	 *		Condition is any value or expression that can be evaluated to TRUE or FALSE.
@@ -252,33 +250,33 @@ class PHPExcel_Calculation_Logical {
 	 *			If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
 	 *			ReturnIfFalse can be another formula.
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@param	mixed	$condition		Condition to evaluate
-	 *	@param	mixed	$returnIfTrue	Value to return when condition is true
-	 *	@param	mixed	$returnIfFalse	Optional value to return when condition is false
-	 *	@return	mixed	The value of returnIfTrue or returnIfFalse determined by condition
+	 * @access	public
+	 * @category Logical Functions
+	 * @param	mixed	$condition		Condition to evaluate
+	 * @param	mixed	$returnIfTrue	Value to return when condition is true
+	 * @param	mixed	$returnIfFalse	Optional value to return when condition is false
+	 * @return	mixed	The value of returnIfTrue or returnIfFalse determined by condition
 	 */
-	public static function STATEMENT_IF($condition = true, $returnIfTrue = 0, $returnIfFalse = False) {
-		$condition		= (is_null($condition))		? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
+	public static function STATEMENT_IF($condition = TRUE, $returnIfTrue = 0, $returnIfFalse = FALSE) {
+		$condition		= (is_null($condition))		? TRUE :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
 		$returnIfTrue	= (is_null($returnIfTrue))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
-		$returnIfFalse	= (is_null($returnIfFalse))	? False :	PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
+		$returnIfFalse	= (is_null($returnIfFalse))	? FALSE :	PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
 
-		return ($condition ? $returnIfTrue : $returnIfFalse);
+		return ($condition) ? $returnIfTrue : $returnIfFalse;
 	}	//	function STATEMENT_IF()
 
 
 	/**
-	 *	IFERROR
+	 * IFERROR
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=IFERROR(testValue,errorpart)
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@param	mixed	$testValue	Value to check, is also the value returned when no error
-	 *	@param	mixed	$errorpart	Value to return when testValue is an error condition
-	 *	@return	mixed	The value of errorpart or testValue determined by error condition
+	 * @access	public
+	 * @category Logical Functions
+	 * @param	mixed	$testValue	Value to check, is also the value returned when no error
+	 * @param	mixed	$errorpart	Value to return when testValue is an error condition
+	 * @return	mixed	The value of errorpart or testValue determined by error condition
 	 */
 	public static function IFERROR($testValue = '', $errorpart = '') {
 		$testValue	= (is_null($testValue))	? '' :	PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/LookupRef.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/LookupRef.php
index 2c3371b5c7a..c8246903f2e 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/LookupRef.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/LookupRef.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -41,28 +41,31 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	CELL_ADDRESS
+	 * CELL_ADDRESS
 	 *
-	 *	Creates a cell address as text, given specified row and column numbers.
+	 * Creates a cell address as text, given specified row and column numbers.
 	 *
-	 *	@param	row				Row number to use in the cell reference
-	 *	@param	column			Column number to use in the cell reference
-	 *	@param	relativity		Flag indicating the type of reference to return
+	 * Excel Function:
+	 *		=ADDRESS(row, column, [relativity], [referenceStyle], [sheetText])
+	 *
+	 * @param	row				Row number to use in the cell reference
+	 * @param	column			Column number to use in the cell reference
+	 * @param	relativity		Flag indicating the type of reference to return
 	 *								1 or omitted	Absolute
 	 *								2				Absolute row; relative column
 	 *								3				Relative row; absolute column
 	 *								4				Relative
-	 *	@param	referenceStyle	A logical value that specifies the A1 or R1C1 reference style.
+	 * @param	referenceStyle	A logical value that specifies the A1 or R1C1 reference style.
 	 *								TRUE or omitted		CELL_ADDRESS returns an A1-style reference
 	 *								FALSE				CELL_ADDRESS returns an R1C1-style reference
-	 *	@param	sheetText		Optional Name of worksheet to use
-	 *	@return	string
+	 * @param	sheetText		Optional Name of worksheet to use
+	 * @return	string
 	 */
 	public static function CELL_ADDRESS($row, $column, $relativity=1, $referenceStyle=True, $sheetText='') {
 		$row		= PHPExcel_Calculation_Functions::flattenSingleValue($row);
@@ -93,15 +96,18 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	COLUMN
+	 * COLUMN
 	 *
-	 *	Returns the column number of the given cell reference
-	 *	If the cell reference is a range of cells, COLUMN returns the column numbers of each column in the reference as a horizontal array.
-	 *	If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
+	 * Returns the column number of the given cell reference
+	 * If the cell reference is a range of cells, COLUMN returns the column numbers of each column in the reference as a horizontal array.
+	 * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
 	 *		reference of the cell in which the COLUMN function appears; otherwise this function returns 0.
 	 *
-	 *	@param	cellAddress		A reference to a range of cells for which you want the column numbers
-	 *	@return	integer or array of integer
+	 * Excel Function:
+	 *		=COLUMN([cellAddress])
+	 *
+	 * @param	cellAddress		A reference to a range of cells for which you want the column numbers
+	 * @return	integer or array of integer
 	 */
 	public static function COLUMN($cellAddress=Null) {
 		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
@@ -133,12 +139,15 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	COLUMNS
+	 * COLUMNS
 	 *
-	 *	Returns the number of columns in an array or reference.
+	 * Returns the number of columns in an array or reference.
 	 *
-	 *	@param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of columns
-	 *	@return	integer
+	 * Excel Function:
+	 *		=COLUMNS(cellAddress)
+	 *
+	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of columns
+	 * @return	integer			The number of columns in cellAddress
 	 */
 	public static function COLUMNS($cellAddress=Null) {
 		if (is_null($cellAddress) || $cellAddress === '') {
@@ -161,15 +170,18 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	ROW
+	 * ROW
 	 *
-	 *	Returns the row number of the given cell reference
-	 *	If the cell reference is a range of cells, ROW returns the row numbers of each row in the reference as a vertical array.
-	 *	If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
+	 * Returns the row number of the given cell reference
+	 * If the cell reference is a range of cells, ROW returns the row numbers of each row in the reference as a vertical array.
+	 * If cell reference is omitted, and the function is being called through the calculation engine, then it is assumed to be the
 	 *		reference of the cell in which the ROW function appears; otherwise this function returns 0.
 	 *
-	 *	@param	cellAddress		A reference to a range of cells for which you want the row numbers
-	 *	@return	integer or array of integer
+	 * Excel Function:
+	 *		=ROW([cellAddress])
+	 *
+	 * @param	cellAddress		A reference to a range of cells for which you want the row numbers
+	 * @return	integer or array of integer
 	 */
 	public static function ROW($cellAddress=Null) {
 		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
@@ -202,12 +214,15 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	ROWS
+	 * ROWS
 	 *
-	 *	Returns the number of rows in an array or reference.
+	 * Returns the number of rows in an array or reference.
 	 *
-	 *	@param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
-	 *	@return	integer
+	 * Excel Function:
+	 *		=ROWS(cellAddress)
+	 *
+	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
+	 * @return	integer			The number of rows in cellAddress
 	 */
 	public static function ROWS($cellAddress=Null) {
 		if (is_null($cellAddress) || $cellAddress === '') {
@@ -229,16 +244,16 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	HYPERLINK
+	 * HYPERLINK
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		=HYPERLINK(linkURL,displayName)
 	 *
-	 *	@access	public
-	 *	@category Logical Functions
-	 *	@param	string	$linkURL		Value to check, is also the value returned when no error
-	 *	@param	string	$displayName	Value to return when testValue is an error condition
-	 *	@return	mixed	The value of errorpart or testValue determined by error condition
+	 * @access	public
+	 * @category Logical Functions
+	 * @param	string	$linkURL		Value to check, is also the value returned when no error
+	 * @param	string	$displayName	Value to return when testValue is an error condition
+	 * @return	mixed	The value of $displayName (or $linkURL if $displayName was blank)
 	 */
 	public static function HYPERLINK($linkURL = '', $displayName = null, PHPExcel_Cell $pCell = null) {
 		$args = func_get_args();
@@ -262,12 +277,21 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	INDIRECT
+	 * INDIRECT
 	 *
-	 *	Returns the number of rows in an array or reference.
+	 * Returns the reference specified by a text string.
+	 * References are immediately evaluated to display their contents.
+	 *
+	 * Excel Function:
+	 *		=INDIRECT(cellAddress)
+	 *
+	 * NOTE - INDIRECT() does not yet support the optional a1 parameter introduced in Excel 2010
+	 *
+	 * @param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
+	 * @return	mixed			The cells referenced by cellAddress
+	 *
+	 * @todo	Support for the optional a1 parameter introduced in Excel 2010
 	 *
-	 *	@param	cellAddress		An array or array formula, or a reference to a range of cells for which you want the number of rows
-	 *	@return	integer
 	 */
 	public static function INDIRECT($cellAddress=Null, PHPExcel_Cell $pCell = null) {
 		$cellAddress	= PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
@@ -283,7 +307,19 @@ class PHPExcel_Calculation_LookupRef {
 
 		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
 			((!is_null($cellAddress2)) && (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
-			return PHPExcel_Calculation_Functions::REF();
+
+			if (!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
+				return PHPExcel_Calculation_Functions::REF();
+			}
+
+			if (strpos($cellAddress,'!') !== false) {
+				list($sheetName,$cellAddress) = explode('!',$cellAddress);
+				$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
+			} else {
+				$pSheet = $pCell->getParent();
+			}
+
+			return PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, False);
 		}
 
 		if (strpos($cellAddress,'!') !== false) {
@@ -298,26 +334,29 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	OFFSET
+	 * OFFSET
 	 *
-	 *	Returns a reference to a range that is a specified number of rows and columns from a cell or range of cells.
-	 *	The reference that is returned can be a single cell or a range of cells. You can specify the number of rows and
-	 *	the number of columns to be returned.
+	 * Returns a reference to a range that is a specified number of rows and columns from a cell or range of cells.
+	 * The reference that is returned can be a single cell or a range of cells. You can specify the number of rows and
+	 * the number of columns to be returned.
 	 *
-	 *	@param	cellAddress		The reference from which you want to base the offset. Reference must refer to a cell or
+	 * Excel Function:
+	 *		=OFFSET(cellAddress, rows, cols, [height], [width])
+	 *
+	 * @param	cellAddress		The reference from which you want to base the offset. Reference must refer to a cell or
 	 *								range of adjacent cells; otherwise, OFFSET returns the #VALUE! error value.
-	 *	@param	rows			The number of rows, up or down, that you want the upper-left cell to refer to.
+	 * @param	rows			The number of rows, up or down, that you want the upper-left cell to refer to.
 	 *								Using 5 as the rows argument specifies that the upper-left cell in the reference is
 	 *								five rows below reference. Rows can be positive (which means below the starting reference)
 	 *								or negative (which means above the starting reference).
-	 *	@param	cols			The number of columns, to the left or right, that you want the upper-left cell of the result
+	 * @param	cols			The number of columns, to the left or right, that you want the upper-left cell of the result
 	 *								to refer to. Using 5 as the cols argument specifies that the upper-left cell in the
 	 *								reference is five columns to the right of reference. Cols can be positive (which means
 	 *								to the right of the starting reference) or negative (which means to the left of the
 	 *								starting reference).
-	 *	@param	height			The height, in number of rows, that you want the returned reference to be. Height must be a positive number.
-	 *	@param	width			The width, in number of columns, that you want the returned reference to be. Width must be a positive number.
-	 *	@return	string			A reference to a cell or range of cells
+	 * @param	height			The height, in number of rows, that you want the returned reference to be. Height must be a positive number.
+	 * @param	width			The width, in number of columns, that you want the returned reference to be. Width must be a positive number.
+	 * @return	string			A reference to a cell or range of cells
 	 */
 	public static function OFFSET($cellAddress=Null,$rows=0,$columns=0,$height=null,$width=null) {
 		$rows		= PHPExcel_Calculation_Functions::flattenSingleValue($rows);
@@ -387,6 +426,24 @@ class PHPExcel_Calculation_LookupRef {
 	}	//	function OFFSET()
 
 
+	/**
+	 * CHOOSE
+	 *
+	 * Uses lookup_value to return a value from the list of value arguments.
+	 * Use CHOOSE to select one of up to 254 values based on the lookup_value.
+	 *
+	 * Excel Function:
+	 *		=CHOOSE(index_num, value1, [value2], ...)
+	 *
+	 * @param	index_num		Specifies which value argument is selected.
+	 *							Index_num must be a number between 1 and 254, or a formula or reference to a cell containing a number
+	 *								between 1 and 254.
+	 * @param	value1...		Value1 is required, subsequent values are optional.
+	 *							Between 1 to 254 value arguments from which CHOOSE selects a value or an action to perform based on
+	 *								index_num. The arguments can be numbers, cell references, defined names, formulas, functions, or
+	 *								text.
+	 * @return	mixed			The selected value
+	 */
 	public static function CHOOSE() {
 		$chooseArgs = func_get_args();
 		$chosenEntry = PHPExcel_Calculation_Functions::flattenArray(array_shift($chooseArgs));
@@ -414,14 +471,17 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	MATCH
+	 * MATCH
 	 *
-	 *	The MATCH function searches for a specified item in a range of cells
+	 * The MATCH function searches for a specified item in a range of cells
 	 *
-	 *	@param	lookup_value	The value that you want to match in lookup_array
-	 *	@param	lookup_array	The range of cells being searched
-	 *	@param	match_type		The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
-	 *	@return	integer			The relative position of the found item
+	 * Excel Function:
+	 *		=MATCH(lookup_value, lookup_array, [match_type])
+	 *
+	 * @param	lookup_value	The value that you want to match in lookup_array
+	 * @param	lookup_array	The range of cells being searched
+	 * @param	match_type		The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
+	 * @return	integer			The relative position of the found item
 	 */
 	public static function MATCH($lookup_value, $lookup_array, $match_type=1) {
 		$lookup_array = PHPExcel_Calculation_Functions::flattenArray($lookup_array);
@@ -524,15 +584,17 @@ class PHPExcel_Calculation_LookupRef {
 
 
 	/**
-	 *	INDEX
+	 * INDEX
 	 *
 	 * Uses an index to choose a value from a reference or array
-	 * implemented: Return the value of a specified cell or array of cells	Array form
-	 * not implemented: Return a reference to specified cells	Reference form
 	 *
-	 * @param	range_array	a range of cells or an array constant
-	 * @param	row_num		selects the row in array from which to return a value. If row_num is omitted, column_num is required.
-	 * @param	column_num	selects the column in array from which to return a value. If column_num is omitted, row_num is required.
+	 * Excel Function:
+	 *		=INDEX(range_array, row_num, [column_num])
+	 *
+	 * @param	range_array		A range of cells or an array constant
+	 * @param	row_num			The row in array from which to return a value. If row_num is omitted, column_num is required.
+	 * @param	column_num		The column in array from which to return a value. If column_num is omitted, row_num is required.
+	 * @return	mixed			the value of a specified cell or array of cells
 	 */
 	public static function INDEX($arrayValues,$rowNum = 0,$columnNum = 0) {
 
@@ -635,7 +697,7 @@ class PHPExcel_Calculation_LookupRef {
 		}
 
 		// index_number must be less than or equal to the number of columns in lookup_array
-		if ((!is_array($lookup_array)) || (count($lookup_array) < 1)) {
+		if ((!is_array($lookup_array)) || (empty($lookup_array))) {
 			return PHPExcel_Calculation_Functions::REF();
 		} else {
 			$f = array_keys($lookup_array);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/MathTrig.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/MathTrig.php
index 35530274dfc..79c573b2774 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/MathTrig.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/MathTrig.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -41,7 +41,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_MathTrig {
 
@@ -61,7 +61,7 @@ class PHPExcel_Calculation_MathTrig {
 				}
 			}
 		}
-		if (count($factorArray) > 0) {
+		if (!empty($factorArray)) {
 			rsort($factorArray);
 			return $factorArray;
 		} else {
@@ -76,61 +76,79 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	ATAN2
+	 * ATAN2
 	 *
-	 *	This function calculates the arc tangent of the two variables x and y. It is similar to
+	 * This function calculates the arc tangent of the two variables x and y. It is similar to
 	 *		calculating the arc tangent of y � x, except that the signs of both arguments are used
 	 *		to determine the quadrant of the result.
-	 *	The arctangent is the angle from the x-axis to a line containing the origin (0, 0) and a
+	 * The arctangent is the angle from the x-axis to a line containing the origin (0, 0) and a
 	 *		point with coordinates (xCoordinate, yCoordinate). The angle is given in radians between
 	 *		-pi and pi, excluding -pi.
 	 *
-	 *	Note that the Excel ATAN2() function accepts its arguments in the reverse order to the standard
+	 * Note that the Excel ATAN2() function accepts its arguments in the reverse order to the standard
 	 *		PHP atan2() function, so we need to reverse them here before calling the PHP atan() function.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		ATAN2(xCoordinate,yCoordinate)
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	float	$xCoordinate		The x-coordinate of the point.
-	 *	@param	float	$yCoordinate		The y-coordinate of the point.
-	 *	@return	float	The inverse tangent of the specified x- and y-coordinates.
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$xCoordinate		The x-coordinate of the point.
+	 * @param	float	$yCoordinate		The y-coordinate of the point.
+	 * @return	float	The inverse tangent of the specified x- and y-coordinates.
 	 */
-	public static function ATAN2($xCoordinate, $yCoordinate) {
-		$xCoordinate	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($xCoordinate);
-		$yCoordinate	= (float) PHPExcel_Calculation_Functions::flattenSingleValue($yCoordinate);
+	public static function ATAN2($xCoordinate = NULL, $yCoordinate = NULL) {
+		$xCoordinate	= PHPExcel_Calculation_Functions::flattenSingleValue($xCoordinate);
+		$yCoordinate	= PHPExcel_Calculation_Functions::flattenSingleValue($yCoordinate);
 
-		if (($xCoordinate == 0) && ($yCoordinate == 0)) {
-			return PHPExcel_Calculation_Functions::DIV0();
+		$xCoordinate	= ($xCoordinate !== NULL)	? $xCoordinate : 0.0;
+		$yCoordinate	= ($yCoordinate !== NULL)	? $yCoordinate : 0.0;
+
+		if (((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
+			((is_numeric($yCoordinate)))  || (is_bool($yCoordinate))) {
+			$xCoordinate	= (float) $xCoordinate;
+			$yCoordinate	= (float) $yCoordinate;
+
+			if (($xCoordinate == 0) && ($yCoordinate == 0)) {
+				return PHPExcel_Calculation_Functions::DIV0();
+			}
+
+			return atan2($yCoordinate, $xCoordinate);
 		}
-
-		return atan2($yCoordinate, $xCoordinate);
-	}	//	function REVERSE_ATAN2()
+		return PHPExcel_Calculation_Functions::VALUE();
+	}	//	function ATAN2()
 
 
 	/**
-	 *	CEILING
+	 * CEILING
 	 *
-	 *	Returns number rounded up, away from zero, to the nearest multiple of significance.
+	 * Returns number rounded up, away from zero, to the nearest multiple of significance.
+	 *		For example, if you want to avoid using pennies in your prices and your product is
+	 *		priced at $4.42, use the formula =CEILING(4.42,0.05) to round prices up to the
+	 *		nearest nickel.
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@param	float	$significance	Significance
-	 *	@return	float	Rounded Number
+	 * Excel Function:
+	 *		CEILING(number[,significance])
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$number			The number you want to round.
+	 * @param	float	$significance	The multiple to which you want to round.
+	 * @return	float	Rounded Number
 	 */
-	public static function CEILING($number,$significance=null) {
+	public static function CEILING($number, $significance = NULL) {
 		$number			= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 		$significance	= PHPExcel_Calculation_Functions::flattenSingleValue($significance);
 
-		if ((is_null($significance)) && (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
+		if ((is_null($significance)) &&
+			(PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
 			$significance = $number/abs($number);
 		}
 
 		if ((is_numeric($number)) && (is_numeric($significance))) {
-			if (self::SIGN($number) == self::SIGN($significance)) {
-				if ($significance == 0.0) {
-					return 0;
-				}
+			if ($significance == 0.0) {
+				return 0.0;
+			} elseif (self::SIGN($number) == self::SIGN($significance)) {
 				return ceil($number / $significance) * $significance;
 			} else {
 				return PHPExcel_Calculation_Functions::NaN();
@@ -141,16 +159,21 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	COMBIN
+	 * COMBIN
 	 *
-	 *	Returns the number of combinations for a given number of items. Use COMBIN to
-	 *	determine the total possible number of groups for a given number of items.
+	 * Returns the number of combinations for a given number of items. Use COMBIN to
+	 *		determine the total possible number of groups for a given number of items.
 	 *
-	 *	@param	int		$numObjs	Number of different objects
-	 *	@param	int		$numInSet	Number of objects in each combination
-	 *	@return	int		Number of combinations
+	 * Excel Function:
+	 *		COMBIN(numObjs,numInSet)
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	int		$numObjs	Number of different objects
+	 * @param	int		$numInSet	Number of objects in each combination
+	 * @return	int		Number of combinations
 	 */
-	public static function COMBIN($numObjs,$numInSet) {
+	public static function COMBIN($numObjs, $numInSet) {
 		$numObjs	= PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
 		$numInSet	= PHPExcel_Calculation_Functions::flattenSingleValue($numInSet);
 
@@ -167,19 +190,32 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	EVEN
+	 * EVEN
 	 *
-	 *	Returns number rounded up to the nearest even integer.
+	 * Returns number rounded up to the nearest even integer.
+	 * You can use this function for processing items that come in twos. For example,
+	 *		a packing crate accepts rows of one or two items. The crate is full when
+	 *		the number of items, rounded up to the nearest two, matches the crate's
+	 *		capacity.
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@return	int		Rounded Number
+	 * Excel Function:
+	 *		EVEN(number)
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$number			Number to round
+	 * @return	int		Rounded Number
 	 */
 	public static function EVEN($number) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 
 		if (is_null($number)) {
 			return 0;
-		} elseif (is_numeric($number)) {
+		} elseif (is_bool($number)) {
+			$number = (int) $number;
+		}
+
+		if (is_numeric($number)) {
 			$significance = 2 * self::SIGN($number);
 			return (int) self::CEILING($number,$significance);
 		}
@@ -188,12 +224,18 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	FACT
+	 * FACT
 	 *
-	 *	Returns the factorial of a number.
+	 * Returns the factorial of a number.
+	 * The factorial of a number is equal to 1*2*3*...* number.
 	 *
-	 *	@param	float	$factVal	Factorial Value
-	 *	@return	int		Factorial
+	 * Excel Function:
+	 *		FACT(factVal)
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$factVal	Factorial Value
+	 * @return	int		Factorial
 	 */
 	public static function FACT($factVal) {
 		$factVal	= PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
@@ -220,17 +262,23 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	FACTDOUBLE
+	 * FACTDOUBLE
 	 *
-	 *	Returns the double factorial of a number.
+	 * Returns the double factorial of a number.
 	 *
-	 *	@param	float	$factVal	Factorial Value
-	 *	@return	int		Double Factorial
+	 * Excel Function:
+	 *		FACTDOUBLE(factVal)
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$factVal	Factorial Value
+	 * @return	int		Double Factorial
 	 */
 	public static function FACTDOUBLE($factVal) {
-		$factLoop	= floor(PHPExcel_Calculation_Functions::flattenSingleValue($factVal));
+		$factLoop	= PHPExcel_Calculation_Functions::flattenSingleValue($factVal);
 
 		if (is_numeric($factLoop)) {
+			$factLoop	= floor($factLoop);
 			if ($factVal < 0) {
 				return PHPExcel_Calculation_Functions::NaN();
 			}
@@ -246,15 +294,20 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	FLOOR
+	 * FLOOR
 	 *
-	 *	Rounds number down, toward zero, to the nearest multiple of significance.
+	 * Rounds number down, toward zero, to the nearest multiple of significance.
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@param	float	$significance	Significance
-	 *	@return	float	Rounded Number
+	 * Excel Function:
+	 *		FLOOR(number[,significance])
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$number			Number to round
+	 * @param	float	$significance	Significance
+	 * @return	float	Rounded Number
 	 */
-	public static function FLOOR($number,$significance=null) {
+	public static function FLOOR($number, $significance = NULL) {
 		$number			= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 		$significance	= PHPExcel_Calculation_Functions::flattenSingleValue($significance);
 
@@ -277,26 +330,41 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	GCD
+	 * GCD
 	 *
-	 *	Returns the greatest common divisor of a series of numbers
+	 * Returns the greatest common divisor of a series of numbers.
+	 * The greatest common divisor is the largest integer that divides both
+	 *		number1 and number2 without a remainder.
 	 *
-	 *	@param	$array	Values to calculate the Greatest Common Divisor
-	 *	@return	int		Greatest Common Divisor
+	 * Excel Function:
+	 *		GCD(number1[,number2[, ...]])
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed	$arg,...		Data values
+	 * @return	integer					Greatest Common Divisor
 	 */
 	public static function GCD() {
 		$returnValue = 1;
-		$allPoweredFactors = array();
+		$allValuesFactors = array();
 		// Loop through arguments
 		foreach(PHPExcel_Calculation_Functions::flattenArray(func_get_args()) as $value) {
-			if ($value == 0) {
-				break;
+			if (!is_numeric($value)) {
+				return PHPExcel_Calculation_Functions::VALUE();
+			} elseif ($value == 0) {
+				continue;
+			} elseif($value < 0) {
+				return PHPExcel_Calculation_Functions::NaN();
 			}
 			$myFactors = self::_factors($value);
 			$myCountedFactors = array_count_values($myFactors);
 			$allValuesFactors[] = $myCountedFactors;
 		}
 		$allValuesCount = count($allValuesFactors);
+		if ($allValuesCount == 0) {
+			return 0;
+		}
+
 		$mergedArray = $allValuesFactors[0];
 		for ($i=1;$i < $allValuesCount; ++$i) {
 			$mergedArray = array_intersect_key($mergedArray,$allValuesFactors[$i]);
@@ -338,16 +406,26 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	INT
+	 * INT
 	 *
-	 *	Casts a floating point value to an integer
+	 * Casts a floating point value to an integer
 	 *
-	 *	@param	float	$number			Number to cast to an integer
-	 *	@return	integer	Integer value
+	 * Excel Function:
+	 *		INT(number)
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$number			Number to cast to an integer
+	 * @return	integer	Integer value
 	 */
 	public static function INT($number) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 
+		if (is_null($number)) {
+			return 0;
+		} elseif (is_bool($number)) {
+			return (int) $number;
+		}
 		if (is_numeric($number)) {
 			return (int) floor($number);
 		}
@@ -356,12 +434,20 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	LCM
+	 * LCM
 	 *
-	 *	Returns the lowest common multiplier of a series of numbers
+	 * Returns the lowest common multiplier of a series of numbers
+	 * The least common multiple is the smallest positive integer that is a multiple
+	 * of all integer arguments number1, number2, and so on. Use LCM to add fractions
+	 * with different denominators.
 	 *
-	 *	@param	$array	Values to calculate the Lowest Common Multiplier
-	 *	@return	int		Lowest Common Multiplier
+	 * Excel Function:
+	 *		LCM(number1[,number2[, ...]])
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed	$arg,...		Data values
+	 * @return	int		Lowest Common Multiplier
 	 */
 	public static function LCM() {
 		$returnValue = 1;
@@ -400,23 +486,27 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	LOG_BASE
+	 * LOG_BASE
 	 *
-	 *	Returns the logarithm of a number to a specified base. The default base is 10.
+	 * Returns the logarithm of a number to a specified base. The default base is 10.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		LOG(number[,base])
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	float	$value		The positive real number for which you want the logarithm
-	 *	@param	float	$base		The base of the logarithm. If base is omitted, it is assumed to be 10.
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	float	$value		The positive real number for which you want the logarithm
+	 * @param	float	$base		The base of the logarithm. If base is omitted, it is assumed to be 10.
+	 * @return	float
 	 */
-	public static function LOG_BASE($number, $base=10) {
+	public static function LOG_BASE($number = NULL, $base = 10) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 		$base	= (is_null($base))	? 10 :	(float) PHPExcel_Calculation_Functions::flattenSingleValue($base);
 
+		if ((!is_numeric($base)) || (!is_numeric($number)))
+			return PHPExcel_Calculation_Functions::VALUE();
+		if (($base <= 0) || ($number <= 0))
+			return PHPExcel_Calculation_Functions::NaN();
 		return log($number, $base);
 	}	//	function LOG_BASE()
 
@@ -424,6 +514,13 @@ class PHPExcel_Calculation_MathTrig {
 	/**
 	 * MDETERM
 	 *
+	 * Returns the matrix determinant of an array.
+	 *
+	 * Excel Function:
+	 *		MDETERM(array)
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
 	 * @param	array	$matrixValues	A matrix of values
 	 * @return	float
 	 */
@@ -433,6 +530,7 @@ class PHPExcel_Calculation_MathTrig {
 
 		$row = $maxColumn = 0;
 		foreach($matrixValues as $matrixRow) {
+			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
 			$column = 0;
 			foreach($matrixRow as $matrixCell) {
 				if ((is_string($matrixCell)) || ($matrixCell === null)) {
@@ -458,6 +556,13 @@ class PHPExcel_Calculation_MathTrig {
 	/**
 	 * MINVERSE
 	 *
+	 * Returns the inverse matrix for the matrix stored in an array.
+	 *
+	 * Excel Function:
+	 *		MINVERSE(array)
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
 	 * @param	array	$matrixValues	A matrix of values
 	 * @return	array
 	 */
@@ -467,6 +572,7 @@ class PHPExcel_Calculation_MathTrig {
 
 		$row = $maxColumn = 0;
 		foreach($matrixValues as $matrixRow) {
+			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
 			$column = 0;
 			foreach($matrixRow as $matrixCell) {
 				if ((is_string($matrixCell)) || ($matrixCell === null)) {
@@ -503,6 +609,7 @@ class PHPExcel_Calculation_MathTrig {
 
 		$rowA = 0;
 		foreach($matrixData1 as $matrixRow) {
+			if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
 			$columnA = 0;
 			foreach($matrixRow as $matrixCell) {
 				if ((is_string($matrixCell)) || ($matrixCell === null)) {
@@ -517,6 +624,7 @@ class PHPExcel_Calculation_MathTrig {
 			$matrixA = new PHPExcel_Shared_JAMA_Matrix($matrixAData);
 			$rowB = 0;
 			foreach($matrixData2 as $matrixRow) {
+				if (!is_array($matrixRow)) { $matrixRow = array($matrixRow); }
 				$columnB = 0;
 				foreach($matrixRow as $matrixCell) {
 					if ((is_string($matrixCell)) || ($matrixCell === null)) {
@@ -564,13 +672,13 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	MROUND
+	 * MROUND
 	 *
-	 *	Rounds a number to the nearest multiple of a specified value
+	 * Rounds a number to the nearest multiple of a specified value
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@param	int		$multiple		Multiple to which you want to round $number
-	 *	@return	float	Rounded Number
+	 * @param	float	$number			Number to round
+	 * @param	int		$multiple		Multiple to which you want to round $number
+	 * @return	float	Rounded Number
 	 */
 	public static function MROUND($number,$multiple) {
 		$number		= PHPExcel_Calculation_Functions::flattenSingleValue($number);
@@ -591,12 +699,12 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	MULTINOMIAL
+	 * MULTINOMIAL
 	 *
-	 *	Returns the ratio of the factorial of a sum of values to the product of factorials.
+	 * Returns the ratio of the factorial of a sum of values to the product of factorials.
 	 *
-	 *	@param	array of mixed		Data Series
-	 *	@return	float
+	 * @param	array of mixed		Data Series
+	 * @return	float
 	 */
 	public static function MULTINOMIAL() {
 		$summer = 0;
@@ -625,19 +733,23 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	ODD
+	 * ODD
 	 *
-	 *	Returns number rounded up to the nearest odd integer.
+	 * Returns number rounded up to the nearest odd integer.
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@return	int		Rounded Number
+	 * @param	float	$number			Number to round
+	 * @return	int		Rounded Number
 	 */
 	public static function ODD($number) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 
 		if (is_null($number)) {
 			return 1;
-		} elseif (is_numeric($number)) {
+		} elseif (is_bool($number)) {
+			$number = (int) $number;
+		}
+
+		if (is_numeric($number)) {
 			$significance = self::SIGN($number);
 			if ($significance == 0) {
 				return 1;
@@ -655,40 +767,43 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	POWER
+	 * POWER
 	 *
-	 *	Computes x raised to the power y.
+	 * Computes x raised to the power y.
 	 *
-	 *	@param	float		$x
-	 *	@param	float		$y
-	 *	@return	float
+	 * @param	float		$x
+	 * @param	float		$y
+	 * @return	float
 	 */
 	public static function POWER($x = 0, $y = 2) {
 		$x	= PHPExcel_Calculation_Functions::flattenSingleValue($x);
 		$y	= PHPExcel_Calculation_Functions::flattenSingleValue($y);
 
 		// Validate parameters
-		if ($x == 0 && $y <= 0) {
+		if ($x == 0.0 && $y == 0.0) {
+			return PHPExcel_Calculation_Functions::NaN();
+		} elseif ($x == 0.0 && $y < 0.0) {
 			return PHPExcel_Calculation_Functions::DIV0();
 		}
 
 		// Return
-		return pow($x, $y);
+		$result = pow($x, $y);
+		return (!is_nan($result) && !is_infinite($result)) ? $result : PHPExcel_Calculation_Functions::NaN();
 	}	//	function POWER()
 
 
 	/**
-	 *	PRODUCT
+	 * PRODUCT
 	 *
-	 *	PRODUCT returns the product of all the values and cells referenced in the argument list.
+	 * PRODUCT returns the product of all the values and cells referenced in the argument list.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		PRODUCT(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function PRODUCT() {
 		// Return value
@@ -715,18 +830,18 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	QUOTIENT
+	 * QUOTIENT
 	 *
-	 *	QUOTIENT function returns the integer portion of a division. Numerator is the divided number
+	 * QUOTIENT function returns the integer portion of a division. Numerator is the divided number
 	 *		and denominator is the divisor.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		QUOTIENT(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function QUOTIENT() {
 		// Return value
@@ -773,11 +888,12 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	public static function ROMAN($aValue, $style=0) {
-		$aValue	= (integer) PHPExcel_Calculation_Functions::flattenSingleValue($aValue);
+		$aValue	= PHPExcel_Calculation_Functions::flattenSingleValue($aValue);
 		$style	= (is_null($style))	? 0 :	(integer) PHPExcel_Calculation_Functions::flattenSingleValue($style);
 		if ((!is_numeric($aValue)) || ($aValue < 0) || ($aValue >= 4000)) {
 			return PHPExcel_Calculation_Functions::VALUE();
 		}
+		$aValue = (integer) $aValue;
 		if ($aValue == 0) {
 			return '';
 		}
@@ -801,20 +917,20 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	ROUNDUP
+	 * ROUNDUP
 	 *
-	 *	Rounds a number up to a specified number of decimal places
+	 * Rounds a number up to a specified number of decimal places
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@param	int		$digits			Number of digits to which you want to round $number
-	 *	@return	float	Rounded Number
+	 * @param	float	$number			Number to round
+	 * @param	int		$digits			Number of digits to which you want to round $number
+	 * @return	float	Rounded Number
 	 */
 	public static function ROUNDUP($number,$digits) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
 
 		if ((is_numeric($number)) && (is_numeric($digits))) {
-			$significance = pow(10,$digits);
+			$significance = pow(10,(int) $digits);
 			if ($number < 0.0) {
 				return floor($number * $significance) / $significance;
 			} else {
@@ -826,20 +942,20 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	ROUNDDOWN
+	 * ROUNDDOWN
 	 *
-	 *	Rounds a number down to a specified number of decimal places
+	 * Rounds a number down to a specified number of decimal places
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@param	int		$digits			Number of digits to which you want to round $number
-	 *	@return	float	Rounded Number
+	 * @param	float	$number			Number to round
+	 * @param	int		$digits			Number of digits to which you want to round $number
+	 * @return	float	Rounded Number
 	 */
 	public static function ROUNDDOWN($number,$digits) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
 
 		if ((is_numeric($number)) && (is_numeric($digits))) {
-			$significance = pow(10,$digits);
+			$significance = pow(10,(int) $digits);
 			if ($number < 0.0) {
 				return ceil($number * $significance) / $significance;
 			} else {
@@ -851,15 +967,15 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	SERIESSUM
+	 * SERIESSUM
 	 *
-	 *	Returns the sum of a power series
+	 * Returns the sum of a power series
 	 *
-	 *	@param	float			$x	Input value to the power series
-	 *	@param	float			$n	Initial power to which you want to raise $x
-	 *	@param	float			$m	Step by which to increase $n for each term in the series
-	 *	@param	array of mixed		Data Series
-	 *	@return	float
+	 * @param	float			$x	Input value to the power series
+	 * @param	float			$n	Initial power to which you want to raise $x
+	 * @param	float			$m	Step by which to increase $n for each term in the series
+	 * @param	array of mixed		Data Series
+	 * @return	float
 	 */
 	public static function SERIESSUM() {
 		// Return value
@@ -891,17 +1007,19 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	SIGN
+	 * SIGN
 	 *
-	 *	Determines the sign of a number. Returns 1 if the number is positive, zero (0)
-	 *	if the number is 0, and -1 if the number is negative.
+	 * Determines the sign of a number. Returns 1 if the number is positive, zero (0)
+	 *		if the number is 0, and -1 if the number is negative.
 	 *
-	 *	@param	float	$number			Number to round
-	 *	@return	int		sign value
+	 * @param	float	$number			Number to round
+	 * @return	int		sign value
 	 */
 	public static function SIGN($number) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
 
+		if (is_bool($number))
+			return (int) $number;
 		if (is_numeric($number)) {
 			if ($number == 0.0) {
 				return 0;
@@ -913,12 +1031,12 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	SQRTPI
+	 * SQRTPI
 	 *
-	 *	Returns the square root of (number * pi).
+	 * Returns the square root of (number * pi).
 	 *
-	 *	@param	float	$number		Number
-	 *	@return	float	Square Root of Number * Pi
+	 * @param	float	$number		Number
+	 * @return	float	Square Root of Number * Pi
 	 */
 	public static function SQRTPI($number) {
 		$number	= PHPExcel_Calculation_Functions::flattenSingleValue($number);
@@ -934,14 +1052,14 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	SUBTOTAL
+	 * SUBTOTAL
 	 *
-	 *	Returns a subtotal in a list or database.
+	 * Returns a subtotal in a list or database.
 	 *
-	 *	@param	int		the number 1 to 11 that specifies which function to
+	 * @param	int		the number 1 to 11 that specifies which function to
 	 *					use in calculating subtotals within a list.
-	 *	@param	array of mixed		Data Series
-	 *	@return	float
+	 * @param	array of mixed		Data Series
+	 * @return	float
 	 */
 	public static function SUBTOTAL() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -991,17 +1109,17 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	SUM
+	 * SUM
 	 *
-	 *	SUM computes the sum of all the values and cells referenced in the argument list.
+	 * SUM computes the sum of all the values and cells referenced in the argument list.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		SUM(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function SUM() {
 		// Return value
@@ -1021,18 +1139,18 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	SUMIF
+	 * SUMIF
 	 *
-	 *	Counts the number of cells that contain numbers within the list of arguments
+	 * Counts the number of cells that contain numbers within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		SUMIF(value1[,value2[, ...]],condition)
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	string		$condition		The criteria that defines which cells will be summed.
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	string		$condition		The criteria that defines which cells will be summed.
+	 * @return	float
 	 */
 	public static function SUMIF($aArgs,$condition,$sumArgs = array()) {
 		// Return value
@@ -1040,7 +1158,7 @@ class PHPExcel_Calculation_MathTrig {
 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
 		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (count($sumArgs) == 0) {
+		if (empty($sumArgs)) {
 			$sumArgs = $aArgs;
 		}
 		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
@@ -1062,7 +1180,12 @@ class PHPExcel_Calculation_MathTrig {
 	/**
 	 * SUMPRODUCT
 	 *
-	 * @param	mixed	$value	Value to check
+	 * Excel Function:
+	 *		SUMPRODUCT(value1[,value2[, ...]])
+	 *
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
 	 * @return	float
 	 */
 	public static function SUMPRODUCT() {
@@ -1071,6 +1194,12 @@ class PHPExcel_Calculation_MathTrig {
 		$wrkArray = PHPExcel_Calculation_Functions::flattenArray(array_shift($arrayList));
 		$wrkCellCount = count($wrkArray);
 
+		for ($i=0; $i< $wrkCellCount; ++$i) {
+			if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
+				$wrkArray[$i] = 0;
+			}
+		}
+
 		foreach($arrayList as $matrixData) {
 			$array2 = PHPExcel_Calculation_Functions::flattenArray($matrixData);
 			$count = count($array2);
@@ -1079,10 +1208,10 @@ class PHPExcel_Calculation_MathTrig {
 			}
 
 			foreach ($array2 as $i => $val) {
-				if (((is_numeric($wrkArray[$i])) && (!is_string($wrkArray[$i]))) &&
-					((is_numeric($val)) && (!is_string($val)))) {
-					$wrkArray[$i] *= $val;
+				if ((!is_numeric($val)) || (is_string($val))) {
+					$val = 0;
 				}
+				$wrkArray[$i] *= $val;
 			}
 		}
 
@@ -1091,17 +1220,17 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	SUMSQ
+	 * SUMSQ
 	 *
-	 *	SUMSQ returns the sum of the squares of the arguments
+	 * SUMSQ returns the sum of the squares of the arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		SUMSQ(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function SUMSQ() {
 		// Return value
@@ -1208,34 +1337,30 @@ class PHPExcel_Calculation_MathTrig {
 
 
 	/**
-	 *	TRUNC
+	 * TRUNC
 	 *
-	 *	Truncates value to the number of fractional digits by number_digits.
+	 * Truncates value to the number of fractional digits by number_digits.
 	 *
-	 *	@param	float		$value
-	 *	@param	int			$number_digits
-	 *	@return	float		Truncated value
+	 * @param	float		$value
+	 * @param	int			$digits
+	 * @return	float		Truncated value
 	 */
-	public static function TRUNC($value = 0, $number_digits = 0) {
-		$value			= PHPExcel_Calculation_Functions::flattenSingleValue($value);
-		$number_digits	= PHPExcel_Calculation_Functions::flattenSingleValue($number_digits);
+	public static function TRUNC($value = 0, $digits = 0) {
+		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
+		$digits	= PHPExcel_Calculation_Functions::flattenSingleValue($digits);
 
 		// Validate parameters
-		if ($number_digits < 0) {
+		if ((!is_numeric($value)) || (!is_numeric($digits)))
 			return PHPExcel_Calculation_Functions::VALUE();
-		}
+		$digits	= floor($digits);
 
 		// Truncate
-		if ($number_digits > 0) {
-			$value = $value * pow(10, $number_digits);
-		}
-		$value = intval($value);
-		if ($number_digits > 0) {
-			$value = $value / pow(10, $number_digits);
-		}
+		$adjust = pow(10, $digits);
 
-		// Return
-		return $value;
+		if (($digits > 0) && (rtrim(intval((abs($value) - abs(intval($value))) * $adjust),'0') < $adjust/10))
+			return $value;
+
+		return (intval($value * $adjust)) / $adjust;
 	}	//	function TRUNC()
 
 }	//	class PHPExcel_Calculation_MathTrig
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Statistical.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Statistical.php
index 31c92964ade..2fbb163ef7b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/Statistical.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Statistical.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -57,7 +57,7 @@ define('SQRT2PI', 2.5066282746310005024157652848110452530069867406099);
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_Statistical {
 
@@ -140,11 +140,12 @@ class PHPExcel_Calculation_Statistical {
 	private static $_logBetaCache_result	= 0.0;
 
 	/**
-	 *	The natural logarithm of the beta function.
-	 *	@param p require p>0
-	 *	@param q require q>0
-	 *	@return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
-	 *	@author Jaco van Kooten
+	 * The natural logarithm of the beta function.
+	 *
+	 * @param p require p>0
+	 * @param q require q>0
+	 * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
+	 * @author Jaco van Kooten
 	 */
 	private static function _logBeta($p, $q) {
 		if ($p != self::$_logBetaCache_p || $q != self::$_logBetaCache_q) {
@@ -161,9 +162,9 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	Evaluates of continued fraction part of incomplete beta function.
-	 *	Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
-	 *	@author Jaco van Kooten
+	 * Evaluates of continued fraction part of incomplete beta function.
+	 * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
+	 * @author Jaco van Kooten
 	 */
 	private static function _betaFraction($x, $p, $q) {
 		$c = 1.0;
@@ -683,18 +684,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	AVEDEV
+	 * AVEDEV
 	 *
-	 *	Returns the average of the absolute deviations of data points from their mean.
-	 *	AVEDEV is a measure of the variability in a data set.
+	 * Returns the average of the absolute deviations of data points from their mean.
+	 * AVEDEV is a measure of the variability in a data set.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		AVEDEV(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function AVEDEV() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
@@ -732,17 +733,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	AVERAGE
+	 * AVERAGE
 	 *
-	 *	Returns the average (arithmetic mean) of the arguments
+	 * Returns the average (arithmetic mean) of the arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		AVERAGE(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function AVERAGE() {
 		$returnValue = $aCount = 0;
@@ -774,17 +775,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	AVERAGEA
+	 * AVERAGEA
 	 *
-	 *	Returns the average of its arguments, including numbers, text, and logical values
+	 * Returns the average of its arguments, including numbers, text, and logical values
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		AVERAGEA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function AVERAGEA() {
 		// Return value
@@ -822,18 +823,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	AVERAGEIF
+	 * AVERAGEIF
 	 *
-	 *	Returns the average value from a range of cells that contain numbers within the list of arguments
+	 * Returns the average value from a range of cells that contain numbers within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		AVERAGEIF(value1[,value2[, ...]],condition)
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	string		$condition		The criteria that defines which cells will be checked.
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	string		$condition		The criteria that defines which cells will be checked.
+	 * @return	float
 	 */
 	public static function AVERAGEIF($aArgs,$condition,$averageArgs = array()) {
 		// Return value
@@ -841,7 +842,7 @@ class PHPExcel_Calculation_Statistical {
 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
 		$averageArgs = PHPExcel_Calculation_Functions::flattenArray($averageArgs);
-		if (count($averageArgs) == 0) {
+		if (empty($averageArgs)) {
 			$averageArgs = $aArgs;
 		}
 		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
@@ -956,21 +957,21 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	BINOMDIST
+	 * BINOMDIST
 	 *
-	 *	Returns the individual term binomial distribution probability. Use BINOMDIST in problems with
-	 *	a fixed number of tests or trials, when the outcomes of any trial are only success or failure,
-	 *	when trials are independent, and when the probability of success is constant throughout the
-	 *	experiment. For example, BINOMDIST can calculate the probability that two of the next three
-	 *	babies born are male.
+	 * Returns the individual term binomial distribution probability. Use BINOMDIST in problems with
+	 *		a fixed number of tests or trials, when the outcomes of any trial are only success or failure,
+	 *		when trials are independent, and when the probability of success is constant throughout the
+	 *		experiment. For example, BINOMDIST can calculate the probability that two of the next three
+	 *		babies born are male.
 	 *
-	 *	@param	float		$value			Number of successes in trials
-	 *	@param	float		$trials			Number of trials
-	 *	@param	float		$probability	Probability of success on each trial
-	 *	@param	boolean		$cumulative
-	 *	@return	float
+	 * @param	float		$value			Number of successes in trials
+	 * @param	float		$trials			Number of trials
+	 * @param	float		$probability	Probability of success on each trial
+	 * @param	boolean		$cumulative
+	 * @return	float
 	 *
-	 *	@todo	Cumulative distribution function
+	 * @todo	Cumulative distribution function
 	 *
 	 */
 	public static function BINOMDIST($value, $trials, $probability, $cumulative) {
@@ -1002,13 +1003,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	CHIDIST
+	 * CHIDIST
 	 *
-	 *	Returns the one-tailed probability of the chi-squared distribution.
+	 * Returns the one-tailed probability of the chi-squared distribution.
 	 *
-	 *	@param	float		$value			Value for the function
-	 *	@param	float		$degrees		degrees of freedom
-	 *	@return	float
+	 * @param	float		$value			Value for the function
+	 * @param	float		$degrees		degrees of freedom
+	 * @return	float
 	 */
 	public static function CHIDIST($value, $degrees) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -1031,13 +1032,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	CHIINV
+	 * CHIINV
 	 *
-	 *	Returns the one-tailed probability of the chi-squared distribution.
+	 * Returns the one-tailed probability of the chi-squared distribution.
 	 *
-	 *	@param	float		$probability	Probability for the function
-	 *	@param	float		$degrees		degrees of freedom
-	 *	@return	float
+	 * @param	float		$probability	Probability for the function
+	 * @param	float		$degrees		degrees of freedom
+	 * @return	float
 	 */
 	public static function CHIINV($probability, $degrees) {
 		$probability	= PHPExcel_Calculation_Functions::flattenSingleValue($probability);
@@ -1116,13 +1117,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	CORREL
+	 * CORREL
 	 *
-	 *	Returns covariance, the average of the products of deviations for each data point pair.
+	 * Returns covariance, the average of the products of deviations for each data point pair.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@return	float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @return	float
 	 */
 	public static function CORREL($yValues,$xValues=null) {
 		if ((is_null($xValues)) || (!is_array($yValues)) || (!is_array($xValues))) {
@@ -1146,17 +1147,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	COUNT
+	 * COUNT
 	 *
-	 *	Counts the number of cells that contain numbers within the list of arguments
+	 * Counts the number of cells that contain numbers within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		COUNT(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	int
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	int
 	 */
 	public static function COUNT() {
 		// Return value
@@ -1181,17 +1182,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	COUNTA
+	 * COUNTA
 	 *
-	 *	Counts the number of cells that are not empty within the list of arguments
+	 * Counts the number of cells that are not empty within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		COUNTA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	int
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	int
 	 */
 	public static function COUNTA() {
 		// Return value
@@ -1212,17 +1213,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	COUNTBLANK
+	 * COUNTBLANK
 	 *
-	 *	Counts the number of empty cells within the list of arguments
+	 * Counts the number of empty cells within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		COUNTBLANK(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	int
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	int
 	 */
 	public static function COUNTBLANK() {
 		// Return value
@@ -1243,18 +1244,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	COUNTIF
+	 * COUNTIF
 	 *
-	 *	Counts the number of cells that contain numbers within the list of arguments
+	 * Counts the number of cells that contain numbers within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		COUNTIF(value1[,value2[, ...]],condition)
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	string		$condition		The criteria that defines which cells will be counted.
-	 *	@return	int
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	string		$condition		The criteria that defines which cells will be counted.
+	 * @return	int
 	 */
 	public static function COUNTIF($aArgs,$condition) {
 		// Return value
@@ -1278,13 +1279,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	COVAR
+	 * COVAR
 	 *
-	 *	Returns covariance, the average of the products of deviations for each data point pair.
+	 * Returns covariance, the average of the products of deviations for each data point pair.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@return	float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @return	float
 	 */
 	public static function COVAR($yValues,$xValues) {
 		if (!self::_checkTrendArrays($yValues,$xValues)) {
@@ -1305,19 +1306,19 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	CRITBINOM
+	 * CRITBINOM
 	 *
-	 *	Returns the smallest value for which the cumulative binomial distribution is greater
-	 *	than or equal to a criterion value
+	 * Returns the smallest value for which the cumulative binomial distribution is greater
+	 *		than or equal to a criterion value
 	 *
-	 *	See http://support.microsoft.com/kb/828117/ for details of the algorithm used
+	 * See http://support.microsoft.com/kb/828117/ for details of the algorithm used
 	 *
-	 *	@param	float		$trials			number of Bernoulli trials
-	 *	@param	float		$probability	probability of a success on each trial
-	 *	@param	float		$alpha			criterion value
-	 *	@return	int
+	 * @param	float		$trials			number of Bernoulli trials
+	 * @param	float		$probability	probability of a success on each trial
+	 * @param	float		$alpha			criterion value
+	 * @return	int
 	 *
-	 *	@todo	Warning. This implementation differs from the algorithm detailed on the MS
+	 * @todo	Warning. This implementation differs from the algorithm detailed on the MS
 	 *			web site in that $CumPGuessMinus1 = $CumPGuess - 1 rather than $CumPGuess - $PGuess
 	 *			This eliminates a potential endless loop error, but may have an adverse affect on the
 	 *			accuracy of the function (although all my tests have so far returned correct results).
@@ -1415,17 +1416,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	DEVSQ
+	 * DEVSQ
 	 *
-	 *	Returns the sum of squares of deviations of data points from their sample mean.
+	 * Returns the sum of squares of deviations of data points from their sample mean.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		DEVSQ(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function DEVSQ() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
@@ -1464,16 +1465,16 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	EXPONDIST
+	 * EXPONDIST
 	 *
 	 *	Returns the exponential distribution. Use EXPONDIST to model the time between events,
-	 *	such as how long an automated bank teller takes to deliver cash. For example, you can
-	 *	use EXPONDIST to determine the probability that the process takes at most 1 minute.
+	 *		such as how long an automated bank teller takes to deliver cash. For example, you can
+	 *		use EXPONDIST to determine the probability that the process takes at most 1 minute.
 	 *
-	 *	@param	float		$value			Value of the function
-	 *	@param	float		$lambda			The parameter value
-	 *	@param	boolean		$cumulative
-	 *	@return	float
+	 * @param	float		$value			Value of the function
+	 * @param	float		$lambda			The parameter value
+	 * @param	boolean		$cumulative
+	 * @return	float
 	 */
 	public static function EXPONDIST($value, $lambda, $cumulative) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -1497,14 +1498,14 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	FISHER
+	 * FISHER
 	 *
-	 *	Returns the Fisher transformation at x. This transformation produces a function that
-	 *	is normally distributed rather than skewed. Use this function to perform hypothesis
-	 *	testing on the correlation coefficient.
+	 * Returns the Fisher transformation at x. This transformation produces a function that
+	 *		is normally distributed rather than skewed. Use this function to perform hypothesis
+	 *		testing on the correlation coefficient.
 	 *
-	 *	@param	float		$value
-	 *	@return	float
+	 * @param	float		$value
+	 * @return	float
 	 */
 	public static function FISHER($value) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -1520,14 +1521,14 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	FISHERINV
+	 * FISHERINV
 	 *
-	 *	Returns the inverse of the Fisher transformation. Use this transformation when
-	 *	analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
-	 *	FISHERINV(y) = x.
+	 * Returns the inverse of the Fisher transformation. Use this transformation when
+	 *		analyzing correlations between ranges or arrays of data. If y = FISHER(x), then
+	 *		FISHERINV(y) = x.
 	 *
-	 *	@param	float		$value
-	 *	@return	float
+	 * @param	float		$value
+	 * @return	float
 	 */
 	public static function FISHERINV($value) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -1540,14 +1541,14 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	FORECAST
+	 * FORECAST
 	 *
-	 *	Calculates, or predicts, a future value by using existing values. The predicted value is a y-value for a given x-value.
+	 * Calculates, or predicts, a future value by using existing values. The predicted value is a y-value for a given x-value.
 	 *
-	 *	@param	float				Value of X for which we want to find Y
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@return	float
+	 * @param	float				Value of X for which we want to find Y
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @return	float
 	 */
 	public static function FORECAST($xValue,$yValues,$xValues) {
 		$xValue	= PHPExcel_Calculation_Functions::flattenSingleValue($xValue);
@@ -1688,19 +1689,19 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	GEOMEAN
+	 * GEOMEAN
 	 *
-	 *	Returns the geometric mean of an array or range of positive data. For example, you
+	 * Returns the geometric mean of an array or range of positive data. For example, you
 	 *		can use GEOMEAN to calculate average growth rate given compound interest with
 	 *		variable rates.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		GEOMEAN(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function GEOMEAN() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -1717,15 +1718,15 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	GROWTH
+	 * GROWTH
 	 *
-	 *	Returns values along a predicted emponential trend
+	 * Returns values along a predicted emponential trend
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@param	array of mixed		Values of X for which we want to find Y
-	 *	@param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 *	@return	array of float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @param	array of mixed		Values of X for which we want to find Y
+	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
+	 * @return	array of float
 	 */
 	public static function GROWTH($yValues,$xValues=array(),$newValues=array(),$const=True) {
 		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
@@ -1734,7 +1735,7 @@ class PHPExcel_Calculation_Statistical {
 		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
 
 		$bestFitExponential = trendClass::calculate(trendClass::TREND_EXPONENTIAL,$yValues,$xValues,$const);
-		if (count($newValues) == 0) {
+		if (empty($newValues)) {
 			$newValues = $bestFitExponential->getXValues();
 		}
 
@@ -1748,18 +1749,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	HARMEAN
+	 * HARMEAN
 	 *
-	 *	Returns the harmonic mean of a data set. The harmonic mean is the reciprocal of the
+	 * Returns the harmonic mean of a data set. The harmonic mean is the reciprocal of the
 	 *		arithmetic mean of reciprocals.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		HARMEAN(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function HARMEAN() {
 		// Return value
@@ -1833,13 +1834,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	INTERCEPT
+	 * INTERCEPT
 	 *
-	 *	Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
+	 * Calculates the point at which a line will intersect the y-axis by using existing x-values and y-values.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@return	float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @return	float
 	 */
 	public static function INTERCEPT($yValues,$xValues) {
 		if (!self::_checkTrendArrays($yValues,$xValues)) {
@@ -1900,19 +1901,19 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	LARGE
+	 * LARGE
 	 *
-	 *	Returns the nth largest value in a data set. You can use this function to
+	 * Returns the nth largest value in a data set. You can use this function to
 	 *		select a value based on its relative standing.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		LARGE(value1[,value2[, ...]],entry)
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	int			$entry			Position (ordered from the largest) in the array or range of data to return
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	int			$entry			Position (ordered from the largest) in the array or range of data to return
+	 * @return	float
 	 *
 	 */
 	public static function LARGE() {
@@ -1942,16 +1943,16 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	LINEST
+	 * LINEST
 	 *
-	 *	Calculates the statistics for a line by using the "least squares" method to calculate a straight line that best fits your data,
+	 * Calculates the statistics for a line by using the "least squares" method to calculate a straight line that best fits your data,
 	 *		and then returns an array that describes the line.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 *	@param	boolean				A logical value specifying whether to return additional regression statistics.
-	 *	@return	array
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
+	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
+	 * @return	array
 	 */
 	public static function LINEST($yValues,$xValues=null,$const=True,$stats=False) {
 		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
@@ -1995,16 +1996,16 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	LOGEST
+	 * LOGEST
 	 *
-	 *	Calculates an exponential curve that best fits the X and Y data series,
+	 * Calculates an exponential curve that best fits the X and Y data series,
 	 *		and then returns an array that describes the line.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 *	@param	boolean				A logical value specifying whether to return additional regression statistics.
-	 *	@return	array
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
+	 * @param	boolean				A logical value specifying whether to return additional regression statistics.
+	 * @return	array
 	 */
 	public static function LOGEST($yValues,$xValues=null,$const=True,$stats=False) {
 		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
@@ -2105,18 +2106,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MAX
+	 * MAX
 	 *
-	 *	MAX returns the value of the element of the values passed that has the highest value,
+	 * MAX returns the value of the element of the values passed that has the highest value,
 	 *		with negative numbers considered smaller than positive numbers.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MAX(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function MAX() {
 		// Return value
@@ -2142,17 +2143,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MAXA
+	 * MAXA
 	 *
-	 *	Returns the greatest value in a list of arguments, including numbers, text, and logical values
+	 * Returns the greatest value in a list of arguments, including numbers, text, and logical values
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MAXA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function MAXA() {
 		// Return value
@@ -2183,18 +2184,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MAXIF
+	 * MAXIF
 	 *
-	 *	Counts the maximum value within a range of cells that contain numbers within the list of arguments
+	 * Counts the maximum value within a range of cells that contain numbers within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MAXIF(value1[,value2[, ...]],condition)
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	string		$condition		The criteria that defines which cells will be checked.
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	string		$condition		The criteria that defines which cells will be checked.
+	 * @return	float
 	 */
 	public static function MAXIF($aArgs,$condition,$sumArgs = array()) {
 		// Return value
@@ -2202,7 +2203,7 @@ class PHPExcel_Calculation_Statistical {
 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
 		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (count($sumArgs) == 0) {
+		if (empty($sumArgs)) {
 			$sumArgs = $aArgs;
 		}
 		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
@@ -2223,17 +2224,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MEDIAN
+	 * MEDIAN
 	 *
-	 *	Returns the median of the given numbers. The median is the number in the middle of a set of numbers.
+	 * Returns the median of the given numbers. The median is the number in the middle of a set of numbers.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MEDIAN(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function MEDIAN() {
 		// Return value
@@ -2267,18 +2268,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MIN
+	 * MIN
 	 *
-	 *	MIN returns the value of the element of the values passed that has the smallest value,
+	 * MIN returns the value of the element of the values passed that has the smallest value,
 	 *		with negative numbers considered smaller than positive numbers.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MIN(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function MIN() {
 		// Return value
@@ -2304,17 +2305,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MINA
+	 * MINA
 	 *
-	 *	Returns the smallest value in a list of arguments, including numbers, text, and logical values
+	 * Returns the smallest value in a list of arguments, including numbers, text, and logical values
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MINA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function MINA() {
 		// Return value
@@ -2345,18 +2346,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MINIF
+	 * MINIF
 	 *
-	 *	Returns the minimum value within a range of cells that contain numbers within the list of arguments
+	 * Returns the minimum value within a range of cells that contain numbers within the list of arguments
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MINIF(value1[,value2[, ...]],condition)
 	 *
-	 *	@access	public
-	 *	@category Mathematical and Trigonometric Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	string		$condition		The criteria that defines which cells will be checked.
-	 *	@return	float
+	 * @access	public
+	 * @category Mathematical and Trigonometric Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	string		$condition		The criteria that defines which cells will be checked.
+	 * @return	float
 	 */
 	public static function MINIF($aArgs,$condition,$sumArgs = array()) {
 		// Return value
@@ -2364,7 +2365,7 @@ class PHPExcel_Calculation_Statistical {
 
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray($aArgs);
 		$sumArgs = PHPExcel_Calculation_Functions::flattenArray($sumArgs);
-		if (count($sumArgs) == 0) {
+		if (empty($sumArgs)) {
 			$sumArgs = $aArgs;
 		}
 		$condition = PHPExcel_Calculation_Functions::_ifCondition($condition);
@@ -2419,17 +2420,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	MODE
+	 * MODE
 	 *
-	 *	Returns the most frequently occurring, or repetitive, value in an array or range of data
+	 * Returns the most frequently occurring, or repetitive, value in an array or range of data
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		MODE(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function MODE() {
 		// Return value
@@ -2446,7 +2447,7 @@ class PHPExcel_Calculation_Statistical {
 			}
 		}
 
-		if (count($mArgs) > 0) {
+		if (!empty($mArgs)) {
 			return self::_modeCalc($mArgs);
 		}
 
@@ -2456,18 +2457,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	NEGBINOMDIST
+	 * NEGBINOMDIST
 	 *
-	 *	Returns the negative binomial distribution. NEGBINOMDIST returns the probability that
-	 *	there will be number_f failures before the number_s-th success, when the constant
-	 *	probability of a success is probability_s. This function is similar to the binomial
-	 *	distribution, except that the number of successes is fixed, and the number of trials is
-	 *	variable. Like the binomial, trials are assumed to be independent.
+	 * Returns the negative binomial distribution. NEGBINOMDIST returns the probability that
+	 *		there will be number_f failures before the number_s-th success, when the constant
+	 *		probability of a success is probability_s. This function is similar to the binomial
+	 *		distribution, except that the number of successes is fixed, and the number of trials is
+	 *		variable. Like the binomial, trials are assumed to be independent.
 	 *
-	 *	@param	float		$failures		Number of Failures
-	 *	@param	float		$successes		Threshold number of Successes
-	 *	@param	float		$probability	Probability of success on each trial
-	 *	@return	float
+	 * @param	float		$failures		Number of Failures
+	 * @param	float		$successes		Threshold number of Successes
+	 * @param	float		$probability	Probability of success on each trial
+	 * @return	float
 	 *
 	 */
 	public static function NEGBINOMDIST($failures, $successes, $probability) {
@@ -2588,18 +2589,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	PERCENTILE
+	 * PERCENTILE
 	 *
-	 *	Returns the nth percentile of values in a range..
+	 * Returns the nth percentile of values in a range..
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		PERCENTILE(value1[,value2[, ...]],entry)
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	float		$entry			Percentile value in the range 0..1, inclusive.
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	float		$entry			Percentile value in the range 0..1, inclusive.
+	 * @return	float
 	 */
 	public static function PERCENTILE() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -2638,14 +2639,14 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	PERCENTRANK
+	 * PERCENTRANK
 	 *
-	 *	Returns the rank of a value in a data set as a percentage of the data set.
+	 * Returns the rank of a value in a data set as a percentage of the data set.
 	 *
-	 *	@param	array of number		An array of, or a reference to, a list of numbers.
-	 *	@param	number				The number whose rank you want to find.
-	 *	@param	number				The number of significant digits for the returned percentage value.
-	 *	@return	float
+	 * @param	array of number		An array of, or a reference to, a list of numbers.
+	 * @param	number				The number whose rank you want to find.
+	 * @param	number				The number of significant digits for the returned percentage value.
+	 * @return	float
 	 */
 	public static function PERCENTRANK($valueSet,$value,$significance=3) {
 		$valueSet	= PHPExcel_Calculation_Functions::flattenArray($valueSet);
@@ -2684,17 +2685,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	PERMUT
+	 * PERMUT
 	 *
-	 *	Returns the number of permutations for a given number of objects that can be
-	 *	selected from number objects. A permutation is any set or subset of objects or
-	 *	events where internal order is significant. Permutations are different from
-	 *	combinations, for which the internal order is not significant. Use this function
-	 *	for lottery-style probability calculations.
+	 * Returns the number of permutations for a given number of objects that can be
+	 *		selected from number objects. A permutation is any set or subset of objects or
+	 *		events where internal order is significant. Permutations are different from
+	 *		combinations, for which the internal order is not significant. Use this function
+	 *		for lottery-style probability calculations.
 	 *
-	 *	@param	int		$numObjs	Number of different objects
-	 *	@param	int		$numInSet	Number of objects in each permutation
-	 *	@return	int		Number of permutations
+	 * @param	int		$numObjs	Number of different objects
+	 * @param	int		$numInSet	Number of objects in each permutation
+	 * @return	int		Number of permutations
 	 */
 	public static function PERMUT($numObjs,$numInSet) {
 		$numObjs	= PHPExcel_Calculation_Functions::flattenSingleValue($numObjs);
@@ -2749,18 +2750,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	QUARTILE
+	 * QUARTILE
 	 *
-	 *	Returns the quartile of a data set.
+	 * Returns the quartile of a data set.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		QUARTILE(value1[,value2[, ...]],entry)
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	int			$entry			Quartile value in the range 1..3, inclusive.
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	int			$entry			Quartile value in the range 1..3, inclusive.
+	 * @return	float
 	 */
 	public static function QUARTILE() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -2780,14 +2781,14 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	RANK
+	 * RANK
 	 *
-	 *	Returns the rank of a number in a list of numbers.
+	 * Returns the rank of a number in a list of numbers.
 	 *
-	 *	@param	number				The number whose rank you want to find.
-	 *	@param	array of number		An array of, or a reference to, a list of numbers.
-	 *	@param	mixed				Order to sort the values in the value set
-	 *	@return	float
+	 * @param	number				The number whose rank you want to find.
+	 * @param	array of number		An array of, or a reference to, a list of numbers.
+	 * @param	mixed				Order to sort the values in the value set
+	 * @return	float
 	 */
 	public static function RANK($value,$valueSet,$order=0) {
 		$value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -2815,13 +2816,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	RSQ
+	 * RSQ
 	 *
-	 *	Returns the square of the Pearson product moment correlation coefficient through data points in known_y's and known_x's.
+	 * Returns the square of the Pearson product moment correlation coefficient through data points in known_y's and known_x's.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@return	float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @return	float
 	 */
 	public static function RSQ($yValues,$xValues) {
 		if (!self::_checkTrendArrays($yValues,$xValues)) {
@@ -2880,13 +2881,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	SLOPE
+	 * SLOPE
 	 *
-	 *	Returns the slope of the linear regression line through data points in known_y's and known_x's.
+	 * Returns the slope of the linear regression line through data points in known_y's and known_x's.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@return	float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @return	float
 	 */
 	public static function SLOPE($yValues,$xValues) {
 		if (!self::_checkTrendArrays($yValues,$xValues)) {
@@ -2907,19 +2908,19 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	SMALL
+	 * SMALL
 	 *
-	 *	Returns the nth smallest value in a data set. You can use this function to
+	 * Returns the nth smallest value in a data set. You can use this function to
 	 *		select a value based on its relative standing.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		SMALL(value1[,value2[, ...]],entry)
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	int			$entry			Position (ordered from the smallest) in the array or range of data to return
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	int			$entry			Position (ordered from the smallest) in the array or range of data to return
+	 * @return	float
 	 */
 	public static function SMALL() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -2948,14 +2949,14 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	STANDARDIZE
+	 * STANDARDIZE
 	 *
-	 *	Returns a normalized value from a distribution characterized by mean and standard_dev.
+	 * Returns a normalized value from a distribution characterized by mean and standard_dev.
 	 *
-	 *	@param	float	$value		Value to normalize
-	 *	@param	float	$mean		Mean Value
-	 *	@param	float	$stdDev		Standard Deviation
-	 *	@return	float	Standardized value
+	 * @param	float	$value		Value to normalize
+	 * @param	float	$mean		Mean Value
+	 * @param	float	$stdDev		Standard Deviation
+	 * @return	float	Standardized value
 	 */
 	public static function STANDARDIZE($value,$mean,$stdDev) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -2973,18 +2974,18 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	STDEV
+	 * STDEV
 	 *
-	 *	Estimates standard deviation based on a sample. The standard deviation is a measure of how
-	 *	widely values are dispersed from the average value (the mean).
+	 * Estimates standard deviation based on a sample. The standard deviation is a measure of how
+	 *		widely values are dispersed from the average value (the mean).
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		STDEV(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function STDEV() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
@@ -3021,17 +3022,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	STDEVA
+	 * STDEVA
 	 *
-	 *	Estimates standard deviation based on a sample, including numbers, text, and logical values
+	 * Estimates standard deviation based on a sample, including numbers, text, and logical values
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		STDEVA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function STDEVA() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
@@ -3073,17 +3074,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	STDEVP
+	 * STDEVP
 	 *
-	 *	Calculates standard deviation based on the entire population
+	 * Calculates standard deviation based on the entire population
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		STDEVP(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function STDEVP() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
@@ -3120,17 +3121,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	STDEVPA
+	 * STDEVPA
 	 *
-	 *	Calculates standard deviation based on the entire population, including numbers, text, and logical values
+	 * Calculates standard deviation based on the entire population, including numbers, text, and logical values
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		STDEVPA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function STDEVPA() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArrayIndexed(func_get_args());
@@ -3172,13 +3173,13 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	STEYX
+	 * STEYX
 	 *
-	 *	Returns the standard error of the predicted y-value for each x in the regression.
+	 * Returns the standard error of the predicted y-value for each x in the regression.
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@return	float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @return	float
 	 */
 	public static function STEYX($yValues,$xValues) {
 		if (!self::_checkTrendArrays($yValues,$xValues)) {
@@ -3315,15 +3316,15 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	TREND
+	 * TREND
 	 *
-	 *	Returns values along a linear trend
+	 * Returns values along a linear trend
 	 *
-	 *	@param	array of mixed		Data Series Y
-	 *	@param	array of mixed		Data Series X
-	 *	@param	array of mixed		Values of X for which we want to find Y
-	 *	@param	boolean				A logical value specifying whether to force the intersect to equal 0.
-	 *	@return	array of float
+	 * @param	array of mixed		Data Series Y
+	 * @param	array of mixed		Data Series X
+	 * @param	array of mixed		Values of X for which we want to find Y
+	 * @param	boolean				A logical value specifying whether to force the intersect to equal 0.
+	 * @return	array of float
 	 */
 	public static function TREND($yValues,$xValues=array(),$newValues=array(),$const=True) {
 		$yValues = PHPExcel_Calculation_Functions::flattenArray($yValues);
@@ -3332,7 +3333,7 @@ class PHPExcel_Calculation_Statistical {
 		$const	= (is_null($const))	? True :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($const);
 
 		$bestFitLinear = trendClass::calculate(trendClass::TREND_LINEAR,$yValues,$xValues,$const);
-		if (count($newValues) == 0) {
+		if (empty($newValues)) {
 			$newValues = $bestFitLinear->getXValues();
 		}
 
@@ -3346,20 +3347,20 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	TRIMMEAN
+	 * TRIMMEAN
 	 *
-	 *	Returns the mean of the interior of a data set. TRIMMEAN calculates the mean
-	 *	taken by excluding a percentage of data points from the top and bottom tails
-	 *	of a data set.
+	 * Returns the mean of the interior of a data set. TRIMMEAN calculates the mean
+	 *		taken by excluding a percentage of data points from the top and bottom tails
+	 *		of a data set.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		TRIMEAN(value1[,value2[, ...]],$discard)
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@param	float		$discard		Percentage to discard
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @param	float		$discard		Percentage to discard
+	 * @return	float
 	 */
 	public static function TRIMMEAN() {
 		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -3391,17 +3392,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	VARFunc
+	 * VARFunc
 	 *
-	 *	Estimates variance based on a sample.
+	 * Estimates variance based on a sample.
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		VAR(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function VARFunc() {
 		// Return value
@@ -3433,17 +3434,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	VARA
+	 * VARA
 	 *
-	 *	Estimates variance based on a sample, including numbers, text, and logical values
+	 * Estimates variance based on a sample, including numbers, text, and logical values
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		VARA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function VARA() {
 		// Return value
@@ -3486,17 +3487,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	VARP
+	 * VARP
 	 *
-	 *	Calculates variance based on the entire population
+	 * Calculates variance based on the entire population
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		VARP(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function VARP() {
 		// Return value
@@ -3528,17 +3529,17 @@ class PHPExcel_Calculation_Statistical {
 
 
 	/**
-	 *	VARPA
+	 * VARPA
 	 *
-	 *	Calculates variance based on the entire population, including numbers, text, and logical values
+	 * Calculates variance based on the entire population, including numbers, text, and logical values
 	 *
-	 *	Excel Function:
+	 * Excel Function:
 	 *		VARPA(value1[,value2[, ...]])
 	 *
-	 *	@access	public
-	 *	@category Statistical Functions
-	 *	@param	mixed		$arg,...		Data values
-	 *	@return	float
+	 * @access	public
+	 * @category Statistical Functions
+	 * @param	mixed		$arg,...		Data values
+	 * @return	float
 	 */
 	public static function VARPA() {
 		// Return value
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/TextData.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/TextData.php
index 9916876257b..3289645f519 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Calculation/TextData.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/TextData.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
@@ -41,7 +41,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category	PHPExcel
  * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Calculation_TextData {
 
@@ -87,16 +87,16 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	TRIMNONPRINTABLE
+	 * TRIMNONPRINTABLE
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	string
+	 * @param	mixed	$value	Value to check
+	 * @return	string
 	 */
 	public static function TRIMNONPRINTABLE($stringValue = '') {
 		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
 
 		if (is_bool($stringValue)) {
-			$stringValue = ($stringValue) ? 'TRUE' : 'FALSE';
+			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (self::$_invalidChars == Null) {
@@ -106,23 +106,27 @@ class PHPExcel_Calculation_TextData {
 		if (is_string($stringValue) || is_numeric($stringValue)) {
 			return str_replace(self::$_invalidChars,'',trim($stringValue,"\x00..\x1F"));
 		}
-		return Null;
+		return NULL;
 	}	//	function TRIMNONPRINTABLE()
 
 
 	/**
-	 *	TRIMSPACES
+	 * TRIMSPACES
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	string
+	 * @param	mixed	$value	Value to check
+	 * @return	string
 	 */
 	public static function TRIMSPACES($stringValue = '') {
 		$stringValue	= PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
 
-		if (is_string($stringValue) || is_numeric($stringValue)) {
-			return trim(preg_replace('/  +/',' ',$stringValue));
+		if (is_bool($stringValue)) {
+			return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
-		return Null;
+
+		if (is_string($stringValue) || is_numeric($stringValue)) {
+			return trim(preg_replace('/ +/',' ',trim($stringValue,' ')));
+		}
+		return NULL;
 	}	//	function TRIMSPACES()
 
 
@@ -133,16 +137,14 @@ class PHPExcel_Calculation_TextData {
 	 * @return	int
 	 */
 	public static function ASCIICODE($characters) {
+		if (($characters === NULL) || ($characters === ''))
+			return PHPExcel_Calculation_Functions::VALUE();
 		$characters	= PHPExcel_Calculation_Functions::flattenSingleValue($characters);
 		if (is_bool($characters)) {
 			if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
 				$characters = (int) $characters;
 			} else {
-				if ($characters) {
-					$characters = 'True';
-				} else {
-					$characters = 'False';
-				}
+				$characters = ($characters) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 			}
 		}
 
@@ -173,11 +175,7 @@ class PHPExcel_Calculation_TextData {
 				if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
 					$arg = (int) $arg;
 				} else {
-					if ($arg) {
-						$arg = 'TRUE';
-					} else {
-						$arg = 'FALSE';
-					}
+					$arg = ($arg) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 				}
 			}
 			$returnValue .= $arg;
@@ -189,16 +187,16 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	DOLLAR
+	 * DOLLAR
 	 *
-	 *	This function converts a number to text using currency format, with the decimals rounded to the specified place.
-	 *	The format used is $#,##0.00_);($#,##0.00)..
+	 * This function converts a number to text using currency format, with the decimals rounded to the specified place.
+	 * The format used is $#,##0.00_);($#,##0.00)..
 	 *
-	 *	@param	float	$value			The value to format
-	 *	@param	int		$decimals		The number of digits to display to the right of the decimal point.
+	 * @param	float	$value			The value to format
+	 * @param	int		$decimals		The number of digits to display to the right of the decimal point.
 	 *									If decimals is negative, number is rounded to the left of the decimal point.
 	 *									If you omit decimals, it is assumed to be 2
-	 *	@return	string
+	 * @return	string
 	 */
 	public static function DOLLAR($value = 0, $decimals = 2) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -238,12 +236,15 @@ class PHPExcel_Calculation_TextData {
 
 		if (!is_bool($needle)) {
 			if (is_bool($haystack)) {
-				$haystack = ($haystack) ? 'TRUE' : 'FALSE';
+				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 			}
 
-			if (($offset > 0) && (strlen($haystack) > $offset)) {
+			if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
+				if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
+					return $offset;
+				}
 				if (function_exists('mb_strpos')) {
-					$pos = mb_strpos($haystack, $needle, --$offset,'UTF-8');
+					$pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
 				} else {
 					$pos = strpos($haystack, $needle, --$offset);
 				}
@@ -271,10 +272,13 @@ class PHPExcel_Calculation_TextData {
 
 		if (!is_bool($needle)) {
 			if (is_bool($haystack)) {
-				$haystack = ($haystack) ? 'TRUE' : 'FALSE';
+				$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 			}
 
-			if (($offset > 0) && (strlen($haystack) > $offset)) {
+			if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
+				if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
+					return $offset;
+				}
 				if (function_exists('mb_stripos')) {
 					$pos = mb_stripos($haystack, $needle, --$offset,'UTF-8');
 				} else {
@@ -290,15 +294,21 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	FIXEDFORMAT
+	 * FIXEDFORMAT
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
-	public static function FIXEDFORMAT($value,$decimals=2,$no_commas=false) {
+	public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = FALSE) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
 		$decimals	= PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
-		$no_commas		= PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
+		$no_commas	= PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
+
+		// Validate parameters
+		if (!is_numeric($value) || !is_numeric($decimals)) {
+			return PHPExcel_Calculation_Functions::NaN();
+		}
+		$decimals = floor($decimals);
 
 		$valueResult = round($value,$decimals);
 		if ($decimals < 0) { $decimals = 0; }
@@ -326,7 +336,7 @@ class PHPExcel_Calculation_TextData {
 		}
 
 		if (is_bool($value)) {
-			$value = ($value) ? 'TRUE' : 'FALSE';
+			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (function_exists('mb_substr')) {
@@ -338,12 +348,12 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	MID
+	 * MID
 	 *
-	 *	@param	string	$value	Value
-	 *	@param	int		$start	Start character
-	 *	@param	int		$chars	Number of characters
-	 *	@return	string
+	 * @param	string	$value	Value
+	 * @param	int		$start	Start character
+	 * @param	int		$chars	Number of characters
+	 * @return	string
 	 */
 	public static function MID($value = '', $start = 1, $chars = null) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -355,7 +365,7 @@ class PHPExcel_Calculation_TextData {
 		}
 
 		if (is_bool($value)) {
-			$value = ($value) ? 'TRUE' : 'FALSE';
+			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (function_exists('mb_substr')) {
@@ -367,11 +377,11 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	RIGHT
+	 * RIGHT
 	 *
-	 *	@param	string	$value	Value
-	 *	@param	int		$chars	Number of characters
-	 *	@return	string
+	 * @param	string	$value	Value
+	 * @param	int		$chars	Number of characters
+	 * @return	string
 	 */
 	public static function RIGHT($value = '', $chars = 1) {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
@@ -382,7 +392,7 @@ class PHPExcel_Calculation_TextData {
 		}
 
 		if (is_bool($value)) {
-			$value = ($value) ? 'TRUE' : 'FALSE';
+			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if ((function_exists('mb_substr')) && (function_exists('mb_strlen'))) {
@@ -404,7 +414,7 @@ class PHPExcel_Calculation_TextData {
 		$value		= PHPExcel_Calculation_Functions::flattenSingleValue($value);
 
 		if (is_bool($value)) {
-			$value = ($value) ? 'TRUE' : 'FALSE';
+			$value = ($value) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (function_exists('mb_strlen')) {
@@ -416,18 +426,18 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	LOWERCASE
+	 * LOWERCASE
 	 *
-	 *	Converts a string value to upper case.
+	 * Converts a string value to upper case.
 	 *
-	 *	@param	string		$mixedCaseString
-	 *	@return	string
+	 * @param	string		$mixedCaseString
+	 * @return	string
 	 */
 	public static function LOWERCASE($mixedCaseString) {
 		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
 		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? 'TRUE' : 'FALSE';
+			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (function_exists('mb_convert_case')) {
@@ -439,18 +449,18 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	UPPERCASE
+	 * UPPERCASE
 	 *
-	 *	Converts a string value to upper case.
+	 * Converts a string value to upper case.
 	 *
-	 *	@param	string		$mixedCaseString
-	 *	@return	string
+	 * @param	string		$mixedCaseString
+	 * @return	string
 	 */
 	public static function UPPERCASE($mixedCaseString) {
 		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
 		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? 'TRUE' : 'FALSE';
+			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (function_exists('mb_convert_case')) {
@@ -462,18 +472,18 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	PROPERCASE
+	 * PROPERCASE
 	 *
-	 *	Converts a string value to upper case.
+	 * Converts a string value to upper case.
 	 *
-	 *	@param	string		$mixedCaseString
-	 *	@return	string
+	 * @param	string		$mixedCaseString
+	 * @return	string
 	 */
 	public static function PROPERCASE($mixedCaseString) {
 		$mixedCaseString	= PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
 		if (is_bool($mixedCaseString)) {
-			$mixedCaseString = ($mixedCaseString) ? 'TRUE' : 'FALSE';
+			$mixedCaseString = ($mixedCaseString) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
 		}
 
 		if (function_exists('mb_convert_case')) {
@@ -485,12 +495,12 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	REPLACE
+	 * REPLACE
 	 *
-	 *	@param	string	$value	Value
-	 *	@param	int		$start	Start character
-	 *	@param	int		$chars	Number of characters
-	 *	@return	string
+	 * @param	string	$value	Value
+	 * @param	int		$start	Start character
+	 * @param	int		$chars	Number of characters
+	 * @return	string
 	 */
 	public static function REPLACE($oldText = '', $start = 1, $chars = null, $newText) {
 		$oldText	= PHPExcel_Calculation_Functions::flattenSingleValue($oldText);
@@ -506,13 +516,13 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	SUBSTITUTE
+	 * SUBSTITUTE
 	 *
-	 *	@param	string	$text		Value
-	 *	@param	string	$fromText	From Value
-	 *	@param	string	$toText		To Value
-	 *	@param	integer	$instance	Instance Number
-	 *	@return	string
+	 * @param	string	$text		Value
+	 * @param	string	$fromText	From Value
+	 * @param	string	$toText		To Value
+	 * @param	integer	$instance	Instance Number
+	 * @return	string
 	 */
 	public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0) {
 		$text		= PHPExcel_Calculation_Functions::flattenSingleValue($text);
@@ -548,15 +558,15 @@ class PHPExcel_Calculation_TextData {
 			}
 		}
 
-		return $left.$newText.$right;
+		return $text;
 	}	//	function SUBSTITUTE()
 
 
 	/**
-	 *	RETURNSTRING
+	 * RETURNSTRING
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
 	public static function RETURNSTRING($testValue = '') {
 		$testValue	= PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
@@ -569,10 +579,10 @@ class PHPExcel_Calculation_TextData {
 
 
 	/**
-	 *	TEXTFORMAT
+	 * TEXTFORMAT
 	 *
-	 *	@param	mixed	$value	Value to check
-	 *	@return	boolean
+	 * @param	mixed	$value	Value to check
+	 * @return	boolean
 	 */
 	public static function TEXTFORMAT($value,$format) {
 		$value	= PHPExcel_Calculation_Functions::flattenSingleValue($value);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Calculation/Token/Stack.php b/htdocs/includes/phpexcel/PHPExcel/Calculation/Token/Stack.php
new file mode 100644
index 00000000000..ea7efa0c923
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Calculation/Token/Stack.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Calculation
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version	1.7.8, 2012-10-12
+ */
+
+
+class PHPExcel_Calculation_Token_Stack {
+
+	private $_stack = array();
+	private $_count = 0;
+
+
+	public function count() {
+		return $this->_count;
+	}	//	function count()
+
+
+	public function push($type,$value,$reference=null) {
+		$this->_stack[$this->_count++] = array('type'		=> $type,
+											   'value'		=> $value,
+											   'reference'	=> $reference
+											  );
+		if ($type == 'Function') {
+			$localeFunction = PHPExcel_Calculation::_localeFunc($value);
+			if ($localeFunction != $value) {
+				$this->_stack[($this->_count - 1)]['localeValue'] = $localeFunction;
+			}
+		}
+	}	//	function push()
+
+
+	public function pop() {
+		if ($this->_count > 0) {
+			return $this->_stack[--$this->_count];
+		}
+		return null;
+	}	//	function pop()
+
+
+	public function last($n=1) {
+		if ($this->_count-$n < 0) {
+			return null;
+		}
+		return $this->_stack[$this->_count-$n];
+	}	//	function last()
+
+
+	function __construct() {
+	}
+
+}	//	class PHPExcel_Calculation_Token_Stack
diff --git a/htdocs/includes/phpexcel/PHPExcel/Cell.php b/htdocs/includes/phpexcel/PHPExcel/Cell.php
index 996d68aa754..75996f2942f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Cell.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Cell.php
@@ -1,107 +1,120 @@
 <?php
 /**
- * PHPExcel
+ *	PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ *	Copyright (c) 2006 - 2012 PHPExcel
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation; either
+ *	version 2.1 of the License, or (at your option) any later version.
  *
- * This library 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
- * Lesser General Public License for more details.
+ *	This library 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
+ *	Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *	You should have received a copy of the GNU Lesser General Public
+ *	License along with this library; if not, write to the Free Software
+ *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * @category	PHPExcel
- * @package		PHPExcel_Cell
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ *	@category	PHPExcel
+ *	@package	PHPExcel_Cell
+ *	@copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *	@license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ *	@version	1.7.8, 2012-10-12
  */
 
 
 /**
- * PHPExcel_Cell
+ *	PHPExcel_Cell
  *
- * @category   PHPExcel
- * @package	PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *	@category   PHPExcel
+ *	@package	PHPExcel_Cell
+ *	@copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Cell
 {
-	/**
-	 * Value binder to use
-	 *
-	 * @var PHPExcel_Cell_IValueBinder
-	 */
-	private static $_valueBinder = null;
 
 	/**
-	 * Column of the cell
+	 *  Default range variable constant
 	 *
-	 * @var string
+	 *  @var  string
+	 */
+	const DEFAULT_RANGE = 'A1:A1';
+
+	/**
+	 *	Value binder to use
+	 *
+	 *	@var	PHPExcel_Cell_IValueBinder
+	 */
+	private static $_valueBinder = NULL;
+
+	/**
+	 *	Column of the cell
+	 *
+	 *	@var	string
 	 */
 	private $_column;
 
 	/**
-	 * Row of the cell
+	 *	Row of the cell
 	 *
-	 * @var int
+	 *	@var	int
 	 */
 	private $_row;
 
 	/**
-	 * Value of the cell
+	 *	Value of the cell
 	 *
-	 * @var mixed
+	 *	@var	mixed
 	 */
 	private $_value;
 
 	/**
-	 * Calculated value of the cell (used for caching)
+	 *	Calculated value of the cell (used for caching)
+	 *	This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
+	 *		create the original spreadsheet file.
+	 *	Note that this value is not guaranteed to reflect the actual calculated value because it is
+	 *		possible that auto-calculation was disabled in the original spreadsheet, and underlying data
+	 *		values used by the formula have changed since it was last calculated.
 	 *
-	 * @var mixed
+	 *	@var mixed
 	 */
-	private $_calculatedValue = null;
+	private $_calculatedValue = NULL;
 
 	/**
-	 * Type of the cell data
+	 *	Type of the cell data
 	 *
-	 * @var string
+	 *	@var	string
 	 */
 	private $_dataType;
 
 	/**
-	 * Parent worksheet
+	 *	Parent worksheet
 	 *
-	 * @var PHPExcel_Worksheet
+	 *	@var	PHPExcel_Worksheet
 	 */
 	private $_parent;
 
 	/**
-	 * Index to cellXf
+	 *	Index to cellXf
 	 *
-	 * @var int
+	 *	@var	int
 	 */
 	private $_xfIndex;
 
 	/**
-	 * Attributes of the formula
-	 *
+	 *	Attributes of the formula
 	 *
 	 */
 	private $_formulaAttributes;
 
 
 	/**
-	 * Send notification to the cache controller
-	 * @return void
+	 *	Send notification to the cache controller
+	 *
+	 *	@return void
 	 **/
 	public function notifyCacheController() {
 		$this->_parent->getCellCacheController()->updateCacheData($this);
@@ -109,7 +122,7 @@ class PHPExcel_Cell
 	}
 
 	public function detach() {
-		$this->_parent = null;
+		$this->_parent = NULL;
 	}
 
 	public function attach($parent) {
@@ -118,16 +131,16 @@ class PHPExcel_Cell
 
 
 	/**
-	 * Create a new Cell
+	 *	Create a new Cell
 	 *
-	 * @param	string				$pColumn
-	 * @param	int				$pRow
-	 * @param	mixed				$pValue
-	 * @param	string				$pDataType
-	 * @param	PHPExcel_Worksheet	$pSheet
-	 * @throws	Exception
+	 *	@param	string				$pColumn
+	 *	@param	int					$pRow
+	 *	@param	mixed				$pValue
+	 *	@param	string				$pDataType
+	 *	@param	PHPExcel_Worksheet	$pSheet
+	 *	@throws	PHPExcel_Exception
 	 */
-	public function __construct($pColumn = 'A', $pRow = 1, $pValue = null, $pDataType = null, PHPExcel_Worksheet $pSheet = null)
+	public function __construct($pColumn = 'A', $pRow = 1, $pValue = NULL, $pDataType = NULL, PHPExcel_Worksheet $pSheet = NULL)
 	{
 		// Initialise cell coordinate
 		$this->_column = strtoupper($pColumn);
@@ -140,13 +153,13 @@ class PHPExcel_Cell
 		$this->_parent = $pSheet;
 
 		// Set datatype?
-		if ($pDataType !== null) {
+		if ($pDataType !== NULL) {
 			if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
 				$pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
 			$this->_dataType = $pDataType;
 		} else {
 			if (!self::getValueBinder()->bindValue($this, $pValue)) {
-				throw new Exception("Value could not be bound to cell.");
+				throw new PHPExcel_Exception("Value could not be bound to cell.");
 			}
 		}
 
@@ -155,9 +168,9 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get cell coordinate column
+	 *	Get cell coordinate column
 	 *
-	 * @return string
+	 *	@return	string
 	 */
 	public function getColumn()
 	{
@@ -165,9 +178,9 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get cell coordinate row
+	 *	Get cell coordinate row
 	 *
-	 * @return int
+	 *	@return	int
 	 */
 	public function getRow()
 	{
@@ -175,9 +188,9 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get cell coordinate
+	 *	Get cell coordinate
 	 *
-	 * @return string
+	 *	@return	string
 	 */
 	public function getCoordinate()
 	{
@@ -185,9 +198,9 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get cell value
+	 *	Get cell value
 	 *
-	 * @return mixed
+	 *	@return	mixed
 	 */
 	public function getValue()
 	{
@@ -195,42 +208,45 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get cell value with formatting
+	 *	Get cell value with formatting
 	 *
-	 * @return string
+	 *	@return	string
 	 */
 	public function getFormattedValue()
 	{
-		return PHPExcel_Style_NumberFormat::toFormattedString( $this->getCalculatedValue(),
-						$this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())->getNumberFormat()->getFormatCode()
-			   );
+		return (string) PHPExcel_Style_NumberFormat::toFormattedString(
+				$this->getCalculatedValue(),
+				$this->_parent->getParent()->getCellXfByIndex($this->getXfIndex())
+					->getNumberFormat()->getFormatCode()
+			);
 	}
 
 	/**
-	 * Set cell value
+	 *	Set cell value
 	 *
-	 * This clears the cell formula.
+	 *	Sets the value for a cell, automatically determining the datatype using the value binder
 	 *
-	 * @param mixed	$pValue					Value
-	 * @return PHPExcel_Cell
+	 *	@param	mixed	$pValue					Value
+	 *	@return	PHPExcel_Cell
+	 *	@throws	PHPExcel_Exception
 	 */
-	public function setValue($pValue = null)
+	public function setValue($pValue = NULL)
 	{
 		if (!self::getValueBinder()->bindValue($this, $pValue)) {
-			throw new Exception("Value could not be bound to cell.");
+			throw new PHPExcel_Exception("Value could not be bound to cell.");
 		}
 		return $this;
 	}
 
 	/**
-	 * Set cell value (with explicit data type given)
+	 *	Set the value for a cell, with the explicit data type passed to the method (bypassing any use of the value binder)
 	 *
-	 * @param mixed	$pValue			Value
-	 * @param string	$pDataType		Explicit data type
-	 * @return PHPExcel_Cell
-	 * @throws Exception
+	 *	@param	mixed	$pValue			Value
+	 *	@param	string	$pDataType		Explicit data type
+	 *	@return	PHPExcel_Cell
+	 *	@throws	PHPExcel_Exception
 	 */
-	public function setValueExplicit($pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
+	public function setValueExplicit($pValue = NULL, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
 	{
 		// set the value according to data type
 		switch ($pDataType) {
@@ -241,25 +257,20 @@ class PHPExcel_Cell
 			case PHPExcel_Cell_DataType::TYPE_INLINE:
 				$this->_value = PHPExcel_Cell_DataType::checkString($pValue);
 				break;
-
 			case PHPExcel_Cell_DataType::TYPE_NUMERIC:
 				$this->_value = (float)$pValue;
 				break;
-
 			case PHPExcel_Cell_DataType::TYPE_FORMULA:
 				$this->_value = (string)$pValue;
 				break;
-
 			case PHPExcel_Cell_DataType::TYPE_BOOL:
 				$this->_value = (bool)$pValue;
 				break;
-
 			case PHPExcel_Cell_DataType::TYPE_ERROR:
 				$this->_value = PHPExcel_Cell_DataType::checkErrorCode($pValue);
 				break;
-
 			default:
-				throw new Exception('Invalid datatype: ' . $pDataType);
+				throw new PHPExcel_Exception('Invalid datatype: ' . $pDataType);
 				break;
 		}
 
@@ -270,11 +281,14 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get calculated cell value
+	 *	Get calculated cell value
 	 *
-	 * @return mixed
+	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
+	 *
+	 *	@return	mixed
+	 *	@throws	PHPExcel_Exception
 	 */
-	public function getCalculatedValue($resetLog=true)
+	public function getCalculatedValue($resetLog = TRUE)
 	{
 //		echo 'Cell '.$this->getCoordinate().' value is a '.$this->_dataType.' with a value of '.$this->getValue().'<br />';
 		if ($this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) {
@@ -283,9 +297,17 @@ class PHPExcel_Cell
 				$result = PHPExcel_Calculation::getInstance()->calculateCellValue($this,$resetLog);
 //				echo $this->getCoordinate().' calculation result is '.$result.'<br />';
 			} catch ( Exception $ex ) {
+				if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->_calculatedValue !== NULL)) {
+//					echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().'<br />';
+					return $this->_calculatedValue; // Fallback for calculations referencing external files.
+				}
 //				echo 'Calculation Exception: '.$ex->getMessage().'<br />';
 				$result = '#N/A';
-				throw(new Exception($this->getParent()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()));
+				throw(
+					new PHPExcel_Exception(
+						$this->getParent()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
+					)
+				);
 			}
 
 			if ($result === '#Not Yet Implemented') {
@@ -296,33 +318,38 @@ class PHPExcel_Cell
 			return $result;
 		}
 
-//		if (is_null($this->_value)) {
+//		if ($this->_value === NULL) {
 //			echo 'Cell '.$this->getCoordinate().' has no value, formula or otherwise<br />';
-//			return null;
+//			return NULL;
 //		}
 //		echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />';
 		return $this->_value;
 	}
 
 	/**
-	 * Set calculated value (used for caching)
+	 *	Set old calculated value (cached)
 	 *
-	 * @param mixed $pValue	Value
-	 * @return PHPExcel_Cell
+	 *	@param	mixed $pValue	Value
+	 *	@return	PHPExcel_Cell
 	 */
-	public function setCalculatedValue($pValue = null)
+	public function setCalculatedValue($pValue = NULL)
 	{
-		if (!is_null($pValue)) {
-			$this->_calculatedValue = $pValue;
+		if ($pValue !== NULL) {
+			$this->_calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
 		}
 
 		return $this->notifyCacheController();
 	}
 
 	/**
-	 * Get old calculated value (cached)
+	 *	Get old calculated value (cached)
+	 *	This returns the value last calculated by MS Excel or whichever spreadsheet program was used to
+	 *		create the original spreadsheet file.
+	 *	Note that this value is not guaranteed to refelect the actual calculated value because it is
+	 *		possible that auto-calculation was disabled in the original spreadsheet, and underlying data
+	 *		values used by the formula have changed since it was last calculated.
 	 *
-	 * @return mixed
+	 *	@return	mixed
 	 */
 	public function getOldCalculatedValue()
 	{
@@ -330,9 +357,9 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get cell data type
+	 *	Get cell data type
 	 *
-	 * @return string
+	 *	@return string
 	 */
 	public function getDataType()
 	{
@@ -340,10 +367,10 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Set cell data type
+	 *	Set cell data type
 	 *
-	 * @param string $pDataType
-	 * @return PHPExcel_Cell
+	 *	@param	string $pDataType
+	 *	@return	PHPExcel_Cell
 	 */
 	public function setDataType($pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
 	{
@@ -356,44 +383,46 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Has Data validation?
+	 *	Does this cell contain Data validation rules?
 	 *
-	 * @return boolean
+	 *	@return	boolean
+	 *	@throws	PHPExcel_Exception
 	 */
 	public function hasDataValidation()
 	{
 		if (!isset($this->_parent)) {
-			throw new Exception('Cannot check for data validation when cell is not bound to a worksheet');
+			throw new PHPExcel_Exception('Cannot check for data validation when cell is not bound to a worksheet');
 		}
 
 		return $this->_parent->dataValidationExists($this->getCoordinate());
 	}
 
 	/**
-	 * Get Data validation
+	 *	Get Data validation rules
 	 *
-	 * @return PHPExcel_Cell_DataValidation
+	 *	@return	PHPExcel_Cell_DataValidation
+	 *	@throws	PHPExcel_Exception
 	 */
 	public function getDataValidation()
 	{
 		if (!isset($this->_parent)) {
-			throw new Exception('Cannot get data validation for cell that is not bound to a worksheet');
+			throw new PHPExcel_Exception('Cannot get data validation for cell that is not bound to a worksheet');
 		}
 
 		return $this->_parent->getDataValidation($this->getCoordinate());
 	}
 
 	/**
-	 * Set Data validation
+	 *	Set Data validation rules
 	 *
-	 * @param	PHPExcel_Cell_DataValidation	$pDataValidation
-	 * @throws	Exception
-	 * @return PHPExcel_Cell
+	 *	@param	PHPExcel_Cell_DataValidation	$pDataValidation
+	 *	@return	PHPExcel_Cell
+	 *	@throws	PHPExcel_Exception
 	 */
-	public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = null)
+	public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = NULL)
 	{
 		if (!isset($this->_parent)) {
-			throw new Exception('Cannot set data validation for cell that is not bound to a worksheet');
+			throw new PHPExcel_Exception('Cannot set data validation for cell that is not bound to a worksheet');
 		}
 
 		$this->_parent->setDataValidation($this->getCoordinate(), $pDataValidation);
@@ -402,45 +431,46 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Has Hyperlink
+	 *	Does this cell contain a Hyperlink?
 	 *
-	 * @return boolean
+	 *	@return boolean
+	 *	@throws	PHPExcel_Exception
 	 */
 	public function hasHyperlink()
 	{
 		if (!isset($this->_parent)) {
-			throw new Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
+			throw new PHPExcel_Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
 		}
 
 		return $this->_parent->hyperlinkExists($this->getCoordinate());
 	}
 
 	/**
-	 * Get Hyperlink
+	 *	Get Hyperlink
 	 *
-	 * @throws Exception
-	 * @return PHPExcel_Cell_Hyperlink
+	 *	@return	PHPExcel_Cell_Hyperlink
+	 *	@throws	PHPExcel_Exception
 	 */
 	public function getHyperlink()
 	{
 		if (!isset($this->_parent)) {
-			throw new Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
+			throw new PHPExcel_Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
 		}
 
 		return $this->_parent->getHyperlink($this->getCoordinate());
 	}
 
 	/**
-	 * Set Hyperlink
+	 *	Set Hyperlink
 	 *
-	 * @param	PHPExcel_Cell_Hyperlink	$pHyperlink
-	 * @throws	Exception
-	 * @return PHPExcel_Cell
+	 *	@param	PHPExcel_Cell_Hyperlink	$pHyperlink
+	 *	@return	PHPExcel_Cell
+	 *	@throws	PHPExcel_Exception
 	 */
-	public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = null)
+	public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = NULL)
 	{
 		if (!isset($this->_parent)) {
-			throw new Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
+			throw new PHPExcel_Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
 		}
 
 		$this->_parent->setHyperlink($this->getCoordinate(), $pHyperlink);
@@ -449,19 +479,19 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Get parent
+	 *	Get parent worksheet
 	 *
-	 * @return PHPExcel_Worksheet
+	 *	@return PHPExcel_Worksheet
 	 */
 	public function getParent() {
 		return $this->_parent;
 	}
 
 	/**
-	 * Re-bind parent
+	 *	Re-bind parent
 	 *
-	 * @param PHPExcel_Worksheet $parent
-	 * @return PHPExcel_Cell
+	 *	@param	PHPExcel_Worksheet $parent
+	 *	@return	PHPExcel_Cell
 	 */
 	public function rebindParent(PHPExcel_Worksheet $parent) {
 		$this->_parent = $parent;
@@ -470,17 +500,17 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Is cell in a specific range?
+	 *	Is cell in a specific range?
 	 *
-	 * @param	string	$pRange		Cell range (e.g. A1:A1)
-	 * @return	boolean
+	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
+	 *	@return	boolean
 	 */
 	public function isInRange($pRange = 'A1:A1')
 	{
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
+		list($rangeStart,$rangeEnd) = self::rangeBoundaries($pRange);
 
 		// Translate properties
-		$myColumn	= PHPExcel_Cell::columnIndexFromString($this->getColumn());
+		$myColumn	= self::columnIndexFromString($this->getColumn());
 		$myRow		= $this->getRow();
 
 		// Verify if cell is in range
@@ -490,75 +520,99 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Coordinate from string
+	 *	Coordinate from string
 	 *
-	 * @param	string	$pCoordinateString
-	 * @return	array	Array containing column and row (indexes 0 and 1)
-	 * @throws	Exception
+	 *	@param	string	$pCoordinateString
+	 *	@return	array	Array containing column and row (indexes 0 and 1)
+	 *	@throws	PHPExcel_Exception
 	 */
 	public static function coordinateFromString($pCoordinateString = 'A1')
 	{
 		if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
 			return array($matches[1],$matches[2]);
-		} elseif ((strpos($pCoordinateString,':') !== false) || (strpos($pCoordinateString,',') !== false)) {
-			throw new Exception('Cell coordinate string can not be a range of cells.');
+		} elseif ((strpos($pCoordinateString,':') !== FALSE) || (strpos($pCoordinateString,',') !== FALSE)) {
+			throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
 		} elseif ($pCoordinateString == '') {
-			throw new Exception('Cell coordinate can not be zero-length string.');
-		} else {
-			throw new Exception('Invalid cell coordinate '.$pCoordinateString);
+			throw new PHPExcel_Exception('Cell coordinate can not be zero-length string');
 		}
+
+		throw new PHPExcel_Exception('Invalid cell coordinate '.$pCoordinateString);
 	}
 
 	/**
-	 * Make string row, column or cell coordinate absolute
+	 *	Make string row, column or cell coordinate absolute
 	 *
-	 * @param	string	$pCoordinateString		e.g. 'A' or '1' or 'A1'
-	 * @return	string	Absolute coordinate		e.g. '$A' or '$1' or '$A$1'
-	 * @throws	Exception
+	 *	@param	string	$pCoordinateString		e.g. 'A' or '1' or 'A1'
+	 *					Note that this value can be a row or column reference as well as a cell reference
+	 *	@return	string	Absolute coordinate		e.g. '$A' or '$1' or '$A$1'
+	 *	@throws	PHPExcel_Exception
 	 */
 	public static function absoluteReference($pCoordinateString = 'A1')
 	{
-		if (strpos($pCoordinateString,':') === false && strpos($pCoordinateString,',') === false) {
+		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
+			// Split out any worksheet name from the reference
+			$worksheet = '';
+			$cellAddress = explode('!',$pCoordinateString);
+			if (count($cellAddress) > 1) {
+				list($worksheet,$pCoordinateString) = $cellAddress;
+			}
+			if ($worksheet > '')	$worksheet .= '!';
+
 			// Create absolute coordinate
 			if (ctype_digit($pCoordinateString)) {
-				return '$'.$pCoordinateString;
+				return $worksheet . '$' . $pCoordinateString;
 			} elseif (ctype_alpha($pCoordinateString)) {
-				return '$'.strtoupper($pCoordinateString);
+				return $worksheet . '$' . strtoupper($pCoordinateString);
 			}
-			return self::absoluteCoordinate($pCoordinateString);
-		} else {
-			throw new Exception("Coordinate string should not be a cell range.");
+			return $worksheet . self::absoluteCoordinate($pCoordinateString);
 		}
+
+		throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
 	}
 
 	/**
-	 * Make string coordinate absolute
+	 *	Make string coordinate absolute
 	 *
-	 * @param	string	$pCoordinateString		e.g. 'A1'
-	 * @return	string	Absolute coordinate		e.g. '$A$1'
-	 * @throws	Exception
+	 *	@param	string	$pCoordinateString		e.g. 'A1'
+	 *	@return	string	Absolute coordinate		e.g. '$A$1'
+	 *	@throws	PHPExcel_Exception
 	 */
 	public static function absoluteCoordinate($pCoordinateString = 'A1')
 	{
-		if (strpos($pCoordinateString,':') === false && strpos($pCoordinateString,',') === false) {
+		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
+			// Split out any worksheet name from the coordinate
+			$worksheet = '';
+			$cellAddress = explode('!',$pCoordinateString);
+			if (count($cellAddress) > 1) {
+				list($worksheet,$pCoordinateString) = $cellAddress;
+			}
+			if ($worksheet > '')	$worksheet .= '!';
+
 			// Create absolute coordinate
-			list($column, $row) = PHPExcel_Cell::coordinateFromString($pCoordinateString);
-			if ($column[0] == '$')	$column = substr($column,1);
-			if ($row[0] == '$')		$row = substr($row,1);
-			return '$' . $column . '$' . $row;
-		} else {
-			throw new Exception("Coordinate string should not be a cell range.");
+			list($column, $row) = self::coordinateFromString($pCoordinateString);
+			$column = ltrim($column,'$');
+			$row = ltrim($row,'$');
+			return $worksheet . '$' . $column . '$' . $row;
 		}
+
+		throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
 	}
 
 	/**
-	 * Split range into coordinate strings
+	 *	Split range into coordinate strings
 	 *
-	 * @param	string	$pRange
-	 * @return	array	Array containg one or more arrays containing one or two coordinate strings
+	 *	@param	string	$pRange		e.g. 'B4:D9' or 'B4:D9,H2:O11' or 'B4'
+	 *	@return	array	Array containg one or more arrays containing one or two coordinate strings
+	 *								e.g. array('B4','D9') or array(array('B4','D9'),array('H2','O11'))
+	 *										or array('B4')
 	 */
 	public static function splitRange($pRange = 'A1:A1')
 	{
+		// Ensure $pRange is a valid range
+		if(empty($pRange)) {
+			$pRange = self::DEFAULT_RANGE;
+		}
+
 		$exploded = explode(',', $pRange);
 		$counter = count($exploded);
 		for ($i = 0; $i < $counter; ++$i) {
@@ -568,17 +622,17 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Build range from coordinate strings
+	 *	Build range from coordinate strings
 	 *
-	 * @param	array	$pRange	Array containg one or more arrays containing one or two coordinate strings
-	 * @return  string	String representation of $pRange
-	 * @throws	Exception
+	 *	@param	array	$pRange	Array containg one or more arrays containing one or two coordinate strings
+	 *	@return	string	String representation of $pRange
+	 *	@throws	PHPExcel_Exception
 	 */
 	public static function buildRange($pRange)
 	{
 		// Verify range
-		if (!is_array($pRange) || count($pRange) == 0 || !is_array($pRange[0])) {
-			throw new Exception('Range does not contain any information.');
+		if (!is_array($pRange) || empty($pRange) || !is_array($pRange[0])) {
+			throw new PHPExcel_Exception('Range does not contain any information');
 		}
 
 		// Build range
@@ -593,61 +647,73 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Calculate range boundaries
+	 *	Calculate range boundaries
 	 *
-	 * @param	string	$pRange		Cell range (e.g. A1:A1)
-	 * @return	array	Range coordinates (Start Cell, End Cell) where Start Cell and End Cell are arrays (Column Number, Row Number)
+	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
+	 *	@return	array	Range coordinates array(Start Cell, End Cell)
+	 *					where Start Cell and End Cell are arrays (Column Number, Row Number)
 	 */
 	public static function rangeBoundaries($pRange = 'A1:A1')
 	{
+		// Ensure $pRange is a valid range
+		if(empty($pRange)) {
+			$pRange = self::DEFAULT_RANGE;
+		}
+
 		// Uppercase coordinate
 		$pRange = strtoupper($pRange);
 
 		// Extract range
-		if (strpos($pRange, ':') === false) {
+		if (strpos($pRange, ':') === FALSE) {
 			$rangeA = $rangeB = $pRange;
 		} else {
 			list($rangeA, $rangeB) = explode(':', $pRange);
 		}
 
 		// Calculate range outer borders
-		$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
-		$rangeEnd	= PHPExcel_Cell::coordinateFromString($rangeB);
+		$rangeStart = self::coordinateFromString($rangeA);
+		$rangeEnd	= self::coordinateFromString($rangeB);
 
 		// Translate column into index
-		$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]);
-		$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]);
+		$rangeStart[0]	= self::columnIndexFromString($rangeStart[0]);
+		$rangeEnd[0]	= self::columnIndexFromString($rangeEnd[0]);
 
 		return array($rangeStart, $rangeEnd);
 	}
 
 	/**
-	 * Calculate range dimension
+	 *	Calculate range dimension
 	 *
-	 * @param	string	$pRange		Cell range (e.g. A1:A1)
-	 * @return	array	Range dimension (width, height)
+	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
+	 *	@return	array	Range dimension (width, height)
 	 */
 	public static function rangeDimension($pRange = 'A1:A1')
 	{
 		// Calculate range outer borders
-		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($pRange);
+		list($rangeStart,$rangeEnd) = self::rangeBoundaries($pRange);
 
 		return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) );
 	}
 
 	/**
-	 * Calculate range boundaries
+	 *	Calculate range boundaries
 	 *
-	 * @param	string	$pRange		Cell range (e.g. A1:A1)
-	 * @return	array	Range boundaries (staring Column, starting Row, Final Column, Final Row)
+	 *	@param	string	$pRange		Cell range (e.g. A1:A1)
+	 *	@return	array	Range coordinates array(Start Cell, End Cell)
+	 *					where Start Cell and End Cell are arrays (Column ID, Row Number)
 	 */
 	public static function getRangeBoundaries($pRange = 'A1:A1')
 	{
+		// Ensure $pRange is a valid range
+		if(empty($pRange)) {
+			$pRange = self::DEFAULT_RANGE;
+		}
+
 		// Uppercase coordinate
 		$pRange = strtoupper($pRange);
 
 		// Extract range
-		if (strpos($pRange, ':') === false) {
+		if (strpos($pRange, ':') === FALSE) {
 			$rangeA = $rangeB = $pRange;
 		} else {
 			list($rangeA, $rangeB) = explode(':', $pRange);
@@ -657,14 +723,22 @@ class PHPExcel_Cell
 	}
 
 	/**
-	 * Column index from string
+	 *	Column index from string
 	 *
-	 * @param	string $pString
-	 * @return	int Column index (base 1 !!!)
-	 * @throws	Exception
+	 *	@param	string $pString
+	 *	@return	int Column index (base 1 !!!)
+	 *	@throws	Exception
 	 */
 	public static function columnIndexFromString($pString = 'A')
 	{
+		//	Using a lookup cache adds a slight memory overhead, but boosts speed
+		//	caching using a static within the method is faster than a class static,
+		//		though it's additional memory overhead
+		static $_indexCache = array();
+
+		if (isset($_indexCache[$pString]))
+			return $_indexCache[$pString];
+
 		//	It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
 		//		and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant
 		//		memory overhead either
@@ -679,38 +753,53 @@ class PHPExcel_Cell
 		//		for improved performance
 		if (isset($pString{0})) {
 			if (!isset($pString{1})) {
-				return $_columnLookup[$pString];
+				$_indexCache[$pString] = $_columnLookup[$pString];
+				return $_indexCache[$pString];
 			} elseif(!isset($pString{2})) {
-				return $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}];
+				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}];
+				return $_indexCache[$pString];
 			} elseif(!isset($pString{3})) {
-				return $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}];
+				$_indexCache[$pString] = $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}];
+				return $_indexCache[$pString];
 			}
 		}
-		throw new Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty") . ".");
+		throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty"));
 	}
 
 	/**
-	 * String from columnindex
+	 *	String from columnindex
 	 *
-	 * @param int $pColumnIndex Column index (base 0 !!!)
-	 * @return string
+	 *	@param	int $pColumnIndex Column index (base 0 !!!)
+	 *	@return	string
 	 */
 	public static function stringFromColumnIndex($pColumnIndex = 0)
 	{
-		// Determine column string
-		if ($pColumnIndex < 26) {
-			return chr(65 + $pColumnIndex);
-		} elseif ($pColumnIndex < 702) {
-			return chr(64 + ($pColumnIndex / 26)).chr(65 + $pColumnIndex % 26);
+		//	Using a lookup cache adds a slight memory overhead, but boosts speed
+		//	caching using a static within the method is faster than a class static,
+		//		though it's additional memory overhead
+		static $_indexCache = array();
+
+		if (!isset($_indexCache[$pColumnIndex])) {
+			// Determine column string
+			if ($pColumnIndex < 26) {
+				$_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex);
+			} elseif ($pColumnIndex < 702) {
+				$_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) .
+											  chr(65 + $pColumnIndex % 26);
+			} else {
+				$_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) .
+											  chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
+											  chr(65 + $pColumnIndex % 26);
+			}
 		}
-		return chr(64 + (($pColumnIndex - 26) / 676)).chr(65 + ((($pColumnIndex - 26) % 676) / 26)).chr(65 + $pColumnIndex % 26);
+		return $_indexCache[$pColumnIndex];
 	}
 
 	/**
-	 * Extract all cell references in range
+	 *	Extract all cell references in range
 	 *
-	 * @param	string	$pRange		Range (e.g. A1 or A1:A10 or A1:A10 A100:A1000)
-	 * @return	array	Array containing single cell references
+	 *	@param	string	$pRange		Range (e.g. A1 or A1:C10 or A1:E10 A20:E25)
+	 *	@return	array	Array containing single cell references
 	 */
 	public static function extractAllCellReferencesInRange($pRange = 'A1') {
 		// Returnvalue
@@ -720,13 +809,13 @@ class PHPExcel_Cell
 		$cellBlocks = explode(' ', str_replace('$', '', strtoupper($pRange)));
 		foreach ($cellBlocks as $cellBlock) {
 			// Single cell?
-			if (strpos($cellBlock,':') === false && strpos($cellBlock,',') === false) {
+			if (strpos($cellBlock,':') === FALSE && strpos($cellBlock,',') === FALSE) {
 				$returnValue[] = $cellBlock;
 				continue;
 			}
 
 			// Range...
-			$ranges = PHPExcel_Cell::splitRange($cellBlock);
+			$ranges = self::splitRange($cellBlock);
 			foreach($ranges as $range) {
 				// Single cell?
 				if (!isset($range[1])) {
@@ -756,8 +845,16 @@ class PHPExcel_Cell
 			}
 		}
 
+		//	Sort the result by column and row
+		$sortKeys = array();
+		foreach (array_unique($returnValue) as $coord) {
+			list($column,$row) = sscanf($coord,'%[A-Z]%d');
+			$sortKeys[sprintf('%3s%09d',$column,$row)] = $coord;
+		}
+		ksort($sortKeys);
+
 		// Return value
-		return $returnValue;
+		return array_values($sortKeys);
 	}
 
 	/**
@@ -773,7 +870,7 @@ class PHPExcel_Cell
 			return -1;
 		} elseif ($a->_row > $b->_row) {
 			return 1;
-		} elseif (PHPExcel_Cell::columnIndexFromString($a->_column) < PHPExcel_Cell::columnIndexFromString($b->_column)) {
+		} elseif (self::columnIndexFromString($a->_column) < self::columnIndexFromString($b->_column)) {
 			return -1;
 		} else {
 			return 1;
@@ -786,7 +883,7 @@ class PHPExcel_Cell
 	 * @return PHPExcel_Cell_IValueBinder
 	 */
 	public static function getValueBinder() {
-		if (is_null(self::$_valueBinder)) {
+		if (self::$_valueBinder === NULL) {
 			self::$_valueBinder = new PHPExcel_Cell_DefaultValueBinder();
 		}
 
@@ -799,8 +896,8 @@ class PHPExcel_Cell
 	 * @param PHPExcel_Cell_IValueBinder $binder
 	 * @throws Exception
 	 */
-	public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = null) {
-		if (is_null($binder)) {
+	public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = NULL) {
+		if ($binder === NULL) {
 			throw new Exception("A PHPExcel_Cell_IValueBinder is required for PHPExcel to function correctly.");
 		}
 
@@ -844,17 +941,32 @@ class PHPExcel_Cell
 		return $this->notifyCacheController();
 	}
 
-
+	/**
+	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
+	 */
 	public function setFormulaAttributes($pAttributes)
 	{
 		$this->_formulaAttributes = $pAttributes;
 		return $this;
 	}
 
+	/**
+	 *	@deprecated		Since version 1.7.8 for planned changes to cell for array formula handling
+	 */
 	public function getFormulaAttributes()
 	{
 		return $this->_formulaAttributes;
 	}
 
+    /**
+     * Convert to string
+     *
+     * @return string
+     */
+	public function __toString()
+	{
+		return (string) $this->getValue();
+	}
+
 }
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php b/htdocs/includes/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
index df959dfa53e..3603f5ee61d 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -41,7 +41,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
 {
@@ -66,10 +66,10 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
 		if ($dataType === PHPExcel_Cell_DataType::TYPE_STRING && !$value instanceof PHPExcel_RichText) {
 			//	Test for booleans using locale-setting
 			if ($value == PHPExcel_Calculation::getTRUE()) {
-				$cell->setValueExplicit( True, PHPExcel_Cell_DataType::TYPE_BOOL);
+				$cell->setValueExplicit( TRUE, PHPExcel_Cell_DataType::TYPE_BOOL);
 				return true;
 			} elseif($value == PHPExcel_Calculation::getFALSE()) {
-				$cell->setValueExplicit( False, PHPExcel_Cell_DataType::TYPE_BOOL);
+				$cell->setValueExplicit( FALSE, PHPExcel_Cell_DataType::TYPE_BOOL);
 				return true;
 			}
 
@@ -79,34 +79,82 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
 				return true;
 			}
 
+			// Check for fraction
+			if (preg_match('/^([+-]?) *([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
+				// Convert value to number
+				$value = $matches[2] / $matches[3];
+				if ($matches[1] == '-') $value = 0 - $value;
+				$cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+				// Set style
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode( '??/??' );
+				return true;
+			} elseif (preg_match('/^([+-]?)([0-9]*) +([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
+				// Convert value to number
+				$value = $matches[2] + ($matches[3] / $matches[4]);
+				if ($matches[1] == '-') $value = 0 - $value;
+				$cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+				// Set style
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode( '# ??/??' );
+				return true;
+			}
+
 			// Check for percentage
 			if (preg_match('/^\-?[0-9]*\.?[0-9]*\s?\%$/', $value)) {
 				// Convert value to number
-				$cell->setValueExplicit( (float)str_replace('%', '', $value) / 100, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+				$value = (float) str_replace('%', '', $value) / 100;
+				$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
 				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE );
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00 );
+				return true;
+			}
+
+			// Check for currency
+			$currencyCode = PHPExcel_Shared_String::getCurrencyCode();
+			if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
+				// Convert value to number
+				$value = (float) trim(str_replace(array($currencyCode,','), '', $value));
+				$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+				// Set style
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode(
+						str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE )
+					);
+				return true;
+			} elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
+				// Convert value to number
+				$value = (float) trim(str_replace(array('$',','), '', $value));
+				$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+				// Set style
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE );
 				return true;
 			}
 
 			// Check for time without seconds e.g. '9:45', '09:45'
 			if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d$/', $value)) {
+				// Convert value to number
 				list($h, $m) = explode(':', $value);
 				$days = $h / 24 + $m / 1440;
-				// Convert value to number
 				$cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
 				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3 );
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3 );
 				return true;
 			}
 
 			// Check for time with seconds '9:45:59', '09:45:59'
 			if (preg_match('/^(\d|[0-1]\d|2[0-3]):[0-5]\d:[0-5]\d$/', $value)) {
+				// Convert value to number
 				list($h, $m, $s) = explode(':', $value);
 				$days = $h / 24 + $m / 1440 + $s / 86400;
 				// Convert value to number
 				$cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
 				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4 );
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4 );
 				return true;
 			}
 
@@ -120,16 +168,18 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
 				} else {
 					$formatCode = 'yyyy-mm-dd';
 				}
-				$cell->getParent()->getStyle( $cell->getCoordinate() )->getNumberFormat()->setFormatCode($formatCode);
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getNumberFormat()->setFormatCode($formatCode);
 				return true;
 			}
 
 			// Check for newline character "\n"
-			if (strpos($value, "\n") !== false) {
+			if (strpos($value, "\n") !== FALSE) {
 				$value = PHPExcel_Shared_String::SanitizeUTF8($value);
 				$cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
 				// Set style
-				$cell->getParent()->getStyle( $cell->getCoordinate() )->getAlignment()->setWrapText(true);
+				$cell->getParent()->getStyle( $cell->getCoordinate() )
+					->getAlignment()->setWrapText(TRUE);
 				return true;
 			}
 		}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Cell/DataType.php b/htdocs/includes/phpexcel/PHPExcel/Cell/DataType.php
index 3143cded790..a833a5a44e3 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Cell/DataType.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Cell/DataType.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Cell_DataType
 {
@@ -41,7 +41,7 @@ class PHPExcel_Cell_DataType
 	const TYPE_FORMULA		= 'f';
 	const TYPE_NUMERIC		= 'n';
 	const TYPE_BOOL			= 'b';
-    const TYPE_NULL			= 's';
+    const TYPE_NULL			= 'null';
     const TYPE_INLINE		= 'inlineStr';
 	const TYPE_ERROR		= 'e';
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Cell/DataValidation.php b/htdocs/includes/phpexcel/PHPExcel/Cell/DataValidation.php
index 950c47709ef..01b1edb7e52 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Cell/DataValidation.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Cell/DataValidation.php
@@ -2,27 +2,27 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Cell_DataValidation
 {
@@ -44,12 +44,12 @@ class PHPExcel_Cell_DataValidation
 	const TYPE_TEXTLENGTH	= 'textLength';
 	const TYPE_TIME			= 'time';
 	const TYPE_WHOLE		= 'whole';
-	
+
 	/* Data validation error styles */
 	const STYLE_STOP		= 'stop';
 	const STYLE_WARNING		= 'warning';
 	const STYLE_INFORMATION	= 'information';
-	
+
 	/* Data validation operators */
 	const OPERATOR_BETWEEN				= 'between';
 	const OPERATOR_EQUAL				= 'equal';
@@ -59,98 +59,98 @@ class PHPExcel_Cell_DataValidation
 	const OPERATOR_LESSTHANOREQUAL		= 'lessThanOrEqual';
 	const OPERATOR_NOTBETWEEN			= 'notBetween';
 	const OPERATOR_NOTEQUAL				= 'notEqual';
-    
+
     /**
      * Formula 1
      *
      * @var string
      */
     private $_formula1;
-    
+
     /**
      * Formula 2
      *
      * @var string
      */
     private $_formula2;
-    
+
     /**
      * Type
      *
      * @var string
      */
     private $_type = PHPExcel_Cell_DataValidation::TYPE_NONE;
-    
+
     /**
      * Error style
      *
      * @var string
      */
     private $_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;
-    
+
     /**
      * Operator
      *
      * @var string
      */
     private $_operator;
-    
+
     /**
      * Allow Blank
      *
      * @var boolean
      */
     private $_allowBlank;
-    
+
     /**
      * Show DropDown
      *
      * @var boolean
      */
     private $_showDropDown;
-    
+
     /**
      * Show InputMessage
      *
      * @var boolean
      */
     private $_showInputMessage;
-    
+
     /**
      * Show ErrorMessage
      *
      * @var boolean
      */
     private $_showErrorMessage;
-    
+
     /**
      * Error title
      *
      * @var string
      */
     private $_errorTitle;
-    
+
     /**
      * Error
      *
      * @var string
      */
     private $_error;
-    
+
     /**
      * Prompt title
      *
      * @var string
      */
     private $_promptTitle;
-    
+
     /**
      * Prompt
      *
      * @var string
      */
     private $_prompt;
-    
+
     /**
      * Create a new PHPExcel_Cell_DataValidation
      *
@@ -173,7 +173,7 @@ class PHPExcel_Cell_DataValidation
 		$this->_promptTitle 		= '';
 		$this->_prompt 				= '';
     }
-	
+
 	/**
 	 * Get Formula 1
 	 *
@@ -213,7 +213,7 @@ class PHPExcel_Cell_DataValidation
 		$this->_formula2 = $value;
 		return $this;
 	}
-	
+
 	/**
 	 * Get Type
 	 *
@@ -433,12 +433,12 @@ class PHPExcel_Cell_DataValidation
 		$this->_prompt = $value;
 		return $this;
 	}
-	
+
 	/**
 	 * Get hash code
 	 *
 	 * @return string	Hash code
-	 */	
+	 */
 	public function getHashCode() {
     	return md5(
     		  $this->_formula1
@@ -457,7 +457,7 @@ class PHPExcel_Cell_DataValidation
     		. __CLASS__
     	);
     }
-    
+
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
 	 */
diff --git a/htdocs/includes/phpexcel/PHPExcel/Cell/DefaultValueBinder.php b/htdocs/includes/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
index 07134633f0c..f520cc5ed7a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -41,7 +41,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
 {
@@ -60,7 +60,7 @@ class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
 		}
 
 		// Set value explicit
-		$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::dataTypeForValue($value) );
+		$cell->setValueExplicit( $value, self::dataTypeForValue($value) );
 
 		// Done!
 		return true;
@@ -81,7 +81,7 @@ class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
 			return PHPExcel_Cell_DataType::TYPE_STRING;
 
 		} elseif ($pValue instanceof PHPExcel_RichText) {
-			return PHPExcel_Cell_DataType::TYPE_STRING;
+			return PHPExcel_Cell_DataType::TYPE_INLINE;
 
 		} elseif ($pValue{0} === '=' && strlen($pValue) > 1) {
 			return PHPExcel_Cell_DataType::TYPE_FORMULA;
diff --git a/htdocs/includes/phpexcel/PHPExcel/Cell/Hyperlink.php b/htdocs/includes/phpexcel/PHPExcel/Cell/Hyperlink.php
index dba5e776b0f..9dc13042aa5 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Cell/Hyperlink.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Cell/Hyperlink.php
@@ -2,27 +2,27 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Cell_Hyperlink
 {
@@ -41,14 +41,14 @@ class PHPExcel_Cell_Hyperlink
 	 * @var string
 	 */
 	private $_url;
-	
+
 	/**
 	 * Tooltip to display on the hyperlink
 	 *
 	 * @var string
 	 */
-	private $_tooltip;	
-	
+	private $_tooltip;
+
     /**
      * Create a new PHPExcel_Cell_Hyperlink
      *
@@ -62,7 +62,7 @@ class PHPExcel_Cell_Hyperlink
 		$this->_url 		= $pUrl;
 		$this->_tooltip 	= $pTooltip;
     }
-	
+
 	/**
 	 * Get URL
 	 *
@@ -82,7 +82,7 @@ class PHPExcel_Cell_Hyperlink
 		$this->_url = $value;
 		return $this;
 	}
-	
+
 	/**
 	 * Get tooltip
 	 *
@@ -102,7 +102,7 @@ class PHPExcel_Cell_Hyperlink
 		$this->_tooltip = $value;
 		return $this;
 	}
-	
+
 	/**
 	 * Is this hyperlink internal? (to another sheet)
 	 *
@@ -111,12 +111,12 @@ class PHPExcel_Cell_Hyperlink
 	public function isInternal() {
 		return strpos($this->_url, 'sheet://') !== false;
 	}
-	
+
 	/**
 	 * Get hash code
 	 *
 	 * @return string	Hash code
-	 */	
+	 */
 	public function getHashCode() {
     	return md5(
     		  $this->_url
diff --git a/htdocs/includes/phpexcel/PHPExcel/Cell/IValueBinder.php b/htdocs/includes/phpexcel/PHPExcel/Cell/IValueBinder.php
index b175705a501..4070b674c77 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Cell/IValueBinder.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Cell/IValueBinder.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_Cell_IValueBinder
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart.php b/htdocs/includes/phpexcel/PHPExcel/Chart.php
new file mode 100644
index 00000000000..4fa4cddb2df
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart.php
@@ -0,0 +1,527 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart
+{
+	/**
+	 * Chart Name
+	 *
+	 * @var string
+	 */
+	private $_name = '';
+
+	/**
+	 * Worksheet
+	 *
+	 * @var PHPExcel_Worksheet
+	 */
+	private $_worksheet = null;
+
+	/**
+	 * Chart Title
+	 *
+	 * @var PHPExcel_Chart_Title
+	 */
+	private $_title = null;
+
+	/**
+	 * Chart Legend
+	 *
+	 * @var PHPExcel_Chart_Legend
+	 */
+	private $_legend = null;
+
+	/**
+	 * X-Axis Label
+	 *
+	 * @var PHPExcel_Chart_Title
+	 */
+	private $_xAxisLabel = null;
+
+	/**
+	 * Y-Axis Label
+	 *
+	 * @var PHPExcel_Chart_Title
+	 */
+	private $_yAxisLabel = null;
+
+	/**
+	 * Chart Plot Area
+	 *
+	 * @var PHPExcel_Chart_PlotArea
+	 */
+	private $_plotArea = null;
+
+	/**
+	 * Plot Visible Only
+	 *
+	 * @var boolean
+	 */
+	private $_plotVisibleOnly = true;
+
+	/**
+	 * Display Blanks as
+	 *
+	 * @var string
+	 */
+	private $_displayBlanksAs = '0';
+
+
+	/**
+	 * Top-Left Cell Position
+	 *
+	 * @var string
+	 */
+	private $_topLeftCellRef = 'A1';
+
+
+	/**
+	 * Top-Left X-Offset
+	 *
+	 * @var integer
+	 */
+	private $_topLeftXOffset = 0;
+
+
+	/**
+	 * Top-Left Y-Offset
+	 *
+	 * @var integer
+	 */
+	private $_topLeftYOffset = 0;
+
+
+	/**
+	 * Bottom-Right Cell Position
+	 *
+	 * @var string
+	 */
+	private $_bottomRightCellRef = 'A1';
+
+
+	/**
+	 * Bottom-Right X-Offset
+	 *
+	 * @var integer
+	 */
+	private $_bottomRightXOffset = 10;
+
+
+	/**
+	 * Bottom-Right Y-Offset
+	 *
+	 * @var integer
+	 */
+	private $_bottomRightYOffset = 10;
+
+
+	/**
+	 * Create a new PHPExcel_Chart
+	 */
+	public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null)
+	{
+		$this->_name = $name;
+		$this->_title = $title;
+		$this->_legend = $legend;
+		$this->_xAxisLabel = $xAxisLabel;
+		$this->_yAxisLabel = $yAxisLabel;
+		$this->_plotArea = $plotArea;
+		$this->_plotVisibleOnly = $plotVisibleOnly;
+		$this->_displayBlanksAs = $displayBlanksAs;
+	}
+
+	/**
+	 * Get Name
+	 *
+	 * @return string
+	 */
+	public function getName() {
+		return $this->_name;
+	}
+
+	/**
+	 * Get Worksheet
+	 *
+	 * @return PHPExcel_Worksheet
+	 */
+	public function getWorksheet() {
+		return $this->_worksheet;
+	}
+
+	/**
+	 * Set Worksheet
+	 *
+	 * @param	PHPExcel_Worksheet	$pValue
+	 * @throws	Exception
+	 * @return PHPExcel_Chart
+	 */
+	public function setWorksheet(PHPExcel_Worksheet $pValue = null) {
+		$this->_worksheet = $pValue;
+
+		return $this;
+	}
+
+	/**
+	 * Get Title
+	 *
+	 * @return PHPExcel_Chart_Title
+	 */
+	public function getTitle() {
+		return $this->_title;
+	}
+
+	/**
+	 * Set Title
+	 *
+	 * @param	PHPExcel_Chart_Title $title
+	 * @return	PHPExcel_Chart
+	 */
+	public function setTitle(PHPExcel_Chart_Title $title) {
+		$this->_title = $title;
+
+		return $this;
+	}
+
+	/**
+	 * Get Legend
+	 *
+	 * @return PHPExcel_Chart_Legend
+	 */
+	public function getLegend() {
+		return $this->_legend;
+	}
+
+	/**
+	 * Set Legend
+	 *
+	 * @param	PHPExcel_Chart_Legend $legend
+	 * @return	PHPExcel_Chart
+	 */
+	public function setLegend(PHPExcel_Chart_Legend $legend) {
+		$this->_legend = $legend;
+
+		return $this;
+	}
+
+	/**
+	 * Get X-Axis Label
+	 *
+	 * @return PHPExcel_Chart_Title
+	 */
+	public function getXAxisLabel() {
+		return $this->_xAxisLabel;
+	}
+
+	/**
+	 * Set X-Axis Label
+	 *
+	 * @param	PHPExcel_Chart_Title $label
+	 * @return	PHPExcel_Chart
+	 */
+	public function setXAxisLabel(PHPExcel_Chart_Title $label) {
+		$this->_xAxisLabel = $label;
+
+		return $this;
+	}
+
+	/**
+	 * Get Y-Axis Label
+	 *
+	 * @return PHPExcel_Chart_Title
+	 */
+	public function getYAxisLabel() {
+		return $this->_yAxisLabel;
+	}
+
+	/**
+	 * Set Y-Axis Label
+	 *
+	 * @param	PHPExcel_Chart_Title $label
+	 * @return	PHPExcel_Chart
+	 */
+	public function setYAxisLabel(PHPExcel_Chart_Title $label) {
+		$this->_yAxisLabel = $label;
+
+		return $this;
+	}
+
+	/**
+	 * Get Plot Area
+	 *
+	 * @return PHPExcel_Chart_PlotArea
+	 */
+	public function getPlotArea() {
+		return $this->_plotArea;
+	}
+
+	/**
+	 * Get Plot Visible Only
+	 *
+	 * @return boolean
+	 */
+	public function getPlotVisibleOnly() {
+		return $this->_plotVisibleOnly;
+	}
+
+	/**
+	 * Set Plot Visible Only
+	 *
+	 * @param boolean $plotVisibleOnly
+	 * @return PHPExcel_Chart
+	 */
+	public function setPlotVisibleOnly($plotVisibleOnly = true) {
+		$this->_plotVisibleOnly = $plotVisibleOnly;
+
+		return $this;
+	}
+
+	/**
+	 * Get Display Blanks as
+	 *
+	 * @return string
+	 */
+	public function getDisplayBlanksAs() {
+		return $this->_displayBlanksAs;
+	}
+
+	/**
+	 * Set Display Blanks as
+	 *
+	 * @param string $displayBlanksAs
+	 * @return PHPExcel_Chart
+	 */
+	public function setDisplayBlanksAs($displayBlanksAs = '0') {
+		$this->_displayBlanksAs = $displayBlanksAs;
+	}
+
+
+	/**
+	 * Set the Top Left position for the chart
+	 *
+	 * @param	string	$cell
+	 * @param	integer	$xOffset
+	 * @param	integer	$yOffset
+	 * @return PHPExcel_Chart
+	 */
+	public function setTopLeftPosition($cell, $xOffset=null, $yOffset=null) {
+		$this->_topLeftCellRef = $cell;
+		if (!is_null($xOffset))
+			$this->setTopLeftXOffset($xOffset);
+		if (!is_null($yOffset))
+			$this->setTopLeftYOffset($yOffset);
+
+		return $this;
+	}
+
+	/**
+	 * Get the top left position of the chart
+	 *
+	 * @return array	an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
+	 */
+	public function getTopLeftPosition() {
+		return array( 'cell'	=> $this->_topLeftCellRef,
+					  'xOffset'	=> $this->_topLeftXOffset,
+					  'yOffset'	=> $this->_topLeftYOffset
+					);
+	}
+
+	/**
+	 * Get the cell address where the top left of the chart is fixed
+	 *
+	 * @return string
+	 */
+	public function getTopLeftCell() {
+		return $this->_topLeftCellRef;
+	}
+
+	/**
+	 * Set the Top Left cell position for the chart
+	 *
+	 * @param	string	$cell
+	 * @return PHPExcel_Chart
+	 */
+	public function setTopLeftCell($cell) {
+		$this->_topLeftCellRef = $cell;
+
+		return $this;
+	}
+
+	public function setTopLeftOffset($xOffset=null,$yOffset=null) {
+		if (!is_null($xOffset))
+			$this->setTopLeftXOffset($xOffset);
+		if (!is_null($yOffset))
+			$this->setTopLeftYOffset($yOffset);
+
+		return $this;
+	}
+
+	public function getTopLeftOffset() {
+		return array( 'X' => $this->_topLeftXOffset,
+					  'Y' => $this->_topLeftYOffset
+					);
+	}
+
+	public function setTopLeftXOffset($xOffset) {
+		$this->_topLeftXOffset = $xOffset;
+
+		return $this;
+	}
+
+	public function getTopLeftXOffset() {
+		return $this->_topLeftXOffset;
+	}
+
+	public function setTopLeftYOffset($yOffset) {
+		$this->_topLeftYOffset = $yOffset;
+
+		return $this;
+	}
+
+	public function getTopLeftYOffset() {
+		return $this->_topLeftYOffset;
+	}
+
+	/**
+	 * Set the Bottom Right position of the chart
+	 *
+	 * @param	string	$cell
+	 * @param	integer	$xOffset
+	 * @param	integer	$yOffset
+	 * @return PHPExcel_Chart
+	 */
+	public function setBottomRightPosition($cell, $xOffset=null, $yOffset=null) {
+		$this->_bottomRightCellRef = $cell;
+		if (!is_null($xOffset))
+			$this->setBottomRightXOffset($xOffset);
+		if (!is_null($yOffset))
+			$this->setBottomRightYOffset($yOffset);
+
+		return $this;
+	}
+
+	/**
+	 * Get the bottom right position of the chart
+	 *
+	 * @return array	an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
+	 */
+	public function getBottomRightPosition() {
+		return array( 'cell'	=> $this->_bottomRightCellRef,
+					  'xOffset'	=> $this->_bottomRightXOffset,
+					  'yOffset'	=> $this->_bottomRightYOffset
+					);
+	}
+
+	public function setBottomRightCell($cell) {
+		$this->_bottomRightCellRef = $cell;
+
+		return $this;
+	}
+
+	/**
+	 * Get the cell address where the bottom right of the chart is fixed
+	 *
+	 * @return string
+	 */
+	public function getBottomRightCell() {
+		return $this->_bottomRightCellRef;
+	}
+
+	public function setBottomRightOffset($xOffset=null,$yOffset=null) {
+		if (!is_null($xOffset))
+			$this->setBottomRightXOffset($xOffset);
+		if (!is_null($yOffset))
+			$this->setBottomRightYOffset($yOffset);
+
+		return $this;
+	}
+
+	public function getBottomRightOffset() {
+		return array( 'X' => $this->_bottomRightXOffset,
+					  'Y' => $this->_bottomRightYOffset
+					);
+	}
+
+	public function setBottomRightXOffset($xOffset) {
+		$this->_bottomRightXOffset = $xOffset;
+
+		return $this;
+	}
+
+	public function getBottomRightXOffset() {
+		return $this->_bottomRightXOffset;
+	}
+
+	public function setBottomRightYOffset($yOffset) {
+		$this->_bottomRightYOffset = $yOffset;
+
+		return $this;
+	}
+
+	public function getBottomRightYOffset() {
+		return $this->_bottomRightYOffset;
+	}
+
+
+	public function refresh() {
+		if ($this->_worksheet !== NULL) {
+			$this->_plotArea->refresh($this->_worksheet);
+		}
+	}
+
+	public function render($outputDestination = null) {
+		$libraryName = PHPExcel_Settings::getChartRendererName();
+		if (is_null($libraryName)) {
+			return false;
+		}
+		//	Ensure that data series values are up-to-date before we render
+		$this->refresh();
+
+		$libraryPath = PHPExcel_Settings::getChartRendererPath();
+		$includePath = str_replace('\\','/',get_include_path());
+		$rendererPath = str_replace('\\','/',$libraryPath);
+		if (strpos($rendererPath,$includePath) === false) {
+			set_include_path(get_include_path() . PATH_SEPARATOR . $libraryPath);
+		}
+
+		$rendererName = 'PHPExcel_Chart_Renderer_'.$libraryName;
+		$renderer = new $rendererName($this);
+
+		if ($outputDestination == 'php://output') {
+			$outputDestination = null;
+		}
+		return $renderer->render($outputDestination);
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/DataSeries.php b/htdocs/includes/phpexcel/PHPExcel/Chart/DataSeries.php
new file mode 100644
index 00000000000..16e5e23194f
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/DataSeries.php
@@ -0,0 +1,354 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version	1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart_DataSeries
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_DataSeries
+{
+
+	const TYPE_BARCHART			= 'barChart';
+	const TYPE_BARCHART_3D		= 'bar3DChart';
+	const TYPE_LINECHART		= 'lineChart';
+	const TYPE_LINECHART_3D		= 'line3DChart';
+	const TYPE_AREACHART		= 'areaChart';
+	const TYPE_AREACHART_3D		= 'area3DChart';
+	const TYPE_PIECHART			= 'pieChart';
+	const TYPE_PIECHART_3D		= 'pie3DChart';
+	const TYPE_DOUGHTNUTCHART	= 'doughnutChart';
+	const TYPE_DONUTCHART		= self::TYPE_DOUGHTNUTCHART;	//	Synonym
+	const TYPE_SCATTERCHART		= 'scatterChart';
+	const TYPE_SURFACECHART		= 'surfaceChart';
+	const TYPE_SURFACECHART_3D	= 'surface3DChart';
+	const TYPE_RADARCHART		= 'radarChart';
+	const TYPE_BUBBLECHART		= 'bubbleChart';
+	const TYPE_STOCKCHART		= 'stockChart';
+
+	const GROUPING_CLUSTERED			= 'clustered';
+	const GROUPING_STACKED				= 'stacked';
+	const GROUPING_PERCENT_STACKED		= 'percentStacked';
+	const GROUPING_STANDARD				= 'standard';
+
+	const DIRECTION_BAR			= 'bar';
+	const DIRECTION_HORIZONTAL	= self::DIRECTION_BAR;
+	const DIRECTION_COL			= 'col';
+	const DIRECTION_COLUMN		= self::DIRECTION_COL;
+	const DIRECTION_VERTICAL	= self::DIRECTION_COL;
+
+	const STYLE_LINEMARKER		= 'lineMarker';
+	const STYLE_SMOOTHMARKER	= 'smoothMarker';
+	const STYLE_MARKER			= 'marker';
+	const STYLE_FILLED			= 'filled';
+
+
+	/**
+	 * Series Plot Type
+	 *
+	 * @var string
+	 */
+	private $_plotType = null;
+
+	/**
+	 * Plot Grouping Type
+	 *
+	 * @var boolean
+	 */
+	private $_plotGrouping = null;
+
+	/**
+	 * Plot Direction
+	 *
+	 * @var boolean
+	 */
+	private $_plotDirection = null;
+
+	/**
+	 * Plot Style
+	 *
+	 * @var string
+	 */
+	private $_plotStyle = null;
+
+	/**
+	 * Order of plots in Series
+	 *
+	 * @var array of integer
+	 */
+	private $_plotOrder = array();
+
+	/**
+	 * Plot Label
+	 *
+	 * @var array of PHPExcel_Chart_DataSeriesValues
+	 */
+	private $_plotLabel = array();
+
+	/**
+	 * Plot Category
+	 *
+	 * @var array of PHPExcel_Chart_DataSeriesValues
+	 */
+	private $_plotCategory = array();
+
+	/**
+	 * Smooth Line
+	 *
+	 * @var string
+	 */
+	private $_smoothLine = null;
+
+	/**
+	 * Plot Values
+	 *
+	 * @var array of PHPExcel_Chart_DataSeriesValues
+	 */
+	private $_plotValues = array();
+
+	/**
+	 * Create a new PHPExcel_Chart_DataSeries
+	 */
+	public function __construct($plotType = null, $plotGrouping = null, $plotOrder = array(), $plotLabel = array(), $plotCategory = array(), $plotValues = array(), $smoothLine = null, $plotStyle = null)
+	{
+		$this->_plotType = $plotType;
+		$this->_plotGrouping = $plotGrouping;
+		$this->_plotOrder = $plotOrder;
+		$keys = array_keys($plotValues);
+		$this->_plotValues = $plotValues;
+		if ((count($plotLabel) == 0) || (is_null($plotLabel[$keys[0]]))) {
+			$plotLabel[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
+		}
+
+		$this->_plotLabel = $plotLabel;
+		if ((count($plotCategory) == 0) || (is_null($plotCategory[$keys[0]]))) {
+			$plotCategory[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
+		}
+		$this->_plotCategory = $plotCategory;
+		$this->_smoothLine = $smoothLine;
+		$this->_plotStyle = $plotStyle;
+	}
+
+	/**
+	 * Get Plot Type
+	 *
+	 * @return string
+	 */
+	public function getPlotType() {
+		return $this->_plotType;
+	}
+
+	/**
+	 * Set Plot Type
+	 *
+	 * @param string $plotType
+	 */
+	public function setPlotType($plotType = '') {
+		$this->_plotType = $plotType;
+	}
+
+	/**
+	 * Get Plot Grouping Type
+	 *
+	 * @return string
+	 */
+	public function getPlotGrouping() {
+		return $this->_plotGrouping;
+	}
+
+	/**
+	 * Set Plot Grouping Type
+	 *
+	 * @param string $groupingType
+	 */
+	public function setPlotGrouping($groupingType = null) {
+		$this->_plotGrouping = $groupingType;
+	}
+
+	/**
+	 * Get Plot Direction
+	 *
+	 * @return string
+	 */
+	public function getPlotDirection() {
+		return $this->_plotDirection;
+	}
+
+	/**
+	 * Set Plot Direction
+	 *
+	 * @param string $plotDirection
+	 */
+	public function setPlotDirection($plotDirection = null) {
+		$this->_plotDirection = $plotDirection;
+	}
+
+	/**
+	 * Get Plot Order
+	 *
+	 * @return string
+	 */
+	public function getPlotOrder() {
+		return $this->_plotOrder;
+	}
+
+	/**
+	 * Get Plot Labels
+	 *
+	 * @return array of PHPExcel_Chart_DataSeriesValues
+	 */
+	public function getPlotLabels() {
+		return $this->_plotLabel;
+	}
+
+	/**
+	 * Get Plot Label by Index
+	 *
+	 * @return PHPExcel_Chart_DataSeriesValues
+	 */
+	public function getPlotLabelByIndex($index) {
+		$keys = array_keys($this->_plotLabel);
+		if (in_array($index,$keys)) {
+			return $this->_plotLabel[$index];
+		} elseif(isset($keys[$index])) {
+			return $this->_plotLabel[$keys[$index]];
+		}
+		return false;
+	}
+
+	/**
+	 * Get Plot Categories
+	 *
+	 * @return array of PHPExcel_Chart_DataSeriesValues
+	 */
+	public function getPlotCategories() {
+		return $this->_plotCategory;
+	}
+
+	/**
+	 * Get Plot Category by Index
+	 *
+	 * @return PHPExcel_Chart_DataSeriesValues
+	 */
+	public function getPlotCategoryByIndex($index) {
+		$keys = array_keys($this->_plotCategory);
+		if (in_array($index,$keys)) {
+			return $this->_plotCategory[$index];
+		} elseif(isset($keys[$index])) {
+			return $this->_plotCategory[$keys[$index]];
+		}
+		return false;
+	}
+
+	/**
+	 * Get Plot Style
+	 *
+	 * @return string
+	 */
+	public function getPlotStyle() {
+		return $this->_plotStyle;
+	}
+
+	/**
+	 * Set Plot Style
+	 *
+	 * @param string $plotStyle
+	 */
+	public function setPlotStyle($plotStyle = null) {
+		$this->_plotStyle = $plotStyle;
+	}
+
+	/**
+	 * Get Plot Values
+	 *
+	 * @return array of PHPExcel_Chart_DataSeriesValues
+	 */
+	public function getPlotValues() {
+		return $this->_plotValues;
+	}
+
+	/**
+	 * Get Plot Values by Index
+	 *
+	 * @return PHPExcel_Chart_DataSeriesValues
+	 */
+	public function getPlotValuesByIndex($index) {
+		$keys = array_keys($this->_plotValues);
+		if (in_array($index,$keys)) {
+			return $this->_plotValues[$index];
+		} elseif(isset($keys[$index])) {
+			return $this->_plotValues[$keys[$index]];
+		}
+		return false;
+	}
+
+	/**
+	 * Get Number of Plot Series
+	 *
+	 * @return integer
+	 */
+	public function getPlotSeriesCount() {
+		return count($this->_plotValues);
+	}
+
+	/**
+	 * Get Smooth Line
+	 *
+	 * @return boolean
+	 */
+	public function getSmoothLine() {
+		return $this->_smoothLine;
+	}
+
+	/**
+	 * Set Smooth Line
+	 *
+	 * @param boolean $smoothLine
+	 */
+	public function setSmoothLine($smoothLine = TRUE) {
+		$this->_smoothLine = $smoothLine;
+	}
+
+	public function refresh(PHPExcel_Worksheet $worksheet) {
+	    foreach($this->_plotValues as $plotValues) {
+			if ($plotValues !== NULL)
+				$plotValues->refresh($worksheet, TRUE);
+		}
+		foreach($this->_plotLabel as $plotValues) {
+			if ($plotValues !== NULL)
+				$plotValues->refresh($worksheet, TRUE);
+		}
+		foreach($this->_plotCategory as $plotValues) {
+			if ($plotValues !== NULL)
+				$plotValues->refresh($worksheet, FALSE);
+		}
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/DataSeriesValues.php b/htdocs/includes/phpexcel/PHPExcel/Chart/DataSeriesValues.php
new file mode 100644
index 00000000000..e49d0c79a84
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/DataSeriesValues.php
@@ -0,0 +1,321 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version	1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart_DataSeriesValues
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_DataSeriesValues
+{
+
+	const DATASERIES_TYPE_STRING	= 'String';
+	const DATASERIES_TYPE_NUMBER	= 'Number';
+
+	private static $_dataTypeValues = array(
+		self::DATASERIES_TYPE_STRING,
+		self::DATASERIES_TYPE_NUMBER,
+	);
+
+	/**
+	 * Series Data Type
+	 *
+	 * @var	string
+	 */
+	private $_dataType = null;
+
+	/**
+	 * Series Data Source
+	 *
+	 * @var	string
+	 */
+	private $_dataSource = null;
+
+	/**
+	 * Format Code
+	 *
+	 * @var	string
+	 */
+	private $_formatCode = null;
+
+	/**
+	 * Series Point Marker
+	 *
+	 * @var	string
+	 */
+	private $_marker = null;
+
+	/**
+	 * Point Count (The number of datapoints in the dataseries)
+	 *
+	 * @var	integer
+	 */
+	private $_pointCount = 0;
+
+	/**
+	 * Data Values
+	 *
+	 * @var	array of mixed
+	 */
+	private $_dataValues = array();
+
+	/**
+	 * Create a new PHPExcel_Chart_DataSeriesValues object
+	 */
+	public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
+	{
+		$this->setDataType($dataType);
+		$this->_dataSource = $dataSource;
+		$this->_formatCode = $formatCode;
+		$this->_pointCount = $pointCount;
+		$this->_dataValues = $dataValues;
+		$this->_marker = $marker;
+	}
+
+	/**
+	 * Get Series Data Type
+	 *
+	 * @return	string
+	 */
+	public function getDataType() {
+		return $this->_dataType;
+	}
+
+	/**
+	 * Set Series Data Type
+	 *
+	 * @param	string	$dataType	Datatype of this data series
+	 *								Typical values are:
+	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_STRING
+	 *										Normally used for axis point values
+	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_NUMBER
+	 *										Normally used for chart data values
+	 * @return	PHPExcel_Chart_DataSeriesValues
+	 */
+	public function setDataType($dataType = self::DATASERIES_TYPE_NUMBER) {
+		if (!in_array($dataType, self::$_dataTypeValues)) {
+    		throw new PHPExcel_Chart_Exception('Invalid datatype for chart data series values');
+		}
+		$this->_dataType = $dataType;
+
+		return $this;
+	}
+
+	/**
+	 * Get Series Data Source (formula)
+	 *
+	 * @return	string
+	 */
+	public function getDataSource() {
+		return $this->_dataSource;
+	}
+
+	/**
+	 * Set Series Data Source (formula)
+	 *
+	 * @param	string	$dataSource
+	 * @return	PHPExcel_Chart_DataSeriesValues
+	 */
+	public function setDataSource($dataSource = null, $refreshDataValues = true) {
+		$this->_dataSource = $dataSource;
+
+		if ($refreshDataValues) {
+			//	TO DO
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get Point Marker
+	 *
+	 * @return string
+	 */
+	public function getPointMarker() {
+		return $this->_marker;
+	}
+
+	/**
+	 * Set Point Marker
+	 *
+	 * @param	string	$marker
+	 * @return	PHPExcel_Chart_DataSeriesValues
+	 */
+	public function setPointMarker($marker = null) {
+		$this->_marker = $marker;
+
+		return $this;
+	}
+
+	/**
+	 * Get Series Format Code
+	 *
+	 * @return	string
+	 */
+	public function getFormatCode() {
+		return $this->_formatCode;
+	}
+
+	/**
+	 * Set Series Format Code
+	 *
+	 * @param	string	$formatCode
+	 * @return	PHPExcel_Chart_DataSeriesValues
+	 */
+	public function setFormatCode($formatCode = null) {
+		$this->_formatCode = $formatCode;
+
+		return $this;
+	}
+
+	/**
+	 * Get Series Point Count
+	 *
+	 * @return	integer
+	 */
+	public function getPointCount() {
+		return $this->_pointCount;
+	}
+
+	/**
+	 * Identify if the Data Series is a multi-level or a simple series
+	 *
+	 * @return	boolean
+	 */
+	public function isMultiLevelSeries() {
+		if (count($this->_dataValues) > 0) {
+			return is_array($this->_dataValues[0]);
+		}
+		return null;
+	}
+
+	/**
+	 * Return the level count of a multi-level Data Series
+	 *
+	 * @return	boolean
+	 */
+	public function multiLevelCount() {
+		$levelCount = 0;
+		foreach($this->_dataValues as $dataValueSet) {
+			$levelCount = max($levelCount,count($dataValueSet));
+		}
+		return $levelCount;
+	}
+
+	/**
+	 * Get Series Data Values
+	 *
+	 * @return	array of mixed
+	 */
+	public function getDataValues() {
+		return $this->_dataValues;
+	}
+
+	/**
+	 * Get the first Series Data value
+	 *
+	 * @return	mixed
+	 */
+	public function getDataValue() {
+		$count = count($this->_dataValues);
+		if ($count == 0) {
+			return null;
+		} elseif ($count == 1) {
+			return $this->_dataValues[0];
+		}
+		return $this->_dataValues;
+	}
+
+	/**
+	 * Set Series Data Values
+	 *
+	 * @param	array	$dataValues
+	 * @param	boolean	$refreshDataSource
+	 *					TRUE - refresh the value of _dataSource based on the values of $dataValues
+	 *					FALSE - don't change the value of _dataSource
+	 * @return	PHPExcel_Chart_DataSeriesValues
+	 */
+	public function setDataValues($dataValues = array(), $refreshDataSource = TRUE) {
+		$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
+		$this->_pointCount = count($dataValues);
+
+		if ($refreshDataSource) {
+			//	TO DO
+		}
+
+		return $this;
+	}
+
+	private function _stripNulls($var) {
+		return $var !== NULL;
+	}
+
+	public function refresh(PHPExcel_Worksheet $worksheet, $flatten = TRUE) {
+        if ($this->_dataSource !== NULL) {
+        	$calcEngine = PHPExcel_Calculation::getInstance();
+			$newDataValues = PHPExcel_Calculation::_unwrapResult(
+			    $calcEngine->_calculateFormulaValue(
+			        '='.$this->_dataSource,
+			        NULL,
+			        $worksheet->getCell('A1')
+			    )
+			);
+			if ($flatten) {
+				$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+			} else {
+				$cellRange = explode('!',$this->_dataSource);
+				if (count($cellRange) > 1) {
+					list(,$cellRange) = $cellRange;
+				}
+
+				$dimensions = PHPExcel_Cell::rangeDimension(str_replace('$','',$cellRange));
+				if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
+					$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+				} else {
+					$newArray = array_values(array_shift($newDataValues));
+					foreach($newArray as $i => $newDataSet) {
+						$newArray[$i] = array($newDataSet);
+					}
+
+					foreach($newDataValues as $newDataSet) {
+						$i = 0;
+						foreach($newDataSet as $newDataVal) {
+							array_unshift($newArray[$i++],$newDataVal);
+						}
+					}
+					$this->_dataValues = $newArray;
+				}
+			}
+			$this->_pointCount = count($this->_dataValues);
+		}
+
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/Exception.php b/htdocs/includes/phpexcel/PHPExcel/Chart/Exception.php
new file mode 100644
index 00000000000..984d5f91ddb
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/Exception.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Chart
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version	1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart_Exception
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Chart
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_Exception extends Exception {
+	/**
+	 * Error handler callback
+	 *
+	 * @param mixed $code
+	 * @param mixed $string
+	 * @param mixed $file
+	 * @param mixed $line
+	 * @param mixed $context
+	 */
+	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+		$e = new self($string, $code);
+		$e->line = $line;
+		$e->file = $file;
+		throw $e;
+	}
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/Layout.php b/htdocs/includes/phpexcel/PHPExcel/Chart/Layout.php
new file mode 100644
index 00000000000..d128382c16f
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/Layout.php
@@ -0,0 +1,417 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart_Layout
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_Layout
+{
+	/**
+	 * layoutTarget
+	 *
+	 * @var string
+	 */
+	private $_layoutTarget = NULL;
+
+	/**
+	 * X Mode
+	 *
+	 * @var string
+	 */
+	private $_xMode		= NULL;
+
+	/**
+	 * Y Mode
+	 *
+	 * @var string
+	 */
+	private $_yMode		= NULL;
+
+	/**
+	 * X-Position
+	 *
+	 * @var float
+	 */
+	private $_xPos		= NULL;
+
+	/**
+	 * Y-Position
+	 *
+	 * @var float
+	 */
+	private $_yPos		= NULL;
+
+	/**
+	 * width
+	 *
+	 * @var float
+	 */
+	private $_width		= NULL;
+
+	/**
+	 * height
+	 *
+	 * @var float
+	 */
+	private $_height	= NULL;
+
+	/**
+	 * show legend key
+	 * Specifies that legend keys should be shown in data labels
+	 *
+	 * @var boolean
+	 */
+	private $_showLegendKey	= NULL;
+
+	/**
+	 * show value
+	 * Specifies that the value should be shown in a data label.
+	 *
+	 * @var boolean
+	 */
+	private $_showVal	= NULL;
+
+	/**
+	 * show category name
+	 * Specifies that the category name should be shown in the data label.
+	 *
+	 * @var boolean
+	 */
+	private $_showCatName	= NULL;
+
+	/**
+	 * show data series name
+	 * Specifies that the series name should be shown in the data label.
+	 *
+	 * @var boolean
+	 */
+	private $_showSerName	= NULL;
+
+	/**
+	 * show percentage
+	 * Specifies that the percentage should be shown in the data label.
+	 *
+	 * @var boolean
+	 */
+	private $_showPercent	= NULL;
+
+	/**
+	 * show bubble size
+	 *
+	 * @var boolean
+	 */
+	private $_showBubbleSize	= NULL;
+
+	/**
+	 * show leader lines
+	 * Specifies that leader lines should be shown for the data label.
+	 *
+	 * @var boolean
+	 */
+	private $_showLeaderLines	= NULL;
+
+
+	/**
+	 * Create a new PHPExcel_Chart_Layout
+	 */
+	public function __construct($layout=array())
+	{
+		if (isset($layout['layoutTarget']))	{ $this->_layoutTarget	= $layout['layoutTarget'];	}
+		if (isset($layout['xMode']))		{ $this->_xMode			= $layout['xMode'];			}
+		if (isset($layout['yMode']))		{ $this->_yMode			= $layout['yMode'];			}
+		if (isset($layout['x']))			{ $this->_xPos			= (float) $layout['x'];		}
+		if (isset($layout['y']))			{ $this->_yPos			= (float) $layout['y'];		}
+		if (isset($layout['w']))			{ $this->_width			= (float) $layout['w'];		}
+		if (isset($layout['h']))			{ $this->_height		= (float) $layout['h'];		}
+	}
+
+	/**
+	 * Get Layout Target
+	 *
+	 * @return string
+	 */
+	public function getLayoutTarget() {
+		return $this->_layoutTarget;
+	}
+
+	/**
+	 * Set Layout Target
+	 *
+	 * @param Layout Target $value
+	 */
+	public function setLayoutTarget($value) {
+		$this->_layoutTarget = $value;
+	}
+
+	/**
+	 * Get X-Mode
+	 *
+	 * @return string
+	 */
+	public function getXMode() {
+		return $this->_xMode;
+	}
+
+	/**
+	 * Set X-Mode
+	 *
+	 * @param X-Mode $value
+	 */
+	public function setXMode($value) {
+		$this->_xMode = $value;
+	}
+
+	/**
+	 * Get Y-Mode
+	 *
+	 * @return string
+	 */
+	public function getYMode() {
+		return $this->_xMode;
+	}
+
+	/**
+	 * Set Y-Mode
+	 *
+	 * @param Y-Mode $value
+	 */
+	public function setYMode($value) {
+		$this->_xMode = $value;
+	}
+
+	/**
+	 * Get X-Position
+	 *
+	 * @return number
+	 */
+	public function getXPosition() {
+		return $this->_xPos;
+	}
+
+	/**
+	 * Set X-Position
+	 *
+	 * @param X-Position $value
+	 */
+	public function setXPosition($value) {
+		$this->_xPos = $value;
+	}
+
+	/**
+	 * Get Y-Position
+	 *
+	 * @return number
+	 */
+	public function getYPosition() {
+		return $this->_yPos;
+	}
+
+	/**
+	 * Set Y-Position
+	 *
+	 * @param Y-Position $value
+	 */
+	public function setYPosition($value) {
+		$this->_yPos = $value;
+	}
+
+	/**
+	 * Get Width
+	 *
+	 * @return number
+	 */
+	public function getWidth() {
+		return $this->_width;
+	}
+
+	/**
+	 * Set Width
+	 *
+	 * @param Width $value
+	 */
+	public function setWidth($value) {
+		$this->_width = $value;
+	}
+
+	/**
+	 * Get Height
+	 *
+	 * @return number
+	 */
+	public function getHeight() {
+		return $this->_height;
+	}
+
+	/**
+	 * Set Height
+	 *
+	 * @param Height $value
+	 */
+	public function setHeight($value) {
+		$this->_height = $value;
+	}
+
+
+	/**
+	 * Get show legend key
+	 *
+	 * @return boolean
+	 */
+	public function getShowLegendKey() {
+		return $this->_showLegendKey;
+	}
+
+	/**
+	 * Set show legend key
+	 * Specifies that legend keys should be shown in data labels.
+	 *
+	 * @param boolean $value		Show legend key
+	 */
+	public function setShowLegendKey($value) {
+		$this->_showLegendKey = $value;
+	}
+
+	/**
+	 * Get show value
+	 *
+	 * @return boolean
+	 */
+	public function getShowVal() {
+		return $this->_showVal;
+	}
+
+	/**
+	 * Set show val
+	 * Specifies that the value should be shown in data labels.
+	 *
+	 * @param boolean $value		Show val
+	 */
+	public function setShowVal($value) {
+		$this->_showVal = $value;
+	}
+
+	/**
+	 * Get show category name
+	 *
+	 * @return boolean
+	 */
+	public function getShowCatName() {
+		return $this->_showCatName;
+	}
+
+	/**
+	 * Set show cat name
+	 * Specifies that the category name should be shown in data labels.
+	 *
+	 * @param boolean $value		Show cat name
+	 */
+	public function setShowCatName($value) {
+		$this->_showCatName = $value;
+	}
+
+	/**
+	 * Get show data series name
+	 *
+	 * @return boolean
+	 */
+	public function getShowSerName() {
+		return $this->_showSerName;
+	}
+
+	/**
+	 * Set show ser name
+	 * Specifies that the series name should be shown in data labels.
+	 *
+	 * @param boolean $value		Show ser name
+	 */
+	public function setShowSerName($value) {
+		$this->_showSerName = $value;
+	}
+
+	/**
+	 * Get show percentage
+	 *
+	 * @return boolean
+	 */
+	public function getShowPercent() {
+		return $this->_showPercent;
+	}
+
+	/**
+	 * Set show percentage
+	 * Specifies that the percentage should be shown in data labels.
+	 *
+	 * @param boolean $value		Show percentage
+	 */
+	public function setShowPercent($value) {
+		$this->_showPercent = $value;
+	}
+
+	/**
+	 * Get show bubble size
+	 *
+	 * @return boolean
+	 */
+	public function getShowBubbleSize() {
+		return $this->_showBubbleSize;
+	}
+
+	/**
+	 * Set show bubble size
+	 * Specifies that the bubble size should be shown in data labels.
+	 *
+	 * @param boolean $value		Show bubble size
+	 */
+	public function setShowBubbleSize($value) {
+		$this->_showBubbleSize = $value;
+	}
+
+	/**
+	 * Get show leader lines
+	 *
+	 * @return boolean
+	 */
+	public function getShowLeaderLines() {
+		return $this->_showLeaderLines;
+	}
+
+	/**
+	 * Set show leader lines
+	 * Specifies that leader lines should be shown in data labels.
+	 *
+	 * @param boolean $value		Show leader lines
+	 */
+	public function setShowLeaderLines($value) {
+		$this->_showLeaderLines = $value;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/Legend.php b/htdocs/includes/phpexcel/PHPExcel/Chart/Legend.php
new file mode 100644
index 00000000000..0ccd77e958d
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/Legend.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart_Legend
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_Legend
+{
+	/** Legend positions */
+	const xlLegendPositionBottom	= -4107;	//	Below the chart.
+	const xlLegendPositionCorner	= 2;		//	In the upper right-hand corner of the chart border.
+	const xlLegendPositionCustom	= -4161;	//	A custom position.
+	const xlLegendPositionLeft		= -4131;	//	Left of the chart.
+	const xlLegendPositionRight		= -4152;	//	Right of the chart.
+	const xlLegendPositionTop		= -4160;	//	Above the chart.
+
+	const POSITION_RIGHT	= 'r';
+	const POSITION_LEFT		= 'l';
+	const POSITION_BOTTOM	= 'b';
+	const POSITION_TOP		= 't';
+	const POSITION_TOPRIGHT	= 'tr';
+
+	private static $_positionXLref = array( self::xlLegendPositionBottom	=> self::POSITION_BOTTOM,
+											self::xlLegendPositionCorner	=> self::POSITION_TOPRIGHT,
+											self::xlLegendPositionCustom	=> '??',
+											self::xlLegendPositionLeft		=> self::POSITION_LEFT,
+											self::xlLegendPositionRight		=> self::POSITION_RIGHT,
+											self::xlLegendPositionTop		=> self::POSITION_TOP
+										  );
+
+	/**
+	 * Legend position
+	 *
+	 * @var	string
+	 */
+	private $_position = self::POSITION_RIGHT;
+
+	/**
+	 * Allow overlay of other elements?
+	 *
+	 * @var	boolean
+	 */
+	private $_overlay = TRUE;
+
+	/**
+	 * Legend Layout
+	 *
+	 * @var	PHPExcel_Chart_Layout
+	 */
+	private $_layout = NULL;
+
+
+	/**
+	 *	Create a new PHPExcel_Chart_Legend
+	 */
+	public function __construct($position = self::POSITION_RIGHT, PHPExcel_Chart_Layout $layout = NULL, $overlay = FALSE)
+	{
+		$this->setPosition($position);
+		$this->_layout = $layout;
+		$this->setOverlay($overlay);
+	}
+
+	/**
+	 * Get legend position as an excel string value
+	 *
+	 * @return	string
+	 */
+	public function getPosition() {
+		return $this->_position;
+	}
+
+	/**
+	 * Get legend position using an excel string value
+	 *
+	 * @param	string	$position
+	 */
+	public function setPosition($position = self::POSITION_RIGHT) {
+		if (!in_array($position,self::$_positionXLref)) {
+			return false;
+		}
+
+		$this->_position = $position;
+		return true;
+	}
+
+	/**
+	 * Get legend position as an Excel internal numeric value
+	 *
+	 * @return	number
+	 */
+	public function getPositionXL() {
+		return array_search($this->_position,self::$_positionXLref);
+	}
+
+	/**
+	 * Set legend position using an Excel internal numeric value
+	 *
+	 * @param	number	$positionXL
+	 */
+	public function setPositionXL($positionXL = self::xlLegendPositionRight) {
+		if (!array_key_exists($positionXL,self::$_positionXLref)) {
+			return false;
+		}
+
+		$this->_position = self::$_positionXLref[$positionXL];
+		return true;
+	}
+
+	/**
+	 * Get allow overlay of other elements?
+	 *
+	 * @return	boolean
+	 */
+	public function getOverlay() {
+		return $this->_overlay;
+	}
+
+	/**
+	 * Set allow overlay of other elements?
+	 *
+	 * @param	boolean	$overlay
+	 * @return	boolean
+	 */
+	public function setOverlay($overlay = FALSE) {
+		if (!is_bool($overlay)) {
+			return false;
+		}
+
+		$this->_overlay = $overlay;
+		return true;
+	}
+
+	/**
+	 * Get Layout
+	 *
+	 * @return PHPExcel_Chart_Layout
+	 */
+	public function getLayout() {
+		return $this->_layout;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/PlotArea.php b/htdocs/includes/phpexcel/PHPExcel/Chart/PlotArea.php
new file mode 100644
index 00000000000..134ee59550a
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/PlotArea.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart_PlotArea
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_PlotArea
+{
+	/**
+	 * PlotArea Layout
+	 *
+	 * @var PHPExcel_Chart_Layout
+	 */
+	private $_layout = null;
+
+	/**
+	 * Plot Series
+	 *
+	 * @var array of PHPExcel_Chart_DataSeries
+	 */
+	private $_plotSeries = array();
+
+	/**
+	 * Create a new PHPExcel_Chart_PlotArea
+	 */
+	public function __construct(PHPExcel_Chart_Layout $layout = null, $plotSeries = array())
+	{
+		$this->_layout = $layout;
+		$this->_plotSeries = $plotSeries;
+	}
+
+	/**
+	 * Get Layout
+	 *
+	 * @return PHPExcel_Chart_Layout
+	 */
+	public function getLayout() {
+		return $this->_layout;
+	}
+
+	/**
+	 * Get Number of Plot Groups
+	 *
+	 * @return array of PHPExcel_Chart_DataSeries
+	 */
+	public function getPlotGroupCount() {
+		return count($this->_plotSeries);
+	}
+
+	/**
+	 * Get Number of Plot Series
+	 *
+	 * @return integer
+	 */
+	public function getPlotSeriesCount() {
+		$seriesCount = 0;
+		foreach($this->_plotSeries as $plot) {
+			$seriesCount += $plot->getPlotSeriesCount();
+		}
+		return $seriesCount;
+	}
+
+	/**
+	 * Get Plot Series
+	 *
+	 * @return array of PHPExcel_Chart_DataSeries
+	 */
+	public function getPlotGroup() {
+		return $this->_plotSeries;
+	}
+
+	/**
+	 * Get Plot Series by Index
+	 *
+	 * @return PHPExcel_Chart_DataSeries
+	 */
+	public function getPlotGroupByIndex($index) {
+		return $this->_plotSeries[$index];
+	}
+
+	/**
+	 * Set Plot Series
+	 *
+	 * @param array of PHPExcel_Chart_DataSeries
+	 */
+	public function setPlotSeries($plotSeries = array()) {
+		$this->_plotSeries = $plotSeries;
+	}
+
+	public function refresh(PHPExcel_Worksheet $worksheet) {
+	    foreach($this->_plotSeries as $plotSeries) {
+			$plotSeries->refresh($worksheet);
+		}
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt b/htdocs/includes/phpexcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
new file mode 100644
index 00000000000..faaa61d153b
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt	
@@ -0,0 +1,17 @@
+ChartDirector
+	http://www.advsofteng.com/cdphp.html
+
+GraPHPite
+	http://graphpite.sourceforge.net/
+
+JpGraph
+	http://www.aditus.nu/jpgraph/
+
+LibChart
+	http://naku.dohcrew.com/libchart/pages/introduction/
+
+pChart
+	http://pchart.sourceforge.net/
+
+TeeChart
+	http://www.steema.com/products/teechart/overview.html
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php b/htdocs/includes/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
new file mode 100644
index 00000000000..889fd9fce08
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
@@ -0,0 +1,839 @@
+<?php
+
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+require_once(PHPExcel_Settings::getChartRendererPath().'/jpgraph.php');
+
+
+/**
+ * PHPExcel_Chart_Renderer_jpgraph
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart_Renderer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_Renderer_jpgraph
+{
+	private static $_width	= 640;
+
+	private static $_height	= 480;
+
+	private static $_colourSet = array( 'mediumpurple1',	'palegreen3',	'gold1',		'cadetblue1',
+										'darkmagenta',		'coral',		'dodgerblue3',	'eggplant',
+										'mediumblue',		'magenta',		'sandybrown',	'cyan',
+										'firebrick1',		'forestgreen',	'deeppink4',	'darkolivegreen',
+										'goldenrod2'
+									  );
+
+	private static $_markSet = array(	'diamond'	=> MARK_DIAMOND,
+										'square'	=> MARK_SQUARE,
+										'triangle'	=> MARK_UTRIANGLE,
+										'x'			=> MARK_X,
+										'star'		=> MARK_STAR,
+										'dot'		=> MARK_FILLEDCIRCLE,
+										'dash'		=> MARK_DTRIANGLE,
+										'circle'	=> MARK_CIRCLE,
+										'plus'		=> MARK_CROSS
+									);
+
+
+	private $_chart	= null;
+
+	private $_graph	= null;
+
+	private static $_plotColour	= 0;
+
+	private static $_plotMark	= 0;
+
+
+	private function _formatPointMarker($seriesPlot,$markerID) {
+		$plotMarkKeys = array_keys(self::$_markSet);
+		if (is_null($markerID)) {
+			//	Use default plot marker (next marker in the series)
+			self::$_plotMark %= count(self::$_markSet);
+			$seriesPlot->mark->SetType(self::$_markSet[$plotMarkKeys[self::$_plotMark++]]);
+		} elseif ($markerID !== 'none') {
+			//	Use specified plot marker (if it exists)
+			if (isset(self::$_markSet[$markerID])) {
+				$seriesPlot->mark->SetType(self::$_markSet[$markerID]);
+			} else {
+				//	If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
+				self::$_plotMark %= count(self::$_markSet);
+				$seriesPlot->mark->SetType(self::$_markSet[$plotMarkKeys[self::$_plotMark++]]);
+			}
+		} else {
+			//	Hide plot marker
+			$seriesPlot->mark->Hide();
+		}
+		$seriesPlot->mark->SetColor(self::$_colourSet[self::$_plotColour]);
+		$seriesPlot->mark->SetFillColor(self::$_colourSet[self::$_plotColour]);
+		$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
+
+		return $seriesPlot;
+	}	//	function _formatPointMarker()
+
+
+	private function _formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '') {
+		$datasetLabelFormatCode = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
+		if (!is_null($datasetLabelFormatCode)) {
+			//	Retrieve any label formatting code
+			$datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
+		}
+
+		$testCurrentIndex = 0;
+		foreach($datasetLabels as $i => $datasetLabel) {
+			array_reverse($datasetLabel);
+
+			if (is_array($datasetLabel)) {
+				if ($rotation == 'bar') {
+					$datasetLabel = array_reverse($datasetLabel);
+					$datasetLabels[$i] = implode(" ",$datasetLabel);
+				} else {
+					$datasetLabels[$i] = implode("\n",$datasetLabel);
+				}
+			} else {
+				//	Format labels according to any formatting code
+				if (!is_null($datasetLabelFormatCode)) {
+					$datasetLabels[$i] = PHPExcel_Style_NumberFormat::toFormattedString($datasetLabel,$datasetLabelFormatCode);
+				}
+			}
+			++$testCurrentIndex;
+		}
+
+		return $datasetLabels;
+	}	//	function _formatDataSetLabels()
+
+
+	private function _percentageSumCalculation($groupID,$seriesCount) {
+		//	Adjust our values to a percentage value across all series in the group
+		for($i = 0; $i < $seriesCount; ++$i) {
+			if ($i == 0) {
+				$sumValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+			} else {
+				$nextValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+				foreach($nextValues as $k => $value) {
+					if (isset($sumValues[$k])) {
+						$sumValues[$k] += $value;
+					} else {
+						$sumValues[$k] = $value;
+					}
+				}
+			}
+		}
+
+		return $sumValues;
+	}	//	function _percentageSumCalculation()
+
+
+	private function _percentageAdjustValues($dataValues,$sumValues) {
+		foreach($dataValues as $k => $dataValue) {
+			$dataValues[$k] = $dataValue / $sumValues[$k] * 100;
+		}
+
+		return $dataValues;
+	}	//	function _percentageAdjustValues()
+
+
+	private function _getCaption($captionElement) {
+		//	Read any caption
+		$caption = (!is_null($captionElement)) ? $captionElement->getCaption() : NULL;
+		//	Test if we have a title caption to display
+		if (!is_null($caption)) {
+			//	If we do, it could be a plain string or an array
+			if (is_array($caption)) {
+				//	Implode an array to a plain string
+				$caption = implode('',$caption);
+			}
+		}
+		return $caption;
+	}	//	function _getCaption()
+
+
+	private function _renderTitle() {
+		$title = $this->_getCaption($this->_chart->getTitle());
+		if (!is_null($title)) {
+			$this->_graph->title->Set($title);
+		}
+	}	//	function _renderTitle()
+
+
+	private function _renderLegend() {
+		$legend = $this->_chart->getLegend();
+		if (!is_null($legend)) {
+			$legendPosition = $legend->getPosition();
+			$legendOverlay = $legend->getOverlay();
+			switch ($legendPosition) {
+				case 'r'	:
+					$this->_graph->legend->SetPos(0.01,0.5,'right','center');	//	right
+					$this->_graph->legend->SetColumns(1);
+					break;
+				case 'l'	:
+					$this->_graph->legend->SetPos(0.01,0.5,'left','center');	//	left
+					$this->_graph->legend->SetColumns(1);
+					break;
+				case 't'	:
+					$this->_graph->legend->SetPos(0.5,0.01,'center','top');	//	top
+					break;
+				case 'b'	:
+					$this->_graph->legend->SetPos(0.5,0.99,'center','bottom');	//	bottom
+					break;
+				default		:
+					$this->_graph->legend->SetPos(0.01,0.01,'right','top');	//	top-right
+					$this->_graph->legend->SetColumns(1);
+					break;
+			}
+		} else {
+			$this->_graph->legend->Hide();
+		}
+	}	//	function _renderLegend()
+
+
+	private function _renderCartesianPlotArea($type='textlin') {
+		$this->_graph = new Graph(self::$_width,self::$_height);
+		$this->_graph->SetScale($type);
+
+		$this->_renderTitle();
+
+		//	Rotate for bar rather than column chart
+		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
+		$reverse = ($rotation == 'bar') ? true : false;
+
+		$xAxisLabel = $this->_chart->getXAxisLabel();
+		if (!is_null($xAxisLabel)) {
+			$title = $this->_getCaption($xAxisLabel);
+			if (!is_null($title)) {
+				$this->_graph->xaxis->SetTitle($title,'center');
+				$this->_graph->xaxis->title->SetMargin(35);
+				if ($reverse) {
+					$this->_graph->xaxis->title->SetAngle(90);
+					$this->_graph->xaxis->title->SetMargin(90);
+				}
+			}
+		}
+
+		$yAxisLabel = $this->_chart->getYAxisLabel();
+		if (!is_null($yAxisLabel)) {
+			$title = $this->_getCaption($yAxisLabel);
+			if (!is_null($title)) {
+				$this->_graph->yaxis->SetTitle($title,'center');
+				if ($reverse) {
+					$this->_graph->yaxis->title->SetAngle(0);
+					$this->_graph->yaxis->title->SetMargin(-55);
+				}
+			}
+		}
+	}	//	function _renderCartesianPlotArea()
+
+
+	private function _renderPiePlotArea($doughnut = False) {
+		$this->_graph = new PieGraph(self::$_width,self::$_height);
+
+		$this->_renderTitle();
+	}	//	function _renderPiePlotArea()
+
+
+	private function _renderRadarPlotArea() {
+		$this->_graph = new RadarGraph(self::$_width,self::$_height);
+		$this->_graph->SetScale('lin');
+
+		$this->_renderTitle();
+	}	//	function _renderRadarPlotArea()
+
+
+	private function _renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d') {
+		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+		if ($labelCount > 0) {
+			$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+			$this->_graph->xaxis->SetTickLabels($datasetLabels);
+		}
+
+		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+		$seriesPlots = array();
+		if ($grouping == 'percentStacked') {
+			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
+		}
+
+		//	Loop through each data series in turn
+		for($i = 0; $i < $seriesCount; ++$i) {
+			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+			if ($grouping == 'percentStacked') {
+				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
+			}
+
+			//	Fill in any missing values in the $dataValues array
+			$testCurrentIndex = 0;
+			foreach($dataValues as $k => $dataValue) {
+				while($k != $testCurrentIndex) {
+					$dataValues[$testCurrentIndex] = null;
+					++$testCurrentIndex;
+				}
+				++$testCurrentIndex;
+			}
+
+			$seriesPlot = new LinePlot($dataValues);
+			if ($combination) {
+				$seriesPlot->SetBarCenter();
+			}
+
+			if ($filled) {
+				$seriesPlot->SetFilled(true);
+				$seriesPlot->SetColor('black');
+				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
+			} else {
+				//	Set the appropriate plot marker
+				$this->_formatPointMarker($seriesPlot,$marker);
+			}
+			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+			$seriesPlot->SetLegend($dataLabel);
+
+			$seriesPlots[] = $seriesPlot;
+		}
+
+		if ($grouping == 'standard') {
+			$groupPlot = $seriesPlots;
+		} else {
+			$groupPlot = new AccLinePlot($seriesPlots);
+		}
+		$this->_graph->Add($groupPlot);
+	}	//	function _renderPlotLine()
+
+
+	private function _renderPlotBar($groupID, $dimensions = '2d') {
+		$rotation = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
+		//	Rotate for bar rather than column chart
+		if (($groupID == 0) && ($rotation == 'bar')) {
+			$this->_graph->Set90AndMargin();
+		}
+		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+		if ($labelCount > 0) {
+			$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+			$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
+			//	Rotate for bar rather than column chart
+			if ($rotation == 'bar') {
+				$datasetLabels = array_reverse($datasetLabels);
+				$this->_graph->yaxis->SetPos('max');
+				$this->_graph->yaxis->SetLabelAlign('center','top');
+				$this->_graph->yaxis->SetLabelSide(SIDE_RIGHT);
+			}
+			$this->_graph->xaxis->SetTickLabels($datasetLabels);
+		}
+
+
+		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+		$seriesPlots = array();
+		if ($grouping == 'percentStacked') {
+			$sumValues = $this->_percentageSumCalculation($groupID,$seriesCount);
+		}
+
+		//	Loop through each data series in turn
+		for($j = 0; $j < $seriesCount; ++$j) {
+			$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+			if ($grouping == 'percentStacked') {
+				$dataValues = $this->_percentageAdjustValues($dataValues,$sumValues);
+			}
+
+			//	Fill in any missing values in the $dataValues array
+			$testCurrentIndex = 0;
+			foreach($dataValues as $k => $dataValue) {
+				while($k != $testCurrentIndex) {
+					$dataValues[$testCurrentIndex] = null;
+					++$testCurrentIndex;
+				}
+				++$testCurrentIndex;
+			}
+
+			//	Reverse the $dataValues order for bar rather than column chart
+			if ($rotation == 'bar') {
+				$dataValues = array_reverse($dataValues);
+			}
+			$seriesPlot = new BarPlot($dataValues);
+			$seriesPlot->SetColor('black');
+			$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour++]);
+			if ($dimensions == '3d') {
+				$seriesPlot->SetShadow();
+			}
+			if (!$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
+				$dataLabel = '';
+			} else {
+				$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
+			}
+			$seriesPlot->SetLegend($dataLabel);
+
+			$seriesPlots[] = $seriesPlot;
+		}
+		//	Reverse the plot order for bar rather than column chart
+		if (($rotation == 'bar') && (!($grouping == 'percentStacked'))) {
+			$seriesPlots = array_reverse($seriesPlots);
+		}
+
+		if ($grouping == 'clustered') {
+			$groupPlot = new GroupBarPlot($seriesPlots);
+		} elseif ($grouping == 'standard') {
+			$groupPlot = new GroupBarPlot($seriesPlots);
+		} else {
+			$groupPlot = new AccBarPlot($seriesPlots);
+			if ($dimensions == '3d') {
+				$groupPlot->SetShadow();
+			}
+		}
+
+		$this->_graph->Add($groupPlot);
+	}	//	function _renderPlotBar()
+
+
+	private function _renderPlotScatter($groupID,$bubble) {
+		$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+		$scatterStyle = $bubbleSize = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+		$seriesPlots = array();
+
+		//	Loop through each data series in turn
+		for($i = 0; $i < $seriesCount; ++$i) {
+			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+			foreach($dataValuesY as $k => $dataValueY) {
+				$dataValuesY[$k] = $k;
+			}
+
+			$seriesPlot = new ScatterPlot($dataValuesX,$dataValuesY);
+			if ($scatterStyle == 'lineMarker') {
+				$seriesPlot->SetLinkPoints();
+				$seriesPlot->link->SetColor(self::$_colourSet[self::$_plotColour]);
+			} elseif ($scatterStyle == 'smoothMarker') {
+				$spline = new Spline($dataValuesY,$dataValuesX);
+				list($splineDataY,$splineDataX) = $spline->Get(count($dataValuesX) * self::$_width / 20);
+				$lplot = new LinePlot($splineDataX,$splineDataY);
+				$lplot->SetColor(self::$_colourSet[self::$_plotColour]);
+
+				$this->_graph->Add($lplot);
+			}
+
+			if ($bubble) {
+				$this->_formatPointMarker($seriesPlot,'dot');
+				$seriesPlot->mark->SetColor('black');
+				$seriesPlot->mark->SetSize($bubbleSize);
+			} else {
+				$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+				$this->_formatPointMarker($seriesPlot,$marker);
+			}
+			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+			$seriesPlot->SetLegend($dataLabel);
+
+			$this->_graph->Add($seriesPlot);
+		}
+	}	//	function _renderPlotScatter()
+
+
+	private function _renderPlotRadar($groupID) {
+		$radarStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+		$seriesPlots = array();
+
+		//	Loop through each data series in turn
+		for($i = 0; $i < $seriesCount; ++$i) {
+			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+			$marker = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+			$dataValues = array();
+			foreach($dataValuesY as $k => $dataValueY) {
+				$dataValues[$k] = implode(' ',array_reverse($dataValueY));
+			}
+			$tmp = array_shift($dataValues);
+			$dataValues[] = $tmp;
+			$tmp = array_shift($dataValuesX);
+			$dataValuesX[] = $tmp;
+
+			$this->_graph->SetTitles(array_reverse($dataValues));
+
+			$seriesPlot = new RadarPlot(array_reverse($dataValuesX));
+
+			$dataLabel = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+			$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
+			if ($radarStyle == 'filled') {
+				$seriesPlot->SetFillColor(self::$_colourSet[self::$_plotColour]);
+			}
+			$this->_formatPointMarker($seriesPlot,$marker);
+			$seriesPlot->SetLegend($dataLabel);
+
+			$this->_graph->Add($seriesPlot);
+		}
+	}	//	function _renderPlotRadar()
+
+
+	private function _renderPlotContour($groupID) {
+		$contourStyle = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+		$seriesPlots = array();
+
+		$dataValues = array();
+		//	Loop through each data series in turn
+		for($i = 0; $i < $seriesCount; ++$i) {
+			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+			$dataValues[$i] = $dataValuesX;
+		}
+		$seriesPlot = new ContourPlot($dataValues);
+
+		$this->_graph->Add($seriesPlot);
+	}	//	function _renderPlotContour()
+
+
+	private function _renderPlotStock($groupID) {
+		$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+		$plotOrder = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
+		$seriesPlots = array();
+
+		$dataValues = array();
+		//	Loop through each data series in turn
+		for($i = 0; $i < $seriesCount; ++$i) {
+			$dataValuesY = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+			$dataValuesX = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+			foreach($dataValuesX as $j => $dataValueX)
+			$dataValues[$j][$plotOrder[$i]] = $dataValueX;
+		}
+
+		$seriesPlot = new StockPlot($dataValues);
+
+		$this->_graph->Add($seriesPlot);
+	}	//	function _renderPlotStock()
+
+
+	private function _renderAreaChart($groupCount, $dimensions = '2d') {
+		require_once('jpgraph_line.php');
+
+		$this->_renderCartesianPlotArea();
+
+		for($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotLine($i,True,False,$dimensions);
+		}
+	}	//	function _renderAreaChart()
+
+
+	private function _renderLineChart($groupCount, $dimensions = '2d') {
+		require_once('jpgraph_line.php');
+
+		$this->_renderCartesianPlotArea();
+
+		for($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotLine($i,False,False,$dimensions);
+		}
+	}	//	function _renderLineChart()
+
+
+	private function _renderBarChart($groupCount, $dimensions = '2d') {
+		require_once('jpgraph_bar.php');
+
+		$this->_renderCartesianPlotArea();
+
+		for($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotBar($i,$dimensions);
+		}
+	}	//	function _renderBarChart()
+
+
+	private function _renderScatterChart($groupCount) {
+		require_once('jpgraph_scatter.php');
+		require_once('jpgraph_regstat.php');
+		require_once('jpgraph_line.php');
+
+		$this->_renderCartesianPlotArea('linlin');
+
+		for($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotScatter($i,false);
+		}
+	}	//	function _renderScatterChart()
+
+
+	private function _renderBubbleChart($groupCount) {
+		require_once('jpgraph_scatter.php');
+
+		$this->_renderCartesianPlotArea('linlin');
+
+		for($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotScatter($i,true);
+		}
+	}	//	function _renderBubbleChart()
+
+
+	private function _renderPieChart($groupCount, $dimensions = '2d', $doughnut = False, $multiplePlots = False) {
+		require_once('jpgraph_pie.php');
+		if ($dimensions == '3d') {
+			require_once('jpgraph_pie3d.php');
+		}
+
+		$this->_renderPiePlotArea($doughnut);
+
+		$iLimit = ($multiplePlots) ? $groupCount : 1;
+		for($groupID = 0; $groupID < $iLimit; ++$groupID) {
+			$grouping = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+			$exploded = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+			if ($groupID == 0) {
+		        $labelCount = count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+				if ($labelCount > 0) {
+					$datasetLabels = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+					$datasetLabels = $this->_formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+				}
+			}
+
+			$seriesCount = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+			$seriesPlots = array();
+			//	For pie charts, we only display the first series: doughnut charts generally display all series
+			$jLimit = ($multiplePlots) ? $seriesCount : 1;
+			//	Loop through each data series in turn
+			for($j = 0; $j < $jLimit; ++$j) {
+				$dataValues = $this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+
+				//	Fill in any missing values in the $dataValues array
+				$testCurrentIndex = 0;
+				foreach($dataValues as $k => $dataValue) {
+					while($k != $testCurrentIndex) {
+						$dataValues[$testCurrentIndex] = null;
+						++$testCurrentIndex;
+					}
+					++$testCurrentIndex;
+				}
+
+				if ($dimensions == '3d') {
+					$seriesPlot = new PiePlot3D($dataValues);
+				} else {
+					if ($doughnut) {
+						$seriesPlot = new PiePlotC($dataValues);
+					} else {
+						$seriesPlot = new PiePlot($dataValues);
+					}
+				}
+
+				if ($multiplePlots) {
+					$seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
+				}
+
+				if ($doughnut) {
+					$seriesPlot->SetMidColor('white');
+				}
+
+				$seriesPlot->SetColor(self::$_colourSet[self::$_plotColour++]);
+				if (count($datasetLabels) > 0)
+					$seriesPlot->SetLabels(array_fill(0,count($datasetLabels),''));
+				if ($dimensions != '3d') {
+					$seriesPlot->SetGuideLines(false);
+				}
+				if ($j == 0) {
+					if ($exploded) {
+						$seriesPlot->ExplodeAll();
+					}
+					$seriesPlot->SetLegends($datasetLabels);
+				}
+
+				$this->_graph->Add($seriesPlot);
+			}
+		}
+	}	//	function _renderPieChart()
+
+
+	private function _renderRadarChart($groupCount) {
+		require_once('jpgraph_radar.php');
+
+		$this->_renderRadarPlotArea();
+
+		for($groupID = 0; $groupID < $groupCount; ++$groupID) {
+			$this->_renderPlotRadar($groupID);
+		}
+	}	//	function _renderRadarChart()
+
+
+	private function _renderStockChart($groupCount) {
+		require_once('jpgraph_stock.php');
+
+		$this->_renderCartesianPlotArea();
+
+		for($groupID = 0; $groupID < $groupCount; ++$i) {
+			$this->_renderPlotStock($groupID);
+		}
+	}	//	function _renderStockChart()
+
+
+	private function _renderContourChart($groupCount,$dimensions) {
+		require_once('jpgraph_contour.php');
+
+		$this->_renderCartesianPlotArea('intint');
+
+		for($i = 0; $i < $groupCount; ++$i) {
+			$this->_renderPlotContour($i);
+		}
+	}	//	function _renderContourChart()
+
+
+	private function _renderCombinationChart($groupCount,$dimensions,$outputDestination) {
+		require_once('jpgraph_line.php');
+		require_once('jpgraph_bar.php');
+		require_once('jpgraph_scatter.php');
+		require_once('jpgraph_regstat.php');
+		require_once('jpgraph_line.php');
+
+		$this->_renderCartesianPlotArea();
+
+		for($i = 0; $i < $groupCount; ++$i) {
+			$dimensions = null;
+			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+			switch ($chartType) {
+				case 'area3DChart' :
+					$dimensions = '3d';
+				case 'areaChart' :
+					$this->_renderPlotLine($i,True,True,$dimensions);
+					break;
+				case 'bar3DChart' :
+					$dimensions = '3d';
+				case 'barChart' :
+					$this->_renderPlotBar($i,$dimensions);
+					break;
+				case 'line3DChart' :
+					$dimensions = '3d';
+				case 'lineChart' :
+					$this->_renderPlotLine($i,False,True,$dimensions);
+					break;
+				case 'scatterChart' :
+					$this->_renderPlotScatter($i,false);
+					break;
+				case 'bubbleChart' :
+					$this->_renderPlotScatter($i,true);
+					break;
+				default	:
+					$this->_graph = null;
+					return false;
+			}
+		}
+
+		$this->_renderLegend();
+
+		$this->_graph->Stroke($outputDestination);
+		return true;
+	}	//	function _renderCombinationChart()
+
+
+	public function render($outputDestination) {
+        self::$_plotColour = 0;
+
+		$groupCount = $this->_chart->getPlotArea()->getPlotGroupCount();
+
+		$dimensions = null;
+		if ($groupCount == 1) {
+			$chartType = $this->_chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+		} else {
+			$chartTypes = array();
+			for($i = 0; $i < $groupCount; ++$i) {
+				$chartTypes[] = $this->_chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+			}
+			$chartTypes = array_unique($chartTypes);
+			if (count($chartTypes) == 1) {
+				$chartType = array_pop($chartTypes);
+			} elseif (count($chartTypes) == 0) {
+				echo 'Chart is not yet implemented<br />';
+				return false;
+			} else {
+				return $this->_renderCombinationChart($groupCount,$dimensions,$outputDestination);
+			}
+		}
+
+		switch ($chartType) {
+			case 'area3DChart' :
+				$dimensions = '3d';
+			case 'areaChart' :
+				$this->_renderAreaChart($groupCount,$dimensions);
+				break;
+			case 'bar3DChart' :
+				$dimensions = '3d';
+			case 'barChart' :
+				$this->_renderBarChart($groupCount,$dimensions);
+				break;
+			case 'line3DChart' :
+				$dimensions = '3d';
+			case 'lineChart' :
+				$this->_renderLineChart($groupCount,$dimensions);
+				break;
+			case 'pie3DChart' :
+				$dimensions = '3d';
+			case 'pieChart' :
+				$this->_renderPieChart($groupCount,$dimensions,False,False);
+				break;
+			case 'doughnut3DChart' :
+				$dimensions = '3d';
+			case 'doughnutChart' :
+				$this->_renderPieChart($groupCount,$dimensions,True,True);
+				break;
+			case 'scatterChart' :
+				$this->_renderScatterChart($groupCount);
+				break;
+			case 'bubbleChart' :
+				$this->_renderBubbleChart($groupCount);
+				break;
+			case 'radarChart' :
+				$this->_renderRadarChart($groupCount);
+				break;
+			case 'surface3DChart' :
+				$dimensions = '3d';
+			case 'surfaceChart' :
+				$this->_renderContourChart($groupCount,$dimensions);
+				break;
+			case 'stockChart' :
+				$this->_renderStockChart($groupCount,$dimensions);
+				break;
+			default	:
+				echo $chartType.' is not yet implemented<br />';
+				return false;
+		}
+		$this->_renderLegend();
+
+		$this->_graph->Stroke($outputDestination);
+		return true;
+	}	//	function render()
+
+
+	/**
+	 * Create a new PHPExcel_Chart_Renderer_jpgraph
+	 */
+	public function __construct(PHPExcel_Chart $chart)
+	{
+		$this->_graph	= null;
+		$this->_chart	= $chart;
+	}	//	function __construct()
+
+}	//	PHPExcel_Chart_Renderer_jpgraph
diff --git a/htdocs/includes/phpexcel/PHPExcel/Chart/Title.php b/htdocs/includes/phpexcel/PHPExcel/Chart/Title.php
new file mode 100644
index 00000000000..ef26f465825
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Chart/Title.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Chart_Title
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Chart
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Chart_Title
+{
+
+	/**
+	 * Title Caption
+	 *
+	 * @var string
+	 */
+	private $_caption = null;
+
+	/**
+	 * Title Layout
+	 *
+	 * @var PHPExcel_Chart_Layout
+	 */
+	private $_layout = null;
+
+	/**
+	 * Create a new PHPExcel_Chart_Title
+	 */
+	public function __construct($caption = null, PHPExcel_Chart_Layout $layout = null)
+	{
+		$this->_caption = $caption;
+		$this->_layout = $layout;
+	}
+
+	/**
+	 * Get caption
+	 *
+	 * @return string
+	 */
+	public function getCaption() {
+		return $this->_caption;
+	}
+
+	/**
+	 * Set caption
+	 *
+	 * @param string $caption
+	 */
+	public function setCaption($caption = null) {
+		$this->_caption = $caption;
+	}
+
+	/**
+	 * Get Layout
+	 *
+	 * @return PHPExcel_Chart_Layout
+	 */
+	public function getLayout() {
+		return $this->_layout;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Comment.php b/htdocs/includes/phpexcel/PHPExcel/Comment.php
index 17fac71d38b..4ba239f4b7c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Comment.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Comment.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Comment implements PHPExcel_IComparable
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/DocumentProperties.php b/htdocs/includes/phpexcel/PHPExcel/DocumentProperties.php
index e1bd0ba0dc8..1f4cad247ca 100644
--- a/htdocs/includes/phpexcel/PHPExcel/DocumentProperties.php
+++ b/htdocs/includes/phpexcel/PHPExcel/DocumentProperties.php
@@ -1,28 +1,28 @@
 <?php
 /**
- *	PHPExcel
+ * PHPExcel
  *
- *	Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- *	This library 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
- *	Lesser General Public License for more details.
+ * This library 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
+ * Lesser General Public License for more details.
  *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *	@category	PHPExcel
- *	@package	PHPExcel
- *	@copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
- *	@license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- *	@version	1.7.6, 2011-02-27
+ * @category	PHPExcel
+ * @package	PHPExcel
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_DocumentProperties
 {
@@ -196,7 +196,7 @@ class PHPExcel_DocumentProperties
 	 * @return	PHPExcel_DocumentProperties
 	 */
 	public function setCreated($pValue = null) {
-		if (is_null($pValue)) {
+		if ($pValue === NULL) {
 			$pValue = time();
 		} elseif (is_string($pValue)) {
 			if (is_numeric($pValue)) {
@@ -226,7 +226,7 @@ class PHPExcel_DocumentProperties
 	 * @return	PHPExcel_DocumentProperties
 	 */
 	public function setModified($pValue = null) {
-		if (is_null($pValue)) {
+		if ($pValue === NULL) {
 			$pValue = time();
 		} elseif (is_string($pValue)) {
 			if (is_numeric($pValue)) {
@@ -439,12 +439,12 @@ class PHPExcel_DocumentProperties
 	 * @return	PHPExcel_DocumentProperties
 	 */
 	public function setCustomProperty($propertyName,$propertyValue='',$propertyType=NULL) {
-		if ((is_null($propertyType)) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
+		if (($propertyType === NULL) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
 																	   self::PROPERTY_TYPE_FLOAT,
 																	   self::PROPERTY_TYPE_STRING,
 																	   self::PROPERTY_TYPE_DATE,
 																	   self::PROPERTY_TYPE_BOOLEAN)))) {
-			if (is_null($propertyValue)) {
+			if ($propertyValue === NULL) {
 				$propertyType = self::PROPERTY_TYPE_STRING;
 			} elseif (is_float($propertyValue)) {
 				$propertyType = self::PROPERTY_TYPE_FLOAT;
diff --git a/htdocs/includes/phpexcel/PHPExcel/DocumentSecurity.php b/htdocs/includes/phpexcel/PHPExcel/DocumentSecurity.php
index f10902487e1..32bcb93035d 100644
--- a/htdocs/includes/phpexcel/PHPExcel/DocumentSecurity.php
+++ b/htdocs/includes/phpexcel/PHPExcel/DocumentSecurity.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_DocumentSecurity
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Exception.php b/htdocs/includes/phpexcel/PHPExcel/Exception.php
new file mode 100644
index 00000000000..454eaaa21b1
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Exception.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version	1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Exception
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Exception extends Exception {
+	/**
+	 * Error handler callback
+	 *
+	 * @param mixed $code
+	 * @param mixed $string
+	 * @param mixed $file
+	 * @param mixed $line
+	 * @param mixed $context
+	 */
+	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+		$e = new self($string, $code);
+		$e->line = $line;
+		$e->file = $file;
+		throw $e;
+	}
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/HashTable.php b/htdocs/includes/phpexcel/PHPExcel/HashTable.php
index 8ca647e8b98..ca15e6e7a79 100644
--- a/htdocs/includes/phpexcel/PHPExcel/HashTable.php
+++ b/htdocs/includes/phpexcel/PHPExcel/HashTable.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_HashTable
 {
@@ -57,7 +57,7 @@ class PHPExcel_HashTable
 	 */
 	public function __construct($pSource = null)
 	{
-		if (!is_null($pSource)) {
+		if ($pSource !== NULL) {
 			// Create HashTable
 			$this->addFromSource($pSource);
 		}
diff --git a/htdocs/includes/phpexcel/PHPExcel/IComparable.php b/htdocs/includes/phpexcel/PHPExcel/IComparable.php
index 777c1cd90ea..1c87f398cf4 100644
--- a/htdocs/includes/phpexcel/PHPExcel/IComparable.php
+++ b/htdocs/includes/phpexcel/PHPExcel/IComparable.php
@@ -6,21 +6,21 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -29,7 +29,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_IComparable
 {
@@ -37,7 +37,7 @@ interface PHPExcel_IComparable
 	 * Get hash code
 	 *
 	 * @return string	Hash code
-	 */	
+	 */
 	public function getHashCode();
 
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/IOFactory.php b/htdocs/includes/phpexcel/PHPExcel/IOFactory.php
index f8e2e8c2855..eeeb2af93a1 100644
--- a/htdocs/includes/phpexcel/PHPExcel/IOFactory.php
+++ b/htdocs/includes/phpexcel/PHPExcel/IOFactory.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,16 +20,16 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
 /**	PHPExcel root directory */
 if (!defined('PHPEXCEL_ROOT')) {
 	/**
-	 *	@ignore
+	 * @ignore
 	 */
 	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
 	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
@@ -40,16 +40,16 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_IOFactory
 {
 	/**
-	 *	Search locations
+	 * Search locations
 	 *
-	 *	@var	array
-	 *	@access	private
-	 *	@static
+	 * @var	array
+	 * @access	private
+	 * @static
 	 */
 	private static $_searchLocations = array(
 		array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
@@ -57,11 +57,11 @@ class PHPExcel_IOFactory
 	);
 
 	/**
-	 *	Autoresolve classes
+	 * Autoresolve classes
 	 *
-	 *	@var	array
-	 *	@access	private
-	 *	@static
+	 * @var	array
+	 * @access	private
+	 * @static
 	 */
 	private static $_autoResolveClasses = array(
 		'Excel2007',
@@ -70,6 +70,7 @@ class PHPExcel_IOFactory
 		'OOCalc',
 		'SYLK',
 		'Gnumeric',
+		'HTML',
 		'CSV',
 	);
 
@@ -79,23 +80,23 @@ class PHPExcel_IOFactory
     private function __construct() { }
 
     /**
-     *	Get search locations
+     * Get search locations
      *
-	 *	@static
-	 *	@access	public
-     *	@return	array
+	 * @static
+	 * @access	public
+     * @return	array
      */
 	public static function getSearchLocations() {
 		return self::$_searchLocations;
 	}	//	function getSearchLocations()
 
 	/**
-	 *	Set search locations
+	 * Set search locations
 	 *
-	 *	@static
-	 *	@access	public
-	 *	@param	array $value
-	 *	@throws	Exception
+	 * @static
+	 * @access	public
+	 * @param	array $value
+	 * @throws	Exception
 	 */
 	public static function setSearchLocations($value) {
 		if (is_array($value)) {
@@ -106,27 +107,27 @@ class PHPExcel_IOFactory
 	}	//	function setSearchLocations()
 
 	/**
-	 *	Add search location
+	 * Add search location
 	 *
-	 *	@static
-	 *	@access	public
-	 *	@param	string $type		Example: IWriter
-	 *	@param	string $location	Example: PHPExcel/Writer/{0}.php
-	 *	@param	string $classname 	Example: PHPExcel_Writer_{0}
+	 * @static
+	 * @access	public
+	 * @param	string $type		Example: IWriter
+	 * @param	string $location	Example: PHPExcel/Writer/{0}.php
+	 * @param	string $classname 	Example: PHPExcel_Writer_{0}
 	 */
 	public static function addSearchLocation($type = '', $location = '', $classname = '') {
 		self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
 	}	//	function addSearchLocation()
 
 	/**
-	 *	Create PHPExcel_Writer_IWriter
+	 * Create PHPExcel_Writer_IWriter
 	 *
-	 *	@static
-	 *	@access	public
-	 *	@param	PHPExcel $phpExcel
-	 *	@param	string  $writerType	Example: Excel2007
-	 *	@return	PHPExcel_Writer_IWriter
-	 *	@throws	Exception
+	 * @static
+	 * @access	public
+	 * @param	PHPExcel $phpExcel
+	 * @param	string  $writerType	Example: Excel2007
+	 * @return	PHPExcel_Writer_IWriter
+	 * @throws	Exception
 	 */
 	public static function createWriter(PHPExcel $phpExcel, $writerType = '') {
 		// Search type
@@ -136,10 +137,9 @@ class PHPExcel_IOFactory
 		foreach (self::$_searchLocations as $searchLocation) {
 			if ($searchLocation['type'] == $searchType) {
 				$className = str_replace('{0}', $writerType, $searchLocation['class']);
-				$classFile = str_replace('{0}', $writerType, $searchLocation['path']);
 
 				$instance = new $className($phpExcel);
-				if (!is_null($instance)) {
+				if ($instance !== NULL) {
 					return $instance;
 				}
 			}
@@ -150,13 +150,13 @@ class PHPExcel_IOFactory
 	}	//	function createWriter()
 
 	/**
-	 *	Create PHPExcel_Reader_IReader
+	 * Create PHPExcel_Reader_IReader
 	 *
-	 *	@static
-	 *	@access	public
-	 *	@param	string $readerType	Example: Excel2007
-	 *	@return	PHPExcel_Reader_IReader
-	 *	@throws	Exception
+	 * @static
+	 * @access	public
+	 * @param	string $readerType	Example: Excel2007
+	 * @return	PHPExcel_Reader_IReader
+	 * @throws	Exception
 	 */
 	public static function createReader($readerType = '') {
 		// Search type
@@ -166,10 +166,9 @@ class PHPExcel_IOFactory
 		foreach (self::$_searchLocations as $searchLocation) {
 			if ($searchLocation['type'] == $searchType) {
 				$className = str_replace('{0}', $readerType, $searchLocation['class']);
-				$classFile = str_replace('{0}', $readerType, $searchLocation['path']);
 
 				$instance = new $className();
-				if (!is_null($instance)) {
+				if ($instance !== NULL) {
 					return $instance;
 				}
 			}
@@ -180,13 +179,13 @@ class PHPExcel_IOFactory
 	}	//	function createReader()
 
 	/**
-	 *	Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
+	 * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
 	 *
-	 *	@static
-	 *	@access public
-	 *	@param 	string 		$pFileName
-	 *	@return	PHPExcel
-	 *	@throws	Exception
+	 * @static
+	 * @access public
+	 * @param 	string 		$pFileName		The name of the spreadsheet file
+	 * @return	PHPExcel
+	 * @throws	Exception
 	 */
 	public static function load($pFilename) {
 		$reader = self::createReaderForFile($pFilename);
@@ -194,13 +193,13 @@ class PHPExcel_IOFactory
 	}	//	function load()
 
 	/**
-	 *	Identify file type using automatic PHPExcel_Reader_IReader resolution
+	 * Identify file type using automatic PHPExcel_Reader_IReader resolution
 	 *
-	 *	@static
-	 *	@access public
-	 *	@param 	string 		$pFileName
-	 *	@return	string
-	 *	@throws	Exception
+	 * @static
+	 * @access public
+	 * @param 	string 		$pFileName		The name of the spreadsheet file to identify
+	 * @return	string
+	 * @throws	Exception
 	 */
 	public static function identify($pFilename) {
 		$reader = self::createReaderForFile($pFilename);
@@ -211,38 +210,48 @@ class PHPExcel_IOFactory
 	}	//	function identify()
 
 	/**
-	 *	Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
+	 * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
 	 *
-	 *	@static
-	 *	@access	public
-	 *	@param 	string 		$pFileName
-	 *	@return	PHPExcel_Reader_IReader
-	 *	@throws	Exception
+	 * @static
+	 * @access	public
+	 * @param 	string 		$pFileName		The name of the spreadsheet file
+	 * @return	PHPExcel_Reader_IReader
+	 * @throws	Exception
 	 */
 	public static function createReaderForFile($pFilename) {
 
 		// First, lucky guess by inspecting file extension
 		$pathinfo = pathinfo($pFilename);
 
+		$extensionType = NULL;
 		if (isset($pathinfo['extension'])) {
 			switch (strtolower($pathinfo['extension'])) {
-				case 'xlsx':
-					$reader = self::createReader('Excel2007');
+				case 'xlsx':			//	Excel (OfficeOpenXML) Spreadsheet
+				case 'xlsm':			//	Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
+				case 'xltx':			//	Excel (OfficeOpenXML) Template
+				case 'xltm':			//	Excel (OfficeOpenXML) Macro Template (macros will be discarded)
+					$extensionType = 'Excel2007';
 					break;
-				case 'xls':
-					$reader = self::createReader('Excel5');
+				case 'xls':				//	Excel (BIFF) Spreadsheet
+				case 'xlt':				//	Excel (BIFF) Template
+					$extensionType = 'Excel5';
 					break;
-				case 'ods':
-					$reader = self::createReader('OOCalc');
+				case 'ods':				//	Open/Libre Offic Calc
+				case 'ots':				//	Open/Libre Offic Calc Template
+					$extensionType = 'OOCalc';
 					break;
 				case 'slk':
-					$reader = self::createReader('SYLK');
+					$extensionType = 'SYLK';
 					break;
-				case 'xml':
-					$reader = self::createReader('Excel2003XML');
+				case 'xml':				//	Excel 2003 SpreadSheetML
+					$extensionType = 'Excel2003XML';
 					break;
 				case 'gnumeric':
-					$reader = self::createReader('Gnumeric');
+					$extensionType = 'Gnumeric';
+					break;
+				case 'htm':
+				case 'html':
+					$extensionType = 'HTML';
 					break;
 				case 'csv':
 					// Do nothing
@@ -253,22 +262,27 @@ class PHPExcel_IOFactory
 					break;
 			}
 
-			// Let's see if we are lucky
-			if (isset($reader) && $reader->canRead($pFilename)) {
-				return $reader;
+			if ($extensionType !== NULL) {
+				$reader = self::createReader($extensionType);
+				// Let's see if we are lucky
+				if (isset($reader) && $reader->canRead($pFilename)) {
+					return $reader;
+				}
 			}
-
 		}
 
 		// If we reach here then "lucky guess" didn't give any result
-
-		// Try loading using self::$_autoResolveClasses
+		// Try walking through all the options in self::$_autoResolveClasses
 		foreach (self::$_autoResolveClasses as $autoResolveClass) {
-			$reader = self::createReader($autoResolveClass);
-			if ($reader->canRead($pFilename)) {
-				return $reader;
+			//	Ignore our original guess, we know that won't work
+			if ($autoResolveClass !== $extensionType) {
+				$reader = self::createReader($autoResolveClass);
+				if ($reader->canRead($pFilename)) {
+					return $reader;
+				}
 			}
 		}
 
+		throw new Exception('Unable to identify a reader for this file');
 	}	//	function createReaderForFile()
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/NamedRange.php b/htdocs/includes/phpexcel/PHPExcel/NamedRange.php
index 9afb0f9b40d..3debd41a184 100644
--- a/htdocs/includes/phpexcel/PHPExcel/NamedRange.php
+++ b/htdocs/includes/phpexcel/PHPExcel/NamedRange.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_NamedRange
 {
@@ -82,7 +82,7 @@ class PHPExcel_NamedRange
     public function __construct($pName = null, PHPExcel_Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
     {
     	// Validate data
-    	if (is_null($pName) || is_null($pWorksheet)|| is_null($pRange)) {
+    	if (($pName === NULL) || ($pWorksheet === NULL) || ($pRange === NULL)) {
     		throw new Exception('Parameters can not be null.');
     	}
 
@@ -111,17 +111,17 @@ class PHPExcel_NamedRange
      * @return PHPExcel_NamedRange
      */
     public function setName($value = null) {
-    	if (!is_null($value)) {
+    	if ($value !== NULL) {
     		// Old title
     		$oldTitle = $this->_name;
 
     		// Re-attach
-    		if (!is_null($this->_worksheet)) {
+    		if ($this->_worksheet !== NULL) {
     			$this->_worksheet->getParent()->removeNamedRange($this->_name,$this->_worksheet);
     		}
     		$this->_name = $value;
 
-    		if (!is_null($this->_worksheet)) {
+    		if ($this->_worksheet !== NULL) {
     			$this->_worksheet->getParent()->addNamedRange($this);
     		}
 
@@ -148,7 +148,7 @@ class PHPExcel_NamedRange
      * @return PHPExcel_NamedRange
      */
     public function setWorksheet(PHPExcel_Worksheet $value = null) {
-    	if (!is_null($value)) {
+    	if ($value !== NULL) {
     		$this->_worksheet = $value;
     	}
     	return $this;
@@ -170,7 +170,7 @@ class PHPExcel_NamedRange
      * @return PHPExcel_NamedRange
      */
     public function setRange($value = null) {
-    	if (!is_null($value)) {
+    	if ($value !== NULL) {
     		$this->_range = $value;
     	}
     	return $this;
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/CSV.php b/htdocs/includes/phpexcel/PHPExcel/Reader/CSV.php
index 3bac3af0f23..2739e3c4136 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/CSV.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/CSV.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -40,89 +40,91 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 {
 	/**
-	 *	Input encoding
+	 * Input encoding
 	 *
-	 *	@access	private
-	 *	@var	string
+	 * @access	private
+	 * @var	string
 	 */
 	private $_inputEncoding	= 'UTF-8';
 
 	/**
-	 *	Delimiter
+	 * Delimiter
 	 *
-	 *	@access	private
-	 *	@var string
+	 * @access	private
+	 * @var string
 	 */
 	private $_delimiter		= ',';
 
 	/**
-	 *	Enclosure
+	 * Enclosure
 	 *
-	 *	@access	private
-	 *	@var	string
+	 * @access	private
+	 * @var	string
 	 */
 	private $_enclosure		= '"';
 
 	/**
-	 *	Line ending
+	 * Line ending
 	 *
-	 *	@access	private
-	 *	@var	string
+	 * @access	private
+	 * @var	string
 	 */
 	private $_lineEnding	= PHP_EOL;
 
 	/**
-	 *	Sheet index to read
+	 * Sheet index to read
 	 *
-	 *	@access	private
-	 *	@var	int
+	 * @access	private
+	 * @var	int
 	 */
 	private $_sheetIndex	= 0;
 
 	/**
-	 *	Load rows contiguously
+	 * Load rows contiguously
 	 *
-	 *	@access	private
-	 *	@var	int
+	 * @access	private
+	 * @var	int
 	 */
 	private $_contiguous	= false;
 
 
 	/**
-	 *	Row counter for loading rows contiguously
+	 * Row counter for loading rows contiguously
 	 *
-	 *	@access	private
-	 *	@var	int
+	 * @access	private
+	 * @var	int
 	 */
 	private $_contiguousRow	= -1;
 
 	/**
-	 *	PHPExcel_Reader_IReadFilter instance
+	 * PHPExcel_Reader_IReadFilter instance
 	 *
-	 *	@access	private
-	 *	@var	PHPExcel_Reader_IReadFilter
+	 * @access	private
+	 * @var	PHPExcel_Reader_IReadFilter
 	 */
 	private $_readFilter = null;
 
+
 	/**
-	 *	Create a new PHPExcel_Reader_CSV
+	 * Create a new PHPExcel_Reader_CSV
 	 */
 	public function __construct() {
 		$this->_readFilter		= new PHPExcel_Reader_DefaultReadFilter();
 	}	//	function __construct()
 
+
 	/**
-	 *	Can the current PHPExcel_Reader_IReader read the file?
+	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
-	 *	@access	public
-	 *	@param 	string 		$pFileName
-	 *	@return boolean
-	 *	@throws Exception
+	 * @access	public
+	 * @param 	string 		$pFileName
+	 * @return boolean
+	 * @throws Exception
 	 */
 	public function canRead($pFilename)
 	{
@@ -134,13 +136,133 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 		return true;
 	}	//	function canRead()
 
+
 	/**
-	 *	Loads PHPExcel from file
+	 * Read filter
 	 *
-	 *	@access	public
-	 *	@param 	string 		$pFilename
-	 *	@return PHPExcel
-	 *	@throws Exception
+	 * @access	public
+	 * @return PHPExcel_Reader_IReadFilter
+	 */
+	public function getReadFilter() {
+		return $this->_readFilter;
+	}	//	function getReadFilter()
+
+
+	/**
+	 * Set read filter
+	 *
+	 * @access	public
+	 * @param	PHPExcel_Reader_IReadFilter $pValue
+	 */
+	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
+		$this->_readFilter = $pValue;
+		return $this;
+	}	//	function setReadFilter()
+
+
+	/**
+	 * Set input encoding
+	 *
+	 * @access	public
+	 * @param string $pValue Input encoding
+	 */
+	public function setInputEncoding($pValue = 'UTF-8')
+	{
+		$this->_inputEncoding = $pValue;
+		return $this;
+	}	//	function setInputEncoding()
+
+
+	/**
+	 * Get input encoding
+	 *
+	 * @access	public
+	 * @return string
+	 */
+	public function getInputEncoding()
+	{
+		return $this->_inputEncoding;
+	}	//	function getInputEncoding()
+
+
+	/**
+	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+	 *
+	 * @access	public
+	 * @param 	string 		$pFilename
+	 * @throws	Exception
+	 */
+	public function listWorksheetInfo($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		// Open file
+		$fileHandle = fopen($pFilename, 'r');
+		if ($fileHandle === false) {
+			throw new Exception("Could not open file " . $pFilename . " for reading.");
+		}
+
+		// Skip BOM, if any
+		switch ($this->_inputEncoding) {
+			case 'UTF-8':
+				fgets($fileHandle, 4) == "\xEF\xBB\xBF" ?
+				fseek($fileHandle, 3) : fseek($fileHandle, 0);
+				break;
+			case 'UTF-16LE':
+				fgets($fileHandle, 3) == "\xFF\xFE" ?
+				fseek($fileHandle, 2) : fseek($fileHandle, 0);
+				break;
+			case 'UTF-16BE':
+				fgets($fileHandle, 3) == "\xFE\xFF" ?
+				fseek($fileHandle, 2) : fseek($fileHandle, 0);
+				break;
+			case 'UTF-32LE':
+				fgets($fileHandle, 5) == "\xFF\xFE\x00\x00" ?
+				fseek($fileHandle, 4) : fseek($fileHandle, 0);
+				break;
+			case 'UTF-32BE':
+				fgets($fileHandle, 5) == "\x00\x00\xFE\xFF" ?
+				fseek($fileHandle, 4) : fseek($fileHandle, 0);
+				break;
+			default:
+				break;
+		}
+
+		$escapeEnclosures = array( "\\" . $this->_enclosure, $this->_enclosure . $this->_enclosure );
+
+		$worksheetInfo = array();
+		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
+		$worksheetInfo[0]['lastColumnLetter'] = 'A';
+		$worksheetInfo[0]['lastColumnIndex'] = 0;
+		$worksheetInfo[0]['totalRows'] = 0;
+		$worksheetInfo[0]['totalColumns'] = 0;
+
+		// Loop through each line of the file in turn
+		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
+			$worksheetInfo[0]['totalRows']++;
+			$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
+		}
+
+		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
+		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+
+		// Close file
+		fclose($fileHandle);
+
+		return $worksheetInfo;
+	}
+
+
+	/**
+	 * Loads PHPExcel from file
+	 *
+	 * @access	public
+	 * @param 	string 		$pFilename
+	 * @return PHPExcel
+	 * @throws Exception
 	 */
 	public function load($pFilename)
 	{
@@ -151,58 +273,15 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 		return $this->loadIntoExisting($pFilename, $objPHPExcel);
 	}	//	function load()
 
-	/**
-	 *	Read filter
-	 *
-	 *	@access	public
-	 *	@return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}	//	function getReadFilter()
 
 	/**
-	 *	Set read filter
+	 * Loads PHPExcel from file into PHPExcel instance
 	 *
-	 *	@access	public
-	 *	@param	PHPExcel_Reader_IReadFilter $pValue
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}	//	function setReadFilter()
-
-	/**
-	 *	Set input encoding
-	 *
-	 *	@access	public
-	 *	@param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'UTF-8')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}	//	function setInputEncoding()
-
-	/**
-	 *	Get input encoding
-	 *
-	 *	@access	public
-	 *	@return string
-	 */
-	public function getInputEncoding()
-	{
-		return $this->_inputEncoding;
-	}	//	function getInputEncoding()
-
-	/**
-	 *	Loads PHPExcel from file into PHPExcel instance
-	 *
-	 *	@access	public
-	 *	@param 	string 		$pFilename
-	 *	@param	PHPExcel	$objPHPExcel
-	 *	@return 	PHPExcel
-	 *	@throws 	Exception
+	 * @access	public
+	 * @param 	string 		$pFilename
+	 * @param	PHPExcel	$objPHPExcel
+	 * @return 	PHPExcel
+	 * @throws 	Exception
 	 */
 	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
 	{
@@ -215,7 +294,10 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
 			$objPHPExcel->createSheet();
 		}
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+		$sheet = $objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+
+		$lineEnding = ini_get('auto_detect_line_endings');
+		ini_set('auto_detect_line_endings', true);
 
 		// Open file
 		$fileHandle = fopen($pFilename, 'r');
@@ -256,7 +338,7 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 		// Set our starting row based on whether we're in contiguous mode or not
 		$currentRow = 1;
 		if ($this->_contiguous) {
-			$currentRow = ($this->_contiguousRow == -1) ? $objPHPExcel->getActiveSheet()->getHighestRow(): $this->_contiguousRow;
+			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow(): $this->_contiguousRow;
 		}
 
 		// Loop through each line of the file in turn
@@ -273,7 +355,7 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 					}
 
 					// Set cell value
-					$objPHPExcel->getActiveSheet()->getCell($columnLetter . $currentRow)->setValue($rowDatum);
+					$sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
 				}
 				++$columnLetter;
 			}
@@ -287,48 +369,54 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 			$this->_contiguousRow = $currentRow;
 		}
 
+		ini_set('auto_detect_line_endings', $lineEnding);
+
 		// Return
 		return $objPHPExcel;
 	}	//	function loadIntoExisting()
 
+
 	/**
-	 *	Get delimiter
+	 * Get delimiter
 	 *
-	 *	@access	public
-	 *	@return string
+	 * @access	public
+	 * @return string
 	 */
 	public function getDelimiter() {
 		return $this->_delimiter;
 	}	//	function getDelimiter()
 
+
 	/**
-	 *	Set delimiter
+	 * Set delimiter
 	 *
-	 *	@access	public
-	 *	@param	string	$pValue		Delimiter, defaults to ,
-	 *	@return	PHPExcel_Reader_CSV
+	 * @access	public
+	 * @param	string	$pValue		Delimiter, defaults to ,
+	 * @return	PHPExcel_Reader_CSV
 	 */
 	public function setDelimiter($pValue = ',') {
 		$this->_delimiter = $pValue;
 		return $this;
 	}	//	function setDelimiter()
 
+
 	/**
-	 *	Get enclosure
+	 * Get enclosure
 	 *
-	 *	@access	public
-	 *	@return string
+	 * @access	public
+	 * @return string
 	 */
 	public function getEnclosure() {
 		return $this->_enclosure;
 	}	//	function getEnclosure()
 
+
 	/**
-	 *	Set enclosure
+	 * Set enclosure
 	 *
-	 *	@access	public
-	 *	@param	string	$pValue		Enclosure, defaults to "
-	 *	@return PHPExcel_Reader_CSV
+	 * @access	public
+	 * @param	string	$pValue		Enclosure, defaults to "
+	 * @return PHPExcel_Reader_CSV
 	 */
 	public function setEnclosure($pValue = '"') {
 		if ($pValue == '') {
@@ -338,55 +426,60 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 		return $this;
 	}	//	function setEnclosure()
 
+
 	/**
-	 *	Get line ending
+	 * Get line ending
 	 *
-	 *	@access	public
-	 *	@return string
+	 * @access	public
+	 * @return string
 	 */
 	public function getLineEnding() {
 		return $this->_lineEnding;
 	}	//	function getLineEnding()
 
+
 	/**
-	 *	Set line ending
+	 * Set line ending
 	 *
-	 *	@access	public
-	 *	@param	string	$pValue		Line ending, defaults to OS line ending (PHP_EOL)
-	 *	@return PHPExcel_Reader_CSV
+	 * @access	public
+	 * @param	string	$pValue		Line ending, defaults to OS line ending (PHP_EOL)
+	 * @return PHPExcel_Reader_CSV
 	 */
 	public function setLineEnding($pValue = PHP_EOL) {
 		$this->_lineEnding = $pValue;
 		return $this;
 	}	//	function setLineEnding()
 
+
 	/**
-	 *	Get sheet index
+	 * Get sheet index
 	 *
-	 *	@access	public
-	 *	@return int
+	 * @access	public
+	 * @return int
 	 */
 	public function getSheetIndex() {
 		return $this->_sheetIndex;
 	}	//	function getSheetIndex()
 
+
 	/**
-	 *	Set sheet index
+	 * Set sheet index
 	 *
-	 *	@access	public
-	 *	@param	int		$pValue		Sheet index
-	 *	@return PHPExcel_Reader_CSV
+	 * @access	public
+	 * @param	int		$pValue		Sheet index
+	 * @return PHPExcel_Reader_CSV
 	 */
 	public function setSheetIndex($pValue = 0) {
 		$this->_sheetIndex = $pValue;
 		return $this;
 	}	//	function setSheetIndex()
 
+
 	/**
-	 *	Set Contiguous
+	 * Set Contiguous
 	 *
-	 *	@access	public
-	 *	@param string $pValue Input encoding
+	 * @access	public
+	 * @param string $pValue Input encoding
 	 */
 	public function setContiguous($contiguous = false)
 	{
@@ -398,11 +491,12 @@ class PHPExcel_Reader_CSV implements PHPExcel_Reader_IReader
 		return $this;
 	}	//	function setInputEncoding()
 
+
 	/**
-	 *	Get Contiguous
+	 * Get Contiguous
 	 *
-	 *	@access	public
-	 *	@return boolean
+	 * @access	public
+	 * @return boolean
 	 */
 	public function getContiguous() {
 		return $this->_contiguous;
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/DefaultReadFilter.php b/htdocs/includes/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
index 9255f2dfaff..276b974eecc 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -40,7 +40,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_DefaultReadFilter implements PHPExcel_Reader_IReadFilter
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2003XML.php b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2003XML.php
index cb91a746b34..33ffe6dcb3f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2003XML.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2003XML.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -40,7 +40,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 {
@@ -72,6 +72,21 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 	 */
 	private $_readFilter = null;
 
+	/**
+	 * Character set used in the file
+	 *
+	 * @var string
+	 */
+	private $_charSet = 'UTF-8';
+
+
+	/**
+	 * Create a new PHPExcel_Reader_Excel2003XML
+	 */
+	public function __construct() {
+		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+	}
+
 
 	/**
 	 * Read data only?
@@ -82,6 +97,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this->_readDataOnly;
 	}
 
+
 	/**
 	 * Set read data only
 	 *
@@ -93,6 +109,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
 	 * Get which sheets to load
 	 *
@@ -103,6 +120,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this->_loadSheetsOnly;
 	}
 
+
 	/**
 	 * Set which sheets to load
 	 *
@@ -116,6 +134,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
 	 * Set all sheets to load
 	 *
@@ -127,6 +146,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
 	 * Read filter
 	 *
@@ -136,6 +156,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this->_readFilter;
 	}
 
+
 	/**
 	 * Set read filter
 	 *
@@ -147,31 +168,26 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
-	/**
-	 * Create a new PHPExcel_Reader_Excel2003XML
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @param 	string 		$pFileName
 	 * @return 	boolean
+	 * @throws Exception
 	 */
 	public function canRead($pFilename)
 	{
 
-//	Office					xmlns:o="urn:schemas-microsoft-com:office:office"
-//	Excel					xmlns:x="urn:schemas-microsoft-com:office:excel"
-//	XML Spreadsheet			xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
-//	Spreadsheet component	xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet"
-//	XML schema 				xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
-//	XML data type			xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
-//	MS-persist recordset	xmlns:rs="urn:schemas-microsoft-com:rowset"
-//	Rowset					xmlns:z="#RowsetSchema"
-//
+		//	Office					xmlns:o="urn:schemas-microsoft-com:office:office"
+		//	Excel					xmlns:x="urn:schemas-microsoft-com:office:excel"
+		//	XML Spreadsheet			xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+		//	Spreadsheet component	xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet"
+		//	XML schema 				xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
+		//	XML data type			xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
+		//	MS-persist recordset	xmlns:rs="urn:schemas-microsoft-com:rowset"
+		//	Rowset					xmlns:z="#RowsetSchema"
+		//
 
 		$signature = array(
 				'<?xml version="1.0"',
@@ -197,9 +213,16 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 			}
 		}
 
+		//	Retrieve charset encoding
+		if(preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um',$data,$matches)) {
+			$this->_charSet = strtoupper($matches[1]);
+		}
+//		echo 'Character Set is ',$this->_charSet,'<br />';
+
 		return $valid;
 	}
 
+
 	/**
 	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
 	 *
@@ -212,6 +235,9 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		if (!file_exists($pFilename)) {
 			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
 		}
+		if (!$this->canRead($pFilename)) {
+			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
+		}
 
 		$worksheetNames = array();
 
@@ -221,7 +247,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		$xml_ss = $xml->children($namespaces['ss']);
 		foreach($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
-			$worksheetNames[] = $worksheet_ss['Name'];
+			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
 		}
 
 		return $worksheetNames;
@@ -229,6 +255,77 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 
 
 	/**
+	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+	 *
+	 * @param   string     $pFilename
+	 * @throws   Exception
+	 */
+	public function listWorksheetInfo($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		$worksheetInfo = array();
+
+		$xml = simplexml_load_file($pFilename);
+		$namespaces = $xml->getNamespaces(true);
+
+		$worksheetID = 1;
+		$xml_ss = $xml->children($namespaces['ss']);
+		foreach($xml_ss->Worksheet as $worksheet) {
+			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
+
+			$tmpInfo = array();
+			$tmpInfo['worksheetName'] = '';
+			$tmpInfo['lastColumnLetter'] = 'A';
+			$tmpInfo['lastColumnIndex'] = 0;
+			$tmpInfo['totalRows'] = 0;
+			$tmpInfo['totalColumns'] = 0;
+
+			if (isset($worksheet_ss['Name'])) {
+				$tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
+			} else {
+				$tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
+			}
+
+			if (isset($worksheet->Table->Row)) {
+				$rowIndex = 0;
+
+				foreach($worksheet->Table->Row as $rowData) {
+					$columnIndex = 0;
+					$rowHasData = false;
+
+					foreach($rowData->Cell as $cell) {
+						if (isset($cell->Data)) {
+							$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+							$rowHasData = true;
+						}
+
+						++$columnIndex;
+					}
+
+					++$rowIndex;
+
+					if ($rowHasData) {
+						$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+					}
+				}
+			}
+
+			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+			$worksheetInfo[] = $tmpInfo;
+			++$worksheetID;
+		}
+
+		return $worksheetInfo;
+	}
+
+
+    /**
 	 * Loads PHPExcel from file
 	 *
 	 * @param 	string 		$pFilename
@@ -244,6 +341,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $this->loadIntoExisting($pFilename, $objPHPExcel);
 	}
 
+
 	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
 		$styleAttributeValue = strtolower($styleAttributeValue);
 		foreach($styleList as $style) {
@@ -255,6 +353,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return false;
 	}
 
+
  	/**
  	 * pixel units to excel width units(units of 1/256th of a character width)
  	 * @param pxs
@@ -268,6 +367,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $widthUnits;
 	}
 
+
 	/**
 	 * excel width units(units of 1/256th of a character width) to pixel units
 	 * @param widthUnits
@@ -285,6 +385,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return chr(hexdec($hex[1]));
 	}
 
+
 	/**
 	 * Loads PHPExcel from file into PHPExcel instance
 	 *
@@ -329,6 +430,10 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
 		}
 
+		if (!$this->canRead($pFilename)) {
+			throw new Exception($pFilename . " is an Invalid Spreadsheet file.");
+		}
+
 		$xml = simplexml_load_file($pFilename);
 		$namespaces = $xml->getNamespaces(true);
 
@@ -337,39 +442,39 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 			foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
 				switch ($propertyName) {
 					case 'Title' :
-							$docProps->setTitle($propertyValue);
+							$docProps->setTitle(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'Subject' :
-							$docProps->setSubject($propertyValue);
+							$docProps->setSubject(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'Author' :
-							$docProps->setCreator($propertyValue);
+							$docProps->setCreator(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'Created' :
 							$creationDate = strtotime($propertyValue);
 							$docProps->setCreated($creationDate);
 							break;
 					case 'LastAuthor' :
-							$docProps->setLastModifiedBy($propertyValue);
+							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'LastSaved' :
 							$lastSaveDate = strtotime($propertyValue);
 							$docProps->setModified($lastSaveDate);
 							break;
 					case 'Company' :
-							$docProps->setCompany($propertyValue);
+							$docProps->setCompany(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'Category' :
-							$docProps->setCategory($propertyValue);
+							$docProps->setCategory(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'Manager' :
-							$docProps->setManager($propertyValue);
+							$docProps->setManager(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'Keywords' :
-							$docProps->setKeywords($propertyValue);
+							$docProps->setKeywords(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 					case 'Description' :
-							$docProps->setDescription($propertyValue);
+							$docProps->setDescription(self::_convertStringEncoding($propertyValue,$this->_charSet));
 							break;
 				}
 			}
@@ -462,7 +567,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 												break;
 									}
 								}
-								if (count($thisBorder) > 0) {
+								if (!empty($thisBorder)) {
 									if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
 										$this->_styles[$styleID]['borders'][$borderPosition] = $thisBorder;
 									}
@@ -535,6 +640,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 
 		$worksheetID = 0;
 		$xml_ss = $xml->children($namespaces['ss']);
+
 		foreach($xml_ss->Worksheet as $worksheet) {
 			$worksheet_ss = $worksheet->attributes($namespaces['ss']);
 
@@ -549,8 +655,11 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 			$objPHPExcel->createSheet();
 			$objPHPExcel->setActiveSheetIndex($worksheetID);
 			if (isset($worksheet_ss['Name'])) {
-				$worksheetName = (string) $worksheet_ss['Name'];
-				$objPHPExcel->getActiveSheet()->setTitle($worksheetName);
+				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+				//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+				//		formula cells... during the load, all formulae should be correct, and we're simply bringing
+				//		the worksheet name in line with the formula, not the reverse
+				$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
 			}
 
 			$columnID = 'A';
@@ -588,7 +697,7 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 						}
 						$cellRange = $columnID.$rowID;
 
-						if (!is_null($this->getReadFilter())) {
+						if ($this->getReadFilter() !== NULL) {
 							if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
 								continue;
 							}
@@ -630,11 +739,12 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 									const TYPE_FORMULA		= 'f';
 									const TYPE_NUMERIC		= 'n';
 									const TYPE_BOOL			= 'b';
-								    const TYPE_NULL			= 's';
+								    const TYPE_NULL			= 'null';
 								    const TYPE_INLINE		= 'inlineStr';
 									const TYPE_ERROR		= 'e';
 									*/
 									case 'String' :
+											$cellValue = self::_convertStringEncoding($cellValue,$this->_charSet);
 											$type = PHPExcel_Cell_DataType::TYPE_STRING;
 											break;
 									case 'Number' :
@@ -735,14 +845,14 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 							$annotation = strip_tags($node);
 //							echo 'Annotation: ',$annotation,'<br />';
 							$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-															->setAuthor( $author )
+															->setAuthor(self::_convertStringEncoding($author ,$this->_charSet))
 															->setText($this->_parseRichText($annotation) );
 						}
 
 						if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
 							$style = (string) $cell_ss['StyleID'];
 //							echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
-							if ((isset($this->_styles[$style])) && (count($this->_styles[$style]) > 0)) {
+							if ((isset($this->_styles[$style])) && (!empty($this->_styles[$style]))) {
 //								echo 'Cell '.$columnID.$rowID.'<br />';
 //								print_r($this->_styles[$style]);
 //								echo '<br />';
@@ -776,10 +886,19 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		return $objPHPExcel;
 	}
 
+
+	private static function _convertStringEncoding($string,$charset) {
+		if ($charset != 'UTF-8') {
+			return PHPExcel_Shared_String::ConvertEncoding($string,'UTF-8',$charset);
+		}
+		return $string;
+	}
+
+
 	private function _parseRichText($is = '') {
 		$value = new PHPExcel_RichText();
 
-		$value->createText($is);
+		$value->createText(self::_convertStringEncoding($is,$this->_charSet));
 
 		return $value;
 	}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007.php b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007.php
index ae38cbfd6c8..fbb9158ebd3 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -36,118 +36,169 @@ if (!defined('PHPEXCEL_ROOT')) {
 }
 
 /**
- *	PHPExcel_Reader_Excel2007
+ * PHPExcel_Reader_Excel2007
  *
- *	@category	PHPExcel
- *	@package	PHPExcel_Reader
- *	@copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @category	PHPExcel
+ * @package	PHPExcel_Reader
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 {
 	/**
-	 *	Read data only?
-	 *	Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
+	 * Read data only?
+	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
 	 *		or whether it should read both data and formatting
 	 *
-	 *	@var	boolean
+	 * @var	boolean
 	 */
-	private $_readDataOnly = false;
+	private $_readDataOnly = FALSE;
 
 	/**
-	 *	Restrict which sheets should be loaded?
-	 *	This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+	 * Read charts that are defined in the workbook?
+	 * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;
 	 *
-	 *	@var array of string
+	 * @var	boolean
 	 */
-	private $_loadSheetsOnly = null;
+	private $_includeCharts = FALSE;
+
+	/**
+	 * Restrict which sheets should be loaded?
+	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+	 *
+	 * @var array of string
+	 */
+	private $_loadSheetsOnly = NULL;
 
 	/**
 	 * PHPExcel_Reader_IReadFilter instance
 	 *
 	 * @var PHPExcel_Reader_IReadFilter
 	 */
-	private $_readFilter = null;
+	private $_readFilter = NULL;
 
 	/**
 	 * PHPExcel_ReferenceHelper instance
 	 *
 	 * @var PHPExcel_ReferenceHelper
 	 */
-	private $_referenceHelper = null;
+	private $_referenceHelper = NULL;
 
 	/**
 	 * PHPExcel_Reader_Excel2007_Theme instance
 	 *
 	 * @var PHPExcel_Reader_Excel2007_Theme
 	 */
-	private static $_theme = null;
+	private static $_theme = NULL;
 
 
 	/**
-	 *	Read data only?
+	 * Create a new PHPExcel_Reader_Excel2007 instance
+	 */
+	public function __construct() {
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
+		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
+	}
+
+
+	/**
+	 * Read data only?
 	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
 	 *		If false (the default) it will read data and formatting.
 	 *
-	 *	@return	boolean
+	 * @return	boolean
 	 */
 	public function getReadDataOnly() {
 		return $this->_readDataOnly;
 	}
 
+
 	/**
-	 *	Set read data only
+	 * Set read data only
 	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
 	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
 	 *
-	 *	@param	boolean	$pValue
+	 * @param	boolean	$pValue
 	 *
-	 *	@return	PHPExcel_Reader_Excel2007
+	 * @return	PHPExcel_Reader_Excel2007
 	 */
-	public function setReadDataOnly($pValue = false) {
+	public function setReadDataOnly($pValue = FALSE) {
 		$this->_readDataOnly = $pValue;
 		return $this;
 	}
 
+
 	/**
-	 *	Get which sheets to load
-	 *		Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *			indicating that all worksheets in the workbook should be loaded.
+	 * Read charts in workbook?
+	 *		If this is true, then the Reader will include any charts that exist in the workbook.
+	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+	 *		If false (the default) it will ignore any charts defined in the workbook file.
 	 *
-	 *	@return mixed
+	 * @return	boolean
+	 */
+	public function getIncludeCharts() {
+		return $this->_includeCharts;
+	}
+
+
+	/**
+	 * Set read charts in workbook
+	 *		Set to true, to advise the Reader to include any charts that exist in the workbook.
+	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+	 *		Set to false (the default) to discard charts.
+	 *
+	 * @param	boolean	$pValue
+	 *
+	 * @return	PHPExcel_Reader_Excel2007
+	 */
+	public function setIncludeCharts($pValue = FALSE) {
+		$this->_includeCharts = (boolean) $pValue;
+		return $this;
+	}
+
+
+	/**
+	 * Get which sheets to load
+	 * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
+	 *		indicating that all worksheets in the workbook should be loaded.
+	 *
+	 * @return mixed
 	 */
 	public function getLoadSheetsOnly()
 	{
 		return $this->_loadSheetsOnly;
 	}
 
+
 	/**
-	 *	Set which sheets to load
+	 * Set which sheets to load
 	 *
-	 *	@param mixed $value
+	 * @param mixed $value
 	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
 	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
 	 *
-	 *	@return PHPExcel_Reader_Excel2007
+	 * @return PHPExcel_Reader_Excel2007
 	 */
-	public function setLoadSheetsOnly($value = null)
+	public function setLoadSheetsOnly($value = NULL)
 	{
 		$this->_loadSheetsOnly = is_array($value) ?
 			$value : array($value);
 		return $this;
 	}
 
+
 	/**
-	 *	Set all sheets to load
+	 * Set all sheets to load
 	 *		Tells the Reader to load all worksheets from the workbook.
 	 *
-	 *	@return PHPExcel_Reader_Excel2007
+	 * @return PHPExcel_Reader_Excel2007
 	 */
 	public function setLoadAllSheets()
 	{
-		$this->_loadSheetsOnly = null;
+		$this->_loadSheetsOnly = NULL;
 		return $this;
 	}
 
+
 	/**
 	 * Read filter
 	 *
@@ -157,6 +208,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		return $this->_readFilter;
 	}
 
+
 	/**
 	 * Set read filter
 	 *
@@ -168,46 +220,42 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
-	/**
-	 * Create a new PHPExcel_Reader_Excel2007 instance
-	 */
-	public function __construct() {
-		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
-		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
-	}
 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @param 	string 		$pFileName
 	 * @return 	boolean
+	 * @throws Exception
 	 */
 	public function canRead($pFilename)
 	{
-		// Check if zip class exists
-		if (!class_exists('ZipArchive')) {
-			return false;
-		}
-
 		// Check if file exists
 		if (!file_exists($pFilename)) {
 			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
 		}
 
+		// Check if zip class exists
+		if (!class_exists('ZipArchive',FALSE)) {
+			throw new Exception("ZipArchive library is not enabled");
+		}
+
 		$xl = false;
 		// Load file
 		$zip = new ZipArchive;
 		if ($zip->open($pFilename) === true) {
 			// check if it is an OOXML archive
 			$rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels"));
-			foreach ($rels->Relationship as $rel) {
-				switch ($rel["Type"]) {
-					case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
-						if (basename($rel["Target"]) == 'workbook.xml') {
-							$xl = true;
-						}
-						break;
+			if ($rels !== false) {
+				foreach ($rels->Relationship as $rel) {
+					switch ($rel["Type"]) {
+						case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
+							if (basename($rel["Target"]) == 'workbook.xml') {
+								$xl = true;
+							}
+							break;
 
+					}
 				}
 			}
 			$zip->close();
@@ -216,31 +264,110 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		return $xl;
 	}
 
+
+	/**
+	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+	 *
+	 * @param   string     $pFilename
+	 * @throws   Exception
+	 */
+	public function listWorksheetInfo($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		$worksheetInfo = array();
+
+		$zip = new ZipArchive;
+		$zip->open($pFilename);
+
+		$rels = simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels")); //~ http://schemas.openxmlformats.org/package/2006/relationships");
+		foreach ($rels->Relationship as $rel) {
+			if ($rel["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument") {
+				$dir = dirname($rel["Target"]);
+				$relsWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" . basename($rel["Target"]) . ".rels"));  //~ http://schemas.openxmlformats.org/package/2006/relationships");
+				$relsWorkbook->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006/relationships");
+
+				$worksheets = array();
+				foreach ($relsWorkbook->Relationship as $ele) {
+					if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet") {
+						$worksheets[(string) $ele["Id"]] = $ele["Target"];
+					}
+				}
+
+				$xmlWorkbook = simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+				if ($xmlWorkbook->sheets) {
+					$dir = dirname($rel["Target"]);
+					foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
+						$tmpInfo = array();
+						$tmpInfo['worksheetName'] = (string) $eleSheet["name"];
+						$tmpInfo['lastColumnLetter'] = 'A';
+						$tmpInfo['lastColumnIndex'] = 0;
+						$tmpInfo['totalRows'] = 0;
+						$tmpInfo['totalColumns'] = 0;
+
+						$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
+						$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+						if ($xmlSheet && $xmlSheet->sheetData && $xmlSheet->sheetData->row) {
+							foreach ($xmlSheet->sheetData->row as $row) {
+								foreach ($row->c as $c) {
+									$r = (string) $c["r"];
+									$coordinates = PHPExcel_Cell::coordinateFromString($r);
+
+									$rowIndex = $coordinates[1];
+									$columnIndex = PHPExcel_Cell::columnIndexFromString($coordinates[0]) - 1;
+
+									$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+									$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+								}
+							}
+						}
+
+						$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+						$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+						$worksheetInfo[] = $tmpInfo;
+					}
+				}
+			}
+		}
+
+		$zip->close();
+
+		return $worksheetInfo;
+	}
+
+
 	private static function _castToBool($c) {
 //		echo 'Initial Cast to Boolean<br />';
-		$value = isset($c->v) ? (string) $c->v : null;
+		$value = isset($c->v) ? (string) $c->v : NULL;
 		if ($value == '0') {
-			return false;
+			return FALSE;
 		} elseif ($value == '1') {
-			return true;
+			return TRUE;
 		} else {
 			return (bool)$c->v;
 		}
 		return $value;
 	}	//	function _castToBool()
 
+
 	private static function _castToError($c) {
 //		echo 'Initial Cast to Error<br />';
-		return isset($c->v) ? (string) $c->v : null;;
+		return isset($c->v) ? (string) $c->v : NULL;
 	}	//	function _castToError()
 
+
 	private static function _castToString($c) {
 //		echo 'Initial Cast to String<br />';
-		return isset($c->v) ? (string) $c->v : null;;
+		return isset($c->v) ? (string) $c->v : NULL;
 	}	//	function _castToString()
 
+
 	private function _castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType) {
-//		echo '<font color="darkgreen">Formula</font><br />';
+//		echo 'Formula<br />';
 //		echo '$c->f is '.$c->f.'<br />';
 		$cellDataType 		= 'f';
 		$value 				= "={$c->f}";
@@ -248,7 +375,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 
 		// Shared formula?
 		if (isset($c->f['t']) && strtolower((string)$c->f['t']) == 'shared') {
-//			echo '<font color="darkgreen">SHARED FORMULA</font><br />';
+//			echo 'SHARED FORMULA<br />';
 			$instance = (string)$c->f['si'];
 
 //			echo 'Instance ID = '.$instance.'<br />';
@@ -257,7 +384,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 //			print_r($sharedFormulas);
 //			echo '</pre>';
 			if (!isset($sharedFormulas[(string)$c->f['si']])) {
-//				echo '<font color="darkgreen">SETTING NEW SHARED FORMULA</font><br />';
+//				echo 'SETTING NEW SHARED FORMULA<br />';
 //				echo 'Master is '.$r.'<br />';
 //				echo 'Formula is '.$value.'<br />';
 				$sharedFormulas[$instance] = array(	'master' => $r,
@@ -267,7 +394,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 //				print_r($sharedFormulas);
 //				echo '</pre>';
 			} else {
-//				echo '<font color="darkgreen">GETTING SHARED FORMULA</font><br />';
+//				echo 'GETTING SHARED FORMULA<br />';
 //				echo 'Master is '.$sharedFormulas[$instance]['master'].'<br />';
 //				echo 'Formula is '.$sharedFormulas[$instance]['formula'].'<br />';
 				$master = PHPExcel_Cell::coordinateFromString($sharedFormulas[$instance]['master']);
@@ -287,6 +414,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	public function _getFromZipArchive(ZipArchive $archive, $fileName = '')
 	{
 		// Root-relative paths
@@ -306,6 +434,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		return $contents;
 	}
 
+
 	/**
 	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
 	 *
@@ -491,7 +620,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 					if ($xmlStyles && $xmlStyles->numFmts[0]) {
 						$numFmts = $xmlStyles->numFmts[0];
 					}
-					if (isset($numFmts) && !is_null($numFmts)) {
+					if (isset($numFmts) && ($numFmts !== NULL)) {
 						$numFmts->registerXPathNamespace("sml", "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 					}
 					if (!$this->_readDataOnly && $xmlStyles) {
@@ -560,16 +689,16 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 
 					$dxfs = array();
 					if (!$this->_readDataOnly && $xmlStyles) {
+						//	Conditional Styles
 						if ($xmlStyles->dxfs) {
 							foreach ($xmlStyles->dxfs->dxf as $dxf) {
-								$style = new PHPExcel_Style;
+								$style = new PHPExcel_Style(FALSE, TRUE);
 								self::_readStyle($style, $dxf);
 								$dxfs[] = $style;
 							}
 						}
-
-						if ($xmlStyles->cellStyles)
-						{
+						//	Cell Styles
+						if ($xmlStyles->cellStyles) {
 							foreach ($xmlStyles->cellStyles->cellStyle as $cellStyle) {
 								if (intval($cellStyle['builtinId']) == 0) {
 									if (isset($cellStyles[intval($cellStyle['xfId'])])) {
@@ -602,8 +731,10 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 					$countSkippedSheets = 0; // keep track of number of skipped sheets
 					$mapSheetId = array(); // mapping of sheet ids from old to new
 
-					if ($xmlWorkbook->sheets)
-					{
+
+					$charts = $chartDetails = array();
+
+					if ($xmlWorkbook->sheets) {
 						foreach ($xmlWorkbook->sheets->sheet as $eleSheet) {
 							++$oldSheetId;
 
@@ -620,7 +751,11 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 
 							// Load sheet
 							$docSheet = $excel->createSheet();
-							$docSheet->setTitle((string) $eleSheet["name"]);
+							//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet
+							//		references in formula cells... during the load, all formulae should be correct,
+							//		and we're simply bringing the worksheet name in line with the formula, not the
+							//		reverse
+							$docSheet->setTitle((string) $eleSheet["name"],false);
 							$fileWorksheet = $worksheets[(string) self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "id")];
 							$xmlSheet = simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$fileWorksheet"));  //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
 
@@ -639,6 +774,10 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 								    $docSheet->getSheetView()->setZoomScaleNormal( intval($xmlSheet->sheetViews->sheetView['zoomScaleNormal']) );
 								}
 
+							    if (isset($xmlSheet->sheetViews->sheetView['view'])) {
+								    $docSheet->getSheetView()->setView((string) $xmlSheet->sheetViews->sheetView['view']);
+								}
+
 								if (isset($xmlSheet->sheetViews->sheetView['showGridLines'])) {
 									$docSheet->setShowGridLines((string)$xmlSheet->sheetViews->sheetView['showGridLines'] ? true : false);
 								}
@@ -716,6 +855,10 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 								if (isset($xmlSheet->sheetFormatPr['defaultColWidth'])) {
 									$docSheet->getDefaultColumnDimension()->setWidth( (float)$xmlSheet->sheetFormatPr['defaultColWidth'] );
 								}
+								if (isset($xmlSheet->sheetFormatPr['zeroHeight']) &&
+									((string)$xmlSheet->sheetFormatPr['zeroHeight'] == '1')) {
+									$docSheet->getDefaultRowDimension()->setzeroHeight(true);
+								}
 							}
 
 							if (isset($xmlSheet->cols) && !$this->_readDataOnly) {
@@ -787,7 +930,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 										$calculatedValue 	= null;
 
 										// Read cell?
-										if (!is_null($this->getReadFilter())) {
+										if ($this->getReadFilter() !== NULL) {
 											$coordinates = PHPExcel_Cell::coordinateFromString($r);
 
 											if (!$this->getReadFilter()->readCell($coordinates[0], $coordinates[1], $docSheet->getTitle())) {
@@ -882,7 +1025,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 										} else {
 											$cell->setValue($value);
 										}
-										if (!is_null($calculatedValue)) {
+										if ($calculatedValue !== NULL) {
 											$cell->setCalculatedValue($calculatedValue);
 										}
 
@@ -962,12 +1105,111 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 							}
 
 							if ($xmlSheet && $xmlSheet->autoFilter && !$this->_readDataOnly) {
-								$docSheet->setAutoFilter((string) $xmlSheet->autoFilter["ref"]);
+								$autoFilter = $docSheet->getAutoFilter();
+								$autoFilter->setRange((string) $xmlSheet->autoFilter["ref"]);
+								foreach ($xmlSheet->autoFilter->filterColumn as $filterColumn) {
+									$column = $autoFilter->getColumnByOffset((integer) $filterColumn["colId"]);
+									//	Check for standard filters
+									if ($filterColumn->filters) {
+										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER);
+										$filters = $filterColumn->filters;
+										if ((isset($filters["blank"])) && ($filters["blank"] == 1)) {
+											$column->createRule()->setRule(
+												NULL,	//	Operator is undefined, but always treated as EQUAL
+												''
+											)
+											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
+										}
+										//	Standard filters are always an OR join, so no join rule needs to be set
+										//	Entries can be either filter elements
+										foreach ($filters->filter as $filterRule) {
+											$column->createRule()->setRule(
+												NULL,	//	Operator is undefined, but always treated as EQUAL
+												(string) $filterRule["val"]
+											)
+											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER);
+										}
+										//	Or Date Group elements
+										foreach ($filters->dateGroupItem as $dateGroupItem) {
+											$column->createRule()->setRule(
+												NULL,	//	Operator is undefined, but always treated as EQUAL
+												array(
+													'year' => (string) $dateGroupItem["year"],
+													'month' => (string) $dateGroupItem["month"],
+													'day' => (string) $dateGroupItem["day"],
+													'hour' => (string) $dateGroupItem["hour"],
+													'minute' => (string) $dateGroupItem["minute"],
+													'second' => (string) $dateGroupItem["second"],
+												),
+												(string) $dateGroupItem["dateTimeGrouping"]
+											)
+											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP);
+										}
+									}
+									//	Check for custom filters
+									if ($filterColumn->customFilters) {
+										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
+										$customFilters = $filterColumn->customFilters;
+										//	Custom filters can an AND or an OR join;
+										//		and there should only ever be one or two entries
+										if ((isset($customFilters["and"])) && ($customFilters["and"] == 1)) {
+											$column->setJoin(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
+										}
+										foreach ($customFilters->customFilter as $filterRule) {
+											$column->createRule()->setRule(
+												(string) $filterRule["operator"],
+												(string) $filterRule["val"]
+											)
+											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_CUSTOMFILTER);
+										}
+									}
+									//	Check for dynamic filters
+									if ($filterColumn->dynamicFilter) {
+										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
+										//	We should only ever have one dynamic filter
+										foreach ($filterColumn->dynamicFilter as $filterRule) {
+											$column->createRule()->setRule(
+												NULL,	//	Operator is undefined, but always treated as EQUAL
+												(string) $filterRule["val"],
+												(string) $filterRule["type"]
+											)
+											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
+											if (isset($filterRule["val"])) {
+												$column->setAttribute('val',(string) $filterRule["val"]);
+											}
+											if (isset($filterRule["maxVal"])) {
+												$column->setAttribute('maxVal',(string) $filterRule["maxVal"]);
+											}
+										}
+									}
+									//	Check for dynamic filters
+									if ($filterColumn->top10) {
+										$column->setFilterType(PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
+										//	We should only ever have one top10 filter
+										foreach ($filterColumn->top10 as $filterRule) {
+											$column->createRule()->setRule(
+												(((isset($filterRule["percent"])) && ($filterRule["percent"] == 1))
+													? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT
+													: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE
+												),
+												(string) $filterRule["val"],
+												(((isset($filterRule["top"])) && ($filterRule["top"] == 1))
+													? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP
+													: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM
+												)
+											)
+											->setRuleType(PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER);
+										}
+									}
+								}
 							}
 
 							if ($xmlSheet && $xmlSheet->mergeCells && $xmlSheet->mergeCells->mergeCell && !$this->_readDataOnly) {
 								foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
-									$docSheet->mergeCells((string) $mergeCell["ref"]);
+									$mergeRef = (string) $mergeCell["ref"];
+									if (strpos($mergeRef,':') !== FALSE) {
+										$docSheet->mergeCells((string) $mergeCell["ref"]);
+									}
 								}
 							}
 
@@ -1051,7 +1293,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 							if ($xmlSheet && $xmlSheet->colBreaks && $xmlSheet->colBreaks->brk && !$this->_readDataOnly) {
 								foreach ($xmlSheet->colBreaks->brk as $brk) {
 									if ($brk["man"]) {
-										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex($brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
+										$docSheet->setBreak(PHPExcel_Cell::stringFromColumnIndex((string) $brk["id"]) . "1", PHPExcel_Worksheet::BREAK_COLUMN);
 									}
 								}
 							}
@@ -1180,7 +1422,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 	    									$row          = null;
 
 	    									$clientData   = $shape->xpath('.//x:ClientData');
-	    									if (is_array($clientData) && count($clientData) > 0) {
+	    									if (is_array($clientData) && !empty($clientData)) {
 	        									$clientData   = $clientData[0];
 
 	        									if ( isset($clientData['ObjectType']) && (string)$clientData['ObjectType'] == 'Note' ) {
@@ -1192,9 +1434,9 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 	        									}
 	    									}
 
-	    									if (!is_null($column) && !is_null($row)) {
+	    									if (($column !== NULL) && ($row !== NULL)) {
 	    									    // Set comment properties
-	    									    $comment = $docSheet->getCommentByColumnAndRow($column, $row + 1);
+	    									    $comment = $docSheet->getCommentByColumnAndRow((string) $column, $row + 1);
 	    									    $comment->getFillColor()->setRGB( $fillColor );
 
 	    									    // Parse style
@@ -1272,7 +1514,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 
 							}
 
-	// TODO: Make sure drawings and graph are loaded differently!
+// TODO: Autoshapes from twoCellAnchors!
 							if ($zip->locateName(dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels")) {
 								$relsWorksheet = simplexml_load_string($this->_getFromZipArchive($zip,  dirname("$dir/$fileWorksheet") . "/_rels/" . basename($fileWorksheet) . ".rels") ); //~ http://schemas.openxmlformats.org/package/2006/relationships");
 								$drawings = array();
@@ -1291,6 +1533,12 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 											foreach ($relsDrawing->Relationship as $ele) {
 												if ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image") {
 													$images[(string) $ele["Id"]] = self::dir_add($fileDrawing, $ele["Target"]);
+												} elseif ($ele["Type"] == "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart") {
+													if ($this->_includeCharts) {
+														$charts[self::dir_add($fileDrawing, $ele["Target"])] = array('id'		=> (string) $ele["Id"],
+																													 'sheet'	=> $docSheet->getTitle()
+																													);
+													}
 												}
 											}
 										}
@@ -1306,7 +1554,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 													$objDrawing->setName((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
 													$objDrawing->setDescription((string) self::array_item($oneCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
 													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex($oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
+													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1));
 													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff));
 													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
 													$objDrawing->setResizeProportional(false);
@@ -1326,6 +1574,13 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
 													}
 													$objDrawing->setWorksheet($docSheet);
+												} else {
+													//	? Can charts be positioned with a oneCellAnchor ?
+													$coordinates	= PHPExcel_Cell::stringFromColumnIndex((string) $oneCellAnchor->from->col) . ($oneCellAnchor->from->row + 1);
+													$offsetX		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->colOff);
+													$offsetY		= PHPExcel_Shared_Drawing::EMUToPixels($oneCellAnchor->from->rowOff);
+													$width			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cx"));
+													$height			= PHPExcel_Shared_Drawing::EMUToPixels(self::array_item($oneCellAnchor->ext->attributes(), "cy"));
 												}
 											}
 										}
@@ -1339,7 +1594,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 													$objDrawing->setName((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "name"));
 													$objDrawing->setDescription((string) self::array_item($twoCellAnchor->pic->nvPicPr->cNvPr->attributes(), "descr"));
 													$objDrawing->setPath("zip://$pFilename#" . $images[(string) self::array_item($blip->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), "embed")], false);
-													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex($twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
+													$objDrawing->setCoordinates(PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1));
 													$objDrawing->setOffsetX(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff));
 													$objDrawing->setOffsetY(PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff));
 													$objDrawing->setResizeProportional(false);
@@ -1361,6 +1616,26 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 														$shadow->setAlpha(self::array_item($outerShdw->srgbClr->alpha->attributes(), "val") / 1000);
 													}
 													$objDrawing->setWorksheet($docSheet);
+												} elseif(($this->_includeCharts) && ($twoCellAnchor->graphicFrame)) {
+													$fromCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->from->col) . ($twoCellAnchor->from->row + 1);
+													$fromOffsetX	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->colOff);
+													$fromOffsetY	= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->from->rowOff);
+													$toCoordinate	= PHPExcel_Cell::stringFromColumnIndex((string) $twoCellAnchor->to->col) . ($twoCellAnchor->to->row + 1);
+													$toOffsetX		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->colOff);
+													$toOffsetY		= PHPExcel_Shared_Drawing::EMUToPixels($twoCellAnchor->to->rowOff);
+													$graphic		= $twoCellAnchor->graphicFrame->children("http://schemas.openxmlformats.org/drawingml/2006/main")->graphic;
+													$chartRef		= $graphic->graphicData->children("http://schemas.openxmlformats.org/drawingml/2006/chart")->chart;
+													$thisChart		= (string) $chartRef->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+
+													$chartDetails[$docSheet->getTitle().'!'.$thisChart] =
+															array(	'fromCoordinate'	=> $fromCoordinate,
+																	'fromOffsetX'		=> $fromOffsetX,
+																	'fromOffsetY'		=> $fromOffsetY,
+																	'toCoordinate'		=> $toCoordinate,
+																	'toOffsetX'			=> $toOffsetX,
+																	'toOffsetY'			=> $toOffsetY,
+																	'worksheetTitle'	=> $docSheet->getTitle()
+																 );
 												}
 											}
 										}
@@ -1382,7 +1657,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 									}
 
 									// Valid range?
-									if (stripos((string)$definedName, '#REF!') !== false || $extractedRange == '') {
+									if (stripos((string)$definedName, '#REF!') !== FALSE || $extractedRange == '') {
 										continue;
 									}
 
@@ -1392,7 +1667,9 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 										switch ((string)$definedName['name']) {
 
 											case '_xlnm._FilterDatabase':
-												$docSheet->setAutoFilter($extractedRange);
+												if ((string)$definedName['hidden'] !== '1') {
+													$docSheet->getAutoFilter()->setRange($extractedRange);
+												}
 												break;
 
 											case '_xlnm.Print_Titles':
@@ -1495,7 +1772,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 										$extractedRange = isset($range[1]) ? $range[1] : $range[0];
 									}
 
-									if (!is_null($locatedSheet)) {
+									if ($locatedSheet !== NULL) {
 										$excel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $locatedSheet, $extractedRange, false) );
 									}
 								}
@@ -1511,8 +1788,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 						if (isset($mapSheetId[$activeTab]) && $mapSheetId[$activeTab] !== null) {
 							$excel->setActiveSheetIndex($mapSheetId[$activeTab]);
 						} else {
-							if ($excel->getSheetCount() == 0)
-							{
+							if ($excel->getSheetCount() == 0) {
 								$excel->createSheet();
 							}
 							$excel->setActiveSheetIndex(0);
@@ -1523,18 +1799,56 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 
 		}
 
+
+		if (!$this->_readDataOnly) {
+			$contentTypes = simplexml_load_string($this->_getFromZipArchive($zip, "[Content_Types].xml"));
+			foreach ($contentTypes->Override as $contentType) {
+				switch ($contentType["ContentType"]) {
+					case "application/vnd.openxmlformats-officedocument.drawingml.chart+xml":
+						if ($this->_includeCharts) {
+							$chartEntryRef = ltrim($contentType['PartName'],'/');
+							$chartElements = simplexml_load_string($this->_getFromZipArchive($zip, $chartEntryRef));
+							$objChart = PHPExcel_Reader_Excel2007_Chart::readChart($chartElements,basename($chartEntryRef,'.xml'));
+
+//							echo 'Chart ',$chartEntryRef,'<br />';
+//							var_dump($charts[$chartEntryRef]);
+//
+							if (isset($charts[$chartEntryRef])) {
+								$chartPositionRef = $charts[$chartEntryRef]['sheet'].'!'.$charts[$chartEntryRef]['id'];
+//								echo 'Position Ref ',$chartPositionRef,'<br />';
+								if (isset($chartDetails[$chartPositionRef])) {
+//									var_dump($chartDetails[$chartPositionRef]);
+
+									$excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
+									$objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
+									$objChart->setTopLeftPosition( $chartDetails[$chartPositionRef]['fromCoordinate'],
+																   $chartDetails[$chartPositionRef]['fromOffsetX'],
+																   $chartDetails[$chartPositionRef]['fromOffsetY']
+																 );
+									$objChart->setBottomRightPosition( $chartDetails[$chartPositionRef]['toCoordinate'],
+																	   $chartDetails[$chartPositionRef]['toOffsetX'],
+																	   $chartDetails[$chartPositionRef]['toOffsetY']
+																	 );
+								}
+							}
+						}
+				}
+			}
+		}
+
 		$zip->close();
 
 		return $excel;
 	}
 
-	private static function _readColor($color, $background=false) {
+
+	private static function _readColor($color, $background=FALSE) {
 		if (isset($color["rgb"])) {
 			return (string)$color["rgb"];
 		} else if (isset($color["indexed"])) {
-			return PHPExcel_Style_Color::indexedColor($color["indexed"],$background)->getARGB();
+			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
 		} else if (isset($color["theme"])) {
-			if (!is_null(self::$_theme)) {
+			if (self::$_theme !== NULL) {
 				$returnColour = self::$_theme->getColourByIndex((int)$color["theme"]);
 				if (isset($color["tint"])) {
 					$tintAdjust = (float) $color["tint"];
@@ -1550,11 +1864,16 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		return 'FF000000';
 	}
 
+
 	private static function _readStyle($docStyle, $style) {
 		// format code
-		if (isset($style->numFmt)) {
-			$docStyle->getNumberFormat()->setFormatCode($style->numFmt);
-		}
+//		if (isset($style->numFmt)) {
+//			if (isset($style->numFmt['formatCode'])) {
+//				$docStyle->getNumberFormat()->setFormatCode((string) $style->numFmt['formatCode']);
+//			} else {
+				$docStyle->getNumberFormat()->setFormatCode($style->numFmt);
+//			}
+//		}
 
 		// font
 		if (isset($style->font)) {
@@ -1677,6 +1996,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	private static function _readBorder($docBorder, $eleBorder) {
 		if (isset($eleBorder["style"])) {
 			$docBorder->setBorderStyle((string) $eleBorder["style"]);
@@ -1686,6 +2006,7 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	private function _parseRichText($is = null) {
 		$value = new PHPExcel_RichText();
 
@@ -1748,14 +2069,17 @@ class PHPExcel_Reader_Excel2007 implements PHPExcel_Reader_IReader
 		return $value;
 	}
 
+
 	private static function array_item($array, $key = 0) {
 		return (isset($array[$key]) ? $array[$key] : null);
 	}
 
+
 	private static function dir_add($base, $add) {
 		return preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
 	}
 
+
 	private static function toCSSArray($style) {
 		$style = str_replace(array("\r","\n"), "", $style);
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007/Chart.php b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
new file mode 100644
index 00000000000..f4d38bdb44a
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
@@ -0,0 +1,513 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Reader_Excel5
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+/**
+ * PHPExcel_Reader_Excel2007_Chart
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Reader_Excel2007
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_Excel2007_Chart
+{
+	private static function _getAttribute($component, $name, $format) {
+		$attributes = $component->attributes();
+		if (isset($attributes[$name])) {
+			if ($format == 'string') {
+				return (string) $attributes[$name];
+			} elseif ($format == 'integer') {
+				return (integer) $attributes[$name];
+			} elseif ($format == 'boolean') {
+				return (boolean) ($attributes[$name] == '0') ? false : true;
+			} else {
+				return (float) $attributes[$name];
+			}
+		}
+		return null;
+	}	//	function _getAttribute()
+
+
+	private static function _readColor($color,$background=false) {
+		if (isset($color["rgb"])) {
+			return (string)$color["rgb"];
+		} else if (isset($color["indexed"])) {
+			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
+		}
+	}
+
+
+	public static function readChart($chartElements,$chartName) {
+		$namespacesChartMeta = $chartElements->getNamespaces(true);
+		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
+
+		$XaxisLabel = $YaxisLabel = $legend = $title = NULL;
+		$dispBlanksAs = $plotVisOnly = NULL;
+
+		foreach($chartElementsC as $chartElementKey => $chartElement) {
+			switch ($chartElementKey) {
+				case "chart":
+					foreach($chartElement as $chartDetailsKey => $chartDetails) {
+						$chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
+						switch ($chartDetailsKey) {
+							case "plotArea":
+									$plotAreaLayout = $XaxisLable = $YaxisLable = null;
+									$plotSeries = $plotAttributes = array();
+									foreach($chartDetails as $chartDetailKey => $chartDetail) {
+										switch ($chartDetailKey) {
+											case "layout":
+												$plotAreaLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'plotArea');
+												break;
+											case "catAx":
+												if (isset($chartDetail->title)) {
+													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+												}
+												break;
+											case "dateAx":
+												if (isset($chartDetail->title)) {
+													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+												}
+												break;
+											case "valAx":
+												if (isset($chartDetail->title)) {
+													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+												}
+												break;
+											case "barChart":
+											case "bar3DChart":
+												$barDirection = self::_getAttribute($chartDetail->barDir, 'val', 'string');
+												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer->setPlotDirection($barDirection);
+												$plotSeries[] = $plotSer;
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "lineChart":
+											case "line3DChart":
+												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "areaChart":
+											case "area3DChart":
+												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "doughnutChart":
+											case "pieChart":
+											case "pie3DChart":
+												$explosion = isset($chartDetail->ser->explosion);
+												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer->setPlotStyle($explosion);
+												$plotSeries[] = $plotSer;
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "scatterChart":
+												$scatterStyle = self::_getAttribute($chartDetail->scatterStyle, 'val', 'string');
+												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer->setPlotStyle($scatterStyle);
+												$plotSeries[] = $plotSer;
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "bubbleChart":
+												$bubbleScale = self::_getAttribute($chartDetail->bubbleScale, 'val', 'integer');
+												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer->setPlotStyle($bubbleScale);
+												$plotSeries[] = $plotSer;
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "radarChart":
+												$radarStyle = self::_getAttribute($chartDetail->radarStyle, 'val', 'string');
+												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer->setPlotStyle($radarStyle);
+												$plotSeries[] = $plotSer;
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "surfaceChart":
+											case "surface3DChart":
+												$wireFrame = self::_getAttribute($chartDetail->wireframe, 'val', 'boolean');
+												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotSer->setPlotStyle($wireFrame);
+												$plotSeries[] = $plotSer;
+												$plotAttributes = self::_readChartAttributes($chartDetail);
+												break;
+											case "stockChart":
+												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+												$plotAttributes = self::_readChartAttributes($plotAreaLayout);
+												break;
+										}
+									}
+									if ($plotAreaLayout == NULL) {
+										$plotAreaLayout = new PHPExcel_Chart_Layout();
+									}
+									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout,$plotSeries);
+									self::_setChartAttributes($plotAreaLayout,$plotAttributes);
+									break;
+							case "plotVisOnly":
+									$plotVisOnly = self::_getAttribute($chartDetails, 'val', 'string');
+									break;
+							case "dispBlanksAs":
+									$dispBlanksAs = self::_getAttribute($chartDetails, 'val', 'string');
+									break;
+							case "title":
+									$title = self::_chartTitle($chartDetails,$namespacesChartMeta,'title');
+									break;
+							case "legend":
+									$legendPos = 'r';
+									$legendLayout = null;
+									$legendOverlay = false;
+									foreach($chartDetails as $chartDetailKey => $chartDetail) {
+										switch ($chartDetailKey) {
+											case "legendPos":
+												$legendPos = self::_getAttribute($chartDetail, 'val', 'string');
+												break;
+											case "overlay":
+												$legendOverlay = self::_getAttribute($chartDetail, 'val', 'boolean');
+												break;
+											case "layout":
+												$legendLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'legend');
+												break;
+										}
+									}
+									$legend = new PHPExcel_Chart_Legend($legendPos, $legendLayout, $legendOverlay);
+									break;
+						}
+					}
+			}
+		}
+		$chart = new PHPExcel_Chart($chartName,$title,$legend,$plotArea,$plotVisOnly,$dispBlanksAs,$XaxisLabel,$YaxisLabel);
+
+		return $chart;
+	}	//	function readChart()
+
+
+	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
+		$caption = array();
+		$titleLayout = null;
+		foreach($titleDetails as $titleDetailKey => $chartDetail) {
+			switch ($titleDetailKey) {
+				case "tx":
+					$titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
+					foreach($titleDetails as $titleKey => $titleDetail) {
+						switch ($titleKey) {
+							case "p":
+								$titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
+								$caption[] = self::_parseRichText($titleDetailPart);
+						}
+					}
+					break;
+				case "layout":
+					$titleLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta);
+					break;
+			}
+		}
+
+		return new PHPExcel_Chart_Title($caption, $titleLayout);
+	}	//	function _chartTitle()
+
+
+	private static function _chartLayoutDetails($chartDetail,$namespacesChartMeta) {
+		if (!isset($chartDetail->manualLayout)) {
+			return null;
+		}
+		$details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
+		if (is_null($details)) {
+			return null;
+		}
+		$layout = array();
+		foreach($details as $detailKey => $detail) {
+//			echo $detailKey,' => ',self::_getAttribute($detail, 'val', 'string'),PHP_EOL;
+			$layout[$detailKey] = self::_getAttribute($detail, 'val', 'string');
+		}
+		return new PHPExcel_Chart_Layout($layout);
+	}	//	function _chartLayoutDetails()
+
+
+	private static function _chartDataSeries($chartDetail,$namespacesChartMeta,$plotType) {
+		$multiSeriesType = NULL;
+		$smoothLine = false;
+		$seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
+
+		$seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
+		foreach($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
+			switch ($seriesDetailKey) {
+				case "grouping":
+					$multiSeriesType = self::_getAttribute($chartDetail->grouping, 'val', 'string');
+					break;
+				case "ser":
+					$marker = NULL;
+					foreach($seriesDetails as $seriesKey => $seriesDetail) {
+						switch ($seriesKey) {
+							case "idx":
+								$seriesIndex = self::_getAttribute($seriesDetail, 'val', 'integer');
+								break;
+							case "order":
+								$seriesOrder = self::_getAttribute($seriesDetail, 'val', 'integer');
+								$plotOrder[$seriesIndex] = $seriesOrder;
+								break;
+							case "tx":
+								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+								break;
+							case "marker":
+								$marker = self::_getAttribute($seriesDetail->symbol, 'val', 'string');
+								break;
+							case "smooth":
+								$smoothLine = self::_getAttribute($seriesDetail, 'val', 'boolean');
+								break;
+							case "cat":
+								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+								break;
+							case "val":
+								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								break;
+							case "xVal":
+								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								break;
+							case "yVal":
+								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+								break;
+						}
+					}
+			}
+		}
+		return new PHPExcel_Chart_DataSeries($plotType,$multiSeriesType,$plotOrder,$seriesLabel,$seriesCategory,$seriesValues,$smoothLine);
+	}	//	function _chartDataSeries()
+
+
+	private static function _chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false) {
+		if (isset($seriesDetail->strRef)) {
+			$seriesSource = (string) $seriesDetail->strRef->f;
+			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']),'s');
+
+			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+		} elseif (isset($seriesDetail->numRef)) {
+			$seriesSource = (string) $seriesDetail->numRef->f;
+			$seriesData = self::_chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
+
+			return new PHPExcel_Chart_DataSeriesValues('Number',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+		} elseif (isset($seriesDetail->multiLvlStrRef)) {
+			$seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
+			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']),'s');
+			$seriesData['pointCount'] = count($seriesData['dataValues']);
+
+			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+		} elseif (isset($seriesDetail->multiLvlNumRef)) {
+			$seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
+			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']),'s');
+			$seriesData['pointCount'] = count($seriesData['dataValues']);
+
+			return new PHPExcel_Chart_DataSeriesValues('String',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+		}
+		return null;
+	}	//	function _chartDataSeriesValueSet()
+
+
+	private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
+		$seriesVal = array();
+		$formatCode = '';
+		$pointCount = 0;
+
+		foreach($seriesValueSet as $seriesValueIdx => $seriesValue) {
+			switch ($seriesValueIdx) {
+				case 'ptCount':
+					$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
+					break;
+				case 'formatCode':
+					$formatCode = (string) $seriesValue;
+					break;
+				case 'pt':
+					$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
+					if ($dataType == 's') {
+						$seriesVal[$pointVal] = (string) $seriesValue->v;
+					} else {
+						$seriesVal[$pointVal] = (float) $seriesValue->v;
+					}
+					break;
+			}
+		}
+
+		return array( 'formatCode'	=> $formatCode,
+					  'pointCount'	=> $pointCount,
+					  'dataValues'	=> $seriesVal
+					);
+	}	//	function _chartDataSeriesValues()
+
+
+	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet,$dataType='n') {
+		$seriesVal = array();
+		$formatCode = '';
+		$pointCount = 0;
+
+		foreach($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
+			foreach($seriesLevel as $seriesValueIdx => $seriesValue) {
+				switch ($seriesValueIdx) {
+					case 'ptCount':
+						$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
+						break;
+					case 'formatCode':
+						$formatCode = (string) $seriesValue;
+						break;
+					case 'pt':
+						$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
+						if ($dataType == 's') {
+							$seriesVal[$pointVal][] = (string) $seriesValue->v;
+						} else {
+							$seriesVal[$pointVal][] = (float) $seriesValue->v;
+						}
+						break;
+				}
+			}
+		}
+
+		return array( 'formatCode'	=> $formatCode,
+					  'pointCount'	=> $pointCount,
+					  'dataValues'	=> $seriesVal
+					);
+	}	//	function _chartDataSeriesValuesMultiLevel()
+
+	private static function _parseRichText($titleDetailPart = null) {
+		$value = new PHPExcel_RichText();
+
+		foreach($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
+			if (isset($titleDetailElement->t)) {
+				$objText = $value->createTextRun( (string) $titleDetailElement->t );
+			}
+			if (isset($titleDetailElement->rPr)) {
+				if (isset($titleDetailElement->rPr->rFont["val"])) {
+					$objText->getFont()->setName((string) $titleDetailElement->rPr->rFont["val"]);
+				}
+
+				$fontSize = (self::_getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
+				if (!is_null($fontSize)) {
+					$objText->getFont()->setSize(floor($fontSize / 100));
+				}
+
+				$fontColor = (self::_getAttribute($titleDetailElement->rPr, 'color', 'string'));
+				if (!is_null($fontColor)) {
+					$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($fontColor) ) );
+				}
+
+				$bold = self::_getAttribute($titleDetailElement->rPr, 'b', 'boolean');
+				if (!is_null($bold)) {
+					$objText->getFont()->setBold($bold);
+				}
+
+				$italic = self::_getAttribute($titleDetailElement->rPr, 'i', 'boolean');
+				if (!is_null($italic)) {
+					$objText->getFont()->setItalic($italic);
+				}
+
+				$baseline = self::_getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
+				if (!is_null($baseline)) {
+					if ($baseline > 0) {
+						$objText->getFont()->setSuperScript(true);
+					} elseif($baseline < 0) {
+						$objText->getFont()->setSubScript(true);
+					}
+				}
+
+				$underscore = (self::_getAttribute($titleDetailElement->rPr, 'u', 'string'));
+				if (!is_null($underscore)) {
+					if ($underscore == 'sng') {
+						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+					} elseif($underscore == 'dbl') {
+						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
+					} else {
+						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
+					}
+				}
+
+				$strikethrough = (self::_getAttribute($titleDetailElement->rPr, 's', 'string'));
+				if (!is_null($strikethrough)) {
+					if ($strikethrough == 'noStrike') {
+						$objText->getFont()->setStrikethrough(false);
+					} else {
+						$objText->getFont()->setStrikethrough(true);
+					}
+				}
+			}
+		}
+
+		return $value;
+	}
+
+	private static function _readChartAttributes($chartDetail) {
+		$plotAttributes = array();
+		if (isset($chartDetail->dLbls)) {
+			if (isset($chartDetail->dLbls->howLegendKey)) {
+				$plotAttributes['showLegendKey'] = self::_getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
+			}
+			if (isset($chartDetail->dLbls->showVal)) {
+				$plotAttributes['showVal'] = self::_getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
+			}
+			if (isset($chartDetail->dLbls->showCatName)) {
+				$plotAttributes['showCatName'] = self::_getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
+			}
+			if (isset($chartDetail->dLbls->showSerName)) {
+				$plotAttributes['showSerName'] = self::_getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
+			}
+			if (isset($chartDetail->dLbls->showPercent)) {
+				$plotAttributes['showPercent'] = self::_getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
+			}
+			if (isset($chartDetail->dLbls->showBubbleSize)) {
+				$plotAttributes['showBubbleSize'] = self::_getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
+			}
+			if (isset($chartDetail->dLbls->showLeaderLines)) {
+				$plotAttributes['showLeaderLines'] = self::_getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
+			}
+		}
+
+		return $plotAttributes;
+	}
+
+	private static function _setChartAttributes($plotArea,$plotAttributes)
+	{
+		foreach($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
+			switch($plotAttributeKey) {
+				case 'showLegendKey' :
+					$plotArea->setShowLegendKey($plotAttributeValue);
+					break;
+				case 'showVal' :
+					$plotArea->setShowVal($plotAttributeValue);
+					break;
+				case 'showCatName' :
+					$plotArea->setShowCatName($plotAttributeValue);
+					break;
+				case 'showSerName' :
+					$plotArea->setShowSerName($plotAttributeValue);
+					break;
+				case 'showPercent' :
+					$plotArea->setShowPercent($plotAttributeValue);
+					break;
+				case 'showBubbleSize' :
+					$plotArea->setShowBubbleSize($plotAttributeValue);
+					break;
+				case 'showLeaderLines' :
+					$plotArea->setShowLeaderLines($plotAttributeValue);
+					break;
+			}
+		}
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007/Theme.php b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
index 89e24ffea84..6b38fa79fb9 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Excel2007_Theme
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5.php b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5.php
index 227ba53a1a5..535654243c2 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 // Original file header of ParseXL (used as the base for this class):
@@ -67,13 +67,13 @@ if (!defined('PHPEXCEL_ROOT')) {
 }
 
 /**
- *	PHPExcel_Reader_Excel5
+ * PHPExcel_Reader_Excel5
  *
- *	This class uses {@link http://sourceforge.net/projects/phpexcelreader/parseXL}
+ * This class uses {@link http://sourceforge.net/projects/phpexcelreader/parseXL}
  *
- *	@category	PHPExcel
- *	@package	PHPExcel_Reader_Excel5
- *	@copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @category	PHPExcel
+ * @package		PHPExcel_Reader_Excel5
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 {
@@ -158,20 +158,21 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 	const XLS_Type_XFEXT				= 0x087d;
 	const XLS_Type_UNKNOWN				= 0xffff;
 
+
 	/**
-	 *	Read data only?
-	 *	Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
+	 * Read data only?
+	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
 	 *		or whether it should read both data and formatting
 	 *
-	 *	@var	boolean
+	 * @var	boolean
 	 */
 	private $_readDataOnly = false;
 
 	/**
-	 *	Restrict which sheets should be loaded?
-	 *	This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+	 * Restrict which sheets should be loaded?
+	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
 	 *
-	 *	@var	array of string
+	 * @var	array of string
 	 */
 	private $_loadSheetsOnly = null;
 
@@ -403,25 +404,34 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 
 	/**
-	 *	Read data only?
+	 * Create a new PHPExcel_Reader_Excel5 instance
+	 */
+	public function __construct() {
+		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
+	}
+
+
+	/**
+	 * Read data only?
 	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
 	 *		If false (the default) it will read data and formatting.
 	 *
-	 *	@return	boolean
+	 * @return	boolean
 	 */
 	public function getReadDataOnly()
 	{
 		return $this->_readDataOnly;
 	}
 
+
 	/**
-	 *	Set read data only
+	 * Set read data only
 	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
 	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
 	 *
-	 *	@param	boolean	$pValue
+	 * @param	boolean	$pValue
 	 *
-	 *	@return	PHPExcel_Reader_Excel5
+	 * @return	PHPExcel_Reader_Excel5
 	 */
 	public function setReadDataOnly($pValue = false)
 	{
@@ -429,26 +439,28 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
-	 *	Get which sheets to load
+	 * Get which sheets to load
 	 *		Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
 	 *			indicating that all worksheets in the workbook should be loaded.
 	 *
-	 *	@return mixed
+	 * @return mixed
 	 */
 	public function getLoadSheetsOnly()
 	{
 		return $this->_loadSheetsOnly;
 	}
 
+
 	/**
-	 *	Set which sheets to load
+	 * Set which sheets to load
 	 *
-	 *	@param mixed $value
+	 * @param mixed $value
 	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
 	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
 	 *
-	 *	@return PHPExcel_Reader_Excel5
+	 * @return PHPExcel_Reader_Excel5
 	 */
 	public function setLoadSheetsOnly($value = null)
 	{
@@ -457,11 +469,12 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
-	 *	Set all sheets to load
+	 * Set all sheets to load
 	 *		Tells the Reader to load all worksheets from the workbook.
 	 *
-	 *	@return	PHPExcel_Reader_Excel5
+	 * @return	PHPExcel_Reader_Excel5
 	 */
 	public function setLoadAllSheets()
 	{
@@ -469,6 +482,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
 	 * Read filter
 	 *
@@ -478,6 +492,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $this->_readFilter;
 	}
 
+
 	/**
 	 * Set read filter
 	 *
@@ -489,18 +504,13 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
-	/**
-	 * Create a new PHPExcel_Reader_Excel5 instance
-	 */
-	public function __construct() {
-		$this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
-	}
 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @param 	string 		$pFileName
 	 * @return 	boolean
+	 * @throws Exception
 	 */
 	public function canRead($pFilename)
 	{
@@ -522,6 +532,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
 	 *
@@ -571,6 +582,100 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 	}
 
 
+	/**
+	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+	 *
+	 * @param   string     $pFilename
+	 * @throws   Exception
+	 */
+	public function listWorksheetInfo($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		$worksheetInfo = array();
+
+		// Read the OLE file
+		$this->_loadOLE($pFilename);
+
+		// total byte size of Excel data (workbook global substream + sheet substreams)
+		$this->_dataSize = strlen($this->_data);
+
+		// initialize
+		$this->_pos    = 0;
+		$this->_sheets = array();
+
+		// Parse Workbook Global Substream
+		while ($this->_pos < $this->_dataSize) {
+			$code = self::_GetInt2d($this->_data, $this->_pos);
+
+			switch ($code) {
+				case self::XLS_Type_BOF:        $this->_readBof();        break;
+				case self::XLS_Type_SHEET:      $this->_readSheet();      break;
+				case self::XLS_Type_EOF:        $this->_readDefault();    break 2;
+				default:                        $this->_readDefault();    break;
+			}
+		}
+
+		// Parse the individual sheets
+		foreach ($this->_sheets as $sheet) {
+
+			if ($sheet['sheetType'] != 0x00) {
+				// 0x00: Worksheet
+				// 0x02: Chart
+				// 0x06: Visual Basic module
+				continue;
+			}
+
+			$tmpInfo = array();
+			$tmpInfo['worksheetName'] = $sheet['name'];
+			$tmpInfo['lastColumnLetter'] = 'A';
+			$tmpInfo['lastColumnIndex'] = 0;
+			$tmpInfo['totalRows'] = 0;
+			$tmpInfo['totalColumns'] = 0;
+
+			$this->_pos = $sheet['offset'];
+
+			while ($this->_pos <= $this->_dataSize - 4) {
+				$code = self::_GetInt2d($this->_data, $this->_pos);
+
+				switch ($code) {
+					case self::XLS_Type_RK:
+					case self::XLS_Type_LABELSST:
+					case self::XLS_Type_NUMBER:
+					case self::XLS_Type_FORMULA:
+					case self::XLS_Type_BOOLERR:
+					case self::XLS_Type_LABEL:
+						$length = self::_GetInt2d($this->_data, $this->_pos + 2);
+						$recordData = substr($this->_data, $this->_pos + 4, $length);
+
+						// move stream pointer to next record
+						$this->_pos += 4 + $length;
+
+						$rowIndex = self::_GetInt2d($recordData, 0) + 1;
+						$columnIndex = self::_GetInt2d($recordData, 2);
+
+						$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+						$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+						break;
+					case self::XLS_Type_BOF:      $this->_readBof();          break;
+					case self::XLS_Type_EOF:      $this->_readDefault();      break 2;
+					default:                      $this->_readDefault();      break;
+				}
+			}
+
+			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+			$worksheetInfo[] = $tmpInfo;
+		}
+
+		return $worksheetInfo;
+	}
+
+
 	/**
 	 * Loads PHPExcel from file
 	 *
@@ -727,7 +832,10 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 			// add sheet to PHPExcel object
 			$this->_phpSheet = $this->_phpExcel->createSheet();
-			$this->_phpSheet->setTitle($sheet['name']);
+			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
+			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
+			//		name in line with the formula, not the reverse
+			$this->_phpSheet->setTitle($sheet['name'],false);
 			$this->_phpSheet->setSheetState($sheet['sheetState']);
 
 			$this->_pos = $sheet['offset'];
@@ -836,101 +944,92 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 //				echo '<br />';
 
 				// the first shape container never has a corresponding OBJ record, hence $n + 1
-				$spContainer = $allSpContainers[$n + 1];
+				if (isset($allSpContainers[$n + 1]) && is_object($allSpContainers[$n + 1])) {
+					$spContainer = $allSpContainers[$n + 1];
 
-				// we skip all spContainers that are a part of a group shape since we cannot yet handle those
-				if ($spContainer->getNestingLevel() > 1) {
-					continue;
-				}
-
-				// calculate the width and height of the shape
-				list($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($spContainer->getStartCoordinates());
-				list($endColumn, $endRow) = PHPExcel_Cell::coordinateFromString($spContainer->getEndCoordinates());
-
-				$startOffsetX = $spContainer->getStartOffsetX();
-				$startOffsetY = $spContainer->getStartOffsetY();
-				$endOffsetX = $spContainer->getEndOffsetX();
-				$endOffsetY = $spContainer->getEndOffsetY();
-
-				$width = PHPExcel_Shared_Excel5::getDistanceX($this->_phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
-				$height = PHPExcel_Shared_Excel5::getDistanceY($this->_phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
-
-				// calculate offsetX and offsetY of the shape
-				$offsetX = $startOffsetX * PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, $startColumn) / 1024;
-				$offsetY = $startOffsetY * PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $startRow) / 256;
-
-				switch ($obj['otObjType']) {
-
-				case 0x19:
-					// Note
-//					echo 'Cell Annotation Object<br />';
-//					echo 'Object ID is ',$obj['idObjID'],'<br />';
-//
-					if (isset($this->_cellNotes[$obj['idObjID']])) {
-						$cellNote = $this->_cellNotes[$obj['idObjID']];
-
-//						echo '_cellNotes[',$obj['idObjID'],']: ';
-//						var_dump($cellNote);
-//						echo '<br />';
-//
-						if (isset($this->_textObjects[$obj['idObjID']])) {
-							$textObject = $this->_textObjects[$obj['idObjID']];
-//							echo '_textObject: ';
-//							var_dump($textObject);
-//							echo '<br />';
-//
-							$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
-							$text = $textObject['text'];
-						}
-//						echo $text,'<br />';
-					}
-					break;
-
-				case 0x08:
-//					echo 'Picture Object<br />';
-					// picture
-
-					// get index to BSE entry (1-based)
-					$BSEindex = $spContainer->getOPT(0x0104);
-					$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
-					$BSE = $BSECollection[$BSEindex - 1];
-					$blipType = $BSE->getBlipType();
-
-					// need check because some blip types are not supported by Escher reader such as EMF
-					if ($blip = $BSE->getBlip()) {
-						$ih = imagecreatefromstring($blip->getData());
-						$drawing = new PHPExcel_Worksheet_MemoryDrawing();
-						$drawing->setImageResource($ih);
-
-						// width, height, offsetX, offsetY
-						$drawing->setResizeProportional(false);
-						$drawing->setWidth($width);
-						$drawing->setHeight($height);
-						$drawing->setOffsetX($offsetX);
-						$drawing->setOffsetY($offsetY);
-
-						switch ($blipType) {
-							case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-								$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG);
-								$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_JPEG);
-								break;
-
-							case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-								$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG);
-								$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_PNG);
-								break;
-						}
-
-						$drawing->setWorksheet($this->_phpSheet);
-						$drawing->setCoordinates($spContainer->getStartCoordinates());
+					// we skip all spContainers that are a part of a group shape since we cannot yet handle those
+					if ($spContainer->getNestingLevel() > 1) {
+						continue;
 					}
 
-					break;
+					// calculate the width and height of the shape
+					list($startColumn, $startRow) = PHPExcel_Cell::coordinateFromString($spContainer->getStartCoordinates());
+					list($endColumn, $endRow) = PHPExcel_Cell::coordinateFromString($spContainer->getEndCoordinates());
 
-				default:
-					// other object type
-					break;
+					$startOffsetX = $spContainer->getStartOffsetX();
+					$startOffsetY = $spContainer->getStartOffsetY();
+					$endOffsetX = $spContainer->getEndOffsetX();
+					$endOffsetY = $spContainer->getEndOffsetY();
 
+					$width = PHPExcel_Shared_Excel5::getDistanceX($this->_phpSheet, $startColumn, $startOffsetX, $endColumn, $endOffsetX);
+					$height = PHPExcel_Shared_Excel5::getDistanceY($this->_phpSheet, $startRow, $startOffsetY, $endRow, $endOffsetY);
+
+					// calculate offsetX and offsetY of the shape
+					$offsetX = $startOffsetX * PHPExcel_Shared_Excel5::sizeCol($this->_phpSheet, $startColumn) / 1024;
+					$offsetY = $startOffsetY * PHPExcel_Shared_Excel5::sizeRow($this->_phpSheet, $startRow) / 256;
+
+					switch ($obj['otObjType']) {
+						case 0x19:
+							// Note
+//							echo 'Cell Annotation Object<br />';
+//							echo 'Object ID is ',$obj['idObjID'],'<br />';
+//
+							if (isset($this->_cellNotes[$obj['idObjID']])) {
+								$cellNote = $this->_cellNotes[$obj['idObjID']];
+
+								if (isset($this->_textObjects[$obj['idObjID']])) {
+									$textObject = $this->_textObjects[$obj['idObjID']];
+									$this->_cellNotes[$obj['idObjID']]['objTextData'] = $textObject;
+								}
+							}
+							break;
+
+						case 0x08:
+//							echo 'Picture Object<br />';
+							// picture
+
+							// get index to BSE entry (1-based)
+							$BSEindex = $spContainer->getOPT(0x0104);
+							$BSECollection = $escherWorkbook->getDggContainer()->getBstoreContainer()->getBSECollection();
+							$BSE = $BSECollection[$BSEindex - 1];
+							$blipType = $BSE->getBlipType();
+
+							// need check because some blip types are not supported by Escher reader such as EMF
+							if ($blip = $BSE->getBlip()) {
+								$ih = imagecreatefromstring($blip->getData());
+								$drawing = new PHPExcel_Worksheet_MemoryDrawing();
+								$drawing->setImageResource($ih);
+
+								// width, height, offsetX, offsetY
+								$drawing->setResizeProportional(false);
+								$drawing->setWidth($width);
+								$drawing->setHeight($height);
+								$drawing->setOffsetX($offsetX);
+								$drawing->setOffsetY($offsetY);
+
+								switch ($blipType) {
+									case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
+										$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG);
+										$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_JPEG);
+										break;
+
+									case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
+										$drawing->setRenderingFunction(PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG);
+										$drawing->setMimeType(PHPExcel_Worksheet_MemoryDrawing::MIMETYPE_PNG);
+										break;
+								}
+
+								$drawing->setWorksheet($this->_phpSheet);
+								$drawing->setCoordinates($spContainer->getStartCoordinates());
+							}
+
+							break;
+
+						default:
+							// other object type
+							break;
+
+					}
 				}
 			}
 
@@ -938,15 +1037,23 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 			if ($this->_version == self::XLS_BIFF8) {
 				foreach ($this->_sharedFormulaParts as $cell => $baseCell) {
 					list($column, $row) = PHPExcel_Cell::coordinateFromString($cell);
-					if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle()) ) {
+					if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($column, $row, $this->_phpSheet->getTitle()) ) {
 						$formula = $this->_getFormulaFromStructure($this->_sharedFormulas[$baseCell], $cell);
 						$this->_phpSheet->getCell($cell)->setValueExplicit('=' . $formula, PHPExcel_Cell_DataType::TYPE_FORMULA);
 					}
 				}
 			}
 
-			if (count($this->_cellNotes) > 0) {
+			if (!empty($this->_cellNotes)) {
 				foreach($this->_cellNotes as $note => $noteDetails) {
+					if (!isset($noteDetails['objTextData'])) {
+						if (isset($this->_textObjects[$note])) {
+							$textObject = $this->_textObjects[$note];
+							$noteDetails['objTextData'] = $textObject;
+						} else {
+							$noteDetails['objTextData']['text'] = '';
+						}
+					}
 //					echo '<b>Cell annotation ',$note,'</b><br />';
 //					var_dump($noteDetails);
 //					echo '<br />';
@@ -1038,16 +1145,21 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 				$explodes = explode('!', $definedName['formula']);
 
 				if (count($explodes) == 2) {
-					if ($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) {
+					if (($docSheet = $this->_phpExcel->getSheetByName($explodes[0])) ||
+						($docSheet = $this->_phpExcel->getSheetByName(trim($explodes[0],"'")))) {
 						$extractedRange = $explodes[1];
 						$extractedRange = str_replace('$', '', $extractedRange);
 
 						$localOnly = ($definedName['scope'] == 0) ? false : true;
+
 						$scope = ($definedName['scope'] == 0) ?
 							null : $this->_phpExcel->getSheetByName($this->_sheets[$definedName['scope'] - 1]['name']);
 
 						$this->_phpExcel->addNamedRange( new PHPExcel_NamedRange((string)$definedName['name'], $docSheet, $extractedRange, $localOnly, $scope) );
 					}
+				} else {
+					//	Named Value
+					//	TODO Provide support for named values
 				}
 			}
 		}
@@ -1055,6 +1167,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $this->_phpExcel;
 	}
 
+
 	/**
 	 * Use OLE reader to extract the relevant data streams from the OLE file
 	 *
@@ -1080,6 +1193,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 //		$this->_userDefinedProperties = $ole->getUserDefinedProperties();
 	}
 
+
 	/**
 	 * Read summary information
 	 */
@@ -1239,6 +1353,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read additional document summary information
 	 */
@@ -1302,6 +1417,11 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 					$value = self::_GetInt4d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
 					break;
 
+				case 0x0B:  // Boolean
+					$value = self::_GetInt2d($this->_documentSummaryInformation, $secOffset + 4 + $offset);
+					$value = ($value == 0 ? false : true);
+					break;
+
 				case 0x13:	//	4 byte unsigned integer
 					// not needed yet, fix later if necessary
 					break;
@@ -1392,6 +1512,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Reads a general type of BIFF record. Does nothing except for moving stream pointer forward to next record.
 	 */
@@ -1468,6 +1589,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 	}
 
+
 	/**
 	 *	The TEXT Object record contains the text associated with a cell annotation.
 	 */
@@ -1507,6 +1629,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 //		echo '<br />';
 	}
 
+
 	/**
 	 * Read BOF
 	 */
@@ -1546,6 +1669,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * FILEPASS
 	 *
@@ -1568,6 +1692,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		throw new Exception('Cannot read encrypted file');
 	}
 
+
 	/**
 	 * CODEPAGE
 	 *
@@ -1591,6 +1716,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_codepage = PHPExcel_Shared_CodePage::NumberToName($codepage);
 	}
 
+
 	/**
 	 * DATEMODE
 	 *
@@ -1618,6 +1744,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read a FONT record
 	 */
@@ -1704,6 +1831,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * FORMAT
 	 *
@@ -1741,6 +1869,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * XF - Extended Format
 	 *
@@ -2034,6 +2163,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 *
 	 */
@@ -2210,6 +2340,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 	}
 
+
 	/**
 	 * Read STYLE record
 	 */
@@ -2250,6 +2381,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read PALETTE record
 	 */
@@ -2273,6 +2405,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * SHEET
 	 *
@@ -2324,6 +2457,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Read EXTERNALBOOK record
 	 */
@@ -2387,6 +2521,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read EXTERNNAME record.
 	 */
@@ -2421,6 +2556,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read EXTERNSHEET record
 	 */
@@ -2449,6 +2585,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * DEFINEDNAME
 	 *
@@ -2511,6 +2648,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read MSODRAWINGGROUP record
 	 */
@@ -2525,6 +2663,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_drawingGroupData .= $recordData;
 	}
 
+
 	/**
 	 * SST - Shared String Table
 	 *
@@ -2716,6 +2855,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		// _getSplicedRecordData() takes care of moving current position in data stream
 	}
 
+
 	/**
 	 * Read PRINTGRIDLINES record
 	 */
@@ -2734,6 +2874,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read DEFAULTROWHEIGHT record
 	 */
@@ -2751,6 +2892,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_phpSheet->getDefaultRowDimension()->setRowHeight($height / 20);
 	}
 
+
 	/**
 	 * Read SHEETPR record
 	 */
@@ -2777,6 +2919,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_isFitToPages = (bool) ((0x0100 & self::_GetInt2d($recordData, 0)) >> 8);
 	}
 
+
 	/**
 	 * Read HORIZONTALPAGEBREAKS record
 	 */
@@ -2805,6 +2948,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read VERTICALPAGEBREAKS record
 	 */
@@ -2832,6 +2976,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read HEADER record
 	 */
@@ -2859,6 +3004,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read FOOTER record
 	 */
@@ -2885,6 +3031,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read HCENTER record
 	 */
@@ -2904,6 +3051,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read VCENTER record
 	 */
@@ -2923,6 +3071,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read LEFTMARGIN record
 	 */
@@ -2940,6 +3089,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read RIGHTMARGIN record
 	 */
@@ -2957,6 +3107,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read TOPMARGIN record
 	 */
@@ -2974,6 +3125,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read BOTTOMMARGIN record
 	 */
@@ -2991,6 +3143,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read PAGESETUP record
 	 */
@@ -3047,6 +3200,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * PROTECT - Sheet protection (BIFF2 through BIFF8)
 	 *   if this record is omitted, then it also means no sheet protection
@@ -3070,6 +3224,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_phpSheet->getProtection()->setSheet((bool)$bool);
 	}
 
+
 	/**
 	 * SCENPROTECT
 	 */
@@ -3093,6 +3248,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_phpSheet->getProtection()->setScenarios((bool)$bool);
 	}
 
+
 	/**
 	 * OBJECTPROTECT
 	 */
@@ -3116,6 +3272,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_phpSheet->getProtection()->setObjects((bool)$bool);
 	}
 
+
 	/**
 	 * PASSWORD - Sheet protection (hashed) password (BIFF2 through BIFF8)
 	 */
@@ -3134,6 +3291,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read DEFCOLWIDTH record
 	 */
@@ -3152,6 +3310,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read COLINFO record
 	 */
@@ -3203,6 +3362,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * ROW
 	 *
@@ -3231,15 +3391,15 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 			// offset: 6; size: 2;
 
-				// bit: 14-0; mask: 0x7FFF; height of the row, in twips = 1/20 of a point
-				$height = (0x7FFF & self::_GetInt2d($recordData, 6)) >> 0;
+			// bit: 14-0; mask: 0x7FFF; height of the row, in twips = 1/20 of a point
+			$height = (0x7FFF & self::_GetInt2d($recordData, 6)) >> 0;
 
-				// bit: 15: mask: 0x8000; 0 = row has custom height; 1= row has default height
-				$useDefaultHeight = (0x8000 & self::_GetInt2d($recordData, 6)) >> 15;
+			// bit: 15: mask: 0x8000; 0 = row has custom height; 1= row has default height
+			$useDefaultHeight = (0x8000 & self::_GetInt2d($recordData, 6)) >> 15;
 
-				if (!$useDefaultHeight) {
-					$this->_phpSheet->getRowDimension($r + 1)->setRowHeight($height / 20);
-				}
+			if (!$useDefaultHeight) {
+				$this->_phpSheet->getRowDimension($r + 1)->setRowHeight($height / 20);
+			}
 
 			// offset: 8; size: 2; not used
 
@@ -3247,30 +3407,31 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 			// offset: 12; size: 4; option flags and default row formatting
 
-				// bit: 2-0: mask: 0x00000007; outline level of the row
-				$level = (0x00000007 & self::_GetInt4d($recordData, 12)) >> 0;
-				$this->_phpSheet->getRowDimension($r + 1)->setOutlineLevel($level);
+			// bit: 2-0: mask: 0x00000007; outline level of the row
+			$level = (0x00000007 & self::_GetInt4d($recordData, 12)) >> 0;
+			$this->_phpSheet->getRowDimension($r + 1)->setOutlineLevel($level);
 
-				// bit: 4; mask: 0x00000010; 1 = outline group start or ends here... and is collapsed
-				$isCollapsed = (0x00000010 & self::_GetInt4d($recordData, 12)) >> 4;
-				$this->_phpSheet->getRowDimension($r + 1)->setCollapsed($isCollapsed);
+			// bit: 4; mask: 0x00000010; 1 = outline group start or ends here... and is collapsed
+			$isCollapsed = (0x00000010 & self::_GetInt4d($recordData, 12)) >> 4;
+			$this->_phpSheet->getRowDimension($r + 1)->setCollapsed($isCollapsed);
 
-				// bit: 5; mask: 0x00000020; 1 = row is hidden
-				$isHidden = (0x00000020 & self::_GetInt4d($recordData, 12)) >> 5;
-				$this->_phpSheet->getRowDimension($r + 1)->setVisible(!$isHidden);
+			// bit: 5; mask: 0x00000020; 1 = row is hidden
+			$isHidden = (0x00000020 & self::_GetInt4d($recordData, 12)) >> 5;
+			$this->_phpSheet->getRowDimension($r + 1)->setVisible(!$isHidden);
 
-				// bit: 7; mask: 0x00000080; 1 = row has explicit format
-				$hasExplicitFormat = (0x00000080 & self::_GetInt4d($recordData, 12)) >> 7;
+			// bit: 7; mask: 0x00000080; 1 = row has explicit format
+			$hasExplicitFormat = (0x00000080 & self::_GetInt4d($recordData, 12)) >> 7;
 
-				// bit: 27-16; mask: 0x0FFF0000; only applies when hasExplicitFormat = 1; index to XF record
-				$xfIndex = (0x0FFF0000 & self::_GetInt4d($recordData, 12)) >> 16;
+			// bit: 27-16; mask: 0x0FFF0000; only applies when hasExplicitFormat = 1; index to XF record
+			$xfIndex = (0x0FFF0000 & self::_GetInt4d($recordData, 12)) >> 16;
 
-				if ($hasExplicitFormat) {
-					$this->_phpSheet->getRowDimension($r + 1)->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
-				}
+			if ($hasExplicitFormat) {
+				$this->_phpSheet->getRowDimension($r + 1)->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
+			}
 		}
 	}
 
+
 	/**
 	 * Read RK record
 	 * This record represents a cell that contains an RK value
@@ -3298,7 +3459,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 			// offset: 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3317,6 +3478,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read LABELSST record
 	 * This record represents a cell that contains a string. It
@@ -3342,7 +3504,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 			// offset: 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3395,6 +3557,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read MULRK record
 	 * This record represents a cell range containing RK value
@@ -3428,7 +3591,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 			$columnString = PHPExcel_Cell::stringFromColumnIndex($colFirst + $i);
 
 			// Read cell?
-			if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+			if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 
 				// offset: var; size: 2; index to XF record
 				$xfIndex = self::_GetInt2d($recordData, $offset);
@@ -3449,6 +3612,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read NUMBER record
 	 * This record represents a cell that contains a
@@ -3473,7 +3637,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 			// offset 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3490,6 +3654,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read FORMULA record + perhaps a following STRING record if formula result is a string
 	 * This record contains the token array and the result of a
@@ -3539,7 +3704,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 
 		// Read cell?
-		if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 
 			if ($isPartOfSharedFormula) {
 				// formula is added to this cell after the sheet has been read
@@ -3633,6 +3798,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read a SHAREDFMLA record. This function just stores the binary shared formula in the reader,
 	 * which usually contains relative references.
@@ -3663,6 +3829,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 	}
 
+
 	/**
 	 * Read a STRING record from current stream position and advance the stream pointer to next record
 	 * This record is used for storing result from FORMULA record when it is a string, and
@@ -3689,6 +3856,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $value;
 	}
 
+
 	/**
 	 * Read BOOLERR record
 	 * This record represents a Boolean value or error value
@@ -3713,7 +3881,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 			// offset: 4; size: 2; index to XF record
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3747,6 +3915,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read MULBLANK record
 	 * This record represents a cell range of empty cells. All
@@ -3776,7 +3945,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 				$columnString = PHPExcel_Cell::stringFromColumnIndex($fc + $i);
 
 				// Read cell?
-				if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+				if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 					$xfIndex = self::_GetInt2d($recordData, 4 + 2 * $i);
 					$this->_phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->_mapCellXfIndex[$xfIndex]);
 				}
@@ -3786,6 +3955,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		// offset: 6; size 2; index to last column (not needed)
 	}
 
+
 	/**
 	 * Read LABEL record
 	 * This record represents a cell that contains a string. In
@@ -3812,7 +3982,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($column);
 
 		// Read cell?
-		if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 			// offset: 4; size: 2; XF index
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3835,6 +4005,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read BLANK record
 	 */
@@ -3854,7 +4025,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$columnString = PHPExcel_Cell::stringFromColumnIndex($col);
 
 		// Read cell?
-		if ( !is_null($this->getReadFilter()) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
+		if (($this->getReadFilter() !== NULL) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->_phpSheet->getTitle()) ) {
 			// offset: 4; size: 2; XF index
 			$xfIndex = self::_GetInt2d($recordData, 4);
 
@@ -3866,6 +4037,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 	}
 
+
 	/**
 	 * Read MSODRAWING record
 	 */
@@ -3880,6 +4052,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_drawingData .= $recordData;
 	}
 
+
 	/**
 	 * Read OBJ record
 	 */
@@ -3924,6 +4097,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 //		echo '<br />';
 	}
 
+
 	/**
 	 * Read WINDOW2 record
 	 */
@@ -3959,6 +4133,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read SCL record
 	 */
@@ -3980,6 +4155,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_phpSheet->getSheetView()->setZoomScale($numerator * 100 / $denumerator);
 	}
 
+
 	/**
 	 * Read PANE record
 	 */
@@ -4007,6 +4183,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read SELECTION record. There is one such record for each pane in the sheet.
 	 */
@@ -4057,10 +4234,11 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	private function _includeCellRangeFiltered($cellRangeAddress)
 	{
 		$includeCellRange = true;
-		if (!is_null($this->getReadFilter())) {
+		if ($this->getReadFilter() !== NULL) {
 			$includeCellRange = false;
 			$rangeBoundaries = PHPExcel_Cell::getRangeBoundaries($cellRangeAddress);
 			$rangeBoundaries[1][0]++;
@@ -4076,6 +4254,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $includeCellRange;
 	}
 
+
 	/**
 	 * MERGEDCELLS
 	 *
@@ -4096,13 +4275,15 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		if ($this->_version == self::XLS_BIFF8 && !$this->_readDataOnly) {
 			$cellRangeAddressList = $this->_readBIFF8CellRangeAddressList($recordData);
 			foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
-				if ($this->_includeCellRangeFiltered($cellRangeAddress)) {
+				if ((strpos($cellRangeAddress,':') !== FALSE) &&
+					($this->_includeCellRangeFiltered($cellRangeAddress))) {
 					$this->_phpSheet->mergeCells($cellRangeAddress);
 				}
 			}
 		}
 	}
 
+
 	/**
 	 * Read HYPERLINK record
 	 */
@@ -4278,6 +4459,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read DATAVALIDATIONS record
 	 */
@@ -4290,6 +4472,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		$this->_pos += 4 + $length;
 	}
 
+
 	/**
 	 * Read DATAVALIDATION record
 	 */
@@ -4449,6 +4632,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 	}
 
+
 	/**
 	 * Read SHEETLAYOUT record. Stores sheet tab color information.
 	 */
@@ -4488,6 +4672,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read SHEETPROTECTION record (FEATHEADR)
 	 */
@@ -4586,6 +4771,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		// offset: 21; size: 2; not used
 	}
 
+
 	/**
 	 * Read RANGEPROTECTION record
 	 * Reading of this record is based on Microsoft Office Excel 97-2000 Binary File Format Specification,
@@ -4648,6 +4834,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Read IMDATA record
 	 */
@@ -4728,6 +4915,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		// _getSplicedRecordData() takes care of moving current position in data stream
 	}
 
+
 	/**
 	 * Read a free CONTINUE record. Free CONTINUE record may be a camouflaged MSODRAWING record
 	 * When MSODRAWING data on a sheet exceeds 8224 bytes, CONTINUE records are used instead. Undocumented.
@@ -4819,6 +5007,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 	}
 
+
 	/**
 	 * Convert formula structure into human readable Excel formula like 'A3+A5*5'
 	 *
@@ -4857,6 +5046,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $this->_getFormulaFromData($formulaData, $additionalData, $baseCell);
 	}
 
+
 	/**
 	 * Take formula data and additional data for formula and return human readable formula
 	 *
@@ -4883,6 +5073,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $formulaString;
 	}
 
+
 	/**
 	 * Take array of tokens together with additional data for formula and return human readable formula
 	 *
@@ -4894,7 +5085,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 	private function _createFormulaFromTokens($tokens, $additionalData)
 	{
 		// empty formula?
-		if (count($tokens) == 0) {
+		if (empty($tokens)) {
 			return '';
 		}
 
@@ -5046,6 +5237,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $formulaString;
 	}
 
+
 	/**
 	 * Fetch next token from binary formula data
 	 *
@@ -5611,6 +5803,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Reads a cell address in BIFF8 e.g. 'A2' or '$A$2'
 	 * section 3.3.4
@@ -5640,6 +5833,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $column . $row;
 	}
 
+
 	/**
 	 * Reads a cell address in BIFF8 for shared formulas. Uses positive and negative values for row and column
 	 * to indicate offsets from a base cell
@@ -5683,6 +5877,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $column . $row;
 	}
 
+
 	/**
 	 * Reads a cell range address in BIFF5 e.g. 'A2:B6' or 'A1'
 	 * always fixed range
@@ -5721,6 +5916,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return "$fc$fr:$lc$lr";
 	}
 
+
 	/**
 	 * Reads a cell range address in BIFF8 e.g. 'A2:B6' or 'A1'
 	 * always fixed range
@@ -5759,6 +5955,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return "$fc$fr:$lc$lr";
 	}
 
+
 	/**
 	 * Reads a cell range address in BIFF8 e.g. 'A2:B6' or '$A$2:$B$6'
 	 * there are flags indicating whether column/row index is relative
@@ -5780,37 +5977,38 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 		// offset: 4; size: 2; index to first column or column offset + relative flags
 
-			// bit: 7-0; mask 0x00FF; column index
-			$fc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 4));
+		// bit: 7-0; mask 0x00FF; column index
+		$fc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 4));
 
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($subData, 4))) {
-				$fc = '$' . $fc;
-			}
+		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
+			$fc = '$' . $fc;
+		}
 
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($subData, 4))) {
-				$fr = '$' . $fr;
-			}
+		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
+			$fr = '$' . $fr;
+		}
 
 		// offset: 6; size: 2; index to last column or column offset + relative flags
 
-			// bit: 7-0; mask 0x00FF; column index
-			$lc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 6));
+		// bit: 7-0; mask 0x00FF; column index
+		$lc = PHPExcel_Cell::stringFromColumnIndex(0x00FF & self::_GetInt2d($subData, 6));
 
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($subData, 6))) {
-				$lc = '$' . $lc;
-			}
+		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
+			$lc = '$' . $lc;
+		}
 
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($subData, 6))) {
-				$lr = '$' . $lr;
-			}
+		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
+			$lr = '$' . $lr;
+		}
 
 		return "$fc$fr:$lc$lr";
 	}
 
+
 	/**
 	 * Reads a cell range address in BIFF8 for shared formulas. Uses positive and negative values for row and column
 	 * to indicate offsets from a base cell
@@ -5836,63 +6034,64 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 		// offset: 4; size: 2; first column with relative/absolute flags
 
-			// bit: 7-0; mask 0x00FF; column index
-			$fcIndex = 0x00FF & self::_GetInt2d($subData, 4);
+		// bit: 7-0; mask 0x00FF; column index
+		$fcIndex = 0x00FF & self::_GetInt2d($subData, 4);
 
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($subData, 4))) {
-				// absolute column index
-				$fc = PHPExcel_Cell::stringFromColumnIndex($fcIndex);
-				$fc = '$' . $fc;
-			} else {
-				// column offset
-				$fcIndex = ($fcIndex <= 127) ? $fcIndex : $fcIndex - 256;
-				$fc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $fcIndex);
-			}
+		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+		if (!(0x4000 & self::_GetInt2d($subData, 4))) {
+			// absolute column index
+			$fc = PHPExcel_Cell::stringFromColumnIndex($fcIndex);
+			$fc = '$' . $fc;
+		} else {
+			// column offset
+			$fcIndex = ($fcIndex <= 127) ? $fcIndex : $fcIndex - 256;
+			$fc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $fcIndex);
+		}
 
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($subData, 4))) {
-				// absolute row index
-				$fr = $frIndex + 1;
-				$fr = '$' . $fr;
-			} else {
-				// row offset
-				$frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
-				$fr = $baseRow + $frIndex;
-			}
+		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+		if (!(0x8000 & self::_GetInt2d($subData, 4))) {
+			// absolute row index
+			$fr = $frIndex + 1;
+			$fr = '$' . $fr;
+		} else {
+			// row offset
+			$frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
+			$fr = $baseRow + $frIndex;
+		}
 
 		// offset: 6; size: 2; last column with relative/absolute flags
 
-			// bit: 7-0; mask 0x00FF; column index
-			$lcIndex = 0x00FF & self::_GetInt2d($subData, 6);
+		// bit: 7-0; mask 0x00FF; column index
+		$lcIndex = 0x00FF & self::_GetInt2d($subData, 6);
+		$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
+		$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
+
+		// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
+		if (!(0x4000 & self::_GetInt2d($subData, 6))) {
+			// absolute column index
+			$lc = PHPExcel_Cell::stringFromColumnIndex($lcIndex);
+			$lc = '$' . $lc;
+		} else {
+			// column offset
 			$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
 			$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
+		}
 
-			// bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
-			if (!(0x4000 & self::_GetInt2d($subData, 6))) {
-				// absolute column index
-				$lc = PHPExcel_Cell::stringFromColumnIndex($lcIndex);
-				$lc = '$' . $lc;
-			} else {
-				// column offset
-				$lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
-				$lc = PHPExcel_Cell::stringFromColumnIndex($baseCol + $lcIndex);
-			}
-
-			// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
-			if (!(0x8000 & self::_GetInt2d($subData, 6))) {
-				// absolute row index
-				$lr = $lrIndex + 1;
-				$lr = '$' . $lr;
-			} else {
-				// row offset
-				$lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
-				$lr = $baseRow + $lrIndex;
-			}
+		// bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
+		if (!(0x8000 & self::_GetInt2d($subData, 6))) {
+			// absolute row index
+			$lr = $lrIndex + 1;
+			$lr = '$' . $lr;
+		} else {
+			// row offset
+			$lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
+			$lr = $baseRow + $lrIndex;
+		}
 
 		return "$fc$fr:$lc$lr";
 	}
 
+
 	/**
 	 * Read BIFF8 cell range address list
 	 * section 2.5.15
@@ -5920,6 +6119,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Read BIFF5 cell range address list
 	 * section 2.5.15
@@ -5947,6 +6147,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Get a sheet range like Sheet1:Sheet3 from REF index
 	 * Note: If there is only one sheet in the range, one gets e.g Sheet1
@@ -6004,6 +6205,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return false;
 	}
 
+
 	/**
 	 * read BIFF8 constant value array from array data
 	 * returns e.g. array('value' => '{1,2;3,4}', 'size' => 40}
@@ -6042,6 +6244,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * read BIFF8 constant value which may be 'Empty Value', 'Number', 'String Value', 'Boolean Value', 'Error Value'
 	 * section 2.5.7
@@ -6092,6 +6295,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Extract RGB color
 	 * OpenOffice.org's Documentation of the Microsoft Excel File Format, section 2.5.4
@@ -6116,6 +6320,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return array('rgb' => $rgb);
 	}
 
+
 	/**
 	 * Read byte string (8-bit string length)
 	 * OpenOffice documentation: 2.5.2
@@ -6137,6 +6342,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Read byte string (16-bit string length)
 	 * OpenOffice documentation: 2.5.2
@@ -6159,6 +6365,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Extracts an Excel Unicode short string (8-bit string length)
 	 * OpenOffice documentation: 2.5.3
@@ -6182,6 +6389,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $string;
 	}
 
+
 	/**
 	 * Extracts an Excel Unicode long string (16-bit string length)
 	 * OpenOffice documentation: 2.5.3
@@ -6205,6 +6413,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $string;
 	}
 
+
 	/**
 	 * Read Unicode string with no string length field, but with known character count
 	 * this function is under construction, needs to support rich text, and Asian phonetic settings
@@ -6240,6 +6449,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		);
 	}
 
+
 	/**
 	 * Convert UTF-8 string to string surounded by double quotes. Used for explicit string tokens in formulas.
 	 * Example:  hello"world  -->  "hello""world"
@@ -6252,6 +6462,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return '"' . str_replace('"', '""', $value) . '"';
 	}
 
+
 	/**
 	 * Reads first 8 bytes of a string and return IEEE 754 float
 	 *
@@ -6275,18 +6486,18 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 
 		$value += $mantissalow2 / pow (2 , (52 - $exp));
 		if ($sign) {
-			$value = -1 * $value;
+			$value *= -1;
 		}
 
 		return $value;
 	}
 
+
 	private static function _GetIEEE754($rknum)
 	{
 		if (($rknum & 0x02) != 0) {
 			$value = $rknum >> 2;
-		}
-		else {
+		} else {
 			// changes by mmp, info on IEEE754 encoding from
 			// research.microsoft.com/~hollasch/cgindex/coding/ieeefloat.html
 			// The RK format calls for using only the most significant 30 bits
@@ -6307,6 +6518,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $value;
 	}
 
+
 	/**
 	 * Get UTF-8 string from (compressed or uncompressed) UTF-16 string
 	 *
@@ -6323,6 +6535,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', 'UTF-16LE');
 	}
 
+
 	/**
 	 * Convert UTF-16 string in compressed notation to uncompressed form. Only used for BIFF8.
 	 *
@@ -6340,6 +6553,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return $uncompressedString;
 	}
 
+
 	/**
 	 * Convert string to UTF-8. Only used for BIFF5.
 	 *
@@ -6351,6 +6565,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $this->_codepage);
 	}
 
+
 	/**
 	 * Read 16-bit unsigned integer
 	 *
@@ -6360,9 +6575,10 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 	 */
 	public static function _GetInt2d($data, $pos)
 	{
-		return ord($data[$pos]) | (ord($data[$pos + 1]) << 8);
+		return ord($data[$pos]) | (ord($data[$pos+1]) << 8);
 	}
 
+
 	/**
 	 * Read 32-bit signed integer
 	 *
@@ -6382,9 +6598,10 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		} else {
 			$_ord_24 = ($_or_24 & 127) << 24;
 		}
-		return ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | $_ord_24;
+		return ord($data[$pos]) | (ord($data[$pos+1]) << 8) | (ord($data[$pos+2]) << 16) | $_ord_24;
 	}
 
+
 	/**
 	 * Read color
 	 *
@@ -6442,6 +6659,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Get fill pattern from index
 	 * OpenOffice documentation: 2.5.12
@@ -6475,6 +6693,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Map error code, e.g. '#N/A'
 	 *
@@ -6495,6 +6714,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Map built-in color to RGB value
 	 *
@@ -6518,6 +6738,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Map color array from BIFF5 built-in color index
 	 *
@@ -6587,6 +6808,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	/**
 	 * Map color array from BIFF8 built-in color index
 	 *
@@ -6656,6 +6878,7 @@ class PHPExcel_Reader_Excel5 implements PHPExcel_Reader_IReader
 		}
 	}
 
+
 	private function _parseRichText($is = '') {
 		$value = new PHPExcel_RichText();
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5/Escher.php b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5/Escher.php
index e1a25bb47ac..e167655ffd6 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5/Escher.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/Excel5/Escher.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Excel5_Escher
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/Gnumeric.php b/htdocs/includes/phpexcel/PHPExcel/Reader/Gnumeric.php
index af0b5fe4643..5d82f22924f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/Gnumeric.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/Gnumeric.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -36,28 +36,28 @@ if (!defined('PHPEXCEL_ROOT')) {
 }
 
 /**
- *	PHPExcel_Reader_Gnumeric
+ * PHPExcel_Reader_Gnumeric
  *
- *	@category	PHPExcel
- *	@package	PHPExcel_Reader
- *	@copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @category	PHPExcel
+ * @package		PHPExcel_Reader
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 {
 	/**
-	 *	Read data only?
-	 *	Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
+	 * Read data only?
+	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
 	 *		or whether it should read both data and formatting
 	 *
-	 *	@var	boolean
+	 * @var	boolean
 	 */
 	private $_readDataOnly = false;
 
 	/**
-	 *	Restrict which sheets should be loaded?
-	 *	This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+	 * Restrict which sheets should be loaded?
+	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
 	 *
-	 *	@var	array of string
+	 * @var	array of string
 	 */
 	private $_loadSheetsOnly = null;
 
@@ -86,50 +86,62 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 
 
 	/**
-	 *	Read data only?
+	 * Create a new PHPExcel_Reader_Gnumeric
+	 */
+	public function __construct() {
+		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
+	}
+
+
+	/**
+	 * Read data only?
 	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
 	 *		If false (the default) it will read data and formatting.
 	 *
-	 *	@return	boolean
+	 * @return	boolean
 	 */
 	public function getReadDataOnly() {
 		return $this->_readDataOnly;
 	}
 
+
 	/**
-	 *	Set read data only
+	 * Set read data only
 	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
 	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
 	 *
-	 *	@param	boolean	$pValue
+	 * @param	boolean	$pValue
 	 *
-	 *	@return	PHPExcel_Reader_Gnumeric
+	 * @return	PHPExcel_Reader_Gnumeric
 	 */
 	public function setReadDataOnly($pValue = false) {
 		$this->_readDataOnly = $pValue;
 		return $this;
 	}
 
+
 	/**
-	 *	Get which sheets to load
-	 *		Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *			indicating that all worksheets in the workbook should be loaded.
+	 * Get which sheets to load
+	 * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
+	 *		indicating that all worksheets in the workbook should be loaded.
 	 *
-	 *	@return mixed
+	 * @return mixed
 	 */
 	public function getLoadSheetsOnly()
 	{
 		return $this->_loadSheetsOnly;
 	}
 
+
 	/**
-	 *	Set which sheets to load
+	 * Set which sheets to load
 	 *
-	 *	@param mixed $value
+	 * @param mixed $value
 	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
 	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
 	 *
-	 *	@return PHPExcel_Reader_Gnumeric
+	 * @return PHPExcel_Reader_Gnumeric
 	 */
 	public function setLoadSheetsOnly($value = null)
 	{
@@ -138,11 +150,12 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
-	 *	Set all sheets to load
+	 * Set all sheets to load
 	 *		Tells the Reader to load all worksheets from the workbook.
 	 *
-	 *	@return PHPExcel_Reader_Gnumeric
+	 * @return PHPExcel_Reader_Gnumeric
 	 */
 	public function setLoadAllSheets()
 	{
@@ -150,6 +163,7 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
 	 * Read filter
 	 *
@@ -159,6 +173,7 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $this->_readFilter;
 	}
 
+
 	/**
 	 * Set read filter
 	 *
@@ -170,32 +185,26 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
-	/**
-	 * Create a new PHPExcel_Reader_Gnumeric
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
-	}
 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @param 	string 		$pFileName
 	 * @return 	boolean
+	 * @throws Exception
 	 */
 	public function canRead($pFilename)
 	{
-		// Check if gzlib functions are available
-		if (!function_exists('gzread')) {
-			return false;
-		}
-
 		// Check if file exists
 		if (!file_exists($pFilename)) {
 			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
 		}
 
+		// Check if gzlib functions are available
+		if (!function_exists('gzread')) {
+			throw new Exception("gzlib library is not enabled");
+		}
+
 		// Read signature data (first 3 bytes)
 		$fh = fopen($pFilename, 'r');
 		$data = fread($fh, 2);
@@ -208,6 +217,70 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return true;
 	}
 
+
+	/**
+	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+	 *
+	 * @param   string     $pFilename
+	 * @throws   Exception
+	 */
+	public function listWorksheetInfo($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		$gFileData = $this->_gzfileGetContents($pFilename);
+
+		$xml = simplexml_load_string($gFileData);
+		$namespacesMeta = $xml->getNamespaces(true);
+
+		$gnmXML = $xml->children($namespacesMeta['gnm']);
+
+		$worksheetInfo = array();
+
+		foreach ($gnmXML->Sheets->Sheet as $sheet) {
+			$tmpInfo = array();
+			$tmpInfo['worksheetName'] = (string) $sheet->Name;
+			$tmpInfo['lastColumnLetter'] = 'A';
+			$tmpInfo['lastColumnIndex'] = 0;
+			$tmpInfo['totalRows'] = 0;
+			$tmpInfo['totalColumns'] = 0;
+
+			foreach ($sheet->Cells->Cell as $cell) {
+				$cellAttributes = $cell->attributes();
+
+				$rowIndex = (int) $cellAttributes->Row + 1;
+				$columnIndex = (int) $cellAttributes->Col;
+
+				$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex);
+				$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex);
+			}
+
+			$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+			$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+			$worksheetInfo[] = $tmpInfo;
+		}
+
+		return $worksheetInfo;
+	}
+
+
+	private function _gzfileGetContents($filename) {
+		$file = @gzopen($filename, 'rb');
+		if ($file !== false) {
+			$data = '';
+			while (!gzeof($file)) {
+				$data .= gzread($file, 1024);
+			}
+			gzclose($file);
+		}
+		return $data;
+	}
+
+
 	/**
 	 * Loads PHPExcel from file
 	 *
@@ -224,17 +297,6 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $this->loadIntoExisting($pFilename, $objPHPExcel);
 	}
 
-	private function _gzfileGetContents($filename) {
-		$file = @gzopen($filename, 'rb');
-		if ($file !== false) {
-			$data = '';
-			while (!gzeof($file)) {
-				$data .= gzread($file, 1024);
-			}
-			gzclose($file);
-		}
-		return $data;
-	}
 
 	/**
 	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
@@ -414,7 +476,10 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 			// Create new Worksheet
 			$objPHPExcel->createSheet();
 			$objPHPExcel->setActiveSheetIndex($worksheetID);
-			$objPHPExcel->getActiveSheet()->setTitle($worksheetName);
+			//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
+			//		cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
+			//		name in line with the formula, not the reverse
+			$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
 
 			if ((!$this->_readDataOnly) && (isset($sheet->PrintInformation))) {
 				if (isset($sheet->PrintInformation->Margins)) {
@@ -461,7 +526,7 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 				$column = PHPExcel_Cell::stringFromColumnIndex($column);
 
 				// Read cell?
-				if (!is_null($this->getReadFilter())) {
+				if ($this->getReadFilter() !== NULL) {
 					if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
 						continue;
 					}
@@ -536,16 +601,13 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 //
 			foreach($sheet->Styles->StyleRegion as $styleRegion) {
 				$styleAttributes = $styleRegion->attributes();
-//				var_dump($styleAttributes);
-//				echo '<br />';
-
 				if (($styleAttributes['startRow'] <= $maxRow) &&
 					($styleAttributes['startCol'] <= $maxCol)) {
 
-					$startColumn = PHPExcel_Cell::stringFromColumnIndex($styleAttributes['startCol']);
+					$startColumn = PHPExcel_Cell::stringFromColumnIndex((int) $styleAttributes['startCol']);
 					$startRow = $styleAttributes['startRow'] + 1;
 
-					$endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : $styleAttributes['endCol'];
+					$endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
 					$endColumn = PHPExcel_Cell::stringFromColumnIndex($endColumn);
 					$endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
 					$endRow += 1;
@@ -808,7 +870,9 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 			//	Handle Merged Cells in this worksheet
 			if (isset($sheet->MergedRegions)) {
 				foreach($sheet->MergedRegions->Merge as $mergeCells) {
-					$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
+					if (strpos($mergeCells,':') !== FALSE) {
+						$objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
+					}
 				}
 			}
 
@@ -838,7 +902,9 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $objPHPExcel;
 	}
 
-	private static function _parseBorderAttributes($borderAttributes) {
+
+	private static function _parseBorderAttributes($borderAttributes)
+	{
 		$styleArray = array();
 
 		if (isset($borderAttributes["Color"])) {
@@ -893,6 +959,7 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $styleArray;
 	}
 
+
 	private function _parseRichText($is = '') {
 		$value = new PHPExcel_RichText();
 
@@ -901,6 +968,7 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
 		return $value;
 	}
 
+
 	private static function _parseGnumericColour($gnmColour) {
 		list($gnmR,$gnmG,$gnmB) = explode(':',$gnmColour);
 		$gnmR = substr(str_pad($gnmR,4,'0',STR_PAD_RIGHT),0,2);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/HTML.php b/htdocs/includes/phpexcel/PHPExcel/Reader/HTML.php
new file mode 100644
index 00000000000..d6068eaa4f4
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/HTML.php
@@ -0,0 +1,499 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+	/**
+	 * @ignore
+	 */
+	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_HTML
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Reader_HTML implements PHPExcel_Reader_IReader
+{
+	/**
+	 * Input encoding
+	 *
+	 * @var string
+	 */
+	private $_inputEncoding	= 'ANSI';
+
+	/**
+	 * Sheet index to read
+	 *
+	 * @var int
+	 */
+	private $_sheetIndex 	= 0;
+
+	/**
+	 * Formats
+	 *
+	 * @var array
+	 */
+	private $_formats = array( 'h1' => array( 'font' => array( 'bold' => true,
+															   'size' => 24,
+															 ),
+											),	//	Bold, 24pt
+							   'h2' => array( 'font' => array( 'bold' => true,
+															   'size' => 18,
+															 ),
+											),	//	Bold, 18pt
+							   'h3' => array( 'font' => array( 'bold' => true,
+															   'size' => 13.5,
+															 ),
+											),	//	Bold, 13.5pt
+							   'h4' => array( 'font' => array( 'bold' => true,
+															   'size' => 12,
+															 ),
+											),	//	Bold, 12pt
+							   'h5' => array( 'font' => array( 'bold' => true,
+															   'size' => 10,
+															 ),
+											),	//	Bold, 10pt
+							   'h6' => array( 'font' => array( 'bold' => true,
+															   'size' => 7.5,
+															 ),
+											),	//	Bold, 7.5pt
+							   'a'  => array( 'font' => array( 'underline' => true,
+															   'color' => array( 'argb' => PHPExcel_Style_Color::COLOR_BLUE,
+															                   ),
+															 ),
+											),	//	Blue underlined
+							   'hr' => array( 'borders' => array( 'bottom' => array( 'style' => PHPExcel_Style_Border::BORDER_THIN,
+																					 'color' => array( PHPExcel_Style_Color::COLOR_BLACK,
+																					                 ),
+																				   ),
+																),
+											),	//	Bottom border
+							 );
+
+	/**
+	 * PHPExcel_Reader_IReadFilter instance
+	 *
+	 * @var PHPExcel_Reader_IReadFilter
+	 */
+	private $_readFilter = null;
+
+
+	/**
+	 * Create a new PHPExcel_Reader_HTML
+	 */
+	public function __construct() {
+		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+	}
+
+	/**
+	 *	Can the current PHPExcel_Reader_IReader read the file?
+	 *
+	 *	@param 	string 		$pFileName
+	 *	@return 	boolean
+	 *	@throws Exception
+	 */
+	public function canRead($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		// Read sample data (first 2 KB will do)
+		$fh = fopen($pFilename, 'r');
+		$data = fread($fh, 2048);
+		fclose($fh);
+
+		return true;
+	}
+
+	/**
+	 * Loads PHPExcel from file
+	 *
+	 * @param 	string 		$pFilename
+	 * @return 	PHPExcel
+	 * @throws 	Exception
+	 */
+	public function load($pFilename)
+	{
+		// Create new PHPExcel
+		$objPHPExcel = new PHPExcel();
+
+		// Load into this instance
+		return $this->loadIntoExisting($pFilename, $objPHPExcel);
+	}
+
+	/**
+	 * Read filter
+	 *
+	 * @return PHPExcel_Reader_IReadFilter
+	 */
+	public function getReadFilter() {
+		return $this->_readFilter;
+	}
+
+	/**
+	 * Set read filter
+	 *
+	 * @param PHPExcel_Reader_IReadFilter $pValue
+	 */
+	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
+		$this->_readFilter = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Set input encoding
+	 *
+	 * @param string $pValue Input encoding
+	 */
+	public function setInputEncoding($pValue = 'ANSI')
+	{
+		$this->_inputEncoding = $pValue;
+		return $this;
+	}
+
+	/**
+	 * Get input encoding
+	 *
+	 * @return string
+	 */
+	public function getInputEncoding()
+	{
+		return $this->_inputEncoding;
+	}
+
+	//	Data Array used for testing only, should write to PHPExcel object on completion of tests
+	private $_dataArray = array();
+
+	private $_tableLevel = 0;
+	private $_nestedColumn = array('A');
+
+	private function _setTableStartColumn($column) {
+		if ($this->_tableLevel == 0)
+			$column = 'A';
+		++$this->_tableLevel;
+		$this->_nestedColumn[$this->_tableLevel] = $column;
+
+		return $this->_nestedColumn[$this->_tableLevel];
+	}
+
+	private function _getTableStartColumn() {
+		return $this->_nestedColumn[$this->_tableLevel];
+	}
+
+	private function _releaseTableStartColumn() {
+		--$this->_tableLevel;
+		return array_pop($this->_nestedColumn);
+	}
+
+	private function _flushCell($sheet,$column,$row,&$cellContent) {
+		if (is_string($cellContent)) {
+			//	Simple String content
+			if (trim($cellContent) > '') {
+				//	Only actually write it if there's content in the string
+				echo 'FLUSH CELL: ' , $column , $row , ' => ' , $cellContent , '<br />';
+				//	Write to worksheet to be done here...
+				//	... we return the cell so we can mess about with styles more easily
+				$cell = $sheet->setCellValue($column.$row,$cellContent,true);
+				$this->_dataArray[$row][$column] = $cellContent;
+			}
+		} else {
+			//	We have a Rich Text run
+			//	TODO
+			$this->_dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
+		}
+		$cellContent = (string) '';
+	}
+
+	private function _processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent){
+		foreach($element->childNodes as $child){
+			if ($child instanceOf DOMText) {
+				$domText = preg_replace('/\s+/',' ',trim($child->nodeValue));
+				if (is_string($cellContent)) {
+					//	simply append the text if the cell content is a plain text string
+					$cellContent .= $domText;
+				} else {
+					//	but if we have a rich text run instead, we need to append it correctly
+					//	TODO
+				}
+			} elseif($child instanceOf DOMElement) {
+				echo '<b>DOM ELEMENT: </b>' , strtoupper($child->nodeName) , '<br />';
+
+				$attributeArray = array();
+				foreach($child->attributes as $attribute) {
+					echo '<b>ATTRIBUTE: </b>' , $attribute->name , ' => ' , $attribute->value , '<br />';
+					$attributeArray[$attribute->name] = $attribute->value;
+				}
+
+				switch($child->nodeName) {
+					case 'meta' :
+						foreach($attributeArray as $attributeName => $attributeValue) {
+							switch($attributeName) {
+								case 'content':
+									//	TODO
+									//	Extract character set, so we can convert to UTF-8 if required
+									break;
+							}
+						}
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						break;
+					case 'title' :
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						$sheet->setTitle($cellContent);
+						$cellContent = '';
+						break;
+					case 'span'  :
+					case 'div'   :
+					case 'font'  :
+					case 'i'     :
+					case 'em'    :
+					case 'strong':
+					case 'b'     :
+						echo 'STYLING, SPAN OR DIV<br />';
+						if ($cellContent > '')
+							$cellContent .= ' ';
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						if ($cellContent > '')
+							$cellContent .= ' ';
+						echo 'END OF STYLING, SPAN OR DIV<br />';
+						break;
+					case 'hr' :
+						$this->_flushCell($sheet,$column,$row,$cellContent);
+						++$row;
+						if (isset($this->_formats[$child->nodeName])) {
+							$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
+						} else {
+							$cellContent = '----------';
+							$this->_flushCell($sheet,$column,$row,$cellContent);
+						}
+						++$row;
+					case 'br' :
+						if ($this->_tableLevel > 0) {
+							//	If we're inside a table, replace with a \n
+							$cellContent .= "\n";
+						} else {
+							//	Otherwise flush our existing content and move the row cursor on
+							$this->_flushCell($sheet,$column,$row,$cellContent);
+							++$row;
+						}
+						echo 'HARD LINE BREAK: ' , '<br />';
+						break;
+					case 'a'  :
+						echo 'START OF HYPERLINK: ' , '<br />';
+						foreach($attributeArray as $attributeName => $attributeValue) {
+							switch($attributeName) {
+								case 'href':
+									echo 'Link to ' , $attributeValue , '<br />';
+									$sheet->getCell($column.$row)->getHyperlink()->setUrl($attributeValue);
+									if (isset($this->_formats[$child->nodeName])) {
+										$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
+									}
+									break;
+							}
+						}
+						$cellContent .= ' ';
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						echo 'END OF HYPERLINK:' , '<br />';
+						break;
+					case 'h1' :
+					case 'h2' :
+					case 'h3' :
+					case 'h4' :
+					case 'h5' :
+					case 'h6' :
+					case 'ol' :
+					case 'ul' :
+					case 'p'  :
+						if ($this->_tableLevel > 0) {
+							//	If we're inside a table, replace with a \n
+							$cellContent .= "\n";
+							echo 'LIST ENTRY: ' , '<br />';
+							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+							echo 'END OF LIST ENTRY:' , '<br />';
+						} else {
+							if ($cellContent > '') {
+								$this->_flushCell($sheet,$column,$row,$cellContent);
+								$row += 2;
+							}
+							echo 'START OF PARAGRAPH: ' , '<br />';
+							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+							echo 'END OF PARAGRAPH:' , '<br />';
+							$this->_flushCell($sheet,$column,$row,$cellContent);
+
+							if (isset($this->_formats[$child->nodeName])) {
+								$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
+							}
+
+							$row += 2;
+							$column = 'A';
+						}
+						break;
+					case 'li'  :
+						if ($this->_tableLevel > 0) {
+							//	If we're inside a table, replace with a \n
+							$cellContent .= "\n";
+							echo 'LIST ENTRY: ' , '<br />';
+							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+							echo 'END OF LIST ENTRY:' , '<br />';
+						} else {
+							if ($cellContent > '') {
+								$this->_flushCell($sheet,$column,$row,$cellContent);
+							}
+							++$row;
+							echo 'LIST ENTRY: ' , '<br />';
+							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+							echo 'END OF LIST ENTRY:' , '<br />';
+							$this->_flushCell($sheet,$column,$row,$cellContent);
+							$column = 'A';
+						}
+						break;
+					case 'table' :
+						$this->_flushCell($sheet,$column,$row,$cellContent);
+						$column = $this->_setTableStartColumn($column);
+						echo 'START OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
+						if ($this->_tableLevel > 1)
+							--$row;
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						echo 'END OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
+						$column = $this->_releaseTableStartColumn();
+						if ($this->_tableLevel > 1) {
+							++$column;
+						} else {
+							++$row;
+						}
+						break;
+					case 'thead' :
+					case 'tbody' :
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						break;
+					case 'tr' :
+						++$row;
+						$column = $this->_getTableStartColumn();
+						$cellContent = '';
+						echo 'START OF TABLE ' , $this->_tableLevel , ' ROW<br />';
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						echo 'END OF TABLE ' , $this->_tableLevel , ' ROW<br />';
+						break;
+					case 'th' :
+					case 'td' :
+						echo 'START OF TABLE ' , $this->_tableLevel , ' CELL<br />';
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						echo 'END OF TABLE ' , $this->_tableLevel , ' CELL<br />';
+						$this->_flushCell($sheet,$column,$row,$cellContent);
+						++$column;
+						break;
+					case 'body' :
+						$row = 1;
+						$column = 'A';
+						$content = '';
+						$this->_tableLevel = 0;
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+						break;
+					default:
+						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Loads PHPExcel from file into PHPExcel instance
+	 *
+	 * @param 	string 		$pFilename
+	 * @param	PHPExcel	$objPHPExcel
+	 * @return 	PHPExcel
+	 * @throws 	Exception
+	 */
+	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		if (!is_file($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! The given file is not a regular file.");
+		}
+
+		// Create new PHPExcel
+		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
+			$objPHPExcel->createSheet();
+		}
+		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+
+		//	Create a new DOM object
+		$dom = new domDocument;
+		//	Load the HTML file into the DOM object
+		$loaded = $dom->loadHTMLFile($pFilename);
+		if ($loaded === false) {
+			throw new Exception('Failed to load ',$pFilename,' as a DOM Document');
+		}
+
+		//	Discard white space
+		$dom->preserveWhiteSpace = false;
+
+
+		$row = 0;
+		$column = 'A';
+		$content = '';
+		$this->_processDomElement($dom,$objPHPExcel->getActiveSheet(),$row,$column,$content);
+
+		echo '<hr />';
+		var_dump($this->_dataArray);
+
+		// Return
+		return $objPHPExcel;
+	}
+
+	/**
+	 * Get sheet index
+	 *
+	 * @return int
+	 */
+	public function getSheetIndex() {
+		return $this->_sheetIndex;
+	}
+
+	/**
+	 * Set sheet index
+	 *
+	 * @param	int		$pValue		Sheet index
+	 * @return PHPExcel_Reader_HTML
+	 */
+	public function setSheetIndex($pValue = 0) {
+		$this->_sheetIndex = $pValue;
+		return $this;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/IReadFilter.php b/htdocs/includes/phpexcel/PHPExcel/Reader/IReadFilter.php
index d5b0cb9c2c2..50e92c8045a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/IReadFilter.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/IReadFilter.php
@@ -2,27 +2,27 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_Reader_IReadFilter
 {
@@ -42,6 +42,6 @@ interface PHPExcel_Reader_IReadFilter
 	 * @param 	$row			Row index
 	 * @param	$worksheetName	Optional worksheet name
 	 * @return	boolean
-	 */	
+	 */
 	public function readCell($column, $row, $worksheetName = '');
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/IReader.php b/htdocs/includes/phpexcel/PHPExcel/Reader/IReader.php
index d82260a31de..1c9884730b8 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/IReader.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/IReader.php
@@ -2,27 +2,27 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_Reader_IReader
 {
@@ -40,14 +40,14 @@ interface PHPExcel_Reader_IReader
 	 *
 	 * @param 	string 		$pFileName
 	 * @return 	boolean
-	 */	
+	 */
 	public function canRead($pFilename);
-	
+
 	/**
 	 * Loads PHPExcel from file
 	 *
 	 * @param 	string 		$pFileName
 	 * @throws 	Exception
-	 */	
+	 */
 	public function load($pFilename);
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/OOCalc.php b/htdocs/includes/phpexcel/PHPExcel/Reader/OOCalc.php
index 93a376bef77..22ad1173b4f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/OOCalc.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/OOCalc.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -36,28 +36,28 @@ if (!defined('PHPEXCEL_ROOT')) {
 }
 
 /**
- *	PHPExcel_Reader_OOCalc
+ * PHPExcel_Reader_OOCalc
  *
- *	@category	PHPExcel
- *	@package	PHPExcel_Reader
- *	@copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @category	PHPExcel
+ * @package		PHPExcel_Reader
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 {
 	/**
-	 *	Read data only?
-	 *	Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
+	 * Read data only?
+	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
 	 *		or whether it should read both data and formatting
 	 *
-	 *	@var	boolean
+	 * @var	boolean
 	 */
 	private $_readDataOnly = false;
 
 	/**
-	 *	Restrict which sheets should be loaded?
-	 *	This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+	 * Restrict which sheets should be loaded?
+	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
 	 *
-	 *	@var	array of string
+	 * @var	array of string
 	 */
 	private $_loadSheetsOnly = null;
 
@@ -77,50 +77,60 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 
 
 	/**
-	 *	Read data only?
+	 * Create a new PHPExcel_Reader_OOCalc
+	 */
+	public function __construct() {
+		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+	}
+
+
+	/**
+	 * Read data only?
 	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
 	 *		If false (the default) it will read data and formatting.
 	 *
-	 *	@return	boolean
+	 * @return	boolean
 	 */
 	public function getReadDataOnly() {
 		return $this->_readDataOnly;
 	}
 
+
 	/**
-	 *	Set read data only
+	 * Set read data only
 	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
 	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
 	 *
-	 *	@param	boolean	$pValue
-	 *
-	 *	@return	PHPExcel_Reader_OOCalc
+	 * @param	boolean	$pValue
+	 * @return	PHPExcel_Reader_OOCalc
 	 */
 	public function setReadDataOnly($pValue = false) {
 		$this->_readDataOnly = $pValue;
 		return $this;
 	}
 
+
 	/**
-	 *	Get which sheets to load
+	 * Get which sheets to load
 	 *		Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
 	 *			indicating that all worksheets in the workbook should be loaded.
 	 *
-	 *	@return mixed
+	 * @return mixed
 	 */
 	public function getLoadSheetsOnly()
 	{
 		return $this->_loadSheetsOnly;
 	}
 
+
 	/**
-	 *	Set which sheets to load
+	 * Set which sheets to load
 	 *
-	 *	@param mixed $value
+	 * @param mixed $value
 	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
 	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
 	 *
-	 *	@return PHPExcel_Reader_OOCalc
+	 * @return PHPExcel_Reader_OOCalc
 	 */
 	public function setLoadSheetsOnly($value = null)
 	{
@@ -129,11 +139,12 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
-	 *	Set all sheets to load
+	 * Set all sheets to load
 	 *		Tells the Reader to load all worksheets from the workbook.
 	 *
-	 *	@return PHPExcel_Reader_OOCalc
+	 * @return PHPExcel_Reader_OOCalc
 	 */
 	public function setLoadAllSheets()
 	{
@@ -141,6 +152,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
+
 	/**
 	 * Read filter
 	 *
@@ -150,6 +162,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 		return $this->_readFilter;
 	}
 
+
 	/**
 	 * Set read filter
 	 *
@@ -161,45 +174,47 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 		return $this;
 	}
 
-	/**
-	 * Create a new PHPExcel_Reader_OOCalc
-	 */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-	}
 
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @param 	string 		$pFileName
 	 * @return 	boolean
+	 * @throws Exception
 	 */
 	public function canRead($pFilename)
 	{
-		// Check if zip class exists
-		if (!class_exists('ZipArchive')) {
-			return false;
-		}
-
 		// Check if file exists
 		if (!file_exists($pFilename)) {
 			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
 		}
 
+		// Check if zip class exists
+		if (!class_exists('ZipArchive',FALSE)) {
+			throw new Exception("ZipArchive library is not enabled");
+		}
+
 		// Load file
 		$zip = new ZipArchive;
 		if ($zip->open($pFilename) === true) {
 			// check if it is an OOXML archive
-			$mimeType = $zip->getFromName("mimetype");
+			$stat = $zip->statName('mimetype');
+			if ($stat && ($stat['size'] <= 255)) {
+				$mimeType = $zip->getFromName($stat['name']);
+			} else {
+				$zip->close();
+				return FALSE;
+			}
 
 			$zip->close();
 
 			return ($mimeType === 'application/vnd.oasis.opendocument.spreadsheet');
 		}
 
-		return false;
+		return FALSE;
 	}
 
+
 	/**
 	 * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
 	 *
@@ -252,6 +267,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 		return $this->loadIntoExisting($pFilename, $objPHPExcel);
 	}
 
+
 	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
 		$styleAttributeValue = strtolower($styleAttributeValue);
 		foreach($styleList as $style) {
@@ -263,6 +279,79 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 		return false;
 	}
 
+
+	/**
+	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+	 *
+	 * @param   string     $pFilename
+	 * @throws   Exception
+	 */
+	public function listWorksheetInfo($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		$worksheetInfo = array();
+
+		$zip = new ZipArchive;
+		if ($zip->open($pFilename) === true) {
+
+			$xml = simplexml_load_string($zip->getFromName("content.xml"));
+			$namespacesContent = $xml->getNamespaces(true);
+
+			$workbook = $xml->children($namespacesContent['office']);
+			foreach($workbook->body->spreadsheet as $workbookData) {
+				$workbookData = $workbookData->children($namespacesContent['table']);
+				foreach($workbookData->table as $worksheetDataSet) {
+					$worksheetData = $worksheetDataSet->children($namespacesContent['table']);
+					$worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
+
+					$tmpInfo = array();
+					$tmpInfo['worksheetName'] = (string) $worksheetDataAttributes['name'];
+					$tmpInfo['lastColumnLetter'] = 'A';
+					$tmpInfo['lastColumnIndex'] = 0;
+					$tmpInfo['totalRows'] = 0;
+					$tmpInfo['totalColumns'] = 0;
+
+					$rowIndex = 0;
+					foreach ($worksheetData as $key => $rowData) {
+						switch ($key) {
+							case 'table-row' :
+								$rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
+								$rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
+										$rowDataTableAttributes['number-rows-repeated'] : 1;
+								$columnIndex = 0;
+
+								foreach ($rowData as $key => $cellData) {
+									$cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
+									$colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
+										$cellDataTableAttributes['number-columns-repeated'] : 1;
+									$cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
+									if (isset($cellDataOfficeAttributes['value-type'])) {
+										$tmpInfo['lastColumnIndex'] = max($tmpInfo['lastColumnIndex'], $columnIndex + $colRepeats - 1);
+										$tmpInfo['totalRows'] = max($tmpInfo['totalRows'], $rowIndex + $rowRepeats);
+									}
+									$columnIndex += $colRepeats;
+								}
+								$rowIndex += $rowRepeats;
+								break;
+						}
+					}
+
+					$tmpInfo['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
+					$tmpInfo['totalColumns'] = $tmpInfo['lastColumnIndex'] + 1;
+
+					$worksheetInfo[] = $tmpInfo;
+				}
+			}
+		}
+
+		return $worksheetInfo;
+	}
+
+
 	/**
 	 * Loads PHPExcel from file into PHPExcel instance
 	 *
@@ -396,7 +485,10 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 					$objPHPExcel->setActiveSheetIndex($worksheetID);
 					if (isset($worksheetDataAttributes['name'])) {
 						$worksheetName = (string) $worksheetDataAttributes['name'];
-						$objPHPExcel->getActiveSheet()->setTitle($worksheetName);
+						//	Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
+						//		formula cells... during the load, all formulae should be correct, and we're simply
+						//		bringing the worksheet name in line with the formula, not the reverse
+						$objPHPExcel->getActiveSheet()->setTitle($worksheetName,false);
 					}
 
 					$rowID = 1;
@@ -409,16 +501,21 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 									break;
 								}
 							case 'table-row' :
+								$rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
+								$rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
+										$rowDataTableAttributes['number-rows-repeated'] : 1;
 								$columnID = 'A';
 								foreach($rowData as $key => $cellData) {
-									if (!is_null($this->getReadFilter())) {
+									if ($this->getReadFilter() !== NULL) {
 										if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
 											continue;
 										}
 									}
 
 //									echo '<b>'.$columnID.$rowID.'</b><br />';
-									$cellDataText = $cellData->children($namespacesContent['text']);
+									$cellDataText = (isset($namespacesContent['text'])) ?
+										$cellData->children($namespacesContent['text']) :
+										'';
 									$cellDataOffice = $cellData->children($namespacesContent['office']);
 									$cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
 									$cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
@@ -456,11 +553,31 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 									}
 
 									if (isset($cellDataText->p)) {
+										// Consolidate if there are multiple p records (maybe with spans as well)
+										$dataArray = array();
+										// Text can have multiple text:p and within those, multiple text:span.
+										// text:p newlines, but text:span does not.
+										// Also, here we assume there is no text data is span fields are specified, since
+										// we have no way of knowing proper positioning anyway.
+										foreach ($cellDataText->p as $pData) {
+											if (isset($pData->span)) {
+												// span sections do not newline, so we just create one large string here
+												$spanSection = "";
+												foreach ($pData->span as $spanData) {
+													$spanSection .= $spanData;
+												}
+												array_push($dataArray, $spanSection);
+											} else {
+												array_push($dataArray, $pData);
+											}
+										}
+										$allCellDataText = implode($dataArray, "\n");
+
 //										echo 'Value Type is '.$cellDataOfficeAttributes['value-type'].'<br />';
 										switch ($cellDataOfficeAttributes['value-type']) {
-											case 'string' :
+ 											case 'string' :
 													$type = PHPExcel_Cell_DataType::TYPE_STRING;
-													$dataValue = $cellDataText->p;
+													$dataValue = $allCellDataText;
 													if (isset($dataValue->a)) {
 														$dataValue = $dataValue->a;
 														$cellXLinkAttributes = $dataValue->attributes($namespacesContent['xlink']);
@@ -469,13 +586,32 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 													break;
 											case 'boolean' :
 													$type = PHPExcel_Cell_DataType::TYPE_BOOL;
-													$dataValue = ($cellDataText->p == 'TRUE') ? True : False;
+													$dataValue = ($allCellDataText == 'TRUE') ? True : False;
+													break;
+											case 'percentage' :
+													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+													$dataValue = (float) $cellDataOfficeAttributes['value'];
+													if (floor($dataValue) == $dataValue) {
+														$dataValue = (integer) $dataValue;
+													}
+													$formatting = PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00;
+													break;
+											case 'currency' :
+													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
+													$dataValue = (float) $cellDataOfficeAttributes['value'];
+													if (floor($dataValue) == $dataValue) {
+														$dataValue = (integer) $dataValue;
+													}
+													$formatting = PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
 													break;
 											case 'float' :
 													$type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
 													$dataValue = (float) $cellDataOfficeAttributes['value'];
 													if (floor($dataValue) == $dataValue) {
-														$dataValue = (integer) $dataValue;
+														if ($dataValue = (integer) $dataValue)
+															$dataValue = (integer) $dataValue;
+														else
+															$dataValue = (float) $dataValue;
 													}
 													break;
 											case 'date' :
@@ -497,9 +633,12 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 													break;
 										}
 //										echo 'Data value is '.$dataValue.'<br />';
-//										if (!is_null($hyperlink)) {
+//										if ($hyperlink !== NULL) {
 //											echo 'Hyperlink is '.$hyperlink.'<br />';
 //										}
+									} else {
+										$type = PHPExcel_Cell_DataType::TYPE_NULL;
+										$dataValue = NULL;
 									}
 
 									if ($hasCalculatedValue) {
@@ -522,42 +661,53 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 //										echo 'Adjusted Formula: '.$cellDataFormula.'<br />';
 									}
 
-									if (!is_null($type)) {
-										$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue),$type);
-										if ($hasCalculatedValue) {
-//											echo 'Forumla result is '.$dataValue.'<br />';
-											$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setCalculatedValue($dataValue);
-										}
-										if (($cellDataOfficeAttributes['value-type'] == 'date') ||
-											($cellDataOfficeAttributes['value-type'] == 'time')) {
-											$objPHPExcel->getActiveSheet()->getStyle($columnID.$rowID)->getNumberFormat()->setFormatCode($formatting);
-										}
-										if (!is_null($hyperlink)) {
-											$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->getHyperlink()->setUrl($hyperlink);
+									$colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
+										$cellDataTableAttributes['number-columns-repeated'] : 1;
+									if ($type !== NULL) {
+										for ($i = 0; $i < $colRepeats; ++$i) {
+											if ($i > 0) {
+												++$columnID;
+											}
+											if ($type !== PHPExcel_Cell_DataType::TYPE_NULL) {
+												for ($rowAdjust = 0; $rowAdjust < $rowRepeats; ++$rowAdjust) {
+													$rID = $rowID + $rowAdjust;
+													$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $dataValue),$type);
+													if ($hasCalculatedValue) {
+//														echo 'Forumla result is '.$dataValue.'<br />';
+														$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setCalculatedValue($dataValue);
+													}
+													if ($formatting !== NULL) {
+														$objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode($formatting);
+													} else {
+														$objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_GENERAL);
+													}
+													if ($hyperlink !== NULL) {
+														$objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->getHyperlink()->setUrl($hyperlink);
+													}
+												}
+											}
 										}
 									}
 
 									//	Merged cells
 									if ((isset($cellDataTableAttributes['number-columns-spanned'])) || (isset($cellDataTableAttributes['number-rows-spanned']))) {
-										$columnTo = $columnID;
-										if (isset($cellDataTableAttributes['number-columns-spanned'])) {
-											$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
+										if (($type !== PHPExcel_Cell_DataType::TYPE_NULL) || (!$this->_readDataOnly)) {
+											$columnTo = $columnID;
+											if (isset($cellDataTableAttributes['number-columns-spanned'])) {
+												$columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
+											}
+											$rowTo = $rowID;
+											if (isset($cellDataTableAttributes['number-rows-spanned'])) {
+												$rowTo = $rowTo + $cellDataTableAttributes['number-rows-spanned'] - 1;
+											}
+											$cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
+											$objPHPExcel->getActiveSheet()->mergeCells($cellRange);
 										}
-										$rowTo = $rowID;
-										if (isset($cellDataTableAttributes['number-rows-spanned'])) {
-											$rowTo = $rowTo + $cellDataTableAttributes['number-rows-spanned'] - 1;
-										}
-										$cellRange = $columnID.$rowID.':'.$columnTo.$rowTo;
-										$objPHPExcel->getActiveSheet()->mergeCells($cellRange);
 									}
 
-									if (isset($cellDataTableAttributes['number-columns-repeated'])) {
-//										echo 'Repeated '.$cellDataTableAttributes['number-columns-repeated'].' times<br />';
-										$columnID = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-repeated'] - 2);
-									}
 									++$columnID;
 								}
-								++$rowID;
+								$rowID += $rowRepeats;
 								break;
 						}
 					}
@@ -571,6 +721,7 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 		return $objPHPExcel;
 	}
 
+
 	private function _parseRichText($is = '') {
 		$value = new PHPExcel_RichText();
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Reader/SYLK.php b/htdocs/includes/phpexcel/PHPExcel/Reader/SYLK.php
index 5c9830aae00..47d5703f56b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Reader/SYLK.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Reader/SYLK.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -40,7 +40,7 @@ if (!defined('PHPEXCEL_ROOT')) {
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 {
@@ -79,6 +79,7 @@ class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 	 */
 	private $_readFilter = null;
 
+
 	/**
 	 * Create a new PHPExcel_Reader_SYLK
 	 */
@@ -86,11 +87,13 @@ class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
 	}
 
+
 	/**
 	 * Can the current PHPExcel_Reader_IReader read the file?
 	 *
 	 * @param 	string 		$pFileName
 	 * @return 	boolean
+	 * @throws Exception
 	 */
 	public function canRead($pFilename)
 	{
@@ -119,6 +122,123 @@ class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 		return true;
 	}
 
+
+	/**
+	 * Read filter
+	 *
+	 * @return PHPExcel_Reader_IReadFilter
+	 */
+	public function getReadFilter() {
+		return $this->_readFilter;
+	}
+
+
+	/**
+	 * Set read filter
+	 *
+	 * @param PHPExcel_Reader_IReadFilter $pValue
+	 */
+	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
+		$this->_readFilter = $pValue;
+		return $this;
+	}
+
+
+	/**
+	 * Set input encoding
+	 *
+	 * @param string $pValue Input encoding
+	 */
+	public function setInputEncoding($pValue = 'ANSI')
+	{
+		$this->_inputEncoding = $pValue;
+		return $this;
+	}
+
+
+	/**
+	 * Get input encoding
+	 *
+	 * @return string
+	 */
+	public function getInputEncoding()
+	{
+		return $this->_inputEncoding;
+	}
+
+
+	/**
+	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+	 *
+	 * @param   string     $pFilename
+	 * @throws   Exception
+	 */
+	public function listWorksheetInfo($pFilename)
+	{
+		// Check if file exists
+		if (!file_exists($pFilename)) {
+			throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+		}
+
+		// Open file
+		$fileHandle = fopen($pFilename, 'r');
+		if ($fileHandle === false) {
+			throw new Exception("Could not open file " . $pFilename . " for reading.");
+		}
+
+		$worksheetInfo = array();
+		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
+		$worksheetInfo[0]['lastColumnLetter'] = 'A';
+		$worksheetInfo[0]['lastColumnIndex'] = 0;
+		$worksheetInfo[0]['totalRows'] = 0;
+		$worksheetInfo[0]['totalColumns'] = 0;
+
+		// Loop through file
+		$rowData = array();
+
+		// loop through one row (line) at a time in the file
+		$rowIndex = 0;
+		while (($rowData = fgets($fileHandle)) !== FALSE) {
+			$columnIndex = 0;
+
+			// convert SYLK encoded $rowData to UTF-8
+			$rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
+
+			// explode each row at semicolons while taking into account that literal semicolon (;)
+			// is escaped like this (;;)
+			$rowData = explode("\t",str_replace('?',';',str_replace(';',"\t",str_replace(';;','?',rtrim($rowData)))));
+
+			$dataType = array_shift($rowData);
+			if ($dataType == 'C') {
+				//  Read cell value data
+				foreach($rowData as $rowDatum) {
+					switch($rowDatum{0}) {
+						case 'C' :
+						case 'X' :
+							$columnIndex = substr($rowDatum,1) - 1;
+							break;
+						case 'R' :
+						case 'Y' :
+							$rowIndex = substr($rowDatum,1);
+							break;
+					}
+
+					$worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
+					$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
+				}
+			}
+		}
+
+		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
+		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+
+		// Close file
+		fclose($fileHandle);
+
+		return $worksheetInfo;
+	}
+
+
 	/**
 	 * Loads PHPExcel from file
 	 *
@@ -135,45 +255,6 @@ class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 		return $this->loadIntoExisting($pFilename, $objPHPExcel);
 	}
 
-	/**
-	 * Read filter
-	 *
-	 * @return PHPExcel_Reader_IReadFilter
-	 */
-	public function getReadFilter() {
-		return $this->_readFilter;
-	}
-
-	/**
-	 * Set read filter
-	 *
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Set input encoding
-	 *
-	 * @param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'ANSI')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get input encoding
-	 *
-	 * @return string
-	 */
-	public function getInputEncoding()
-	{
-		return $this->_inputEncoding;
-	}
 
 	/**
 	 * Loads PHPExcel from file into PHPExcel instance
@@ -354,7 +435,7 @@ class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
 					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->_formats[$formatStyle]);
 				}
-				if ((count($styleData) > 0) && ($column > '') && ($row > '')) {
+				if ((!empty($styleData)) && ($column > '') && ($row > '')) {
 					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
 					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
 				}
@@ -392,6 +473,7 @@ class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 		return $objPHPExcel;
 	}
 
+
 	/**
 	 * Get sheet index
 	 *
@@ -401,6 +483,7 @@ class PHPExcel_Reader_SYLK implements PHPExcel_Reader_IReader
 		return $this->_sheetIndex;
 	}
 
+
 	/**
 	 * Set sheet index
 	 *
diff --git a/htdocs/includes/phpexcel/PHPExcel/ReferenceHelper.php b/htdocs/includes/phpexcel/PHPExcel/ReferenceHelper.php
index 74a12d20aba..9113591297a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/ReferenceHelper.php
+++ b/htdocs/includes/phpexcel/PHPExcel/ReferenceHelper.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_ReferenceHelper
 {
@@ -55,7 +55,7 @@ class PHPExcel_ReferenceHelper
 	 * @return PHPExcel_ReferenceHelper
 	 */
 	public static function getInstance() {
-		if (!isset(self::$_instance) || is_null(self::$_instance)) {
+		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
 			self::$_instance = new PHPExcel_ReferenceHelper();
 		}
 
@@ -214,7 +214,7 @@ class PHPExcel_ReferenceHelper
 
 		// Update worksheet: column dimensions
 		$aColumnDimensions = array_reverse($pSheet->getColumnDimensions(), true);
-		if (count($aColumnDimensions) > 0) {
+		if (!empty($aColumnDimensions)) {
 			foreach ($aColumnDimensions as $objColumnDimension) {
 				$newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1', $pBefore, $pNumCols, $pNumRows);
 				list($newReference) = PHPExcel_Cell::coordinateFromString($newReference);
@@ -228,7 +228,7 @@ class PHPExcel_ReferenceHelper
 
 		// Update worksheet: row dimensions
 		$aRowDimensions = array_reverse($pSheet->getRowDimensions(), true);
-		if (count($aRowDimensions) > 0) {
+		if (!empty($aRowDimensions)) {
 			foreach ($aRowDimensions as $objRowDimension) {
 				$newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex(), $pBefore, $pNumCols, $pNumRows);
 				list(, $newReference) = PHPExcel_Cell::coordinateFromString($newReference);
@@ -312,8 +312,61 @@ class PHPExcel_ReferenceHelper
 
 
 		// Update worksheet: autofilter
-		if ($pSheet->getAutoFilter() != '') {
-			$pSheet->setAutoFilter( $this->updateCellReference($pSheet->getAutoFilter(), $pBefore, $pNumCols, $pNumRows) );
+		$autoFilter = $pSheet->getAutoFilter();
+		$autoFilterRange = $autoFilter->getRange();
+		if (!empty($autoFilterRange)) {
+			if ($pNumCols != 0) {
+				$autoFilterColumns = array_keys($autoFilter->getColumns());
+				if (count($autoFilterColumns) > 0) {
+					list($column,$row) = sscanf($pBefore,'%[A-Z]%d');
+					$columnIndex = PHPExcel_Cell::columnIndexFromString($column);
+					list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
+					if ($columnIndex <= $rangeEnd[0]) {
+						if ($pNumCols < 0) {
+							//	If we're actually deleting any columns that fall within the autofilter range,
+							//		then we delete any rules for those columns
+							$deleteColumn = $columnIndex + $pNumCols - 1;
+							$deleteCount = abs($pNumCols);
+							for ($i = 1; $i <= $deleteCount; ++$i) {
+								if (in_array(PHPExcel_Cell::stringFromColumnIndex($deleteColumn),$autoFilterColumns)) {
+									$autoFilter->clearColumn(PHPExcel_Cell::stringFromColumnIndex($deleteColumn));
+								}
+								++$deleteColumn;
+							}
+						}
+						$startCol = ($columnIndex > $rangeStart[0]) ? $columnIndex : $rangeStart[0];
+
+						//	Shuffle columns in autofilter range
+						if ($pNumCols > 0) {
+							//	For insert, we shuffle from end to beginning to avoid overwriting
+							$startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+							$toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+							$endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
+
+							$startColRef = $startCol;
+							$endColRef = $rangeEnd[0];
+							$toColRef = $rangeEnd[0]+$pNumCols;
+
+							do {
+								$autoFilter->shiftColumn(PHPExcel_Cell::stringFromColumnIndex($endColRef-1),PHPExcel_Cell::stringFromColumnIndex($toColRef-1));
+								--$endColRef;
+								--$toColRef;
+							} while ($startColRef <= $endColRef);
+						} else {
+							//	For delete, we shuffle from beginning to end to avoid overwriting
+							$startColID = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+							$toColID = PHPExcel_Cell::stringFromColumnIndex($startCol+$pNumCols-1);
+							$endColID = PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]);
+							do {
+								$autoFilter->shiftColumn($startColID,$toColID);
+								++$startColID;
+								++$toColID;
+							} while ($startColID != $endColID);
+						}
+					}
+				}
+			}
+			$pSheet->setAutoFilter( $this->updateCellReference($autoFilterRange, $pBefore, $pNumCols, $pNumRows) );
 		}
 
 
@@ -530,7 +583,7 @@ class PHPExcel_ReferenceHelper
 		foreach ($pPhpExcel->getWorksheetIterator() as $sheet) {
 			foreach ($sheet->getCellCollection(false) as $cellID) {
 				$cell = $sheet->getCell($cellID);
-				if (!is_null($cell) && $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
+				if (($cell !== NULL) && ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA)) {
 					$formula = $cell->getValue();
 					if (strpos($formula, $oldName) !== false) {
 						$formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
diff --git a/htdocs/includes/phpexcel/PHPExcel/RichText.php b/htdocs/includes/phpexcel/PHPExcel/RichText.php
index 57d3ce4d190..17af169cdd6 100644
--- a/htdocs/includes/phpexcel/PHPExcel/RichText.php
+++ b/htdocs/includes/phpexcel/PHPExcel/RichText.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_RichText implements PHPExcel_IComparable
 {
@@ -54,7 +54,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
     	$this->_richTextElements = array();
 
     	// Rich-Text string attached to cell?
-    	if (!is_null($pCell)) {
+    	if ($pCell !== NULL) {
 	    	// Add cell text and style
 	    	if ($pCell->getValue() != "") {
 	    		$objRun = new PHPExcel_RichText_Run($pCell->getValue());
diff --git a/htdocs/includes/phpexcel/PHPExcel/RichText/ITextElement.php b/htdocs/includes/phpexcel/PHPExcel/RichText/ITextElement.php
index e355f8bb20c..4c658637f62 100644
--- a/htdocs/includes/phpexcel/PHPExcel/RichText/ITextElement.php
+++ b/htdocs/includes/phpexcel/PHPExcel/RichText/ITextElement.php
@@ -18,9 +18,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -29,7 +29,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_RichText_ITextElement
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/RichText/Run.php b/htdocs/includes/phpexcel/PHPExcel/RichText/Run.php
index 55b59270236..9e33786c195 100644
--- a/htdocs/includes/phpexcel/PHPExcel/RichText/Run.php
+++ b/htdocs/includes/phpexcel/PHPExcel/RichText/Run.php
@@ -18,9 +18,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -29,7 +29,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/RichText/TextElement.php b/htdocs/includes/phpexcel/PHPExcel/RichText/TextElement.php
index a9a2c05b1c6..5b9edd07ee4 100644
--- a/htdocs/includes/phpexcel/PHPExcel/RichText/TextElement.php
+++ b/htdocs/includes/phpexcel/PHPExcel/RichText/TextElement.php
@@ -18,9 +18,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -29,7 +29,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Settings.php b/htdocs/includes/phpexcel/PHPExcel/Settings.php
index f1967cd1a7b..6659b90e956 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Settings.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Settings.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Settings
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /** PHPExcel root directory */
@@ -38,56 +38,295 @@ if (!defined('PHPEXCEL_ROOT')) {
 class PHPExcel_Settings
 {
 	/**	constants */
+	/**	Available Zip library classes */
 	const PCLZIP		= 'PHPExcel_Shared_ZipArchive';
 	const ZIPARCHIVE	= 'ZipArchive';
 
+	/**	Optional Chart Rendering libraries */
+    const CHART_RENDERER_JPGRAPH	= 'jpgraph';
 
+	/**	Optional PDF Rendering libraries */
+    const PDF_RENDERER_TCPDF		= 'tcPDF';
+    const PDF_RENDERER_DOMPDF		= 'DomPDF';
+    const PDF_RENDERER_MPDF			= 'mPDF';
+
+
+	private static $_chartRenderers = array(
+		self::CHART_RENDERER_JPGRAPH,
+	);
+
+	private static $_pdfRenderers = array(
+		self::PDF_RENDERER_TCPDF,
+		self::PDF_RENDERER_DOMPDF,
+		self::PDF_RENDERER_MPDF,
+	);
+
+
+	/**
+	 * Name of the class used for Zip file management
+	 *		e.g.
+	 *			ZipArchive
+	 *
+	 * @var string
+	 */
 	private static $_zipClass	= self::ZIPARCHIVE;
 
 
 	/**
-	 * Set the Zip Class to use (PCLZip or ZipArchive)
+	 * Name of the external Library used for rendering charts
+	 *		e.g.
+	 *			jpgraph
 	 *
-	 * @param	 string	$zipClass			PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
+	 * @var string
+	 */
+	private static $_chartRendererName = NULL;
+
+	/**
+	 * Directory Path to the external Library used for rendering charts
+	 *
+	 * @var string
+	 */
+	private static $_chartRendererPath = NULL;
+
+
+	/**
+	 * Name of the external Library used for rendering PDF files
+	 *		e.g.
+	 *			mPDF
+	 *
+	 * @var string
+	 */
+	private static $_pdfRendererName = NULL;
+
+	/**
+	 * Directory Path to the external Library used for rendering PDF files
+	 *
+	 * @var string
+	 */
+	private static $_pdfRendererPath = NULL;
+
+
+	/**
+	 * Set the Zip handler Class that PHPExcel should use for Zip file management (PCLZip or ZipArchive)
+	 *
+	 * @param	 string	$zipClass			The Zip handler class that PHPExcel should use for Zip file management
+	 *											e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
 	 * @return	 boolean					Success or failure
 	 */
 	public static function setZipClass($zipClass) {
-		if (($zipClass == self::PCLZIP) ||
-			($zipClass == self::ZIPARCHIVE)) {
+		if (($zipClass === self::PCLZIP) ||
+			($zipClass === self::ZIPARCHIVE)) {
 			self::$_zipClass = $zipClass;
-			return True;
+			return TRUE;
 		}
-		return False;
+		return FALSE;
 	}	//	function setZipClass()
 
 
 	/**
-	 * Return the Zip Class to use (PCLZip or ZipArchive)
+	 * Return the name of the Zip handler Class that PHPExcel is configured to use (PCLZip or ZipArchive)
+	 *		for Zip file management
 	 *
-	 * @return	 string						Zip Class to use	- PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
+	 * @return	 string						Name of the Zip handler Class that PHPExcel is configured to use
+	 *											for Zip file management
+	 *												e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
 	 */
 	public static function getZipClass() {
 		return self::$_zipClass;
 	}	//	function getZipClass()
 
 
+	/**
+	 * Return the name of the method that is currently configured for cell cacheing
+	 *
+	 * @return	string				Name of the cacheing method
+	 */
 	public static function getCacheStorageMethod() {
-		return PHPExcel_CachedObjectStorageFactory::$_cacheStorageMethod;
+		return PHPExcel_CachedObjectStorageFactory::getCacheStorageMethod();
 	}	//	function getCacheStorageMethod()
 
 
+	/**
+	 * Return the name of the class that is currently being used for cell cacheing
+	 *
+	 * @return	string				Name of the class currently being used for cacheing
+	 */
 	public static function getCacheStorageClass() {
-		return PHPExcel_CachedObjectStorageFactory::$_cacheStorageClass;
+		return PHPExcel_CachedObjectStorageFactory::getCacheStorageClass();
 	}	//	function getCacheStorageClass()
 
 
-	public static function setCacheStorageMethod($method = PHPExcel_CachedObjectStorageFactory::cache_in_memory, $arguments = array()) {
-		return PHPExcel_CachedObjectStorageFactory::initialize($method,$arguments);
+	/**
+	 * Set the method that should be used for cell cacheing
+	 *
+	 * @param	string	$method		Name of the cacheing method
+	 * @param	array	$arguments	Optional configuration arguments for the cacheing method
+	 * @return	boolean				Success or failure
+	 */
+	public static function setCacheStorageMethod($method = PHPExcel_CachedObjectStorageFactory::cache_in_memory,
+												 $arguments = array()) {
+		return PHPExcel_CachedObjectStorageFactory::initialize($method, $arguments);
 	}	//	function setCacheStorageMethod()
 
 
-	public static function setLocale($locale){
+	/**
+	 * Set the locale code to use for formula translations and any special formatting
+	 *
+	 * @param	string	$locale		The locale code to use (e.g. "fr" or "pt_br" or "en_uk")
+	 * @return	boolean				Success or failure
+	 */
+	public static function setLocale($locale='en_us') {
 		return PHPExcel_Calculation::getInstance()->setLocale($locale);
 	}	//	function setLocale()
 
+
+	/**
+	 * Set details of the external library that PHPExcel should use for rendering charts
+	 *
+	 * @param	 string	$libraryName		Internal reference name of the library
+	 *											e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+	 * @param	 string	$libraryBaseDir		Directory path to the library's base folder
+	 * @return	 boolean					Success or failure
+	 */
+	public static function setChartRenderer($libraryName, $libraryBaseDir) {
+		if (!self::setChartRendererName($libraryName))
+			return FALSE;
+		return self::setChartRendererPath($libraryBaseDir);
+	}	//	function setChartRenderer()
+
+
+	/**
+	 * Identify to PHPExcel the external library to use for rendering charts
+	 *
+	 * @param	 string	$libraryName		Internal reference name of the library
+	 *											e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+	 * @return	 boolean					Success or failure
+	 */
+	public static function setChartRendererName($libraryName) {
+		if (!in_array($libraryName,self::$_chartRenderers)) {
+			return FALSE;
+		}
+
+		self::$_chartRendererName = $libraryName;
+
+		return TRUE;
+	}	//	function setChartRendererName()
+
+
+	/**
+	 * Tell PHPExcel where to find the external library to use for rendering charts
+	 *
+	 * @param	 string	$libraryBaseDir		Directory path to the library's base folder
+	 * @return	 boolean					Success or failure
+	 */
+	public static function setChartRendererPath($libraryBaseDir) {
+		if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
+			return FALSE;
+		}
+		self::$_chartRendererPath = $libraryBaseDir;
+
+		return TRUE;
+	}	//	function setChartRendererPath()
+
+
+	/**
+	 * Return the Chart Rendering Library that PHPExcel is currently configured to use (e.g. jpgraph)
+	 *
+	 * @return	 string|NULL				Internal reference name of the Chart Rendering Library that PHPExcel is
+	 *											currently configured to use
+	 *												e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+	 */
+	public static function getChartRendererName() {
+		return self::$_chartRendererName;
+	}	//	function getChartRendererName()
+
+
+	/**
+	 * Return the directory path to the Chart Rendering Library that PHPExcel is currently configured to use
+	 *
+	 * @return	 string|NULL				Directory Path to the Chart Rendering Library that PHPExcel is
+	 *											currently configured to use
+	 */
+	public static function getChartRendererPath() {
+		return self::$_chartRendererPath;
+	}	//	function getChartRendererPath()
+
+
+	/**
+	 * Set details of the external library that PHPExcel should use for rendering PDF files
+	 *
+	 * @param	 string	$libraryName		Internal reference name of the library
+	 *											e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+	 *												 PHPExcel_Settings::PDF_RENDERER_DOMPDF
+	 *											  or PHPExcel_Settings::PDF_RENDERER_MPDF
+	 * @param	 string	$libraryBaseDir		Directory path to the library's base folder
+	 * @return	 boolean					Success or failure
+	 */
+	public static function setPdfRenderer($libraryName, $libraryBaseDir) {
+		if (!self::setPdfRendererName($libraryName))
+			return FALSE;
+		return self::setPdfRendererPath($libraryBaseDir);
+	}	//	function setPdfRenderer()
+
+
+	/**
+	 * Identify to PHPExcel the external library to use for rendering PDF files
+	 *
+	 * @param	 string	$libraryName		Internal reference name of the library
+	 *											e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+	 *												 PHPExcel_Settings::PDF_RENDERER_DOMPDF
+	 *											  or PHPExcel_Settings::PDF_RENDERER_MPDF
+	 * @return	 boolean					Success or failure
+	 */
+	public static function setPdfRendererName($libraryName) {
+		if (!in_array($libraryName,self::$_pdfRenderers)) {
+			return FALSE;
+		}
+
+		self::$_pdfRendererName = $libraryName;
+
+		return TRUE;
+	}	//	function setPdfRendererName()
+
+
+	/**
+	 * Tell PHPExcel where to find the external library to use for rendering PDF files
+	 *
+	 * @param	 string	$libraryBaseDir		Directory path to the library's base folder
+	 * @return	 boolean					Success or failure
+	 */
+	public static function setPdfRendererPath($libraryBaseDir) {
+		if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
+			return FALSE;
+		}
+		self::$_pdfRendererPath = $libraryBaseDir;
+
+		return TRUE;
+	}	//	function setPdfRendererPath()
+
+
+	/**
+	 * Return the PDF Rendering Library that PHPExcel is currently configured to use (e.g. dompdf)
+	 *
+	 * @return	 string|NULL				Internal reference name of the PDF Rendering Library that PHPExcel is
+	 *											currently configured to use
+	 *												e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+	 *													 PHPExcel_Settings::PDF_RENDERER_DOMPDF
+	 *												  or PHPExcel_Settings::PDF_RENDERER_MPDF
+	 */
+	public static function getPdfRendererName() {
+		return self::$_pdfRendererName;
+	}	//	function getPdfRendererName()
+
+
+	/**
+	 * Return the directory path to the PDF Rendering Library that PHPExcel is currently configured to use
+	 *
+	 * @return	 string|NULL				Directory Path to the PDF Rendering Library that PHPExcel is
+	 *											currently configured to use
+	 */
+	public static function getPdfRendererPath() {
+		return self::$_pdfRendererPath;
+	}	//	function getPdfRendererPath()
+
 }
\ No newline at end of file
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/CodePage.php b/htdocs/includes/phpexcel/PHPExcel/Shared/CodePage.php
index 7c8854b860f..5660e116ce0 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/CodePage.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/CodePage.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_CodePage
 {
@@ -46,47 +46,53 @@ class PHPExcel_Shared_CodePage
 	public static function NumberToName($codePage = '1252')
 	{
 		switch ($codePage) {
-			case 367:	return 'ASCII';		break;	//	ASCII
-			case 437:	return 'CP437';		break;	//	OEM US
+			case 367:	return 'ASCII';				break;	//	ASCII
+			case 437:	return 'CP437';				break;	//	OEM US
 			case 720:	throw new Exception('Code page 720 not supported.');
-											break;	//	OEM Arabic
-			case 737:	return 'CP737';		break;	//	OEM Greek
-			case 775:	return 'CP775';		break;	//	OEM Baltic
-			case 850:	return 'CP850';		break;	//	OEM Latin I
-			case 852:	return 'CP852';		break;	//	OEM Latin II (Central European)
-			case 855:	return 'CP855';		break;	//	OEM Cyrillic
-			case 857:	return 'CP857';		break;	//	OEM Turkish
-			case 858:	return 'CP858';		break;	//	OEM Multilingual Latin I with Euro
-			case 860:	return 'CP860';		break;	//	OEM Portugese
-			case 861:	return 'CP861';		break;	//	OEM Icelandic
-			case 862:	return 'CP862';		break;	//	OEM Hebrew
-			case 863:	return 'CP863';		break;	//	OEM Canadian (French)
-			case 864:	return 'CP864';		break;	//	OEM Arabic
-			case 865:	return 'CP865';		break;	//	OEM Nordic
-			case 866:	return 'CP866';		break;	//	OEM Cyrillic (Russian)
-			case 869:	return 'CP869';		break;	//	OEM Greek (Modern)
-			case 874:	return 'CP874';		break;	//	ANSI Thai
-			case 932:	return 'CP932';		break;	//	ANSI Japanese Shift-JIS
-			case 936:	return 'CP936';		break;	//	ANSI Chinese Simplified GBK
-			case 949:	return 'CP949';		break;	//	ANSI Korean (Wansung)
-			case 950:	return 'CP950';		break;	//	ANSI Chinese Traditional BIG5
-			case 1200:	return 'UTF-16LE';	break;	//	UTF-16 (BIFF8)
-			case 1250:	return 'CP1250';	break;	//	ANSI Latin II (Central European)
-			case 1251:	return 'CP1251';	break;	//	ANSI Cyrillic
-			case 0:									//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
-			case 1252:	return 'CP1252';	break;	//	ANSI Latin I (BIFF4-BIFF7)
-			case 1253:	return 'CP1253';	break;	//	ANSI Greek
-			case 1254:	return 'CP1254';	break;	//	ANSI Turkish
-			case 1255:	return 'CP1255';	break;	//	ANSI Hebrew
-			case 1256:	return 'CP1256';	break;	//	ANSI Arabic
-			case 1257:	return 'CP1257';	break;	//	ANSI Baltic
-			case 1258:	return 'CP1258';	break;	//	ANSI Vietnamese
-			case 1361:	return 'CP1361';	break;	//	ANSI Korean (Johab)
-			case 10000:	return 'MAC';		break;	//	Apple Roman
-			case 32768:	return 'MAC';		break;	//	Apple Roman
+													break;	//	OEM Arabic
+			case 737:	return 'CP737';				break;	//	OEM Greek
+			case 775:	return 'CP775';				break;	//	OEM Baltic
+			case 850:	return 'CP850';				break;	//	OEM Latin I
+			case 852:	return 'CP852';				break;	//	OEM Latin II (Central European)
+			case 855:	return 'CP855';				break;	//	OEM Cyrillic
+			case 857:	return 'CP857';				break;	//	OEM Turkish
+			case 858:	return 'CP858';				break;	//	OEM Multilingual Latin I with Euro
+			case 860:	return 'CP860';				break;	//	OEM Portugese
+			case 861:	return 'CP861';				break;	//	OEM Icelandic
+			case 862:	return 'CP862';				break;	//	OEM Hebrew
+			case 863:	return 'CP863';				break;	//	OEM Canadian (French)
+			case 864:	return 'CP864';				break;	//	OEM Arabic
+			case 865:	return 'CP865';				break;	//	OEM Nordic
+			case 866:	return 'CP866';				break;	//	OEM Cyrillic (Russian)
+			case 869:	return 'CP869';				break;	//	OEM Greek (Modern)
+			case 874:	return 'CP874';				break;	//	ANSI Thai
+			case 932:	return 'CP932';				break;	//	ANSI Japanese Shift-JIS
+			case 936:	return 'CP936';				break;	//	ANSI Chinese Simplified GBK
+			case 949:	return 'CP949';				break;	//	ANSI Korean (Wansung)
+			case 950:	return 'CP950';				break;	//	ANSI Chinese Traditional BIG5
+			case 1200:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8)
+			case 1250:	return 'CP1250';			break;	//	ANSI Latin II (Central European)
+			case 1251:	return 'CP1251';			break;	//	ANSI Cyrillic
+			case 0:		//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
+			case 1252:	return 'CP1252';			break;	//	ANSI Latin I (BIFF4-BIFF7)
+			case 1253:	return 'CP1253';			break;	//	ANSI Greek
+			case 1254:	return 'CP1254';			break;	//	ANSI Turkish
+			case 1255:	return 'CP1255';			break;	//	ANSI Hebrew
+			case 1256:	return 'CP1256';			break;	//	ANSI Arabic
+			case 1257:	return 'CP1257';			break;	//	ANSI Baltic
+			case 1258:	return 'CP1258';			break;	//	ANSI Vietnamese
+			case 1361:	return 'CP1361';			break;	//	ANSI Korean (Johab)
+			case 10000:	return 'MAC';				break;	//	Apple Roman
+			case 10006:	return 'MACGREEK';			break;	//	Macintosh Greek
+			case 10007:	return 'MACCYRILLIC';		break;	//	Macintosh Cyrillic
+			case 10029:	return 'MACCENTRALEUROPE';	break;	//	Macintosh Central Europe
+			case 10079: return 'MACICELAND';		break;	//	Macintosh Icelandic
+			case 10081: return 'MACTURKISH';		break;	//	Macintosh Turkish
+			case 32768:	return 'MAC';				break;	//	Apple Roman
 			case 32769:	throw new Exception('Code page 32769 not supported.');
-											break;	//	ANSI Latin I (BIFF2-BIFF3)
-			case 65001:	return 'UTF-8';		break;	//	Unicode (UTF-8)
+													break;	//	ANSI Latin I (BIFF2-BIFF3)
+			case 65000:	return 'UTF-7';				break;	//	Unicode (UTF-7)
+			case 65001:	return 'UTF-8';				break;	//	Unicode (UTF-8)
 		}
 
 		throw new Exception('Unknown codepage: ' . $codePage);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Date.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Date.php
index 16cf6a19ef4..2c1ab0088ba 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Date.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Date.php
@@ -3,7 +3,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,9 +21,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -32,7 +32,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Date
 {
@@ -40,8 +40,41 @@ class PHPExcel_Shared_Date
 	const CALENDAR_WINDOWS_1900 = 1900;		//	Base date of 1st Jan 1900 = 1.0
 	const CALENDAR_MAC_1904 = 1904;			//	Base date of 2nd Jan 1904 = 1.0
 
+	/*
+	 * Names of the months of the year, indexed by shortname
+	 * Planned usage for locale settings
+	 *
+	 * @public
+	 * @var	string[]
+	 */
+	public static $_monthNames = array(	'Jan' => 'January',
+										'Feb' => 'February',
+										'Mar' => 'March',
+										'Apr' => 'April',
+										'May' => 'May',
+										'Jun' => 'June',
+										'Jul' => 'July',
+										'Aug' => 'August',
+										'Sep' => 'September',
+										'Oct' => 'October',
+										'Nov' => 'November',
+										'Dec' => 'December'
+									  );
+
+	/*
+	 * Base calendar year to use for calculations
+	 *
+	 * @private
+	 * @var	int
+	 */
 	private static $ExcelBaseDate	= self::CALENDAR_WINDOWS_1900;
 
+	/*
+	 * Object type for PHP Date/Time values
+	 *
+	 * @private
+	 * @var	string
+	 */
 	public static $dateTimeObjectType	= 'DateTime';
 
 
@@ -55,9 +88,9 @@ class PHPExcel_Shared_Date
 		if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
 			($baseDate == self::CALENDAR_MAC_1904)) {
 			self::$ExcelBaseDate = $baseDate;
-			return True;
+			return TRUE;
 		}
-		return False;
+		return FALSE;
 	}	//	function setExcelCalendar()
 
 
@@ -91,14 +124,14 @@ class PHPExcel_Shared_Date
 		// Perform conversion
 		if ($dateValue >= 1) {
 			$utcDays = $dateValue - $myExcelBaseDate;
-			$returnValue = round($utcDays * 24 * 60 * 60);
+			$returnValue = round($utcDays * 86400);
 			if (($returnValue <= PHP_INT_MAX) && ($returnValue >= -PHP_INT_MAX)) {
 				$returnValue = (integer) $returnValue;
 			}
 		} else {
 			$hours = round($dateValue * 24);
-			$mins = round($dateValue * 24 * 60) - round($hours * 60);
-			$secs = round($dateValue * 24 * 60 * 60) - round($hours * 60 * 60) - round($mins * 60);
+			$mins = round($dateValue * 1440) - round($hours * 60);
+			$secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60);
 			$returnValue = (integer) gmmktime($hours, $mins, $secs);
 		}
 
@@ -133,12 +166,12 @@ class PHPExcel_Shared_Date
 	 *
 	 * @param	 mixed		$dateValue	PHP serialized date/time or date object
 	 * @return	 mixed					Excel date/time value
-	 *										or boolean False on failure
+	 *										or boolean FALSE on failure
 	 */
 	public static function PHPToExcel($dateValue = 0) {
 		$saveTimeZone = date_default_timezone_get();
 		date_default_timezone_set('UTC');
-		$retValue = False;
+		$retValue = FALSE;
 		if ((is_object($dateValue)) && ($dateValue instanceof self::$dateTimeObjectType)) {
 			$retValue = self::FormattedPHPToExcel( $dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'),
 												   $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')
@@ -171,19 +204,19 @@ class PHPExcel_Shared_Date
 			//	Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
 			//	This affects every date following 28th February 1900
 			//
-			$excel1900isLeapYear = True;
-			if (($year == 1900) && ($month <= 2)) { $excel1900isLeapYear = False; }
+			$excel1900isLeapYear = TRUE;
+			if (($year == 1900) && ($month <= 2)) { $excel1900isLeapYear = FALSE; }
 			$myExcelBaseDate = 2415020;
 		} else {
 			$myExcelBaseDate = 2416481;
-			$excel1900isLeapYear = False;
+			$excel1900isLeapYear = FALSE;
 		}
 
 		//	Julian base date Adjustment
 		if ($month > 2) {
-			$month = $month - 3;
+			$month -= 3;
 		} else {
-			$month = $month + 9;
+			$month += 9;
 			--$year;
 		}
 
@@ -205,7 +238,11 @@ class PHPExcel_Shared_Date
 	 * @return	 boolean
 	 */
 	public static function isDateTime(PHPExcel_Cell $pCell) {
-		return self::isDateTimeFormat($pCell->getParent()->getStyle($pCell->getCoordinate())->getNumberFormat());
+		return self::isDateTimeFormat(
+			$pCell->getParent()->getStyle(
+				$pCell->getCoordinate()
+			)->getNumberFormat()
+		);
 	}	//	function isDateTime()
 
 
@@ -220,7 +257,7 @@ class PHPExcel_Shared_Date
 	}	//	function isDateTimeFormat()
 
 
-	private static	$possibleDateFormatCharacters = 'ymdHs';
+	private static	$possibleDateFormatCharacters = 'eymdHs';
 
 	/**
 	 * Is a given number format code a date/time?
@@ -231,6 +268,10 @@ class PHPExcel_Shared_Date
 	public static function isDateTimeFormatCode($pFormatCode = '') {
 		// Switch on formatcode
 		switch ($pFormatCode) {
+			//	General contains an epoch letter 'e', so we trap for it explicitly here
+			case PHPExcel_Style_NumberFormat::FORMAT_GENERAL:
+				return FALSE;
+			//	Explicitly defined date formats
 			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD:
 			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2:
 			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DDMMYYYY:
@@ -253,32 +294,32 @@ class PHPExcel_Shared_Date
 			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX16:
 			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX17:
 			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22:
-				return true;
+				return TRUE;
 		}
 
 		//	Typically number, currency or accounting (or occasionally fraction) formats
 		if ((substr($pFormatCode,0,1) == '_') || (substr($pFormatCode,0,2) == '0 ')) {
-			return false;
+			return FALSE;
 		}
 		// Try checking for any of the date formatting characters that don't appear within square braces
 		if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$pFormatCode)) {
 			//	We might also have a format mask containing quoted strings...
 			//		we don't want to test for any of our characters within the quoted blocks
-			if (strpos($pFormatCode,'"') !== false) {
-				$i = false;
+			if (strpos($pFormatCode,'"') !== FALSE) {
+				$i = FALSE;
 				foreach(explode('"',$pFormatCode) as $subVal) {
 					//	Only test in alternate array entries (the non-quoted blocks)
 					if (($i = !$i) && (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$subVal))) {
-						return true;
+						return TRUE;
 					}
 				}
-				return false;
+				return FALSE;
 			}
-			return true;
+			return TRUE;
 		}
 
 		// No date...
-		return false;
+		return FALSE;
 	}	//	function isDateTimeFormatCode()
 
 
@@ -286,23 +327,23 @@ class PHPExcel_Shared_Date
 	 * Convert a date/time string to Excel time
 	 *
 	 * @param	string	$dateValue		Examples: '2009-12-31', '2009-12-31 15:59', '2009-12-31 15:59:10'
-	 * @return	float|false		Excel date/time serial value
+	 * @return	float|FALSE		Excel date/time serial value
 	 */
 	public static function stringToExcel($dateValue = '') {
 		if (strlen($dateValue) < 2)
-			return false;
+			return FALSE;
 		if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
-			return false;
+			return FALSE;
 
 		$dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
 
 		if ($dateValueNew === PHPExcel_Calculation_Functions::VALUE()) {
-			return false;
+			return FALSE;
 		} else {
-			if (strpos($dateValue, ':') !== false) {
+			if (strpos($dateValue, ':') !== FALSE) {
 				$timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($dateValue);
 				if ($timeValue === PHPExcel_Calculation_Functions::VALUE()) {
-					return false;
+					return FALSE;
 				}
 				$dateValueNew += $timeValue;
 			}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Drawing.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Drawing.php
index 3367f272b6b..9401000dd8a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Drawing.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Drawing.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Drawing
 {
@@ -183,35 +183,35 @@ class PHPExcel_Shared_Drawing
         $read    =    fread($file,10);
         while(!feof($file)&&($read<>""))
             $read    .=    fread($file,1024);
-       
+
         $temp    =    unpack("H*",$read);
         $hex    =    $temp[1];
         $header    =    substr($hex,0,108);
-       
+
         //    Process the header
         //    Structure: http://www.fastgraph.com/help/bmp_header_format.html
         if (substr($header,0,4)=="424d")
         {
             //    Cut it in parts of 2 bytes
             $header_parts    =    str_split($header,2);
-           
+
             //    Get the width        4 bytes
             $width            =    hexdec($header_parts[19].$header_parts[18]);
-           
+
             //    Get the height        4 bytes
             $height            =    hexdec($header_parts[23].$header_parts[22]);
-           
+
             //    Unset the header params
             unset($header_parts);
         }
-       
+
         //    Define starting X and Y
         $x                =    0;
         $y                =    1;
-       
+
         //    Create newimage
         $image            =    imagecreatetruecolor($width,$height);
-       
+
         //    Grab the body from the image
         $body            =    substr($hex,108);
 
@@ -223,7 +223,7 @@ class PHPExcel_Shared_Drawing
 
         //    Use end-line padding? Only when needed
         $usePadding        =    ($body_size>($header_size*3)+4);
-       
+
         //    Using a for-loop with index-calculation instaid of str_split to avoid large memory consumption
         //    Calculate the next DWORD-position in the body
         for ($i=0;$i<$body_size;$i+=3)
@@ -235,36 +235,36 @@ class PHPExcel_Shared_Drawing
                 //    Shift i to the ending of the current 32-bit-block
                 if ($usePadding)
                     $i    +=    $width%4;
-               
+
                 //    Reset horizontal position
                 $x    =    0;
-               
+
                 //    Raise the height-position (bottom-up)
                 $y++;
-               
+
                 //    Reached the image-height? Break the for-loop
                 if ($y>$height)
                     break;
             }
-           
+
             //    Calculation of the RGB-pixel (defined as BGR in image-data)
             //    Define $i_pos as absolute position in the body
             $i_pos    =    $i*2;
             $r        =    hexdec($body[$i_pos+4].$body[$i_pos+5]);
             $g        =    hexdec($body[$i_pos+2].$body[$i_pos+3]);
             $b        =    hexdec($body[$i_pos].$body[$i_pos+1]);
-           
+
             //    Calculate and draw the pixel
             $color    =    imagecolorallocate($image,$r,$g,$b);
             imagesetpixel($image,$x,$height-$y,$color);
-           
+
             //    Raise the horizontal position
             $x++;
         }
-       
+
         //    Unset the body / free the memory
         unset($body);
-       
+
         //    Return image-object
         return $image;
 	}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher.php
index 55470960717..ecd8216aa4c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer.php
index 7e17e464a35..adbe429dbbc 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher_DgContainer
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
index c11d7657126..ea0235e8bfa 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher_DgContainer_SpgrContainer
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
index a3bd3cd65b1..cb4988c8494 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
 {
@@ -55,6 +55,13 @@ class PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
 	 */
 	private $_spType;
 
+	/**
+	 * Shape flag
+	 *
+	 * @var int
+	 */
+	private $_spFlag;
+
 	/**
 	 * Shape index (usually group shape has index 0, and the rest: 1,2,3...)
 	 *
@@ -171,6 +178,26 @@ class PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer
 		return $this->_spType;
 	}
 
+	/**
+	 * Set the shape flag
+	 *
+	 * @param int $value
+	 */
+	public function setSpFlag($value)
+	{
+		$this->_spFlag = $value;
+	}
+
+	/**
+	 * Get the shape flag
+	 *
+	 * @return int
+	 */
+	public function getSpFlag()
+	{
+		return $this->_spFlag;
+	}
+
 	/**
 	 * Set the shape index
 	 *
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer.php
index 39b57d02070..4fddbdf3fd6 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher_DggContainer
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
index 8ac8f556abe..428c76e6a41 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher_DggContainer_BstoreContainer
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
index 9b31bb5e2e0..1f10ae1767d 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
index 4a6d4e4c4f2..0d28a6bf561 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_Escher
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Excel5.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Excel5.php
index f6bced5034c..629f621c8e3 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Excel5.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Excel5.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 /**
@@ -30,7 +30,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Excel5
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/File.php b/htdocs/includes/phpexcel/PHPExcel/Shared/File.php
index 75532f6c78e..575ac3cd22c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/File.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/File.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_File
 {
@@ -80,7 +80,7 @@ class PHPExcel_Shared_File
 		}
 
 		// Found something?
-		if ($returnValue == '' || is_null($returnValue)) {
+		if ($returnValue == '' || ($returnValue === NULL)) {
 			$pathArray = explode('/' , $pFilename);
 			while(in_array('..', $pathArray) && $pathArray[0] != '..') {
 				for ($i = 0; $i < count($pathArray); ++$i) {
@@ -110,13 +110,13 @@ class PHPExcel_Shared_File
 
 		if ( !function_exists('sys_get_temp_dir')) {
 			if ($temp = getenv('TMP') ) {
-				if (file_exists($temp)) { return realpath($temp); }
+				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
 			}
 			if ($temp = getenv('TEMP') ) {
-				if (file_exists($temp)) { return realpath($temp); }
+				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
 			}
 			if ($temp = getenv('TMPDIR') ) {
-				if (file_exists($temp)) { return realpath($temp); }
+				if ((!empty($temp)) && (file_exists($temp))) { return realpath($temp); }
 			}
 
 			// trick for creating a file in system's temporary dir
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/Font.php b/htdocs/includes/phpexcel/PHPExcel/Shared/Font.php
index a0535688ac9..3d0662e8830 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/Font.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/Font.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_Font
 {
@@ -39,6 +39,11 @@ class PHPExcel_Shared_Font
 	const AUTOSIZE_METHOD_APPROX	= 'approx';
 	const AUTOSIZE_METHOD_EXACT		= 'exact';
 
+	private static $_autoSizeMethods = array(
+		self::AUTOSIZE_METHOD_APPROX,
+		self::AUTOSIZE_METHOD_EXACT,
+	);
+
 	/** Character set codes used by BIFF5-8 in Font records */
 	const CHARSET_ANSI_LATIN				= 0x00;
 	const CHARSET_SYSTEM_DEFAULT			= 0x01;
@@ -47,8 +52,8 @@ class PHPExcel_Shared_Font
 	const CHARSET_ANSI_JAPANESE_SHIFTJIS	= 0x80;
 	const CHARSET_ANSI_KOREAN_HANGUL		= 0x81;
 	const CHARSET_ANSI_KOREAN_JOHAB			= 0x82;
-	const CHARSET_ANSI_CHINESE_SIMIPLIFIED	= 0x86;
-	const CHARSET_ANSI_CHINESE_TRADITIONAL	= 0x88;
+	const CHARSET_ANSI_CHINESE_SIMIPLIFIED	= 0x86;		//	gb2312
+	const CHARSET_ANSI_CHINESE_TRADITIONAL	= 0x88;		//	big5
 	const CHARSET_ANSI_GREEK				= 0xA1;
 	const CHARSET_ANSI_TURKISH				= 0xA2;
 	const CHARSET_ANSI_VIETNAMESE			= 0xA3;
@@ -56,7 +61,7 @@ class PHPExcel_Shared_Font
 	const CHARSET_ANSI_ARABIC				= 0xB2;
 	const CHARSET_ANSI_BALTIC				= 0xBA;
 	const CHARSET_ANSI_CYRILLIC				= 0xCC;
-	const CHARSET_ANSI_THAI					= 0xDE;
+	const CHARSET_ANSI_THAI					= 0xDD;
 	const CHARSET_ANSI_LATIN_II				= 0xEE;
 	const CHARSET_OEM_LATIN_I				= 0xFF;
 
@@ -187,10 +192,17 @@ class PHPExcel_Shared_Font
 	 * Set autoSize method
 	 *
 	 * @param string $pValue
+	 * @return	 boolean					Success or failure
 	 */
-	public static function setAutoSizeMethod($pValue = 'approx')
+	public static function setAutoSizeMethod($pValue = self::AUTOSIZE_METHOD_APPROX)
 	{
+		if (!in_array($pValue,self::$_autoSizeMethods)) {
+			return FALSE;
+		}
+
 		self::$autoSizeMethod = $pValue;
+
+		return TRUE;
 	}
 
 	/**
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/docs.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/docs.php
deleted file mode 100644
index d27a42f76ea..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/docs.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-require_once "includes/header.php";
-require_once "includes/navbar.php";
-require_once "sections/Home.php";
-require_once "includes/footer.php";	
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/download.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/download.php
deleted file mode 100644
index 2df6e0c94e0..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/download.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
-* Script to create REGRESS package for download
-*
-* @author Mike Bommarito
-* @author Paul Meagher
-* @version 0.3
-* @modified Apr 2, 2006
-*
-* Note: Script requires the PEAR Archive_Tar package be installed:
-*
-* @see http://pear.php.net/package/Archive_Tar
-*/
-
-// name and directory of package
-$pkgName   = "JAMA";
-
-// root of PHP/Math build directory
-$buildDir  = substr(dirname(__FILE__), 0, -5 - strlen($pkgName));
-
-// switch to PHP/Math build directory
-chdir($buildDir);
-
-$tarName = "$pkgName.tar.gz";  
-
-$tarPath = $buildDir.$pkgName."/downloads/".$tarName;
-
-if($_GET['op'] == "download") {  
-  
-	require_once('Archive/Tar.php');  
-	
-	$tar   = new Archive_Tar($tarPath);
-
-  // create $pkgName archive under $pkgName folder
-  $files = glob("$pkgName/*.php");
-  $files = array_merge($files, glob("$pkgName/*.TXT"));
-  $files = array_merge($files, glob("$pkgName/docs/*.php"));
-  $files = array_merge($files, glob("$pkgName/docs/includes/*.php"));
-  $files = array_merge($files, glob("$pkgName/examples/*.php"));
-  $files = array_merge($files, glob("$pkgName/tests/*.php"));  
-  $files = array_merge($files, glob("$pkgName/utils/*.php"));    
-  
-	$tar->create($files);
-		
-	// create the download url
-  $webDir  = substr($_SERVER['PHP_SELF'], 0, -18);
-  $urlPath = "http://".$_SERVER['HTTP_HOST'].$webDir."/downloads";
-  
-  // redirect to download url
-	header("Location: $urlPath/$tarName");
-
-}
-
-include_once "includes/header.php";
-include_once "includes/navbar.php";
-?>
-<p>
-Download current version: 
-</p>
-<ul>
- <li><a href='<?php echo $_SERVER['PHP_SELF']."?op=download"; ?>'><?php echo $tarName ?></a></li>
-</ul>
-<?php
-include_once "includes/footer.php";
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/example.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/example.php
deleted file mode 100644
index d76c0f5f43a..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/example.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-include_once "includes/header.php";
-include_once "includes/navbar.php";
-?>
-<h2>Magic Square Example</h2>
-<p>
-The Jama distribution comes with a magic square example that is used to 
-test and benchmark the LU, QR, SVD and symmetric Eig decompositions.  
-The example outputs a multi-column table with these column headings:
-</p>
-
-<table border='1' cellpadding='5' cellspacing='0' align='center'>
-  <tr>
-    <td><b>n</b></td>
-    <td>Order of magic square.</td>
-  </tr>
-  <tr>
-    <td><b>trace</b></td>
-    <td>Diagonal sum, should be the magic sum, (n^3 + n)/2.</td>
-  </tr>
-  <tr>
-    <td><b>max_eig</b></td>
-    <td>Maximum eigenvalue of (A + A')/2, should equal trace.</td>
-  </tr>
-  <tr>
-    <td><b>rank</b></td>
-    <td>Linear algebraic rank, should equal n if n is odd, be less than n if n is even.</td>
-  </tr>
-  <tr>
-    <td><b>cond</b></td>
-    <td>L_2 condition number, ratio of singular values.</td>
-  </tr>
-  <tr>
-    <td><b>lu_res</b></td>
-    <td>test of LU factorization, norm1(L*U-A(p,:))/(n*eps).</td>
-  </tr>
-  <tr>
-    <td><b>qr_res</b></td>
-    <td>test of QR factorization, norm1(Q*R-A)/(n*eps).</td>
-  </tr>
-</table>
-<p>
-Running the Java-based version of the matix square example produces these results:
-</p>
-
-<table border='1' align='center'>
-  <tr>
-    <th> n </th>
-    <th> trace </th>       
-    <th> max_eig </th>   
-    <th> rank </th>        
-    <th> cond </th>      
-    <th> lu_res </th>      
-    <th> qr_res </th>
-  </tr>
-  <tr>
-    <td>3</td><td>15</td><td>15.000</td><td>3</td><td>4.330</td><td>0.000</td><td>11.333</td>
-  </tr>
-  <tr>
-    <td>4</td><td>34</td><td>34.000</td><td>3</td><td> Inf</td><td>0.000</td><td>13.500</td>
-  <tr>
-    <td>5</td><td>65</td><td>65.000</td><td>5</td><td>5.462</td><td>0.000</td><td>14.400</td>
-  </tr>
-  <tr>
-    <td>6</td><td>111</td><td>111.000</td><td>5</td><td> Inf</td><td>5.333</td><td>16.000</td>
-  </tr>
-  <tr>
-    <td>7</td><td>175</td><td>175.000</td><td>7</td><td>7.111</td><td>2.286</td><td>37.714</td>
-  </tr>
-  <tr>
-    <td>8</td><td>260</td><td>260.000</td><td>3</td><td> Inf</td><td>0.000</td><td>59.000</td>
-  </tr>
-  <tr>
-    <td>9</td><td>369</td><td>369.000</td><td>9</td><td>9.102</td><td>7.111</td><td>53.333</td>
-  </tr>
-  <tr>
-    <td>10</td><td>505</td><td>505.000</td><td>7</td><td> Inf</td><td>3.200</td><td>159.200</td>
-  </tr>
-  <tr>
-    <td>11</td><td>671</td><td>671.000</td><td>11</td><td>11.102</td><td>2.909</td><td>215.273</td>
-  </tr>
-  <tr>
-    <td>12</td><td>870</td><td>870.000</td><td>3</td><td> Inf</td><td>0.000</td><td>185.333</td>
-  </tr>
-  <tr>
-    <td>13</td><td>1105</td><td>1105.000</td><td>13</td><td>13.060</td><td>4.923</td><td>313.846</td>
-  </tr>
-  <tr>
-    <td>14</td><td>1379</td><td>1379.000</td><td>9</td><td> Inf</td><td>4.571</td><td>540.571</td>
-  </tr>
-  <tr>
-    <td>15</td><td>1695</td><td>1695.000</td><td>15</td><td>15.062</td><td>4.267</td><td>242.133</td>
-  </tr>
-  <tr>
-    <td>16</td><td>2056</td><td>2056.000</td><td>3</td><td> Inf</td><td>0.000</td><td>488.500</td>
-  </tr>
-  <tr>
-    <td>17</td><td>2465</td><td>2465.000</td><td>17</td><td>17.042</td><td>7.529</td><td>267.294</td>
-  </tr>
-  <tr>
-    <td>18</td><td>2925</td><td>2925.000</td><td>11</td><td> Inf</td><td>7.111</td><td>520.889</td>
-  </tr>
-  <tr>
-    <td>19</td><td>3439</td><td>3439.000</td><td>19</td><td>19.048</td><td>16.842</td><td>387.368</td>
-  </tr>
-  <tr>
-    <td>20</td><td>4010</td><td>4010.000</td><td>3</td><td> Inf</td><td>14.400</td><td>584.800</td>
-  </tr>
-  <tr>
-    <td>21</td><td>4641</td><td>4641.000</td><td>21</td><td>21.035</td><td>6.095</td><td>1158.095</td>
-  </tr>
-  <tr>
-    <td>22</td><td>5335</td><td>5335.000</td><td>13</td><td> Inf</td><td>6.545</td><td>1132.364</td>
-  </tr>
-  <tr>
-    <td>23</td><td>6095</td><td>6095.000</td><td>23</td><td>23.037</td><td>11.130</td><td>1268.870</td>
-  </tr>
-  <tr>
-    <td>24</td><td>6924</td><td>6924.000</td><td>3</td><td> Inf</td><td>10.667</td><td>827.500</td>
-  </tr>
-  <tr>
-    <td>25</td><td>7825</td><td>7825.000</td><td>25</td><td>25.029</td><td>35.840</td><td>1190.400</td>
-  </tr>
-  <tr>
-    <td>26</td><td>8801</td><td>8801.000</td><td>15</td><td> Inf</td><td>4.923</td><td>1859.077</td>
-  </tr>
-  <tr>
-    <td>27</td><td>9855</td><td>9855.000</td><td>27</td><td>27.032</td><td>37.926</td><td>1365.333</td>
-  </tr>
-  <tr>
-    <td>28</td><td>10990</td><td>10990.000</td><td>3</td><td> Inf</td><td>34.286</td><td>1365.714</td>
-  </tr>
-  <tr>
-    <td>29</td><td>12209</td><td>12209.000</td><td>29</td><td>29.025</td><td>30.897</td><td>1647.448</td>
-  </tr>
-  <tr>
-    <td>30</td><td>13515</td><td>13515.000</td><td>17</td><td> Inf</td><td>8.533</td><td>2571.733</td>
-  </tr>
-  <tr>
-    <td>31</td><td>14911</td><td>14911.000</td><td>31</td><td>31.027</td><td>33.032</td><td>1426.581</td>
-  </tr>
-  <tr>
-    <td>32</td><td>16400</td><td>16400.000</td><td>3</td><td> Inf</td><td>0.000</td><td>1600.125</td>
-  </tr>
-</table>
-<center>Elapsed Time =        0.710 seconds</center>
-
-<p>
-The magic square example does not fare well when <a href='../examples/MagicSquareExample.php'>run as a PHP script</a>.  For a 32x32 matrix array 
-it takes around a second to complete just the last row of computations in the above table.  
-Hopefully this result will spur PHP developers to find optimizations and better attuned algorithms 
-to speed things up. Matrix algebra is a great testing ground for ideas about time and memory 
-performance optimation.  Keep in perspective that PHP JAMA scripts are still plenty fast for use as 
-a tool for learning about matrix algebra and quickly extending your knowledge with new scripts 
-to apply knowledge.
-</p> 
-
-<p>
-To learn more about the subject of magic squares you can visit the <a href='http://mathforum.org/alejandre/magic.square.html'>Drexel Math Forum on Magic Squares</a>.
-You can also learn more by carefully examining the <code>MagicSquareExample.php</code> source code below.
-</p>
-
-<?php
-highlight_file("../examples/MagicSquareExample.php");
-include_once "includes/footer.php";	
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/credits.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/credits.php
deleted file mode 100644
index efc91c228c2..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/credits.php
+++ /dev/null
@@ -1,14 +0,0 @@
-	<div id="credits">
-  <p>
-  Brought to you by:
-  </p>
-	<ul>
-	  <li><a href="http://math.nist.gov/">National Institute of Standards and Technology</a></li>
-	  <li><a href="http://math.nist.gov/">MathWorks</a></li>
-	  <li><a href="http://math.nist.gov/javanumerics/jama/">JAMA : A Java Matrix Package</a></li>	
-	  <li>Paul Meagher</li>
-	  <li>Michael Bommarito</li>
-	  <li>Lukasz Karapuda</li>
-	  <li>Bartek Matosiuk</li>
-	</ul>
-	</div>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/footer.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/footer.php
deleted file mode 100644
index 7fb2bd61bf2..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/footer.php
+++ /dev/null
@@ -1,2 +0,0 @@
-	</body>
-</html>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/header.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/header.php
deleted file mode 100644
index 10d32a3254e..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/header.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<title>JAMA v1.0.1</title>
-		<meta name="description" content="JAMA v1.0.1 - Port of the proposed standard Java Matrix Library to PHP" />
-		<meta name="robots" content="index, follow" />
-		<meta name="keywords" content="php, matrix, matrix library, cholesky decomposition, eigenvalue decomposition, eigenvector, lu decomposition, qr decomposition, singular value decomposition" />
-		<link rel="stylesheet" type="text/css" href="style.css" />
-	</head>
-	<body>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/navbar.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/navbar.php
deleted file mode 100644
index 873d34d6f42..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/includes/navbar.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<center>
-  <hr />
-    [ <a href="index.php">index.php</a> ] [ <a href="docs.php">docs.php</a> ] [ <a href="package.php">package.php</a> ] [ <a href="test.php">test.php</a> ] [ <a href="example.php">example.php</a> ] [ <a href="download.php">download.php</a> ]
-  <hr />
-</center>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/index.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/index.php
deleted file mode 100644
index 42a491e5839..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-include_once "includes/header.php";
-include_once "includes/navbar.php";
-?>
-
-<p>
-JAMA is a proposed standard matrix class for Java. The JAMA introduction 
-describes "JAMA : A Java Matrix Package" in this way:
-</p> 
-
-<blockquote>
-JAMA is a basic linear algebra package for Java. It provides user-level classes for 
-constructing and manipulating real, dense matrices.  It is meant to provide sufficient 
-functionality for routine problems, packaged in a way that is natural and understandable 
-to non-experts.  It is intended to serve as the standard matrix class for Java, and 
-will be proposed as such to the Java Grande Forum and then to Sun.  A straightforward 
-public-domain reference implementation has been developed by the MathWorks and NIST as 
-a strawman for such a class.  We are releasing this version in order to obtain public 
-comment. There is no guarantee that future versions of JAMA will be compatible with this one.  
-</blockquote>
-
-<p>
-The development team below has successfully ported the JAMA API to PHP.  You can explore 
-this site to learn more about this project and it's current development status.
-</p>
-
-<?php
-include_once "includes/credits.php";
-include_once "includes/footer.php";	
-?>
\ No newline at end of file
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/package.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/package.php
deleted file mode 100644
index 07f84929b50..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/package.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-include_once "includes/header.php";
-include_once "includes/navbar.php";
-?>
-<p>
-Source Listing:
-</p>
-<ul>
-  <?php
-  chdir("../");
-  $files = glob("*.php");
-  $files = array_merge($files, glob("util/*.php"));
-  foreach ($files as $fileName) {
-    ?>
-  	<li><a href="package.php?view=<?php echo sha1($fileName);?>"><?php echo $fileName;?></a>&nbsp;-&nbsp;<?php echo date ("F d Y - g:i a", filemtime($fileName));?></li>
-    <?php
-  }
-  ?>
-</ul>
-<?php
-if( isset($_REQUEST['view']) ) {
-	$hash = $_REQUEST['view'];
-	$n = array_search($hash, array_map(sha1, $files));
-	$fileName = $files[$n];
-  ?>
-  <hr />  
-	Viewing: <?php echo $fileName;?>	
-	<hr />
-	<?php
-	highlight_file($fileName);
-	?>
-	<hr />
-<?php
-}
-include_once "includes/footer.php";	
-?>
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/test.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/test.php
deleted file mode 100644
index d5478a0562f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/docs/test.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-include_once "includes/header.php";
-include_once "includes/navbar.php";
-?>
-<p>
-The first script your should run when you install Jama is the TestMatrix.php script.
-</p>
-<p>
-This will run the unit tests for methods in the <code>Matrix.php</code> class.  Because
-the Matrix.php class can be used to invoke all the decomposition methods the <code>TestMatrix.php</code> 
-script is a test suite for the whole Jama package.
-</p>
-<p>
-The original <code>TestMatrix.java</code> code uses try/catch error handling.  We will 
-eventually create a build of JAMA that will take advantage of PHP5's new try/catch error 
-handling capabilities.  This will improve our ability to replicate all the unit tests that 
-appeared in the original (except for some print methods that may not be worth porting).
-</p>
-<p>
-You can <a href='../test/TestMatrix.php'>run the TestMatrix.php script</a> to see what 
-unit tests are currently implemented.  The source of the <code>TestMatrix.php</code> script 
-is provided below.  It is worth studying carefully for an example of how to do matrix algebra
-programming with Jama.
-</p>
-<?php
-highlight_file("../test/TestMatrix.php");
-include_once "includes/footer.php";	
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
index 7c49e078faf..38bc4b7d86c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/JAMA/examples/Stats.php
@@ -16,6 +16,7 @@
 // | Authors: Jesus M. Castagnetto <jmcastagnetto@php.net>                |
 // +----------------------------------------------------------------------+
 //
+// $Id: Stats.php,v 1.15 2003/06/01 11:40:30 jmcastagnetto Exp $
 //
 
 include_once 'PEAR.php';
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php
index 8582061b5eb..a5c8dd1d000 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE.php
@@ -17,6 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
+// $Id: OLE.php,v 1.13 2007/03/07 14:38:25 schmidt Exp $
 
 
 /**
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
index b838b96c27e..4e233ad0436 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (C) 2006 - 2011 PHPExcel
+ * Copyright (C) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
  * @package    PHPExcel_Shared_OLE
  * @copyright  Copyright (c) 2006 - 2007 Christian Schmidt
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version 1.7.6, 2011-02-27
+ * @version 1.7.8, 2012-10-12
  */
 
 /**
@@ -64,12 +64,13 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
 	/**
 	 * Implements support for fopen().
 	 * For creating streams using this wrapper, use OLE_PPS_File::getStream().
-	 * @param  string  resource name including scheme, e.g.
-	 *                 ole-chainedblockstream://oleInstanceId=1
-	 * @param  string  only "r" is supported
-	 * @param  int     mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
-	 * @param  string  absolute path of the opened stream (out parameter)
-	 * @return bool    true on success
+	 *
+	 * @param	string	$path			resource name including scheme, e.g.
+	 *									ole-chainedblockstream://oleInstanceId=1
+	 * @param	string	$mode			only "r" is supported
+	 * @param	int		$options		mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
+	 * @param	string  &$openedPath	absolute path of the opened stream (out parameter)
+	 * @return	bool    true on success
 	 */
 	public function stream_open($path, $mode, $options, &$openedPath)
 	{
@@ -129,7 +130,7 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
 
 	/**
 	 * Implements support for fclose().
-	 * @return  string
+	 *
 	 */
 	public function stream_close()
 	{
@@ -139,7 +140,8 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
 
 	/**
 	 * Implements support for fread(), fgets() etc.
-	 * @param   int  maximum number of bytes to read
+	 *
+	 * @param   int		$count	maximum number of bytes to read
 	 * @return  string
 	 */
 	public function stream_read($count)
@@ -154,6 +156,7 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
 
 	/**
 	 * Implements support for feof().
+	 *
 	 * @return  bool  TRUE if the file pointer is at EOF; otherwise FALSE
 	 */
 	public function stream_eof()
@@ -171,6 +174,7 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
 	/**
 	 * Returns the position of the file pointer, i.e. its offset into the file
 	 * stream. Implements support for ftell().
+	 *
 	 * @return  int
 	 */
 	public function stream_tell()
@@ -180,9 +184,10 @@ class PHPExcel_Shared_OLE_ChainedBlockStream
 
 	/**
 	 * Implements support for fseek().
-	 * @param   int  byte offset
-	 * @param   int  SEEK_SET, SEEK_CUR or SEEK_END
-	 * @return  bool
+	 *
+	 * @param	int		$offset	byte offset
+	 * @param	int		$whence	SEEK_SET, SEEK_CUR or SEEK_END
+	 * @return	bool
 	 */
 	public function stream_seek($offset, $whence)
 	{
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php
index a77064dfa56..4db0ae4e27b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS.php
@@ -17,6 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
+// $Id: PPS.php,v 1.7 2007/02/13 21:00:42 schmidt Exp $
 
 
 /**
@@ -195,21 +196,35 @@ class PHPExcel_Shared_OLE_PPS
 	* PPS. I don't think it'll work with Dir PPS's.
 	*
 	* @access public
-	* @param array &$pps_array Reference to the array of PPS's for the whole OLE
+	* @param array &$raList Reference to the array of PPS's for the whole OLE
 	*                          container
 	* @return integer          The index for this PPS
 	*/
-	public function _savePpsSetPnt(&$pps_array)
+	public static function _savePpsSetPnt(&$raList, $to_save, $depth = 0)
 	{
-		$pps_array[count($pps_array)] = &$this;
-		$this->No = count($pps_array) - 1;
-		$this->PrevPps = 0xFFFFFFFF;
-		$this->NextPps = 0xFFFFFFFF;
-		if (count($this->children) > 0) {
-			$this->DirPps = $this->children[0]->_savePpsSetPnt($pps_array);
+		if ( !is_array($to_save) || (empty($to_save)) ) {
+			return 0xFFFFFFFF;
+		} elseif( count($to_save) == 1 ) {
+			$cnt = count($raList);
+			// If the first entry, it's the root... Don't clone it!
+			$raList[$cnt] = ( $depth == 0 ) ? $to_save[0] : clone $to_save[0];
+			$raList[$cnt]->No = $cnt;
+			$raList[$cnt]->PrevPps = 0xFFFFFFFF;
+			$raList[$cnt]->NextPps = 0xFFFFFFFF;
+			$raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
 		} else {
-			$this->DirPps = 0xFFFFFFFF;
+			$iPos  = floor(count($to_save) / 2);
+			$aPrev = array_slice($to_save, 0, $iPos);
+			$aNext = array_slice($to_save, $iPos + 1);
+			$cnt   = count($raList);
+			// If the first entry, it's the root... Don't clone it!
+			$raList[$cnt] = ( $depth == 0 ) ? $to_save[$iPos] : clone $to_save[$iPos];
+			$raList[$cnt]->No = $cnt;
+			$raList[$cnt]->PrevPps = self::_savePpsSetPnt($raList, $aPrev, $depth++);
+			$raList[$cnt]->NextPps = self::_savePpsSetPnt($raList, $aNext, $depth++);
+			$raList[$cnt]->DirPps  = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+
 		}
-		return $this->No;
+		return $cnt;
 	}
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
index d844401208c..f061f568cc2 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/File.php
@@ -17,6 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
+// $Id: File.php,v 1.11 2007/02/13 21:00:42 schmidt Exp $
 
 
 /**
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
index 94f2462ce6f..7046a0a3aeb 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
@@ -17,6 +17,7 @@
 // | Based on OLE::Storage_Lite by Kawai, Takanori                        |
 // +----------------------------------------------------------------------+
 //
+// $Id: Root.php,v 1.9 2005/04/23 21:53:49 dufuz Exp $
 
 
 /**
@@ -30,10 +31,10 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
 	{
 
 	/**
-	 *	Directory for temporary files
-	 *	@var string
+	 * Directory for temporary files
+	 * @var string
 	 */
-	protected $_tmp_dir		= '';
+	protected $_tmp_dir		= NULL;
 
 	/**
 	 * @param integer $time_1st A timestamp
@@ -78,6 +79,8 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
 		if (is_resource($filename)) {
 		    $this->_FILEH_ = $filename;
 		} else if ($filename == '-' || $filename == '') {
+			if ($this->_tmp_dir === NULL)
+				$this->_tmp_dir = PHPExcel_Shared_File::sys_get_temp_dir();
 			$this->_tmp_filename = tempnam($this->_tmp_dir, "OLE_PPS_Root");
 			$this->_FILEH_ = fopen($this->_tmp_filename,"w+b");
 			if ($this->_FILEH_ == false) {
@@ -91,7 +94,7 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
 		}
 		// Make an array of PPS's (for Save)
 		$aList = array();
-		$this->_savePpsSetPnt($aList);
+		PHPExcel_Shared_OLE_PPS::_savePpsSetPnt($aList, array($this));
 		// calculate values for header
 		list($iSBDcnt, $iBBcnt, $iPPScnt) = $this->_calcSize($aList); //, $rhInfo);
 		// Save Header
@@ -203,31 +206,31 @@ class PHPExcel_Shared_OLE_PPS_Root extends PHPExcel_Shared_OLE_PPS
 
 		// Save Header
 		fwrite($FILE,
-				  "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
-				  . "\x00\x00\x00\x00"
-				  . "\x00\x00\x00\x00"
-				  . "\x00\x00\x00\x00"
-				  . "\x00\x00\x00\x00"
-				  . pack("v", 0x3b)
-				  . pack("v", 0x03)
-				  . pack("v", -2)
-				  . pack("v", 9)
-				  . pack("v", 6)
-				  . pack("v", 0)
-				  . "\x00\x00\x00\x00"
-				  . "\x00\x00\x00\x00"
-				  . pack("V", $iBdCnt)
-				  . pack("V", $iBBcnt+$iSBDcnt) //ROOT START
-				  . pack("V", 0)
-				  . pack("V", 0x1000)
-				  . pack("V", $iSBDcnt ? 0 : -2)                  //Small Block Depot
-				  . pack("V", $iSBDcnt)
+				"\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
+				. "\x00\x00\x00\x00"
+				. "\x00\x00\x00\x00"
+				. "\x00\x00\x00\x00"
+				. "\x00\x00\x00\x00"
+				. pack("v", 0x3b)
+				. pack("v", 0x03)
+				. pack("v", -2)
+				. pack("v", 9)
+				. pack("v", 6)
+				. pack("v", 0)
+				. "\x00\x00\x00\x00"
+				. "\x00\x00\x00\x00"
+				. pack("V", $iBdCnt)
+				. pack("V", $iBBcnt+$iSBDcnt) //ROOT START
+				. pack("V", 0)
+				. pack("V", 0x1000)
+				. pack("V", $iSBDcnt ? 0 : -2)                  //Small Block Depot
+				. pack("V", $iSBDcnt)
 		  );
 		// Extra BDList Start, Count
 		if ($iBdCnt < $i1stBdL) {
 			fwrite($FILE,
-					  pack("V", -2).      // Extra BDList Start
-					  pack("V", 0)        // Extra BDList Count
+					pack("V", -2)      // Extra BDList Start
+					. pack("V", 0)        // Extra BDList Count
 				  );
 		} else {
 			fwrite($FILE, pack("V", $iAll+$iBdCnt) . pack("V", $iBdExL));
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/OLERead.php b/htdocs/includes/phpexcel/PHPExcel/Shared/OLERead.php
index d6a58d6bcd7..2a5eb7d7a12 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/OLERead.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/OLERead.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 define('IDENTIFIER_OLE', pack('CCCCCCCC', 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));
@@ -175,7 +175,7 @@ class PHPExcel_Shared_OLERead {
 	 */
 	public function getStream($stream)
 	{
-		if (is_null($stream)) {
+		if ($stream === NULL) {
 			return null;
 		}
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
index 8cc5ca828bf..e7facc1eaa1 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/pclzip.lib.php
@@ -22,6 +22,7 @@
 //   The use of this software is at the risk of the user.
 //
 // --------------------------------------------------------------------------------
+// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
 // --------------------------------------------------------------------------------
 
   // ----- Constants
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt
index c5d2486d3ef..d1b11e25897 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip/readme.txt
@@ -5,6 +5,7 @@
 // Vincent Blavet - vincent@phpconcept.net
 // http://www.phpconcept.net
 // --------------------------------------------------------------------------------
+// $Id: readme.txt,v 1.60 2009/09/30 20:35:21 vblavet Exp $
 // --------------------------------------------------------------------------------
 
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/2dbarcodes.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/2dbarcodes.php
deleted file mode 100644
index 8b73857d237..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/2dbarcodes.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-//============================================================+
-// File name   : 2dbarcodes.php
-// Version     : 1.0.007
-// Begin       : 2009-04-07
-// Last Update : 2010-08-08
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2009-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : PHP class to creates array representations for
-//               2D barcodes to be used with TCPDF.
-//
-//============================================================+
-
-/**
- * PHP class to creates array representations for 2D barcodes to be used with TCPDF.
- * @package com.tecnick.tcpdf
- * @abstract Functions for generating string representation of 2D barcodes.
- * @author Nicola Asuni
- * @copyright 2009-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.007
- */
-
-	/**
-	* PHP class to creates array representations for 2D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
-	* @name TCPDFBarcode
-	* @package com.tecnick.tcpdf
-	* @version 1.0.007
-	* @author Nicola Asuni
-	* @link http://www.tcpdf.org
-	* @license http://www.gnu.org/copyleft/lesser.html LGPL
-	*/
-class TCPDF2DBarcode {
-
-	/**
-	 * @var array representation of barcode.
-	 * @access protected
-	 */
-	protected $barcode_array = false;
-
-	/**
-	 * This is the class constructor.
-	 * Return an array representations for 2D barcodes:<ul>
-	 * <li>$arrcode['code'] code to be printed on text label</li>
-	 * <li>$arrcode['num_rows'] required number of rows</li>
-	 * <li>$arrcode['num_cols'] required number of columns</li>
-	 * <li>$arrcode['bcode'][$r][$c] value of the cell is $r row and $c column (0 = transparent, 1 = black)</li></ul>
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>QRCODE : QR-CODE Low error correction</li><li>QRCODE,L : QR-CODE Low error correction</li><li>QRCODE,M : QR-CODE Medium error correction</li><li>QRCODE,Q : QR-CODE Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li></ul>
-	 */
-	public function __construct($code, $type) {
-		$this->setBarcode($code, $type);
-	}
-
-	/**
-	 * Return an array representations of barcode.
- 	 * @return array
-	 */
-	public function getBarcodeArray() {
-		return $this->barcode_array;
-	}
-
-	/**
-	 * Set the barcode.
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>QRCODE : QR-CODE Low error correction</li><li>QRCODE,L : QR-CODE Low error correction</li><li>QRCODE,M : QR-CODE Medium error correction</li><li>QRCODE,Q : QR-CODE Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li></ul>
- 	 * @return array
-	 */
-	public function setBarcode($code, $type) {
-		$mode = explode(',', $type);
-		$qrtype = strtoupper($mode[0]);
-		switch ($qrtype) {
-			case 'QRCODE': { // QR-CODE
-				require_once(dirname(__FILE__).'/qrcode.php');
-				if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) {
-					$mode[1] = 'L'; // Ddefault: Low error correction
-				}
-				$qrcode = new QRcode($code, strtoupper($mode[1]));
-				$this->barcode_array = $qrcode->getBarcodeArray();
-				break;
-			}
-			case 'PDF417': { // PDF417 (ISO/IEC 15438:2006)
-				require_once(dirname(__FILE__).'/pdf417.php');
-				if (!isset($mode[1]) OR ($mode[1] === '')) {
-					$aspectratio = 2; // default aspect ratio (width / height)
-				} else {
-					$aspectratio = floatval($mode[1]);
-				}
-				if (!isset($mode[2]) OR ($mode[2] === '')) {
-					$ecl = -1; // default error correction level (auto)
-				} else {
-					$ecl = intval($mode[2]);
-				}
-				// set macro block
-				$macro = array();
-				if (isset($mode[3]) AND ($mode[3] !== '') AND isset($mode[4]) AND ($mode[4] !== '') AND isset($mode[5]) AND ($mode[5] !== '')) {
-					$macro['segment_total'] = intval($mode[3]);
-					$macro['segment_index'] = intval($mode[4]);
-					$macro['file_id'] = strtr($mode[5], "\xff", ',');
-					for ($i = 0; $i < 7; ++$i) {
-						$o = $i + 6;
-						if (isset($mode[$o]) AND ($mode[$o] !== '')) {
-							// add option
-							$macro['option_'.$i] = strtr($mode[$o], "\xff", ',');
-						}
-					}
-				}
-				$qrcode = new PDF417($code, $ecl, $aspectratio, $macro);
-				$this->barcode_array = $qrcode->getBarcodeArray();
-				break;
-			}
-			case 'RAW':
-			case 'RAW2': { // RAW MODE
-				// remove spaces
-				$code = preg_replace('/[\s]*/si', '', $code);
-				if (strlen($code) < 3) {
-					break;
-				}
-				if ($qrtype == 'RAW') {
-					// comma-separated rows
-					$rows = explode(',', $code);
-				} else { // RAW2
-					// rows enclosed in square parentheses
-					$code = substr($code, 1, -1);
-					$rows = explode('][', $code);
-				}
-				$this->barcode_array['num_rows'] = count($rows);
-				$this->barcode_array['num_cols'] = strlen($rows[0]);
-				$this->barcode_array['bcode'] = array();
-				foreach ($rows as $r) {
-					$this->barcode_array['bcode'][] = str_split($r, 1);
-				}
-				break;
-			}
-			case 'TEST': { // TEST MODE
-				$this->barcode_array['num_rows'] = 5;
-				$this->barcode_array['num_cols'] = 15;
-				$this->barcode_array['bcode'] = array(
-					array(1,1,1,0,1,1,1,0,1,1,1,0,1,1,1),
-					array(0,1,0,0,1,0,0,0,1,0,0,0,0,1,0),
-					array(0,1,0,0,1,1,0,0,1,1,1,0,0,1,0),
-					array(0,1,0,0,1,0,0,0,0,0,1,0,0,1,0),
-					array(0,1,0,0,1,1,1,0,1,1,1,0,0,1,0));
-				break;
-			}
-			default: {
-				$this->barcode_array = false;
-			}
-		}
-	}
-} // end of class
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/CHANGELOG.TXT b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/CHANGELOG.TXT
deleted file mode 100644
index 2583192f438..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/CHANGELOG.TXT
+++ /dev/null
@@ -1,1782 +0,0 @@
-5.9.009 (2010-10-21)
-	- HTML text alignment was improved to include the case of RTL text on LTR direction and LTR text on RTL direction.
-
-5.9.008 (2010-10-21)
-	- Bug item #3091502 "Bookmark oddity" was fixed.
-	- HTML internal links now accepts page number and Y position.
-	- The method write1DBarcode() was improved to accept separate horizontal and vertical padding (see example n. 27).
-
-5.9.007 (2010-10-20)
-	- Method adjustCellPadding() was fixed to handle bad input.
-
-5.9.006 (2010-10-19)
-	- Support for AES 256 bit encryption was added (see example n. 16).
-	- Method getNumLines() was fixed for the empty string case.
-
-5.9.005 (2010-10-18)
-	- Method addPageRegion() was changed to accept regions starting exactly from the top of the page.
-
-5.9.004 (2010-10-18)
-	- A bug related to annotations was fixed.
-	- The file unicode_data.php was canged to encapsulate all data in a class.
-	- The file htmlcolors.php was changed to remove the global variable.
-
-5.9.003 (2010-10-15)
-	- Support for no-write page regions was added. Check the example n. 64 and new methods setPageRegions(), addPageRegion(), getPageRegions(), removePageRegion().
-	- A bug on Right-To-Left alignment was fixed.
-
-5.9.002 (2010-10-08)
-	- Cell method was improved to preserve the font stretching and spacing values when using the $stretch parameter (see example n. 4).
-
-5.9.001 (2010-10-07)
-	- The problem of blank page for nobr table higher than a single page was fixed.
-
-5.9.000 (2010-10-06)
-	- Support for text stretching and spacing (kerning) was added, see example n. 63 and methods setFontStretching(), getFontStretching(), setFontSpacing(), getFontSpacing().
-	- Support for CSS properties 'font-stretch' and 'letter-spacing' was added (see example n. 63).
-	- The cMargin state was replaced by cell_padding array that can be set/get using setCellPadding() and getCellPadding() methods.
-	- Methods getCellPaddings() and setCellPaddings() were added to fine tune cell paddings (see example n. 5).
-	- Methods getCellMargins() and setCellMargins() were added to fine tune cell margins (see example n. 5).
-	- Method write1DBarcode() was improved to permit custom labels (see example n. 27).
-	- Method ImagePngAlpha() now includes support for ImageMagick to improve performances.
-	- XObject Template support was extended to support Multicell(), writeHTML() and writeHTMLCell() methods.
-	- The signature of getNumLines() and getStringHeight() methods is changed.
-	- Example n. 57 was updated.
-
-// -------------------------------------------------------------------
-
-5.8.034 (2010-09-27)
-	- A bug related to SetFont on XObject templates was fixed.
-
-5.8.033 (2010-09-25)
-	- A problem with Footer() and multiple columns was fixed.
-
-5.8.032 (2010-09-22)
-	- Bug #3073165 "Issues with changes to addHTMLVertSpace()" was fixed.
-
-5.8.031 (2010-09-20)
-	- Bug #3071961 "Spaces in HTML" was fixed.
-
-5.8.030 (2010-09-17)
-	- SVG support was improved and some bugs were fixed.
-
-5.8.029 (2010-09-16)
-	- A problem with HTML borders was fixed.
-
-5.8.028 (2010-09-13)
-	- Bug #3065224 "mcrypt_create_iv error on TCPDF 5.8.027 on PHP 5.3.2" was fixed.
-
-5.8.027 (2010-09-13)
-	- Bug #3065118 "mcrypt_decrypt error on TCPDF 5.8.026 on PHP 5.3.2" was fixed.
-
-5.8.026 (2010-09-13)
-	- A bug on addHTMLTOC() method was fixed. Note: be sure that the #TOC_PAGE_NUMBER# template has enough width to be printed correctly.
-
-5.8.025 (2010-09-09)
-	- Bug #3062692 "Textarea inside a table" was fixed.
-
-5.8.024 (2010-09-08)
-	- Bug #3062005 "Undefined variable: ann_obj_id" was fixed.
-
-5.8.023 (2010-08-31)
-	- Forms bug added on version 5.8.019 was fixed.
-
-5.8.022 (2010-08-31)
-	- Bug #3056632 "SVG rendered vertically flipped" was fixed.
-
-5.8.021 (2010-08-30)
-	- A new CID-0 'chinese' font was added for traditional Chinese.
-	- Bug #3054287 'Inner tags are ignored due to "align" attribute' was fixed.
-
-5.8.020 (2010-08-26)
-	- CSS "catch-all" class selector is now supported.
-
-5.8.019 (2010-08-26)
-	- XObject Templates now includes support for links and annotations.
-	- A problem related to link alignment on cell was fixed.
-	- A problem related to SVG styles was fixed.
-
-5.8.018 (2010-08-25)
-	- Method getNumberOfColumns() was added.
-	- A problem related to table header was fixed.
-	- Method getSVGTransformMatrix() was fixed to apply SVG transformations in the correct order.
-	- SVG support was improved and several bugs were fixed.
-
-5.8.017 (2010-08-25)
-	- This version includes support for XObject Templates (see the new example n. 62).
-	- Methods starttemplate(), endTemplate() and printTemplate() were added (see the new example n. 62).
-
-5.8.016 (2010-08-24)
-	- Alignment problem on write2DBarcode was fixed.
-
-5.8.015 (2010-08-24)
-	- A problem arised with the latest bugfix was fixed.
-
-5.8.014 (2010-08-23)
-	- Method _getxobjectdict() was added for better compatibility with external extensions.
-	- A bug related to radiobuttons was fixed.
-	- Bug #3051509 "new line after punctuation marks" was fixed (partially).
-
-5.8.013 (2010-08-23)
-	- SVG support for 'direction' property was added.
-	- A problem on default width calculation for linear barcodes was fixed.
-	- New option was added to write1DBarcode() method to improve alignments (see example n. 27).
-	- Bug #3050896 "Nested HTML tables: styles are not applied" was fixed.
-	- Method _putresourcedict() was improved to include external XObject templates.
-
-5.8.012 (2010-08-22)
-	- Support for SVG 'text-anchor' property was added.
-
-5.8.011 (2010-08-21)
-	- Method write1DBarcode() was improved to be backward compatible (check the new example n. 27).
-	- Support for CSS width and height properties on images were added.
-
-5.8.010 (2010-08-20)
-	- Documentation of unhtmlentities() was fixed.
-	- The 'fitwidth' option was added and border color problem was fixed on write1DBarcode() method (check the example n. 27).
-
-5.8.009 (2010-08-20)
-	- Internal object numbering was improved.
-	- Some errors in object encryption were fixed.
-
-5.8.008 (2010-08-19)
-	- Method write1DBarcode() was changed, check the example n. 27.
-	- Method Footer() was changed to account for barcode changes.
-	- Automatic calculation of K_PATH_URL constant was fixed on configuration file.
-	- Method setEqualColumns() was fixed for $width=0 case.
-	- Method AddTOC() was fixed for multipage and multicolumn modes.
-	- Better support for SVG "font-family" property.
-	- A problem on default Page Zoom mode was fixed.
-	- Several Annotation bugs were fixed.
-
-5.8.007 (2010-08-18)
-	- A bug affecting HTML tables was fixed.
-	- Bug #3047500 "SVG not rendering paths properly" was fixed.
-
-5.8.006 (2010-08-17)
-	- A bug affecting HTML table nesting was fixed.
-
-5.8.005 (2010-08-17)
-	- A bug affecting the HTML 'select' tag in certain conditions was fixed.
-
-5.8.004 (2010-08-17)
-	- Better support for HTML "font-family" property.
-	- A bug related to HTML multicolumn was fixed.
-
-5.8.003 (2010-08-16)
-	- Better support for HTML "font-family" property.
-
-5.8.002 (2010-08-14)
-	- HTML alignments were improved
-	- IMPORTANT: Default regular expression to find spaces has been changed to exclude the non-breaking-space (160 DEC- A0 HEX). If you are using setSpacesRE() method, please read the new documentation.
-	- Example n. 1 was updated.
-
-5.8.001 (2010-08-12)
-	- Bug #3043650 "subsetchars incorrectly cached" was fixed.
-
-5.8.000 (2010-08-11)
-	- A control to avoid bookmarking page 0 was added.
-	- addTOC() method now includes support for multicolumn mode.
-	- Support for tables in multicolumn mode was improved.
-	- Example n.10 was updated.
-	- All trimming functions were replaced with stringLeftTrim(), stringRightTrim() and stringTrim().
-	- HTML alignments were improved.
-
-------------------------------------------------------------
-
-5.7.003 (2010-08-08)
-	- Bug #3041263 "php source ending is bad" was fixed (all PHP files were updated, including fonts).
-
-5.7.002 (2010-08-06)
-	- Methods copyPage(), movePage() and deletePage() were changed to account for internal markings.
-
-5.7.001 (2010-08-05)
-	- Bug #3040105 "Broken PDF when using TOC (example 45)" was fixed.
-
-5.7.000 (2010-08-03)
-	- CSS borders are now supported for HTML tables and other block tags (see example n. 61);
-	- Cell borders were improved (see example n. 57);
-	- Minor bugs were fixed.
-encry
-------------------------------------------------------------
-
-5.6.000 (2010-07-31)
-	- A bug with object IDs was fixes.
-	- Performances were improved.
-
-------------------------------------------------------------
-
-5.5.015 (2010-07-29)
-	- Automatic fix for unclosed self-closing tag.
-	- Support for deprecated 's' and 'strike' tags was added.
-	- Empty list items problem was fixed.
-
-5.5.014 (2010-07-15)
-	- Support for external images was improved.
-
-5.5.013 (2010-07-14)
-	- Bug #3029338 "FI and FO output destination filename bug" was fixed (previous fix was wrong).
-
-5.5.012 (2010-07-14)
-	- Bug #3029310 "Font baseline inconsistencies with line-height and font-size" was fixed.
-	- Bug #3029338 "FI and FO output destination filename bug" was fixed.
-
-5.5.011 (2010-07-09)
-	- Support for multiple CSS classes was added.
-	- The method getColumn() was added to return the current column number.
-	- Some regular Expressions were fixed to be more compatible with UTF-8.
-
-5.5.010 (2010-07-06)
-	- Bug item #3025772 "Borders in all image functions are still flawed" was fixed.
-
-5.5.009 (2010-07-05)
-	- A problem related to last page footer was fixed.
-	- Image alignments and fit-on-page features were improved.
-
-5.5.008 (2010-07-02)
-	- A problem on table header alignment in booklet mode was fixed.
-	- Default graphic vars are now applied for setHeader();
-
-5.5.007 (2010-07-02)
-	- Attribute "readonly" was added to input and textarea form fields.
-	- Vertical alignment feature was added on MultiCell() method only for simple text mode (see example n. 5).
-	- Text-Fit feature was added on MultiCell() method only for simple text mode (see example n. 5).
-
-5.5.006 (2010-06-29)
-	- getStringHeight() and getNumLines() methods were fixed.
-
-5.5.005 (2010-06-28)
-	- Bug #3022170 "getFontDescent() does not return correct descent value" was fixed.
-	- Some problems with multicolumn mode were fixed.
-
-5.5.004 (2010-06-27)
-	- Bug #3021803 "SVG Border" was fixed.
-
-5.5.003 (2010-06-26)
-	- On Write() method, blank lines at the beginning of a page or column are now automatically removed.
-
-5.5.002 (2010-06-24)
-	- ToUnicode Identity-H name was replaced with a full CMap (to avoid preflight syntax error).
-	- Bug #3020638 "str_split() not available in php4" was fixed.
-	- Bug #3020665 "file_get_contents() too many parameters for php4" was fixed.
-
-5.5.001 (2010-06-23)
-	- A problem on image streams was fixed.
-
-5.5.000 (2010-06-22)
-	- Several PDF syntax errors (and related bugs) were fixed.
-	- Bug #3019090 "/Length values are wrong if AES encryption is used" was fixed.
-
-------------------------------------------------------------
-
-5.4.003 (2010-06-19)
-	- A problem related to page boxes was fixed.
-	- Bug #3016920 "Font subsetting issues when editing pdf" was partially fixed (Note that flattening transparency layers is currently incompatible with TrueTypeUnicode fonts).
-
-5.4.002 (2010-06-18)
-	- A problem related with setProtection() method was fixed.
-
-5.4.001 (2010-06-18)
-	- A problem related with setProtection() method was fixed.
-
-5.4.000 (2010-06-18)
-	- The method setSignatureAppearance() was added, check the example n. 52.
-	- Several problems related to font subsetting were fixed.
-
-------------------------------------------------------------
-
-5.3.010 (2010-06-15)
-	- Previous release was corrupted.
-
-5.3.009 (2010-06-15)
-	- Bug #3015934 "Bullets don't display correctly" was fixed.
-
-5.3.008 (2010-06-13)
-	- This version fixes some problems of SVG rasterization.
-
-5.3.007 (2010-06-13)
-	- This version improves SVG support.
-
-5.3.006 (2010-06-10)
-	- This version includes a change in uniqid calls for backward compatibility with PHP4.
-
-5.3.005 (2010-06-09)
-	- The method getPageSizeFromFormat() was changed to include all standard page formats (includes 281 page formats + variation).
-
-5.3.004 (2010-06-08)
-	- Bug #3013291 "HTML table cell width" was fixed.
-	- Bug #3013294 "HTML table cell alignment" was fixed.
-	- The columns widths of HTML tables are now inherited from the first row.
-
-5.3.003 (2010-06-08)
-	- Bug #3013102 "HTML table header misaligned after page break" was fixed.
-
-5.3.002 (2010-06-07)
-	- The methods setFontSubsetting() and setFontSubsetting() were added to control the default font subsetting mode (see example n. 1).
-	- Bug #3012596 "Whitespace should not appeared after use Thai top characters" was fixed.
-	- Examples n. 1, 14, and 54 were updated.
-
-5.3.001 (2010-06-06)
-	- Barcode PDF417 was improved to support Macro Code Blocks (see example n. 50).
-
-5.3.000 (2010-06-05)
-	- License was changed to GNU-LGPLv3 (see the updated LICENSE.TXT file).
-	- PDF417 barcode support was added (check the example n. 50).
-	- The method write2DBarcode() was improved (some parameters were added and other changed - check example n. 50).
-
-------------------------------------------------------------
-
-5.2.000 (2010-06-02)
-	- IMPORTANT: Support for font subsetting was added by default to reduce the size of documents using large unicode font files.
-		If you embed the whole font in the PDF, the person on the other end can make changes to it even if he didn't have your font.
-		If you subset the font, file size of the PDF will be smaller but the person who receives your PDF would need to have your same font in order to make changes to your PDF.
-	- The signature of the SetFont() and AddFont() methods were changed to include the font subsetting option (subsetting is applied by default).
-	- Examples 14 and 54 were updated.
-
-------------------------------------------------------------
-
-5.1.002 (2010-05-27)
-	- Bug #3007818 "SetAutoPageBreak fails with MultiCell" was fixed.
-	- A bug related to MultiCell() minimun height was fixed.
-
-5.1.001 (2010-05-26)
-	- The problem of blank page after table was fixed.
-
-5.1.000 (2010-05-25)
-	- This version includes support for CSS (Cascading Style Sheets) (see example n. 61).
-	- The convertHTMLColorToDec() method was improved.
-
-------------------------------------------------------------
-
-5.0.014 (2010-05-21)
-	- A problem on color and style of HTML links was fixed.
-	- A bug relative to gradients was fixed.
-	- The getStringHeight() method was added and getNumLines() method was improved.
-	- All examples were updated.
-
-5.0.013 (2010-05-19)
-	- A bug related to page-breaks and table cells was fixed.
-
-5.0.012 (2010-05-19)
-	- Page orientation bug was fixed.
-	- The access to method setPageFormat() was changed to 'protected' because it is not intended to be directly called.
-
-5.0.011 (2010-05-19)
-	- Page orientation bug was fixed.
-	- Bug #3003966 "Multiple columns and nested lists" was fixed.
-
-5.0.010 (2010-05-17)
-	- The methods setPageFormat(), setPageOrientation() and related methods were extended to include page boxes, page rotations and page transitions.
-	- The method setPageBoxes() was added to set page boundaries (MediaBox, CropBox, BleedBox, TrimBox, ArtBox);
-	- A bug relative to underline, overline and linethrough was fixed.
-
-5.0.009 (2010-05-16)
-	- Bug #3002381 "Multiple columns and nested lists" was fixed.
-
-5.0.008 (2010-05-15)
-	- Bug "Columns WriteHTML and Justification" was fixed.
-
-5.0.007 (2010-05-14)
-	- Bug #3001347 "Bug when using  WriteHTML with setEqualColumns()" was fixed.
-	- Bug #3001505 "problem with sup and sub tags at the beginning of a line" was fixed.
-
-5.0.006 (2010-05-13)
-	- Length of hr tag was fixed.
-	- An error on 2d barcode method was fixed.
-
-5.0.005 (2010-05-12)
-	- WARNING: The logic of permissions on the SetProtection() method has been inverted and extended (see example 16). Now you have to specify the features you want to block.
-	- SetProtection() method was extended to support RSA and AES 128 encryption and public-keys (see example 16).
-	- Bug #2999489 "setEqualColumns() and TOC uses wrong columns" was fixed (see the example 10).
-
-5.0.004 (2010-05-10)
-	- HTML line alignment when using sub and sup tags was fixed.
-
-5.0.003 (2010-05-07)
-	- Horizontal alignment was fixed for images and barcodes. Now the X coordinate is always relative to the left margin. Use GetAbsX() instead of GetX() to get the X relative to left margin.
-	- Header() method was changed to account for new image alignment rules.
-
-5.0.002 (2010-05-06)
-	- Bookmark() and related methods were fixed to accept HTML code.
-	- A problem on HTML links was fixed.
-
-5.0.001 (2010-05-06)
-	- Protected method _putstream was re-added for backward compatibility.
-	- The following method were added to display HTML Table Of Content (see example n. 59):
-		addTOCPage(), endTOCPage(), addHTMLTOC().
-
-5.0.000 (2010-05-05)
-	- Method ImageSVG() was added to embedd SVG images (see example n. 58). Note that not all SVG images are supported.
-	- Method setRasterizeVectorImages() was added to enable/disable rasterization for vector images via ImageMagick library.
-	- Method RoundedRectXY() was added.
-	- Method PieSectorXY() was added.
-	- Gradient() method is now public and support new features.
-	- Shading to transparency is now supported.
-	- Image alignments were fixed.
-	- Support for dynamic images were improved.
-	- PDF_IMAGE_SCALE_RATIO has been changed to 1.25 for better compatibility with SVG.
-	- RAW and RAW2 modes were added to 2D Barcodes (see example n. 50).
-	- Automatic padding feature was added on barcodes (see examples n. 27 and 50).
-	- Bug #2995003 "Reproduced thead bug" was fixed.
-	- The Output() method now accepts FI and FD destinations to save the document on server before sending it to the client.
-	- Ellipse() method was improved and fixed (see page 2 of example n. 12).
-
-------------------------------------------------------------
-
-4.9.018 (2010-04-21)
-	- Bug item #2990356 "Current font size not respected with more than two HTML <p>" was fixed.
-
-4.9.017 (2010-04-21)
-	- Bug item #2990224 "Different behaviour for equivalent HTML strings" was fixed.
-	- Bug item #2990314 "Dash is not appearing with SHY character" was fixed.
-
-4.9.016 (2010-04-20)
-	- An error on htmlcolors.php was fixed.
-	- getImageFileType() method was improved.
-	- GIF images with transparency are now better supported.
-	- Automatic page orientation was improved.
-
-4.9.015 (2010-04-20)
-	- A new method copyPage() was added to clone pages (see example n. 44).
-	- Support for text overline was added.
-	- Underline and linethrough methods were fixed.
-	- Bug #2989058 "SHY character causes unnecessary word-wrapping" was fixed.
-
-4.9.014 (2010-04-18)
-	- Bug item #2988845 was fixed.
-
-4.9.013 (2010-04-15)
-	- Image() and ImageEPS() methods were fixed and improved; $fitonpage parameter was added.
-
-4.9.012 (2010-04-12)
-	- The hyphenateText() method was added to automatically hyphenate text (see example n. 46).
-
-4.9.011 (2010-04-07)
-	- Vertical alignments for Cell() method were improved (see example n. 57).
-
-4.9.010 (2010-04-06)
-	- Signature of Cell() method now includes new parameters for vertical alignment (see example n. 57).
-	- Text() method was extended to include all Cell() parameters.
-	- HTML line alignment procedure was changed to fix some bugs.
-
-4.9.009 (2010-04-05)
-	- Text() method was fixed for backward compatibility.
-
-4.9.008 (2010-04-03)
-	- Additional line space after table header was removed.
-	- Support for HTML lists in multicolumn mode was added.
-	- The method setTextRenderingMode() was added to set text rendering modes (see the example n. 26).
-	- The following HTML attributes were added to set text rendering modes (see the example n. 26): stroke, strokecolor, fill.
-
-4.9.007 (2010-04-03)
-	- Font Descent computation was fixed (patch #2981441).
-
-4.9.006 (2010-04-02)
-	- The constant K_TCPDF_CALLS_IN_HTML was added on configuration file to enable/disable the ability to call TCPDF methods in HTML.
-	- The usage of tcpdf tag in HTML mode was changed to remove the possible security flaw offered by the eval() function (thanks to Matthias Hecker for spotting this security problem). See the new example n. 49 for further information.
-
-4.9.005 (2010-04-01)
-	- Bug# 2980354 "Wrong File attachment description with security" was fixed.
-	- Several problems with HTML line alignment were fixed.
-	- The constant K_THAI_TOPCHAR was added on configuration file to enable/disable the special procedure used to avoid the overlappind of symbols on Thai language.
-	- A problem with font name directory was fixed.
-	- A bug on _destroy() method was fixed.
-
-4.9.004 (2010-03-31)
-	- Patch #979681 "GetCharWidth - default character width" was applied (bugfix).
-
-4.9.003 (2010-03-30)
-	- Problem of first <br /> on multiple columns was fixed.
-	- HTML line alignment was fixed.
-	- A QR-code bug was fixed.
-
-4.9.002 (2010-03-29)
-	- Patch #2978349 "$ignore_min_height is ignored in function Cell()" was applied.
-	- Bug #2978607 "2D Barcodes are wrong" was fixed.
-	- A problem with HTML block tags was fixed.
-	- Artificial italic for CID-0 fonts was added.
-	- Several multicolumn bugs were fixed.
-	- Support for HTML tables on multicolumn was added.
-
-4.9.001 (2010-03-28)
-	- QR Code minor bug was fixed.
-	- Multicolumn mode was added (see the new example n. 10).
-	- The following methods were added: setEqualColumns(), setColumnsArray(), selectColumn().
-	- Thai diacritics support were changed (note that this is incompatible with html justification).
-
-4.9.000 (2010-03-27)
-	- QR Code (2D barcode) support was added (see example n. 50).
-	- The following methods were added to print crop and registration marks (see example n. 56): colorRegistrationBar(), cropMark(), registrationMark().
-	- Limited support for CSS line-height property was added.
-	- Gradient method now supports Gray, RGB and CMYK space color.
-	- Example n. 51 was updated.
-	- Vertical alignment of font inside cell was fixed.
-	- Support for multiple Thai diacritics was added.
-	- Bug item #2974929 "Duplicate case values" was fixed.
-	- Bug item #2976729 "File attachment not working with security" was fixed.
-
-------------------------------------------------------------
-
-4.8.039 (2010-03-20)
-	- Problems related to custom locale settings were fixed.
-	- Problems related to HTML on Header and Footer were fixed.
-
-4.8.038 (2010-03-13)
-	- Various bugs related to page-break in HTML mode were fixed.
-	- Bug item #2968974 "Another <thead> pagebreak problem" was fixed.
-	- Bug item #2969276 "justification problem" was fixed.
-	- Bug item #2969289 "bug when using justified text and custom headers" was fixed.
-	- Images are now automatically resized to be contained on the page.
-	- Some HTML line alignments were fixed.
-	- Signature of AddPage() and SetMargins() methods were changed to include an option to set default page margins.
-
-4.8.037 (2010-03-03)
-	- Bug item #2962068 was fixed.
-	- Bug item #2967017 "Problems with <thead> and pagebreaks" was fixed.
-	- Bug item #2967023 "table header lost with pagebreak" was fixed.
-	- Bug item #2967032 "Header lost with nested tables" was fixed.
-
-4.8.036 (2010-02-24)
-	- Automatic page break for HTML images was improved.
-	- Example 10 was updated.
-	- Japanese was removed from example 8 because the freeserif font doesn't contain japanese (you can display it using arialunicid0 font).
-
-4.8.035 (2010-02-23)
-	- Automatic page break for HTML images was added.
-	- Support for multicolumn HTML was added (example 10 was updated).
-
-4.8.034 (2010-02-17)
-	- Language files were updated.
-
-4.8.033 (2010-02-12)
-	- A bug related to protection mode with links was fixed.
-
-4.8.032 (2010-02-04)
-	- A bug related to $maxh parameter on Write() and MultiCell() was fixed.
-	- Support for body tag was added.
-
-4.8.031 (2010-01-30)
-	- Bug item #2941589 "paragraph justify not working on some non-C locales" was fixed.
-
-4.8.030 (2010-01-27)
-	- Some text alignment cases were fixed.
-
-4.8.029 (2010-01-27)
-	- Bug item #2941057 "TOC Error in PDF File Output" was fixed.
-	- Some text alignment cases were fixed.
-
-4.8.028 (2010-01-26)
-	- Text alignment for RTL mode was fixed.
-
-4.8.027 (2010-01-25)
-	- Bug item #2938412 "Table related problems - thead, nobr, table width" was fixed.
-
-4.8.026 (2010-01-19)
-	- The misspelled word "lenght" was replaced with "length" in some variables and comments.
-
-4.8.025 (2010-01-18)
-	- addExtGState() method was improved to reuse existing ExtGState objects.
-
-4.8.024 (2010-01-15)
-	- Justification mode for HTML was fixed (Bug item #2932470).
-
-4.8.023 (2010-01-15)
-	- Bug item #2932470 "Some HTML entities breaks justification" was fixed.
-
-4.8.022 (2010-01-14)
-	- Source code documentation was fixed.
-
-4.8.021 (2010-01-03)
-	- A Bug relative to Table Of Content index was fixed.
-
-4.8.020 (2009-12-21)
-	- Bug item #2918545 "Display problem of the first row of a table with larger font" was fixed.
-	- A Bug relative to table rowspan mode was fixed.
-
-4.8.019 (2009-12-16)
-	- Bug item #2915684 "Image size" was fixed.
-	- Bug item #2914995 "Image jpeg quality" was fixed.
-	- The signature of the Image() method was changed (check the documentation for the $resize parameter).
-
-4.8.018 (2009-12-15)
-	- Bug item #2914352 "write error" was fixed.
-
-4.8.017 (2009-11-27)
-	- THEAD problem when table is used on header/footer was fixed.
-	- A first line alignment on HTML justification was fixed.
-	- Method getImageFileType() was added.
-	- Images with unknown extension and type are now supported via ImageMagick PHP extension.
-
-4.8.016 (2009-11-21)
-	- Document Information Dictionary was fixed.
-	- CSS attributes 'page-break-before', 'page-break-after' and 'page-break-inside' are now supported.
-	- Problem of unclosed last page was fixed.
-	- Problem of 'thead' unnecessarily repeated on the next page was fixed.
-
-4.8.015 (2009-11-20)
-	- A problem with some PNG transparency images was fixed.
-	- Bug #2900762 "Sort issues in Bookmarks" was fixed.
-	- Text justification was fixed for various modes: underline, strikeout and background.
-
-4.8.014 (2009-11-04)
-	- Bug item #2891316 "writeHTML, underlining replacing spaces" was fixed.
-	- The handling of temporary RTL text direction mode was fixed.
-
-4.8.013 (2009-10-26)
-	- Bug item #2884729 "Problem with word-wrap and hyphen" was fixed.
-
-4.8.012 (2009-10-23)
-	- Table cell alignments for RTL booklet mode were fixed.
-	- Images and barcode alignments for booklet mode were fixed.
-
-4.8.011 (2009-10-22)
-	- DejaVu fonts were updated to latest version.
-
-4.8.010 (2009-10-21)
-	- Bookmark for TOC page was added.
-	- Signature of addTOC() method is changed.
-	- Bookmarks are now automatically sorted by page and Y position.
-	- Example n. 45 was updated.
-	- Example n. 55 was added to display all charactes available on core fonts.
-
-4.8.009 (2009-09-30)
-	- Compatibility with PHP 5.3 was improved.
-	- All examples were updated.
-	- Index file for examples was added.
-
-4.8.008 (2009-09-29)
-	- Example 49 was updated.
-	- Underline and linethrough now works with cell stretching mode.
-
-4.8.007 (2009-09-23)
-	- Infinite loop problem caused by nobr attribute was fixed.
-
-4.8.006 (2009-09-23)
-	- Bug item #2864522 "No images if DOCUMENT_ROOT=='/'" was fixed.
-	- Support for text-indent CSS attribute was added.
-	- Method rollbackTransaction() was changed to support self-reassigment of previous object (check source code documentation).
-	- Support for the HTML "nobr" attribute was added to avoid splitting a table or a table row on two pages (i.e.: <tr nobr="true">...</tr>).
-
-4.8.005 (2009-09-17)
-	- A bug relative to multiple transformations and annotations was fixed.
-
-4.8.004 (2009-09-16)
-	- A bug on _putannotsrefs() method was fixed.
-
-4.8.003 (2009-09-15)
-	- Bug item #2858754 "Division by zero" was fixed.
-	- A bug relative to HTML list items was fixed.
-	- A bug relative to form fields on multiple pages was fixed.
-	- PolyLine() method was added (see example n. 12).
-	- Signature of Polygon() method was changed.
-
-4.8.002 (2009-09-12)
-	- A problem related to CID-0 fonts offset was fixed: if the $cw[1] entry on the CID-0 font file is not defined, then a CID keys offset is introduced.
-
-4.8.001 (2009-09-09)
-	- The appearance streams (AP) for anotations form fields was fixed (see examples n. 14 and 54).
-	- Radiobuttons were fixed.
-
-4.8.000 (2009-09-07)
-	- This version includes some support for Forms fields (see example n. 14) and XHTML forms (see example n. 54).
-	- The following methods were changed to work without JavaScript: TextField(), RadioButton(), ListBox(), ComboBox(), CheckBox(), Button().
-	- Support for Widget annotations was improved.
-	- Alignment of annotation objects was fixed (examples 36 and 41 were updated).
-	- addJavascriptObject() method was added.
-	- Signature of Image() method was changed.
-	- htmlcolors.php file was updated.
-
-------------------------------------------------------------
-
-4.7.003 (2009-09-03)
-	- Support for TCPDF methods on HTML was improved (see example n. 49).
-
-4.7.002 (2009-09-02)
-	- Bug item #2848892 "writeHTML + table: Gaps between rows" was fixed.
-	- JavaScript support was fixed (see example n. 53).
-
-4.7.001 (2009-08-30)
-	- The Polygon() and Arrow() methods were fixed and improved (see example n. 12).
-
-4.7.000 (2009-08-29)
-	- This is a major release.
-	- Some procedures were internally optimized.
-	- The problem of mixed signature and annotations was fixed (example n. 52).
-
-4.6.030 (2009-08-29)
-	- IMPORTANT: percentages on table cell widths are now relative to the full table width (as in standard HTML).
-	- Various minor bugs were fixed.
-	- Example n. 52 (digital signature) was updated.
-
-4.6.029 (2009-08-26)
-	- PHP4 version was fixed.
-
-4.6.028 (2009-08-25)
-	- Signature algorithm was finally fixed (see example n. 52).
-
-4.6.027 (2009-08-24)
-	- TCPDF now supports unembedded TrueTypeUnicode Fonts (just comment the $file entry on the fonts' php file.
-
-4.6.026 (2009-08-21)
-	- Bug #2841693 "Problem with MultiCell and ishtml and justification" was fixed.
-	- Signature functions were improved but not yet fixed (tcpdf.crt and example n. 52 were updated).
-
-4.6.025 (2009-08-17)
-	- Carriage returns (\r) were removed from source code.
-	- Problem related to set_magic_quotes_runtime() depracated was fixed.
-
-4.6.024 (2009-08-07)
-	- Bug item #2833556 "justification using other units than mm" was fixed.
-	- Documentation was fixed/updated.
-
-4.6.023 (2009-08-02)
-	- Bug item #2830537 "MirrorH can show mask for transparent PNGs" was fixed.
-
-4.6.022 (2009-07-24)
-	- A bug relative to single line printing when using WriteHTMLCell() was fixed.
-	- Signature support were improved but is still experimental.
-	- Fonts Free and Dejavu were updated to latest versions.
-
-4.6.021 (2009-07-20)
-	- Bug item #2824015 "XHTML Ampersand &amp; in hyperlink bug" was fixed.
-	- Bug item #2824036 "Image as hyperlink in table, text displaced at page break" was fixed.
-	- Links alignment on justified text was fixed.
-	- Unicode "\u" modifier was added to re_spaces variable by default.
-
-4.6.020 (2009-07-16)
-	- Bug item #2821921 "issue in example 18" was fixed.
-	- Signature of SetRTL() method was changed.
-
-4.6.019 (2009-07-13)
-	- Bug item #2820703 "xref table broken" was fixed.
-
-4.6.018 (2009-07-10)
-	- Bug item #2819319 "Text over text" was fixed.
-	- Method Arrow() was added to print graphic arrows (example 12 was updated).
-
-4.6.017 (2009-07-05)
-	- Bug item #2816079 "Example 48 not working" was fixed.
-	- The signature of the checkPageBreak() was changed. The parameter $addpage was added to turn off the automatic page creation.
-
-4.6.016 (2009-06-16)
-	- Method setSpacesRE() was added to set the regular expression used for detecting withespaces or word separators. If you are using chinese, try: setSpacesRE('/[\s\p{Z}\p{Lo}]/');, otherwise you can use setSpacesRE('/[\s\p{Z}]/');
-	- The method _putinfo() now automatically fills the metadata with '?' in case of empty string.
-
-4.6.015 (2009-06-11)
-	- Bug #2804667 "word wrap bug" was fixed.
-
-4.6.014 (2009-06-04)
-	- Bug #2800931 "Table thead tag bug" was fixed.
-	- A bug related to <pre> tag was fixed.
-
-4.6.013 (2009-05-28)
-	- List bullets position was fixed for RTL languages.
-
-4.6.012 (2009-05-23)
-	- setUserRights() method doesn't work anymore unless you call the setSignature() method with the Adobe private key!
-
-4.6.011 (2009-05-18)
-	- Signature of the Image() method was changed to include the new $fitbox parameter (see source code documentation).
-
-4.6.010 (2009-05-17)
-	- Image() method was improved: now is possible to specify the maximum dimensions for a constraint box defined by $w and $h parameters, and setting the $resize parameter to null.
-	- <tcpdf> tag indent problem was fixed.
-	- $y parameter was added to checkPageBreak() method.
-	- Bug n. 2791773 "writeHTML" was fixed.
-
-4.6.009 (2009-05-13)
-	- xref table for embedded files was fixed.
-
-4.6.008 (2009-05-07)
-	- setSignature() method was improved (but is still experimental).
-	- Example n. 52 was added.
-
-4.6.007 (2009-05-05)
-	- Bug #2786685 "writeHtmlCell and <br /> in custom footer" was fixed.
-	- Table header repeating bug was fixed.
-	- Some newlines and tabs are now automatically removed from HTML strings.
-
-4.6.006 (2009-04-28)
-	- Support for "<a name="...">...</a>" was added.
-	- By default TCPDF requires PCRE Unicode support turned on but now works also without it (with limited ability to detect some Unicode blank spaces).
-
-4.6.005 (2009-04-25)
-	- Points (pt) conversion in getHTMLUnitToUnits() was fixed.
-	- Default tcpdf.pem certificate file was added.
-	- Experimental support for signing document was added but it is not yet completed (some help is needed - I think that the calculation of the ByteRange is OK and the problem is on the signature calculation).
-
-4.6.004 (2009-04-23)
-	- Method deletePage() was added to delete pages (see example n. 44).
-
-4.6.003 (2009-04-21)
-	- The caching mechanism of the UTF8StringToArray() method was fixed.
-
-4.6.002 (2009-04-20)
-	- Documentation of rollbackTransaction() method was fixed.
-	- The setImageScale() and getImageScale() methods now set and get the adjusting parameter used by pixelsToUnits() method.
-	- HTML images now support other units of measure than pixels (getHTMLUnitToUnits() is now used instead of pixelsToUnits()).
-	- WARNING: PDF_IMAGE_SCALE_RATIO has been changed by default to 1.
-
-4.6.001 (2009-04-17)
-	- Spaces between HTML block tags are now automatically removed.
-	- The bug related to cMargin changes between tables was fixed.
-
-4.6.000 (2009-04-16)
-	- WARNING: THIS VERSION CHANGES THE BEHAVIOUR OF $x and $y parameters for several TCPDF methods:
-		zero coordinates for $x and $y are now valid coordinates;
-		set $x and $y as empty strings to get the current value.
-	- Some error caused by 'empty' funtion were fixed.
-	- Default color for convertHTMLColorToDec() method was changed to white and the return value for invalid color is false.
-	- HTML on footer bug was fixed.
-	- The following examples were fixed: 5,7,10,17,19,20,21,33,42,43.
-
-4.5.043 (2009-04-15)
-	- Barcode class (barcode.php) was extended to include new linear barcode types (see example n. 27):
-		C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9
-		C39+ : CODE 39 with checksum
-		C39E : CODE 39 EXTENDED
-		C39E+ : CODE 39 EXTENDED + CHECKSUM
-		C93 : CODE 93 - USS-93
-		S25 : Standard 2 of 5
-		S25+ : Standard 2 of 5 + CHECKSUM
-		I25 : Interleaved 2 of 5
-		I25+ : Interleaved 2 of 5 + CHECKSUM
-		C128A : CODE 128 A
-		C128B : CODE 128 B
-		C128C : CODE 128 C
-		EAN2 : 2-Digits UPC-Based Extention
-		EAN5 : 5-Digits UPC-Based Extention
-		EAN8 : EAN 8
-		EAN13 : EAN 13
-		UPCA : UPC-A
-		UPCE : UPC-E
-		MSI : MSI (Variation of Plessey code)
-		MSI+ : MSI + CHECKSUM (modulo 11)
-		POSTNET : POSTNET
-		PLANET : PLANET
-		RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)
-		KIX : KIX (Klant index - Customer index)
-		IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200 (NOTE: requires BCMath PHP extension)
-		CODABAR : CODABAR
-		CODE11 : CODE 11
-		PHARMA : PHARMACODE
-		PHARMA2T : PHARMACODE TWO-TRACKS
-
-4.5.042 (2009-04-15)
-	- Method Write() was fixed for the strings containing only zero value.
-
-4.5.041 (2009-04-14)
-	- Barcode methods were fixed.
-
-4.5.040 (2009-04-14)
-	- Method Write() was fixed to handle empty strings.
-
-4.5.039 (2009-04-11)
-	- Support for linear barcodes was extended (see example n. 27 and barcodes.php documentation).
-
-4.5.038 (2009-04-10)
-	- Write() method was improved to support separators for Japanese, Korean, Chinese Traditional and Chinese Simplified.
-
-4.5.037 (2009-04-09)
-	- General performances were improved.
-	- The signature of the method utf8Bidi() was changed.
-	- The method UniArrSubString() was added.
-	- Experimental support for 2D barcodes were added (see example n. 50 and 2dbarcodes.php class).
-
-4.5.036 (2009-04-03)
-	- TCPDF methods can be called inside the HTML code (see example n. 49).
-	- All tag attributes, such as <p align="center"> must be enclosed within double quotes.
-
-4.5.035 (2009-03-28)
-	- Bug #2717436 "writeHTML rowspan problem (continued)" was fixed.
-	- Bug #2719090 "writeHTML fix follow up" was fixed.
-	- The method _putuserrights() was changed to avoid Adobe Reader 9.1 crash. This broken the 'trick' that was used to display forms in Acrobat Reader.
-
-4.5.034 (2009-03-27)
-	- Bug #2716914 "Bug writeHTML of a table in body and footer related with pb" was fixed.
-	- Bug #2717056 ] "writeHTML problem when setting tr style" was fixed.
-	- The signature of the Cell() method was changed.
-
-4.5.033 (2009-03-27)
-	- The support for rowspan/colspan on HTML tables was improved (see example n. 48).
-
-4.5.032 (2009-03-23)
-	- setPrintFooter(false) bug was fixed.
-
-4.5.031 (2009-03-20)
-	- Table header support was extended to multiple pages.
-
-4.5.030 (2009-03-20)
-	- thead tag is now supported on HTML tables (header rows are repeated after page breaks).
-	- The startTransaction() was improved to autocommit.
-	- List bullets now uses the foreground color (putHtmlListBullet()).
-
-4.5.029 (2009-03-19)
-	- The following methods were added to UNDO commands (see example 47): startTransaction(), commitTransaction(), rollbackTransaction().
-	- All examples were updated.
-
-4.5.028 (2009-03-18)
-	- Bug #2690945 "List Bugs" was fixed.
-	- HTML text alignment on lists was fixed.
-	- The constant PDF_FONT_MONOSPACED was added to the configuration file to define the default monospaced font.
-	- The following methods were fixed: getPageWidth(), getPageHeight(), getBreakMargin().
-	- All examples were updated.
-
-4.5.027 (2009-03-16)
-	- Method getPageDimensions() was added to get page dimensions.
-	- The signature of the following methos were changed: getPageWidth(), getPageHeight(), getBreakMargin().
-	- _parsepng() method was fixed for PNG URL images (fread bug).
-
-4.5.026 (2009-03-11)
-	- Bug #2681793 affecting URL images with spaces was fixed.
-
-4.5.025 (2009-03-10)
-	- A small bug affecting hyphenation support was fixed.
-	- The method SetDefaultMonospacedFont() was added to define the default monospaced font.
-
-4.5.024 (2009-03-07)
-	- The bug #2666493 was fixed "Footer corrupts document".
-
-4.5.023 (2009-03-06)
-	- The bug #2666688 was fixed "Rowspan in tables".
-
-4.5.022 (2009-03-05)
-	- The bug #2659676 was fixed "refer to #2157099 test 4 < BR > problem still not fixed".
-	- addTOC() function bug was fixed.
-
-4.5.020 (2009-03-03)
-	- The following bug was fixed: "function removeSHY corrupts unicode".
-
-4.5.019 (2009-02-28)
-	- The problem of decimal separator using different locale was fixed.
-	- The text hyphenation is now supported (see example n. 46).
-
-4.5.018 (2009-02-26)
-	- The _destroy() method was added to unset all class variables and frees memory.
-	- Now it's possible to call Output() method multiple times.
-
-4.5.017 (2009-02-24)
-	- A minor bug that raises a PHP warning was fixed.
-
-4.5.016 (2009-02-24)
-	- Bug item #2631200 "getNumLines() counts wrong" was fixed.
-	- Multiple attachments bug was fixed.
-	- All class variables are now cleared on Output() for memory otpimization.
-
-4.5.015 (2009-02-18)
-	- Bug item #2612553 "function Write() must not break a line on &nbsp;  character" was fixed.
-
-4.5.014 (2009-02-13)
-	- Bug item #2595015 "POSTNET Barcode Checksum Error" was fixed (on barcode.php).
-	- Pagebreak bug for barcode was fixed.
-
-4.5.013 (2009-02-12)
-	- border attribute is now supported on HTML images (only accepts the same values accepted by Cell()).
-
-4.5.012 (2009-02-12)
-	- An error on image border feature was fixed.
-
-4.5.011 (2009-02-12)
-	- HTML links for images are now supported.
-	- height attribute is now supported on HTML cells.
-	- $border parameter was added to Image() and ImageEps() methods.
-	- The method getNumLines() was added to estimate the number of lines required for the specified text.
-
-4.5.010 (2009-01-29)
-	- Bug n. 2546108 "BarCode Y position" was fixed.
-
-4.5.009 (2009-01-26)
-	- Bug n. 2538094 "Empty pdf file created" was fixed.
-
-4.5.008 (2009-01-26)
-	- setPage() method was fixed to correctly restore graphic states.
-	- Source code was cleaned up for performances.
-
-4.5.007 (2009-01-24)
-	- checkPageBreak() and write1DBarcode() methods were fixed.
-	- Source code was cleaned up for performances.
-	- barcodes.php was updated.
-
-4.5.006 (2009-01-23)
-	- getHTMLUnitToPoints() method was replaced by getHTMLUnitToUnits() to fix HTML units bugs.
-
-4.5.005 (2009-01-23)
-	- Page closing bug was fixed.
-
-4.5.004 (2009-01-21)
-	- The access of convertHTMLColorToDec() method was changed to public
-	- Fixed bug on UL tag.
-
-4.5.003 (2009-01-19)
-	- Fonts on different folders are now supported.
-
-4.5.002 (2009-01-07)
-	- addTOC() function was improved (see example n. 45).
-
-4.5.001 (2009-01-04)
-	- The signature of startPageGroup() function was changed.
-	- Method Footer() was improved to automatically print page or page-group number (see example n. 23).
-	- Protected method formatTOCPageNumber() was added to customize the format of page numbers on the Table Of Content.
-	- The signature of addTOC() was changed to include the font used for page numbers.
-
-4.5.000 (2009-01-03)
-	- A new $diskcache parameter was added to class constructor to enable disk caching and reduce RAM memory usage (see example n. 43).
-	- The method movePageTo() was added to move pages to previous positions (see example n. 44).
-	- The methods getAliasNumPage() and getPageNumGroupAlias() were added to get the alias for page number (needed when using movepageTo()).
-	- The methods addTOC() was added to print a Table Of Content (see example n. 45).
-	- Imagick class constant was removed for better compatibility with PHP4.
-	- All existing examples were updated and new examples were added.
-
-4.4.009 (2008-12-29)
-	- Examples 1 and 35 were fixed.
-
-4.4.008 (2008-12-28)
-	- Bug #2472169 "Unordered bullet size not adjusted for unit type" was fixed.
-
-4.4.007 (2008-12-23)
-	- Bug #2459935 "no unit conversion for header line" was fixed.
-	- Example n. 42 for image alpha channel was added.
-	- All examples were updated.
-
-4.4.006 (2008-12-11)
-	- Method setLIsymbol() was changed to reflect latest changes in HTML list handling.
-
-4.4.005 (2008-12-10)
-	- Bug item #2413870 "ordered list override value" was fixed.
-
-4.4.004 (2008-12-10)
-	- The protected method getHTMLUnitToPoints() was added to accept various HTML units of measure (em, ex, px, in, cm, mm, pt, pc, %).
-	- The method intToRoman() was added to convert integer number to Roman representation.
-	- Support fot HTML lists was improved: the CSS property list-style-type is now supported.
-
-4.4.003 (2008-12-09)
-	- Bug item #2412147 "Warning on line 3367" was fixed.
-	- Method setHtmlLinksStyle() was added to set default HTML link colors and font style.
-	- Method addHtmlLink() was changed to use color and style defined on the inline CSS.
-
-4.4.002 (2008-12-09)
-	- Borders on Multicell() were fixed.
-	- Problem of Multicell() on Header function (Bug item #2407579) was fixed.
-	- Problem on graphics tranformations applied to Multicell() was fixed.
-	- Support for ImageMagick was added.
-	- Width calculation for nested tables was fixed.
-
-4.4.001 (2008-12-08)
-	- Some missing core fonts were added on fonts directory.
-	- CID0 fonts rendering was fixed.
-	- HTML support was improved (<pre> and <tt> tags are now supported).
-	- Bug item #2406022 "Left padding bug in MultiCell with maxh" was fixed.
-
-4.4.000 (2008-12-07)
-	- File attachments are now supported (see example n. 41).
-	- Font functions were optimized to reduce document size.
-	- makefont.php was updated.
-	- Linux binaries were added on /fonts/utils
-	- All fonts were updated.
-	- $autopadding parameter was added to Multicell() to disable automatic padding features.
-	- $maxh parameter was added to Multicell() and Write() to set a maximum height.
-
-4.3.009 (2008-12-05)
-	- Bug item #2392989 (Custom header + setlinewidth + cell border bug) was fixed.
-
-4.3.008 (2008-12-05)
-	- Bug item #2390566 "rect bug" was fixed.
-	- File path was fixed for font embedded files.
-	- SetFont() method signature was changed to include the font filename.
-	- Some font-related methods were improved.
-	- Methods getFontFamily() and getFontStyle() were added.
-
-4.3.007 (2008-12-03)
-	- PNG alpha channel is now supported (GD library is required).
-	- AddFont() function now support custom font file path on $file parameter.
-	- The default width variable ($dw) is now always defined for any font.
-	- The 'Style' attribute on CID-0 fonts was removed because of protection bug.
-
-4.3.006 (2008-12-01)
-	- A regular expression on getHtmlDomArray() to find HTML tags was fixed.
-
-4.3.005 (2008-11-25)
-	- makefont.php was fixed.
-	- Bug item #2339877 was fixed (false loop condition detected on WriteHTML()).
-	- Bug item #2336733 was fixed (lasth value update on Multicell() when border and fill are disabled).
-	- Bug item #2342303 was fixed (automatic page-break on Image() and ImageEPS()).
-
-4.3.004 (2008-11-19)
-	- Function _textstring() was fixed (bug 2309051).
-	- All examples were updated.
-
-4.3.003 (2008-11-18)
-	- CID-0 font bug was fixed.
-	- Some functions were optimized.
-	- Function getGroupPageNoFormatted() was added.
-	- Example n. 23 was updated.
-
-4.3.002 (2008-11-17)
-	- Bug item #2305518 "CID-0 font don't work with encryption" was fixed.
-
-4.3.001 (2008-11-17)
-	- Bug item #2300007 "download mimetype pdf" was fixed.
-	- Double quotes were replaced by single quotes to improve PHP performances.
-	- A bug relative to HTML cell borders was fixed.
-
-4.3.000 (2008-11-14)
-	- The function setOpenCell() was added to set the top/bottom cell sides to be open or closed when the cell cross the page.
-	- A bug relative to list items indentation was fixed.
-	- A bug relative to borders on HTML tables and Multicell was fixed.
-	- A bug relative to rowspanned cells was fixed.
-	- A bug relative to html images across pages was fixed.
-
-4.2.009 (2008-11-13)
-	- Spaces between li tags are now automatically removed.
-
-4.2.008 (2008-11-12)
-	- A bug relative to fill color on next page was fixed.
-
-4.2.007 (2008-11-12)
-	- The function setListIndentWidth() was added to set custom indentation widht for HTML lists.
-
-4.2.006 (2008-11-06)
-	- A bug relative to HTML justification was fixed.
-
-4.2.005 (2008-11-06)
-	- A bug relative to HTML justification was fixed.
-	- The methods formatPageNumber() and PageNoFormatted() were added to format page numbers.
-	- Default Footer() method was changed to use PageNoFormatted() instead of PageNo().
-	- Example 6 was updated.
-
-4.2.004 (2008-11-04)
-	- Bug item n. 2217039 "filename handling improvement" was fixed.
-
-4.2.003 (2008-10-31)
-	- Font style bug was fixed.
-
-4.2.002 (2008-10-31)
-	- Bug item #2210922 (htm element br not work) was fixed.
-	- Write() function was improved to support margin changes.
-
-4.2.001 (2008-10-30)
-	- setHtmlVSpace($tagvs) function was added to set custom vertical spaces for HTML tags.
-	- writeHTML() function now support margin changes during execution.
-	- Signature of addHTMLVertSpace() function is changed.
-
-4.2.000 (2008-10-29)
-	- htmlcolors.php was changed to support class-loaders.
-	- ImageEps() function was improved in performances.
-	- Signature of Link() And Annotation() functions were changed.
-	- (Bug item #2198926) Links and Annotations alignment were fixed (support for geometric tranformations was added).
-	- rowspan mode for HTML table cells was improved and fixed.
-	- Booklet mode for double-sided pages was added; see SetBooklet() function and example n. 40.
-	- lastPage() signature is changed.
-	- Signature of Write() function is changed.
-	- Some HTML justification problems were fixed.
-	- Some functions were fixed to better support RTL mode.
-	- Example n. 10 was changed to support RTL mode.
-	- All examples were updated.
-
-4.1.004 (2008-10-23)
-	- unicode_data.php was changed to support class-loaders.
-	- Bug item #2186040/2 (writeHTML margin problem) was fixed.
-
-4.1.003 (2008-10-22)
-	- Bug item #2185399 was fixed (rowspan and page break).
-	- Bugs item #2186040 was fixed (writeHTML margin problem).
-	- Newline after table was removed.
-
-4.1.002 (2008-10-21)
-	- Bug item #2184525 was fixed (rowspan on HTML cell).
-
-4.1.001 (2008-10-21)
-	- Support for "start" attribute was added to HTML ordered list.
-	- unicode_data.php file was changed to include UTF-8 to ASCII table.
-	- Some functions were modified to better support UTF-8 extensions to core fonts.
-	- Support for images on HTML lists was improved.
-	- Examples n. 1 and 6 were updated.
-
-4.1.000 (2008-10-18)
-	- Page-break bug using HTML content was fixed.
-	- The "false" parameter was reintroduced to class_exists function on PHP5 version to avoid autoload.
-	- addHtmlLink() function was improved to support internal links (i.e.: <a href="#23">link to page 23</a>).
-	- Justification alignment is now supported on HTML (see example n. 39).
-	- example_006.php was updated.
-
-4.0.033 (2008-10-13)
-	- Bug n. 2157099 was fixed.
-	- SetX() and SetY() functions were improved.
-	- SetY() includes a new parameter to avoid the X reset.
-
-4.0.032 (2008-10-10)
-	- Bug n. 2156926 was fixed (bold, italic, underlined, linethrough).
-	- setStyle() method was removed.
-	- Configuration file was changed to use helvetica (non-unicode) font by default.
-	- The use of mixed font types was improved.
-	- All examples were updated.
-
-4.0.031 (2008-10-09)
-	- _putannots() and _putbookmarks() links alignments were fixed.
-
-4.0.030 (2008-10-07)
-	- _putbookmarks() function was fixed.
-	- _putannots() was fixed to include internal links.
-
-4.0.029 (2008-09-27)
-	- Infinite loop bug was fixed [Bug item #130309].
-	- Multicell() problem on Header() was fixed.
-
-4.0.028 (2008-09-26)
-	- setLIsymbol() was added to set the LI symbol used on UL lists.
-	- Missing $padding and $encryption_key variables declarations were added [Bug item #2129058].
-
-4.0.027 (2008-09-19)
-	- Bug #2118588 "Undefined offset in tcpdf.php on line 9581" was fixed.
-	- arailunicid0.php font was updated.
-	- The problem of javascript form fields duplication after saving was fixed.
-
-4.0.026 (2008-09-17)
-	- convertHTMLColorToDec() function was improved to support rgb(RR,GG,BB) notation.
-	- The following inline CSS attributes are now supported: text-decoration, color, background-color and font-size names: xx-small, x-small, small, medium, large, x-large, xx-large
-	- Example n. 6 was updated.
-
-4.0.025 (2008-09-15)
-	- _putcidfont0 function was improved to include CJK fonts (Chinese, Japanese, Korean, CJK, Asian fonts) without embedding.
-	- arialunicid0 font was added (see the new example n. 38).
-	- The following Unicode to CID-0 tables were added on fonts folder: uni2cid_ak12.php, uni2cid_aj16.php, uni2cid_ag15.php, uni2cid_ac15.php.
-
-4.0.024 (2008-09-12)
-	- "stripos" function was replaced with "strpos + strtolower" for backward compatibility with PHP4.
-	- support for Spot Colors were added. Check the new example n. 37 and the following new functions:
-		AddSpotColor()
-		SetDrawSpotColor()
-		SetFillSpotColor()
-		SetTextSpotColor()
-		_putspotcolors()
-	- Bookmark() function was improved to fix wrong levels.
-	- $lasth changes after header/footer calls were fixed.
-
-4.0.023 (2008-09-05)
-	- Some HTML related problems were fixed.
-	- Image alignment on HTML was changed, now it always defaults to the normal mode (see example_006.php).
-
-4.0.022 (2008-08-28)
-	- Line height on HTML was fixed.
-	- Image inside an HTML cell problem was fixed.
-	- A new "zarbold" persian font was added.
-
-4.0.021 (2008-08-24)
-	- HTTP headers were fixed on Output function().
-	- getAliasNbPages() and getPageGroupAlias() functions were changed to support non-unicode fonts on unicode documents.
-	- Function Write() was fixed.
-	- The problem of additional vertical spaces on HTML was fixed.
-	- The problem of frame around HTML links was fixed.
-
-4.0.020 (2008-08-15)
-	- "[2052259] WriteHTML <u> & <b>" bug was fixed.
-
-4.0.019 (2008-08-13)
-	- "Rowspan on first cell" bug was fixed.
-
-4.0.018 (2008-08-08)
-	- Default cellpadding for HTML tables was fixed.
-	- Annotation() function was added to support some PDF annotations (see example_036.php and section 8.4 of PDF reference 1.7).
-	- HTML links are now correclty shifted during line alignments.
-	- function getAliasNbPages() was added and Footer() was updated.
-	- RowSpan mode for HTML tables was fixed.
-	- Bugs item #2043610 "Multiple sizes vertical align wrong" was fixed.
-	- ImageEPS() function was improved and RTL alignment was fixed (see example_032.php).
-
-4.0.017 (2008-08-05)
-	- Missing CNZ and CEO style modes were added to Rect() function.
-	- Fonts utils were updated to include support for OpenType fonts.
-	- getLastH() function was added.
-
-4.0.016 (2008-07-30)
-	- setPageMark() function was added. This function must be called after calling Image() function for a background image.
-
-4.0.015 (2008-07-29)
-	- Some functions were changed to support different page formats (see example_028.php).
-	- The signature of setPage() function is changed.
-
-4.0.014 (2008-07-29)
-	- K_PATH_MAIN calculation on tcpdf_config.php was fixed.
-	- HTML support for EPS/AI images was added (see example_006.php).
-	- Bugs item #2030807 "Truncated text on multipage html fields" was fixed.
-	- PDF header bug was fixed.
-	- helvetica was added as default font family.
-	- Stroke mode was fixed on Text function.
-	- several minor bugs were fixed.
-
-4.0.013 (2008-07-27)
-	- Bugs item #2027799 " Big spaces between lines after page break" was fixed.
-	- K_PATH_MAIN calculation on tcpdf_config.php was changed.
-	- Function setVisibility() was fixed to avoid the "Incorrect PDEObject type" error message.
-
-4.0.012 (2008-07-24)
-	- Addpage(), Header() and Footer() functions were changed to simplify the implementation of external header/footer functions.
-	- The following functions were added:
-			setHeader()
-			setFooter()
-			getImageRBX()
-			getImageRBY()
-			getCellHeightRatio()
-			getHeaderFont()
-			getFooterFont()
-			getRTL()
-			getBarcode()
-			getHeaderData()
-			getHeaderMargin()
-			getFooterMargin()
-
-4.0.011 (2008-07-23)
-	- Font support was improved.
-	- The folder /fonts/utils contains new utilities and instructions for embedd font files.
-	- Documentation was updated.
-
-4.0.010 (2008-07-22)
-	- HTML tables were fixed to work across pages.
-	- Header() and Footer() functions were updated to preserve previous settings.
-	- example_035.php was added.
-
-4.0.009 (2008-07-21)
-	- UTF8StringToArray() function was fixed for non-unicode mode.
-
-4.0.008 (2008-07-21)
-	- Barcodes alignment was fixed (see example_027.php).
-	- unicode_data.php was updated.
-	- Arabic shaping for "Zero-Width Non-Joiner" character (U+200C) was fixed.
-
-4.0.007 (2008-07-18)
-	- str_split was replaced by preg_split for compatibility with PHP4 version.
-	- Clipping mode was added to all graphic functions by using parameter $style = "CNZ" or "CEO" (see example_034.php).
-
-4.0.006 (2008-07-16)
-	- HTML rowspan bug was fixed.
-	- Line style for MultiCell() was fixed.
-	- WriteHTML() function was improved.
-	- CODE128C barcode was fixed (barcodes.php).
-
-4.0.005 (2008-07-11)
-	- Bug [2015715] "PHP Error/Warning" was fixed.
-
-4.0.004 (2008-07-09)
-	- HTML cell internal padding was fixed.
-
-4.0.003 (2008-07-08)
-	- Removed URL encoding when F option is selected on Output() function.
-	- fixed some minor bugs in html tables.
-
-4.0.002 (2008-07-07)
-	- Bug [2000861] was still unfixed and has been fixed.
-
-4.0.001 (2008-07-05)
-	- Bug [2000861] was fixed.
-
-4.0.000 (2008-07-03)
-	- THIS IS A MAIN RELEASE THAT INCLUDES SEVERAL NEW FEATURES AND BUGFIXES
-	- Signature fo SetTextColor() and SetFillColor() functions was changed (parameter $storeprev was removed).
-	- HTML support was completely rewritten and improved (see example 6).
-	- Alignments parameters were fixed.
-	- Functions GetArrStringWidth() and GetStringWidth() now include font parameters.
-	- Fonts support was improved.
-	- All core fonts were replaced and moved to fonts/ directory.
-	- The following functions were added: getMargins(), getFontSize(), getFontSizePt().
-	- File config/tcpdf_config_old.php was renamed tcpdf_config_alt.php and updated.
-	- Multicell and WriteHTMLCell fill function was fixed.
-	- Several minor bugs were fixed.
-	- barcodes.php was updated.
-	- All examples were updated.
-
-------------------------------------------------------------
-
-3.1.001 (2008-06-13)
-	- Bug [1992515] "K_PATH_FONTS default value wrong" was fixed.
-	- Vera font was removed, DejaVu font and Free fonts were updated.
-	- Image handling was improved.
-	- All examples were updated.
-
-3.1.000 (2008-06-11)
-	- setPDFVersion() was added to change the default PDF version (currently 1.7).
-	- setViewerPreferences() was added to control the way the document is to be presented on the screen or printed (see example 29).
-	- SetDisplayMode() signature was changed (new options were added).
-	- LinearGradient(), RadialGradient(), CoonsPatchMesh() functions were added to print various color gradients (see example 30).
-	- PieSector() function was added to render render pie charts (see example 31).
-	- ImageEps() was added to display EPS and AI images with limited support (see example 32).
-	- writeBarcode() function is now depracated, a new write1DBarcode() function was added. The barcode directory was removed and a new barcodes.php file was added.
-	- The new write1DBarcode() function support more barcodes and do not need the GD library (see example 027). All barcodes are directly written to PDF using graphic functions.
-	- HTML lists were improved and could be nested (you may now represent trees).
-	- AddFont() bug was fixed.
-	- _putfonts() bug was fixed.
-	- graphics functions were fixed.
-	- unicode_data.php file was updated (fixed).
-	- almohanad font was updated.
-	- example 18 was updated (Farsi and Arabic languages).
-	- source code cleanup.
-	- All examples were updated and new examples were added.
-
-3.0.015 (2008-06-06)
-	- AddPage() function signature is changed to include page format.
-	- example 28 was added to show page format changes.
-	- setPageUnit() function was added to change the page units of measure.
-	- setPageFormat() function was added to change the page format and orientation between pages.
-	- setPageOrientation() function was added to change the page orientation.
-	- Arabic font shaping was fixed for laa letter and square boxes (see the example 18).
-
-3.0.014 (2008-06-04)
-	- Arabic font shaping was fixed.
-	- setDefaultTableColumns() function was added.
-	- $cell_height_ratio variable was added.
-	- setCellHeightRatio() function was added to define the default height of cell repect font height.
-
-3.0.013 (2008-06-03)
-	- Multicell height parameter was fixed.
-	- Arabic font shaping was improved.
-	- unicode_data.php was updated.
-
-3.0.012 (2008-05-30)
-	- K_PATH_MAIN and K_PATH_URL constants are now automatically set on config file.
-	- DOCUMENT_ROOT constant was fixed for IIS Webserver (config file was updated).
-	- Arabic font shaping was improved.
-	- TranslateY() function was fixed (bug [1977962]).
-	- setVisibility() function was fixed.
-	- writeBarcode() function was fixed to scale using $xref parameter.
-	- All examples were updated.
-
-3.0.011 (2008-05-23)
-	- CMYK color support was added to all graphic functions.
-	- HTML table support was improved:
-	  -- now it's possible to include additional html tags inside a cell;
-	  -- colspan attribute was added.
-	- example 006 was updated.
-
-3.0.010 (2008-05-21)
-	- fixed $laa_array inclusion on utf8Bidi() function.
-
-3.0.009 (2008-05-20)
-	- unicode_data.php was updated.
-	- Arabic laa letter problem was fixed.
-
-3.0.008 (2008-05-12)
-	- Arabic support was fixed and improved (unicode_data.php was updated).
-	- Polycurve() function was added to draw a poly-Bezier curve.
-	- list items alignment was fixed.
-	- example 6 was updated.
-
-3.0.007 (2008-05-06)
-	- Arabic support was fixed and improved.
-	- AlMohanad (arabic) font was added.
-	- C128 barcode bugs were fixed.
-
-3.0.006 (2008-04-21)
-	- Condition to check negative width values was added.
-
-3.0.005 (2008-04-18)
-	- back-Slash character escape was fixed on writeHTML() function.
-	- Exampe 6 was updated.
-
-3.0.004 (2008-04-11)
-	- Bug [1939304] (Right to Left Issue) was fixed.
-
-3.0.003 (2008-04-07)
-	- Bug [1934523](Words between HTML tags in cell not kept on one line) was fixed.
-	- "face" attribute of "font" tag is now fully supported.
-
-3.0.002 (2008-04-01)
-	- Write() functions now return the number of cells and not the number of lines.
-	- TCPDF is released under LGPL 2.1, or any later version.
-
-3.0.001 (2008-05-28)
-	- _legacyparsejpeg() and _legacyparsepng() were renamed _parsejpeg() and _parsepng().
-	- function writeBarcode() was fixed.
-	- all examples were updated.
-	- example 27 was added to show various barcodes.
-
-3.0.000 (2008-03-27)
-	- private function pixelsToMillimeters() was changed to public function pixelsToUnits() to fix html image size bug.
-	- Image-related functions were rewritten.
-	- resize parameter was added to Image() signature to reduce the image size and fit width and height (see example 9).
-	- TCPDF now supports all images supported by GD library: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM.
-	- CMYK support was added to SetDrawColor(), SetFillColor(), SetTextColor() (see example 22).
-	- Page Groups were added (see example 23).
-	- setVisibility() function was added to restrict the rendering of some elements to screen or printout (see example 24).
-	- All private variables and functions were changed to protected.
-	- setAlpha() function was added to give transparency support for all objects (see example 25).
-	- Clipping and stroke modes were added to Text() function (see example 26).
-	- All examples were moved to "examples" directory.
-	- function setJPEGQuality() was added to set the JPEG image comrpession (see example 9).
-
-2.9.000 (2008-03-26)
-	- htmlcolors.php file was added to include html colors.
-	- Support for HTML color names and three-digit hexadecimal color codes was added.
-	- private function convertColorHexToDec() was renamed convertHTMLColorToDec().
-	- color and bgcolor attributes are now supported on all HTML tags (color nesting is also supported).
-	- Write() function were fixed.
-	- example_006.php was updated.
-	- private function setUserRights() was added to release user rights on Acrobat Reader (this allows to display forms, see example 14)
-
-2.8.000 (2008-03-20)
-	- Private variables were changed to protected.
-	- Function Write() was fixed and improved.
-	- Support for dl, dt, dd, del HTML tags was introduced.
-	- Line-trought mode was added for HTML and text.
-	- Text vertical alignment on cells were fixed.
-	- Examples were updated to reflect changes.
-
-2.7.002 (2008-03-13)
-	- Bug "[1912142] Encrypted PDF created/modified date" was fixed.
-
-2.7.001 (2008-03-10)
-	- Cell justification was fixed for non-unicode mode.
-
-2.7.000 (2008-03-09)
-	- Cell() stretching mode 4 (forced character spacing) was fixed.
-	- writeHTMLCell() now uses Multicell() to write.
-	- Multicell() has a new parameter $ishtml to act as writeHTMLCell().
-	- Write() speed was improved for non-arabic strings.
-	- Example n. 20 was changed.
-
-2.6.000 (2008-03-07)
-	- various alignments bugs were fixed.
-
-2.5.000 (2008-03-07)
-	- Several bugs were fixed.
-	- example_019.php was added to test non-unicode mode using old fonts.
-
-2.4.000 (2008-03-06)
-	- RTL support was deeply improved.
-	- GetStringWidth() was fixed to support RTL languages.
-	- Text() RTL alignment was fixed.
-	- Some functions were added: GetArrStringWidth(), GetCharWidth(), uniord(), utf8Bidi().
-	- example_018.php was added and test_unicode.php was removed.
-
-2.3.000 (2008-03-05)
-	- MultiCell() signature is changed. Now support multiple columns across pages (see example_017).
-	- Write() signature is changed. Now support the cell mode to be used with MultiCell.
-	- Header() and Footer() were changed.
-	- The following functions were added: UTF8ArrSubString() and unichr().
-	- Examples were updated to reflect last changes.
-
-2.2.004 (2008-03-04)
-	- Several examples were added.
-	- AddPage() Header() and Footer() were fixed.
-	- Documentation is now available on http://www.tcpdf.org
-
-2.2.003 (2008-03-03)
-	- [1894853] Performance of MultiCell() was improved.
-	- RadioButton and ListBox functions were added.
-	- javascript form functions were rewritten and properties names are changed. The properties function supported by form fields are listed on Possible values are listed on http://www.adobe.com/devnet/acrobat/pdfs/js_developer_guide.pdf.
-
-2.2.002 (2008-02-28)
-	- [1900495] html images path was fixed.
-	- Legacy image functions were reintroduced to allow PNG and JPEG support without GD library.
-
-2.2.001 (2008-02-16)
-	- The bug "[1894700] bug with replace relative path" was fixed
-	- Justification was fixed
-
-2.2.000 (2008-02-12)
-	- fixed javascript bug introduced with latest release
-
-2.1.002 (2008-02-12)
-	- Justify function was fixed on PHP4 version.
-	- Bookmank function was added ([1578250] Table of contents).
-	- Javascript and Form fields support was added ([1796359] Form fields).
-
-2.1.001 (2008-02-10)
-	- The bug "[1885776] Race Condition in function justitfy" was fixed.
-	- The bug "[1890217] xpdf complains that pdf is incorrect" was fixed.
-
-2.1.000 (2008-01-07)
-	- FPDF_FONTPATH constant was changed to K_PATH_FONTS on config file
-	- Bidirectional Algorithm to correctly reverse bidirectional languages was added.
-	- SetLeftMargin, SetTopMargin, SetRightMargin functions were fixed.
-	- SetCellPadding function was added.
-	- writeHTML was updated with new parameters.
-	- Text function was fixed.
-	- MultiCell function was fixed, now works also across multiple pages.
-	- Line width was fixed on Header and Footer functions and <hr> tag.
-	- "GetImageSize" was renamed "getimagesize".
-	- Document version was changed from 1.3 to 1.5.
-	- _begindoc() function was fixed.
-	- ChangeDate was fixed and ModDate was added.
-	- The following functions were added:
-	  setPage() : Move pointer to the specified document page.
-	  getPage() : Get current document page number.
-	  lastpage() : Reset pointer to the last document page.
-	  getNumPages() : Get the total number of inserted pages.
-	  GetNumChars() : count the number of (UTF-8) characters in a string.
-	- $stretch parameter was added to Cell() function to fit text on cell:
-			0 = disabled
-			1 = horizontal scaling only if necessary
-			2 = forced horizontal scaling
-			3 = character spacing only if necessary
-			4 = forced character spacing
-	- Line function was fixed for RTL.
-	- Graphic transformation functions were added [1811158]:
-			StartTransform()
-			StopTransform()
-			ScaleX()
-			ScaleY()
-			ScaleXY()
-			Scale()
-			MirrorH()
-			MirrorV()
-			MirrorP()
-			MirrorL()
-			TranslateX()
-			TranslateY()
-			Translate()
-			Rotate()
-			SkewX()
-			SkewY()
-			Skew()
-	- Graphic function were added/updated [1688549]:
-			SetLineStyle()
-			_outPoint()
-			_outLine()
-			_outRect()
-			_outCurve()
-			Line()
-			Rect()
-			Curve
-			Ellipse
-			Circle
-			Polygon
-			RegularPolygon
-
-2.0.000 (2008-01-04)
-	- RTL (Right-To-Left) languages support was added. Language direction is set using the $l['a_meta_dir'] setting on /configure/language/xxx.php language files.
-	- setRTL($enable) method was added to manually enable/disable the RTL text direction.
-	- The attribute "dir" was added to support custom text direction on HTML tags. Possible values are: ltr - for Left-To-Right and RTL for Right-To-Left.
-	- RC4 40bit encryption was added. Check the SetProtection method.
-	- [1815213] Improved image support for GIF, JPEG, PNG formats.
-	- [1800094] Attribute "value" was added to ordered list items <li>.
-	- Image function now has a new "align" parameter that indicates the alignment of the pointer next to image insertion and relative to image height. The value can be:
-			T: top-right for LTR or top-left for RTL
-			M: middle-right for LTR or middle-left for RTL
-			B: bottom-right for LTR or bottom-left for RTL
-			N: next line
-	- Attribute "align" was added to <img> html tag to set the above image "align" parameter. Possible values are:
-			top: top-right for LTR or top-left for RTL
-			middle: middle-right for LTR or middle-left for RTL
-			bottom: bottom-right for LTR or bottom-left for RTL
-	- [1798103] newline was added after </ul>, </ol> and </p> tages.
-	- [1816393] Documentation was updated.
-	- 'ln' parameter was fixed on writeHTMLCell. Now it's possible to print two or more columns across several pages;
-	- The method lastPage() was added to move the pointer on the last page;
-
-------------------------------------------------------------
-
-1.53.0.TC034 (2007-07-30)
-	- fixed htmlentities conversion.
-	- MultiCell() function returns the number of cells.
-
-1.53.0.TC033 (2007-07-30)
-	- fixed bug 1762550: case sensitive for font files
-	- NOTE: all fonts files names must be in lowercase!
-
-1.53.0.TC032 (2007-07-27)
-	- setLastH method was added to resolve bug 1689071.
-	- all fonts names were converted in lowercase (bug 1713005).
-	- bug 1740954 was fixed.
-	- justification was added as Cell option.
-
-1.53.0.TC031 (2007-03-20)
-	- ToUnicode CMap were added on _puttruetypeunicode function. Now you may search and copy unicode text.
-
-1.53.0.TC030 (2007-03-06)
-	- fixed bug on PHP4 version.
-
-1.53.0.TC029 (2007-03-06)
-	- DejaVu Fonts were added.
-
-1.53.0.TC028 (2007-03-03)
-	- MultiCell function signature were changed: the $ln parameter were added. Check documentation for further information.
-	- Greek language were added on example sentences.
-	- setPrintHeader() and setPrintFooter() functions were added to enable or disable page header and footer.
-
-1.53.0.TC027 (2006-12-14)
-	- $attr['face'] bug were fixed.
-	- K_TCPDF_EXTERNAL_CONFIG control where introduced on /config/tcpdf_config.php to use external configuration files.
-
-1.53.0.TC026 (2006-10-28)
-	- writeHTML function call were fixed on examples.
-
-1.53.0.TC025 (2006-10-27)
-	- Bugs item #1421290 were fixed (0D - 0A substitution in some characters)
-	- Bugs item #1573174 were fixed (MultiCell documentation)
-
-1.53.0.TC024 (2006-09-26)
-	- getPageHeight() function were fixed (bug 1543476).
-	- fixed missing breaks on closedHTMLTagHandler function (bug 1535263).
-	- fixed extra spaces on Write function (bug 1535262).
-
-1.53.0.TC023 (2006-08-04)
-	- paths to barcode directory were fixed.
-	- documentation were updated.
-
-1.53.0.TC022 (2006-07-16)
-	- fixed bug: [ 1516858 ] Probs with PHP autoloader and class_exists()
-
-1.53.0.TC021 (2006-07-01)
-	- HTML attributes with whitespaces are now supported (thanks to Nelson Benitez for his support)
-
-1.53.0.TC020 (2006-06-23)
-	- code cleanup
-
-1.53.0.TC019 (2006-05-21)
-	- fixed <strong> and <em> closing tags
-
-1.53.0.TC018 (2006-05-18)
-	- fixed font names bug
-
-1.53.0.TC017 (2006-05-18)
-	- the TTF2UFM utility to convert True Type fonts for TCPDF were included on fonts folder.
-	- new free unicode fonts were included on /fonts/freefont.
-	- test_unicode.php example were exended.
-	- parameter $fill were added on Write, writeHTML and writeHTMLCell functions.
-	- documentation were updated.
-
-1.53.0.TC016 (2006-03-09)
-	- fixed closing <strong> tag on html parser.
-
-1.53.0.TC016 (2005-08-28)
-	- fpdf.php and tcpdf.php files were joined in one single class (you can still extend TCPDF with your own class).
-	- fixed problem when mb_internal_encoding is set.
-
-1.53.0.TC014 (2005-05-29)
-	- fixed WriteHTMLCell new page issue.
-
-1.53.0.TC013 (2005-05-29)
-	- fixed WriteHTMLCell across pages.
-
-1.53.0.TC012 (2005-05-29)
-	- font color attribute bug were fixed.
-
-1.53.0.TC011 (2005-03-31)
-	- SetFont function were fixed (thank Sjaak Lauwers for bug notice).
-
-1.53.0.TC010 (2005-03-22)
-	- the html functions were improved (thanks to Manfred Vervuert for bug reporting).
-
-1.53.0.TC009 (2005-03-19)
-	- a wrong reference to convertColorHexToDec were fixed.
-
-1.53.0.TC008 (2005-02-07)
-	- removed some extra bytes from PHP files.
-
-1.53.0.TC007 (2005-01-08)
-	- fill attribute were removed from writeHTMLCell method.
-
-1.53.0.TC006 (2005-01-08)
-	- the documentation were updated.
-
-1.53.0.TC005 (2005-01-05)
-	- Steven Wittens's unicode methods were removed.
-	- All unicode methods were rewritten from scratch.
-	- TCPDF is now licensed as LGPL.
-
-1.53.0.TC004 (2005-01-04)
-	- this changelog were added.
-	- removed commercial fonts for licensing issue.
-	- Bitstream Vera Fonts were added (http://www.bitstream.com/font_rendering/products/dev_fonts/vera.html).
-	- Now the AddFont and SetFont functions returns the basic font if the styled version do not exist.
-
-EOF --------------------------------------------------------
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/LICENSE.TXT b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/LICENSE.TXT
deleted file mode 100644
index daf21f7d3eb..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/LICENSE.TXT
+++ /dev/null
@@ -1,858 +0,0 @@
-**********************************************************************
-* TCPDF LICENSE
-**********************************************************************
-
-  TCPDF is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
-
-**********************************************************************
-**********************************************************************
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-**********************************************************************
-**********************************************************************
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-**********************************************************************
-**********************************************************************
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/README.TXT b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/README.TXT
deleted file mode 100644
index 65dd26cc1fb..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/README.TXT
+++ /dev/null
@@ -1,86 +0,0 @@
-TCPDF - README
-============================================================
-
-I WISH TO IMPROVE AND EXPAND TCPDF BUT I NEED YOUR SUPPORT.
-PLEASE MAKE A DONATION:
-http://sourceforge.net/donate/index.php?group_id=128076
-
-------------------------------------------------------------
-
-Name: TCPDF
-Version: 5.9.009
-Release date: 2010-10-21
-Author:	Nicola Asuni
-
-Copyright (c) 2002-2010:
-	Nicola Asuni
-	Tecnick.com s.r.l.
-	Via Della Pace, 11
-	09044 Quartucciu (CA)
-	ITALY
-	www.tecnick.com
-
-URLs:
-	http:  www.tcpdf.org
-	http:  www.sourceforge.net/projects/tcpdf
-
-Description:
-	TCPDF is a PHP class for generating PDF files on-the-fly without requiring external extensions.
-
-Main Features:
-    * no external libraries are required for the basic functions;
-    * all standard page formats, custom page formats, custom margins and units of measure;
-    * UTF-8 Unicode and Right-To-Left languages;
-    * TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
-    * font subsetting;
-    * methods to publish some XHTML + CSS code, Javascript and Forms;
-    * images, graphic (geometric figures) and transformation methods;
-    * supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http:  www.imagemagick.org/www/formats.html)
-    * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code, PDF417;
-    * Grayscale, RGB, CMYK, Spot Colors and Transparencies;
-    * automatic page header and footer management;
-    * document encryption up to 256 bit and digital signature certifications;
-    * transactions to UNDO commands;
-    * PDF annotations, including links, text and file attachments;
-    * text rendering modes (fill, stroke and clipping);
-    * multiple columns mode;
-    * no-write page regions;
-    * bookmarks and table of content;
-    * text hyphenation;
-    * text stretching and spacing (tracking/kerning);
-    * automatic page break, line break and text alignments including justification;
-    * automatic page numbering and page groups;
-    * move and delete pages;
-    * page compression (requires php-zlib extension);
-    * XOBject Templates;
-
-Installation (full instructions on http:  www.tcpdf.org):
-	1. copy the folder on your Web server
-	2. set your installation path and other parameters on the config/tcpdf_config.php
-	3. call the examples/example_001.php page with your browser to see an example
-
-Source Code Documentation:
-	doc/index.html
-
-For Additional Documentation:
-	http:  www.tcpdf.org
-
-License
-	Copyright (C) 2002-2010  Nicola Asuni - Tecnick.com S.r.l.
-
-	TCPDF is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Lesser General Public License as
-	published by the Free Software Foundation, either version 3 of the
-	License, or (at your option) any later version.
-
-	TCPDF 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-
-	See LICENSE.TXT file for more information.
-
-============================================================
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/barcodes.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/barcodes.php
deleted file mode 100644
index 4efb7a47ccd..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/barcodes.php
+++ /dev/null
@@ -1,1969 +0,0 @@
-<?php
-//============================================================+
-// File name   : barcodes.php
-// Version     : 1.0.011
-// Begin       : 2008-06-09
-// Last Update : 2010-08-08
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2008-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : PHP class to creates array representations for
-//               common 1D barcodes to be used with TCPDF.
-//
-//============================================================+
-
-/**
- * PHP class to creates array representations for common 1D barcodes to be used with TCPDF.
- * @package com.tecnick.tcpdf
- * @abstract Functions for generating string representation of common 1D barcodes.
- * @author Nicola Asuni
- * @copyright 2008-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.011
- */
-
-	/**
-	* PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
-	* @name TCPDFBarcode
-	* @package com.tecnick.tcpdf
-	* @version 1.0.011
-	* @author Nicola Asuni
-	* @link http://www.tcpdf.org
-	* @license http://www.gnu.org/copyleft/lesser.html LGPL
-	*/
-class TCPDFBarcode {
-
-	/**
-	 * @var array representation of barcode.
-	 * @access protected
-	 */
-	protected $barcode_array;
-
-	/**
-	 * This is the class constructor.
-	 * Return an array representations for common 1D barcodes:<ul>
-	 * <li>$arrcode['code'] code to be printed on text label</li>
-	 * <li>$arrcode['maxh'] max bar height</li>
-	 * <li>$arrcode['maxw'] max bar width</li>
-	 * <li>$arrcode['bcode'][$k] single bar or space in $k position</li>
-	 * <li>$arrcode['bcode'][$k]['t'] bar type: true = bar, false = space.</li>
-	 * <li>$arrcode['bcode'][$k]['w'] bar width in units.</li>
-	 * <li>$arrcode['bcode'][$k]['h'] bar height in units.</li>
-	 * <li>$arrcode['bcode'][$k]['p'] bar top position (0 = top, 1 = middle)</li></ul>
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
-	 */
-	public function __construct($code, $type) {
-		$this->setBarcode($code, $type);
-	}
-
-	/**
-	 * Return an array representations of barcode.
- 	 * @return array
-	 */
-	public function getBarcodeArray() {
-		return $this->barcode_array;
-	}
-
-	/**
-	 * Set the barcode.
-	 * @param string $code code to print
- 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
- 	 * @return array
-	 */
-	public function setBarcode($code, $type) {
-		switch (strtoupper($type)) {
-			case 'C39': { // CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.
-				$arrcode = $this->barcode_code39($code, false, false);
-				break;
-			}
-			case 'C39+': { // CODE 39 with checksum
-				$arrcode = $this->barcode_code39($code, false, true);
-				break;
-			}
-			case 'C39E': { // CODE 39 EXTENDED
-				$arrcode = $this->barcode_code39($code, true, false);
-				break;
-			}
-			case 'C39E+': { // CODE 39 EXTENDED + CHECKSUM
-				$arrcode = $this->barcode_code39($code, true, true);
-				break;
-			}
-			case 'C93': { // CODE 93 - USS-93
-				$arrcode = $this->barcode_code93($code);
-				break;
-			}
-			case 'S25': { // Standard 2 of 5
-				$arrcode = $this->barcode_s25($code, false);
-				break;
-			}
-			case 'S25+': { // Standard 2 of 5 + CHECKSUM
-				$arrcode = $this->barcode_s25($code, true);
-				break;
-			}
-			case 'I25': { // Interleaved 2 of 5
-				$arrcode = $this->barcode_i25($code, false);
-				break;
-			}
-			case 'I25+': { // Interleaved 2 of 5 + CHECKSUM
-				$arrcode = $this->barcode_i25($code, true);
-				break;
-			}
-			case 'C128A': { // CODE 128 A
-				$arrcode = $this->barcode_c128($code, 'A');
-				break;
-			}
-			case 'C128B': { // CODE 128 B
-				$arrcode = $this->barcode_c128($code, 'B');
-				break;
-			}
-			case 'C128C': { // CODE 128 C
-				$arrcode = $this->barcode_c128($code, 'C');
-				break;
-			}
-			case 'EAN2': { // 2-Digits UPC-Based Extention
-				$arrcode = $this->barcode_eanext($code, 2);
-				break;
-			}
-			case 'EAN5': { // 5-Digits UPC-Based Extention
-				$arrcode = $this->barcode_eanext($code, 5);
-				break;
-			}
-			case 'EAN8': { // EAN 8
-				$arrcode = $this->barcode_eanupc($code, 8);
-				break;
-			}
-			case 'EAN13': { // EAN 13
-				$arrcode = $this->barcode_eanupc($code, 13);
-				break;
-			}
-			case 'UPCA': { // UPC-A
-				$arrcode = $this->barcode_eanupc($code, 12);
-				break;
-			}
-			case 'UPCE': { // UPC-E
-				$arrcode = $this->barcode_eanupc($code, 6);
-				break;
-			}
-			case 'MSI': { // MSI (Variation of Plessey code)
-				$arrcode = $this->barcode_msi($code, false);
-				break;
-			}
-			case 'MSI+': { // MSI + CHECKSUM (modulo 11)
-				$arrcode = $this->barcode_msi($code, true);
-				break;
-			}
-			case 'POSTNET': { // POSTNET
-				$arrcode = $this->barcode_postnet($code, false);
-				break;
-			}
-			case 'PLANET': { // PLANET
-				$arrcode = $this->barcode_postnet($code, true);
-				break;
-			}
-			case 'RMS4CC': { // RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)
-				$arrcode = $this->barcode_rms4cc($code, false);
-				break;
-			}
-			case 'KIX': { // KIX (Klant index - Customer index)
-				$arrcode = $this->barcode_rms4cc($code, true);
-				break;
-			}
-			case 'IMB': { // IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
-				$arrcode = $this->barcode_imb($code);
-				break;
-			}
-			case 'CODABAR': { // CODABAR
-				$arrcode = $this->barcode_codabar($code);
-				break;
-			}
-			case 'CODE11': { // CODE 11
-				$arrcode = $this->barcode_code11($code);
-				break;
-			}
-			case 'PHARMA': { // PHARMACODE
-				$arrcode = $this->barcode_pharmacode($code);
-				break;
-			}
-			case 'PHARMA2T': { // PHARMACODE TWO-TRACKS
-				$arrcode = $this->barcode_pharmacode2t($code);
-				break;
-			}
-			default: {
-				$this->barcode_array = false;
-				$arrcode = false;
-				break;
-			}
-		}
-		$this->barcode_array = $arrcode;
-	}
-
-	/**
-	 * CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.
-	 * General-purpose code in very wide use world-wide
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_code39($code, $extended=false, $checksum=false) {
-		$chr['0'] = '111221211';
-		$chr['1'] = '211211112';
-		$chr['2'] = '112211112';
-		$chr['3'] = '212211111';
-		$chr['4'] = '111221112';
-		$chr['5'] = '211221111';
-		$chr['6'] = '112221111';
-		$chr['7'] = '111211212';
-		$chr['8'] = '211211211';
-		$chr['9'] = '112211211';
-		$chr['A'] = '211112112';
-		$chr['B'] = '112112112';
-		$chr['C'] = '212112111';
-		$chr['D'] = '111122112';
-		$chr['E'] = '211122111';
-		$chr['F'] = '112122111';
-		$chr['G'] = '111112212';
-		$chr['H'] = '211112211';
-		$chr['I'] = '112112211';
-		$chr['J'] = '111122211';
-		$chr['K'] = '211111122';
-		$chr['L'] = '112111122';
-		$chr['M'] = '212111121';
-		$chr['N'] = '111121122';
-		$chr['O'] = '211121121';
-		$chr['P'] = '112121121';
-		$chr['Q'] = '111111222';
-		$chr['R'] = '211111221';
-		$chr['S'] = '112111221';
-		$chr['T'] = '111121221';
-		$chr['U'] = '221111112';
-		$chr['V'] = '122111112';
-		$chr['W'] = '222111111';
-		$chr['X'] = '121121112';
-		$chr['Y'] = '221121111';
-		$chr['Z'] = '122121111';
-		$chr['-'] = '121111212';
-		$chr['.'] = '221111211';
-		$chr[' '] = '122111211';
-		$chr['$'] = '121212111';
-		$chr['/'] = '121211121';
-		$chr['+'] = '121112121';
-		$chr['%'] = '111212121';
-		$chr['*'] = '121121211';
-
-		$code = strtoupper($code);
-		if ($extended) {
-			// extended mode
-			$code = $this->encode_code39_ext($code);
-		}
-		if ($code === false) {
-			return false;
-		}
-		if ($checksum) {
-			// checksum
-			$code .= $this->checksum_code39($code);
-		}
-		// add start and stop codes
-		$code = '*'.$code.'*';
-
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$char = $code{$i};
-			if(!isset($chr[$char])) {
-				// invalid character
-				return false;
-			}
-			for ($j = 0; $j < 9; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $chr[$char]{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-			$bararray['bcode'][$k] = array('t' => false, 'w' => 1, 'h' => 1, 'p' => 0);
-			$bararray['maxw'] += 1;
-			++$k;
-		}
-		return $bararray;
-	}
-
-	/**
-	 * Encode a string to be used for CODE 39 Extended mode.
-	 * @param string $code code to represent.
-	 * @return encoded string.
-	 * @access protected
-	 */
-	protected function encode_code39_ext($code) {
-		$encode = array(
-			chr(0) => '%U', chr(1) => '$A', chr(2) => '$B', chr(3) => '$C',
-			chr(4) => '$D', chr(5) => '$E', chr(6) => '$F', chr(7) => '$G',
-			chr(8) => '$H', chr(9) => '$I', chr(10) => '$J', chr(11) => '£K',
-			chr(12) => '$L', chr(13) => '$M', chr(14) => '$N', chr(15) => '$O',
-			chr(16) => '$P', chr(17) => '$Q', chr(18) => '$R', chr(19) => '$S',
-			chr(20) => '$T', chr(21) => '$U', chr(22) => '$V', chr(23) => '$W',
-			chr(24) => '$X', chr(25) => '$Y', chr(26) => '$Z', chr(27) => '%A',
-			chr(28) => '%B', chr(29) => '%C', chr(30) => '%D', chr(31) => '%E',
-			chr(32) => ' ', chr(33) => '/A', chr(34) => '/B', chr(35) => '/C',
-			chr(36) => '/D', chr(37) => '/E', chr(38) => '/F', chr(39) => '/G',
-			chr(40) => '/H', chr(41) => '/I', chr(42) => '/J', chr(43) => '/K',
-			chr(44) => '/L', chr(45) => '-', chr(46) => '.', chr(47) => '/O',
-			chr(48) => '0', chr(49) => '1', chr(50) => '2', chr(51) => '3',
-			chr(52) => '4', chr(53) => '5', chr(54) => '6', chr(55) => '7',
-			chr(56) => '8', chr(57) => '9', chr(58) => '/Z', chr(59) => '%F',
-			chr(60) => '%G', chr(61) => '%H', chr(62) => '%I', chr(63) => '%J',
-			chr(64) => '%V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C',
-			chr(68) => 'D', chr(69) => 'E', chr(70) => 'F', chr(71) => 'G',
-			chr(72) => 'H', chr(73) => 'I', chr(74) => 'J', chr(75) => 'K',
-			chr(76) => 'L', chr(77) => 'M', chr(78) => 'N', chr(79) => 'O',
-			chr(80) => 'P', chr(81) => 'Q', chr(82) => 'R', chr(83) => 'S',
-			chr(84) => 'T', chr(85) => 'U', chr(86) => 'V', chr(87) => 'W',
-			chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => '%K',
-			chr(92) => '%L', chr(93) => '%M', chr(94) => '%N', chr(95) => '%O',
-			chr(96) => '%W', chr(97) => '+A', chr(98) => '+B', chr(99) => '+C',
-			chr(100) => '+D', chr(101) => '+E', chr(102) => '+F', chr(103) => '+G',
-			chr(104) => '+H', chr(105) => '+I', chr(106) => '+J', chr(107) => '+K',
-			chr(108) => '+L', chr(109) => '+M', chr(110) => '+N', chr(111) => '+O',
-			chr(112) => '+P', chr(113) => '+Q', chr(114) => '+R', chr(115) => '+S',
-			chr(116) => '+T', chr(117) => '+U', chr(118) => '+V', chr(119) => '+W',
-			chr(120) => '+X', chr(121) => '+Y', chr(122) => '+Z', chr(123) => '%P',
-			chr(124) => '%Q', chr(125) => '%R', chr(126) => '%S', chr(127) => '%T');
-		$code_ext = '';
-		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
-			if (ord($code{$i}) > 127) {
-				return false;
-			}
-			$code_ext .= $encode[$code{$i}];
-		}
-		return $code_ext;
-	}
-
-	/**
-	 * Calculate CODE 39 checksum (modulo 43).
-	 * @param string $code code to represent.
-	 * @return char checksum.
-	 * @access protected
-	 */
-	protected function checksum_code39($code) {
-		$chars = array(
-			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
-			'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
-			'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%');
-		$sum = 0;
-		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
-			$k = array_keys($chars, $code{$i});
-			$sum += $k[0];
-		}
-		$j = ($sum % 43);
-		return $chars[$j];
-	}
-
-	/**
-	 * CODE 93 - USS-93
-	 * Compact code similar to Code 39
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_code93($code) {
-		$chr['0'] = '131112';
-		$chr['1'] = '111213';
-		$chr['2'] = '111312';
-		$chr['3'] = '111411';
-		$chr['4'] = '121113';
-		$chr['5'] = '121212';
-		$chr['6'] = '121311';
-		$chr['7'] = '111114';
-		$chr['8'] = '131211';
-		$chr['9'] = '141111';
-		$chr['A'] = '211113';
-		$chr['B'] = '211212';
-		$chr['C'] = '211311';
-		$chr['D'] = '221112';
-		$chr['E'] = '221211';
-		$chr['F'] = '231111';
-		$chr['G'] = '112113';
-		$chr['H'] = '112212';
-		$chr['I'] = '112311';
-		$chr['J'] = '122112';
-		$chr['K'] = '132111';
-		$chr['L'] = '111123';
-		$chr['M'] = '111222';
-		$chr['N'] = '111321';
-		$chr['O'] = '121122';
-		$chr['P'] = '131121';
-		$chr['Q'] = '212112';
-		$chr['R'] = '212211';
-		$chr['S'] = '211122';
-		$chr['T'] = '211221';
-		$chr['U'] = '221121';
-		$chr['V'] = '222111';
-		$chr['W'] = '112122';
-		$chr['X'] = '112221';
-		$chr['Y'] = '122121';
-		$chr['Z'] = '123111';
-		$chr['-'] = '121131';
-		$chr['.'] = '311112';
-		$chr[' '] = '311211';
-		$chr['$'] = '321111';
-		$chr['/'] = '112131';
-		$chr['+'] = '113121';
-		$chr['%'] = '211131';
-		$chr[128] = '121221'; // ($)
-		$chr[129] = '311121'; // (/)
-		$chr[130] = '122211'; // (+)
-		$chr[131] = '312111'; // (%)
-		$chr['*'] = '111141';
-		$code = strtoupper($code);
-		$encode = array(
-			chr(0) => chr(131).'U', chr(1) => chr(128).'A', chr(2) => chr(128).'B', chr(3) => chr(128).'C',
-			chr(4) => chr(128).'D', chr(5) => chr(128).'E', chr(6) => chr(128).'F', chr(7) => chr(128).'G',
-			chr(8) => chr(128).'H', chr(9) => chr(128).'I', chr(10) => chr(128).'J', chr(11) => '£K',
-			chr(12) => chr(128).'L', chr(13) => chr(128).'M', chr(14) => chr(128).'N', chr(15) => chr(128).'O',
-			chr(16) => chr(128).'P', chr(17) => chr(128).'Q', chr(18) => chr(128).'R', chr(19) => chr(128).'S',
-			chr(20) => chr(128).'T', chr(21) => chr(128).'U', chr(22) => chr(128).'V', chr(23) => chr(128).'W',
-			chr(24) => chr(128).'X', chr(25) => chr(128).'Y', chr(26) => chr(128).'Z', chr(27) => chr(131).'A',
-			chr(28) => chr(131).'B', chr(29) => chr(131).'C', chr(30) => chr(131).'D', chr(31) => chr(131).'E',
-			chr(32) => ' ', chr(33) => chr(129).'A', chr(34) => chr(129).'B', chr(35) => chr(129).'C',
-			chr(36) => chr(129).'D', chr(37) => chr(129).'E', chr(38) => chr(129).'F', chr(39) => chr(129).'G',
-			chr(40) => chr(129).'H', chr(41) => chr(129).'I', chr(42) => chr(129).'J', chr(43) => chr(129).'K',
-			chr(44) => chr(129).'L', chr(45) => '-', chr(46) => '.', chr(47) => chr(129).'O',
-			chr(48) => '0', chr(49) => '1', chr(50) => '2', chr(51) => '3',
-			chr(52) => '4', chr(53) => '5', chr(54) => '6', chr(55) => '7',
-			chr(56) => '8', chr(57) => '9', chr(58) => chr(129).'Z', chr(59) => chr(131).'F',
-			chr(60) => chr(131).'G', chr(61) => chr(131).'H', chr(62) => chr(131).'I', chr(63) => chr(131).'J',
-			chr(64) => chr(131).'V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C',
-			chr(68) => 'D', chr(69) => 'E', chr(70) => 'F', chr(71) => 'G',
-			chr(72) => 'H', chr(73) => 'I', chr(74) => 'J', chr(75) => 'K',
-			chr(76) => 'L', chr(77) => 'M', chr(78) => 'N', chr(79) => 'O',
-			chr(80) => 'P', chr(81) => 'Q', chr(82) => 'R', chr(83) => 'S',
-			chr(84) => 'T', chr(85) => 'U', chr(86) => 'V', chr(87) => 'W',
-			chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => chr(131).'K',
-			chr(92) => chr(131).'L', chr(93) => chr(131).'M', chr(94) => chr(131).'N', chr(95) => chr(131).'O',
-			chr(96) => chr(131).'W', chr(97) => chr(130).'A', chr(98) => chr(130).'B', chr(99) => chr(130).'C',
-			chr(100) => chr(130).'D', chr(101) => chr(130).'E', chr(102) => chr(130).'F', chr(103) => chr(130).'G',
-			chr(104) => chr(130).'H', chr(105) => chr(130).'I', chr(106) => chr(130).'J', chr(107) => chr(130).'K',
-			chr(108) => chr(130).'L', chr(109) => chr(130).'M', chr(110) => chr(130).'N', chr(111) => chr(130).'O',
-			chr(112) => chr(130).'P', chr(113) => chr(130).'Q', chr(114) => chr(130).'R', chr(115) => chr(130).'S',
-			chr(116) => chr(130).'T', chr(117) => chr(130).'U', chr(118) => chr(130).'V', chr(119) => chr(130).'W',
-			chr(120) => chr(130).'X', chr(121) => chr(130).'Y', chr(122) => chr(130).'Z', chr(123) => chr(131).'P',
-			chr(124) => chr(131).'Q', chr(125) => chr(131).'R', chr(126) => chr(131).'S', chr(127) => chr(131).'T');
-		$code_ext = '';
-		$clen = strlen($code);
-		for ($i = 0 ; $i < $clen; ++$i) {
-			if (ord($code{$i}) > 127) {
-				return false;
-			}
-			$code_ext .= $encode[$code{$i}];
-		}
-		// checksum
-		$code .= $this->checksum_code93($code);
-		// add start and stop codes
-		$code = '*'.$code.'*';
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$char = $code{$i};
-			if(!isset($chr[$char])) {
-				// invalid character
-				return false;
-			}
-			for ($j = 0; $j < 6; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $chr[$char]{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		$bararray['bcode'][$k] = array('t' => true, 'w' => 1, 'h' => 1, 'p' => 0);
-		$bararray['maxw'] += 1;
-		++$k;
-		return $bararray;
-	}
-
-	/**
-	 * Calculate CODE 93 checksum (modulo 47).
-	 * @param string $code code to represent.
-	 * @return string checksum code.
-	 * @access protected
-	 */
-	protected function checksum_code93($code) {
-		$chars = array(
-			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
-			'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
-			'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%');
-		// translate special characters
-		$code = strtr($code, chr(128).chr(129).chr(130).chr(131), '$/+%');
-		$len = strlen($code);
-		// calculate check digit C
-		$p = 1;
-		$check = 0;
-		for ($i = ($len - 1); $i >= 0; --$i) {
-			$k = array_keys($chars, $code{$i});
-			$check += ($k[0] * $p);
-			++$p;
-			if ($p > 20) {
-				$p = 1;
-			}
-		}
-		$check %= 47;
-		$c = $chars[$check];
-		$code .= $c;
-		// calculate check digit K
-		$p = 1;
-		$check = 0;
-		for ($i = $len; $i >= 0; --$i) {
-			$k = array_keys($chars, $code{$i});
-			$check += ($k[0] * $p);
-			++$p;
-			if ($p > 15) {
-				$p = 1;
-			}
-		}
-		$check %= 47;
-		$k = $chars[$check];
-		return $c.$k;
-	}
-
-	/**
-	 * Checksum for standard 2 of 5 barcodes.
-	 * @param string $code code to process.
-	 * @return int checksum.
-	 * @access protected
-	 */
-	protected function checksum_s25($code) {
-		$len = strlen($code);
-		$sum = 0;
-		for ($i = 0; $i < $len; $i+=2) {
-			$sum += $code{$i};
-		}
-		$sum *= 3;
-		for ($i = 1; $i < $len; $i+=2) {
-			$sum += ($code{$i});
-		}
-		$r = $sum % 10;
-		if($r > 0) {
-			$r = (10 - $r);
-		}
-		return $r;
-	}
-
-	/**
-	 * MSI.
-	 * Variation of Plessey code, with similar applications
-	 * Contains digits (0 to 9) and encodes the data only in the width of bars.
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code (modulo 11)
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_msi($code, $checksum=false) {
-		$chr['0'] = '100100100100';
-		$chr['1'] = '100100100110';
-		$chr['2'] = '100100110100';
-		$chr['3'] = '100100110110';
-		$chr['4'] = '100110100100';
-		$chr['5'] = '100110100110';
-		$chr['6'] = '100110110100';
-		$chr['7'] = '100110110110';
-		$chr['8'] = '110100100100';
-		$chr['9'] = '110100100110';
-		$chr['A'] = '110100110100';
-		$chr['B'] = '110100110110';
-		$chr['C'] = '110110100100';
-		$chr['D'] = '110110100110';
-		$chr['E'] = '110110110100';
-		$chr['F'] = '110110110110';
-		if ($checksum) {
-			// add checksum
-			$clen = strlen($code);
-			$p = 2;
-			$check = 0;
-			for ($i = ($clen - 1); $i >= 0; --$i) {
-				$check += (hexdec($code{$i}) * $p);
-				++$p;
-				if ($p > 7) {
-					$p = 2;
-				}
-			}
-			$check %= 11;
-			if ($check > 0) {
-				$check = 11 - $check;
-			}
-			$code .= $check;
-		}
-		$seq = '110'; // left guard
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$digit = $code{$i};
-			if (!isset($chr[$digit])) {
-				// invalid character
-				return false;
-			}
-			$seq .= $chr[$digit];
-		}
-		$seq .= '1001'; // right guard
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-
-	/**
-	 * Standard 2 of 5 barcodes.
-	 * Used in airline ticket marking, photofinishing
-	 * Contains digits (0 to 9) and encodes the data only in the width of bars.
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_s25($code, $checksum=false) {
-		$chr['0'] = '10101110111010';
-		$chr['1'] = '11101010101110';
-		$chr['2'] = '10111010101110';
-		$chr['3'] = '11101110101010';
-		$chr['4'] = '10101110101110';
-		$chr['5'] = '11101011101010';
-		$chr['6'] = '10111011101010';
-		$chr['7'] = '10101011101110';
-		$chr['8'] = '10101110111010';
-		$chr['9'] = '10111010111010';
-		if ($checksum) {
-			// add checksum
-			$code .= $this->checksum_s25($code);
-		}
-		if((strlen($code) % 2) != 0) {
-			// add leading zero if code-length is odd
-			$code = '0'.$code;
-		}
-		$seq = '11011010';
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$digit = $code{$i};
-			if (!isset($chr[$digit])) {
-				// invalid character
-				return false;
-			}
-			$seq .= $chr[$digit];
-		}
-		$seq .= '1101011';
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-
-	/**
-	 * Convert binary barcode sequence to TCPDF barcode array
-	 * @param string $seq barcode as binary sequence
-	 * òparam array $bararray TCPDF barcode array to fill up
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function binseq_to_array($seq, $bararray) {
-		$len = strlen($seq);
-		$w = 0;
-		$k = 0;
-		for ($i = 0; $i < $len; ++$i) {
-			$w += 1;
-			if (($i == ($len - 1)) OR (($i < ($len - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
-				if ($seq{$i} == '1') {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-				$w = 0;
-			}
-		}
-		return $bararray;
-	}
-
-	/**
-	 * Interleaved 2 of 5 barcodes.
-	 * Compact numeric code, widely used in industry, air cargo
-	 * Contains digits (0 to 9) and encodes the data in the width of both bars and spaces.
-	 * @param string $code code to represent.
-	 * @param boolean $checksum if true add a checksum to the code
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_i25($code, $checksum=false) {
-		$chr['0'] = '11221';
-		$chr['1'] = '21112';
-		$chr['2'] = '12112';
-		$chr['3'] = '22111';
-		$chr['4'] = '11212';
-		$chr['5'] = '21211';
-		$chr['6'] = '12211';
-		$chr['7'] = '11122';
-		$chr['8'] = '21121';
-		$chr['9'] = '12121';
-		$chr['A'] = '11';
-		$chr['Z'] = '21';
-		if ($checksum) {
-			// add checksum
-			$code .= $this->checksum_s25($code);
-		}
-		if((strlen($code) % 2) != 0) {
-			// add leading zero if code-length is odd
-			$code = '0'.$code;
-		}
-		// add start and stop codes
-		$code = 'AA'.strtolower($code).'ZA';
-
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; $i = ($i + 2)) {
-			$char_bar = $code{$i};
-			$char_space = $code{$i+1};
-			if((!isset($chr[$char_bar])) OR (!isset($chr[$char_space]))) {
-				// invalid character
-				return false;
-			}
-			// create a bar-space sequence
-			$seq = '';
-			$chrlen = strlen($chr[$char_bar]);
-			for ($s = 0; $s < $chrlen; $s++){
-				$seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s};
-			}
-			$seqlen = strlen($seq);
-			for ($j = 0; $j < $seqlen; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;
-	}
-
-	/**
-	 * C128 barcodes.
-	 * Very capable code, excellent density, high reliability; in very wide use world-wide
-	 * @param string $code code to represent.
-	 * @param string $type barcode type: A, B or C
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_c128($code, $type='B') {
-		$chr = array(
-			'212222', /* 00 */
-			'222122', /* 01 */
-			'222221', /* 02 */
-			'121223', /* 03 */
-			'121322', /* 04 */
-			'131222', /* 05 */
-			'122213', /* 06 */
-			'122312', /* 07 */
-			'132212', /* 08 */
-			'221213', /* 09 */
-			'221312', /* 10 */
-			'231212', /* 11 */
-			'112232', /* 12 */
-			'122132', /* 13 */
-			'122231', /* 14 */
-			'113222', /* 15 */
-			'123122', /* 16 */
-			'123221', /* 17 */
-			'223211', /* 18 */
-			'221132', /* 19 */
-			'221231', /* 20 */
-			'213212', /* 21 */
-			'223112', /* 22 */
-			'312131', /* 23 */
-			'311222', /* 24 */
-			'321122', /* 25 */
-			'321221', /* 26 */
-			'312212', /* 27 */
-			'322112', /* 28 */
-			'322211', /* 29 */
-			'212123', /* 30 */
-			'212321', /* 31 */
-			'232121', /* 32 */
-			'111323', /* 33 */
-			'131123', /* 34 */
-			'131321', /* 35 */
-			'112313', /* 36 */
-			'132113', /* 37 */
-			'132311', /* 38 */
-			'211313', /* 39 */
-			'231113', /* 40 */
-			'231311', /* 41 */
-			'112133', /* 42 */
-			'112331', /* 43 */
-			'132131', /* 44 */
-			'113123', /* 45 */
-			'113321', /* 46 */
-			'133121', /* 47 */
-			'313121', /* 48 */
-			'211331', /* 49 */
-			'231131', /* 50 */
-			'213113', /* 51 */
-			'213311', /* 52 */
-			'213131', /* 53 */
-			'311123', /* 54 */
-			'311321', /* 55 */
-			'331121', /* 56 */
-			'312113', /* 57 */
-			'312311', /* 58 */
-			'332111', /* 59 */
-			'314111', /* 60 */
-			'221411', /* 61 */
-			'431111', /* 62 */
-			'111224', /* 63 */
-			'111422', /* 64 */
-			'121124', /* 65 */
-			'121421', /* 66 */
-			'141122', /* 67 */
-			'141221', /* 68 */
-			'112214', /* 69 */
-			'112412', /* 70 */
-			'122114', /* 71 */
-			'122411', /* 72 */
-			'142112', /* 73 */
-			'142211', /* 74 */
-			'241211', /* 75 */
-			'221114', /* 76 */
-			'413111', /* 77 */
-			'241112', /* 78 */
-			'134111', /* 79 */
-			'111242', /* 80 */
-			'121142', /* 81 */
-			'121241', /* 82 */
-			'114212', /* 83 */
-			'124112', /* 84 */
-			'124211', /* 85 */
-			'411212', /* 86 */
-			'421112', /* 87 */
-			'421211', /* 88 */
-			'212141', /* 89 */
-			'214121', /* 90 */
-			'412121', /* 91 */
-			'111143', /* 92 */
-			'111341', /* 93 */
-			'131141', /* 94 */
-			'114113', /* 95 */
-			'114311', /* 96 */
-			'411113', /* 97 */
-			'411311', /* 98 */
-			'113141', /* 99 */
-			'114131', /* 100 */
-			'311141', /* 101 */
-			'411131', /* 102 */
-			'211412', /* 103 START A */
-			'211214', /* 104 START B  */
-			'211232', /* 105 START C  */
-			'233111', /* STOP */
-			'200000'  /* END */
-		);
-		$keys = '';
-		switch(strtoupper($type)) {
-			case 'A': {
-				$startid = 103;
-				$keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_';
-				for ($i = 0; $i < 32; ++$i) {
-					$keys .= chr($i);
-				}
-				break;
-			}
-			case 'B': {
-				$startid = 104;
-				$keys = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~'.chr(127);
-				break;
-			}
-			case 'C': {
-				$startid = 105;
-				$keys = '';
-				if ((strlen($code) % 2) != 0) {
-					// The length of barcode value must be even ($code). You must pad the number with zeros
-					return false;
-				}
-				for ($i = 0; $i <= 99; ++$i) {
-					$keys .= chr($i);
-				}
-				$new_code = '';
-				$hclen = (strlen($code) / 2);
-				for ($i = 0; $i < $hclen; ++$i) {
-					$new_code .= chr(intval($code{(2 * $i)}.$code{(2 * $i + 1)}));
-				}
-				$code = $new_code;
-				break;
-			}
-			default: {
-				return false;
-			}
-		}
-		// calculate check character
-		$sum = $startid;
-		$clen = strlen($code);
-		for ($i = 0; $i < $clen; ++$i) {
-			$sum +=  (strpos($keys, $code{$i}) * ($i+1));
-		}
-		$check = ($sum % 103);
-		// add start, check and stop codes
-		$code = chr($startid).$code.chr($check).chr(106).chr(107);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$len = strlen($code);
-		for ($i = 0; $i < $len; ++$i) {
-			$ck = strpos($keys, $code{$i});
-			if (($i == 0) OR ($i > ($len-4))) {
-				$char_num = ord($code{$i});
-				$seq = $chr[$char_num];
-			} elseif(($ck >= 0) AND isset($chr[$ck])) {
-					$seq = $chr[$ck];
-			} else {
-				// invalid character
-				return false;
-			}
-			for ($j = 0; $j < 6; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;
-	}
-
-	/**
-	 * EAN13 and UPC-A barcodes.
-	 * EAN13: European Article Numbering international retail product code
-	 * UPC-A: Universal product code seen on almost all retail products in the USA and Canada
-	 * UPC-E: Short version of UPC symbol
-	 * @param string $code code to represent.
-	 * @param string $len barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_eanupc($code, $len=13) {
-		$upce = false;
-		if ($len == 6) {
-			$len = 12; // UPC-A
-			$upce = true; // UPC-E mode
-		}
-		$data_len = $len - 1;
-		//Padding
-		$code = str_pad($code, $data_len, '0', STR_PAD_LEFT);
-		$code_len = strlen($code);
-		// calculate check digit
-		$sum_a = 0;
-		for ($i = 1; $i < $data_len; $i+=2) {
-			$sum_a += $code{$i};
-		}
-		if ($len > 12) {
-			$sum_a *= 3;
-		}
-		$sum_b = 0;
-		for ($i = 0; $i < $data_len; $i+=2) {
-			$sum_b += ($code{$i});
-		}
-		if ($len < 13) {
-			$sum_b *= 3;
-		}
-		$r = ($sum_a + $sum_b) % 10;
-		if($r > 0) {
-			$r = (10 - $r);
-		}
-		if ($code_len == $data_len) {
-			// add check digit
-			$code .= $r;
-		} elseif ($r !== intval($code{$data_len})) {
-			// wrong checkdigit
-			return false;
-		}
-		if ($len == 12) {
-			// UPC-A
-			$code = '0'.$code;
-			++$len;
-		}
-		if ($upce) {
-			// convert UPC-A to UPC-E
-			$tmp = substr($code, 4, 3);
-			if (($tmp == '000') OR ($tmp == '100') OR ($tmp == '200')) {
-				// manufacturer code ends in 000, 100, or 200
-				$upce_code = substr($code, 2, 2).substr($code, 9, 3).substr($code, 4, 1);
-			} else {
-				$tmp = substr($code, 5, 2);
-				if ($tmp == '00') {
-					// manufacturer code ends in 00
-					$upce_code = substr($code, 2, 3).substr($code, 10, 2).'3';
-				} else {
-					$tmp = substr($code, 6, 1);
-					if ($tmp == '0') {
-						// manufacturer code ends in 0
-						$upce_code = substr($code, 2, 4).substr($code, 11, 1).'4';
-					} else {
-						// manufacturer code does not end in zero
-						$upce_code = substr($code, 2, 5).substr($code, 11, 1);
-					}
-				}
-			}
-		}
-		//Convert digits to bars
-		$codes = array(
-			'A'=>array( // left odd parity
-				'0'=>'0001101',
-				'1'=>'0011001',
-				'2'=>'0010011',
-				'3'=>'0111101',
-				'4'=>'0100011',
-				'5'=>'0110001',
-				'6'=>'0101111',
-				'7'=>'0111011',
-				'8'=>'0110111',
-				'9'=>'0001011'),
-			'B'=>array( // left even parity
-				'0'=>'0100111',
-				'1'=>'0110011',
-				'2'=>'0011011',
-				'3'=>'0100001',
-				'4'=>'0011101',
-				'5'=>'0111001',
-				'6'=>'0000101',
-				'7'=>'0010001',
-				'8'=>'0001001',
-				'9'=>'0010111'),
-			'C'=>array( // right
-				'0'=>'1110010',
-				'1'=>'1100110',
-				'2'=>'1101100',
-				'3'=>'1000010',
-				'4'=>'1011100',
-				'5'=>'1001110',
-				'6'=>'1010000',
-				'7'=>'1000100',
-				'8'=>'1001000',
-				'9'=>'1110100')
-		);
-		$parities = array(
-			'0'=>array('A','A','A','A','A','A'),
-			'1'=>array('A','A','B','A','B','B'),
-			'2'=>array('A','A','B','B','A','B'),
-			'3'=>array('A','A','B','B','B','A'),
-			'4'=>array('A','B','A','A','B','B'),
-			'5'=>array('A','B','B','A','A','B'),
-			'6'=>array('A','B','B','B','A','A'),
-			'7'=>array('A','B','A','B','A','B'),
-			'8'=>array('A','B','A','B','B','A'),
-			'9'=>array('A','B','B','A','B','A')
-		);
-		$upce_parities = array();
-		$upce_parities[0] = array(
-			'0'=>array('B','B','B','A','A','A'),
-			'1'=>array('B','B','A','B','A','A'),
-			'2'=>array('B','B','A','A','B','A'),
-			'3'=>array('B','B','A','A','A','B'),
-			'4'=>array('B','A','B','B','A','A'),
-			'5'=>array('B','A','A','B','B','A'),
-			'6'=>array('B','A','A','A','B','B'),
-			'7'=>array('B','A','B','A','B','A'),
-			'8'=>array('B','A','B','A','A','B'),
-			'9'=>array('B','A','A','B','A','B')
-		);
-		$upce_parities[1] = array(
-			'0'=>array('A','A','A','B','B','B'),
-			'1'=>array('A','A','B','A','B','B'),
-			'2'=>array('A','A','B','B','A','B'),
-			'3'=>array('A','A','B','B','B','A'),
-			'4'=>array('A','B','A','A','B','B'),
-			'5'=>array('A','B','B','A','A','B'),
-			'6'=>array('A','B','B','B','A','A'),
-			'7'=>array('A','B','A','B','A','B'),
-			'8'=>array('A','B','A','B','B','A'),
-			'9'=>array('A','B','B','A','B','A')
-		);
-		$k = 0;
-		$seq = '101'; // left guard bar
-		if ($upce) {
-			$bararray = array('code' => $upce_code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-			$p = $upce_parities[$code{1}][$r];
-			for ($i = 0; $i < 6; ++$i) {
-				$seq .= $codes[$p[$i]][$upce_code{$i}];
-			}
-			$seq .= '010101'; // right guard bar
-		} else {
-			$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-			$half_len = ceil($len / 2);
-			if ($len == 8) {
-				for ($i = 0; $i < $half_len; ++$i) {
-					$seq .= $codes['A'][$code{$i}];
-				}
-			} else {
-				$p = $parities[$code{0}];
-				for ($i = 1; $i < $half_len; ++$i) {
-					$seq .= $codes[$p[$i-1]][$code{$i}];
-				}
-			}
-			$seq .= '01010'; // center guard bar
-			for ($i = $half_len; $i < $len; ++$i) {
-				$seq .= $codes['C'][$code{$i}];
-			}
-			$seq .= '101'; // right guard bar
-		}
-		$clen = strlen($seq);
-		$w = 0;
-		for ($i = 0; $i < $clen; ++$i) {
-			$w += 1;
-			if (($i == ($clen - 1)) OR (($i < ($clen - 1)) AND ($seq{$i} != $seq{($i+1)}))) {
-				if ($seq{$i} == '1') {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-				$w = 0;
-			}
-		}
-		return $bararray;
-	}
-
-	/**
-	 * UPC-Based Extentions
-	 * 2-Digit Ext.: Used to indicate magazines and newspaper issue numbers
-	 * 5-Digit Ext.: Used to mark suggested retail price of books
-	 * @param string $code code to represent.
-	 * @param string $len barcode type: 2 = 2-Digit, 5 = 5-Digit
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_eanext($code, $len=5) {
-		//Padding
-		$code = str_pad($code, $len, '0', STR_PAD_LEFT);
-		// calculate check digit
-		if ($len == 2) {
-			$r = $code % 4;
-		} elseif ($len == 5) {
-			$r = (3 * ($code{0} + $code{2} + $code{4})) + (9 * ($code{1} + $code{3}));
-			$r %= 10;
-		} else {
-			return false;
-		}
-		//Convert digits to bars
-		$codes = array(
-			'A'=>array( // left odd parity
-				'0'=>'0001101',
-				'1'=>'0011001',
-				'2'=>'0010011',
-				'3'=>'0111101',
-				'4'=>'0100011',
-				'5'=>'0110001',
-				'6'=>'0101111',
-				'7'=>'0111011',
-				'8'=>'0110111',
-				'9'=>'0001011'),
-			'B'=>array( // left even parity
-				'0'=>'0100111',
-				'1'=>'0110011',
-				'2'=>'0011011',
-				'3'=>'0100001',
-				'4'=>'0011101',
-				'5'=>'0111001',
-				'6'=>'0000101',
-				'7'=>'0010001',
-				'8'=>'0001001',
-				'9'=>'0010111')
-		);
-		$parities = array();
-		$parities[2] = array(
-			'0'=>array('A','A'),
-			'1'=>array('A','B'),
-			'2'=>array('B','A'),
-			'3'=>array('B','B')
-		);
-		$parities[5] = array(
-			'0'=>array('B','B','A','A','A'),
-			'1'=>array('B','A','B','A','A'),
-			'2'=>array('B','A','A','B','A'),
-			'3'=>array('B','A','A','A','B'),
-			'4'=>array('A','B','B','A','A'),
-			'5'=>array('A','A','B','B','A'),
-			'6'=>array('A','A','A','B','B'),
-			'7'=>array('A','B','A','B','A'),
-			'8'=>array('A','B','A','A','B'),
-			'9'=>array('A','A','B','A','B')
-		);
-		$p = $parities[$len][$r];
-		$seq = '1011'; // left guard bar
-		$seq .= $codes[$p[0]][$code{0}];
-		for ($i = 1; $i < $len; ++$i) {
-			$seq .= '01'; // separator
-			$seq .= $codes[$p[$i]][$code{$i}];
-		}
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-
-	/**
-	 * POSTNET and PLANET barcodes.
-	 * Used by U.S. Postal Service for automated mail sorting
-	 * @param string $code zip code to represent. Must be a string containing a zip code of the form DDDDD or DDDDD-DDDD.
-	 * @param boolean $planet if true print the PLANET barcode, otherwise print POSTNET
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_postnet($code, $planet=false) {
-		// bar lenght
-		if ($planet) {
-			$barlen = Array(
-				0 => Array(1,1,2,2,2),
-				1 => Array(2,2,2,1,1),
-				2 => Array(2,2,1,2,1),
-				3 => Array(2,2,1,1,2),
-				4 => Array(2,1,2,2,1),
-				5 => Array(2,1,2,1,2),
-				6 => Array(2,1,1,2,2),
-				7 => Array(1,2,2,2,1),
-				8 => Array(1,2,2,1,2),
-				9 => Array(1,2,1,2,2)
-			);
-		} else {
-			$barlen = Array(
-				0 => Array(2,2,1,1,1),
-				1 => Array(1,1,1,2,2),
-				2 => Array(1,1,2,1,2),
-				3 => Array(1,1,2,2,1),
-				4 => Array(1,2,1,1,2),
-				5 => Array(1,2,1,2,1),
-				6 => Array(1,2,2,1,1),
-				7 => Array(2,1,1,1,2),
-				8 => Array(2,1,1,2,1),
-				9 => Array(2,1,2,1,1)
-			);
-		}
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 2, 'bcode' => array());
-		$k = 0;
-		$code = str_replace('-', '', $code);
-		$code = str_replace(' ', '', $code);
-		$len = strlen($code);
-		// calculate checksum
-		$sum = 0;
-		for ($i = 0; $i < $len; ++$i) {
-			$sum += intval($code{$i});
-		}
-		$chkd = ($sum % 10);
-		if($chkd > 0) {
-			$chkd = (10 - $chkd);
-		}
-		$code .= $chkd;
-		$len = strlen($code);
-		// start bar
-		$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 2, 'p' => 0);
-		$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-		$bararray['maxw'] += 2;
-		for ($i = 0; $i < $len; ++$i) {
-			for ($j = 0; $j < 5; ++$j) {
-				$h = $barlen[$code{$i}][$j];
-				$p = floor(1 / $h);
-				$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-				$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-				$bararray['maxw'] += 2;
-			}
-		}
-		// end bar
-		$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 2, 'p' => 0);
-		$bararray['maxw'] += 1;
-		return $bararray;
-	}
-
-	/**
-	 * RMS4CC - CBC - KIX
-	 * RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code) - KIX (Klant index - Customer index)
-	 * RM4SCC is the name of the barcode symbology used by the Royal Mail for its Cleanmail service.
-	 * @param string $code code to print
-	 * @param boolean $kix if true prints the KIX variation (doesn't use the start and end symbols, and the checksum) - in this case the house number must be sufficed with an X and placed at the end of the code.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_rms4cc($code, $kix=false) {
-		$notkix = !$kix;
-		// bar mode
-		// 1 = pos 1, length 2
-		// 2 = pos 1, length 3
-		// 3 = pos 2, length 1
-		// 4 = pos 2, length 2
-		$barmode = array(
-			'0' => array(3,3,2,2),
-			'1' => array(3,4,1,2),
-			'2' => array(3,4,2,1),
-			'3' => array(4,3,1,2),
-			'4' => array(4,3,2,1),
-			'5' => array(4,4,1,1),
-			'6' => array(3,1,4,2),
-			'7' => array(3,2,3,2),
-			'8' => array(3,2,4,1),
-			'9' => array(4,1,3,2),
-			'A' => array(4,1,4,1),
-			'B' => array(4,2,3,1),
-			'C' => array(3,1,2,4),
-			'D' => array(3,2,1,4),
-			'E' => array(3,2,2,3),
-			'F' => array(4,1,1,4),
-			'G' => array(4,1,2,3),
-			'H' => array(4,2,1,3),
-			'I' => array(1,3,4,2),
-			'J' => array(1,4,3,2),
-			'K' => array(1,4,4,1),
-			'L' => array(2,3,3,2),
-			'M' => array(2,3,4,1),
-			'N' => array(2,4,3,1),
-			'O' => array(1,3,2,4),
-			'P' => array(1,4,1,4),
-			'Q' => array(1,4,2,3),
-			'R' => array(2,3,1,4),
-			'S' => array(2,3,2,3),
-			'T' => array(2,4,1,3),
-			'U' => array(1,1,4,4),
-			'V' => array(1,2,3,4),
-			'W' => array(1,2,4,3),
-			'X' => array(2,1,3,4),
-			'Y' => array(2,1,4,3),
-			'Z' => array(2,2,3,3)
-		);
-		$code = strtoupper($code);
-		$len = strlen($code);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 3, 'bcode' => array());
-		if ($notkix) {
-			// table for checksum calculation (row,col)
-			$checktable = array(
-				'0' => array(1,1),
-				'1' => array(1,2),
-				'2' => array(1,3),
-				'3' => array(1,4),
-				'4' => array(1,5),
-				'5' => array(1,0),
-				'6' => array(2,1),
-				'7' => array(2,2),
-				'8' => array(2,3),
-				'9' => array(2,4),
-				'A' => array(2,5),
-				'B' => array(2,0),
-				'C' => array(3,1),
-				'D' => array(3,2),
-				'E' => array(3,3),
-				'F' => array(3,4),
-				'G' => array(3,5),
-				'H' => array(3,0),
-				'I' => array(4,1),
-				'J' => array(4,2),
-				'K' => array(4,3),
-				'L' => array(4,4),
-				'M' => array(4,5),
-				'N' => array(4,0),
-				'O' => array(5,1),
-				'P' => array(5,2),
-				'Q' => array(5,3),
-				'R' => array(5,4),
-				'S' => array(5,5),
-				'T' => array(5,0),
-				'U' => array(0,1),
-				'V' => array(0,2),
-				'W' => array(0,3),
-				'X' => array(0,4),
-				'Y' => array(0,5),
-				'Z' => array(0,0)
-			);
-			$row = 0;
-			$col = 0;
-			for ($i = 0; $i < $len; ++$i) {
-				$row += $checktable[$code{$i}][0];
-				$col += $checktable[$code{$i}][1];
-			}
-			$row %= 6;
-			$col %= 6;
-			$chk = array_keys($checktable, array($row,$col));
-			$code .= $chk[0];
-			++$len;
-		}
-		$k = 0;
-		if ($notkix) {
-			// start bar
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['maxw'] += 2;
-		}
-		for ($i = 0; $i < $len; ++$i) {
-			for ($j = 0; $j < 4; ++$j) {
-				switch ($barmode[$code{$i}][$j]) {
-					case 1: {
-						$p = 0;
-						$h = 2;
-						break;
-					}
-					case 2: {
-						$p = 0;
-						$h = 3;
-						break;
-					}
-					case 3: {
-						$p = 1;
-						$h = 1;
-						break;
-					}
-					case 4: {
-						$p = 1;
-						$h = 2;
-						break;
-					}
-				}
-				$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-				$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-				$bararray['maxw'] += 2;
-			}
-		}
-		if ($notkix) {
-			// stop bar
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => 3, 'p' => 0);
-			$bararray['maxw'] += 1;
-		}
-		return $bararray;
-	}
-
-	/**
-	 * CODABAR barcodes.
-	 * Older code often used in library systems, sometimes in blood banks
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_codabar($code) {
-		$chr = array(
-			'0' => '11111221',
-			'1' => '11112211',
-			'2' => '11121121',
-			'3' => '22111111',
-			'4' => '11211211',
-			'5' => '21111211',
-			'6' => '12111121',
-			'7' => '12112111',
-			'8' => '12211111',
-			'9' => '21121111',
-			'-' => '11122111',
-			'$' => '11221111',
-			':' => '21112121',
-			'/' => '21211121',
-			'.' => '21212111',
-			'+' => '11222221',
-			'A' => '11221211',
-			'B' => '12121121',
-			'C' => '11121221',
-			'D' => '11122211'
-		);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$w = 0;
-		$seq = '';
-		$code = 'A'.strtoupper($code).'A';
-		$len = strlen($code);
-		for ($i = 0; $i < $len; ++$i) {
-			if (!isset($chr[$code{$i}])) {
-				return false;
-			}
-			$seq = $chr[$code{$i}];
-			for ($j = 0; $j < 8; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;
-	}
-
-	/**
-	 * CODE11 barcodes.
-	 * Used primarily for labeling telecommunications equipment
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_code11($code) {
-		$chr = array(
-			'0' => '111121',
-			'1' => '211121',
-			'2' => '121121',
-			'3' => '221111',
-			'4' => '112121',
-			'5' => '212111',
-			'6' => '122111',
-			'7' => '111221',
-			'8' => '211211',
-			'9' => '211111',
-			'-' => '112111',
-			'S' => '112211'
-		);
-
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		$k = 0;
-		$w = 0;
-		$seq = '';
-		$len = strlen($code);
-		// calculate check digit C
-		$p = 1;
-		$check = 0;
-		for ($i = ($len - 1); $i >= 0; --$i) {
-			$digit = $code{$i};
-			if ($digit == '-') {
-				$dval = 10;
-			} else {
-				$dval = intval($digit);
-			}
-			$check += ($dval * $p);
-			++$p;
-			if ($p > 10) {
-				$p = 1;
-			}
-		}
-		$check %= 11;
-		if ($check == 10) {
-			$check = '-';
-		}
-		$code .= $check;
-		if ($len > 10) {
-			// calculate check digit K
-			$p = 1;
-			$check = 0;
-			for ($i = $len; $i >= 0; --$i) {
-				$digit = $code{$i};
-				if ($digit == '-') {
-					$dval = 10;
-				} else {
-					$dval = intval($digit);
-				}
-				$check += ($dval * $p);
-				++$p;
-				if ($p > 9) {
-					$p = 1;
-				}
-			}
-			$check %= 11;
-			$code .= $check;
-			++$len;
-		}
-		$code = 'S'.$code.'S';
-		$len += 3;
-		for ($i = 0; $i < $len; ++$i) {
-			if (!isset($chr[$code{$i}])) {
-				return false;
-			}
-			$seq = $chr[$code{$i}];
-			for ($j = 0; $j < 6; ++$j) {
-				if (($j % 2) == 0) {
-					$t = true; // bar
-				} else {
-					$t = false; // space
-				}
-				$w = $seq{$j};
-				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
-				$bararray['maxw'] += $w;
-				++$k;
-			}
-		}
-		return $bararray;
-	}
-
-	/**
-	 * Pharmacode
-	 * Contains digits (0 to 9)
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_pharmacode($code) {
-		$seq = '';
-		$code = intval($code);
-		while ($code > 0) {
-			if (($code % 2) == 0) {
-				$seq .= '11100';
-				$code -= 2;
-			} else {
-				$seq .= '100';
-				$code -= 1;
-			}
-			$code /= 2;
-		}
-		$seq = substr($seq, 0, -2);
-		$seq = strrev($seq);
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
-		return $this->binseq_to_array($seq, $bararray);
-	}
-
-	/**
-	 * Pharmacode two-track
-	 * Contains digits (0 to 9)
-	 * @param string $code code to represent.
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_pharmacode2t($code) {
-		$seq = '';
-		$code = intval($code);
-		do {
-			switch ($code % 3) {
-				case 0: {
-					$seq .= '3';
-					$code = ($code - 3) / 3;
-					break;
-				}
-				case 1: {
-					$seq .= '1';
-					$code = ($code - 1) / 3;
-					break;
-				}
-				case 2: {
-					$seq .= '2';
-					$code = ($code - 2) / 3;
-					break;
-				}
-			}
-		} while($code != 0);
-		$seq = strrev($seq);
-		$k = 0;
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 2, 'bcode' => array());
-		$len = strlen($seq);
-		for ($i = 0; $i < $len; ++$i) {
-			switch ($seq{$i}) {
-				case '1': {
-					$p = 1;
-					$h = 1;
-					break;
-				}
-				case '2': {
-					$p = 0;
-					$h = 1;
-					break;
-				}
-				case '3': {
-					$p = 0;
-					$h = 2;
-					break;
-				}
-			}
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-			$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['maxw'] += 2;
-		}
-		unset($bararray['bcode'][($k - 1)]);
-		--$bararray['maxw'];
-		return $bararray;
-	}
-
-
-	/**
-	 * IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
-	 * (requires PHP bcmath extension)
-	 * Intelligent Mail barcode is a 65-bar code for use on mail in the United States.
-	 * The fields are described as follows:<ul><li>The Barcode Identifier shall be assigned by USPS to encode the presort identification that is currently printed in human readable form on the optional endorsement line (OEL) as well as for future USPS use. This shall be two digits, with the second digit in the range of 0–4. The allowable encoding ranges shall be 00–04, 10–14, 20–24, 30–34, 40–44, 50–54, 60–64, 70–74, 80–84, and 90–94.</li><li>The Service Type Identifier shall be assigned by USPS for any combination of services requested on the mailpiece. The allowable encoding range shall be 000http://it2.php.net/manual/en/function.dechex.php–999. Each 3-digit value shall correspond to a particular mail class with a particular combination of service(s). Each service program, such as OneCode Confirm and OneCode ACS, shall provide the list of Service Type Identifier values.</li><li>The Mailer or Customer Identifier shall be assigned by USPS as a unique, 6 or 9 digit number that identifies a business entity. The allowable encoding range for the 6 digit Mailer ID shall be 000000- 899999, while the allowable encoding range for the 9 digit Mailer ID shall be 900000000-999999999.</li><li>The Serial or Sequence Number shall be assigned by the mailer for uniquely identifying and tracking mailpieces. The allowable encoding range shall be 000000000–999999999 when used with a 6 digit Mailer ID and 000000-999999 when used with a 9 digit Mailer ID. e. The Delivery Point ZIP Code shall be assigned by the mailer for routing the mailpiece. This shall replace POSTNET for routing the mailpiece to its final delivery point. The length may be 0, 5, 9, or 11 digits. The allowable encoding ranges shall be no ZIP Code, 00000–99999,  000000000–999999999, and 00000000000–99999999999.</li></ul>
-	 * @param string $code code to print, separate the ZIP (routing code) from the rest using a minus char '-' (BarcodeID_ServiceTypeID_MailerID_SerialNumber-RoutingCode)
-	 * @return array barcode representation.
-	 * @access protected
-	 */
-	protected function barcode_imb($code) {
-		$asc_chr = array(4,0,2,6,3,5,1,9,8,7,1,2,0,6,4,8,2,9,5,3,0,1,3,7,4,6,8,9,2,0,5,1,9,4,3,8,6,7,1,2,4,3,9,5,7,8,3,0,2,1,4,0,9,1,7,0,2,4,6,3,7,1,9,5,8);
-		$dsc_chr = array(7,1,9,5,8,0,2,4,6,3,5,8,9,7,3,0,6,1,7,4,6,8,9,2,5,1,7,5,4,3,8,7,6,0,2,5,4,9,3,0,1,6,8,2,0,4,5,9,6,7,5,2,6,3,8,5,1,9,8,7,4,0,2,6,3);
-		$asc_pos = array(3,0,8,11,1,12,8,11,10,6,4,12,2,7,9,6,7,9,2,8,4,0,12,7,10,9,0,7,10,5,7,9,6,8,2,12,1,4,2,0,1,5,4,6,12,1,0,9,4,7,5,10,2,6,9,11,2,12,6,7,5,11,0,3,2);
-		$dsc_pos = array(2,10,12,5,9,1,5,4,3,9,11,5,10,1,6,3,4,1,10,0,2,11,8,6,1,12,3,8,6,4,4,11,0,6,1,9,11,5,3,7,3,10,7,11,8,2,10,3,5,8,0,3,12,11,8,4,5,1,3,0,7,12,9,8,10);
-		$code_arr = explode('-', $code);
-		$tracking_number = $code_arr[0];
-		if (isset($code_arr[1])) {
-			$routing_code = $code_arr[1];
-		} else {
-			$routing_code = '';
-		}
-		// Conversion of Routing Code
-		switch (strlen($routing_code)) {
-			case 0: {
-				$binary_code = 0;
-				break;
-			}
-			case 5: {
-				$binary_code = bcadd($routing_code, '1');
-				break;
-			}
-			case 9: {
-				$binary_code = bcadd($routing_code, '100001');
-				break;
-			}
-			case 11: {
-				$binary_code = bcadd($routing_code, '1000100001');
-				break;
-			}
-			default: {
-				return false;
-				break;
-			}
-		}
-		$binary_code = bcmul($binary_code, 10);
-		$binary_code = bcadd($binary_code, $tracking_number{0});
-		$binary_code = bcmul($binary_code, 5);
-		$binary_code = bcadd($binary_code, $tracking_number{1});
-		$binary_code .= substr($tracking_number, 2, 18);
-		// convert to hexadecimal
-		$binary_code = $this->dec_to_hex($binary_code);
-		// pad to get 13 bytes
-		$binary_code = str_pad($binary_code, 26, '0', STR_PAD_LEFT);
-		// convert string to array of bytes
-		$binary_code_arr = chunk_split($binary_code, 2, "\r");
-		$binary_code_arr = substr($binary_code_arr, 0, -1);
-		$binary_code_arr = explode("\r", $binary_code_arr);
-		// calculate frame check sequence
-		$fcs = $this->imb_crc11fcs($binary_code_arr);
-		// exclude first 2 bits from first byte
-		$first_byte = sprintf('%2s', dechex((hexdec($binary_code_arr[0]) << 2) >> 2));
-		$binary_code_102bit = $first_byte.substr($binary_code, 2);
-		// convert binary data to codewords
-		$codewords = array();
-		$data = $this->hex_to_dec($binary_code_102bit);
-		$codewords[0] = bcmod($data, 636) * 2;
-		$data = bcdiv($data, 636);
-		for ($i = 1; $i < 9; ++$i) {
-			$codewords[$i] = bcmod($data, 1365);
-			$data = bcdiv($data, 1365);
-		}
-		$codewords[9] = $data;
-		if (($fcs >> 10) == 1) {
-			$codewords[9] += 659;
-		}
-		// generate lookup tables
-		$table2of13 = $this->imb_tables(2, 78);
-		$table5of13 = $this->imb_tables(5, 1287);
-		// convert codewords to characters
-		$characters = array();
-		$bitmask = 512;
-		foreach($codewords as $k => $val) {
-			if ($val <= 1286) {
-				$chrcode = $table5of13[$val];
-			} else {
-				$chrcode = $table2of13[($val - 1287)];
-			}
-			if (($fcs & $bitmask) > 0) {
-				// bitwise invert
-				$chrcode = ((~$chrcode) & 8191);
-			}
-			$characters[] = $chrcode;
-			$bitmask /= 2;
-		}
-		$characters = array_reverse($characters);
-		// build bars
-		$k = 0;
-		$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 3, 'bcode' => array());
-		for ($i = 0; $i < 65; ++$i) {
-			$asc = (($characters[$asc_chr[$i]] & pow(2, $asc_pos[$i])) > 0);
-			$dsc = (($characters[$dsc_chr[$i]] & pow(2, $dsc_pos[$i])) > 0);
-			if ($asc AND $dsc) {
-				// full bar (F)
-				$p = 0;
-				$h = 3;
-			} elseif ($asc) {
-				// ascender (A)
-				$p = 0;
-				$h = 2;
-			} elseif ($dsc) {
-				// descender (D)
-				$p = 1;
-				$h = 2;
-			} else {
-				// tracker (T)
-				$p = 1;
-				$h = 1;
-			}
-			$bararray['bcode'][$k++] = array('t' => 1, 'w' => 1, 'h' => $h, 'p' => $p);
-			$bararray['bcode'][$k++] = array('t' => 0, 'w' => 1, 'h' => 2, 'p' => 0);
-			$bararray['maxw'] += 2;
-		}
-		unset($bararray['bcode'][($k - 1)]);
-		--$bararray['maxw'];
-		return $bararray;
-	}
-
-	/**
-	 * Convert large integer number to hexadecimal representation.
-	 * (requires PHP bcmath extension)
-	 * @param string $number number to convert specified as a string
-	 * @return string hexadecimal representation
-	 */
-	public function dec_to_hex($number) {
-		$i = 0;
-		$hex = array();
-		if($number == 0) {
-			return '00';
-		}
-		while($number > 0) {
-			if($number == 0) {
-				array_push($hex, '0');
-			} else {
-				array_push($hex, strtoupper(dechex(bcmod($number, '16'))));
-				$number = bcdiv($number, '16', 0);
-			}
-		}
-		$hex = array_reverse($hex);
-		return implode($hex);
-	}
-
-	/**
-	 * Convert large hexadecimal number to decimal representation (string).
-	 * (requires PHP bcmath extension)
-	 * @param string $hex hexadecimal number to convert specified as a string
-	 * @return string hexadecimal representation
-	 */
-	public function hex_to_dec($hex) {
-		$dec = 0;
-		$bitval = 1;
-		$len = strlen($hex);
-		for($pos = ($len - 1); $pos >= 0; --$pos) {
-			$dec = bcadd($dec, bcmul(hexdec($hex{$pos}), $bitval));
-			$bitval = bcmul($bitval, 16);
-		}
-		return $dec;
-	}
-
-	/**
-	 * Intelligent Mail Barcode calculation of Frame Check Sequence
-	 * @param string $code_arr array of hexadecimal values (13 bytes holding 102 bits right justified).
-	 * @return int 11 bit Frame Check Sequence as integer (decimal base)
-	 * @access protected
-	 */
-	protected function imb_crc11fcs($code_arr) {
-		$genpoly = 0x0F35; // generator polynomial
-		$fcs = 0x07FF; // Frame Check Sequence
-		// do most significant byte skipping the 2 most significant bits
-		$data = hexdec($code_arr[0]) << 5;
-		for ($bit = 2; $bit < 8; ++$bit) {
-			if (($fcs ^ $data) & 0x400) {
-				$fcs = ($fcs << 1) ^ $genpoly;
-			} else {
-				$fcs = ($fcs << 1);
-			}
-			$fcs &= 0x7FF;
-			$data <<= 1;
-		}
-		// do rest of bytes
-		for ($byte = 1; $byte < 13; ++$byte) {
-			$data = hexdec($code_arr[$byte]) << 3;
-			for ($bit = 0; $bit < 8; ++$bit) {
-				if (($fcs ^ $data) & 0x400) {
-					$fcs = ($fcs << 1) ^ $genpoly;
-				} else {
-					$fcs = ($fcs << 1);
-				}
-				$fcs &= 0x7FF;
-				$data <<= 1;
-			}
-		}
-		return $fcs;
-	}
-
-	/**
-	 * Reverse unsigned short value
-	 * @param int $num value to reversr
-	 * @return int reversed value
-	 * @access protected
-	 */
-	protected function imb_reverse_us($num) {
-		$rev = 0;
-		for ($i = 0; $i < 16; ++$i) {
-			$rev <<= 1;
-			$rev |= ($num & 1);
-			$num >>= 1;
-		}
-		return $rev;
-	}
-
-	/**
-	 * generate Nof13 tables used for Intelligent Mail Barcode
-	 * @param int $n is the type of table: 2 for 2of13 table, 5 for 5of13table
-	 * @param int $size size of table (78 for n=2 and 1287 for n=5)
-	 * @return array requested table
-	 * @access protected
-	 */
-	protected function imb_tables($n, $size) {
-		$table = array();
-		$lli = 0; // LUT lower index
-		$lui = $size - 1; // LUT upper index
-		for ($count = 0; $count < 8192; ++$count) {
-			$bit_count = 0;
-			for ($bit_index = 0; $bit_index < 13; ++$bit_index) {
-				$bit_count += intval(($count & (1 << $bit_index)) != 0);
-			}
-			// if we don't have the right number of bits on, go on to the next value
-			if ($bit_count == $n) {
-				$reverse = ($this->imb_reverse_us($count) >> 3);
-				// if the reverse is less than count, we have already visited this pair before
-				if ($reverse >= $count) {
-					// If count is symmetric, place it at the first free slot from the end of the list.
-					// Otherwise, place it at the first free slot from the beginning of the list AND place $reverse ath the next free slot from the beginning of the list
-					if ($reverse == $count) {
-						$table[$lui] = $count;
-						--$lui;
-					} else {
-						$table[$lli] = $count;
-						++$lli;
-						$table[$lli] = $reverse;
-						++$lli;
-					}
-				}
-			}
-		}
-		return $table;
-	}
-
-} // end of class
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/chapter_demo_1.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/chapter_demo_1.txt
deleted file mode 100644
index 4025de9303f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/chapter_demo_1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-
-Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.
-
-Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.
-
-Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-
-Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.
-
-Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.
-
-Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/chapter_demo_2.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/chapter_demo_2.txt
deleted file mode 100644
index cd7bfe68c3f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/chapter_demo_2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-<p><strong>Lorem ipsum</strong> dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.</p>
-
-<img src="../images/image_demo.jpg" width="54mm" height="80mm" />
-
-<p style="background-color:yellow;"><i>Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.</i></p>
-
-<p>Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.</p>
-
-<p style="color:navy;">Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.</p>
-
-<p>Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.</p>
-
-<p><strong>Lorem ipsum</strong> dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.</p>
-
-<img src="../images/image_demo.jpg" width="54mm" height="80mm" />
-
-<p style="background-color:yellow;"><i>Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.</i></p>
-
-<p>Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.</p>
-
-<p style="color:navy;">Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.</p>
-
-<p>Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.</p>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/table_data_demo.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/table_data_demo.txt
deleted file mode 100644
index 5a48a42e77b..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/table_data_demo.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Austria;Vienna;83859;8075
-Belgium;Brussels;30518;10192
-Denmark;Copenhagen;43094;5295
-Finland;Helsinki;304529;5147
-France;Paris;543965;58728
-Germany;Berlin;357022;82057
-Greece;Athens;131625;10511
-Ireland;Dublin;70723;3694
-Italy;Roma;301316;57563
-Luxembourg;Luxembourg;2586;424
-Netherlands;Amsterdam;41526;15654
-Portugal;Lisbon;91906;9957
-Spain;Madrid;504790;39348
-Sweden;Stockholm;410934;8839
-United Kingdom;London;243820;58862
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/utf8test.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/utf8test.txt
deleted file mode 100644
index af794dfdb23..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/cache/utf8test.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-Sentences that contain all letters commonly used in a language
---------------------------------------------------------------
-
-Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> -- 2001-09-02
-
-This file is UTF-8 encoded.
-
-
-Danish (da)
----------
-
-  Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen
-  Wolther spillede på xylofon.
-  (= Quiz contestants were eating strawbery with cream while Wolther
-  the circus clown played on xylophone.)
-
-German (de)
------------
-
-  Falsches Üben von Xylophonmusik quält jeden größeren Zwerg
-  (= Wrongful practicing of xylophone music tortures every larger dwarf)
-
-  Zwölf Boxkämpfer jagten Eva quer über den Sylter Deich
-  (= Twelve boxing fighters hunted Eva across the dike of Sylt)
-
-  Heizölrückstoßabdämpfung
-  (= fuel oil recoil absorber)
-  (jqvwxy missing, but all non-ASCII letters in one word)
-
-English (en)
-------------
-
-  The quick brown fox jumps over the lazy dog
-
-Spanish (es)
-------------
-
-  El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y 
-  frío, añoraba a su querido cachorro.
-  (Contains every letter and every accent, but not every combination
-  of vowel + acute.)
-
-French (fr)
------------
-
-  Portez ce vieux whisky au juge blond qui fume sur son île intérieure, à
-  côté de l'alcôve ovoïde, où les bûches se consument dans l'âtre, ce
-  qui lui permet de penser à la cænogenèse de l'être dont il est question
-  dans la cause ambiguë entendue à Moÿ, dans un capharnaüm qui,
-  pense-t-il, diminue çà et là la qualité de son œuvre. 
-
-  l'île exiguë
-  Où l'obèse jury mûr
-  Fête l'haï volapük,
-  Âne ex aéquo au whist,
-  Ôtez ce vœu déçu.
-
-  Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en
-  canoë au delà des îles, près du mälström où brûlent les novæ.
-
-Irish Gaelic (ga)
------------------
-
-  D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh
-
-Hungarian (hu)
---------------
-
-  Árvíztűrő tükörfúrógép
-  (= flood-proof mirror-drilling machine, only all non-ASCII letters)
-
-Icelandic (is)
---------------
-
-  Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa
-
-  Sævör grét áðan því úlpan var ónýt
-  (some ASCII letters missing)
-
-Greek (el)
--------------
-
-  Γαζέες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο
-  (= No more shall I see acacias or myrtles in the golden clearing)
-
-  Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία
-  (= I uncover the soul-destroying abhorrence)
-
-Hebrew (iw)
------------
-
-  ? דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה
-
-Polish (pl)
------------
-
-  Pchnąć w tę łódź jeża lub osiem skrzyń fig
-  (= To push a hedgehog or eight bins of figs in this boat)
-  
-  Zażółć gęślą jaźń
-
-Russian (ru)
-------------
-
-  В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
-  (= Would a citrus live in the bushes of south? Yes, but only a fake one!)
-
-Thai (th)
----------
-
-  [--------------------------|------------------------]
-  ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า  กว่าบรรดาฝูงสัตว์เดรัจฉาน
-  จงฝ่าฟันพัฒนาวิชาการ           อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร
-  ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า     หัดอภัยเหมือนกีฬาอัชฌาสัย
-  ปฏิบัติประพฤติกฎกำหนดใจ        พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ
-
-  [The copyright for the Thai example is owned by The Computer
-  Association of Thailand under the Royal Patronage of His Majesty the
-  King.]
-
-Please let me know if you find others! Special thanks to the people
-from all over the world who contributed these sentences.
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/bra.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/bra.php
deleted file mode 100644
index ebaadd309d6..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/bra.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-//============================================================+
-// File name   : eng.php
-// Begin       : 2004-03-03
-// Last Update : 2010-08-08
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'pt';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'página';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/eng.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/eng.php
deleted file mode 100644
index b63f787aa47..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/eng.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-//============================================================+
-// File name   : eng.php
-// Begin       : 2004-03-03
-// Last Update : 2010-08-08
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'en';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'page';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/ger.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/ger.php
deleted file mode 100644
index a4b7ae77d4c..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/ger.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-//============================================================+
-// File name   : eng.php
-// Begin       : 2004-03-03
-// Last Update : 2010-08-08
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'de';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'seite';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/ita.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/ita.php
deleted file mode 100644
index 04393cd1999..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/lang/ita.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-//============================================================+
-// File name   : ita.php
-// Begin       : 2004-03-03
-// Last Update : 2010-08-08
-// 
-// Description : Language module for TCPDF
-//               (contains translated texts)
-// 
-// Author: Nicola Asuni
-// 
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * TCPDF language file (contains translated texts).
- * @package com.tecnick.tcpdf
- * @abstract TCPDF language file.
- * @author Nicola Asuni
- * @copyright 2004-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-03-03
- */
- 
-// ENGLISH
-
-global $l;
-$l = Array();
-
-// PAGE META DESCRIPTORS --------------------------------------
-
-$l['a_meta_charset'] = 'UTF-8';
-$l['a_meta_dir'] = 'ltr';
-$l['a_meta_language'] = 'it';
-
-// TRANSLATIONS --------------------------------------
-$l['w_page'] = 'pagina';
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/tcpdf_config.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/tcpdf_config.php
deleted file mode 100644
index 8b662117f4f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/tcpdf_config.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_config.php
-// Begin       : 2004-06-11
-// Last Update : 2010-08-19
-//
-// Description : Configuration file for TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Configuration file for TCPDF.
- * @author Nicola Asuni
- * @copyright 2004-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @version 4.9.005
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-10-27
- */
-
-// If you define the constant K_TCPDF_EXTERNAL_CONFIG, the following settings will be ignored.
-
-if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
-
-	// DOCUMENT_ROOT fix for IIS Webserver
-	if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-		if(isset($_SERVER['SCRIPT_FILENAME'])) {
-			$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
-		} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
-			$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-		}	else {
-			// define here your DOCUMENT_ROOT path if the previous fails
-			$_SERVER['DOCUMENT_ROOT'] = '/var/www';
-		}
-	}
-
-	// Automatic calculation for the following K_PATH_MAIN constant
-	$k_path_main = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
-	if (substr($k_path_main, -1) != '/') {
-		$k_path_main .= '/';
-	}
-
-	/**
-	 * Installation path (/var/www/tcpdf/).
-	 * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
-	 */
-	define ('K_PATH_MAIN', $k_path_main);
-
-	// Automatic calculation for the following K_PATH_URL constant
-	$k_path_url = $k_path_main; // default value for console mode
-	if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-		if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
-			$k_path_url = 'https://';
-		} else {
-			$k_path_url = 'http://';
-		}
-		$k_path_url .= $_SERVER['HTTP_HOST'];
-		$k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
-	}
-
-	/**
-	 * URL path to tcpdf installation folder (http://localhost/tcpdf/).
-	 * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
-	 */
-	define ('K_PATH_URL', $k_path_url);
-
-	/**
-	 * path for PDF fonts
-	 * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
-	 */
-	define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-	/**
-	 * cache directory for temporary files (full path)
-	 */
-	define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
-
-	/**
-	 * cache directory for temporary files (url path)
-	 */
-	define ('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
-
-	/**
-	 *images directory
-	 */
-	define ('K_PATH_IMAGES', K_PATH_MAIN.'images/');
-
-	/**
-	 * blank image
-	 */
-	define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
-
-	/**
-	 * page format
-	 */
-	define ('PDF_PAGE_FORMAT', 'A4');
-
-	/**
-	 * page orientation (P=portrait, L=landscape)
-	 */
-	define ('PDF_PAGE_ORIENTATION', 'P');
-
-	/**
-	 * document creator
-	 */
-	define ('PDF_CREATOR', 'TCPDF');
-
-	/**
-	 * document author
-	 */
-	define ('PDF_AUTHOR', 'TCPDF');
-
-	/**
-	 * header title
-	 */
-	define ('PDF_HEADER_TITLE', 'TCPDF Example');
-
-	/**
-	 * header description string
-	 */
-	define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
-
-	/**
-	 * image logo
-	 */
-	define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
-
-	/**
-	 * header logo image width [mm]
-	 */
-	define ('PDF_HEADER_LOGO_WIDTH', 30);
-
-	/**
-	 *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
-	 */
-	define ('PDF_UNIT', 'mm');
-
-	/**
-	 * header margin
-	 */
-	define ('PDF_MARGIN_HEADER', 5);
-
-	/**
-	 * footer margin
-	 */
-	define ('PDF_MARGIN_FOOTER', 10);
-
-	/**
-	 * top margin
-	 */
-	define ('PDF_MARGIN_TOP', 27);
-
-	/**
-	 * bottom margin
-	 */
-	define ('PDF_MARGIN_BOTTOM', 25);
-
-	/**
-	 * left margin
-	 */
-	define ('PDF_MARGIN_LEFT', 15);
-
-	/**
-	 * right margin
-	 */
-	define ('PDF_MARGIN_RIGHT', 15);
-
-	/**
-	 * default main font name
-	 */
-	define ('PDF_FONT_NAME_MAIN', 'helvetica');
-
-	/**
-	 * default main font size
-	 */
-	define ('PDF_FONT_SIZE_MAIN', 10);
-
-	/**
-	 * default data font name
-	 */
-	define ('PDF_FONT_NAME_DATA', 'helvetica');
-
-	/**
-	 * default data font size
-	 */
-	define ('PDF_FONT_SIZE_DATA', 8);
-
-	/**
-	 * default monospaced font name
-	 */
-	define ('PDF_FONT_MONOSPACED', 'courier');
-
-	/**
-	 * ratio used to adjust the conversion of pixels to user units
-	 */
-	define ('PDF_IMAGE_SCALE_RATIO', 1.25);
-
-	/**
-	 * magnification factor for titles
-	 */
-	define('HEAD_MAGNIFICATION', 1.1);
-
-	/**
-	 * height of cell repect font height
-	 */
-	define('K_CELL_HEIGHT_RATIO', 1.25);
-
-	/**
-	 * title magnification respect main font size
-	 */
-	define('K_TITLE_MAGNIFICATION', 1.3);
-
-	/**
-	 * reduction factor for small font
-	 */
-	define('K_SMALL_RATIO', 2/3);
-
-	/**
-	 * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
-	 */
-	define('K_THAI_TOPCHARS', true);
-
-	/**
-	 * if true allows to call TCPDF methods using HTML syntax
-	 * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
-	 */
-	define('K_TCPDF_CALLS_IN_HTML', true);
-}
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/tcpdf_config_alt.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/tcpdf_config_alt.php
deleted file mode 100644
index b3a91845b52..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/config/tcpdf_config_alt.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf_config.php
-// Begin       : 2004-06-11
-// Last Update : 2010-08-19
-//
-// Description : Alternative configuration file for TCPDF.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Alternative configuration file for TCPDF.
- * @author Nicola Asuni
- * @copyright 2004-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @version 4.9.005
- * @link http://tcpdf.sourceforge.net
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2004-10-27
- */
-
-// DOCUMENT_ROOT fix for IIS Webserver
-if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-	if(isset($_SERVER['SCRIPT_FILENAME'])) {
-		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
-	} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
-		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-	}	else {
-		// define here your DOCUMENT_ROOT path if the previous fails
-		$_SERVER['DOCUMENT_ROOT'] = '/var/www';
-	}
-}
-
-// Automatic calculation for the following K_PATH_MAIN constant
-$k_path_main = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
-if (substr($k_path_main, -1) != '/') {
-	$k_path_main .= '/';
-}
-
-/**
- * Installation path (/var/www/tcpdf/).
- * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
- */
-define ('K_PATH_MAIN', $k_path_main);
-
-// Automatic calculation for the following K_PATH_URL constant
-if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-	if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
-		$k_path_url = 'https://';
-	} else {
-		$k_path_url = 'http://';
-	}
-	$k_path_url .= $_SERVER['HTTP_HOST'];
-	$k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
-}
-
-/**
- * URL path to tcpdf installation folder (http://localhost/tcpdf/).
- * By default it is automatically calculated but you can also set it as a fixed string to improve performances..
- */
-define ('K_PATH_URL', $k_path_url);
-
-/**
- * path for PDF fonts
- * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
- */
-define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-/**
- * cache directory for temporary files (full path)
- */
-define ('K_PATH_CACHE', K_PATH_MAIN.'cache/');
-
-/**
- * cache directory for temporary files (url path)
- */
-define ('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
-
-/**
- *images directory
- */
-define ('K_PATH_IMAGES', K_PATH_MAIN.'images/');
-
-/**
- * blank image
- */
-define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
-
-/**
- * page format
- */
-define ('PDF_PAGE_FORMAT', 'A4');
-
-/**
- * page orientation (P=portrait, L=landscape)
- */
-define ('PDF_PAGE_ORIENTATION', 'P');
-
-/**
- * document creator
- */
-define ('PDF_CREATOR', 'TCPDF');
-
-/**
- * document author
- */
-define ('PDF_AUTHOR', 'TCPDF');
-
-/**
- * header title
- */
-define ('PDF_HEADER_TITLE', 'TCPDF Example');
-
-/**
- * header description string
- */
-define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
-
-/**
- * image logo
- */
-define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
-
-/**
- * header logo image width [mm]
- */
-define ('PDF_HEADER_LOGO_WIDTH', 30);
-
-/**
- *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
- */
-define ('PDF_UNIT', 'mm');
-
-/**
- * header margin
- */
-define ('PDF_MARGIN_HEADER', 5);
-
-/**
- * footer margin
- */
-define ('PDF_MARGIN_FOOTER', 10);
-
-/**
- * top margin
- */
-define ('PDF_MARGIN_TOP', 27);
-
-/**
- * bottom margin
- */
-define ('PDF_MARGIN_BOTTOM', 25);
-
-/**
- * left margin
- */
-define ('PDF_MARGIN_LEFT', 15);
-
-/**
- * right margin
- */
-define ('PDF_MARGIN_RIGHT', 15);
-
-/**
- * default main font name
- */
-define ('PDF_FONT_NAME_MAIN', 'helvetica');
-
-/**
- * default main font size
- */
-define ('PDF_FONT_SIZE_MAIN', 10);
-
-/**
- * default data font name
- */
-define ('PDF_FONT_NAME_DATA', 'helvetica');
-
-/**
- * default data font size
- */
-define ('PDF_FONT_SIZE_DATA', 8);
-
-/**
- * default monospaced font name
- */
-define ('PDF_FONT_MONOSPACED', 'courier');
-
-/**
- * ratio used to adjust the conversion of pixels to user units
- */
-define ('PDF_IMAGE_SCALE_RATIO', 1.25);
-
-/**
- * magnification factor for titles
- */
-define('HEAD_MAGNIFICATION', 1.1);
-
-/**
- * height of cell repect font height
- */
-define('K_CELL_HEIGHT_RATIO', 1.25);
-
-/**
- * title magnification respect main font size
- */
-define('K_TITLE_MAGNIFICATION', 1.3);
-
-/**
- * reduction factor for small font
- */
-define('K_SMALL_RATIO', 2/3);
-
-/**
- * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
- */
-define('K_THAI_TOPCHARS', true);
-
-/**
- * if true allows to call TCPDF methods using HTML syntax
- * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
- */
-define('K_TCPDF_CALLS_IN_HTML', true);
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/README.TXT b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/README.TXT
deleted file mode 100644
index c27086f2850..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/README.TXT
+++ /dev/null
@@ -1,3 +0,0 @@
-This folder contains fonts descriptions for TCPDF.
-All fonts names must be in lowercase.
-Please read the documentation on subfolders for copyright, license and other information.
\ No newline at end of file
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/almohanad.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/almohanad.php
deleted file mode 100644
index 787921ebc1f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/almohanad.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='AlMohanad';
-$desc=array('Ascent'=>1093,'Descent'=>-509,'CapHeight'=>1093,'Flags'=>32,'FontBBox'=>'[-278 -507 1124 1093]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-136;
-$ut=64;
-$dw=600;
-$cw=array(
-	0=>0,32=>139,33=>185,34=>308,35=>278,36=>278,37=>556,38=>463,39=>154,40=>185,41=>185,42=>278,43=>317,44=>139,45=>185,46=>139,
-	47=>154,48=>278,49=>278,50=>278,51=>278,52=>278,53=>278,54=>278,55=>278,56=>278,57=>278,58=>185,59=>185,60=>317,61=>317,62=>317,
-	63=>278,64=>517,65=>401,66=>371,67=>401,68=>402,69=>371,70=>339,71=>432,72=>430,73=>214,74=>278,75=>424,76=>369,77=>524,78=>401,
-	79=>432,80=>339,81=>432,82=>396,83=>309,84=>371,85=>401,86=>401,87=>556,88=>401,89=>401,90=>371,91=>185,92=>154,93=>185,94=>323,
-	95=>278,96=>185,97=>278,98=>309,99=>247,100=>309,101=>247,102=>185,103=>278,104=>309,105=>154,106=>185,107=>309,108=>154,109=>463,110=>309,
-	111=>278,112=>309,113=>309,114=>247,115=>216,116=>185,117=>309,118=>278,119=>401,120=>278,121=>278,122=>247,123=>219,124=>122,125=>219,126=>289,
-	8364=>278,1027=>339,8218=>185,1107=>254,8222=>278,8230=>556,8224=>278,8225=>278,710=>185,8240=>556,352=>309,8249=>185,338=>556,1036=>432,381=>371,1039=>432,
-	8216=>185,8217=>185,8220=>278,8221=>278,8226=>194,8211=>278,8212=>556,732=>185,8482=>556,353=>216,8250=>185,339=>401,1116=>297,382=>247,376=>401,161=>185,
-	162=>278,163=>278,164=>278,165=>278,166=>122,167=>278,168=>185,169=>415,170=>167,171=>278,172=>317,174=>415,175=>185,176=>222,177=>317,178=>167,
-	179=>167,180=>185,181=>309,182=>300,183=>139,184=>185,185=>167,186=>183,187=>278,188=>417,189=>417,190=>417,191=>278,192=>401,193=>401,194=>401,
-	195=>401,196=>401,197=>401,198=>556,199=>401,200=>371,201=>371,202=>371,203=>371,204=>216,205=>216,206=>216,207=>216,208=>401,209=>401,210=>432,
-	211=>432,212=>432,213=>432,214=>432,215=>317,216=>432,217=>401,218=>401,219=>401,220=>401,221=>401,222=>339,223=>309,224=>278,225=>278,226=>278,
-	227=>278,228=>278,229=>278,230=>401,231=>247,232=>247,233=>247,234=>247,235=>247,236=>154,237=>154,238=>154,239=>154,240=>278,241=>309,242=>278,
-	243=>278,244=>278,245=>278,246=>278,247=>317,248=>278,249=>309,250=>309,251=>309,252=>309,253=>278,254=>309,255=>278,256=>401,257=>278,258=>401,
-	259=>278,260=>401,261=>278,262=>401,263=>247,264=>401,265=>247,266=>401,267=>247,268=>401,269=>247,270=>401,271=>309,272=>401,273=>309,274=>371,
-	275=>247,276=>371,277=>247,278=>371,279=>247,280=>371,281=>247,282=>371,283=>247,284=>432,285=>278,286=>432,287=>278,288=>432,289=>278,290=>432,
-	291=>278,292=>432,293=>309,294=>432,295=>309,296=>216,297=>154,298=>216,299=>154,300=>216,301=>154,302=>216,303=>154,304=>216,305=>154,306=>490,
-	307=>270,308=>278,309=>185,310=>432,311=>309,312=>297,313=>371,314=>154,315=>371,316=>154,317=>371,318=>154,319=>371,320=>293,321=>371,322=>154,
-	323=>401,324=>309,325=>401,326=>309,327=>401,328=>309,329=>391,330=>401,331=>309,332=>432,333=>278,334=>432,335=>278,336=>432,337=>278,340=>401,
-	341=>247,342=>401,343=>247,344=>401,345=>247,346=>309,347=>216,348=>309,349=>216,350=>309,351=>216,354=>371,355=>185,356=>371,357=>185,358=>371,
-	359=>185,360=>401,361=>309,362=>401,363=>309,364=>401,365=>309,366=>401,367=>309,368=>401,369=>309,370=>401,371=>309,372=>556,373=>401,374=>401,
-	375=>278,377=>371,378=>247,379=>371,380=>247,383=>185,450=>317,477=>247,484=>432,485=>278,536=>309,537=>216,538=>371,539=>185,658=>282,711=>185,
-	728=>185,729=>185,730=>185,731=>185,733=>185,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-	779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,
-	795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,
-	811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,
-	827=>0,828=>0,829=>0,830=>0,831=>0,864=>0,865=>0,884=>111,885=>111,890=>0,894=>185,900=>100,901=>183,902=>401,903=>139,904=>451,
-	905=>532,906=>316,908=>451,910=>501,911=>451,912=>183,913=>401,914=>371,915=>339,916=>422,917=>371,918=>371,919=>432,920=>432,921=>216,922=>432,
-	923=>401,924=>524,925=>401,926=>361,927=>432,928=>451,929=>339,931=>361,932=>371,933=>401,934=>482,935=>401,936=>482,937=>451,938=>0,939=>401,
-	940=>336,941=>244,942=>336,943=>183,944=>306,945=>336,946=>306,947=>306,948=>306,949=>244,950=>275,951=>336,952=>306,953=>183,954=>338,955=>275,
-	956=>336,957=>275,958=>275,959=>306,960=>336,961=>306,962=>244,963=>306,964=>244,965=>306,966=>367,967=>275,968=>397,969=>397,970=>183,971=>306,
-	972=>306,973=>306,974=>397,976=>306,977=>306,978=>401,979=>401,980=>401,981=>367,982=>336,986=>283,987=>237,988=>339,989=>261,1024=>371,1025=>371,
-	1026=>371,1028=>401,1029=>309,1030=>216,1031=>216,1032=>278,1033=>573,1034=>573,1035=>449,1037=>432,1038=>401,1040=>401,1041=>371,1042=>371,1043=>328,1044=>432,
-	1045=>371,1046=>615,1047=>313,1048=>429,1049=>429,1050=>424,1051=>432,1052=>524,1053=>432,1054=>432,1055=>430,1056=>339,1057=>401,1058=>371,1059=>401,1060=>444,
-	1061=>401,1062=>429,1063=>432,1064=>618,1065=>618,1066=>482,1067=>539,1068=>350,1069=>401,1070=>619,1071=>408,1072=>278,1073=>278,1074=>279,1075=>246,1076=>309,
-	1077=>247,1078=>417,1079=>227,1080=>319,1081=>319,1082=>297,1083=>302,1084=>376,1085=>309,1086=>278,1087=>309,1088=>309,1089=>247,1090=>274,1091=>278,1092=>458,
-	1093=>278,1094=>309,1095=>309,1096=>454,1097=>454,1098=>340,1099=>423,1100=>284,1101=>247,1102=>439,1103=>284,1104=>247,1105=>247,1106=>309,1108=>247,1109=>216,
-	1110=>154,1111=>154,1112=>185,1113=>440,1114=>437,1115=>309,1117=>309,1118=>278,1119=>309,1164=>339,1165=>284,1166=>339,1167=>309,1168=>339,1169=>254,1170=>339,
-	1171=>254,1172=>339,1173=>254,1174=>615,1175=>417,1176=>322,1177=>216,1178=>432,1179=>297,1180=>432,1181=>297,1182=>432,1183=>297,1184=>537,1185=>352,1186=>432,
-	1187=>309,1188=>563,1189=>408,1190=>432,1191=>461,1192=>401,1193=>247,1194=>401,1195=>247,1196=>371,1197=>274,1198=>401,1199=>278,1200=>401,1201=>278,1202=>401,
-	1203=>278,1204=>581,1205=>432,1206=>432,1207=>309,1208=>432,1209=>309,1210=>432,1211=>309,1212=>367,1213=>247,1214=>367,1215=>247,1216=>216,1217=>615,1218=>417,
-	1219=>432,1220=>297,1223=>432,1224=>309,1227=>432,1228=>309,1232=>401,1233=>278,1234=>401,1235=>278,1236=>556,1237=>401,1238=>371,1239=>247,1240=>367,1241=>247,
-	1242=>367,1243=>247,1244=>615,1245=>417,1246=>313,1247=>227,1248=>322,1249=>216,1250=>432,1251=>309,1252=>432,1253=>309,1254=>432,1255=>278,1256=>432,1257=>278,
-	1258=>432,1259=>278,1260=>401,1261=>247,1262=>401,1263=>278,1264=>401,1265=>278,1266=>401,1267=>278,1268=>432,1269=>309,1272=>548,1273=>423,1488=>280,1489=>280,
-	1490=>174,1491=>280,1492=>280,1493=>158,1494=>158,1495=>280,1496=>280,1497=>158,1498=>287,1499=>280,1500=>280,1501=>280,1502=>280,1503=>156,1504=>158,1505=>280,
-	1506=>280,1507=>292,1508=>280,1509=>273,1510=>280,1511=>305,1512=>285,1513=>299,1514=>280,1548=>195,1563=>246,1567=>340,1569=>392,1570=>306,1571=>247,1572=>447,
-	1573=>247,1574=>602,1575=>192,1576=>635,1577=>369,1578=>635,1579=>635,1580=>548,1581=>1173,1582=>548,1583=>363,1584=>363,1585=>439,1586=>442,1587=>875,1588=>875,
-	1589=>1061,1590=>1061,1591=>811,1592=>811,1593=>549,1594=>547,1600=>389,1601=>755,1602=>574,1603=>717,1604=>555,1605=>423,1606=>532,1607=>371,1608=>454,1609=>633,
-	1610=>643,1611=>-19,1612=>-26,1613=>-20,1614=>-19,1615=>-18,1616=>-19,1617=>-19,1618=>-15,1632=>383,1633=>383,1634=>383,1635=>383,1636=>383,1637=>383,1638=>383,
-	1639=>383,1640=>383,1641=>383,1642=>383,1645=>398,7936=>336,7937=>336,7938=>336,7939=>336,7940=>336,7941=>336,7942=>336,7943=>336,7944=>401,7945=>401,7946=>401,
-	7947=>401,7948=>401,7949=>401,7950=>401,7951=>401,7952=>244,7953=>244,7954=>244,7955=>244,7956=>244,7957=>244,7960=>371,7961=>371,7962=>371,7963=>371,7964=>371,
-	7965=>371,7968=>336,7969=>336,7970=>336,7971=>336,7972=>336,7973=>336,7974=>336,7975=>336,7976=>432,7977=>432,7978=>432,7979=>432,7980=>432,7981=>432,7982=>432,
-	7983=>432,7984=>183,7985=>183,7986=>183,7987=>183,7988=>183,7989=>183,7990=>183,7991=>183,7992=>216,7993=>216,7994=>216,7995=>216,7996=>216,7997=>216,7998=>216,
-	7999=>216,8000=>306,8001=>306,8002=>306,8003=>306,8004=>306,8005=>306,8008=>432,8009=>432,8010=>432,8011=>432,8012=>432,8013=>432,8016=>306,8017=>306,8018=>306,
-	8019=>306,8020=>306,8021=>306,8022=>306,8023=>306,8025=>401,8027=>401,8029=>401,8031=>401,8032=>397,8033=>397,8034=>397,8035=>397,8036=>397,8037=>397,8038=>397,
-	8039=>397,8040=>451,8041=>451,8042=>451,8043=>451,8044=>451,8045=>451,8046=>451,8047=>451,8048=>336,8049=>336,8050=>244,8051=>244,8052=>336,8053=>336,8054=>183,
-	8055=>183,8056=>306,8057=>306,8058=>306,8059=>306,8060=>397,8061=>397,8064=>336,8065=>336,8066=>336,8067=>336,8068=>336,8069=>336,8070=>336,8071=>336,8072=>401,
-	8073=>401,8074=>401,8075=>401,8076=>401,8077=>401,8078=>401,8079=>401,8080=>336,8081=>336,8082=>336,8083=>336,8084=>336,8085=>336,8086=>336,8087=>336,8088=>432,
-	8089=>432,8090=>432,8091=>432,8092=>432,8093=>432,8094=>432,8095=>432,8096=>397,8097=>397,8098=>397,8099=>397,8100=>397,8101=>397,8102=>397,8103=>397,8104=>451,
-	8105=>451,8106=>451,8107=>451,8108=>451,8109=>451,8110=>451,8111=>451,8112=>336,8113=>336,8114=>336,8115=>336,8116=>336,8118=>336,8119=>336,8120=>401,8121=>401,
-	8122=>401,8123=>401,8124=>401,8125=>278,8126=>0,8127=>278,8128=>278,8129=>306,8130=>336,8131=>336,8132=>336,8134=>336,8135=>336,8136=>371,8137=>371,8138=>432,
-	8139=>432,8140=>432,8141=>278,8142=>278,8143=>278,8144=>183,8145=>183,8146=>183,8147=>183,8150=>183,8151=>183,8152=>216,8153=>216,8154=>216,8155=>216,8157=>278,
-	8158=>278,8159=>278,8160=>306,8161=>306,8162=>306,8163=>306,8164=>306,8165=>306,8166=>306,8167=>306,8168=>401,8169=>401,8170=>401,8171=>401,8172=>339,8173=>306,
-	8174=>306,8175=>278,8178=>397,8179=>397,8180=>397,8182=>397,8183=>397,8184=>432,8185=>432,8186=>451,8187=>451,8188=>451,8189=>278,8190=>278,8208=>185,8209=>185,
-	8219=>185,8223=>278,8227=>311,8241=>1011,8248=>261,8251=>404,8253=>386,8255=>529,8256=>529,8257=>188,8258=>517,8259=>185,8260=>93,8261=>184,8262=>184,8267=>300,
-	8308=>167,8309=>556,8321=>167,8322=>167,8323=>167,8324=>167,8352=>394,8353=>401,8354=>435,8355=>339,8356=>278,8357=>463,8358=>401,8359=>389,8361=>556,8470=>530,
-	8471=>415,8479=>401,8483=>401,8486=>451,8487=>451,8494=>306,8498=>339,8543=>417,8706=>274,8710=>340,8721=>396,8722=>317,8730=>305,8734=>418,8800=>317,8804=>317,
-	8805=>317,9674=>274,12353=>556,12354=>556,12355=>556,12356=>556,12357=>556,12358=>556,12359=>556,12360=>556,12361=>556,12362=>556,12363=>556,12364=>556,12365=>556,12366=>556,
-	12367=>556,12368=>556,12369=>556,12370=>556,12371=>556,12372=>556,12373=>556,12374=>556,12375=>556,12376=>556,12377=>556,12378=>556,12379=>556,12380=>556,12381=>556,12382=>556,
-	12383=>556,12384=>556,12385=>556,12386=>556,12387=>556,12388=>556,12389=>556,12390=>556,12391=>556,12392=>556,12393=>556,12394=>556,12395=>556,12396=>556,12397=>556,12398=>556,
-	12399=>556,12400=>556,12401=>556,12402=>556,12403=>556,12404=>556,12405=>556,12406=>556,12407=>556,12408=>556,12409=>556,12410=>556,12411=>556,12412=>556,12413=>556,12414=>556,
-	12415=>556,12416=>556,12417=>556,12418=>556,12419=>556,12420=>556,12421=>556,12422=>556,12423=>556,12424=>556,12425=>556,12426=>556,12427=>556,12428=>556,12429=>556,12430=>556,
-	12431=>556,12432=>556,12433=>556,12434=>556,12435=>556,12449=>556,12450=>556,12451=>556,12452=>556,12453=>556,12454=>556,12455=>556,12456=>556,12457=>556,12458=>556,12459=>556,
-	12460=>556,12461=>556,12462=>556,12463=>556,12464=>556,12465=>556,12466=>556,12467=>556,12468=>556,12469=>556,12470=>556,12471=>556,12472=>556,12473=>556,12474=>556,12475=>556,
-	12476=>556,12477=>556,12478=>556,12479=>556,12480=>556,12481=>556,12482=>556,12483=>556,12484=>556,12485=>556,12486=>556,12487=>556,12488=>556,12489=>556,12490=>556,12491=>556,
-	12492=>556,12493=>556,12494=>556,12495=>556,12496=>556,12497=>556,12498=>556,12499=>556,12500=>556,12501=>556,12502=>556,12503=>556,12504=>556,12505=>556,12506=>556,12507=>556,
-	12508=>556,12509=>556,12510=>556,12511=>556,12512=>556,12513=>556,12514=>556,12515=>556,12516=>556,12517=>556,12518=>556,12519=>556,12520=>556,12521=>556,12522=>556,12523=>556,
-	12524=>556,12525=>556,12526=>556,12527=>556,12528=>556,12529=>556,12530=>556,12531=>556,12532=>556,12533=>556,12534=>556,63033=>278,63034=>278,63035=>278,63036=>278,63037=>278,
-	63038=>278,63039=>278,63040=>278,63041=>278,63171=>185,63196=>278,64256=>309,64257=>309,64258=>309,64259=>463,64260=>463,64262=>402,64606=>0,64607=>0,64608=>0,64609=>0,
-	64610=>0,64830=>467,64831=>467,65010=>814,65152=>392,65153=>306,65154=>281,65155=>247,65156=>250,65157=>447,65158=>412,65159=>247,65160=>222,65161=>602,65162=>535,65163=>360,
-	65164=>329,65165=>192,65166=>220,65167=>635,65168=>644,65169=>338,65170=>321,65171=>369,65172=>419,65173=>635,65174=>644,65175=>345,65176=>336,65177=>635,65178=>644,65179=>393,
-	65180=>345,65181=>548,65182=>553,65183=>637,65184=>652,65185=>548,65186=>546,65187=>637,65188=>656,65189=>548,65190=>544,65191=>637,65192=>656,65193=>363,65194=>439,65195=>363,
-	65196=>439,65197=>440,65198=>471,65199=>439,65200=>474,65201=>875,65202=>871,65203=>608,65204=>588,65205=>875,65206=>871,65207=>609,65208=>587,65209=>1061,65210=>1033,65211=>794,
-	65212=>758,65213=>1061,65214=>1033,65215=>794,65216=>761,65217=>811,65218=>793,65219=>659,65220=>647,65221=>811,65222=>793,65223=>659,65224=>642,65225=>549,65226=>481,65227=>512,
-	65228=>409,65229=>547,65230=>476,65231=>512,65232=>409,65233=>755,65234=>748,65235=>416,65236=>442,65237=>574,65238=>550,65239=>416,65240=>442,65241=>717,65242=>687,65243=>883,
-	65244=>409,65245=>555,65246=>511,65247=>338,65248=>297,65249=>423,65250=>478,65251=>489,65252=>476,65253=>532,65254=>548,65255=>336,65256=>326,65257=>371,65258=>391,65259=>524,
-	65260=>412,65261=>454,65262=>412,65263=>633,65264=>566,65265=>643,65266=>560,65267=>357,65268=>333,65269=>623,65270=>617,65271=>603,65272=>621,65273=>576,65274=>617,65275=>576,
-	65276=>625);
-$enc='';
-$diff='';
-$file='almohanad.z';
-$ctg='almohanad.ctg.z';
-$originalsize=227760;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-simplified.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-simplified.php
deleted file mode 100644
index d0b9ad8d6ca..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-simplified.php
+++ /dev/null
@@ -1,1768 +0,0 @@
-<?php
-$type='cidfont0';
-$name='ArialUnicodeMS';
-$desc=array('Ascent'=>1069,'Descent'=>-271,'CapHeight'=>1069,'Flags'=>32,'FontBBox'=>'[-1011 -330 2260 1078]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=1000;
-$cw=array(
-	32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,
-	48=>556,49=>556,50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,60=>584,61=>584,62=>584,63=>556,
-	64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-	80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>278,92=>278,93=>278,94=>469,95=>500,
-	96=>333,97=>556,98=>556,99=>500,100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,109=>833,110=>556,111=>556,
-	112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,8364=>556,
-	1027=>567,8218=>222,402=>278,8222=>333,8230=>1000,8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,1036=>584,381=>611,1039=>723,8216=>222,
-	8217=>222,8220=>333,8221=>333,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>500,8250=>333,339=>944,1116=>437,382=>500,376=>667,160=>278,161=>333,
-	162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,172=>584,173=>333,174=>737,175=>500,176=>400,177=>584,
-	178=>333,179=>333,180=>333,181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,190=>834,191=>611,192=>667,193=>667,
-	194=>667,195=>667,196=>667,197=>667,198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,208=>722,209=>722,
-	210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-	226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,
-	242=>556,243=>556,244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>667,257=>556,
-	258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,268=>722,269=>500,270=>722,271=>627,272=>722,273=>556,
-	274=>667,275=>556,276=>667,277=>556,278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,288=>778,289=>556,
-	290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>222,298=>278,299=>222,300=>278,301=>222,302=>278,303=>222,304=>278,305=>278,
-	306=>751,307=>444,308=>500,309=>222,310=>667,311=>500,312=>437,313=>556,314=>222,315=>556,316=>222,317=>556,318=>222,319=>556,320=>318,321=>556,
-	322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,328=>556,329=>626,330=>723,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-	340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,350=>667,351=>500,354=>611,355=>278,356=>611,357=>406,
-	358=>611,359=>278,360=>722,361=>556,362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,372=>944,373=>722,
-	374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>222,384=>556,385=>740,386=>655,387=>556,388=>556,389=>556,390=>722,391=>766,392=>579,
-	393=>722,394=>789,395=>655,396=>556,397=>557,398=>667,399=>729,400=>604,401=>611,403=>791,404=>649,405=>806,406=>245,407=>322,408=>667,409=>500,
-	410=>322,411=>500,412=>833,413=>722,414=>556,415=>778,416=>776,417=>556,418=>1019,419=>782,420=>735,421=>556,422=>722,423=>667,424=>500,425=>602,
-	426=>366,427=>278,428=>571,429=>278,430=>611,431=>776,432=>620,433=>748,434=>667,435=>752,436=>615,437=>611,438=>500,439=>628,440=>628,441=>526,
-	442=>480,443=>556,444=>556,445=>526,446=>556,447=>556,448=>278,449=>464,450=>474,451=>278,452=>1333,453=>1222,454=>1056,455=>1030,456=>778,457=>444,
-	458=>1222,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,
-	474=>556,475=>722,476=>556,477=>556,478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,488=>667,489=>500,
-	490=>778,491=>556,492=>778,493=>556,494=>534,495=>534,496=>222,497=>1333,498=>1222,499=>1056,500=>778,501=>556,506=>667,507=>556,508=>1000,509=>889,
-	510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,
-	526=>778,527=>556,528=>722,529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,
-	598=>556,599=>556,600=>556,601=>556,602=>777,603=>485,604=>485,605=>686,606=>519,607=>260,608=>556,609=>556,610=>557,611=>500,612=>500,613=>556,
-	614=>556,615=>556,616=>242,617=>282,618=>356,619=>356,620=>425,621=>222,622=>635,623=>833,624=>833,625=>833,626=>556,627=>556,628=>558,629=>556,
-	630=>715,631=>674,632=>558,633=>333,634=>333,635=>333,636=>333,637=>333,638=>312,639=>312,640=>530,641=>530,642=>500,643=>216,644=>276,645=>216,
-	646=>222,647=>278,648=>278,649=>596,650=>558,651=>556,652=>500,653=>722,654=>500,655=>500,656=>500,657=>564,658=>530,659=>530,660=>464,661=>464,
-	662=>464,663=>500,664=>614,665=>526,666=>519,667=>557,668=>558,669=>222,670=>500,671=>416,672=>556,673=>464,674=>464,675=>966,676=>966,677=>1030,
-	678=>689,679=>484,680=>718,688=>326,689=>326,690=>153,691=>201,692=>201,693=>201,694=>304,695=>389,696=>278,697=>222,698=>372,699=>222,700=>222,
-	701=>222,702=>222,703=>222,704=>250,705=>250,706=>320,707=>320,708=>320,709=>320,711=>333,712=>192,713=>333,714=>333,715=>333,716=>192,717=>333,
-	718=>333,719=>333,720=>300,721=>300,722=>222,723=>222,724=>340,725=>340,726=>280,727=>362,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-	736=>278,737=>153,738=>270,739=>274,740=>325,741=>360,742=>360,743=>360,744=>360,745=>360,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-	774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,
-	790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,
-	806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-	822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-	864=>0,865=>0,884=>308,885=>308,890=>278,894=>278,900=>278,901=>278,902=>667,903=>278,904=>704,905=>759,906=>315,908=>778,910=>746,911=>758,
-	912=>222,913=>667,914=>667,915=>550,916=>682,917=>667,918=>611,919=>722,920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>650,927=>778,
-	928=>722,929=>667,931=>602,932=>611,933=>667,934=>808,935=>667,936=>804,937=>758,938=>278,939=>667,940=>576,941=>434,942=>556,943=>222,944=>551,
-	945=>576,946=>563,947=>500,948=>557,949=>434,950=>440,951=>556,952=>556,953=>222,954=>498,955=>500,956=>553,957=>500,958=>432,959=>556,960=>678,
-	961=>571,962=>472,963=>619,964=>382,965=>551,966=>649,967=>522,968=>729,969=>766,970=>222,971=>551,972=>556,973=>551,974=>766,976=>563,977=>616,
-	978=>631,979=>726,980=>631,981=>644,982=>781,986=>722,988=>578,990=>570,992=>692,994=>880,995=>833,996=>684,997=>558,998=>680,999=>529,1000=>557,
-	1001=>505,1002=>623,1003=>603,1004=>610,1005=>611,1006=>568,1007=>434,1008=>600,1009=>571,1010=>500,1011=>222,1025=>667,1026=>865,1028=>717,1029=>667,1030=>278,
-	1031=>278,1032=>500,1033=>1105,1034=>1009,1035=>867,1038=>635,1040=>667,1041=>655,1042=>667,1043=>567,1044=>677,1045=>667,1046=>923,1047=>604,1048=>722,1049=>722,
-	1050=>584,1051=>705,1052=>833,1053=>722,1054=>778,1055=>723,1056=>667,1057=>722,1058=>611,1059=>635,1060=>760,1061=>667,1062=>740,1063=>684,1064=>920,1065=>939,
-	1066=>793,1067=>883,1068=>655,1069=>717,1070=>1006,1071=>722,1072=>556,1073=>573,1074=>531,1075=>383,1076=>583,1077=>556,1078=>669,1079=>458,1080=>559,1081=>559,
-	1082=>437,1083=>571,1084=>683,1085=>552,1086=>556,1087=>542,1088=>556,1089=>500,1090=>458,1091=>500,1092=>823,1093=>500,1094=>562,1095=>533,1096=>802,1097=>823,
-	1098=>620,1099=>717,1100=>523,1101=>510,1102=>744,1103=>542,1105=>556,1106=>556,1107=>383,1108=>510,1109=>500,1110=>222,1111=>278,1112=>222,1113=>873,1114=>811,
-	1115=>556,1118=>500,1119=>542,1120=>976,1121=>766,1122=>656,1123=>521,1124=>950,1125=>694,1126=>667,1127=>597,1128=>952,1129=>817,1130=>654,1131=>600,1132=>932,
-	1133=>817,1134=>604,1135=>458,1136=>804,1137=>729,1138=>778,1139=>556,1140=>667,1141=>500,1142=>667,1143=>500,1144=>1279,1145=>1060,1146=>778,1147=>556,1148=>976,
-	1149=>766,1150=>976,1151=>766,1152=>722,1153=>514,1154=>686,1155=>334,1156=>382,1157=>334,1158=>334,1168=>435,1169=>339,1170=>567,1171=>383,1172=>656,1173=>556,
-	1174=>923,1175=>669,1176=>604,1177=>458,1178=>584,1179=>437,1180=>584,1181=>437,1182=>584,1183=>437,1184=>764,1185=>537,1186=>741,1187=>573,1188=>900,1189=>670,
-	1190=>736,1191=>560,1192=>778,1193=>560,1194=>722,1195=>500,1196=>611,1197=>458,1198=>667,1199=>500,1200=>667,1201=>500,1202=>667,1203=>500,1204=>916,1205=>661,
-	1206=>684,1207=>533,1208=>684,1209=>533,1210=>684,1211=>556,1212=>829,1213=>667,1214=>829,1215=>667,1216=>278,1217=>923,1218=>669,1219=>584,1220=>437,1223=>735,
-	1224=>570,1227=>684,1228=>533,1232=>667,1233=>556,1234=>667,1235=>556,1236=>1000,1237=>889,1238=>667,1239=>556,1240=>729,1241=>556,1242=>729,1243=>556,1244=>923,
-	1245=>669,1246=>604,1247=>458,1248=>604,1249=>492,1250=>722,1251=>559,1252=>722,1253=>559,1254=>778,1255=>556,1256=>778,1257=>556,1258=>778,1259=>556,1262=>635,
-	1263=>500,1264=>635,1265=>500,1266=>635,1267=>500,1268=>684,1269=>533,1272=>883,1273=>717,1329=>635,1330=>531,1331=>583,1332=>583,1333=>531,1334=>531,1335=>427,
-	1336=>531,1337=>750,1338=>635,1339=>531,1340=>375,1341=>583,1342=>698,1343=>531,1344=>427,1345=>531,1346=>583,1347=>531,1348=>635,1349=>698,1350=>635,1351=>635,
-	1352=>531,1353=>531,1354=>698,1355=>531,1356=>635,1357=>531,1358=>698,1359=>583,1360=>479,1361=>583,1362=>531,1363=>698,1364=>698,1365=>635,1366=>750,1369=>271,
-	1370=>271,1371=>150,1372=>300,1373=>271,1374=>271,1375=>420,1377=>583,1378=>427,1379=>427,1380=>427,1381=>427,1382=>427,1383=>427,1384=>427,1385=>459,1386=>427,
-	1387=>427,1388=>323,1389=>531,1390=>427,1391=>427,1392=>427,1393=>427,1394=>427,1395=>427,1396=>427,1397=>271,1398=>427,1399=>375,1400=>427,1401=>375,1402=>583,
-	1403=>427,1404=>427,1405=>427,1406=>427,1407=>583,1408=>427,1409=>427,1410=>323,1411=>583,1412=>375,1413=>375,1414=>583,1415=>527,1417=>271,1425=>360,1426=>360,
-	1427=>360,1428=>360,1429=>360,1430=>360,1431=>360,1432=>360,1433=>360,1434=>360,1435=>360,1436=>360,1437=>360,1438=>360,1439=>360,1440=>360,1441=>360,1443=>360,
-	1444=>360,1445=>360,1446=>360,1447=>360,1448=>360,1449=>360,1450=>360,1451=>360,1452=>360,1453=>360,1454=>360,1455=>360,1456=>360,1457=>360,1458=>360,1459=>360,
-	1460=>360,1461=>360,1462=>360,1463=>360,1464=>360,1465=>360,1467=>360,1468=>360,1469=>360,1470=>366,1471=>360,1472=>225,1473=>360,1474=>360,1475=>238,1476=>360,
-	1488=>577,1489=>563,1490=>411,1491=>512,1492=>594,1493=>316,1494=>326,1495=>594,1496=>594,1497=>316,1498=>507,1499=>527,1500=>484,1501=>594,1502=>594,1503=>316,
-	1504=>338,1505=>604,1506=>550,1507=>567,1508=>569,1509=>505,1510=>514,1511=>583,1512=>507,1513=>700,1514=>633,1520=>590,1521=>590,1522=>590,1523=>216,1524=>412,
-	1548=>278,1563=>278,1567=>556,1569=>529,1570=>243,1571=>243,1572=>470,1573=>243,1574=>731,1575=>243,1576=>771,1577=>514,1578=>771,1579=>771,1580=>544,1581=>544,
-	1582=>544,1583=>430,1584=>430,1585=>421,1586=>421,1587=>1194,1588=>1194,1589=>1291,1590=>1291,1591=>843,1592=>843,1593=>594,1594=>594,1600=>279,1601=>957,1602=>800,
-	1603=>757,1604=>662,1605=>589,1606=>692,1607=>514,1608=>470,1609=>731,1610=>731,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,
-	1632=>480,1633=>480,1634=>480,1635=>480,1636=>480,1637=>480,1638=>480,1639=>480,1640=>480,1641=>480,1642=>547,1643=>278,1644=>278,1645=>438,1648=>0,1649=>243,
-	1650=>243,1651=>243,1652=>0,1653=>380,1654=>470,1655=>548,1656=>772,1657=>771,1658=>771,1659=>771,1660=>771,1661=>771,1662=>771,1663=>771,1664=>771,1665=>544,
-	1666=>544,1667=>544,1668=>544,1669=>544,1670=>544,1671=>544,1672=>430,1673=>430,1674=>430,1675=>430,1676=>430,1677=>430,1678=>430,1679=>430,1680=>430,1681=>421,
-	1682=>421,1683=>421,1684=>421,1685=>421,1686=>419,1687=>421,1688=>421,1689=>421,1690=>1194,1691=>1194,1692=>1194,1693=>1291,1694=>1291,1695=>843,1696=>594,1697=>957,
-	1698=>957,1699=>957,1700=>957,1701=>957,1702=>957,1703=>800,1704=>800,1705=>828,1706=>1058,1707=>828,1708=>757,1709=>757,1710=>757,1711=>828,1712=>828,1713=>828,
-	1714=>828,1715=>828,1716=>828,1717=>662,1718=>662,1719=>662,1722=>692,1723=>692,1724=>692,1725=>692,1726=>706,1728=>514,1729=>509,1730=>509,1731=>509,1732=>470,
-	1733=>470,1734=>470,1735=>470,1736=>470,1737=>470,1738=>470,1739=>470,1740=>731,1741=>841,1742=>731,1744=>731,1745=>731,1746=>550,1747=>550,1748=>279,1749=>514,
-	1750=>726,1751=>558,1752=>321,1753=>318,1754=>342,1755=>373,1756=>716,1757=>688,1758=>852,1759=>288,1760=>288,1761=>388,1762=>350,1763=>716,1764=>146,1765=>282,
-	1766=>339,1767=>339,1768=>415,1769=>514,1770=>220,1771=>220,1772=>220,1773=>350,1776=>480,1777=>480,1778=>480,1779=>480,1780=>480,1781=>480,1782=>480,1783=>480,
-	1784=>480,1785=>480,2305=>0,2306=>0,2307=>294,2309=>693,2310=>910,2311=>533,2312=>533,2313=>590,2314=>713,2315=>920,2316=>677,2317=>611,2318=>611,2319=>611,
-	2320=>611,2321=>910,2322=>910,2323=>910,2324=>910,2325=>667,2326=>732,2327=>593,2328=>639,2329=>624,2330=>688,2331=>713,2332=>688,2333=>712,2334=>697,2335=>502,
-	2336=>533,2337=>583,2338=>523,2339=>693,2340=>585,2341=>638,2342=>533,2343=>640,2344=>585,2345=>585,2346=>565,2347=>699,2348=>592,2349=>689,2350=>633,2351=>600,
-	2352=>486,2353=>486,2354=>680,2355=>730,2356=>730,2357=>592,2358=>684,2359=>608,2360=>646,2361=>546,2364=>0,2365=>373,2366=>319,2367=>319,2368=>319,2369=>0,
-	2370=>0,2371=>0,2372=>0,2373=>0,2374=>0,2375=>0,2376=>0,2377=>319,2378=>319,2379=>319,2380=>319,2381=>0,2384=>884,2385=>0,2386=>0,2387=>0,
-	2388=>0,2392=>667,2393=>732,2394=>593,2395=>688,2396=>583,2397=>523,2398=>699,2399=>600,2400=>920,2401=>677,2402=>0,2403=>0,2404=>331,2405=>513,2406=>639,
-	2407=>639,2408=>639,2409=>639,2410=>639,2411=>639,2412=>639,2413=>639,2414=>639,2415=>639,2416=>362,2433=>0,2434=>430,2435=>430,2437=>786,2438=>1030,2439=>582,
-	2440=>603,2441=>648,2442=>757,2443=>758,2444=>630,2447=>685,2448=>746,2451=>711,2452=>776,2453=>779,2454=>655,2455=>606,2456=>645,2457=>661,2458=>554,2459=>585,
-	2460=>729,2461=>752,2462=>893,2463=>567,2464=>625,2465=>648,2466=>567,2467=>598,2468=>680,2469=>645,2470=>609,2471=>596,2472=>595,2474=>635,2475=>780,2476=>593,
-	2477=>677,2478=>621,2479=>601,2480=>593,2482=>640,2486=>598,2487=>596,2488=>637,2489=>582,2492=>0,2494=>245,2495=>245,2496=>245,2497=>0,2498=>0,2499=>0,
-	2500=>0,2503=>309,2504=>309,2507=>932,2508=>932,2509=>0,2519=>245,2524=>648,2525=>553,2527=>596,2528=>758,2529=>630,2530=>0,2531=>335,2534=>610,2535=>559,
-	2536=>595,2537=>711,2538=>610,2539=>661,2540=>661,2541=>559,2542=>661,2543=>600,2544=>593,2545=>593,2546=>601,2547=>567,2548=>601,2549=>699,2550=>661,2551=>267,
-	2552=>610,2553=>424,2554=>548,2562=>0,2565=>691,2566=>936,2567=>803,2568=>803,2569=>678,2570=>678,2575=>557,2576=>691,2579=>678,2580=>691,2581=>602,2582=>567,
-	2583=>641,2584=>688,2585=>565,2586=>592,2587=>603,2588=>591,2589=>541,2590=>558,2591=>543,2592=>581,2593=>596,2594=>640,2595=>640,2596=>591,2597=>564,2598=>640,
-	2599=>564,2600=>581,2602=>564,2603=>551,2604=>560,2605=>549,2606=>558,2607=>652,2608=>540,2610=>677,2611=>677,2613=>601,2614=>558,2616=>558,2617=>549,2620=>0,
-	2622=>246,2623=>246,2624=>246,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>567,2650=>690,2651=>591,2652=>591,2654=>581,2662=>591,
-	2663=>591,2664=>591,2665=>591,2666=>591,2667=>591,2668=>591,2669=>591,2670=>591,2671=>591,2672=>0,2673=>0,2674=>557,2675=>678,2676=>894,2689=>0,2690=>0,
-	2691=>300,2693=>781,2694=>1044,2695=>589,2696=>589,2697=>560,2698=>758,2699=>806,2701=>781,2703=>781,2704=>781,2705=>1044,2707=>1044,2708=>1044,2709=>413,2710=>773,
-	2711=>606,2712=>558,2713=>483,2714=>600,2715=>691,2716=>811,2717=>647,2718=>651,2719=>453,2720=>450,2721=>425,2722=>478,2723=>694,2724=>534,2725=>553,2726=>446,
-	2727=>541,2728=>582,2730=>572,2731=>437,2732=>663,2733=>756,2734=>594,2735=>493,2736=>392,2738=>613,2739=>656,2741=>538,2742=>611,2743=>507,2744=>663,2745=>587,
-	2748=>0,2749=>478,2750=>273,2751=>273,2752=>273,2753=>0,2754=>0,2755=>0,2756=>0,2757=>0,2759=>0,2760=>0,2761=>273,2763=>273,2764=>273,2765=>0,
-	2768=>843,2784=>893,2790=>625,2791=>625,2792=>625,2793=>625,2794=>625,2795=>625,2796=>625,2797=>625,2798=>625,2799=>625,2817=>0,2818=>306,2819=>391,2821=>590,
-	2822=>808,2823=>658,2824=>658,2825=>633,2826=>654,2827=>636,2828=>540,2831=>560,2832=>938,2835=>600,2836=>973,2837=>603,2838=>620,2839=>620,2840=>605,2841=>712,
-	2842=>579,2843=>579,2844=>593,2845=>564,2846=>581,2847=>604,2848=>578,2849=>579,2850=>579,2851=>607,2852=>579,2853=>587,2854=>579,2855=>602,2856=>579,2858=>605,
-	2859=>728,2860=>579,2861=>643,2862=>605,2863=>628,2864=>619,2866=>653,2867=>593,2870=>620,2871=>605,2872=>605,2873=>579,2876=>0,2877=>333,2878=>218,2879=>0,
-	2880=>294,2881=>0,2882=>0,2883=>0,2887=>479,2888=>479,2891=>1026,2892=>1026,2893=>0,2902=>0,2903=>218,2908=>579,2909=>579,2911=>599,2912=>636,2913=>540,
-	2918=>578,2919=>480,2920=>480,2921=>622,2922=>506,2923=>605,2924=>529,2925=>548,2926=>512,2927=>528,2928=>561,2946=>0,2947=>742,2949=>1002,2950=>1118,2951=>994,
-	2952=>660,2953=>1012,2954=>1231,2958=>726,2959=>731,2960=>870,2962=>763,2963=>763,2964=>1636,2965=>667,2969=>830,2970=>584,2972=>876,2974=>986,2975=>802,2979=>1295,
-	2980=>656,2984=>630,2985=>1012,2986=>694,2990=>727,2991=>790,2992=>545,2993=>718,2994=>821,2995=>871,2996=>724,2997=>873,2999=>1087,3000=>1098,3001=>1274,3006=>547,
-	3007=>172,3008=>93,3009=>519,3010=>814,3014=>748,3015=>681,3016=>956,3018=>1666,3019=>1666,3020=>1994,3021=>0,3031=>871,3047=>667,3048=>1012,3049=>751,3050=>740,
-	3051=>924,3052=>884,3053=>726,3054=>1002,3055=>825,3056=>717,3057=>719,3058=>774,3073=>365,3074=>601,3075=>346,3077=>720,3078=>786,3079=>567,3080=>1159,3081=>690,
-	3082=>1047,3083=>1299,3084=>913,3086=>625,3087=>625,3088=>712,3090=>655,3091=>655,3092=>862,3093=>515,3094=>680,3095=>526,3096=>943,3097=>655,3098=>684,3099=>684,
-	3100=>670,3101=>1205,3102=>732,3103=>888,3104=>597,3105=>709,3106=>709,3107=>809,3108=>715,3109=>702,3110=>702,3111=>702,3112=>607,3114=>623,3115=>623,3116=>681,
-	3117=>681,3118=>932,3119=>1203,3120=>597,3121=>893,3122=>631,3123=>608,3125=>620,3126=>541,3127=>667,3128=>640,3129=>911,3134=>644,3135=>298,3136=>298,3137=>361,
-	3138=>682,3139=>342,3140=>704,3142=>624,3143=>624,3144=>900,3146=>849,3147=>849,3148=>976,3149=>669,3157=>298,3158=>119,3168=>1620,3169=>1281,3174=>840,3175=>840,
-	3176=>840,3177=>840,3178=>840,3179=>840,3180=>840,3181=>840,3182=>840,3183=>840,3202=>440,3203=>251,3205=>654,3206=>654,3207=>631,3208=>891,3209=>957,3210=>1293,
-	3211=>1044,3212=>744,3214=>650,3215=>650,3216=>659,3218=>667,3219=>667,3220=>667,3221=>462,3222=>749,3223=>543,3224=>779,3225=>674,3226=>682,3227=>660,3228=>667,
-	3229=>1171,3230=>926,3231=>671,3232=>557,3233=>669,3234=>669,3235=>728,3236=>544,3237=>672,3238=>672,3239=>672,3240=>560,3242=>668,3243=>668,3244=>681,3245=>687,
-	3246=>972,3247=>1101,3248=>556,3249=>677,3250=>661,3251=>545,3253=>666,3254=>553,3255=>670,3256=>549,3257=>716,3262=>425,3263=>341,3264=>680,3265=>354,3266=>714,
-	3267=>386,3268=>638,3270=>307,3271=>670,3272=>462,3274=>908,3275=>1251,3276=>434,3277=>336,3285=>344,3286=>404,3294=>673,3296=>1695,3297=>978,3302=>549,3303=>549,
-	3304=>549,3305=>549,3306=>549,3307=>549,3308=>549,3309=>549,3310=>549,3311=>549,3330=>368,3331=>305,3333=>1201,3334=>1351,3335=>905,3336=>1459,3337=>635,3338=>1198,
-	3339=>861,3340=>957,3342=>1211,3343=>1202,3344=>1839,3346=>642,3347=>1114,3348=>1195,3349=>861,3350=>982,3351=>874,3352=>1354,3353=>957,3354=>1016,3355=>1266,3356=>712,
-	3357=>1454,3358=>1215,3359=>563,3360=>565,3361=>1192,3362=>1244,3363=>1268,3364=>878,3365=>966,3366=>545,3367=>879,3368=>879,3370=>1031,3371=>1175,3372=>1334,3373=>546,
-	3374=>643,3375=>949,3376=>642,3377=>555,3378=>945,3379=>631,3380=>553,3381=>959,3382=>936,3383=>1122,3384=>1190,3385=>1112,3390=>475,3391=>418,3392=>442,3393=>340,
-	3394=>340,3395=>473,3398=>640,3399=>530,3400=>1279,3402=>1368,3403=>1258,3404=>1447,3405=>0,3415=>553,3424=>861,3425=>1100,3430=>1095,3431=>929,3432=>854,3433=>1181,
-	3434=>658,3435=>972,3436=>1210,3437=>650,3438=>959,3439=>896,3585=>595,3586=>648,3587=>665,3588=>608,3589=>608,3590=>665,3591=>471,3592=>556,3593=>652,3594=>664,
-	3595=>681,3596=>816,3597=>849,3598=>620,3599=>620,3600=>541,3601=>785,3602=>826,3603=>887,3604=>598,3605=>605,3606=>595,3607=>650,3608=>541,3609=>652,3610=>608,
-	3611=>608,3612=>630,3613=>630,3614=>695,3615=>695,3616=>620,3617=>581,3618=>588,3619=>501,3620=>595,3621=>569,3622=>620,3623=>519,3624=>592,3625=>659,3626=>574,
-	3627=>654,3628=>695,3629=>566,3630=>574,3631=>517,3632=>452,3633=>0,3634=>496,3635=>496,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-	3647=>687,3648=>302,3649=>571,3650=>478,3651=>515,3652=>515,3653=>496,3654=>506,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,
-	3663=>555,3664=>598,3665=>640,3666=>688,3667=>690,3668=>657,3669=>657,3670=>635,3671=>839,3672=>693,3673=>769,3674=>673,3675=>994,3713=>775,3714=>707,3716=>724,
-	3719=>524,3720=>690,3722=>678,3725=>711,3732=>719,3733=>834,3734=>776,3735=>916,3737=>744,3738=>740,3739=>740,3740=>834,3741=>834,3742=>854,3743=>854,3745=>775,
-	3746=>724,3747=>697,3749=>700,3751=>700,3754=>708,3755=>916,3757=>700,3758=>697,3759=>658,3760=>432,3761=>534,3762=>476,3763=>476,3764=>778,3765=>778,3766=>778,
-	3767=>778,3768=>778,3769=>778,3771=>778,3772=>778,3773=>670,3776=>420,3777=>806,3778=>430,3779=>446,3780=>346,3782=>571,3784=>778,3785=>778,3786=>778,3787=>778,
-	3788=>778,3789=>778,3792=>721,3793=>719,3794=>601,3795=>711,3796=>686,3797=>686,3798=>834,3799=>756,3800=>724,3801=>906,3804=>1272,3805=>1272,3840=>600,3841=>600,
-	3842=>600,3843=>600,3844=>600,3845=>600,3846=>600,3847=>600,3848=>600,3849=>600,3850=>600,3851=>600,3852=>600,3853=>600,3854=>600,3855=>600,3856=>600,3857=>600,
-	3858=>600,3859=>600,3860=>600,3861=>600,3862=>600,3863=>600,3864=>600,3865=>600,3866=>600,3867=>600,3868=>600,3869=>600,3870=>600,3871=>600,3872=>600,3873=>600,
-	3874=>600,3875=>600,3876=>600,3877=>600,3878=>600,3879=>600,3880=>600,3881=>600,3882=>600,3883=>600,3884=>600,3885=>600,3886=>600,3887=>600,3888=>600,3889=>600,
-	3890=>600,3891=>600,3892=>600,3893=>600,3894=>600,3895=>600,3896=>600,3897=>600,3898=>600,3899=>600,3900=>600,3901=>600,3902=>600,3903=>600,3904=>600,3905=>600,
-	3906=>600,3907=>600,3908=>600,3909=>600,3910=>600,3911=>600,3913=>600,3914=>600,3915=>600,3916=>600,3917=>600,3918=>600,3919=>600,3920=>600,3921=>600,3922=>600,
-	3923=>600,3924=>600,3925=>600,3926=>600,3927=>600,3928=>600,3929=>600,3930=>600,3931=>600,3932=>600,3933=>600,3934=>600,3935=>600,3936=>600,3937=>600,3938=>600,
-	3939=>600,3940=>600,3941=>600,3942=>600,3943=>600,3944=>600,3945=>600,3953=>600,3954=>600,3955=>600,3956=>600,3957=>600,3958=>600,3959=>600,3960=>600,3961=>600,
-	3962=>600,3963=>600,3964=>600,3965=>600,3966=>600,3967=>600,3968=>600,3969=>600,3970=>600,3971=>600,3972=>600,3973=>600,3974=>600,3975=>600,3976=>600,3977=>600,
-	3978=>600,3979=>600,3984=>600,3985=>600,3986=>600,3987=>600,3988=>600,3989=>600,3991=>600,3993=>600,3994=>600,3995=>600,3996=>600,3997=>600,3998=>600,3999=>600,
-	4000=>600,4001=>600,4002=>600,4003=>600,4004=>600,4005=>600,4006=>600,4007=>600,4008=>600,4009=>600,4010=>600,4011=>600,4012=>600,4013=>600,4017=>600,4018=>600,
-	4019=>600,4020=>600,4021=>600,4022=>600,4023=>600,4025=>600,4256=>662,4257=>677,4258=>708,4259=>696,4260=>609,4261=>790,4262=>664,4263=>785,4264=>560,4265=>634,
-	4266=>782,4267=>701,4268=>629,4269=>682,4270=>705,4271=>692,4272=>734,4273=>615,4274=>592,4275=>680,4276=>679,4277=>705,4278=>643,4279=>623,4280=>623,4281=>629,
-	4282=>633,4283=>770,4284=>592,4285=>662,4286=>629,4287=>672,4288=>735,4289=>576,4290=>606,4291=>605,4292=>676,4293=>792,4304=>435,4305=>556,4306=>565,4307=>872,
-	4308=>506,4309=>544,4310=>723,4311=>868,4312=>530,4313=>532,4314=>955,4315=>552,4316=>565,4317=>712,4318=>547,4319=>574,4320=>685,4321=>554,4322=>806,4323=>810,
-	4324=>777,4325=>502,4326=>686,4327=>512,4328=>552,4329=>496,4330=>568,4331=>552,4332=>592,4333=>565,4334=>552,4335=>741,4336=>549,4337=>659,4338=>559,4339=>524,
-	4340=>482,4341=>565,4342=>822,4347=>506,4352=>1000,4353=>1000,4354=>1000,4355=>1000,4356=>1000,4357=>1000,4358=>1000,4359=>1000,4360=>1000,4361=>1000,4362=>1000,4363=>1000,
-	4364=>1000,4365=>1000,4366=>1000,4367=>1000,4368=>1000,4369=>1000,4370=>1000,4371=>1000,4372=>1000,4373=>1000,4374=>1000,4375=>1000,4376=>1000,4377=>1000,4378=>1000,4379=>1000,
-	4380=>1000,4381=>1000,4382=>1000,4383=>1000,4384=>1000,4385=>1000,4386=>1000,4387=>1000,4388=>1000,4389=>1000,4390=>1000,4391=>1000,4392=>1000,4393=>1000,4394=>1000,4395=>1000,
-	4396=>1000,4397=>1000,4398=>1000,4399=>1000,4400=>1000,4401=>1000,4402=>1000,4403=>1000,4404=>1000,4405=>1000,4406=>1000,4407=>1000,4408=>1000,4409=>1000,4410=>1000,4411=>1000,
-	4412=>1000,4413=>1000,4414=>1000,4415=>1000,4416=>1000,4417=>1000,4418=>1000,4419=>1000,4420=>1000,4421=>1000,4422=>1000,4423=>1000,4424=>1000,4425=>1000,4426=>1000,4427=>1000,
-	4428=>1000,4429=>1000,4430=>1000,4431=>1000,4432=>1000,4433=>1000,4434=>1000,4435=>1000,4436=>1000,4437=>1000,4438=>1000,4439=>1000,4440=>1000,4441=>1000,4447=>1000,4448=>1000,
-	4449=>1000,4450=>1000,4451=>1000,4452=>1000,4453=>1000,4454=>1000,4455=>1000,4456=>1000,4457=>1000,4458=>1000,4459=>1000,4460=>1000,4461=>1000,4462=>1000,4463=>1000,4464=>1000,
-	4465=>1000,4466=>1000,4467=>1000,4468=>1000,4469=>1000,4470=>1000,4471=>1000,4472=>1000,4473=>1000,4474=>1000,4475=>1000,4476=>1000,4477=>1000,4478=>1000,4479=>1000,4480=>1000,
-	4481=>1000,4482=>1000,4483=>1000,4484=>1000,4485=>1000,4486=>1000,4487=>1000,4488=>1000,4489=>1000,4490=>1000,4491=>1000,4492=>1000,4493=>1000,4494=>1000,4495=>1000,4496=>1000,
-	4497=>1000,4498=>1000,4499=>1000,4500=>1000,4501=>1000,4502=>1000,4503=>1000,4504=>1000,4505=>1000,4506=>1000,4507=>1000,4508=>1000,4509=>1000,4510=>1000,4511=>1000,4512=>1000,
-	4513=>1000,4514=>1000,4520=>1000,4521=>1000,4522=>1000,4523=>1000,4524=>1000,4525=>1000,4526=>1000,4527=>1000,4528=>1000,4529=>1000,4530=>1000,4531=>1000,4532=>1000,4533=>1000,
-	4534=>1000,4535=>1000,4536=>1000,4537=>1000,4538=>1000,4539=>1000,4540=>1000,4541=>1000,4542=>1000,4543=>1000,4544=>1000,4545=>1000,4546=>1000,4547=>1000,4548=>1000,4549=>1000,
-	4550=>1000,4551=>1000,4552=>1000,4553=>1000,4554=>1000,4555=>1000,4556=>1000,4557=>1000,4558=>1000,4559=>1000,4560=>1000,4561=>1000,4562=>1000,4563=>1000,4564=>1000,4565=>1000,
-	4566=>1000,4567=>1000,4568=>1000,4569=>1000,4570=>1000,4571=>1000,4572=>1000,4573=>1000,4574=>1000,4575=>1000,4576=>1000,4577=>1000,4578=>1000,4579=>1000,4580=>1000,4581=>1000,
-	4582=>1000,4583=>1000,4584=>1000,4585=>1000,4586=>1000,4587=>1000,4588=>1000,4589=>1000,4590=>1000,4591=>1000,4592=>1000,4593=>1000,4594=>1000,4595=>1000,4596=>1000,4597=>1000,
-	4598=>1000,4599=>1000,4600=>1000,4601=>1000,7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,7691=>556,
-	7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,
-	7708=>667,7709=>556,7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,7721=>556,7722=>722,7723=>556,
-	7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-	7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,
-	7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,7771=>333,
-	7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,
-	7788=>611,7789=>278,7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,
-	7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-	7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,7831=>278,7832=>722,7833=>500,7834=>556,7835=>278,
-	7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,7855=>556,
-	7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,
-	7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,7885=>556,7886=>778,7887=>556,
-	7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,7895=>556,7896=>778,7897=>556,7898=>776,7899=>556,7900=>776,7901=>556,7902=>776,7903=>556,
-	7904=>776,7905=>556,7906=>776,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>620,7914=>776,7915=>620,7916=>776,7917=>620,7918=>776,7919=>620,
-	7920=>776,7921=>620,7922=>667,7923=>500,7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>576,7937=>576,7938=>576,7939=>576,7940=>576,7941=>576,
-	7942=>576,7943=>576,7944=>667,7945=>667,7946=>680,7947=>680,7948=>680,7949=>680,7950=>718,7951=>718,7952=>434,7953=>434,7954=>434,7955=>434,7956=>434,7957=>434,
-	7960=>692,7961=>692,7962=>823,7963=>823,7964=>823,7965=>823,7968=>556,7969=>556,7970=>556,7971=>556,7972=>556,7973=>556,7974=>556,7975=>556,7976=>747,7977=>747,
-	7978=>878,7979=>878,7980=>878,7981=>878,7982=>923,7983=>923,7984=>222,7985=>222,7986=>222,7987=>222,7988=>222,7989=>222,7990=>222,7991=>222,7992=>303,7993=>303,
-	7994=>434,7995=>434,7996=>434,7997=>434,7998=>479,7999=>479,8000=>556,8001=>556,8002=>556,8003=>556,8004=>556,8005=>556,8008=>778,8009=>778,8010=>894,8011=>894,
-	8012=>894,8013=>894,8016=>551,8017=>551,8018=>551,8019=>551,8020=>551,8021=>551,8022=>551,8023=>551,8025=>777,8027=>893,8029=>885,8031=>940,8032=>766,8033=>766,
-	8034=>766,8035=>766,8036=>766,8037=>766,8038=>766,8039=>766,8040=>758,8041=>758,8042=>874,8043=>874,8044=>868,8045=>867,8046=>911,8047=>911,8048=>576,8049=>576,
-	8050=>434,8051=>434,8052=>556,8053=>556,8054=>222,8055=>222,8056=>556,8057=>556,8058=>551,8059=>551,8060=>766,8061=>766,8064=>576,8065=>576,8066=>576,8067=>576,
-	8068=>576,8069=>576,8070=>576,8071=>576,8072=>667,8073=>667,8074=>680,8075=>680,8076=>680,8077=>680,8078=>718,8079=>718,8080=>556,8081=>556,8082=>556,8083=>556,
-	8084=>556,8085=>556,8086=>556,8087=>556,8088=>747,8089=>747,8090=>878,8091=>878,8092=>878,8093=>878,8094=>923,8095=>923,8096=>766,8097=>766,8098=>766,8099=>766,
-	8100=>766,8101=>766,8102=>766,8103=>766,8104=>758,8105=>758,8106=>874,8107=>874,8108=>868,8109=>867,8110=>911,8111=>911,8112=>576,8113=>576,8114=>576,8115=>576,
-	8116=>576,8118=>576,8119=>576,8120=>667,8121=>667,8122=>667,8123=>667,8124=>667,8125=>278,8126=>278,8127=>278,8128=>278,8129=>278,8130=>556,8131=>556,8132=>556,
-	8134=>556,8135=>556,8136=>693,8137=>704,8138=>748,8139=>759,8140=>722,8141=>278,8142=>278,8143=>278,8144=>222,8145=>222,8146=>222,8147=>222,8150=>222,8151=>222,
-	8152=>278,8153=>278,8154=>304,8155=>304,8157=>278,8158=>278,8159=>278,8160=>551,8161=>551,8162=>551,8163=>551,8164=>571,8165=>571,8166=>551,8167=>551,8168=>667,
-	8169=>667,8170=>742,8171=>746,8172=>693,8173=>278,8174=>278,8175=>278,8178=>766,8179=>766,8180=>766,8182=>766,8183=>766,8184=>778,8185=>778,8186=>758,8187=>758,
-	8188=>758,8189=>278,8190=>278,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>100,8202=>50,8203=>0,8204=>0,
-	8205=>0,8208=>333,8209=>333,8210=>556,8213=>564,8214=>428,8215=>500,8219=>222,8223=>333,8227=>350,8228=>278,8229=>556,8231=>278,8232=>0,8233=>0,8241=>1330,
-	8242=>222,8243=>372,8244=>522,8245=>206,8246=>356,8247=>506,8248=>312,8251=>1000,8252=>471,8253=>556,8254=>500,8255=>945,8256=>945,8257=>312,8258=>820,8259=>333,
-	8260=>167,8261=>278,8262=>278,8304=>333,8308=>333,8309=>333,8310=>333,8311=>333,8312=>333,8313=>333,8314=>333,8315=>333,8316=>333,8317=>210,8318=>210,8319=>333,
-	8320=>333,8321=>333,8322=>333,8323=>333,8324=>333,8325=>333,8326=>333,8327=>333,8328=>333,8329=>333,8330=>333,8331=>333,8332=>333,8333=>210,8334=>210,8352=>556,
-	8353=>556,8354=>556,8355=>556,8356=>556,8357=>833,8358=>556,8359=>556,8360=>1024,8361=>940,8362=>784,8363=>556,8400=>600,8401=>600,8402=>600,8403=>600,8404=>700,
-	8405=>700,8406=>600,8407=>600,8408=>600,8409=>600,8410=>600,8411=>600,8412=>600,8413=>900,8414=>900,8415=>900,8416=>900,8417=>700,8448=>889,8449=>889,8450=>667,
-	8451=>1022,8452=>611,8453=>889,8454=>889,8455=>501,8456=>667,8457=>921,8458=>510,8459=>906,8460=>988,8461=>722,8462=>500,8463=>500,8464=>688,8465=>553,8466=>708,
-	8467=>291,8468=>778,8469=>722,8470=>1073,8471=>737,8472=>740,8473=>556,8474=>722,8475=>927,8476=>795,8477=>667,8478=>667,8479=>667,8480=>1000,8481=>1174,8483=>722,
-	8484=>611,8485=>542,8486=>768,8487=>768,8488=>698,8489=>321,8490=>667,8491=>667,8492=>927,8493=>646,8494=>556,8495=>385,8496=>615,8497=>688,8498=>611,8499=>1115,
-	8500=>406,8501=>688,8502=>688,8503=>344,8504=>688,8531=>834,8532=>834,8533=>834,8534=>834,8535=>834,8536=>834,8537=>834,8538=>834,8539=>834,8540=>834,8541=>834,
-	8542=>834,8543=>834,8544=>278,8545=>555,8546=>832,8547=>933,8548=>667,8549=>934,8550=>1031,8551=>1268,8552=>944,8553=>667,8554=>944,8555=>1035,8556=>556,8557=>722,
-	8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>700,8564=>500,8565=>700,8566=>922,8567=>1144,8568=>712,8569=>500,8570=>712,8571=>934,8572=>222,8573=>500,
-	8574=>556,8575=>833,8576=>983,8577=>722,8578=>983,8592=>713,8593=>713,8594=>713,8595=>713,8596=>713,8597=>713,8598=>713,8599=>713,8600=>713,8601=>713,8602=>713,
-	8603=>713,8604=>713,8605=>713,8606=>713,8607=>713,8608=>713,8609=>713,8610=>713,8611=>713,8612=>713,8613=>713,8614=>713,8615=>713,8616=>713,8617=>713,8618=>713,
-	8619=>713,8620=>713,8621=>813,8622=>813,8623=>713,8624=>713,8625=>713,8626=>713,8627=>713,8628=>713,8629=>713,8630=>713,8631=>713,8632=>713,8633=>713,8634=>800,
-	8635=>800,8636=>713,8637=>713,8638=>713,8639=>713,8640=>713,8641=>713,8642=>713,8643=>713,8644=>713,8645=>713,8646=>713,8647=>713,8648=>713,8649=>713,8650=>713,
-	8651=>713,8652=>713,8653=>713,8654=>950,8655=>713,8656=>713,8657=>713,8658=>713,8659=>713,8660=>863,8661=>713,8662=>713,8663=>713,8664=>713,8665=>713,8666=>713,
-	8667=>713,8668=>813,8669=>813,8670=>713,8671=>713,8672=>713,8673=>713,8674=>713,8675=>713,8676=>713,8677=>713,8678=>713,8679=>713,8680=>713,8681=>713,8682=>713,
-	8704=>600,8705=>600,8706=>494,8707=>600,8708=>600,8709=>800,8710=>612,8711=>612,8712=>549,8713=>549,8714=>549,8715=>549,8716=>549,8717=>549,8718=>549,8719=>823,
-	8720=>823,8721=>713,8722=>584,8723=>584,8724=>584,8725=>167,8726=>278,8727=>389,8728=>400,8729=>400,8730=>600,8731=>600,8732=>600,8733=>549,8734=>549,8735=>584,
-	8736=>584,8737=>584,8738=>584,8739=>260,8740=>444,8741=>418,8742=>602,8743=>561,8744=>561,8745=>561,8746=>561,8747=>506,8748=>806,8749=>1106,8750=>506,8751=>806,
-	8752=>1106,8753=>506,8754=>506,8755=>506,8756=>561,8757=>561,8758=>422,8759=>561,8760=>584,8761=>584,8762=>584,8763=>584,8764=>584,8765=>584,8766=>584,8767=>584,
-	8768=>422,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,8775=>584,8776=>584,8777=>584,8778=>584,8779=>584,8780=>584,8781=>584,8782=>584,8783=>584,
-	8784=>584,8785=>584,8786=>584,8787=>584,8788=>737,8789=>737,8790=>584,8791=>584,8792=>584,8793=>584,8794=>584,8795=>584,8796=>584,8797=>584,8798=>584,8799=>584,
-	8800=>584,8801=>584,8802=>584,8803=>584,8804=>584,8805=>584,8806=>584,8807=>584,8808=>584,8809=>584,8810=>969,8811=>969,8812=>584,8813=>584,8814=>584,8815=>584,
-	8816=>584,8817=>584,8818=>584,8819=>584,8820=>584,8821=>584,8822=>584,8823=>584,8824=>584,8825=>584,8826=>584,8827=>584,8828=>584,8829=>584,8830=>584,8831=>584,
-	8832=>584,8833=>584,8834=>678,8835=>678,8836=>678,8837=>678,8838=>678,8839=>678,8840=>678,8841=>678,8842=>678,8843=>678,8844=>561,8845=>561,8846=>561,8847=>678,
-	8848=>678,8849=>673,8850=>673,8851=>561,8852=>561,8853=>800,8854=>800,8855=>800,8856=>800,8857=>800,8858=>800,8859=>800,8860=>800,8861=>800,8862=>800,8863=>800,
-	8864=>800,8865=>800,8866=>549,8867=>549,8868=>549,8869=>549,8870=>399,8871=>399,8872=>549,8873=>549,8874=>549,8875=>672,8876=>549,8877=>549,8878=>549,8879=>672,
-	8880=>549,8881=>549,8882=>549,8883=>549,8884=>549,8885=>549,8886=>713,8887=>713,8888=>713,8889=>549,8890=>549,8891=>584,8892=>584,8893=>584,8894=>584,8895=>584,
-	8896=>561,8897=>561,8898=>561,8899=>561,8900=>549,8901=>250,8902=>549,8903=>649,8904=>630,8905=>630,8906=>630,8907=>630,8908=>630,8909=>584,8910=>561,8911=>561,
-	8912=>668,8913=>668,8914=>668,8915=>668,8916=>561,8917=>602,8918=>584,8919=>584,8920=>1354,8921=>1354,8922=>584,8923=>584,8924=>584,8925=>584,8926=>584,8927=>584,
-	8928=>584,8929=>584,8930=>673,8931=>673,8932=>673,8933=>673,8934=>584,8935=>584,8936=>584,8937=>584,8938=>584,8939=>584,8940=>584,8941=>584,8942=>278,8943=>1000,
-	8944=>1000,8945=>1000,8960=>549,8962=>549,8963=>549,8964=>549,8965=>549,8966=>549,8967=>549,8968=>449,8969=>449,8970=>449,8971=>449,8972=>549,8973=>549,8974=>549,
-	8975=>549,8976=>549,8977=>549,8978=>800,8979=>800,8980=>549,8981=>549,8982=>549,8983=>650,8984=>780,8985=>549,8986=>549,8987=>549,8988=>549,8989=>549,8990=>549,
-	8991=>549,8992=>506,8993=>506,8994=>713,8995=>713,8996=>1000,8997=>1000,8998=>1000,8999=>1000,9000=>1000,9001=>329,9002=>329,9003=>1000,9004=>549,9005=>549,9006=>549,
-	9007=>549,9008=>549,9009=>549,9010=>549,9011=>549,9012=>549,9013=>549,9014=>600,9015=>600,9016=>600,9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,
-	9023=>600,9024=>600,9025=>600,9026=>600,9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,9037=>600,9038=>600,
-	9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,
-	9055=>600,9056=>600,9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,9067=>600,9068=>600,9069=>600,9070=>600,
-	9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9109=>600,9216=>600,9217=>600,9218=>600,
-	9219=>600,9220=>600,9221=>600,9222=>600,9223=>600,9224=>600,9225=>600,9226=>600,9227=>600,9228=>600,9229=>600,9230=>600,9231=>600,9232=>600,9233=>600,9234=>600,
-	9235=>600,9236=>600,9237=>600,9238=>600,9239=>600,9240=>600,9241=>600,9242=>600,9243=>600,9244=>600,9245=>600,9246=>600,9247=>600,9248=>600,9249=>600,9250=>600,
-	9251=>600,9252=>600,9280=>604,9281=>604,9282=>604,9283=>604,9284=>604,9285=>604,9286=>750,9287=>750,9288=>750,9289=>750,9290=>604,9312=>1000,9313=>1000,9314=>1000,
-	9315=>1000,9316=>1000,9317=>1000,9318=>1000,9319=>1000,9320=>1000,9321=>1000,9322=>1000,9323=>1000,9324=>1000,9325=>1000,9326=>1000,9327=>1000,9328=>1000,9329=>1000,9330=>1000,
-	9331=>1000,9332=>1000,9333=>1000,9334=>1000,9335=>1000,9336=>1000,9337=>1000,9338=>1000,9339=>1000,9340=>1000,9341=>1000,9342=>1000,9343=>1000,9344=>1000,9345=>1000,9346=>1000,
-	9347=>1000,9348=>1000,9349=>1000,9350=>1000,9351=>1000,9352=>1000,9353=>1000,9354=>1000,9355=>1000,9356=>1000,9357=>1000,9358=>1000,9359=>1000,9360=>1000,9361=>1000,9362=>1000,
-	9363=>1000,9364=>1000,9365=>1000,9366=>1000,9367=>1000,9368=>1000,9369=>1000,9370=>1000,9371=>1000,9372=>1000,9373=>1000,9374=>1000,9375=>1000,9376=>1000,9377=>1000,9378=>1000,
-	9379=>1000,9380=>1000,9381=>1000,9382=>1000,9383=>1000,9384=>1000,9385=>1000,9386=>1000,9387=>1000,9388=>1000,9389=>1000,9390=>1000,9391=>1000,9392=>1000,9393=>1000,9394=>1000,
-	9395=>1000,9396=>1000,9397=>1000,9398=>1000,9399=>1000,9400=>1000,9401=>1000,9402=>1000,9403=>1000,9404=>1000,9405=>1000,9406=>1000,9407=>1000,9408=>1000,9409=>1000,9410=>1000,
-	9411=>1000,9412=>1000,9413=>1000,9414=>1000,9415=>1000,9416=>1000,9417=>1000,9418=>1000,9419=>1000,9420=>1000,9421=>1000,9422=>1000,9423=>1000,9424=>1000,9425=>1000,9426=>1000,
-	9427=>1000,9428=>1000,9429=>1000,9430=>1000,9431=>1000,9432=>1000,9433=>1000,9434=>1000,9435=>1000,9436=>1000,9437=>1000,9438=>1000,9439=>1000,9440=>1000,9441=>1000,9442=>1000,
-	9443=>1000,9444=>1000,9445=>1000,9446=>1000,9447=>1000,9448=>1000,9449=>1000,9450=>1000,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,
-	9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,
-	9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,
-	9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,
-	9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,
-	9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,
-	9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,
-	9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,
-	9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,
-	9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,
-	9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,
-	9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,
-	9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,
-	9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,
-	9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9728=>750,9729=>1000,
-	9730=>750,9731=>750,9732=>1000,9733=>816,9734=>823,9735=>500,9736=>500,9737=>800,9738=>800,9739=>800,9740=>800,9741=>800,9742=>719,9743=>719,9744=>734,9745=>734,
-	9746=>734,9747=>762,9754=>960,9755=>960,9756=>939,9757=>939,9758=>939,9759=>939,9760=>750,9761=>600,9762=>750,9763=>750,9764=>580,9765=>460,9766=>444,9767=>650,
-	9768=>444,9769=>768,9770=>800,9771=>850,9772=>675,9773=>800,9774=>750,9775=>750,9776=>900,9777=>900,9778=>900,9779=>900,9780=>900,9781=>900,9782=>900,9783=>900,
-	9784=>750,9785=>750,9786=>750,9787=>750,9788=>750,9789=>750,9790=>750,9791=>740,9792=>740,9793=>740,9794=>740,9795=>653,9796=>490,9797=>632,9798=>780,9799=>560,
-	9800=>838,9801=>780,9802=>734,9803=>887,9804=>780,9805=>1080,9806=>896,9807=>1080,9808=>804,9809=>868,9810=>922,9811=>696,9812=>1000,9813=>1000,9814=>1000,9815=>1000,
-	9816=>1000,9817=>1000,9818=>1000,9819=>1000,9820=>1000,9821=>1000,9822=>1000,9823=>1000,9824=>722,9825=>734,9826=>674,9827=>804,9828=>722,9829=>734,9830=>674,9831=>804,
-	9832=>860,9833=>423,9834=>592,9835=>750,9836=>750,9837=>439,9838=>439,9839=>439,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,9993=>690,
-	9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,
-	10012=>754,10013=>494,10014=>552,10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,10026=>789,10027=>841,10028=>823,
-	10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,
-	10045=>682,10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,
-	10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,10084=>910,
-	10085=>667,10086=>760,10087=>760,10102=>788,10103=>788,10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,10114=>788,
-	10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,
-	10131=>788,10132=>894,10136=>748,10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,10147=>924,10148=>917,10149=>930,
-	10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,
-	10167=>888,10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,12288=>1000,12289=>1000,12290=>1000,12291=>1000,12292=>1000,12293=>1000,12294=>1000,12295=>1000,
-	12296=>1000,12297=>1000,12298=>1000,12299=>1000,12300=>1000,12301=>1000,12302=>1000,12303=>1000,12304=>1000,12305=>1000,12306=>1000,12307=>1000,12308=>1000,12309=>1000,12310=>1000,12311=>1000,
-	12312=>1000,12313=>1000,12314=>1000,12315=>1000,12316=>1000,12317=>1000,12318=>1000,12319=>1000,12320=>1000,12321=>1000,12322=>1000,12323=>1000,12324=>1000,12325=>1000,12326=>1000,12327=>1000,
-	12328=>1000,12329=>1000,12330=>1000,12331=>1000,12332=>1000,12333=>1000,12334=>1000,12335=>1000,12336=>1000,12337=>1000,12338=>1000,12339=>1000,12340=>1000,12341=>1000,12342=>1000,12343=>1000,
-	12351=>1000,12353=>1000,12354=>1000,12355=>1000,12356=>1000,12357=>1000,12358=>1000,12359=>1000,12360=>1000,12361=>1000,12362=>1000,12363=>1000,12364=>1000,12365=>1000,12366=>1000,12367=>1000,
-	12368=>1000,12369=>1000,12370=>1000,12371=>1000,12372=>1000,12373=>1000,12374=>1000,12375=>1000,12376=>1000,12377=>1000,12378=>1000,12379=>1000,12380=>1000,12381=>1000,12382=>1000,12383=>1000,
-	12384=>1000,12385=>1000,12386=>1000,12387=>1000,12388=>1000,12389=>1000,12390=>1000,12391=>1000,12392=>1000,12393=>1000,12394=>1000,12395=>1000,12396=>1000,12397=>1000,12398=>1000,12399=>1000,
-	12400=>1000,12401=>1000,12402=>1000,12403=>1000,12404=>1000,12405=>1000,12406=>1000,12407=>1000,12408=>1000,12409=>1000,12410=>1000,12411=>1000,12412=>1000,12413=>1000,12414=>1000,12415=>1000,
-	12416=>1000,12417=>1000,12418=>1000,12419=>1000,12420=>1000,12421=>1000,12422=>1000,12423=>1000,12424=>1000,12425=>1000,12426=>1000,12427=>1000,12428=>1000,12429=>1000,12430=>1000,12431=>1000,
-	12432=>1000,12433=>1000,12434=>1000,12435=>1000,12436=>1000,12441=>1000,12442=>1000,12443=>1000,12444=>1000,12445=>1000,12446=>1000,12449=>1000,12450=>1000,12451=>1000,12452=>1000,12453=>1000,
-	12454=>1000,12455=>1000,12456=>1000,12457=>1000,12458=>1000,12459=>1000,12460=>1000,12461=>1000,12462=>1000,12463=>1000,12464=>1000,12465=>1000,12466=>1000,12467=>1000,12468=>1000,12469=>1000,
-	12470=>1000,12471=>1000,12472=>1000,12473=>1000,12474=>1000,12475=>1000,12476=>1000,12477=>1000,12478=>1000,12479=>1000,12480=>1000,12481=>1000,12482=>1000,12483=>1000,12484=>1000,12485=>1000,
-	12486=>1000,12487=>1000,12488=>1000,12489=>1000,12490=>1000,12491=>1000,12492=>1000,12493=>1000,12494=>1000,12495=>1000,12496=>1000,12497=>1000,12498=>1000,12499=>1000,12500=>1000,12501=>1000,
-	12502=>1000,12503=>1000,12504=>1000,12505=>1000,12506=>1000,12507=>1000,12508=>1000,12509=>1000,12510=>1000,12511=>1000,12512=>1000,12513=>1000,12514=>1000,12515=>1000,12516=>1000,12517=>1000,
-	12518=>1000,12519=>1000,12520=>1000,12521=>1000,12522=>1000,12523=>1000,12524=>1000,12525=>1000,12526=>1000,12527=>1000,12528=>1000,12529=>1000,12530=>1000,12531=>1000,12532=>1000,12533=>1000,
-	12534=>1000,12535=>1000,12536=>1000,12537=>1000,12538=>1000,12539=>1000,12540=>1000,12541=>1000,12542=>1000,12549=>1000,12550=>1000,12551=>1000,12552=>1000,12553=>1000,12554=>1000,12555=>1000,
-	12556=>1000,12557=>1000,12558=>1000,12559=>1000,12560=>1000,12561=>1000,12562=>1000,12563=>1000,12564=>1000,12565=>1000,12566=>1000,12567=>1000,12568=>1000,12569=>1000,12570=>1000,12571=>1000,
-	12572=>1000,12573=>1000,12574=>1000,12575=>1000,12576=>1000,12577=>1000,12578=>1000,12579=>1000,12580=>1000,12581=>1000,12582=>1000,12583=>1000,12584=>1000,12585=>1000,12586=>1000,12587=>1000,
-	12588=>1000,12593=>1000,12594=>1000,12595=>1000,12596=>1000,12597=>1000,12598=>1000,12599=>1000,12600=>1000,12601=>1000,12602=>1000,12603=>1000,12604=>1000,12605=>1000,12606=>1000,12607=>1000,
-	12608=>1000,12609=>1000,12610=>1000,12611=>1000,12612=>1000,12613=>1000,12614=>1000,12615=>1000,12616=>1000,12617=>1000,12618=>1000,12619=>1000,12620=>1000,12621=>1000,12622=>1000,12623=>1000,
-	12624=>1000,12625=>1000,12626=>1000,12627=>1000,12628=>1000,12629=>1000,12630=>1000,12631=>1000,12632=>1000,12633=>1000,12634=>1000,12635=>1000,12636=>1000,12637=>1000,12638=>1000,12639=>1000,
-	12640=>1000,12641=>1000,12642=>1000,12643=>1000,12644=>1000,12645=>1000,12646=>1000,12647=>1000,12648=>1000,12649=>1000,12650=>1000,12651=>1000,12652=>1000,12653=>1000,12654=>1000,12655=>1000,
-	12656=>1000,12657=>1000,12658=>1000,12659=>1000,12660=>1000,12661=>1000,12662=>1000,12663=>1000,12664=>1000,12665=>1000,12666=>1000,12667=>1000,12668=>1000,12669=>1000,12670=>1000,12671=>1000,
-	12672=>1000,12673=>1000,12674=>1000,12675=>1000,12676=>1000,12677=>1000,12678=>1000,12679=>1000,12680=>1000,12681=>1000,12682=>1000,12683=>1000,12684=>1000,12685=>1000,12686=>1000,12688=>1000,
-	12689=>1000,12690=>1000,12691=>1000,12692=>1000,12693=>1000,12694=>1000,12695=>1000,12696=>1000,12697=>1000,12698=>1000,12699=>1000,12700=>1000,12701=>1000,12702=>1000,12703=>1000,12800=>1000,
-	12801=>1000,12802=>1000,12803=>1000,12804=>1000,12805=>1000,12806=>1000,12807=>1000,12808=>1000,12809=>1000,12810=>1000,12811=>1000,12812=>1000,12813=>1000,12814=>1000,12815=>1000,12816=>1000,
-	12817=>1000,12818=>1000,12819=>1000,12820=>1000,12821=>1000,12822=>1000,12823=>1000,12824=>1000,12825=>1000,12826=>1000,12827=>1000,12828=>1000,12832=>1000,12833=>1000,12834=>1000,12835=>1000,
-	12836=>1000,12837=>1000,12838=>1000,12839=>1000,12840=>1000,12841=>1000,12842=>1000,12843=>1000,12844=>1000,12845=>1000,12846=>1000,12847=>1000,12848=>1000,12849=>1000,12850=>1000,12851=>1000,
-	12852=>1000,12853=>1000,12854=>1000,12855=>1000,12856=>1000,12857=>1000,12858=>1000,12859=>1000,12860=>1000,12861=>1000,12862=>1000,12863=>1000,12864=>1000,12865=>1000,12866=>1000,12867=>1000,
-	12896=>1000,12897=>1000,12898=>1000,12899=>1000,12900=>1000,12901=>1000,12902=>1000,12903=>1000,12904=>1000,12905=>1000,12906=>1000,12907=>1000,12908=>1000,12909=>1000,12910=>1000,12911=>1000,
-	12912=>1000,12913=>1000,12914=>1000,12915=>1000,12916=>1000,12917=>1000,12918=>1000,12919=>1000,12920=>1000,12921=>1000,12922=>1000,12923=>1000,12927=>1000,12928=>1000,12929=>1000,12930=>1000,
-	12931=>1000,12932=>1000,12933=>1000,12934=>1000,12935=>1000,12936=>1000,12937=>1000,12938=>1000,12939=>1000,12940=>1000,12941=>1000,12942=>1000,12943=>1000,12944=>1000,12945=>1000,12946=>1000,
-	12947=>1000,12948=>1000,12949=>1000,12950=>1000,12951=>1000,12952=>1000,12953=>1000,12954=>1000,12955=>1000,12956=>1000,12957=>1000,12958=>1000,12959=>1000,12960=>1000,12961=>1000,12962=>1000,
-	12963=>1000,12964=>1000,12965=>1000,12966=>1000,12967=>1000,12968=>1000,12969=>1000,12970=>1000,12971=>1000,12972=>1000,12973=>1000,12974=>1000,12975=>1000,12976=>1000,12992=>1000,12993=>1000,
-	12994=>1000,12995=>1000,12996=>1000,12997=>1000,12998=>1000,12999=>1000,13000=>1000,13001=>1000,13002=>1000,13003=>1000,13008=>1000,13009=>1000,13010=>1000,13011=>1000,13012=>1000,13013=>1000,
-	13014=>1000,13015=>1000,13016=>1000,13017=>1000,13018=>1000,13019=>1000,13020=>1000,13021=>1000,13022=>1000,13023=>1000,13024=>1000,13025=>1000,13026=>1000,13027=>1000,13028=>1000,13029=>1000,
-	13030=>1000,13031=>1000,13032=>1000,13033=>1000,13034=>1000,13035=>1000,13036=>1000,13037=>1000,13038=>1000,13039=>1000,13040=>1000,13041=>1000,13042=>1000,13043=>1000,13044=>1000,13045=>1000,
-	13046=>1000,13047=>1000,13048=>1000,13049=>1000,13050=>1000,13051=>1000,13052=>1000,13053=>1000,13054=>1000,13056=>1000,13057=>1000,13058=>1000,13059=>1000,13060=>1000,13061=>1000,13062=>1000,
-	13063=>1000,13064=>1000,13065=>1000,13066=>1000,13067=>1000,13068=>1000,13069=>1000,13070=>1000,13071=>1000,13072=>1000,13073=>1000,13074=>1000,13075=>1000,13076=>1000,13077=>1000,13078=>1000,
-	13079=>1000,13080=>1000,13081=>1000,13082=>1000,13083=>1000,13084=>1000,13085=>1000,13086=>1000,13087=>1000,13088=>1000,13089=>1000,13090=>1000,13091=>1000,13092=>1000,13093=>1000,13094=>1000,
-	13095=>1000,13096=>1000,13097=>1000,13098=>1000,13099=>1000,13100=>1000,13101=>1000,13102=>1000,13103=>1000,13104=>1000,13105=>1000,13106=>1000,13107=>1000,13108=>1000,13109=>1000,13110=>1000,
-	13111=>1000,13112=>1000,13113=>1000,13114=>1000,13115=>1000,13116=>1000,13117=>1000,13118=>1000,13119=>1000,13120=>1000,13121=>1000,13122=>1000,13123=>1000,13124=>1000,13125=>1000,13126=>1000,
-	13127=>1000,13128=>1000,13129=>1000,13130=>1000,13131=>1000,13132=>1000,13133=>1000,13134=>1000,13135=>1000,13136=>1000,13137=>1000,13138=>1000,13139=>1000,13140=>1000,13141=>1000,13142=>1000,
-	13143=>1000,13144=>1000,13145=>1000,13146=>1000,13147=>1000,13148=>1000,13149=>1000,13150=>1000,13151=>1000,13152=>1000,13153=>1000,13154=>1000,13155=>1000,13156=>1000,13157=>1000,13158=>1000,
-	13159=>1000,13160=>1000,13161=>1000,13162=>1000,13163=>1000,13164=>1000,13165=>1000,13166=>1000,13167=>1000,13168=>1000,13169=>1000,13170=>1000,13171=>1000,13172=>1000,13173=>1000,13174=>1000,
-	13179=>1000,13180=>1000,13181=>1000,13182=>1000,13183=>1000,13184=>1000,13185=>1000,13186=>1000,13187=>1000,13188=>1000,13189=>1000,13190=>1000,13191=>1000,13192=>1000,13193=>1000,13194=>1000,
-	13195=>1000,13196=>1000,13197=>1000,13198=>1000,13199=>1000,13200=>1000,13201=>1000,13202=>1000,13203=>1000,13204=>1000,13205=>1000,13206=>1000,13207=>1000,13208=>1000,13209=>1000,13210=>1000,
-	13211=>1000,13212=>1000,13213=>1000,13214=>1000,13215=>1000,13216=>1000,13217=>1000,13218=>1000,13219=>1000,13220=>1000,13221=>1000,13222=>1000,13223=>1000,13224=>1000,13225=>1000,13226=>1000,
-	13227=>1000,13228=>1000,13229=>1000,13230=>1000,13231=>1000,13232=>1000,13233=>1000,13234=>1000,13235=>1000,13236=>1000,13237=>1000,13238=>1000,13239=>1000,13240=>1000,13241=>1000,13242=>1000,
-	13243=>1000,13244=>1000,13245=>1000,13246=>1000,13247=>1000,13248=>1000,13249=>1000,13250=>1000,13251=>1000,13252=>1000,13253=>1000,13254=>1000,13255=>1000,13256=>1000,13257=>1000,13258=>1000,
-	13259=>1000,13260=>1000,13261=>1000,13262=>1000,13263=>1000,13264=>1000,13265=>1000,13266=>1000,13267=>1000,13268=>1000,13269=>1000,13270=>1000,13271=>1000,13272=>1000,13273=>1000,13274=>1000,
-	13275=>1000,13276=>1000,13277=>1000,13280=>1000,13281=>1000,13282=>1000,13283=>1000,13284=>1000,13285=>1000,13286=>1000,13287=>1000,13288=>1000,13289=>1000,13290=>1000,13291=>1000,13292=>1000,
-	13293=>1000,13294=>1000,13295=>1000,13296=>1000,13297=>1000,13298=>1000,13299=>1000,13300=>1000,13301=>1000,13302=>1000,13303=>1000,13304=>1000,13305=>1000,13306=>1000,13307=>1000,13308=>1000,
-	13309=>1000,13310=>1000,59393=>316,59394=>507,59395=>507,59396=>484,59397=>484,59416=>0,59492=>480,59495=>480,59536=>458,59557=>466,59558=>480,59559=>903,61441=>500,61442=>500,
-	63232=>541,63233=>0,63234=>0,63235=>0,63236=>0,63237=>0,63238=>0,63239=>0,63240=>0,63241=>0,63242=>0,63243=>0,63244=>0,63245=>0,63246=>0,63247=>849,
-	63248=>0,63249=>0,63250=>0,63251=>0,63252=>0,63253=>0,63254=>0,63255=>0,63256=>0,63257=>0,63258=>0,63260=>333,63261=>287,63744=>1000,63745=>1000,63746=>1000,
-	63747=>1000,63748=>1000,63749=>1000,63750=>1000,63751=>1000,63752=>1000,63753=>1000,63754=>1000,63755=>1000,63756=>1000,63757=>1000,63758=>1000,63759=>1000,63760=>1000,63761=>1000,63762=>1000,
-	63763=>1000,63764=>1000,63765=>1000,63766=>1000,63767=>1000,63768=>1000,63769=>1000,63770=>1000,63771=>1000,63772=>1000,63773=>1000,63774=>1000,63775=>1000,63776=>1000,63777=>1000,63778=>1000,
-	63779=>1000,63780=>1000,63781=>1000,63782=>1000,63783=>1000,63784=>1000,63785=>1000,63786=>1000,63787=>1000,63788=>1000,63789=>1000,63790=>1000,63791=>1000,63792=>1000,63793=>1000,63794=>1000,
-	63795=>1000,63796=>1000,63797=>1000,63798=>1000,63799=>1000,63800=>1000,63801=>1000,63802=>1000,63803=>1000,63804=>1000,63805=>1000,63806=>1000,63807=>1000,63808=>1000,63809=>1000,63810=>1000,
-	63811=>1000,63812=>1000,63813=>1000,63814=>1000,63815=>1000,63816=>1000,63817=>1000,63818=>1000,63819=>1000,63820=>1000,63821=>1000,63822=>1000,63823=>1000,63824=>1000,63825=>1000,63826=>1000,
-	63827=>1000,63828=>1000,63829=>1000,63830=>1000,63831=>1000,63832=>1000,63833=>1000,63834=>1000,63835=>1000,63836=>1000,63837=>1000,63838=>1000,63839=>1000,63840=>1000,63841=>1000,63842=>1000,
-	63843=>1000,63844=>1000,63845=>1000,63846=>1000,63847=>1000,63848=>1000,63849=>1000,63850=>1000,63851=>1000,63852=>1000,63853=>1000,63854=>1000,63855=>1000,63856=>1000,63857=>1000,63858=>1000,
-	63859=>1000,63860=>1000,63861=>1000,63862=>1000,63863=>1000,63864=>1000,63865=>1000,63866=>1000,63867=>1000,63868=>1000,63869=>1000,63870=>1000,63871=>1000,63872=>1000,63873=>1000,63874=>1000,
-	63875=>1000,63876=>1000,63877=>1000,63878=>1000,63879=>1000,63880=>1000,63881=>1000,63882=>1000,63883=>1000,63884=>1000,63885=>1000,63886=>1000,63887=>1000,63888=>1000,63889=>1000,63890=>1000,
-	63891=>1000,63892=>1000,63893=>1000,63894=>1000,63895=>1000,63896=>1000,63897=>1000,63898=>1000,63899=>1000,63900=>1000,63901=>1000,63902=>1000,63903=>1000,63904=>1000,63905=>1000,63906=>1000,
-	63907=>1000,63908=>1000,63909=>1000,63910=>1000,63911=>1000,63912=>1000,63913=>1000,63914=>1000,63915=>1000,63916=>1000,63917=>1000,63918=>1000,63919=>1000,63920=>1000,63921=>1000,63922=>1000,
-	63923=>1000,63924=>1000,63925=>1000,63926=>1000,63927=>1000,63928=>1000,63929=>1000,63930=>1000,63931=>1000,63932=>1000,63933=>1000,63934=>1000,63935=>1000,63936=>1000,63937=>1000,63938=>1000,
-	63939=>1000,63940=>1000,63941=>1000,63942=>1000,63943=>1000,63944=>1000,63945=>1000,63946=>1000,63947=>1000,63948=>1000,63949=>1000,63950=>1000,63951=>1000,63952=>1000,63953=>1000,63954=>1000,
-	63955=>1000,63956=>1000,63957=>1000,63958=>1000,63959=>1000,63960=>1000,63961=>1000,63962=>1000,63963=>1000,63964=>1000,63965=>1000,63966=>1000,63967=>1000,63968=>1000,63969=>1000,63970=>1000,
-	63971=>1000,63972=>1000,63973=>1000,63974=>1000,63975=>1000,63976=>1000,63977=>1000,63978=>1000,63979=>1000,63980=>1000,63981=>1000,63982=>1000,63983=>1000,63984=>1000,63985=>1000,63986=>1000,
-	63987=>1000,63988=>1000,63989=>1000,63990=>1000,63991=>1000,63992=>1000,63993=>1000,63994=>1000,63995=>1000,63996=>1000,63997=>1000,63998=>1000,63999=>1000,64000=>1000,64001=>1000,64002=>1000,
-	64003=>1000,64004=>1000,64005=>1000,64006=>1000,64007=>1000,64008=>1000,64009=>1000,64010=>1000,64011=>1000,64012=>1000,64013=>1000,64014=>1000,64015=>1000,64016=>1000,64017=>1000,64018=>1000,
-	64019=>1000,64020=>1000,64021=>1000,64022=>1000,64023=>1000,64024=>1000,64025=>1000,64026=>1000,64027=>1000,64028=>1000,64029=>1000,64030=>1000,64031=>1000,64032=>1000,64033=>1000,64034=>1000,
-	64035=>1000,64036=>1000,64037=>1000,64038=>1000,64039=>1000,64040=>1000,64041=>1000,64042=>1000,64043=>1000,64044=>1000,64045=>1000,64256=>537,64257=>500,64258=>500,64259=>778,64260=>750,
-	64261=>532,64262=>758,64275=>784,64276=>784,64277=>784,64278=>784,64279=>893,64286=>333,64287=>590,64288=>550,64289=>709,64290=>649,64291=>730,64292=>656,64293=>605,64294=>730,
-	64295=>633,64296=>794,64297=>584,64298=>700,64299=>700,64300=>700,64301=>700,64302=>577,64303=>577,64304=>577,64305=>563,64306=>411,64307=>512,64308=>594,64309=>316,64310=>326,
-	64312=>594,64313=>316,64314=>507,64315=>527,64316=>484,64318=>594,64320=>338,64321=>604,64323=>567,64324=>569,64326=>514,64327=>583,64328=>507,64329=>700,64330=>633,64331=>316,
-	64332=>563,64333=>527,64334=>569,64335=>577,64336=>243,64337=>273,64338=>771,64339=>788,64340=>276,64341=>243,64342=>771,64343=>788,64344=>276,64345=>243,64346=>771,64347=>788,
-	64348=>276,64349=>243,64350=>771,64351=>788,64352=>276,64353=>243,64354=>771,64355=>788,64356=>276,64357=>243,64358=>771,64359=>788,64360=>276,64361=>243,64362=>957,64363=>903,
-	64364=>466,64365=>480,64366=>957,64367=>903,64368=>466,64369=>480,64370=>544,64371=>658,64372=>646,64373=>637,64374=>544,64375=>658,64376=>646,64377=>637,64378=>544,64379=>658,
-	64380=>646,64381=>637,64382=>544,64383=>658,64384=>646,64385=>637,64386=>430,64387=>458,64388=>430,64389=>458,64390=>430,64391=>458,64392=>430,64393=>458,64394=>421,64395=>436,
-	64396=>421,64397=>436,64398=>828,64399=>942,64400=>432,64401=>549,64402=>828,64403=>942,64404=>432,64405=>549,64406=>828,64407=>942,64408=>432,64409=>549,64410=>828,64411=>942,
-	64412=>432,64413=>549,64414=>692,64415=>723,64416=>692,64417=>723,64418=>276,64419=>243,64420=>514,64421=>477,64422=>514,64423=>509,64424=>273,64425=>427,64426=>706,64427=>706,
-	64428=>686,64429=>686,64430=>550,64431=>461,64432=>550,64433=>461,64467=>757,64468=>733,64469=>432,64470=>549,64471=>470,64472=>466,64473=>470,64474=>466,64475=>470,64476=>466,
-	64477=>470,64478=>470,64479=>466,64480=>470,64481=>466,64482=>470,64483=>466,64484=>781,64485=>933,64486=>276,64487=>243,64488=>276,64489=>243,64490=>547,64491=>517,64492=>783,
-	64493=>753,64494=>740,64495=>710,64496=>740,64497=>710,64498=>740,64499=>710,64500=>740,64501=>710,64502=>1207,64503=>1177,64504=>517,64505=>1067,64506=>1037,64507=>517,64508=>731,
-	64509=>793,64510=>276,64511=>243,64512=>932,64513=>932,64514=>914,64515=>1067,64516=>1077,64517=>935,64518=>935,64519=>935,64520=>917,64521=>1070,64522=>1080,64523=>932,64524=>932,
-	64525=>932,64526=>914,64527=>1067,64528=>1077,64529=>932,64530=>914,64531=>1067,64532=>1077,64533=>1305,64534=>1287,64535=>1305,64536=>1287,64537=>1305,64538=>1305,64539=>1287,64540=>1429,
-	64541=>1429,64542=>1429,64543=>1411,64544=>1476,64545=>1458,64546=>1476,64547=>1476,64548=>1476,64549=>1458,64550=>1392,64551=>1374,64552=>1374,64553=>1245,64554=>1227,64555=>1245,64556=>1227,
-	64557=>1125,64558=>1125,64559=>1125,64560=>1107,64561=>1260,64562=>1270,64563=>1125,64564=>1107,64565=>1260,64566=>1270,64567=>706,64568=>1091,64569=>1091,64570=>1091,64571=>1106,64572=>1073,
-	64573=>1226,64574=>1236,64575=>932,64576=>932,64577=>932,64578=>914,64579=>1067,64580=>1077,64581=>1140,64582=>1140,64583=>1140,64584=>1122,64585=>1275,64586=>1285,64587=>932,64588=>932,
-	64589=>932,64590=>914,64591=>1067,64592=>1077,64593=>1345,64594=>1327,64595=>1480,64596=>1490,64597=>932,64598=>932,64599=>932,64600=>914,64601=>1067,64602=>1077,64603=>430,64604=>421,
-	64605=>731,64606=>296,64607=>300,64608=>300,64609=>300,64610=>300,64611=>300,64612=>680,64613=>680,64614=>884,64615=>967,64616=>1037,64617=>1047,64618=>680,64619=>680,64620=>884,
-	64621=>967,64622=>1037,64623=>1047,64624=>680,64625=>680,64626=>884,64627=>967,64628=>1037,64629=>1047,64630=>680,64631=>680,64632=>884,64633=>967,64634=>1037,64635=>1047,64636=>1274,
-	64637=>1284,64638=>1274,64639=>1284,64640=>821,64641=>1221,64642=>1188,64643=>1341,64644=>1351,64645=>884,64646=>1037,64647=>1047,64648=>806,64649=>1173,64650=>680,64651=>680,64652=>884,
-	64653=>967,64654=>1037,64655=>1047,64656=>793,64657=>680,64658=>680,64659=>884,64660=>967,64661=>1037,64662=>1047,64663=>911,64664=>911,64665=>911,64666=>806,64667=>679,64668=>911,
-	64669=>911,64670=>911,64671=>806,64672=>679,64673=>911,64674=>911,64675=>911,64676=>806,64677=>679,64678=>806,64679=>1284,64680=>1179,64681=>1284,64682=>1179,64683=>1284,64684=>1179,
-	64685=>1408,64686=>1408,64687=>1408,64688=>1303,64689=>1455,64690=>1455,64691=>1350,64692=>1455,64693=>1455,64694=>1455,64695=>1350,64696=>1371,64697=>1266,64698=>1224,64699=>1119,64700=>1224,
-	64701=>1119,64702=>1104,64703=>1104,64704=>1104,64705=>999,64706=>1104,64707=>999,64708=>1070,64709=>1070,64710=>1070,64711=>676,64712=>965,64713=>911,64714=>911,64715=>911,64716=>806,
-	64717=>679,64718=>1119,64719=>1119,64720=>1119,64721=>1014,64722=>911,64723=>911,64724=>911,64725=>806,64726=>679,64727=>1324,64728=>1219,64729=>686,64730=>911,64731=>911,64732=>911,
-	64733=>806,64734=>679,64735=>776,64736=>649,64737=>776,64738=>649,64739=>776,64740=>649,64741=>776,64742=>649,64743=>1303,64744=>1176,64745=>1303,64746=>1176,64747=>793,64748=>1082,
-	64749=>776,64750=>776,64751=>649,64752=>776,64753=>649,64754=>306,64755=>302,64756=>298,64757=>1527,64758=>1537,64759=>1380,64760=>1390,64761=>1380,64762=>1390,64763=>1564,64764=>1574,
-	64765=>1564,64766=>1574,64767=>1440,64768=>1450,64769=>1440,64770=>1450,64771=>1440,64772=>1450,64773=>1611,64774=>1621,64775=>1611,64776=>1621,64777=>1429,64778=>1429,64779=>1429,64780=>1411,
-	64781=>1207,64782=>1207,64783=>1254,64784=>1254,64785=>1527,64786=>1537,64787=>1348,64788=>1358,64789=>1348,64790=>1358,64791=>1564,64792=>1574,64793=>1564,64794=>1574,64795=>1431,64796=>1441,
-	64797=>1431,64798=>1441,64799=>1431,64800=>1441,64801=>1611,64802=>1621,64803=>1611,64804=>1621,64805=>1429,64806=>1429,64807=>1429,64808=>1411,64809=>1207,64810=>1207,64811=>1254,64812=>1254,
-	64813=>1408,64814=>1408,64815=>1408,64816=>1303,64817=>1176,64818=>1176,64819=>1266,64820=>1408,64821=>1408,64822=>1408,64823=>1408,64824=>1408,64825=>1408,64826=>1266,64827=>1266,64828=>273,
-	64829=>243,64830=>600,64831=>600,64848=>1444,64849=>1541,64850=>1549,64851=>1444,64852=>1444,64853=>1444,64854=>1444,64855=>1444,64856=>1830,64857=>1817,64858=>1975,64859=>1964,64860=>2046,
-	64861=>2046,64862=>2202,64863=>1962,64864=>1941,64865=>1941,64866=>1944,64867=>1836,64868=>2114,64869=>2093,64870=>1991,64871=>2049,64872=>1941,64873=>2212,64874=>1962,64875=>1941,64876=>1944,
-	64877=>1836,64878=>2249,64879=>2096,64880=>1988,64881=>1925,64882=>1904,64883=>1799,64884=>2070,64885=>1833,64886=>1729,64887=>1652,64888=>1881,64889=>1729,64890=>1892,64891=>1881,64892=>1759,
-	64893=>1637,64894=>1670,64895=>1654,64896=>1522,64897=>1686,64898=>1675,64899=>1549,64900=>1541,64901=>1522,64902=>1444,64903=>1436,64904=>1444,64905=>1757,64906=>1652,64907=>1975,64908=>1757,
-	64909=>1652,64910=>1757,64911=>1652,64914=>1757,64915=>1857,64916=>1752,64917=>1444,64918=>1675,64919=>1522,64920=>1444,64921=>1675,64922=>1581,64923=>1570,64924=>1417,64925=>1362,64926=>1686,
-	64927=>1686,64928=>1675,64929=>1686,64930=>1675,64931=>1581,64932=>1570,64933=>1975,64934=>2069,64935=>1964,64936=>2202,64937=>2259,64938=>2212,64939=>2259,64940=>1686,64941=>1581,64942=>1686,
-	64943=>1686,64944=>1581,64945=>1870,64946=>1817,64947=>1686,64948=>1637,64949=>1444,64950=>1892,64951=>1886,64952=>1549,64953=>1975,64954=>1444,64955=>1723,64956=>1522,64957=>1541,64958=>2080,
-	64959=>2080,64960=>1975,64961=>1817,64962=>1686,64963=>1499,64964=>1757,64965=>1883,64966=>2212,64967=>1686,65008=>1523,65009=>1172,65010=>1159,65011=>1356,65012=>2111,65013=>2258,65014=>2130,
-	65015=>1552,65016=>2046,65017=>1856,65018=>1930,65019=>1070,65056=>450,65057=>450,65058=>450,65059=>450,65072=>1000,65073=>1000,65074=>1000,65075=>1000,65076=>1000,65077=>1000,65078=>1000,
-	65079=>1000,65080=>1000,65081=>1000,65082=>1000,65083=>1000,65084=>1000,65085=>1000,65086=>1000,65087=>1000,65088=>1000,65089=>1000,65090=>1000,65091=>1000,65092=>1000,65097=>1000,65098=>1000,
-	65099=>1000,65100=>1000,65101=>1000,65102=>1000,65103=>1000,65104=>167,65105=>250,65106=>167,65108=>167,65109=>167,65110=>334,65111=>167,65112=>600,65113=>200,65114=>200,65115=>200,
-	65116=>200,65117=>200,65118=>200,65119=>334,65120=>400,65121=>233,65122=>350,65123=>200,65124=>350,65125=>350,65126=>350,65128=>167,65129=>334,65130=>533,65131=>609,65136=>300,
-	65137=>298,65138=>296,65140=>298,65142=>300,65143=>298,65144=>300,65145=>302,65146=>298,65147=>296,65148=>306,65149=>306,65150=>154,65151=>154,65152=>529,65153=>243,65154=>273,
-	65155=>243,65156=>273,65157=>470,65158=>466,65159=>243,65160=>273,65161=>731,65162=>793,65163=>276,65164=>243,65165=>243,65166=>273,65167=>771,65168=>788,65169=>276,65170=>243,
-	65171=>514,65172=>477,65173=>771,65174=>788,65175=>276,65176=>243,65177=>771,65178=>788,65179=>276,65180=>243,65181=>544,65182=>658,65183=>646,65184=>637,65185=>544,65186=>658,
-	65187=>646,65188=>637,65189=>544,65190=>658,65191=>646,65192=>637,65193=>430,65194=>458,65195=>430,65196=>458,65197=>421,65198=>436,65199=>421,65200=>436,65201=>1194,65202=>1194,
-	65203=>770,65204=>770,65205=>1194,65206=>1194,65207=>770,65208=>770,65209=>1291,65210=>1291,65211=>817,65212=>817,65213=>1291,65214=>1291,65215=>817,65216=>817,65217=>843,65218=>843,
-	65219=>733,65220=>733,65221=>843,65222=>843,65223=>733,65224=>733,65225=>594,65226=>556,65227=>586,65228=>554,65229=>594,65230=>556,65231=>586,65232=>554,65233=>957,65234=>903,
-	65235=>466,65236=>480,65237=>800,65238=>823,65239=>466,65240=>480,65241=>757,65242=>733,65243=>432,65244=>549,65245=>662,65246=>673,65247=>273,65248=>243,65249=>589,65250=>640,
-	65251=>481,65252=>532,65253=>692,65254=>723,65255=>276,65256=>243,65257=>514,65258=>477,65259=>686,65260=>405,65261=>470,65262=>466,65263=>731,65264=>793,65265=>731,65266=>803,
-	65267=>276,65268=>243,65269=>551,65270=>603,65271=>551,65272=>603,65273=>551,65274=>603,65275=>551,65276=>603,65281=>1000,65282=>1000,65283=>1000,65284=>1000,65285=>1000,65286=>1000,
-	65287=>1000,65288=>1000,65289=>1000,65290=>1000,65291=>1000,65292=>1000,65293=>1000,65294=>1000,65295=>1000,65296=>1000,65297=>1000,65298=>1000,65299=>1000,65300=>1000,65301=>1000,65302=>1000,
-	65303=>1000,65304=>1000,65305=>1000,65306=>1000,65307=>1000,65308=>1000,65309=>1000,65310=>1000,65311=>1000,65312=>1000,65313=>1000,65314=>1000,65315=>1000,65316=>1000,65317=>1000,65318=>1000,
-	65319=>1000,65320=>1000,65321=>1000,65322=>1000,65323=>1000,65324=>1000,65325=>1000,65326=>1000,65327=>1000,65328=>1000,65329=>1000,65330=>1000,65331=>1000,65332=>1000,65333=>1000,65334=>1000,
-	65335=>1000,65336=>1000,65337=>1000,65338=>1000,65339=>1000,65340=>1000,65341=>1000,65342=>1000,65343=>1000,65344=>1000,65345=>1000,65346=>1000,65347=>1000,65348=>1000,65349=>1000,65350=>1000,
-	65351=>1000,65352=>1000,65353=>1000,65354=>1000,65355=>1000,65356=>1000,65357=>1000,65358=>1000,65359=>1000,65360=>1000,65361=>1000,65362=>1000,65363=>1000,65364=>1000,65365=>1000,65366=>1000,
-	65367=>1000,65368=>1000,65369=>1000,65370=>1000,65371=>1000,65372=>1000,65373=>1000,65374=>1000,65377=>500,65378=>500,65379=>500,65380=>500,65381=>500,65382=>500,65383=>500,65384=>500,
-	65385=>500,65386=>500,65387=>500,65388=>500,65389=>500,65390=>500,65391=>500,65392=>500,65393=>500,65394=>500,65395=>500,65396=>500,65397=>500,65398=>500,65399=>500,65400=>500,
-	65401=>500,65402=>500,65403=>500,65404=>500,65405=>500,65406=>500,65407=>500,65408=>500,65409=>500,65410=>500,65411=>500,65412=>500,65413=>500,65414=>500,65415=>500,65416=>500,
-	65417=>500,65418=>500,65419=>500,65420=>500,65421=>500,65422=>500,65423=>500,65424=>500,65425=>500,65426=>500,65427=>500,65428=>500,65429=>500,65430=>500,65431=>500,65432=>500,
-	65433=>500,65434=>500,65435=>500,65436=>500,65437=>500,65438=>500,65439=>500,65440=>500,65441=>500,65442=>500,65443=>500,65444=>500,65445=>500,65446=>500,65447=>500,65448=>500,
-	65449=>500,65450=>500,65451=>500,65452=>500,65453=>500,65454=>500,65455=>500,65456=>500,65457=>500,65458=>500,65459=>500,65460=>500,65461=>500,65462=>500,65463=>500,65464=>500,
-	65465=>500,65466=>500,65467=>500,65468=>500,65469=>500,65470=>500,65474=>500,65475=>500,65476=>500,65477=>500,65478=>500,65479=>500,65482=>500,65483=>500,65484=>500,65485=>500,
-	65486=>500,65487=>500,65490=>500,65491=>500,65492=>500,65493=>500,65494=>500,65495=>500,65498=>500,65499=>500,65500=>500,65504=>1000,65505=>1000,65506=>1000,65507=>1000,65508=>1000,
-	65509=>1000,65510=>1000,65512=>500,65513=>500,65514=>500,65515=>500,65516=>500,65517=>500,65518=>500,65532=>1000,65533=>1000,19968=>1000,19969=>1000,19970=>1000,19971=>1000,19972=>1000,
-	19973=>1000,19974=>1000,19975=>1000,19976=>1000,19977=>1000,19978=>1000,19979=>1000,19980=>1000,19981=>1000,19982=>1000,19983=>1000,19984=>1000,19985=>1000,19986=>1000,19987=>1000,19988=>1000,
-	19989=>1000,19990=>1000,19991=>1000,19992=>1000,19993=>1000,19994=>1000,19995=>1000,19996=>1000,19997=>1000,19998=>1000,19999=>1000,20000=>1000,20001=>1000,20002=>1000,20003=>1000,20004=>1000,
-	20005=>1000,20006=>1000,20007=>1000,20008=>1000,20009=>1000,20010=>1000,20011=>1000,20012=>1000,20013=>1000,20014=>1000,20015=>1000,20016=>1000,20017=>1000,20018=>1000,20019=>1000,20020=>1000,
-	20021=>1000,20022=>1000,20023=>1000,20024=>1000,20025=>1000,20026=>1000,20027=>1000,20028=>1000,20029=>1000,20030=>1000,20031=>1000,20032=>1000,20033=>1000,20034=>1000,20035=>1000,20036=>1000,
-	20037=>1000,20038=>1000,20039=>1000,20040=>1000,20041=>1000,20042=>1000,20043=>1000,20044=>1000,20045=>1000,20046=>1000,20047=>1000,20048=>1000,20049=>1000,20050=>1000,20051=>1000,20052=>1000,
-	20053=>1000,20054=>1000,20055=>1000,20056=>1000,20057=>1000,20058=>1000,20059=>1000,20060=>1000,20061=>1000,20062=>1000,20063=>1000,20064=>1000,20065=>1000,20066=>1000,20067=>1000,20068=>1000,
-	20069=>1000,20070=>1000,20071=>1000,20072=>1000,20073=>1000,20074=>1000,20075=>1000,20076=>1000,20077=>1000,20078=>1000,20079=>1000,20080=>1000,20081=>1000,20082=>1000,20083=>1000,20084=>1000,
-	20085=>1000,20086=>1000,20087=>1000,20088=>1000,20089=>1000,20090=>1000,20091=>1000,20092=>1000,20093=>1000,20094=>1000,20095=>1000,20096=>1000,20097=>1000,20098=>1000,20099=>1000,20100=>1000,
-	20101=>1000,20102=>1000,20103=>1000,20104=>1000,20105=>1000,20106=>1000,20107=>1000,20108=>1000,20109=>1000,20110=>1000,20111=>1000,20112=>1000,20113=>1000,20114=>1000,20115=>1000,20116=>1000,
-	20117=>1000,20118=>1000,20119=>1000,20120=>1000,20121=>1000,20122=>1000,20123=>1000,20124=>1000,20125=>1000,20126=>1000,20127=>1000,20128=>1000,20129=>1000,20130=>1000,20131=>1000,20132=>1000,
-	20133=>1000,20134=>1000,20135=>1000,20136=>1000,20137=>1000,20138=>1000,20139=>1000,20140=>1000,20141=>1000,20142=>1000,20143=>1000,20144=>1000,20145=>1000,20146=>1000,20147=>1000,20148=>1000,
-	20149=>1000,20150=>1000,20151=>1000,20152=>1000,20153=>1000,20154=>1000,20155=>1000,20156=>1000,20157=>1000,20158=>1000,20159=>1000,20160=>1000,20161=>1000,20162=>1000,20163=>1000,20164=>1000,
-	20165=>1000,20166=>1000,20167=>1000,20168=>1000,20169=>1000,20170=>1000,20171=>1000,20172=>1000,20173=>1000,20174=>1000,20175=>1000,20176=>1000,20177=>1000,20178=>1000,20179=>1000,20180=>1000,
-	20181=>1000,20182=>1000,20183=>1000,20184=>1000,20185=>1000,20186=>1000,20187=>1000,20188=>1000,20189=>1000,20190=>1000,20191=>1000,20192=>1000,20193=>1000,20194=>1000,20195=>1000,20196=>1000,
-	20197=>1000,20198=>1000,20199=>1000,20200=>1000,20201=>1000,20202=>1000,20203=>1000,20204=>1000,20205=>1000,20206=>1000,20207=>1000,20208=>1000,20209=>1000,20210=>1000,20211=>1000,20212=>1000,
-	20213=>1000,20214=>1000,20215=>1000,20216=>1000,20217=>1000,20218=>1000,20219=>1000,20220=>1000,20221=>1000,20222=>1000,20223=>1000,20224=>1000,20225=>1000,20226=>1000,20227=>1000,20228=>1000,
-	20229=>1000,20230=>1000,20231=>1000,20232=>1000,20233=>1000,20234=>1000,20235=>1000,20236=>1000,20237=>1000,20238=>1000,20239=>1000,20240=>1000,20241=>1000,20242=>1000,20243=>1000,20244=>1000,
-	20245=>1000,20246=>1000,20247=>1000,20248=>1000,20249=>1000,20250=>1000,20251=>1000,20252=>1000,20253=>1000,20254=>1000,20255=>1000,20256=>1000,20257=>1000,20258=>1000,20259=>1000,20260=>1000,
-	20261=>1000,20262=>1000,20263=>1000,20264=>1000,20265=>1000,20266=>1000,20267=>1000,20268=>1000,20269=>1000,20270=>1000,20271=>1000,20272=>1000,20273=>1000,20274=>1000,20275=>1000,20276=>1000,
-	20277=>1000,20278=>1000,20279=>1000,20280=>1000,20281=>1000,20282=>1000,20283=>1000,20284=>1000,20285=>1000,20286=>1000,20287=>1000,20288=>1000,20289=>1000,20290=>1000,20291=>1000,20292=>1000,
-	20293=>1000,20294=>1000,20295=>1000,20296=>1000,20297=>1000,20298=>1000,20299=>1000,20300=>1000,20301=>1000,20302=>1000,20303=>1000,20304=>1000,20305=>1000,20306=>1000,20307=>1000,20308=>1000,
-	20309=>1000,20310=>1000,20311=>1000,20312=>1000,20313=>1000,20314=>1000,20315=>1000,20316=>1000,20317=>1000,20318=>1000,20319=>1000,20320=>1000,20321=>1000,20322=>1000,20323=>1000,20324=>1000,
-	20325=>1000,20326=>1000,20327=>1000,20328=>1000,20329=>1000,20330=>1000,20331=>1000,20332=>1000,20333=>1000,20334=>1000,20335=>1000,20336=>1000,20337=>1000,20338=>1000,20339=>1000,20340=>1000,
-	20341=>1000,20342=>1000,20343=>1000,20344=>1000,20345=>1000,20346=>1000,20347=>1000,20348=>1000,20349=>1000,20350=>1000,20351=>1000,20352=>1000,20353=>1000,20354=>1000,20355=>1000,20356=>1000,
-	20357=>1000,20358=>1000,20359=>1000,20360=>1000,20361=>1000,20362=>1000,20363=>1000,20364=>1000,20365=>1000,20366=>1000,20367=>1000,20368=>1000,20369=>1000,20370=>1000,20371=>1000,20372=>1000,
-	20373=>1000,20374=>1000,20375=>1000,20376=>1000,20377=>1000,20378=>1000,20379=>1000,20380=>1000,20381=>1000,20382=>1000,20383=>1000,20384=>1000,20385=>1000,20386=>1000,20387=>1000,20388=>1000,
-	20389=>1000,20390=>1000,20391=>1000,20392=>1000,20393=>1000,20394=>1000,20395=>1000,20396=>1000,20397=>1000,20398=>1000,20399=>1000,20400=>1000,20401=>1000,20402=>1000,20403=>1000,20404=>1000,
-	20405=>1000,20406=>1000,20407=>1000,20408=>1000,20409=>1000,20410=>1000,20411=>1000,20412=>1000,20413=>1000,20414=>1000,20415=>1000,20416=>1000,20417=>1000,20418=>1000,20419=>1000,20420=>1000,
-	20421=>1000,20422=>1000,20423=>1000,20424=>1000,20425=>1000,20426=>1000,20427=>1000,20428=>1000,20429=>1000,20430=>1000,20431=>1000,20432=>1000,20433=>1000,20434=>1000,20435=>1000,20436=>1000,
-	20437=>1000,20438=>1000,20439=>1000,20440=>1000,20441=>1000,20442=>1000,20443=>1000,20444=>1000,20445=>1000,20446=>1000,20447=>1000,20448=>1000,20449=>1000,20450=>1000,20451=>1000,20452=>1000,
-	20453=>1000,20454=>1000,20455=>1000,20456=>1000,20457=>1000,20458=>1000,20459=>1000,20460=>1000,20461=>1000,20462=>1000,20463=>1000,20464=>1000,20465=>1000,20466=>1000,20467=>1000,20468=>1000,
-	20469=>1000,20470=>1000,20471=>1000,20472=>1000,20473=>1000,20474=>1000,20475=>1000,20476=>1000,20477=>1000,20478=>1000,20479=>1000,20480=>1000,20481=>1000,20482=>1000,20483=>1000,20484=>1000,
-	20485=>1000,20486=>1000,20487=>1000,20488=>1000,20489=>1000,20490=>1000,20491=>1000,20492=>1000,20493=>1000,20494=>1000,20495=>1000,20496=>1000,20497=>1000,20498=>1000,20499=>1000,20500=>1000,
-	20501=>1000,20502=>1000,20503=>1000,20504=>1000,20505=>1000,20506=>1000,20507=>1000,20508=>1000,20509=>1000,20510=>1000,20511=>1000,20512=>1000,20513=>1000,20514=>1000,20515=>1000,20516=>1000,
-	20517=>1000,20518=>1000,20519=>1000,20520=>1000,20521=>1000,20522=>1000,20523=>1000,20524=>1000,20525=>1000,20526=>1000,20527=>1000,20528=>1000,20529=>1000,20530=>1000,20531=>1000,20532=>1000,
-	20533=>1000,20534=>1000,20535=>1000,20536=>1000,20537=>1000,20538=>1000,20539=>1000,20540=>1000,20541=>1000,20542=>1000,20543=>1000,20544=>1000,20545=>1000,20546=>1000,20547=>1000,20548=>1000,
-	20549=>1000,20550=>1000,20551=>1000,20552=>1000,20553=>1000,20554=>1000,20555=>1000,20556=>1000,20557=>1000,20558=>1000,20559=>1000,20560=>1000,20561=>1000,20562=>1000,20563=>1000,20564=>1000,
-	20565=>1000,20566=>1000,20567=>1000,20568=>1000,20569=>1000,20570=>1000,20571=>1000,20572=>1000,20573=>1000,20574=>1000,20575=>1000,20576=>1000,20577=>1000,20578=>1000,20579=>1000,20580=>1000,
-	20581=>1000,20582=>1000,20583=>1000,20584=>1000,20585=>1000,20586=>1000,20587=>1000,20588=>1000,20589=>1000,20590=>1000,20591=>1000,20592=>1000,20593=>1000,20594=>1000,20595=>1000,20596=>1000,
-	20597=>1000,20598=>1000,20599=>1000,20600=>1000,20601=>1000,20602=>1000,20603=>1000,20604=>1000,20605=>1000,20606=>1000,20607=>1000,20608=>1000,20609=>1000,20610=>1000,20611=>1000,20612=>1000,
-	20613=>1000,20614=>1000,20615=>1000,20616=>1000,20617=>1000,20618=>1000,20619=>1000,20620=>1000,20621=>1000,20622=>1000,20623=>1000,20624=>1000,20625=>1000,20626=>1000,20627=>1000,20628=>1000,
-	20629=>1000,20630=>1000,20631=>1000,20632=>1000,20633=>1000,20634=>1000,20635=>1000,20636=>1000,20637=>1000,20638=>1000,20639=>1000,20640=>1000,20641=>1000,20642=>1000,20643=>1000,20644=>1000,
-	20645=>1000,20646=>1000,20647=>1000,20648=>1000,20649=>1000,20650=>1000,20651=>1000,20652=>1000,20653=>1000,20654=>1000,20655=>1000,20656=>1000,20657=>1000,20658=>1000,20659=>1000,20660=>1000,
-	20661=>1000,20662=>1000,20663=>1000,20664=>1000,20665=>1000,20666=>1000,20667=>1000,20668=>1000,20669=>1000,20670=>1000,20671=>1000,20672=>1000,20673=>1000,20674=>1000,20675=>1000,20676=>1000,
-	20677=>1000,20678=>1000,20679=>1000,20680=>1000,20681=>1000,20682=>1000,20683=>1000,20684=>1000,20685=>1000,20686=>1000,20687=>1000,20688=>1000,20689=>1000,20690=>1000,20691=>1000,20692=>1000,
-	20693=>1000,20694=>1000,20695=>1000,20696=>1000,20697=>1000,20698=>1000,20699=>1000,20700=>1000,20701=>1000,20702=>1000,20703=>1000,20704=>1000,20705=>1000,20706=>1000,20707=>1000,20708=>1000,
-	20709=>1000,20710=>1000,20711=>1000,20712=>1000,20713=>1000,20714=>1000,20715=>1000,20716=>1000,20717=>1000,20718=>1000,20719=>1000,20720=>1000,20721=>1000,20722=>1000,20723=>1000,20724=>1000,
-	20725=>1000,20726=>1000,20727=>1000,20728=>1000,20729=>1000,20730=>1000,20731=>1000,20732=>1000,20733=>1000,20734=>1000,20735=>1000,20736=>1000,20737=>1000,20738=>1000,20739=>1000,20740=>1000,
-	20741=>1000,20742=>1000,20743=>1000,20744=>1000,20745=>1000,20746=>1000,20747=>1000,20748=>1000,20749=>1000,20750=>1000,20751=>1000,20752=>1000,20753=>1000,20754=>1000,20755=>1000,20756=>1000,
-	20757=>1000,20758=>1000,20759=>1000,20760=>1000,20761=>1000,20762=>1000,20763=>1000,20764=>1000,20765=>1000,20766=>1000,20767=>1000,20768=>1000,20769=>1000,20770=>1000,20771=>1000,20772=>1000,
-	20773=>1000,20774=>1000,20775=>1000,20776=>1000,20777=>1000,20778=>1000,20779=>1000,20780=>1000,20781=>1000,20782=>1000,20783=>1000,20784=>1000,20785=>1000,20786=>1000,20787=>1000,20788=>1000,
-	20789=>1000,20790=>1000,20791=>1000,20792=>1000,20793=>1000,20794=>1000,20795=>1000,20796=>1000,20797=>1000,20798=>1000,20799=>1000,20800=>1000,20801=>1000,20802=>1000,20803=>1000,20804=>1000,
-	20805=>1000,20806=>1000,20807=>1000,20808=>1000,20809=>1000,20810=>1000,20811=>1000,20812=>1000,20813=>1000,20814=>1000,20815=>1000,20816=>1000,20817=>1000,20818=>1000,20819=>1000,20820=>1000,
-	20821=>1000,20822=>1000,20823=>1000,20824=>1000,20825=>1000,20826=>1000,20827=>1000,20828=>1000,20829=>1000,20830=>1000,20831=>1000,20832=>1000,20833=>1000,20834=>1000,20835=>1000,20836=>1000,
-	20837=>1000,20838=>1000,20839=>1000,20840=>1000,20841=>1000,20842=>1000,20843=>1000,20844=>1000,20845=>1000,20846=>1000,20847=>1000,20848=>1000,20849=>1000,20850=>1000,20851=>1000,20852=>1000,
-	20853=>1000,20854=>1000,20855=>1000,20856=>1000,20857=>1000,20858=>1000,20859=>1000,20860=>1000,20861=>1000,20862=>1000,20863=>1000,20864=>1000,20865=>1000,20866=>1000,20867=>1000,20868=>1000,
-	20869=>1000,20870=>1000,20871=>1000,20872=>1000,20873=>1000,20874=>1000,20875=>1000,20876=>1000,20877=>1000,20878=>1000,20879=>1000,20880=>1000,20881=>1000,20882=>1000,20883=>1000,20884=>1000,
-	20885=>1000,20886=>1000,20887=>1000,20888=>1000,20889=>1000,20890=>1000,20891=>1000,20892=>1000,20893=>1000,20894=>1000,20895=>1000,20896=>1000,20897=>1000,20898=>1000,20899=>1000,20900=>1000,
-	20901=>1000,20902=>1000,20903=>1000,20904=>1000,20905=>1000,20906=>1000,20907=>1000,20908=>1000,20909=>1000,20910=>1000,20911=>1000,20912=>1000,20913=>1000,20914=>1000,20915=>1000,20916=>1000,
-	20917=>1000,20918=>1000,20919=>1000,20920=>1000,20921=>1000,20922=>1000,20923=>1000,20924=>1000,20925=>1000,20926=>1000,20927=>1000,20928=>1000,20929=>1000,20930=>1000,20931=>1000,20932=>1000,
-	20933=>1000,20934=>1000,20935=>1000,20936=>1000,20937=>1000,20938=>1000,20939=>1000,20940=>1000,20941=>1000,20942=>1000,20943=>1000,20944=>1000,20945=>1000,20946=>1000,20947=>1000,20948=>1000,
-	20949=>1000,20950=>1000,20951=>1000,20952=>1000,20953=>1000,20954=>1000,20955=>1000,20956=>1000,20957=>1000,20958=>1000,20959=>1000,20960=>1000,20961=>1000,20962=>1000,20963=>1000,20964=>1000,
-	20965=>1000,20966=>1000,20967=>1000,20968=>1000,20969=>1000,20970=>1000,20971=>1000,20972=>1000,20973=>1000,20974=>1000,20975=>1000,20976=>1000,20977=>1000,20978=>1000,20979=>1000,20980=>1000,
-	20981=>1000,20982=>1000,20983=>1000,20984=>1000,20985=>1000,20986=>1000,20987=>1000,20988=>1000,20989=>1000,20990=>1000,20991=>1000,20992=>1000,20993=>1000,20994=>1000,20995=>1000,20996=>1000,
-	20997=>1000,20998=>1000,20999=>1000,21000=>1000,21001=>1000,21002=>1000,21003=>1000,21004=>1000,21005=>1000,21006=>1000,21007=>1000,21008=>1000,21009=>1000,21010=>1000,21011=>1000,21012=>1000,
-	21013=>1000,21014=>1000,21015=>1000,21016=>1000,21017=>1000,21018=>1000,21019=>1000,21020=>1000,21021=>1000,21022=>1000,21023=>1000,21024=>1000,21025=>1000,21026=>1000,21027=>1000,21028=>1000,
-	21029=>1000,21030=>1000,21031=>1000,21032=>1000,21033=>1000,21034=>1000,21035=>1000,21036=>1000,21037=>1000,21038=>1000,21039=>1000,21040=>1000,21041=>1000,21042=>1000,21043=>1000,21044=>1000,
-	21045=>1000,21046=>1000,21047=>1000,21048=>1000,21049=>1000,21050=>1000,21051=>1000,21052=>1000,21053=>1000,21054=>1000,21055=>1000,21056=>1000,21057=>1000,21058=>1000,21059=>1000,21060=>1000,
-	21061=>1000,21062=>1000,21063=>1000,21064=>1000,21065=>1000,21066=>1000,21067=>1000,21068=>1000,21069=>1000,21070=>1000,21071=>1000,21072=>1000,21073=>1000,21074=>1000,21075=>1000,21076=>1000,
-	21077=>1000,21078=>1000,21079=>1000,21080=>1000,21081=>1000,21082=>1000,21083=>1000,21084=>1000,21085=>1000,21086=>1000,21087=>1000,21088=>1000,21089=>1000,21090=>1000,21091=>1000,21092=>1000,
-	21093=>1000,21094=>1000,21095=>1000,21096=>1000,21097=>1000,21098=>1000,21099=>1000,21100=>1000,21101=>1000,21102=>1000,21103=>1000,21104=>1000,21105=>1000,21106=>1000,21107=>1000,21108=>1000,
-	21109=>1000,21110=>1000,21111=>1000,21112=>1000,21113=>1000,21114=>1000,21115=>1000,21116=>1000,21117=>1000,21118=>1000,21119=>1000,21120=>1000,21121=>1000,21122=>1000,21123=>1000,21124=>1000,
-	21125=>1000,21126=>1000,21127=>1000,21128=>1000,21129=>1000,21130=>1000,21131=>1000,21132=>1000,21133=>1000,21134=>1000,21135=>1000,21136=>1000,21137=>1000,21138=>1000,21139=>1000,21140=>1000,
-	21141=>1000,21142=>1000,21143=>1000,21144=>1000,21145=>1000,21146=>1000,21147=>1000,21148=>1000,21149=>1000,21150=>1000,21151=>1000,21152=>1000,21153=>1000,21154=>1000,21155=>1000,21156=>1000,
-	21157=>1000,21158=>1000,21159=>1000,21160=>1000,21161=>1000,21162=>1000,21163=>1000,21164=>1000,21165=>1000,21166=>1000,21167=>1000,21168=>1000,21169=>1000,21170=>1000,21171=>1000,21172=>1000,
-	21173=>1000,21174=>1000,21175=>1000,21176=>1000,21177=>1000,21178=>1000,21179=>1000,21180=>1000,21181=>1000,21182=>1000,21183=>1000,21184=>1000,21185=>1000,21186=>1000,21187=>1000,21188=>1000,
-	21189=>1000,21190=>1000,21191=>1000,21192=>1000,21193=>1000,21194=>1000,21195=>1000,21196=>1000,21197=>1000,21198=>1000,21199=>1000,21200=>1000,21201=>1000,21202=>1000,21203=>1000,21204=>1000,
-	21205=>1000,21206=>1000,21207=>1000,21208=>1000,21209=>1000,21210=>1000,21211=>1000,21212=>1000,21213=>1000,21214=>1000,21215=>1000,21216=>1000,21217=>1000,21218=>1000,21219=>1000,21220=>1000,
-	21221=>1000,21222=>1000,21223=>1000,21224=>1000,21225=>1000,21226=>1000,21227=>1000,21228=>1000,21229=>1000,21230=>1000,21231=>1000,21232=>1000,21233=>1000,21234=>1000,21235=>1000,21236=>1000,
-	21237=>1000,21238=>1000,21239=>1000,21240=>1000,21241=>1000,21242=>1000,21243=>1000,21244=>1000,21245=>1000,21246=>1000,21247=>1000,21248=>1000,21249=>1000,21250=>1000,21251=>1000,21252=>1000,
-	21253=>1000,21254=>1000,21255=>1000,21256=>1000,21257=>1000,21258=>1000,21259=>1000,21260=>1000,21261=>1000,21262=>1000,21263=>1000,21264=>1000,21265=>1000,21266=>1000,21267=>1000,21268=>1000,
-	21269=>1000,21270=>1000,21271=>1000,21272=>1000,21273=>1000,21274=>1000,21275=>1000,21276=>1000,21277=>1000,21278=>1000,21279=>1000,21280=>1000,21281=>1000,21282=>1000,21283=>1000,21284=>1000,
-	21285=>1000,21286=>1000,21287=>1000,21288=>1000,21289=>1000,21290=>1000,21291=>1000,21292=>1000,21293=>994,21294=>1000,21295=>1000,21296=>1000,21297=>1000,21298=>1000,21299=>1000,21300=>1000,
-	21301=>1000,21302=>1000,21303=>1000,21304=>1000,21305=>1000,21306=>1000,21307=>1000,21308=>1000,21309=>1000,21310=>1000,21311=>1000,21312=>1000,21313=>1000,21314=>1000,21315=>1000,21316=>1000,
-	21317=>1000,21318=>1000,21319=>1000,21320=>1000,21321=>1000,21322=>1000,21323=>1000,21324=>1000,21325=>1000,21326=>1000,21327=>1000,21328=>1000,21329=>1000,21330=>1000,21331=>1000,21332=>1000,
-	21333=>1000,21334=>1000,21335=>1000,21336=>1000,21337=>1000,21338=>1000,21339=>1000,21340=>1000,21341=>1000,21342=>1000,21343=>1000,21344=>1000,21345=>1000,21346=>1000,21347=>1000,21348=>1000,
-	21349=>1000,21350=>1000,21351=>1000,21352=>1000,21353=>1000,21354=>1000,21355=>1000,21356=>1000,21357=>1000,21358=>1000,21359=>1000,21360=>1000,21361=>1000,21362=>1000,21363=>1000,21364=>1000,
-	21365=>1000,21366=>1000,21367=>1000,21368=>1000,21369=>1000,21370=>1000,21371=>1000,21372=>1000,21373=>1000,21374=>1000,21375=>1000,21376=>1000,21377=>1000,21378=>1000,21379=>1000,21380=>1000,
-	21381=>1000,21382=>1000,21383=>1000,21384=>1000,21385=>1000,21386=>1000,21387=>1000,21388=>1000,21389=>1000,21390=>1000,21391=>1000,21392=>1000,21393=>1000,21394=>1000,21395=>1000,21396=>1000,
-	21397=>1000,21398=>1000,21399=>1000,21400=>1000,21401=>1000,21402=>1000,21403=>1000,21404=>1000,21405=>1000,21406=>1000,21407=>1000,21408=>1000,21409=>1000,21410=>1000,21411=>1000,21412=>1000,
-	21413=>1000,21414=>1000,21415=>1000,21416=>1000,21417=>1000,21418=>1000,21419=>1000,21420=>1000,21421=>1000,21422=>1000,21423=>1000,21424=>1000,21425=>1000,21426=>1000,21427=>1000,21428=>1000,
-	21429=>1000,21430=>1000,21431=>1000,21432=>1000,21433=>1000,21434=>1000,21435=>1000,21436=>1000,21437=>1000,21438=>1000,21439=>1000,21440=>1000,21441=>1000,21442=>1000,21443=>1000,21444=>1000,
-	21445=>1000,21446=>1000,21447=>1000,21448=>1000,21449=>1000,21450=>1000,21451=>1000,21452=>1000,21453=>1000,21454=>1000,21455=>1000,21456=>1000,21457=>1000,21458=>1000,21459=>1000,21460=>1000,
-	21461=>1000,21462=>1000,21463=>1000,21464=>1000,21465=>1000,21466=>1000,21467=>1000,21468=>1000,21469=>1000,21470=>1000,21471=>1000,21472=>1000,21473=>1000,21474=>1000,21475=>1000,21476=>1000,
-	21477=>1000,21478=>1000,21479=>1000,21480=>1000,21481=>1000,21482=>1000,21483=>1000,21484=>1000,21485=>1000,21486=>1000,21487=>1000,21488=>1000,21489=>1000,21490=>1000,21491=>1000,21492=>1000,
-	21493=>1000,21494=>1000,21495=>1000,21496=>1000,21497=>1000,21498=>1000,21499=>1000,21500=>1000,21501=>1000,21502=>1000,21503=>1000,21504=>1000,21505=>1000,21506=>1000,21507=>1000,21508=>1000,
-	21509=>1000,21510=>1000,21511=>1000,21512=>1000,21513=>1000,21514=>1000,21515=>1000,21516=>1000,21517=>1000,21518=>1000,21519=>1000,21520=>1000,21521=>1000,21522=>1000,21523=>1000,21524=>1000,
-	21525=>1000,21526=>1000,21527=>1000,21528=>1000,21529=>1000,21530=>1000,21531=>1000,21532=>1000,21533=>1000,21534=>1000,21535=>1000,21536=>1000,21537=>1000,21538=>1000,21539=>1000,21540=>1000,
-	21541=>1000,21542=>1000,21543=>1000,21544=>1000,21545=>1000,21546=>1000,21547=>1000,21548=>1000,21549=>1000,21550=>1000,21551=>1000,21552=>1000,21553=>1000,21554=>1000,21555=>1000,21556=>1000,
-	21557=>1000,21558=>1000,21559=>1000,21560=>1000,21561=>1000,21562=>1000,21563=>1000,21564=>1000,21565=>1000,21566=>1000,21567=>1000,21568=>1000,21569=>1000,21570=>1000,21571=>1000,21572=>1000,
-	21573=>1000,21574=>1000,21575=>1000,21576=>1000,21577=>1000,21578=>1000,21579=>1000,21580=>1000,21581=>1000,21582=>1000,21583=>1000,21584=>1000,21585=>1000,21586=>1000,21587=>1000,21588=>1000,
-	21589=>1000,21590=>1000,21591=>1000,21592=>1000,21593=>1000,21594=>1000,21595=>1000,21596=>1000,21597=>1000,21598=>1000,21599=>1000,21600=>1000,21601=>1000,21602=>1000,21603=>1000,21604=>1000,
-	21605=>1000,21606=>1000,21607=>1000,21608=>1000,21609=>1000,21610=>1000,21611=>1000,21612=>1000,21613=>1000,21614=>1000,21615=>1000,21616=>1000,21617=>1000,21618=>1000,21619=>1000,21620=>1000,
-	21621=>1000,21622=>1000,21623=>1000,21624=>1000,21625=>1000,21626=>1000,21627=>1000,21628=>1000,21629=>1000,21630=>1000,21631=>1000,21632=>1000,21633=>1000,21634=>1000,21635=>1000,21636=>1000,
-	21637=>1000,21638=>1000,21639=>1000,21640=>1000,21641=>1000,21642=>1000,21643=>1000,21644=>1000,21645=>1000,21646=>1000,21647=>1000,21648=>1000,21649=>1000,21650=>1000,21651=>1000,21652=>1000,
-	21653=>1000,21654=>1000,21655=>1000,21656=>1000,21657=>1000,21658=>1000,21659=>1000,21660=>1000,21661=>1000,21662=>1000,21663=>1000,21664=>1000,21665=>1000,21666=>1000,21667=>1000,21668=>1000,
-	21669=>1000,21670=>1000,21671=>1000,21672=>1000,21673=>1000,21674=>1000,21675=>1000,21676=>1000,21677=>1000,21678=>1000,21679=>1000,21680=>1000,21681=>1000,21682=>1000,21683=>1000,21684=>1000,
-	21685=>1000,21686=>1000,21687=>1000,21688=>1000,21689=>1000,21690=>1000,21691=>1000,21692=>1000,21693=>1000,21694=>1000,21695=>1000,21696=>1000,21697=>1000,21698=>1000,21699=>1000,21700=>1000,
-	21701=>1000,21702=>1000,21703=>1000,21704=>1000,21705=>1000,21706=>1000,21707=>1000,21708=>1000,21709=>1000,21710=>1000,21711=>1000,21712=>1000,21713=>1000,21714=>1000,21715=>1000,21716=>1000,
-	21717=>1000,21718=>1000,21719=>1000,21720=>1000,21721=>1000,21722=>1000,21723=>1000,21724=>1000,21725=>1000,21726=>1000,21727=>1000,21728=>1000,21729=>1000,21730=>1000,21731=>1000,21732=>1000,
-	21733=>1000,21734=>1000,21735=>1000,21736=>1000,21737=>1000,21738=>1000,21739=>1000,21740=>1000,21741=>1000,21742=>1000,21743=>1000,21744=>1000,21745=>1000,21746=>1000,21747=>1000,21748=>1000,
-	21749=>1000,21750=>1000,21751=>1000,21752=>1000,21753=>1000,21754=>1000,21755=>1000,21756=>1000,21757=>1000,21758=>1000,21759=>1000,21760=>1000,21761=>1000,21762=>1000,21763=>1000,21764=>1000,
-	21765=>1000,21766=>1000,21767=>1000,21768=>1000,21769=>1000,21770=>1000,21771=>1000,21772=>1000,21773=>1000,21774=>1000,21775=>1000,21776=>1000,21777=>1000,21778=>1000,21779=>1000,21780=>1000,
-	21781=>1000,21782=>1000,21783=>1000,21784=>1000,21785=>1000,21786=>1000,21787=>1000,21788=>1000,21789=>1000,21790=>1000,21791=>1000,21792=>1000,21793=>1000,21794=>1000,21795=>1000,21796=>1000,
-	21797=>1000,21798=>1000,21799=>1000,21800=>1000,21801=>1000,21802=>1000,21803=>1000,21804=>1000,21805=>1000,21806=>1000,21807=>1000,21808=>1000,21809=>1000,21810=>1000,21811=>1000,21812=>1000,
-	21813=>1000,21814=>1000,21815=>1000,21816=>1000,21817=>1000,21818=>1000,21819=>1000,21820=>1000,21821=>1000,21822=>1000,21823=>1000,21824=>1000,21825=>1000,21826=>1000,21827=>1000,21828=>1000,
-	21829=>1000,21830=>1000,21831=>1000,21832=>1000,21833=>1000,21834=>1000,21835=>1000,21836=>1000,21837=>1000,21838=>1000,21839=>1000,21840=>1000,21841=>1000,21842=>1000,21843=>1000,21844=>1000,
-	21845=>1000,21846=>1000,21847=>1000,21848=>1000,21849=>1000,21850=>1000,21851=>1000,21852=>1000,21853=>1000,21854=>1000,21855=>1000,21856=>1000,21857=>1000,21858=>1000,21859=>1000,21860=>1000,
-	21861=>1000,21862=>1000,21863=>1000,21864=>1000,21865=>1000,21866=>1000,21867=>1000,21868=>1000,21869=>1000,21870=>1000,21871=>1000,21872=>1000,21873=>1000,21874=>1000,21875=>1000,21876=>1000,
-	21877=>1000,21878=>1000,21879=>1000,21880=>1000,21881=>1000,21882=>1000,21883=>1000,21884=>1000,21885=>1000,21886=>1000,21887=>1000,21888=>1000,21889=>1000,21890=>1000,21891=>1000,21892=>1000,
-	21893=>1000,21894=>1000,21895=>1000,21896=>1000,21897=>1000,21898=>1000,21899=>1000,21900=>1000,21901=>1000,21902=>1000,21903=>1000,21904=>1000,21905=>1000,21906=>1000,21907=>1000,21908=>1000,
-	21909=>1000,21910=>1000,21911=>1000,21912=>1000,21913=>1000,21914=>1000,21915=>1000,21916=>1000,21917=>1000,21918=>1000,21919=>1000,21920=>1000,21921=>1000,21922=>1000,21923=>1000,21924=>1000,
-	21925=>1000,21926=>1000,21927=>1000,21928=>1000,21929=>1000,21930=>1000,21931=>1000,21932=>1000,21933=>1000,21934=>1000,21935=>1000,21936=>1000,21937=>1000,21938=>1000,21939=>1000,21940=>1000,
-	21941=>1000,21942=>1000,21943=>1000,21944=>1000,21945=>1000,21946=>1000,21947=>1000,21948=>1000,21949=>1000,21950=>1000,21951=>1000,21952=>1000,21953=>1000,21954=>1000,21955=>1000,21956=>1000,
-	21957=>1000,21958=>1000,21959=>1000,21960=>1000,21961=>1000,21962=>1000,21963=>1000,21964=>1000,21965=>1000,21966=>1000,21967=>1000,21968=>1000,21969=>1000,21970=>1000,21971=>1000,21972=>1000,
-	21973=>1000,21974=>1000,21975=>1000,21976=>1000,21977=>1000,21978=>1000,21979=>1000,21980=>1000,21981=>1000,21982=>1000,21983=>1000,21984=>1000,21985=>1000,21986=>1000,21987=>1000,21988=>1000,
-	21989=>1000,21990=>1000,21991=>1000,21992=>1000,21993=>1000,21994=>1000,21995=>1000,21996=>1000,21997=>1000,21998=>1000,21999=>1000,22000=>1000,22001=>1000,22002=>1000,22003=>1000,22004=>1000,
-	22005=>1000,22006=>1000,22007=>1000,22008=>1000,22009=>1000,22010=>1000,22011=>1000,22012=>1000,22013=>1000,22014=>1000,22015=>1000,22016=>1000,22017=>1000,22018=>1000,22019=>1000,22020=>1000,
-	22021=>1000,22022=>1000,22023=>1000,22024=>1000,22025=>1000,22026=>1000,22027=>1000,22028=>1000,22029=>1000,22030=>1000,22031=>1000,22032=>1000,22033=>1000,22034=>1000,22035=>1000,22036=>1000,
-	22037=>1000,22038=>1000,22039=>1000,22040=>1000,22041=>1000,22042=>1000,22043=>1000,22044=>1000,22045=>1000,22046=>1000,22047=>1000,22048=>1000,22049=>1000,22050=>1000,22051=>1000,22052=>1000,
-	22053=>1000,22054=>1000,22055=>1000,22056=>1000,22057=>1000,22058=>1000,22059=>1000,22060=>1000,22061=>1000,22062=>1000,22063=>1000,22064=>1000,22065=>1000,22066=>1000,22067=>1000,22068=>1000,
-	22069=>1000,22070=>1000,22071=>1000,22072=>1000,22073=>1000,22074=>1000,22075=>1000,22076=>1000,22077=>1000,22078=>1000,22079=>1000,22080=>1000,22081=>1000,22082=>1000,22083=>1000,22084=>1000,
-	22085=>1000,22086=>1000,22087=>1000,22088=>1000,22089=>1000,22090=>1000,22091=>1000,22092=>1000,22093=>1000,22094=>1000,22095=>1000,22096=>1000,22097=>1000,22098=>1000,22099=>1000,22100=>1000,
-	22101=>1000,22102=>1000,22103=>1000,22104=>1000,22105=>1000,22106=>1000,22107=>1000,22108=>1000,22109=>1000,22110=>1000,22111=>1000,22112=>1000,22113=>1000,22114=>1000,22115=>1000,22116=>1000,
-	22117=>1000,22118=>1000,22119=>1000,22120=>1000,22121=>1000,22122=>1000,22123=>1000,22124=>1000,22125=>1000,22126=>1000,22127=>1000,22128=>1000,22129=>1000,22130=>1000,22131=>1000,22132=>1000,
-	22133=>1000,22134=>1000,22135=>1000,22136=>1000,22137=>1000,22138=>1000,22139=>1000,22140=>1000,22141=>1000,22142=>1000,22143=>1000,22144=>1000,22145=>1000,22146=>1000,22147=>1000,22148=>1000,
-	22149=>1000,22150=>1000,22151=>1000,22152=>1000,22153=>1000,22154=>1000,22155=>1000,22156=>1000,22157=>1000,22158=>1000,22159=>1000,22160=>1000,22161=>1000,22162=>1000,22163=>1000,22164=>1000,
-	22165=>1000,22166=>1000,22167=>1000,22168=>1000,22169=>1000,22170=>1000,22171=>1000,22172=>1000,22173=>1000,22174=>1000,22175=>1000,22176=>1000,22177=>1000,22178=>1000,22179=>1000,22180=>1000,
-	22181=>1000,22182=>1000,22183=>1000,22184=>1000,22185=>1000,22186=>1000,22187=>1000,22188=>1000,22189=>1000,22190=>1000,22191=>1000,22192=>1000,22193=>1000,22194=>1000,22195=>1000,22196=>1000,
-	22197=>1000,22198=>1000,22199=>1000,22200=>1000,22201=>1000,22202=>1000,22203=>1000,22204=>1000,22205=>1000,22206=>1000,22207=>1000,22208=>1000,22209=>1000,22210=>1000,22211=>1000,22212=>1000,
-	22213=>1000,22214=>1000,22215=>1000,22216=>1000,22217=>1000,22218=>1000,22219=>1000,22220=>1000,22221=>1000,22222=>1000,22223=>1000,22224=>1000,22225=>1000,22226=>1000,22227=>1000,22228=>1000,
-	22229=>1000,22230=>1000,22231=>1000,22232=>1000,22233=>1000,22234=>1000,22235=>1000,22236=>1000,22237=>1000,22238=>1000,22239=>1000,22240=>1000,22241=>1000,22242=>1000,22243=>1000,22244=>1000,
-	22245=>1000,22246=>1000,22247=>1000,22248=>1000,22249=>1000,22250=>1000,22251=>1000,22252=>1000,22253=>1000,22254=>1000,22255=>1000,22256=>1000,22257=>1000,22258=>1000,22259=>1000,22260=>1000,
-	22261=>1000,22262=>1000,22263=>1000,22264=>1000,22265=>1000,22266=>1000,22267=>1000,22268=>1000,22269=>1000,22270=>1000,22271=>1000,22272=>1000,22273=>1000,22274=>1000,22275=>1000,22276=>1000,
-	22277=>1000,22278=>1000,22279=>1000,22280=>1000,22281=>1000,22282=>1000,22283=>1000,22284=>1000,22285=>1000,22286=>1000,22287=>1000,22288=>1000,22289=>1000,22290=>1000,22291=>1000,22292=>1000,
-	22293=>1000,22294=>1000,22295=>1000,22296=>1000,22297=>1000,22298=>1000,22299=>1000,22300=>1000,22301=>1000,22302=>1000,22303=>1000,22304=>1000,22305=>1000,22306=>1000,22307=>1000,22308=>1000,
-	22309=>1000,22310=>1000,22311=>1000,22312=>1000,22313=>1000,22314=>1000,22315=>1000,22316=>1000,22317=>1000,22318=>1000,22319=>1000,22320=>1000,22321=>1000,22322=>1000,22323=>1000,22324=>1000,
-	22325=>1000,22326=>1000,22327=>1000,22328=>1000,22329=>1000,22330=>1000,22331=>1000,22332=>1000,22333=>1000,22334=>1000,22335=>1000,22336=>1000,22337=>1000,22338=>1000,22339=>1000,22340=>1000,
-	22341=>1000,22342=>1000,22343=>1000,22344=>1000,22345=>1000,22346=>1000,22347=>1000,22348=>1000,22349=>1000,22350=>1000,22351=>1000,22352=>1000,22353=>1000,22354=>1000,22355=>1000,22356=>1000,
-	22357=>1000,22358=>1000,22359=>1000,22360=>1000,22361=>1000,22362=>1000,22363=>1000,22364=>1000,22365=>1000,22366=>1000,22367=>1000,22368=>1000,22369=>1000,22370=>1000,22371=>1000,22372=>1000,
-	22373=>1000,22374=>1000,22375=>1000,22376=>1000,22377=>1000,22378=>1000,22379=>1000,22380=>1000,22381=>1000,22382=>1000,22383=>1000,22384=>1000,22385=>1000,22386=>1000,22387=>1000,22388=>1000,
-	22389=>1000,22390=>1000,22391=>1000,22392=>1000,22393=>1000,22394=>1000,22395=>1000,22396=>1000,22397=>1000,22398=>1000,22399=>1000,22400=>1000,22401=>1000,22402=>1000,22403=>1000,22404=>1000,
-	22405=>1000,22406=>1000,22407=>1000,22408=>1000,22409=>1000,22410=>1000,22411=>1000,22412=>1000,22413=>1000,22414=>1000,22415=>1000,22416=>1000,22417=>1000,22418=>1000,22419=>1000,22420=>1000,
-	22421=>1000,22422=>1000,22423=>1000,22424=>1000,22425=>1000,22426=>1000,22427=>1000,22428=>1000,22429=>1000,22430=>1000,22431=>1000,22432=>1000,22433=>1000,22434=>1000,22435=>1000,22436=>1000,
-	22437=>1000,22438=>1000,22439=>1000,22440=>1000,22441=>1000,22442=>1000,22443=>1000,22444=>1000,22445=>1000,22446=>1000,22447=>1000,22448=>1000,22449=>1000,22450=>1000,22451=>1000,22452=>1000,
-	22453=>1000,22454=>1000,22455=>1000,22456=>1000,22457=>1000,22458=>1000,22459=>1000,22460=>1000,22461=>1000,22462=>1000,22463=>1000,22464=>1000,22465=>1000,22466=>1000,22467=>1000,22468=>1000,
-	22469=>1000,22470=>1000,22471=>1000,22472=>1000,22473=>1000,22474=>1000,22475=>1000,22476=>1000,22477=>1000,22478=>1000,22479=>1000,22480=>1000,22481=>1000,22482=>1000,22483=>1000,22484=>1000,
-	22485=>1000,22486=>1000,22487=>1000,22488=>1000,22489=>1000,22490=>1000,22491=>1000,22492=>1000,22493=>1000,22494=>1000,22495=>1000,22496=>1000,22497=>1000,22498=>1000,22499=>1000,22500=>1000,
-	22501=>1000,22502=>1000,22503=>1000,22504=>1000,22505=>1000,22506=>1000,22507=>1000,22508=>1000,22509=>1000,22510=>1000,22511=>1000,22512=>1000,22513=>1000,22514=>1000,22515=>1000,22516=>1000,
-	22517=>1000,22518=>1000,22519=>1000,22520=>1000,22521=>1000,22522=>1000,22523=>1000,22524=>1000,22525=>1000,22526=>1000,22527=>1000,22528=>1000,22529=>1000,22530=>1000,22531=>1000,22532=>1000,
-	22533=>1000,22534=>1000,22535=>1000,22536=>1000,22537=>1000,22538=>1000,22539=>1000,22540=>1000,22541=>1000,22542=>1000,22543=>1000,22544=>1000,22545=>1000,22546=>1000,22547=>1000,22548=>1000,
-	22549=>1000,22550=>1000,22551=>1000,22552=>1000,22553=>1000,22554=>1000,22555=>1000,22556=>1000,22557=>1000,22558=>1000,22559=>1000,22560=>1000,22561=>1000,22562=>1000,22563=>1000,22564=>1000,
-	22565=>1000,22566=>1000,22567=>1000,22568=>1000,22569=>1000,22570=>1000,22571=>1000,22572=>1000,22573=>1000,22574=>1000,22575=>1000,22576=>1000,22577=>1000,22578=>1000,22579=>1000,22580=>1000,
-	22581=>1000,22582=>1000,22583=>1000,22584=>1000,22585=>1000,22586=>1000,22587=>1000,22588=>1000,22589=>1000,22590=>1000,22591=>1000,22592=>1000,22593=>1000,22594=>1000,22595=>1000,22596=>1000,
-	22597=>1000,22598=>1000,22599=>1000,22600=>1000,22601=>1000,22602=>1000,22603=>1000,22604=>1000,22605=>1000,22606=>1000,22607=>1000,22608=>1000,22609=>1000,22610=>1000,22611=>1000,22612=>1000,
-	22613=>1000,22614=>1000,22615=>1000,22616=>1000,22617=>1000,22618=>1000,22619=>1000,22620=>1000,22621=>1000,22622=>1000,22623=>1000,22624=>1000,22625=>1000,22626=>1000,22627=>1000,22628=>1000,
-	22629=>1000,22630=>1000,22631=>1000,22632=>1000,22633=>1000,22634=>1000,22635=>1000,22636=>1000,22637=>1000,22638=>1000,22639=>1000,22640=>1000,22641=>1000,22642=>1000,22643=>1000,22644=>1000,
-	22645=>1000,22646=>1000,22647=>1000,22648=>1000,22649=>1000,22650=>1000,22651=>1000,22652=>1000,22653=>1000,22654=>1000,22655=>1000,22656=>1000,22657=>1000,22658=>1000,22659=>1000,22660=>1000,
-	22661=>1000,22662=>1000,22663=>1000,22664=>1000,22665=>1000,22666=>1000,22667=>1000,22668=>1000,22669=>1000,22670=>1000,22671=>1000,22672=>1000,22673=>1000,22674=>1000,22675=>1000,22676=>1000,
-	22677=>1000,22678=>1000,22679=>1000,22680=>1000,22681=>1000,22682=>1000,22683=>1000,22684=>1000,22685=>1000,22686=>1000,22687=>1000,22688=>1000,22689=>1000,22690=>1000,22691=>1000,22692=>1000,
-	22693=>1000,22694=>1000,22695=>1000,22696=>1000,22697=>1000,22698=>1000,22699=>1000,22700=>1000,22701=>1000,22702=>1000,22703=>1000,22704=>1000,22705=>1000,22706=>1000,22707=>1000,22708=>1000,
-	22709=>1000,22710=>1000,22711=>1000,22712=>1000,22713=>1000,22714=>1000,22715=>1000,22716=>1000,22717=>1000,22718=>1000,22719=>1000,22720=>1000,22721=>1000,22722=>1000,22723=>1000,22724=>1000,
-	22725=>1000,22726=>1000,22727=>1000,22728=>1000,22729=>1000,22730=>1000,22731=>1000,22732=>1000,22733=>1000,22734=>1000,22735=>1000,22736=>1000,22737=>1000,22738=>1000,22739=>1000,22740=>1000,
-	22741=>1000,22742=>1000,22743=>1000,22744=>1000,22745=>1000,22746=>1000,22747=>1000,22748=>1000,22749=>1000,22750=>1000,22751=>1000,22752=>1000,22753=>1000,22754=>1000,22755=>1000,22756=>1000,
-	22757=>1000,22758=>1000,22759=>1000,22760=>1000,22761=>1000,22762=>1000,22763=>1000,22764=>1000,22765=>1000,22766=>1000,22767=>1000,22768=>1000,22769=>1000,22770=>1000,22771=>1000,22772=>1000,
-	22773=>1000,22774=>1000,22775=>1000,22776=>1000,22777=>1000,22778=>1000,22779=>1000,22780=>1000,22781=>1000,22782=>1000,22783=>1000,22784=>1000,22785=>1000,22786=>1000,22787=>1000,22788=>1000,
-	22789=>1000,22790=>1000,22791=>1000,22792=>1000,22793=>1000,22794=>1000,22795=>1000,22796=>1000,22797=>1000,22798=>1000,22799=>1000,22800=>1000,22801=>1000,22802=>1000,22803=>1000,22804=>1000,
-	22805=>1000,22806=>1000,22807=>1000,22808=>1000,22809=>1000,22810=>1000,22811=>1000,22812=>1000,22813=>1000,22814=>1000,22815=>1000,22816=>1000,22817=>1000,22818=>1000,22819=>1000,22820=>1000,
-	22821=>1000,22822=>1000,22823=>1000,22824=>1000,22825=>1000,22826=>1000,22827=>1000,22828=>1000,22829=>1000,22830=>1000,22831=>1000,22832=>1000,22833=>1000,22834=>1000,22835=>1000,22836=>1000,
-	22837=>1000,22838=>1000,22839=>1000,22840=>1000,22841=>1000,22842=>1000,22843=>1000,22844=>1000,22845=>1000,22846=>1000,22847=>1000,22848=>1000,22849=>1000,22850=>1000,22851=>1000,22852=>1000,
-	22853=>1000,22854=>1000,22855=>1000,22856=>1000,22857=>1000,22858=>1000,22859=>1000,22860=>1000,22861=>1000,22862=>1000,22863=>1000,22864=>1000,22865=>1000,22866=>1000,22867=>1000,22868=>1000,
-	22869=>1000,22870=>1000,22871=>1000,22872=>1000,22873=>1000,22874=>1000,22875=>1000,22876=>1000,22877=>1000,22878=>1000,22879=>1000,22880=>1000,22881=>1000,22882=>1000,22883=>1000,22884=>1000,
-	22885=>1000,22886=>1000,22887=>1000,22888=>1000,22889=>1000,22890=>1000,22891=>1000,22892=>1000,22893=>1000,22894=>1000,22895=>1000,22896=>1000,22897=>1000,22898=>1000,22899=>1000,22900=>1000,
-	22901=>1000,22902=>1000,22903=>1000,22904=>1000,22905=>1000,22906=>1000,22907=>1000,22908=>1000,22909=>1000,22910=>1000,22911=>1000,22912=>1000,22913=>1000,22914=>1000,22915=>1000,22916=>1000,
-	22917=>1000,22918=>1000,22919=>1000,22920=>1000,22921=>1000,22922=>1000,22923=>1000,22924=>1000,22925=>1000,22926=>1000,22927=>1000,22928=>1000,22929=>1000,22930=>1000,22931=>1000,22932=>1000,
-	22933=>1000,22934=>1000,22935=>1000,22936=>1000,22937=>1000,22938=>1000,22939=>1000,22940=>1000,22941=>1000,22942=>1000,22943=>1000,22944=>1000,22945=>1000,22946=>1000,22947=>1000,22948=>1000,
-	22949=>1000,22950=>1000,22951=>1000,22952=>1000,22953=>1000,22954=>1000,22955=>1000,22956=>1000,22957=>1000,22958=>1000,22959=>1000,22960=>1000,22961=>1000,22962=>1000,22963=>1000,22964=>1000,
-	22965=>1000,22966=>1000,22967=>1000,22968=>1000,22969=>1000,22970=>1000,22971=>1000,22972=>1000,22973=>1000,22974=>1000,22975=>1000,22976=>1000,22977=>1000,22978=>1000,22979=>1000,22980=>1000,
-	22981=>1000,22982=>1000,22983=>1000,22984=>1000,22985=>1000,22986=>1000,22987=>1000,22988=>1000,22989=>1000,22990=>1000,22991=>1000,22992=>1000,22993=>1000,22994=>1000,22995=>1000,22996=>1000,
-	22997=>1000,22998=>1000,22999=>1000,23000=>1000,23001=>1000,23002=>1000,23003=>1000,23004=>1000,23005=>1000,23006=>1000,23007=>1000,23008=>1000,23009=>1000,23010=>1000,23011=>1000,23012=>1000,
-	23013=>1000,23014=>1000,23015=>1000,23016=>1000,23017=>1000,23018=>1000,23019=>1000,23020=>1000,23021=>1000,23022=>1000,23023=>1000,23024=>1000,23025=>1000,23026=>1000,23027=>1000,23028=>1000,
-	23029=>1000,23030=>1000,23031=>1000,23032=>1000,23033=>1000,23034=>1000,23035=>1000,23036=>1000,23037=>1000,23038=>1000,23039=>1000,23040=>1000,23041=>1000,23042=>1000,23043=>1000,23044=>1000,
-	23045=>1000,23046=>1000,23047=>1000,23048=>1000,23049=>1000,23050=>1000,23051=>1000,23052=>1000,23053=>1000,23054=>1000,23055=>1000,23056=>1000,23057=>1000,23058=>1000,23059=>1000,23060=>1000,
-	23061=>1000,23062=>1000,23063=>1000,23064=>1000,23065=>1000,23066=>1000,23067=>1000,23068=>1000,23069=>1000,23070=>1000,23071=>1000,23072=>1000,23073=>1000,23074=>1000,23075=>1000,23076=>1000,
-	23077=>1000,23078=>1000,23079=>1000,23080=>1000,23081=>1000,23082=>1000,23083=>1000,23084=>1000,23085=>1000,23086=>1000,23087=>1000,23088=>1000,23089=>1000,23090=>1000,23091=>1000,23092=>1000,
-	23093=>1000,23094=>1000,23095=>1000,23096=>1000,23097=>1000,23098=>1000,23099=>1000,23100=>1000,23101=>1000,23102=>1000,23103=>1000,23104=>1000,23105=>1000,23106=>1000,23107=>1000,23108=>1000,
-	23109=>1000,23110=>1000,23111=>1000,23112=>1000,23113=>1000,23114=>1000,23115=>1000,23116=>1000,23117=>1000,23118=>1000,23119=>1000,23120=>1000,23121=>1000,23122=>1000,23123=>1000,23124=>1000,
-	23125=>1000,23126=>1000,23127=>1000,23128=>1000,23129=>1000,23130=>1000,23131=>1000,23132=>1000,23133=>1000,23134=>1000,23135=>1000,23136=>1000,23137=>1000,23138=>1000,23139=>1000,23140=>1000,
-	23141=>1000,23142=>1000,23143=>1000,23144=>1000,23145=>1000,23146=>1000,23147=>1000,23148=>1000,23149=>1000,23150=>1000,23151=>1000,23152=>1000,23153=>1000,23154=>1000,23155=>1000,23156=>1000,
-	23157=>1000,23158=>1000,23159=>1000,23160=>1000,23161=>1000,23162=>1000,23163=>1000,23164=>1000,23165=>1000,23166=>1000,23167=>1000,23168=>1000,23169=>1000,23170=>1000,23171=>1000,23172=>1000,
-	23173=>1000,23174=>1000,23175=>1000,23176=>1000,23177=>1000,23178=>1000,23179=>1000,23180=>1000,23181=>1000,23182=>1000,23183=>1000,23184=>1000,23185=>1000,23186=>1000,23187=>1000,23188=>1000,
-	23189=>1000,23190=>1000,23191=>1000,23192=>1000,23193=>1000,23194=>1000,23195=>1000,23196=>1000,23197=>1000,23198=>1000,23199=>1000,23200=>1000,23201=>1000,23202=>1000,23203=>1000,23204=>1000,
-	23205=>1000,23206=>1000,23207=>1000,23208=>1000,23209=>1000,23210=>1000,23211=>1000,23212=>1000,23213=>1000,23214=>1000,23215=>1000,23216=>1000,23217=>1000,23218=>1000,23219=>1000,23220=>1000,
-	23221=>1000,23222=>1000,23223=>1000,23224=>1000,23225=>1000,23226=>1000,23227=>1000,23228=>1000,23229=>1000,23230=>1000,23231=>1000,23232=>1000,23233=>1000,23234=>1000,23235=>1000,23236=>1000,
-	23237=>1000,23238=>1000,23239=>1000,23240=>1000,23241=>1000,23242=>1000,23243=>1000,23244=>1000,23245=>1000,23246=>1000,23247=>1000,23248=>1000,23249=>1000,23250=>1000,23251=>1000,23252=>1000,
-	23253=>1000,23254=>1000,23255=>1000,23256=>1000,23257=>1000,23258=>1000,23259=>1000,23260=>1000,23261=>1000,23262=>1000,23263=>1000,23264=>1000,23265=>1000,23266=>1000,23267=>1000,23268=>1000,
-	23269=>1000,23270=>1000,23271=>1000,23272=>1000,23273=>1000,23274=>1000,23275=>1000,23276=>1000,23277=>1000,23278=>1000,23279=>1000,23280=>1000,23281=>1000,23282=>1000,23283=>1000,23284=>1000,
-	23285=>1000,23286=>1000,23287=>1000,23288=>1000,23289=>1000,23290=>1000,23291=>1000,23292=>1000,23293=>1000,23294=>1000,23295=>1000,23296=>1000,23297=>1000,23298=>1000,23299=>1000,23300=>1000,
-	23301=>1000,23302=>1000,23303=>1000,23304=>1000,23305=>1000,23306=>1000,23307=>1000,23308=>1000,23309=>1000,23310=>1000,23311=>1000,23312=>1000,23313=>1000,23314=>1000,23315=>1000,23316=>1000,
-	23317=>1000,23318=>1000,23319=>1000,23320=>1000,23321=>1000,23322=>1000,23323=>1000,23324=>1000,23325=>1000,23326=>1000,23327=>1000,23328=>1000,23329=>1000,23330=>1000,23331=>1000,23332=>1000,
-	23333=>1000,23334=>1000,23335=>1000,23336=>1000,23337=>1000,23338=>1000,23339=>1000,23340=>1000,23341=>1000,23342=>1000,23343=>1000,23344=>1000,23345=>1000,23346=>1000,23347=>1000,23348=>1000,
-	23349=>1000,23350=>1000,23351=>1000,23352=>1000,23353=>1000,23354=>1000,23355=>1000,23356=>1000,23357=>1000,23358=>1000,23359=>1000,23360=>1000,23361=>1000,23362=>1000,23363=>1000,23364=>1000,
-	23365=>1000,23366=>1000,23367=>1000,23368=>1000,23369=>1000,23370=>1000,23371=>1000,23372=>1000,23373=>1000,23374=>1000,23375=>1000,23376=>1000,23377=>1000,23378=>1000,23379=>1000,23380=>1000,
-	23381=>1000,23382=>1000,23383=>1000,23384=>1000,23385=>1000,23386=>1000,23387=>1000,23388=>1000,23389=>1000,23390=>1000,23391=>1000,23392=>1000,23393=>1000,23394=>1000,23395=>1000,23396=>1000,
-	23397=>1000,23398=>1000,23399=>1000,23400=>1000,23401=>1000,23402=>1000,23403=>1000,23404=>1000,23405=>1000,23406=>1000,23407=>1000,23408=>1000,23409=>1000,23410=>1000,23411=>1000,23412=>1000,
-	23413=>1000,23414=>1000,23415=>1000,23416=>1000,23417=>1000,23418=>1000,23419=>1000,23420=>1000,23421=>1000,23422=>1000,23423=>1000,23424=>1000,23425=>1000,23426=>1000,23427=>1000,23428=>1000,
-	23429=>1000,23430=>1000,23431=>1000,23432=>1000,23433=>1000,23434=>1000,23435=>1000,23436=>1000,23437=>1000,23438=>1000,23439=>1000,23440=>1000,23441=>1000,23442=>1000,23443=>1000,23444=>1000,
-	23445=>1000,23446=>1000,23447=>1000,23448=>1000,23449=>1000,23450=>1000,23451=>1000,23452=>1000,23453=>1000,23454=>1000,23455=>1000,23456=>1000,23457=>1000,23458=>1000,23459=>1000,23460=>1000,
-	23461=>1000,23462=>1000,23463=>1000,23464=>1000,23465=>1000,23466=>1000,23467=>1000,23468=>1000,23469=>1000,23470=>1000,23471=>1000,23472=>1000,23473=>1000,23474=>1000,23475=>1000,23476=>1000,
-	23477=>1000,23478=>1000,23479=>1000,23480=>1000,23481=>1000,23482=>1000,23483=>1000,23484=>1000,23485=>1000,23486=>1000,23487=>1000,23488=>1000,23489=>1000,23490=>1000,23491=>1000,23492=>1000,
-	23493=>1000,23494=>1000,23495=>1000,23496=>1000,23497=>1000,23498=>1000,23499=>1000,23500=>1000,23501=>1000,23502=>1000,23503=>1000,23504=>1000,23505=>1000,23506=>1000,23507=>1000,23508=>1000,
-	23509=>1000,23510=>1000,23511=>1000,23512=>1000,23513=>1000,23514=>1000,23515=>1000,23516=>1000,23517=>1000,23518=>1000,23519=>1000,23520=>1000,23521=>1000,23522=>1000,23523=>1000,23524=>1000,
-	23525=>1000,23526=>1000,23527=>1000,23528=>1000,23529=>1000,23530=>1000,23531=>1000,23532=>1000,23533=>1000,23534=>1000,23535=>1000,23536=>1000,23537=>1000,23538=>1000,23539=>1000,23540=>1000,
-	23541=>1000,23542=>1000,23543=>1000,23544=>1000,23545=>1000,23546=>1000,23547=>1000,23548=>1000,23549=>1000,23550=>1000,23551=>1000,23552=>1000,23553=>1000,23554=>1000,23555=>1000,23556=>1000,
-	23557=>1000,23558=>1000,23559=>1000,23560=>1000,23561=>1000,23562=>1000,23563=>1000,23564=>1000,23565=>1000,23566=>1000,23567=>1000,23568=>1000,23569=>1000,23570=>1000,23571=>1000,23572=>1000,
-	23573=>1000,23574=>1000,23575=>1000,23576=>1000,23577=>1000,23578=>1000,23579=>1000,23580=>1000,23581=>1000,23582=>1000,23583=>1000,23584=>1000,23585=>1000,23586=>1000,23587=>1000,23588=>1000,
-	23589=>1000,23590=>1000,23591=>1000,23592=>1000,23593=>1000,23594=>1000,23595=>1000,23596=>1000,23597=>1000,23598=>1000,23599=>1000,23600=>1000,23601=>1000,23602=>1000,23603=>1000,23604=>1000,
-	23605=>1000,23606=>1000,23607=>1000,23608=>1000,23609=>1000,23610=>1000,23611=>1000,23612=>1000,23613=>1000,23614=>1000,23615=>1000,23616=>1000,23617=>1000,23618=>1000,23619=>1000,23620=>1000,
-	23621=>1000,23622=>1000,23623=>1000,23624=>1000,23625=>1000,23626=>1000,23627=>1000,23628=>1000,23629=>1000,23630=>1000,23631=>1000,23632=>1000,23633=>1000,23634=>1000,23635=>1000,23636=>1000,
-	23637=>1000,23638=>1000,23639=>1000,23640=>1000,23641=>1000,23642=>1000,23643=>1000,23644=>1000,23645=>1000,23646=>1000,23647=>1000,23648=>1000,23649=>1000,23650=>1000,23651=>1000,23652=>1000,
-	23653=>1000,23654=>1000,23655=>1000,23656=>1000,23657=>1000,23658=>1000,23659=>1000,23660=>1000,23661=>1000,23662=>1000,23663=>1000,23664=>1000,23665=>1000,23666=>1000,23667=>1000,23668=>1000,
-	23669=>1000,23670=>1000,23671=>1000,23672=>1000,23673=>1000,23674=>1000,23675=>1000,23676=>1000,23677=>1000,23678=>1000,23679=>1000,23680=>1000,23681=>1000,23682=>1000,23683=>1000,23684=>1000,
-	23685=>1000,23686=>1000,23687=>1000,23688=>1000,23689=>1000,23690=>1000,23691=>1000,23692=>1000,23693=>1000,23694=>1000,23695=>1000,23696=>1000,23697=>1000,23698=>1000,23699=>1000,23700=>1000,
-	23701=>1000,23702=>1000,23703=>1000,23704=>1000,23705=>1000,23706=>1000,23707=>1000,23708=>1000,23709=>1000,23710=>1000,23711=>1000,23712=>1000,23713=>1000,23714=>1000,23715=>1000,23716=>1000,
-	23717=>1000,23718=>1000,23719=>1000,23720=>1000,23721=>1000,23722=>1000,23723=>1000,23724=>1000,23725=>1000,23726=>1000,23727=>1000,23728=>1000,23729=>1000,23730=>1000,23731=>1000,23732=>1000,
-	23733=>1000,23734=>1000,23735=>1000,23736=>1000,23737=>1000,23738=>1000,23739=>1000,23740=>1000,23741=>1000,23742=>1000,23743=>1000,23744=>1000,23745=>1000,23746=>1000,23747=>1000,23748=>1000,
-	23749=>1000,23750=>1000,23751=>1000,23752=>1000,23753=>1000,23754=>1000,23755=>1000,23756=>1000,23757=>1000,23758=>1000,23759=>1000,23760=>1000,23761=>1000,23762=>1000,23763=>1000,23764=>1000,
-	23765=>1000,23766=>1000,23767=>1000,23768=>1000,23769=>1000,23770=>1000,23771=>1000,23772=>1000,23773=>1000,23774=>1000,23775=>1000,23776=>1000,23777=>1000,23778=>1000,23779=>1000,23780=>1000,
-	23781=>1000,23782=>1000,23783=>1000,23784=>1000,23785=>1000,23786=>1000,23787=>1000,23788=>1000,23789=>1000,23790=>1000,23791=>1000,23792=>1000,23793=>1000,23794=>1000,23795=>1000,23796=>1000,
-	23797=>1000,23798=>1000,23799=>1000,23800=>1000,23801=>1000,23802=>1000,23803=>1000,23804=>1000,23805=>1000,23806=>1000,23807=>1000,23808=>1000,23809=>1000,23810=>1000,23811=>1000,23812=>1000,
-	23813=>1000,23814=>1000,23815=>1000,23816=>1000,23817=>1000,23818=>1000,23819=>1000,23820=>1000,23821=>1000,23822=>1000,23823=>1000,23824=>1000,23825=>1000,23826=>1000,23827=>1000,23828=>1000,
-	23829=>1000,23830=>1000,23831=>1000,23832=>1000,23833=>1000,23834=>1000,23835=>1000,23836=>1000,23837=>1000,23838=>1000,23839=>1000,23840=>1000,23841=>1000,23842=>1000,23843=>1000,23844=>1000,
-	23845=>1000,23846=>1000,23847=>1000,23848=>1000,23849=>1000,23850=>1000,23851=>1000,23852=>1000,23853=>1000,23854=>1000,23855=>1000,23856=>1000,23857=>1000,23858=>1000,23859=>1000,23860=>1000,
-	23861=>1000,23862=>1000,23863=>1000,23864=>1000,23865=>1000,23866=>1000,23867=>1000,23868=>1000,23869=>1000,23870=>1000,23871=>1000,23872=>1000,23873=>1000,23874=>1000,23875=>1000,23876=>1000,
-	23877=>1000,23878=>1000,23879=>1000,23880=>1000,23881=>1000,23882=>1000,23883=>1000,23884=>1000,23885=>1000,23886=>1000,23887=>1000,23888=>1000,23889=>1000,23890=>1000,23891=>1000,23892=>1000,
-	23893=>1000,23894=>1000,23895=>1000,23896=>1000,23897=>1000,23898=>1000,23899=>1000,23900=>1000,23901=>1000,23902=>1000,23903=>1000,23904=>1000,23905=>1000,23906=>1000,23907=>1000,23908=>1000,
-	23909=>1000,23910=>1000,23911=>1000,23912=>1000,23913=>1000,23914=>1000,23915=>1000,23916=>1000,23917=>1000,23918=>1000,23919=>1000,23920=>1000,23921=>1000,23922=>1000,23923=>1000,23924=>1000,
-	23925=>1000,23926=>1000,23927=>1000,23928=>1000,23929=>1000,23930=>1000,23931=>1000,23932=>1000,23933=>1000,23934=>1000,23935=>1000,23936=>1000,23937=>1000,23938=>1000,23939=>1000,23940=>1000,
-	23941=>1000,23942=>1000,23943=>1000,23944=>1000,23945=>1000,23946=>1000,23947=>1000,23948=>1000,23949=>1000,23950=>1000,23951=>1000,23952=>1000,23953=>1000,23954=>1000,23955=>1000,23956=>1000,
-	23957=>1000,23958=>1000,23959=>1000,23960=>1000,23961=>1000,23962=>1000,23963=>1000,23964=>1000,23965=>1000,23966=>1000,23967=>1000,23968=>1000,23969=>1000,23970=>1000,23971=>1000,23972=>1000,
-	23973=>1000,23974=>1000,23975=>1000,23976=>1000,23977=>1000,23978=>1000,23979=>1000,23980=>1000,23981=>1000,23982=>1000,23983=>1000,23984=>1000,23985=>1000,23986=>1000,23987=>1000,23988=>1000,
-	23989=>1000,23990=>1000,23991=>1000,23992=>1000,23993=>1000,23994=>1000,23995=>1000,23996=>1000,23997=>1000,23998=>1000,23999=>1000,24000=>1000,24001=>1000,24002=>1000,24003=>1000,24004=>1000,
-	24005=>1000,24006=>1000,24007=>1000,24008=>1000,24009=>1000,24010=>1000,24011=>1000,24012=>1000,24013=>1000,24014=>1000,24015=>1000,24016=>1000,24017=>1000,24018=>1000,24019=>1000,24020=>1000,
-	24021=>1000,24022=>1000,24023=>1000,24024=>1000,24025=>1000,24026=>1000,24027=>1000,24028=>1000,24029=>1000,24030=>1000,24031=>1000,24032=>1000,24033=>1000,24034=>1000,24035=>1000,24036=>1000,
-	24037=>1000,24038=>1000,24039=>1000,24040=>1000,24041=>1000,24042=>1000,24043=>1000,24044=>1000,24045=>1000,24046=>1000,24047=>1000,24048=>1000,24049=>1000,24050=>1000,24051=>1000,24052=>1000,
-	24053=>1000,24054=>1000,24055=>1000,24056=>1000,24057=>1000,24058=>1000,24059=>1000,24060=>1000,24061=>1000,24062=>1000,24063=>1000,24064=>1000,24065=>1000,24066=>1000,24067=>1000,24068=>1000,
-	24069=>1000,24070=>1000,24071=>1000,24072=>1000,24073=>1000,24074=>1000,24075=>1000,24076=>1000,24077=>1000,24078=>1000,24079=>1000,24080=>1000,24081=>1000,24082=>1000,24083=>1000,24084=>1000,
-	24085=>1000,24086=>1000,24087=>1000,24088=>1000,24089=>1000,24090=>1000,24091=>1000,24092=>1000,24093=>1000,24094=>1000,24095=>1000,24096=>1000,24097=>1000,24098=>1000,24099=>1000,24100=>1000,
-	24101=>1000,24102=>1000,24103=>1000,24104=>1000,24105=>1000,24106=>1000,24107=>1000,24108=>1000,24109=>1000,24110=>1000,24111=>1000,24112=>1000,24113=>1000,24114=>1000,24115=>1000,24116=>1000,
-	24117=>1000,24118=>1000,24119=>1000,24120=>1000,24121=>1000,24122=>1000,24123=>1000,24124=>1000,24125=>1000,24126=>1000,24127=>1000,24128=>1000,24129=>1000,24130=>1000,24131=>1000,24132=>1000,
-	24133=>1000,24134=>1000,24135=>1000,24136=>1000,24137=>1000,24138=>1000,24139=>1000,24140=>1000,24141=>1000,24142=>1000,24143=>1000,24144=>1000,24145=>1000,24146=>1000,24147=>1000,24148=>1000,
-	24149=>1000,24150=>1000,24151=>1000,24152=>1000,24153=>1000,24154=>1000,24155=>1000,24156=>1000,24157=>1000,24158=>1000,24159=>1000,24160=>1000,24161=>1000,24162=>1000,24163=>1000,24164=>1000,
-	24165=>1000,24166=>1000,24167=>1000,24168=>1000,24169=>1000,24170=>1000,24171=>1000,24172=>1000,24173=>1000,24174=>1000,24175=>1000,24176=>1000,24177=>1000,24178=>1000,24179=>1000,24180=>1000,
-	24181=>1000,24182=>1000,24183=>1000,24184=>1000,24185=>1000,24186=>1000,24187=>1000,24188=>1000,24189=>1000,24190=>1000,24191=>1000,24192=>1000,24193=>1000,24194=>1000,24195=>1000,24196=>1000,
-	24197=>1000,24198=>1000,24199=>1000,24200=>1000,24201=>1000,24202=>1000,24203=>1000,24204=>1000,24205=>1000,24206=>1000,24207=>1000,24208=>1000,24209=>1000,24210=>1000,24211=>1000,24212=>1000,
-	24213=>1000,24214=>1000,24215=>1000,24216=>1000,24217=>1000,24218=>1000,24219=>1000,24220=>1000,24221=>1000,24222=>1000,24223=>1000,24224=>1000,24225=>1000,24226=>1000,24227=>1000,24228=>1000,
-	24229=>1000,24230=>1000,24231=>1000,24232=>1000,24233=>1000,24234=>1000,24235=>1000,24236=>1000,24237=>1000,24238=>1000,24239=>1000,24240=>1000,24241=>1000,24242=>1000,24243=>1000,24244=>1000,
-	24245=>1000,24246=>1000,24247=>1000,24248=>1000,24249=>1000,24250=>1000,24251=>1000,24252=>1000,24253=>1000,24254=>1000,24255=>1000,24256=>1000,24257=>1000,24258=>1000,24259=>1000,24260=>1000,
-	24261=>1000,24262=>1000,24263=>1000,24264=>1000,24265=>1000,24266=>1000,24267=>1000,24268=>1000,24269=>1000,24270=>1000,24271=>1000,24272=>1000,24273=>1000,24274=>1000,24275=>1000,24276=>1000,
-	24277=>1000,24278=>1000,24279=>1000,24280=>1000,24281=>1000,24282=>1000,24283=>1000,24284=>1000,24285=>1000,24286=>1000,24287=>1000,24288=>1000,24289=>1000,24290=>1000,24291=>1000,24292=>1000,
-	24293=>1000,24294=>1000,24295=>1000,24296=>1000,24297=>1000,24298=>1000,24299=>1000,24300=>1000,24301=>1000,24302=>1000,24303=>1000,24304=>1000,24305=>1000,24306=>1000,24307=>1000,24308=>1000,
-	24309=>1000,24310=>1000,24311=>1000,24312=>1000,24313=>1000,24314=>1000,24315=>1000,24316=>1000,24317=>1000,24318=>1000,24319=>1000,24320=>1000,24321=>1000,24322=>1000,24323=>1000,24324=>1000,
-	24325=>1000,24326=>1000,24327=>1000,24328=>1000,24329=>1000,24330=>1000,24331=>1000,24332=>1000,24333=>1000,24334=>1000,24335=>1000,24336=>1000,24337=>1000,24338=>1000,24339=>1000,24340=>1000,
-	24341=>1000,24342=>1000,24343=>1000,24344=>1000,24345=>1000,24346=>1000,24347=>1000,24348=>1000,24349=>1000,24350=>1000,24351=>1000,24352=>1000,24353=>1000,24354=>1000,24355=>1000,24356=>1000,
-	24357=>1000,24358=>1000,24359=>1000,24360=>1000,24361=>1000,24362=>1000,24363=>1000,24364=>1000,24365=>1000,24366=>1000,24367=>1000,24368=>1000,24369=>1000,24370=>1000,24371=>1000,24372=>1000,
-	24373=>1000,24374=>1000,24375=>1000,24376=>1000,24377=>1000,24378=>1000,24379=>1000,24380=>1000,24381=>1000,24382=>1000,24383=>1000,24384=>1000,24385=>1000,24386=>1000,24387=>1000,24388=>1000,
-	24389=>1000,24390=>1000,24391=>1000,24392=>1000,24393=>1000,24394=>1000,24395=>1000,24396=>1000,24397=>1000,24398=>1000,24399=>1000,24400=>1000,24401=>1000,24402=>1000,24403=>1000,24404=>1000,
-	24405=>1000,24406=>1000,24407=>1000,24408=>1000,24409=>1000,24410=>1000,24411=>1000,24412=>1000,24413=>1000,24414=>1000,24415=>1000,24416=>1000,24417=>1000,24418=>1000,24419=>1000,24420=>1000,
-	24421=>1000,24422=>1000,24423=>1000,24424=>1000,24425=>1000,24426=>1000,24427=>1000,24428=>1000,24429=>1000,24430=>1000,24431=>1000,24432=>1000,24433=>1000,24434=>1000,24435=>1000,24436=>1000,
-	24437=>1000,24438=>1000,24439=>1000,24440=>1000,24441=>1000,24442=>1000,24443=>1000,24444=>1000,24445=>1000,24446=>1000,24447=>1000,24448=>1000,24449=>1000,24450=>1000,24451=>1000,24452=>1000,
-	24453=>1000,24454=>1000,24455=>1000,24456=>1000,24457=>1000,24458=>1000,24459=>1000,24460=>1000,24461=>1000,24462=>1000,24463=>1000,24464=>1000,24465=>1000,24466=>1000,24467=>1000,24468=>1000,
-	24469=>1000,24470=>1000,24471=>1000,24472=>1000,24473=>1000,24474=>1000,24475=>1000,24476=>1000,24477=>1000,24478=>1000,24479=>1000,24480=>1000,24481=>1000,24482=>1000,24483=>1000,24484=>1000,
-	24485=>1000,24486=>1000,24487=>1000,24488=>1000,24489=>1000,24490=>1000,24491=>1000,24492=>1000,24493=>1000,24494=>1000,24495=>1000,24496=>1000,24497=>1000,24498=>1000,24499=>1000,24500=>1000,
-	24501=>1000,24502=>1000,24503=>1000,24504=>1000,24505=>1000,24506=>1000,24507=>1000,24508=>1000,24509=>1000,24510=>1000,24511=>1000,24512=>1000,24513=>1000,24514=>1000,24515=>1000,24516=>1000,
-	24517=>1000,24518=>1000,24519=>1000,24520=>1000,24521=>1000,24522=>1000,24523=>1000,24524=>1000,24525=>1000,24526=>1000,24527=>1000,24528=>1000,24529=>1000,24530=>1000,24531=>1000,24532=>1000,
-	24533=>1000,24534=>1000,24535=>1000,24536=>1000,24537=>1000,24538=>1000,24539=>1000,24540=>1000,24541=>1000,24542=>1000,24543=>1000,24544=>1000,24545=>1000,24546=>1000,24547=>1000,24548=>1000,
-	24549=>1000,24550=>1000,24551=>1000,24552=>1000,24553=>1000,24554=>1000,24555=>1000,24556=>1000,24557=>1000,24558=>1000,24559=>1000,24560=>1000,24561=>1000,24562=>1000,24563=>1000,24564=>1000,
-	24565=>1000,24566=>1000,24567=>1000,24568=>1000,24569=>1000,24570=>1000,24571=>1000,24572=>1000,24573=>1000,24574=>1000,24575=>1000,24576=>1000,24577=>1000,24578=>1000,24579=>1000,24580=>1000,
-	24581=>1000,24582=>1000,24583=>1000,24584=>1000,24585=>1000,24586=>1000,24587=>1000,24588=>1000,24589=>1000,24590=>1000,24591=>1000,24592=>1000,24593=>1000,24594=>1000,24595=>1000,24596=>1000,
-	24597=>1000,24598=>1000,24599=>1000,24600=>1000,24601=>1000,24602=>1000,24603=>1000,24604=>1000,24605=>1000,24606=>1000,24607=>1000,24608=>1000,24609=>1000,24610=>1000,24611=>1000,24612=>1000,
-	24613=>1000,24614=>1000,24615=>1000,24616=>1000,24617=>1000,24618=>1000,24619=>1000,24620=>1000,24621=>1000,24622=>1000,24623=>1000,24624=>1000,24625=>1000,24626=>1000,24627=>1000,24628=>1000,
-	24629=>1000,24630=>1000,24631=>1000,24632=>1000,24633=>1000,24634=>1000,24635=>1000,24636=>1000,24637=>1000,24638=>1000,24639=>1000,24640=>1000,24641=>1000,24642=>1000,24643=>1000,24644=>1000,
-	24645=>1000,24646=>1000,24647=>1000,24648=>1000,24649=>1000,24650=>1000,24651=>1000,24652=>1000,24653=>1000,24654=>1000,24655=>1000,24656=>1000,24657=>1000,24658=>1000,24659=>1000,24660=>1000,
-	24661=>1000,24662=>1000,24663=>1000,24664=>1000,24665=>1000,24666=>1000,24667=>1000,24668=>1000,24669=>1000,24670=>1000,24671=>1000,24672=>1000,24673=>1000,24674=>1000,24675=>1000,24676=>1000,
-	24677=>1000,24678=>1000,24679=>1000,24680=>1000,24681=>1000,24682=>1000,24683=>1000,24684=>1000,24685=>1000,24686=>1000,24687=>1000,24688=>1000,24689=>1000,24690=>1000,24691=>1000,24692=>1000,
-	24693=>1000,24694=>1000,24695=>1000,24696=>1000,24697=>1000,24698=>1000,24699=>1000,24700=>1000,24701=>1000,24702=>1000,24703=>1000,24704=>1000,24705=>1000,24706=>1000,24707=>1000,24708=>1000,
-	24709=>1000,24710=>1000,24711=>1000,24712=>1000,24713=>1000,24714=>1000,24715=>1000,24716=>1000,24717=>1000,24718=>1000,24719=>1000,24720=>1000,24721=>1000,24722=>1000,24723=>1000,24724=>1000,
-	24725=>1000,24726=>1000,24727=>1000,24728=>1000,24729=>1000,24730=>1000,24731=>1000,24732=>1000,24733=>1000,24734=>1000,24735=>1000,24736=>1000,24737=>1000,24738=>1000,24739=>1000,24740=>1000,
-	24741=>1000,24742=>1000,24743=>1000,24744=>1000,24745=>1000,24746=>1000,24747=>1000,24748=>1000,24749=>1000,24750=>1000,24751=>1000,24752=>1000,24753=>1000,24754=>1000,24755=>1000,24756=>1000,
-	24757=>1000,24758=>1000,24759=>1000,24760=>1000,24761=>1000,24762=>1000,24763=>1000,24764=>1000,24765=>1000,24766=>1000,24767=>1000,24768=>1000,24769=>1000,24770=>1000,24771=>1000,24772=>1000,
-	24773=>1000,24774=>1000,24775=>1000,24776=>1000,24777=>1000,24778=>1000,24779=>1000,24780=>1000,24781=>1000,24782=>1000,24783=>1000,24784=>1000,24785=>1000,24786=>1000,24787=>1000,24788=>1000,
-	24789=>1000,24790=>1000,24791=>1000,24792=>1000,24793=>1000,24794=>1000,24795=>1000,24796=>1000,24797=>1000,24798=>1000,24799=>1000,24800=>1000,24801=>1000,24802=>1000,24803=>1000,24804=>1000,
-	24805=>1000,24806=>1000,24807=>1000,24808=>1000,24809=>1000,24810=>1000,24811=>1000,24812=>1000,24813=>1000,24814=>1000,24815=>1000,24816=>1000,24817=>1000,24818=>1000,24819=>1000,24820=>1000,
-	24821=>1000,24822=>1000,24823=>1000,24824=>1000,24825=>1000,24826=>1000,24827=>1000,24828=>1000,24829=>1000,24830=>1000,24831=>1000,24832=>1000,24833=>1000,24834=>1000,24835=>1000,24836=>1000,
-	24837=>1000,24838=>1000,24839=>1000,24840=>1000,24841=>1000,24842=>1000,24843=>1000,24844=>1000,24845=>1000,24846=>1000,24847=>1000,24848=>1000,24849=>1000,24850=>1000,24851=>1000,24852=>1000,
-	24853=>1000,24854=>1000,24855=>1000,24856=>1000,24857=>1000,24858=>1000,24859=>1000,24860=>1000,24861=>1000,24862=>1000,24863=>1000,24864=>1000,24865=>1000,24866=>1000,24867=>1000,24868=>1000,
-	24869=>1000,24870=>1000,24871=>1000,24872=>1000,24873=>1000,24874=>1000,24875=>1000,24876=>1000,24877=>1000,24878=>1000,24879=>1000,24880=>1000,24881=>1000,24882=>1000,24883=>1000,24884=>1000,
-	24885=>1000,24886=>1000,24887=>1000,24888=>1000,24889=>1000,24890=>1000,24891=>1000,24892=>1000,24893=>1000,24894=>1000,24895=>1000,24896=>1000,24897=>1000,24898=>1000,24899=>1000,24900=>1000,
-	24901=>1000,24902=>1000,24903=>1000,24904=>1000,24905=>1000,24906=>1000,24907=>1000,24908=>1000,24909=>1000,24910=>1000,24911=>1000,24912=>1000,24913=>1000,24914=>1000,24915=>1000,24916=>1000,
-	24917=>1000,24918=>1000,24919=>1000,24920=>1000,24921=>1000,24922=>1000,24923=>1000,24924=>1000,24925=>1000,24926=>1000,24927=>1000,24928=>1000,24929=>1000,24930=>1000,24931=>1000,24932=>1000,
-	24933=>1000,24934=>1000,24935=>1000,24936=>1000,24937=>1000,24938=>1000,24939=>1000,24940=>1000,24941=>1000,24942=>1000,24943=>1000,24944=>1000,24945=>1000,24946=>1000,24947=>1000,24948=>1000,
-	24949=>1000,24950=>1000,24951=>1000,24952=>1000,24953=>1000,24954=>1000,24955=>1000,24956=>1000,24957=>1000,24958=>1000,24959=>1000,24960=>1000,24961=>1001,24962=>1000,24963=>1000,24964=>1000,
-	24965=>1000,24966=>1000,24967=>1000,24968=>1000,24969=>1000,24970=>1000,24971=>1000,24972=>1000,24973=>1000,24974=>1000,24975=>1000,24976=>1000,24977=>1000,24978=>1000,24979=>1000,24980=>1000,
-	24981=>1000,24982=>1000,24983=>1000,24984=>1000,24985=>1000,24986=>1000,24987=>1000,24988=>1000,24989=>1000,24990=>1000,24991=>1000,24992=>1000,24993=>1000,24994=>1000,24995=>1000,24996=>1000,
-	24997=>1000,24998=>1000,24999=>1000,25000=>1000,25001=>1000,25002=>1000,25003=>1000,25004=>1000,25005=>1000,25006=>1000,25007=>1000,25008=>1000,25009=>1000,25010=>1000,25011=>1000,25012=>1000,
-	25013=>1000,25014=>1000,25015=>1000,25016=>1000,25017=>1000,25018=>1000,25019=>1000,25020=>1000,25021=>1000,25022=>1000,25023=>1000,25024=>1000,25025=>1000,25026=>1000,25027=>1000,25028=>1000,
-	25029=>1000,25030=>1000,25031=>1000,25032=>1000,25033=>1000,25034=>1000,25035=>1000,25036=>1000,25037=>1000,25038=>1000,25039=>1000,25040=>1000,25041=>1000,25042=>1000,25043=>1000,25044=>1000,
-	25045=>1000,25046=>1000,25047=>1000,25048=>1000,25049=>1000,25050=>1000,25051=>1000,25052=>1000,25053=>1000,25054=>1000,25055=>1000,25056=>1000,25057=>1000,25058=>1000,25059=>1000,25060=>1000,
-	25061=>1000,25062=>1000,25063=>1000,25064=>1000,25065=>1000,25066=>1000,25067=>1000,25068=>1000,25069=>1000,25070=>1000,25071=>1000,25072=>1000,25073=>1000,25074=>1000,25075=>1000,25076=>1000,
-	25077=>1000,25078=>1000,25079=>1000,25080=>1000,25081=>1000,25082=>1000,25083=>1000,25084=>1000,25085=>1000,25086=>1000,25087=>1000,25088=>1000,25089=>1000,25090=>1000,25091=>1000,25092=>1000,
-	25093=>1000,25094=>1000,25095=>1000,25096=>1000,25097=>1000,25098=>1000,25099=>1000,25100=>1000,25101=>1000,25102=>1000,25103=>1000,25104=>1000,25105=>1000,25106=>1000,25107=>1000,25108=>1000,
-	25109=>1000,25110=>1000,25111=>1000,25112=>1000,25113=>1000,25114=>1000,25115=>1000,25116=>1000,25117=>1000,25118=>1000,25119=>1000,25120=>1000,25121=>1000,25122=>1000,25123=>1000,25124=>1000,
-	25125=>1000,25126=>1000,25127=>1000,25128=>1000,25129=>1000,25130=>1000,25131=>1000,25132=>1000,25133=>1000,25134=>1000,25135=>1000,25136=>1000,25137=>1000,25138=>1000,25139=>1000,25140=>1000,
-	25141=>1000,25142=>1000,25143=>1000,25144=>1000,25145=>1000,25146=>1000,25147=>1000,25148=>1000,25149=>1000,25150=>1000,25151=>1000,25152=>1000,25153=>1000,25154=>1000,25155=>1000,25156=>1000,
-	25157=>1000,25158=>1000,25159=>1000,25160=>1000,25161=>1000,25162=>1000,25163=>1000,25164=>1000,25165=>1000,25166=>1000,25167=>1000,25168=>1000,25169=>1000,25170=>1000,25171=>1000,25172=>1000,
-	25173=>1000,25174=>1000,25175=>1000,25176=>1000,25177=>1000,25178=>1000,25179=>1000,25180=>1000,25181=>1000,25182=>1000,25183=>1000,25184=>1000,25185=>1000,25186=>1000,25187=>1000,25188=>1000,
-	25189=>1000,25190=>1000,25191=>1000,25192=>1000,25193=>1000,25194=>1000,25195=>1000,25196=>1000,25197=>1000,25198=>1000,25199=>1000,25200=>1000,25201=>1000,25202=>1000,25203=>1000,25204=>1000,
-	25205=>1000,25206=>1000,25207=>1000,25208=>1000,25209=>1000,25210=>1000,25211=>1000,25212=>1000,25213=>1000,25214=>1000,25215=>1000,25216=>1000,25217=>1000,25218=>1000,25219=>1000,25220=>1000,
-	25221=>1000,25222=>1000,25223=>1000,25224=>1000,25225=>1000,25226=>1000,25227=>1000,25228=>1000,25229=>1000,25230=>1000,25231=>1000,25232=>1000,25233=>1000,25234=>1000,25235=>1000,25236=>1000,
-	25237=>1000,25238=>1000,25239=>1000,25240=>1000,25241=>1000,25242=>1000,25243=>1000,25244=>1000,25245=>1000,25246=>1000,25247=>1000,25248=>1000,25249=>1000,25250=>1000,25251=>1000,25252=>1000,
-	25253=>1000,25254=>1000,25255=>1000,25256=>1000,25257=>1000,25258=>1000,25259=>1000,25260=>1000,25261=>1000,25262=>1000,25263=>1000,25264=>1000,25265=>1000,25266=>1000,25267=>1000,25268=>1000,
-	25269=>1000,25270=>1000,25271=>1000,25272=>1000,25273=>1000,25274=>1000,25275=>1000,25276=>1000,25277=>1000,25278=>1000,25279=>1000,25280=>1000,25281=>1000,25282=>1000,25283=>1000,25284=>1000,
-	25285=>1000,25286=>1000,25287=>1000,25288=>1000,25289=>1000,25290=>1000,25291=>1000,25292=>1000,25293=>1000,25294=>1000,25295=>1000,25296=>1000,25297=>1000,25298=>1000,25299=>1000,25300=>1000,
-	25301=>1000,25302=>1000,25303=>1000,25304=>1000,25305=>1000,25306=>1000,25307=>1000,25308=>1000,25309=>1000,25310=>1000,25311=>1000,25312=>1000,25313=>1000,25314=>1000,25315=>1000,25316=>1000,
-	25317=>1000,25318=>1000,25319=>1000,25320=>1000,25321=>1000,25322=>1000,25323=>1000,25324=>1000,25325=>1000,25326=>1000,25327=>1000,25328=>1000,25329=>1000,25330=>1000,25331=>1000,25332=>1000,
-	25333=>1000,25334=>1000,25335=>1000,25336=>1000,25337=>1000,25338=>1000,25339=>1000,25340=>1000,25341=>1000,25342=>1000,25343=>1000,25344=>1000,25345=>1000,25346=>1000,25347=>1000,25348=>1000,
-	25349=>1000,25350=>1000,25351=>1000,25352=>1000,25353=>1000,25354=>1000,25355=>1000,25356=>1000,25357=>1000,25358=>1000,25359=>1000,25360=>1000,25361=>1000,25362=>1000,25363=>1000,25364=>1000,
-	25365=>1000,25366=>1000,25367=>1000,25368=>1000,25369=>1000,25370=>1000,25371=>1000,25372=>1000,25373=>1000,25374=>1000,25375=>1000,25376=>1000,25377=>1000,25378=>1000,25379=>1000,25380=>1000,
-	25381=>1000,25382=>1000,25383=>1000,25384=>1000,25385=>1000,25386=>1000,25387=>1000,25388=>1000,25389=>1000,25390=>1000,25391=>1000,25392=>1000,25393=>1000,25394=>1000,25395=>1000,25396=>1000,
-	25397=>1000,25398=>1000,25399=>1000,25400=>1000,25401=>1000,25402=>1000,25403=>1000,25404=>1000,25405=>1000,25406=>1000,25407=>1000,25408=>1000,25409=>1000,25410=>1000,25411=>1000,25412=>1000,
-	25413=>1000,25414=>1000,25415=>1000,25416=>1000,25417=>1000,25418=>1000,25419=>1000,25420=>1000,25421=>1000,25422=>1000,25423=>1000,25424=>1000,25425=>1000,25426=>1000,25427=>1000,25428=>1000,
-	25429=>1000,25430=>1000,25431=>1000,25432=>1000,25433=>1000,25434=>1000,25435=>1000,25436=>1000,25437=>1000,25438=>1000,25439=>1000,25440=>1000,25441=>1000,25442=>1000,25443=>1000,25444=>1000,
-	25445=>1000,25446=>1000,25447=>1000,25448=>1000,25449=>1000,25450=>1000,25451=>1000,25452=>1000,25453=>1000,25454=>1000,25455=>1000,25456=>1000,25457=>1000,25458=>1000,25459=>1000,25460=>1000,
-	25461=>1000,25462=>1000,25463=>1000,25464=>1000,25465=>1000,25466=>1000,25467=>1000,25468=>1000,25469=>1000,25470=>1000,25471=>1000,25472=>1000,25473=>1000,25474=>1000,25475=>1000,25476=>1000,
-	25477=>1000,25478=>1000,25479=>1000,25480=>1000,25481=>1000,25482=>1000,25483=>1000,25484=>1000,25485=>1000,25486=>1000,25487=>1000,25488=>1000,25489=>1000,25490=>1000,25491=>1000,25492=>1000,
-	25493=>1000,25494=>1000,25495=>1000,25496=>1000,25497=>1000,25498=>1000,25499=>1000,25500=>1000,25501=>1000,25502=>1000,25503=>1000,25504=>1000,25505=>1000,25506=>1000,25507=>1000,25508=>1000,
-	25509=>1000,25510=>1000,25511=>1000,25512=>1000,25513=>1000,25514=>1000,25515=>1000,25516=>1000,25517=>1000,25518=>1000,25519=>1000,25520=>1000,25521=>1000,25522=>1000,25523=>1000,25524=>1000,
-	25525=>1000,25526=>1000,25527=>1000,25528=>1000,25529=>1000,25530=>1000,25531=>1000,25532=>1000,25533=>1000,25534=>1000,25535=>1000,25536=>1000,25537=>1000,25538=>1000,25539=>1000,25540=>1000,
-	25541=>1000,25542=>1000,25543=>1000,25544=>1000,25545=>1000,25546=>1000,25547=>1000,25548=>1000,25549=>1000,25550=>1000,25551=>1000,25552=>1000,25553=>1000,25554=>1000,25555=>1000,25556=>1000,
-	25557=>1000,25558=>1000,25559=>1000,25560=>1000,25561=>1000,25562=>1000,25563=>1000,25564=>1000,25565=>1000,25566=>1000,25567=>1000,25568=>1000,25569=>1000,25570=>1000,25571=>1000,25572=>1000,
-	25573=>1000,25574=>1000,25575=>1000,25576=>1000,25577=>1000,25578=>1000,25579=>1000,25580=>1000,25581=>1000,25582=>1000,25583=>1000,25584=>1000,25585=>1000,25586=>1000,25587=>1000,25588=>1000,
-	25589=>1000,25590=>1000,25591=>1000,25592=>1000,25593=>1000,25594=>1000,25595=>1000,25596=>1000,25597=>1000,25598=>1000,25599=>1000,25600=>1000,25601=>1000,25602=>1000,25603=>1000,25604=>1000,
-	25605=>1000,25606=>1000,25607=>1000,25608=>1000,25609=>1000,25610=>1000,25611=>1000,25612=>1000,25613=>1000,25614=>1000,25615=>1000,25616=>1000,25617=>1000,25618=>1000,25619=>1000,25620=>1000,
-	25621=>1000,25622=>1000,25623=>1000,25624=>1000,25625=>1000,25626=>1000,25627=>1000,25628=>1000,25629=>1000,25630=>1000,25631=>1000,25632=>1000,25633=>1000,25634=>1000,25635=>1000,25636=>1000,
-	25637=>1000,25638=>1000,25639=>1000,25640=>1000,25641=>1000,25642=>1000,25643=>1000,25644=>1000,25645=>1000,25646=>1000,25647=>1000,25648=>1000,25649=>1000,25650=>1000,25651=>1000,25652=>1000,
-	25653=>1000,25654=>1000,25655=>1000,25656=>1000,25657=>1000,25658=>1000,25659=>1000,25660=>1000,25661=>1000,25662=>1000,25663=>1000,25664=>1000,25665=>1000,25666=>1000,25667=>1000,25668=>1000,
-	25669=>1000,25670=>1000,25671=>1000,25672=>1000,25673=>1000,25674=>1000,25675=>1000,25676=>1000,25677=>1000,25678=>1000,25679=>1000,25680=>1000,25681=>1000,25682=>1000,25683=>1000,25684=>1000,
-	25685=>1000,25686=>1000,25687=>1000,25688=>1000,25689=>1000,25690=>1000,25691=>1000,25692=>1000,25693=>1000,25694=>1000,25695=>1000,25696=>1000,25697=>1000,25698=>1000,25699=>1000,25700=>1000,
-	25701=>1000,25702=>1000,25703=>1000,25704=>1000,25705=>1000,25706=>1000,25707=>1000,25708=>1000,25709=>1000,25710=>1000,25711=>1000,25712=>1000,25713=>1000,25714=>1000,25715=>1000,25716=>1000,
-	25717=>1000,25718=>1000,25719=>1000,25720=>1000,25721=>1000,25722=>1000,25723=>1000,25724=>1000,25725=>1000,25726=>1000,25727=>1000,25728=>1000,25729=>1000,25730=>1000,25731=>1000,25732=>1000,
-	25733=>1000,25734=>1000,25735=>1000,25736=>1000,25737=>1000,25738=>1000,25739=>1000,25740=>1000,25741=>1000,25742=>1000,25743=>1000,25744=>1000,25745=>1000,25746=>1000,25747=>1000,25748=>1000,
-	25749=>1000,25750=>1000,25751=>1000,25752=>1000,25753=>1000,25754=>1000,25755=>1000,25756=>1000,25757=>1000,25758=>1000,25759=>1000,25760=>1000,25761=>1000,25762=>1000,25763=>1000,25764=>1000,
-	25765=>1000,25766=>1000,25767=>1000,25768=>1000,25769=>1000,25770=>1000,25771=>1000,25772=>1000,25773=>1000,25774=>1000,25775=>1000,25776=>1000,25777=>1000,25778=>1000,25779=>1000,25780=>1000,
-	25781=>1000,25782=>1000,25783=>1000,25784=>1000,25785=>1000,25786=>1000,25787=>1000,25788=>1000,25789=>1000,25790=>1000,25791=>1000,25792=>1000,25793=>1000,25794=>1000,25795=>1000,25796=>1000,
-	25797=>1000,25798=>1000,25799=>1000,25800=>1000,25801=>1000,25802=>1000,25803=>1000,25804=>1000,25805=>1000,25806=>1000,25807=>1000,25808=>1000,25809=>1000,25810=>1000,25811=>1000,25812=>1000,
-	25813=>1000,25814=>1000,25815=>1000,25816=>1000,25817=>1000,25818=>1000,25819=>1000,25820=>1000,25821=>1000,25822=>1000,25823=>1000,25824=>1000,25825=>1000,25826=>1000,25827=>1000,25828=>1000,
-	25829=>1000,25830=>1000,25831=>1000,25832=>1000,25833=>1000,25834=>1000,25835=>1000,25836=>1000,25837=>1000,25838=>1000,25839=>1000,25840=>1000,25841=>1000,25842=>1000,25843=>1000,25844=>1000,
-	25845=>1000,25846=>1000,25847=>1000,25848=>1000,25849=>1000,25850=>1000,25851=>1000,25852=>1000,25853=>1000,25854=>1000,25855=>1000,25856=>1000,25857=>1000,25858=>1000,25859=>1000,25860=>1000,
-	25861=>1000,25862=>1000,25863=>1000,25864=>1000,25865=>1000,25866=>1000,25867=>1000,25868=>1000,25869=>1000,25870=>1000,25871=>1000,25872=>1000,25873=>1000,25874=>1000,25875=>1000,25876=>1000,
-	25877=>1000,25878=>1000,25879=>1000,25880=>1000,25881=>1000,25882=>1000,25883=>1000,25884=>1000,25885=>1000,25886=>1000,25887=>1000,25888=>1000,25889=>1000,25890=>1000,25891=>1000,25892=>1000,
-	25893=>1000,25894=>1000,25895=>1000,25896=>1000,25897=>1000,25898=>1000,25899=>1000,25900=>1000,25901=>1000,25902=>1000,25903=>1000,25904=>1000,25905=>1000,25906=>1000,25907=>1000,25908=>1000,
-	25909=>1000,25910=>1000,25911=>1000,25912=>1000,25913=>1000,25914=>1000,25915=>1000,25916=>1000,25917=>1000,25918=>1000,25919=>1000,25920=>1000,25921=>1000,25922=>1000,25923=>1000,25924=>1000,
-	25925=>1000,25926=>1000,25927=>1000,25928=>1000,25929=>1000,25930=>1000,25931=>1000,25932=>1000,25933=>1000,25934=>1000,25935=>1000,25936=>1000,25937=>1000,25938=>1000,25939=>1000,25940=>1000,
-	25941=>1000,25942=>1000,25943=>1000,25944=>1000,25945=>1000,25946=>1000,25947=>1000,25948=>1000,25949=>1000,25950=>1000,25951=>1000,25952=>1000,25953=>1000,25954=>1000,25955=>1000,25956=>1000,
-	25957=>1000,25958=>1000,25959=>1000,25960=>1000,25961=>1000,25962=>1000,25963=>1000,25964=>1000,25965=>1000,25966=>1000,25967=>1000,25968=>1000,25969=>1000,25970=>1000,25971=>1000,25972=>1000,
-	25973=>1000,25974=>1000,25975=>1000,25976=>1000,25977=>1000,25978=>1000,25979=>1000,25980=>1000,25981=>1000,25982=>1000,25983=>1000,25984=>1000,25985=>1000,25986=>1000,25987=>1000,25988=>1000,
-	25989=>1000,25990=>1000,25991=>1000,25992=>1000,25993=>1000,25994=>1000,25995=>1000,25996=>1000,25997=>1000,25998=>1000,25999=>1000,26000=>1000,26001=>1000,26002=>1000,26003=>1000,26004=>1000,
-	26005=>1000,26006=>1000,26007=>1000,26008=>1000,26009=>1000,26010=>1000,26011=>1000,26012=>1000,26013=>1000,26014=>1000,26015=>1000,26016=>1000,26017=>1000,26018=>1000,26019=>1000,26020=>1000,
-	26021=>1000,26022=>1000,26023=>1000,26024=>1000,26025=>1000,26026=>1000,26027=>1000,26028=>1000,26029=>1000,26030=>1000,26031=>1000,26032=>1000,26033=>1000,26034=>1000,26035=>1000,26036=>1000,
-	26037=>1000,26038=>1000,26039=>1000,26040=>1000,26041=>1000,26042=>1000,26043=>1000,26044=>1000,26045=>1000,26046=>1000,26047=>1000,26048=>1000,26049=>1000,26050=>1000,26051=>1000,26052=>1000,
-	26053=>1000,26054=>1000,26055=>1000,26056=>1000,26057=>1000,26058=>1000,26059=>1000,26060=>1000,26061=>1000,26062=>1000,26063=>1000,26064=>1000,26065=>1000,26066=>1000,26067=>1000,26068=>1000,
-	26069=>1000,26070=>1000,26071=>1000,26072=>1000,26073=>1000,26074=>1000,26075=>1000,26076=>1000,26077=>1000,26078=>1000,26079=>1000,26080=>1000,26081=>1000,26082=>1000,26083=>1000,26084=>1000,
-	26085=>1000,26086=>1000,26087=>1000,26088=>1000,26089=>1000,26090=>1000,26091=>1000,26092=>1000,26093=>1000,26094=>1000,26095=>1000,26096=>1000,26097=>1000,26098=>1000,26099=>1000,26100=>1000,
-	26101=>1000,26102=>1000,26103=>1000,26104=>1000,26105=>1000,26106=>1000,26107=>1000,26108=>1000,26109=>1000,26110=>1000,26111=>1000,26112=>1000,26113=>1000,26114=>1000,26115=>1000,26116=>1000,
-	26117=>1000,26118=>1000,26119=>1000,26120=>1000,26121=>1000,26122=>1000,26123=>1000,26124=>1000,26125=>1000,26126=>1000,26127=>1000,26128=>1000,26129=>1000,26130=>1000,26131=>1000,26132=>1000,
-	26133=>1000,26134=>1000,26135=>1000,26136=>1000,26137=>1000,26138=>1000,26139=>1000,26140=>1000,26141=>1000,26142=>1000,26143=>1000,26144=>1000,26145=>1000,26146=>1000,26147=>1000,26148=>1000,
-	26149=>1000,26150=>1000,26151=>1000,26152=>1000,26153=>1000,26154=>1000,26155=>1000,26156=>1000,26157=>1000,26158=>1000,26159=>1000,26160=>1000,26161=>1000,26162=>1000,26163=>1000,26164=>1000,
-	26165=>1000,26166=>1000,26167=>1000,26168=>1000,26169=>1000,26170=>1000,26171=>1000,26172=>1000,26173=>1000,26174=>1000,26175=>1000,26176=>1000,26177=>1000,26178=>1000,26179=>1000,26180=>1000,
-	26181=>1000,26182=>1000,26183=>1000,26184=>1000,26185=>1000,26186=>1000,26187=>1000,26188=>1000,26189=>1000,26190=>1000,26191=>1000,26192=>1000,26193=>1000,26194=>1000,26195=>1000,26196=>1000,
-	26197=>1000,26198=>1000,26199=>1000,26200=>1000,26201=>1000,26202=>1000,26203=>1000,26204=>1000,26205=>1000,26206=>1000,26207=>1000,26208=>1000,26209=>1000,26210=>1000,26211=>1000,26212=>1000,
-	26213=>1000,26214=>1000,26215=>1000,26216=>1000,26217=>1000,26218=>1000,26219=>1000,26220=>1000,26221=>1000,26222=>1000,26223=>1000,26224=>1000,26225=>1000,26226=>1000,26227=>1000,26228=>1000,
-	26229=>1000,26230=>1000,26231=>1000,26232=>1000,26233=>1000,26234=>1000,26235=>1000,26236=>1000,26237=>1000,26238=>1000,26239=>1000,26240=>1000,26241=>1000,26242=>1000,26243=>1000,26244=>1000,
-	26245=>1000,26246=>1000,26247=>1000,26248=>1000,26249=>1000,26250=>1000,26251=>1000,26252=>1000,26253=>1000,26254=>1000,26255=>1000,26256=>1000,26257=>1000,26258=>1000,26259=>1000,26260=>1000,
-	26261=>1000,26262=>1000,26263=>1000,26264=>1000,26265=>1000,26266=>1000,26267=>1000,26268=>1000,26269=>1000,26270=>1000,26271=>1000,26272=>1000,26273=>1000,26274=>1000,26275=>1000,26276=>1000,
-	26277=>1000,26278=>1000,26279=>1000,26280=>1000,26281=>1000,26282=>1000,26283=>1000,26284=>1000,26285=>1000,26286=>1000,26287=>1000,26288=>1000,26289=>1000,26290=>1000,26291=>1000,26292=>1000,
-	26293=>1000,26294=>1000,26295=>1000,26296=>1000,26297=>1000,26298=>1000,26299=>1000,26300=>1000,26301=>1000,26302=>1000,26303=>1000,26304=>1000,26305=>1000,26306=>1000,26307=>1000,26308=>1000,
-	26309=>1000,26310=>1000,26311=>1000,26312=>1000,26313=>1000,26314=>1000,26315=>1000,26316=>1000,26317=>1000,26318=>1000,26319=>1000,26320=>1000,26321=>1000,26322=>1000,26323=>1000,26324=>1000,
-	26325=>1000,26326=>1000,26327=>1000,26328=>1000,26329=>1000,26330=>1000,26331=>1000,26332=>1000,26333=>1000,26334=>1000,26335=>1000,26336=>1000,26337=>1000,26338=>1000,26339=>1000,26340=>1000,
-	26341=>1000,26342=>1000,26343=>1000,26344=>1000,26345=>1000,26346=>1000,26347=>1000,26348=>1000,26349=>1000,26350=>1000,26351=>1000,26352=>1000,26353=>1000,26354=>1000,26355=>1000,26356=>1000,
-	26357=>1000,26358=>1000,26359=>1000,26360=>1000,26361=>1000,26362=>1000,26363=>1000,26364=>1000,26365=>1000,26366=>1000,26367=>1000,26368=>1000,26369=>1000,26370=>1000,26371=>1000,26372=>1000,
-	26373=>1000,26374=>1000,26375=>1000,26376=>1000,26377=>1000,26378=>1000,26379=>1000,26380=>1000,26381=>1000,26382=>1000,26383=>1000,26384=>1000,26385=>1000,26386=>1000,26387=>1000,26388=>1000,
-	26389=>1000,26390=>1000,26391=>1000,26392=>1000,26393=>1000,26394=>1000,26395=>1000,26396=>1000,26397=>1000,26398=>1000,26399=>1000,26400=>1000,26401=>1000,26402=>1000,26403=>1000,26404=>1000,
-	26405=>1000,26406=>1000,26407=>1000,26408=>1000,26409=>1000,26410=>1000,26411=>1000,26412=>1000,26413=>1000,26414=>1000,26415=>1000,26416=>1000,26417=>1000,26418=>1000,26419=>1000,26420=>1000,
-	26421=>1000,26422=>1000,26423=>1000,26424=>1000,26425=>1000,26426=>1000,26427=>1000,26428=>1000,26429=>1000,26430=>1000,26431=>1000,26432=>1000,26433=>1000,26434=>1000,26435=>1000,26436=>1000,
-	26437=>1000,26438=>1000,26439=>1000,26440=>1000,26441=>1000,26442=>1000,26443=>1000,26444=>1000,26445=>1000,26446=>1000,26447=>1000,26448=>1000,26449=>1000,26450=>1000,26451=>1000,26452=>1000,
-	26453=>1000,26454=>1000,26455=>1000,26456=>1000,26457=>1000,26458=>1000,26459=>1000,26460=>1000,26461=>1000,26462=>1000,26463=>1000,26464=>1000,26465=>1000,26466=>1000,26467=>1000,26468=>1000,
-	26469=>1000,26470=>1000,26471=>1000,26472=>1000,26473=>1000,26474=>1000,26475=>1000,26476=>1000,26477=>1000,26478=>1000,26479=>1000,26480=>1000,26481=>1000,26482=>1000,26483=>1000,26484=>1000,
-	26485=>1000,26486=>1000,26487=>1000,26488=>1000,26489=>1000,26490=>1000,26491=>1000,26492=>1000,26493=>1000,26494=>1000,26495=>1000,26496=>1000,26497=>1000,26498=>1000,26499=>1000,26500=>1000,
-	26501=>1000,26502=>1000,26503=>1000,26504=>1000,26505=>1000,26506=>1000,26507=>1000,26508=>1000,26509=>1000,26510=>1000,26511=>1000,26512=>1000,26513=>1000,26514=>1000,26515=>1000,26516=>1000,
-	26517=>1000,26518=>1000,26519=>1000,26520=>1000,26521=>1000,26522=>1000,26523=>1000,26524=>1000,26525=>1000,26526=>1000,26527=>1000,26528=>1000,26529=>1000,26530=>1000,26531=>1000,26532=>1000,
-	26533=>1000,26534=>1000,26535=>1000,26536=>1000,26537=>1000,26538=>1000,26539=>1000,26540=>1000,26541=>1000,26542=>1000,26543=>1000,26544=>1000,26545=>1000,26546=>1000,26547=>1000,26548=>1000,
-	26549=>1000,26550=>1000,26551=>1000,26552=>1000,26553=>1000,26554=>1000,26555=>1000,26556=>1000,26557=>1000,26558=>1000,26559=>1000,26560=>1000,26561=>1000,26562=>1000,26563=>1000,26564=>1000,
-	26565=>1000,26566=>1000,26567=>1000,26568=>1000,26569=>1000,26570=>1000,26571=>1000,26572=>1000,26573=>1000,26574=>1000,26575=>1000,26576=>1000,26577=>1000,26578=>1000,26579=>1000,26580=>1000,
-	26581=>1000,26582=>1000,26583=>1000,26584=>1000,26585=>1000,26586=>1000,26587=>1000,26588=>1000,26589=>1000,26590=>1000,26591=>1000,26592=>1000,26593=>1000,26594=>1000,26595=>1000,26596=>1000,
-	26597=>1000,26598=>1000,26599=>1000,26600=>1000,26601=>1000,26602=>1000,26603=>1000,26604=>1000,26605=>1000,26606=>1000,26607=>1000,26608=>1000,26609=>1000,26610=>1000,26611=>1000,26612=>1000,
-	26613=>1000,26614=>1000,26615=>1000,26616=>1000,26617=>1000,26618=>1000,26619=>1000,26620=>1000,26621=>1000,26622=>1000,26623=>1000,26624=>1000,26625=>1000,26626=>1000,26627=>1000,26628=>1000,
-	26629=>1000,26630=>1000,26631=>1000,26632=>1000,26633=>1000,26634=>1000,26635=>1000,26636=>1000,26637=>1000,26638=>1000,26639=>1000,26640=>1000,26641=>1000,26642=>1000,26643=>1000,26644=>1000,
-	26645=>1000,26646=>1000,26647=>1000,26648=>1000,26649=>1000,26650=>1000,26651=>1000,26652=>1000,26653=>1000,26654=>1000,26655=>1000,26656=>1000,26657=>1000,26658=>1000,26659=>1000,26660=>1000,
-	26661=>1000,26662=>1000,26663=>1000,26664=>1000,26665=>1000,26666=>1000,26667=>1000,26668=>1000,26669=>1000,26670=>1000,26671=>1000,26672=>1000,26673=>1000,26674=>1000,26675=>1000,26676=>1000,
-	26677=>1000,26678=>1000,26679=>1000,26680=>1000,26681=>1000,26682=>1000,26683=>1000,26684=>1000,26685=>1000,26686=>1000,26687=>1000,26688=>1000,26689=>1000,26690=>1000,26691=>1000,26692=>1000,
-	26693=>1000,26694=>1000,26695=>1000,26696=>1000,26697=>1000,26698=>1000,26699=>1000,26700=>1000,26701=>1000,26702=>1000,26703=>1000,26704=>1000,26705=>1000,26706=>1000,26707=>1000,26708=>1000,
-	26709=>1000,26710=>1000,26711=>1000,26712=>1000,26713=>1000,26714=>1000,26715=>1000,26716=>1000,26717=>1000,26718=>1000,26719=>1000,26720=>1000,26721=>1000,26722=>1000,26723=>1000,26724=>1000,
-	26725=>1000,26726=>1000,26727=>1000,26728=>1000,26729=>1000,26730=>1000,26731=>1000,26732=>1000,26733=>1000,26734=>1000,26735=>1000,26736=>1000,26737=>1000,26738=>1000,26739=>1000,26740=>1000,
-	26741=>1000,26742=>1000,26743=>1000,26744=>1000,26745=>1000,26746=>1000,26747=>1000,26748=>1000,26749=>1000,26750=>1000,26751=>1000,26752=>1000,26753=>1000,26754=>1000,26755=>1000,26756=>1000,
-	26757=>1000,26758=>1000,26759=>1000,26760=>1000,26761=>1000,26762=>1000,26763=>1000,26764=>1000,26765=>1000,26766=>1000,26767=>1000,26768=>1000,26769=>1000,26770=>1000,26771=>1000,26772=>1000,
-	26773=>1000,26774=>1000,26775=>1000,26776=>1000,26777=>1000,26778=>1000,26779=>1000,26780=>1000,26781=>1000,26782=>1000,26783=>1000,26784=>1000,26785=>1000,26786=>1000,26787=>1000,26788=>1000,
-	26789=>1000,26790=>1000,26791=>1000,26792=>1000,26793=>1000,26794=>1000,26795=>1000,26796=>1000,26797=>1000,26798=>1000,26799=>1000,26800=>1000,26801=>1000,26802=>1000,26803=>1000,26804=>1000,
-	26805=>1000,26806=>1000,26807=>1000,26808=>1000,26809=>1000,26810=>1000,26811=>1000,26812=>1000,26813=>1000,26814=>1000,26815=>1000,26816=>1000,26817=>1000,26818=>1000,26819=>1000,26820=>1000,
-	26821=>1000,26822=>1000,26823=>1000,26824=>1000,26825=>1000,26826=>1000,26827=>1000,26828=>1000,26829=>1000,26830=>1000,26831=>1000,26832=>1000,26833=>1000,26834=>1000,26835=>1000,26836=>1000,
-	26837=>1000,26838=>1000,26839=>1000,26840=>1000,26841=>1000,26842=>1000,26843=>1000,26844=>1000,26845=>1000,26846=>1000,26847=>1000,26848=>1000,26849=>1000,26850=>1000,26851=>1000,26852=>1000,
-	26853=>1000,26854=>1000,26855=>1000,26856=>1000,26857=>1000,26858=>1000,26859=>1000,26860=>1000,26861=>1000,26862=>1000,26863=>1000,26864=>1000,26865=>1000,26866=>1000,26867=>1000,26868=>1000,
-	26869=>1000,26870=>1000,26871=>1000,26872=>1000,26873=>1000,26874=>1000,26875=>1000,26876=>1000,26877=>1000,26878=>1000,26879=>1000,26880=>1000,26881=>1000,26882=>1000,26883=>1000,26884=>1000,
-	26885=>1000,26886=>1000,26887=>1000,26888=>1000,26889=>1000,26890=>1000,26891=>1000,26892=>1000,26893=>1000,26894=>1000,26895=>1000,26896=>1000,26897=>1000,26898=>1000,26899=>1000,26900=>1000,
-	26901=>1000,26902=>1000,26903=>1000,26904=>1000,26905=>1000,26906=>1000,26907=>1000,26908=>1000,26909=>1000,26910=>1000,26911=>1000,26912=>1000,26913=>1000,26914=>1000,26915=>1000,26916=>1000,
-	26917=>1000,26918=>1000,26919=>1000,26920=>1000,26921=>1000,26922=>1000,26923=>1000,26924=>1000,26925=>1000,26926=>1000,26927=>1000,26928=>1000,26929=>1000,26930=>1000,26931=>1000,26932=>1000,
-	26933=>1000,26934=>1000,26935=>1000,26936=>1000,26937=>1000,26938=>1000,26939=>1000,26940=>1000,26941=>1000,26942=>1000,26943=>1000,26944=>1000,26945=>1000,26946=>1000,26947=>1000,26948=>1000,
-	26949=>1000,26950=>1000,26951=>1000,26952=>1000,26953=>1000,26954=>1000,26955=>1000,26956=>1000,26957=>1000,26958=>1000,26959=>1000,26960=>1000,26961=>1000,26962=>1000,26963=>1000,26964=>1000,
-	26965=>1000,26966=>1000,26967=>1000,26968=>1000,26969=>1000,26970=>1000,26971=>1000,26972=>1000,26973=>1000,26974=>1000,26975=>1000,26976=>1000,26977=>1000,26978=>1000,26979=>1000,26980=>1000,
-	26981=>1000,26982=>1000,26983=>1000,26984=>1000,26985=>1000,26986=>1000,26987=>1000,26988=>1000,26989=>1000,26990=>1000,26991=>1000,26992=>1000,26993=>1000,26994=>1000,26995=>1000,26996=>1000,
-	26997=>1000,26998=>1000,26999=>1000,27000=>1000,27001=>1000,27002=>1000,27003=>1000,27004=>1000,27005=>1000,27006=>1000,27007=>1000,27008=>1000,27009=>1000,27010=>1000,27011=>1000,27012=>1000,
-	27013=>1000,27014=>1000,27015=>1000,27016=>1000,27017=>1000,27018=>1000,27019=>1000,27020=>1000,27021=>1000,27022=>1000,27023=>1000,27024=>1000,27025=>1000,27026=>1000,27027=>1000,27028=>1000,
-	27029=>1000,27030=>1000,27031=>1000,27032=>1000,27033=>1000,27034=>1000,27035=>1000,27036=>1000,27037=>1000,27038=>1000,27039=>1000,27040=>1000,27041=>1000,27042=>1000,27043=>1000,27044=>1000,
-	27045=>1000,27046=>1000,27047=>1000,27048=>1000,27049=>1000,27050=>1000,27051=>1000,27052=>1000,27053=>1000,27054=>1000,27055=>1000,27056=>1000,27057=>1000,27058=>1000,27059=>1000,27060=>1000,
-	27061=>1000,27062=>1000,27063=>1000,27064=>1000,27065=>1000,27066=>1000,27067=>1000,27068=>1000,27069=>1000,27070=>1000,27071=>1000,27072=>1000,27073=>1000,27074=>1000,27075=>1000,27076=>1000,
-	27077=>1000,27078=>1000,27079=>1000,27080=>1000,27081=>1000,27082=>1000,27083=>1000,27084=>1000,27085=>1000,27086=>1000,27087=>1000,27088=>1000,27089=>1000,27090=>1000,27091=>1000,27092=>1000,
-	27093=>1000,27094=>1000,27095=>1000,27096=>1000,27097=>1000,27098=>1000,27099=>1000,27100=>1000,27101=>1000,27102=>1000,27103=>1000,27104=>1000,27105=>1000,27106=>1000,27107=>1000,27108=>1000,
-	27109=>1000,27110=>1000,27111=>1000,27112=>1000,27113=>1000,27114=>1000,27115=>1000,27116=>1000,27117=>1000,27118=>1000,27119=>1000,27120=>1000,27121=>1000,27122=>1000,27123=>1000,27124=>1000,
-	27125=>1000,27126=>1000,27127=>1000,27128=>1000,27129=>1000,27130=>1000,27131=>1000,27132=>1000,27133=>1000,27134=>1000,27135=>1000,27136=>1000,27137=>1000,27138=>1000,27139=>1000,27140=>1000,
-	27141=>1000,27142=>1000,27143=>1000,27144=>1000,27145=>1000,27146=>1000,27147=>1000,27148=>1000,27149=>1000,27150=>1000,27151=>1000,27152=>1000,27153=>1000,27154=>1000,27155=>1000,27156=>1000,
-	27157=>1000,27158=>1000,27159=>1000,27160=>1000,27161=>1000,27162=>1000,27163=>1000,27164=>1000,27165=>1000,27166=>1000,27167=>1000,27168=>1000,27169=>1000,27170=>1000,27171=>1000,27172=>1000,
-	27173=>1000,27174=>1000,27175=>1000,27176=>1000,27177=>1000,27178=>1000,27179=>1000,27180=>1000,27181=>1000,27182=>1000,27183=>1000,27184=>1000,27185=>1000,27186=>1000,27187=>1000,27188=>1000,
-	27189=>1000,27190=>1000,27191=>1000,27192=>1000,27193=>1000,27194=>1000,27195=>1000,27196=>1000,27197=>1000,27198=>1000,27199=>1000,27200=>1000,27201=>1000,27202=>1000,27203=>1000,27204=>1000,
-	27205=>1000,27206=>1000,27207=>1000,27208=>1000,27209=>1000,27210=>1000,27211=>1000,27212=>1000,27213=>1000,27214=>1000,27215=>1000,27216=>1000,27217=>1000,27218=>1000,27219=>1000,27220=>1000,
-	27221=>1000,27222=>1000,27223=>1000,27224=>1000,27225=>1000,27226=>1000,27227=>1000,27228=>1000,27229=>1000,27230=>1000,27231=>1000,27232=>1000,27233=>1000,27234=>1000,27235=>1000,27236=>1000,
-	27237=>1000,27238=>1000,27239=>1000,27240=>1000,27241=>1000,27242=>1000,27243=>1000,27244=>1000,27245=>1000,27246=>1000,27247=>1000,27248=>1000,27249=>1000,27250=>1000,27251=>1000,27252=>1000,
-	27253=>1000,27254=>1000,27255=>1000,27256=>1000,27257=>1000,27258=>1000,27259=>1000,27260=>1000,27261=>1000,27262=>1000,27263=>1000,27264=>1000,27265=>1000,27266=>1000,27267=>1000,27268=>1000,
-	27269=>1000,27270=>1000,27271=>1000,27272=>1000,27273=>1000,27274=>1000,27275=>1000,27276=>1000,27277=>1000,27278=>1000,27279=>1000,27280=>1000,27281=>1000,27282=>1000,27283=>1000,27284=>1000,
-	27285=>1000,27286=>1000,27287=>1000,27288=>1000,27289=>1000,27290=>1000,27291=>1000,27292=>1000,27293=>1000,27294=>1000,27295=>1000,27296=>1000,27297=>1000,27298=>1000,27299=>1000,27300=>1000,
-	27301=>1000,27302=>1000,27303=>1000,27304=>1000,27305=>1000,27306=>1000,27307=>1000,27308=>1000,27309=>1000,27310=>1000,27311=>1000,27312=>1000,27313=>1000,27314=>1000,27315=>1000,27316=>1000,
-	27317=>1000,27318=>1000,27319=>1000,27320=>1000,27321=>1000,27322=>1000,27323=>1000,27324=>1000,27325=>1000,27326=>1000,27327=>1000,27328=>1000,27329=>1000,27330=>1000,27331=>1000,27332=>1000,
-	27333=>1000,27334=>1000,27335=>1000,27336=>1000,27337=>1000,27338=>1000,27339=>1000,27340=>1000,27341=>1000,27342=>1000,27343=>1000,27344=>1000,27345=>1000,27346=>1000,27347=>1000,27348=>1000,
-	27349=>1000,27350=>1000,27351=>1000,27352=>1000,27353=>1000,27354=>1000,27355=>1000,27356=>1000,27357=>1000,27358=>1000,27359=>1000,27360=>1000,27361=>1000,27362=>1000,27363=>1000,27364=>1000,
-	27365=>1000,27366=>1000,27367=>1000,27368=>1000,27369=>1000,27370=>1000,27371=>1000,27372=>1000,27373=>1000,27374=>1000,27375=>1000,27376=>1000,27377=>1000,27378=>1000,27379=>1000,27380=>1000,
-	27381=>1000,27382=>1000,27383=>1000,27384=>1000,27385=>1000,27386=>1000,27387=>1000,27388=>1000,27389=>1000,27390=>1000,27391=>1000,27392=>1000,27393=>1000,27394=>1000,27395=>1000,27396=>1000,
-	27397=>1000,27398=>1000,27399=>1000,27400=>1000,27401=>1000,27402=>1000,27403=>1000,27404=>1000,27405=>1000,27406=>1000,27407=>1000,27408=>1000,27409=>1000,27410=>1000,27411=>1000,27412=>1000,
-	27413=>1000,27414=>1000,27415=>1000,27416=>1000,27417=>1000,27418=>1000,27419=>1000,27420=>1000,27421=>1000,27422=>1000,27423=>1000,27424=>1000,27425=>1000,27426=>1000,27427=>1000,27428=>1000,
-	27429=>1000,27430=>1000,27431=>1000,27432=>1000,27433=>1000,27434=>1000,27435=>1000,27436=>1000,27437=>1000,27438=>1000,27439=>1000,27440=>1000,27441=>1000,27442=>1000,27443=>1000,27444=>1000,
-	27445=>1000,27446=>1000,27447=>1000,27448=>1000,27449=>1000,27450=>1000,27451=>1000,27452=>1000,27453=>1000,27454=>1000,27455=>1000,27456=>1000,27457=>1000,27458=>1000,27459=>1000,27460=>1000,
-	27461=>1000,27462=>1000,27463=>1000,27464=>1000,27465=>1000,27466=>1000,27467=>1000,27468=>1000,27469=>1000,27470=>1000,27471=>1000,27472=>1000,27473=>1000,27474=>1000,27475=>1000,27476=>1000,
-	27477=>1000,27478=>1000,27479=>1000,27480=>1000,27481=>1000,27482=>1000,27483=>1000,27484=>1000,27485=>1000,27486=>1000,27487=>1000,27488=>1000,27489=>1000,27490=>1000,27491=>1000,27492=>1000,
-	27493=>1000,27494=>1000,27495=>1000,27496=>1000,27497=>1000,27498=>1000,27499=>1000,27500=>1000,27501=>1000,27502=>1000,27503=>1000,27504=>1000,27505=>1000,27506=>1000,27507=>1000,27508=>1000,
-	27509=>1000,27510=>1000,27511=>1000,27512=>1000,27513=>1000,27514=>1000,27515=>1000,27516=>1000,27517=>1000,27518=>1000,27519=>1000,27520=>1000,27521=>1000,27522=>1000,27523=>1000,27524=>1000,
-	27525=>1000,27526=>1000,27527=>1000,27528=>1000,27529=>1000,27530=>1000,27531=>1000,27532=>1000,27533=>1000,27534=>1000,27535=>1000,27536=>1000,27537=>1000,27538=>1000,27539=>1000,27540=>1000,
-	27541=>1000,27542=>1000,27543=>1000,27544=>1000,27545=>1000,27546=>1000,27547=>1000,27548=>1000,27549=>1000,27550=>1000,27551=>1000,27552=>1000,27553=>1000,27554=>1000,27555=>1000,27556=>1000,
-	27557=>1000,27558=>1000,27559=>1000,27560=>1000,27561=>1000,27562=>1000,27563=>1000,27564=>1000,27565=>1000,27566=>1000,27567=>1000,27568=>1000,27569=>1000,27570=>1000,27571=>1000,27572=>1000,
-	27573=>1000,27574=>1000,27575=>1000,27576=>1000,27577=>1000,27578=>1000,27579=>1000,27580=>1000,27581=>1000,27582=>1000,27583=>1000,27584=>1000,27585=>1000,27586=>1000,27587=>1000,27588=>1000,
-	27589=>1000,27590=>1000,27591=>1000,27592=>1000,27593=>1000,27594=>1000,27595=>1000,27596=>1000,27597=>1000,27598=>1000,27599=>1000,27600=>1000,27601=>1000,27602=>1000,27603=>1000,27604=>1000,
-	27605=>1000,27606=>1000,27607=>1000,27608=>1000,27609=>1000,27610=>1000,27611=>1000,27612=>1000,27613=>1000,27614=>1000,27615=>1000,27616=>1000,27617=>1000,27618=>1000,27619=>1000,27620=>1000,
-	27621=>1000,27622=>1000,27623=>1000,27624=>1000,27625=>1000,27626=>1000,27627=>1000,27628=>1000,27629=>1000,27630=>1000,27631=>1000,27632=>1000,27633=>1000,27634=>1000,27635=>1000,27636=>1000,
-	27637=>1000,27638=>1000,27639=>1000,27640=>1000,27641=>1000,27642=>1000,27643=>1000,27644=>1000,27645=>1000,27646=>1000,27647=>1000,27648=>1000,27649=>1000,27650=>1000,27651=>1000,27652=>1000,
-	27653=>1000,27654=>1000,27655=>1000,27656=>1000,27657=>1000,27658=>1000,27659=>1000,27660=>1000,27661=>1000,27662=>1000,27663=>1000,27664=>1000,27665=>1000,27666=>1000,27667=>1000,27668=>1000,
-	27669=>1000,27670=>1000,27671=>1000,27672=>1000,27673=>1000,27674=>1000,27675=>1000,27676=>1000,27677=>1000,27678=>1000,27679=>1000,27680=>1000,27681=>1000,27682=>1000,27683=>1000,27684=>1000,
-	27685=>1000,27686=>1000,27687=>1000,27688=>1000,27689=>1000,27690=>1000,27691=>1000,27692=>1000,27693=>1000,27694=>1000,27695=>1000,27696=>1000,27697=>1000,27698=>1000,27699=>1000,27700=>1000,
-	27701=>1000,27702=>1000,27703=>1000,27704=>1000,27705=>1000,27706=>1000,27707=>1000,27708=>1000,27709=>1000,27710=>1000,27711=>1000,27712=>1000,27713=>1000,27714=>1000,27715=>1000,27716=>1000,
-	27717=>1000,27718=>1000,27719=>1000,27720=>1000,27721=>1000,27722=>1000,27723=>1000,27724=>1000,27725=>1000,27726=>1000,27727=>1000,27728=>1000,27729=>1000,27730=>1000,27731=>1000,27732=>1000,
-	27733=>1000,27734=>1000,27735=>1000,27736=>1000,27737=>1000,27738=>1000,27739=>1000,27740=>1000,27741=>1000,27742=>1000,27743=>1000,27744=>1000,27745=>1000,27746=>1000,27747=>1000,27748=>1000,
-	27749=>1000,27750=>1000,27751=>1000,27752=>1000,27753=>1000,27754=>1000,27755=>1000,27756=>1000,27757=>1000,27758=>1000,27759=>1000,27760=>1000,27761=>1000,27762=>1000,27763=>1000,27764=>1000,
-	27765=>1000,27766=>1000,27767=>1000,27768=>1000,27769=>1000,27770=>1000,27771=>1000,27772=>1000,27773=>1000,27774=>1000,27775=>1000,27776=>1000,27777=>1000,27778=>1000,27779=>1000,27780=>1000,
-	27781=>1000,27782=>1000,27783=>1000,27784=>1000,27785=>1000,27786=>1000,27787=>1000,27788=>1000,27789=>1000,27790=>1000,27791=>1000,27792=>1000,27793=>1000,27794=>1000,27795=>1000,27796=>1000,
-	27797=>1000,27798=>1000,27799=>1000,27800=>1000,27801=>1000,27802=>1000,27803=>1000,27804=>1000,27805=>1000,27806=>1000,27807=>1000,27808=>1000,27809=>1000,27810=>1000,27811=>1000,27812=>1000,
-	27813=>1000,27814=>1000,27815=>1000,27816=>1000,27817=>1000,27818=>1000,27819=>1000,27820=>1000,27821=>1000,27822=>1000,27823=>1000,27824=>1000,27825=>1000,27826=>1000,27827=>1000,27828=>1000,
-	27829=>1000,27830=>1000,27831=>1000,27832=>1000,27833=>1000,27834=>1000,27835=>1000,27836=>1000,27837=>1000,27838=>1000,27839=>1000,27840=>1000,27841=>1000,27842=>1000,27843=>1000,27844=>1000,
-	27845=>1000,27846=>1000,27847=>1000,27848=>1000,27849=>1000,27850=>1000,27851=>1000,27852=>1000,27853=>1000,27854=>1000,27855=>1000,27856=>1000,27857=>1000,27858=>1000,27859=>1000,27860=>1000,
-	27861=>1000,27862=>1000,27863=>1000,27864=>1000,27865=>1000,27866=>1000,27867=>1000,27868=>1000,27869=>1000,27870=>1000,27871=>1000,27872=>1000,27873=>1000,27874=>1000,27875=>1000,27876=>1000,
-	27877=>1000,27878=>1000,27879=>1000,27880=>1000,27881=>1000,27882=>1000,27883=>1000,27884=>1000,27885=>1000,27886=>1000,27887=>1000,27888=>1000,27889=>1000,27890=>1000,27891=>1000,27892=>1000,
-	27893=>1000,27894=>1000,27895=>1000,27896=>1000,27897=>1000,27898=>1000,27899=>1000,27900=>1000,27901=>1000,27902=>1000,27903=>1000,27904=>1000,27905=>1000,27906=>1000,27907=>1000,27908=>1000,
-	27909=>1000,27910=>1000,27911=>1000,27912=>1000,27913=>1000,27914=>1000,27915=>1000,27916=>1000,27917=>1000,27918=>1000,27919=>1000,27920=>1000,27921=>1000,27922=>1000,27923=>1000,27924=>1000,
-	27925=>1000,27926=>1000,27927=>1000,27928=>1000,27929=>1000,27930=>1000,27931=>1000,27932=>1000,27933=>1000,27934=>1000,27935=>1000,27936=>1000,27937=>1000,27938=>1000,27939=>1000,27940=>1000,
-	27941=>1000,27942=>1000,27943=>1000,27944=>1000,27945=>1000,27946=>1000,27947=>1000,27948=>1000,27949=>1000,27950=>1000,27951=>1000,27952=>1000,27953=>1000,27954=>1000,27955=>1000,27956=>1000,
-	27957=>1000,27958=>1000,27959=>1000,27960=>1000,27961=>1000,27962=>1000,27963=>1000,27964=>1000,27965=>1000,27966=>1000,27967=>1000,27968=>1000,27969=>1000,27970=>1000,27971=>1000,27972=>1000,
-	27973=>1000,27974=>1000,27975=>1000,27976=>1000,27977=>1000,27978=>1000,27979=>1000,27980=>1000,27981=>1000,27982=>1000,27983=>1000,27984=>1000,27985=>1000,27986=>1000,27987=>1000,27988=>1000,
-	27989=>1000,27990=>1000,27991=>1000,27992=>1000,27993=>1000,27994=>1000,27995=>1000,27996=>1000,27997=>1000,27998=>1000,27999=>1000,28000=>1000,28001=>1000,28002=>1000,28003=>1000,28004=>1000,
-	28005=>1000,28006=>1000,28007=>1000,28008=>1000,28009=>1000,28010=>1000,28011=>1000,28012=>1000,28013=>1000,28014=>1000,28015=>1000,28016=>1000,28017=>1000,28018=>1000,28019=>1000,28020=>1000,
-	28021=>1000,28022=>1000,28023=>1000,28024=>1000,28025=>1000,28026=>1000,28027=>1000,28028=>1000,28029=>1000,28030=>1000,28031=>1000,28032=>1000,28033=>1000,28034=>1000,28035=>1000,28036=>1000,
-	28037=>1000,28038=>1000,28039=>1000,28040=>1000,28041=>1000,28042=>1000,28043=>1000,28044=>1000,28045=>1000,28046=>1000,28047=>1000,28048=>1000,28049=>1000,28050=>1000,28051=>1000,28052=>1000,
-	28053=>1000,28054=>1000,28055=>1000,28056=>1000,28057=>1000,28058=>1000,28059=>1000,28060=>1000,28061=>1000,28062=>1000,28063=>1000,28064=>1000,28065=>1000,28066=>1000,28067=>1000,28068=>1000,
-	28069=>1000,28070=>1000,28071=>1000,28072=>1000,28073=>1000,28074=>1000,28075=>1000,28076=>1000,28077=>1000,28078=>1000,28079=>1000,28080=>1000,28081=>1000,28082=>1000,28083=>1000,28084=>1000,
-	28085=>1000,28086=>1000,28087=>1000,28088=>1000,28089=>1000,28090=>1000,28091=>1000,28092=>1000,28093=>1000,28094=>1000,28095=>1000,28096=>1000,28097=>1000,28098=>1000,28099=>1000,28100=>1000,
-	28101=>1000,28102=>1000,28103=>1000,28104=>1000,28105=>1000,28106=>1000,28107=>1000,28108=>1000,28109=>1000,28110=>1000,28111=>1000,28112=>1000,28113=>1000,28114=>1000,28115=>1000,28116=>1000,
-	28117=>1000,28118=>1000,28119=>1000,28120=>1000,28121=>1000,28122=>1000,28123=>1000,28124=>1000,28125=>1000,28126=>1000,28127=>1000,28128=>1000,28129=>1000,28130=>1000,28131=>1000,28132=>1000,
-	28133=>1000,28134=>1000,28135=>1000,28136=>1000,28137=>1000,28138=>1000,28139=>1000,28140=>1000,28141=>1000,28142=>1000,28143=>1000,28144=>1000,28145=>1000,28146=>1000,28147=>1000,28148=>1000,
-	28149=>1000,28150=>1000,28151=>1000,28152=>1000,28153=>1000,28154=>1000,28155=>1000,28156=>1000,28157=>1000,28158=>1000,28159=>1000,28160=>1000,28161=>1000,28162=>1000,28163=>1000,28164=>1000,
-	28165=>1000,28166=>1000,28167=>1000,28168=>1000,28169=>1000,28170=>1000,28171=>1000,28172=>1000,28173=>1000,28174=>1000,28175=>1000,28176=>1000,28177=>1000,28178=>1000,28179=>1000,28180=>1000,
-	28181=>1000,28182=>1000,28183=>1000,28184=>1000,28185=>1000,28186=>1000,28187=>1000,28188=>1000,28189=>1000,28190=>1000,28191=>1000,28192=>1000,28193=>1000,28194=>1000,28195=>1000,28196=>1000,
-	28197=>1000,28198=>1000,28199=>1000,28200=>1000,28201=>1000,28202=>1000,28203=>1000,28204=>1000,28205=>1000,28206=>1000,28207=>1000,28208=>1000,28209=>1000,28210=>1000,28211=>1000,28212=>1000,
-	28213=>1000,28214=>1000,28215=>1000,28216=>1000,28217=>1000,28218=>1000,28219=>1000,28220=>1000,28221=>1000,28222=>1000,28223=>1000,28224=>1000,28225=>1000,28226=>1000,28227=>1000,28228=>1000,
-	28229=>1000,28230=>1000,28231=>1000,28232=>1000,28233=>1000,28234=>1000,28235=>1000,28236=>1000,28237=>1000,28238=>1000,28239=>1000,28240=>1000,28241=>1000,28242=>1000,28243=>1000,28244=>1000,
-	28245=>1000,28246=>1000,28247=>1000,28248=>1000,28249=>1000,28250=>1000,28251=>1000,28252=>1000,28253=>1000,28254=>1000,28255=>1000,28256=>1000,28257=>1000,28258=>1000,28259=>1000,28260=>1000,
-	28261=>1000,28262=>1000,28263=>1000,28264=>1000,28265=>1000,28266=>1000,28267=>1000,28268=>1000,28269=>1000,28270=>1000,28271=>1000,28272=>1000,28273=>1000,28274=>1000,28275=>1000,28276=>1000,
-	28277=>1000,28278=>1000,28279=>1000,28280=>1000,28281=>1000,28282=>1000,28283=>1000,28284=>1000,28285=>1000,28286=>1000,28287=>1000,28288=>1000,28289=>1000,28290=>1000,28291=>1000,28292=>1000,
-	28293=>1000,28294=>1000,28295=>1000,28296=>1000,28297=>1000,28298=>1000,28299=>1000,28300=>1000,28301=>1000,28302=>1000,28303=>1000,28304=>1000,28305=>1000,28306=>1000,28307=>1000,28308=>1000,
-	28309=>1000,28310=>1000,28311=>1000,28312=>1000,28313=>1000,28314=>1000,28315=>1000,28316=>1000,28317=>1000,28318=>1000,28319=>1000,28320=>1000,28321=>1000,28322=>1000,28323=>1000,28324=>1000,
-	28325=>1000,28326=>1000,28327=>1000,28328=>1000,28329=>1000,28330=>1000,28331=>1000,28332=>1000,28333=>1000,28334=>1000,28335=>1000,28336=>1000,28337=>1000,28338=>1000,28339=>1000,28340=>1000,
-	28341=>1000,28342=>1000,28343=>1000,28344=>1000,28345=>1000,28346=>1000,28347=>1000,28348=>1000,28349=>1000,28350=>1000,28351=>1000,28352=>1000,28353=>1000,28354=>1000,28355=>1000,28356=>1000,
-	28357=>1000,28358=>1000,28359=>1000,28360=>1000,28361=>1000,28362=>1000,28363=>1000,28364=>1000,28365=>1000,28366=>1000,28367=>1000,28368=>1000,28369=>1000,28370=>1000,28371=>1000,28372=>1000,
-	28373=>1000,28374=>1000,28375=>1000,28376=>1000,28377=>1000,28378=>1000,28379=>1000,28380=>1000,28381=>1000,28382=>1000,28383=>1000,28384=>1000,28385=>1000,28386=>1000,28387=>1000,28388=>1000,
-	28389=>1000,28390=>1000,28391=>1000,28392=>1000,28393=>1000,28394=>1000,28395=>1000,28396=>1000,28397=>1000,28398=>1000,28399=>1000,28400=>1000,28401=>1000,28402=>1000,28403=>1000,28404=>1000,
-	28405=>1000,28406=>1000,28407=>1000,28408=>1000,28409=>1000,28410=>1000,28411=>1000,28412=>1000,28413=>1000,28414=>1000,28415=>1000,28416=>1000,28417=>1000,28418=>1000,28419=>1000,28420=>1000,
-	28421=>1000,28422=>1000,28423=>1000,28424=>1000,28425=>1000,28426=>1000,28427=>1000,28428=>1000,28429=>1000,28430=>1000,28431=>1000,28432=>1000,28433=>1000,28434=>1000,28435=>1000,28436=>1000,
-	28437=>1000,28438=>1000,28439=>1000,28440=>1000,28441=>1000,28442=>1000,28443=>1000,28444=>1000,28445=>1000,28446=>1000,28447=>1000,28448=>1000,28449=>1000,28450=>1000,28451=>1000,28452=>1000,
-	28453=>1000,28454=>1000,28455=>1000,28456=>1000,28457=>1000,28458=>1000,28459=>1000,28460=>1000,28461=>1000,28462=>1000,28463=>1000,28464=>1000,28465=>1000,28466=>1000,28467=>1000,28468=>1000,
-	28469=>1000,28470=>1000,28471=>1000,28472=>1000,28473=>1000,28474=>1000,28475=>1000,28476=>1000,28477=>1000,28478=>1000,28479=>1000,28480=>1000,28481=>1000,28482=>1000,28483=>1000,28484=>1000,
-	28485=>1000,28486=>1000,28487=>1000,28488=>1000,28489=>1000,28490=>1000,28491=>1000,28492=>1000,28493=>1000,28494=>1000,28495=>1000,28496=>1000,28497=>1000,28498=>1000,28499=>1000,28500=>1000,
-	28501=>1000,28502=>1000,28503=>1000,28504=>1000,28505=>1000,28506=>1000,28507=>1000,28508=>1000,28509=>1000,28510=>1000,28511=>1000,28512=>1000,28513=>1000,28514=>1000,28515=>1000,28516=>1000,
-	28517=>1000,28518=>1000,28519=>1000,28520=>1000,28521=>1000,28522=>1000,28523=>1000,28524=>1000,28525=>1000,28526=>1000,28527=>1000,28528=>1000,28529=>1000,28530=>1000,28531=>1000,28532=>1000,
-	28533=>1000,28534=>1000,28535=>1000,28536=>1000,28537=>1000,28538=>1000,28539=>1000,28540=>1000,28541=>1000,28542=>1000,28543=>1000,28544=>1000,28545=>1000,28546=>1000,28547=>1000,28548=>1000,
-	28549=>1000,28550=>1000,28551=>1000,28552=>1000,28553=>1000,28554=>1000,28555=>1000,28556=>1000,28557=>1000,28558=>1000,28559=>1000,28560=>1000,28561=>1000,28562=>1000,28563=>1000,28564=>1000,
-	28565=>1000,28566=>1000,28567=>1000,28568=>1000,28569=>1000,28570=>1000,28571=>1000,28572=>1000,28573=>1000,28574=>1000,28575=>1000,28576=>1000,28577=>1000,28578=>1000,28579=>1000,28580=>1000,
-	28581=>1000,28582=>1000,28583=>1000,28584=>1000,28585=>1000,28586=>1000,28587=>1000,28588=>1000,28589=>1000,28590=>1000,28591=>1000,28592=>1000,28593=>1000,28594=>1000,28595=>1000,28596=>1000,
-	28597=>1000,28598=>1000,28599=>1000,28600=>1000,28601=>1000,28602=>1000,28603=>1000,28604=>1000,28605=>1000,28606=>1000,28607=>1000,28608=>1000,28609=>1000,28610=>1000,28611=>1000,28612=>1000,
-	28613=>1000,28614=>1000,28615=>1000,28616=>1000,28617=>1000,28618=>1000,28619=>1000,28620=>1000,28621=>1000,28622=>1000,28623=>1000,28624=>1000,28625=>1000,28626=>1000,28627=>1000,28628=>1000,
-	28629=>1000,28630=>1000,28631=>1000,28632=>1000,28633=>1000,28634=>1000,28635=>1000,28636=>1000,28637=>1000,28638=>1000,28639=>1000,28640=>1000,28641=>1000,28642=>1000,28643=>1000,28644=>1000,
-	28645=>1000,28646=>1000,28647=>1000,28648=>1000,28649=>1000,28650=>1000,28651=>1000,28652=>1000,28653=>1000,28654=>1000,28655=>1000,28656=>1000,28657=>1000,28658=>1000,28659=>1000,28660=>1000,
-	28661=>1000,28662=>1000,28663=>1000,28664=>1000,28665=>1000,28666=>1000,28667=>1000,28668=>1000,28669=>1000,28670=>1000,28671=>1000,28672=>1000,28673=>1000,28674=>1000,28675=>1000,28676=>1000,
-	28677=>1000,28678=>1000,28679=>1000,28680=>1000,28681=>1000,28682=>1000,28683=>1000,28684=>1000,28685=>1000,28686=>1000,28687=>1000,28688=>1000,28689=>1000,28690=>1000,28691=>1000,28692=>1000,
-	28693=>1000,28694=>1000,28695=>1000,28696=>1000,28697=>1000,28698=>1000,28699=>1000,28700=>1000,28701=>1000,28702=>1000,28703=>1000,28704=>1000,28705=>1000,28706=>1000,28707=>1000,28708=>1000,
-	28709=>1000,28710=>1000,28711=>1000,28712=>1000,28713=>1000,28714=>1000,28715=>1000,28716=>1000,28717=>1000,28718=>1000,28719=>1000,28720=>1000,28721=>1000,28722=>1000,28723=>1000,28724=>1000,
-	28725=>1000,28726=>1000,28727=>1000,28728=>1000,28729=>1000,28730=>1000,28731=>1000,28732=>1000,28733=>1000,28734=>1000,28735=>1000,28736=>1000,28737=>1000,28738=>1000,28739=>1000,28740=>1000,
-	28741=>1000,28742=>1000,28743=>1000,28744=>1000,28745=>1000,28746=>1000,28747=>1000,28748=>1000,28749=>1000,28750=>1000,28751=>1000,28752=>1000,28753=>1000,28754=>1000,28755=>1000,28756=>1000,
-	28757=>1000,28758=>1000,28759=>1000,28760=>1000,28761=>1000,28762=>1000,28763=>1000,28764=>1000,28765=>1000,28766=>1000,28767=>1000,28768=>1000,28769=>1000,28770=>1000,28771=>1000,28772=>1000,
-	28773=>1000,28774=>1000,28775=>1000,28776=>1000,28777=>1000,28778=>1000,28779=>1000,28780=>1000,28781=>1000,28782=>1000,28783=>1000,28784=>1000,28785=>1000,28786=>1000,28787=>1000,28788=>1000,
-	28789=>1000,28790=>1000,28791=>1000,28792=>1000,28793=>1000,28794=>1000,28795=>1000,28796=>1000,28797=>1000,28798=>1000,28799=>1000,28800=>1000,28801=>1000,28802=>1000,28803=>1000,28804=>1000,
-	28805=>1000,28806=>1000,28807=>1000,28808=>1000,28809=>1000,28810=>1000,28811=>1000,28812=>1000,28813=>1000,28814=>1000,28815=>1000,28816=>1000,28817=>1000,28818=>1000,28819=>1000,28820=>1000,
-	28821=>1000,28822=>1000,28823=>1000,28824=>1000,28825=>1000,28826=>1000,28827=>1000,28828=>1000,28829=>1000,28830=>1000,28831=>1000,28832=>1000,28833=>1000,28834=>1000,28835=>1000,28836=>1000,
-	28837=>1000,28838=>1000,28839=>1000,28840=>1000,28841=>1000,28842=>1000,28843=>1000,28844=>1000,28845=>1000,28846=>1000,28847=>1000,28848=>1000,28849=>1000,28850=>1000,28851=>1000,28852=>1000,
-	28853=>1000,28854=>1000,28855=>1000,28856=>1000,28857=>1000,28858=>1000,28859=>1000,28860=>1000,28861=>1000,28862=>1000,28863=>1000,28864=>1000,28865=>1000,28866=>1000,28867=>1000,28868=>1000,
-	28869=>1000,28870=>1000,28871=>1000,28872=>1000,28873=>1000,28874=>1000,28875=>1000,28876=>1000,28877=>1000,28878=>1000,28879=>1000,28880=>1000,28881=>1000,28882=>1000,28883=>1000,28884=>1000,
-	28885=>1000,28886=>1000,28887=>1000,28888=>1000,28889=>1000,28890=>1000,28891=>1000,28892=>1000,28893=>1000,28894=>1000,28895=>1000,28896=>1000,28897=>1000,28898=>1000,28899=>1000,28900=>1000,
-	28901=>1000,28902=>1000,28903=>1000,28904=>1000,28905=>1000,28906=>1000,28907=>1000,28908=>1000,28909=>1000,28910=>1000,28911=>1000,28912=>1000,28913=>1000,28914=>1000,28915=>1000,28916=>1000,
-	28917=>1000,28918=>1000,28919=>1000,28920=>1000,28921=>1000,28922=>1000,28923=>1000,28924=>1000,28925=>1000,28926=>1000,28927=>1000,28928=>1000,28929=>1000,28930=>1000,28931=>1000,28932=>1000,
-	28933=>1000,28934=>1000,28935=>1000,28936=>1000,28937=>1000,28938=>1000,28939=>1000,28940=>1000,28941=>1000,28942=>1000,28943=>1000,28944=>1000,28945=>1000,28946=>1000,28947=>1000,28948=>1000,
-	28949=>1000,28950=>1000,28951=>1000,28952=>1000,28953=>1000,28954=>1000,28955=>1000,28956=>1000,28957=>1000,28958=>1000,28959=>1000,28960=>1000,28961=>1000,28962=>1000,28963=>1000,28964=>1000,
-	28965=>1000,28966=>1000,28967=>1000,28968=>1000,28969=>1000,28970=>1000,28971=>1000,28972=>1000,28973=>1000,28974=>1000,28975=>1000,28976=>1000,28977=>1000,28978=>1000,28979=>1000,28980=>1000,
-	28981=>1000,28982=>1000,28983=>1000,28984=>1000,28985=>1000,28986=>1000,28987=>1000,28988=>1000,28989=>1000,28990=>1000,28991=>1000,28992=>1000,28993=>1000,28994=>1000,28995=>1000,28996=>1000,
-	28997=>1000,28998=>1000,28999=>1000,29000=>1000,29001=>1000,29002=>1000,29003=>1000,29004=>1000,29005=>1000,29006=>1000,29007=>1000,29008=>1000,29009=>1000,29010=>1000,29011=>1000,29012=>1000,
-	29013=>1000,29014=>1000,29015=>1000,29016=>1000,29017=>1000,29018=>1000,29019=>1000,29020=>1000,29021=>1000,29022=>1000,29023=>1000,29024=>1000,29025=>1000,29026=>1000,29027=>1000,29028=>1000,
-	29029=>1000,29030=>1000,29031=>1000,29032=>1000,29033=>1000,29034=>1000,29035=>1000,29036=>1000,29037=>1000,29038=>1000,29039=>1000,29040=>1000,29041=>1000,29042=>1000,29043=>1000,29044=>1000,
-	29045=>1000,29046=>1000,29047=>1000,29048=>1000,29049=>1000,29050=>1000,29051=>1000,29052=>1000,29053=>1000,29054=>1000,29055=>1000,29056=>1000,29057=>1000,29058=>1000,29059=>1000,29060=>1000,
-	29061=>1000,29062=>1000,29063=>1000,29064=>1000,29065=>1000,29066=>1000,29067=>1000,29068=>1000,29069=>1000,29070=>1000,29071=>1000,29072=>1000,29073=>1000,29074=>1000,29075=>1000,29076=>1000,
-	29077=>1000,29078=>1000,29079=>1000,29080=>1000,29081=>1000,29082=>1000,29083=>1000,29084=>1000,29085=>1000,29086=>1000,29087=>1000,29088=>1000,29089=>1000,29090=>1000,29091=>1000,29092=>1000,
-	29093=>1000,29094=>1000,29095=>1000,29096=>1000,29097=>1000,29098=>1000,29099=>1000,29100=>1000,29101=>1000,29102=>1000,29103=>1000,29104=>1000,29105=>1000,29106=>1000,29107=>1000,29108=>1000,
-	29109=>1000,29110=>1000,29111=>1000,29112=>1000,29113=>1000,29114=>1000,29115=>1000,29116=>1000,29117=>1000,29118=>1000,29119=>1000,29120=>1000,29121=>1000,29122=>1000,29123=>1000,29124=>1000,
-	29125=>1000,29126=>1000,29127=>1000,29128=>1000,29129=>1000,29130=>1000,29131=>1000,29132=>1000,29133=>1000,29134=>1000,29135=>1000,29136=>1000,29137=>1000,29138=>1000,29139=>1000,29140=>1000,
-	29141=>1000,29142=>1000,29143=>1000,29144=>1000,29145=>1000,29146=>1000,29147=>1000,29148=>1000,29149=>1000,29150=>1000,29151=>1000,29152=>1000,29153=>1000,29154=>1000,29155=>1000,29156=>1000,
-	29157=>1000,29158=>1000,29159=>1000,29160=>1000,29161=>1000,29162=>1000,29163=>1000,29164=>1000,29165=>1000,29166=>1000,29167=>1000,29168=>1000,29169=>1000,29170=>1000,29171=>1000,29172=>1000,
-	29173=>1000,29174=>1000,29175=>1000,29176=>1000,29177=>1000,29178=>1000,29179=>1000,29180=>1000,29181=>1000,29182=>1000,29183=>1000,29184=>1000,29185=>1000,29186=>1000,29187=>1000,29188=>1000,
-	29189=>1000,29190=>1000,29191=>1000,29192=>1000,29193=>1000,29194=>1000,29195=>1000,29196=>1000,29197=>1000,29198=>1000,29199=>1000,29200=>1000,29201=>1000,29202=>1000,29203=>1000,29204=>1000,
-	29205=>1000,29206=>1000,29207=>1000,29208=>1000,29209=>1000,29210=>1000,29211=>1000,29212=>1000,29213=>1000,29214=>1000,29215=>1000,29216=>1000,29217=>1000,29218=>1000,29219=>1000,29220=>1000,
-	29221=>1000,29222=>1000,29223=>1000,29224=>1000,29225=>1000,29226=>1000,29227=>1000,29228=>1000,29229=>1000,29230=>1000,29231=>1000,29232=>1000,29233=>1000,29234=>1000,29235=>1000,29236=>1000,
-	29237=>1000,29238=>1000,29239=>1000,29240=>1000,29241=>1000,29242=>1000,29243=>1000,29244=>1000,29245=>1000,29246=>1000,29247=>1000,29248=>1000,29249=>1000,29250=>1000,29251=>1000,29252=>1000,
-	29253=>1000,29254=>1000,29255=>1000,29256=>1000,29257=>1000,29258=>1000,29259=>1000,29260=>1000,29261=>1000,29262=>1000,29263=>1000,29264=>1000,29265=>1000,29266=>1000,29267=>1000,29268=>1000,
-	29269=>1000,29270=>1000,29271=>1000,29272=>1000,29273=>1000,29274=>1000,29275=>1000,29276=>1000,29277=>1000,29278=>1000,29279=>1000,29280=>1000,29281=>1000,29282=>1000,29283=>1000,29284=>1000,
-	29285=>1000,29286=>1000,29287=>1000,29288=>1000,29289=>1000,29290=>1000,29291=>1000,29292=>1000,29293=>1000,29294=>1000,29295=>1000,29296=>1000,29297=>1000,29298=>1000,29299=>1000,29300=>1000,
-	29301=>1000,29302=>1000,29303=>1000,29304=>1000,29305=>1000,29306=>1000,29307=>1000,29308=>1000,29309=>1000,29310=>1000,29311=>1000,29312=>1000,29313=>1000,29314=>1000,29315=>1000,29316=>1000,
-	29317=>1000,29318=>1000,29319=>1000,29320=>1000,29321=>1000,29322=>1000,29323=>1000,29324=>1000,29325=>1000,29326=>1000,29327=>1000,29328=>1000,29329=>1000,29330=>1000,29331=>1000,29332=>1000,
-	29333=>1000,29334=>1000,29335=>1000,29336=>1000,29337=>1000,29338=>1000,29339=>1000,29340=>1000,29341=>1000,29342=>1000,29343=>1000,29344=>1000,29345=>1000,29346=>1000,29347=>1000,29348=>1000,
-	29349=>1000,29350=>1000,29351=>1000,29352=>1000,29353=>1000,29354=>1000,29355=>1000,29356=>1000,29357=>1000,29358=>1000,29359=>1000,29360=>1000,29361=>1000,29362=>1000,29363=>1000,29364=>1000,
-	29365=>1000,29366=>1000,29367=>1000,29368=>1000,29369=>1000,29370=>1000,29371=>1000,29372=>1000,29373=>1000,29374=>1000,29375=>1000,29376=>1000,29377=>1000,29378=>1000,29379=>1000,29380=>1000,
-	29381=>1000,29382=>1000,29383=>1000,29384=>1000,29385=>1000,29386=>1000,29387=>1000,29388=>1000,29389=>1000,29390=>1000,29391=>1000,29392=>1000,29393=>1000,29394=>1000,29395=>1000,29396=>1000,
-	29397=>1000,29398=>1000,29399=>1000,29400=>1000,29401=>1000,29402=>1000,29403=>1000,29404=>1000,29405=>1000,29406=>1000,29407=>1000,29408=>1000,29409=>1000,29410=>1000,29411=>1000,29412=>1000,
-	29413=>1000,29414=>1000,29415=>1000,29416=>1000,29417=>1000,29418=>1000,29419=>1000,29420=>1000,29421=>1000,29422=>1000,29423=>1000,29424=>1000,29425=>1000,29426=>1000,29427=>1000,29428=>1000,
-	29429=>1000,29430=>1000,29431=>1000,29432=>1000,29433=>1000,29434=>1000,29435=>1000,29436=>1000,29437=>1000,29438=>1000,29439=>1000,29440=>1000,29441=>1000,29442=>1000,29443=>1000,29444=>1000,
-	29445=>1000,29446=>1000,29447=>1000,29448=>1000,29449=>1000,29450=>1000,29451=>1000,29452=>1000,29453=>1000,29454=>1000,29455=>1000,29456=>1000,29457=>1000,29458=>1000,29459=>1000,29460=>1000,
-	29461=>1000,29462=>1000,29463=>1000,29464=>1000,29465=>1000,29466=>1000,29467=>1000,29468=>1000,29469=>1000,29470=>1000,29471=>1000,29472=>1000,29473=>1000,29474=>1000,29475=>1000,29476=>1000,
-	29477=>1000,29478=>1000,29479=>1000,29480=>1000,29481=>1000,29482=>1000,29483=>1000,29484=>1000,29485=>1000,29486=>1000,29487=>1000,29488=>1000,29489=>1000,29490=>1000,29491=>1000,29492=>1000,
-	29493=>1000,29494=>1000,29495=>1000,29496=>1000,29497=>1000,29498=>1000,29499=>1000,29500=>1000,29501=>1000,29502=>1000,29503=>1000,29504=>1000,29505=>1000,29506=>1000,29507=>1000,29508=>1000,
-	29509=>1000,29510=>1000,29511=>1000,29512=>1000,29513=>1000,29514=>1000,29515=>1000,29516=>1000,29517=>1000,29518=>1000,29519=>1000,29520=>1000,29521=>1000,29522=>1000,29523=>1000,29524=>1000,
-	29525=>1000,29526=>1000,29527=>1000,29528=>1000,29529=>1000,29530=>1000,29531=>1000,29532=>1000,29533=>1000,29534=>1000,29535=>1000,29536=>1000,29537=>1000,29538=>1000,29539=>1000,29540=>1000,
-	29541=>1000,29542=>1000,29543=>1000,29544=>1000,29545=>1000,29546=>1000,29547=>1000,29548=>1000,29549=>1000,29550=>1000,29551=>1000,29552=>1000,29553=>1000,29554=>1000,29555=>1000,29556=>1000,
-	29557=>1000,29558=>1000,29559=>1000,29560=>1000,29561=>1000,29562=>1000,29563=>1000,29564=>1000,29565=>1000,29566=>1000,29567=>1000,29568=>1000,29569=>1000,29570=>1000,29571=>1000,29572=>1000,
-	29573=>1000,29574=>1000,29575=>1000,29576=>1000,29577=>1000,29578=>1000,29579=>1000,29580=>1000,29581=>1000,29582=>1000,29583=>1000,29584=>1000,29585=>1000,29586=>1000,29587=>1000,29588=>1000,
-	29589=>1000,29590=>1000,29591=>1000,29592=>1000,29593=>1000,29594=>1000,29595=>1000,29596=>1000,29597=>1000,29598=>1000,29599=>1000,29600=>1000,29601=>1000,29602=>1000,29603=>1000,29604=>1000,
-	29605=>1000,29606=>1000,29607=>1000,29608=>1000,29609=>1000,29610=>1000,29611=>1000,29612=>1000,29613=>1000,29614=>1000,29615=>1000,29616=>1000,29617=>1000,29618=>1000,29619=>1000,29620=>1000,
-	29621=>1000,29622=>1000,29623=>1000,29624=>1000,29625=>1000,29626=>1000,29627=>1000,29628=>1000,29629=>1000,29630=>1000,29631=>1000,29632=>1000,29633=>1000,29634=>1000,29635=>1000,29636=>1000,
-	29637=>1000,29638=>1000,29639=>1000,29640=>1000,29641=>1000,29642=>1000,29643=>1000,29644=>1000,29645=>1000,29646=>1000,29647=>1000,29648=>1000,29649=>1000,29650=>1000,29651=>1000,29652=>1000,
-	29653=>1000,29654=>1000,29655=>1000,29656=>1000,29657=>1000,29658=>1000,29659=>1000,29660=>1000,29661=>1000,29662=>1000,29663=>1000,29664=>1000,29665=>1000,29666=>1000,29667=>1000,29668=>1000,
-	29669=>1000,29670=>1000,29671=>1000,29672=>1000,29673=>1000,29674=>1000,29675=>1000,29676=>1000,29677=>1000,29678=>1000,29679=>1000,29680=>1000,29681=>1000,29682=>1000,29683=>1000,29684=>1000,
-	29685=>1000,29686=>1000,29687=>1000,29688=>1000,29689=>1000,29690=>1000,29691=>1000,29692=>1000,29693=>1000,29694=>1000,29695=>1000,29696=>1000,29697=>1000,29698=>1000,29699=>1000,29700=>1000,
-	29701=>1000,29702=>1000,29703=>1000,29704=>1000,29705=>1000,29706=>1000,29707=>1000,29708=>1000,29709=>1000,29710=>1000,29711=>1000,29712=>1000,29713=>1000,29714=>1000,29715=>1000,29716=>1000,
-	29717=>1000,29718=>1000,29719=>1000,29720=>1000,29721=>1000,29722=>1000,29723=>1000,29724=>1000,29725=>1000,29726=>1000,29727=>1000,29728=>1000,29729=>1000,29730=>1000,29731=>1000,29732=>1000,
-	29733=>1000,29734=>1000,29735=>1000,29736=>1000,29737=>1000,29738=>1000,29739=>1000,29740=>1000,29741=>1000,29742=>1000,29743=>1000,29744=>1000,29745=>1000,29746=>1000,29747=>1000,29748=>1000,
-	29749=>1000,29750=>1000,29751=>1000,29752=>1000,29753=>1000,29754=>1000,29755=>1000,29756=>1000,29757=>1000,29758=>1000,29759=>1000,29760=>1000,29761=>1000,29762=>1000,29763=>1000,29764=>1000,
-	29765=>1000,29766=>1000,29767=>1000,29768=>1000,29769=>1000,29770=>1000,29771=>1000,29772=>1000,29773=>1000,29774=>1000,29775=>1000,29776=>1000,29777=>1000,29778=>1000,29779=>1000,29780=>1000,
-	29781=>1000,29782=>1000,29783=>1000,29784=>1000,29785=>1000,29786=>1000,29787=>1000,29788=>1000,29789=>1000,29790=>1000,29791=>1000,29792=>1000,29793=>1000,29794=>1000,29795=>1000,29796=>1000,
-	29797=>1000,29798=>1000,29799=>1000,29800=>1000,29801=>1000,29802=>1000,29803=>1000,29804=>1000,29805=>1000,29806=>1000,29807=>1000,29808=>1000,29809=>1000,29810=>1000,29811=>1000,29812=>1000,
-	29813=>1000,29814=>1000,29815=>1000,29816=>1000,29817=>1000,29818=>1000,29819=>1000,29820=>1000,29821=>1000,29822=>1000,29823=>1000,29824=>1000,29825=>1000,29826=>1000,29827=>1000,29828=>1000,
-	29829=>1000,29830=>1000,29831=>1000,29832=>1000,29833=>1000,29834=>1000,29835=>1000,29836=>1000,29837=>1000,29838=>1000,29839=>1000,29840=>1000,29841=>1000,29842=>1000,29843=>1000,29844=>1000,
-	29845=>1000,29846=>1000,29847=>1000,29848=>1000,29849=>1000,29850=>1000,29851=>1000,29852=>1000,29853=>1000,29854=>1000,29855=>1000,29856=>1000,29857=>1000,29858=>1000,29859=>1000,29860=>1000,
-	29861=>1000,29862=>1000,29863=>1000,29864=>1000,29865=>1000,29866=>1000,29867=>1000,29868=>1000,29869=>1000,29870=>1000,29871=>1000,29872=>1000,29873=>1000,29874=>1000,29875=>1000,29876=>1000,
-	29877=>1000,29878=>1000,29879=>1000,29880=>1000,29881=>1000,29882=>1000,29883=>1000,29884=>1000,29885=>1000,29886=>1000,29887=>1000,29888=>1000,29889=>1000,29890=>1000,29891=>1000,29892=>1000,
-	29893=>1000,29894=>1000,29895=>1000,29896=>1000,29897=>1000,29898=>1000,29899=>1000,29900=>1000,29901=>1000,29902=>1000,29903=>1000,29904=>1000,29905=>1000,29906=>1000,29907=>1000,29908=>1000,
-	29909=>1000,29910=>1000,29911=>1000,29912=>1000,29913=>1000,29914=>1000,29915=>1000,29916=>1000,29917=>1000,29918=>1000,29919=>1000,29920=>1000,29921=>1000,29922=>1000,29923=>1000,29924=>1000,
-	29925=>1000,29926=>1000,29927=>1000,29928=>1000,29929=>1000,29930=>1000,29931=>1000,29932=>1000,29933=>1000,29934=>1000,29935=>1000,29936=>1000,29937=>1000,29938=>1000,29939=>1000,29940=>1000,
-	29941=>1000,29942=>1000,29943=>1000,29944=>1000,29945=>1000,29946=>1000,29947=>1000,29948=>1000,29949=>1000,29950=>1000,29951=>1000,29952=>1000,29953=>1000,29954=>1000,29955=>1000,29956=>1000,
-	29957=>1000,29958=>1000,29959=>1000,29960=>1000,29961=>1000,29962=>1000,29963=>1000,29964=>1000,29965=>1000,29966=>1000,29967=>1000,29968=>1000,29969=>1000,29970=>1000,29971=>1000,29972=>1000,
-	29973=>1000,29974=>1000,29975=>1000,29976=>1000,29977=>1000,29978=>1000,29979=>1000,29980=>1000,29981=>1000,29982=>1000,29983=>1000,29984=>1000,29985=>1000,29986=>1000,29987=>1000,29988=>1000,
-	29989=>1000,29990=>1000,29991=>1000,29992=>1000,29993=>1000,29994=>1000,29995=>1000,29996=>1000,29997=>1000,29998=>1000,29999=>1000,30000=>1000,30001=>1000,30002=>1000,30003=>1000,30004=>1000,
-	30005=>1000,30006=>1000,30007=>1000,30008=>1000,30009=>1000,30010=>1000,30011=>1000,30012=>1000,30013=>1000,30014=>1000,30015=>1000,30016=>1000,30017=>1000,30018=>1000,30019=>1000,30020=>1000,
-	30021=>1000,30022=>1000,30023=>1000,30024=>1000,30025=>1000,30026=>1000,30027=>1000,30028=>1000,30029=>1000,30030=>1000,30031=>1000,30032=>1000,30033=>1000,30034=>1000,30035=>1000,30036=>1000,
-	30037=>1000,30038=>1000,30039=>1000,30040=>1000,30041=>1000,30042=>1000,30043=>1000,30044=>1000,30045=>1000,30046=>1000,30047=>1000,30048=>1000,30049=>1000,30050=>1000,30051=>1000,30052=>1000,
-	30053=>1000,30054=>1000,30055=>1000,30056=>1000,30057=>1000,30058=>1000,30059=>1000,30060=>1000,30061=>1000,30062=>1000,30063=>1000,30064=>1000,30065=>1000,30066=>1000,30067=>1000,30068=>1000,
-	30069=>1000,30070=>1000,30071=>1000,30072=>1000,30073=>1000,30074=>1000,30075=>1000,30076=>1000,30077=>1000,30078=>1000,30079=>1000,30080=>1000,30081=>1000,30082=>1000,30083=>1000,30084=>1000,
-	30085=>1000,30086=>1000,30087=>1000,30088=>1000,30089=>1000,30090=>1000,30091=>1000,30092=>1000,30093=>1000,30094=>1000,30095=>1000,30096=>1000,30097=>1000,30098=>1000,30099=>1000,30100=>1000,
-	30101=>1000,30102=>1000,30103=>1000,30104=>1000,30105=>1000,30106=>1000,30107=>1000,30108=>1000,30109=>1000,30110=>1000,30111=>1000,30112=>1000,30113=>1000,30114=>1000,30115=>1000,30116=>1000,
-	30117=>1000,30118=>1000,30119=>1000,30120=>1000,30121=>1000,30122=>1000,30123=>1000,30124=>1000,30125=>1000,30126=>1000,30127=>1000,30128=>1000,30129=>1000,30130=>1000,30131=>1000,30132=>1000,
-	30133=>1000,30134=>1000,30135=>1000,30136=>1000,30137=>1000,30138=>1000,30139=>1000,30140=>1000,30141=>1000,30142=>1000,30143=>1000,30144=>1000,30145=>1000,30146=>1000,30147=>1000,30148=>1000,
-	30149=>1000,30150=>1000,30151=>1000,30152=>1000,30153=>1000,30154=>1000,30155=>1000,30156=>1000,30157=>1000,30158=>1000,30159=>1000,30160=>1000,30161=>1000,30162=>1000,30163=>1000,30164=>1000,
-	30165=>1000,30166=>1000,30167=>1000,30168=>1000,30169=>1000,30170=>1000,30171=>1000,30172=>1000,30173=>1000,30174=>1000,30175=>1000,30176=>1000,30177=>1000,30178=>1000,30179=>1000,30180=>1000,
-	30181=>1000,30182=>1000,30183=>1000,30184=>1000,30185=>1000,30186=>1000,30187=>1000,30188=>1000,30189=>1000,30190=>1000,30191=>1000,30192=>1000,30193=>1000,30194=>1000,30195=>1000,30196=>1000,
-	30197=>1000,30198=>1000,30199=>1000,30200=>1000,30201=>1000,30202=>1000,30203=>1000,30204=>1000,30205=>1000,30206=>1000,30207=>1000,30208=>1000,30209=>1000,30210=>1000,30211=>1000,30212=>1000,
-	30213=>1000,30214=>1000,30215=>1000,30216=>1000,30217=>1000,30218=>1000,30219=>1000,30220=>1000,30221=>1000,30222=>1000,30223=>1000,30224=>1000,30225=>1000,30226=>1000,30227=>1000,30228=>1000,
-	30229=>1000,30230=>1000,30231=>1000,30232=>1000,30233=>1000,30234=>1000,30235=>1000,30236=>1000,30237=>1000,30238=>1000,30239=>1000,30240=>1000,30241=>1000,30242=>1000,30243=>1000,30244=>1000,
-	30245=>1000,30246=>1000,30247=>1000,30248=>1000,30249=>1000,30250=>1000,30251=>1000,30252=>1000,30253=>1000,30254=>1000,30255=>1000,30256=>1000,30257=>1000,30258=>1000,30259=>1000,30260=>1000,
-	30261=>1000,30262=>1000,30263=>1000,30264=>1000,30265=>1000,30266=>1000,30267=>1000,30268=>1000,30269=>1000,30270=>1000,30271=>1000,30272=>1000,30273=>1000,30274=>1000,30275=>1000,30276=>1000,
-	30277=>1000,30278=>1000,30279=>1000,30280=>1000,30281=>1000,30282=>1000,30283=>1000,30284=>1000,30285=>1000,30286=>1000,30287=>1000,30288=>1000,30289=>1000,30290=>1000,30291=>1000,30292=>1000,
-	30293=>1000,30294=>1000,30295=>1000,30296=>1000,30297=>1000,30298=>1000,30299=>1000,30300=>1000,30301=>1000,30302=>1000,30303=>1000,30304=>1000,30305=>1000,30306=>1000,30307=>1000,30308=>1000,
-	30309=>1000,30310=>1000,30311=>1000,30312=>1000,30313=>1000,30314=>1000,30315=>1000,30316=>1000,30317=>1000,30318=>1000,30319=>1000,30320=>1000,30321=>1000,30322=>1000,30323=>1000,30324=>1000,
-	30325=>1000,30326=>1000,30327=>1000,30328=>1000,30329=>1000,30330=>1000,30331=>1000,30332=>1000,30333=>1000,30334=>1000,30335=>1000,30336=>1000,30337=>1000,30338=>1000,30339=>1000,30340=>1000,
-	30341=>1000,30342=>1000,30343=>1000,30344=>1000,30345=>1000,30346=>1000,30347=>1000,30348=>1000,30349=>1000,30350=>1000,30351=>1000,30352=>1000,30353=>1000,30354=>1000,30355=>1000,30356=>1000,
-	30357=>1000,30358=>1000,30359=>1000,30360=>1000,30361=>1000,30362=>1000,30363=>1000,30364=>1000,30365=>1000,30366=>1000,30367=>1000,30368=>1000,30369=>1000,30370=>1000,30371=>1000,30372=>1000,
-	30373=>1000,30374=>1000,30375=>1000,30376=>1000,30377=>1000,30378=>1000,30379=>1000,30380=>1000,30381=>1000,30382=>1000,30383=>1000,30384=>1000,30385=>1000,30386=>1000,30387=>1000,30388=>1000,
-	30389=>1000,30390=>1000,30391=>1000,30392=>1000,30393=>1000,30394=>1000,30395=>1000,30396=>1000,30397=>1000,30398=>1000,30399=>1000,30400=>1000,30401=>1000,30402=>1000,30403=>1000,30404=>1000,
-	30405=>1000,30406=>1000,30407=>1000,30408=>1000,30409=>1000,30410=>1000,30411=>1000,30412=>1000,30413=>1000,30414=>1000,30415=>1000,30416=>1000,30417=>1000,30418=>1000,30419=>1000,30420=>1000,
-	30421=>1000,30422=>1000,30423=>1000,30424=>1000,30425=>1000,30426=>1000,30427=>1000,30428=>1000,30429=>1000,30430=>1000,30431=>1000,30432=>1000,30433=>1000,30434=>1000,30435=>1000,30436=>1000,
-	30437=>1000,30438=>1000,30439=>1000,30440=>1000,30441=>1000,30442=>1000,30443=>1000,30444=>1000,30445=>1000,30446=>1000,30447=>1000,30448=>1000,30449=>1000,30450=>1000,30451=>1000,30452=>1000,
-	30453=>1000,30454=>1000,30455=>1000,30456=>1000,30457=>1000,30458=>1000,30459=>1000,30460=>1000,30461=>1000,30462=>1000,30463=>1000,30464=>1000,30465=>1000,30466=>1000,30467=>1000,30468=>1000,
-	30469=>1000,30470=>1000,30471=>1000,30472=>1000,30473=>1000,30474=>1000,30475=>1000,30476=>1000,30477=>1000,30478=>1000,30479=>1000,30480=>1000,30481=>1000,30482=>1000,30483=>1000,30484=>1000,
-	30485=>1000,30486=>1000,30487=>1000,30488=>1000,30489=>1000,30490=>1000,30491=>1000,30492=>1000,30493=>1000,30494=>1000,30495=>1000,30496=>1000,30497=>1000,30498=>1000,30499=>1000,30500=>1000,
-	30501=>1000,30502=>1000,30503=>1000,30504=>1000,30505=>1000,30506=>1000,30507=>1000,30508=>1000,30509=>1000,30510=>1000,30511=>1000,30512=>1000,30513=>1000,30514=>1000,30515=>1000,30516=>1000,
-	30517=>1000,30518=>1000,30519=>1000,30520=>1000,30521=>1000,30522=>1000,30523=>1000,30524=>1000,30525=>1000,30526=>1000,30527=>1000,30528=>1000,30529=>1000,30530=>1000,30531=>1000,30532=>1000,
-	30533=>1000,30534=>1000,30535=>1000,30536=>1000,30537=>1000,30538=>1000,30539=>1000,30540=>1000,30541=>1000,30542=>1000,30543=>1000,30544=>1000,30545=>1000,30546=>1000,30547=>1000,30548=>1000,
-	30549=>1000,30550=>1000,30551=>1000,30552=>1000,30553=>1000,30554=>1000,30555=>1000,30556=>1000,30557=>1000,30558=>1000,30559=>1000,30560=>1000,30561=>1000,30562=>1000,30563=>1000,30564=>1000,
-	30565=>1000,30566=>1000,30567=>1000,30568=>1000,30569=>1000,30570=>1000,30571=>1000,30572=>1000,30573=>1000,30574=>1000,30575=>1000,30576=>1000,30577=>1000,30578=>1000,30579=>1000,30580=>1000,
-	30581=>1000,30582=>1000,30583=>1000,30584=>1000,30585=>1000,30586=>1000,30587=>1000,30588=>1000,30589=>1000,30590=>1000,30591=>1000,30592=>1000,30593=>1000,30594=>1000,30595=>1000,30596=>1000,
-	30597=>1000,30598=>1000,30599=>1000,30600=>1000,30601=>1000,30602=>1000,30603=>1000,30604=>1000,30605=>1000,30606=>1000,30607=>1000,30608=>1000,30609=>1000,30610=>1000,30611=>1000,30612=>1000,
-	30613=>1000,30614=>1000,30615=>1000,30616=>1000,30617=>1000,30618=>1000,30619=>1000,30620=>1000,30621=>1000,30622=>1000,30623=>1000,30624=>1000,30625=>1000,30626=>1000,30627=>1000,30628=>1000,
-	30629=>1000,30630=>1000,30631=>1000,30632=>1000,30633=>1000,30634=>1000,30635=>1000,30636=>1000,30637=>1000,30638=>1000,30639=>1000,30640=>1000,30641=>1000,30642=>1000,30643=>1000,30644=>1000,
-	30645=>1000,30646=>1000,30647=>1000,30648=>1000,30649=>1000,30650=>1000,30651=>1000,30652=>1000,30653=>1000,30654=>1000,30655=>1000,30656=>1000,30657=>1000,30658=>1000,30659=>1000,30660=>1000,
-	30661=>1000,30662=>1000,30663=>1000,30664=>1000,30665=>1000,30666=>1000,30667=>1000,30668=>1000,30669=>1000,30670=>1000,30671=>1000,30672=>1000,30673=>1000,30674=>1000,30675=>1000,30676=>1000,
-	30677=>1000,30678=>1000,30679=>1000,30680=>1000,30681=>1000,30682=>1000,30683=>1000,30684=>1000,30685=>1000,30686=>1000,30687=>1000,30688=>1000,30689=>1000,30690=>1000,30691=>1000,30692=>1000,
-	30693=>1000,30694=>1000,30695=>1000,30696=>1000,30697=>1000,30698=>1000,30699=>1000,30700=>1000,30701=>1000,30702=>1000,30703=>1000,30704=>1000,30705=>1000,30706=>1000,30707=>1000,30708=>1000,
-	30709=>1000,30710=>1000,30711=>1000,30712=>1000,30713=>1000,30714=>1000,30715=>1000,30716=>1000,30717=>1000,30718=>1000,30719=>1000,30720=>1000,30721=>1000,30722=>1000,30723=>1000,30724=>1000,
-	30725=>1000,30726=>1000,30727=>1000,30728=>1000,30729=>1000,30730=>1000,30731=>1000,30732=>1000,30733=>1000,30734=>1000,30735=>1000,30736=>1000,30737=>1000,30738=>1000,30739=>1000,30740=>1000,
-	30741=>1000,30742=>1000,30743=>1000,30744=>1000,30745=>1000,30746=>1000,30747=>1000,30748=>1000,30749=>1000,30750=>1000,30751=>1000,30752=>1000,30753=>1000,30754=>1000,30755=>1000,30756=>1000,
-	30757=>1000,30758=>1000,30759=>1000,30760=>1000,30761=>1000,30762=>1000,30763=>1000,30764=>1000,30765=>1000,30766=>1000,30767=>1000,30768=>1000,30769=>1000,30770=>1000,30771=>1000,30772=>1000,
-	30773=>1000,30774=>1000,30775=>1000,30776=>1000,30777=>1000,30778=>1000,30779=>1000,30780=>1000,30781=>1000,30782=>1000,30783=>1000,30784=>1000,30785=>1000,30786=>1000,30787=>1000,30788=>1000,
-	30789=>1000,30790=>1000,30791=>1000,30792=>1000,30793=>1000,30794=>1000,30795=>1000,30796=>1000,30797=>1000,30798=>1000,30799=>1000,30800=>1000,30801=>1000,30802=>1000,30803=>1000,30804=>1000,
-	30805=>1000,30806=>1000,30807=>1000,30808=>1000,30809=>1000,30810=>1000,30811=>1000,30812=>1000,30813=>1000,30814=>1000,30815=>1000,30816=>1000,30817=>1000,30818=>1000,30819=>1000,30820=>1000,
-	30821=>1000,30822=>1000,30823=>1000,30824=>1000,30825=>1000,30826=>1000,30827=>1000,30828=>1000,30829=>1000,30830=>1000,30831=>1000,30832=>1000,30833=>1000,30834=>1000,30835=>1000,30836=>1000,
-	30837=>1000,30838=>1000,30839=>1000,30840=>1000,30841=>1000,30842=>1000,30843=>1000,30844=>1000,30845=>1000,30846=>1000,30847=>1000,30848=>1000,30849=>1000,30850=>1000,30851=>1000,30852=>1000,
-	30853=>1000,30854=>1000,30855=>1000,30856=>1000,30857=>1000,30858=>1000,30859=>1000,30860=>1000,30861=>1000,30862=>1000,30863=>1000,30864=>1000,30865=>1000,30866=>1000,30867=>1000,30868=>1000,
-	30869=>1000,30870=>1000,30871=>1000,30872=>1000,30873=>1000,30874=>1000,30875=>1000,30876=>1000,30877=>1000,30878=>1000,30879=>1000,30880=>1000,30881=>1000,30882=>1000,30883=>1000,30884=>1000,
-	30885=>1000,30886=>1000,30887=>1000,30888=>1000,30889=>1000,30890=>1000,30891=>1000,30892=>1000,30893=>1000,30894=>1000,30895=>1000,30896=>1000,30897=>1000,30898=>1000,30899=>1000,30900=>1000,
-	30901=>1000,30902=>1000,30903=>1000,30904=>1000,30905=>1000,30906=>1000,30907=>1000,30908=>1000,30909=>1000,30910=>1000,30911=>1000,30912=>1000,30913=>1000,30914=>1000,30915=>1000,30916=>1000,
-	30917=>1000,30918=>1000,30919=>1000,30920=>1000,30921=>1000,30922=>1000,30923=>1000,30924=>1000,30925=>1000,30926=>1000,30927=>1000,30928=>1000,30929=>1000,30930=>1000,30931=>1000,30932=>1000,
-	30933=>1000,30934=>1000,30935=>1000,30936=>1000,30937=>1000,30938=>1000,30939=>1000,30940=>1000,30941=>1000,30942=>1000,30943=>1000,30944=>1000,30945=>1000,30946=>1000,30947=>1000,30948=>1000,
-	30949=>1000,30950=>1000,30951=>1000,30952=>1000,30953=>1000,30954=>1000,30955=>1000,30956=>1000,30957=>1000,30958=>1000,30959=>1000,30960=>1000,30961=>1000,30962=>1000,30963=>1000,30964=>1000,
-	30965=>1000,30966=>1000,30967=>1000,30968=>1000,30969=>1000,30970=>1000,30971=>1000,30972=>1000,30973=>1000,30974=>1000,30975=>1000,30976=>1000,30977=>1000,30978=>1000,30979=>1000,30980=>1000,
-	30981=>1000,30982=>1000,30983=>1000,30984=>1000,30985=>1000,30986=>1000,30987=>1000,30988=>1000,30989=>1000,30990=>1000,30991=>1000,30992=>1000,30993=>1000,30994=>1000,30995=>1000,30996=>1000,
-	30997=>1000,30998=>1000,30999=>1000,31000=>1000,31001=>1000,31002=>1000,31003=>1000,31004=>1000,31005=>1000,31006=>1000,31007=>1000,31008=>1000,31009=>1000,31010=>1000,31011=>1000,31012=>1000,
-	31013=>1000,31014=>1000,31015=>1000,31016=>1000,31017=>1000,31018=>1000,31019=>1000,31020=>1000,31021=>1000,31022=>1000,31023=>1000,31024=>1000,31025=>1000,31026=>1000,31027=>1000,31028=>1000,
-	31029=>1000,31030=>1000,31031=>1000,31032=>1000,31033=>1000,31034=>1000,31035=>1000,31036=>1000,31037=>1000,31038=>1000,31039=>1000,31040=>1000,31041=>1000,31042=>1000,31043=>1000,31044=>1000,
-	31045=>1000,31046=>1000,31047=>1000,31048=>1000,31049=>1000,31050=>1000,31051=>1000,31052=>1000,31053=>1000,31054=>1000,31055=>1000,31056=>1000,31057=>1000,31058=>1000,31059=>1000,31060=>1000,
-	31061=>1000,31062=>1000,31063=>1000,31064=>1000,31065=>1000,31066=>1000,31067=>1000,31068=>1000,31069=>1000,31070=>1000,31071=>1000,31072=>1000,31073=>1000,31074=>1000,31075=>1000,31076=>1000,
-	31077=>1000,31078=>1000,31079=>1000,31080=>1000,31081=>1000,31082=>1000,31083=>1000,31084=>1000,31085=>1000,31086=>1000,31087=>1000,31088=>1000,31089=>1000,31090=>1000,31091=>1000,31092=>1000,
-	31093=>1000,31094=>1000,31095=>1000,31096=>1000,31097=>1000,31098=>1000,31099=>1000,31100=>1000,31101=>1000,31102=>1000,31103=>1000,31104=>1000,31105=>1000,31106=>1000,31107=>1000,31108=>1000,
-	31109=>1000,31110=>1000,31111=>1000,31112=>1000,31113=>1000,31114=>1000,31115=>1000,31116=>1000,31117=>1000,31118=>1000,31119=>1000,31120=>1000,31121=>1000,31122=>1000,31123=>1000,31124=>1000,
-	31125=>1000,31126=>1000,31127=>1000,31128=>1000,31129=>1000,31130=>1000,31131=>1000,31132=>1000,31133=>1000,31134=>1000,31135=>1000,31136=>1000,31137=>1000,31138=>1000,31139=>1000,31140=>1000,
-	31141=>1000,31142=>1000,31143=>1000,31144=>1000,31145=>1000,31146=>1000,31147=>1000,31148=>1000,31149=>1000,31150=>1000,31151=>1000,31152=>1000,31153=>1000,31154=>1000,31155=>1000,31156=>1000,
-	31157=>1000,31158=>1000,31159=>1000,31160=>1000,31161=>1000,31162=>1000,31163=>1000,31164=>1000,31165=>1000,31166=>1000,31167=>1000,31168=>1000,31169=>1000,31170=>1000,31171=>1000,31172=>1000,
-	31173=>1000,31174=>1000,31175=>1000,31176=>1000,31177=>1000,31178=>1000,31179=>1000,31180=>1000,31181=>1000,31182=>1000,31183=>1000,31184=>1000,31185=>1000,31186=>1000,31187=>1000,31188=>1000,
-	31189=>1000,31190=>1000,31191=>1000,31192=>1000,31193=>1000,31194=>1000,31195=>1000,31196=>1000,31197=>1000,31198=>1000,31199=>1000,31200=>1000,31201=>1000,31202=>1000,31203=>1000,31204=>1000,
-	31205=>1000,31206=>1000,31207=>1000,31208=>1000,31209=>1000,31210=>1000,31211=>1000,31212=>1000,31213=>1000,31214=>1000,31215=>1000,31216=>1000,31217=>1000,31218=>1000,31219=>1000,31220=>1000,
-	31221=>1000,31222=>1000,31223=>1000,31224=>1000,31225=>1000,31226=>1000,31227=>1000,31228=>1000,31229=>1000,31230=>1000,31231=>1000,31232=>1000,31233=>1000,31234=>1000,31235=>1000,31236=>1000,
-	31237=>1000,31238=>1000,31239=>1000,31240=>1000,31241=>1000,31242=>1000,31243=>1000,31244=>1000,31245=>1000,31246=>1000,31247=>1000,31248=>1000,31249=>1000,31250=>1000,31251=>1000,31252=>1000,
-	31253=>1000,31254=>1000,31255=>1000,31256=>1000,31257=>1000,31258=>1000,31259=>1000,31260=>1000,31261=>1000,31262=>1000,31263=>1000,31264=>1000,31265=>1000,31266=>1000,31267=>1000,31268=>1000,
-	31269=>1000,31270=>1000,31271=>1000,31272=>1000,31273=>1000,31274=>1000,31275=>1000,31276=>1000,31277=>1000,31278=>1000,31279=>1000,31280=>1000,31281=>1000,31282=>1000,31283=>1000,31284=>1000,
-	31285=>1000,31286=>1000,31287=>1000,31288=>1000,31289=>1000,31290=>1000,31291=>1000,31292=>1000,31293=>1000,31294=>1000,31295=>1000,31296=>1000,31297=>1000,31298=>1000,31299=>1000,31300=>1000,
-	31301=>1000,31302=>1000,31303=>1000,31304=>1000,31305=>1000,31306=>1000,31307=>1000,31308=>1000,31309=>1000,31310=>1000,31311=>1000,31312=>1000,31313=>1000,31314=>1000,31315=>1000,31316=>1000,
-	31317=>1000,31318=>1000,31319=>1000,31320=>1000,31321=>1000,31322=>1000,31323=>1000,31324=>1000,31325=>1000,31326=>1000,31327=>1000,31328=>1000,31329=>1000,31330=>1000,31331=>1000,31332=>1000,
-	31333=>1000,31334=>1000,31335=>1000,31336=>1000,31337=>1000,31338=>1000,31339=>1000,31340=>1000,31341=>1000,31342=>1000,31343=>1000,31344=>1000,31345=>1000,31346=>1000,31347=>1000,31348=>1000,
-	31349=>1000,31350=>1000,31351=>1000,31352=>1000,31353=>1000,31354=>1000,31355=>1000,31356=>1000,31357=>1000,31358=>1000,31359=>1000,31360=>1000,31361=>1000,31362=>1000,31363=>1000,31364=>1000,
-	31365=>1000,31366=>1000,31367=>1000,31368=>1000,31369=>1000,31370=>1000,31371=>1000,31372=>1000,31373=>1000,31374=>1000,31375=>1000,31376=>1000,31377=>1000,31378=>1000,31379=>1000,31380=>1000,
-	31381=>1000,31382=>1000,31383=>1000,31384=>1000,31385=>1000,31386=>1000,31387=>1000,31388=>1000,31389=>1000,31390=>1000,31391=>1000,31392=>1000,31393=>1000,31394=>1000,31395=>1000,31396=>1000,
-	31397=>1000,31398=>1000,31399=>1000,31400=>1000,31401=>1000,31402=>1000,31403=>1000,31404=>1000,31405=>1000,31406=>1000,31407=>1000,31408=>1000,31409=>1000,31410=>1000,31411=>1000,31412=>1000,
-	31413=>1000,31414=>1000,31415=>1000,31416=>1000,31417=>1000,31418=>1000,31419=>1000,31420=>1000,31421=>1000,31422=>1000,31423=>1000,31424=>1000,31425=>1000,31426=>1000,31427=>1000,31428=>1000,
-	31429=>1000,31430=>1000,31431=>1000,31432=>1000,31433=>1000,31434=>1000,31435=>1000,31436=>1000,31437=>1000,31438=>1000,31439=>1000,31440=>1000,31441=>1000,31442=>1000,31443=>1000,31444=>1000,
-	31445=>1000,31446=>1000,31447=>1000,31448=>1000,31449=>1000,31450=>1000,31451=>1000,31452=>1000,31453=>1000,31454=>1000,31455=>1000,31456=>1000,31457=>1000,31458=>1000,31459=>1000,31460=>1000,
-	31461=>1000,31462=>1000,31463=>1000,31464=>1000,31465=>1000,31466=>1000,31467=>1000,31468=>1000,31469=>1000,31470=>1000,31471=>1000,31472=>1000,31473=>1000,31474=>1000,31475=>1000,31476=>1000,
-	31477=>1000,31478=>1000,31479=>1000,31480=>1000,31481=>1000,31482=>1000,31483=>1000,31484=>1000,31485=>1000,31486=>1000,31487=>1000,31488=>1000,31489=>1000,31490=>1000,31491=>1000,31492=>1000,
-	31493=>1000,31494=>1000,31495=>1000,31496=>1000,31497=>1000,31498=>1000,31499=>1000,31500=>1000,31501=>1000,31502=>1000,31503=>1000,31504=>1000,31505=>1000,31506=>1000,31507=>1000,31508=>1000,
-	31509=>1000,31510=>1000,31511=>1000,31512=>1000,31513=>1000,31514=>1000,31515=>1000,31516=>1000,31517=>1000,31518=>1000,31519=>1000,31520=>1000,31521=>1000,31522=>1000,31523=>1000,31524=>1000,
-	31525=>1000,31526=>1000,31527=>1000,31528=>1000,31529=>1000,31530=>1000,31531=>1000,31532=>1000,31533=>1000,31534=>1000,31535=>1000,31536=>1000,31537=>1000,31538=>1000,31539=>1000,31540=>1000,
-	31541=>1000,31542=>1000,31543=>1000,31544=>1000,31545=>1000,31546=>1000,31547=>1000,31548=>1000,31549=>1000,31550=>1000,31551=>1000,31552=>1000,31553=>1000,31554=>1000,31555=>1000,31556=>1000,
-	31557=>1000,31558=>1000,31559=>1000,31560=>1000,31561=>1000,31562=>1000,31563=>1000,31564=>1000,31565=>1000,31566=>1000,31567=>1000,31568=>1000,31569=>1000,31570=>1000,31571=>1000,31572=>1000,
-	31573=>1000,31574=>1000,31575=>1000,31576=>1000,31577=>1000,31578=>1000,31579=>1000,31580=>1000,31581=>1000,31582=>1000,31583=>1000,31584=>1000,31585=>1000,31586=>1000,31587=>1000,31588=>1000,
-	31589=>1000,31590=>1000,31591=>1000,31592=>1000,31593=>1000,31594=>1000,31595=>1000,31596=>1000,31597=>1000,31598=>1000,31599=>1000,31600=>1000,31601=>1000,31602=>1000,31603=>1000,31604=>1000,
-	31605=>1000,31606=>1000,31607=>1000,31608=>1000,31609=>1000,31610=>1000,31611=>1000,31612=>1000,31613=>1000,31614=>1000,31615=>1000,31616=>1000,31617=>1000,31618=>1000,31619=>1000,31620=>1000,
-	31621=>1000,31622=>1000,31623=>1000,31624=>1000,31625=>1000,31626=>1000,31627=>1000,31628=>1000,31629=>1000,31630=>1000,31631=>1000,31632=>1000,31633=>1000,31634=>1000,31635=>1000,31636=>1000,
-	31637=>1000,31638=>1000,31639=>1000,31640=>1000,31641=>1000,31642=>1000,31643=>1000,31644=>1000,31645=>1000,31646=>1000,31647=>1000,31648=>1000,31649=>1000,31650=>1000,31651=>1000,31652=>1000,
-	31653=>1000,31654=>1000,31655=>1000,31656=>1000,31657=>1000,31658=>1000,31659=>1000,31660=>1000,31661=>1000,31662=>1000,31663=>1000,31664=>1000,31665=>1000,31666=>1000,31667=>1000,31668=>1000,
-	31669=>1000,31670=>1000,31671=>1000,31672=>1000,31673=>1000,31674=>1000,31675=>1000,31676=>1000,31677=>1000,31678=>1000,31679=>1000,31680=>1000,31681=>1000,31682=>1000,31683=>1000,31684=>1000,
-	31685=>1000,31686=>1000,31687=>1000,31688=>1000,31689=>1000,31690=>1000,31691=>1000,31692=>1000,31693=>1000,31694=>1000,31695=>1000,31696=>1000,31697=>1000,31698=>1000,31699=>1000,31700=>1000,
-	31701=>1000,31702=>1000,31703=>1000,31704=>1000,31705=>1000,31706=>1000,31707=>1000,31708=>1000,31709=>1000,31710=>1000,31711=>1000,31712=>1000,31713=>1000,31714=>1000,31715=>1000,31716=>1000,
-	31717=>1000,31718=>1000,31719=>1000,31720=>1000,31721=>1000,31722=>1000,31723=>1000,31724=>1000,31725=>1000,31726=>1000,31727=>1000,31728=>1000,31729=>1000,31730=>1000,31731=>1000,31732=>1000,
-	31733=>1000,31734=>1000,31735=>1000,31736=>1000,31737=>1000,31738=>1000,31739=>1000,31740=>1000,31741=>1000,31742=>1000,31743=>1000,31744=>1000,31745=>1000,31746=>1000,31747=>1000,31748=>1000,
-	31749=>1000,31750=>1000,31751=>1000,31752=>1000,31753=>1000,31754=>1000,31755=>1000,31756=>1000,31757=>1000,31758=>1000,31759=>1000,31760=>1000,31761=>1000,31762=>1000,31763=>1000,31764=>1000,
-	31765=>1000,31766=>1000,31767=>1000,31768=>1000,31769=>1000,31770=>1000,31771=>1000,31772=>1000,31773=>1000,31774=>1000,31775=>1000,31776=>1000,31777=>1000,31778=>1000,31779=>1000,31780=>1000,
-	31781=>1000,31782=>1000,31783=>1000,31784=>1000,31785=>1000,31786=>1000,31787=>1000,31788=>1000,31789=>1000,31790=>1000,31791=>1000,31792=>1000,31793=>1000,31794=>1000,31795=>1000,31796=>1000,
-	31797=>1000,31798=>1000,31799=>1000,31800=>1000,31801=>1000,31802=>1000,31803=>1000,31804=>1000,31805=>1000,31806=>1000,31807=>1000,31808=>1000,31809=>1000,31810=>1000,31811=>1000,31812=>1000,
-	31813=>1000,31814=>1000,31815=>1000,31816=>1000,31817=>1000,31818=>1000,31819=>1000,31820=>1000,31821=>1000,31822=>1000,31823=>1000,31824=>1000,31825=>1000,31826=>1000,31827=>1000,31828=>1000,
-	31829=>1000,31830=>1000,31831=>1000,31832=>1000,31833=>1000,31834=>1000,31835=>1000,31836=>1000,31837=>1000,31838=>1000,31839=>1000,31840=>1000,31841=>1000,31842=>1000,31843=>1000,31844=>1000,
-	31845=>1000,31846=>1000,31847=>1000,31848=>1000,31849=>1000,31850=>1000,31851=>1000,31852=>1000,31853=>1000,31854=>1000,31855=>1000,31856=>1000,31857=>1000,31858=>1000,31859=>1000,31860=>1000,
-	31861=>1000,31862=>1000,31863=>1000,31864=>1000,31865=>1000,31866=>1000,31867=>1000,31868=>1000,31869=>1000,31870=>1000,31871=>1000,31872=>1000,31873=>1000,31874=>1000,31875=>1000,31876=>1000,
-	31877=>1000,31878=>1000,31879=>1000,31880=>1000,31881=>1000,31882=>1000,31883=>1000,31884=>1000,31885=>1000,31886=>1000,31887=>1000,31888=>1000,31889=>1000,31890=>1000,31891=>1000,31892=>1000,
-	31893=>1000,31894=>1000,31895=>1000,31896=>1000,31897=>1000,31898=>1000,31899=>1000,31900=>1000,31901=>1000,31902=>1000,31903=>1000,31904=>1000,31905=>1000,31906=>1000,31907=>1000,31908=>1000,
-	31909=>1000,31910=>1000,31911=>1000,31912=>1000,31913=>1000,31914=>1000,31915=>1000,31916=>1000,31917=>1000,31918=>1000,31919=>1000,31920=>1000,31921=>1000,31922=>1000,31923=>1000,31924=>1000,
-	31925=>1000,31926=>1000,31927=>1000,31928=>1000,31929=>1000,31930=>1000,31931=>1000,31932=>1000,31933=>1000,31934=>1000,31935=>1000,31936=>1000,31937=>1000,31938=>1000,31939=>1000,31940=>1000,
-	31941=>1000,31942=>1000,31943=>1000,31944=>1000,31945=>1000,31946=>1000,31947=>1000,31948=>1000,31949=>1000,31950=>1000,31951=>1000,31952=>1000,31953=>1000,31954=>1000,31955=>1000,31956=>1000,
-	31957=>1000,31958=>1000,31959=>1000,31960=>1000,31961=>1000,31962=>1000,31963=>1000,31964=>1000,31965=>1000,31966=>1000,31967=>1000,31968=>1000,31969=>1000,31970=>1000,31971=>1000,31972=>1000,
-	31973=>1000,31974=>1000,31975=>1000,31976=>1000,31977=>1000,31978=>1000,31979=>1000,31980=>1000,31981=>1000,31982=>1000,31983=>1000,31984=>1000,31985=>1000,31986=>1000,31987=>1000,31988=>1000,
-	31989=>1000,31990=>1000,31991=>1000,31992=>1000,31993=>1000,31994=>1000,31995=>1000,31996=>1000,31997=>1000,31998=>1000,31999=>1000,32000=>1000,32001=>1000,32002=>1000,32003=>1000,32004=>1000,
-	32005=>1000,32006=>1000,32007=>1000,32008=>1000,32009=>1000,32010=>1000,32011=>1000,32012=>1000,32013=>1000,32014=>1000,32015=>1000,32016=>1000,32017=>1000,32018=>1000,32019=>1000,32020=>1000,
-	32021=>1000,32022=>1000,32023=>1000,32024=>1000,32025=>1000,32026=>1000,32027=>1000,32028=>1000,32029=>1000,32030=>1000,32031=>1000,32032=>1000,32033=>1000,32034=>1000,32035=>1000,32036=>1000,
-	32037=>1000,32038=>1000,32039=>1000,32040=>1000,32041=>1000,32042=>1000,32043=>1000,32044=>1000,32045=>1000,32046=>1000,32047=>1000,32048=>1000,32049=>1000,32050=>1000,32051=>1000,32052=>1000,
-	32053=>1000,32054=>1000,32055=>1000,32056=>1000,32057=>1000,32058=>1000,32059=>1000,32060=>1000,32061=>1000,32062=>1000,32063=>1000,32064=>1000,32065=>1000,32066=>1000,32067=>1000,32068=>1000,
-	32069=>1000,32070=>1000,32071=>1000,32072=>1000,32073=>1000,32074=>1000,32075=>1000,32076=>1000,32077=>1000,32078=>1000,32079=>1000,32080=>1000,32081=>1000,32082=>1000,32083=>1000,32084=>1000,
-	32085=>1000,32086=>1000,32087=>1000,32088=>1000,32089=>1000,32090=>1000,32091=>1000,32092=>1000,32093=>1000,32094=>1000,32095=>1000,32096=>1000,32097=>1000,32098=>1000,32099=>1000,32100=>1000,
-	32101=>1000,32102=>1000,32103=>1000,32104=>1000,32105=>1000,32106=>1000,32107=>1000,32108=>1000,32109=>1000,32110=>1000,32111=>1000,32112=>1000,32113=>1000,32114=>1000,32115=>1000,32116=>1000,
-	32117=>1000,32118=>1000,32119=>1000,32120=>1000,32121=>1000,32122=>1000,32123=>1000,32124=>1000,32125=>1000,32126=>1000,32127=>1000,32128=>1000,32129=>1000,32130=>1000,32131=>1000,32132=>1000,
-	32133=>1000,32134=>1000,32135=>1000,32136=>1000,32137=>1000,32138=>1000,32139=>1000,32140=>1000,32141=>1000,32142=>1000,32143=>1000,32144=>1000,32145=>1000,32146=>1000,32147=>1000,32148=>1000,
-	32149=>1000,32150=>1000,32151=>1000,32152=>1000,32153=>1000,32154=>1000,32155=>1000,32156=>1000,32157=>1000,32158=>1000,32159=>1000,32160=>1000,32161=>1000,32162=>1000,32163=>1000,32164=>1000,
-	32165=>1000,32166=>1000,32167=>1000,32168=>1000,32169=>1000,32170=>1000,32171=>1000,32172=>1000,32173=>1000,32174=>1000,32175=>1000,32176=>1000,32177=>1000,32178=>1000,32179=>1000,32180=>1000,
-	32181=>1000,32182=>1000,32183=>1000,32184=>1000,32185=>1000,32186=>1000,32187=>1000,32188=>1000,32189=>1000,32190=>1000,32191=>1000,32192=>1000,32193=>1000,32194=>1000,32195=>1000,32196=>1000,
-	32197=>1000,32198=>1000,32199=>1000,32200=>1000,32201=>1000,32202=>1000,32203=>1000,32204=>1000,32205=>1000,32206=>1000,32207=>1000,32208=>1000,32209=>1000,32210=>1000,32211=>1000,32212=>1000,
-	32213=>1000,32214=>1000,32215=>1000,32216=>1000,32217=>1000,32218=>1000,32219=>1000,32220=>1000,32221=>1000,32222=>1000,32223=>1000,32224=>1000,32225=>1000,32226=>1000,32227=>1000,32228=>1000,
-	32229=>1000,32230=>1000,32231=>1000,32232=>1000,32233=>1000,32234=>1000,32235=>1000,32236=>1000,32237=>1000,32238=>1000,32239=>1000,32240=>1000,32241=>1000,32242=>1000,32243=>1000,32244=>1000,
-	32245=>1000,32246=>1000,32247=>1000,32248=>1000,32249=>1000,32250=>1000,32251=>1000,32252=>1000,32253=>1000,32254=>1000,32255=>1000,32256=>1000,32257=>1000,32258=>1000,32259=>1000,32260=>1000,
-	32261=>1000,32262=>1000,32263=>1000,32264=>1000,32265=>1000,32266=>1000,32267=>1000,32268=>1000,32269=>1000,32270=>1000,32271=>1000,32272=>1000,32273=>1000,32274=>1000,32275=>1000,32276=>1000,
-	32277=>1000,32278=>1000,32279=>1000,32280=>1000,32281=>1000,32282=>1000,32283=>1000,32284=>1000,32285=>1000,32286=>1000,32287=>1000,32288=>1000,32289=>1000,32290=>1000,32291=>1000,32292=>1000,
-	32293=>1000,32294=>1000,32295=>1000,32296=>1000,32297=>1000,32298=>1000,32299=>1000,32300=>1000,32301=>1000,32302=>1000,32303=>1000,32304=>1000,32305=>1000,32306=>1000,32307=>1000,32308=>1000,
-	32309=>1000,32310=>1000,32311=>1000,32312=>1000,32313=>1000,32314=>1000,32315=>1000,32316=>1000,32317=>1000,32318=>1000,32319=>1000,32320=>1000,32321=>1000,32322=>1000,32323=>1000,32324=>1000,
-	32325=>1000,32326=>1000,32327=>1000,32328=>1000,32329=>1000,32330=>1000,32331=>1000,32332=>1000,32333=>1000,32334=>1000,32335=>1000,32336=>1000,32337=>1000,32338=>1000,32339=>1000,32340=>1000,
-	32341=>1000,32342=>1000,32343=>1000,32344=>1000,32345=>1000,32346=>1000,32347=>1000,32348=>1000,32349=>1000,32350=>1000,32351=>1000,32352=>1000,32353=>1000,32354=>1000,32355=>1000,32356=>1000,
-	32357=>1000,32358=>1000,32359=>1000,32360=>1000,32361=>1000,32362=>1000,32363=>1000,32364=>1000,32365=>1000,32366=>1000,32367=>1000,32368=>1000,32369=>1000,32370=>1000,32371=>1000,32372=>1000,
-	32373=>1000,32374=>1000,32375=>1000,32376=>1000,32377=>1000,32378=>1000,32379=>1000,32380=>1000,32381=>1000,32382=>1000,32383=>1000,32384=>1000,32385=>1000,32386=>1000,32387=>1000,32388=>1000,
-	32389=>1000,32390=>1000,32391=>1000,32392=>1000,32393=>1000,32394=>1000,32395=>1000,32396=>1000,32397=>1000,32398=>1000,32399=>1000,32400=>1000,32401=>1000,32402=>1000,32403=>1000,32404=>1000,
-	32405=>1000,32406=>1000,32407=>1000,32408=>1000,32409=>1000,32410=>1000,32411=>1000,32412=>1000,32413=>1000,32414=>1000,32415=>1000,32416=>1000,32417=>1000,32418=>1000,32419=>1000,32420=>1000,
-	32421=>1000,32422=>1000,32423=>1000,32424=>1000,32425=>1000,32426=>1000,32427=>1000,32428=>1000,32429=>1000,32430=>1000,32431=>1000,32432=>1000,32433=>1000,32434=>1000,32435=>1000,32436=>1000,
-	32437=>1000,32438=>1000,32439=>1000,32440=>1000,32441=>1000,32442=>1000,32443=>1000,32444=>1000,32445=>1000,32446=>1000,32447=>1000,32448=>1000,32449=>1000,32450=>1000,32451=>1000,32452=>1000,
-	32453=>1000,32454=>1000,32455=>1000,32456=>1000,32457=>1000,32458=>1000,32459=>1000,32460=>1000,32461=>1000,32462=>1000,32463=>1000,32464=>1000,32465=>1000,32466=>1000,32467=>1000,32468=>1000,
-	32469=>1000,32470=>1000,32471=>1000,32472=>1000,32473=>1000,32474=>1000,32475=>1000,32476=>1000,32477=>1000,32478=>1000,32479=>1000,32480=>1000,32481=>1000,32482=>1000,32483=>1000,32484=>1000,
-	32485=>1000,32486=>1000,32487=>1000,32488=>1000,32489=>1000,32490=>1000,32491=>1000,32492=>1000,32493=>1000,32494=>1000,32495=>1000,32496=>1000,32497=>1000,32498=>1000,32499=>1000,32500=>1000,
-	32501=>1000,32502=>1000,32503=>1000,32504=>1000,32505=>1000,32506=>1000,32507=>1000,32508=>1000,32509=>1000,32510=>1000,32511=>1000,32512=>1000,32513=>1000,32514=>1000,32515=>1000,32516=>1000,
-	32517=>1000,32518=>1000,32519=>1000,32520=>1000,32521=>1000,32522=>1000,32523=>1000,32524=>1000,32525=>1000,32526=>1000,32527=>1000,32528=>1000,32529=>1000,32530=>1000,32531=>1000,32532=>1000,
-	32533=>1000,32534=>1000,32535=>1000,32536=>1000,32537=>1000,32538=>1000,32539=>1000,32540=>1000,32541=>1000,32542=>1000,32543=>1000,32544=>1000,32545=>1000,32546=>1000,32547=>1000,32548=>1000,
-	32549=>1000,32550=>1000,32551=>1000,32552=>1000,32553=>1000,32554=>1000,32555=>1000,32556=>1000,32557=>1000,32558=>1000,32559=>1000,32560=>1000,32561=>1000,32562=>1000,32563=>1000,32564=>1000,
-	32565=>1000,32566=>1000,32567=>1000,32568=>1000,32569=>1000,32570=>1000,32571=>1000,32572=>1000,32573=>1000,32574=>1000,32575=>1000,32576=>1000,32577=>1000,32578=>1000,32579=>1000,32580=>1000,
-	32581=>1000,32582=>1000,32583=>1000,32584=>1000,32585=>1000,32586=>1000,32587=>1000,32588=>1000,32589=>1000,32590=>1000,32591=>1000,32592=>1000,32593=>1000,32594=>1000,32595=>1000,32596=>1000,
-	32597=>1000,32598=>1000,32599=>1000,32600=>1000,32601=>1000,32602=>1000,32603=>1000,32604=>1000,32605=>1000,32606=>1000,32607=>1000,32608=>1000,32609=>1000,32610=>1000,32611=>1000,32612=>1000,
-	32613=>1000,32614=>1000,32615=>1000,32616=>1000,32617=>1000,32618=>1000,32619=>1000,32620=>1000,32621=>1000,32622=>1000,32623=>1000,32624=>1000,32625=>1000,32626=>1000,32627=>1000,32628=>1000,
-	32629=>1000,32630=>1000,32631=>1000,32632=>1000,32633=>1000,32634=>1000,32635=>1000,32636=>1000,32637=>1000,32638=>1000,32639=>1000,32640=>1000,32641=>1000,32642=>1000,32643=>1000,32644=>1000,
-	32645=>1000,32646=>1000,32647=>1000,32648=>1000,32649=>1000,32650=>1000,32651=>1000,32652=>1000,32653=>1000,32654=>1000,32655=>1000,32656=>1000,32657=>1000,32658=>1000,32659=>1000,32660=>1000,
-	32661=>1000,32662=>1000,32663=>1000,32664=>1000,32665=>1000,32666=>1000,32667=>1000,32668=>1000,32669=>1000,32670=>1000,32671=>1000,32672=>1000,32673=>1000,32674=>1000,32675=>1000,32676=>1000,
-	32677=>1000,32678=>1000,32679=>1000,32680=>1000,32681=>1000,32682=>1000,32683=>1000,32684=>1000,32685=>1000,32686=>1000,32687=>1000,32688=>1000,32689=>1000,32690=>1000,32691=>1000,32692=>1000,
-	32693=>1000,32694=>1000,32695=>1000,32696=>1000,32697=>1000,32698=>1000,32699=>1000,32700=>1000,32701=>1000,32702=>1000,32703=>1000,32704=>1000,32705=>1000,32706=>1000,32707=>1000,32708=>1000,
-	32709=>1000,32710=>1000,32711=>1000,32712=>1000,32713=>1000,32714=>1000,32715=>1000,32716=>1000,32717=>1000,32718=>1000,32719=>1000,32720=>1000,32721=>1000,32722=>1000,32723=>1000,32724=>1000,
-	32725=>1000,32726=>1000,32727=>1000,32728=>1000,32729=>1000,32730=>1000,32731=>1000,32732=>1000,32733=>1000,32734=>1000,32735=>1000,32736=>1000,32737=>1000,32738=>1000,32739=>1000,32740=>1000,
-	32741=>1000,32742=>1000,32743=>1000,32744=>1000,32745=>1000,32746=>1000,32747=>1000,32748=>1000,32749=>1000,32750=>1000,32751=>1000,32752=>1000,32753=>1000,32754=>1000,32755=>1000,32756=>1000,
-	32757=>1000,32758=>1000,32759=>1000,32760=>1000,32761=>1000,32762=>1000,32763=>1000,32764=>1000,32765=>1000,32766=>1000,32767=>1000,32768=>1000,32769=>1000,32770=>1000,32771=>1000,32772=>1000,
-	32773=>1000,32774=>1000,32775=>1000,32776=>1000,32777=>1000,32778=>1000,32779=>1000,32780=>1000,32781=>1000,32782=>1000,32783=>1000,32784=>1000,32785=>1000,32786=>1000,32787=>1000,32788=>1000,
-	32789=>1000,32790=>1000,32791=>1000,32792=>1000,32793=>1000,32794=>1000,32795=>1000,32796=>1000,32797=>1000,32798=>1000,32799=>1000,32800=>1000,32801=>1000,32802=>1000,32803=>1000,32804=>1000,
-	32805=>1000,32806=>1000,32807=>1000,32808=>1000,32809=>1000,32810=>1000,32811=>1000,32812=>1000,32813=>1000,32814=>1000,32815=>1000,32816=>1000,32817=>1000,32818=>1000,32819=>1000,32820=>1000,
-	32821=>1000,32822=>1000,32823=>1000,32824=>1000,32825=>1000,32826=>1000,32827=>1000,32828=>1000,32829=>1000,32830=>1000,32831=>1000,32832=>1000,32833=>1000,32834=>1000,32835=>1000,32836=>1000,
-	32837=>1000,32838=>1000,32839=>1000,32840=>1000,32841=>1000,32842=>1000,32843=>1000,32844=>1000,32845=>1000,32846=>1000,32847=>1000,32848=>1000,32849=>1000,32850=>1000,32851=>1000,32852=>1000,
-	32853=>1000,32854=>1000,32855=>1000,32856=>1000,32857=>1000,32858=>1000,32859=>1000,32860=>1000,32861=>1000,32862=>1000,32863=>1000,32864=>1000,32865=>1000,32866=>1000,32867=>1000,32868=>1000,
-	32869=>1000,32870=>1000,32871=>1000,32872=>1000,32873=>1000,32874=>1000,32875=>1000,32876=>1000,32877=>1000,32878=>1000,32879=>1000,32880=>1000,32881=>1000,32882=>1000,32883=>1000,32884=>1000,
-	32885=>1000,32886=>1000,32887=>1000,32888=>1000,32889=>1000,32890=>1000,32891=>1000,32892=>1000,32893=>1000,32894=>1000,32895=>1000,32896=>1000,32897=>1000,32898=>1000,32899=>1000,32900=>1000,
-	32901=>1000,32902=>1000,32903=>1000,32904=>1000,32905=>1000,32906=>1000,32907=>1000,32908=>1000,32909=>1000,32910=>1000,32911=>1000,32912=>1000,32913=>1000,32914=>1000,32915=>1000,32916=>1000,
-	32917=>1000,32918=>1000,32919=>1000,32920=>1000,32921=>1000,32922=>1000,32923=>1000,32924=>1000,32925=>1000,32926=>1000,32927=>1000,32928=>1000,32929=>1000,32930=>1000,32931=>1000,32932=>1000,
-	32933=>1000,32934=>1000,32935=>1000,32936=>1000,32937=>1000,32938=>1000,32939=>1000,32940=>1000,32941=>1000,32942=>1000,32943=>1000,32944=>1000,32945=>1000,32946=>1000,32947=>1000,32948=>1000,
-	32949=>1000,32950=>1000,32951=>1000,32952=>1000,32953=>1000,32954=>1000,32955=>1000,32956=>1000,32957=>1000,32958=>1000,32959=>1000,32960=>1000,32961=>1000,32962=>1000,32963=>1000,32964=>1000,
-	32965=>1000,32966=>1000,32967=>1000,32968=>1000,32969=>1000,32970=>1000,32971=>1000,32972=>1000,32973=>1000,32974=>1000,32975=>1000,32976=>1000,32977=>1000,32978=>1000,32979=>1000,32980=>1000,
-	32981=>1000,32982=>1000,32983=>1000,32984=>1000,32985=>1000,32986=>1000,32987=>1000,32988=>1000,32989=>1000,32990=>1000,32991=>1000,32992=>1000,32993=>1000,32994=>1000,32995=>1000,32996=>1000,
-	32997=>1000,32998=>1000,32999=>1000,33000=>1000,33001=>1000,33002=>1000,33003=>1000,33004=>1000,33005=>1000,33006=>1000,33007=>1000,33008=>1000,33009=>1000,33010=>1000,33011=>1000,33012=>1000,
-	33013=>1000,33014=>1000,33015=>1000,33016=>1000,33017=>1000,33018=>1000,33019=>1000,33020=>1000,33021=>1000,33022=>1000,33023=>1000,33024=>1000,33025=>1000,33026=>1000,33027=>1000,33028=>1000,
-	33029=>1000,33030=>1000,33031=>1000,33032=>1000,33033=>1000,33034=>1000,33035=>1000,33036=>1000,33037=>1000,33038=>1000,33039=>1000,33040=>1000,33041=>1000,33042=>1000,33043=>1000,33044=>1000,
-	33045=>1000,33046=>1000,33047=>1000,33048=>1000,33049=>1000,33050=>1000,33051=>1000,33052=>1000,33053=>1000,33054=>1000,33055=>1000,33056=>1000,33057=>1000,33058=>1000,33059=>1000,33060=>1000,
-	33061=>1000,33062=>1000,33063=>1000,33064=>1000,33065=>1000,33066=>1000,33067=>1000,33068=>1000,33069=>1000,33070=>1000,33071=>1000,33072=>1000,33073=>1000,33074=>1000,33075=>1000,33076=>1000,
-	33077=>1000,33078=>1000,33079=>1000,33080=>1000,33081=>1000,33082=>1000,33083=>1000,33084=>1000,33085=>1000,33086=>1000,33087=>1000,33088=>1000,33089=>1000,33090=>1000,33091=>1000,33092=>1000,
-	33093=>1000,33094=>1000,33095=>1000,33096=>1000,33097=>1000,33098=>1000,33099=>1000,33100=>1000,33101=>1000,33102=>1000,33103=>1000,33104=>1000,33105=>1000,33106=>1000,33107=>1000,33108=>1000,
-	33109=>1000,33110=>1000,33111=>1000,33112=>1000,33113=>1000,33114=>1000,33115=>1000,33116=>1000,33117=>1000,33118=>1000,33119=>1000,33120=>1000,33121=>1000,33122=>1000,33123=>1000,33124=>1000,
-	33125=>1000,33126=>1000,33127=>1000,33128=>1000,33129=>1000,33130=>1000,33131=>1000,33132=>1000,33133=>1000,33134=>1000,33135=>1000,33136=>1000,33137=>1000,33138=>1000,33139=>1000,33140=>1000,
-	33141=>1000,33142=>1000,33143=>1000,33144=>1000,33145=>1000,33146=>1000,33147=>1000,33148=>1000,33149=>1000,33150=>1000,33151=>1000,33152=>1000,33153=>1000,33154=>1000,33155=>1000,33156=>1000,
-	33157=>1000,33158=>1000,33159=>1000,33160=>1000,33161=>1000,33162=>1000,33163=>1000,33164=>1000,33165=>1000,33166=>1000,33167=>1000,33168=>1000,33169=>1000,33170=>1000,33171=>1000,33172=>1000,
-	33173=>1000,33174=>1000,33175=>1000,33176=>1000,33177=>1000,33178=>1000,33179=>1000,33180=>1000,33181=>1000,33182=>1000,33183=>1000,33184=>1000,33185=>1000,33186=>1000,33187=>1000,33188=>1000,
-	33189=>1000,33190=>1000,33191=>1000,33192=>1000,33193=>1000,33194=>1000,33195=>1000,33196=>1000,33197=>1000,33198=>1000,33199=>1000,33200=>1000,33201=>1000,33202=>1000,33203=>1000,33204=>1000,
-	33205=>1000,33206=>1000,33207=>1000,33208=>1000,33209=>1000,33210=>1000,33211=>1000,33212=>1000,33213=>1000,33214=>1000,33215=>1000,33216=>1000,33217=>1000,33218=>1000,33219=>1000,33220=>1000,
-	33221=>1000,33222=>1000,33223=>1000,33224=>1000,33225=>1000,33226=>1000,33227=>1000,33228=>1000,33229=>1000,33230=>1000,33231=>1000,33232=>1000,33233=>1000,33234=>1000,33235=>1000,33236=>1000,
-	33237=>1000,33238=>1000,33239=>1000,33240=>1000,33241=>1000,33242=>1000,33243=>1000,33244=>1000,33245=>1000,33246=>1000,33247=>1000,33248=>1000,33249=>1000,33250=>1000,33251=>1000,33252=>1000,
-	33253=>1000,33254=>1000,33255=>1000,33256=>1000,33257=>1000,33258=>1000,33259=>1000,33260=>1000,33261=>1000,33262=>1000,33263=>1000,33264=>1000,33265=>1000,33266=>1000,33267=>1000,33268=>1000,
-	33269=>1000,33270=>1000,33271=>1000,33272=>1000,33273=>1000,33274=>1000,33275=>1000,33276=>1000,33277=>1000,33278=>1000,33279=>1000,33280=>1000,33281=>1000,33282=>1000,33283=>1000,33284=>1000,
-	33285=>1000,33286=>1000,33287=>1000,33288=>1000,33289=>1000,33290=>1000,33291=>1000,33292=>1000,33293=>1000,33294=>1000,33295=>1000,33296=>1000,33297=>1000,33298=>1000,33299=>1000,33300=>1000,
-	33301=>1000,33302=>1000,33303=>1000,33304=>1000,33305=>1000,33306=>1000,33307=>1000,33308=>1000,33309=>1000,33310=>1000,33311=>1000,33312=>1000,33313=>1000,33314=>1000,33315=>1000,33316=>1000,
-	33317=>1000,33318=>1000,33319=>1000,33320=>1000,33321=>1000,33322=>1000,33323=>1000,33324=>1000,33325=>1000,33326=>1000,33327=>1000,33328=>1000,33329=>1000,33330=>1000,33331=>1000,33332=>1000,
-	33333=>1000,33334=>1000,33335=>1000,33336=>1000,33337=>1000,33338=>1000,33339=>1000,33340=>1000,33341=>1000,33342=>1000,33343=>1000,33344=>1000,33345=>1000,33346=>1000,33347=>1000,33348=>1000,
-	33349=>1000,33350=>1000,33351=>1000,33352=>1000,33353=>1000,33354=>1000,33355=>1000,33356=>1000,33357=>1000,33358=>1000,33359=>1000,33360=>1000,33361=>1000,33362=>1000,33363=>1000,33364=>1000,
-	33365=>1000,33366=>1000,33367=>1000,33368=>1000,33369=>1000,33370=>1000,33371=>1000,33372=>1000,33373=>1000,33374=>1000,33375=>1000,33376=>1000,33377=>1000,33378=>1000,33379=>1000,33380=>1000,
-	33381=>1000,33382=>1000,33383=>1000,33384=>1000,33385=>1000,33386=>1000,33387=>1000,33388=>1000,33389=>1000,33390=>1000,33391=>1000,33392=>1000,33393=>1000,33394=>1000,33395=>1000,33396=>1000,
-	33397=>1000,33398=>1000,33399=>1000,33400=>1000,33401=>1000,33402=>1000,33403=>1000,33404=>1000,33405=>1000,33406=>1000,33407=>1000,33408=>1000,33409=>1000,33410=>1000,33411=>1000,33412=>1000,
-	33413=>1000,33414=>1000,33415=>1000,33416=>1000,33417=>1000,33418=>1000,33419=>1000,33420=>1000,33421=>1000,33422=>1000,33423=>1000,33424=>1000,33425=>1000,33426=>1000,33427=>1000,33428=>1000,
-	33429=>1000,33430=>1000,33431=>1000,33432=>1000,33433=>1000,33434=>1000,33435=>1000,33436=>1000,33437=>1000,33438=>1000,33439=>1000,33440=>1000,33441=>1000,33442=>1000,33443=>1000,33444=>1000,
-	33445=>1000,33446=>1000,33447=>1000,33448=>1000,33449=>1000,33450=>1000,33451=>1000,33452=>1000,33453=>1000,33454=>1000,33455=>1000,33456=>1000,33457=>1000,33458=>1000,33459=>1000,33460=>1000,
-	33461=>1000,33462=>1000,33463=>1000,33464=>1000,33465=>1000,33466=>1000,33467=>1000,33468=>1000,33469=>1000,33470=>1000,33471=>1000,33472=>1000,33473=>1000,33474=>1000,33475=>1000,33476=>1000,
-	33477=>1000,33478=>1000,33479=>1000,33480=>1000,33481=>1000,33482=>1000,33483=>1000,33484=>1000,33485=>1000,33486=>1000,33487=>1000,33488=>1000,33489=>1000,33490=>1000,33491=>1000,33492=>1000,
-	33493=>1000,33494=>1000,33495=>1000,33496=>1000,33497=>1000,33498=>1000,33499=>1000,33500=>1000,33501=>1000,33502=>1000,33503=>1000,33504=>1000,33505=>1000,33506=>1000,33507=>1000,33508=>1000,
-	33509=>1000,33510=>1000,33511=>1000,33512=>1000,33513=>1000,33514=>1000,33515=>1000,33516=>1000,33517=>1000,33518=>1000,33519=>1000,33520=>1000,33521=>1000,33522=>1000,33523=>1000,33524=>1000,
-	33525=>1000,33526=>1000,33527=>1000,33528=>1000,33529=>1000,33530=>1000,33531=>1000,33532=>1000,33533=>1000,33534=>1000,33535=>1000,33536=>1000,33537=>1000,33538=>1000,33539=>1000,33540=>1000,
-	33541=>1000,33542=>1000,33543=>1000,33544=>1000,33545=>1000,33546=>1000,33547=>1000,33548=>1000,33549=>1000,33550=>1000,33551=>1000,33552=>1000,33553=>1000,33554=>1000,33555=>1000,33556=>1000,
-	33557=>1000,33558=>1000,33559=>1000,33560=>1000,33561=>1000,33562=>1000,33563=>1000,33564=>1000,33565=>1000,33566=>1000,33567=>1000,33568=>1000,33569=>1000,33570=>1000,33571=>1000,33572=>1000,
-	33573=>1000,33574=>1000,33575=>1000,33576=>1000,33577=>1000,33578=>1000,33579=>1000,33580=>1000,33581=>1000,33582=>1000,33583=>1000,33584=>1000,33585=>1000,33586=>1000,33587=>1000,33588=>1000,
-	33589=>1000,33590=>1000,33591=>1000,33592=>1000,33593=>1000,33594=>1000,33595=>1000,33596=>1000,33597=>1000,33598=>1000,33599=>1000,33600=>1000,33601=>1000,33602=>1000,33603=>1000,33604=>1000,
-	33605=>1000,33606=>1000,33607=>1000,33608=>1000,33609=>1000,33610=>1000,33611=>1000,33612=>1000,33613=>1000,33614=>1000,33615=>1000,33616=>1000,33617=>1000,33618=>1000,33619=>1000,33620=>1000,
-	33621=>1000,33622=>1000,33623=>1000,33624=>1000,33625=>1000,33626=>1000,33627=>1000,33628=>1000,33629=>1000,33630=>1000,33631=>1000,33632=>1000,33633=>1000,33634=>1000,33635=>1000,33636=>1000,
-	33637=>1000,33638=>1000,33639=>1000,33640=>1000,33641=>1000,33642=>1000,33643=>1000,33644=>1000,33645=>1000,33646=>1000,33647=>1000,33648=>1000,33649=>1000,33650=>1000,33651=>1000,33652=>1000,
-	33653=>1000,33654=>1000,33655=>1000,33656=>1000,33657=>1000,33658=>1000,33659=>1000,33660=>1000,33661=>1000,33662=>1000,33663=>1000,33664=>1000,33665=>1000,33666=>1000,33667=>1000,33668=>1000,
-	33669=>1000,33670=>1000,33671=>1000,33672=>1000,33673=>1000,33674=>1000,33675=>1000,33676=>1000,33677=>1000,33678=>1000,33679=>1000,33680=>1000,33681=>1000,33682=>1000,33683=>1000,33684=>1000,
-	33685=>1000,33686=>1000,33687=>1000,33688=>1000,33689=>1000,33690=>1000,33691=>1000,33692=>1000,33693=>1000,33694=>1000,33695=>1000,33696=>1000,33697=>1000,33698=>1000,33699=>1000,33700=>1000,
-	33701=>1000,33702=>1000,33703=>1000,33704=>1000,33705=>1000,33706=>1000,33707=>1000,33708=>1000,33709=>1000,33710=>1000,33711=>1000,33712=>1000,33713=>1000,33714=>1000,33715=>1000,33716=>1000,
-	33717=>1000,33718=>1000,33719=>1000,33720=>1000,33721=>1000,33722=>1000,33723=>1000,33724=>1000,33725=>1000,33726=>1000,33727=>1000,33728=>1000,33729=>1000,33730=>1000,33731=>1000,33732=>1000,
-	33733=>1000,33734=>1000,33735=>1000,33736=>1000,33737=>1000,33738=>1000,33739=>1000,33740=>1000,33741=>1000,33742=>1000,33743=>1000,33744=>1000,33745=>1000,33746=>1000,33747=>1000,33748=>1000,
-	33749=>1000,33750=>1000,33751=>1000,33752=>1000,33753=>1000,33754=>1000,33755=>1000,33756=>1000,33757=>1000,33758=>1000,33759=>1000,33760=>1000,33761=>1000,33762=>1000,33763=>1000,33764=>1000,
-	33765=>1000,33766=>1000,33767=>1000,33768=>1000,33769=>1000,33770=>1000,33771=>1000,33772=>1000,33773=>1000,33774=>1000,33775=>1000,33776=>1000,33777=>1000,33778=>1000,33779=>1000,33780=>1000,
-	33781=>1000,33782=>1000,33783=>1000,33784=>1000,33785=>1000,33786=>1000,33787=>1000,33788=>1000,33789=>1000,33790=>1000,33791=>1000,33792=>1000,33793=>1000,33794=>1000,33795=>1000,33796=>1000,
-	33797=>1000,33798=>1000,33799=>1000,33800=>1000,33801=>1000,33802=>1000,33803=>1000,33804=>1000,33805=>1000,33806=>1000,33807=>1000,33808=>1000,33809=>1000,33810=>1000,33811=>1000,33812=>1000,
-	33813=>1000,33814=>1000,33815=>1000,33816=>1000,33817=>1000,33818=>1000,33819=>1000,33820=>1000,33821=>1000,33822=>1000,33823=>1000,33824=>1000,33825=>1000,33826=>1000,33827=>1000,33828=>1000,
-	33829=>1000,33830=>1000,33831=>1000,33832=>1000,33833=>1000,33834=>1000,33835=>1000,33836=>1000,33837=>1000,33838=>1000,33839=>1000,33840=>1000,33841=>1000,33842=>1000,33843=>1000,33844=>1000,
-	33845=>1000,33846=>1000,33847=>1000,33848=>1000,33849=>1000,33850=>1000,33851=>1000,33852=>1000,33853=>1000,33854=>1000,33855=>1000,33856=>1000,33857=>1000,33858=>1000,33859=>1000,33860=>1000,
-	33861=>1000,33862=>1000,33863=>1000,33864=>1000,33865=>1000,33866=>1000,33867=>1000,33868=>1000,33869=>1000,33870=>1000,33871=>1000,33872=>1000,33873=>1000,33874=>1000,33875=>1000,33876=>1000,
-	33877=>1000,33878=>1000,33879=>1000,33880=>1000,33881=>1000,33882=>1000,33883=>1000,33884=>1000,33885=>1000,33886=>1000,33887=>1000,33888=>1000,33889=>1000,33890=>1000,33891=>1000,33892=>1000,
-	33893=>1000,33894=>1000,33895=>1000,33896=>1000,33897=>1000,33898=>1000,33899=>1000,33900=>1000,33901=>1000,33902=>1000,33903=>1000,33904=>1000,33905=>1000,33906=>1000,33907=>1000,33908=>1000,
-	33909=>1000,33910=>1000,33911=>1000,33912=>1000,33913=>1000,33914=>1000,33915=>1000,33916=>1000,33917=>1000,33918=>1000,33919=>1000,33920=>1000,33921=>1000,33922=>1000,33923=>1000,33924=>1000,
-	33925=>1000,33926=>1000,33927=>1000,33928=>1000,33929=>1000,33930=>1000,33931=>1000,33932=>1000,33933=>1000,33934=>1000,33935=>1000,33936=>1000,33937=>1000,33938=>1000,33939=>1000,33940=>1000,
-	33941=>1000,33942=>1000,33943=>1000,33944=>1000,33945=>1000,33946=>1000,33947=>1000,33948=>1000,33949=>1000,33950=>1000,33951=>1000,33952=>1000,33953=>1000,33954=>1000,33955=>1000,33956=>1000,
-	33957=>1000,33958=>1000,33959=>1000,33960=>1000,33961=>1000,33962=>1000,33963=>1000,33964=>1000,33965=>1000,33966=>1000,33967=>1000,33968=>1000,33969=>1000,33970=>1000,33971=>1000,33972=>1000,
-	33973=>1000,33974=>1000,33975=>1000,33976=>1000,33977=>1000,33978=>1000,33979=>1000,33980=>1000,33981=>1000,33982=>1000,33983=>1000,33984=>1000,33985=>1000,33986=>1000,33987=>1000,33988=>1000,
-	33989=>1000,33990=>1000,33991=>1000,33992=>1000,33993=>1000,33994=>1000,33995=>1000,33996=>1000,33997=>1000,33998=>1000,33999=>1000,34000=>1000,34001=>1000,34002=>1000,34003=>1000,34004=>1000,
-	34005=>1000,34006=>1000,34007=>1000,34008=>1000,34009=>1000,34010=>1000,34011=>1000,34012=>1000,34013=>1000,34014=>1000,34015=>1000,34016=>1000,34017=>1000,34018=>1000,34019=>1000,34020=>1000,
-	34021=>1000,34022=>1000,34023=>1000,34024=>1000,34025=>1000,34026=>1000,34027=>1000,34028=>1000,34029=>1000,34030=>1000,34031=>1000,34032=>1000,34033=>1000,34034=>1000,34035=>1000,34036=>1000,
-	34037=>1000,34038=>1000,34039=>1000,34040=>1000,34041=>1000,34042=>1000,34043=>1000,34044=>1000,34045=>1000,34046=>1000,34047=>1000,34048=>1000,34049=>1000,34050=>1000,34051=>1000,34052=>1000,
-	34053=>1000,34054=>1000,34055=>1000,34056=>1000,34057=>1000,34058=>1000,34059=>1000,34060=>1000,34061=>1000,34062=>1000,34063=>1000,34064=>1000,34065=>1000,34066=>1000,34067=>1000,34068=>1000,
-	34069=>1000,34070=>1000,34071=>1000,34072=>1000,34073=>1000,34074=>1000,34075=>1000,34076=>1000,34077=>1000,34078=>1000,34079=>1000,34080=>1000,34081=>1000,34082=>1000,34083=>1000,34084=>1000,
-	34085=>1000,34086=>1000,34087=>1000,34088=>1000,34089=>1000,34090=>1000,34091=>1000,34092=>1000,34093=>1000,34094=>1000,34095=>1000,34096=>1000,34097=>1000,34098=>1000,34099=>1000,34100=>1000,
-	34101=>1000,34102=>1000,34103=>1000,34104=>1000,34105=>1000,34106=>1000,34107=>1000,34108=>1000,34109=>1000,34110=>1000,34111=>1000,34112=>1000,34113=>1000,34114=>1000,34115=>1000,34116=>1000,
-	34117=>1000,34118=>1000,34119=>1000,34120=>1000,34121=>1000,34122=>1000,34123=>1000,34124=>1000,34125=>1000,34126=>1000,34127=>1000,34128=>1000,34129=>1000,34130=>1000,34131=>1000,34132=>1000,
-	34133=>1000,34134=>1000,34135=>1000,34136=>1000,34137=>1000,34138=>1000,34139=>1000,34140=>1000,34141=>1000,34142=>1000,34143=>1000,34144=>1000,34145=>1000,34146=>1000,34147=>1000,34148=>1000,
-	34149=>1000,34150=>1000,34151=>1000,34152=>1000,34153=>1000,34154=>1000,34155=>1000,34156=>1000,34157=>1000,34158=>1000,34159=>1000,34160=>1000,34161=>1000,34162=>1000,34163=>1000,34164=>1000,
-	34165=>1000,34166=>1000,34167=>1000,34168=>1000,34169=>1000,34170=>1000,34171=>1000,34172=>1000,34173=>1000,34174=>1000,34175=>1000,34176=>1000,34177=>1000,34178=>1000,34179=>1000,34180=>1000,
-	34181=>1000,34182=>1000,34183=>1000,34184=>1000,34185=>1000,34186=>1000,34187=>1000,34188=>1000,34189=>1000,34190=>1000,34191=>1000,34192=>1000,34193=>1000,34194=>1000,34195=>1000,34196=>1000,
-	34197=>1000,34198=>1000,34199=>1000,34200=>1000,34201=>1000,34202=>1000,34203=>1000,34204=>1000,34205=>1000,34206=>1000,34207=>1000,34208=>1000,34209=>1000,34210=>1000,34211=>1000,34212=>1000,
-	34213=>1000,34214=>1000,34215=>1000,34216=>1000,34217=>1000,34218=>1000,34219=>1000,34220=>1000,34221=>1000,34222=>1000,34223=>1000,34224=>1000,34225=>1000,34226=>1000,34227=>1000,34228=>1000,
-	34229=>1000,34230=>1000,34231=>1000,34232=>1000,34233=>1000,34234=>1000,34235=>1000,34236=>1000,34237=>1000,34238=>1000,34239=>1000,34240=>1000,34241=>1000,34242=>1000,34243=>1000,34244=>1000,
-	34245=>1000,34246=>1000,34247=>1000,34248=>1000,34249=>1000,34250=>1000,34251=>1000,34252=>1000,34253=>1000,34254=>1000,34255=>1000,34256=>1000,34257=>1000,34258=>1000,34259=>1000,34260=>1000,
-	34261=>1000,34262=>1000,34263=>1000,34264=>1000,34265=>1000,34266=>1000,34267=>1000,34268=>1000,34269=>1000,34270=>1000,34271=>1000,34272=>1000,34273=>1000,34274=>1000,34275=>1000,34276=>1000,
-	34277=>1000,34278=>1000,34279=>1000,34280=>1000,34281=>1000,34282=>1000,34283=>1000,34284=>1000,34285=>1000,34286=>1000,34287=>1000,34288=>1000,34289=>1000,34290=>1000,34291=>1000,34292=>1000,
-	34293=>1000,34294=>1000,34295=>1000,34296=>1000,34297=>1000,34298=>1000,34299=>1000,34300=>1000,34301=>1000,34302=>1000,34303=>1000,34304=>1000,34305=>1000,34306=>1000,34307=>1000,34308=>1000,
-	34309=>1000,34310=>1000,34311=>1000,34312=>1000,34313=>1000,34314=>1000,34315=>1000,34316=>1000,34317=>1000,34318=>1000,34319=>1000,34320=>1000,34321=>1000,34322=>1000,34323=>1000,34324=>1000,
-	34325=>1000,34326=>1000,34327=>1000,34328=>1000,34329=>1000,34330=>1000,34331=>1000,34332=>1000,34333=>1000,34334=>1000,34335=>1000,34336=>1000,34337=>1000,34338=>1000,34339=>1000,34340=>1000,
-	34341=>1000,34342=>1000,34343=>1000,34344=>1000,34345=>1000,34346=>1000,34347=>1000,34348=>1000,34349=>1000,34350=>1000,34351=>1000,34352=>1000,34353=>1000,34354=>1000,34355=>1000,34356=>1000,
-	34357=>1000,34358=>1000,34359=>1000,34360=>1000,34361=>1000,34362=>1000,34363=>1000,34364=>1000,34365=>1000,34366=>1000,34367=>1000,34368=>1000,34369=>1000,34370=>1000,34371=>1000,34372=>1000,
-	34373=>1000,34374=>1000,34375=>1000,34376=>1000,34377=>1000,34378=>1000,34379=>1000,34380=>1000,34381=>1000,34382=>1000,34383=>1000,34384=>1000,34385=>1000,34386=>1000,34387=>1000,34388=>1000,
-	34389=>1000,34390=>1000,34391=>1000,34392=>1000,34393=>1000,34394=>1000,34395=>1000,34396=>1000,34397=>1000,34398=>1000,34399=>1000,34400=>1000,34401=>1000,34402=>1000,34403=>1000,34404=>1000,
-	34405=>1000,34406=>1000,34407=>1000,34408=>1000,34409=>1000,34410=>1000,34411=>1000,34412=>1000,34413=>1000,34414=>1000,34415=>1000,34416=>1000,34417=>1000,34418=>1000,34419=>1000,34420=>1000,
-	34421=>1000,34422=>1000,34423=>1000,34424=>1000,34425=>1000,34426=>1000,34427=>1000,34428=>1000,34429=>1000,34430=>1000,34431=>1000,34432=>1000,34433=>1000,34434=>1000,34435=>1000,34436=>1000,
-	34437=>1000,34438=>1000,34439=>1000,34440=>1000,34441=>1000,34442=>1000,34443=>1000,34444=>1000,34445=>1000,34446=>1000,34447=>1000,34448=>1000,34449=>1000,34450=>1000,34451=>1000,34452=>1000,
-	34453=>1000,34454=>1000,34455=>1000,34456=>1000,34457=>1000,34458=>1000,34459=>1000,34460=>1000,34461=>1000,34462=>1000,34463=>1000,34464=>1000,34465=>1000,34466=>1000,34467=>1000,34468=>1000,
-	34469=>1000,34470=>1000,34471=>1000,34472=>1000,34473=>1000,34474=>1000,34475=>1000,34476=>1000,34477=>1000,34478=>1000,34479=>1000,34480=>1000,34481=>1000,34482=>1000,34483=>1000,34484=>1000,
-	34485=>1000,34486=>1000,34487=>1000,34488=>1000,34489=>1000,34490=>1000,34491=>1000,34492=>1000,34493=>1000,34494=>1000,34495=>1000,34496=>1000,34497=>1000,34498=>1000,34499=>1000,34500=>1000,
-	34501=>1000,34502=>1000,34503=>1000,34504=>1000,34505=>1000,34506=>1000,34507=>1000,34508=>1000,34509=>1000,34510=>1000,34511=>1000,34512=>1000,34513=>1000,34514=>1000,34515=>1000,34516=>1000,
-	34517=>1000,34518=>1000,34519=>1000,34520=>1000,34521=>1000,34522=>1000,34523=>1000,34524=>1000,34525=>1000,34526=>1000,34527=>1000,34528=>1000,34529=>1000,34530=>1000,34531=>1000,34532=>1000,
-	34533=>1000,34534=>1000,34535=>1000,34536=>1000,34537=>1000,34538=>1000,34539=>1000,34540=>1000,34541=>1000,34542=>1000,34543=>1000,34544=>1000,34545=>1000,34546=>1000,34547=>1000,34548=>1000,
-	34549=>1000,34550=>1000,34551=>1000,34552=>1000,34553=>1000,34554=>1000,34555=>1000,34556=>1000,34557=>1000,34558=>1000,34559=>1000,34560=>1000,34561=>1000,34562=>1000,34563=>1000,34564=>1000,
-	34565=>1000,34566=>1000,34567=>1000,34568=>1000,34569=>1000,34570=>1000,34571=>1000,34572=>1000,34573=>1000,34574=>1000,34575=>1000,34576=>1000,34577=>1000,34578=>1000,34579=>1000,34580=>1000,
-	34581=>1000,34582=>1000,34583=>1000,34584=>1000,34585=>1000,34586=>1000,34587=>1000,34588=>1000,34589=>1000,34590=>1000,34591=>1000,34592=>1000,34593=>1000,34594=>1000,34595=>1000,34596=>1000,
-	34597=>1000,34598=>1000,34599=>1000,34600=>1000,34601=>1000,34602=>1000,34603=>1000,34604=>1000,34605=>1000,34606=>1000,34607=>1000,34608=>1000,34609=>1000,34610=>1000,34611=>1000,34612=>1000,
-	34613=>1000,34614=>1000,34615=>1000,34616=>1000,34617=>1000,34618=>1000,34619=>1000,34620=>1000,34621=>1000,34622=>1000,34623=>1000,34624=>1000,34625=>1000,34626=>1000,34627=>1000,34628=>1000,
-	34629=>1000,34630=>1000,34631=>1000,34632=>1000,34633=>1000,34634=>1000,34635=>1000,34636=>1000,34637=>1000,34638=>1000,34639=>1000,34640=>1000,34641=>1000,34642=>1000,34643=>1000,34644=>1000,
-	34645=>1000,34646=>1000,34647=>1000,34648=>1000,34649=>1000,34650=>1000,34651=>1000,34652=>1000,34653=>1000,34654=>1000,34655=>1000,34656=>1000,34657=>1000,34658=>1000,34659=>1000,34660=>1000,
-	34661=>1000,34662=>1000,34663=>1000,34664=>1000,34665=>1000,34666=>1000,34667=>1000,34668=>1000,34669=>1000,34670=>1000,34671=>1000,34672=>1000,34673=>1000,34674=>1000,34675=>1000,34676=>1000,
-	34677=>1000,34678=>1000,34679=>1000,34680=>1000,34681=>1000,34682=>1000,34683=>1000,34684=>1000,34685=>1000,34686=>1000,34687=>1000,34688=>1000,34689=>1000,34690=>1000,34691=>1000,34692=>1000,
-	34693=>1000,34694=>1000,34695=>1000,34696=>1000,34697=>1000,34698=>1000,34699=>1000,34700=>1000,34701=>1000,34702=>1000,34703=>1000,34704=>1000,34705=>1000,34706=>1000,34707=>1000,34708=>1000,
-	34709=>1000,34710=>1000,34711=>1000,34712=>1000,34713=>1000,34714=>1000,34715=>1000,34716=>1000,34717=>1000,34718=>1000,34719=>1000,34720=>1000,34721=>1000,34722=>1000,34723=>1000,34724=>1000,
-	34725=>1000,34726=>1000,34727=>1000,34728=>1000,34729=>1000,34730=>1000,34731=>1000,34732=>1000,34733=>1000,34734=>1000,34735=>1000,34736=>1000,34737=>1000,34738=>1000,34739=>1000,34740=>1000,
-	34741=>1000,34742=>1000,34743=>1000,34744=>1000,34745=>1000,34746=>1000,34747=>1000,34748=>1000,34749=>1000,34750=>1000,34751=>1000,34752=>1000,34753=>1000,34754=>1000,34755=>1000,34756=>1000,
-	34757=>1000,34758=>1000,34759=>1000,34760=>1000,34761=>1000,34762=>1000,34763=>1000,34764=>1000,34765=>1000,34766=>1000,34767=>1000,34768=>1000,34769=>1000,34770=>1000,34771=>1000,34772=>1000,
-	34773=>1000,34774=>1000,34775=>1000,34776=>1000,34777=>1000,34778=>1000,34779=>1000,34780=>1000,34781=>1000,34782=>1000,34783=>1000,34784=>1000,34785=>1000,34786=>1000,34787=>1000,34788=>1000,
-	34789=>1000,34790=>1000,34791=>1000,34792=>1000,34793=>1000,34794=>1000,34795=>1000,34796=>1000,34797=>1000,34798=>1000,34799=>1000,34800=>1000,34801=>1000,34802=>1000,34803=>1000,34804=>1000,
-	34805=>1000,34806=>1000,34807=>1000,34808=>1000,34809=>1000,34810=>1000,34811=>1000,34812=>1000,34813=>1000,34814=>1000,34815=>1000,34816=>1000,34817=>1000,34818=>1000,34819=>1000,34820=>1000,
-	34821=>1000,34822=>1000,34823=>1000,34824=>1000,34825=>1000,34826=>1000,34827=>1000,34828=>1000,34829=>1000,34830=>1000,34831=>1000,34832=>1000,34833=>1000,34834=>1000,34835=>1000,34836=>1000,
-	34837=>1000,34838=>1000,34839=>1000,34840=>1000,34841=>1000,34842=>1000,34843=>1000,34844=>1000,34845=>1000,34846=>1000,34847=>1000,34848=>1000,34849=>1000,34850=>1000,34851=>1000,34852=>1000,
-	34853=>1000,34854=>1000,34855=>1000,34856=>1000,34857=>1000,34858=>1000,34859=>1000,34860=>1000,34861=>1000,34862=>1000,34863=>1000,34864=>1000,34865=>1000,34866=>1000,34867=>1000,34868=>1000,
-	34869=>1000,34870=>1000,34871=>1000,34872=>1000,34873=>1000,34874=>1000,34875=>1000,34876=>1000,34877=>1000,34878=>1000,34879=>1000,34880=>1000,34881=>1000,34882=>1000,34883=>1000,34884=>1000,
-	34885=>1000,34886=>1000,34887=>1000,34888=>1000,34889=>1000,34890=>1000,34891=>1000,34892=>1000,34893=>1000,34894=>1000,34895=>1000,34896=>1000,34897=>1000,34898=>1000,34899=>1000,34900=>1000,
-	34901=>1000,34902=>1000,34903=>1000,34904=>1000,34905=>1000,34906=>1000,34907=>1000,34908=>1000,34909=>1000,34910=>1000,34911=>1000,34912=>1000,34913=>1000,34914=>1000,34915=>1000,34916=>1000,
-	34917=>1000,34918=>1000,34919=>1000,34920=>1000,34921=>1000,34922=>1000,34923=>1000,34924=>1000,34925=>1000,34926=>1000,34927=>1000,34928=>1000,34929=>1000,34930=>1000,34931=>1000,34932=>1000,
-	34933=>1000,34934=>1000,34935=>1000,34936=>1000,34937=>1000,34938=>1000,34939=>1000,34940=>1000,34941=>1000,34942=>1000,34943=>1000,34944=>1000,34945=>1000,34946=>1000,34947=>1000,34948=>1000,
-	34949=>1000,34950=>1000,34951=>1000,34952=>1000,34953=>1000,34954=>1000,34955=>1000,34956=>1000,34957=>1000,34958=>1000,34959=>1000,34960=>1000,34961=>1000,34962=>1000,34963=>1000,34964=>1000,
-	34965=>1000,34966=>1000,34967=>1000,34968=>1000,34969=>1000,34970=>1000,34971=>1000,34972=>1000,34973=>1000,34974=>1000,34975=>1000,34976=>1000,34977=>1000,34978=>1000,34979=>1000,34980=>1000,
-	34981=>1000,34982=>1000,34983=>1000,34984=>1000,34985=>1000,34986=>1000,34987=>1000,34988=>1000,34989=>1000,34990=>1000,34991=>1000,34992=>1000,34993=>1000,34994=>1000,34995=>1000,34996=>1000,
-	34997=>1000,34998=>1000,34999=>1000,35000=>1000,35001=>1000,35002=>1000,35003=>1000,35004=>1000,35005=>1000,35006=>1000,35007=>1000,35008=>1000,35009=>1000,35010=>1000,35011=>1000,35012=>1000,
-	35013=>1000,35014=>1000,35015=>1000,35016=>1000,35017=>1000,35018=>1000,35019=>1000,35020=>1000,35021=>1000,35022=>1000,35023=>1000,35024=>1000,35025=>1000,35026=>1000,35027=>1000,35028=>1000,
-	35029=>1000,35030=>1000,35031=>1000,35032=>1000,35033=>1000,35034=>1000,35035=>1000,35036=>1000,35037=>1000,35038=>1000,35039=>1000,35040=>1000,35041=>1000,35042=>1000,35043=>1000,35044=>1000,
-	35045=>1000,35046=>1000,35047=>1000,35048=>1000,35049=>1000,35050=>1000,35051=>1000,35052=>1000,35053=>1000,35054=>1000,35055=>1000,35056=>1000,35057=>1000,35058=>1000,35059=>1000,35060=>1000,
-	35061=>1000,35062=>1000,35063=>1000,35064=>1000,35065=>1000,35066=>1000,35067=>1000,35068=>1000,35069=>1000,35070=>1000,35071=>1000,35072=>1000,35073=>1000,35074=>1000,35075=>1000,35076=>1000,
-	35077=>1000,35078=>1000,35079=>1000,35080=>1000,35081=>1000,35082=>1000,35083=>1000,35084=>1000,35085=>1000,35086=>1000,35087=>1000,35088=>1000,35089=>1000,35090=>1000,35091=>1000,35092=>1000,
-	35093=>1000,35094=>1000,35095=>1000,35096=>1000,35097=>1000,35098=>1000,35099=>1000,35100=>1000,35101=>1000,35102=>1000,35103=>1000,35104=>1000,35105=>1000,35106=>1000,35107=>1000,35108=>1000,
-	35109=>1000,35110=>1000,35111=>1000,35112=>1000,35113=>1000,35114=>1000,35115=>1000,35116=>1000,35117=>1000,35118=>1000,35119=>1000,35120=>1000,35121=>1000,35122=>1000,35123=>1000,35124=>1000,
-	35125=>1000,35126=>1000,35127=>1000,35128=>1000,35129=>1000,35130=>1000,35131=>1000,35132=>1000,35133=>1000,35134=>1000,35135=>1000,35136=>1000,35137=>1000,35138=>1000,35139=>1000,35140=>1000,
-	35141=>1000,35142=>1000,35143=>1000,35144=>1000,35145=>1000,35146=>1000,35147=>1000,35148=>1000,35149=>1000,35150=>1000,35151=>1000,35152=>1000,35153=>1000,35154=>1000,35155=>1000,35156=>1000,
-	35157=>1000,35158=>1000,35159=>1000,35160=>1000,35161=>1000,35162=>1000,35163=>1000,35164=>1000,35165=>1000,35166=>1000,35167=>1000,35168=>1000,35169=>1000,35170=>1000,35171=>1000,35172=>1000,
-	35173=>1000,35174=>1000,35175=>1000,35176=>1000,35177=>1000,35178=>1000,35179=>1000,35180=>1000,35181=>1000,35182=>1000,35183=>1000,35184=>1000,35185=>1000,35186=>1000,35187=>1000,35188=>1000,
-	35189=>1000,35190=>1000,35191=>1000,35192=>1000,35193=>1000,35194=>1000,35195=>1000,35196=>1000,35197=>1000,35198=>1000,35199=>1000,35200=>1000,35201=>1000,35202=>1000,35203=>1000,35204=>1000,
-	35205=>1000,35206=>1000,35207=>1000,35208=>1000,35209=>1000,35210=>1000,35211=>1000,35212=>1000,35213=>1000,35214=>1000,35215=>1000,35216=>1000,35217=>1000,35218=>1000,35219=>1000,35220=>1000,
-	35221=>1000,35222=>1000,35223=>1000,35224=>1000,35225=>1000,35226=>1000,35227=>1000,35228=>1000,35229=>1000,35230=>1000,35231=>1000,35232=>1000,35233=>1000,35234=>1000,35235=>1000,35236=>1000,
-	35237=>1000,35238=>1000,35239=>1000,35240=>1000,35241=>1000,35242=>1000,35243=>1000,35244=>1000,35245=>1000,35246=>1000,35247=>1000,35248=>1000,35249=>1000,35250=>1000,35251=>1000,35252=>1000,
-	35253=>1000,35254=>1000,35255=>1000,35256=>1000,35257=>1000,35258=>1000,35259=>1000,35260=>1000,35261=>1000,35262=>1000,35263=>1000,35264=>1000,35265=>1000,35266=>1000,35267=>1000,35268=>1000,
-	35269=>1000,35270=>1000,35271=>1000,35272=>1000,35273=>1000,35274=>1000,35275=>1000,35276=>1000,35277=>1000,35278=>1000,35279=>1000,35280=>1000,35281=>1000,35282=>1000,35283=>1000,35284=>1000,
-	35285=>1000,35286=>1000,35287=>1000,35288=>1000,35289=>1000,35290=>1000,35291=>1000,35292=>1000,35293=>1000,35294=>1000,35295=>1000,35296=>1000,35297=>1000,35298=>1000,35299=>1000,35300=>1000,
-	35301=>1000,35302=>1000,35303=>1000,35304=>1000,35305=>1000,35306=>1000,35307=>1000,35308=>1000,35309=>1000,35310=>1000,35311=>1000,35312=>1000,35313=>1000,35314=>1000,35315=>1000,35316=>1000,
-	35317=>1000,35318=>1000,35319=>1000,35320=>1000,35321=>1000,35322=>1000,35323=>1000,35324=>1000,35325=>1000,35326=>1000,35327=>1000,35328=>1000,35329=>1000,35330=>1000,35331=>1000,35332=>1000,
-	35333=>1000,35334=>1000,35335=>1000,35336=>1000,35337=>1000,35338=>1000,35339=>1000,35340=>1000,35341=>1000,35342=>1000,35343=>1000,35344=>1000,35345=>1000,35346=>1000,35347=>1000,35348=>1000,
-	35349=>1000,35350=>1000,35351=>1000,35352=>1000,35353=>1000,35354=>1000,35355=>1000,35356=>1000,35357=>1000,35358=>1000,35359=>1000,35360=>1000,35361=>1000,35362=>1000,35363=>1000,35364=>1000,
-	35365=>1000,35366=>1000,35367=>1000,35368=>1000,35369=>1000,35370=>1000,35371=>1000,35372=>1000,35373=>1000,35374=>1000,35375=>1000,35376=>1000,35377=>1000,35378=>1000,35379=>1000,35380=>1000,
-	35381=>1000,35382=>1000,35383=>1000,35384=>1000,35385=>1000,35386=>1000,35387=>1000,35388=>1000,35389=>1000,35390=>1000,35391=>1000,35392=>1000,35393=>1000,35394=>1000,35395=>1000,35396=>1000,
-	35397=>1000,35398=>1000,35399=>1000,35400=>1000,35401=>1000,35402=>1000,35403=>1000,35404=>1000,35405=>1000,35406=>1000,35407=>1000,35408=>1000,35409=>1000,35410=>1000,35411=>1000,35412=>1000,
-	35413=>1000,35414=>1000,35415=>1000,35416=>1000,35417=>1000,35418=>1000,35419=>1000,35420=>1000,35421=>1000,35422=>1000,35423=>1000,35424=>1000,35425=>1000,35426=>1000,35427=>1000,35428=>1000,
-	35429=>1000,35430=>1000,35431=>1000,35432=>1000,35433=>1000,35434=>1000,35435=>1000,35436=>1000,35437=>1000,35438=>1000,35439=>1000,35440=>1000,35441=>1000,35442=>1000,35443=>1000,35444=>1000,
-	35445=>1000,35446=>1000,35447=>1000,35448=>1000,35449=>1000,35450=>1000,35451=>1000,35452=>1000,35453=>1000,35454=>1000,35455=>1000,35456=>1000,35457=>1000,35458=>1000,35459=>1000,35460=>1000,
-	35461=>1000,35462=>1000,35463=>1000,35464=>1000,35465=>1000,35466=>1000,35467=>1000,35468=>1000,35469=>1000,35470=>1000,35471=>1000,35472=>1000,35473=>1000,35474=>1000,35475=>1000,35476=>1000,
-	35477=>1000,35478=>1000,35479=>1000,35480=>1000,35481=>1000,35482=>1000,35483=>1000,35484=>1000,35485=>1000,35486=>1000,35487=>1000,35488=>1000,35489=>1000,35490=>1000,35491=>1000,35492=>1000,
-	35493=>1000,35494=>1000,35495=>1000,35496=>1000,35497=>1000,35498=>1000,35499=>1000,35500=>1000,35501=>1000,35502=>1000,35503=>1000,35504=>1000,35505=>1000,35506=>1000,35507=>1000,35508=>1000,
-	35509=>1000,35510=>1000,35511=>1000,35512=>1000,35513=>1000,35514=>1000,35515=>1000,35516=>1000,35517=>1000,35518=>1000,35519=>1000,35520=>1000,35521=>1000,35522=>1000,35523=>1000,35524=>1000,
-	35525=>1000,35526=>1000,35527=>1000,35528=>1000,35529=>1000,35530=>1000,35531=>1000,35532=>1000,35533=>1000,35534=>1000,35535=>1000,35536=>1000,35537=>1000,35538=>1000,35539=>1000,35540=>1000,
-	35541=>1000,35542=>1000,35543=>1000,35544=>1000,35545=>1000,35546=>1000,35547=>1000,35548=>1000,35549=>1000,35550=>1000,35551=>1000,35552=>1000,35553=>1000,35554=>1000,35555=>1000,35556=>1000,
-	35557=>1000,35558=>1000,35559=>1000,35560=>1000,35561=>1000,35562=>1000,35563=>1000,35564=>1000,35565=>1000,35566=>1000,35567=>1000,35568=>1000,35569=>1000,35570=>1000,35571=>1000,35572=>1000,
-	35573=>1000,35574=>1000,35575=>1000,35576=>1000,35577=>1000,35578=>1000,35579=>1000,35580=>1000,35581=>1000,35582=>1000,35583=>1000,35584=>1000,35585=>1000,35586=>1000,35587=>1000,35588=>1000,
-	35589=>1000,35590=>1000,35591=>1000,35592=>1000,35593=>1000,35594=>1000,35595=>1000,35596=>1000,35597=>1000,35598=>1000,35599=>1000,35600=>1000,35601=>1000,35602=>1000,35603=>1000,35604=>1000,
-	35605=>1000,35606=>1000,35607=>1000,35608=>1000,35609=>1000,35610=>1000,35611=>1000,35612=>1000,35613=>1000,35614=>1000,35615=>1000,35616=>1000,35617=>1000,35618=>1000,35619=>1000,35620=>1000,
-	35621=>1000,35622=>1000,35623=>1000,35624=>1000,35625=>1000,35626=>1000,35627=>1000,35628=>1000,35629=>1000,35630=>1000,35631=>1000,35632=>1000,35633=>1000,35634=>1000,35635=>1000,35636=>1000,
-	35637=>1000,35638=>1000,35639=>1000,35640=>1000,35641=>1000,35642=>1000,35643=>1000,35644=>1000,35645=>1000,35646=>1000,35647=>1000,35648=>1000,35649=>1000,35650=>1000,35651=>1000,35652=>1000,
-	35653=>1000,35654=>1000,35655=>1000,35656=>1000,35657=>1000,35658=>1000,35659=>1000,35660=>1000,35661=>1000,35662=>1000,35663=>1000,35664=>1000,35665=>1000,35666=>1000,35667=>1000,35668=>1000,
-	35669=>1000,35670=>1000,35671=>1000,35672=>1000,35673=>1000,35674=>1000,35675=>1000,35676=>1000,35677=>1000,35678=>1000,35679=>1000,35680=>1000,35681=>1000,35682=>1000,35683=>1000,35684=>1000,
-	35685=>1000,35686=>1000,35687=>1000,35688=>1000,35689=>1000,35690=>1000,35691=>1000,35692=>1000,35693=>1000,35694=>1000,35695=>1000,35696=>1000,35697=>1000,35698=>1000,35699=>1000,35700=>1000,
-	35701=>1000,35702=>1000,35703=>1000,35704=>1000,35705=>1000,35706=>1000,35707=>1000,35708=>1000,35709=>1000,35710=>1000,35711=>1000,35712=>1000,35713=>1000,35714=>1000,35715=>1000,35716=>1000,
-	35717=>1000,35718=>1000,35719=>1000,35720=>1000,35721=>1000,35722=>1000,35723=>1000,35724=>1000,35725=>1000,35726=>1000,35727=>1000,35728=>1000,35729=>1000,35730=>1000,35731=>1000,35732=>1000,
-	35733=>1000,35734=>1000,35735=>1000,35736=>1000,35737=>1000,35738=>1000,35739=>1000,35740=>1000,35741=>1000,35742=>1000,35743=>1000,35744=>1000,35745=>1000,35746=>1000,35747=>1000,35748=>1000,
-	35749=>1000,35750=>1000,35751=>1000,35752=>1000,35753=>1000,35754=>1000,35755=>1000,35756=>1000,35757=>1000,35758=>1000,35759=>1000,35760=>1000,35761=>1000,35762=>1000,35763=>1000,35764=>1000,
-	35765=>1000,35766=>1000,35767=>1000,35768=>1000,35769=>1000,35770=>1000,35771=>1000,35772=>1000,35773=>1000,35774=>1000,35775=>1000,35776=>1000,35777=>1000,35778=>1000,35779=>1000,35780=>1000,
-	35781=>1000,35782=>1000,35783=>1000,35784=>1000,35785=>1000,35786=>1000,35787=>1000,35788=>1000,35789=>1000,35790=>1000,35791=>1000,35792=>1000,35793=>1000,35794=>1000,35795=>1000,35796=>1000,
-	35797=>1000,35798=>1000,35799=>1000,35800=>1000,35801=>1000,35802=>1000,35803=>1000,35804=>1000,35805=>1000,35806=>1000,35807=>1000,35808=>1000,35809=>1000,35810=>1000,35811=>1000,35812=>1000,
-	35813=>1000,35814=>1000,35815=>1000,35816=>1000,35817=>1000,35818=>1000,35819=>1000,35820=>1000,35821=>1000,35822=>1000,35823=>1000,35824=>1000,35825=>1000,35826=>1000,35827=>1000,35828=>1000,
-	35829=>1000,35830=>1000,35831=>1000,35832=>1000,35833=>1000,35834=>1000,35835=>1000,35836=>1000,35837=>1000,35838=>1000,35839=>1000,35840=>1000,35841=>1000,35842=>1000,35843=>1000,35844=>1000,
-	35845=>1000,35846=>1000,35847=>1000,35848=>1000,35849=>1000,35850=>1000,35851=>1000,35852=>1000,35853=>1000,35854=>1000,35855=>1000,35856=>1000,35857=>1000,35858=>1000,35859=>1000,35860=>1000,
-	35861=>1000,35862=>1000,35863=>1000,35864=>1000,35865=>1000,35866=>1000,35867=>1000,35868=>1000,35869=>1000,35870=>1000,35871=>1000,35872=>1000,35873=>1000,35874=>1000,35875=>1000,35876=>1000,
-	35877=>1000,35878=>1000,35879=>1000,35880=>1000,35881=>1000,35882=>1000,35883=>1000,35884=>1000,35885=>1000,35886=>1000,35887=>1000,35888=>1000,35889=>1000,35890=>1000,35891=>1000,35892=>1000,
-	35893=>1000,35894=>1000,35895=>1000,35896=>1000,35897=>1000,35898=>1000,35899=>1000,35900=>1000,35901=>1000,35902=>1000,35903=>1000,35904=>1000,35905=>1000,35906=>1000,35907=>1000,35908=>1000,
-	35909=>1000,35910=>1000,35911=>1000,35912=>1000,35913=>1000,35914=>1000,35915=>1000,35916=>1000,35917=>1000,35918=>1000,35919=>1000,35920=>1000,35921=>1000,35922=>1000,35923=>1000,35924=>1000,
-	35925=>1000,35926=>1000,35927=>1000,35928=>1000,35929=>1000,35930=>1000,35931=>1000,35932=>1000,35933=>1000,35934=>1000,35935=>1000,35936=>1000,35937=>1000,35938=>1000,35939=>1000,35940=>1000,
-	35941=>1000,35942=>1000,35943=>1000,35944=>1000,35945=>1000,35946=>1000,35947=>1000,35948=>1000,35949=>1000,35950=>1000,35951=>1000,35952=>1000,35953=>1000,35954=>1000,35955=>1000,35956=>1000,
-	35957=>1000,35958=>1000,35959=>1000,35960=>1000,35961=>1000,35962=>1000,35963=>1000,35964=>1000,35965=>1000,35966=>1000,35967=>1000,35968=>1000,35969=>1000,35970=>1000,35971=>1000,35972=>1000,
-	35973=>1000,35974=>1000,35975=>1000,35976=>1000,35977=>1000,35978=>1000,35979=>1000,35980=>1000,35981=>1000,35982=>1000,35983=>1000,35984=>1000,35985=>1000,35986=>1000,35987=>1000,35988=>1000,
-	35989=>1000,35990=>1000,35991=>1000,35992=>1000,35993=>1000,35994=>1000,35995=>1000,35996=>1000,35997=>1000,35998=>1000,35999=>1000,36000=>1000,36001=>1000,36002=>1000,36003=>1000,36004=>1000,
-	36005=>1000,36006=>1000,36007=>1000,36008=>1000,36009=>1000,36010=>1000,36011=>1000,36012=>1000,36013=>1000,36014=>1000,36015=>1000,36016=>1000,36017=>1000,36018=>1000,36019=>1000,36020=>1000,
-	36021=>1000,36022=>1000,36023=>1000,36024=>1000,36025=>1000,36026=>1000,36027=>1000,36028=>1000,36029=>1000,36030=>1000,36031=>1000,36032=>1000,36033=>1000,36034=>1000,36035=>1000,36036=>1000,
-	36037=>1000,36038=>1000,36039=>1000,36040=>1000,36041=>1000,36042=>1000,36043=>1000,36044=>1000,36045=>1000,36046=>1000,36047=>1000,36048=>1000,36049=>1000,36050=>1000,36051=>1000,36052=>1000,
-	36053=>1000,36054=>1000,36055=>1000,36056=>1000,36057=>1000,36058=>1000,36059=>1000,36060=>1000,36061=>1000,36062=>1000,36063=>1000,36064=>1000,36065=>1000,36066=>1000,36067=>1000,36068=>1000,
-	36069=>1000,36070=>1000,36071=>1000,36072=>1000,36073=>1000,36074=>1000,36075=>1000,36076=>1000,36077=>1000,36078=>1000,36079=>1000,36080=>1000,36081=>1000,36082=>1000,36083=>1000,36084=>1000,
-	36085=>1000,36086=>1000,36087=>1000,36088=>1000,36089=>1000,36090=>1000,36091=>1000,36092=>1000,36093=>1000,36094=>1000,36095=>1000,36096=>1000,36097=>1000,36098=>1000,36099=>1000,36100=>1000,
-	36101=>1000,36102=>1000,36103=>1000,36104=>1000,36105=>1000,36106=>1000,36107=>1000,36108=>1000,36109=>1000,36110=>1000,36111=>1000,36112=>1000,36113=>1000,36114=>1000,36115=>1000,36116=>1000,
-	36117=>1000,36118=>1000,36119=>1000,36120=>1000,36121=>1000,36122=>1000,36123=>1000,36124=>1000,36125=>1000,36126=>1000,36127=>1000,36128=>1000,36129=>1000,36130=>1000,36131=>1000,36132=>1000,
-	36133=>1000,36134=>1000,36135=>1000,36136=>1000,36137=>1000,36138=>1000,36139=>1000,36140=>1000,36141=>1000,36142=>1000,36143=>1000,36144=>1000,36145=>1000,36146=>1000,36147=>1000,36148=>1000,
-	36149=>1000,36150=>1000,36151=>1000,36152=>1000,36153=>1000,36154=>1000,36155=>1000,36156=>1000,36157=>1000,36158=>1000,36159=>1000,36160=>1000,36161=>1000,36162=>1000,36163=>1000,36164=>1000,
-	36165=>1000,36166=>1000,36167=>1000,36168=>1000,36169=>1000,36170=>1000,36171=>1000,36172=>1000,36173=>1000,36174=>1000,36175=>1000,36176=>1000,36177=>1000,36178=>1000,36179=>1000,36180=>1000,
-	36181=>1000,36182=>1000,36183=>1000,36184=>1000,36185=>1000,36186=>1000,36187=>1000,36188=>1000,36189=>1000,36190=>1000,36191=>1000,36192=>1000,36193=>1000,36194=>1000,36195=>1000,36196=>1000,
-	36197=>1000,36198=>1000,36199=>1000,36200=>1000,36201=>1000,36202=>1000,36203=>1000,36204=>1000,36205=>1000,36206=>1000,36207=>1000,36208=>1000,36209=>1000,36210=>1000,36211=>1000,36212=>1000,
-	36213=>1000,36214=>1000,36215=>1000,36216=>1000,36217=>1000,36218=>1000,36219=>1000,36220=>1000,36221=>1000,36222=>1000,36223=>1000,36224=>1000,36225=>1000,36226=>1000,36227=>1000,36228=>1000,
-	36229=>1000,36230=>1000,36231=>1000,36232=>1000,36233=>1000,36234=>1000,36235=>1000,36236=>1000,36237=>1000,36238=>1000,36239=>1000,36240=>1000,36241=>1000,36242=>1000,36243=>1000,36244=>1000,
-	36245=>1000,36246=>1000,36247=>1000,36248=>1000,36249=>1000,36250=>1000,36251=>1000,36252=>1000,36253=>1000,36254=>1000,36255=>1000,36256=>1000,36257=>1000,36258=>1000,36259=>1000,36260=>1000,
-	36261=>1000,36262=>1000,36263=>1000,36264=>1000,36265=>1000,36266=>1000,36267=>1000,36268=>1000,36269=>1000,36270=>1000,36271=>1000,36272=>1000,36273=>1000,36274=>1000,36275=>1000,36276=>1000,
-	36277=>1000,36278=>1000,36279=>1000,36280=>1000,36281=>1000,36282=>1000,36283=>1000,36284=>1000,36285=>1000,36286=>1000,36287=>1000,36288=>1000,36289=>1000,36290=>1000,36291=>1000,36292=>1000,
-	36293=>1000,36294=>1000,36295=>1000,36296=>1000,36297=>1000,36298=>1000,36299=>1000,36300=>1000,36301=>1000,36302=>1000,36303=>1000,36304=>1000,36305=>1000,36306=>1000,36307=>1000,36308=>1000,
-	36309=>1000,36310=>1000,36311=>1000,36312=>1000,36313=>1000,36314=>1000,36315=>1000,36316=>1000,36317=>1000,36318=>1000,36319=>1000,36320=>1000,36321=>1000,36322=>1000,36323=>1000,36324=>1000,
-	36325=>1000,36326=>1000,36327=>1000,36328=>1000,36329=>1000,36330=>1000,36331=>1000,36332=>1000,36333=>1000,36334=>1000,36335=>1000,36336=>1000,36337=>1000,36338=>1000,36339=>1000,36340=>1000,
-	36341=>1000,36342=>1000,36343=>1000,36344=>1000,36345=>1000,36346=>1000,36347=>1000,36348=>1000,36349=>1000,36350=>1000,36351=>1000,36352=>1000,36353=>1000,36354=>1000,36355=>1000,36356=>1000,
-	36357=>1000,36358=>1000,36359=>1000,36360=>1000,36361=>1000,36362=>1000,36363=>1000,36364=>1000,36365=>1000,36366=>1000,36367=>1000,36368=>1000,36369=>1000,36370=>1000,36371=>1000,36372=>1000,
-	36373=>1000,36374=>1000,36375=>1000,36376=>1000,36377=>1000,36378=>1000,36379=>1000,36380=>1000,36381=>1000,36382=>1000,36383=>1000,36384=>1000,36385=>1000,36386=>1000,36387=>1000,36388=>1000,
-	36389=>1000,36390=>1000,36391=>1000,36392=>1000,36393=>1000,36394=>1000,36395=>1000,36396=>1000,36397=>1000,36398=>1000,36399=>1000,36400=>1000,36401=>1000,36402=>1000,36403=>1000,36404=>1000,
-	36405=>1000,36406=>1000,36407=>1000,36408=>1000,36409=>1000,36410=>1000,36411=>1000,36412=>1000,36413=>1000,36414=>1000,36415=>1000,36416=>1000,36417=>1000,36418=>1000,36419=>1000,36420=>1000,
-	36421=>1000,36422=>1000,36423=>1000,36424=>1000,36425=>1000,36426=>1000,36427=>1000,36428=>1000,36429=>1000,36430=>1000,36431=>1000,36432=>1000,36433=>1000,36434=>1000,36435=>1000,36436=>1000,
-	36437=>1000,36438=>1000,36439=>1000,36440=>1000,36441=>1000,36442=>1000,36443=>1000,36444=>1000,36445=>1000,36446=>1000,36447=>1000,36448=>1000,36449=>1000,36450=>1000,36451=>1000,36452=>1000,
-	36453=>1000,36454=>1000,36455=>1000,36456=>1000,36457=>1000,36458=>1000,36459=>1000,36460=>1000,36461=>1000,36462=>1000,36463=>1000,36464=>1000,36465=>1000,36466=>1000,36467=>1000,36468=>1000,
-	36469=>1000,36470=>1000,36471=>1000,36472=>1000,36473=>1000,36474=>1000,36475=>1000,36476=>1000,36477=>1000,36478=>1000,36479=>1000,36480=>1000,36481=>1000,36482=>1000,36483=>1000,36484=>1000,
-	36485=>1000,36486=>1000,36487=>1000,36488=>1000,36489=>1000,36490=>1000,36491=>1000,36492=>1000,36493=>1000,36494=>1000,36495=>1000,36496=>1000,36497=>1000,36498=>1000,36499=>1000,36500=>1000,
-	36501=>1000,36502=>1000,36503=>1000,36504=>1000,36505=>1000,36506=>1000,36507=>1000,36508=>1000,36509=>1000,36510=>1000,36511=>1000,36512=>1000,36513=>1000,36514=>1000,36515=>1000,36516=>1000,
-	36517=>1000,36518=>1000,36519=>1000,36520=>1000,36521=>1000,36522=>1000,36523=>1000,36524=>1000,36525=>1000,36526=>1000,36527=>1000,36528=>1000,36529=>1000,36530=>1000,36531=>1000,36532=>1000,
-	36533=>1000,36534=>1000,36535=>1000,36536=>1000,36537=>1000,36538=>1000,36539=>1000,36540=>1000,36541=>1000,36542=>1000,36543=>1000,36544=>1000,36545=>1000,36546=>1000,36547=>1000,36548=>1000,
-	36549=>1000,36550=>1000,36551=>1000,36552=>1000,36553=>1000,36554=>1000,36555=>1000,36556=>1000,36557=>1000,36558=>1000,36559=>1000,36560=>1000,36561=>1000,36562=>1000,36563=>1000,36564=>1000,
-	36565=>1000,36566=>1000,36567=>1000,36568=>1000,36569=>1000,36570=>1000,36571=>1000,36572=>1000,36573=>1000,36574=>1000,36575=>1000,36576=>1000,36577=>1000,36578=>1000,36579=>1000,36580=>1000,
-	36581=>1000,36582=>1000,36583=>1000,36584=>1000,36585=>1000,36586=>1000,36587=>1000,36588=>1000,36589=>1000,36590=>1000,36591=>1000,36592=>1000,36593=>1000,36594=>1000,36595=>1000,36596=>1000,
-	36597=>1000,36598=>1000,36599=>1000,36600=>1000,36601=>1000,36602=>1000,36603=>1000,36604=>1000,36605=>1000,36606=>1000,36607=>1000,36608=>1000,36609=>1000,36610=>1000,36611=>1000,36612=>1000,
-	36613=>1000,36614=>1000,36615=>1000,36616=>1000,36617=>1000,36618=>1000,36619=>1000,36620=>1000,36621=>1000,36622=>1000,36623=>1000,36624=>1000,36625=>1000,36626=>1000,36627=>1000,36628=>1000,
-	36629=>1000,36630=>1000,36631=>1000,36632=>1000,36633=>1000,36634=>1000,36635=>1000,36636=>1000,36637=>1000,36638=>1000,36639=>1000,36640=>1000,36641=>1000,36642=>1000,36643=>1000,36644=>1000,
-	36645=>1000,36646=>1000,36647=>1000,36648=>1000,36649=>1000,36650=>1000,36651=>1000,36652=>1000,36653=>1000,36654=>1000,36655=>1000,36656=>1000,36657=>1000,36658=>1000,36659=>1000,36660=>1000,
-	36661=>1000,36662=>1000,36663=>1000,36664=>1000,36665=>1000,36666=>1000,36667=>1000,36668=>1000,36669=>1000,36670=>1000,36671=>1000,36672=>1000,36673=>1000,36674=>1000,36675=>1000,36676=>1000,
-	36677=>1000,36678=>1000,36679=>1000,36680=>1000,36681=>1000,36682=>1000,36683=>1000,36684=>1000,36685=>1000,36686=>1000,36687=>1000,36688=>1000,36689=>1000,36690=>1000,36691=>1000,36692=>1000,
-	36693=>1000,36694=>1000,36695=>1000,36696=>1000,36697=>1000,36698=>1000,36699=>1000,36700=>1000,36701=>1000,36702=>1000,36703=>1000,36704=>1000,36705=>1000,36706=>1000,36707=>1000,36708=>1000,
-	36709=>1000,36710=>1000,36711=>1000,36712=>1000,36713=>1000,36714=>1000,36715=>1000,36716=>1000,36717=>1000,36718=>1000,36719=>1000,36720=>1000,36721=>1000,36722=>1000,36723=>1000,36724=>1000,
-	36725=>1000,36726=>1000,36727=>1000,36728=>1000,36729=>1000,36730=>1000,36731=>1000,36732=>1000,36733=>1000,36734=>1000,36735=>1000,36736=>1000,36737=>1000,36738=>1000,36739=>1000,36740=>1000,
-	36741=>1000,36742=>1000,36743=>1000,36744=>1000,36745=>1000,36746=>1000,36747=>1000,36748=>1000,36749=>1000,36750=>1000,36751=>1000,36752=>1000,36753=>1000,36754=>1000,36755=>1000,36756=>1000,
-	36757=>1000,36758=>1000,36759=>1000,36760=>1000,36761=>1000,36762=>1000,36763=>1000,36764=>1000,36765=>1000,36766=>1000,36767=>1000,36768=>1000,36769=>1000,36770=>1000,36771=>1000,36772=>1000,
-	36773=>1000,36774=>1000,36775=>1000,36776=>1000,36777=>1000,36778=>1000,36779=>1000,36780=>1000,36781=>1000,36782=>1000,36783=>1000,36784=>1000,36785=>1000,36786=>1000,36787=>1000,36788=>1000,
-	36789=>1000,36790=>1000,36791=>1000,36792=>1000,36793=>1000,36794=>1000,36795=>1000,36796=>1000,36797=>1000,36798=>1000,36799=>1000,36800=>1000,36801=>1000,36802=>1000,36803=>1000,36804=>1000,
-	36805=>1000,36806=>1000,36807=>1000,36808=>1000,36809=>1000,36810=>1000,36811=>1000,36812=>1000,36813=>1000,36814=>1000,36815=>1000,36816=>1000,36817=>1000,36818=>1000,36819=>1000,36820=>1000,
-	36821=>1000,36822=>1000,36823=>1000,36824=>1000,36825=>1000,36826=>1000,36827=>1000,36828=>1000,36829=>1000,36830=>1000,36831=>1000,36832=>1000,36833=>1000,36834=>1000,36835=>1000,36836=>1000,
-	36837=>1000,36838=>1000,36839=>1000,36840=>1000,36841=>1000,36842=>1000,36843=>1000,36844=>1000,36845=>1000,36846=>1000,36847=>1000,36848=>1000,36849=>1000,36850=>1000,36851=>1000,36852=>1000,
-	36853=>1000,36854=>1000,36855=>1000,36856=>1000,36857=>1000,36858=>1000,36859=>1000,36860=>1000,36861=>1000,36862=>1000,36863=>1000,36864=>1000,36865=>1000,36866=>1000,36867=>1000,36868=>1000,
-	36869=>1000,36870=>1000,36871=>1000,36872=>1000,36873=>1000,36874=>1000,36875=>1000,36876=>1000,36877=>1000,36878=>1000,36879=>1000,36880=>1000,36881=>1000,36882=>1000,36883=>1000,36884=>1000,
-	36885=>1000,36886=>1000,36887=>1000,36888=>1000,36889=>1000,36890=>1000,36891=>1000,36892=>1000,36893=>1000,36894=>1000,36895=>1000,36896=>1000,36897=>1000,36898=>1000,36899=>1000,36900=>1000,
-	36901=>1000,36902=>1000,36903=>1000,36904=>1000,36905=>1000,36906=>1000,36907=>1000,36908=>1000,36909=>1000,36910=>1000,36911=>1000,36912=>1000,36913=>1000,36914=>1000,36915=>1000,36916=>1000,
-	36917=>1000,36918=>1000,36919=>1000,36920=>1000,36921=>1000,36922=>1000,36923=>1000,36924=>1000,36925=>1000,36926=>1000,36927=>1000,36928=>1000,36929=>1000,36930=>1000,36931=>1000,36932=>1000,
-	36933=>1000,36934=>1000,36935=>1000,36936=>1000,36937=>1000,36938=>1000,36939=>1000,36940=>1000,36941=>1000,36942=>1000,36943=>1000,36944=>1000,36945=>1000,36946=>1000,36947=>1000,36948=>1000,
-	36949=>1000,36950=>1000,36951=>1000,36952=>1000,36953=>1000,36954=>1000,36955=>1000,36956=>1000,36957=>1000,36958=>1000,36959=>1000,36960=>1000,36961=>1000,36962=>1000,36963=>1000,36964=>1000,
-	36965=>1000,36966=>1000,36967=>1000,36968=>1000,36969=>1000,36970=>1000,36971=>1000,36972=>1000,36973=>1000,36974=>1000,36975=>1000,36976=>1000,36977=>1000,36978=>1000,36979=>1000,36980=>1000,
-	36981=>1000,36982=>1000,36983=>1000,36984=>1000,36985=>1000,36986=>1000,36987=>1000,36988=>1000,36989=>1000,36990=>1000,36991=>1000,36992=>1000,36993=>1000,36994=>1000,36995=>1000,36996=>1000,
-	36997=>1000,36998=>1000,36999=>1000,37000=>1000,37001=>1000,37002=>1000,37003=>1000,37004=>1000,37005=>1000,37006=>1000,37007=>1000,37008=>1000,37009=>1000,37010=>1000,37011=>1000,37012=>1000,
-	37013=>1000,37014=>1000,37015=>1000,37016=>1000,37017=>1000,37018=>1000,37019=>1000,37020=>1000,37021=>1000,37022=>1000,37023=>1000,37024=>1000,37025=>1000,37026=>1000,37027=>1000,37028=>1000,
-	37029=>1000,37030=>1000,37031=>1000,37032=>1000,37033=>1000,37034=>1000,37035=>1000,37036=>1000,37037=>1000,37038=>1000,37039=>1000,37040=>1000,37041=>1000,37042=>1000,37043=>1000,37044=>1000,
-	37045=>1000,37046=>1000,37047=>1000,37048=>1000,37049=>1000,37050=>1000,37051=>1000,37052=>1000,37053=>1000,37054=>1000,37055=>1000,37056=>1000,37057=>1000,37058=>1000,37059=>1000,37060=>1000,
-	37061=>1000,37062=>1000,37063=>1000,37064=>1000,37065=>1000,37066=>1000,37067=>1000,37068=>1000,37069=>1000,37070=>1000,37071=>1000,37072=>1000,37073=>1000,37074=>1000,37075=>1000,37076=>1000,
-	37077=>1000,37078=>1000,37079=>1000,37080=>1000,37081=>1000,37082=>1000,37083=>1000,37084=>1000,37085=>1000,37086=>1000,37087=>1000,37088=>1000,37089=>1000,37090=>1000,37091=>1000,37092=>1000,
-	37093=>1000,37094=>1000,37095=>1000,37096=>1000,37097=>1000,37098=>1000,37099=>1000,37100=>1000,37101=>1000,37102=>1000,37103=>1000,37104=>1000,37105=>1000,37106=>1000,37107=>1000,37108=>1000,
-	37109=>1000,37110=>1000,37111=>1000,37112=>1000,37113=>1000,37114=>1000,37115=>1000,37116=>1000,37117=>1000,37118=>1000,37119=>1000,37120=>1000,37121=>1000,37122=>1000,37123=>1000,37124=>1000,
-	37125=>1000,37126=>1000,37127=>1000,37128=>1000,37129=>1000,37130=>1000,37131=>1000,37132=>1000,37133=>1000,37134=>1000,37135=>1000,37136=>1000,37137=>1000,37138=>1000,37139=>1000,37140=>1000,
-	37141=>1000,37142=>1000,37143=>1000,37144=>1000,37145=>1000,37146=>1000,37147=>1000,37148=>1000,37149=>1000,37150=>1000,37151=>1000,37152=>1000,37153=>1000,37154=>1000,37155=>1000,37156=>1000,
-	37157=>1000,37158=>1000,37159=>1000,37160=>1000,37161=>1000,37162=>1000,37163=>1000,37164=>1000,37165=>1000,37166=>1000,37167=>1000,37168=>1000,37169=>1000,37170=>1000,37171=>1000,37172=>1000,
-	37173=>1000,37174=>1000,37175=>1000,37176=>1000,37177=>1000,37178=>1000,37179=>1000,37180=>1000,37181=>1000,37182=>1000,37183=>1000,37184=>1000,37185=>1000,37186=>1000,37187=>1000,37188=>1000,
-	37189=>1000,37190=>1000,37191=>1000,37192=>1000,37193=>1000,37194=>1000,37195=>1000,37196=>1000,37197=>1000,37198=>1000,37199=>1000,37200=>1000,37201=>1000,37202=>1000,37203=>1000,37204=>1000,
-	37205=>1000,37206=>1000,37207=>1000,37208=>1000,37209=>1000,37210=>1000,37211=>1000,37212=>1000,37213=>1000,37214=>1000,37215=>1000,37216=>1000,37217=>1000,37218=>1000,37219=>1000,37220=>1000,
-	37221=>1000,37222=>1000,37223=>1000,37224=>1000,37225=>1000,37226=>1000,37227=>1000,37228=>1000,37229=>1000,37230=>1000,37231=>1000,37232=>1000,37233=>1000,37234=>1000,37235=>1000,37236=>1000,
-	37237=>1000,37238=>1000,37239=>1000,37240=>1000,37241=>1000,37242=>1000,37243=>1000,37244=>1000,37245=>1000,37246=>1000,37247=>1000,37248=>1000,37249=>1000,37250=>1000,37251=>1000,37252=>1000,
-	37253=>1000,37254=>1000,37255=>1000,37256=>1000,37257=>1000,37258=>1000,37259=>1000,37260=>1000,37261=>1000,37262=>1000,37263=>1000,37264=>1000,37265=>1000,37266=>1000,37267=>1000,37268=>1000,
-	37269=>1000,37270=>1000,37271=>1000,37272=>1000,37273=>1000,37274=>1000,37275=>1000,37276=>1000,37277=>1000,37278=>1000,37279=>1000,37280=>1000,37281=>1000,37282=>1000,37283=>1000,37284=>1000,
-	37285=>1000,37286=>1000,37287=>1000,37288=>1000,37289=>1000,37290=>1000,37291=>1000,37292=>1000,37293=>1000,37294=>1000,37295=>1000,37296=>1000,37297=>1000,37298=>1000,37299=>1000,37300=>1000,
-	37301=>1000,37302=>1000,37303=>1000,37304=>1000,37305=>1000,37306=>1000,37307=>1000,37308=>1000,37309=>1000,37310=>1000,37311=>1000,37312=>1000,37313=>1000,37314=>1000,37315=>1000,37316=>1000,
-	37317=>1000,37318=>1000,37319=>1000,37320=>1000,37321=>1000,37322=>1000,37323=>1000,37324=>1000,37325=>1000,37326=>1000,37327=>1000,37328=>1000,37329=>1000,37330=>1000,37331=>1000,37332=>1000,
-	37333=>1000,37334=>1000,37335=>1000,37336=>1000,37337=>1000,37338=>1000,37339=>1000,37340=>1000,37341=>1000,37342=>1000,37343=>1000,37344=>1000,37345=>1000,37346=>1000,37347=>1000,37348=>1000,
-	37349=>1000,37350=>1000,37351=>1000,37352=>1000,37353=>1000,37354=>1000,37355=>1000,37356=>1000,37357=>1000,37358=>1000,37359=>1000,37360=>1000,37361=>1000,37362=>1000,37363=>1000,37364=>1000,
-	37365=>1000,37366=>1000,37367=>1000,37368=>1000,37369=>1000,37370=>1000,37371=>1000,37372=>1000,37373=>1000,37374=>1000,37375=>1000,37376=>1000,37377=>1000,37378=>1000,37379=>1000,37380=>1000,
-	37381=>1000,37382=>1000,37383=>1000,37384=>1000,37385=>1000,37386=>1000,37387=>1000,37388=>1000,37389=>1000,37390=>1000,37391=>1000,37392=>1000,37393=>1000,37394=>1000,37395=>1000,37396=>1000,
-	37397=>1000,37398=>1000,37399=>1000,37400=>1000,37401=>1000,37402=>1000,37403=>1000,37404=>1000,37405=>1000,37406=>1000,37407=>1000,37408=>1000,37409=>1000,37410=>1000,37411=>1000,37412=>1000,
-	37413=>1000,37414=>1000,37415=>1000,37416=>1000,37417=>1000,37418=>1000,37419=>1000,37420=>1000,37421=>1000,37422=>1000,37423=>1000,37424=>1000,37425=>1000,37426=>1000,37427=>1000,37428=>1000,
-	37429=>1000,37430=>1000,37431=>1000,37432=>1000,37433=>1000,37434=>1000,37435=>1000,37436=>1000,37437=>1000,37438=>1000,37439=>1000,37440=>1000,37441=>1000,37442=>1000,37443=>1000,37444=>1000,
-	37445=>1000,37446=>1000,37447=>1000,37448=>1000,37449=>1000,37450=>1000,37451=>1000,37452=>1000,37453=>1000,37454=>1000,37455=>1000,37456=>1000,37457=>1000,37458=>1000,37459=>1000,37460=>1000,
-	37461=>1000,37462=>1000,37463=>1000,37464=>1000,37465=>1000,37466=>1000,37467=>1000,37468=>1000,37469=>1000,37470=>1000,37471=>1000,37472=>1000,37473=>1000,37474=>1000,37475=>1000,37476=>1000,
-	37477=>1000,37478=>1000,37479=>1000,37480=>1000,37481=>1000,37482=>1000,37483=>1000,37484=>1000,37485=>1000,37486=>1000,37487=>1000,37488=>1000,37489=>1000,37490=>1000,37491=>1000,37492=>1000,
-	37493=>1000,37494=>1000,37495=>1000,37496=>1000,37497=>1000,37498=>1000,37499=>1000,37500=>1000,37501=>1000,37502=>1000,37503=>1000,37504=>1000,37505=>1000,37506=>1000,37507=>1000,37508=>1000,
-	37509=>1000,37510=>1000,37511=>1000,37512=>1000,37513=>1000,37514=>1000,37515=>1000,37516=>1000,37517=>1000,37518=>1000,37519=>1000,37520=>1000,37521=>1000,37522=>1000,37523=>1000,37524=>1000,
-	37525=>1000,37526=>1000,37527=>1000,37528=>1000,37529=>1000,37530=>1000,37531=>1000,37532=>1000,37533=>1000,37534=>1000,37535=>1000,37536=>1000,37537=>1000,37538=>1000,37539=>1000,37540=>1000,
-	37541=>1000,37542=>1000,37543=>1000,37544=>1000,37545=>1000,37546=>1000,37547=>1000,37548=>1000,37549=>1000,37550=>1000,37551=>1000,37552=>1000,37553=>1000,37554=>1000,37555=>1000,37556=>1000,
-	37557=>1000,37558=>1000,37559=>1000,37560=>1000,37561=>1000,37562=>1000,37563=>1000,37564=>1000,37565=>1000,37566=>1000,37567=>1000,37568=>1000,37569=>1000,37570=>1000,37571=>1000,37572=>1000,
-	37573=>1000,37574=>1000,37575=>1000,37576=>1000,37577=>1000,37578=>1000,37579=>1000,37580=>1000,37581=>1000,37582=>1000,37583=>1000,37584=>1000,37585=>1000,37586=>1000,37587=>1000,37588=>1000,
-	37589=>1000,37590=>1000,37591=>1000,37592=>1000,37593=>1000,37594=>1000,37595=>1000,37596=>1000,37597=>1000,37598=>1000,37599=>1000,37600=>1000,37601=>1000,37602=>1000,37603=>1000,37604=>1000,
-	37605=>1000,37606=>1000,37607=>1000,37608=>1000,37609=>1000,37610=>1000,37611=>1000,37612=>1000,37613=>1000,37614=>1000,37615=>1000,37616=>1000,37617=>1000,37618=>1000,37619=>1000,37620=>1000,
-	37621=>1000,37622=>1000,37623=>1000,37624=>1000,37625=>1000,37626=>1000,37627=>1000,37628=>1000,37629=>1000,37630=>1000,37631=>1000,37632=>1000,37633=>1000,37634=>1000,37635=>1000,37636=>1000,
-	37637=>1000,37638=>1000,37639=>1000,37640=>1000,37641=>1000,37642=>1000,37643=>1000,37644=>1000,37645=>1000,37646=>1000,37647=>1000,37648=>1000,37649=>1000,37650=>1000,37651=>1000,37652=>1000,
-	37653=>1000,37654=>1000,37655=>1000,37656=>1000,37657=>1000,37658=>1000,37659=>1000,37660=>1000,37661=>1000,37662=>1000,37663=>1000,37664=>1000,37665=>1000,37666=>1000,37667=>1000,37668=>1000,
-	37669=>1000,37670=>1000,37671=>1000,37672=>1000,37673=>1000,37674=>1000,37675=>1000,37676=>1000,37677=>1000,37678=>1000,37679=>1000,37680=>1000,37681=>1000,37682=>1000,37683=>1000,37684=>1000,
-	37685=>1000,37686=>1000,37687=>1000,37688=>1000,37689=>1000,37690=>1000,37691=>1000,37692=>1000,37693=>1000,37694=>1000,37695=>1000,37696=>1000,37697=>1000,37698=>1000,37699=>1000,37700=>1000,
-	37701=>1000,37702=>1000,37703=>1000,37704=>1000,37705=>1000,37706=>1000,37707=>1000,37708=>1000,37709=>1000,37710=>1000,37711=>1000,37712=>1000,37713=>1000,37714=>1000,37715=>1000,37716=>1000,
-	37717=>1000,37718=>1000,37719=>1000,37720=>1000,37721=>1000,37722=>1000,37723=>1000,37724=>1000,37725=>1000,37726=>1000,37727=>1000,37728=>1000,37729=>1000,37730=>1000,37731=>1000,37732=>1000,
-	37733=>1000,37734=>1000,37735=>1000,37736=>1000,37737=>1000,37738=>1000,37739=>1000,37740=>1000,37741=>1000,37742=>1000,37743=>1000,37744=>1000,37745=>1000,37746=>1000,37747=>1000,37748=>1000,
-	37749=>1000,37750=>1000,37751=>1000,37752=>1000,37753=>1000,37754=>1000,37755=>1000,37756=>1000,37757=>1000,37758=>1000,37759=>1000,37760=>1000,37761=>1000,37762=>1000,37763=>1000,37764=>1000,
-	37765=>1000,37766=>1000,37767=>1000,37768=>1000,37769=>1000,37770=>1000,37771=>1000,37772=>1000,37773=>1000,37774=>1000,37775=>1000,37776=>1000,37777=>1000,37778=>1000,37779=>1000,37780=>1000,
-	37781=>1000,37782=>1000,37783=>1000,37784=>1000,37785=>1000,37786=>1000,37787=>1000,37788=>1000,37789=>1000,37790=>1000,37791=>1000,37792=>1000,37793=>1000,37794=>1000,37795=>1000,37796=>1000,
-	37797=>1000,37798=>1000,37799=>1000,37800=>1000,37801=>1000,37802=>1000,37803=>1000,37804=>1000,37805=>1000,37806=>1000,37807=>1000,37808=>1000,37809=>1000,37810=>1000,37811=>1000,37812=>1000,
-	37813=>1000,37814=>1000,37815=>1000,37816=>1000,37817=>1000,37818=>1000,37819=>1000,37820=>1000,37821=>1000,37822=>1000,37823=>1000,37824=>1000,37825=>1000,37826=>1000,37827=>1000,37828=>1000,
-	37829=>1000,37830=>1000,37831=>1000,37832=>1000,37833=>1000,37834=>1000,37835=>1000,37836=>1000,37837=>1000,37838=>1000,37839=>1000,37840=>1000,37841=>1000,37842=>1000,37843=>1000,37844=>1000,
-	37845=>1000,37846=>1000,37847=>1000,37848=>1000,37849=>1000,37850=>1000,37851=>1000,37852=>1000,37853=>1000,37854=>1000,37855=>1000,37856=>1000,37857=>1000,37858=>1000,37859=>1000,37860=>1000,
-	37861=>1000,37862=>1000,37863=>1000,37864=>1000,37865=>1000,37866=>1000,37867=>1000,37868=>1000,37869=>1000,37870=>1000,37871=>1000,37872=>1000,37873=>1000,37874=>1000,37875=>1000,37876=>1000,
-	37877=>1000,37878=>1000,37879=>1000,37880=>1000,37881=>1000,37882=>1000,37883=>1000,37884=>1000,37885=>1000,37886=>1000,37887=>1000,37888=>1000,37889=>1000,37890=>1000,37891=>1000,37892=>1000,
-	37893=>1000,37894=>1000,37895=>1000,37896=>1000,37897=>1000,37898=>1000,37899=>1000,37900=>1000,37901=>1000,37902=>1000,37903=>1000,37904=>1000,37905=>1000,37906=>1000,37907=>1000,37908=>1000,
-	37909=>1000,37910=>1000,37911=>1000,37912=>1000,37913=>1000,37914=>1000,37915=>1000,37916=>1000,37917=>1000,37918=>1000,37919=>1000,37920=>1000,37921=>1000,37922=>1000,37923=>1000,37924=>1000,
-	37925=>1000,37926=>1000,37927=>998,37928=>1000,37929=>1000,37930=>1000,37931=>1000,37932=>1000,37933=>1000,37934=>1000,37935=>1000,37936=>1000,37937=>1000,37938=>1000,37939=>1000,37940=>1000,
-	37941=>1000,37942=>1000,37943=>1000,37944=>1000,37945=>1000,37946=>1000,37947=>1000,37948=>1000,37949=>1000,37950=>1000,37951=>1000,37952=>1000,37953=>1000,37954=>1000,37955=>1000,37956=>1000,
-	37957=>1000,37958=>1000,37959=>1000,37960=>1000,37961=>1000,37962=>1000,37963=>1000,37964=>1000,37965=>1000,37966=>1000,37967=>1000,37968=>1000,37969=>1000,37970=>1000,37971=>1000,37972=>1000,
-	37973=>1000,37974=>1000,37975=>1000,37976=>1000,37977=>1000,37978=>1000,37979=>1000,37980=>1000,37981=>1000,37982=>1000,37983=>1000,37984=>1000,37985=>1000,37986=>1000,37987=>1000,37988=>1000,
-	37989=>1000,37990=>1000,37991=>1000,37992=>1000,37993=>1000,37994=>1000,37995=>1000,37996=>1000,37997=>1000,37998=>1000,37999=>1000,38000=>1000,38001=>1000,38002=>1000,38003=>1000,38004=>1000,
-	38005=>1000,38006=>1000,38007=>1000,38008=>1000,38009=>1000,38010=>1000,38011=>1000,38012=>1000,38013=>1000,38014=>1000,38015=>1000,38016=>1000,38017=>1000,38018=>1000,38019=>1000,38020=>1000,
-	38021=>1000,38022=>1000,38023=>1000,38024=>1000,38025=>1000,38026=>1000,38027=>1000,38028=>1000,38029=>1000,38030=>1000,38031=>1000,38032=>1000,38033=>1000,38034=>1000,38035=>1000,38036=>1000,
-	38037=>1000,38038=>1000,38039=>1000,38040=>1000,38041=>1000,38042=>1000,38043=>1000,38044=>1000,38045=>1000,38046=>1000,38047=>1000,38048=>1000,38049=>1000,38050=>1000,38051=>1000,38052=>1000,
-	38053=>1000,38054=>1000,38055=>1000,38056=>1000,38057=>1000,38058=>1000,38059=>1000,38060=>1000,38061=>1000,38062=>1000,38063=>1000,38064=>1000,38065=>1000,38066=>1000,38067=>1000,38068=>1000,
-	38069=>1000,38070=>1000,38071=>1000,38072=>1000,38073=>1000,38074=>1000,38075=>1000,38076=>1000,38077=>1000,38078=>1000,38079=>1000,38080=>1000,38081=>1000,38082=>1000,38083=>1000,38084=>1000,
-	38085=>1000,38086=>1000,38087=>1000,38088=>1000,38089=>1000,38090=>1000,38091=>1000,38092=>1000,38093=>1000,38094=>1000,38095=>1000,38096=>1000,38097=>1000,38098=>1000,38099=>1000,38100=>1000,
-	38101=>1000,38102=>1000,38103=>1000,38104=>1000,38105=>1000,38106=>1000,38107=>1000,38108=>1000,38109=>1000,38110=>1000,38111=>1000,38112=>1000,38113=>1000,38114=>1000,38115=>1000,38116=>1000,
-	38117=>1000,38118=>1000,38119=>1000,38120=>1000,38121=>1000,38122=>1000,38123=>1000,38124=>1000,38125=>1000,38126=>1000,38127=>1000,38128=>1000,38129=>1000,38130=>1000,38131=>1000,38132=>1000,
-	38133=>1000,38134=>1000,38135=>1000,38136=>1000,38137=>1000,38138=>1000,38139=>1000,38140=>1000,38141=>1000,38142=>1000,38143=>1000,38144=>1000,38145=>1000,38146=>1000,38147=>1000,38148=>1000,
-	38149=>1000,38150=>1000,38151=>1000,38152=>1000,38153=>1000,38154=>1000,38155=>1000,38156=>1000,38157=>1000,38158=>1000,38159=>1000,38160=>1000,38161=>1000,38162=>1000,38163=>1000,38164=>1000,
-	38165=>1000,38166=>1000,38167=>1000,38168=>1000,38169=>1000,38170=>1000,38171=>1000,38172=>1000,38173=>1000,38174=>1000,38175=>1000,38176=>1000,38177=>1000,38178=>1000,38179=>1000,38180=>1000,
-	38181=>1000,38182=>1000,38183=>1000,38184=>1000,38185=>1000,38186=>1000,38187=>1000,38188=>1000,38189=>1000,38190=>1000,38191=>1000,38192=>1000,38193=>1000,38194=>1000,38195=>1000,38196=>1000,
-	38197=>1000,38198=>1000,38199=>1000,38200=>1000,38201=>1000,38202=>1000,38203=>1000,38204=>1000,38205=>1000,38206=>1000,38207=>1000,38208=>1000,38209=>1000,38210=>1000,38211=>1000,38212=>1000,
-	38213=>1000,38214=>1000,38215=>1000,38216=>1000,38217=>1000,38218=>1000,38219=>1000,38220=>1000,38221=>1000,38222=>1000,38223=>1000,38224=>1000,38225=>1000,38226=>1000,38227=>1000,38228=>1000,
-	38229=>1000,38230=>1000,38231=>1000,38232=>1000,38233=>1000,38234=>1000,38235=>1000,38236=>1000,38237=>1000,38238=>1000,38239=>1000,38240=>1000,38241=>1000,38242=>1000,38243=>1000,38244=>1000,
-	38245=>1000,38246=>1000,38247=>1000,38248=>1000,38249=>1000,38250=>1000,38251=>1000,38252=>1000,38253=>1000,38254=>1000,38255=>1000,38256=>1000,38257=>1000,38258=>1000,38259=>1000,38260=>1000,
-	38261=>1000,38262=>1000,38263=>1000,38264=>1000,38265=>1000,38266=>1000,38267=>1000,38268=>1000,38269=>1000,38270=>1000,38271=>1000,38272=>1000,38273=>1000,38274=>1000,38275=>1000,38276=>1000,
-	38277=>1000,38278=>1000,38279=>1000,38280=>1000,38281=>1000,38282=>1000,38283=>1000,38284=>1000,38285=>1000,38286=>1000,38287=>1000,38288=>1000,38289=>1000,38290=>1000,38291=>1000,38292=>1000,
-	38293=>1000,38294=>1000,38295=>1000,38296=>1000,38297=>1000,38298=>1000,38299=>1000,38300=>1000,38301=>1000,38302=>1000,38303=>1000,38304=>1000,38305=>1000,38306=>1000,38307=>1000,38308=>1000,
-	38309=>1000,38310=>1000,38311=>1000,38312=>1000,38313=>1000,38314=>1000,38315=>1000,38316=>1000,38317=>1000,38318=>1000,38319=>1000,38320=>1000,38321=>1000,38322=>1000,38323=>1000,38324=>1000,
-	38325=>1000,38326=>1000,38327=>1000,38328=>1000,38329=>1000,38330=>1000,38331=>1000,38332=>1000,38333=>1000,38334=>1000,38335=>1000,38336=>1000,38337=>1000,38338=>1000,38339=>1000,38340=>1000,
-	38341=>1000,38342=>1000,38343=>1000,38344=>1000,38345=>1000,38346=>1000,38347=>1000,38348=>1000,38349=>1000,38350=>1000,38351=>1000,38352=>1000,38353=>1000,38354=>1000,38355=>1000,38356=>1000,
-	38357=>1000,38358=>1000,38359=>1000,38360=>1000,38361=>1000,38362=>1000,38363=>1000,38364=>1000,38365=>1000,38366=>1000,38367=>1000,38368=>1000,38369=>1000,38370=>1000,38371=>1000,38372=>1000,
-	38373=>1000,38374=>1000,38375=>1000,38376=>1000,38377=>1000,38378=>1000,38379=>1000,38380=>1000,38381=>1000,38382=>1000,38383=>1000,38384=>1000,38385=>1000,38386=>1000,38387=>1000,38388=>1000,
-	38389=>1000,38390=>1000,38391=>1000,38392=>1000,38393=>1000,38394=>1000,38395=>1000,38396=>1000,38397=>1000,38398=>1000,38399=>1000,38400=>1000,38401=>1000,38402=>1000,38403=>1000,38404=>1000,
-	38405=>1000,38406=>1000,38407=>1000,38408=>1000,38409=>1000,38410=>1000,38411=>1000,38412=>1000,38413=>1000,38414=>1000,38415=>1000,38416=>1000,38417=>1000,38418=>1000,38419=>1000,38420=>1000,
-	38421=>1000,38422=>1000,38423=>1000,38424=>1000,38425=>1000,38426=>1000,38427=>1000,38428=>1000,38429=>1000,38430=>1000,38431=>1000,38432=>1000,38433=>1000,38434=>1000,38435=>1000,38436=>1000,
-	38437=>1000,38438=>1000,38439=>1000,38440=>1000,38441=>1000,38442=>1000,38443=>1000,38444=>1000,38445=>1000,38446=>1000,38447=>1000,38448=>1000,38449=>1000,38450=>1000,38451=>1000,38452=>1000,
-	38453=>1000,38454=>1000,38455=>1000,38456=>1000,38457=>1000,38458=>1000,38459=>1000,38460=>1000,38461=>1000,38462=>1000,38463=>1000,38464=>1000,38465=>1000,38466=>1000,38467=>1000,38468=>1000,
-	38469=>1000,38470=>1000,38471=>1000,38472=>1000,38473=>1000,38474=>1000,38475=>1000,38476=>1000,38477=>1000,38478=>1000,38479=>1000,38480=>1000,38481=>1000,38482=>1000,38483=>1000,38484=>1000,
-	38485=>1000,38486=>1000,38487=>1000,38488=>1000,38489=>1000,38490=>1000,38491=>1000,38492=>1000,38493=>1000,38494=>1000,38495=>1000,38496=>1000,38497=>1000,38498=>1000,38499=>1000,38500=>1000,
-	38501=>1000,38502=>1000,38503=>1000,38504=>1000,38505=>1000,38506=>1000,38507=>1000,38508=>1000,38509=>1000,38510=>1000,38511=>1000,38512=>1000,38513=>1000,38514=>1000,38515=>1000,38516=>1000,
-	38517=>1000,38518=>1000,38519=>1000,38520=>1000,38521=>1000,38522=>1000,38523=>1000,38524=>1000,38525=>1000,38526=>1000,38527=>1000,38528=>1000,38529=>1000,38530=>1000,38531=>1000,38532=>1000,
-	38533=>1000,38534=>1000,38535=>1000,38536=>1000,38537=>1000,38538=>1000,38539=>1000,38540=>1000,38541=>1000,38542=>1000,38543=>1000,38544=>1000,38545=>1000,38546=>1000,38547=>1000,38548=>1000,
-	38549=>1000,38550=>1000,38551=>1000,38552=>1000,38553=>1000,38554=>1000,38555=>1000,38556=>1000,38557=>1000,38558=>1000,38559=>1000,38560=>1000,38561=>1000,38562=>1000,38563=>1000,38564=>1000,
-	38565=>1000,38566=>1000,38567=>1000,38568=>1000,38569=>1000,38570=>1000,38571=>1000,38572=>1000,38573=>1000,38574=>1000,38575=>1000,38576=>1000,38577=>1000,38578=>1000,38579=>1000,38580=>1000,
-	38581=>1000,38582=>1000,38583=>1000,38584=>1000,38585=>1000,38586=>1000,38587=>1000,38588=>1000,38589=>1000,38590=>1000,38591=>1000,38592=>1000,38593=>1000,38594=>1000,38595=>1000,38596=>1000,
-	38597=>1000,38598=>1000,38599=>1000,38600=>1000,38601=>1000,38602=>1000,38603=>1000,38604=>1000,38605=>1000,38606=>1000,38607=>1000,38608=>1000,38609=>1000,38610=>1000,38611=>1000,38612=>1000,
-	38613=>1000,38614=>1000,38615=>1000,38616=>1000,38617=>1000,38618=>1000,38619=>1000,38620=>1000,38621=>1000,38622=>1000,38623=>1000,38624=>1000,38625=>1000,38626=>1000,38627=>1000,38628=>1000,
-	38629=>1000,38630=>1000,38631=>1000,38632=>1000,38633=>1000,38634=>1000,38635=>1000,38636=>1000,38637=>1000,38638=>1000,38639=>1000,38640=>1000,38641=>1000,38642=>1000,38643=>1000,38644=>1000,
-	38645=>1000,38646=>1000,38647=>1000,38648=>1000,38649=>1000,38650=>1000,38651=>1000,38652=>1000,38653=>1000,38654=>1000,38655=>1000,38656=>1000,38657=>1000,38658=>1000,38659=>1000,38660=>1000,
-	38661=>1000,38662=>1000,38663=>1000,38664=>1000,38665=>1000,38666=>1000,38667=>1000,38668=>1000,38669=>1000,38670=>1000,38671=>1000,38672=>1000,38673=>1000,38674=>1000,38675=>1000,38676=>1000,
-	38677=>1000,38678=>1000,38679=>1000,38680=>1000,38681=>1000,38682=>1000,38683=>1000,38684=>1000,38685=>1000,38686=>1000,38687=>1000,38688=>1000,38689=>1000,38690=>1000,38691=>1000,38692=>1000,
-	38693=>1000,38694=>1000,38695=>1000,38696=>1000,38697=>1000,38698=>1000,38699=>1000,38700=>1000,38701=>1000,38702=>1000,38703=>1000,38704=>1000,38705=>1000,38706=>1000,38707=>1000,38708=>1000,
-	38709=>1000,38710=>1000,38711=>1000,38712=>1000,38713=>1000,38714=>1000,38715=>1000,38716=>1000,38717=>1000,38718=>1000,38719=>1000,38720=>1000,38721=>1000,38722=>1000,38723=>1000,38724=>1000,
-	38725=>1000,38726=>1000,38727=>1000,38728=>1000,38729=>1000,38730=>1000,38731=>1000,38732=>1000,38733=>1000,38734=>1000,38735=>1000,38736=>1000,38737=>1000,38738=>1000,38739=>1000,38740=>1000,
-	38741=>1000,38742=>1000,38743=>1000,38744=>1000,38745=>1000,38746=>1000,38747=>1000,38748=>1000,38749=>1000,38750=>1000,38751=>1000,38752=>1000,38753=>1000,38754=>1000,38755=>1000,38756=>1000,
-	38757=>1000,38758=>1000,38759=>1000,38760=>1000,38761=>1000,38762=>1000,38763=>1000,38764=>1000,38765=>1000,38766=>1000,38767=>1000,38768=>1000,38769=>1000,38770=>1000,38771=>1000,38772=>1000,
-	38773=>1000,38774=>1000,38775=>1000,38776=>1000,38777=>1000,38778=>1000,38779=>1000,38780=>1000,38781=>1000,38782=>1000,38783=>1000,38784=>1000,38785=>1000,38786=>1000,38787=>1000,38788=>1000,
-	38789=>1000,38790=>1000,38791=>1000,38792=>1000,38793=>1000,38794=>1000,38795=>1000,38796=>1000,38797=>1000,38798=>1000,38799=>1000,38800=>1000,38801=>1000,38802=>1000,38803=>1000,38804=>1000,
-	38805=>1000,38806=>1000,38807=>1000,38808=>1000,38809=>1000,38810=>1000,38811=>1000,38812=>1000,38813=>1000,38814=>1000,38815=>1000,38816=>1000,38817=>1000,38818=>1000,38819=>1000,38820=>1000,
-	38821=>1000,38822=>1000,38823=>1000,38824=>1000,38825=>1000,38826=>1000,38827=>1000,38828=>1000,38829=>1000,38830=>1000,38831=>1000,38832=>1000,38833=>1000,38834=>1000,38835=>1000,38836=>1000,
-	38837=>1000,38838=>1000,38839=>1000,38840=>1000,38841=>1000,38842=>1000,38843=>1000,38844=>1000,38845=>1000,38846=>1000,38847=>1000,38848=>1000,38849=>1000,38850=>1000,38851=>1000,38852=>1000,
-	38853=>1000,38854=>1000,38855=>1000,38856=>1000,38857=>1000,38858=>1000,38859=>1000,38860=>1000,38861=>1000,38862=>1000,38863=>1000,38864=>1000,38865=>1000,38866=>1000,38867=>1000,38868=>1000,
-	38869=>1000,38870=>1000,38871=>1000,38872=>1000,38873=>1000,38874=>1000,38875=>1000,38876=>1000,38877=>1000,38878=>1000,38879=>1000,38880=>1000,38881=>1000,38882=>1000,38883=>1000,38884=>1000,
-	38885=>1000,38886=>1000,38887=>1000,38888=>1000,38889=>1000,38890=>1000,38891=>1000,38892=>1000,38893=>1000,38894=>1000,38895=>1000,38896=>1000,38897=>1000,38898=>1000,38899=>1000,38900=>1000,
-	38901=>1000,38902=>1000,38903=>1000,38904=>1000,38905=>1000,38906=>1000,38907=>1000,38908=>1000,38909=>1000,38910=>1000,38911=>1000,38912=>1000,38913=>1000,38914=>1000,38915=>1000,38916=>1000,
-	38917=>1000,38918=>1000,38919=>1000,38920=>1000,38921=>1000,38922=>1000,38923=>1000,38924=>1000,38925=>1000,38926=>1000,38927=>1000,38928=>1000,38929=>1000,38930=>1000,38931=>1000,38932=>1000,
-	38933=>1000,38934=>1000,38935=>1000,38936=>1000,38937=>1000,38938=>1000,38939=>1000,38940=>1000,38941=>1000,38942=>1000,38943=>1000,38944=>1000,38945=>1000,38946=>1000,38947=>1000,38948=>1000,
-	38949=>1000,38950=>1000,38951=>1000,38952=>1000,38953=>1000,38954=>1000,38955=>1000,38956=>1000,38957=>1000,38958=>1000,38959=>1000,38960=>1000,38961=>1000,38962=>1000,38963=>1000,38964=>1000,
-	38965=>1000,38966=>1000,38967=>1000,38968=>1000,38969=>1000,38970=>1000,38971=>1000,38972=>1000,38973=>1000,38974=>1000,38975=>1000,38976=>1000,38977=>1000,38978=>1000,38979=>1000,38980=>1000,
-	38981=>1000,38982=>1000,38983=>1000,38984=>1000,38985=>1000,38986=>1000,38987=>1000,38988=>1000,38989=>1000,38990=>1000,38991=>1000,38992=>1000,38993=>1000,38994=>1000,38995=>1000,38996=>1000,
-	38997=>1000,38998=>1000,38999=>1000,39000=>1000,39001=>1000,39002=>1000,39003=>1000,39004=>1000,39005=>1000,39006=>1000,39007=>1000,39008=>1000,39009=>1000,39010=>1000,39011=>1000,39012=>1000,
-	39013=>1000,39014=>1000,39015=>1000,39016=>1000,39017=>1000,39018=>1000,39019=>1000,39020=>1000,39021=>1000,39022=>1000,39023=>1000,39024=>1000,39025=>1000,39026=>1000,39027=>1000,39028=>1000,
-	39029=>1000,39030=>1000,39031=>1000,39032=>1000,39033=>1000,39034=>1000,39035=>1000,39036=>1000,39037=>1000,39038=>1000,39039=>1000,39040=>1000,39041=>1000,39042=>1000,39043=>1000,39044=>1000,
-	39045=>1000,39046=>1000,39047=>1000,39048=>1000,39049=>1000,39050=>1000,39051=>1000,39052=>1000,39053=>1000,39054=>1000,39055=>1000,39056=>1000,39057=>1000,39058=>1000,39059=>1000,39060=>1000,
-	39061=>1000,39062=>1000,39063=>1000,39064=>1000,39065=>1000,39066=>1000,39067=>1000,39068=>1000,39069=>1000,39070=>1000,39071=>1000,39072=>1000,39073=>1000,39074=>1000,39075=>1000,39076=>1000,
-	39077=>1000,39078=>1000,39079=>1000,39080=>1000,39081=>1000,39082=>1000,39083=>1000,39084=>1000,39085=>1000,39086=>1000,39087=>1000,39088=>1000,39089=>1000,39090=>1000,39091=>1000,39092=>1000,
-	39093=>1000,39094=>1000,39095=>1000,39096=>1000,39097=>1000,39098=>1000,39099=>1000,39100=>1000,39101=>1000,39102=>1000,39103=>1000,39104=>1000,39105=>1000,39106=>1000,39107=>1000,39108=>1000,
-	39109=>1000,39110=>1000,39111=>1000,39112=>1000,39113=>1000,39114=>1000,39115=>1000,39116=>1000,39117=>1000,39118=>1000,39119=>1000,39120=>1000,39121=>1000,39122=>1000,39123=>1000,39124=>1000,
-	39125=>1000,39126=>1000,39127=>1000,39128=>1000,39129=>1000,39130=>1000,39131=>1000,39132=>1000,39133=>1000,39134=>1000,39135=>1000,39136=>1000,39137=>1000,39138=>1000,39139=>1000,39140=>1000,
-	39141=>1000,39142=>1000,39143=>1000,39144=>1000,39145=>1000,39146=>1000,39147=>1000,39148=>1000,39149=>1000,39150=>1000,39151=>1000,39152=>1000,39153=>1000,39154=>1000,39155=>1000,39156=>1000,
-	39157=>1000,39158=>1000,39159=>1000,39160=>1000,39161=>1000,39162=>1000,39163=>1000,39164=>1000,39165=>1000,39166=>1000,39167=>1000,39168=>1000,39169=>1000,39170=>1000,39171=>1000,39172=>1000,
-	39173=>1000,39174=>1000,39175=>1000,39176=>1000,39177=>1000,39178=>1000,39179=>1000,39180=>1000,39181=>1000,39182=>1000,39183=>1000,39184=>1000,39185=>1000,39186=>1000,39187=>1000,39188=>1000,
-	39189=>1000,39190=>1000,39191=>1000,39192=>1000,39193=>1000,39194=>1000,39195=>1000,39196=>1000,39197=>1000,39198=>1000,39199=>1000,39200=>1000,39201=>1000,39202=>1000,39203=>1000,39204=>1000,
-	39205=>1000,39206=>1000,39207=>1000,39208=>1000,39209=>1000,39210=>1000,39211=>1000,39212=>1000,39213=>1000,39214=>1000,39215=>1000,39216=>1000,39217=>1000,39218=>1000,39219=>1000,39220=>1000,
-	39221=>1000,39222=>1000,39223=>1000,39224=>1000,39225=>1000,39226=>1000,39227=>1000,39228=>1000,39229=>1000,39230=>1000,39231=>1000,39232=>1000,39233=>1000,39234=>1000,39235=>1000,39236=>1000,
-	39237=>1000,39238=>1000,39239=>1000,39240=>1000,39241=>1000,39242=>1000,39243=>1000,39244=>1000,39245=>1000,39246=>1000,39247=>1000,39248=>1000,39249=>1000,39250=>1000,39251=>1000,39252=>1000,
-	39253=>1000,39254=>1000,39255=>1000,39256=>1000,39257=>1000,39258=>1000,39259=>1000,39260=>1000,39261=>1000,39262=>1000,39263=>1000,39264=>1000,39265=>1000,39266=>1000,39267=>1000,39268=>1000,
-	39269=>1000,39270=>1000,39271=>1000,39272=>1000,39273=>1000,39274=>1000,39275=>1000,39276=>1000,39277=>1000,39278=>1000,39279=>1000,39280=>1000,39281=>1000,39282=>1000,39283=>1000,39284=>1000,
-	39285=>1000,39286=>1000,39287=>1000,39288=>1000,39289=>1000,39290=>1000,39291=>1000,39292=>1000,39293=>1000,39294=>1000,39295=>1000,39296=>1000,39297=>1000,39298=>1000,39299=>1000,39300=>1000,
-	39301=>1000,39302=>1000,39303=>1000,39304=>1000,39305=>1000,39306=>1000,39307=>1000,39308=>1000,39309=>1000,39310=>1000,39311=>1000,39312=>1000,39313=>1000,39314=>1000,39315=>1000,39316=>1000,
-	39317=>1000,39318=>1000,39319=>1000,39320=>1000,39321=>1000,39322=>1000,39323=>1000,39324=>1000,39325=>1000,39326=>1000,39327=>1000,39328=>1000,39329=>1000,39330=>1000,39331=>1000,39332=>1000,
-	39333=>1000,39334=>1000,39335=>1000,39336=>1000,39337=>1000,39338=>1000,39339=>1000,39340=>1000,39341=>1000,39342=>1000,39343=>1000,39344=>1000,39345=>1000,39346=>1000,39347=>1000,39348=>1000,
-	39349=>1000,39350=>1000,39351=>1000,39352=>1000,39353=>1000,39354=>1000,39355=>1000,39356=>1000,39357=>1000,39358=>1000,39359=>1000,39360=>1000,39361=>1000,39362=>1000,39363=>1000,39364=>1000,
-	39365=>1000,39366=>1000,39367=>1000,39368=>1000,39369=>1000,39370=>1000,39371=>1000,39372=>1000,39373=>1000,39374=>1000,39375=>1000,39376=>1000,39377=>1000,39378=>1000,39379=>1000,39380=>1000,
-	39381=>1000,39382=>1000,39383=>1000,39384=>1000,39385=>1000,39386=>1000,39387=>1000,39388=>1000,39389=>1000,39390=>1000,39391=>1000,39392=>1000,39393=>1000,39394=>1000,39395=>1000,39396=>1000,
-	39397=>1000,39398=>1000,39399=>1000,39400=>1000,39401=>1000,39402=>1000,39403=>1000,39404=>1000,39405=>1000,39406=>1000,39407=>1000,39408=>1000,39409=>1000,39410=>1000,39411=>1000,39412=>1000,
-	39413=>1000,39414=>1000,39415=>1000,39416=>1000,39417=>1000,39418=>1000,39419=>1000,39420=>1000,39421=>1000,39422=>1000,39423=>1000,39424=>1000,39425=>1000,39426=>1000,39427=>1000,39428=>1000,
-	39429=>1000,39430=>1000,39431=>1000,39432=>1000,39433=>1000,39434=>1000,39435=>1000,39436=>1000,39437=>1000,39438=>1000,39439=>1000,39440=>1000,39441=>1000,39442=>1000,39443=>1000,39444=>1000,
-	39445=>1000,39446=>1000,39447=>1000,39448=>1000,39449=>1000,39450=>1000,39451=>1000,39452=>1000,39453=>1000,39454=>1000,39455=>1000,39456=>1000,39457=>1000,39458=>1000,39459=>1000,39460=>1000,
-	39461=>1000,39462=>1000,39463=>1000,39464=>1000,39465=>1000,39466=>1000,39467=>1000,39468=>1000,39469=>1000,39470=>1000,39471=>1000,39472=>1000,39473=>1000,39474=>1000,39475=>1000,39476=>1000,
-	39477=>1000,39478=>1000,39479=>1000,39480=>1000,39481=>1000,39482=>1000,39483=>1000,39484=>1000,39485=>1000,39486=>1000,39487=>1000,39488=>1000,39489=>1000,39490=>1000,39491=>1000,39492=>1000,
-	39493=>1000,39494=>1000,39495=>1000,39496=>1000,39497=>1000,39498=>1000,39499=>1000,39500=>1000,39501=>1000,39502=>1000,39503=>1000,39504=>1000,39505=>1000,39506=>1000,39507=>1000,39508=>1000,
-	39509=>1000,39510=>1000,39511=>1000,39512=>1000,39513=>1000,39514=>1000,39515=>1000,39516=>1000,39517=>1000,39518=>1000,39519=>1000,39520=>1000,39521=>1000,39522=>1000,39523=>1000,39524=>1000,
-	39525=>1000,39526=>1000,39527=>1000,39528=>1000,39529=>1000,39530=>1000,39531=>1000,39532=>1000,39533=>1000,39534=>1000,39535=>1000,39536=>1000,39537=>1000,39538=>1000,39539=>1000,39540=>1000,
-	39541=>1000,39542=>1000,39543=>1000,39544=>1000,39545=>1000,39546=>1000,39547=>1000,39548=>1000,39549=>1000,39550=>1000,39551=>1000,39552=>1000,39553=>1000,39554=>1000,39555=>1000,39556=>1000,
-	39557=>1000,39558=>1000,39559=>1000,39560=>1000,39561=>1000,39562=>1000,39563=>1000,39564=>1000,39565=>1000,39566=>1000,39567=>1000,39568=>1000,39569=>1000,39570=>1000,39571=>1000,39572=>1000,
-	39573=>1000,39574=>1000,39575=>1000,39576=>1000,39577=>1000,39578=>1000,39579=>1000,39580=>1000,39581=>1000,39582=>1000,39583=>1000,39584=>1000,39585=>1000,39586=>1000,39587=>1000,39588=>1000,
-	39589=>1000,39590=>1000,39591=>1000,39592=>1000,39593=>1000,39594=>1000,39595=>1000,39596=>1000,39597=>1000,39598=>1000,39599=>1000,39600=>1000,39601=>1000,39602=>1000,39603=>1000,39604=>1000,
-	39605=>1000,39606=>1000,39607=>1000,39608=>1000,39609=>1000,39610=>1000,39611=>1000,39612=>1000,39613=>1000,39614=>1000,39615=>1000,39616=>1000,39617=>1000,39618=>1000,39619=>1000,39620=>1000,
-	39621=>1000,39622=>1000,39623=>1000,39624=>1000,39625=>1000,39626=>1000,39627=>1000,39628=>1000,39629=>1000,39630=>1000,39631=>1000,39632=>1000,39633=>1000,39634=>1000,39635=>1000,39636=>1000,
-	39637=>1000,39638=>1000,39639=>1000,39640=>1000,39641=>1000,39642=>1000,39643=>1000,39644=>1000,39645=>1000,39646=>1000,39647=>1000,39648=>1000,39649=>1000,39650=>1000,39651=>1000,39652=>1000,
-	39653=>1000,39654=>1000,39655=>1000,39656=>1000,39657=>1000,39658=>1000,39659=>1000,39660=>1000,39661=>1000,39662=>1000,39663=>1000,39664=>1000,39665=>1000,39666=>1000,39667=>1000,39668=>1000,
-	39669=>1000,39670=>1000,39671=>1000,39672=>1000,39673=>1000,39674=>1000,39675=>1000,39676=>1000,39677=>1000,39678=>1000,39679=>1000,39680=>1000,39681=>1000,39682=>1000,39683=>1000,39684=>1000,
-	39685=>1000,39686=>1000,39687=>1000,39688=>1000,39689=>1000,39690=>1000,39691=>1000,39692=>1000,39693=>1000,39694=>1000,39695=>1000,39696=>1000,39697=>1000,39698=>1000,39699=>1000,39700=>1000,
-	39701=>1000,39702=>1000,39703=>1000,39704=>1000,39705=>1000,39706=>1000,39707=>1000,39708=>1000,39709=>1000,39710=>1000,39711=>1000,39712=>1000,39713=>1000,39714=>1000,39715=>1000,39716=>1000,
-	39717=>1000,39718=>1000,39719=>1000,39720=>1000,39721=>1000,39722=>1000,39723=>1000,39724=>1000,39725=>1000,39726=>1000,39727=>1000,39728=>1000,39729=>1000,39730=>1000,39731=>1000,39732=>1000,
-	39733=>1000,39734=>1000,39735=>1000,39736=>1000,39737=>1000,39738=>1000,39739=>1000,39740=>1000,39741=>1000,39742=>1000,39743=>1000,39744=>1000,39745=>1000,39746=>1000,39747=>1000,39748=>1000,
-	39749=>1000,39750=>1000,39751=>1000,39752=>1000,39753=>1000,39754=>1000,39755=>1000,39756=>1000,39757=>1000,39758=>1000,39759=>1000,39760=>1000,39761=>1000,39762=>1000,39763=>1000,39764=>1000,
-	39765=>1000,39766=>1000,39767=>1000,39768=>1000,39769=>1000,39770=>1000,39771=>1000,39772=>1000,39773=>1000,39774=>1000,39775=>1000,39776=>1000,39777=>1000,39778=>1000,39779=>1000,39780=>1000,
-	39781=>1000,39782=>1000,39783=>1000,39784=>1000,39785=>1000,39786=>1000,39787=>1000,39788=>1000,39789=>1000,39790=>1000,39791=>1000,39792=>1000,39793=>1000,39794=>1000,39795=>1000,39796=>1000,
-	39797=>1000,39798=>1000,39799=>1000,39800=>1000,39801=>1000,39802=>1000,39803=>1000,39804=>1000,39805=>1000,39806=>1000,39807=>1000,39808=>1000,39809=>1000,39810=>1000,39811=>1000,39812=>1000,
-	39813=>1000,39814=>1000,39815=>1000,39816=>1000,39817=>1000,39818=>1000,39819=>1000,39820=>1000,39821=>1000,39822=>1000,39823=>1000,39824=>1000,39825=>1000,39826=>1000,39827=>1000,39828=>1000,
-	39829=>1000,39830=>1000,39831=>1000,39832=>1000,39833=>1000,39834=>1000,39835=>1000,39836=>1000,39837=>1000,39838=>1000,39839=>1000,39840=>1000,39841=>1000,39842=>1000,39843=>1000,39844=>1000,
-	39845=>1000,39846=>1000,39847=>1000,39848=>1000,39849=>1000,39850=>1000,39851=>1000,39852=>1000,39853=>1000,39854=>1000,39855=>1000,39856=>1000,39857=>1000,39858=>1000,39859=>1000,39860=>1000,
-	39861=>1000,39862=>1000,39863=>1000,39864=>1000,39865=>1000,39866=>1000,39867=>1000,39868=>1000,39869=>1000,39870=>1000,39871=>1000,39872=>1000,39873=>1000,39874=>1000,39875=>1000,39876=>1000,
-	39877=>1000,39878=>1000,39879=>1000,39880=>1000,39881=>1000,39882=>1000,39883=>1000,39884=>1000,39885=>1000,39886=>1000,39887=>1000,39888=>1000,39889=>1000,39890=>1000,39891=>1000,39892=>1000,
-	39893=>1000,39894=>1000,39895=>1000,39896=>1000,39897=>1000,39898=>1000,39899=>1000,39900=>1000,39901=>1000,39902=>1000,39903=>1000,39904=>1000,39905=>1000,39906=>1000,39907=>1000,39908=>1000,
-	39909=>1000,39910=>1000,39911=>1000,39912=>1000,39913=>1000,39914=>1000,39915=>1000,39916=>1000,39917=>1000,39918=>1000,39919=>1000,39920=>1000,39921=>1000,39922=>1000,39923=>1000,39924=>1000,
-	39925=>1000,39926=>1000,39927=>1000,39928=>1000,39929=>1000,39930=>1000,39931=>1000,39932=>1000,39933=>1000,39934=>1000,39935=>1000,39936=>1000,39937=>1000,39938=>1000,39939=>1000,39940=>1000,
-	39941=>1000,39942=>1000,39943=>1000,39944=>1000,39945=>1000,39946=>1000,39947=>1000,39948=>1000,39949=>1000,39950=>1000,39951=>1000,39952=>1000,39953=>1000,39954=>1000,39955=>1000,39956=>1000,
-	39957=>1000,39958=>1000,39959=>1000,39960=>1000,39961=>1000,39962=>1000,39963=>1000,39964=>1000,39965=>1000,39966=>1000,39967=>1000,39968=>1000,39969=>1000,39970=>1000,39971=>1000,39972=>1000,
-	39973=>1000,39974=>1000,39975=>1000,39976=>1000,39977=>1000,39978=>1000,39979=>1000,39980=>1000,39981=>1000,39982=>1000,39983=>1000,39984=>1000,39985=>1000,39986=>1000,39987=>1000,39988=>1000,
-	39989=>1000,39990=>1000,39991=>1000,39992=>1000,39993=>1000,39994=>1000,39995=>1000,39996=>1000,39997=>1000,39998=>1000,39999=>1000,40000=>1000,40001=>1000,40002=>1000,40003=>1000,40004=>1000,
-	40005=>1000,40006=>1000,40007=>1000,40008=>1000,40009=>1000,40010=>1000,40011=>1000,40012=>1000,40013=>1000,40014=>1000,40015=>1000,40016=>1000,40017=>1000,40018=>1000,40019=>1000,40020=>1000,
-	40021=>1000,40022=>1000,40023=>1000,40024=>1000,40025=>1000,40026=>1000,40027=>1000,40028=>1000,40029=>1000,40030=>1000,40031=>1000,40032=>1000,40033=>1000,40034=>1000,40035=>1000,40036=>1000,
-	40037=>1000,40038=>1000,40039=>1000,40040=>1000,40041=>1000,40042=>1000,40043=>1000,40044=>1000,40045=>1000,40046=>1000,40047=>1000,40048=>1000,40049=>1000,40050=>1000,40051=>1000,40052=>1000,
-	40053=>1000,40054=>1000,40055=>1000,40056=>1000,40057=>1000,40058=>1000,40059=>1000,40060=>1000,40061=>1000,40062=>1000,40063=>1000,40064=>1000,40065=>1000,40066=>1000,40067=>1000,40068=>1000,
-	40069=>1000,40070=>1000,40071=>1000,40072=>1000,40073=>1000,40074=>1000,40075=>1000,40076=>1000,40077=>1000,40078=>1000,40079=>1000,40080=>1000,40081=>1000,40082=>1000,40083=>1000,40084=>1000,
-	40085=>1000,40086=>1000,40087=>1000,40088=>1000,40089=>1000,40090=>1000,40091=>1000,40092=>1000,40093=>1000,40094=>1000,40095=>1000,40096=>1000,40097=>1000,40098=>1000,40099=>1000,40100=>1000,
-	40101=>1000,40102=>1000,40103=>1000,40104=>1000,40105=>1000,40106=>1000,40107=>1000,40108=>1000,40109=>1000,40110=>1000,40111=>1000,40112=>1000,40113=>1000,40114=>1000,40115=>1000,40116=>1000,
-	40117=>1000,40118=>1000,40119=>1000,40120=>1000,40121=>1000,40122=>1000,40123=>1000,40124=>1000,40125=>1000,40126=>1000,40127=>1000,40128=>1000,40129=>1000,40130=>1000,40131=>1000,40132=>1000,
-	40133=>1000,40134=>1000,40135=>1000,40136=>1000,40137=>1000,40138=>1000,40139=>1000,40140=>1000,40141=>1000,40142=>1000,40143=>1000,40144=>1000,40145=>1000,40146=>1000,40147=>1000,40148=>1000,
-	40149=>1000,40150=>1000,40151=>1000,40152=>1000,40153=>1000,40154=>1000,40155=>1000,40156=>1000,40157=>1000,40158=>1000,40159=>1000,40160=>1000,40161=>1000,40162=>1000,40163=>1000,40164=>1000,
-	40165=>1000,40166=>1000,40167=>1000,40168=>1000,40169=>1000,40170=>1000,40171=>1000,40172=>1000,40173=>1000,40174=>1000,40175=>1000,40176=>1000,40177=>1000,40178=>1000,40179=>1000,40180=>1000,
-	40181=>1000,40182=>1000,40183=>1000,40184=>1000,40185=>1000,40186=>1000,40187=>1000,40188=>1000,40189=>1000,40190=>1000,40191=>1000,40192=>1000,40193=>1000,40194=>1000,40195=>1000,40196=>1000,
-	40197=>1000,40198=>1000,40199=>1000,40200=>1000,40201=>1000,40202=>1000,40203=>1000,40204=>1000,40205=>1000,40206=>1000,40207=>1000,40208=>1000,40209=>1000,40210=>1000,40211=>1000,40212=>1000,
-	40213=>1000,40214=>1000,40215=>1000,40216=>1000,40217=>1000,40218=>1000,40219=>1000,40220=>1000,40221=>1000,40222=>1000,40223=>1000,40224=>1000,40225=>1000,40226=>1000,40227=>1000,40228=>1000,
-	40229=>1000,40230=>1000,40231=>1000,40232=>1000,40233=>1000,40234=>1000,40235=>1000,40236=>1000,40237=>1000,40238=>1000,40239=>1000,40240=>1000,40241=>1000,40242=>1000,40243=>1000,40244=>1000,
-	40245=>1000,40246=>1000,40247=>1000,40248=>1000,40249=>1000,40250=>1000,40251=>1000,40252=>1000,40253=>1000,40254=>1000,40255=>1000,40256=>1000,40257=>1000,40258=>1000,40259=>1000,40260=>1000,
-	40261=>1000,40262=>1000,40263=>1000,40264=>1000,40265=>1000,40266=>1000,40267=>1000,40268=>1000,40269=>1000,40270=>1000,40271=>1000,40272=>1000,40273=>1000,40274=>1000,40275=>1000,40276=>1000,
-	40277=>1000,40278=>1000,40279=>1000,40280=>1000,40281=>1000,40282=>1000,40283=>1000,40284=>1000,40285=>1000,40286=>1000,40287=>1000,40288=>1000,40289=>1000,40290=>1000,40291=>1000,40292=>1000,
-	40293=>1000,40294=>1000,40295=>1000,40296=>1000,40297=>1000,40298=>1000,40299=>1000,40300=>1000,40301=>1000,40302=>1000,40303=>1000,40304=>1000,40305=>1000,40306=>1000,40307=>1000,40308=>1000,
-	40309=>1000,40310=>1000,40311=>1000,40312=>1000,40313=>1000,40314=>1000,40315=>1000,40316=>1000,40317=>1000,40318=>1000,40319=>1000,40320=>1000,40321=>1000,40322=>1000,40323=>1000,40324=>1000,
-	40325=>1000,40326=>1000,40327=>1000,40328=>1000,40329=>1000,40330=>1000,40331=>1000,40332=>1000,40333=>1000,40334=>1000,40335=>1000,40336=>1000,40337=>1000,40338=>1000,40339=>1000,40340=>1000,
-	40341=>1000,40342=>1000,40343=>1000,40344=>1000,40345=>1000,40346=>1000,40347=>1000,40348=>1000,40349=>1000,40350=>1000,40351=>1000,40352=>1000,40353=>1000,40354=>1000,40355=>1000,40356=>1000,
-	40357=>1000,40358=>1000,40359=>1000,40360=>1000,40361=>1000,40362=>1000,40363=>1000,40364=>1000,40365=>1000,40366=>1000,40367=>1000,40368=>1000,40369=>1000,40370=>1000,40371=>1000,40372=>1000,
-	40373=>1000,40374=>1000,40375=>1000,40376=>1000,40377=>1000,40378=>1000,40379=>1000,40380=>1000,40381=>1000,40382=>1000,40383=>1000,40384=>1000,40385=>1000,40386=>1000,40387=>1000,40388=>1000,
-	40389=>1000,40390=>1000,40391=>1000,40392=>1000,40393=>1000,40394=>1000,40395=>1000,40396=>1000,40397=>1000,40398=>1000,40399=>1000,40400=>1000,40401=>1000,40402=>1000,40403=>1000,40404=>1000,
-	40405=>1000,40406=>1000,40407=>1000,40408=>1000,40409=>1000,40410=>1000,40411=>1000,40412=>1000,40413=>1000,40414=>1000,40415=>1000,40416=>1000,40417=>1000,40418=>1000,40419=>1000,40420=>1000,
-	40421=>1000,40422=>1000,40423=>1000,40424=>1000,40425=>1000,40426=>1000,40427=>1000,40428=>1000,40429=>1000,40430=>1000,40431=>1000,40432=>1000,40433=>1000,40434=>1000,40435=>1000,40436=>1000,
-	40437=>1000,40438=>1000,40439=>1000,40440=>1000,40441=>1000,40442=>1000,40443=>1000,40444=>1000,40445=>1000,40446=>1000,40447=>1000,40448=>1000,40449=>1000,40450=>1000,40451=>1000,40452=>1000,
-	40453=>1000,40454=>1000,40455=>1000,40456=>1000,40457=>1000,40458=>1000,40459=>1000,40460=>1000,40461=>1000,40462=>1000,40463=>1000,40464=>1000,40465=>1000,40466=>1000,40467=>1000,40468=>1000,
-	40469=>1000,40470=>1000,40471=>1000,40472=>1000,40473=>1000,40474=>1000,40475=>1000,40476=>1000,40477=>1000,40478=>1000,40479=>1000,40480=>1000,40481=>1000,40482=>1000,40483=>1000,40484=>1000,
-	40485=>1000,40486=>1000,40487=>1000,40488=>1000,40489=>1000,40490=>1000,40491=>1000,40492=>1000,40493=>1000,40494=>1000,40495=>1000,40496=>1000,40497=>1000,40498=>1000,40499=>1000,40500=>1000,
-	40501=>1000,40502=>1000,40503=>1000,40504=>1000,40505=>1000,40506=>1000,40507=>1000,40508=>1000,40509=>1000,40510=>1000,40511=>1000,40512=>1000,40513=>1000,40514=>1000,40515=>1000,40516=>1000,
-	40517=>1000,40518=>1000,40519=>1000,40520=>1000,40521=>1000,40522=>1000,40523=>1000,40524=>1000,40525=>1000,40526=>1000,40527=>1000,40528=>1000,40529=>1000,40530=>1000,40531=>1000,40532=>1000,
-	40533=>1000,40534=>1000,40535=>1000,40536=>1000,40537=>1000,40538=>1000,40539=>1000,40540=>1000,40541=>1000,40542=>1000,40543=>1000,40544=>1000,40545=>1000,40546=>1000,40547=>1000,40548=>1000,
-	40549=>1000,40550=>1000,40551=>1000,40552=>1000,40553=>1000,40554=>1000,40555=>1000,40556=>1000,40557=>1000,40558=>1000,40559=>1000,40560=>1000,40561=>1000,40562=>1000,40563=>1000,40564=>1000,
-	40565=>1000,40566=>1000,40567=>1000,40568=>1000,40569=>1000,40570=>1000,40571=>1000,40572=>1000,40573=>1000,40574=>1000,40575=>1000,40576=>1000,40577=>1000,40578=>1000,40579=>1000,40580=>1000,
-	40581=>1000,40582=>1000,40583=>1000,40584=>1000,40585=>1000,40586=>1000,40587=>1000,40588=>1000,40589=>1000,40590=>1000,40591=>1000,40592=>1000,40593=>1000,40594=>1000,40595=>1000,40596=>1000,
-	40597=>1000,40598=>1000,40599=>1000,40600=>1000,40601=>1000,40602=>1000,40603=>1000,40604=>1000,40605=>1000,40606=>1000,40607=>1000,40608=>1000,40609=>1000,40610=>1000,40611=>1000,40612=>1000,
-	40613=>1000,40614=>1000,40615=>1000,40616=>1000,40617=>1000,40618=>1000,40619=>1000,40620=>1000,40621=>1000,40622=>1000,40623=>1000,40624=>1000,40625=>1000,40626=>1000,40627=>1000,40628=>1000,
-	40629=>1000,40630=>1000,40631=>1000,40632=>1000,40633=>1000,40634=>1000,40635=>1000,40636=>1000,40637=>1000,40638=>1000,40639=>1000,40640=>1000,40641=>1000,40642=>1000,40643=>1000,40644=>1000,
-	40645=>1000,40646=>1000,40647=>1000,40648=>1000,40649=>1000,40650=>1000,40651=>1000,40652=>1000,40653=>1000,40654=>1000,40655=>1000,40656=>1000,40657=>1000,40658=>1000,40659=>1000,40660=>1000,
-	40661=>1000,40662=>1000,40663=>1000,40664=>1000,40665=>1000,40666=>1000,40667=>1000,40668=>1000,40669=>1000,40670=>1000,40671=>1000,40672=>1000,40673=>1000,40674=>1000,40675=>1000,40676=>1000,
-	40677=>1000,40678=>1000,40679=>1000,40680=>1000,40681=>1000,40682=>1000,40683=>1000,40684=>1000,40685=>1000,40686=>1000,40687=>1000,40688=>1000,40689=>1000,40690=>1000,40691=>1000,40692=>1000,
-	40693=>1000,40694=>1000,40695=>1000,40696=>1000,40697=>1000,40698=>1000,40699=>1000,40700=>1000,40701=>1000,40702=>1000,40703=>1000,40704=>1000,40705=>1000,40706=>1000,40707=>1000,40708=>1000,
-	40709=>1000,40710=>1000,40711=>1000,40712=>1000,40713=>1000,40714=>1000,40715=>1000,40716=>1000,40717=>1000,40718=>1000,40719=>1000,40720=>1000,40721=>1000,40722=>1000,40723=>1000,40724=>1000,
-	40725=>1000,40726=>1000,40727=>1000,40728=>1000,40729=>1000,40730=>1000,40731=>1000,40732=>1000,40733=>1000,40734=>1000,40735=>1000,40736=>1000,40737=>1000,40738=>1000,40739=>1000,40740=>1000,
-	40741=>1000,40742=>1000,40743=>1000,40744=>1000,40745=>1000,40746=>1000,40747=>1000,40748=>1000,40749=>1000,40750=>1000,40751=>1000,40752=>1000,40753=>1000,40754=>1000,40755=>1000,40756=>1000,
-	40757=>1000,40758=>1000,40759=>1000,40760=>1000,40761=>1000,40762=>1000,40763=>1000,40764=>1000,40765=>1000,40766=>1000,40767=>1000,40768=>1000,40769=>1000,40770=>1000,40771=>1000,40772=>1000,
-	40773=>1000,40774=>1000,40775=>1000,40776=>1000,40777=>1000,40778=>1000,40779=>1000,40780=>1000,40781=>1000,40782=>1000,40783=>1000,40784=>1000,40785=>1000,40786=>1000,40787=>1000,40788=>1000,
-	40789=>1000,40790=>1000,40791=>1000,40792=>1000,40793=>1000,40794=>1000,40795=>1000,40796=>1000,40797=>1000,40798=>1000,40799=>1000,40800=>1000,40801=>1000,40802=>1000,40803=>1000,40804=>1000,
-	40805=>1000,40806=>1000,40807=>1000,40808=>1000,40809=>1000,40810=>1000,40811=>1000,40812=>1000,40813=>1000,40814=>1000,40815=>1000,40816=>1000,40817=>1000,40818=>1000,40819=>1000,40820=>1000,
-	40821=>1000,40822=>1000,40823=>1000,40824=>1000,40825=>1000,40826=>1000,40827=>1000,40828=>1000,40829=>1000,40830=>1000,40831=>1000,40832=>1000,40833=>1000,40834=>1000,40835=>1000,40836=>1000,
-	40837=>1000,40838=>1000,40839=>1000,40840=>1000,40841=>1000,40842=>1000,40843=>1000,40844=>1000,40845=>1000,40846=>1000,40847=>1000,40848=>1000,40849=>1000,40850=>1000,40851=>1000,40852=>1000,
-	40853=>1000,40854=>1000,40855=>1000,40856=>1000,40857=>1000,40858=>1000,40859=>1000,40860=>1000,40861=>1000,40862=>1000,40863=>1000,40864=>1000,40865=>1000,40866=>1000,40867=>1000,40868=>1000,
-	40869=>1000);
-$diff='';
-$originalsize=23275812;
-
-// CID Information
-// Select your language
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ac16.tar.Z,ag15.tar.Z,ak12.tar.Z and aj16.tar.Z.
-
-//$enc='UniCNS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'CNS1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ac15.php');
-
-$enc='UniGB-UTF16-H';
-$cidinfo=array('Registry'=>'Adobe','Ordering'=>'GB1','Supplement'=>2);
-include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-//$enc='UniKS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Korea1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-//$enc='UniJIS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Japan1','Supplement'=>5);
-//include(dirname(__FILE__).'/uni2cid_aj16.php');
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-traditional.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-traditional.php
deleted file mode 100644
index 097caf59af0..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-chinese-traditional.php
+++ /dev/null
@@ -1,1768 +0,0 @@
-<?php
-$type='cidfont0';
-$name='ArialUnicodeMS';
-$desc=array('Ascent'=>1069,'Descent'=>-271,'CapHeight'=>1069,'Flags'=>32,'FontBBox'=>'[-1011 -330 2260 1078]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=1000;
-$cw=array(
-	32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,
-	48=>556,49=>556,50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,60=>584,61=>584,62=>584,63=>556,
-	64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-	80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>278,92=>278,93=>278,94=>469,95=>500,
-	96=>333,97=>556,98=>556,99=>500,100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,109=>833,110=>556,111=>556,
-	112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,8364=>556,
-	1027=>567,8218=>222,402=>278,8222=>333,8230=>1000,8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,1036=>584,381=>611,1039=>723,8216=>222,
-	8217=>222,8220=>333,8221=>333,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>500,8250=>333,339=>944,1116=>437,382=>500,376=>667,160=>278,161=>333,
-	162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,172=>584,173=>333,174=>737,175=>500,176=>400,177=>584,
-	178=>333,179=>333,180=>333,181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,190=>834,191=>611,192=>667,193=>667,
-	194=>667,195=>667,196=>667,197=>667,198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,208=>722,209=>722,
-	210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-	226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,
-	242=>556,243=>556,244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>667,257=>556,
-	258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,268=>722,269=>500,270=>722,271=>627,272=>722,273=>556,
-	274=>667,275=>556,276=>667,277=>556,278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,288=>778,289=>556,
-	290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>222,298=>278,299=>222,300=>278,301=>222,302=>278,303=>222,304=>278,305=>278,
-	306=>751,307=>444,308=>500,309=>222,310=>667,311=>500,312=>437,313=>556,314=>222,315=>556,316=>222,317=>556,318=>222,319=>556,320=>318,321=>556,
-	322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,328=>556,329=>626,330=>723,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-	340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,350=>667,351=>500,354=>611,355=>278,356=>611,357=>406,
-	358=>611,359=>278,360=>722,361=>556,362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,372=>944,373=>722,
-	374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>222,384=>556,385=>740,386=>655,387=>556,388=>556,389=>556,390=>722,391=>766,392=>579,
-	393=>722,394=>789,395=>655,396=>556,397=>557,398=>667,399=>729,400=>604,401=>611,403=>791,404=>649,405=>806,406=>245,407=>322,408=>667,409=>500,
-	410=>322,411=>500,412=>833,413=>722,414=>556,415=>778,416=>776,417=>556,418=>1019,419=>782,420=>735,421=>556,422=>722,423=>667,424=>500,425=>602,
-	426=>366,427=>278,428=>571,429=>278,430=>611,431=>776,432=>620,433=>748,434=>667,435=>752,436=>615,437=>611,438=>500,439=>628,440=>628,441=>526,
-	442=>480,443=>556,444=>556,445=>526,446=>556,447=>556,448=>278,449=>464,450=>474,451=>278,452=>1333,453=>1222,454=>1056,455=>1030,456=>778,457=>444,
-	458=>1222,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,
-	474=>556,475=>722,476=>556,477=>556,478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,488=>667,489=>500,
-	490=>778,491=>556,492=>778,493=>556,494=>534,495=>534,496=>222,497=>1333,498=>1222,499=>1056,500=>778,501=>556,506=>667,507=>556,508=>1000,509=>889,
-	510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,
-	526=>778,527=>556,528=>722,529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,
-	598=>556,599=>556,600=>556,601=>556,602=>777,603=>485,604=>485,605=>686,606=>519,607=>260,608=>556,609=>556,610=>557,611=>500,612=>500,613=>556,
-	614=>556,615=>556,616=>242,617=>282,618=>356,619=>356,620=>425,621=>222,622=>635,623=>833,624=>833,625=>833,626=>556,627=>556,628=>558,629=>556,
-	630=>715,631=>674,632=>558,633=>333,634=>333,635=>333,636=>333,637=>333,638=>312,639=>312,640=>530,641=>530,642=>500,643=>216,644=>276,645=>216,
-	646=>222,647=>278,648=>278,649=>596,650=>558,651=>556,652=>500,653=>722,654=>500,655=>500,656=>500,657=>564,658=>530,659=>530,660=>464,661=>464,
-	662=>464,663=>500,664=>614,665=>526,666=>519,667=>557,668=>558,669=>222,670=>500,671=>416,672=>556,673=>464,674=>464,675=>966,676=>966,677=>1030,
-	678=>689,679=>484,680=>718,688=>326,689=>326,690=>153,691=>201,692=>201,693=>201,694=>304,695=>389,696=>278,697=>222,698=>372,699=>222,700=>222,
-	701=>222,702=>222,703=>222,704=>250,705=>250,706=>320,707=>320,708=>320,709=>320,711=>333,712=>192,713=>333,714=>333,715=>333,716=>192,717=>333,
-	718=>333,719=>333,720=>300,721=>300,722=>222,723=>222,724=>340,725=>340,726=>280,727=>362,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-	736=>278,737=>153,738=>270,739=>274,740=>325,741=>360,742=>360,743=>360,744=>360,745=>360,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-	774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,
-	790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,
-	806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-	822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-	864=>0,865=>0,884=>308,885=>308,890=>278,894=>278,900=>278,901=>278,902=>667,903=>278,904=>704,905=>759,906=>315,908=>778,910=>746,911=>758,
-	912=>222,913=>667,914=>667,915=>550,916=>682,917=>667,918=>611,919=>722,920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>650,927=>778,
-	928=>722,929=>667,931=>602,932=>611,933=>667,934=>808,935=>667,936=>804,937=>758,938=>278,939=>667,940=>576,941=>434,942=>556,943=>222,944=>551,
-	945=>576,946=>563,947=>500,948=>557,949=>434,950=>440,951=>556,952=>556,953=>222,954=>498,955=>500,956=>553,957=>500,958=>432,959=>556,960=>678,
-	961=>571,962=>472,963=>619,964=>382,965=>551,966=>649,967=>522,968=>729,969=>766,970=>222,971=>551,972=>556,973=>551,974=>766,976=>563,977=>616,
-	978=>631,979=>726,980=>631,981=>644,982=>781,986=>722,988=>578,990=>570,992=>692,994=>880,995=>833,996=>684,997=>558,998=>680,999=>529,1000=>557,
-	1001=>505,1002=>623,1003=>603,1004=>610,1005=>611,1006=>568,1007=>434,1008=>600,1009=>571,1010=>500,1011=>222,1025=>667,1026=>865,1028=>717,1029=>667,1030=>278,
-	1031=>278,1032=>500,1033=>1105,1034=>1009,1035=>867,1038=>635,1040=>667,1041=>655,1042=>667,1043=>567,1044=>677,1045=>667,1046=>923,1047=>604,1048=>722,1049=>722,
-	1050=>584,1051=>705,1052=>833,1053=>722,1054=>778,1055=>723,1056=>667,1057=>722,1058=>611,1059=>635,1060=>760,1061=>667,1062=>740,1063=>684,1064=>920,1065=>939,
-	1066=>793,1067=>883,1068=>655,1069=>717,1070=>1006,1071=>722,1072=>556,1073=>573,1074=>531,1075=>383,1076=>583,1077=>556,1078=>669,1079=>458,1080=>559,1081=>559,
-	1082=>437,1083=>571,1084=>683,1085=>552,1086=>556,1087=>542,1088=>556,1089=>500,1090=>458,1091=>500,1092=>823,1093=>500,1094=>562,1095=>533,1096=>802,1097=>823,
-	1098=>620,1099=>717,1100=>523,1101=>510,1102=>744,1103=>542,1105=>556,1106=>556,1107=>383,1108=>510,1109=>500,1110=>222,1111=>278,1112=>222,1113=>873,1114=>811,
-	1115=>556,1118=>500,1119=>542,1120=>976,1121=>766,1122=>656,1123=>521,1124=>950,1125=>694,1126=>667,1127=>597,1128=>952,1129=>817,1130=>654,1131=>600,1132=>932,
-	1133=>817,1134=>604,1135=>458,1136=>804,1137=>729,1138=>778,1139=>556,1140=>667,1141=>500,1142=>667,1143=>500,1144=>1279,1145=>1060,1146=>778,1147=>556,1148=>976,
-	1149=>766,1150=>976,1151=>766,1152=>722,1153=>514,1154=>686,1155=>334,1156=>382,1157=>334,1158=>334,1168=>435,1169=>339,1170=>567,1171=>383,1172=>656,1173=>556,
-	1174=>923,1175=>669,1176=>604,1177=>458,1178=>584,1179=>437,1180=>584,1181=>437,1182=>584,1183=>437,1184=>764,1185=>537,1186=>741,1187=>573,1188=>900,1189=>670,
-	1190=>736,1191=>560,1192=>778,1193=>560,1194=>722,1195=>500,1196=>611,1197=>458,1198=>667,1199=>500,1200=>667,1201=>500,1202=>667,1203=>500,1204=>916,1205=>661,
-	1206=>684,1207=>533,1208=>684,1209=>533,1210=>684,1211=>556,1212=>829,1213=>667,1214=>829,1215=>667,1216=>278,1217=>923,1218=>669,1219=>584,1220=>437,1223=>735,
-	1224=>570,1227=>684,1228=>533,1232=>667,1233=>556,1234=>667,1235=>556,1236=>1000,1237=>889,1238=>667,1239=>556,1240=>729,1241=>556,1242=>729,1243=>556,1244=>923,
-	1245=>669,1246=>604,1247=>458,1248=>604,1249=>492,1250=>722,1251=>559,1252=>722,1253=>559,1254=>778,1255=>556,1256=>778,1257=>556,1258=>778,1259=>556,1262=>635,
-	1263=>500,1264=>635,1265=>500,1266=>635,1267=>500,1268=>684,1269=>533,1272=>883,1273=>717,1329=>635,1330=>531,1331=>583,1332=>583,1333=>531,1334=>531,1335=>427,
-	1336=>531,1337=>750,1338=>635,1339=>531,1340=>375,1341=>583,1342=>698,1343=>531,1344=>427,1345=>531,1346=>583,1347=>531,1348=>635,1349=>698,1350=>635,1351=>635,
-	1352=>531,1353=>531,1354=>698,1355=>531,1356=>635,1357=>531,1358=>698,1359=>583,1360=>479,1361=>583,1362=>531,1363=>698,1364=>698,1365=>635,1366=>750,1369=>271,
-	1370=>271,1371=>150,1372=>300,1373=>271,1374=>271,1375=>420,1377=>583,1378=>427,1379=>427,1380=>427,1381=>427,1382=>427,1383=>427,1384=>427,1385=>459,1386=>427,
-	1387=>427,1388=>323,1389=>531,1390=>427,1391=>427,1392=>427,1393=>427,1394=>427,1395=>427,1396=>427,1397=>271,1398=>427,1399=>375,1400=>427,1401=>375,1402=>583,
-	1403=>427,1404=>427,1405=>427,1406=>427,1407=>583,1408=>427,1409=>427,1410=>323,1411=>583,1412=>375,1413=>375,1414=>583,1415=>527,1417=>271,1425=>360,1426=>360,
-	1427=>360,1428=>360,1429=>360,1430=>360,1431=>360,1432=>360,1433=>360,1434=>360,1435=>360,1436=>360,1437=>360,1438=>360,1439=>360,1440=>360,1441=>360,1443=>360,
-	1444=>360,1445=>360,1446=>360,1447=>360,1448=>360,1449=>360,1450=>360,1451=>360,1452=>360,1453=>360,1454=>360,1455=>360,1456=>360,1457=>360,1458=>360,1459=>360,
-	1460=>360,1461=>360,1462=>360,1463=>360,1464=>360,1465=>360,1467=>360,1468=>360,1469=>360,1470=>366,1471=>360,1472=>225,1473=>360,1474=>360,1475=>238,1476=>360,
-	1488=>577,1489=>563,1490=>411,1491=>512,1492=>594,1493=>316,1494=>326,1495=>594,1496=>594,1497=>316,1498=>507,1499=>527,1500=>484,1501=>594,1502=>594,1503=>316,
-	1504=>338,1505=>604,1506=>550,1507=>567,1508=>569,1509=>505,1510=>514,1511=>583,1512=>507,1513=>700,1514=>633,1520=>590,1521=>590,1522=>590,1523=>216,1524=>412,
-	1548=>278,1563=>278,1567=>556,1569=>529,1570=>243,1571=>243,1572=>470,1573=>243,1574=>731,1575=>243,1576=>771,1577=>514,1578=>771,1579=>771,1580=>544,1581=>544,
-	1582=>544,1583=>430,1584=>430,1585=>421,1586=>421,1587=>1194,1588=>1194,1589=>1291,1590=>1291,1591=>843,1592=>843,1593=>594,1594=>594,1600=>279,1601=>957,1602=>800,
-	1603=>757,1604=>662,1605=>589,1606=>692,1607=>514,1608=>470,1609=>731,1610=>731,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,
-	1632=>480,1633=>480,1634=>480,1635=>480,1636=>480,1637=>480,1638=>480,1639=>480,1640=>480,1641=>480,1642=>547,1643=>278,1644=>278,1645=>438,1648=>0,1649=>243,
-	1650=>243,1651=>243,1652=>0,1653=>380,1654=>470,1655=>548,1656=>772,1657=>771,1658=>771,1659=>771,1660=>771,1661=>771,1662=>771,1663=>771,1664=>771,1665=>544,
-	1666=>544,1667=>544,1668=>544,1669=>544,1670=>544,1671=>544,1672=>430,1673=>430,1674=>430,1675=>430,1676=>430,1677=>430,1678=>430,1679=>430,1680=>430,1681=>421,
-	1682=>421,1683=>421,1684=>421,1685=>421,1686=>419,1687=>421,1688=>421,1689=>421,1690=>1194,1691=>1194,1692=>1194,1693=>1291,1694=>1291,1695=>843,1696=>594,1697=>957,
-	1698=>957,1699=>957,1700=>957,1701=>957,1702=>957,1703=>800,1704=>800,1705=>828,1706=>1058,1707=>828,1708=>757,1709=>757,1710=>757,1711=>828,1712=>828,1713=>828,
-	1714=>828,1715=>828,1716=>828,1717=>662,1718=>662,1719=>662,1722=>692,1723=>692,1724=>692,1725=>692,1726=>706,1728=>514,1729=>509,1730=>509,1731=>509,1732=>470,
-	1733=>470,1734=>470,1735=>470,1736=>470,1737=>470,1738=>470,1739=>470,1740=>731,1741=>841,1742=>731,1744=>731,1745=>731,1746=>550,1747=>550,1748=>279,1749=>514,
-	1750=>726,1751=>558,1752=>321,1753=>318,1754=>342,1755=>373,1756=>716,1757=>688,1758=>852,1759=>288,1760=>288,1761=>388,1762=>350,1763=>716,1764=>146,1765=>282,
-	1766=>339,1767=>339,1768=>415,1769=>514,1770=>220,1771=>220,1772=>220,1773=>350,1776=>480,1777=>480,1778=>480,1779=>480,1780=>480,1781=>480,1782=>480,1783=>480,
-	1784=>480,1785=>480,2305=>0,2306=>0,2307=>294,2309=>693,2310=>910,2311=>533,2312=>533,2313=>590,2314=>713,2315=>920,2316=>677,2317=>611,2318=>611,2319=>611,
-	2320=>611,2321=>910,2322=>910,2323=>910,2324=>910,2325=>667,2326=>732,2327=>593,2328=>639,2329=>624,2330=>688,2331=>713,2332=>688,2333=>712,2334=>697,2335=>502,
-	2336=>533,2337=>583,2338=>523,2339=>693,2340=>585,2341=>638,2342=>533,2343=>640,2344=>585,2345=>585,2346=>565,2347=>699,2348=>592,2349=>689,2350=>633,2351=>600,
-	2352=>486,2353=>486,2354=>680,2355=>730,2356=>730,2357=>592,2358=>684,2359=>608,2360=>646,2361=>546,2364=>0,2365=>373,2366=>319,2367=>319,2368=>319,2369=>0,
-	2370=>0,2371=>0,2372=>0,2373=>0,2374=>0,2375=>0,2376=>0,2377=>319,2378=>319,2379=>319,2380=>319,2381=>0,2384=>884,2385=>0,2386=>0,2387=>0,
-	2388=>0,2392=>667,2393=>732,2394=>593,2395=>688,2396=>583,2397=>523,2398=>699,2399=>600,2400=>920,2401=>677,2402=>0,2403=>0,2404=>331,2405=>513,2406=>639,
-	2407=>639,2408=>639,2409=>639,2410=>639,2411=>639,2412=>639,2413=>639,2414=>639,2415=>639,2416=>362,2433=>0,2434=>430,2435=>430,2437=>786,2438=>1030,2439=>582,
-	2440=>603,2441=>648,2442=>757,2443=>758,2444=>630,2447=>685,2448=>746,2451=>711,2452=>776,2453=>779,2454=>655,2455=>606,2456=>645,2457=>661,2458=>554,2459=>585,
-	2460=>729,2461=>752,2462=>893,2463=>567,2464=>625,2465=>648,2466=>567,2467=>598,2468=>680,2469=>645,2470=>609,2471=>596,2472=>595,2474=>635,2475=>780,2476=>593,
-	2477=>677,2478=>621,2479=>601,2480=>593,2482=>640,2486=>598,2487=>596,2488=>637,2489=>582,2492=>0,2494=>245,2495=>245,2496=>245,2497=>0,2498=>0,2499=>0,
-	2500=>0,2503=>309,2504=>309,2507=>932,2508=>932,2509=>0,2519=>245,2524=>648,2525=>553,2527=>596,2528=>758,2529=>630,2530=>0,2531=>335,2534=>610,2535=>559,
-	2536=>595,2537=>711,2538=>610,2539=>661,2540=>661,2541=>559,2542=>661,2543=>600,2544=>593,2545=>593,2546=>601,2547=>567,2548=>601,2549=>699,2550=>661,2551=>267,
-	2552=>610,2553=>424,2554=>548,2562=>0,2565=>691,2566=>936,2567=>803,2568=>803,2569=>678,2570=>678,2575=>557,2576=>691,2579=>678,2580=>691,2581=>602,2582=>567,
-	2583=>641,2584=>688,2585=>565,2586=>592,2587=>603,2588=>591,2589=>541,2590=>558,2591=>543,2592=>581,2593=>596,2594=>640,2595=>640,2596=>591,2597=>564,2598=>640,
-	2599=>564,2600=>581,2602=>564,2603=>551,2604=>560,2605=>549,2606=>558,2607=>652,2608=>540,2610=>677,2611=>677,2613=>601,2614=>558,2616=>558,2617=>549,2620=>0,
-	2622=>246,2623=>246,2624=>246,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>567,2650=>690,2651=>591,2652=>591,2654=>581,2662=>591,
-	2663=>591,2664=>591,2665=>591,2666=>591,2667=>591,2668=>591,2669=>591,2670=>591,2671=>591,2672=>0,2673=>0,2674=>557,2675=>678,2676=>894,2689=>0,2690=>0,
-	2691=>300,2693=>781,2694=>1044,2695=>589,2696=>589,2697=>560,2698=>758,2699=>806,2701=>781,2703=>781,2704=>781,2705=>1044,2707=>1044,2708=>1044,2709=>413,2710=>773,
-	2711=>606,2712=>558,2713=>483,2714=>600,2715=>691,2716=>811,2717=>647,2718=>651,2719=>453,2720=>450,2721=>425,2722=>478,2723=>694,2724=>534,2725=>553,2726=>446,
-	2727=>541,2728=>582,2730=>572,2731=>437,2732=>663,2733=>756,2734=>594,2735=>493,2736=>392,2738=>613,2739=>656,2741=>538,2742=>611,2743=>507,2744=>663,2745=>587,
-	2748=>0,2749=>478,2750=>273,2751=>273,2752=>273,2753=>0,2754=>0,2755=>0,2756=>0,2757=>0,2759=>0,2760=>0,2761=>273,2763=>273,2764=>273,2765=>0,
-	2768=>843,2784=>893,2790=>625,2791=>625,2792=>625,2793=>625,2794=>625,2795=>625,2796=>625,2797=>625,2798=>625,2799=>625,2817=>0,2818=>306,2819=>391,2821=>590,
-	2822=>808,2823=>658,2824=>658,2825=>633,2826=>654,2827=>636,2828=>540,2831=>560,2832=>938,2835=>600,2836=>973,2837=>603,2838=>620,2839=>620,2840=>605,2841=>712,
-	2842=>579,2843=>579,2844=>593,2845=>564,2846=>581,2847=>604,2848=>578,2849=>579,2850=>579,2851=>607,2852=>579,2853=>587,2854=>579,2855=>602,2856=>579,2858=>605,
-	2859=>728,2860=>579,2861=>643,2862=>605,2863=>628,2864=>619,2866=>653,2867=>593,2870=>620,2871=>605,2872=>605,2873=>579,2876=>0,2877=>333,2878=>218,2879=>0,
-	2880=>294,2881=>0,2882=>0,2883=>0,2887=>479,2888=>479,2891=>1026,2892=>1026,2893=>0,2902=>0,2903=>218,2908=>579,2909=>579,2911=>599,2912=>636,2913=>540,
-	2918=>578,2919=>480,2920=>480,2921=>622,2922=>506,2923=>605,2924=>529,2925=>548,2926=>512,2927=>528,2928=>561,2946=>0,2947=>742,2949=>1002,2950=>1118,2951=>994,
-	2952=>660,2953=>1012,2954=>1231,2958=>726,2959=>731,2960=>870,2962=>763,2963=>763,2964=>1636,2965=>667,2969=>830,2970=>584,2972=>876,2974=>986,2975=>802,2979=>1295,
-	2980=>656,2984=>630,2985=>1012,2986=>694,2990=>727,2991=>790,2992=>545,2993=>718,2994=>821,2995=>871,2996=>724,2997=>873,2999=>1087,3000=>1098,3001=>1274,3006=>547,
-	3007=>172,3008=>93,3009=>519,3010=>814,3014=>748,3015=>681,3016=>956,3018=>1666,3019=>1666,3020=>1994,3021=>0,3031=>871,3047=>667,3048=>1012,3049=>751,3050=>740,
-	3051=>924,3052=>884,3053=>726,3054=>1002,3055=>825,3056=>717,3057=>719,3058=>774,3073=>365,3074=>601,3075=>346,3077=>720,3078=>786,3079=>567,3080=>1159,3081=>690,
-	3082=>1047,3083=>1299,3084=>913,3086=>625,3087=>625,3088=>712,3090=>655,3091=>655,3092=>862,3093=>515,3094=>680,3095=>526,3096=>943,3097=>655,3098=>684,3099=>684,
-	3100=>670,3101=>1205,3102=>732,3103=>888,3104=>597,3105=>709,3106=>709,3107=>809,3108=>715,3109=>702,3110=>702,3111=>702,3112=>607,3114=>623,3115=>623,3116=>681,
-	3117=>681,3118=>932,3119=>1203,3120=>597,3121=>893,3122=>631,3123=>608,3125=>620,3126=>541,3127=>667,3128=>640,3129=>911,3134=>644,3135=>298,3136=>298,3137=>361,
-	3138=>682,3139=>342,3140=>704,3142=>624,3143=>624,3144=>900,3146=>849,3147=>849,3148=>976,3149=>669,3157=>298,3158=>119,3168=>1620,3169=>1281,3174=>840,3175=>840,
-	3176=>840,3177=>840,3178=>840,3179=>840,3180=>840,3181=>840,3182=>840,3183=>840,3202=>440,3203=>251,3205=>654,3206=>654,3207=>631,3208=>891,3209=>957,3210=>1293,
-	3211=>1044,3212=>744,3214=>650,3215=>650,3216=>659,3218=>667,3219=>667,3220=>667,3221=>462,3222=>749,3223=>543,3224=>779,3225=>674,3226=>682,3227=>660,3228=>667,
-	3229=>1171,3230=>926,3231=>671,3232=>557,3233=>669,3234=>669,3235=>728,3236=>544,3237=>672,3238=>672,3239=>672,3240=>560,3242=>668,3243=>668,3244=>681,3245=>687,
-	3246=>972,3247=>1101,3248=>556,3249=>677,3250=>661,3251=>545,3253=>666,3254=>553,3255=>670,3256=>549,3257=>716,3262=>425,3263=>341,3264=>680,3265=>354,3266=>714,
-	3267=>386,3268=>638,3270=>307,3271=>670,3272=>462,3274=>908,3275=>1251,3276=>434,3277=>336,3285=>344,3286=>404,3294=>673,3296=>1695,3297=>978,3302=>549,3303=>549,
-	3304=>549,3305=>549,3306=>549,3307=>549,3308=>549,3309=>549,3310=>549,3311=>549,3330=>368,3331=>305,3333=>1201,3334=>1351,3335=>905,3336=>1459,3337=>635,3338=>1198,
-	3339=>861,3340=>957,3342=>1211,3343=>1202,3344=>1839,3346=>642,3347=>1114,3348=>1195,3349=>861,3350=>982,3351=>874,3352=>1354,3353=>957,3354=>1016,3355=>1266,3356=>712,
-	3357=>1454,3358=>1215,3359=>563,3360=>565,3361=>1192,3362=>1244,3363=>1268,3364=>878,3365=>966,3366=>545,3367=>879,3368=>879,3370=>1031,3371=>1175,3372=>1334,3373=>546,
-	3374=>643,3375=>949,3376=>642,3377=>555,3378=>945,3379=>631,3380=>553,3381=>959,3382=>936,3383=>1122,3384=>1190,3385=>1112,3390=>475,3391=>418,3392=>442,3393=>340,
-	3394=>340,3395=>473,3398=>640,3399=>530,3400=>1279,3402=>1368,3403=>1258,3404=>1447,3405=>0,3415=>553,3424=>861,3425=>1100,3430=>1095,3431=>929,3432=>854,3433=>1181,
-	3434=>658,3435=>972,3436=>1210,3437=>650,3438=>959,3439=>896,3585=>595,3586=>648,3587=>665,3588=>608,3589=>608,3590=>665,3591=>471,3592=>556,3593=>652,3594=>664,
-	3595=>681,3596=>816,3597=>849,3598=>620,3599=>620,3600=>541,3601=>785,3602=>826,3603=>887,3604=>598,3605=>605,3606=>595,3607=>650,3608=>541,3609=>652,3610=>608,
-	3611=>608,3612=>630,3613=>630,3614=>695,3615=>695,3616=>620,3617=>581,3618=>588,3619=>501,3620=>595,3621=>569,3622=>620,3623=>519,3624=>592,3625=>659,3626=>574,
-	3627=>654,3628=>695,3629=>566,3630=>574,3631=>517,3632=>452,3633=>0,3634=>496,3635=>496,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-	3647=>687,3648=>302,3649=>571,3650=>478,3651=>515,3652=>515,3653=>496,3654=>506,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,
-	3663=>555,3664=>598,3665=>640,3666=>688,3667=>690,3668=>657,3669=>657,3670=>635,3671=>839,3672=>693,3673=>769,3674=>673,3675=>994,3713=>775,3714=>707,3716=>724,
-	3719=>524,3720=>690,3722=>678,3725=>711,3732=>719,3733=>834,3734=>776,3735=>916,3737=>744,3738=>740,3739=>740,3740=>834,3741=>834,3742=>854,3743=>854,3745=>775,
-	3746=>724,3747=>697,3749=>700,3751=>700,3754=>708,3755=>916,3757=>700,3758=>697,3759=>658,3760=>432,3761=>534,3762=>476,3763=>476,3764=>778,3765=>778,3766=>778,
-	3767=>778,3768=>778,3769=>778,3771=>778,3772=>778,3773=>670,3776=>420,3777=>806,3778=>430,3779=>446,3780=>346,3782=>571,3784=>778,3785=>778,3786=>778,3787=>778,
-	3788=>778,3789=>778,3792=>721,3793=>719,3794=>601,3795=>711,3796=>686,3797=>686,3798=>834,3799=>756,3800=>724,3801=>906,3804=>1272,3805=>1272,3840=>600,3841=>600,
-	3842=>600,3843=>600,3844=>600,3845=>600,3846=>600,3847=>600,3848=>600,3849=>600,3850=>600,3851=>600,3852=>600,3853=>600,3854=>600,3855=>600,3856=>600,3857=>600,
-	3858=>600,3859=>600,3860=>600,3861=>600,3862=>600,3863=>600,3864=>600,3865=>600,3866=>600,3867=>600,3868=>600,3869=>600,3870=>600,3871=>600,3872=>600,3873=>600,
-	3874=>600,3875=>600,3876=>600,3877=>600,3878=>600,3879=>600,3880=>600,3881=>600,3882=>600,3883=>600,3884=>600,3885=>600,3886=>600,3887=>600,3888=>600,3889=>600,
-	3890=>600,3891=>600,3892=>600,3893=>600,3894=>600,3895=>600,3896=>600,3897=>600,3898=>600,3899=>600,3900=>600,3901=>600,3902=>600,3903=>600,3904=>600,3905=>600,
-	3906=>600,3907=>600,3908=>600,3909=>600,3910=>600,3911=>600,3913=>600,3914=>600,3915=>600,3916=>600,3917=>600,3918=>600,3919=>600,3920=>600,3921=>600,3922=>600,
-	3923=>600,3924=>600,3925=>600,3926=>600,3927=>600,3928=>600,3929=>600,3930=>600,3931=>600,3932=>600,3933=>600,3934=>600,3935=>600,3936=>600,3937=>600,3938=>600,
-	3939=>600,3940=>600,3941=>600,3942=>600,3943=>600,3944=>600,3945=>600,3953=>600,3954=>600,3955=>600,3956=>600,3957=>600,3958=>600,3959=>600,3960=>600,3961=>600,
-	3962=>600,3963=>600,3964=>600,3965=>600,3966=>600,3967=>600,3968=>600,3969=>600,3970=>600,3971=>600,3972=>600,3973=>600,3974=>600,3975=>600,3976=>600,3977=>600,
-	3978=>600,3979=>600,3984=>600,3985=>600,3986=>600,3987=>600,3988=>600,3989=>600,3991=>600,3993=>600,3994=>600,3995=>600,3996=>600,3997=>600,3998=>600,3999=>600,
-	4000=>600,4001=>600,4002=>600,4003=>600,4004=>600,4005=>600,4006=>600,4007=>600,4008=>600,4009=>600,4010=>600,4011=>600,4012=>600,4013=>600,4017=>600,4018=>600,
-	4019=>600,4020=>600,4021=>600,4022=>600,4023=>600,4025=>600,4256=>662,4257=>677,4258=>708,4259=>696,4260=>609,4261=>790,4262=>664,4263=>785,4264=>560,4265=>634,
-	4266=>782,4267=>701,4268=>629,4269=>682,4270=>705,4271=>692,4272=>734,4273=>615,4274=>592,4275=>680,4276=>679,4277=>705,4278=>643,4279=>623,4280=>623,4281=>629,
-	4282=>633,4283=>770,4284=>592,4285=>662,4286=>629,4287=>672,4288=>735,4289=>576,4290=>606,4291=>605,4292=>676,4293=>792,4304=>435,4305=>556,4306=>565,4307=>872,
-	4308=>506,4309=>544,4310=>723,4311=>868,4312=>530,4313=>532,4314=>955,4315=>552,4316=>565,4317=>712,4318=>547,4319=>574,4320=>685,4321=>554,4322=>806,4323=>810,
-	4324=>777,4325=>502,4326=>686,4327=>512,4328=>552,4329=>496,4330=>568,4331=>552,4332=>592,4333=>565,4334=>552,4335=>741,4336=>549,4337=>659,4338=>559,4339=>524,
-	4340=>482,4341=>565,4342=>822,4347=>506,4352=>1000,4353=>1000,4354=>1000,4355=>1000,4356=>1000,4357=>1000,4358=>1000,4359=>1000,4360=>1000,4361=>1000,4362=>1000,4363=>1000,
-	4364=>1000,4365=>1000,4366=>1000,4367=>1000,4368=>1000,4369=>1000,4370=>1000,4371=>1000,4372=>1000,4373=>1000,4374=>1000,4375=>1000,4376=>1000,4377=>1000,4378=>1000,4379=>1000,
-	4380=>1000,4381=>1000,4382=>1000,4383=>1000,4384=>1000,4385=>1000,4386=>1000,4387=>1000,4388=>1000,4389=>1000,4390=>1000,4391=>1000,4392=>1000,4393=>1000,4394=>1000,4395=>1000,
-	4396=>1000,4397=>1000,4398=>1000,4399=>1000,4400=>1000,4401=>1000,4402=>1000,4403=>1000,4404=>1000,4405=>1000,4406=>1000,4407=>1000,4408=>1000,4409=>1000,4410=>1000,4411=>1000,
-	4412=>1000,4413=>1000,4414=>1000,4415=>1000,4416=>1000,4417=>1000,4418=>1000,4419=>1000,4420=>1000,4421=>1000,4422=>1000,4423=>1000,4424=>1000,4425=>1000,4426=>1000,4427=>1000,
-	4428=>1000,4429=>1000,4430=>1000,4431=>1000,4432=>1000,4433=>1000,4434=>1000,4435=>1000,4436=>1000,4437=>1000,4438=>1000,4439=>1000,4440=>1000,4441=>1000,4447=>1000,4448=>1000,
-	4449=>1000,4450=>1000,4451=>1000,4452=>1000,4453=>1000,4454=>1000,4455=>1000,4456=>1000,4457=>1000,4458=>1000,4459=>1000,4460=>1000,4461=>1000,4462=>1000,4463=>1000,4464=>1000,
-	4465=>1000,4466=>1000,4467=>1000,4468=>1000,4469=>1000,4470=>1000,4471=>1000,4472=>1000,4473=>1000,4474=>1000,4475=>1000,4476=>1000,4477=>1000,4478=>1000,4479=>1000,4480=>1000,
-	4481=>1000,4482=>1000,4483=>1000,4484=>1000,4485=>1000,4486=>1000,4487=>1000,4488=>1000,4489=>1000,4490=>1000,4491=>1000,4492=>1000,4493=>1000,4494=>1000,4495=>1000,4496=>1000,
-	4497=>1000,4498=>1000,4499=>1000,4500=>1000,4501=>1000,4502=>1000,4503=>1000,4504=>1000,4505=>1000,4506=>1000,4507=>1000,4508=>1000,4509=>1000,4510=>1000,4511=>1000,4512=>1000,
-	4513=>1000,4514=>1000,4520=>1000,4521=>1000,4522=>1000,4523=>1000,4524=>1000,4525=>1000,4526=>1000,4527=>1000,4528=>1000,4529=>1000,4530=>1000,4531=>1000,4532=>1000,4533=>1000,
-	4534=>1000,4535=>1000,4536=>1000,4537=>1000,4538=>1000,4539=>1000,4540=>1000,4541=>1000,4542=>1000,4543=>1000,4544=>1000,4545=>1000,4546=>1000,4547=>1000,4548=>1000,4549=>1000,
-	4550=>1000,4551=>1000,4552=>1000,4553=>1000,4554=>1000,4555=>1000,4556=>1000,4557=>1000,4558=>1000,4559=>1000,4560=>1000,4561=>1000,4562=>1000,4563=>1000,4564=>1000,4565=>1000,
-	4566=>1000,4567=>1000,4568=>1000,4569=>1000,4570=>1000,4571=>1000,4572=>1000,4573=>1000,4574=>1000,4575=>1000,4576=>1000,4577=>1000,4578=>1000,4579=>1000,4580=>1000,4581=>1000,
-	4582=>1000,4583=>1000,4584=>1000,4585=>1000,4586=>1000,4587=>1000,4588=>1000,4589=>1000,4590=>1000,4591=>1000,4592=>1000,4593=>1000,4594=>1000,4595=>1000,4596=>1000,4597=>1000,
-	4598=>1000,4599=>1000,4600=>1000,4601=>1000,7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,7691=>556,
-	7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,
-	7708=>667,7709=>556,7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,7721=>556,7722=>722,7723=>556,
-	7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-	7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,
-	7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,7771=>333,
-	7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,
-	7788=>611,7789=>278,7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,
-	7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-	7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,7831=>278,7832=>722,7833=>500,7834=>556,7835=>278,
-	7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,7855=>556,
-	7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,
-	7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,7885=>556,7886=>778,7887=>556,
-	7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,7895=>556,7896=>778,7897=>556,7898=>776,7899=>556,7900=>776,7901=>556,7902=>776,7903=>556,
-	7904=>776,7905=>556,7906=>776,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>620,7914=>776,7915=>620,7916=>776,7917=>620,7918=>776,7919=>620,
-	7920=>776,7921=>620,7922=>667,7923=>500,7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>576,7937=>576,7938=>576,7939=>576,7940=>576,7941=>576,
-	7942=>576,7943=>576,7944=>667,7945=>667,7946=>680,7947=>680,7948=>680,7949=>680,7950=>718,7951=>718,7952=>434,7953=>434,7954=>434,7955=>434,7956=>434,7957=>434,
-	7960=>692,7961=>692,7962=>823,7963=>823,7964=>823,7965=>823,7968=>556,7969=>556,7970=>556,7971=>556,7972=>556,7973=>556,7974=>556,7975=>556,7976=>747,7977=>747,
-	7978=>878,7979=>878,7980=>878,7981=>878,7982=>923,7983=>923,7984=>222,7985=>222,7986=>222,7987=>222,7988=>222,7989=>222,7990=>222,7991=>222,7992=>303,7993=>303,
-	7994=>434,7995=>434,7996=>434,7997=>434,7998=>479,7999=>479,8000=>556,8001=>556,8002=>556,8003=>556,8004=>556,8005=>556,8008=>778,8009=>778,8010=>894,8011=>894,
-	8012=>894,8013=>894,8016=>551,8017=>551,8018=>551,8019=>551,8020=>551,8021=>551,8022=>551,8023=>551,8025=>777,8027=>893,8029=>885,8031=>940,8032=>766,8033=>766,
-	8034=>766,8035=>766,8036=>766,8037=>766,8038=>766,8039=>766,8040=>758,8041=>758,8042=>874,8043=>874,8044=>868,8045=>867,8046=>911,8047=>911,8048=>576,8049=>576,
-	8050=>434,8051=>434,8052=>556,8053=>556,8054=>222,8055=>222,8056=>556,8057=>556,8058=>551,8059=>551,8060=>766,8061=>766,8064=>576,8065=>576,8066=>576,8067=>576,
-	8068=>576,8069=>576,8070=>576,8071=>576,8072=>667,8073=>667,8074=>680,8075=>680,8076=>680,8077=>680,8078=>718,8079=>718,8080=>556,8081=>556,8082=>556,8083=>556,
-	8084=>556,8085=>556,8086=>556,8087=>556,8088=>747,8089=>747,8090=>878,8091=>878,8092=>878,8093=>878,8094=>923,8095=>923,8096=>766,8097=>766,8098=>766,8099=>766,
-	8100=>766,8101=>766,8102=>766,8103=>766,8104=>758,8105=>758,8106=>874,8107=>874,8108=>868,8109=>867,8110=>911,8111=>911,8112=>576,8113=>576,8114=>576,8115=>576,
-	8116=>576,8118=>576,8119=>576,8120=>667,8121=>667,8122=>667,8123=>667,8124=>667,8125=>278,8126=>278,8127=>278,8128=>278,8129=>278,8130=>556,8131=>556,8132=>556,
-	8134=>556,8135=>556,8136=>693,8137=>704,8138=>748,8139=>759,8140=>722,8141=>278,8142=>278,8143=>278,8144=>222,8145=>222,8146=>222,8147=>222,8150=>222,8151=>222,
-	8152=>278,8153=>278,8154=>304,8155=>304,8157=>278,8158=>278,8159=>278,8160=>551,8161=>551,8162=>551,8163=>551,8164=>571,8165=>571,8166=>551,8167=>551,8168=>667,
-	8169=>667,8170=>742,8171=>746,8172=>693,8173=>278,8174=>278,8175=>278,8178=>766,8179=>766,8180=>766,8182=>766,8183=>766,8184=>778,8185=>778,8186=>758,8187=>758,
-	8188=>758,8189=>278,8190=>278,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>100,8202=>50,8203=>0,8204=>0,
-	8205=>0,8208=>333,8209=>333,8210=>556,8213=>564,8214=>428,8215=>500,8219=>222,8223=>333,8227=>350,8228=>278,8229=>556,8231=>278,8232=>0,8233=>0,8241=>1330,
-	8242=>222,8243=>372,8244=>522,8245=>206,8246=>356,8247=>506,8248=>312,8251=>1000,8252=>471,8253=>556,8254=>500,8255=>945,8256=>945,8257=>312,8258=>820,8259=>333,
-	8260=>167,8261=>278,8262=>278,8304=>333,8308=>333,8309=>333,8310=>333,8311=>333,8312=>333,8313=>333,8314=>333,8315=>333,8316=>333,8317=>210,8318=>210,8319=>333,
-	8320=>333,8321=>333,8322=>333,8323=>333,8324=>333,8325=>333,8326=>333,8327=>333,8328=>333,8329=>333,8330=>333,8331=>333,8332=>333,8333=>210,8334=>210,8352=>556,
-	8353=>556,8354=>556,8355=>556,8356=>556,8357=>833,8358=>556,8359=>556,8360=>1024,8361=>940,8362=>784,8363=>556,8400=>600,8401=>600,8402=>600,8403=>600,8404=>700,
-	8405=>700,8406=>600,8407=>600,8408=>600,8409=>600,8410=>600,8411=>600,8412=>600,8413=>900,8414=>900,8415=>900,8416=>900,8417=>700,8448=>889,8449=>889,8450=>667,
-	8451=>1022,8452=>611,8453=>889,8454=>889,8455=>501,8456=>667,8457=>921,8458=>510,8459=>906,8460=>988,8461=>722,8462=>500,8463=>500,8464=>688,8465=>553,8466=>708,
-	8467=>291,8468=>778,8469=>722,8470=>1073,8471=>737,8472=>740,8473=>556,8474=>722,8475=>927,8476=>795,8477=>667,8478=>667,8479=>667,8480=>1000,8481=>1174,8483=>722,
-	8484=>611,8485=>542,8486=>768,8487=>768,8488=>698,8489=>321,8490=>667,8491=>667,8492=>927,8493=>646,8494=>556,8495=>385,8496=>615,8497=>688,8498=>611,8499=>1115,
-	8500=>406,8501=>688,8502=>688,8503=>344,8504=>688,8531=>834,8532=>834,8533=>834,8534=>834,8535=>834,8536=>834,8537=>834,8538=>834,8539=>834,8540=>834,8541=>834,
-	8542=>834,8543=>834,8544=>278,8545=>555,8546=>832,8547=>933,8548=>667,8549=>934,8550=>1031,8551=>1268,8552=>944,8553=>667,8554=>944,8555=>1035,8556=>556,8557=>722,
-	8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>700,8564=>500,8565=>700,8566=>922,8567=>1144,8568=>712,8569=>500,8570=>712,8571=>934,8572=>222,8573=>500,
-	8574=>556,8575=>833,8576=>983,8577=>722,8578=>983,8592=>713,8593=>713,8594=>713,8595=>713,8596=>713,8597=>713,8598=>713,8599=>713,8600=>713,8601=>713,8602=>713,
-	8603=>713,8604=>713,8605=>713,8606=>713,8607=>713,8608=>713,8609=>713,8610=>713,8611=>713,8612=>713,8613=>713,8614=>713,8615=>713,8616=>713,8617=>713,8618=>713,
-	8619=>713,8620=>713,8621=>813,8622=>813,8623=>713,8624=>713,8625=>713,8626=>713,8627=>713,8628=>713,8629=>713,8630=>713,8631=>713,8632=>713,8633=>713,8634=>800,
-	8635=>800,8636=>713,8637=>713,8638=>713,8639=>713,8640=>713,8641=>713,8642=>713,8643=>713,8644=>713,8645=>713,8646=>713,8647=>713,8648=>713,8649=>713,8650=>713,
-	8651=>713,8652=>713,8653=>713,8654=>950,8655=>713,8656=>713,8657=>713,8658=>713,8659=>713,8660=>863,8661=>713,8662=>713,8663=>713,8664=>713,8665=>713,8666=>713,
-	8667=>713,8668=>813,8669=>813,8670=>713,8671=>713,8672=>713,8673=>713,8674=>713,8675=>713,8676=>713,8677=>713,8678=>713,8679=>713,8680=>713,8681=>713,8682=>713,
-	8704=>600,8705=>600,8706=>494,8707=>600,8708=>600,8709=>800,8710=>612,8711=>612,8712=>549,8713=>549,8714=>549,8715=>549,8716=>549,8717=>549,8718=>549,8719=>823,
-	8720=>823,8721=>713,8722=>584,8723=>584,8724=>584,8725=>167,8726=>278,8727=>389,8728=>400,8729=>400,8730=>600,8731=>600,8732=>600,8733=>549,8734=>549,8735=>584,
-	8736=>584,8737=>584,8738=>584,8739=>260,8740=>444,8741=>418,8742=>602,8743=>561,8744=>561,8745=>561,8746=>561,8747=>506,8748=>806,8749=>1106,8750=>506,8751=>806,
-	8752=>1106,8753=>506,8754=>506,8755=>506,8756=>561,8757=>561,8758=>422,8759=>561,8760=>584,8761=>584,8762=>584,8763=>584,8764=>584,8765=>584,8766=>584,8767=>584,
-	8768=>422,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,8775=>584,8776=>584,8777=>584,8778=>584,8779=>584,8780=>584,8781=>584,8782=>584,8783=>584,
-	8784=>584,8785=>584,8786=>584,8787=>584,8788=>737,8789=>737,8790=>584,8791=>584,8792=>584,8793=>584,8794=>584,8795=>584,8796=>584,8797=>584,8798=>584,8799=>584,
-	8800=>584,8801=>584,8802=>584,8803=>584,8804=>584,8805=>584,8806=>584,8807=>584,8808=>584,8809=>584,8810=>969,8811=>969,8812=>584,8813=>584,8814=>584,8815=>584,
-	8816=>584,8817=>584,8818=>584,8819=>584,8820=>584,8821=>584,8822=>584,8823=>584,8824=>584,8825=>584,8826=>584,8827=>584,8828=>584,8829=>584,8830=>584,8831=>584,
-	8832=>584,8833=>584,8834=>678,8835=>678,8836=>678,8837=>678,8838=>678,8839=>678,8840=>678,8841=>678,8842=>678,8843=>678,8844=>561,8845=>561,8846=>561,8847=>678,
-	8848=>678,8849=>673,8850=>673,8851=>561,8852=>561,8853=>800,8854=>800,8855=>800,8856=>800,8857=>800,8858=>800,8859=>800,8860=>800,8861=>800,8862=>800,8863=>800,
-	8864=>800,8865=>800,8866=>549,8867=>549,8868=>549,8869=>549,8870=>399,8871=>399,8872=>549,8873=>549,8874=>549,8875=>672,8876=>549,8877=>549,8878=>549,8879=>672,
-	8880=>549,8881=>549,8882=>549,8883=>549,8884=>549,8885=>549,8886=>713,8887=>713,8888=>713,8889=>549,8890=>549,8891=>584,8892=>584,8893=>584,8894=>584,8895=>584,
-	8896=>561,8897=>561,8898=>561,8899=>561,8900=>549,8901=>250,8902=>549,8903=>649,8904=>630,8905=>630,8906=>630,8907=>630,8908=>630,8909=>584,8910=>561,8911=>561,
-	8912=>668,8913=>668,8914=>668,8915=>668,8916=>561,8917=>602,8918=>584,8919=>584,8920=>1354,8921=>1354,8922=>584,8923=>584,8924=>584,8925=>584,8926=>584,8927=>584,
-	8928=>584,8929=>584,8930=>673,8931=>673,8932=>673,8933=>673,8934=>584,8935=>584,8936=>584,8937=>584,8938=>584,8939=>584,8940=>584,8941=>584,8942=>278,8943=>1000,
-	8944=>1000,8945=>1000,8960=>549,8962=>549,8963=>549,8964=>549,8965=>549,8966=>549,8967=>549,8968=>449,8969=>449,8970=>449,8971=>449,8972=>549,8973=>549,8974=>549,
-	8975=>549,8976=>549,8977=>549,8978=>800,8979=>800,8980=>549,8981=>549,8982=>549,8983=>650,8984=>780,8985=>549,8986=>549,8987=>549,8988=>549,8989=>549,8990=>549,
-	8991=>549,8992=>506,8993=>506,8994=>713,8995=>713,8996=>1000,8997=>1000,8998=>1000,8999=>1000,9000=>1000,9001=>329,9002=>329,9003=>1000,9004=>549,9005=>549,9006=>549,
-	9007=>549,9008=>549,9009=>549,9010=>549,9011=>549,9012=>549,9013=>549,9014=>600,9015=>600,9016=>600,9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,
-	9023=>600,9024=>600,9025=>600,9026=>600,9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,9037=>600,9038=>600,
-	9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,
-	9055=>600,9056=>600,9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,9067=>600,9068=>600,9069=>600,9070=>600,
-	9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9109=>600,9216=>600,9217=>600,9218=>600,
-	9219=>600,9220=>600,9221=>600,9222=>600,9223=>600,9224=>600,9225=>600,9226=>600,9227=>600,9228=>600,9229=>600,9230=>600,9231=>600,9232=>600,9233=>600,9234=>600,
-	9235=>600,9236=>600,9237=>600,9238=>600,9239=>600,9240=>600,9241=>600,9242=>600,9243=>600,9244=>600,9245=>600,9246=>600,9247=>600,9248=>600,9249=>600,9250=>600,
-	9251=>600,9252=>600,9280=>604,9281=>604,9282=>604,9283=>604,9284=>604,9285=>604,9286=>750,9287=>750,9288=>750,9289=>750,9290=>604,9312=>1000,9313=>1000,9314=>1000,
-	9315=>1000,9316=>1000,9317=>1000,9318=>1000,9319=>1000,9320=>1000,9321=>1000,9322=>1000,9323=>1000,9324=>1000,9325=>1000,9326=>1000,9327=>1000,9328=>1000,9329=>1000,9330=>1000,
-	9331=>1000,9332=>1000,9333=>1000,9334=>1000,9335=>1000,9336=>1000,9337=>1000,9338=>1000,9339=>1000,9340=>1000,9341=>1000,9342=>1000,9343=>1000,9344=>1000,9345=>1000,9346=>1000,
-	9347=>1000,9348=>1000,9349=>1000,9350=>1000,9351=>1000,9352=>1000,9353=>1000,9354=>1000,9355=>1000,9356=>1000,9357=>1000,9358=>1000,9359=>1000,9360=>1000,9361=>1000,9362=>1000,
-	9363=>1000,9364=>1000,9365=>1000,9366=>1000,9367=>1000,9368=>1000,9369=>1000,9370=>1000,9371=>1000,9372=>1000,9373=>1000,9374=>1000,9375=>1000,9376=>1000,9377=>1000,9378=>1000,
-	9379=>1000,9380=>1000,9381=>1000,9382=>1000,9383=>1000,9384=>1000,9385=>1000,9386=>1000,9387=>1000,9388=>1000,9389=>1000,9390=>1000,9391=>1000,9392=>1000,9393=>1000,9394=>1000,
-	9395=>1000,9396=>1000,9397=>1000,9398=>1000,9399=>1000,9400=>1000,9401=>1000,9402=>1000,9403=>1000,9404=>1000,9405=>1000,9406=>1000,9407=>1000,9408=>1000,9409=>1000,9410=>1000,
-	9411=>1000,9412=>1000,9413=>1000,9414=>1000,9415=>1000,9416=>1000,9417=>1000,9418=>1000,9419=>1000,9420=>1000,9421=>1000,9422=>1000,9423=>1000,9424=>1000,9425=>1000,9426=>1000,
-	9427=>1000,9428=>1000,9429=>1000,9430=>1000,9431=>1000,9432=>1000,9433=>1000,9434=>1000,9435=>1000,9436=>1000,9437=>1000,9438=>1000,9439=>1000,9440=>1000,9441=>1000,9442=>1000,
-	9443=>1000,9444=>1000,9445=>1000,9446=>1000,9447=>1000,9448=>1000,9449=>1000,9450=>1000,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,
-	9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,
-	9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,
-	9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,
-	9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,
-	9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,
-	9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,
-	9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,
-	9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,
-	9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,
-	9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,
-	9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,
-	9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,
-	9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,
-	9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9728=>750,9729=>1000,
-	9730=>750,9731=>750,9732=>1000,9733=>816,9734=>823,9735=>500,9736=>500,9737=>800,9738=>800,9739=>800,9740=>800,9741=>800,9742=>719,9743=>719,9744=>734,9745=>734,
-	9746=>734,9747=>762,9754=>960,9755=>960,9756=>939,9757=>939,9758=>939,9759=>939,9760=>750,9761=>600,9762=>750,9763=>750,9764=>580,9765=>460,9766=>444,9767=>650,
-	9768=>444,9769=>768,9770=>800,9771=>850,9772=>675,9773=>800,9774=>750,9775=>750,9776=>900,9777=>900,9778=>900,9779=>900,9780=>900,9781=>900,9782=>900,9783=>900,
-	9784=>750,9785=>750,9786=>750,9787=>750,9788=>750,9789=>750,9790=>750,9791=>740,9792=>740,9793=>740,9794=>740,9795=>653,9796=>490,9797=>632,9798=>780,9799=>560,
-	9800=>838,9801=>780,9802=>734,9803=>887,9804=>780,9805=>1080,9806=>896,9807=>1080,9808=>804,9809=>868,9810=>922,9811=>696,9812=>1000,9813=>1000,9814=>1000,9815=>1000,
-	9816=>1000,9817=>1000,9818=>1000,9819=>1000,9820=>1000,9821=>1000,9822=>1000,9823=>1000,9824=>722,9825=>734,9826=>674,9827=>804,9828=>722,9829=>734,9830=>674,9831=>804,
-	9832=>860,9833=>423,9834=>592,9835=>750,9836=>750,9837=>439,9838=>439,9839=>439,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,9993=>690,
-	9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,
-	10012=>754,10013=>494,10014=>552,10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,10026=>789,10027=>841,10028=>823,
-	10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,
-	10045=>682,10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,
-	10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,10084=>910,
-	10085=>667,10086=>760,10087=>760,10102=>788,10103=>788,10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,10114=>788,
-	10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,
-	10131=>788,10132=>894,10136=>748,10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,10147=>924,10148=>917,10149=>930,
-	10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,
-	10167=>888,10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,12288=>1000,12289=>1000,12290=>1000,12291=>1000,12292=>1000,12293=>1000,12294=>1000,12295=>1000,
-	12296=>1000,12297=>1000,12298=>1000,12299=>1000,12300=>1000,12301=>1000,12302=>1000,12303=>1000,12304=>1000,12305=>1000,12306=>1000,12307=>1000,12308=>1000,12309=>1000,12310=>1000,12311=>1000,
-	12312=>1000,12313=>1000,12314=>1000,12315=>1000,12316=>1000,12317=>1000,12318=>1000,12319=>1000,12320=>1000,12321=>1000,12322=>1000,12323=>1000,12324=>1000,12325=>1000,12326=>1000,12327=>1000,
-	12328=>1000,12329=>1000,12330=>1000,12331=>1000,12332=>1000,12333=>1000,12334=>1000,12335=>1000,12336=>1000,12337=>1000,12338=>1000,12339=>1000,12340=>1000,12341=>1000,12342=>1000,12343=>1000,
-	12351=>1000,12353=>1000,12354=>1000,12355=>1000,12356=>1000,12357=>1000,12358=>1000,12359=>1000,12360=>1000,12361=>1000,12362=>1000,12363=>1000,12364=>1000,12365=>1000,12366=>1000,12367=>1000,
-	12368=>1000,12369=>1000,12370=>1000,12371=>1000,12372=>1000,12373=>1000,12374=>1000,12375=>1000,12376=>1000,12377=>1000,12378=>1000,12379=>1000,12380=>1000,12381=>1000,12382=>1000,12383=>1000,
-	12384=>1000,12385=>1000,12386=>1000,12387=>1000,12388=>1000,12389=>1000,12390=>1000,12391=>1000,12392=>1000,12393=>1000,12394=>1000,12395=>1000,12396=>1000,12397=>1000,12398=>1000,12399=>1000,
-	12400=>1000,12401=>1000,12402=>1000,12403=>1000,12404=>1000,12405=>1000,12406=>1000,12407=>1000,12408=>1000,12409=>1000,12410=>1000,12411=>1000,12412=>1000,12413=>1000,12414=>1000,12415=>1000,
-	12416=>1000,12417=>1000,12418=>1000,12419=>1000,12420=>1000,12421=>1000,12422=>1000,12423=>1000,12424=>1000,12425=>1000,12426=>1000,12427=>1000,12428=>1000,12429=>1000,12430=>1000,12431=>1000,
-	12432=>1000,12433=>1000,12434=>1000,12435=>1000,12436=>1000,12441=>1000,12442=>1000,12443=>1000,12444=>1000,12445=>1000,12446=>1000,12449=>1000,12450=>1000,12451=>1000,12452=>1000,12453=>1000,
-	12454=>1000,12455=>1000,12456=>1000,12457=>1000,12458=>1000,12459=>1000,12460=>1000,12461=>1000,12462=>1000,12463=>1000,12464=>1000,12465=>1000,12466=>1000,12467=>1000,12468=>1000,12469=>1000,
-	12470=>1000,12471=>1000,12472=>1000,12473=>1000,12474=>1000,12475=>1000,12476=>1000,12477=>1000,12478=>1000,12479=>1000,12480=>1000,12481=>1000,12482=>1000,12483=>1000,12484=>1000,12485=>1000,
-	12486=>1000,12487=>1000,12488=>1000,12489=>1000,12490=>1000,12491=>1000,12492=>1000,12493=>1000,12494=>1000,12495=>1000,12496=>1000,12497=>1000,12498=>1000,12499=>1000,12500=>1000,12501=>1000,
-	12502=>1000,12503=>1000,12504=>1000,12505=>1000,12506=>1000,12507=>1000,12508=>1000,12509=>1000,12510=>1000,12511=>1000,12512=>1000,12513=>1000,12514=>1000,12515=>1000,12516=>1000,12517=>1000,
-	12518=>1000,12519=>1000,12520=>1000,12521=>1000,12522=>1000,12523=>1000,12524=>1000,12525=>1000,12526=>1000,12527=>1000,12528=>1000,12529=>1000,12530=>1000,12531=>1000,12532=>1000,12533=>1000,
-	12534=>1000,12535=>1000,12536=>1000,12537=>1000,12538=>1000,12539=>1000,12540=>1000,12541=>1000,12542=>1000,12549=>1000,12550=>1000,12551=>1000,12552=>1000,12553=>1000,12554=>1000,12555=>1000,
-	12556=>1000,12557=>1000,12558=>1000,12559=>1000,12560=>1000,12561=>1000,12562=>1000,12563=>1000,12564=>1000,12565=>1000,12566=>1000,12567=>1000,12568=>1000,12569=>1000,12570=>1000,12571=>1000,
-	12572=>1000,12573=>1000,12574=>1000,12575=>1000,12576=>1000,12577=>1000,12578=>1000,12579=>1000,12580=>1000,12581=>1000,12582=>1000,12583=>1000,12584=>1000,12585=>1000,12586=>1000,12587=>1000,
-	12588=>1000,12593=>1000,12594=>1000,12595=>1000,12596=>1000,12597=>1000,12598=>1000,12599=>1000,12600=>1000,12601=>1000,12602=>1000,12603=>1000,12604=>1000,12605=>1000,12606=>1000,12607=>1000,
-	12608=>1000,12609=>1000,12610=>1000,12611=>1000,12612=>1000,12613=>1000,12614=>1000,12615=>1000,12616=>1000,12617=>1000,12618=>1000,12619=>1000,12620=>1000,12621=>1000,12622=>1000,12623=>1000,
-	12624=>1000,12625=>1000,12626=>1000,12627=>1000,12628=>1000,12629=>1000,12630=>1000,12631=>1000,12632=>1000,12633=>1000,12634=>1000,12635=>1000,12636=>1000,12637=>1000,12638=>1000,12639=>1000,
-	12640=>1000,12641=>1000,12642=>1000,12643=>1000,12644=>1000,12645=>1000,12646=>1000,12647=>1000,12648=>1000,12649=>1000,12650=>1000,12651=>1000,12652=>1000,12653=>1000,12654=>1000,12655=>1000,
-	12656=>1000,12657=>1000,12658=>1000,12659=>1000,12660=>1000,12661=>1000,12662=>1000,12663=>1000,12664=>1000,12665=>1000,12666=>1000,12667=>1000,12668=>1000,12669=>1000,12670=>1000,12671=>1000,
-	12672=>1000,12673=>1000,12674=>1000,12675=>1000,12676=>1000,12677=>1000,12678=>1000,12679=>1000,12680=>1000,12681=>1000,12682=>1000,12683=>1000,12684=>1000,12685=>1000,12686=>1000,12688=>1000,
-	12689=>1000,12690=>1000,12691=>1000,12692=>1000,12693=>1000,12694=>1000,12695=>1000,12696=>1000,12697=>1000,12698=>1000,12699=>1000,12700=>1000,12701=>1000,12702=>1000,12703=>1000,12800=>1000,
-	12801=>1000,12802=>1000,12803=>1000,12804=>1000,12805=>1000,12806=>1000,12807=>1000,12808=>1000,12809=>1000,12810=>1000,12811=>1000,12812=>1000,12813=>1000,12814=>1000,12815=>1000,12816=>1000,
-	12817=>1000,12818=>1000,12819=>1000,12820=>1000,12821=>1000,12822=>1000,12823=>1000,12824=>1000,12825=>1000,12826=>1000,12827=>1000,12828=>1000,12832=>1000,12833=>1000,12834=>1000,12835=>1000,
-	12836=>1000,12837=>1000,12838=>1000,12839=>1000,12840=>1000,12841=>1000,12842=>1000,12843=>1000,12844=>1000,12845=>1000,12846=>1000,12847=>1000,12848=>1000,12849=>1000,12850=>1000,12851=>1000,
-	12852=>1000,12853=>1000,12854=>1000,12855=>1000,12856=>1000,12857=>1000,12858=>1000,12859=>1000,12860=>1000,12861=>1000,12862=>1000,12863=>1000,12864=>1000,12865=>1000,12866=>1000,12867=>1000,
-	12896=>1000,12897=>1000,12898=>1000,12899=>1000,12900=>1000,12901=>1000,12902=>1000,12903=>1000,12904=>1000,12905=>1000,12906=>1000,12907=>1000,12908=>1000,12909=>1000,12910=>1000,12911=>1000,
-	12912=>1000,12913=>1000,12914=>1000,12915=>1000,12916=>1000,12917=>1000,12918=>1000,12919=>1000,12920=>1000,12921=>1000,12922=>1000,12923=>1000,12927=>1000,12928=>1000,12929=>1000,12930=>1000,
-	12931=>1000,12932=>1000,12933=>1000,12934=>1000,12935=>1000,12936=>1000,12937=>1000,12938=>1000,12939=>1000,12940=>1000,12941=>1000,12942=>1000,12943=>1000,12944=>1000,12945=>1000,12946=>1000,
-	12947=>1000,12948=>1000,12949=>1000,12950=>1000,12951=>1000,12952=>1000,12953=>1000,12954=>1000,12955=>1000,12956=>1000,12957=>1000,12958=>1000,12959=>1000,12960=>1000,12961=>1000,12962=>1000,
-	12963=>1000,12964=>1000,12965=>1000,12966=>1000,12967=>1000,12968=>1000,12969=>1000,12970=>1000,12971=>1000,12972=>1000,12973=>1000,12974=>1000,12975=>1000,12976=>1000,12992=>1000,12993=>1000,
-	12994=>1000,12995=>1000,12996=>1000,12997=>1000,12998=>1000,12999=>1000,13000=>1000,13001=>1000,13002=>1000,13003=>1000,13008=>1000,13009=>1000,13010=>1000,13011=>1000,13012=>1000,13013=>1000,
-	13014=>1000,13015=>1000,13016=>1000,13017=>1000,13018=>1000,13019=>1000,13020=>1000,13021=>1000,13022=>1000,13023=>1000,13024=>1000,13025=>1000,13026=>1000,13027=>1000,13028=>1000,13029=>1000,
-	13030=>1000,13031=>1000,13032=>1000,13033=>1000,13034=>1000,13035=>1000,13036=>1000,13037=>1000,13038=>1000,13039=>1000,13040=>1000,13041=>1000,13042=>1000,13043=>1000,13044=>1000,13045=>1000,
-	13046=>1000,13047=>1000,13048=>1000,13049=>1000,13050=>1000,13051=>1000,13052=>1000,13053=>1000,13054=>1000,13056=>1000,13057=>1000,13058=>1000,13059=>1000,13060=>1000,13061=>1000,13062=>1000,
-	13063=>1000,13064=>1000,13065=>1000,13066=>1000,13067=>1000,13068=>1000,13069=>1000,13070=>1000,13071=>1000,13072=>1000,13073=>1000,13074=>1000,13075=>1000,13076=>1000,13077=>1000,13078=>1000,
-	13079=>1000,13080=>1000,13081=>1000,13082=>1000,13083=>1000,13084=>1000,13085=>1000,13086=>1000,13087=>1000,13088=>1000,13089=>1000,13090=>1000,13091=>1000,13092=>1000,13093=>1000,13094=>1000,
-	13095=>1000,13096=>1000,13097=>1000,13098=>1000,13099=>1000,13100=>1000,13101=>1000,13102=>1000,13103=>1000,13104=>1000,13105=>1000,13106=>1000,13107=>1000,13108=>1000,13109=>1000,13110=>1000,
-	13111=>1000,13112=>1000,13113=>1000,13114=>1000,13115=>1000,13116=>1000,13117=>1000,13118=>1000,13119=>1000,13120=>1000,13121=>1000,13122=>1000,13123=>1000,13124=>1000,13125=>1000,13126=>1000,
-	13127=>1000,13128=>1000,13129=>1000,13130=>1000,13131=>1000,13132=>1000,13133=>1000,13134=>1000,13135=>1000,13136=>1000,13137=>1000,13138=>1000,13139=>1000,13140=>1000,13141=>1000,13142=>1000,
-	13143=>1000,13144=>1000,13145=>1000,13146=>1000,13147=>1000,13148=>1000,13149=>1000,13150=>1000,13151=>1000,13152=>1000,13153=>1000,13154=>1000,13155=>1000,13156=>1000,13157=>1000,13158=>1000,
-	13159=>1000,13160=>1000,13161=>1000,13162=>1000,13163=>1000,13164=>1000,13165=>1000,13166=>1000,13167=>1000,13168=>1000,13169=>1000,13170=>1000,13171=>1000,13172=>1000,13173=>1000,13174=>1000,
-	13179=>1000,13180=>1000,13181=>1000,13182=>1000,13183=>1000,13184=>1000,13185=>1000,13186=>1000,13187=>1000,13188=>1000,13189=>1000,13190=>1000,13191=>1000,13192=>1000,13193=>1000,13194=>1000,
-	13195=>1000,13196=>1000,13197=>1000,13198=>1000,13199=>1000,13200=>1000,13201=>1000,13202=>1000,13203=>1000,13204=>1000,13205=>1000,13206=>1000,13207=>1000,13208=>1000,13209=>1000,13210=>1000,
-	13211=>1000,13212=>1000,13213=>1000,13214=>1000,13215=>1000,13216=>1000,13217=>1000,13218=>1000,13219=>1000,13220=>1000,13221=>1000,13222=>1000,13223=>1000,13224=>1000,13225=>1000,13226=>1000,
-	13227=>1000,13228=>1000,13229=>1000,13230=>1000,13231=>1000,13232=>1000,13233=>1000,13234=>1000,13235=>1000,13236=>1000,13237=>1000,13238=>1000,13239=>1000,13240=>1000,13241=>1000,13242=>1000,
-	13243=>1000,13244=>1000,13245=>1000,13246=>1000,13247=>1000,13248=>1000,13249=>1000,13250=>1000,13251=>1000,13252=>1000,13253=>1000,13254=>1000,13255=>1000,13256=>1000,13257=>1000,13258=>1000,
-	13259=>1000,13260=>1000,13261=>1000,13262=>1000,13263=>1000,13264=>1000,13265=>1000,13266=>1000,13267=>1000,13268=>1000,13269=>1000,13270=>1000,13271=>1000,13272=>1000,13273=>1000,13274=>1000,
-	13275=>1000,13276=>1000,13277=>1000,13280=>1000,13281=>1000,13282=>1000,13283=>1000,13284=>1000,13285=>1000,13286=>1000,13287=>1000,13288=>1000,13289=>1000,13290=>1000,13291=>1000,13292=>1000,
-	13293=>1000,13294=>1000,13295=>1000,13296=>1000,13297=>1000,13298=>1000,13299=>1000,13300=>1000,13301=>1000,13302=>1000,13303=>1000,13304=>1000,13305=>1000,13306=>1000,13307=>1000,13308=>1000,
-	13309=>1000,13310=>1000,59393=>316,59394=>507,59395=>507,59396=>484,59397=>484,59416=>0,59492=>480,59495=>480,59536=>458,59557=>466,59558=>480,59559=>903,61441=>500,61442=>500,
-	63232=>541,63233=>0,63234=>0,63235=>0,63236=>0,63237=>0,63238=>0,63239=>0,63240=>0,63241=>0,63242=>0,63243=>0,63244=>0,63245=>0,63246=>0,63247=>849,
-	63248=>0,63249=>0,63250=>0,63251=>0,63252=>0,63253=>0,63254=>0,63255=>0,63256=>0,63257=>0,63258=>0,63260=>333,63261=>287,63744=>1000,63745=>1000,63746=>1000,
-	63747=>1000,63748=>1000,63749=>1000,63750=>1000,63751=>1000,63752=>1000,63753=>1000,63754=>1000,63755=>1000,63756=>1000,63757=>1000,63758=>1000,63759=>1000,63760=>1000,63761=>1000,63762=>1000,
-	63763=>1000,63764=>1000,63765=>1000,63766=>1000,63767=>1000,63768=>1000,63769=>1000,63770=>1000,63771=>1000,63772=>1000,63773=>1000,63774=>1000,63775=>1000,63776=>1000,63777=>1000,63778=>1000,
-	63779=>1000,63780=>1000,63781=>1000,63782=>1000,63783=>1000,63784=>1000,63785=>1000,63786=>1000,63787=>1000,63788=>1000,63789=>1000,63790=>1000,63791=>1000,63792=>1000,63793=>1000,63794=>1000,
-	63795=>1000,63796=>1000,63797=>1000,63798=>1000,63799=>1000,63800=>1000,63801=>1000,63802=>1000,63803=>1000,63804=>1000,63805=>1000,63806=>1000,63807=>1000,63808=>1000,63809=>1000,63810=>1000,
-	63811=>1000,63812=>1000,63813=>1000,63814=>1000,63815=>1000,63816=>1000,63817=>1000,63818=>1000,63819=>1000,63820=>1000,63821=>1000,63822=>1000,63823=>1000,63824=>1000,63825=>1000,63826=>1000,
-	63827=>1000,63828=>1000,63829=>1000,63830=>1000,63831=>1000,63832=>1000,63833=>1000,63834=>1000,63835=>1000,63836=>1000,63837=>1000,63838=>1000,63839=>1000,63840=>1000,63841=>1000,63842=>1000,
-	63843=>1000,63844=>1000,63845=>1000,63846=>1000,63847=>1000,63848=>1000,63849=>1000,63850=>1000,63851=>1000,63852=>1000,63853=>1000,63854=>1000,63855=>1000,63856=>1000,63857=>1000,63858=>1000,
-	63859=>1000,63860=>1000,63861=>1000,63862=>1000,63863=>1000,63864=>1000,63865=>1000,63866=>1000,63867=>1000,63868=>1000,63869=>1000,63870=>1000,63871=>1000,63872=>1000,63873=>1000,63874=>1000,
-	63875=>1000,63876=>1000,63877=>1000,63878=>1000,63879=>1000,63880=>1000,63881=>1000,63882=>1000,63883=>1000,63884=>1000,63885=>1000,63886=>1000,63887=>1000,63888=>1000,63889=>1000,63890=>1000,
-	63891=>1000,63892=>1000,63893=>1000,63894=>1000,63895=>1000,63896=>1000,63897=>1000,63898=>1000,63899=>1000,63900=>1000,63901=>1000,63902=>1000,63903=>1000,63904=>1000,63905=>1000,63906=>1000,
-	63907=>1000,63908=>1000,63909=>1000,63910=>1000,63911=>1000,63912=>1000,63913=>1000,63914=>1000,63915=>1000,63916=>1000,63917=>1000,63918=>1000,63919=>1000,63920=>1000,63921=>1000,63922=>1000,
-	63923=>1000,63924=>1000,63925=>1000,63926=>1000,63927=>1000,63928=>1000,63929=>1000,63930=>1000,63931=>1000,63932=>1000,63933=>1000,63934=>1000,63935=>1000,63936=>1000,63937=>1000,63938=>1000,
-	63939=>1000,63940=>1000,63941=>1000,63942=>1000,63943=>1000,63944=>1000,63945=>1000,63946=>1000,63947=>1000,63948=>1000,63949=>1000,63950=>1000,63951=>1000,63952=>1000,63953=>1000,63954=>1000,
-	63955=>1000,63956=>1000,63957=>1000,63958=>1000,63959=>1000,63960=>1000,63961=>1000,63962=>1000,63963=>1000,63964=>1000,63965=>1000,63966=>1000,63967=>1000,63968=>1000,63969=>1000,63970=>1000,
-	63971=>1000,63972=>1000,63973=>1000,63974=>1000,63975=>1000,63976=>1000,63977=>1000,63978=>1000,63979=>1000,63980=>1000,63981=>1000,63982=>1000,63983=>1000,63984=>1000,63985=>1000,63986=>1000,
-	63987=>1000,63988=>1000,63989=>1000,63990=>1000,63991=>1000,63992=>1000,63993=>1000,63994=>1000,63995=>1000,63996=>1000,63997=>1000,63998=>1000,63999=>1000,64000=>1000,64001=>1000,64002=>1000,
-	64003=>1000,64004=>1000,64005=>1000,64006=>1000,64007=>1000,64008=>1000,64009=>1000,64010=>1000,64011=>1000,64012=>1000,64013=>1000,64014=>1000,64015=>1000,64016=>1000,64017=>1000,64018=>1000,
-	64019=>1000,64020=>1000,64021=>1000,64022=>1000,64023=>1000,64024=>1000,64025=>1000,64026=>1000,64027=>1000,64028=>1000,64029=>1000,64030=>1000,64031=>1000,64032=>1000,64033=>1000,64034=>1000,
-	64035=>1000,64036=>1000,64037=>1000,64038=>1000,64039=>1000,64040=>1000,64041=>1000,64042=>1000,64043=>1000,64044=>1000,64045=>1000,64256=>537,64257=>500,64258=>500,64259=>778,64260=>750,
-	64261=>532,64262=>758,64275=>784,64276=>784,64277=>784,64278=>784,64279=>893,64286=>333,64287=>590,64288=>550,64289=>709,64290=>649,64291=>730,64292=>656,64293=>605,64294=>730,
-	64295=>633,64296=>794,64297=>584,64298=>700,64299=>700,64300=>700,64301=>700,64302=>577,64303=>577,64304=>577,64305=>563,64306=>411,64307=>512,64308=>594,64309=>316,64310=>326,
-	64312=>594,64313=>316,64314=>507,64315=>527,64316=>484,64318=>594,64320=>338,64321=>604,64323=>567,64324=>569,64326=>514,64327=>583,64328=>507,64329=>700,64330=>633,64331=>316,
-	64332=>563,64333=>527,64334=>569,64335=>577,64336=>243,64337=>273,64338=>771,64339=>788,64340=>276,64341=>243,64342=>771,64343=>788,64344=>276,64345=>243,64346=>771,64347=>788,
-	64348=>276,64349=>243,64350=>771,64351=>788,64352=>276,64353=>243,64354=>771,64355=>788,64356=>276,64357=>243,64358=>771,64359=>788,64360=>276,64361=>243,64362=>957,64363=>903,
-	64364=>466,64365=>480,64366=>957,64367=>903,64368=>466,64369=>480,64370=>544,64371=>658,64372=>646,64373=>637,64374=>544,64375=>658,64376=>646,64377=>637,64378=>544,64379=>658,
-	64380=>646,64381=>637,64382=>544,64383=>658,64384=>646,64385=>637,64386=>430,64387=>458,64388=>430,64389=>458,64390=>430,64391=>458,64392=>430,64393=>458,64394=>421,64395=>436,
-	64396=>421,64397=>436,64398=>828,64399=>942,64400=>432,64401=>549,64402=>828,64403=>942,64404=>432,64405=>549,64406=>828,64407=>942,64408=>432,64409=>549,64410=>828,64411=>942,
-	64412=>432,64413=>549,64414=>692,64415=>723,64416=>692,64417=>723,64418=>276,64419=>243,64420=>514,64421=>477,64422=>514,64423=>509,64424=>273,64425=>427,64426=>706,64427=>706,
-	64428=>686,64429=>686,64430=>550,64431=>461,64432=>550,64433=>461,64467=>757,64468=>733,64469=>432,64470=>549,64471=>470,64472=>466,64473=>470,64474=>466,64475=>470,64476=>466,
-	64477=>470,64478=>470,64479=>466,64480=>470,64481=>466,64482=>470,64483=>466,64484=>781,64485=>933,64486=>276,64487=>243,64488=>276,64489=>243,64490=>547,64491=>517,64492=>783,
-	64493=>753,64494=>740,64495=>710,64496=>740,64497=>710,64498=>740,64499=>710,64500=>740,64501=>710,64502=>1207,64503=>1177,64504=>517,64505=>1067,64506=>1037,64507=>517,64508=>731,
-	64509=>793,64510=>276,64511=>243,64512=>932,64513=>932,64514=>914,64515=>1067,64516=>1077,64517=>935,64518=>935,64519=>935,64520=>917,64521=>1070,64522=>1080,64523=>932,64524=>932,
-	64525=>932,64526=>914,64527=>1067,64528=>1077,64529=>932,64530=>914,64531=>1067,64532=>1077,64533=>1305,64534=>1287,64535=>1305,64536=>1287,64537=>1305,64538=>1305,64539=>1287,64540=>1429,
-	64541=>1429,64542=>1429,64543=>1411,64544=>1476,64545=>1458,64546=>1476,64547=>1476,64548=>1476,64549=>1458,64550=>1392,64551=>1374,64552=>1374,64553=>1245,64554=>1227,64555=>1245,64556=>1227,
-	64557=>1125,64558=>1125,64559=>1125,64560=>1107,64561=>1260,64562=>1270,64563=>1125,64564=>1107,64565=>1260,64566=>1270,64567=>706,64568=>1091,64569=>1091,64570=>1091,64571=>1106,64572=>1073,
-	64573=>1226,64574=>1236,64575=>932,64576=>932,64577=>932,64578=>914,64579=>1067,64580=>1077,64581=>1140,64582=>1140,64583=>1140,64584=>1122,64585=>1275,64586=>1285,64587=>932,64588=>932,
-	64589=>932,64590=>914,64591=>1067,64592=>1077,64593=>1345,64594=>1327,64595=>1480,64596=>1490,64597=>932,64598=>932,64599=>932,64600=>914,64601=>1067,64602=>1077,64603=>430,64604=>421,
-	64605=>731,64606=>296,64607=>300,64608=>300,64609=>300,64610=>300,64611=>300,64612=>680,64613=>680,64614=>884,64615=>967,64616=>1037,64617=>1047,64618=>680,64619=>680,64620=>884,
-	64621=>967,64622=>1037,64623=>1047,64624=>680,64625=>680,64626=>884,64627=>967,64628=>1037,64629=>1047,64630=>680,64631=>680,64632=>884,64633=>967,64634=>1037,64635=>1047,64636=>1274,
-	64637=>1284,64638=>1274,64639=>1284,64640=>821,64641=>1221,64642=>1188,64643=>1341,64644=>1351,64645=>884,64646=>1037,64647=>1047,64648=>806,64649=>1173,64650=>680,64651=>680,64652=>884,
-	64653=>967,64654=>1037,64655=>1047,64656=>793,64657=>680,64658=>680,64659=>884,64660=>967,64661=>1037,64662=>1047,64663=>911,64664=>911,64665=>911,64666=>806,64667=>679,64668=>911,
-	64669=>911,64670=>911,64671=>806,64672=>679,64673=>911,64674=>911,64675=>911,64676=>806,64677=>679,64678=>806,64679=>1284,64680=>1179,64681=>1284,64682=>1179,64683=>1284,64684=>1179,
-	64685=>1408,64686=>1408,64687=>1408,64688=>1303,64689=>1455,64690=>1455,64691=>1350,64692=>1455,64693=>1455,64694=>1455,64695=>1350,64696=>1371,64697=>1266,64698=>1224,64699=>1119,64700=>1224,
-	64701=>1119,64702=>1104,64703=>1104,64704=>1104,64705=>999,64706=>1104,64707=>999,64708=>1070,64709=>1070,64710=>1070,64711=>676,64712=>965,64713=>911,64714=>911,64715=>911,64716=>806,
-	64717=>679,64718=>1119,64719=>1119,64720=>1119,64721=>1014,64722=>911,64723=>911,64724=>911,64725=>806,64726=>679,64727=>1324,64728=>1219,64729=>686,64730=>911,64731=>911,64732=>911,
-	64733=>806,64734=>679,64735=>776,64736=>649,64737=>776,64738=>649,64739=>776,64740=>649,64741=>776,64742=>649,64743=>1303,64744=>1176,64745=>1303,64746=>1176,64747=>793,64748=>1082,
-	64749=>776,64750=>776,64751=>649,64752=>776,64753=>649,64754=>306,64755=>302,64756=>298,64757=>1527,64758=>1537,64759=>1380,64760=>1390,64761=>1380,64762=>1390,64763=>1564,64764=>1574,
-	64765=>1564,64766=>1574,64767=>1440,64768=>1450,64769=>1440,64770=>1450,64771=>1440,64772=>1450,64773=>1611,64774=>1621,64775=>1611,64776=>1621,64777=>1429,64778=>1429,64779=>1429,64780=>1411,
-	64781=>1207,64782=>1207,64783=>1254,64784=>1254,64785=>1527,64786=>1537,64787=>1348,64788=>1358,64789=>1348,64790=>1358,64791=>1564,64792=>1574,64793=>1564,64794=>1574,64795=>1431,64796=>1441,
-	64797=>1431,64798=>1441,64799=>1431,64800=>1441,64801=>1611,64802=>1621,64803=>1611,64804=>1621,64805=>1429,64806=>1429,64807=>1429,64808=>1411,64809=>1207,64810=>1207,64811=>1254,64812=>1254,
-	64813=>1408,64814=>1408,64815=>1408,64816=>1303,64817=>1176,64818=>1176,64819=>1266,64820=>1408,64821=>1408,64822=>1408,64823=>1408,64824=>1408,64825=>1408,64826=>1266,64827=>1266,64828=>273,
-	64829=>243,64830=>600,64831=>600,64848=>1444,64849=>1541,64850=>1549,64851=>1444,64852=>1444,64853=>1444,64854=>1444,64855=>1444,64856=>1830,64857=>1817,64858=>1975,64859=>1964,64860=>2046,
-	64861=>2046,64862=>2202,64863=>1962,64864=>1941,64865=>1941,64866=>1944,64867=>1836,64868=>2114,64869=>2093,64870=>1991,64871=>2049,64872=>1941,64873=>2212,64874=>1962,64875=>1941,64876=>1944,
-	64877=>1836,64878=>2249,64879=>2096,64880=>1988,64881=>1925,64882=>1904,64883=>1799,64884=>2070,64885=>1833,64886=>1729,64887=>1652,64888=>1881,64889=>1729,64890=>1892,64891=>1881,64892=>1759,
-	64893=>1637,64894=>1670,64895=>1654,64896=>1522,64897=>1686,64898=>1675,64899=>1549,64900=>1541,64901=>1522,64902=>1444,64903=>1436,64904=>1444,64905=>1757,64906=>1652,64907=>1975,64908=>1757,
-	64909=>1652,64910=>1757,64911=>1652,64914=>1757,64915=>1857,64916=>1752,64917=>1444,64918=>1675,64919=>1522,64920=>1444,64921=>1675,64922=>1581,64923=>1570,64924=>1417,64925=>1362,64926=>1686,
-	64927=>1686,64928=>1675,64929=>1686,64930=>1675,64931=>1581,64932=>1570,64933=>1975,64934=>2069,64935=>1964,64936=>2202,64937=>2259,64938=>2212,64939=>2259,64940=>1686,64941=>1581,64942=>1686,
-	64943=>1686,64944=>1581,64945=>1870,64946=>1817,64947=>1686,64948=>1637,64949=>1444,64950=>1892,64951=>1886,64952=>1549,64953=>1975,64954=>1444,64955=>1723,64956=>1522,64957=>1541,64958=>2080,
-	64959=>2080,64960=>1975,64961=>1817,64962=>1686,64963=>1499,64964=>1757,64965=>1883,64966=>2212,64967=>1686,65008=>1523,65009=>1172,65010=>1159,65011=>1356,65012=>2111,65013=>2258,65014=>2130,
-	65015=>1552,65016=>2046,65017=>1856,65018=>1930,65019=>1070,65056=>450,65057=>450,65058=>450,65059=>450,65072=>1000,65073=>1000,65074=>1000,65075=>1000,65076=>1000,65077=>1000,65078=>1000,
-	65079=>1000,65080=>1000,65081=>1000,65082=>1000,65083=>1000,65084=>1000,65085=>1000,65086=>1000,65087=>1000,65088=>1000,65089=>1000,65090=>1000,65091=>1000,65092=>1000,65097=>1000,65098=>1000,
-	65099=>1000,65100=>1000,65101=>1000,65102=>1000,65103=>1000,65104=>167,65105=>250,65106=>167,65108=>167,65109=>167,65110=>334,65111=>167,65112=>600,65113=>200,65114=>200,65115=>200,
-	65116=>200,65117=>200,65118=>200,65119=>334,65120=>400,65121=>233,65122=>350,65123=>200,65124=>350,65125=>350,65126=>350,65128=>167,65129=>334,65130=>533,65131=>609,65136=>300,
-	65137=>298,65138=>296,65140=>298,65142=>300,65143=>298,65144=>300,65145=>302,65146=>298,65147=>296,65148=>306,65149=>306,65150=>154,65151=>154,65152=>529,65153=>243,65154=>273,
-	65155=>243,65156=>273,65157=>470,65158=>466,65159=>243,65160=>273,65161=>731,65162=>793,65163=>276,65164=>243,65165=>243,65166=>273,65167=>771,65168=>788,65169=>276,65170=>243,
-	65171=>514,65172=>477,65173=>771,65174=>788,65175=>276,65176=>243,65177=>771,65178=>788,65179=>276,65180=>243,65181=>544,65182=>658,65183=>646,65184=>637,65185=>544,65186=>658,
-	65187=>646,65188=>637,65189=>544,65190=>658,65191=>646,65192=>637,65193=>430,65194=>458,65195=>430,65196=>458,65197=>421,65198=>436,65199=>421,65200=>436,65201=>1194,65202=>1194,
-	65203=>770,65204=>770,65205=>1194,65206=>1194,65207=>770,65208=>770,65209=>1291,65210=>1291,65211=>817,65212=>817,65213=>1291,65214=>1291,65215=>817,65216=>817,65217=>843,65218=>843,
-	65219=>733,65220=>733,65221=>843,65222=>843,65223=>733,65224=>733,65225=>594,65226=>556,65227=>586,65228=>554,65229=>594,65230=>556,65231=>586,65232=>554,65233=>957,65234=>903,
-	65235=>466,65236=>480,65237=>800,65238=>823,65239=>466,65240=>480,65241=>757,65242=>733,65243=>432,65244=>549,65245=>662,65246=>673,65247=>273,65248=>243,65249=>589,65250=>640,
-	65251=>481,65252=>532,65253=>692,65254=>723,65255=>276,65256=>243,65257=>514,65258=>477,65259=>686,65260=>405,65261=>470,65262=>466,65263=>731,65264=>793,65265=>731,65266=>803,
-	65267=>276,65268=>243,65269=>551,65270=>603,65271=>551,65272=>603,65273=>551,65274=>603,65275=>551,65276=>603,65281=>1000,65282=>1000,65283=>1000,65284=>1000,65285=>1000,65286=>1000,
-	65287=>1000,65288=>1000,65289=>1000,65290=>1000,65291=>1000,65292=>1000,65293=>1000,65294=>1000,65295=>1000,65296=>1000,65297=>1000,65298=>1000,65299=>1000,65300=>1000,65301=>1000,65302=>1000,
-	65303=>1000,65304=>1000,65305=>1000,65306=>1000,65307=>1000,65308=>1000,65309=>1000,65310=>1000,65311=>1000,65312=>1000,65313=>1000,65314=>1000,65315=>1000,65316=>1000,65317=>1000,65318=>1000,
-	65319=>1000,65320=>1000,65321=>1000,65322=>1000,65323=>1000,65324=>1000,65325=>1000,65326=>1000,65327=>1000,65328=>1000,65329=>1000,65330=>1000,65331=>1000,65332=>1000,65333=>1000,65334=>1000,
-	65335=>1000,65336=>1000,65337=>1000,65338=>1000,65339=>1000,65340=>1000,65341=>1000,65342=>1000,65343=>1000,65344=>1000,65345=>1000,65346=>1000,65347=>1000,65348=>1000,65349=>1000,65350=>1000,
-	65351=>1000,65352=>1000,65353=>1000,65354=>1000,65355=>1000,65356=>1000,65357=>1000,65358=>1000,65359=>1000,65360=>1000,65361=>1000,65362=>1000,65363=>1000,65364=>1000,65365=>1000,65366=>1000,
-	65367=>1000,65368=>1000,65369=>1000,65370=>1000,65371=>1000,65372=>1000,65373=>1000,65374=>1000,65377=>500,65378=>500,65379=>500,65380=>500,65381=>500,65382=>500,65383=>500,65384=>500,
-	65385=>500,65386=>500,65387=>500,65388=>500,65389=>500,65390=>500,65391=>500,65392=>500,65393=>500,65394=>500,65395=>500,65396=>500,65397=>500,65398=>500,65399=>500,65400=>500,
-	65401=>500,65402=>500,65403=>500,65404=>500,65405=>500,65406=>500,65407=>500,65408=>500,65409=>500,65410=>500,65411=>500,65412=>500,65413=>500,65414=>500,65415=>500,65416=>500,
-	65417=>500,65418=>500,65419=>500,65420=>500,65421=>500,65422=>500,65423=>500,65424=>500,65425=>500,65426=>500,65427=>500,65428=>500,65429=>500,65430=>500,65431=>500,65432=>500,
-	65433=>500,65434=>500,65435=>500,65436=>500,65437=>500,65438=>500,65439=>500,65440=>500,65441=>500,65442=>500,65443=>500,65444=>500,65445=>500,65446=>500,65447=>500,65448=>500,
-	65449=>500,65450=>500,65451=>500,65452=>500,65453=>500,65454=>500,65455=>500,65456=>500,65457=>500,65458=>500,65459=>500,65460=>500,65461=>500,65462=>500,65463=>500,65464=>500,
-	65465=>500,65466=>500,65467=>500,65468=>500,65469=>500,65470=>500,65474=>500,65475=>500,65476=>500,65477=>500,65478=>500,65479=>500,65482=>500,65483=>500,65484=>500,65485=>500,
-	65486=>500,65487=>500,65490=>500,65491=>500,65492=>500,65493=>500,65494=>500,65495=>500,65498=>500,65499=>500,65500=>500,65504=>1000,65505=>1000,65506=>1000,65507=>1000,65508=>1000,
-	65509=>1000,65510=>1000,65512=>500,65513=>500,65514=>500,65515=>500,65516=>500,65517=>500,65518=>500,65532=>1000,65533=>1000,19968=>1000,19969=>1000,19970=>1000,19971=>1000,19972=>1000,
-	19973=>1000,19974=>1000,19975=>1000,19976=>1000,19977=>1000,19978=>1000,19979=>1000,19980=>1000,19981=>1000,19982=>1000,19983=>1000,19984=>1000,19985=>1000,19986=>1000,19987=>1000,19988=>1000,
-	19989=>1000,19990=>1000,19991=>1000,19992=>1000,19993=>1000,19994=>1000,19995=>1000,19996=>1000,19997=>1000,19998=>1000,19999=>1000,20000=>1000,20001=>1000,20002=>1000,20003=>1000,20004=>1000,
-	20005=>1000,20006=>1000,20007=>1000,20008=>1000,20009=>1000,20010=>1000,20011=>1000,20012=>1000,20013=>1000,20014=>1000,20015=>1000,20016=>1000,20017=>1000,20018=>1000,20019=>1000,20020=>1000,
-	20021=>1000,20022=>1000,20023=>1000,20024=>1000,20025=>1000,20026=>1000,20027=>1000,20028=>1000,20029=>1000,20030=>1000,20031=>1000,20032=>1000,20033=>1000,20034=>1000,20035=>1000,20036=>1000,
-	20037=>1000,20038=>1000,20039=>1000,20040=>1000,20041=>1000,20042=>1000,20043=>1000,20044=>1000,20045=>1000,20046=>1000,20047=>1000,20048=>1000,20049=>1000,20050=>1000,20051=>1000,20052=>1000,
-	20053=>1000,20054=>1000,20055=>1000,20056=>1000,20057=>1000,20058=>1000,20059=>1000,20060=>1000,20061=>1000,20062=>1000,20063=>1000,20064=>1000,20065=>1000,20066=>1000,20067=>1000,20068=>1000,
-	20069=>1000,20070=>1000,20071=>1000,20072=>1000,20073=>1000,20074=>1000,20075=>1000,20076=>1000,20077=>1000,20078=>1000,20079=>1000,20080=>1000,20081=>1000,20082=>1000,20083=>1000,20084=>1000,
-	20085=>1000,20086=>1000,20087=>1000,20088=>1000,20089=>1000,20090=>1000,20091=>1000,20092=>1000,20093=>1000,20094=>1000,20095=>1000,20096=>1000,20097=>1000,20098=>1000,20099=>1000,20100=>1000,
-	20101=>1000,20102=>1000,20103=>1000,20104=>1000,20105=>1000,20106=>1000,20107=>1000,20108=>1000,20109=>1000,20110=>1000,20111=>1000,20112=>1000,20113=>1000,20114=>1000,20115=>1000,20116=>1000,
-	20117=>1000,20118=>1000,20119=>1000,20120=>1000,20121=>1000,20122=>1000,20123=>1000,20124=>1000,20125=>1000,20126=>1000,20127=>1000,20128=>1000,20129=>1000,20130=>1000,20131=>1000,20132=>1000,
-	20133=>1000,20134=>1000,20135=>1000,20136=>1000,20137=>1000,20138=>1000,20139=>1000,20140=>1000,20141=>1000,20142=>1000,20143=>1000,20144=>1000,20145=>1000,20146=>1000,20147=>1000,20148=>1000,
-	20149=>1000,20150=>1000,20151=>1000,20152=>1000,20153=>1000,20154=>1000,20155=>1000,20156=>1000,20157=>1000,20158=>1000,20159=>1000,20160=>1000,20161=>1000,20162=>1000,20163=>1000,20164=>1000,
-	20165=>1000,20166=>1000,20167=>1000,20168=>1000,20169=>1000,20170=>1000,20171=>1000,20172=>1000,20173=>1000,20174=>1000,20175=>1000,20176=>1000,20177=>1000,20178=>1000,20179=>1000,20180=>1000,
-	20181=>1000,20182=>1000,20183=>1000,20184=>1000,20185=>1000,20186=>1000,20187=>1000,20188=>1000,20189=>1000,20190=>1000,20191=>1000,20192=>1000,20193=>1000,20194=>1000,20195=>1000,20196=>1000,
-	20197=>1000,20198=>1000,20199=>1000,20200=>1000,20201=>1000,20202=>1000,20203=>1000,20204=>1000,20205=>1000,20206=>1000,20207=>1000,20208=>1000,20209=>1000,20210=>1000,20211=>1000,20212=>1000,
-	20213=>1000,20214=>1000,20215=>1000,20216=>1000,20217=>1000,20218=>1000,20219=>1000,20220=>1000,20221=>1000,20222=>1000,20223=>1000,20224=>1000,20225=>1000,20226=>1000,20227=>1000,20228=>1000,
-	20229=>1000,20230=>1000,20231=>1000,20232=>1000,20233=>1000,20234=>1000,20235=>1000,20236=>1000,20237=>1000,20238=>1000,20239=>1000,20240=>1000,20241=>1000,20242=>1000,20243=>1000,20244=>1000,
-	20245=>1000,20246=>1000,20247=>1000,20248=>1000,20249=>1000,20250=>1000,20251=>1000,20252=>1000,20253=>1000,20254=>1000,20255=>1000,20256=>1000,20257=>1000,20258=>1000,20259=>1000,20260=>1000,
-	20261=>1000,20262=>1000,20263=>1000,20264=>1000,20265=>1000,20266=>1000,20267=>1000,20268=>1000,20269=>1000,20270=>1000,20271=>1000,20272=>1000,20273=>1000,20274=>1000,20275=>1000,20276=>1000,
-	20277=>1000,20278=>1000,20279=>1000,20280=>1000,20281=>1000,20282=>1000,20283=>1000,20284=>1000,20285=>1000,20286=>1000,20287=>1000,20288=>1000,20289=>1000,20290=>1000,20291=>1000,20292=>1000,
-	20293=>1000,20294=>1000,20295=>1000,20296=>1000,20297=>1000,20298=>1000,20299=>1000,20300=>1000,20301=>1000,20302=>1000,20303=>1000,20304=>1000,20305=>1000,20306=>1000,20307=>1000,20308=>1000,
-	20309=>1000,20310=>1000,20311=>1000,20312=>1000,20313=>1000,20314=>1000,20315=>1000,20316=>1000,20317=>1000,20318=>1000,20319=>1000,20320=>1000,20321=>1000,20322=>1000,20323=>1000,20324=>1000,
-	20325=>1000,20326=>1000,20327=>1000,20328=>1000,20329=>1000,20330=>1000,20331=>1000,20332=>1000,20333=>1000,20334=>1000,20335=>1000,20336=>1000,20337=>1000,20338=>1000,20339=>1000,20340=>1000,
-	20341=>1000,20342=>1000,20343=>1000,20344=>1000,20345=>1000,20346=>1000,20347=>1000,20348=>1000,20349=>1000,20350=>1000,20351=>1000,20352=>1000,20353=>1000,20354=>1000,20355=>1000,20356=>1000,
-	20357=>1000,20358=>1000,20359=>1000,20360=>1000,20361=>1000,20362=>1000,20363=>1000,20364=>1000,20365=>1000,20366=>1000,20367=>1000,20368=>1000,20369=>1000,20370=>1000,20371=>1000,20372=>1000,
-	20373=>1000,20374=>1000,20375=>1000,20376=>1000,20377=>1000,20378=>1000,20379=>1000,20380=>1000,20381=>1000,20382=>1000,20383=>1000,20384=>1000,20385=>1000,20386=>1000,20387=>1000,20388=>1000,
-	20389=>1000,20390=>1000,20391=>1000,20392=>1000,20393=>1000,20394=>1000,20395=>1000,20396=>1000,20397=>1000,20398=>1000,20399=>1000,20400=>1000,20401=>1000,20402=>1000,20403=>1000,20404=>1000,
-	20405=>1000,20406=>1000,20407=>1000,20408=>1000,20409=>1000,20410=>1000,20411=>1000,20412=>1000,20413=>1000,20414=>1000,20415=>1000,20416=>1000,20417=>1000,20418=>1000,20419=>1000,20420=>1000,
-	20421=>1000,20422=>1000,20423=>1000,20424=>1000,20425=>1000,20426=>1000,20427=>1000,20428=>1000,20429=>1000,20430=>1000,20431=>1000,20432=>1000,20433=>1000,20434=>1000,20435=>1000,20436=>1000,
-	20437=>1000,20438=>1000,20439=>1000,20440=>1000,20441=>1000,20442=>1000,20443=>1000,20444=>1000,20445=>1000,20446=>1000,20447=>1000,20448=>1000,20449=>1000,20450=>1000,20451=>1000,20452=>1000,
-	20453=>1000,20454=>1000,20455=>1000,20456=>1000,20457=>1000,20458=>1000,20459=>1000,20460=>1000,20461=>1000,20462=>1000,20463=>1000,20464=>1000,20465=>1000,20466=>1000,20467=>1000,20468=>1000,
-	20469=>1000,20470=>1000,20471=>1000,20472=>1000,20473=>1000,20474=>1000,20475=>1000,20476=>1000,20477=>1000,20478=>1000,20479=>1000,20480=>1000,20481=>1000,20482=>1000,20483=>1000,20484=>1000,
-	20485=>1000,20486=>1000,20487=>1000,20488=>1000,20489=>1000,20490=>1000,20491=>1000,20492=>1000,20493=>1000,20494=>1000,20495=>1000,20496=>1000,20497=>1000,20498=>1000,20499=>1000,20500=>1000,
-	20501=>1000,20502=>1000,20503=>1000,20504=>1000,20505=>1000,20506=>1000,20507=>1000,20508=>1000,20509=>1000,20510=>1000,20511=>1000,20512=>1000,20513=>1000,20514=>1000,20515=>1000,20516=>1000,
-	20517=>1000,20518=>1000,20519=>1000,20520=>1000,20521=>1000,20522=>1000,20523=>1000,20524=>1000,20525=>1000,20526=>1000,20527=>1000,20528=>1000,20529=>1000,20530=>1000,20531=>1000,20532=>1000,
-	20533=>1000,20534=>1000,20535=>1000,20536=>1000,20537=>1000,20538=>1000,20539=>1000,20540=>1000,20541=>1000,20542=>1000,20543=>1000,20544=>1000,20545=>1000,20546=>1000,20547=>1000,20548=>1000,
-	20549=>1000,20550=>1000,20551=>1000,20552=>1000,20553=>1000,20554=>1000,20555=>1000,20556=>1000,20557=>1000,20558=>1000,20559=>1000,20560=>1000,20561=>1000,20562=>1000,20563=>1000,20564=>1000,
-	20565=>1000,20566=>1000,20567=>1000,20568=>1000,20569=>1000,20570=>1000,20571=>1000,20572=>1000,20573=>1000,20574=>1000,20575=>1000,20576=>1000,20577=>1000,20578=>1000,20579=>1000,20580=>1000,
-	20581=>1000,20582=>1000,20583=>1000,20584=>1000,20585=>1000,20586=>1000,20587=>1000,20588=>1000,20589=>1000,20590=>1000,20591=>1000,20592=>1000,20593=>1000,20594=>1000,20595=>1000,20596=>1000,
-	20597=>1000,20598=>1000,20599=>1000,20600=>1000,20601=>1000,20602=>1000,20603=>1000,20604=>1000,20605=>1000,20606=>1000,20607=>1000,20608=>1000,20609=>1000,20610=>1000,20611=>1000,20612=>1000,
-	20613=>1000,20614=>1000,20615=>1000,20616=>1000,20617=>1000,20618=>1000,20619=>1000,20620=>1000,20621=>1000,20622=>1000,20623=>1000,20624=>1000,20625=>1000,20626=>1000,20627=>1000,20628=>1000,
-	20629=>1000,20630=>1000,20631=>1000,20632=>1000,20633=>1000,20634=>1000,20635=>1000,20636=>1000,20637=>1000,20638=>1000,20639=>1000,20640=>1000,20641=>1000,20642=>1000,20643=>1000,20644=>1000,
-	20645=>1000,20646=>1000,20647=>1000,20648=>1000,20649=>1000,20650=>1000,20651=>1000,20652=>1000,20653=>1000,20654=>1000,20655=>1000,20656=>1000,20657=>1000,20658=>1000,20659=>1000,20660=>1000,
-	20661=>1000,20662=>1000,20663=>1000,20664=>1000,20665=>1000,20666=>1000,20667=>1000,20668=>1000,20669=>1000,20670=>1000,20671=>1000,20672=>1000,20673=>1000,20674=>1000,20675=>1000,20676=>1000,
-	20677=>1000,20678=>1000,20679=>1000,20680=>1000,20681=>1000,20682=>1000,20683=>1000,20684=>1000,20685=>1000,20686=>1000,20687=>1000,20688=>1000,20689=>1000,20690=>1000,20691=>1000,20692=>1000,
-	20693=>1000,20694=>1000,20695=>1000,20696=>1000,20697=>1000,20698=>1000,20699=>1000,20700=>1000,20701=>1000,20702=>1000,20703=>1000,20704=>1000,20705=>1000,20706=>1000,20707=>1000,20708=>1000,
-	20709=>1000,20710=>1000,20711=>1000,20712=>1000,20713=>1000,20714=>1000,20715=>1000,20716=>1000,20717=>1000,20718=>1000,20719=>1000,20720=>1000,20721=>1000,20722=>1000,20723=>1000,20724=>1000,
-	20725=>1000,20726=>1000,20727=>1000,20728=>1000,20729=>1000,20730=>1000,20731=>1000,20732=>1000,20733=>1000,20734=>1000,20735=>1000,20736=>1000,20737=>1000,20738=>1000,20739=>1000,20740=>1000,
-	20741=>1000,20742=>1000,20743=>1000,20744=>1000,20745=>1000,20746=>1000,20747=>1000,20748=>1000,20749=>1000,20750=>1000,20751=>1000,20752=>1000,20753=>1000,20754=>1000,20755=>1000,20756=>1000,
-	20757=>1000,20758=>1000,20759=>1000,20760=>1000,20761=>1000,20762=>1000,20763=>1000,20764=>1000,20765=>1000,20766=>1000,20767=>1000,20768=>1000,20769=>1000,20770=>1000,20771=>1000,20772=>1000,
-	20773=>1000,20774=>1000,20775=>1000,20776=>1000,20777=>1000,20778=>1000,20779=>1000,20780=>1000,20781=>1000,20782=>1000,20783=>1000,20784=>1000,20785=>1000,20786=>1000,20787=>1000,20788=>1000,
-	20789=>1000,20790=>1000,20791=>1000,20792=>1000,20793=>1000,20794=>1000,20795=>1000,20796=>1000,20797=>1000,20798=>1000,20799=>1000,20800=>1000,20801=>1000,20802=>1000,20803=>1000,20804=>1000,
-	20805=>1000,20806=>1000,20807=>1000,20808=>1000,20809=>1000,20810=>1000,20811=>1000,20812=>1000,20813=>1000,20814=>1000,20815=>1000,20816=>1000,20817=>1000,20818=>1000,20819=>1000,20820=>1000,
-	20821=>1000,20822=>1000,20823=>1000,20824=>1000,20825=>1000,20826=>1000,20827=>1000,20828=>1000,20829=>1000,20830=>1000,20831=>1000,20832=>1000,20833=>1000,20834=>1000,20835=>1000,20836=>1000,
-	20837=>1000,20838=>1000,20839=>1000,20840=>1000,20841=>1000,20842=>1000,20843=>1000,20844=>1000,20845=>1000,20846=>1000,20847=>1000,20848=>1000,20849=>1000,20850=>1000,20851=>1000,20852=>1000,
-	20853=>1000,20854=>1000,20855=>1000,20856=>1000,20857=>1000,20858=>1000,20859=>1000,20860=>1000,20861=>1000,20862=>1000,20863=>1000,20864=>1000,20865=>1000,20866=>1000,20867=>1000,20868=>1000,
-	20869=>1000,20870=>1000,20871=>1000,20872=>1000,20873=>1000,20874=>1000,20875=>1000,20876=>1000,20877=>1000,20878=>1000,20879=>1000,20880=>1000,20881=>1000,20882=>1000,20883=>1000,20884=>1000,
-	20885=>1000,20886=>1000,20887=>1000,20888=>1000,20889=>1000,20890=>1000,20891=>1000,20892=>1000,20893=>1000,20894=>1000,20895=>1000,20896=>1000,20897=>1000,20898=>1000,20899=>1000,20900=>1000,
-	20901=>1000,20902=>1000,20903=>1000,20904=>1000,20905=>1000,20906=>1000,20907=>1000,20908=>1000,20909=>1000,20910=>1000,20911=>1000,20912=>1000,20913=>1000,20914=>1000,20915=>1000,20916=>1000,
-	20917=>1000,20918=>1000,20919=>1000,20920=>1000,20921=>1000,20922=>1000,20923=>1000,20924=>1000,20925=>1000,20926=>1000,20927=>1000,20928=>1000,20929=>1000,20930=>1000,20931=>1000,20932=>1000,
-	20933=>1000,20934=>1000,20935=>1000,20936=>1000,20937=>1000,20938=>1000,20939=>1000,20940=>1000,20941=>1000,20942=>1000,20943=>1000,20944=>1000,20945=>1000,20946=>1000,20947=>1000,20948=>1000,
-	20949=>1000,20950=>1000,20951=>1000,20952=>1000,20953=>1000,20954=>1000,20955=>1000,20956=>1000,20957=>1000,20958=>1000,20959=>1000,20960=>1000,20961=>1000,20962=>1000,20963=>1000,20964=>1000,
-	20965=>1000,20966=>1000,20967=>1000,20968=>1000,20969=>1000,20970=>1000,20971=>1000,20972=>1000,20973=>1000,20974=>1000,20975=>1000,20976=>1000,20977=>1000,20978=>1000,20979=>1000,20980=>1000,
-	20981=>1000,20982=>1000,20983=>1000,20984=>1000,20985=>1000,20986=>1000,20987=>1000,20988=>1000,20989=>1000,20990=>1000,20991=>1000,20992=>1000,20993=>1000,20994=>1000,20995=>1000,20996=>1000,
-	20997=>1000,20998=>1000,20999=>1000,21000=>1000,21001=>1000,21002=>1000,21003=>1000,21004=>1000,21005=>1000,21006=>1000,21007=>1000,21008=>1000,21009=>1000,21010=>1000,21011=>1000,21012=>1000,
-	21013=>1000,21014=>1000,21015=>1000,21016=>1000,21017=>1000,21018=>1000,21019=>1000,21020=>1000,21021=>1000,21022=>1000,21023=>1000,21024=>1000,21025=>1000,21026=>1000,21027=>1000,21028=>1000,
-	21029=>1000,21030=>1000,21031=>1000,21032=>1000,21033=>1000,21034=>1000,21035=>1000,21036=>1000,21037=>1000,21038=>1000,21039=>1000,21040=>1000,21041=>1000,21042=>1000,21043=>1000,21044=>1000,
-	21045=>1000,21046=>1000,21047=>1000,21048=>1000,21049=>1000,21050=>1000,21051=>1000,21052=>1000,21053=>1000,21054=>1000,21055=>1000,21056=>1000,21057=>1000,21058=>1000,21059=>1000,21060=>1000,
-	21061=>1000,21062=>1000,21063=>1000,21064=>1000,21065=>1000,21066=>1000,21067=>1000,21068=>1000,21069=>1000,21070=>1000,21071=>1000,21072=>1000,21073=>1000,21074=>1000,21075=>1000,21076=>1000,
-	21077=>1000,21078=>1000,21079=>1000,21080=>1000,21081=>1000,21082=>1000,21083=>1000,21084=>1000,21085=>1000,21086=>1000,21087=>1000,21088=>1000,21089=>1000,21090=>1000,21091=>1000,21092=>1000,
-	21093=>1000,21094=>1000,21095=>1000,21096=>1000,21097=>1000,21098=>1000,21099=>1000,21100=>1000,21101=>1000,21102=>1000,21103=>1000,21104=>1000,21105=>1000,21106=>1000,21107=>1000,21108=>1000,
-	21109=>1000,21110=>1000,21111=>1000,21112=>1000,21113=>1000,21114=>1000,21115=>1000,21116=>1000,21117=>1000,21118=>1000,21119=>1000,21120=>1000,21121=>1000,21122=>1000,21123=>1000,21124=>1000,
-	21125=>1000,21126=>1000,21127=>1000,21128=>1000,21129=>1000,21130=>1000,21131=>1000,21132=>1000,21133=>1000,21134=>1000,21135=>1000,21136=>1000,21137=>1000,21138=>1000,21139=>1000,21140=>1000,
-	21141=>1000,21142=>1000,21143=>1000,21144=>1000,21145=>1000,21146=>1000,21147=>1000,21148=>1000,21149=>1000,21150=>1000,21151=>1000,21152=>1000,21153=>1000,21154=>1000,21155=>1000,21156=>1000,
-	21157=>1000,21158=>1000,21159=>1000,21160=>1000,21161=>1000,21162=>1000,21163=>1000,21164=>1000,21165=>1000,21166=>1000,21167=>1000,21168=>1000,21169=>1000,21170=>1000,21171=>1000,21172=>1000,
-	21173=>1000,21174=>1000,21175=>1000,21176=>1000,21177=>1000,21178=>1000,21179=>1000,21180=>1000,21181=>1000,21182=>1000,21183=>1000,21184=>1000,21185=>1000,21186=>1000,21187=>1000,21188=>1000,
-	21189=>1000,21190=>1000,21191=>1000,21192=>1000,21193=>1000,21194=>1000,21195=>1000,21196=>1000,21197=>1000,21198=>1000,21199=>1000,21200=>1000,21201=>1000,21202=>1000,21203=>1000,21204=>1000,
-	21205=>1000,21206=>1000,21207=>1000,21208=>1000,21209=>1000,21210=>1000,21211=>1000,21212=>1000,21213=>1000,21214=>1000,21215=>1000,21216=>1000,21217=>1000,21218=>1000,21219=>1000,21220=>1000,
-	21221=>1000,21222=>1000,21223=>1000,21224=>1000,21225=>1000,21226=>1000,21227=>1000,21228=>1000,21229=>1000,21230=>1000,21231=>1000,21232=>1000,21233=>1000,21234=>1000,21235=>1000,21236=>1000,
-	21237=>1000,21238=>1000,21239=>1000,21240=>1000,21241=>1000,21242=>1000,21243=>1000,21244=>1000,21245=>1000,21246=>1000,21247=>1000,21248=>1000,21249=>1000,21250=>1000,21251=>1000,21252=>1000,
-	21253=>1000,21254=>1000,21255=>1000,21256=>1000,21257=>1000,21258=>1000,21259=>1000,21260=>1000,21261=>1000,21262=>1000,21263=>1000,21264=>1000,21265=>1000,21266=>1000,21267=>1000,21268=>1000,
-	21269=>1000,21270=>1000,21271=>1000,21272=>1000,21273=>1000,21274=>1000,21275=>1000,21276=>1000,21277=>1000,21278=>1000,21279=>1000,21280=>1000,21281=>1000,21282=>1000,21283=>1000,21284=>1000,
-	21285=>1000,21286=>1000,21287=>1000,21288=>1000,21289=>1000,21290=>1000,21291=>1000,21292=>1000,21293=>994,21294=>1000,21295=>1000,21296=>1000,21297=>1000,21298=>1000,21299=>1000,21300=>1000,
-	21301=>1000,21302=>1000,21303=>1000,21304=>1000,21305=>1000,21306=>1000,21307=>1000,21308=>1000,21309=>1000,21310=>1000,21311=>1000,21312=>1000,21313=>1000,21314=>1000,21315=>1000,21316=>1000,
-	21317=>1000,21318=>1000,21319=>1000,21320=>1000,21321=>1000,21322=>1000,21323=>1000,21324=>1000,21325=>1000,21326=>1000,21327=>1000,21328=>1000,21329=>1000,21330=>1000,21331=>1000,21332=>1000,
-	21333=>1000,21334=>1000,21335=>1000,21336=>1000,21337=>1000,21338=>1000,21339=>1000,21340=>1000,21341=>1000,21342=>1000,21343=>1000,21344=>1000,21345=>1000,21346=>1000,21347=>1000,21348=>1000,
-	21349=>1000,21350=>1000,21351=>1000,21352=>1000,21353=>1000,21354=>1000,21355=>1000,21356=>1000,21357=>1000,21358=>1000,21359=>1000,21360=>1000,21361=>1000,21362=>1000,21363=>1000,21364=>1000,
-	21365=>1000,21366=>1000,21367=>1000,21368=>1000,21369=>1000,21370=>1000,21371=>1000,21372=>1000,21373=>1000,21374=>1000,21375=>1000,21376=>1000,21377=>1000,21378=>1000,21379=>1000,21380=>1000,
-	21381=>1000,21382=>1000,21383=>1000,21384=>1000,21385=>1000,21386=>1000,21387=>1000,21388=>1000,21389=>1000,21390=>1000,21391=>1000,21392=>1000,21393=>1000,21394=>1000,21395=>1000,21396=>1000,
-	21397=>1000,21398=>1000,21399=>1000,21400=>1000,21401=>1000,21402=>1000,21403=>1000,21404=>1000,21405=>1000,21406=>1000,21407=>1000,21408=>1000,21409=>1000,21410=>1000,21411=>1000,21412=>1000,
-	21413=>1000,21414=>1000,21415=>1000,21416=>1000,21417=>1000,21418=>1000,21419=>1000,21420=>1000,21421=>1000,21422=>1000,21423=>1000,21424=>1000,21425=>1000,21426=>1000,21427=>1000,21428=>1000,
-	21429=>1000,21430=>1000,21431=>1000,21432=>1000,21433=>1000,21434=>1000,21435=>1000,21436=>1000,21437=>1000,21438=>1000,21439=>1000,21440=>1000,21441=>1000,21442=>1000,21443=>1000,21444=>1000,
-	21445=>1000,21446=>1000,21447=>1000,21448=>1000,21449=>1000,21450=>1000,21451=>1000,21452=>1000,21453=>1000,21454=>1000,21455=>1000,21456=>1000,21457=>1000,21458=>1000,21459=>1000,21460=>1000,
-	21461=>1000,21462=>1000,21463=>1000,21464=>1000,21465=>1000,21466=>1000,21467=>1000,21468=>1000,21469=>1000,21470=>1000,21471=>1000,21472=>1000,21473=>1000,21474=>1000,21475=>1000,21476=>1000,
-	21477=>1000,21478=>1000,21479=>1000,21480=>1000,21481=>1000,21482=>1000,21483=>1000,21484=>1000,21485=>1000,21486=>1000,21487=>1000,21488=>1000,21489=>1000,21490=>1000,21491=>1000,21492=>1000,
-	21493=>1000,21494=>1000,21495=>1000,21496=>1000,21497=>1000,21498=>1000,21499=>1000,21500=>1000,21501=>1000,21502=>1000,21503=>1000,21504=>1000,21505=>1000,21506=>1000,21507=>1000,21508=>1000,
-	21509=>1000,21510=>1000,21511=>1000,21512=>1000,21513=>1000,21514=>1000,21515=>1000,21516=>1000,21517=>1000,21518=>1000,21519=>1000,21520=>1000,21521=>1000,21522=>1000,21523=>1000,21524=>1000,
-	21525=>1000,21526=>1000,21527=>1000,21528=>1000,21529=>1000,21530=>1000,21531=>1000,21532=>1000,21533=>1000,21534=>1000,21535=>1000,21536=>1000,21537=>1000,21538=>1000,21539=>1000,21540=>1000,
-	21541=>1000,21542=>1000,21543=>1000,21544=>1000,21545=>1000,21546=>1000,21547=>1000,21548=>1000,21549=>1000,21550=>1000,21551=>1000,21552=>1000,21553=>1000,21554=>1000,21555=>1000,21556=>1000,
-	21557=>1000,21558=>1000,21559=>1000,21560=>1000,21561=>1000,21562=>1000,21563=>1000,21564=>1000,21565=>1000,21566=>1000,21567=>1000,21568=>1000,21569=>1000,21570=>1000,21571=>1000,21572=>1000,
-	21573=>1000,21574=>1000,21575=>1000,21576=>1000,21577=>1000,21578=>1000,21579=>1000,21580=>1000,21581=>1000,21582=>1000,21583=>1000,21584=>1000,21585=>1000,21586=>1000,21587=>1000,21588=>1000,
-	21589=>1000,21590=>1000,21591=>1000,21592=>1000,21593=>1000,21594=>1000,21595=>1000,21596=>1000,21597=>1000,21598=>1000,21599=>1000,21600=>1000,21601=>1000,21602=>1000,21603=>1000,21604=>1000,
-	21605=>1000,21606=>1000,21607=>1000,21608=>1000,21609=>1000,21610=>1000,21611=>1000,21612=>1000,21613=>1000,21614=>1000,21615=>1000,21616=>1000,21617=>1000,21618=>1000,21619=>1000,21620=>1000,
-	21621=>1000,21622=>1000,21623=>1000,21624=>1000,21625=>1000,21626=>1000,21627=>1000,21628=>1000,21629=>1000,21630=>1000,21631=>1000,21632=>1000,21633=>1000,21634=>1000,21635=>1000,21636=>1000,
-	21637=>1000,21638=>1000,21639=>1000,21640=>1000,21641=>1000,21642=>1000,21643=>1000,21644=>1000,21645=>1000,21646=>1000,21647=>1000,21648=>1000,21649=>1000,21650=>1000,21651=>1000,21652=>1000,
-	21653=>1000,21654=>1000,21655=>1000,21656=>1000,21657=>1000,21658=>1000,21659=>1000,21660=>1000,21661=>1000,21662=>1000,21663=>1000,21664=>1000,21665=>1000,21666=>1000,21667=>1000,21668=>1000,
-	21669=>1000,21670=>1000,21671=>1000,21672=>1000,21673=>1000,21674=>1000,21675=>1000,21676=>1000,21677=>1000,21678=>1000,21679=>1000,21680=>1000,21681=>1000,21682=>1000,21683=>1000,21684=>1000,
-	21685=>1000,21686=>1000,21687=>1000,21688=>1000,21689=>1000,21690=>1000,21691=>1000,21692=>1000,21693=>1000,21694=>1000,21695=>1000,21696=>1000,21697=>1000,21698=>1000,21699=>1000,21700=>1000,
-	21701=>1000,21702=>1000,21703=>1000,21704=>1000,21705=>1000,21706=>1000,21707=>1000,21708=>1000,21709=>1000,21710=>1000,21711=>1000,21712=>1000,21713=>1000,21714=>1000,21715=>1000,21716=>1000,
-	21717=>1000,21718=>1000,21719=>1000,21720=>1000,21721=>1000,21722=>1000,21723=>1000,21724=>1000,21725=>1000,21726=>1000,21727=>1000,21728=>1000,21729=>1000,21730=>1000,21731=>1000,21732=>1000,
-	21733=>1000,21734=>1000,21735=>1000,21736=>1000,21737=>1000,21738=>1000,21739=>1000,21740=>1000,21741=>1000,21742=>1000,21743=>1000,21744=>1000,21745=>1000,21746=>1000,21747=>1000,21748=>1000,
-	21749=>1000,21750=>1000,21751=>1000,21752=>1000,21753=>1000,21754=>1000,21755=>1000,21756=>1000,21757=>1000,21758=>1000,21759=>1000,21760=>1000,21761=>1000,21762=>1000,21763=>1000,21764=>1000,
-	21765=>1000,21766=>1000,21767=>1000,21768=>1000,21769=>1000,21770=>1000,21771=>1000,21772=>1000,21773=>1000,21774=>1000,21775=>1000,21776=>1000,21777=>1000,21778=>1000,21779=>1000,21780=>1000,
-	21781=>1000,21782=>1000,21783=>1000,21784=>1000,21785=>1000,21786=>1000,21787=>1000,21788=>1000,21789=>1000,21790=>1000,21791=>1000,21792=>1000,21793=>1000,21794=>1000,21795=>1000,21796=>1000,
-	21797=>1000,21798=>1000,21799=>1000,21800=>1000,21801=>1000,21802=>1000,21803=>1000,21804=>1000,21805=>1000,21806=>1000,21807=>1000,21808=>1000,21809=>1000,21810=>1000,21811=>1000,21812=>1000,
-	21813=>1000,21814=>1000,21815=>1000,21816=>1000,21817=>1000,21818=>1000,21819=>1000,21820=>1000,21821=>1000,21822=>1000,21823=>1000,21824=>1000,21825=>1000,21826=>1000,21827=>1000,21828=>1000,
-	21829=>1000,21830=>1000,21831=>1000,21832=>1000,21833=>1000,21834=>1000,21835=>1000,21836=>1000,21837=>1000,21838=>1000,21839=>1000,21840=>1000,21841=>1000,21842=>1000,21843=>1000,21844=>1000,
-	21845=>1000,21846=>1000,21847=>1000,21848=>1000,21849=>1000,21850=>1000,21851=>1000,21852=>1000,21853=>1000,21854=>1000,21855=>1000,21856=>1000,21857=>1000,21858=>1000,21859=>1000,21860=>1000,
-	21861=>1000,21862=>1000,21863=>1000,21864=>1000,21865=>1000,21866=>1000,21867=>1000,21868=>1000,21869=>1000,21870=>1000,21871=>1000,21872=>1000,21873=>1000,21874=>1000,21875=>1000,21876=>1000,
-	21877=>1000,21878=>1000,21879=>1000,21880=>1000,21881=>1000,21882=>1000,21883=>1000,21884=>1000,21885=>1000,21886=>1000,21887=>1000,21888=>1000,21889=>1000,21890=>1000,21891=>1000,21892=>1000,
-	21893=>1000,21894=>1000,21895=>1000,21896=>1000,21897=>1000,21898=>1000,21899=>1000,21900=>1000,21901=>1000,21902=>1000,21903=>1000,21904=>1000,21905=>1000,21906=>1000,21907=>1000,21908=>1000,
-	21909=>1000,21910=>1000,21911=>1000,21912=>1000,21913=>1000,21914=>1000,21915=>1000,21916=>1000,21917=>1000,21918=>1000,21919=>1000,21920=>1000,21921=>1000,21922=>1000,21923=>1000,21924=>1000,
-	21925=>1000,21926=>1000,21927=>1000,21928=>1000,21929=>1000,21930=>1000,21931=>1000,21932=>1000,21933=>1000,21934=>1000,21935=>1000,21936=>1000,21937=>1000,21938=>1000,21939=>1000,21940=>1000,
-	21941=>1000,21942=>1000,21943=>1000,21944=>1000,21945=>1000,21946=>1000,21947=>1000,21948=>1000,21949=>1000,21950=>1000,21951=>1000,21952=>1000,21953=>1000,21954=>1000,21955=>1000,21956=>1000,
-	21957=>1000,21958=>1000,21959=>1000,21960=>1000,21961=>1000,21962=>1000,21963=>1000,21964=>1000,21965=>1000,21966=>1000,21967=>1000,21968=>1000,21969=>1000,21970=>1000,21971=>1000,21972=>1000,
-	21973=>1000,21974=>1000,21975=>1000,21976=>1000,21977=>1000,21978=>1000,21979=>1000,21980=>1000,21981=>1000,21982=>1000,21983=>1000,21984=>1000,21985=>1000,21986=>1000,21987=>1000,21988=>1000,
-	21989=>1000,21990=>1000,21991=>1000,21992=>1000,21993=>1000,21994=>1000,21995=>1000,21996=>1000,21997=>1000,21998=>1000,21999=>1000,22000=>1000,22001=>1000,22002=>1000,22003=>1000,22004=>1000,
-	22005=>1000,22006=>1000,22007=>1000,22008=>1000,22009=>1000,22010=>1000,22011=>1000,22012=>1000,22013=>1000,22014=>1000,22015=>1000,22016=>1000,22017=>1000,22018=>1000,22019=>1000,22020=>1000,
-	22021=>1000,22022=>1000,22023=>1000,22024=>1000,22025=>1000,22026=>1000,22027=>1000,22028=>1000,22029=>1000,22030=>1000,22031=>1000,22032=>1000,22033=>1000,22034=>1000,22035=>1000,22036=>1000,
-	22037=>1000,22038=>1000,22039=>1000,22040=>1000,22041=>1000,22042=>1000,22043=>1000,22044=>1000,22045=>1000,22046=>1000,22047=>1000,22048=>1000,22049=>1000,22050=>1000,22051=>1000,22052=>1000,
-	22053=>1000,22054=>1000,22055=>1000,22056=>1000,22057=>1000,22058=>1000,22059=>1000,22060=>1000,22061=>1000,22062=>1000,22063=>1000,22064=>1000,22065=>1000,22066=>1000,22067=>1000,22068=>1000,
-	22069=>1000,22070=>1000,22071=>1000,22072=>1000,22073=>1000,22074=>1000,22075=>1000,22076=>1000,22077=>1000,22078=>1000,22079=>1000,22080=>1000,22081=>1000,22082=>1000,22083=>1000,22084=>1000,
-	22085=>1000,22086=>1000,22087=>1000,22088=>1000,22089=>1000,22090=>1000,22091=>1000,22092=>1000,22093=>1000,22094=>1000,22095=>1000,22096=>1000,22097=>1000,22098=>1000,22099=>1000,22100=>1000,
-	22101=>1000,22102=>1000,22103=>1000,22104=>1000,22105=>1000,22106=>1000,22107=>1000,22108=>1000,22109=>1000,22110=>1000,22111=>1000,22112=>1000,22113=>1000,22114=>1000,22115=>1000,22116=>1000,
-	22117=>1000,22118=>1000,22119=>1000,22120=>1000,22121=>1000,22122=>1000,22123=>1000,22124=>1000,22125=>1000,22126=>1000,22127=>1000,22128=>1000,22129=>1000,22130=>1000,22131=>1000,22132=>1000,
-	22133=>1000,22134=>1000,22135=>1000,22136=>1000,22137=>1000,22138=>1000,22139=>1000,22140=>1000,22141=>1000,22142=>1000,22143=>1000,22144=>1000,22145=>1000,22146=>1000,22147=>1000,22148=>1000,
-	22149=>1000,22150=>1000,22151=>1000,22152=>1000,22153=>1000,22154=>1000,22155=>1000,22156=>1000,22157=>1000,22158=>1000,22159=>1000,22160=>1000,22161=>1000,22162=>1000,22163=>1000,22164=>1000,
-	22165=>1000,22166=>1000,22167=>1000,22168=>1000,22169=>1000,22170=>1000,22171=>1000,22172=>1000,22173=>1000,22174=>1000,22175=>1000,22176=>1000,22177=>1000,22178=>1000,22179=>1000,22180=>1000,
-	22181=>1000,22182=>1000,22183=>1000,22184=>1000,22185=>1000,22186=>1000,22187=>1000,22188=>1000,22189=>1000,22190=>1000,22191=>1000,22192=>1000,22193=>1000,22194=>1000,22195=>1000,22196=>1000,
-	22197=>1000,22198=>1000,22199=>1000,22200=>1000,22201=>1000,22202=>1000,22203=>1000,22204=>1000,22205=>1000,22206=>1000,22207=>1000,22208=>1000,22209=>1000,22210=>1000,22211=>1000,22212=>1000,
-	22213=>1000,22214=>1000,22215=>1000,22216=>1000,22217=>1000,22218=>1000,22219=>1000,22220=>1000,22221=>1000,22222=>1000,22223=>1000,22224=>1000,22225=>1000,22226=>1000,22227=>1000,22228=>1000,
-	22229=>1000,22230=>1000,22231=>1000,22232=>1000,22233=>1000,22234=>1000,22235=>1000,22236=>1000,22237=>1000,22238=>1000,22239=>1000,22240=>1000,22241=>1000,22242=>1000,22243=>1000,22244=>1000,
-	22245=>1000,22246=>1000,22247=>1000,22248=>1000,22249=>1000,22250=>1000,22251=>1000,22252=>1000,22253=>1000,22254=>1000,22255=>1000,22256=>1000,22257=>1000,22258=>1000,22259=>1000,22260=>1000,
-	22261=>1000,22262=>1000,22263=>1000,22264=>1000,22265=>1000,22266=>1000,22267=>1000,22268=>1000,22269=>1000,22270=>1000,22271=>1000,22272=>1000,22273=>1000,22274=>1000,22275=>1000,22276=>1000,
-	22277=>1000,22278=>1000,22279=>1000,22280=>1000,22281=>1000,22282=>1000,22283=>1000,22284=>1000,22285=>1000,22286=>1000,22287=>1000,22288=>1000,22289=>1000,22290=>1000,22291=>1000,22292=>1000,
-	22293=>1000,22294=>1000,22295=>1000,22296=>1000,22297=>1000,22298=>1000,22299=>1000,22300=>1000,22301=>1000,22302=>1000,22303=>1000,22304=>1000,22305=>1000,22306=>1000,22307=>1000,22308=>1000,
-	22309=>1000,22310=>1000,22311=>1000,22312=>1000,22313=>1000,22314=>1000,22315=>1000,22316=>1000,22317=>1000,22318=>1000,22319=>1000,22320=>1000,22321=>1000,22322=>1000,22323=>1000,22324=>1000,
-	22325=>1000,22326=>1000,22327=>1000,22328=>1000,22329=>1000,22330=>1000,22331=>1000,22332=>1000,22333=>1000,22334=>1000,22335=>1000,22336=>1000,22337=>1000,22338=>1000,22339=>1000,22340=>1000,
-	22341=>1000,22342=>1000,22343=>1000,22344=>1000,22345=>1000,22346=>1000,22347=>1000,22348=>1000,22349=>1000,22350=>1000,22351=>1000,22352=>1000,22353=>1000,22354=>1000,22355=>1000,22356=>1000,
-	22357=>1000,22358=>1000,22359=>1000,22360=>1000,22361=>1000,22362=>1000,22363=>1000,22364=>1000,22365=>1000,22366=>1000,22367=>1000,22368=>1000,22369=>1000,22370=>1000,22371=>1000,22372=>1000,
-	22373=>1000,22374=>1000,22375=>1000,22376=>1000,22377=>1000,22378=>1000,22379=>1000,22380=>1000,22381=>1000,22382=>1000,22383=>1000,22384=>1000,22385=>1000,22386=>1000,22387=>1000,22388=>1000,
-	22389=>1000,22390=>1000,22391=>1000,22392=>1000,22393=>1000,22394=>1000,22395=>1000,22396=>1000,22397=>1000,22398=>1000,22399=>1000,22400=>1000,22401=>1000,22402=>1000,22403=>1000,22404=>1000,
-	22405=>1000,22406=>1000,22407=>1000,22408=>1000,22409=>1000,22410=>1000,22411=>1000,22412=>1000,22413=>1000,22414=>1000,22415=>1000,22416=>1000,22417=>1000,22418=>1000,22419=>1000,22420=>1000,
-	22421=>1000,22422=>1000,22423=>1000,22424=>1000,22425=>1000,22426=>1000,22427=>1000,22428=>1000,22429=>1000,22430=>1000,22431=>1000,22432=>1000,22433=>1000,22434=>1000,22435=>1000,22436=>1000,
-	22437=>1000,22438=>1000,22439=>1000,22440=>1000,22441=>1000,22442=>1000,22443=>1000,22444=>1000,22445=>1000,22446=>1000,22447=>1000,22448=>1000,22449=>1000,22450=>1000,22451=>1000,22452=>1000,
-	22453=>1000,22454=>1000,22455=>1000,22456=>1000,22457=>1000,22458=>1000,22459=>1000,22460=>1000,22461=>1000,22462=>1000,22463=>1000,22464=>1000,22465=>1000,22466=>1000,22467=>1000,22468=>1000,
-	22469=>1000,22470=>1000,22471=>1000,22472=>1000,22473=>1000,22474=>1000,22475=>1000,22476=>1000,22477=>1000,22478=>1000,22479=>1000,22480=>1000,22481=>1000,22482=>1000,22483=>1000,22484=>1000,
-	22485=>1000,22486=>1000,22487=>1000,22488=>1000,22489=>1000,22490=>1000,22491=>1000,22492=>1000,22493=>1000,22494=>1000,22495=>1000,22496=>1000,22497=>1000,22498=>1000,22499=>1000,22500=>1000,
-	22501=>1000,22502=>1000,22503=>1000,22504=>1000,22505=>1000,22506=>1000,22507=>1000,22508=>1000,22509=>1000,22510=>1000,22511=>1000,22512=>1000,22513=>1000,22514=>1000,22515=>1000,22516=>1000,
-	22517=>1000,22518=>1000,22519=>1000,22520=>1000,22521=>1000,22522=>1000,22523=>1000,22524=>1000,22525=>1000,22526=>1000,22527=>1000,22528=>1000,22529=>1000,22530=>1000,22531=>1000,22532=>1000,
-	22533=>1000,22534=>1000,22535=>1000,22536=>1000,22537=>1000,22538=>1000,22539=>1000,22540=>1000,22541=>1000,22542=>1000,22543=>1000,22544=>1000,22545=>1000,22546=>1000,22547=>1000,22548=>1000,
-	22549=>1000,22550=>1000,22551=>1000,22552=>1000,22553=>1000,22554=>1000,22555=>1000,22556=>1000,22557=>1000,22558=>1000,22559=>1000,22560=>1000,22561=>1000,22562=>1000,22563=>1000,22564=>1000,
-	22565=>1000,22566=>1000,22567=>1000,22568=>1000,22569=>1000,22570=>1000,22571=>1000,22572=>1000,22573=>1000,22574=>1000,22575=>1000,22576=>1000,22577=>1000,22578=>1000,22579=>1000,22580=>1000,
-	22581=>1000,22582=>1000,22583=>1000,22584=>1000,22585=>1000,22586=>1000,22587=>1000,22588=>1000,22589=>1000,22590=>1000,22591=>1000,22592=>1000,22593=>1000,22594=>1000,22595=>1000,22596=>1000,
-	22597=>1000,22598=>1000,22599=>1000,22600=>1000,22601=>1000,22602=>1000,22603=>1000,22604=>1000,22605=>1000,22606=>1000,22607=>1000,22608=>1000,22609=>1000,22610=>1000,22611=>1000,22612=>1000,
-	22613=>1000,22614=>1000,22615=>1000,22616=>1000,22617=>1000,22618=>1000,22619=>1000,22620=>1000,22621=>1000,22622=>1000,22623=>1000,22624=>1000,22625=>1000,22626=>1000,22627=>1000,22628=>1000,
-	22629=>1000,22630=>1000,22631=>1000,22632=>1000,22633=>1000,22634=>1000,22635=>1000,22636=>1000,22637=>1000,22638=>1000,22639=>1000,22640=>1000,22641=>1000,22642=>1000,22643=>1000,22644=>1000,
-	22645=>1000,22646=>1000,22647=>1000,22648=>1000,22649=>1000,22650=>1000,22651=>1000,22652=>1000,22653=>1000,22654=>1000,22655=>1000,22656=>1000,22657=>1000,22658=>1000,22659=>1000,22660=>1000,
-	22661=>1000,22662=>1000,22663=>1000,22664=>1000,22665=>1000,22666=>1000,22667=>1000,22668=>1000,22669=>1000,22670=>1000,22671=>1000,22672=>1000,22673=>1000,22674=>1000,22675=>1000,22676=>1000,
-	22677=>1000,22678=>1000,22679=>1000,22680=>1000,22681=>1000,22682=>1000,22683=>1000,22684=>1000,22685=>1000,22686=>1000,22687=>1000,22688=>1000,22689=>1000,22690=>1000,22691=>1000,22692=>1000,
-	22693=>1000,22694=>1000,22695=>1000,22696=>1000,22697=>1000,22698=>1000,22699=>1000,22700=>1000,22701=>1000,22702=>1000,22703=>1000,22704=>1000,22705=>1000,22706=>1000,22707=>1000,22708=>1000,
-	22709=>1000,22710=>1000,22711=>1000,22712=>1000,22713=>1000,22714=>1000,22715=>1000,22716=>1000,22717=>1000,22718=>1000,22719=>1000,22720=>1000,22721=>1000,22722=>1000,22723=>1000,22724=>1000,
-	22725=>1000,22726=>1000,22727=>1000,22728=>1000,22729=>1000,22730=>1000,22731=>1000,22732=>1000,22733=>1000,22734=>1000,22735=>1000,22736=>1000,22737=>1000,22738=>1000,22739=>1000,22740=>1000,
-	22741=>1000,22742=>1000,22743=>1000,22744=>1000,22745=>1000,22746=>1000,22747=>1000,22748=>1000,22749=>1000,22750=>1000,22751=>1000,22752=>1000,22753=>1000,22754=>1000,22755=>1000,22756=>1000,
-	22757=>1000,22758=>1000,22759=>1000,22760=>1000,22761=>1000,22762=>1000,22763=>1000,22764=>1000,22765=>1000,22766=>1000,22767=>1000,22768=>1000,22769=>1000,22770=>1000,22771=>1000,22772=>1000,
-	22773=>1000,22774=>1000,22775=>1000,22776=>1000,22777=>1000,22778=>1000,22779=>1000,22780=>1000,22781=>1000,22782=>1000,22783=>1000,22784=>1000,22785=>1000,22786=>1000,22787=>1000,22788=>1000,
-	22789=>1000,22790=>1000,22791=>1000,22792=>1000,22793=>1000,22794=>1000,22795=>1000,22796=>1000,22797=>1000,22798=>1000,22799=>1000,22800=>1000,22801=>1000,22802=>1000,22803=>1000,22804=>1000,
-	22805=>1000,22806=>1000,22807=>1000,22808=>1000,22809=>1000,22810=>1000,22811=>1000,22812=>1000,22813=>1000,22814=>1000,22815=>1000,22816=>1000,22817=>1000,22818=>1000,22819=>1000,22820=>1000,
-	22821=>1000,22822=>1000,22823=>1000,22824=>1000,22825=>1000,22826=>1000,22827=>1000,22828=>1000,22829=>1000,22830=>1000,22831=>1000,22832=>1000,22833=>1000,22834=>1000,22835=>1000,22836=>1000,
-	22837=>1000,22838=>1000,22839=>1000,22840=>1000,22841=>1000,22842=>1000,22843=>1000,22844=>1000,22845=>1000,22846=>1000,22847=>1000,22848=>1000,22849=>1000,22850=>1000,22851=>1000,22852=>1000,
-	22853=>1000,22854=>1000,22855=>1000,22856=>1000,22857=>1000,22858=>1000,22859=>1000,22860=>1000,22861=>1000,22862=>1000,22863=>1000,22864=>1000,22865=>1000,22866=>1000,22867=>1000,22868=>1000,
-	22869=>1000,22870=>1000,22871=>1000,22872=>1000,22873=>1000,22874=>1000,22875=>1000,22876=>1000,22877=>1000,22878=>1000,22879=>1000,22880=>1000,22881=>1000,22882=>1000,22883=>1000,22884=>1000,
-	22885=>1000,22886=>1000,22887=>1000,22888=>1000,22889=>1000,22890=>1000,22891=>1000,22892=>1000,22893=>1000,22894=>1000,22895=>1000,22896=>1000,22897=>1000,22898=>1000,22899=>1000,22900=>1000,
-	22901=>1000,22902=>1000,22903=>1000,22904=>1000,22905=>1000,22906=>1000,22907=>1000,22908=>1000,22909=>1000,22910=>1000,22911=>1000,22912=>1000,22913=>1000,22914=>1000,22915=>1000,22916=>1000,
-	22917=>1000,22918=>1000,22919=>1000,22920=>1000,22921=>1000,22922=>1000,22923=>1000,22924=>1000,22925=>1000,22926=>1000,22927=>1000,22928=>1000,22929=>1000,22930=>1000,22931=>1000,22932=>1000,
-	22933=>1000,22934=>1000,22935=>1000,22936=>1000,22937=>1000,22938=>1000,22939=>1000,22940=>1000,22941=>1000,22942=>1000,22943=>1000,22944=>1000,22945=>1000,22946=>1000,22947=>1000,22948=>1000,
-	22949=>1000,22950=>1000,22951=>1000,22952=>1000,22953=>1000,22954=>1000,22955=>1000,22956=>1000,22957=>1000,22958=>1000,22959=>1000,22960=>1000,22961=>1000,22962=>1000,22963=>1000,22964=>1000,
-	22965=>1000,22966=>1000,22967=>1000,22968=>1000,22969=>1000,22970=>1000,22971=>1000,22972=>1000,22973=>1000,22974=>1000,22975=>1000,22976=>1000,22977=>1000,22978=>1000,22979=>1000,22980=>1000,
-	22981=>1000,22982=>1000,22983=>1000,22984=>1000,22985=>1000,22986=>1000,22987=>1000,22988=>1000,22989=>1000,22990=>1000,22991=>1000,22992=>1000,22993=>1000,22994=>1000,22995=>1000,22996=>1000,
-	22997=>1000,22998=>1000,22999=>1000,23000=>1000,23001=>1000,23002=>1000,23003=>1000,23004=>1000,23005=>1000,23006=>1000,23007=>1000,23008=>1000,23009=>1000,23010=>1000,23011=>1000,23012=>1000,
-	23013=>1000,23014=>1000,23015=>1000,23016=>1000,23017=>1000,23018=>1000,23019=>1000,23020=>1000,23021=>1000,23022=>1000,23023=>1000,23024=>1000,23025=>1000,23026=>1000,23027=>1000,23028=>1000,
-	23029=>1000,23030=>1000,23031=>1000,23032=>1000,23033=>1000,23034=>1000,23035=>1000,23036=>1000,23037=>1000,23038=>1000,23039=>1000,23040=>1000,23041=>1000,23042=>1000,23043=>1000,23044=>1000,
-	23045=>1000,23046=>1000,23047=>1000,23048=>1000,23049=>1000,23050=>1000,23051=>1000,23052=>1000,23053=>1000,23054=>1000,23055=>1000,23056=>1000,23057=>1000,23058=>1000,23059=>1000,23060=>1000,
-	23061=>1000,23062=>1000,23063=>1000,23064=>1000,23065=>1000,23066=>1000,23067=>1000,23068=>1000,23069=>1000,23070=>1000,23071=>1000,23072=>1000,23073=>1000,23074=>1000,23075=>1000,23076=>1000,
-	23077=>1000,23078=>1000,23079=>1000,23080=>1000,23081=>1000,23082=>1000,23083=>1000,23084=>1000,23085=>1000,23086=>1000,23087=>1000,23088=>1000,23089=>1000,23090=>1000,23091=>1000,23092=>1000,
-	23093=>1000,23094=>1000,23095=>1000,23096=>1000,23097=>1000,23098=>1000,23099=>1000,23100=>1000,23101=>1000,23102=>1000,23103=>1000,23104=>1000,23105=>1000,23106=>1000,23107=>1000,23108=>1000,
-	23109=>1000,23110=>1000,23111=>1000,23112=>1000,23113=>1000,23114=>1000,23115=>1000,23116=>1000,23117=>1000,23118=>1000,23119=>1000,23120=>1000,23121=>1000,23122=>1000,23123=>1000,23124=>1000,
-	23125=>1000,23126=>1000,23127=>1000,23128=>1000,23129=>1000,23130=>1000,23131=>1000,23132=>1000,23133=>1000,23134=>1000,23135=>1000,23136=>1000,23137=>1000,23138=>1000,23139=>1000,23140=>1000,
-	23141=>1000,23142=>1000,23143=>1000,23144=>1000,23145=>1000,23146=>1000,23147=>1000,23148=>1000,23149=>1000,23150=>1000,23151=>1000,23152=>1000,23153=>1000,23154=>1000,23155=>1000,23156=>1000,
-	23157=>1000,23158=>1000,23159=>1000,23160=>1000,23161=>1000,23162=>1000,23163=>1000,23164=>1000,23165=>1000,23166=>1000,23167=>1000,23168=>1000,23169=>1000,23170=>1000,23171=>1000,23172=>1000,
-	23173=>1000,23174=>1000,23175=>1000,23176=>1000,23177=>1000,23178=>1000,23179=>1000,23180=>1000,23181=>1000,23182=>1000,23183=>1000,23184=>1000,23185=>1000,23186=>1000,23187=>1000,23188=>1000,
-	23189=>1000,23190=>1000,23191=>1000,23192=>1000,23193=>1000,23194=>1000,23195=>1000,23196=>1000,23197=>1000,23198=>1000,23199=>1000,23200=>1000,23201=>1000,23202=>1000,23203=>1000,23204=>1000,
-	23205=>1000,23206=>1000,23207=>1000,23208=>1000,23209=>1000,23210=>1000,23211=>1000,23212=>1000,23213=>1000,23214=>1000,23215=>1000,23216=>1000,23217=>1000,23218=>1000,23219=>1000,23220=>1000,
-	23221=>1000,23222=>1000,23223=>1000,23224=>1000,23225=>1000,23226=>1000,23227=>1000,23228=>1000,23229=>1000,23230=>1000,23231=>1000,23232=>1000,23233=>1000,23234=>1000,23235=>1000,23236=>1000,
-	23237=>1000,23238=>1000,23239=>1000,23240=>1000,23241=>1000,23242=>1000,23243=>1000,23244=>1000,23245=>1000,23246=>1000,23247=>1000,23248=>1000,23249=>1000,23250=>1000,23251=>1000,23252=>1000,
-	23253=>1000,23254=>1000,23255=>1000,23256=>1000,23257=>1000,23258=>1000,23259=>1000,23260=>1000,23261=>1000,23262=>1000,23263=>1000,23264=>1000,23265=>1000,23266=>1000,23267=>1000,23268=>1000,
-	23269=>1000,23270=>1000,23271=>1000,23272=>1000,23273=>1000,23274=>1000,23275=>1000,23276=>1000,23277=>1000,23278=>1000,23279=>1000,23280=>1000,23281=>1000,23282=>1000,23283=>1000,23284=>1000,
-	23285=>1000,23286=>1000,23287=>1000,23288=>1000,23289=>1000,23290=>1000,23291=>1000,23292=>1000,23293=>1000,23294=>1000,23295=>1000,23296=>1000,23297=>1000,23298=>1000,23299=>1000,23300=>1000,
-	23301=>1000,23302=>1000,23303=>1000,23304=>1000,23305=>1000,23306=>1000,23307=>1000,23308=>1000,23309=>1000,23310=>1000,23311=>1000,23312=>1000,23313=>1000,23314=>1000,23315=>1000,23316=>1000,
-	23317=>1000,23318=>1000,23319=>1000,23320=>1000,23321=>1000,23322=>1000,23323=>1000,23324=>1000,23325=>1000,23326=>1000,23327=>1000,23328=>1000,23329=>1000,23330=>1000,23331=>1000,23332=>1000,
-	23333=>1000,23334=>1000,23335=>1000,23336=>1000,23337=>1000,23338=>1000,23339=>1000,23340=>1000,23341=>1000,23342=>1000,23343=>1000,23344=>1000,23345=>1000,23346=>1000,23347=>1000,23348=>1000,
-	23349=>1000,23350=>1000,23351=>1000,23352=>1000,23353=>1000,23354=>1000,23355=>1000,23356=>1000,23357=>1000,23358=>1000,23359=>1000,23360=>1000,23361=>1000,23362=>1000,23363=>1000,23364=>1000,
-	23365=>1000,23366=>1000,23367=>1000,23368=>1000,23369=>1000,23370=>1000,23371=>1000,23372=>1000,23373=>1000,23374=>1000,23375=>1000,23376=>1000,23377=>1000,23378=>1000,23379=>1000,23380=>1000,
-	23381=>1000,23382=>1000,23383=>1000,23384=>1000,23385=>1000,23386=>1000,23387=>1000,23388=>1000,23389=>1000,23390=>1000,23391=>1000,23392=>1000,23393=>1000,23394=>1000,23395=>1000,23396=>1000,
-	23397=>1000,23398=>1000,23399=>1000,23400=>1000,23401=>1000,23402=>1000,23403=>1000,23404=>1000,23405=>1000,23406=>1000,23407=>1000,23408=>1000,23409=>1000,23410=>1000,23411=>1000,23412=>1000,
-	23413=>1000,23414=>1000,23415=>1000,23416=>1000,23417=>1000,23418=>1000,23419=>1000,23420=>1000,23421=>1000,23422=>1000,23423=>1000,23424=>1000,23425=>1000,23426=>1000,23427=>1000,23428=>1000,
-	23429=>1000,23430=>1000,23431=>1000,23432=>1000,23433=>1000,23434=>1000,23435=>1000,23436=>1000,23437=>1000,23438=>1000,23439=>1000,23440=>1000,23441=>1000,23442=>1000,23443=>1000,23444=>1000,
-	23445=>1000,23446=>1000,23447=>1000,23448=>1000,23449=>1000,23450=>1000,23451=>1000,23452=>1000,23453=>1000,23454=>1000,23455=>1000,23456=>1000,23457=>1000,23458=>1000,23459=>1000,23460=>1000,
-	23461=>1000,23462=>1000,23463=>1000,23464=>1000,23465=>1000,23466=>1000,23467=>1000,23468=>1000,23469=>1000,23470=>1000,23471=>1000,23472=>1000,23473=>1000,23474=>1000,23475=>1000,23476=>1000,
-	23477=>1000,23478=>1000,23479=>1000,23480=>1000,23481=>1000,23482=>1000,23483=>1000,23484=>1000,23485=>1000,23486=>1000,23487=>1000,23488=>1000,23489=>1000,23490=>1000,23491=>1000,23492=>1000,
-	23493=>1000,23494=>1000,23495=>1000,23496=>1000,23497=>1000,23498=>1000,23499=>1000,23500=>1000,23501=>1000,23502=>1000,23503=>1000,23504=>1000,23505=>1000,23506=>1000,23507=>1000,23508=>1000,
-	23509=>1000,23510=>1000,23511=>1000,23512=>1000,23513=>1000,23514=>1000,23515=>1000,23516=>1000,23517=>1000,23518=>1000,23519=>1000,23520=>1000,23521=>1000,23522=>1000,23523=>1000,23524=>1000,
-	23525=>1000,23526=>1000,23527=>1000,23528=>1000,23529=>1000,23530=>1000,23531=>1000,23532=>1000,23533=>1000,23534=>1000,23535=>1000,23536=>1000,23537=>1000,23538=>1000,23539=>1000,23540=>1000,
-	23541=>1000,23542=>1000,23543=>1000,23544=>1000,23545=>1000,23546=>1000,23547=>1000,23548=>1000,23549=>1000,23550=>1000,23551=>1000,23552=>1000,23553=>1000,23554=>1000,23555=>1000,23556=>1000,
-	23557=>1000,23558=>1000,23559=>1000,23560=>1000,23561=>1000,23562=>1000,23563=>1000,23564=>1000,23565=>1000,23566=>1000,23567=>1000,23568=>1000,23569=>1000,23570=>1000,23571=>1000,23572=>1000,
-	23573=>1000,23574=>1000,23575=>1000,23576=>1000,23577=>1000,23578=>1000,23579=>1000,23580=>1000,23581=>1000,23582=>1000,23583=>1000,23584=>1000,23585=>1000,23586=>1000,23587=>1000,23588=>1000,
-	23589=>1000,23590=>1000,23591=>1000,23592=>1000,23593=>1000,23594=>1000,23595=>1000,23596=>1000,23597=>1000,23598=>1000,23599=>1000,23600=>1000,23601=>1000,23602=>1000,23603=>1000,23604=>1000,
-	23605=>1000,23606=>1000,23607=>1000,23608=>1000,23609=>1000,23610=>1000,23611=>1000,23612=>1000,23613=>1000,23614=>1000,23615=>1000,23616=>1000,23617=>1000,23618=>1000,23619=>1000,23620=>1000,
-	23621=>1000,23622=>1000,23623=>1000,23624=>1000,23625=>1000,23626=>1000,23627=>1000,23628=>1000,23629=>1000,23630=>1000,23631=>1000,23632=>1000,23633=>1000,23634=>1000,23635=>1000,23636=>1000,
-	23637=>1000,23638=>1000,23639=>1000,23640=>1000,23641=>1000,23642=>1000,23643=>1000,23644=>1000,23645=>1000,23646=>1000,23647=>1000,23648=>1000,23649=>1000,23650=>1000,23651=>1000,23652=>1000,
-	23653=>1000,23654=>1000,23655=>1000,23656=>1000,23657=>1000,23658=>1000,23659=>1000,23660=>1000,23661=>1000,23662=>1000,23663=>1000,23664=>1000,23665=>1000,23666=>1000,23667=>1000,23668=>1000,
-	23669=>1000,23670=>1000,23671=>1000,23672=>1000,23673=>1000,23674=>1000,23675=>1000,23676=>1000,23677=>1000,23678=>1000,23679=>1000,23680=>1000,23681=>1000,23682=>1000,23683=>1000,23684=>1000,
-	23685=>1000,23686=>1000,23687=>1000,23688=>1000,23689=>1000,23690=>1000,23691=>1000,23692=>1000,23693=>1000,23694=>1000,23695=>1000,23696=>1000,23697=>1000,23698=>1000,23699=>1000,23700=>1000,
-	23701=>1000,23702=>1000,23703=>1000,23704=>1000,23705=>1000,23706=>1000,23707=>1000,23708=>1000,23709=>1000,23710=>1000,23711=>1000,23712=>1000,23713=>1000,23714=>1000,23715=>1000,23716=>1000,
-	23717=>1000,23718=>1000,23719=>1000,23720=>1000,23721=>1000,23722=>1000,23723=>1000,23724=>1000,23725=>1000,23726=>1000,23727=>1000,23728=>1000,23729=>1000,23730=>1000,23731=>1000,23732=>1000,
-	23733=>1000,23734=>1000,23735=>1000,23736=>1000,23737=>1000,23738=>1000,23739=>1000,23740=>1000,23741=>1000,23742=>1000,23743=>1000,23744=>1000,23745=>1000,23746=>1000,23747=>1000,23748=>1000,
-	23749=>1000,23750=>1000,23751=>1000,23752=>1000,23753=>1000,23754=>1000,23755=>1000,23756=>1000,23757=>1000,23758=>1000,23759=>1000,23760=>1000,23761=>1000,23762=>1000,23763=>1000,23764=>1000,
-	23765=>1000,23766=>1000,23767=>1000,23768=>1000,23769=>1000,23770=>1000,23771=>1000,23772=>1000,23773=>1000,23774=>1000,23775=>1000,23776=>1000,23777=>1000,23778=>1000,23779=>1000,23780=>1000,
-	23781=>1000,23782=>1000,23783=>1000,23784=>1000,23785=>1000,23786=>1000,23787=>1000,23788=>1000,23789=>1000,23790=>1000,23791=>1000,23792=>1000,23793=>1000,23794=>1000,23795=>1000,23796=>1000,
-	23797=>1000,23798=>1000,23799=>1000,23800=>1000,23801=>1000,23802=>1000,23803=>1000,23804=>1000,23805=>1000,23806=>1000,23807=>1000,23808=>1000,23809=>1000,23810=>1000,23811=>1000,23812=>1000,
-	23813=>1000,23814=>1000,23815=>1000,23816=>1000,23817=>1000,23818=>1000,23819=>1000,23820=>1000,23821=>1000,23822=>1000,23823=>1000,23824=>1000,23825=>1000,23826=>1000,23827=>1000,23828=>1000,
-	23829=>1000,23830=>1000,23831=>1000,23832=>1000,23833=>1000,23834=>1000,23835=>1000,23836=>1000,23837=>1000,23838=>1000,23839=>1000,23840=>1000,23841=>1000,23842=>1000,23843=>1000,23844=>1000,
-	23845=>1000,23846=>1000,23847=>1000,23848=>1000,23849=>1000,23850=>1000,23851=>1000,23852=>1000,23853=>1000,23854=>1000,23855=>1000,23856=>1000,23857=>1000,23858=>1000,23859=>1000,23860=>1000,
-	23861=>1000,23862=>1000,23863=>1000,23864=>1000,23865=>1000,23866=>1000,23867=>1000,23868=>1000,23869=>1000,23870=>1000,23871=>1000,23872=>1000,23873=>1000,23874=>1000,23875=>1000,23876=>1000,
-	23877=>1000,23878=>1000,23879=>1000,23880=>1000,23881=>1000,23882=>1000,23883=>1000,23884=>1000,23885=>1000,23886=>1000,23887=>1000,23888=>1000,23889=>1000,23890=>1000,23891=>1000,23892=>1000,
-	23893=>1000,23894=>1000,23895=>1000,23896=>1000,23897=>1000,23898=>1000,23899=>1000,23900=>1000,23901=>1000,23902=>1000,23903=>1000,23904=>1000,23905=>1000,23906=>1000,23907=>1000,23908=>1000,
-	23909=>1000,23910=>1000,23911=>1000,23912=>1000,23913=>1000,23914=>1000,23915=>1000,23916=>1000,23917=>1000,23918=>1000,23919=>1000,23920=>1000,23921=>1000,23922=>1000,23923=>1000,23924=>1000,
-	23925=>1000,23926=>1000,23927=>1000,23928=>1000,23929=>1000,23930=>1000,23931=>1000,23932=>1000,23933=>1000,23934=>1000,23935=>1000,23936=>1000,23937=>1000,23938=>1000,23939=>1000,23940=>1000,
-	23941=>1000,23942=>1000,23943=>1000,23944=>1000,23945=>1000,23946=>1000,23947=>1000,23948=>1000,23949=>1000,23950=>1000,23951=>1000,23952=>1000,23953=>1000,23954=>1000,23955=>1000,23956=>1000,
-	23957=>1000,23958=>1000,23959=>1000,23960=>1000,23961=>1000,23962=>1000,23963=>1000,23964=>1000,23965=>1000,23966=>1000,23967=>1000,23968=>1000,23969=>1000,23970=>1000,23971=>1000,23972=>1000,
-	23973=>1000,23974=>1000,23975=>1000,23976=>1000,23977=>1000,23978=>1000,23979=>1000,23980=>1000,23981=>1000,23982=>1000,23983=>1000,23984=>1000,23985=>1000,23986=>1000,23987=>1000,23988=>1000,
-	23989=>1000,23990=>1000,23991=>1000,23992=>1000,23993=>1000,23994=>1000,23995=>1000,23996=>1000,23997=>1000,23998=>1000,23999=>1000,24000=>1000,24001=>1000,24002=>1000,24003=>1000,24004=>1000,
-	24005=>1000,24006=>1000,24007=>1000,24008=>1000,24009=>1000,24010=>1000,24011=>1000,24012=>1000,24013=>1000,24014=>1000,24015=>1000,24016=>1000,24017=>1000,24018=>1000,24019=>1000,24020=>1000,
-	24021=>1000,24022=>1000,24023=>1000,24024=>1000,24025=>1000,24026=>1000,24027=>1000,24028=>1000,24029=>1000,24030=>1000,24031=>1000,24032=>1000,24033=>1000,24034=>1000,24035=>1000,24036=>1000,
-	24037=>1000,24038=>1000,24039=>1000,24040=>1000,24041=>1000,24042=>1000,24043=>1000,24044=>1000,24045=>1000,24046=>1000,24047=>1000,24048=>1000,24049=>1000,24050=>1000,24051=>1000,24052=>1000,
-	24053=>1000,24054=>1000,24055=>1000,24056=>1000,24057=>1000,24058=>1000,24059=>1000,24060=>1000,24061=>1000,24062=>1000,24063=>1000,24064=>1000,24065=>1000,24066=>1000,24067=>1000,24068=>1000,
-	24069=>1000,24070=>1000,24071=>1000,24072=>1000,24073=>1000,24074=>1000,24075=>1000,24076=>1000,24077=>1000,24078=>1000,24079=>1000,24080=>1000,24081=>1000,24082=>1000,24083=>1000,24084=>1000,
-	24085=>1000,24086=>1000,24087=>1000,24088=>1000,24089=>1000,24090=>1000,24091=>1000,24092=>1000,24093=>1000,24094=>1000,24095=>1000,24096=>1000,24097=>1000,24098=>1000,24099=>1000,24100=>1000,
-	24101=>1000,24102=>1000,24103=>1000,24104=>1000,24105=>1000,24106=>1000,24107=>1000,24108=>1000,24109=>1000,24110=>1000,24111=>1000,24112=>1000,24113=>1000,24114=>1000,24115=>1000,24116=>1000,
-	24117=>1000,24118=>1000,24119=>1000,24120=>1000,24121=>1000,24122=>1000,24123=>1000,24124=>1000,24125=>1000,24126=>1000,24127=>1000,24128=>1000,24129=>1000,24130=>1000,24131=>1000,24132=>1000,
-	24133=>1000,24134=>1000,24135=>1000,24136=>1000,24137=>1000,24138=>1000,24139=>1000,24140=>1000,24141=>1000,24142=>1000,24143=>1000,24144=>1000,24145=>1000,24146=>1000,24147=>1000,24148=>1000,
-	24149=>1000,24150=>1000,24151=>1000,24152=>1000,24153=>1000,24154=>1000,24155=>1000,24156=>1000,24157=>1000,24158=>1000,24159=>1000,24160=>1000,24161=>1000,24162=>1000,24163=>1000,24164=>1000,
-	24165=>1000,24166=>1000,24167=>1000,24168=>1000,24169=>1000,24170=>1000,24171=>1000,24172=>1000,24173=>1000,24174=>1000,24175=>1000,24176=>1000,24177=>1000,24178=>1000,24179=>1000,24180=>1000,
-	24181=>1000,24182=>1000,24183=>1000,24184=>1000,24185=>1000,24186=>1000,24187=>1000,24188=>1000,24189=>1000,24190=>1000,24191=>1000,24192=>1000,24193=>1000,24194=>1000,24195=>1000,24196=>1000,
-	24197=>1000,24198=>1000,24199=>1000,24200=>1000,24201=>1000,24202=>1000,24203=>1000,24204=>1000,24205=>1000,24206=>1000,24207=>1000,24208=>1000,24209=>1000,24210=>1000,24211=>1000,24212=>1000,
-	24213=>1000,24214=>1000,24215=>1000,24216=>1000,24217=>1000,24218=>1000,24219=>1000,24220=>1000,24221=>1000,24222=>1000,24223=>1000,24224=>1000,24225=>1000,24226=>1000,24227=>1000,24228=>1000,
-	24229=>1000,24230=>1000,24231=>1000,24232=>1000,24233=>1000,24234=>1000,24235=>1000,24236=>1000,24237=>1000,24238=>1000,24239=>1000,24240=>1000,24241=>1000,24242=>1000,24243=>1000,24244=>1000,
-	24245=>1000,24246=>1000,24247=>1000,24248=>1000,24249=>1000,24250=>1000,24251=>1000,24252=>1000,24253=>1000,24254=>1000,24255=>1000,24256=>1000,24257=>1000,24258=>1000,24259=>1000,24260=>1000,
-	24261=>1000,24262=>1000,24263=>1000,24264=>1000,24265=>1000,24266=>1000,24267=>1000,24268=>1000,24269=>1000,24270=>1000,24271=>1000,24272=>1000,24273=>1000,24274=>1000,24275=>1000,24276=>1000,
-	24277=>1000,24278=>1000,24279=>1000,24280=>1000,24281=>1000,24282=>1000,24283=>1000,24284=>1000,24285=>1000,24286=>1000,24287=>1000,24288=>1000,24289=>1000,24290=>1000,24291=>1000,24292=>1000,
-	24293=>1000,24294=>1000,24295=>1000,24296=>1000,24297=>1000,24298=>1000,24299=>1000,24300=>1000,24301=>1000,24302=>1000,24303=>1000,24304=>1000,24305=>1000,24306=>1000,24307=>1000,24308=>1000,
-	24309=>1000,24310=>1000,24311=>1000,24312=>1000,24313=>1000,24314=>1000,24315=>1000,24316=>1000,24317=>1000,24318=>1000,24319=>1000,24320=>1000,24321=>1000,24322=>1000,24323=>1000,24324=>1000,
-	24325=>1000,24326=>1000,24327=>1000,24328=>1000,24329=>1000,24330=>1000,24331=>1000,24332=>1000,24333=>1000,24334=>1000,24335=>1000,24336=>1000,24337=>1000,24338=>1000,24339=>1000,24340=>1000,
-	24341=>1000,24342=>1000,24343=>1000,24344=>1000,24345=>1000,24346=>1000,24347=>1000,24348=>1000,24349=>1000,24350=>1000,24351=>1000,24352=>1000,24353=>1000,24354=>1000,24355=>1000,24356=>1000,
-	24357=>1000,24358=>1000,24359=>1000,24360=>1000,24361=>1000,24362=>1000,24363=>1000,24364=>1000,24365=>1000,24366=>1000,24367=>1000,24368=>1000,24369=>1000,24370=>1000,24371=>1000,24372=>1000,
-	24373=>1000,24374=>1000,24375=>1000,24376=>1000,24377=>1000,24378=>1000,24379=>1000,24380=>1000,24381=>1000,24382=>1000,24383=>1000,24384=>1000,24385=>1000,24386=>1000,24387=>1000,24388=>1000,
-	24389=>1000,24390=>1000,24391=>1000,24392=>1000,24393=>1000,24394=>1000,24395=>1000,24396=>1000,24397=>1000,24398=>1000,24399=>1000,24400=>1000,24401=>1000,24402=>1000,24403=>1000,24404=>1000,
-	24405=>1000,24406=>1000,24407=>1000,24408=>1000,24409=>1000,24410=>1000,24411=>1000,24412=>1000,24413=>1000,24414=>1000,24415=>1000,24416=>1000,24417=>1000,24418=>1000,24419=>1000,24420=>1000,
-	24421=>1000,24422=>1000,24423=>1000,24424=>1000,24425=>1000,24426=>1000,24427=>1000,24428=>1000,24429=>1000,24430=>1000,24431=>1000,24432=>1000,24433=>1000,24434=>1000,24435=>1000,24436=>1000,
-	24437=>1000,24438=>1000,24439=>1000,24440=>1000,24441=>1000,24442=>1000,24443=>1000,24444=>1000,24445=>1000,24446=>1000,24447=>1000,24448=>1000,24449=>1000,24450=>1000,24451=>1000,24452=>1000,
-	24453=>1000,24454=>1000,24455=>1000,24456=>1000,24457=>1000,24458=>1000,24459=>1000,24460=>1000,24461=>1000,24462=>1000,24463=>1000,24464=>1000,24465=>1000,24466=>1000,24467=>1000,24468=>1000,
-	24469=>1000,24470=>1000,24471=>1000,24472=>1000,24473=>1000,24474=>1000,24475=>1000,24476=>1000,24477=>1000,24478=>1000,24479=>1000,24480=>1000,24481=>1000,24482=>1000,24483=>1000,24484=>1000,
-	24485=>1000,24486=>1000,24487=>1000,24488=>1000,24489=>1000,24490=>1000,24491=>1000,24492=>1000,24493=>1000,24494=>1000,24495=>1000,24496=>1000,24497=>1000,24498=>1000,24499=>1000,24500=>1000,
-	24501=>1000,24502=>1000,24503=>1000,24504=>1000,24505=>1000,24506=>1000,24507=>1000,24508=>1000,24509=>1000,24510=>1000,24511=>1000,24512=>1000,24513=>1000,24514=>1000,24515=>1000,24516=>1000,
-	24517=>1000,24518=>1000,24519=>1000,24520=>1000,24521=>1000,24522=>1000,24523=>1000,24524=>1000,24525=>1000,24526=>1000,24527=>1000,24528=>1000,24529=>1000,24530=>1000,24531=>1000,24532=>1000,
-	24533=>1000,24534=>1000,24535=>1000,24536=>1000,24537=>1000,24538=>1000,24539=>1000,24540=>1000,24541=>1000,24542=>1000,24543=>1000,24544=>1000,24545=>1000,24546=>1000,24547=>1000,24548=>1000,
-	24549=>1000,24550=>1000,24551=>1000,24552=>1000,24553=>1000,24554=>1000,24555=>1000,24556=>1000,24557=>1000,24558=>1000,24559=>1000,24560=>1000,24561=>1000,24562=>1000,24563=>1000,24564=>1000,
-	24565=>1000,24566=>1000,24567=>1000,24568=>1000,24569=>1000,24570=>1000,24571=>1000,24572=>1000,24573=>1000,24574=>1000,24575=>1000,24576=>1000,24577=>1000,24578=>1000,24579=>1000,24580=>1000,
-	24581=>1000,24582=>1000,24583=>1000,24584=>1000,24585=>1000,24586=>1000,24587=>1000,24588=>1000,24589=>1000,24590=>1000,24591=>1000,24592=>1000,24593=>1000,24594=>1000,24595=>1000,24596=>1000,
-	24597=>1000,24598=>1000,24599=>1000,24600=>1000,24601=>1000,24602=>1000,24603=>1000,24604=>1000,24605=>1000,24606=>1000,24607=>1000,24608=>1000,24609=>1000,24610=>1000,24611=>1000,24612=>1000,
-	24613=>1000,24614=>1000,24615=>1000,24616=>1000,24617=>1000,24618=>1000,24619=>1000,24620=>1000,24621=>1000,24622=>1000,24623=>1000,24624=>1000,24625=>1000,24626=>1000,24627=>1000,24628=>1000,
-	24629=>1000,24630=>1000,24631=>1000,24632=>1000,24633=>1000,24634=>1000,24635=>1000,24636=>1000,24637=>1000,24638=>1000,24639=>1000,24640=>1000,24641=>1000,24642=>1000,24643=>1000,24644=>1000,
-	24645=>1000,24646=>1000,24647=>1000,24648=>1000,24649=>1000,24650=>1000,24651=>1000,24652=>1000,24653=>1000,24654=>1000,24655=>1000,24656=>1000,24657=>1000,24658=>1000,24659=>1000,24660=>1000,
-	24661=>1000,24662=>1000,24663=>1000,24664=>1000,24665=>1000,24666=>1000,24667=>1000,24668=>1000,24669=>1000,24670=>1000,24671=>1000,24672=>1000,24673=>1000,24674=>1000,24675=>1000,24676=>1000,
-	24677=>1000,24678=>1000,24679=>1000,24680=>1000,24681=>1000,24682=>1000,24683=>1000,24684=>1000,24685=>1000,24686=>1000,24687=>1000,24688=>1000,24689=>1000,24690=>1000,24691=>1000,24692=>1000,
-	24693=>1000,24694=>1000,24695=>1000,24696=>1000,24697=>1000,24698=>1000,24699=>1000,24700=>1000,24701=>1000,24702=>1000,24703=>1000,24704=>1000,24705=>1000,24706=>1000,24707=>1000,24708=>1000,
-	24709=>1000,24710=>1000,24711=>1000,24712=>1000,24713=>1000,24714=>1000,24715=>1000,24716=>1000,24717=>1000,24718=>1000,24719=>1000,24720=>1000,24721=>1000,24722=>1000,24723=>1000,24724=>1000,
-	24725=>1000,24726=>1000,24727=>1000,24728=>1000,24729=>1000,24730=>1000,24731=>1000,24732=>1000,24733=>1000,24734=>1000,24735=>1000,24736=>1000,24737=>1000,24738=>1000,24739=>1000,24740=>1000,
-	24741=>1000,24742=>1000,24743=>1000,24744=>1000,24745=>1000,24746=>1000,24747=>1000,24748=>1000,24749=>1000,24750=>1000,24751=>1000,24752=>1000,24753=>1000,24754=>1000,24755=>1000,24756=>1000,
-	24757=>1000,24758=>1000,24759=>1000,24760=>1000,24761=>1000,24762=>1000,24763=>1000,24764=>1000,24765=>1000,24766=>1000,24767=>1000,24768=>1000,24769=>1000,24770=>1000,24771=>1000,24772=>1000,
-	24773=>1000,24774=>1000,24775=>1000,24776=>1000,24777=>1000,24778=>1000,24779=>1000,24780=>1000,24781=>1000,24782=>1000,24783=>1000,24784=>1000,24785=>1000,24786=>1000,24787=>1000,24788=>1000,
-	24789=>1000,24790=>1000,24791=>1000,24792=>1000,24793=>1000,24794=>1000,24795=>1000,24796=>1000,24797=>1000,24798=>1000,24799=>1000,24800=>1000,24801=>1000,24802=>1000,24803=>1000,24804=>1000,
-	24805=>1000,24806=>1000,24807=>1000,24808=>1000,24809=>1000,24810=>1000,24811=>1000,24812=>1000,24813=>1000,24814=>1000,24815=>1000,24816=>1000,24817=>1000,24818=>1000,24819=>1000,24820=>1000,
-	24821=>1000,24822=>1000,24823=>1000,24824=>1000,24825=>1000,24826=>1000,24827=>1000,24828=>1000,24829=>1000,24830=>1000,24831=>1000,24832=>1000,24833=>1000,24834=>1000,24835=>1000,24836=>1000,
-	24837=>1000,24838=>1000,24839=>1000,24840=>1000,24841=>1000,24842=>1000,24843=>1000,24844=>1000,24845=>1000,24846=>1000,24847=>1000,24848=>1000,24849=>1000,24850=>1000,24851=>1000,24852=>1000,
-	24853=>1000,24854=>1000,24855=>1000,24856=>1000,24857=>1000,24858=>1000,24859=>1000,24860=>1000,24861=>1000,24862=>1000,24863=>1000,24864=>1000,24865=>1000,24866=>1000,24867=>1000,24868=>1000,
-	24869=>1000,24870=>1000,24871=>1000,24872=>1000,24873=>1000,24874=>1000,24875=>1000,24876=>1000,24877=>1000,24878=>1000,24879=>1000,24880=>1000,24881=>1000,24882=>1000,24883=>1000,24884=>1000,
-	24885=>1000,24886=>1000,24887=>1000,24888=>1000,24889=>1000,24890=>1000,24891=>1000,24892=>1000,24893=>1000,24894=>1000,24895=>1000,24896=>1000,24897=>1000,24898=>1000,24899=>1000,24900=>1000,
-	24901=>1000,24902=>1000,24903=>1000,24904=>1000,24905=>1000,24906=>1000,24907=>1000,24908=>1000,24909=>1000,24910=>1000,24911=>1000,24912=>1000,24913=>1000,24914=>1000,24915=>1000,24916=>1000,
-	24917=>1000,24918=>1000,24919=>1000,24920=>1000,24921=>1000,24922=>1000,24923=>1000,24924=>1000,24925=>1000,24926=>1000,24927=>1000,24928=>1000,24929=>1000,24930=>1000,24931=>1000,24932=>1000,
-	24933=>1000,24934=>1000,24935=>1000,24936=>1000,24937=>1000,24938=>1000,24939=>1000,24940=>1000,24941=>1000,24942=>1000,24943=>1000,24944=>1000,24945=>1000,24946=>1000,24947=>1000,24948=>1000,
-	24949=>1000,24950=>1000,24951=>1000,24952=>1000,24953=>1000,24954=>1000,24955=>1000,24956=>1000,24957=>1000,24958=>1000,24959=>1000,24960=>1000,24961=>1001,24962=>1000,24963=>1000,24964=>1000,
-	24965=>1000,24966=>1000,24967=>1000,24968=>1000,24969=>1000,24970=>1000,24971=>1000,24972=>1000,24973=>1000,24974=>1000,24975=>1000,24976=>1000,24977=>1000,24978=>1000,24979=>1000,24980=>1000,
-	24981=>1000,24982=>1000,24983=>1000,24984=>1000,24985=>1000,24986=>1000,24987=>1000,24988=>1000,24989=>1000,24990=>1000,24991=>1000,24992=>1000,24993=>1000,24994=>1000,24995=>1000,24996=>1000,
-	24997=>1000,24998=>1000,24999=>1000,25000=>1000,25001=>1000,25002=>1000,25003=>1000,25004=>1000,25005=>1000,25006=>1000,25007=>1000,25008=>1000,25009=>1000,25010=>1000,25011=>1000,25012=>1000,
-	25013=>1000,25014=>1000,25015=>1000,25016=>1000,25017=>1000,25018=>1000,25019=>1000,25020=>1000,25021=>1000,25022=>1000,25023=>1000,25024=>1000,25025=>1000,25026=>1000,25027=>1000,25028=>1000,
-	25029=>1000,25030=>1000,25031=>1000,25032=>1000,25033=>1000,25034=>1000,25035=>1000,25036=>1000,25037=>1000,25038=>1000,25039=>1000,25040=>1000,25041=>1000,25042=>1000,25043=>1000,25044=>1000,
-	25045=>1000,25046=>1000,25047=>1000,25048=>1000,25049=>1000,25050=>1000,25051=>1000,25052=>1000,25053=>1000,25054=>1000,25055=>1000,25056=>1000,25057=>1000,25058=>1000,25059=>1000,25060=>1000,
-	25061=>1000,25062=>1000,25063=>1000,25064=>1000,25065=>1000,25066=>1000,25067=>1000,25068=>1000,25069=>1000,25070=>1000,25071=>1000,25072=>1000,25073=>1000,25074=>1000,25075=>1000,25076=>1000,
-	25077=>1000,25078=>1000,25079=>1000,25080=>1000,25081=>1000,25082=>1000,25083=>1000,25084=>1000,25085=>1000,25086=>1000,25087=>1000,25088=>1000,25089=>1000,25090=>1000,25091=>1000,25092=>1000,
-	25093=>1000,25094=>1000,25095=>1000,25096=>1000,25097=>1000,25098=>1000,25099=>1000,25100=>1000,25101=>1000,25102=>1000,25103=>1000,25104=>1000,25105=>1000,25106=>1000,25107=>1000,25108=>1000,
-	25109=>1000,25110=>1000,25111=>1000,25112=>1000,25113=>1000,25114=>1000,25115=>1000,25116=>1000,25117=>1000,25118=>1000,25119=>1000,25120=>1000,25121=>1000,25122=>1000,25123=>1000,25124=>1000,
-	25125=>1000,25126=>1000,25127=>1000,25128=>1000,25129=>1000,25130=>1000,25131=>1000,25132=>1000,25133=>1000,25134=>1000,25135=>1000,25136=>1000,25137=>1000,25138=>1000,25139=>1000,25140=>1000,
-	25141=>1000,25142=>1000,25143=>1000,25144=>1000,25145=>1000,25146=>1000,25147=>1000,25148=>1000,25149=>1000,25150=>1000,25151=>1000,25152=>1000,25153=>1000,25154=>1000,25155=>1000,25156=>1000,
-	25157=>1000,25158=>1000,25159=>1000,25160=>1000,25161=>1000,25162=>1000,25163=>1000,25164=>1000,25165=>1000,25166=>1000,25167=>1000,25168=>1000,25169=>1000,25170=>1000,25171=>1000,25172=>1000,
-	25173=>1000,25174=>1000,25175=>1000,25176=>1000,25177=>1000,25178=>1000,25179=>1000,25180=>1000,25181=>1000,25182=>1000,25183=>1000,25184=>1000,25185=>1000,25186=>1000,25187=>1000,25188=>1000,
-	25189=>1000,25190=>1000,25191=>1000,25192=>1000,25193=>1000,25194=>1000,25195=>1000,25196=>1000,25197=>1000,25198=>1000,25199=>1000,25200=>1000,25201=>1000,25202=>1000,25203=>1000,25204=>1000,
-	25205=>1000,25206=>1000,25207=>1000,25208=>1000,25209=>1000,25210=>1000,25211=>1000,25212=>1000,25213=>1000,25214=>1000,25215=>1000,25216=>1000,25217=>1000,25218=>1000,25219=>1000,25220=>1000,
-	25221=>1000,25222=>1000,25223=>1000,25224=>1000,25225=>1000,25226=>1000,25227=>1000,25228=>1000,25229=>1000,25230=>1000,25231=>1000,25232=>1000,25233=>1000,25234=>1000,25235=>1000,25236=>1000,
-	25237=>1000,25238=>1000,25239=>1000,25240=>1000,25241=>1000,25242=>1000,25243=>1000,25244=>1000,25245=>1000,25246=>1000,25247=>1000,25248=>1000,25249=>1000,25250=>1000,25251=>1000,25252=>1000,
-	25253=>1000,25254=>1000,25255=>1000,25256=>1000,25257=>1000,25258=>1000,25259=>1000,25260=>1000,25261=>1000,25262=>1000,25263=>1000,25264=>1000,25265=>1000,25266=>1000,25267=>1000,25268=>1000,
-	25269=>1000,25270=>1000,25271=>1000,25272=>1000,25273=>1000,25274=>1000,25275=>1000,25276=>1000,25277=>1000,25278=>1000,25279=>1000,25280=>1000,25281=>1000,25282=>1000,25283=>1000,25284=>1000,
-	25285=>1000,25286=>1000,25287=>1000,25288=>1000,25289=>1000,25290=>1000,25291=>1000,25292=>1000,25293=>1000,25294=>1000,25295=>1000,25296=>1000,25297=>1000,25298=>1000,25299=>1000,25300=>1000,
-	25301=>1000,25302=>1000,25303=>1000,25304=>1000,25305=>1000,25306=>1000,25307=>1000,25308=>1000,25309=>1000,25310=>1000,25311=>1000,25312=>1000,25313=>1000,25314=>1000,25315=>1000,25316=>1000,
-	25317=>1000,25318=>1000,25319=>1000,25320=>1000,25321=>1000,25322=>1000,25323=>1000,25324=>1000,25325=>1000,25326=>1000,25327=>1000,25328=>1000,25329=>1000,25330=>1000,25331=>1000,25332=>1000,
-	25333=>1000,25334=>1000,25335=>1000,25336=>1000,25337=>1000,25338=>1000,25339=>1000,25340=>1000,25341=>1000,25342=>1000,25343=>1000,25344=>1000,25345=>1000,25346=>1000,25347=>1000,25348=>1000,
-	25349=>1000,25350=>1000,25351=>1000,25352=>1000,25353=>1000,25354=>1000,25355=>1000,25356=>1000,25357=>1000,25358=>1000,25359=>1000,25360=>1000,25361=>1000,25362=>1000,25363=>1000,25364=>1000,
-	25365=>1000,25366=>1000,25367=>1000,25368=>1000,25369=>1000,25370=>1000,25371=>1000,25372=>1000,25373=>1000,25374=>1000,25375=>1000,25376=>1000,25377=>1000,25378=>1000,25379=>1000,25380=>1000,
-	25381=>1000,25382=>1000,25383=>1000,25384=>1000,25385=>1000,25386=>1000,25387=>1000,25388=>1000,25389=>1000,25390=>1000,25391=>1000,25392=>1000,25393=>1000,25394=>1000,25395=>1000,25396=>1000,
-	25397=>1000,25398=>1000,25399=>1000,25400=>1000,25401=>1000,25402=>1000,25403=>1000,25404=>1000,25405=>1000,25406=>1000,25407=>1000,25408=>1000,25409=>1000,25410=>1000,25411=>1000,25412=>1000,
-	25413=>1000,25414=>1000,25415=>1000,25416=>1000,25417=>1000,25418=>1000,25419=>1000,25420=>1000,25421=>1000,25422=>1000,25423=>1000,25424=>1000,25425=>1000,25426=>1000,25427=>1000,25428=>1000,
-	25429=>1000,25430=>1000,25431=>1000,25432=>1000,25433=>1000,25434=>1000,25435=>1000,25436=>1000,25437=>1000,25438=>1000,25439=>1000,25440=>1000,25441=>1000,25442=>1000,25443=>1000,25444=>1000,
-	25445=>1000,25446=>1000,25447=>1000,25448=>1000,25449=>1000,25450=>1000,25451=>1000,25452=>1000,25453=>1000,25454=>1000,25455=>1000,25456=>1000,25457=>1000,25458=>1000,25459=>1000,25460=>1000,
-	25461=>1000,25462=>1000,25463=>1000,25464=>1000,25465=>1000,25466=>1000,25467=>1000,25468=>1000,25469=>1000,25470=>1000,25471=>1000,25472=>1000,25473=>1000,25474=>1000,25475=>1000,25476=>1000,
-	25477=>1000,25478=>1000,25479=>1000,25480=>1000,25481=>1000,25482=>1000,25483=>1000,25484=>1000,25485=>1000,25486=>1000,25487=>1000,25488=>1000,25489=>1000,25490=>1000,25491=>1000,25492=>1000,
-	25493=>1000,25494=>1000,25495=>1000,25496=>1000,25497=>1000,25498=>1000,25499=>1000,25500=>1000,25501=>1000,25502=>1000,25503=>1000,25504=>1000,25505=>1000,25506=>1000,25507=>1000,25508=>1000,
-	25509=>1000,25510=>1000,25511=>1000,25512=>1000,25513=>1000,25514=>1000,25515=>1000,25516=>1000,25517=>1000,25518=>1000,25519=>1000,25520=>1000,25521=>1000,25522=>1000,25523=>1000,25524=>1000,
-	25525=>1000,25526=>1000,25527=>1000,25528=>1000,25529=>1000,25530=>1000,25531=>1000,25532=>1000,25533=>1000,25534=>1000,25535=>1000,25536=>1000,25537=>1000,25538=>1000,25539=>1000,25540=>1000,
-	25541=>1000,25542=>1000,25543=>1000,25544=>1000,25545=>1000,25546=>1000,25547=>1000,25548=>1000,25549=>1000,25550=>1000,25551=>1000,25552=>1000,25553=>1000,25554=>1000,25555=>1000,25556=>1000,
-	25557=>1000,25558=>1000,25559=>1000,25560=>1000,25561=>1000,25562=>1000,25563=>1000,25564=>1000,25565=>1000,25566=>1000,25567=>1000,25568=>1000,25569=>1000,25570=>1000,25571=>1000,25572=>1000,
-	25573=>1000,25574=>1000,25575=>1000,25576=>1000,25577=>1000,25578=>1000,25579=>1000,25580=>1000,25581=>1000,25582=>1000,25583=>1000,25584=>1000,25585=>1000,25586=>1000,25587=>1000,25588=>1000,
-	25589=>1000,25590=>1000,25591=>1000,25592=>1000,25593=>1000,25594=>1000,25595=>1000,25596=>1000,25597=>1000,25598=>1000,25599=>1000,25600=>1000,25601=>1000,25602=>1000,25603=>1000,25604=>1000,
-	25605=>1000,25606=>1000,25607=>1000,25608=>1000,25609=>1000,25610=>1000,25611=>1000,25612=>1000,25613=>1000,25614=>1000,25615=>1000,25616=>1000,25617=>1000,25618=>1000,25619=>1000,25620=>1000,
-	25621=>1000,25622=>1000,25623=>1000,25624=>1000,25625=>1000,25626=>1000,25627=>1000,25628=>1000,25629=>1000,25630=>1000,25631=>1000,25632=>1000,25633=>1000,25634=>1000,25635=>1000,25636=>1000,
-	25637=>1000,25638=>1000,25639=>1000,25640=>1000,25641=>1000,25642=>1000,25643=>1000,25644=>1000,25645=>1000,25646=>1000,25647=>1000,25648=>1000,25649=>1000,25650=>1000,25651=>1000,25652=>1000,
-	25653=>1000,25654=>1000,25655=>1000,25656=>1000,25657=>1000,25658=>1000,25659=>1000,25660=>1000,25661=>1000,25662=>1000,25663=>1000,25664=>1000,25665=>1000,25666=>1000,25667=>1000,25668=>1000,
-	25669=>1000,25670=>1000,25671=>1000,25672=>1000,25673=>1000,25674=>1000,25675=>1000,25676=>1000,25677=>1000,25678=>1000,25679=>1000,25680=>1000,25681=>1000,25682=>1000,25683=>1000,25684=>1000,
-	25685=>1000,25686=>1000,25687=>1000,25688=>1000,25689=>1000,25690=>1000,25691=>1000,25692=>1000,25693=>1000,25694=>1000,25695=>1000,25696=>1000,25697=>1000,25698=>1000,25699=>1000,25700=>1000,
-	25701=>1000,25702=>1000,25703=>1000,25704=>1000,25705=>1000,25706=>1000,25707=>1000,25708=>1000,25709=>1000,25710=>1000,25711=>1000,25712=>1000,25713=>1000,25714=>1000,25715=>1000,25716=>1000,
-	25717=>1000,25718=>1000,25719=>1000,25720=>1000,25721=>1000,25722=>1000,25723=>1000,25724=>1000,25725=>1000,25726=>1000,25727=>1000,25728=>1000,25729=>1000,25730=>1000,25731=>1000,25732=>1000,
-	25733=>1000,25734=>1000,25735=>1000,25736=>1000,25737=>1000,25738=>1000,25739=>1000,25740=>1000,25741=>1000,25742=>1000,25743=>1000,25744=>1000,25745=>1000,25746=>1000,25747=>1000,25748=>1000,
-	25749=>1000,25750=>1000,25751=>1000,25752=>1000,25753=>1000,25754=>1000,25755=>1000,25756=>1000,25757=>1000,25758=>1000,25759=>1000,25760=>1000,25761=>1000,25762=>1000,25763=>1000,25764=>1000,
-	25765=>1000,25766=>1000,25767=>1000,25768=>1000,25769=>1000,25770=>1000,25771=>1000,25772=>1000,25773=>1000,25774=>1000,25775=>1000,25776=>1000,25777=>1000,25778=>1000,25779=>1000,25780=>1000,
-	25781=>1000,25782=>1000,25783=>1000,25784=>1000,25785=>1000,25786=>1000,25787=>1000,25788=>1000,25789=>1000,25790=>1000,25791=>1000,25792=>1000,25793=>1000,25794=>1000,25795=>1000,25796=>1000,
-	25797=>1000,25798=>1000,25799=>1000,25800=>1000,25801=>1000,25802=>1000,25803=>1000,25804=>1000,25805=>1000,25806=>1000,25807=>1000,25808=>1000,25809=>1000,25810=>1000,25811=>1000,25812=>1000,
-	25813=>1000,25814=>1000,25815=>1000,25816=>1000,25817=>1000,25818=>1000,25819=>1000,25820=>1000,25821=>1000,25822=>1000,25823=>1000,25824=>1000,25825=>1000,25826=>1000,25827=>1000,25828=>1000,
-	25829=>1000,25830=>1000,25831=>1000,25832=>1000,25833=>1000,25834=>1000,25835=>1000,25836=>1000,25837=>1000,25838=>1000,25839=>1000,25840=>1000,25841=>1000,25842=>1000,25843=>1000,25844=>1000,
-	25845=>1000,25846=>1000,25847=>1000,25848=>1000,25849=>1000,25850=>1000,25851=>1000,25852=>1000,25853=>1000,25854=>1000,25855=>1000,25856=>1000,25857=>1000,25858=>1000,25859=>1000,25860=>1000,
-	25861=>1000,25862=>1000,25863=>1000,25864=>1000,25865=>1000,25866=>1000,25867=>1000,25868=>1000,25869=>1000,25870=>1000,25871=>1000,25872=>1000,25873=>1000,25874=>1000,25875=>1000,25876=>1000,
-	25877=>1000,25878=>1000,25879=>1000,25880=>1000,25881=>1000,25882=>1000,25883=>1000,25884=>1000,25885=>1000,25886=>1000,25887=>1000,25888=>1000,25889=>1000,25890=>1000,25891=>1000,25892=>1000,
-	25893=>1000,25894=>1000,25895=>1000,25896=>1000,25897=>1000,25898=>1000,25899=>1000,25900=>1000,25901=>1000,25902=>1000,25903=>1000,25904=>1000,25905=>1000,25906=>1000,25907=>1000,25908=>1000,
-	25909=>1000,25910=>1000,25911=>1000,25912=>1000,25913=>1000,25914=>1000,25915=>1000,25916=>1000,25917=>1000,25918=>1000,25919=>1000,25920=>1000,25921=>1000,25922=>1000,25923=>1000,25924=>1000,
-	25925=>1000,25926=>1000,25927=>1000,25928=>1000,25929=>1000,25930=>1000,25931=>1000,25932=>1000,25933=>1000,25934=>1000,25935=>1000,25936=>1000,25937=>1000,25938=>1000,25939=>1000,25940=>1000,
-	25941=>1000,25942=>1000,25943=>1000,25944=>1000,25945=>1000,25946=>1000,25947=>1000,25948=>1000,25949=>1000,25950=>1000,25951=>1000,25952=>1000,25953=>1000,25954=>1000,25955=>1000,25956=>1000,
-	25957=>1000,25958=>1000,25959=>1000,25960=>1000,25961=>1000,25962=>1000,25963=>1000,25964=>1000,25965=>1000,25966=>1000,25967=>1000,25968=>1000,25969=>1000,25970=>1000,25971=>1000,25972=>1000,
-	25973=>1000,25974=>1000,25975=>1000,25976=>1000,25977=>1000,25978=>1000,25979=>1000,25980=>1000,25981=>1000,25982=>1000,25983=>1000,25984=>1000,25985=>1000,25986=>1000,25987=>1000,25988=>1000,
-	25989=>1000,25990=>1000,25991=>1000,25992=>1000,25993=>1000,25994=>1000,25995=>1000,25996=>1000,25997=>1000,25998=>1000,25999=>1000,26000=>1000,26001=>1000,26002=>1000,26003=>1000,26004=>1000,
-	26005=>1000,26006=>1000,26007=>1000,26008=>1000,26009=>1000,26010=>1000,26011=>1000,26012=>1000,26013=>1000,26014=>1000,26015=>1000,26016=>1000,26017=>1000,26018=>1000,26019=>1000,26020=>1000,
-	26021=>1000,26022=>1000,26023=>1000,26024=>1000,26025=>1000,26026=>1000,26027=>1000,26028=>1000,26029=>1000,26030=>1000,26031=>1000,26032=>1000,26033=>1000,26034=>1000,26035=>1000,26036=>1000,
-	26037=>1000,26038=>1000,26039=>1000,26040=>1000,26041=>1000,26042=>1000,26043=>1000,26044=>1000,26045=>1000,26046=>1000,26047=>1000,26048=>1000,26049=>1000,26050=>1000,26051=>1000,26052=>1000,
-	26053=>1000,26054=>1000,26055=>1000,26056=>1000,26057=>1000,26058=>1000,26059=>1000,26060=>1000,26061=>1000,26062=>1000,26063=>1000,26064=>1000,26065=>1000,26066=>1000,26067=>1000,26068=>1000,
-	26069=>1000,26070=>1000,26071=>1000,26072=>1000,26073=>1000,26074=>1000,26075=>1000,26076=>1000,26077=>1000,26078=>1000,26079=>1000,26080=>1000,26081=>1000,26082=>1000,26083=>1000,26084=>1000,
-	26085=>1000,26086=>1000,26087=>1000,26088=>1000,26089=>1000,26090=>1000,26091=>1000,26092=>1000,26093=>1000,26094=>1000,26095=>1000,26096=>1000,26097=>1000,26098=>1000,26099=>1000,26100=>1000,
-	26101=>1000,26102=>1000,26103=>1000,26104=>1000,26105=>1000,26106=>1000,26107=>1000,26108=>1000,26109=>1000,26110=>1000,26111=>1000,26112=>1000,26113=>1000,26114=>1000,26115=>1000,26116=>1000,
-	26117=>1000,26118=>1000,26119=>1000,26120=>1000,26121=>1000,26122=>1000,26123=>1000,26124=>1000,26125=>1000,26126=>1000,26127=>1000,26128=>1000,26129=>1000,26130=>1000,26131=>1000,26132=>1000,
-	26133=>1000,26134=>1000,26135=>1000,26136=>1000,26137=>1000,26138=>1000,26139=>1000,26140=>1000,26141=>1000,26142=>1000,26143=>1000,26144=>1000,26145=>1000,26146=>1000,26147=>1000,26148=>1000,
-	26149=>1000,26150=>1000,26151=>1000,26152=>1000,26153=>1000,26154=>1000,26155=>1000,26156=>1000,26157=>1000,26158=>1000,26159=>1000,26160=>1000,26161=>1000,26162=>1000,26163=>1000,26164=>1000,
-	26165=>1000,26166=>1000,26167=>1000,26168=>1000,26169=>1000,26170=>1000,26171=>1000,26172=>1000,26173=>1000,26174=>1000,26175=>1000,26176=>1000,26177=>1000,26178=>1000,26179=>1000,26180=>1000,
-	26181=>1000,26182=>1000,26183=>1000,26184=>1000,26185=>1000,26186=>1000,26187=>1000,26188=>1000,26189=>1000,26190=>1000,26191=>1000,26192=>1000,26193=>1000,26194=>1000,26195=>1000,26196=>1000,
-	26197=>1000,26198=>1000,26199=>1000,26200=>1000,26201=>1000,26202=>1000,26203=>1000,26204=>1000,26205=>1000,26206=>1000,26207=>1000,26208=>1000,26209=>1000,26210=>1000,26211=>1000,26212=>1000,
-	26213=>1000,26214=>1000,26215=>1000,26216=>1000,26217=>1000,26218=>1000,26219=>1000,26220=>1000,26221=>1000,26222=>1000,26223=>1000,26224=>1000,26225=>1000,26226=>1000,26227=>1000,26228=>1000,
-	26229=>1000,26230=>1000,26231=>1000,26232=>1000,26233=>1000,26234=>1000,26235=>1000,26236=>1000,26237=>1000,26238=>1000,26239=>1000,26240=>1000,26241=>1000,26242=>1000,26243=>1000,26244=>1000,
-	26245=>1000,26246=>1000,26247=>1000,26248=>1000,26249=>1000,26250=>1000,26251=>1000,26252=>1000,26253=>1000,26254=>1000,26255=>1000,26256=>1000,26257=>1000,26258=>1000,26259=>1000,26260=>1000,
-	26261=>1000,26262=>1000,26263=>1000,26264=>1000,26265=>1000,26266=>1000,26267=>1000,26268=>1000,26269=>1000,26270=>1000,26271=>1000,26272=>1000,26273=>1000,26274=>1000,26275=>1000,26276=>1000,
-	26277=>1000,26278=>1000,26279=>1000,26280=>1000,26281=>1000,26282=>1000,26283=>1000,26284=>1000,26285=>1000,26286=>1000,26287=>1000,26288=>1000,26289=>1000,26290=>1000,26291=>1000,26292=>1000,
-	26293=>1000,26294=>1000,26295=>1000,26296=>1000,26297=>1000,26298=>1000,26299=>1000,26300=>1000,26301=>1000,26302=>1000,26303=>1000,26304=>1000,26305=>1000,26306=>1000,26307=>1000,26308=>1000,
-	26309=>1000,26310=>1000,26311=>1000,26312=>1000,26313=>1000,26314=>1000,26315=>1000,26316=>1000,26317=>1000,26318=>1000,26319=>1000,26320=>1000,26321=>1000,26322=>1000,26323=>1000,26324=>1000,
-	26325=>1000,26326=>1000,26327=>1000,26328=>1000,26329=>1000,26330=>1000,26331=>1000,26332=>1000,26333=>1000,26334=>1000,26335=>1000,26336=>1000,26337=>1000,26338=>1000,26339=>1000,26340=>1000,
-	26341=>1000,26342=>1000,26343=>1000,26344=>1000,26345=>1000,26346=>1000,26347=>1000,26348=>1000,26349=>1000,26350=>1000,26351=>1000,26352=>1000,26353=>1000,26354=>1000,26355=>1000,26356=>1000,
-	26357=>1000,26358=>1000,26359=>1000,26360=>1000,26361=>1000,26362=>1000,26363=>1000,26364=>1000,26365=>1000,26366=>1000,26367=>1000,26368=>1000,26369=>1000,26370=>1000,26371=>1000,26372=>1000,
-	26373=>1000,26374=>1000,26375=>1000,26376=>1000,26377=>1000,26378=>1000,26379=>1000,26380=>1000,26381=>1000,26382=>1000,26383=>1000,26384=>1000,26385=>1000,26386=>1000,26387=>1000,26388=>1000,
-	26389=>1000,26390=>1000,26391=>1000,26392=>1000,26393=>1000,26394=>1000,26395=>1000,26396=>1000,26397=>1000,26398=>1000,26399=>1000,26400=>1000,26401=>1000,26402=>1000,26403=>1000,26404=>1000,
-	26405=>1000,26406=>1000,26407=>1000,26408=>1000,26409=>1000,26410=>1000,26411=>1000,26412=>1000,26413=>1000,26414=>1000,26415=>1000,26416=>1000,26417=>1000,26418=>1000,26419=>1000,26420=>1000,
-	26421=>1000,26422=>1000,26423=>1000,26424=>1000,26425=>1000,26426=>1000,26427=>1000,26428=>1000,26429=>1000,26430=>1000,26431=>1000,26432=>1000,26433=>1000,26434=>1000,26435=>1000,26436=>1000,
-	26437=>1000,26438=>1000,26439=>1000,26440=>1000,26441=>1000,26442=>1000,26443=>1000,26444=>1000,26445=>1000,26446=>1000,26447=>1000,26448=>1000,26449=>1000,26450=>1000,26451=>1000,26452=>1000,
-	26453=>1000,26454=>1000,26455=>1000,26456=>1000,26457=>1000,26458=>1000,26459=>1000,26460=>1000,26461=>1000,26462=>1000,26463=>1000,26464=>1000,26465=>1000,26466=>1000,26467=>1000,26468=>1000,
-	26469=>1000,26470=>1000,26471=>1000,26472=>1000,26473=>1000,26474=>1000,26475=>1000,26476=>1000,26477=>1000,26478=>1000,26479=>1000,26480=>1000,26481=>1000,26482=>1000,26483=>1000,26484=>1000,
-	26485=>1000,26486=>1000,26487=>1000,26488=>1000,26489=>1000,26490=>1000,26491=>1000,26492=>1000,26493=>1000,26494=>1000,26495=>1000,26496=>1000,26497=>1000,26498=>1000,26499=>1000,26500=>1000,
-	26501=>1000,26502=>1000,26503=>1000,26504=>1000,26505=>1000,26506=>1000,26507=>1000,26508=>1000,26509=>1000,26510=>1000,26511=>1000,26512=>1000,26513=>1000,26514=>1000,26515=>1000,26516=>1000,
-	26517=>1000,26518=>1000,26519=>1000,26520=>1000,26521=>1000,26522=>1000,26523=>1000,26524=>1000,26525=>1000,26526=>1000,26527=>1000,26528=>1000,26529=>1000,26530=>1000,26531=>1000,26532=>1000,
-	26533=>1000,26534=>1000,26535=>1000,26536=>1000,26537=>1000,26538=>1000,26539=>1000,26540=>1000,26541=>1000,26542=>1000,26543=>1000,26544=>1000,26545=>1000,26546=>1000,26547=>1000,26548=>1000,
-	26549=>1000,26550=>1000,26551=>1000,26552=>1000,26553=>1000,26554=>1000,26555=>1000,26556=>1000,26557=>1000,26558=>1000,26559=>1000,26560=>1000,26561=>1000,26562=>1000,26563=>1000,26564=>1000,
-	26565=>1000,26566=>1000,26567=>1000,26568=>1000,26569=>1000,26570=>1000,26571=>1000,26572=>1000,26573=>1000,26574=>1000,26575=>1000,26576=>1000,26577=>1000,26578=>1000,26579=>1000,26580=>1000,
-	26581=>1000,26582=>1000,26583=>1000,26584=>1000,26585=>1000,26586=>1000,26587=>1000,26588=>1000,26589=>1000,26590=>1000,26591=>1000,26592=>1000,26593=>1000,26594=>1000,26595=>1000,26596=>1000,
-	26597=>1000,26598=>1000,26599=>1000,26600=>1000,26601=>1000,26602=>1000,26603=>1000,26604=>1000,26605=>1000,26606=>1000,26607=>1000,26608=>1000,26609=>1000,26610=>1000,26611=>1000,26612=>1000,
-	26613=>1000,26614=>1000,26615=>1000,26616=>1000,26617=>1000,26618=>1000,26619=>1000,26620=>1000,26621=>1000,26622=>1000,26623=>1000,26624=>1000,26625=>1000,26626=>1000,26627=>1000,26628=>1000,
-	26629=>1000,26630=>1000,26631=>1000,26632=>1000,26633=>1000,26634=>1000,26635=>1000,26636=>1000,26637=>1000,26638=>1000,26639=>1000,26640=>1000,26641=>1000,26642=>1000,26643=>1000,26644=>1000,
-	26645=>1000,26646=>1000,26647=>1000,26648=>1000,26649=>1000,26650=>1000,26651=>1000,26652=>1000,26653=>1000,26654=>1000,26655=>1000,26656=>1000,26657=>1000,26658=>1000,26659=>1000,26660=>1000,
-	26661=>1000,26662=>1000,26663=>1000,26664=>1000,26665=>1000,26666=>1000,26667=>1000,26668=>1000,26669=>1000,26670=>1000,26671=>1000,26672=>1000,26673=>1000,26674=>1000,26675=>1000,26676=>1000,
-	26677=>1000,26678=>1000,26679=>1000,26680=>1000,26681=>1000,26682=>1000,26683=>1000,26684=>1000,26685=>1000,26686=>1000,26687=>1000,26688=>1000,26689=>1000,26690=>1000,26691=>1000,26692=>1000,
-	26693=>1000,26694=>1000,26695=>1000,26696=>1000,26697=>1000,26698=>1000,26699=>1000,26700=>1000,26701=>1000,26702=>1000,26703=>1000,26704=>1000,26705=>1000,26706=>1000,26707=>1000,26708=>1000,
-	26709=>1000,26710=>1000,26711=>1000,26712=>1000,26713=>1000,26714=>1000,26715=>1000,26716=>1000,26717=>1000,26718=>1000,26719=>1000,26720=>1000,26721=>1000,26722=>1000,26723=>1000,26724=>1000,
-	26725=>1000,26726=>1000,26727=>1000,26728=>1000,26729=>1000,26730=>1000,26731=>1000,26732=>1000,26733=>1000,26734=>1000,26735=>1000,26736=>1000,26737=>1000,26738=>1000,26739=>1000,26740=>1000,
-	26741=>1000,26742=>1000,26743=>1000,26744=>1000,26745=>1000,26746=>1000,26747=>1000,26748=>1000,26749=>1000,26750=>1000,26751=>1000,26752=>1000,26753=>1000,26754=>1000,26755=>1000,26756=>1000,
-	26757=>1000,26758=>1000,26759=>1000,26760=>1000,26761=>1000,26762=>1000,26763=>1000,26764=>1000,26765=>1000,26766=>1000,26767=>1000,26768=>1000,26769=>1000,26770=>1000,26771=>1000,26772=>1000,
-	26773=>1000,26774=>1000,26775=>1000,26776=>1000,26777=>1000,26778=>1000,26779=>1000,26780=>1000,26781=>1000,26782=>1000,26783=>1000,26784=>1000,26785=>1000,26786=>1000,26787=>1000,26788=>1000,
-	26789=>1000,26790=>1000,26791=>1000,26792=>1000,26793=>1000,26794=>1000,26795=>1000,26796=>1000,26797=>1000,26798=>1000,26799=>1000,26800=>1000,26801=>1000,26802=>1000,26803=>1000,26804=>1000,
-	26805=>1000,26806=>1000,26807=>1000,26808=>1000,26809=>1000,26810=>1000,26811=>1000,26812=>1000,26813=>1000,26814=>1000,26815=>1000,26816=>1000,26817=>1000,26818=>1000,26819=>1000,26820=>1000,
-	26821=>1000,26822=>1000,26823=>1000,26824=>1000,26825=>1000,26826=>1000,26827=>1000,26828=>1000,26829=>1000,26830=>1000,26831=>1000,26832=>1000,26833=>1000,26834=>1000,26835=>1000,26836=>1000,
-	26837=>1000,26838=>1000,26839=>1000,26840=>1000,26841=>1000,26842=>1000,26843=>1000,26844=>1000,26845=>1000,26846=>1000,26847=>1000,26848=>1000,26849=>1000,26850=>1000,26851=>1000,26852=>1000,
-	26853=>1000,26854=>1000,26855=>1000,26856=>1000,26857=>1000,26858=>1000,26859=>1000,26860=>1000,26861=>1000,26862=>1000,26863=>1000,26864=>1000,26865=>1000,26866=>1000,26867=>1000,26868=>1000,
-	26869=>1000,26870=>1000,26871=>1000,26872=>1000,26873=>1000,26874=>1000,26875=>1000,26876=>1000,26877=>1000,26878=>1000,26879=>1000,26880=>1000,26881=>1000,26882=>1000,26883=>1000,26884=>1000,
-	26885=>1000,26886=>1000,26887=>1000,26888=>1000,26889=>1000,26890=>1000,26891=>1000,26892=>1000,26893=>1000,26894=>1000,26895=>1000,26896=>1000,26897=>1000,26898=>1000,26899=>1000,26900=>1000,
-	26901=>1000,26902=>1000,26903=>1000,26904=>1000,26905=>1000,26906=>1000,26907=>1000,26908=>1000,26909=>1000,26910=>1000,26911=>1000,26912=>1000,26913=>1000,26914=>1000,26915=>1000,26916=>1000,
-	26917=>1000,26918=>1000,26919=>1000,26920=>1000,26921=>1000,26922=>1000,26923=>1000,26924=>1000,26925=>1000,26926=>1000,26927=>1000,26928=>1000,26929=>1000,26930=>1000,26931=>1000,26932=>1000,
-	26933=>1000,26934=>1000,26935=>1000,26936=>1000,26937=>1000,26938=>1000,26939=>1000,26940=>1000,26941=>1000,26942=>1000,26943=>1000,26944=>1000,26945=>1000,26946=>1000,26947=>1000,26948=>1000,
-	26949=>1000,26950=>1000,26951=>1000,26952=>1000,26953=>1000,26954=>1000,26955=>1000,26956=>1000,26957=>1000,26958=>1000,26959=>1000,26960=>1000,26961=>1000,26962=>1000,26963=>1000,26964=>1000,
-	26965=>1000,26966=>1000,26967=>1000,26968=>1000,26969=>1000,26970=>1000,26971=>1000,26972=>1000,26973=>1000,26974=>1000,26975=>1000,26976=>1000,26977=>1000,26978=>1000,26979=>1000,26980=>1000,
-	26981=>1000,26982=>1000,26983=>1000,26984=>1000,26985=>1000,26986=>1000,26987=>1000,26988=>1000,26989=>1000,26990=>1000,26991=>1000,26992=>1000,26993=>1000,26994=>1000,26995=>1000,26996=>1000,
-	26997=>1000,26998=>1000,26999=>1000,27000=>1000,27001=>1000,27002=>1000,27003=>1000,27004=>1000,27005=>1000,27006=>1000,27007=>1000,27008=>1000,27009=>1000,27010=>1000,27011=>1000,27012=>1000,
-	27013=>1000,27014=>1000,27015=>1000,27016=>1000,27017=>1000,27018=>1000,27019=>1000,27020=>1000,27021=>1000,27022=>1000,27023=>1000,27024=>1000,27025=>1000,27026=>1000,27027=>1000,27028=>1000,
-	27029=>1000,27030=>1000,27031=>1000,27032=>1000,27033=>1000,27034=>1000,27035=>1000,27036=>1000,27037=>1000,27038=>1000,27039=>1000,27040=>1000,27041=>1000,27042=>1000,27043=>1000,27044=>1000,
-	27045=>1000,27046=>1000,27047=>1000,27048=>1000,27049=>1000,27050=>1000,27051=>1000,27052=>1000,27053=>1000,27054=>1000,27055=>1000,27056=>1000,27057=>1000,27058=>1000,27059=>1000,27060=>1000,
-	27061=>1000,27062=>1000,27063=>1000,27064=>1000,27065=>1000,27066=>1000,27067=>1000,27068=>1000,27069=>1000,27070=>1000,27071=>1000,27072=>1000,27073=>1000,27074=>1000,27075=>1000,27076=>1000,
-	27077=>1000,27078=>1000,27079=>1000,27080=>1000,27081=>1000,27082=>1000,27083=>1000,27084=>1000,27085=>1000,27086=>1000,27087=>1000,27088=>1000,27089=>1000,27090=>1000,27091=>1000,27092=>1000,
-	27093=>1000,27094=>1000,27095=>1000,27096=>1000,27097=>1000,27098=>1000,27099=>1000,27100=>1000,27101=>1000,27102=>1000,27103=>1000,27104=>1000,27105=>1000,27106=>1000,27107=>1000,27108=>1000,
-	27109=>1000,27110=>1000,27111=>1000,27112=>1000,27113=>1000,27114=>1000,27115=>1000,27116=>1000,27117=>1000,27118=>1000,27119=>1000,27120=>1000,27121=>1000,27122=>1000,27123=>1000,27124=>1000,
-	27125=>1000,27126=>1000,27127=>1000,27128=>1000,27129=>1000,27130=>1000,27131=>1000,27132=>1000,27133=>1000,27134=>1000,27135=>1000,27136=>1000,27137=>1000,27138=>1000,27139=>1000,27140=>1000,
-	27141=>1000,27142=>1000,27143=>1000,27144=>1000,27145=>1000,27146=>1000,27147=>1000,27148=>1000,27149=>1000,27150=>1000,27151=>1000,27152=>1000,27153=>1000,27154=>1000,27155=>1000,27156=>1000,
-	27157=>1000,27158=>1000,27159=>1000,27160=>1000,27161=>1000,27162=>1000,27163=>1000,27164=>1000,27165=>1000,27166=>1000,27167=>1000,27168=>1000,27169=>1000,27170=>1000,27171=>1000,27172=>1000,
-	27173=>1000,27174=>1000,27175=>1000,27176=>1000,27177=>1000,27178=>1000,27179=>1000,27180=>1000,27181=>1000,27182=>1000,27183=>1000,27184=>1000,27185=>1000,27186=>1000,27187=>1000,27188=>1000,
-	27189=>1000,27190=>1000,27191=>1000,27192=>1000,27193=>1000,27194=>1000,27195=>1000,27196=>1000,27197=>1000,27198=>1000,27199=>1000,27200=>1000,27201=>1000,27202=>1000,27203=>1000,27204=>1000,
-	27205=>1000,27206=>1000,27207=>1000,27208=>1000,27209=>1000,27210=>1000,27211=>1000,27212=>1000,27213=>1000,27214=>1000,27215=>1000,27216=>1000,27217=>1000,27218=>1000,27219=>1000,27220=>1000,
-	27221=>1000,27222=>1000,27223=>1000,27224=>1000,27225=>1000,27226=>1000,27227=>1000,27228=>1000,27229=>1000,27230=>1000,27231=>1000,27232=>1000,27233=>1000,27234=>1000,27235=>1000,27236=>1000,
-	27237=>1000,27238=>1000,27239=>1000,27240=>1000,27241=>1000,27242=>1000,27243=>1000,27244=>1000,27245=>1000,27246=>1000,27247=>1000,27248=>1000,27249=>1000,27250=>1000,27251=>1000,27252=>1000,
-	27253=>1000,27254=>1000,27255=>1000,27256=>1000,27257=>1000,27258=>1000,27259=>1000,27260=>1000,27261=>1000,27262=>1000,27263=>1000,27264=>1000,27265=>1000,27266=>1000,27267=>1000,27268=>1000,
-	27269=>1000,27270=>1000,27271=>1000,27272=>1000,27273=>1000,27274=>1000,27275=>1000,27276=>1000,27277=>1000,27278=>1000,27279=>1000,27280=>1000,27281=>1000,27282=>1000,27283=>1000,27284=>1000,
-	27285=>1000,27286=>1000,27287=>1000,27288=>1000,27289=>1000,27290=>1000,27291=>1000,27292=>1000,27293=>1000,27294=>1000,27295=>1000,27296=>1000,27297=>1000,27298=>1000,27299=>1000,27300=>1000,
-	27301=>1000,27302=>1000,27303=>1000,27304=>1000,27305=>1000,27306=>1000,27307=>1000,27308=>1000,27309=>1000,27310=>1000,27311=>1000,27312=>1000,27313=>1000,27314=>1000,27315=>1000,27316=>1000,
-	27317=>1000,27318=>1000,27319=>1000,27320=>1000,27321=>1000,27322=>1000,27323=>1000,27324=>1000,27325=>1000,27326=>1000,27327=>1000,27328=>1000,27329=>1000,27330=>1000,27331=>1000,27332=>1000,
-	27333=>1000,27334=>1000,27335=>1000,27336=>1000,27337=>1000,27338=>1000,27339=>1000,27340=>1000,27341=>1000,27342=>1000,27343=>1000,27344=>1000,27345=>1000,27346=>1000,27347=>1000,27348=>1000,
-	27349=>1000,27350=>1000,27351=>1000,27352=>1000,27353=>1000,27354=>1000,27355=>1000,27356=>1000,27357=>1000,27358=>1000,27359=>1000,27360=>1000,27361=>1000,27362=>1000,27363=>1000,27364=>1000,
-	27365=>1000,27366=>1000,27367=>1000,27368=>1000,27369=>1000,27370=>1000,27371=>1000,27372=>1000,27373=>1000,27374=>1000,27375=>1000,27376=>1000,27377=>1000,27378=>1000,27379=>1000,27380=>1000,
-	27381=>1000,27382=>1000,27383=>1000,27384=>1000,27385=>1000,27386=>1000,27387=>1000,27388=>1000,27389=>1000,27390=>1000,27391=>1000,27392=>1000,27393=>1000,27394=>1000,27395=>1000,27396=>1000,
-	27397=>1000,27398=>1000,27399=>1000,27400=>1000,27401=>1000,27402=>1000,27403=>1000,27404=>1000,27405=>1000,27406=>1000,27407=>1000,27408=>1000,27409=>1000,27410=>1000,27411=>1000,27412=>1000,
-	27413=>1000,27414=>1000,27415=>1000,27416=>1000,27417=>1000,27418=>1000,27419=>1000,27420=>1000,27421=>1000,27422=>1000,27423=>1000,27424=>1000,27425=>1000,27426=>1000,27427=>1000,27428=>1000,
-	27429=>1000,27430=>1000,27431=>1000,27432=>1000,27433=>1000,27434=>1000,27435=>1000,27436=>1000,27437=>1000,27438=>1000,27439=>1000,27440=>1000,27441=>1000,27442=>1000,27443=>1000,27444=>1000,
-	27445=>1000,27446=>1000,27447=>1000,27448=>1000,27449=>1000,27450=>1000,27451=>1000,27452=>1000,27453=>1000,27454=>1000,27455=>1000,27456=>1000,27457=>1000,27458=>1000,27459=>1000,27460=>1000,
-	27461=>1000,27462=>1000,27463=>1000,27464=>1000,27465=>1000,27466=>1000,27467=>1000,27468=>1000,27469=>1000,27470=>1000,27471=>1000,27472=>1000,27473=>1000,27474=>1000,27475=>1000,27476=>1000,
-	27477=>1000,27478=>1000,27479=>1000,27480=>1000,27481=>1000,27482=>1000,27483=>1000,27484=>1000,27485=>1000,27486=>1000,27487=>1000,27488=>1000,27489=>1000,27490=>1000,27491=>1000,27492=>1000,
-	27493=>1000,27494=>1000,27495=>1000,27496=>1000,27497=>1000,27498=>1000,27499=>1000,27500=>1000,27501=>1000,27502=>1000,27503=>1000,27504=>1000,27505=>1000,27506=>1000,27507=>1000,27508=>1000,
-	27509=>1000,27510=>1000,27511=>1000,27512=>1000,27513=>1000,27514=>1000,27515=>1000,27516=>1000,27517=>1000,27518=>1000,27519=>1000,27520=>1000,27521=>1000,27522=>1000,27523=>1000,27524=>1000,
-	27525=>1000,27526=>1000,27527=>1000,27528=>1000,27529=>1000,27530=>1000,27531=>1000,27532=>1000,27533=>1000,27534=>1000,27535=>1000,27536=>1000,27537=>1000,27538=>1000,27539=>1000,27540=>1000,
-	27541=>1000,27542=>1000,27543=>1000,27544=>1000,27545=>1000,27546=>1000,27547=>1000,27548=>1000,27549=>1000,27550=>1000,27551=>1000,27552=>1000,27553=>1000,27554=>1000,27555=>1000,27556=>1000,
-	27557=>1000,27558=>1000,27559=>1000,27560=>1000,27561=>1000,27562=>1000,27563=>1000,27564=>1000,27565=>1000,27566=>1000,27567=>1000,27568=>1000,27569=>1000,27570=>1000,27571=>1000,27572=>1000,
-	27573=>1000,27574=>1000,27575=>1000,27576=>1000,27577=>1000,27578=>1000,27579=>1000,27580=>1000,27581=>1000,27582=>1000,27583=>1000,27584=>1000,27585=>1000,27586=>1000,27587=>1000,27588=>1000,
-	27589=>1000,27590=>1000,27591=>1000,27592=>1000,27593=>1000,27594=>1000,27595=>1000,27596=>1000,27597=>1000,27598=>1000,27599=>1000,27600=>1000,27601=>1000,27602=>1000,27603=>1000,27604=>1000,
-	27605=>1000,27606=>1000,27607=>1000,27608=>1000,27609=>1000,27610=>1000,27611=>1000,27612=>1000,27613=>1000,27614=>1000,27615=>1000,27616=>1000,27617=>1000,27618=>1000,27619=>1000,27620=>1000,
-	27621=>1000,27622=>1000,27623=>1000,27624=>1000,27625=>1000,27626=>1000,27627=>1000,27628=>1000,27629=>1000,27630=>1000,27631=>1000,27632=>1000,27633=>1000,27634=>1000,27635=>1000,27636=>1000,
-	27637=>1000,27638=>1000,27639=>1000,27640=>1000,27641=>1000,27642=>1000,27643=>1000,27644=>1000,27645=>1000,27646=>1000,27647=>1000,27648=>1000,27649=>1000,27650=>1000,27651=>1000,27652=>1000,
-	27653=>1000,27654=>1000,27655=>1000,27656=>1000,27657=>1000,27658=>1000,27659=>1000,27660=>1000,27661=>1000,27662=>1000,27663=>1000,27664=>1000,27665=>1000,27666=>1000,27667=>1000,27668=>1000,
-	27669=>1000,27670=>1000,27671=>1000,27672=>1000,27673=>1000,27674=>1000,27675=>1000,27676=>1000,27677=>1000,27678=>1000,27679=>1000,27680=>1000,27681=>1000,27682=>1000,27683=>1000,27684=>1000,
-	27685=>1000,27686=>1000,27687=>1000,27688=>1000,27689=>1000,27690=>1000,27691=>1000,27692=>1000,27693=>1000,27694=>1000,27695=>1000,27696=>1000,27697=>1000,27698=>1000,27699=>1000,27700=>1000,
-	27701=>1000,27702=>1000,27703=>1000,27704=>1000,27705=>1000,27706=>1000,27707=>1000,27708=>1000,27709=>1000,27710=>1000,27711=>1000,27712=>1000,27713=>1000,27714=>1000,27715=>1000,27716=>1000,
-	27717=>1000,27718=>1000,27719=>1000,27720=>1000,27721=>1000,27722=>1000,27723=>1000,27724=>1000,27725=>1000,27726=>1000,27727=>1000,27728=>1000,27729=>1000,27730=>1000,27731=>1000,27732=>1000,
-	27733=>1000,27734=>1000,27735=>1000,27736=>1000,27737=>1000,27738=>1000,27739=>1000,27740=>1000,27741=>1000,27742=>1000,27743=>1000,27744=>1000,27745=>1000,27746=>1000,27747=>1000,27748=>1000,
-	27749=>1000,27750=>1000,27751=>1000,27752=>1000,27753=>1000,27754=>1000,27755=>1000,27756=>1000,27757=>1000,27758=>1000,27759=>1000,27760=>1000,27761=>1000,27762=>1000,27763=>1000,27764=>1000,
-	27765=>1000,27766=>1000,27767=>1000,27768=>1000,27769=>1000,27770=>1000,27771=>1000,27772=>1000,27773=>1000,27774=>1000,27775=>1000,27776=>1000,27777=>1000,27778=>1000,27779=>1000,27780=>1000,
-	27781=>1000,27782=>1000,27783=>1000,27784=>1000,27785=>1000,27786=>1000,27787=>1000,27788=>1000,27789=>1000,27790=>1000,27791=>1000,27792=>1000,27793=>1000,27794=>1000,27795=>1000,27796=>1000,
-	27797=>1000,27798=>1000,27799=>1000,27800=>1000,27801=>1000,27802=>1000,27803=>1000,27804=>1000,27805=>1000,27806=>1000,27807=>1000,27808=>1000,27809=>1000,27810=>1000,27811=>1000,27812=>1000,
-	27813=>1000,27814=>1000,27815=>1000,27816=>1000,27817=>1000,27818=>1000,27819=>1000,27820=>1000,27821=>1000,27822=>1000,27823=>1000,27824=>1000,27825=>1000,27826=>1000,27827=>1000,27828=>1000,
-	27829=>1000,27830=>1000,27831=>1000,27832=>1000,27833=>1000,27834=>1000,27835=>1000,27836=>1000,27837=>1000,27838=>1000,27839=>1000,27840=>1000,27841=>1000,27842=>1000,27843=>1000,27844=>1000,
-	27845=>1000,27846=>1000,27847=>1000,27848=>1000,27849=>1000,27850=>1000,27851=>1000,27852=>1000,27853=>1000,27854=>1000,27855=>1000,27856=>1000,27857=>1000,27858=>1000,27859=>1000,27860=>1000,
-	27861=>1000,27862=>1000,27863=>1000,27864=>1000,27865=>1000,27866=>1000,27867=>1000,27868=>1000,27869=>1000,27870=>1000,27871=>1000,27872=>1000,27873=>1000,27874=>1000,27875=>1000,27876=>1000,
-	27877=>1000,27878=>1000,27879=>1000,27880=>1000,27881=>1000,27882=>1000,27883=>1000,27884=>1000,27885=>1000,27886=>1000,27887=>1000,27888=>1000,27889=>1000,27890=>1000,27891=>1000,27892=>1000,
-	27893=>1000,27894=>1000,27895=>1000,27896=>1000,27897=>1000,27898=>1000,27899=>1000,27900=>1000,27901=>1000,27902=>1000,27903=>1000,27904=>1000,27905=>1000,27906=>1000,27907=>1000,27908=>1000,
-	27909=>1000,27910=>1000,27911=>1000,27912=>1000,27913=>1000,27914=>1000,27915=>1000,27916=>1000,27917=>1000,27918=>1000,27919=>1000,27920=>1000,27921=>1000,27922=>1000,27923=>1000,27924=>1000,
-	27925=>1000,27926=>1000,27927=>1000,27928=>1000,27929=>1000,27930=>1000,27931=>1000,27932=>1000,27933=>1000,27934=>1000,27935=>1000,27936=>1000,27937=>1000,27938=>1000,27939=>1000,27940=>1000,
-	27941=>1000,27942=>1000,27943=>1000,27944=>1000,27945=>1000,27946=>1000,27947=>1000,27948=>1000,27949=>1000,27950=>1000,27951=>1000,27952=>1000,27953=>1000,27954=>1000,27955=>1000,27956=>1000,
-	27957=>1000,27958=>1000,27959=>1000,27960=>1000,27961=>1000,27962=>1000,27963=>1000,27964=>1000,27965=>1000,27966=>1000,27967=>1000,27968=>1000,27969=>1000,27970=>1000,27971=>1000,27972=>1000,
-	27973=>1000,27974=>1000,27975=>1000,27976=>1000,27977=>1000,27978=>1000,27979=>1000,27980=>1000,27981=>1000,27982=>1000,27983=>1000,27984=>1000,27985=>1000,27986=>1000,27987=>1000,27988=>1000,
-	27989=>1000,27990=>1000,27991=>1000,27992=>1000,27993=>1000,27994=>1000,27995=>1000,27996=>1000,27997=>1000,27998=>1000,27999=>1000,28000=>1000,28001=>1000,28002=>1000,28003=>1000,28004=>1000,
-	28005=>1000,28006=>1000,28007=>1000,28008=>1000,28009=>1000,28010=>1000,28011=>1000,28012=>1000,28013=>1000,28014=>1000,28015=>1000,28016=>1000,28017=>1000,28018=>1000,28019=>1000,28020=>1000,
-	28021=>1000,28022=>1000,28023=>1000,28024=>1000,28025=>1000,28026=>1000,28027=>1000,28028=>1000,28029=>1000,28030=>1000,28031=>1000,28032=>1000,28033=>1000,28034=>1000,28035=>1000,28036=>1000,
-	28037=>1000,28038=>1000,28039=>1000,28040=>1000,28041=>1000,28042=>1000,28043=>1000,28044=>1000,28045=>1000,28046=>1000,28047=>1000,28048=>1000,28049=>1000,28050=>1000,28051=>1000,28052=>1000,
-	28053=>1000,28054=>1000,28055=>1000,28056=>1000,28057=>1000,28058=>1000,28059=>1000,28060=>1000,28061=>1000,28062=>1000,28063=>1000,28064=>1000,28065=>1000,28066=>1000,28067=>1000,28068=>1000,
-	28069=>1000,28070=>1000,28071=>1000,28072=>1000,28073=>1000,28074=>1000,28075=>1000,28076=>1000,28077=>1000,28078=>1000,28079=>1000,28080=>1000,28081=>1000,28082=>1000,28083=>1000,28084=>1000,
-	28085=>1000,28086=>1000,28087=>1000,28088=>1000,28089=>1000,28090=>1000,28091=>1000,28092=>1000,28093=>1000,28094=>1000,28095=>1000,28096=>1000,28097=>1000,28098=>1000,28099=>1000,28100=>1000,
-	28101=>1000,28102=>1000,28103=>1000,28104=>1000,28105=>1000,28106=>1000,28107=>1000,28108=>1000,28109=>1000,28110=>1000,28111=>1000,28112=>1000,28113=>1000,28114=>1000,28115=>1000,28116=>1000,
-	28117=>1000,28118=>1000,28119=>1000,28120=>1000,28121=>1000,28122=>1000,28123=>1000,28124=>1000,28125=>1000,28126=>1000,28127=>1000,28128=>1000,28129=>1000,28130=>1000,28131=>1000,28132=>1000,
-	28133=>1000,28134=>1000,28135=>1000,28136=>1000,28137=>1000,28138=>1000,28139=>1000,28140=>1000,28141=>1000,28142=>1000,28143=>1000,28144=>1000,28145=>1000,28146=>1000,28147=>1000,28148=>1000,
-	28149=>1000,28150=>1000,28151=>1000,28152=>1000,28153=>1000,28154=>1000,28155=>1000,28156=>1000,28157=>1000,28158=>1000,28159=>1000,28160=>1000,28161=>1000,28162=>1000,28163=>1000,28164=>1000,
-	28165=>1000,28166=>1000,28167=>1000,28168=>1000,28169=>1000,28170=>1000,28171=>1000,28172=>1000,28173=>1000,28174=>1000,28175=>1000,28176=>1000,28177=>1000,28178=>1000,28179=>1000,28180=>1000,
-	28181=>1000,28182=>1000,28183=>1000,28184=>1000,28185=>1000,28186=>1000,28187=>1000,28188=>1000,28189=>1000,28190=>1000,28191=>1000,28192=>1000,28193=>1000,28194=>1000,28195=>1000,28196=>1000,
-	28197=>1000,28198=>1000,28199=>1000,28200=>1000,28201=>1000,28202=>1000,28203=>1000,28204=>1000,28205=>1000,28206=>1000,28207=>1000,28208=>1000,28209=>1000,28210=>1000,28211=>1000,28212=>1000,
-	28213=>1000,28214=>1000,28215=>1000,28216=>1000,28217=>1000,28218=>1000,28219=>1000,28220=>1000,28221=>1000,28222=>1000,28223=>1000,28224=>1000,28225=>1000,28226=>1000,28227=>1000,28228=>1000,
-	28229=>1000,28230=>1000,28231=>1000,28232=>1000,28233=>1000,28234=>1000,28235=>1000,28236=>1000,28237=>1000,28238=>1000,28239=>1000,28240=>1000,28241=>1000,28242=>1000,28243=>1000,28244=>1000,
-	28245=>1000,28246=>1000,28247=>1000,28248=>1000,28249=>1000,28250=>1000,28251=>1000,28252=>1000,28253=>1000,28254=>1000,28255=>1000,28256=>1000,28257=>1000,28258=>1000,28259=>1000,28260=>1000,
-	28261=>1000,28262=>1000,28263=>1000,28264=>1000,28265=>1000,28266=>1000,28267=>1000,28268=>1000,28269=>1000,28270=>1000,28271=>1000,28272=>1000,28273=>1000,28274=>1000,28275=>1000,28276=>1000,
-	28277=>1000,28278=>1000,28279=>1000,28280=>1000,28281=>1000,28282=>1000,28283=>1000,28284=>1000,28285=>1000,28286=>1000,28287=>1000,28288=>1000,28289=>1000,28290=>1000,28291=>1000,28292=>1000,
-	28293=>1000,28294=>1000,28295=>1000,28296=>1000,28297=>1000,28298=>1000,28299=>1000,28300=>1000,28301=>1000,28302=>1000,28303=>1000,28304=>1000,28305=>1000,28306=>1000,28307=>1000,28308=>1000,
-	28309=>1000,28310=>1000,28311=>1000,28312=>1000,28313=>1000,28314=>1000,28315=>1000,28316=>1000,28317=>1000,28318=>1000,28319=>1000,28320=>1000,28321=>1000,28322=>1000,28323=>1000,28324=>1000,
-	28325=>1000,28326=>1000,28327=>1000,28328=>1000,28329=>1000,28330=>1000,28331=>1000,28332=>1000,28333=>1000,28334=>1000,28335=>1000,28336=>1000,28337=>1000,28338=>1000,28339=>1000,28340=>1000,
-	28341=>1000,28342=>1000,28343=>1000,28344=>1000,28345=>1000,28346=>1000,28347=>1000,28348=>1000,28349=>1000,28350=>1000,28351=>1000,28352=>1000,28353=>1000,28354=>1000,28355=>1000,28356=>1000,
-	28357=>1000,28358=>1000,28359=>1000,28360=>1000,28361=>1000,28362=>1000,28363=>1000,28364=>1000,28365=>1000,28366=>1000,28367=>1000,28368=>1000,28369=>1000,28370=>1000,28371=>1000,28372=>1000,
-	28373=>1000,28374=>1000,28375=>1000,28376=>1000,28377=>1000,28378=>1000,28379=>1000,28380=>1000,28381=>1000,28382=>1000,28383=>1000,28384=>1000,28385=>1000,28386=>1000,28387=>1000,28388=>1000,
-	28389=>1000,28390=>1000,28391=>1000,28392=>1000,28393=>1000,28394=>1000,28395=>1000,28396=>1000,28397=>1000,28398=>1000,28399=>1000,28400=>1000,28401=>1000,28402=>1000,28403=>1000,28404=>1000,
-	28405=>1000,28406=>1000,28407=>1000,28408=>1000,28409=>1000,28410=>1000,28411=>1000,28412=>1000,28413=>1000,28414=>1000,28415=>1000,28416=>1000,28417=>1000,28418=>1000,28419=>1000,28420=>1000,
-	28421=>1000,28422=>1000,28423=>1000,28424=>1000,28425=>1000,28426=>1000,28427=>1000,28428=>1000,28429=>1000,28430=>1000,28431=>1000,28432=>1000,28433=>1000,28434=>1000,28435=>1000,28436=>1000,
-	28437=>1000,28438=>1000,28439=>1000,28440=>1000,28441=>1000,28442=>1000,28443=>1000,28444=>1000,28445=>1000,28446=>1000,28447=>1000,28448=>1000,28449=>1000,28450=>1000,28451=>1000,28452=>1000,
-	28453=>1000,28454=>1000,28455=>1000,28456=>1000,28457=>1000,28458=>1000,28459=>1000,28460=>1000,28461=>1000,28462=>1000,28463=>1000,28464=>1000,28465=>1000,28466=>1000,28467=>1000,28468=>1000,
-	28469=>1000,28470=>1000,28471=>1000,28472=>1000,28473=>1000,28474=>1000,28475=>1000,28476=>1000,28477=>1000,28478=>1000,28479=>1000,28480=>1000,28481=>1000,28482=>1000,28483=>1000,28484=>1000,
-	28485=>1000,28486=>1000,28487=>1000,28488=>1000,28489=>1000,28490=>1000,28491=>1000,28492=>1000,28493=>1000,28494=>1000,28495=>1000,28496=>1000,28497=>1000,28498=>1000,28499=>1000,28500=>1000,
-	28501=>1000,28502=>1000,28503=>1000,28504=>1000,28505=>1000,28506=>1000,28507=>1000,28508=>1000,28509=>1000,28510=>1000,28511=>1000,28512=>1000,28513=>1000,28514=>1000,28515=>1000,28516=>1000,
-	28517=>1000,28518=>1000,28519=>1000,28520=>1000,28521=>1000,28522=>1000,28523=>1000,28524=>1000,28525=>1000,28526=>1000,28527=>1000,28528=>1000,28529=>1000,28530=>1000,28531=>1000,28532=>1000,
-	28533=>1000,28534=>1000,28535=>1000,28536=>1000,28537=>1000,28538=>1000,28539=>1000,28540=>1000,28541=>1000,28542=>1000,28543=>1000,28544=>1000,28545=>1000,28546=>1000,28547=>1000,28548=>1000,
-	28549=>1000,28550=>1000,28551=>1000,28552=>1000,28553=>1000,28554=>1000,28555=>1000,28556=>1000,28557=>1000,28558=>1000,28559=>1000,28560=>1000,28561=>1000,28562=>1000,28563=>1000,28564=>1000,
-	28565=>1000,28566=>1000,28567=>1000,28568=>1000,28569=>1000,28570=>1000,28571=>1000,28572=>1000,28573=>1000,28574=>1000,28575=>1000,28576=>1000,28577=>1000,28578=>1000,28579=>1000,28580=>1000,
-	28581=>1000,28582=>1000,28583=>1000,28584=>1000,28585=>1000,28586=>1000,28587=>1000,28588=>1000,28589=>1000,28590=>1000,28591=>1000,28592=>1000,28593=>1000,28594=>1000,28595=>1000,28596=>1000,
-	28597=>1000,28598=>1000,28599=>1000,28600=>1000,28601=>1000,28602=>1000,28603=>1000,28604=>1000,28605=>1000,28606=>1000,28607=>1000,28608=>1000,28609=>1000,28610=>1000,28611=>1000,28612=>1000,
-	28613=>1000,28614=>1000,28615=>1000,28616=>1000,28617=>1000,28618=>1000,28619=>1000,28620=>1000,28621=>1000,28622=>1000,28623=>1000,28624=>1000,28625=>1000,28626=>1000,28627=>1000,28628=>1000,
-	28629=>1000,28630=>1000,28631=>1000,28632=>1000,28633=>1000,28634=>1000,28635=>1000,28636=>1000,28637=>1000,28638=>1000,28639=>1000,28640=>1000,28641=>1000,28642=>1000,28643=>1000,28644=>1000,
-	28645=>1000,28646=>1000,28647=>1000,28648=>1000,28649=>1000,28650=>1000,28651=>1000,28652=>1000,28653=>1000,28654=>1000,28655=>1000,28656=>1000,28657=>1000,28658=>1000,28659=>1000,28660=>1000,
-	28661=>1000,28662=>1000,28663=>1000,28664=>1000,28665=>1000,28666=>1000,28667=>1000,28668=>1000,28669=>1000,28670=>1000,28671=>1000,28672=>1000,28673=>1000,28674=>1000,28675=>1000,28676=>1000,
-	28677=>1000,28678=>1000,28679=>1000,28680=>1000,28681=>1000,28682=>1000,28683=>1000,28684=>1000,28685=>1000,28686=>1000,28687=>1000,28688=>1000,28689=>1000,28690=>1000,28691=>1000,28692=>1000,
-	28693=>1000,28694=>1000,28695=>1000,28696=>1000,28697=>1000,28698=>1000,28699=>1000,28700=>1000,28701=>1000,28702=>1000,28703=>1000,28704=>1000,28705=>1000,28706=>1000,28707=>1000,28708=>1000,
-	28709=>1000,28710=>1000,28711=>1000,28712=>1000,28713=>1000,28714=>1000,28715=>1000,28716=>1000,28717=>1000,28718=>1000,28719=>1000,28720=>1000,28721=>1000,28722=>1000,28723=>1000,28724=>1000,
-	28725=>1000,28726=>1000,28727=>1000,28728=>1000,28729=>1000,28730=>1000,28731=>1000,28732=>1000,28733=>1000,28734=>1000,28735=>1000,28736=>1000,28737=>1000,28738=>1000,28739=>1000,28740=>1000,
-	28741=>1000,28742=>1000,28743=>1000,28744=>1000,28745=>1000,28746=>1000,28747=>1000,28748=>1000,28749=>1000,28750=>1000,28751=>1000,28752=>1000,28753=>1000,28754=>1000,28755=>1000,28756=>1000,
-	28757=>1000,28758=>1000,28759=>1000,28760=>1000,28761=>1000,28762=>1000,28763=>1000,28764=>1000,28765=>1000,28766=>1000,28767=>1000,28768=>1000,28769=>1000,28770=>1000,28771=>1000,28772=>1000,
-	28773=>1000,28774=>1000,28775=>1000,28776=>1000,28777=>1000,28778=>1000,28779=>1000,28780=>1000,28781=>1000,28782=>1000,28783=>1000,28784=>1000,28785=>1000,28786=>1000,28787=>1000,28788=>1000,
-	28789=>1000,28790=>1000,28791=>1000,28792=>1000,28793=>1000,28794=>1000,28795=>1000,28796=>1000,28797=>1000,28798=>1000,28799=>1000,28800=>1000,28801=>1000,28802=>1000,28803=>1000,28804=>1000,
-	28805=>1000,28806=>1000,28807=>1000,28808=>1000,28809=>1000,28810=>1000,28811=>1000,28812=>1000,28813=>1000,28814=>1000,28815=>1000,28816=>1000,28817=>1000,28818=>1000,28819=>1000,28820=>1000,
-	28821=>1000,28822=>1000,28823=>1000,28824=>1000,28825=>1000,28826=>1000,28827=>1000,28828=>1000,28829=>1000,28830=>1000,28831=>1000,28832=>1000,28833=>1000,28834=>1000,28835=>1000,28836=>1000,
-	28837=>1000,28838=>1000,28839=>1000,28840=>1000,28841=>1000,28842=>1000,28843=>1000,28844=>1000,28845=>1000,28846=>1000,28847=>1000,28848=>1000,28849=>1000,28850=>1000,28851=>1000,28852=>1000,
-	28853=>1000,28854=>1000,28855=>1000,28856=>1000,28857=>1000,28858=>1000,28859=>1000,28860=>1000,28861=>1000,28862=>1000,28863=>1000,28864=>1000,28865=>1000,28866=>1000,28867=>1000,28868=>1000,
-	28869=>1000,28870=>1000,28871=>1000,28872=>1000,28873=>1000,28874=>1000,28875=>1000,28876=>1000,28877=>1000,28878=>1000,28879=>1000,28880=>1000,28881=>1000,28882=>1000,28883=>1000,28884=>1000,
-	28885=>1000,28886=>1000,28887=>1000,28888=>1000,28889=>1000,28890=>1000,28891=>1000,28892=>1000,28893=>1000,28894=>1000,28895=>1000,28896=>1000,28897=>1000,28898=>1000,28899=>1000,28900=>1000,
-	28901=>1000,28902=>1000,28903=>1000,28904=>1000,28905=>1000,28906=>1000,28907=>1000,28908=>1000,28909=>1000,28910=>1000,28911=>1000,28912=>1000,28913=>1000,28914=>1000,28915=>1000,28916=>1000,
-	28917=>1000,28918=>1000,28919=>1000,28920=>1000,28921=>1000,28922=>1000,28923=>1000,28924=>1000,28925=>1000,28926=>1000,28927=>1000,28928=>1000,28929=>1000,28930=>1000,28931=>1000,28932=>1000,
-	28933=>1000,28934=>1000,28935=>1000,28936=>1000,28937=>1000,28938=>1000,28939=>1000,28940=>1000,28941=>1000,28942=>1000,28943=>1000,28944=>1000,28945=>1000,28946=>1000,28947=>1000,28948=>1000,
-	28949=>1000,28950=>1000,28951=>1000,28952=>1000,28953=>1000,28954=>1000,28955=>1000,28956=>1000,28957=>1000,28958=>1000,28959=>1000,28960=>1000,28961=>1000,28962=>1000,28963=>1000,28964=>1000,
-	28965=>1000,28966=>1000,28967=>1000,28968=>1000,28969=>1000,28970=>1000,28971=>1000,28972=>1000,28973=>1000,28974=>1000,28975=>1000,28976=>1000,28977=>1000,28978=>1000,28979=>1000,28980=>1000,
-	28981=>1000,28982=>1000,28983=>1000,28984=>1000,28985=>1000,28986=>1000,28987=>1000,28988=>1000,28989=>1000,28990=>1000,28991=>1000,28992=>1000,28993=>1000,28994=>1000,28995=>1000,28996=>1000,
-	28997=>1000,28998=>1000,28999=>1000,29000=>1000,29001=>1000,29002=>1000,29003=>1000,29004=>1000,29005=>1000,29006=>1000,29007=>1000,29008=>1000,29009=>1000,29010=>1000,29011=>1000,29012=>1000,
-	29013=>1000,29014=>1000,29015=>1000,29016=>1000,29017=>1000,29018=>1000,29019=>1000,29020=>1000,29021=>1000,29022=>1000,29023=>1000,29024=>1000,29025=>1000,29026=>1000,29027=>1000,29028=>1000,
-	29029=>1000,29030=>1000,29031=>1000,29032=>1000,29033=>1000,29034=>1000,29035=>1000,29036=>1000,29037=>1000,29038=>1000,29039=>1000,29040=>1000,29041=>1000,29042=>1000,29043=>1000,29044=>1000,
-	29045=>1000,29046=>1000,29047=>1000,29048=>1000,29049=>1000,29050=>1000,29051=>1000,29052=>1000,29053=>1000,29054=>1000,29055=>1000,29056=>1000,29057=>1000,29058=>1000,29059=>1000,29060=>1000,
-	29061=>1000,29062=>1000,29063=>1000,29064=>1000,29065=>1000,29066=>1000,29067=>1000,29068=>1000,29069=>1000,29070=>1000,29071=>1000,29072=>1000,29073=>1000,29074=>1000,29075=>1000,29076=>1000,
-	29077=>1000,29078=>1000,29079=>1000,29080=>1000,29081=>1000,29082=>1000,29083=>1000,29084=>1000,29085=>1000,29086=>1000,29087=>1000,29088=>1000,29089=>1000,29090=>1000,29091=>1000,29092=>1000,
-	29093=>1000,29094=>1000,29095=>1000,29096=>1000,29097=>1000,29098=>1000,29099=>1000,29100=>1000,29101=>1000,29102=>1000,29103=>1000,29104=>1000,29105=>1000,29106=>1000,29107=>1000,29108=>1000,
-	29109=>1000,29110=>1000,29111=>1000,29112=>1000,29113=>1000,29114=>1000,29115=>1000,29116=>1000,29117=>1000,29118=>1000,29119=>1000,29120=>1000,29121=>1000,29122=>1000,29123=>1000,29124=>1000,
-	29125=>1000,29126=>1000,29127=>1000,29128=>1000,29129=>1000,29130=>1000,29131=>1000,29132=>1000,29133=>1000,29134=>1000,29135=>1000,29136=>1000,29137=>1000,29138=>1000,29139=>1000,29140=>1000,
-	29141=>1000,29142=>1000,29143=>1000,29144=>1000,29145=>1000,29146=>1000,29147=>1000,29148=>1000,29149=>1000,29150=>1000,29151=>1000,29152=>1000,29153=>1000,29154=>1000,29155=>1000,29156=>1000,
-	29157=>1000,29158=>1000,29159=>1000,29160=>1000,29161=>1000,29162=>1000,29163=>1000,29164=>1000,29165=>1000,29166=>1000,29167=>1000,29168=>1000,29169=>1000,29170=>1000,29171=>1000,29172=>1000,
-	29173=>1000,29174=>1000,29175=>1000,29176=>1000,29177=>1000,29178=>1000,29179=>1000,29180=>1000,29181=>1000,29182=>1000,29183=>1000,29184=>1000,29185=>1000,29186=>1000,29187=>1000,29188=>1000,
-	29189=>1000,29190=>1000,29191=>1000,29192=>1000,29193=>1000,29194=>1000,29195=>1000,29196=>1000,29197=>1000,29198=>1000,29199=>1000,29200=>1000,29201=>1000,29202=>1000,29203=>1000,29204=>1000,
-	29205=>1000,29206=>1000,29207=>1000,29208=>1000,29209=>1000,29210=>1000,29211=>1000,29212=>1000,29213=>1000,29214=>1000,29215=>1000,29216=>1000,29217=>1000,29218=>1000,29219=>1000,29220=>1000,
-	29221=>1000,29222=>1000,29223=>1000,29224=>1000,29225=>1000,29226=>1000,29227=>1000,29228=>1000,29229=>1000,29230=>1000,29231=>1000,29232=>1000,29233=>1000,29234=>1000,29235=>1000,29236=>1000,
-	29237=>1000,29238=>1000,29239=>1000,29240=>1000,29241=>1000,29242=>1000,29243=>1000,29244=>1000,29245=>1000,29246=>1000,29247=>1000,29248=>1000,29249=>1000,29250=>1000,29251=>1000,29252=>1000,
-	29253=>1000,29254=>1000,29255=>1000,29256=>1000,29257=>1000,29258=>1000,29259=>1000,29260=>1000,29261=>1000,29262=>1000,29263=>1000,29264=>1000,29265=>1000,29266=>1000,29267=>1000,29268=>1000,
-	29269=>1000,29270=>1000,29271=>1000,29272=>1000,29273=>1000,29274=>1000,29275=>1000,29276=>1000,29277=>1000,29278=>1000,29279=>1000,29280=>1000,29281=>1000,29282=>1000,29283=>1000,29284=>1000,
-	29285=>1000,29286=>1000,29287=>1000,29288=>1000,29289=>1000,29290=>1000,29291=>1000,29292=>1000,29293=>1000,29294=>1000,29295=>1000,29296=>1000,29297=>1000,29298=>1000,29299=>1000,29300=>1000,
-	29301=>1000,29302=>1000,29303=>1000,29304=>1000,29305=>1000,29306=>1000,29307=>1000,29308=>1000,29309=>1000,29310=>1000,29311=>1000,29312=>1000,29313=>1000,29314=>1000,29315=>1000,29316=>1000,
-	29317=>1000,29318=>1000,29319=>1000,29320=>1000,29321=>1000,29322=>1000,29323=>1000,29324=>1000,29325=>1000,29326=>1000,29327=>1000,29328=>1000,29329=>1000,29330=>1000,29331=>1000,29332=>1000,
-	29333=>1000,29334=>1000,29335=>1000,29336=>1000,29337=>1000,29338=>1000,29339=>1000,29340=>1000,29341=>1000,29342=>1000,29343=>1000,29344=>1000,29345=>1000,29346=>1000,29347=>1000,29348=>1000,
-	29349=>1000,29350=>1000,29351=>1000,29352=>1000,29353=>1000,29354=>1000,29355=>1000,29356=>1000,29357=>1000,29358=>1000,29359=>1000,29360=>1000,29361=>1000,29362=>1000,29363=>1000,29364=>1000,
-	29365=>1000,29366=>1000,29367=>1000,29368=>1000,29369=>1000,29370=>1000,29371=>1000,29372=>1000,29373=>1000,29374=>1000,29375=>1000,29376=>1000,29377=>1000,29378=>1000,29379=>1000,29380=>1000,
-	29381=>1000,29382=>1000,29383=>1000,29384=>1000,29385=>1000,29386=>1000,29387=>1000,29388=>1000,29389=>1000,29390=>1000,29391=>1000,29392=>1000,29393=>1000,29394=>1000,29395=>1000,29396=>1000,
-	29397=>1000,29398=>1000,29399=>1000,29400=>1000,29401=>1000,29402=>1000,29403=>1000,29404=>1000,29405=>1000,29406=>1000,29407=>1000,29408=>1000,29409=>1000,29410=>1000,29411=>1000,29412=>1000,
-	29413=>1000,29414=>1000,29415=>1000,29416=>1000,29417=>1000,29418=>1000,29419=>1000,29420=>1000,29421=>1000,29422=>1000,29423=>1000,29424=>1000,29425=>1000,29426=>1000,29427=>1000,29428=>1000,
-	29429=>1000,29430=>1000,29431=>1000,29432=>1000,29433=>1000,29434=>1000,29435=>1000,29436=>1000,29437=>1000,29438=>1000,29439=>1000,29440=>1000,29441=>1000,29442=>1000,29443=>1000,29444=>1000,
-	29445=>1000,29446=>1000,29447=>1000,29448=>1000,29449=>1000,29450=>1000,29451=>1000,29452=>1000,29453=>1000,29454=>1000,29455=>1000,29456=>1000,29457=>1000,29458=>1000,29459=>1000,29460=>1000,
-	29461=>1000,29462=>1000,29463=>1000,29464=>1000,29465=>1000,29466=>1000,29467=>1000,29468=>1000,29469=>1000,29470=>1000,29471=>1000,29472=>1000,29473=>1000,29474=>1000,29475=>1000,29476=>1000,
-	29477=>1000,29478=>1000,29479=>1000,29480=>1000,29481=>1000,29482=>1000,29483=>1000,29484=>1000,29485=>1000,29486=>1000,29487=>1000,29488=>1000,29489=>1000,29490=>1000,29491=>1000,29492=>1000,
-	29493=>1000,29494=>1000,29495=>1000,29496=>1000,29497=>1000,29498=>1000,29499=>1000,29500=>1000,29501=>1000,29502=>1000,29503=>1000,29504=>1000,29505=>1000,29506=>1000,29507=>1000,29508=>1000,
-	29509=>1000,29510=>1000,29511=>1000,29512=>1000,29513=>1000,29514=>1000,29515=>1000,29516=>1000,29517=>1000,29518=>1000,29519=>1000,29520=>1000,29521=>1000,29522=>1000,29523=>1000,29524=>1000,
-	29525=>1000,29526=>1000,29527=>1000,29528=>1000,29529=>1000,29530=>1000,29531=>1000,29532=>1000,29533=>1000,29534=>1000,29535=>1000,29536=>1000,29537=>1000,29538=>1000,29539=>1000,29540=>1000,
-	29541=>1000,29542=>1000,29543=>1000,29544=>1000,29545=>1000,29546=>1000,29547=>1000,29548=>1000,29549=>1000,29550=>1000,29551=>1000,29552=>1000,29553=>1000,29554=>1000,29555=>1000,29556=>1000,
-	29557=>1000,29558=>1000,29559=>1000,29560=>1000,29561=>1000,29562=>1000,29563=>1000,29564=>1000,29565=>1000,29566=>1000,29567=>1000,29568=>1000,29569=>1000,29570=>1000,29571=>1000,29572=>1000,
-	29573=>1000,29574=>1000,29575=>1000,29576=>1000,29577=>1000,29578=>1000,29579=>1000,29580=>1000,29581=>1000,29582=>1000,29583=>1000,29584=>1000,29585=>1000,29586=>1000,29587=>1000,29588=>1000,
-	29589=>1000,29590=>1000,29591=>1000,29592=>1000,29593=>1000,29594=>1000,29595=>1000,29596=>1000,29597=>1000,29598=>1000,29599=>1000,29600=>1000,29601=>1000,29602=>1000,29603=>1000,29604=>1000,
-	29605=>1000,29606=>1000,29607=>1000,29608=>1000,29609=>1000,29610=>1000,29611=>1000,29612=>1000,29613=>1000,29614=>1000,29615=>1000,29616=>1000,29617=>1000,29618=>1000,29619=>1000,29620=>1000,
-	29621=>1000,29622=>1000,29623=>1000,29624=>1000,29625=>1000,29626=>1000,29627=>1000,29628=>1000,29629=>1000,29630=>1000,29631=>1000,29632=>1000,29633=>1000,29634=>1000,29635=>1000,29636=>1000,
-	29637=>1000,29638=>1000,29639=>1000,29640=>1000,29641=>1000,29642=>1000,29643=>1000,29644=>1000,29645=>1000,29646=>1000,29647=>1000,29648=>1000,29649=>1000,29650=>1000,29651=>1000,29652=>1000,
-	29653=>1000,29654=>1000,29655=>1000,29656=>1000,29657=>1000,29658=>1000,29659=>1000,29660=>1000,29661=>1000,29662=>1000,29663=>1000,29664=>1000,29665=>1000,29666=>1000,29667=>1000,29668=>1000,
-	29669=>1000,29670=>1000,29671=>1000,29672=>1000,29673=>1000,29674=>1000,29675=>1000,29676=>1000,29677=>1000,29678=>1000,29679=>1000,29680=>1000,29681=>1000,29682=>1000,29683=>1000,29684=>1000,
-	29685=>1000,29686=>1000,29687=>1000,29688=>1000,29689=>1000,29690=>1000,29691=>1000,29692=>1000,29693=>1000,29694=>1000,29695=>1000,29696=>1000,29697=>1000,29698=>1000,29699=>1000,29700=>1000,
-	29701=>1000,29702=>1000,29703=>1000,29704=>1000,29705=>1000,29706=>1000,29707=>1000,29708=>1000,29709=>1000,29710=>1000,29711=>1000,29712=>1000,29713=>1000,29714=>1000,29715=>1000,29716=>1000,
-	29717=>1000,29718=>1000,29719=>1000,29720=>1000,29721=>1000,29722=>1000,29723=>1000,29724=>1000,29725=>1000,29726=>1000,29727=>1000,29728=>1000,29729=>1000,29730=>1000,29731=>1000,29732=>1000,
-	29733=>1000,29734=>1000,29735=>1000,29736=>1000,29737=>1000,29738=>1000,29739=>1000,29740=>1000,29741=>1000,29742=>1000,29743=>1000,29744=>1000,29745=>1000,29746=>1000,29747=>1000,29748=>1000,
-	29749=>1000,29750=>1000,29751=>1000,29752=>1000,29753=>1000,29754=>1000,29755=>1000,29756=>1000,29757=>1000,29758=>1000,29759=>1000,29760=>1000,29761=>1000,29762=>1000,29763=>1000,29764=>1000,
-	29765=>1000,29766=>1000,29767=>1000,29768=>1000,29769=>1000,29770=>1000,29771=>1000,29772=>1000,29773=>1000,29774=>1000,29775=>1000,29776=>1000,29777=>1000,29778=>1000,29779=>1000,29780=>1000,
-	29781=>1000,29782=>1000,29783=>1000,29784=>1000,29785=>1000,29786=>1000,29787=>1000,29788=>1000,29789=>1000,29790=>1000,29791=>1000,29792=>1000,29793=>1000,29794=>1000,29795=>1000,29796=>1000,
-	29797=>1000,29798=>1000,29799=>1000,29800=>1000,29801=>1000,29802=>1000,29803=>1000,29804=>1000,29805=>1000,29806=>1000,29807=>1000,29808=>1000,29809=>1000,29810=>1000,29811=>1000,29812=>1000,
-	29813=>1000,29814=>1000,29815=>1000,29816=>1000,29817=>1000,29818=>1000,29819=>1000,29820=>1000,29821=>1000,29822=>1000,29823=>1000,29824=>1000,29825=>1000,29826=>1000,29827=>1000,29828=>1000,
-	29829=>1000,29830=>1000,29831=>1000,29832=>1000,29833=>1000,29834=>1000,29835=>1000,29836=>1000,29837=>1000,29838=>1000,29839=>1000,29840=>1000,29841=>1000,29842=>1000,29843=>1000,29844=>1000,
-	29845=>1000,29846=>1000,29847=>1000,29848=>1000,29849=>1000,29850=>1000,29851=>1000,29852=>1000,29853=>1000,29854=>1000,29855=>1000,29856=>1000,29857=>1000,29858=>1000,29859=>1000,29860=>1000,
-	29861=>1000,29862=>1000,29863=>1000,29864=>1000,29865=>1000,29866=>1000,29867=>1000,29868=>1000,29869=>1000,29870=>1000,29871=>1000,29872=>1000,29873=>1000,29874=>1000,29875=>1000,29876=>1000,
-	29877=>1000,29878=>1000,29879=>1000,29880=>1000,29881=>1000,29882=>1000,29883=>1000,29884=>1000,29885=>1000,29886=>1000,29887=>1000,29888=>1000,29889=>1000,29890=>1000,29891=>1000,29892=>1000,
-	29893=>1000,29894=>1000,29895=>1000,29896=>1000,29897=>1000,29898=>1000,29899=>1000,29900=>1000,29901=>1000,29902=>1000,29903=>1000,29904=>1000,29905=>1000,29906=>1000,29907=>1000,29908=>1000,
-	29909=>1000,29910=>1000,29911=>1000,29912=>1000,29913=>1000,29914=>1000,29915=>1000,29916=>1000,29917=>1000,29918=>1000,29919=>1000,29920=>1000,29921=>1000,29922=>1000,29923=>1000,29924=>1000,
-	29925=>1000,29926=>1000,29927=>1000,29928=>1000,29929=>1000,29930=>1000,29931=>1000,29932=>1000,29933=>1000,29934=>1000,29935=>1000,29936=>1000,29937=>1000,29938=>1000,29939=>1000,29940=>1000,
-	29941=>1000,29942=>1000,29943=>1000,29944=>1000,29945=>1000,29946=>1000,29947=>1000,29948=>1000,29949=>1000,29950=>1000,29951=>1000,29952=>1000,29953=>1000,29954=>1000,29955=>1000,29956=>1000,
-	29957=>1000,29958=>1000,29959=>1000,29960=>1000,29961=>1000,29962=>1000,29963=>1000,29964=>1000,29965=>1000,29966=>1000,29967=>1000,29968=>1000,29969=>1000,29970=>1000,29971=>1000,29972=>1000,
-	29973=>1000,29974=>1000,29975=>1000,29976=>1000,29977=>1000,29978=>1000,29979=>1000,29980=>1000,29981=>1000,29982=>1000,29983=>1000,29984=>1000,29985=>1000,29986=>1000,29987=>1000,29988=>1000,
-	29989=>1000,29990=>1000,29991=>1000,29992=>1000,29993=>1000,29994=>1000,29995=>1000,29996=>1000,29997=>1000,29998=>1000,29999=>1000,30000=>1000,30001=>1000,30002=>1000,30003=>1000,30004=>1000,
-	30005=>1000,30006=>1000,30007=>1000,30008=>1000,30009=>1000,30010=>1000,30011=>1000,30012=>1000,30013=>1000,30014=>1000,30015=>1000,30016=>1000,30017=>1000,30018=>1000,30019=>1000,30020=>1000,
-	30021=>1000,30022=>1000,30023=>1000,30024=>1000,30025=>1000,30026=>1000,30027=>1000,30028=>1000,30029=>1000,30030=>1000,30031=>1000,30032=>1000,30033=>1000,30034=>1000,30035=>1000,30036=>1000,
-	30037=>1000,30038=>1000,30039=>1000,30040=>1000,30041=>1000,30042=>1000,30043=>1000,30044=>1000,30045=>1000,30046=>1000,30047=>1000,30048=>1000,30049=>1000,30050=>1000,30051=>1000,30052=>1000,
-	30053=>1000,30054=>1000,30055=>1000,30056=>1000,30057=>1000,30058=>1000,30059=>1000,30060=>1000,30061=>1000,30062=>1000,30063=>1000,30064=>1000,30065=>1000,30066=>1000,30067=>1000,30068=>1000,
-	30069=>1000,30070=>1000,30071=>1000,30072=>1000,30073=>1000,30074=>1000,30075=>1000,30076=>1000,30077=>1000,30078=>1000,30079=>1000,30080=>1000,30081=>1000,30082=>1000,30083=>1000,30084=>1000,
-	30085=>1000,30086=>1000,30087=>1000,30088=>1000,30089=>1000,30090=>1000,30091=>1000,30092=>1000,30093=>1000,30094=>1000,30095=>1000,30096=>1000,30097=>1000,30098=>1000,30099=>1000,30100=>1000,
-	30101=>1000,30102=>1000,30103=>1000,30104=>1000,30105=>1000,30106=>1000,30107=>1000,30108=>1000,30109=>1000,30110=>1000,30111=>1000,30112=>1000,30113=>1000,30114=>1000,30115=>1000,30116=>1000,
-	30117=>1000,30118=>1000,30119=>1000,30120=>1000,30121=>1000,30122=>1000,30123=>1000,30124=>1000,30125=>1000,30126=>1000,30127=>1000,30128=>1000,30129=>1000,30130=>1000,30131=>1000,30132=>1000,
-	30133=>1000,30134=>1000,30135=>1000,30136=>1000,30137=>1000,30138=>1000,30139=>1000,30140=>1000,30141=>1000,30142=>1000,30143=>1000,30144=>1000,30145=>1000,30146=>1000,30147=>1000,30148=>1000,
-	30149=>1000,30150=>1000,30151=>1000,30152=>1000,30153=>1000,30154=>1000,30155=>1000,30156=>1000,30157=>1000,30158=>1000,30159=>1000,30160=>1000,30161=>1000,30162=>1000,30163=>1000,30164=>1000,
-	30165=>1000,30166=>1000,30167=>1000,30168=>1000,30169=>1000,30170=>1000,30171=>1000,30172=>1000,30173=>1000,30174=>1000,30175=>1000,30176=>1000,30177=>1000,30178=>1000,30179=>1000,30180=>1000,
-	30181=>1000,30182=>1000,30183=>1000,30184=>1000,30185=>1000,30186=>1000,30187=>1000,30188=>1000,30189=>1000,30190=>1000,30191=>1000,30192=>1000,30193=>1000,30194=>1000,30195=>1000,30196=>1000,
-	30197=>1000,30198=>1000,30199=>1000,30200=>1000,30201=>1000,30202=>1000,30203=>1000,30204=>1000,30205=>1000,30206=>1000,30207=>1000,30208=>1000,30209=>1000,30210=>1000,30211=>1000,30212=>1000,
-	30213=>1000,30214=>1000,30215=>1000,30216=>1000,30217=>1000,30218=>1000,30219=>1000,30220=>1000,30221=>1000,30222=>1000,30223=>1000,30224=>1000,30225=>1000,30226=>1000,30227=>1000,30228=>1000,
-	30229=>1000,30230=>1000,30231=>1000,30232=>1000,30233=>1000,30234=>1000,30235=>1000,30236=>1000,30237=>1000,30238=>1000,30239=>1000,30240=>1000,30241=>1000,30242=>1000,30243=>1000,30244=>1000,
-	30245=>1000,30246=>1000,30247=>1000,30248=>1000,30249=>1000,30250=>1000,30251=>1000,30252=>1000,30253=>1000,30254=>1000,30255=>1000,30256=>1000,30257=>1000,30258=>1000,30259=>1000,30260=>1000,
-	30261=>1000,30262=>1000,30263=>1000,30264=>1000,30265=>1000,30266=>1000,30267=>1000,30268=>1000,30269=>1000,30270=>1000,30271=>1000,30272=>1000,30273=>1000,30274=>1000,30275=>1000,30276=>1000,
-	30277=>1000,30278=>1000,30279=>1000,30280=>1000,30281=>1000,30282=>1000,30283=>1000,30284=>1000,30285=>1000,30286=>1000,30287=>1000,30288=>1000,30289=>1000,30290=>1000,30291=>1000,30292=>1000,
-	30293=>1000,30294=>1000,30295=>1000,30296=>1000,30297=>1000,30298=>1000,30299=>1000,30300=>1000,30301=>1000,30302=>1000,30303=>1000,30304=>1000,30305=>1000,30306=>1000,30307=>1000,30308=>1000,
-	30309=>1000,30310=>1000,30311=>1000,30312=>1000,30313=>1000,30314=>1000,30315=>1000,30316=>1000,30317=>1000,30318=>1000,30319=>1000,30320=>1000,30321=>1000,30322=>1000,30323=>1000,30324=>1000,
-	30325=>1000,30326=>1000,30327=>1000,30328=>1000,30329=>1000,30330=>1000,30331=>1000,30332=>1000,30333=>1000,30334=>1000,30335=>1000,30336=>1000,30337=>1000,30338=>1000,30339=>1000,30340=>1000,
-	30341=>1000,30342=>1000,30343=>1000,30344=>1000,30345=>1000,30346=>1000,30347=>1000,30348=>1000,30349=>1000,30350=>1000,30351=>1000,30352=>1000,30353=>1000,30354=>1000,30355=>1000,30356=>1000,
-	30357=>1000,30358=>1000,30359=>1000,30360=>1000,30361=>1000,30362=>1000,30363=>1000,30364=>1000,30365=>1000,30366=>1000,30367=>1000,30368=>1000,30369=>1000,30370=>1000,30371=>1000,30372=>1000,
-	30373=>1000,30374=>1000,30375=>1000,30376=>1000,30377=>1000,30378=>1000,30379=>1000,30380=>1000,30381=>1000,30382=>1000,30383=>1000,30384=>1000,30385=>1000,30386=>1000,30387=>1000,30388=>1000,
-	30389=>1000,30390=>1000,30391=>1000,30392=>1000,30393=>1000,30394=>1000,30395=>1000,30396=>1000,30397=>1000,30398=>1000,30399=>1000,30400=>1000,30401=>1000,30402=>1000,30403=>1000,30404=>1000,
-	30405=>1000,30406=>1000,30407=>1000,30408=>1000,30409=>1000,30410=>1000,30411=>1000,30412=>1000,30413=>1000,30414=>1000,30415=>1000,30416=>1000,30417=>1000,30418=>1000,30419=>1000,30420=>1000,
-	30421=>1000,30422=>1000,30423=>1000,30424=>1000,30425=>1000,30426=>1000,30427=>1000,30428=>1000,30429=>1000,30430=>1000,30431=>1000,30432=>1000,30433=>1000,30434=>1000,30435=>1000,30436=>1000,
-	30437=>1000,30438=>1000,30439=>1000,30440=>1000,30441=>1000,30442=>1000,30443=>1000,30444=>1000,30445=>1000,30446=>1000,30447=>1000,30448=>1000,30449=>1000,30450=>1000,30451=>1000,30452=>1000,
-	30453=>1000,30454=>1000,30455=>1000,30456=>1000,30457=>1000,30458=>1000,30459=>1000,30460=>1000,30461=>1000,30462=>1000,30463=>1000,30464=>1000,30465=>1000,30466=>1000,30467=>1000,30468=>1000,
-	30469=>1000,30470=>1000,30471=>1000,30472=>1000,30473=>1000,30474=>1000,30475=>1000,30476=>1000,30477=>1000,30478=>1000,30479=>1000,30480=>1000,30481=>1000,30482=>1000,30483=>1000,30484=>1000,
-	30485=>1000,30486=>1000,30487=>1000,30488=>1000,30489=>1000,30490=>1000,30491=>1000,30492=>1000,30493=>1000,30494=>1000,30495=>1000,30496=>1000,30497=>1000,30498=>1000,30499=>1000,30500=>1000,
-	30501=>1000,30502=>1000,30503=>1000,30504=>1000,30505=>1000,30506=>1000,30507=>1000,30508=>1000,30509=>1000,30510=>1000,30511=>1000,30512=>1000,30513=>1000,30514=>1000,30515=>1000,30516=>1000,
-	30517=>1000,30518=>1000,30519=>1000,30520=>1000,30521=>1000,30522=>1000,30523=>1000,30524=>1000,30525=>1000,30526=>1000,30527=>1000,30528=>1000,30529=>1000,30530=>1000,30531=>1000,30532=>1000,
-	30533=>1000,30534=>1000,30535=>1000,30536=>1000,30537=>1000,30538=>1000,30539=>1000,30540=>1000,30541=>1000,30542=>1000,30543=>1000,30544=>1000,30545=>1000,30546=>1000,30547=>1000,30548=>1000,
-	30549=>1000,30550=>1000,30551=>1000,30552=>1000,30553=>1000,30554=>1000,30555=>1000,30556=>1000,30557=>1000,30558=>1000,30559=>1000,30560=>1000,30561=>1000,30562=>1000,30563=>1000,30564=>1000,
-	30565=>1000,30566=>1000,30567=>1000,30568=>1000,30569=>1000,30570=>1000,30571=>1000,30572=>1000,30573=>1000,30574=>1000,30575=>1000,30576=>1000,30577=>1000,30578=>1000,30579=>1000,30580=>1000,
-	30581=>1000,30582=>1000,30583=>1000,30584=>1000,30585=>1000,30586=>1000,30587=>1000,30588=>1000,30589=>1000,30590=>1000,30591=>1000,30592=>1000,30593=>1000,30594=>1000,30595=>1000,30596=>1000,
-	30597=>1000,30598=>1000,30599=>1000,30600=>1000,30601=>1000,30602=>1000,30603=>1000,30604=>1000,30605=>1000,30606=>1000,30607=>1000,30608=>1000,30609=>1000,30610=>1000,30611=>1000,30612=>1000,
-	30613=>1000,30614=>1000,30615=>1000,30616=>1000,30617=>1000,30618=>1000,30619=>1000,30620=>1000,30621=>1000,30622=>1000,30623=>1000,30624=>1000,30625=>1000,30626=>1000,30627=>1000,30628=>1000,
-	30629=>1000,30630=>1000,30631=>1000,30632=>1000,30633=>1000,30634=>1000,30635=>1000,30636=>1000,30637=>1000,30638=>1000,30639=>1000,30640=>1000,30641=>1000,30642=>1000,30643=>1000,30644=>1000,
-	30645=>1000,30646=>1000,30647=>1000,30648=>1000,30649=>1000,30650=>1000,30651=>1000,30652=>1000,30653=>1000,30654=>1000,30655=>1000,30656=>1000,30657=>1000,30658=>1000,30659=>1000,30660=>1000,
-	30661=>1000,30662=>1000,30663=>1000,30664=>1000,30665=>1000,30666=>1000,30667=>1000,30668=>1000,30669=>1000,30670=>1000,30671=>1000,30672=>1000,30673=>1000,30674=>1000,30675=>1000,30676=>1000,
-	30677=>1000,30678=>1000,30679=>1000,30680=>1000,30681=>1000,30682=>1000,30683=>1000,30684=>1000,30685=>1000,30686=>1000,30687=>1000,30688=>1000,30689=>1000,30690=>1000,30691=>1000,30692=>1000,
-	30693=>1000,30694=>1000,30695=>1000,30696=>1000,30697=>1000,30698=>1000,30699=>1000,30700=>1000,30701=>1000,30702=>1000,30703=>1000,30704=>1000,30705=>1000,30706=>1000,30707=>1000,30708=>1000,
-	30709=>1000,30710=>1000,30711=>1000,30712=>1000,30713=>1000,30714=>1000,30715=>1000,30716=>1000,30717=>1000,30718=>1000,30719=>1000,30720=>1000,30721=>1000,30722=>1000,30723=>1000,30724=>1000,
-	30725=>1000,30726=>1000,30727=>1000,30728=>1000,30729=>1000,30730=>1000,30731=>1000,30732=>1000,30733=>1000,30734=>1000,30735=>1000,30736=>1000,30737=>1000,30738=>1000,30739=>1000,30740=>1000,
-	30741=>1000,30742=>1000,30743=>1000,30744=>1000,30745=>1000,30746=>1000,30747=>1000,30748=>1000,30749=>1000,30750=>1000,30751=>1000,30752=>1000,30753=>1000,30754=>1000,30755=>1000,30756=>1000,
-	30757=>1000,30758=>1000,30759=>1000,30760=>1000,30761=>1000,30762=>1000,30763=>1000,30764=>1000,30765=>1000,30766=>1000,30767=>1000,30768=>1000,30769=>1000,30770=>1000,30771=>1000,30772=>1000,
-	30773=>1000,30774=>1000,30775=>1000,30776=>1000,30777=>1000,30778=>1000,30779=>1000,30780=>1000,30781=>1000,30782=>1000,30783=>1000,30784=>1000,30785=>1000,30786=>1000,30787=>1000,30788=>1000,
-	30789=>1000,30790=>1000,30791=>1000,30792=>1000,30793=>1000,30794=>1000,30795=>1000,30796=>1000,30797=>1000,30798=>1000,30799=>1000,30800=>1000,30801=>1000,30802=>1000,30803=>1000,30804=>1000,
-	30805=>1000,30806=>1000,30807=>1000,30808=>1000,30809=>1000,30810=>1000,30811=>1000,30812=>1000,30813=>1000,30814=>1000,30815=>1000,30816=>1000,30817=>1000,30818=>1000,30819=>1000,30820=>1000,
-	30821=>1000,30822=>1000,30823=>1000,30824=>1000,30825=>1000,30826=>1000,30827=>1000,30828=>1000,30829=>1000,30830=>1000,30831=>1000,30832=>1000,30833=>1000,30834=>1000,30835=>1000,30836=>1000,
-	30837=>1000,30838=>1000,30839=>1000,30840=>1000,30841=>1000,30842=>1000,30843=>1000,30844=>1000,30845=>1000,30846=>1000,30847=>1000,30848=>1000,30849=>1000,30850=>1000,30851=>1000,30852=>1000,
-	30853=>1000,30854=>1000,30855=>1000,30856=>1000,30857=>1000,30858=>1000,30859=>1000,30860=>1000,30861=>1000,30862=>1000,30863=>1000,30864=>1000,30865=>1000,30866=>1000,30867=>1000,30868=>1000,
-	30869=>1000,30870=>1000,30871=>1000,30872=>1000,30873=>1000,30874=>1000,30875=>1000,30876=>1000,30877=>1000,30878=>1000,30879=>1000,30880=>1000,30881=>1000,30882=>1000,30883=>1000,30884=>1000,
-	30885=>1000,30886=>1000,30887=>1000,30888=>1000,30889=>1000,30890=>1000,30891=>1000,30892=>1000,30893=>1000,30894=>1000,30895=>1000,30896=>1000,30897=>1000,30898=>1000,30899=>1000,30900=>1000,
-	30901=>1000,30902=>1000,30903=>1000,30904=>1000,30905=>1000,30906=>1000,30907=>1000,30908=>1000,30909=>1000,30910=>1000,30911=>1000,30912=>1000,30913=>1000,30914=>1000,30915=>1000,30916=>1000,
-	30917=>1000,30918=>1000,30919=>1000,30920=>1000,30921=>1000,30922=>1000,30923=>1000,30924=>1000,30925=>1000,30926=>1000,30927=>1000,30928=>1000,30929=>1000,30930=>1000,30931=>1000,30932=>1000,
-	30933=>1000,30934=>1000,30935=>1000,30936=>1000,30937=>1000,30938=>1000,30939=>1000,30940=>1000,30941=>1000,30942=>1000,30943=>1000,30944=>1000,30945=>1000,30946=>1000,30947=>1000,30948=>1000,
-	30949=>1000,30950=>1000,30951=>1000,30952=>1000,30953=>1000,30954=>1000,30955=>1000,30956=>1000,30957=>1000,30958=>1000,30959=>1000,30960=>1000,30961=>1000,30962=>1000,30963=>1000,30964=>1000,
-	30965=>1000,30966=>1000,30967=>1000,30968=>1000,30969=>1000,30970=>1000,30971=>1000,30972=>1000,30973=>1000,30974=>1000,30975=>1000,30976=>1000,30977=>1000,30978=>1000,30979=>1000,30980=>1000,
-	30981=>1000,30982=>1000,30983=>1000,30984=>1000,30985=>1000,30986=>1000,30987=>1000,30988=>1000,30989=>1000,30990=>1000,30991=>1000,30992=>1000,30993=>1000,30994=>1000,30995=>1000,30996=>1000,
-	30997=>1000,30998=>1000,30999=>1000,31000=>1000,31001=>1000,31002=>1000,31003=>1000,31004=>1000,31005=>1000,31006=>1000,31007=>1000,31008=>1000,31009=>1000,31010=>1000,31011=>1000,31012=>1000,
-	31013=>1000,31014=>1000,31015=>1000,31016=>1000,31017=>1000,31018=>1000,31019=>1000,31020=>1000,31021=>1000,31022=>1000,31023=>1000,31024=>1000,31025=>1000,31026=>1000,31027=>1000,31028=>1000,
-	31029=>1000,31030=>1000,31031=>1000,31032=>1000,31033=>1000,31034=>1000,31035=>1000,31036=>1000,31037=>1000,31038=>1000,31039=>1000,31040=>1000,31041=>1000,31042=>1000,31043=>1000,31044=>1000,
-	31045=>1000,31046=>1000,31047=>1000,31048=>1000,31049=>1000,31050=>1000,31051=>1000,31052=>1000,31053=>1000,31054=>1000,31055=>1000,31056=>1000,31057=>1000,31058=>1000,31059=>1000,31060=>1000,
-	31061=>1000,31062=>1000,31063=>1000,31064=>1000,31065=>1000,31066=>1000,31067=>1000,31068=>1000,31069=>1000,31070=>1000,31071=>1000,31072=>1000,31073=>1000,31074=>1000,31075=>1000,31076=>1000,
-	31077=>1000,31078=>1000,31079=>1000,31080=>1000,31081=>1000,31082=>1000,31083=>1000,31084=>1000,31085=>1000,31086=>1000,31087=>1000,31088=>1000,31089=>1000,31090=>1000,31091=>1000,31092=>1000,
-	31093=>1000,31094=>1000,31095=>1000,31096=>1000,31097=>1000,31098=>1000,31099=>1000,31100=>1000,31101=>1000,31102=>1000,31103=>1000,31104=>1000,31105=>1000,31106=>1000,31107=>1000,31108=>1000,
-	31109=>1000,31110=>1000,31111=>1000,31112=>1000,31113=>1000,31114=>1000,31115=>1000,31116=>1000,31117=>1000,31118=>1000,31119=>1000,31120=>1000,31121=>1000,31122=>1000,31123=>1000,31124=>1000,
-	31125=>1000,31126=>1000,31127=>1000,31128=>1000,31129=>1000,31130=>1000,31131=>1000,31132=>1000,31133=>1000,31134=>1000,31135=>1000,31136=>1000,31137=>1000,31138=>1000,31139=>1000,31140=>1000,
-	31141=>1000,31142=>1000,31143=>1000,31144=>1000,31145=>1000,31146=>1000,31147=>1000,31148=>1000,31149=>1000,31150=>1000,31151=>1000,31152=>1000,31153=>1000,31154=>1000,31155=>1000,31156=>1000,
-	31157=>1000,31158=>1000,31159=>1000,31160=>1000,31161=>1000,31162=>1000,31163=>1000,31164=>1000,31165=>1000,31166=>1000,31167=>1000,31168=>1000,31169=>1000,31170=>1000,31171=>1000,31172=>1000,
-	31173=>1000,31174=>1000,31175=>1000,31176=>1000,31177=>1000,31178=>1000,31179=>1000,31180=>1000,31181=>1000,31182=>1000,31183=>1000,31184=>1000,31185=>1000,31186=>1000,31187=>1000,31188=>1000,
-	31189=>1000,31190=>1000,31191=>1000,31192=>1000,31193=>1000,31194=>1000,31195=>1000,31196=>1000,31197=>1000,31198=>1000,31199=>1000,31200=>1000,31201=>1000,31202=>1000,31203=>1000,31204=>1000,
-	31205=>1000,31206=>1000,31207=>1000,31208=>1000,31209=>1000,31210=>1000,31211=>1000,31212=>1000,31213=>1000,31214=>1000,31215=>1000,31216=>1000,31217=>1000,31218=>1000,31219=>1000,31220=>1000,
-	31221=>1000,31222=>1000,31223=>1000,31224=>1000,31225=>1000,31226=>1000,31227=>1000,31228=>1000,31229=>1000,31230=>1000,31231=>1000,31232=>1000,31233=>1000,31234=>1000,31235=>1000,31236=>1000,
-	31237=>1000,31238=>1000,31239=>1000,31240=>1000,31241=>1000,31242=>1000,31243=>1000,31244=>1000,31245=>1000,31246=>1000,31247=>1000,31248=>1000,31249=>1000,31250=>1000,31251=>1000,31252=>1000,
-	31253=>1000,31254=>1000,31255=>1000,31256=>1000,31257=>1000,31258=>1000,31259=>1000,31260=>1000,31261=>1000,31262=>1000,31263=>1000,31264=>1000,31265=>1000,31266=>1000,31267=>1000,31268=>1000,
-	31269=>1000,31270=>1000,31271=>1000,31272=>1000,31273=>1000,31274=>1000,31275=>1000,31276=>1000,31277=>1000,31278=>1000,31279=>1000,31280=>1000,31281=>1000,31282=>1000,31283=>1000,31284=>1000,
-	31285=>1000,31286=>1000,31287=>1000,31288=>1000,31289=>1000,31290=>1000,31291=>1000,31292=>1000,31293=>1000,31294=>1000,31295=>1000,31296=>1000,31297=>1000,31298=>1000,31299=>1000,31300=>1000,
-	31301=>1000,31302=>1000,31303=>1000,31304=>1000,31305=>1000,31306=>1000,31307=>1000,31308=>1000,31309=>1000,31310=>1000,31311=>1000,31312=>1000,31313=>1000,31314=>1000,31315=>1000,31316=>1000,
-	31317=>1000,31318=>1000,31319=>1000,31320=>1000,31321=>1000,31322=>1000,31323=>1000,31324=>1000,31325=>1000,31326=>1000,31327=>1000,31328=>1000,31329=>1000,31330=>1000,31331=>1000,31332=>1000,
-	31333=>1000,31334=>1000,31335=>1000,31336=>1000,31337=>1000,31338=>1000,31339=>1000,31340=>1000,31341=>1000,31342=>1000,31343=>1000,31344=>1000,31345=>1000,31346=>1000,31347=>1000,31348=>1000,
-	31349=>1000,31350=>1000,31351=>1000,31352=>1000,31353=>1000,31354=>1000,31355=>1000,31356=>1000,31357=>1000,31358=>1000,31359=>1000,31360=>1000,31361=>1000,31362=>1000,31363=>1000,31364=>1000,
-	31365=>1000,31366=>1000,31367=>1000,31368=>1000,31369=>1000,31370=>1000,31371=>1000,31372=>1000,31373=>1000,31374=>1000,31375=>1000,31376=>1000,31377=>1000,31378=>1000,31379=>1000,31380=>1000,
-	31381=>1000,31382=>1000,31383=>1000,31384=>1000,31385=>1000,31386=>1000,31387=>1000,31388=>1000,31389=>1000,31390=>1000,31391=>1000,31392=>1000,31393=>1000,31394=>1000,31395=>1000,31396=>1000,
-	31397=>1000,31398=>1000,31399=>1000,31400=>1000,31401=>1000,31402=>1000,31403=>1000,31404=>1000,31405=>1000,31406=>1000,31407=>1000,31408=>1000,31409=>1000,31410=>1000,31411=>1000,31412=>1000,
-	31413=>1000,31414=>1000,31415=>1000,31416=>1000,31417=>1000,31418=>1000,31419=>1000,31420=>1000,31421=>1000,31422=>1000,31423=>1000,31424=>1000,31425=>1000,31426=>1000,31427=>1000,31428=>1000,
-	31429=>1000,31430=>1000,31431=>1000,31432=>1000,31433=>1000,31434=>1000,31435=>1000,31436=>1000,31437=>1000,31438=>1000,31439=>1000,31440=>1000,31441=>1000,31442=>1000,31443=>1000,31444=>1000,
-	31445=>1000,31446=>1000,31447=>1000,31448=>1000,31449=>1000,31450=>1000,31451=>1000,31452=>1000,31453=>1000,31454=>1000,31455=>1000,31456=>1000,31457=>1000,31458=>1000,31459=>1000,31460=>1000,
-	31461=>1000,31462=>1000,31463=>1000,31464=>1000,31465=>1000,31466=>1000,31467=>1000,31468=>1000,31469=>1000,31470=>1000,31471=>1000,31472=>1000,31473=>1000,31474=>1000,31475=>1000,31476=>1000,
-	31477=>1000,31478=>1000,31479=>1000,31480=>1000,31481=>1000,31482=>1000,31483=>1000,31484=>1000,31485=>1000,31486=>1000,31487=>1000,31488=>1000,31489=>1000,31490=>1000,31491=>1000,31492=>1000,
-	31493=>1000,31494=>1000,31495=>1000,31496=>1000,31497=>1000,31498=>1000,31499=>1000,31500=>1000,31501=>1000,31502=>1000,31503=>1000,31504=>1000,31505=>1000,31506=>1000,31507=>1000,31508=>1000,
-	31509=>1000,31510=>1000,31511=>1000,31512=>1000,31513=>1000,31514=>1000,31515=>1000,31516=>1000,31517=>1000,31518=>1000,31519=>1000,31520=>1000,31521=>1000,31522=>1000,31523=>1000,31524=>1000,
-	31525=>1000,31526=>1000,31527=>1000,31528=>1000,31529=>1000,31530=>1000,31531=>1000,31532=>1000,31533=>1000,31534=>1000,31535=>1000,31536=>1000,31537=>1000,31538=>1000,31539=>1000,31540=>1000,
-	31541=>1000,31542=>1000,31543=>1000,31544=>1000,31545=>1000,31546=>1000,31547=>1000,31548=>1000,31549=>1000,31550=>1000,31551=>1000,31552=>1000,31553=>1000,31554=>1000,31555=>1000,31556=>1000,
-	31557=>1000,31558=>1000,31559=>1000,31560=>1000,31561=>1000,31562=>1000,31563=>1000,31564=>1000,31565=>1000,31566=>1000,31567=>1000,31568=>1000,31569=>1000,31570=>1000,31571=>1000,31572=>1000,
-	31573=>1000,31574=>1000,31575=>1000,31576=>1000,31577=>1000,31578=>1000,31579=>1000,31580=>1000,31581=>1000,31582=>1000,31583=>1000,31584=>1000,31585=>1000,31586=>1000,31587=>1000,31588=>1000,
-	31589=>1000,31590=>1000,31591=>1000,31592=>1000,31593=>1000,31594=>1000,31595=>1000,31596=>1000,31597=>1000,31598=>1000,31599=>1000,31600=>1000,31601=>1000,31602=>1000,31603=>1000,31604=>1000,
-	31605=>1000,31606=>1000,31607=>1000,31608=>1000,31609=>1000,31610=>1000,31611=>1000,31612=>1000,31613=>1000,31614=>1000,31615=>1000,31616=>1000,31617=>1000,31618=>1000,31619=>1000,31620=>1000,
-	31621=>1000,31622=>1000,31623=>1000,31624=>1000,31625=>1000,31626=>1000,31627=>1000,31628=>1000,31629=>1000,31630=>1000,31631=>1000,31632=>1000,31633=>1000,31634=>1000,31635=>1000,31636=>1000,
-	31637=>1000,31638=>1000,31639=>1000,31640=>1000,31641=>1000,31642=>1000,31643=>1000,31644=>1000,31645=>1000,31646=>1000,31647=>1000,31648=>1000,31649=>1000,31650=>1000,31651=>1000,31652=>1000,
-	31653=>1000,31654=>1000,31655=>1000,31656=>1000,31657=>1000,31658=>1000,31659=>1000,31660=>1000,31661=>1000,31662=>1000,31663=>1000,31664=>1000,31665=>1000,31666=>1000,31667=>1000,31668=>1000,
-	31669=>1000,31670=>1000,31671=>1000,31672=>1000,31673=>1000,31674=>1000,31675=>1000,31676=>1000,31677=>1000,31678=>1000,31679=>1000,31680=>1000,31681=>1000,31682=>1000,31683=>1000,31684=>1000,
-	31685=>1000,31686=>1000,31687=>1000,31688=>1000,31689=>1000,31690=>1000,31691=>1000,31692=>1000,31693=>1000,31694=>1000,31695=>1000,31696=>1000,31697=>1000,31698=>1000,31699=>1000,31700=>1000,
-	31701=>1000,31702=>1000,31703=>1000,31704=>1000,31705=>1000,31706=>1000,31707=>1000,31708=>1000,31709=>1000,31710=>1000,31711=>1000,31712=>1000,31713=>1000,31714=>1000,31715=>1000,31716=>1000,
-	31717=>1000,31718=>1000,31719=>1000,31720=>1000,31721=>1000,31722=>1000,31723=>1000,31724=>1000,31725=>1000,31726=>1000,31727=>1000,31728=>1000,31729=>1000,31730=>1000,31731=>1000,31732=>1000,
-	31733=>1000,31734=>1000,31735=>1000,31736=>1000,31737=>1000,31738=>1000,31739=>1000,31740=>1000,31741=>1000,31742=>1000,31743=>1000,31744=>1000,31745=>1000,31746=>1000,31747=>1000,31748=>1000,
-	31749=>1000,31750=>1000,31751=>1000,31752=>1000,31753=>1000,31754=>1000,31755=>1000,31756=>1000,31757=>1000,31758=>1000,31759=>1000,31760=>1000,31761=>1000,31762=>1000,31763=>1000,31764=>1000,
-	31765=>1000,31766=>1000,31767=>1000,31768=>1000,31769=>1000,31770=>1000,31771=>1000,31772=>1000,31773=>1000,31774=>1000,31775=>1000,31776=>1000,31777=>1000,31778=>1000,31779=>1000,31780=>1000,
-	31781=>1000,31782=>1000,31783=>1000,31784=>1000,31785=>1000,31786=>1000,31787=>1000,31788=>1000,31789=>1000,31790=>1000,31791=>1000,31792=>1000,31793=>1000,31794=>1000,31795=>1000,31796=>1000,
-	31797=>1000,31798=>1000,31799=>1000,31800=>1000,31801=>1000,31802=>1000,31803=>1000,31804=>1000,31805=>1000,31806=>1000,31807=>1000,31808=>1000,31809=>1000,31810=>1000,31811=>1000,31812=>1000,
-	31813=>1000,31814=>1000,31815=>1000,31816=>1000,31817=>1000,31818=>1000,31819=>1000,31820=>1000,31821=>1000,31822=>1000,31823=>1000,31824=>1000,31825=>1000,31826=>1000,31827=>1000,31828=>1000,
-	31829=>1000,31830=>1000,31831=>1000,31832=>1000,31833=>1000,31834=>1000,31835=>1000,31836=>1000,31837=>1000,31838=>1000,31839=>1000,31840=>1000,31841=>1000,31842=>1000,31843=>1000,31844=>1000,
-	31845=>1000,31846=>1000,31847=>1000,31848=>1000,31849=>1000,31850=>1000,31851=>1000,31852=>1000,31853=>1000,31854=>1000,31855=>1000,31856=>1000,31857=>1000,31858=>1000,31859=>1000,31860=>1000,
-	31861=>1000,31862=>1000,31863=>1000,31864=>1000,31865=>1000,31866=>1000,31867=>1000,31868=>1000,31869=>1000,31870=>1000,31871=>1000,31872=>1000,31873=>1000,31874=>1000,31875=>1000,31876=>1000,
-	31877=>1000,31878=>1000,31879=>1000,31880=>1000,31881=>1000,31882=>1000,31883=>1000,31884=>1000,31885=>1000,31886=>1000,31887=>1000,31888=>1000,31889=>1000,31890=>1000,31891=>1000,31892=>1000,
-	31893=>1000,31894=>1000,31895=>1000,31896=>1000,31897=>1000,31898=>1000,31899=>1000,31900=>1000,31901=>1000,31902=>1000,31903=>1000,31904=>1000,31905=>1000,31906=>1000,31907=>1000,31908=>1000,
-	31909=>1000,31910=>1000,31911=>1000,31912=>1000,31913=>1000,31914=>1000,31915=>1000,31916=>1000,31917=>1000,31918=>1000,31919=>1000,31920=>1000,31921=>1000,31922=>1000,31923=>1000,31924=>1000,
-	31925=>1000,31926=>1000,31927=>1000,31928=>1000,31929=>1000,31930=>1000,31931=>1000,31932=>1000,31933=>1000,31934=>1000,31935=>1000,31936=>1000,31937=>1000,31938=>1000,31939=>1000,31940=>1000,
-	31941=>1000,31942=>1000,31943=>1000,31944=>1000,31945=>1000,31946=>1000,31947=>1000,31948=>1000,31949=>1000,31950=>1000,31951=>1000,31952=>1000,31953=>1000,31954=>1000,31955=>1000,31956=>1000,
-	31957=>1000,31958=>1000,31959=>1000,31960=>1000,31961=>1000,31962=>1000,31963=>1000,31964=>1000,31965=>1000,31966=>1000,31967=>1000,31968=>1000,31969=>1000,31970=>1000,31971=>1000,31972=>1000,
-	31973=>1000,31974=>1000,31975=>1000,31976=>1000,31977=>1000,31978=>1000,31979=>1000,31980=>1000,31981=>1000,31982=>1000,31983=>1000,31984=>1000,31985=>1000,31986=>1000,31987=>1000,31988=>1000,
-	31989=>1000,31990=>1000,31991=>1000,31992=>1000,31993=>1000,31994=>1000,31995=>1000,31996=>1000,31997=>1000,31998=>1000,31999=>1000,32000=>1000,32001=>1000,32002=>1000,32003=>1000,32004=>1000,
-	32005=>1000,32006=>1000,32007=>1000,32008=>1000,32009=>1000,32010=>1000,32011=>1000,32012=>1000,32013=>1000,32014=>1000,32015=>1000,32016=>1000,32017=>1000,32018=>1000,32019=>1000,32020=>1000,
-	32021=>1000,32022=>1000,32023=>1000,32024=>1000,32025=>1000,32026=>1000,32027=>1000,32028=>1000,32029=>1000,32030=>1000,32031=>1000,32032=>1000,32033=>1000,32034=>1000,32035=>1000,32036=>1000,
-	32037=>1000,32038=>1000,32039=>1000,32040=>1000,32041=>1000,32042=>1000,32043=>1000,32044=>1000,32045=>1000,32046=>1000,32047=>1000,32048=>1000,32049=>1000,32050=>1000,32051=>1000,32052=>1000,
-	32053=>1000,32054=>1000,32055=>1000,32056=>1000,32057=>1000,32058=>1000,32059=>1000,32060=>1000,32061=>1000,32062=>1000,32063=>1000,32064=>1000,32065=>1000,32066=>1000,32067=>1000,32068=>1000,
-	32069=>1000,32070=>1000,32071=>1000,32072=>1000,32073=>1000,32074=>1000,32075=>1000,32076=>1000,32077=>1000,32078=>1000,32079=>1000,32080=>1000,32081=>1000,32082=>1000,32083=>1000,32084=>1000,
-	32085=>1000,32086=>1000,32087=>1000,32088=>1000,32089=>1000,32090=>1000,32091=>1000,32092=>1000,32093=>1000,32094=>1000,32095=>1000,32096=>1000,32097=>1000,32098=>1000,32099=>1000,32100=>1000,
-	32101=>1000,32102=>1000,32103=>1000,32104=>1000,32105=>1000,32106=>1000,32107=>1000,32108=>1000,32109=>1000,32110=>1000,32111=>1000,32112=>1000,32113=>1000,32114=>1000,32115=>1000,32116=>1000,
-	32117=>1000,32118=>1000,32119=>1000,32120=>1000,32121=>1000,32122=>1000,32123=>1000,32124=>1000,32125=>1000,32126=>1000,32127=>1000,32128=>1000,32129=>1000,32130=>1000,32131=>1000,32132=>1000,
-	32133=>1000,32134=>1000,32135=>1000,32136=>1000,32137=>1000,32138=>1000,32139=>1000,32140=>1000,32141=>1000,32142=>1000,32143=>1000,32144=>1000,32145=>1000,32146=>1000,32147=>1000,32148=>1000,
-	32149=>1000,32150=>1000,32151=>1000,32152=>1000,32153=>1000,32154=>1000,32155=>1000,32156=>1000,32157=>1000,32158=>1000,32159=>1000,32160=>1000,32161=>1000,32162=>1000,32163=>1000,32164=>1000,
-	32165=>1000,32166=>1000,32167=>1000,32168=>1000,32169=>1000,32170=>1000,32171=>1000,32172=>1000,32173=>1000,32174=>1000,32175=>1000,32176=>1000,32177=>1000,32178=>1000,32179=>1000,32180=>1000,
-	32181=>1000,32182=>1000,32183=>1000,32184=>1000,32185=>1000,32186=>1000,32187=>1000,32188=>1000,32189=>1000,32190=>1000,32191=>1000,32192=>1000,32193=>1000,32194=>1000,32195=>1000,32196=>1000,
-	32197=>1000,32198=>1000,32199=>1000,32200=>1000,32201=>1000,32202=>1000,32203=>1000,32204=>1000,32205=>1000,32206=>1000,32207=>1000,32208=>1000,32209=>1000,32210=>1000,32211=>1000,32212=>1000,
-	32213=>1000,32214=>1000,32215=>1000,32216=>1000,32217=>1000,32218=>1000,32219=>1000,32220=>1000,32221=>1000,32222=>1000,32223=>1000,32224=>1000,32225=>1000,32226=>1000,32227=>1000,32228=>1000,
-	32229=>1000,32230=>1000,32231=>1000,32232=>1000,32233=>1000,32234=>1000,32235=>1000,32236=>1000,32237=>1000,32238=>1000,32239=>1000,32240=>1000,32241=>1000,32242=>1000,32243=>1000,32244=>1000,
-	32245=>1000,32246=>1000,32247=>1000,32248=>1000,32249=>1000,32250=>1000,32251=>1000,32252=>1000,32253=>1000,32254=>1000,32255=>1000,32256=>1000,32257=>1000,32258=>1000,32259=>1000,32260=>1000,
-	32261=>1000,32262=>1000,32263=>1000,32264=>1000,32265=>1000,32266=>1000,32267=>1000,32268=>1000,32269=>1000,32270=>1000,32271=>1000,32272=>1000,32273=>1000,32274=>1000,32275=>1000,32276=>1000,
-	32277=>1000,32278=>1000,32279=>1000,32280=>1000,32281=>1000,32282=>1000,32283=>1000,32284=>1000,32285=>1000,32286=>1000,32287=>1000,32288=>1000,32289=>1000,32290=>1000,32291=>1000,32292=>1000,
-	32293=>1000,32294=>1000,32295=>1000,32296=>1000,32297=>1000,32298=>1000,32299=>1000,32300=>1000,32301=>1000,32302=>1000,32303=>1000,32304=>1000,32305=>1000,32306=>1000,32307=>1000,32308=>1000,
-	32309=>1000,32310=>1000,32311=>1000,32312=>1000,32313=>1000,32314=>1000,32315=>1000,32316=>1000,32317=>1000,32318=>1000,32319=>1000,32320=>1000,32321=>1000,32322=>1000,32323=>1000,32324=>1000,
-	32325=>1000,32326=>1000,32327=>1000,32328=>1000,32329=>1000,32330=>1000,32331=>1000,32332=>1000,32333=>1000,32334=>1000,32335=>1000,32336=>1000,32337=>1000,32338=>1000,32339=>1000,32340=>1000,
-	32341=>1000,32342=>1000,32343=>1000,32344=>1000,32345=>1000,32346=>1000,32347=>1000,32348=>1000,32349=>1000,32350=>1000,32351=>1000,32352=>1000,32353=>1000,32354=>1000,32355=>1000,32356=>1000,
-	32357=>1000,32358=>1000,32359=>1000,32360=>1000,32361=>1000,32362=>1000,32363=>1000,32364=>1000,32365=>1000,32366=>1000,32367=>1000,32368=>1000,32369=>1000,32370=>1000,32371=>1000,32372=>1000,
-	32373=>1000,32374=>1000,32375=>1000,32376=>1000,32377=>1000,32378=>1000,32379=>1000,32380=>1000,32381=>1000,32382=>1000,32383=>1000,32384=>1000,32385=>1000,32386=>1000,32387=>1000,32388=>1000,
-	32389=>1000,32390=>1000,32391=>1000,32392=>1000,32393=>1000,32394=>1000,32395=>1000,32396=>1000,32397=>1000,32398=>1000,32399=>1000,32400=>1000,32401=>1000,32402=>1000,32403=>1000,32404=>1000,
-	32405=>1000,32406=>1000,32407=>1000,32408=>1000,32409=>1000,32410=>1000,32411=>1000,32412=>1000,32413=>1000,32414=>1000,32415=>1000,32416=>1000,32417=>1000,32418=>1000,32419=>1000,32420=>1000,
-	32421=>1000,32422=>1000,32423=>1000,32424=>1000,32425=>1000,32426=>1000,32427=>1000,32428=>1000,32429=>1000,32430=>1000,32431=>1000,32432=>1000,32433=>1000,32434=>1000,32435=>1000,32436=>1000,
-	32437=>1000,32438=>1000,32439=>1000,32440=>1000,32441=>1000,32442=>1000,32443=>1000,32444=>1000,32445=>1000,32446=>1000,32447=>1000,32448=>1000,32449=>1000,32450=>1000,32451=>1000,32452=>1000,
-	32453=>1000,32454=>1000,32455=>1000,32456=>1000,32457=>1000,32458=>1000,32459=>1000,32460=>1000,32461=>1000,32462=>1000,32463=>1000,32464=>1000,32465=>1000,32466=>1000,32467=>1000,32468=>1000,
-	32469=>1000,32470=>1000,32471=>1000,32472=>1000,32473=>1000,32474=>1000,32475=>1000,32476=>1000,32477=>1000,32478=>1000,32479=>1000,32480=>1000,32481=>1000,32482=>1000,32483=>1000,32484=>1000,
-	32485=>1000,32486=>1000,32487=>1000,32488=>1000,32489=>1000,32490=>1000,32491=>1000,32492=>1000,32493=>1000,32494=>1000,32495=>1000,32496=>1000,32497=>1000,32498=>1000,32499=>1000,32500=>1000,
-	32501=>1000,32502=>1000,32503=>1000,32504=>1000,32505=>1000,32506=>1000,32507=>1000,32508=>1000,32509=>1000,32510=>1000,32511=>1000,32512=>1000,32513=>1000,32514=>1000,32515=>1000,32516=>1000,
-	32517=>1000,32518=>1000,32519=>1000,32520=>1000,32521=>1000,32522=>1000,32523=>1000,32524=>1000,32525=>1000,32526=>1000,32527=>1000,32528=>1000,32529=>1000,32530=>1000,32531=>1000,32532=>1000,
-	32533=>1000,32534=>1000,32535=>1000,32536=>1000,32537=>1000,32538=>1000,32539=>1000,32540=>1000,32541=>1000,32542=>1000,32543=>1000,32544=>1000,32545=>1000,32546=>1000,32547=>1000,32548=>1000,
-	32549=>1000,32550=>1000,32551=>1000,32552=>1000,32553=>1000,32554=>1000,32555=>1000,32556=>1000,32557=>1000,32558=>1000,32559=>1000,32560=>1000,32561=>1000,32562=>1000,32563=>1000,32564=>1000,
-	32565=>1000,32566=>1000,32567=>1000,32568=>1000,32569=>1000,32570=>1000,32571=>1000,32572=>1000,32573=>1000,32574=>1000,32575=>1000,32576=>1000,32577=>1000,32578=>1000,32579=>1000,32580=>1000,
-	32581=>1000,32582=>1000,32583=>1000,32584=>1000,32585=>1000,32586=>1000,32587=>1000,32588=>1000,32589=>1000,32590=>1000,32591=>1000,32592=>1000,32593=>1000,32594=>1000,32595=>1000,32596=>1000,
-	32597=>1000,32598=>1000,32599=>1000,32600=>1000,32601=>1000,32602=>1000,32603=>1000,32604=>1000,32605=>1000,32606=>1000,32607=>1000,32608=>1000,32609=>1000,32610=>1000,32611=>1000,32612=>1000,
-	32613=>1000,32614=>1000,32615=>1000,32616=>1000,32617=>1000,32618=>1000,32619=>1000,32620=>1000,32621=>1000,32622=>1000,32623=>1000,32624=>1000,32625=>1000,32626=>1000,32627=>1000,32628=>1000,
-	32629=>1000,32630=>1000,32631=>1000,32632=>1000,32633=>1000,32634=>1000,32635=>1000,32636=>1000,32637=>1000,32638=>1000,32639=>1000,32640=>1000,32641=>1000,32642=>1000,32643=>1000,32644=>1000,
-	32645=>1000,32646=>1000,32647=>1000,32648=>1000,32649=>1000,32650=>1000,32651=>1000,32652=>1000,32653=>1000,32654=>1000,32655=>1000,32656=>1000,32657=>1000,32658=>1000,32659=>1000,32660=>1000,
-	32661=>1000,32662=>1000,32663=>1000,32664=>1000,32665=>1000,32666=>1000,32667=>1000,32668=>1000,32669=>1000,32670=>1000,32671=>1000,32672=>1000,32673=>1000,32674=>1000,32675=>1000,32676=>1000,
-	32677=>1000,32678=>1000,32679=>1000,32680=>1000,32681=>1000,32682=>1000,32683=>1000,32684=>1000,32685=>1000,32686=>1000,32687=>1000,32688=>1000,32689=>1000,32690=>1000,32691=>1000,32692=>1000,
-	32693=>1000,32694=>1000,32695=>1000,32696=>1000,32697=>1000,32698=>1000,32699=>1000,32700=>1000,32701=>1000,32702=>1000,32703=>1000,32704=>1000,32705=>1000,32706=>1000,32707=>1000,32708=>1000,
-	32709=>1000,32710=>1000,32711=>1000,32712=>1000,32713=>1000,32714=>1000,32715=>1000,32716=>1000,32717=>1000,32718=>1000,32719=>1000,32720=>1000,32721=>1000,32722=>1000,32723=>1000,32724=>1000,
-	32725=>1000,32726=>1000,32727=>1000,32728=>1000,32729=>1000,32730=>1000,32731=>1000,32732=>1000,32733=>1000,32734=>1000,32735=>1000,32736=>1000,32737=>1000,32738=>1000,32739=>1000,32740=>1000,
-	32741=>1000,32742=>1000,32743=>1000,32744=>1000,32745=>1000,32746=>1000,32747=>1000,32748=>1000,32749=>1000,32750=>1000,32751=>1000,32752=>1000,32753=>1000,32754=>1000,32755=>1000,32756=>1000,
-	32757=>1000,32758=>1000,32759=>1000,32760=>1000,32761=>1000,32762=>1000,32763=>1000,32764=>1000,32765=>1000,32766=>1000,32767=>1000,32768=>1000,32769=>1000,32770=>1000,32771=>1000,32772=>1000,
-	32773=>1000,32774=>1000,32775=>1000,32776=>1000,32777=>1000,32778=>1000,32779=>1000,32780=>1000,32781=>1000,32782=>1000,32783=>1000,32784=>1000,32785=>1000,32786=>1000,32787=>1000,32788=>1000,
-	32789=>1000,32790=>1000,32791=>1000,32792=>1000,32793=>1000,32794=>1000,32795=>1000,32796=>1000,32797=>1000,32798=>1000,32799=>1000,32800=>1000,32801=>1000,32802=>1000,32803=>1000,32804=>1000,
-	32805=>1000,32806=>1000,32807=>1000,32808=>1000,32809=>1000,32810=>1000,32811=>1000,32812=>1000,32813=>1000,32814=>1000,32815=>1000,32816=>1000,32817=>1000,32818=>1000,32819=>1000,32820=>1000,
-	32821=>1000,32822=>1000,32823=>1000,32824=>1000,32825=>1000,32826=>1000,32827=>1000,32828=>1000,32829=>1000,32830=>1000,32831=>1000,32832=>1000,32833=>1000,32834=>1000,32835=>1000,32836=>1000,
-	32837=>1000,32838=>1000,32839=>1000,32840=>1000,32841=>1000,32842=>1000,32843=>1000,32844=>1000,32845=>1000,32846=>1000,32847=>1000,32848=>1000,32849=>1000,32850=>1000,32851=>1000,32852=>1000,
-	32853=>1000,32854=>1000,32855=>1000,32856=>1000,32857=>1000,32858=>1000,32859=>1000,32860=>1000,32861=>1000,32862=>1000,32863=>1000,32864=>1000,32865=>1000,32866=>1000,32867=>1000,32868=>1000,
-	32869=>1000,32870=>1000,32871=>1000,32872=>1000,32873=>1000,32874=>1000,32875=>1000,32876=>1000,32877=>1000,32878=>1000,32879=>1000,32880=>1000,32881=>1000,32882=>1000,32883=>1000,32884=>1000,
-	32885=>1000,32886=>1000,32887=>1000,32888=>1000,32889=>1000,32890=>1000,32891=>1000,32892=>1000,32893=>1000,32894=>1000,32895=>1000,32896=>1000,32897=>1000,32898=>1000,32899=>1000,32900=>1000,
-	32901=>1000,32902=>1000,32903=>1000,32904=>1000,32905=>1000,32906=>1000,32907=>1000,32908=>1000,32909=>1000,32910=>1000,32911=>1000,32912=>1000,32913=>1000,32914=>1000,32915=>1000,32916=>1000,
-	32917=>1000,32918=>1000,32919=>1000,32920=>1000,32921=>1000,32922=>1000,32923=>1000,32924=>1000,32925=>1000,32926=>1000,32927=>1000,32928=>1000,32929=>1000,32930=>1000,32931=>1000,32932=>1000,
-	32933=>1000,32934=>1000,32935=>1000,32936=>1000,32937=>1000,32938=>1000,32939=>1000,32940=>1000,32941=>1000,32942=>1000,32943=>1000,32944=>1000,32945=>1000,32946=>1000,32947=>1000,32948=>1000,
-	32949=>1000,32950=>1000,32951=>1000,32952=>1000,32953=>1000,32954=>1000,32955=>1000,32956=>1000,32957=>1000,32958=>1000,32959=>1000,32960=>1000,32961=>1000,32962=>1000,32963=>1000,32964=>1000,
-	32965=>1000,32966=>1000,32967=>1000,32968=>1000,32969=>1000,32970=>1000,32971=>1000,32972=>1000,32973=>1000,32974=>1000,32975=>1000,32976=>1000,32977=>1000,32978=>1000,32979=>1000,32980=>1000,
-	32981=>1000,32982=>1000,32983=>1000,32984=>1000,32985=>1000,32986=>1000,32987=>1000,32988=>1000,32989=>1000,32990=>1000,32991=>1000,32992=>1000,32993=>1000,32994=>1000,32995=>1000,32996=>1000,
-	32997=>1000,32998=>1000,32999=>1000,33000=>1000,33001=>1000,33002=>1000,33003=>1000,33004=>1000,33005=>1000,33006=>1000,33007=>1000,33008=>1000,33009=>1000,33010=>1000,33011=>1000,33012=>1000,
-	33013=>1000,33014=>1000,33015=>1000,33016=>1000,33017=>1000,33018=>1000,33019=>1000,33020=>1000,33021=>1000,33022=>1000,33023=>1000,33024=>1000,33025=>1000,33026=>1000,33027=>1000,33028=>1000,
-	33029=>1000,33030=>1000,33031=>1000,33032=>1000,33033=>1000,33034=>1000,33035=>1000,33036=>1000,33037=>1000,33038=>1000,33039=>1000,33040=>1000,33041=>1000,33042=>1000,33043=>1000,33044=>1000,
-	33045=>1000,33046=>1000,33047=>1000,33048=>1000,33049=>1000,33050=>1000,33051=>1000,33052=>1000,33053=>1000,33054=>1000,33055=>1000,33056=>1000,33057=>1000,33058=>1000,33059=>1000,33060=>1000,
-	33061=>1000,33062=>1000,33063=>1000,33064=>1000,33065=>1000,33066=>1000,33067=>1000,33068=>1000,33069=>1000,33070=>1000,33071=>1000,33072=>1000,33073=>1000,33074=>1000,33075=>1000,33076=>1000,
-	33077=>1000,33078=>1000,33079=>1000,33080=>1000,33081=>1000,33082=>1000,33083=>1000,33084=>1000,33085=>1000,33086=>1000,33087=>1000,33088=>1000,33089=>1000,33090=>1000,33091=>1000,33092=>1000,
-	33093=>1000,33094=>1000,33095=>1000,33096=>1000,33097=>1000,33098=>1000,33099=>1000,33100=>1000,33101=>1000,33102=>1000,33103=>1000,33104=>1000,33105=>1000,33106=>1000,33107=>1000,33108=>1000,
-	33109=>1000,33110=>1000,33111=>1000,33112=>1000,33113=>1000,33114=>1000,33115=>1000,33116=>1000,33117=>1000,33118=>1000,33119=>1000,33120=>1000,33121=>1000,33122=>1000,33123=>1000,33124=>1000,
-	33125=>1000,33126=>1000,33127=>1000,33128=>1000,33129=>1000,33130=>1000,33131=>1000,33132=>1000,33133=>1000,33134=>1000,33135=>1000,33136=>1000,33137=>1000,33138=>1000,33139=>1000,33140=>1000,
-	33141=>1000,33142=>1000,33143=>1000,33144=>1000,33145=>1000,33146=>1000,33147=>1000,33148=>1000,33149=>1000,33150=>1000,33151=>1000,33152=>1000,33153=>1000,33154=>1000,33155=>1000,33156=>1000,
-	33157=>1000,33158=>1000,33159=>1000,33160=>1000,33161=>1000,33162=>1000,33163=>1000,33164=>1000,33165=>1000,33166=>1000,33167=>1000,33168=>1000,33169=>1000,33170=>1000,33171=>1000,33172=>1000,
-	33173=>1000,33174=>1000,33175=>1000,33176=>1000,33177=>1000,33178=>1000,33179=>1000,33180=>1000,33181=>1000,33182=>1000,33183=>1000,33184=>1000,33185=>1000,33186=>1000,33187=>1000,33188=>1000,
-	33189=>1000,33190=>1000,33191=>1000,33192=>1000,33193=>1000,33194=>1000,33195=>1000,33196=>1000,33197=>1000,33198=>1000,33199=>1000,33200=>1000,33201=>1000,33202=>1000,33203=>1000,33204=>1000,
-	33205=>1000,33206=>1000,33207=>1000,33208=>1000,33209=>1000,33210=>1000,33211=>1000,33212=>1000,33213=>1000,33214=>1000,33215=>1000,33216=>1000,33217=>1000,33218=>1000,33219=>1000,33220=>1000,
-	33221=>1000,33222=>1000,33223=>1000,33224=>1000,33225=>1000,33226=>1000,33227=>1000,33228=>1000,33229=>1000,33230=>1000,33231=>1000,33232=>1000,33233=>1000,33234=>1000,33235=>1000,33236=>1000,
-	33237=>1000,33238=>1000,33239=>1000,33240=>1000,33241=>1000,33242=>1000,33243=>1000,33244=>1000,33245=>1000,33246=>1000,33247=>1000,33248=>1000,33249=>1000,33250=>1000,33251=>1000,33252=>1000,
-	33253=>1000,33254=>1000,33255=>1000,33256=>1000,33257=>1000,33258=>1000,33259=>1000,33260=>1000,33261=>1000,33262=>1000,33263=>1000,33264=>1000,33265=>1000,33266=>1000,33267=>1000,33268=>1000,
-	33269=>1000,33270=>1000,33271=>1000,33272=>1000,33273=>1000,33274=>1000,33275=>1000,33276=>1000,33277=>1000,33278=>1000,33279=>1000,33280=>1000,33281=>1000,33282=>1000,33283=>1000,33284=>1000,
-	33285=>1000,33286=>1000,33287=>1000,33288=>1000,33289=>1000,33290=>1000,33291=>1000,33292=>1000,33293=>1000,33294=>1000,33295=>1000,33296=>1000,33297=>1000,33298=>1000,33299=>1000,33300=>1000,
-	33301=>1000,33302=>1000,33303=>1000,33304=>1000,33305=>1000,33306=>1000,33307=>1000,33308=>1000,33309=>1000,33310=>1000,33311=>1000,33312=>1000,33313=>1000,33314=>1000,33315=>1000,33316=>1000,
-	33317=>1000,33318=>1000,33319=>1000,33320=>1000,33321=>1000,33322=>1000,33323=>1000,33324=>1000,33325=>1000,33326=>1000,33327=>1000,33328=>1000,33329=>1000,33330=>1000,33331=>1000,33332=>1000,
-	33333=>1000,33334=>1000,33335=>1000,33336=>1000,33337=>1000,33338=>1000,33339=>1000,33340=>1000,33341=>1000,33342=>1000,33343=>1000,33344=>1000,33345=>1000,33346=>1000,33347=>1000,33348=>1000,
-	33349=>1000,33350=>1000,33351=>1000,33352=>1000,33353=>1000,33354=>1000,33355=>1000,33356=>1000,33357=>1000,33358=>1000,33359=>1000,33360=>1000,33361=>1000,33362=>1000,33363=>1000,33364=>1000,
-	33365=>1000,33366=>1000,33367=>1000,33368=>1000,33369=>1000,33370=>1000,33371=>1000,33372=>1000,33373=>1000,33374=>1000,33375=>1000,33376=>1000,33377=>1000,33378=>1000,33379=>1000,33380=>1000,
-	33381=>1000,33382=>1000,33383=>1000,33384=>1000,33385=>1000,33386=>1000,33387=>1000,33388=>1000,33389=>1000,33390=>1000,33391=>1000,33392=>1000,33393=>1000,33394=>1000,33395=>1000,33396=>1000,
-	33397=>1000,33398=>1000,33399=>1000,33400=>1000,33401=>1000,33402=>1000,33403=>1000,33404=>1000,33405=>1000,33406=>1000,33407=>1000,33408=>1000,33409=>1000,33410=>1000,33411=>1000,33412=>1000,
-	33413=>1000,33414=>1000,33415=>1000,33416=>1000,33417=>1000,33418=>1000,33419=>1000,33420=>1000,33421=>1000,33422=>1000,33423=>1000,33424=>1000,33425=>1000,33426=>1000,33427=>1000,33428=>1000,
-	33429=>1000,33430=>1000,33431=>1000,33432=>1000,33433=>1000,33434=>1000,33435=>1000,33436=>1000,33437=>1000,33438=>1000,33439=>1000,33440=>1000,33441=>1000,33442=>1000,33443=>1000,33444=>1000,
-	33445=>1000,33446=>1000,33447=>1000,33448=>1000,33449=>1000,33450=>1000,33451=>1000,33452=>1000,33453=>1000,33454=>1000,33455=>1000,33456=>1000,33457=>1000,33458=>1000,33459=>1000,33460=>1000,
-	33461=>1000,33462=>1000,33463=>1000,33464=>1000,33465=>1000,33466=>1000,33467=>1000,33468=>1000,33469=>1000,33470=>1000,33471=>1000,33472=>1000,33473=>1000,33474=>1000,33475=>1000,33476=>1000,
-	33477=>1000,33478=>1000,33479=>1000,33480=>1000,33481=>1000,33482=>1000,33483=>1000,33484=>1000,33485=>1000,33486=>1000,33487=>1000,33488=>1000,33489=>1000,33490=>1000,33491=>1000,33492=>1000,
-	33493=>1000,33494=>1000,33495=>1000,33496=>1000,33497=>1000,33498=>1000,33499=>1000,33500=>1000,33501=>1000,33502=>1000,33503=>1000,33504=>1000,33505=>1000,33506=>1000,33507=>1000,33508=>1000,
-	33509=>1000,33510=>1000,33511=>1000,33512=>1000,33513=>1000,33514=>1000,33515=>1000,33516=>1000,33517=>1000,33518=>1000,33519=>1000,33520=>1000,33521=>1000,33522=>1000,33523=>1000,33524=>1000,
-	33525=>1000,33526=>1000,33527=>1000,33528=>1000,33529=>1000,33530=>1000,33531=>1000,33532=>1000,33533=>1000,33534=>1000,33535=>1000,33536=>1000,33537=>1000,33538=>1000,33539=>1000,33540=>1000,
-	33541=>1000,33542=>1000,33543=>1000,33544=>1000,33545=>1000,33546=>1000,33547=>1000,33548=>1000,33549=>1000,33550=>1000,33551=>1000,33552=>1000,33553=>1000,33554=>1000,33555=>1000,33556=>1000,
-	33557=>1000,33558=>1000,33559=>1000,33560=>1000,33561=>1000,33562=>1000,33563=>1000,33564=>1000,33565=>1000,33566=>1000,33567=>1000,33568=>1000,33569=>1000,33570=>1000,33571=>1000,33572=>1000,
-	33573=>1000,33574=>1000,33575=>1000,33576=>1000,33577=>1000,33578=>1000,33579=>1000,33580=>1000,33581=>1000,33582=>1000,33583=>1000,33584=>1000,33585=>1000,33586=>1000,33587=>1000,33588=>1000,
-	33589=>1000,33590=>1000,33591=>1000,33592=>1000,33593=>1000,33594=>1000,33595=>1000,33596=>1000,33597=>1000,33598=>1000,33599=>1000,33600=>1000,33601=>1000,33602=>1000,33603=>1000,33604=>1000,
-	33605=>1000,33606=>1000,33607=>1000,33608=>1000,33609=>1000,33610=>1000,33611=>1000,33612=>1000,33613=>1000,33614=>1000,33615=>1000,33616=>1000,33617=>1000,33618=>1000,33619=>1000,33620=>1000,
-	33621=>1000,33622=>1000,33623=>1000,33624=>1000,33625=>1000,33626=>1000,33627=>1000,33628=>1000,33629=>1000,33630=>1000,33631=>1000,33632=>1000,33633=>1000,33634=>1000,33635=>1000,33636=>1000,
-	33637=>1000,33638=>1000,33639=>1000,33640=>1000,33641=>1000,33642=>1000,33643=>1000,33644=>1000,33645=>1000,33646=>1000,33647=>1000,33648=>1000,33649=>1000,33650=>1000,33651=>1000,33652=>1000,
-	33653=>1000,33654=>1000,33655=>1000,33656=>1000,33657=>1000,33658=>1000,33659=>1000,33660=>1000,33661=>1000,33662=>1000,33663=>1000,33664=>1000,33665=>1000,33666=>1000,33667=>1000,33668=>1000,
-	33669=>1000,33670=>1000,33671=>1000,33672=>1000,33673=>1000,33674=>1000,33675=>1000,33676=>1000,33677=>1000,33678=>1000,33679=>1000,33680=>1000,33681=>1000,33682=>1000,33683=>1000,33684=>1000,
-	33685=>1000,33686=>1000,33687=>1000,33688=>1000,33689=>1000,33690=>1000,33691=>1000,33692=>1000,33693=>1000,33694=>1000,33695=>1000,33696=>1000,33697=>1000,33698=>1000,33699=>1000,33700=>1000,
-	33701=>1000,33702=>1000,33703=>1000,33704=>1000,33705=>1000,33706=>1000,33707=>1000,33708=>1000,33709=>1000,33710=>1000,33711=>1000,33712=>1000,33713=>1000,33714=>1000,33715=>1000,33716=>1000,
-	33717=>1000,33718=>1000,33719=>1000,33720=>1000,33721=>1000,33722=>1000,33723=>1000,33724=>1000,33725=>1000,33726=>1000,33727=>1000,33728=>1000,33729=>1000,33730=>1000,33731=>1000,33732=>1000,
-	33733=>1000,33734=>1000,33735=>1000,33736=>1000,33737=>1000,33738=>1000,33739=>1000,33740=>1000,33741=>1000,33742=>1000,33743=>1000,33744=>1000,33745=>1000,33746=>1000,33747=>1000,33748=>1000,
-	33749=>1000,33750=>1000,33751=>1000,33752=>1000,33753=>1000,33754=>1000,33755=>1000,33756=>1000,33757=>1000,33758=>1000,33759=>1000,33760=>1000,33761=>1000,33762=>1000,33763=>1000,33764=>1000,
-	33765=>1000,33766=>1000,33767=>1000,33768=>1000,33769=>1000,33770=>1000,33771=>1000,33772=>1000,33773=>1000,33774=>1000,33775=>1000,33776=>1000,33777=>1000,33778=>1000,33779=>1000,33780=>1000,
-	33781=>1000,33782=>1000,33783=>1000,33784=>1000,33785=>1000,33786=>1000,33787=>1000,33788=>1000,33789=>1000,33790=>1000,33791=>1000,33792=>1000,33793=>1000,33794=>1000,33795=>1000,33796=>1000,
-	33797=>1000,33798=>1000,33799=>1000,33800=>1000,33801=>1000,33802=>1000,33803=>1000,33804=>1000,33805=>1000,33806=>1000,33807=>1000,33808=>1000,33809=>1000,33810=>1000,33811=>1000,33812=>1000,
-	33813=>1000,33814=>1000,33815=>1000,33816=>1000,33817=>1000,33818=>1000,33819=>1000,33820=>1000,33821=>1000,33822=>1000,33823=>1000,33824=>1000,33825=>1000,33826=>1000,33827=>1000,33828=>1000,
-	33829=>1000,33830=>1000,33831=>1000,33832=>1000,33833=>1000,33834=>1000,33835=>1000,33836=>1000,33837=>1000,33838=>1000,33839=>1000,33840=>1000,33841=>1000,33842=>1000,33843=>1000,33844=>1000,
-	33845=>1000,33846=>1000,33847=>1000,33848=>1000,33849=>1000,33850=>1000,33851=>1000,33852=>1000,33853=>1000,33854=>1000,33855=>1000,33856=>1000,33857=>1000,33858=>1000,33859=>1000,33860=>1000,
-	33861=>1000,33862=>1000,33863=>1000,33864=>1000,33865=>1000,33866=>1000,33867=>1000,33868=>1000,33869=>1000,33870=>1000,33871=>1000,33872=>1000,33873=>1000,33874=>1000,33875=>1000,33876=>1000,
-	33877=>1000,33878=>1000,33879=>1000,33880=>1000,33881=>1000,33882=>1000,33883=>1000,33884=>1000,33885=>1000,33886=>1000,33887=>1000,33888=>1000,33889=>1000,33890=>1000,33891=>1000,33892=>1000,
-	33893=>1000,33894=>1000,33895=>1000,33896=>1000,33897=>1000,33898=>1000,33899=>1000,33900=>1000,33901=>1000,33902=>1000,33903=>1000,33904=>1000,33905=>1000,33906=>1000,33907=>1000,33908=>1000,
-	33909=>1000,33910=>1000,33911=>1000,33912=>1000,33913=>1000,33914=>1000,33915=>1000,33916=>1000,33917=>1000,33918=>1000,33919=>1000,33920=>1000,33921=>1000,33922=>1000,33923=>1000,33924=>1000,
-	33925=>1000,33926=>1000,33927=>1000,33928=>1000,33929=>1000,33930=>1000,33931=>1000,33932=>1000,33933=>1000,33934=>1000,33935=>1000,33936=>1000,33937=>1000,33938=>1000,33939=>1000,33940=>1000,
-	33941=>1000,33942=>1000,33943=>1000,33944=>1000,33945=>1000,33946=>1000,33947=>1000,33948=>1000,33949=>1000,33950=>1000,33951=>1000,33952=>1000,33953=>1000,33954=>1000,33955=>1000,33956=>1000,
-	33957=>1000,33958=>1000,33959=>1000,33960=>1000,33961=>1000,33962=>1000,33963=>1000,33964=>1000,33965=>1000,33966=>1000,33967=>1000,33968=>1000,33969=>1000,33970=>1000,33971=>1000,33972=>1000,
-	33973=>1000,33974=>1000,33975=>1000,33976=>1000,33977=>1000,33978=>1000,33979=>1000,33980=>1000,33981=>1000,33982=>1000,33983=>1000,33984=>1000,33985=>1000,33986=>1000,33987=>1000,33988=>1000,
-	33989=>1000,33990=>1000,33991=>1000,33992=>1000,33993=>1000,33994=>1000,33995=>1000,33996=>1000,33997=>1000,33998=>1000,33999=>1000,34000=>1000,34001=>1000,34002=>1000,34003=>1000,34004=>1000,
-	34005=>1000,34006=>1000,34007=>1000,34008=>1000,34009=>1000,34010=>1000,34011=>1000,34012=>1000,34013=>1000,34014=>1000,34015=>1000,34016=>1000,34017=>1000,34018=>1000,34019=>1000,34020=>1000,
-	34021=>1000,34022=>1000,34023=>1000,34024=>1000,34025=>1000,34026=>1000,34027=>1000,34028=>1000,34029=>1000,34030=>1000,34031=>1000,34032=>1000,34033=>1000,34034=>1000,34035=>1000,34036=>1000,
-	34037=>1000,34038=>1000,34039=>1000,34040=>1000,34041=>1000,34042=>1000,34043=>1000,34044=>1000,34045=>1000,34046=>1000,34047=>1000,34048=>1000,34049=>1000,34050=>1000,34051=>1000,34052=>1000,
-	34053=>1000,34054=>1000,34055=>1000,34056=>1000,34057=>1000,34058=>1000,34059=>1000,34060=>1000,34061=>1000,34062=>1000,34063=>1000,34064=>1000,34065=>1000,34066=>1000,34067=>1000,34068=>1000,
-	34069=>1000,34070=>1000,34071=>1000,34072=>1000,34073=>1000,34074=>1000,34075=>1000,34076=>1000,34077=>1000,34078=>1000,34079=>1000,34080=>1000,34081=>1000,34082=>1000,34083=>1000,34084=>1000,
-	34085=>1000,34086=>1000,34087=>1000,34088=>1000,34089=>1000,34090=>1000,34091=>1000,34092=>1000,34093=>1000,34094=>1000,34095=>1000,34096=>1000,34097=>1000,34098=>1000,34099=>1000,34100=>1000,
-	34101=>1000,34102=>1000,34103=>1000,34104=>1000,34105=>1000,34106=>1000,34107=>1000,34108=>1000,34109=>1000,34110=>1000,34111=>1000,34112=>1000,34113=>1000,34114=>1000,34115=>1000,34116=>1000,
-	34117=>1000,34118=>1000,34119=>1000,34120=>1000,34121=>1000,34122=>1000,34123=>1000,34124=>1000,34125=>1000,34126=>1000,34127=>1000,34128=>1000,34129=>1000,34130=>1000,34131=>1000,34132=>1000,
-	34133=>1000,34134=>1000,34135=>1000,34136=>1000,34137=>1000,34138=>1000,34139=>1000,34140=>1000,34141=>1000,34142=>1000,34143=>1000,34144=>1000,34145=>1000,34146=>1000,34147=>1000,34148=>1000,
-	34149=>1000,34150=>1000,34151=>1000,34152=>1000,34153=>1000,34154=>1000,34155=>1000,34156=>1000,34157=>1000,34158=>1000,34159=>1000,34160=>1000,34161=>1000,34162=>1000,34163=>1000,34164=>1000,
-	34165=>1000,34166=>1000,34167=>1000,34168=>1000,34169=>1000,34170=>1000,34171=>1000,34172=>1000,34173=>1000,34174=>1000,34175=>1000,34176=>1000,34177=>1000,34178=>1000,34179=>1000,34180=>1000,
-	34181=>1000,34182=>1000,34183=>1000,34184=>1000,34185=>1000,34186=>1000,34187=>1000,34188=>1000,34189=>1000,34190=>1000,34191=>1000,34192=>1000,34193=>1000,34194=>1000,34195=>1000,34196=>1000,
-	34197=>1000,34198=>1000,34199=>1000,34200=>1000,34201=>1000,34202=>1000,34203=>1000,34204=>1000,34205=>1000,34206=>1000,34207=>1000,34208=>1000,34209=>1000,34210=>1000,34211=>1000,34212=>1000,
-	34213=>1000,34214=>1000,34215=>1000,34216=>1000,34217=>1000,34218=>1000,34219=>1000,34220=>1000,34221=>1000,34222=>1000,34223=>1000,34224=>1000,34225=>1000,34226=>1000,34227=>1000,34228=>1000,
-	34229=>1000,34230=>1000,34231=>1000,34232=>1000,34233=>1000,34234=>1000,34235=>1000,34236=>1000,34237=>1000,34238=>1000,34239=>1000,34240=>1000,34241=>1000,34242=>1000,34243=>1000,34244=>1000,
-	34245=>1000,34246=>1000,34247=>1000,34248=>1000,34249=>1000,34250=>1000,34251=>1000,34252=>1000,34253=>1000,34254=>1000,34255=>1000,34256=>1000,34257=>1000,34258=>1000,34259=>1000,34260=>1000,
-	34261=>1000,34262=>1000,34263=>1000,34264=>1000,34265=>1000,34266=>1000,34267=>1000,34268=>1000,34269=>1000,34270=>1000,34271=>1000,34272=>1000,34273=>1000,34274=>1000,34275=>1000,34276=>1000,
-	34277=>1000,34278=>1000,34279=>1000,34280=>1000,34281=>1000,34282=>1000,34283=>1000,34284=>1000,34285=>1000,34286=>1000,34287=>1000,34288=>1000,34289=>1000,34290=>1000,34291=>1000,34292=>1000,
-	34293=>1000,34294=>1000,34295=>1000,34296=>1000,34297=>1000,34298=>1000,34299=>1000,34300=>1000,34301=>1000,34302=>1000,34303=>1000,34304=>1000,34305=>1000,34306=>1000,34307=>1000,34308=>1000,
-	34309=>1000,34310=>1000,34311=>1000,34312=>1000,34313=>1000,34314=>1000,34315=>1000,34316=>1000,34317=>1000,34318=>1000,34319=>1000,34320=>1000,34321=>1000,34322=>1000,34323=>1000,34324=>1000,
-	34325=>1000,34326=>1000,34327=>1000,34328=>1000,34329=>1000,34330=>1000,34331=>1000,34332=>1000,34333=>1000,34334=>1000,34335=>1000,34336=>1000,34337=>1000,34338=>1000,34339=>1000,34340=>1000,
-	34341=>1000,34342=>1000,34343=>1000,34344=>1000,34345=>1000,34346=>1000,34347=>1000,34348=>1000,34349=>1000,34350=>1000,34351=>1000,34352=>1000,34353=>1000,34354=>1000,34355=>1000,34356=>1000,
-	34357=>1000,34358=>1000,34359=>1000,34360=>1000,34361=>1000,34362=>1000,34363=>1000,34364=>1000,34365=>1000,34366=>1000,34367=>1000,34368=>1000,34369=>1000,34370=>1000,34371=>1000,34372=>1000,
-	34373=>1000,34374=>1000,34375=>1000,34376=>1000,34377=>1000,34378=>1000,34379=>1000,34380=>1000,34381=>1000,34382=>1000,34383=>1000,34384=>1000,34385=>1000,34386=>1000,34387=>1000,34388=>1000,
-	34389=>1000,34390=>1000,34391=>1000,34392=>1000,34393=>1000,34394=>1000,34395=>1000,34396=>1000,34397=>1000,34398=>1000,34399=>1000,34400=>1000,34401=>1000,34402=>1000,34403=>1000,34404=>1000,
-	34405=>1000,34406=>1000,34407=>1000,34408=>1000,34409=>1000,34410=>1000,34411=>1000,34412=>1000,34413=>1000,34414=>1000,34415=>1000,34416=>1000,34417=>1000,34418=>1000,34419=>1000,34420=>1000,
-	34421=>1000,34422=>1000,34423=>1000,34424=>1000,34425=>1000,34426=>1000,34427=>1000,34428=>1000,34429=>1000,34430=>1000,34431=>1000,34432=>1000,34433=>1000,34434=>1000,34435=>1000,34436=>1000,
-	34437=>1000,34438=>1000,34439=>1000,34440=>1000,34441=>1000,34442=>1000,34443=>1000,34444=>1000,34445=>1000,34446=>1000,34447=>1000,34448=>1000,34449=>1000,34450=>1000,34451=>1000,34452=>1000,
-	34453=>1000,34454=>1000,34455=>1000,34456=>1000,34457=>1000,34458=>1000,34459=>1000,34460=>1000,34461=>1000,34462=>1000,34463=>1000,34464=>1000,34465=>1000,34466=>1000,34467=>1000,34468=>1000,
-	34469=>1000,34470=>1000,34471=>1000,34472=>1000,34473=>1000,34474=>1000,34475=>1000,34476=>1000,34477=>1000,34478=>1000,34479=>1000,34480=>1000,34481=>1000,34482=>1000,34483=>1000,34484=>1000,
-	34485=>1000,34486=>1000,34487=>1000,34488=>1000,34489=>1000,34490=>1000,34491=>1000,34492=>1000,34493=>1000,34494=>1000,34495=>1000,34496=>1000,34497=>1000,34498=>1000,34499=>1000,34500=>1000,
-	34501=>1000,34502=>1000,34503=>1000,34504=>1000,34505=>1000,34506=>1000,34507=>1000,34508=>1000,34509=>1000,34510=>1000,34511=>1000,34512=>1000,34513=>1000,34514=>1000,34515=>1000,34516=>1000,
-	34517=>1000,34518=>1000,34519=>1000,34520=>1000,34521=>1000,34522=>1000,34523=>1000,34524=>1000,34525=>1000,34526=>1000,34527=>1000,34528=>1000,34529=>1000,34530=>1000,34531=>1000,34532=>1000,
-	34533=>1000,34534=>1000,34535=>1000,34536=>1000,34537=>1000,34538=>1000,34539=>1000,34540=>1000,34541=>1000,34542=>1000,34543=>1000,34544=>1000,34545=>1000,34546=>1000,34547=>1000,34548=>1000,
-	34549=>1000,34550=>1000,34551=>1000,34552=>1000,34553=>1000,34554=>1000,34555=>1000,34556=>1000,34557=>1000,34558=>1000,34559=>1000,34560=>1000,34561=>1000,34562=>1000,34563=>1000,34564=>1000,
-	34565=>1000,34566=>1000,34567=>1000,34568=>1000,34569=>1000,34570=>1000,34571=>1000,34572=>1000,34573=>1000,34574=>1000,34575=>1000,34576=>1000,34577=>1000,34578=>1000,34579=>1000,34580=>1000,
-	34581=>1000,34582=>1000,34583=>1000,34584=>1000,34585=>1000,34586=>1000,34587=>1000,34588=>1000,34589=>1000,34590=>1000,34591=>1000,34592=>1000,34593=>1000,34594=>1000,34595=>1000,34596=>1000,
-	34597=>1000,34598=>1000,34599=>1000,34600=>1000,34601=>1000,34602=>1000,34603=>1000,34604=>1000,34605=>1000,34606=>1000,34607=>1000,34608=>1000,34609=>1000,34610=>1000,34611=>1000,34612=>1000,
-	34613=>1000,34614=>1000,34615=>1000,34616=>1000,34617=>1000,34618=>1000,34619=>1000,34620=>1000,34621=>1000,34622=>1000,34623=>1000,34624=>1000,34625=>1000,34626=>1000,34627=>1000,34628=>1000,
-	34629=>1000,34630=>1000,34631=>1000,34632=>1000,34633=>1000,34634=>1000,34635=>1000,34636=>1000,34637=>1000,34638=>1000,34639=>1000,34640=>1000,34641=>1000,34642=>1000,34643=>1000,34644=>1000,
-	34645=>1000,34646=>1000,34647=>1000,34648=>1000,34649=>1000,34650=>1000,34651=>1000,34652=>1000,34653=>1000,34654=>1000,34655=>1000,34656=>1000,34657=>1000,34658=>1000,34659=>1000,34660=>1000,
-	34661=>1000,34662=>1000,34663=>1000,34664=>1000,34665=>1000,34666=>1000,34667=>1000,34668=>1000,34669=>1000,34670=>1000,34671=>1000,34672=>1000,34673=>1000,34674=>1000,34675=>1000,34676=>1000,
-	34677=>1000,34678=>1000,34679=>1000,34680=>1000,34681=>1000,34682=>1000,34683=>1000,34684=>1000,34685=>1000,34686=>1000,34687=>1000,34688=>1000,34689=>1000,34690=>1000,34691=>1000,34692=>1000,
-	34693=>1000,34694=>1000,34695=>1000,34696=>1000,34697=>1000,34698=>1000,34699=>1000,34700=>1000,34701=>1000,34702=>1000,34703=>1000,34704=>1000,34705=>1000,34706=>1000,34707=>1000,34708=>1000,
-	34709=>1000,34710=>1000,34711=>1000,34712=>1000,34713=>1000,34714=>1000,34715=>1000,34716=>1000,34717=>1000,34718=>1000,34719=>1000,34720=>1000,34721=>1000,34722=>1000,34723=>1000,34724=>1000,
-	34725=>1000,34726=>1000,34727=>1000,34728=>1000,34729=>1000,34730=>1000,34731=>1000,34732=>1000,34733=>1000,34734=>1000,34735=>1000,34736=>1000,34737=>1000,34738=>1000,34739=>1000,34740=>1000,
-	34741=>1000,34742=>1000,34743=>1000,34744=>1000,34745=>1000,34746=>1000,34747=>1000,34748=>1000,34749=>1000,34750=>1000,34751=>1000,34752=>1000,34753=>1000,34754=>1000,34755=>1000,34756=>1000,
-	34757=>1000,34758=>1000,34759=>1000,34760=>1000,34761=>1000,34762=>1000,34763=>1000,34764=>1000,34765=>1000,34766=>1000,34767=>1000,34768=>1000,34769=>1000,34770=>1000,34771=>1000,34772=>1000,
-	34773=>1000,34774=>1000,34775=>1000,34776=>1000,34777=>1000,34778=>1000,34779=>1000,34780=>1000,34781=>1000,34782=>1000,34783=>1000,34784=>1000,34785=>1000,34786=>1000,34787=>1000,34788=>1000,
-	34789=>1000,34790=>1000,34791=>1000,34792=>1000,34793=>1000,34794=>1000,34795=>1000,34796=>1000,34797=>1000,34798=>1000,34799=>1000,34800=>1000,34801=>1000,34802=>1000,34803=>1000,34804=>1000,
-	34805=>1000,34806=>1000,34807=>1000,34808=>1000,34809=>1000,34810=>1000,34811=>1000,34812=>1000,34813=>1000,34814=>1000,34815=>1000,34816=>1000,34817=>1000,34818=>1000,34819=>1000,34820=>1000,
-	34821=>1000,34822=>1000,34823=>1000,34824=>1000,34825=>1000,34826=>1000,34827=>1000,34828=>1000,34829=>1000,34830=>1000,34831=>1000,34832=>1000,34833=>1000,34834=>1000,34835=>1000,34836=>1000,
-	34837=>1000,34838=>1000,34839=>1000,34840=>1000,34841=>1000,34842=>1000,34843=>1000,34844=>1000,34845=>1000,34846=>1000,34847=>1000,34848=>1000,34849=>1000,34850=>1000,34851=>1000,34852=>1000,
-	34853=>1000,34854=>1000,34855=>1000,34856=>1000,34857=>1000,34858=>1000,34859=>1000,34860=>1000,34861=>1000,34862=>1000,34863=>1000,34864=>1000,34865=>1000,34866=>1000,34867=>1000,34868=>1000,
-	34869=>1000,34870=>1000,34871=>1000,34872=>1000,34873=>1000,34874=>1000,34875=>1000,34876=>1000,34877=>1000,34878=>1000,34879=>1000,34880=>1000,34881=>1000,34882=>1000,34883=>1000,34884=>1000,
-	34885=>1000,34886=>1000,34887=>1000,34888=>1000,34889=>1000,34890=>1000,34891=>1000,34892=>1000,34893=>1000,34894=>1000,34895=>1000,34896=>1000,34897=>1000,34898=>1000,34899=>1000,34900=>1000,
-	34901=>1000,34902=>1000,34903=>1000,34904=>1000,34905=>1000,34906=>1000,34907=>1000,34908=>1000,34909=>1000,34910=>1000,34911=>1000,34912=>1000,34913=>1000,34914=>1000,34915=>1000,34916=>1000,
-	34917=>1000,34918=>1000,34919=>1000,34920=>1000,34921=>1000,34922=>1000,34923=>1000,34924=>1000,34925=>1000,34926=>1000,34927=>1000,34928=>1000,34929=>1000,34930=>1000,34931=>1000,34932=>1000,
-	34933=>1000,34934=>1000,34935=>1000,34936=>1000,34937=>1000,34938=>1000,34939=>1000,34940=>1000,34941=>1000,34942=>1000,34943=>1000,34944=>1000,34945=>1000,34946=>1000,34947=>1000,34948=>1000,
-	34949=>1000,34950=>1000,34951=>1000,34952=>1000,34953=>1000,34954=>1000,34955=>1000,34956=>1000,34957=>1000,34958=>1000,34959=>1000,34960=>1000,34961=>1000,34962=>1000,34963=>1000,34964=>1000,
-	34965=>1000,34966=>1000,34967=>1000,34968=>1000,34969=>1000,34970=>1000,34971=>1000,34972=>1000,34973=>1000,34974=>1000,34975=>1000,34976=>1000,34977=>1000,34978=>1000,34979=>1000,34980=>1000,
-	34981=>1000,34982=>1000,34983=>1000,34984=>1000,34985=>1000,34986=>1000,34987=>1000,34988=>1000,34989=>1000,34990=>1000,34991=>1000,34992=>1000,34993=>1000,34994=>1000,34995=>1000,34996=>1000,
-	34997=>1000,34998=>1000,34999=>1000,35000=>1000,35001=>1000,35002=>1000,35003=>1000,35004=>1000,35005=>1000,35006=>1000,35007=>1000,35008=>1000,35009=>1000,35010=>1000,35011=>1000,35012=>1000,
-	35013=>1000,35014=>1000,35015=>1000,35016=>1000,35017=>1000,35018=>1000,35019=>1000,35020=>1000,35021=>1000,35022=>1000,35023=>1000,35024=>1000,35025=>1000,35026=>1000,35027=>1000,35028=>1000,
-	35029=>1000,35030=>1000,35031=>1000,35032=>1000,35033=>1000,35034=>1000,35035=>1000,35036=>1000,35037=>1000,35038=>1000,35039=>1000,35040=>1000,35041=>1000,35042=>1000,35043=>1000,35044=>1000,
-	35045=>1000,35046=>1000,35047=>1000,35048=>1000,35049=>1000,35050=>1000,35051=>1000,35052=>1000,35053=>1000,35054=>1000,35055=>1000,35056=>1000,35057=>1000,35058=>1000,35059=>1000,35060=>1000,
-	35061=>1000,35062=>1000,35063=>1000,35064=>1000,35065=>1000,35066=>1000,35067=>1000,35068=>1000,35069=>1000,35070=>1000,35071=>1000,35072=>1000,35073=>1000,35074=>1000,35075=>1000,35076=>1000,
-	35077=>1000,35078=>1000,35079=>1000,35080=>1000,35081=>1000,35082=>1000,35083=>1000,35084=>1000,35085=>1000,35086=>1000,35087=>1000,35088=>1000,35089=>1000,35090=>1000,35091=>1000,35092=>1000,
-	35093=>1000,35094=>1000,35095=>1000,35096=>1000,35097=>1000,35098=>1000,35099=>1000,35100=>1000,35101=>1000,35102=>1000,35103=>1000,35104=>1000,35105=>1000,35106=>1000,35107=>1000,35108=>1000,
-	35109=>1000,35110=>1000,35111=>1000,35112=>1000,35113=>1000,35114=>1000,35115=>1000,35116=>1000,35117=>1000,35118=>1000,35119=>1000,35120=>1000,35121=>1000,35122=>1000,35123=>1000,35124=>1000,
-	35125=>1000,35126=>1000,35127=>1000,35128=>1000,35129=>1000,35130=>1000,35131=>1000,35132=>1000,35133=>1000,35134=>1000,35135=>1000,35136=>1000,35137=>1000,35138=>1000,35139=>1000,35140=>1000,
-	35141=>1000,35142=>1000,35143=>1000,35144=>1000,35145=>1000,35146=>1000,35147=>1000,35148=>1000,35149=>1000,35150=>1000,35151=>1000,35152=>1000,35153=>1000,35154=>1000,35155=>1000,35156=>1000,
-	35157=>1000,35158=>1000,35159=>1000,35160=>1000,35161=>1000,35162=>1000,35163=>1000,35164=>1000,35165=>1000,35166=>1000,35167=>1000,35168=>1000,35169=>1000,35170=>1000,35171=>1000,35172=>1000,
-	35173=>1000,35174=>1000,35175=>1000,35176=>1000,35177=>1000,35178=>1000,35179=>1000,35180=>1000,35181=>1000,35182=>1000,35183=>1000,35184=>1000,35185=>1000,35186=>1000,35187=>1000,35188=>1000,
-	35189=>1000,35190=>1000,35191=>1000,35192=>1000,35193=>1000,35194=>1000,35195=>1000,35196=>1000,35197=>1000,35198=>1000,35199=>1000,35200=>1000,35201=>1000,35202=>1000,35203=>1000,35204=>1000,
-	35205=>1000,35206=>1000,35207=>1000,35208=>1000,35209=>1000,35210=>1000,35211=>1000,35212=>1000,35213=>1000,35214=>1000,35215=>1000,35216=>1000,35217=>1000,35218=>1000,35219=>1000,35220=>1000,
-	35221=>1000,35222=>1000,35223=>1000,35224=>1000,35225=>1000,35226=>1000,35227=>1000,35228=>1000,35229=>1000,35230=>1000,35231=>1000,35232=>1000,35233=>1000,35234=>1000,35235=>1000,35236=>1000,
-	35237=>1000,35238=>1000,35239=>1000,35240=>1000,35241=>1000,35242=>1000,35243=>1000,35244=>1000,35245=>1000,35246=>1000,35247=>1000,35248=>1000,35249=>1000,35250=>1000,35251=>1000,35252=>1000,
-	35253=>1000,35254=>1000,35255=>1000,35256=>1000,35257=>1000,35258=>1000,35259=>1000,35260=>1000,35261=>1000,35262=>1000,35263=>1000,35264=>1000,35265=>1000,35266=>1000,35267=>1000,35268=>1000,
-	35269=>1000,35270=>1000,35271=>1000,35272=>1000,35273=>1000,35274=>1000,35275=>1000,35276=>1000,35277=>1000,35278=>1000,35279=>1000,35280=>1000,35281=>1000,35282=>1000,35283=>1000,35284=>1000,
-	35285=>1000,35286=>1000,35287=>1000,35288=>1000,35289=>1000,35290=>1000,35291=>1000,35292=>1000,35293=>1000,35294=>1000,35295=>1000,35296=>1000,35297=>1000,35298=>1000,35299=>1000,35300=>1000,
-	35301=>1000,35302=>1000,35303=>1000,35304=>1000,35305=>1000,35306=>1000,35307=>1000,35308=>1000,35309=>1000,35310=>1000,35311=>1000,35312=>1000,35313=>1000,35314=>1000,35315=>1000,35316=>1000,
-	35317=>1000,35318=>1000,35319=>1000,35320=>1000,35321=>1000,35322=>1000,35323=>1000,35324=>1000,35325=>1000,35326=>1000,35327=>1000,35328=>1000,35329=>1000,35330=>1000,35331=>1000,35332=>1000,
-	35333=>1000,35334=>1000,35335=>1000,35336=>1000,35337=>1000,35338=>1000,35339=>1000,35340=>1000,35341=>1000,35342=>1000,35343=>1000,35344=>1000,35345=>1000,35346=>1000,35347=>1000,35348=>1000,
-	35349=>1000,35350=>1000,35351=>1000,35352=>1000,35353=>1000,35354=>1000,35355=>1000,35356=>1000,35357=>1000,35358=>1000,35359=>1000,35360=>1000,35361=>1000,35362=>1000,35363=>1000,35364=>1000,
-	35365=>1000,35366=>1000,35367=>1000,35368=>1000,35369=>1000,35370=>1000,35371=>1000,35372=>1000,35373=>1000,35374=>1000,35375=>1000,35376=>1000,35377=>1000,35378=>1000,35379=>1000,35380=>1000,
-	35381=>1000,35382=>1000,35383=>1000,35384=>1000,35385=>1000,35386=>1000,35387=>1000,35388=>1000,35389=>1000,35390=>1000,35391=>1000,35392=>1000,35393=>1000,35394=>1000,35395=>1000,35396=>1000,
-	35397=>1000,35398=>1000,35399=>1000,35400=>1000,35401=>1000,35402=>1000,35403=>1000,35404=>1000,35405=>1000,35406=>1000,35407=>1000,35408=>1000,35409=>1000,35410=>1000,35411=>1000,35412=>1000,
-	35413=>1000,35414=>1000,35415=>1000,35416=>1000,35417=>1000,35418=>1000,35419=>1000,35420=>1000,35421=>1000,35422=>1000,35423=>1000,35424=>1000,35425=>1000,35426=>1000,35427=>1000,35428=>1000,
-	35429=>1000,35430=>1000,35431=>1000,35432=>1000,35433=>1000,35434=>1000,35435=>1000,35436=>1000,35437=>1000,35438=>1000,35439=>1000,35440=>1000,35441=>1000,35442=>1000,35443=>1000,35444=>1000,
-	35445=>1000,35446=>1000,35447=>1000,35448=>1000,35449=>1000,35450=>1000,35451=>1000,35452=>1000,35453=>1000,35454=>1000,35455=>1000,35456=>1000,35457=>1000,35458=>1000,35459=>1000,35460=>1000,
-	35461=>1000,35462=>1000,35463=>1000,35464=>1000,35465=>1000,35466=>1000,35467=>1000,35468=>1000,35469=>1000,35470=>1000,35471=>1000,35472=>1000,35473=>1000,35474=>1000,35475=>1000,35476=>1000,
-	35477=>1000,35478=>1000,35479=>1000,35480=>1000,35481=>1000,35482=>1000,35483=>1000,35484=>1000,35485=>1000,35486=>1000,35487=>1000,35488=>1000,35489=>1000,35490=>1000,35491=>1000,35492=>1000,
-	35493=>1000,35494=>1000,35495=>1000,35496=>1000,35497=>1000,35498=>1000,35499=>1000,35500=>1000,35501=>1000,35502=>1000,35503=>1000,35504=>1000,35505=>1000,35506=>1000,35507=>1000,35508=>1000,
-	35509=>1000,35510=>1000,35511=>1000,35512=>1000,35513=>1000,35514=>1000,35515=>1000,35516=>1000,35517=>1000,35518=>1000,35519=>1000,35520=>1000,35521=>1000,35522=>1000,35523=>1000,35524=>1000,
-	35525=>1000,35526=>1000,35527=>1000,35528=>1000,35529=>1000,35530=>1000,35531=>1000,35532=>1000,35533=>1000,35534=>1000,35535=>1000,35536=>1000,35537=>1000,35538=>1000,35539=>1000,35540=>1000,
-	35541=>1000,35542=>1000,35543=>1000,35544=>1000,35545=>1000,35546=>1000,35547=>1000,35548=>1000,35549=>1000,35550=>1000,35551=>1000,35552=>1000,35553=>1000,35554=>1000,35555=>1000,35556=>1000,
-	35557=>1000,35558=>1000,35559=>1000,35560=>1000,35561=>1000,35562=>1000,35563=>1000,35564=>1000,35565=>1000,35566=>1000,35567=>1000,35568=>1000,35569=>1000,35570=>1000,35571=>1000,35572=>1000,
-	35573=>1000,35574=>1000,35575=>1000,35576=>1000,35577=>1000,35578=>1000,35579=>1000,35580=>1000,35581=>1000,35582=>1000,35583=>1000,35584=>1000,35585=>1000,35586=>1000,35587=>1000,35588=>1000,
-	35589=>1000,35590=>1000,35591=>1000,35592=>1000,35593=>1000,35594=>1000,35595=>1000,35596=>1000,35597=>1000,35598=>1000,35599=>1000,35600=>1000,35601=>1000,35602=>1000,35603=>1000,35604=>1000,
-	35605=>1000,35606=>1000,35607=>1000,35608=>1000,35609=>1000,35610=>1000,35611=>1000,35612=>1000,35613=>1000,35614=>1000,35615=>1000,35616=>1000,35617=>1000,35618=>1000,35619=>1000,35620=>1000,
-	35621=>1000,35622=>1000,35623=>1000,35624=>1000,35625=>1000,35626=>1000,35627=>1000,35628=>1000,35629=>1000,35630=>1000,35631=>1000,35632=>1000,35633=>1000,35634=>1000,35635=>1000,35636=>1000,
-	35637=>1000,35638=>1000,35639=>1000,35640=>1000,35641=>1000,35642=>1000,35643=>1000,35644=>1000,35645=>1000,35646=>1000,35647=>1000,35648=>1000,35649=>1000,35650=>1000,35651=>1000,35652=>1000,
-	35653=>1000,35654=>1000,35655=>1000,35656=>1000,35657=>1000,35658=>1000,35659=>1000,35660=>1000,35661=>1000,35662=>1000,35663=>1000,35664=>1000,35665=>1000,35666=>1000,35667=>1000,35668=>1000,
-	35669=>1000,35670=>1000,35671=>1000,35672=>1000,35673=>1000,35674=>1000,35675=>1000,35676=>1000,35677=>1000,35678=>1000,35679=>1000,35680=>1000,35681=>1000,35682=>1000,35683=>1000,35684=>1000,
-	35685=>1000,35686=>1000,35687=>1000,35688=>1000,35689=>1000,35690=>1000,35691=>1000,35692=>1000,35693=>1000,35694=>1000,35695=>1000,35696=>1000,35697=>1000,35698=>1000,35699=>1000,35700=>1000,
-	35701=>1000,35702=>1000,35703=>1000,35704=>1000,35705=>1000,35706=>1000,35707=>1000,35708=>1000,35709=>1000,35710=>1000,35711=>1000,35712=>1000,35713=>1000,35714=>1000,35715=>1000,35716=>1000,
-	35717=>1000,35718=>1000,35719=>1000,35720=>1000,35721=>1000,35722=>1000,35723=>1000,35724=>1000,35725=>1000,35726=>1000,35727=>1000,35728=>1000,35729=>1000,35730=>1000,35731=>1000,35732=>1000,
-	35733=>1000,35734=>1000,35735=>1000,35736=>1000,35737=>1000,35738=>1000,35739=>1000,35740=>1000,35741=>1000,35742=>1000,35743=>1000,35744=>1000,35745=>1000,35746=>1000,35747=>1000,35748=>1000,
-	35749=>1000,35750=>1000,35751=>1000,35752=>1000,35753=>1000,35754=>1000,35755=>1000,35756=>1000,35757=>1000,35758=>1000,35759=>1000,35760=>1000,35761=>1000,35762=>1000,35763=>1000,35764=>1000,
-	35765=>1000,35766=>1000,35767=>1000,35768=>1000,35769=>1000,35770=>1000,35771=>1000,35772=>1000,35773=>1000,35774=>1000,35775=>1000,35776=>1000,35777=>1000,35778=>1000,35779=>1000,35780=>1000,
-	35781=>1000,35782=>1000,35783=>1000,35784=>1000,35785=>1000,35786=>1000,35787=>1000,35788=>1000,35789=>1000,35790=>1000,35791=>1000,35792=>1000,35793=>1000,35794=>1000,35795=>1000,35796=>1000,
-	35797=>1000,35798=>1000,35799=>1000,35800=>1000,35801=>1000,35802=>1000,35803=>1000,35804=>1000,35805=>1000,35806=>1000,35807=>1000,35808=>1000,35809=>1000,35810=>1000,35811=>1000,35812=>1000,
-	35813=>1000,35814=>1000,35815=>1000,35816=>1000,35817=>1000,35818=>1000,35819=>1000,35820=>1000,35821=>1000,35822=>1000,35823=>1000,35824=>1000,35825=>1000,35826=>1000,35827=>1000,35828=>1000,
-	35829=>1000,35830=>1000,35831=>1000,35832=>1000,35833=>1000,35834=>1000,35835=>1000,35836=>1000,35837=>1000,35838=>1000,35839=>1000,35840=>1000,35841=>1000,35842=>1000,35843=>1000,35844=>1000,
-	35845=>1000,35846=>1000,35847=>1000,35848=>1000,35849=>1000,35850=>1000,35851=>1000,35852=>1000,35853=>1000,35854=>1000,35855=>1000,35856=>1000,35857=>1000,35858=>1000,35859=>1000,35860=>1000,
-	35861=>1000,35862=>1000,35863=>1000,35864=>1000,35865=>1000,35866=>1000,35867=>1000,35868=>1000,35869=>1000,35870=>1000,35871=>1000,35872=>1000,35873=>1000,35874=>1000,35875=>1000,35876=>1000,
-	35877=>1000,35878=>1000,35879=>1000,35880=>1000,35881=>1000,35882=>1000,35883=>1000,35884=>1000,35885=>1000,35886=>1000,35887=>1000,35888=>1000,35889=>1000,35890=>1000,35891=>1000,35892=>1000,
-	35893=>1000,35894=>1000,35895=>1000,35896=>1000,35897=>1000,35898=>1000,35899=>1000,35900=>1000,35901=>1000,35902=>1000,35903=>1000,35904=>1000,35905=>1000,35906=>1000,35907=>1000,35908=>1000,
-	35909=>1000,35910=>1000,35911=>1000,35912=>1000,35913=>1000,35914=>1000,35915=>1000,35916=>1000,35917=>1000,35918=>1000,35919=>1000,35920=>1000,35921=>1000,35922=>1000,35923=>1000,35924=>1000,
-	35925=>1000,35926=>1000,35927=>1000,35928=>1000,35929=>1000,35930=>1000,35931=>1000,35932=>1000,35933=>1000,35934=>1000,35935=>1000,35936=>1000,35937=>1000,35938=>1000,35939=>1000,35940=>1000,
-	35941=>1000,35942=>1000,35943=>1000,35944=>1000,35945=>1000,35946=>1000,35947=>1000,35948=>1000,35949=>1000,35950=>1000,35951=>1000,35952=>1000,35953=>1000,35954=>1000,35955=>1000,35956=>1000,
-	35957=>1000,35958=>1000,35959=>1000,35960=>1000,35961=>1000,35962=>1000,35963=>1000,35964=>1000,35965=>1000,35966=>1000,35967=>1000,35968=>1000,35969=>1000,35970=>1000,35971=>1000,35972=>1000,
-	35973=>1000,35974=>1000,35975=>1000,35976=>1000,35977=>1000,35978=>1000,35979=>1000,35980=>1000,35981=>1000,35982=>1000,35983=>1000,35984=>1000,35985=>1000,35986=>1000,35987=>1000,35988=>1000,
-	35989=>1000,35990=>1000,35991=>1000,35992=>1000,35993=>1000,35994=>1000,35995=>1000,35996=>1000,35997=>1000,35998=>1000,35999=>1000,36000=>1000,36001=>1000,36002=>1000,36003=>1000,36004=>1000,
-	36005=>1000,36006=>1000,36007=>1000,36008=>1000,36009=>1000,36010=>1000,36011=>1000,36012=>1000,36013=>1000,36014=>1000,36015=>1000,36016=>1000,36017=>1000,36018=>1000,36019=>1000,36020=>1000,
-	36021=>1000,36022=>1000,36023=>1000,36024=>1000,36025=>1000,36026=>1000,36027=>1000,36028=>1000,36029=>1000,36030=>1000,36031=>1000,36032=>1000,36033=>1000,36034=>1000,36035=>1000,36036=>1000,
-	36037=>1000,36038=>1000,36039=>1000,36040=>1000,36041=>1000,36042=>1000,36043=>1000,36044=>1000,36045=>1000,36046=>1000,36047=>1000,36048=>1000,36049=>1000,36050=>1000,36051=>1000,36052=>1000,
-	36053=>1000,36054=>1000,36055=>1000,36056=>1000,36057=>1000,36058=>1000,36059=>1000,36060=>1000,36061=>1000,36062=>1000,36063=>1000,36064=>1000,36065=>1000,36066=>1000,36067=>1000,36068=>1000,
-	36069=>1000,36070=>1000,36071=>1000,36072=>1000,36073=>1000,36074=>1000,36075=>1000,36076=>1000,36077=>1000,36078=>1000,36079=>1000,36080=>1000,36081=>1000,36082=>1000,36083=>1000,36084=>1000,
-	36085=>1000,36086=>1000,36087=>1000,36088=>1000,36089=>1000,36090=>1000,36091=>1000,36092=>1000,36093=>1000,36094=>1000,36095=>1000,36096=>1000,36097=>1000,36098=>1000,36099=>1000,36100=>1000,
-	36101=>1000,36102=>1000,36103=>1000,36104=>1000,36105=>1000,36106=>1000,36107=>1000,36108=>1000,36109=>1000,36110=>1000,36111=>1000,36112=>1000,36113=>1000,36114=>1000,36115=>1000,36116=>1000,
-	36117=>1000,36118=>1000,36119=>1000,36120=>1000,36121=>1000,36122=>1000,36123=>1000,36124=>1000,36125=>1000,36126=>1000,36127=>1000,36128=>1000,36129=>1000,36130=>1000,36131=>1000,36132=>1000,
-	36133=>1000,36134=>1000,36135=>1000,36136=>1000,36137=>1000,36138=>1000,36139=>1000,36140=>1000,36141=>1000,36142=>1000,36143=>1000,36144=>1000,36145=>1000,36146=>1000,36147=>1000,36148=>1000,
-	36149=>1000,36150=>1000,36151=>1000,36152=>1000,36153=>1000,36154=>1000,36155=>1000,36156=>1000,36157=>1000,36158=>1000,36159=>1000,36160=>1000,36161=>1000,36162=>1000,36163=>1000,36164=>1000,
-	36165=>1000,36166=>1000,36167=>1000,36168=>1000,36169=>1000,36170=>1000,36171=>1000,36172=>1000,36173=>1000,36174=>1000,36175=>1000,36176=>1000,36177=>1000,36178=>1000,36179=>1000,36180=>1000,
-	36181=>1000,36182=>1000,36183=>1000,36184=>1000,36185=>1000,36186=>1000,36187=>1000,36188=>1000,36189=>1000,36190=>1000,36191=>1000,36192=>1000,36193=>1000,36194=>1000,36195=>1000,36196=>1000,
-	36197=>1000,36198=>1000,36199=>1000,36200=>1000,36201=>1000,36202=>1000,36203=>1000,36204=>1000,36205=>1000,36206=>1000,36207=>1000,36208=>1000,36209=>1000,36210=>1000,36211=>1000,36212=>1000,
-	36213=>1000,36214=>1000,36215=>1000,36216=>1000,36217=>1000,36218=>1000,36219=>1000,36220=>1000,36221=>1000,36222=>1000,36223=>1000,36224=>1000,36225=>1000,36226=>1000,36227=>1000,36228=>1000,
-	36229=>1000,36230=>1000,36231=>1000,36232=>1000,36233=>1000,36234=>1000,36235=>1000,36236=>1000,36237=>1000,36238=>1000,36239=>1000,36240=>1000,36241=>1000,36242=>1000,36243=>1000,36244=>1000,
-	36245=>1000,36246=>1000,36247=>1000,36248=>1000,36249=>1000,36250=>1000,36251=>1000,36252=>1000,36253=>1000,36254=>1000,36255=>1000,36256=>1000,36257=>1000,36258=>1000,36259=>1000,36260=>1000,
-	36261=>1000,36262=>1000,36263=>1000,36264=>1000,36265=>1000,36266=>1000,36267=>1000,36268=>1000,36269=>1000,36270=>1000,36271=>1000,36272=>1000,36273=>1000,36274=>1000,36275=>1000,36276=>1000,
-	36277=>1000,36278=>1000,36279=>1000,36280=>1000,36281=>1000,36282=>1000,36283=>1000,36284=>1000,36285=>1000,36286=>1000,36287=>1000,36288=>1000,36289=>1000,36290=>1000,36291=>1000,36292=>1000,
-	36293=>1000,36294=>1000,36295=>1000,36296=>1000,36297=>1000,36298=>1000,36299=>1000,36300=>1000,36301=>1000,36302=>1000,36303=>1000,36304=>1000,36305=>1000,36306=>1000,36307=>1000,36308=>1000,
-	36309=>1000,36310=>1000,36311=>1000,36312=>1000,36313=>1000,36314=>1000,36315=>1000,36316=>1000,36317=>1000,36318=>1000,36319=>1000,36320=>1000,36321=>1000,36322=>1000,36323=>1000,36324=>1000,
-	36325=>1000,36326=>1000,36327=>1000,36328=>1000,36329=>1000,36330=>1000,36331=>1000,36332=>1000,36333=>1000,36334=>1000,36335=>1000,36336=>1000,36337=>1000,36338=>1000,36339=>1000,36340=>1000,
-	36341=>1000,36342=>1000,36343=>1000,36344=>1000,36345=>1000,36346=>1000,36347=>1000,36348=>1000,36349=>1000,36350=>1000,36351=>1000,36352=>1000,36353=>1000,36354=>1000,36355=>1000,36356=>1000,
-	36357=>1000,36358=>1000,36359=>1000,36360=>1000,36361=>1000,36362=>1000,36363=>1000,36364=>1000,36365=>1000,36366=>1000,36367=>1000,36368=>1000,36369=>1000,36370=>1000,36371=>1000,36372=>1000,
-	36373=>1000,36374=>1000,36375=>1000,36376=>1000,36377=>1000,36378=>1000,36379=>1000,36380=>1000,36381=>1000,36382=>1000,36383=>1000,36384=>1000,36385=>1000,36386=>1000,36387=>1000,36388=>1000,
-	36389=>1000,36390=>1000,36391=>1000,36392=>1000,36393=>1000,36394=>1000,36395=>1000,36396=>1000,36397=>1000,36398=>1000,36399=>1000,36400=>1000,36401=>1000,36402=>1000,36403=>1000,36404=>1000,
-	36405=>1000,36406=>1000,36407=>1000,36408=>1000,36409=>1000,36410=>1000,36411=>1000,36412=>1000,36413=>1000,36414=>1000,36415=>1000,36416=>1000,36417=>1000,36418=>1000,36419=>1000,36420=>1000,
-	36421=>1000,36422=>1000,36423=>1000,36424=>1000,36425=>1000,36426=>1000,36427=>1000,36428=>1000,36429=>1000,36430=>1000,36431=>1000,36432=>1000,36433=>1000,36434=>1000,36435=>1000,36436=>1000,
-	36437=>1000,36438=>1000,36439=>1000,36440=>1000,36441=>1000,36442=>1000,36443=>1000,36444=>1000,36445=>1000,36446=>1000,36447=>1000,36448=>1000,36449=>1000,36450=>1000,36451=>1000,36452=>1000,
-	36453=>1000,36454=>1000,36455=>1000,36456=>1000,36457=>1000,36458=>1000,36459=>1000,36460=>1000,36461=>1000,36462=>1000,36463=>1000,36464=>1000,36465=>1000,36466=>1000,36467=>1000,36468=>1000,
-	36469=>1000,36470=>1000,36471=>1000,36472=>1000,36473=>1000,36474=>1000,36475=>1000,36476=>1000,36477=>1000,36478=>1000,36479=>1000,36480=>1000,36481=>1000,36482=>1000,36483=>1000,36484=>1000,
-	36485=>1000,36486=>1000,36487=>1000,36488=>1000,36489=>1000,36490=>1000,36491=>1000,36492=>1000,36493=>1000,36494=>1000,36495=>1000,36496=>1000,36497=>1000,36498=>1000,36499=>1000,36500=>1000,
-	36501=>1000,36502=>1000,36503=>1000,36504=>1000,36505=>1000,36506=>1000,36507=>1000,36508=>1000,36509=>1000,36510=>1000,36511=>1000,36512=>1000,36513=>1000,36514=>1000,36515=>1000,36516=>1000,
-	36517=>1000,36518=>1000,36519=>1000,36520=>1000,36521=>1000,36522=>1000,36523=>1000,36524=>1000,36525=>1000,36526=>1000,36527=>1000,36528=>1000,36529=>1000,36530=>1000,36531=>1000,36532=>1000,
-	36533=>1000,36534=>1000,36535=>1000,36536=>1000,36537=>1000,36538=>1000,36539=>1000,36540=>1000,36541=>1000,36542=>1000,36543=>1000,36544=>1000,36545=>1000,36546=>1000,36547=>1000,36548=>1000,
-	36549=>1000,36550=>1000,36551=>1000,36552=>1000,36553=>1000,36554=>1000,36555=>1000,36556=>1000,36557=>1000,36558=>1000,36559=>1000,36560=>1000,36561=>1000,36562=>1000,36563=>1000,36564=>1000,
-	36565=>1000,36566=>1000,36567=>1000,36568=>1000,36569=>1000,36570=>1000,36571=>1000,36572=>1000,36573=>1000,36574=>1000,36575=>1000,36576=>1000,36577=>1000,36578=>1000,36579=>1000,36580=>1000,
-	36581=>1000,36582=>1000,36583=>1000,36584=>1000,36585=>1000,36586=>1000,36587=>1000,36588=>1000,36589=>1000,36590=>1000,36591=>1000,36592=>1000,36593=>1000,36594=>1000,36595=>1000,36596=>1000,
-	36597=>1000,36598=>1000,36599=>1000,36600=>1000,36601=>1000,36602=>1000,36603=>1000,36604=>1000,36605=>1000,36606=>1000,36607=>1000,36608=>1000,36609=>1000,36610=>1000,36611=>1000,36612=>1000,
-	36613=>1000,36614=>1000,36615=>1000,36616=>1000,36617=>1000,36618=>1000,36619=>1000,36620=>1000,36621=>1000,36622=>1000,36623=>1000,36624=>1000,36625=>1000,36626=>1000,36627=>1000,36628=>1000,
-	36629=>1000,36630=>1000,36631=>1000,36632=>1000,36633=>1000,36634=>1000,36635=>1000,36636=>1000,36637=>1000,36638=>1000,36639=>1000,36640=>1000,36641=>1000,36642=>1000,36643=>1000,36644=>1000,
-	36645=>1000,36646=>1000,36647=>1000,36648=>1000,36649=>1000,36650=>1000,36651=>1000,36652=>1000,36653=>1000,36654=>1000,36655=>1000,36656=>1000,36657=>1000,36658=>1000,36659=>1000,36660=>1000,
-	36661=>1000,36662=>1000,36663=>1000,36664=>1000,36665=>1000,36666=>1000,36667=>1000,36668=>1000,36669=>1000,36670=>1000,36671=>1000,36672=>1000,36673=>1000,36674=>1000,36675=>1000,36676=>1000,
-	36677=>1000,36678=>1000,36679=>1000,36680=>1000,36681=>1000,36682=>1000,36683=>1000,36684=>1000,36685=>1000,36686=>1000,36687=>1000,36688=>1000,36689=>1000,36690=>1000,36691=>1000,36692=>1000,
-	36693=>1000,36694=>1000,36695=>1000,36696=>1000,36697=>1000,36698=>1000,36699=>1000,36700=>1000,36701=>1000,36702=>1000,36703=>1000,36704=>1000,36705=>1000,36706=>1000,36707=>1000,36708=>1000,
-	36709=>1000,36710=>1000,36711=>1000,36712=>1000,36713=>1000,36714=>1000,36715=>1000,36716=>1000,36717=>1000,36718=>1000,36719=>1000,36720=>1000,36721=>1000,36722=>1000,36723=>1000,36724=>1000,
-	36725=>1000,36726=>1000,36727=>1000,36728=>1000,36729=>1000,36730=>1000,36731=>1000,36732=>1000,36733=>1000,36734=>1000,36735=>1000,36736=>1000,36737=>1000,36738=>1000,36739=>1000,36740=>1000,
-	36741=>1000,36742=>1000,36743=>1000,36744=>1000,36745=>1000,36746=>1000,36747=>1000,36748=>1000,36749=>1000,36750=>1000,36751=>1000,36752=>1000,36753=>1000,36754=>1000,36755=>1000,36756=>1000,
-	36757=>1000,36758=>1000,36759=>1000,36760=>1000,36761=>1000,36762=>1000,36763=>1000,36764=>1000,36765=>1000,36766=>1000,36767=>1000,36768=>1000,36769=>1000,36770=>1000,36771=>1000,36772=>1000,
-	36773=>1000,36774=>1000,36775=>1000,36776=>1000,36777=>1000,36778=>1000,36779=>1000,36780=>1000,36781=>1000,36782=>1000,36783=>1000,36784=>1000,36785=>1000,36786=>1000,36787=>1000,36788=>1000,
-	36789=>1000,36790=>1000,36791=>1000,36792=>1000,36793=>1000,36794=>1000,36795=>1000,36796=>1000,36797=>1000,36798=>1000,36799=>1000,36800=>1000,36801=>1000,36802=>1000,36803=>1000,36804=>1000,
-	36805=>1000,36806=>1000,36807=>1000,36808=>1000,36809=>1000,36810=>1000,36811=>1000,36812=>1000,36813=>1000,36814=>1000,36815=>1000,36816=>1000,36817=>1000,36818=>1000,36819=>1000,36820=>1000,
-	36821=>1000,36822=>1000,36823=>1000,36824=>1000,36825=>1000,36826=>1000,36827=>1000,36828=>1000,36829=>1000,36830=>1000,36831=>1000,36832=>1000,36833=>1000,36834=>1000,36835=>1000,36836=>1000,
-	36837=>1000,36838=>1000,36839=>1000,36840=>1000,36841=>1000,36842=>1000,36843=>1000,36844=>1000,36845=>1000,36846=>1000,36847=>1000,36848=>1000,36849=>1000,36850=>1000,36851=>1000,36852=>1000,
-	36853=>1000,36854=>1000,36855=>1000,36856=>1000,36857=>1000,36858=>1000,36859=>1000,36860=>1000,36861=>1000,36862=>1000,36863=>1000,36864=>1000,36865=>1000,36866=>1000,36867=>1000,36868=>1000,
-	36869=>1000,36870=>1000,36871=>1000,36872=>1000,36873=>1000,36874=>1000,36875=>1000,36876=>1000,36877=>1000,36878=>1000,36879=>1000,36880=>1000,36881=>1000,36882=>1000,36883=>1000,36884=>1000,
-	36885=>1000,36886=>1000,36887=>1000,36888=>1000,36889=>1000,36890=>1000,36891=>1000,36892=>1000,36893=>1000,36894=>1000,36895=>1000,36896=>1000,36897=>1000,36898=>1000,36899=>1000,36900=>1000,
-	36901=>1000,36902=>1000,36903=>1000,36904=>1000,36905=>1000,36906=>1000,36907=>1000,36908=>1000,36909=>1000,36910=>1000,36911=>1000,36912=>1000,36913=>1000,36914=>1000,36915=>1000,36916=>1000,
-	36917=>1000,36918=>1000,36919=>1000,36920=>1000,36921=>1000,36922=>1000,36923=>1000,36924=>1000,36925=>1000,36926=>1000,36927=>1000,36928=>1000,36929=>1000,36930=>1000,36931=>1000,36932=>1000,
-	36933=>1000,36934=>1000,36935=>1000,36936=>1000,36937=>1000,36938=>1000,36939=>1000,36940=>1000,36941=>1000,36942=>1000,36943=>1000,36944=>1000,36945=>1000,36946=>1000,36947=>1000,36948=>1000,
-	36949=>1000,36950=>1000,36951=>1000,36952=>1000,36953=>1000,36954=>1000,36955=>1000,36956=>1000,36957=>1000,36958=>1000,36959=>1000,36960=>1000,36961=>1000,36962=>1000,36963=>1000,36964=>1000,
-	36965=>1000,36966=>1000,36967=>1000,36968=>1000,36969=>1000,36970=>1000,36971=>1000,36972=>1000,36973=>1000,36974=>1000,36975=>1000,36976=>1000,36977=>1000,36978=>1000,36979=>1000,36980=>1000,
-	36981=>1000,36982=>1000,36983=>1000,36984=>1000,36985=>1000,36986=>1000,36987=>1000,36988=>1000,36989=>1000,36990=>1000,36991=>1000,36992=>1000,36993=>1000,36994=>1000,36995=>1000,36996=>1000,
-	36997=>1000,36998=>1000,36999=>1000,37000=>1000,37001=>1000,37002=>1000,37003=>1000,37004=>1000,37005=>1000,37006=>1000,37007=>1000,37008=>1000,37009=>1000,37010=>1000,37011=>1000,37012=>1000,
-	37013=>1000,37014=>1000,37015=>1000,37016=>1000,37017=>1000,37018=>1000,37019=>1000,37020=>1000,37021=>1000,37022=>1000,37023=>1000,37024=>1000,37025=>1000,37026=>1000,37027=>1000,37028=>1000,
-	37029=>1000,37030=>1000,37031=>1000,37032=>1000,37033=>1000,37034=>1000,37035=>1000,37036=>1000,37037=>1000,37038=>1000,37039=>1000,37040=>1000,37041=>1000,37042=>1000,37043=>1000,37044=>1000,
-	37045=>1000,37046=>1000,37047=>1000,37048=>1000,37049=>1000,37050=>1000,37051=>1000,37052=>1000,37053=>1000,37054=>1000,37055=>1000,37056=>1000,37057=>1000,37058=>1000,37059=>1000,37060=>1000,
-	37061=>1000,37062=>1000,37063=>1000,37064=>1000,37065=>1000,37066=>1000,37067=>1000,37068=>1000,37069=>1000,37070=>1000,37071=>1000,37072=>1000,37073=>1000,37074=>1000,37075=>1000,37076=>1000,
-	37077=>1000,37078=>1000,37079=>1000,37080=>1000,37081=>1000,37082=>1000,37083=>1000,37084=>1000,37085=>1000,37086=>1000,37087=>1000,37088=>1000,37089=>1000,37090=>1000,37091=>1000,37092=>1000,
-	37093=>1000,37094=>1000,37095=>1000,37096=>1000,37097=>1000,37098=>1000,37099=>1000,37100=>1000,37101=>1000,37102=>1000,37103=>1000,37104=>1000,37105=>1000,37106=>1000,37107=>1000,37108=>1000,
-	37109=>1000,37110=>1000,37111=>1000,37112=>1000,37113=>1000,37114=>1000,37115=>1000,37116=>1000,37117=>1000,37118=>1000,37119=>1000,37120=>1000,37121=>1000,37122=>1000,37123=>1000,37124=>1000,
-	37125=>1000,37126=>1000,37127=>1000,37128=>1000,37129=>1000,37130=>1000,37131=>1000,37132=>1000,37133=>1000,37134=>1000,37135=>1000,37136=>1000,37137=>1000,37138=>1000,37139=>1000,37140=>1000,
-	37141=>1000,37142=>1000,37143=>1000,37144=>1000,37145=>1000,37146=>1000,37147=>1000,37148=>1000,37149=>1000,37150=>1000,37151=>1000,37152=>1000,37153=>1000,37154=>1000,37155=>1000,37156=>1000,
-	37157=>1000,37158=>1000,37159=>1000,37160=>1000,37161=>1000,37162=>1000,37163=>1000,37164=>1000,37165=>1000,37166=>1000,37167=>1000,37168=>1000,37169=>1000,37170=>1000,37171=>1000,37172=>1000,
-	37173=>1000,37174=>1000,37175=>1000,37176=>1000,37177=>1000,37178=>1000,37179=>1000,37180=>1000,37181=>1000,37182=>1000,37183=>1000,37184=>1000,37185=>1000,37186=>1000,37187=>1000,37188=>1000,
-	37189=>1000,37190=>1000,37191=>1000,37192=>1000,37193=>1000,37194=>1000,37195=>1000,37196=>1000,37197=>1000,37198=>1000,37199=>1000,37200=>1000,37201=>1000,37202=>1000,37203=>1000,37204=>1000,
-	37205=>1000,37206=>1000,37207=>1000,37208=>1000,37209=>1000,37210=>1000,37211=>1000,37212=>1000,37213=>1000,37214=>1000,37215=>1000,37216=>1000,37217=>1000,37218=>1000,37219=>1000,37220=>1000,
-	37221=>1000,37222=>1000,37223=>1000,37224=>1000,37225=>1000,37226=>1000,37227=>1000,37228=>1000,37229=>1000,37230=>1000,37231=>1000,37232=>1000,37233=>1000,37234=>1000,37235=>1000,37236=>1000,
-	37237=>1000,37238=>1000,37239=>1000,37240=>1000,37241=>1000,37242=>1000,37243=>1000,37244=>1000,37245=>1000,37246=>1000,37247=>1000,37248=>1000,37249=>1000,37250=>1000,37251=>1000,37252=>1000,
-	37253=>1000,37254=>1000,37255=>1000,37256=>1000,37257=>1000,37258=>1000,37259=>1000,37260=>1000,37261=>1000,37262=>1000,37263=>1000,37264=>1000,37265=>1000,37266=>1000,37267=>1000,37268=>1000,
-	37269=>1000,37270=>1000,37271=>1000,37272=>1000,37273=>1000,37274=>1000,37275=>1000,37276=>1000,37277=>1000,37278=>1000,37279=>1000,37280=>1000,37281=>1000,37282=>1000,37283=>1000,37284=>1000,
-	37285=>1000,37286=>1000,37287=>1000,37288=>1000,37289=>1000,37290=>1000,37291=>1000,37292=>1000,37293=>1000,37294=>1000,37295=>1000,37296=>1000,37297=>1000,37298=>1000,37299=>1000,37300=>1000,
-	37301=>1000,37302=>1000,37303=>1000,37304=>1000,37305=>1000,37306=>1000,37307=>1000,37308=>1000,37309=>1000,37310=>1000,37311=>1000,37312=>1000,37313=>1000,37314=>1000,37315=>1000,37316=>1000,
-	37317=>1000,37318=>1000,37319=>1000,37320=>1000,37321=>1000,37322=>1000,37323=>1000,37324=>1000,37325=>1000,37326=>1000,37327=>1000,37328=>1000,37329=>1000,37330=>1000,37331=>1000,37332=>1000,
-	37333=>1000,37334=>1000,37335=>1000,37336=>1000,37337=>1000,37338=>1000,37339=>1000,37340=>1000,37341=>1000,37342=>1000,37343=>1000,37344=>1000,37345=>1000,37346=>1000,37347=>1000,37348=>1000,
-	37349=>1000,37350=>1000,37351=>1000,37352=>1000,37353=>1000,37354=>1000,37355=>1000,37356=>1000,37357=>1000,37358=>1000,37359=>1000,37360=>1000,37361=>1000,37362=>1000,37363=>1000,37364=>1000,
-	37365=>1000,37366=>1000,37367=>1000,37368=>1000,37369=>1000,37370=>1000,37371=>1000,37372=>1000,37373=>1000,37374=>1000,37375=>1000,37376=>1000,37377=>1000,37378=>1000,37379=>1000,37380=>1000,
-	37381=>1000,37382=>1000,37383=>1000,37384=>1000,37385=>1000,37386=>1000,37387=>1000,37388=>1000,37389=>1000,37390=>1000,37391=>1000,37392=>1000,37393=>1000,37394=>1000,37395=>1000,37396=>1000,
-	37397=>1000,37398=>1000,37399=>1000,37400=>1000,37401=>1000,37402=>1000,37403=>1000,37404=>1000,37405=>1000,37406=>1000,37407=>1000,37408=>1000,37409=>1000,37410=>1000,37411=>1000,37412=>1000,
-	37413=>1000,37414=>1000,37415=>1000,37416=>1000,37417=>1000,37418=>1000,37419=>1000,37420=>1000,37421=>1000,37422=>1000,37423=>1000,37424=>1000,37425=>1000,37426=>1000,37427=>1000,37428=>1000,
-	37429=>1000,37430=>1000,37431=>1000,37432=>1000,37433=>1000,37434=>1000,37435=>1000,37436=>1000,37437=>1000,37438=>1000,37439=>1000,37440=>1000,37441=>1000,37442=>1000,37443=>1000,37444=>1000,
-	37445=>1000,37446=>1000,37447=>1000,37448=>1000,37449=>1000,37450=>1000,37451=>1000,37452=>1000,37453=>1000,37454=>1000,37455=>1000,37456=>1000,37457=>1000,37458=>1000,37459=>1000,37460=>1000,
-	37461=>1000,37462=>1000,37463=>1000,37464=>1000,37465=>1000,37466=>1000,37467=>1000,37468=>1000,37469=>1000,37470=>1000,37471=>1000,37472=>1000,37473=>1000,37474=>1000,37475=>1000,37476=>1000,
-	37477=>1000,37478=>1000,37479=>1000,37480=>1000,37481=>1000,37482=>1000,37483=>1000,37484=>1000,37485=>1000,37486=>1000,37487=>1000,37488=>1000,37489=>1000,37490=>1000,37491=>1000,37492=>1000,
-	37493=>1000,37494=>1000,37495=>1000,37496=>1000,37497=>1000,37498=>1000,37499=>1000,37500=>1000,37501=>1000,37502=>1000,37503=>1000,37504=>1000,37505=>1000,37506=>1000,37507=>1000,37508=>1000,
-	37509=>1000,37510=>1000,37511=>1000,37512=>1000,37513=>1000,37514=>1000,37515=>1000,37516=>1000,37517=>1000,37518=>1000,37519=>1000,37520=>1000,37521=>1000,37522=>1000,37523=>1000,37524=>1000,
-	37525=>1000,37526=>1000,37527=>1000,37528=>1000,37529=>1000,37530=>1000,37531=>1000,37532=>1000,37533=>1000,37534=>1000,37535=>1000,37536=>1000,37537=>1000,37538=>1000,37539=>1000,37540=>1000,
-	37541=>1000,37542=>1000,37543=>1000,37544=>1000,37545=>1000,37546=>1000,37547=>1000,37548=>1000,37549=>1000,37550=>1000,37551=>1000,37552=>1000,37553=>1000,37554=>1000,37555=>1000,37556=>1000,
-	37557=>1000,37558=>1000,37559=>1000,37560=>1000,37561=>1000,37562=>1000,37563=>1000,37564=>1000,37565=>1000,37566=>1000,37567=>1000,37568=>1000,37569=>1000,37570=>1000,37571=>1000,37572=>1000,
-	37573=>1000,37574=>1000,37575=>1000,37576=>1000,37577=>1000,37578=>1000,37579=>1000,37580=>1000,37581=>1000,37582=>1000,37583=>1000,37584=>1000,37585=>1000,37586=>1000,37587=>1000,37588=>1000,
-	37589=>1000,37590=>1000,37591=>1000,37592=>1000,37593=>1000,37594=>1000,37595=>1000,37596=>1000,37597=>1000,37598=>1000,37599=>1000,37600=>1000,37601=>1000,37602=>1000,37603=>1000,37604=>1000,
-	37605=>1000,37606=>1000,37607=>1000,37608=>1000,37609=>1000,37610=>1000,37611=>1000,37612=>1000,37613=>1000,37614=>1000,37615=>1000,37616=>1000,37617=>1000,37618=>1000,37619=>1000,37620=>1000,
-	37621=>1000,37622=>1000,37623=>1000,37624=>1000,37625=>1000,37626=>1000,37627=>1000,37628=>1000,37629=>1000,37630=>1000,37631=>1000,37632=>1000,37633=>1000,37634=>1000,37635=>1000,37636=>1000,
-	37637=>1000,37638=>1000,37639=>1000,37640=>1000,37641=>1000,37642=>1000,37643=>1000,37644=>1000,37645=>1000,37646=>1000,37647=>1000,37648=>1000,37649=>1000,37650=>1000,37651=>1000,37652=>1000,
-	37653=>1000,37654=>1000,37655=>1000,37656=>1000,37657=>1000,37658=>1000,37659=>1000,37660=>1000,37661=>1000,37662=>1000,37663=>1000,37664=>1000,37665=>1000,37666=>1000,37667=>1000,37668=>1000,
-	37669=>1000,37670=>1000,37671=>1000,37672=>1000,37673=>1000,37674=>1000,37675=>1000,37676=>1000,37677=>1000,37678=>1000,37679=>1000,37680=>1000,37681=>1000,37682=>1000,37683=>1000,37684=>1000,
-	37685=>1000,37686=>1000,37687=>1000,37688=>1000,37689=>1000,37690=>1000,37691=>1000,37692=>1000,37693=>1000,37694=>1000,37695=>1000,37696=>1000,37697=>1000,37698=>1000,37699=>1000,37700=>1000,
-	37701=>1000,37702=>1000,37703=>1000,37704=>1000,37705=>1000,37706=>1000,37707=>1000,37708=>1000,37709=>1000,37710=>1000,37711=>1000,37712=>1000,37713=>1000,37714=>1000,37715=>1000,37716=>1000,
-	37717=>1000,37718=>1000,37719=>1000,37720=>1000,37721=>1000,37722=>1000,37723=>1000,37724=>1000,37725=>1000,37726=>1000,37727=>1000,37728=>1000,37729=>1000,37730=>1000,37731=>1000,37732=>1000,
-	37733=>1000,37734=>1000,37735=>1000,37736=>1000,37737=>1000,37738=>1000,37739=>1000,37740=>1000,37741=>1000,37742=>1000,37743=>1000,37744=>1000,37745=>1000,37746=>1000,37747=>1000,37748=>1000,
-	37749=>1000,37750=>1000,37751=>1000,37752=>1000,37753=>1000,37754=>1000,37755=>1000,37756=>1000,37757=>1000,37758=>1000,37759=>1000,37760=>1000,37761=>1000,37762=>1000,37763=>1000,37764=>1000,
-	37765=>1000,37766=>1000,37767=>1000,37768=>1000,37769=>1000,37770=>1000,37771=>1000,37772=>1000,37773=>1000,37774=>1000,37775=>1000,37776=>1000,37777=>1000,37778=>1000,37779=>1000,37780=>1000,
-	37781=>1000,37782=>1000,37783=>1000,37784=>1000,37785=>1000,37786=>1000,37787=>1000,37788=>1000,37789=>1000,37790=>1000,37791=>1000,37792=>1000,37793=>1000,37794=>1000,37795=>1000,37796=>1000,
-	37797=>1000,37798=>1000,37799=>1000,37800=>1000,37801=>1000,37802=>1000,37803=>1000,37804=>1000,37805=>1000,37806=>1000,37807=>1000,37808=>1000,37809=>1000,37810=>1000,37811=>1000,37812=>1000,
-	37813=>1000,37814=>1000,37815=>1000,37816=>1000,37817=>1000,37818=>1000,37819=>1000,37820=>1000,37821=>1000,37822=>1000,37823=>1000,37824=>1000,37825=>1000,37826=>1000,37827=>1000,37828=>1000,
-	37829=>1000,37830=>1000,37831=>1000,37832=>1000,37833=>1000,37834=>1000,37835=>1000,37836=>1000,37837=>1000,37838=>1000,37839=>1000,37840=>1000,37841=>1000,37842=>1000,37843=>1000,37844=>1000,
-	37845=>1000,37846=>1000,37847=>1000,37848=>1000,37849=>1000,37850=>1000,37851=>1000,37852=>1000,37853=>1000,37854=>1000,37855=>1000,37856=>1000,37857=>1000,37858=>1000,37859=>1000,37860=>1000,
-	37861=>1000,37862=>1000,37863=>1000,37864=>1000,37865=>1000,37866=>1000,37867=>1000,37868=>1000,37869=>1000,37870=>1000,37871=>1000,37872=>1000,37873=>1000,37874=>1000,37875=>1000,37876=>1000,
-	37877=>1000,37878=>1000,37879=>1000,37880=>1000,37881=>1000,37882=>1000,37883=>1000,37884=>1000,37885=>1000,37886=>1000,37887=>1000,37888=>1000,37889=>1000,37890=>1000,37891=>1000,37892=>1000,
-	37893=>1000,37894=>1000,37895=>1000,37896=>1000,37897=>1000,37898=>1000,37899=>1000,37900=>1000,37901=>1000,37902=>1000,37903=>1000,37904=>1000,37905=>1000,37906=>1000,37907=>1000,37908=>1000,
-	37909=>1000,37910=>1000,37911=>1000,37912=>1000,37913=>1000,37914=>1000,37915=>1000,37916=>1000,37917=>1000,37918=>1000,37919=>1000,37920=>1000,37921=>1000,37922=>1000,37923=>1000,37924=>1000,
-	37925=>1000,37926=>1000,37927=>998,37928=>1000,37929=>1000,37930=>1000,37931=>1000,37932=>1000,37933=>1000,37934=>1000,37935=>1000,37936=>1000,37937=>1000,37938=>1000,37939=>1000,37940=>1000,
-	37941=>1000,37942=>1000,37943=>1000,37944=>1000,37945=>1000,37946=>1000,37947=>1000,37948=>1000,37949=>1000,37950=>1000,37951=>1000,37952=>1000,37953=>1000,37954=>1000,37955=>1000,37956=>1000,
-	37957=>1000,37958=>1000,37959=>1000,37960=>1000,37961=>1000,37962=>1000,37963=>1000,37964=>1000,37965=>1000,37966=>1000,37967=>1000,37968=>1000,37969=>1000,37970=>1000,37971=>1000,37972=>1000,
-	37973=>1000,37974=>1000,37975=>1000,37976=>1000,37977=>1000,37978=>1000,37979=>1000,37980=>1000,37981=>1000,37982=>1000,37983=>1000,37984=>1000,37985=>1000,37986=>1000,37987=>1000,37988=>1000,
-	37989=>1000,37990=>1000,37991=>1000,37992=>1000,37993=>1000,37994=>1000,37995=>1000,37996=>1000,37997=>1000,37998=>1000,37999=>1000,38000=>1000,38001=>1000,38002=>1000,38003=>1000,38004=>1000,
-	38005=>1000,38006=>1000,38007=>1000,38008=>1000,38009=>1000,38010=>1000,38011=>1000,38012=>1000,38013=>1000,38014=>1000,38015=>1000,38016=>1000,38017=>1000,38018=>1000,38019=>1000,38020=>1000,
-	38021=>1000,38022=>1000,38023=>1000,38024=>1000,38025=>1000,38026=>1000,38027=>1000,38028=>1000,38029=>1000,38030=>1000,38031=>1000,38032=>1000,38033=>1000,38034=>1000,38035=>1000,38036=>1000,
-	38037=>1000,38038=>1000,38039=>1000,38040=>1000,38041=>1000,38042=>1000,38043=>1000,38044=>1000,38045=>1000,38046=>1000,38047=>1000,38048=>1000,38049=>1000,38050=>1000,38051=>1000,38052=>1000,
-	38053=>1000,38054=>1000,38055=>1000,38056=>1000,38057=>1000,38058=>1000,38059=>1000,38060=>1000,38061=>1000,38062=>1000,38063=>1000,38064=>1000,38065=>1000,38066=>1000,38067=>1000,38068=>1000,
-	38069=>1000,38070=>1000,38071=>1000,38072=>1000,38073=>1000,38074=>1000,38075=>1000,38076=>1000,38077=>1000,38078=>1000,38079=>1000,38080=>1000,38081=>1000,38082=>1000,38083=>1000,38084=>1000,
-	38085=>1000,38086=>1000,38087=>1000,38088=>1000,38089=>1000,38090=>1000,38091=>1000,38092=>1000,38093=>1000,38094=>1000,38095=>1000,38096=>1000,38097=>1000,38098=>1000,38099=>1000,38100=>1000,
-	38101=>1000,38102=>1000,38103=>1000,38104=>1000,38105=>1000,38106=>1000,38107=>1000,38108=>1000,38109=>1000,38110=>1000,38111=>1000,38112=>1000,38113=>1000,38114=>1000,38115=>1000,38116=>1000,
-	38117=>1000,38118=>1000,38119=>1000,38120=>1000,38121=>1000,38122=>1000,38123=>1000,38124=>1000,38125=>1000,38126=>1000,38127=>1000,38128=>1000,38129=>1000,38130=>1000,38131=>1000,38132=>1000,
-	38133=>1000,38134=>1000,38135=>1000,38136=>1000,38137=>1000,38138=>1000,38139=>1000,38140=>1000,38141=>1000,38142=>1000,38143=>1000,38144=>1000,38145=>1000,38146=>1000,38147=>1000,38148=>1000,
-	38149=>1000,38150=>1000,38151=>1000,38152=>1000,38153=>1000,38154=>1000,38155=>1000,38156=>1000,38157=>1000,38158=>1000,38159=>1000,38160=>1000,38161=>1000,38162=>1000,38163=>1000,38164=>1000,
-	38165=>1000,38166=>1000,38167=>1000,38168=>1000,38169=>1000,38170=>1000,38171=>1000,38172=>1000,38173=>1000,38174=>1000,38175=>1000,38176=>1000,38177=>1000,38178=>1000,38179=>1000,38180=>1000,
-	38181=>1000,38182=>1000,38183=>1000,38184=>1000,38185=>1000,38186=>1000,38187=>1000,38188=>1000,38189=>1000,38190=>1000,38191=>1000,38192=>1000,38193=>1000,38194=>1000,38195=>1000,38196=>1000,
-	38197=>1000,38198=>1000,38199=>1000,38200=>1000,38201=>1000,38202=>1000,38203=>1000,38204=>1000,38205=>1000,38206=>1000,38207=>1000,38208=>1000,38209=>1000,38210=>1000,38211=>1000,38212=>1000,
-	38213=>1000,38214=>1000,38215=>1000,38216=>1000,38217=>1000,38218=>1000,38219=>1000,38220=>1000,38221=>1000,38222=>1000,38223=>1000,38224=>1000,38225=>1000,38226=>1000,38227=>1000,38228=>1000,
-	38229=>1000,38230=>1000,38231=>1000,38232=>1000,38233=>1000,38234=>1000,38235=>1000,38236=>1000,38237=>1000,38238=>1000,38239=>1000,38240=>1000,38241=>1000,38242=>1000,38243=>1000,38244=>1000,
-	38245=>1000,38246=>1000,38247=>1000,38248=>1000,38249=>1000,38250=>1000,38251=>1000,38252=>1000,38253=>1000,38254=>1000,38255=>1000,38256=>1000,38257=>1000,38258=>1000,38259=>1000,38260=>1000,
-	38261=>1000,38262=>1000,38263=>1000,38264=>1000,38265=>1000,38266=>1000,38267=>1000,38268=>1000,38269=>1000,38270=>1000,38271=>1000,38272=>1000,38273=>1000,38274=>1000,38275=>1000,38276=>1000,
-	38277=>1000,38278=>1000,38279=>1000,38280=>1000,38281=>1000,38282=>1000,38283=>1000,38284=>1000,38285=>1000,38286=>1000,38287=>1000,38288=>1000,38289=>1000,38290=>1000,38291=>1000,38292=>1000,
-	38293=>1000,38294=>1000,38295=>1000,38296=>1000,38297=>1000,38298=>1000,38299=>1000,38300=>1000,38301=>1000,38302=>1000,38303=>1000,38304=>1000,38305=>1000,38306=>1000,38307=>1000,38308=>1000,
-	38309=>1000,38310=>1000,38311=>1000,38312=>1000,38313=>1000,38314=>1000,38315=>1000,38316=>1000,38317=>1000,38318=>1000,38319=>1000,38320=>1000,38321=>1000,38322=>1000,38323=>1000,38324=>1000,
-	38325=>1000,38326=>1000,38327=>1000,38328=>1000,38329=>1000,38330=>1000,38331=>1000,38332=>1000,38333=>1000,38334=>1000,38335=>1000,38336=>1000,38337=>1000,38338=>1000,38339=>1000,38340=>1000,
-	38341=>1000,38342=>1000,38343=>1000,38344=>1000,38345=>1000,38346=>1000,38347=>1000,38348=>1000,38349=>1000,38350=>1000,38351=>1000,38352=>1000,38353=>1000,38354=>1000,38355=>1000,38356=>1000,
-	38357=>1000,38358=>1000,38359=>1000,38360=>1000,38361=>1000,38362=>1000,38363=>1000,38364=>1000,38365=>1000,38366=>1000,38367=>1000,38368=>1000,38369=>1000,38370=>1000,38371=>1000,38372=>1000,
-	38373=>1000,38374=>1000,38375=>1000,38376=>1000,38377=>1000,38378=>1000,38379=>1000,38380=>1000,38381=>1000,38382=>1000,38383=>1000,38384=>1000,38385=>1000,38386=>1000,38387=>1000,38388=>1000,
-	38389=>1000,38390=>1000,38391=>1000,38392=>1000,38393=>1000,38394=>1000,38395=>1000,38396=>1000,38397=>1000,38398=>1000,38399=>1000,38400=>1000,38401=>1000,38402=>1000,38403=>1000,38404=>1000,
-	38405=>1000,38406=>1000,38407=>1000,38408=>1000,38409=>1000,38410=>1000,38411=>1000,38412=>1000,38413=>1000,38414=>1000,38415=>1000,38416=>1000,38417=>1000,38418=>1000,38419=>1000,38420=>1000,
-	38421=>1000,38422=>1000,38423=>1000,38424=>1000,38425=>1000,38426=>1000,38427=>1000,38428=>1000,38429=>1000,38430=>1000,38431=>1000,38432=>1000,38433=>1000,38434=>1000,38435=>1000,38436=>1000,
-	38437=>1000,38438=>1000,38439=>1000,38440=>1000,38441=>1000,38442=>1000,38443=>1000,38444=>1000,38445=>1000,38446=>1000,38447=>1000,38448=>1000,38449=>1000,38450=>1000,38451=>1000,38452=>1000,
-	38453=>1000,38454=>1000,38455=>1000,38456=>1000,38457=>1000,38458=>1000,38459=>1000,38460=>1000,38461=>1000,38462=>1000,38463=>1000,38464=>1000,38465=>1000,38466=>1000,38467=>1000,38468=>1000,
-	38469=>1000,38470=>1000,38471=>1000,38472=>1000,38473=>1000,38474=>1000,38475=>1000,38476=>1000,38477=>1000,38478=>1000,38479=>1000,38480=>1000,38481=>1000,38482=>1000,38483=>1000,38484=>1000,
-	38485=>1000,38486=>1000,38487=>1000,38488=>1000,38489=>1000,38490=>1000,38491=>1000,38492=>1000,38493=>1000,38494=>1000,38495=>1000,38496=>1000,38497=>1000,38498=>1000,38499=>1000,38500=>1000,
-	38501=>1000,38502=>1000,38503=>1000,38504=>1000,38505=>1000,38506=>1000,38507=>1000,38508=>1000,38509=>1000,38510=>1000,38511=>1000,38512=>1000,38513=>1000,38514=>1000,38515=>1000,38516=>1000,
-	38517=>1000,38518=>1000,38519=>1000,38520=>1000,38521=>1000,38522=>1000,38523=>1000,38524=>1000,38525=>1000,38526=>1000,38527=>1000,38528=>1000,38529=>1000,38530=>1000,38531=>1000,38532=>1000,
-	38533=>1000,38534=>1000,38535=>1000,38536=>1000,38537=>1000,38538=>1000,38539=>1000,38540=>1000,38541=>1000,38542=>1000,38543=>1000,38544=>1000,38545=>1000,38546=>1000,38547=>1000,38548=>1000,
-	38549=>1000,38550=>1000,38551=>1000,38552=>1000,38553=>1000,38554=>1000,38555=>1000,38556=>1000,38557=>1000,38558=>1000,38559=>1000,38560=>1000,38561=>1000,38562=>1000,38563=>1000,38564=>1000,
-	38565=>1000,38566=>1000,38567=>1000,38568=>1000,38569=>1000,38570=>1000,38571=>1000,38572=>1000,38573=>1000,38574=>1000,38575=>1000,38576=>1000,38577=>1000,38578=>1000,38579=>1000,38580=>1000,
-	38581=>1000,38582=>1000,38583=>1000,38584=>1000,38585=>1000,38586=>1000,38587=>1000,38588=>1000,38589=>1000,38590=>1000,38591=>1000,38592=>1000,38593=>1000,38594=>1000,38595=>1000,38596=>1000,
-	38597=>1000,38598=>1000,38599=>1000,38600=>1000,38601=>1000,38602=>1000,38603=>1000,38604=>1000,38605=>1000,38606=>1000,38607=>1000,38608=>1000,38609=>1000,38610=>1000,38611=>1000,38612=>1000,
-	38613=>1000,38614=>1000,38615=>1000,38616=>1000,38617=>1000,38618=>1000,38619=>1000,38620=>1000,38621=>1000,38622=>1000,38623=>1000,38624=>1000,38625=>1000,38626=>1000,38627=>1000,38628=>1000,
-	38629=>1000,38630=>1000,38631=>1000,38632=>1000,38633=>1000,38634=>1000,38635=>1000,38636=>1000,38637=>1000,38638=>1000,38639=>1000,38640=>1000,38641=>1000,38642=>1000,38643=>1000,38644=>1000,
-	38645=>1000,38646=>1000,38647=>1000,38648=>1000,38649=>1000,38650=>1000,38651=>1000,38652=>1000,38653=>1000,38654=>1000,38655=>1000,38656=>1000,38657=>1000,38658=>1000,38659=>1000,38660=>1000,
-	38661=>1000,38662=>1000,38663=>1000,38664=>1000,38665=>1000,38666=>1000,38667=>1000,38668=>1000,38669=>1000,38670=>1000,38671=>1000,38672=>1000,38673=>1000,38674=>1000,38675=>1000,38676=>1000,
-	38677=>1000,38678=>1000,38679=>1000,38680=>1000,38681=>1000,38682=>1000,38683=>1000,38684=>1000,38685=>1000,38686=>1000,38687=>1000,38688=>1000,38689=>1000,38690=>1000,38691=>1000,38692=>1000,
-	38693=>1000,38694=>1000,38695=>1000,38696=>1000,38697=>1000,38698=>1000,38699=>1000,38700=>1000,38701=>1000,38702=>1000,38703=>1000,38704=>1000,38705=>1000,38706=>1000,38707=>1000,38708=>1000,
-	38709=>1000,38710=>1000,38711=>1000,38712=>1000,38713=>1000,38714=>1000,38715=>1000,38716=>1000,38717=>1000,38718=>1000,38719=>1000,38720=>1000,38721=>1000,38722=>1000,38723=>1000,38724=>1000,
-	38725=>1000,38726=>1000,38727=>1000,38728=>1000,38729=>1000,38730=>1000,38731=>1000,38732=>1000,38733=>1000,38734=>1000,38735=>1000,38736=>1000,38737=>1000,38738=>1000,38739=>1000,38740=>1000,
-	38741=>1000,38742=>1000,38743=>1000,38744=>1000,38745=>1000,38746=>1000,38747=>1000,38748=>1000,38749=>1000,38750=>1000,38751=>1000,38752=>1000,38753=>1000,38754=>1000,38755=>1000,38756=>1000,
-	38757=>1000,38758=>1000,38759=>1000,38760=>1000,38761=>1000,38762=>1000,38763=>1000,38764=>1000,38765=>1000,38766=>1000,38767=>1000,38768=>1000,38769=>1000,38770=>1000,38771=>1000,38772=>1000,
-	38773=>1000,38774=>1000,38775=>1000,38776=>1000,38777=>1000,38778=>1000,38779=>1000,38780=>1000,38781=>1000,38782=>1000,38783=>1000,38784=>1000,38785=>1000,38786=>1000,38787=>1000,38788=>1000,
-	38789=>1000,38790=>1000,38791=>1000,38792=>1000,38793=>1000,38794=>1000,38795=>1000,38796=>1000,38797=>1000,38798=>1000,38799=>1000,38800=>1000,38801=>1000,38802=>1000,38803=>1000,38804=>1000,
-	38805=>1000,38806=>1000,38807=>1000,38808=>1000,38809=>1000,38810=>1000,38811=>1000,38812=>1000,38813=>1000,38814=>1000,38815=>1000,38816=>1000,38817=>1000,38818=>1000,38819=>1000,38820=>1000,
-	38821=>1000,38822=>1000,38823=>1000,38824=>1000,38825=>1000,38826=>1000,38827=>1000,38828=>1000,38829=>1000,38830=>1000,38831=>1000,38832=>1000,38833=>1000,38834=>1000,38835=>1000,38836=>1000,
-	38837=>1000,38838=>1000,38839=>1000,38840=>1000,38841=>1000,38842=>1000,38843=>1000,38844=>1000,38845=>1000,38846=>1000,38847=>1000,38848=>1000,38849=>1000,38850=>1000,38851=>1000,38852=>1000,
-	38853=>1000,38854=>1000,38855=>1000,38856=>1000,38857=>1000,38858=>1000,38859=>1000,38860=>1000,38861=>1000,38862=>1000,38863=>1000,38864=>1000,38865=>1000,38866=>1000,38867=>1000,38868=>1000,
-	38869=>1000,38870=>1000,38871=>1000,38872=>1000,38873=>1000,38874=>1000,38875=>1000,38876=>1000,38877=>1000,38878=>1000,38879=>1000,38880=>1000,38881=>1000,38882=>1000,38883=>1000,38884=>1000,
-	38885=>1000,38886=>1000,38887=>1000,38888=>1000,38889=>1000,38890=>1000,38891=>1000,38892=>1000,38893=>1000,38894=>1000,38895=>1000,38896=>1000,38897=>1000,38898=>1000,38899=>1000,38900=>1000,
-	38901=>1000,38902=>1000,38903=>1000,38904=>1000,38905=>1000,38906=>1000,38907=>1000,38908=>1000,38909=>1000,38910=>1000,38911=>1000,38912=>1000,38913=>1000,38914=>1000,38915=>1000,38916=>1000,
-	38917=>1000,38918=>1000,38919=>1000,38920=>1000,38921=>1000,38922=>1000,38923=>1000,38924=>1000,38925=>1000,38926=>1000,38927=>1000,38928=>1000,38929=>1000,38930=>1000,38931=>1000,38932=>1000,
-	38933=>1000,38934=>1000,38935=>1000,38936=>1000,38937=>1000,38938=>1000,38939=>1000,38940=>1000,38941=>1000,38942=>1000,38943=>1000,38944=>1000,38945=>1000,38946=>1000,38947=>1000,38948=>1000,
-	38949=>1000,38950=>1000,38951=>1000,38952=>1000,38953=>1000,38954=>1000,38955=>1000,38956=>1000,38957=>1000,38958=>1000,38959=>1000,38960=>1000,38961=>1000,38962=>1000,38963=>1000,38964=>1000,
-	38965=>1000,38966=>1000,38967=>1000,38968=>1000,38969=>1000,38970=>1000,38971=>1000,38972=>1000,38973=>1000,38974=>1000,38975=>1000,38976=>1000,38977=>1000,38978=>1000,38979=>1000,38980=>1000,
-	38981=>1000,38982=>1000,38983=>1000,38984=>1000,38985=>1000,38986=>1000,38987=>1000,38988=>1000,38989=>1000,38990=>1000,38991=>1000,38992=>1000,38993=>1000,38994=>1000,38995=>1000,38996=>1000,
-	38997=>1000,38998=>1000,38999=>1000,39000=>1000,39001=>1000,39002=>1000,39003=>1000,39004=>1000,39005=>1000,39006=>1000,39007=>1000,39008=>1000,39009=>1000,39010=>1000,39011=>1000,39012=>1000,
-	39013=>1000,39014=>1000,39015=>1000,39016=>1000,39017=>1000,39018=>1000,39019=>1000,39020=>1000,39021=>1000,39022=>1000,39023=>1000,39024=>1000,39025=>1000,39026=>1000,39027=>1000,39028=>1000,
-	39029=>1000,39030=>1000,39031=>1000,39032=>1000,39033=>1000,39034=>1000,39035=>1000,39036=>1000,39037=>1000,39038=>1000,39039=>1000,39040=>1000,39041=>1000,39042=>1000,39043=>1000,39044=>1000,
-	39045=>1000,39046=>1000,39047=>1000,39048=>1000,39049=>1000,39050=>1000,39051=>1000,39052=>1000,39053=>1000,39054=>1000,39055=>1000,39056=>1000,39057=>1000,39058=>1000,39059=>1000,39060=>1000,
-	39061=>1000,39062=>1000,39063=>1000,39064=>1000,39065=>1000,39066=>1000,39067=>1000,39068=>1000,39069=>1000,39070=>1000,39071=>1000,39072=>1000,39073=>1000,39074=>1000,39075=>1000,39076=>1000,
-	39077=>1000,39078=>1000,39079=>1000,39080=>1000,39081=>1000,39082=>1000,39083=>1000,39084=>1000,39085=>1000,39086=>1000,39087=>1000,39088=>1000,39089=>1000,39090=>1000,39091=>1000,39092=>1000,
-	39093=>1000,39094=>1000,39095=>1000,39096=>1000,39097=>1000,39098=>1000,39099=>1000,39100=>1000,39101=>1000,39102=>1000,39103=>1000,39104=>1000,39105=>1000,39106=>1000,39107=>1000,39108=>1000,
-	39109=>1000,39110=>1000,39111=>1000,39112=>1000,39113=>1000,39114=>1000,39115=>1000,39116=>1000,39117=>1000,39118=>1000,39119=>1000,39120=>1000,39121=>1000,39122=>1000,39123=>1000,39124=>1000,
-	39125=>1000,39126=>1000,39127=>1000,39128=>1000,39129=>1000,39130=>1000,39131=>1000,39132=>1000,39133=>1000,39134=>1000,39135=>1000,39136=>1000,39137=>1000,39138=>1000,39139=>1000,39140=>1000,
-	39141=>1000,39142=>1000,39143=>1000,39144=>1000,39145=>1000,39146=>1000,39147=>1000,39148=>1000,39149=>1000,39150=>1000,39151=>1000,39152=>1000,39153=>1000,39154=>1000,39155=>1000,39156=>1000,
-	39157=>1000,39158=>1000,39159=>1000,39160=>1000,39161=>1000,39162=>1000,39163=>1000,39164=>1000,39165=>1000,39166=>1000,39167=>1000,39168=>1000,39169=>1000,39170=>1000,39171=>1000,39172=>1000,
-	39173=>1000,39174=>1000,39175=>1000,39176=>1000,39177=>1000,39178=>1000,39179=>1000,39180=>1000,39181=>1000,39182=>1000,39183=>1000,39184=>1000,39185=>1000,39186=>1000,39187=>1000,39188=>1000,
-	39189=>1000,39190=>1000,39191=>1000,39192=>1000,39193=>1000,39194=>1000,39195=>1000,39196=>1000,39197=>1000,39198=>1000,39199=>1000,39200=>1000,39201=>1000,39202=>1000,39203=>1000,39204=>1000,
-	39205=>1000,39206=>1000,39207=>1000,39208=>1000,39209=>1000,39210=>1000,39211=>1000,39212=>1000,39213=>1000,39214=>1000,39215=>1000,39216=>1000,39217=>1000,39218=>1000,39219=>1000,39220=>1000,
-	39221=>1000,39222=>1000,39223=>1000,39224=>1000,39225=>1000,39226=>1000,39227=>1000,39228=>1000,39229=>1000,39230=>1000,39231=>1000,39232=>1000,39233=>1000,39234=>1000,39235=>1000,39236=>1000,
-	39237=>1000,39238=>1000,39239=>1000,39240=>1000,39241=>1000,39242=>1000,39243=>1000,39244=>1000,39245=>1000,39246=>1000,39247=>1000,39248=>1000,39249=>1000,39250=>1000,39251=>1000,39252=>1000,
-	39253=>1000,39254=>1000,39255=>1000,39256=>1000,39257=>1000,39258=>1000,39259=>1000,39260=>1000,39261=>1000,39262=>1000,39263=>1000,39264=>1000,39265=>1000,39266=>1000,39267=>1000,39268=>1000,
-	39269=>1000,39270=>1000,39271=>1000,39272=>1000,39273=>1000,39274=>1000,39275=>1000,39276=>1000,39277=>1000,39278=>1000,39279=>1000,39280=>1000,39281=>1000,39282=>1000,39283=>1000,39284=>1000,
-	39285=>1000,39286=>1000,39287=>1000,39288=>1000,39289=>1000,39290=>1000,39291=>1000,39292=>1000,39293=>1000,39294=>1000,39295=>1000,39296=>1000,39297=>1000,39298=>1000,39299=>1000,39300=>1000,
-	39301=>1000,39302=>1000,39303=>1000,39304=>1000,39305=>1000,39306=>1000,39307=>1000,39308=>1000,39309=>1000,39310=>1000,39311=>1000,39312=>1000,39313=>1000,39314=>1000,39315=>1000,39316=>1000,
-	39317=>1000,39318=>1000,39319=>1000,39320=>1000,39321=>1000,39322=>1000,39323=>1000,39324=>1000,39325=>1000,39326=>1000,39327=>1000,39328=>1000,39329=>1000,39330=>1000,39331=>1000,39332=>1000,
-	39333=>1000,39334=>1000,39335=>1000,39336=>1000,39337=>1000,39338=>1000,39339=>1000,39340=>1000,39341=>1000,39342=>1000,39343=>1000,39344=>1000,39345=>1000,39346=>1000,39347=>1000,39348=>1000,
-	39349=>1000,39350=>1000,39351=>1000,39352=>1000,39353=>1000,39354=>1000,39355=>1000,39356=>1000,39357=>1000,39358=>1000,39359=>1000,39360=>1000,39361=>1000,39362=>1000,39363=>1000,39364=>1000,
-	39365=>1000,39366=>1000,39367=>1000,39368=>1000,39369=>1000,39370=>1000,39371=>1000,39372=>1000,39373=>1000,39374=>1000,39375=>1000,39376=>1000,39377=>1000,39378=>1000,39379=>1000,39380=>1000,
-	39381=>1000,39382=>1000,39383=>1000,39384=>1000,39385=>1000,39386=>1000,39387=>1000,39388=>1000,39389=>1000,39390=>1000,39391=>1000,39392=>1000,39393=>1000,39394=>1000,39395=>1000,39396=>1000,
-	39397=>1000,39398=>1000,39399=>1000,39400=>1000,39401=>1000,39402=>1000,39403=>1000,39404=>1000,39405=>1000,39406=>1000,39407=>1000,39408=>1000,39409=>1000,39410=>1000,39411=>1000,39412=>1000,
-	39413=>1000,39414=>1000,39415=>1000,39416=>1000,39417=>1000,39418=>1000,39419=>1000,39420=>1000,39421=>1000,39422=>1000,39423=>1000,39424=>1000,39425=>1000,39426=>1000,39427=>1000,39428=>1000,
-	39429=>1000,39430=>1000,39431=>1000,39432=>1000,39433=>1000,39434=>1000,39435=>1000,39436=>1000,39437=>1000,39438=>1000,39439=>1000,39440=>1000,39441=>1000,39442=>1000,39443=>1000,39444=>1000,
-	39445=>1000,39446=>1000,39447=>1000,39448=>1000,39449=>1000,39450=>1000,39451=>1000,39452=>1000,39453=>1000,39454=>1000,39455=>1000,39456=>1000,39457=>1000,39458=>1000,39459=>1000,39460=>1000,
-	39461=>1000,39462=>1000,39463=>1000,39464=>1000,39465=>1000,39466=>1000,39467=>1000,39468=>1000,39469=>1000,39470=>1000,39471=>1000,39472=>1000,39473=>1000,39474=>1000,39475=>1000,39476=>1000,
-	39477=>1000,39478=>1000,39479=>1000,39480=>1000,39481=>1000,39482=>1000,39483=>1000,39484=>1000,39485=>1000,39486=>1000,39487=>1000,39488=>1000,39489=>1000,39490=>1000,39491=>1000,39492=>1000,
-	39493=>1000,39494=>1000,39495=>1000,39496=>1000,39497=>1000,39498=>1000,39499=>1000,39500=>1000,39501=>1000,39502=>1000,39503=>1000,39504=>1000,39505=>1000,39506=>1000,39507=>1000,39508=>1000,
-	39509=>1000,39510=>1000,39511=>1000,39512=>1000,39513=>1000,39514=>1000,39515=>1000,39516=>1000,39517=>1000,39518=>1000,39519=>1000,39520=>1000,39521=>1000,39522=>1000,39523=>1000,39524=>1000,
-	39525=>1000,39526=>1000,39527=>1000,39528=>1000,39529=>1000,39530=>1000,39531=>1000,39532=>1000,39533=>1000,39534=>1000,39535=>1000,39536=>1000,39537=>1000,39538=>1000,39539=>1000,39540=>1000,
-	39541=>1000,39542=>1000,39543=>1000,39544=>1000,39545=>1000,39546=>1000,39547=>1000,39548=>1000,39549=>1000,39550=>1000,39551=>1000,39552=>1000,39553=>1000,39554=>1000,39555=>1000,39556=>1000,
-	39557=>1000,39558=>1000,39559=>1000,39560=>1000,39561=>1000,39562=>1000,39563=>1000,39564=>1000,39565=>1000,39566=>1000,39567=>1000,39568=>1000,39569=>1000,39570=>1000,39571=>1000,39572=>1000,
-	39573=>1000,39574=>1000,39575=>1000,39576=>1000,39577=>1000,39578=>1000,39579=>1000,39580=>1000,39581=>1000,39582=>1000,39583=>1000,39584=>1000,39585=>1000,39586=>1000,39587=>1000,39588=>1000,
-	39589=>1000,39590=>1000,39591=>1000,39592=>1000,39593=>1000,39594=>1000,39595=>1000,39596=>1000,39597=>1000,39598=>1000,39599=>1000,39600=>1000,39601=>1000,39602=>1000,39603=>1000,39604=>1000,
-	39605=>1000,39606=>1000,39607=>1000,39608=>1000,39609=>1000,39610=>1000,39611=>1000,39612=>1000,39613=>1000,39614=>1000,39615=>1000,39616=>1000,39617=>1000,39618=>1000,39619=>1000,39620=>1000,
-	39621=>1000,39622=>1000,39623=>1000,39624=>1000,39625=>1000,39626=>1000,39627=>1000,39628=>1000,39629=>1000,39630=>1000,39631=>1000,39632=>1000,39633=>1000,39634=>1000,39635=>1000,39636=>1000,
-	39637=>1000,39638=>1000,39639=>1000,39640=>1000,39641=>1000,39642=>1000,39643=>1000,39644=>1000,39645=>1000,39646=>1000,39647=>1000,39648=>1000,39649=>1000,39650=>1000,39651=>1000,39652=>1000,
-	39653=>1000,39654=>1000,39655=>1000,39656=>1000,39657=>1000,39658=>1000,39659=>1000,39660=>1000,39661=>1000,39662=>1000,39663=>1000,39664=>1000,39665=>1000,39666=>1000,39667=>1000,39668=>1000,
-	39669=>1000,39670=>1000,39671=>1000,39672=>1000,39673=>1000,39674=>1000,39675=>1000,39676=>1000,39677=>1000,39678=>1000,39679=>1000,39680=>1000,39681=>1000,39682=>1000,39683=>1000,39684=>1000,
-	39685=>1000,39686=>1000,39687=>1000,39688=>1000,39689=>1000,39690=>1000,39691=>1000,39692=>1000,39693=>1000,39694=>1000,39695=>1000,39696=>1000,39697=>1000,39698=>1000,39699=>1000,39700=>1000,
-	39701=>1000,39702=>1000,39703=>1000,39704=>1000,39705=>1000,39706=>1000,39707=>1000,39708=>1000,39709=>1000,39710=>1000,39711=>1000,39712=>1000,39713=>1000,39714=>1000,39715=>1000,39716=>1000,
-	39717=>1000,39718=>1000,39719=>1000,39720=>1000,39721=>1000,39722=>1000,39723=>1000,39724=>1000,39725=>1000,39726=>1000,39727=>1000,39728=>1000,39729=>1000,39730=>1000,39731=>1000,39732=>1000,
-	39733=>1000,39734=>1000,39735=>1000,39736=>1000,39737=>1000,39738=>1000,39739=>1000,39740=>1000,39741=>1000,39742=>1000,39743=>1000,39744=>1000,39745=>1000,39746=>1000,39747=>1000,39748=>1000,
-	39749=>1000,39750=>1000,39751=>1000,39752=>1000,39753=>1000,39754=>1000,39755=>1000,39756=>1000,39757=>1000,39758=>1000,39759=>1000,39760=>1000,39761=>1000,39762=>1000,39763=>1000,39764=>1000,
-	39765=>1000,39766=>1000,39767=>1000,39768=>1000,39769=>1000,39770=>1000,39771=>1000,39772=>1000,39773=>1000,39774=>1000,39775=>1000,39776=>1000,39777=>1000,39778=>1000,39779=>1000,39780=>1000,
-	39781=>1000,39782=>1000,39783=>1000,39784=>1000,39785=>1000,39786=>1000,39787=>1000,39788=>1000,39789=>1000,39790=>1000,39791=>1000,39792=>1000,39793=>1000,39794=>1000,39795=>1000,39796=>1000,
-	39797=>1000,39798=>1000,39799=>1000,39800=>1000,39801=>1000,39802=>1000,39803=>1000,39804=>1000,39805=>1000,39806=>1000,39807=>1000,39808=>1000,39809=>1000,39810=>1000,39811=>1000,39812=>1000,
-	39813=>1000,39814=>1000,39815=>1000,39816=>1000,39817=>1000,39818=>1000,39819=>1000,39820=>1000,39821=>1000,39822=>1000,39823=>1000,39824=>1000,39825=>1000,39826=>1000,39827=>1000,39828=>1000,
-	39829=>1000,39830=>1000,39831=>1000,39832=>1000,39833=>1000,39834=>1000,39835=>1000,39836=>1000,39837=>1000,39838=>1000,39839=>1000,39840=>1000,39841=>1000,39842=>1000,39843=>1000,39844=>1000,
-	39845=>1000,39846=>1000,39847=>1000,39848=>1000,39849=>1000,39850=>1000,39851=>1000,39852=>1000,39853=>1000,39854=>1000,39855=>1000,39856=>1000,39857=>1000,39858=>1000,39859=>1000,39860=>1000,
-	39861=>1000,39862=>1000,39863=>1000,39864=>1000,39865=>1000,39866=>1000,39867=>1000,39868=>1000,39869=>1000,39870=>1000,39871=>1000,39872=>1000,39873=>1000,39874=>1000,39875=>1000,39876=>1000,
-	39877=>1000,39878=>1000,39879=>1000,39880=>1000,39881=>1000,39882=>1000,39883=>1000,39884=>1000,39885=>1000,39886=>1000,39887=>1000,39888=>1000,39889=>1000,39890=>1000,39891=>1000,39892=>1000,
-	39893=>1000,39894=>1000,39895=>1000,39896=>1000,39897=>1000,39898=>1000,39899=>1000,39900=>1000,39901=>1000,39902=>1000,39903=>1000,39904=>1000,39905=>1000,39906=>1000,39907=>1000,39908=>1000,
-	39909=>1000,39910=>1000,39911=>1000,39912=>1000,39913=>1000,39914=>1000,39915=>1000,39916=>1000,39917=>1000,39918=>1000,39919=>1000,39920=>1000,39921=>1000,39922=>1000,39923=>1000,39924=>1000,
-	39925=>1000,39926=>1000,39927=>1000,39928=>1000,39929=>1000,39930=>1000,39931=>1000,39932=>1000,39933=>1000,39934=>1000,39935=>1000,39936=>1000,39937=>1000,39938=>1000,39939=>1000,39940=>1000,
-	39941=>1000,39942=>1000,39943=>1000,39944=>1000,39945=>1000,39946=>1000,39947=>1000,39948=>1000,39949=>1000,39950=>1000,39951=>1000,39952=>1000,39953=>1000,39954=>1000,39955=>1000,39956=>1000,
-	39957=>1000,39958=>1000,39959=>1000,39960=>1000,39961=>1000,39962=>1000,39963=>1000,39964=>1000,39965=>1000,39966=>1000,39967=>1000,39968=>1000,39969=>1000,39970=>1000,39971=>1000,39972=>1000,
-	39973=>1000,39974=>1000,39975=>1000,39976=>1000,39977=>1000,39978=>1000,39979=>1000,39980=>1000,39981=>1000,39982=>1000,39983=>1000,39984=>1000,39985=>1000,39986=>1000,39987=>1000,39988=>1000,
-	39989=>1000,39990=>1000,39991=>1000,39992=>1000,39993=>1000,39994=>1000,39995=>1000,39996=>1000,39997=>1000,39998=>1000,39999=>1000,40000=>1000,40001=>1000,40002=>1000,40003=>1000,40004=>1000,
-	40005=>1000,40006=>1000,40007=>1000,40008=>1000,40009=>1000,40010=>1000,40011=>1000,40012=>1000,40013=>1000,40014=>1000,40015=>1000,40016=>1000,40017=>1000,40018=>1000,40019=>1000,40020=>1000,
-	40021=>1000,40022=>1000,40023=>1000,40024=>1000,40025=>1000,40026=>1000,40027=>1000,40028=>1000,40029=>1000,40030=>1000,40031=>1000,40032=>1000,40033=>1000,40034=>1000,40035=>1000,40036=>1000,
-	40037=>1000,40038=>1000,40039=>1000,40040=>1000,40041=>1000,40042=>1000,40043=>1000,40044=>1000,40045=>1000,40046=>1000,40047=>1000,40048=>1000,40049=>1000,40050=>1000,40051=>1000,40052=>1000,
-	40053=>1000,40054=>1000,40055=>1000,40056=>1000,40057=>1000,40058=>1000,40059=>1000,40060=>1000,40061=>1000,40062=>1000,40063=>1000,40064=>1000,40065=>1000,40066=>1000,40067=>1000,40068=>1000,
-	40069=>1000,40070=>1000,40071=>1000,40072=>1000,40073=>1000,40074=>1000,40075=>1000,40076=>1000,40077=>1000,40078=>1000,40079=>1000,40080=>1000,40081=>1000,40082=>1000,40083=>1000,40084=>1000,
-	40085=>1000,40086=>1000,40087=>1000,40088=>1000,40089=>1000,40090=>1000,40091=>1000,40092=>1000,40093=>1000,40094=>1000,40095=>1000,40096=>1000,40097=>1000,40098=>1000,40099=>1000,40100=>1000,
-	40101=>1000,40102=>1000,40103=>1000,40104=>1000,40105=>1000,40106=>1000,40107=>1000,40108=>1000,40109=>1000,40110=>1000,40111=>1000,40112=>1000,40113=>1000,40114=>1000,40115=>1000,40116=>1000,
-	40117=>1000,40118=>1000,40119=>1000,40120=>1000,40121=>1000,40122=>1000,40123=>1000,40124=>1000,40125=>1000,40126=>1000,40127=>1000,40128=>1000,40129=>1000,40130=>1000,40131=>1000,40132=>1000,
-	40133=>1000,40134=>1000,40135=>1000,40136=>1000,40137=>1000,40138=>1000,40139=>1000,40140=>1000,40141=>1000,40142=>1000,40143=>1000,40144=>1000,40145=>1000,40146=>1000,40147=>1000,40148=>1000,
-	40149=>1000,40150=>1000,40151=>1000,40152=>1000,40153=>1000,40154=>1000,40155=>1000,40156=>1000,40157=>1000,40158=>1000,40159=>1000,40160=>1000,40161=>1000,40162=>1000,40163=>1000,40164=>1000,
-	40165=>1000,40166=>1000,40167=>1000,40168=>1000,40169=>1000,40170=>1000,40171=>1000,40172=>1000,40173=>1000,40174=>1000,40175=>1000,40176=>1000,40177=>1000,40178=>1000,40179=>1000,40180=>1000,
-	40181=>1000,40182=>1000,40183=>1000,40184=>1000,40185=>1000,40186=>1000,40187=>1000,40188=>1000,40189=>1000,40190=>1000,40191=>1000,40192=>1000,40193=>1000,40194=>1000,40195=>1000,40196=>1000,
-	40197=>1000,40198=>1000,40199=>1000,40200=>1000,40201=>1000,40202=>1000,40203=>1000,40204=>1000,40205=>1000,40206=>1000,40207=>1000,40208=>1000,40209=>1000,40210=>1000,40211=>1000,40212=>1000,
-	40213=>1000,40214=>1000,40215=>1000,40216=>1000,40217=>1000,40218=>1000,40219=>1000,40220=>1000,40221=>1000,40222=>1000,40223=>1000,40224=>1000,40225=>1000,40226=>1000,40227=>1000,40228=>1000,
-	40229=>1000,40230=>1000,40231=>1000,40232=>1000,40233=>1000,40234=>1000,40235=>1000,40236=>1000,40237=>1000,40238=>1000,40239=>1000,40240=>1000,40241=>1000,40242=>1000,40243=>1000,40244=>1000,
-	40245=>1000,40246=>1000,40247=>1000,40248=>1000,40249=>1000,40250=>1000,40251=>1000,40252=>1000,40253=>1000,40254=>1000,40255=>1000,40256=>1000,40257=>1000,40258=>1000,40259=>1000,40260=>1000,
-	40261=>1000,40262=>1000,40263=>1000,40264=>1000,40265=>1000,40266=>1000,40267=>1000,40268=>1000,40269=>1000,40270=>1000,40271=>1000,40272=>1000,40273=>1000,40274=>1000,40275=>1000,40276=>1000,
-	40277=>1000,40278=>1000,40279=>1000,40280=>1000,40281=>1000,40282=>1000,40283=>1000,40284=>1000,40285=>1000,40286=>1000,40287=>1000,40288=>1000,40289=>1000,40290=>1000,40291=>1000,40292=>1000,
-	40293=>1000,40294=>1000,40295=>1000,40296=>1000,40297=>1000,40298=>1000,40299=>1000,40300=>1000,40301=>1000,40302=>1000,40303=>1000,40304=>1000,40305=>1000,40306=>1000,40307=>1000,40308=>1000,
-	40309=>1000,40310=>1000,40311=>1000,40312=>1000,40313=>1000,40314=>1000,40315=>1000,40316=>1000,40317=>1000,40318=>1000,40319=>1000,40320=>1000,40321=>1000,40322=>1000,40323=>1000,40324=>1000,
-	40325=>1000,40326=>1000,40327=>1000,40328=>1000,40329=>1000,40330=>1000,40331=>1000,40332=>1000,40333=>1000,40334=>1000,40335=>1000,40336=>1000,40337=>1000,40338=>1000,40339=>1000,40340=>1000,
-	40341=>1000,40342=>1000,40343=>1000,40344=>1000,40345=>1000,40346=>1000,40347=>1000,40348=>1000,40349=>1000,40350=>1000,40351=>1000,40352=>1000,40353=>1000,40354=>1000,40355=>1000,40356=>1000,
-	40357=>1000,40358=>1000,40359=>1000,40360=>1000,40361=>1000,40362=>1000,40363=>1000,40364=>1000,40365=>1000,40366=>1000,40367=>1000,40368=>1000,40369=>1000,40370=>1000,40371=>1000,40372=>1000,
-	40373=>1000,40374=>1000,40375=>1000,40376=>1000,40377=>1000,40378=>1000,40379=>1000,40380=>1000,40381=>1000,40382=>1000,40383=>1000,40384=>1000,40385=>1000,40386=>1000,40387=>1000,40388=>1000,
-	40389=>1000,40390=>1000,40391=>1000,40392=>1000,40393=>1000,40394=>1000,40395=>1000,40396=>1000,40397=>1000,40398=>1000,40399=>1000,40400=>1000,40401=>1000,40402=>1000,40403=>1000,40404=>1000,
-	40405=>1000,40406=>1000,40407=>1000,40408=>1000,40409=>1000,40410=>1000,40411=>1000,40412=>1000,40413=>1000,40414=>1000,40415=>1000,40416=>1000,40417=>1000,40418=>1000,40419=>1000,40420=>1000,
-	40421=>1000,40422=>1000,40423=>1000,40424=>1000,40425=>1000,40426=>1000,40427=>1000,40428=>1000,40429=>1000,40430=>1000,40431=>1000,40432=>1000,40433=>1000,40434=>1000,40435=>1000,40436=>1000,
-	40437=>1000,40438=>1000,40439=>1000,40440=>1000,40441=>1000,40442=>1000,40443=>1000,40444=>1000,40445=>1000,40446=>1000,40447=>1000,40448=>1000,40449=>1000,40450=>1000,40451=>1000,40452=>1000,
-	40453=>1000,40454=>1000,40455=>1000,40456=>1000,40457=>1000,40458=>1000,40459=>1000,40460=>1000,40461=>1000,40462=>1000,40463=>1000,40464=>1000,40465=>1000,40466=>1000,40467=>1000,40468=>1000,
-	40469=>1000,40470=>1000,40471=>1000,40472=>1000,40473=>1000,40474=>1000,40475=>1000,40476=>1000,40477=>1000,40478=>1000,40479=>1000,40480=>1000,40481=>1000,40482=>1000,40483=>1000,40484=>1000,
-	40485=>1000,40486=>1000,40487=>1000,40488=>1000,40489=>1000,40490=>1000,40491=>1000,40492=>1000,40493=>1000,40494=>1000,40495=>1000,40496=>1000,40497=>1000,40498=>1000,40499=>1000,40500=>1000,
-	40501=>1000,40502=>1000,40503=>1000,40504=>1000,40505=>1000,40506=>1000,40507=>1000,40508=>1000,40509=>1000,40510=>1000,40511=>1000,40512=>1000,40513=>1000,40514=>1000,40515=>1000,40516=>1000,
-	40517=>1000,40518=>1000,40519=>1000,40520=>1000,40521=>1000,40522=>1000,40523=>1000,40524=>1000,40525=>1000,40526=>1000,40527=>1000,40528=>1000,40529=>1000,40530=>1000,40531=>1000,40532=>1000,
-	40533=>1000,40534=>1000,40535=>1000,40536=>1000,40537=>1000,40538=>1000,40539=>1000,40540=>1000,40541=>1000,40542=>1000,40543=>1000,40544=>1000,40545=>1000,40546=>1000,40547=>1000,40548=>1000,
-	40549=>1000,40550=>1000,40551=>1000,40552=>1000,40553=>1000,40554=>1000,40555=>1000,40556=>1000,40557=>1000,40558=>1000,40559=>1000,40560=>1000,40561=>1000,40562=>1000,40563=>1000,40564=>1000,
-	40565=>1000,40566=>1000,40567=>1000,40568=>1000,40569=>1000,40570=>1000,40571=>1000,40572=>1000,40573=>1000,40574=>1000,40575=>1000,40576=>1000,40577=>1000,40578=>1000,40579=>1000,40580=>1000,
-	40581=>1000,40582=>1000,40583=>1000,40584=>1000,40585=>1000,40586=>1000,40587=>1000,40588=>1000,40589=>1000,40590=>1000,40591=>1000,40592=>1000,40593=>1000,40594=>1000,40595=>1000,40596=>1000,
-	40597=>1000,40598=>1000,40599=>1000,40600=>1000,40601=>1000,40602=>1000,40603=>1000,40604=>1000,40605=>1000,40606=>1000,40607=>1000,40608=>1000,40609=>1000,40610=>1000,40611=>1000,40612=>1000,
-	40613=>1000,40614=>1000,40615=>1000,40616=>1000,40617=>1000,40618=>1000,40619=>1000,40620=>1000,40621=>1000,40622=>1000,40623=>1000,40624=>1000,40625=>1000,40626=>1000,40627=>1000,40628=>1000,
-	40629=>1000,40630=>1000,40631=>1000,40632=>1000,40633=>1000,40634=>1000,40635=>1000,40636=>1000,40637=>1000,40638=>1000,40639=>1000,40640=>1000,40641=>1000,40642=>1000,40643=>1000,40644=>1000,
-	40645=>1000,40646=>1000,40647=>1000,40648=>1000,40649=>1000,40650=>1000,40651=>1000,40652=>1000,40653=>1000,40654=>1000,40655=>1000,40656=>1000,40657=>1000,40658=>1000,40659=>1000,40660=>1000,
-	40661=>1000,40662=>1000,40663=>1000,40664=>1000,40665=>1000,40666=>1000,40667=>1000,40668=>1000,40669=>1000,40670=>1000,40671=>1000,40672=>1000,40673=>1000,40674=>1000,40675=>1000,40676=>1000,
-	40677=>1000,40678=>1000,40679=>1000,40680=>1000,40681=>1000,40682=>1000,40683=>1000,40684=>1000,40685=>1000,40686=>1000,40687=>1000,40688=>1000,40689=>1000,40690=>1000,40691=>1000,40692=>1000,
-	40693=>1000,40694=>1000,40695=>1000,40696=>1000,40697=>1000,40698=>1000,40699=>1000,40700=>1000,40701=>1000,40702=>1000,40703=>1000,40704=>1000,40705=>1000,40706=>1000,40707=>1000,40708=>1000,
-	40709=>1000,40710=>1000,40711=>1000,40712=>1000,40713=>1000,40714=>1000,40715=>1000,40716=>1000,40717=>1000,40718=>1000,40719=>1000,40720=>1000,40721=>1000,40722=>1000,40723=>1000,40724=>1000,
-	40725=>1000,40726=>1000,40727=>1000,40728=>1000,40729=>1000,40730=>1000,40731=>1000,40732=>1000,40733=>1000,40734=>1000,40735=>1000,40736=>1000,40737=>1000,40738=>1000,40739=>1000,40740=>1000,
-	40741=>1000,40742=>1000,40743=>1000,40744=>1000,40745=>1000,40746=>1000,40747=>1000,40748=>1000,40749=>1000,40750=>1000,40751=>1000,40752=>1000,40753=>1000,40754=>1000,40755=>1000,40756=>1000,
-	40757=>1000,40758=>1000,40759=>1000,40760=>1000,40761=>1000,40762=>1000,40763=>1000,40764=>1000,40765=>1000,40766=>1000,40767=>1000,40768=>1000,40769=>1000,40770=>1000,40771=>1000,40772=>1000,
-	40773=>1000,40774=>1000,40775=>1000,40776=>1000,40777=>1000,40778=>1000,40779=>1000,40780=>1000,40781=>1000,40782=>1000,40783=>1000,40784=>1000,40785=>1000,40786=>1000,40787=>1000,40788=>1000,
-	40789=>1000,40790=>1000,40791=>1000,40792=>1000,40793=>1000,40794=>1000,40795=>1000,40796=>1000,40797=>1000,40798=>1000,40799=>1000,40800=>1000,40801=>1000,40802=>1000,40803=>1000,40804=>1000,
-	40805=>1000,40806=>1000,40807=>1000,40808=>1000,40809=>1000,40810=>1000,40811=>1000,40812=>1000,40813=>1000,40814=>1000,40815=>1000,40816=>1000,40817=>1000,40818=>1000,40819=>1000,40820=>1000,
-	40821=>1000,40822=>1000,40823=>1000,40824=>1000,40825=>1000,40826=>1000,40827=>1000,40828=>1000,40829=>1000,40830=>1000,40831=>1000,40832=>1000,40833=>1000,40834=>1000,40835=>1000,40836=>1000,
-	40837=>1000,40838=>1000,40839=>1000,40840=>1000,40841=>1000,40842=>1000,40843=>1000,40844=>1000,40845=>1000,40846=>1000,40847=>1000,40848=>1000,40849=>1000,40850=>1000,40851=>1000,40852=>1000,
-	40853=>1000,40854=>1000,40855=>1000,40856=>1000,40857=>1000,40858=>1000,40859=>1000,40860=>1000,40861=>1000,40862=>1000,40863=>1000,40864=>1000,40865=>1000,40866=>1000,40867=>1000,40868=>1000,
-	40869=>1000);
-$diff='';
-$originalsize=23275812;
-
-// CID Information
-// Select your language
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ac16.tar.Z,ag15.tar.Z,ak12.tar.Z and aj16.tar.Z.
-
-$enc='UniCNS-UTF16-H';
-$cidinfo=array('Registry'=>'Adobe','Ordering'=>'CNS1','Supplement'=>0);
-include(dirname(__FILE__).'/uni2cid_ac15.php');
-
-//$enc='UniGB-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'GB1','Supplement'=>2);
-//include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-//$enc='UniKS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Korea1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-//$enc='UniJIS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Japan1','Supplement'=>5);
-//include(dirname(__FILE__).'/uni2cid_aj16.php');
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-japanese.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-japanese.php
deleted file mode 100644
index 2e32061e274..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-japanese.php
+++ /dev/null
@@ -1,1768 +0,0 @@
-<?php
-$type='cidfont0';
-$name='ArialUnicodeMS';
-$desc=array('Ascent'=>1069,'Descent'=>-271,'CapHeight'=>1069,'Flags'=>32,'FontBBox'=>'[-1011 -330 2260 1078]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=1000;
-$cw=array(
-	32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,
-	48=>556,49=>556,50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,60=>584,61=>584,62=>584,63=>556,
-	64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-	80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>278,92=>278,93=>278,94=>469,95=>500,
-	96=>333,97=>556,98=>556,99=>500,100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,109=>833,110=>556,111=>556,
-	112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,8364=>556,
-	1027=>567,8218=>222,402=>278,8222=>333,8230=>1000,8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,1036=>584,381=>611,1039=>723,8216=>222,
-	8217=>222,8220=>333,8221=>333,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>500,8250=>333,339=>944,1116=>437,382=>500,376=>667,160=>278,161=>333,
-	162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,172=>584,173=>333,174=>737,175=>500,176=>400,177=>584,
-	178=>333,179=>333,180=>333,181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,190=>834,191=>611,192=>667,193=>667,
-	194=>667,195=>667,196=>667,197=>667,198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,208=>722,209=>722,
-	210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-	226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,
-	242=>556,243=>556,244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>667,257=>556,
-	258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,268=>722,269=>500,270=>722,271=>627,272=>722,273=>556,
-	274=>667,275=>556,276=>667,277=>556,278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,288=>778,289=>556,
-	290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>222,298=>278,299=>222,300=>278,301=>222,302=>278,303=>222,304=>278,305=>278,
-	306=>751,307=>444,308=>500,309=>222,310=>667,311=>500,312=>437,313=>556,314=>222,315=>556,316=>222,317=>556,318=>222,319=>556,320=>318,321=>556,
-	322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,328=>556,329=>626,330=>723,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-	340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,350=>667,351=>500,354=>611,355=>278,356=>611,357=>406,
-	358=>611,359=>278,360=>722,361=>556,362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,372=>944,373=>722,
-	374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>222,384=>556,385=>740,386=>655,387=>556,388=>556,389=>556,390=>722,391=>766,392=>579,
-	393=>722,394=>789,395=>655,396=>556,397=>557,398=>667,399=>729,400=>604,401=>611,403=>791,404=>649,405=>806,406=>245,407=>322,408=>667,409=>500,
-	410=>322,411=>500,412=>833,413=>722,414=>556,415=>778,416=>776,417=>556,418=>1019,419=>782,420=>735,421=>556,422=>722,423=>667,424=>500,425=>602,
-	426=>366,427=>278,428=>571,429=>278,430=>611,431=>776,432=>620,433=>748,434=>667,435=>752,436=>615,437=>611,438=>500,439=>628,440=>628,441=>526,
-	442=>480,443=>556,444=>556,445=>526,446=>556,447=>556,448=>278,449=>464,450=>474,451=>278,452=>1333,453=>1222,454=>1056,455=>1030,456=>778,457=>444,
-	458=>1222,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,
-	474=>556,475=>722,476=>556,477=>556,478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,488=>667,489=>500,
-	490=>778,491=>556,492=>778,493=>556,494=>534,495=>534,496=>222,497=>1333,498=>1222,499=>1056,500=>778,501=>556,506=>667,507=>556,508=>1000,509=>889,
-	510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,
-	526=>778,527=>556,528=>722,529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,
-	598=>556,599=>556,600=>556,601=>556,602=>777,603=>485,604=>485,605=>686,606=>519,607=>260,608=>556,609=>556,610=>557,611=>500,612=>500,613=>556,
-	614=>556,615=>556,616=>242,617=>282,618=>356,619=>356,620=>425,621=>222,622=>635,623=>833,624=>833,625=>833,626=>556,627=>556,628=>558,629=>556,
-	630=>715,631=>674,632=>558,633=>333,634=>333,635=>333,636=>333,637=>333,638=>312,639=>312,640=>530,641=>530,642=>500,643=>216,644=>276,645=>216,
-	646=>222,647=>278,648=>278,649=>596,650=>558,651=>556,652=>500,653=>722,654=>500,655=>500,656=>500,657=>564,658=>530,659=>530,660=>464,661=>464,
-	662=>464,663=>500,664=>614,665=>526,666=>519,667=>557,668=>558,669=>222,670=>500,671=>416,672=>556,673=>464,674=>464,675=>966,676=>966,677=>1030,
-	678=>689,679=>484,680=>718,688=>326,689=>326,690=>153,691=>201,692=>201,693=>201,694=>304,695=>389,696=>278,697=>222,698=>372,699=>222,700=>222,
-	701=>222,702=>222,703=>222,704=>250,705=>250,706=>320,707=>320,708=>320,709=>320,711=>333,712=>192,713=>333,714=>333,715=>333,716=>192,717=>333,
-	718=>333,719=>333,720=>300,721=>300,722=>222,723=>222,724=>340,725=>340,726=>280,727=>362,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-	736=>278,737=>153,738=>270,739=>274,740=>325,741=>360,742=>360,743=>360,744=>360,745=>360,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-	774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,
-	790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,
-	806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-	822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-	864=>0,865=>0,884=>308,885=>308,890=>278,894=>278,900=>278,901=>278,902=>667,903=>278,904=>704,905=>759,906=>315,908=>778,910=>746,911=>758,
-	912=>222,913=>667,914=>667,915=>550,916=>682,917=>667,918=>611,919=>722,920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>650,927=>778,
-	928=>722,929=>667,931=>602,932=>611,933=>667,934=>808,935=>667,936=>804,937=>758,938=>278,939=>667,940=>576,941=>434,942=>556,943=>222,944=>551,
-	945=>576,946=>563,947=>500,948=>557,949=>434,950=>440,951=>556,952=>556,953=>222,954=>498,955=>500,956=>553,957=>500,958=>432,959=>556,960=>678,
-	961=>571,962=>472,963=>619,964=>382,965=>551,966=>649,967=>522,968=>729,969=>766,970=>222,971=>551,972=>556,973=>551,974=>766,976=>563,977=>616,
-	978=>631,979=>726,980=>631,981=>644,982=>781,986=>722,988=>578,990=>570,992=>692,994=>880,995=>833,996=>684,997=>558,998=>680,999=>529,1000=>557,
-	1001=>505,1002=>623,1003=>603,1004=>610,1005=>611,1006=>568,1007=>434,1008=>600,1009=>571,1010=>500,1011=>222,1025=>667,1026=>865,1028=>717,1029=>667,1030=>278,
-	1031=>278,1032=>500,1033=>1105,1034=>1009,1035=>867,1038=>635,1040=>667,1041=>655,1042=>667,1043=>567,1044=>677,1045=>667,1046=>923,1047=>604,1048=>722,1049=>722,
-	1050=>584,1051=>705,1052=>833,1053=>722,1054=>778,1055=>723,1056=>667,1057=>722,1058=>611,1059=>635,1060=>760,1061=>667,1062=>740,1063=>684,1064=>920,1065=>939,
-	1066=>793,1067=>883,1068=>655,1069=>717,1070=>1006,1071=>722,1072=>556,1073=>573,1074=>531,1075=>383,1076=>583,1077=>556,1078=>669,1079=>458,1080=>559,1081=>559,
-	1082=>437,1083=>571,1084=>683,1085=>552,1086=>556,1087=>542,1088=>556,1089=>500,1090=>458,1091=>500,1092=>823,1093=>500,1094=>562,1095=>533,1096=>802,1097=>823,
-	1098=>620,1099=>717,1100=>523,1101=>510,1102=>744,1103=>542,1105=>556,1106=>556,1107=>383,1108=>510,1109=>500,1110=>222,1111=>278,1112=>222,1113=>873,1114=>811,
-	1115=>556,1118=>500,1119=>542,1120=>976,1121=>766,1122=>656,1123=>521,1124=>950,1125=>694,1126=>667,1127=>597,1128=>952,1129=>817,1130=>654,1131=>600,1132=>932,
-	1133=>817,1134=>604,1135=>458,1136=>804,1137=>729,1138=>778,1139=>556,1140=>667,1141=>500,1142=>667,1143=>500,1144=>1279,1145=>1060,1146=>778,1147=>556,1148=>976,
-	1149=>766,1150=>976,1151=>766,1152=>722,1153=>514,1154=>686,1155=>334,1156=>382,1157=>334,1158=>334,1168=>435,1169=>339,1170=>567,1171=>383,1172=>656,1173=>556,
-	1174=>923,1175=>669,1176=>604,1177=>458,1178=>584,1179=>437,1180=>584,1181=>437,1182=>584,1183=>437,1184=>764,1185=>537,1186=>741,1187=>573,1188=>900,1189=>670,
-	1190=>736,1191=>560,1192=>778,1193=>560,1194=>722,1195=>500,1196=>611,1197=>458,1198=>667,1199=>500,1200=>667,1201=>500,1202=>667,1203=>500,1204=>916,1205=>661,
-	1206=>684,1207=>533,1208=>684,1209=>533,1210=>684,1211=>556,1212=>829,1213=>667,1214=>829,1215=>667,1216=>278,1217=>923,1218=>669,1219=>584,1220=>437,1223=>735,
-	1224=>570,1227=>684,1228=>533,1232=>667,1233=>556,1234=>667,1235=>556,1236=>1000,1237=>889,1238=>667,1239=>556,1240=>729,1241=>556,1242=>729,1243=>556,1244=>923,
-	1245=>669,1246=>604,1247=>458,1248=>604,1249=>492,1250=>722,1251=>559,1252=>722,1253=>559,1254=>778,1255=>556,1256=>778,1257=>556,1258=>778,1259=>556,1262=>635,
-	1263=>500,1264=>635,1265=>500,1266=>635,1267=>500,1268=>684,1269=>533,1272=>883,1273=>717,1329=>635,1330=>531,1331=>583,1332=>583,1333=>531,1334=>531,1335=>427,
-	1336=>531,1337=>750,1338=>635,1339=>531,1340=>375,1341=>583,1342=>698,1343=>531,1344=>427,1345=>531,1346=>583,1347=>531,1348=>635,1349=>698,1350=>635,1351=>635,
-	1352=>531,1353=>531,1354=>698,1355=>531,1356=>635,1357=>531,1358=>698,1359=>583,1360=>479,1361=>583,1362=>531,1363=>698,1364=>698,1365=>635,1366=>750,1369=>271,
-	1370=>271,1371=>150,1372=>300,1373=>271,1374=>271,1375=>420,1377=>583,1378=>427,1379=>427,1380=>427,1381=>427,1382=>427,1383=>427,1384=>427,1385=>459,1386=>427,
-	1387=>427,1388=>323,1389=>531,1390=>427,1391=>427,1392=>427,1393=>427,1394=>427,1395=>427,1396=>427,1397=>271,1398=>427,1399=>375,1400=>427,1401=>375,1402=>583,
-	1403=>427,1404=>427,1405=>427,1406=>427,1407=>583,1408=>427,1409=>427,1410=>323,1411=>583,1412=>375,1413=>375,1414=>583,1415=>527,1417=>271,1425=>360,1426=>360,
-	1427=>360,1428=>360,1429=>360,1430=>360,1431=>360,1432=>360,1433=>360,1434=>360,1435=>360,1436=>360,1437=>360,1438=>360,1439=>360,1440=>360,1441=>360,1443=>360,
-	1444=>360,1445=>360,1446=>360,1447=>360,1448=>360,1449=>360,1450=>360,1451=>360,1452=>360,1453=>360,1454=>360,1455=>360,1456=>360,1457=>360,1458=>360,1459=>360,
-	1460=>360,1461=>360,1462=>360,1463=>360,1464=>360,1465=>360,1467=>360,1468=>360,1469=>360,1470=>366,1471=>360,1472=>225,1473=>360,1474=>360,1475=>238,1476=>360,
-	1488=>577,1489=>563,1490=>411,1491=>512,1492=>594,1493=>316,1494=>326,1495=>594,1496=>594,1497=>316,1498=>507,1499=>527,1500=>484,1501=>594,1502=>594,1503=>316,
-	1504=>338,1505=>604,1506=>550,1507=>567,1508=>569,1509=>505,1510=>514,1511=>583,1512=>507,1513=>700,1514=>633,1520=>590,1521=>590,1522=>590,1523=>216,1524=>412,
-	1548=>278,1563=>278,1567=>556,1569=>529,1570=>243,1571=>243,1572=>470,1573=>243,1574=>731,1575=>243,1576=>771,1577=>514,1578=>771,1579=>771,1580=>544,1581=>544,
-	1582=>544,1583=>430,1584=>430,1585=>421,1586=>421,1587=>1194,1588=>1194,1589=>1291,1590=>1291,1591=>843,1592=>843,1593=>594,1594=>594,1600=>279,1601=>957,1602=>800,
-	1603=>757,1604=>662,1605=>589,1606=>692,1607=>514,1608=>470,1609=>731,1610=>731,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,
-	1632=>480,1633=>480,1634=>480,1635=>480,1636=>480,1637=>480,1638=>480,1639=>480,1640=>480,1641=>480,1642=>547,1643=>278,1644=>278,1645=>438,1648=>0,1649=>243,
-	1650=>243,1651=>243,1652=>0,1653=>380,1654=>470,1655=>548,1656=>772,1657=>771,1658=>771,1659=>771,1660=>771,1661=>771,1662=>771,1663=>771,1664=>771,1665=>544,
-	1666=>544,1667=>544,1668=>544,1669=>544,1670=>544,1671=>544,1672=>430,1673=>430,1674=>430,1675=>430,1676=>430,1677=>430,1678=>430,1679=>430,1680=>430,1681=>421,
-	1682=>421,1683=>421,1684=>421,1685=>421,1686=>419,1687=>421,1688=>421,1689=>421,1690=>1194,1691=>1194,1692=>1194,1693=>1291,1694=>1291,1695=>843,1696=>594,1697=>957,
-	1698=>957,1699=>957,1700=>957,1701=>957,1702=>957,1703=>800,1704=>800,1705=>828,1706=>1058,1707=>828,1708=>757,1709=>757,1710=>757,1711=>828,1712=>828,1713=>828,
-	1714=>828,1715=>828,1716=>828,1717=>662,1718=>662,1719=>662,1722=>692,1723=>692,1724=>692,1725=>692,1726=>706,1728=>514,1729=>509,1730=>509,1731=>509,1732=>470,
-	1733=>470,1734=>470,1735=>470,1736=>470,1737=>470,1738=>470,1739=>470,1740=>731,1741=>841,1742=>731,1744=>731,1745=>731,1746=>550,1747=>550,1748=>279,1749=>514,
-	1750=>726,1751=>558,1752=>321,1753=>318,1754=>342,1755=>373,1756=>716,1757=>688,1758=>852,1759=>288,1760=>288,1761=>388,1762=>350,1763=>716,1764=>146,1765=>282,
-	1766=>339,1767=>339,1768=>415,1769=>514,1770=>220,1771=>220,1772=>220,1773=>350,1776=>480,1777=>480,1778=>480,1779=>480,1780=>480,1781=>480,1782=>480,1783=>480,
-	1784=>480,1785=>480,2305=>0,2306=>0,2307=>294,2309=>693,2310=>910,2311=>533,2312=>533,2313=>590,2314=>713,2315=>920,2316=>677,2317=>611,2318=>611,2319=>611,
-	2320=>611,2321=>910,2322=>910,2323=>910,2324=>910,2325=>667,2326=>732,2327=>593,2328=>639,2329=>624,2330=>688,2331=>713,2332=>688,2333=>712,2334=>697,2335=>502,
-	2336=>533,2337=>583,2338=>523,2339=>693,2340=>585,2341=>638,2342=>533,2343=>640,2344=>585,2345=>585,2346=>565,2347=>699,2348=>592,2349=>689,2350=>633,2351=>600,
-	2352=>486,2353=>486,2354=>680,2355=>730,2356=>730,2357=>592,2358=>684,2359=>608,2360=>646,2361=>546,2364=>0,2365=>373,2366=>319,2367=>319,2368=>319,2369=>0,
-	2370=>0,2371=>0,2372=>0,2373=>0,2374=>0,2375=>0,2376=>0,2377=>319,2378=>319,2379=>319,2380=>319,2381=>0,2384=>884,2385=>0,2386=>0,2387=>0,
-	2388=>0,2392=>667,2393=>732,2394=>593,2395=>688,2396=>583,2397=>523,2398=>699,2399=>600,2400=>920,2401=>677,2402=>0,2403=>0,2404=>331,2405=>513,2406=>639,
-	2407=>639,2408=>639,2409=>639,2410=>639,2411=>639,2412=>639,2413=>639,2414=>639,2415=>639,2416=>362,2433=>0,2434=>430,2435=>430,2437=>786,2438=>1030,2439=>582,
-	2440=>603,2441=>648,2442=>757,2443=>758,2444=>630,2447=>685,2448=>746,2451=>711,2452=>776,2453=>779,2454=>655,2455=>606,2456=>645,2457=>661,2458=>554,2459=>585,
-	2460=>729,2461=>752,2462=>893,2463=>567,2464=>625,2465=>648,2466=>567,2467=>598,2468=>680,2469=>645,2470=>609,2471=>596,2472=>595,2474=>635,2475=>780,2476=>593,
-	2477=>677,2478=>621,2479=>601,2480=>593,2482=>640,2486=>598,2487=>596,2488=>637,2489=>582,2492=>0,2494=>245,2495=>245,2496=>245,2497=>0,2498=>0,2499=>0,
-	2500=>0,2503=>309,2504=>309,2507=>932,2508=>932,2509=>0,2519=>245,2524=>648,2525=>553,2527=>596,2528=>758,2529=>630,2530=>0,2531=>335,2534=>610,2535=>559,
-	2536=>595,2537=>711,2538=>610,2539=>661,2540=>661,2541=>559,2542=>661,2543=>600,2544=>593,2545=>593,2546=>601,2547=>567,2548=>601,2549=>699,2550=>661,2551=>267,
-	2552=>610,2553=>424,2554=>548,2562=>0,2565=>691,2566=>936,2567=>803,2568=>803,2569=>678,2570=>678,2575=>557,2576=>691,2579=>678,2580=>691,2581=>602,2582=>567,
-	2583=>641,2584=>688,2585=>565,2586=>592,2587=>603,2588=>591,2589=>541,2590=>558,2591=>543,2592=>581,2593=>596,2594=>640,2595=>640,2596=>591,2597=>564,2598=>640,
-	2599=>564,2600=>581,2602=>564,2603=>551,2604=>560,2605=>549,2606=>558,2607=>652,2608=>540,2610=>677,2611=>677,2613=>601,2614=>558,2616=>558,2617=>549,2620=>0,
-	2622=>246,2623=>246,2624=>246,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>567,2650=>690,2651=>591,2652=>591,2654=>581,2662=>591,
-	2663=>591,2664=>591,2665=>591,2666=>591,2667=>591,2668=>591,2669=>591,2670=>591,2671=>591,2672=>0,2673=>0,2674=>557,2675=>678,2676=>894,2689=>0,2690=>0,
-	2691=>300,2693=>781,2694=>1044,2695=>589,2696=>589,2697=>560,2698=>758,2699=>806,2701=>781,2703=>781,2704=>781,2705=>1044,2707=>1044,2708=>1044,2709=>413,2710=>773,
-	2711=>606,2712=>558,2713=>483,2714=>600,2715=>691,2716=>811,2717=>647,2718=>651,2719=>453,2720=>450,2721=>425,2722=>478,2723=>694,2724=>534,2725=>553,2726=>446,
-	2727=>541,2728=>582,2730=>572,2731=>437,2732=>663,2733=>756,2734=>594,2735=>493,2736=>392,2738=>613,2739=>656,2741=>538,2742=>611,2743=>507,2744=>663,2745=>587,
-	2748=>0,2749=>478,2750=>273,2751=>273,2752=>273,2753=>0,2754=>0,2755=>0,2756=>0,2757=>0,2759=>0,2760=>0,2761=>273,2763=>273,2764=>273,2765=>0,
-	2768=>843,2784=>893,2790=>625,2791=>625,2792=>625,2793=>625,2794=>625,2795=>625,2796=>625,2797=>625,2798=>625,2799=>625,2817=>0,2818=>306,2819=>391,2821=>590,
-	2822=>808,2823=>658,2824=>658,2825=>633,2826=>654,2827=>636,2828=>540,2831=>560,2832=>938,2835=>600,2836=>973,2837=>603,2838=>620,2839=>620,2840=>605,2841=>712,
-	2842=>579,2843=>579,2844=>593,2845=>564,2846=>581,2847=>604,2848=>578,2849=>579,2850=>579,2851=>607,2852=>579,2853=>587,2854=>579,2855=>602,2856=>579,2858=>605,
-	2859=>728,2860=>579,2861=>643,2862=>605,2863=>628,2864=>619,2866=>653,2867=>593,2870=>620,2871=>605,2872=>605,2873=>579,2876=>0,2877=>333,2878=>218,2879=>0,
-	2880=>294,2881=>0,2882=>0,2883=>0,2887=>479,2888=>479,2891=>1026,2892=>1026,2893=>0,2902=>0,2903=>218,2908=>579,2909=>579,2911=>599,2912=>636,2913=>540,
-	2918=>578,2919=>480,2920=>480,2921=>622,2922=>506,2923=>605,2924=>529,2925=>548,2926=>512,2927=>528,2928=>561,2946=>0,2947=>742,2949=>1002,2950=>1118,2951=>994,
-	2952=>660,2953=>1012,2954=>1231,2958=>726,2959=>731,2960=>870,2962=>763,2963=>763,2964=>1636,2965=>667,2969=>830,2970=>584,2972=>876,2974=>986,2975=>802,2979=>1295,
-	2980=>656,2984=>630,2985=>1012,2986=>694,2990=>727,2991=>790,2992=>545,2993=>718,2994=>821,2995=>871,2996=>724,2997=>873,2999=>1087,3000=>1098,3001=>1274,3006=>547,
-	3007=>172,3008=>93,3009=>519,3010=>814,3014=>748,3015=>681,3016=>956,3018=>1666,3019=>1666,3020=>1994,3021=>0,3031=>871,3047=>667,3048=>1012,3049=>751,3050=>740,
-	3051=>924,3052=>884,3053=>726,3054=>1002,3055=>825,3056=>717,3057=>719,3058=>774,3073=>365,3074=>601,3075=>346,3077=>720,3078=>786,3079=>567,3080=>1159,3081=>690,
-	3082=>1047,3083=>1299,3084=>913,3086=>625,3087=>625,3088=>712,3090=>655,3091=>655,3092=>862,3093=>515,3094=>680,3095=>526,3096=>943,3097=>655,3098=>684,3099=>684,
-	3100=>670,3101=>1205,3102=>732,3103=>888,3104=>597,3105=>709,3106=>709,3107=>809,3108=>715,3109=>702,3110=>702,3111=>702,3112=>607,3114=>623,3115=>623,3116=>681,
-	3117=>681,3118=>932,3119=>1203,3120=>597,3121=>893,3122=>631,3123=>608,3125=>620,3126=>541,3127=>667,3128=>640,3129=>911,3134=>644,3135=>298,3136=>298,3137=>361,
-	3138=>682,3139=>342,3140=>704,3142=>624,3143=>624,3144=>900,3146=>849,3147=>849,3148=>976,3149=>669,3157=>298,3158=>119,3168=>1620,3169=>1281,3174=>840,3175=>840,
-	3176=>840,3177=>840,3178=>840,3179=>840,3180=>840,3181=>840,3182=>840,3183=>840,3202=>440,3203=>251,3205=>654,3206=>654,3207=>631,3208=>891,3209=>957,3210=>1293,
-	3211=>1044,3212=>744,3214=>650,3215=>650,3216=>659,3218=>667,3219=>667,3220=>667,3221=>462,3222=>749,3223=>543,3224=>779,3225=>674,3226=>682,3227=>660,3228=>667,
-	3229=>1171,3230=>926,3231=>671,3232=>557,3233=>669,3234=>669,3235=>728,3236=>544,3237=>672,3238=>672,3239=>672,3240=>560,3242=>668,3243=>668,3244=>681,3245=>687,
-	3246=>972,3247=>1101,3248=>556,3249=>677,3250=>661,3251=>545,3253=>666,3254=>553,3255=>670,3256=>549,3257=>716,3262=>425,3263=>341,3264=>680,3265=>354,3266=>714,
-	3267=>386,3268=>638,3270=>307,3271=>670,3272=>462,3274=>908,3275=>1251,3276=>434,3277=>336,3285=>344,3286=>404,3294=>673,3296=>1695,3297=>978,3302=>549,3303=>549,
-	3304=>549,3305=>549,3306=>549,3307=>549,3308=>549,3309=>549,3310=>549,3311=>549,3330=>368,3331=>305,3333=>1201,3334=>1351,3335=>905,3336=>1459,3337=>635,3338=>1198,
-	3339=>861,3340=>957,3342=>1211,3343=>1202,3344=>1839,3346=>642,3347=>1114,3348=>1195,3349=>861,3350=>982,3351=>874,3352=>1354,3353=>957,3354=>1016,3355=>1266,3356=>712,
-	3357=>1454,3358=>1215,3359=>563,3360=>565,3361=>1192,3362=>1244,3363=>1268,3364=>878,3365=>966,3366=>545,3367=>879,3368=>879,3370=>1031,3371=>1175,3372=>1334,3373=>546,
-	3374=>643,3375=>949,3376=>642,3377=>555,3378=>945,3379=>631,3380=>553,3381=>959,3382=>936,3383=>1122,3384=>1190,3385=>1112,3390=>475,3391=>418,3392=>442,3393=>340,
-	3394=>340,3395=>473,3398=>640,3399=>530,3400=>1279,3402=>1368,3403=>1258,3404=>1447,3405=>0,3415=>553,3424=>861,3425=>1100,3430=>1095,3431=>929,3432=>854,3433=>1181,
-	3434=>658,3435=>972,3436=>1210,3437=>650,3438=>959,3439=>896,3585=>595,3586=>648,3587=>665,3588=>608,3589=>608,3590=>665,3591=>471,3592=>556,3593=>652,3594=>664,
-	3595=>681,3596=>816,3597=>849,3598=>620,3599=>620,3600=>541,3601=>785,3602=>826,3603=>887,3604=>598,3605=>605,3606=>595,3607=>650,3608=>541,3609=>652,3610=>608,
-	3611=>608,3612=>630,3613=>630,3614=>695,3615=>695,3616=>620,3617=>581,3618=>588,3619=>501,3620=>595,3621=>569,3622=>620,3623=>519,3624=>592,3625=>659,3626=>574,
-	3627=>654,3628=>695,3629=>566,3630=>574,3631=>517,3632=>452,3633=>0,3634=>496,3635=>496,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-	3647=>687,3648=>302,3649=>571,3650=>478,3651=>515,3652=>515,3653=>496,3654=>506,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,
-	3663=>555,3664=>598,3665=>640,3666=>688,3667=>690,3668=>657,3669=>657,3670=>635,3671=>839,3672=>693,3673=>769,3674=>673,3675=>994,3713=>775,3714=>707,3716=>724,
-	3719=>524,3720=>690,3722=>678,3725=>711,3732=>719,3733=>834,3734=>776,3735=>916,3737=>744,3738=>740,3739=>740,3740=>834,3741=>834,3742=>854,3743=>854,3745=>775,
-	3746=>724,3747=>697,3749=>700,3751=>700,3754=>708,3755=>916,3757=>700,3758=>697,3759=>658,3760=>432,3761=>534,3762=>476,3763=>476,3764=>778,3765=>778,3766=>778,
-	3767=>778,3768=>778,3769=>778,3771=>778,3772=>778,3773=>670,3776=>420,3777=>806,3778=>430,3779=>446,3780=>346,3782=>571,3784=>778,3785=>778,3786=>778,3787=>778,
-	3788=>778,3789=>778,3792=>721,3793=>719,3794=>601,3795=>711,3796=>686,3797=>686,3798=>834,3799=>756,3800=>724,3801=>906,3804=>1272,3805=>1272,3840=>600,3841=>600,
-	3842=>600,3843=>600,3844=>600,3845=>600,3846=>600,3847=>600,3848=>600,3849=>600,3850=>600,3851=>600,3852=>600,3853=>600,3854=>600,3855=>600,3856=>600,3857=>600,
-	3858=>600,3859=>600,3860=>600,3861=>600,3862=>600,3863=>600,3864=>600,3865=>600,3866=>600,3867=>600,3868=>600,3869=>600,3870=>600,3871=>600,3872=>600,3873=>600,
-	3874=>600,3875=>600,3876=>600,3877=>600,3878=>600,3879=>600,3880=>600,3881=>600,3882=>600,3883=>600,3884=>600,3885=>600,3886=>600,3887=>600,3888=>600,3889=>600,
-	3890=>600,3891=>600,3892=>600,3893=>600,3894=>600,3895=>600,3896=>600,3897=>600,3898=>600,3899=>600,3900=>600,3901=>600,3902=>600,3903=>600,3904=>600,3905=>600,
-	3906=>600,3907=>600,3908=>600,3909=>600,3910=>600,3911=>600,3913=>600,3914=>600,3915=>600,3916=>600,3917=>600,3918=>600,3919=>600,3920=>600,3921=>600,3922=>600,
-	3923=>600,3924=>600,3925=>600,3926=>600,3927=>600,3928=>600,3929=>600,3930=>600,3931=>600,3932=>600,3933=>600,3934=>600,3935=>600,3936=>600,3937=>600,3938=>600,
-	3939=>600,3940=>600,3941=>600,3942=>600,3943=>600,3944=>600,3945=>600,3953=>600,3954=>600,3955=>600,3956=>600,3957=>600,3958=>600,3959=>600,3960=>600,3961=>600,
-	3962=>600,3963=>600,3964=>600,3965=>600,3966=>600,3967=>600,3968=>600,3969=>600,3970=>600,3971=>600,3972=>600,3973=>600,3974=>600,3975=>600,3976=>600,3977=>600,
-	3978=>600,3979=>600,3984=>600,3985=>600,3986=>600,3987=>600,3988=>600,3989=>600,3991=>600,3993=>600,3994=>600,3995=>600,3996=>600,3997=>600,3998=>600,3999=>600,
-	4000=>600,4001=>600,4002=>600,4003=>600,4004=>600,4005=>600,4006=>600,4007=>600,4008=>600,4009=>600,4010=>600,4011=>600,4012=>600,4013=>600,4017=>600,4018=>600,
-	4019=>600,4020=>600,4021=>600,4022=>600,4023=>600,4025=>600,4256=>662,4257=>677,4258=>708,4259=>696,4260=>609,4261=>790,4262=>664,4263=>785,4264=>560,4265=>634,
-	4266=>782,4267=>701,4268=>629,4269=>682,4270=>705,4271=>692,4272=>734,4273=>615,4274=>592,4275=>680,4276=>679,4277=>705,4278=>643,4279=>623,4280=>623,4281=>629,
-	4282=>633,4283=>770,4284=>592,4285=>662,4286=>629,4287=>672,4288=>735,4289=>576,4290=>606,4291=>605,4292=>676,4293=>792,4304=>435,4305=>556,4306=>565,4307=>872,
-	4308=>506,4309=>544,4310=>723,4311=>868,4312=>530,4313=>532,4314=>955,4315=>552,4316=>565,4317=>712,4318=>547,4319=>574,4320=>685,4321=>554,4322=>806,4323=>810,
-	4324=>777,4325=>502,4326=>686,4327=>512,4328=>552,4329=>496,4330=>568,4331=>552,4332=>592,4333=>565,4334=>552,4335=>741,4336=>549,4337=>659,4338=>559,4339=>524,
-	4340=>482,4341=>565,4342=>822,4347=>506,4352=>1000,4353=>1000,4354=>1000,4355=>1000,4356=>1000,4357=>1000,4358=>1000,4359=>1000,4360=>1000,4361=>1000,4362=>1000,4363=>1000,
-	4364=>1000,4365=>1000,4366=>1000,4367=>1000,4368=>1000,4369=>1000,4370=>1000,4371=>1000,4372=>1000,4373=>1000,4374=>1000,4375=>1000,4376=>1000,4377=>1000,4378=>1000,4379=>1000,
-	4380=>1000,4381=>1000,4382=>1000,4383=>1000,4384=>1000,4385=>1000,4386=>1000,4387=>1000,4388=>1000,4389=>1000,4390=>1000,4391=>1000,4392=>1000,4393=>1000,4394=>1000,4395=>1000,
-	4396=>1000,4397=>1000,4398=>1000,4399=>1000,4400=>1000,4401=>1000,4402=>1000,4403=>1000,4404=>1000,4405=>1000,4406=>1000,4407=>1000,4408=>1000,4409=>1000,4410=>1000,4411=>1000,
-	4412=>1000,4413=>1000,4414=>1000,4415=>1000,4416=>1000,4417=>1000,4418=>1000,4419=>1000,4420=>1000,4421=>1000,4422=>1000,4423=>1000,4424=>1000,4425=>1000,4426=>1000,4427=>1000,
-	4428=>1000,4429=>1000,4430=>1000,4431=>1000,4432=>1000,4433=>1000,4434=>1000,4435=>1000,4436=>1000,4437=>1000,4438=>1000,4439=>1000,4440=>1000,4441=>1000,4447=>1000,4448=>1000,
-	4449=>1000,4450=>1000,4451=>1000,4452=>1000,4453=>1000,4454=>1000,4455=>1000,4456=>1000,4457=>1000,4458=>1000,4459=>1000,4460=>1000,4461=>1000,4462=>1000,4463=>1000,4464=>1000,
-	4465=>1000,4466=>1000,4467=>1000,4468=>1000,4469=>1000,4470=>1000,4471=>1000,4472=>1000,4473=>1000,4474=>1000,4475=>1000,4476=>1000,4477=>1000,4478=>1000,4479=>1000,4480=>1000,
-	4481=>1000,4482=>1000,4483=>1000,4484=>1000,4485=>1000,4486=>1000,4487=>1000,4488=>1000,4489=>1000,4490=>1000,4491=>1000,4492=>1000,4493=>1000,4494=>1000,4495=>1000,4496=>1000,
-	4497=>1000,4498=>1000,4499=>1000,4500=>1000,4501=>1000,4502=>1000,4503=>1000,4504=>1000,4505=>1000,4506=>1000,4507=>1000,4508=>1000,4509=>1000,4510=>1000,4511=>1000,4512=>1000,
-	4513=>1000,4514=>1000,4520=>1000,4521=>1000,4522=>1000,4523=>1000,4524=>1000,4525=>1000,4526=>1000,4527=>1000,4528=>1000,4529=>1000,4530=>1000,4531=>1000,4532=>1000,4533=>1000,
-	4534=>1000,4535=>1000,4536=>1000,4537=>1000,4538=>1000,4539=>1000,4540=>1000,4541=>1000,4542=>1000,4543=>1000,4544=>1000,4545=>1000,4546=>1000,4547=>1000,4548=>1000,4549=>1000,
-	4550=>1000,4551=>1000,4552=>1000,4553=>1000,4554=>1000,4555=>1000,4556=>1000,4557=>1000,4558=>1000,4559=>1000,4560=>1000,4561=>1000,4562=>1000,4563=>1000,4564=>1000,4565=>1000,
-	4566=>1000,4567=>1000,4568=>1000,4569=>1000,4570=>1000,4571=>1000,4572=>1000,4573=>1000,4574=>1000,4575=>1000,4576=>1000,4577=>1000,4578=>1000,4579=>1000,4580=>1000,4581=>1000,
-	4582=>1000,4583=>1000,4584=>1000,4585=>1000,4586=>1000,4587=>1000,4588=>1000,4589=>1000,4590=>1000,4591=>1000,4592=>1000,4593=>1000,4594=>1000,4595=>1000,4596=>1000,4597=>1000,
-	4598=>1000,4599=>1000,4600=>1000,4601=>1000,7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,7691=>556,
-	7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,
-	7708=>667,7709=>556,7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,7721=>556,7722=>722,7723=>556,
-	7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-	7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,
-	7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,7771=>333,
-	7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,
-	7788=>611,7789=>278,7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,
-	7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-	7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,7831=>278,7832=>722,7833=>500,7834=>556,7835=>278,
-	7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,7855=>556,
-	7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,
-	7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,7885=>556,7886=>778,7887=>556,
-	7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,7895=>556,7896=>778,7897=>556,7898=>776,7899=>556,7900=>776,7901=>556,7902=>776,7903=>556,
-	7904=>776,7905=>556,7906=>776,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>620,7914=>776,7915=>620,7916=>776,7917=>620,7918=>776,7919=>620,
-	7920=>776,7921=>620,7922=>667,7923=>500,7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>576,7937=>576,7938=>576,7939=>576,7940=>576,7941=>576,
-	7942=>576,7943=>576,7944=>667,7945=>667,7946=>680,7947=>680,7948=>680,7949=>680,7950=>718,7951=>718,7952=>434,7953=>434,7954=>434,7955=>434,7956=>434,7957=>434,
-	7960=>692,7961=>692,7962=>823,7963=>823,7964=>823,7965=>823,7968=>556,7969=>556,7970=>556,7971=>556,7972=>556,7973=>556,7974=>556,7975=>556,7976=>747,7977=>747,
-	7978=>878,7979=>878,7980=>878,7981=>878,7982=>923,7983=>923,7984=>222,7985=>222,7986=>222,7987=>222,7988=>222,7989=>222,7990=>222,7991=>222,7992=>303,7993=>303,
-	7994=>434,7995=>434,7996=>434,7997=>434,7998=>479,7999=>479,8000=>556,8001=>556,8002=>556,8003=>556,8004=>556,8005=>556,8008=>778,8009=>778,8010=>894,8011=>894,
-	8012=>894,8013=>894,8016=>551,8017=>551,8018=>551,8019=>551,8020=>551,8021=>551,8022=>551,8023=>551,8025=>777,8027=>893,8029=>885,8031=>940,8032=>766,8033=>766,
-	8034=>766,8035=>766,8036=>766,8037=>766,8038=>766,8039=>766,8040=>758,8041=>758,8042=>874,8043=>874,8044=>868,8045=>867,8046=>911,8047=>911,8048=>576,8049=>576,
-	8050=>434,8051=>434,8052=>556,8053=>556,8054=>222,8055=>222,8056=>556,8057=>556,8058=>551,8059=>551,8060=>766,8061=>766,8064=>576,8065=>576,8066=>576,8067=>576,
-	8068=>576,8069=>576,8070=>576,8071=>576,8072=>667,8073=>667,8074=>680,8075=>680,8076=>680,8077=>680,8078=>718,8079=>718,8080=>556,8081=>556,8082=>556,8083=>556,
-	8084=>556,8085=>556,8086=>556,8087=>556,8088=>747,8089=>747,8090=>878,8091=>878,8092=>878,8093=>878,8094=>923,8095=>923,8096=>766,8097=>766,8098=>766,8099=>766,
-	8100=>766,8101=>766,8102=>766,8103=>766,8104=>758,8105=>758,8106=>874,8107=>874,8108=>868,8109=>867,8110=>911,8111=>911,8112=>576,8113=>576,8114=>576,8115=>576,
-	8116=>576,8118=>576,8119=>576,8120=>667,8121=>667,8122=>667,8123=>667,8124=>667,8125=>278,8126=>278,8127=>278,8128=>278,8129=>278,8130=>556,8131=>556,8132=>556,
-	8134=>556,8135=>556,8136=>693,8137=>704,8138=>748,8139=>759,8140=>722,8141=>278,8142=>278,8143=>278,8144=>222,8145=>222,8146=>222,8147=>222,8150=>222,8151=>222,
-	8152=>278,8153=>278,8154=>304,8155=>304,8157=>278,8158=>278,8159=>278,8160=>551,8161=>551,8162=>551,8163=>551,8164=>571,8165=>571,8166=>551,8167=>551,8168=>667,
-	8169=>667,8170=>742,8171=>746,8172=>693,8173=>278,8174=>278,8175=>278,8178=>766,8179=>766,8180=>766,8182=>766,8183=>766,8184=>778,8185=>778,8186=>758,8187=>758,
-	8188=>758,8189=>278,8190=>278,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>100,8202=>50,8203=>0,8204=>0,
-	8205=>0,8208=>333,8209=>333,8210=>556,8213=>564,8214=>428,8215=>500,8219=>222,8223=>333,8227=>350,8228=>278,8229=>556,8231=>278,8232=>0,8233=>0,8241=>1330,
-	8242=>222,8243=>372,8244=>522,8245=>206,8246=>356,8247=>506,8248=>312,8251=>1000,8252=>471,8253=>556,8254=>500,8255=>945,8256=>945,8257=>312,8258=>820,8259=>333,
-	8260=>167,8261=>278,8262=>278,8304=>333,8308=>333,8309=>333,8310=>333,8311=>333,8312=>333,8313=>333,8314=>333,8315=>333,8316=>333,8317=>210,8318=>210,8319=>333,
-	8320=>333,8321=>333,8322=>333,8323=>333,8324=>333,8325=>333,8326=>333,8327=>333,8328=>333,8329=>333,8330=>333,8331=>333,8332=>333,8333=>210,8334=>210,8352=>556,
-	8353=>556,8354=>556,8355=>556,8356=>556,8357=>833,8358=>556,8359=>556,8360=>1024,8361=>940,8362=>784,8363=>556,8400=>600,8401=>600,8402=>600,8403=>600,8404=>700,
-	8405=>700,8406=>600,8407=>600,8408=>600,8409=>600,8410=>600,8411=>600,8412=>600,8413=>900,8414=>900,8415=>900,8416=>900,8417=>700,8448=>889,8449=>889,8450=>667,
-	8451=>1022,8452=>611,8453=>889,8454=>889,8455=>501,8456=>667,8457=>921,8458=>510,8459=>906,8460=>988,8461=>722,8462=>500,8463=>500,8464=>688,8465=>553,8466=>708,
-	8467=>291,8468=>778,8469=>722,8470=>1073,8471=>737,8472=>740,8473=>556,8474=>722,8475=>927,8476=>795,8477=>667,8478=>667,8479=>667,8480=>1000,8481=>1174,8483=>722,
-	8484=>611,8485=>542,8486=>768,8487=>768,8488=>698,8489=>321,8490=>667,8491=>667,8492=>927,8493=>646,8494=>556,8495=>385,8496=>615,8497=>688,8498=>611,8499=>1115,
-	8500=>406,8501=>688,8502=>688,8503=>344,8504=>688,8531=>834,8532=>834,8533=>834,8534=>834,8535=>834,8536=>834,8537=>834,8538=>834,8539=>834,8540=>834,8541=>834,
-	8542=>834,8543=>834,8544=>278,8545=>555,8546=>832,8547=>933,8548=>667,8549=>934,8550=>1031,8551=>1268,8552=>944,8553=>667,8554=>944,8555=>1035,8556=>556,8557=>722,
-	8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>700,8564=>500,8565=>700,8566=>922,8567=>1144,8568=>712,8569=>500,8570=>712,8571=>934,8572=>222,8573=>500,
-	8574=>556,8575=>833,8576=>983,8577=>722,8578=>983,8592=>713,8593=>713,8594=>713,8595=>713,8596=>713,8597=>713,8598=>713,8599=>713,8600=>713,8601=>713,8602=>713,
-	8603=>713,8604=>713,8605=>713,8606=>713,8607=>713,8608=>713,8609=>713,8610=>713,8611=>713,8612=>713,8613=>713,8614=>713,8615=>713,8616=>713,8617=>713,8618=>713,
-	8619=>713,8620=>713,8621=>813,8622=>813,8623=>713,8624=>713,8625=>713,8626=>713,8627=>713,8628=>713,8629=>713,8630=>713,8631=>713,8632=>713,8633=>713,8634=>800,
-	8635=>800,8636=>713,8637=>713,8638=>713,8639=>713,8640=>713,8641=>713,8642=>713,8643=>713,8644=>713,8645=>713,8646=>713,8647=>713,8648=>713,8649=>713,8650=>713,
-	8651=>713,8652=>713,8653=>713,8654=>950,8655=>713,8656=>713,8657=>713,8658=>713,8659=>713,8660=>863,8661=>713,8662=>713,8663=>713,8664=>713,8665=>713,8666=>713,
-	8667=>713,8668=>813,8669=>813,8670=>713,8671=>713,8672=>713,8673=>713,8674=>713,8675=>713,8676=>713,8677=>713,8678=>713,8679=>713,8680=>713,8681=>713,8682=>713,
-	8704=>600,8705=>600,8706=>494,8707=>600,8708=>600,8709=>800,8710=>612,8711=>612,8712=>549,8713=>549,8714=>549,8715=>549,8716=>549,8717=>549,8718=>549,8719=>823,
-	8720=>823,8721=>713,8722=>584,8723=>584,8724=>584,8725=>167,8726=>278,8727=>389,8728=>400,8729=>400,8730=>600,8731=>600,8732=>600,8733=>549,8734=>549,8735=>584,
-	8736=>584,8737=>584,8738=>584,8739=>260,8740=>444,8741=>418,8742=>602,8743=>561,8744=>561,8745=>561,8746=>561,8747=>506,8748=>806,8749=>1106,8750=>506,8751=>806,
-	8752=>1106,8753=>506,8754=>506,8755=>506,8756=>561,8757=>561,8758=>422,8759=>561,8760=>584,8761=>584,8762=>584,8763=>584,8764=>584,8765=>584,8766=>584,8767=>584,
-	8768=>422,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,8775=>584,8776=>584,8777=>584,8778=>584,8779=>584,8780=>584,8781=>584,8782=>584,8783=>584,
-	8784=>584,8785=>584,8786=>584,8787=>584,8788=>737,8789=>737,8790=>584,8791=>584,8792=>584,8793=>584,8794=>584,8795=>584,8796=>584,8797=>584,8798=>584,8799=>584,
-	8800=>584,8801=>584,8802=>584,8803=>584,8804=>584,8805=>584,8806=>584,8807=>584,8808=>584,8809=>584,8810=>969,8811=>969,8812=>584,8813=>584,8814=>584,8815=>584,
-	8816=>584,8817=>584,8818=>584,8819=>584,8820=>584,8821=>584,8822=>584,8823=>584,8824=>584,8825=>584,8826=>584,8827=>584,8828=>584,8829=>584,8830=>584,8831=>584,
-	8832=>584,8833=>584,8834=>678,8835=>678,8836=>678,8837=>678,8838=>678,8839=>678,8840=>678,8841=>678,8842=>678,8843=>678,8844=>561,8845=>561,8846=>561,8847=>678,
-	8848=>678,8849=>673,8850=>673,8851=>561,8852=>561,8853=>800,8854=>800,8855=>800,8856=>800,8857=>800,8858=>800,8859=>800,8860=>800,8861=>800,8862=>800,8863=>800,
-	8864=>800,8865=>800,8866=>549,8867=>549,8868=>549,8869=>549,8870=>399,8871=>399,8872=>549,8873=>549,8874=>549,8875=>672,8876=>549,8877=>549,8878=>549,8879=>672,
-	8880=>549,8881=>549,8882=>549,8883=>549,8884=>549,8885=>549,8886=>713,8887=>713,8888=>713,8889=>549,8890=>549,8891=>584,8892=>584,8893=>584,8894=>584,8895=>584,
-	8896=>561,8897=>561,8898=>561,8899=>561,8900=>549,8901=>250,8902=>549,8903=>649,8904=>630,8905=>630,8906=>630,8907=>630,8908=>630,8909=>584,8910=>561,8911=>561,
-	8912=>668,8913=>668,8914=>668,8915=>668,8916=>561,8917=>602,8918=>584,8919=>584,8920=>1354,8921=>1354,8922=>584,8923=>584,8924=>584,8925=>584,8926=>584,8927=>584,
-	8928=>584,8929=>584,8930=>673,8931=>673,8932=>673,8933=>673,8934=>584,8935=>584,8936=>584,8937=>584,8938=>584,8939=>584,8940=>584,8941=>584,8942=>278,8943=>1000,
-	8944=>1000,8945=>1000,8960=>549,8962=>549,8963=>549,8964=>549,8965=>549,8966=>549,8967=>549,8968=>449,8969=>449,8970=>449,8971=>449,8972=>549,8973=>549,8974=>549,
-	8975=>549,8976=>549,8977=>549,8978=>800,8979=>800,8980=>549,8981=>549,8982=>549,8983=>650,8984=>780,8985=>549,8986=>549,8987=>549,8988=>549,8989=>549,8990=>549,
-	8991=>549,8992=>506,8993=>506,8994=>713,8995=>713,8996=>1000,8997=>1000,8998=>1000,8999=>1000,9000=>1000,9001=>329,9002=>329,9003=>1000,9004=>549,9005=>549,9006=>549,
-	9007=>549,9008=>549,9009=>549,9010=>549,9011=>549,9012=>549,9013=>549,9014=>600,9015=>600,9016=>600,9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,
-	9023=>600,9024=>600,9025=>600,9026=>600,9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,9037=>600,9038=>600,
-	9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,
-	9055=>600,9056=>600,9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,9067=>600,9068=>600,9069=>600,9070=>600,
-	9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9109=>600,9216=>600,9217=>600,9218=>600,
-	9219=>600,9220=>600,9221=>600,9222=>600,9223=>600,9224=>600,9225=>600,9226=>600,9227=>600,9228=>600,9229=>600,9230=>600,9231=>600,9232=>600,9233=>600,9234=>600,
-	9235=>600,9236=>600,9237=>600,9238=>600,9239=>600,9240=>600,9241=>600,9242=>600,9243=>600,9244=>600,9245=>600,9246=>600,9247=>600,9248=>600,9249=>600,9250=>600,
-	9251=>600,9252=>600,9280=>604,9281=>604,9282=>604,9283=>604,9284=>604,9285=>604,9286=>750,9287=>750,9288=>750,9289=>750,9290=>604,9312=>1000,9313=>1000,9314=>1000,
-	9315=>1000,9316=>1000,9317=>1000,9318=>1000,9319=>1000,9320=>1000,9321=>1000,9322=>1000,9323=>1000,9324=>1000,9325=>1000,9326=>1000,9327=>1000,9328=>1000,9329=>1000,9330=>1000,
-	9331=>1000,9332=>1000,9333=>1000,9334=>1000,9335=>1000,9336=>1000,9337=>1000,9338=>1000,9339=>1000,9340=>1000,9341=>1000,9342=>1000,9343=>1000,9344=>1000,9345=>1000,9346=>1000,
-	9347=>1000,9348=>1000,9349=>1000,9350=>1000,9351=>1000,9352=>1000,9353=>1000,9354=>1000,9355=>1000,9356=>1000,9357=>1000,9358=>1000,9359=>1000,9360=>1000,9361=>1000,9362=>1000,
-	9363=>1000,9364=>1000,9365=>1000,9366=>1000,9367=>1000,9368=>1000,9369=>1000,9370=>1000,9371=>1000,9372=>1000,9373=>1000,9374=>1000,9375=>1000,9376=>1000,9377=>1000,9378=>1000,
-	9379=>1000,9380=>1000,9381=>1000,9382=>1000,9383=>1000,9384=>1000,9385=>1000,9386=>1000,9387=>1000,9388=>1000,9389=>1000,9390=>1000,9391=>1000,9392=>1000,9393=>1000,9394=>1000,
-	9395=>1000,9396=>1000,9397=>1000,9398=>1000,9399=>1000,9400=>1000,9401=>1000,9402=>1000,9403=>1000,9404=>1000,9405=>1000,9406=>1000,9407=>1000,9408=>1000,9409=>1000,9410=>1000,
-	9411=>1000,9412=>1000,9413=>1000,9414=>1000,9415=>1000,9416=>1000,9417=>1000,9418=>1000,9419=>1000,9420=>1000,9421=>1000,9422=>1000,9423=>1000,9424=>1000,9425=>1000,9426=>1000,
-	9427=>1000,9428=>1000,9429=>1000,9430=>1000,9431=>1000,9432=>1000,9433=>1000,9434=>1000,9435=>1000,9436=>1000,9437=>1000,9438=>1000,9439=>1000,9440=>1000,9441=>1000,9442=>1000,
-	9443=>1000,9444=>1000,9445=>1000,9446=>1000,9447=>1000,9448=>1000,9449=>1000,9450=>1000,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,
-	9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,
-	9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,
-	9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,
-	9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,
-	9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,
-	9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,
-	9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,
-	9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,
-	9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,
-	9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,
-	9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,
-	9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,
-	9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,
-	9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9728=>750,9729=>1000,
-	9730=>750,9731=>750,9732=>1000,9733=>816,9734=>823,9735=>500,9736=>500,9737=>800,9738=>800,9739=>800,9740=>800,9741=>800,9742=>719,9743=>719,9744=>734,9745=>734,
-	9746=>734,9747=>762,9754=>960,9755=>960,9756=>939,9757=>939,9758=>939,9759=>939,9760=>750,9761=>600,9762=>750,9763=>750,9764=>580,9765=>460,9766=>444,9767=>650,
-	9768=>444,9769=>768,9770=>800,9771=>850,9772=>675,9773=>800,9774=>750,9775=>750,9776=>900,9777=>900,9778=>900,9779=>900,9780=>900,9781=>900,9782=>900,9783=>900,
-	9784=>750,9785=>750,9786=>750,9787=>750,9788=>750,9789=>750,9790=>750,9791=>740,9792=>740,9793=>740,9794=>740,9795=>653,9796=>490,9797=>632,9798=>780,9799=>560,
-	9800=>838,9801=>780,9802=>734,9803=>887,9804=>780,9805=>1080,9806=>896,9807=>1080,9808=>804,9809=>868,9810=>922,9811=>696,9812=>1000,9813=>1000,9814=>1000,9815=>1000,
-	9816=>1000,9817=>1000,9818=>1000,9819=>1000,9820=>1000,9821=>1000,9822=>1000,9823=>1000,9824=>722,9825=>734,9826=>674,9827=>804,9828=>722,9829=>734,9830=>674,9831=>804,
-	9832=>860,9833=>423,9834=>592,9835=>750,9836=>750,9837=>439,9838=>439,9839=>439,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,9993=>690,
-	9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,
-	10012=>754,10013=>494,10014=>552,10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,10026=>789,10027=>841,10028=>823,
-	10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,
-	10045=>682,10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,
-	10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,10084=>910,
-	10085=>667,10086=>760,10087=>760,10102=>788,10103=>788,10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,10114=>788,
-	10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,
-	10131=>788,10132=>894,10136=>748,10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,10147=>924,10148=>917,10149=>930,
-	10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,
-	10167=>888,10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,12288=>1000,12289=>1000,12290=>1000,12291=>1000,12292=>1000,12293=>1000,12294=>1000,12295=>1000,
-	12296=>1000,12297=>1000,12298=>1000,12299=>1000,12300=>1000,12301=>1000,12302=>1000,12303=>1000,12304=>1000,12305=>1000,12306=>1000,12307=>1000,12308=>1000,12309=>1000,12310=>1000,12311=>1000,
-	12312=>1000,12313=>1000,12314=>1000,12315=>1000,12316=>1000,12317=>1000,12318=>1000,12319=>1000,12320=>1000,12321=>1000,12322=>1000,12323=>1000,12324=>1000,12325=>1000,12326=>1000,12327=>1000,
-	12328=>1000,12329=>1000,12330=>1000,12331=>1000,12332=>1000,12333=>1000,12334=>1000,12335=>1000,12336=>1000,12337=>1000,12338=>1000,12339=>1000,12340=>1000,12341=>1000,12342=>1000,12343=>1000,
-	12351=>1000,12353=>1000,12354=>1000,12355=>1000,12356=>1000,12357=>1000,12358=>1000,12359=>1000,12360=>1000,12361=>1000,12362=>1000,12363=>1000,12364=>1000,12365=>1000,12366=>1000,12367=>1000,
-	12368=>1000,12369=>1000,12370=>1000,12371=>1000,12372=>1000,12373=>1000,12374=>1000,12375=>1000,12376=>1000,12377=>1000,12378=>1000,12379=>1000,12380=>1000,12381=>1000,12382=>1000,12383=>1000,
-	12384=>1000,12385=>1000,12386=>1000,12387=>1000,12388=>1000,12389=>1000,12390=>1000,12391=>1000,12392=>1000,12393=>1000,12394=>1000,12395=>1000,12396=>1000,12397=>1000,12398=>1000,12399=>1000,
-	12400=>1000,12401=>1000,12402=>1000,12403=>1000,12404=>1000,12405=>1000,12406=>1000,12407=>1000,12408=>1000,12409=>1000,12410=>1000,12411=>1000,12412=>1000,12413=>1000,12414=>1000,12415=>1000,
-	12416=>1000,12417=>1000,12418=>1000,12419=>1000,12420=>1000,12421=>1000,12422=>1000,12423=>1000,12424=>1000,12425=>1000,12426=>1000,12427=>1000,12428=>1000,12429=>1000,12430=>1000,12431=>1000,
-	12432=>1000,12433=>1000,12434=>1000,12435=>1000,12436=>1000,12441=>1000,12442=>1000,12443=>1000,12444=>1000,12445=>1000,12446=>1000,12449=>1000,12450=>1000,12451=>1000,12452=>1000,12453=>1000,
-	12454=>1000,12455=>1000,12456=>1000,12457=>1000,12458=>1000,12459=>1000,12460=>1000,12461=>1000,12462=>1000,12463=>1000,12464=>1000,12465=>1000,12466=>1000,12467=>1000,12468=>1000,12469=>1000,
-	12470=>1000,12471=>1000,12472=>1000,12473=>1000,12474=>1000,12475=>1000,12476=>1000,12477=>1000,12478=>1000,12479=>1000,12480=>1000,12481=>1000,12482=>1000,12483=>1000,12484=>1000,12485=>1000,
-	12486=>1000,12487=>1000,12488=>1000,12489=>1000,12490=>1000,12491=>1000,12492=>1000,12493=>1000,12494=>1000,12495=>1000,12496=>1000,12497=>1000,12498=>1000,12499=>1000,12500=>1000,12501=>1000,
-	12502=>1000,12503=>1000,12504=>1000,12505=>1000,12506=>1000,12507=>1000,12508=>1000,12509=>1000,12510=>1000,12511=>1000,12512=>1000,12513=>1000,12514=>1000,12515=>1000,12516=>1000,12517=>1000,
-	12518=>1000,12519=>1000,12520=>1000,12521=>1000,12522=>1000,12523=>1000,12524=>1000,12525=>1000,12526=>1000,12527=>1000,12528=>1000,12529=>1000,12530=>1000,12531=>1000,12532=>1000,12533=>1000,
-	12534=>1000,12535=>1000,12536=>1000,12537=>1000,12538=>1000,12539=>1000,12540=>1000,12541=>1000,12542=>1000,12549=>1000,12550=>1000,12551=>1000,12552=>1000,12553=>1000,12554=>1000,12555=>1000,
-	12556=>1000,12557=>1000,12558=>1000,12559=>1000,12560=>1000,12561=>1000,12562=>1000,12563=>1000,12564=>1000,12565=>1000,12566=>1000,12567=>1000,12568=>1000,12569=>1000,12570=>1000,12571=>1000,
-	12572=>1000,12573=>1000,12574=>1000,12575=>1000,12576=>1000,12577=>1000,12578=>1000,12579=>1000,12580=>1000,12581=>1000,12582=>1000,12583=>1000,12584=>1000,12585=>1000,12586=>1000,12587=>1000,
-	12588=>1000,12593=>1000,12594=>1000,12595=>1000,12596=>1000,12597=>1000,12598=>1000,12599=>1000,12600=>1000,12601=>1000,12602=>1000,12603=>1000,12604=>1000,12605=>1000,12606=>1000,12607=>1000,
-	12608=>1000,12609=>1000,12610=>1000,12611=>1000,12612=>1000,12613=>1000,12614=>1000,12615=>1000,12616=>1000,12617=>1000,12618=>1000,12619=>1000,12620=>1000,12621=>1000,12622=>1000,12623=>1000,
-	12624=>1000,12625=>1000,12626=>1000,12627=>1000,12628=>1000,12629=>1000,12630=>1000,12631=>1000,12632=>1000,12633=>1000,12634=>1000,12635=>1000,12636=>1000,12637=>1000,12638=>1000,12639=>1000,
-	12640=>1000,12641=>1000,12642=>1000,12643=>1000,12644=>1000,12645=>1000,12646=>1000,12647=>1000,12648=>1000,12649=>1000,12650=>1000,12651=>1000,12652=>1000,12653=>1000,12654=>1000,12655=>1000,
-	12656=>1000,12657=>1000,12658=>1000,12659=>1000,12660=>1000,12661=>1000,12662=>1000,12663=>1000,12664=>1000,12665=>1000,12666=>1000,12667=>1000,12668=>1000,12669=>1000,12670=>1000,12671=>1000,
-	12672=>1000,12673=>1000,12674=>1000,12675=>1000,12676=>1000,12677=>1000,12678=>1000,12679=>1000,12680=>1000,12681=>1000,12682=>1000,12683=>1000,12684=>1000,12685=>1000,12686=>1000,12688=>1000,
-	12689=>1000,12690=>1000,12691=>1000,12692=>1000,12693=>1000,12694=>1000,12695=>1000,12696=>1000,12697=>1000,12698=>1000,12699=>1000,12700=>1000,12701=>1000,12702=>1000,12703=>1000,12800=>1000,
-	12801=>1000,12802=>1000,12803=>1000,12804=>1000,12805=>1000,12806=>1000,12807=>1000,12808=>1000,12809=>1000,12810=>1000,12811=>1000,12812=>1000,12813=>1000,12814=>1000,12815=>1000,12816=>1000,
-	12817=>1000,12818=>1000,12819=>1000,12820=>1000,12821=>1000,12822=>1000,12823=>1000,12824=>1000,12825=>1000,12826=>1000,12827=>1000,12828=>1000,12832=>1000,12833=>1000,12834=>1000,12835=>1000,
-	12836=>1000,12837=>1000,12838=>1000,12839=>1000,12840=>1000,12841=>1000,12842=>1000,12843=>1000,12844=>1000,12845=>1000,12846=>1000,12847=>1000,12848=>1000,12849=>1000,12850=>1000,12851=>1000,
-	12852=>1000,12853=>1000,12854=>1000,12855=>1000,12856=>1000,12857=>1000,12858=>1000,12859=>1000,12860=>1000,12861=>1000,12862=>1000,12863=>1000,12864=>1000,12865=>1000,12866=>1000,12867=>1000,
-	12896=>1000,12897=>1000,12898=>1000,12899=>1000,12900=>1000,12901=>1000,12902=>1000,12903=>1000,12904=>1000,12905=>1000,12906=>1000,12907=>1000,12908=>1000,12909=>1000,12910=>1000,12911=>1000,
-	12912=>1000,12913=>1000,12914=>1000,12915=>1000,12916=>1000,12917=>1000,12918=>1000,12919=>1000,12920=>1000,12921=>1000,12922=>1000,12923=>1000,12927=>1000,12928=>1000,12929=>1000,12930=>1000,
-	12931=>1000,12932=>1000,12933=>1000,12934=>1000,12935=>1000,12936=>1000,12937=>1000,12938=>1000,12939=>1000,12940=>1000,12941=>1000,12942=>1000,12943=>1000,12944=>1000,12945=>1000,12946=>1000,
-	12947=>1000,12948=>1000,12949=>1000,12950=>1000,12951=>1000,12952=>1000,12953=>1000,12954=>1000,12955=>1000,12956=>1000,12957=>1000,12958=>1000,12959=>1000,12960=>1000,12961=>1000,12962=>1000,
-	12963=>1000,12964=>1000,12965=>1000,12966=>1000,12967=>1000,12968=>1000,12969=>1000,12970=>1000,12971=>1000,12972=>1000,12973=>1000,12974=>1000,12975=>1000,12976=>1000,12992=>1000,12993=>1000,
-	12994=>1000,12995=>1000,12996=>1000,12997=>1000,12998=>1000,12999=>1000,13000=>1000,13001=>1000,13002=>1000,13003=>1000,13008=>1000,13009=>1000,13010=>1000,13011=>1000,13012=>1000,13013=>1000,
-	13014=>1000,13015=>1000,13016=>1000,13017=>1000,13018=>1000,13019=>1000,13020=>1000,13021=>1000,13022=>1000,13023=>1000,13024=>1000,13025=>1000,13026=>1000,13027=>1000,13028=>1000,13029=>1000,
-	13030=>1000,13031=>1000,13032=>1000,13033=>1000,13034=>1000,13035=>1000,13036=>1000,13037=>1000,13038=>1000,13039=>1000,13040=>1000,13041=>1000,13042=>1000,13043=>1000,13044=>1000,13045=>1000,
-	13046=>1000,13047=>1000,13048=>1000,13049=>1000,13050=>1000,13051=>1000,13052=>1000,13053=>1000,13054=>1000,13056=>1000,13057=>1000,13058=>1000,13059=>1000,13060=>1000,13061=>1000,13062=>1000,
-	13063=>1000,13064=>1000,13065=>1000,13066=>1000,13067=>1000,13068=>1000,13069=>1000,13070=>1000,13071=>1000,13072=>1000,13073=>1000,13074=>1000,13075=>1000,13076=>1000,13077=>1000,13078=>1000,
-	13079=>1000,13080=>1000,13081=>1000,13082=>1000,13083=>1000,13084=>1000,13085=>1000,13086=>1000,13087=>1000,13088=>1000,13089=>1000,13090=>1000,13091=>1000,13092=>1000,13093=>1000,13094=>1000,
-	13095=>1000,13096=>1000,13097=>1000,13098=>1000,13099=>1000,13100=>1000,13101=>1000,13102=>1000,13103=>1000,13104=>1000,13105=>1000,13106=>1000,13107=>1000,13108=>1000,13109=>1000,13110=>1000,
-	13111=>1000,13112=>1000,13113=>1000,13114=>1000,13115=>1000,13116=>1000,13117=>1000,13118=>1000,13119=>1000,13120=>1000,13121=>1000,13122=>1000,13123=>1000,13124=>1000,13125=>1000,13126=>1000,
-	13127=>1000,13128=>1000,13129=>1000,13130=>1000,13131=>1000,13132=>1000,13133=>1000,13134=>1000,13135=>1000,13136=>1000,13137=>1000,13138=>1000,13139=>1000,13140=>1000,13141=>1000,13142=>1000,
-	13143=>1000,13144=>1000,13145=>1000,13146=>1000,13147=>1000,13148=>1000,13149=>1000,13150=>1000,13151=>1000,13152=>1000,13153=>1000,13154=>1000,13155=>1000,13156=>1000,13157=>1000,13158=>1000,
-	13159=>1000,13160=>1000,13161=>1000,13162=>1000,13163=>1000,13164=>1000,13165=>1000,13166=>1000,13167=>1000,13168=>1000,13169=>1000,13170=>1000,13171=>1000,13172=>1000,13173=>1000,13174=>1000,
-	13179=>1000,13180=>1000,13181=>1000,13182=>1000,13183=>1000,13184=>1000,13185=>1000,13186=>1000,13187=>1000,13188=>1000,13189=>1000,13190=>1000,13191=>1000,13192=>1000,13193=>1000,13194=>1000,
-	13195=>1000,13196=>1000,13197=>1000,13198=>1000,13199=>1000,13200=>1000,13201=>1000,13202=>1000,13203=>1000,13204=>1000,13205=>1000,13206=>1000,13207=>1000,13208=>1000,13209=>1000,13210=>1000,
-	13211=>1000,13212=>1000,13213=>1000,13214=>1000,13215=>1000,13216=>1000,13217=>1000,13218=>1000,13219=>1000,13220=>1000,13221=>1000,13222=>1000,13223=>1000,13224=>1000,13225=>1000,13226=>1000,
-	13227=>1000,13228=>1000,13229=>1000,13230=>1000,13231=>1000,13232=>1000,13233=>1000,13234=>1000,13235=>1000,13236=>1000,13237=>1000,13238=>1000,13239=>1000,13240=>1000,13241=>1000,13242=>1000,
-	13243=>1000,13244=>1000,13245=>1000,13246=>1000,13247=>1000,13248=>1000,13249=>1000,13250=>1000,13251=>1000,13252=>1000,13253=>1000,13254=>1000,13255=>1000,13256=>1000,13257=>1000,13258=>1000,
-	13259=>1000,13260=>1000,13261=>1000,13262=>1000,13263=>1000,13264=>1000,13265=>1000,13266=>1000,13267=>1000,13268=>1000,13269=>1000,13270=>1000,13271=>1000,13272=>1000,13273=>1000,13274=>1000,
-	13275=>1000,13276=>1000,13277=>1000,13280=>1000,13281=>1000,13282=>1000,13283=>1000,13284=>1000,13285=>1000,13286=>1000,13287=>1000,13288=>1000,13289=>1000,13290=>1000,13291=>1000,13292=>1000,
-	13293=>1000,13294=>1000,13295=>1000,13296=>1000,13297=>1000,13298=>1000,13299=>1000,13300=>1000,13301=>1000,13302=>1000,13303=>1000,13304=>1000,13305=>1000,13306=>1000,13307=>1000,13308=>1000,
-	13309=>1000,13310=>1000,59393=>316,59394=>507,59395=>507,59396=>484,59397=>484,59416=>0,59492=>480,59495=>480,59536=>458,59557=>466,59558=>480,59559=>903,61441=>500,61442=>500,
-	63232=>541,63233=>0,63234=>0,63235=>0,63236=>0,63237=>0,63238=>0,63239=>0,63240=>0,63241=>0,63242=>0,63243=>0,63244=>0,63245=>0,63246=>0,63247=>849,
-	63248=>0,63249=>0,63250=>0,63251=>0,63252=>0,63253=>0,63254=>0,63255=>0,63256=>0,63257=>0,63258=>0,63260=>333,63261=>287,63744=>1000,63745=>1000,63746=>1000,
-	63747=>1000,63748=>1000,63749=>1000,63750=>1000,63751=>1000,63752=>1000,63753=>1000,63754=>1000,63755=>1000,63756=>1000,63757=>1000,63758=>1000,63759=>1000,63760=>1000,63761=>1000,63762=>1000,
-	63763=>1000,63764=>1000,63765=>1000,63766=>1000,63767=>1000,63768=>1000,63769=>1000,63770=>1000,63771=>1000,63772=>1000,63773=>1000,63774=>1000,63775=>1000,63776=>1000,63777=>1000,63778=>1000,
-	63779=>1000,63780=>1000,63781=>1000,63782=>1000,63783=>1000,63784=>1000,63785=>1000,63786=>1000,63787=>1000,63788=>1000,63789=>1000,63790=>1000,63791=>1000,63792=>1000,63793=>1000,63794=>1000,
-	63795=>1000,63796=>1000,63797=>1000,63798=>1000,63799=>1000,63800=>1000,63801=>1000,63802=>1000,63803=>1000,63804=>1000,63805=>1000,63806=>1000,63807=>1000,63808=>1000,63809=>1000,63810=>1000,
-	63811=>1000,63812=>1000,63813=>1000,63814=>1000,63815=>1000,63816=>1000,63817=>1000,63818=>1000,63819=>1000,63820=>1000,63821=>1000,63822=>1000,63823=>1000,63824=>1000,63825=>1000,63826=>1000,
-	63827=>1000,63828=>1000,63829=>1000,63830=>1000,63831=>1000,63832=>1000,63833=>1000,63834=>1000,63835=>1000,63836=>1000,63837=>1000,63838=>1000,63839=>1000,63840=>1000,63841=>1000,63842=>1000,
-	63843=>1000,63844=>1000,63845=>1000,63846=>1000,63847=>1000,63848=>1000,63849=>1000,63850=>1000,63851=>1000,63852=>1000,63853=>1000,63854=>1000,63855=>1000,63856=>1000,63857=>1000,63858=>1000,
-	63859=>1000,63860=>1000,63861=>1000,63862=>1000,63863=>1000,63864=>1000,63865=>1000,63866=>1000,63867=>1000,63868=>1000,63869=>1000,63870=>1000,63871=>1000,63872=>1000,63873=>1000,63874=>1000,
-	63875=>1000,63876=>1000,63877=>1000,63878=>1000,63879=>1000,63880=>1000,63881=>1000,63882=>1000,63883=>1000,63884=>1000,63885=>1000,63886=>1000,63887=>1000,63888=>1000,63889=>1000,63890=>1000,
-	63891=>1000,63892=>1000,63893=>1000,63894=>1000,63895=>1000,63896=>1000,63897=>1000,63898=>1000,63899=>1000,63900=>1000,63901=>1000,63902=>1000,63903=>1000,63904=>1000,63905=>1000,63906=>1000,
-	63907=>1000,63908=>1000,63909=>1000,63910=>1000,63911=>1000,63912=>1000,63913=>1000,63914=>1000,63915=>1000,63916=>1000,63917=>1000,63918=>1000,63919=>1000,63920=>1000,63921=>1000,63922=>1000,
-	63923=>1000,63924=>1000,63925=>1000,63926=>1000,63927=>1000,63928=>1000,63929=>1000,63930=>1000,63931=>1000,63932=>1000,63933=>1000,63934=>1000,63935=>1000,63936=>1000,63937=>1000,63938=>1000,
-	63939=>1000,63940=>1000,63941=>1000,63942=>1000,63943=>1000,63944=>1000,63945=>1000,63946=>1000,63947=>1000,63948=>1000,63949=>1000,63950=>1000,63951=>1000,63952=>1000,63953=>1000,63954=>1000,
-	63955=>1000,63956=>1000,63957=>1000,63958=>1000,63959=>1000,63960=>1000,63961=>1000,63962=>1000,63963=>1000,63964=>1000,63965=>1000,63966=>1000,63967=>1000,63968=>1000,63969=>1000,63970=>1000,
-	63971=>1000,63972=>1000,63973=>1000,63974=>1000,63975=>1000,63976=>1000,63977=>1000,63978=>1000,63979=>1000,63980=>1000,63981=>1000,63982=>1000,63983=>1000,63984=>1000,63985=>1000,63986=>1000,
-	63987=>1000,63988=>1000,63989=>1000,63990=>1000,63991=>1000,63992=>1000,63993=>1000,63994=>1000,63995=>1000,63996=>1000,63997=>1000,63998=>1000,63999=>1000,64000=>1000,64001=>1000,64002=>1000,
-	64003=>1000,64004=>1000,64005=>1000,64006=>1000,64007=>1000,64008=>1000,64009=>1000,64010=>1000,64011=>1000,64012=>1000,64013=>1000,64014=>1000,64015=>1000,64016=>1000,64017=>1000,64018=>1000,
-	64019=>1000,64020=>1000,64021=>1000,64022=>1000,64023=>1000,64024=>1000,64025=>1000,64026=>1000,64027=>1000,64028=>1000,64029=>1000,64030=>1000,64031=>1000,64032=>1000,64033=>1000,64034=>1000,
-	64035=>1000,64036=>1000,64037=>1000,64038=>1000,64039=>1000,64040=>1000,64041=>1000,64042=>1000,64043=>1000,64044=>1000,64045=>1000,64256=>537,64257=>500,64258=>500,64259=>778,64260=>750,
-	64261=>532,64262=>758,64275=>784,64276=>784,64277=>784,64278=>784,64279=>893,64286=>333,64287=>590,64288=>550,64289=>709,64290=>649,64291=>730,64292=>656,64293=>605,64294=>730,
-	64295=>633,64296=>794,64297=>584,64298=>700,64299=>700,64300=>700,64301=>700,64302=>577,64303=>577,64304=>577,64305=>563,64306=>411,64307=>512,64308=>594,64309=>316,64310=>326,
-	64312=>594,64313=>316,64314=>507,64315=>527,64316=>484,64318=>594,64320=>338,64321=>604,64323=>567,64324=>569,64326=>514,64327=>583,64328=>507,64329=>700,64330=>633,64331=>316,
-	64332=>563,64333=>527,64334=>569,64335=>577,64336=>243,64337=>273,64338=>771,64339=>788,64340=>276,64341=>243,64342=>771,64343=>788,64344=>276,64345=>243,64346=>771,64347=>788,
-	64348=>276,64349=>243,64350=>771,64351=>788,64352=>276,64353=>243,64354=>771,64355=>788,64356=>276,64357=>243,64358=>771,64359=>788,64360=>276,64361=>243,64362=>957,64363=>903,
-	64364=>466,64365=>480,64366=>957,64367=>903,64368=>466,64369=>480,64370=>544,64371=>658,64372=>646,64373=>637,64374=>544,64375=>658,64376=>646,64377=>637,64378=>544,64379=>658,
-	64380=>646,64381=>637,64382=>544,64383=>658,64384=>646,64385=>637,64386=>430,64387=>458,64388=>430,64389=>458,64390=>430,64391=>458,64392=>430,64393=>458,64394=>421,64395=>436,
-	64396=>421,64397=>436,64398=>828,64399=>942,64400=>432,64401=>549,64402=>828,64403=>942,64404=>432,64405=>549,64406=>828,64407=>942,64408=>432,64409=>549,64410=>828,64411=>942,
-	64412=>432,64413=>549,64414=>692,64415=>723,64416=>692,64417=>723,64418=>276,64419=>243,64420=>514,64421=>477,64422=>514,64423=>509,64424=>273,64425=>427,64426=>706,64427=>706,
-	64428=>686,64429=>686,64430=>550,64431=>461,64432=>550,64433=>461,64467=>757,64468=>733,64469=>432,64470=>549,64471=>470,64472=>466,64473=>470,64474=>466,64475=>470,64476=>466,
-	64477=>470,64478=>470,64479=>466,64480=>470,64481=>466,64482=>470,64483=>466,64484=>781,64485=>933,64486=>276,64487=>243,64488=>276,64489=>243,64490=>547,64491=>517,64492=>783,
-	64493=>753,64494=>740,64495=>710,64496=>740,64497=>710,64498=>740,64499=>710,64500=>740,64501=>710,64502=>1207,64503=>1177,64504=>517,64505=>1067,64506=>1037,64507=>517,64508=>731,
-	64509=>793,64510=>276,64511=>243,64512=>932,64513=>932,64514=>914,64515=>1067,64516=>1077,64517=>935,64518=>935,64519=>935,64520=>917,64521=>1070,64522=>1080,64523=>932,64524=>932,
-	64525=>932,64526=>914,64527=>1067,64528=>1077,64529=>932,64530=>914,64531=>1067,64532=>1077,64533=>1305,64534=>1287,64535=>1305,64536=>1287,64537=>1305,64538=>1305,64539=>1287,64540=>1429,
-	64541=>1429,64542=>1429,64543=>1411,64544=>1476,64545=>1458,64546=>1476,64547=>1476,64548=>1476,64549=>1458,64550=>1392,64551=>1374,64552=>1374,64553=>1245,64554=>1227,64555=>1245,64556=>1227,
-	64557=>1125,64558=>1125,64559=>1125,64560=>1107,64561=>1260,64562=>1270,64563=>1125,64564=>1107,64565=>1260,64566=>1270,64567=>706,64568=>1091,64569=>1091,64570=>1091,64571=>1106,64572=>1073,
-	64573=>1226,64574=>1236,64575=>932,64576=>932,64577=>932,64578=>914,64579=>1067,64580=>1077,64581=>1140,64582=>1140,64583=>1140,64584=>1122,64585=>1275,64586=>1285,64587=>932,64588=>932,
-	64589=>932,64590=>914,64591=>1067,64592=>1077,64593=>1345,64594=>1327,64595=>1480,64596=>1490,64597=>932,64598=>932,64599=>932,64600=>914,64601=>1067,64602=>1077,64603=>430,64604=>421,
-	64605=>731,64606=>296,64607=>300,64608=>300,64609=>300,64610=>300,64611=>300,64612=>680,64613=>680,64614=>884,64615=>967,64616=>1037,64617=>1047,64618=>680,64619=>680,64620=>884,
-	64621=>967,64622=>1037,64623=>1047,64624=>680,64625=>680,64626=>884,64627=>967,64628=>1037,64629=>1047,64630=>680,64631=>680,64632=>884,64633=>967,64634=>1037,64635=>1047,64636=>1274,
-	64637=>1284,64638=>1274,64639=>1284,64640=>821,64641=>1221,64642=>1188,64643=>1341,64644=>1351,64645=>884,64646=>1037,64647=>1047,64648=>806,64649=>1173,64650=>680,64651=>680,64652=>884,
-	64653=>967,64654=>1037,64655=>1047,64656=>793,64657=>680,64658=>680,64659=>884,64660=>967,64661=>1037,64662=>1047,64663=>911,64664=>911,64665=>911,64666=>806,64667=>679,64668=>911,
-	64669=>911,64670=>911,64671=>806,64672=>679,64673=>911,64674=>911,64675=>911,64676=>806,64677=>679,64678=>806,64679=>1284,64680=>1179,64681=>1284,64682=>1179,64683=>1284,64684=>1179,
-	64685=>1408,64686=>1408,64687=>1408,64688=>1303,64689=>1455,64690=>1455,64691=>1350,64692=>1455,64693=>1455,64694=>1455,64695=>1350,64696=>1371,64697=>1266,64698=>1224,64699=>1119,64700=>1224,
-	64701=>1119,64702=>1104,64703=>1104,64704=>1104,64705=>999,64706=>1104,64707=>999,64708=>1070,64709=>1070,64710=>1070,64711=>676,64712=>965,64713=>911,64714=>911,64715=>911,64716=>806,
-	64717=>679,64718=>1119,64719=>1119,64720=>1119,64721=>1014,64722=>911,64723=>911,64724=>911,64725=>806,64726=>679,64727=>1324,64728=>1219,64729=>686,64730=>911,64731=>911,64732=>911,
-	64733=>806,64734=>679,64735=>776,64736=>649,64737=>776,64738=>649,64739=>776,64740=>649,64741=>776,64742=>649,64743=>1303,64744=>1176,64745=>1303,64746=>1176,64747=>793,64748=>1082,
-	64749=>776,64750=>776,64751=>649,64752=>776,64753=>649,64754=>306,64755=>302,64756=>298,64757=>1527,64758=>1537,64759=>1380,64760=>1390,64761=>1380,64762=>1390,64763=>1564,64764=>1574,
-	64765=>1564,64766=>1574,64767=>1440,64768=>1450,64769=>1440,64770=>1450,64771=>1440,64772=>1450,64773=>1611,64774=>1621,64775=>1611,64776=>1621,64777=>1429,64778=>1429,64779=>1429,64780=>1411,
-	64781=>1207,64782=>1207,64783=>1254,64784=>1254,64785=>1527,64786=>1537,64787=>1348,64788=>1358,64789=>1348,64790=>1358,64791=>1564,64792=>1574,64793=>1564,64794=>1574,64795=>1431,64796=>1441,
-	64797=>1431,64798=>1441,64799=>1431,64800=>1441,64801=>1611,64802=>1621,64803=>1611,64804=>1621,64805=>1429,64806=>1429,64807=>1429,64808=>1411,64809=>1207,64810=>1207,64811=>1254,64812=>1254,
-	64813=>1408,64814=>1408,64815=>1408,64816=>1303,64817=>1176,64818=>1176,64819=>1266,64820=>1408,64821=>1408,64822=>1408,64823=>1408,64824=>1408,64825=>1408,64826=>1266,64827=>1266,64828=>273,
-	64829=>243,64830=>600,64831=>600,64848=>1444,64849=>1541,64850=>1549,64851=>1444,64852=>1444,64853=>1444,64854=>1444,64855=>1444,64856=>1830,64857=>1817,64858=>1975,64859=>1964,64860=>2046,
-	64861=>2046,64862=>2202,64863=>1962,64864=>1941,64865=>1941,64866=>1944,64867=>1836,64868=>2114,64869=>2093,64870=>1991,64871=>2049,64872=>1941,64873=>2212,64874=>1962,64875=>1941,64876=>1944,
-	64877=>1836,64878=>2249,64879=>2096,64880=>1988,64881=>1925,64882=>1904,64883=>1799,64884=>2070,64885=>1833,64886=>1729,64887=>1652,64888=>1881,64889=>1729,64890=>1892,64891=>1881,64892=>1759,
-	64893=>1637,64894=>1670,64895=>1654,64896=>1522,64897=>1686,64898=>1675,64899=>1549,64900=>1541,64901=>1522,64902=>1444,64903=>1436,64904=>1444,64905=>1757,64906=>1652,64907=>1975,64908=>1757,
-	64909=>1652,64910=>1757,64911=>1652,64914=>1757,64915=>1857,64916=>1752,64917=>1444,64918=>1675,64919=>1522,64920=>1444,64921=>1675,64922=>1581,64923=>1570,64924=>1417,64925=>1362,64926=>1686,
-	64927=>1686,64928=>1675,64929=>1686,64930=>1675,64931=>1581,64932=>1570,64933=>1975,64934=>2069,64935=>1964,64936=>2202,64937=>2259,64938=>2212,64939=>2259,64940=>1686,64941=>1581,64942=>1686,
-	64943=>1686,64944=>1581,64945=>1870,64946=>1817,64947=>1686,64948=>1637,64949=>1444,64950=>1892,64951=>1886,64952=>1549,64953=>1975,64954=>1444,64955=>1723,64956=>1522,64957=>1541,64958=>2080,
-	64959=>2080,64960=>1975,64961=>1817,64962=>1686,64963=>1499,64964=>1757,64965=>1883,64966=>2212,64967=>1686,65008=>1523,65009=>1172,65010=>1159,65011=>1356,65012=>2111,65013=>2258,65014=>2130,
-	65015=>1552,65016=>2046,65017=>1856,65018=>1930,65019=>1070,65056=>450,65057=>450,65058=>450,65059=>450,65072=>1000,65073=>1000,65074=>1000,65075=>1000,65076=>1000,65077=>1000,65078=>1000,
-	65079=>1000,65080=>1000,65081=>1000,65082=>1000,65083=>1000,65084=>1000,65085=>1000,65086=>1000,65087=>1000,65088=>1000,65089=>1000,65090=>1000,65091=>1000,65092=>1000,65097=>1000,65098=>1000,
-	65099=>1000,65100=>1000,65101=>1000,65102=>1000,65103=>1000,65104=>167,65105=>250,65106=>167,65108=>167,65109=>167,65110=>334,65111=>167,65112=>600,65113=>200,65114=>200,65115=>200,
-	65116=>200,65117=>200,65118=>200,65119=>334,65120=>400,65121=>233,65122=>350,65123=>200,65124=>350,65125=>350,65126=>350,65128=>167,65129=>334,65130=>533,65131=>609,65136=>300,
-	65137=>298,65138=>296,65140=>298,65142=>300,65143=>298,65144=>300,65145=>302,65146=>298,65147=>296,65148=>306,65149=>306,65150=>154,65151=>154,65152=>529,65153=>243,65154=>273,
-	65155=>243,65156=>273,65157=>470,65158=>466,65159=>243,65160=>273,65161=>731,65162=>793,65163=>276,65164=>243,65165=>243,65166=>273,65167=>771,65168=>788,65169=>276,65170=>243,
-	65171=>514,65172=>477,65173=>771,65174=>788,65175=>276,65176=>243,65177=>771,65178=>788,65179=>276,65180=>243,65181=>544,65182=>658,65183=>646,65184=>637,65185=>544,65186=>658,
-	65187=>646,65188=>637,65189=>544,65190=>658,65191=>646,65192=>637,65193=>430,65194=>458,65195=>430,65196=>458,65197=>421,65198=>436,65199=>421,65200=>436,65201=>1194,65202=>1194,
-	65203=>770,65204=>770,65205=>1194,65206=>1194,65207=>770,65208=>770,65209=>1291,65210=>1291,65211=>817,65212=>817,65213=>1291,65214=>1291,65215=>817,65216=>817,65217=>843,65218=>843,
-	65219=>733,65220=>733,65221=>843,65222=>843,65223=>733,65224=>733,65225=>594,65226=>556,65227=>586,65228=>554,65229=>594,65230=>556,65231=>586,65232=>554,65233=>957,65234=>903,
-	65235=>466,65236=>480,65237=>800,65238=>823,65239=>466,65240=>480,65241=>757,65242=>733,65243=>432,65244=>549,65245=>662,65246=>673,65247=>273,65248=>243,65249=>589,65250=>640,
-	65251=>481,65252=>532,65253=>692,65254=>723,65255=>276,65256=>243,65257=>514,65258=>477,65259=>686,65260=>405,65261=>470,65262=>466,65263=>731,65264=>793,65265=>731,65266=>803,
-	65267=>276,65268=>243,65269=>551,65270=>603,65271=>551,65272=>603,65273=>551,65274=>603,65275=>551,65276=>603,65281=>1000,65282=>1000,65283=>1000,65284=>1000,65285=>1000,65286=>1000,
-	65287=>1000,65288=>1000,65289=>1000,65290=>1000,65291=>1000,65292=>1000,65293=>1000,65294=>1000,65295=>1000,65296=>1000,65297=>1000,65298=>1000,65299=>1000,65300=>1000,65301=>1000,65302=>1000,
-	65303=>1000,65304=>1000,65305=>1000,65306=>1000,65307=>1000,65308=>1000,65309=>1000,65310=>1000,65311=>1000,65312=>1000,65313=>1000,65314=>1000,65315=>1000,65316=>1000,65317=>1000,65318=>1000,
-	65319=>1000,65320=>1000,65321=>1000,65322=>1000,65323=>1000,65324=>1000,65325=>1000,65326=>1000,65327=>1000,65328=>1000,65329=>1000,65330=>1000,65331=>1000,65332=>1000,65333=>1000,65334=>1000,
-	65335=>1000,65336=>1000,65337=>1000,65338=>1000,65339=>1000,65340=>1000,65341=>1000,65342=>1000,65343=>1000,65344=>1000,65345=>1000,65346=>1000,65347=>1000,65348=>1000,65349=>1000,65350=>1000,
-	65351=>1000,65352=>1000,65353=>1000,65354=>1000,65355=>1000,65356=>1000,65357=>1000,65358=>1000,65359=>1000,65360=>1000,65361=>1000,65362=>1000,65363=>1000,65364=>1000,65365=>1000,65366=>1000,
-	65367=>1000,65368=>1000,65369=>1000,65370=>1000,65371=>1000,65372=>1000,65373=>1000,65374=>1000,65377=>500,65378=>500,65379=>500,65380=>500,65381=>500,65382=>500,65383=>500,65384=>500,
-	65385=>500,65386=>500,65387=>500,65388=>500,65389=>500,65390=>500,65391=>500,65392=>500,65393=>500,65394=>500,65395=>500,65396=>500,65397=>500,65398=>500,65399=>500,65400=>500,
-	65401=>500,65402=>500,65403=>500,65404=>500,65405=>500,65406=>500,65407=>500,65408=>500,65409=>500,65410=>500,65411=>500,65412=>500,65413=>500,65414=>500,65415=>500,65416=>500,
-	65417=>500,65418=>500,65419=>500,65420=>500,65421=>500,65422=>500,65423=>500,65424=>500,65425=>500,65426=>500,65427=>500,65428=>500,65429=>500,65430=>500,65431=>500,65432=>500,
-	65433=>500,65434=>500,65435=>500,65436=>500,65437=>500,65438=>500,65439=>500,65440=>500,65441=>500,65442=>500,65443=>500,65444=>500,65445=>500,65446=>500,65447=>500,65448=>500,
-	65449=>500,65450=>500,65451=>500,65452=>500,65453=>500,65454=>500,65455=>500,65456=>500,65457=>500,65458=>500,65459=>500,65460=>500,65461=>500,65462=>500,65463=>500,65464=>500,
-	65465=>500,65466=>500,65467=>500,65468=>500,65469=>500,65470=>500,65474=>500,65475=>500,65476=>500,65477=>500,65478=>500,65479=>500,65482=>500,65483=>500,65484=>500,65485=>500,
-	65486=>500,65487=>500,65490=>500,65491=>500,65492=>500,65493=>500,65494=>500,65495=>500,65498=>500,65499=>500,65500=>500,65504=>1000,65505=>1000,65506=>1000,65507=>1000,65508=>1000,
-	65509=>1000,65510=>1000,65512=>500,65513=>500,65514=>500,65515=>500,65516=>500,65517=>500,65518=>500,65532=>1000,65533=>1000,19968=>1000,19969=>1000,19970=>1000,19971=>1000,19972=>1000,
-	19973=>1000,19974=>1000,19975=>1000,19976=>1000,19977=>1000,19978=>1000,19979=>1000,19980=>1000,19981=>1000,19982=>1000,19983=>1000,19984=>1000,19985=>1000,19986=>1000,19987=>1000,19988=>1000,
-	19989=>1000,19990=>1000,19991=>1000,19992=>1000,19993=>1000,19994=>1000,19995=>1000,19996=>1000,19997=>1000,19998=>1000,19999=>1000,20000=>1000,20001=>1000,20002=>1000,20003=>1000,20004=>1000,
-	20005=>1000,20006=>1000,20007=>1000,20008=>1000,20009=>1000,20010=>1000,20011=>1000,20012=>1000,20013=>1000,20014=>1000,20015=>1000,20016=>1000,20017=>1000,20018=>1000,20019=>1000,20020=>1000,
-	20021=>1000,20022=>1000,20023=>1000,20024=>1000,20025=>1000,20026=>1000,20027=>1000,20028=>1000,20029=>1000,20030=>1000,20031=>1000,20032=>1000,20033=>1000,20034=>1000,20035=>1000,20036=>1000,
-	20037=>1000,20038=>1000,20039=>1000,20040=>1000,20041=>1000,20042=>1000,20043=>1000,20044=>1000,20045=>1000,20046=>1000,20047=>1000,20048=>1000,20049=>1000,20050=>1000,20051=>1000,20052=>1000,
-	20053=>1000,20054=>1000,20055=>1000,20056=>1000,20057=>1000,20058=>1000,20059=>1000,20060=>1000,20061=>1000,20062=>1000,20063=>1000,20064=>1000,20065=>1000,20066=>1000,20067=>1000,20068=>1000,
-	20069=>1000,20070=>1000,20071=>1000,20072=>1000,20073=>1000,20074=>1000,20075=>1000,20076=>1000,20077=>1000,20078=>1000,20079=>1000,20080=>1000,20081=>1000,20082=>1000,20083=>1000,20084=>1000,
-	20085=>1000,20086=>1000,20087=>1000,20088=>1000,20089=>1000,20090=>1000,20091=>1000,20092=>1000,20093=>1000,20094=>1000,20095=>1000,20096=>1000,20097=>1000,20098=>1000,20099=>1000,20100=>1000,
-	20101=>1000,20102=>1000,20103=>1000,20104=>1000,20105=>1000,20106=>1000,20107=>1000,20108=>1000,20109=>1000,20110=>1000,20111=>1000,20112=>1000,20113=>1000,20114=>1000,20115=>1000,20116=>1000,
-	20117=>1000,20118=>1000,20119=>1000,20120=>1000,20121=>1000,20122=>1000,20123=>1000,20124=>1000,20125=>1000,20126=>1000,20127=>1000,20128=>1000,20129=>1000,20130=>1000,20131=>1000,20132=>1000,
-	20133=>1000,20134=>1000,20135=>1000,20136=>1000,20137=>1000,20138=>1000,20139=>1000,20140=>1000,20141=>1000,20142=>1000,20143=>1000,20144=>1000,20145=>1000,20146=>1000,20147=>1000,20148=>1000,
-	20149=>1000,20150=>1000,20151=>1000,20152=>1000,20153=>1000,20154=>1000,20155=>1000,20156=>1000,20157=>1000,20158=>1000,20159=>1000,20160=>1000,20161=>1000,20162=>1000,20163=>1000,20164=>1000,
-	20165=>1000,20166=>1000,20167=>1000,20168=>1000,20169=>1000,20170=>1000,20171=>1000,20172=>1000,20173=>1000,20174=>1000,20175=>1000,20176=>1000,20177=>1000,20178=>1000,20179=>1000,20180=>1000,
-	20181=>1000,20182=>1000,20183=>1000,20184=>1000,20185=>1000,20186=>1000,20187=>1000,20188=>1000,20189=>1000,20190=>1000,20191=>1000,20192=>1000,20193=>1000,20194=>1000,20195=>1000,20196=>1000,
-	20197=>1000,20198=>1000,20199=>1000,20200=>1000,20201=>1000,20202=>1000,20203=>1000,20204=>1000,20205=>1000,20206=>1000,20207=>1000,20208=>1000,20209=>1000,20210=>1000,20211=>1000,20212=>1000,
-	20213=>1000,20214=>1000,20215=>1000,20216=>1000,20217=>1000,20218=>1000,20219=>1000,20220=>1000,20221=>1000,20222=>1000,20223=>1000,20224=>1000,20225=>1000,20226=>1000,20227=>1000,20228=>1000,
-	20229=>1000,20230=>1000,20231=>1000,20232=>1000,20233=>1000,20234=>1000,20235=>1000,20236=>1000,20237=>1000,20238=>1000,20239=>1000,20240=>1000,20241=>1000,20242=>1000,20243=>1000,20244=>1000,
-	20245=>1000,20246=>1000,20247=>1000,20248=>1000,20249=>1000,20250=>1000,20251=>1000,20252=>1000,20253=>1000,20254=>1000,20255=>1000,20256=>1000,20257=>1000,20258=>1000,20259=>1000,20260=>1000,
-	20261=>1000,20262=>1000,20263=>1000,20264=>1000,20265=>1000,20266=>1000,20267=>1000,20268=>1000,20269=>1000,20270=>1000,20271=>1000,20272=>1000,20273=>1000,20274=>1000,20275=>1000,20276=>1000,
-	20277=>1000,20278=>1000,20279=>1000,20280=>1000,20281=>1000,20282=>1000,20283=>1000,20284=>1000,20285=>1000,20286=>1000,20287=>1000,20288=>1000,20289=>1000,20290=>1000,20291=>1000,20292=>1000,
-	20293=>1000,20294=>1000,20295=>1000,20296=>1000,20297=>1000,20298=>1000,20299=>1000,20300=>1000,20301=>1000,20302=>1000,20303=>1000,20304=>1000,20305=>1000,20306=>1000,20307=>1000,20308=>1000,
-	20309=>1000,20310=>1000,20311=>1000,20312=>1000,20313=>1000,20314=>1000,20315=>1000,20316=>1000,20317=>1000,20318=>1000,20319=>1000,20320=>1000,20321=>1000,20322=>1000,20323=>1000,20324=>1000,
-	20325=>1000,20326=>1000,20327=>1000,20328=>1000,20329=>1000,20330=>1000,20331=>1000,20332=>1000,20333=>1000,20334=>1000,20335=>1000,20336=>1000,20337=>1000,20338=>1000,20339=>1000,20340=>1000,
-	20341=>1000,20342=>1000,20343=>1000,20344=>1000,20345=>1000,20346=>1000,20347=>1000,20348=>1000,20349=>1000,20350=>1000,20351=>1000,20352=>1000,20353=>1000,20354=>1000,20355=>1000,20356=>1000,
-	20357=>1000,20358=>1000,20359=>1000,20360=>1000,20361=>1000,20362=>1000,20363=>1000,20364=>1000,20365=>1000,20366=>1000,20367=>1000,20368=>1000,20369=>1000,20370=>1000,20371=>1000,20372=>1000,
-	20373=>1000,20374=>1000,20375=>1000,20376=>1000,20377=>1000,20378=>1000,20379=>1000,20380=>1000,20381=>1000,20382=>1000,20383=>1000,20384=>1000,20385=>1000,20386=>1000,20387=>1000,20388=>1000,
-	20389=>1000,20390=>1000,20391=>1000,20392=>1000,20393=>1000,20394=>1000,20395=>1000,20396=>1000,20397=>1000,20398=>1000,20399=>1000,20400=>1000,20401=>1000,20402=>1000,20403=>1000,20404=>1000,
-	20405=>1000,20406=>1000,20407=>1000,20408=>1000,20409=>1000,20410=>1000,20411=>1000,20412=>1000,20413=>1000,20414=>1000,20415=>1000,20416=>1000,20417=>1000,20418=>1000,20419=>1000,20420=>1000,
-	20421=>1000,20422=>1000,20423=>1000,20424=>1000,20425=>1000,20426=>1000,20427=>1000,20428=>1000,20429=>1000,20430=>1000,20431=>1000,20432=>1000,20433=>1000,20434=>1000,20435=>1000,20436=>1000,
-	20437=>1000,20438=>1000,20439=>1000,20440=>1000,20441=>1000,20442=>1000,20443=>1000,20444=>1000,20445=>1000,20446=>1000,20447=>1000,20448=>1000,20449=>1000,20450=>1000,20451=>1000,20452=>1000,
-	20453=>1000,20454=>1000,20455=>1000,20456=>1000,20457=>1000,20458=>1000,20459=>1000,20460=>1000,20461=>1000,20462=>1000,20463=>1000,20464=>1000,20465=>1000,20466=>1000,20467=>1000,20468=>1000,
-	20469=>1000,20470=>1000,20471=>1000,20472=>1000,20473=>1000,20474=>1000,20475=>1000,20476=>1000,20477=>1000,20478=>1000,20479=>1000,20480=>1000,20481=>1000,20482=>1000,20483=>1000,20484=>1000,
-	20485=>1000,20486=>1000,20487=>1000,20488=>1000,20489=>1000,20490=>1000,20491=>1000,20492=>1000,20493=>1000,20494=>1000,20495=>1000,20496=>1000,20497=>1000,20498=>1000,20499=>1000,20500=>1000,
-	20501=>1000,20502=>1000,20503=>1000,20504=>1000,20505=>1000,20506=>1000,20507=>1000,20508=>1000,20509=>1000,20510=>1000,20511=>1000,20512=>1000,20513=>1000,20514=>1000,20515=>1000,20516=>1000,
-	20517=>1000,20518=>1000,20519=>1000,20520=>1000,20521=>1000,20522=>1000,20523=>1000,20524=>1000,20525=>1000,20526=>1000,20527=>1000,20528=>1000,20529=>1000,20530=>1000,20531=>1000,20532=>1000,
-	20533=>1000,20534=>1000,20535=>1000,20536=>1000,20537=>1000,20538=>1000,20539=>1000,20540=>1000,20541=>1000,20542=>1000,20543=>1000,20544=>1000,20545=>1000,20546=>1000,20547=>1000,20548=>1000,
-	20549=>1000,20550=>1000,20551=>1000,20552=>1000,20553=>1000,20554=>1000,20555=>1000,20556=>1000,20557=>1000,20558=>1000,20559=>1000,20560=>1000,20561=>1000,20562=>1000,20563=>1000,20564=>1000,
-	20565=>1000,20566=>1000,20567=>1000,20568=>1000,20569=>1000,20570=>1000,20571=>1000,20572=>1000,20573=>1000,20574=>1000,20575=>1000,20576=>1000,20577=>1000,20578=>1000,20579=>1000,20580=>1000,
-	20581=>1000,20582=>1000,20583=>1000,20584=>1000,20585=>1000,20586=>1000,20587=>1000,20588=>1000,20589=>1000,20590=>1000,20591=>1000,20592=>1000,20593=>1000,20594=>1000,20595=>1000,20596=>1000,
-	20597=>1000,20598=>1000,20599=>1000,20600=>1000,20601=>1000,20602=>1000,20603=>1000,20604=>1000,20605=>1000,20606=>1000,20607=>1000,20608=>1000,20609=>1000,20610=>1000,20611=>1000,20612=>1000,
-	20613=>1000,20614=>1000,20615=>1000,20616=>1000,20617=>1000,20618=>1000,20619=>1000,20620=>1000,20621=>1000,20622=>1000,20623=>1000,20624=>1000,20625=>1000,20626=>1000,20627=>1000,20628=>1000,
-	20629=>1000,20630=>1000,20631=>1000,20632=>1000,20633=>1000,20634=>1000,20635=>1000,20636=>1000,20637=>1000,20638=>1000,20639=>1000,20640=>1000,20641=>1000,20642=>1000,20643=>1000,20644=>1000,
-	20645=>1000,20646=>1000,20647=>1000,20648=>1000,20649=>1000,20650=>1000,20651=>1000,20652=>1000,20653=>1000,20654=>1000,20655=>1000,20656=>1000,20657=>1000,20658=>1000,20659=>1000,20660=>1000,
-	20661=>1000,20662=>1000,20663=>1000,20664=>1000,20665=>1000,20666=>1000,20667=>1000,20668=>1000,20669=>1000,20670=>1000,20671=>1000,20672=>1000,20673=>1000,20674=>1000,20675=>1000,20676=>1000,
-	20677=>1000,20678=>1000,20679=>1000,20680=>1000,20681=>1000,20682=>1000,20683=>1000,20684=>1000,20685=>1000,20686=>1000,20687=>1000,20688=>1000,20689=>1000,20690=>1000,20691=>1000,20692=>1000,
-	20693=>1000,20694=>1000,20695=>1000,20696=>1000,20697=>1000,20698=>1000,20699=>1000,20700=>1000,20701=>1000,20702=>1000,20703=>1000,20704=>1000,20705=>1000,20706=>1000,20707=>1000,20708=>1000,
-	20709=>1000,20710=>1000,20711=>1000,20712=>1000,20713=>1000,20714=>1000,20715=>1000,20716=>1000,20717=>1000,20718=>1000,20719=>1000,20720=>1000,20721=>1000,20722=>1000,20723=>1000,20724=>1000,
-	20725=>1000,20726=>1000,20727=>1000,20728=>1000,20729=>1000,20730=>1000,20731=>1000,20732=>1000,20733=>1000,20734=>1000,20735=>1000,20736=>1000,20737=>1000,20738=>1000,20739=>1000,20740=>1000,
-	20741=>1000,20742=>1000,20743=>1000,20744=>1000,20745=>1000,20746=>1000,20747=>1000,20748=>1000,20749=>1000,20750=>1000,20751=>1000,20752=>1000,20753=>1000,20754=>1000,20755=>1000,20756=>1000,
-	20757=>1000,20758=>1000,20759=>1000,20760=>1000,20761=>1000,20762=>1000,20763=>1000,20764=>1000,20765=>1000,20766=>1000,20767=>1000,20768=>1000,20769=>1000,20770=>1000,20771=>1000,20772=>1000,
-	20773=>1000,20774=>1000,20775=>1000,20776=>1000,20777=>1000,20778=>1000,20779=>1000,20780=>1000,20781=>1000,20782=>1000,20783=>1000,20784=>1000,20785=>1000,20786=>1000,20787=>1000,20788=>1000,
-	20789=>1000,20790=>1000,20791=>1000,20792=>1000,20793=>1000,20794=>1000,20795=>1000,20796=>1000,20797=>1000,20798=>1000,20799=>1000,20800=>1000,20801=>1000,20802=>1000,20803=>1000,20804=>1000,
-	20805=>1000,20806=>1000,20807=>1000,20808=>1000,20809=>1000,20810=>1000,20811=>1000,20812=>1000,20813=>1000,20814=>1000,20815=>1000,20816=>1000,20817=>1000,20818=>1000,20819=>1000,20820=>1000,
-	20821=>1000,20822=>1000,20823=>1000,20824=>1000,20825=>1000,20826=>1000,20827=>1000,20828=>1000,20829=>1000,20830=>1000,20831=>1000,20832=>1000,20833=>1000,20834=>1000,20835=>1000,20836=>1000,
-	20837=>1000,20838=>1000,20839=>1000,20840=>1000,20841=>1000,20842=>1000,20843=>1000,20844=>1000,20845=>1000,20846=>1000,20847=>1000,20848=>1000,20849=>1000,20850=>1000,20851=>1000,20852=>1000,
-	20853=>1000,20854=>1000,20855=>1000,20856=>1000,20857=>1000,20858=>1000,20859=>1000,20860=>1000,20861=>1000,20862=>1000,20863=>1000,20864=>1000,20865=>1000,20866=>1000,20867=>1000,20868=>1000,
-	20869=>1000,20870=>1000,20871=>1000,20872=>1000,20873=>1000,20874=>1000,20875=>1000,20876=>1000,20877=>1000,20878=>1000,20879=>1000,20880=>1000,20881=>1000,20882=>1000,20883=>1000,20884=>1000,
-	20885=>1000,20886=>1000,20887=>1000,20888=>1000,20889=>1000,20890=>1000,20891=>1000,20892=>1000,20893=>1000,20894=>1000,20895=>1000,20896=>1000,20897=>1000,20898=>1000,20899=>1000,20900=>1000,
-	20901=>1000,20902=>1000,20903=>1000,20904=>1000,20905=>1000,20906=>1000,20907=>1000,20908=>1000,20909=>1000,20910=>1000,20911=>1000,20912=>1000,20913=>1000,20914=>1000,20915=>1000,20916=>1000,
-	20917=>1000,20918=>1000,20919=>1000,20920=>1000,20921=>1000,20922=>1000,20923=>1000,20924=>1000,20925=>1000,20926=>1000,20927=>1000,20928=>1000,20929=>1000,20930=>1000,20931=>1000,20932=>1000,
-	20933=>1000,20934=>1000,20935=>1000,20936=>1000,20937=>1000,20938=>1000,20939=>1000,20940=>1000,20941=>1000,20942=>1000,20943=>1000,20944=>1000,20945=>1000,20946=>1000,20947=>1000,20948=>1000,
-	20949=>1000,20950=>1000,20951=>1000,20952=>1000,20953=>1000,20954=>1000,20955=>1000,20956=>1000,20957=>1000,20958=>1000,20959=>1000,20960=>1000,20961=>1000,20962=>1000,20963=>1000,20964=>1000,
-	20965=>1000,20966=>1000,20967=>1000,20968=>1000,20969=>1000,20970=>1000,20971=>1000,20972=>1000,20973=>1000,20974=>1000,20975=>1000,20976=>1000,20977=>1000,20978=>1000,20979=>1000,20980=>1000,
-	20981=>1000,20982=>1000,20983=>1000,20984=>1000,20985=>1000,20986=>1000,20987=>1000,20988=>1000,20989=>1000,20990=>1000,20991=>1000,20992=>1000,20993=>1000,20994=>1000,20995=>1000,20996=>1000,
-	20997=>1000,20998=>1000,20999=>1000,21000=>1000,21001=>1000,21002=>1000,21003=>1000,21004=>1000,21005=>1000,21006=>1000,21007=>1000,21008=>1000,21009=>1000,21010=>1000,21011=>1000,21012=>1000,
-	21013=>1000,21014=>1000,21015=>1000,21016=>1000,21017=>1000,21018=>1000,21019=>1000,21020=>1000,21021=>1000,21022=>1000,21023=>1000,21024=>1000,21025=>1000,21026=>1000,21027=>1000,21028=>1000,
-	21029=>1000,21030=>1000,21031=>1000,21032=>1000,21033=>1000,21034=>1000,21035=>1000,21036=>1000,21037=>1000,21038=>1000,21039=>1000,21040=>1000,21041=>1000,21042=>1000,21043=>1000,21044=>1000,
-	21045=>1000,21046=>1000,21047=>1000,21048=>1000,21049=>1000,21050=>1000,21051=>1000,21052=>1000,21053=>1000,21054=>1000,21055=>1000,21056=>1000,21057=>1000,21058=>1000,21059=>1000,21060=>1000,
-	21061=>1000,21062=>1000,21063=>1000,21064=>1000,21065=>1000,21066=>1000,21067=>1000,21068=>1000,21069=>1000,21070=>1000,21071=>1000,21072=>1000,21073=>1000,21074=>1000,21075=>1000,21076=>1000,
-	21077=>1000,21078=>1000,21079=>1000,21080=>1000,21081=>1000,21082=>1000,21083=>1000,21084=>1000,21085=>1000,21086=>1000,21087=>1000,21088=>1000,21089=>1000,21090=>1000,21091=>1000,21092=>1000,
-	21093=>1000,21094=>1000,21095=>1000,21096=>1000,21097=>1000,21098=>1000,21099=>1000,21100=>1000,21101=>1000,21102=>1000,21103=>1000,21104=>1000,21105=>1000,21106=>1000,21107=>1000,21108=>1000,
-	21109=>1000,21110=>1000,21111=>1000,21112=>1000,21113=>1000,21114=>1000,21115=>1000,21116=>1000,21117=>1000,21118=>1000,21119=>1000,21120=>1000,21121=>1000,21122=>1000,21123=>1000,21124=>1000,
-	21125=>1000,21126=>1000,21127=>1000,21128=>1000,21129=>1000,21130=>1000,21131=>1000,21132=>1000,21133=>1000,21134=>1000,21135=>1000,21136=>1000,21137=>1000,21138=>1000,21139=>1000,21140=>1000,
-	21141=>1000,21142=>1000,21143=>1000,21144=>1000,21145=>1000,21146=>1000,21147=>1000,21148=>1000,21149=>1000,21150=>1000,21151=>1000,21152=>1000,21153=>1000,21154=>1000,21155=>1000,21156=>1000,
-	21157=>1000,21158=>1000,21159=>1000,21160=>1000,21161=>1000,21162=>1000,21163=>1000,21164=>1000,21165=>1000,21166=>1000,21167=>1000,21168=>1000,21169=>1000,21170=>1000,21171=>1000,21172=>1000,
-	21173=>1000,21174=>1000,21175=>1000,21176=>1000,21177=>1000,21178=>1000,21179=>1000,21180=>1000,21181=>1000,21182=>1000,21183=>1000,21184=>1000,21185=>1000,21186=>1000,21187=>1000,21188=>1000,
-	21189=>1000,21190=>1000,21191=>1000,21192=>1000,21193=>1000,21194=>1000,21195=>1000,21196=>1000,21197=>1000,21198=>1000,21199=>1000,21200=>1000,21201=>1000,21202=>1000,21203=>1000,21204=>1000,
-	21205=>1000,21206=>1000,21207=>1000,21208=>1000,21209=>1000,21210=>1000,21211=>1000,21212=>1000,21213=>1000,21214=>1000,21215=>1000,21216=>1000,21217=>1000,21218=>1000,21219=>1000,21220=>1000,
-	21221=>1000,21222=>1000,21223=>1000,21224=>1000,21225=>1000,21226=>1000,21227=>1000,21228=>1000,21229=>1000,21230=>1000,21231=>1000,21232=>1000,21233=>1000,21234=>1000,21235=>1000,21236=>1000,
-	21237=>1000,21238=>1000,21239=>1000,21240=>1000,21241=>1000,21242=>1000,21243=>1000,21244=>1000,21245=>1000,21246=>1000,21247=>1000,21248=>1000,21249=>1000,21250=>1000,21251=>1000,21252=>1000,
-	21253=>1000,21254=>1000,21255=>1000,21256=>1000,21257=>1000,21258=>1000,21259=>1000,21260=>1000,21261=>1000,21262=>1000,21263=>1000,21264=>1000,21265=>1000,21266=>1000,21267=>1000,21268=>1000,
-	21269=>1000,21270=>1000,21271=>1000,21272=>1000,21273=>1000,21274=>1000,21275=>1000,21276=>1000,21277=>1000,21278=>1000,21279=>1000,21280=>1000,21281=>1000,21282=>1000,21283=>1000,21284=>1000,
-	21285=>1000,21286=>1000,21287=>1000,21288=>1000,21289=>1000,21290=>1000,21291=>1000,21292=>1000,21293=>994,21294=>1000,21295=>1000,21296=>1000,21297=>1000,21298=>1000,21299=>1000,21300=>1000,
-	21301=>1000,21302=>1000,21303=>1000,21304=>1000,21305=>1000,21306=>1000,21307=>1000,21308=>1000,21309=>1000,21310=>1000,21311=>1000,21312=>1000,21313=>1000,21314=>1000,21315=>1000,21316=>1000,
-	21317=>1000,21318=>1000,21319=>1000,21320=>1000,21321=>1000,21322=>1000,21323=>1000,21324=>1000,21325=>1000,21326=>1000,21327=>1000,21328=>1000,21329=>1000,21330=>1000,21331=>1000,21332=>1000,
-	21333=>1000,21334=>1000,21335=>1000,21336=>1000,21337=>1000,21338=>1000,21339=>1000,21340=>1000,21341=>1000,21342=>1000,21343=>1000,21344=>1000,21345=>1000,21346=>1000,21347=>1000,21348=>1000,
-	21349=>1000,21350=>1000,21351=>1000,21352=>1000,21353=>1000,21354=>1000,21355=>1000,21356=>1000,21357=>1000,21358=>1000,21359=>1000,21360=>1000,21361=>1000,21362=>1000,21363=>1000,21364=>1000,
-	21365=>1000,21366=>1000,21367=>1000,21368=>1000,21369=>1000,21370=>1000,21371=>1000,21372=>1000,21373=>1000,21374=>1000,21375=>1000,21376=>1000,21377=>1000,21378=>1000,21379=>1000,21380=>1000,
-	21381=>1000,21382=>1000,21383=>1000,21384=>1000,21385=>1000,21386=>1000,21387=>1000,21388=>1000,21389=>1000,21390=>1000,21391=>1000,21392=>1000,21393=>1000,21394=>1000,21395=>1000,21396=>1000,
-	21397=>1000,21398=>1000,21399=>1000,21400=>1000,21401=>1000,21402=>1000,21403=>1000,21404=>1000,21405=>1000,21406=>1000,21407=>1000,21408=>1000,21409=>1000,21410=>1000,21411=>1000,21412=>1000,
-	21413=>1000,21414=>1000,21415=>1000,21416=>1000,21417=>1000,21418=>1000,21419=>1000,21420=>1000,21421=>1000,21422=>1000,21423=>1000,21424=>1000,21425=>1000,21426=>1000,21427=>1000,21428=>1000,
-	21429=>1000,21430=>1000,21431=>1000,21432=>1000,21433=>1000,21434=>1000,21435=>1000,21436=>1000,21437=>1000,21438=>1000,21439=>1000,21440=>1000,21441=>1000,21442=>1000,21443=>1000,21444=>1000,
-	21445=>1000,21446=>1000,21447=>1000,21448=>1000,21449=>1000,21450=>1000,21451=>1000,21452=>1000,21453=>1000,21454=>1000,21455=>1000,21456=>1000,21457=>1000,21458=>1000,21459=>1000,21460=>1000,
-	21461=>1000,21462=>1000,21463=>1000,21464=>1000,21465=>1000,21466=>1000,21467=>1000,21468=>1000,21469=>1000,21470=>1000,21471=>1000,21472=>1000,21473=>1000,21474=>1000,21475=>1000,21476=>1000,
-	21477=>1000,21478=>1000,21479=>1000,21480=>1000,21481=>1000,21482=>1000,21483=>1000,21484=>1000,21485=>1000,21486=>1000,21487=>1000,21488=>1000,21489=>1000,21490=>1000,21491=>1000,21492=>1000,
-	21493=>1000,21494=>1000,21495=>1000,21496=>1000,21497=>1000,21498=>1000,21499=>1000,21500=>1000,21501=>1000,21502=>1000,21503=>1000,21504=>1000,21505=>1000,21506=>1000,21507=>1000,21508=>1000,
-	21509=>1000,21510=>1000,21511=>1000,21512=>1000,21513=>1000,21514=>1000,21515=>1000,21516=>1000,21517=>1000,21518=>1000,21519=>1000,21520=>1000,21521=>1000,21522=>1000,21523=>1000,21524=>1000,
-	21525=>1000,21526=>1000,21527=>1000,21528=>1000,21529=>1000,21530=>1000,21531=>1000,21532=>1000,21533=>1000,21534=>1000,21535=>1000,21536=>1000,21537=>1000,21538=>1000,21539=>1000,21540=>1000,
-	21541=>1000,21542=>1000,21543=>1000,21544=>1000,21545=>1000,21546=>1000,21547=>1000,21548=>1000,21549=>1000,21550=>1000,21551=>1000,21552=>1000,21553=>1000,21554=>1000,21555=>1000,21556=>1000,
-	21557=>1000,21558=>1000,21559=>1000,21560=>1000,21561=>1000,21562=>1000,21563=>1000,21564=>1000,21565=>1000,21566=>1000,21567=>1000,21568=>1000,21569=>1000,21570=>1000,21571=>1000,21572=>1000,
-	21573=>1000,21574=>1000,21575=>1000,21576=>1000,21577=>1000,21578=>1000,21579=>1000,21580=>1000,21581=>1000,21582=>1000,21583=>1000,21584=>1000,21585=>1000,21586=>1000,21587=>1000,21588=>1000,
-	21589=>1000,21590=>1000,21591=>1000,21592=>1000,21593=>1000,21594=>1000,21595=>1000,21596=>1000,21597=>1000,21598=>1000,21599=>1000,21600=>1000,21601=>1000,21602=>1000,21603=>1000,21604=>1000,
-	21605=>1000,21606=>1000,21607=>1000,21608=>1000,21609=>1000,21610=>1000,21611=>1000,21612=>1000,21613=>1000,21614=>1000,21615=>1000,21616=>1000,21617=>1000,21618=>1000,21619=>1000,21620=>1000,
-	21621=>1000,21622=>1000,21623=>1000,21624=>1000,21625=>1000,21626=>1000,21627=>1000,21628=>1000,21629=>1000,21630=>1000,21631=>1000,21632=>1000,21633=>1000,21634=>1000,21635=>1000,21636=>1000,
-	21637=>1000,21638=>1000,21639=>1000,21640=>1000,21641=>1000,21642=>1000,21643=>1000,21644=>1000,21645=>1000,21646=>1000,21647=>1000,21648=>1000,21649=>1000,21650=>1000,21651=>1000,21652=>1000,
-	21653=>1000,21654=>1000,21655=>1000,21656=>1000,21657=>1000,21658=>1000,21659=>1000,21660=>1000,21661=>1000,21662=>1000,21663=>1000,21664=>1000,21665=>1000,21666=>1000,21667=>1000,21668=>1000,
-	21669=>1000,21670=>1000,21671=>1000,21672=>1000,21673=>1000,21674=>1000,21675=>1000,21676=>1000,21677=>1000,21678=>1000,21679=>1000,21680=>1000,21681=>1000,21682=>1000,21683=>1000,21684=>1000,
-	21685=>1000,21686=>1000,21687=>1000,21688=>1000,21689=>1000,21690=>1000,21691=>1000,21692=>1000,21693=>1000,21694=>1000,21695=>1000,21696=>1000,21697=>1000,21698=>1000,21699=>1000,21700=>1000,
-	21701=>1000,21702=>1000,21703=>1000,21704=>1000,21705=>1000,21706=>1000,21707=>1000,21708=>1000,21709=>1000,21710=>1000,21711=>1000,21712=>1000,21713=>1000,21714=>1000,21715=>1000,21716=>1000,
-	21717=>1000,21718=>1000,21719=>1000,21720=>1000,21721=>1000,21722=>1000,21723=>1000,21724=>1000,21725=>1000,21726=>1000,21727=>1000,21728=>1000,21729=>1000,21730=>1000,21731=>1000,21732=>1000,
-	21733=>1000,21734=>1000,21735=>1000,21736=>1000,21737=>1000,21738=>1000,21739=>1000,21740=>1000,21741=>1000,21742=>1000,21743=>1000,21744=>1000,21745=>1000,21746=>1000,21747=>1000,21748=>1000,
-	21749=>1000,21750=>1000,21751=>1000,21752=>1000,21753=>1000,21754=>1000,21755=>1000,21756=>1000,21757=>1000,21758=>1000,21759=>1000,21760=>1000,21761=>1000,21762=>1000,21763=>1000,21764=>1000,
-	21765=>1000,21766=>1000,21767=>1000,21768=>1000,21769=>1000,21770=>1000,21771=>1000,21772=>1000,21773=>1000,21774=>1000,21775=>1000,21776=>1000,21777=>1000,21778=>1000,21779=>1000,21780=>1000,
-	21781=>1000,21782=>1000,21783=>1000,21784=>1000,21785=>1000,21786=>1000,21787=>1000,21788=>1000,21789=>1000,21790=>1000,21791=>1000,21792=>1000,21793=>1000,21794=>1000,21795=>1000,21796=>1000,
-	21797=>1000,21798=>1000,21799=>1000,21800=>1000,21801=>1000,21802=>1000,21803=>1000,21804=>1000,21805=>1000,21806=>1000,21807=>1000,21808=>1000,21809=>1000,21810=>1000,21811=>1000,21812=>1000,
-	21813=>1000,21814=>1000,21815=>1000,21816=>1000,21817=>1000,21818=>1000,21819=>1000,21820=>1000,21821=>1000,21822=>1000,21823=>1000,21824=>1000,21825=>1000,21826=>1000,21827=>1000,21828=>1000,
-	21829=>1000,21830=>1000,21831=>1000,21832=>1000,21833=>1000,21834=>1000,21835=>1000,21836=>1000,21837=>1000,21838=>1000,21839=>1000,21840=>1000,21841=>1000,21842=>1000,21843=>1000,21844=>1000,
-	21845=>1000,21846=>1000,21847=>1000,21848=>1000,21849=>1000,21850=>1000,21851=>1000,21852=>1000,21853=>1000,21854=>1000,21855=>1000,21856=>1000,21857=>1000,21858=>1000,21859=>1000,21860=>1000,
-	21861=>1000,21862=>1000,21863=>1000,21864=>1000,21865=>1000,21866=>1000,21867=>1000,21868=>1000,21869=>1000,21870=>1000,21871=>1000,21872=>1000,21873=>1000,21874=>1000,21875=>1000,21876=>1000,
-	21877=>1000,21878=>1000,21879=>1000,21880=>1000,21881=>1000,21882=>1000,21883=>1000,21884=>1000,21885=>1000,21886=>1000,21887=>1000,21888=>1000,21889=>1000,21890=>1000,21891=>1000,21892=>1000,
-	21893=>1000,21894=>1000,21895=>1000,21896=>1000,21897=>1000,21898=>1000,21899=>1000,21900=>1000,21901=>1000,21902=>1000,21903=>1000,21904=>1000,21905=>1000,21906=>1000,21907=>1000,21908=>1000,
-	21909=>1000,21910=>1000,21911=>1000,21912=>1000,21913=>1000,21914=>1000,21915=>1000,21916=>1000,21917=>1000,21918=>1000,21919=>1000,21920=>1000,21921=>1000,21922=>1000,21923=>1000,21924=>1000,
-	21925=>1000,21926=>1000,21927=>1000,21928=>1000,21929=>1000,21930=>1000,21931=>1000,21932=>1000,21933=>1000,21934=>1000,21935=>1000,21936=>1000,21937=>1000,21938=>1000,21939=>1000,21940=>1000,
-	21941=>1000,21942=>1000,21943=>1000,21944=>1000,21945=>1000,21946=>1000,21947=>1000,21948=>1000,21949=>1000,21950=>1000,21951=>1000,21952=>1000,21953=>1000,21954=>1000,21955=>1000,21956=>1000,
-	21957=>1000,21958=>1000,21959=>1000,21960=>1000,21961=>1000,21962=>1000,21963=>1000,21964=>1000,21965=>1000,21966=>1000,21967=>1000,21968=>1000,21969=>1000,21970=>1000,21971=>1000,21972=>1000,
-	21973=>1000,21974=>1000,21975=>1000,21976=>1000,21977=>1000,21978=>1000,21979=>1000,21980=>1000,21981=>1000,21982=>1000,21983=>1000,21984=>1000,21985=>1000,21986=>1000,21987=>1000,21988=>1000,
-	21989=>1000,21990=>1000,21991=>1000,21992=>1000,21993=>1000,21994=>1000,21995=>1000,21996=>1000,21997=>1000,21998=>1000,21999=>1000,22000=>1000,22001=>1000,22002=>1000,22003=>1000,22004=>1000,
-	22005=>1000,22006=>1000,22007=>1000,22008=>1000,22009=>1000,22010=>1000,22011=>1000,22012=>1000,22013=>1000,22014=>1000,22015=>1000,22016=>1000,22017=>1000,22018=>1000,22019=>1000,22020=>1000,
-	22021=>1000,22022=>1000,22023=>1000,22024=>1000,22025=>1000,22026=>1000,22027=>1000,22028=>1000,22029=>1000,22030=>1000,22031=>1000,22032=>1000,22033=>1000,22034=>1000,22035=>1000,22036=>1000,
-	22037=>1000,22038=>1000,22039=>1000,22040=>1000,22041=>1000,22042=>1000,22043=>1000,22044=>1000,22045=>1000,22046=>1000,22047=>1000,22048=>1000,22049=>1000,22050=>1000,22051=>1000,22052=>1000,
-	22053=>1000,22054=>1000,22055=>1000,22056=>1000,22057=>1000,22058=>1000,22059=>1000,22060=>1000,22061=>1000,22062=>1000,22063=>1000,22064=>1000,22065=>1000,22066=>1000,22067=>1000,22068=>1000,
-	22069=>1000,22070=>1000,22071=>1000,22072=>1000,22073=>1000,22074=>1000,22075=>1000,22076=>1000,22077=>1000,22078=>1000,22079=>1000,22080=>1000,22081=>1000,22082=>1000,22083=>1000,22084=>1000,
-	22085=>1000,22086=>1000,22087=>1000,22088=>1000,22089=>1000,22090=>1000,22091=>1000,22092=>1000,22093=>1000,22094=>1000,22095=>1000,22096=>1000,22097=>1000,22098=>1000,22099=>1000,22100=>1000,
-	22101=>1000,22102=>1000,22103=>1000,22104=>1000,22105=>1000,22106=>1000,22107=>1000,22108=>1000,22109=>1000,22110=>1000,22111=>1000,22112=>1000,22113=>1000,22114=>1000,22115=>1000,22116=>1000,
-	22117=>1000,22118=>1000,22119=>1000,22120=>1000,22121=>1000,22122=>1000,22123=>1000,22124=>1000,22125=>1000,22126=>1000,22127=>1000,22128=>1000,22129=>1000,22130=>1000,22131=>1000,22132=>1000,
-	22133=>1000,22134=>1000,22135=>1000,22136=>1000,22137=>1000,22138=>1000,22139=>1000,22140=>1000,22141=>1000,22142=>1000,22143=>1000,22144=>1000,22145=>1000,22146=>1000,22147=>1000,22148=>1000,
-	22149=>1000,22150=>1000,22151=>1000,22152=>1000,22153=>1000,22154=>1000,22155=>1000,22156=>1000,22157=>1000,22158=>1000,22159=>1000,22160=>1000,22161=>1000,22162=>1000,22163=>1000,22164=>1000,
-	22165=>1000,22166=>1000,22167=>1000,22168=>1000,22169=>1000,22170=>1000,22171=>1000,22172=>1000,22173=>1000,22174=>1000,22175=>1000,22176=>1000,22177=>1000,22178=>1000,22179=>1000,22180=>1000,
-	22181=>1000,22182=>1000,22183=>1000,22184=>1000,22185=>1000,22186=>1000,22187=>1000,22188=>1000,22189=>1000,22190=>1000,22191=>1000,22192=>1000,22193=>1000,22194=>1000,22195=>1000,22196=>1000,
-	22197=>1000,22198=>1000,22199=>1000,22200=>1000,22201=>1000,22202=>1000,22203=>1000,22204=>1000,22205=>1000,22206=>1000,22207=>1000,22208=>1000,22209=>1000,22210=>1000,22211=>1000,22212=>1000,
-	22213=>1000,22214=>1000,22215=>1000,22216=>1000,22217=>1000,22218=>1000,22219=>1000,22220=>1000,22221=>1000,22222=>1000,22223=>1000,22224=>1000,22225=>1000,22226=>1000,22227=>1000,22228=>1000,
-	22229=>1000,22230=>1000,22231=>1000,22232=>1000,22233=>1000,22234=>1000,22235=>1000,22236=>1000,22237=>1000,22238=>1000,22239=>1000,22240=>1000,22241=>1000,22242=>1000,22243=>1000,22244=>1000,
-	22245=>1000,22246=>1000,22247=>1000,22248=>1000,22249=>1000,22250=>1000,22251=>1000,22252=>1000,22253=>1000,22254=>1000,22255=>1000,22256=>1000,22257=>1000,22258=>1000,22259=>1000,22260=>1000,
-	22261=>1000,22262=>1000,22263=>1000,22264=>1000,22265=>1000,22266=>1000,22267=>1000,22268=>1000,22269=>1000,22270=>1000,22271=>1000,22272=>1000,22273=>1000,22274=>1000,22275=>1000,22276=>1000,
-	22277=>1000,22278=>1000,22279=>1000,22280=>1000,22281=>1000,22282=>1000,22283=>1000,22284=>1000,22285=>1000,22286=>1000,22287=>1000,22288=>1000,22289=>1000,22290=>1000,22291=>1000,22292=>1000,
-	22293=>1000,22294=>1000,22295=>1000,22296=>1000,22297=>1000,22298=>1000,22299=>1000,22300=>1000,22301=>1000,22302=>1000,22303=>1000,22304=>1000,22305=>1000,22306=>1000,22307=>1000,22308=>1000,
-	22309=>1000,22310=>1000,22311=>1000,22312=>1000,22313=>1000,22314=>1000,22315=>1000,22316=>1000,22317=>1000,22318=>1000,22319=>1000,22320=>1000,22321=>1000,22322=>1000,22323=>1000,22324=>1000,
-	22325=>1000,22326=>1000,22327=>1000,22328=>1000,22329=>1000,22330=>1000,22331=>1000,22332=>1000,22333=>1000,22334=>1000,22335=>1000,22336=>1000,22337=>1000,22338=>1000,22339=>1000,22340=>1000,
-	22341=>1000,22342=>1000,22343=>1000,22344=>1000,22345=>1000,22346=>1000,22347=>1000,22348=>1000,22349=>1000,22350=>1000,22351=>1000,22352=>1000,22353=>1000,22354=>1000,22355=>1000,22356=>1000,
-	22357=>1000,22358=>1000,22359=>1000,22360=>1000,22361=>1000,22362=>1000,22363=>1000,22364=>1000,22365=>1000,22366=>1000,22367=>1000,22368=>1000,22369=>1000,22370=>1000,22371=>1000,22372=>1000,
-	22373=>1000,22374=>1000,22375=>1000,22376=>1000,22377=>1000,22378=>1000,22379=>1000,22380=>1000,22381=>1000,22382=>1000,22383=>1000,22384=>1000,22385=>1000,22386=>1000,22387=>1000,22388=>1000,
-	22389=>1000,22390=>1000,22391=>1000,22392=>1000,22393=>1000,22394=>1000,22395=>1000,22396=>1000,22397=>1000,22398=>1000,22399=>1000,22400=>1000,22401=>1000,22402=>1000,22403=>1000,22404=>1000,
-	22405=>1000,22406=>1000,22407=>1000,22408=>1000,22409=>1000,22410=>1000,22411=>1000,22412=>1000,22413=>1000,22414=>1000,22415=>1000,22416=>1000,22417=>1000,22418=>1000,22419=>1000,22420=>1000,
-	22421=>1000,22422=>1000,22423=>1000,22424=>1000,22425=>1000,22426=>1000,22427=>1000,22428=>1000,22429=>1000,22430=>1000,22431=>1000,22432=>1000,22433=>1000,22434=>1000,22435=>1000,22436=>1000,
-	22437=>1000,22438=>1000,22439=>1000,22440=>1000,22441=>1000,22442=>1000,22443=>1000,22444=>1000,22445=>1000,22446=>1000,22447=>1000,22448=>1000,22449=>1000,22450=>1000,22451=>1000,22452=>1000,
-	22453=>1000,22454=>1000,22455=>1000,22456=>1000,22457=>1000,22458=>1000,22459=>1000,22460=>1000,22461=>1000,22462=>1000,22463=>1000,22464=>1000,22465=>1000,22466=>1000,22467=>1000,22468=>1000,
-	22469=>1000,22470=>1000,22471=>1000,22472=>1000,22473=>1000,22474=>1000,22475=>1000,22476=>1000,22477=>1000,22478=>1000,22479=>1000,22480=>1000,22481=>1000,22482=>1000,22483=>1000,22484=>1000,
-	22485=>1000,22486=>1000,22487=>1000,22488=>1000,22489=>1000,22490=>1000,22491=>1000,22492=>1000,22493=>1000,22494=>1000,22495=>1000,22496=>1000,22497=>1000,22498=>1000,22499=>1000,22500=>1000,
-	22501=>1000,22502=>1000,22503=>1000,22504=>1000,22505=>1000,22506=>1000,22507=>1000,22508=>1000,22509=>1000,22510=>1000,22511=>1000,22512=>1000,22513=>1000,22514=>1000,22515=>1000,22516=>1000,
-	22517=>1000,22518=>1000,22519=>1000,22520=>1000,22521=>1000,22522=>1000,22523=>1000,22524=>1000,22525=>1000,22526=>1000,22527=>1000,22528=>1000,22529=>1000,22530=>1000,22531=>1000,22532=>1000,
-	22533=>1000,22534=>1000,22535=>1000,22536=>1000,22537=>1000,22538=>1000,22539=>1000,22540=>1000,22541=>1000,22542=>1000,22543=>1000,22544=>1000,22545=>1000,22546=>1000,22547=>1000,22548=>1000,
-	22549=>1000,22550=>1000,22551=>1000,22552=>1000,22553=>1000,22554=>1000,22555=>1000,22556=>1000,22557=>1000,22558=>1000,22559=>1000,22560=>1000,22561=>1000,22562=>1000,22563=>1000,22564=>1000,
-	22565=>1000,22566=>1000,22567=>1000,22568=>1000,22569=>1000,22570=>1000,22571=>1000,22572=>1000,22573=>1000,22574=>1000,22575=>1000,22576=>1000,22577=>1000,22578=>1000,22579=>1000,22580=>1000,
-	22581=>1000,22582=>1000,22583=>1000,22584=>1000,22585=>1000,22586=>1000,22587=>1000,22588=>1000,22589=>1000,22590=>1000,22591=>1000,22592=>1000,22593=>1000,22594=>1000,22595=>1000,22596=>1000,
-	22597=>1000,22598=>1000,22599=>1000,22600=>1000,22601=>1000,22602=>1000,22603=>1000,22604=>1000,22605=>1000,22606=>1000,22607=>1000,22608=>1000,22609=>1000,22610=>1000,22611=>1000,22612=>1000,
-	22613=>1000,22614=>1000,22615=>1000,22616=>1000,22617=>1000,22618=>1000,22619=>1000,22620=>1000,22621=>1000,22622=>1000,22623=>1000,22624=>1000,22625=>1000,22626=>1000,22627=>1000,22628=>1000,
-	22629=>1000,22630=>1000,22631=>1000,22632=>1000,22633=>1000,22634=>1000,22635=>1000,22636=>1000,22637=>1000,22638=>1000,22639=>1000,22640=>1000,22641=>1000,22642=>1000,22643=>1000,22644=>1000,
-	22645=>1000,22646=>1000,22647=>1000,22648=>1000,22649=>1000,22650=>1000,22651=>1000,22652=>1000,22653=>1000,22654=>1000,22655=>1000,22656=>1000,22657=>1000,22658=>1000,22659=>1000,22660=>1000,
-	22661=>1000,22662=>1000,22663=>1000,22664=>1000,22665=>1000,22666=>1000,22667=>1000,22668=>1000,22669=>1000,22670=>1000,22671=>1000,22672=>1000,22673=>1000,22674=>1000,22675=>1000,22676=>1000,
-	22677=>1000,22678=>1000,22679=>1000,22680=>1000,22681=>1000,22682=>1000,22683=>1000,22684=>1000,22685=>1000,22686=>1000,22687=>1000,22688=>1000,22689=>1000,22690=>1000,22691=>1000,22692=>1000,
-	22693=>1000,22694=>1000,22695=>1000,22696=>1000,22697=>1000,22698=>1000,22699=>1000,22700=>1000,22701=>1000,22702=>1000,22703=>1000,22704=>1000,22705=>1000,22706=>1000,22707=>1000,22708=>1000,
-	22709=>1000,22710=>1000,22711=>1000,22712=>1000,22713=>1000,22714=>1000,22715=>1000,22716=>1000,22717=>1000,22718=>1000,22719=>1000,22720=>1000,22721=>1000,22722=>1000,22723=>1000,22724=>1000,
-	22725=>1000,22726=>1000,22727=>1000,22728=>1000,22729=>1000,22730=>1000,22731=>1000,22732=>1000,22733=>1000,22734=>1000,22735=>1000,22736=>1000,22737=>1000,22738=>1000,22739=>1000,22740=>1000,
-	22741=>1000,22742=>1000,22743=>1000,22744=>1000,22745=>1000,22746=>1000,22747=>1000,22748=>1000,22749=>1000,22750=>1000,22751=>1000,22752=>1000,22753=>1000,22754=>1000,22755=>1000,22756=>1000,
-	22757=>1000,22758=>1000,22759=>1000,22760=>1000,22761=>1000,22762=>1000,22763=>1000,22764=>1000,22765=>1000,22766=>1000,22767=>1000,22768=>1000,22769=>1000,22770=>1000,22771=>1000,22772=>1000,
-	22773=>1000,22774=>1000,22775=>1000,22776=>1000,22777=>1000,22778=>1000,22779=>1000,22780=>1000,22781=>1000,22782=>1000,22783=>1000,22784=>1000,22785=>1000,22786=>1000,22787=>1000,22788=>1000,
-	22789=>1000,22790=>1000,22791=>1000,22792=>1000,22793=>1000,22794=>1000,22795=>1000,22796=>1000,22797=>1000,22798=>1000,22799=>1000,22800=>1000,22801=>1000,22802=>1000,22803=>1000,22804=>1000,
-	22805=>1000,22806=>1000,22807=>1000,22808=>1000,22809=>1000,22810=>1000,22811=>1000,22812=>1000,22813=>1000,22814=>1000,22815=>1000,22816=>1000,22817=>1000,22818=>1000,22819=>1000,22820=>1000,
-	22821=>1000,22822=>1000,22823=>1000,22824=>1000,22825=>1000,22826=>1000,22827=>1000,22828=>1000,22829=>1000,22830=>1000,22831=>1000,22832=>1000,22833=>1000,22834=>1000,22835=>1000,22836=>1000,
-	22837=>1000,22838=>1000,22839=>1000,22840=>1000,22841=>1000,22842=>1000,22843=>1000,22844=>1000,22845=>1000,22846=>1000,22847=>1000,22848=>1000,22849=>1000,22850=>1000,22851=>1000,22852=>1000,
-	22853=>1000,22854=>1000,22855=>1000,22856=>1000,22857=>1000,22858=>1000,22859=>1000,22860=>1000,22861=>1000,22862=>1000,22863=>1000,22864=>1000,22865=>1000,22866=>1000,22867=>1000,22868=>1000,
-	22869=>1000,22870=>1000,22871=>1000,22872=>1000,22873=>1000,22874=>1000,22875=>1000,22876=>1000,22877=>1000,22878=>1000,22879=>1000,22880=>1000,22881=>1000,22882=>1000,22883=>1000,22884=>1000,
-	22885=>1000,22886=>1000,22887=>1000,22888=>1000,22889=>1000,22890=>1000,22891=>1000,22892=>1000,22893=>1000,22894=>1000,22895=>1000,22896=>1000,22897=>1000,22898=>1000,22899=>1000,22900=>1000,
-	22901=>1000,22902=>1000,22903=>1000,22904=>1000,22905=>1000,22906=>1000,22907=>1000,22908=>1000,22909=>1000,22910=>1000,22911=>1000,22912=>1000,22913=>1000,22914=>1000,22915=>1000,22916=>1000,
-	22917=>1000,22918=>1000,22919=>1000,22920=>1000,22921=>1000,22922=>1000,22923=>1000,22924=>1000,22925=>1000,22926=>1000,22927=>1000,22928=>1000,22929=>1000,22930=>1000,22931=>1000,22932=>1000,
-	22933=>1000,22934=>1000,22935=>1000,22936=>1000,22937=>1000,22938=>1000,22939=>1000,22940=>1000,22941=>1000,22942=>1000,22943=>1000,22944=>1000,22945=>1000,22946=>1000,22947=>1000,22948=>1000,
-	22949=>1000,22950=>1000,22951=>1000,22952=>1000,22953=>1000,22954=>1000,22955=>1000,22956=>1000,22957=>1000,22958=>1000,22959=>1000,22960=>1000,22961=>1000,22962=>1000,22963=>1000,22964=>1000,
-	22965=>1000,22966=>1000,22967=>1000,22968=>1000,22969=>1000,22970=>1000,22971=>1000,22972=>1000,22973=>1000,22974=>1000,22975=>1000,22976=>1000,22977=>1000,22978=>1000,22979=>1000,22980=>1000,
-	22981=>1000,22982=>1000,22983=>1000,22984=>1000,22985=>1000,22986=>1000,22987=>1000,22988=>1000,22989=>1000,22990=>1000,22991=>1000,22992=>1000,22993=>1000,22994=>1000,22995=>1000,22996=>1000,
-	22997=>1000,22998=>1000,22999=>1000,23000=>1000,23001=>1000,23002=>1000,23003=>1000,23004=>1000,23005=>1000,23006=>1000,23007=>1000,23008=>1000,23009=>1000,23010=>1000,23011=>1000,23012=>1000,
-	23013=>1000,23014=>1000,23015=>1000,23016=>1000,23017=>1000,23018=>1000,23019=>1000,23020=>1000,23021=>1000,23022=>1000,23023=>1000,23024=>1000,23025=>1000,23026=>1000,23027=>1000,23028=>1000,
-	23029=>1000,23030=>1000,23031=>1000,23032=>1000,23033=>1000,23034=>1000,23035=>1000,23036=>1000,23037=>1000,23038=>1000,23039=>1000,23040=>1000,23041=>1000,23042=>1000,23043=>1000,23044=>1000,
-	23045=>1000,23046=>1000,23047=>1000,23048=>1000,23049=>1000,23050=>1000,23051=>1000,23052=>1000,23053=>1000,23054=>1000,23055=>1000,23056=>1000,23057=>1000,23058=>1000,23059=>1000,23060=>1000,
-	23061=>1000,23062=>1000,23063=>1000,23064=>1000,23065=>1000,23066=>1000,23067=>1000,23068=>1000,23069=>1000,23070=>1000,23071=>1000,23072=>1000,23073=>1000,23074=>1000,23075=>1000,23076=>1000,
-	23077=>1000,23078=>1000,23079=>1000,23080=>1000,23081=>1000,23082=>1000,23083=>1000,23084=>1000,23085=>1000,23086=>1000,23087=>1000,23088=>1000,23089=>1000,23090=>1000,23091=>1000,23092=>1000,
-	23093=>1000,23094=>1000,23095=>1000,23096=>1000,23097=>1000,23098=>1000,23099=>1000,23100=>1000,23101=>1000,23102=>1000,23103=>1000,23104=>1000,23105=>1000,23106=>1000,23107=>1000,23108=>1000,
-	23109=>1000,23110=>1000,23111=>1000,23112=>1000,23113=>1000,23114=>1000,23115=>1000,23116=>1000,23117=>1000,23118=>1000,23119=>1000,23120=>1000,23121=>1000,23122=>1000,23123=>1000,23124=>1000,
-	23125=>1000,23126=>1000,23127=>1000,23128=>1000,23129=>1000,23130=>1000,23131=>1000,23132=>1000,23133=>1000,23134=>1000,23135=>1000,23136=>1000,23137=>1000,23138=>1000,23139=>1000,23140=>1000,
-	23141=>1000,23142=>1000,23143=>1000,23144=>1000,23145=>1000,23146=>1000,23147=>1000,23148=>1000,23149=>1000,23150=>1000,23151=>1000,23152=>1000,23153=>1000,23154=>1000,23155=>1000,23156=>1000,
-	23157=>1000,23158=>1000,23159=>1000,23160=>1000,23161=>1000,23162=>1000,23163=>1000,23164=>1000,23165=>1000,23166=>1000,23167=>1000,23168=>1000,23169=>1000,23170=>1000,23171=>1000,23172=>1000,
-	23173=>1000,23174=>1000,23175=>1000,23176=>1000,23177=>1000,23178=>1000,23179=>1000,23180=>1000,23181=>1000,23182=>1000,23183=>1000,23184=>1000,23185=>1000,23186=>1000,23187=>1000,23188=>1000,
-	23189=>1000,23190=>1000,23191=>1000,23192=>1000,23193=>1000,23194=>1000,23195=>1000,23196=>1000,23197=>1000,23198=>1000,23199=>1000,23200=>1000,23201=>1000,23202=>1000,23203=>1000,23204=>1000,
-	23205=>1000,23206=>1000,23207=>1000,23208=>1000,23209=>1000,23210=>1000,23211=>1000,23212=>1000,23213=>1000,23214=>1000,23215=>1000,23216=>1000,23217=>1000,23218=>1000,23219=>1000,23220=>1000,
-	23221=>1000,23222=>1000,23223=>1000,23224=>1000,23225=>1000,23226=>1000,23227=>1000,23228=>1000,23229=>1000,23230=>1000,23231=>1000,23232=>1000,23233=>1000,23234=>1000,23235=>1000,23236=>1000,
-	23237=>1000,23238=>1000,23239=>1000,23240=>1000,23241=>1000,23242=>1000,23243=>1000,23244=>1000,23245=>1000,23246=>1000,23247=>1000,23248=>1000,23249=>1000,23250=>1000,23251=>1000,23252=>1000,
-	23253=>1000,23254=>1000,23255=>1000,23256=>1000,23257=>1000,23258=>1000,23259=>1000,23260=>1000,23261=>1000,23262=>1000,23263=>1000,23264=>1000,23265=>1000,23266=>1000,23267=>1000,23268=>1000,
-	23269=>1000,23270=>1000,23271=>1000,23272=>1000,23273=>1000,23274=>1000,23275=>1000,23276=>1000,23277=>1000,23278=>1000,23279=>1000,23280=>1000,23281=>1000,23282=>1000,23283=>1000,23284=>1000,
-	23285=>1000,23286=>1000,23287=>1000,23288=>1000,23289=>1000,23290=>1000,23291=>1000,23292=>1000,23293=>1000,23294=>1000,23295=>1000,23296=>1000,23297=>1000,23298=>1000,23299=>1000,23300=>1000,
-	23301=>1000,23302=>1000,23303=>1000,23304=>1000,23305=>1000,23306=>1000,23307=>1000,23308=>1000,23309=>1000,23310=>1000,23311=>1000,23312=>1000,23313=>1000,23314=>1000,23315=>1000,23316=>1000,
-	23317=>1000,23318=>1000,23319=>1000,23320=>1000,23321=>1000,23322=>1000,23323=>1000,23324=>1000,23325=>1000,23326=>1000,23327=>1000,23328=>1000,23329=>1000,23330=>1000,23331=>1000,23332=>1000,
-	23333=>1000,23334=>1000,23335=>1000,23336=>1000,23337=>1000,23338=>1000,23339=>1000,23340=>1000,23341=>1000,23342=>1000,23343=>1000,23344=>1000,23345=>1000,23346=>1000,23347=>1000,23348=>1000,
-	23349=>1000,23350=>1000,23351=>1000,23352=>1000,23353=>1000,23354=>1000,23355=>1000,23356=>1000,23357=>1000,23358=>1000,23359=>1000,23360=>1000,23361=>1000,23362=>1000,23363=>1000,23364=>1000,
-	23365=>1000,23366=>1000,23367=>1000,23368=>1000,23369=>1000,23370=>1000,23371=>1000,23372=>1000,23373=>1000,23374=>1000,23375=>1000,23376=>1000,23377=>1000,23378=>1000,23379=>1000,23380=>1000,
-	23381=>1000,23382=>1000,23383=>1000,23384=>1000,23385=>1000,23386=>1000,23387=>1000,23388=>1000,23389=>1000,23390=>1000,23391=>1000,23392=>1000,23393=>1000,23394=>1000,23395=>1000,23396=>1000,
-	23397=>1000,23398=>1000,23399=>1000,23400=>1000,23401=>1000,23402=>1000,23403=>1000,23404=>1000,23405=>1000,23406=>1000,23407=>1000,23408=>1000,23409=>1000,23410=>1000,23411=>1000,23412=>1000,
-	23413=>1000,23414=>1000,23415=>1000,23416=>1000,23417=>1000,23418=>1000,23419=>1000,23420=>1000,23421=>1000,23422=>1000,23423=>1000,23424=>1000,23425=>1000,23426=>1000,23427=>1000,23428=>1000,
-	23429=>1000,23430=>1000,23431=>1000,23432=>1000,23433=>1000,23434=>1000,23435=>1000,23436=>1000,23437=>1000,23438=>1000,23439=>1000,23440=>1000,23441=>1000,23442=>1000,23443=>1000,23444=>1000,
-	23445=>1000,23446=>1000,23447=>1000,23448=>1000,23449=>1000,23450=>1000,23451=>1000,23452=>1000,23453=>1000,23454=>1000,23455=>1000,23456=>1000,23457=>1000,23458=>1000,23459=>1000,23460=>1000,
-	23461=>1000,23462=>1000,23463=>1000,23464=>1000,23465=>1000,23466=>1000,23467=>1000,23468=>1000,23469=>1000,23470=>1000,23471=>1000,23472=>1000,23473=>1000,23474=>1000,23475=>1000,23476=>1000,
-	23477=>1000,23478=>1000,23479=>1000,23480=>1000,23481=>1000,23482=>1000,23483=>1000,23484=>1000,23485=>1000,23486=>1000,23487=>1000,23488=>1000,23489=>1000,23490=>1000,23491=>1000,23492=>1000,
-	23493=>1000,23494=>1000,23495=>1000,23496=>1000,23497=>1000,23498=>1000,23499=>1000,23500=>1000,23501=>1000,23502=>1000,23503=>1000,23504=>1000,23505=>1000,23506=>1000,23507=>1000,23508=>1000,
-	23509=>1000,23510=>1000,23511=>1000,23512=>1000,23513=>1000,23514=>1000,23515=>1000,23516=>1000,23517=>1000,23518=>1000,23519=>1000,23520=>1000,23521=>1000,23522=>1000,23523=>1000,23524=>1000,
-	23525=>1000,23526=>1000,23527=>1000,23528=>1000,23529=>1000,23530=>1000,23531=>1000,23532=>1000,23533=>1000,23534=>1000,23535=>1000,23536=>1000,23537=>1000,23538=>1000,23539=>1000,23540=>1000,
-	23541=>1000,23542=>1000,23543=>1000,23544=>1000,23545=>1000,23546=>1000,23547=>1000,23548=>1000,23549=>1000,23550=>1000,23551=>1000,23552=>1000,23553=>1000,23554=>1000,23555=>1000,23556=>1000,
-	23557=>1000,23558=>1000,23559=>1000,23560=>1000,23561=>1000,23562=>1000,23563=>1000,23564=>1000,23565=>1000,23566=>1000,23567=>1000,23568=>1000,23569=>1000,23570=>1000,23571=>1000,23572=>1000,
-	23573=>1000,23574=>1000,23575=>1000,23576=>1000,23577=>1000,23578=>1000,23579=>1000,23580=>1000,23581=>1000,23582=>1000,23583=>1000,23584=>1000,23585=>1000,23586=>1000,23587=>1000,23588=>1000,
-	23589=>1000,23590=>1000,23591=>1000,23592=>1000,23593=>1000,23594=>1000,23595=>1000,23596=>1000,23597=>1000,23598=>1000,23599=>1000,23600=>1000,23601=>1000,23602=>1000,23603=>1000,23604=>1000,
-	23605=>1000,23606=>1000,23607=>1000,23608=>1000,23609=>1000,23610=>1000,23611=>1000,23612=>1000,23613=>1000,23614=>1000,23615=>1000,23616=>1000,23617=>1000,23618=>1000,23619=>1000,23620=>1000,
-	23621=>1000,23622=>1000,23623=>1000,23624=>1000,23625=>1000,23626=>1000,23627=>1000,23628=>1000,23629=>1000,23630=>1000,23631=>1000,23632=>1000,23633=>1000,23634=>1000,23635=>1000,23636=>1000,
-	23637=>1000,23638=>1000,23639=>1000,23640=>1000,23641=>1000,23642=>1000,23643=>1000,23644=>1000,23645=>1000,23646=>1000,23647=>1000,23648=>1000,23649=>1000,23650=>1000,23651=>1000,23652=>1000,
-	23653=>1000,23654=>1000,23655=>1000,23656=>1000,23657=>1000,23658=>1000,23659=>1000,23660=>1000,23661=>1000,23662=>1000,23663=>1000,23664=>1000,23665=>1000,23666=>1000,23667=>1000,23668=>1000,
-	23669=>1000,23670=>1000,23671=>1000,23672=>1000,23673=>1000,23674=>1000,23675=>1000,23676=>1000,23677=>1000,23678=>1000,23679=>1000,23680=>1000,23681=>1000,23682=>1000,23683=>1000,23684=>1000,
-	23685=>1000,23686=>1000,23687=>1000,23688=>1000,23689=>1000,23690=>1000,23691=>1000,23692=>1000,23693=>1000,23694=>1000,23695=>1000,23696=>1000,23697=>1000,23698=>1000,23699=>1000,23700=>1000,
-	23701=>1000,23702=>1000,23703=>1000,23704=>1000,23705=>1000,23706=>1000,23707=>1000,23708=>1000,23709=>1000,23710=>1000,23711=>1000,23712=>1000,23713=>1000,23714=>1000,23715=>1000,23716=>1000,
-	23717=>1000,23718=>1000,23719=>1000,23720=>1000,23721=>1000,23722=>1000,23723=>1000,23724=>1000,23725=>1000,23726=>1000,23727=>1000,23728=>1000,23729=>1000,23730=>1000,23731=>1000,23732=>1000,
-	23733=>1000,23734=>1000,23735=>1000,23736=>1000,23737=>1000,23738=>1000,23739=>1000,23740=>1000,23741=>1000,23742=>1000,23743=>1000,23744=>1000,23745=>1000,23746=>1000,23747=>1000,23748=>1000,
-	23749=>1000,23750=>1000,23751=>1000,23752=>1000,23753=>1000,23754=>1000,23755=>1000,23756=>1000,23757=>1000,23758=>1000,23759=>1000,23760=>1000,23761=>1000,23762=>1000,23763=>1000,23764=>1000,
-	23765=>1000,23766=>1000,23767=>1000,23768=>1000,23769=>1000,23770=>1000,23771=>1000,23772=>1000,23773=>1000,23774=>1000,23775=>1000,23776=>1000,23777=>1000,23778=>1000,23779=>1000,23780=>1000,
-	23781=>1000,23782=>1000,23783=>1000,23784=>1000,23785=>1000,23786=>1000,23787=>1000,23788=>1000,23789=>1000,23790=>1000,23791=>1000,23792=>1000,23793=>1000,23794=>1000,23795=>1000,23796=>1000,
-	23797=>1000,23798=>1000,23799=>1000,23800=>1000,23801=>1000,23802=>1000,23803=>1000,23804=>1000,23805=>1000,23806=>1000,23807=>1000,23808=>1000,23809=>1000,23810=>1000,23811=>1000,23812=>1000,
-	23813=>1000,23814=>1000,23815=>1000,23816=>1000,23817=>1000,23818=>1000,23819=>1000,23820=>1000,23821=>1000,23822=>1000,23823=>1000,23824=>1000,23825=>1000,23826=>1000,23827=>1000,23828=>1000,
-	23829=>1000,23830=>1000,23831=>1000,23832=>1000,23833=>1000,23834=>1000,23835=>1000,23836=>1000,23837=>1000,23838=>1000,23839=>1000,23840=>1000,23841=>1000,23842=>1000,23843=>1000,23844=>1000,
-	23845=>1000,23846=>1000,23847=>1000,23848=>1000,23849=>1000,23850=>1000,23851=>1000,23852=>1000,23853=>1000,23854=>1000,23855=>1000,23856=>1000,23857=>1000,23858=>1000,23859=>1000,23860=>1000,
-	23861=>1000,23862=>1000,23863=>1000,23864=>1000,23865=>1000,23866=>1000,23867=>1000,23868=>1000,23869=>1000,23870=>1000,23871=>1000,23872=>1000,23873=>1000,23874=>1000,23875=>1000,23876=>1000,
-	23877=>1000,23878=>1000,23879=>1000,23880=>1000,23881=>1000,23882=>1000,23883=>1000,23884=>1000,23885=>1000,23886=>1000,23887=>1000,23888=>1000,23889=>1000,23890=>1000,23891=>1000,23892=>1000,
-	23893=>1000,23894=>1000,23895=>1000,23896=>1000,23897=>1000,23898=>1000,23899=>1000,23900=>1000,23901=>1000,23902=>1000,23903=>1000,23904=>1000,23905=>1000,23906=>1000,23907=>1000,23908=>1000,
-	23909=>1000,23910=>1000,23911=>1000,23912=>1000,23913=>1000,23914=>1000,23915=>1000,23916=>1000,23917=>1000,23918=>1000,23919=>1000,23920=>1000,23921=>1000,23922=>1000,23923=>1000,23924=>1000,
-	23925=>1000,23926=>1000,23927=>1000,23928=>1000,23929=>1000,23930=>1000,23931=>1000,23932=>1000,23933=>1000,23934=>1000,23935=>1000,23936=>1000,23937=>1000,23938=>1000,23939=>1000,23940=>1000,
-	23941=>1000,23942=>1000,23943=>1000,23944=>1000,23945=>1000,23946=>1000,23947=>1000,23948=>1000,23949=>1000,23950=>1000,23951=>1000,23952=>1000,23953=>1000,23954=>1000,23955=>1000,23956=>1000,
-	23957=>1000,23958=>1000,23959=>1000,23960=>1000,23961=>1000,23962=>1000,23963=>1000,23964=>1000,23965=>1000,23966=>1000,23967=>1000,23968=>1000,23969=>1000,23970=>1000,23971=>1000,23972=>1000,
-	23973=>1000,23974=>1000,23975=>1000,23976=>1000,23977=>1000,23978=>1000,23979=>1000,23980=>1000,23981=>1000,23982=>1000,23983=>1000,23984=>1000,23985=>1000,23986=>1000,23987=>1000,23988=>1000,
-	23989=>1000,23990=>1000,23991=>1000,23992=>1000,23993=>1000,23994=>1000,23995=>1000,23996=>1000,23997=>1000,23998=>1000,23999=>1000,24000=>1000,24001=>1000,24002=>1000,24003=>1000,24004=>1000,
-	24005=>1000,24006=>1000,24007=>1000,24008=>1000,24009=>1000,24010=>1000,24011=>1000,24012=>1000,24013=>1000,24014=>1000,24015=>1000,24016=>1000,24017=>1000,24018=>1000,24019=>1000,24020=>1000,
-	24021=>1000,24022=>1000,24023=>1000,24024=>1000,24025=>1000,24026=>1000,24027=>1000,24028=>1000,24029=>1000,24030=>1000,24031=>1000,24032=>1000,24033=>1000,24034=>1000,24035=>1000,24036=>1000,
-	24037=>1000,24038=>1000,24039=>1000,24040=>1000,24041=>1000,24042=>1000,24043=>1000,24044=>1000,24045=>1000,24046=>1000,24047=>1000,24048=>1000,24049=>1000,24050=>1000,24051=>1000,24052=>1000,
-	24053=>1000,24054=>1000,24055=>1000,24056=>1000,24057=>1000,24058=>1000,24059=>1000,24060=>1000,24061=>1000,24062=>1000,24063=>1000,24064=>1000,24065=>1000,24066=>1000,24067=>1000,24068=>1000,
-	24069=>1000,24070=>1000,24071=>1000,24072=>1000,24073=>1000,24074=>1000,24075=>1000,24076=>1000,24077=>1000,24078=>1000,24079=>1000,24080=>1000,24081=>1000,24082=>1000,24083=>1000,24084=>1000,
-	24085=>1000,24086=>1000,24087=>1000,24088=>1000,24089=>1000,24090=>1000,24091=>1000,24092=>1000,24093=>1000,24094=>1000,24095=>1000,24096=>1000,24097=>1000,24098=>1000,24099=>1000,24100=>1000,
-	24101=>1000,24102=>1000,24103=>1000,24104=>1000,24105=>1000,24106=>1000,24107=>1000,24108=>1000,24109=>1000,24110=>1000,24111=>1000,24112=>1000,24113=>1000,24114=>1000,24115=>1000,24116=>1000,
-	24117=>1000,24118=>1000,24119=>1000,24120=>1000,24121=>1000,24122=>1000,24123=>1000,24124=>1000,24125=>1000,24126=>1000,24127=>1000,24128=>1000,24129=>1000,24130=>1000,24131=>1000,24132=>1000,
-	24133=>1000,24134=>1000,24135=>1000,24136=>1000,24137=>1000,24138=>1000,24139=>1000,24140=>1000,24141=>1000,24142=>1000,24143=>1000,24144=>1000,24145=>1000,24146=>1000,24147=>1000,24148=>1000,
-	24149=>1000,24150=>1000,24151=>1000,24152=>1000,24153=>1000,24154=>1000,24155=>1000,24156=>1000,24157=>1000,24158=>1000,24159=>1000,24160=>1000,24161=>1000,24162=>1000,24163=>1000,24164=>1000,
-	24165=>1000,24166=>1000,24167=>1000,24168=>1000,24169=>1000,24170=>1000,24171=>1000,24172=>1000,24173=>1000,24174=>1000,24175=>1000,24176=>1000,24177=>1000,24178=>1000,24179=>1000,24180=>1000,
-	24181=>1000,24182=>1000,24183=>1000,24184=>1000,24185=>1000,24186=>1000,24187=>1000,24188=>1000,24189=>1000,24190=>1000,24191=>1000,24192=>1000,24193=>1000,24194=>1000,24195=>1000,24196=>1000,
-	24197=>1000,24198=>1000,24199=>1000,24200=>1000,24201=>1000,24202=>1000,24203=>1000,24204=>1000,24205=>1000,24206=>1000,24207=>1000,24208=>1000,24209=>1000,24210=>1000,24211=>1000,24212=>1000,
-	24213=>1000,24214=>1000,24215=>1000,24216=>1000,24217=>1000,24218=>1000,24219=>1000,24220=>1000,24221=>1000,24222=>1000,24223=>1000,24224=>1000,24225=>1000,24226=>1000,24227=>1000,24228=>1000,
-	24229=>1000,24230=>1000,24231=>1000,24232=>1000,24233=>1000,24234=>1000,24235=>1000,24236=>1000,24237=>1000,24238=>1000,24239=>1000,24240=>1000,24241=>1000,24242=>1000,24243=>1000,24244=>1000,
-	24245=>1000,24246=>1000,24247=>1000,24248=>1000,24249=>1000,24250=>1000,24251=>1000,24252=>1000,24253=>1000,24254=>1000,24255=>1000,24256=>1000,24257=>1000,24258=>1000,24259=>1000,24260=>1000,
-	24261=>1000,24262=>1000,24263=>1000,24264=>1000,24265=>1000,24266=>1000,24267=>1000,24268=>1000,24269=>1000,24270=>1000,24271=>1000,24272=>1000,24273=>1000,24274=>1000,24275=>1000,24276=>1000,
-	24277=>1000,24278=>1000,24279=>1000,24280=>1000,24281=>1000,24282=>1000,24283=>1000,24284=>1000,24285=>1000,24286=>1000,24287=>1000,24288=>1000,24289=>1000,24290=>1000,24291=>1000,24292=>1000,
-	24293=>1000,24294=>1000,24295=>1000,24296=>1000,24297=>1000,24298=>1000,24299=>1000,24300=>1000,24301=>1000,24302=>1000,24303=>1000,24304=>1000,24305=>1000,24306=>1000,24307=>1000,24308=>1000,
-	24309=>1000,24310=>1000,24311=>1000,24312=>1000,24313=>1000,24314=>1000,24315=>1000,24316=>1000,24317=>1000,24318=>1000,24319=>1000,24320=>1000,24321=>1000,24322=>1000,24323=>1000,24324=>1000,
-	24325=>1000,24326=>1000,24327=>1000,24328=>1000,24329=>1000,24330=>1000,24331=>1000,24332=>1000,24333=>1000,24334=>1000,24335=>1000,24336=>1000,24337=>1000,24338=>1000,24339=>1000,24340=>1000,
-	24341=>1000,24342=>1000,24343=>1000,24344=>1000,24345=>1000,24346=>1000,24347=>1000,24348=>1000,24349=>1000,24350=>1000,24351=>1000,24352=>1000,24353=>1000,24354=>1000,24355=>1000,24356=>1000,
-	24357=>1000,24358=>1000,24359=>1000,24360=>1000,24361=>1000,24362=>1000,24363=>1000,24364=>1000,24365=>1000,24366=>1000,24367=>1000,24368=>1000,24369=>1000,24370=>1000,24371=>1000,24372=>1000,
-	24373=>1000,24374=>1000,24375=>1000,24376=>1000,24377=>1000,24378=>1000,24379=>1000,24380=>1000,24381=>1000,24382=>1000,24383=>1000,24384=>1000,24385=>1000,24386=>1000,24387=>1000,24388=>1000,
-	24389=>1000,24390=>1000,24391=>1000,24392=>1000,24393=>1000,24394=>1000,24395=>1000,24396=>1000,24397=>1000,24398=>1000,24399=>1000,24400=>1000,24401=>1000,24402=>1000,24403=>1000,24404=>1000,
-	24405=>1000,24406=>1000,24407=>1000,24408=>1000,24409=>1000,24410=>1000,24411=>1000,24412=>1000,24413=>1000,24414=>1000,24415=>1000,24416=>1000,24417=>1000,24418=>1000,24419=>1000,24420=>1000,
-	24421=>1000,24422=>1000,24423=>1000,24424=>1000,24425=>1000,24426=>1000,24427=>1000,24428=>1000,24429=>1000,24430=>1000,24431=>1000,24432=>1000,24433=>1000,24434=>1000,24435=>1000,24436=>1000,
-	24437=>1000,24438=>1000,24439=>1000,24440=>1000,24441=>1000,24442=>1000,24443=>1000,24444=>1000,24445=>1000,24446=>1000,24447=>1000,24448=>1000,24449=>1000,24450=>1000,24451=>1000,24452=>1000,
-	24453=>1000,24454=>1000,24455=>1000,24456=>1000,24457=>1000,24458=>1000,24459=>1000,24460=>1000,24461=>1000,24462=>1000,24463=>1000,24464=>1000,24465=>1000,24466=>1000,24467=>1000,24468=>1000,
-	24469=>1000,24470=>1000,24471=>1000,24472=>1000,24473=>1000,24474=>1000,24475=>1000,24476=>1000,24477=>1000,24478=>1000,24479=>1000,24480=>1000,24481=>1000,24482=>1000,24483=>1000,24484=>1000,
-	24485=>1000,24486=>1000,24487=>1000,24488=>1000,24489=>1000,24490=>1000,24491=>1000,24492=>1000,24493=>1000,24494=>1000,24495=>1000,24496=>1000,24497=>1000,24498=>1000,24499=>1000,24500=>1000,
-	24501=>1000,24502=>1000,24503=>1000,24504=>1000,24505=>1000,24506=>1000,24507=>1000,24508=>1000,24509=>1000,24510=>1000,24511=>1000,24512=>1000,24513=>1000,24514=>1000,24515=>1000,24516=>1000,
-	24517=>1000,24518=>1000,24519=>1000,24520=>1000,24521=>1000,24522=>1000,24523=>1000,24524=>1000,24525=>1000,24526=>1000,24527=>1000,24528=>1000,24529=>1000,24530=>1000,24531=>1000,24532=>1000,
-	24533=>1000,24534=>1000,24535=>1000,24536=>1000,24537=>1000,24538=>1000,24539=>1000,24540=>1000,24541=>1000,24542=>1000,24543=>1000,24544=>1000,24545=>1000,24546=>1000,24547=>1000,24548=>1000,
-	24549=>1000,24550=>1000,24551=>1000,24552=>1000,24553=>1000,24554=>1000,24555=>1000,24556=>1000,24557=>1000,24558=>1000,24559=>1000,24560=>1000,24561=>1000,24562=>1000,24563=>1000,24564=>1000,
-	24565=>1000,24566=>1000,24567=>1000,24568=>1000,24569=>1000,24570=>1000,24571=>1000,24572=>1000,24573=>1000,24574=>1000,24575=>1000,24576=>1000,24577=>1000,24578=>1000,24579=>1000,24580=>1000,
-	24581=>1000,24582=>1000,24583=>1000,24584=>1000,24585=>1000,24586=>1000,24587=>1000,24588=>1000,24589=>1000,24590=>1000,24591=>1000,24592=>1000,24593=>1000,24594=>1000,24595=>1000,24596=>1000,
-	24597=>1000,24598=>1000,24599=>1000,24600=>1000,24601=>1000,24602=>1000,24603=>1000,24604=>1000,24605=>1000,24606=>1000,24607=>1000,24608=>1000,24609=>1000,24610=>1000,24611=>1000,24612=>1000,
-	24613=>1000,24614=>1000,24615=>1000,24616=>1000,24617=>1000,24618=>1000,24619=>1000,24620=>1000,24621=>1000,24622=>1000,24623=>1000,24624=>1000,24625=>1000,24626=>1000,24627=>1000,24628=>1000,
-	24629=>1000,24630=>1000,24631=>1000,24632=>1000,24633=>1000,24634=>1000,24635=>1000,24636=>1000,24637=>1000,24638=>1000,24639=>1000,24640=>1000,24641=>1000,24642=>1000,24643=>1000,24644=>1000,
-	24645=>1000,24646=>1000,24647=>1000,24648=>1000,24649=>1000,24650=>1000,24651=>1000,24652=>1000,24653=>1000,24654=>1000,24655=>1000,24656=>1000,24657=>1000,24658=>1000,24659=>1000,24660=>1000,
-	24661=>1000,24662=>1000,24663=>1000,24664=>1000,24665=>1000,24666=>1000,24667=>1000,24668=>1000,24669=>1000,24670=>1000,24671=>1000,24672=>1000,24673=>1000,24674=>1000,24675=>1000,24676=>1000,
-	24677=>1000,24678=>1000,24679=>1000,24680=>1000,24681=>1000,24682=>1000,24683=>1000,24684=>1000,24685=>1000,24686=>1000,24687=>1000,24688=>1000,24689=>1000,24690=>1000,24691=>1000,24692=>1000,
-	24693=>1000,24694=>1000,24695=>1000,24696=>1000,24697=>1000,24698=>1000,24699=>1000,24700=>1000,24701=>1000,24702=>1000,24703=>1000,24704=>1000,24705=>1000,24706=>1000,24707=>1000,24708=>1000,
-	24709=>1000,24710=>1000,24711=>1000,24712=>1000,24713=>1000,24714=>1000,24715=>1000,24716=>1000,24717=>1000,24718=>1000,24719=>1000,24720=>1000,24721=>1000,24722=>1000,24723=>1000,24724=>1000,
-	24725=>1000,24726=>1000,24727=>1000,24728=>1000,24729=>1000,24730=>1000,24731=>1000,24732=>1000,24733=>1000,24734=>1000,24735=>1000,24736=>1000,24737=>1000,24738=>1000,24739=>1000,24740=>1000,
-	24741=>1000,24742=>1000,24743=>1000,24744=>1000,24745=>1000,24746=>1000,24747=>1000,24748=>1000,24749=>1000,24750=>1000,24751=>1000,24752=>1000,24753=>1000,24754=>1000,24755=>1000,24756=>1000,
-	24757=>1000,24758=>1000,24759=>1000,24760=>1000,24761=>1000,24762=>1000,24763=>1000,24764=>1000,24765=>1000,24766=>1000,24767=>1000,24768=>1000,24769=>1000,24770=>1000,24771=>1000,24772=>1000,
-	24773=>1000,24774=>1000,24775=>1000,24776=>1000,24777=>1000,24778=>1000,24779=>1000,24780=>1000,24781=>1000,24782=>1000,24783=>1000,24784=>1000,24785=>1000,24786=>1000,24787=>1000,24788=>1000,
-	24789=>1000,24790=>1000,24791=>1000,24792=>1000,24793=>1000,24794=>1000,24795=>1000,24796=>1000,24797=>1000,24798=>1000,24799=>1000,24800=>1000,24801=>1000,24802=>1000,24803=>1000,24804=>1000,
-	24805=>1000,24806=>1000,24807=>1000,24808=>1000,24809=>1000,24810=>1000,24811=>1000,24812=>1000,24813=>1000,24814=>1000,24815=>1000,24816=>1000,24817=>1000,24818=>1000,24819=>1000,24820=>1000,
-	24821=>1000,24822=>1000,24823=>1000,24824=>1000,24825=>1000,24826=>1000,24827=>1000,24828=>1000,24829=>1000,24830=>1000,24831=>1000,24832=>1000,24833=>1000,24834=>1000,24835=>1000,24836=>1000,
-	24837=>1000,24838=>1000,24839=>1000,24840=>1000,24841=>1000,24842=>1000,24843=>1000,24844=>1000,24845=>1000,24846=>1000,24847=>1000,24848=>1000,24849=>1000,24850=>1000,24851=>1000,24852=>1000,
-	24853=>1000,24854=>1000,24855=>1000,24856=>1000,24857=>1000,24858=>1000,24859=>1000,24860=>1000,24861=>1000,24862=>1000,24863=>1000,24864=>1000,24865=>1000,24866=>1000,24867=>1000,24868=>1000,
-	24869=>1000,24870=>1000,24871=>1000,24872=>1000,24873=>1000,24874=>1000,24875=>1000,24876=>1000,24877=>1000,24878=>1000,24879=>1000,24880=>1000,24881=>1000,24882=>1000,24883=>1000,24884=>1000,
-	24885=>1000,24886=>1000,24887=>1000,24888=>1000,24889=>1000,24890=>1000,24891=>1000,24892=>1000,24893=>1000,24894=>1000,24895=>1000,24896=>1000,24897=>1000,24898=>1000,24899=>1000,24900=>1000,
-	24901=>1000,24902=>1000,24903=>1000,24904=>1000,24905=>1000,24906=>1000,24907=>1000,24908=>1000,24909=>1000,24910=>1000,24911=>1000,24912=>1000,24913=>1000,24914=>1000,24915=>1000,24916=>1000,
-	24917=>1000,24918=>1000,24919=>1000,24920=>1000,24921=>1000,24922=>1000,24923=>1000,24924=>1000,24925=>1000,24926=>1000,24927=>1000,24928=>1000,24929=>1000,24930=>1000,24931=>1000,24932=>1000,
-	24933=>1000,24934=>1000,24935=>1000,24936=>1000,24937=>1000,24938=>1000,24939=>1000,24940=>1000,24941=>1000,24942=>1000,24943=>1000,24944=>1000,24945=>1000,24946=>1000,24947=>1000,24948=>1000,
-	24949=>1000,24950=>1000,24951=>1000,24952=>1000,24953=>1000,24954=>1000,24955=>1000,24956=>1000,24957=>1000,24958=>1000,24959=>1000,24960=>1000,24961=>1001,24962=>1000,24963=>1000,24964=>1000,
-	24965=>1000,24966=>1000,24967=>1000,24968=>1000,24969=>1000,24970=>1000,24971=>1000,24972=>1000,24973=>1000,24974=>1000,24975=>1000,24976=>1000,24977=>1000,24978=>1000,24979=>1000,24980=>1000,
-	24981=>1000,24982=>1000,24983=>1000,24984=>1000,24985=>1000,24986=>1000,24987=>1000,24988=>1000,24989=>1000,24990=>1000,24991=>1000,24992=>1000,24993=>1000,24994=>1000,24995=>1000,24996=>1000,
-	24997=>1000,24998=>1000,24999=>1000,25000=>1000,25001=>1000,25002=>1000,25003=>1000,25004=>1000,25005=>1000,25006=>1000,25007=>1000,25008=>1000,25009=>1000,25010=>1000,25011=>1000,25012=>1000,
-	25013=>1000,25014=>1000,25015=>1000,25016=>1000,25017=>1000,25018=>1000,25019=>1000,25020=>1000,25021=>1000,25022=>1000,25023=>1000,25024=>1000,25025=>1000,25026=>1000,25027=>1000,25028=>1000,
-	25029=>1000,25030=>1000,25031=>1000,25032=>1000,25033=>1000,25034=>1000,25035=>1000,25036=>1000,25037=>1000,25038=>1000,25039=>1000,25040=>1000,25041=>1000,25042=>1000,25043=>1000,25044=>1000,
-	25045=>1000,25046=>1000,25047=>1000,25048=>1000,25049=>1000,25050=>1000,25051=>1000,25052=>1000,25053=>1000,25054=>1000,25055=>1000,25056=>1000,25057=>1000,25058=>1000,25059=>1000,25060=>1000,
-	25061=>1000,25062=>1000,25063=>1000,25064=>1000,25065=>1000,25066=>1000,25067=>1000,25068=>1000,25069=>1000,25070=>1000,25071=>1000,25072=>1000,25073=>1000,25074=>1000,25075=>1000,25076=>1000,
-	25077=>1000,25078=>1000,25079=>1000,25080=>1000,25081=>1000,25082=>1000,25083=>1000,25084=>1000,25085=>1000,25086=>1000,25087=>1000,25088=>1000,25089=>1000,25090=>1000,25091=>1000,25092=>1000,
-	25093=>1000,25094=>1000,25095=>1000,25096=>1000,25097=>1000,25098=>1000,25099=>1000,25100=>1000,25101=>1000,25102=>1000,25103=>1000,25104=>1000,25105=>1000,25106=>1000,25107=>1000,25108=>1000,
-	25109=>1000,25110=>1000,25111=>1000,25112=>1000,25113=>1000,25114=>1000,25115=>1000,25116=>1000,25117=>1000,25118=>1000,25119=>1000,25120=>1000,25121=>1000,25122=>1000,25123=>1000,25124=>1000,
-	25125=>1000,25126=>1000,25127=>1000,25128=>1000,25129=>1000,25130=>1000,25131=>1000,25132=>1000,25133=>1000,25134=>1000,25135=>1000,25136=>1000,25137=>1000,25138=>1000,25139=>1000,25140=>1000,
-	25141=>1000,25142=>1000,25143=>1000,25144=>1000,25145=>1000,25146=>1000,25147=>1000,25148=>1000,25149=>1000,25150=>1000,25151=>1000,25152=>1000,25153=>1000,25154=>1000,25155=>1000,25156=>1000,
-	25157=>1000,25158=>1000,25159=>1000,25160=>1000,25161=>1000,25162=>1000,25163=>1000,25164=>1000,25165=>1000,25166=>1000,25167=>1000,25168=>1000,25169=>1000,25170=>1000,25171=>1000,25172=>1000,
-	25173=>1000,25174=>1000,25175=>1000,25176=>1000,25177=>1000,25178=>1000,25179=>1000,25180=>1000,25181=>1000,25182=>1000,25183=>1000,25184=>1000,25185=>1000,25186=>1000,25187=>1000,25188=>1000,
-	25189=>1000,25190=>1000,25191=>1000,25192=>1000,25193=>1000,25194=>1000,25195=>1000,25196=>1000,25197=>1000,25198=>1000,25199=>1000,25200=>1000,25201=>1000,25202=>1000,25203=>1000,25204=>1000,
-	25205=>1000,25206=>1000,25207=>1000,25208=>1000,25209=>1000,25210=>1000,25211=>1000,25212=>1000,25213=>1000,25214=>1000,25215=>1000,25216=>1000,25217=>1000,25218=>1000,25219=>1000,25220=>1000,
-	25221=>1000,25222=>1000,25223=>1000,25224=>1000,25225=>1000,25226=>1000,25227=>1000,25228=>1000,25229=>1000,25230=>1000,25231=>1000,25232=>1000,25233=>1000,25234=>1000,25235=>1000,25236=>1000,
-	25237=>1000,25238=>1000,25239=>1000,25240=>1000,25241=>1000,25242=>1000,25243=>1000,25244=>1000,25245=>1000,25246=>1000,25247=>1000,25248=>1000,25249=>1000,25250=>1000,25251=>1000,25252=>1000,
-	25253=>1000,25254=>1000,25255=>1000,25256=>1000,25257=>1000,25258=>1000,25259=>1000,25260=>1000,25261=>1000,25262=>1000,25263=>1000,25264=>1000,25265=>1000,25266=>1000,25267=>1000,25268=>1000,
-	25269=>1000,25270=>1000,25271=>1000,25272=>1000,25273=>1000,25274=>1000,25275=>1000,25276=>1000,25277=>1000,25278=>1000,25279=>1000,25280=>1000,25281=>1000,25282=>1000,25283=>1000,25284=>1000,
-	25285=>1000,25286=>1000,25287=>1000,25288=>1000,25289=>1000,25290=>1000,25291=>1000,25292=>1000,25293=>1000,25294=>1000,25295=>1000,25296=>1000,25297=>1000,25298=>1000,25299=>1000,25300=>1000,
-	25301=>1000,25302=>1000,25303=>1000,25304=>1000,25305=>1000,25306=>1000,25307=>1000,25308=>1000,25309=>1000,25310=>1000,25311=>1000,25312=>1000,25313=>1000,25314=>1000,25315=>1000,25316=>1000,
-	25317=>1000,25318=>1000,25319=>1000,25320=>1000,25321=>1000,25322=>1000,25323=>1000,25324=>1000,25325=>1000,25326=>1000,25327=>1000,25328=>1000,25329=>1000,25330=>1000,25331=>1000,25332=>1000,
-	25333=>1000,25334=>1000,25335=>1000,25336=>1000,25337=>1000,25338=>1000,25339=>1000,25340=>1000,25341=>1000,25342=>1000,25343=>1000,25344=>1000,25345=>1000,25346=>1000,25347=>1000,25348=>1000,
-	25349=>1000,25350=>1000,25351=>1000,25352=>1000,25353=>1000,25354=>1000,25355=>1000,25356=>1000,25357=>1000,25358=>1000,25359=>1000,25360=>1000,25361=>1000,25362=>1000,25363=>1000,25364=>1000,
-	25365=>1000,25366=>1000,25367=>1000,25368=>1000,25369=>1000,25370=>1000,25371=>1000,25372=>1000,25373=>1000,25374=>1000,25375=>1000,25376=>1000,25377=>1000,25378=>1000,25379=>1000,25380=>1000,
-	25381=>1000,25382=>1000,25383=>1000,25384=>1000,25385=>1000,25386=>1000,25387=>1000,25388=>1000,25389=>1000,25390=>1000,25391=>1000,25392=>1000,25393=>1000,25394=>1000,25395=>1000,25396=>1000,
-	25397=>1000,25398=>1000,25399=>1000,25400=>1000,25401=>1000,25402=>1000,25403=>1000,25404=>1000,25405=>1000,25406=>1000,25407=>1000,25408=>1000,25409=>1000,25410=>1000,25411=>1000,25412=>1000,
-	25413=>1000,25414=>1000,25415=>1000,25416=>1000,25417=>1000,25418=>1000,25419=>1000,25420=>1000,25421=>1000,25422=>1000,25423=>1000,25424=>1000,25425=>1000,25426=>1000,25427=>1000,25428=>1000,
-	25429=>1000,25430=>1000,25431=>1000,25432=>1000,25433=>1000,25434=>1000,25435=>1000,25436=>1000,25437=>1000,25438=>1000,25439=>1000,25440=>1000,25441=>1000,25442=>1000,25443=>1000,25444=>1000,
-	25445=>1000,25446=>1000,25447=>1000,25448=>1000,25449=>1000,25450=>1000,25451=>1000,25452=>1000,25453=>1000,25454=>1000,25455=>1000,25456=>1000,25457=>1000,25458=>1000,25459=>1000,25460=>1000,
-	25461=>1000,25462=>1000,25463=>1000,25464=>1000,25465=>1000,25466=>1000,25467=>1000,25468=>1000,25469=>1000,25470=>1000,25471=>1000,25472=>1000,25473=>1000,25474=>1000,25475=>1000,25476=>1000,
-	25477=>1000,25478=>1000,25479=>1000,25480=>1000,25481=>1000,25482=>1000,25483=>1000,25484=>1000,25485=>1000,25486=>1000,25487=>1000,25488=>1000,25489=>1000,25490=>1000,25491=>1000,25492=>1000,
-	25493=>1000,25494=>1000,25495=>1000,25496=>1000,25497=>1000,25498=>1000,25499=>1000,25500=>1000,25501=>1000,25502=>1000,25503=>1000,25504=>1000,25505=>1000,25506=>1000,25507=>1000,25508=>1000,
-	25509=>1000,25510=>1000,25511=>1000,25512=>1000,25513=>1000,25514=>1000,25515=>1000,25516=>1000,25517=>1000,25518=>1000,25519=>1000,25520=>1000,25521=>1000,25522=>1000,25523=>1000,25524=>1000,
-	25525=>1000,25526=>1000,25527=>1000,25528=>1000,25529=>1000,25530=>1000,25531=>1000,25532=>1000,25533=>1000,25534=>1000,25535=>1000,25536=>1000,25537=>1000,25538=>1000,25539=>1000,25540=>1000,
-	25541=>1000,25542=>1000,25543=>1000,25544=>1000,25545=>1000,25546=>1000,25547=>1000,25548=>1000,25549=>1000,25550=>1000,25551=>1000,25552=>1000,25553=>1000,25554=>1000,25555=>1000,25556=>1000,
-	25557=>1000,25558=>1000,25559=>1000,25560=>1000,25561=>1000,25562=>1000,25563=>1000,25564=>1000,25565=>1000,25566=>1000,25567=>1000,25568=>1000,25569=>1000,25570=>1000,25571=>1000,25572=>1000,
-	25573=>1000,25574=>1000,25575=>1000,25576=>1000,25577=>1000,25578=>1000,25579=>1000,25580=>1000,25581=>1000,25582=>1000,25583=>1000,25584=>1000,25585=>1000,25586=>1000,25587=>1000,25588=>1000,
-	25589=>1000,25590=>1000,25591=>1000,25592=>1000,25593=>1000,25594=>1000,25595=>1000,25596=>1000,25597=>1000,25598=>1000,25599=>1000,25600=>1000,25601=>1000,25602=>1000,25603=>1000,25604=>1000,
-	25605=>1000,25606=>1000,25607=>1000,25608=>1000,25609=>1000,25610=>1000,25611=>1000,25612=>1000,25613=>1000,25614=>1000,25615=>1000,25616=>1000,25617=>1000,25618=>1000,25619=>1000,25620=>1000,
-	25621=>1000,25622=>1000,25623=>1000,25624=>1000,25625=>1000,25626=>1000,25627=>1000,25628=>1000,25629=>1000,25630=>1000,25631=>1000,25632=>1000,25633=>1000,25634=>1000,25635=>1000,25636=>1000,
-	25637=>1000,25638=>1000,25639=>1000,25640=>1000,25641=>1000,25642=>1000,25643=>1000,25644=>1000,25645=>1000,25646=>1000,25647=>1000,25648=>1000,25649=>1000,25650=>1000,25651=>1000,25652=>1000,
-	25653=>1000,25654=>1000,25655=>1000,25656=>1000,25657=>1000,25658=>1000,25659=>1000,25660=>1000,25661=>1000,25662=>1000,25663=>1000,25664=>1000,25665=>1000,25666=>1000,25667=>1000,25668=>1000,
-	25669=>1000,25670=>1000,25671=>1000,25672=>1000,25673=>1000,25674=>1000,25675=>1000,25676=>1000,25677=>1000,25678=>1000,25679=>1000,25680=>1000,25681=>1000,25682=>1000,25683=>1000,25684=>1000,
-	25685=>1000,25686=>1000,25687=>1000,25688=>1000,25689=>1000,25690=>1000,25691=>1000,25692=>1000,25693=>1000,25694=>1000,25695=>1000,25696=>1000,25697=>1000,25698=>1000,25699=>1000,25700=>1000,
-	25701=>1000,25702=>1000,25703=>1000,25704=>1000,25705=>1000,25706=>1000,25707=>1000,25708=>1000,25709=>1000,25710=>1000,25711=>1000,25712=>1000,25713=>1000,25714=>1000,25715=>1000,25716=>1000,
-	25717=>1000,25718=>1000,25719=>1000,25720=>1000,25721=>1000,25722=>1000,25723=>1000,25724=>1000,25725=>1000,25726=>1000,25727=>1000,25728=>1000,25729=>1000,25730=>1000,25731=>1000,25732=>1000,
-	25733=>1000,25734=>1000,25735=>1000,25736=>1000,25737=>1000,25738=>1000,25739=>1000,25740=>1000,25741=>1000,25742=>1000,25743=>1000,25744=>1000,25745=>1000,25746=>1000,25747=>1000,25748=>1000,
-	25749=>1000,25750=>1000,25751=>1000,25752=>1000,25753=>1000,25754=>1000,25755=>1000,25756=>1000,25757=>1000,25758=>1000,25759=>1000,25760=>1000,25761=>1000,25762=>1000,25763=>1000,25764=>1000,
-	25765=>1000,25766=>1000,25767=>1000,25768=>1000,25769=>1000,25770=>1000,25771=>1000,25772=>1000,25773=>1000,25774=>1000,25775=>1000,25776=>1000,25777=>1000,25778=>1000,25779=>1000,25780=>1000,
-	25781=>1000,25782=>1000,25783=>1000,25784=>1000,25785=>1000,25786=>1000,25787=>1000,25788=>1000,25789=>1000,25790=>1000,25791=>1000,25792=>1000,25793=>1000,25794=>1000,25795=>1000,25796=>1000,
-	25797=>1000,25798=>1000,25799=>1000,25800=>1000,25801=>1000,25802=>1000,25803=>1000,25804=>1000,25805=>1000,25806=>1000,25807=>1000,25808=>1000,25809=>1000,25810=>1000,25811=>1000,25812=>1000,
-	25813=>1000,25814=>1000,25815=>1000,25816=>1000,25817=>1000,25818=>1000,25819=>1000,25820=>1000,25821=>1000,25822=>1000,25823=>1000,25824=>1000,25825=>1000,25826=>1000,25827=>1000,25828=>1000,
-	25829=>1000,25830=>1000,25831=>1000,25832=>1000,25833=>1000,25834=>1000,25835=>1000,25836=>1000,25837=>1000,25838=>1000,25839=>1000,25840=>1000,25841=>1000,25842=>1000,25843=>1000,25844=>1000,
-	25845=>1000,25846=>1000,25847=>1000,25848=>1000,25849=>1000,25850=>1000,25851=>1000,25852=>1000,25853=>1000,25854=>1000,25855=>1000,25856=>1000,25857=>1000,25858=>1000,25859=>1000,25860=>1000,
-	25861=>1000,25862=>1000,25863=>1000,25864=>1000,25865=>1000,25866=>1000,25867=>1000,25868=>1000,25869=>1000,25870=>1000,25871=>1000,25872=>1000,25873=>1000,25874=>1000,25875=>1000,25876=>1000,
-	25877=>1000,25878=>1000,25879=>1000,25880=>1000,25881=>1000,25882=>1000,25883=>1000,25884=>1000,25885=>1000,25886=>1000,25887=>1000,25888=>1000,25889=>1000,25890=>1000,25891=>1000,25892=>1000,
-	25893=>1000,25894=>1000,25895=>1000,25896=>1000,25897=>1000,25898=>1000,25899=>1000,25900=>1000,25901=>1000,25902=>1000,25903=>1000,25904=>1000,25905=>1000,25906=>1000,25907=>1000,25908=>1000,
-	25909=>1000,25910=>1000,25911=>1000,25912=>1000,25913=>1000,25914=>1000,25915=>1000,25916=>1000,25917=>1000,25918=>1000,25919=>1000,25920=>1000,25921=>1000,25922=>1000,25923=>1000,25924=>1000,
-	25925=>1000,25926=>1000,25927=>1000,25928=>1000,25929=>1000,25930=>1000,25931=>1000,25932=>1000,25933=>1000,25934=>1000,25935=>1000,25936=>1000,25937=>1000,25938=>1000,25939=>1000,25940=>1000,
-	25941=>1000,25942=>1000,25943=>1000,25944=>1000,25945=>1000,25946=>1000,25947=>1000,25948=>1000,25949=>1000,25950=>1000,25951=>1000,25952=>1000,25953=>1000,25954=>1000,25955=>1000,25956=>1000,
-	25957=>1000,25958=>1000,25959=>1000,25960=>1000,25961=>1000,25962=>1000,25963=>1000,25964=>1000,25965=>1000,25966=>1000,25967=>1000,25968=>1000,25969=>1000,25970=>1000,25971=>1000,25972=>1000,
-	25973=>1000,25974=>1000,25975=>1000,25976=>1000,25977=>1000,25978=>1000,25979=>1000,25980=>1000,25981=>1000,25982=>1000,25983=>1000,25984=>1000,25985=>1000,25986=>1000,25987=>1000,25988=>1000,
-	25989=>1000,25990=>1000,25991=>1000,25992=>1000,25993=>1000,25994=>1000,25995=>1000,25996=>1000,25997=>1000,25998=>1000,25999=>1000,26000=>1000,26001=>1000,26002=>1000,26003=>1000,26004=>1000,
-	26005=>1000,26006=>1000,26007=>1000,26008=>1000,26009=>1000,26010=>1000,26011=>1000,26012=>1000,26013=>1000,26014=>1000,26015=>1000,26016=>1000,26017=>1000,26018=>1000,26019=>1000,26020=>1000,
-	26021=>1000,26022=>1000,26023=>1000,26024=>1000,26025=>1000,26026=>1000,26027=>1000,26028=>1000,26029=>1000,26030=>1000,26031=>1000,26032=>1000,26033=>1000,26034=>1000,26035=>1000,26036=>1000,
-	26037=>1000,26038=>1000,26039=>1000,26040=>1000,26041=>1000,26042=>1000,26043=>1000,26044=>1000,26045=>1000,26046=>1000,26047=>1000,26048=>1000,26049=>1000,26050=>1000,26051=>1000,26052=>1000,
-	26053=>1000,26054=>1000,26055=>1000,26056=>1000,26057=>1000,26058=>1000,26059=>1000,26060=>1000,26061=>1000,26062=>1000,26063=>1000,26064=>1000,26065=>1000,26066=>1000,26067=>1000,26068=>1000,
-	26069=>1000,26070=>1000,26071=>1000,26072=>1000,26073=>1000,26074=>1000,26075=>1000,26076=>1000,26077=>1000,26078=>1000,26079=>1000,26080=>1000,26081=>1000,26082=>1000,26083=>1000,26084=>1000,
-	26085=>1000,26086=>1000,26087=>1000,26088=>1000,26089=>1000,26090=>1000,26091=>1000,26092=>1000,26093=>1000,26094=>1000,26095=>1000,26096=>1000,26097=>1000,26098=>1000,26099=>1000,26100=>1000,
-	26101=>1000,26102=>1000,26103=>1000,26104=>1000,26105=>1000,26106=>1000,26107=>1000,26108=>1000,26109=>1000,26110=>1000,26111=>1000,26112=>1000,26113=>1000,26114=>1000,26115=>1000,26116=>1000,
-	26117=>1000,26118=>1000,26119=>1000,26120=>1000,26121=>1000,26122=>1000,26123=>1000,26124=>1000,26125=>1000,26126=>1000,26127=>1000,26128=>1000,26129=>1000,26130=>1000,26131=>1000,26132=>1000,
-	26133=>1000,26134=>1000,26135=>1000,26136=>1000,26137=>1000,26138=>1000,26139=>1000,26140=>1000,26141=>1000,26142=>1000,26143=>1000,26144=>1000,26145=>1000,26146=>1000,26147=>1000,26148=>1000,
-	26149=>1000,26150=>1000,26151=>1000,26152=>1000,26153=>1000,26154=>1000,26155=>1000,26156=>1000,26157=>1000,26158=>1000,26159=>1000,26160=>1000,26161=>1000,26162=>1000,26163=>1000,26164=>1000,
-	26165=>1000,26166=>1000,26167=>1000,26168=>1000,26169=>1000,26170=>1000,26171=>1000,26172=>1000,26173=>1000,26174=>1000,26175=>1000,26176=>1000,26177=>1000,26178=>1000,26179=>1000,26180=>1000,
-	26181=>1000,26182=>1000,26183=>1000,26184=>1000,26185=>1000,26186=>1000,26187=>1000,26188=>1000,26189=>1000,26190=>1000,26191=>1000,26192=>1000,26193=>1000,26194=>1000,26195=>1000,26196=>1000,
-	26197=>1000,26198=>1000,26199=>1000,26200=>1000,26201=>1000,26202=>1000,26203=>1000,26204=>1000,26205=>1000,26206=>1000,26207=>1000,26208=>1000,26209=>1000,26210=>1000,26211=>1000,26212=>1000,
-	26213=>1000,26214=>1000,26215=>1000,26216=>1000,26217=>1000,26218=>1000,26219=>1000,26220=>1000,26221=>1000,26222=>1000,26223=>1000,26224=>1000,26225=>1000,26226=>1000,26227=>1000,26228=>1000,
-	26229=>1000,26230=>1000,26231=>1000,26232=>1000,26233=>1000,26234=>1000,26235=>1000,26236=>1000,26237=>1000,26238=>1000,26239=>1000,26240=>1000,26241=>1000,26242=>1000,26243=>1000,26244=>1000,
-	26245=>1000,26246=>1000,26247=>1000,26248=>1000,26249=>1000,26250=>1000,26251=>1000,26252=>1000,26253=>1000,26254=>1000,26255=>1000,26256=>1000,26257=>1000,26258=>1000,26259=>1000,26260=>1000,
-	26261=>1000,26262=>1000,26263=>1000,26264=>1000,26265=>1000,26266=>1000,26267=>1000,26268=>1000,26269=>1000,26270=>1000,26271=>1000,26272=>1000,26273=>1000,26274=>1000,26275=>1000,26276=>1000,
-	26277=>1000,26278=>1000,26279=>1000,26280=>1000,26281=>1000,26282=>1000,26283=>1000,26284=>1000,26285=>1000,26286=>1000,26287=>1000,26288=>1000,26289=>1000,26290=>1000,26291=>1000,26292=>1000,
-	26293=>1000,26294=>1000,26295=>1000,26296=>1000,26297=>1000,26298=>1000,26299=>1000,26300=>1000,26301=>1000,26302=>1000,26303=>1000,26304=>1000,26305=>1000,26306=>1000,26307=>1000,26308=>1000,
-	26309=>1000,26310=>1000,26311=>1000,26312=>1000,26313=>1000,26314=>1000,26315=>1000,26316=>1000,26317=>1000,26318=>1000,26319=>1000,26320=>1000,26321=>1000,26322=>1000,26323=>1000,26324=>1000,
-	26325=>1000,26326=>1000,26327=>1000,26328=>1000,26329=>1000,26330=>1000,26331=>1000,26332=>1000,26333=>1000,26334=>1000,26335=>1000,26336=>1000,26337=>1000,26338=>1000,26339=>1000,26340=>1000,
-	26341=>1000,26342=>1000,26343=>1000,26344=>1000,26345=>1000,26346=>1000,26347=>1000,26348=>1000,26349=>1000,26350=>1000,26351=>1000,26352=>1000,26353=>1000,26354=>1000,26355=>1000,26356=>1000,
-	26357=>1000,26358=>1000,26359=>1000,26360=>1000,26361=>1000,26362=>1000,26363=>1000,26364=>1000,26365=>1000,26366=>1000,26367=>1000,26368=>1000,26369=>1000,26370=>1000,26371=>1000,26372=>1000,
-	26373=>1000,26374=>1000,26375=>1000,26376=>1000,26377=>1000,26378=>1000,26379=>1000,26380=>1000,26381=>1000,26382=>1000,26383=>1000,26384=>1000,26385=>1000,26386=>1000,26387=>1000,26388=>1000,
-	26389=>1000,26390=>1000,26391=>1000,26392=>1000,26393=>1000,26394=>1000,26395=>1000,26396=>1000,26397=>1000,26398=>1000,26399=>1000,26400=>1000,26401=>1000,26402=>1000,26403=>1000,26404=>1000,
-	26405=>1000,26406=>1000,26407=>1000,26408=>1000,26409=>1000,26410=>1000,26411=>1000,26412=>1000,26413=>1000,26414=>1000,26415=>1000,26416=>1000,26417=>1000,26418=>1000,26419=>1000,26420=>1000,
-	26421=>1000,26422=>1000,26423=>1000,26424=>1000,26425=>1000,26426=>1000,26427=>1000,26428=>1000,26429=>1000,26430=>1000,26431=>1000,26432=>1000,26433=>1000,26434=>1000,26435=>1000,26436=>1000,
-	26437=>1000,26438=>1000,26439=>1000,26440=>1000,26441=>1000,26442=>1000,26443=>1000,26444=>1000,26445=>1000,26446=>1000,26447=>1000,26448=>1000,26449=>1000,26450=>1000,26451=>1000,26452=>1000,
-	26453=>1000,26454=>1000,26455=>1000,26456=>1000,26457=>1000,26458=>1000,26459=>1000,26460=>1000,26461=>1000,26462=>1000,26463=>1000,26464=>1000,26465=>1000,26466=>1000,26467=>1000,26468=>1000,
-	26469=>1000,26470=>1000,26471=>1000,26472=>1000,26473=>1000,26474=>1000,26475=>1000,26476=>1000,26477=>1000,26478=>1000,26479=>1000,26480=>1000,26481=>1000,26482=>1000,26483=>1000,26484=>1000,
-	26485=>1000,26486=>1000,26487=>1000,26488=>1000,26489=>1000,26490=>1000,26491=>1000,26492=>1000,26493=>1000,26494=>1000,26495=>1000,26496=>1000,26497=>1000,26498=>1000,26499=>1000,26500=>1000,
-	26501=>1000,26502=>1000,26503=>1000,26504=>1000,26505=>1000,26506=>1000,26507=>1000,26508=>1000,26509=>1000,26510=>1000,26511=>1000,26512=>1000,26513=>1000,26514=>1000,26515=>1000,26516=>1000,
-	26517=>1000,26518=>1000,26519=>1000,26520=>1000,26521=>1000,26522=>1000,26523=>1000,26524=>1000,26525=>1000,26526=>1000,26527=>1000,26528=>1000,26529=>1000,26530=>1000,26531=>1000,26532=>1000,
-	26533=>1000,26534=>1000,26535=>1000,26536=>1000,26537=>1000,26538=>1000,26539=>1000,26540=>1000,26541=>1000,26542=>1000,26543=>1000,26544=>1000,26545=>1000,26546=>1000,26547=>1000,26548=>1000,
-	26549=>1000,26550=>1000,26551=>1000,26552=>1000,26553=>1000,26554=>1000,26555=>1000,26556=>1000,26557=>1000,26558=>1000,26559=>1000,26560=>1000,26561=>1000,26562=>1000,26563=>1000,26564=>1000,
-	26565=>1000,26566=>1000,26567=>1000,26568=>1000,26569=>1000,26570=>1000,26571=>1000,26572=>1000,26573=>1000,26574=>1000,26575=>1000,26576=>1000,26577=>1000,26578=>1000,26579=>1000,26580=>1000,
-	26581=>1000,26582=>1000,26583=>1000,26584=>1000,26585=>1000,26586=>1000,26587=>1000,26588=>1000,26589=>1000,26590=>1000,26591=>1000,26592=>1000,26593=>1000,26594=>1000,26595=>1000,26596=>1000,
-	26597=>1000,26598=>1000,26599=>1000,26600=>1000,26601=>1000,26602=>1000,26603=>1000,26604=>1000,26605=>1000,26606=>1000,26607=>1000,26608=>1000,26609=>1000,26610=>1000,26611=>1000,26612=>1000,
-	26613=>1000,26614=>1000,26615=>1000,26616=>1000,26617=>1000,26618=>1000,26619=>1000,26620=>1000,26621=>1000,26622=>1000,26623=>1000,26624=>1000,26625=>1000,26626=>1000,26627=>1000,26628=>1000,
-	26629=>1000,26630=>1000,26631=>1000,26632=>1000,26633=>1000,26634=>1000,26635=>1000,26636=>1000,26637=>1000,26638=>1000,26639=>1000,26640=>1000,26641=>1000,26642=>1000,26643=>1000,26644=>1000,
-	26645=>1000,26646=>1000,26647=>1000,26648=>1000,26649=>1000,26650=>1000,26651=>1000,26652=>1000,26653=>1000,26654=>1000,26655=>1000,26656=>1000,26657=>1000,26658=>1000,26659=>1000,26660=>1000,
-	26661=>1000,26662=>1000,26663=>1000,26664=>1000,26665=>1000,26666=>1000,26667=>1000,26668=>1000,26669=>1000,26670=>1000,26671=>1000,26672=>1000,26673=>1000,26674=>1000,26675=>1000,26676=>1000,
-	26677=>1000,26678=>1000,26679=>1000,26680=>1000,26681=>1000,26682=>1000,26683=>1000,26684=>1000,26685=>1000,26686=>1000,26687=>1000,26688=>1000,26689=>1000,26690=>1000,26691=>1000,26692=>1000,
-	26693=>1000,26694=>1000,26695=>1000,26696=>1000,26697=>1000,26698=>1000,26699=>1000,26700=>1000,26701=>1000,26702=>1000,26703=>1000,26704=>1000,26705=>1000,26706=>1000,26707=>1000,26708=>1000,
-	26709=>1000,26710=>1000,26711=>1000,26712=>1000,26713=>1000,26714=>1000,26715=>1000,26716=>1000,26717=>1000,26718=>1000,26719=>1000,26720=>1000,26721=>1000,26722=>1000,26723=>1000,26724=>1000,
-	26725=>1000,26726=>1000,26727=>1000,26728=>1000,26729=>1000,26730=>1000,26731=>1000,26732=>1000,26733=>1000,26734=>1000,26735=>1000,26736=>1000,26737=>1000,26738=>1000,26739=>1000,26740=>1000,
-	26741=>1000,26742=>1000,26743=>1000,26744=>1000,26745=>1000,26746=>1000,26747=>1000,26748=>1000,26749=>1000,26750=>1000,26751=>1000,26752=>1000,26753=>1000,26754=>1000,26755=>1000,26756=>1000,
-	26757=>1000,26758=>1000,26759=>1000,26760=>1000,26761=>1000,26762=>1000,26763=>1000,26764=>1000,26765=>1000,26766=>1000,26767=>1000,26768=>1000,26769=>1000,26770=>1000,26771=>1000,26772=>1000,
-	26773=>1000,26774=>1000,26775=>1000,26776=>1000,26777=>1000,26778=>1000,26779=>1000,26780=>1000,26781=>1000,26782=>1000,26783=>1000,26784=>1000,26785=>1000,26786=>1000,26787=>1000,26788=>1000,
-	26789=>1000,26790=>1000,26791=>1000,26792=>1000,26793=>1000,26794=>1000,26795=>1000,26796=>1000,26797=>1000,26798=>1000,26799=>1000,26800=>1000,26801=>1000,26802=>1000,26803=>1000,26804=>1000,
-	26805=>1000,26806=>1000,26807=>1000,26808=>1000,26809=>1000,26810=>1000,26811=>1000,26812=>1000,26813=>1000,26814=>1000,26815=>1000,26816=>1000,26817=>1000,26818=>1000,26819=>1000,26820=>1000,
-	26821=>1000,26822=>1000,26823=>1000,26824=>1000,26825=>1000,26826=>1000,26827=>1000,26828=>1000,26829=>1000,26830=>1000,26831=>1000,26832=>1000,26833=>1000,26834=>1000,26835=>1000,26836=>1000,
-	26837=>1000,26838=>1000,26839=>1000,26840=>1000,26841=>1000,26842=>1000,26843=>1000,26844=>1000,26845=>1000,26846=>1000,26847=>1000,26848=>1000,26849=>1000,26850=>1000,26851=>1000,26852=>1000,
-	26853=>1000,26854=>1000,26855=>1000,26856=>1000,26857=>1000,26858=>1000,26859=>1000,26860=>1000,26861=>1000,26862=>1000,26863=>1000,26864=>1000,26865=>1000,26866=>1000,26867=>1000,26868=>1000,
-	26869=>1000,26870=>1000,26871=>1000,26872=>1000,26873=>1000,26874=>1000,26875=>1000,26876=>1000,26877=>1000,26878=>1000,26879=>1000,26880=>1000,26881=>1000,26882=>1000,26883=>1000,26884=>1000,
-	26885=>1000,26886=>1000,26887=>1000,26888=>1000,26889=>1000,26890=>1000,26891=>1000,26892=>1000,26893=>1000,26894=>1000,26895=>1000,26896=>1000,26897=>1000,26898=>1000,26899=>1000,26900=>1000,
-	26901=>1000,26902=>1000,26903=>1000,26904=>1000,26905=>1000,26906=>1000,26907=>1000,26908=>1000,26909=>1000,26910=>1000,26911=>1000,26912=>1000,26913=>1000,26914=>1000,26915=>1000,26916=>1000,
-	26917=>1000,26918=>1000,26919=>1000,26920=>1000,26921=>1000,26922=>1000,26923=>1000,26924=>1000,26925=>1000,26926=>1000,26927=>1000,26928=>1000,26929=>1000,26930=>1000,26931=>1000,26932=>1000,
-	26933=>1000,26934=>1000,26935=>1000,26936=>1000,26937=>1000,26938=>1000,26939=>1000,26940=>1000,26941=>1000,26942=>1000,26943=>1000,26944=>1000,26945=>1000,26946=>1000,26947=>1000,26948=>1000,
-	26949=>1000,26950=>1000,26951=>1000,26952=>1000,26953=>1000,26954=>1000,26955=>1000,26956=>1000,26957=>1000,26958=>1000,26959=>1000,26960=>1000,26961=>1000,26962=>1000,26963=>1000,26964=>1000,
-	26965=>1000,26966=>1000,26967=>1000,26968=>1000,26969=>1000,26970=>1000,26971=>1000,26972=>1000,26973=>1000,26974=>1000,26975=>1000,26976=>1000,26977=>1000,26978=>1000,26979=>1000,26980=>1000,
-	26981=>1000,26982=>1000,26983=>1000,26984=>1000,26985=>1000,26986=>1000,26987=>1000,26988=>1000,26989=>1000,26990=>1000,26991=>1000,26992=>1000,26993=>1000,26994=>1000,26995=>1000,26996=>1000,
-	26997=>1000,26998=>1000,26999=>1000,27000=>1000,27001=>1000,27002=>1000,27003=>1000,27004=>1000,27005=>1000,27006=>1000,27007=>1000,27008=>1000,27009=>1000,27010=>1000,27011=>1000,27012=>1000,
-	27013=>1000,27014=>1000,27015=>1000,27016=>1000,27017=>1000,27018=>1000,27019=>1000,27020=>1000,27021=>1000,27022=>1000,27023=>1000,27024=>1000,27025=>1000,27026=>1000,27027=>1000,27028=>1000,
-	27029=>1000,27030=>1000,27031=>1000,27032=>1000,27033=>1000,27034=>1000,27035=>1000,27036=>1000,27037=>1000,27038=>1000,27039=>1000,27040=>1000,27041=>1000,27042=>1000,27043=>1000,27044=>1000,
-	27045=>1000,27046=>1000,27047=>1000,27048=>1000,27049=>1000,27050=>1000,27051=>1000,27052=>1000,27053=>1000,27054=>1000,27055=>1000,27056=>1000,27057=>1000,27058=>1000,27059=>1000,27060=>1000,
-	27061=>1000,27062=>1000,27063=>1000,27064=>1000,27065=>1000,27066=>1000,27067=>1000,27068=>1000,27069=>1000,27070=>1000,27071=>1000,27072=>1000,27073=>1000,27074=>1000,27075=>1000,27076=>1000,
-	27077=>1000,27078=>1000,27079=>1000,27080=>1000,27081=>1000,27082=>1000,27083=>1000,27084=>1000,27085=>1000,27086=>1000,27087=>1000,27088=>1000,27089=>1000,27090=>1000,27091=>1000,27092=>1000,
-	27093=>1000,27094=>1000,27095=>1000,27096=>1000,27097=>1000,27098=>1000,27099=>1000,27100=>1000,27101=>1000,27102=>1000,27103=>1000,27104=>1000,27105=>1000,27106=>1000,27107=>1000,27108=>1000,
-	27109=>1000,27110=>1000,27111=>1000,27112=>1000,27113=>1000,27114=>1000,27115=>1000,27116=>1000,27117=>1000,27118=>1000,27119=>1000,27120=>1000,27121=>1000,27122=>1000,27123=>1000,27124=>1000,
-	27125=>1000,27126=>1000,27127=>1000,27128=>1000,27129=>1000,27130=>1000,27131=>1000,27132=>1000,27133=>1000,27134=>1000,27135=>1000,27136=>1000,27137=>1000,27138=>1000,27139=>1000,27140=>1000,
-	27141=>1000,27142=>1000,27143=>1000,27144=>1000,27145=>1000,27146=>1000,27147=>1000,27148=>1000,27149=>1000,27150=>1000,27151=>1000,27152=>1000,27153=>1000,27154=>1000,27155=>1000,27156=>1000,
-	27157=>1000,27158=>1000,27159=>1000,27160=>1000,27161=>1000,27162=>1000,27163=>1000,27164=>1000,27165=>1000,27166=>1000,27167=>1000,27168=>1000,27169=>1000,27170=>1000,27171=>1000,27172=>1000,
-	27173=>1000,27174=>1000,27175=>1000,27176=>1000,27177=>1000,27178=>1000,27179=>1000,27180=>1000,27181=>1000,27182=>1000,27183=>1000,27184=>1000,27185=>1000,27186=>1000,27187=>1000,27188=>1000,
-	27189=>1000,27190=>1000,27191=>1000,27192=>1000,27193=>1000,27194=>1000,27195=>1000,27196=>1000,27197=>1000,27198=>1000,27199=>1000,27200=>1000,27201=>1000,27202=>1000,27203=>1000,27204=>1000,
-	27205=>1000,27206=>1000,27207=>1000,27208=>1000,27209=>1000,27210=>1000,27211=>1000,27212=>1000,27213=>1000,27214=>1000,27215=>1000,27216=>1000,27217=>1000,27218=>1000,27219=>1000,27220=>1000,
-	27221=>1000,27222=>1000,27223=>1000,27224=>1000,27225=>1000,27226=>1000,27227=>1000,27228=>1000,27229=>1000,27230=>1000,27231=>1000,27232=>1000,27233=>1000,27234=>1000,27235=>1000,27236=>1000,
-	27237=>1000,27238=>1000,27239=>1000,27240=>1000,27241=>1000,27242=>1000,27243=>1000,27244=>1000,27245=>1000,27246=>1000,27247=>1000,27248=>1000,27249=>1000,27250=>1000,27251=>1000,27252=>1000,
-	27253=>1000,27254=>1000,27255=>1000,27256=>1000,27257=>1000,27258=>1000,27259=>1000,27260=>1000,27261=>1000,27262=>1000,27263=>1000,27264=>1000,27265=>1000,27266=>1000,27267=>1000,27268=>1000,
-	27269=>1000,27270=>1000,27271=>1000,27272=>1000,27273=>1000,27274=>1000,27275=>1000,27276=>1000,27277=>1000,27278=>1000,27279=>1000,27280=>1000,27281=>1000,27282=>1000,27283=>1000,27284=>1000,
-	27285=>1000,27286=>1000,27287=>1000,27288=>1000,27289=>1000,27290=>1000,27291=>1000,27292=>1000,27293=>1000,27294=>1000,27295=>1000,27296=>1000,27297=>1000,27298=>1000,27299=>1000,27300=>1000,
-	27301=>1000,27302=>1000,27303=>1000,27304=>1000,27305=>1000,27306=>1000,27307=>1000,27308=>1000,27309=>1000,27310=>1000,27311=>1000,27312=>1000,27313=>1000,27314=>1000,27315=>1000,27316=>1000,
-	27317=>1000,27318=>1000,27319=>1000,27320=>1000,27321=>1000,27322=>1000,27323=>1000,27324=>1000,27325=>1000,27326=>1000,27327=>1000,27328=>1000,27329=>1000,27330=>1000,27331=>1000,27332=>1000,
-	27333=>1000,27334=>1000,27335=>1000,27336=>1000,27337=>1000,27338=>1000,27339=>1000,27340=>1000,27341=>1000,27342=>1000,27343=>1000,27344=>1000,27345=>1000,27346=>1000,27347=>1000,27348=>1000,
-	27349=>1000,27350=>1000,27351=>1000,27352=>1000,27353=>1000,27354=>1000,27355=>1000,27356=>1000,27357=>1000,27358=>1000,27359=>1000,27360=>1000,27361=>1000,27362=>1000,27363=>1000,27364=>1000,
-	27365=>1000,27366=>1000,27367=>1000,27368=>1000,27369=>1000,27370=>1000,27371=>1000,27372=>1000,27373=>1000,27374=>1000,27375=>1000,27376=>1000,27377=>1000,27378=>1000,27379=>1000,27380=>1000,
-	27381=>1000,27382=>1000,27383=>1000,27384=>1000,27385=>1000,27386=>1000,27387=>1000,27388=>1000,27389=>1000,27390=>1000,27391=>1000,27392=>1000,27393=>1000,27394=>1000,27395=>1000,27396=>1000,
-	27397=>1000,27398=>1000,27399=>1000,27400=>1000,27401=>1000,27402=>1000,27403=>1000,27404=>1000,27405=>1000,27406=>1000,27407=>1000,27408=>1000,27409=>1000,27410=>1000,27411=>1000,27412=>1000,
-	27413=>1000,27414=>1000,27415=>1000,27416=>1000,27417=>1000,27418=>1000,27419=>1000,27420=>1000,27421=>1000,27422=>1000,27423=>1000,27424=>1000,27425=>1000,27426=>1000,27427=>1000,27428=>1000,
-	27429=>1000,27430=>1000,27431=>1000,27432=>1000,27433=>1000,27434=>1000,27435=>1000,27436=>1000,27437=>1000,27438=>1000,27439=>1000,27440=>1000,27441=>1000,27442=>1000,27443=>1000,27444=>1000,
-	27445=>1000,27446=>1000,27447=>1000,27448=>1000,27449=>1000,27450=>1000,27451=>1000,27452=>1000,27453=>1000,27454=>1000,27455=>1000,27456=>1000,27457=>1000,27458=>1000,27459=>1000,27460=>1000,
-	27461=>1000,27462=>1000,27463=>1000,27464=>1000,27465=>1000,27466=>1000,27467=>1000,27468=>1000,27469=>1000,27470=>1000,27471=>1000,27472=>1000,27473=>1000,27474=>1000,27475=>1000,27476=>1000,
-	27477=>1000,27478=>1000,27479=>1000,27480=>1000,27481=>1000,27482=>1000,27483=>1000,27484=>1000,27485=>1000,27486=>1000,27487=>1000,27488=>1000,27489=>1000,27490=>1000,27491=>1000,27492=>1000,
-	27493=>1000,27494=>1000,27495=>1000,27496=>1000,27497=>1000,27498=>1000,27499=>1000,27500=>1000,27501=>1000,27502=>1000,27503=>1000,27504=>1000,27505=>1000,27506=>1000,27507=>1000,27508=>1000,
-	27509=>1000,27510=>1000,27511=>1000,27512=>1000,27513=>1000,27514=>1000,27515=>1000,27516=>1000,27517=>1000,27518=>1000,27519=>1000,27520=>1000,27521=>1000,27522=>1000,27523=>1000,27524=>1000,
-	27525=>1000,27526=>1000,27527=>1000,27528=>1000,27529=>1000,27530=>1000,27531=>1000,27532=>1000,27533=>1000,27534=>1000,27535=>1000,27536=>1000,27537=>1000,27538=>1000,27539=>1000,27540=>1000,
-	27541=>1000,27542=>1000,27543=>1000,27544=>1000,27545=>1000,27546=>1000,27547=>1000,27548=>1000,27549=>1000,27550=>1000,27551=>1000,27552=>1000,27553=>1000,27554=>1000,27555=>1000,27556=>1000,
-	27557=>1000,27558=>1000,27559=>1000,27560=>1000,27561=>1000,27562=>1000,27563=>1000,27564=>1000,27565=>1000,27566=>1000,27567=>1000,27568=>1000,27569=>1000,27570=>1000,27571=>1000,27572=>1000,
-	27573=>1000,27574=>1000,27575=>1000,27576=>1000,27577=>1000,27578=>1000,27579=>1000,27580=>1000,27581=>1000,27582=>1000,27583=>1000,27584=>1000,27585=>1000,27586=>1000,27587=>1000,27588=>1000,
-	27589=>1000,27590=>1000,27591=>1000,27592=>1000,27593=>1000,27594=>1000,27595=>1000,27596=>1000,27597=>1000,27598=>1000,27599=>1000,27600=>1000,27601=>1000,27602=>1000,27603=>1000,27604=>1000,
-	27605=>1000,27606=>1000,27607=>1000,27608=>1000,27609=>1000,27610=>1000,27611=>1000,27612=>1000,27613=>1000,27614=>1000,27615=>1000,27616=>1000,27617=>1000,27618=>1000,27619=>1000,27620=>1000,
-	27621=>1000,27622=>1000,27623=>1000,27624=>1000,27625=>1000,27626=>1000,27627=>1000,27628=>1000,27629=>1000,27630=>1000,27631=>1000,27632=>1000,27633=>1000,27634=>1000,27635=>1000,27636=>1000,
-	27637=>1000,27638=>1000,27639=>1000,27640=>1000,27641=>1000,27642=>1000,27643=>1000,27644=>1000,27645=>1000,27646=>1000,27647=>1000,27648=>1000,27649=>1000,27650=>1000,27651=>1000,27652=>1000,
-	27653=>1000,27654=>1000,27655=>1000,27656=>1000,27657=>1000,27658=>1000,27659=>1000,27660=>1000,27661=>1000,27662=>1000,27663=>1000,27664=>1000,27665=>1000,27666=>1000,27667=>1000,27668=>1000,
-	27669=>1000,27670=>1000,27671=>1000,27672=>1000,27673=>1000,27674=>1000,27675=>1000,27676=>1000,27677=>1000,27678=>1000,27679=>1000,27680=>1000,27681=>1000,27682=>1000,27683=>1000,27684=>1000,
-	27685=>1000,27686=>1000,27687=>1000,27688=>1000,27689=>1000,27690=>1000,27691=>1000,27692=>1000,27693=>1000,27694=>1000,27695=>1000,27696=>1000,27697=>1000,27698=>1000,27699=>1000,27700=>1000,
-	27701=>1000,27702=>1000,27703=>1000,27704=>1000,27705=>1000,27706=>1000,27707=>1000,27708=>1000,27709=>1000,27710=>1000,27711=>1000,27712=>1000,27713=>1000,27714=>1000,27715=>1000,27716=>1000,
-	27717=>1000,27718=>1000,27719=>1000,27720=>1000,27721=>1000,27722=>1000,27723=>1000,27724=>1000,27725=>1000,27726=>1000,27727=>1000,27728=>1000,27729=>1000,27730=>1000,27731=>1000,27732=>1000,
-	27733=>1000,27734=>1000,27735=>1000,27736=>1000,27737=>1000,27738=>1000,27739=>1000,27740=>1000,27741=>1000,27742=>1000,27743=>1000,27744=>1000,27745=>1000,27746=>1000,27747=>1000,27748=>1000,
-	27749=>1000,27750=>1000,27751=>1000,27752=>1000,27753=>1000,27754=>1000,27755=>1000,27756=>1000,27757=>1000,27758=>1000,27759=>1000,27760=>1000,27761=>1000,27762=>1000,27763=>1000,27764=>1000,
-	27765=>1000,27766=>1000,27767=>1000,27768=>1000,27769=>1000,27770=>1000,27771=>1000,27772=>1000,27773=>1000,27774=>1000,27775=>1000,27776=>1000,27777=>1000,27778=>1000,27779=>1000,27780=>1000,
-	27781=>1000,27782=>1000,27783=>1000,27784=>1000,27785=>1000,27786=>1000,27787=>1000,27788=>1000,27789=>1000,27790=>1000,27791=>1000,27792=>1000,27793=>1000,27794=>1000,27795=>1000,27796=>1000,
-	27797=>1000,27798=>1000,27799=>1000,27800=>1000,27801=>1000,27802=>1000,27803=>1000,27804=>1000,27805=>1000,27806=>1000,27807=>1000,27808=>1000,27809=>1000,27810=>1000,27811=>1000,27812=>1000,
-	27813=>1000,27814=>1000,27815=>1000,27816=>1000,27817=>1000,27818=>1000,27819=>1000,27820=>1000,27821=>1000,27822=>1000,27823=>1000,27824=>1000,27825=>1000,27826=>1000,27827=>1000,27828=>1000,
-	27829=>1000,27830=>1000,27831=>1000,27832=>1000,27833=>1000,27834=>1000,27835=>1000,27836=>1000,27837=>1000,27838=>1000,27839=>1000,27840=>1000,27841=>1000,27842=>1000,27843=>1000,27844=>1000,
-	27845=>1000,27846=>1000,27847=>1000,27848=>1000,27849=>1000,27850=>1000,27851=>1000,27852=>1000,27853=>1000,27854=>1000,27855=>1000,27856=>1000,27857=>1000,27858=>1000,27859=>1000,27860=>1000,
-	27861=>1000,27862=>1000,27863=>1000,27864=>1000,27865=>1000,27866=>1000,27867=>1000,27868=>1000,27869=>1000,27870=>1000,27871=>1000,27872=>1000,27873=>1000,27874=>1000,27875=>1000,27876=>1000,
-	27877=>1000,27878=>1000,27879=>1000,27880=>1000,27881=>1000,27882=>1000,27883=>1000,27884=>1000,27885=>1000,27886=>1000,27887=>1000,27888=>1000,27889=>1000,27890=>1000,27891=>1000,27892=>1000,
-	27893=>1000,27894=>1000,27895=>1000,27896=>1000,27897=>1000,27898=>1000,27899=>1000,27900=>1000,27901=>1000,27902=>1000,27903=>1000,27904=>1000,27905=>1000,27906=>1000,27907=>1000,27908=>1000,
-	27909=>1000,27910=>1000,27911=>1000,27912=>1000,27913=>1000,27914=>1000,27915=>1000,27916=>1000,27917=>1000,27918=>1000,27919=>1000,27920=>1000,27921=>1000,27922=>1000,27923=>1000,27924=>1000,
-	27925=>1000,27926=>1000,27927=>1000,27928=>1000,27929=>1000,27930=>1000,27931=>1000,27932=>1000,27933=>1000,27934=>1000,27935=>1000,27936=>1000,27937=>1000,27938=>1000,27939=>1000,27940=>1000,
-	27941=>1000,27942=>1000,27943=>1000,27944=>1000,27945=>1000,27946=>1000,27947=>1000,27948=>1000,27949=>1000,27950=>1000,27951=>1000,27952=>1000,27953=>1000,27954=>1000,27955=>1000,27956=>1000,
-	27957=>1000,27958=>1000,27959=>1000,27960=>1000,27961=>1000,27962=>1000,27963=>1000,27964=>1000,27965=>1000,27966=>1000,27967=>1000,27968=>1000,27969=>1000,27970=>1000,27971=>1000,27972=>1000,
-	27973=>1000,27974=>1000,27975=>1000,27976=>1000,27977=>1000,27978=>1000,27979=>1000,27980=>1000,27981=>1000,27982=>1000,27983=>1000,27984=>1000,27985=>1000,27986=>1000,27987=>1000,27988=>1000,
-	27989=>1000,27990=>1000,27991=>1000,27992=>1000,27993=>1000,27994=>1000,27995=>1000,27996=>1000,27997=>1000,27998=>1000,27999=>1000,28000=>1000,28001=>1000,28002=>1000,28003=>1000,28004=>1000,
-	28005=>1000,28006=>1000,28007=>1000,28008=>1000,28009=>1000,28010=>1000,28011=>1000,28012=>1000,28013=>1000,28014=>1000,28015=>1000,28016=>1000,28017=>1000,28018=>1000,28019=>1000,28020=>1000,
-	28021=>1000,28022=>1000,28023=>1000,28024=>1000,28025=>1000,28026=>1000,28027=>1000,28028=>1000,28029=>1000,28030=>1000,28031=>1000,28032=>1000,28033=>1000,28034=>1000,28035=>1000,28036=>1000,
-	28037=>1000,28038=>1000,28039=>1000,28040=>1000,28041=>1000,28042=>1000,28043=>1000,28044=>1000,28045=>1000,28046=>1000,28047=>1000,28048=>1000,28049=>1000,28050=>1000,28051=>1000,28052=>1000,
-	28053=>1000,28054=>1000,28055=>1000,28056=>1000,28057=>1000,28058=>1000,28059=>1000,28060=>1000,28061=>1000,28062=>1000,28063=>1000,28064=>1000,28065=>1000,28066=>1000,28067=>1000,28068=>1000,
-	28069=>1000,28070=>1000,28071=>1000,28072=>1000,28073=>1000,28074=>1000,28075=>1000,28076=>1000,28077=>1000,28078=>1000,28079=>1000,28080=>1000,28081=>1000,28082=>1000,28083=>1000,28084=>1000,
-	28085=>1000,28086=>1000,28087=>1000,28088=>1000,28089=>1000,28090=>1000,28091=>1000,28092=>1000,28093=>1000,28094=>1000,28095=>1000,28096=>1000,28097=>1000,28098=>1000,28099=>1000,28100=>1000,
-	28101=>1000,28102=>1000,28103=>1000,28104=>1000,28105=>1000,28106=>1000,28107=>1000,28108=>1000,28109=>1000,28110=>1000,28111=>1000,28112=>1000,28113=>1000,28114=>1000,28115=>1000,28116=>1000,
-	28117=>1000,28118=>1000,28119=>1000,28120=>1000,28121=>1000,28122=>1000,28123=>1000,28124=>1000,28125=>1000,28126=>1000,28127=>1000,28128=>1000,28129=>1000,28130=>1000,28131=>1000,28132=>1000,
-	28133=>1000,28134=>1000,28135=>1000,28136=>1000,28137=>1000,28138=>1000,28139=>1000,28140=>1000,28141=>1000,28142=>1000,28143=>1000,28144=>1000,28145=>1000,28146=>1000,28147=>1000,28148=>1000,
-	28149=>1000,28150=>1000,28151=>1000,28152=>1000,28153=>1000,28154=>1000,28155=>1000,28156=>1000,28157=>1000,28158=>1000,28159=>1000,28160=>1000,28161=>1000,28162=>1000,28163=>1000,28164=>1000,
-	28165=>1000,28166=>1000,28167=>1000,28168=>1000,28169=>1000,28170=>1000,28171=>1000,28172=>1000,28173=>1000,28174=>1000,28175=>1000,28176=>1000,28177=>1000,28178=>1000,28179=>1000,28180=>1000,
-	28181=>1000,28182=>1000,28183=>1000,28184=>1000,28185=>1000,28186=>1000,28187=>1000,28188=>1000,28189=>1000,28190=>1000,28191=>1000,28192=>1000,28193=>1000,28194=>1000,28195=>1000,28196=>1000,
-	28197=>1000,28198=>1000,28199=>1000,28200=>1000,28201=>1000,28202=>1000,28203=>1000,28204=>1000,28205=>1000,28206=>1000,28207=>1000,28208=>1000,28209=>1000,28210=>1000,28211=>1000,28212=>1000,
-	28213=>1000,28214=>1000,28215=>1000,28216=>1000,28217=>1000,28218=>1000,28219=>1000,28220=>1000,28221=>1000,28222=>1000,28223=>1000,28224=>1000,28225=>1000,28226=>1000,28227=>1000,28228=>1000,
-	28229=>1000,28230=>1000,28231=>1000,28232=>1000,28233=>1000,28234=>1000,28235=>1000,28236=>1000,28237=>1000,28238=>1000,28239=>1000,28240=>1000,28241=>1000,28242=>1000,28243=>1000,28244=>1000,
-	28245=>1000,28246=>1000,28247=>1000,28248=>1000,28249=>1000,28250=>1000,28251=>1000,28252=>1000,28253=>1000,28254=>1000,28255=>1000,28256=>1000,28257=>1000,28258=>1000,28259=>1000,28260=>1000,
-	28261=>1000,28262=>1000,28263=>1000,28264=>1000,28265=>1000,28266=>1000,28267=>1000,28268=>1000,28269=>1000,28270=>1000,28271=>1000,28272=>1000,28273=>1000,28274=>1000,28275=>1000,28276=>1000,
-	28277=>1000,28278=>1000,28279=>1000,28280=>1000,28281=>1000,28282=>1000,28283=>1000,28284=>1000,28285=>1000,28286=>1000,28287=>1000,28288=>1000,28289=>1000,28290=>1000,28291=>1000,28292=>1000,
-	28293=>1000,28294=>1000,28295=>1000,28296=>1000,28297=>1000,28298=>1000,28299=>1000,28300=>1000,28301=>1000,28302=>1000,28303=>1000,28304=>1000,28305=>1000,28306=>1000,28307=>1000,28308=>1000,
-	28309=>1000,28310=>1000,28311=>1000,28312=>1000,28313=>1000,28314=>1000,28315=>1000,28316=>1000,28317=>1000,28318=>1000,28319=>1000,28320=>1000,28321=>1000,28322=>1000,28323=>1000,28324=>1000,
-	28325=>1000,28326=>1000,28327=>1000,28328=>1000,28329=>1000,28330=>1000,28331=>1000,28332=>1000,28333=>1000,28334=>1000,28335=>1000,28336=>1000,28337=>1000,28338=>1000,28339=>1000,28340=>1000,
-	28341=>1000,28342=>1000,28343=>1000,28344=>1000,28345=>1000,28346=>1000,28347=>1000,28348=>1000,28349=>1000,28350=>1000,28351=>1000,28352=>1000,28353=>1000,28354=>1000,28355=>1000,28356=>1000,
-	28357=>1000,28358=>1000,28359=>1000,28360=>1000,28361=>1000,28362=>1000,28363=>1000,28364=>1000,28365=>1000,28366=>1000,28367=>1000,28368=>1000,28369=>1000,28370=>1000,28371=>1000,28372=>1000,
-	28373=>1000,28374=>1000,28375=>1000,28376=>1000,28377=>1000,28378=>1000,28379=>1000,28380=>1000,28381=>1000,28382=>1000,28383=>1000,28384=>1000,28385=>1000,28386=>1000,28387=>1000,28388=>1000,
-	28389=>1000,28390=>1000,28391=>1000,28392=>1000,28393=>1000,28394=>1000,28395=>1000,28396=>1000,28397=>1000,28398=>1000,28399=>1000,28400=>1000,28401=>1000,28402=>1000,28403=>1000,28404=>1000,
-	28405=>1000,28406=>1000,28407=>1000,28408=>1000,28409=>1000,28410=>1000,28411=>1000,28412=>1000,28413=>1000,28414=>1000,28415=>1000,28416=>1000,28417=>1000,28418=>1000,28419=>1000,28420=>1000,
-	28421=>1000,28422=>1000,28423=>1000,28424=>1000,28425=>1000,28426=>1000,28427=>1000,28428=>1000,28429=>1000,28430=>1000,28431=>1000,28432=>1000,28433=>1000,28434=>1000,28435=>1000,28436=>1000,
-	28437=>1000,28438=>1000,28439=>1000,28440=>1000,28441=>1000,28442=>1000,28443=>1000,28444=>1000,28445=>1000,28446=>1000,28447=>1000,28448=>1000,28449=>1000,28450=>1000,28451=>1000,28452=>1000,
-	28453=>1000,28454=>1000,28455=>1000,28456=>1000,28457=>1000,28458=>1000,28459=>1000,28460=>1000,28461=>1000,28462=>1000,28463=>1000,28464=>1000,28465=>1000,28466=>1000,28467=>1000,28468=>1000,
-	28469=>1000,28470=>1000,28471=>1000,28472=>1000,28473=>1000,28474=>1000,28475=>1000,28476=>1000,28477=>1000,28478=>1000,28479=>1000,28480=>1000,28481=>1000,28482=>1000,28483=>1000,28484=>1000,
-	28485=>1000,28486=>1000,28487=>1000,28488=>1000,28489=>1000,28490=>1000,28491=>1000,28492=>1000,28493=>1000,28494=>1000,28495=>1000,28496=>1000,28497=>1000,28498=>1000,28499=>1000,28500=>1000,
-	28501=>1000,28502=>1000,28503=>1000,28504=>1000,28505=>1000,28506=>1000,28507=>1000,28508=>1000,28509=>1000,28510=>1000,28511=>1000,28512=>1000,28513=>1000,28514=>1000,28515=>1000,28516=>1000,
-	28517=>1000,28518=>1000,28519=>1000,28520=>1000,28521=>1000,28522=>1000,28523=>1000,28524=>1000,28525=>1000,28526=>1000,28527=>1000,28528=>1000,28529=>1000,28530=>1000,28531=>1000,28532=>1000,
-	28533=>1000,28534=>1000,28535=>1000,28536=>1000,28537=>1000,28538=>1000,28539=>1000,28540=>1000,28541=>1000,28542=>1000,28543=>1000,28544=>1000,28545=>1000,28546=>1000,28547=>1000,28548=>1000,
-	28549=>1000,28550=>1000,28551=>1000,28552=>1000,28553=>1000,28554=>1000,28555=>1000,28556=>1000,28557=>1000,28558=>1000,28559=>1000,28560=>1000,28561=>1000,28562=>1000,28563=>1000,28564=>1000,
-	28565=>1000,28566=>1000,28567=>1000,28568=>1000,28569=>1000,28570=>1000,28571=>1000,28572=>1000,28573=>1000,28574=>1000,28575=>1000,28576=>1000,28577=>1000,28578=>1000,28579=>1000,28580=>1000,
-	28581=>1000,28582=>1000,28583=>1000,28584=>1000,28585=>1000,28586=>1000,28587=>1000,28588=>1000,28589=>1000,28590=>1000,28591=>1000,28592=>1000,28593=>1000,28594=>1000,28595=>1000,28596=>1000,
-	28597=>1000,28598=>1000,28599=>1000,28600=>1000,28601=>1000,28602=>1000,28603=>1000,28604=>1000,28605=>1000,28606=>1000,28607=>1000,28608=>1000,28609=>1000,28610=>1000,28611=>1000,28612=>1000,
-	28613=>1000,28614=>1000,28615=>1000,28616=>1000,28617=>1000,28618=>1000,28619=>1000,28620=>1000,28621=>1000,28622=>1000,28623=>1000,28624=>1000,28625=>1000,28626=>1000,28627=>1000,28628=>1000,
-	28629=>1000,28630=>1000,28631=>1000,28632=>1000,28633=>1000,28634=>1000,28635=>1000,28636=>1000,28637=>1000,28638=>1000,28639=>1000,28640=>1000,28641=>1000,28642=>1000,28643=>1000,28644=>1000,
-	28645=>1000,28646=>1000,28647=>1000,28648=>1000,28649=>1000,28650=>1000,28651=>1000,28652=>1000,28653=>1000,28654=>1000,28655=>1000,28656=>1000,28657=>1000,28658=>1000,28659=>1000,28660=>1000,
-	28661=>1000,28662=>1000,28663=>1000,28664=>1000,28665=>1000,28666=>1000,28667=>1000,28668=>1000,28669=>1000,28670=>1000,28671=>1000,28672=>1000,28673=>1000,28674=>1000,28675=>1000,28676=>1000,
-	28677=>1000,28678=>1000,28679=>1000,28680=>1000,28681=>1000,28682=>1000,28683=>1000,28684=>1000,28685=>1000,28686=>1000,28687=>1000,28688=>1000,28689=>1000,28690=>1000,28691=>1000,28692=>1000,
-	28693=>1000,28694=>1000,28695=>1000,28696=>1000,28697=>1000,28698=>1000,28699=>1000,28700=>1000,28701=>1000,28702=>1000,28703=>1000,28704=>1000,28705=>1000,28706=>1000,28707=>1000,28708=>1000,
-	28709=>1000,28710=>1000,28711=>1000,28712=>1000,28713=>1000,28714=>1000,28715=>1000,28716=>1000,28717=>1000,28718=>1000,28719=>1000,28720=>1000,28721=>1000,28722=>1000,28723=>1000,28724=>1000,
-	28725=>1000,28726=>1000,28727=>1000,28728=>1000,28729=>1000,28730=>1000,28731=>1000,28732=>1000,28733=>1000,28734=>1000,28735=>1000,28736=>1000,28737=>1000,28738=>1000,28739=>1000,28740=>1000,
-	28741=>1000,28742=>1000,28743=>1000,28744=>1000,28745=>1000,28746=>1000,28747=>1000,28748=>1000,28749=>1000,28750=>1000,28751=>1000,28752=>1000,28753=>1000,28754=>1000,28755=>1000,28756=>1000,
-	28757=>1000,28758=>1000,28759=>1000,28760=>1000,28761=>1000,28762=>1000,28763=>1000,28764=>1000,28765=>1000,28766=>1000,28767=>1000,28768=>1000,28769=>1000,28770=>1000,28771=>1000,28772=>1000,
-	28773=>1000,28774=>1000,28775=>1000,28776=>1000,28777=>1000,28778=>1000,28779=>1000,28780=>1000,28781=>1000,28782=>1000,28783=>1000,28784=>1000,28785=>1000,28786=>1000,28787=>1000,28788=>1000,
-	28789=>1000,28790=>1000,28791=>1000,28792=>1000,28793=>1000,28794=>1000,28795=>1000,28796=>1000,28797=>1000,28798=>1000,28799=>1000,28800=>1000,28801=>1000,28802=>1000,28803=>1000,28804=>1000,
-	28805=>1000,28806=>1000,28807=>1000,28808=>1000,28809=>1000,28810=>1000,28811=>1000,28812=>1000,28813=>1000,28814=>1000,28815=>1000,28816=>1000,28817=>1000,28818=>1000,28819=>1000,28820=>1000,
-	28821=>1000,28822=>1000,28823=>1000,28824=>1000,28825=>1000,28826=>1000,28827=>1000,28828=>1000,28829=>1000,28830=>1000,28831=>1000,28832=>1000,28833=>1000,28834=>1000,28835=>1000,28836=>1000,
-	28837=>1000,28838=>1000,28839=>1000,28840=>1000,28841=>1000,28842=>1000,28843=>1000,28844=>1000,28845=>1000,28846=>1000,28847=>1000,28848=>1000,28849=>1000,28850=>1000,28851=>1000,28852=>1000,
-	28853=>1000,28854=>1000,28855=>1000,28856=>1000,28857=>1000,28858=>1000,28859=>1000,28860=>1000,28861=>1000,28862=>1000,28863=>1000,28864=>1000,28865=>1000,28866=>1000,28867=>1000,28868=>1000,
-	28869=>1000,28870=>1000,28871=>1000,28872=>1000,28873=>1000,28874=>1000,28875=>1000,28876=>1000,28877=>1000,28878=>1000,28879=>1000,28880=>1000,28881=>1000,28882=>1000,28883=>1000,28884=>1000,
-	28885=>1000,28886=>1000,28887=>1000,28888=>1000,28889=>1000,28890=>1000,28891=>1000,28892=>1000,28893=>1000,28894=>1000,28895=>1000,28896=>1000,28897=>1000,28898=>1000,28899=>1000,28900=>1000,
-	28901=>1000,28902=>1000,28903=>1000,28904=>1000,28905=>1000,28906=>1000,28907=>1000,28908=>1000,28909=>1000,28910=>1000,28911=>1000,28912=>1000,28913=>1000,28914=>1000,28915=>1000,28916=>1000,
-	28917=>1000,28918=>1000,28919=>1000,28920=>1000,28921=>1000,28922=>1000,28923=>1000,28924=>1000,28925=>1000,28926=>1000,28927=>1000,28928=>1000,28929=>1000,28930=>1000,28931=>1000,28932=>1000,
-	28933=>1000,28934=>1000,28935=>1000,28936=>1000,28937=>1000,28938=>1000,28939=>1000,28940=>1000,28941=>1000,28942=>1000,28943=>1000,28944=>1000,28945=>1000,28946=>1000,28947=>1000,28948=>1000,
-	28949=>1000,28950=>1000,28951=>1000,28952=>1000,28953=>1000,28954=>1000,28955=>1000,28956=>1000,28957=>1000,28958=>1000,28959=>1000,28960=>1000,28961=>1000,28962=>1000,28963=>1000,28964=>1000,
-	28965=>1000,28966=>1000,28967=>1000,28968=>1000,28969=>1000,28970=>1000,28971=>1000,28972=>1000,28973=>1000,28974=>1000,28975=>1000,28976=>1000,28977=>1000,28978=>1000,28979=>1000,28980=>1000,
-	28981=>1000,28982=>1000,28983=>1000,28984=>1000,28985=>1000,28986=>1000,28987=>1000,28988=>1000,28989=>1000,28990=>1000,28991=>1000,28992=>1000,28993=>1000,28994=>1000,28995=>1000,28996=>1000,
-	28997=>1000,28998=>1000,28999=>1000,29000=>1000,29001=>1000,29002=>1000,29003=>1000,29004=>1000,29005=>1000,29006=>1000,29007=>1000,29008=>1000,29009=>1000,29010=>1000,29011=>1000,29012=>1000,
-	29013=>1000,29014=>1000,29015=>1000,29016=>1000,29017=>1000,29018=>1000,29019=>1000,29020=>1000,29021=>1000,29022=>1000,29023=>1000,29024=>1000,29025=>1000,29026=>1000,29027=>1000,29028=>1000,
-	29029=>1000,29030=>1000,29031=>1000,29032=>1000,29033=>1000,29034=>1000,29035=>1000,29036=>1000,29037=>1000,29038=>1000,29039=>1000,29040=>1000,29041=>1000,29042=>1000,29043=>1000,29044=>1000,
-	29045=>1000,29046=>1000,29047=>1000,29048=>1000,29049=>1000,29050=>1000,29051=>1000,29052=>1000,29053=>1000,29054=>1000,29055=>1000,29056=>1000,29057=>1000,29058=>1000,29059=>1000,29060=>1000,
-	29061=>1000,29062=>1000,29063=>1000,29064=>1000,29065=>1000,29066=>1000,29067=>1000,29068=>1000,29069=>1000,29070=>1000,29071=>1000,29072=>1000,29073=>1000,29074=>1000,29075=>1000,29076=>1000,
-	29077=>1000,29078=>1000,29079=>1000,29080=>1000,29081=>1000,29082=>1000,29083=>1000,29084=>1000,29085=>1000,29086=>1000,29087=>1000,29088=>1000,29089=>1000,29090=>1000,29091=>1000,29092=>1000,
-	29093=>1000,29094=>1000,29095=>1000,29096=>1000,29097=>1000,29098=>1000,29099=>1000,29100=>1000,29101=>1000,29102=>1000,29103=>1000,29104=>1000,29105=>1000,29106=>1000,29107=>1000,29108=>1000,
-	29109=>1000,29110=>1000,29111=>1000,29112=>1000,29113=>1000,29114=>1000,29115=>1000,29116=>1000,29117=>1000,29118=>1000,29119=>1000,29120=>1000,29121=>1000,29122=>1000,29123=>1000,29124=>1000,
-	29125=>1000,29126=>1000,29127=>1000,29128=>1000,29129=>1000,29130=>1000,29131=>1000,29132=>1000,29133=>1000,29134=>1000,29135=>1000,29136=>1000,29137=>1000,29138=>1000,29139=>1000,29140=>1000,
-	29141=>1000,29142=>1000,29143=>1000,29144=>1000,29145=>1000,29146=>1000,29147=>1000,29148=>1000,29149=>1000,29150=>1000,29151=>1000,29152=>1000,29153=>1000,29154=>1000,29155=>1000,29156=>1000,
-	29157=>1000,29158=>1000,29159=>1000,29160=>1000,29161=>1000,29162=>1000,29163=>1000,29164=>1000,29165=>1000,29166=>1000,29167=>1000,29168=>1000,29169=>1000,29170=>1000,29171=>1000,29172=>1000,
-	29173=>1000,29174=>1000,29175=>1000,29176=>1000,29177=>1000,29178=>1000,29179=>1000,29180=>1000,29181=>1000,29182=>1000,29183=>1000,29184=>1000,29185=>1000,29186=>1000,29187=>1000,29188=>1000,
-	29189=>1000,29190=>1000,29191=>1000,29192=>1000,29193=>1000,29194=>1000,29195=>1000,29196=>1000,29197=>1000,29198=>1000,29199=>1000,29200=>1000,29201=>1000,29202=>1000,29203=>1000,29204=>1000,
-	29205=>1000,29206=>1000,29207=>1000,29208=>1000,29209=>1000,29210=>1000,29211=>1000,29212=>1000,29213=>1000,29214=>1000,29215=>1000,29216=>1000,29217=>1000,29218=>1000,29219=>1000,29220=>1000,
-	29221=>1000,29222=>1000,29223=>1000,29224=>1000,29225=>1000,29226=>1000,29227=>1000,29228=>1000,29229=>1000,29230=>1000,29231=>1000,29232=>1000,29233=>1000,29234=>1000,29235=>1000,29236=>1000,
-	29237=>1000,29238=>1000,29239=>1000,29240=>1000,29241=>1000,29242=>1000,29243=>1000,29244=>1000,29245=>1000,29246=>1000,29247=>1000,29248=>1000,29249=>1000,29250=>1000,29251=>1000,29252=>1000,
-	29253=>1000,29254=>1000,29255=>1000,29256=>1000,29257=>1000,29258=>1000,29259=>1000,29260=>1000,29261=>1000,29262=>1000,29263=>1000,29264=>1000,29265=>1000,29266=>1000,29267=>1000,29268=>1000,
-	29269=>1000,29270=>1000,29271=>1000,29272=>1000,29273=>1000,29274=>1000,29275=>1000,29276=>1000,29277=>1000,29278=>1000,29279=>1000,29280=>1000,29281=>1000,29282=>1000,29283=>1000,29284=>1000,
-	29285=>1000,29286=>1000,29287=>1000,29288=>1000,29289=>1000,29290=>1000,29291=>1000,29292=>1000,29293=>1000,29294=>1000,29295=>1000,29296=>1000,29297=>1000,29298=>1000,29299=>1000,29300=>1000,
-	29301=>1000,29302=>1000,29303=>1000,29304=>1000,29305=>1000,29306=>1000,29307=>1000,29308=>1000,29309=>1000,29310=>1000,29311=>1000,29312=>1000,29313=>1000,29314=>1000,29315=>1000,29316=>1000,
-	29317=>1000,29318=>1000,29319=>1000,29320=>1000,29321=>1000,29322=>1000,29323=>1000,29324=>1000,29325=>1000,29326=>1000,29327=>1000,29328=>1000,29329=>1000,29330=>1000,29331=>1000,29332=>1000,
-	29333=>1000,29334=>1000,29335=>1000,29336=>1000,29337=>1000,29338=>1000,29339=>1000,29340=>1000,29341=>1000,29342=>1000,29343=>1000,29344=>1000,29345=>1000,29346=>1000,29347=>1000,29348=>1000,
-	29349=>1000,29350=>1000,29351=>1000,29352=>1000,29353=>1000,29354=>1000,29355=>1000,29356=>1000,29357=>1000,29358=>1000,29359=>1000,29360=>1000,29361=>1000,29362=>1000,29363=>1000,29364=>1000,
-	29365=>1000,29366=>1000,29367=>1000,29368=>1000,29369=>1000,29370=>1000,29371=>1000,29372=>1000,29373=>1000,29374=>1000,29375=>1000,29376=>1000,29377=>1000,29378=>1000,29379=>1000,29380=>1000,
-	29381=>1000,29382=>1000,29383=>1000,29384=>1000,29385=>1000,29386=>1000,29387=>1000,29388=>1000,29389=>1000,29390=>1000,29391=>1000,29392=>1000,29393=>1000,29394=>1000,29395=>1000,29396=>1000,
-	29397=>1000,29398=>1000,29399=>1000,29400=>1000,29401=>1000,29402=>1000,29403=>1000,29404=>1000,29405=>1000,29406=>1000,29407=>1000,29408=>1000,29409=>1000,29410=>1000,29411=>1000,29412=>1000,
-	29413=>1000,29414=>1000,29415=>1000,29416=>1000,29417=>1000,29418=>1000,29419=>1000,29420=>1000,29421=>1000,29422=>1000,29423=>1000,29424=>1000,29425=>1000,29426=>1000,29427=>1000,29428=>1000,
-	29429=>1000,29430=>1000,29431=>1000,29432=>1000,29433=>1000,29434=>1000,29435=>1000,29436=>1000,29437=>1000,29438=>1000,29439=>1000,29440=>1000,29441=>1000,29442=>1000,29443=>1000,29444=>1000,
-	29445=>1000,29446=>1000,29447=>1000,29448=>1000,29449=>1000,29450=>1000,29451=>1000,29452=>1000,29453=>1000,29454=>1000,29455=>1000,29456=>1000,29457=>1000,29458=>1000,29459=>1000,29460=>1000,
-	29461=>1000,29462=>1000,29463=>1000,29464=>1000,29465=>1000,29466=>1000,29467=>1000,29468=>1000,29469=>1000,29470=>1000,29471=>1000,29472=>1000,29473=>1000,29474=>1000,29475=>1000,29476=>1000,
-	29477=>1000,29478=>1000,29479=>1000,29480=>1000,29481=>1000,29482=>1000,29483=>1000,29484=>1000,29485=>1000,29486=>1000,29487=>1000,29488=>1000,29489=>1000,29490=>1000,29491=>1000,29492=>1000,
-	29493=>1000,29494=>1000,29495=>1000,29496=>1000,29497=>1000,29498=>1000,29499=>1000,29500=>1000,29501=>1000,29502=>1000,29503=>1000,29504=>1000,29505=>1000,29506=>1000,29507=>1000,29508=>1000,
-	29509=>1000,29510=>1000,29511=>1000,29512=>1000,29513=>1000,29514=>1000,29515=>1000,29516=>1000,29517=>1000,29518=>1000,29519=>1000,29520=>1000,29521=>1000,29522=>1000,29523=>1000,29524=>1000,
-	29525=>1000,29526=>1000,29527=>1000,29528=>1000,29529=>1000,29530=>1000,29531=>1000,29532=>1000,29533=>1000,29534=>1000,29535=>1000,29536=>1000,29537=>1000,29538=>1000,29539=>1000,29540=>1000,
-	29541=>1000,29542=>1000,29543=>1000,29544=>1000,29545=>1000,29546=>1000,29547=>1000,29548=>1000,29549=>1000,29550=>1000,29551=>1000,29552=>1000,29553=>1000,29554=>1000,29555=>1000,29556=>1000,
-	29557=>1000,29558=>1000,29559=>1000,29560=>1000,29561=>1000,29562=>1000,29563=>1000,29564=>1000,29565=>1000,29566=>1000,29567=>1000,29568=>1000,29569=>1000,29570=>1000,29571=>1000,29572=>1000,
-	29573=>1000,29574=>1000,29575=>1000,29576=>1000,29577=>1000,29578=>1000,29579=>1000,29580=>1000,29581=>1000,29582=>1000,29583=>1000,29584=>1000,29585=>1000,29586=>1000,29587=>1000,29588=>1000,
-	29589=>1000,29590=>1000,29591=>1000,29592=>1000,29593=>1000,29594=>1000,29595=>1000,29596=>1000,29597=>1000,29598=>1000,29599=>1000,29600=>1000,29601=>1000,29602=>1000,29603=>1000,29604=>1000,
-	29605=>1000,29606=>1000,29607=>1000,29608=>1000,29609=>1000,29610=>1000,29611=>1000,29612=>1000,29613=>1000,29614=>1000,29615=>1000,29616=>1000,29617=>1000,29618=>1000,29619=>1000,29620=>1000,
-	29621=>1000,29622=>1000,29623=>1000,29624=>1000,29625=>1000,29626=>1000,29627=>1000,29628=>1000,29629=>1000,29630=>1000,29631=>1000,29632=>1000,29633=>1000,29634=>1000,29635=>1000,29636=>1000,
-	29637=>1000,29638=>1000,29639=>1000,29640=>1000,29641=>1000,29642=>1000,29643=>1000,29644=>1000,29645=>1000,29646=>1000,29647=>1000,29648=>1000,29649=>1000,29650=>1000,29651=>1000,29652=>1000,
-	29653=>1000,29654=>1000,29655=>1000,29656=>1000,29657=>1000,29658=>1000,29659=>1000,29660=>1000,29661=>1000,29662=>1000,29663=>1000,29664=>1000,29665=>1000,29666=>1000,29667=>1000,29668=>1000,
-	29669=>1000,29670=>1000,29671=>1000,29672=>1000,29673=>1000,29674=>1000,29675=>1000,29676=>1000,29677=>1000,29678=>1000,29679=>1000,29680=>1000,29681=>1000,29682=>1000,29683=>1000,29684=>1000,
-	29685=>1000,29686=>1000,29687=>1000,29688=>1000,29689=>1000,29690=>1000,29691=>1000,29692=>1000,29693=>1000,29694=>1000,29695=>1000,29696=>1000,29697=>1000,29698=>1000,29699=>1000,29700=>1000,
-	29701=>1000,29702=>1000,29703=>1000,29704=>1000,29705=>1000,29706=>1000,29707=>1000,29708=>1000,29709=>1000,29710=>1000,29711=>1000,29712=>1000,29713=>1000,29714=>1000,29715=>1000,29716=>1000,
-	29717=>1000,29718=>1000,29719=>1000,29720=>1000,29721=>1000,29722=>1000,29723=>1000,29724=>1000,29725=>1000,29726=>1000,29727=>1000,29728=>1000,29729=>1000,29730=>1000,29731=>1000,29732=>1000,
-	29733=>1000,29734=>1000,29735=>1000,29736=>1000,29737=>1000,29738=>1000,29739=>1000,29740=>1000,29741=>1000,29742=>1000,29743=>1000,29744=>1000,29745=>1000,29746=>1000,29747=>1000,29748=>1000,
-	29749=>1000,29750=>1000,29751=>1000,29752=>1000,29753=>1000,29754=>1000,29755=>1000,29756=>1000,29757=>1000,29758=>1000,29759=>1000,29760=>1000,29761=>1000,29762=>1000,29763=>1000,29764=>1000,
-	29765=>1000,29766=>1000,29767=>1000,29768=>1000,29769=>1000,29770=>1000,29771=>1000,29772=>1000,29773=>1000,29774=>1000,29775=>1000,29776=>1000,29777=>1000,29778=>1000,29779=>1000,29780=>1000,
-	29781=>1000,29782=>1000,29783=>1000,29784=>1000,29785=>1000,29786=>1000,29787=>1000,29788=>1000,29789=>1000,29790=>1000,29791=>1000,29792=>1000,29793=>1000,29794=>1000,29795=>1000,29796=>1000,
-	29797=>1000,29798=>1000,29799=>1000,29800=>1000,29801=>1000,29802=>1000,29803=>1000,29804=>1000,29805=>1000,29806=>1000,29807=>1000,29808=>1000,29809=>1000,29810=>1000,29811=>1000,29812=>1000,
-	29813=>1000,29814=>1000,29815=>1000,29816=>1000,29817=>1000,29818=>1000,29819=>1000,29820=>1000,29821=>1000,29822=>1000,29823=>1000,29824=>1000,29825=>1000,29826=>1000,29827=>1000,29828=>1000,
-	29829=>1000,29830=>1000,29831=>1000,29832=>1000,29833=>1000,29834=>1000,29835=>1000,29836=>1000,29837=>1000,29838=>1000,29839=>1000,29840=>1000,29841=>1000,29842=>1000,29843=>1000,29844=>1000,
-	29845=>1000,29846=>1000,29847=>1000,29848=>1000,29849=>1000,29850=>1000,29851=>1000,29852=>1000,29853=>1000,29854=>1000,29855=>1000,29856=>1000,29857=>1000,29858=>1000,29859=>1000,29860=>1000,
-	29861=>1000,29862=>1000,29863=>1000,29864=>1000,29865=>1000,29866=>1000,29867=>1000,29868=>1000,29869=>1000,29870=>1000,29871=>1000,29872=>1000,29873=>1000,29874=>1000,29875=>1000,29876=>1000,
-	29877=>1000,29878=>1000,29879=>1000,29880=>1000,29881=>1000,29882=>1000,29883=>1000,29884=>1000,29885=>1000,29886=>1000,29887=>1000,29888=>1000,29889=>1000,29890=>1000,29891=>1000,29892=>1000,
-	29893=>1000,29894=>1000,29895=>1000,29896=>1000,29897=>1000,29898=>1000,29899=>1000,29900=>1000,29901=>1000,29902=>1000,29903=>1000,29904=>1000,29905=>1000,29906=>1000,29907=>1000,29908=>1000,
-	29909=>1000,29910=>1000,29911=>1000,29912=>1000,29913=>1000,29914=>1000,29915=>1000,29916=>1000,29917=>1000,29918=>1000,29919=>1000,29920=>1000,29921=>1000,29922=>1000,29923=>1000,29924=>1000,
-	29925=>1000,29926=>1000,29927=>1000,29928=>1000,29929=>1000,29930=>1000,29931=>1000,29932=>1000,29933=>1000,29934=>1000,29935=>1000,29936=>1000,29937=>1000,29938=>1000,29939=>1000,29940=>1000,
-	29941=>1000,29942=>1000,29943=>1000,29944=>1000,29945=>1000,29946=>1000,29947=>1000,29948=>1000,29949=>1000,29950=>1000,29951=>1000,29952=>1000,29953=>1000,29954=>1000,29955=>1000,29956=>1000,
-	29957=>1000,29958=>1000,29959=>1000,29960=>1000,29961=>1000,29962=>1000,29963=>1000,29964=>1000,29965=>1000,29966=>1000,29967=>1000,29968=>1000,29969=>1000,29970=>1000,29971=>1000,29972=>1000,
-	29973=>1000,29974=>1000,29975=>1000,29976=>1000,29977=>1000,29978=>1000,29979=>1000,29980=>1000,29981=>1000,29982=>1000,29983=>1000,29984=>1000,29985=>1000,29986=>1000,29987=>1000,29988=>1000,
-	29989=>1000,29990=>1000,29991=>1000,29992=>1000,29993=>1000,29994=>1000,29995=>1000,29996=>1000,29997=>1000,29998=>1000,29999=>1000,30000=>1000,30001=>1000,30002=>1000,30003=>1000,30004=>1000,
-	30005=>1000,30006=>1000,30007=>1000,30008=>1000,30009=>1000,30010=>1000,30011=>1000,30012=>1000,30013=>1000,30014=>1000,30015=>1000,30016=>1000,30017=>1000,30018=>1000,30019=>1000,30020=>1000,
-	30021=>1000,30022=>1000,30023=>1000,30024=>1000,30025=>1000,30026=>1000,30027=>1000,30028=>1000,30029=>1000,30030=>1000,30031=>1000,30032=>1000,30033=>1000,30034=>1000,30035=>1000,30036=>1000,
-	30037=>1000,30038=>1000,30039=>1000,30040=>1000,30041=>1000,30042=>1000,30043=>1000,30044=>1000,30045=>1000,30046=>1000,30047=>1000,30048=>1000,30049=>1000,30050=>1000,30051=>1000,30052=>1000,
-	30053=>1000,30054=>1000,30055=>1000,30056=>1000,30057=>1000,30058=>1000,30059=>1000,30060=>1000,30061=>1000,30062=>1000,30063=>1000,30064=>1000,30065=>1000,30066=>1000,30067=>1000,30068=>1000,
-	30069=>1000,30070=>1000,30071=>1000,30072=>1000,30073=>1000,30074=>1000,30075=>1000,30076=>1000,30077=>1000,30078=>1000,30079=>1000,30080=>1000,30081=>1000,30082=>1000,30083=>1000,30084=>1000,
-	30085=>1000,30086=>1000,30087=>1000,30088=>1000,30089=>1000,30090=>1000,30091=>1000,30092=>1000,30093=>1000,30094=>1000,30095=>1000,30096=>1000,30097=>1000,30098=>1000,30099=>1000,30100=>1000,
-	30101=>1000,30102=>1000,30103=>1000,30104=>1000,30105=>1000,30106=>1000,30107=>1000,30108=>1000,30109=>1000,30110=>1000,30111=>1000,30112=>1000,30113=>1000,30114=>1000,30115=>1000,30116=>1000,
-	30117=>1000,30118=>1000,30119=>1000,30120=>1000,30121=>1000,30122=>1000,30123=>1000,30124=>1000,30125=>1000,30126=>1000,30127=>1000,30128=>1000,30129=>1000,30130=>1000,30131=>1000,30132=>1000,
-	30133=>1000,30134=>1000,30135=>1000,30136=>1000,30137=>1000,30138=>1000,30139=>1000,30140=>1000,30141=>1000,30142=>1000,30143=>1000,30144=>1000,30145=>1000,30146=>1000,30147=>1000,30148=>1000,
-	30149=>1000,30150=>1000,30151=>1000,30152=>1000,30153=>1000,30154=>1000,30155=>1000,30156=>1000,30157=>1000,30158=>1000,30159=>1000,30160=>1000,30161=>1000,30162=>1000,30163=>1000,30164=>1000,
-	30165=>1000,30166=>1000,30167=>1000,30168=>1000,30169=>1000,30170=>1000,30171=>1000,30172=>1000,30173=>1000,30174=>1000,30175=>1000,30176=>1000,30177=>1000,30178=>1000,30179=>1000,30180=>1000,
-	30181=>1000,30182=>1000,30183=>1000,30184=>1000,30185=>1000,30186=>1000,30187=>1000,30188=>1000,30189=>1000,30190=>1000,30191=>1000,30192=>1000,30193=>1000,30194=>1000,30195=>1000,30196=>1000,
-	30197=>1000,30198=>1000,30199=>1000,30200=>1000,30201=>1000,30202=>1000,30203=>1000,30204=>1000,30205=>1000,30206=>1000,30207=>1000,30208=>1000,30209=>1000,30210=>1000,30211=>1000,30212=>1000,
-	30213=>1000,30214=>1000,30215=>1000,30216=>1000,30217=>1000,30218=>1000,30219=>1000,30220=>1000,30221=>1000,30222=>1000,30223=>1000,30224=>1000,30225=>1000,30226=>1000,30227=>1000,30228=>1000,
-	30229=>1000,30230=>1000,30231=>1000,30232=>1000,30233=>1000,30234=>1000,30235=>1000,30236=>1000,30237=>1000,30238=>1000,30239=>1000,30240=>1000,30241=>1000,30242=>1000,30243=>1000,30244=>1000,
-	30245=>1000,30246=>1000,30247=>1000,30248=>1000,30249=>1000,30250=>1000,30251=>1000,30252=>1000,30253=>1000,30254=>1000,30255=>1000,30256=>1000,30257=>1000,30258=>1000,30259=>1000,30260=>1000,
-	30261=>1000,30262=>1000,30263=>1000,30264=>1000,30265=>1000,30266=>1000,30267=>1000,30268=>1000,30269=>1000,30270=>1000,30271=>1000,30272=>1000,30273=>1000,30274=>1000,30275=>1000,30276=>1000,
-	30277=>1000,30278=>1000,30279=>1000,30280=>1000,30281=>1000,30282=>1000,30283=>1000,30284=>1000,30285=>1000,30286=>1000,30287=>1000,30288=>1000,30289=>1000,30290=>1000,30291=>1000,30292=>1000,
-	30293=>1000,30294=>1000,30295=>1000,30296=>1000,30297=>1000,30298=>1000,30299=>1000,30300=>1000,30301=>1000,30302=>1000,30303=>1000,30304=>1000,30305=>1000,30306=>1000,30307=>1000,30308=>1000,
-	30309=>1000,30310=>1000,30311=>1000,30312=>1000,30313=>1000,30314=>1000,30315=>1000,30316=>1000,30317=>1000,30318=>1000,30319=>1000,30320=>1000,30321=>1000,30322=>1000,30323=>1000,30324=>1000,
-	30325=>1000,30326=>1000,30327=>1000,30328=>1000,30329=>1000,30330=>1000,30331=>1000,30332=>1000,30333=>1000,30334=>1000,30335=>1000,30336=>1000,30337=>1000,30338=>1000,30339=>1000,30340=>1000,
-	30341=>1000,30342=>1000,30343=>1000,30344=>1000,30345=>1000,30346=>1000,30347=>1000,30348=>1000,30349=>1000,30350=>1000,30351=>1000,30352=>1000,30353=>1000,30354=>1000,30355=>1000,30356=>1000,
-	30357=>1000,30358=>1000,30359=>1000,30360=>1000,30361=>1000,30362=>1000,30363=>1000,30364=>1000,30365=>1000,30366=>1000,30367=>1000,30368=>1000,30369=>1000,30370=>1000,30371=>1000,30372=>1000,
-	30373=>1000,30374=>1000,30375=>1000,30376=>1000,30377=>1000,30378=>1000,30379=>1000,30380=>1000,30381=>1000,30382=>1000,30383=>1000,30384=>1000,30385=>1000,30386=>1000,30387=>1000,30388=>1000,
-	30389=>1000,30390=>1000,30391=>1000,30392=>1000,30393=>1000,30394=>1000,30395=>1000,30396=>1000,30397=>1000,30398=>1000,30399=>1000,30400=>1000,30401=>1000,30402=>1000,30403=>1000,30404=>1000,
-	30405=>1000,30406=>1000,30407=>1000,30408=>1000,30409=>1000,30410=>1000,30411=>1000,30412=>1000,30413=>1000,30414=>1000,30415=>1000,30416=>1000,30417=>1000,30418=>1000,30419=>1000,30420=>1000,
-	30421=>1000,30422=>1000,30423=>1000,30424=>1000,30425=>1000,30426=>1000,30427=>1000,30428=>1000,30429=>1000,30430=>1000,30431=>1000,30432=>1000,30433=>1000,30434=>1000,30435=>1000,30436=>1000,
-	30437=>1000,30438=>1000,30439=>1000,30440=>1000,30441=>1000,30442=>1000,30443=>1000,30444=>1000,30445=>1000,30446=>1000,30447=>1000,30448=>1000,30449=>1000,30450=>1000,30451=>1000,30452=>1000,
-	30453=>1000,30454=>1000,30455=>1000,30456=>1000,30457=>1000,30458=>1000,30459=>1000,30460=>1000,30461=>1000,30462=>1000,30463=>1000,30464=>1000,30465=>1000,30466=>1000,30467=>1000,30468=>1000,
-	30469=>1000,30470=>1000,30471=>1000,30472=>1000,30473=>1000,30474=>1000,30475=>1000,30476=>1000,30477=>1000,30478=>1000,30479=>1000,30480=>1000,30481=>1000,30482=>1000,30483=>1000,30484=>1000,
-	30485=>1000,30486=>1000,30487=>1000,30488=>1000,30489=>1000,30490=>1000,30491=>1000,30492=>1000,30493=>1000,30494=>1000,30495=>1000,30496=>1000,30497=>1000,30498=>1000,30499=>1000,30500=>1000,
-	30501=>1000,30502=>1000,30503=>1000,30504=>1000,30505=>1000,30506=>1000,30507=>1000,30508=>1000,30509=>1000,30510=>1000,30511=>1000,30512=>1000,30513=>1000,30514=>1000,30515=>1000,30516=>1000,
-	30517=>1000,30518=>1000,30519=>1000,30520=>1000,30521=>1000,30522=>1000,30523=>1000,30524=>1000,30525=>1000,30526=>1000,30527=>1000,30528=>1000,30529=>1000,30530=>1000,30531=>1000,30532=>1000,
-	30533=>1000,30534=>1000,30535=>1000,30536=>1000,30537=>1000,30538=>1000,30539=>1000,30540=>1000,30541=>1000,30542=>1000,30543=>1000,30544=>1000,30545=>1000,30546=>1000,30547=>1000,30548=>1000,
-	30549=>1000,30550=>1000,30551=>1000,30552=>1000,30553=>1000,30554=>1000,30555=>1000,30556=>1000,30557=>1000,30558=>1000,30559=>1000,30560=>1000,30561=>1000,30562=>1000,30563=>1000,30564=>1000,
-	30565=>1000,30566=>1000,30567=>1000,30568=>1000,30569=>1000,30570=>1000,30571=>1000,30572=>1000,30573=>1000,30574=>1000,30575=>1000,30576=>1000,30577=>1000,30578=>1000,30579=>1000,30580=>1000,
-	30581=>1000,30582=>1000,30583=>1000,30584=>1000,30585=>1000,30586=>1000,30587=>1000,30588=>1000,30589=>1000,30590=>1000,30591=>1000,30592=>1000,30593=>1000,30594=>1000,30595=>1000,30596=>1000,
-	30597=>1000,30598=>1000,30599=>1000,30600=>1000,30601=>1000,30602=>1000,30603=>1000,30604=>1000,30605=>1000,30606=>1000,30607=>1000,30608=>1000,30609=>1000,30610=>1000,30611=>1000,30612=>1000,
-	30613=>1000,30614=>1000,30615=>1000,30616=>1000,30617=>1000,30618=>1000,30619=>1000,30620=>1000,30621=>1000,30622=>1000,30623=>1000,30624=>1000,30625=>1000,30626=>1000,30627=>1000,30628=>1000,
-	30629=>1000,30630=>1000,30631=>1000,30632=>1000,30633=>1000,30634=>1000,30635=>1000,30636=>1000,30637=>1000,30638=>1000,30639=>1000,30640=>1000,30641=>1000,30642=>1000,30643=>1000,30644=>1000,
-	30645=>1000,30646=>1000,30647=>1000,30648=>1000,30649=>1000,30650=>1000,30651=>1000,30652=>1000,30653=>1000,30654=>1000,30655=>1000,30656=>1000,30657=>1000,30658=>1000,30659=>1000,30660=>1000,
-	30661=>1000,30662=>1000,30663=>1000,30664=>1000,30665=>1000,30666=>1000,30667=>1000,30668=>1000,30669=>1000,30670=>1000,30671=>1000,30672=>1000,30673=>1000,30674=>1000,30675=>1000,30676=>1000,
-	30677=>1000,30678=>1000,30679=>1000,30680=>1000,30681=>1000,30682=>1000,30683=>1000,30684=>1000,30685=>1000,30686=>1000,30687=>1000,30688=>1000,30689=>1000,30690=>1000,30691=>1000,30692=>1000,
-	30693=>1000,30694=>1000,30695=>1000,30696=>1000,30697=>1000,30698=>1000,30699=>1000,30700=>1000,30701=>1000,30702=>1000,30703=>1000,30704=>1000,30705=>1000,30706=>1000,30707=>1000,30708=>1000,
-	30709=>1000,30710=>1000,30711=>1000,30712=>1000,30713=>1000,30714=>1000,30715=>1000,30716=>1000,30717=>1000,30718=>1000,30719=>1000,30720=>1000,30721=>1000,30722=>1000,30723=>1000,30724=>1000,
-	30725=>1000,30726=>1000,30727=>1000,30728=>1000,30729=>1000,30730=>1000,30731=>1000,30732=>1000,30733=>1000,30734=>1000,30735=>1000,30736=>1000,30737=>1000,30738=>1000,30739=>1000,30740=>1000,
-	30741=>1000,30742=>1000,30743=>1000,30744=>1000,30745=>1000,30746=>1000,30747=>1000,30748=>1000,30749=>1000,30750=>1000,30751=>1000,30752=>1000,30753=>1000,30754=>1000,30755=>1000,30756=>1000,
-	30757=>1000,30758=>1000,30759=>1000,30760=>1000,30761=>1000,30762=>1000,30763=>1000,30764=>1000,30765=>1000,30766=>1000,30767=>1000,30768=>1000,30769=>1000,30770=>1000,30771=>1000,30772=>1000,
-	30773=>1000,30774=>1000,30775=>1000,30776=>1000,30777=>1000,30778=>1000,30779=>1000,30780=>1000,30781=>1000,30782=>1000,30783=>1000,30784=>1000,30785=>1000,30786=>1000,30787=>1000,30788=>1000,
-	30789=>1000,30790=>1000,30791=>1000,30792=>1000,30793=>1000,30794=>1000,30795=>1000,30796=>1000,30797=>1000,30798=>1000,30799=>1000,30800=>1000,30801=>1000,30802=>1000,30803=>1000,30804=>1000,
-	30805=>1000,30806=>1000,30807=>1000,30808=>1000,30809=>1000,30810=>1000,30811=>1000,30812=>1000,30813=>1000,30814=>1000,30815=>1000,30816=>1000,30817=>1000,30818=>1000,30819=>1000,30820=>1000,
-	30821=>1000,30822=>1000,30823=>1000,30824=>1000,30825=>1000,30826=>1000,30827=>1000,30828=>1000,30829=>1000,30830=>1000,30831=>1000,30832=>1000,30833=>1000,30834=>1000,30835=>1000,30836=>1000,
-	30837=>1000,30838=>1000,30839=>1000,30840=>1000,30841=>1000,30842=>1000,30843=>1000,30844=>1000,30845=>1000,30846=>1000,30847=>1000,30848=>1000,30849=>1000,30850=>1000,30851=>1000,30852=>1000,
-	30853=>1000,30854=>1000,30855=>1000,30856=>1000,30857=>1000,30858=>1000,30859=>1000,30860=>1000,30861=>1000,30862=>1000,30863=>1000,30864=>1000,30865=>1000,30866=>1000,30867=>1000,30868=>1000,
-	30869=>1000,30870=>1000,30871=>1000,30872=>1000,30873=>1000,30874=>1000,30875=>1000,30876=>1000,30877=>1000,30878=>1000,30879=>1000,30880=>1000,30881=>1000,30882=>1000,30883=>1000,30884=>1000,
-	30885=>1000,30886=>1000,30887=>1000,30888=>1000,30889=>1000,30890=>1000,30891=>1000,30892=>1000,30893=>1000,30894=>1000,30895=>1000,30896=>1000,30897=>1000,30898=>1000,30899=>1000,30900=>1000,
-	30901=>1000,30902=>1000,30903=>1000,30904=>1000,30905=>1000,30906=>1000,30907=>1000,30908=>1000,30909=>1000,30910=>1000,30911=>1000,30912=>1000,30913=>1000,30914=>1000,30915=>1000,30916=>1000,
-	30917=>1000,30918=>1000,30919=>1000,30920=>1000,30921=>1000,30922=>1000,30923=>1000,30924=>1000,30925=>1000,30926=>1000,30927=>1000,30928=>1000,30929=>1000,30930=>1000,30931=>1000,30932=>1000,
-	30933=>1000,30934=>1000,30935=>1000,30936=>1000,30937=>1000,30938=>1000,30939=>1000,30940=>1000,30941=>1000,30942=>1000,30943=>1000,30944=>1000,30945=>1000,30946=>1000,30947=>1000,30948=>1000,
-	30949=>1000,30950=>1000,30951=>1000,30952=>1000,30953=>1000,30954=>1000,30955=>1000,30956=>1000,30957=>1000,30958=>1000,30959=>1000,30960=>1000,30961=>1000,30962=>1000,30963=>1000,30964=>1000,
-	30965=>1000,30966=>1000,30967=>1000,30968=>1000,30969=>1000,30970=>1000,30971=>1000,30972=>1000,30973=>1000,30974=>1000,30975=>1000,30976=>1000,30977=>1000,30978=>1000,30979=>1000,30980=>1000,
-	30981=>1000,30982=>1000,30983=>1000,30984=>1000,30985=>1000,30986=>1000,30987=>1000,30988=>1000,30989=>1000,30990=>1000,30991=>1000,30992=>1000,30993=>1000,30994=>1000,30995=>1000,30996=>1000,
-	30997=>1000,30998=>1000,30999=>1000,31000=>1000,31001=>1000,31002=>1000,31003=>1000,31004=>1000,31005=>1000,31006=>1000,31007=>1000,31008=>1000,31009=>1000,31010=>1000,31011=>1000,31012=>1000,
-	31013=>1000,31014=>1000,31015=>1000,31016=>1000,31017=>1000,31018=>1000,31019=>1000,31020=>1000,31021=>1000,31022=>1000,31023=>1000,31024=>1000,31025=>1000,31026=>1000,31027=>1000,31028=>1000,
-	31029=>1000,31030=>1000,31031=>1000,31032=>1000,31033=>1000,31034=>1000,31035=>1000,31036=>1000,31037=>1000,31038=>1000,31039=>1000,31040=>1000,31041=>1000,31042=>1000,31043=>1000,31044=>1000,
-	31045=>1000,31046=>1000,31047=>1000,31048=>1000,31049=>1000,31050=>1000,31051=>1000,31052=>1000,31053=>1000,31054=>1000,31055=>1000,31056=>1000,31057=>1000,31058=>1000,31059=>1000,31060=>1000,
-	31061=>1000,31062=>1000,31063=>1000,31064=>1000,31065=>1000,31066=>1000,31067=>1000,31068=>1000,31069=>1000,31070=>1000,31071=>1000,31072=>1000,31073=>1000,31074=>1000,31075=>1000,31076=>1000,
-	31077=>1000,31078=>1000,31079=>1000,31080=>1000,31081=>1000,31082=>1000,31083=>1000,31084=>1000,31085=>1000,31086=>1000,31087=>1000,31088=>1000,31089=>1000,31090=>1000,31091=>1000,31092=>1000,
-	31093=>1000,31094=>1000,31095=>1000,31096=>1000,31097=>1000,31098=>1000,31099=>1000,31100=>1000,31101=>1000,31102=>1000,31103=>1000,31104=>1000,31105=>1000,31106=>1000,31107=>1000,31108=>1000,
-	31109=>1000,31110=>1000,31111=>1000,31112=>1000,31113=>1000,31114=>1000,31115=>1000,31116=>1000,31117=>1000,31118=>1000,31119=>1000,31120=>1000,31121=>1000,31122=>1000,31123=>1000,31124=>1000,
-	31125=>1000,31126=>1000,31127=>1000,31128=>1000,31129=>1000,31130=>1000,31131=>1000,31132=>1000,31133=>1000,31134=>1000,31135=>1000,31136=>1000,31137=>1000,31138=>1000,31139=>1000,31140=>1000,
-	31141=>1000,31142=>1000,31143=>1000,31144=>1000,31145=>1000,31146=>1000,31147=>1000,31148=>1000,31149=>1000,31150=>1000,31151=>1000,31152=>1000,31153=>1000,31154=>1000,31155=>1000,31156=>1000,
-	31157=>1000,31158=>1000,31159=>1000,31160=>1000,31161=>1000,31162=>1000,31163=>1000,31164=>1000,31165=>1000,31166=>1000,31167=>1000,31168=>1000,31169=>1000,31170=>1000,31171=>1000,31172=>1000,
-	31173=>1000,31174=>1000,31175=>1000,31176=>1000,31177=>1000,31178=>1000,31179=>1000,31180=>1000,31181=>1000,31182=>1000,31183=>1000,31184=>1000,31185=>1000,31186=>1000,31187=>1000,31188=>1000,
-	31189=>1000,31190=>1000,31191=>1000,31192=>1000,31193=>1000,31194=>1000,31195=>1000,31196=>1000,31197=>1000,31198=>1000,31199=>1000,31200=>1000,31201=>1000,31202=>1000,31203=>1000,31204=>1000,
-	31205=>1000,31206=>1000,31207=>1000,31208=>1000,31209=>1000,31210=>1000,31211=>1000,31212=>1000,31213=>1000,31214=>1000,31215=>1000,31216=>1000,31217=>1000,31218=>1000,31219=>1000,31220=>1000,
-	31221=>1000,31222=>1000,31223=>1000,31224=>1000,31225=>1000,31226=>1000,31227=>1000,31228=>1000,31229=>1000,31230=>1000,31231=>1000,31232=>1000,31233=>1000,31234=>1000,31235=>1000,31236=>1000,
-	31237=>1000,31238=>1000,31239=>1000,31240=>1000,31241=>1000,31242=>1000,31243=>1000,31244=>1000,31245=>1000,31246=>1000,31247=>1000,31248=>1000,31249=>1000,31250=>1000,31251=>1000,31252=>1000,
-	31253=>1000,31254=>1000,31255=>1000,31256=>1000,31257=>1000,31258=>1000,31259=>1000,31260=>1000,31261=>1000,31262=>1000,31263=>1000,31264=>1000,31265=>1000,31266=>1000,31267=>1000,31268=>1000,
-	31269=>1000,31270=>1000,31271=>1000,31272=>1000,31273=>1000,31274=>1000,31275=>1000,31276=>1000,31277=>1000,31278=>1000,31279=>1000,31280=>1000,31281=>1000,31282=>1000,31283=>1000,31284=>1000,
-	31285=>1000,31286=>1000,31287=>1000,31288=>1000,31289=>1000,31290=>1000,31291=>1000,31292=>1000,31293=>1000,31294=>1000,31295=>1000,31296=>1000,31297=>1000,31298=>1000,31299=>1000,31300=>1000,
-	31301=>1000,31302=>1000,31303=>1000,31304=>1000,31305=>1000,31306=>1000,31307=>1000,31308=>1000,31309=>1000,31310=>1000,31311=>1000,31312=>1000,31313=>1000,31314=>1000,31315=>1000,31316=>1000,
-	31317=>1000,31318=>1000,31319=>1000,31320=>1000,31321=>1000,31322=>1000,31323=>1000,31324=>1000,31325=>1000,31326=>1000,31327=>1000,31328=>1000,31329=>1000,31330=>1000,31331=>1000,31332=>1000,
-	31333=>1000,31334=>1000,31335=>1000,31336=>1000,31337=>1000,31338=>1000,31339=>1000,31340=>1000,31341=>1000,31342=>1000,31343=>1000,31344=>1000,31345=>1000,31346=>1000,31347=>1000,31348=>1000,
-	31349=>1000,31350=>1000,31351=>1000,31352=>1000,31353=>1000,31354=>1000,31355=>1000,31356=>1000,31357=>1000,31358=>1000,31359=>1000,31360=>1000,31361=>1000,31362=>1000,31363=>1000,31364=>1000,
-	31365=>1000,31366=>1000,31367=>1000,31368=>1000,31369=>1000,31370=>1000,31371=>1000,31372=>1000,31373=>1000,31374=>1000,31375=>1000,31376=>1000,31377=>1000,31378=>1000,31379=>1000,31380=>1000,
-	31381=>1000,31382=>1000,31383=>1000,31384=>1000,31385=>1000,31386=>1000,31387=>1000,31388=>1000,31389=>1000,31390=>1000,31391=>1000,31392=>1000,31393=>1000,31394=>1000,31395=>1000,31396=>1000,
-	31397=>1000,31398=>1000,31399=>1000,31400=>1000,31401=>1000,31402=>1000,31403=>1000,31404=>1000,31405=>1000,31406=>1000,31407=>1000,31408=>1000,31409=>1000,31410=>1000,31411=>1000,31412=>1000,
-	31413=>1000,31414=>1000,31415=>1000,31416=>1000,31417=>1000,31418=>1000,31419=>1000,31420=>1000,31421=>1000,31422=>1000,31423=>1000,31424=>1000,31425=>1000,31426=>1000,31427=>1000,31428=>1000,
-	31429=>1000,31430=>1000,31431=>1000,31432=>1000,31433=>1000,31434=>1000,31435=>1000,31436=>1000,31437=>1000,31438=>1000,31439=>1000,31440=>1000,31441=>1000,31442=>1000,31443=>1000,31444=>1000,
-	31445=>1000,31446=>1000,31447=>1000,31448=>1000,31449=>1000,31450=>1000,31451=>1000,31452=>1000,31453=>1000,31454=>1000,31455=>1000,31456=>1000,31457=>1000,31458=>1000,31459=>1000,31460=>1000,
-	31461=>1000,31462=>1000,31463=>1000,31464=>1000,31465=>1000,31466=>1000,31467=>1000,31468=>1000,31469=>1000,31470=>1000,31471=>1000,31472=>1000,31473=>1000,31474=>1000,31475=>1000,31476=>1000,
-	31477=>1000,31478=>1000,31479=>1000,31480=>1000,31481=>1000,31482=>1000,31483=>1000,31484=>1000,31485=>1000,31486=>1000,31487=>1000,31488=>1000,31489=>1000,31490=>1000,31491=>1000,31492=>1000,
-	31493=>1000,31494=>1000,31495=>1000,31496=>1000,31497=>1000,31498=>1000,31499=>1000,31500=>1000,31501=>1000,31502=>1000,31503=>1000,31504=>1000,31505=>1000,31506=>1000,31507=>1000,31508=>1000,
-	31509=>1000,31510=>1000,31511=>1000,31512=>1000,31513=>1000,31514=>1000,31515=>1000,31516=>1000,31517=>1000,31518=>1000,31519=>1000,31520=>1000,31521=>1000,31522=>1000,31523=>1000,31524=>1000,
-	31525=>1000,31526=>1000,31527=>1000,31528=>1000,31529=>1000,31530=>1000,31531=>1000,31532=>1000,31533=>1000,31534=>1000,31535=>1000,31536=>1000,31537=>1000,31538=>1000,31539=>1000,31540=>1000,
-	31541=>1000,31542=>1000,31543=>1000,31544=>1000,31545=>1000,31546=>1000,31547=>1000,31548=>1000,31549=>1000,31550=>1000,31551=>1000,31552=>1000,31553=>1000,31554=>1000,31555=>1000,31556=>1000,
-	31557=>1000,31558=>1000,31559=>1000,31560=>1000,31561=>1000,31562=>1000,31563=>1000,31564=>1000,31565=>1000,31566=>1000,31567=>1000,31568=>1000,31569=>1000,31570=>1000,31571=>1000,31572=>1000,
-	31573=>1000,31574=>1000,31575=>1000,31576=>1000,31577=>1000,31578=>1000,31579=>1000,31580=>1000,31581=>1000,31582=>1000,31583=>1000,31584=>1000,31585=>1000,31586=>1000,31587=>1000,31588=>1000,
-	31589=>1000,31590=>1000,31591=>1000,31592=>1000,31593=>1000,31594=>1000,31595=>1000,31596=>1000,31597=>1000,31598=>1000,31599=>1000,31600=>1000,31601=>1000,31602=>1000,31603=>1000,31604=>1000,
-	31605=>1000,31606=>1000,31607=>1000,31608=>1000,31609=>1000,31610=>1000,31611=>1000,31612=>1000,31613=>1000,31614=>1000,31615=>1000,31616=>1000,31617=>1000,31618=>1000,31619=>1000,31620=>1000,
-	31621=>1000,31622=>1000,31623=>1000,31624=>1000,31625=>1000,31626=>1000,31627=>1000,31628=>1000,31629=>1000,31630=>1000,31631=>1000,31632=>1000,31633=>1000,31634=>1000,31635=>1000,31636=>1000,
-	31637=>1000,31638=>1000,31639=>1000,31640=>1000,31641=>1000,31642=>1000,31643=>1000,31644=>1000,31645=>1000,31646=>1000,31647=>1000,31648=>1000,31649=>1000,31650=>1000,31651=>1000,31652=>1000,
-	31653=>1000,31654=>1000,31655=>1000,31656=>1000,31657=>1000,31658=>1000,31659=>1000,31660=>1000,31661=>1000,31662=>1000,31663=>1000,31664=>1000,31665=>1000,31666=>1000,31667=>1000,31668=>1000,
-	31669=>1000,31670=>1000,31671=>1000,31672=>1000,31673=>1000,31674=>1000,31675=>1000,31676=>1000,31677=>1000,31678=>1000,31679=>1000,31680=>1000,31681=>1000,31682=>1000,31683=>1000,31684=>1000,
-	31685=>1000,31686=>1000,31687=>1000,31688=>1000,31689=>1000,31690=>1000,31691=>1000,31692=>1000,31693=>1000,31694=>1000,31695=>1000,31696=>1000,31697=>1000,31698=>1000,31699=>1000,31700=>1000,
-	31701=>1000,31702=>1000,31703=>1000,31704=>1000,31705=>1000,31706=>1000,31707=>1000,31708=>1000,31709=>1000,31710=>1000,31711=>1000,31712=>1000,31713=>1000,31714=>1000,31715=>1000,31716=>1000,
-	31717=>1000,31718=>1000,31719=>1000,31720=>1000,31721=>1000,31722=>1000,31723=>1000,31724=>1000,31725=>1000,31726=>1000,31727=>1000,31728=>1000,31729=>1000,31730=>1000,31731=>1000,31732=>1000,
-	31733=>1000,31734=>1000,31735=>1000,31736=>1000,31737=>1000,31738=>1000,31739=>1000,31740=>1000,31741=>1000,31742=>1000,31743=>1000,31744=>1000,31745=>1000,31746=>1000,31747=>1000,31748=>1000,
-	31749=>1000,31750=>1000,31751=>1000,31752=>1000,31753=>1000,31754=>1000,31755=>1000,31756=>1000,31757=>1000,31758=>1000,31759=>1000,31760=>1000,31761=>1000,31762=>1000,31763=>1000,31764=>1000,
-	31765=>1000,31766=>1000,31767=>1000,31768=>1000,31769=>1000,31770=>1000,31771=>1000,31772=>1000,31773=>1000,31774=>1000,31775=>1000,31776=>1000,31777=>1000,31778=>1000,31779=>1000,31780=>1000,
-	31781=>1000,31782=>1000,31783=>1000,31784=>1000,31785=>1000,31786=>1000,31787=>1000,31788=>1000,31789=>1000,31790=>1000,31791=>1000,31792=>1000,31793=>1000,31794=>1000,31795=>1000,31796=>1000,
-	31797=>1000,31798=>1000,31799=>1000,31800=>1000,31801=>1000,31802=>1000,31803=>1000,31804=>1000,31805=>1000,31806=>1000,31807=>1000,31808=>1000,31809=>1000,31810=>1000,31811=>1000,31812=>1000,
-	31813=>1000,31814=>1000,31815=>1000,31816=>1000,31817=>1000,31818=>1000,31819=>1000,31820=>1000,31821=>1000,31822=>1000,31823=>1000,31824=>1000,31825=>1000,31826=>1000,31827=>1000,31828=>1000,
-	31829=>1000,31830=>1000,31831=>1000,31832=>1000,31833=>1000,31834=>1000,31835=>1000,31836=>1000,31837=>1000,31838=>1000,31839=>1000,31840=>1000,31841=>1000,31842=>1000,31843=>1000,31844=>1000,
-	31845=>1000,31846=>1000,31847=>1000,31848=>1000,31849=>1000,31850=>1000,31851=>1000,31852=>1000,31853=>1000,31854=>1000,31855=>1000,31856=>1000,31857=>1000,31858=>1000,31859=>1000,31860=>1000,
-	31861=>1000,31862=>1000,31863=>1000,31864=>1000,31865=>1000,31866=>1000,31867=>1000,31868=>1000,31869=>1000,31870=>1000,31871=>1000,31872=>1000,31873=>1000,31874=>1000,31875=>1000,31876=>1000,
-	31877=>1000,31878=>1000,31879=>1000,31880=>1000,31881=>1000,31882=>1000,31883=>1000,31884=>1000,31885=>1000,31886=>1000,31887=>1000,31888=>1000,31889=>1000,31890=>1000,31891=>1000,31892=>1000,
-	31893=>1000,31894=>1000,31895=>1000,31896=>1000,31897=>1000,31898=>1000,31899=>1000,31900=>1000,31901=>1000,31902=>1000,31903=>1000,31904=>1000,31905=>1000,31906=>1000,31907=>1000,31908=>1000,
-	31909=>1000,31910=>1000,31911=>1000,31912=>1000,31913=>1000,31914=>1000,31915=>1000,31916=>1000,31917=>1000,31918=>1000,31919=>1000,31920=>1000,31921=>1000,31922=>1000,31923=>1000,31924=>1000,
-	31925=>1000,31926=>1000,31927=>1000,31928=>1000,31929=>1000,31930=>1000,31931=>1000,31932=>1000,31933=>1000,31934=>1000,31935=>1000,31936=>1000,31937=>1000,31938=>1000,31939=>1000,31940=>1000,
-	31941=>1000,31942=>1000,31943=>1000,31944=>1000,31945=>1000,31946=>1000,31947=>1000,31948=>1000,31949=>1000,31950=>1000,31951=>1000,31952=>1000,31953=>1000,31954=>1000,31955=>1000,31956=>1000,
-	31957=>1000,31958=>1000,31959=>1000,31960=>1000,31961=>1000,31962=>1000,31963=>1000,31964=>1000,31965=>1000,31966=>1000,31967=>1000,31968=>1000,31969=>1000,31970=>1000,31971=>1000,31972=>1000,
-	31973=>1000,31974=>1000,31975=>1000,31976=>1000,31977=>1000,31978=>1000,31979=>1000,31980=>1000,31981=>1000,31982=>1000,31983=>1000,31984=>1000,31985=>1000,31986=>1000,31987=>1000,31988=>1000,
-	31989=>1000,31990=>1000,31991=>1000,31992=>1000,31993=>1000,31994=>1000,31995=>1000,31996=>1000,31997=>1000,31998=>1000,31999=>1000,32000=>1000,32001=>1000,32002=>1000,32003=>1000,32004=>1000,
-	32005=>1000,32006=>1000,32007=>1000,32008=>1000,32009=>1000,32010=>1000,32011=>1000,32012=>1000,32013=>1000,32014=>1000,32015=>1000,32016=>1000,32017=>1000,32018=>1000,32019=>1000,32020=>1000,
-	32021=>1000,32022=>1000,32023=>1000,32024=>1000,32025=>1000,32026=>1000,32027=>1000,32028=>1000,32029=>1000,32030=>1000,32031=>1000,32032=>1000,32033=>1000,32034=>1000,32035=>1000,32036=>1000,
-	32037=>1000,32038=>1000,32039=>1000,32040=>1000,32041=>1000,32042=>1000,32043=>1000,32044=>1000,32045=>1000,32046=>1000,32047=>1000,32048=>1000,32049=>1000,32050=>1000,32051=>1000,32052=>1000,
-	32053=>1000,32054=>1000,32055=>1000,32056=>1000,32057=>1000,32058=>1000,32059=>1000,32060=>1000,32061=>1000,32062=>1000,32063=>1000,32064=>1000,32065=>1000,32066=>1000,32067=>1000,32068=>1000,
-	32069=>1000,32070=>1000,32071=>1000,32072=>1000,32073=>1000,32074=>1000,32075=>1000,32076=>1000,32077=>1000,32078=>1000,32079=>1000,32080=>1000,32081=>1000,32082=>1000,32083=>1000,32084=>1000,
-	32085=>1000,32086=>1000,32087=>1000,32088=>1000,32089=>1000,32090=>1000,32091=>1000,32092=>1000,32093=>1000,32094=>1000,32095=>1000,32096=>1000,32097=>1000,32098=>1000,32099=>1000,32100=>1000,
-	32101=>1000,32102=>1000,32103=>1000,32104=>1000,32105=>1000,32106=>1000,32107=>1000,32108=>1000,32109=>1000,32110=>1000,32111=>1000,32112=>1000,32113=>1000,32114=>1000,32115=>1000,32116=>1000,
-	32117=>1000,32118=>1000,32119=>1000,32120=>1000,32121=>1000,32122=>1000,32123=>1000,32124=>1000,32125=>1000,32126=>1000,32127=>1000,32128=>1000,32129=>1000,32130=>1000,32131=>1000,32132=>1000,
-	32133=>1000,32134=>1000,32135=>1000,32136=>1000,32137=>1000,32138=>1000,32139=>1000,32140=>1000,32141=>1000,32142=>1000,32143=>1000,32144=>1000,32145=>1000,32146=>1000,32147=>1000,32148=>1000,
-	32149=>1000,32150=>1000,32151=>1000,32152=>1000,32153=>1000,32154=>1000,32155=>1000,32156=>1000,32157=>1000,32158=>1000,32159=>1000,32160=>1000,32161=>1000,32162=>1000,32163=>1000,32164=>1000,
-	32165=>1000,32166=>1000,32167=>1000,32168=>1000,32169=>1000,32170=>1000,32171=>1000,32172=>1000,32173=>1000,32174=>1000,32175=>1000,32176=>1000,32177=>1000,32178=>1000,32179=>1000,32180=>1000,
-	32181=>1000,32182=>1000,32183=>1000,32184=>1000,32185=>1000,32186=>1000,32187=>1000,32188=>1000,32189=>1000,32190=>1000,32191=>1000,32192=>1000,32193=>1000,32194=>1000,32195=>1000,32196=>1000,
-	32197=>1000,32198=>1000,32199=>1000,32200=>1000,32201=>1000,32202=>1000,32203=>1000,32204=>1000,32205=>1000,32206=>1000,32207=>1000,32208=>1000,32209=>1000,32210=>1000,32211=>1000,32212=>1000,
-	32213=>1000,32214=>1000,32215=>1000,32216=>1000,32217=>1000,32218=>1000,32219=>1000,32220=>1000,32221=>1000,32222=>1000,32223=>1000,32224=>1000,32225=>1000,32226=>1000,32227=>1000,32228=>1000,
-	32229=>1000,32230=>1000,32231=>1000,32232=>1000,32233=>1000,32234=>1000,32235=>1000,32236=>1000,32237=>1000,32238=>1000,32239=>1000,32240=>1000,32241=>1000,32242=>1000,32243=>1000,32244=>1000,
-	32245=>1000,32246=>1000,32247=>1000,32248=>1000,32249=>1000,32250=>1000,32251=>1000,32252=>1000,32253=>1000,32254=>1000,32255=>1000,32256=>1000,32257=>1000,32258=>1000,32259=>1000,32260=>1000,
-	32261=>1000,32262=>1000,32263=>1000,32264=>1000,32265=>1000,32266=>1000,32267=>1000,32268=>1000,32269=>1000,32270=>1000,32271=>1000,32272=>1000,32273=>1000,32274=>1000,32275=>1000,32276=>1000,
-	32277=>1000,32278=>1000,32279=>1000,32280=>1000,32281=>1000,32282=>1000,32283=>1000,32284=>1000,32285=>1000,32286=>1000,32287=>1000,32288=>1000,32289=>1000,32290=>1000,32291=>1000,32292=>1000,
-	32293=>1000,32294=>1000,32295=>1000,32296=>1000,32297=>1000,32298=>1000,32299=>1000,32300=>1000,32301=>1000,32302=>1000,32303=>1000,32304=>1000,32305=>1000,32306=>1000,32307=>1000,32308=>1000,
-	32309=>1000,32310=>1000,32311=>1000,32312=>1000,32313=>1000,32314=>1000,32315=>1000,32316=>1000,32317=>1000,32318=>1000,32319=>1000,32320=>1000,32321=>1000,32322=>1000,32323=>1000,32324=>1000,
-	32325=>1000,32326=>1000,32327=>1000,32328=>1000,32329=>1000,32330=>1000,32331=>1000,32332=>1000,32333=>1000,32334=>1000,32335=>1000,32336=>1000,32337=>1000,32338=>1000,32339=>1000,32340=>1000,
-	32341=>1000,32342=>1000,32343=>1000,32344=>1000,32345=>1000,32346=>1000,32347=>1000,32348=>1000,32349=>1000,32350=>1000,32351=>1000,32352=>1000,32353=>1000,32354=>1000,32355=>1000,32356=>1000,
-	32357=>1000,32358=>1000,32359=>1000,32360=>1000,32361=>1000,32362=>1000,32363=>1000,32364=>1000,32365=>1000,32366=>1000,32367=>1000,32368=>1000,32369=>1000,32370=>1000,32371=>1000,32372=>1000,
-	32373=>1000,32374=>1000,32375=>1000,32376=>1000,32377=>1000,32378=>1000,32379=>1000,32380=>1000,32381=>1000,32382=>1000,32383=>1000,32384=>1000,32385=>1000,32386=>1000,32387=>1000,32388=>1000,
-	32389=>1000,32390=>1000,32391=>1000,32392=>1000,32393=>1000,32394=>1000,32395=>1000,32396=>1000,32397=>1000,32398=>1000,32399=>1000,32400=>1000,32401=>1000,32402=>1000,32403=>1000,32404=>1000,
-	32405=>1000,32406=>1000,32407=>1000,32408=>1000,32409=>1000,32410=>1000,32411=>1000,32412=>1000,32413=>1000,32414=>1000,32415=>1000,32416=>1000,32417=>1000,32418=>1000,32419=>1000,32420=>1000,
-	32421=>1000,32422=>1000,32423=>1000,32424=>1000,32425=>1000,32426=>1000,32427=>1000,32428=>1000,32429=>1000,32430=>1000,32431=>1000,32432=>1000,32433=>1000,32434=>1000,32435=>1000,32436=>1000,
-	32437=>1000,32438=>1000,32439=>1000,32440=>1000,32441=>1000,32442=>1000,32443=>1000,32444=>1000,32445=>1000,32446=>1000,32447=>1000,32448=>1000,32449=>1000,32450=>1000,32451=>1000,32452=>1000,
-	32453=>1000,32454=>1000,32455=>1000,32456=>1000,32457=>1000,32458=>1000,32459=>1000,32460=>1000,32461=>1000,32462=>1000,32463=>1000,32464=>1000,32465=>1000,32466=>1000,32467=>1000,32468=>1000,
-	32469=>1000,32470=>1000,32471=>1000,32472=>1000,32473=>1000,32474=>1000,32475=>1000,32476=>1000,32477=>1000,32478=>1000,32479=>1000,32480=>1000,32481=>1000,32482=>1000,32483=>1000,32484=>1000,
-	32485=>1000,32486=>1000,32487=>1000,32488=>1000,32489=>1000,32490=>1000,32491=>1000,32492=>1000,32493=>1000,32494=>1000,32495=>1000,32496=>1000,32497=>1000,32498=>1000,32499=>1000,32500=>1000,
-	32501=>1000,32502=>1000,32503=>1000,32504=>1000,32505=>1000,32506=>1000,32507=>1000,32508=>1000,32509=>1000,32510=>1000,32511=>1000,32512=>1000,32513=>1000,32514=>1000,32515=>1000,32516=>1000,
-	32517=>1000,32518=>1000,32519=>1000,32520=>1000,32521=>1000,32522=>1000,32523=>1000,32524=>1000,32525=>1000,32526=>1000,32527=>1000,32528=>1000,32529=>1000,32530=>1000,32531=>1000,32532=>1000,
-	32533=>1000,32534=>1000,32535=>1000,32536=>1000,32537=>1000,32538=>1000,32539=>1000,32540=>1000,32541=>1000,32542=>1000,32543=>1000,32544=>1000,32545=>1000,32546=>1000,32547=>1000,32548=>1000,
-	32549=>1000,32550=>1000,32551=>1000,32552=>1000,32553=>1000,32554=>1000,32555=>1000,32556=>1000,32557=>1000,32558=>1000,32559=>1000,32560=>1000,32561=>1000,32562=>1000,32563=>1000,32564=>1000,
-	32565=>1000,32566=>1000,32567=>1000,32568=>1000,32569=>1000,32570=>1000,32571=>1000,32572=>1000,32573=>1000,32574=>1000,32575=>1000,32576=>1000,32577=>1000,32578=>1000,32579=>1000,32580=>1000,
-	32581=>1000,32582=>1000,32583=>1000,32584=>1000,32585=>1000,32586=>1000,32587=>1000,32588=>1000,32589=>1000,32590=>1000,32591=>1000,32592=>1000,32593=>1000,32594=>1000,32595=>1000,32596=>1000,
-	32597=>1000,32598=>1000,32599=>1000,32600=>1000,32601=>1000,32602=>1000,32603=>1000,32604=>1000,32605=>1000,32606=>1000,32607=>1000,32608=>1000,32609=>1000,32610=>1000,32611=>1000,32612=>1000,
-	32613=>1000,32614=>1000,32615=>1000,32616=>1000,32617=>1000,32618=>1000,32619=>1000,32620=>1000,32621=>1000,32622=>1000,32623=>1000,32624=>1000,32625=>1000,32626=>1000,32627=>1000,32628=>1000,
-	32629=>1000,32630=>1000,32631=>1000,32632=>1000,32633=>1000,32634=>1000,32635=>1000,32636=>1000,32637=>1000,32638=>1000,32639=>1000,32640=>1000,32641=>1000,32642=>1000,32643=>1000,32644=>1000,
-	32645=>1000,32646=>1000,32647=>1000,32648=>1000,32649=>1000,32650=>1000,32651=>1000,32652=>1000,32653=>1000,32654=>1000,32655=>1000,32656=>1000,32657=>1000,32658=>1000,32659=>1000,32660=>1000,
-	32661=>1000,32662=>1000,32663=>1000,32664=>1000,32665=>1000,32666=>1000,32667=>1000,32668=>1000,32669=>1000,32670=>1000,32671=>1000,32672=>1000,32673=>1000,32674=>1000,32675=>1000,32676=>1000,
-	32677=>1000,32678=>1000,32679=>1000,32680=>1000,32681=>1000,32682=>1000,32683=>1000,32684=>1000,32685=>1000,32686=>1000,32687=>1000,32688=>1000,32689=>1000,32690=>1000,32691=>1000,32692=>1000,
-	32693=>1000,32694=>1000,32695=>1000,32696=>1000,32697=>1000,32698=>1000,32699=>1000,32700=>1000,32701=>1000,32702=>1000,32703=>1000,32704=>1000,32705=>1000,32706=>1000,32707=>1000,32708=>1000,
-	32709=>1000,32710=>1000,32711=>1000,32712=>1000,32713=>1000,32714=>1000,32715=>1000,32716=>1000,32717=>1000,32718=>1000,32719=>1000,32720=>1000,32721=>1000,32722=>1000,32723=>1000,32724=>1000,
-	32725=>1000,32726=>1000,32727=>1000,32728=>1000,32729=>1000,32730=>1000,32731=>1000,32732=>1000,32733=>1000,32734=>1000,32735=>1000,32736=>1000,32737=>1000,32738=>1000,32739=>1000,32740=>1000,
-	32741=>1000,32742=>1000,32743=>1000,32744=>1000,32745=>1000,32746=>1000,32747=>1000,32748=>1000,32749=>1000,32750=>1000,32751=>1000,32752=>1000,32753=>1000,32754=>1000,32755=>1000,32756=>1000,
-	32757=>1000,32758=>1000,32759=>1000,32760=>1000,32761=>1000,32762=>1000,32763=>1000,32764=>1000,32765=>1000,32766=>1000,32767=>1000,32768=>1000,32769=>1000,32770=>1000,32771=>1000,32772=>1000,
-	32773=>1000,32774=>1000,32775=>1000,32776=>1000,32777=>1000,32778=>1000,32779=>1000,32780=>1000,32781=>1000,32782=>1000,32783=>1000,32784=>1000,32785=>1000,32786=>1000,32787=>1000,32788=>1000,
-	32789=>1000,32790=>1000,32791=>1000,32792=>1000,32793=>1000,32794=>1000,32795=>1000,32796=>1000,32797=>1000,32798=>1000,32799=>1000,32800=>1000,32801=>1000,32802=>1000,32803=>1000,32804=>1000,
-	32805=>1000,32806=>1000,32807=>1000,32808=>1000,32809=>1000,32810=>1000,32811=>1000,32812=>1000,32813=>1000,32814=>1000,32815=>1000,32816=>1000,32817=>1000,32818=>1000,32819=>1000,32820=>1000,
-	32821=>1000,32822=>1000,32823=>1000,32824=>1000,32825=>1000,32826=>1000,32827=>1000,32828=>1000,32829=>1000,32830=>1000,32831=>1000,32832=>1000,32833=>1000,32834=>1000,32835=>1000,32836=>1000,
-	32837=>1000,32838=>1000,32839=>1000,32840=>1000,32841=>1000,32842=>1000,32843=>1000,32844=>1000,32845=>1000,32846=>1000,32847=>1000,32848=>1000,32849=>1000,32850=>1000,32851=>1000,32852=>1000,
-	32853=>1000,32854=>1000,32855=>1000,32856=>1000,32857=>1000,32858=>1000,32859=>1000,32860=>1000,32861=>1000,32862=>1000,32863=>1000,32864=>1000,32865=>1000,32866=>1000,32867=>1000,32868=>1000,
-	32869=>1000,32870=>1000,32871=>1000,32872=>1000,32873=>1000,32874=>1000,32875=>1000,32876=>1000,32877=>1000,32878=>1000,32879=>1000,32880=>1000,32881=>1000,32882=>1000,32883=>1000,32884=>1000,
-	32885=>1000,32886=>1000,32887=>1000,32888=>1000,32889=>1000,32890=>1000,32891=>1000,32892=>1000,32893=>1000,32894=>1000,32895=>1000,32896=>1000,32897=>1000,32898=>1000,32899=>1000,32900=>1000,
-	32901=>1000,32902=>1000,32903=>1000,32904=>1000,32905=>1000,32906=>1000,32907=>1000,32908=>1000,32909=>1000,32910=>1000,32911=>1000,32912=>1000,32913=>1000,32914=>1000,32915=>1000,32916=>1000,
-	32917=>1000,32918=>1000,32919=>1000,32920=>1000,32921=>1000,32922=>1000,32923=>1000,32924=>1000,32925=>1000,32926=>1000,32927=>1000,32928=>1000,32929=>1000,32930=>1000,32931=>1000,32932=>1000,
-	32933=>1000,32934=>1000,32935=>1000,32936=>1000,32937=>1000,32938=>1000,32939=>1000,32940=>1000,32941=>1000,32942=>1000,32943=>1000,32944=>1000,32945=>1000,32946=>1000,32947=>1000,32948=>1000,
-	32949=>1000,32950=>1000,32951=>1000,32952=>1000,32953=>1000,32954=>1000,32955=>1000,32956=>1000,32957=>1000,32958=>1000,32959=>1000,32960=>1000,32961=>1000,32962=>1000,32963=>1000,32964=>1000,
-	32965=>1000,32966=>1000,32967=>1000,32968=>1000,32969=>1000,32970=>1000,32971=>1000,32972=>1000,32973=>1000,32974=>1000,32975=>1000,32976=>1000,32977=>1000,32978=>1000,32979=>1000,32980=>1000,
-	32981=>1000,32982=>1000,32983=>1000,32984=>1000,32985=>1000,32986=>1000,32987=>1000,32988=>1000,32989=>1000,32990=>1000,32991=>1000,32992=>1000,32993=>1000,32994=>1000,32995=>1000,32996=>1000,
-	32997=>1000,32998=>1000,32999=>1000,33000=>1000,33001=>1000,33002=>1000,33003=>1000,33004=>1000,33005=>1000,33006=>1000,33007=>1000,33008=>1000,33009=>1000,33010=>1000,33011=>1000,33012=>1000,
-	33013=>1000,33014=>1000,33015=>1000,33016=>1000,33017=>1000,33018=>1000,33019=>1000,33020=>1000,33021=>1000,33022=>1000,33023=>1000,33024=>1000,33025=>1000,33026=>1000,33027=>1000,33028=>1000,
-	33029=>1000,33030=>1000,33031=>1000,33032=>1000,33033=>1000,33034=>1000,33035=>1000,33036=>1000,33037=>1000,33038=>1000,33039=>1000,33040=>1000,33041=>1000,33042=>1000,33043=>1000,33044=>1000,
-	33045=>1000,33046=>1000,33047=>1000,33048=>1000,33049=>1000,33050=>1000,33051=>1000,33052=>1000,33053=>1000,33054=>1000,33055=>1000,33056=>1000,33057=>1000,33058=>1000,33059=>1000,33060=>1000,
-	33061=>1000,33062=>1000,33063=>1000,33064=>1000,33065=>1000,33066=>1000,33067=>1000,33068=>1000,33069=>1000,33070=>1000,33071=>1000,33072=>1000,33073=>1000,33074=>1000,33075=>1000,33076=>1000,
-	33077=>1000,33078=>1000,33079=>1000,33080=>1000,33081=>1000,33082=>1000,33083=>1000,33084=>1000,33085=>1000,33086=>1000,33087=>1000,33088=>1000,33089=>1000,33090=>1000,33091=>1000,33092=>1000,
-	33093=>1000,33094=>1000,33095=>1000,33096=>1000,33097=>1000,33098=>1000,33099=>1000,33100=>1000,33101=>1000,33102=>1000,33103=>1000,33104=>1000,33105=>1000,33106=>1000,33107=>1000,33108=>1000,
-	33109=>1000,33110=>1000,33111=>1000,33112=>1000,33113=>1000,33114=>1000,33115=>1000,33116=>1000,33117=>1000,33118=>1000,33119=>1000,33120=>1000,33121=>1000,33122=>1000,33123=>1000,33124=>1000,
-	33125=>1000,33126=>1000,33127=>1000,33128=>1000,33129=>1000,33130=>1000,33131=>1000,33132=>1000,33133=>1000,33134=>1000,33135=>1000,33136=>1000,33137=>1000,33138=>1000,33139=>1000,33140=>1000,
-	33141=>1000,33142=>1000,33143=>1000,33144=>1000,33145=>1000,33146=>1000,33147=>1000,33148=>1000,33149=>1000,33150=>1000,33151=>1000,33152=>1000,33153=>1000,33154=>1000,33155=>1000,33156=>1000,
-	33157=>1000,33158=>1000,33159=>1000,33160=>1000,33161=>1000,33162=>1000,33163=>1000,33164=>1000,33165=>1000,33166=>1000,33167=>1000,33168=>1000,33169=>1000,33170=>1000,33171=>1000,33172=>1000,
-	33173=>1000,33174=>1000,33175=>1000,33176=>1000,33177=>1000,33178=>1000,33179=>1000,33180=>1000,33181=>1000,33182=>1000,33183=>1000,33184=>1000,33185=>1000,33186=>1000,33187=>1000,33188=>1000,
-	33189=>1000,33190=>1000,33191=>1000,33192=>1000,33193=>1000,33194=>1000,33195=>1000,33196=>1000,33197=>1000,33198=>1000,33199=>1000,33200=>1000,33201=>1000,33202=>1000,33203=>1000,33204=>1000,
-	33205=>1000,33206=>1000,33207=>1000,33208=>1000,33209=>1000,33210=>1000,33211=>1000,33212=>1000,33213=>1000,33214=>1000,33215=>1000,33216=>1000,33217=>1000,33218=>1000,33219=>1000,33220=>1000,
-	33221=>1000,33222=>1000,33223=>1000,33224=>1000,33225=>1000,33226=>1000,33227=>1000,33228=>1000,33229=>1000,33230=>1000,33231=>1000,33232=>1000,33233=>1000,33234=>1000,33235=>1000,33236=>1000,
-	33237=>1000,33238=>1000,33239=>1000,33240=>1000,33241=>1000,33242=>1000,33243=>1000,33244=>1000,33245=>1000,33246=>1000,33247=>1000,33248=>1000,33249=>1000,33250=>1000,33251=>1000,33252=>1000,
-	33253=>1000,33254=>1000,33255=>1000,33256=>1000,33257=>1000,33258=>1000,33259=>1000,33260=>1000,33261=>1000,33262=>1000,33263=>1000,33264=>1000,33265=>1000,33266=>1000,33267=>1000,33268=>1000,
-	33269=>1000,33270=>1000,33271=>1000,33272=>1000,33273=>1000,33274=>1000,33275=>1000,33276=>1000,33277=>1000,33278=>1000,33279=>1000,33280=>1000,33281=>1000,33282=>1000,33283=>1000,33284=>1000,
-	33285=>1000,33286=>1000,33287=>1000,33288=>1000,33289=>1000,33290=>1000,33291=>1000,33292=>1000,33293=>1000,33294=>1000,33295=>1000,33296=>1000,33297=>1000,33298=>1000,33299=>1000,33300=>1000,
-	33301=>1000,33302=>1000,33303=>1000,33304=>1000,33305=>1000,33306=>1000,33307=>1000,33308=>1000,33309=>1000,33310=>1000,33311=>1000,33312=>1000,33313=>1000,33314=>1000,33315=>1000,33316=>1000,
-	33317=>1000,33318=>1000,33319=>1000,33320=>1000,33321=>1000,33322=>1000,33323=>1000,33324=>1000,33325=>1000,33326=>1000,33327=>1000,33328=>1000,33329=>1000,33330=>1000,33331=>1000,33332=>1000,
-	33333=>1000,33334=>1000,33335=>1000,33336=>1000,33337=>1000,33338=>1000,33339=>1000,33340=>1000,33341=>1000,33342=>1000,33343=>1000,33344=>1000,33345=>1000,33346=>1000,33347=>1000,33348=>1000,
-	33349=>1000,33350=>1000,33351=>1000,33352=>1000,33353=>1000,33354=>1000,33355=>1000,33356=>1000,33357=>1000,33358=>1000,33359=>1000,33360=>1000,33361=>1000,33362=>1000,33363=>1000,33364=>1000,
-	33365=>1000,33366=>1000,33367=>1000,33368=>1000,33369=>1000,33370=>1000,33371=>1000,33372=>1000,33373=>1000,33374=>1000,33375=>1000,33376=>1000,33377=>1000,33378=>1000,33379=>1000,33380=>1000,
-	33381=>1000,33382=>1000,33383=>1000,33384=>1000,33385=>1000,33386=>1000,33387=>1000,33388=>1000,33389=>1000,33390=>1000,33391=>1000,33392=>1000,33393=>1000,33394=>1000,33395=>1000,33396=>1000,
-	33397=>1000,33398=>1000,33399=>1000,33400=>1000,33401=>1000,33402=>1000,33403=>1000,33404=>1000,33405=>1000,33406=>1000,33407=>1000,33408=>1000,33409=>1000,33410=>1000,33411=>1000,33412=>1000,
-	33413=>1000,33414=>1000,33415=>1000,33416=>1000,33417=>1000,33418=>1000,33419=>1000,33420=>1000,33421=>1000,33422=>1000,33423=>1000,33424=>1000,33425=>1000,33426=>1000,33427=>1000,33428=>1000,
-	33429=>1000,33430=>1000,33431=>1000,33432=>1000,33433=>1000,33434=>1000,33435=>1000,33436=>1000,33437=>1000,33438=>1000,33439=>1000,33440=>1000,33441=>1000,33442=>1000,33443=>1000,33444=>1000,
-	33445=>1000,33446=>1000,33447=>1000,33448=>1000,33449=>1000,33450=>1000,33451=>1000,33452=>1000,33453=>1000,33454=>1000,33455=>1000,33456=>1000,33457=>1000,33458=>1000,33459=>1000,33460=>1000,
-	33461=>1000,33462=>1000,33463=>1000,33464=>1000,33465=>1000,33466=>1000,33467=>1000,33468=>1000,33469=>1000,33470=>1000,33471=>1000,33472=>1000,33473=>1000,33474=>1000,33475=>1000,33476=>1000,
-	33477=>1000,33478=>1000,33479=>1000,33480=>1000,33481=>1000,33482=>1000,33483=>1000,33484=>1000,33485=>1000,33486=>1000,33487=>1000,33488=>1000,33489=>1000,33490=>1000,33491=>1000,33492=>1000,
-	33493=>1000,33494=>1000,33495=>1000,33496=>1000,33497=>1000,33498=>1000,33499=>1000,33500=>1000,33501=>1000,33502=>1000,33503=>1000,33504=>1000,33505=>1000,33506=>1000,33507=>1000,33508=>1000,
-	33509=>1000,33510=>1000,33511=>1000,33512=>1000,33513=>1000,33514=>1000,33515=>1000,33516=>1000,33517=>1000,33518=>1000,33519=>1000,33520=>1000,33521=>1000,33522=>1000,33523=>1000,33524=>1000,
-	33525=>1000,33526=>1000,33527=>1000,33528=>1000,33529=>1000,33530=>1000,33531=>1000,33532=>1000,33533=>1000,33534=>1000,33535=>1000,33536=>1000,33537=>1000,33538=>1000,33539=>1000,33540=>1000,
-	33541=>1000,33542=>1000,33543=>1000,33544=>1000,33545=>1000,33546=>1000,33547=>1000,33548=>1000,33549=>1000,33550=>1000,33551=>1000,33552=>1000,33553=>1000,33554=>1000,33555=>1000,33556=>1000,
-	33557=>1000,33558=>1000,33559=>1000,33560=>1000,33561=>1000,33562=>1000,33563=>1000,33564=>1000,33565=>1000,33566=>1000,33567=>1000,33568=>1000,33569=>1000,33570=>1000,33571=>1000,33572=>1000,
-	33573=>1000,33574=>1000,33575=>1000,33576=>1000,33577=>1000,33578=>1000,33579=>1000,33580=>1000,33581=>1000,33582=>1000,33583=>1000,33584=>1000,33585=>1000,33586=>1000,33587=>1000,33588=>1000,
-	33589=>1000,33590=>1000,33591=>1000,33592=>1000,33593=>1000,33594=>1000,33595=>1000,33596=>1000,33597=>1000,33598=>1000,33599=>1000,33600=>1000,33601=>1000,33602=>1000,33603=>1000,33604=>1000,
-	33605=>1000,33606=>1000,33607=>1000,33608=>1000,33609=>1000,33610=>1000,33611=>1000,33612=>1000,33613=>1000,33614=>1000,33615=>1000,33616=>1000,33617=>1000,33618=>1000,33619=>1000,33620=>1000,
-	33621=>1000,33622=>1000,33623=>1000,33624=>1000,33625=>1000,33626=>1000,33627=>1000,33628=>1000,33629=>1000,33630=>1000,33631=>1000,33632=>1000,33633=>1000,33634=>1000,33635=>1000,33636=>1000,
-	33637=>1000,33638=>1000,33639=>1000,33640=>1000,33641=>1000,33642=>1000,33643=>1000,33644=>1000,33645=>1000,33646=>1000,33647=>1000,33648=>1000,33649=>1000,33650=>1000,33651=>1000,33652=>1000,
-	33653=>1000,33654=>1000,33655=>1000,33656=>1000,33657=>1000,33658=>1000,33659=>1000,33660=>1000,33661=>1000,33662=>1000,33663=>1000,33664=>1000,33665=>1000,33666=>1000,33667=>1000,33668=>1000,
-	33669=>1000,33670=>1000,33671=>1000,33672=>1000,33673=>1000,33674=>1000,33675=>1000,33676=>1000,33677=>1000,33678=>1000,33679=>1000,33680=>1000,33681=>1000,33682=>1000,33683=>1000,33684=>1000,
-	33685=>1000,33686=>1000,33687=>1000,33688=>1000,33689=>1000,33690=>1000,33691=>1000,33692=>1000,33693=>1000,33694=>1000,33695=>1000,33696=>1000,33697=>1000,33698=>1000,33699=>1000,33700=>1000,
-	33701=>1000,33702=>1000,33703=>1000,33704=>1000,33705=>1000,33706=>1000,33707=>1000,33708=>1000,33709=>1000,33710=>1000,33711=>1000,33712=>1000,33713=>1000,33714=>1000,33715=>1000,33716=>1000,
-	33717=>1000,33718=>1000,33719=>1000,33720=>1000,33721=>1000,33722=>1000,33723=>1000,33724=>1000,33725=>1000,33726=>1000,33727=>1000,33728=>1000,33729=>1000,33730=>1000,33731=>1000,33732=>1000,
-	33733=>1000,33734=>1000,33735=>1000,33736=>1000,33737=>1000,33738=>1000,33739=>1000,33740=>1000,33741=>1000,33742=>1000,33743=>1000,33744=>1000,33745=>1000,33746=>1000,33747=>1000,33748=>1000,
-	33749=>1000,33750=>1000,33751=>1000,33752=>1000,33753=>1000,33754=>1000,33755=>1000,33756=>1000,33757=>1000,33758=>1000,33759=>1000,33760=>1000,33761=>1000,33762=>1000,33763=>1000,33764=>1000,
-	33765=>1000,33766=>1000,33767=>1000,33768=>1000,33769=>1000,33770=>1000,33771=>1000,33772=>1000,33773=>1000,33774=>1000,33775=>1000,33776=>1000,33777=>1000,33778=>1000,33779=>1000,33780=>1000,
-	33781=>1000,33782=>1000,33783=>1000,33784=>1000,33785=>1000,33786=>1000,33787=>1000,33788=>1000,33789=>1000,33790=>1000,33791=>1000,33792=>1000,33793=>1000,33794=>1000,33795=>1000,33796=>1000,
-	33797=>1000,33798=>1000,33799=>1000,33800=>1000,33801=>1000,33802=>1000,33803=>1000,33804=>1000,33805=>1000,33806=>1000,33807=>1000,33808=>1000,33809=>1000,33810=>1000,33811=>1000,33812=>1000,
-	33813=>1000,33814=>1000,33815=>1000,33816=>1000,33817=>1000,33818=>1000,33819=>1000,33820=>1000,33821=>1000,33822=>1000,33823=>1000,33824=>1000,33825=>1000,33826=>1000,33827=>1000,33828=>1000,
-	33829=>1000,33830=>1000,33831=>1000,33832=>1000,33833=>1000,33834=>1000,33835=>1000,33836=>1000,33837=>1000,33838=>1000,33839=>1000,33840=>1000,33841=>1000,33842=>1000,33843=>1000,33844=>1000,
-	33845=>1000,33846=>1000,33847=>1000,33848=>1000,33849=>1000,33850=>1000,33851=>1000,33852=>1000,33853=>1000,33854=>1000,33855=>1000,33856=>1000,33857=>1000,33858=>1000,33859=>1000,33860=>1000,
-	33861=>1000,33862=>1000,33863=>1000,33864=>1000,33865=>1000,33866=>1000,33867=>1000,33868=>1000,33869=>1000,33870=>1000,33871=>1000,33872=>1000,33873=>1000,33874=>1000,33875=>1000,33876=>1000,
-	33877=>1000,33878=>1000,33879=>1000,33880=>1000,33881=>1000,33882=>1000,33883=>1000,33884=>1000,33885=>1000,33886=>1000,33887=>1000,33888=>1000,33889=>1000,33890=>1000,33891=>1000,33892=>1000,
-	33893=>1000,33894=>1000,33895=>1000,33896=>1000,33897=>1000,33898=>1000,33899=>1000,33900=>1000,33901=>1000,33902=>1000,33903=>1000,33904=>1000,33905=>1000,33906=>1000,33907=>1000,33908=>1000,
-	33909=>1000,33910=>1000,33911=>1000,33912=>1000,33913=>1000,33914=>1000,33915=>1000,33916=>1000,33917=>1000,33918=>1000,33919=>1000,33920=>1000,33921=>1000,33922=>1000,33923=>1000,33924=>1000,
-	33925=>1000,33926=>1000,33927=>1000,33928=>1000,33929=>1000,33930=>1000,33931=>1000,33932=>1000,33933=>1000,33934=>1000,33935=>1000,33936=>1000,33937=>1000,33938=>1000,33939=>1000,33940=>1000,
-	33941=>1000,33942=>1000,33943=>1000,33944=>1000,33945=>1000,33946=>1000,33947=>1000,33948=>1000,33949=>1000,33950=>1000,33951=>1000,33952=>1000,33953=>1000,33954=>1000,33955=>1000,33956=>1000,
-	33957=>1000,33958=>1000,33959=>1000,33960=>1000,33961=>1000,33962=>1000,33963=>1000,33964=>1000,33965=>1000,33966=>1000,33967=>1000,33968=>1000,33969=>1000,33970=>1000,33971=>1000,33972=>1000,
-	33973=>1000,33974=>1000,33975=>1000,33976=>1000,33977=>1000,33978=>1000,33979=>1000,33980=>1000,33981=>1000,33982=>1000,33983=>1000,33984=>1000,33985=>1000,33986=>1000,33987=>1000,33988=>1000,
-	33989=>1000,33990=>1000,33991=>1000,33992=>1000,33993=>1000,33994=>1000,33995=>1000,33996=>1000,33997=>1000,33998=>1000,33999=>1000,34000=>1000,34001=>1000,34002=>1000,34003=>1000,34004=>1000,
-	34005=>1000,34006=>1000,34007=>1000,34008=>1000,34009=>1000,34010=>1000,34011=>1000,34012=>1000,34013=>1000,34014=>1000,34015=>1000,34016=>1000,34017=>1000,34018=>1000,34019=>1000,34020=>1000,
-	34021=>1000,34022=>1000,34023=>1000,34024=>1000,34025=>1000,34026=>1000,34027=>1000,34028=>1000,34029=>1000,34030=>1000,34031=>1000,34032=>1000,34033=>1000,34034=>1000,34035=>1000,34036=>1000,
-	34037=>1000,34038=>1000,34039=>1000,34040=>1000,34041=>1000,34042=>1000,34043=>1000,34044=>1000,34045=>1000,34046=>1000,34047=>1000,34048=>1000,34049=>1000,34050=>1000,34051=>1000,34052=>1000,
-	34053=>1000,34054=>1000,34055=>1000,34056=>1000,34057=>1000,34058=>1000,34059=>1000,34060=>1000,34061=>1000,34062=>1000,34063=>1000,34064=>1000,34065=>1000,34066=>1000,34067=>1000,34068=>1000,
-	34069=>1000,34070=>1000,34071=>1000,34072=>1000,34073=>1000,34074=>1000,34075=>1000,34076=>1000,34077=>1000,34078=>1000,34079=>1000,34080=>1000,34081=>1000,34082=>1000,34083=>1000,34084=>1000,
-	34085=>1000,34086=>1000,34087=>1000,34088=>1000,34089=>1000,34090=>1000,34091=>1000,34092=>1000,34093=>1000,34094=>1000,34095=>1000,34096=>1000,34097=>1000,34098=>1000,34099=>1000,34100=>1000,
-	34101=>1000,34102=>1000,34103=>1000,34104=>1000,34105=>1000,34106=>1000,34107=>1000,34108=>1000,34109=>1000,34110=>1000,34111=>1000,34112=>1000,34113=>1000,34114=>1000,34115=>1000,34116=>1000,
-	34117=>1000,34118=>1000,34119=>1000,34120=>1000,34121=>1000,34122=>1000,34123=>1000,34124=>1000,34125=>1000,34126=>1000,34127=>1000,34128=>1000,34129=>1000,34130=>1000,34131=>1000,34132=>1000,
-	34133=>1000,34134=>1000,34135=>1000,34136=>1000,34137=>1000,34138=>1000,34139=>1000,34140=>1000,34141=>1000,34142=>1000,34143=>1000,34144=>1000,34145=>1000,34146=>1000,34147=>1000,34148=>1000,
-	34149=>1000,34150=>1000,34151=>1000,34152=>1000,34153=>1000,34154=>1000,34155=>1000,34156=>1000,34157=>1000,34158=>1000,34159=>1000,34160=>1000,34161=>1000,34162=>1000,34163=>1000,34164=>1000,
-	34165=>1000,34166=>1000,34167=>1000,34168=>1000,34169=>1000,34170=>1000,34171=>1000,34172=>1000,34173=>1000,34174=>1000,34175=>1000,34176=>1000,34177=>1000,34178=>1000,34179=>1000,34180=>1000,
-	34181=>1000,34182=>1000,34183=>1000,34184=>1000,34185=>1000,34186=>1000,34187=>1000,34188=>1000,34189=>1000,34190=>1000,34191=>1000,34192=>1000,34193=>1000,34194=>1000,34195=>1000,34196=>1000,
-	34197=>1000,34198=>1000,34199=>1000,34200=>1000,34201=>1000,34202=>1000,34203=>1000,34204=>1000,34205=>1000,34206=>1000,34207=>1000,34208=>1000,34209=>1000,34210=>1000,34211=>1000,34212=>1000,
-	34213=>1000,34214=>1000,34215=>1000,34216=>1000,34217=>1000,34218=>1000,34219=>1000,34220=>1000,34221=>1000,34222=>1000,34223=>1000,34224=>1000,34225=>1000,34226=>1000,34227=>1000,34228=>1000,
-	34229=>1000,34230=>1000,34231=>1000,34232=>1000,34233=>1000,34234=>1000,34235=>1000,34236=>1000,34237=>1000,34238=>1000,34239=>1000,34240=>1000,34241=>1000,34242=>1000,34243=>1000,34244=>1000,
-	34245=>1000,34246=>1000,34247=>1000,34248=>1000,34249=>1000,34250=>1000,34251=>1000,34252=>1000,34253=>1000,34254=>1000,34255=>1000,34256=>1000,34257=>1000,34258=>1000,34259=>1000,34260=>1000,
-	34261=>1000,34262=>1000,34263=>1000,34264=>1000,34265=>1000,34266=>1000,34267=>1000,34268=>1000,34269=>1000,34270=>1000,34271=>1000,34272=>1000,34273=>1000,34274=>1000,34275=>1000,34276=>1000,
-	34277=>1000,34278=>1000,34279=>1000,34280=>1000,34281=>1000,34282=>1000,34283=>1000,34284=>1000,34285=>1000,34286=>1000,34287=>1000,34288=>1000,34289=>1000,34290=>1000,34291=>1000,34292=>1000,
-	34293=>1000,34294=>1000,34295=>1000,34296=>1000,34297=>1000,34298=>1000,34299=>1000,34300=>1000,34301=>1000,34302=>1000,34303=>1000,34304=>1000,34305=>1000,34306=>1000,34307=>1000,34308=>1000,
-	34309=>1000,34310=>1000,34311=>1000,34312=>1000,34313=>1000,34314=>1000,34315=>1000,34316=>1000,34317=>1000,34318=>1000,34319=>1000,34320=>1000,34321=>1000,34322=>1000,34323=>1000,34324=>1000,
-	34325=>1000,34326=>1000,34327=>1000,34328=>1000,34329=>1000,34330=>1000,34331=>1000,34332=>1000,34333=>1000,34334=>1000,34335=>1000,34336=>1000,34337=>1000,34338=>1000,34339=>1000,34340=>1000,
-	34341=>1000,34342=>1000,34343=>1000,34344=>1000,34345=>1000,34346=>1000,34347=>1000,34348=>1000,34349=>1000,34350=>1000,34351=>1000,34352=>1000,34353=>1000,34354=>1000,34355=>1000,34356=>1000,
-	34357=>1000,34358=>1000,34359=>1000,34360=>1000,34361=>1000,34362=>1000,34363=>1000,34364=>1000,34365=>1000,34366=>1000,34367=>1000,34368=>1000,34369=>1000,34370=>1000,34371=>1000,34372=>1000,
-	34373=>1000,34374=>1000,34375=>1000,34376=>1000,34377=>1000,34378=>1000,34379=>1000,34380=>1000,34381=>1000,34382=>1000,34383=>1000,34384=>1000,34385=>1000,34386=>1000,34387=>1000,34388=>1000,
-	34389=>1000,34390=>1000,34391=>1000,34392=>1000,34393=>1000,34394=>1000,34395=>1000,34396=>1000,34397=>1000,34398=>1000,34399=>1000,34400=>1000,34401=>1000,34402=>1000,34403=>1000,34404=>1000,
-	34405=>1000,34406=>1000,34407=>1000,34408=>1000,34409=>1000,34410=>1000,34411=>1000,34412=>1000,34413=>1000,34414=>1000,34415=>1000,34416=>1000,34417=>1000,34418=>1000,34419=>1000,34420=>1000,
-	34421=>1000,34422=>1000,34423=>1000,34424=>1000,34425=>1000,34426=>1000,34427=>1000,34428=>1000,34429=>1000,34430=>1000,34431=>1000,34432=>1000,34433=>1000,34434=>1000,34435=>1000,34436=>1000,
-	34437=>1000,34438=>1000,34439=>1000,34440=>1000,34441=>1000,34442=>1000,34443=>1000,34444=>1000,34445=>1000,34446=>1000,34447=>1000,34448=>1000,34449=>1000,34450=>1000,34451=>1000,34452=>1000,
-	34453=>1000,34454=>1000,34455=>1000,34456=>1000,34457=>1000,34458=>1000,34459=>1000,34460=>1000,34461=>1000,34462=>1000,34463=>1000,34464=>1000,34465=>1000,34466=>1000,34467=>1000,34468=>1000,
-	34469=>1000,34470=>1000,34471=>1000,34472=>1000,34473=>1000,34474=>1000,34475=>1000,34476=>1000,34477=>1000,34478=>1000,34479=>1000,34480=>1000,34481=>1000,34482=>1000,34483=>1000,34484=>1000,
-	34485=>1000,34486=>1000,34487=>1000,34488=>1000,34489=>1000,34490=>1000,34491=>1000,34492=>1000,34493=>1000,34494=>1000,34495=>1000,34496=>1000,34497=>1000,34498=>1000,34499=>1000,34500=>1000,
-	34501=>1000,34502=>1000,34503=>1000,34504=>1000,34505=>1000,34506=>1000,34507=>1000,34508=>1000,34509=>1000,34510=>1000,34511=>1000,34512=>1000,34513=>1000,34514=>1000,34515=>1000,34516=>1000,
-	34517=>1000,34518=>1000,34519=>1000,34520=>1000,34521=>1000,34522=>1000,34523=>1000,34524=>1000,34525=>1000,34526=>1000,34527=>1000,34528=>1000,34529=>1000,34530=>1000,34531=>1000,34532=>1000,
-	34533=>1000,34534=>1000,34535=>1000,34536=>1000,34537=>1000,34538=>1000,34539=>1000,34540=>1000,34541=>1000,34542=>1000,34543=>1000,34544=>1000,34545=>1000,34546=>1000,34547=>1000,34548=>1000,
-	34549=>1000,34550=>1000,34551=>1000,34552=>1000,34553=>1000,34554=>1000,34555=>1000,34556=>1000,34557=>1000,34558=>1000,34559=>1000,34560=>1000,34561=>1000,34562=>1000,34563=>1000,34564=>1000,
-	34565=>1000,34566=>1000,34567=>1000,34568=>1000,34569=>1000,34570=>1000,34571=>1000,34572=>1000,34573=>1000,34574=>1000,34575=>1000,34576=>1000,34577=>1000,34578=>1000,34579=>1000,34580=>1000,
-	34581=>1000,34582=>1000,34583=>1000,34584=>1000,34585=>1000,34586=>1000,34587=>1000,34588=>1000,34589=>1000,34590=>1000,34591=>1000,34592=>1000,34593=>1000,34594=>1000,34595=>1000,34596=>1000,
-	34597=>1000,34598=>1000,34599=>1000,34600=>1000,34601=>1000,34602=>1000,34603=>1000,34604=>1000,34605=>1000,34606=>1000,34607=>1000,34608=>1000,34609=>1000,34610=>1000,34611=>1000,34612=>1000,
-	34613=>1000,34614=>1000,34615=>1000,34616=>1000,34617=>1000,34618=>1000,34619=>1000,34620=>1000,34621=>1000,34622=>1000,34623=>1000,34624=>1000,34625=>1000,34626=>1000,34627=>1000,34628=>1000,
-	34629=>1000,34630=>1000,34631=>1000,34632=>1000,34633=>1000,34634=>1000,34635=>1000,34636=>1000,34637=>1000,34638=>1000,34639=>1000,34640=>1000,34641=>1000,34642=>1000,34643=>1000,34644=>1000,
-	34645=>1000,34646=>1000,34647=>1000,34648=>1000,34649=>1000,34650=>1000,34651=>1000,34652=>1000,34653=>1000,34654=>1000,34655=>1000,34656=>1000,34657=>1000,34658=>1000,34659=>1000,34660=>1000,
-	34661=>1000,34662=>1000,34663=>1000,34664=>1000,34665=>1000,34666=>1000,34667=>1000,34668=>1000,34669=>1000,34670=>1000,34671=>1000,34672=>1000,34673=>1000,34674=>1000,34675=>1000,34676=>1000,
-	34677=>1000,34678=>1000,34679=>1000,34680=>1000,34681=>1000,34682=>1000,34683=>1000,34684=>1000,34685=>1000,34686=>1000,34687=>1000,34688=>1000,34689=>1000,34690=>1000,34691=>1000,34692=>1000,
-	34693=>1000,34694=>1000,34695=>1000,34696=>1000,34697=>1000,34698=>1000,34699=>1000,34700=>1000,34701=>1000,34702=>1000,34703=>1000,34704=>1000,34705=>1000,34706=>1000,34707=>1000,34708=>1000,
-	34709=>1000,34710=>1000,34711=>1000,34712=>1000,34713=>1000,34714=>1000,34715=>1000,34716=>1000,34717=>1000,34718=>1000,34719=>1000,34720=>1000,34721=>1000,34722=>1000,34723=>1000,34724=>1000,
-	34725=>1000,34726=>1000,34727=>1000,34728=>1000,34729=>1000,34730=>1000,34731=>1000,34732=>1000,34733=>1000,34734=>1000,34735=>1000,34736=>1000,34737=>1000,34738=>1000,34739=>1000,34740=>1000,
-	34741=>1000,34742=>1000,34743=>1000,34744=>1000,34745=>1000,34746=>1000,34747=>1000,34748=>1000,34749=>1000,34750=>1000,34751=>1000,34752=>1000,34753=>1000,34754=>1000,34755=>1000,34756=>1000,
-	34757=>1000,34758=>1000,34759=>1000,34760=>1000,34761=>1000,34762=>1000,34763=>1000,34764=>1000,34765=>1000,34766=>1000,34767=>1000,34768=>1000,34769=>1000,34770=>1000,34771=>1000,34772=>1000,
-	34773=>1000,34774=>1000,34775=>1000,34776=>1000,34777=>1000,34778=>1000,34779=>1000,34780=>1000,34781=>1000,34782=>1000,34783=>1000,34784=>1000,34785=>1000,34786=>1000,34787=>1000,34788=>1000,
-	34789=>1000,34790=>1000,34791=>1000,34792=>1000,34793=>1000,34794=>1000,34795=>1000,34796=>1000,34797=>1000,34798=>1000,34799=>1000,34800=>1000,34801=>1000,34802=>1000,34803=>1000,34804=>1000,
-	34805=>1000,34806=>1000,34807=>1000,34808=>1000,34809=>1000,34810=>1000,34811=>1000,34812=>1000,34813=>1000,34814=>1000,34815=>1000,34816=>1000,34817=>1000,34818=>1000,34819=>1000,34820=>1000,
-	34821=>1000,34822=>1000,34823=>1000,34824=>1000,34825=>1000,34826=>1000,34827=>1000,34828=>1000,34829=>1000,34830=>1000,34831=>1000,34832=>1000,34833=>1000,34834=>1000,34835=>1000,34836=>1000,
-	34837=>1000,34838=>1000,34839=>1000,34840=>1000,34841=>1000,34842=>1000,34843=>1000,34844=>1000,34845=>1000,34846=>1000,34847=>1000,34848=>1000,34849=>1000,34850=>1000,34851=>1000,34852=>1000,
-	34853=>1000,34854=>1000,34855=>1000,34856=>1000,34857=>1000,34858=>1000,34859=>1000,34860=>1000,34861=>1000,34862=>1000,34863=>1000,34864=>1000,34865=>1000,34866=>1000,34867=>1000,34868=>1000,
-	34869=>1000,34870=>1000,34871=>1000,34872=>1000,34873=>1000,34874=>1000,34875=>1000,34876=>1000,34877=>1000,34878=>1000,34879=>1000,34880=>1000,34881=>1000,34882=>1000,34883=>1000,34884=>1000,
-	34885=>1000,34886=>1000,34887=>1000,34888=>1000,34889=>1000,34890=>1000,34891=>1000,34892=>1000,34893=>1000,34894=>1000,34895=>1000,34896=>1000,34897=>1000,34898=>1000,34899=>1000,34900=>1000,
-	34901=>1000,34902=>1000,34903=>1000,34904=>1000,34905=>1000,34906=>1000,34907=>1000,34908=>1000,34909=>1000,34910=>1000,34911=>1000,34912=>1000,34913=>1000,34914=>1000,34915=>1000,34916=>1000,
-	34917=>1000,34918=>1000,34919=>1000,34920=>1000,34921=>1000,34922=>1000,34923=>1000,34924=>1000,34925=>1000,34926=>1000,34927=>1000,34928=>1000,34929=>1000,34930=>1000,34931=>1000,34932=>1000,
-	34933=>1000,34934=>1000,34935=>1000,34936=>1000,34937=>1000,34938=>1000,34939=>1000,34940=>1000,34941=>1000,34942=>1000,34943=>1000,34944=>1000,34945=>1000,34946=>1000,34947=>1000,34948=>1000,
-	34949=>1000,34950=>1000,34951=>1000,34952=>1000,34953=>1000,34954=>1000,34955=>1000,34956=>1000,34957=>1000,34958=>1000,34959=>1000,34960=>1000,34961=>1000,34962=>1000,34963=>1000,34964=>1000,
-	34965=>1000,34966=>1000,34967=>1000,34968=>1000,34969=>1000,34970=>1000,34971=>1000,34972=>1000,34973=>1000,34974=>1000,34975=>1000,34976=>1000,34977=>1000,34978=>1000,34979=>1000,34980=>1000,
-	34981=>1000,34982=>1000,34983=>1000,34984=>1000,34985=>1000,34986=>1000,34987=>1000,34988=>1000,34989=>1000,34990=>1000,34991=>1000,34992=>1000,34993=>1000,34994=>1000,34995=>1000,34996=>1000,
-	34997=>1000,34998=>1000,34999=>1000,35000=>1000,35001=>1000,35002=>1000,35003=>1000,35004=>1000,35005=>1000,35006=>1000,35007=>1000,35008=>1000,35009=>1000,35010=>1000,35011=>1000,35012=>1000,
-	35013=>1000,35014=>1000,35015=>1000,35016=>1000,35017=>1000,35018=>1000,35019=>1000,35020=>1000,35021=>1000,35022=>1000,35023=>1000,35024=>1000,35025=>1000,35026=>1000,35027=>1000,35028=>1000,
-	35029=>1000,35030=>1000,35031=>1000,35032=>1000,35033=>1000,35034=>1000,35035=>1000,35036=>1000,35037=>1000,35038=>1000,35039=>1000,35040=>1000,35041=>1000,35042=>1000,35043=>1000,35044=>1000,
-	35045=>1000,35046=>1000,35047=>1000,35048=>1000,35049=>1000,35050=>1000,35051=>1000,35052=>1000,35053=>1000,35054=>1000,35055=>1000,35056=>1000,35057=>1000,35058=>1000,35059=>1000,35060=>1000,
-	35061=>1000,35062=>1000,35063=>1000,35064=>1000,35065=>1000,35066=>1000,35067=>1000,35068=>1000,35069=>1000,35070=>1000,35071=>1000,35072=>1000,35073=>1000,35074=>1000,35075=>1000,35076=>1000,
-	35077=>1000,35078=>1000,35079=>1000,35080=>1000,35081=>1000,35082=>1000,35083=>1000,35084=>1000,35085=>1000,35086=>1000,35087=>1000,35088=>1000,35089=>1000,35090=>1000,35091=>1000,35092=>1000,
-	35093=>1000,35094=>1000,35095=>1000,35096=>1000,35097=>1000,35098=>1000,35099=>1000,35100=>1000,35101=>1000,35102=>1000,35103=>1000,35104=>1000,35105=>1000,35106=>1000,35107=>1000,35108=>1000,
-	35109=>1000,35110=>1000,35111=>1000,35112=>1000,35113=>1000,35114=>1000,35115=>1000,35116=>1000,35117=>1000,35118=>1000,35119=>1000,35120=>1000,35121=>1000,35122=>1000,35123=>1000,35124=>1000,
-	35125=>1000,35126=>1000,35127=>1000,35128=>1000,35129=>1000,35130=>1000,35131=>1000,35132=>1000,35133=>1000,35134=>1000,35135=>1000,35136=>1000,35137=>1000,35138=>1000,35139=>1000,35140=>1000,
-	35141=>1000,35142=>1000,35143=>1000,35144=>1000,35145=>1000,35146=>1000,35147=>1000,35148=>1000,35149=>1000,35150=>1000,35151=>1000,35152=>1000,35153=>1000,35154=>1000,35155=>1000,35156=>1000,
-	35157=>1000,35158=>1000,35159=>1000,35160=>1000,35161=>1000,35162=>1000,35163=>1000,35164=>1000,35165=>1000,35166=>1000,35167=>1000,35168=>1000,35169=>1000,35170=>1000,35171=>1000,35172=>1000,
-	35173=>1000,35174=>1000,35175=>1000,35176=>1000,35177=>1000,35178=>1000,35179=>1000,35180=>1000,35181=>1000,35182=>1000,35183=>1000,35184=>1000,35185=>1000,35186=>1000,35187=>1000,35188=>1000,
-	35189=>1000,35190=>1000,35191=>1000,35192=>1000,35193=>1000,35194=>1000,35195=>1000,35196=>1000,35197=>1000,35198=>1000,35199=>1000,35200=>1000,35201=>1000,35202=>1000,35203=>1000,35204=>1000,
-	35205=>1000,35206=>1000,35207=>1000,35208=>1000,35209=>1000,35210=>1000,35211=>1000,35212=>1000,35213=>1000,35214=>1000,35215=>1000,35216=>1000,35217=>1000,35218=>1000,35219=>1000,35220=>1000,
-	35221=>1000,35222=>1000,35223=>1000,35224=>1000,35225=>1000,35226=>1000,35227=>1000,35228=>1000,35229=>1000,35230=>1000,35231=>1000,35232=>1000,35233=>1000,35234=>1000,35235=>1000,35236=>1000,
-	35237=>1000,35238=>1000,35239=>1000,35240=>1000,35241=>1000,35242=>1000,35243=>1000,35244=>1000,35245=>1000,35246=>1000,35247=>1000,35248=>1000,35249=>1000,35250=>1000,35251=>1000,35252=>1000,
-	35253=>1000,35254=>1000,35255=>1000,35256=>1000,35257=>1000,35258=>1000,35259=>1000,35260=>1000,35261=>1000,35262=>1000,35263=>1000,35264=>1000,35265=>1000,35266=>1000,35267=>1000,35268=>1000,
-	35269=>1000,35270=>1000,35271=>1000,35272=>1000,35273=>1000,35274=>1000,35275=>1000,35276=>1000,35277=>1000,35278=>1000,35279=>1000,35280=>1000,35281=>1000,35282=>1000,35283=>1000,35284=>1000,
-	35285=>1000,35286=>1000,35287=>1000,35288=>1000,35289=>1000,35290=>1000,35291=>1000,35292=>1000,35293=>1000,35294=>1000,35295=>1000,35296=>1000,35297=>1000,35298=>1000,35299=>1000,35300=>1000,
-	35301=>1000,35302=>1000,35303=>1000,35304=>1000,35305=>1000,35306=>1000,35307=>1000,35308=>1000,35309=>1000,35310=>1000,35311=>1000,35312=>1000,35313=>1000,35314=>1000,35315=>1000,35316=>1000,
-	35317=>1000,35318=>1000,35319=>1000,35320=>1000,35321=>1000,35322=>1000,35323=>1000,35324=>1000,35325=>1000,35326=>1000,35327=>1000,35328=>1000,35329=>1000,35330=>1000,35331=>1000,35332=>1000,
-	35333=>1000,35334=>1000,35335=>1000,35336=>1000,35337=>1000,35338=>1000,35339=>1000,35340=>1000,35341=>1000,35342=>1000,35343=>1000,35344=>1000,35345=>1000,35346=>1000,35347=>1000,35348=>1000,
-	35349=>1000,35350=>1000,35351=>1000,35352=>1000,35353=>1000,35354=>1000,35355=>1000,35356=>1000,35357=>1000,35358=>1000,35359=>1000,35360=>1000,35361=>1000,35362=>1000,35363=>1000,35364=>1000,
-	35365=>1000,35366=>1000,35367=>1000,35368=>1000,35369=>1000,35370=>1000,35371=>1000,35372=>1000,35373=>1000,35374=>1000,35375=>1000,35376=>1000,35377=>1000,35378=>1000,35379=>1000,35380=>1000,
-	35381=>1000,35382=>1000,35383=>1000,35384=>1000,35385=>1000,35386=>1000,35387=>1000,35388=>1000,35389=>1000,35390=>1000,35391=>1000,35392=>1000,35393=>1000,35394=>1000,35395=>1000,35396=>1000,
-	35397=>1000,35398=>1000,35399=>1000,35400=>1000,35401=>1000,35402=>1000,35403=>1000,35404=>1000,35405=>1000,35406=>1000,35407=>1000,35408=>1000,35409=>1000,35410=>1000,35411=>1000,35412=>1000,
-	35413=>1000,35414=>1000,35415=>1000,35416=>1000,35417=>1000,35418=>1000,35419=>1000,35420=>1000,35421=>1000,35422=>1000,35423=>1000,35424=>1000,35425=>1000,35426=>1000,35427=>1000,35428=>1000,
-	35429=>1000,35430=>1000,35431=>1000,35432=>1000,35433=>1000,35434=>1000,35435=>1000,35436=>1000,35437=>1000,35438=>1000,35439=>1000,35440=>1000,35441=>1000,35442=>1000,35443=>1000,35444=>1000,
-	35445=>1000,35446=>1000,35447=>1000,35448=>1000,35449=>1000,35450=>1000,35451=>1000,35452=>1000,35453=>1000,35454=>1000,35455=>1000,35456=>1000,35457=>1000,35458=>1000,35459=>1000,35460=>1000,
-	35461=>1000,35462=>1000,35463=>1000,35464=>1000,35465=>1000,35466=>1000,35467=>1000,35468=>1000,35469=>1000,35470=>1000,35471=>1000,35472=>1000,35473=>1000,35474=>1000,35475=>1000,35476=>1000,
-	35477=>1000,35478=>1000,35479=>1000,35480=>1000,35481=>1000,35482=>1000,35483=>1000,35484=>1000,35485=>1000,35486=>1000,35487=>1000,35488=>1000,35489=>1000,35490=>1000,35491=>1000,35492=>1000,
-	35493=>1000,35494=>1000,35495=>1000,35496=>1000,35497=>1000,35498=>1000,35499=>1000,35500=>1000,35501=>1000,35502=>1000,35503=>1000,35504=>1000,35505=>1000,35506=>1000,35507=>1000,35508=>1000,
-	35509=>1000,35510=>1000,35511=>1000,35512=>1000,35513=>1000,35514=>1000,35515=>1000,35516=>1000,35517=>1000,35518=>1000,35519=>1000,35520=>1000,35521=>1000,35522=>1000,35523=>1000,35524=>1000,
-	35525=>1000,35526=>1000,35527=>1000,35528=>1000,35529=>1000,35530=>1000,35531=>1000,35532=>1000,35533=>1000,35534=>1000,35535=>1000,35536=>1000,35537=>1000,35538=>1000,35539=>1000,35540=>1000,
-	35541=>1000,35542=>1000,35543=>1000,35544=>1000,35545=>1000,35546=>1000,35547=>1000,35548=>1000,35549=>1000,35550=>1000,35551=>1000,35552=>1000,35553=>1000,35554=>1000,35555=>1000,35556=>1000,
-	35557=>1000,35558=>1000,35559=>1000,35560=>1000,35561=>1000,35562=>1000,35563=>1000,35564=>1000,35565=>1000,35566=>1000,35567=>1000,35568=>1000,35569=>1000,35570=>1000,35571=>1000,35572=>1000,
-	35573=>1000,35574=>1000,35575=>1000,35576=>1000,35577=>1000,35578=>1000,35579=>1000,35580=>1000,35581=>1000,35582=>1000,35583=>1000,35584=>1000,35585=>1000,35586=>1000,35587=>1000,35588=>1000,
-	35589=>1000,35590=>1000,35591=>1000,35592=>1000,35593=>1000,35594=>1000,35595=>1000,35596=>1000,35597=>1000,35598=>1000,35599=>1000,35600=>1000,35601=>1000,35602=>1000,35603=>1000,35604=>1000,
-	35605=>1000,35606=>1000,35607=>1000,35608=>1000,35609=>1000,35610=>1000,35611=>1000,35612=>1000,35613=>1000,35614=>1000,35615=>1000,35616=>1000,35617=>1000,35618=>1000,35619=>1000,35620=>1000,
-	35621=>1000,35622=>1000,35623=>1000,35624=>1000,35625=>1000,35626=>1000,35627=>1000,35628=>1000,35629=>1000,35630=>1000,35631=>1000,35632=>1000,35633=>1000,35634=>1000,35635=>1000,35636=>1000,
-	35637=>1000,35638=>1000,35639=>1000,35640=>1000,35641=>1000,35642=>1000,35643=>1000,35644=>1000,35645=>1000,35646=>1000,35647=>1000,35648=>1000,35649=>1000,35650=>1000,35651=>1000,35652=>1000,
-	35653=>1000,35654=>1000,35655=>1000,35656=>1000,35657=>1000,35658=>1000,35659=>1000,35660=>1000,35661=>1000,35662=>1000,35663=>1000,35664=>1000,35665=>1000,35666=>1000,35667=>1000,35668=>1000,
-	35669=>1000,35670=>1000,35671=>1000,35672=>1000,35673=>1000,35674=>1000,35675=>1000,35676=>1000,35677=>1000,35678=>1000,35679=>1000,35680=>1000,35681=>1000,35682=>1000,35683=>1000,35684=>1000,
-	35685=>1000,35686=>1000,35687=>1000,35688=>1000,35689=>1000,35690=>1000,35691=>1000,35692=>1000,35693=>1000,35694=>1000,35695=>1000,35696=>1000,35697=>1000,35698=>1000,35699=>1000,35700=>1000,
-	35701=>1000,35702=>1000,35703=>1000,35704=>1000,35705=>1000,35706=>1000,35707=>1000,35708=>1000,35709=>1000,35710=>1000,35711=>1000,35712=>1000,35713=>1000,35714=>1000,35715=>1000,35716=>1000,
-	35717=>1000,35718=>1000,35719=>1000,35720=>1000,35721=>1000,35722=>1000,35723=>1000,35724=>1000,35725=>1000,35726=>1000,35727=>1000,35728=>1000,35729=>1000,35730=>1000,35731=>1000,35732=>1000,
-	35733=>1000,35734=>1000,35735=>1000,35736=>1000,35737=>1000,35738=>1000,35739=>1000,35740=>1000,35741=>1000,35742=>1000,35743=>1000,35744=>1000,35745=>1000,35746=>1000,35747=>1000,35748=>1000,
-	35749=>1000,35750=>1000,35751=>1000,35752=>1000,35753=>1000,35754=>1000,35755=>1000,35756=>1000,35757=>1000,35758=>1000,35759=>1000,35760=>1000,35761=>1000,35762=>1000,35763=>1000,35764=>1000,
-	35765=>1000,35766=>1000,35767=>1000,35768=>1000,35769=>1000,35770=>1000,35771=>1000,35772=>1000,35773=>1000,35774=>1000,35775=>1000,35776=>1000,35777=>1000,35778=>1000,35779=>1000,35780=>1000,
-	35781=>1000,35782=>1000,35783=>1000,35784=>1000,35785=>1000,35786=>1000,35787=>1000,35788=>1000,35789=>1000,35790=>1000,35791=>1000,35792=>1000,35793=>1000,35794=>1000,35795=>1000,35796=>1000,
-	35797=>1000,35798=>1000,35799=>1000,35800=>1000,35801=>1000,35802=>1000,35803=>1000,35804=>1000,35805=>1000,35806=>1000,35807=>1000,35808=>1000,35809=>1000,35810=>1000,35811=>1000,35812=>1000,
-	35813=>1000,35814=>1000,35815=>1000,35816=>1000,35817=>1000,35818=>1000,35819=>1000,35820=>1000,35821=>1000,35822=>1000,35823=>1000,35824=>1000,35825=>1000,35826=>1000,35827=>1000,35828=>1000,
-	35829=>1000,35830=>1000,35831=>1000,35832=>1000,35833=>1000,35834=>1000,35835=>1000,35836=>1000,35837=>1000,35838=>1000,35839=>1000,35840=>1000,35841=>1000,35842=>1000,35843=>1000,35844=>1000,
-	35845=>1000,35846=>1000,35847=>1000,35848=>1000,35849=>1000,35850=>1000,35851=>1000,35852=>1000,35853=>1000,35854=>1000,35855=>1000,35856=>1000,35857=>1000,35858=>1000,35859=>1000,35860=>1000,
-	35861=>1000,35862=>1000,35863=>1000,35864=>1000,35865=>1000,35866=>1000,35867=>1000,35868=>1000,35869=>1000,35870=>1000,35871=>1000,35872=>1000,35873=>1000,35874=>1000,35875=>1000,35876=>1000,
-	35877=>1000,35878=>1000,35879=>1000,35880=>1000,35881=>1000,35882=>1000,35883=>1000,35884=>1000,35885=>1000,35886=>1000,35887=>1000,35888=>1000,35889=>1000,35890=>1000,35891=>1000,35892=>1000,
-	35893=>1000,35894=>1000,35895=>1000,35896=>1000,35897=>1000,35898=>1000,35899=>1000,35900=>1000,35901=>1000,35902=>1000,35903=>1000,35904=>1000,35905=>1000,35906=>1000,35907=>1000,35908=>1000,
-	35909=>1000,35910=>1000,35911=>1000,35912=>1000,35913=>1000,35914=>1000,35915=>1000,35916=>1000,35917=>1000,35918=>1000,35919=>1000,35920=>1000,35921=>1000,35922=>1000,35923=>1000,35924=>1000,
-	35925=>1000,35926=>1000,35927=>1000,35928=>1000,35929=>1000,35930=>1000,35931=>1000,35932=>1000,35933=>1000,35934=>1000,35935=>1000,35936=>1000,35937=>1000,35938=>1000,35939=>1000,35940=>1000,
-	35941=>1000,35942=>1000,35943=>1000,35944=>1000,35945=>1000,35946=>1000,35947=>1000,35948=>1000,35949=>1000,35950=>1000,35951=>1000,35952=>1000,35953=>1000,35954=>1000,35955=>1000,35956=>1000,
-	35957=>1000,35958=>1000,35959=>1000,35960=>1000,35961=>1000,35962=>1000,35963=>1000,35964=>1000,35965=>1000,35966=>1000,35967=>1000,35968=>1000,35969=>1000,35970=>1000,35971=>1000,35972=>1000,
-	35973=>1000,35974=>1000,35975=>1000,35976=>1000,35977=>1000,35978=>1000,35979=>1000,35980=>1000,35981=>1000,35982=>1000,35983=>1000,35984=>1000,35985=>1000,35986=>1000,35987=>1000,35988=>1000,
-	35989=>1000,35990=>1000,35991=>1000,35992=>1000,35993=>1000,35994=>1000,35995=>1000,35996=>1000,35997=>1000,35998=>1000,35999=>1000,36000=>1000,36001=>1000,36002=>1000,36003=>1000,36004=>1000,
-	36005=>1000,36006=>1000,36007=>1000,36008=>1000,36009=>1000,36010=>1000,36011=>1000,36012=>1000,36013=>1000,36014=>1000,36015=>1000,36016=>1000,36017=>1000,36018=>1000,36019=>1000,36020=>1000,
-	36021=>1000,36022=>1000,36023=>1000,36024=>1000,36025=>1000,36026=>1000,36027=>1000,36028=>1000,36029=>1000,36030=>1000,36031=>1000,36032=>1000,36033=>1000,36034=>1000,36035=>1000,36036=>1000,
-	36037=>1000,36038=>1000,36039=>1000,36040=>1000,36041=>1000,36042=>1000,36043=>1000,36044=>1000,36045=>1000,36046=>1000,36047=>1000,36048=>1000,36049=>1000,36050=>1000,36051=>1000,36052=>1000,
-	36053=>1000,36054=>1000,36055=>1000,36056=>1000,36057=>1000,36058=>1000,36059=>1000,36060=>1000,36061=>1000,36062=>1000,36063=>1000,36064=>1000,36065=>1000,36066=>1000,36067=>1000,36068=>1000,
-	36069=>1000,36070=>1000,36071=>1000,36072=>1000,36073=>1000,36074=>1000,36075=>1000,36076=>1000,36077=>1000,36078=>1000,36079=>1000,36080=>1000,36081=>1000,36082=>1000,36083=>1000,36084=>1000,
-	36085=>1000,36086=>1000,36087=>1000,36088=>1000,36089=>1000,36090=>1000,36091=>1000,36092=>1000,36093=>1000,36094=>1000,36095=>1000,36096=>1000,36097=>1000,36098=>1000,36099=>1000,36100=>1000,
-	36101=>1000,36102=>1000,36103=>1000,36104=>1000,36105=>1000,36106=>1000,36107=>1000,36108=>1000,36109=>1000,36110=>1000,36111=>1000,36112=>1000,36113=>1000,36114=>1000,36115=>1000,36116=>1000,
-	36117=>1000,36118=>1000,36119=>1000,36120=>1000,36121=>1000,36122=>1000,36123=>1000,36124=>1000,36125=>1000,36126=>1000,36127=>1000,36128=>1000,36129=>1000,36130=>1000,36131=>1000,36132=>1000,
-	36133=>1000,36134=>1000,36135=>1000,36136=>1000,36137=>1000,36138=>1000,36139=>1000,36140=>1000,36141=>1000,36142=>1000,36143=>1000,36144=>1000,36145=>1000,36146=>1000,36147=>1000,36148=>1000,
-	36149=>1000,36150=>1000,36151=>1000,36152=>1000,36153=>1000,36154=>1000,36155=>1000,36156=>1000,36157=>1000,36158=>1000,36159=>1000,36160=>1000,36161=>1000,36162=>1000,36163=>1000,36164=>1000,
-	36165=>1000,36166=>1000,36167=>1000,36168=>1000,36169=>1000,36170=>1000,36171=>1000,36172=>1000,36173=>1000,36174=>1000,36175=>1000,36176=>1000,36177=>1000,36178=>1000,36179=>1000,36180=>1000,
-	36181=>1000,36182=>1000,36183=>1000,36184=>1000,36185=>1000,36186=>1000,36187=>1000,36188=>1000,36189=>1000,36190=>1000,36191=>1000,36192=>1000,36193=>1000,36194=>1000,36195=>1000,36196=>1000,
-	36197=>1000,36198=>1000,36199=>1000,36200=>1000,36201=>1000,36202=>1000,36203=>1000,36204=>1000,36205=>1000,36206=>1000,36207=>1000,36208=>1000,36209=>1000,36210=>1000,36211=>1000,36212=>1000,
-	36213=>1000,36214=>1000,36215=>1000,36216=>1000,36217=>1000,36218=>1000,36219=>1000,36220=>1000,36221=>1000,36222=>1000,36223=>1000,36224=>1000,36225=>1000,36226=>1000,36227=>1000,36228=>1000,
-	36229=>1000,36230=>1000,36231=>1000,36232=>1000,36233=>1000,36234=>1000,36235=>1000,36236=>1000,36237=>1000,36238=>1000,36239=>1000,36240=>1000,36241=>1000,36242=>1000,36243=>1000,36244=>1000,
-	36245=>1000,36246=>1000,36247=>1000,36248=>1000,36249=>1000,36250=>1000,36251=>1000,36252=>1000,36253=>1000,36254=>1000,36255=>1000,36256=>1000,36257=>1000,36258=>1000,36259=>1000,36260=>1000,
-	36261=>1000,36262=>1000,36263=>1000,36264=>1000,36265=>1000,36266=>1000,36267=>1000,36268=>1000,36269=>1000,36270=>1000,36271=>1000,36272=>1000,36273=>1000,36274=>1000,36275=>1000,36276=>1000,
-	36277=>1000,36278=>1000,36279=>1000,36280=>1000,36281=>1000,36282=>1000,36283=>1000,36284=>1000,36285=>1000,36286=>1000,36287=>1000,36288=>1000,36289=>1000,36290=>1000,36291=>1000,36292=>1000,
-	36293=>1000,36294=>1000,36295=>1000,36296=>1000,36297=>1000,36298=>1000,36299=>1000,36300=>1000,36301=>1000,36302=>1000,36303=>1000,36304=>1000,36305=>1000,36306=>1000,36307=>1000,36308=>1000,
-	36309=>1000,36310=>1000,36311=>1000,36312=>1000,36313=>1000,36314=>1000,36315=>1000,36316=>1000,36317=>1000,36318=>1000,36319=>1000,36320=>1000,36321=>1000,36322=>1000,36323=>1000,36324=>1000,
-	36325=>1000,36326=>1000,36327=>1000,36328=>1000,36329=>1000,36330=>1000,36331=>1000,36332=>1000,36333=>1000,36334=>1000,36335=>1000,36336=>1000,36337=>1000,36338=>1000,36339=>1000,36340=>1000,
-	36341=>1000,36342=>1000,36343=>1000,36344=>1000,36345=>1000,36346=>1000,36347=>1000,36348=>1000,36349=>1000,36350=>1000,36351=>1000,36352=>1000,36353=>1000,36354=>1000,36355=>1000,36356=>1000,
-	36357=>1000,36358=>1000,36359=>1000,36360=>1000,36361=>1000,36362=>1000,36363=>1000,36364=>1000,36365=>1000,36366=>1000,36367=>1000,36368=>1000,36369=>1000,36370=>1000,36371=>1000,36372=>1000,
-	36373=>1000,36374=>1000,36375=>1000,36376=>1000,36377=>1000,36378=>1000,36379=>1000,36380=>1000,36381=>1000,36382=>1000,36383=>1000,36384=>1000,36385=>1000,36386=>1000,36387=>1000,36388=>1000,
-	36389=>1000,36390=>1000,36391=>1000,36392=>1000,36393=>1000,36394=>1000,36395=>1000,36396=>1000,36397=>1000,36398=>1000,36399=>1000,36400=>1000,36401=>1000,36402=>1000,36403=>1000,36404=>1000,
-	36405=>1000,36406=>1000,36407=>1000,36408=>1000,36409=>1000,36410=>1000,36411=>1000,36412=>1000,36413=>1000,36414=>1000,36415=>1000,36416=>1000,36417=>1000,36418=>1000,36419=>1000,36420=>1000,
-	36421=>1000,36422=>1000,36423=>1000,36424=>1000,36425=>1000,36426=>1000,36427=>1000,36428=>1000,36429=>1000,36430=>1000,36431=>1000,36432=>1000,36433=>1000,36434=>1000,36435=>1000,36436=>1000,
-	36437=>1000,36438=>1000,36439=>1000,36440=>1000,36441=>1000,36442=>1000,36443=>1000,36444=>1000,36445=>1000,36446=>1000,36447=>1000,36448=>1000,36449=>1000,36450=>1000,36451=>1000,36452=>1000,
-	36453=>1000,36454=>1000,36455=>1000,36456=>1000,36457=>1000,36458=>1000,36459=>1000,36460=>1000,36461=>1000,36462=>1000,36463=>1000,36464=>1000,36465=>1000,36466=>1000,36467=>1000,36468=>1000,
-	36469=>1000,36470=>1000,36471=>1000,36472=>1000,36473=>1000,36474=>1000,36475=>1000,36476=>1000,36477=>1000,36478=>1000,36479=>1000,36480=>1000,36481=>1000,36482=>1000,36483=>1000,36484=>1000,
-	36485=>1000,36486=>1000,36487=>1000,36488=>1000,36489=>1000,36490=>1000,36491=>1000,36492=>1000,36493=>1000,36494=>1000,36495=>1000,36496=>1000,36497=>1000,36498=>1000,36499=>1000,36500=>1000,
-	36501=>1000,36502=>1000,36503=>1000,36504=>1000,36505=>1000,36506=>1000,36507=>1000,36508=>1000,36509=>1000,36510=>1000,36511=>1000,36512=>1000,36513=>1000,36514=>1000,36515=>1000,36516=>1000,
-	36517=>1000,36518=>1000,36519=>1000,36520=>1000,36521=>1000,36522=>1000,36523=>1000,36524=>1000,36525=>1000,36526=>1000,36527=>1000,36528=>1000,36529=>1000,36530=>1000,36531=>1000,36532=>1000,
-	36533=>1000,36534=>1000,36535=>1000,36536=>1000,36537=>1000,36538=>1000,36539=>1000,36540=>1000,36541=>1000,36542=>1000,36543=>1000,36544=>1000,36545=>1000,36546=>1000,36547=>1000,36548=>1000,
-	36549=>1000,36550=>1000,36551=>1000,36552=>1000,36553=>1000,36554=>1000,36555=>1000,36556=>1000,36557=>1000,36558=>1000,36559=>1000,36560=>1000,36561=>1000,36562=>1000,36563=>1000,36564=>1000,
-	36565=>1000,36566=>1000,36567=>1000,36568=>1000,36569=>1000,36570=>1000,36571=>1000,36572=>1000,36573=>1000,36574=>1000,36575=>1000,36576=>1000,36577=>1000,36578=>1000,36579=>1000,36580=>1000,
-	36581=>1000,36582=>1000,36583=>1000,36584=>1000,36585=>1000,36586=>1000,36587=>1000,36588=>1000,36589=>1000,36590=>1000,36591=>1000,36592=>1000,36593=>1000,36594=>1000,36595=>1000,36596=>1000,
-	36597=>1000,36598=>1000,36599=>1000,36600=>1000,36601=>1000,36602=>1000,36603=>1000,36604=>1000,36605=>1000,36606=>1000,36607=>1000,36608=>1000,36609=>1000,36610=>1000,36611=>1000,36612=>1000,
-	36613=>1000,36614=>1000,36615=>1000,36616=>1000,36617=>1000,36618=>1000,36619=>1000,36620=>1000,36621=>1000,36622=>1000,36623=>1000,36624=>1000,36625=>1000,36626=>1000,36627=>1000,36628=>1000,
-	36629=>1000,36630=>1000,36631=>1000,36632=>1000,36633=>1000,36634=>1000,36635=>1000,36636=>1000,36637=>1000,36638=>1000,36639=>1000,36640=>1000,36641=>1000,36642=>1000,36643=>1000,36644=>1000,
-	36645=>1000,36646=>1000,36647=>1000,36648=>1000,36649=>1000,36650=>1000,36651=>1000,36652=>1000,36653=>1000,36654=>1000,36655=>1000,36656=>1000,36657=>1000,36658=>1000,36659=>1000,36660=>1000,
-	36661=>1000,36662=>1000,36663=>1000,36664=>1000,36665=>1000,36666=>1000,36667=>1000,36668=>1000,36669=>1000,36670=>1000,36671=>1000,36672=>1000,36673=>1000,36674=>1000,36675=>1000,36676=>1000,
-	36677=>1000,36678=>1000,36679=>1000,36680=>1000,36681=>1000,36682=>1000,36683=>1000,36684=>1000,36685=>1000,36686=>1000,36687=>1000,36688=>1000,36689=>1000,36690=>1000,36691=>1000,36692=>1000,
-	36693=>1000,36694=>1000,36695=>1000,36696=>1000,36697=>1000,36698=>1000,36699=>1000,36700=>1000,36701=>1000,36702=>1000,36703=>1000,36704=>1000,36705=>1000,36706=>1000,36707=>1000,36708=>1000,
-	36709=>1000,36710=>1000,36711=>1000,36712=>1000,36713=>1000,36714=>1000,36715=>1000,36716=>1000,36717=>1000,36718=>1000,36719=>1000,36720=>1000,36721=>1000,36722=>1000,36723=>1000,36724=>1000,
-	36725=>1000,36726=>1000,36727=>1000,36728=>1000,36729=>1000,36730=>1000,36731=>1000,36732=>1000,36733=>1000,36734=>1000,36735=>1000,36736=>1000,36737=>1000,36738=>1000,36739=>1000,36740=>1000,
-	36741=>1000,36742=>1000,36743=>1000,36744=>1000,36745=>1000,36746=>1000,36747=>1000,36748=>1000,36749=>1000,36750=>1000,36751=>1000,36752=>1000,36753=>1000,36754=>1000,36755=>1000,36756=>1000,
-	36757=>1000,36758=>1000,36759=>1000,36760=>1000,36761=>1000,36762=>1000,36763=>1000,36764=>1000,36765=>1000,36766=>1000,36767=>1000,36768=>1000,36769=>1000,36770=>1000,36771=>1000,36772=>1000,
-	36773=>1000,36774=>1000,36775=>1000,36776=>1000,36777=>1000,36778=>1000,36779=>1000,36780=>1000,36781=>1000,36782=>1000,36783=>1000,36784=>1000,36785=>1000,36786=>1000,36787=>1000,36788=>1000,
-	36789=>1000,36790=>1000,36791=>1000,36792=>1000,36793=>1000,36794=>1000,36795=>1000,36796=>1000,36797=>1000,36798=>1000,36799=>1000,36800=>1000,36801=>1000,36802=>1000,36803=>1000,36804=>1000,
-	36805=>1000,36806=>1000,36807=>1000,36808=>1000,36809=>1000,36810=>1000,36811=>1000,36812=>1000,36813=>1000,36814=>1000,36815=>1000,36816=>1000,36817=>1000,36818=>1000,36819=>1000,36820=>1000,
-	36821=>1000,36822=>1000,36823=>1000,36824=>1000,36825=>1000,36826=>1000,36827=>1000,36828=>1000,36829=>1000,36830=>1000,36831=>1000,36832=>1000,36833=>1000,36834=>1000,36835=>1000,36836=>1000,
-	36837=>1000,36838=>1000,36839=>1000,36840=>1000,36841=>1000,36842=>1000,36843=>1000,36844=>1000,36845=>1000,36846=>1000,36847=>1000,36848=>1000,36849=>1000,36850=>1000,36851=>1000,36852=>1000,
-	36853=>1000,36854=>1000,36855=>1000,36856=>1000,36857=>1000,36858=>1000,36859=>1000,36860=>1000,36861=>1000,36862=>1000,36863=>1000,36864=>1000,36865=>1000,36866=>1000,36867=>1000,36868=>1000,
-	36869=>1000,36870=>1000,36871=>1000,36872=>1000,36873=>1000,36874=>1000,36875=>1000,36876=>1000,36877=>1000,36878=>1000,36879=>1000,36880=>1000,36881=>1000,36882=>1000,36883=>1000,36884=>1000,
-	36885=>1000,36886=>1000,36887=>1000,36888=>1000,36889=>1000,36890=>1000,36891=>1000,36892=>1000,36893=>1000,36894=>1000,36895=>1000,36896=>1000,36897=>1000,36898=>1000,36899=>1000,36900=>1000,
-	36901=>1000,36902=>1000,36903=>1000,36904=>1000,36905=>1000,36906=>1000,36907=>1000,36908=>1000,36909=>1000,36910=>1000,36911=>1000,36912=>1000,36913=>1000,36914=>1000,36915=>1000,36916=>1000,
-	36917=>1000,36918=>1000,36919=>1000,36920=>1000,36921=>1000,36922=>1000,36923=>1000,36924=>1000,36925=>1000,36926=>1000,36927=>1000,36928=>1000,36929=>1000,36930=>1000,36931=>1000,36932=>1000,
-	36933=>1000,36934=>1000,36935=>1000,36936=>1000,36937=>1000,36938=>1000,36939=>1000,36940=>1000,36941=>1000,36942=>1000,36943=>1000,36944=>1000,36945=>1000,36946=>1000,36947=>1000,36948=>1000,
-	36949=>1000,36950=>1000,36951=>1000,36952=>1000,36953=>1000,36954=>1000,36955=>1000,36956=>1000,36957=>1000,36958=>1000,36959=>1000,36960=>1000,36961=>1000,36962=>1000,36963=>1000,36964=>1000,
-	36965=>1000,36966=>1000,36967=>1000,36968=>1000,36969=>1000,36970=>1000,36971=>1000,36972=>1000,36973=>1000,36974=>1000,36975=>1000,36976=>1000,36977=>1000,36978=>1000,36979=>1000,36980=>1000,
-	36981=>1000,36982=>1000,36983=>1000,36984=>1000,36985=>1000,36986=>1000,36987=>1000,36988=>1000,36989=>1000,36990=>1000,36991=>1000,36992=>1000,36993=>1000,36994=>1000,36995=>1000,36996=>1000,
-	36997=>1000,36998=>1000,36999=>1000,37000=>1000,37001=>1000,37002=>1000,37003=>1000,37004=>1000,37005=>1000,37006=>1000,37007=>1000,37008=>1000,37009=>1000,37010=>1000,37011=>1000,37012=>1000,
-	37013=>1000,37014=>1000,37015=>1000,37016=>1000,37017=>1000,37018=>1000,37019=>1000,37020=>1000,37021=>1000,37022=>1000,37023=>1000,37024=>1000,37025=>1000,37026=>1000,37027=>1000,37028=>1000,
-	37029=>1000,37030=>1000,37031=>1000,37032=>1000,37033=>1000,37034=>1000,37035=>1000,37036=>1000,37037=>1000,37038=>1000,37039=>1000,37040=>1000,37041=>1000,37042=>1000,37043=>1000,37044=>1000,
-	37045=>1000,37046=>1000,37047=>1000,37048=>1000,37049=>1000,37050=>1000,37051=>1000,37052=>1000,37053=>1000,37054=>1000,37055=>1000,37056=>1000,37057=>1000,37058=>1000,37059=>1000,37060=>1000,
-	37061=>1000,37062=>1000,37063=>1000,37064=>1000,37065=>1000,37066=>1000,37067=>1000,37068=>1000,37069=>1000,37070=>1000,37071=>1000,37072=>1000,37073=>1000,37074=>1000,37075=>1000,37076=>1000,
-	37077=>1000,37078=>1000,37079=>1000,37080=>1000,37081=>1000,37082=>1000,37083=>1000,37084=>1000,37085=>1000,37086=>1000,37087=>1000,37088=>1000,37089=>1000,37090=>1000,37091=>1000,37092=>1000,
-	37093=>1000,37094=>1000,37095=>1000,37096=>1000,37097=>1000,37098=>1000,37099=>1000,37100=>1000,37101=>1000,37102=>1000,37103=>1000,37104=>1000,37105=>1000,37106=>1000,37107=>1000,37108=>1000,
-	37109=>1000,37110=>1000,37111=>1000,37112=>1000,37113=>1000,37114=>1000,37115=>1000,37116=>1000,37117=>1000,37118=>1000,37119=>1000,37120=>1000,37121=>1000,37122=>1000,37123=>1000,37124=>1000,
-	37125=>1000,37126=>1000,37127=>1000,37128=>1000,37129=>1000,37130=>1000,37131=>1000,37132=>1000,37133=>1000,37134=>1000,37135=>1000,37136=>1000,37137=>1000,37138=>1000,37139=>1000,37140=>1000,
-	37141=>1000,37142=>1000,37143=>1000,37144=>1000,37145=>1000,37146=>1000,37147=>1000,37148=>1000,37149=>1000,37150=>1000,37151=>1000,37152=>1000,37153=>1000,37154=>1000,37155=>1000,37156=>1000,
-	37157=>1000,37158=>1000,37159=>1000,37160=>1000,37161=>1000,37162=>1000,37163=>1000,37164=>1000,37165=>1000,37166=>1000,37167=>1000,37168=>1000,37169=>1000,37170=>1000,37171=>1000,37172=>1000,
-	37173=>1000,37174=>1000,37175=>1000,37176=>1000,37177=>1000,37178=>1000,37179=>1000,37180=>1000,37181=>1000,37182=>1000,37183=>1000,37184=>1000,37185=>1000,37186=>1000,37187=>1000,37188=>1000,
-	37189=>1000,37190=>1000,37191=>1000,37192=>1000,37193=>1000,37194=>1000,37195=>1000,37196=>1000,37197=>1000,37198=>1000,37199=>1000,37200=>1000,37201=>1000,37202=>1000,37203=>1000,37204=>1000,
-	37205=>1000,37206=>1000,37207=>1000,37208=>1000,37209=>1000,37210=>1000,37211=>1000,37212=>1000,37213=>1000,37214=>1000,37215=>1000,37216=>1000,37217=>1000,37218=>1000,37219=>1000,37220=>1000,
-	37221=>1000,37222=>1000,37223=>1000,37224=>1000,37225=>1000,37226=>1000,37227=>1000,37228=>1000,37229=>1000,37230=>1000,37231=>1000,37232=>1000,37233=>1000,37234=>1000,37235=>1000,37236=>1000,
-	37237=>1000,37238=>1000,37239=>1000,37240=>1000,37241=>1000,37242=>1000,37243=>1000,37244=>1000,37245=>1000,37246=>1000,37247=>1000,37248=>1000,37249=>1000,37250=>1000,37251=>1000,37252=>1000,
-	37253=>1000,37254=>1000,37255=>1000,37256=>1000,37257=>1000,37258=>1000,37259=>1000,37260=>1000,37261=>1000,37262=>1000,37263=>1000,37264=>1000,37265=>1000,37266=>1000,37267=>1000,37268=>1000,
-	37269=>1000,37270=>1000,37271=>1000,37272=>1000,37273=>1000,37274=>1000,37275=>1000,37276=>1000,37277=>1000,37278=>1000,37279=>1000,37280=>1000,37281=>1000,37282=>1000,37283=>1000,37284=>1000,
-	37285=>1000,37286=>1000,37287=>1000,37288=>1000,37289=>1000,37290=>1000,37291=>1000,37292=>1000,37293=>1000,37294=>1000,37295=>1000,37296=>1000,37297=>1000,37298=>1000,37299=>1000,37300=>1000,
-	37301=>1000,37302=>1000,37303=>1000,37304=>1000,37305=>1000,37306=>1000,37307=>1000,37308=>1000,37309=>1000,37310=>1000,37311=>1000,37312=>1000,37313=>1000,37314=>1000,37315=>1000,37316=>1000,
-	37317=>1000,37318=>1000,37319=>1000,37320=>1000,37321=>1000,37322=>1000,37323=>1000,37324=>1000,37325=>1000,37326=>1000,37327=>1000,37328=>1000,37329=>1000,37330=>1000,37331=>1000,37332=>1000,
-	37333=>1000,37334=>1000,37335=>1000,37336=>1000,37337=>1000,37338=>1000,37339=>1000,37340=>1000,37341=>1000,37342=>1000,37343=>1000,37344=>1000,37345=>1000,37346=>1000,37347=>1000,37348=>1000,
-	37349=>1000,37350=>1000,37351=>1000,37352=>1000,37353=>1000,37354=>1000,37355=>1000,37356=>1000,37357=>1000,37358=>1000,37359=>1000,37360=>1000,37361=>1000,37362=>1000,37363=>1000,37364=>1000,
-	37365=>1000,37366=>1000,37367=>1000,37368=>1000,37369=>1000,37370=>1000,37371=>1000,37372=>1000,37373=>1000,37374=>1000,37375=>1000,37376=>1000,37377=>1000,37378=>1000,37379=>1000,37380=>1000,
-	37381=>1000,37382=>1000,37383=>1000,37384=>1000,37385=>1000,37386=>1000,37387=>1000,37388=>1000,37389=>1000,37390=>1000,37391=>1000,37392=>1000,37393=>1000,37394=>1000,37395=>1000,37396=>1000,
-	37397=>1000,37398=>1000,37399=>1000,37400=>1000,37401=>1000,37402=>1000,37403=>1000,37404=>1000,37405=>1000,37406=>1000,37407=>1000,37408=>1000,37409=>1000,37410=>1000,37411=>1000,37412=>1000,
-	37413=>1000,37414=>1000,37415=>1000,37416=>1000,37417=>1000,37418=>1000,37419=>1000,37420=>1000,37421=>1000,37422=>1000,37423=>1000,37424=>1000,37425=>1000,37426=>1000,37427=>1000,37428=>1000,
-	37429=>1000,37430=>1000,37431=>1000,37432=>1000,37433=>1000,37434=>1000,37435=>1000,37436=>1000,37437=>1000,37438=>1000,37439=>1000,37440=>1000,37441=>1000,37442=>1000,37443=>1000,37444=>1000,
-	37445=>1000,37446=>1000,37447=>1000,37448=>1000,37449=>1000,37450=>1000,37451=>1000,37452=>1000,37453=>1000,37454=>1000,37455=>1000,37456=>1000,37457=>1000,37458=>1000,37459=>1000,37460=>1000,
-	37461=>1000,37462=>1000,37463=>1000,37464=>1000,37465=>1000,37466=>1000,37467=>1000,37468=>1000,37469=>1000,37470=>1000,37471=>1000,37472=>1000,37473=>1000,37474=>1000,37475=>1000,37476=>1000,
-	37477=>1000,37478=>1000,37479=>1000,37480=>1000,37481=>1000,37482=>1000,37483=>1000,37484=>1000,37485=>1000,37486=>1000,37487=>1000,37488=>1000,37489=>1000,37490=>1000,37491=>1000,37492=>1000,
-	37493=>1000,37494=>1000,37495=>1000,37496=>1000,37497=>1000,37498=>1000,37499=>1000,37500=>1000,37501=>1000,37502=>1000,37503=>1000,37504=>1000,37505=>1000,37506=>1000,37507=>1000,37508=>1000,
-	37509=>1000,37510=>1000,37511=>1000,37512=>1000,37513=>1000,37514=>1000,37515=>1000,37516=>1000,37517=>1000,37518=>1000,37519=>1000,37520=>1000,37521=>1000,37522=>1000,37523=>1000,37524=>1000,
-	37525=>1000,37526=>1000,37527=>1000,37528=>1000,37529=>1000,37530=>1000,37531=>1000,37532=>1000,37533=>1000,37534=>1000,37535=>1000,37536=>1000,37537=>1000,37538=>1000,37539=>1000,37540=>1000,
-	37541=>1000,37542=>1000,37543=>1000,37544=>1000,37545=>1000,37546=>1000,37547=>1000,37548=>1000,37549=>1000,37550=>1000,37551=>1000,37552=>1000,37553=>1000,37554=>1000,37555=>1000,37556=>1000,
-	37557=>1000,37558=>1000,37559=>1000,37560=>1000,37561=>1000,37562=>1000,37563=>1000,37564=>1000,37565=>1000,37566=>1000,37567=>1000,37568=>1000,37569=>1000,37570=>1000,37571=>1000,37572=>1000,
-	37573=>1000,37574=>1000,37575=>1000,37576=>1000,37577=>1000,37578=>1000,37579=>1000,37580=>1000,37581=>1000,37582=>1000,37583=>1000,37584=>1000,37585=>1000,37586=>1000,37587=>1000,37588=>1000,
-	37589=>1000,37590=>1000,37591=>1000,37592=>1000,37593=>1000,37594=>1000,37595=>1000,37596=>1000,37597=>1000,37598=>1000,37599=>1000,37600=>1000,37601=>1000,37602=>1000,37603=>1000,37604=>1000,
-	37605=>1000,37606=>1000,37607=>1000,37608=>1000,37609=>1000,37610=>1000,37611=>1000,37612=>1000,37613=>1000,37614=>1000,37615=>1000,37616=>1000,37617=>1000,37618=>1000,37619=>1000,37620=>1000,
-	37621=>1000,37622=>1000,37623=>1000,37624=>1000,37625=>1000,37626=>1000,37627=>1000,37628=>1000,37629=>1000,37630=>1000,37631=>1000,37632=>1000,37633=>1000,37634=>1000,37635=>1000,37636=>1000,
-	37637=>1000,37638=>1000,37639=>1000,37640=>1000,37641=>1000,37642=>1000,37643=>1000,37644=>1000,37645=>1000,37646=>1000,37647=>1000,37648=>1000,37649=>1000,37650=>1000,37651=>1000,37652=>1000,
-	37653=>1000,37654=>1000,37655=>1000,37656=>1000,37657=>1000,37658=>1000,37659=>1000,37660=>1000,37661=>1000,37662=>1000,37663=>1000,37664=>1000,37665=>1000,37666=>1000,37667=>1000,37668=>1000,
-	37669=>1000,37670=>1000,37671=>1000,37672=>1000,37673=>1000,37674=>1000,37675=>1000,37676=>1000,37677=>1000,37678=>1000,37679=>1000,37680=>1000,37681=>1000,37682=>1000,37683=>1000,37684=>1000,
-	37685=>1000,37686=>1000,37687=>1000,37688=>1000,37689=>1000,37690=>1000,37691=>1000,37692=>1000,37693=>1000,37694=>1000,37695=>1000,37696=>1000,37697=>1000,37698=>1000,37699=>1000,37700=>1000,
-	37701=>1000,37702=>1000,37703=>1000,37704=>1000,37705=>1000,37706=>1000,37707=>1000,37708=>1000,37709=>1000,37710=>1000,37711=>1000,37712=>1000,37713=>1000,37714=>1000,37715=>1000,37716=>1000,
-	37717=>1000,37718=>1000,37719=>1000,37720=>1000,37721=>1000,37722=>1000,37723=>1000,37724=>1000,37725=>1000,37726=>1000,37727=>1000,37728=>1000,37729=>1000,37730=>1000,37731=>1000,37732=>1000,
-	37733=>1000,37734=>1000,37735=>1000,37736=>1000,37737=>1000,37738=>1000,37739=>1000,37740=>1000,37741=>1000,37742=>1000,37743=>1000,37744=>1000,37745=>1000,37746=>1000,37747=>1000,37748=>1000,
-	37749=>1000,37750=>1000,37751=>1000,37752=>1000,37753=>1000,37754=>1000,37755=>1000,37756=>1000,37757=>1000,37758=>1000,37759=>1000,37760=>1000,37761=>1000,37762=>1000,37763=>1000,37764=>1000,
-	37765=>1000,37766=>1000,37767=>1000,37768=>1000,37769=>1000,37770=>1000,37771=>1000,37772=>1000,37773=>1000,37774=>1000,37775=>1000,37776=>1000,37777=>1000,37778=>1000,37779=>1000,37780=>1000,
-	37781=>1000,37782=>1000,37783=>1000,37784=>1000,37785=>1000,37786=>1000,37787=>1000,37788=>1000,37789=>1000,37790=>1000,37791=>1000,37792=>1000,37793=>1000,37794=>1000,37795=>1000,37796=>1000,
-	37797=>1000,37798=>1000,37799=>1000,37800=>1000,37801=>1000,37802=>1000,37803=>1000,37804=>1000,37805=>1000,37806=>1000,37807=>1000,37808=>1000,37809=>1000,37810=>1000,37811=>1000,37812=>1000,
-	37813=>1000,37814=>1000,37815=>1000,37816=>1000,37817=>1000,37818=>1000,37819=>1000,37820=>1000,37821=>1000,37822=>1000,37823=>1000,37824=>1000,37825=>1000,37826=>1000,37827=>1000,37828=>1000,
-	37829=>1000,37830=>1000,37831=>1000,37832=>1000,37833=>1000,37834=>1000,37835=>1000,37836=>1000,37837=>1000,37838=>1000,37839=>1000,37840=>1000,37841=>1000,37842=>1000,37843=>1000,37844=>1000,
-	37845=>1000,37846=>1000,37847=>1000,37848=>1000,37849=>1000,37850=>1000,37851=>1000,37852=>1000,37853=>1000,37854=>1000,37855=>1000,37856=>1000,37857=>1000,37858=>1000,37859=>1000,37860=>1000,
-	37861=>1000,37862=>1000,37863=>1000,37864=>1000,37865=>1000,37866=>1000,37867=>1000,37868=>1000,37869=>1000,37870=>1000,37871=>1000,37872=>1000,37873=>1000,37874=>1000,37875=>1000,37876=>1000,
-	37877=>1000,37878=>1000,37879=>1000,37880=>1000,37881=>1000,37882=>1000,37883=>1000,37884=>1000,37885=>1000,37886=>1000,37887=>1000,37888=>1000,37889=>1000,37890=>1000,37891=>1000,37892=>1000,
-	37893=>1000,37894=>1000,37895=>1000,37896=>1000,37897=>1000,37898=>1000,37899=>1000,37900=>1000,37901=>1000,37902=>1000,37903=>1000,37904=>1000,37905=>1000,37906=>1000,37907=>1000,37908=>1000,
-	37909=>1000,37910=>1000,37911=>1000,37912=>1000,37913=>1000,37914=>1000,37915=>1000,37916=>1000,37917=>1000,37918=>1000,37919=>1000,37920=>1000,37921=>1000,37922=>1000,37923=>1000,37924=>1000,
-	37925=>1000,37926=>1000,37927=>998,37928=>1000,37929=>1000,37930=>1000,37931=>1000,37932=>1000,37933=>1000,37934=>1000,37935=>1000,37936=>1000,37937=>1000,37938=>1000,37939=>1000,37940=>1000,
-	37941=>1000,37942=>1000,37943=>1000,37944=>1000,37945=>1000,37946=>1000,37947=>1000,37948=>1000,37949=>1000,37950=>1000,37951=>1000,37952=>1000,37953=>1000,37954=>1000,37955=>1000,37956=>1000,
-	37957=>1000,37958=>1000,37959=>1000,37960=>1000,37961=>1000,37962=>1000,37963=>1000,37964=>1000,37965=>1000,37966=>1000,37967=>1000,37968=>1000,37969=>1000,37970=>1000,37971=>1000,37972=>1000,
-	37973=>1000,37974=>1000,37975=>1000,37976=>1000,37977=>1000,37978=>1000,37979=>1000,37980=>1000,37981=>1000,37982=>1000,37983=>1000,37984=>1000,37985=>1000,37986=>1000,37987=>1000,37988=>1000,
-	37989=>1000,37990=>1000,37991=>1000,37992=>1000,37993=>1000,37994=>1000,37995=>1000,37996=>1000,37997=>1000,37998=>1000,37999=>1000,38000=>1000,38001=>1000,38002=>1000,38003=>1000,38004=>1000,
-	38005=>1000,38006=>1000,38007=>1000,38008=>1000,38009=>1000,38010=>1000,38011=>1000,38012=>1000,38013=>1000,38014=>1000,38015=>1000,38016=>1000,38017=>1000,38018=>1000,38019=>1000,38020=>1000,
-	38021=>1000,38022=>1000,38023=>1000,38024=>1000,38025=>1000,38026=>1000,38027=>1000,38028=>1000,38029=>1000,38030=>1000,38031=>1000,38032=>1000,38033=>1000,38034=>1000,38035=>1000,38036=>1000,
-	38037=>1000,38038=>1000,38039=>1000,38040=>1000,38041=>1000,38042=>1000,38043=>1000,38044=>1000,38045=>1000,38046=>1000,38047=>1000,38048=>1000,38049=>1000,38050=>1000,38051=>1000,38052=>1000,
-	38053=>1000,38054=>1000,38055=>1000,38056=>1000,38057=>1000,38058=>1000,38059=>1000,38060=>1000,38061=>1000,38062=>1000,38063=>1000,38064=>1000,38065=>1000,38066=>1000,38067=>1000,38068=>1000,
-	38069=>1000,38070=>1000,38071=>1000,38072=>1000,38073=>1000,38074=>1000,38075=>1000,38076=>1000,38077=>1000,38078=>1000,38079=>1000,38080=>1000,38081=>1000,38082=>1000,38083=>1000,38084=>1000,
-	38085=>1000,38086=>1000,38087=>1000,38088=>1000,38089=>1000,38090=>1000,38091=>1000,38092=>1000,38093=>1000,38094=>1000,38095=>1000,38096=>1000,38097=>1000,38098=>1000,38099=>1000,38100=>1000,
-	38101=>1000,38102=>1000,38103=>1000,38104=>1000,38105=>1000,38106=>1000,38107=>1000,38108=>1000,38109=>1000,38110=>1000,38111=>1000,38112=>1000,38113=>1000,38114=>1000,38115=>1000,38116=>1000,
-	38117=>1000,38118=>1000,38119=>1000,38120=>1000,38121=>1000,38122=>1000,38123=>1000,38124=>1000,38125=>1000,38126=>1000,38127=>1000,38128=>1000,38129=>1000,38130=>1000,38131=>1000,38132=>1000,
-	38133=>1000,38134=>1000,38135=>1000,38136=>1000,38137=>1000,38138=>1000,38139=>1000,38140=>1000,38141=>1000,38142=>1000,38143=>1000,38144=>1000,38145=>1000,38146=>1000,38147=>1000,38148=>1000,
-	38149=>1000,38150=>1000,38151=>1000,38152=>1000,38153=>1000,38154=>1000,38155=>1000,38156=>1000,38157=>1000,38158=>1000,38159=>1000,38160=>1000,38161=>1000,38162=>1000,38163=>1000,38164=>1000,
-	38165=>1000,38166=>1000,38167=>1000,38168=>1000,38169=>1000,38170=>1000,38171=>1000,38172=>1000,38173=>1000,38174=>1000,38175=>1000,38176=>1000,38177=>1000,38178=>1000,38179=>1000,38180=>1000,
-	38181=>1000,38182=>1000,38183=>1000,38184=>1000,38185=>1000,38186=>1000,38187=>1000,38188=>1000,38189=>1000,38190=>1000,38191=>1000,38192=>1000,38193=>1000,38194=>1000,38195=>1000,38196=>1000,
-	38197=>1000,38198=>1000,38199=>1000,38200=>1000,38201=>1000,38202=>1000,38203=>1000,38204=>1000,38205=>1000,38206=>1000,38207=>1000,38208=>1000,38209=>1000,38210=>1000,38211=>1000,38212=>1000,
-	38213=>1000,38214=>1000,38215=>1000,38216=>1000,38217=>1000,38218=>1000,38219=>1000,38220=>1000,38221=>1000,38222=>1000,38223=>1000,38224=>1000,38225=>1000,38226=>1000,38227=>1000,38228=>1000,
-	38229=>1000,38230=>1000,38231=>1000,38232=>1000,38233=>1000,38234=>1000,38235=>1000,38236=>1000,38237=>1000,38238=>1000,38239=>1000,38240=>1000,38241=>1000,38242=>1000,38243=>1000,38244=>1000,
-	38245=>1000,38246=>1000,38247=>1000,38248=>1000,38249=>1000,38250=>1000,38251=>1000,38252=>1000,38253=>1000,38254=>1000,38255=>1000,38256=>1000,38257=>1000,38258=>1000,38259=>1000,38260=>1000,
-	38261=>1000,38262=>1000,38263=>1000,38264=>1000,38265=>1000,38266=>1000,38267=>1000,38268=>1000,38269=>1000,38270=>1000,38271=>1000,38272=>1000,38273=>1000,38274=>1000,38275=>1000,38276=>1000,
-	38277=>1000,38278=>1000,38279=>1000,38280=>1000,38281=>1000,38282=>1000,38283=>1000,38284=>1000,38285=>1000,38286=>1000,38287=>1000,38288=>1000,38289=>1000,38290=>1000,38291=>1000,38292=>1000,
-	38293=>1000,38294=>1000,38295=>1000,38296=>1000,38297=>1000,38298=>1000,38299=>1000,38300=>1000,38301=>1000,38302=>1000,38303=>1000,38304=>1000,38305=>1000,38306=>1000,38307=>1000,38308=>1000,
-	38309=>1000,38310=>1000,38311=>1000,38312=>1000,38313=>1000,38314=>1000,38315=>1000,38316=>1000,38317=>1000,38318=>1000,38319=>1000,38320=>1000,38321=>1000,38322=>1000,38323=>1000,38324=>1000,
-	38325=>1000,38326=>1000,38327=>1000,38328=>1000,38329=>1000,38330=>1000,38331=>1000,38332=>1000,38333=>1000,38334=>1000,38335=>1000,38336=>1000,38337=>1000,38338=>1000,38339=>1000,38340=>1000,
-	38341=>1000,38342=>1000,38343=>1000,38344=>1000,38345=>1000,38346=>1000,38347=>1000,38348=>1000,38349=>1000,38350=>1000,38351=>1000,38352=>1000,38353=>1000,38354=>1000,38355=>1000,38356=>1000,
-	38357=>1000,38358=>1000,38359=>1000,38360=>1000,38361=>1000,38362=>1000,38363=>1000,38364=>1000,38365=>1000,38366=>1000,38367=>1000,38368=>1000,38369=>1000,38370=>1000,38371=>1000,38372=>1000,
-	38373=>1000,38374=>1000,38375=>1000,38376=>1000,38377=>1000,38378=>1000,38379=>1000,38380=>1000,38381=>1000,38382=>1000,38383=>1000,38384=>1000,38385=>1000,38386=>1000,38387=>1000,38388=>1000,
-	38389=>1000,38390=>1000,38391=>1000,38392=>1000,38393=>1000,38394=>1000,38395=>1000,38396=>1000,38397=>1000,38398=>1000,38399=>1000,38400=>1000,38401=>1000,38402=>1000,38403=>1000,38404=>1000,
-	38405=>1000,38406=>1000,38407=>1000,38408=>1000,38409=>1000,38410=>1000,38411=>1000,38412=>1000,38413=>1000,38414=>1000,38415=>1000,38416=>1000,38417=>1000,38418=>1000,38419=>1000,38420=>1000,
-	38421=>1000,38422=>1000,38423=>1000,38424=>1000,38425=>1000,38426=>1000,38427=>1000,38428=>1000,38429=>1000,38430=>1000,38431=>1000,38432=>1000,38433=>1000,38434=>1000,38435=>1000,38436=>1000,
-	38437=>1000,38438=>1000,38439=>1000,38440=>1000,38441=>1000,38442=>1000,38443=>1000,38444=>1000,38445=>1000,38446=>1000,38447=>1000,38448=>1000,38449=>1000,38450=>1000,38451=>1000,38452=>1000,
-	38453=>1000,38454=>1000,38455=>1000,38456=>1000,38457=>1000,38458=>1000,38459=>1000,38460=>1000,38461=>1000,38462=>1000,38463=>1000,38464=>1000,38465=>1000,38466=>1000,38467=>1000,38468=>1000,
-	38469=>1000,38470=>1000,38471=>1000,38472=>1000,38473=>1000,38474=>1000,38475=>1000,38476=>1000,38477=>1000,38478=>1000,38479=>1000,38480=>1000,38481=>1000,38482=>1000,38483=>1000,38484=>1000,
-	38485=>1000,38486=>1000,38487=>1000,38488=>1000,38489=>1000,38490=>1000,38491=>1000,38492=>1000,38493=>1000,38494=>1000,38495=>1000,38496=>1000,38497=>1000,38498=>1000,38499=>1000,38500=>1000,
-	38501=>1000,38502=>1000,38503=>1000,38504=>1000,38505=>1000,38506=>1000,38507=>1000,38508=>1000,38509=>1000,38510=>1000,38511=>1000,38512=>1000,38513=>1000,38514=>1000,38515=>1000,38516=>1000,
-	38517=>1000,38518=>1000,38519=>1000,38520=>1000,38521=>1000,38522=>1000,38523=>1000,38524=>1000,38525=>1000,38526=>1000,38527=>1000,38528=>1000,38529=>1000,38530=>1000,38531=>1000,38532=>1000,
-	38533=>1000,38534=>1000,38535=>1000,38536=>1000,38537=>1000,38538=>1000,38539=>1000,38540=>1000,38541=>1000,38542=>1000,38543=>1000,38544=>1000,38545=>1000,38546=>1000,38547=>1000,38548=>1000,
-	38549=>1000,38550=>1000,38551=>1000,38552=>1000,38553=>1000,38554=>1000,38555=>1000,38556=>1000,38557=>1000,38558=>1000,38559=>1000,38560=>1000,38561=>1000,38562=>1000,38563=>1000,38564=>1000,
-	38565=>1000,38566=>1000,38567=>1000,38568=>1000,38569=>1000,38570=>1000,38571=>1000,38572=>1000,38573=>1000,38574=>1000,38575=>1000,38576=>1000,38577=>1000,38578=>1000,38579=>1000,38580=>1000,
-	38581=>1000,38582=>1000,38583=>1000,38584=>1000,38585=>1000,38586=>1000,38587=>1000,38588=>1000,38589=>1000,38590=>1000,38591=>1000,38592=>1000,38593=>1000,38594=>1000,38595=>1000,38596=>1000,
-	38597=>1000,38598=>1000,38599=>1000,38600=>1000,38601=>1000,38602=>1000,38603=>1000,38604=>1000,38605=>1000,38606=>1000,38607=>1000,38608=>1000,38609=>1000,38610=>1000,38611=>1000,38612=>1000,
-	38613=>1000,38614=>1000,38615=>1000,38616=>1000,38617=>1000,38618=>1000,38619=>1000,38620=>1000,38621=>1000,38622=>1000,38623=>1000,38624=>1000,38625=>1000,38626=>1000,38627=>1000,38628=>1000,
-	38629=>1000,38630=>1000,38631=>1000,38632=>1000,38633=>1000,38634=>1000,38635=>1000,38636=>1000,38637=>1000,38638=>1000,38639=>1000,38640=>1000,38641=>1000,38642=>1000,38643=>1000,38644=>1000,
-	38645=>1000,38646=>1000,38647=>1000,38648=>1000,38649=>1000,38650=>1000,38651=>1000,38652=>1000,38653=>1000,38654=>1000,38655=>1000,38656=>1000,38657=>1000,38658=>1000,38659=>1000,38660=>1000,
-	38661=>1000,38662=>1000,38663=>1000,38664=>1000,38665=>1000,38666=>1000,38667=>1000,38668=>1000,38669=>1000,38670=>1000,38671=>1000,38672=>1000,38673=>1000,38674=>1000,38675=>1000,38676=>1000,
-	38677=>1000,38678=>1000,38679=>1000,38680=>1000,38681=>1000,38682=>1000,38683=>1000,38684=>1000,38685=>1000,38686=>1000,38687=>1000,38688=>1000,38689=>1000,38690=>1000,38691=>1000,38692=>1000,
-	38693=>1000,38694=>1000,38695=>1000,38696=>1000,38697=>1000,38698=>1000,38699=>1000,38700=>1000,38701=>1000,38702=>1000,38703=>1000,38704=>1000,38705=>1000,38706=>1000,38707=>1000,38708=>1000,
-	38709=>1000,38710=>1000,38711=>1000,38712=>1000,38713=>1000,38714=>1000,38715=>1000,38716=>1000,38717=>1000,38718=>1000,38719=>1000,38720=>1000,38721=>1000,38722=>1000,38723=>1000,38724=>1000,
-	38725=>1000,38726=>1000,38727=>1000,38728=>1000,38729=>1000,38730=>1000,38731=>1000,38732=>1000,38733=>1000,38734=>1000,38735=>1000,38736=>1000,38737=>1000,38738=>1000,38739=>1000,38740=>1000,
-	38741=>1000,38742=>1000,38743=>1000,38744=>1000,38745=>1000,38746=>1000,38747=>1000,38748=>1000,38749=>1000,38750=>1000,38751=>1000,38752=>1000,38753=>1000,38754=>1000,38755=>1000,38756=>1000,
-	38757=>1000,38758=>1000,38759=>1000,38760=>1000,38761=>1000,38762=>1000,38763=>1000,38764=>1000,38765=>1000,38766=>1000,38767=>1000,38768=>1000,38769=>1000,38770=>1000,38771=>1000,38772=>1000,
-	38773=>1000,38774=>1000,38775=>1000,38776=>1000,38777=>1000,38778=>1000,38779=>1000,38780=>1000,38781=>1000,38782=>1000,38783=>1000,38784=>1000,38785=>1000,38786=>1000,38787=>1000,38788=>1000,
-	38789=>1000,38790=>1000,38791=>1000,38792=>1000,38793=>1000,38794=>1000,38795=>1000,38796=>1000,38797=>1000,38798=>1000,38799=>1000,38800=>1000,38801=>1000,38802=>1000,38803=>1000,38804=>1000,
-	38805=>1000,38806=>1000,38807=>1000,38808=>1000,38809=>1000,38810=>1000,38811=>1000,38812=>1000,38813=>1000,38814=>1000,38815=>1000,38816=>1000,38817=>1000,38818=>1000,38819=>1000,38820=>1000,
-	38821=>1000,38822=>1000,38823=>1000,38824=>1000,38825=>1000,38826=>1000,38827=>1000,38828=>1000,38829=>1000,38830=>1000,38831=>1000,38832=>1000,38833=>1000,38834=>1000,38835=>1000,38836=>1000,
-	38837=>1000,38838=>1000,38839=>1000,38840=>1000,38841=>1000,38842=>1000,38843=>1000,38844=>1000,38845=>1000,38846=>1000,38847=>1000,38848=>1000,38849=>1000,38850=>1000,38851=>1000,38852=>1000,
-	38853=>1000,38854=>1000,38855=>1000,38856=>1000,38857=>1000,38858=>1000,38859=>1000,38860=>1000,38861=>1000,38862=>1000,38863=>1000,38864=>1000,38865=>1000,38866=>1000,38867=>1000,38868=>1000,
-	38869=>1000,38870=>1000,38871=>1000,38872=>1000,38873=>1000,38874=>1000,38875=>1000,38876=>1000,38877=>1000,38878=>1000,38879=>1000,38880=>1000,38881=>1000,38882=>1000,38883=>1000,38884=>1000,
-	38885=>1000,38886=>1000,38887=>1000,38888=>1000,38889=>1000,38890=>1000,38891=>1000,38892=>1000,38893=>1000,38894=>1000,38895=>1000,38896=>1000,38897=>1000,38898=>1000,38899=>1000,38900=>1000,
-	38901=>1000,38902=>1000,38903=>1000,38904=>1000,38905=>1000,38906=>1000,38907=>1000,38908=>1000,38909=>1000,38910=>1000,38911=>1000,38912=>1000,38913=>1000,38914=>1000,38915=>1000,38916=>1000,
-	38917=>1000,38918=>1000,38919=>1000,38920=>1000,38921=>1000,38922=>1000,38923=>1000,38924=>1000,38925=>1000,38926=>1000,38927=>1000,38928=>1000,38929=>1000,38930=>1000,38931=>1000,38932=>1000,
-	38933=>1000,38934=>1000,38935=>1000,38936=>1000,38937=>1000,38938=>1000,38939=>1000,38940=>1000,38941=>1000,38942=>1000,38943=>1000,38944=>1000,38945=>1000,38946=>1000,38947=>1000,38948=>1000,
-	38949=>1000,38950=>1000,38951=>1000,38952=>1000,38953=>1000,38954=>1000,38955=>1000,38956=>1000,38957=>1000,38958=>1000,38959=>1000,38960=>1000,38961=>1000,38962=>1000,38963=>1000,38964=>1000,
-	38965=>1000,38966=>1000,38967=>1000,38968=>1000,38969=>1000,38970=>1000,38971=>1000,38972=>1000,38973=>1000,38974=>1000,38975=>1000,38976=>1000,38977=>1000,38978=>1000,38979=>1000,38980=>1000,
-	38981=>1000,38982=>1000,38983=>1000,38984=>1000,38985=>1000,38986=>1000,38987=>1000,38988=>1000,38989=>1000,38990=>1000,38991=>1000,38992=>1000,38993=>1000,38994=>1000,38995=>1000,38996=>1000,
-	38997=>1000,38998=>1000,38999=>1000,39000=>1000,39001=>1000,39002=>1000,39003=>1000,39004=>1000,39005=>1000,39006=>1000,39007=>1000,39008=>1000,39009=>1000,39010=>1000,39011=>1000,39012=>1000,
-	39013=>1000,39014=>1000,39015=>1000,39016=>1000,39017=>1000,39018=>1000,39019=>1000,39020=>1000,39021=>1000,39022=>1000,39023=>1000,39024=>1000,39025=>1000,39026=>1000,39027=>1000,39028=>1000,
-	39029=>1000,39030=>1000,39031=>1000,39032=>1000,39033=>1000,39034=>1000,39035=>1000,39036=>1000,39037=>1000,39038=>1000,39039=>1000,39040=>1000,39041=>1000,39042=>1000,39043=>1000,39044=>1000,
-	39045=>1000,39046=>1000,39047=>1000,39048=>1000,39049=>1000,39050=>1000,39051=>1000,39052=>1000,39053=>1000,39054=>1000,39055=>1000,39056=>1000,39057=>1000,39058=>1000,39059=>1000,39060=>1000,
-	39061=>1000,39062=>1000,39063=>1000,39064=>1000,39065=>1000,39066=>1000,39067=>1000,39068=>1000,39069=>1000,39070=>1000,39071=>1000,39072=>1000,39073=>1000,39074=>1000,39075=>1000,39076=>1000,
-	39077=>1000,39078=>1000,39079=>1000,39080=>1000,39081=>1000,39082=>1000,39083=>1000,39084=>1000,39085=>1000,39086=>1000,39087=>1000,39088=>1000,39089=>1000,39090=>1000,39091=>1000,39092=>1000,
-	39093=>1000,39094=>1000,39095=>1000,39096=>1000,39097=>1000,39098=>1000,39099=>1000,39100=>1000,39101=>1000,39102=>1000,39103=>1000,39104=>1000,39105=>1000,39106=>1000,39107=>1000,39108=>1000,
-	39109=>1000,39110=>1000,39111=>1000,39112=>1000,39113=>1000,39114=>1000,39115=>1000,39116=>1000,39117=>1000,39118=>1000,39119=>1000,39120=>1000,39121=>1000,39122=>1000,39123=>1000,39124=>1000,
-	39125=>1000,39126=>1000,39127=>1000,39128=>1000,39129=>1000,39130=>1000,39131=>1000,39132=>1000,39133=>1000,39134=>1000,39135=>1000,39136=>1000,39137=>1000,39138=>1000,39139=>1000,39140=>1000,
-	39141=>1000,39142=>1000,39143=>1000,39144=>1000,39145=>1000,39146=>1000,39147=>1000,39148=>1000,39149=>1000,39150=>1000,39151=>1000,39152=>1000,39153=>1000,39154=>1000,39155=>1000,39156=>1000,
-	39157=>1000,39158=>1000,39159=>1000,39160=>1000,39161=>1000,39162=>1000,39163=>1000,39164=>1000,39165=>1000,39166=>1000,39167=>1000,39168=>1000,39169=>1000,39170=>1000,39171=>1000,39172=>1000,
-	39173=>1000,39174=>1000,39175=>1000,39176=>1000,39177=>1000,39178=>1000,39179=>1000,39180=>1000,39181=>1000,39182=>1000,39183=>1000,39184=>1000,39185=>1000,39186=>1000,39187=>1000,39188=>1000,
-	39189=>1000,39190=>1000,39191=>1000,39192=>1000,39193=>1000,39194=>1000,39195=>1000,39196=>1000,39197=>1000,39198=>1000,39199=>1000,39200=>1000,39201=>1000,39202=>1000,39203=>1000,39204=>1000,
-	39205=>1000,39206=>1000,39207=>1000,39208=>1000,39209=>1000,39210=>1000,39211=>1000,39212=>1000,39213=>1000,39214=>1000,39215=>1000,39216=>1000,39217=>1000,39218=>1000,39219=>1000,39220=>1000,
-	39221=>1000,39222=>1000,39223=>1000,39224=>1000,39225=>1000,39226=>1000,39227=>1000,39228=>1000,39229=>1000,39230=>1000,39231=>1000,39232=>1000,39233=>1000,39234=>1000,39235=>1000,39236=>1000,
-	39237=>1000,39238=>1000,39239=>1000,39240=>1000,39241=>1000,39242=>1000,39243=>1000,39244=>1000,39245=>1000,39246=>1000,39247=>1000,39248=>1000,39249=>1000,39250=>1000,39251=>1000,39252=>1000,
-	39253=>1000,39254=>1000,39255=>1000,39256=>1000,39257=>1000,39258=>1000,39259=>1000,39260=>1000,39261=>1000,39262=>1000,39263=>1000,39264=>1000,39265=>1000,39266=>1000,39267=>1000,39268=>1000,
-	39269=>1000,39270=>1000,39271=>1000,39272=>1000,39273=>1000,39274=>1000,39275=>1000,39276=>1000,39277=>1000,39278=>1000,39279=>1000,39280=>1000,39281=>1000,39282=>1000,39283=>1000,39284=>1000,
-	39285=>1000,39286=>1000,39287=>1000,39288=>1000,39289=>1000,39290=>1000,39291=>1000,39292=>1000,39293=>1000,39294=>1000,39295=>1000,39296=>1000,39297=>1000,39298=>1000,39299=>1000,39300=>1000,
-	39301=>1000,39302=>1000,39303=>1000,39304=>1000,39305=>1000,39306=>1000,39307=>1000,39308=>1000,39309=>1000,39310=>1000,39311=>1000,39312=>1000,39313=>1000,39314=>1000,39315=>1000,39316=>1000,
-	39317=>1000,39318=>1000,39319=>1000,39320=>1000,39321=>1000,39322=>1000,39323=>1000,39324=>1000,39325=>1000,39326=>1000,39327=>1000,39328=>1000,39329=>1000,39330=>1000,39331=>1000,39332=>1000,
-	39333=>1000,39334=>1000,39335=>1000,39336=>1000,39337=>1000,39338=>1000,39339=>1000,39340=>1000,39341=>1000,39342=>1000,39343=>1000,39344=>1000,39345=>1000,39346=>1000,39347=>1000,39348=>1000,
-	39349=>1000,39350=>1000,39351=>1000,39352=>1000,39353=>1000,39354=>1000,39355=>1000,39356=>1000,39357=>1000,39358=>1000,39359=>1000,39360=>1000,39361=>1000,39362=>1000,39363=>1000,39364=>1000,
-	39365=>1000,39366=>1000,39367=>1000,39368=>1000,39369=>1000,39370=>1000,39371=>1000,39372=>1000,39373=>1000,39374=>1000,39375=>1000,39376=>1000,39377=>1000,39378=>1000,39379=>1000,39380=>1000,
-	39381=>1000,39382=>1000,39383=>1000,39384=>1000,39385=>1000,39386=>1000,39387=>1000,39388=>1000,39389=>1000,39390=>1000,39391=>1000,39392=>1000,39393=>1000,39394=>1000,39395=>1000,39396=>1000,
-	39397=>1000,39398=>1000,39399=>1000,39400=>1000,39401=>1000,39402=>1000,39403=>1000,39404=>1000,39405=>1000,39406=>1000,39407=>1000,39408=>1000,39409=>1000,39410=>1000,39411=>1000,39412=>1000,
-	39413=>1000,39414=>1000,39415=>1000,39416=>1000,39417=>1000,39418=>1000,39419=>1000,39420=>1000,39421=>1000,39422=>1000,39423=>1000,39424=>1000,39425=>1000,39426=>1000,39427=>1000,39428=>1000,
-	39429=>1000,39430=>1000,39431=>1000,39432=>1000,39433=>1000,39434=>1000,39435=>1000,39436=>1000,39437=>1000,39438=>1000,39439=>1000,39440=>1000,39441=>1000,39442=>1000,39443=>1000,39444=>1000,
-	39445=>1000,39446=>1000,39447=>1000,39448=>1000,39449=>1000,39450=>1000,39451=>1000,39452=>1000,39453=>1000,39454=>1000,39455=>1000,39456=>1000,39457=>1000,39458=>1000,39459=>1000,39460=>1000,
-	39461=>1000,39462=>1000,39463=>1000,39464=>1000,39465=>1000,39466=>1000,39467=>1000,39468=>1000,39469=>1000,39470=>1000,39471=>1000,39472=>1000,39473=>1000,39474=>1000,39475=>1000,39476=>1000,
-	39477=>1000,39478=>1000,39479=>1000,39480=>1000,39481=>1000,39482=>1000,39483=>1000,39484=>1000,39485=>1000,39486=>1000,39487=>1000,39488=>1000,39489=>1000,39490=>1000,39491=>1000,39492=>1000,
-	39493=>1000,39494=>1000,39495=>1000,39496=>1000,39497=>1000,39498=>1000,39499=>1000,39500=>1000,39501=>1000,39502=>1000,39503=>1000,39504=>1000,39505=>1000,39506=>1000,39507=>1000,39508=>1000,
-	39509=>1000,39510=>1000,39511=>1000,39512=>1000,39513=>1000,39514=>1000,39515=>1000,39516=>1000,39517=>1000,39518=>1000,39519=>1000,39520=>1000,39521=>1000,39522=>1000,39523=>1000,39524=>1000,
-	39525=>1000,39526=>1000,39527=>1000,39528=>1000,39529=>1000,39530=>1000,39531=>1000,39532=>1000,39533=>1000,39534=>1000,39535=>1000,39536=>1000,39537=>1000,39538=>1000,39539=>1000,39540=>1000,
-	39541=>1000,39542=>1000,39543=>1000,39544=>1000,39545=>1000,39546=>1000,39547=>1000,39548=>1000,39549=>1000,39550=>1000,39551=>1000,39552=>1000,39553=>1000,39554=>1000,39555=>1000,39556=>1000,
-	39557=>1000,39558=>1000,39559=>1000,39560=>1000,39561=>1000,39562=>1000,39563=>1000,39564=>1000,39565=>1000,39566=>1000,39567=>1000,39568=>1000,39569=>1000,39570=>1000,39571=>1000,39572=>1000,
-	39573=>1000,39574=>1000,39575=>1000,39576=>1000,39577=>1000,39578=>1000,39579=>1000,39580=>1000,39581=>1000,39582=>1000,39583=>1000,39584=>1000,39585=>1000,39586=>1000,39587=>1000,39588=>1000,
-	39589=>1000,39590=>1000,39591=>1000,39592=>1000,39593=>1000,39594=>1000,39595=>1000,39596=>1000,39597=>1000,39598=>1000,39599=>1000,39600=>1000,39601=>1000,39602=>1000,39603=>1000,39604=>1000,
-	39605=>1000,39606=>1000,39607=>1000,39608=>1000,39609=>1000,39610=>1000,39611=>1000,39612=>1000,39613=>1000,39614=>1000,39615=>1000,39616=>1000,39617=>1000,39618=>1000,39619=>1000,39620=>1000,
-	39621=>1000,39622=>1000,39623=>1000,39624=>1000,39625=>1000,39626=>1000,39627=>1000,39628=>1000,39629=>1000,39630=>1000,39631=>1000,39632=>1000,39633=>1000,39634=>1000,39635=>1000,39636=>1000,
-	39637=>1000,39638=>1000,39639=>1000,39640=>1000,39641=>1000,39642=>1000,39643=>1000,39644=>1000,39645=>1000,39646=>1000,39647=>1000,39648=>1000,39649=>1000,39650=>1000,39651=>1000,39652=>1000,
-	39653=>1000,39654=>1000,39655=>1000,39656=>1000,39657=>1000,39658=>1000,39659=>1000,39660=>1000,39661=>1000,39662=>1000,39663=>1000,39664=>1000,39665=>1000,39666=>1000,39667=>1000,39668=>1000,
-	39669=>1000,39670=>1000,39671=>1000,39672=>1000,39673=>1000,39674=>1000,39675=>1000,39676=>1000,39677=>1000,39678=>1000,39679=>1000,39680=>1000,39681=>1000,39682=>1000,39683=>1000,39684=>1000,
-	39685=>1000,39686=>1000,39687=>1000,39688=>1000,39689=>1000,39690=>1000,39691=>1000,39692=>1000,39693=>1000,39694=>1000,39695=>1000,39696=>1000,39697=>1000,39698=>1000,39699=>1000,39700=>1000,
-	39701=>1000,39702=>1000,39703=>1000,39704=>1000,39705=>1000,39706=>1000,39707=>1000,39708=>1000,39709=>1000,39710=>1000,39711=>1000,39712=>1000,39713=>1000,39714=>1000,39715=>1000,39716=>1000,
-	39717=>1000,39718=>1000,39719=>1000,39720=>1000,39721=>1000,39722=>1000,39723=>1000,39724=>1000,39725=>1000,39726=>1000,39727=>1000,39728=>1000,39729=>1000,39730=>1000,39731=>1000,39732=>1000,
-	39733=>1000,39734=>1000,39735=>1000,39736=>1000,39737=>1000,39738=>1000,39739=>1000,39740=>1000,39741=>1000,39742=>1000,39743=>1000,39744=>1000,39745=>1000,39746=>1000,39747=>1000,39748=>1000,
-	39749=>1000,39750=>1000,39751=>1000,39752=>1000,39753=>1000,39754=>1000,39755=>1000,39756=>1000,39757=>1000,39758=>1000,39759=>1000,39760=>1000,39761=>1000,39762=>1000,39763=>1000,39764=>1000,
-	39765=>1000,39766=>1000,39767=>1000,39768=>1000,39769=>1000,39770=>1000,39771=>1000,39772=>1000,39773=>1000,39774=>1000,39775=>1000,39776=>1000,39777=>1000,39778=>1000,39779=>1000,39780=>1000,
-	39781=>1000,39782=>1000,39783=>1000,39784=>1000,39785=>1000,39786=>1000,39787=>1000,39788=>1000,39789=>1000,39790=>1000,39791=>1000,39792=>1000,39793=>1000,39794=>1000,39795=>1000,39796=>1000,
-	39797=>1000,39798=>1000,39799=>1000,39800=>1000,39801=>1000,39802=>1000,39803=>1000,39804=>1000,39805=>1000,39806=>1000,39807=>1000,39808=>1000,39809=>1000,39810=>1000,39811=>1000,39812=>1000,
-	39813=>1000,39814=>1000,39815=>1000,39816=>1000,39817=>1000,39818=>1000,39819=>1000,39820=>1000,39821=>1000,39822=>1000,39823=>1000,39824=>1000,39825=>1000,39826=>1000,39827=>1000,39828=>1000,
-	39829=>1000,39830=>1000,39831=>1000,39832=>1000,39833=>1000,39834=>1000,39835=>1000,39836=>1000,39837=>1000,39838=>1000,39839=>1000,39840=>1000,39841=>1000,39842=>1000,39843=>1000,39844=>1000,
-	39845=>1000,39846=>1000,39847=>1000,39848=>1000,39849=>1000,39850=>1000,39851=>1000,39852=>1000,39853=>1000,39854=>1000,39855=>1000,39856=>1000,39857=>1000,39858=>1000,39859=>1000,39860=>1000,
-	39861=>1000,39862=>1000,39863=>1000,39864=>1000,39865=>1000,39866=>1000,39867=>1000,39868=>1000,39869=>1000,39870=>1000,39871=>1000,39872=>1000,39873=>1000,39874=>1000,39875=>1000,39876=>1000,
-	39877=>1000,39878=>1000,39879=>1000,39880=>1000,39881=>1000,39882=>1000,39883=>1000,39884=>1000,39885=>1000,39886=>1000,39887=>1000,39888=>1000,39889=>1000,39890=>1000,39891=>1000,39892=>1000,
-	39893=>1000,39894=>1000,39895=>1000,39896=>1000,39897=>1000,39898=>1000,39899=>1000,39900=>1000,39901=>1000,39902=>1000,39903=>1000,39904=>1000,39905=>1000,39906=>1000,39907=>1000,39908=>1000,
-	39909=>1000,39910=>1000,39911=>1000,39912=>1000,39913=>1000,39914=>1000,39915=>1000,39916=>1000,39917=>1000,39918=>1000,39919=>1000,39920=>1000,39921=>1000,39922=>1000,39923=>1000,39924=>1000,
-	39925=>1000,39926=>1000,39927=>1000,39928=>1000,39929=>1000,39930=>1000,39931=>1000,39932=>1000,39933=>1000,39934=>1000,39935=>1000,39936=>1000,39937=>1000,39938=>1000,39939=>1000,39940=>1000,
-	39941=>1000,39942=>1000,39943=>1000,39944=>1000,39945=>1000,39946=>1000,39947=>1000,39948=>1000,39949=>1000,39950=>1000,39951=>1000,39952=>1000,39953=>1000,39954=>1000,39955=>1000,39956=>1000,
-	39957=>1000,39958=>1000,39959=>1000,39960=>1000,39961=>1000,39962=>1000,39963=>1000,39964=>1000,39965=>1000,39966=>1000,39967=>1000,39968=>1000,39969=>1000,39970=>1000,39971=>1000,39972=>1000,
-	39973=>1000,39974=>1000,39975=>1000,39976=>1000,39977=>1000,39978=>1000,39979=>1000,39980=>1000,39981=>1000,39982=>1000,39983=>1000,39984=>1000,39985=>1000,39986=>1000,39987=>1000,39988=>1000,
-	39989=>1000,39990=>1000,39991=>1000,39992=>1000,39993=>1000,39994=>1000,39995=>1000,39996=>1000,39997=>1000,39998=>1000,39999=>1000,40000=>1000,40001=>1000,40002=>1000,40003=>1000,40004=>1000,
-	40005=>1000,40006=>1000,40007=>1000,40008=>1000,40009=>1000,40010=>1000,40011=>1000,40012=>1000,40013=>1000,40014=>1000,40015=>1000,40016=>1000,40017=>1000,40018=>1000,40019=>1000,40020=>1000,
-	40021=>1000,40022=>1000,40023=>1000,40024=>1000,40025=>1000,40026=>1000,40027=>1000,40028=>1000,40029=>1000,40030=>1000,40031=>1000,40032=>1000,40033=>1000,40034=>1000,40035=>1000,40036=>1000,
-	40037=>1000,40038=>1000,40039=>1000,40040=>1000,40041=>1000,40042=>1000,40043=>1000,40044=>1000,40045=>1000,40046=>1000,40047=>1000,40048=>1000,40049=>1000,40050=>1000,40051=>1000,40052=>1000,
-	40053=>1000,40054=>1000,40055=>1000,40056=>1000,40057=>1000,40058=>1000,40059=>1000,40060=>1000,40061=>1000,40062=>1000,40063=>1000,40064=>1000,40065=>1000,40066=>1000,40067=>1000,40068=>1000,
-	40069=>1000,40070=>1000,40071=>1000,40072=>1000,40073=>1000,40074=>1000,40075=>1000,40076=>1000,40077=>1000,40078=>1000,40079=>1000,40080=>1000,40081=>1000,40082=>1000,40083=>1000,40084=>1000,
-	40085=>1000,40086=>1000,40087=>1000,40088=>1000,40089=>1000,40090=>1000,40091=>1000,40092=>1000,40093=>1000,40094=>1000,40095=>1000,40096=>1000,40097=>1000,40098=>1000,40099=>1000,40100=>1000,
-	40101=>1000,40102=>1000,40103=>1000,40104=>1000,40105=>1000,40106=>1000,40107=>1000,40108=>1000,40109=>1000,40110=>1000,40111=>1000,40112=>1000,40113=>1000,40114=>1000,40115=>1000,40116=>1000,
-	40117=>1000,40118=>1000,40119=>1000,40120=>1000,40121=>1000,40122=>1000,40123=>1000,40124=>1000,40125=>1000,40126=>1000,40127=>1000,40128=>1000,40129=>1000,40130=>1000,40131=>1000,40132=>1000,
-	40133=>1000,40134=>1000,40135=>1000,40136=>1000,40137=>1000,40138=>1000,40139=>1000,40140=>1000,40141=>1000,40142=>1000,40143=>1000,40144=>1000,40145=>1000,40146=>1000,40147=>1000,40148=>1000,
-	40149=>1000,40150=>1000,40151=>1000,40152=>1000,40153=>1000,40154=>1000,40155=>1000,40156=>1000,40157=>1000,40158=>1000,40159=>1000,40160=>1000,40161=>1000,40162=>1000,40163=>1000,40164=>1000,
-	40165=>1000,40166=>1000,40167=>1000,40168=>1000,40169=>1000,40170=>1000,40171=>1000,40172=>1000,40173=>1000,40174=>1000,40175=>1000,40176=>1000,40177=>1000,40178=>1000,40179=>1000,40180=>1000,
-	40181=>1000,40182=>1000,40183=>1000,40184=>1000,40185=>1000,40186=>1000,40187=>1000,40188=>1000,40189=>1000,40190=>1000,40191=>1000,40192=>1000,40193=>1000,40194=>1000,40195=>1000,40196=>1000,
-	40197=>1000,40198=>1000,40199=>1000,40200=>1000,40201=>1000,40202=>1000,40203=>1000,40204=>1000,40205=>1000,40206=>1000,40207=>1000,40208=>1000,40209=>1000,40210=>1000,40211=>1000,40212=>1000,
-	40213=>1000,40214=>1000,40215=>1000,40216=>1000,40217=>1000,40218=>1000,40219=>1000,40220=>1000,40221=>1000,40222=>1000,40223=>1000,40224=>1000,40225=>1000,40226=>1000,40227=>1000,40228=>1000,
-	40229=>1000,40230=>1000,40231=>1000,40232=>1000,40233=>1000,40234=>1000,40235=>1000,40236=>1000,40237=>1000,40238=>1000,40239=>1000,40240=>1000,40241=>1000,40242=>1000,40243=>1000,40244=>1000,
-	40245=>1000,40246=>1000,40247=>1000,40248=>1000,40249=>1000,40250=>1000,40251=>1000,40252=>1000,40253=>1000,40254=>1000,40255=>1000,40256=>1000,40257=>1000,40258=>1000,40259=>1000,40260=>1000,
-	40261=>1000,40262=>1000,40263=>1000,40264=>1000,40265=>1000,40266=>1000,40267=>1000,40268=>1000,40269=>1000,40270=>1000,40271=>1000,40272=>1000,40273=>1000,40274=>1000,40275=>1000,40276=>1000,
-	40277=>1000,40278=>1000,40279=>1000,40280=>1000,40281=>1000,40282=>1000,40283=>1000,40284=>1000,40285=>1000,40286=>1000,40287=>1000,40288=>1000,40289=>1000,40290=>1000,40291=>1000,40292=>1000,
-	40293=>1000,40294=>1000,40295=>1000,40296=>1000,40297=>1000,40298=>1000,40299=>1000,40300=>1000,40301=>1000,40302=>1000,40303=>1000,40304=>1000,40305=>1000,40306=>1000,40307=>1000,40308=>1000,
-	40309=>1000,40310=>1000,40311=>1000,40312=>1000,40313=>1000,40314=>1000,40315=>1000,40316=>1000,40317=>1000,40318=>1000,40319=>1000,40320=>1000,40321=>1000,40322=>1000,40323=>1000,40324=>1000,
-	40325=>1000,40326=>1000,40327=>1000,40328=>1000,40329=>1000,40330=>1000,40331=>1000,40332=>1000,40333=>1000,40334=>1000,40335=>1000,40336=>1000,40337=>1000,40338=>1000,40339=>1000,40340=>1000,
-	40341=>1000,40342=>1000,40343=>1000,40344=>1000,40345=>1000,40346=>1000,40347=>1000,40348=>1000,40349=>1000,40350=>1000,40351=>1000,40352=>1000,40353=>1000,40354=>1000,40355=>1000,40356=>1000,
-	40357=>1000,40358=>1000,40359=>1000,40360=>1000,40361=>1000,40362=>1000,40363=>1000,40364=>1000,40365=>1000,40366=>1000,40367=>1000,40368=>1000,40369=>1000,40370=>1000,40371=>1000,40372=>1000,
-	40373=>1000,40374=>1000,40375=>1000,40376=>1000,40377=>1000,40378=>1000,40379=>1000,40380=>1000,40381=>1000,40382=>1000,40383=>1000,40384=>1000,40385=>1000,40386=>1000,40387=>1000,40388=>1000,
-	40389=>1000,40390=>1000,40391=>1000,40392=>1000,40393=>1000,40394=>1000,40395=>1000,40396=>1000,40397=>1000,40398=>1000,40399=>1000,40400=>1000,40401=>1000,40402=>1000,40403=>1000,40404=>1000,
-	40405=>1000,40406=>1000,40407=>1000,40408=>1000,40409=>1000,40410=>1000,40411=>1000,40412=>1000,40413=>1000,40414=>1000,40415=>1000,40416=>1000,40417=>1000,40418=>1000,40419=>1000,40420=>1000,
-	40421=>1000,40422=>1000,40423=>1000,40424=>1000,40425=>1000,40426=>1000,40427=>1000,40428=>1000,40429=>1000,40430=>1000,40431=>1000,40432=>1000,40433=>1000,40434=>1000,40435=>1000,40436=>1000,
-	40437=>1000,40438=>1000,40439=>1000,40440=>1000,40441=>1000,40442=>1000,40443=>1000,40444=>1000,40445=>1000,40446=>1000,40447=>1000,40448=>1000,40449=>1000,40450=>1000,40451=>1000,40452=>1000,
-	40453=>1000,40454=>1000,40455=>1000,40456=>1000,40457=>1000,40458=>1000,40459=>1000,40460=>1000,40461=>1000,40462=>1000,40463=>1000,40464=>1000,40465=>1000,40466=>1000,40467=>1000,40468=>1000,
-	40469=>1000,40470=>1000,40471=>1000,40472=>1000,40473=>1000,40474=>1000,40475=>1000,40476=>1000,40477=>1000,40478=>1000,40479=>1000,40480=>1000,40481=>1000,40482=>1000,40483=>1000,40484=>1000,
-	40485=>1000,40486=>1000,40487=>1000,40488=>1000,40489=>1000,40490=>1000,40491=>1000,40492=>1000,40493=>1000,40494=>1000,40495=>1000,40496=>1000,40497=>1000,40498=>1000,40499=>1000,40500=>1000,
-	40501=>1000,40502=>1000,40503=>1000,40504=>1000,40505=>1000,40506=>1000,40507=>1000,40508=>1000,40509=>1000,40510=>1000,40511=>1000,40512=>1000,40513=>1000,40514=>1000,40515=>1000,40516=>1000,
-	40517=>1000,40518=>1000,40519=>1000,40520=>1000,40521=>1000,40522=>1000,40523=>1000,40524=>1000,40525=>1000,40526=>1000,40527=>1000,40528=>1000,40529=>1000,40530=>1000,40531=>1000,40532=>1000,
-	40533=>1000,40534=>1000,40535=>1000,40536=>1000,40537=>1000,40538=>1000,40539=>1000,40540=>1000,40541=>1000,40542=>1000,40543=>1000,40544=>1000,40545=>1000,40546=>1000,40547=>1000,40548=>1000,
-	40549=>1000,40550=>1000,40551=>1000,40552=>1000,40553=>1000,40554=>1000,40555=>1000,40556=>1000,40557=>1000,40558=>1000,40559=>1000,40560=>1000,40561=>1000,40562=>1000,40563=>1000,40564=>1000,
-	40565=>1000,40566=>1000,40567=>1000,40568=>1000,40569=>1000,40570=>1000,40571=>1000,40572=>1000,40573=>1000,40574=>1000,40575=>1000,40576=>1000,40577=>1000,40578=>1000,40579=>1000,40580=>1000,
-	40581=>1000,40582=>1000,40583=>1000,40584=>1000,40585=>1000,40586=>1000,40587=>1000,40588=>1000,40589=>1000,40590=>1000,40591=>1000,40592=>1000,40593=>1000,40594=>1000,40595=>1000,40596=>1000,
-	40597=>1000,40598=>1000,40599=>1000,40600=>1000,40601=>1000,40602=>1000,40603=>1000,40604=>1000,40605=>1000,40606=>1000,40607=>1000,40608=>1000,40609=>1000,40610=>1000,40611=>1000,40612=>1000,
-	40613=>1000,40614=>1000,40615=>1000,40616=>1000,40617=>1000,40618=>1000,40619=>1000,40620=>1000,40621=>1000,40622=>1000,40623=>1000,40624=>1000,40625=>1000,40626=>1000,40627=>1000,40628=>1000,
-	40629=>1000,40630=>1000,40631=>1000,40632=>1000,40633=>1000,40634=>1000,40635=>1000,40636=>1000,40637=>1000,40638=>1000,40639=>1000,40640=>1000,40641=>1000,40642=>1000,40643=>1000,40644=>1000,
-	40645=>1000,40646=>1000,40647=>1000,40648=>1000,40649=>1000,40650=>1000,40651=>1000,40652=>1000,40653=>1000,40654=>1000,40655=>1000,40656=>1000,40657=>1000,40658=>1000,40659=>1000,40660=>1000,
-	40661=>1000,40662=>1000,40663=>1000,40664=>1000,40665=>1000,40666=>1000,40667=>1000,40668=>1000,40669=>1000,40670=>1000,40671=>1000,40672=>1000,40673=>1000,40674=>1000,40675=>1000,40676=>1000,
-	40677=>1000,40678=>1000,40679=>1000,40680=>1000,40681=>1000,40682=>1000,40683=>1000,40684=>1000,40685=>1000,40686=>1000,40687=>1000,40688=>1000,40689=>1000,40690=>1000,40691=>1000,40692=>1000,
-	40693=>1000,40694=>1000,40695=>1000,40696=>1000,40697=>1000,40698=>1000,40699=>1000,40700=>1000,40701=>1000,40702=>1000,40703=>1000,40704=>1000,40705=>1000,40706=>1000,40707=>1000,40708=>1000,
-	40709=>1000,40710=>1000,40711=>1000,40712=>1000,40713=>1000,40714=>1000,40715=>1000,40716=>1000,40717=>1000,40718=>1000,40719=>1000,40720=>1000,40721=>1000,40722=>1000,40723=>1000,40724=>1000,
-	40725=>1000,40726=>1000,40727=>1000,40728=>1000,40729=>1000,40730=>1000,40731=>1000,40732=>1000,40733=>1000,40734=>1000,40735=>1000,40736=>1000,40737=>1000,40738=>1000,40739=>1000,40740=>1000,
-	40741=>1000,40742=>1000,40743=>1000,40744=>1000,40745=>1000,40746=>1000,40747=>1000,40748=>1000,40749=>1000,40750=>1000,40751=>1000,40752=>1000,40753=>1000,40754=>1000,40755=>1000,40756=>1000,
-	40757=>1000,40758=>1000,40759=>1000,40760=>1000,40761=>1000,40762=>1000,40763=>1000,40764=>1000,40765=>1000,40766=>1000,40767=>1000,40768=>1000,40769=>1000,40770=>1000,40771=>1000,40772=>1000,
-	40773=>1000,40774=>1000,40775=>1000,40776=>1000,40777=>1000,40778=>1000,40779=>1000,40780=>1000,40781=>1000,40782=>1000,40783=>1000,40784=>1000,40785=>1000,40786=>1000,40787=>1000,40788=>1000,
-	40789=>1000,40790=>1000,40791=>1000,40792=>1000,40793=>1000,40794=>1000,40795=>1000,40796=>1000,40797=>1000,40798=>1000,40799=>1000,40800=>1000,40801=>1000,40802=>1000,40803=>1000,40804=>1000,
-	40805=>1000,40806=>1000,40807=>1000,40808=>1000,40809=>1000,40810=>1000,40811=>1000,40812=>1000,40813=>1000,40814=>1000,40815=>1000,40816=>1000,40817=>1000,40818=>1000,40819=>1000,40820=>1000,
-	40821=>1000,40822=>1000,40823=>1000,40824=>1000,40825=>1000,40826=>1000,40827=>1000,40828=>1000,40829=>1000,40830=>1000,40831=>1000,40832=>1000,40833=>1000,40834=>1000,40835=>1000,40836=>1000,
-	40837=>1000,40838=>1000,40839=>1000,40840=>1000,40841=>1000,40842=>1000,40843=>1000,40844=>1000,40845=>1000,40846=>1000,40847=>1000,40848=>1000,40849=>1000,40850=>1000,40851=>1000,40852=>1000,
-	40853=>1000,40854=>1000,40855=>1000,40856=>1000,40857=>1000,40858=>1000,40859=>1000,40860=>1000,40861=>1000,40862=>1000,40863=>1000,40864=>1000,40865=>1000,40866=>1000,40867=>1000,40868=>1000,
-	40869=>1000);
-$diff='';
-$originalsize=23275812;
-
-// CID Information
-// Select your language
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ac16.tar.Z,ag15.tar.Z,ak12.tar.Z and aj16.tar.Z.
-
-//$enc='UniCNS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'CNS1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ac15.php');
-
-//$enc='UniGB-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'GB1','Supplement'=>2);
-//include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-//$enc='UniKS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Korea1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-$enc='UniJIS-UTF16-H';
-$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Japan1','Supplement'=>5);
-include(dirname(__FILE__).'/uni2cid_aj16.php');
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-korean.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-korean.php
deleted file mode 100644
index 1edf395db6e..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0-korean.php
+++ /dev/null
@@ -1,1768 +0,0 @@
-<?php
-$type='cidfont0';
-$name='ArialUnicodeMS';
-$desc=array('Ascent'=>1069,'Descent'=>-271,'CapHeight'=>1069,'Flags'=>32,'FontBBox'=>'[-1011 -330 2260 1078]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=1000;
-$cw=array(
-	32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,
-	48=>556,49=>556,50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,60=>584,61=>584,62=>584,63=>556,
-	64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-	80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>278,92=>278,93=>278,94=>469,95=>500,
-	96=>333,97=>556,98=>556,99=>500,100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,109=>833,110=>556,111=>556,
-	112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,8364=>556,
-	1027=>567,8218=>222,402=>278,8222=>333,8230=>1000,8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,1036=>584,381=>611,1039=>723,8216=>222,
-	8217=>222,8220=>333,8221=>333,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>500,8250=>333,339=>944,1116=>437,382=>500,376=>667,160=>278,161=>333,
-	162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,172=>584,173=>333,174=>737,175=>500,176=>400,177=>584,
-	178=>333,179=>333,180=>333,181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,190=>834,191=>611,192=>667,193=>667,
-	194=>667,195=>667,196=>667,197=>667,198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,208=>722,209=>722,
-	210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-	226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,
-	242=>556,243=>556,244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>667,257=>556,
-	258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,268=>722,269=>500,270=>722,271=>627,272=>722,273=>556,
-	274=>667,275=>556,276=>667,277=>556,278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,288=>778,289=>556,
-	290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>222,298=>278,299=>222,300=>278,301=>222,302=>278,303=>222,304=>278,305=>278,
-	306=>751,307=>444,308=>500,309=>222,310=>667,311=>500,312=>437,313=>556,314=>222,315=>556,316=>222,317=>556,318=>222,319=>556,320=>318,321=>556,
-	322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,328=>556,329=>626,330=>723,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-	340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,350=>667,351=>500,354=>611,355=>278,356=>611,357=>406,
-	358=>611,359=>278,360=>722,361=>556,362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,372=>944,373=>722,
-	374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>222,384=>556,385=>740,386=>655,387=>556,388=>556,389=>556,390=>722,391=>766,392=>579,
-	393=>722,394=>789,395=>655,396=>556,397=>557,398=>667,399=>729,400=>604,401=>611,403=>791,404=>649,405=>806,406=>245,407=>322,408=>667,409=>500,
-	410=>322,411=>500,412=>833,413=>722,414=>556,415=>778,416=>776,417=>556,418=>1019,419=>782,420=>735,421=>556,422=>722,423=>667,424=>500,425=>602,
-	426=>366,427=>278,428=>571,429=>278,430=>611,431=>776,432=>620,433=>748,434=>667,435=>752,436=>615,437=>611,438=>500,439=>628,440=>628,441=>526,
-	442=>480,443=>556,444=>556,445=>526,446=>556,447=>556,448=>278,449=>464,450=>474,451=>278,452=>1333,453=>1222,454=>1056,455=>1030,456=>778,457=>444,
-	458=>1222,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,
-	474=>556,475=>722,476=>556,477=>556,478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,488=>667,489=>500,
-	490=>778,491=>556,492=>778,493=>556,494=>534,495=>534,496=>222,497=>1333,498=>1222,499=>1056,500=>778,501=>556,506=>667,507=>556,508=>1000,509=>889,
-	510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,
-	526=>778,527=>556,528=>722,529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,
-	598=>556,599=>556,600=>556,601=>556,602=>777,603=>485,604=>485,605=>686,606=>519,607=>260,608=>556,609=>556,610=>557,611=>500,612=>500,613=>556,
-	614=>556,615=>556,616=>242,617=>282,618=>356,619=>356,620=>425,621=>222,622=>635,623=>833,624=>833,625=>833,626=>556,627=>556,628=>558,629=>556,
-	630=>715,631=>674,632=>558,633=>333,634=>333,635=>333,636=>333,637=>333,638=>312,639=>312,640=>530,641=>530,642=>500,643=>216,644=>276,645=>216,
-	646=>222,647=>278,648=>278,649=>596,650=>558,651=>556,652=>500,653=>722,654=>500,655=>500,656=>500,657=>564,658=>530,659=>530,660=>464,661=>464,
-	662=>464,663=>500,664=>614,665=>526,666=>519,667=>557,668=>558,669=>222,670=>500,671=>416,672=>556,673=>464,674=>464,675=>966,676=>966,677=>1030,
-	678=>689,679=>484,680=>718,688=>326,689=>326,690=>153,691=>201,692=>201,693=>201,694=>304,695=>389,696=>278,697=>222,698=>372,699=>222,700=>222,
-	701=>222,702=>222,703=>222,704=>250,705=>250,706=>320,707=>320,708=>320,709=>320,711=>333,712=>192,713=>333,714=>333,715=>333,716=>192,717=>333,
-	718=>333,719=>333,720=>300,721=>300,722=>222,723=>222,724=>340,725=>340,726=>280,727=>362,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-	736=>278,737=>153,738=>270,739=>274,740=>325,741=>360,742=>360,743=>360,744=>360,745=>360,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-	774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,
-	790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,
-	806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-	822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-	864=>0,865=>0,884=>308,885=>308,890=>278,894=>278,900=>278,901=>278,902=>667,903=>278,904=>704,905=>759,906=>315,908=>778,910=>746,911=>758,
-	912=>222,913=>667,914=>667,915=>550,916=>682,917=>667,918=>611,919=>722,920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>650,927=>778,
-	928=>722,929=>667,931=>602,932=>611,933=>667,934=>808,935=>667,936=>804,937=>758,938=>278,939=>667,940=>576,941=>434,942=>556,943=>222,944=>551,
-	945=>576,946=>563,947=>500,948=>557,949=>434,950=>440,951=>556,952=>556,953=>222,954=>498,955=>500,956=>553,957=>500,958=>432,959=>556,960=>678,
-	961=>571,962=>472,963=>619,964=>382,965=>551,966=>649,967=>522,968=>729,969=>766,970=>222,971=>551,972=>556,973=>551,974=>766,976=>563,977=>616,
-	978=>631,979=>726,980=>631,981=>644,982=>781,986=>722,988=>578,990=>570,992=>692,994=>880,995=>833,996=>684,997=>558,998=>680,999=>529,1000=>557,
-	1001=>505,1002=>623,1003=>603,1004=>610,1005=>611,1006=>568,1007=>434,1008=>600,1009=>571,1010=>500,1011=>222,1025=>667,1026=>865,1028=>717,1029=>667,1030=>278,
-	1031=>278,1032=>500,1033=>1105,1034=>1009,1035=>867,1038=>635,1040=>667,1041=>655,1042=>667,1043=>567,1044=>677,1045=>667,1046=>923,1047=>604,1048=>722,1049=>722,
-	1050=>584,1051=>705,1052=>833,1053=>722,1054=>778,1055=>723,1056=>667,1057=>722,1058=>611,1059=>635,1060=>760,1061=>667,1062=>740,1063=>684,1064=>920,1065=>939,
-	1066=>793,1067=>883,1068=>655,1069=>717,1070=>1006,1071=>722,1072=>556,1073=>573,1074=>531,1075=>383,1076=>583,1077=>556,1078=>669,1079=>458,1080=>559,1081=>559,
-	1082=>437,1083=>571,1084=>683,1085=>552,1086=>556,1087=>542,1088=>556,1089=>500,1090=>458,1091=>500,1092=>823,1093=>500,1094=>562,1095=>533,1096=>802,1097=>823,
-	1098=>620,1099=>717,1100=>523,1101=>510,1102=>744,1103=>542,1105=>556,1106=>556,1107=>383,1108=>510,1109=>500,1110=>222,1111=>278,1112=>222,1113=>873,1114=>811,
-	1115=>556,1118=>500,1119=>542,1120=>976,1121=>766,1122=>656,1123=>521,1124=>950,1125=>694,1126=>667,1127=>597,1128=>952,1129=>817,1130=>654,1131=>600,1132=>932,
-	1133=>817,1134=>604,1135=>458,1136=>804,1137=>729,1138=>778,1139=>556,1140=>667,1141=>500,1142=>667,1143=>500,1144=>1279,1145=>1060,1146=>778,1147=>556,1148=>976,
-	1149=>766,1150=>976,1151=>766,1152=>722,1153=>514,1154=>686,1155=>334,1156=>382,1157=>334,1158=>334,1168=>435,1169=>339,1170=>567,1171=>383,1172=>656,1173=>556,
-	1174=>923,1175=>669,1176=>604,1177=>458,1178=>584,1179=>437,1180=>584,1181=>437,1182=>584,1183=>437,1184=>764,1185=>537,1186=>741,1187=>573,1188=>900,1189=>670,
-	1190=>736,1191=>560,1192=>778,1193=>560,1194=>722,1195=>500,1196=>611,1197=>458,1198=>667,1199=>500,1200=>667,1201=>500,1202=>667,1203=>500,1204=>916,1205=>661,
-	1206=>684,1207=>533,1208=>684,1209=>533,1210=>684,1211=>556,1212=>829,1213=>667,1214=>829,1215=>667,1216=>278,1217=>923,1218=>669,1219=>584,1220=>437,1223=>735,
-	1224=>570,1227=>684,1228=>533,1232=>667,1233=>556,1234=>667,1235=>556,1236=>1000,1237=>889,1238=>667,1239=>556,1240=>729,1241=>556,1242=>729,1243=>556,1244=>923,
-	1245=>669,1246=>604,1247=>458,1248=>604,1249=>492,1250=>722,1251=>559,1252=>722,1253=>559,1254=>778,1255=>556,1256=>778,1257=>556,1258=>778,1259=>556,1262=>635,
-	1263=>500,1264=>635,1265=>500,1266=>635,1267=>500,1268=>684,1269=>533,1272=>883,1273=>717,1329=>635,1330=>531,1331=>583,1332=>583,1333=>531,1334=>531,1335=>427,
-	1336=>531,1337=>750,1338=>635,1339=>531,1340=>375,1341=>583,1342=>698,1343=>531,1344=>427,1345=>531,1346=>583,1347=>531,1348=>635,1349=>698,1350=>635,1351=>635,
-	1352=>531,1353=>531,1354=>698,1355=>531,1356=>635,1357=>531,1358=>698,1359=>583,1360=>479,1361=>583,1362=>531,1363=>698,1364=>698,1365=>635,1366=>750,1369=>271,
-	1370=>271,1371=>150,1372=>300,1373=>271,1374=>271,1375=>420,1377=>583,1378=>427,1379=>427,1380=>427,1381=>427,1382=>427,1383=>427,1384=>427,1385=>459,1386=>427,
-	1387=>427,1388=>323,1389=>531,1390=>427,1391=>427,1392=>427,1393=>427,1394=>427,1395=>427,1396=>427,1397=>271,1398=>427,1399=>375,1400=>427,1401=>375,1402=>583,
-	1403=>427,1404=>427,1405=>427,1406=>427,1407=>583,1408=>427,1409=>427,1410=>323,1411=>583,1412=>375,1413=>375,1414=>583,1415=>527,1417=>271,1425=>360,1426=>360,
-	1427=>360,1428=>360,1429=>360,1430=>360,1431=>360,1432=>360,1433=>360,1434=>360,1435=>360,1436=>360,1437=>360,1438=>360,1439=>360,1440=>360,1441=>360,1443=>360,
-	1444=>360,1445=>360,1446=>360,1447=>360,1448=>360,1449=>360,1450=>360,1451=>360,1452=>360,1453=>360,1454=>360,1455=>360,1456=>360,1457=>360,1458=>360,1459=>360,
-	1460=>360,1461=>360,1462=>360,1463=>360,1464=>360,1465=>360,1467=>360,1468=>360,1469=>360,1470=>366,1471=>360,1472=>225,1473=>360,1474=>360,1475=>238,1476=>360,
-	1488=>577,1489=>563,1490=>411,1491=>512,1492=>594,1493=>316,1494=>326,1495=>594,1496=>594,1497=>316,1498=>507,1499=>527,1500=>484,1501=>594,1502=>594,1503=>316,
-	1504=>338,1505=>604,1506=>550,1507=>567,1508=>569,1509=>505,1510=>514,1511=>583,1512=>507,1513=>700,1514=>633,1520=>590,1521=>590,1522=>590,1523=>216,1524=>412,
-	1548=>278,1563=>278,1567=>556,1569=>529,1570=>243,1571=>243,1572=>470,1573=>243,1574=>731,1575=>243,1576=>771,1577=>514,1578=>771,1579=>771,1580=>544,1581=>544,
-	1582=>544,1583=>430,1584=>430,1585=>421,1586=>421,1587=>1194,1588=>1194,1589=>1291,1590=>1291,1591=>843,1592=>843,1593=>594,1594=>594,1600=>279,1601=>957,1602=>800,
-	1603=>757,1604=>662,1605=>589,1606=>692,1607=>514,1608=>470,1609=>731,1610=>731,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,
-	1632=>480,1633=>480,1634=>480,1635=>480,1636=>480,1637=>480,1638=>480,1639=>480,1640=>480,1641=>480,1642=>547,1643=>278,1644=>278,1645=>438,1648=>0,1649=>243,
-	1650=>243,1651=>243,1652=>0,1653=>380,1654=>470,1655=>548,1656=>772,1657=>771,1658=>771,1659=>771,1660=>771,1661=>771,1662=>771,1663=>771,1664=>771,1665=>544,
-	1666=>544,1667=>544,1668=>544,1669=>544,1670=>544,1671=>544,1672=>430,1673=>430,1674=>430,1675=>430,1676=>430,1677=>430,1678=>430,1679=>430,1680=>430,1681=>421,
-	1682=>421,1683=>421,1684=>421,1685=>421,1686=>419,1687=>421,1688=>421,1689=>421,1690=>1194,1691=>1194,1692=>1194,1693=>1291,1694=>1291,1695=>843,1696=>594,1697=>957,
-	1698=>957,1699=>957,1700=>957,1701=>957,1702=>957,1703=>800,1704=>800,1705=>828,1706=>1058,1707=>828,1708=>757,1709=>757,1710=>757,1711=>828,1712=>828,1713=>828,
-	1714=>828,1715=>828,1716=>828,1717=>662,1718=>662,1719=>662,1722=>692,1723=>692,1724=>692,1725=>692,1726=>706,1728=>514,1729=>509,1730=>509,1731=>509,1732=>470,
-	1733=>470,1734=>470,1735=>470,1736=>470,1737=>470,1738=>470,1739=>470,1740=>731,1741=>841,1742=>731,1744=>731,1745=>731,1746=>550,1747=>550,1748=>279,1749=>514,
-	1750=>726,1751=>558,1752=>321,1753=>318,1754=>342,1755=>373,1756=>716,1757=>688,1758=>852,1759=>288,1760=>288,1761=>388,1762=>350,1763=>716,1764=>146,1765=>282,
-	1766=>339,1767=>339,1768=>415,1769=>514,1770=>220,1771=>220,1772=>220,1773=>350,1776=>480,1777=>480,1778=>480,1779=>480,1780=>480,1781=>480,1782=>480,1783=>480,
-	1784=>480,1785=>480,2305=>0,2306=>0,2307=>294,2309=>693,2310=>910,2311=>533,2312=>533,2313=>590,2314=>713,2315=>920,2316=>677,2317=>611,2318=>611,2319=>611,
-	2320=>611,2321=>910,2322=>910,2323=>910,2324=>910,2325=>667,2326=>732,2327=>593,2328=>639,2329=>624,2330=>688,2331=>713,2332=>688,2333=>712,2334=>697,2335=>502,
-	2336=>533,2337=>583,2338=>523,2339=>693,2340=>585,2341=>638,2342=>533,2343=>640,2344=>585,2345=>585,2346=>565,2347=>699,2348=>592,2349=>689,2350=>633,2351=>600,
-	2352=>486,2353=>486,2354=>680,2355=>730,2356=>730,2357=>592,2358=>684,2359=>608,2360=>646,2361=>546,2364=>0,2365=>373,2366=>319,2367=>319,2368=>319,2369=>0,
-	2370=>0,2371=>0,2372=>0,2373=>0,2374=>0,2375=>0,2376=>0,2377=>319,2378=>319,2379=>319,2380=>319,2381=>0,2384=>884,2385=>0,2386=>0,2387=>0,
-	2388=>0,2392=>667,2393=>732,2394=>593,2395=>688,2396=>583,2397=>523,2398=>699,2399=>600,2400=>920,2401=>677,2402=>0,2403=>0,2404=>331,2405=>513,2406=>639,
-	2407=>639,2408=>639,2409=>639,2410=>639,2411=>639,2412=>639,2413=>639,2414=>639,2415=>639,2416=>362,2433=>0,2434=>430,2435=>430,2437=>786,2438=>1030,2439=>582,
-	2440=>603,2441=>648,2442=>757,2443=>758,2444=>630,2447=>685,2448=>746,2451=>711,2452=>776,2453=>779,2454=>655,2455=>606,2456=>645,2457=>661,2458=>554,2459=>585,
-	2460=>729,2461=>752,2462=>893,2463=>567,2464=>625,2465=>648,2466=>567,2467=>598,2468=>680,2469=>645,2470=>609,2471=>596,2472=>595,2474=>635,2475=>780,2476=>593,
-	2477=>677,2478=>621,2479=>601,2480=>593,2482=>640,2486=>598,2487=>596,2488=>637,2489=>582,2492=>0,2494=>245,2495=>245,2496=>245,2497=>0,2498=>0,2499=>0,
-	2500=>0,2503=>309,2504=>309,2507=>932,2508=>932,2509=>0,2519=>245,2524=>648,2525=>553,2527=>596,2528=>758,2529=>630,2530=>0,2531=>335,2534=>610,2535=>559,
-	2536=>595,2537=>711,2538=>610,2539=>661,2540=>661,2541=>559,2542=>661,2543=>600,2544=>593,2545=>593,2546=>601,2547=>567,2548=>601,2549=>699,2550=>661,2551=>267,
-	2552=>610,2553=>424,2554=>548,2562=>0,2565=>691,2566=>936,2567=>803,2568=>803,2569=>678,2570=>678,2575=>557,2576=>691,2579=>678,2580=>691,2581=>602,2582=>567,
-	2583=>641,2584=>688,2585=>565,2586=>592,2587=>603,2588=>591,2589=>541,2590=>558,2591=>543,2592=>581,2593=>596,2594=>640,2595=>640,2596=>591,2597=>564,2598=>640,
-	2599=>564,2600=>581,2602=>564,2603=>551,2604=>560,2605=>549,2606=>558,2607=>652,2608=>540,2610=>677,2611=>677,2613=>601,2614=>558,2616=>558,2617=>549,2620=>0,
-	2622=>246,2623=>246,2624=>246,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>567,2650=>690,2651=>591,2652=>591,2654=>581,2662=>591,
-	2663=>591,2664=>591,2665=>591,2666=>591,2667=>591,2668=>591,2669=>591,2670=>591,2671=>591,2672=>0,2673=>0,2674=>557,2675=>678,2676=>894,2689=>0,2690=>0,
-	2691=>300,2693=>781,2694=>1044,2695=>589,2696=>589,2697=>560,2698=>758,2699=>806,2701=>781,2703=>781,2704=>781,2705=>1044,2707=>1044,2708=>1044,2709=>413,2710=>773,
-	2711=>606,2712=>558,2713=>483,2714=>600,2715=>691,2716=>811,2717=>647,2718=>651,2719=>453,2720=>450,2721=>425,2722=>478,2723=>694,2724=>534,2725=>553,2726=>446,
-	2727=>541,2728=>582,2730=>572,2731=>437,2732=>663,2733=>756,2734=>594,2735=>493,2736=>392,2738=>613,2739=>656,2741=>538,2742=>611,2743=>507,2744=>663,2745=>587,
-	2748=>0,2749=>478,2750=>273,2751=>273,2752=>273,2753=>0,2754=>0,2755=>0,2756=>0,2757=>0,2759=>0,2760=>0,2761=>273,2763=>273,2764=>273,2765=>0,
-	2768=>843,2784=>893,2790=>625,2791=>625,2792=>625,2793=>625,2794=>625,2795=>625,2796=>625,2797=>625,2798=>625,2799=>625,2817=>0,2818=>306,2819=>391,2821=>590,
-	2822=>808,2823=>658,2824=>658,2825=>633,2826=>654,2827=>636,2828=>540,2831=>560,2832=>938,2835=>600,2836=>973,2837=>603,2838=>620,2839=>620,2840=>605,2841=>712,
-	2842=>579,2843=>579,2844=>593,2845=>564,2846=>581,2847=>604,2848=>578,2849=>579,2850=>579,2851=>607,2852=>579,2853=>587,2854=>579,2855=>602,2856=>579,2858=>605,
-	2859=>728,2860=>579,2861=>643,2862=>605,2863=>628,2864=>619,2866=>653,2867=>593,2870=>620,2871=>605,2872=>605,2873=>579,2876=>0,2877=>333,2878=>218,2879=>0,
-	2880=>294,2881=>0,2882=>0,2883=>0,2887=>479,2888=>479,2891=>1026,2892=>1026,2893=>0,2902=>0,2903=>218,2908=>579,2909=>579,2911=>599,2912=>636,2913=>540,
-	2918=>578,2919=>480,2920=>480,2921=>622,2922=>506,2923=>605,2924=>529,2925=>548,2926=>512,2927=>528,2928=>561,2946=>0,2947=>742,2949=>1002,2950=>1118,2951=>994,
-	2952=>660,2953=>1012,2954=>1231,2958=>726,2959=>731,2960=>870,2962=>763,2963=>763,2964=>1636,2965=>667,2969=>830,2970=>584,2972=>876,2974=>986,2975=>802,2979=>1295,
-	2980=>656,2984=>630,2985=>1012,2986=>694,2990=>727,2991=>790,2992=>545,2993=>718,2994=>821,2995=>871,2996=>724,2997=>873,2999=>1087,3000=>1098,3001=>1274,3006=>547,
-	3007=>172,3008=>93,3009=>519,3010=>814,3014=>748,3015=>681,3016=>956,3018=>1666,3019=>1666,3020=>1994,3021=>0,3031=>871,3047=>667,3048=>1012,3049=>751,3050=>740,
-	3051=>924,3052=>884,3053=>726,3054=>1002,3055=>825,3056=>717,3057=>719,3058=>774,3073=>365,3074=>601,3075=>346,3077=>720,3078=>786,3079=>567,3080=>1159,3081=>690,
-	3082=>1047,3083=>1299,3084=>913,3086=>625,3087=>625,3088=>712,3090=>655,3091=>655,3092=>862,3093=>515,3094=>680,3095=>526,3096=>943,3097=>655,3098=>684,3099=>684,
-	3100=>670,3101=>1205,3102=>732,3103=>888,3104=>597,3105=>709,3106=>709,3107=>809,3108=>715,3109=>702,3110=>702,3111=>702,3112=>607,3114=>623,3115=>623,3116=>681,
-	3117=>681,3118=>932,3119=>1203,3120=>597,3121=>893,3122=>631,3123=>608,3125=>620,3126=>541,3127=>667,3128=>640,3129=>911,3134=>644,3135=>298,3136=>298,3137=>361,
-	3138=>682,3139=>342,3140=>704,3142=>624,3143=>624,3144=>900,3146=>849,3147=>849,3148=>976,3149=>669,3157=>298,3158=>119,3168=>1620,3169=>1281,3174=>840,3175=>840,
-	3176=>840,3177=>840,3178=>840,3179=>840,3180=>840,3181=>840,3182=>840,3183=>840,3202=>440,3203=>251,3205=>654,3206=>654,3207=>631,3208=>891,3209=>957,3210=>1293,
-	3211=>1044,3212=>744,3214=>650,3215=>650,3216=>659,3218=>667,3219=>667,3220=>667,3221=>462,3222=>749,3223=>543,3224=>779,3225=>674,3226=>682,3227=>660,3228=>667,
-	3229=>1171,3230=>926,3231=>671,3232=>557,3233=>669,3234=>669,3235=>728,3236=>544,3237=>672,3238=>672,3239=>672,3240=>560,3242=>668,3243=>668,3244=>681,3245=>687,
-	3246=>972,3247=>1101,3248=>556,3249=>677,3250=>661,3251=>545,3253=>666,3254=>553,3255=>670,3256=>549,3257=>716,3262=>425,3263=>341,3264=>680,3265=>354,3266=>714,
-	3267=>386,3268=>638,3270=>307,3271=>670,3272=>462,3274=>908,3275=>1251,3276=>434,3277=>336,3285=>344,3286=>404,3294=>673,3296=>1695,3297=>978,3302=>549,3303=>549,
-	3304=>549,3305=>549,3306=>549,3307=>549,3308=>549,3309=>549,3310=>549,3311=>549,3330=>368,3331=>305,3333=>1201,3334=>1351,3335=>905,3336=>1459,3337=>635,3338=>1198,
-	3339=>861,3340=>957,3342=>1211,3343=>1202,3344=>1839,3346=>642,3347=>1114,3348=>1195,3349=>861,3350=>982,3351=>874,3352=>1354,3353=>957,3354=>1016,3355=>1266,3356=>712,
-	3357=>1454,3358=>1215,3359=>563,3360=>565,3361=>1192,3362=>1244,3363=>1268,3364=>878,3365=>966,3366=>545,3367=>879,3368=>879,3370=>1031,3371=>1175,3372=>1334,3373=>546,
-	3374=>643,3375=>949,3376=>642,3377=>555,3378=>945,3379=>631,3380=>553,3381=>959,3382=>936,3383=>1122,3384=>1190,3385=>1112,3390=>475,3391=>418,3392=>442,3393=>340,
-	3394=>340,3395=>473,3398=>640,3399=>530,3400=>1279,3402=>1368,3403=>1258,3404=>1447,3405=>0,3415=>553,3424=>861,3425=>1100,3430=>1095,3431=>929,3432=>854,3433=>1181,
-	3434=>658,3435=>972,3436=>1210,3437=>650,3438=>959,3439=>896,3585=>595,3586=>648,3587=>665,3588=>608,3589=>608,3590=>665,3591=>471,3592=>556,3593=>652,3594=>664,
-	3595=>681,3596=>816,3597=>849,3598=>620,3599=>620,3600=>541,3601=>785,3602=>826,3603=>887,3604=>598,3605=>605,3606=>595,3607=>650,3608=>541,3609=>652,3610=>608,
-	3611=>608,3612=>630,3613=>630,3614=>695,3615=>695,3616=>620,3617=>581,3618=>588,3619=>501,3620=>595,3621=>569,3622=>620,3623=>519,3624=>592,3625=>659,3626=>574,
-	3627=>654,3628=>695,3629=>566,3630=>574,3631=>517,3632=>452,3633=>0,3634=>496,3635=>496,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-	3647=>687,3648=>302,3649=>571,3650=>478,3651=>515,3652=>515,3653=>496,3654=>506,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,
-	3663=>555,3664=>598,3665=>640,3666=>688,3667=>690,3668=>657,3669=>657,3670=>635,3671=>839,3672=>693,3673=>769,3674=>673,3675=>994,3713=>775,3714=>707,3716=>724,
-	3719=>524,3720=>690,3722=>678,3725=>711,3732=>719,3733=>834,3734=>776,3735=>916,3737=>744,3738=>740,3739=>740,3740=>834,3741=>834,3742=>854,3743=>854,3745=>775,
-	3746=>724,3747=>697,3749=>700,3751=>700,3754=>708,3755=>916,3757=>700,3758=>697,3759=>658,3760=>432,3761=>534,3762=>476,3763=>476,3764=>778,3765=>778,3766=>778,
-	3767=>778,3768=>778,3769=>778,3771=>778,3772=>778,3773=>670,3776=>420,3777=>806,3778=>430,3779=>446,3780=>346,3782=>571,3784=>778,3785=>778,3786=>778,3787=>778,
-	3788=>778,3789=>778,3792=>721,3793=>719,3794=>601,3795=>711,3796=>686,3797=>686,3798=>834,3799=>756,3800=>724,3801=>906,3804=>1272,3805=>1272,3840=>600,3841=>600,
-	3842=>600,3843=>600,3844=>600,3845=>600,3846=>600,3847=>600,3848=>600,3849=>600,3850=>600,3851=>600,3852=>600,3853=>600,3854=>600,3855=>600,3856=>600,3857=>600,
-	3858=>600,3859=>600,3860=>600,3861=>600,3862=>600,3863=>600,3864=>600,3865=>600,3866=>600,3867=>600,3868=>600,3869=>600,3870=>600,3871=>600,3872=>600,3873=>600,
-	3874=>600,3875=>600,3876=>600,3877=>600,3878=>600,3879=>600,3880=>600,3881=>600,3882=>600,3883=>600,3884=>600,3885=>600,3886=>600,3887=>600,3888=>600,3889=>600,
-	3890=>600,3891=>600,3892=>600,3893=>600,3894=>600,3895=>600,3896=>600,3897=>600,3898=>600,3899=>600,3900=>600,3901=>600,3902=>600,3903=>600,3904=>600,3905=>600,
-	3906=>600,3907=>600,3908=>600,3909=>600,3910=>600,3911=>600,3913=>600,3914=>600,3915=>600,3916=>600,3917=>600,3918=>600,3919=>600,3920=>600,3921=>600,3922=>600,
-	3923=>600,3924=>600,3925=>600,3926=>600,3927=>600,3928=>600,3929=>600,3930=>600,3931=>600,3932=>600,3933=>600,3934=>600,3935=>600,3936=>600,3937=>600,3938=>600,
-	3939=>600,3940=>600,3941=>600,3942=>600,3943=>600,3944=>600,3945=>600,3953=>600,3954=>600,3955=>600,3956=>600,3957=>600,3958=>600,3959=>600,3960=>600,3961=>600,
-	3962=>600,3963=>600,3964=>600,3965=>600,3966=>600,3967=>600,3968=>600,3969=>600,3970=>600,3971=>600,3972=>600,3973=>600,3974=>600,3975=>600,3976=>600,3977=>600,
-	3978=>600,3979=>600,3984=>600,3985=>600,3986=>600,3987=>600,3988=>600,3989=>600,3991=>600,3993=>600,3994=>600,3995=>600,3996=>600,3997=>600,3998=>600,3999=>600,
-	4000=>600,4001=>600,4002=>600,4003=>600,4004=>600,4005=>600,4006=>600,4007=>600,4008=>600,4009=>600,4010=>600,4011=>600,4012=>600,4013=>600,4017=>600,4018=>600,
-	4019=>600,4020=>600,4021=>600,4022=>600,4023=>600,4025=>600,4256=>662,4257=>677,4258=>708,4259=>696,4260=>609,4261=>790,4262=>664,4263=>785,4264=>560,4265=>634,
-	4266=>782,4267=>701,4268=>629,4269=>682,4270=>705,4271=>692,4272=>734,4273=>615,4274=>592,4275=>680,4276=>679,4277=>705,4278=>643,4279=>623,4280=>623,4281=>629,
-	4282=>633,4283=>770,4284=>592,4285=>662,4286=>629,4287=>672,4288=>735,4289=>576,4290=>606,4291=>605,4292=>676,4293=>792,4304=>435,4305=>556,4306=>565,4307=>872,
-	4308=>506,4309=>544,4310=>723,4311=>868,4312=>530,4313=>532,4314=>955,4315=>552,4316=>565,4317=>712,4318=>547,4319=>574,4320=>685,4321=>554,4322=>806,4323=>810,
-	4324=>777,4325=>502,4326=>686,4327=>512,4328=>552,4329=>496,4330=>568,4331=>552,4332=>592,4333=>565,4334=>552,4335=>741,4336=>549,4337=>659,4338=>559,4339=>524,
-	4340=>482,4341=>565,4342=>822,4347=>506,4352=>1000,4353=>1000,4354=>1000,4355=>1000,4356=>1000,4357=>1000,4358=>1000,4359=>1000,4360=>1000,4361=>1000,4362=>1000,4363=>1000,
-	4364=>1000,4365=>1000,4366=>1000,4367=>1000,4368=>1000,4369=>1000,4370=>1000,4371=>1000,4372=>1000,4373=>1000,4374=>1000,4375=>1000,4376=>1000,4377=>1000,4378=>1000,4379=>1000,
-	4380=>1000,4381=>1000,4382=>1000,4383=>1000,4384=>1000,4385=>1000,4386=>1000,4387=>1000,4388=>1000,4389=>1000,4390=>1000,4391=>1000,4392=>1000,4393=>1000,4394=>1000,4395=>1000,
-	4396=>1000,4397=>1000,4398=>1000,4399=>1000,4400=>1000,4401=>1000,4402=>1000,4403=>1000,4404=>1000,4405=>1000,4406=>1000,4407=>1000,4408=>1000,4409=>1000,4410=>1000,4411=>1000,
-	4412=>1000,4413=>1000,4414=>1000,4415=>1000,4416=>1000,4417=>1000,4418=>1000,4419=>1000,4420=>1000,4421=>1000,4422=>1000,4423=>1000,4424=>1000,4425=>1000,4426=>1000,4427=>1000,
-	4428=>1000,4429=>1000,4430=>1000,4431=>1000,4432=>1000,4433=>1000,4434=>1000,4435=>1000,4436=>1000,4437=>1000,4438=>1000,4439=>1000,4440=>1000,4441=>1000,4447=>1000,4448=>1000,
-	4449=>1000,4450=>1000,4451=>1000,4452=>1000,4453=>1000,4454=>1000,4455=>1000,4456=>1000,4457=>1000,4458=>1000,4459=>1000,4460=>1000,4461=>1000,4462=>1000,4463=>1000,4464=>1000,
-	4465=>1000,4466=>1000,4467=>1000,4468=>1000,4469=>1000,4470=>1000,4471=>1000,4472=>1000,4473=>1000,4474=>1000,4475=>1000,4476=>1000,4477=>1000,4478=>1000,4479=>1000,4480=>1000,
-	4481=>1000,4482=>1000,4483=>1000,4484=>1000,4485=>1000,4486=>1000,4487=>1000,4488=>1000,4489=>1000,4490=>1000,4491=>1000,4492=>1000,4493=>1000,4494=>1000,4495=>1000,4496=>1000,
-	4497=>1000,4498=>1000,4499=>1000,4500=>1000,4501=>1000,4502=>1000,4503=>1000,4504=>1000,4505=>1000,4506=>1000,4507=>1000,4508=>1000,4509=>1000,4510=>1000,4511=>1000,4512=>1000,
-	4513=>1000,4514=>1000,4520=>1000,4521=>1000,4522=>1000,4523=>1000,4524=>1000,4525=>1000,4526=>1000,4527=>1000,4528=>1000,4529=>1000,4530=>1000,4531=>1000,4532=>1000,4533=>1000,
-	4534=>1000,4535=>1000,4536=>1000,4537=>1000,4538=>1000,4539=>1000,4540=>1000,4541=>1000,4542=>1000,4543=>1000,4544=>1000,4545=>1000,4546=>1000,4547=>1000,4548=>1000,4549=>1000,
-	4550=>1000,4551=>1000,4552=>1000,4553=>1000,4554=>1000,4555=>1000,4556=>1000,4557=>1000,4558=>1000,4559=>1000,4560=>1000,4561=>1000,4562=>1000,4563=>1000,4564=>1000,4565=>1000,
-	4566=>1000,4567=>1000,4568=>1000,4569=>1000,4570=>1000,4571=>1000,4572=>1000,4573=>1000,4574=>1000,4575=>1000,4576=>1000,4577=>1000,4578=>1000,4579=>1000,4580=>1000,4581=>1000,
-	4582=>1000,4583=>1000,4584=>1000,4585=>1000,4586=>1000,4587=>1000,4588=>1000,4589=>1000,4590=>1000,4591=>1000,4592=>1000,4593=>1000,4594=>1000,4595=>1000,4596=>1000,4597=>1000,
-	4598=>1000,4599=>1000,4600=>1000,4601=>1000,7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,7691=>556,
-	7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,
-	7708=>667,7709=>556,7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,7721=>556,7722=>722,7723=>556,
-	7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-	7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,
-	7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,7771=>333,
-	7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,
-	7788=>611,7789=>278,7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,
-	7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-	7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,7831=>278,7832=>722,7833=>500,7834=>556,7835=>278,
-	7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,7855=>556,
-	7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,
-	7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,7885=>556,7886=>778,7887=>556,
-	7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,7895=>556,7896=>778,7897=>556,7898=>776,7899=>556,7900=>776,7901=>556,7902=>776,7903=>556,
-	7904=>776,7905=>556,7906=>776,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>620,7914=>776,7915=>620,7916=>776,7917=>620,7918=>776,7919=>620,
-	7920=>776,7921=>620,7922=>667,7923=>500,7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>576,7937=>576,7938=>576,7939=>576,7940=>576,7941=>576,
-	7942=>576,7943=>576,7944=>667,7945=>667,7946=>680,7947=>680,7948=>680,7949=>680,7950=>718,7951=>718,7952=>434,7953=>434,7954=>434,7955=>434,7956=>434,7957=>434,
-	7960=>692,7961=>692,7962=>823,7963=>823,7964=>823,7965=>823,7968=>556,7969=>556,7970=>556,7971=>556,7972=>556,7973=>556,7974=>556,7975=>556,7976=>747,7977=>747,
-	7978=>878,7979=>878,7980=>878,7981=>878,7982=>923,7983=>923,7984=>222,7985=>222,7986=>222,7987=>222,7988=>222,7989=>222,7990=>222,7991=>222,7992=>303,7993=>303,
-	7994=>434,7995=>434,7996=>434,7997=>434,7998=>479,7999=>479,8000=>556,8001=>556,8002=>556,8003=>556,8004=>556,8005=>556,8008=>778,8009=>778,8010=>894,8011=>894,
-	8012=>894,8013=>894,8016=>551,8017=>551,8018=>551,8019=>551,8020=>551,8021=>551,8022=>551,8023=>551,8025=>777,8027=>893,8029=>885,8031=>940,8032=>766,8033=>766,
-	8034=>766,8035=>766,8036=>766,8037=>766,8038=>766,8039=>766,8040=>758,8041=>758,8042=>874,8043=>874,8044=>868,8045=>867,8046=>911,8047=>911,8048=>576,8049=>576,
-	8050=>434,8051=>434,8052=>556,8053=>556,8054=>222,8055=>222,8056=>556,8057=>556,8058=>551,8059=>551,8060=>766,8061=>766,8064=>576,8065=>576,8066=>576,8067=>576,
-	8068=>576,8069=>576,8070=>576,8071=>576,8072=>667,8073=>667,8074=>680,8075=>680,8076=>680,8077=>680,8078=>718,8079=>718,8080=>556,8081=>556,8082=>556,8083=>556,
-	8084=>556,8085=>556,8086=>556,8087=>556,8088=>747,8089=>747,8090=>878,8091=>878,8092=>878,8093=>878,8094=>923,8095=>923,8096=>766,8097=>766,8098=>766,8099=>766,
-	8100=>766,8101=>766,8102=>766,8103=>766,8104=>758,8105=>758,8106=>874,8107=>874,8108=>868,8109=>867,8110=>911,8111=>911,8112=>576,8113=>576,8114=>576,8115=>576,
-	8116=>576,8118=>576,8119=>576,8120=>667,8121=>667,8122=>667,8123=>667,8124=>667,8125=>278,8126=>278,8127=>278,8128=>278,8129=>278,8130=>556,8131=>556,8132=>556,
-	8134=>556,8135=>556,8136=>693,8137=>704,8138=>748,8139=>759,8140=>722,8141=>278,8142=>278,8143=>278,8144=>222,8145=>222,8146=>222,8147=>222,8150=>222,8151=>222,
-	8152=>278,8153=>278,8154=>304,8155=>304,8157=>278,8158=>278,8159=>278,8160=>551,8161=>551,8162=>551,8163=>551,8164=>571,8165=>571,8166=>551,8167=>551,8168=>667,
-	8169=>667,8170=>742,8171=>746,8172=>693,8173=>278,8174=>278,8175=>278,8178=>766,8179=>766,8180=>766,8182=>766,8183=>766,8184=>778,8185=>778,8186=>758,8187=>758,
-	8188=>758,8189=>278,8190=>278,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>100,8202=>50,8203=>0,8204=>0,
-	8205=>0,8208=>333,8209=>333,8210=>556,8213=>564,8214=>428,8215=>500,8219=>222,8223=>333,8227=>350,8228=>278,8229=>556,8231=>278,8232=>0,8233=>0,8241=>1330,
-	8242=>222,8243=>372,8244=>522,8245=>206,8246=>356,8247=>506,8248=>312,8251=>1000,8252=>471,8253=>556,8254=>500,8255=>945,8256=>945,8257=>312,8258=>820,8259=>333,
-	8260=>167,8261=>278,8262=>278,8304=>333,8308=>333,8309=>333,8310=>333,8311=>333,8312=>333,8313=>333,8314=>333,8315=>333,8316=>333,8317=>210,8318=>210,8319=>333,
-	8320=>333,8321=>333,8322=>333,8323=>333,8324=>333,8325=>333,8326=>333,8327=>333,8328=>333,8329=>333,8330=>333,8331=>333,8332=>333,8333=>210,8334=>210,8352=>556,
-	8353=>556,8354=>556,8355=>556,8356=>556,8357=>833,8358=>556,8359=>556,8360=>1024,8361=>940,8362=>784,8363=>556,8400=>600,8401=>600,8402=>600,8403=>600,8404=>700,
-	8405=>700,8406=>600,8407=>600,8408=>600,8409=>600,8410=>600,8411=>600,8412=>600,8413=>900,8414=>900,8415=>900,8416=>900,8417=>700,8448=>889,8449=>889,8450=>667,
-	8451=>1022,8452=>611,8453=>889,8454=>889,8455=>501,8456=>667,8457=>921,8458=>510,8459=>906,8460=>988,8461=>722,8462=>500,8463=>500,8464=>688,8465=>553,8466=>708,
-	8467=>291,8468=>778,8469=>722,8470=>1073,8471=>737,8472=>740,8473=>556,8474=>722,8475=>927,8476=>795,8477=>667,8478=>667,8479=>667,8480=>1000,8481=>1174,8483=>722,
-	8484=>611,8485=>542,8486=>768,8487=>768,8488=>698,8489=>321,8490=>667,8491=>667,8492=>927,8493=>646,8494=>556,8495=>385,8496=>615,8497=>688,8498=>611,8499=>1115,
-	8500=>406,8501=>688,8502=>688,8503=>344,8504=>688,8531=>834,8532=>834,8533=>834,8534=>834,8535=>834,8536=>834,8537=>834,8538=>834,8539=>834,8540=>834,8541=>834,
-	8542=>834,8543=>834,8544=>278,8545=>555,8546=>832,8547=>933,8548=>667,8549=>934,8550=>1031,8551=>1268,8552=>944,8553=>667,8554=>944,8555=>1035,8556=>556,8557=>722,
-	8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>700,8564=>500,8565=>700,8566=>922,8567=>1144,8568=>712,8569=>500,8570=>712,8571=>934,8572=>222,8573=>500,
-	8574=>556,8575=>833,8576=>983,8577=>722,8578=>983,8592=>713,8593=>713,8594=>713,8595=>713,8596=>713,8597=>713,8598=>713,8599=>713,8600=>713,8601=>713,8602=>713,
-	8603=>713,8604=>713,8605=>713,8606=>713,8607=>713,8608=>713,8609=>713,8610=>713,8611=>713,8612=>713,8613=>713,8614=>713,8615=>713,8616=>713,8617=>713,8618=>713,
-	8619=>713,8620=>713,8621=>813,8622=>813,8623=>713,8624=>713,8625=>713,8626=>713,8627=>713,8628=>713,8629=>713,8630=>713,8631=>713,8632=>713,8633=>713,8634=>800,
-	8635=>800,8636=>713,8637=>713,8638=>713,8639=>713,8640=>713,8641=>713,8642=>713,8643=>713,8644=>713,8645=>713,8646=>713,8647=>713,8648=>713,8649=>713,8650=>713,
-	8651=>713,8652=>713,8653=>713,8654=>950,8655=>713,8656=>713,8657=>713,8658=>713,8659=>713,8660=>863,8661=>713,8662=>713,8663=>713,8664=>713,8665=>713,8666=>713,
-	8667=>713,8668=>813,8669=>813,8670=>713,8671=>713,8672=>713,8673=>713,8674=>713,8675=>713,8676=>713,8677=>713,8678=>713,8679=>713,8680=>713,8681=>713,8682=>713,
-	8704=>600,8705=>600,8706=>494,8707=>600,8708=>600,8709=>800,8710=>612,8711=>612,8712=>549,8713=>549,8714=>549,8715=>549,8716=>549,8717=>549,8718=>549,8719=>823,
-	8720=>823,8721=>713,8722=>584,8723=>584,8724=>584,8725=>167,8726=>278,8727=>389,8728=>400,8729=>400,8730=>600,8731=>600,8732=>600,8733=>549,8734=>549,8735=>584,
-	8736=>584,8737=>584,8738=>584,8739=>260,8740=>444,8741=>418,8742=>602,8743=>561,8744=>561,8745=>561,8746=>561,8747=>506,8748=>806,8749=>1106,8750=>506,8751=>806,
-	8752=>1106,8753=>506,8754=>506,8755=>506,8756=>561,8757=>561,8758=>422,8759=>561,8760=>584,8761=>584,8762=>584,8763=>584,8764=>584,8765=>584,8766=>584,8767=>584,
-	8768=>422,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,8775=>584,8776=>584,8777=>584,8778=>584,8779=>584,8780=>584,8781=>584,8782=>584,8783=>584,
-	8784=>584,8785=>584,8786=>584,8787=>584,8788=>737,8789=>737,8790=>584,8791=>584,8792=>584,8793=>584,8794=>584,8795=>584,8796=>584,8797=>584,8798=>584,8799=>584,
-	8800=>584,8801=>584,8802=>584,8803=>584,8804=>584,8805=>584,8806=>584,8807=>584,8808=>584,8809=>584,8810=>969,8811=>969,8812=>584,8813=>584,8814=>584,8815=>584,
-	8816=>584,8817=>584,8818=>584,8819=>584,8820=>584,8821=>584,8822=>584,8823=>584,8824=>584,8825=>584,8826=>584,8827=>584,8828=>584,8829=>584,8830=>584,8831=>584,
-	8832=>584,8833=>584,8834=>678,8835=>678,8836=>678,8837=>678,8838=>678,8839=>678,8840=>678,8841=>678,8842=>678,8843=>678,8844=>561,8845=>561,8846=>561,8847=>678,
-	8848=>678,8849=>673,8850=>673,8851=>561,8852=>561,8853=>800,8854=>800,8855=>800,8856=>800,8857=>800,8858=>800,8859=>800,8860=>800,8861=>800,8862=>800,8863=>800,
-	8864=>800,8865=>800,8866=>549,8867=>549,8868=>549,8869=>549,8870=>399,8871=>399,8872=>549,8873=>549,8874=>549,8875=>672,8876=>549,8877=>549,8878=>549,8879=>672,
-	8880=>549,8881=>549,8882=>549,8883=>549,8884=>549,8885=>549,8886=>713,8887=>713,8888=>713,8889=>549,8890=>549,8891=>584,8892=>584,8893=>584,8894=>584,8895=>584,
-	8896=>561,8897=>561,8898=>561,8899=>561,8900=>549,8901=>250,8902=>549,8903=>649,8904=>630,8905=>630,8906=>630,8907=>630,8908=>630,8909=>584,8910=>561,8911=>561,
-	8912=>668,8913=>668,8914=>668,8915=>668,8916=>561,8917=>602,8918=>584,8919=>584,8920=>1354,8921=>1354,8922=>584,8923=>584,8924=>584,8925=>584,8926=>584,8927=>584,
-	8928=>584,8929=>584,8930=>673,8931=>673,8932=>673,8933=>673,8934=>584,8935=>584,8936=>584,8937=>584,8938=>584,8939=>584,8940=>584,8941=>584,8942=>278,8943=>1000,
-	8944=>1000,8945=>1000,8960=>549,8962=>549,8963=>549,8964=>549,8965=>549,8966=>549,8967=>549,8968=>449,8969=>449,8970=>449,8971=>449,8972=>549,8973=>549,8974=>549,
-	8975=>549,8976=>549,8977=>549,8978=>800,8979=>800,8980=>549,8981=>549,8982=>549,8983=>650,8984=>780,8985=>549,8986=>549,8987=>549,8988=>549,8989=>549,8990=>549,
-	8991=>549,8992=>506,8993=>506,8994=>713,8995=>713,8996=>1000,8997=>1000,8998=>1000,8999=>1000,9000=>1000,9001=>329,9002=>329,9003=>1000,9004=>549,9005=>549,9006=>549,
-	9007=>549,9008=>549,9009=>549,9010=>549,9011=>549,9012=>549,9013=>549,9014=>600,9015=>600,9016=>600,9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,
-	9023=>600,9024=>600,9025=>600,9026=>600,9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,9037=>600,9038=>600,
-	9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,
-	9055=>600,9056=>600,9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,9067=>600,9068=>600,9069=>600,9070=>600,
-	9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9109=>600,9216=>600,9217=>600,9218=>600,
-	9219=>600,9220=>600,9221=>600,9222=>600,9223=>600,9224=>600,9225=>600,9226=>600,9227=>600,9228=>600,9229=>600,9230=>600,9231=>600,9232=>600,9233=>600,9234=>600,
-	9235=>600,9236=>600,9237=>600,9238=>600,9239=>600,9240=>600,9241=>600,9242=>600,9243=>600,9244=>600,9245=>600,9246=>600,9247=>600,9248=>600,9249=>600,9250=>600,
-	9251=>600,9252=>600,9280=>604,9281=>604,9282=>604,9283=>604,9284=>604,9285=>604,9286=>750,9287=>750,9288=>750,9289=>750,9290=>604,9312=>1000,9313=>1000,9314=>1000,
-	9315=>1000,9316=>1000,9317=>1000,9318=>1000,9319=>1000,9320=>1000,9321=>1000,9322=>1000,9323=>1000,9324=>1000,9325=>1000,9326=>1000,9327=>1000,9328=>1000,9329=>1000,9330=>1000,
-	9331=>1000,9332=>1000,9333=>1000,9334=>1000,9335=>1000,9336=>1000,9337=>1000,9338=>1000,9339=>1000,9340=>1000,9341=>1000,9342=>1000,9343=>1000,9344=>1000,9345=>1000,9346=>1000,
-	9347=>1000,9348=>1000,9349=>1000,9350=>1000,9351=>1000,9352=>1000,9353=>1000,9354=>1000,9355=>1000,9356=>1000,9357=>1000,9358=>1000,9359=>1000,9360=>1000,9361=>1000,9362=>1000,
-	9363=>1000,9364=>1000,9365=>1000,9366=>1000,9367=>1000,9368=>1000,9369=>1000,9370=>1000,9371=>1000,9372=>1000,9373=>1000,9374=>1000,9375=>1000,9376=>1000,9377=>1000,9378=>1000,
-	9379=>1000,9380=>1000,9381=>1000,9382=>1000,9383=>1000,9384=>1000,9385=>1000,9386=>1000,9387=>1000,9388=>1000,9389=>1000,9390=>1000,9391=>1000,9392=>1000,9393=>1000,9394=>1000,
-	9395=>1000,9396=>1000,9397=>1000,9398=>1000,9399=>1000,9400=>1000,9401=>1000,9402=>1000,9403=>1000,9404=>1000,9405=>1000,9406=>1000,9407=>1000,9408=>1000,9409=>1000,9410=>1000,
-	9411=>1000,9412=>1000,9413=>1000,9414=>1000,9415=>1000,9416=>1000,9417=>1000,9418=>1000,9419=>1000,9420=>1000,9421=>1000,9422=>1000,9423=>1000,9424=>1000,9425=>1000,9426=>1000,
-	9427=>1000,9428=>1000,9429=>1000,9430=>1000,9431=>1000,9432=>1000,9433=>1000,9434=>1000,9435=>1000,9436=>1000,9437=>1000,9438=>1000,9439=>1000,9440=>1000,9441=>1000,9442=>1000,
-	9443=>1000,9444=>1000,9445=>1000,9446=>1000,9447=>1000,9448=>1000,9449=>1000,9450=>1000,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,
-	9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,
-	9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,
-	9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,
-	9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,
-	9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,
-	9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,
-	9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,
-	9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,
-	9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,
-	9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,
-	9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,
-	9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,
-	9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,
-	9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9728=>750,9729=>1000,
-	9730=>750,9731=>750,9732=>1000,9733=>816,9734=>823,9735=>500,9736=>500,9737=>800,9738=>800,9739=>800,9740=>800,9741=>800,9742=>719,9743=>719,9744=>734,9745=>734,
-	9746=>734,9747=>762,9754=>960,9755=>960,9756=>939,9757=>939,9758=>939,9759=>939,9760=>750,9761=>600,9762=>750,9763=>750,9764=>580,9765=>460,9766=>444,9767=>650,
-	9768=>444,9769=>768,9770=>800,9771=>850,9772=>675,9773=>800,9774=>750,9775=>750,9776=>900,9777=>900,9778=>900,9779=>900,9780=>900,9781=>900,9782=>900,9783=>900,
-	9784=>750,9785=>750,9786=>750,9787=>750,9788=>750,9789=>750,9790=>750,9791=>740,9792=>740,9793=>740,9794=>740,9795=>653,9796=>490,9797=>632,9798=>780,9799=>560,
-	9800=>838,9801=>780,9802=>734,9803=>887,9804=>780,9805=>1080,9806=>896,9807=>1080,9808=>804,9809=>868,9810=>922,9811=>696,9812=>1000,9813=>1000,9814=>1000,9815=>1000,
-	9816=>1000,9817=>1000,9818=>1000,9819=>1000,9820=>1000,9821=>1000,9822=>1000,9823=>1000,9824=>722,9825=>734,9826=>674,9827=>804,9828=>722,9829=>734,9830=>674,9831=>804,
-	9832=>860,9833=>423,9834=>592,9835=>750,9836=>750,9837=>439,9838=>439,9839=>439,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,9993=>690,
-	9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,
-	10012=>754,10013=>494,10014=>552,10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,10026=>789,10027=>841,10028=>823,
-	10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,
-	10045=>682,10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,
-	10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,10084=>910,
-	10085=>667,10086=>760,10087=>760,10102=>788,10103=>788,10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,10114=>788,
-	10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,
-	10131=>788,10132=>894,10136=>748,10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,10147=>924,10148=>917,10149=>930,
-	10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,
-	10167=>888,10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,12288=>1000,12289=>1000,12290=>1000,12291=>1000,12292=>1000,12293=>1000,12294=>1000,12295=>1000,
-	12296=>1000,12297=>1000,12298=>1000,12299=>1000,12300=>1000,12301=>1000,12302=>1000,12303=>1000,12304=>1000,12305=>1000,12306=>1000,12307=>1000,12308=>1000,12309=>1000,12310=>1000,12311=>1000,
-	12312=>1000,12313=>1000,12314=>1000,12315=>1000,12316=>1000,12317=>1000,12318=>1000,12319=>1000,12320=>1000,12321=>1000,12322=>1000,12323=>1000,12324=>1000,12325=>1000,12326=>1000,12327=>1000,
-	12328=>1000,12329=>1000,12330=>1000,12331=>1000,12332=>1000,12333=>1000,12334=>1000,12335=>1000,12336=>1000,12337=>1000,12338=>1000,12339=>1000,12340=>1000,12341=>1000,12342=>1000,12343=>1000,
-	12351=>1000,12353=>1000,12354=>1000,12355=>1000,12356=>1000,12357=>1000,12358=>1000,12359=>1000,12360=>1000,12361=>1000,12362=>1000,12363=>1000,12364=>1000,12365=>1000,12366=>1000,12367=>1000,
-	12368=>1000,12369=>1000,12370=>1000,12371=>1000,12372=>1000,12373=>1000,12374=>1000,12375=>1000,12376=>1000,12377=>1000,12378=>1000,12379=>1000,12380=>1000,12381=>1000,12382=>1000,12383=>1000,
-	12384=>1000,12385=>1000,12386=>1000,12387=>1000,12388=>1000,12389=>1000,12390=>1000,12391=>1000,12392=>1000,12393=>1000,12394=>1000,12395=>1000,12396=>1000,12397=>1000,12398=>1000,12399=>1000,
-	12400=>1000,12401=>1000,12402=>1000,12403=>1000,12404=>1000,12405=>1000,12406=>1000,12407=>1000,12408=>1000,12409=>1000,12410=>1000,12411=>1000,12412=>1000,12413=>1000,12414=>1000,12415=>1000,
-	12416=>1000,12417=>1000,12418=>1000,12419=>1000,12420=>1000,12421=>1000,12422=>1000,12423=>1000,12424=>1000,12425=>1000,12426=>1000,12427=>1000,12428=>1000,12429=>1000,12430=>1000,12431=>1000,
-	12432=>1000,12433=>1000,12434=>1000,12435=>1000,12436=>1000,12441=>1000,12442=>1000,12443=>1000,12444=>1000,12445=>1000,12446=>1000,12449=>1000,12450=>1000,12451=>1000,12452=>1000,12453=>1000,
-	12454=>1000,12455=>1000,12456=>1000,12457=>1000,12458=>1000,12459=>1000,12460=>1000,12461=>1000,12462=>1000,12463=>1000,12464=>1000,12465=>1000,12466=>1000,12467=>1000,12468=>1000,12469=>1000,
-	12470=>1000,12471=>1000,12472=>1000,12473=>1000,12474=>1000,12475=>1000,12476=>1000,12477=>1000,12478=>1000,12479=>1000,12480=>1000,12481=>1000,12482=>1000,12483=>1000,12484=>1000,12485=>1000,
-	12486=>1000,12487=>1000,12488=>1000,12489=>1000,12490=>1000,12491=>1000,12492=>1000,12493=>1000,12494=>1000,12495=>1000,12496=>1000,12497=>1000,12498=>1000,12499=>1000,12500=>1000,12501=>1000,
-	12502=>1000,12503=>1000,12504=>1000,12505=>1000,12506=>1000,12507=>1000,12508=>1000,12509=>1000,12510=>1000,12511=>1000,12512=>1000,12513=>1000,12514=>1000,12515=>1000,12516=>1000,12517=>1000,
-	12518=>1000,12519=>1000,12520=>1000,12521=>1000,12522=>1000,12523=>1000,12524=>1000,12525=>1000,12526=>1000,12527=>1000,12528=>1000,12529=>1000,12530=>1000,12531=>1000,12532=>1000,12533=>1000,
-	12534=>1000,12535=>1000,12536=>1000,12537=>1000,12538=>1000,12539=>1000,12540=>1000,12541=>1000,12542=>1000,12549=>1000,12550=>1000,12551=>1000,12552=>1000,12553=>1000,12554=>1000,12555=>1000,
-	12556=>1000,12557=>1000,12558=>1000,12559=>1000,12560=>1000,12561=>1000,12562=>1000,12563=>1000,12564=>1000,12565=>1000,12566=>1000,12567=>1000,12568=>1000,12569=>1000,12570=>1000,12571=>1000,
-	12572=>1000,12573=>1000,12574=>1000,12575=>1000,12576=>1000,12577=>1000,12578=>1000,12579=>1000,12580=>1000,12581=>1000,12582=>1000,12583=>1000,12584=>1000,12585=>1000,12586=>1000,12587=>1000,
-	12588=>1000,12593=>1000,12594=>1000,12595=>1000,12596=>1000,12597=>1000,12598=>1000,12599=>1000,12600=>1000,12601=>1000,12602=>1000,12603=>1000,12604=>1000,12605=>1000,12606=>1000,12607=>1000,
-	12608=>1000,12609=>1000,12610=>1000,12611=>1000,12612=>1000,12613=>1000,12614=>1000,12615=>1000,12616=>1000,12617=>1000,12618=>1000,12619=>1000,12620=>1000,12621=>1000,12622=>1000,12623=>1000,
-	12624=>1000,12625=>1000,12626=>1000,12627=>1000,12628=>1000,12629=>1000,12630=>1000,12631=>1000,12632=>1000,12633=>1000,12634=>1000,12635=>1000,12636=>1000,12637=>1000,12638=>1000,12639=>1000,
-	12640=>1000,12641=>1000,12642=>1000,12643=>1000,12644=>1000,12645=>1000,12646=>1000,12647=>1000,12648=>1000,12649=>1000,12650=>1000,12651=>1000,12652=>1000,12653=>1000,12654=>1000,12655=>1000,
-	12656=>1000,12657=>1000,12658=>1000,12659=>1000,12660=>1000,12661=>1000,12662=>1000,12663=>1000,12664=>1000,12665=>1000,12666=>1000,12667=>1000,12668=>1000,12669=>1000,12670=>1000,12671=>1000,
-	12672=>1000,12673=>1000,12674=>1000,12675=>1000,12676=>1000,12677=>1000,12678=>1000,12679=>1000,12680=>1000,12681=>1000,12682=>1000,12683=>1000,12684=>1000,12685=>1000,12686=>1000,12688=>1000,
-	12689=>1000,12690=>1000,12691=>1000,12692=>1000,12693=>1000,12694=>1000,12695=>1000,12696=>1000,12697=>1000,12698=>1000,12699=>1000,12700=>1000,12701=>1000,12702=>1000,12703=>1000,12800=>1000,
-	12801=>1000,12802=>1000,12803=>1000,12804=>1000,12805=>1000,12806=>1000,12807=>1000,12808=>1000,12809=>1000,12810=>1000,12811=>1000,12812=>1000,12813=>1000,12814=>1000,12815=>1000,12816=>1000,
-	12817=>1000,12818=>1000,12819=>1000,12820=>1000,12821=>1000,12822=>1000,12823=>1000,12824=>1000,12825=>1000,12826=>1000,12827=>1000,12828=>1000,12832=>1000,12833=>1000,12834=>1000,12835=>1000,
-	12836=>1000,12837=>1000,12838=>1000,12839=>1000,12840=>1000,12841=>1000,12842=>1000,12843=>1000,12844=>1000,12845=>1000,12846=>1000,12847=>1000,12848=>1000,12849=>1000,12850=>1000,12851=>1000,
-	12852=>1000,12853=>1000,12854=>1000,12855=>1000,12856=>1000,12857=>1000,12858=>1000,12859=>1000,12860=>1000,12861=>1000,12862=>1000,12863=>1000,12864=>1000,12865=>1000,12866=>1000,12867=>1000,
-	12896=>1000,12897=>1000,12898=>1000,12899=>1000,12900=>1000,12901=>1000,12902=>1000,12903=>1000,12904=>1000,12905=>1000,12906=>1000,12907=>1000,12908=>1000,12909=>1000,12910=>1000,12911=>1000,
-	12912=>1000,12913=>1000,12914=>1000,12915=>1000,12916=>1000,12917=>1000,12918=>1000,12919=>1000,12920=>1000,12921=>1000,12922=>1000,12923=>1000,12927=>1000,12928=>1000,12929=>1000,12930=>1000,
-	12931=>1000,12932=>1000,12933=>1000,12934=>1000,12935=>1000,12936=>1000,12937=>1000,12938=>1000,12939=>1000,12940=>1000,12941=>1000,12942=>1000,12943=>1000,12944=>1000,12945=>1000,12946=>1000,
-	12947=>1000,12948=>1000,12949=>1000,12950=>1000,12951=>1000,12952=>1000,12953=>1000,12954=>1000,12955=>1000,12956=>1000,12957=>1000,12958=>1000,12959=>1000,12960=>1000,12961=>1000,12962=>1000,
-	12963=>1000,12964=>1000,12965=>1000,12966=>1000,12967=>1000,12968=>1000,12969=>1000,12970=>1000,12971=>1000,12972=>1000,12973=>1000,12974=>1000,12975=>1000,12976=>1000,12992=>1000,12993=>1000,
-	12994=>1000,12995=>1000,12996=>1000,12997=>1000,12998=>1000,12999=>1000,13000=>1000,13001=>1000,13002=>1000,13003=>1000,13008=>1000,13009=>1000,13010=>1000,13011=>1000,13012=>1000,13013=>1000,
-	13014=>1000,13015=>1000,13016=>1000,13017=>1000,13018=>1000,13019=>1000,13020=>1000,13021=>1000,13022=>1000,13023=>1000,13024=>1000,13025=>1000,13026=>1000,13027=>1000,13028=>1000,13029=>1000,
-	13030=>1000,13031=>1000,13032=>1000,13033=>1000,13034=>1000,13035=>1000,13036=>1000,13037=>1000,13038=>1000,13039=>1000,13040=>1000,13041=>1000,13042=>1000,13043=>1000,13044=>1000,13045=>1000,
-	13046=>1000,13047=>1000,13048=>1000,13049=>1000,13050=>1000,13051=>1000,13052=>1000,13053=>1000,13054=>1000,13056=>1000,13057=>1000,13058=>1000,13059=>1000,13060=>1000,13061=>1000,13062=>1000,
-	13063=>1000,13064=>1000,13065=>1000,13066=>1000,13067=>1000,13068=>1000,13069=>1000,13070=>1000,13071=>1000,13072=>1000,13073=>1000,13074=>1000,13075=>1000,13076=>1000,13077=>1000,13078=>1000,
-	13079=>1000,13080=>1000,13081=>1000,13082=>1000,13083=>1000,13084=>1000,13085=>1000,13086=>1000,13087=>1000,13088=>1000,13089=>1000,13090=>1000,13091=>1000,13092=>1000,13093=>1000,13094=>1000,
-	13095=>1000,13096=>1000,13097=>1000,13098=>1000,13099=>1000,13100=>1000,13101=>1000,13102=>1000,13103=>1000,13104=>1000,13105=>1000,13106=>1000,13107=>1000,13108=>1000,13109=>1000,13110=>1000,
-	13111=>1000,13112=>1000,13113=>1000,13114=>1000,13115=>1000,13116=>1000,13117=>1000,13118=>1000,13119=>1000,13120=>1000,13121=>1000,13122=>1000,13123=>1000,13124=>1000,13125=>1000,13126=>1000,
-	13127=>1000,13128=>1000,13129=>1000,13130=>1000,13131=>1000,13132=>1000,13133=>1000,13134=>1000,13135=>1000,13136=>1000,13137=>1000,13138=>1000,13139=>1000,13140=>1000,13141=>1000,13142=>1000,
-	13143=>1000,13144=>1000,13145=>1000,13146=>1000,13147=>1000,13148=>1000,13149=>1000,13150=>1000,13151=>1000,13152=>1000,13153=>1000,13154=>1000,13155=>1000,13156=>1000,13157=>1000,13158=>1000,
-	13159=>1000,13160=>1000,13161=>1000,13162=>1000,13163=>1000,13164=>1000,13165=>1000,13166=>1000,13167=>1000,13168=>1000,13169=>1000,13170=>1000,13171=>1000,13172=>1000,13173=>1000,13174=>1000,
-	13179=>1000,13180=>1000,13181=>1000,13182=>1000,13183=>1000,13184=>1000,13185=>1000,13186=>1000,13187=>1000,13188=>1000,13189=>1000,13190=>1000,13191=>1000,13192=>1000,13193=>1000,13194=>1000,
-	13195=>1000,13196=>1000,13197=>1000,13198=>1000,13199=>1000,13200=>1000,13201=>1000,13202=>1000,13203=>1000,13204=>1000,13205=>1000,13206=>1000,13207=>1000,13208=>1000,13209=>1000,13210=>1000,
-	13211=>1000,13212=>1000,13213=>1000,13214=>1000,13215=>1000,13216=>1000,13217=>1000,13218=>1000,13219=>1000,13220=>1000,13221=>1000,13222=>1000,13223=>1000,13224=>1000,13225=>1000,13226=>1000,
-	13227=>1000,13228=>1000,13229=>1000,13230=>1000,13231=>1000,13232=>1000,13233=>1000,13234=>1000,13235=>1000,13236=>1000,13237=>1000,13238=>1000,13239=>1000,13240=>1000,13241=>1000,13242=>1000,
-	13243=>1000,13244=>1000,13245=>1000,13246=>1000,13247=>1000,13248=>1000,13249=>1000,13250=>1000,13251=>1000,13252=>1000,13253=>1000,13254=>1000,13255=>1000,13256=>1000,13257=>1000,13258=>1000,
-	13259=>1000,13260=>1000,13261=>1000,13262=>1000,13263=>1000,13264=>1000,13265=>1000,13266=>1000,13267=>1000,13268=>1000,13269=>1000,13270=>1000,13271=>1000,13272=>1000,13273=>1000,13274=>1000,
-	13275=>1000,13276=>1000,13277=>1000,13280=>1000,13281=>1000,13282=>1000,13283=>1000,13284=>1000,13285=>1000,13286=>1000,13287=>1000,13288=>1000,13289=>1000,13290=>1000,13291=>1000,13292=>1000,
-	13293=>1000,13294=>1000,13295=>1000,13296=>1000,13297=>1000,13298=>1000,13299=>1000,13300=>1000,13301=>1000,13302=>1000,13303=>1000,13304=>1000,13305=>1000,13306=>1000,13307=>1000,13308=>1000,
-	13309=>1000,13310=>1000,59393=>316,59394=>507,59395=>507,59396=>484,59397=>484,59416=>0,59492=>480,59495=>480,59536=>458,59557=>466,59558=>480,59559=>903,61441=>500,61442=>500,
-	63232=>541,63233=>0,63234=>0,63235=>0,63236=>0,63237=>0,63238=>0,63239=>0,63240=>0,63241=>0,63242=>0,63243=>0,63244=>0,63245=>0,63246=>0,63247=>849,
-	63248=>0,63249=>0,63250=>0,63251=>0,63252=>0,63253=>0,63254=>0,63255=>0,63256=>0,63257=>0,63258=>0,63260=>333,63261=>287,63744=>1000,63745=>1000,63746=>1000,
-	63747=>1000,63748=>1000,63749=>1000,63750=>1000,63751=>1000,63752=>1000,63753=>1000,63754=>1000,63755=>1000,63756=>1000,63757=>1000,63758=>1000,63759=>1000,63760=>1000,63761=>1000,63762=>1000,
-	63763=>1000,63764=>1000,63765=>1000,63766=>1000,63767=>1000,63768=>1000,63769=>1000,63770=>1000,63771=>1000,63772=>1000,63773=>1000,63774=>1000,63775=>1000,63776=>1000,63777=>1000,63778=>1000,
-	63779=>1000,63780=>1000,63781=>1000,63782=>1000,63783=>1000,63784=>1000,63785=>1000,63786=>1000,63787=>1000,63788=>1000,63789=>1000,63790=>1000,63791=>1000,63792=>1000,63793=>1000,63794=>1000,
-	63795=>1000,63796=>1000,63797=>1000,63798=>1000,63799=>1000,63800=>1000,63801=>1000,63802=>1000,63803=>1000,63804=>1000,63805=>1000,63806=>1000,63807=>1000,63808=>1000,63809=>1000,63810=>1000,
-	63811=>1000,63812=>1000,63813=>1000,63814=>1000,63815=>1000,63816=>1000,63817=>1000,63818=>1000,63819=>1000,63820=>1000,63821=>1000,63822=>1000,63823=>1000,63824=>1000,63825=>1000,63826=>1000,
-	63827=>1000,63828=>1000,63829=>1000,63830=>1000,63831=>1000,63832=>1000,63833=>1000,63834=>1000,63835=>1000,63836=>1000,63837=>1000,63838=>1000,63839=>1000,63840=>1000,63841=>1000,63842=>1000,
-	63843=>1000,63844=>1000,63845=>1000,63846=>1000,63847=>1000,63848=>1000,63849=>1000,63850=>1000,63851=>1000,63852=>1000,63853=>1000,63854=>1000,63855=>1000,63856=>1000,63857=>1000,63858=>1000,
-	63859=>1000,63860=>1000,63861=>1000,63862=>1000,63863=>1000,63864=>1000,63865=>1000,63866=>1000,63867=>1000,63868=>1000,63869=>1000,63870=>1000,63871=>1000,63872=>1000,63873=>1000,63874=>1000,
-	63875=>1000,63876=>1000,63877=>1000,63878=>1000,63879=>1000,63880=>1000,63881=>1000,63882=>1000,63883=>1000,63884=>1000,63885=>1000,63886=>1000,63887=>1000,63888=>1000,63889=>1000,63890=>1000,
-	63891=>1000,63892=>1000,63893=>1000,63894=>1000,63895=>1000,63896=>1000,63897=>1000,63898=>1000,63899=>1000,63900=>1000,63901=>1000,63902=>1000,63903=>1000,63904=>1000,63905=>1000,63906=>1000,
-	63907=>1000,63908=>1000,63909=>1000,63910=>1000,63911=>1000,63912=>1000,63913=>1000,63914=>1000,63915=>1000,63916=>1000,63917=>1000,63918=>1000,63919=>1000,63920=>1000,63921=>1000,63922=>1000,
-	63923=>1000,63924=>1000,63925=>1000,63926=>1000,63927=>1000,63928=>1000,63929=>1000,63930=>1000,63931=>1000,63932=>1000,63933=>1000,63934=>1000,63935=>1000,63936=>1000,63937=>1000,63938=>1000,
-	63939=>1000,63940=>1000,63941=>1000,63942=>1000,63943=>1000,63944=>1000,63945=>1000,63946=>1000,63947=>1000,63948=>1000,63949=>1000,63950=>1000,63951=>1000,63952=>1000,63953=>1000,63954=>1000,
-	63955=>1000,63956=>1000,63957=>1000,63958=>1000,63959=>1000,63960=>1000,63961=>1000,63962=>1000,63963=>1000,63964=>1000,63965=>1000,63966=>1000,63967=>1000,63968=>1000,63969=>1000,63970=>1000,
-	63971=>1000,63972=>1000,63973=>1000,63974=>1000,63975=>1000,63976=>1000,63977=>1000,63978=>1000,63979=>1000,63980=>1000,63981=>1000,63982=>1000,63983=>1000,63984=>1000,63985=>1000,63986=>1000,
-	63987=>1000,63988=>1000,63989=>1000,63990=>1000,63991=>1000,63992=>1000,63993=>1000,63994=>1000,63995=>1000,63996=>1000,63997=>1000,63998=>1000,63999=>1000,64000=>1000,64001=>1000,64002=>1000,
-	64003=>1000,64004=>1000,64005=>1000,64006=>1000,64007=>1000,64008=>1000,64009=>1000,64010=>1000,64011=>1000,64012=>1000,64013=>1000,64014=>1000,64015=>1000,64016=>1000,64017=>1000,64018=>1000,
-	64019=>1000,64020=>1000,64021=>1000,64022=>1000,64023=>1000,64024=>1000,64025=>1000,64026=>1000,64027=>1000,64028=>1000,64029=>1000,64030=>1000,64031=>1000,64032=>1000,64033=>1000,64034=>1000,
-	64035=>1000,64036=>1000,64037=>1000,64038=>1000,64039=>1000,64040=>1000,64041=>1000,64042=>1000,64043=>1000,64044=>1000,64045=>1000,64256=>537,64257=>500,64258=>500,64259=>778,64260=>750,
-	64261=>532,64262=>758,64275=>784,64276=>784,64277=>784,64278=>784,64279=>893,64286=>333,64287=>590,64288=>550,64289=>709,64290=>649,64291=>730,64292=>656,64293=>605,64294=>730,
-	64295=>633,64296=>794,64297=>584,64298=>700,64299=>700,64300=>700,64301=>700,64302=>577,64303=>577,64304=>577,64305=>563,64306=>411,64307=>512,64308=>594,64309=>316,64310=>326,
-	64312=>594,64313=>316,64314=>507,64315=>527,64316=>484,64318=>594,64320=>338,64321=>604,64323=>567,64324=>569,64326=>514,64327=>583,64328=>507,64329=>700,64330=>633,64331=>316,
-	64332=>563,64333=>527,64334=>569,64335=>577,64336=>243,64337=>273,64338=>771,64339=>788,64340=>276,64341=>243,64342=>771,64343=>788,64344=>276,64345=>243,64346=>771,64347=>788,
-	64348=>276,64349=>243,64350=>771,64351=>788,64352=>276,64353=>243,64354=>771,64355=>788,64356=>276,64357=>243,64358=>771,64359=>788,64360=>276,64361=>243,64362=>957,64363=>903,
-	64364=>466,64365=>480,64366=>957,64367=>903,64368=>466,64369=>480,64370=>544,64371=>658,64372=>646,64373=>637,64374=>544,64375=>658,64376=>646,64377=>637,64378=>544,64379=>658,
-	64380=>646,64381=>637,64382=>544,64383=>658,64384=>646,64385=>637,64386=>430,64387=>458,64388=>430,64389=>458,64390=>430,64391=>458,64392=>430,64393=>458,64394=>421,64395=>436,
-	64396=>421,64397=>436,64398=>828,64399=>942,64400=>432,64401=>549,64402=>828,64403=>942,64404=>432,64405=>549,64406=>828,64407=>942,64408=>432,64409=>549,64410=>828,64411=>942,
-	64412=>432,64413=>549,64414=>692,64415=>723,64416=>692,64417=>723,64418=>276,64419=>243,64420=>514,64421=>477,64422=>514,64423=>509,64424=>273,64425=>427,64426=>706,64427=>706,
-	64428=>686,64429=>686,64430=>550,64431=>461,64432=>550,64433=>461,64467=>757,64468=>733,64469=>432,64470=>549,64471=>470,64472=>466,64473=>470,64474=>466,64475=>470,64476=>466,
-	64477=>470,64478=>470,64479=>466,64480=>470,64481=>466,64482=>470,64483=>466,64484=>781,64485=>933,64486=>276,64487=>243,64488=>276,64489=>243,64490=>547,64491=>517,64492=>783,
-	64493=>753,64494=>740,64495=>710,64496=>740,64497=>710,64498=>740,64499=>710,64500=>740,64501=>710,64502=>1207,64503=>1177,64504=>517,64505=>1067,64506=>1037,64507=>517,64508=>731,
-	64509=>793,64510=>276,64511=>243,64512=>932,64513=>932,64514=>914,64515=>1067,64516=>1077,64517=>935,64518=>935,64519=>935,64520=>917,64521=>1070,64522=>1080,64523=>932,64524=>932,
-	64525=>932,64526=>914,64527=>1067,64528=>1077,64529=>932,64530=>914,64531=>1067,64532=>1077,64533=>1305,64534=>1287,64535=>1305,64536=>1287,64537=>1305,64538=>1305,64539=>1287,64540=>1429,
-	64541=>1429,64542=>1429,64543=>1411,64544=>1476,64545=>1458,64546=>1476,64547=>1476,64548=>1476,64549=>1458,64550=>1392,64551=>1374,64552=>1374,64553=>1245,64554=>1227,64555=>1245,64556=>1227,
-	64557=>1125,64558=>1125,64559=>1125,64560=>1107,64561=>1260,64562=>1270,64563=>1125,64564=>1107,64565=>1260,64566=>1270,64567=>706,64568=>1091,64569=>1091,64570=>1091,64571=>1106,64572=>1073,
-	64573=>1226,64574=>1236,64575=>932,64576=>932,64577=>932,64578=>914,64579=>1067,64580=>1077,64581=>1140,64582=>1140,64583=>1140,64584=>1122,64585=>1275,64586=>1285,64587=>932,64588=>932,
-	64589=>932,64590=>914,64591=>1067,64592=>1077,64593=>1345,64594=>1327,64595=>1480,64596=>1490,64597=>932,64598=>932,64599=>932,64600=>914,64601=>1067,64602=>1077,64603=>430,64604=>421,
-	64605=>731,64606=>296,64607=>300,64608=>300,64609=>300,64610=>300,64611=>300,64612=>680,64613=>680,64614=>884,64615=>967,64616=>1037,64617=>1047,64618=>680,64619=>680,64620=>884,
-	64621=>967,64622=>1037,64623=>1047,64624=>680,64625=>680,64626=>884,64627=>967,64628=>1037,64629=>1047,64630=>680,64631=>680,64632=>884,64633=>967,64634=>1037,64635=>1047,64636=>1274,
-	64637=>1284,64638=>1274,64639=>1284,64640=>821,64641=>1221,64642=>1188,64643=>1341,64644=>1351,64645=>884,64646=>1037,64647=>1047,64648=>806,64649=>1173,64650=>680,64651=>680,64652=>884,
-	64653=>967,64654=>1037,64655=>1047,64656=>793,64657=>680,64658=>680,64659=>884,64660=>967,64661=>1037,64662=>1047,64663=>911,64664=>911,64665=>911,64666=>806,64667=>679,64668=>911,
-	64669=>911,64670=>911,64671=>806,64672=>679,64673=>911,64674=>911,64675=>911,64676=>806,64677=>679,64678=>806,64679=>1284,64680=>1179,64681=>1284,64682=>1179,64683=>1284,64684=>1179,
-	64685=>1408,64686=>1408,64687=>1408,64688=>1303,64689=>1455,64690=>1455,64691=>1350,64692=>1455,64693=>1455,64694=>1455,64695=>1350,64696=>1371,64697=>1266,64698=>1224,64699=>1119,64700=>1224,
-	64701=>1119,64702=>1104,64703=>1104,64704=>1104,64705=>999,64706=>1104,64707=>999,64708=>1070,64709=>1070,64710=>1070,64711=>676,64712=>965,64713=>911,64714=>911,64715=>911,64716=>806,
-	64717=>679,64718=>1119,64719=>1119,64720=>1119,64721=>1014,64722=>911,64723=>911,64724=>911,64725=>806,64726=>679,64727=>1324,64728=>1219,64729=>686,64730=>911,64731=>911,64732=>911,
-	64733=>806,64734=>679,64735=>776,64736=>649,64737=>776,64738=>649,64739=>776,64740=>649,64741=>776,64742=>649,64743=>1303,64744=>1176,64745=>1303,64746=>1176,64747=>793,64748=>1082,
-	64749=>776,64750=>776,64751=>649,64752=>776,64753=>649,64754=>306,64755=>302,64756=>298,64757=>1527,64758=>1537,64759=>1380,64760=>1390,64761=>1380,64762=>1390,64763=>1564,64764=>1574,
-	64765=>1564,64766=>1574,64767=>1440,64768=>1450,64769=>1440,64770=>1450,64771=>1440,64772=>1450,64773=>1611,64774=>1621,64775=>1611,64776=>1621,64777=>1429,64778=>1429,64779=>1429,64780=>1411,
-	64781=>1207,64782=>1207,64783=>1254,64784=>1254,64785=>1527,64786=>1537,64787=>1348,64788=>1358,64789=>1348,64790=>1358,64791=>1564,64792=>1574,64793=>1564,64794=>1574,64795=>1431,64796=>1441,
-	64797=>1431,64798=>1441,64799=>1431,64800=>1441,64801=>1611,64802=>1621,64803=>1611,64804=>1621,64805=>1429,64806=>1429,64807=>1429,64808=>1411,64809=>1207,64810=>1207,64811=>1254,64812=>1254,
-	64813=>1408,64814=>1408,64815=>1408,64816=>1303,64817=>1176,64818=>1176,64819=>1266,64820=>1408,64821=>1408,64822=>1408,64823=>1408,64824=>1408,64825=>1408,64826=>1266,64827=>1266,64828=>273,
-	64829=>243,64830=>600,64831=>600,64848=>1444,64849=>1541,64850=>1549,64851=>1444,64852=>1444,64853=>1444,64854=>1444,64855=>1444,64856=>1830,64857=>1817,64858=>1975,64859=>1964,64860=>2046,
-	64861=>2046,64862=>2202,64863=>1962,64864=>1941,64865=>1941,64866=>1944,64867=>1836,64868=>2114,64869=>2093,64870=>1991,64871=>2049,64872=>1941,64873=>2212,64874=>1962,64875=>1941,64876=>1944,
-	64877=>1836,64878=>2249,64879=>2096,64880=>1988,64881=>1925,64882=>1904,64883=>1799,64884=>2070,64885=>1833,64886=>1729,64887=>1652,64888=>1881,64889=>1729,64890=>1892,64891=>1881,64892=>1759,
-	64893=>1637,64894=>1670,64895=>1654,64896=>1522,64897=>1686,64898=>1675,64899=>1549,64900=>1541,64901=>1522,64902=>1444,64903=>1436,64904=>1444,64905=>1757,64906=>1652,64907=>1975,64908=>1757,
-	64909=>1652,64910=>1757,64911=>1652,64914=>1757,64915=>1857,64916=>1752,64917=>1444,64918=>1675,64919=>1522,64920=>1444,64921=>1675,64922=>1581,64923=>1570,64924=>1417,64925=>1362,64926=>1686,
-	64927=>1686,64928=>1675,64929=>1686,64930=>1675,64931=>1581,64932=>1570,64933=>1975,64934=>2069,64935=>1964,64936=>2202,64937=>2259,64938=>2212,64939=>2259,64940=>1686,64941=>1581,64942=>1686,
-	64943=>1686,64944=>1581,64945=>1870,64946=>1817,64947=>1686,64948=>1637,64949=>1444,64950=>1892,64951=>1886,64952=>1549,64953=>1975,64954=>1444,64955=>1723,64956=>1522,64957=>1541,64958=>2080,
-	64959=>2080,64960=>1975,64961=>1817,64962=>1686,64963=>1499,64964=>1757,64965=>1883,64966=>2212,64967=>1686,65008=>1523,65009=>1172,65010=>1159,65011=>1356,65012=>2111,65013=>2258,65014=>2130,
-	65015=>1552,65016=>2046,65017=>1856,65018=>1930,65019=>1070,65056=>450,65057=>450,65058=>450,65059=>450,65072=>1000,65073=>1000,65074=>1000,65075=>1000,65076=>1000,65077=>1000,65078=>1000,
-	65079=>1000,65080=>1000,65081=>1000,65082=>1000,65083=>1000,65084=>1000,65085=>1000,65086=>1000,65087=>1000,65088=>1000,65089=>1000,65090=>1000,65091=>1000,65092=>1000,65097=>1000,65098=>1000,
-	65099=>1000,65100=>1000,65101=>1000,65102=>1000,65103=>1000,65104=>167,65105=>250,65106=>167,65108=>167,65109=>167,65110=>334,65111=>167,65112=>600,65113=>200,65114=>200,65115=>200,
-	65116=>200,65117=>200,65118=>200,65119=>334,65120=>400,65121=>233,65122=>350,65123=>200,65124=>350,65125=>350,65126=>350,65128=>167,65129=>334,65130=>533,65131=>609,65136=>300,
-	65137=>298,65138=>296,65140=>298,65142=>300,65143=>298,65144=>300,65145=>302,65146=>298,65147=>296,65148=>306,65149=>306,65150=>154,65151=>154,65152=>529,65153=>243,65154=>273,
-	65155=>243,65156=>273,65157=>470,65158=>466,65159=>243,65160=>273,65161=>731,65162=>793,65163=>276,65164=>243,65165=>243,65166=>273,65167=>771,65168=>788,65169=>276,65170=>243,
-	65171=>514,65172=>477,65173=>771,65174=>788,65175=>276,65176=>243,65177=>771,65178=>788,65179=>276,65180=>243,65181=>544,65182=>658,65183=>646,65184=>637,65185=>544,65186=>658,
-	65187=>646,65188=>637,65189=>544,65190=>658,65191=>646,65192=>637,65193=>430,65194=>458,65195=>430,65196=>458,65197=>421,65198=>436,65199=>421,65200=>436,65201=>1194,65202=>1194,
-	65203=>770,65204=>770,65205=>1194,65206=>1194,65207=>770,65208=>770,65209=>1291,65210=>1291,65211=>817,65212=>817,65213=>1291,65214=>1291,65215=>817,65216=>817,65217=>843,65218=>843,
-	65219=>733,65220=>733,65221=>843,65222=>843,65223=>733,65224=>733,65225=>594,65226=>556,65227=>586,65228=>554,65229=>594,65230=>556,65231=>586,65232=>554,65233=>957,65234=>903,
-	65235=>466,65236=>480,65237=>800,65238=>823,65239=>466,65240=>480,65241=>757,65242=>733,65243=>432,65244=>549,65245=>662,65246=>673,65247=>273,65248=>243,65249=>589,65250=>640,
-	65251=>481,65252=>532,65253=>692,65254=>723,65255=>276,65256=>243,65257=>514,65258=>477,65259=>686,65260=>405,65261=>470,65262=>466,65263=>731,65264=>793,65265=>731,65266=>803,
-	65267=>276,65268=>243,65269=>551,65270=>603,65271=>551,65272=>603,65273=>551,65274=>603,65275=>551,65276=>603,65281=>1000,65282=>1000,65283=>1000,65284=>1000,65285=>1000,65286=>1000,
-	65287=>1000,65288=>1000,65289=>1000,65290=>1000,65291=>1000,65292=>1000,65293=>1000,65294=>1000,65295=>1000,65296=>1000,65297=>1000,65298=>1000,65299=>1000,65300=>1000,65301=>1000,65302=>1000,
-	65303=>1000,65304=>1000,65305=>1000,65306=>1000,65307=>1000,65308=>1000,65309=>1000,65310=>1000,65311=>1000,65312=>1000,65313=>1000,65314=>1000,65315=>1000,65316=>1000,65317=>1000,65318=>1000,
-	65319=>1000,65320=>1000,65321=>1000,65322=>1000,65323=>1000,65324=>1000,65325=>1000,65326=>1000,65327=>1000,65328=>1000,65329=>1000,65330=>1000,65331=>1000,65332=>1000,65333=>1000,65334=>1000,
-	65335=>1000,65336=>1000,65337=>1000,65338=>1000,65339=>1000,65340=>1000,65341=>1000,65342=>1000,65343=>1000,65344=>1000,65345=>1000,65346=>1000,65347=>1000,65348=>1000,65349=>1000,65350=>1000,
-	65351=>1000,65352=>1000,65353=>1000,65354=>1000,65355=>1000,65356=>1000,65357=>1000,65358=>1000,65359=>1000,65360=>1000,65361=>1000,65362=>1000,65363=>1000,65364=>1000,65365=>1000,65366=>1000,
-	65367=>1000,65368=>1000,65369=>1000,65370=>1000,65371=>1000,65372=>1000,65373=>1000,65374=>1000,65377=>500,65378=>500,65379=>500,65380=>500,65381=>500,65382=>500,65383=>500,65384=>500,
-	65385=>500,65386=>500,65387=>500,65388=>500,65389=>500,65390=>500,65391=>500,65392=>500,65393=>500,65394=>500,65395=>500,65396=>500,65397=>500,65398=>500,65399=>500,65400=>500,
-	65401=>500,65402=>500,65403=>500,65404=>500,65405=>500,65406=>500,65407=>500,65408=>500,65409=>500,65410=>500,65411=>500,65412=>500,65413=>500,65414=>500,65415=>500,65416=>500,
-	65417=>500,65418=>500,65419=>500,65420=>500,65421=>500,65422=>500,65423=>500,65424=>500,65425=>500,65426=>500,65427=>500,65428=>500,65429=>500,65430=>500,65431=>500,65432=>500,
-	65433=>500,65434=>500,65435=>500,65436=>500,65437=>500,65438=>500,65439=>500,65440=>500,65441=>500,65442=>500,65443=>500,65444=>500,65445=>500,65446=>500,65447=>500,65448=>500,
-	65449=>500,65450=>500,65451=>500,65452=>500,65453=>500,65454=>500,65455=>500,65456=>500,65457=>500,65458=>500,65459=>500,65460=>500,65461=>500,65462=>500,65463=>500,65464=>500,
-	65465=>500,65466=>500,65467=>500,65468=>500,65469=>500,65470=>500,65474=>500,65475=>500,65476=>500,65477=>500,65478=>500,65479=>500,65482=>500,65483=>500,65484=>500,65485=>500,
-	65486=>500,65487=>500,65490=>500,65491=>500,65492=>500,65493=>500,65494=>500,65495=>500,65498=>500,65499=>500,65500=>500,65504=>1000,65505=>1000,65506=>1000,65507=>1000,65508=>1000,
-	65509=>1000,65510=>1000,65512=>500,65513=>500,65514=>500,65515=>500,65516=>500,65517=>500,65518=>500,65532=>1000,65533=>1000,19968=>1000,19969=>1000,19970=>1000,19971=>1000,19972=>1000,
-	19973=>1000,19974=>1000,19975=>1000,19976=>1000,19977=>1000,19978=>1000,19979=>1000,19980=>1000,19981=>1000,19982=>1000,19983=>1000,19984=>1000,19985=>1000,19986=>1000,19987=>1000,19988=>1000,
-	19989=>1000,19990=>1000,19991=>1000,19992=>1000,19993=>1000,19994=>1000,19995=>1000,19996=>1000,19997=>1000,19998=>1000,19999=>1000,20000=>1000,20001=>1000,20002=>1000,20003=>1000,20004=>1000,
-	20005=>1000,20006=>1000,20007=>1000,20008=>1000,20009=>1000,20010=>1000,20011=>1000,20012=>1000,20013=>1000,20014=>1000,20015=>1000,20016=>1000,20017=>1000,20018=>1000,20019=>1000,20020=>1000,
-	20021=>1000,20022=>1000,20023=>1000,20024=>1000,20025=>1000,20026=>1000,20027=>1000,20028=>1000,20029=>1000,20030=>1000,20031=>1000,20032=>1000,20033=>1000,20034=>1000,20035=>1000,20036=>1000,
-	20037=>1000,20038=>1000,20039=>1000,20040=>1000,20041=>1000,20042=>1000,20043=>1000,20044=>1000,20045=>1000,20046=>1000,20047=>1000,20048=>1000,20049=>1000,20050=>1000,20051=>1000,20052=>1000,
-	20053=>1000,20054=>1000,20055=>1000,20056=>1000,20057=>1000,20058=>1000,20059=>1000,20060=>1000,20061=>1000,20062=>1000,20063=>1000,20064=>1000,20065=>1000,20066=>1000,20067=>1000,20068=>1000,
-	20069=>1000,20070=>1000,20071=>1000,20072=>1000,20073=>1000,20074=>1000,20075=>1000,20076=>1000,20077=>1000,20078=>1000,20079=>1000,20080=>1000,20081=>1000,20082=>1000,20083=>1000,20084=>1000,
-	20085=>1000,20086=>1000,20087=>1000,20088=>1000,20089=>1000,20090=>1000,20091=>1000,20092=>1000,20093=>1000,20094=>1000,20095=>1000,20096=>1000,20097=>1000,20098=>1000,20099=>1000,20100=>1000,
-	20101=>1000,20102=>1000,20103=>1000,20104=>1000,20105=>1000,20106=>1000,20107=>1000,20108=>1000,20109=>1000,20110=>1000,20111=>1000,20112=>1000,20113=>1000,20114=>1000,20115=>1000,20116=>1000,
-	20117=>1000,20118=>1000,20119=>1000,20120=>1000,20121=>1000,20122=>1000,20123=>1000,20124=>1000,20125=>1000,20126=>1000,20127=>1000,20128=>1000,20129=>1000,20130=>1000,20131=>1000,20132=>1000,
-	20133=>1000,20134=>1000,20135=>1000,20136=>1000,20137=>1000,20138=>1000,20139=>1000,20140=>1000,20141=>1000,20142=>1000,20143=>1000,20144=>1000,20145=>1000,20146=>1000,20147=>1000,20148=>1000,
-	20149=>1000,20150=>1000,20151=>1000,20152=>1000,20153=>1000,20154=>1000,20155=>1000,20156=>1000,20157=>1000,20158=>1000,20159=>1000,20160=>1000,20161=>1000,20162=>1000,20163=>1000,20164=>1000,
-	20165=>1000,20166=>1000,20167=>1000,20168=>1000,20169=>1000,20170=>1000,20171=>1000,20172=>1000,20173=>1000,20174=>1000,20175=>1000,20176=>1000,20177=>1000,20178=>1000,20179=>1000,20180=>1000,
-	20181=>1000,20182=>1000,20183=>1000,20184=>1000,20185=>1000,20186=>1000,20187=>1000,20188=>1000,20189=>1000,20190=>1000,20191=>1000,20192=>1000,20193=>1000,20194=>1000,20195=>1000,20196=>1000,
-	20197=>1000,20198=>1000,20199=>1000,20200=>1000,20201=>1000,20202=>1000,20203=>1000,20204=>1000,20205=>1000,20206=>1000,20207=>1000,20208=>1000,20209=>1000,20210=>1000,20211=>1000,20212=>1000,
-	20213=>1000,20214=>1000,20215=>1000,20216=>1000,20217=>1000,20218=>1000,20219=>1000,20220=>1000,20221=>1000,20222=>1000,20223=>1000,20224=>1000,20225=>1000,20226=>1000,20227=>1000,20228=>1000,
-	20229=>1000,20230=>1000,20231=>1000,20232=>1000,20233=>1000,20234=>1000,20235=>1000,20236=>1000,20237=>1000,20238=>1000,20239=>1000,20240=>1000,20241=>1000,20242=>1000,20243=>1000,20244=>1000,
-	20245=>1000,20246=>1000,20247=>1000,20248=>1000,20249=>1000,20250=>1000,20251=>1000,20252=>1000,20253=>1000,20254=>1000,20255=>1000,20256=>1000,20257=>1000,20258=>1000,20259=>1000,20260=>1000,
-	20261=>1000,20262=>1000,20263=>1000,20264=>1000,20265=>1000,20266=>1000,20267=>1000,20268=>1000,20269=>1000,20270=>1000,20271=>1000,20272=>1000,20273=>1000,20274=>1000,20275=>1000,20276=>1000,
-	20277=>1000,20278=>1000,20279=>1000,20280=>1000,20281=>1000,20282=>1000,20283=>1000,20284=>1000,20285=>1000,20286=>1000,20287=>1000,20288=>1000,20289=>1000,20290=>1000,20291=>1000,20292=>1000,
-	20293=>1000,20294=>1000,20295=>1000,20296=>1000,20297=>1000,20298=>1000,20299=>1000,20300=>1000,20301=>1000,20302=>1000,20303=>1000,20304=>1000,20305=>1000,20306=>1000,20307=>1000,20308=>1000,
-	20309=>1000,20310=>1000,20311=>1000,20312=>1000,20313=>1000,20314=>1000,20315=>1000,20316=>1000,20317=>1000,20318=>1000,20319=>1000,20320=>1000,20321=>1000,20322=>1000,20323=>1000,20324=>1000,
-	20325=>1000,20326=>1000,20327=>1000,20328=>1000,20329=>1000,20330=>1000,20331=>1000,20332=>1000,20333=>1000,20334=>1000,20335=>1000,20336=>1000,20337=>1000,20338=>1000,20339=>1000,20340=>1000,
-	20341=>1000,20342=>1000,20343=>1000,20344=>1000,20345=>1000,20346=>1000,20347=>1000,20348=>1000,20349=>1000,20350=>1000,20351=>1000,20352=>1000,20353=>1000,20354=>1000,20355=>1000,20356=>1000,
-	20357=>1000,20358=>1000,20359=>1000,20360=>1000,20361=>1000,20362=>1000,20363=>1000,20364=>1000,20365=>1000,20366=>1000,20367=>1000,20368=>1000,20369=>1000,20370=>1000,20371=>1000,20372=>1000,
-	20373=>1000,20374=>1000,20375=>1000,20376=>1000,20377=>1000,20378=>1000,20379=>1000,20380=>1000,20381=>1000,20382=>1000,20383=>1000,20384=>1000,20385=>1000,20386=>1000,20387=>1000,20388=>1000,
-	20389=>1000,20390=>1000,20391=>1000,20392=>1000,20393=>1000,20394=>1000,20395=>1000,20396=>1000,20397=>1000,20398=>1000,20399=>1000,20400=>1000,20401=>1000,20402=>1000,20403=>1000,20404=>1000,
-	20405=>1000,20406=>1000,20407=>1000,20408=>1000,20409=>1000,20410=>1000,20411=>1000,20412=>1000,20413=>1000,20414=>1000,20415=>1000,20416=>1000,20417=>1000,20418=>1000,20419=>1000,20420=>1000,
-	20421=>1000,20422=>1000,20423=>1000,20424=>1000,20425=>1000,20426=>1000,20427=>1000,20428=>1000,20429=>1000,20430=>1000,20431=>1000,20432=>1000,20433=>1000,20434=>1000,20435=>1000,20436=>1000,
-	20437=>1000,20438=>1000,20439=>1000,20440=>1000,20441=>1000,20442=>1000,20443=>1000,20444=>1000,20445=>1000,20446=>1000,20447=>1000,20448=>1000,20449=>1000,20450=>1000,20451=>1000,20452=>1000,
-	20453=>1000,20454=>1000,20455=>1000,20456=>1000,20457=>1000,20458=>1000,20459=>1000,20460=>1000,20461=>1000,20462=>1000,20463=>1000,20464=>1000,20465=>1000,20466=>1000,20467=>1000,20468=>1000,
-	20469=>1000,20470=>1000,20471=>1000,20472=>1000,20473=>1000,20474=>1000,20475=>1000,20476=>1000,20477=>1000,20478=>1000,20479=>1000,20480=>1000,20481=>1000,20482=>1000,20483=>1000,20484=>1000,
-	20485=>1000,20486=>1000,20487=>1000,20488=>1000,20489=>1000,20490=>1000,20491=>1000,20492=>1000,20493=>1000,20494=>1000,20495=>1000,20496=>1000,20497=>1000,20498=>1000,20499=>1000,20500=>1000,
-	20501=>1000,20502=>1000,20503=>1000,20504=>1000,20505=>1000,20506=>1000,20507=>1000,20508=>1000,20509=>1000,20510=>1000,20511=>1000,20512=>1000,20513=>1000,20514=>1000,20515=>1000,20516=>1000,
-	20517=>1000,20518=>1000,20519=>1000,20520=>1000,20521=>1000,20522=>1000,20523=>1000,20524=>1000,20525=>1000,20526=>1000,20527=>1000,20528=>1000,20529=>1000,20530=>1000,20531=>1000,20532=>1000,
-	20533=>1000,20534=>1000,20535=>1000,20536=>1000,20537=>1000,20538=>1000,20539=>1000,20540=>1000,20541=>1000,20542=>1000,20543=>1000,20544=>1000,20545=>1000,20546=>1000,20547=>1000,20548=>1000,
-	20549=>1000,20550=>1000,20551=>1000,20552=>1000,20553=>1000,20554=>1000,20555=>1000,20556=>1000,20557=>1000,20558=>1000,20559=>1000,20560=>1000,20561=>1000,20562=>1000,20563=>1000,20564=>1000,
-	20565=>1000,20566=>1000,20567=>1000,20568=>1000,20569=>1000,20570=>1000,20571=>1000,20572=>1000,20573=>1000,20574=>1000,20575=>1000,20576=>1000,20577=>1000,20578=>1000,20579=>1000,20580=>1000,
-	20581=>1000,20582=>1000,20583=>1000,20584=>1000,20585=>1000,20586=>1000,20587=>1000,20588=>1000,20589=>1000,20590=>1000,20591=>1000,20592=>1000,20593=>1000,20594=>1000,20595=>1000,20596=>1000,
-	20597=>1000,20598=>1000,20599=>1000,20600=>1000,20601=>1000,20602=>1000,20603=>1000,20604=>1000,20605=>1000,20606=>1000,20607=>1000,20608=>1000,20609=>1000,20610=>1000,20611=>1000,20612=>1000,
-	20613=>1000,20614=>1000,20615=>1000,20616=>1000,20617=>1000,20618=>1000,20619=>1000,20620=>1000,20621=>1000,20622=>1000,20623=>1000,20624=>1000,20625=>1000,20626=>1000,20627=>1000,20628=>1000,
-	20629=>1000,20630=>1000,20631=>1000,20632=>1000,20633=>1000,20634=>1000,20635=>1000,20636=>1000,20637=>1000,20638=>1000,20639=>1000,20640=>1000,20641=>1000,20642=>1000,20643=>1000,20644=>1000,
-	20645=>1000,20646=>1000,20647=>1000,20648=>1000,20649=>1000,20650=>1000,20651=>1000,20652=>1000,20653=>1000,20654=>1000,20655=>1000,20656=>1000,20657=>1000,20658=>1000,20659=>1000,20660=>1000,
-	20661=>1000,20662=>1000,20663=>1000,20664=>1000,20665=>1000,20666=>1000,20667=>1000,20668=>1000,20669=>1000,20670=>1000,20671=>1000,20672=>1000,20673=>1000,20674=>1000,20675=>1000,20676=>1000,
-	20677=>1000,20678=>1000,20679=>1000,20680=>1000,20681=>1000,20682=>1000,20683=>1000,20684=>1000,20685=>1000,20686=>1000,20687=>1000,20688=>1000,20689=>1000,20690=>1000,20691=>1000,20692=>1000,
-	20693=>1000,20694=>1000,20695=>1000,20696=>1000,20697=>1000,20698=>1000,20699=>1000,20700=>1000,20701=>1000,20702=>1000,20703=>1000,20704=>1000,20705=>1000,20706=>1000,20707=>1000,20708=>1000,
-	20709=>1000,20710=>1000,20711=>1000,20712=>1000,20713=>1000,20714=>1000,20715=>1000,20716=>1000,20717=>1000,20718=>1000,20719=>1000,20720=>1000,20721=>1000,20722=>1000,20723=>1000,20724=>1000,
-	20725=>1000,20726=>1000,20727=>1000,20728=>1000,20729=>1000,20730=>1000,20731=>1000,20732=>1000,20733=>1000,20734=>1000,20735=>1000,20736=>1000,20737=>1000,20738=>1000,20739=>1000,20740=>1000,
-	20741=>1000,20742=>1000,20743=>1000,20744=>1000,20745=>1000,20746=>1000,20747=>1000,20748=>1000,20749=>1000,20750=>1000,20751=>1000,20752=>1000,20753=>1000,20754=>1000,20755=>1000,20756=>1000,
-	20757=>1000,20758=>1000,20759=>1000,20760=>1000,20761=>1000,20762=>1000,20763=>1000,20764=>1000,20765=>1000,20766=>1000,20767=>1000,20768=>1000,20769=>1000,20770=>1000,20771=>1000,20772=>1000,
-	20773=>1000,20774=>1000,20775=>1000,20776=>1000,20777=>1000,20778=>1000,20779=>1000,20780=>1000,20781=>1000,20782=>1000,20783=>1000,20784=>1000,20785=>1000,20786=>1000,20787=>1000,20788=>1000,
-	20789=>1000,20790=>1000,20791=>1000,20792=>1000,20793=>1000,20794=>1000,20795=>1000,20796=>1000,20797=>1000,20798=>1000,20799=>1000,20800=>1000,20801=>1000,20802=>1000,20803=>1000,20804=>1000,
-	20805=>1000,20806=>1000,20807=>1000,20808=>1000,20809=>1000,20810=>1000,20811=>1000,20812=>1000,20813=>1000,20814=>1000,20815=>1000,20816=>1000,20817=>1000,20818=>1000,20819=>1000,20820=>1000,
-	20821=>1000,20822=>1000,20823=>1000,20824=>1000,20825=>1000,20826=>1000,20827=>1000,20828=>1000,20829=>1000,20830=>1000,20831=>1000,20832=>1000,20833=>1000,20834=>1000,20835=>1000,20836=>1000,
-	20837=>1000,20838=>1000,20839=>1000,20840=>1000,20841=>1000,20842=>1000,20843=>1000,20844=>1000,20845=>1000,20846=>1000,20847=>1000,20848=>1000,20849=>1000,20850=>1000,20851=>1000,20852=>1000,
-	20853=>1000,20854=>1000,20855=>1000,20856=>1000,20857=>1000,20858=>1000,20859=>1000,20860=>1000,20861=>1000,20862=>1000,20863=>1000,20864=>1000,20865=>1000,20866=>1000,20867=>1000,20868=>1000,
-	20869=>1000,20870=>1000,20871=>1000,20872=>1000,20873=>1000,20874=>1000,20875=>1000,20876=>1000,20877=>1000,20878=>1000,20879=>1000,20880=>1000,20881=>1000,20882=>1000,20883=>1000,20884=>1000,
-	20885=>1000,20886=>1000,20887=>1000,20888=>1000,20889=>1000,20890=>1000,20891=>1000,20892=>1000,20893=>1000,20894=>1000,20895=>1000,20896=>1000,20897=>1000,20898=>1000,20899=>1000,20900=>1000,
-	20901=>1000,20902=>1000,20903=>1000,20904=>1000,20905=>1000,20906=>1000,20907=>1000,20908=>1000,20909=>1000,20910=>1000,20911=>1000,20912=>1000,20913=>1000,20914=>1000,20915=>1000,20916=>1000,
-	20917=>1000,20918=>1000,20919=>1000,20920=>1000,20921=>1000,20922=>1000,20923=>1000,20924=>1000,20925=>1000,20926=>1000,20927=>1000,20928=>1000,20929=>1000,20930=>1000,20931=>1000,20932=>1000,
-	20933=>1000,20934=>1000,20935=>1000,20936=>1000,20937=>1000,20938=>1000,20939=>1000,20940=>1000,20941=>1000,20942=>1000,20943=>1000,20944=>1000,20945=>1000,20946=>1000,20947=>1000,20948=>1000,
-	20949=>1000,20950=>1000,20951=>1000,20952=>1000,20953=>1000,20954=>1000,20955=>1000,20956=>1000,20957=>1000,20958=>1000,20959=>1000,20960=>1000,20961=>1000,20962=>1000,20963=>1000,20964=>1000,
-	20965=>1000,20966=>1000,20967=>1000,20968=>1000,20969=>1000,20970=>1000,20971=>1000,20972=>1000,20973=>1000,20974=>1000,20975=>1000,20976=>1000,20977=>1000,20978=>1000,20979=>1000,20980=>1000,
-	20981=>1000,20982=>1000,20983=>1000,20984=>1000,20985=>1000,20986=>1000,20987=>1000,20988=>1000,20989=>1000,20990=>1000,20991=>1000,20992=>1000,20993=>1000,20994=>1000,20995=>1000,20996=>1000,
-	20997=>1000,20998=>1000,20999=>1000,21000=>1000,21001=>1000,21002=>1000,21003=>1000,21004=>1000,21005=>1000,21006=>1000,21007=>1000,21008=>1000,21009=>1000,21010=>1000,21011=>1000,21012=>1000,
-	21013=>1000,21014=>1000,21015=>1000,21016=>1000,21017=>1000,21018=>1000,21019=>1000,21020=>1000,21021=>1000,21022=>1000,21023=>1000,21024=>1000,21025=>1000,21026=>1000,21027=>1000,21028=>1000,
-	21029=>1000,21030=>1000,21031=>1000,21032=>1000,21033=>1000,21034=>1000,21035=>1000,21036=>1000,21037=>1000,21038=>1000,21039=>1000,21040=>1000,21041=>1000,21042=>1000,21043=>1000,21044=>1000,
-	21045=>1000,21046=>1000,21047=>1000,21048=>1000,21049=>1000,21050=>1000,21051=>1000,21052=>1000,21053=>1000,21054=>1000,21055=>1000,21056=>1000,21057=>1000,21058=>1000,21059=>1000,21060=>1000,
-	21061=>1000,21062=>1000,21063=>1000,21064=>1000,21065=>1000,21066=>1000,21067=>1000,21068=>1000,21069=>1000,21070=>1000,21071=>1000,21072=>1000,21073=>1000,21074=>1000,21075=>1000,21076=>1000,
-	21077=>1000,21078=>1000,21079=>1000,21080=>1000,21081=>1000,21082=>1000,21083=>1000,21084=>1000,21085=>1000,21086=>1000,21087=>1000,21088=>1000,21089=>1000,21090=>1000,21091=>1000,21092=>1000,
-	21093=>1000,21094=>1000,21095=>1000,21096=>1000,21097=>1000,21098=>1000,21099=>1000,21100=>1000,21101=>1000,21102=>1000,21103=>1000,21104=>1000,21105=>1000,21106=>1000,21107=>1000,21108=>1000,
-	21109=>1000,21110=>1000,21111=>1000,21112=>1000,21113=>1000,21114=>1000,21115=>1000,21116=>1000,21117=>1000,21118=>1000,21119=>1000,21120=>1000,21121=>1000,21122=>1000,21123=>1000,21124=>1000,
-	21125=>1000,21126=>1000,21127=>1000,21128=>1000,21129=>1000,21130=>1000,21131=>1000,21132=>1000,21133=>1000,21134=>1000,21135=>1000,21136=>1000,21137=>1000,21138=>1000,21139=>1000,21140=>1000,
-	21141=>1000,21142=>1000,21143=>1000,21144=>1000,21145=>1000,21146=>1000,21147=>1000,21148=>1000,21149=>1000,21150=>1000,21151=>1000,21152=>1000,21153=>1000,21154=>1000,21155=>1000,21156=>1000,
-	21157=>1000,21158=>1000,21159=>1000,21160=>1000,21161=>1000,21162=>1000,21163=>1000,21164=>1000,21165=>1000,21166=>1000,21167=>1000,21168=>1000,21169=>1000,21170=>1000,21171=>1000,21172=>1000,
-	21173=>1000,21174=>1000,21175=>1000,21176=>1000,21177=>1000,21178=>1000,21179=>1000,21180=>1000,21181=>1000,21182=>1000,21183=>1000,21184=>1000,21185=>1000,21186=>1000,21187=>1000,21188=>1000,
-	21189=>1000,21190=>1000,21191=>1000,21192=>1000,21193=>1000,21194=>1000,21195=>1000,21196=>1000,21197=>1000,21198=>1000,21199=>1000,21200=>1000,21201=>1000,21202=>1000,21203=>1000,21204=>1000,
-	21205=>1000,21206=>1000,21207=>1000,21208=>1000,21209=>1000,21210=>1000,21211=>1000,21212=>1000,21213=>1000,21214=>1000,21215=>1000,21216=>1000,21217=>1000,21218=>1000,21219=>1000,21220=>1000,
-	21221=>1000,21222=>1000,21223=>1000,21224=>1000,21225=>1000,21226=>1000,21227=>1000,21228=>1000,21229=>1000,21230=>1000,21231=>1000,21232=>1000,21233=>1000,21234=>1000,21235=>1000,21236=>1000,
-	21237=>1000,21238=>1000,21239=>1000,21240=>1000,21241=>1000,21242=>1000,21243=>1000,21244=>1000,21245=>1000,21246=>1000,21247=>1000,21248=>1000,21249=>1000,21250=>1000,21251=>1000,21252=>1000,
-	21253=>1000,21254=>1000,21255=>1000,21256=>1000,21257=>1000,21258=>1000,21259=>1000,21260=>1000,21261=>1000,21262=>1000,21263=>1000,21264=>1000,21265=>1000,21266=>1000,21267=>1000,21268=>1000,
-	21269=>1000,21270=>1000,21271=>1000,21272=>1000,21273=>1000,21274=>1000,21275=>1000,21276=>1000,21277=>1000,21278=>1000,21279=>1000,21280=>1000,21281=>1000,21282=>1000,21283=>1000,21284=>1000,
-	21285=>1000,21286=>1000,21287=>1000,21288=>1000,21289=>1000,21290=>1000,21291=>1000,21292=>1000,21293=>994,21294=>1000,21295=>1000,21296=>1000,21297=>1000,21298=>1000,21299=>1000,21300=>1000,
-	21301=>1000,21302=>1000,21303=>1000,21304=>1000,21305=>1000,21306=>1000,21307=>1000,21308=>1000,21309=>1000,21310=>1000,21311=>1000,21312=>1000,21313=>1000,21314=>1000,21315=>1000,21316=>1000,
-	21317=>1000,21318=>1000,21319=>1000,21320=>1000,21321=>1000,21322=>1000,21323=>1000,21324=>1000,21325=>1000,21326=>1000,21327=>1000,21328=>1000,21329=>1000,21330=>1000,21331=>1000,21332=>1000,
-	21333=>1000,21334=>1000,21335=>1000,21336=>1000,21337=>1000,21338=>1000,21339=>1000,21340=>1000,21341=>1000,21342=>1000,21343=>1000,21344=>1000,21345=>1000,21346=>1000,21347=>1000,21348=>1000,
-	21349=>1000,21350=>1000,21351=>1000,21352=>1000,21353=>1000,21354=>1000,21355=>1000,21356=>1000,21357=>1000,21358=>1000,21359=>1000,21360=>1000,21361=>1000,21362=>1000,21363=>1000,21364=>1000,
-	21365=>1000,21366=>1000,21367=>1000,21368=>1000,21369=>1000,21370=>1000,21371=>1000,21372=>1000,21373=>1000,21374=>1000,21375=>1000,21376=>1000,21377=>1000,21378=>1000,21379=>1000,21380=>1000,
-	21381=>1000,21382=>1000,21383=>1000,21384=>1000,21385=>1000,21386=>1000,21387=>1000,21388=>1000,21389=>1000,21390=>1000,21391=>1000,21392=>1000,21393=>1000,21394=>1000,21395=>1000,21396=>1000,
-	21397=>1000,21398=>1000,21399=>1000,21400=>1000,21401=>1000,21402=>1000,21403=>1000,21404=>1000,21405=>1000,21406=>1000,21407=>1000,21408=>1000,21409=>1000,21410=>1000,21411=>1000,21412=>1000,
-	21413=>1000,21414=>1000,21415=>1000,21416=>1000,21417=>1000,21418=>1000,21419=>1000,21420=>1000,21421=>1000,21422=>1000,21423=>1000,21424=>1000,21425=>1000,21426=>1000,21427=>1000,21428=>1000,
-	21429=>1000,21430=>1000,21431=>1000,21432=>1000,21433=>1000,21434=>1000,21435=>1000,21436=>1000,21437=>1000,21438=>1000,21439=>1000,21440=>1000,21441=>1000,21442=>1000,21443=>1000,21444=>1000,
-	21445=>1000,21446=>1000,21447=>1000,21448=>1000,21449=>1000,21450=>1000,21451=>1000,21452=>1000,21453=>1000,21454=>1000,21455=>1000,21456=>1000,21457=>1000,21458=>1000,21459=>1000,21460=>1000,
-	21461=>1000,21462=>1000,21463=>1000,21464=>1000,21465=>1000,21466=>1000,21467=>1000,21468=>1000,21469=>1000,21470=>1000,21471=>1000,21472=>1000,21473=>1000,21474=>1000,21475=>1000,21476=>1000,
-	21477=>1000,21478=>1000,21479=>1000,21480=>1000,21481=>1000,21482=>1000,21483=>1000,21484=>1000,21485=>1000,21486=>1000,21487=>1000,21488=>1000,21489=>1000,21490=>1000,21491=>1000,21492=>1000,
-	21493=>1000,21494=>1000,21495=>1000,21496=>1000,21497=>1000,21498=>1000,21499=>1000,21500=>1000,21501=>1000,21502=>1000,21503=>1000,21504=>1000,21505=>1000,21506=>1000,21507=>1000,21508=>1000,
-	21509=>1000,21510=>1000,21511=>1000,21512=>1000,21513=>1000,21514=>1000,21515=>1000,21516=>1000,21517=>1000,21518=>1000,21519=>1000,21520=>1000,21521=>1000,21522=>1000,21523=>1000,21524=>1000,
-	21525=>1000,21526=>1000,21527=>1000,21528=>1000,21529=>1000,21530=>1000,21531=>1000,21532=>1000,21533=>1000,21534=>1000,21535=>1000,21536=>1000,21537=>1000,21538=>1000,21539=>1000,21540=>1000,
-	21541=>1000,21542=>1000,21543=>1000,21544=>1000,21545=>1000,21546=>1000,21547=>1000,21548=>1000,21549=>1000,21550=>1000,21551=>1000,21552=>1000,21553=>1000,21554=>1000,21555=>1000,21556=>1000,
-	21557=>1000,21558=>1000,21559=>1000,21560=>1000,21561=>1000,21562=>1000,21563=>1000,21564=>1000,21565=>1000,21566=>1000,21567=>1000,21568=>1000,21569=>1000,21570=>1000,21571=>1000,21572=>1000,
-	21573=>1000,21574=>1000,21575=>1000,21576=>1000,21577=>1000,21578=>1000,21579=>1000,21580=>1000,21581=>1000,21582=>1000,21583=>1000,21584=>1000,21585=>1000,21586=>1000,21587=>1000,21588=>1000,
-	21589=>1000,21590=>1000,21591=>1000,21592=>1000,21593=>1000,21594=>1000,21595=>1000,21596=>1000,21597=>1000,21598=>1000,21599=>1000,21600=>1000,21601=>1000,21602=>1000,21603=>1000,21604=>1000,
-	21605=>1000,21606=>1000,21607=>1000,21608=>1000,21609=>1000,21610=>1000,21611=>1000,21612=>1000,21613=>1000,21614=>1000,21615=>1000,21616=>1000,21617=>1000,21618=>1000,21619=>1000,21620=>1000,
-	21621=>1000,21622=>1000,21623=>1000,21624=>1000,21625=>1000,21626=>1000,21627=>1000,21628=>1000,21629=>1000,21630=>1000,21631=>1000,21632=>1000,21633=>1000,21634=>1000,21635=>1000,21636=>1000,
-	21637=>1000,21638=>1000,21639=>1000,21640=>1000,21641=>1000,21642=>1000,21643=>1000,21644=>1000,21645=>1000,21646=>1000,21647=>1000,21648=>1000,21649=>1000,21650=>1000,21651=>1000,21652=>1000,
-	21653=>1000,21654=>1000,21655=>1000,21656=>1000,21657=>1000,21658=>1000,21659=>1000,21660=>1000,21661=>1000,21662=>1000,21663=>1000,21664=>1000,21665=>1000,21666=>1000,21667=>1000,21668=>1000,
-	21669=>1000,21670=>1000,21671=>1000,21672=>1000,21673=>1000,21674=>1000,21675=>1000,21676=>1000,21677=>1000,21678=>1000,21679=>1000,21680=>1000,21681=>1000,21682=>1000,21683=>1000,21684=>1000,
-	21685=>1000,21686=>1000,21687=>1000,21688=>1000,21689=>1000,21690=>1000,21691=>1000,21692=>1000,21693=>1000,21694=>1000,21695=>1000,21696=>1000,21697=>1000,21698=>1000,21699=>1000,21700=>1000,
-	21701=>1000,21702=>1000,21703=>1000,21704=>1000,21705=>1000,21706=>1000,21707=>1000,21708=>1000,21709=>1000,21710=>1000,21711=>1000,21712=>1000,21713=>1000,21714=>1000,21715=>1000,21716=>1000,
-	21717=>1000,21718=>1000,21719=>1000,21720=>1000,21721=>1000,21722=>1000,21723=>1000,21724=>1000,21725=>1000,21726=>1000,21727=>1000,21728=>1000,21729=>1000,21730=>1000,21731=>1000,21732=>1000,
-	21733=>1000,21734=>1000,21735=>1000,21736=>1000,21737=>1000,21738=>1000,21739=>1000,21740=>1000,21741=>1000,21742=>1000,21743=>1000,21744=>1000,21745=>1000,21746=>1000,21747=>1000,21748=>1000,
-	21749=>1000,21750=>1000,21751=>1000,21752=>1000,21753=>1000,21754=>1000,21755=>1000,21756=>1000,21757=>1000,21758=>1000,21759=>1000,21760=>1000,21761=>1000,21762=>1000,21763=>1000,21764=>1000,
-	21765=>1000,21766=>1000,21767=>1000,21768=>1000,21769=>1000,21770=>1000,21771=>1000,21772=>1000,21773=>1000,21774=>1000,21775=>1000,21776=>1000,21777=>1000,21778=>1000,21779=>1000,21780=>1000,
-	21781=>1000,21782=>1000,21783=>1000,21784=>1000,21785=>1000,21786=>1000,21787=>1000,21788=>1000,21789=>1000,21790=>1000,21791=>1000,21792=>1000,21793=>1000,21794=>1000,21795=>1000,21796=>1000,
-	21797=>1000,21798=>1000,21799=>1000,21800=>1000,21801=>1000,21802=>1000,21803=>1000,21804=>1000,21805=>1000,21806=>1000,21807=>1000,21808=>1000,21809=>1000,21810=>1000,21811=>1000,21812=>1000,
-	21813=>1000,21814=>1000,21815=>1000,21816=>1000,21817=>1000,21818=>1000,21819=>1000,21820=>1000,21821=>1000,21822=>1000,21823=>1000,21824=>1000,21825=>1000,21826=>1000,21827=>1000,21828=>1000,
-	21829=>1000,21830=>1000,21831=>1000,21832=>1000,21833=>1000,21834=>1000,21835=>1000,21836=>1000,21837=>1000,21838=>1000,21839=>1000,21840=>1000,21841=>1000,21842=>1000,21843=>1000,21844=>1000,
-	21845=>1000,21846=>1000,21847=>1000,21848=>1000,21849=>1000,21850=>1000,21851=>1000,21852=>1000,21853=>1000,21854=>1000,21855=>1000,21856=>1000,21857=>1000,21858=>1000,21859=>1000,21860=>1000,
-	21861=>1000,21862=>1000,21863=>1000,21864=>1000,21865=>1000,21866=>1000,21867=>1000,21868=>1000,21869=>1000,21870=>1000,21871=>1000,21872=>1000,21873=>1000,21874=>1000,21875=>1000,21876=>1000,
-	21877=>1000,21878=>1000,21879=>1000,21880=>1000,21881=>1000,21882=>1000,21883=>1000,21884=>1000,21885=>1000,21886=>1000,21887=>1000,21888=>1000,21889=>1000,21890=>1000,21891=>1000,21892=>1000,
-	21893=>1000,21894=>1000,21895=>1000,21896=>1000,21897=>1000,21898=>1000,21899=>1000,21900=>1000,21901=>1000,21902=>1000,21903=>1000,21904=>1000,21905=>1000,21906=>1000,21907=>1000,21908=>1000,
-	21909=>1000,21910=>1000,21911=>1000,21912=>1000,21913=>1000,21914=>1000,21915=>1000,21916=>1000,21917=>1000,21918=>1000,21919=>1000,21920=>1000,21921=>1000,21922=>1000,21923=>1000,21924=>1000,
-	21925=>1000,21926=>1000,21927=>1000,21928=>1000,21929=>1000,21930=>1000,21931=>1000,21932=>1000,21933=>1000,21934=>1000,21935=>1000,21936=>1000,21937=>1000,21938=>1000,21939=>1000,21940=>1000,
-	21941=>1000,21942=>1000,21943=>1000,21944=>1000,21945=>1000,21946=>1000,21947=>1000,21948=>1000,21949=>1000,21950=>1000,21951=>1000,21952=>1000,21953=>1000,21954=>1000,21955=>1000,21956=>1000,
-	21957=>1000,21958=>1000,21959=>1000,21960=>1000,21961=>1000,21962=>1000,21963=>1000,21964=>1000,21965=>1000,21966=>1000,21967=>1000,21968=>1000,21969=>1000,21970=>1000,21971=>1000,21972=>1000,
-	21973=>1000,21974=>1000,21975=>1000,21976=>1000,21977=>1000,21978=>1000,21979=>1000,21980=>1000,21981=>1000,21982=>1000,21983=>1000,21984=>1000,21985=>1000,21986=>1000,21987=>1000,21988=>1000,
-	21989=>1000,21990=>1000,21991=>1000,21992=>1000,21993=>1000,21994=>1000,21995=>1000,21996=>1000,21997=>1000,21998=>1000,21999=>1000,22000=>1000,22001=>1000,22002=>1000,22003=>1000,22004=>1000,
-	22005=>1000,22006=>1000,22007=>1000,22008=>1000,22009=>1000,22010=>1000,22011=>1000,22012=>1000,22013=>1000,22014=>1000,22015=>1000,22016=>1000,22017=>1000,22018=>1000,22019=>1000,22020=>1000,
-	22021=>1000,22022=>1000,22023=>1000,22024=>1000,22025=>1000,22026=>1000,22027=>1000,22028=>1000,22029=>1000,22030=>1000,22031=>1000,22032=>1000,22033=>1000,22034=>1000,22035=>1000,22036=>1000,
-	22037=>1000,22038=>1000,22039=>1000,22040=>1000,22041=>1000,22042=>1000,22043=>1000,22044=>1000,22045=>1000,22046=>1000,22047=>1000,22048=>1000,22049=>1000,22050=>1000,22051=>1000,22052=>1000,
-	22053=>1000,22054=>1000,22055=>1000,22056=>1000,22057=>1000,22058=>1000,22059=>1000,22060=>1000,22061=>1000,22062=>1000,22063=>1000,22064=>1000,22065=>1000,22066=>1000,22067=>1000,22068=>1000,
-	22069=>1000,22070=>1000,22071=>1000,22072=>1000,22073=>1000,22074=>1000,22075=>1000,22076=>1000,22077=>1000,22078=>1000,22079=>1000,22080=>1000,22081=>1000,22082=>1000,22083=>1000,22084=>1000,
-	22085=>1000,22086=>1000,22087=>1000,22088=>1000,22089=>1000,22090=>1000,22091=>1000,22092=>1000,22093=>1000,22094=>1000,22095=>1000,22096=>1000,22097=>1000,22098=>1000,22099=>1000,22100=>1000,
-	22101=>1000,22102=>1000,22103=>1000,22104=>1000,22105=>1000,22106=>1000,22107=>1000,22108=>1000,22109=>1000,22110=>1000,22111=>1000,22112=>1000,22113=>1000,22114=>1000,22115=>1000,22116=>1000,
-	22117=>1000,22118=>1000,22119=>1000,22120=>1000,22121=>1000,22122=>1000,22123=>1000,22124=>1000,22125=>1000,22126=>1000,22127=>1000,22128=>1000,22129=>1000,22130=>1000,22131=>1000,22132=>1000,
-	22133=>1000,22134=>1000,22135=>1000,22136=>1000,22137=>1000,22138=>1000,22139=>1000,22140=>1000,22141=>1000,22142=>1000,22143=>1000,22144=>1000,22145=>1000,22146=>1000,22147=>1000,22148=>1000,
-	22149=>1000,22150=>1000,22151=>1000,22152=>1000,22153=>1000,22154=>1000,22155=>1000,22156=>1000,22157=>1000,22158=>1000,22159=>1000,22160=>1000,22161=>1000,22162=>1000,22163=>1000,22164=>1000,
-	22165=>1000,22166=>1000,22167=>1000,22168=>1000,22169=>1000,22170=>1000,22171=>1000,22172=>1000,22173=>1000,22174=>1000,22175=>1000,22176=>1000,22177=>1000,22178=>1000,22179=>1000,22180=>1000,
-	22181=>1000,22182=>1000,22183=>1000,22184=>1000,22185=>1000,22186=>1000,22187=>1000,22188=>1000,22189=>1000,22190=>1000,22191=>1000,22192=>1000,22193=>1000,22194=>1000,22195=>1000,22196=>1000,
-	22197=>1000,22198=>1000,22199=>1000,22200=>1000,22201=>1000,22202=>1000,22203=>1000,22204=>1000,22205=>1000,22206=>1000,22207=>1000,22208=>1000,22209=>1000,22210=>1000,22211=>1000,22212=>1000,
-	22213=>1000,22214=>1000,22215=>1000,22216=>1000,22217=>1000,22218=>1000,22219=>1000,22220=>1000,22221=>1000,22222=>1000,22223=>1000,22224=>1000,22225=>1000,22226=>1000,22227=>1000,22228=>1000,
-	22229=>1000,22230=>1000,22231=>1000,22232=>1000,22233=>1000,22234=>1000,22235=>1000,22236=>1000,22237=>1000,22238=>1000,22239=>1000,22240=>1000,22241=>1000,22242=>1000,22243=>1000,22244=>1000,
-	22245=>1000,22246=>1000,22247=>1000,22248=>1000,22249=>1000,22250=>1000,22251=>1000,22252=>1000,22253=>1000,22254=>1000,22255=>1000,22256=>1000,22257=>1000,22258=>1000,22259=>1000,22260=>1000,
-	22261=>1000,22262=>1000,22263=>1000,22264=>1000,22265=>1000,22266=>1000,22267=>1000,22268=>1000,22269=>1000,22270=>1000,22271=>1000,22272=>1000,22273=>1000,22274=>1000,22275=>1000,22276=>1000,
-	22277=>1000,22278=>1000,22279=>1000,22280=>1000,22281=>1000,22282=>1000,22283=>1000,22284=>1000,22285=>1000,22286=>1000,22287=>1000,22288=>1000,22289=>1000,22290=>1000,22291=>1000,22292=>1000,
-	22293=>1000,22294=>1000,22295=>1000,22296=>1000,22297=>1000,22298=>1000,22299=>1000,22300=>1000,22301=>1000,22302=>1000,22303=>1000,22304=>1000,22305=>1000,22306=>1000,22307=>1000,22308=>1000,
-	22309=>1000,22310=>1000,22311=>1000,22312=>1000,22313=>1000,22314=>1000,22315=>1000,22316=>1000,22317=>1000,22318=>1000,22319=>1000,22320=>1000,22321=>1000,22322=>1000,22323=>1000,22324=>1000,
-	22325=>1000,22326=>1000,22327=>1000,22328=>1000,22329=>1000,22330=>1000,22331=>1000,22332=>1000,22333=>1000,22334=>1000,22335=>1000,22336=>1000,22337=>1000,22338=>1000,22339=>1000,22340=>1000,
-	22341=>1000,22342=>1000,22343=>1000,22344=>1000,22345=>1000,22346=>1000,22347=>1000,22348=>1000,22349=>1000,22350=>1000,22351=>1000,22352=>1000,22353=>1000,22354=>1000,22355=>1000,22356=>1000,
-	22357=>1000,22358=>1000,22359=>1000,22360=>1000,22361=>1000,22362=>1000,22363=>1000,22364=>1000,22365=>1000,22366=>1000,22367=>1000,22368=>1000,22369=>1000,22370=>1000,22371=>1000,22372=>1000,
-	22373=>1000,22374=>1000,22375=>1000,22376=>1000,22377=>1000,22378=>1000,22379=>1000,22380=>1000,22381=>1000,22382=>1000,22383=>1000,22384=>1000,22385=>1000,22386=>1000,22387=>1000,22388=>1000,
-	22389=>1000,22390=>1000,22391=>1000,22392=>1000,22393=>1000,22394=>1000,22395=>1000,22396=>1000,22397=>1000,22398=>1000,22399=>1000,22400=>1000,22401=>1000,22402=>1000,22403=>1000,22404=>1000,
-	22405=>1000,22406=>1000,22407=>1000,22408=>1000,22409=>1000,22410=>1000,22411=>1000,22412=>1000,22413=>1000,22414=>1000,22415=>1000,22416=>1000,22417=>1000,22418=>1000,22419=>1000,22420=>1000,
-	22421=>1000,22422=>1000,22423=>1000,22424=>1000,22425=>1000,22426=>1000,22427=>1000,22428=>1000,22429=>1000,22430=>1000,22431=>1000,22432=>1000,22433=>1000,22434=>1000,22435=>1000,22436=>1000,
-	22437=>1000,22438=>1000,22439=>1000,22440=>1000,22441=>1000,22442=>1000,22443=>1000,22444=>1000,22445=>1000,22446=>1000,22447=>1000,22448=>1000,22449=>1000,22450=>1000,22451=>1000,22452=>1000,
-	22453=>1000,22454=>1000,22455=>1000,22456=>1000,22457=>1000,22458=>1000,22459=>1000,22460=>1000,22461=>1000,22462=>1000,22463=>1000,22464=>1000,22465=>1000,22466=>1000,22467=>1000,22468=>1000,
-	22469=>1000,22470=>1000,22471=>1000,22472=>1000,22473=>1000,22474=>1000,22475=>1000,22476=>1000,22477=>1000,22478=>1000,22479=>1000,22480=>1000,22481=>1000,22482=>1000,22483=>1000,22484=>1000,
-	22485=>1000,22486=>1000,22487=>1000,22488=>1000,22489=>1000,22490=>1000,22491=>1000,22492=>1000,22493=>1000,22494=>1000,22495=>1000,22496=>1000,22497=>1000,22498=>1000,22499=>1000,22500=>1000,
-	22501=>1000,22502=>1000,22503=>1000,22504=>1000,22505=>1000,22506=>1000,22507=>1000,22508=>1000,22509=>1000,22510=>1000,22511=>1000,22512=>1000,22513=>1000,22514=>1000,22515=>1000,22516=>1000,
-	22517=>1000,22518=>1000,22519=>1000,22520=>1000,22521=>1000,22522=>1000,22523=>1000,22524=>1000,22525=>1000,22526=>1000,22527=>1000,22528=>1000,22529=>1000,22530=>1000,22531=>1000,22532=>1000,
-	22533=>1000,22534=>1000,22535=>1000,22536=>1000,22537=>1000,22538=>1000,22539=>1000,22540=>1000,22541=>1000,22542=>1000,22543=>1000,22544=>1000,22545=>1000,22546=>1000,22547=>1000,22548=>1000,
-	22549=>1000,22550=>1000,22551=>1000,22552=>1000,22553=>1000,22554=>1000,22555=>1000,22556=>1000,22557=>1000,22558=>1000,22559=>1000,22560=>1000,22561=>1000,22562=>1000,22563=>1000,22564=>1000,
-	22565=>1000,22566=>1000,22567=>1000,22568=>1000,22569=>1000,22570=>1000,22571=>1000,22572=>1000,22573=>1000,22574=>1000,22575=>1000,22576=>1000,22577=>1000,22578=>1000,22579=>1000,22580=>1000,
-	22581=>1000,22582=>1000,22583=>1000,22584=>1000,22585=>1000,22586=>1000,22587=>1000,22588=>1000,22589=>1000,22590=>1000,22591=>1000,22592=>1000,22593=>1000,22594=>1000,22595=>1000,22596=>1000,
-	22597=>1000,22598=>1000,22599=>1000,22600=>1000,22601=>1000,22602=>1000,22603=>1000,22604=>1000,22605=>1000,22606=>1000,22607=>1000,22608=>1000,22609=>1000,22610=>1000,22611=>1000,22612=>1000,
-	22613=>1000,22614=>1000,22615=>1000,22616=>1000,22617=>1000,22618=>1000,22619=>1000,22620=>1000,22621=>1000,22622=>1000,22623=>1000,22624=>1000,22625=>1000,22626=>1000,22627=>1000,22628=>1000,
-	22629=>1000,22630=>1000,22631=>1000,22632=>1000,22633=>1000,22634=>1000,22635=>1000,22636=>1000,22637=>1000,22638=>1000,22639=>1000,22640=>1000,22641=>1000,22642=>1000,22643=>1000,22644=>1000,
-	22645=>1000,22646=>1000,22647=>1000,22648=>1000,22649=>1000,22650=>1000,22651=>1000,22652=>1000,22653=>1000,22654=>1000,22655=>1000,22656=>1000,22657=>1000,22658=>1000,22659=>1000,22660=>1000,
-	22661=>1000,22662=>1000,22663=>1000,22664=>1000,22665=>1000,22666=>1000,22667=>1000,22668=>1000,22669=>1000,22670=>1000,22671=>1000,22672=>1000,22673=>1000,22674=>1000,22675=>1000,22676=>1000,
-	22677=>1000,22678=>1000,22679=>1000,22680=>1000,22681=>1000,22682=>1000,22683=>1000,22684=>1000,22685=>1000,22686=>1000,22687=>1000,22688=>1000,22689=>1000,22690=>1000,22691=>1000,22692=>1000,
-	22693=>1000,22694=>1000,22695=>1000,22696=>1000,22697=>1000,22698=>1000,22699=>1000,22700=>1000,22701=>1000,22702=>1000,22703=>1000,22704=>1000,22705=>1000,22706=>1000,22707=>1000,22708=>1000,
-	22709=>1000,22710=>1000,22711=>1000,22712=>1000,22713=>1000,22714=>1000,22715=>1000,22716=>1000,22717=>1000,22718=>1000,22719=>1000,22720=>1000,22721=>1000,22722=>1000,22723=>1000,22724=>1000,
-	22725=>1000,22726=>1000,22727=>1000,22728=>1000,22729=>1000,22730=>1000,22731=>1000,22732=>1000,22733=>1000,22734=>1000,22735=>1000,22736=>1000,22737=>1000,22738=>1000,22739=>1000,22740=>1000,
-	22741=>1000,22742=>1000,22743=>1000,22744=>1000,22745=>1000,22746=>1000,22747=>1000,22748=>1000,22749=>1000,22750=>1000,22751=>1000,22752=>1000,22753=>1000,22754=>1000,22755=>1000,22756=>1000,
-	22757=>1000,22758=>1000,22759=>1000,22760=>1000,22761=>1000,22762=>1000,22763=>1000,22764=>1000,22765=>1000,22766=>1000,22767=>1000,22768=>1000,22769=>1000,22770=>1000,22771=>1000,22772=>1000,
-	22773=>1000,22774=>1000,22775=>1000,22776=>1000,22777=>1000,22778=>1000,22779=>1000,22780=>1000,22781=>1000,22782=>1000,22783=>1000,22784=>1000,22785=>1000,22786=>1000,22787=>1000,22788=>1000,
-	22789=>1000,22790=>1000,22791=>1000,22792=>1000,22793=>1000,22794=>1000,22795=>1000,22796=>1000,22797=>1000,22798=>1000,22799=>1000,22800=>1000,22801=>1000,22802=>1000,22803=>1000,22804=>1000,
-	22805=>1000,22806=>1000,22807=>1000,22808=>1000,22809=>1000,22810=>1000,22811=>1000,22812=>1000,22813=>1000,22814=>1000,22815=>1000,22816=>1000,22817=>1000,22818=>1000,22819=>1000,22820=>1000,
-	22821=>1000,22822=>1000,22823=>1000,22824=>1000,22825=>1000,22826=>1000,22827=>1000,22828=>1000,22829=>1000,22830=>1000,22831=>1000,22832=>1000,22833=>1000,22834=>1000,22835=>1000,22836=>1000,
-	22837=>1000,22838=>1000,22839=>1000,22840=>1000,22841=>1000,22842=>1000,22843=>1000,22844=>1000,22845=>1000,22846=>1000,22847=>1000,22848=>1000,22849=>1000,22850=>1000,22851=>1000,22852=>1000,
-	22853=>1000,22854=>1000,22855=>1000,22856=>1000,22857=>1000,22858=>1000,22859=>1000,22860=>1000,22861=>1000,22862=>1000,22863=>1000,22864=>1000,22865=>1000,22866=>1000,22867=>1000,22868=>1000,
-	22869=>1000,22870=>1000,22871=>1000,22872=>1000,22873=>1000,22874=>1000,22875=>1000,22876=>1000,22877=>1000,22878=>1000,22879=>1000,22880=>1000,22881=>1000,22882=>1000,22883=>1000,22884=>1000,
-	22885=>1000,22886=>1000,22887=>1000,22888=>1000,22889=>1000,22890=>1000,22891=>1000,22892=>1000,22893=>1000,22894=>1000,22895=>1000,22896=>1000,22897=>1000,22898=>1000,22899=>1000,22900=>1000,
-	22901=>1000,22902=>1000,22903=>1000,22904=>1000,22905=>1000,22906=>1000,22907=>1000,22908=>1000,22909=>1000,22910=>1000,22911=>1000,22912=>1000,22913=>1000,22914=>1000,22915=>1000,22916=>1000,
-	22917=>1000,22918=>1000,22919=>1000,22920=>1000,22921=>1000,22922=>1000,22923=>1000,22924=>1000,22925=>1000,22926=>1000,22927=>1000,22928=>1000,22929=>1000,22930=>1000,22931=>1000,22932=>1000,
-	22933=>1000,22934=>1000,22935=>1000,22936=>1000,22937=>1000,22938=>1000,22939=>1000,22940=>1000,22941=>1000,22942=>1000,22943=>1000,22944=>1000,22945=>1000,22946=>1000,22947=>1000,22948=>1000,
-	22949=>1000,22950=>1000,22951=>1000,22952=>1000,22953=>1000,22954=>1000,22955=>1000,22956=>1000,22957=>1000,22958=>1000,22959=>1000,22960=>1000,22961=>1000,22962=>1000,22963=>1000,22964=>1000,
-	22965=>1000,22966=>1000,22967=>1000,22968=>1000,22969=>1000,22970=>1000,22971=>1000,22972=>1000,22973=>1000,22974=>1000,22975=>1000,22976=>1000,22977=>1000,22978=>1000,22979=>1000,22980=>1000,
-	22981=>1000,22982=>1000,22983=>1000,22984=>1000,22985=>1000,22986=>1000,22987=>1000,22988=>1000,22989=>1000,22990=>1000,22991=>1000,22992=>1000,22993=>1000,22994=>1000,22995=>1000,22996=>1000,
-	22997=>1000,22998=>1000,22999=>1000,23000=>1000,23001=>1000,23002=>1000,23003=>1000,23004=>1000,23005=>1000,23006=>1000,23007=>1000,23008=>1000,23009=>1000,23010=>1000,23011=>1000,23012=>1000,
-	23013=>1000,23014=>1000,23015=>1000,23016=>1000,23017=>1000,23018=>1000,23019=>1000,23020=>1000,23021=>1000,23022=>1000,23023=>1000,23024=>1000,23025=>1000,23026=>1000,23027=>1000,23028=>1000,
-	23029=>1000,23030=>1000,23031=>1000,23032=>1000,23033=>1000,23034=>1000,23035=>1000,23036=>1000,23037=>1000,23038=>1000,23039=>1000,23040=>1000,23041=>1000,23042=>1000,23043=>1000,23044=>1000,
-	23045=>1000,23046=>1000,23047=>1000,23048=>1000,23049=>1000,23050=>1000,23051=>1000,23052=>1000,23053=>1000,23054=>1000,23055=>1000,23056=>1000,23057=>1000,23058=>1000,23059=>1000,23060=>1000,
-	23061=>1000,23062=>1000,23063=>1000,23064=>1000,23065=>1000,23066=>1000,23067=>1000,23068=>1000,23069=>1000,23070=>1000,23071=>1000,23072=>1000,23073=>1000,23074=>1000,23075=>1000,23076=>1000,
-	23077=>1000,23078=>1000,23079=>1000,23080=>1000,23081=>1000,23082=>1000,23083=>1000,23084=>1000,23085=>1000,23086=>1000,23087=>1000,23088=>1000,23089=>1000,23090=>1000,23091=>1000,23092=>1000,
-	23093=>1000,23094=>1000,23095=>1000,23096=>1000,23097=>1000,23098=>1000,23099=>1000,23100=>1000,23101=>1000,23102=>1000,23103=>1000,23104=>1000,23105=>1000,23106=>1000,23107=>1000,23108=>1000,
-	23109=>1000,23110=>1000,23111=>1000,23112=>1000,23113=>1000,23114=>1000,23115=>1000,23116=>1000,23117=>1000,23118=>1000,23119=>1000,23120=>1000,23121=>1000,23122=>1000,23123=>1000,23124=>1000,
-	23125=>1000,23126=>1000,23127=>1000,23128=>1000,23129=>1000,23130=>1000,23131=>1000,23132=>1000,23133=>1000,23134=>1000,23135=>1000,23136=>1000,23137=>1000,23138=>1000,23139=>1000,23140=>1000,
-	23141=>1000,23142=>1000,23143=>1000,23144=>1000,23145=>1000,23146=>1000,23147=>1000,23148=>1000,23149=>1000,23150=>1000,23151=>1000,23152=>1000,23153=>1000,23154=>1000,23155=>1000,23156=>1000,
-	23157=>1000,23158=>1000,23159=>1000,23160=>1000,23161=>1000,23162=>1000,23163=>1000,23164=>1000,23165=>1000,23166=>1000,23167=>1000,23168=>1000,23169=>1000,23170=>1000,23171=>1000,23172=>1000,
-	23173=>1000,23174=>1000,23175=>1000,23176=>1000,23177=>1000,23178=>1000,23179=>1000,23180=>1000,23181=>1000,23182=>1000,23183=>1000,23184=>1000,23185=>1000,23186=>1000,23187=>1000,23188=>1000,
-	23189=>1000,23190=>1000,23191=>1000,23192=>1000,23193=>1000,23194=>1000,23195=>1000,23196=>1000,23197=>1000,23198=>1000,23199=>1000,23200=>1000,23201=>1000,23202=>1000,23203=>1000,23204=>1000,
-	23205=>1000,23206=>1000,23207=>1000,23208=>1000,23209=>1000,23210=>1000,23211=>1000,23212=>1000,23213=>1000,23214=>1000,23215=>1000,23216=>1000,23217=>1000,23218=>1000,23219=>1000,23220=>1000,
-	23221=>1000,23222=>1000,23223=>1000,23224=>1000,23225=>1000,23226=>1000,23227=>1000,23228=>1000,23229=>1000,23230=>1000,23231=>1000,23232=>1000,23233=>1000,23234=>1000,23235=>1000,23236=>1000,
-	23237=>1000,23238=>1000,23239=>1000,23240=>1000,23241=>1000,23242=>1000,23243=>1000,23244=>1000,23245=>1000,23246=>1000,23247=>1000,23248=>1000,23249=>1000,23250=>1000,23251=>1000,23252=>1000,
-	23253=>1000,23254=>1000,23255=>1000,23256=>1000,23257=>1000,23258=>1000,23259=>1000,23260=>1000,23261=>1000,23262=>1000,23263=>1000,23264=>1000,23265=>1000,23266=>1000,23267=>1000,23268=>1000,
-	23269=>1000,23270=>1000,23271=>1000,23272=>1000,23273=>1000,23274=>1000,23275=>1000,23276=>1000,23277=>1000,23278=>1000,23279=>1000,23280=>1000,23281=>1000,23282=>1000,23283=>1000,23284=>1000,
-	23285=>1000,23286=>1000,23287=>1000,23288=>1000,23289=>1000,23290=>1000,23291=>1000,23292=>1000,23293=>1000,23294=>1000,23295=>1000,23296=>1000,23297=>1000,23298=>1000,23299=>1000,23300=>1000,
-	23301=>1000,23302=>1000,23303=>1000,23304=>1000,23305=>1000,23306=>1000,23307=>1000,23308=>1000,23309=>1000,23310=>1000,23311=>1000,23312=>1000,23313=>1000,23314=>1000,23315=>1000,23316=>1000,
-	23317=>1000,23318=>1000,23319=>1000,23320=>1000,23321=>1000,23322=>1000,23323=>1000,23324=>1000,23325=>1000,23326=>1000,23327=>1000,23328=>1000,23329=>1000,23330=>1000,23331=>1000,23332=>1000,
-	23333=>1000,23334=>1000,23335=>1000,23336=>1000,23337=>1000,23338=>1000,23339=>1000,23340=>1000,23341=>1000,23342=>1000,23343=>1000,23344=>1000,23345=>1000,23346=>1000,23347=>1000,23348=>1000,
-	23349=>1000,23350=>1000,23351=>1000,23352=>1000,23353=>1000,23354=>1000,23355=>1000,23356=>1000,23357=>1000,23358=>1000,23359=>1000,23360=>1000,23361=>1000,23362=>1000,23363=>1000,23364=>1000,
-	23365=>1000,23366=>1000,23367=>1000,23368=>1000,23369=>1000,23370=>1000,23371=>1000,23372=>1000,23373=>1000,23374=>1000,23375=>1000,23376=>1000,23377=>1000,23378=>1000,23379=>1000,23380=>1000,
-	23381=>1000,23382=>1000,23383=>1000,23384=>1000,23385=>1000,23386=>1000,23387=>1000,23388=>1000,23389=>1000,23390=>1000,23391=>1000,23392=>1000,23393=>1000,23394=>1000,23395=>1000,23396=>1000,
-	23397=>1000,23398=>1000,23399=>1000,23400=>1000,23401=>1000,23402=>1000,23403=>1000,23404=>1000,23405=>1000,23406=>1000,23407=>1000,23408=>1000,23409=>1000,23410=>1000,23411=>1000,23412=>1000,
-	23413=>1000,23414=>1000,23415=>1000,23416=>1000,23417=>1000,23418=>1000,23419=>1000,23420=>1000,23421=>1000,23422=>1000,23423=>1000,23424=>1000,23425=>1000,23426=>1000,23427=>1000,23428=>1000,
-	23429=>1000,23430=>1000,23431=>1000,23432=>1000,23433=>1000,23434=>1000,23435=>1000,23436=>1000,23437=>1000,23438=>1000,23439=>1000,23440=>1000,23441=>1000,23442=>1000,23443=>1000,23444=>1000,
-	23445=>1000,23446=>1000,23447=>1000,23448=>1000,23449=>1000,23450=>1000,23451=>1000,23452=>1000,23453=>1000,23454=>1000,23455=>1000,23456=>1000,23457=>1000,23458=>1000,23459=>1000,23460=>1000,
-	23461=>1000,23462=>1000,23463=>1000,23464=>1000,23465=>1000,23466=>1000,23467=>1000,23468=>1000,23469=>1000,23470=>1000,23471=>1000,23472=>1000,23473=>1000,23474=>1000,23475=>1000,23476=>1000,
-	23477=>1000,23478=>1000,23479=>1000,23480=>1000,23481=>1000,23482=>1000,23483=>1000,23484=>1000,23485=>1000,23486=>1000,23487=>1000,23488=>1000,23489=>1000,23490=>1000,23491=>1000,23492=>1000,
-	23493=>1000,23494=>1000,23495=>1000,23496=>1000,23497=>1000,23498=>1000,23499=>1000,23500=>1000,23501=>1000,23502=>1000,23503=>1000,23504=>1000,23505=>1000,23506=>1000,23507=>1000,23508=>1000,
-	23509=>1000,23510=>1000,23511=>1000,23512=>1000,23513=>1000,23514=>1000,23515=>1000,23516=>1000,23517=>1000,23518=>1000,23519=>1000,23520=>1000,23521=>1000,23522=>1000,23523=>1000,23524=>1000,
-	23525=>1000,23526=>1000,23527=>1000,23528=>1000,23529=>1000,23530=>1000,23531=>1000,23532=>1000,23533=>1000,23534=>1000,23535=>1000,23536=>1000,23537=>1000,23538=>1000,23539=>1000,23540=>1000,
-	23541=>1000,23542=>1000,23543=>1000,23544=>1000,23545=>1000,23546=>1000,23547=>1000,23548=>1000,23549=>1000,23550=>1000,23551=>1000,23552=>1000,23553=>1000,23554=>1000,23555=>1000,23556=>1000,
-	23557=>1000,23558=>1000,23559=>1000,23560=>1000,23561=>1000,23562=>1000,23563=>1000,23564=>1000,23565=>1000,23566=>1000,23567=>1000,23568=>1000,23569=>1000,23570=>1000,23571=>1000,23572=>1000,
-	23573=>1000,23574=>1000,23575=>1000,23576=>1000,23577=>1000,23578=>1000,23579=>1000,23580=>1000,23581=>1000,23582=>1000,23583=>1000,23584=>1000,23585=>1000,23586=>1000,23587=>1000,23588=>1000,
-	23589=>1000,23590=>1000,23591=>1000,23592=>1000,23593=>1000,23594=>1000,23595=>1000,23596=>1000,23597=>1000,23598=>1000,23599=>1000,23600=>1000,23601=>1000,23602=>1000,23603=>1000,23604=>1000,
-	23605=>1000,23606=>1000,23607=>1000,23608=>1000,23609=>1000,23610=>1000,23611=>1000,23612=>1000,23613=>1000,23614=>1000,23615=>1000,23616=>1000,23617=>1000,23618=>1000,23619=>1000,23620=>1000,
-	23621=>1000,23622=>1000,23623=>1000,23624=>1000,23625=>1000,23626=>1000,23627=>1000,23628=>1000,23629=>1000,23630=>1000,23631=>1000,23632=>1000,23633=>1000,23634=>1000,23635=>1000,23636=>1000,
-	23637=>1000,23638=>1000,23639=>1000,23640=>1000,23641=>1000,23642=>1000,23643=>1000,23644=>1000,23645=>1000,23646=>1000,23647=>1000,23648=>1000,23649=>1000,23650=>1000,23651=>1000,23652=>1000,
-	23653=>1000,23654=>1000,23655=>1000,23656=>1000,23657=>1000,23658=>1000,23659=>1000,23660=>1000,23661=>1000,23662=>1000,23663=>1000,23664=>1000,23665=>1000,23666=>1000,23667=>1000,23668=>1000,
-	23669=>1000,23670=>1000,23671=>1000,23672=>1000,23673=>1000,23674=>1000,23675=>1000,23676=>1000,23677=>1000,23678=>1000,23679=>1000,23680=>1000,23681=>1000,23682=>1000,23683=>1000,23684=>1000,
-	23685=>1000,23686=>1000,23687=>1000,23688=>1000,23689=>1000,23690=>1000,23691=>1000,23692=>1000,23693=>1000,23694=>1000,23695=>1000,23696=>1000,23697=>1000,23698=>1000,23699=>1000,23700=>1000,
-	23701=>1000,23702=>1000,23703=>1000,23704=>1000,23705=>1000,23706=>1000,23707=>1000,23708=>1000,23709=>1000,23710=>1000,23711=>1000,23712=>1000,23713=>1000,23714=>1000,23715=>1000,23716=>1000,
-	23717=>1000,23718=>1000,23719=>1000,23720=>1000,23721=>1000,23722=>1000,23723=>1000,23724=>1000,23725=>1000,23726=>1000,23727=>1000,23728=>1000,23729=>1000,23730=>1000,23731=>1000,23732=>1000,
-	23733=>1000,23734=>1000,23735=>1000,23736=>1000,23737=>1000,23738=>1000,23739=>1000,23740=>1000,23741=>1000,23742=>1000,23743=>1000,23744=>1000,23745=>1000,23746=>1000,23747=>1000,23748=>1000,
-	23749=>1000,23750=>1000,23751=>1000,23752=>1000,23753=>1000,23754=>1000,23755=>1000,23756=>1000,23757=>1000,23758=>1000,23759=>1000,23760=>1000,23761=>1000,23762=>1000,23763=>1000,23764=>1000,
-	23765=>1000,23766=>1000,23767=>1000,23768=>1000,23769=>1000,23770=>1000,23771=>1000,23772=>1000,23773=>1000,23774=>1000,23775=>1000,23776=>1000,23777=>1000,23778=>1000,23779=>1000,23780=>1000,
-	23781=>1000,23782=>1000,23783=>1000,23784=>1000,23785=>1000,23786=>1000,23787=>1000,23788=>1000,23789=>1000,23790=>1000,23791=>1000,23792=>1000,23793=>1000,23794=>1000,23795=>1000,23796=>1000,
-	23797=>1000,23798=>1000,23799=>1000,23800=>1000,23801=>1000,23802=>1000,23803=>1000,23804=>1000,23805=>1000,23806=>1000,23807=>1000,23808=>1000,23809=>1000,23810=>1000,23811=>1000,23812=>1000,
-	23813=>1000,23814=>1000,23815=>1000,23816=>1000,23817=>1000,23818=>1000,23819=>1000,23820=>1000,23821=>1000,23822=>1000,23823=>1000,23824=>1000,23825=>1000,23826=>1000,23827=>1000,23828=>1000,
-	23829=>1000,23830=>1000,23831=>1000,23832=>1000,23833=>1000,23834=>1000,23835=>1000,23836=>1000,23837=>1000,23838=>1000,23839=>1000,23840=>1000,23841=>1000,23842=>1000,23843=>1000,23844=>1000,
-	23845=>1000,23846=>1000,23847=>1000,23848=>1000,23849=>1000,23850=>1000,23851=>1000,23852=>1000,23853=>1000,23854=>1000,23855=>1000,23856=>1000,23857=>1000,23858=>1000,23859=>1000,23860=>1000,
-	23861=>1000,23862=>1000,23863=>1000,23864=>1000,23865=>1000,23866=>1000,23867=>1000,23868=>1000,23869=>1000,23870=>1000,23871=>1000,23872=>1000,23873=>1000,23874=>1000,23875=>1000,23876=>1000,
-	23877=>1000,23878=>1000,23879=>1000,23880=>1000,23881=>1000,23882=>1000,23883=>1000,23884=>1000,23885=>1000,23886=>1000,23887=>1000,23888=>1000,23889=>1000,23890=>1000,23891=>1000,23892=>1000,
-	23893=>1000,23894=>1000,23895=>1000,23896=>1000,23897=>1000,23898=>1000,23899=>1000,23900=>1000,23901=>1000,23902=>1000,23903=>1000,23904=>1000,23905=>1000,23906=>1000,23907=>1000,23908=>1000,
-	23909=>1000,23910=>1000,23911=>1000,23912=>1000,23913=>1000,23914=>1000,23915=>1000,23916=>1000,23917=>1000,23918=>1000,23919=>1000,23920=>1000,23921=>1000,23922=>1000,23923=>1000,23924=>1000,
-	23925=>1000,23926=>1000,23927=>1000,23928=>1000,23929=>1000,23930=>1000,23931=>1000,23932=>1000,23933=>1000,23934=>1000,23935=>1000,23936=>1000,23937=>1000,23938=>1000,23939=>1000,23940=>1000,
-	23941=>1000,23942=>1000,23943=>1000,23944=>1000,23945=>1000,23946=>1000,23947=>1000,23948=>1000,23949=>1000,23950=>1000,23951=>1000,23952=>1000,23953=>1000,23954=>1000,23955=>1000,23956=>1000,
-	23957=>1000,23958=>1000,23959=>1000,23960=>1000,23961=>1000,23962=>1000,23963=>1000,23964=>1000,23965=>1000,23966=>1000,23967=>1000,23968=>1000,23969=>1000,23970=>1000,23971=>1000,23972=>1000,
-	23973=>1000,23974=>1000,23975=>1000,23976=>1000,23977=>1000,23978=>1000,23979=>1000,23980=>1000,23981=>1000,23982=>1000,23983=>1000,23984=>1000,23985=>1000,23986=>1000,23987=>1000,23988=>1000,
-	23989=>1000,23990=>1000,23991=>1000,23992=>1000,23993=>1000,23994=>1000,23995=>1000,23996=>1000,23997=>1000,23998=>1000,23999=>1000,24000=>1000,24001=>1000,24002=>1000,24003=>1000,24004=>1000,
-	24005=>1000,24006=>1000,24007=>1000,24008=>1000,24009=>1000,24010=>1000,24011=>1000,24012=>1000,24013=>1000,24014=>1000,24015=>1000,24016=>1000,24017=>1000,24018=>1000,24019=>1000,24020=>1000,
-	24021=>1000,24022=>1000,24023=>1000,24024=>1000,24025=>1000,24026=>1000,24027=>1000,24028=>1000,24029=>1000,24030=>1000,24031=>1000,24032=>1000,24033=>1000,24034=>1000,24035=>1000,24036=>1000,
-	24037=>1000,24038=>1000,24039=>1000,24040=>1000,24041=>1000,24042=>1000,24043=>1000,24044=>1000,24045=>1000,24046=>1000,24047=>1000,24048=>1000,24049=>1000,24050=>1000,24051=>1000,24052=>1000,
-	24053=>1000,24054=>1000,24055=>1000,24056=>1000,24057=>1000,24058=>1000,24059=>1000,24060=>1000,24061=>1000,24062=>1000,24063=>1000,24064=>1000,24065=>1000,24066=>1000,24067=>1000,24068=>1000,
-	24069=>1000,24070=>1000,24071=>1000,24072=>1000,24073=>1000,24074=>1000,24075=>1000,24076=>1000,24077=>1000,24078=>1000,24079=>1000,24080=>1000,24081=>1000,24082=>1000,24083=>1000,24084=>1000,
-	24085=>1000,24086=>1000,24087=>1000,24088=>1000,24089=>1000,24090=>1000,24091=>1000,24092=>1000,24093=>1000,24094=>1000,24095=>1000,24096=>1000,24097=>1000,24098=>1000,24099=>1000,24100=>1000,
-	24101=>1000,24102=>1000,24103=>1000,24104=>1000,24105=>1000,24106=>1000,24107=>1000,24108=>1000,24109=>1000,24110=>1000,24111=>1000,24112=>1000,24113=>1000,24114=>1000,24115=>1000,24116=>1000,
-	24117=>1000,24118=>1000,24119=>1000,24120=>1000,24121=>1000,24122=>1000,24123=>1000,24124=>1000,24125=>1000,24126=>1000,24127=>1000,24128=>1000,24129=>1000,24130=>1000,24131=>1000,24132=>1000,
-	24133=>1000,24134=>1000,24135=>1000,24136=>1000,24137=>1000,24138=>1000,24139=>1000,24140=>1000,24141=>1000,24142=>1000,24143=>1000,24144=>1000,24145=>1000,24146=>1000,24147=>1000,24148=>1000,
-	24149=>1000,24150=>1000,24151=>1000,24152=>1000,24153=>1000,24154=>1000,24155=>1000,24156=>1000,24157=>1000,24158=>1000,24159=>1000,24160=>1000,24161=>1000,24162=>1000,24163=>1000,24164=>1000,
-	24165=>1000,24166=>1000,24167=>1000,24168=>1000,24169=>1000,24170=>1000,24171=>1000,24172=>1000,24173=>1000,24174=>1000,24175=>1000,24176=>1000,24177=>1000,24178=>1000,24179=>1000,24180=>1000,
-	24181=>1000,24182=>1000,24183=>1000,24184=>1000,24185=>1000,24186=>1000,24187=>1000,24188=>1000,24189=>1000,24190=>1000,24191=>1000,24192=>1000,24193=>1000,24194=>1000,24195=>1000,24196=>1000,
-	24197=>1000,24198=>1000,24199=>1000,24200=>1000,24201=>1000,24202=>1000,24203=>1000,24204=>1000,24205=>1000,24206=>1000,24207=>1000,24208=>1000,24209=>1000,24210=>1000,24211=>1000,24212=>1000,
-	24213=>1000,24214=>1000,24215=>1000,24216=>1000,24217=>1000,24218=>1000,24219=>1000,24220=>1000,24221=>1000,24222=>1000,24223=>1000,24224=>1000,24225=>1000,24226=>1000,24227=>1000,24228=>1000,
-	24229=>1000,24230=>1000,24231=>1000,24232=>1000,24233=>1000,24234=>1000,24235=>1000,24236=>1000,24237=>1000,24238=>1000,24239=>1000,24240=>1000,24241=>1000,24242=>1000,24243=>1000,24244=>1000,
-	24245=>1000,24246=>1000,24247=>1000,24248=>1000,24249=>1000,24250=>1000,24251=>1000,24252=>1000,24253=>1000,24254=>1000,24255=>1000,24256=>1000,24257=>1000,24258=>1000,24259=>1000,24260=>1000,
-	24261=>1000,24262=>1000,24263=>1000,24264=>1000,24265=>1000,24266=>1000,24267=>1000,24268=>1000,24269=>1000,24270=>1000,24271=>1000,24272=>1000,24273=>1000,24274=>1000,24275=>1000,24276=>1000,
-	24277=>1000,24278=>1000,24279=>1000,24280=>1000,24281=>1000,24282=>1000,24283=>1000,24284=>1000,24285=>1000,24286=>1000,24287=>1000,24288=>1000,24289=>1000,24290=>1000,24291=>1000,24292=>1000,
-	24293=>1000,24294=>1000,24295=>1000,24296=>1000,24297=>1000,24298=>1000,24299=>1000,24300=>1000,24301=>1000,24302=>1000,24303=>1000,24304=>1000,24305=>1000,24306=>1000,24307=>1000,24308=>1000,
-	24309=>1000,24310=>1000,24311=>1000,24312=>1000,24313=>1000,24314=>1000,24315=>1000,24316=>1000,24317=>1000,24318=>1000,24319=>1000,24320=>1000,24321=>1000,24322=>1000,24323=>1000,24324=>1000,
-	24325=>1000,24326=>1000,24327=>1000,24328=>1000,24329=>1000,24330=>1000,24331=>1000,24332=>1000,24333=>1000,24334=>1000,24335=>1000,24336=>1000,24337=>1000,24338=>1000,24339=>1000,24340=>1000,
-	24341=>1000,24342=>1000,24343=>1000,24344=>1000,24345=>1000,24346=>1000,24347=>1000,24348=>1000,24349=>1000,24350=>1000,24351=>1000,24352=>1000,24353=>1000,24354=>1000,24355=>1000,24356=>1000,
-	24357=>1000,24358=>1000,24359=>1000,24360=>1000,24361=>1000,24362=>1000,24363=>1000,24364=>1000,24365=>1000,24366=>1000,24367=>1000,24368=>1000,24369=>1000,24370=>1000,24371=>1000,24372=>1000,
-	24373=>1000,24374=>1000,24375=>1000,24376=>1000,24377=>1000,24378=>1000,24379=>1000,24380=>1000,24381=>1000,24382=>1000,24383=>1000,24384=>1000,24385=>1000,24386=>1000,24387=>1000,24388=>1000,
-	24389=>1000,24390=>1000,24391=>1000,24392=>1000,24393=>1000,24394=>1000,24395=>1000,24396=>1000,24397=>1000,24398=>1000,24399=>1000,24400=>1000,24401=>1000,24402=>1000,24403=>1000,24404=>1000,
-	24405=>1000,24406=>1000,24407=>1000,24408=>1000,24409=>1000,24410=>1000,24411=>1000,24412=>1000,24413=>1000,24414=>1000,24415=>1000,24416=>1000,24417=>1000,24418=>1000,24419=>1000,24420=>1000,
-	24421=>1000,24422=>1000,24423=>1000,24424=>1000,24425=>1000,24426=>1000,24427=>1000,24428=>1000,24429=>1000,24430=>1000,24431=>1000,24432=>1000,24433=>1000,24434=>1000,24435=>1000,24436=>1000,
-	24437=>1000,24438=>1000,24439=>1000,24440=>1000,24441=>1000,24442=>1000,24443=>1000,24444=>1000,24445=>1000,24446=>1000,24447=>1000,24448=>1000,24449=>1000,24450=>1000,24451=>1000,24452=>1000,
-	24453=>1000,24454=>1000,24455=>1000,24456=>1000,24457=>1000,24458=>1000,24459=>1000,24460=>1000,24461=>1000,24462=>1000,24463=>1000,24464=>1000,24465=>1000,24466=>1000,24467=>1000,24468=>1000,
-	24469=>1000,24470=>1000,24471=>1000,24472=>1000,24473=>1000,24474=>1000,24475=>1000,24476=>1000,24477=>1000,24478=>1000,24479=>1000,24480=>1000,24481=>1000,24482=>1000,24483=>1000,24484=>1000,
-	24485=>1000,24486=>1000,24487=>1000,24488=>1000,24489=>1000,24490=>1000,24491=>1000,24492=>1000,24493=>1000,24494=>1000,24495=>1000,24496=>1000,24497=>1000,24498=>1000,24499=>1000,24500=>1000,
-	24501=>1000,24502=>1000,24503=>1000,24504=>1000,24505=>1000,24506=>1000,24507=>1000,24508=>1000,24509=>1000,24510=>1000,24511=>1000,24512=>1000,24513=>1000,24514=>1000,24515=>1000,24516=>1000,
-	24517=>1000,24518=>1000,24519=>1000,24520=>1000,24521=>1000,24522=>1000,24523=>1000,24524=>1000,24525=>1000,24526=>1000,24527=>1000,24528=>1000,24529=>1000,24530=>1000,24531=>1000,24532=>1000,
-	24533=>1000,24534=>1000,24535=>1000,24536=>1000,24537=>1000,24538=>1000,24539=>1000,24540=>1000,24541=>1000,24542=>1000,24543=>1000,24544=>1000,24545=>1000,24546=>1000,24547=>1000,24548=>1000,
-	24549=>1000,24550=>1000,24551=>1000,24552=>1000,24553=>1000,24554=>1000,24555=>1000,24556=>1000,24557=>1000,24558=>1000,24559=>1000,24560=>1000,24561=>1000,24562=>1000,24563=>1000,24564=>1000,
-	24565=>1000,24566=>1000,24567=>1000,24568=>1000,24569=>1000,24570=>1000,24571=>1000,24572=>1000,24573=>1000,24574=>1000,24575=>1000,24576=>1000,24577=>1000,24578=>1000,24579=>1000,24580=>1000,
-	24581=>1000,24582=>1000,24583=>1000,24584=>1000,24585=>1000,24586=>1000,24587=>1000,24588=>1000,24589=>1000,24590=>1000,24591=>1000,24592=>1000,24593=>1000,24594=>1000,24595=>1000,24596=>1000,
-	24597=>1000,24598=>1000,24599=>1000,24600=>1000,24601=>1000,24602=>1000,24603=>1000,24604=>1000,24605=>1000,24606=>1000,24607=>1000,24608=>1000,24609=>1000,24610=>1000,24611=>1000,24612=>1000,
-	24613=>1000,24614=>1000,24615=>1000,24616=>1000,24617=>1000,24618=>1000,24619=>1000,24620=>1000,24621=>1000,24622=>1000,24623=>1000,24624=>1000,24625=>1000,24626=>1000,24627=>1000,24628=>1000,
-	24629=>1000,24630=>1000,24631=>1000,24632=>1000,24633=>1000,24634=>1000,24635=>1000,24636=>1000,24637=>1000,24638=>1000,24639=>1000,24640=>1000,24641=>1000,24642=>1000,24643=>1000,24644=>1000,
-	24645=>1000,24646=>1000,24647=>1000,24648=>1000,24649=>1000,24650=>1000,24651=>1000,24652=>1000,24653=>1000,24654=>1000,24655=>1000,24656=>1000,24657=>1000,24658=>1000,24659=>1000,24660=>1000,
-	24661=>1000,24662=>1000,24663=>1000,24664=>1000,24665=>1000,24666=>1000,24667=>1000,24668=>1000,24669=>1000,24670=>1000,24671=>1000,24672=>1000,24673=>1000,24674=>1000,24675=>1000,24676=>1000,
-	24677=>1000,24678=>1000,24679=>1000,24680=>1000,24681=>1000,24682=>1000,24683=>1000,24684=>1000,24685=>1000,24686=>1000,24687=>1000,24688=>1000,24689=>1000,24690=>1000,24691=>1000,24692=>1000,
-	24693=>1000,24694=>1000,24695=>1000,24696=>1000,24697=>1000,24698=>1000,24699=>1000,24700=>1000,24701=>1000,24702=>1000,24703=>1000,24704=>1000,24705=>1000,24706=>1000,24707=>1000,24708=>1000,
-	24709=>1000,24710=>1000,24711=>1000,24712=>1000,24713=>1000,24714=>1000,24715=>1000,24716=>1000,24717=>1000,24718=>1000,24719=>1000,24720=>1000,24721=>1000,24722=>1000,24723=>1000,24724=>1000,
-	24725=>1000,24726=>1000,24727=>1000,24728=>1000,24729=>1000,24730=>1000,24731=>1000,24732=>1000,24733=>1000,24734=>1000,24735=>1000,24736=>1000,24737=>1000,24738=>1000,24739=>1000,24740=>1000,
-	24741=>1000,24742=>1000,24743=>1000,24744=>1000,24745=>1000,24746=>1000,24747=>1000,24748=>1000,24749=>1000,24750=>1000,24751=>1000,24752=>1000,24753=>1000,24754=>1000,24755=>1000,24756=>1000,
-	24757=>1000,24758=>1000,24759=>1000,24760=>1000,24761=>1000,24762=>1000,24763=>1000,24764=>1000,24765=>1000,24766=>1000,24767=>1000,24768=>1000,24769=>1000,24770=>1000,24771=>1000,24772=>1000,
-	24773=>1000,24774=>1000,24775=>1000,24776=>1000,24777=>1000,24778=>1000,24779=>1000,24780=>1000,24781=>1000,24782=>1000,24783=>1000,24784=>1000,24785=>1000,24786=>1000,24787=>1000,24788=>1000,
-	24789=>1000,24790=>1000,24791=>1000,24792=>1000,24793=>1000,24794=>1000,24795=>1000,24796=>1000,24797=>1000,24798=>1000,24799=>1000,24800=>1000,24801=>1000,24802=>1000,24803=>1000,24804=>1000,
-	24805=>1000,24806=>1000,24807=>1000,24808=>1000,24809=>1000,24810=>1000,24811=>1000,24812=>1000,24813=>1000,24814=>1000,24815=>1000,24816=>1000,24817=>1000,24818=>1000,24819=>1000,24820=>1000,
-	24821=>1000,24822=>1000,24823=>1000,24824=>1000,24825=>1000,24826=>1000,24827=>1000,24828=>1000,24829=>1000,24830=>1000,24831=>1000,24832=>1000,24833=>1000,24834=>1000,24835=>1000,24836=>1000,
-	24837=>1000,24838=>1000,24839=>1000,24840=>1000,24841=>1000,24842=>1000,24843=>1000,24844=>1000,24845=>1000,24846=>1000,24847=>1000,24848=>1000,24849=>1000,24850=>1000,24851=>1000,24852=>1000,
-	24853=>1000,24854=>1000,24855=>1000,24856=>1000,24857=>1000,24858=>1000,24859=>1000,24860=>1000,24861=>1000,24862=>1000,24863=>1000,24864=>1000,24865=>1000,24866=>1000,24867=>1000,24868=>1000,
-	24869=>1000,24870=>1000,24871=>1000,24872=>1000,24873=>1000,24874=>1000,24875=>1000,24876=>1000,24877=>1000,24878=>1000,24879=>1000,24880=>1000,24881=>1000,24882=>1000,24883=>1000,24884=>1000,
-	24885=>1000,24886=>1000,24887=>1000,24888=>1000,24889=>1000,24890=>1000,24891=>1000,24892=>1000,24893=>1000,24894=>1000,24895=>1000,24896=>1000,24897=>1000,24898=>1000,24899=>1000,24900=>1000,
-	24901=>1000,24902=>1000,24903=>1000,24904=>1000,24905=>1000,24906=>1000,24907=>1000,24908=>1000,24909=>1000,24910=>1000,24911=>1000,24912=>1000,24913=>1000,24914=>1000,24915=>1000,24916=>1000,
-	24917=>1000,24918=>1000,24919=>1000,24920=>1000,24921=>1000,24922=>1000,24923=>1000,24924=>1000,24925=>1000,24926=>1000,24927=>1000,24928=>1000,24929=>1000,24930=>1000,24931=>1000,24932=>1000,
-	24933=>1000,24934=>1000,24935=>1000,24936=>1000,24937=>1000,24938=>1000,24939=>1000,24940=>1000,24941=>1000,24942=>1000,24943=>1000,24944=>1000,24945=>1000,24946=>1000,24947=>1000,24948=>1000,
-	24949=>1000,24950=>1000,24951=>1000,24952=>1000,24953=>1000,24954=>1000,24955=>1000,24956=>1000,24957=>1000,24958=>1000,24959=>1000,24960=>1000,24961=>1001,24962=>1000,24963=>1000,24964=>1000,
-	24965=>1000,24966=>1000,24967=>1000,24968=>1000,24969=>1000,24970=>1000,24971=>1000,24972=>1000,24973=>1000,24974=>1000,24975=>1000,24976=>1000,24977=>1000,24978=>1000,24979=>1000,24980=>1000,
-	24981=>1000,24982=>1000,24983=>1000,24984=>1000,24985=>1000,24986=>1000,24987=>1000,24988=>1000,24989=>1000,24990=>1000,24991=>1000,24992=>1000,24993=>1000,24994=>1000,24995=>1000,24996=>1000,
-	24997=>1000,24998=>1000,24999=>1000,25000=>1000,25001=>1000,25002=>1000,25003=>1000,25004=>1000,25005=>1000,25006=>1000,25007=>1000,25008=>1000,25009=>1000,25010=>1000,25011=>1000,25012=>1000,
-	25013=>1000,25014=>1000,25015=>1000,25016=>1000,25017=>1000,25018=>1000,25019=>1000,25020=>1000,25021=>1000,25022=>1000,25023=>1000,25024=>1000,25025=>1000,25026=>1000,25027=>1000,25028=>1000,
-	25029=>1000,25030=>1000,25031=>1000,25032=>1000,25033=>1000,25034=>1000,25035=>1000,25036=>1000,25037=>1000,25038=>1000,25039=>1000,25040=>1000,25041=>1000,25042=>1000,25043=>1000,25044=>1000,
-	25045=>1000,25046=>1000,25047=>1000,25048=>1000,25049=>1000,25050=>1000,25051=>1000,25052=>1000,25053=>1000,25054=>1000,25055=>1000,25056=>1000,25057=>1000,25058=>1000,25059=>1000,25060=>1000,
-	25061=>1000,25062=>1000,25063=>1000,25064=>1000,25065=>1000,25066=>1000,25067=>1000,25068=>1000,25069=>1000,25070=>1000,25071=>1000,25072=>1000,25073=>1000,25074=>1000,25075=>1000,25076=>1000,
-	25077=>1000,25078=>1000,25079=>1000,25080=>1000,25081=>1000,25082=>1000,25083=>1000,25084=>1000,25085=>1000,25086=>1000,25087=>1000,25088=>1000,25089=>1000,25090=>1000,25091=>1000,25092=>1000,
-	25093=>1000,25094=>1000,25095=>1000,25096=>1000,25097=>1000,25098=>1000,25099=>1000,25100=>1000,25101=>1000,25102=>1000,25103=>1000,25104=>1000,25105=>1000,25106=>1000,25107=>1000,25108=>1000,
-	25109=>1000,25110=>1000,25111=>1000,25112=>1000,25113=>1000,25114=>1000,25115=>1000,25116=>1000,25117=>1000,25118=>1000,25119=>1000,25120=>1000,25121=>1000,25122=>1000,25123=>1000,25124=>1000,
-	25125=>1000,25126=>1000,25127=>1000,25128=>1000,25129=>1000,25130=>1000,25131=>1000,25132=>1000,25133=>1000,25134=>1000,25135=>1000,25136=>1000,25137=>1000,25138=>1000,25139=>1000,25140=>1000,
-	25141=>1000,25142=>1000,25143=>1000,25144=>1000,25145=>1000,25146=>1000,25147=>1000,25148=>1000,25149=>1000,25150=>1000,25151=>1000,25152=>1000,25153=>1000,25154=>1000,25155=>1000,25156=>1000,
-	25157=>1000,25158=>1000,25159=>1000,25160=>1000,25161=>1000,25162=>1000,25163=>1000,25164=>1000,25165=>1000,25166=>1000,25167=>1000,25168=>1000,25169=>1000,25170=>1000,25171=>1000,25172=>1000,
-	25173=>1000,25174=>1000,25175=>1000,25176=>1000,25177=>1000,25178=>1000,25179=>1000,25180=>1000,25181=>1000,25182=>1000,25183=>1000,25184=>1000,25185=>1000,25186=>1000,25187=>1000,25188=>1000,
-	25189=>1000,25190=>1000,25191=>1000,25192=>1000,25193=>1000,25194=>1000,25195=>1000,25196=>1000,25197=>1000,25198=>1000,25199=>1000,25200=>1000,25201=>1000,25202=>1000,25203=>1000,25204=>1000,
-	25205=>1000,25206=>1000,25207=>1000,25208=>1000,25209=>1000,25210=>1000,25211=>1000,25212=>1000,25213=>1000,25214=>1000,25215=>1000,25216=>1000,25217=>1000,25218=>1000,25219=>1000,25220=>1000,
-	25221=>1000,25222=>1000,25223=>1000,25224=>1000,25225=>1000,25226=>1000,25227=>1000,25228=>1000,25229=>1000,25230=>1000,25231=>1000,25232=>1000,25233=>1000,25234=>1000,25235=>1000,25236=>1000,
-	25237=>1000,25238=>1000,25239=>1000,25240=>1000,25241=>1000,25242=>1000,25243=>1000,25244=>1000,25245=>1000,25246=>1000,25247=>1000,25248=>1000,25249=>1000,25250=>1000,25251=>1000,25252=>1000,
-	25253=>1000,25254=>1000,25255=>1000,25256=>1000,25257=>1000,25258=>1000,25259=>1000,25260=>1000,25261=>1000,25262=>1000,25263=>1000,25264=>1000,25265=>1000,25266=>1000,25267=>1000,25268=>1000,
-	25269=>1000,25270=>1000,25271=>1000,25272=>1000,25273=>1000,25274=>1000,25275=>1000,25276=>1000,25277=>1000,25278=>1000,25279=>1000,25280=>1000,25281=>1000,25282=>1000,25283=>1000,25284=>1000,
-	25285=>1000,25286=>1000,25287=>1000,25288=>1000,25289=>1000,25290=>1000,25291=>1000,25292=>1000,25293=>1000,25294=>1000,25295=>1000,25296=>1000,25297=>1000,25298=>1000,25299=>1000,25300=>1000,
-	25301=>1000,25302=>1000,25303=>1000,25304=>1000,25305=>1000,25306=>1000,25307=>1000,25308=>1000,25309=>1000,25310=>1000,25311=>1000,25312=>1000,25313=>1000,25314=>1000,25315=>1000,25316=>1000,
-	25317=>1000,25318=>1000,25319=>1000,25320=>1000,25321=>1000,25322=>1000,25323=>1000,25324=>1000,25325=>1000,25326=>1000,25327=>1000,25328=>1000,25329=>1000,25330=>1000,25331=>1000,25332=>1000,
-	25333=>1000,25334=>1000,25335=>1000,25336=>1000,25337=>1000,25338=>1000,25339=>1000,25340=>1000,25341=>1000,25342=>1000,25343=>1000,25344=>1000,25345=>1000,25346=>1000,25347=>1000,25348=>1000,
-	25349=>1000,25350=>1000,25351=>1000,25352=>1000,25353=>1000,25354=>1000,25355=>1000,25356=>1000,25357=>1000,25358=>1000,25359=>1000,25360=>1000,25361=>1000,25362=>1000,25363=>1000,25364=>1000,
-	25365=>1000,25366=>1000,25367=>1000,25368=>1000,25369=>1000,25370=>1000,25371=>1000,25372=>1000,25373=>1000,25374=>1000,25375=>1000,25376=>1000,25377=>1000,25378=>1000,25379=>1000,25380=>1000,
-	25381=>1000,25382=>1000,25383=>1000,25384=>1000,25385=>1000,25386=>1000,25387=>1000,25388=>1000,25389=>1000,25390=>1000,25391=>1000,25392=>1000,25393=>1000,25394=>1000,25395=>1000,25396=>1000,
-	25397=>1000,25398=>1000,25399=>1000,25400=>1000,25401=>1000,25402=>1000,25403=>1000,25404=>1000,25405=>1000,25406=>1000,25407=>1000,25408=>1000,25409=>1000,25410=>1000,25411=>1000,25412=>1000,
-	25413=>1000,25414=>1000,25415=>1000,25416=>1000,25417=>1000,25418=>1000,25419=>1000,25420=>1000,25421=>1000,25422=>1000,25423=>1000,25424=>1000,25425=>1000,25426=>1000,25427=>1000,25428=>1000,
-	25429=>1000,25430=>1000,25431=>1000,25432=>1000,25433=>1000,25434=>1000,25435=>1000,25436=>1000,25437=>1000,25438=>1000,25439=>1000,25440=>1000,25441=>1000,25442=>1000,25443=>1000,25444=>1000,
-	25445=>1000,25446=>1000,25447=>1000,25448=>1000,25449=>1000,25450=>1000,25451=>1000,25452=>1000,25453=>1000,25454=>1000,25455=>1000,25456=>1000,25457=>1000,25458=>1000,25459=>1000,25460=>1000,
-	25461=>1000,25462=>1000,25463=>1000,25464=>1000,25465=>1000,25466=>1000,25467=>1000,25468=>1000,25469=>1000,25470=>1000,25471=>1000,25472=>1000,25473=>1000,25474=>1000,25475=>1000,25476=>1000,
-	25477=>1000,25478=>1000,25479=>1000,25480=>1000,25481=>1000,25482=>1000,25483=>1000,25484=>1000,25485=>1000,25486=>1000,25487=>1000,25488=>1000,25489=>1000,25490=>1000,25491=>1000,25492=>1000,
-	25493=>1000,25494=>1000,25495=>1000,25496=>1000,25497=>1000,25498=>1000,25499=>1000,25500=>1000,25501=>1000,25502=>1000,25503=>1000,25504=>1000,25505=>1000,25506=>1000,25507=>1000,25508=>1000,
-	25509=>1000,25510=>1000,25511=>1000,25512=>1000,25513=>1000,25514=>1000,25515=>1000,25516=>1000,25517=>1000,25518=>1000,25519=>1000,25520=>1000,25521=>1000,25522=>1000,25523=>1000,25524=>1000,
-	25525=>1000,25526=>1000,25527=>1000,25528=>1000,25529=>1000,25530=>1000,25531=>1000,25532=>1000,25533=>1000,25534=>1000,25535=>1000,25536=>1000,25537=>1000,25538=>1000,25539=>1000,25540=>1000,
-	25541=>1000,25542=>1000,25543=>1000,25544=>1000,25545=>1000,25546=>1000,25547=>1000,25548=>1000,25549=>1000,25550=>1000,25551=>1000,25552=>1000,25553=>1000,25554=>1000,25555=>1000,25556=>1000,
-	25557=>1000,25558=>1000,25559=>1000,25560=>1000,25561=>1000,25562=>1000,25563=>1000,25564=>1000,25565=>1000,25566=>1000,25567=>1000,25568=>1000,25569=>1000,25570=>1000,25571=>1000,25572=>1000,
-	25573=>1000,25574=>1000,25575=>1000,25576=>1000,25577=>1000,25578=>1000,25579=>1000,25580=>1000,25581=>1000,25582=>1000,25583=>1000,25584=>1000,25585=>1000,25586=>1000,25587=>1000,25588=>1000,
-	25589=>1000,25590=>1000,25591=>1000,25592=>1000,25593=>1000,25594=>1000,25595=>1000,25596=>1000,25597=>1000,25598=>1000,25599=>1000,25600=>1000,25601=>1000,25602=>1000,25603=>1000,25604=>1000,
-	25605=>1000,25606=>1000,25607=>1000,25608=>1000,25609=>1000,25610=>1000,25611=>1000,25612=>1000,25613=>1000,25614=>1000,25615=>1000,25616=>1000,25617=>1000,25618=>1000,25619=>1000,25620=>1000,
-	25621=>1000,25622=>1000,25623=>1000,25624=>1000,25625=>1000,25626=>1000,25627=>1000,25628=>1000,25629=>1000,25630=>1000,25631=>1000,25632=>1000,25633=>1000,25634=>1000,25635=>1000,25636=>1000,
-	25637=>1000,25638=>1000,25639=>1000,25640=>1000,25641=>1000,25642=>1000,25643=>1000,25644=>1000,25645=>1000,25646=>1000,25647=>1000,25648=>1000,25649=>1000,25650=>1000,25651=>1000,25652=>1000,
-	25653=>1000,25654=>1000,25655=>1000,25656=>1000,25657=>1000,25658=>1000,25659=>1000,25660=>1000,25661=>1000,25662=>1000,25663=>1000,25664=>1000,25665=>1000,25666=>1000,25667=>1000,25668=>1000,
-	25669=>1000,25670=>1000,25671=>1000,25672=>1000,25673=>1000,25674=>1000,25675=>1000,25676=>1000,25677=>1000,25678=>1000,25679=>1000,25680=>1000,25681=>1000,25682=>1000,25683=>1000,25684=>1000,
-	25685=>1000,25686=>1000,25687=>1000,25688=>1000,25689=>1000,25690=>1000,25691=>1000,25692=>1000,25693=>1000,25694=>1000,25695=>1000,25696=>1000,25697=>1000,25698=>1000,25699=>1000,25700=>1000,
-	25701=>1000,25702=>1000,25703=>1000,25704=>1000,25705=>1000,25706=>1000,25707=>1000,25708=>1000,25709=>1000,25710=>1000,25711=>1000,25712=>1000,25713=>1000,25714=>1000,25715=>1000,25716=>1000,
-	25717=>1000,25718=>1000,25719=>1000,25720=>1000,25721=>1000,25722=>1000,25723=>1000,25724=>1000,25725=>1000,25726=>1000,25727=>1000,25728=>1000,25729=>1000,25730=>1000,25731=>1000,25732=>1000,
-	25733=>1000,25734=>1000,25735=>1000,25736=>1000,25737=>1000,25738=>1000,25739=>1000,25740=>1000,25741=>1000,25742=>1000,25743=>1000,25744=>1000,25745=>1000,25746=>1000,25747=>1000,25748=>1000,
-	25749=>1000,25750=>1000,25751=>1000,25752=>1000,25753=>1000,25754=>1000,25755=>1000,25756=>1000,25757=>1000,25758=>1000,25759=>1000,25760=>1000,25761=>1000,25762=>1000,25763=>1000,25764=>1000,
-	25765=>1000,25766=>1000,25767=>1000,25768=>1000,25769=>1000,25770=>1000,25771=>1000,25772=>1000,25773=>1000,25774=>1000,25775=>1000,25776=>1000,25777=>1000,25778=>1000,25779=>1000,25780=>1000,
-	25781=>1000,25782=>1000,25783=>1000,25784=>1000,25785=>1000,25786=>1000,25787=>1000,25788=>1000,25789=>1000,25790=>1000,25791=>1000,25792=>1000,25793=>1000,25794=>1000,25795=>1000,25796=>1000,
-	25797=>1000,25798=>1000,25799=>1000,25800=>1000,25801=>1000,25802=>1000,25803=>1000,25804=>1000,25805=>1000,25806=>1000,25807=>1000,25808=>1000,25809=>1000,25810=>1000,25811=>1000,25812=>1000,
-	25813=>1000,25814=>1000,25815=>1000,25816=>1000,25817=>1000,25818=>1000,25819=>1000,25820=>1000,25821=>1000,25822=>1000,25823=>1000,25824=>1000,25825=>1000,25826=>1000,25827=>1000,25828=>1000,
-	25829=>1000,25830=>1000,25831=>1000,25832=>1000,25833=>1000,25834=>1000,25835=>1000,25836=>1000,25837=>1000,25838=>1000,25839=>1000,25840=>1000,25841=>1000,25842=>1000,25843=>1000,25844=>1000,
-	25845=>1000,25846=>1000,25847=>1000,25848=>1000,25849=>1000,25850=>1000,25851=>1000,25852=>1000,25853=>1000,25854=>1000,25855=>1000,25856=>1000,25857=>1000,25858=>1000,25859=>1000,25860=>1000,
-	25861=>1000,25862=>1000,25863=>1000,25864=>1000,25865=>1000,25866=>1000,25867=>1000,25868=>1000,25869=>1000,25870=>1000,25871=>1000,25872=>1000,25873=>1000,25874=>1000,25875=>1000,25876=>1000,
-	25877=>1000,25878=>1000,25879=>1000,25880=>1000,25881=>1000,25882=>1000,25883=>1000,25884=>1000,25885=>1000,25886=>1000,25887=>1000,25888=>1000,25889=>1000,25890=>1000,25891=>1000,25892=>1000,
-	25893=>1000,25894=>1000,25895=>1000,25896=>1000,25897=>1000,25898=>1000,25899=>1000,25900=>1000,25901=>1000,25902=>1000,25903=>1000,25904=>1000,25905=>1000,25906=>1000,25907=>1000,25908=>1000,
-	25909=>1000,25910=>1000,25911=>1000,25912=>1000,25913=>1000,25914=>1000,25915=>1000,25916=>1000,25917=>1000,25918=>1000,25919=>1000,25920=>1000,25921=>1000,25922=>1000,25923=>1000,25924=>1000,
-	25925=>1000,25926=>1000,25927=>1000,25928=>1000,25929=>1000,25930=>1000,25931=>1000,25932=>1000,25933=>1000,25934=>1000,25935=>1000,25936=>1000,25937=>1000,25938=>1000,25939=>1000,25940=>1000,
-	25941=>1000,25942=>1000,25943=>1000,25944=>1000,25945=>1000,25946=>1000,25947=>1000,25948=>1000,25949=>1000,25950=>1000,25951=>1000,25952=>1000,25953=>1000,25954=>1000,25955=>1000,25956=>1000,
-	25957=>1000,25958=>1000,25959=>1000,25960=>1000,25961=>1000,25962=>1000,25963=>1000,25964=>1000,25965=>1000,25966=>1000,25967=>1000,25968=>1000,25969=>1000,25970=>1000,25971=>1000,25972=>1000,
-	25973=>1000,25974=>1000,25975=>1000,25976=>1000,25977=>1000,25978=>1000,25979=>1000,25980=>1000,25981=>1000,25982=>1000,25983=>1000,25984=>1000,25985=>1000,25986=>1000,25987=>1000,25988=>1000,
-	25989=>1000,25990=>1000,25991=>1000,25992=>1000,25993=>1000,25994=>1000,25995=>1000,25996=>1000,25997=>1000,25998=>1000,25999=>1000,26000=>1000,26001=>1000,26002=>1000,26003=>1000,26004=>1000,
-	26005=>1000,26006=>1000,26007=>1000,26008=>1000,26009=>1000,26010=>1000,26011=>1000,26012=>1000,26013=>1000,26014=>1000,26015=>1000,26016=>1000,26017=>1000,26018=>1000,26019=>1000,26020=>1000,
-	26021=>1000,26022=>1000,26023=>1000,26024=>1000,26025=>1000,26026=>1000,26027=>1000,26028=>1000,26029=>1000,26030=>1000,26031=>1000,26032=>1000,26033=>1000,26034=>1000,26035=>1000,26036=>1000,
-	26037=>1000,26038=>1000,26039=>1000,26040=>1000,26041=>1000,26042=>1000,26043=>1000,26044=>1000,26045=>1000,26046=>1000,26047=>1000,26048=>1000,26049=>1000,26050=>1000,26051=>1000,26052=>1000,
-	26053=>1000,26054=>1000,26055=>1000,26056=>1000,26057=>1000,26058=>1000,26059=>1000,26060=>1000,26061=>1000,26062=>1000,26063=>1000,26064=>1000,26065=>1000,26066=>1000,26067=>1000,26068=>1000,
-	26069=>1000,26070=>1000,26071=>1000,26072=>1000,26073=>1000,26074=>1000,26075=>1000,26076=>1000,26077=>1000,26078=>1000,26079=>1000,26080=>1000,26081=>1000,26082=>1000,26083=>1000,26084=>1000,
-	26085=>1000,26086=>1000,26087=>1000,26088=>1000,26089=>1000,26090=>1000,26091=>1000,26092=>1000,26093=>1000,26094=>1000,26095=>1000,26096=>1000,26097=>1000,26098=>1000,26099=>1000,26100=>1000,
-	26101=>1000,26102=>1000,26103=>1000,26104=>1000,26105=>1000,26106=>1000,26107=>1000,26108=>1000,26109=>1000,26110=>1000,26111=>1000,26112=>1000,26113=>1000,26114=>1000,26115=>1000,26116=>1000,
-	26117=>1000,26118=>1000,26119=>1000,26120=>1000,26121=>1000,26122=>1000,26123=>1000,26124=>1000,26125=>1000,26126=>1000,26127=>1000,26128=>1000,26129=>1000,26130=>1000,26131=>1000,26132=>1000,
-	26133=>1000,26134=>1000,26135=>1000,26136=>1000,26137=>1000,26138=>1000,26139=>1000,26140=>1000,26141=>1000,26142=>1000,26143=>1000,26144=>1000,26145=>1000,26146=>1000,26147=>1000,26148=>1000,
-	26149=>1000,26150=>1000,26151=>1000,26152=>1000,26153=>1000,26154=>1000,26155=>1000,26156=>1000,26157=>1000,26158=>1000,26159=>1000,26160=>1000,26161=>1000,26162=>1000,26163=>1000,26164=>1000,
-	26165=>1000,26166=>1000,26167=>1000,26168=>1000,26169=>1000,26170=>1000,26171=>1000,26172=>1000,26173=>1000,26174=>1000,26175=>1000,26176=>1000,26177=>1000,26178=>1000,26179=>1000,26180=>1000,
-	26181=>1000,26182=>1000,26183=>1000,26184=>1000,26185=>1000,26186=>1000,26187=>1000,26188=>1000,26189=>1000,26190=>1000,26191=>1000,26192=>1000,26193=>1000,26194=>1000,26195=>1000,26196=>1000,
-	26197=>1000,26198=>1000,26199=>1000,26200=>1000,26201=>1000,26202=>1000,26203=>1000,26204=>1000,26205=>1000,26206=>1000,26207=>1000,26208=>1000,26209=>1000,26210=>1000,26211=>1000,26212=>1000,
-	26213=>1000,26214=>1000,26215=>1000,26216=>1000,26217=>1000,26218=>1000,26219=>1000,26220=>1000,26221=>1000,26222=>1000,26223=>1000,26224=>1000,26225=>1000,26226=>1000,26227=>1000,26228=>1000,
-	26229=>1000,26230=>1000,26231=>1000,26232=>1000,26233=>1000,26234=>1000,26235=>1000,26236=>1000,26237=>1000,26238=>1000,26239=>1000,26240=>1000,26241=>1000,26242=>1000,26243=>1000,26244=>1000,
-	26245=>1000,26246=>1000,26247=>1000,26248=>1000,26249=>1000,26250=>1000,26251=>1000,26252=>1000,26253=>1000,26254=>1000,26255=>1000,26256=>1000,26257=>1000,26258=>1000,26259=>1000,26260=>1000,
-	26261=>1000,26262=>1000,26263=>1000,26264=>1000,26265=>1000,26266=>1000,26267=>1000,26268=>1000,26269=>1000,26270=>1000,26271=>1000,26272=>1000,26273=>1000,26274=>1000,26275=>1000,26276=>1000,
-	26277=>1000,26278=>1000,26279=>1000,26280=>1000,26281=>1000,26282=>1000,26283=>1000,26284=>1000,26285=>1000,26286=>1000,26287=>1000,26288=>1000,26289=>1000,26290=>1000,26291=>1000,26292=>1000,
-	26293=>1000,26294=>1000,26295=>1000,26296=>1000,26297=>1000,26298=>1000,26299=>1000,26300=>1000,26301=>1000,26302=>1000,26303=>1000,26304=>1000,26305=>1000,26306=>1000,26307=>1000,26308=>1000,
-	26309=>1000,26310=>1000,26311=>1000,26312=>1000,26313=>1000,26314=>1000,26315=>1000,26316=>1000,26317=>1000,26318=>1000,26319=>1000,26320=>1000,26321=>1000,26322=>1000,26323=>1000,26324=>1000,
-	26325=>1000,26326=>1000,26327=>1000,26328=>1000,26329=>1000,26330=>1000,26331=>1000,26332=>1000,26333=>1000,26334=>1000,26335=>1000,26336=>1000,26337=>1000,26338=>1000,26339=>1000,26340=>1000,
-	26341=>1000,26342=>1000,26343=>1000,26344=>1000,26345=>1000,26346=>1000,26347=>1000,26348=>1000,26349=>1000,26350=>1000,26351=>1000,26352=>1000,26353=>1000,26354=>1000,26355=>1000,26356=>1000,
-	26357=>1000,26358=>1000,26359=>1000,26360=>1000,26361=>1000,26362=>1000,26363=>1000,26364=>1000,26365=>1000,26366=>1000,26367=>1000,26368=>1000,26369=>1000,26370=>1000,26371=>1000,26372=>1000,
-	26373=>1000,26374=>1000,26375=>1000,26376=>1000,26377=>1000,26378=>1000,26379=>1000,26380=>1000,26381=>1000,26382=>1000,26383=>1000,26384=>1000,26385=>1000,26386=>1000,26387=>1000,26388=>1000,
-	26389=>1000,26390=>1000,26391=>1000,26392=>1000,26393=>1000,26394=>1000,26395=>1000,26396=>1000,26397=>1000,26398=>1000,26399=>1000,26400=>1000,26401=>1000,26402=>1000,26403=>1000,26404=>1000,
-	26405=>1000,26406=>1000,26407=>1000,26408=>1000,26409=>1000,26410=>1000,26411=>1000,26412=>1000,26413=>1000,26414=>1000,26415=>1000,26416=>1000,26417=>1000,26418=>1000,26419=>1000,26420=>1000,
-	26421=>1000,26422=>1000,26423=>1000,26424=>1000,26425=>1000,26426=>1000,26427=>1000,26428=>1000,26429=>1000,26430=>1000,26431=>1000,26432=>1000,26433=>1000,26434=>1000,26435=>1000,26436=>1000,
-	26437=>1000,26438=>1000,26439=>1000,26440=>1000,26441=>1000,26442=>1000,26443=>1000,26444=>1000,26445=>1000,26446=>1000,26447=>1000,26448=>1000,26449=>1000,26450=>1000,26451=>1000,26452=>1000,
-	26453=>1000,26454=>1000,26455=>1000,26456=>1000,26457=>1000,26458=>1000,26459=>1000,26460=>1000,26461=>1000,26462=>1000,26463=>1000,26464=>1000,26465=>1000,26466=>1000,26467=>1000,26468=>1000,
-	26469=>1000,26470=>1000,26471=>1000,26472=>1000,26473=>1000,26474=>1000,26475=>1000,26476=>1000,26477=>1000,26478=>1000,26479=>1000,26480=>1000,26481=>1000,26482=>1000,26483=>1000,26484=>1000,
-	26485=>1000,26486=>1000,26487=>1000,26488=>1000,26489=>1000,26490=>1000,26491=>1000,26492=>1000,26493=>1000,26494=>1000,26495=>1000,26496=>1000,26497=>1000,26498=>1000,26499=>1000,26500=>1000,
-	26501=>1000,26502=>1000,26503=>1000,26504=>1000,26505=>1000,26506=>1000,26507=>1000,26508=>1000,26509=>1000,26510=>1000,26511=>1000,26512=>1000,26513=>1000,26514=>1000,26515=>1000,26516=>1000,
-	26517=>1000,26518=>1000,26519=>1000,26520=>1000,26521=>1000,26522=>1000,26523=>1000,26524=>1000,26525=>1000,26526=>1000,26527=>1000,26528=>1000,26529=>1000,26530=>1000,26531=>1000,26532=>1000,
-	26533=>1000,26534=>1000,26535=>1000,26536=>1000,26537=>1000,26538=>1000,26539=>1000,26540=>1000,26541=>1000,26542=>1000,26543=>1000,26544=>1000,26545=>1000,26546=>1000,26547=>1000,26548=>1000,
-	26549=>1000,26550=>1000,26551=>1000,26552=>1000,26553=>1000,26554=>1000,26555=>1000,26556=>1000,26557=>1000,26558=>1000,26559=>1000,26560=>1000,26561=>1000,26562=>1000,26563=>1000,26564=>1000,
-	26565=>1000,26566=>1000,26567=>1000,26568=>1000,26569=>1000,26570=>1000,26571=>1000,26572=>1000,26573=>1000,26574=>1000,26575=>1000,26576=>1000,26577=>1000,26578=>1000,26579=>1000,26580=>1000,
-	26581=>1000,26582=>1000,26583=>1000,26584=>1000,26585=>1000,26586=>1000,26587=>1000,26588=>1000,26589=>1000,26590=>1000,26591=>1000,26592=>1000,26593=>1000,26594=>1000,26595=>1000,26596=>1000,
-	26597=>1000,26598=>1000,26599=>1000,26600=>1000,26601=>1000,26602=>1000,26603=>1000,26604=>1000,26605=>1000,26606=>1000,26607=>1000,26608=>1000,26609=>1000,26610=>1000,26611=>1000,26612=>1000,
-	26613=>1000,26614=>1000,26615=>1000,26616=>1000,26617=>1000,26618=>1000,26619=>1000,26620=>1000,26621=>1000,26622=>1000,26623=>1000,26624=>1000,26625=>1000,26626=>1000,26627=>1000,26628=>1000,
-	26629=>1000,26630=>1000,26631=>1000,26632=>1000,26633=>1000,26634=>1000,26635=>1000,26636=>1000,26637=>1000,26638=>1000,26639=>1000,26640=>1000,26641=>1000,26642=>1000,26643=>1000,26644=>1000,
-	26645=>1000,26646=>1000,26647=>1000,26648=>1000,26649=>1000,26650=>1000,26651=>1000,26652=>1000,26653=>1000,26654=>1000,26655=>1000,26656=>1000,26657=>1000,26658=>1000,26659=>1000,26660=>1000,
-	26661=>1000,26662=>1000,26663=>1000,26664=>1000,26665=>1000,26666=>1000,26667=>1000,26668=>1000,26669=>1000,26670=>1000,26671=>1000,26672=>1000,26673=>1000,26674=>1000,26675=>1000,26676=>1000,
-	26677=>1000,26678=>1000,26679=>1000,26680=>1000,26681=>1000,26682=>1000,26683=>1000,26684=>1000,26685=>1000,26686=>1000,26687=>1000,26688=>1000,26689=>1000,26690=>1000,26691=>1000,26692=>1000,
-	26693=>1000,26694=>1000,26695=>1000,26696=>1000,26697=>1000,26698=>1000,26699=>1000,26700=>1000,26701=>1000,26702=>1000,26703=>1000,26704=>1000,26705=>1000,26706=>1000,26707=>1000,26708=>1000,
-	26709=>1000,26710=>1000,26711=>1000,26712=>1000,26713=>1000,26714=>1000,26715=>1000,26716=>1000,26717=>1000,26718=>1000,26719=>1000,26720=>1000,26721=>1000,26722=>1000,26723=>1000,26724=>1000,
-	26725=>1000,26726=>1000,26727=>1000,26728=>1000,26729=>1000,26730=>1000,26731=>1000,26732=>1000,26733=>1000,26734=>1000,26735=>1000,26736=>1000,26737=>1000,26738=>1000,26739=>1000,26740=>1000,
-	26741=>1000,26742=>1000,26743=>1000,26744=>1000,26745=>1000,26746=>1000,26747=>1000,26748=>1000,26749=>1000,26750=>1000,26751=>1000,26752=>1000,26753=>1000,26754=>1000,26755=>1000,26756=>1000,
-	26757=>1000,26758=>1000,26759=>1000,26760=>1000,26761=>1000,26762=>1000,26763=>1000,26764=>1000,26765=>1000,26766=>1000,26767=>1000,26768=>1000,26769=>1000,26770=>1000,26771=>1000,26772=>1000,
-	26773=>1000,26774=>1000,26775=>1000,26776=>1000,26777=>1000,26778=>1000,26779=>1000,26780=>1000,26781=>1000,26782=>1000,26783=>1000,26784=>1000,26785=>1000,26786=>1000,26787=>1000,26788=>1000,
-	26789=>1000,26790=>1000,26791=>1000,26792=>1000,26793=>1000,26794=>1000,26795=>1000,26796=>1000,26797=>1000,26798=>1000,26799=>1000,26800=>1000,26801=>1000,26802=>1000,26803=>1000,26804=>1000,
-	26805=>1000,26806=>1000,26807=>1000,26808=>1000,26809=>1000,26810=>1000,26811=>1000,26812=>1000,26813=>1000,26814=>1000,26815=>1000,26816=>1000,26817=>1000,26818=>1000,26819=>1000,26820=>1000,
-	26821=>1000,26822=>1000,26823=>1000,26824=>1000,26825=>1000,26826=>1000,26827=>1000,26828=>1000,26829=>1000,26830=>1000,26831=>1000,26832=>1000,26833=>1000,26834=>1000,26835=>1000,26836=>1000,
-	26837=>1000,26838=>1000,26839=>1000,26840=>1000,26841=>1000,26842=>1000,26843=>1000,26844=>1000,26845=>1000,26846=>1000,26847=>1000,26848=>1000,26849=>1000,26850=>1000,26851=>1000,26852=>1000,
-	26853=>1000,26854=>1000,26855=>1000,26856=>1000,26857=>1000,26858=>1000,26859=>1000,26860=>1000,26861=>1000,26862=>1000,26863=>1000,26864=>1000,26865=>1000,26866=>1000,26867=>1000,26868=>1000,
-	26869=>1000,26870=>1000,26871=>1000,26872=>1000,26873=>1000,26874=>1000,26875=>1000,26876=>1000,26877=>1000,26878=>1000,26879=>1000,26880=>1000,26881=>1000,26882=>1000,26883=>1000,26884=>1000,
-	26885=>1000,26886=>1000,26887=>1000,26888=>1000,26889=>1000,26890=>1000,26891=>1000,26892=>1000,26893=>1000,26894=>1000,26895=>1000,26896=>1000,26897=>1000,26898=>1000,26899=>1000,26900=>1000,
-	26901=>1000,26902=>1000,26903=>1000,26904=>1000,26905=>1000,26906=>1000,26907=>1000,26908=>1000,26909=>1000,26910=>1000,26911=>1000,26912=>1000,26913=>1000,26914=>1000,26915=>1000,26916=>1000,
-	26917=>1000,26918=>1000,26919=>1000,26920=>1000,26921=>1000,26922=>1000,26923=>1000,26924=>1000,26925=>1000,26926=>1000,26927=>1000,26928=>1000,26929=>1000,26930=>1000,26931=>1000,26932=>1000,
-	26933=>1000,26934=>1000,26935=>1000,26936=>1000,26937=>1000,26938=>1000,26939=>1000,26940=>1000,26941=>1000,26942=>1000,26943=>1000,26944=>1000,26945=>1000,26946=>1000,26947=>1000,26948=>1000,
-	26949=>1000,26950=>1000,26951=>1000,26952=>1000,26953=>1000,26954=>1000,26955=>1000,26956=>1000,26957=>1000,26958=>1000,26959=>1000,26960=>1000,26961=>1000,26962=>1000,26963=>1000,26964=>1000,
-	26965=>1000,26966=>1000,26967=>1000,26968=>1000,26969=>1000,26970=>1000,26971=>1000,26972=>1000,26973=>1000,26974=>1000,26975=>1000,26976=>1000,26977=>1000,26978=>1000,26979=>1000,26980=>1000,
-	26981=>1000,26982=>1000,26983=>1000,26984=>1000,26985=>1000,26986=>1000,26987=>1000,26988=>1000,26989=>1000,26990=>1000,26991=>1000,26992=>1000,26993=>1000,26994=>1000,26995=>1000,26996=>1000,
-	26997=>1000,26998=>1000,26999=>1000,27000=>1000,27001=>1000,27002=>1000,27003=>1000,27004=>1000,27005=>1000,27006=>1000,27007=>1000,27008=>1000,27009=>1000,27010=>1000,27011=>1000,27012=>1000,
-	27013=>1000,27014=>1000,27015=>1000,27016=>1000,27017=>1000,27018=>1000,27019=>1000,27020=>1000,27021=>1000,27022=>1000,27023=>1000,27024=>1000,27025=>1000,27026=>1000,27027=>1000,27028=>1000,
-	27029=>1000,27030=>1000,27031=>1000,27032=>1000,27033=>1000,27034=>1000,27035=>1000,27036=>1000,27037=>1000,27038=>1000,27039=>1000,27040=>1000,27041=>1000,27042=>1000,27043=>1000,27044=>1000,
-	27045=>1000,27046=>1000,27047=>1000,27048=>1000,27049=>1000,27050=>1000,27051=>1000,27052=>1000,27053=>1000,27054=>1000,27055=>1000,27056=>1000,27057=>1000,27058=>1000,27059=>1000,27060=>1000,
-	27061=>1000,27062=>1000,27063=>1000,27064=>1000,27065=>1000,27066=>1000,27067=>1000,27068=>1000,27069=>1000,27070=>1000,27071=>1000,27072=>1000,27073=>1000,27074=>1000,27075=>1000,27076=>1000,
-	27077=>1000,27078=>1000,27079=>1000,27080=>1000,27081=>1000,27082=>1000,27083=>1000,27084=>1000,27085=>1000,27086=>1000,27087=>1000,27088=>1000,27089=>1000,27090=>1000,27091=>1000,27092=>1000,
-	27093=>1000,27094=>1000,27095=>1000,27096=>1000,27097=>1000,27098=>1000,27099=>1000,27100=>1000,27101=>1000,27102=>1000,27103=>1000,27104=>1000,27105=>1000,27106=>1000,27107=>1000,27108=>1000,
-	27109=>1000,27110=>1000,27111=>1000,27112=>1000,27113=>1000,27114=>1000,27115=>1000,27116=>1000,27117=>1000,27118=>1000,27119=>1000,27120=>1000,27121=>1000,27122=>1000,27123=>1000,27124=>1000,
-	27125=>1000,27126=>1000,27127=>1000,27128=>1000,27129=>1000,27130=>1000,27131=>1000,27132=>1000,27133=>1000,27134=>1000,27135=>1000,27136=>1000,27137=>1000,27138=>1000,27139=>1000,27140=>1000,
-	27141=>1000,27142=>1000,27143=>1000,27144=>1000,27145=>1000,27146=>1000,27147=>1000,27148=>1000,27149=>1000,27150=>1000,27151=>1000,27152=>1000,27153=>1000,27154=>1000,27155=>1000,27156=>1000,
-	27157=>1000,27158=>1000,27159=>1000,27160=>1000,27161=>1000,27162=>1000,27163=>1000,27164=>1000,27165=>1000,27166=>1000,27167=>1000,27168=>1000,27169=>1000,27170=>1000,27171=>1000,27172=>1000,
-	27173=>1000,27174=>1000,27175=>1000,27176=>1000,27177=>1000,27178=>1000,27179=>1000,27180=>1000,27181=>1000,27182=>1000,27183=>1000,27184=>1000,27185=>1000,27186=>1000,27187=>1000,27188=>1000,
-	27189=>1000,27190=>1000,27191=>1000,27192=>1000,27193=>1000,27194=>1000,27195=>1000,27196=>1000,27197=>1000,27198=>1000,27199=>1000,27200=>1000,27201=>1000,27202=>1000,27203=>1000,27204=>1000,
-	27205=>1000,27206=>1000,27207=>1000,27208=>1000,27209=>1000,27210=>1000,27211=>1000,27212=>1000,27213=>1000,27214=>1000,27215=>1000,27216=>1000,27217=>1000,27218=>1000,27219=>1000,27220=>1000,
-	27221=>1000,27222=>1000,27223=>1000,27224=>1000,27225=>1000,27226=>1000,27227=>1000,27228=>1000,27229=>1000,27230=>1000,27231=>1000,27232=>1000,27233=>1000,27234=>1000,27235=>1000,27236=>1000,
-	27237=>1000,27238=>1000,27239=>1000,27240=>1000,27241=>1000,27242=>1000,27243=>1000,27244=>1000,27245=>1000,27246=>1000,27247=>1000,27248=>1000,27249=>1000,27250=>1000,27251=>1000,27252=>1000,
-	27253=>1000,27254=>1000,27255=>1000,27256=>1000,27257=>1000,27258=>1000,27259=>1000,27260=>1000,27261=>1000,27262=>1000,27263=>1000,27264=>1000,27265=>1000,27266=>1000,27267=>1000,27268=>1000,
-	27269=>1000,27270=>1000,27271=>1000,27272=>1000,27273=>1000,27274=>1000,27275=>1000,27276=>1000,27277=>1000,27278=>1000,27279=>1000,27280=>1000,27281=>1000,27282=>1000,27283=>1000,27284=>1000,
-	27285=>1000,27286=>1000,27287=>1000,27288=>1000,27289=>1000,27290=>1000,27291=>1000,27292=>1000,27293=>1000,27294=>1000,27295=>1000,27296=>1000,27297=>1000,27298=>1000,27299=>1000,27300=>1000,
-	27301=>1000,27302=>1000,27303=>1000,27304=>1000,27305=>1000,27306=>1000,27307=>1000,27308=>1000,27309=>1000,27310=>1000,27311=>1000,27312=>1000,27313=>1000,27314=>1000,27315=>1000,27316=>1000,
-	27317=>1000,27318=>1000,27319=>1000,27320=>1000,27321=>1000,27322=>1000,27323=>1000,27324=>1000,27325=>1000,27326=>1000,27327=>1000,27328=>1000,27329=>1000,27330=>1000,27331=>1000,27332=>1000,
-	27333=>1000,27334=>1000,27335=>1000,27336=>1000,27337=>1000,27338=>1000,27339=>1000,27340=>1000,27341=>1000,27342=>1000,27343=>1000,27344=>1000,27345=>1000,27346=>1000,27347=>1000,27348=>1000,
-	27349=>1000,27350=>1000,27351=>1000,27352=>1000,27353=>1000,27354=>1000,27355=>1000,27356=>1000,27357=>1000,27358=>1000,27359=>1000,27360=>1000,27361=>1000,27362=>1000,27363=>1000,27364=>1000,
-	27365=>1000,27366=>1000,27367=>1000,27368=>1000,27369=>1000,27370=>1000,27371=>1000,27372=>1000,27373=>1000,27374=>1000,27375=>1000,27376=>1000,27377=>1000,27378=>1000,27379=>1000,27380=>1000,
-	27381=>1000,27382=>1000,27383=>1000,27384=>1000,27385=>1000,27386=>1000,27387=>1000,27388=>1000,27389=>1000,27390=>1000,27391=>1000,27392=>1000,27393=>1000,27394=>1000,27395=>1000,27396=>1000,
-	27397=>1000,27398=>1000,27399=>1000,27400=>1000,27401=>1000,27402=>1000,27403=>1000,27404=>1000,27405=>1000,27406=>1000,27407=>1000,27408=>1000,27409=>1000,27410=>1000,27411=>1000,27412=>1000,
-	27413=>1000,27414=>1000,27415=>1000,27416=>1000,27417=>1000,27418=>1000,27419=>1000,27420=>1000,27421=>1000,27422=>1000,27423=>1000,27424=>1000,27425=>1000,27426=>1000,27427=>1000,27428=>1000,
-	27429=>1000,27430=>1000,27431=>1000,27432=>1000,27433=>1000,27434=>1000,27435=>1000,27436=>1000,27437=>1000,27438=>1000,27439=>1000,27440=>1000,27441=>1000,27442=>1000,27443=>1000,27444=>1000,
-	27445=>1000,27446=>1000,27447=>1000,27448=>1000,27449=>1000,27450=>1000,27451=>1000,27452=>1000,27453=>1000,27454=>1000,27455=>1000,27456=>1000,27457=>1000,27458=>1000,27459=>1000,27460=>1000,
-	27461=>1000,27462=>1000,27463=>1000,27464=>1000,27465=>1000,27466=>1000,27467=>1000,27468=>1000,27469=>1000,27470=>1000,27471=>1000,27472=>1000,27473=>1000,27474=>1000,27475=>1000,27476=>1000,
-	27477=>1000,27478=>1000,27479=>1000,27480=>1000,27481=>1000,27482=>1000,27483=>1000,27484=>1000,27485=>1000,27486=>1000,27487=>1000,27488=>1000,27489=>1000,27490=>1000,27491=>1000,27492=>1000,
-	27493=>1000,27494=>1000,27495=>1000,27496=>1000,27497=>1000,27498=>1000,27499=>1000,27500=>1000,27501=>1000,27502=>1000,27503=>1000,27504=>1000,27505=>1000,27506=>1000,27507=>1000,27508=>1000,
-	27509=>1000,27510=>1000,27511=>1000,27512=>1000,27513=>1000,27514=>1000,27515=>1000,27516=>1000,27517=>1000,27518=>1000,27519=>1000,27520=>1000,27521=>1000,27522=>1000,27523=>1000,27524=>1000,
-	27525=>1000,27526=>1000,27527=>1000,27528=>1000,27529=>1000,27530=>1000,27531=>1000,27532=>1000,27533=>1000,27534=>1000,27535=>1000,27536=>1000,27537=>1000,27538=>1000,27539=>1000,27540=>1000,
-	27541=>1000,27542=>1000,27543=>1000,27544=>1000,27545=>1000,27546=>1000,27547=>1000,27548=>1000,27549=>1000,27550=>1000,27551=>1000,27552=>1000,27553=>1000,27554=>1000,27555=>1000,27556=>1000,
-	27557=>1000,27558=>1000,27559=>1000,27560=>1000,27561=>1000,27562=>1000,27563=>1000,27564=>1000,27565=>1000,27566=>1000,27567=>1000,27568=>1000,27569=>1000,27570=>1000,27571=>1000,27572=>1000,
-	27573=>1000,27574=>1000,27575=>1000,27576=>1000,27577=>1000,27578=>1000,27579=>1000,27580=>1000,27581=>1000,27582=>1000,27583=>1000,27584=>1000,27585=>1000,27586=>1000,27587=>1000,27588=>1000,
-	27589=>1000,27590=>1000,27591=>1000,27592=>1000,27593=>1000,27594=>1000,27595=>1000,27596=>1000,27597=>1000,27598=>1000,27599=>1000,27600=>1000,27601=>1000,27602=>1000,27603=>1000,27604=>1000,
-	27605=>1000,27606=>1000,27607=>1000,27608=>1000,27609=>1000,27610=>1000,27611=>1000,27612=>1000,27613=>1000,27614=>1000,27615=>1000,27616=>1000,27617=>1000,27618=>1000,27619=>1000,27620=>1000,
-	27621=>1000,27622=>1000,27623=>1000,27624=>1000,27625=>1000,27626=>1000,27627=>1000,27628=>1000,27629=>1000,27630=>1000,27631=>1000,27632=>1000,27633=>1000,27634=>1000,27635=>1000,27636=>1000,
-	27637=>1000,27638=>1000,27639=>1000,27640=>1000,27641=>1000,27642=>1000,27643=>1000,27644=>1000,27645=>1000,27646=>1000,27647=>1000,27648=>1000,27649=>1000,27650=>1000,27651=>1000,27652=>1000,
-	27653=>1000,27654=>1000,27655=>1000,27656=>1000,27657=>1000,27658=>1000,27659=>1000,27660=>1000,27661=>1000,27662=>1000,27663=>1000,27664=>1000,27665=>1000,27666=>1000,27667=>1000,27668=>1000,
-	27669=>1000,27670=>1000,27671=>1000,27672=>1000,27673=>1000,27674=>1000,27675=>1000,27676=>1000,27677=>1000,27678=>1000,27679=>1000,27680=>1000,27681=>1000,27682=>1000,27683=>1000,27684=>1000,
-	27685=>1000,27686=>1000,27687=>1000,27688=>1000,27689=>1000,27690=>1000,27691=>1000,27692=>1000,27693=>1000,27694=>1000,27695=>1000,27696=>1000,27697=>1000,27698=>1000,27699=>1000,27700=>1000,
-	27701=>1000,27702=>1000,27703=>1000,27704=>1000,27705=>1000,27706=>1000,27707=>1000,27708=>1000,27709=>1000,27710=>1000,27711=>1000,27712=>1000,27713=>1000,27714=>1000,27715=>1000,27716=>1000,
-	27717=>1000,27718=>1000,27719=>1000,27720=>1000,27721=>1000,27722=>1000,27723=>1000,27724=>1000,27725=>1000,27726=>1000,27727=>1000,27728=>1000,27729=>1000,27730=>1000,27731=>1000,27732=>1000,
-	27733=>1000,27734=>1000,27735=>1000,27736=>1000,27737=>1000,27738=>1000,27739=>1000,27740=>1000,27741=>1000,27742=>1000,27743=>1000,27744=>1000,27745=>1000,27746=>1000,27747=>1000,27748=>1000,
-	27749=>1000,27750=>1000,27751=>1000,27752=>1000,27753=>1000,27754=>1000,27755=>1000,27756=>1000,27757=>1000,27758=>1000,27759=>1000,27760=>1000,27761=>1000,27762=>1000,27763=>1000,27764=>1000,
-	27765=>1000,27766=>1000,27767=>1000,27768=>1000,27769=>1000,27770=>1000,27771=>1000,27772=>1000,27773=>1000,27774=>1000,27775=>1000,27776=>1000,27777=>1000,27778=>1000,27779=>1000,27780=>1000,
-	27781=>1000,27782=>1000,27783=>1000,27784=>1000,27785=>1000,27786=>1000,27787=>1000,27788=>1000,27789=>1000,27790=>1000,27791=>1000,27792=>1000,27793=>1000,27794=>1000,27795=>1000,27796=>1000,
-	27797=>1000,27798=>1000,27799=>1000,27800=>1000,27801=>1000,27802=>1000,27803=>1000,27804=>1000,27805=>1000,27806=>1000,27807=>1000,27808=>1000,27809=>1000,27810=>1000,27811=>1000,27812=>1000,
-	27813=>1000,27814=>1000,27815=>1000,27816=>1000,27817=>1000,27818=>1000,27819=>1000,27820=>1000,27821=>1000,27822=>1000,27823=>1000,27824=>1000,27825=>1000,27826=>1000,27827=>1000,27828=>1000,
-	27829=>1000,27830=>1000,27831=>1000,27832=>1000,27833=>1000,27834=>1000,27835=>1000,27836=>1000,27837=>1000,27838=>1000,27839=>1000,27840=>1000,27841=>1000,27842=>1000,27843=>1000,27844=>1000,
-	27845=>1000,27846=>1000,27847=>1000,27848=>1000,27849=>1000,27850=>1000,27851=>1000,27852=>1000,27853=>1000,27854=>1000,27855=>1000,27856=>1000,27857=>1000,27858=>1000,27859=>1000,27860=>1000,
-	27861=>1000,27862=>1000,27863=>1000,27864=>1000,27865=>1000,27866=>1000,27867=>1000,27868=>1000,27869=>1000,27870=>1000,27871=>1000,27872=>1000,27873=>1000,27874=>1000,27875=>1000,27876=>1000,
-	27877=>1000,27878=>1000,27879=>1000,27880=>1000,27881=>1000,27882=>1000,27883=>1000,27884=>1000,27885=>1000,27886=>1000,27887=>1000,27888=>1000,27889=>1000,27890=>1000,27891=>1000,27892=>1000,
-	27893=>1000,27894=>1000,27895=>1000,27896=>1000,27897=>1000,27898=>1000,27899=>1000,27900=>1000,27901=>1000,27902=>1000,27903=>1000,27904=>1000,27905=>1000,27906=>1000,27907=>1000,27908=>1000,
-	27909=>1000,27910=>1000,27911=>1000,27912=>1000,27913=>1000,27914=>1000,27915=>1000,27916=>1000,27917=>1000,27918=>1000,27919=>1000,27920=>1000,27921=>1000,27922=>1000,27923=>1000,27924=>1000,
-	27925=>1000,27926=>1000,27927=>1000,27928=>1000,27929=>1000,27930=>1000,27931=>1000,27932=>1000,27933=>1000,27934=>1000,27935=>1000,27936=>1000,27937=>1000,27938=>1000,27939=>1000,27940=>1000,
-	27941=>1000,27942=>1000,27943=>1000,27944=>1000,27945=>1000,27946=>1000,27947=>1000,27948=>1000,27949=>1000,27950=>1000,27951=>1000,27952=>1000,27953=>1000,27954=>1000,27955=>1000,27956=>1000,
-	27957=>1000,27958=>1000,27959=>1000,27960=>1000,27961=>1000,27962=>1000,27963=>1000,27964=>1000,27965=>1000,27966=>1000,27967=>1000,27968=>1000,27969=>1000,27970=>1000,27971=>1000,27972=>1000,
-	27973=>1000,27974=>1000,27975=>1000,27976=>1000,27977=>1000,27978=>1000,27979=>1000,27980=>1000,27981=>1000,27982=>1000,27983=>1000,27984=>1000,27985=>1000,27986=>1000,27987=>1000,27988=>1000,
-	27989=>1000,27990=>1000,27991=>1000,27992=>1000,27993=>1000,27994=>1000,27995=>1000,27996=>1000,27997=>1000,27998=>1000,27999=>1000,28000=>1000,28001=>1000,28002=>1000,28003=>1000,28004=>1000,
-	28005=>1000,28006=>1000,28007=>1000,28008=>1000,28009=>1000,28010=>1000,28011=>1000,28012=>1000,28013=>1000,28014=>1000,28015=>1000,28016=>1000,28017=>1000,28018=>1000,28019=>1000,28020=>1000,
-	28021=>1000,28022=>1000,28023=>1000,28024=>1000,28025=>1000,28026=>1000,28027=>1000,28028=>1000,28029=>1000,28030=>1000,28031=>1000,28032=>1000,28033=>1000,28034=>1000,28035=>1000,28036=>1000,
-	28037=>1000,28038=>1000,28039=>1000,28040=>1000,28041=>1000,28042=>1000,28043=>1000,28044=>1000,28045=>1000,28046=>1000,28047=>1000,28048=>1000,28049=>1000,28050=>1000,28051=>1000,28052=>1000,
-	28053=>1000,28054=>1000,28055=>1000,28056=>1000,28057=>1000,28058=>1000,28059=>1000,28060=>1000,28061=>1000,28062=>1000,28063=>1000,28064=>1000,28065=>1000,28066=>1000,28067=>1000,28068=>1000,
-	28069=>1000,28070=>1000,28071=>1000,28072=>1000,28073=>1000,28074=>1000,28075=>1000,28076=>1000,28077=>1000,28078=>1000,28079=>1000,28080=>1000,28081=>1000,28082=>1000,28083=>1000,28084=>1000,
-	28085=>1000,28086=>1000,28087=>1000,28088=>1000,28089=>1000,28090=>1000,28091=>1000,28092=>1000,28093=>1000,28094=>1000,28095=>1000,28096=>1000,28097=>1000,28098=>1000,28099=>1000,28100=>1000,
-	28101=>1000,28102=>1000,28103=>1000,28104=>1000,28105=>1000,28106=>1000,28107=>1000,28108=>1000,28109=>1000,28110=>1000,28111=>1000,28112=>1000,28113=>1000,28114=>1000,28115=>1000,28116=>1000,
-	28117=>1000,28118=>1000,28119=>1000,28120=>1000,28121=>1000,28122=>1000,28123=>1000,28124=>1000,28125=>1000,28126=>1000,28127=>1000,28128=>1000,28129=>1000,28130=>1000,28131=>1000,28132=>1000,
-	28133=>1000,28134=>1000,28135=>1000,28136=>1000,28137=>1000,28138=>1000,28139=>1000,28140=>1000,28141=>1000,28142=>1000,28143=>1000,28144=>1000,28145=>1000,28146=>1000,28147=>1000,28148=>1000,
-	28149=>1000,28150=>1000,28151=>1000,28152=>1000,28153=>1000,28154=>1000,28155=>1000,28156=>1000,28157=>1000,28158=>1000,28159=>1000,28160=>1000,28161=>1000,28162=>1000,28163=>1000,28164=>1000,
-	28165=>1000,28166=>1000,28167=>1000,28168=>1000,28169=>1000,28170=>1000,28171=>1000,28172=>1000,28173=>1000,28174=>1000,28175=>1000,28176=>1000,28177=>1000,28178=>1000,28179=>1000,28180=>1000,
-	28181=>1000,28182=>1000,28183=>1000,28184=>1000,28185=>1000,28186=>1000,28187=>1000,28188=>1000,28189=>1000,28190=>1000,28191=>1000,28192=>1000,28193=>1000,28194=>1000,28195=>1000,28196=>1000,
-	28197=>1000,28198=>1000,28199=>1000,28200=>1000,28201=>1000,28202=>1000,28203=>1000,28204=>1000,28205=>1000,28206=>1000,28207=>1000,28208=>1000,28209=>1000,28210=>1000,28211=>1000,28212=>1000,
-	28213=>1000,28214=>1000,28215=>1000,28216=>1000,28217=>1000,28218=>1000,28219=>1000,28220=>1000,28221=>1000,28222=>1000,28223=>1000,28224=>1000,28225=>1000,28226=>1000,28227=>1000,28228=>1000,
-	28229=>1000,28230=>1000,28231=>1000,28232=>1000,28233=>1000,28234=>1000,28235=>1000,28236=>1000,28237=>1000,28238=>1000,28239=>1000,28240=>1000,28241=>1000,28242=>1000,28243=>1000,28244=>1000,
-	28245=>1000,28246=>1000,28247=>1000,28248=>1000,28249=>1000,28250=>1000,28251=>1000,28252=>1000,28253=>1000,28254=>1000,28255=>1000,28256=>1000,28257=>1000,28258=>1000,28259=>1000,28260=>1000,
-	28261=>1000,28262=>1000,28263=>1000,28264=>1000,28265=>1000,28266=>1000,28267=>1000,28268=>1000,28269=>1000,28270=>1000,28271=>1000,28272=>1000,28273=>1000,28274=>1000,28275=>1000,28276=>1000,
-	28277=>1000,28278=>1000,28279=>1000,28280=>1000,28281=>1000,28282=>1000,28283=>1000,28284=>1000,28285=>1000,28286=>1000,28287=>1000,28288=>1000,28289=>1000,28290=>1000,28291=>1000,28292=>1000,
-	28293=>1000,28294=>1000,28295=>1000,28296=>1000,28297=>1000,28298=>1000,28299=>1000,28300=>1000,28301=>1000,28302=>1000,28303=>1000,28304=>1000,28305=>1000,28306=>1000,28307=>1000,28308=>1000,
-	28309=>1000,28310=>1000,28311=>1000,28312=>1000,28313=>1000,28314=>1000,28315=>1000,28316=>1000,28317=>1000,28318=>1000,28319=>1000,28320=>1000,28321=>1000,28322=>1000,28323=>1000,28324=>1000,
-	28325=>1000,28326=>1000,28327=>1000,28328=>1000,28329=>1000,28330=>1000,28331=>1000,28332=>1000,28333=>1000,28334=>1000,28335=>1000,28336=>1000,28337=>1000,28338=>1000,28339=>1000,28340=>1000,
-	28341=>1000,28342=>1000,28343=>1000,28344=>1000,28345=>1000,28346=>1000,28347=>1000,28348=>1000,28349=>1000,28350=>1000,28351=>1000,28352=>1000,28353=>1000,28354=>1000,28355=>1000,28356=>1000,
-	28357=>1000,28358=>1000,28359=>1000,28360=>1000,28361=>1000,28362=>1000,28363=>1000,28364=>1000,28365=>1000,28366=>1000,28367=>1000,28368=>1000,28369=>1000,28370=>1000,28371=>1000,28372=>1000,
-	28373=>1000,28374=>1000,28375=>1000,28376=>1000,28377=>1000,28378=>1000,28379=>1000,28380=>1000,28381=>1000,28382=>1000,28383=>1000,28384=>1000,28385=>1000,28386=>1000,28387=>1000,28388=>1000,
-	28389=>1000,28390=>1000,28391=>1000,28392=>1000,28393=>1000,28394=>1000,28395=>1000,28396=>1000,28397=>1000,28398=>1000,28399=>1000,28400=>1000,28401=>1000,28402=>1000,28403=>1000,28404=>1000,
-	28405=>1000,28406=>1000,28407=>1000,28408=>1000,28409=>1000,28410=>1000,28411=>1000,28412=>1000,28413=>1000,28414=>1000,28415=>1000,28416=>1000,28417=>1000,28418=>1000,28419=>1000,28420=>1000,
-	28421=>1000,28422=>1000,28423=>1000,28424=>1000,28425=>1000,28426=>1000,28427=>1000,28428=>1000,28429=>1000,28430=>1000,28431=>1000,28432=>1000,28433=>1000,28434=>1000,28435=>1000,28436=>1000,
-	28437=>1000,28438=>1000,28439=>1000,28440=>1000,28441=>1000,28442=>1000,28443=>1000,28444=>1000,28445=>1000,28446=>1000,28447=>1000,28448=>1000,28449=>1000,28450=>1000,28451=>1000,28452=>1000,
-	28453=>1000,28454=>1000,28455=>1000,28456=>1000,28457=>1000,28458=>1000,28459=>1000,28460=>1000,28461=>1000,28462=>1000,28463=>1000,28464=>1000,28465=>1000,28466=>1000,28467=>1000,28468=>1000,
-	28469=>1000,28470=>1000,28471=>1000,28472=>1000,28473=>1000,28474=>1000,28475=>1000,28476=>1000,28477=>1000,28478=>1000,28479=>1000,28480=>1000,28481=>1000,28482=>1000,28483=>1000,28484=>1000,
-	28485=>1000,28486=>1000,28487=>1000,28488=>1000,28489=>1000,28490=>1000,28491=>1000,28492=>1000,28493=>1000,28494=>1000,28495=>1000,28496=>1000,28497=>1000,28498=>1000,28499=>1000,28500=>1000,
-	28501=>1000,28502=>1000,28503=>1000,28504=>1000,28505=>1000,28506=>1000,28507=>1000,28508=>1000,28509=>1000,28510=>1000,28511=>1000,28512=>1000,28513=>1000,28514=>1000,28515=>1000,28516=>1000,
-	28517=>1000,28518=>1000,28519=>1000,28520=>1000,28521=>1000,28522=>1000,28523=>1000,28524=>1000,28525=>1000,28526=>1000,28527=>1000,28528=>1000,28529=>1000,28530=>1000,28531=>1000,28532=>1000,
-	28533=>1000,28534=>1000,28535=>1000,28536=>1000,28537=>1000,28538=>1000,28539=>1000,28540=>1000,28541=>1000,28542=>1000,28543=>1000,28544=>1000,28545=>1000,28546=>1000,28547=>1000,28548=>1000,
-	28549=>1000,28550=>1000,28551=>1000,28552=>1000,28553=>1000,28554=>1000,28555=>1000,28556=>1000,28557=>1000,28558=>1000,28559=>1000,28560=>1000,28561=>1000,28562=>1000,28563=>1000,28564=>1000,
-	28565=>1000,28566=>1000,28567=>1000,28568=>1000,28569=>1000,28570=>1000,28571=>1000,28572=>1000,28573=>1000,28574=>1000,28575=>1000,28576=>1000,28577=>1000,28578=>1000,28579=>1000,28580=>1000,
-	28581=>1000,28582=>1000,28583=>1000,28584=>1000,28585=>1000,28586=>1000,28587=>1000,28588=>1000,28589=>1000,28590=>1000,28591=>1000,28592=>1000,28593=>1000,28594=>1000,28595=>1000,28596=>1000,
-	28597=>1000,28598=>1000,28599=>1000,28600=>1000,28601=>1000,28602=>1000,28603=>1000,28604=>1000,28605=>1000,28606=>1000,28607=>1000,28608=>1000,28609=>1000,28610=>1000,28611=>1000,28612=>1000,
-	28613=>1000,28614=>1000,28615=>1000,28616=>1000,28617=>1000,28618=>1000,28619=>1000,28620=>1000,28621=>1000,28622=>1000,28623=>1000,28624=>1000,28625=>1000,28626=>1000,28627=>1000,28628=>1000,
-	28629=>1000,28630=>1000,28631=>1000,28632=>1000,28633=>1000,28634=>1000,28635=>1000,28636=>1000,28637=>1000,28638=>1000,28639=>1000,28640=>1000,28641=>1000,28642=>1000,28643=>1000,28644=>1000,
-	28645=>1000,28646=>1000,28647=>1000,28648=>1000,28649=>1000,28650=>1000,28651=>1000,28652=>1000,28653=>1000,28654=>1000,28655=>1000,28656=>1000,28657=>1000,28658=>1000,28659=>1000,28660=>1000,
-	28661=>1000,28662=>1000,28663=>1000,28664=>1000,28665=>1000,28666=>1000,28667=>1000,28668=>1000,28669=>1000,28670=>1000,28671=>1000,28672=>1000,28673=>1000,28674=>1000,28675=>1000,28676=>1000,
-	28677=>1000,28678=>1000,28679=>1000,28680=>1000,28681=>1000,28682=>1000,28683=>1000,28684=>1000,28685=>1000,28686=>1000,28687=>1000,28688=>1000,28689=>1000,28690=>1000,28691=>1000,28692=>1000,
-	28693=>1000,28694=>1000,28695=>1000,28696=>1000,28697=>1000,28698=>1000,28699=>1000,28700=>1000,28701=>1000,28702=>1000,28703=>1000,28704=>1000,28705=>1000,28706=>1000,28707=>1000,28708=>1000,
-	28709=>1000,28710=>1000,28711=>1000,28712=>1000,28713=>1000,28714=>1000,28715=>1000,28716=>1000,28717=>1000,28718=>1000,28719=>1000,28720=>1000,28721=>1000,28722=>1000,28723=>1000,28724=>1000,
-	28725=>1000,28726=>1000,28727=>1000,28728=>1000,28729=>1000,28730=>1000,28731=>1000,28732=>1000,28733=>1000,28734=>1000,28735=>1000,28736=>1000,28737=>1000,28738=>1000,28739=>1000,28740=>1000,
-	28741=>1000,28742=>1000,28743=>1000,28744=>1000,28745=>1000,28746=>1000,28747=>1000,28748=>1000,28749=>1000,28750=>1000,28751=>1000,28752=>1000,28753=>1000,28754=>1000,28755=>1000,28756=>1000,
-	28757=>1000,28758=>1000,28759=>1000,28760=>1000,28761=>1000,28762=>1000,28763=>1000,28764=>1000,28765=>1000,28766=>1000,28767=>1000,28768=>1000,28769=>1000,28770=>1000,28771=>1000,28772=>1000,
-	28773=>1000,28774=>1000,28775=>1000,28776=>1000,28777=>1000,28778=>1000,28779=>1000,28780=>1000,28781=>1000,28782=>1000,28783=>1000,28784=>1000,28785=>1000,28786=>1000,28787=>1000,28788=>1000,
-	28789=>1000,28790=>1000,28791=>1000,28792=>1000,28793=>1000,28794=>1000,28795=>1000,28796=>1000,28797=>1000,28798=>1000,28799=>1000,28800=>1000,28801=>1000,28802=>1000,28803=>1000,28804=>1000,
-	28805=>1000,28806=>1000,28807=>1000,28808=>1000,28809=>1000,28810=>1000,28811=>1000,28812=>1000,28813=>1000,28814=>1000,28815=>1000,28816=>1000,28817=>1000,28818=>1000,28819=>1000,28820=>1000,
-	28821=>1000,28822=>1000,28823=>1000,28824=>1000,28825=>1000,28826=>1000,28827=>1000,28828=>1000,28829=>1000,28830=>1000,28831=>1000,28832=>1000,28833=>1000,28834=>1000,28835=>1000,28836=>1000,
-	28837=>1000,28838=>1000,28839=>1000,28840=>1000,28841=>1000,28842=>1000,28843=>1000,28844=>1000,28845=>1000,28846=>1000,28847=>1000,28848=>1000,28849=>1000,28850=>1000,28851=>1000,28852=>1000,
-	28853=>1000,28854=>1000,28855=>1000,28856=>1000,28857=>1000,28858=>1000,28859=>1000,28860=>1000,28861=>1000,28862=>1000,28863=>1000,28864=>1000,28865=>1000,28866=>1000,28867=>1000,28868=>1000,
-	28869=>1000,28870=>1000,28871=>1000,28872=>1000,28873=>1000,28874=>1000,28875=>1000,28876=>1000,28877=>1000,28878=>1000,28879=>1000,28880=>1000,28881=>1000,28882=>1000,28883=>1000,28884=>1000,
-	28885=>1000,28886=>1000,28887=>1000,28888=>1000,28889=>1000,28890=>1000,28891=>1000,28892=>1000,28893=>1000,28894=>1000,28895=>1000,28896=>1000,28897=>1000,28898=>1000,28899=>1000,28900=>1000,
-	28901=>1000,28902=>1000,28903=>1000,28904=>1000,28905=>1000,28906=>1000,28907=>1000,28908=>1000,28909=>1000,28910=>1000,28911=>1000,28912=>1000,28913=>1000,28914=>1000,28915=>1000,28916=>1000,
-	28917=>1000,28918=>1000,28919=>1000,28920=>1000,28921=>1000,28922=>1000,28923=>1000,28924=>1000,28925=>1000,28926=>1000,28927=>1000,28928=>1000,28929=>1000,28930=>1000,28931=>1000,28932=>1000,
-	28933=>1000,28934=>1000,28935=>1000,28936=>1000,28937=>1000,28938=>1000,28939=>1000,28940=>1000,28941=>1000,28942=>1000,28943=>1000,28944=>1000,28945=>1000,28946=>1000,28947=>1000,28948=>1000,
-	28949=>1000,28950=>1000,28951=>1000,28952=>1000,28953=>1000,28954=>1000,28955=>1000,28956=>1000,28957=>1000,28958=>1000,28959=>1000,28960=>1000,28961=>1000,28962=>1000,28963=>1000,28964=>1000,
-	28965=>1000,28966=>1000,28967=>1000,28968=>1000,28969=>1000,28970=>1000,28971=>1000,28972=>1000,28973=>1000,28974=>1000,28975=>1000,28976=>1000,28977=>1000,28978=>1000,28979=>1000,28980=>1000,
-	28981=>1000,28982=>1000,28983=>1000,28984=>1000,28985=>1000,28986=>1000,28987=>1000,28988=>1000,28989=>1000,28990=>1000,28991=>1000,28992=>1000,28993=>1000,28994=>1000,28995=>1000,28996=>1000,
-	28997=>1000,28998=>1000,28999=>1000,29000=>1000,29001=>1000,29002=>1000,29003=>1000,29004=>1000,29005=>1000,29006=>1000,29007=>1000,29008=>1000,29009=>1000,29010=>1000,29011=>1000,29012=>1000,
-	29013=>1000,29014=>1000,29015=>1000,29016=>1000,29017=>1000,29018=>1000,29019=>1000,29020=>1000,29021=>1000,29022=>1000,29023=>1000,29024=>1000,29025=>1000,29026=>1000,29027=>1000,29028=>1000,
-	29029=>1000,29030=>1000,29031=>1000,29032=>1000,29033=>1000,29034=>1000,29035=>1000,29036=>1000,29037=>1000,29038=>1000,29039=>1000,29040=>1000,29041=>1000,29042=>1000,29043=>1000,29044=>1000,
-	29045=>1000,29046=>1000,29047=>1000,29048=>1000,29049=>1000,29050=>1000,29051=>1000,29052=>1000,29053=>1000,29054=>1000,29055=>1000,29056=>1000,29057=>1000,29058=>1000,29059=>1000,29060=>1000,
-	29061=>1000,29062=>1000,29063=>1000,29064=>1000,29065=>1000,29066=>1000,29067=>1000,29068=>1000,29069=>1000,29070=>1000,29071=>1000,29072=>1000,29073=>1000,29074=>1000,29075=>1000,29076=>1000,
-	29077=>1000,29078=>1000,29079=>1000,29080=>1000,29081=>1000,29082=>1000,29083=>1000,29084=>1000,29085=>1000,29086=>1000,29087=>1000,29088=>1000,29089=>1000,29090=>1000,29091=>1000,29092=>1000,
-	29093=>1000,29094=>1000,29095=>1000,29096=>1000,29097=>1000,29098=>1000,29099=>1000,29100=>1000,29101=>1000,29102=>1000,29103=>1000,29104=>1000,29105=>1000,29106=>1000,29107=>1000,29108=>1000,
-	29109=>1000,29110=>1000,29111=>1000,29112=>1000,29113=>1000,29114=>1000,29115=>1000,29116=>1000,29117=>1000,29118=>1000,29119=>1000,29120=>1000,29121=>1000,29122=>1000,29123=>1000,29124=>1000,
-	29125=>1000,29126=>1000,29127=>1000,29128=>1000,29129=>1000,29130=>1000,29131=>1000,29132=>1000,29133=>1000,29134=>1000,29135=>1000,29136=>1000,29137=>1000,29138=>1000,29139=>1000,29140=>1000,
-	29141=>1000,29142=>1000,29143=>1000,29144=>1000,29145=>1000,29146=>1000,29147=>1000,29148=>1000,29149=>1000,29150=>1000,29151=>1000,29152=>1000,29153=>1000,29154=>1000,29155=>1000,29156=>1000,
-	29157=>1000,29158=>1000,29159=>1000,29160=>1000,29161=>1000,29162=>1000,29163=>1000,29164=>1000,29165=>1000,29166=>1000,29167=>1000,29168=>1000,29169=>1000,29170=>1000,29171=>1000,29172=>1000,
-	29173=>1000,29174=>1000,29175=>1000,29176=>1000,29177=>1000,29178=>1000,29179=>1000,29180=>1000,29181=>1000,29182=>1000,29183=>1000,29184=>1000,29185=>1000,29186=>1000,29187=>1000,29188=>1000,
-	29189=>1000,29190=>1000,29191=>1000,29192=>1000,29193=>1000,29194=>1000,29195=>1000,29196=>1000,29197=>1000,29198=>1000,29199=>1000,29200=>1000,29201=>1000,29202=>1000,29203=>1000,29204=>1000,
-	29205=>1000,29206=>1000,29207=>1000,29208=>1000,29209=>1000,29210=>1000,29211=>1000,29212=>1000,29213=>1000,29214=>1000,29215=>1000,29216=>1000,29217=>1000,29218=>1000,29219=>1000,29220=>1000,
-	29221=>1000,29222=>1000,29223=>1000,29224=>1000,29225=>1000,29226=>1000,29227=>1000,29228=>1000,29229=>1000,29230=>1000,29231=>1000,29232=>1000,29233=>1000,29234=>1000,29235=>1000,29236=>1000,
-	29237=>1000,29238=>1000,29239=>1000,29240=>1000,29241=>1000,29242=>1000,29243=>1000,29244=>1000,29245=>1000,29246=>1000,29247=>1000,29248=>1000,29249=>1000,29250=>1000,29251=>1000,29252=>1000,
-	29253=>1000,29254=>1000,29255=>1000,29256=>1000,29257=>1000,29258=>1000,29259=>1000,29260=>1000,29261=>1000,29262=>1000,29263=>1000,29264=>1000,29265=>1000,29266=>1000,29267=>1000,29268=>1000,
-	29269=>1000,29270=>1000,29271=>1000,29272=>1000,29273=>1000,29274=>1000,29275=>1000,29276=>1000,29277=>1000,29278=>1000,29279=>1000,29280=>1000,29281=>1000,29282=>1000,29283=>1000,29284=>1000,
-	29285=>1000,29286=>1000,29287=>1000,29288=>1000,29289=>1000,29290=>1000,29291=>1000,29292=>1000,29293=>1000,29294=>1000,29295=>1000,29296=>1000,29297=>1000,29298=>1000,29299=>1000,29300=>1000,
-	29301=>1000,29302=>1000,29303=>1000,29304=>1000,29305=>1000,29306=>1000,29307=>1000,29308=>1000,29309=>1000,29310=>1000,29311=>1000,29312=>1000,29313=>1000,29314=>1000,29315=>1000,29316=>1000,
-	29317=>1000,29318=>1000,29319=>1000,29320=>1000,29321=>1000,29322=>1000,29323=>1000,29324=>1000,29325=>1000,29326=>1000,29327=>1000,29328=>1000,29329=>1000,29330=>1000,29331=>1000,29332=>1000,
-	29333=>1000,29334=>1000,29335=>1000,29336=>1000,29337=>1000,29338=>1000,29339=>1000,29340=>1000,29341=>1000,29342=>1000,29343=>1000,29344=>1000,29345=>1000,29346=>1000,29347=>1000,29348=>1000,
-	29349=>1000,29350=>1000,29351=>1000,29352=>1000,29353=>1000,29354=>1000,29355=>1000,29356=>1000,29357=>1000,29358=>1000,29359=>1000,29360=>1000,29361=>1000,29362=>1000,29363=>1000,29364=>1000,
-	29365=>1000,29366=>1000,29367=>1000,29368=>1000,29369=>1000,29370=>1000,29371=>1000,29372=>1000,29373=>1000,29374=>1000,29375=>1000,29376=>1000,29377=>1000,29378=>1000,29379=>1000,29380=>1000,
-	29381=>1000,29382=>1000,29383=>1000,29384=>1000,29385=>1000,29386=>1000,29387=>1000,29388=>1000,29389=>1000,29390=>1000,29391=>1000,29392=>1000,29393=>1000,29394=>1000,29395=>1000,29396=>1000,
-	29397=>1000,29398=>1000,29399=>1000,29400=>1000,29401=>1000,29402=>1000,29403=>1000,29404=>1000,29405=>1000,29406=>1000,29407=>1000,29408=>1000,29409=>1000,29410=>1000,29411=>1000,29412=>1000,
-	29413=>1000,29414=>1000,29415=>1000,29416=>1000,29417=>1000,29418=>1000,29419=>1000,29420=>1000,29421=>1000,29422=>1000,29423=>1000,29424=>1000,29425=>1000,29426=>1000,29427=>1000,29428=>1000,
-	29429=>1000,29430=>1000,29431=>1000,29432=>1000,29433=>1000,29434=>1000,29435=>1000,29436=>1000,29437=>1000,29438=>1000,29439=>1000,29440=>1000,29441=>1000,29442=>1000,29443=>1000,29444=>1000,
-	29445=>1000,29446=>1000,29447=>1000,29448=>1000,29449=>1000,29450=>1000,29451=>1000,29452=>1000,29453=>1000,29454=>1000,29455=>1000,29456=>1000,29457=>1000,29458=>1000,29459=>1000,29460=>1000,
-	29461=>1000,29462=>1000,29463=>1000,29464=>1000,29465=>1000,29466=>1000,29467=>1000,29468=>1000,29469=>1000,29470=>1000,29471=>1000,29472=>1000,29473=>1000,29474=>1000,29475=>1000,29476=>1000,
-	29477=>1000,29478=>1000,29479=>1000,29480=>1000,29481=>1000,29482=>1000,29483=>1000,29484=>1000,29485=>1000,29486=>1000,29487=>1000,29488=>1000,29489=>1000,29490=>1000,29491=>1000,29492=>1000,
-	29493=>1000,29494=>1000,29495=>1000,29496=>1000,29497=>1000,29498=>1000,29499=>1000,29500=>1000,29501=>1000,29502=>1000,29503=>1000,29504=>1000,29505=>1000,29506=>1000,29507=>1000,29508=>1000,
-	29509=>1000,29510=>1000,29511=>1000,29512=>1000,29513=>1000,29514=>1000,29515=>1000,29516=>1000,29517=>1000,29518=>1000,29519=>1000,29520=>1000,29521=>1000,29522=>1000,29523=>1000,29524=>1000,
-	29525=>1000,29526=>1000,29527=>1000,29528=>1000,29529=>1000,29530=>1000,29531=>1000,29532=>1000,29533=>1000,29534=>1000,29535=>1000,29536=>1000,29537=>1000,29538=>1000,29539=>1000,29540=>1000,
-	29541=>1000,29542=>1000,29543=>1000,29544=>1000,29545=>1000,29546=>1000,29547=>1000,29548=>1000,29549=>1000,29550=>1000,29551=>1000,29552=>1000,29553=>1000,29554=>1000,29555=>1000,29556=>1000,
-	29557=>1000,29558=>1000,29559=>1000,29560=>1000,29561=>1000,29562=>1000,29563=>1000,29564=>1000,29565=>1000,29566=>1000,29567=>1000,29568=>1000,29569=>1000,29570=>1000,29571=>1000,29572=>1000,
-	29573=>1000,29574=>1000,29575=>1000,29576=>1000,29577=>1000,29578=>1000,29579=>1000,29580=>1000,29581=>1000,29582=>1000,29583=>1000,29584=>1000,29585=>1000,29586=>1000,29587=>1000,29588=>1000,
-	29589=>1000,29590=>1000,29591=>1000,29592=>1000,29593=>1000,29594=>1000,29595=>1000,29596=>1000,29597=>1000,29598=>1000,29599=>1000,29600=>1000,29601=>1000,29602=>1000,29603=>1000,29604=>1000,
-	29605=>1000,29606=>1000,29607=>1000,29608=>1000,29609=>1000,29610=>1000,29611=>1000,29612=>1000,29613=>1000,29614=>1000,29615=>1000,29616=>1000,29617=>1000,29618=>1000,29619=>1000,29620=>1000,
-	29621=>1000,29622=>1000,29623=>1000,29624=>1000,29625=>1000,29626=>1000,29627=>1000,29628=>1000,29629=>1000,29630=>1000,29631=>1000,29632=>1000,29633=>1000,29634=>1000,29635=>1000,29636=>1000,
-	29637=>1000,29638=>1000,29639=>1000,29640=>1000,29641=>1000,29642=>1000,29643=>1000,29644=>1000,29645=>1000,29646=>1000,29647=>1000,29648=>1000,29649=>1000,29650=>1000,29651=>1000,29652=>1000,
-	29653=>1000,29654=>1000,29655=>1000,29656=>1000,29657=>1000,29658=>1000,29659=>1000,29660=>1000,29661=>1000,29662=>1000,29663=>1000,29664=>1000,29665=>1000,29666=>1000,29667=>1000,29668=>1000,
-	29669=>1000,29670=>1000,29671=>1000,29672=>1000,29673=>1000,29674=>1000,29675=>1000,29676=>1000,29677=>1000,29678=>1000,29679=>1000,29680=>1000,29681=>1000,29682=>1000,29683=>1000,29684=>1000,
-	29685=>1000,29686=>1000,29687=>1000,29688=>1000,29689=>1000,29690=>1000,29691=>1000,29692=>1000,29693=>1000,29694=>1000,29695=>1000,29696=>1000,29697=>1000,29698=>1000,29699=>1000,29700=>1000,
-	29701=>1000,29702=>1000,29703=>1000,29704=>1000,29705=>1000,29706=>1000,29707=>1000,29708=>1000,29709=>1000,29710=>1000,29711=>1000,29712=>1000,29713=>1000,29714=>1000,29715=>1000,29716=>1000,
-	29717=>1000,29718=>1000,29719=>1000,29720=>1000,29721=>1000,29722=>1000,29723=>1000,29724=>1000,29725=>1000,29726=>1000,29727=>1000,29728=>1000,29729=>1000,29730=>1000,29731=>1000,29732=>1000,
-	29733=>1000,29734=>1000,29735=>1000,29736=>1000,29737=>1000,29738=>1000,29739=>1000,29740=>1000,29741=>1000,29742=>1000,29743=>1000,29744=>1000,29745=>1000,29746=>1000,29747=>1000,29748=>1000,
-	29749=>1000,29750=>1000,29751=>1000,29752=>1000,29753=>1000,29754=>1000,29755=>1000,29756=>1000,29757=>1000,29758=>1000,29759=>1000,29760=>1000,29761=>1000,29762=>1000,29763=>1000,29764=>1000,
-	29765=>1000,29766=>1000,29767=>1000,29768=>1000,29769=>1000,29770=>1000,29771=>1000,29772=>1000,29773=>1000,29774=>1000,29775=>1000,29776=>1000,29777=>1000,29778=>1000,29779=>1000,29780=>1000,
-	29781=>1000,29782=>1000,29783=>1000,29784=>1000,29785=>1000,29786=>1000,29787=>1000,29788=>1000,29789=>1000,29790=>1000,29791=>1000,29792=>1000,29793=>1000,29794=>1000,29795=>1000,29796=>1000,
-	29797=>1000,29798=>1000,29799=>1000,29800=>1000,29801=>1000,29802=>1000,29803=>1000,29804=>1000,29805=>1000,29806=>1000,29807=>1000,29808=>1000,29809=>1000,29810=>1000,29811=>1000,29812=>1000,
-	29813=>1000,29814=>1000,29815=>1000,29816=>1000,29817=>1000,29818=>1000,29819=>1000,29820=>1000,29821=>1000,29822=>1000,29823=>1000,29824=>1000,29825=>1000,29826=>1000,29827=>1000,29828=>1000,
-	29829=>1000,29830=>1000,29831=>1000,29832=>1000,29833=>1000,29834=>1000,29835=>1000,29836=>1000,29837=>1000,29838=>1000,29839=>1000,29840=>1000,29841=>1000,29842=>1000,29843=>1000,29844=>1000,
-	29845=>1000,29846=>1000,29847=>1000,29848=>1000,29849=>1000,29850=>1000,29851=>1000,29852=>1000,29853=>1000,29854=>1000,29855=>1000,29856=>1000,29857=>1000,29858=>1000,29859=>1000,29860=>1000,
-	29861=>1000,29862=>1000,29863=>1000,29864=>1000,29865=>1000,29866=>1000,29867=>1000,29868=>1000,29869=>1000,29870=>1000,29871=>1000,29872=>1000,29873=>1000,29874=>1000,29875=>1000,29876=>1000,
-	29877=>1000,29878=>1000,29879=>1000,29880=>1000,29881=>1000,29882=>1000,29883=>1000,29884=>1000,29885=>1000,29886=>1000,29887=>1000,29888=>1000,29889=>1000,29890=>1000,29891=>1000,29892=>1000,
-	29893=>1000,29894=>1000,29895=>1000,29896=>1000,29897=>1000,29898=>1000,29899=>1000,29900=>1000,29901=>1000,29902=>1000,29903=>1000,29904=>1000,29905=>1000,29906=>1000,29907=>1000,29908=>1000,
-	29909=>1000,29910=>1000,29911=>1000,29912=>1000,29913=>1000,29914=>1000,29915=>1000,29916=>1000,29917=>1000,29918=>1000,29919=>1000,29920=>1000,29921=>1000,29922=>1000,29923=>1000,29924=>1000,
-	29925=>1000,29926=>1000,29927=>1000,29928=>1000,29929=>1000,29930=>1000,29931=>1000,29932=>1000,29933=>1000,29934=>1000,29935=>1000,29936=>1000,29937=>1000,29938=>1000,29939=>1000,29940=>1000,
-	29941=>1000,29942=>1000,29943=>1000,29944=>1000,29945=>1000,29946=>1000,29947=>1000,29948=>1000,29949=>1000,29950=>1000,29951=>1000,29952=>1000,29953=>1000,29954=>1000,29955=>1000,29956=>1000,
-	29957=>1000,29958=>1000,29959=>1000,29960=>1000,29961=>1000,29962=>1000,29963=>1000,29964=>1000,29965=>1000,29966=>1000,29967=>1000,29968=>1000,29969=>1000,29970=>1000,29971=>1000,29972=>1000,
-	29973=>1000,29974=>1000,29975=>1000,29976=>1000,29977=>1000,29978=>1000,29979=>1000,29980=>1000,29981=>1000,29982=>1000,29983=>1000,29984=>1000,29985=>1000,29986=>1000,29987=>1000,29988=>1000,
-	29989=>1000,29990=>1000,29991=>1000,29992=>1000,29993=>1000,29994=>1000,29995=>1000,29996=>1000,29997=>1000,29998=>1000,29999=>1000,30000=>1000,30001=>1000,30002=>1000,30003=>1000,30004=>1000,
-	30005=>1000,30006=>1000,30007=>1000,30008=>1000,30009=>1000,30010=>1000,30011=>1000,30012=>1000,30013=>1000,30014=>1000,30015=>1000,30016=>1000,30017=>1000,30018=>1000,30019=>1000,30020=>1000,
-	30021=>1000,30022=>1000,30023=>1000,30024=>1000,30025=>1000,30026=>1000,30027=>1000,30028=>1000,30029=>1000,30030=>1000,30031=>1000,30032=>1000,30033=>1000,30034=>1000,30035=>1000,30036=>1000,
-	30037=>1000,30038=>1000,30039=>1000,30040=>1000,30041=>1000,30042=>1000,30043=>1000,30044=>1000,30045=>1000,30046=>1000,30047=>1000,30048=>1000,30049=>1000,30050=>1000,30051=>1000,30052=>1000,
-	30053=>1000,30054=>1000,30055=>1000,30056=>1000,30057=>1000,30058=>1000,30059=>1000,30060=>1000,30061=>1000,30062=>1000,30063=>1000,30064=>1000,30065=>1000,30066=>1000,30067=>1000,30068=>1000,
-	30069=>1000,30070=>1000,30071=>1000,30072=>1000,30073=>1000,30074=>1000,30075=>1000,30076=>1000,30077=>1000,30078=>1000,30079=>1000,30080=>1000,30081=>1000,30082=>1000,30083=>1000,30084=>1000,
-	30085=>1000,30086=>1000,30087=>1000,30088=>1000,30089=>1000,30090=>1000,30091=>1000,30092=>1000,30093=>1000,30094=>1000,30095=>1000,30096=>1000,30097=>1000,30098=>1000,30099=>1000,30100=>1000,
-	30101=>1000,30102=>1000,30103=>1000,30104=>1000,30105=>1000,30106=>1000,30107=>1000,30108=>1000,30109=>1000,30110=>1000,30111=>1000,30112=>1000,30113=>1000,30114=>1000,30115=>1000,30116=>1000,
-	30117=>1000,30118=>1000,30119=>1000,30120=>1000,30121=>1000,30122=>1000,30123=>1000,30124=>1000,30125=>1000,30126=>1000,30127=>1000,30128=>1000,30129=>1000,30130=>1000,30131=>1000,30132=>1000,
-	30133=>1000,30134=>1000,30135=>1000,30136=>1000,30137=>1000,30138=>1000,30139=>1000,30140=>1000,30141=>1000,30142=>1000,30143=>1000,30144=>1000,30145=>1000,30146=>1000,30147=>1000,30148=>1000,
-	30149=>1000,30150=>1000,30151=>1000,30152=>1000,30153=>1000,30154=>1000,30155=>1000,30156=>1000,30157=>1000,30158=>1000,30159=>1000,30160=>1000,30161=>1000,30162=>1000,30163=>1000,30164=>1000,
-	30165=>1000,30166=>1000,30167=>1000,30168=>1000,30169=>1000,30170=>1000,30171=>1000,30172=>1000,30173=>1000,30174=>1000,30175=>1000,30176=>1000,30177=>1000,30178=>1000,30179=>1000,30180=>1000,
-	30181=>1000,30182=>1000,30183=>1000,30184=>1000,30185=>1000,30186=>1000,30187=>1000,30188=>1000,30189=>1000,30190=>1000,30191=>1000,30192=>1000,30193=>1000,30194=>1000,30195=>1000,30196=>1000,
-	30197=>1000,30198=>1000,30199=>1000,30200=>1000,30201=>1000,30202=>1000,30203=>1000,30204=>1000,30205=>1000,30206=>1000,30207=>1000,30208=>1000,30209=>1000,30210=>1000,30211=>1000,30212=>1000,
-	30213=>1000,30214=>1000,30215=>1000,30216=>1000,30217=>1000,30218=>1000,30219=>1000,30220=>1000,30221=>1000,30222=>1000,30223=>1000,30224=>1000,30225=>1000,30226=>1000,30227=>1000,30228=>1000,
-	30229=>1000,30230=>1000,30231=>1000,30232=>1000,30233=>1000,30234=>1000,30235=>1000,30236=>1000,30237=>1000,30238=>1000,30239=>1000,30240=>1000,30241=>1000,30242=>1000,30243=>1000,30244=>1000,
-	30245=>1000,30246=>1000,30247=>1000,30248=>1000,30249=>1000,30250=>1000,30251=>1000,30252=>1000,30253=>1000,30254=>1000,30255=>1000,30256=>1000,30257=>1000,30258=>1000,30259=>1000,30260=>1000,
-	30261=>1000,30262=>1000,30263=>1000,30264=>1000,30265=>1000,30266=>1000,30267=>1000,30268=>1000,30269=>1000,30270=>1000,30271=>1000,30272=>1000,30273=>1000,30274=>1000,30275=>1000,30276=>1000,
-	30277=>1000,30278=>1000,30279=>1000,30280=>1000,30281=>1000,30282=>1000,30283=>1000,30284=>1000,30285=>1000,30286=>1000,30287=>1000,30288=>1000,30289=>1000,30290=>1000,30291=>1000,30292=>1000,
-	30293=>1000,30294=>1000,30295=>1000,30296=>1000,30297=>1000,30298=>1000,30299=>1000,30300=>1000,30301=>1000,30302=>1000,30303=>1000,30304=>1000,30305=>1000,30306=>1000,30307=>1000,30308=>1000,
-	30309=>1000,30310=>1000,30311=>1000,30312=>1000,30313=>1000,30314=>1000,30315=>1000,30316=>1000,30317=>1000,30318=>1000,30319=>1000,30320=>1000,30321=>1000,30322=>1000,30323=>1000,30324=>1000,
-	30325=>1000,30326=>1000,30327=>1000,30328=>1000,30329=>1000,30330=>1000,30331=>1000,30332=>1000,30333=>1000,30334=>1000,30335=>1000,30336=>1000,30337=>1000,30338=>1000,30339=>1000,30340=>1000,
-	30341=>1000,30342=>1000,30343=>1000,30344=>1000,30345=>1000,30346=>1000,30347=>1000,30348=>1000,30349=>1000,30350=>1000,30351=>1000,30352=>1000,30353=>1000,30354=>1000,30355=>1000,30356=>1000,
-	30357=>1000,30358=>1000,30359=>1000,30360=>1000,30361=>1000,30362=>1000,30363=>1000,30364=>1000,30365=>1000,30366=>1000,30367=>1000,30368=>1000,30369=>1000,30370=>1000,30371=>1000,30372=>1000,
-	30373=>1000,30374=>1000,30375=>1000,30376=>1000,30377=>1000,30378=>1000,30379=>1000,30380=>1000,30381=>1000,30382=>1000,30383=>1000,30384=>1000,30385=>1000,30386=>1000,30387=>1000,30388=>1000,
-	30389=>1000,30390=>1000,30391=>1000,30392=>1000,30393=>1000,30394=>1000,30395=>1000,30396=>1000,30397=>1000,30398=>1000,30399=>1000,30400=>1000,30401=>1000,30402=>1000,30403=>1000,30404=>1000,
-	30405=>1000,30406=>1000,30407=>1000,30408=>1000,30409=>1000,30410=>1000,30411=>1000,30412=>1000,30413=>1000,30414=>1000,30415=>1000,30416=>1000,30417=>1000,30418=>1000,30419=>1000,30420=>1000,
-	30421=>1000,30422=>1000,30423=>1000,30424=>1000,30425=>1000,30426=>1000,30427=>1000,30428=>1000,30429=>1000,30430=>1000,30431=>1000,30432=>1000,30433=>1000,30434=>1000,30435=>1000,30436=>1000,
-	30437=>1000,30438=>1000,30439=>1000,30440=>1000,30441=>1000,30442=>1000,30443=>1000,30444=>1000,30445=>1000,30446=>1000,30447=>1000,30448=>1000,30449=>1000,30450=>1000,30451=>1000,30452=>1000,
-	30453=>1000,30454=>1000,30455=>1000,30456=>1000,30457=>1000,30458=>1000,30459=>1000,30460=>1000,30461=>1000,30462=>1000,30463=>1000,30464=>1000,30465=>1000,30466=>1000,30467=>1000,30468=>1000,
-	30469=>1000,30470=>1000,30471=>1000,30472=>1000,30473=>1000,30474=>1000,30475=>1000,30476=>1000,30477=>1000,30478=>1000,30479=>1000,30480=>1000,30481=>1000,30482=>1000,30483=>1000,30484=>1000,
-	30485=>1000,30486=>1000,30487=>1000,30488=>1000,30489=>1000,30490=>1000,30491=>1000,30492=>1000,30493=>1000,30494=>1000,30495=>1000,30496=>1000,30497=>1000,30498=>1000,30499=>1000,30500=>1000,
-	30501=>1000,30502=>1000,30503=>1000,30504=>1000,30505=>1000,30506=>1000,30507=>1000,30508=>1000,30509=>1000,30510=>1000,30511=>1000,30512=>1000,30513=>1000,30514=>1000,30515=>1000,30516=>1000,
-	30517=>1000,30518=>1000,30519=>1000,30520=>1000,30521=>1000,30522=>1000,30523=>1000,30524=>1000,30525=>1000,30526=>1000,30527=>1000,30528=>1000,30529=>1000,30530=>1000,30531=>1000,30532=>1000,
-	30533=>1000,30534=>1000,30535=>1000,30536=>1000,30537=>1000,30538=>1000,30539=>1000,30540=>1000,30541=>1000,30542=>1000,30543=>1000,30544=>1000,30545=>1000,30546=>1000,30547=>1000,30548=>1000,
-	30549=>1000,30550=>1000,30551=>1000,30552=>1000,30553=>1000,30554=>1000,30555=>1000,30556=>1000,30557=>1000,30558=>1000,30559=>1000,30560=>1000,30561=>1000,30562=>1000,30563=>1000,30564=>1000,
-	30565=>1000,30566=>1000,30567=>1000,30568=>1000,30569=>1000,30570=>1000,30571=>1000,30572=>1000,30573=>1000,30574=>1000,30575=>1000,30576=>1000,30577=>1000,30578=>1000,30579=>1000,30580=>1000,
-	30581=>1000,30582=>1000,30583=>1000,30584=>1000,30585=>1000,30586=>1000,30587=>1000,30588=>1000,30589=>1000,30590=>1000,30591=>1000,30592=>1000,30593=>1000,30594=>1000,30595=>1000,30596=>1000,
-	30597=>1000,30598=>1000,30599=>1000,30600=>1000,30601=>1000,30602=>1000,30603=>1000,30604=>1000,30605=>1000,30606=>1000,30607=>1000,30608=>1000,30609=>1000,30610=>1000,30611=>1000,30612=>1000,
-	30613=>1000,30614=>1000,30615=>1000,30616=>1000,30617=>1000,30618=>1000,30619=>1000,30620=>1000,30621=>1000,30622=>1000,30623=>1000,30624=>1000,30625=>1000,30626=>1000,30627=>1000,30628=>1000,
-	30629=>1000,30630=>1000,30631=>1000,30632=>1000,30633=>1000,30634=>1000,30635=>1000,30636=>1000,30637=>1000,30638=>1000,30639=>1000,30640=>1000,30641=>1000,30642=>1000,30643=>1000,30644=>1000,
-	30645=>1000,30646=>1000,30647=>1000,30648=>1000,30649=>1000,30650=>1000,30651=>1000,30652=>1000,30653=>1000,30654=>1000,30655=>1000,30656=>1000,30657=>1000,30658=>1000,30659=>1000,30660=>1000,
-	30661=>1000,30662=>1000,30663=>1000,30664=>1000,30665=>1000,30666=>1000,30667=>1000,30668=>1000,30669=>1000,30670=>1000,30671=>1000,30672=>1000,30673=>1000,30674=>1000,30675=>1000,30676=>1000,
-	30677=>1000,30678=>1000,30679=>1000,30680=>1000,30681=>1000,30682=>1000,30683=>1000,30684=>1000,30685=>1000,30686=>1000,30687=>1000,30688=>1000,30689=>1000,30690=>1000,30691=>1000,30692=>1000,
-	30693=>1000,30694=>1000,30695=>1000,30696=>1000,30697=>1000,30698=>1000,30699=>1000,30700=>1000,30701=>1000,30702=>1000,30703=>1000,30704=>1000,30705=>1000,30706=>1000,30707=>1000,30708=>1000,
-	30709=>1000,30710=>1000,30711=>1000,30712=>1000,30713=>1000,30714=>1000,30715=>1000,30716=>1000,30717=>1000,30718=>1000,30719=>1000,30720=>1000,30721=>1000,30722=>1000,30723=>1000,30724=>1000,
-	30725=>1000,30726=>1000,30727=>1000,30728=>1000,30729=>1000,30730=>1000,30731=>1000,30732=>1000,30733=>1000,30734=>1000,30735=>1000,30736=>1000,30737=>1000,30738=>1000,30739=>1000,30740=>1000,
-	30741=>1000,30742=>1000,30743=>1000,30744=>1000,30745=>1000,30746=>1000,30747=>1000,30748=>1000,30749=>1000,30750=>1000,30751=>1000,30752=>1000,30753=>1000,30754=>1000,30755=>1000,30756=>1000,
-	30757=>1000,30758=>1000,30759=>1000,30760=>1000,30761=>1000,30762=>1000,30763=>1000,30764=>1000,30765=>1000,30766=>1000,30767=>1000,30768=>1000,30769=>1000,30770=>1000,30771=>1000,30772=>1000,
-	30773=>1000,30774=>1000,30775=>1000,30776=>1000,30777=>1000,30778=>1000,30779=>1000,30780=>1000,30781=>1000,30782=>1000,30783=>1000,30784=>1000,30785=>1000,30786=>1000,30787=>1000,30788=>1000,
-	30789=>1000,30790=>1000,30791=>1000,30792=>1000,30793=>1000,30794=>1000,30795=>1000,30796=>1000,30797=>1000,30798=>1000,30799=>1000,30800=>1000,30801=>1000,30802=>1000,30803=>1000,30804=>1000,
-	30805=>1000,30806=>1000,30807=>1000,30808=>1000,30809=>1000,30810=>1000,30811=>1000,30812=>1000,30813=>1000,30814=>1000,30815=>1000,30816=>1000,30817=>1000,30818=>1000,30819=>1000,30820=>1000,
-	30821=>1000,30822=>1000,30823=>1000,30824=>1000,30825=>1000,30826=>1000,30827=>1000,30828=>1000,30829=>1000,30830=>1000,30831=>1000,30832=>1000,30833=>1000,30834=>1000,30835=>1000,30836=>1000,
-	30837=>1000,30838=>1000,30839=>1000,30840=>1000,30841=>1000,30842=>1000,30843=>1000,30844=>1000,30845=>1000,30846=>1000,30847=>1000,30848=>1000,30849=>1000,30850=>1000,30851=>1000,30852=>1000,
-	30853=>1000,30854=>1000,30855=>1000,30856=>1000,30857=>1000,30858=>1000,30859=>1000,30860=>1000,30861=>1000,30862=>1000,30863=>1000,30864=>1000,30865=>1000,30866=>1000,30867=>1000,30868=>1000,
-	30869=>1000,30870=>1000,30871=>1000,30872=>1000,30873=>1000,30874=>1000,30875=>1000,30876=>1000,30877=>1000,30878=>1000,30879=>1000,30880=>1000,30881=>1000,30882=>1000,30883=>1000,30884=>1000,
-	30885=>1000,30886=>1000,30887=>1000,30888=>1000,30889=>1000,30890=>1000,30891=>1000,30892=>1000,30893=>1000,30894=>1000,30895=>1000,30896=>1000,30897=>1000,30898=>1000,30899=>1000,30900=>1000,
-	30901=>1000,30902=>1000,30903=>1000,30904=>1000,30905=>1000,30906=>1000,30907=>1000,30908=>1000,30909=>1000,30910=>1000,30911=>1000,30912=>1000,30913=>1000,30914=>1000,30915=>1000,30916=>1000,
-	30917=>1000,30918=>1000,30919=>1000,30920=>1000,30921=>1000,30922=>1000,30923=>1000,30924=>1000,30925=>1000,30926=>1000,30927=>1000,30928=>1000,30929=>1000,30930=>1000,30931=>1000,30932=>1000,
-	30933=>1000,30934=>1000,30935=>1000,30936=>1000,30937=>1000,30938=>1000,30939=>1000,30940=>1000,30941=>1000,30942=>1000,30943=>1000,30944=>1000,30945=>1000,30946=>1000,30947=>1000,30948=>1000,
-	30949=>1000,30950=>1000,30951=>1000,30952=>1000,30953=>1000,30954=>1000,30955=>1000,30956=>1000,30957=>1000,30958=>1000,30959=>1000,30960=>1000,30961=>1000,30962=>1000,30963=>1000,30964=>1000,
-	30965=>1000,30966=>1000,30967=>1000,30968=>1000,30969=>1000,30970=>1000,30971=>1000,30972=>1000,30973=>1000,30974=>1000,30975=>1000,30976=>1000,30977=>1000,30978=>1000,30979=>1000,30980=>1000,
-	30981=>1000,30982=>1000,30983=>1000,30984=>1000,30985=>1000,30986=>1000,30987=>1000,30988=>1000,30989=>1000,30990=>1000,30991=>1000,30992=>1000,30993=>1000,30994=>1000,30995=>1000,30996=>1000,
-	30997=>1000,30998=>1000,30999=>1000,31000=>1000,31001=>1000,31002=>1000,31003=>1000,31004=>1000,31005=>1000,31006=>1000,31007=>1000,31008=>1000,31009=>1000,31010=>1000,31011=>1000,31012=>1000,
-	31013=>1000,31014=>1000,31015=>1000,31016=>1000,31017=>1000,31018=>1000,31019=>1000,31020=>1000,31021=>1000,31022=>1000,31023=>1000,31024=>1000,31025=>1000,31026=>1000,31027=>1000,31028=>1000,
-	31029=>1000,31030=>1000,31031=>1000,31032=>1000,31033=>1000,31034=>1000,31035=>1000,31036=>1000,31037=>1000,31038=>1000,31039=>1000,31040=>1000,31041=>1000,31042=>1000,31043=>1000,31044=>1000,
-	31045=>1000,31046=>1000,31047=>1000,31048=>1000,31049=>1000,31050=>1000,31051=>1000,31052=>1000,31053=>1000,31054=>1000,31055=>1000,31056=>1000,31057=>1000,31058=>1000,31059=>1000,31060=>1000,
-	31061=>1000,31062=>1000,31063=>1000,31064=>1000,31065=>1000,31066=>1000,31067=>1000,31068=>1000,31069=>1000,31070=>1000,31071=>1000,31072=>1000,31073=>1000,31074=>1000,31075=>1000,31076=>1000,
-	31077=>1000,31078=>1000,31079=>1000,31080=>1000,31081=>1000,31082=>1000,31083=>1000,31084=>1000,31085=>1000,31086=>1000,31087=>1000,31088=>1000,31089=>1000,31090=>1000,31091=>1000,31092=>1000,
-	31093=>1000,31094=>1000,31095=>1000,31096=>1000,31097=>1000,31098=>1000,31099=>1000,31100=>1000,31101=>1000,31102=>1000,31103=>1000,31104=>1000,31105=>1000,31106=>1000,31107=>1000,31108=>1000,
-	31109=>1000,31110=>1000,31111=>1000,31112=>1000,31113=>1000,31114=>1000,31115=>1000,31116=>1000,31117=>1000,31118=>1000,31119=>1000,31120=>1000,31121=>1000,31122=>1000,31123=>1000,31124=>1000,
-	31125=>1000,31126=>1000,31127=>1000,31128=>1000,31129=>1000,31130=>1000,31131=>1000,31132=>1000,31133=>1000,31134=>1000,31135=>1000,31136=>1000,31137=>1000,31138=>1000,31139=>1000,31140=>1000,
-	31141=>1000,31142=>1000,31143=>1000,31144=>1000,31145=>1000,31146=>1000,31147=>1000,31148=>1000,31149=>1000,31150=>1000,31151=>1000,31152=>1000,31153=>1000,31154=>1000,31155=>1000,31156=>1000,
-	31157=>1000,31158=>1000,31159=>1000,31160=>1000,31161=>1000,31162=>1000,31163=>1000,31164=>1000,31165=>1000,31166=>1000,31167=>1000,31168=>1000,31169=>1000,31170=>1000,31171=>1000,31172=>1000,
-	31173=>1000,31174=>1000,31175=>1000,31176=>1000,31177=>1000,31178=>1000,31179=>1000,31180=>1000,31181=>1000,31182=>1000,31183=>1000,31184=>1000,31185=>1000,31186=>1000,31187=>1000,31188=>1000,
-	31189=>1000,31190=>1000,31191=>1000,31192=>1000,31193=>1000,31194=>1000,31195=>1000,31196=>1000,31197=>1000,31198=>1000,31199=>1000,31200=>1000,31201=>1000,31202=>1000,31203=>1000,31204=>1000,
-	31205=>1000,31206=>1000,31207=>1000,31208=>1000,31209=>1000,31210=>1000,31211=>1000,31212=>1000,31213=>1000,31214=>1000,31215=>1000,31216=>1000,31217=>1000,31218=>1000,31219=>1000,31220=>1000,
-	31221=>1000,31222=>1000,31223=>1000,31224=>1000,31225=>1000,31226=>1000,31227=>1000,31228=>1000,31229=>1000,31230=>1000,31231=>1000,31232=>1000,31233=>1000,31234=>1000,31235=>1000,31236=>1000,
-	31237=>1000,31238=>1000,31239=>1000,31240=>1000,31241=>1000,31242=>1000,31243=>1000,31244=>1000,31245=>1000,31246=>1000,31247=>1000,31248=>1000,31249=>1000,31250=>1000,31251=>1000,31252=>1000,
-	31253=>1000,31254=>1000,31255=>1000,31256=>1000,31257=>1000,31258=>1000,31259=>1000,31260=>1000,31261=>1000,31262=>1000,31263=>1000,31264=>1000,31265=>1000,31266=>1000,31267=>1000,31268=>1000,
-	31269=>1000,31270=>1000,31271=>1000,31272=>1000,31273=>1000,31274=>1000,31275=>1000,31276=>1000,31277=>1000,31278=>1000,31279=>1000,31280=>1000,31281=>1000,31282=>1000,31283=>1000,31284=>1000,
-	31285=>1000,31286=>1000,31287=>1000,31288=>1000,31289=>1000,31290=>1000,31291=>1000,31292=>1000,31293=>1000,31294=>1000,31295=>1000,31296=>1000,31297=>1000,31298=>1000,31299=>1000,31300=>1000,
-	31301=>1000,31302=>1000,31303=>1000,31304=>1000,31305=>1000,31306=>1000,31307=>1000,31308=>1000,31309=>1000,31310=>1000,31311=>1000,31312=>1000,31313=>1000,31314=>1000,31315=>1000,31316=>1000,
-	31317=>1000,31318=>1000,31319=>1000,31320=>1000,31321=>1000,31322=>1000,31323=>1000,31324=>1000,31325=>1000,31326=>1000,31327=>1000,31328=>1000,31329=>1000,31330=>1000,31331=>1000,31332=>1000,
-	31333=>1000,31334=>1000,31335=>1000,31336=>1000,31337=>1000,31338=>1000,31339=>1000,31340=>1000,31341=>1000,31342=>1000,31343=>1000,31344=>1000,31345=>1000,31346=>1000,31347=>1000,31348=>1000,
-	31349=>1000,31350=>1000,31351=>1000,31352=>1000,31353=>1000,31354=>1000,31355=>1000,31356=>1000,31357=>1000,31358=>1000,31359=>1000,31360=>1000,31361=>1000,31362=>1000,31363=>1000,31364=>1000,
-	31365=>1000,31366=>1000,31367=>1000,31368=>1000,31369=>1000,31370=>1000,31371=>1000,31372=>1000,31373=>1000,31374=>1000,31375=>1000,31376=>1000,31377=>1000,31378=>1000,31379=>1000,31380=>1000,
-	31381=>1000,31382=>1000,31383=>1000,31384=>1000,31385=>1000,31386=>1000,31387=>1000,31388=>1000,31389=>1000,31390=>1000,31391=>1000,31392=>1000,31393=>1000,31394=>1000,31395=>1000,31396=>1000,
-	31397=>1000,31398=>1000,31399=>1000,31400=>1000,31401=>1000,31402=>1000,31403=>1000,31404=>1000,31405=>1000,31406=>1000,31407=>1000,31408=>1000,31409=>1000,31410=>1000,31411=>1000,31412=>1000,
-	31413=>1000,31414=>1000,31415=>1000,31416=>1000,31417=>1000,31418=>1000,31419=>1000,31420=>1000,31421=>1000,31422=>1000,31423=>1000,31424=>1000,31425=>1000,31426=>1000,31427=>1000,31428=>1000,
-	31429=>1000,31430=>1000,31431=>1000,31432=>1000,31433=>1000,31434=>1000,31435=>1000,31436=>1000,31437=>1000,31438=>1000,31439=>1000,31440=>1000,31441=>1000,31442=>1000,31443=>1000,31444=>1000,
-	31445=>1000,31446=>1000,31447=>1000,31448=>1000,31449=>1000,31450=>1000,31451=>1000,31452=>1000,31453=>1000,31454=>1000,31455=>1000,31456=>1000,31457=>1000,31458=>1000,31459=>1000,31460=>1000,
-	31461=>1000,31462=>1000,31463=>1000,31464=>1000,31465=>1000,31466=>1000,31467=>1000,31468=>1000,31469=>1000,31470=>1000,31471=>1000,31472=>1000,31473=>1000,31474=>1000,31475=>1000,31476=>1000,
-	31477=>1000,31478=>1000,31479=>1000,31480=>1000,31481=>1000,31482=>1000,31483=>1000,31484=>1000,31485=>1000,31486=>1000,31487=>1000,31488=>1000,31489=>1000,31490=>1000,31491=>1000,31492=>1000,
-	31493=>1000,31494=>1000,31495=>1000,31496=>1000,31497=>1000,31498=>1000,31499=>1000,31500=>1000,31501=>1000,31502=>1000,31503=>1000,31504=>1000,31505=>1000,31506=>1000,31507=>1000,31508=>1000,
-	31509=>1000,31510=>1000,31511=>1000,31512=>1000,31513=>1000,31514=>1000,31515=>1000,31516=>1000,31517=>1000,31518=>1000,31519=>1000,31520=>1000,31521=>1000,31522=>1000,31523=>1000,31524=>1000,
-	31525=>1000,31526=>1000,31527=>1000,31528=>1000,31529=>1000,31530=>1000,31531=>1000,31532=>1000,31533=>1000,31534=>1000,31535=>1000,31536=>1000,31537=>1000,31538=>1000,31539=>1000,31540=>1000,
-	31541=>1000,31542=>1000,31543=>1000,31544=>1000,31545=>1000,31546=>1000,31547=>1000,31548=>1000,31549=>1000,31550=>1000,31551=>1000,31552=>1000,31553=>1000,31554=>1000,31555=>1000,31556=>1000,
-	31557=>1000,31558=>1000,31559=>1000,31560=>1000,31561=>1000,31562=>1000,31563=>1000,31564=>1000,31565=>1000,31566=>1000,31567=>1000,31568=>1000,31569=>1000,31570=>1000,31571=>1000,31572=>1000,
-	31573=>1000,31574=>1000,31575=>1000,31576=>1000,31577=>1000,31578=>1000,31579=>1000,31580=>1000,31581=>1000,31582=>1000,31583=>1000,31584=>1000,31585=>1000,31586=>1000,31587=>1000,31588=>1000,
-	31589=>1000,31590=>1000,31591=>1000,31592=>1000,31593=>1000,31594=>1000,31595=>1000,31596=>1000,31597=>1000,31598=>1000,31599=>1000,31600=>1000,31601=>1000,31602=>1000,31603=>1000,31604=>1000,
-	31605=>1000,31606=>1000,31607=>1000,31608=>1000,31609=>1000,31610=>1000,31611=>1000,31612=>1000,31613=>1000,31614=>1000,31615=>1000,31616=>1000,31617=>1000,31618=>1000,31619=>1000,31620=>1000,
-	31621=>1000,31622=>1000,31623=>1000,31624=>1000,31625=>1000,31626=>1000,31627=>1000,31628=>1000,31629=>1000,31630=>1000,31631=>1000,31632=>1000,31633=>1000,31634=>1000,31635=>1000,31636=>1000,
-	31637=>1000,31638=>1000,31639=>1000,31640=>1000,31641=>1000,31642=>1000,31643=>1000,31644=>1000,31645=>1000,31646=>1000,31647=>1000,31648=>1000,31649=>1000,31650=>1000,31651=>1000,31652=>1000,
-	31653=>1000,31654=>1000,31655=>1000,31656=>1000,31657=>1000,31658=>1000,31659=>1000,31660=>1000,31661=>1000,31662=>1000,31663=>1000,31664=>1000,31665=>1000,31666=>1000,31667=>1000,31668=>1000,
-	31669=>1000,31670=>1000,31671=>1000,31672=>1000,31673=>1000,31674=>1000,31675=>1000,31676=>1000,31677=>1000,31678=>1000,31679=>1000,31680=>1000,31681=>1000,31682=>1000,31683=>1000,31684=>1000,
-	31685=>1000,31686=>1000,31687=>1000,31688=>1000,31689=>1000,31690=>1000,31691=>1000,31692=>1000,31693=>1000,31694=>1000,31695=>1000,31696=>1000,31697=>1000,31698=>1000,31699=>1000,31700=>1000,
-	31701=>1000,31702=>1000,31703=>1000,31704=>1000,31705=>1000,31706=>1000,31707=>1000,31708=>1000,31709=>1000,31710=>1000,31711=>1000,31712=>1000,31713=>1000,31714=>1000,31715=>1000,31716=>1000,
-	31717=>1000,31718=>1000,31719=>1000,31720=>1000,31721=>1000,31722=>1000,31723=>1000,31724=>1000,31725=>1000,31726=>1000,31727=>1000,31728=>1000,31729=>1000,31730=>1000,31731=>1000,31732=>1000,
-	31733=>1000,31734=>1000,31735=>1000,31736=>1000,31737=>1000,31738=>1000,31739=>1000,31740=>1000,31741=>1000,31742=>1000,31743=>1000,31744=>1000,31745=>1000,31746=>1000,31747=>1000,31748=>1000,
-	31749=>1000,31750=>1000,31751=>1000,31752=>1000,31753=>1000,31754=>1000,31755=>1000,31756=>1000,31757=>1000,31758=>1000,31759=>1000,31760=>1000,31761=>1000,31762=>1000,31763=>1000,31764=>1000,
-	31765=>1000,31766=>1000,31767=>1000,31768=>1000,31769=>1000,31770=>1000,31771=>1000,31772=>1000,31773=>1000,31774=>1000,31775=>1000,31776=>1000,31777=>1000,31778=>1000,31779=>1000,31780=>1000,
-	31781=>1000,31782=>1000,31783=>1000,31784=>1000,31785=>1000,31786=>1000,31787=>1000,31788=>1000,31789=>1000,31790=>1000,31791=>1000,31792=>1000,31793=>1000,31794=>1000,31795=>1000,31796=>1000,
-	31797=>1000,31798=>1000,31799=>1000,31800=>1000,31801=>1000,31802=>1000,31803=>1000,31804=>1000,31805=>1000,31806=>1000,31807=>1000,31808=>1000,31809=>1000,31810=>1000,31811=>1000,31812=>1000,
-	31813=>1000,31814=>1000,31815=>1000,31816=>1000,31817=>1000,31818=>1000,31819=>1000,31820=>1000,31821=>1000,31822=>1000,31823=>1000,31824=>1000,31825=>1000,31826=>1000,31827=>1000,31828=>1000,
-	31829=>1000,31830=>1000,31831=>1000,31832=>1000,31833=>1000,31834=>1000,31835=>1000,31836=>1000,31837=>1000,31838=>1000,31839=>1000,31840=>1000,31841=>1000,31842=>1000,31843=>1000,31844=>1000,
-	31845=>1000,31846=>1000,31847=>1000,31848=>1000,31849=>1000,31850=>1000,31851=>1000,31852=>1000,31853=>1000,31854=>1000,31855=>1000,31856=>1000,31857=>1000,31858=>1000,31859=>1000,31860=>1000,
-	31861=>1000,31862=>1000,31863=>1000,31864=>1000,31865=>1000,31866=>1000,31867=>1000,31868=>1000,31869=>1000,31870=>1000,31871=>1000,31872=>1000,31873=>1000,31874=>1000,31875=>1000,31876=>1000,
-	31877=>1000,31878=>1000,31879=>1000,31880=>1000,31881=>1000,31882=>1000,31883=>1000,31884=>1000,31885=>1000,31886=>1000,31887=>1000,31888=>1000,31889=>1000,31890=>1000,31891=>1000,31892=>1000,
-	31893=>1000,31894=>1000,31895=>1000,31896=>1000,31897=>1000,31898=>1000,31899=>1000,31900=>1000,31901=>1000,31902=>1000,31903=>1000,31904=>1000,31905=>1000,31906=>1000,31907=>1000,31908=>1000,
-	31909=>1000,31910=>1000,31911=>1000,31912=>1000,31913=>1000,31914=>1000,31915=>1000,31916=>1000,31917=>1000,31918=>1000,31919=>1000,31920=>1000,31921=>1000,31922=>1000,31923=>1000,31924=>1000,
-	31925=>1000,31926=>1000,31927=>1000,31928=>1000,31929=>1000,31930=>1000,31931=>1000,31932=>1000,31933=>1000,31934=>1000,31935=>1000,31936=>1000,31937=>1000,31938=>1000,31939=>1000,31940=>1000,
-	31941=>1000,31942=>1000,31943=>1000,31944=>1000,31945=>1000,31946=>1000,31947=>1000,31948=>1000,31949=>1000,31950=>1000,31951=>1000,31952=>1000,31953=>1000,31954=>1000,31955=>1000,31956=>1000,
-	31957=>1000,31958=>1000,31959=>1000,31960=>1000,31961=>1000,31962=>1000,31963=>1000,31964=>1000,31965=>1000,31966=>1000,31967=>1000,31968=>1000,31969=>1000,31970=>1000,31971=>1000,31972=>1000,
-	31973=>1000,31974=>1000,31975=>1000,31976=>1000,31977=>1000,31978=>1000,31979=>1000,31980=>1000,31981=>1000,31982=>1000,31983=>1000,31984=>1000,31985=>1000,31986=>1000,31987=>1000,31988=>1000,
-	31989=>1000,31990=>1000,31991=>1000,31992=>1000,31993=>1000,31994=>1000,31995=>1000,31996=>1000,31997=>1000,31998=>1000,31999=>1000,32000=>1000,32001=>1000,32002=>1000,32003=>1000,32004=>1000,
-	32005=>1000,32006=>1000,32007=>1000,32008=>1000,32009=>1000,32010=>1000,32011=>1000,32012=>1000,32013=>1000,32014=>1000,32015=>1000,32016=>1000,32017=>1000,32018=>1000,32019=>1000,32020=>1000,
-	32021=>1000,32022=>1000,32023=>1000,32024=>1000,32025=>1000,32026=>1000,32027=>1000,32028=>1000,32029=>1000,32030=>1000,32031=>1000,32032=>1000,32033=>1000,32034=>1000,32035=>1000,32036=>1000,
-	32037=>1000,32038=>1000,32039=>1000,32040=>1000,32041=>1000,32042=>1000,32043=>1000,32044=>1000,32045=>1000,32046=>1000,32047=>1000,32048=>1000,32049=>1000,32050=>1000,32051=>1000,32052=>1000,
-	32053=>1000,32054=>1000,32055=>1000,32056=>1000,32057=>1000,32058=>1000,32059=>1000,32060=>1000,32061=>1000,32062=>1000,32063=>1000,32064=>1000,32065=>1000,32066=>1000,32067=>1000,32068=>1000,
-	32069=>1000,32070=>1000,32071=>1000,32072=>1000,32073=>1000,32074=>1000,32075=>1000,32076=>1000,32077=>1000,32078=>1000,32079=>1000,32080=>1000,32081=>1000,32082=>1000,32083=>1000,32084=>1000,
-	32085=>1000,32086=>1000,32087=>1000,32088=>1000,32089=>1000,32090=>1000,32091=>1000,32092=>1000,32093=>1000,32094=>1000,32095=>1000,32096=>1000,32097=>1000,32098=>1000,32099=>1000,32100=>1000,
-	32101=>1000,32102=>1000,32103=>1000,32104=>1000,32105=>1000,32106=>1000,32107=>1000,32108=>1000,32109=>1000,32110=>1000,32111=>1000,32112=>1000,32113=>1000,32114=>1000,32115=>1000,32116=>1000,
-	32117=>1000,32118=>1000,32119=>1000,32120=>1000,32121=>1000,32122=>1000,32123=>1000,32124=>1000,32125=>1000,32126=>1000,32127=>1000,32128=>1000,32129=>1000,32130=>1000,32131=>1000,32132=>1000,
-	32133=>1000,32134=>1000,32135=>1000,32136=>1000,32137=>1000,32138=>1000,32139=>1000,32140=>1000,32141=>1000,32142=>1000,32143=>1000,32144=>1000,32145=>1000,32146=>1000,32147=>1000,32148=>1000,
-	32149=>1000,32150=>1000,32151=>1000,32152=>1000,32153=>1000,32154=>1000,32155=>1000,32156=>1000,32157=>1000,32158=>1000,32159=>1000,32160=>1000,32161=>1000,32162=>1000,32163=>1000,32164=>1000,
-	32165=>1000,32166=>1000,32167=>1000,32168=>1000,32169=>1000,32170=>1000,32171=>1000,32172=>1000,32173=>1000,32174=>1000,32175=>1000,32176=>1000,32177=>1000,32178=>1000,32179=>1000,32180=>1000,
-	32181=>1000,32182=>1000,32183=>1000,32184=>1000,32185=>1000,32186=>1000,32187=>1000,32188=>1000,32189=>1000,32190=>1000,32191=>1000,32192=>1000,32193=>1000,32194=>1000,32195=>1000,32196=>1000,
-	32197=>1000,32198=>1000,32199=>1000,32200=>1000,32201=>1000,32202=>1000,32203=>1000,32204=>1000,32205=>1000,32206=>1000,32207=>1000,32208=>1000,32209=>1000,32210=>1000,32211=>1000,32212=>1000,
-	32213=>1000,32214=>1000,32215=>1000,32216=>1000,32217=>1000,32218=>1000,32219=>1000,32220=>1000,32221=>1000,32222=>1000,32223=>1000,32224=>1000,32225=>1000,32226=>1000,32227=>1000,32228=>1000,
-	32229=>1000,32230=>1000,32231=>1000,32232=>1000,32233=>1000,32234=>1000,32235=>1000,32236=>1000,32237=>1000,32238=>1000,32239=>1000,32240=>1000,32241=>1000,32242=>1000,32243=>1000,32244=>1000,
-	32245=>1000,32246=>1000,32247=>1000,32248=>1000,32249=>1000,32250=>1000,32251=>1000,32252=>1000,32253=>1000,32254=>1000,32255=>1000,32256=>1000,32257=>1000,32258=>1000,32259=>1000,32260=>1000,
-	32261=>1000,32262=>1000,32263=>1000,32264=>1000,32265=>1000,32266=>1000,32267=>1000,32268=>1000,32269=>1000,32270=>1000,32271=>1000,32272=>1000,32273=>1000,32274=>1000,32275=>1000,32276=>1000,
-	32277=>1000,32278=>1000,32279=>1000,32280=>1000,32281=>1000,32282=>1000,32283=>1000,32284=>1000,32285=>1000,32286=>1000,32287=>1000,32288=>1000,32289=>1000,32290=>1000,32291=>1000,32292=>1000,
-	32293=>1000,32294=>1000,32295=>1000,32296=>1000,32297=>1000,32298=>1000,32299=>1000,32300=>1000,32301=>1000,32302=>1000,32303=>1000,32304=>1000,32305=>1000,32306=>1000,32307=>1000,32308=>1000,
-	32309=>1000,32310=>1000,32311=>1000,32312=>1000,32313=>1000,32314=>1000,32315=>1000,32316=>1000,32317=>1000,32318=>1000,32319=>1000,32320=>1000,32321=>1000,32322=>1000,32323=>1000,32324=>1000,
-	32325=>1000,32326=>1000,32327=>1000,32328=>1000,32329=>1000,32330=>1000,32331=>1000,32332=>1000,32333=>1000,32334=>1000,32335=>1000,32336=>1000,32337=>1000,32338=>1000,32339=>1000,32340=>1000,
-	32341=>1000,32342=>1000,32343=>1000,32344=>1000,32345=>1000,32346=>1000,32347=>1000,32348=>1000,32349=>1000,32350=>1000,32351=>1000,32352=>1000,32353=>1000,32354=>1000,32355=>1000,32356=>1000,
-	32357=>1000,32358=>1000,32359=>1000,32360=>1000,32361=>1000,32362=>1000,32363=>1000,32364=>1000,32365=>1000,32366=>1000,32367=>1000,32368=>1000,32369=>1000,32370=>1000,32371=>1000,32372=>1000,
-	32373=>1000,32374=>1000,32375=>1000,32376=>1000,32377=>1000,32378=>1000,32379=>1000,32380=>1000,32381=>1000,32382=>1000,32383=>1000,32384=>1000,32385=>1000,32386=>1000,32387=>1000,32388=>1000,
-	32389=>1000,32390=>1000,32391=>1000,32392=>1000,32393=>1000,32394=>1000,32395=>1000,32396=>1000,32397=>1000,32398=>1000,32399=>1000,32400=>1000,32401=>1000,32402=>1000,32403=>1000,32404=>1000,
-	32405=>1000,32406=>1000,32407=>1000,32408=>1000,32409=>1000,32410=>1000,32411=>1000,32412=>1000,32413=>1000,32414=>1000,32415=>1000,32416=>1000,32417=>1000,32418=>1000,32419=>1000,32420=>1000,
-	32421=>1000,32422=>1000,32423=>1000,32424=>1000,32425=>1000,32426=>1000,32427=>1000,32428=>1000,32429=>1000,32430=>1000,32431=>1000,32432=>1000,32433=>1000,32434=>1000,32435=>1000,32436=>1000,
-	32437=>1000,32438=>1000,32439=>1000,32440=>1000,32441=>1000,32442=>1000,32443=>1000,32444=>1000,32445=>1000,32446=>1000,32447=>1000,32448=>1000,32449=>1000,32450=>1000,32451=>1000,32452=>1000,
-	32453=>1000,32454=>1000,32455=>1000,32456=>1000,32457=>1000,32458=>1000,32459=>1000,32460=>1000,32461=>1000,32462=>1000,32463=>1000,32464=>1000,32465=>1000,32466=>1000,32467=>1000,32468=>1000,
-	32469=>1000,32470=>1000,32471=>1000,32472=>1000,32473=>1000,32474=>1000,32475=>1000,32476=>1000,32477=>1000,32478=>1000,32479=>1000,32480=>1000,32481=>1000,32482=>1000,32483=>1000,32484=>1000,
-	32485=>1000,32486=>1000,32487=>1000,32488=>1000,32489=>1000,32490=>1000,32491=>1000,32492=>1000,32493=>1000,32494=>1000,32495=>1000,32496=>1000,32497=>1000,32498=>1000,32499=>1000,32500=>1000,
-	32501=>1000,32502=>1000,32503=>1000,32504=>1000,32505=>1000,32506=>1000,32507=>1000,32508=>1000,32509=>1000,32510=>1000,32511=>1000,32512=>1000,32513=>1000,32514=>1000,32515=>1000,32516=>1000,
-	32517=>1000,32518=>1000,32519=>1000,32520=>1000,32521=>1000,32522=>1000,32523=>1000,32524=>1000,32525=>1000,32526=>1000,32527=>1000,32528=>1000,32529=>1000,32530=>1000,32531=>1000,32532=>1000,
-	32533=>1000,32534=>1000,32535=>1000,32536=>1000,32537=>1000,32538=>1000,32539=>1000,32540=>1000,32541=>1000,32542=>1000,32543=>1000,32544=>1000,32545=>1000,32546=>1000,32547=>1000,32548=>1000,
-	32549=>1000,32550=>1000,32551=>1000,32552=>1000,32553=>1000,32554=>1000,32555=>1000,32556=>1000,32557=>1000,32558=>1000,32559=>1000,32560=>1000,32561=>1000,32562=>1000,32563=>1000,32564=>1000,
-	32565=>1000,32566=>1000,32567=>1000,32568=>1000,32569=>1000,32570=>1000,32571=>1000,32572=>1000,32573=>1000,32574=>1000,32575=>1000,32576=>1000,32577=>1000,32578=>1000,32579=>1000,32580=>1000,
-	32581=>1000,32582=>1000,32583=>1000,32584=>1000,32585=>1000,32586=>1000,32587=>1000,32588=>1000,32589=>1000,32590=>1000,32591=>1000,32592=>1000,32593=>1000,32594=>1000,32595=>1000,32596=>1000,
-	32597=>1000,32598=>1000,32599=>1000,32600=>1000,32601=>1000,32602=>1000,32603=>1000,32604=>1000,32605=>1000,32606=>1000,32607=>1000,32608=>1000,32609=>1000,32610=>1000,32611=>1000,32612=>1000,
-	32613=>1000,32614=>1000,32615=>1000,32616=>1000,32617=>1000,32618=>1000,32619=>1000,32620=>1000,32621=>1000,32622=>1000,32623=>1000,32624=>1000,32625=>1000,32626=>1000,32627=>1000,32628=>1000,
-	32629=>1000,32630=>1000,32631=>1000,32632=>1000,32633=>1000,32634=>1000,32635=>1000,32636=>1000,32637=>1000,32638=>1000,32639=>1000,32640=>1000,32641=>1000,32642=>1000,32643=>1000,32644=>1000,
-	32645=>1000,32646=>1000,32647=>1000,32648=>1000,32649=>1000,32650=>1000,32651=>1000,32652=>1000,32653=>1000,32654=>1000,32655=>1000,32656=>1000,32657=>1000,32658=>1000,32659=>1000,32660=>1000,
-	32661=>1000,32662=>1000,32663=>1000,32664=>1000,32665=>1000,32666=>1000,32667=>1000,32668=>1000,32669=>1000,32670=>1000,32671=>1000,32672=>1000,32673=>1000,32674=>1000,32675=>1000,32676=>1000,
-	32677=>1000,32678=>1000,32679=>1000,32680=>1000,32681=>1000,32682=>1000,32683=>1000,32684=>1000,32685=>1000,32686=>1000,32687=>1000,32688=>1000,32689=>1000,32690=>1000,32691=>1000,32692=>1000,
-	32693=>1000,32694=>1000,32695=>1000,32696=>1000,32697=>1000,32698=>1000,32699=>1000,32700=>1000,32701=>1000,32702=>1000,32703=>1000,32704=>1000,32705=>1000,32706=>1000,32707=>1000,32708=>1000,
-	32709=>1000,32710=>1000,32711=>1000,32712=>1000,32713=>1000,32714=>1000,32715=>1000,32716=>1000,32717=>1000,32718=>1000,32719=>1000,32720=>1000,32721=>1000,32722=>1000,32723=>1000,32724=>1000,
-	32725=>1000,32726=>1000,32727=>1000,32728=>1000,32729=>1000,32730=>1000,32731=>1000,32732=>1000,32733=>1000,32734=>1000,32735=>1000,32736=>1000,32737=>1000,32738=>1000,32739=>1000,32740=>1000,
-	32741=>1000,32742=>1000,32743=>1000,32744=>1000,32745=>1000,32746=>1000,32747=>1000,32748=>1000,32749=>1000,32750=>1000,32751=>1000,32752=>1000,32753=>1000,32754=>1000,32755=>1000,32756=>1000,
-	32757=>1000,32758=>1000,32759=>1000,32760=>1000,32761=>1000,32762=>1000,32763=>1000,32764=>1000,32765=>1000,32766=>1000,32767=>1000,32768=>1000,32769=>1000,32770=>1000,32771=>1000,32772=>1000,
-	32773=>1000,32774=>1000,32775=>1000,32776=>1000,32777=>1000,32778=>1000,32779=>1000,32780=>1000,32781=>1000,32782=>1000,32783=>1000,32784=>1000,32785=>1000,32786=>1000,32787=>1000,32788=>1000,
-	32789=>1000,32790=>1000,32791=>1000,32792=>1000,32793=>1000,32794=>1000,32795=>1000,32796=>1000,32797=>1000,32798=>1000,32799=>1000,32800=>1000,32801=>1000,32802=>1000,32803=>1000,32804=>1000,
-	32805=>1000,32806=>1000,32807=>1000,32808=>1000,32809=>1000,32810=>1000,32811=>1000,32812=>1000,32813=>1000,32814=>1000,32815=>1000,32816=>1000,32817=>1000,32818=>1000,32819=>1000,32820=>1000,
-	32821=>1000,32822=>1000,32823=>1000,32824=>1000,32825=>1000,32826=>1000,32827=>1000,32828=>1000,32829=>1000,32830=>1000,32831=>1000,32832=>1000,32833=>1000,32834=>1000,32835=>1000,32836=>1000,
-	32837=>1000,32838=>1000,32839=>1000,32840=>1000,32841=>1000,32842=>1000,32843=>1000,32844=>1000,32845=>1000,32846=>1000,32847=>1000,32848=>1000,32849=>1000,32850=>1000,32851=>1000,32852=>1000,
-	32853=>1000,32854=>1000,32855=>1000,32856=>1000,32857=>1000,32858=>1000,32859=>1000,32860=>1000,32861=>1000,32862=>1000,32863=>1000,32864=>1000,32865=>1000,32866=>1000,32867=>1000,32868=>1000,
-	32869=>1000,32870=>1000,32871=>1000,32872=>1000,32873=>1000,32874=>1000,32875=>1000,32876=>1000,32877=>1000,32878=>1000,32879=>1000,32880=>1000,32881=>1000,32882=>1000,32883=>1000,32884=>1000,
-	32885=>1000,32886=>1000,32887=>1000,32888=>1000,32889=>1000,32890=>1000,32891=>1000,32892=>1000,32893=>1000,32894=>1000,32895=>1000,32896=>1000,32897=>1000,32898=>1000,32899=>1000,32900=>1000,
-	32901=>1000,32902=>1000,32903=>1000,32904=>1000,32905=>1000,32906=>1000,32907=>1000,32908=>1000,32909=>1000,32910=>1000,32911=>1000,32912=>1000,32913=>1000,32914=>1000,32915=>1000,32916=>1000,
-	32917=>1000,32918=>1000,32919=>1000,32920=>1000,32921=>1000,32922=>1000,32923=>1000,32924=>1000,32925=>1000,32926=>1000,32927=>1000,32928=>1000,32929=>1000,32930=>1000,32931=>1000,32932=>1000,
-	32933=>1000,32934=>1000,32935=>1000,32936=>1000,32937=>1000,32938=>1000,32939=>1000,32940=>1000,32941=>1000,32942=>1000,32943=>1000,32944=>1000,32945=>1000,32946=>1000,32947=>1000,32948=>1000,
-	32949=>1000,32950=>1000,32951=>1000,32952=>1000,32953=>1000,32954=>1000,32955=>1000,32956=>1000,32957=>1000,32958=>1000,32959=>1000,32960=>1000,32961=>1000,32962=>1000,32963=>1000,32964=>1000,
-	32965=>1000,32966=>1000,32967=>1000,32968=>1000,32969=>1000,32970=>1000,32971=>1000,32972=>1000,32973=>1000,32974=>1000,32975=>1000,32976=>1000,32977=>1000,32978=>1000,32979=>1000,32980=>1000,
-	32981=>1000,32982=>1000,32983=>1000,32984=>1000,32985=>1000,32986=>1000,32987=>1000,32988=>1000,32989=>1000,32990=>1000,32991=>1000,32992=>1000,32993=>1000,32994=>1000,32995=>1000,32996=>1000,
-	32997=>1000,32998=>1000,32999=>1000,33000=>1000,33001=>1000,33002=>1000,33003=>1000,33004=>1000,33005=>1000,33006=>1000,33007=>1000,33008=>1000,33009=>1000,33010=>1000,33011=>1000,33012=>1000,
-	33013=>1000,33014=>1000,33015=>1000,33016=>1000,33017=>1000,33018=>1000,33019=>1000,33020=>1000,33021=>1000,33022=>1000,33023=>1000,33024=>1000,33025=>1000,33026=>1000,33027=>1000,33028=>1000,
-	33029=>1000,33030=>1000,33031=>1000,33032=>1000,33033=>1000,33034=>1000,33035=>1000,33036=>1000,33037=>1000,33038=>1000,33039=>1000,33040=>1000,33041=>1000,33042=>1000,33043=>1000,33044=>1000,
-	33045=>1000,33046=>1000,33047=>1000,33048=>1000,33049=>1000,33050=>1000,33051=>1000,33052=>1000,33053=>1000,33054=>1000,33055=>1000,33056=>1000,33057=>1000,33058=>1000,33059=>1000,33060=>1000,
-	33061=>1000,33062=>1000,33063=>1000,33064=>1000,33065=>1000,33066=>1000,33067=>1000,33068=>1000,33069=>1000,33070=>1000,33071=>1000,33072=>1000,33073=>1000,33074=>1000,33075=>1000,33076=>1000,
-	33077=>1000,33078=>1000,33079=>1000,33080=>1000,33081=>1000,33082=>1000,33083=>1000,33084=>1000,33085=>1000,33086=>1000,33087=>1000,33088=>1000,33089=>1000,33090=>1000,33091=>1000,33092=>1000,
-	33093=>1000,33094=>1000,33095=>1000,33096=>1000,33097=>1000,33098=>1000,33099=>1000,33100=>1000,33101=>1000,33102=>1000,33103=>1000,33104=>1000,33105=>1000,33106=>1000,33107=>1000,33108=>1000,
-	33109=>1000,33110=>1000,33111=>1000,33112=>1000,33113=>1000,33114=>1000,33115=>1000,33116=>1000,33117=>1000,33118=>1000,33119=>1000,33120=>1000,33121=>1000,33122=>1000,33123=>1000,33124=>1000,
-	33125=>1000,33126=>1000,33127=>1000,33128=>1000,33129=>1000,33130=>1000,33131=>1000,33132=>1000,33133=>1000,33134=>1000,33135=>1000,33136=>1000,33137=>1000,33138=>1000,33139=>1000,33140=>1000,
-	33141=>1000,33142=>1000,33143=>1000,33144=>1000,33145=>1000,33146=>1000,33147=>1000,33148=>1000,33149=>1000,33150=>1000,33151=>1000,33152=>1000,33153=>1000,33154=>1000,33155=>1000,33156=>1000,
-	33157=>1000,33158=>1000,33159=>1000,33160=>1000,33161=>1000,33162=>1000,33163=>1000,33164=>1000,33165=>1000,33166=>1000,33167=>1000,33168=>1000,33169=>1000,33170=>1000,33171=>1000,33172=>1000,
-	33173=>1000,33174=>1000,33175=>1000,33176=>1000,33177=>1000,33178=>1000,33179=>1000,33180=>1000,33181=>1000,33182=>1000,33183=>1000,33184=>1000,33185=>1000,33186=>1000,33187=>1000,33188=>1000,
-	33189=>1000,33190=>1000,33191=>1000,33192=>1000,33193=>1000,33194=>1000,33195=>1000,33196=>1000,33197=>1000,33198=>1000,33199=>1000,33200=>1000,33201=>1000,33202=>1000,33203=>1000,33204=>1000,
-	33205=>1000,33206=>1000,33207=>1000,33208=>1000,33209=>1000,33210=>1000,33211=>1000,33212=>1000,33213=>1000,33214=>1000,33215=>1000,33216=>1000,33217=>1000,33218=>1000,33219=>1000,33220=>1000,
-	33221=>1000,33222=>1000,33223=>1000,33224=>1000,33225=>1000,33226=>1000,33227=>1000,33228=>1000,33229=>1000,33230=>1000,33231=>1000,33232=>1000,33233=>1000,33234=>1000,33235=>1000,33236=>1000,
-	33237=>1000,33238=>1000,33239=>1000,33240=>1000,33241=>1000,33242=>1000,33243=>1000,33244=>1000,33245=>1000,33246=>1000,33247=>1000,33248=>1000,33249=>1000,33250=>1000,33251=>1000,33252=>1000,
-	33253=>1000,33254=>1000,33255=>1000,33256=>1000,33257=>1000,33258=>1000,33259=>1000,33260=>1000,33261=>1000,33262=>1000,33263=>1000,33264=>1000,33265=>1000,33266=>1000,33267=>1000,33268=>1000,
-	33269=>1000,33270=>1000,33271=>1000,33272=>1000,33273=>1000,33274=>1000,33275=>1000,33276=>1000,33277=>1000,33278=>1000,33279=>1000,33280=>1000,33281=>1000,33282=>1000,33283=>1000,33284=>1000,
-	33285=>1000,33286=>1000,33287=>1000,33288=>1000,33289=>1000,33290=>1000,33291=>1000,33292=>1000,33293=>1000,33294=>1000,33295=>1000,33296=>1000,33297=>1000,33298=>1000,33299=>1000,33300=>1000,
-	33301=>1000,33302=>1000,33303=>1000,33304=>1000,33305=>1000,33306=>1000,33307=>1000,33308=>1000,33309=>1000,33310=>1000,33311=>1000,33312=>1000,33313=>1000,33314=>1000,33315=>1000,33316=>1000,
-	33317=>1000,33318=>1000,33319=>1000,33320=>1000,33321=>1000,33322=>1000,33323=>1000,33324=>1000,33325=>1000,33326=>1000,33327=>1000,33328=>1000,33329=>1000,33330=>1000,33331=>1000,33332=>1000,
-	33333=>1000,33334=>1000,33335=>1000,33336=>1000,33337=>1000,33338=>1000,33339=>1000,33340=>1000,33341=>1000,33342=>1000,33343=>1000,33344=>1000,33345=>1000,33346=>1000,33347=>1000,33348=>1000,
-	33349=>1000,33350=>1000,33351=>1000,33352=>1000,33353=>1000,33354=>1000,33355=>1000,33356=>1000,33357=>1000,33358=>1000,33359=>1000,33360=>1000,33361=>1000,33362=>1000,33363=>1000,33364=>1000,
-	33365=>1000,33366=>1000,33367=>1000,33368=>1000,33369=>1000,33370=>1000,33371=>1000,33372=>1000,33373=>1000,33374=>1000,33375=>1000,33376=>1000,33377=>1000,33378=>1000,33379=>1000,33380=>1000,
-	33381=>1000,33382=>1000,33383=>1000,33384=>1000,33385=>1000,33386=>1000,33387=>1000,33388=>1000,33389=>1000,33390=>1000,33391=>1000,33392=>1000,33393=>1000,33394=>1000,33395=>1000,33396=>1000,
-	33397=>1000,33398=>1000,33399=>1000,33400=>1000,33401=>1000,33402=>1000,33403=>1000,33404=>1000,33405=>1000,33406=>1000,33407=>1000,33408=>1000,33409=>1000,33410=>1000,33411=>1000,33412=>1000,
-	33413=>1000,33414=>1000,33415=>1000,33416=>1000,33417=>1000,33418=>1000,33419=>1000,33420=>1000,33421=>1000,33422=>1000,33423=>1000,33424=>1000,33425=>1000,33426=>1000,33427=>1000,33428=>1000,
-	33429=>1000,33430=>1000,33431=>1000,33432=>1000,33433=>1000,33434=>1000,33435=>1000,33436=>1000,33437=>1000,33438=>1000,33439=>1000,33440=>1000,33441=>1000,33442=>1000,33443=>1000,33444=>1000,
-	33445=>1000,33446=>1000,33447=>1000,33448=>1000,33449=>1000,33450=>1000,33451=>1000,33452=>1000,33453=>1000,33454=>1000,33455=>1000,33456=>1000,33457=>1000,33458=>1000,33459=>1000,33460=>1000,
-	33461=>1000,33462=>1000,33463=>1000,33464=>1000,33465=>1000,33466=>1000,33467=>1000,33468=>1000,33469=>1000,33470=>1000,33471=>1000,33472=>1000,33473=>1000,33474=>1000,33475=>1000,33476=>1000,
-	33477=>1000,33478=>1000,33479=>1000,33480=>1000,33481=>1000,33482=>1000,33483=>1000,33484=>1000,33485=>1000,33486=>1000,33487=>1000,33488=>1000,33489=>1000,33490=>1000,33491=>1000,33492=>1000,
-	33493=>1000,33494=>1000,33495=>1000,33496=>1000,33497=>1000,33498=>1000,33499=>1000,33500=>1000,33501=>1000,33502=>1000,33503=>1000,33504=>1000,33505=>1000,33506=>1000,33507=>1000,33508=>1000,
-	33509=>1000,33510=>1000,33511=>1000,33512=>1000,33513=>1000,33514=>1000,33515=>1000,33516=>1000,33517=>1000,33518=>1000,33519=>1000,33520=>1000,33521=>1000,33522=>1000,33523=>1000,33524=>1000,
-	33525=>1000,33526=>1000,33527=>1000,33528=>1000,33529=>1000,33530=>1000,33531=>1000,33532=>1000,33533=>1000,33534=>1000,33535=>1000,33536=>1000,33537=>1000,33538=>1000,33539=>1000,33540=>1000,
-	33541=>1000,33542=>1000,33543=>1000,33544=>1000,33545=>1000,33546=>1000,33547=>1000,33548=>1000,33549=>1000,33550=>1000,33551=>1000,33552=>1000,33553=>1000,33554=>1000,33555=>1000,33556=>1000,
-	33557=>1000,33558=>1000,33559=>1000,33560=>1000,33561=>1000,33562=>1000,33563=>1000,33564=>1000,33565=>1000,33566=>1000,33567=>1000,33568=>1000,33569=>1000,33570=>1000,33571=>1000,33572=>1000,
-	33573=>1000,33574=>1000,33575=>1000,33576=>1000,33577=>1000,33578=>1000,33579=>1000,33580=>1000,33581=>1000,33582=>1000,33583=>1000,33584=>1000,33585=>1000,33586=>1000,33587=>1000,33588=>1000,
-	33589=>1000,33590=>1000,33591=>1000,33592=>1000,33593=>1000,33594=>1000,33595=>1000,33596=>1000,33597=>1000,33598=>1000,33599=>1000,33600=>1000,33601=>1000,33602=>1000,33603=>1000,33604=>1000,
-	33605=>1000,33606=>1000,33607=>1000,33608=>1000,33609=>1000,33610=>1000,33611=>1000,33612=>1000,33613=>1000,33614=>1000,33615=>1000,33616=>1000,33617=>1000,33618=>1000,33619=>1000,33620=>1000,
-	33621=>1000,33622=>1000,33623=>1000,33624=>1000,33625=>1000,33626=>1000,33627=>1000,33628=>1000,33629=>1000,33630=>1000,33631=>1000,33632=>1000,33633=>1000,33634=>1000,33635=>1000,33636=>1000,
-	33637=>1000,33638=>1000,33639=>1000,33640=>1000,33641=>1000,33642=>1000,33643=>1000,33644=>1000,33645=>1000,33646=>1000,33647=>1000,33648=>1000,33649=>1000,33650=>1000,33651=>1000,33652=>1000,
-	33653=>1000,33654=>1000,33655=>1000,33656=>1000,33657=>1000,33658=>1000,33659=>1000,33660=>1000,33661=>1000,33662=>1000,33663=>1000,33664=>1000,33665=>1000,33666=>1000,33667=>1000,33668=>1000,
-	33669=>1000,33670=>1000,33671=>1000,33672=>1000,33673=>1000,33674=>1000,33675=>1000,33676=>1000,33677=>1000,33678=>1000,33679=>1000,33680=>1000,33681=>1000,33682=>1000,33683=>1000,33684=>1000,
-	33685=>1000,33686=>1000,33687=>1000,33688=>1000,33689=>1000,33690=>1000,33691=>1000,33692=>1000,33693=>1000,33694=>1000,33695=>1000,33696=>1000,33697=>1000,33698=>1000,33699=>1000,33700=>1000,
-	33701=>1000,33702=>1000,33703=>1000,33704=>1000,33705=>1000,33706=>1000,33707=>1000,33708=>1000,33709=>1000,33710=>1000,33711=>1000,33712=>1000,33713=>1000,33714=>1000,33715=>1000,33716=>1000,
-	33717=>1000,33718=>1000,33719=>1000,33720=>1000,33721=>1000,33722=>1000,33723=>1000,33724=>1000,33725=>1000,33726=>1000,33727=>1000,33728=>1000,33729=>1000,33730=>1000,33731=>1000,33732=>1000,
-	33733=>1000,33734=>1000,33735=>1000,33736=>1000,33737=>1000,33738=>1000,33739=>1000,33740=>1000,33741=>1000,33742=>1000,33743=>1000,33744=>1000,33745=>1000,33746=>1000,33747=>1000,33748=>1000,
-	33749=>1000,33750=>1000,33751=>1000,33752=>1000,33753=>1000,33754=>1000,33755=>1000,33756=>1000,33757=>1000,33758=>1000,33759=>1000,33760=>1000,33761=>1000,33762=>1000,33763=>1000,33764=>1000,
-	33765=>1000,33766=>1000,33767=>1000,33768=>1000,33769=>1000,33770=>1000,33771=>1000,33772=>1000,33773=>1000,33774=>1000,33775=>1000,33776=>1000,33777=>1000,33778=>1000,33779=>1000,33780=>1000,
-	33781=>1000,33782=>1000,33783=>1000,33784=>1000,33785=>1000,33786=>1000,33787=>1000,33788=>1000,33789=>1000,33790=>1000,33791=>1000,33792=>1000,33793=>1000,33794=>1000,33795=>1000,33796=>1000,
-	33797=>1000,33798=>1000,33799=>1000,33800=>1000,33801=>1000,33802=>1000,33803=>1000,33804=>1000,33805=>1000,33806=>1000,33807=>1000,33808=>1000,33809=>1000,33810=>1000,33811=>1000,33812=>1000,
-	33813=>1000,33814=>1000,33815=>1000,33816=>1000,33817=>1000,33818=>1000,33819=>1000,33820=>1000,33821=>1000,33822=>1000,33823=>1000,33824=>1000,33825=>1000,33826=>1000,33827=>1000,33828=>1000,
-	33829=>1000,33830=>1000,33831=>1000,33832=>1000,33833=>1000,33834=>1000,33835=>1000,33836=>1000,33837=>1000,33838=>1000,33839=>1000,33840=>1000,33841=>1000,33842=>1000,33843=>1000,33844=>1000,
-	33845=>1000,33846=>1000,33847=>1000,33848=>1000,33849=>1000,33850=>1000,33851=>1000,33852=>1000,33853=>1000,33854=>1000,33855=>1000,33856=>1000,33857=>1000,33858=>1000,33859=>1000,33860=>1000,
-	33861=>1000,33862=>1000,33863=>1000,33864=>1000,33865=>1000,33866=>1000,33867=>1000,33868=>1000,33869=>1000,33870=>1000,33871=>1000,33872=>1000,33873=>1000,33874=>1000,33875=>1000,33876=>1000,
-	33877=>1000,33878=>1000,33879=>1000,33880=>1000,33881=>1000,33882=>1000,33883=>1000,33884=>1000,33885=>1000,33886=>1000,33887=>1000,33888=>1000,33889=>1000,33890=>1000,33891=>1000,33892=>1000,
-	33893=>1000,33894=>1000,33895=>1000,33896=>1000,33897=>1000,33898=>1000,33899=>1000,33900=>1000,33901=>1000,33902=>1000,33903=>1000,33904=>1000,33905=>1000,33906=>1000,33907=>1000,33908=>1000,
-	33909=>1000,33910=>1000,33911=>1000,33912=>1000,33913=>1000,33914=>1000,33915=>1000,33916=>1000,33917=>1000,33918=>1000,33919=>1000,33920=>1000,33921=>1000,33922=>1000,33923=>1000,33924=>1000,
-	33925=>1000,33926=>1000,33927=>1000,33928=>1000,33929=>1000,33930=>1000,33931=>1000,33932=>1000,33933=>1000,33934=>1000,33935=>1000,33936=>1000,33937=>1000,33938=>1000,33939=>1000,33940=>1000,
-	33941=>1000,33942=>1000,33943=>1000,33944=>1000,33945=>1000,33946=>1000,33947=>1000,33948=>1000,33949=>1000,33950=>1000,33951=>1000,33952=>1000,33953=>1000,33954=>1000,33955=>1000,33956=>1000,
-	33957=>1000,33958=>1000,33959=>1000,33960=>1000,33961=>1000,33962=>1000,33963=>1000,33964=>1000,33965=>1000,33966=>1000,33967=>1000,33968=>1000,33969=>1000,33970=>1000,33971=>1000,33972=>1000,
-	33973=>1000,33974=>1000,33975=>1000,33976=>1000,33977=>1000,33978=>1000,33979=>1000,33980=>1000,33981=>1000,33982=>1000,33983=>1000,33984=>1000,33985=>1000,33986=>1000,33987=>1000,33988=>1000,
-	33989=>1000,33990=>1000,33991=>1000,33992=>1000,33993=>1000,33994=>1000,33995=>1000,33996=>1000,33997=>1000,33998=>1000,33999=>1000,34000=>1000,34001=>1000,34002=>1000,34003=>1000,34004=>1000,
-	34005=>1000,34006=>1000,34007=>1000,34008=>1000,34009=>1000,34010=>1000,34011=>1000,34012=>1000,34013=>1000,34014=>1000,34015=>1000,34016=>1000,34017=>1000,34018=>1000,34019=>1000,34020=>1000,
-	34021=>1000,34022=>1000,34023=>1000,34024=>1000,34025=>1000,34026=>1000,34027=>1000,34028=>1000,34029=>1000,34030=>1000,34031=>1000,34032=>1000,34033=>1000,34034=>1000,34035=>1000,34036=>1000,
-	34037=>1000,34038=>1000,34039=>1000,34040=>1000,34041=>1000,34042=>1000,34043=>1000,34044=>1000,34045=>1000,34046=>1000,34047=>1000,34048=>1000,34049=>1000,34050=>1000,34051=>1000,34052=>1000,
-	34053=>1000,34054=>1000,34055=>1000,34056=>1000,34057=>1000,34058=>1000,34059=>1000,34060=>1000,34061=>1000,34062=>1000,34063=>1000,34064=>1000,34065=>1000,34066=>1000,34067=>1000,34068=>1000,
-	34069=>1000,34070=>1000,34071=>1000,34072=>1000,34073=>1000,34074=>1000,34075=>1000,34076=>1000,34077=>1000,34078=>1000,34079=>1000,34080=>1000,34081=>1000,34082=>1000,34083=>1000,34084=>1000,
-	34085=>1000,34086=>1000,34087=>1000,34088=>1000,34089=>1000,34090=>1000,34091=>1000,34092=>1000,34093=>1000,34094=>1000,34095=>1000,34096=>1000,34097=>1000,34098=>1000,34099=>1000,34100=>1000,
-	34101=>1000,34102=>1000,34103=>1000,34104=>1000,34105=>1000,34106=>1000,34107=>1000,34108=>1000,34109=>1000,34110=>1000,34111=>1000,34112=>1000,34113=>1000,34114=>1000,34115=>1000,34116=>1000,
-	34117=>1000,34118=>1000,34119=>1000,34120=>1000,34121=>1000,34122=>1000,34123=>1000,34124=>1000,34125=>1000,34126=>1000,34127=>1000,34128=>1000,34129=>1000,34130=>1000,34131=>1000,34132=>1000,
-	34133=>1000,34134=>1000,34135=>1000,34136=>1000,34137=>1000,34138=>1000,34139=>1000,34140=>1000,34141=>1000,34142=>1000,34143=>1000,34144=>1000,34145=>1000,34146=>1000,34147=>1000,34148=>1000,
-	34149=>1000,34150=>1000,34151=>1000,34152=>1000,34153=>1000,34154=>1000,34155=>1000,34156=>1000,34157=>1000,34158=>1000,34159=>1000,34160=>1000,34161=>1000,34162=>1000,34163=>1000,34164=>1000,
-	34165=>1000,34166=>1000,34167=>1000,34168=>1000,34169=>1000,34170=>1000,34171=>1000,34172=>1000,34173=>1000,34174=>1000,34175=>1000,34176=>1000,34177=>1000,34178=>1000,34179=>1000,34180=>1000,
-	34181=>1000,34182=>1000,34183=>1000,34184=>1000,34185=>1000,34186=>1000,34187=>1000,34188=>1000,34189=>1000,34190=>1000,34191=>1000,34192=>1000,34193=>1000,34194=>1000,34195=>1000,34196=>1000,
-	34197=>1000,34198=>1000,34199=>1000,34200=>1000,34201=>1000,34202=>1000,34203=>1000,34204=>1000,34205=>1000,34206=>1000,34207=>1000,34208=>1000,34209=>1000,34210=>1000,34211=>1000,34212=>1000,
-	34213=>1000,34214=>1000,34215=>1000,34216=>1000,34217=>1000,34218=>1000,34219=>1000,34220=>1000,34221=>1000,34222=>1000,34223=>1000,34224=>1000,34225=>1000,34226=>1000,34227=>1000,34228=>1000,
-	34229=>1000,34230=>1000,34231=>1000,34232=>1000,34233=>1000,34234=>1000,34235=>1000,34236=>1000,34237=>1000,34238=>1000,34239=>1000,34240=>1000,34241=>1000,34242=>1000,34243=>1000,34244=>1000,
-	34245=>1000,34246=>1000,34247=>1000,34248=>1000,34249=>1000,34250=>1000,34251=>1000,34252=>1000,34253=>1000,34254=>1000,34255=>1000,34256=>1000,34257=>1000,34258=>1000,34259=>1000,34260=>1000,
-	34261=>1000,34262=>1000,34263=>1000,34264=>1000,34265=>1000,34266=>1000,34267=>1000,34268=>1000,34269=>1000,34270=>1000,34271=>1000,34272=>1000,34273=>1000,34274=>1000,34275=>1000,34276=>1000,
-	34277=>1000,34278=>1000,34279=>1000,34280=>1000,34281=>1000,34282=>1000,34283=>1000,34284=>1000,34285=>1000,34286=>1000,34287=>1000,34288=>1000,34289=>1000,34290=>1000,34291=>1000,34292=>1000,
-	34293=>1000,34294=>1000,34295=>1000,34296=>1000,34297=>1000,34298=>1000,34299=>1000,34300=>1000,34301=>1000,34302=>1000,34303=>1000,34304=>1000,34305=>1000,34306=>1000,34307=>1000,34308=>1000,
-	34309=>1000,34310=>1000,34311=>1000,34312=>1000,34313=>1000,34314=>1000,34315=>1000,34316=>1000,34317=>1000,34318=>1000,34319=>1000,34320=>1000,34321=>1000,34322=>1000,34323=>1000,34324=>1000,
-	34325=>1000,34326=>1000,34327=>1000,34328=>1000,34329=>1000,34330=>1000,34331=>1000,34332=>1000,34333=>1000,34334=>1000,34335=>1000,34336=>1000,34337=>1000,34338=>1000,34339=>1000,34340=>1000,
-	34341=>1000,34342=>1000,34343=>1000,34344=>1000,34345=>1000,34346=>1000,34347=>1000,34348=>1000,34349=>1000,34350=>1000,34351=>1000,34352=>1000,34353=>1000,34354=>1000,34355=>1000,34356=>1000,
-	34357=>1000,34358=>1000,34359=>1000,34360=>1000,34361=>1000,34362=>1000,34363=>1000,34364=>1000,34365=>1000,34366=>1000,34367=>1000,34368=>1000,34369=>1000,34370=>1000,34371=>1000,34372=>1000,
-	34373=>1000,34374=>1000,34375=>1000,34376=>1000,34377=>1000,34378=>1000,34379=>1000,34380=>1000,34381=>1000,34382=>1000,34383=>1000,34384=>1000,34385=>1000,34386=>1000,34387=>1000,34388=>1000,
-	34389=>1000,34390=>1000,34391=>1000,34392=>1000,34393=>1000,34394=>1000,34395=>1000,34396=>1000,34397=>1000,34398=>1000,34399=>1000,34400=>1000,34401=>1000,34402=>1000,34403=>1000,34404=>1000,
-	34405=>1000,34406=>1000,34407=>1000,34408=>1000,34409=>1000,34410=>1000,34411=>1000,34412=>1000,34413=>1000,34414=>1000,34415=>1000,34416=>1000,34417=>1000,34418=>1000,34419=>1000,34420=>1000,
-	34421=>1000,34422=>1000,34423=>1000,34424=>1000,34425=>1000,34426=>1000,34427=>1000,34428=>1000,34429=>1000,34430=>1000,34431=>1000,34432=>1000,34433=>1000,34434=>1000,34435=>1000,34436=>1000,
-	34437=>1000,34438=>1000,34439=>1000,34440=>1000,34441=>1000,34442=>1000,34443=>1000,34444=>1000,34445=>1000,34446=>1000,34447=>1000,34448=>1000,34449=>1000,34450=>1000,34451=>1000,34452=>1000,
-	34453=>1000,34454=>1000,34455=>1000,34456=>1000,34457=>1000,34458=>1000,34459=>1000,34460=>1000,34461=>1000,34462=>1000,34463=>1000,34464=>1000,34465=>1000,34466=>1000,34467=>1000,34468=>1000,
-	34469=>1000,34470=>1000,34471=>1000,34472=>1000,34473=>1000,34474=>1000,34475=>1000,34476=>1000,34477=>1000,34478=>1000,34479=>1000,34480=>1000,34481=>1000,34482=>1000,34483=>1000,34484=>1000,
-	34485=>1000,34486=>1000,34487=>1000,34488=>1000,34489=>1000,34490=>1000,34491=>1000,34492=>1000,34493=>1000,34494=>1000,34495=>1000,34496=>1000,34497=>1000,34498=>1000,34499=>1000,34500=>1000,
-	34501=>1000,34502=>1000,34503=>1000,34504=>1000,34505=>1000,34506=>1000,34507=>1000,34508=>1000,34509=>1000,34510=>1000,34511=>1000,34512=>1000,34513=>1000,34514=>1000,34515=>1000,34516=>1000,
-	34517=>1000,34518=>1000,34519=>1000,34520=>1000,34521=>1000,34522=>1000,34523=>1000,34524=>1000,34525=>1000,34526=>1000,34527=>1000,34528=>1000,34529=>1000,34530=>1000,34531=>1000,34532=>1000,
-	34533=>1000,34534=>1000,34535=>1000,34536=>1000,34537=>1000,34538=>1000,34539=>1000,34540=>1000,34541=>1000,34542=>1000,34543=>1000,34544=>1000,34545=>1000,34546=>1000,34547=>1000,34548=>1000,
-	34549=>1000,34550=>1000,34551=>1000,34552=>1000,34553=>1000,34554=>1000,34555=>1000,34556=>1000,34557=>1000,34558=>1000,34559=>1000,34560=>1000,34561=>1000,34562=>1000,34563=>1000,34564=>1000,
-	34565=>1000,34566=>1000,34567=>1000,34568=>1000,34569=>1000,34570=>1000,34571=>1000,34572=>1000,34573=>1000,34574=>1000,34575=>1000,34576=>1000,34577=>1000,34578=>1000,34579=>1000,34580=>1000,
-	34581=>1000,34582=>1000,34583=>1000,34584=>1000,34585=>1000,34586=>1000,34587=>1000,34588=>1000,34589=>1000,34590=>1000,34591=>1000,34592=>1000,34593=>1000,34594=>1000,34595=>1000,34596=>1000,
-	34597=>1000,34598=>1000,34599=>1000,34600=>1000,34601=>1000,34602=>1000,34603=>1000,34604=>1000,34605=>1000,34606=>1000,34607=>1000,34608=>1000,34609=>1000,34610=>1000,34611=>1000,34612=>1000,
-	34613=>1000,34614=>1000,34615=>1000,34616=>1000,34617=>1000,34618=>1000,34619=>1000,34620=>1000,34621=>1000,34622=>1000,34623=>1000,34624=>1000,34625=>1000,34626=>1000,34627=>1000,34628=>1000,
-	34629=>1000,34630=>1000,34631=>1000,34632=>1000,34633=>1000,34634=>1000,34635=>1000,34636=>1000,34637=>1000,34638=>1000,34639=>1000,34640=>1000,34641=>1000,34642=>1000,34643=>1000,34644=>1000,
-	34645=>1000,34646=>1000,34647=>1000,34648=>1000,34649=>1000,34650=>1000,34651=>1000,34652=>1000,34653=>1000,34654=>1000,34655=>1000,34656=>1000,34657=>1000,34658=>1000,34659=>1000,34660=>1000,
-	34661=>1000,34662=>1000,34663=>1000,34664=>1000,34665=>1000,34666=>1000,34667=>1000,34668=>1000,34669=>1000,34670=>1000,34671=>1000,34672=>1000,34673=>1000,34674=>1000,34675=>1000,34676=>1000,
-	34677=>1000,34678=>1000,34679=>1000,34680=>1000,34681=>1000,34682=>1000,34683=>1000,34684=>1000,34685=>1000,34686=>1000,34687=>1000,34688=>1000,34689=>1000,34690=>1000,34691=>1000,34692=>1000,
-	34693=>1000,34694=>1000,34695=>1000,34696=>1000,34697=>1000,34698=>1000,34699=>1000,34700=>1000,34701=>1000,34702=>1000,34703=>1000,34704=>1000,34705=>1000,34706=>1000,34707=>1000,34708=>1000,
-	34709=>1000,34710=>1000,34711=>1000,34712=>1000,34713=>1000,34714=>1000,34715=>1000,34716=>1000,34717=>1000,34718=>1000,34719=>1000,34720=>1000,34721=>1000,34722=>1000,34723=>1000,34724=>1000,
-	34725=>1000,34726=>1000,34727=>1000,34728=>1000,34729=>1000,34730=>1000,34731=>1000,34732=>1000,34733=>1000,34734=>1000,34735=>1000,34736=>1000,34737=>1000,34738=>1000,34739=>1000,34740=>1000,
-	34741=>1000,34742=>1000,34743=>1000,34744=>1000,34745=>1000,34746=>1000,34747=>1000,34748=>1000,34749=>1000,34750=>1000,34751=>1000,34752=>1000,34753=>1000,34754=>1000,34755=>1000,34756=>1000,
-	34757=>1000,34758=>1000,34759=>1000,34760=>1000,34761=>1000,34762=>1000,34763=>1000,34764=>1000,34765=>1000,34766=>1000,34767=>1000,34768=>1000,34769=>1000,34770=>1000,34771=>1000,34772=>1000,
-	34773=>1000,34774=>1000,34775=>1000,34776=>1000,34777=>1000,34778=>1000,34779=>1000,34780=>1000,34781=>1000,34782=>1000,34783=>1000,34784=>1000,34785=>1000,34786=>1000,34787=>1000,34788=>1000,
-	34789=>1000,34790=>1000,34791=>1000,34792=>1000,34793=>1000,34794=>1000,34795=>1000,34796=>1000,34797=>1000,34798=>1000,34799=>1000,34800=>1000,34801=>1000,34802=>1000,34803=>1000,34804=>1000,
-	34805=>1000,34806=>1000,34807=>1000,34808=>1000,34809=>1000,34810=>1000,34811=>1000,34812=>1000,34813=>1000,34814=>1000,34815=>1000,34816=>1000,34817=>1000,34818=>1000,34819=>1000,34820=>1000,
-	34821=>1000,34822=>1000,34823=>1000,34824=>1000,34825=>1000,34826=>1000,34827=>1000,34828=>1000,34829=>1000,34830=>1000,34831=>1000,34832=>1000,34833=>1000,34834=>1000,34835=>1000,34836=>1000,
-	34837=>1000,34838=>1000,34839=>1000,34840=>1000,34841=>1000,34842=>1000,34843=>1000,34844=>1000,34845=>1000,34846=>1000,34847=>1000,34848=>1000,34849=>1000,34850=>1000,34851=>1000,34852=>1000,
-	34853=>1000,34854=>1000,34855=>1000,34856=>1000,34857=>1000,34858=>1000,34859=>1000,34860=>1000,34861=>1000,34862=>1000,34863=>1000,34864=>1000,34865=>1000,34866=>1000,34867=>1000,34868=>1000,
-	34869=>1000,34870=>1000,34871=>1000,34872=>1000,34873=>1000,34874=>1000,34875=>1000,34876=>1000,34877=>1000,34878=>1000,34879=>1000,34880=>1000,34881=>1000,34882=>1000,34883=>1000,34884=>1000,
-	34885=>1000,34886=>1000,34887=>1000,34888=>1000,34889=>1000,34890=>1000,34891=>1000,34892=>1000,34893=>1000,34894=>1000,34895=>1000,34896=>1000,34897=>1000,34898=>1000,34899=>1000,34900=>1000,
-	34901=>1000,34902=>1000,34903=>1000,34904=>1000,34905=>1000,34906=>1000,34907=>1000,34908=>1000,34909=>1000,34910=>1000,34911=>1000,34912=>1000,34913=>1000,34914=>1000,34915=>1000,34916=>1000,
-	34917=>1000,34918=>1000,34919=>1000,34920=>1000,34921=>1000,34922=>1000,34923=>1000,34924=>1000,34925=>1000,34926=>1000,34927=>1000,34928=>1000,34929=>1000,34930=>1000,34931=>1000,34932=>1000,
-	34933=>1000,34934=>1000,34935=>1000,34936=>1000,34937=>1000,34938=>1000,34939=>1000,34940=>1000,34941=>1000,34942=>1000,34943=>1000,34944=>1000,34945=>1000,34946=>1000,34947=>1000,34948=>1000,
-	34949=>1000,34950=>1000,34951=>1000,34952=>1000,34953=>1000,34954=>1000,34955=>1000,34956=>1000,34957=>1000,34958=>1000,34959=>1000,34960=>1000,34961=>1000,34962=>1000,34963=>1000,34964=>1000,
-	34965=>1000,34966=>1000,34967=>1000,34968=>1000,34969=>1000,34970=>1000,34971=>1000,34972=>1000,34973=>1000,34974=>1000,34975=>1000,34976=>1000,34977=>1000,34978=>1000,34979=>1000,34980=>1000,
-	34981=>1000,34982=>1000,34983=>1000,34984=>1000,34985=>1000,34986=>1000,34987=>1000,34988=>1000,34989=>1000,34990=>1000,34991=>1000,34992=>1000,34993=>1000,34994=>1000,34995=>1000,34996=>1000,
-	34997=>1000,34998=>1000,34999=>1000,35000=>1000,35001=>1000,35002=>1000,35003=>1000,35004=>1000,35005=>1000,35006=>1000,35007=>1000,35008=>1000,35009=>1000,35010=>1000,35011=>1000,35012=>1000,
-	35013=>1000,35014=>1000,35015=>1000,35016=>1000,35017=>1000,35018=>1000,35019=>1000,35020=>1000,35021=>1000,35022=>1000,35023=>1000,35024=>1000,35025=>1000,35026=>1000,35027=>1000,35028=>1000,
-	35029=>1000,35030=>1000,35031=>1000,35032=>1000,35033=>1000,35034=>1000,35035=>1000,35036=>1000,35037=>1000,35038=>1000,35039=>1000,35040=>1000,35041=>1000,35042=>1000,35043=>1000,35044=>1000,
-	35045=>1000,35046=>1000,35047=>1000,35048=>1000,35049=>1000,35050=>1000,35051=>1000,35052=>1000,35053=>1000,35054=>1000,35055=>1000,35056=>1000,35057=>1000,35058=>1000,35059=>1000,35060=>1000,
-	35061=>1000,35062=>1000,35063=>1000,35064=>1000,35065=>1000,35066=>1000,35067=>1000,35068=>1000,35069=>1000,35070=>1000,35071=>1000,35072=>1000,35073=>1000,35074=>1000,35075=>1000,35076=>1000,
-	35077=>1000,35078=>1000,35079=>1000,35080=>1000,35081=>1000,35082=>1000,35083=>1000,35084=>1000,35085=>1000,35086=>1000,35087=>1000,35088=>1000,35089=>1000,35090=>1000,35091=>1000,35092=>1000,
-	35093=>1000,35094=>1000,35095=>1000,35096=>1000,35097=>1000,35098=>1000,35099=>1000,35100=>1000,35101=>1000,35102=>1000,35103=>1000,35104=>1000,35105=>1000,35106=>1000,35107=>1000,35108=>1000,
-	35109=>1000,35110=>1000,35111=>1000,35112=>1000,35113=>1000,35114=>1000,35115=>1000,35116=>1000,35117=>1000,35118=>1000,35119=>1000,35120=>1000,35121=>1000,35122=>1000,35123=>1000,35124=>1000,
-	35125=>1000,35126=>1000,35127=>1000,35128=>1000,35129=>1000,35130=>1000,35131=>1000,35132=>1000,35133=>1000,35134=>1000,35135=>1000,35136=>1000,35137=>1000,35138=>1000,35139=>1000,35140=>1000,
-	35141=>1000,35142=>1000,35143=>1000,35144=>1000,35145=>1000,35146=>1000,35147=>1000,35148=>1000,35149=>1000,35150=>1000,35151=>1000,35152=>1000,35153=>1000,35154=>1000,35155=>1000,35156=>1000,
-	35157=>1000,35158=>1000,35159=>1000,35160=>1000,35161=>1000,35162=>1000,35163=>1000,35164=>1000,35165=>1000,35166=>1000,35167=>1000,35168=>1000,35169=>1000,35170=>1000,35171=>1000,35172=>1000,
-	35173=>1000,35174=>1000,35175=>1000,35176=>1000,35177=>1000,35178=>1000,35179=>1000,35180=>1000,35181=>1000,35182=>1000,35183=>1000,35184=>1000,35185=>1000,35186=>1000,35187=>1000,35188=>1000,
-	35189=>1000,35190=>1000,35191=>1000,35192=>1000,35193=>1000,35194=>1000,35195=>1000,35196=>1000,35197=>1000,35198=>1000,35199=>1000,35200=>1000,35201=>1000,35202=>1000,35203=>1000,35204=>1000,
-	35205=>1000,35206=>1000,35207=>1000,35208=>1000,35209=>1000,35210=>1000,35211=>1000,35212=>1000,35213=>1000,35214=>1000,35215=>1000,35216=>1000,35217=>1000,35218=>1000,35219=>1000,35220=>1000,
-	35221=>1000,35222=>1000,35223=>1000,35224=>1000,35225=>1000,35226=>1000,35227=>1000,35228=>1000,35229=>1000,35230=>1000,35231=>1000,35232=>1000,35233=>1000,35234=>1000,35235=>1000,35236=>1000,
-	35237=>1000,35238=>1000,35239=>1000,35240=>1000,35241=>1000,35242=>1000,35243=>1000,35244=>1000,35245=>1000,35246=>1000,35247=>1000,35248=>1000,35249=>1000,35250=>1000,35251=>1000,35252=>1000,
-	35253=>1000,35254=>1000,35255=>1000,35256=>1000,35257=>1000,35258=>1000,35259=>1000,35260=>1000,35261=>1000,35262=>1000,35263=>1000,35264=>1000,35265=>1000,35266=>1000,35267=>1000,35268=>1000,
-	35269=>1000,35270=>1000,35271=>1000,35272=>1000,35273=>1000,35274=>1000,35275=>1000,35276=>1000,35277=>1000,35278=>1000,35279=>1000,35280=>1000,35281=>1000,35282=>1000,35283=>1000,35284=>1000,
-	35285=>1000,35286=>1000,35287=>1000,35288=>1000,35289=>1000,35290=>1000,35291=>1000,35292=>1000,35293=>1000,35294=>1000,35295=>1000,35296=>1000,35297=>1000,35298=>1000,35299=>1000,35300=>1000,
-	35301=>1000,35302=>1000,35303=>1000,35304=>1000,35305=>1000,35306=>1000,35307=>1000,35308=>1000,35309=>1000,35310=>1000,35311=>1000,35312=>1000,35313=>1000,35314=>1000,35315=>1000,35316=>1000,
-	35317=>1000,35318=>1000,35319=>1000,35320=>1000,35321=>1000,35322=>1000,35323=>1000,35324=>1000,35325=>1000,35326=>1000,35327=>1000,35328=>1000,35329=>1000,35330=>1000,35331=>1000,35332=>1000,
-	35333=>1000,35334=>1000,35335=>1000,35336=>1000,35337=>1000,35338=>1000,35339=>1000,35340=>1000,35341=>1000,35342=>1000,35343=>1000,35344=>1000,35345=>1000,35346=>1000,35347=>1000,35348=>1000,
-	35349=>1000,35350=>1000,35351=>1000,35352=>1000,35353=>1000,35354=>1000,35355=>1000,35356=>1000,35357=>1000,35358=>1000,35359=>1000,35360=>1000,35361=>1000,35362=>1000,35363=>1000,35364=>1000,
-	35365=>1000,35366=>1000,35367=>1000,35368=>1000,35369=>1000,35370=>1000,35371=>1000,35372=>1000,35373=>1000,35374=>1000,35375=>1000,35376=>1000,35377=>1000,35378=>1000,35379=>1000,35380=>1000,
-	35381=>1000,35382=>1000,35383=>1000,35384=>1000,35385=>1000,35386=>1000,35387=>1000,35388=>1000,35389=>1000,35390=>1000,35391=>1000,35392=>1000,35393=>1000,35394=>1000,35395=>1000,35396=>1000,
-	35397=>1000,35398=>1000,35399=>1000,35400=>1000,35401=>1000,35402=>1000,35403=>1000,35404=>1000,35405=>1000,35406=>1000,35407=>1000,35408=>1000,35409=>1000,35410=>1000,35411=>1000,35412=>1000,
-	35413=>1000,35414=>1000,35415=>1000,35416=>1000,35417=>1000,35418=>1000,35419=>1000,35420=>1000,35421=>1000,35422=>1000,35423=>1000,35424=>1000,35425=>1000,35426=>1000,35427=>1000,35428=>1000,
-	35429=>1000,35430=>1000,35431=>1000,35432=>1000,35433=>1000,35434=>1000,35435=>1000,35436=>1000,35437=>1000,35438=>1000,35439=>1000,35440=>1000,35441=>1000,35442=>1000,35443=>1000,35444=>1000,
-	35445=>1000,35446=>1000,35447=>1000,35448=>1000,35449=>1000,35450=>1000,35451=>1000,35452=>1000,35453=>1000,35454=>1000,35455=>1000,35456=>1000,35457=>1000,35458=>1000,35459=>1000,35460=>1000,
-	35461=>1000,35462=>1000,35463=>1000,35464=>1000,35465=>1000,35466=>1000,35467=>1000,35468=>1000,35469=>1000,35470=>1000,35471=>1000,35472=>1000,35473=>1000,35474=>1000,35475=>1000,35476=>1000,
-	35477=>1000,35478=>1000,35479=>1000,35480=>1000,35481=>1000,35482=>1000,35483=>1000,35484=>1000,35485=>1000,35486=>1000,35487=>1000,35488=>1000,35489=>1000,35490=>1000,35491=>1000,35492=>1000,
-	35493=>1000,35494=>1000,35495=>1000,35496=>1000,35497=>1000,35498=>1000,35499=>1000,35500=>1000,35501=>1000,35502=>1000,35503=>1000,35504=>1000,35505=>1000,35506=>1000,35507=>1000,35508=>1000,
-	35509=>1000,35510=>1000,35511=>1000,35512=>1000,35513=>1000,35514=>1000,35515=>1000,35516=>1000,35517=>1000,35518=>1000,35519=>1000,35520=>1000,35521=>1000,35522=>1000,35523=>1000,35524=>1000,
-	35525=>1000,35526=>1000,35527=>1000,35528=>1000,35529=>1000,35530=>1000,35531=>1000,35532=>1000,35533=>1000,35534=>1000,35535=>1000,35536=>1000,35537=>1000,35538=>1000,35539=>1000,35540=>1000,
-	35541=>1000,35542=>1000,35543=>1000,35544=>1000,35545=>1000,35546=>1000,35547=>1000,35548=>1000,35549=>1000,35550=>1000,35551=>1000,35552=>1000,35553=>1000,35554=>1000,35555=>1000,35556=>1000,
-	35557=>1000,35558=>1000,35559=>1000,35560=>1000,35561=>1000,35562=>1000,35563=>1000,35564=>1000,35565=>1000,35566=>1000,35567=>1000,35568=>1000,35569=>1000,35570=>1000,35571=>1000,35572=>1000,
-	35573=>1000,35574=>1000,35575=>1000,35576=>1000,35577=>1000,35578=>1000,35579=>1000,35580=>1000,35581=>1000,35582=>1000,35583=>1000,35584=>1000,35585=>1000,35586=>1000,35587=>1000,35588=>1000,
-	35589=>1000,35590=>1000,35591=>1000,35592=>1000,35593=>1000,35594=>1000,35595=>1000,35596=>1000,35597=>1000,35598=>1000,35599=>1000,35600=>1000,35601=>1000,35602=>1000,35603=>1000,35604=>1000,
-	35605=>1000,35606=>1000,35607=>1000,35608=>1000,35609=>1000,35610=>1000,35611=>1000,35612=>1000,35613=>1000,35614=>1000,35615=>1000,35616=>1000,35617=>1000,35618=>1000,35619=>1000,35620=>1000,
-	35621=>1000,35622=>1000,35623=>1000,35624=>1000,35625=>1000,35626=>1000,35627=>1000,35628=>1000,35629=>1000,35630=>1000,35631=>1000,35632=>1000,35633=>1000,35634=>1000,35635=>1000,35636=>1000,
-	35637=>1000,35638=>1000,35639=>1000,35640=>1000,35641=>1000,35642=>1000,35643=>1000,35644=>1000,35645=>1000,35646=>1000,35647=>1000,35648=>1000,35649=>1000,35650=>1000,35651=>1000,35652=>1000,
-	35653=>1000,35654=>1000,35655=>1000,35656=>1000,35657=>1000,35658=>1000,35659=>1000,35660=>1000,35661=>1000,35662=>1000,35663=>1000,35664=>1000,35665=>1000,35666=>1000,35667=>1000,35668=>1000,
-	35669=>1000,35670=>1000,35671=>1000,35672=>1000,35673=>1000,35674=>1000,35675=>1000,35676=>1000,35677=>1000,35678=>1000,35679=>1000,35680=>1000,35681=>1000,35682=>1000,35683=>1000,35684=>1000,
-	35685=>1000,35686=>1000,35687=>1000,35688=>1000,35689=>1000,35690=>1000,35691=>1000,35692=>1000,35693=>1000,35694=>1000,35695=>1000,35696=>1000,35697=>1000,35698=>1000,35699=>1000,35700=>1000,
-	35701=>1000,35702=>1000,35703=>1000,35704=>1000,35705=>1000,35706=>1000,35707=>1000,35708=>1000,35709=>1000,35710=>1000,35711=>1000,35712=>1000,35713=>1000,35714=>1000,35715=>1000,35716=>1000,
-	35717=>1000,35718=>1000,35719=>1000,35720=>1000,35721=>1000,35722=>1000,35723=>1000,35724=>1000,35725=>1000,35726=>1000,35727=>1000,35728=>1000,35729=>1000,35730=>1000,35731=>1000,35732=>1000,
-	35733=>1000,35734=>1000,35735=>1000,35736=>1000,35737=>1000,35738=>1000,35739=>1000,35740=>1000,35741=>1000,35742=>1000,35743=>1000,35744=>1000,35745=>1000,35746=>1000,35747=>1000,35748=>1000,
-	35749=>1000,35750=>1000,35751=>1000,35752=>1000,35753=>1000,35754=>1000,35755=>1000,35756=>1000,35757=>1000,35758=>1000,35759=>1000,35760=>1000,35761=>1000,35762=>1000,35763=>1000,35764=>1000,
-	35765=>1000,35766=>1000,35767=>1000,35768=>1000,35769=>1000,35770=>1000,35771=>1000,35772=>1000,35773=>1000,35774=>1000,35775=>1000,35776=>1000,35777=>1000,35778=>1000,35779=>1000,35780=>1000,
-	35781=>1000,35782=>1000,35783=>1000,35784=>1000,35785=>1000,35786=>1000,35787=>1000,35788=>1000,35789=>1000,35790=>1000,35791=>1000,35792=>1000,35793=>1000,35794=>1000,35795=>1000,35796=>1000,
-	35797=>1000,35798=>1000,35799=>1000,35800=>1000,35801=>1000,35802=>1000,35803=>1000,35804=>1000,35805=>1000,35806=>1000,35807=>1000,35808=>1000,35809=>1000,35810=>1000,35811=>1000,35812=>1000,
-	35813=>1000,35814=>1000,35815=>1000,35816=>1000,35817=>1000,35818=>1000,35819=>1000,35820=>1000,35821=>1000,35822=>1000,35823=>1000,35824=>1000,35825=>1000,35826=>1000,35827=>1000,35828=>1000,
-	35829=>1000,35830=>1000,35831=>1000,35832=>1000,35833=>1000,35834=>1000,35835=>1000,35836=>1000,35837=>1000,35838=>1000,35839=>1000,35840=>1000,35841=>1000,35842=>1000,35843=>1000,35844=>1000,
-	35845=>1000,35846=>1000,35847=>1000,35848=>1000,35849=>1000,35850=>1000,35851=>1000,35852=>1000,35853=>1000,35854=>1000,35855=>1000,35856=>1000,35857=>1000,35858=>1000,35859=>1000,35860=>1000,
-	35861=>1000,35862=>1000,35863=>1000,35864=>1000,35865=>1000,35866=>1000,35867=>1000,35868=>1000,35869=>1000,35870=>1000,35871=>1000,35872=>1000,35873=>1000,35874=>1000,35875=>1000,35876=>1000,
-	35877=>1000,35878=>1000,35879=>1000,35880=>1000,35881=>1000,35882=>1000,35883=>1000,35884=>1000,35885=>1000,35886=>1000,35887=>1000,35888=>1000,35889=>1000,35890=>1000,35891=>1000,35892=>1000,
-	35893=>1000,35894=>1000,35895=>1000,35896=>1000,35897=>1000,35898=>1000,35899=>1000,35900=>1000,35901=>1000,35902=>1000,35903=>1000,35904=>1000,35905=>1000,35906=>1000,35907=>1000,35908=>1000,
-	35909=>1000,35910=>1000,35911=>1000,35912=>1000,35913=>1000,35914=>1000,35915=>1000,35916=>1000,35917=>1000,35918=>1000,35919=>1000,35920=>1000,35921=>1000,35922=>1000,35923=>1000,35924=>1000,
-	35925=>1000,35926=>1000,35927=>1000,35928=>1000,35929=>1000,35930=>1000,35931=>1000,35932=>1000,35933=>1000,35934=>1000,35935=>1000,35936=>1000,35937=>1000,35938=>1000,35939=>1000,35940=>1000,
-	35941=>1000,35942=>1000,35943=>1000,35944=>1000,35945=>1000,35946=>1000,35947=>1000,35948=>1000,35949=>1000,35950=>1000,35951=>1000,35952=>1000,35953=>1000,35954=>1000,35955=>1000,35956=>1000,
-	35957=>1000,35958=>1000,35959=>1000,35960=>1000,35961=>1000,35962=>1000,35963=>1000,35964=>1000,35965=>1000,35966=>1000,35967=>1000,35968=>1000,35969=>1000,35970=>1000,35971=>1000,35972=>1000,
-	35973=>1000,35974=>1000,35975=>1000,35976=>1000,35977=>1000,35978=>1000,35979=>1000,35980=>1000,35981=>1000,35982=>1000,35983=>1000,35984=>1000,35985=>1000,35986=>1000,35987=>1000,35988=>1000,
-	35989=>1000,35990=>1000,35991=>1000,35992=>1000,35993=>1000,35994=>1000,35995=>1000,35996=>1000,35997=>1000,35998=>1000,35999=>1000,36000=>1000,36001=>1000,36002=>1000,36003=>1000,36004=>1000,
-	36005=>1000,36006=>1000,36007=>1000,36008=>1000,36009=>1000,36010=>1000,36011=>1000,36012=>1000,36013=>1000,36014=>1000,36015=>1000,36016=>1000,36017=>1000,36018=>1000,36019=>1000,36020=>1000,
-	36021=>1000,36022=>1000,36023=>1000,36024=>1000,36025=>1000,36026=>1000,36027=>1000,36028=>1000,36029=>1000,36030=>1000,36031=>1000,36032=>1000,36033=>1000,36034=>1000,36035=>1000,36036=>1000,
-	36037=>1000,36038=>1000,36039=>1000,36040=>1000,36041=>1000,36042=>1000,36043=>1000,36044=>1000,36045=>1000,36046=>1000,36047=>1000,36048=>1000,36049=>1000,36050=>1000,36051=>1000,36052=>1000,
-	36053=>1000,36054=>1000,36055=>1000,36056=>1000,36057=>1000,36058=>1000,36059=>1000,36060=>1000,36061=>1000,36062=>1000,36063=>1000,36064=>1000,36065=>1000,36066=>1000,36067=>1000,36068=>1000,
-	36069=>1000,36070=>1000,36071=>1000,36072=>1000,36073=>1000,36074=>1000,36075=>1000,36076=>1000,36077=>1000,36078=>1000,36079=>1000,36080=>1000,36081=>1000,36082=>1000,36083=>1000,36084=>1000,
-	36085=>1000,36086=>1000,36087=>1000,36088=>1000,36089=>1000,36090=>1000,36091=>1000,36092=>1000,36093=>1000,36094=>1000,36095=>1000,36096=>1000,36097=>1000,36098=>1000,36099=>1000,36100=>1000,
-	36101=>1000,36102=>1000,36103=>1000,36104=>1000,36105=>1000,36106=>1000,36107=>1000,36108=>1000,36109=>1000,36110=>1000,36111=>1000,36112=>1000,36113=>1000,36114=>1000,36115=>1000,36116=>1000,
-	36117=>1000,36118=>1000,36119=>1000,36120=>1000,36121=>1000,36122=>1000,36123=>1000,36124=>1000,36125=>1000,36126=>1000,36127=>1000,36128=>1000,36129=>1000,36130=>1000,36131=>1000,36132=>1000,
-	36133=>1000,36134=>1000,36135=>1000,36136=>1000,36137=>1000,36138=>1000,36139=>1000,36140=>1000,36141=>1000,36142=>1000,36143=>1000,36144=>1000,36145=>1000,36146=>1000,36147=>1000,36148=>1000,
-	36149=>1000,36150=>1000,36151=>1000,36152=>1000,36153=>1000,36154=>1000,36155=>1000,36156=>1000,36157=>1000,36158=>1000,36159=>1000,36160=>1000,36161=>1000,36162=>1000,36163=>1000,36164=>1000,
-	36165=>1000,36166=>1000,36167=>1000,36168=>1000,36169=>1000,36170=>1000,36171=>1000,36172=>1000,36173=>1000,36174=>1000,36175=>1000,36176=>1000,36177=>1000,36178=>1000,36179=>1000,36180=>1000,
-	36181=>1000,36182=>1000,36183=>1000,36184=>1000,36185=>1000,36186=>1000,36187=>1000,36188=>1000,36189=>1000,36190=>1000,36191=>1000,36192=>1000,36193=>1000,36194=>1000,36195=>1000,36196=>1000,
-	36197=>1000,36198=>1000,36199=>1000,36200=>1000,36201=>1000,36202=>1000,36203=>1000,36204=>1000,36205=>1000,36206=>1000,36207=>1000,36208=>1000,36209=>1000,36210=>1000,36211=>1000,36212=>1000,
-	36213=>1000,36214=>1000,36215=>1000,36216=>1000,36217=>1000,36218=>1000,36219=>1000,36220=>1000,36221=>1000,36222=>1000,36223=>1000,36224=>1000,36225=>1000,36226=>1000,36227=>1000,36228=>1000,
-	36229=>1000,36230=>1000,36231=>1000,36232=>1000,36233=>1000,36234=>1000,36235=>1000,36236=>1000,36237=>1000,36238=>1000,36239=>1000,36240=>1000,36241=>1000,36242=>1000,36243=>1000,36244=>1000,
-	36245=>1000,36246=>1000,36247=>1000,36248=>1000,36249=>1000,36250=>1000,36251=>1000,36252=>1000,36253=>1000,36254=>1000,36255=>1000,36256=>1000,36257=>1000,36258=>1000,36259=>1000,36260=>1000,
-	36261=>1000,36262=>1000,36263=>1000,36264=>1000,36265=>1000,36266=>1000,36267=>1000,36268=>1000,36269=>1000,36270=>1000,36271=>1000,36272=>1000,36273=>1000,36274=>1000,36275=>1000,36276=>1000,
-	36277=>1000,36278=>1000,36279=>1000,36280=>1000,36281=>1000,36282=>1000,36283=>1000,36284=>1000,36285=>1000,36286=>1000,36287=>1000,36288=>1000,36289=>1000,36290=>1000,36291=>1000,36292=>1000,
-	36293=>1000,36294=>1000,36295=>1000,36296=>1000,36297=>1000,36298=>1000,36299=>1000,36300=>1000,36301=>1000,36302=>1000,36303=>1000,36304=>1000,36305=>1000,36306=>1000,36307=>1000,36308=>1000,
-	36309=>1000,36310=>1000,36311=>1000,36312=>1000,36313=>1000,36314=>1000,36315=>1000,36316=>1000,36317=>1000,36318=>1000,36319=>1000,36320=>1000,36321=>1000,36322=>1000,36323=>1000,36324=>1000,
-	36325=>1000,36326=>1000,36327=>1000,36328=>1000,36329=>1000,36330=>1000,36331=>1000,36332=>1000,36333=>1000,36334=>1000,36335=>1000,36336=>1000,36337=>1000,36338=>1000,36339=>1000,36340=>1000,
-	36341=>1000,36342=>1000,36343=>1000,36344=>1000,36345=>1000,36346=>1000,36347=>1000,36348=>1000,36349=>1000,36350=>1000,36351=>1000,36352=>1000,36353=>1000,36354=>1000,36355=>1000,36356=>1000,
-	36357=>1000,36358=>1000,36359=>1000,36360=>1000,36361=>1000,36362=>1000,36363=>1000,36364=>1000,36365=>1000,36366=>1000,36367=>1000,36368=>1000,36369=>1000,36370=>1000,36371=>1000,36372=>1000,
-	36373=>1000,36374=>1000,36375=>1000,36376=>1000,36377=>1000,36378=>1000,36379=>1000,36380=>1000,36381=>1000,36382=>1000,36383=>1000,36384=>1000,36385=>1000,36386=>1000,36387=>1000,36388=>1000,
-	36389=>1000,36390=>1000,36391=>1000,36392=>1000,36393=>1000,36394=>1000,36395=>1000,36396=>1000,36397=>1000,36398=>1000,36399=>1000,36400=>1000,36401=>1000,36402=>1000,36403=>1000,36404=>1000,
-	36405=>1000,36406=>1000,36407=>1000,36408=>1000,36409=>1000,36410=>1000,36411=>1000,36412=>1000,36413=>1000,36414=>1000,36415=>1000,36416=>1000,36417=>1000,36418=>1000,36419=>1000,36420=>1000,
-	36421=>1000,36422=>1000,36423=>1000,36424=>1000,36425=>1000,36426=>1000,36427=>1000,36428=>1000,36429=>1000,36430=>1000,36431=>1000,36432=>1000,36433=>1000,36434=>1000,36435=>1000,36436=>1000,
-	36437=>1000,36438=>1000,36439=>1000,36440=>1000,36441=>1000,36442=>1000,36443=>1000,36444=>1000,36445=>1000,36446=>1000,36447=>1000,36448=>1000,36449=>1000,36450=>1000,36451=>1000,36452=>1000,
-	36453=>1000,36454=>1000,36455=>1000,36456=>1000,36457=>1000,36458=>1000,36459=>1000,36460=>1000,36461=>1000,36462=>1000,36463=>1000,36464=>1000,36465=>1000,36466=>1000,36467=>1000,36468=>1000,
-	36469=>1000,36470=>1000,36471=>1000,36472=>1000,36473=>1000,36474=>1000,36475=>1000,36476=>1000,36477=>1000,36478=>1000,36479=>1000,36480=>1000,36481=>1000,36482=>1000,36483=>1000,36484=>1000,
-	36485=>1000,36486=>1000,36487=>1000,36488=>1000,36489=>1000,36490=>1000,36491=>1000,36492=>1000,36493=>1000,36494=>1000,36495=>1000,36496=>1000,36497=>1000,36498=>1000,36499=>1000,36500=>1000,
-	36501=>1000,36502=>1000,36503=>1000,36504=>1000,36505=>1000,36506=>1000,36507=>1000,36508=>1000,36509=>1000,36510=>1000,36511=>1000,36512=>1000,36513=>1000,36514=>1000,36515=>1000,36516=>1000,
-	36517=>1000,36518=>1000,36519=>1000,36520=>1000,36521=>1000,36522=>1000,36523=>1000,36524=>1000,36525=>1000,36526=>1000,36527=>1000,36528=>1000,36529=>1000,36530=>1000,36531=>1000,36532=>1000,
-	36533=>1000,36534=>1000,36535=>1000,36536=>1000,36537=>1000,36538=>1000,36539=>1000,36540=>1000,36541=>1000,36542=>1000,36543=>1000,36544=>1000,36545=>1000,36546=>1000,36547=>1000,36548=>1000,
-	36549=>1000,36550=>1000,36551=>1000,36552=>1000,36553=>1000,36554=>1000,36555=>1000,36556=>1000,36557=>1000,36558=>1000,36559=>1000,36560=>1000,36561=>1000,36562=>1000,36563=>1000,36564=>1000,
-	36565=>1000,36566=>1000,36567=>1000,36568=>1000,36569=>1000,36570=>1000,36571=>1000,36572=>1000,36573=>1000,36574=>1000,36575=>1000,36576=>1000,36577=>1000,36578=>1000,36579=>1000,36580=>1000,
-	36581=>1000,36582=>1000,36583=>1000,36584=>1000,36585=>1000,36586=>1000,36587=>1000,36588=>1000,36589=>1000,36590=>1000,36591=>1000,36592=>1000,36593=>1000,36594=>1000,36595=>1000,36596=>1000,
-	36597=>1000,36598=>1000,36599=>1000,36600=>1000,36601=>1000,36602=>1000,36603=>1000,36604=>1000,36605=>1000,36606=>1000,36607=>1000,36608=>1000,36609=>1000,36610=>1000,36611=>1000,36612=>1000,
-	36613=>1000,36614=>1000,36615=>1000,36616=>1000,36617=>1000,36618=>1000,36619=>1000,36620=>1000,36621=>1000,36622=>1000,36623=>1000,36624=>1000,36625=>1000,36626=>1000,36627=>1000,36628=>1000,
-	36629=>1000,36630=>1000,36631=>1000,36632=>1000,36633=>1000,36634=>1000,36635=>1000,36636=>1000,36637=>1000,36638=>1000,36639=>1000,36640=>1000,36641=>1000,36642=>1000,36643=>1000,36644=>1000,
-	36645=>1000,36646=>1000,36647=>1000,36648=>1000,36649=>1000,36650=>1000,36651=>1000,36652=>1000,36653=>1000,36654=>1000,36655=>1000,36656=>1000,36657=>1000,36658=>1000,36659=>1000,36660=>1000,
-	36661=>1000,36662=>1000,36663=>1000,36664=>1000,36665=>1000,36666=>1000,36667=>1000,36668=>1000,36669=>1000,36670=>1000,36671=>1000,36672=>1000,36673=>1000,36674=>1000,36675=>1000,36676=>1000,
-	36677=>1000,36678=>1000,36679=>1000,36680=>1000,36681=>1000,36682=>1000,36683=>1000,36684=>1000,36685=>1000,36686=>1000,36687=>1000,36688=>1000,36689=>1000,36690=>1000,36691=>1000,36692=>1000,
-	36693=>1000,36694=>1000,36695=>1000,36696=>1000,36697=>1000,36698=>1000,36699=>1000,36700=>1000,36701=>1000,36702=>1000,36703=>1000,36704=>1000,36705=>1000,36706=>1000,36707=>1000,36708=>1000,
-	36709=>1000,36710=>1000,36711=>1000,36712=>1000,36713=>1000,36714=>1000,36715=>1000,36716=>1000,36717=>1000,36718=>1000,36719=>1000,36720=>1000,36721=>1000,36722=>1000,36723=>1000,36724=>1000,
-	36725=>1000,36726=>1000,36727=>1000,36728=>1000,36729=>1000,36730=>1000,36731=>1000,36732=>1000,36733=>1000,36734=>1000,36735=>1000,36736=>1000,36737=>1000,36738=>1000,36739=>1000,36740=>1000,
-	36741=>1000,36742=>1000,36743=>1000,36744=>1000,36745=>1000,36746=>1000,36747=>1000,36748=>1000,36749=>1000,36750=>1000,36751=>1000,36752=>1000,36753=>1000,36754=>1000,36755=>1000,36756=>1000,
-	36757=>1000,36758=>1000,36759=>1000,36760=>1000,36761=>1000,36762=>1000,36763=>1000,36764=>1000,36765=>1000,36766=>1000,36767=>1000,36768=>1000,36769=>1000,36770=>1000,36771=>1000,36772=>1000,
-	36773=>1000,36774=>1000,36775=>1000,36776=>1000,36777=>1000,36778=>1000,36779=>1000,36780=>1000,36781=>1000,36782=>1000,36783=>1000,36784=>1000,36785=>1000,36786=>1000,36787=>1000,36788=>1000,
-	36789=>1000,36790=>1000,36791=>1000,36792=>1000,36793=>1000,36794=>1000,36795=>1000,36796=>1000,36797=>1000,36798=>1000,36799=>1000,36800=>1000,36801=>1000,36802=>1000,36803=>1000,36804=>1000,
-	36805=>1000,36806=>1000,36807=>1000,36808=>1000,36809=>1000,36810=>1000,36811=>1000,36812=>1000,36813=>1000,36814=>1000,36815=>1000,36816=>1000,36817=>1000,36818=>1000,36819=>1000,36820=>1000,
-	36821=>1000,36822=>1000,36823=>1000,36824=>1000,36825=>1000,36826=>1000,36827=>1000,36828=>1000,36829=>1000,36830=>1000,36831=>1000,36832=>1000,36833=>1000,36834=>1000,36835=>1000,36836=>1000,
-	36837=>1000,36838=>1000,36839=>1000,36840=>1000,36841=>1000,36842=>1000,36843=>1000,36844=>1000,36845=>1000,36846=>1000,36847=>1000,36848=>1000,36849=>1000,36850=>1000,36851=>1000,36852=>1000,
-	36853=>1000,36854=>1000,36855=>1000,36856=>1000,36857=>1000,36858=>1000,36859=>1000,36860=>1000,36861=>1000,36862=>1000,36863=>1000,36864=>1000,36865=>1000,36866=>1000,36867=>1000,36868=>1000,
-	36869=>1000,36870=>1000,36871=>1000,36872=>1000,36873=>1000,36874=>1000,36875=>1000,36876=>1000,36877=>1000,36878=>1000,36879=>1000,36880=>1000,36881=>1000,36882=>1000,36883=>1000,36884=>1000,
-	36885=>1000,36886=>1000,36887=>1000,36888=>1000,36889=>1000,36890=>1000,36891=>1000,36892=>1000,36893=>1000,36894=>1000,36895=>1000,36896=>1000,36897=>1000,36898=>1000,36899=>1000,36900=>1000,
-	36901=>1000,36902=>1000,36903=>1000,36904=>1000,36905=>1000,36906=>1000,36907=>1000,36908=>1000,36909=>1000,36910=>1000,36911=>1000,36912=>1000,36913=>1000,36914=>1000,36915=>1000,36916=>1000,
-	36917=>1000,36918=>1000,36919=>1000,36920=>1000,36921=>1000,36922=>1000,36923=>1000,36924=>1000,36925=>1000,36926=>1000,36927=>1000,36928=>1000,36929=>1000,36930=>1000,36931=>1000,36932=>1000,
-	36933=>1000,36934=>1000,36935=>1000,36936=>1000,36937=>1000,36938=>1000,36939=>1000,36940=>1000,36941=>1000,36942=>1000,36943=>1000,36944=>1000,36945=>1000,36946=>1000,36947=>1000,36948=>1000,
-	36949=>1000,36950=>1000,36951=>1000,36952=>1000,36953=>1000,36954=>1000,36955=>1000,36956=>1000,36957=>1000,36958=>1000,36959=>1000,36960=>1000,36961=>1000,36962=>1000,36963=>1000,36964=>1000,
-	36965=>1000,36966=>1000,36967=>1000,36968=>1000,36969=>1000,36970=>1000,36971=>1000,36972=>1000,36973=>1000,36974=>1000,36975=>1000,36976=>1000,36977=>1000,36978=>1000,36979=>1000,36980=>1000,
-	36981=>1000,36982=>1000,36983=>1000,36984=>1000,36985=>1000,36986=>1000,36987=>1000,36988=>1000,36989=>1000,36990=>1000,36991=>1000,36992=>1000,36993=>1000,36994=>1000,36995=>1000,36996=>1000,
-	36997=>1000,36998=>1000,36999=>1000,37000=>1000,37001=>1000,37002=>1000,37003=>1000,37004=>1000,37005=>1000,37006=>1000,37007=>1000,37008=>1000,37009=>1000,37010=>1000,37011=>1000,37012=>1000,
-	37013=>1000,37014=>1000,37015=>1000,37016=>1000,37017=>1000,37018=>1000,37019=>1000,37020=>1000,37021=>1000,37022=>1000,37023=>1000,37024=>1000,37025=>1000,37026=>1000,37027=>1000,37028=>1000,
-	37029=>1000,37030=>1000,37031=>1000,37032=>1000,37033=>1000,37034=>1000,37035=>1000,37036=>1000,37037=>1000,37038=>1000,37039=>1000,37040=>1000,37041=>1000,37042=>1000,37043=>1000,37044=>1000,
-	37045=>1000,37046=>1000,37047=>1000,37048=>1000,37049=>1000,37050=>1000,37051=>1000,37052=>1000,37053=>1000,37054=>1000,37055=>1000,37056=>1000,37057=>1000,37058=>1000,37059=>1000,37060=>1000,
-	37061=>1000,37062=>1000,37063=>1000,37064=>1000,37065=>1000,37066=>1000,37067=>1000,37068=>1000,37069=>1000,37070=>1000,37071=>1000,37072=>1000,37073=>1000,37074=>1000,37075=>1000,37076=>1000,
-	37077=>1000,37078=>1000,37079=>1000,37080=>1000,37081=>1000,37082=>1000,37083=>1000,37084=>1000,37085=>1000,37086=>1000,37087=>1000,37088=>1000,37089=>1000,37090=>1000,37091=>1000,37092=>1000,
-	37093=>1000,37094=>1000,37095=>1000,37096=>1000,37097=>1000,37098=>1000,37099=>1000,37100=>1000,37101=>1000,37102=>1000,37103=>1000,37104=>1000,37105=>1000,37106=>1000,37107=>1000,37108=>1000,
-	37109=>1000,37110=>1000,37111=>1000,37112=>1000,37113=>1000,37114=>1000,37115=>1000,37116=>1000,37117=>1000,37118=>1000,37119=>1000,37120=>1000,37121=>1000,37122=>1000,37123=>1000,37124=>1000,
-	37125=>1000,37126=>1000,37127=>1000,37128=>1000,37129=>1000,37130=>1000,37131=>1000,37132=>1000,37133=>1000,37134=>1000,37135=>1000,37136=>1000,37137=>1000,37138=>1000,37139=>1000,37140=>1000,
-	37141=>1000,37142=>1000,37143=>1000,37144=>1000,37145=>1000,37146=>1000,37147=>1000,37148=>1000,37149=>1000,37150=>1000,37151=>1000,37152=>1000,37153=>1000,37154=>1000,37155=>1000,37156=>1000,
-	37157=>1000,37158=>1000,37159=>1000,37160=>1000,37161=>1000,37162=>1000,37163=>1000,37164=>1000,37165=>1000,37166=>1000,37167=>1000,37168=>1000,37169=>1000,37170=>1000,37171=>1000,37172=>1000,
-	37173=>1000,37174=>1000,37175=>1000,37176=>1000,37177=>1000,37178=>1000,37179=>1000,37180=>1000,37181=>1000,37182=>1000,37183=>1000,37184=>1000,37185=>1000,37186=>1000,37187=>1000,37188=>1000,
-	37189=>1000,37190=>1000,37191=>1000,37192=>1000,37193=>1000,37194=>1000,37195=>1000,37196=>1000,37197=>1000,37198=>1000,37199=>1000,37200=>1000,37201=>1000,37202=>1000,37203=>1000,37204=>1000,
-	37205=>1000,37206=>1000,37207=>1000,37208=>1000,37209=>1000,37210=>1000,37211=>1000,37212=>1000,37213=>1000,37214=>1000,37215=>1000,37216=>1000,37217=>1000,37218=>1000,37219=>1000,37220=>1000,
-	37221=>1000,37222=>1000,37223=>1000,37224=>1000,37225=>1000,37226=>1000,37227=>1000,37228=>1000,37229=>1000,37230=>1000,37231=>1000,37232=>1000,37233=>1000,37234=>1000,37235=>1000,37236=>1000,
-	37237=>1000,37238=>1000,37239=>1000,37240=>1000,37241=>1000,37242=>1000,37243=>1000,37244=>1000,37245=>1000,37246=>1000,37247=>1000,37248=>1000,37249=>1000,37250=>1000,37251=>1000,37252=>1000,
-	37253=>1000,37254=>1000,37255=>1000,37256=>1000,37257=>1000,37258=>1000,37259=>1000,37260=>1000,37261=>1000,37262=>1000,37263=>1000,37264=>1000,37265=>1000,37266=>1000,37267=>1000,37268=>1000,
-	37269=>1000,37270=>1000,37271=>1000,37272=>1000,37273=>1000,37274=>1000,37275=>1000,37276=>1000,37277=>1000,37278=>1000,37279=>1000,37280=>1000,37281=>1000,37282=>1000,37283=>1000,37284=>1000,
-	37285=>1000,37286=>1000,37287=>1000,37288=>1000,37289=>1000,37290=>1000,37291=>1000,37292=>1000,37293=>1000,37294=>1000,37295=>1000,37296=>1000,37297=>1000,37298=>1000,37299=>1000,37300=>1000,
-	37301=>1000,37302=>1000,37303=>1000,37304=>1000,37305=>1000,37306=>1000,37307=>1000,37308=>1000,37309=>1000,37310=>1000,37311=>1000,37312=>1000,37313=>1000,37314=>1000,37315=>1000,37316=>1000,
-	37317=>1000,37318=>1000,37319=>1000,37320=>1000,37321=>1000,37322=>1000,37323=>1000,37324=>1000,37325=>1000,37326=>1000,37327=>1000,37328=>1000,37329=>1000,37330=>1000,37331=>1000,37332=>1000,
-	37333=>1000,37334=>1000,37335=>1000,37336=>1000,37337=>1000,37338=>1000,37339=>1000,37340=>1000,37341=>1000,37342=>1000,37343=>1000,37344=>1000,37345=>1000,37346=>1000,37347=>1000,37348=>1000,
-	37349=>1000,37350=>1000,37351=>1000,37352=>1000,37353=>1000,37354=>1000,37355=>1000,37356=>1000,37357=>1000,37358=>1000,37359=>1000,37360=>1000,37361=>1000,37362=>1000,37363=>1000,37364=>1000,
-	37365=>1000,37366=>1000,37367=>1000,37368=>1000,37369=>1000,37370=>1000,37371=>1000,37372=>1000,37373=>1000,37374=>1000,37375=>1000,37376=>1000,37377=>1000,37378=>1000,37379=>1000,37380=>1000,
-	37381=>1000,37382=>1000,37383=>1000,37384=>1000,37385=>1000,37386=>1000,37387=>1000,37388=>1000,37389=>1000,37390=>1000,37391=>1000,37392=>1000,37393=>1000,37394=>1000,37395=>1000,37396=>1000,
-	37397=>1000,37398=>1000,37399=>1000,37400=>1000,37401=>1000,37402=>1000,37403=>1000,37404=>1000,37405=>1000,37406=>1000,37407=>1000,37408=>1000,37409=>1000,37410=>1000,37411=>1000,37412=>1000,
-	37413=>1000,37414=>1000,37415=>1000,37416=>1000,37417=>1000,37418=>1000,37419=>1000,37420=>1000,37421=>1000,37422=>1000,37423=>1000,37424=>1000,37425=>1000,37426=>1000,37427=>1000,37428=>1000,
-	37429=>1000,37430=>1000,37431=>1000,37432=>1000,37433=>1000,37434=>1000,37435=>1000,37436=>1000,37437=>1000,37438=>1000,37439=>1000,37440=>1000,37441=>1000,37442=>1000,37443=>1000,37444=>1000,
-	37445=>1000,37446=>1000,37447=>1000,37448=>1000,37449=>1000,37450=>1000,37451=>1000,37452=>1000,37453=>1000,37454=>1000,37455=>1000,37456=>1000,37457=>1000,37458=>1000,37459=>1000,37460=>1000,
-	37461=>1000,37462=>1000,37463=>1000,37464=>1000,37465=>1000,37466=>1000,37467=>1000,37468=>1000,37469=>1000,37470=>1000,37471=>1000,37472=>1000,37473=>1000,37474=>1000,37475=>1000,37476=>1000,
-	37477=>1000,37478=>1000,37479=>1000,37480=>1000,37481=>1000,37482=>1000,37483=>1000,37484=>1000,37485=>1000,37486=>1000,37487=>1000,37488=>1000,37489=>1000,37490=>1000,37491=>1000,37492=>1000,
-	37493=>1000,37494=>1000,37495=>1000,37496=>1000,37497=>1000,37498=>1000,37499=>1000,37500=>1000,37501=>1000,37502=>1000,37503=>1000,37504=>1000,37505=>1000,37506=>1000,37507=>1000,37508=>1000,
-	37509=>1000,37510=>1000,37511=>1000,37512=>1000,37513=>1000,37514=>1000,37515=>1000,37516=>1000,37517=>1000,37518=>1000,37519=>1000,37520=>1000,37521=>1000,37522=>1000,37523=>1000,37524=>1000,
-	37525=>1000,37526=>1000,37527=>1000,37528=>1000,37529=>1000,37530=>1000,37531=>1000,37532=>1000,37533=>1000,37534=>1000,37535=>1000,37536=>1000,37537=>1000,37538=>1000,37539=>1000,37540=>1000,
-	37541=>1000,37542=>1000,37543=>1000,37544=>1000,37545=>1000,37546=>1000,37547=>1000,37548=>1000,37549=>1000,37550=>1000,37551=>1000,37552=>1000,37553=>1000,37554=>1000,37555=>1000,37556=>1000,
-	37557=>1000,37558=>1000,37559=>1000,37560=>1000,37561=>1000,37562=>1000,37563=>1000,37564=>1000,37565=>1000,37566=>1000,37567=>1000,37568=>1000,37569=>1000,37570=>1000,37571=>1000,37572=>1000,
-	37573=>1000,37574=>1000,37575=>1000,37576=>1000,37577=>1000,37578=>1000,37579=>1000,37580=>1000,37581=>1000,37582=>1000,37583=>1000,37584=>1000,37585=>1000,37586=>1000,37587=>1000,37588=>1000,
-	37589=>1000,37590=>1000,37591=>1000,37592=>1000,37593=>1000,37594=>1000,37595=>1000,37596=>1000,37597=>1000,37598=>1000,37599=>1000,37600=>1000,37601=>1000,37602=>1000,37603=>1000,37604=>1000,
-	37605=>1000,37606=>1000,37607=>1000,37608=>1000,37609=>1000,37610=>1000,37611=>1000,37612=>1000,37613=>1000,37614=>1000,37615=>1000,37616=>1000,37617=>1000,37618=>1000,37619=>1000,37620=>1000,
-	37621=>1000,37622=>1000,37623=>1000,37624=>1000,37625=>1000,37626=>1000,37627=>1000,37628=>1000,37629=>1000,37630=>1000,37631=>1000,37632=>1000,37633=>1000,37634=>1000,37635=>1000,37636=>1000,
-	37637=>1000,37638=>1000,37639=>1000,37640=>1000,37641=>1000,37642=>1000,37643=>1000,37644=>1000,37645=>1000,37646=>1000,37647=>1000,37648=>1000,37649=>1000,37650=>1000,37651=>1000,37652=>1000,
-	37653=>1000,37654=>1000,37655=>1000,37656=>1000,37657=>1000,37658=>1000,37659=>1000,37660=>1000,37661=>1000,37662=>1000,37663=>1000,37664=>1000,37665=>1000,37666=>1000,37667=>1000,37668=>1000,
-	37669=>1000,37670=>1000,37671=>1000,37672=>1000,37673=>1000,37674=>1000,37675=>1000,37676=>1000,37677=>1000,37678=>1000,37679=>1000,37680=>1000,37681=>1000,37682=>1000,37683=>1000,37684=>1000,
-	37685=>1000,37686=>1000,37687=>1000,37688=>1000,37689=>1000,37690=>1000,37691=>1000,37692=>1000,37693=>1000,37694=>1000,37695=>1000,37696=>1000,37697=>1000,37698=>1000,37699=>1000,37700=>1000,
-	37701=>1000,37702=>1000,37703=>1000,37704=>1000,37705=>1000,37706=>1000,37707=>1000,37708=>1000,37709=>1000,37710=>1000,37711=>1000,37712=>1000,37713=>1000,37714=>1000,37715=>1000,37716=>1000,
-	37717=>1000,37718=>1000,37719=>1000,37720=>1000,37721=>1000,37722=>1000,37723=>1000,37724=>1000,37725=>1000,37726=>1000,37727=>1000,37728=>1000,37729=>1000,37730=>1000,37731=>1000,37732=>1000,
-	37733=>1000,37734=>1000,37735=>1000,37736=>1000,37737=>1000,37738=>1000,37739=>1000,37740=>1000,37741=>1000,37742=>1000,37743=>1000,37744=>1000,37745=>1000,37746=>1000,37747=>1000,37748=>1000,
-	37749=>1000,37750=>1000,37751=>1000,37752=>1000,37753=>1000,37754=>1000,37755=>1000,37756=>1000,37757=>1000,37758=>1000,37759=>1000,37760=>1000,37761=>1000,37762=>1000,37763=>1000,37764=>1000,
-	37765=>1000,37766=>1000,37767=>1000,37768=>1000,37769=>1000,37770=>1000,37771=>1000,37772=>1000,37773=>1000,37774=>1000,37775=>1000,37776=>1000,37777=>1000,37778=>1000,37779=>1000,37780=>1000,
-	37781=>1000,37782=>1000,37783=>1000,37784=>1000,37785=>1000,37786=>1000,37787=>1000,37788=>1000,37789=>1000,37790=>1000,37791=>1000,37792=>1000,37793=>1000,37794=>1000,37795=>1000,37796=>1000,
-	37797=>1000,37798=>1000,37799=>1000,37800=>1000,37801=>1000,37802=>1000,37803=>1000,37804=>1000,37805=>1000,37806=>1000,37807=>1000,37808=>1000,37809=>1000,37810=>1000,37811=>1000,37812=>1000,
-	37813=>1000,37814=>1000,37815=>1000,37816=>1000,37817=>1000,37818=>1000,37819=>1000,37820=>1000,37821=>1000,37822=>1000,37823=>1000,37824=>1000,37825=>1000,37826=>1000,37827=>1000,37828=>1000,
-	37829=>1000,37830=>1000,37831=>1000,37832=>1000,37833=>1000,37834=>1000,37835=>1000,37836=>1000,37837=>1000,37838=>1000,37839=>1000,37840=>1000,37841=>1000,37842=>1000,37843=>1000,37844=>1000,
-	37845=>1000,37846=>1000,37847=>1000,37848=>1000,37849=>1000,37850=>1000,37851=>1000,37852=>1000,37853=>1000,37854=>1000,37855=>1000,37856=>1000,37857=>1000,37858=>1000,37859=>1000,37860=>1000,
-	37861=>1000,37862=>1000,37863=>1000,37864=>1000,37865=>1000,37866=>1000,37867=>1000,37868=>1000,37869=>1000,37870=>1000,37871=>1000,37872=>1000,37873=>1000,37874=>1000,37875=>1000,37876=>1000,
-	37877=>1000,37878=>1000,37879=>1000,37880=>1000,37881=>1000,37882=>1000,37883=>1000,37884=>1000,37885=>1000,37886=>1000,37887=>1000,37888=>1000,37889=>1000,37890=>1000,37891=>1000,37892=>1000,
-	37893=>1000,37894=>1000,37895=>1000,37896=>1000,37897=>1000,37898=>1000,37899=>1000,37900=>1000,37901=>1000,37902=>1000,37903=>1000,37904=>1000,37905=>1000,37906=>1000,37907=>1000,37908=>1000,
-	37909=>1000,37910=>1000,37911=>1000,37912=>1000,37913=>1000,37914=>1000,37915=>1000,37916=>1000,37917=>1000,37918=>1000,37919=>1000,37920=>1000,37921=>1000,37922=>1000,37923=>1000,37924=>1000,
-	37925=>1000,37926=>1000,37927=>998,37928=>1000,37929=>1000,37930=>1000,37931=>1000,37932=>1000,37933=>1000,37934=>1000,37935=>1000,37936=>1000,37937=>1000,37938=>1000,37939=>1000,37940=>1000,
-	37941=>1000,37942=>1000,37943=>1000,37944=>1000,37945=>1000,37946=>1000,37947=>1000,37948=>1000,37949=>1000,37950=>1000,37951=>1000,37952=>1000,37953=>1000,37954=>1000,37955=>1000,37956=>1000,
-	37957=>1000,37958=>1000,37959=>1000,37960=>1000,37961=>1000,37962=>1000,37963=>1000,37964=>1000,37965=>1000,37966=>1000,37967=>1000,37968=>1000,37969=>1000,37970=>1000,37971=>1000,37972=>1000,
-	37973=>1000,37974=>1000,37975=>1000,37976=>1000,37977=>1000,37978=>1000,37979=>1000,37980=>1000,37981=>1000,37982=>1000,37983=>1000,37984=>1000,37985=>1000,37986=>1000,37987=>1000,37988=>1000,
-	37989=>1000,37990=>1000,37991=>1000,37992=>1000,37993=>1000,37994=>1000,37995=>1000,37996=>1000,37997=>1000,37998=>1000,37999=>1000,38000=>1000,38001=>1000,38002=>1000,38003=>1000,38004=>1000,
-	38005=>1000,38006=>1000,38007=>1000,38008=>1000,38009=>1000,38010=>1000,38011=>1000,38012=>1000,38013=>1000,38014=>1000,38015=>1000,38016=>1000,38017=>1000,38018=>1000,38019=>1000,38020=>1000,
-	38021=>1000,38022=>1000,38023=>1000,38024=>1000,38025=>1000,38026=>1000,38027=>1000,38028=>1000,38029=>1000,38030=>1000,38031=>1000,38032=>1000,38033=>1000,38034=>1000,38035=>1000,38036=>1000,
-	38037=>1000,38038=>1000,38039=>1000,38040=>1000,38041=>1000,38042=>1000,38043=>1000,38044=>1000,38045=>1000,38046=>1000,38047=>1000,38048=>1000,38049=>1000,38050=>1000,38051=>1000,38052=>1000,
-	38053=>1000,38054=>1000,38055=>1000,38056=>1000,38057=>1000,38058=>1000,38059=>1000,38060=>1000,38061=>1000,38062=>1000,38063=>1000,38064=>1000,38065=>1000,38066=>1000,38067=>1000,38068=>1000,
-	38069=>1000,38070=>1000,38071=>1000,38072=>1000,38073=>1000,38074=>1000,38075=>1000,38076=>1000,38077=>1000,38078=>1000,38079=>1000,38080=>1000,38081=>1000,38082=>1000,38083=>1000,38084=>1000,
-	38085=>1000,38086=>1000,38087=>1000,38088=>1000,38089=>1000,38090=>1000,38091=>1000,38092=>1000,38093=>1000,38094=>1000,38095=>1000,38096=>1000,38097=>1000,38098=>1000,38099=>1000,38100=>1000,
-	38101=>1000,38102=>1000,38103=>1000,38104=>1000,38105=>1000,38106=>1000,38107=>1000,38108=>1000,38109=>1000,38110=>1000,38111=>1000,38112=>1000,38113=>1000,38114=>1000,38115=>1000,38116=>1000,
-	38117=>1000,38118=>1000,38119=>1000,38120=>1000,38121=>1000,38122=>1000,38123=>1000,38124=>1000,38125=>1000,38126=>1000,38127=>1000,38128=>1000,38129=>1000,38130=>1000,38131=>1000,38132=>1000,
-	38133=>1000,38134=>1000,38135=>1000,38136=>1000,38137=>1000,38138=>1000,38139=>1000,38140=>1000,38141=>1000,38142=>1000,38143=>1000,38144=>1000,38145=>1000,38146=>1000,38147=>1000,38148=>1000,
-	38149=>1000,38150=>1000,38151=>1000,38152=>1000,38153=>1000,38154=>1000,38155=>1000,38156=>1000,38157=>1000,38158=>1000,38159=>1000,38160=>1000,38161=>1000,38162=>1000,38163=>1000,38164=>1000,
-	38165=>1000,38166=>1000,38167=>1000,38168=>1000,38169=>1000,38170=>1000,38171=>1000,38172=>1000,38173=>1000,38174=>1000,38175=>1000,38176=>1000,38177=>1000,38178=>1000,38179=>1000,38180=>1000,
-	38181=>1000,38182=>1000,38183=>1000,38184=>1000,38185=>1000,38186=>1000,38187=>1000,38188=>1000,38189=>1000,38190=>1000,38191=>1000,38192=>1000,38193=>1000,38194=>1000,38195=>1000,38196=>1000,
-	38197=>1000,38198=>1000,38199=>1000,38200=>1000,38201=>1000,38202=>1000,38203=>1000,38204=>1000,38205=>1000,38206=>1000,38207=>1000,38208=>1000,38209=>1000,38210=>1000,38211=>1000,38212=>1000,
-	38213=>1000,38214=>1000,38215=>1000,38216=>1000,38217=>1000,38218=>1000,38219=>1000,38220=>1000,38221=>1000,38222=>1000,38223=>1000,38224=>1000,38225=>1000,38226=>1000,38227=>1000,38228=>1000,
-	38229=>1000,38230=>1000,38231=>1000,38232=>1000,38233=>1000,38234=>1000,38235=>1000,38236=>1000,38237=>1000,38238=>1000,38239=>1000,38240=>1000,38241=>1000,38242=>1000,38243=>1000,38244=>1000,
-	38245=>1000,38246=>1000,38247=>1000,38248=>1000,38249=>1000,38250=>1000,38251=>1000,38252=>1000,38253=>1000,38254=>1000,38255=>1000,38256=>1000,38257=>1000,38258=>1000,38259=>1000,38260=>1000,
-	38261=>1000,38262=>1000,38263=>1000,38264=>1000,38265=>1000,38266=>1000,38267=>1000,38268=>1000,38269=>1000,38270=>1000,38271=>1000,38272=>1000,38273=>1000,38274=>1000,38275=>1000,38276=>1000,
-	38277=>1000,38278=>1000,38279=>1000,38280=>1000,38281=>1000,38282=>1000,38283=>1000,38284=>1000,38285=>1000,38286=>1000,38287=>1000,38288=>1000,38289=>1000,38290=>1000,38291=>1000,38292=>1000,
-	38293=>1000,38294=>1000,38295=>1000,38296=>1000,38297=>1000,38298=>1000,38299=>1000,38300=>1000,38301=>1000,38302=>1000,38303=>1000,38304=>1000,38305=>1000,38306=>1000,38307=>1000,38308=>1000,
-	38309=>1000,38310=>1000,38311=>1000,38312=>1000,38313=>1000,38314=>1000,38315=>1000,38316=>1000,38317=>1000,38318=>1000,38319=>1000,38320=>1000,38321=>1000,38322=>1000,38323=>1000,38324=>1000,
-	38325=>1000,38326=>1000,38327=>1000,38328=>1000,38329=>1000,38330=>1000,38331=>1000,38332=>1000,38333=>1000,38334=>1000,38335=>1000,38336=>1000,38337=>1000,38338=>1000,38339=>1000,38340=>1000,
-	38341=>1000,38342=>1000,38343=>1000,38344=>1000,38345=>1000,38346=>1000,38347=>1000,38348=>1000,38349=>1000,38350=>1000,38351=>1000,38352=>1000,38353=>1000,38354=>1000,38355=>1000,38356=>1000,
-	38357=>1000,38358=>1000,38359=>1000,38360=>1000,38361=>1000,38362=>1000,38363=>1000,38364=>1000,38365=>1000,38366=>1000,38367=>1000,38368=>1000,38369=>1000,38370=>1000,38371=>1000,38372=>1000,
-	38373=>1000,38374=>1000,38375=>1000,38376=>1000,38377=>1000,38378=>1000,38379=>1000,38380=>1000,38381=>1000,38382=>1000,38383=>1000,38384=>1000,38385=>1000,38386=>1000,38387=>1000,38388=>1000,
-	38389=>1000,38390=>1000,38391=>1000,38392=>1000,38393=>1000,38394=>1000,38395=>1000,38396=>1000,38397=>1000,38398=>1000,38399=>1000,38400=>1000,38401=>1000,38402=>1000,38403=>1000,38404=>1000,
-	38405=>1000,38406=>1000,38407=>1000,38408=>1000,38409=>1000,38410=>1000,38411=>1000,38412=>1000,38413=>1000,38414=>1000,38415=>1000,38416=>1000,38417=>1000,38418=>1000,38419=>1000,38420=>1000,
-	38421=>1000,38422=>1000,38423=>1000,38424=>1000,38425=>1000,38426=>1000,38427=>1000,38428=>1000,38429=>1000,38430=>1000,38431=>1000,38432=>1000,38433=>1000,38434=>1000,38435=>1000,38436=>1000,
-	38437=>1000,38438=>1000,38439=>1000,38440=>1000,38441=>1000,38442=>1000,38443=>1000,38444=>1000,38445=>1000,38446=>1000,38447=>1000,38448=>1000,38449=>1000,38450=>1000,38451=>1000,38452=>1000,
-	38453=>1000,38454=>1000,38455=>1000,38456=>1000,38457=>1000,38458=>1000,38459=>1000,38460=>1000,38461=>1000,38462=>1000,38463=>1000,38464=>1000,38465=>1000,38466=>1000,38467=>1000,38468=>1000,
-	38469=>1000,38470=>1000,38471=>1000,38472=>1000,38473=>1000,38474=>1000,38475=>1000,38476=>1000,38477=>1000,38478=>1000,38479=>1000,38480=>1000,38481=>1000,38482=>1000,38483=>1000,38484=>1000,
-	38485=>1000,38486=>1000,38487=>1000,38488=>1000,38489=>1000,38490=>1000,38491=>1000,38492=>1000,38493=>1000,38494=>1000,38495=>1000,38496=>1000,38497=>1000,38498=>1000,38499=>1000,38500=>1000,
-	38501=>1000,38502=>1000,38503=>1000,38504=>1000,38505=>1000,38506=>1000,38507=>1000,38508=>1000,38509=>1000,38510=>1000,38511=>1000,38512=>1000,38513=>1000,38514=>1000,38515=>1000,38516=>1000,
-	38517=>1000,38518=>1000,38519=>1000,38520=>1000,38521=>1000,38522=>1000,38523=>1000,38524=>1000,38525=>1000,38526=>1000,38527=>1000,38528=>1000,38529=>1000,38530=>1000,38531=>1000,38532=>1000,
-	38533=>1000,38534=>1000,38535=>1000,38536=>1000,38537=>1000,38538=>1000,38539=>1000,38540=>1000,38541=>1000,38542=>1000,38543=>1000,38544=>1000,38545=>1000,38546=>1000,38547=>1000,38548=>1000,
-	38549=>1000,38550=>1000,38551=>1000,38552=>1000,38553=>1000,38554=>1000,38555=>1000,38556=>1000,38557=>1000,38558=>1000,38559=>1000,38560=>1000,38561=>1000,38562=>1000,38563=>1000,38564=>1000,
-	38565=>1000,38566=>1000,38567=>1000,38568=>1000,38569=>1000,38570=>1000,38571=>1000,38572=>1000,38573=>1000,38574=>1000,38575=>1000,38576=>1000,38577=>1000,38578=>1000,38579=>1000,38580=>1000,
-	38581=>1000,38582=>1000,38583=>1000,38584=>1000,38585=>1000,38586=>1000,38587=>1000,38588=>1000,38589=>1000,38590=>1000,38591=>1000,38592=>1000,38593=>1000,38594=>1000,38595=>1000,38596=>1000,
-	38597=>1000,38598=>1000,38599=>1000,38600=>1000,38601=>1000,38602=>1000,38603=>1000,38604=>1000,38605=>1000,38606=>1000,38607=>1000,38608=>1000,38609=>1000,38610=>1000,38611=>1000,38612=>1000,
-	38613=>1000,38614=>1000,38615=>1000,38616=>1000,38617=>1000,38618=>1000,38619=>1000,38620=>1000,38621=>1000,38622=>1000,38623=>1000,38624=>1000,38625=>1000,38626=>1000,38627=>1000,38628=>1000,
-	38629=>1000,38630=>1000,38631=>1000,38632=>1000,38633=>1000,38634=>1000,38635=>1000,38636=>1000,38637=>1000,38638=>1000,38639=>1000,38640=>1000,38641=>1000,38642=>1000,38643=>1000,38644=>1000,
-	38645=>1000,38646=>1000,38647=>1000,38648=>1000,38649=>1000,38650=>1000,38651=>1000,38652=>1000,38653=>1000,38654=>1000,38655=>1000,38656=>1000,38657=>1000,38658=>1000,38659=>1000,38660=>1000,
-	38661=>1000,38662=>1000,38663=>1000,38664=>1000,38665=>1000,38666=>1000,38667=>1000,38668=>1000,38669=>1000,38670=>1000,38671=>1000,38672=>1000,38673=>1000,38674=>1000,38675=>1000,38676=>1000,
-	38677=>1000,38678=>1000,38679=>1000,38680=>1000,38681=>1000,38682=>1000,38683=>1000,38684=>1000,38685=>1000,38686=>1000,38687=>1000,38688=>1000,38689=>1000,38690=>1000,38691=>1000,38692=>1000,
-	38693=>1000,38694=>1000,38695=>1000,38696=>1000,38697=>1000,38698=>1000,38699=>1000,38700=>1000,38701=>1000,38702=>1000,38703=>1000,38704=>1000,38705=>1000,38706=>1000,38707=>1000,38708=>1000,
-	38709=>1000,38710=>1000,38711=>1000,38712=>1000,38713=>1000,38714=>1000,38715=>1000,38716=>1000,38717=>1000,38718=>1000,38719=>1000,38720=>1000,38721=>1000,38722=>1000,38723=>1000,38724=>1000,
-	38725=>1000,38726=>1000,38727=>1000,38728=>1000,38729=>1000,38730=>1000,38731=>1000,38732=>1000,38733=>1000,38734=>1000,38735=>1000,38736=>1000,38737=>1000,38738=>1000,38739=>1000,38740=>1000,
-	38741=>1000,38742=>1000,38743=>1000,38744=>1000,38745=>1000,38746=>1000,38747=>1000,38748=>1000,38749=>1000,38750=>1000,38751=>1000,38752=>1000,38753=>1000,38754=>1000,38755=>1000,38756=>1000,
-	38757=>1000,38758=>1000,38759=>1000,38760=>1000,38761=>1000,38762=>1000,38763=>1000,38764=>1000,38765=>1000,38766=>1000,38767=>1000,38768=>1000,38769=>1000,38770=>1000,38771=>1000,38772=>1000,
-	38773=>1000,38774=>1000,38775=>1000,38776=>1000,38777=>1000,38778=>1000,38779=>1000,38780=>1000,38781=>1000,38782=>1000,38783=>1000,38784=>1000,38785=>1000,38786=>1000,38787=>1000,38788=>1000,
-	38789=>1000,38790=>1000,38791=>1000,38792=>1000,38793=>1000,38794=>1000,38795=>1000,38796=>1000,38797=>1000,38798=>1000,38799=>1000,38800=>1000,38801=>1000,38802=>1000,38803=>1000,38804=>1000,
-	38805=>1000,38806=>1000,38807=>1000,38808=>1000,38809=>1000,38810=>1000,38811=>1000,38812=>1000,38813=>1000,38814=>1000,38815=>1000,38816=>1000,38817=>1000,38818=>1000,38819=>1000,38820=>1000,
-	38821=>1000,38822=>1000,38823=>1000,38824=>1000,38825=>1000,38826=>1000,38827=>1000,38828=>1000,38829=>1000,38830=>1000,38831=>1000,38832=>1000,38833=>1000,38834=>1000,38835=>1000,38836=>1000,
-	38837=>1000,38838=>1000,38839=>1000,38840=>1000,38841=>1000,38842=>1000,38843=>1000,38844=>1000,38845=>1000,38846=>1000,38847=>1000,38848=>1000,38849=>1000,38850=>1000,38851=>1000,38852=>1000,
-	38853=>1000,38854=>1000,38855=>1000,38856=>1000,38857=>1000,38858=>1000,38859=>1000,38860=>1000,38861=>1000,38862=>1000,38863=>1000,38864=>1000,38865=>1000,38866=>1000,38867=>1000,38868=>1000,
-	38869=>1000,38870=>1000,38871=>1000,38872=>1000,38873=>1000,38874=>1000,38875=>1000,38876=>1000,38877=>1000,38878=>1000,38879=>1000,38880=>1000,38881=>1000,38882=>1000,38883=>1000,38884=>1000,
-	38885=>1000,38886=>1000,38887=>1000,38888=>1000,38889=>1000,38890=>1000,38891=>1000,38892=>1000,38893=>1000,38894=>1000,38895=>1000,38896=>1000,38897=>1000,38898=>1000,38899=>1000,38900=>1000,
-	38901=>1000,38902=>1000,38903=>1000,38904=>1000,38905=>1000,38906=>1000,38907=>1000,38908=>1000,38909=>1000,38910=>1000,38911=>1000,38912=>1000,38913=>1000,38914=>1000,38915=>1000,38916=>1000,
-	38917=>1000,38918=>1000,38919=>1000,38920=>1000,38921=>1000,38922=>1000,38923=>1000,38924=>1000,38925=>1000,38926=>1000,38927=>1000,38928=>1000,38929=>1000,38930=>1000,38931=>1000,38932=>1000,
-	38933=>1000,38934=>1000,38935=>1000,38936=>1000,38937=>1000,38938=>1000,38939=>1000,38940=>1000,38941=>1000,38942=>1000,38943=>1000,38944=>1000,38945=>1000,38946=>1000,38947=>1000,38948=>1000,
-	38949=>1000,38950=>1000,38951=>1000,38952=>1000,38953=>1000,38954=>1000,38955=>1000,38956=>1000,38957=>1000,38958=>1000,38959=>1000,38960=>1000,38961=>1000,38962=>1000,38963=>1000,38964=>1000,
-	38965=>1000,38966=>1000,38967=>1000,38968=>1000,38969=>1000,38970=>1000,38971=>1000,38972=>1000,38973=>1000,38974=>1000,38975=>1000,38976=>1000,38977=>1000,38978=>1000,38979=>1000,38980=>1000,
-	38981=>1000,38982=>1000,38983=>1000,38984=>1000,38985=>1000,38986=>1000,38987=>1000,38988=>1000,38989=>1000,38990=>1000,38991=>1000,38992=>1000,38993=>1000,38994=>1000,38995=>1000,38996=>1000,
-	38997=>1000,38998=>1000,38999=>1000,39000=>1000,39001=>1000,39002=>1000,39003=>1000,39004=>1000,39005=>1000,39006=>1000,39007=>1000,39008=>1000,39009=>1000,39010=>1000,39011=>1000,39012=>1000,
-	39013=>1000,39014=>1000,39015=>1000,39016=>1000,39017=>1000,39018=>1000,39019=>1000,39020=>1000,39021=>1000,39022=>1000,39023=>1000,39024=>1000,39025=>1000,39026=>1000,39027=>1000,39028=>1000,
-	39029=>1000,39030=>1000,39031=>1000,39032=>1000,39033=>1000,39034=>1000,39035=>1000,39036=>1000,39037=>1000,39038=>1000,39039=>1000,39040=>1000,39041=>1000,39042=>1000,39043=>1000,39044=>1000,
-	39045=>1000,39046=>1000,39047=>1000,39048=>1000,39049=>1000,39050=>1000,39051=>1000,39052=>1000,39053=>1000,39054=>1000,39055=>1000,39056=>1000,39057=>1000,39058=>1000,39059=>1000,39060=>1000,
-	39061=>1000,39062=>1000,39063=>1000,39064=>1000,39065=>1000,39066=>1000,39067=>1000,39068=>1000,39069=>1000,39070=>1000,39071=>1000,39072=>1000,39073=>1000,39074=>1000,39075=>1000,39076=>1000,
-	39077=>1000,39078=>1000,39079=>1000,39080=>1000,39081=>1000,39082=>1000,39083=>1000,39084=>1000,39085=>1000,39086=>1000,39087=>1000,39088=>1000,39089=>1000,39090=>1000,39091=>1000,39092=>1000,
-	39093=>1000,39094=>1000,39095=>1000,39096=>1000,39097=>1000,39098=>1000,39099=>1000,39100=>1000,39101=>1000,39102=>1000,39103=>1000,39104=>1000,39105=>1000,39106=>1000,39107=>1000,39108=>1000,
-	39109=>1000,39110=>1000,39111=>1000,39112=>1000,39113=>1000,39114=>1000,39115=>1000,39116=>1000,39117=>1000,39118=>1000,39119=>1000,39120=>1000,39121=>1000,39122=>1000,39123=>1000,39124=>1000,
-	39125=>1000,39126=>1000,39127=>1000,39128=>1000,39129=>1000,39130=>1000,39131=>1000,39132=>1000,39133=>1000,39134=>1000,39135=>1000,39136=>1000,39137=>1000,39138=>1000,39139=>1000,39140=>1000,
-	39141=>1000,39142=>1000,39143=>1000,39144=>1000,39145=>1000,39146=>1000,39147=>1000,39148=>1000,39149=>1000,39150=>1000,39151=>1000,39152=>1000,39153=>1000,39154=>1000,39155=>1000,39156=>1000,
-	39157=>1000,39158=>1000,39159=>1000,39160=>1000,39161=>1000,39162=>1000,39163=>1000,39164=>1000,39165=>1000,39166=>1000,39167=>1000,39168=>1000,39169=>1000,39170=>1000,39171=>1000,39172=>1000,
-	39173=>1000,39174=>1000,39175=>1000,39176=>1000,39177=>1000,39178=>1000,39179=>1000,39180=>1000,39181=>1000,39182=>1000,39183=>1000,39184=>1000,39185=>1000,39186=>1000,39187=>1000,39188=>1000,
-	39189=>1000,39190=>1000,39191=>1000,39192=>1000,39193=>1000,39194=>1000,39195=>1000,39196=>1000,39197=>1000,39198=>1000,39199=>1000,39200=>1000,39201=>1000,39202=>1000,39203=>1000,39204=>1000,
-	39205=>1000,39206=>1000,39207=>1000,39208=>1000,39209=>1000,39210=>1000,39211=>1000,39212=>1000,39213=>1000,39214=>1000,39215=>1000,39216=>1000,39217=>1000,39218=>1000,39219=>1000,39220=>1000,
-	39221=>1000,39222=>1000,39223=>1000,39224=>1000,39225=>1000,39226=>1000,39227=>1000,39228=>1000,39229=>1000,39230=>1000,39231=>1000,39232=>1000,39233=>1000,39234=>1000,39235=>1000,39236=>1000,
-	39237=>1000,39238=>1000,39239=>1000,39240=>1000,39241=>1000,39242=>1000,39243=>1000,39244=>1000,39245=>1000,39246=>1000,39247=>1000,39248=>1000,39249=>1000,39250=>1000,39251=>1000,39252=>1000,
-	39253=>1000,39254=>1000,39255=>1000,39256=>1000,39257=>1000,39258=>1000,39259=>1000,39260=>1000,39261=>1000,39262=>1000,39263=>1000,39264=>1000,39265=>1000,39266=>1000,39267=>1000,39268=>1000,
-	39269=>1000,39270=>1000,39271=>1000,39272=>1000,39273=>1000,39274=>1000,39275=>1000,39276=>1000,39277=>1000,39278=>1000,39279=>1000,39280=>1000,39281=>1000,39282=>1000,39283=>1000,39284=>1000,
-	39285=>1000,39286=>1000,39287=>1000,39288=>1000,39289=>1000,39290=>1000,39291=>1000,39292=>1000,39293=>1000,39294=>1000,39295=>1000,39296=>1000,39297=>1000,39298=>1000,39299=>1000,39300=>1000,
-	39301=>1000,39302=>1000,39303=>1000,39304=>1000,39305=>1000,39306=>1000,39307=>1000,39308=>1000,39309=>1000,39310=>1000,39311=>1000,39312=>1000,39313=>1000,39314=>1000,39315=>1000,39316=>1000,
-	39317=>1000,39318=>1000,39319=>1000,39320=>1000,39321=>1000,39322=>1000,39323=>1000,39324=>1000,39325=>1000,39326=>1000,39327=>1000,39328=>1000,39329=>1000,39330=>1000,39331=>1000,39332=>1000,
-	39333=>1000,39334=>1000,39335=>1000,39336=>1000,39337=>1000,39338=>1000,39339=>1000,39340=>1000,39341=>1000,39342=>1000,39343=>1000,39344=>1000,39345=>1000,39346=>1000,39347=>1000,39348=>1000,
-	39349=>1000,39350=>1000,39351=>1000,39352=>1000,39353=>1000,39354=>1000,39355=>1000,39356=>1000,39357=>1000,39358=>1000,39359=>1000,39360=>1000,39361=>1000,39362=>1000,39363=>1000,39364=>1000,
-	39365=>1000,39366=>1000,39367=>1000,39368=>1000,39369=>1000,39370=>1000,39371=>1000,39372=>1000,39373=>1000,39374=>1000,39375=>1000,39376=>1000,39377=>1000,39378=>1000,39379=>1000,39380=>1000,
-	39381=>1000,39382=>1000,39383=>1000,39384=>1000,39385=>1000,39386=>1000,39387=>1000,39388=>1000,39389=>1000,39390=>1000,39391=>1000,39392=>1000,39393=>1000,39394=>1000,39395=>1000,39396=>1000,
-	39397=>1000,39398=>1000,39399=>1000,39400=>1000,39401=>1000,39402=>1000,39403=>1000,39404=>1000,39405=>1000,39406=>1000,39407=>1000,39408=>1000,39409=>1000,39410=>1000,39411=>1000,39412=>1000,
-	39413=>1000,39414=>1000,39415=>1000,39416=>1000,39417=>1000,39418=>1000,39419=>1000,39420=>1000,39421=>1000,39422=>1000,39423=>1000,39424=>1000,39425=>1000,39426=>1000,39427=>1000,39428=>1000,
-	39429=>1000,39430=>1000,39431=>1000,39432=>1000,39433=>1000,39434=>1000,39435=>1000,39436=>1000,39437=>1000,39438=>1000,39439=>1000,39440=>1000,39441=>1000,39442=>1000,39443=>1000,39444=>1000,
-	39445=>1000,39446=>1000,39447=>1000,39448=>1000,39449=>1000,39450=>1000,39451=>1000,39452=>1000,39453=>1000,39454=>1000,39455=>1000,39456=>1000,39457=>1000,39458=>1000,39459=>1000,39460=>1000,
-	39461=>1000,39462=>1000,39463=>1000,39464=>1000,39465=>1000,39466=>1000,39467=>1000,39468=>1000,39469=>1000,39470=>1000,39471=>1000,39472=>1000,39473=>1000,39474=>1000,39475=>1000,39476=>1000,
-	39477=>1000,39478=>1000,39479=>1000,39480=>1000,39481=>1000,39482=>1000,39483=>1000,39484=>1000,39485=>1000,39486=>1000,39487=>1000,39488=>1000,39489=>1000,39490=>1000,39491=>1000,39492=>1000,
-	39493=>1000,39494=>1000,39495=>1000,39496=>1000,39497=>1000,39498=>1000,39499=>1000,39500=>1000,39501=>1000,39502=>1000,39503=>1000,39504=>1000,39505=>1000,39506=>1000,39507=>1000,39508=>1000,
-	39509=>1000,39510=>1000,39511=>1000,39512=>1000,39513=>1000,39514=>1000,39515=>1000,39516=>1000,39517=>1000,39518=>1000,39519=>1000,39520=>1000,39521=>1000,39522=>1000,39523=>1000,39524=>1000,
-	39525=>1000,39526=>1000,39527=>1000,39528=>1000,39529=>1000,39530=>1000,39531=>1000,39532=>1000,39533=>1000,39534=>1000,39535=>1000,39536=>1000,39537=>1000,39538=>1000,39539=>1000,39540=>1000,
-	39541=>1000,39542=>1000,39543=>1000,39544=>1000,39545=>1000,39546=>1000,39547=>1000,39548=>1000,39549=>1000,39550=>1000,39551=>1000,39552=>1000,39553=>1000,39554=>1000,39555=>1000,39556=>1000,
-	39557=>1000,39558=>1000,39559=>1000,39560=>1000,39561=>1000,39562=>1000,39563=>1000,39564=>1000,39565=>1000,39566=>1000,39567=>1000,39568=>1000,39569=>1000,39570=>1000,39571=>1000,39572=>1000,
-	39573=>1000,39574=>1000,39575=>1000,39576=>1000,39577=>1000,39578=>1000,39579=>1000,39580=>1000,39581=>1000,39582=>1000,39583=>1000,39584=>1000,39585=>1000,39586=>1000,39587=>1000,39588=>1000,
-	39589=>1000,39590=>1000,39591=>1000,39592=>1000,39593=>1000,39594=>1000,39595=>1000,39596=>1000,39597=>1000,39598=>1000,39599=>1000,39600=>1000,39601=>1000,39602=>1000,39603=>1000,39604=>1000,
-	39605=>1000,39606=>1000,39607=>1000,39608=>1000,39609=>1000,39610=>1000,39611=>1000,39612=>1000,39613=>1000,39614=>1000,39615=>1000,39616=>1000,39617=>1000,39618=>1000,39619=>1000,39620=>1000,
-	39621=>1000,39622=>1000,39623=>1000,39624=>1000,39625=>1000,39626=>1000,39627=>1000,39628=>1000,39629=>1000,39630=>1000,39631=>1000,39632=>1000,39633=>1000,39634=>1000,39635=>1000,39636=>1000,
-	39637=>1000,39638=>1000,39639=>1000,39640=>1000,39641=>1000,39642=>1000,39643=>1000,39644=>1000,39645=>1000,39646=>1000,39647=>1000,39648=>1000,39649=>1000,39650=>1000,39651=>1000,39652=>1000,
-	39653=>1000,39654=>1000,39655=>1000,39656=>1000,39657=>1000,39658=>1000,39659=>1000,39660=>1000,39661=>1000,39662=>1000,39663=>1000,39664=>1000,39665=>1000,39666=>1000,39667=>1000,39668=>1000,
-	39669=>1000,39670=>1000,39671=>1000,39672=>1000,39673=>1000,39674=>1000,39675=>1000,39676=>1000,39677=>1000,39678=>1000,39679=>1000,39680=>1000,39681=>1000,39682=>1000,39683=>1000,39684=>1000,
-	39685=>1000,39686=>1000,39687=>1000,39688=>1000,39689=>1000,39690=>1000,39691=>1000,39692=>1000,39693=>1000,39694=>1000,39695=>1000,39696=>1000,39697=>1000,39698=>1000,39699=>1000,39700=>1000,
-	39701=>1000,39702=>1000,39703=>1000,39704=>1000,39705=>1000,39706=>1000,39707=>1000,39708=>1000,39709=>1000,39710=>1000,39711=>1000,39712=>1000,39713=>1000,39714=>1000,39715=>1000,39716=>1000,
-	39717=>1000,39718=>1000,39719=>1000,39720=>1000,39721=>1000,39722=>1000,39723=>1000,39724=>1000,39725=>1000,39726=>1000,39727=>1000,39728=>1000,39729=>1000,39730=>1000,39731=>1000,39732=>1000,
-	39733=>1000,39734=>1000,39735=>1000,39736=>1000,39737=>1000,39738=>1000,39739=>1000,39740=>1000,39741=>1000,39742=>1000,39743=>1000,39744=>1000,39745=>1000,39746=>1000,39747=>1000,39748=>1000,
-	39749=>1000,39750=>1000,39751=>1000,39752=>1000,39753=>1000,39754=>1000,39755=>1000,39756=>1000,39757=>1000,39758=>1000,39759=>1000,39760=>1000,39761=>1000,39762=>1000,39763=>1000,39764=>1000,
-	39765=>1000,39766=>1000,39767=>1000,39768=>1000,39769=>1000,39770=>1000,39771=>1000,39772=>1000,39773=>1000,39774=>1000,39775=>1000,39776=>1000,39777=>1000,39778=>1000,39779=>1000,39780=>1000,
-	39781=>1000,39782=>1000,39783=>1000,39784=>1000,39785=>1000,39786=>1000,39787=>1000,39788=>1000,39789=>1000,39790=>1000,39791=>1000,39792=>1000,39793=>1000,39794=>1000,39795=>1000,39796=>1000,
-	39797=>1000,39798=>1000,39799=>1000,39800=>1000,39801=>1000,39802=>1000,39803=>1000,39804=>1000,39805=>1000,39806=>1000,39807=>1000,39808=>1000,39809=>1000,39810=>1000,39811=>1000,39812=>1000,
-	39813=>1000,39814=>1000,39815=>1000,39816=>1000,39817=>1000,39818=>1000,39819=>1000,39820=>1000,39821=>1000,39822=>1000,39823=>1000,39824=>1000,39825=>1000,39826=>1000,39827=>1000,39828=>1000,
-	39829=>1000,39830=>1000,39831=>1000,39832=>1000,39833=>1000,39834=>1000,39835=>1000,39836=>1000,39837=>1000,39838=>1000,39839=>1000,39840=>1000,39841=>1000,39842=>1000,39843=>1000,39844=>1000,
-	39845=>1000,39846=>1000,39847=>1000,39848=>1000,39849=>1000,39850=>1000,39851=>1000,39852=>1000,39853=>1000,39854=>1000,39855=>1000,39856=>1000,39857=>1000,39858=>1000,39859=>1000,39860=>1000,
-	39861=>1000,39862=>1000,39863=>1000,39864=>1000,39865=>1000,39866=>1000,39867=>1000,39868=>1000,39869=>1000,39870=>1000,39871=>1000,39872=>1000,39873=>1000,39874=>1000,39875=>1000,39876=>1000,
-	39877=>1000,39878=>1000,39879=>1000,39880=>1000,39881=>1000,39882=>1000,39883=>1000,39884=>1000,39885=>1000,39886=>1000,39887=>1000,39888=>1000,39889=>1000,39890=>1000,39891=>1000,39892=>1000,
-	39893=>1000,39894=>1000,39895=>1000,39896=>1000,39897=>1000,39898=>1000,39899=>1000,39900=>1000,39901=>1000,39902=>1000,39903=>1000,39904=>1000,39905=>1000,39906=>1000,39907=>1000,39908=>1000,
-	39909=>1000,39910=>1000,39911=>1000,39912=>1000,39913=>1000,39914=>1000,39915=>1000,39916=>1000,39917=>1000,39918=>1000,39919=>1000,39920=>1000,39921=>1000,39922=>1000,39923=>1000,39924=>1000,
-	39925=>1000,39926=>1000,39927=>1000,39928=>1000,39929=>1000,39930=>1000,39931=>1000,39932=>1000,39933=>1000,39934=>1000,39935=>1000,39936=>1000,39937=>1000,39938=>1000,39939=>1000,39940=>1000,
-	39941=>1000,39942=>1000,39943=>1000,39944=>1000,39945=>1000,39946=>1000,39947=>1000,39948=>1000,39949=>1000,39950=>1000,39951=>1000,39952=>1000,39953=>1000,39954=>1000,39955=>1000,39956=>1000,
-	39957=>1000,39958=>1000,39959=>1000,39960=>1000,39961=>1000,39962=>1000,39963=>1000,39964=>1000,39965=>1000,39966=>1000,39967=>1000,39968=>1000,39969=>1000,39970=>1000,39971=>1000,39972=>1000,
-	39973=>1000,39974=>1000,39975=>1000,39976=>1000,39977=>1000,39978=>1000,39979=>1000,39980=>1000,39981=>1000,39982=>1000,39983=>1000,39984=>1000,39985=>1000,39986=>1000,39987=>1000,39988=>1000,
-	39989=>1000,39990=>1000,39991=>1000,39992=>1000,39993=>1000,39994=>1000,39995=>1000,39996=>1000,39997=>1000,39998=>1000,39999=>1000,40000=>1000,40001=>1000,40002=>1000,40003=>1000,40004=>1000,
-	40005=>1000,40006=>1000,40007=>1000,40008=>1000,40009=>1000,40010=>1000,40011=>1000,40012=>1000,40013=>1000,40014=>1000,40015=>1000,40016=>1000,40017=>1000,40018=>1000,40019=>1000,40020=>1000,
-	40021=>1000,40022=>1000,40023=>1000,40024=>1000,40025=>1000,40026=>1000,40027=>1000,40028=>1000,40029=>1000,40030=>1000,40031=>1000,40032=>1000,40033=>1000,40034=>1000,40035=>1000,40036=>1000,
-	40037=>1000,40038=>1000,40039=>1000,40040=>1000,40041=>1000,40042=>1000,40043=>1000,40044=>1000,40045=>1000,40046=>1000,40047=>1000,40048=>1000,40049=>1000,40050=>1000,40051=>1000,40052=>1000,
-	40053=>1000,40054=>1000,40055=>1000,40056=>1000,40057=>1000,40058=>1000,40059=>1000,40060=>1000,40061=>1000,40062=>1000,40063=>1000,40064=>1000,40065=>1000,40066=>1000,40067=>1000,40068=>1000,
-	40069=>1000,40070=>1000,40071=>1000,40072=>1000,40073=>1000,40074=>1000,40075=>1000,40076=>1000,40077=>1000,40078=>1000,40079=>1000,40080=>1000,40081=>1000,40082=>1000,40083=>1000,40084=>1000,
-	40085=>1000,40086=>1000,40087=>1000,40088=>1000,40089=>1000,40090=>1000,40091=>1000,40092=>1000,40093=>1000,40094=>1000,40095=>1000,40096=>1000,40097=>1000,40098=>1000,40099=>1000,40100=>1000,
-	40101=>1000,40102=>1000,40103=>1000,40104=>1000,40105=>1000,40106=>1000,40107=>1000,40108=>1000,40109=>1000,40110=>1000,40111=>1000,40112=>1000,40113=>1000,40114=>1000,40115=>1000,40116=>1000,
-	40117=>1000,40118=>1000,40119=>1000,40120=>1000,40121=>1000,40122=>1000,40123=>1000,40124=>1000,40125=>1000,40126=>1000,40127=>1000,40128=>1000,40129=>1000,40130=>1000,40131=>1000,40132=>1000,
-	40133=>1000,40134=>1000,40135=>1000,40136=>1000,40137=>1000,40138=>1000,40139=>1000,40140=>1000,40141=>1000,40142=>1000,40143=>1000,40144=>1000,40145=>1000,40146=>1000,40147=>1000,40148=>1000,
-	40149=>1000,40150=>1000,40151=>1000,40152=>1000,40153=>1000,40154=>1000,40155=>1000,40156=>1000,40157=>1000,40158=>1000,40159=>1000,40160=>1000,40161=>1000,40162=>1000,40163=>1000,40164=>1000,
-	40165=>1000,40166=>1000,40167=>1000,40168=>1000,40169=>1000,40170=>1000,40171=>1000,40172=>1000,40173=>1000,40174=>1000,40175=>1000,40176=>1000,40177=>1000,40178=>1000,40179=>1000,40180=>1000,
-	40181=>1000,40182=>1000,40183=>1000,40184=>1000,40185=>1000,40186=>1000,40187=>1000,40188=>1000,40189=>1000,40190=>1000,40191=>1000,40192=>1000,40193=>1000,40194=>1000,40195=>1000,40196=>1000,
-	40197=>1000,40198=>1000,40199=>1000,40200=>1000,40201=>1000,40202=>1000,40203=>1000,40204=>1000,40205=>1000,40206=>1000,40207=>1000,40208=>1000,40209=>1000,40210=>1000,40211=>1000,40212=>1000,
-	40213=>1000,40214=>1000,40215=>1000,40216=>1000,40217=>1000,40218=>1000,40219=>1000,40220=>1000,40221=>1000,40222=>1000,40223=>1000,40224=>1000,40225=>1000,40226=>1000,40227=>1000,40228=>1000,
-	40229=>1000,40230=>1000,40231=>1000,40232=>1000,40233=>1000,40234=>1000,40235=>1000,40236=>1000,40237=>1000,40238=>1000,40239=>1000,40240=>1000,40241=>1000,40242=>1000,40243=>1000,40244=>1000,
-	40245=>1000,40246=>1000,40247=>1000,40248=>1000,40249=>1000,40250=>1000,40251=>1000,40252=>1000,40253=>1000,40254=>1000,40255=>1000,40256=>1000,40257=>1000,40258=>1000,40259=>1000,40260=>1000,
-	40261=>1000,40262=>1000,40263=>1000,40264=>1000,40265=>1000,40266=>1000,40267=>1000,40268=>1000,40269=>1000,40270=>1000,40271=>1000,40272=>1000,40273=>1000,40274=>1000,40275=>1000,40276=>1000,
-	40277=>1000,40278=>1000,40279=>1000,40280=>1000,40281=>1000,40282=>1000,40283=>1000,40284=>1000,40285=>1000,40286=>1000,40287=>1000,40288=>1000,40289=>1000,40290=>1000,40291=>1000,40292=>1000,
-	40293=>1000,40294=>1000,40295=>1000,40296=>1000,40297=>1000,40298=>1000,40299=>1000,40300=>1000,40301=>1000,40302=>1000,40303=>1000,40304=>1000,40305=>1000,40306=>1000,40307=>1000,40308=>1000,
-	40309=>1000,40310=>1000,40311=>1000,40312=>1000,40313=>1000,40314=>1000,40315=>1000,40316=>1000,40317=>1000,40318=>1000,40319=>1000,40320=>1000,40321=>1000,40322=>1000,40323=>1000,40324=>1000,
-	40325=>1000,40326=>1000,40327=>1000,40328=>1000,40329=>1000,40330=>1000,40331=>1000,40332=>1000,40333=>1000,40334=>1000,40335=>1000,40336=>1000,40337=>1000,40338=>1000,40339=>1000,40340=>1000,
-	40341=>1000,40342=>1000,40343=>1000,40344=>1000,40345=>1000,40346=>1000,40347=>1000,40348=>1000,40349=>1000,40350=>1000,40351=>1000,40352=>1000,40353=>1000,40354=>1000,40355=>1000,40356=>1000,
-	40357=>1000,40358=>1000,40359=>1000,40360=>1000,40361=>1000,40362=>1000,40363=>1000,40364=>1000,40365=>1000,40366=>1000,40367=>1000,40368=>1000,40369=>1000,40370=>1000,40371=>1000,40372=>1000,
-	40373=>1000,40374=>1000,40375=>1000,40376=>1000,40377=>1000,40378=>1000,40379=>1000,40380=>1000,40381=>1000,40382=>1000,40383=>1000,40384=>1000,40385=>1000,40386=>1000,40387=>1000,40388=>1000,
-	40389=>1000,40390=>1000,40391=>1000,40392=>1000,40393=>1000,40394=>1000,40395=>1000,40396=>1000,40397=>1000,40398=>1000,40399=>1000,40400=>1000,40401=>1000,40402=>1000,40403=>1000,40404=>1000,
-	40405=>1000,40406=>1000,40407=>1000,40408=>1000,40409=>1000,40410=>1000,40411=>1000,40412=>1000,40413=>1000,40414=>1000,40415=>1000,40416=>1000,40417=>1000,40418=>1000,40419=>1000,40420=>1000,
-	40421=>1000,40422=>1000,40423=>1000,40424=>1000,40425=>1000,40426=>1000,40427=>1000,40428=>1000,40429=>1000,40430=>1000,40431=>1000,40432=>1000,40433=>1000,40434=>1000,40435=>1000,40436=>1000,
-	40437=>1000,40438=>1000,40439=>1000,40440=>1000,40441=>1000,40442=>1000,40443=>1000,40444=>1000,40445=>1000,40446=>1000,40447=>1000,40448=>1000,40449=>1000,40450=>1000,40451=>1000,40452=>1000,
-	40453=>1000,40454=>1000,40455=>1000,40456=>1000,40457=>1000,40458=>1000,40459=>1000,40460=>1000,40461=>1000,40462=>1000,40463=>1000,40464=>1000,40465=>1000,40466=>1000,40467=>1000,40468=>1000,
-	40469=>1000,40470=>1000,40471=>1000,40472=>1000,40473=>1000,40474=>1000,40475=>1000,40476=>1000,40477=>1000,40478=>1000,40479=>1000,40480=>1000,40481=>1000,40482=>1000,40483=>1000,40484=>1000,
-	40485=>1000,40486=>1000,40487=>1000,40488=>1000,40489=>1000,40490=>1000,40491=>1000,40492=>1000,40493=>1000,40494=>1000,40495=>1000,40496=>1000,40497=>1000,40498=>1000,40499=>1000,40500=>1000,
-	40501=>1000,40502=>1000,40503=>1000,40504=>1000,40505=>1000,40506=>1000,40507=>1000,40508=>1000,40509=>1000,40510=>1000,40511=>1000,40512=>1000,40513=>1000,40514=>1000,40515=>1000,40516=>1000,
-	40517=>1000,40518=>1000,40519=>1000,40520=>1000,40521=>1000,40522=>1000,40523=>1000,40524=>1000,40525=>1000,40526=>1000,40527=>1000,40528=>1000,40529=>1000,40530=>1000,40531=>1000,40532=>1000,
-	40533=>1000,40534=>1000,40535=>1000,40536=>1000,40537=>1000,40538=>1000,40539=>1000,40540=>1000,40541=>1000,40542=>1000,40543=>1000,40544=>1000,40545=>1000,40546=>1000,40547=>1000,40548=>1000,
-	40549=>1000,40550=>1000,40551=>1000,40552=>1000,40553=>1000,40554=>1000,40555=>1000,40556=>1000,40557=>1000,40558=>1000,40559=>1000,40560=>1000,40561=>1000,40562=>1000,40563=>1000,40564=>1000,
-	40565=>1000,40566=>1000,40567=>1000,40568=>1000,40569=>1000,40570=>1000,40571=>1000,40572=>1000,40573=>1000,40574=>1000,40575=>1000,40576=>1000,40577=>1000,40578=>1000,40579=>1000,40580=>1000,
-	40581=>1000,40582=>1000,40583=>1000,40584=>1000,40585=>1000,40586=>1000,40587=>1000,40588=>1000,40589=>1000,40590=>1000,40591=>1000,40592=>1000,40593=>1000,40594=>1000,40595=>1000,40596=>1000,
-	40597=>1000,40598=>1000,40599=>1000,40600=>1000,40601=>1000,40602=>1000,40603=>1000,40604=>1000,40605=>1000,40606=>1000,40607=>1000,40608=>1000,40609=>1000,40610=>1000,40611=>1000,40612=>1000,
-	40613=>1000,40614=>1000,40615=>1000,40616=>1000,40617=>1000,40618=>1000,40619=>1000,40620=>1000,40621=>1000,40622=>1000,40623=>1000,40624=>1000,40625=>1000,40626=>1000,40627=>1000,40628=>1000,
-	40629=>1000,40630=>1000,40631=>1000,40632=>1000,40633=>1000,40634=>1000,40635=>1000,40636=>1000,40637=>1000,40638=>1000,40639=>1000,40640=>1000,40641=>1000,40642=>1000,40643=>1000,40644=>1000,
-	40645=>1000,40646=>1000,40647=>1000,40648=>1000,40649=>1000,40650=>1000,40651=>1000,40652=>1000,40653=>1000,40654=>1000,40655=>1000,40656=>1000,40657=>1000,40658=>1000,40659=>1000,40660=>1000,
-	40661=>1000,40662=>1000,40663=>1000,40664=>1000,40665=>1000,40666=>1000,40667=>1000,40668=>1000,40669=>1000,40670=>1000,40671=>1000,40672=>1000,40673=>1000,40674=>1000,40675=>1000,40676=>1000,
-	40677=>1000,40678=>1000,40679=>1000,40680=>1000,40681=>1000,40682=>1000,40683=>1000,40684=>1000,40685=>1000,40686=>1000,40687=>1000,40688=>1000,40689=>1000,40690=>1000,40691=>1000,40692=>1000,
-	40693=>1000,40694=>1000,40695=>1000,40696=>1000,40697=>1000,40698=>1000,40699=>1000,40700=>1000,40701=>1000,40702=>1000,40703=>1000,40704=>1000,40705=>1000,40706=>1000,40707=>1000,40708=>1000,
-	40709=>1000,40710=>1000,40711=>1000,40712=>1000,40713=>1000,40714=>1000,40715=>1000,40716=>1000,40717=>1000,40718=>1000,40719=>1000,40720=>1000,40721=>1000,40722=>1000,40723=>1000,40724=>1000,
-	40725=>1000,40726=>1000,40727=>1000,40728=>1000,40729=>1000,40730=>1000,40731=>1000,40732=>1000,40733=>1000,40734=>1000,40735=>1000,40736=>1000,40737=>1000,40738=>1000,40739=>1000,40740=>1000,
-	40741=>1000,40742=>1000,40743=>1000,40744=>1000,40745=>1000,40746=>1000,40747=>1000,40748=>1000,40749=>1000,40750=>1000,40751=>1000,40752=>1000,40753=>1000,40754=>1000,40755=>1000,40756=>1000,
-	40757=>1000,40758=>1000,40759=>1000,40760=>1000,40761=>1000,40762=>1000,40763=>1000,40764=>1000,40765=>1000,40766=>1000,40767=>1000,40768=>1000,40769=>1000,40770=>1000,40771=>1000,40772=>1000,
-	40773=>1000,40774=>1000,40775=>1000,40776=>1000,40777=>1000,40778=>1000,40779=>1000,40780=>1000,40781=>1000,40782=>1000,40783=>1000,40784=>1000,40785=>1000,40786=>1000,40787=>1000,40788=>1000,
-	40789=>1000,40790=>1000,40791=>1000,40792=>1000,40793=>1000,40794=>1000,40795=>1000,40796=>1000,40797=>1000,40798=>1000,40799=>1000,40800=>1000,40801=>1000,40802=>1000,40803=>1000,40804=>1000,
-	40805=>1000,40806=>1000,40807=>1000,40808=>1000,40809=>1000,40810=>1000,40811=>1000,40812=>1000,40813=>1000,40814=>1000,40815=>1000,40816=>1000,40817=>1000,40818=>1000,40819=>1000,40820=>1000,
-	40821=>1000,40822=>1000,40823=>1000,40824=>1000,40825=>1000,40826=>1000,40827=>1000,40828=>1000,40829=>1000,40830=>1000,40831=>1000,40832=>1000,40833=>1000,40834=>1000,40835=>1000,40836=>1000,
-	40837=>1000,40838=>1000,40839=>1000,40840=>1000,40841=>1000,40842=>1000,40843=>1000,40844=>1000,40845=>1000,40846=>1000,40847=>1000,40848=>1000,40849=>1000,40850=>1000,40851=>1000,40852=>1000,
-	40853=>1000,40854=>1000,40855=>1000,40856=>1000,40857=>1000,40858=>1000,40859=>1000,40860=>1000,40861=>1000,40862=>1000,40863=>1000,40864=>1000,40865=>1000,40866=>1000,40867=>1000,40868=>1000,
-	40869=>1000);
-$diff='';
-$originalsize=23275812;
-
-// CID Information
-// Select your language
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ac16.tar.Z,ag15.tar.Z,ak12.tar.Z and aj16.tar.Z.
-
-//$enc='UniCNS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'CNS1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ac15.php');
-
-//$enc='UniGB-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'GB1','Supplement'=>2);
-//include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-$enc='UniKS-UTF16-H';
-$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Korea1','Supplement'=>0);
-include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-//$enc='UniJIS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Japan1','Supplement'=>5);
-//include(dirname(__FILE__).'/uni2cid_aj16.php');
-?>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0.php
deleted file mode 100644
index 59aa08da852..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/arialunicid0.php
+++ /dev/null
@@ -1,1769 +0,0 @@
-<?php
-$type='cidfont0';
-$name='ArialUnicodeMS';
-$desc=array('Ascent'=>1069,'Descent'=>-271,'CapHeight'=>1069,'Flags'=>32,'FontBBox'=>'[-1011 -330 2260 1078]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-100;
-$ut=50;
-$dw=1000;
-$cw=array(
-	32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,
-	48=>556,49=>556,50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,60=>584,61=>584,62=>584,63=>556,
-	64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-	80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>278,92=>278,93=>278,94=>469,95=>500,
-	96=>333,97=>556,98=>556,99=>500,100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,109=>833,110=>556,111=>556,
-	112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,8364=>556,
-	1027=>567,8218=>222,402=>278,8222=>333,8230=>1000,8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,1036=>584,381=>611,1039=>723,8216=>222,
-	8217=>222,8220=>333,8221=>333,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>500,8250=>333,339=>944,1116=>437,382=>500,376=>667,160=>278,161=>333,
-	162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,172=>584,173=>333,174=>737,175=>500,176=>400,177=>584,
-	178=>333,179=>333,180=>333,181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,190=>834,191=>611,192=>667,193=>667,
-	194=>667,195=>667,196=>667,197=>667,198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,208=>722,209=>722,
-	210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-	226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,
-	242=>556,243=>556,244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>667,257=>556,
-	258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,268=>722,269=>500,270=>722,271=>627,272=>722,273=>556,
-	274=>667,275=>556,276=>667,277=>556,278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,288=>778,289=>556,
-	290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>222,298=>278,299=>222,300=>278,301=>222,302=>278,303=>222,304=>278,305=>278,
-	306=>751,307=>444,308=>500,309=>222,310=>667,311=>500,312=>437,313=>556,314=>222,315=>556,316=>222,317=>556,318=>222,319=>556,320=>318,321=>556,
-	322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,328=>556,329=>626,330=>723,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-	340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,350=>667,351=>500,354=>611,355=>278,356=>611,357=>406,
-	358=>611,359=>278,360=>722,361=>556,362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,372=>944,373=>722,
-	374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>222,384=>556,385=>740,386=>655,387=>556,388=>556,389=>556,390=>722,391=>766,392=>579,
-	393=>722,394=>789,395=>655,396=>556,397=>557,398=>667,399=>729,400=>604,401=>611,403=>791,404=>649,405=>806,406=>245,407=>322,408=>667,409=>500,
-	410=>322,411=>500,412=>833,413=>722,414=>556,415=>778,416=>776,417=>556,418=>1019,419=>782,420=>735,421=>556,422=>722,423=>667,424=>500,425=>602,
-	426=>366,427=>278,428=>571,429=>278,430=>611,431=>776,432=>620,433=>748,434=>667,435=>752,436=>615,437=>611,438=>500,439=>628,440=>628,441=>526,
-	442=>480,443=>556,444=>556,445=>526,446=>556,447=>556,448=>278,449=>464,450=>474,451=>278,452=>1333,453=>1222,454=>1056,455=>1030,456=>778,457=>444,
-	458=>1222,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,
-	474=>556,475=>722,476=>556,477=>556,478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,488=>667,489=>500,
-	490=>778,491=>556,492=>778,493=>556,494=>534,495=>534,496=>222,497=>1333,498=>1222,499=>1056,500=>778,501=>556,506=>667,507=>556,508=>1000,509=>889,
-	510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,
-	526=>778,527=>556,528=>722,529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,
-	598=>556,599=>556,600=>556,601=>556,602=>777,603=>485,604=>485,605=>686,606=>519,607=>260,608=>556,609=>556,610=>557,611=>500,612=>500,613=>556,
-	614=>556,615=>556,616=>242,617=>282,618=>356,619=>356,620=>425,621=>222,622=>635,623=>833,624=>833,625=>833,626=>556,627=>556,628=>558,629=>556,
-	630=>715,631=>674,632=>558,633=>333,634=>333,635=>333,636=>333,637=>333,638=>312,639=>312,640=>530,641=>530,642=>500,643=>216,644=>276,645=>216,
-	646=>222,647=>278,648=>278,649=>596,650=>558,651=>556,652=>500,653=>722,654=>500,655=>500,656=>500,657=>564,658=>530,659=>530,660=>464,661=>464,
-	662=>464,663=>500,664=>614,665=>526,666=>519,667=>557,668=>558,669=>222,670=>500,671=>416,672=>556,673=>464,674=>464,675=>966,676=>966,677=>1030,
-	678=>689,679=>484,680=>718,688=>326,689=>326,690=>153,691=>201,692=>201,693=>201,694=>304,695=>389,696=>278,697=>222,698=>372,699=>222,700=>222,
-	701=>222,702=>222,703=>222,704=>250,705=>250,706=>320,707=>320,708=>320,709=>320,711=>333,712=>192,713=>333,714=>333,715=>333,716=>192,717=>333,
-	718=>333,719=>333,720=>300,721=>300,722=>222,723=>222,724=>340,725=>340,726=>280,727=>362,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-	736=>278,737=>153,738=>270,739=>274,740=>325,741=>360,742=>360,743=>360,744=>360,745=>360,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-	774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,
-	790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,
-	806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-	822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-	864=>0,865=>0,884=>308,885=>308,890=>278,894=>278,900=>278,901=>278,902=>667,903=>278,904=>704,905=>759,906=>315,908=>778,910=>746,911=>758,
-	912=>222,913=>667,914=>667,915=>550,916=>682,917=>667,918=>611,919=>722,920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>650,927=>778,
-	928=>722,929=>667,931=>602,932=>611,933=>667,934=>808,935=>667,936=>804,937=>758,938=>278,939=>667,940=>576,941=>434,942=>556,943=>222,944=>551,
-	945=>576,946=>563,947=>500,948=>557,949=>434,950=>440,951=>556,952=>556,953=>222,954=>498,955=>500,956=>553,957=>500,958=>432,959=>556,960=>678,
-	961=>571,962=>472,963=>619,964=>382,965=>551,966=>649,967=>522,968=>729,969=>766,970=>222,971=>551,972=>556,973=>551,974=>766,976=>563,977=>616,
-	978=>631,979=>726,980=>631,981=>644,982=>781,986=>722,988=>578,990=>570,992=>692,994=>880,995=>833,996=>684,997=>558,998=>680,999=>529,1000=>557,
-	1001=>505,1002=>623,1003=>603,1004=>610,1005=>611,1006=>568,1007=>434,1008=>600,1009=>571,1010=>500,1011=>222,1025=>667,1026=>865,1028=>717,1029=>667,1030=>278,
-	1031=>278,1032=>500,1033=>1105,1034=>1009,1035=>867,1038=>635,1040=>667,1041=>655,1042=>667,1043=>567,1044=>677,1045=>667,1046=>923,1047=>604,1048=>722,1049=>722,
-	1050=>584,1051=>705,1052=>833,1053=>722,1054=>778,1055=>723,1056=>667,1057=>722,1058=>611,1059=>635,1060=>760,1061=>667,1062=>740,1063=>684,1064=>920,1065=>939,
-	1066=>793,1067=>883,1068=>655,1069=>717,1070=>1006,1071=>722,1072=>556,1073=>573,1074=>531,1075=>383,1076=>583,1077=>556,1078=>669,1079=>458,1080=>559,1081=>559,
-	1082=>437,1083=>571,1084=>683,1085=>552,1086=>556,1087=>542,1088=>556,1089=>500,1090=>458,1091=>500,1092=>823,1093=>500,1094=>562,1095=>533,1096=>802,1097=>823,
-	1098=>620,1099=>717,1100=>523,1101=>510,1102=>744,1103=>542,1105=>556,1106=>556,1107=>383,1108=>510,1109=>500,1110=>222,1111=>278,1112=>222,1113=>873,1114=>811,
-	1115=>556,1118=>500,1119=>542,1120=>976,1121=>766,1122=>656,1123=>521,1124=>950,1125=>694,1126=>667,1127=>597,1128=>952,1129=>817,1130=>654,1131=>600,1132=>932,
-	1133=>817,1134=>604,1135=>458,1136=>804,1137=>729,1138=>778,1139=>556,1140=>667,1141=>500,1142=>667,1143=>500,1144=>1279,1145=>1060,1146=>778,1147=>556,1148=>976,
-	1149=>766,1150=>976,1151=>766,1152=>722,1153=>514,1154=>686,1155=>334,1156=>382,1157=>334,1158=>334,1168=>435,1169=>339,1170=>567,1171=>383,1172=>656,1173=>556,
-	1174=>923,1175=>669,1176=>604,1177=>458,1178=>584,1179=>437,1180=>584,1181=>437,1182=>584,1183=>437,1184=>764,1185=>537,1186=>741,1187=>573,1188=>900,1189=>670,
-	1190=>736,1191=>560,1192=>778,1193=>560,1194=>722,1195=>500,1196=>611,1197=>458,1198=>667,1199=>500,1200=>667,1201=>500,1202=>667,1203=>500,1204=>916,1205=>661,
-	1206=>684,1207=>533,1208=>684,1209=>533,1210=>684,1211=>556,1212=>829,1213=>667,1214=>829,1215=>667,1216=>278,1217=>923,1218=>669,1219=>584,1220=>437,1223=>735,
-	1224=>570,1227=>684,1228=>533,1232=>667,1233=>556,1234=>667,1235=>556,1236=>1000,1237=>889,1238=>667,1239=>556,1240=>729,1241=>556,1242=>729,1243=>556,1244=>923,
-	1245=>669,1246=>604,1247=>458,1248=>604,1249=>492,1250=>722,1251=>559,1252=>722,1253=>559,1254=>778,1255=>556,1256=>778,1257=>556,1258=>778,1259=>556,1262=>635,
-	1263=>500,1264=>635,1265=>500,1266=>635,1267=>500,1268=>684,1269=>533,1272=>883,1273=>717,1329=>635,1330=>531,1331=>583,1332=>583,1333=>531,1334=>531,1335=>427,
-	1336=>531,1337=>750,1338=>635,1339=>531,1340=>375,1341=>583,1342=>698,1343=>531,1344=>427,1345=>531,1346=>583,1347=>531,1348=>635,1349=>698,1350=>635,1351=>635,
-	1352=>531,1353=>531,1354=>698,1355=>531,1356=>635,1357=>531,1358=>698,1359=>583,1360=>479,1361=>583,1362=>531,1363=>698,1364=>698,1365=>635,1366=>750,1369=>271,
-	1370=>271,1371=>150,1372=>300,1373=>271,1374=>271,1375=>420,1377=>583,1378=>427,1379=>427,1380=>427,1381=>427,1382=>427,1383=>427,1384=>427,1385=>459,1386=>427,
-	1387=>427,1388=>323,1389=>531,1390=>427,1391=>427,1392=>427,1393=>427,1394=>427,1395=>427,1396=>427,1397=>271,1398=>427,1399=>375,1400=>427,1401=>375,1402=>583,
-	1403=>427,1404=>427,1405=>427,1406=>427,1407=>583,1408=>427,1409=>427,1410=>323,1411=>583,1412=>375,1413=>375,1414=>583,1415=>527,1417=>271,1425=>360,1426=>360,
-	1427=>360,1428=>360,1429=>360,1430=>360,1431=>360,1432=>360,1433=>360,1434=>360,1435=>360,1436=>360,1437=>360,1438=>360,1439=>360,1440=>360,1441=>360,1443=>360,
-	1444=>360,1445=>360,1446=>360,1447=>360,1448=>360,1449=>360,1450=>360,1451=>360,1452=>360,1453=>360,1454=>360,1455=>360,1456=>360,1457=>360,1458=>360,1459=>360,
-	1460=>360,1461=>360,1462=>360,1463=>360,1464=>360,1465=>360,1467=>360,1468=>360,1469=>360,1470=>366,1471=>360,1472=>225,1473=>360,1474=>360,1475=>238,1476=>360,
-	1488=>577,1489=>563,1490=>411,1491=>512,1492=>594,1493=>316,1494=>326,1495=>594,1496=>594,1497=>316,1498=>507,1499=>527,1500=>484,1501=>594,1502=>594,1503=>316,
-	1504=>338,1505=>604,1506=>550,1507=>567,1508=>569,1509=>505,1510=>514,1511=>583,1512=>507,1513=>700,1514=>633,1520=>590,1521=>590,1522=>590,1523=>216,1524=>412,
-	1548=>278,1563=>278,1567=>556,1569=>529,1570=>243,1571=>243,1572=>470,1573=>243,1574=>731,1575=>243,1576=>771,1577=>514,1578=>771,1579=>771,1580=>544,1581=>544,
-	1582=>544,1583=>430,1584=>430,1585=>421,1586=>421,1587=>1194,1588=>1194,1589=>1291,1590=>1291,1591=>843,1592=>843,1593=>594,1594=>594,1600=>279,1601=>957,1602=>800,
-	1603=>757,1604=>662,1605=>589,1606=>692,1607=>514,1608=>470,1609=>731,1610=>731,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,
-	1632=>480,1633=>480,1634=>480,1635=>480,1636=>480,1637=>480,1638=>480,1639=>480,1640=>480,1641=>480,1642=>547,1643=>278,1644=>278,1645=>438,1648=>0,1649=>243,
-	1650=>243,1651=>243,1652=>0,1653=>380,1654=>470,1655=>548,1656=>772,1657=>771,1658=>771,1659=>771,1660=>771,1661=>771,1662=>771,1663=>771,1664=>771,1665=>544,
-	1666=>544,1667=>544,1668=>544,1669=>544,1670=>544,1671=>544,1672=>430,1673=>430,1674=>430,1675=>430,1676=>430,1677=>430,1678=>430,1679=>430,1680=>430,1681=>421,
-	1682=>421,1683=>421,1684=>421,1685=>421,1686=>419,1687=>421,1688=>421,1689=>421,1690=>1194,1691=>1194,1692=>1194,1693=>1291,1694=>1291,1695=>843,1696=>594,1697=>957,
-	1698=>957,1699=>957,1700=>957,1701=>957,1702=>957,1703=>800,1704=>800,1705=>828,1706=>1058,1707=>828,1708=>757,1709=>757,1710=>757,1711=>828,1712=>828,1713=>828,
-	1714=>828,1715=>828,1716=>828,1717=>662,1718=>662,1719=>662,1722=>692,1723=>692,1724=>692,1725=>692,1726=>706,1728=>514,1729=>509,1730=>509,1731=>509,1732=>470,
-	1733=>470,1734=>470,1735=>470,1736=>470,1737=>470,1738=>470,1739=>470,1740=>731,1741=>841,1742=>731,1744=>731,1745=>731,1746=>550,1747=>550,1748=>279,1749=>514,
-	1750=>726,1751=>558,1752=>321,1753=>318,1754=>342,1755=>373,1756=>716,1757=>688,1758=>852,1759=>288,1760=>288,1761=>388,1762=>350,1763=>716,1764=>146,1765=>282,
-	1766=>339,1767=>339,1768=>415,1769=>514,1770=>220,1771=>220,1772=>220,1773=>350,1776=>480,1777=>480,1778=>480,1779=>480,1780=>480,1781=>480,1782=>480,1783=>480,
-	1784=>480,1785=>480,2305=>0,2306=>0,2307=>294,2309=>693,2310=>910,2311=>533,2312=>533,2313=>590,2314=>713,2315=>920,2316=>677,2317=>611,2318=>611,2319=>611,
-	2320=>611,2321=>910,2322=>910,2323=>910,2324=>910,2325=>667,2326=>732,2327=>593,2328=>639,2329=>624,2330=>688,2331=>713,2332=>688,2333=>712,2334=>697,2335=>502,
-	2336=>533,2337=>583,2338=>523,2339=>693,2340=>585,2341=>638,2342=>533,2343=>640,2344=>585,2345=>585,2346=>565,2347=>699,2348=>592,2349=>689,2350=>633,2351=>600,
-	2352=>486,2353=>486,2354=>680,2355=>730,2356=>730,2357=>592,2358=>684,2359=>608,2360=>646,2361=>546,2364=>0,2365=>373,2366=>319,2367=>319,2368=>319,2369=>0,
-	2370=>0,2371=>0,2372=>0,2373=>0,2374=>0,2375=>0,2376=>0,2377=>319,2378=>319,2379=>319,2380=>319,2381=>0,2384=>884,2385=>0,2386=>0,2387=>0,
-	2388=>0,2392=>667,2393=>732,2394=>593,2395=>688,2396=>583,2397=>523,2398=>699,2399=>600,2400=>920,2401=>677,2402=>0,2403=>0,2404=>331,2405=>513,2406=>639,
-	2407=>639,2408=>639,2409=>639,2410=>639,2411=>639,2412=>639,2413=>639,2414=>639,2415=>639,2416=>362,2433=>0,2434=>430,2435=>430,2437=>786,2438=>1030,2439=>582,
-	2440=>603,2441=>648,2442=>757,2443=>758,2444=>630,2447=>685,2448=>746,2451=>711,2452=>776,2453=>779,2454=>655,2455=>606,2456=>645,2457=>661,2458=>554,2459=>585,
-	2460=>729,2461=>752,2462=>893,2463=>567,2464=>625,2465=>648,2466=>567,2467=>598,2468=>680,2469=>645,2470=>609,2471=>596,2472=>595,2474=>635,2475=>780,2476=>593,
-	2477=>677,2478=>621,2479=>601,2480=>593,2482=>640,2486=>598,2487=>596,2488=>637,2489=>582,2492=>0,2494=>245,2495=>245,2496=>245,2497=>0,2498=>0,2499=>0,
-	2500=>0,2503=>309,2504=>309,2507=>932,2508=>932,2509=>0,2519=>245,2524=>648,2525=>553,2527=>596,2528=>758,2529=>630,2530=>0,2531=>335,2534=>610,2535=>559,
-	2536=>595,2537=>711,2538=>610,2539=>661,2540=>661,2541=>559,2542=>661,2543=>600,2544=>593,2545=>593,2546=>601,2547=>567,2548=>601,2549=>699,2550=>661,2551=>267,
-	2552=>610,2553=>424,2554=>548,2562=>0,2565=>691,2566=>936,2567=>803,2568=>803,2569=>678,2570=>678,2575=>557,2576=>691,2579=>678,2580=>691,2581=>602,2582=>567,
-	2583=>641,2584=>688,2585=>565,2586=>592,2587=>603,2588=>591,2589=>541,2590=>558,2591=>543,2592=>581,2593=>596,2594=>640,2595=>640,2596=>591,2597=>564,2598=>640,
-	2599=>564,2600=>581,2602=>564,2603=>551,2604=>560,2605=>549,2606=>558,2607=>652,2608=>540,2610=>677,2611=>677,2613=>601,2614=>558,2616=>558,2617=>549,2620=>0,
-	2622=>246,2623=>246,2624=>246,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>567,2650=>690,2651=>591,2652=>591,2654=>581,2662=>591,
-	2663=>591,2664=>591,2665=>591,2666=>591,2667=>591,2668=>591,2669=>591,2670=>591,2671=>591,2672=>0,2673=>0,2674=>557,2675=>678,2676=>894,2689=>0,2690=>0,
-	2691=>300,2693=>781,2694=>1044,2695=>589,2696=>589,2697=>560,2698=>758,2699=>806,2701=>781,2703=>781,2704=>781,2705=>1044,2707=>1044,2708=>1044,2709=>413,2710=>773,
-	2711=>606,2712=>558,2713=>483,2714=>600,2715=>691,2716=>811,2717=>647,2718=>651,2719=>453,2720=>450,2721=>425,2722=>478,2723=>694,2724=>534,2725=>553,2726=>446,
-	2727=>541,2728=>582,2730=>572,2731=>437,2732=>663,2733=>756,2734=>594,2735=>493,2736=>392,2738=>613,2739=>656,2741=>538,2742=>611,2743=>507,2744=>663,2745=>587,
-	2748=>0,2749=>478,2750=>273,2751=>273,2752=>273,2753=>0,2754=>0,2755=>0,2756=>0,2757=>0,2759=>0,2760=>0,2761=>273,2763=>273,2764=>273,2765=>0,
-	2768=>843,2784=>893,2790=>625,2791=>625,2792=>625,2793=>625,2794=>625,2795=>625,2796=>625,2797=>625,2798=>625,2799=>625,2817=>0,2818=>306,2819=>391,2821=>590,
-	2822=>808,2823=>658,2824=>658,2825=>633,2826=>654,2827=>636,2828=>540,2831=>560,2832=>938,2835=>600,2836=>973,2837=>603,2838=>620,2839=>620,2840=>605,2841=>712,
-	2842=>579,2843=>579,2844=>593,2845=>564,2846=>581,2847=>604,2848=>578,2849=>579,2850=>579,2851=>607,2852=>579,2853=>587,2854=>579,2855=>602,2856=>579,2858=>605,
-	2859=>728,2860=>579,2861=>643,2862=>605,2863=>628,2864=>619,2866=>653,2867=>593,2870=>620,2871=>605,2872=>605,2873=>579,2876=>0,2877=>333,2878=>218,2879=>0,
-	2880=>294,2881=>0,2882=>0,2883=>0,2887=>479,2888=>479,2891=>1026,2892=>1026,2893=>0,2902=>0,2903=>218,2908=>579,2909=>579,2911=>599,2912=>636,2913=>540,
-	2918=>578,2919=>480,2920=>480,2921=>622,2922=>506,2923=>605,2924=>529,2925=>548,2926=>512,2927=>528,2928=>561,2946=>0,2947=>742,2949=>1002,2950=>1118,2951=>994,
-	2952=>660,2953=>1012,2954=>1231,2958=>726,2959=>731,2960=>870,2962=>763,2963=>763,2964=>1636,2965=>667,2969=>830,2970=>584,2972=>876,2974=>986,2975=>802,2979=>1295,
-	2980=>656,2984=>630,2985=>1012,2986=>694,2990=>727,2991=>790,2992=>545,2993=>718,2994=>821,2995=>871,2996=>724,2997=>873,2999=>1087,3000=>1098,3001=>1274,3006=>547,
-	3007=>172,3008=>93,3009=>519,3010=>814,3014=>748,3015=>681,3016=>956,3018=>1666,3019=>1666,3020=>1994,3021=>0,3031=>871,3047=>667,3048=>1012,3049=>751,3050=>740,
-	3051=>924,3052=>884,3053=>726,3054=>1002,3055=>825,3056=>717,3057=>719,3058=>774,3073=>365,3074=>601,3075=>346,3077=>720,3078=>786,3079=>567,3080=>1159,3081=>690,
-	3082=>1047,3083=>1299,3084=>913,3086=>625,3087=>625,3088=>712,3090=>655,3091=>655,3092=>862,3093=>515,3094=>680,3095=>526,3096=>943,3097=>655,3098=>684,3099=>684,
-	3100=>670,3101=>1205,3102=>732,3103=>888,3104=>597,3105=>709,3106=>709,3107=>809,3108=>715,3109=>702,3110=>702,3111=>702,3112=>607,3114=>623,3115=>623,3116=>681,
-	3117=>681,3118=>932,3119=>1203,3120=>597,3121=>893,3122=>631,3123=>608,3125=>620,3126=>541,3127=>667,3128=>640,3129=>911,3134=>644,3135=>298,3136=>298,3137=>361,
-	3138=>682,3139=>342,3140=>704,3142=>624,3143=>624,3144=>900,3146=>849,3147=>849,3148=>976,3149=>669,3157=>298,3158=>119,3168=>1620,3169=>1281,3174=>840,3175=>840,
-	3176=>840,3177=>840,3178=>840,3179=>840,3180=>840,3181=>840,3182=>840,3183=>840,3202=>440,3203=>251,3205=>654,3206=>654,3207=>631,3208=>891,3209=>957,3210=>1293,
-	3211=>1044,3212=>744,3214=>650,3215=>650,3216=>659,3218=>667,3219=>667,3220=>667,3221=>462,3222=>749,3223=>543,3224=>779,3225=>674,3226=>682,3227=>660,3228=>667,
-	3229=>1171,3230=>926,3231=>671,3232=>557,3233=>669,3234=>669,3235=>728,3236=>544,3237=>672,3238=>672,3239=>672,3240=>560,3242=>668,3243=>668,3244=>681,3245=>687,
-	3246=>972,3247=>1101,3248=>556,3249=>677,3250=>661,3251=>545,3253=>666,3254=>553,3255=>670,3256=>549,3257=>716,3262=>425,3263=>341,3264=>680,3265=>354,3266=>714,
-	3267=>386,3268=>638,3270=>307,3271=>670,3272=>462,3274=>908,3275=>1251,3276=>434,3277=>336,3285=>344,3286=>404,3294=>673,3296=>1695,3297=>978,3302=>549,3303=>549,
-	3304=>549,3305=>549,3306=>549,3307=>549,3308=>549,3309=>549,3310=>549,3311=>549,3330=>368,3331=>305,3333=>1201,3334=>1351,3335=>905,3336=>1459,3337=>635,3338=>1198,
-	3339=>861,3340=>957,3342=>1211,3343=>1202,3344=>1839,3346=>642,3347=>1114,3348=>1195,3349=>861,3350=>982,3351=>874,3352=>1354,3353=>957,3354=>1016,3355=>1266,3356=>712,
-	3357=>1454,3358=>1215,3359=>563,3360=>565,3361=>1192,3362=>1244,3363=>1268,3364=>878,3365=>966,3366=>545,3367=>879,3368=>879,3370=>1031,3371=>1175,3372=>1334,3373=>546,
-	3374=>643,3375=>949,3376=>642,3377=>555,3378=>945,3379=>631,3380=>553,3381=>959,3382=>936,3383=>1122,3384=>1190,3385=>1112,3390=>475,3391=>418,3392=>442,3393=>340,
-	3394=>340,3395=>473,3398=>640,3399=>530,3400=>1279,3402=>1368,3403=>1258,3404=>1447,3405=>0,3415=>553,3424=>861,3425=>1100,3430=>1095,3431=>929,3432=>854,3433=>1181,
-	3434=>658,3435=>972,3436=>1210,3437=>650,3438=>959,3439=>896,3585=>595,3586=>648,3587=>665,3588=>608,3589=>608,3590=>665,3591=>471,3592=>556,3593=>652,3594=>664,
-	3595=>681,3596=>816,3597=>849,3598=>620,3599=>620,3600=>541,3601=>785,3602=>826,3603=>887,3604=>598,3605=>605,3606=>595,3607=>650,3608=>541,3609=>652,3610=>608,
-	3611=>608,3612=>630,3613=>630,3614=>695,3615=>695,3616=>620,3617=>581,3618=>588,3619=>501,3620=>595,3621=>569,3622=>620,3623=>519,3624=>592,3625=>659,3626=>574,
-	3627=>654,3628=>695,3629=>566,3630=>574,3631=>517,3632=>452,3633=>0,3634=>496,3635=>496,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-	3647=>687,3648=>302,3649=>571,3650=>478,3651=>515,3652=>515,3653=>496,3654=>506,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,
-	3663=>555,3664=>598,3665=>640,3666=>688,3667=>690,3668=>657,3669=>657,3670=>635,3671=>839,3672=>693,3673=>769,3674=>673,3675=>994,3713=>775,3714=>707,3716=>724,
-	3719=>524,3720=>690,3722=>678,3725=>711,3732=>719,3733=>834,3734=>776,3735=>916,3737=>744,3738=>740,3739=>740,3740=>834,3741=>834,3742=>854,3743=>854,3745=>775,
-	3746=>724,3747=>697,3749=>700,3751=>700,3754=>708,3755=>916,3757=>700,3758=>697,3759=>658,3760=>432,3761=>534,3762=>476,3763=>476,3764=>778,3765=>778,3766=>778,
-	3767=>778,3768=>778,3769=>778,3771=>778,3772=>778,3773=>670,3776=>420,3777=>806,3778=>430,3779=>446,3780=>346,3782=>571,3784=>778,3785=>778,3786=>778,3787=>778,
-	3788=>778,3789=>778,3792=>721,3793=>719,3794=>601,3795=>711,3796=>686,3797=>686,3798=>834,3799=>756,3800=>724,3801=>906,3804=>1272,3805=>1272,3840=>600,3841=>600,
-	3842=>600,3843=>600,3844=>600,3845=>600,3846=>600,3847=>600,3848=>600,3849=>600,3850=>600,3851=>600,3852=>600,3853=>600,3854=>600,3855=>600,3856=>600,3857=>600,
-	3858=>600,3859=>600,3860=>600,3861=>600,3862=>600,3863=>600,3864=>600,3865=>600,3866=>600,3867=>600,3868=>600,3869=>600,3870=>600,3871=>600,3872=>600,3873=>600,
-	3874=>600,3875=>600,3876=>600,3877=>600,3878=>600,3879=>600,3880=>600,3881=>600,3882=>600,3883=>600,3884=>600,3885=>600,3886=>600,3887=>600,3888=>600,3889=>600,
-	3890=>600,3891=>600,3892=>600,3893=>600,3894=>600,3895=>600,3896=>600,3897=>600,3898=>600,3899=>600,3900=>600,3901=>600,3902=>600,3903=>600,3904=>600,3905=>600,
-	3906=>600,3907=>600,3908=>600,3909=>600,3910=>600,3911=>600,3913=>600,3914=>600,3915=>600,3916=>600,3917=>600,3918=>600,3919=>600,3920=>600,3921=>600,3922=>600,
-	3923=>600,3924=>600,3925=>600,3926=>600,3927=>600,3928=>600,3929=>600,3930=>600,3931=>600,3932=>600,3933=>600,3934=>600,3935=>600,3936=>600,3937=>600,3938=>600,
-	3939=>600,3940=>600,3941=>600,3942=>600,3943=>600,3944=>600,3945=>600,3953=>600,3954=>600,3955=>600,3956=>600,3957=>600,3958=>600,3959=>600,3960=>600,3961=>600,
-	3962=>600,3963=>600,3964=>600,3965=>600,3966=>600,3967=>600,3968=>600,3969=>600,3970=>600,3971=>600,3972=>600,3973=>600,3974=>600,3975=>600,3976=>600,3977=>600,
-	3978=>600,3979=>600,3984=>600,3985=>600,3986=>600,3987=>600,3988=>600,3989=>600,3991=>600,3993=>600,3994=>600,3995=>600,3996=>600,3997=>600,3998=>600,3999=>600,
-	4000=>600,4001=>600,4002=>600,4003=>600,4004=>600,4005=>600,4006=>600,4007=>600,4008=>600,4009=>600,4010=>600,4011=>600,4012=>600,4013=>600,4017=>600,4018=>600,
-	4019=>600,4020=>600,4021=>600,4022=>600,4023=>600,4025=>600,4256=>662,4257=>677,4258=>708,4259=>696,4260=>609,4261=>790,4262=>664,4263=>785,4264=>560,4265=>634,
-	4266=>782,4267=>701,4268=>629,4269=>682,4270=>705,4271=>692,4272=>734,4273=>615,4274=>592,4275=>680,4276=>679,4277=>705,4278=>643,4279=>623,4280=>623,4281=>629,
-	4282=>633,4283=>770,4284=>592,4285=>662,4286=>629,4287=>672,4288=>735,4289=>576,4290=>606,4291=>605,4292=>676,4293=>792,4304=>435,4305=>556,4306=>565,4307=>872,
-	4308=>506,4309=>544,4310=>723,4311=>868,4312=>530,4313=>532,4314=>955,4315=>552,4316=>565,4317=>712,4318=>547,4319=>574,4320=>685,4321=>554,4322=>806,4323=>810,
-	4324=>777,4325=>502,4326=>686,4327=>512,4328=>552,4329=>496,4330=>568,4331=>552,4332=>592,4333=>565,4334=>552,4335=>741,4336=>549,4337=>659,4338=>559,4339=>524,
-	4340=>482,4341=>565,4342=>822,4347=>506,4352=>1000,4353=>1000,4354=>1000,4355=>1000,4356=>1000,4357=>1000,4358=>1000,4359=>1000,4360=>1000,4361=>1000,4362=>1000,4363=>1000,
-	4364=>1000,4365=>1000,4366=>1000,4367=>1000,4368=>1000,4369=>1000,4370=>1000,4371=>1000,4372=>1000,4373=>1000,4374=>1000,4375=>1000,4376=>1000,4377=>1000,4378=>1000,4379=>1000,
-	4380=>1000,4381=>1000,4382=>1000,4383=>1000,4384=>1000,4385=>1000,4386=>1000,4387=>1000,4388=>1000,4389=>1000,4390=>1000,4391=>1000,4392=>1000,4393=>1000,4394=>1000,4395=>1000,
-	4396=>1000,4397=>1000,4398=>1000,4399=>1000,4400=>1000,4401=>1000,4402=>1000,4403=>1000,4404=>1000,4405=>1000,4406=>1000,4407=>1000,4408=>1000,4409=>1000,4410=>1000,4411=>1000,
-	4412=>1000,4413=>1000,4414=>1000,4415=>1000,4416=>1000,4417=>1000,4418=>1000,4419=>1000,4420=>1000,4421=>1000,4422=>1000,4423=>1000,4424=>1000,4425=>1000,4426=>1000,4427=>1000,
-	4428=>1000,4429=>1000,4430=>1000,4431=>1000,4432=>1000,4433=>1000,4434=>1000,4435=>1000,4436=>1000,4437=>1000,4438=>1000,4439=>1000,4440=>1000,4441=>1000,4447=>1000,4448=>1000,
-	4449=>1000,4450=>1000,4451=>1000,4452=>1000,4453=>1000,4454=>1000,4455=>1000,4456=>1000,4457=>1000,4458=>1000,4459=>1000,4460=>1000,4461=>1000,4462=>1000,4463=>1000,4464=>1000,
-	4465=>1000,4466=>1000,4467=>1000,4468=>1000,4469=>1000,4470=>1000,4471=>1000,4472=>1000,4473=>1000,4474=>1000,4475=>1000,4476=>1000,4477=>1000,4478=>1000,4479=>1000,4480=>1000,
-	4481=>1000,4482=>1000,4483=>1000,4484=>1000,4485=>1000,4486=>1000,4487=>1000,4488=>1000,4489=>1000,4490=>1000,4491=>1000,4492=>1000,4493=>1000,4494=>1000,4495=>1000,4496=>1000,
-	4497=>1000,4498=>1000,4499=>1000,4500=>1000,4501=>1000,4502=>1000,4503=>1000,4504=>1000,4505=>1000,4506=>1000,4507=>1000,4508=>1000,4509=>1000,4510=>1000,4511=>1000,4512=>1000,
-	4513=>1000,4514=>1000,4520=>1000,4521=>1000,4522=>1000,4523=>1000,4524=>1000,4525=>1000,4526=>1000,4527=>1000,4528=>1000,4529=>1000,4530=>1000,4531=>1000,4532=>1000,4533=>1000,
-	4534=>1000,4535=>1000,4536=>1000,4537=>1000,4538=>1000,4539=>1000,4540=>1000,4541=>1000,4542=>1000,4543=>1000,4544=>1000,4545=>1000,4546=>1000,4547=>1000,4548=>1000,4549=>1000,
-	4550=>1000,4551=>1000,4552=>1000,4553=>1000,4554=>1000,4555=>1000,4556=>1000,4557=>1000,4558=>1000,4559=>1000,4560=>1000,4561=>1000,4562=>1000,4563=>1000,4564=>1000,4565=>1000,
-	4566=>1000,4567=>1000,4568=>1000,4569=>1000,4570=>1000,4571=>1000,4572=>1000,4573=>1000,4574=>1000,4575=>1000,4576=>1000,4577=>1000,4578=>1000,4579=>1000,4580=>1000,4581=>1000,
-	4582=>1000,4583=>1000,4584=>1000,4585=>1000,4586=>1000,4587=>1000,4588=>1000,4589=>1000,4590=>1000,4591=>1000,4592=>1000,4593=>1000,4594=>1000,4595=>1000,4596=>1000,4597=>1000,
-	4598=>1000,4599=>1000,4600=>1000,4601=>1000,7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,7691=>556,
-	7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,
-	7708=>667,7709=>556,7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,7721=>556,7722=>722,7723=>556,
-	7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-	7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,
-	7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,7771=>333,
-	7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,
-	7788=>611,7789=>278,7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,
-	7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-	7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,7831=>278,7832=>722,7833=>500,7834=>556,7835=>278,
-	7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,7855=>556,
-	7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,
-	7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,7885=>556,7886=>778,7887=>556,
-	7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,7895=>556,7896=>778,7897=>556,7898=>776,7899=>556,7900=>776,7901=>556,7902=>776,7903=>556,
-	7904=>776,7905=>556,7906=>776,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>620,7914=>776,7915=>620,7916=>776,7917=>620,7918=>776,7919=>620,
-	7920=>776,7921=>620,7922=>667,7923=>500,7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>576,7937=>576,7938=>576,7939=>576,7940=>576,7941=>576,
-	7942=>576,7943=>576,7944=>667,7945=>667,7946=>680,7947=>680,7948=>680,7949=>680,7950=>718,7951=>718,7952=>434,7953=>434,7954=>434,7955=>434,7956=>434,7957=>434,
-	7960=>692,7961=>692,7962=>823,7963=>823,7964=>823,7965=>823,7968=>556,7969=>556,7970=>556,7971=>556,7972=>556,7973=>556,7974=>556,7975=>556,7976=>747,7977=>747,
-	7978=>878,7979=>878,7980=>878,7981=>878,7982=>923,7983=>923,7984=>222,7985=>222,7986=>222,7987=>222,7988=>222,7989=>222,7990=>222,7991=>222,7992=>303,7993=>303,
-	7994=>434,7995=>434,7996=>434,7997=>434,7998=>479,7999=>479,8000=>556,8001=>556,8002=>556,8003=>556,8004=>556,8005=>556,8008=>778,8009=>778,8010=>894,8011=>894,
-	8012=>894,8013=>894,8016=>551,8017=>551,8018=>551,8019=>551,8020=>551,8021=>551,8022=>551,8023=>551,8025=>777,8027=>893,8029=>885,8031=>940,8032=>766,8033=>766,
-	8034=>766,8035=>766,8036=>766,8037=>766,8038=>766,8039=>766,8040=>758,8041=>758,8042=>874,8043=>874,8044=>868,8045=>867,8046=>911,8047=>911,8048=>576,8049=>576,
-	8050=>434,8051=>434,8052=>556,8053=>556,8054=>222,8055=>222,8056=>556,8057=>556,8058=>551,8059=>551,8060=>766,8061=>766,8064=>576,8065=>576,8066=>576,8067=>576,
-	8068=>576,8069=>576,8070=>576,8071=>576,8072=>667,8073=>667,8074=>680,8075=>680,8076=>680,8077=>680,8078=>718,8079=>718,8080=>556,8081=>556,8082=>556,8083=>556,
-	8084=>556,8085=>556,8086=>556,8087=>556,8088=>747,8089=>747,8090=>878,8091=>878,8092=>878,8093=>878,8094=>923,8095=>923,8096=>766,8097=>766,8098=>766,8099=>766,
-	8100=>766,8101=>766,8102=>766,8103=>766,8104=>758,8105=>758,8106=>874,8107=>874,8108=>868,8109=>867,8110=>911,8111=>911,8112=>576,8113=>576,8114=>576,8115=>576,
-	8116=>576,8118=>576,8119=>576,8120=>667,8121=>667,8122=>667,8123=>667,8124=>667,8125=>278,8126=>278,8127=>278,8128=>278,8129=>278,8130=>556,8131=>556,8132=>556,
-	8134=>556,8135=>556,8136=>693,8137=>704,8138=>748,8139=>759,8140=>722,8141=>278,8142=>278,8143=>278,8144=>222,8145=>222,8146=>222,8147=>222,8150=>222,8151=>222,
-	8152=>278,8153=>278,8154=>304,8155=>304,8157=>278,8158=>278,8159=>278,8160=>551,8161=>551,8162=>551,8163=>551,8164=>571,8165=>571,8166=>551,8167=>551,8168=>667,
-	8169=>667,8170=>742,8171=>746,8172=>693,8173=>278,8174=>278,8175=>278,8178=>766,8179=>766,8180=>766,8182=>766,8183=>766,8184=>778,8185=>778,8186=>758,8187=>758,
-	8188=>758,8189=>278,8190=>278,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>100,8202=>50,8203=>0,8204=>0,
-	8205=>0,8208=>333,8209=>333,8210=>556,8213=>564,8214=>428,8215=>500,8219=>222,8223=>333,8227=>350,8228=>278,8229=>556,8231=>278,8232=>0,8233=>0,8241=>1330,
-	8242=>222,8243=>372,8244=>522,8245=>206,8246=>356,8247=>506,8248=>312,8251=>1000,8252=>471,8253=>556,8254=>500,8255=>945,8256=>945,8257=>312,8258=>820,8259=>333,
-	8260=>167,8261=>278,8262=>278,8304=>333,8308=>333,8309=>333,8310=>333,8311=>333,8312=>333,8313=>333,8314=>333,8315=>333,8316=>333,8317=>210,8318=>210,8319=>333,
-	8320=>333,8321=>333,8322=>333,8323=>333,8324=>333,8325=>333,8326=>333,8327=>333,8328=>333,8329=>333,8330=>333,8331=>333,8332=>333,8333=>210,8334=>210,8352=>556,
-	8353=>556,8354=>556,8355=>556,8356=>556,8357=>833,8358=>556,8359=>556,8360=>1024,8361=>940,8362=>784,8363=>556,8400=>600,8401=>600,8402=>600,8403=>600,8404=>700,
-	8405=>700,8406=>600,8407=>600,8408=>600,8409=>600,8410=>600,8411=>600,8412=>600,8413=>900,8414=>900,8415=>900,8416=>900,8417=>700,8448=>889,8449=>889,8450=>667,
-	8451=>1022,8452=>611,8453=>889,8454=>889,8455=>501,8456=>667,8457=>921,8458=>510,8459=>906,8460=>988,8461=>722,8462=>500,8463=>500,8464=>688,8465=>553,8466=>708,
-	8467=>291,8468=>778,8469=>722,8470=>1073,8471=>737,8472=>740,8473=>556,8474=>722,8475=>927,8476=>795,8477=>667,8478=>667,8479=>667,8480=>1000,8481=>1174,8483=>722,
-	8484=>611,8485=>542,8486=>768,8487=>768,8488=>698,8489=>321,8490=>667,8491=>667,8492=>927,8493=>646,8494=>556,8495=>385,8496=>615,8497=>688,8498=>611,8499=>1115,
-	8500=>406,8501=>688,8502=>688,8503=>344,8504=>688,8531=>834,8532=>834,8533=>834,8534=>834,8535=>834,8536=>834,8537=>834,8538=>834,8539=>834,8540=>834,8541=>834,
-	8542=>834,8543=>834,8544=>278,8545=>555,8546=>832,8547=>933,8548=>667,8549=>934,8550=>1031,8551=>1268,8552=>944,8553=>667,8554=>944,8555=>1035,8556=>556,8557=>722,
-	8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>700,8564=>500,8565=>700,8566=>922,8567=>1144,8568=>712,8569=>500,8570=>712,8571=>934,8572=>222,8573=>500,
-	8574=>556,8575=>833,8576=>983,8577=>722,8578=>983,8592=>713,8593=>713,8594=>713,8595=>713,8596=>713,8597=>713,8598=>713,8599=>713,8600=>713,8601=>713,8602=>713,
-	8603=>713,8604=>713,8605=>713,8606=>713,8607=>713,8608=>713,8609=>713,8610=>713,8611=>713,8612=>713,8613=>713,8614=>713,8615=>713,8616=>713,8617=>713,8618=>713,
-	8619=>713,8620=>713,8621=>813,8622=>813,8623=>713,8624=>713,8625=>713,8626=>713,8627=>713,8628=>713,8629=>713,8630=>713,8631=>713,8632=>713,8633=>713,8634=>800,
-	8635=>800,8636=>713,8637=>713,8638=>713,8639=>713,8640=>713,8641=>713,8642=>713,8643=>713,8644=>713,8645=>713,8646=>713,8647=>713,8648=>713,8649=>713,8650=>713,
-	8651=>713,8652=>713,8653=>713,8654=>950,8655=>713,8656=>713,8657=>713,8658=>713,8659=>713,8660=>863,8661=>713,8662=>713,8663=>713,8664=>713,8665=>713,8666=>713,
-	8667=>713,8668=>813,8669=>813,8670=>713,8671=>713,8672=>713,8673=>713,8674=>713,8675=>713,8676=>713,8677=>713,8678=>713,8679=>713,8680=>713,8681=>713,8682=>713,
-	8704=>600,8705=>600,8706=>494,8707=>600,8708=>600,8709=>800,8710=>612,8711=>612,8712=>549,8713=>549,8714=>549,8715=>549,8716=>549,8717=>549,8718=>549,8719=>823,
-	8720=>823,8721=>713,8722=>584,8723=>584,8724=>584,8725=>167,8726=>278,8727=>389,8728=>400,8729=>400,8730=>600,8731=>600,8732=>600,8733=>549,8734=>549,8735=>584,
-	8736=>584,8737=>584,8738=>584,8739=>260,8740=>444,8741=>418,8742=>602,8743=>561,8744=>561,8745=>561,8746=>561,8747=>506,8748=>806,8749=>1106,8750=>506,8751=>806,
-	8752=>1106,8753=>506,8754=>506,8755=>506,8756=>561,8757=>561,8758=>422,8759=>561,8760=>584,8761=>584,8762=>584,8763=>584,8764=>584,8765=>584,8766=>584,8767=>584,
-	8768=>422,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,8775=>584,8776=>584,8777=>584,8778=>584,8779=>584,8780=>584,8781=>584,8782=>584,8783=>584,
-	8784=>584,8785=>584,8786=>584,8787=>584,8788=>737,8789=>737,8790=>584,8791=>584,8792=>584,8793=>584,8794=>584,8795=>584,8796=>584,8797=>584,8798=>584,8799=>584,
-	8800=>584,8801=>584,8802=>584,8803=>584,8804=>584,8805=>584,8806=>584,8807=>584,8808=>584,8809=>584,8810=>969,8811=>969,8812=>584,8813=>584,8814=>584,8815=>584,
-	8816=>584,8817=>584,8818=>584,8819=>584,8820=>584,8821=>584,8822=>584,8823=>584,8824=>584,8825=>584,8826=>584,8827=>584,8828=>584,8829=>584,8830=>584,8831=>584,
-	8832=>584,8833=>584,8834=>678,8835=>678,8836=>678,8837=>678,8838=>678,8839=>678,8840=>678,8841=>678,8842=>678,8843=>678,8844=>561,8845=>561,8846=>561,8847=>678,
-	8848=>678,8849=>673,8850=>673,8851=>561,8852=>561,8853=>800,8854=>800,8855=>800,8856=>800,8857=>800,8858=>800,8859=>800,8860=>800,8861=>800,8862=>800,8863=>800,
-	8864=>800,8865=>800,8866=>549,8867=>549,8868=>549,8869=>549,8870=>399,8871=>399,8872=>549,8873=>549,8874=>549,8875=>672,8876=>549,8877=>549,8878=>549,8879=>672,
-	8880=>549,8881=>549,8882=>549,8883=>549,8884=>549,8885=>549,8886=>713,8887=>713,8888=>713,8889=>549,8890=>549,8891=>584,8892=>584,8893=>584,8894=>584,8895=>584,
-	8896=>561,8897=>561,8898=>561,8899=>561,8900=>549,8901=>250,8902=>549,8903=>649,8904=>630,8905=>630,8906=>630,8907=>630,8908=>630,8909=>584,8910=>561,8911=>561,
-	8912=>668,8913=>668,8914=>668,8915=>668,8916=>561,8917=>602,8918=>584,8919=>584,8920=>1354,8921=>1354,8922=>584,8923=>584,8924=>584,8925=>584,8926=>584,8927=>584,
-	8928=>584,8929=>584,8930=>673,8931=>673,8932=>673,8933=>673,8934=>584,8935=>584,8936=>584,8937=>584,8938=>584,8939=>584,8940=>584,8941=>584,8942=>278,8943=>1000,
-	8944=>1000,8945=>1000,8960=>549,8962=>549,8963=>549,8964=>549,8965=>549,8966=>549,8967=>549,8968=>449,8969=>449,8970=>449,8971=>449,8972=>549,8973=>549,8974=>549,
-	8975=>549,8976=>549,8977=>549,8978=>800,8979=>800,8980=>549,8981=>549,8982=>549,8983=>650,8984=>780,8985=>549,8986=>549,8987=>549,8988=>549,8989=>549,8990=>549,
-	8991=>549,8992=>506,8993=>506,8994=>713,8995=>713,8996=>1000,8997=>1000,8998=>1000,8999=>1000,9000=>1000,9001=>329,9002=>329,9003=>1000,9004=>549,9005=>549,9006=>549,
-	9007=>549,9008=>549,9009=>549,9010=>549,9011=>549,9012=>549,9013=>549,9014=>600,9015=>600,9016=>600,9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,
-	9023=>600,9024=>600,9025=>600,9026=>600,9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,9037=>600,9038=>600,
-	9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,
-	9055=>600,9056=>600,9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,9067=>600,9068=>600,9069=>600,9070=>600,
-	9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9109=>600,9216=>600,9217=>600,9218=>600,
-	9219=>600,9220=>600,9221=>600,9222=>600,9223=>600,9224=>600,9225=>600,9226=>600,9227=>600,9228=>600,9229=>600,9230=>600,9231=>600,9232=>600,9233=>600,9234=>600,
-	9235=>600,9236=>600,9237=>600,9238=>600,9239=>600,9240=>600,9241=>600,9242=>600,9243=>600,9244=>600,9245=>600,9246=>600,9247=>600,9248=>600,9249=>600,9250=>600,
-	9251=>600,9252=>600,9280=>604,9281=>604,9282=>604,9283=>604,9284=>604,9285=>604,9286=>750,9287=>750,9288=>750,9289=>750,9290=>604,9312=>1000,9313=>1000,9314=>1000,
-	9315=>1000,9316=>1000,9317=>1000,9318=>1000,9319=>1000,9320=>1000,9321=>1000,9322=>1000,9323=>1000,9324=>1000,9325=>1000,9326=>1000,9327=>1000,9328=>1000,9329=>1000,9330=>1000,
-	9331=>1000,9332=>1000,9333=>1000,9334=>1000,9335=>1000,9336=>1000,9337=>1000,9338=>1000,9339=>1000,9340=>1000,9341=>1000,9342=>1000,9343=>1000,9344=>1000,9345=>1000,9346=>1000,
-	9347=>1000,9348=>1000,9349=>1000,9350=>1000,9351=>1000,9352=>1000,9353=>1000,9354=>1000,9355=>1000,9356=>1000,9357=>1000,9358=>1000,9359=>1000,9360=>1000,9361=>1000,9362=>1000,
-	9363=>1000,9364=>1000,9365=>1000,9366=>1000,9367=>1000,9368=>1000,9369=>1000,9370=>1000,9371=>1000,9372=>1000,9373=>1000,9374=>1000,9375=>1000,9376=>1000,9377=>1000,9378=>1000,
-	9379=>1000,9380=>1000,9381=>1000,9382=>1000,9383=>1000,9384=>1000,9385=>1000,9386=>1000,9387=>1000,9388=>1000,9389=>1000,9390=>1000,9391=>1000,9392=>1000,9393=>1000,9394=>1000,
-	9395=>1000,9396=>1000,9397=>1000,9398=>1000,9399=>1000,9400=>1000,9401=>1000,9402=>1000,9403=>1000,9404=>1000,9405=>1000,9406=>1000,9407=>1000,9408=>1000,9409=>1000,9410=>1000,
-	9411=>1000,9412=>1000,9413=>1000,9414=>1000,9415=>1000,9416=>1000,9417=>1000,9418=>1000,9419=>1000,9420=>1000,9421=>1000,9422=>1000,9423=>1000,9424=>1000,9425=>1000,9426=>1000,
-	9427=>1000,9428=>1000,9429=>1000,9430=>1000,9431=>1000,9432=>1000,9433=>1000,9434=>1000,9435=>1000,9436=>1000,9437=>1000,9438=>1000,9439=>1000,9440=>1000,9441=>1000,9442=>1000,
-	9443=>1000,9444=>1000,9445=>1000,9446=>1000,9447=>1000,9448=>1000,9449=>1000,9450=>1000,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,
-	9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,
-	9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,
-	9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,
-	9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,
-	9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,
-	9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,
-	9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,
-	9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,
-	9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,
-	9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,
-	9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,
-	9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,
-	9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,
-	9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9728=>750,9729=>1000,
-	9730=>750,9731=>750,9732=>1000,9733=>816,9734=>823,9735=>500,9736=>500,9737=>800,9738=>800,9739=>800,9740=>800,9741=>800,9742=>719,9743=>719,9744=>734,9745=>734,
-	9746=>734,9747=>762,9754=>960,9755=>960,9756=>939,9757=>939,9758=>939,9759=>939,9760=>750,9761=>600,9762=>750,9763=>750,9764=>580,9765=>460,9766=>444,9767=>650,
-	9768=>444,9769=>768,9770=>800,9771=>850,9772=>675,9773=>800,9774=>750,9775=>750,9776=>900,9777=>900,9778=>900,9779=>900,9780=>900,9781=>900,9782=>900,9783=>900,
-	9784=>750,9785=>750,9786=>750,9787=>750,9788=>750,9789=>750,9790=>750,9791=>740,9792=>740,9793=>740,9794=>740,9795=>653,9796=>490,9797=>632,9798=>780,9799=>560,
-	9800=>838,9801=>780,9802=>734,9803=>887,9804=>780,9805=>1080,9806=>896,9807=>1080,9808=>804,9809=>868,9810=>922,9811=>696,9812=>1000,9813=>1000,9814=>1000,9815=>1000,
-	9816=>1000,9817=>1000,9818=>1000,9819=>1000,9820=>1000,9821=>1000,9822=>1000,9823=>1000,9824=>722,9825=>734,9826=>674,9827=>804,9828=>722,9829=>734,9830=>674,9831=>804,
-	9832=>860,9833=>423,9834=>592,9835=>750,9836=>750,9837=>439,9838=>439,9839=>439,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,9993=>690,
-	9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,
-	10012=>754,10013=>494,10014=>552,10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,10026=>789,10027=>841,10028=>823,
-	10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,
-	10045=>682,10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,
-	10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,10084=>910,
-	10085=>667,10086=>760,10087=>760,10102=>788,10103=>788,10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,10114=>788,
-	10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,
-	10131=>788,10132=>894,10136=>748,10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,10147=>924,10148=>917,10149=>930,
-	10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,
-	10167=>888,10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,12288=>1000,12289=>1000,12290=>1000,12291=>1000,12292=>1000,12293=>1000,12294=>1000,12295=>1000,
-	12296=>1000,12297=>1000,12298=>1000,12299=>1000,12300=>1000,12301=>1000,12302=>1000,12303=>1000,12304=>1000,12305=>1000,12306=>1000,12307=>1000,12308=>1000,12309=>1000,12310=>1000,12311=>1000,
-	12312=>1000,12313=>1000,12314=>1000,12315=>1000,12316=>1000,12317=>1000,12318=>1000,12319=>1000,12320=>1000,12321=>1000,12322=>1000,12323=>1000,12324=>1000,12325=>1000,12326=>1000,12327=>1000,
-	12328=>1000,12329=>1000,12330=>1000,12331=>1000,12332=>1000,12333=>1000,12334=>1000,12335=>1000,12336=>1000,12337=>1000,12338=>1000,12339=>1000,12340=>1000,12341=>1000,12342=>1000,12343=>1000,
-	12351=>1000,12353=>1000,12354=>1000,12355=>1000,12356=>1000,12357=>1000,12358=>1000,12359=>1000,12360=>1000,12361=>1000,12362=>1000,12363=>1000,12364=>1000,12365=>1000,12366=>1000,12367=>1000,
-	12368=>1000,12369=>1000,12370=>1000,12371=>1000,12372=>1000,12373=>1000,12374=>1000,12375=>1000,12376=>1000,12377=>1000,12378=>1000,12379=>1000,12380=>1000,12381=>1000,12382=>1000,12383=>1000,
-	12384=>1000,12385=>1000,12386=>1000,12387=>1000,12388=>1000,12389=>1000,12390=>1000,12391=>1000,12392=>1000,12393=>1000,12394=>1000,12395=>1000,12396=>1000,12397=>1000,12398=>1000,12399=>1000,
-	12400=>1000,12401=>1000,12402=>1000,12403=>1000,12404=>1000,12405=>1000,12406=>1000,12407=>1000,12408=>1000,12409=>1000,12410=>1000,12411=>1000,12412=>1000,12413=>1000,12414=>1000,12415=>1000,
-	12416=>1000,12417=>1000,12418=>1000,12419=>1000,12420=>1000,12421=>1000,12422=>1000,12423=>1000,12424=>1000,12425=>1000,12426=>1000,12427=>1000,12428=>1000,12429=>1000,12430=>1000,12431=>1000,
-	12432=>1000,12433=>1000,12434=>1000,12435=>1000,12436=>1000,12441=>1000,12442=>1000,12443=>1000,12444=>1000,12445=>1000,12446=>1000,12449=>1000,12450=>1000,12451=>1000,12452=>1000,12453=>1000,
-	12454=>1000,12455=>1000,12456=>1000,12457=>1000,12458=>1000,12459=>1000,12460=>1000,12461=>1000,12462=>1000,12463=>1000,12464=>1000,12465=>1000,12466=>1000,12467=>1000,12468=>1000,12469=>1000,
-	12470=>1000,12471=>1000,12472=>1000,12473=>1000,12474=>1000,12475=>1000,12476=>1000,12477=>1000,12478=>1000,12479=>1000,12480=>1000,12481=>1000,12482=>1000,12483=>1000,12484=>1000,12485=>1000,
-	12486=>1000,12487=>1000,12488=>1000,12489=>1000,12490=>1000,12491=>1000,12492=>1000,12493=>1000,12494=>1000,12495=>1000,12496=>1000,12497=>1000,12498=>1000,12499=>1000,12500=>1000,12501=>1000,
-	12502=>1000,12503=>1000,12504=>1000,12505=>1000,12506=>1000,12507=>1000,12508=>1000,12509=>1000,12510=>1000,12511=>1000,12512=>1000,12513=>1000,12514=>1000,12515=>1000,12516=>1000,12517=>1000,
-	12518=>1000,12519=>1000,12520=>1000,12521=>1000,12522=>1000,12523=>1000,12524=>1000,12525=>1000,12526=>1000,12527=>1000,12528=>1000,12529=>1000,12530=>1000,12531=>1000,12532=>1000,12533=>1000,
-	12534=>1000,12535=>1000,12536=>1000,12537=>1000,12538=>1000,12539=>1000,12540=>1000,12541=>1000,12542=>1000,12549=>1000,12550=>1000,12551=>1000,12552=>1000,12553=>1000,12554=>1000,12555=>1000,
-	12556=>1000,12557=>1000,12558=>1000,12559=>1000,12560=>1000,12561=>1000,12562=>1000,12563=>1000,12564=>1000,12565=>1000,12566=>1000,12567=>1000,12568=>1000,12569=>1000,12570=>1000,12571=>1000,
-	12572=>1000,12573=>1000,12574=>1000,12575=>1000,12576=>1000,12577=>1000,12578=>1000,12579=>1000,12580=>1000,12581=>1000,12582=>1000,12583=>1000,12584=>1000,12585=>1000,12586=>1000,12587=>1000,
-	12588=>1000,12593=>1000,12594=>1000,12595=>1000,12596=>1000,12597=>1000,12598=>1000,12599=>1000,12600=>1000,12601=>1000,12602=>1000,12603=>1000,12604=>1000,12605=>1000,12606=>1000,12607=>1000,
-	12608=>1000,12609=>1000,12610=>1000,12611=>1000,12612=>1000,12613=>1000,12614=>1000,12615=>1000,12616=>1000,12617=>1000,12618=>1000,12619=>1000,12620=>1000,12621=>1000,12622=>1000,12623=>1000,
-	12624=>1000,12625=>1000,12626=>1000,12627=>1000,12628=>1000,12629=>1000,12630=>1000,12631=>1000,12632=>1000,12633=>1000,12634=>1000,12635=>1000,12636=>1000,12637=>1000,12638=>1000,12639=>1000,
-	12640=>1000,12641=>1000,12642=>1000,12643=>1000,12644=>1000,12645=>1000,12646=>1000,12647=>1000,12648=>1000,12649=>1000,12650=>1000,12651=>1000,12652=>1000,12653=>1000,12654=>1000,12655=>1000,
-	12656=>1000,12657=>1000,12658=>1000,12659=>1000,12660=>1000,12661=>1000,12662=>1000,12663=>1000,12664=>1000,12665=>1000,12666=>1000,12667=>1000,12668=>1000,12669=>1000,12670=>1000,12671=>1000,
-	12672=>1000,12673=>1000,12674=>1000,12675=>1000,12676=>1000,12677=>1000,12678=>1000,12679=>1000,12680=>1000,12681=>1000,12682=>1000,12683=>1000,12684=>1000,12685=>1000,12686=>1000,12688=>1000,
-	12689=>1000,12690=>1000,12691=>1000,12692=>1000,12693=>1000,12694=>1000,12695=>1000,12696=>1000,12697=>1000,12698=>1000,12699=>1000,12700=>1000,12701=>1000,12702=>1000,12703=>1000,12800=>1000,
-	12801=>1000,12802=>1000,12803=>1000,12804=>1000,12805=>1000,12806=>1000,12807=>1000,12808=>1000,12809=>1000,12810=>1000,12811=>1000,12812=>1000,12813=>1000,12814=>1000,12815=>1000,12816=>1000,
-	12817=>1000,12818=>1000,12819=>1000,12820=>1000,12821=>1000,12822=>1000,12823=>1000,12824=>1000,12825=>1000,12826=>1000,12827=>1000,12828=>1000,12832=>1000,12833=>1000,12834=>1000,12835=>1000,
-	12836=>1000,12837=>1000,12838=>1000,12839=>1000,12840=>1000,12841=>1000,12842=>1000,12843=>1000,12844=>1000,12845=>1000,12846=>1000,12847=>1000,12848=>1000,12849=>1000,12850=>1000,12851=>1000,
-	12852=>1000,12853=>1000,12854=>1000,12855=>1000,12856=>1000,12857=>1000,12858=>1000,12859=>1000,12860=>1000,12861=>1000,12862=>1000,12863=>1000,12864=>1000,12865=>1000,12866=>1000,12867=>1000,
-	12896=>1000,12897=>1000,12898=>1000,12899=>1000,12900=>1000,12901=>1000,12902=>1000,12903=>1000,12904=>1000,12905=>1000,12906=>1000,12907=>1000,12908=>1000,12909=>1000,12910=>1000,12911=>1000,
-	12912=>1000,12913=>1000,12914=>1000,12915=>1000,12916=>1000,12917=>1000,12918=>1000,12919=>1000,12920=>1000,12921=>1000,12922=>1000,12923=>1000,12927=>1000,12928=>1000,12929=>1000,12930=>1000,
-	12931=>1000,12932=>1000,12933=>1000,12934=>1000,12935=>1000,12936=>1000,12937=>1000,12938=>1000,12939=>1000,12940=>1000,12941=>1000,12942=>1000,12943=>1000,12944=>1000,12945=>1000,12946=>1000,
-	12947=>1000,12948=>1000,12949=>1000,12950=>1000,12951=>1000,12952=>1000,12953=>1000,12954=>1000,12955=>1000,12956=>1000,12957=>1000,12958=>1000,12959=>1000,12960=>1000,12961=>1000,12962=>1000,
-	12963=>1000,12964=>1000,12965=>1000,12966=>1000,12967=>1000,12968=>1000,12969=>1000,12970=>1000,12971=>1000,12972=>1000,12973=>1000,12974=>1000,12975=>1000,12976=>1000,12992=>1000,12993=>1000,
-	12994=>1000,12995=>1000,12996=>1000,12997=>1000,12998=>1000,12999=>1000,13000=>1000,13001=>1000,13002=>1000,13003=>1000,13008=>1000,13009=>1000,13010=>1000,13011=>1000,13012=>1000,13013=>1000,
-	13014=>1000,13015=>1000,13016=>1000,13017=>1000,13018=>1000,13019=>1000,13020=>1000,13021=>1000,13022=>1000,13023=>1000,13024=>1000,13025=>1000,13026=>1000,13027=>1000,13028=>1000,13029=>1000,
-	13030=>1000,13031=>1000,13032=>1000,13033=>1000,13034=>1000,13035=>1000,13036=>1000,13037=>1000,13038=>1000,13039=>1000,13040=>1000,13041=>1000,13042=>1000,13043=>1000,13044=>1000,13045=>1000,
-	13046=>1000,13047=>1000,13048=>1000,13049=>1000,13050=>1000,13051=>1000,13052=>1000,13053=>1000,13054=>1000,13056=>1000,13057=>1000,13058=>1000,13059=>1000,13060=>1000,13061=>1000,13062=>1000,
-	13063=>1000,13064=>1000,13065=>1000,13066=>1000,13067=>1000,13068=>1000,13069=>1000,13070=>1000,13071=>1000,13072=>1000,13073=>1000,13074=>1000,13075=>1000,13076=>1000,13077=>1000,13078=>1000,
-	13079=>1000,13080=>1000,13081=>1000,13082=>1000,13083=>1000,13084=>1000,13085=>1000,13086=>1000,13087=>1000,13088=>1000,13089=>1000,13090=>1000,13091=>1000,13092=>1000,13093=>1000,13094=>1000,
-	13095=>1000,13096=>1000,13097=>1000,13098=>1000,13099=>1000,13100=>1000,13101=>1000,13102=>1000,13103=>1000,13104=>1000,13105=>1000,13106=>1000,13107=>1000,13108=>1000,13109=>1000,13110=>1000,
-	13111=>1000,13112=>1000,13113=>1000,13114=>1000,13115=>1000,13116=>1000,13117=>1000,13118=>1000,13119=>1000,13120=>1000,13121=>1000,13122=>1000,13123=>1000,13124=>1000,13125=>1000,13126=>1000,
-	13127=>1000,13128=>1000,13129=>1000,13130=>1000,13131=>1000,13132=>1000,13133=>1000,13134=>1000,13135=>1000,13136=>1000,13137=>1000,13138=>1000,13139=>1000,13140=>1000,13141=>1000,13142=>1000,
-	13143=>1000,13144=>1000,13145=>1000,13146=>1000,13147=>1000,13148=>1000,13149=>1000,13150=>1000,13151=>1000,13152=>1000,13153=>1000,13154=>1000,13155=>1000,13156=>1000,13157=>1000,13158=>1000,
-	13159=>1000,13160=>1000,13161=>1000,13162=>1000,13163=>1000,13164=>1000,13165=>1000,13166=>1000,13167=>1000,13168=>1000,13169=>1000,13170=>1000,13171=>1000,13172=>1000,13173=>1000,13174=>1000,
-	13179=>1000,13180=>1000,13181=>1000,13182=>1000,13183=>1000,13184=>1000,13185=>1000,13186=>1000,13187=>1000,13188=>1000,13189=>1000,13190=>1000,13191=>1000,13192=>1000,13193=>1000,13194=>1000,
-	13195=>1000,13196=>1000,13197=>1000,13198=>1000,13199=>1000,13200=>1000,13201=>1000,13202=>1000,13203=>1000,13204=>1000,13205=>1000,13206=>1000,13207=>1000,13208=>1000,13209=>1000,13210=>1000,
-	13211=>1000,13212=>1000,13213=>1000,13214=>1000,13215=>1000,13216=>1000,13217=>1000,13218=>1000,13219=>1000,13220=>1000,13221=>1000,13222=>1000,13223=>1000,13224=>1000,13225=>1000,13226=>1000,
-	13227=>1000,13228=>1000,13229=>1000,13230=>1000,13231=>1000,13232=>1000,13233=>1000,13234=>1000,13235=>1000,13236=>1000,13237=>1000,13238=>1000,13239=>1000,13240=>1000,13241=>1000,13242=>1000,
-	13243=>1000,13244=>1000,13245=>1000,13246=>1000,13247=>1000,13248=>1000,13249=>1000,13250=>1000,13251=>1000,13252=>1000,13253=>1000,13254=>1000,13255=>1000,13256=>1000,13257=>1000,13258=>1000,
-	13259=>1000,13260=>1000,13261=>1000,13262=>1000,13263=>1000,13264=>1000,13265=>1000,13266=>1000,13267=>1000,13268=>1000,13269=>1000,13270=>1000,13271=>1000,13272=>1000,13273=>1000,13274=>1000,
-	13275=>1000,13276=>1000,13277=>1000,13280=>1000,13281=>1000,13282=>1000,13283=>1000,13284=>1000,13285=>1000,13286=>1000,13287=>1000,13288=>1000,13289=>1000,13290=>1000,13291=>1000,13292=>1000,
-	13293=>1000,13294=>1000,13295=>1000,13296=>1000,13297=>1000,13298=>1000,13299=>1000,13300=>1000,13301=>1000,13302=>1000,13303=>1000,13304=>1000,13305=>1000,13306=>1000,13307=>1000,13308=>1000,
-	13309=>1000,13310=>1000,59393=>316,59394=>507,59395=>507,59396=>484,59397=>484,59416=>0,59492=>480,59495=>480,59536=>458,59557=>466,59558=>480,59559=>903,61441=>500,61442=>500,
-	63232=>541,63233=>0,63234=>0,63235=>0,63236=>0,63237=>0,63238=>0,63239=>0,63240=>0,63241=>0,63242=>0,63243=>0,63244=>0,63245=>0,63246=>0,63247=>849,
-	63248=>0,63249=>0,63250=>0,63251=>0,63252=>0,63253=>0,63254=>0,63255=>0,63256=>0,63257=>0,63258=>0,63260=>333,63261=>287,63744=>1000,63745=>1000,63746=>1000,
-	63747=>1000,63748=>1000,63749=>1000,63750=>1000,63751=>1000,63752=>1000,63753=>1000,63754=>1000,63755=>1000,63756=>1000,63757=>1000,63758=>1000,63759=>1000,63760=>1000,63761=>1000,63762=>1000,
-	63763=>1000,63764=>1000,63765=>1000,63766=>1000,63767=>1000,63768=>1000,63769=>1000,63770=>1000,63771=>1000,63772=>1000,63773=>1000,63774=>1000,63775=>1000,63776=>1000,63777=>1000,63778=>1000,
-	63779=>1000,63780=>1000,63781=>1000,63782=>1000,63783=>1000,63784=>1000,63785=>1000,63786=>1000,63787=>1000,63788=>1000,63789=>1000,63790=>1000,63791=>1000,63792=>1000,63793=>1000,63794=>1000,
-	63795=>1000,63796=>1000,63797=>1000,63798=>1000,63799=>1000,63800=>1000,63801=>1000,63802=>1000,63803=>1000,63804=>1000,63805=>1000,63806=>1000,63807=>1000,63808=>1000,63809=>1000,63810=>1000,
-	63811=>1000,63812=>1000,63813=>1000,63814=>1000,63815=>1000,63816=>1000,63817=>1000,63818=>1000,63819=>1000,63820=>1000,63821=>1000,63822=>1000,63823=>1000,63824=>1000,63825=>1000,63826=>1000,
-	63827=>1000,63828=>1000,63829=>1000,63830=>1000,63831=>1000,63832=>1000,63833=>1000,63834=>1000,63835=>1000,63836=>1000,63837=>1000,63838=>1000,63839=>1000,63840=>1000,63841=>1000,63842=>1000,
-	63843=>1000,63844=>1000,63845=>1000,63846=>1000,63847=>1000,63848=>1000,63849=>1000,63850=>1000,63851=>1000,63852=>1000,63853=>1000,63854=>1000,63855=>1000,63856=>1000,63857=>1000,63858=>1000,
-	63859=>1000,63860=>1000,63861=>1000,63862=>1000,63863=>1000,63864=>1000,63865=>1000,63866=>1000,63867=>1000,63868=>1000,63869=>1000,63870=>1000,63871=>1000,63872=>1000,63873=>1000,63874=>1000,
-	63875=>1000,63876=>1000,63877=>1000,63878=>1000,63879=>1000,63880=>1000,63881=>1000,63882=>1000,63883=>1000,63884=>1000,63885=>1000,63886=>1000,63887=>1000,63888=>1000,63889=>1000,63890=>1000,
-	63891=>1000,63892=>1000,63893=>1000,63894=>1000,63895=>1000,63896=>1000,63897=>1000,63898=>1000,63899=>1000,63900=>1000,63901=>1000,63902=>1000,63903=>1000,63904=>1000,63905=>1000,63906=>1000,
-	63907=>1000,63908=>1000,63909=>1000,63910=>1000,63911=>1000,63912=>1000,63913=>1000,63914=>1000,63915=>1000,63916=>1000,63917=>1000,63918=>1000,63919=>1000,63920=>1000,63921=>1000,63922=>1000,
-	63923=>1000,63924=>1000,63925=>1000,63926=>1000,63927=>1000,63928=>1000,63929=>1000,63930=>1000,63931=>1000,63932=>1000,63933=>1000,63934=>1000,63935=>1000,63936=>1000,63937=>1000,63938=>1000,
-	63939=>1000,63940=>1000,63941=>1000,63942=>1000,63943=>1000,63944=>1000,63945=>1000,63946=>1000,63947=>1000,63948=>1000,63949=>1000,63950=>1000,63951=>1000,63952=>1000,63953=>1000,63954=>1000,
-	63955=>1000,63956=>1000,63957=>1000,63958=>1000,63959=>1000,63960=>1000,63961=>1000,63962=>1000,63963=>1000,63964=>1000,63965=>1000,63966=>1000,63967=>1000,63968=>1000,63969=>1000,63970=>1000,
-	63971=>1000,63972=>1000,63973=>1000,63974=>1000,63975=>1000,63976=>1000,63977=>1000,63978=>1000,63979=>1000,63980=>1000,63981=>1000,63982=>1000,63983=>1000,63984=>1000,63985=>1000,63986=>1000,
-	63987=>1000,63988=>1000,63989=>1000,63990=>1000,63991=>1000,63992=>1000,63993=>1000,63994=>1000,63995=>1000,63996=>1000,63997=>1000,63998=>1000,63999=>1000,64000=>1000,64001=>1000,64002=>1000,
-	64003=>1000,64004=>1000,64005=>1000,64006=>1000,64007=>1000,64008=>1000,64009=>1000,64010=>1000,64011=>1000,64012=>1000,64013=>1000,64014=>1000,64015=>1000,64016=>1000,64017=>1000,64018=>1000,
-	64019=>1000,64020=>1000,64021=>1000,64022=>1000,64023=>1000,64024=>1000,64025=>1000,64026=>1000,64027=>1000,64028=>1000,64029=>1000,64030=>1000,64031=>1000,64032=>1000,64033=>1000,64034=>1000,
-	64035=>1000,64036=>1000,64037=>1000,64038=>1000,64039=>1000,64040=>1000,64041=>1000,64042=>1000,64043=>1000,64044=>1000,64045=>1000,64256=>537,64257=>500,64258=>500,64259=>778,64260=>750,
-	64261=>532,64262=>758,64275=>784,64276=>784,64277=>784,64278=>784,64279=>893,64286=>333,64287=>590,64288=>550,64289=>709,64290=>649,64291=>730,64292=>656,64293=>605,64294=>730,
-	64295=>633,64296=>794,64297=>584,64298=>700,64299=>700,64300=>700,64301=>700,64302=>577,64303=>577,64304=>577,64305=>563,64306=>411,64307=>512,64308=>594,64309=>316,64310=>326,
-	64312=>594,64313=>316,64314=>507,64315=>527,64316=>484,64318=>594,64320=>338,64321=>604,64323=>567,64324=>569,64326=>514,64327=>583,64328=>507,64329=>700,64330=>633,64331=>316,
-	64332=>563,64333=>527,64334=>569,64335=>577,64336=>243,64337=>273,64338=>771,64339=>788,64340=>276,64341=>243,64342=>771,64343=>788,64344=>276,64345=>243,64346=>771,64347=>788,
-	64348=>276,64349=>243,64350=>771,64351=>788,64352=>276,64353=>243,64354=>771,64355=>788,64356=>276,64357=>243,64358=>771,64359=>788,64360=>276,64361=>243,64362=>957,64363=>903,
-	64364=>466,64365=>480,64366=>957,64367=>903,64368=>466,64369=>480,64370=>544,64371=>658,64372=>646,64373=>637,64374=>544,64375=>658,64376=>646,64377=>637,64378=>544,64379=>658,
-	64380=>646,64381=>637,64382=>544,64383=>658,64384=>646,64385=>637,64386=>430,64387=>458,64388=>430,64389=>458,64390=>430,64391=>458,64392=>430,64393=>458,64394=>421,64395=>436,
-	64396=>421,64397=>436,64398=>828,64399=>942,64400=>432,64401=>549,64402=>828,64403=>942,64404=>432,64405=>549,64406=>828,64407=>942,64408=>432,64409=>549,64410=>828,64411=>942,
-	64412=>432,64413=>549,64414=>692,64415=>723,64416=>692,64417=>723,64418=>276,64419=>243,64420=>514,64421=>477,64422=>514,64423=>509,64424=>273,64425=>427,64426=>706,64427=>706,
-	64428=>686,64429=>686,64430=>550,64431=>461,64432=>550,64433=>461,64467=>757,64468=>733,64469=>432,64470=>549,64471=>470,64472=>466,64473=>470,64474=>466,64475=>470,64476=>466,
-	64477=>470,64478=>470,64479=>466,64480=>470,64481=>466,64482=>470,64483=>466,64484=>781,64485=>933,64486=>276,64487=>243,64488=>276,64489=>243,64490=>547,64491=>517,64492=>783,
-	64493=>753,64494=>740,64495=>710,64496=>740,64497=>710,64498=>740,64499=>710,64500=>740,64501=>710,64502=>1207,64503=>1177,64504=>517,64505=>1067,64506=>1037,64507=>517,64508=>731,
-	64509=>793,64510=>276,64511=>243,64512=>932,64513=>932,64514=>914,64515=>1067,64516=>1077,64517=>935,64518=>935,64519=>935,64520=>917,64521=>1070,64522=>1080,64523=>932,64524=>932,
-	64525=>932,64526=>914,64527=>1067,64528=>1077,64529=>932,64530=>914,64531=>1067,64532=>1077,64533=>1305,64534=>1287,64535=>1305,64536=>1287,64537=>1305,64538=>1305,64539=>1287,64540=>1429,
-	64541=>1429,64542=>1429,64543=>1411,64544=>1476,64545=>1458,64546=>1476,64547=>1476,64548=>1476,64549=>1458,64550=>1392,64551=>1374,64552=>1374,64553=>1245,64554=>1227,64555=>1245,64556=>1227,
-	64557=>1125,64558=>1125,64559=>1125,64560=>1107,64561=>1260,64562=>1270,64563=>1125,64564=>1107,64565=>1260,64566=>1270,64567=>706,64568=>1091,64569=>1091,64570=>1091,64571=>1106,64572=>1073,
-	64573=>1226,64574=>1236,64575=>932,64576=>932,64577=>932,64578=>914,64579=>1067,64580=>1077,64581=>1140,64582=>1140,64583=>1140,64584=>1122,64585=>1275,64586=>1285,64587=>932,64588=>932,
-	64589=>932,64590=>914,64591=>1067,64592=>1077,64593=>1345,64594=>1327,64595=>1480,64596=>1490,64597=>932,64598=>932,64599=>932,64600=>914,64601=>1067,64602=>1077,64603=>430,64604=>421,
-	64605=>731,64606=>296,64607=>300,64608=>300,64609=>300,64610=>300,64611=>300,64612=>680,64613=>680,64614=>884,64615=>967,64616=>1037,64617=>1047,64618=>680,64619=>680,64620=>884,
-	64621=>967,64622=>1037,64623=>1047,64624=>680,64625=>680,64626=>884,64627=>967,64628=>1037,64629=>1047,64630=>680,64631=>680,64632=>884,64633=>967,64634=>1037,64635=>1047,64636=>1274,
-	64637=>1284,64638=>1274,64639=>1284,64640=>821,64641=>1221,64642=>1188,64643=>1341,64644=>1351,64645=>884,64646=>1037,64647=>1047,64648=>806,64649=>1173,64650=>680,64651=>680,64652=>884,
-	64653=>967,64654=>1037,64655=>1047,64656=>793,64657=>680,64658=>680,64659=>884,64660=>967,64661=>1037,64662=>1047,64663=>911,64664=>911,64665=>911,64666=>806,64667=>679,64668=>911,
-	64669=>911,64670=>911,64671=>806,64672=>679,64673=>911,64674=>911,64675=>911,64676=>806,64677=>679,64678=>806,64679=>1284,64680=>1179,64681=>1284,64682=>1179,64683=>1284,64684=>1179,
-	64685=>1408,64686=>1408,64687=>1408,64688=>1303,64689=>1455,64690=>1455,64691=>1350,64692=>1455,64693=>1455,64694=>1455,64695=>1350,64696=>1371,64697=>1266,64698=>1224,64699=>1119,64700=>1224,
-	64701=>1119,64702=>1104,64703=>1104,64704=>1104,64705=>999,64706=>1104,64707=>999,64708=>1070,64709=>1070,64710=>1070,64711=>676,64712=>965,64713=>911,64714=>911,64715=>911,64716=>806,
-	64717=>679,64718=>1119,64719=>1119,64720=>1119,64721=>1014,64722=>911,64723=>911,64724=>911,64725=>806,64726=>679,64727=>1324,64728=>1219,64729=>686,64730=>911,64731=>911,64732=>911,
-	64733=>806,64734=>679,64735=>776,64736=>649,64737=>776,64738=>649,64739=>776,64740=>649,64741=>776,64742=>649,64743=>1303,64744=>1176,64745=>1303,64746=>1176,64747=>793,64748=>1082,
-	64749=>776,64750=>776,64751=>649,64752=>776,64753=>649,64754=>306,64755=>302,64756=>298,64757=>1527,64758=>1537,64759=>1380,64760=>1390,64761=>1380,64762=>1390,64763=>1564,64764=>1574,
-	64765=>1564,64766=>1574,64767=>1440,64768=>1450,64769=>1440,64770=>1450,64771=>1440,64772=>1450,64773=>1611,64774=>1621,64775=>1611,64776=>1621,64777=>1429,64778=>1429,64779=>1429,64780=>1411,
-	64781=>1207,64782=>1207,64783=>1254,64784=>1254,64785=>1527,64786=>1537,64787=>1348,64788=>1358,64789=>1348,64790=>1358,64791=>1564,64792=>1574,64793=>1564,64794=>1574,64795=>1431,64796=>1441,
-	64797=>1431,64798=>1441,64799=>1431,64800=>1441,64801=>1611,64802=>1621,64803=>1611,64804=>1621,64805=>1429,64806=>1429,64807=>1429,64808=>1411,64809=>1207,64810=>1207,64811=>1254,64812=>1254,
-	64813=>1408,64814=>1408,64815=>1408,64816=>1303,64817=>1176,64818=>1176,64819=>1266,64820=>1408,64821=>1408,64822=>1408,64823=>1408,64824=>1408,64825=>1408,64826=>1266,64827=>1266,64828=>273,
-	64829=>243,64830=>600,64831=>600,64848=>1444,64849=>1541,64850=>1549,64851=>1444,64852=>1444,64853=>1444,64854=>1444,64855=>1444,64856=>1830,64857=>1817,64858=>1975,64859=>1964,64860=>2046,
-	64861=>2046,64862=>2202,64863=>1962,64864=>1941,64865=>1941,64866=>1944,64867=>1836,64868=>2114,64869=>2093,64870=>1991,64871=>2049,64872=>1941,64873=>2212,64874=>1962,64875=>1941,64876=>1944,
-	64877=>1836,64878=>2249,64879=>2096,64880=>1988,64881=>1925,64882=>1904,64883=>1799,64884=>2070,64885=>1833,64886=>1729,64887=>1652,64888=>1881,64889=>1729,64890=>1892,64891=>1881,64892=>1759,
-	64893=>1637,64894=>1670,64895=>1654,64896=>1522,64897=>1686,64898=>1675,64899=>1549,64900=>1541,64901=>1522,64902=>1444,64903=>1436,64904=>1444,64905=>1757,64906=>1652,64907=>1975,64908=>1757,
-	64909=>1652,64910=>1757,64911=>1652,64914=>1757,64915=>1857,64916=>1752,64917=>1444,64918=>1675,64919=>1522,64920=>1444,64921=>1675,64922=>1581,64923=>1570,64924=>1417,64925=>1362,64926=>1686,
-	64927=>1686,64928=>1675,64929=>1686,64930=>1675,64931=>1581,64932=>1570,64933=>1975,64934=>2069,64935=>1964,64936=>2202,64937=>2259,64938=>2212,64939=>2259,64940=>1686,64941=>1581,64942=>1686,
-	64943=>1686,64944=>1581,64945=>1870,64946=>1817,64947=>1686,64948=>1637,64949=>1444,64950=>1892,64951=>1886,64952=>1549,64953=>1975,64954=>1444,64955=>1723,64956=>1522,64957=>1541,64958=>2080,
-	64959=>2080,64960=>1975,64961=>1817,64962=>1686,64963=>1499,64964=>1757,64965=>1883,64966=>2212,64967=>1686,65008=>1523,65009=>1172,65010=>1159,65011=>1356,65012=>2111,65013=>2258,65014=>2130,
-	65015=>1552,65016=>2046,65017=>1856,65018=>1930,65019=>1070,65056=>450,65057=>450,65058=>450,65059=>450,65072=>1000,65073=>1000,65074=>1000,65075=>1000,65076=>1000,65077=>1000,65078=>1000,
-	65079=>1000,65080=>1000,65081=>1000,65082=>1000,65083=>1000,65084=>1000,65085=>1000,65086=>1000,65087=>1000,65088=>1000,65089=>1000,65090=>1000,65091=>1000,65092=>1000,65097=>1000,65098=>1000,
-	65099=>1000,65100=>1000,65101=>1000,65102=>1000,65103=>1000,65104=>167,65105=>250,65106=>167,65108=>167,65109=>167,65110=>334,65111=>167,65112=>600,65113=>200,65114=>200,65115=>200,
-	65116=>200,65117=>200,65118=>200,65119=>334,65120=>400,65121=>233,65122=>350,65123=>200,65124=>350,65125=>350,65126=>350,65128=>167,65129=>334,65130=>533,65131=>609,65136=>300,
-	65137=>298,65138=>296,65140=>298,65142=>300,65143=>298,65144=>300,65145=>302,65146=>298,65147=>296,65148=>306,65149=>306,65150=>154,65151=>154,65152=>529,65153=>243,65154=>273,
-	65155=>243,65156=>273,65157=>470,65158=>466,65159=>243,65160=>273,65161=>731,65162=>793,65163=>276,65164=>243,65165=>243,65166=>273,65167=>771,65168=>788,65169=>276,65170=>243,
-	65171=>514,65172=>477,65173=>771,65174=>788,65175=>276,65176=>243,65177=>771,65178=>788,65179=>276,65180=>243,65181=>544,65182=>658,65183=>646,65184=>637,65185=>544,65186=>658,
-	65187=>646,65188=>637,65189=>544,65190=>658,65191=>646,65192=>637,65193=>430,65194=>458,65195=>430,65196=>458,65197=>421,65198=>436,65199=>421,65200=>436,65201=>1194,65202=>1194,
-	65203=>770,65204=>770,65205=>1194,65206=>1194,65207=>770,65208=>770,65209=>1291,65210=>1291,65211=>817,65212=>817,65213=>1291,65214=>1291,65215=>817,65216=>817,65217=>843,65218=>843,
-	65219=>733,65220=>733,65221=>843,65222=>843,65223=>733,65224=>733,65225=>594,65226=>556,65227=>586,65228=>554,65229=>594,65230=>556,65231=>586,65232=>554,65233=>957,65234=>903,
-	65235=>466,65236=>480,65237=>800,65238=>823,65239=>466,65240=>480,65241=>757,65242=>733,65243=>432,65244=>549,65245=>662,65246=>673,65247=>273,65248=>243,65249=>589,65250=>640,
-	65251=>481,65252=>532,65253=>692,65254=>723,65255=>276,65256=>243,65257=>514,65258=>477,65259=>686,65260=>405,65261=>470,65262=>466,65263=>731,65264=>793,65265=>731,65266=>803,
-	65267=>276,65268=>243,65269=>551,65270=>603,65271=>551,65272=>603,65273=>551,65274=>603,65275=>551,65276=>603,65281=>1000,65282=>1000,65283=>1000,65284=>1000,65285=>1000,65286=>1000,
-	65287=>1000,65288=>1000,65289=>1000,65290=>1000,65291=>1000,65292=>1000,65293=>1000,65294=>1000,65295=>1000,65296=>1000,65297=>1000,65298=>1000,65299=>1000,65300=>1000,65301=>1000,65302=>1000,
-	65303=>1000,65304=>1000,65305=>1000,65306=>1000,65307=>1000,65308=>1000,65309=>1000,65310=>1000,65311=>1000,65312=>1000,65313=>1000,65314=>1000,65315=>1000,65316=>1000,65317=>1000,65318=>1000,
-	65319=>1000,65320=>1000,65321=>1000,65322=>1000,65323=>1000,65324=>1000,65325=>1000,65326=>1000,65327=>1000,65328=>1000,65329=>1000,65330=>1000,65331=>1000,65332=>1000,65333=>1000,65334=>1000,
-	65335=>1000,65336=>1000,65337=>1000,65338=>1000,65339=>1000,65340=>1000,65341=>1000,65342=>1000,65343=>1000,65344=>1000,65345=>1000,65346=>1000,65347=>1000,65348=>1000,65349=>1000,65350=>1000,
-	65351=>1000,65352=>1000,65353=>1000,65354=>1000,65355=>1000,65356=>1000,65357=>1000,65358=>1000,65359=>1000,65360=>1000,65361=>1000,65362=>1000,65363=>1000,65364=>1000,65365=>1000,65366=>1000,
-	65367=>1000,65368=>1000,65369=>1000,65370=>1000,65371=>1000,65372=>1000,65373=>1000,65374=>1000,65377=>500,65378=>500,65379=>500,65380=>500,65381=>500,65382=>500,65383=>500,65384=>500,
-	65385=>500,65386=>500,65387=>500,65388=>500,65389=>500,65390=>500,65391=>500,65392=>500,65393=>500,65394=>500,65395=>500,65396=>500,65397=>500,65398=>500,65399=>500,65400=>500,
-	65401=>500,65402=>500,65403=>500,65404=>500,65405=>500,65406=>500,65407=>500,65408=>500,65409=>500,65410=>500,65411=>500,65412=>500,65413=>500,65414=>500,65415=>500,65416=>500,
-	65417=>500,65418=>500,65419=>500,65420=>500,65421=>500,65422=>500,65423=>500,65424=>500,65425=>500,65426=>500,65427=>500,65428=>500,65429=>500,65430=>500,65431=>500,65432=>500,
-	65433=>500,65434=>500,65435=>500,65436=>500,65437=>500,65438=>500,65439=>500,65440=>500,65441=>500,65442=>500,65443=>500,65444=>500,65445=>500,65446=>500,65447=>500,65448=>500,
-	65449=>500,65450=>500,65451=>500,65452=>500,65453=>500,65454=>500,65455=>500,65456=>500,65457=>500,65458=>500,65459=>500,65460=>500,65461=>500,65462=>500,65463=>500,65464=>500,
-	65465=>500,65466=>500,65467=>500,65468=>500,65469=>500,65470=>500,65474=>500,65475=>500,65476=>500,65477=>500,65478=>500,65479=>500,65482=>500,65483=>500,65484=>500,65485=>500,
-	65486=>500,65487=>500,65490=>500,65491=>500,65492=>500,65493=>500,65494=>500,65495=>500,65498=>500,65499=>500,65500=>500,65504=>1000,65505=>1000,65506=>1000,65507=>1000,65508=>1000,
-	65509=>1000,65510=>1000,65512=>500,65513=>500,65514=>500,65515=>500,65516=>500,65517=>500,65518=>500,65532=>1000,65533=>1000,19968=>1000,19969=>1000,19970=>1000,19971=>1000,19972=>1000,
-	19973=>1000,19974=>1000,19975=>1000,19976=>1000,19977=>1000,19978=>1000,19979=>1000,19980=>1000,19981=>1000,19982=>1000,19983=>1000,19984=>1000,19985=>1000,19986=>1000,19987=>1000,19988=>1000,
-	19989=>1000,19990=>1000,19991=>1000,19992=>1000,19993=>1000,19994=>1000,19995=>1000,19996=>1000,19997=>1000,19998=>1000,19999=>1000,20000=>1000,20001=>1000,20002=>1000,20003=>1000,20004=>1000,
-	20005=>1000,20006=>1000,20007=>1000,20008=>1000,20009=>1000,20010=>1000,20011=>1000,20012=>1000,20013=>1000,20014=>1000,20015=>1000,20016=>1000,20017=>1000,20018=>1000,20019=>1000,20020=>1000,
-	20021=>1000,20022=>1000,20023=>1000,20024=>1000,20025=>1000,20026=>1000,20027=>1000,20028=>1000,20029=>1000,20030=>1000,20031=>1000,20032=>1000,20033=>1000,20034=>1000,20035=>1000,20036=>1000,
-	20037=>1000,20038=>1000,20039=>1000,20040=>1000,20041=>1000,20042=>1000,20043=>1000,20044=>1000,20045=>1000,20046=>1000,20047=>1000,20048=>1000,20049=>1000,20050=>1000,20051=>1000,20052=>1000,
-	20053=>1000,20054=>1000,20055=>1000,20056=>1000,20057=>1000,20058=>1000,20059=>1000,20060=>1000,20061=>1000,20062=>1000,20063=>1000,20064=>1000,20065=>1000,20066=>1000,20067=>1000,20068=>1000,
-	20069=>1000,20070=>1000,20071=>1000,20072=>1000,20073=>1000,20074=>1000,20075=>1000,20076=>1000,20077=>1000,20078=>1000,20079=>1000,20080=>1000,20081=>1000,20082=>1000,20083=>1000,20084=>1000,
-	20085=>1000,20086=>1000,20087=>1000,20088=>1000,20089=>1000,20090=>1000,20091=>1000,20092=>1000,20093=>1000,20094=>1000,20095=>1000,20096=>1000,20097=>1000,20098=>1000,20099=>1000,20100=>1000,
-	20101=>1000,20102=>1000,20103=>1000,20104=>1000,20105=>1000,20106=>1000,20107=>1000,20108=>1000,20109=>1000,20110=>1000,20111=>1000,20112=>1000,20113=>1000,20114=>1000,20115=>1000,20116=>1000,
-	20117=>1000,20118=>1000,20119=>1000,20120=>1000,20121=>1000,20122=>1000,20123=>1000,20124=>1000,20125=>1000,20126=>1000,20127=>1000,20128=>1000,20129=>1000,20130=>1000,20131=>1000,20132=>1000,
-	20133=>1000,20134=>1000,20135=>1000,20136=>1000,20137=>1000,20138=>1000,20139=>1000,20140=>1000,20141=>1000,20142=>1000,20143=>1000,20144=>1000,20145=>1000,20146=>1000,20147=>1000,20148=>1000,
-	20149=>1000,20150=>1000,20151=>1000,20152=>1000,20153=>1000,20154=>1000,20155=>1000,20156=>1000,20157=>1000,20158=>1000,20159=>1000,20160=>1000,20161=>1000,20162=>1000,20163=>1000,20164=>1000,
-	20165=>1000,20166=>1000,20167=>1000,20168=>1000,20169=>1000,20170=>1000,20171=>1000,20172=>1000,20173=>1000,20174=>1000,20175=>1000,20176=>1000,20177=>1000,20178=>1000,20179=>1000,20180=>1000,
-	20181=>1000,20182=>1000,20183=>1000,20184=>1000,20185=>1000,20186=>1000,20187=>1000,20188=>1000,20189=>1000,20190=>1000,20191=>1000,20192=>1000,20193=>1000,20194=>1000,20195=>1000,20196=>1000,
-	20197=>1000,20198=>1000,20199=>1000,20200=>1000,20201=>1000,20202=>1000,20203=>1000,20204=>1000,20205=>1000,20206=>1000,20207=>1000,20208=>1000,20209=>1000,20210=>1000,20211=>1000,20212=>1000,
-	20213=>1000,20214=>1000,20215=>1000,20216=>1000,20217=>1000,20218=>1000,20219=>1000,20220=>1000,20221=>1000,20222=>1000,20223=>1000,20224=>1000,20225=>1000,20226=>1000,20227=>1000,20228=>1000,
-	20229=>1000,20230=>1000,20231=>1000,20232=>1000,20233=>1000,20234=>1000,20235=>1000,20236=>1000,20237=>1000,20238=>1000,20239=>1000,20240=>1000,20241=>1000,20242=>1000,20243=>1000,20244=>1000,
-	20245=>1000,20246=>1000,20247=>1000,20248=>1000,20249=>1000,20250=>1000,20251=>1000,20252=>1000,20253=>1000,20254=>1000,20255=>1000,20256=>1000,20257=>1000,20258=>1000,20259=>1000,20260=>1000,
-	20261=>1000,20262=>1000,20263=>1000,20264=>1000,20265=>1000,20266=>1000,20267=>1000,20268=>1000,20269=>1000,20270=>1000,20271=>1000,20272=>1000,20273=>1000,20274=>1000,20275=>1000,20276=>1000,
-	20277=>1000,20278=>1000,20279=>1000,20280=>1000,20281=>1000,20282=>1000,20283=>1000,20284=>1000,20285=>1000,20286=>1000,20287=>1000,20288=>1000,20289=>1000,20290=>1000,20291=>1000,20292=>1000,
-	20293=>1000,20294=>1000,20295=>1000,20296=>1000,20297=>1000,20298=>1000,20299=>1000,20300=>1000,20301=>1000,20302=>1000,20303=>1000,20304=>1000,20305=>1000,20306=>1000,20307=>1000,20308=>1000,
-	20309=>1000,20310=>1000,20311=>1000,20312=>1000,20313=>1000,20314=>1000,20315=>1000,20316=>1000,20317=>1000,20318=>1000,20319=>1000,20320=>1000,20321=>1000,20322=>1000,20323=>1000,20324=>1000,
-	20325=>1000,20326=>1000,20327=>1000,20328=>1000,20329=>1000,20330=>1000,20331=>1000,20332=>1000,20333=>1000,20334=>1000,20335=>1000,20336=>1000,20337=>1000,20338=>1000,20339=>1000,20340=>1000,
-	20341=>1000,20342=>1000,20343=>1000,20344=>1000,20345=>1000,20346=>1000,20347=>1000,20348=>1000,20349=>1000,20350=>1000,20351=>1000,20352=>1000,20353=>1000,20354=>1000,20355=>1000,20356=>1000,
-	20357=>1000,20358=>1000,20359=>1000,20360=>1000,20361=>1000,20362=>1000,20363=>1000,20364=>1000,20365=>1000,20366=>1000,20367=>1000,20368=>1000,20369=>1000,20370=>1000,20371=>1000,20372=>1000,
-	20373=>1000,20374=>1000,20375=>1000,20376=>1000,20377=>1000,20378=>1000,20379=>1000,20380=>1000,20381=>1000,20382=>1000,20383=>1000,20384=>1000,20385=>1000,20386=>1000,20387=>1000,20388=>1000,
-	20389=>1000,20390=>1000,20391=>1000,20392=>1000,20393=>1000,20394=>1000,20395=>1000,20396=>1000,20397=>1000,20398=>1000,20399=>1000,20400=>1000,20401=>1000,20402=>1000,20403=>1000,20404=>1000,
-	20405=>1000,20406=>1000,20407=>1000,20408=>1000,20409=>1000,20410=>1000,20411=>1000,20412=>1000,20413=>1000,20414=>1000,20415=>1000,20416=>1000,20417=>1000,20418=>1000,20419=>1000,20420=>1000,
-	20421=>1000,20422=>1000,20423=>1000,20424=>1000,20425=>1000,20426=>1000,20427=>1000,20428=>1000,20429=>1000,20430=>1000,20431=>1000,20432=>1000,20433=>1000,20434=>1000,20435=>1000,20436=>1000,
-	20437=>1000,20438=>1000,20439=>1000,20440=>1000,20441=>1000,20442=>1000,20443=>1000,20444=>1000,20445=>1000,20446=>1000,20447=>1000,20448=>1000,20449=>1000,20450=>1000,20451=>1000,20452=>1000,
-	20453=>1000,20454=>1000,20455=>1000,20456=>1000,20457=>1000,20458=>1000,20459=>1000,20460=>1000,20461=>1000,20462=>1000,20463=>1000,20464=>1000,20465=>1000,20466=>1000,20467=>1000,20468=>1000,
-	20469=>1000,20470=>1000,20471=>1000,20472=>1000,20473=>1000,20474=>1000,20475=>1000,20476=>1000,20477=>1000,20478=>1000,20479=>1000,20480=>1000,20481=>1000,20482=>1000,20483=>1000,20484=>1000,
-	20485=>1000,20486=>1000,20487=>1000,20488=>1000,20489=>1000,20490=>1000,20491=>1000,20492=>1000,20493=>1000,20494=>1000,20495=>1000,20496=>1000,20497=>1000,20498=>1000,20499=>1000,20500=>1000,
-	20501=>1000,20502=>1000,20503=>1000,20504=>1000,20505=>1000,20506=>1000,20507=>1000,20508=>1000,20509=>1000,20510=>1000,20511=>1000,20512=>1000,20513=>1000,20514=>1000,20515=>1000,20516=>1000,
-	20517=>1000,20518=>1000,20519=>1000,20520=>1000,20521=>1000,20522=>1000,20523=>1000,20524=>1000,20525=>1000,20526=>1000,20527=>1000,20528=>1000,20529=>1000,20530=>1000,20531=>1000,20532=>1000,
-	20533=>1000,20534=>1000,20535=>1000,20536=>1000,20537=>1000,20538=>1000,20539=>1000,20540=>1000,20541=>1000,20542=>1000,20543=>1000,20544=>1000,20545=>1000,20546=>1000,20547=>1000,20548=>1000,
-	20549=>1000,20550=>1000,20551=>1000,20552=>1000,20553=>1000,20554=>1000,20555=>1000,20556=>1000,20557=>1000,20558=>1000,20559=>1000,20560=>1000,20561=>1000,20562=>1000,20563=>1000,20564=>1000,
-	20565=>1000,20566=>1000,20567=>1000,20568=>1000,20569=>1000,20570=>1000,20571=>1000,20572=>1000,20573=>1000,20574=>1000,20575=>1000,20576=>1000,20577=>1000,20578=>1000,20579=>1000,20580=>1000,
-	20581=>1000,20582=>1000,20583=>1000,20584=>1000,20585=>1000,20586=>1000,20587=>1000,20588=>1000,20589=>1000,20590=>1000,20591=>1000,20592=>1000,20593=>1000,20594=>1000,20595=>1000,20596=>1000,
-	20597=>1000,20598=>1000,20599=>1000,20600=>1000,20601=>1000,20602=>1000,20603=>1000,20604=>1000,20605=>1000,20606=>1000,20607=>1000,20608=>1000,20609=>1000,20610=>1000,20611=>1000,20612=>1000,
-	20613=>1000,20614=>1000,20615=>1000,20616=>1000,20617=>1000,20618=>1000,20619=>1000,20620=>1000,20621=>1000,20622=>1000,20623=>1000,20624=>1000,20625=>1000,20626=>1000,20627=>1000,20628=>1000,
-	20629=>1000,20630=>1000,20631=>1000,20632=>1000,20633=>1000,20634=>1000,20635=>1000,20636=>1000,20637=>1000,20638=>1000,20639=>1000,20640=>1000,20641=>1000,20642=>1000,20643=>1000,20644=>1000,
-	20645=>1000,20646=>1000,20647=>1000,20648=>1000,20649=>1000,20650=>1000,20651=>1000,20652=>1000,20653=>1000,20654=>1000,20655=>1000,20656=>1000,20657=>1000,20658=>1000,20659=>1000,20660=>1000,
-	20661=>1000,20662=>1000,20663=>1000,20664=>1000,20665=>1000,20666=>1000,20667=>1000,20668=>1000,20669=>1000,20670=>1000,20671=>1000,20672=>1000,20673=>1000,20674=>1000,20675=>1000,20676=>1000,
-	20677=>1000,20678=>1000,20679=>1000,20680=>1000,20681=>1000,20682=>1000,20683=>1000,20684=>1000,20685=>1000,20686=>1000,20687=>1000,20688=>1000,20689=>1000,20690=>1000,20691=>1000,20692=>1000,
-	20693=>1000,20694=>1000,20695=>1000,20696=>1000,20697=>1000,20698=>1000,20699=>1000,20700=>1000,20701=>1000,20702=>1000,20703=>1000,20704=>1000,20705=>1000,20706=>1000,20707=>1000,20708=>1000,
-	20709=>1000,20710=>1000,20711=>1000,20712=>1000,20713=>1000,20714=>1000,20715=>1000,20716=>1000,20717=>1000,20718=>1000,20719=>1000,20720=>1000,20721=>1000,20722=>1000,20723=>1000,20724=>1000,
-	20725=>1000,20726=>1000,20727=>1000,20728=>1000,20729=>1000,20730=>1000,20731=>1000,20732=>1000,20733=>1000,20734=>1000,20735=>1000,20736=>1000,20737=>1000,20738=>1000,20739=>1000,20740=>1000,
-	20741=>1000,20742=>1000,20743=>1000,20744=>1000,20745=>1000,20746=>1000,20747=>1000,20748=>1000,20749=>1000,20750=>1000,20751=>1000,20752=>1000,20753=>1000,20754=>1000,20755=>1000,20756=>1000,
-	20757=>1000,20758=>1000,20759=>1000,20760=>1000,20761=>1000,20762=>1000,20763=>1000,20764=>1000,20765=>1000,20766=>1000,20767=>1000,20768=>1000,20769=>1000,20770=>1000,20771=>1000,20772=>1000,
-	20773=>1000,20774=>1000,20775=>1000,20776=>1000,20777=>1000,20778=>1000,20779=>1000,20780=>1000,20781=>1000,20782=>1000,20783=>1000,20784=>1000,20785=>1000,20786=>1000,20787=>1000,20788=>1000,
-	20789=>1000,20790=>1000,20791=>1000,20792=>1000,20793=>1000,20794=>1000,20795=>1000,20796=>1000,20797=>1000,20798=>1000,20799=>1000,20800=>1000,20801=>1000,20802=>1000,20803=>1000,20804=>1000,
-	20805=>1000,20806=>1000,20807=>1000,20808=>1000,20809=>1000,20810=>1000,20811=>1000,20812=>1000,20813=>1000,20814=>1000,20815=>1000,20816=>1000,20817=>1000,20818=>1000,20819=>1000,20820=>1000,
-	20821=>1000,20822=>1000,20823=>1000,20824=>1000,20825=>1000,20826=>1000,20827=>1000,20828=>1000,20829=>1000,20830=>1000,20831=>1000,20832=>1000,20833=>1000,20834=>1000,20835=>1000,20836=>1000,
-	20837=>1000,20838=>1000,20839=>1000,20840=>1000,20841=>1000,20842=>1000,20843=>1000,20844=>1000,20845=>1000,20846=>1000,20847=>1000,20848=>1000,20849=>1000,20850=>1000,20851=>1000,20852=>1000,
-	20853=>1000,20854=>1000,20855=>1000,20856=>1000,20857=>1000,20858=>1000,20859=>1000,20860=>1000,20861=>1000,20862=>1000,20863=>1000,20864=>1000,20865=>1000,20866=>1000,20867=>1000,20868=>1000,
-	20869=>1000,20870=>1000,20871=>1000,20872=>1000,20873=>1000,20874=>1000,20875=>1000,20876=>1000,20877=>1000,20878=>1000,20879=>1000,20880=>1000,20881=>1000,20882=>1000,20883=>1000,20884=>1000,
-	20885=>1000,20886=>1000,20887=>1000,20888=>1000,20889=>1000,20890=>1000,20891=>1000,20892=>1000,20893=>1000,20894=>1000,20895=>1000,20896=>1000,20897=>1000,20898=>1000,20899=>1000,20900=>1000,
-	20901=>1000,20902=>1000,20903=>1000,20904=>1000,20905=>1000,20906=>1000,20907=>1000,20908=>1000,20909=>1000,20910=>1000,20911=>1000,20912=>1000,20913=>1000,20914=>1000,20915=>1000,20916=>1000,
-	20917=>1000,20918=>1000,20919=>1000,20920=>1000,20921=>1000,20922=>1000,20923=>1000,20924=>1000,20925=>1000,20926=>1000,20927=>1000,20928=>1000,20929=>1000,20930=>1000,20931=>1000,20932=>1000,
-	20933=>1000,20934=>1000,20935=>1000,20936=>1000,20937=>1000,20938=>1000,20939=>1000,20940=>1000,20941=>1000,20942=>1000,20943=>1000,20944=>1000,20945=>1000,20946=>1000,20947=>1000,20948=>1000,
-	20949=>1000,20950=>1000,20951=>1000,20952=>1000,20953=>1000,20954=>1000,20955=>1000,20956=>1000,20957=>1000,20958=>1000,20959=>1000,20960=>1000,20961=>1000,20962=>1000,20963=>1000,20964=>1000,
-	20965=>1000,20966=>1000,20967=>1000,20968=>1000,20969=>1000,20970=>1000,20971=>1000,20972=>1000,20973=>1000,20974=>1000,20975=>1000,20976=>1000,20977=>1000,20978=>1000,20979=>1000,20980=>1000,
-	20981=>1000,20982=>1000,20983=>1000,20984=>1000,20985=>1000,20986=>1000,20987=>1000,20988=>1000,20989=>1000,20990=>1000,20991=>1000,20992=>1000,20993=>1000,20994=>1000,20995=>1000,20996=>1000,
-	20997=>1000,20998=>1000,20999=>1000,21000=>1000,21001=>1000,21002=>1000,21003=>1000,21004=>1000,21005=>1000,21006=>1000,21007=>1000,21008=>1000,21009=>1000,21010=>1000,21011=>1000,21012=>1000,
-	21013=>1000,21014=>1000,21015=>1000,21016=>1000,21017=>1000,21018=>1000,21019=>1000,21020=>1000,21021=>1000,21022=>1000,21023=>1000,21024=>1000,21025=>1000,21026=>1000,21027=>1000,21028=>1000,
-	21029=>1000,21030=>1000,21031=>1000,21032=>1000,21033=>1000,21034=>1000,21035=>1000,21036=>1000,21037=>1000,21038=>1000,21039=>1000,21040=>1000,21041=>1000,21042=>1000,21043=>1000,21044=>1000,
-	21045=>1000,21046=>1000,21047=>1000,21048=>1000,21049=>1000,21050=>1000,21051=>1000,21052=>1000,21053=>1000,21054=>1000,21055=>1000,21056=>1000,21057=>1000,21058=>1000,21059=>1000,21060=>1000,
-	21061=>1000,21062=>1000,21063=>1000,21064=>1000,21065=>1000,21066=>1000,21067=>1000,21068=>1000,21069=>1000,21070=>1000,21071=>1000,21072=>1000,21073=>1000,21074=>1000,21075=>1000,21076=>1000,
-	21077=>1000,21078=>1000,21079=>1000,21080=>1000,21081=>1000,21082=>1000,21083=>1000,21084=>1000,21085=>1000,21086=>1000,21087=>1000,21088=>1000,21089=>1000,21090=>1000,21091=>1000,21092=>1000,
-	21093=>1000,21094=>1000,21095=>1000,21096=>1000,21097=>1000,21098=>1000,21099=>1000,21100=>1000,21101=>1000,21102=>1000,21103=>1000,21104=>1000,21105=>1000,21106=>1000,21107=>1000,21108=>1000,
-	21109=>1000,21110=>1000,21111=>1000,21112=>1000,21113=>1000,21114=>1000,21115=>1000,21116=>1000,21117=>1000,21118=>1000,21119=>1000,21120=>1000,21121=>1000,21122=>1000,21123=>1000,21124=>1000,
-	21125=>1000,21126=>1000,21127=>1000,21128=>1000,21129=>1000,21130=>1000,21131=>1000,21132=>1000,21133=>1000,21134=>1000,21135=>1000,21136=>1000,21137=>1000,21138=>1000,21139=>1000,21140=>1000,
-	21141=>1000,21142=>1000,21143=>1000,21144=>1000,21145=>1000,21146=>1000,21147=>1000,21148=>1000,21149=>1000,21150=>1000,21151=>1000,21152=>1000,21153=>1000,21154=>1000,21155=>1000,21156=>1000,
-	21157=>1000,21158=>1000,21159=>1000,21160=>1000,21161=>1000,21162=>1000,21163=>1000,21164=>1000,21165=>1000,21166=>1000,21167=>1000,21168=>1000,21169=>1000,21170=>1000,21171=>1000,21172=>1000,
-	21173=>1000,21174=>1000,21175=>1000,21176=>1000,21177=>1000,21178=>1000,21179=>1000,21180=>1000,21181=>1000,21182=>1000,21183=>1000,21184=>1000,21185=>1000,21186=>1000,21187=>1000,21188=>1000,
-	21189=>1000,21190=>1000,21191=>1000,21192=>1000,21193=>1000,21194=>1000,21195=>1000,21196=>1000,21197=>1000,21198=>1000,21199=>1000,21200=>1000,21201=>1000,21202=>1000,21203=>1000,21204=>1000,
-	21205=>1000,21206=>1000,21207=>1000,21208=>1000,21209=>1000,21210=>1000,21211=>1000,21212=>1000,21213=>1000,21214=>1000,21215=>1000,21216=>1000,21217=>1000,21218=>1000,21219=>1000,21220=>1000,
-	21221=>1000,21222=>1000,21223=>1000,21224=>1000,21225=>1000,21226=>1000,21227=>1000,21228=>1000,21229=>1000,21230=>1000,21231=>1000,21232=>1000,21233=>1000,21234=>1000,21235=>1000,21236=>1000,
-	21237=>1000,21238=>1000,21239=>1000,21240=>1000,21241=>1000,21242=>1000,21243=>1000,21244=>1000,21245=>1000,21246=>1000,21247=>1000,21248=>1000,21249=>1000,21250=>1000,21251=>1000,21252=>1000,
-	21253=>1000,21254=>1000,21255=>1000,21256=>1000,21257=>1000,21258=>1000,21259=>1000,21260=>1000,21261=>1000,21262=>1000,21263=>1000,21264=>1000,21265=>1000,21266=>1000,21267=>1000,21268=>1000,
-	21269=>1000,21270=>1000,21271=>1000,21272=>1000,21273=>1000,21274=>1000,21275=>1000,21276=>1000,21277=>1000,21278=>1000,21279=>1000,21280=>1000,21281=>1000,21282=>1000,21283=>1000,21284=>1000,
-	21285=>1000,21286=>1000,21287=>1000,21288=>1000,21289=>1000,21290=>1000,21291=>1000,21292=>1000,21293=>994,21294=>1000,21295=>1000,21296=>1000,21297=>1000,21298=>1000,21299=>1000,21300=>1000,
-	21301=>1000,21302=>1000,21303=>1000,21304=>1000,21305=>1000,21306=>1000,21307=>1000,21308=>1000,21309=>1000,21310=>1000,21311=>1000,21312=>1000,21313=>1000,21314=>1000,21315=>1000,21316=>1000,
-	21317=>1000,21318=>1000,21319=>1000,21320=>1000,21321=>1000,21322=>1000,21323=>1000,21324=>1000,21325=>1000,21326=>1000,21327=>1000,21328=>1000,21329=>1000,21330=>1000,21331=>1000,21332=>1000,
-	21333=>1000,21334=>1000,21335=>1000,21336=>1000,21337=>1000,21338=>1000,21339=>1000,21340=>1000,21341=>1000,21342=>1000,21343=>1000,21344=>1000,21345=>1000,21346=>1000,21347=>1000,21348=>1000,
-	21349=>1000,21350=>1000,21351=>1000,21352=>1000,21353=>1000,21354=>1000,21355=>1000,21356=>1000,21357=>1000,21358=>1000,21359=>1000,21360=>1000,21361=>1000,21362=>1000,21363=>1000,21364=>1000,
-	21365=>1000,21366=>1000,21367=>1000,21368=>1000,21369=>1000,21370=>1000,21371=>1000,21372=>1000,21373=>1000,21374=>1000,21375=>1000,21376=>1000,21377=>1000,21378=>1000,21379=>1000,21380=>1000,
-	21381=>1000,21382=>1000,21383=>1000,21384=>1000,21385=>1000,21386=>1000,21387=>1000,21388=>1000,21389=>1000,21390=>1000,21391=>1000,21392=>1000,21393=>1000,21394=>1000,21395=>1000,21396=>1000,
-	21397=>1000,21398=>1000,21399=>1000,21400=>1000,21401=>1000,21402=>1000,21403=>1000,21404=>1000,21405=>1000,21406=>1000,21407=>1000,21408=>1000,21409=>1000,21410=>1000,21411=>1000,21412=>1000,
-	21413=>1000,21414=>1000,21415=>1000,21416=>1000,21417=>1000,21418=>1000,21419=>1000,21420=>1000,21421=>1000,21422=>1000,21423=>1000,21424=>1000,21425=>1000,21426=>1000,21427=>1000,21428=>1000,
-	21429=>1000,21430=>1000,21431=>1000,21432=>1000,21433=>1000,21434=>1000,21435=>1000,21436=>1000,21437=>1000,21438=>1000,21439=>1000,21440=>1000,21441=>1000,21442=>1000,21443=>1000,21444=>1000,
-	21445=>1000,21446=>1000,21447=>1000,21448=>1000,21449=>1000,21450=>1000,21451=>1000,21452=>1000,21453=>1000,21454=>1000,21455=>1000,21456=>1000,21457=>1000,21458=>1000,21459=>1000,21460=>1000,
-	21461=>1000,21462=>1000,21463=>1000,21464=>1000,21465=>1000,21466=>1000,21467=>1000,21468=>1000,21469=>1000,21470=>1000,21471=>1000,21472=>1000,21473=>1000,21474=>1000,21475=>1000,21476=>1000,
-	21477=>1000,21478=>1000,21479=>1000,21480=>1000,21481=>1000,21482=>1000,21483=>1000,21484=>1000,21485=>1000,21486=>1000,21487=>1000,21488=>1000,21489=>1000,21490=>1000,21491=>1000,21492=>1000,
-	21493=>1000,21494=>1000,21495=>1000,21496=>1000,21497=>1000,21498=>1000,21499=>1000,21500=>1000,21501=>1000,21502=>1000,21503=>1000,21504=>1000,21505=>1000,21506=>1000,21507=>1000,21508=>1000,
-	21509=>1000,21510=>1000,21511=>1000,21512=>1000,21513=>1000,21514=>1000,21515=>1000,21516=>1000,21517=>1000,21518=>1000,21519=>1000,21520=>1000,21521=>1000,21522=>1000,21523=>1000,21524=>1000,
-	21525=>1000,21526=>1000,21527=>1000,21528=>1000,21529=>1000,21530=>1000,21531=>1000,21532=>1000,21533=>1000,21534=>1000,21535=>1000,21536=>1000,21537=>1000,21538=>1000,21539=>1000,21540=>1000,
-	21541=>1000,21542=>1000,21543=>1000,21544=>1000,21545=>1000,21546=>1000,21547=>1000,21548=>1000,21549=>1000,21550=>1000,21551=>1000,21552=>1000,21553=>1000,21554=>1000,21555=>1000,21556=>1000,
-	21557=>1000,21558=>1000,21559=>1000,21560=>1000,21561=>1000,21562=>1000,21563=>1000,21564=>1000,21565=>1000,21566=>1000,21567=>1000,21568=>1000,21569=>1000,21570=>1000,21571=>1000,21572=>1000,
-	21573=>1000,21574=>1000,21575=>1000,21576=>1000,21577=>1000,21578=>1000,21579=>1000,21580=>1000,21581=>1000,21582=>1000,21583=>1000,21584=>1000,21585=>1000,21586=>1000,21587=>1000,21588=>1000,
-	21589=>1000,21590=>1000,21591=>1000,21592=>1000,21593=>1000,21594=>1000,21595=>1000,21596=>1000,21597=>1000,21598=>1000,21599=>1000,21600=>1000,21601=>1000,21602=>1000,21603=>1000,21604=>1000,
-	21605=>1000,21606=>1000,21607=>1000,21608=>1000,21609=>1000,21610=>1000,21611=>1000,21612=>1000,21613=>1000,21614=>1000,21615=>1000,21616=>1000,21617=>1000,21618=>1000,21619=>1000,21620=>1000,
-	21621=>1000,21622=>1000,21623=>1000,21624=>1000,21625=>1000,21626=>1000,21627=>1000,21628=>1000,21629=>1000,21630=>1000,21631=>1000,21632=>1000,21633=>1000,21634=>1000,21635=>1000,21636=>1000,
-	21637=>1000,21638=>1000,21639=>1000,21640=>1000,21641=>1000,21642=>1000,21643=>1000,21644=>1000,21645=>1000,21646=>1000,21647=>1000,21648=>1000,21649=>1000,21650=>1000,21651=>1000,21652=>1000,
-	21653=>1000,21654=>1000,21655=>1000,21656=>1000,21657=>1000,21658=>1000,21659=>1000,21660=>1000,21661=>1000,21662=>1000,21663=>1000,21664=>1000,21665=>1000,21666=>1000,21667=>1000,21668=>1000,
-	21669=>1000,21670=>1000,21671=>1000,21672=>1000,21673=>1000,21674=>1000,21675=>1000,21676=>1000,21677=>1000,21678=>1000,21679=>1000,21680=>1000,21681=>1000,21682=>1000,21683=>1000,21684=>1000,
-	21685=>1000,21686=>1000,21687=>1000,21688=>1000,21689=>1000,21690=>1000,21691=>1000,21692=>1000,21693=>1000,21694=>1000,21695=>1000,21696=>1000,21697=>1000,21698=>1000,21699=>1000,21700=>1000,
-	21701=>1000,21702=>1000,21703=>1000,21704=>1000,21705=>1000,21706=>1000,21707=>1000,21708=>1000,21709=>1000,21710=>1000,21711=>1000,21712=>1000,21713=>1000,21714=>1000,21715=>1000,21716=>1000,
-	21717=>1000,21718=>1000,21719=>1000,21720=>1000,21721=>1000,21722=>1000,21723=>1000,21724=>1000,21725=>1000,21726=>1000,21727=>1000,21728=>1000,21729=>1000,21730=>1000,21731=>1000,21732=>1000,
-	21733=>1000,21734=>1000,21735=>1000,21736=>1000,21737=>1000,21738=>1000,21739=>1000,21740=>1000,21741=>1000,21742=>1000,21743=>1000,21744=>1000,21745=>1000,21746=>1000,21747=>1000,21748=>1000,
-	21749=>1000,21750=>1000,21751=>1000,21752=>1000,21753=>1000,21754=>1000,21755=>1000,21756=>1000,21757=>1000,21758=>1000,21759=>1000,21760=>1000,21761=>1000,21762=>1000,21763=>1000,21764=>1000,
-	21765=>1000,21766=>1000,21767=>1000,21768=>1000,21769=>1000,21770=>1000,21771=>1000,21772=>1000,21773=>1000,21774=>1000,21775=>1000,21776=>1000,21777=>1000,21778=>1000,21779=>1000,21780=>1000,
-	21781=>1000,21782=>1000,21783=>1000,21784=>1000,21785=>1000,21786=>1000,21787=>1000,21788=>1000,21789=>1000,21790=>1000,21791=>1000,21792=>1000,21793=>1000,21794=>1000,21795=>1000,21796=>1000,
-	21797=>1000,21798=>1000,21799=>1000,21800=>1000,21801=>1000,21802=>1000,21803=>1000,21804=>1000,21805=>1000,21806=>1000,21807=>1000,21808=>1000,21809=>1000,21810=>1000,21811=>1000,21812=>1000,
-	21813=>1000,21814=>1000,21815=>1000,21816=>1000,21817=>1000,21818=>1000,21819=>1000,21820=>1000,21821=>1000,21822=>1000,21823=>1000,21824=>1000,21825=>1000,21826=>1000,21827=>1000,21828=>1000,
-	21829=>1000,21830=>1000,21831=>1000,21832=>1000,21833=>1000,21834=>1000,21835=>1000,21836=>1000,21837=>1000,21838=>1000,21839=>1000,21840=>1000,21841=>1000,21842=>1000,21843=>1000,21844=>1000,
-	21845=>1000,21846=>1000,21847=>1000,21848=>1000,21849=>1000,21850=>1000,21851=>1000,21852=>1000,21853=>1000,21854=>1000,21855=>1000,21856=>1000,21857=>1000,21858=>1000,21859=>1000,21860=>1000,
-	21861=>1000,21862=>1000,21863=>1000,21864=>1000,21865=>1000,21866=>1000,21867=>1000,21868=>1000,21869=>1000,21870=>1000,21871=>1000,21872=>1000,21873=>1000,21874=>1000,21875=>1000,21876=>1000,
-	21877=>1000,21878=>1000,21879=>1000,21880=>1000,21881=>1000,21882=>1000,21883=>1000,21884=>1000,21885=>1000,21886=>1000,21887=>1000,21888=>1000,21889=>1000,21890=>1000,21891=>1000,21892=>1000,
-	21893=>1000,21894=>1000,21895=>1000,21896=>1000,21897=>1000,21898=>1000,21899=>1000,21900=>1000,21901=>1000,21902=>1000,21903=>1000,21904=>1000,21905=>1000,21906=>1000,21907=>1000,21908=>1000,
-	21909=>1000,21910=>1000,21911=>1000,21912=>1000,21913=>1000,21914=>1000,21915=>1000,21916=>1000,21917=>1000,21918=>1000,21919=>1000,21920=>1000,21921=>1000,21922=>1000,21923=>1000,21924=>1000,
-	21925=>1000,21926=>1000,21927=>1000,21928=>1000,21929=>1000,21930=>1000,21931=>1000,21932=>1000,21933=>1000,21934=>1000,21935=>1000,21936=>1000,21937=>1000,21938=>1000,21939=>1000,21940=>1000,
-	21941=>1000,21942=>1000,21943=>1000,21944=>1000,21945=>1000,21946=>1000,21947=>1000,21948=>1000,21949=>1000,21950=>1000,21951=>1000,21952=>1000,21953=>1000,21954=>1000,21955=>1000,21956=>1000,
-	21957=>1000,21958=>1000,21959=>1000,21960=>1000,21961=>1000,21962=>1000,21963=>1000,21964=>1000,21965=>1000,21966=>1000,21967=>1000,21968=>1000,21969=>1000,21970=>1000,21971=>1000,21972=>1000,
-	21973=>1000,21974=>1000,21975=>1000,21976=>1000,21977=>1000,21978=>1000,21979=>1000,21980=>1000,21981=>1000,21982=>1000,21983=>1000,21984=>1000,21985=>1000,21986=>1000,21987=>1000,21988=>1000,
-	21989=>1000,21990=>1000,21991=>1000,21992=>1000,21993=>1000,21994=>1000,21995=>1000,21996=>1000,21997=>1000,21998=>1000,21999=>1000,22000=>1000,22001=>1000,22002=>1000,22003=>1000,22004=>1000,
-	22005=>1000,22006=>1000,22007=>1000,22008=>1000,22009=>1000,22010=>1000,22011=>1000,22012=>1000,22013=>1000,22014=>1000,22015=>1000,22016=>1000,22017=>1000,22018=>1000,22019=>1000,22020=>1000,
-	22021=>1000,22022=>1000,22023=>1000,22024=>1000,22025=>1000,22026=>1000,22027=>1000,22028=>1000,22029=>1000,22030=>1000,22031=>1000,22032=>1000,22033=>1000,22034=>1000,22035=>1000,22036=>1000,
-	22037=>1000,22038=>1000,22039=>1000,22040=>1000,22041=>1000,22042=>1000,22043=>1000,22044=>1000,22045=>1000,22046=>1000,22047=>1000,22048=>1000,22049=>1000,22050=>1000,22051=>1000,22052=>1000,
-	22053=>1000,22054=>1000,22055=>1000,22056=>1000,22057=>1000,22058=>1000,22059=>1000,22060=>1000,22061=>1000,22062=>1000,22063=>1000,22064=>1000,22065=>1000,22066=>1000,22067=>1000,22068=>1000,
-	22069=>1000,22070=>1000,22071=>1000,22072=>1000,22073=>1000,22074=>1000,22075=>1000,22076=>1000,22077=>1000,22078=>1000,22079=>1000,22080=>1000,22081=>1000,22082=>1000,22083=>1000,22084=>1000,
-	22085=>1000,22086=>1000,22087=>1000,22088=>1000,22089=>1000,22090=>1000,22091=>1000,22092=>1000,22093=>1000,22094=>1000,22095=>1000,22096=>1000,22097=>1000,22098=>1000,22099=>1000,22100=>1000,
-	22101=>1000,22102=>1000,22103=>1000,22104=>1000,22105=>1000,22106=>1000,22107=>1000,22108=>1000,22109=>1000,22110=>1000,22111=>1000,22112=>1000,22113=>1000,22114=>1000,22115=>1000,22116=>1000,
-	22117=>1000,22118=>1000,22119=>1000,22120=>1000,22121=>1000,22122=>1000,22123=>1000,22124=>1000,22125=>1000,22126=>1000,22127=>1000,22128=>1000,22129=>1000,22130=>1000,22131=>1000,22132=>1000,
-	22133=>1000,22134=>1000,22135=>1000,22136=>1000,22137=>1000,22138=>1000,22139=>1000,22140=>1000,22141=>1000,22142=>1000,22143=>1000,22144=>1000,22145=>1000,22146=>1000,22147=>1000,22148=>1000,
-	22149=>1000,22150=>1000,22151=>1000,22152=>1000,22153=>1000,22154=>1000,22155=>1000,22156=>1000,22157=>1000,22158=>1000,22159=>1000,22160=>1000,22161=>1000,22162=>1000,22163=>1000,22164=>1000,
-	22165=>1000,22166=>1000,22167=>1000,22168=>1000,22169=>1000,22170=>1000,22171=>1000,22172=>1000,22173=>1000,22174=>1000,22175=>1000,22176=>1000,22177=>1000,22178=>1000,22179=>1000,22180=>1000,
-	22181=>1000,22182=>1000,22183=>1000,22184=>1000,22185=>1000,22186=>1000,22187=>1000,22188=>1000,22189=>1000,22190=>1000,22191=>1000,22192=>1000,22193=>1000,22194=>1000,22195=>1000,22196=>1000,
-	22197=>1000,22198=>1000,22199=>1000,22200=>1000,22201=>1000,22202=>1000,22203=>1000,22204=>1000,22205=>1000,22206=>1000,22207=>1000,22208=>1000,22209=>1000,22210=>1000,22211=>1000,22212=>1000,
-	22213=>1000,22214=>1000,22215=>1000,22216=>1000,22217=>1000,22218=>1000,22219=>1000,22220=>1000,22221=>1000,22222=>1000,22223=>1000,22224=>1000,22225=>1000,22226=>1000,22227=>1000,22228=>1000,
-	22229=>1000,22230=>1000,22231=>1000,22232=>1000,22233=>1000,22234=>1000,22235=>1000,22236=>1000,22237=>1000,22238=>1000,22239=>1000,22240=>1000,22241=>1000,22242=>1000,22243=>1000,22244=>1000,
-	22245=>1000,22246=>1000,22247=>1000,22248=>1000,22249=>1000,22250=>1000,22251=>1000,22252=>1000,22253=>1000,22254=>1000,22255=>1000,22256=>1000,22257=>1000,22258=>1000,22259=>1000,22260=>1000,
-	22261=>1000,22262=>1000,22263=>1000,22264=>1000,22265=>1000,22266=>1000,22267=>1000,22268=>1000,22269=>1000,22270=>1000,22271=>1000,22272=>1000,22273=>1000,22274=>1000,22275=>1000,22276=>1000,
-	22277=>1000,22278=>1000,22279=>1000,22280=>1000,22281=>1000,22282=>1000,22283=>1000,22284=>1000,22285=>1000,22286=>1000,22287=>1000,22288=>1000,22289=>1000,22290=>1000,22291=>1000,22292=>1000,
-	22293=>1000,22294=>1000,22295=>1000,22296=>1000,22297=>1000,22298=>1000,22299=>1000,22300=>1000,22301=>1000,22302=>1000,22303=>1000,22304=>1000,22305=>1000,22306=>1000,22307=>1000,22308=>1000,
-	22309=>1000,22310=>1000,22311=>1000,22312=>1000,22313=>1000,22314=>1000,22315=>1000,22316=>1000,22317=>1000,22318=>1000,22319=>1000,22320=>1000,22321=>1000,22322=>1000,22323=>1000,22324=>1000,
-	22325=>1000,22326=>1000,22327=>1000,22328=>1000,22329=>1000,22330=>1000,22331=>1000,22332=>1000,22333=>1000,22334=>1000,22335=>1000,22336=>1000,22337=>1000,22338=>1000,22339=>1000,22340=>1000,
-	22341=>1000,22342=>1000,22343=>1000,22344=>1000,22345=>1000,22346=>1000,22347=>1000,22348=>1000,22349=>1000,22350=>1000,22351=>1000,22352=>1000,22353=>1000,22354=>1000,22355=>1000,22356=>1000,
-	22357=>1000,22358=>1000,22359=>1000,22360=>1000,22361=>1000,22362=>1000,22363=>1000,22364=>1000,22365=>1000,22366=>1000,22367=>1000,22368=>1000,22369=>1000,22370=>1000,22371=>1000,22372=>1000,
-	22373=>1000,22374=>1000,22375=>1000,22376=>1000,22377=>1000,22378=>1000,22379=>1000,22380=>1000,22381=>1000,22382=>1000,22383=>1000,22384=>1000,22385=>1000,22386=>1000,22387=>1000,22388=>1000,
-	22389=>1000,22390=>1000,22391=>1000,22392=>1000,22393=>1000,22394=>1000,22395=>1000,22396=>1000,22397=>1000,22398=>1000,22399=>1000,22400=>1000,22401=>1000,22402=>1000,22403=>1000,22404=>1000,
-	22405=>1000,22406=>1000,22407=>1000,22408=>1000,22409=>1000,22410=>1000,22411=>1000,22412=>1000,22413=>1000,22414=>1000,22415=>1000,22416=>1000,22417=>1000,22418=>1000,22419=>1000,22420=>1000,
-	22421=>1000,22422=>1000,22423=>1000,22424=>1000,22425=>1000,22426=>1000,22427=>1000,22428=>1000,22429=>1000,22430=>1000,22431=>1000,22432=>1000,22433=>1000,22434=>1000,22435=>1000,22436=>1000,
-	22437=>1000,22438=>1000,22439=>1000,22440=>1000,22441=>1000,22442=>1000,22443=>1000,22444=>1000,22445=>1000,22446=>1000,22447=>1000,22448=>1000,22449=>1000,22450=>1000,22451=>1000,22452=>1000,
-	22453=>1000,22454=>1000,22455=>1000,22456=>1000,22457=>1000,22458=>1000,22459=>1000,22460=>1000,22461=>1000,22462=>1000,22463=>1000,22464=>1000,22465=>1000,22466=>1000,22467=>1000,22468=>1000,
-	22469=>1000,22470=>1000,22471=>1000,22472=>1000,22473=>1000,22474=>1000,22475=>1000,22476=>1000,22477=>1000,22478=>1000,22479=>1000,22480=>1000,22481=>1000,22482=>1000,22483=>1000,22484=>1000,
-	22485=>1000,22486=>1000,22487=>1000,22488=>1000,22489=>1000,22490=>1000,22491=>1000,22492=>1000,22493=>1000,22494=>1000,22495=>1000,22496=>1000,22497=>1000,22498=>1000,22499=>1000,22500=>1000,
-	22501=>1000,22502=>1000,22503=>1000,22504=>1000,22505=>1000,22506=>1000,22507=>1000,22508=>1000,22509=>1000,22510=>1000,22511=>1000,22512=>1000,22513=>1000,22514=>1000,22515=>1000,22516=>1000,
-	22517=>1000,22518=>1000,22519=>1000,22520=>1000,22521=>1000,22522=>1000,22523=>1000,22524=>1000,22525=>1000,22526=>1000,22527=>1000,22528=>1000,22529=>1000,22530=>1000,22531=>1000,22532=>1000,
-	22533=>1000,22534=>1000,22535=>1000,22536=>1000,22537=>1000,22538=>1000,22539=>1000,22540=>1000,22541=>1000,22542=>1000,22543=>1000,22544=>1000,22545=>1000,22546=>1000,22547=>1000,22548=>1000,
-	22549=>1000,22550=>1000,22551=>1000,22552=>1000,22553=>1000,22554=>1000,22555=>1000,22556=>1000,22557=>1000,22558=>1000,22559=>1000,22560=>1000,22561=>1000,22562=>1000,22563=>1000,22564=>1000,
-	22565=>1000,22566=>1000,22567=>1000,22568=>1000,22569=>1000,22570=>1000,22571=>1000,22572=>1000,22573=>1000,22574=>1000,22575=>1000,22576=>1000,22577=>1000,22578=>1000,22579=>1000,22580=>1000,
-	22581=>1000,22582=>1000,22583=>1000,22584=>1000,22585=>1000,22586=>1000,22587=>1000,22588=>1000,22589=>1000,22590=>1000,22591=>1000,22592=>1000,22593=>1000,22594=>1000,22595=>1000,22596=>1000,
-	22597=>1000,22598=>1000,22599=>1000,22600=>1000,22601=>1000,22602=>1000,22603=>1000,22604=>1000,22605=>1000,22606=>1000,22607=>1000,22608=>1000,22609=>1000,22610=>1000,22611=>1000,22612=>1000,
-	22613=>1000,22614=>1000,22615=>1000,22616=>1000,22617=>1000,22618=>1000,22619=>1000,22620=>1000,22621=>1000,22622=>1000,22623=>1000,22624=>1000,22625=>1000,22626=>1000,22627=>1000,22628=>1000,
-	22629=>1000,22630=>1000,22631=>1000,22632=>1000,22633=>1000,22634=>1000,22635=>1000,22636=>1000,22637=>1000,22638=>1000,22639=>1000,22640=>1000,22641=>1000,22642=>1000,22643=>1000,22644=>1000,
-	22645=>1000,22646=>1000,22647=>1000,22648=>1000,22649=>1000,22650=>1000,22651=>1000,22652=>1000,22653=>1000,22654=>1000,22655=>1000,22656=>1000,22657=>1000,22658=>1000,22659=>1000,22660=>1000,
-	22661=>1000,22662=>1000,22663=>1000,22664=>1000,22665=>1000,22666=>1000,22667=>1000,22668=>1000,22669=>1000,22670=>1000,22671=>1000,22672=>1000,22673=>1000,22674=>1000,22675=>1000,22676=>1000,
-	22677=>1000,22678=>1000,22679=>1000,22680=>1000,22681=>1000,22682=>1000,22683=>1000,22684=>1000,22685=>1000,22686=>1000,22687=>1000,22688=>1000,22689=>1000,22690=>1000,22691=>1000,22692=>1000,
-	22693=>1000,22694=>1000,22695=>1000,22696=>1000,22697=>1000,22698=>1000,22699=>1000,22700=>1000,22701=>1000,22702=>1000,22703=>1000,22704=>1000,22705=>1000,22706=>1000,22707=>1000,22708=>1000,
-	22709=>1000,22710=>1000,22711=>1000,22712=>1000,22713=>1000,22714=>1000,22715=>1000,22716=>1000,22717=>1000,22718=>1000,22719=>1000,22720=>1000,22721=>1000,22722=>1000,22723=>1000,22724=>1000,
-	22725=>1000,22726=>1000,22727=>1000,22728=>1000,22729=>1000,22730=>1000,22731=>1000,22732=>1000,22733=>1000,22734=>1000,22735=>1000,22736=>1000,22737=>1000,22738=>1000,22739=>1000,22740=>1000,
-	22741=>1000,22742=>1000,22743=>1000,22744=>1000,22745=>1000,22746=>1000,22747=>1000,22748=>1000,22749=>1000,22750=>1000,22751=>1000,22752=>1000,22753=>1000,22754=>1000,22755=>1000,22756=>1000,
-	22757=>1000,22758=>1000,22759=>1000,22760=>1000,22761=>1000,22762=>1000,22763=>1000,22764=>1000,22765=>1000,22766=>1000,22767=>1000,22768=>1000,22769=>1000,22770=>1000,22771=>1000,22772=>1000,
-	22773=>1000,22774=>1000,22775=>1000,22776=>1000,22777=>1000,22778=>1000,22779=>1000,22780=>1000,22781=>1000,22782=>1000,22783=>1000,22784=>1000,22785=>1000,22786=>1000,22787=>1000,22788=>1000,
-	22789=>1000,22790=>1000,22791=>1000,22792=>1000,22793=>1000,22794=>1000,22795=>1000,22796=>1000,22797=>1000,22798=>1000,22799=>1000,22800=>1000,22801=>1000,22802=>1000,22803=>1000,22804=>1000,
-	22805=>1000,22806=>1000,22807=>1000,22808=>1000,22809=>1000,22810=>1000,22811=>1000,22812=>1000,22813=>1000,22814=>1000,22815=>1000,22816=>1000,22817=>1000,22818=>1000,22819=>1000,22820=>1000,
-	22821=>1000,22822=>1000,22823=>1000,22824=>1000,22825=>1000,22826=>1000,22827=>1000,22828=>1000,22829=>1000,22830=>1000,22831=>1000,22832=>1000,22833=>1000,22834=>1000,22835=>1000,22836=>1000,
-	22837=>1000,22838=>1000,22839=>1000,22840=>1000,22841=>1000,22842=>1000,22843=>1000,22844=>1000,22845=>1000,22846=>1000,22847=>1000,22848=>1000,22849=>1000,22850=>1000,22851=>1000,22852=>1000,
-	22853=>1000,22854=>1000,22855=>1000,22856=>1000,22857=>1000,22858=>1000,22859=>1000,22860=>1000,22861=>1000,22862=>1000,22863=>1000,22864=>1000,22865=>1000,22866=>1000,22867=>1000,22868=>1000,
-	22869=>1000,22870=>1000,22871=>1000,22872=>1000,22873=>1000,22874=>1000,22875=>1000,22876=>1000,22877=>1000,22878=>1000,22879=>1000,22880=>1000,22881=>1000,22882=>1000,22883=>1000,22884=>1000,
-	22885=>1000,22886=>1000,22887=>1000,22888=>1000,22889=>1000,22890=>1000,22891=>1000,22892=>1000,22893=>1000,22894=>1000,22895=>1000,22896=>1000,22897=>1000,22898=>1000,22899=>1000,22900=>1000,
-	22901=>1000,22902=>1000,22903=>1000,22904=>1000,22905=>1000,22906=>1000,22907=>1000,22908=>1000,22909=>1000,22910=>1000,22911=>1000,22912=>1000,22913=>1000,22914=>1000,22915=>1000,22916=>1000,
-	22917=>1000,22918=>1000,22919=>1000,22920=>1000,22921=>1000,22922=>1000,22923=>1000,22924=>1000,22925=>1000,22926=>1000,22927=>1000,22928=>1000,22929=>1000,22930=>1000,22931=>1000,22932=>1000,
-	22933=>1000,22934=>1000,22935=>1000,22936=>1000,22937=>1000,22938=>1000,22939=>1000,22940=>1000,22941=>1000,22942=>1000,22943=>1000,22944=>1000,22945=>1000,22946=>1000,22947=>1000,22948=>1000,
-	22949=>1000,22950=>1000,22951=>1000,22952=>1000,22953=>1000,22954=>1000,22955=>1000,22956=>1000,22957=>1000,22958=>1000,22959=>1000,22960=>1000,22961=>1000,22962=>1000,22963=>1000,22964=>1000,
-	22965=>1000,22966=>1000,22967=>1000,22968=>1000,22969=>1000,22970=>1000,22971=>1000,22972=>1000,22973=>1000,22974=>1000,22975=>1000,22976=>1000,22977=>1000,22978=>1000,22979=>1000,22980=>1000,
-	22981=>1000,22982=>1000,22983=>1000,22984=>1000,22985=>1000,22986=>1000,22987=>1000,22988=>1000,22989=>1000,22990=>1000,22991=>1000,22992=>1000,22993=>1000,22994=>1000,22995=>1000,22996=>1000,
-	22997=>1000,22998=>1000,22999=>1000,23000=>1000,23001=>1000,23002=>1000,23003=>1000,23004=>1000,23005=>1000,23006=>1000,23007=>1000,23008=>1000,23009=>1000,23010=>1000,23011=>1000,23012=>1000,
-	23013=>1000,23014=>1000,23015=>1000,23016=>1000,23017=>1000,23018=>1000,23019=>1000,23020=>1000,23021=>1000,23022=>1000,23023=>1000,23024=>1000,23025=>1000,23026=>1000,23027=>1000,23028=>1000,
-	23029=>1000,23030=>1000,23031=>1000,23032=>1000,23033=>1000,23034=>1000,23035=>1000,23036=>1000,23037=>1000,23038=>1000,23039=>1000,23040=>1000,23041=>1000,23042=>1000,23043=>1000,23044=>1000,
-	23045=>1000,23046=>1000,23047=>1000,23048=>1000,23049=>1000,23050=>1000,23051=>1000,23052=>1000,23053=>1000,23054=>1000,23055=>1000,23056=>1000,23057=>1000,23058=>1000,23059=>1000,23060=>1000,
-	23061=>1000,23062=>1000,23063=>1000,23064=>1000,23065=>1000,23066=>1000,23067=>1000,23068=>1000,23069=>1000,23070=>1000,23071=>1000,23072=>1000,23073=>1000,23074=>1000,23075=>1000,23076=>1000,
-	23077=>1000,23078=>1000,23079=>1000,23080=>1000,23081=>1000,23082=>1000,23083=>1000,23084=>1000,23085=>1000,23086=>1000,23087=>1000,23088=>1000,23089=>1000,23090=>1000,23091=>1000,23092=>1000,
-	23093=>1000,23094=>1000,23095=>1000,23096=>1000,23097=>1000,23098=>1000,23099=>1000,23100=>1000,23101=>1000,23102=>1000,23103=>1000,23104=>1000,23105=>1000,23106=>1000,23107=>1000,23108=>1000,
-	23109=>1000,23110=>1000,23111=>1000,23112=>1000,23113=>1000,23114=>1000,23115=>1000,23116=>1000,23117=>1000,23118=>1000,23119=>1000,23120=>1000,23121=>1000,23122=>1000,23123=>1000,23124=>1000,
-	23125=>1000,23126=>1000,23127=>1000,23128=>1000,23129=>1000,23130=>1000,23131=>1000,23132=>1000,23133=>1000,23134=>1000,23135=>1000,23136=>1000,23137=>1000,23138=>1000,23139=>1000,23140=>1000,
-	23141=>1000,23142=>1000,23143=>1000,23144=>1000,23145=>1000,23146=>1000,23147=>1000,23148=>1000,23149=>1000,23150=>1000,23151=>1000,23152=>1000,23153=>1000,23154=>1000,23155=>1000,23156=>1000,
-	23157=>1000,23158=>1000,23159=>1000,23160=>1000,23161=>1000,23162=>1000,23163=>1000,23164=>1000,23165=>1000,23166=>1000,23167=>1000,23168=>1000,23169=>1000,23170=>1000,23171=>1000,23172=>1000,
-	23173=>1000,23174=>1000,23175=>1000,23176=>1000,23177=>1000,23178=>1000,23179=>1000,23180=>1000,23181=>1000,23182=>1000,23183=>1000,23184=>1000,23185=>1000,23186=>1000,23187=>1000,23188=>1000,
-	23189=>1000,23190=>1000,23191=>1000,23192=>1000,23193=>1000,23194=>1000,23195=>1000,23196=>1000,23197=>1000,23198=>1000,23199=>1000,23200=>1000,23201=>1000,23202=>1000,23203=>1000,23204=>1000,
-	23205=>1000,23206=>1000,23207=>1000,23208=>1000,23209=>1000,23210=>1000,23211=>1000,23212=>1000,23213=>1000,23214=>1000,23215=>1000,23216=>1000,23217=>1000,23218=>1000,23219=>1000,23220=>1000,
-	23221=>1000,23222=>1000,23223=>1000,23224=>1000,23225=>1000,23226=>1000,23227=>1000,23228=>1000,23229=>1000,23230=>1000,23231=>1000,23232=>1000,23233=>1000,23234=>1000,23235=>1000,23236=>1000,
-	23237=>1000,23238=>1000,23239=>1000,23240=>1000,23241=>1000,23242=>1000,23243=>1000,23244=>1000,23245=>1000,23246=>1000,23247=>1000,23248=>1000,23249=>1000,23250=>1000,23251=>1000,23252=>1000,
-	23253=>1000,23254=>1000,23255=>1000,23256=>1000,23257=>1000,23258=>1000,23259=>1000,23260=>1000,23261=>1000,23262=>1000,23263=>1000,23264=>1000,23265=>1000,23266=>1000,23267=>1000,23268=>1000,
-	23269=>1000,23270=>1000,23271=>1000,23272=>1000,23273=>1000,23274=>1000,23275=>1000,23276=>1000,23277=>1000,23278=>1000,23279=>1000,23280=>1000,23281=>1000,23282=>1000,23283=>1000,23284=>1000,
-	23285=>1000,23286=>1000,23287=>1000,23288=>1000,23289=>1000,23290=>1000,23291=>1000,23292=>1000,23293=>1000,23294=>1000,23295=>1000,23296=>1000,23297=>1000,23298=>1000,23299=>1000,23300=>1000,
-	23301=>1000,23302=>1000,23303=>1000,23304=>1000,23305=>1000,23306=>1000,23307=>1000,23308=>1000,23309=>1000,23310=>1000,23311=>1000,23312=>1000,23313=>1000,23314=>1000,23315=>1000,23316=>1000,
-	23317=>1000,23318=>1000,23319=>1000,23320=>1000,23321=>1000,23322=>1000,23323=>1000,23324=>1000,23325=>1000,23326=>1000,23327=>1000,23328=>1000,23329=>1000,23330=>1000,23331=>1000,23332=>1000,
-	23333=>1000,23334=>1000,23335=>1000,23336=>1000,23337=>1000,23338=>1000,23339=>1000,23340=>1000,23341=>1000,23342=>1000,23343=>1000,23344=>1000,23345=>1000,23346=>1000,23347=>1000,23348=>1000,
-	23349=>1000,23350=>1000,23351=>1000,23352=>1000,23353=>1000,23354=>1000,23355=>1000,23356=>1000,23357=>1000,23358=>1000,23359=>1000,23360=>1000,23361=>1000,23362=>1000,23363=>1000,23364=>1000,
-	23365=>1000,23366=>1000,23367=>1000,23368=>1000,23369=>1000,23370=>1000,23371=>1000,23372=>1000,23373=>1000,23374=>1000,23375=>1000,23376=>1000,23377=>1000,23378=>1000,23379=>1000,23380=>1000,
-	23381=>1000,23382=>1000,23383=>1000,23384=>1000,23385=>1000,23386=>1000,23387=>1000,23388=>1000,23389=>1000,23390=>1000,23391=>1000,23392=>1000,23393=>1000,23394=>1000,23395=>1000,23396=>1000,
-	23397=>1000,23398=>1000,23399=>1000,23400=>1000,23401=>1000,23402=>1000,23403=>1000,23404=>1000,23405=>1000,23406=>1000,23407=>1000,23408=>1000,23409=>1000,23410=>1000,23411=>1000,23412=>1000,
-	23413=>1000,23414=>1000,23415=>1000,23416=>1000,23417=>1000,23418=>1000,23419=>1000,23420=>1000,23421=>1000,23422=>1000,23423=>1000,23424=>1000,23425=>1000,23426=>1000,23427=>1000,23428=>1000,
-	23429=>1000,23430=>1000,23431=>1000,23432=>1000,23433=>1000,23434=>1000,23435=>1000,23436=>1000,23437=>1000,23438=>1000,23439=>1000,23440=>1000,23441=>1000,23442=>1000,23443=>1000,23444=>1000,
-	23445=>1000,23446=>1000,23447=>1000,23448=>1000,23449=>1000,23450=>1000,23451=>1000,23452=>1000,23453=>1000,23454=>1000,23455=>1000,23456=>1000,23457=>1000,23458=>1000,23459=>1000,23460=>1000,
-	23461=>1000,23462=>1000,23463=>1000,23464=>1000,23465=>1000,23466=>1000,23467=>1000,23468=>1000,23469=>1000,23470=>1000,23471=>1000,23472=>1000,23473=>1000,23474=>1000,23475=>1000,23476=>1000,
-	23477=>1000,23478=>1000,23479=>1000,23480=>1000,23481=>1000,23482=>1000,23483=>1000,23484=>1000,23485=>1000,23486=>1000,23487=>1000,23488=>1000,23489=>1000,23490=>1000,23491=>1000,23492=>1000,
-	23493=>1000,23494=>1000,23495=>1000,23496=>1000,23497=>1000,23498=>1000,23499=>1000,23500=>1000,23501=>1000,23502=>1000,23503=>1000,23504=>1000,23505=>1000,23506=>1000,23507=>1000,23508=>1000,
-	23509=>1000,23510=>1000,23511=>1000,23512=>1000,23513=>1000,23514=>1000,23515=>1000,23516=>1000,23517=>1000,23518=>1000,23519=>1000,23520=>1000,23521=>1000,23522=>1000,23523=>1000,23524=>1000,
-	23525=>1000,23526=>1000,23527=>1000,23528=>1000,23529=>1000,23530=>1000,23531=>1000,23532=>1000,23533=>1000,23534=>1000,23535=>1000,23536=>1000,23537=>1000,23538=>1000,23539=>1000,23540=>1000,
-	23541=>1000,23542=>1000,23543=>1000,23544=>1000,23545=>1000,23546=>1000,23547=>1000,23548=>1000,23549=>1000,23550=>1000,23551=>1000,23552=>1000,23553=>1000,23554=>1000,23555=>1000,23556=>1000,
-	23557=>1000,23558=>1000,23559=>1000,23560=>1000,23561=>1000,23562=>1000,23563=>1000,23564=>1000,23565=>1000,23566=>1000,23567=>1000,23568=>1000,23569=>1000,23570=>1000,23571=>1000,23572=>1000,
-	23573=>1000,23574=>1000,23575=>1000,23576=>1000,23577=>1000,23578=>1000,23579=>1000,23580=>1000,23581=>1000,23582=>1000,23583=>1000,23584=>1000,23585=>1000,23586=>1000,23587=>1000,23588=>1000,
-	23589=>1000,23590=>1000,23591=>1000,23592=>1000,23593=>1000,23594=>1000,23595=>1000,23596=>1000,23597=>1000,23598=>1000,23599=>1000,23600=>1000,23601=>1000,23602=>1000,23603=>1000,23604=>1000,
-	23605=>1000,23606=>1000,23607=>1000,23608=>1000,23609=>1000,23610=>1000,23611=>1000,23612=>1000,23613=>1000,23614=>1000,23615=>1000,23616=>1000,23617=>1000,23618=>1000,23619=>1000,23620=>1000,
-	23621=>1000,23622=>1000,23623=>1000,23624=>1000,23625=>1000,23626=>1000,23627=>1000,23628=>1000,23629=>1000,23630=>1000,23631=>1000,23632=>1000,23633=>1000,23634=>1000,23635=>1000,23636=>1000,
-	23637=>1000,23638=>1000,23639=>1000,23640=>1000,23641=>1000,23642=>1000,23643=>1000,23644=>1000,23645=>1000,23646=>1000,23647=>1000,23648=>1000,23649=>1000,23650=>1000,23651=>1000,23652=>1000,
-	23653=>1000,23654=>1000,23655=>1000,23656=>1000,23657=>1000,23658=>1000,23659=>1000,23660=>1000,23661=>1000,23662=>1000,23663=>1000,23664=>1000,23665=>1000,23666=>1000,23667=>1000,23668=>1000,
-	23669=>1000,23670=>1000,23671=>1000,23672=>1000,23673=>1000,23674=>1000,23675=>1000,23676=>1000,23677=>1000,23678=>1000,23679=>1000,23680=>1000,23681=>1000,23682=>1000,23683=>1000,23684=>1000,
-	23685=>1000,23686=>1000,23687=>1000,23688=>1000,23689=>1000,23690=>1000,23691=>1000,23692=>1000,23693=>1000,23694=>1000,23695=>1000,23696=>1000,23697=>1000,23698=>1000,23699=>1000,23700=>1000,
-	23701=>1000,23702=>1000,23703=>1000,23704=>1000,23705=>1000,23706=>1000,23707=>1000,23708=>1000,23709=>1000,23710=>1000,23711=>1000,23712=>1000,23713=>1000,23714=>1000,23715=>1000,23716=>1000,
-	23717=>1000,23718=>1000,23719=>1000,23720=>1000,23721=>1000,23722=>1000,23723=>1000,23724=>1000,23725=>1000,23726=>1000,23727=>1000,23728=>1000,23729=>1000,23730=>1000,23731=>1000,23732=>1000,
-	23733=>1000,23734=>1000,23735=>1000,23736=>1000,23737=>1000,23738=>1000,23739=>1000,23740=>1000,23741=>1000,23742=>1000,23743=>1000,23744=>1000,23745=>1000,23746=>1000,23747=>1000,23748=>1000,
-	23749=>1000,23750=>1000,23751=>1000,23752=>1000,23753=>1000,23754=>1000,23755=>1000,23756=>1000,23757=>1000,23758=>1000,23759=>1000,23760=>1000,23761=>1000,23762=>1000,23763=>1000,23764=>1000,
-	23765=>1000,23766=>1000,23767=>1000,23768=>1000,23769=>1000,23770=>1000,23771=>1000,23772=>1000,23773=>1000,23774=>1000,23775=>1000,23776=>1000,23777=>1000,23778=>1000,23779=>1000,23780=>1000,
-	23781=>1000,23782=>1000,23783=>1000,23784=>1000,23785=>1000,23786=>1000,23787=>1000,23788=>1000,23789=>1000,23790=>1000,23791=>1000,23792=>1000,23793=>1000,23794=>1000,23795=>1000,23796=>1000,
-	23797=>1000,23798=>1000,23799=>1000,23800=>1000,23801=>1000,23802=>1000,23803=>1000,23804=>1000,23805=>1000,23806=>1000,23807=>1000,23808=>1000,23809=>1000,23810=>1000,23811=>1000,23812=>1000,
-	23813=>1000,23814=>1000,23815=>1000,23816=>1000,23817=>1000,23818=>1000,23819=>1000,23820=>1000,23821=>1000,23822=>1000,23823=>1000,23824=>1000,23825=>1000,23826=>1000,23827=>1000,23828=>1000,
-	23829=>1000,23830=>1000,23831=>1000,23832=>1000,23833=>1000,23834=>1000,23835=>1000,23836=>1000,23837=>1000,23838=>1000,23839=>1000,23840=>1000,23841=>1000,23842=>1000,23843=>1000,23844=>1000,
-	23845=>1000,23846=>1000,23847=>1000,23848=>1000,23849=>1000,23850=>1000,23851=>1000,23852=>1000,23853=>1000,23854=>1000,23855=>1000,23856=>1000,23857=>1000,23858=>1000,23859=>1000,23860=>1000,
-	23861=>1000,23862=>1000,23863=>1000,23864=>1000,23865=>1000,23866=>1000,23867=>1000,23868=>1000,23869=>1000,23870=>1000,23871=>1000,23872=>1000,23873=>1000,23874=>1000,23875=>1000,23876=>1000,
-	23877=>1000,23878=>1000,23879=>1000,23880=>1000,23881=>1000,23882=>1000,23883=>1000,23884=>1000,23885=>1000,23886=>1000,23887=>1000,23888=>1000,23889=>1000,23890=>1000,23891=>1000,23892=>1000,
-	23893=>1000,23894=>1000,23895=>1000,23896=>1000,23897=>1000,23898=>1000,23899=>1000,23900=>1000,23901=>1000,23902=>1000,23903=>1000,23904=>1000,23905=>1000,23906=>1000,23907=>1000,23908=>1000,
-	23909=>1000,23910=>1000,23911=>1000,23912=>1000,23913=>1000,23914=>1000,23915=>1000,23916=>1000,23917=>1000,23918=>1000,23919=>1000,23920=>1000,23921=>1000,23922=>1000,23923=>1000,23924=>1000,
-	23925=>1000,23926=>1000,23927=>1000,23928=>1000,23929=>1000,23930=>1000,23931=>1000,23932=>1000,23933=>1000,23934=>1000,23935=>1000,23936=>1000,23937=>1000,23938=>1000,23939=>1000,23940=>1000,
-	23941=>1000,23942=>1000,23943=>1000,23944=>1000,23945=>1000,23946=>1000,23947=>1000,23948=>1000,23949=>1000,23950=>1000,23951=>1000,23952=>1000,23953=>1000,23954=>1000,23955=>1000,23956=>1000,
-	23957=>1000,23958=>1000,23959=>1000,23960=>1000,23961=>1000,23962=>1000,23963=>1000,23964=>1000,23965=>1000,23966=>1000,23967=>1000,23968=>1000,23969=>1000,23970=>1000,23971=>1000,23972=>1000,
-	23973=>1000,23974=>1000,23975=>1000,23976=>1000,23977=>1000,23978=>1000,23979=>1000,23980=>1000,23981=>1000,23982=>1000,23983=>1000,23984=>1000,23985=>1000,23986=>1000,23987=>1000,23988=>1000,
-	23989=>1000,23990=>1000,23991=>1000,23992=>1000,23993=>1000,23994=>1000,23995=>1000,23996=>1000,23997=>1000,23998=>1000,23999=>1000,24000=>1000,24001=>1000,24002=>1000,24003=>1000,24004=>1000,
-	24005=>1000,24006=>1000,24007=>1000,24008=>1000,24009=>1000,24010=>1000,24011=>1000,24012=>1000,24013=>1000,24014=>1000,24015=>1000,24016=>1000,24017=>1000,24018=>1000,24019=>1000,24020=>1000,
-	24021=>1000,24022=>1000,24023=>1000,24024=>1000,24025=>1000,24026=>1000,24027=>1000,24028=>1000,24029=>1000,24030=>1000,24031=>1000,24032=>1000,24033=>1000,24034=>1000,24035=>1000,24036=>1000,
-	24037=>1000,24038=>1000,24039=>1000,24040=>1000,24041=>1000,24042=>1000,24043=>1000,24044=>1000,24045=>1000,24046=>1000,24047=>1000,24048=>1000,24049=>1000,24050=>1000,24051=>1000,24052=>1000,
-	24053=>1000,24054=>1000,24055=>1000,24056=>1000,24057=>1000,24058=>1000,24059=>1000,24060=>1000,24061=>1000,24062=>1000,24063=>1000,24064=>1000,24065=>1000,24066=>1000,24067=>1000,24068=>1000,
-	24069=>1000,24070=>1000,24071=>1000,24072=>1000,24073=>1000,24074=>1000,24075=>1000,24076=>1000,24077=>1000,24078=>1000,24079=>1000,24080=>1000,24081=>1000,24082=>1000,24083=>1000,24084=>1000,
-	24085=>1000,24086=>1000,24087=>1000,24088=>1000,24089=>1000,24090=>1000,24091=>1000,24092=>1000,24093=>1000,24094=>1000,24095=>1000,24096=>1000,24097=>1000,24098=>1000,24099=>1000,24100=>1000,
-	24101=>1000,24102=>1000,24103=>1000,24104=>1000,24105=>1000,24106=>1000,24107=>1000,24108=>1000,24109=>1000,24110=>1000,24111=>1000,24112=>1000,24113=>1000,24114=>1000,24115=>1000,24116=>1000,
-	24117=>1000,24118=>1000,24119=>1000,24120=>1000,24121=>1000,24122=>1000,24123=>1000,24124=>1000,24125=>1000,24126=>1000,24127=>1000,24128=>1000,24129=>1000,24130=>1000,24131=>1000,24132=>1000,
-	24133=>1000,24134=>1000,24135=>1000,24136=>1000,24137=>1000,24138=>1000,24139=>1000,24140=>1000,24141=>1000,24142=>1000,24143=>1000,24144=>1000,24145=>1000,24146=>1000,24147=>1000,24148=>1000,
-	24149=>1000,24150=>1000,24151=>1000,24152=>1000,24153=>1000,24154=>1000,24155=>1000,24156=>1000,24157=>1000,24158=>1000,24159=>1000,24160=>1000,24161=>1000,24162=>1000,24163=>1000,24164=>1000,
-	24165=>1000,24166=>1000,24167=>1000,24168=>1000,24169=>1000,24170=>1000,24171=>1000,24172=>1000,24173=>1000,24174=>1000,24175=>1000,24176=>1000,24177=>1000,24178=>1000,24179=>1000,24180=>1000,
-	24181=>1000,24182=>1000,24183=>1000,24184=>1000,24185=>1000,24186=>1000,24187=>1000,24188=>1000,24189=>1000,24190=>1000,24191=>1000,24192=>1000,24193=>1000,24194=>1000,24195=>1000,24196=>1000,
-	24197=>1000,24198=>1000,24199=>1000,24200=>1000,24201=>1000,24202=>1000,24203=>1000,24204=>1000,24205=>1000,24206=>1000,24207=>1000,24208=>1000,24209=>1000,24210=>1000,24211=>1000,24212=>1000,
-	24213=>1000,24214=>1000,24215=>1000,24216=>1000,24217=>1000,24218=>1000,24219=>1000,24220=>1000,24221=>1000,24222=>1000,24223=>1000,24224=>1000,24225=>1000,24226=>1000,24227=>1000,24228=>1000,
-	24229=>1000,24230=>1000,24231=>1000,24232=>1000,24233=>1000,24234=>1000,24235=>1000,24236=>1000,24237=>1000,24238=>1000,24239=>1000,24240=>1000,24241=>1000,24242=>1000,24243=>1000,24244=>1000,
-	24245=>1000,24246=>1000,24247=>1000,24248=>1000,24249=>1000,24250=>1000,24251=>1000,24252=>1000,24253=>1000,24254=>1000,24255=>1000,24256=>1000,24257=>1000,24258=>1000,24259=>1000,24260=>1000,
-	24261=>1000,24262=>1000,24263=>1000,24264=>1000,24265=>1000,24266=>1000,24267=>1000,24268=>1000,24269=>1000,24270=>1000,24271=>1000,24272=>1000,24273=>1000,24274=>1000,24275=>1000,24276=>1000,
-	24277=>1000,24278=>1000,24279=>1000,24280=>1000,24281=>1000,24282=>1000,24283=>1000,24284=>1000,24285=>1000,24286=>1000,24287=>1000,24288=>1000,24289=>1000,24290=>1000,24291=>1000,24292=>1000,
-	24293=>1000,24294=>1000,24295=>1000,24296=>1000,24297=>1000,24298=>1000,24299=>1000,24300=>1000,24301=>1000,24302=>1000,24303=>1000,24304=>1000,24305=>1000,24306=>1000,24307=>1000,24308=>1000,
-	24309=>1000,24310=>1000,24311=>1000,24312=>1000,24313=>1000,24314=>1000,24315=>1000,24316=>1000,24317=>1000,24318=>1000,24319=>1000,24320=>1000,24321=>1000,24322=>1000,24323=>1000,24324=>1000,
-	24325=>1000,24326=>1000,24327=>1000,24328=>1000,24329=>1000,24330=>1000,24331=>1000,24332=>1000,24333=>1000,24334=>1000,24335=>1000,24336=>1000,24337=>1000,24338=>1000,24339=>1000,24340=>1000,
-	24341=>1000,24342=>1000,24343=>1000,24344=>1000,24345=>1000,24346=>1000,24347=>1000,24348=>1000,24349=>1000,24350=>1000,24351=>1000,24352=>1000,24353=>1000,24354=>1000,24355=>1000,24356=>1000,
-	24357=>1000,24358=>1000,24359=>1000,24360=>1000,24361=>1000,24362=>1000,24363=>1000,24364=>1000,24365=>1000,24366=>1000,24367=>1000,24368=>1000,24369=>1000,24370=>1000,24371=>1000,24372=>1000,
-	24373=>1000,24374=>1000,24375=>1000,24376=>1000,24377=>1000,24378=>1000,24379=>1000,24380=>1000,24381=>1000,24382=>1000,24383=>1000,24384=>1000,24385=>1000,24386=>1000,24387=>1000,24388=>1000,
-	24389=>1000,24390=>1000,24391=>1000,24392=>1000,24393=>1000,24394=>1000,24395=>1000,24396=>1000,24397=>1000,24398=>1000,24399=>1000,24400=>1000,24401=>1000,24402=>1000,24403=>1000,24404=>1000,
-	24405=>1000,24406=>1000,24407=>1000,24408=>1000,24409=>1000,24410=>1000,24411=>1000,24412=>1000,24413=>1000,24414=>1000,24415=>1000,24416=>1000,24417=>1000,24418=>1000,24419=>1000,24420=>1000,
-	24421=>1000,24422=>1000,24423=>1000,24424=>1000,24425=>1000,24426=>1000,24427=>1000,24428=>1000,24429=>1000,24430=>1000,24431=>1000,24432=>1000,24433=>1000,24434=>1000,24435=>1000,24436=>1000,
-	24437=>1000,24438=>1000,24439=>1000,24440=>1000,24441=>1000,24442=>1000,24443=>1000,24444=>1000,24445=>1000,24446=>1000,24447=>1000,24448=>1000,24449=>1000,24450=>1000,24451=>1000,24452=>1000,
-	24453=>1000,24454=>1000,24455=>1000,24456=>1000,24457=>1000,24458=>1000,24459=>1000,24460=>1000,24461=>1000,24462=>1000,24463=>1000,24464=>1000,24465=>1000,24466=>1000,24467=>1000,24468=>1000,
-	24469=>1000,24470=>1000,24471=>1000,24472=>1000,24473=>1000,24474=>1000,24475=>1000,24476=>1000,24477=>1000,24478=>1000,24479=>1000,24480=>1000,24481=>1000,24482=>1000,24483=>1000,24484=>1000,
-	24485=>1000,24486=>1000,24487=>1000,24488=>1000,24489=>1000,24490=>1000,24491=>1000,24492=>1000,24493=>1000,24494=>1000,24495=>1000,24496=>1000,24497=>1000,24498=>1000,24499=>1000,24500=>1000,
-	24501=>1000,24502=>1000,24503=>1000,24504=>1000,24505=>1000,24506=>1000,24507=>1000,24508=>1000,24509=>1000,24510=>1000,24511=>1000,24512=>1000,24513=>1000,24514=>1000,24515=>1000,24516=>1000,
-	24517=>1000,24518=>1000,24519=>1000,24520=>1000,24521=>1000,24522=>1000,24523=>1000,24524=>1000,24525=>1000,24526=>1000,24527=>1000,24528=>1000,24529=>1000,24530=>1000,24531=>1000,24532=>1000,
-	24533=>1000,24534=>1000,24535=>1000,24536=>1000,24537=>1000,24538=>1000,24539=>1000,24540=>1000,24541=>1000,24542=>1000,24543=>1000,24544=>1000,24545=>1000,24546=>1000,24547=>1000,24548=>1000,
-	24549=>1000,24550=>1000,24551=>1000,24552=>1000,24553=>1000,24554=>1000,24555=>1000,24556=>1000,24557=>1000,24558=>1000,24559=>1000,24560=>1000,24561=>1000,24562=>1000,24563=>1000,24564=>1000,
-	24565=>1000,24566=>1000,24567=>1000,24568=>1000,24569=>1000,24570=>1000,24571=>1000,24572=>1000,24573=>1000,24574=>1000,24575=>1000,24576=>1000,24577=>1000,24578=>1000,24579=>1000,24580=>1000,
-	24581=>1000,24582=>1000,24583=>1000,24584=>1000,24585=>1000,24586=>1000,24587=>1000,24588=>1000,24589=>1000,24590=>1000,24591=>1000,24592=>1000,24593=>1000,24594=>1000,24595=>1000,24596=>1000,
-	24597=>1000,24598=>1000,24599=>1000,24600=>1000,24601=>1000,24602=>1000,24603=>1000,24604=>1000,24605=>1000,24606=>1000,24607=>1000,24608=>1000,24609=>1000,24610=>1000,24611=>1000,24612=>1000,
-	24613=>1000,24614=>1000,24615=>1000,24616=>1000,24617=>1000,24618=>1000,24619=>1000,24620=>1000,24621=>1000,24622=>1000,24623=>1000,24624=>1000,24625=>1000,24626=>1000,24627=>1000,24628=>1000,
-	24629=>1000,24630=>1000,24631=>1000,24632=>1000,24633=>1000,24634=>1000,24635=>1000,24636=>1000,24637=>1000,24638=>1000,24639=>1000,24640=>1000,24641=>1000,24642=>1000,24643=>1000,24644=>1000,
-	24645=>1000,24646=>1000,24647=>1000,24648=>1000,24649=>1000,24650=>1000,24651=>1000,24652=>1000,24653=>1000,24654=>1000,24655=>1000,24656=>1000,24657=>1000,24658=>1000,24659=>1000,24660=>1000,
-	24661=>1000,24662=>1000,24663=>1000,24664=>1000,24665=>1000,24666=>1000,24667=>1000,24668=>1000,24669=>1000,24670=>1000,24671=>1000,24672=>1000,24673=>1000,24674=>1000,24675=>1000,24676=>1000,
-	24677=>1000,24678=>1000,24679=>1000,24680=>1000,24681=>1000,24682=>1000,24683=>1000,24684=>1000,24685=>1000,24686=>1000,24687=>1000,24688=>1000,24689=>1000,24690=>1000,24691=>1000,24692=>1000,
-	24693=>1000,24694=>1000,24695=>1000,24696=>1000,24697=>1000,24698=>1000,24699=>1000,24700=>1000,24701=>1000,24702=>1000,24703=>1000,24704=>1000,24705=>1000,24706=>1000,24707=>1000,24708=>1000,
-
-	24709=>1000,24710=>1000,24711=>1000,24712=>1000,24713=>1000,24714=>1000,24715=>1000,24716=>1000,24717=>1000,24718=>1000,24719=>1000,24720=>1000,24721=>1000,24722=>1000,24723=>1000,24724=>1000,
-	24725=>1000,24726=>1000,24727=>1000,24728=>1000,24729=>1000,24730=>1000,24731=>1000,24732=>1000,24733=>1000,24734=>1000,24735=>1000,24736=>1000,24737=>1000,24738=>1000,24739=>1000,24740=>1000,
-	24741=>1000,24742=>1000,24743=>1000,24744=>1000,24745=>1000,24746=>1000,24747=>1000,24748=>1000,24749=>1000,24750=>1000,24751=>1000,24752=>1000,24753=>1000,24754=>1000,24755=>1000,24756=>1000,
-	24757=>1000,24758=>1000,24759=>1000,24760=>1000,24761=>1000,24762=>1000,24763=>1000,24764=>1000,24765=>1000,24766=>1000,24767=>1000,24768=>1000,24769=>1000,24770=>1000,24771=>1000,24772=>1000,
-	24773=>1000,24774=>1000,24775=>1000,24776=>1000,24777=>1000,24778=>1000,24779=>1000,24780=>1000,24781=>1000,24782=>1000,24783=>1000,24784=>1000,24785=>1000,24786=>1000,24787=>1000,24788=>1000,
-	24789=>1000,24790=>1000,24791=>1000,24792=>1000,24793=>1000,24794=>1000,24795=>1000,24796=>1000,24797=>1000,24798=>1000,24799=>1000,24800=>1000,24801=>1000,24802=>1000,24803=>1000,24804=>1000,
-	24805=>1000,24806=>1000,24807=>1000,24808=>1000,24809=>1000,24810=>1000,24811=>1000,24812=>1000,24813=>1000,24814=>1000,24815=>1000,24816=>1000,24817=>1000,24818=>1000,24819=>1000,24820=>1000,
-	24821=>1000,24822=>1000,24823=>1000,24824=>1000,24825=>1000,24826=>1000,24827=>1000,24828=>1000,24829=>1000,24830=>1000,24831=>1000,24832=>1000,24833=>1000,24834=>1000,24835=>1000,24836=>1000,
-	24837=>1000,24838=>1000,24839=>1000,24840=>1000,24841=>1000,24842=>1000,24843=>1000,24844=>1000,24845=>1000,24846=>1000,24847=>1000,24848=>1000,24849=>1000,24850=>1000,24851=>1000,24852=>1000,
-	24853=>1000,24854=>1000,24855=>1000,24856=>1000,24857=>1000,24858=>1000,24859=>1000,24860=>1000,24861=>1000,24862=>1000,24863=>1000,24864=>1000,24865=>1000,24866=>1000,24867=>1000,24868=>1000,
-	24869=>1000,24870=>1000,24871=>1000,24872=>1000,24873=>1000,24874=>1000,24875=>1000,24876=>1000,24877=>1000,24878=>1000,24879=>1000,24880=>1000,24881=>1000,24882=>1000,24883=>1000,24884=>1000,
-	24885=>1000,24886=>1000,24887=>1000,24888=>1000,24889=>1000,24890=>1000,24891=>1000,24892=>1000,24893=>1000,24894=>1000,24895=>1000,24896=>1000,24897=>1000,24898=>1000,24899=>1000,24900=>1000,
-	24901=>1000,24902=>1000,24903=>1000,24904=>1000,24905=>1000,24906=>1000,24907=>1000,24908=>1000,24909=>1000,24910=>1000,24911=>1000,24912=>1000,24913=>1000,24914=>1000,24915=>1000,24916=>1000,
-	24917=>1000,24918=>1000,24919=>1000,24920=>1000,24921=>1000,24922=>1000,24923=>1000,24924=>1000,24925=>1000,24926=>1000,24927=>1000,24928=>1000,24929=>1000,24930=>1000,24931=>1000,24932=>1000,
-	24933=>1000,24934=>1000,24935=>1000,24936=>1000,24937=>1000,24938=>1000,24939=>1000,24940=>1000,24941=>1000,24942=>1000,24943=>1000,24944=>1000,24945=>1000,24946=>1000,24947=>1000,24948=>1000,
-	24949=>1000,24950=>1000,24951=>1000,24952=>1000,24953=>1000,24954=>1000,24955=>1000,24956=>1000,24957=>1000,24958=>1000,24959=>1000,24960=>1000,24961=>1001,24962=>1000,24963=>1000,24964=>1000,
-	24965=>1000,24966=>1000,24967=>1000,24968=>1000,24969=>1000,24970=>1000,24971=>1000,24972=>1000,24973=>1000,24974=>1000,24975=>1000,24976=>1000,24977=>1000,24978=>1000,24979=>1000,24980=>1000,
-	24981=>1000,24982=>1000,24983=>1000,24984=>1000,24985=>1000,24986=>1000,24987=>1000,24988=>1000,24989=>1000,24990=>1000,24991=>1000,24992=>1000,24993=>1000,24994=>1000,24995=>1000,24996=>1000,
-	24997=>1000,24998=>1000,24999=>1000,25000=>1000,25001=>1000,25002=>1000,25003=>1000,25004=>1000,25005=>1000,25006=>1000,25007=>1000,25008=>1000,25009=>1000,25010=>1000,25011=>1000,25012=>1000,
-	25013=>1000,25014=>1000,25015=>1000,25016=>1000,25017=>1000,25018=>1000,25019=>1000,25020=>1000,25021=>1000,25022=>1000,25023=>1000,25024=>1000,25025=>1000,25026=>1000,25027=>1000,25028=>1000,
-	25029=>1000,25030=>1000,25031=>1000,25032=>1000,25033=>1000,25034=>1000,25035=>1000,25036=>1000,25037=>1000,25038=>1000,25039=>1000,25040=>1000,25041=>1000,25042=>1000,25043=>1000,25044=>1000,
-	25045=>1000,25046=>1000,25047=>1000,25048=>1000,25049=>1000,25050=>1000,25051=>1000,25052=>1000,25053=>1000,25054=>1000,25055=>1000,25056=>1000,25057=>1000,25058=>1000,25059=>1000,25060=>1000,
-	25061=>1000,25062=>1000,25063=>1000,25064=>1000,25065=>1000,25066=>1000,25067=>1000,25068=>1000,25069=>1000,25070=>1000,25071=>1000,25072=>1000,25073=>1000,25074=>1000,25075=>1000,25076=>1000,
-	25077=>1000,25078=>1000,25079=>1000,25080=>1000,25081=>1000,25082=>1000,25083=>1000,25084=>1000,25085=>1000,25086=>1000,25087=>1000,25088=>1000,25089=>1000,25090=>1000,25091=>1000,25092=>1000,
-	25093=>1000,25094=>1000,25095=>1000,25096=>1000,25097=>1000,25098=>1000,25099=>1000,25100=>1000,25101=>1000,25102=>1000,25103=>1000,25104=>1000,25105=>1000,25106=>1000,25107=>1000,25108=>1000,
-	25109=>1000,25110=>1000,25111=>1000,25112=>1000,25113=>1000,25114=>1000,25115=>1000,25116=>1000,25117=>1000,25118=>1000,25119=>1000,25120=>1000,25121=>1000,25122=>1000,25123=>1000,25124=>1000,
-	25125=>1000,25126=>1000,25127=>1000,25128=>1000,25129=>1000,25130=>1000,25131=>1000,25132=>1000,25133=>1000,25134=>1000,25135=>1000,25136=>1000,25137=>1000,25138=>1000,25139=>1000,25140=>1000,
-	25141=>1000,25142=>1000,25143=>1000,25144=>1000,25145=>1000,25146=>1000,25147=>1000,25148=>1000,25149=>1000,25150=>1000,25151=>1000,25152=>1000,25153=>1000,25154=>1000,25155=>1000,25156=>1000,
-	25157=>1000,25158=>1000,25159=>1000,25160=>1000,25161=>1000,25162=>1000,25163=>1000,25164=>1000,25165=>1000,25166=>1000,25167=>1000,25168=>1000,25169=>1000,25170=>1000,25171=>1000,25172=>1000,
-	25173=>1000,25174=>1000,25175=>1000,25176=>1000,25177=>1000,25178=>1000,25179=>1000,25180=>1000,25181=>1000,25182=>1000,25183=>1000,25184=>1000,25185=>1000,25186=>1000,25187=>1000,25188=>1000,
-	25189=>1000,25190=>1000,25191=>1000,25192=>1000,25193=>1000,25194=>1000,25195=>1000,25196=>1000,25197=>1000,25198=>1000,25199=>1000,25200=>1000,25201=>1000,25202=>1000,25203=>1000,25204=>1000,
-	25205=>1000,25206=>1000,25207=>1000,25208=>1000,25209=>1000,25210=>1000,25211=>1000,25212=>1000,25213=>1000,25214=>1000,25215=>1000,25216=>1000,25217=>1000,25218=>1000,25219=>1000,25220=>1000,
-	25221=>1000,25222=>1000,25223=>1000,25224=>1000,25225=>1000,25226=>1000,25227=>1000,25228=>1000,25229=>1000,25230=>1000,25231=>1000,25232=>1000,25233=>1000,25234=>1000,25235=>1000,25236=>1000,
-	25237=>1000,25238=>1000,25239=>1000,25240=>1000,25241=>1000,25242=>1000,25243=>1000,25244=>1000,25245=>1000,25246=>1000,25247=>1000,25248=>1000,25249=>1000,25250=>1000,25251=>1000,25252=>1000,
-	25253=>1000,25254=>1000,25255=>1000,25256=>1000,25257=>1000,25258=>1000,25259=>1000,25260=>1000,25261=>1000,25262=>1000,25263=>1000,25264=>1000,25265=>1000,25266=>1000,25267=>1000,25268=>1000,
-	25269=>1000,25270=>1000,25271=>1000,25272=>1000,25273=>1000,25274=>1000,25275=>1000,25276=>1000,25277=>1000,25278=>1000,25279=>1000,25280=>1000,25281=>1000,25282=>1000,25283=>1000,25284=>1000,
-	25285=>1000,25286=>1000,25287=>1000,25288=>1000,25289=>1000,25290=>1000,25291=>1000,25292=>1000,25293=>1000,25294=>1000,25295=>1000,25296=>1000,25297=>1000,25298=>1000,25299=>1000,25300=>1000,
-	25301=>1000,25302=>1000,25303=>1000,25304=>1000,25305=>1000,25306=>1000,25307=>1000,25308=>1000,25309=>1000,25310=>1000,25311=>1000,25312=>1000,25313=>1000,25314=>1000,25315=>1000,25316=>1000,
-	25317=>1000,25318=>1000,25319=>1000,25320=>1000,25321=>1000,25322=>1000,25323=>1000,25324=>1000,25325=>1000,25326=>1000,25327=>1000,25328=>1000,25329=>1000,25330=>1000,25331=>1000,25332=>1000,
-	25333=>1000,25334=>1000,25335=>1000,25336=>1000,25337=>1000,25338=>1000,25339=>1000,25340=>1000,25341=>1000,25342=>1000,25343=>1000,25344=>1000,25345=>1000,25346=>1000,25347=>1000,25348=>1000,
-	25349=>1000,25350=>1000,25351=>1000,25352=>1000,25353=>1000,25354=>1000,25355=>1000,25356=>1000,25357=>1000,25358=>1000,25359=>1000,25360=>1000,25361=>1000,25362=>1000,25363=>1000,25364=>1000,
-	25365=>1000,25366=>1000,25367=>1000,25368=>1000,25369=>1000,25370=>1000,25371=>1000,25372=>1000,25373=>1000,25374=>1000,25375=>1000,25376=>1000,25377=>1000,25378=>1000,25379=>1000,25380=>1000,
-	25381=>1000,25382=>1000,25383=>1000,25384=>1000,25385=>1000,25386=>1000,25387=>1000,25388=>1000,25389=>1000,25390=>1000,25391=>1000,25392=>1000,25393=>1000,25394=>1000,25395=>1000,25396=>1000,
-	25397=>1000,25398=>1000,25399=>1000,25400=>1000,25401=>1000,25402=>1000,25403=>1000,25404=>1000,25405=>1000,25406=>1000,25407=>1000,25408=>1000,25409=>1000,25410=>1000,25411=>1000,25412=>1000,
-	25413=>1000,25414=>1000,25415=>1000,25416=>1000,25417=>1000,25418=>1000,25419=>1000,25420=>1000,25421=>1000,25422=>1000,25423=>1000,25424=>1000,25425=>1000,25426=>1000,25427=>1000,25428=>1000,
-	25429=>1000,25430=>1000,25431=>1000,25432=>1000,25433=>1000,25434=>1000,25435=>1000,25436=>1000,25437=>1000,25438=>1000,25439=>1000,25440=>1000,25441=>1000,25442=>1000,25443=>1000,25444=>1000,
-	25445=>1000,25446=>1000,25447=>1000,25448=>1000,25449=>1000,25450=>1000,25451=>1000,25452=>1000,25453=>1000,25454=>1000,25455=>1000,25456=>1000,25457=>1000,25458=>1000,25459=>1000,25460=>1000,
-	25461=>1000,25462=>1000,25463=>1000,25464=>1000,25465=>1000,25466=>1000,25467=>1000,25468=>1000,25469=>1000,25470=>1000,25471=>1000,25472=>1000,25473=>1000,25474=>1000,25475=>1000,25476=>1000,
-	25477=>1000,25478=>1000,25479=>1000,25480=>1000,25481=>1000,25482=>1000,25483=>1000,25484=>1000,25485=>1000,25486=>1000,25487=>1000,25488=>1000,25489=>1000,25490=>1000,25491=>1000,25492=>1000,
-	25493=>1000,25494=>1000,25495=>1000,25496=>1000,25497=>1000,25498=>1000,25499=>1000,25500=>1000,25501=>1000,25502=>1000,25503=>1000,25504=>1000,25505=>1000,25506=>1000,25507=>1000,25508=>1000,
-	25509=>1000,25510=>1000,25511=>1000,25512=>1000,25513=>1000,25514=>1000,25515=>1000,25516=>1000,25517=>1000,25518=>1000,25519=>1000,25520=>1000,25521=>1000,25522=>1000,25523=>1000,25524=>1000,
-	25525=>1000,25526=>1000,25527=>1000,25528=>1000,25529=>1000,25530=>1000,25531=>1000,25532=>1000,25533=>1000,25534=>1000,25535=>1000,25536=>1000,25537=>1000,25538=>1000,25539=>1000,25540=>1000,
-	25541=>1000,25542=>1000,25543=>1000,25544=>1000,25545=>1000,25546=>1000,25547=>1000,25548=>1000,25549=>1000,25550=>1000,25551=>1000,25552=>1000,25553=>1000,25554=>1000,25555=>1000,25556=>1000,
-	25557=>1000,25558=>1000,25559=>1000,25560=>1000,25561=>1000,25562=>1000,25563=>1000,25564=>1000,25565=>1000,25566=>1000,25567=>1000,25568=>1000,25569=>1000,25570=>1000,25571=>1000,25572=>1000,
-	25573=>1000,25574=>1000,25575=>1000,25576=>1000,25577=>1000,25578=>1000,25579=>1000,25580=>1000,25581=>1000,25582=>1000,25583=>1000,25584=>1000,25585=>1000,25586=>1000,25587=>1000,25588=>1000,
-	25589=>1000,25590=>1000,25591=>1000,25592=>1000,25593=>1000,25594=>1000,25595=>1000,25596=>1000,25597=>1000,25598=>1000,25599=>1000,25600=>1000,25601=>1000,25602=>1000,25603=>1000,25604=>1000,
-	25605=>1000,25606=>1000,25607=>1000,25608=>1000,25609=>1000,25610=>1000,25611=>1000,25612=>1000,25613=>1000,25614=>1000,25615=>1000,25616=>1000,25617=>1000,25618=>1000,25619=>1000,25620=>1000,
-	25621=>1000,25622=>1000,25623=>1000,25624=>1000,25625=>1000,25626=>1000,25627=>1000,25628=>1000,25629=>1000,25630=>1000,25631=>1000,25632=>1000,25633=>1000,25634=>1000,25635=>1000,25636=>1000,
-	25637=>1000,25638=>1000,25639=>1000,25640=>1000,25641=>1000,25642=>1000,25643=>1000,25644=>1000,25645=>1000,25646=>1000,25647=>1000,25648=>1000,25649=>1000,25650=>1000,25651=>1000,25652=>1000,
-	25653=>1000,25654=>1000,25655=>1000,25656=>1000,25657=>1000,25658=>1000,25659=>1000,25660=>1000,25661=>1000,25662=>1000,25663=>1000,25664=>1000,25665=>1000,25666=>1000,25667=>1000,25668=>1000,
-	25669=>1000,25670=>1000,25671=>1000,25672=>1000,25673=>1000,25674=>1000,25675=>1000,25676=>1000,25677=>1000,25678=>1000,25679=>1000,25680=>1000,25681=>1000,25682=>1000,25683=>1000,25684=>1000,
-	25685=>1000,25686=>1000,25687=>1000,25688=>1000,25689=>1000,25690=>1000,25691=>1000,25692=>1000,25693=>1000,25694=>1000,25695=>1000,25696=>1000,25697=>1000,25698=>1000,25699=>1000,25700=>1000,
-	25701=>1000,25702=>1000,25703=>1000,25704=>1000,25705=>1000,25706=>1000,25707=>1000,25708=>1000,25709=>1000,25710=>1000,25711=>1000,25712=>1000,25713=>1000,25714=>1000,25715=>1000,25716=>1000,
-	25717=>1000,25718=>1000,25719=>1000,25720=>1000,25721=>1000,25722=>1000,25723=>1000,25724=>1000,25725=>1000,25726=>1000,25727=>1000,25728=>1000,25729=>1000,25730=>1000,25731=>1000,25732=>1000,
-	25733=>1000,25734=>1000,25735=>1000,25736=>1000,25737=>1000,25738=>1000,25739=>1000,25740=>1000,25741=>1000,25742=>1000,25743=>1000,25744=>1000,25745=>1000,25746=>1000,25747=>1000,25748=>1000,
-	25749=>1000,25750=>1000,25751=>1000,25752=>1000,25753=>1000,25754=>1000,25755=>1000,25756=>1000,25757=>1000,25758=>1000,25759=>1000,25760=>1000,25761=>1000,25762=>1000,25763=>1000,25764=>1000,
-	25765=>1000,25766=>1000,25767=>1000,25768=>1000,25769=>1000,25770=>1000,25771=>1000,25772=>1000,25773=>1000,25774=>1000,25775=>1000,25776=>1000,25777=>1000,25778=>1000,25779=>1000,25780=>1000,
-	25781=>1000,25782=>1000,25783=>1000,25784=>1000,25785=>1000,25786=>1000,25787=>1000,25788=>1000,25789=>1000,25790=>1000,25791=>1000,25792=>1000,25793=>1000,25794=>1000,25795=>1000,25796=>1000,
-	25797=>1000,25798=>1000,25799=>1000,25800=>1000,25801=>1000,25802=>1000,25803=>1000,25804=>1000,25805=>1000,25806=>1000,25807=>1000,25808=>1000,25809=>1000,25810=>1000,25811=>1000,25812=>1000,
-	25813=>1000,25814=>1000,25815=>1000,25816=>1000,25817=>1000,25818=>1000,25819=>1000,25820=>1000,25821=>1000,25822=>1000,25823=>1000,25824=>1000,25825=>1000,25826=>1000,25827=>1000,25828=>1000,
-	25829=>1000,25830=>1000,25831=>1000,25832=>1000,25833=>1000,25834=>1000,25835=>1000,25836=>1000,25837=>1000,25838=>1000,25839=>1000,25840=>1000,25841=>1000,25842=>1000,25843=>1000,25844=>1000,
-	25845=>1000,25846=>1000,25847=>1000,25848=>1000,25849=>1000,25850=>1000,25851=>1000,25852=>1000,25853=>1000,25854=>1000,25855=>1000,25856=>1000,25857=>1000,25858=>1000,25859=>1000,25860=>1000,
-	25861=>1000,25862=>1000,25863=>1000,25864=>1000,25865=>1000,25866=>1000,25867=>1000,25868=>1000,25869=>1000,25870=>1000,25871=>1000,25872=>1000,25873=>1000,25874=>1000,25875=>1000,25876=>1000,
-	25877=>1000,25878=>1000,25879=>1000,25880=>1000,25881=>1000,25882=>1000,25883=>1000,25884=>1000,25885=>1000,25886=>1000,25887=>1000,25888=>1000,25889=>1000,25890=>1000,25891=>1000,25892=>1000,
-	25893=>1000,25894=>1000,25895=>1000,25896=>1000,25897=>1000,25898=>1000,25899=>1000,25900=>1000,25901=>1000,25902=>1000,25903=>1000,25904=>1000,25905=>1000,25906=>1000,25907=>1000,25908=>1000,
-	25909=>1000,25910=>1000,25911=>1000,25912=>1000,25913=>1000,25914=>1000,25915=>1000,25916=>1000,25917=>1000,25918=>1000,25919=>1000,25920=>1000,25921=>1000,25922=>1000,25923=>1000,25924=>1000,
-	25925=>1000,25926=>1000,25927=>1000,25928=>1000,25929=>1000,25930=>1000,25931=>1000,25932=>1000,25933=>1000,25934=>1000,25935=>1000,25936=>1000,25937=>1000,25938=>1000,25939=>1000,25940=>1000,
-	25941=>1000,25942=>1000,25943=>1000,25944=>1000,25945=>1000,25946=>1000,25947=>1000,25948=>1000,25949=>1000,25950=>1000,25951=>1000,25952=>1000,25953=>1000,25954=>1000,25955=>1000,25956=>1000,
-	25957=>1000,25958=>1000,25959=>1000,25960=>1000,25961=>1000,25962=>1000,25963=>1000,25964=>1000,25965=>1000,25966=>1000,25967=>1000,25968=>1000,25969=>1000,25970=>1000,25971=>1000,25972=>1000,
-	25973=>1000,25974=>1000,25975=>1000,25976=>1000,25977=>1000,25978=>1000,25979=>1000,25980=>1000,25981=>1000,25982=>1000,25983=>1000,25984=>1000,25985=>1000,25986=>1000,25987=>1000,25988=>1000,
-	25989=>1000,25990=>1000,25991=>1000,25992=>1000,25993=>1000,25994=>1000,25995=>1000,25996=>1000,25997=>1000,25998=>1000,25999=>1000,26000=>1000,26001=>1000,26002=>1000,26003=>1000,26004=>1000,
-	26005=>1000,26006=>1000,26007=>1000,26008=>1000,26009=>1000,26010=>1000,26011=>1000,26012=>1000,26013=>1000,26014=>1000,26015=>1000,26016=>1000,26017=>1000,26018=>1000,26019=>1000,26020=>1000,
-	26021=>1000,26022=>1000,26023=>1000,26024=>1000,26025=>1000,26026=>1000,26027=>1000,26028=>1000,26029=>1000,26030=>1000,26031=>1000,26032=>1000,26033=>1000,26034=>1000,26035=>1000,26036=>1000,
-	26037=>1000,26038=>1000,26039=>1000,26040=>1000,26041=>1000,26042=>1000,26043=>1000,26044=>1000,26045=>1000,26046=>1000,26047=>1000,26048=>1000,26049=>1000,26050=>1000,26051=>1000,26052=>1000,
-	26053=>1000,26054=>1000,26055=>1000,26056=>1000,26057=>1000,26058=>1000,26059=>1000,26060=>1000,26061=>1000,26062=>1000,26063=>1000,26064=>1000,26065=>1000,26066=>1000,26067=>1000,26068=>1000,
-	26069=>1000,26070=>1000,26071=>1000,26072=>1000,26073=>1000,26074=>1000,26075=>1000,26076=>1000,26077=>1000,26078=>1000,26079=>1000,26080=>1000,26081=>1000,26082=>1000,26083=>1000,26084=>1000,
-	26085=>1000,26086=>1000,26087=>1000,26088=>1000,26089=>1000,26090=>1000,26091=>1000,26092=>1000,26093=>1000,26094=>1000,26095=>1000,26096=>1000,26097=>1000,26098=>1000,26099=>1000,26100=>1000,
-	26101=>1000,26102=>1000,26103=>1000,26104=>1000,26105=>1000,26106=>1000,26107=>1000,26108=>1000,26109=>1000,26110=>1000,26111=>1000,26112=>1000,26113=>1000,26114=>1000,26115=>1000,26116=>1000,
-	26117=>1000,26118=>1000,26119=>1000,26120=>1000,26121=>1000,26122=>1000,26123=>1000,26124=>1000,26125=>1000,26126=>1000,26127=>1000,26128=>1000,26129=>1000,26130=>1000,26131=>1000,26132=>1000,
-	26133=>1000,26134=>1000,26135=>1000,26136=>1000,26137=>1000,26138=>1000,26139=>1000,26140=>1000,26141=>1000,26142=>1000,26143=>1000,26144=>1000,26145=>1000,26146=>1000,26147=>1000,26148=>1000,
-	26149=>1000,26150=>1000,26151=>1000,26152=>1000,26153=>1000,26154=>1000,26155=>1000,26156=>1000,26157=>1000,26158=>1000,26159=>1000,26160=>1000,26161=>1000,26162=>1000,26163=>1000,26164=>1000,
-	26165=>1000,26166=>1000,26167=>1000,26168=>1000,26169=>1000,26170=>1000,26171=>1000,26172=>1000,26173=>1000,26174=>1000,26175=>1000,26176=>1000,26177=>1000,26178=>1000,26179=>1000,26180=>1000,
-	26181=>1000,26182=>1000,26183=>1000,26184=>1000,26185=>1000,26186=>1000,26187=>1000,26188=>1000,26189=>1000,26190=>1000,26191=>1000,26192=>1000,26193=>1000,26194=>1000,26195=>1000,26196=>1000,
-	26197=>1000,26198=>1000,26199=>1000,26200=>1000,26201=>1000,26202=>1000,26203=>1000,26204=>1000,26205=>1000,26206=>1000,26207=>1000,26208=>1000,26209=>1000,26210=>1000,26211=>1000,26212=>1000,
-	26213=>1000,26214=>1000,26215=>1000,26216=>1000,26217=>1000,26218=>1000,26219=>1000,26220=>1000,26221=>1000,26222=>1000,26223=>1000,26224=>1000,26225=>1000,26226=>1000,26227=>1000,26228=>1000,
-	26229=>1000,26230=>1000,26231=>1000,26232=>1000,26233=>1000,26234=>1000,26235=>1000,26236=>1000,26237=>1000,26238=>1000,26239=>1000,26240=>1000,26241=>1000,26242=>1000,26243=>1000,26244=>1000,
-	26245=>1000,26246=>1000,26247=>1000,26248=>1000,26249=>1000,26250=>1000,26251=>1000,26252=>1000,26253=>1000,26254=>1000,26255=>1000,26256=>1000,26257=>1000,26258=>1000,26259=>1000,26260=>1000,
-	26261=>1000,26262=>1000,26263=>1000,26264=>1000,26265=>1000,26266=>1000,26267=>1000,26268=>1000,26269=>1000,26270=>1000,26271=>1000,26272=>1000,26273=>1000,26274=>1000,26275=>1000,26276=>1000,
-	26277=>1000,26278=>1000,26279=>1000,26280=>1000,26281=>1000,26282=>1000,26283=>1000,26284=>1000,26285=>1000,26286=>1000,26287=>1000,26288=>1000,26289=>1000,26290=>1000,26291=>1000,26292=>1000,
-	26293=>1000,26294=>1000,26295=>1000,26296=>1000,26297=>1000,26298=>1000,26299=>1000,26300=>1000,26301=>1000,26302=>1000,26303=>1000,26304=>1000,26305=>1000,26306=>1000,26307=>1000,26308=>1000,
-	26309=>1000,26310=>1000,26311=>1000,26312=>1000,26313=>1000,26314=>1000,26315=>1000,26316=>1000,26317=>1000,26318=>1000,26319=>1000,26320=>1000,26321=>1000,26322=>1000,26323=>1000,26324=>1000,
-	26325=>1000,26326=>1000,26327=>1000,26328=>1000,26329=>1000,26330=>1000,26331=>1000,26332=>1000,26333=>1000,26334=>1000,26335=>1000,26336=>1000,26337=>1000,26338=>1000,26339=>1000,26340=>1000,
-	26341=>1000,26342=>1000,26343=>1000,26344=>1000,26345=>1000,26346=>1000,26347=>1000,26348=>1000,26349=>1000,26350=>1000,26351=>1000,26352=>1000,26353=>1000,26354=>1000,26355=>1000,26356=>1000,
-	26357=>1000,26358=>1000,26359=>1000,26360=>1000,26361=>1000,26362=>1000,26363=>1000,26364=>1000,26365=>1000,26366=>1000,26367=>1000,26368=>1000,26369=>1000,26370=>1000,26371=>1000,26372=>1000,
-	26373=>1000,26374=>1000,26375=>1000,26376=>1000,26377=>1000,26378=>1000,26379=>1000,26380=>1000,26381=>1000,26382=>1000,26383=>1000,26384=>1000,26385=>1000,26386=>1000,26387=>1000,26388=>1000,
-	26389=>1000,26390=>1000,26391=>1000,26392=>1000,26393=>1000,26394=>1000,26395=>1000,26396=>1000,26397=>1000,26398=>1000,26399=>1000,26400=>1000,26401=>1000,26402=>1000,26403=>1000,26404=>1000,
-	26405=>1000,26406=>1000,26407=>1000,26408=>1000,26409=>1000,26410=>1000,26411=>1000,26412=>1000,26413=>1000,26414=>1000,26415=>1000,26416=>1000,26417=>1000,26418=>1000,26419=>1000,26420=>1000,
-	26421=>1000,26422=>1000,26423=>1000,26424=>1000,26425=>1000,26426=>1000,26427=>1000,26428=>1000,26429=>1000,26430=>1000,26431=>1000,26432=>1000,26433=>1000,26434=>1000,26435=>1000,26436=>1000,
-	26437=>1000,26438=>1000,26439=>1000,26440=>1000,26441=>1000,26442=>1000,26443=>1000,26444=>1000,26445=>1000,26446=>1000,26447=>1000,26448=>1000,26449=>1000,26450=>1000,26451=>1000,26452=>1000,
-	26453=>1000,26454=>1000,26455=>1000,26456=>1000,26457=>1000,26458=>1000,26459=>1000,26460=>1000,26461=>1000,26462=>1000,26463=>1000,26464=>1000,26465=>1000,26466=>1000,26467=>1000,26468=>1000,
-	26469=>1000,26470=>1000,26471=>1000,26472=>1000,26473=>1000,26474=>1000,26475=>1000,26476=>1000,26477=>1000,26478=>1000,26479=>1000,26480=>1000,26481=>1000,26482=>1000,26483=>1000,26484=>1000,
-	26485=>1000,26486=>1000,26487=>1000,26488=>1000,26489=>1000,26490=>1000,26491=>1000,26492=>1000,26493=>1000,26494=>1000,26495=>1000,26496=>1000,26497=>1000,26498=>1000,26499=>1000,26500=>1000,
-	26501=>1000,26502=>1000,26503=>1000,26504=>1000,26505=>1000,26506=>1000,26507=>1000,26508=>1000,26509=>1000,26510=>1000,26511=>1000,26512=>1000,26513=>1000,26514=>1000,26515=>1000,26516=>1000,
-	26517=>1000,26518=>1000,26519=>1000,26520=>1000,26521=>1000,26522=>1000,26523=>1000,26524=>1000,26525=>1000,26526=>1000,26527=>1000,26528=>1000,26529=>1000,26530=>1000,26531=>1000,26532=>1000,
-	26533=>1000,26534=>1000,26535=>1000,26536=>1000,26537=>1000,26538=>1000,26539=>1000,26540=>1000,26541=>1000,26542=>1000,26543=>1000,26544=>1000,26545=>1000,26546=>1000,26547=>1000,26548=>1000,
-	26549=>1000,26550=>1000,26551=>1000,26552=>1000,26553=>1000,26554=>1000,26555=>1000,26556=>1000,26557=>1000,26558=>1000,26559=>1000,26560=>1000,26561=>1000,26562=>1000,26563=>1000,26564=>1000,
-	26565=>1000,26566=>1000,26567=>1000,26568=>1000,26569=>1000,26570=>1000,26571=>1000,26572=>1000,26573=>1000,26574=>1000,26575=>1000,26576=>1000,26577=>1000,26578=>1000,26579=>1000,26580=>1000,
-	26581=>1000,26582=>1000,26583=>1000,26584=>1000,26585=>1000,26586=>1000,26587=>1000,26588=>1000,26589=>1000,26590=>1000,26591=>1000,26592=>1000,26593=>1000,26594=>1000,26595=>1000,26596=>1000,
-	26597=>1000,26598=>1000,26599=>1000,26600=>1000,26601=>1000,26602=>1000,26603=>1000,26604=>1000,26605=>1000,26606=>1000,26607=>1000,26608=>1000,26609=>1000,26610=>1000,26611=>1000,26612=>1000,
-	26613=>1000,26614=>1000,26615=>1000,26616=>1000,26617=>1000,26618=>1000,26619=>1000,26620=>1000,26621=>1000,26622=>1000,26623=>1000,26624=>1000,26625=>1000,26626=>1000,26627=>1000,26628=>1000,
-	26629=>1000,26630=>1000,26631=>1000,26632=>1000,26633=>1000,26634=>1000,26635=>1000,26636=>1000,26637=>1000,26638=>1000,26639=>1000,26640=>1000,26641=>1000,26642=>1000,26643=>1000,26644=>1000,
-	26645=>1000,26646=>1000,26647=>1000,26648=>1000,26649=>1000,26650=>1000,26651=>1000,26652=>1000,26653=>1000,26654=>1000,26655=>1000,26656=>1000,26657=>1000,26658=>1000,26659=>1000,26660=>1000,
-	26661=>1000,26662=>1000,26663=>1000,26664=>1000,26665=>1000,26666=>1000,26667=>1000,26668=>1000,26669=>1000,26670=>1000,26671=>1000,26672=>1000,26673=>1000,26674=>1000,26675=>1000,26676=>1000,
-	26677=>1000,26678=>1000,26679=>1000,26680=>1000,26681=>1000,26682=>1000,26683=>1000,26684=>1000,26685=>1000,26686=>1000,26687=>1000,26688=>1000,26689=>1000,26690=>1000,26691=>1000,26692=>1000,
-	26693=>1000,26694=>1000,26695=>1000,26696=>1000,26697=>1000,26698=>1000,26699=>1000,26700=>1000,26701=>1000,26702=>1000,26703=>1000,26704=>1000,26705=>1000,26706=>1000,26707=>1000,26708=>1000,
-	26709=>1000,26710=>1000,26711=>1000,26712=>1000,26713=>1000,26714=>1000,26715=>1000,26716=>1000,26717=>1000,26718=>1000,26719=>1000,26720=>1000,26721=>1000,26722=>1000,26723=>1000,26724=>1000,
-	26725=>1000,26726=>1000,26727=>1000,26728=>1000,26729=>1000,26730=>1000,26731=>1000,26732=>1000,26733=>1000,26734=>1000,26735=>1000,26736=>1000,26737=>1000,26738=>1000,26739=>1000,26740=>1000,
-	26741=>1000,26742=>1000,26743=>1000,26744=>1000,26745=>1000,26746=>1000,26747=>1000,26748=>1000,26749=>1000,26750=>1000,26751=>1000,26752=>1000,26753=>1000,26754=>1000,26755=>1000,26756=>1000,
-	26757=>1000,26758=>1000,26759=>1000,26760=>1000,26761=>1000,26762=>1000,26763=>1000,26764=>1000,26765=>1000,26766=>1000,26767=>1000,26768=>1000,26769=>1000,26770=>1000,26771=>1000,26772=>1000,
-	26773=>1000,26774=>1000,26775=>1000,26776=>1000,26777=>1000,26778=>1000,26779=>1000,26780=>1000,26781=>1000,26782=>1000,26783=>1000,26784=>1000,26785=>1000,26786=>1000,26787=>1000,26788=>1000,
-	26789=>1000,26790=>1000,26791=>1000,26792=>1000,26793=>1000,26794=>1000,26795=>1000,26796=>1000,26797=>1000,26798=>1000,26799=>1000,26800=>1000,26801=>1000,26802=>1000,26803=>1000,26804=>1000,
-	26805=>1000,26806=>1000,26807=>1000,26808=>1000,26809=>1000,26810=>1000,26811=>1000,26812=>1000,26813=>1000,26814=>1000,26815=>1000,26816=>1000,26817=>1000,26818=>1000,26819=>1000,26820=>1000,
-	26821=>1000,26822=>1000,26823=>1000,26824=>1000,26825=>1000,26826=>1000,26827=>1000,26828=>1000,26829=>1000,26830=>1000,26831=>1000,26832=>1000,26833=>1000,26834=>1000,26835=>1000,26836=>1000,
-	26837=>1000,26838=>1000,26839=>1000,26840=>1000,26841=>1000,26842=>1000,26843=>1000,26844=>1000,26845=>1000,26846=>1000,26847=>1000,26848=>1000,26849=>1000,26850=>1000,26851=>1000,26852=>1000,
-	26853=>1000,26854=>1000,26855=>1000,26856=>1000,26857=>1000,26858=>1000,26859=>1000,26860=>1000,26861=>1000,26862=>1000,26863=>1000,26864=>1000,26865=>1000,26866=>1000,26867=>1000,26868=>1000,
-	26869=>1000,26870=>1000,26871=>1000,26872=>1000,26873=>1000,26874=>1000,26875=>1000,26876=>1000,26877=>1000,26878=>1000,26879=>1000,26880=>1000,26881=>1000,26882=>1000,26883=>1000,26884=>1000,
-	26885=>1000,26886=>1000,26887=>1000,26888=>1000,26889=>1000,26890=>1000,26891=>1000,26892=>1000,26893=>1000,26894=>1000,26895=>1000,26896=>1000,26897=>1000,26898=>1000,26899=>1000,26900=>1000,
-	26901=>1000,26902=>1000,26903=>1000,26904=>1000,26905=>1000,26906=>1000,26907=>1000,26908=>1000,26909=>1000,26910=>1000,26911=>1000,26912=>1000,26913=>1000,26914=>1000,26915=>1000,26916=>1000,
-	26917=>1000,26918=>1000,26919=>1000,26920=>1000,26921=>1000,26922=>1000,26923=>1000,26924=>1000,26925=>1000,26926=>1000,26927=>1000,26928=>1000,26929=>1000,26930=>1000,26931=>1000,26932=>1000,
-	26933=>1000,26934=>1000,26935=>1000,26936=>1000,26937=>1000,26938=>1000,26939=>1000,26940=>1000,26941=>1000,26942=>1000,26943=>1000,26944=>1000,26945=>1000,26946=>1000,26947=>1000,26948=>1000,
-	26949=>1000,26950=>1000,26951=>1000,26952=>1000,26953=>1000,26954=>1000,26955=>1000,26956=>1000,26957=>1000,26958=>1000,26959=>1000,26960=>1000,26961=>1000,26962=>1000,26963=>1000,26964=>1000,
-	26965=>1000,26966=>1000,26967=>1000,26968=>1000,26969=>1000,26970=>1000,26971=>1000,26972=>1000,26973=>1000,26974=>1000,26975=>1000,26976=>1000,26977=>1000,26978=>1000,26979=>1000,26980=>1000,
-	26981=>1000,26982=>1000,26983=>1000,26984=>1000,26985=>1000,26986=>1000,26987=>1000,26988=>1000,26989=>1000,26990=>1000,26991=>1000,26992=>1000,26993=>1000,26994=>1000,26995=>1000,26996=>1000,
-	26997=>1000,26998=>1000,26999=>1000,27000=>1000,27001=>1000,27002=>1000,27003=>1000,27004=>1000,27005=>1000,27006=>1000,27007=>1000,27008=>1000,27009=>1000,27010=>1000,27011=>1000,27012=>1000,
-	27013=>1000,27014=>1000,27015=>1000,27016=>1000,27017=>1000,27018=>1000,27019=>1000,27020=>1000,27021=>1000,27022=>1000,27023=>1000,27024=>1000,27025=>1000,27026=>1000,27027=>1000,27028=>1000,
-	27029=>1000,27030=>1000,27031=>1000,27032=>1000,27033=>1000,27034=>1000,27035=>1000,27036=>1000,27037=>1000,27038=>1000,27039=>1000,27040=>1000,27041=>1000,27042=>1000,27043=>1000,27044=>1000,
-	27045=>1000,27046=>1000,27047=>1000,27048=>1000,27049=>1000,27050=>1000,27051=>1000,27052=>1000,27053=>1000,27054=>1000,27055=>1000,27056=>1000,27057=>1000,27058=>1000,27059=>1000,27060=>1000,
-	27061=>1000,27062=>1000,27063=>1000,27064=>1000,27065=>1000,27066=>1000,27067=>1000,27068=>1000,27069=>1000,27070=>1000,27071=>1000,27072=>1000,27073=>1000,27074=>1000,27075=>1000,27076=>1000,
-	27077=>1000,27078=>1000,27079=>1000,27080=>1000,27081=>1000,27082=>1000,27083=>1000,27084=>1000,27085=>1000,27086=>1000,27087=>1000,27088=>1000,27089=>1000,27090=>1000,27091=>1000,27092=>1000,
-	27093=>1000,27094=>1000,27095=>1000,27096=>1000,27097=>1000,27098=>1000,27099=>1000,27100=>1000,27101=>1000,27102=>1000,27103=>1000,27104=>1000,27105=>1000,27106=>1000,27107=>1000,27108=>1000,
-	27109=>1000,27110=>1000,27111=>1000,27112=>1000,27113=>1000,27114=>1000,27115=>1000,27116=>1000,27117=>1000,27118=>1000,27119=>1000,27120=>1000,27121=>1000,27122=>1000,27123=>1000,27124=>1000,
-	27125=>1000,27126=>1000,27127=>1000,27128=>1000,27129=>1000,27130=>1000,27131=>1000,27132=>1000,27133=>1000,27134=>1000,27135=>1000,27136=>1000,27137=>1000,27138=>1000,27139=>1000,27140=>1000,
-	27141=>1000,27142=>1000,27143=>1000,27144=>1000,27145=>1000,27146=>1000,27147=>1000,27148=>1000,27149=>1000,27150=>1000,27151=>1000,27152=>1000,27153=>1000,27154=>1000,27155=>1000,27156=>1000,
-	27157=>1000,27158=>1000,27159=>1000,27160=>1000,27161=>1000,27162=>1000,27163=>1000,27164=>1000,27165=>1000,27166=>1000,27167=>1000,27168=>1000,27169=>1000,27170=>1000,27171=>1000,27172=>1000,
-	27173=>1000,27174=>1000,27175=>1000,27176=>1000,27177=>1000,27178=>1000,27179=>1000,27180=>1000,27181=>1000,27182=>1000,27183=>1000,27184=>1000,27185=>1000,27186=>1000,27187=>1000,27188=>1000,
-	27189=>1000,27190=>1000,27191=>1000,27192=>1000,27193=>1000,27194=>1000,27195=>1000,27196=>1000,27197=>1000,27198=>1000,27199=>1000,27200=>1000,27201=>1000,27202=>1000,27203=>1000,27204=>1000,
-	27205=>1000,27206=>1000,27207=>1000,27208=>1000,27209=>1000,27210=>1000,27211=>1000,27212=>1000,27213=>1000,27214=>1000,27215=>1000,27216=>1000,27217=>1000,27218=>1000,27219=>1000,27220=>1000,
-	27221=>1000,27222=>1000,27223=>1000,27224=>1000,27225=>1000,27226=>1000,27227=>1000,27228=>1000,27229=>1000,27230=>1000,27231=>1000,27232=>1000,27233=>1000,27234=>1000,27235=>1000,27236=>1000,
-	27237=>1000,27238=>1000,27239=>1000,27240=>1000,27241=>1000,27242=>1000,27243=>1000,27244=>1000,27245=>1000,27246=>1000,27247=>1000,27248=>1000,27249=>1000,27250=>1000,27251=>1000,27252=>1000,
-	27253=>1000,27254=>1000,27255=>1000,27256=>1000,27257=>1000,27258=>1000,27259=>1000,27260=>1000,27261=>1000,27262=>1000,27263=>1000,27264=>1000,27265=>1000,27266=>1000,27267=>1000,27268=>1000,
-	27269=>1000,27270=>1000,27271=>1000,27272=>1000,27273=>1000,27274=>1000,27275=>1000,27276=>1000,27277=>1000,27278=>1000,27279=>1000,27280=>1000,27281=>1000,27282=>1000,27283=>1000,27284=>1000,
-	27285=>1000,27286=>1000,27287=>1000,27288=>1000,27289=>1000,27290=>1000,27291=>1000,27292=>1000,27293=>1000,27294=>1000,27295=>1000,27296=>1000,27297=>1000,27298=>1000,27299=>1000,27300=>1000,
-	27301=>1000,27302=>1000,27303=>1000,27304=>1000,27305=>1000,27306=>1000,27307=>1000,27308=>1000,27309=>1000,27310=>1000,27311=>1000,27312=>1000,27313=>1000,27314=>1000,27315=>1000,27316=>1000,
-	27317=>1000,27318=>1000,27319=>1000,27320=>1000,27321=>1000,27322=>1000,27323=>1000,27324=>1000,27325=>1000,27326=>1000,27327=>1000,27328=>1000,27329=>1000,27330=>1000,27331=>1000,27332=>1000,
-	27333=>1000,27334=>1000,27335=>1000,27336=>1000,27337=>1000,27338=>1000,27339=>1000,27340=>1000,27341=>1000,27342=>1000,27343=>1000,27344=>1000,27345=>1000,27346=>1000,27347=>1000,27348=>1000,
-	27349=>1000,27350=>1000,27351=>1000,27352=>1000,27353=>1000,27354=>1000,27355=>1000,27356=>1000,27357=>1000,27358=>1000,27359=>1000,27360=>1000,27361=>1000,27362=>1000,27363=>1000,27364=>1000,
-	27365=>1000,27366=>1000,27367=>1000,27368=>1000,27369=>1000,27370=>1000,27371=>1000,27372=>1000,27373=>1000,27374=>1000,27375=>1000,27376=>1000,27377=>1000,27378=>1000,27379=>1000,27380=>1000,
-	27381=>1000,27382=>1000,27383=>1000,27384=>1000,27385=>1000,27386=>1000,27387=>1000,27388=>1000,27389=>1000,27390=>1000,27391=>1000,27392=>1000,27393=>1000,27394=>1000,27395=>1000,27396=>1000,
-	27397=>1000,27398=>1000,27399=>1000,27400=>1000,27401=>1000,27402=>1000,27403=>1000,27404=>1000,27405=>1000,27406=>1000,27407=>1000,27408=>1000,27409=>1000,27410=>1000,27411=>1000,27412=>1000,
-	27413=>1000,27414=>1000,27415=>1000,27416=>1000,27417=>1000,27418=>1000,27419=>1000,27420=>1000,27421=>1000,27422=>1000,27423=>1000,27424=>1000,27425=>1000,27426=>1000,27427=>1000,27428=>1000,
-	27429=>1000,27430=>1000,27431=>1000,27432=>1000,27433=>1000,27434=>1000,27435=>1000,27436=>1000,27437=>1000,27438=>1000,27439=>1000,27440=>1000,27441=>1000,27442=>1000,27443=>1000,27444=>1000,
-	27445=>1000,27446=>1000,27447=>1000,27448=>1000,27449=>1000,27450=>1000,27451=>1000,27452=>1000,27453=>1000,27454=>1000,27455=>1000,27456=>1000,27457=>1000,27458=>1000,27459=>1000,27460=>1000,
-	27461=>1000,27462=>1000,27463=>1000,27464=>1000,27465=>1000,27466=>1000,27467=>1000,27468=>1000,27469=>1000,27470=>1000,27471=>1000,27472=>1000,27473=>1000,27474=>1000,27475=>1000,27476=>1000,
-	27477=>1000,27478=>1000,27479=>1000,27480=>1000,27481=>1000,27482=>1000,27483=>1000,27484=>1000,27485=>1000,27486=>1000,27487=>1000,27488=>1000,27489=>1000,27490=>1000,27491=>1000,27492=>1000,
-	27493=>1000,27494=>1000,27495=>1000,27496=>1000,27497=>1000,27498=>1000,27499=>1000,27500=>1000,27501=>1000,27502=>1000,27503=>1000,27504=>1000,27505=>1000,27506=>1000,27507=>1000,27508=>1000,
-	27509=>1000,27510=>1000,27511=>1000,27512=>1000,27513=>1000,27514=>1000,27515=>1000,27516=>1000,27517=>1000,27518=>1000,27519=>1000,27520=>1000,27521=>1000,27522=>1000,27523=>1000,27524=>1000,
-	27525=>1000,27526=>1000,27527=>1000,27528=>1000,27529=>1000,27530=>1000,27531=>1000,27532=>1000,27533=>1000,27534=>1000,27535=>1000,27536=>1000,27537=>1000,27538=>1000,27539=>1000,27540=>1000,
-	27541=>1000,27542=>1000,27543=>1000,27544=>1000,27545=>1000,27546=>1000,27547=>1000,27548=>1000,27549=>1000,27550=>1000,27551=>1000,27552=>1000,27553=>1000,27554=>1000,27555=>1000,27556=>1000,
-	27557=>1000,27558=>1000,27559=>1000,27560=>1000,27561=>1000,27562=>1000,27563=>1000,27564=>1000,27565=>1000,27566=>1000,27567=>1000,27568=>1000,27569=>1000,27570=>1000,27571=>1000,27572=>1000,
-	27573=>1000,27574=>1000,27575=>1000,27576=>1000,27577=>1000,27578=>1000,27579=>1000,27580=>1000,27581=>1000,27582=>1000,27583=>1000,27584=>1000,27585=>1000,27586=>1000,27587=>1000,27588=>1000,
-	27589=>1000,27590=>1000,27591=>1000,27592=>1000,27593=>1000,27594=>1000,27595=>1000,27596=>1000,27597=>1000,27598=>1000,27599=>1000,27600=>1000,27601=>1000,27602=>1000,27603=>1000,27604=>1000,
-	27605=>1000,27606=>1000,27607=>1000,27608=>1000,27609=>1000,27610=>1000,27611=>1000,27612=>1000,27613=>1000,27614=>1000,27615=>1000,27616=>1000,27617=>1000,27618=>1000,27619=>1000,27620=>1000,
-	27621=>1000,27622=>1000,27623=>1000,27624=>1000,27625=>1000,27626=>1000,27627=>1000,27628=>1000,27629=>1000,27630=>1000,27631=>1000,27632=>1000,27633=>1000,27634=>1000,27635=>1000,27636=>1000,
-	27637=>1000,27638=>1000,27639=>1000,27640=>1000,27641=>1000,27642=>1000,27643=>1000,27644=>1000,27645=>1000,27646=>1000,27647=>1000,27648=>1000,27649=>1000,27650=>1000,27651=>1000,27652=>1000,
-	27653=>1000,27654=>1000,27655=>1000,27656=>1000,27657=>1000,27658=>1000,27659=>1000,27660=>1000,27661=>1000,27662=>1000,27663=>1000,27664=>1000,27665=>1000,27666=>1000,27667=>1000,27668=>1000,
-	27669=>1000,27670=>1000,27671=>1000,27672=>1000,27673=>1000,27674=>1000,27675=>1000,27676=>1000,27677=>1000,27678=>1000,27679=>1000,27680=>1000,27681=>1000,27682=>1000,27683=>1000,27684=>1000,
-	27685=>1000,27686=>1000,27687=>1000,27688=>1000,27689=>1000,27690=>1000,27691=>1000,27692=>1000,27693=>1000,27694=>1000,27695=>1000,27696=>1000,27697=>1000,27698=>1000,27699=>1000,27700=>1000,
-	27701=>1000,27702=>1000,27703=>1000,27704=>1000,27705=>1000,27706=>1000,27707=>1000,27708=>1000,27709=>1000,27710=>1000,27711=>1000,27712=>1000,27713=>1000,27714=>1000,27715=>1000,27716=>1000,
-	27717=>1000,27718=>1000,27719=>1000,27720=>1000,27721=>1000,27722=>1000,27723=>1000,27724=>1000,27725=>1000,27726=>1000,27727=>1000,27728=>1000,27729=>1000,27730=>1000,27731=>1000,27732=>1000,
-	27733=>1000,27734=>1000,27735=>1000,27736=>1000,27737=>1000,27738=>1000,27739=>1000,27740=>1000,27741=>1000,27742=>1000,27743=>1000,27744=>1000,27745=>1000,27746=>1000,27747=>1000,27748=>1000,
-	27749=>1000,27750=>1000,27751=>1000,27752=>1000,27753=>1000,27754=>1000,27755=>1000,27756=>1000,27757=>1000,27758=>1000,27759=>1000,27760=>1000,27761=>1000,27762=>1000,27763=>1000,27764=>1000,
-	27765=>1000,27766=>1000,27767=>1000,27768=>1000,27769=>1000,27770=>1000,27771=>1000,27772=>1000,27773=>1000,27774=>1000,27775=>1000,27776=>1000,27777=>1000,27778=>1000,27779=>1000,27780=>1000,
-	27781=>1000,27782=>1000,27783=>1000,27784=>1000,27785=>1000,27786=>1000,27787=>1000,27788=>1000,27789=>1000,27790=>1000,27791=>1000,27792=>1000,27793=>1000,27794=>1000,27795=>1000,27796=>1000,
-	27797=>1000,27798=>1000,27799=>1000,27800=>1000,27801=>1000,27802=>1000,27803=>1000,27804=>1000,27805=>1000,27806=>1000,27807=>1000,27808=>1000,27809=>1000,27810=>1000,27811=>1000,27812=>1000,
-	27813=>1000,27814=>1000,27815=>1000,27816=>1000,27817=>1000,27818=>1000,27819=>1000,27820=>1000,27821=>1000,27822=>1000,27823=>1000,27824=>1000,27825=>1000,27826=>1000,27827=>1000,27828=>1000,
-	27829=>1000,27830=>1000,27831=>1000,27832=>1000,27833=>1000,27834=>1000,27835=>1000,27836=>1000,27837=>1000,27838=>1000,27839=>1000,27840=>1000,27841=>1000,27842=>1000,27843=>1000,27844=>1000,
-	27845=>1000,27846=>1000,27847=>1000,27848=>1000,27849=>1000,27850=>1000,27851=>1000,27852=>1000,27853=>1000,27854=>1000,27855=>1000,27856=>1000,27857=>1000,27858=>1000,27859=>1000,27860=>1000,
-	27861=>1000,27862=>1000,27863=>1000,27864=>1000,27865=>1000,27866=>1000,27867=>1000,27868=>1000,27869=>1000,27870=>1000,27871=>1000,27872=>1000,27873=>1000,27874=>1000,27875=>1000,27876=>1000,
-	27877=>1000,27878=>1000,27879=>1000,27880=>1000,27881=>1000,27882=>1000,27883=>1000,27884=>1000,27885=>1000,27886=>1000,27887=>1000,27888=>1000,27889=>1000,27890=>1000,27891=>1000,27892=>1000,
-	27893=>1000,27894=>1000,27895=>1000,27896=>1000,27897=>1000,27898=>1000,27899=>1000,27900=>1000,27901=>1000,27902=>1000,27903=>1000,27904=>1000,27905=>1000,27906=>1000,27907=>1000,27908=>1000,
-	27909=>1000,27910=>1000,27911=>1000,27912=>1000,27913=>1000,27914=>1000,27915=>1000,27916=>1000,27917=>1000,27918=>1000,27919=>1000,27920=>1000,27921=>1000,27922=>1000,27923=>1000,27924=>1000,
-	27925=>1000,27926=>1000,27927=>1000,27928=>1000,27929=>1000,27930=>1000,27931=>1000,27932=>1000,27933=>1000,27934=>1000,27935=>1000,27936=>1000,27937=>1000,27938=>1000,27939=>1000,27940=>1000,
-	27941=>1000,27942=>1000,27943=>1000,27944=>1000,27945=>1000,27946=>1000,27947=>1000,27948=>1000,27949=>1000,27950=>1000,27951=>1000,27952=>1000,27953=>1000,27954=>1000,27955=>1000,27956=>1000,
-	27957=>1000,27958=>1000,27959=>1000,27960=>1000,27961=>1000,27962=>1000,27963=>1000,27964=>1000,27965=>1000,27966=>1000,27967=>1000,27968=>1000,27969=>1000,27970=>1000,27971=>1000,27972=>1000,
-	27973=>1000,27974=>1000,27975=>1000,27976=>1000,27977=>1000,27978=>1000,27979=>1000,27980=>1000,27981=>1000,27982=>1000,27983=>1000,27984=>1000,27985=>1000,27986=>1000,27987=>1000,27988=>1000,
-	27989=>1000,27990=>1000,27991=>1000,27992=>1000,27993=>1000,27994=>1000,27995=>1000,27996=>1000,27997=>1000,27998=>1000,27999=>1000,28000=>1000,28001=>1000,28002=>1000,28003=>1000,28004=>1000,
-	28005=>1000,28006=>1000,28007=>1000,28008=>1000,28009=>1000,28010=>1000,28011=>1000,28012=>1000,28013=>1000,28014=>1000,28015=>1000,28016=>1000,28017=>1000,28018=>1000,28019=>1000,28020=>1000,
-	28021=>1000,28022=>1000,28023=>1000,28024=>1000,28025=>1000,28026=>1000,28027=>1000,28028=>1000,28029=>1000,28030=>1000,28031=>1000,28032=>1000,28033=>1000,28034=>1000,28035=>1000,28036=>1000,
-	28037=>1000,28038=>1000,28039=>1000,28040=>1000,28041=>1000,28042=>1000,28043=>1000,28044=>1000,28045=>1000,28046=>1000,28047=>1000,28048=>1000,28049=>1000,28050=>1000,28051=>1000,28052=>1000,
-	28053=>1000,28054=>1000,28055=>1000,28056=>1000,28057=>1000,28058=>1000,28059=>1000,28060=>1000,28061=>1000,28062=>1000,28063=>1000,28064=>1000,28065=>1000,28066=>1000,28067=>1000,28068=>1000,
-	28069=>1000,28070=>1000,28071=>1000,28072=>1000,28073=>1000,28074=>1000,28075=>1000,28076=>1000,28077=>1000,28078=>1000,28079=>1000,28080=>1000,28081=>1000,28082=>1000,28083=>1000,28084=>1000,
-	28085=>1000,28086=>1000,28087=>1000,28088=>1000,28089=>1000,28090=>1000,28091=>1000,28092=>1000,28093=>1000,28094=>1000,28095=>1000,28096=>1000,28097=>1000,28098=>1000,28099=>1000,28100=>1000,
-	28101=>1000,28102=>1000,28103=>1000,28104=>1000,28105=>1000,28106=>1000,28107=>1000,28108=>1000,28109=>1000,28110=>1000,28111=>1000,28112=>1000,28113=>1000,28114=>1000,28115=>1000,28116=>1000,
-	28117=>1000,28118=>1000,28119=>1000,28120=>1000,28121=>1000,28122=>1000,28123=>1000,28124=>1000,28125=>1000,28126=>1000,28127=>1000,28128=>1000,28129=>1000,28130=>1000,28131=>1000,28132=>1000,
-	28133=>1000,28134=>1000,28135=>1000,28136=>1000,28137=>1000,28138=>1000,28139=>1000,28140=>1000,28141=>1000,28142=>1000,28143=>1000,28144=>1000,28145=>1000,28146=>1000,28147=>1000,28148=>1000,
-	28149=>1000,28150=>1000,28151=>1000,28152=>1000,28153=>1000,28154=>1000,28155=>1000,28156=>1000,28157=>1000,28158=>1000,28159=>1000,28160=>1000,28161=>1000,28162=>1000,28163=>1000,28164=>1000,
-	28165=>1000,28166=>1000,28167=>1000,28168=>1000,28169=>1000,28170=>1000,28171=>1000,28172=>1000,28173=>1000,28174=>1000,28175=>1000,28176=>1000,28177=>1000,28178=>1000,28179=>1000,28180=>1000,
-	28181=>1000,28182=>1000,28183=>1000,28184=>1000,28185=>1000,28186=>1000,28187=>1000,28188=>1000,28189=>1000,28190=>1000,28191=>1000,28192=>1000,28193=>1000,28194=>1000,28195=>1000,28196=>1000,
-	28197=>1000,28198=>1000,28199=>1000,28200=>1000,28201=>1000,28202=>1000,28203=>1000,28204=>1000,28205=>1000,28206=>1000,28207=>1000,28208=>1000,28209=>1000,28210=>1000,28211=>1000,28212=>1000,
-	28213=>1000,28214=>1000,28215=>1000,28216=>1000,28217=>1000,28218=>1000,28219=>1000,28220=>1000,28221=>1000,28222=>1000,28223=>1000,28224=>1000,28225=>1000,28226=>1000,28227=>1000,28228=>1000,
-	28229=>1000,28230=>1000,28231=>1000,28232=>1000,28233=>1000,28234=>1000,28235=>1000,28236=>1000,28237=>1000,28238=>1000,28239=>1000,28240=>1000,28241=>1000,28242=>1000,28243=>1000,28244=>1000,
-	28245=>1000,28246=>1000,28247=>1000,28248=>1000,28249=>1000,28250=>1000,28251=>1000,28252=>1000,28253=>1000,28254=>1000,28255=>1000,28256=>1000,28257=>1000,28258=>1000,28259=>1000,28260=>1000,
-	28261=>1000,28262=>1000,28263=>1000,28264=>1000,28265=>1000,28266=>1000,28267=>1000,28268=>1000,28269=>1000,28270=>1000,28271=>1000,28272=>1000,28273=>1000,28274=>1000,28275=>1000,28276=>1000,
-	28277=>1000,28278=>1000,28279=>1000,28280=>1000,28281=>1000,28282=>1000,28283=>1000,28284=>1000,28285=>1000,28286=>1000,28287=>1000,28288=>1000,28289=>1000,28290=>1000,28291=>1000,28292=>1000,
-	28293=>1000,28294=>1000,28295=>1000,28296=>1000,28297=>1000,28298=>1000,28299=>1000,28300=>1000,28301=>1000,28302=>1000,28303=>1000,28304=>1000,28305=>1000,28306=>1000,28307=>1000,28308=>1000,
-	28309=>1000,28310=>1000,28311=>1000,28312=>1000,28313=>1000,28314=>1000,28315=>1000,28316=>1000,28317=>1000,28318=>1000,28319=>1000,28320=>1000,28321=>1000,28322=>1000,28323=>1000,28324=>1000,
-	28325=>1000,28326=>1000,28327=>1000,28328=>1000,28329=>1000,28330=>1000,28331=>1000,28332=>1000,28333=>1000,28334=>1000,28335=>1000,28336=>1000,28337=>1000,28338=>1000,28339=>1000,28340=>1000,
-	28341=>1000,28342=>1000,28343=>1000,28344=>1000,28345=>1000,28346=>1000,28347=>1000,28348=>1000,28349=>1000,28350=>1000,28351=>1000,28352=>1000,28353=>1000,28354=>1000,28355=>1000,28356=>1000,
-	28357=>1000,28358=>1000,28359=>1000,28360=>1000,28361=>1000,28362=>1000,28363=>1000,28364=>1000,28365=>1000,28366=>1000,28367=>1000,28368=>1000,28369=>1000,28370=>1000,28371=>1000,28372=>1000,
-	28373=>1000,28374=>1000,28375=>1000,28376=>1000,28377=>1000,28378=>1000,28379=>1000,28380=>1000,28381=>1000,28382=>1000,28383=>1000,28384=>1000,28385=>1000,28386=>1000,28387=>1000,28388=>1000,
-	28389=>1000,28390=>1000,28391=>1000,28392=>1000,28393=>1000,28394=>1000,28395=>1000,28396=>1000,28397=>1000,28398=>1000,28399=>1000,28400=>1000,28401=>1000,28402=>1000,28403=>1000,28404=>1000,
-	28405=>1000,28406=>1000,28407=>1000,28408=>1000,28409=>1000,28410=>1000,28411=>1000,28412=>1000,28413=>1000,28414=>1000,28415=>1000,28416=>1000,28417=>1000,28418=>1000,28419=>1000,28420=>1000,
-	28421=>1000,28422=>1000,28423=>1000,28424=>1000,28425=>1000,28426=>1000,28427=>1000,28428=>1000,28429=>1000,28430=>1000,28431=>1000,28432=>1000,28433=>1000,28434=>1000,28435=>1000,28436=>1000,
-	28437=>1000,28438=>1000,28439=>1000,28440=>1000,28441=>1000,28442=>1000,28443=>1000,28444=>1000,28445=>1000,28446=>1000,28447=>1000,28448=>1000,28449=>1000,28450=>1000,28451=>1000,28452=>1000,
-	28453=>1000,28454=>1000,28455=>1000,28456=>1000,28457=>1000,28458=>1000,28459=>1000,28460=>1000,28461=>1000,28462=>1000,28463=>1000,28464=>1000,28465=>1000,28466=>1000,28467=>1000,28468=>1000,
-	28469=>1000,28470=>1000,28471=>1000,28472=>1000,28473=>1000,28474=>1000,28475=>1000,28476=>1000,28477=>1000,28478=>1000,28479=>1000,28480=>1000,28481=>1000,28482=>1000,28483=>1000,28484=>1000,
-	28485=>1000,28486=>1000,28487=>1000,28488=>1000,28489=>1000,28490=>1000,28491=>1000,28492=>1000,28493=>1000,28494=>1000,28495=>1000,28496=>1000,28497=>1000,28498=>1000,28499=>1000,28500=>1000,
-	28501=>1000,28502=>1000,28503=>1000,28504=>1000,28505=>1000,28506=>1000,28507=>1000,28508=>1000,28509=>1000,28510=>1000,28511=>1000,28512=>1000,28513=>1000,28514=>1000,28515=>1000,28516=>1000,
-	28517=>1000,28518=>1000,28519=>1000,28520=>1000,28521=>1000,28522=>1000,28523=>1000,28524=>1000,28525=>1000,28526=>1000,28527=>1000,28528=>1000,28529=>1000,28530=>1000,28531=>1000,28532=>1000,
-	28533=>1000,28534=>1000,28535=>1000,28536=>1000,28537=>1000,28538=>1000,28539=>1000,28540=>1000,28541=>1000,28542=>1000,28543=>1000,28544=>1000,28545=>1000,28546=>1000,28547=>1000,28548=>1000,
-	28549=>1000,28550=>1000,28551=>1000,28552=>1000,28553=>1000,28554=>1000,28555=>1000,28556=>1000,28557=>1000,28558=>1000,28559=>1000,28560=>1000,28561=>1000,28562=>1000,28563=>1000,28564=>1000,
-	28565=>1000,28566=>1000,28567=>1000,28568=>1000,28569=>1000,28570=>1000,28571=>1000,28572=>1000,28573=>1000,28574=>1000,28575=>1000,28576=>1000,28577=>1000,28578=>1000,28579=>1000,28580=>1000,
-	28581=>1000,28582=>1000,28583=>1000,28584=>1000,28585=>1000,28586=>1000,28587=>1000,28588=>1000,28589=>1000,28590=>1000,28591=>1000,28592=>1000,28593=>1000,28594=>1000,28595=>1000,28596=>1000,
-	28597=>1000,28598=>1000,28599=>1000,28600=>1000,28601=>1000,28602=>1000,28603=>1000,28604=>1000,28605=>1000,28606=>1000,28607=>1000,28608=>1000,28609=>1000,28610=>1000,28611=>1000,28612=>1000,
-	28613=>1000,28614=>1000,28615=>1000,28616=>1000,28617=>1000,28618=>1000,28619=>1000,28620=>1000,28621=>1000,28622=>1000,28623=>1000,28624=>1000,28625=>1000,28626=>1000,28627=>1000,28628=>1000,
-	28629=>1000,28630=>1000,28631=>1000,28632=>1000,28633=>1000,28634=>1000,28635=>1000,28636=>1000,28637=>1000,28638=>1000,28639=>1000,28640=>1000,28641=>1000,28642=>1000,28643=>1000,28644=>1000,
-	28645=>1000,28646=>1000,28647=>1000,28648=>1000,28649=>1000,28650=>1000,28651=>1000,28652=>1000,28653=>1000,28654=>1000,28655=>1000,28656=>1000,28657=>1000,28658=>1000,28659=>1000,28660=>1000,
-	28661=>1000,28662=>1000,28663=>1000,28664=>1000,28665=>1000,28666=>1000,28667=>1000,28668=>1000,28669=>1000,28670=>1000,28671=>1000,28672=>1000,28673=>1000,28674=>1000,28675=>1000,28676=>1000,
-	28677=>1000,28678=>1000,28679=>1000,28680=>1000,28681=>1000,28682=>1000,28683=>1000,28684=>1000,28685=>1000,28686=>1000,28687=>1000,28688=>1000,28689=>1000,28690=>1000,28691=>1000,28692=>1000,
-	28693=>1000,28694=>1000,28695=>1000,28696=>1000,28697=>1000,28698=>1000,28699=>1000,28700=>1000,28701=>1000,28702=>1000,28703=>1000,28704=>1000,28705=>1000,28706=>1000,28707=>1000,28708=>1000,
-	28709=>1000,28710=>1000,28711=>1000,28712=>1000,28713=>1000,28714=>1000,28715=>1000,28716=>1000,28717=>1000,28718=>1000,28719=>1000,28720=>1000,28721=>1000,28722=>1000,28723=>1000,28724=>1000,
-	28725=>1000,28726=>1000,28727=>1000,28728=>1000,28729=>1000,28730=>1000,28731=>1000,28732=>1000,28733=>1000,28734=>1000,28735=>1000,28736=>1000,28737=>1000,28738=>1000,28739=>1000,28740=>1000,
-	28741=>1000,28742=>1000,28743=>1000,28744=>1000,28745=>1000,28746=>1000,28747=>1000,28748=>1000,28749=>1000,28750=>1000,28751=>1000,28752=>1000,28753=>1000,28754=>1000,28755=>1000,28756=>1000,
-	28757=>1000,28758=>1000,28759=>1000,28760=>1000,28761=>1000,28762=>1000,28763=>1000,28764=>1000,28765=>1000,28766=>1000,28767=>1000,28768=>1000,28769=>1000,28770=>1000,28771=>1000,28772=>1000,
-	28773=>1000,28774=>1000,28775=>1000,28776=>1000,28777=>1000,28778=>1000,28779=>1000,28780=>1000,28781=>1000,28782=>1000,28783=>1000,28784=>1000,28785=>1000,28786=>1000,28787=>1000,28788=>1000,
-	28789=>1000,28790=>1000,28791=>1000,28792=>1000,28793=>1000,28794=>1000,28795=>1000,28796=>1000,28797=>1000,28798=>1000,28799=>1000,28800=>1000,28801=>1000,28802=>1000,28803=>1000,28804=>1000,
-	28805=>1000,28806=>1000,28807=>1000,28808=>1000,28809=>1000,28810=>1000,28811=>1000,28812=>1000,28813=>1000,28814=>1000,28815=>1000,28816=>1000,28817=>1000,28818=>1000,28819=>1000,28820=>1000,
-	28821=>1000,28822=>1000,28823=>1000,28824=>1000,28825=>1000,28826=>1000,28827=>1000,28828=>1000,28829=>1000,28830=>1000,28831=>1000,28832=>1000,28833=>1000,28834=>1000,28835=>1000,28836=>1000,
-	28837=>1000,28838=>1000,28839=>1000,28840=>1000,28841=>1000,28842=>1000,28843=>1000,28844=>1000,28845=>1000,28846=>1000,28847=>1000,28848=>1000,28849=>1000,28850=>1000,28851=>1000,28852=>1000,
-	28853=>1000,28854=>1000,28855=>1000,28856=>1000,28857=>1000,28858=>1000,28859=>1000,28860=>1000,28861=>1000,28862=>1000,28863=>1000,28864=>1000,28865=>1000,28866=>1000,28867=>1000,28868=>1000,
-	28869=>1000,28870=>1000,28871=>1000,28872=>1000,28873=>1000,28874=>1000,28875=>1000,28876=>1000,28877=>1000,28878=>1000,28879=>1000,28880=>1000,28881=>1000,28882=>1000,28883=>1000,28884=>1000,
-	28885=>1000,28886=>1000,28887=>1000,28888=>1000,28889=>1000,28890=>1000,28891=>1000,28892=>1000,28893=>1000,28894=>1000,28895=>1000,28896=>1000,28897=>1000,28898=>1000,28899=>1000,28900=>1000,
-	28901=>1000,28902=>1000,28903=>1000,28904=>1000,28905=>1000,28906=>1000,28907=>1000,28908=>1000,28909=>1000,28910=>1000,28911=>1000,28912=>1000,28913=>1000,28914=>1000,28915=>1000,28916=>1000,
-	28917=>1000,28918=>1000,28919=>1000,28920=>1000,28921=>1000,28922=>1000,28923=>1000,28924=>1000,28925=>1000,28926=>1000,28927=>1000,28928=>1000,28929=>1000,28930=>1000,28931=>1000,28932=>1000,
-	28933=>1000,28934=>1000,28935=>1000,28936=>1000,28937=>1000,28938=>1000,28939=>1000,28940=>1000,28941=>1000,28942=>1000,28943=>1000,28944=>1000,28945=>1000,28946=>1000,28947=>1000,28948=>1000,
-	28949=>1000,28950=>1000,28951=>1000,28952=>1000,28953=>1000,28954=>1000,28955=>1000,28956=>1000,28957=>1000,28958=>1000,28959=>1000,28960=>1000,28961=>1000,28962=>1000,28963=>1000,28964=>1000,
-	28965=>1000,28966=>1000,28967=>1000,28968=>1000,28969=>1000,28970=>1000,28971=>1000,28972=>1000,28973=>1000,28974=>1000,28975=>1000,28976=>1000,28977=>1000,28978=>1000,28979=>1000,28980=>1000,
-	28981=>1000,28982=>1000,28983=>1000,28984=>1000,28985=>1000,28986=>1000,28987=>1000,28988=>1000,28989=>1000,28990=>1000,28991=>1000,28992=>1000,28993=>1000,28994=>1000,28995=>1000,28996=>1000,
-	28997=>1000,28998=>1000,28999=>1000,29000=>1000,29001=>1000,29002=>1000,29003=>1000,29004=>1000,29005=>1000,29006=>1000,29007=>1000,29008=>1000,29009=>1000,29010=>1000,29011=>1000,29012=>1000,
-	29013=>1000,29014=>1000,29015=>1000,29016=>1000,29017=>1000,29018=>1000,29019=>1000,29020=>1000,29021=>1000,29022=>1000,29023=>1000,29024=>1000,29025=>1000,29026=>1000,29027=>1000,29028=>1000,
-	29029=>1000,29030=>1000,29031=>1000,29032=>1000,29033=>1000,29034=>1000,29035=>1000,29036=>1000,29037=>1000,29038=>1000,29039=>1000,29040=>1000,29041=>1000,29042=>1000,29043=>1000,29044=>1000,
-	29045=>1000,29046=>1000,29047=>1000,29048=>1000,29049=>1000,29050=>1000,29051=>1000,29052=>1000,29053=>1000,29054=>1000,29055=>1000,29056=>1000,29057=>1000,29058=>1000,29059=>1000,29060=>1000,
-	29061=>1000,29062=>1000,29063=>1000,29064=>1000,29065=>1000,29066=>1000,29067=>1000,29068=>1000,29069=>1000,29070=>1000,29071=>1000,29072=>1000,29073=>1000,29074=>1000,29075=>1000,29076=>1000,
-	29077=>1000,29078=>1000,29079=>1000,29080=>1000,29081=>1000,29082=>1000,29083=>1000,29084=>1000,29085=>1000,29086=>1000,29087=>1000,29088=>1000,29089=>1000,29090=>1000,29091=>1000,29092=>1000,
-	29093=>1000,29094=>1000,29095=>1000,29096=>1000,29097=>1000,29098=>1000,29099=>1000,29100=>1000,29101=>1000,29102=>1000,29103=>1000,29104=>1000,29105=>1000,29106=>1000,29107=>1000,29108=>1000,
-	29109=>1000,29110=>1000,29111=>1000,29112=>1000,29113=>1000,29114=>1000,29115=>1000,29116=>1000,29117=>1000,29118=>1000,29119=>1000,29120=>1000,29121=>1000,29122=>1000,29123=>1000,29124=>1000,
-	29125=>1000,29126=>1000,29127=>1000,29128=>1000,29129=>1000,29130=>1000,29131=>1000,29132=>1000,29133=>1000,29134=>1000,29135=>1000,29136=>1000,29137=>1000,29138=>1000,29139=>1000,29140=>1000,
-	29141=>1000,29142=>1000,29143=>1000,29144=>1000,29145=>1000,29146=>1000,29147=>1000,29148=>1000,29149=>1000,29150=>1000,29151=>1000,29152=>1000,29153=>1000,29154=>1000,29155=>1000,29156=>1000,
-	29157=>1000,29158=>1000,29159=>1000,29160=>1000,29161=>1000,29162=>1000,29163=>1000,29164=>1000,29165=>1000,29166=>1000,29167=>1000,29168=>1000,29169=>1000,29170=>1000,29171=>1000,29172=>1000,
-	29173=>1000,29174=>1000,29175=>1000,29176=>1000,29177=>1000,29178=>1000,29179=>1000,29180=>1000,29181=>1000,29182=>1000,29183=>1000,29184=>1000,29185=>1000,29186=>1000,29187=>1000,29188=>1000,
-	29189=>1000,29190=>1000,29191=>1000,29192=>1000,29193=>1000,29194=>1000,29195=>1000,29196=>1000,29197=>1000,29198=>1000,29199=>1000,29200=>1000,29201=>1000,29202=>1000,29203=>1000,29204=>1000,
-	29205=>1000,29206=>1000,29207=>1000,29208=>1000,29209=>1000,29210=>1000,29211=>1000,29212=>1000,29213=>1000,29214=>1000,29215=>1000,29216=>1000,29217=>1000,29218=>1000,29219=>1000,29220=>1000,
-	29221=>1000,29222=>1000,29223=>1000,29224=>1000,29225=>1000,29226=>1000,29227=>1000,29228=>1000,29229=>1000,29230=>1000,29231=>1000,29232=>1000,29233=>1000,29234=>1000,29235=>1000,29236=>1000,
-	29237=>1000,29238=>1000,29239=>1000,29240=>1000,29241=>1000,29242=>1000,29243=>1000,29244=>1000,29245=>1000,29246=>1000,29247=>1000,29248=>1000,29249=>1000,29250=>1000,29251=>1000,29252=>1000,
-	29253=>1000,29254=>1000,29255=>1000,29256=>1000,29257=>1000,29258=>1000,29259=>1000,29260=>1000,29261=>1000,29262=>1000,29263=>1000,29264=>1000,29265=>1000,29266=>1000,29267=>1000,29268=>1000,
-	29269=>1000,29270=>1000,29271=>1000,29272=>1000,29273=>1000,29274=>1000,29275=>1000,29276=>1000,29277=>1000,29278=>1000,29279=>1000,29280=>1000,29281=>1000,29282=>1000,29283=>1000,29284=>1000,
-	29285=>1000,29286=>1000,29287=>1000,29288=>1000,29289=>1000,29290=>1000,29291=>1000,29292=>1000,29293=>1000,29294=>1000,29295=>1000,29296=>1000,29297=>1000,29298=>1000,29299=>1000,29300=>1000,
-	29301=>1000,29302=>1000,29303=>1000,29304=>1000,29305=>1000,29306=>1000,29307=>1000,29308=>1000,29309=>1000,29310=>1000,29311=>1000,29312=>1000,29313=>1000,29314=>1000,29315=>1000,29316=>1000,
-	29317=>1000,29318=>1000,29319=>1000,29320=>1000,29321=>1000,29322=>1000,29323=>1000,29324=>1000,29325=>1000,29326=>1000,29327=>1000,29328=>1000,29329=>1000,29330=>1000,29331=>1000,29332=>1000,
-	29333=>1000,29334=>1000,29335=>1000,29336=>1000,29337=>1000,29338=>1000,29339=>1000,29340=>1000,29341=>1000,29342=>1000,29343=>1000,29344=>1000,29345=>1000,29346=>1000,29347=>1000,29348=>1000,
-	29349=>1000,29350=>1000,29351=>1000,29352=>1000,29353=>1000,29354=>1000,29355=>1000,29356=>1000,29357=>1000,29358=>1000,29359=>1000,29360=>1000,29361=>1000,29362=>1000,29363=>1000,29364=>1000,
-	29365=>1000,29366=>1000,29367=>1000,29368=>1000,29369=>1000,29370=>1000,29371=>1000,29372=>1000,29373=>1000,29374=>1000,29375=>1000,29376=>1000,29377=>1000,29378=>1000,29379=>1000,29380=>1000,
-	29381=>1000,29382=>1000,29383=>1000,29384=>1000,29385=>1000,29386=>1000,29387=>1000,29388=>1000,29389=>1000,29390=>1000,29391=>1000,29392=>1000,29393=>1000,29394=>1000,29395=>1000,29396=>1000,
-	29397=>1000,29398=>1000,29399=>1000,29400=>1000,29401=>1000,29402=>1000,29403=>1000,29404=>1000,29405=>1000,29406=>1000,29407=>1000,29408=>1000,29409=>1000,29410=>1000,29411=>1000,29412=>1000,
-	29413=>1000,29414=>1000,29415=>1000,29416=>1000,29417=>1000,29418=>1000,29419=>1000,29420=>1000,29421=>1000,29422=>1000,29423=>1000,29424=>1000,29425=>1000,29426=>1000,29427=>1000,29428=>1000,
-	29429=>1000,29430=>1000,29431=>1000,29432=>1000,29433=>1000,29434=>1000,29435=>1000,29436=>1000,29437=>1000,29438=>1000,29439=>1000,29440=>1000,29441=>1000,29442=>1000,29443=>1000,29444=>1000,
-	29445=>1000,29446=>1000,29447=>1000,29448=>1000,29449=>1000,29450=>1000,29451=>1000,29452=>1000,29453=>1000,29454=>1000,29455=>1000,29456=>1000,29457=>1000,29458=>1000,29459=>1000,29460=>1000,
-	29461=>1000,29462=>1000,29463=>1000,29464=>1000,29465=>1000,29466=>1000,29467=>1000,29468=>1000,29469=>1000,29470=>1000,29471=>1000,29472=>1000,29473=>1000,29474=>1000,29475=>1000,29476=>1000,
-	29477=>1000,29478=>1000,29479=>1000,29480=>1000,29481=>1000,29482=>1000,29483=>1000,29484=>1000,29485=>1000,29486=>1000,29487=>1000,29488=>1000,29489=>1000,29490=>1000,29491=>1000,29492=>1000,
-	29493=>1000,29494=>1000,29495=>1000,29496=>1000,29497=>1000,29498=>1000,29499=>1000,29500=>1000,29501=>1000,29502=>1000,29503=>1000,29504=>1000,29505=>1000,29506=>1000,29507=>1000,29508=>1000,
-	29509=>1000,29510=>1000,29511=>1000,29512=>1000,29513=>1000,29514=>1000,29515=>1000,29516=>1000,29517=>1000,29518=>1000,29519=>1000,29520=>1000,29521=>1000,29522=>1000,29523=>1000,29524=>1000,
-	29525=>1000,29526=>1000,29527=>1000,29528=>1000,29529=>1000,29530=>1000,29531=>1000,29532=>1000,29533=>1000,29534=>1000,29535=>1000,29536=>1000,29537=>1000,29538=>1000,29539=>1000,29540=>1000,
-	29541=>1000,29542=>1000,29543=>1000,29544=>1000,29545=>1000,29546=>1000,29547=>1000,29548=>1000,29549=>1000,29550=>1000,29551=>1000,29552=>1000,29553=>1000,29554=>1000,29555=>1000,29556=>1000,
-	29557=>1000,29558=>1000,29559=>1000,29560=>1000,29561=>1000,29562=>1000,29563=>1000,29564=>1000,29565=>1000,29566=>1000,29567=>1000,29568=>1000,29569=>1000,29570=>1000,29571=>1000,29572=>1000,
-	29573=>1000,29574=>1000,29575=>1000,29576=>1000,29577=>1000,29578=>1000,29579=>1000,29580=>1000,29581=>1000,29582=>1000,29583=>1000,29584=>1000,29585=>1000,29586=>1000,29587=>1000,29588=>1000,
-	29589=>1000,29590=>1000,29591=>1000,29592=>1000,29593=>1000,29594=>1000,29595=>1000,29596=>1000,29597=>1000,29598=>1000,29599=>1000,29600=>1000,29601=>1000,29602=>1000,29603=>1000,29604=>1000,
-	29605=>1000,29606=>1000,29607=>1000,29608=>1000,29609=>1000,29610=>1000,29611=>1000,29612=>1000,29613=>1000,29614=>1000,29615=>1000,29616=>1000,29617=>1000,29618=>1000,29619=>1000,29620=>1000,
-	29621=>1000,29622=>1000,29623=>1000,29624=>1000,29625=>1000,29626=>1000,29627=>1000,29628=>1000,29629=>1000,29630=>1000,29631=>1000,29632=>1000,29633=>1000,29634=>1000,29635=>1000,29636=>1000,
-	29637=>1000,29638=>1000,29639=>1000,29640=>1000,29641=>1000,29642=>1000,29643=>1000,29644=>1000,29645=>1000,29646=>1000,29647=>1000,29648=>1000,29649=>1000,29650=>1000,29651=>1000,29652=>1000,
-	29653=>1000,29654=>1000,29655=>1000,29656=>1000,29657=>1000,29658=>1000,29659=>1000,29660=>1000,29661=>1000,29662=>1000,29663=>1000,29664=>1000,29665=>1000,29666=>1000,29667=>1000,29668=>1000,
-	29669=>1000,29670=>1000,29671=>1000,29672=>1000,29673=>1000,29674=>1000,29675=>1000,29676=>1000,29677=>1000,29678=>1000,29679=>1000,29680=>1000,29681=>1000,29682=>1000,29683=>1000,29684=>1000,
-	29685=>1000,29686=>1000,29687=>1000,29688=>1000,29689=>1000,29690=>1000,29691=>1000,29692=>1000,29693=>1000,29694=>1000,29695=>1000,29696=>1000,29697=>1000,29698=>1000,29699=>1000,29700=>1000,
-	29701=>1000,29702=>1000,29703=>1000,29704=>1000,29705=>1000,29706=>1000,29707=>1000,29708=>1000,29709=>1000,29710=>1000,29711=>1000,29712=>1000,29713=>1000,29714=>1000,29715=>1000,29716=>1000,
-	29717=>1000,29718=>1000,29719=>1000,29720=>1000,29721=>1000,29722=>1000,29723=>1000,29724=>1000,29725=>1000,29726=>1000,29727=>1000,29728=>1000,29729=>1000,29730=>1000,29731=>1000,29732=>1000,
-	29733=>1000,29734=>1000,29735=>1000,29736=>1000,29737=>1000,29738=>1000,29739=>1000,29740=>1000,29741=>1000,29742=>1000,29743=>1000,29744=>1000,29745=>1000,29746=>1000,29747=>1000,29748=>1000,
-	29749=>1000,29750=>1000,29751=>1000,29752=>1000,29753=>1000,29754=>1000,29755=>1000,29756=>1000,29757=>1000,29758=>1000,29759=>1000,29760=>1000,29761=>1000,29762=>1000,29763=>1000,29764=>1000,
-	29765=>1000,29766=>1000,29767=>1000,29768=>1000,29769=>1000,29770=>1000,29771=>1000,29772=>1000,29773=>1000,29774=>1000,29775=>1000,29776=>1000,29777=>1000,29778=>1000,29779=>1000,29780=>1000,
-	29781=>1000,29782=>1000,29783=>1000,29784=>1000,29785=>1000,29786=>1000,29787=>1000,29788=>1000,29789=>1000,29790=>1000,29791=>1000,29792=>1000,29793=>1000,29794=>1000,29795=>1000,29796=>1000,
-	29797=>1000,29798=>1000,29799=>1000,29800=>1000,29801=>1000,29802=>1000,29803=>1000,29804=>1000,29805=>1000,29806=>1000,29807=>1000,29808=>1000,29809=>1000,29810=>1000,29811=>1000,29812=>1000,
-	29813=>1000,29814=>1000,29815=>1000,29816=>1000,29817=>1000,29818=>1000,29819=>1000,29820=>1000,29821=>1000,29822=>1000,29823=>1000,29824=>1000,29825=>1000,29826=>1000,29827=>1000,29828=>1000,
-	29829=>1000,29830=>1000,29831=>1000,29832=>1000,29833=>1000,29834=>1000,29835=>1000,29836=>1000,29837=>1000,29838=>1000,29839=>1000,29840=>1000,29841=>1000,29842=>1000,29843=>1000,29844=>1000,
-	29845=>1000,29846=>1000,29847=>1000,29848=>1000,29849=>1000,29850=>1000,29851=>1000,29852=>1000,29853=>1000,29854=>1000,29855=>1000,29856=>1000,29857=>1000,29858=>1000,29859=>1000,29860=>1000,
-	29861=>1000,29862=>1000,29863=>1000,29864=>1000,29865=>1000,29866=>1000,29867=>1000,29868=>1000,29869=>1000,29870=>1000,29871=>1000,29872=>1000,29873=>1000,29874=>1000,29875=>1000,29876=>1000,
-	29877=>1000,29878=>1000,29879=>1000,29880=>1000,29881=>1000,29882=>1000,29883=>1000,29884=>1000,29885=>1000,29886=>1000,29887=>1000,29888=>1000,29889=>1000,29890=>1000,29891=>1000,29892=>1000,
-	29893=>1000,29894=>1000,29895=>1000,29896=>1000,29897=>1000,29898=>1000,29899=>1000,29900=>1000,29901=>1000,29902=>1000,29903=>1000,29904=>1000,29905=>1000,29906=>1000,29907=>1000,29908=>1000,
-	29909=>1000,29910=>1000,29911=>1000,29912=>1000,29913=>1000,29914=>1000,29915=>1000,29916=>1000,29917=>1000,29918=>1000,29919=>1000,29920=>1000,29921=>1000,29922=>1000,29923=>1000,29924=>1000,
-	29925=>1000,29926=>1000,29927=>1000,29928=>1000,29929=>1000,29930=>1000,29931=>1000,29932=>1000,29933=>1000,29934=>1000,29935=>1000,29936=>1000,29937=>1000,29938=>1000,29939=>1000,29940=>1000,
-	29941=>1000,29942=>1000,29943=>1000,29944=>1000,29945=>1000,29946=>1000,29947=>1000,29948=>1000,29949=>1000,29950=>1000,29951=>1000,29952=>1000,29953=>1000,29954=>1000,29955=>1000,29956=>1000,
-	29957=>1000,29958=>1000,29959=>1000,29960=>1000,29961=>1000,29962=>1000,29963=>1000,29964=>1000,29965=>1000,29966=>1000,29967=>1000,29968=>1000,29969=>1000,29970=>1000,29971=>1000,29972=>1000,
-	29973=>1000,29974=>1000,29975=>1000,29976=>1000,29977=>1000,29978=>1000,29979=>1000,29980=>1000,29981=>1000,29982=>1000,29983=>1000,29984=>1000,29985=>1000,29986=>1000,29987=>1000,29988=>1000,
-	29989=>1000,29990=>1000,29991=>1000,29992=>1000,29993=>1000,29994=>1000,29995=>1000,29996=>1000,29997=>1000,29998=>1000,29999=>1000,30000=>1000,30001=>1000,30002=>1000,30003=>1000,30004=>1000,
-	30005=>1000,30006=>1000,30007=>1000,30008=>1000,30009=>1000,30010=>1000,30011=>1000,30012=>1000,30013=>1000,30014=>1000,30015=>1000,30016=>1000,30017=>1000,30018=>1000,30019=>1000,30020=>1000,
-	30021=>1000,30022=>1000,30023=>1000,30024=>1000,30025=>1000,30026=>1000,30027=>1000,30028=>1000,30029=>1000,30030=>1000,30031=>1000,30032=>1000,30033=>1000,30034=>1000,30035=>1000,30036=>1000,
-	30037=>1000,30038=>1000,30039=>1000,30040=>1000,30041=>1000,30042=>1000,30043=>1000,30044=>1000,30045=>1000,30046=>1000,30047=>1000,30048=>1000,30049=>1000,30050=>1000,30051=>1000,30052=>1000,
-	30053=>1000,30054=>1000,30055=>1000,30056=>1000,30057=>1000,30058=>1000,30059=>1000,30060=>1000,30061=>1000,30062=>1000,30063=>1000,30064=>1000,30065=>1000,30066=>1000,30067=>1000,30068=>1000,
-	30069=>1000,30070=>1000,30071=>1000,30072=>1000,30073=>1000,30074=>1000,30075=>1000,30076=>1000,30077=>1000,30078=>1000,30079=>1000,30080=>1000,30081=>1000,30082=>1000,30083=>1000,30084=>1000,
-	30085=>1000,30086=>1000,30087=>1000,30088=>1000,30089=>1000,30090=>1000,30091=>1000,30092=>1000,30093=>1000,30094=>1000,30095=>1000,30096=>1000,30097=>1000,30098=>1000,30099=>1000,30100=>1000,
-	30101=>1000,30102=>1000,30103=>1000,30104=>1000,30105=>1000,30106=>1000,30107=>1000,30108=>1000,30109=>1000,30110=>1000,30111=>1000,30112=>1000,30113=>1000,30114=>1000,30115=>1000,30116=>1000,
-	30117=>1000,30118=>1000,30119=>1000,30120=>1000,30121=>1000,30122=>1000,30123=>1000,30124=>1000,30125=>1000,30126=>1000,30127=>1000,30128=>1000,30129=>1000,30130=>1000,30131=>1000,30132=>1000,
-	30133=>1000,30134=>1000,30135=>1000,30136=>1000,30137=>1000,30138=>1000,30139=>1000,30140=>1000,30141=>1000,30142=>1000,30143=>1000,30144=>1000,30145=>1000,30146=>1000,30147=>1000,30148=>1000,
-	30149=>1000,30150=>1000,30151=>1000,30152=>1000,30153=>1000,30154=>1000,30155=>1000,30156=>1000,30157=>1000,30158=>1000,30159=>1000,30160=>1000,30161=>1000,30162=>1000,30163=>1000,30164=>1000,
-	30165=>1000,30166=>1000,30167=>1000,30168=>1000,30169=>1000,30170=>1000,30171=>1000,30172=>1000,30173=>1000,30174=>1000,30175=>1000,30176=>1000,30177=>1000,30178=>1000,30179=>1000,30180=>1000,
-	30181=>1000,30182=>1000,30183=>1000,30184=>1000,30185=>1000,30186=>1000,30187=>1000,30188=>1000,30189=>1000,30190=>1000,30191=>1000,30192=>1000,30193=>1000,30194=>1000,30195=>1000,30196=>1000,
-	30197=>1000,30198=>1000,30199=>1000,30200=>1000,30201=>1000,30202=>1000,30203=>1000,30204=>1000,30205=>1000,30206=>1000,30207=>1000,30208=>1000,30209=>1000,30210=>1000,30211=>1000,30212=>1000,
-	30213=>1000,30214=>1000,30215=>1000,30216=>1000,30217=>1000,30218=>1000,30219=>1000,30220=>1000,30221=>1000,30222=>1000,30223=>1000,30224=>1000,30225=>1000,30226=>1000,30227=>1000,30228=>1000,
-	30229=>1000,30230=>1000,30231=>1000,30232=>1000,30233=>1000,30234=>1000,30235=>1000,30236=>1000,30237=>1000,30238=>1000,30239=>1000,30240=>1000,30241=>1000,30242=>1000,30243=>1000,30244=>1000,
-	30245=>1000,30246=>1000,30247=>1000,30248=>1000,30249=>1000,30250=>1000,30251=>1000,30252=>1000,30253=>1000,30254=>1000,30255=>1000,30256=>1000,30257=>1000,30258=>1000,30259=>1000,30260=>1000,
-	30261=>1000,30262=>1000,30263=>1000,30264=>1000,30265=>1000,30266=>1000,30267=>1000,30268=>1000,30269=>1000,30270=>1000,30271=>1000,30272=>1000,30273=>1000,30274=>1000,30275=>1000,30276=>1000,
-	30277=>1000,30278=>1000,30279=>1000,30280=>1000,30281=>1000,30282=>1000,30283=>1000,30284=>1000,30285=>1000,30286=>1000,30287=>1000,30288=>1000,30289=>1000,30290=>1000,30291=>1000,30292=>1000,
-	30293=>1000,30294=>1000,30295=>1000,30296=>1000,30297=>1000,30298=>1000,30299=>1000,30300=>1000,30301=>1000,30302=>1000,30303=>1000,30304=>1000,30305=>1000,30306=>1000,30307=>1000,30308=>1000,
-	30309=>1000,30310=>1000,30311=>1000,30312=>1000,30313=>1000,30314=>1000,30315=>1000,30316=>1000,30317=>1000,30318=>1000,30319=>1000,30320=>1000,30321=>1000,30322=>1000,30323=>1000,30324=>1000,
-	30325=>1000,30326=>1000,30327=>1000,30328=>1000,30329=>1000,30330=>1000,30331=>1000,30332=>1000,30333=>1000,30334=>1000,30335=>1000,30336=>1000,30337=>1000,30338=>1000,30339=>1000,30340=>1000,
-	30341=>1000,30342=>1000,30343=>1000,30344=>1000,30345=>1000,30346=>1000,30347=>1000,30348=>1000,30349=>1000,30350=>1000,30351=>1000,30352=>1000,30353=>1000,30354=>1000,30355=>1000,30356=>1000,
-	30357=>1000,30358=>1000,30359=>1000,30360=>1000,30361=>1000,30362=>1000,30363=>1000,30364=>1000,30365=>1000,30366=>1000,30367=>1000,30368=>1000,30369=>1000,30370=>1000,30371=>1000,30372=>1000,
-	30373=>1000,30374=>1000,30375=>1000,30376=>1000,30377=>1000,30378=>1000,30379=>1000,30380=>1000,30381=>1000,30382=>1000,30383=>1000,30384=>1000,30385=>1000,30386=>1000,30387=>1000,30388=>1000,
-	30389=>1000,30390=>1000,30391=>1000,30392=>1000,30393=>1000,30394=>1000,30395=>1000,30396=>1000,30397=>1000,30398=>1000,30399=>1000,30400=>1000,30401=>1000,30402=>1000,30403=>1000,30404=>1000,
-	30405=>1000,30406=>1000,30407=>1000,30408=>1000,30409=>1000,30410=>1000,30411=>1000,30412=>1000,30413=>1000,30414=>1000,30415=>1000,30416=>1000,30417=>1000,30418=>1000,30419=>1000,30420=>1000,
-	30421=>1000,30422=>1000,30423=>1000,30424=>1000,30425=>1000,30426=>1000,30427=>1000,30428=>1000,30429=>1000,30430=>1000,30431=>1000,30432=>1000,30433=>1000,30434=>1000,30435=>1000,30436=>1000,
-	30437=>1000,30438=>1000,30439=>1000,30440=>1000,30441=>1000,30442=>1000,30443=>1000,30444=>1000,30445=>1000,30446=>1000,30447=>1000,30448=>1000,30449=>1000,30450=>1000,30451=>1000,30452=>1000,
-	30453=>1000,30454=>1000,30455=>1000,30456=>1000,30457=>1000,30458=>1000,30459=>1000,30460=>1000,30461=>1000,30462=>1000,30463=>1000,30464=>1000,30465=>1000,30466=>1000,30467=>1000,30468=>1000,
-	30469=>1000,30470=>1000,30471=>1000,30472=>1000,30473=>1000,30474=>1000,30475=>1000,30476=>1000,30477=>1000,30478=>1000,30479=>1000,30480=>1000,30481=>1000,30482=>1000,30483=>1000,30484=>1000,
-	30485=>1000,30486=>1000,30487=>1000,30488=>1000,30489=>1000,30490=>1000,30491=>1000,30492=>1000,30493=>1000,30494=>1000,30495=>1000,30496=>1000,30497=>1000,30498=>1000,30499=>1000,30500=>1000,
-	30501=>1000,30502=>1000,30503=>1000,30504=>1000,30505=>1000,30506=>1000,30507=>1000,30508=>1000,30509=>1000,30510=>1000,30511=>1000,30512=>1000,30513=>1000,30514=>1000,30515=>1000,30516=>1000,
-	30517=>1000,30518=>1000,30519=>1000,30520=>1000,30521=>1000,30522=>1000,30523=>1000,30524=>1000,30525=>1000,30526=>1000,30527=>1000,30528=>1000,30529=>1000,30530=>1000,30531=>1000,30532=>1000,
-	30533=>1000,30534=>1000,30535=>1000,30536=>1000,30537=>1000,30538=>1000,30539=>1000,30540=>1000,30541=>1000,30542=>1000,30543=>1000,30544=>1000,30545=>1000,30546=>1000,30547=>1000,30548=>1000,
-	30549=>1000,30550=>1000,30551=>1000,30552=>1000,30553=>1000,30554=>1000,30555=>1000,30556=>1000,30557=>1000,30558=>1000,30559=>1000,30560=>1000,30561=>1000,30562=>1000,30563=>1000,30564=>1000,
-	30565=>1000,30566=>1000,30567=>1000,30568=>1000,30569=>1000,30570=>1000,30571=>1000,30572=>1000,30573=>1000,30574=>1000,30575=>1000,30576=>1000,30577=>1000,30578=>1000,30579=>1000,30580=>1000,
-	30581=>1000,30582=>1000,30583=>1000,30584=>1000,30585=>1000,30586=>1000,30587=>1000,30588=>1000,30589=>1000,30590=>1000,30591=>1000,30592=>1000,30593=>1000,30594=>1000,30595=>1000,30596=>1000,
-	30597=>1000,30598=>1000,30599=>1000,30600=>1000,30601=>1000,30602=>1000,30603=>1000,30604=>1000,30605=>1000,30606=>1000,30607=>1000,30608=>1000,30609=>1000,30610=>1000,30611=>1000,30612=>1000,
-	30613=>1000,30614=>1000,30615=>1000,30616=>1000,30617=>1000,30618=>1000,30619=>1000,30620=>1000,30621=>1000,30622=>1000,30623=>1000,30624=>1000,30625=>1000,30626=>1000,30627=>1000,30628=>1000,
-	30629=>1000,30630=>1000,30631=>1000,30632=>1000,30633=>1000,30634=>1000,30635=>1000,30636=>1000,30637=>1000,30638=>1000,30639=>1000,30640=>1000,30641=>1000,30642=>1000,30643=>1000,30644=>1000,
-	30645=>1000,30646=>1000,30647=>1000,30648=>1000,30649=>1000,30650=>1000,30651=>1000,30652=>1000,30653=>1000,30654=>1000,30655=>1000,30656=>1000,30657=>1000,30658=>1000,30659=>1000,30660=>1000,
-	30661=>1000,30662=>1000,30663=>1000,30664=>1000,30665=>1000,30666=>1000,30667=>1000,30668=>1000,30669=>1000,30670=>1000,30671=>1000,30672=>1000,30673=>1000,30674=>1000,30675=>1000,30676=>1000,
-	30677=>1000,30678=>1000,30679=>1000,30680=>1000,30681=>1000,30682=>1000,30683=>1000,30684=>1000,30685=>1000,30686=>1000,30687=>1000,30688=>1000,30689=>1000,30690=>1000,30691=>1000,30692=>1000,
-	30693=>1000,30694=>1000,30695=>1000,30696=>1000,30697=>1000,30698=>1000,30699=>1000,30700=>1000,30701=>1000,30702=>1000,30703=>1000,30704=>1000,30705=>1000,30706=>1000,30707=>1000,30708=>1000,
-	30709=>1000,30710=>1000,30711=>1000,30712=>1000,30713=>1000,30714=>1000,30715=>1000,30716=>1000,30717=>1000,30718=>1000,30719=>1000,30720=>1000,30721=>1000,30722=>1000,30723=>1000,30724=>1000,
-	30725=>1000,30726=>1000,30727=>1000,30728=>1000,30729=>1000,30730=>1000,30731=>1000,30732=>1000,30733=>1000,30734=>1000,30735=>1000,30736=>1000,30737=>1000,30738=>1000,30739=>1000,30740=>1000,
-	30741=>1000,30742=>1000,30743=>1000,30744=>1000,30745=>1000,30746=>1000,30747=>1000,30748=>1000,30749=>1000,30750=>1000,30751=>1000,30752=>1000,30753=>1000,30754=>1000,30755=>1000,30756=>1000,
-	30757=>1000,30758=>1000,30759=>1000,30760=>1000,30761=>1000,30762=>1000,30763=>1000,30764=>1000,30765=>1000,30766=>1000,30767=>1000,30768=>1000,30769=>1000,30770=>1000,30771=>1000,30772=>1000,
-	30773=>1000,30774=>1000,30775=>1000,30776=>1000,30777=>1000,30778=>1000,30779=>1000,30780=>1000,30781=>1000,30782=>1000,30783=>1000,30784=>1000,30785=>1000,30786=>1000,30787=>1000,30788=>1000,
-	30789=>1000,30790=>1000,30791=>1000,30792=>1000,30793=>1000,30794=>1000,30795=>1000,30796=>1000,30797=>1000,30798=>1000,30799=>1000,30800=>1000,30801=>1000,30802=>1000,30803=>1000,30804=>1000,
-	30805=>1000,30806=>1000,30807=>1000,30808=>1000,30809=>1000,30810=>1000,30811=>1000,30812=>1000,30813=>1000,30814=>1000,30815=>1000,30816=>1000,30817=>1000,30818=>1000,30819=>1000,30820=>1000,
-	30821=>1000,30822=>1000,30823=>1000,30824=>1000,30825=>1000,30826=>1000,30827=>1000,30828=>1000,30829=>1000,30830=>1000,30831=>1000,30832=>1000,30833=>1000,30834=>1000,30835=>1000,30836=>1000,
-	30837=>1000,30838=>1000,30839=>1000,30840=>1000,30841=>1000,30842=>1000,30843=>1000,30844=>1000,30845=>1000,30846=>1000,30847=>1000,30848=>1000,30849=>1000,30850=>1000,30851=>1000,30852=>1000,
-	30853=>1000,30854=>1000,30855=>1000,30856=>1000,30857=>1000,30858=>1000,30859=>1000,30860=>1000,30861=>1000,30862=>1000,30863=>1000,30864=>1000,30865=>1000,30866=>1000,30867=>1000,30868=>1000,
-	30869=>1000,30870=>1000,30871=>1000,30872=>1000,30873=>1000,30874=>1000,30875=>1000,30876=>1000,30877=>1000,30878=>1000,30879=>1000,30880=>1000,30881=>1000,30882=>1000,30883=>1000,30884=>1000,
-	30885=>1000,30886=>1000,30887=>1000,30888=>1000,30889=>1000,30890=>1000,30891=>1000,30892=>1000,30893=>1000,30894=>1000,30895=>1000,30896=>1000,30897=>1000,30898=>1000,30899=>1000,30900=>1000,
-	30901=>1000,30902=>1000,30903=>1000,30904=>1000,30905=>1000,30906=>1000,30907=>1000,30908=>1000,30909=>1000,30910=>1000,30911=>1000,30912=>1000,30913=>1000,30914=>1000,30915=>1000,30916=>1000,
-	30917=>1000,30918=>1000,30919=>1000,30920=>1000,30921=>1000,30922=>1000,30923=>1000,30924=>1000,30925=>1000,30926=>1000,30927=>1000,30928=>1000,30929=>1000,30930=>1000,30931=>1000,30932=>1000,
-	30933=>1000,30934=>1000,30935=>1000,30936=>1000,30937=>1000,30938=>1000,30939=>1000,30940=>1000,30941=>1000,30942=>1000,30943=>1000,30944=>1000,30945=>1000,30946=>1000,30947=>1000,30948=>1000,
-	30949=>1000,30950=>1000,30951=>1000,30952=>1000,30953=>1000,30954=>1000,30955=>1000,30956=>1000,30957=>1000,30958=>1000,30959=>1000,30960=>1000,30961=>1000,30962=>1000,30963=>1000,30964=>1000,
-	30965=>1000,30966=>1000,30967=>1000,30968=>1000,30969=>1000,30970=>1000,30971=>1000,30972=>1000,30973=>1000,30974=>1000,30975=>1000,30976=>1000,30977=>1000,30978=>1000,30979=>1000,30980=>1000,
-	30981=>1000,30982=>1000,30983=>1000,30984=>1000,30985=>1000,30986=>1000,30987=>1000,30988=>1000,30989=>1000,30990=>1000,30991=>1000,30992=>1000,30993=>1000,30994=>1000,30995=>1000,30996=>1000,
-	30997=>1000,30998=>1000,30999=>1000,31000=>1000,31001=>1000,31002=>1000,31003=>1000,31004=>1000,31005=>1000,31006=>1000,31007=>1000,31008=>1000,31009=>1000,31010=>1000,31011=>1000,31012=>1000,
-	31013=>1000,31014=>1000,31015=>1000,31016=>1000,31017=>1000,31018=>1000,31019=>1000,31020=>1000,31021=>1000,31022=>1000,31023=>1000,31024=>1000,31025=>1000,31026=>1000,31027=>1000,31028=>1000,
-	31029=>1000,31030=>1000,31031=>1000,31032=>1000,31033=>1000,31034=>1000,31035=>1000,31036=>1000,31037=>1000,31038=>1000,31039=>1000,31040=>1000,31041=>1000,31042=>1000,31043=>1000,31044=>1000,
-	31045=>1000,31046=>1000,31047=>1000,31048=>1000,31049=>1000,31050=>1000,31051=>1000,31052=>1000,31053=>1000,31054=>1000,31055=>1000,31056=>1000,31057=>1000,31058=>1000,31059=>1000,31060=>1000,
-	31061=>1000,31062=>1000,31063=>1000,31064=>1000,31065=>1000,31066=>1000,31067=>1000,31068=>1000,31069=>1000,31070=>1000,31071=>1000,31072=>1000,31073=>1000,31074=>1000,31075=>1000,31076=>1000,
-	31077=>1000,31078=>1000,31079=>1000,31080=>1000,31081=>1000,31082=>1000,31083=>1000,31084=>1000,31085=>1000,31086=>1000,31087=>1000,31088=>1000,31089=>1000,31090=>1000,31091=>1000,31092=>1000,
-	31093=>1000,31094=>1000,31095=>1000,31096=>1000,31097=>1000,31098=>1000,31099=>1000,31100=>1000,31101=>1000,31102=>1000,31103=>1000,31104=>1000,31105=>1000,31106=>1000,31107=>1000,31108=>1000,
-	31109=>1000,31110=>1000,31111=>1000,31112=>1000,31113=>1000,31114=>1000,31115=>1000,31116=>1000,31117=>1000,31118=>1000,31119=>1000,31120=>1000,31121=>1000,31122=>1000,31123=>1000,31124=>1000,
-	31125=>1000,31126=>1000,31127=>1000,31128=>1000,31129=>1000,31130=>1000,31131=>1000,31132=>1000,31133=>1000,31134=>1000,31135=>1000,31136=>1000,31137=>1000,31138=>1000,31139=>1000,31140=>1000,
-	31141=>1000,31142=>1000,31143=>1000,31144=>1000,31145=>1000,31146=>1000,31147=>1000,31148=>1000,31149=>1000,31150=>1000,31151=>1000,31152=>1000,31153=>1000,31154=>1000,31155=>1000,31156=>1000,
-	31157=>1000,31158=>1000,31159=>1000,31160=>1000,31161=>1000,31162=>1000,31163=>1000,31164=>1000,31165=>1000,31166=>1000,31167=>1000,31168=>1000,31169=>1000,31170=>1000,31171=>1000,31172=>1000,
-	31173=>1000,31174=>1000,31175=>1000,31176=>1000,31177=>1000,31178=>1000,31179=>1000,31180=>1000,31181=>1000,31182=>1000,31183=>1000,31184=>1000,31185=>1000,31186=>1000,31187=>1000,31188=>1000,
-	31189=>1000,31190=>1000,31191=>1000,31192=>1000,31193=>1000,31194=>1000,31195=>1000,31196=>1000,31197=>1000,31198=>1000,31199=>1000,31200=>1000,31201=>1000,31202=>1000,31203=>1000,31204=>1000,
-	31205=>1000,31206=>1000,31207=>1000,31208=>1000,31209=>1000,31210=>1000,31211=>1000,31212=>1000,31213=>1000,31214=>1000,31215=>1000,31216=>1000,31217=>1000,31218=>1000,31219=>1000,31220=>1000,
-	31221=>1000,31222=>1000,31223=>1000,31224=>1000,31225=>1000,31226=>1000,31227=>1000,31228=>1000,31229=>1000,31230=>1000,31231=>1000,31232=>1000,31233=>1000,31234=>1000,31235=>1000,31236=>1000,
-	31237=>1000,31238=>1000,31239=>1000,31240=>1000,31241=>1000,31242=>1000,31243=>1000,31244=>1000,31245=>1000,31246=>1000,31247=>1000,31248=>1000,31249=>1000,31250=>1000,31251=>1000,31252=>1000,
-	31253=>1000,31254=>1000,31255=>1000,31256=>1000,31257=>1000,31258=>1000,31259=>1000,31260=>1000,31261=>1000,31262=>1000,31263=>1000,31264=>1000,31265=>1000,31266=>1000,31267=>1000,31268=>1000,
-	31269=>1000,31270=>1000,31271=>1000,31272=>1000,31273=>1000,31274=>1000,31275=>1000,31276=>1000,31277=>1000,31278=>1000,31279=>1000,31280=>1000,31281=>1000,31282=>1000,31283=>1000,31284=>1000,
-	31285=>1000,31286=>1000,31287=>1000,31288=>1000,31289=>1000,31290=>1000,31291=>1000,31292=>1000,31293=>1000,31294=>1000,31295=>1000,31296=>1000,31297=>1000,31298=>1000,31299=>1000,31300=>1000,
-	31301=>1000,31302=>1000,31303=>1000,31304=>1000,31305=>1000,31306=>1000,31307=>1000,31308=>1000,31309=>1000,31310=>1000,31311=>1000,31312=>1000,31313=>1000,31314=>1000,31315=>1000,31316=>1000,
-	31317=>1000,31318=>1000,31319=>1000,31320=>1000,31321=>1000,31322=>1000,31323=>1000,31324=>1000,31325=>1000,31326=>1000,31327=>1000,31328=>1000,31329=>1000,31330=>1000,31331=>1000,31332=>1000,
-	31333=>1000,31334=>1000,31335=>1000,31336=>1000,31337=>1000,31338=>1000,31339=>1000,31340=>1000,31341=>1000,31342=>1000,31343=>1000,31344=>1000,31345=>1000,31346=>1000,31347=>1000,31348=>1000,
-	31349=>1000,31350=>1000,31351=>1000,31352=>1000,31353=>1000,31354=>1000,31355=>1000,31356=>1000,31357=>1000,31358=>1000,31359=>1000,31360=>1000,31361=>1000,31362=>1000,31363=>1000,31364=>1000,
-	31365=>1000,31366=>1000,31367=>1000,31368=>1000,31369=>1000,31370=>1000,31371=>1000,31372=>1000,31373=>1000,31374=>1000,31375=>1000,31376=>1000,31377=>1000,31378=>1000,31379=>1000,31380=>1000,
-	31381=>1000,31382=>1000,31383=>1000,31384=>1000,31385=>1000,31386=>1000,31387=>1000,31388=>1000,31389=>1000,31390=>1000,31391=>1000,31392=>1000,31393=>1000,31394=>1000,31395=>1000,31396=>1000,
-	31397=>1000,31398=>1000,31399=>1000,31400=>1000,31401=>1000,31402=>1000,31403=>1000,31404=>1000,31405=>1000,31406=>1000,31407=>1000,31408=>1000,31409=>1000,31410=>1000,31411=>1000,31412=>1000,
-	31413=>1000,31414=>1000,31415=>1000,31416=>1000,31417=>1000,31418=>1000,31419=>1000,31420=>1000,31421=>1000,31422=>1000,31423=>1000,31424=>1000,31425=>1000,31426=>1000,31427=>1000,31428=>1000,
-	31429=>1000,31430=>1000,31431=>1000,31432=>1000,31433=>1000,31434=>1000,31435=>1000,31436=>1000,31437=>1000,31438=>1000,31439=>1000,31440=>1000,31441=>1000,31442=>1000,31443=>1000,31444=>1000,
-	31445=>1000,31446=>1000,31447=>1000,31448=>1000,31449=>1000,31450=>1000,31451=>1000,31452=>1000,31453=>1000,31454=>1000,31455=>1000,31456=>1000,31457=>1000,31458=>1000,31459=>1000,31460=>1000,
-	31461=>1000,31462=>1000,31463=>1000,31464=>1000,31465=>1000,31466=>1000,31467=>1000,31468=>1000,31469=>1000,31470=>1000,31471=>1000,31472=>1000,31473=>1000,31474=>1000,31475=>1000,31476=>1000,
-	31477=>1000,31478=>1000,31479=>1000,31480=>1000,31481=>1000,31482=>1000,31483=>1000,31484=>1000,31485=>1000,31486=>1000,31487=>1000,31488=>1000,31489=>1000,31490=>1000,31491=>1000,31492=>1000,
-	31493=>1000,31494=>1000,31495=>1000,31496=>1000,31497=>1000,31498=>1000,31499=>1000,31500=>1000,31501=>1000,31502=>1000,31503=>1000,31504=>1000,31505=>1000,31506=>1000,31507=>1000,31508=>1000,
-	31509=>1000,31510=>1000,31511=>1000,31512=>1000,31513=>1000,31514=>1000,31515=>1000,31516=>1000,31517=>1000,31518=>1000,31519=>1000,31520=>1000,31521=>1000,31522=>1000,31523=>1000,31524=>1000,
-	31525=>1000,31526=>1000,31527=>1000,31528=>1000,31529=>1000,31530=>1000,31531=>1000,31532=>1000,31533=>1000,31534=>1000,31535=>1000,31536=>1000,31537=>1000,31538=>1000,31539=>1000,31540=>1000,
-	31541=>1000,31542=>1000,31543=>1000,31544=>1000,31545=>1000,31546=>1000,31547=>1000,31548=>1000,31549=>1000,31550=>1000,31551=>1000,31552=>1000,31553=>1000,31554=>1000,31555=>1000,31556=>1000,
-	31557=>1000,31558=>1000,31559=>1000,31560=>1000,31561=>1000,31562=>1000,31563=>1000,31564=>1000,31565=>1000,31566=>1000,31567=>1000,31568=>1000,31569=>1000,31570=>1000,31571=>1000,31572=>1000,
-	31573=>1000,31574=>1000,31575=>1000,31576=>1000,31577=>1000,31578=>1000,31579=>1000,31580=>1000,31581=>1000,31582=>1000,31583=>1000,31584=>1000,31585=>1000,31586=>1000,31587=>1000,31588=>1000,
-	31589=>1000,31590=>1000,31591=>1000,31592=>1000,31593=>1000,31594=>1000,31595=>1000,31596=>1000,31597=>1000,31598=>1000,31599=>1000,31600=>1000,31601=>1000,31602=>1000,31603=>1000,31604=>1000,
-	31605=>1000,31606=>1000,31607=>1000,31608=>1000,31609=>1000,31610=>1000,31611=>1000,31612=>1000,31613=>1000,31614=>1000,31615=>1000,31616=>1000,31617=>1000,31618=>1000,31619=>1000,31620=>1000,
-	31621=>1000,31622=>1000,31623=>1000,31624=>1000,31625=>1000,31626=>1000,31627=>1000,31628=>1000,31629=>1000,31630=>1000,31631=>1000,31632=>1000,31633=>1000,31634=>1000,31635=>1000,31636=>1000,
-	31637=>1000,31638=>1000,31639=>1000,31640=>1000,31641=>1000,31642=>1000,31643=>1000,31644=>1000,31645=>1000,31646=>1000,31647=>1000,31648=>1000,31649=>1000,31650=>1000,31651=>1000,31652=>1000,
-	31653=>1000,31654=>1000,31655=>1000,31656=>1000,31657=>1000,31658=>1000,31659=>1000,31660=>1000,31661=>1000,31662=>1000,31663=>1000,31664=>1000,31665=>1000,31666=>1000,31667=>1000,31668=>1000,
-	31669=>1000,31670=>1000,31671=>1000,31672=>1000,31673=>1000,31674=>1000,31675=>1000,31676=>1000,31677=>1000,31678=>1000,31679=>1000,31680=>1000,31681=>1000,31682=>1000,31683=>1000,31684=>1000,
-	31685=>1000,31686=>1000,31687=>1000,31688=>1000,31689=>1000,31690=>1000,31691=>1000,31692=>1000,31693=>1000,31694=>1000,31695=>1000,31696=>1000,31697=>1000,31698=>1000,31699=>1000,31700=>1000,
-	31701=>1000,31702=>1000,31703=>1000,31704=>1000,31705=>1000,31706=>1000,31707=>1000,31708=>1000,31709=>1000,31710=>1000,31711=>1000,31712=>1000,31713=>1000,31714=>1000,31715=>1000,31716=>1000,
-	31717=>1000,31718=>1000,31719=>1000,31720=>1000,31721=>1000,31722=>1000,31723=>1000,31724=>1000,31725=>1000,31726=>1000,31727=>1000,31728=>1000,31729=>1000,31730=>1000,31731=>1000,31732=>1000,
-	31733=>1000,31734=>1000,31735=>1000,31736=>1000,31737=>1000,31738=>1000,31739=>1000,31740=>1000,31741=>1000,31742=>1000,31743=>1000,31744=>1000,31745=>1000,31746=>1000,31747=>1000,31748=>1000,
-	31749=>1000,31750=>1000,31751=>1000,31752=>1000,31753=>1000,31754=>1000,31755=>1000,31756=>1000,31757=>1000,31758=>1000,31759=>1000,31760=>1000,31761=>1000,31762=>1000,31763=>1000,31764=>1000,
-	31765=>1000,31766=>1000,31767=>1000,31768=>1000,31769=>1000,31770=>1000,31771=>1000,31772=>1000,31773=>1000,31774=>1000,31775=>1000,31776=>1000,31777=>1000,31778=>1000,31779=>1000,31780=>1000,
-	31781=>1000,31782=>1000,31783=>1000,31784=>1000,31785=>1000,31786=>1000,31787=>1000,31788=>1000,31789=>1000,31790=>1000,31791=>1000,31792=>1000,31793=>1000,31794=>1000,31795=>1000,31796=>1000,
-	31797=>1000,31798=>1000,31799=>1000,31800=>1000,31801=>1000,31802=>1000,31803=>1000,31804=>1000,31805=>1000,31806=>1000,31807=>1000,31808=>1000,31809=>1000,31810=>1000,31811=>1000,31812=>1000,
-	31813=>1000,31814=>1000,31815=>1000,31816=>1000,31817=>1000,31818=>1000,31819=>1000,31820=>1000,31821=>1000,31822=>1000,31823=>1000,31824=>1000,31825=>1000,31826=>1000,31827=>1000,31828=>1000,
-	31829=>1000,31830=>1000,31831=>1000,31832=>1000,31833=>1000,31834=>1000,31835=>1000,31836=>1000,31837=>1000,31838=>1000,31839=>1000,31840=>1000,31841=>1000,31842=>1000,31843=>1000,31844=>1000,
-	31845=>1000,31846=>1000,31847=>1000,31848=>1000,31849=>1000,31850=>1000,31851=>1000,31852=>1000,31853=>1000,31854=>1000,31855=>1000,31856=>1000,31857=>1000,31858=>1000,31859=>1000,31860=>1000,
-	31861=>1000,31862=>1000,31863=>1000,31864=>1000,31865=>1000,31866=>1000,31867=>1000,31868=>1000,31869=>1000,31870=>1000,31871=>1000,31872=>1000,31873=>1000,31874=>1000,31875=>1000,31876=>1000,
-	31877=>1000,31878=>1000,31879=>1000,31880=>1000,31881=>1000,31882=>1000,31883=>1000,31884=>1000,31885=>1000,31886=>1000,31887=>1000,31888=>1000,31889=>1000,31890=>1000,31891=>1000,31892=>1000,
-	31893=>1000,31894=>1000,31895=>1000,31896=>1000,31897=>1000,31898=>1000,31899=>1000,31900=>1000,31901=>1000,31902=>1000,31903=>1000,31904=>1000,31905=>1000,31906=>1000,31907=>1000,31908=>1000,
-	31909=>1000,31910=>1000,31911=>1000,31912=>1000,31913=>1000,31914=>1000,31915=>1000,31916=>1000,31917=>1000,31918=>1000,31919=>1000,31920=>1000,31921=>1000,31922=>1000,31923=>1000,31924=>1000,
-	31925=>1000,31926=>1000,31927=>1000,31928=>1000,31929=>1000,31930=>1000,31931=>1000,31932=>1000,31933=>1000,31934=>1000,31935=>1000,31936=>1000,31937=>1000,31938=>1000,31939=>1000,31940=>1000,
-	31941=>1000,31942=>1000,31943=>1000,31944=>1000,31945=>1000,31946=>1000,31947=>1000,31948=>1000,31949=>1000,31950=>1000,31951=>1000,31952=>1000,31953=>1000,31954=>1000,31955=>1000,31956=>1000,
-	31957=>1000,31958=>1000,31959=>1000,31960=>1000,31961=>1000,31962=>1000,31963=>1000,31964=>1000,31965=>1000,31966=>1000,31967=>1000,31968=>1000,31969=>1000,31970=>1000,31971=>1000,31972=>1000,
-	31973=>1000,31974=>1000,31975=>1000,31976=>1000,31977=>1000,31978=>1000,31979=>1000,31980=>1000,31981=>1000,31982=>1000,31983=>1000,31984=>1000,31985=>1000,31986=>1000,31987=>1000,31988=>1000,
-	31989=>1000,31990=>1000,31991=>1000,31992=>1000,31993=>1000,31994=>1000,31995=>1000,31996=>1000,31997=>1000,31998=>1000,31999=>1000,32000=>1000,32001=>1000,32002=>1000,32003=>1000,32004=>1000,
-	32005=>1000,32006=>1000,32007=>1000,32008=>1000,32009=>1000,32010=>1000,32011=>1000,32012=>1000,32013=>1000,32014=>1000,32015=>1000,32016=>1000,32017=>1000,32018=>1000,32019=>1000,32020=>1000,
-	32021=>1000,32022=>1000,32023=>1000,32024=>1000,32025=>1000,32026=>1000,32027=>1000,32028=>1000,32029=>1000,32030=>1000,32031=>1000,32032=>1000,32033=>1000,32034=>1000,32035=>1000,32036=>1000,
-	32037=>1000,32038=>1000,32039=>1000,32040=>1000,32041=>1000,32042=>1000,32043=>1000,32044=>1000,32045=>1000,32046=>1000,32047=>1000,32048=>1000,32049=>1000,32050=>1000,32051=>1000,32052=>1000,
-	32053=>1000,32054=>1000,32055=>1000,32056=>1000,32057=>1000,32058=>1000,32059=>1000,32060=>1000,32061=>1000,32062=>1000,32063=>1000,32064=>1000,32065=>1000,32066=>1000,32067=>1000,32068=>1000,
-	32069=>1000,32070=>1000,32071=>1000,32072=>1000,32073=>1000,32074=>1000,32075=>1000,32076=>1000,32077=>1000,32078=>1000,32079=>1000,32080=>1000,32081=>1000,32082=>1000,32083=>1000,32084=>1000,
-	32085=>1000,32086=>1000,32087=>1000,32088=>1000,32089=>1000,32090=>1000,32091=>1000,32092=>1000,32093=>1000,32094=>1000,32095=>1000,32096=>1000,32097=>1000,32098=>1000,32099=>1000,32100=>1000,
-	32101=>1000,32102=>1000,32103=>1000,32104=>1000,32105=>1000,32106=>1000,32107=>1000,32108=>1000,32109=>1000,32110=>1000,32111=>1000,32112=>1000,32113=>1000,32114=>1000,32115=>1000,32116=>1000,
-	32117=>1000,32118=>1000,32119=>1000,32120=>1000,32121=>1000,32122=>1000,32123=>1000,32124=>1000,32125=>1000,32126=>1000,32127=>1000,32128=>1000,32129=>1000,32130=>1000,32131=>1000,32132=>1000,
-	32133=>1000,32134=>1000,32135=>1000,32136=>1000,32137=>1000,32138=>1000,32139=>1000,32140=>1000,32141=>1000,32142=>1000,32143=>1000,32144=>1000,32145=>1000,32146=>1000,32147=>1000,32148=>1000,
-	32149=>1000,32150=>1000,32151=>1000,32152=>1000,32153=>1000,32154=>1000,32155=>1000,32156=>1000,32157=>1000,32158=>1000,32159=>1000,32160=>1000,32161=>1000,32162=>1000,32163=>1000,32164=>1000,
-	32165=>1000,32166=>1000,32167=>1000,32168=>1000,32169=>1000,32170=>1000,32171=>1000,32172=>1000,32173=>1000,32174=>1000,32175=>1000,32176=>1000,32177=>1000,32178=>1000,32179=>1000,32180=>1000,
-	32181=>1000,32182=>1000,32183=>1000,32184=>1000,32185=>1000,32186=>1000,32187=>1000,32188=>1000,32189=>1000,32190=>1000,32191=>1000,32192=>1000,32193=>1000,32194=>1000,32195=>1000,32196=>1000,
-	32197=>1000,32198=>1000,32199=>1000,32200=>1000,32201=>1000,32202=>1000,32203=>1000,32204=>1000,32205=>1000,32206=>1000,32207=>1000,32208=>1000,32209=>1000,32210=>1000,32211=>1000,32212=>1000,
-	32213=>1000,32214=>1000,32215=>1000,32216=>1000,32217=>1000,32218=>1000,32219=>1000,32220=>1000,32221=>1000,32222=>1000,32223=>1000,32224=>1000,32225=>1000,32226=>1000,32227=>1000,32228=>1000,
-	32229=>1000,32230=>1000,32231=>1000,32232=>1000,32233=>1000,32234=>1000,32235=>1000,32236=>1000,32237=>1000,32238=>1000,32239=>1000,32240=>1000,32241=>1000,32242=>1000,32243=>1000,32244=>1000,
-	32245=>1000,32246=>1000,32247=>1000,32248=>1000,32249=>1000,32250=>1000,32251=>1000,32252=>1000,32253=>1000,32254=>1000,32255=>1000,32256=>1000,32257=>1000,32258=>1000,32259=>1000,32260=>1000,
-	32261=>1000,32262=>1000,32263=>1000,32264=>1000,32265=>1000,32266=>1000,32267=>1000,32268=>1000,32269=>1000,32270=>1000,32271=>1000,32272=>1000,32273=>1000,32274=>1000,32275=>1000,32276=>1000,
-	32277=>1000,32278=>1000,32279=>1000,32280=>1000,32281=>1000,32282=>1000,32283=>1000,32284=>1000,32285=>1000,32286=>1000,32287=>1000,32288=>1000,32289=>1000,32290=>1000,32291=>1000,32292=>1000,
-	32293=>1000,32294=>1000,32295=>1000,32296=>1000,32297=>1000,32298=>1000,32299=>1000,32300=>1000,32301=>1000,32302=>1000,32303=>1000,32304=>1000,32305=>1000,32306=>1000,32307=>1000,32308=>1000,
-	32309=>1000,32310=>1000,32311=>1000,32312=>1000,32313=>1000,32314=>1000,32315=>1000,32316=>1000,32317=>1000,32318=>1000,32319=>1000,32320=>1000,32321=>1000,32322=>1000,32323=>1000,32324=>1000,
-	32325=>1000,32326=>1000,32327=>1000,32328=>1000,32329=>1000,32330=>1000,32331=>1000,32332=>1000,32333=>1000,32334=>1000,32335=>1000,32336=>1000,32337=>1000,32338=>1000,32339=>1000,32340=>1000,
-	32341=>1000,32342=>1000,32343=>1000,32344=>1000,32345=>1000,32346=>1000,32347=>1000,32348=>1000,32349=>1000,32350=>1000,32351=>1000,32352=>1000,32353=>1000,32354=>1000,32355=>1000,32356=>1000,
-	32357=>1000,32358=>1000,32359=>1000,32360=>1000,32361=>1000,32362=>1000,32363=>1000,32364=>1000,32365=>1000,32366=>1000,32367=>1000,32368=>1000,32369=>1000,32370=>1000,32371=>1000,32372=>1000,
-	32373=>1000,32374=>1000,32375=>1000,32376=>1000,32377=>1000,32378=>1000,32379=>1000,32380=>1000,32381=>1000,32382=>1000,32383=>1000,32384=>1000,32385=>1000,32386=>1000,32387=>1000,32388=>1000,
-	32389=>1000,32390=>1000,32391=>1000,32392=>1000,32393=>1000,32394=>1000,32395=>1000,32396=>1000,32397=>1000,32398=>1000,32399=>1000,32400=>1000,32401=>1000,32402=>1000,32403=>1000,32404=>1000,
-	32405=>1000,32406=>1000,32407=>1000,32408=>1000,32409=>1000,32410=>1000,32411=>1000,32412=>1000,32413=>1000,32414=>1000,32415=>1000,32416=>1000,32417=>1000,32418=>1000,32419=>1000,32420=>1000,
-	32421=>1000,32422=>1000,32423=>1000,32424=>1000,32425=>1000,32426=>1000,32427=>1000,32428=>1000,32429=>1000,32430=>1000,32431=>1000,32432=>1000,32433=>1000,32434=>1000,32435=>1000,32436=>1000,
-	32437=>1000,32438=>1000,32439=>1000,32440=>1000,32441=>1000,32442=>1000,32443=>1000,32444=>1000,32445=>1000,32446=>1000,32447=>1000,32448=>1000,32449=>1000,32450=>1000,32451=>1000,32452=>1000,
-	32453=>1000,32454=>1000,32455=>1000,32456=>1000,32457=>1000,32458=>1000,32459=>1000,32460=>1000,32461=>1000,32462=>1000,32463=>1000,32464=>1000,32465=>1000,32466=>1000,32467=>1000,32468=>1000,
-	32469=>1000,32470=>1000,32471=>1000,32472=>1000,32473=>1000,32474=>1000,32475=>1000,32476=>1000,32477=>1000,32478=>1000,32479=>1000,32480=>1000,32481=>1000,32482=>1000,32483=>1000,32484=>1000,
-	32485=>1000,32486=>1000,32487=>1000,32488=>1000,32489=>1000,32490=>1000,32491=>1000,32492=>1000,32493=>1000,32494=>1000,32495=>1000,32496=>1000,32497=>1000,32498=>1000,32499=>1000,32500=>1000,
-	32501=>1000,32502=>1000,32503=>1000,32504=>1000,32505=>1000,32506=>1000,32507=>1000,32508=>1000,32509=>1000,32510=>1000,32511=>1000,32512=>1000,32513=>1000,32514=>1000,32515=>1000,32516=>1000,
-	32517=>1000,32518=>1000,32519=>1000,32520=>1000,32521=>1000,32522=>1000,32523=>1000,32524=>1000,32525=>1000,32526=>1000,32527=>1000,32528=>1000,32529=>1000,32530=>1000,32531=>1000,32532=>1000,
-	32533=>1000,32534=>1000,32535=>1000,32536=>1000,32537=>1000,32538=>1000,32539=>1000,32540=>1000,32541=>1000,32542=>1000,32543=>1000,32544=>1000,32545=>1000,32546=>1000,32547=>1000,32548=>1000,
-	32549=>1000,32550=>1000,32551=>1000,32552=>1000,32553=>1000,32554=>1000,32555=>1000,32556=>1000,32557=>1000,32558=>1000,32559=>1000,32560=>1000,32561=>1000,32562=>1000,32563=>1000,32564=>1000,
-	32565=>1000,32566=>1000,32567=>1000,32568=>1000,32569=>1000,32570=>1000,32571=>1000,32572=>1000,32573=>1000,32574=>1000,32575=>1000,32576=>1000,32577=>1000,32578=>1000,32579=>1000,32580=>1000,
-	32581=>1000,32582=>1000,32583=>1000,32584=>1000,32585=>1000,32586=>1000,32587=>1000,32588=>1000,32589=>1000,32590=>1000,32591=>1000,32592=>1000,32593=>1000,32594=>1000,32595=>1000,32596=>1000,
-	32597=>1000,32598=>1000,32599=>1000,32600=>1000,32601=>1000,32602=>1000,32603=>1000,32604=>1000,32605=>1000,32606=>1000,32607=>1000,32608=>1000,32609=>1000,32610=>1000,32611=>1000,32612=>1000,
-	32613=>1000,32614=>1000,32615=>1000,32616=>1000,32617=>1000,32618=>1000,32619=>1000,32620=>1000,32621=>1000,32622=>1000,32623=>1000,32624=>1000,32625=>1000,32626=>1000,32627=>1000,32628=>1000,
-	32629=>1000,32630=>1000,32631=>1000,32632=>1000,32633=>1000,32634=>1000,32635=>1000,32636=>1000,32637=>1000,32638=>1000,32639=>1000,32640=>1000,32641=>1000,32642=>1000,32643=>1000,32644=>1000,
-	32645=>1000,32646=>1000,32647=>1000,32648=>1000,32649=>1000,32650=>1000,32651=>1000,32652=>1000,32653=>1000,32654=>1000,32655=>1000,32656=>1000,32657=>1000,32658=>1000,32659=>1000,32660=>1000,
-	32661=>1000,32662=>1000,32663=>1000,32664=>1000,32665=>1000,32666=>1000,32667=>1000,32668=>1000,32669=>1000,32670=>1000,32671=>1000,32672=>1000,32673=>1000,32674=>1000,32675=>1000,32676=>1000,
-	32677=>1000,32678=>1000,32679=>1000,32680=>1000,32681=>1000,32682=>1000,32683=>1000,32684=>1000,32685=>1000,32686=>1000,32687=>1000,32688=>1000,32689=>1000,32690=>1000,32691=>1000,32692=>1000,
-	32693=>1000,32694=>1000,32695=>1000,32696=>1000,32697=>1000,32698=>1000,32699=>1000,32700=>1000,32701=>1000,32702=>1000,32703=>1000,32704=>1000,32705=>1000,32706=>1000,32707=>1000,32708=>1000,
-	32709=>1000,32710=>1000,32711=>1000,32712=>1000,32713=>1000,32714=>1000,32715=>1000,32716=>1000,32717=>1000,32718=>1000,32719=>1000,32720=>1000,32721=>1000,32722=>1000,32723=>1000,32724=>1000,
-	32725=>1000,32726=>1000,32727=>1000,32728=>1000,32729=>1000,32730=>1000,32731=>1000,32732=>1000,32733=>1000,32734=>1000,32735=>1000,32736=>1000,32737=>1000,32738=>1000,32739=>1000,32740=>1000,
-	32741=>1000,32742=>1000,32743=>1000,32744=>1000,32745=>1000,32746=>1000,32747=>1000,32748=>1000,32749=>1000,32750=>1000,32751=>1000,32752=>1000,32753=>1000,32754=>1000,32755=>1000,32756=>1000,
-	32757=>1000,32758=>1000,32759=>1000,32760=>1000,32761=>1000,32762=>1000,32763=>1000,32764=>1000,32765=>1000,32766=>1000,32767=>1000,32768=>1000,32769=>1000,32770=>1000,32771=>1000,32772=>1000,
-	32773=>1000,32774=>1000,32775=>1000,32776=>1000,32777=>1000,32778=>1000,32779=>1000,32780=>1000,32781=>1000,32782=>1000,32783=>1000,32784=>1000,32785=>1000,32786=>1000,32787=>1000,32788=>1000,
-	32789=>1000,32790=>1000,32791=>1000,32792=>1000,32793=>1000,32794=>1000,32795=>1000,32796=>1000,32797=>1000,32798=>1000,32799=>1000,32800=>1000,32801=>1000,32802=>1000,32803=>1000,32804=>1000,
-	32805=>1000,32806=>1000,32807=>1000,32808=>1000,32809=>1000,32810=>1000,32811=>1000,32812=>1000,32813=>1000,32814=>1000,32815=>1000,32816=>1000,32817=>1000,32818=>1000,32819=>1000,32820=>1000,
-	32821=>1000,32822=>1000,32823=>1000,32824=>1000,32825=>1000,32826=>1000,32827=>1000,32828=>1000,32829=>1000,32830=>1000,32831=>1000,32832=>1000,32833=>1000,32834=>1000,32835=>1000,32836=>1000,
-	32837=>1000,32838=>1000,32839=>1000,32840=>1000,32841=>1000,32842=>1000,32843=>1000,32844=>1000,32845=>1000,32846=>1000,32847=>1000,32848=>1000,32849=>1000,32850=>1000,32851=>1000,32852=>1000,
-	32853=>1000,32854=>1000,32855=>1000,32856=>1000,32857=>1000,32858=>1000,32859=>1000,32860=>1000,32861=>1000,32862=>1000,32863=>1000,32864=>1000,32865=>1000,32866=>1000,32867=>1000,32868=>1000,
-	32869=>1000,32870=>1000,32871=>1000,32872=>1000,32873=>1000,32874=>1000,32875=>1000,32876=>1000,32877=>1000,32878=>1000,32879=>1000,32880=>1000,32881=>1000,32882=>1000,32883=>1000,32884=>1000,
-	32885=>1000,32886=>1000,32887=>1000,32888=>1000,32889=>1000,32890=>1000,32891=>1000,32892=>1000,32893=>1000,32894=>1000,32895=>1000,32896=>1000,32897=>1000,32898=>1000,32899=>1000,32900=>1000,
-	32901=>1000,32902=>1000,32903=>1000,32904=>1000,32905=>1000,32906=>1000,32907=>1000,32908=>1000,32909=>1000,32910=>1000,32911=>1000,32912=>1000,32913=>1000,32914=>1000,32915=>1000,32916=>1000,
-	32917=>1000,32918=>1000,32919=>1000,32920=>1000,32921=>1000,32922=>1000,32923=>1000,32924=>1000,32925=>1000,32926=>1000,32927=>1000,32928=>1000,32929=>1000,32930=>1000,32931=>1000,32932=>1000,
-	32933=>1000,32934=>1000,32935=>1000,32936=>1000,32937=>1000,32938=>1000,32939=>1000,32940=>1000,32941=>1000,32942=>1000,32943=>1000,32944=>1000,32945=>1000,32946=>1000,32947=>1000,32948=>1000,
-	32949=>1000,32950=>1000,32951=>1000,32952=>1000,32953=>1000,32954=>1000,32955=>1000,32956=>1000,32957=>1000,32958=>1000,32959=>1000,32960=>1000,32961=>1000,32962=>1000,32963=>1000,32964=>1000,
-	32965=>1000,32966=>1000,32967=>1000,32968=>1000,32969=>1000,32970=>1000,32971=>1000,32972=>1000,32973=>1000,32974=>1000,32975=>1000,32976=>1000,32977=>1000,32978=>1000,32979=>1000,32980=>1000,
-	32981=>1000,32982=>1000,32983=>1000,32984=>1000,32985=>1000,32986=>1000,32987=>1000,32988=>1000,32989=>1000,32990=>1000,32991=>1000,32992=>1000,32993=>1000,32994=>1000,32995=>1000,32996=>1000,
-	32997=>1000,32998=>1000,32999=>1000,33000=>1000,33001=>1000,33002=>1000,33003=>1000,33004=>1000,33005=>1000,33006=>1000,33007=>1000,33008=>1000,33009=>1000,33010=>1000,33011=>1000,33012=>1000,
-	33013=>1000,33014=>1000,33015=>1000,33016=>1000,33017=>1000,33018=>1000,33019=>1000,33020=>1000,33021=>1000,33022=>1000,33023=>1000,33024=>1000,33025=>1000,33026=>1000,33027=>1000,33028=>1000,
-	33029=>1000,33030=>1000,33031=>1000,33032=>1000,33033=>1000,33034=>1000,33035=>1000,33036=>1000,33037=>1000,33038=>1000,33039=>1000,33040=>1000,33041=>1000,33042=>1000,33043=>1000,33044=>1000,
-	33045=>1000,33046=>1000,33047=>1000,33048=>1000,33049=>1000,33050=>1000,33051=>1000,33052=>1000,33053=>1000,33054=>1000,33055=>1000,33056=>1000,33057=>1000,33058=>1000,33059=>1000,33060=>1000,
-	33061=>1000,33062=>1000,33063=>1000,33064=>1000,33065=>1000,33066=>1000,33067=>1000,33068=>1000,33069=>1000,33070=>1000,33071=>1000,33072=>1000,33073=>1000,33074=>1000,33075=>1000,33076=>1000,
-	33077=>1000,33078=>1000,33079=>1000,33080=>1000,33081=>1000,33082=>1000,33083=>1000,33084=>1000,33085=>1000,33086=>1000,33087=>1000,33088=>1000,33089=>1000,33090=>1000,33091=>1000,33092=>1000,
-	33093=>1000,33094=>1000,33095=>1000,33096=>1000,33097=>1000,33098=>1000,33099=>1000,33100=>1000,33101=>1000,33102=>1000,33103=>1000,33104=>1000,33105=>1000,33106=>1000,33107=>1000,33108=>1000,
-	33109=>1000,33110=>1000,33111=>1000,33112=>1000,33113=>1000,33114=>1000,33115=>1000,33116=>1000,33117=>1000,33118=>1000,33119=>1000,33120=>1000,33121=>1000,33122=>1000,33123=>1000,33124=>1000,
-	33125=>1000,33126=>1000,33127=>1000,33128=>1000,33129=>1000,33130=>1000,33131=>1000,33132=>1000,33133=>1000,33134=>1000,33135=>1000,33136=>1000,33137=>1000,33138=>1000,33139=>1000,33140=>1000,
-	33141=>1000,33142=>1000,33143=>1000,33144=>1000,33145=>1000,33146=>1000,33147=>1000,33148=>1000,33149=>1000,33150=>1000,33151=>1000,33152=>1000,33153=>1000,33154=>1000,33155=>1000,33156=>1000,
-	33157=>1000,33158=>1000,33159=>1000,33160=>1000,33161=>1000,33162=>1000,33163=>1000,33164=>1000,33165=>1000,33166=>1000,33167=>1000,33168=>1000,33169=>1000,33170=>1000,33171=>1000,33172=>1000,
-	33173=>1000,33174=>1000,33175=>1000,33176=>1000,33177=>1000,33178=>1000,33179=>1000,33180=>1000,33181=>1000,33182=>1000,33183=>1000,33184=>1000,33185=>1000,33186=>1000,33187=>1000,33188=>1000,
-	33189=>1000,33190=>1000,33191=>1000,33192=>1000,33193=>1000,33194=>1000,33195=>1000,33196=>1000,33197=>1000,33198=>1000,33199=>1000,33200=>1000,33201=>1000,33202=>1000,33203=>1000,33204=>1000,
-	33205=>1000,33206=>1000,33207=>1000,33208=>1000,33209=>1000,33210=>1000,33211=>1000,33212=>1000,33213=>1000,33214=>1000,33215=>1000,33216=>1000,33217=>1000,33218=>1000,33219=>1000,33220=>1000,
-	33221=>1000,33222=>1000,33223=>1000,33224=>1000,33225=>1000,33226=>1000,33227=>1000,33228=>1000,33229=>1000,33230=>1000,33231=>1000,33232=>1000,33233=>1000,33234=>1000,33235=>1000,33236=>1000,
-	33237=>1000,33238=>1000,33239=>1000,33240=>1000,33241=>1000,33242=>1000,33243=>1000,33244=>1000,33245=>1000,33246=>1000,33247=>1000,33248=>1000,33249=>1000,33250=>1000,33251=>1000,33252=>1000,
-	33253=>1000,33254=>1000,33255=>1000,33256=>1000,33257=>1000,33258=>1000,33259=>1000,33260=>1000,33261=>1000,33262=>1000,33263=>1000,33264=>1000,33265=>1000,33266=>1000,33267=>1000,33268=>1000,
-	33269=>1000,33270=>1000,33271=>1000,33272=>1000,33273=>1000,33274=>1000,33275=>1000,33276=>1000,33277=>1000,33278=>1000,33279=>1000,33280=>1000,33281=>1000,33282=>1000,33283=>1000,33284=>1000,
-	33285=>1000,33286=>1000,33287=>1000,33288=>1000,33289=>1000,33290=>1000,33291=>1000,33292=>1000,33293=>1000,33294=>1000,33295=>1000,33296=>1000,33297=>1000,33298=>1000,33299=>1000,33300=>1000,
-	33301=>1000,33302=>1000,33303=>1000,33304=>1000,33305=>1000,33306=>1000,33307=>1000,33308=>1000,33309=>1000,33310=>1000,33311=>1000,33312=>1000,33313=>1000,33314=>1000,33315=>1000,33316=>1000,
-	33317=>1000,33318=>1000,33319=>1000,33320=>1000,33321=>1000,33322=>1000,33323=>1000,33324=>1000,33325=>1000,33326=>1000,33327=>1000,33328=>1000,33329=>1000,33330=>1000,33331=>1000,33332=>1000,
-	33333=>1000,33334=>1000,33335=>1000,33336=>1000,33337=>1000,33338=>1000,33339=>1000,33340=>1000,33341=>1000,33342=>1000,33343=>1000,33344=>1000,33345=>1000,33346=>1000,33347=>1000,33348=>1000,
-	33349=>1000,33350=>1000,33351=>1000,33352=>1000,33353=>1000,33354=>1000,33355=>1000,33356=>1000,33357=>1000,33358=>1000,33359=>1000,33360=>1000,33361=>1000,33362=>1000,33363=>1000,33364=>1000,
-	33365=>1000,33366=>1000,33367=>1000,33368=>1000,33369=>1000,33370=>1000,33371=>1000,33372=>1000,33373=>1000,33374=>1000,33375=>1000,33376=>1000,33377=>1000,33378=>1000,33379=>1000,33380=>1000,
-	33381=>1000,33382=>1000,33383=>1000,33384=>1000,33385=>1000,33386=>1000,33387=>1000,33388=>1000,33389=>1000,33390=>1000,33391=>1000,33392=>1000,33393=>1000,33394=>1000,33395=>1000,33396=>1000,
-	33397=>1000,33398=>1000,33399=>1000,33400=>1000,33401=>1000,33402=>1000,33403=>1000,33404=>1000,33405=>1000,33406=>1000,33407=>1000,33408=>1000,33409=>1000,33410=>1000,33411=>1000,33412=>1000,
-	33413=>1000,33414=>1000,33415=>1000,33416=>1000,33417=>1000,33418=>1000,33419=>1000,33420=>1000,33421=>1000,33422=>1000,33423=>1000,33424=>1000,33425=>1000,33426=>1000,33427=>1000,33428=>1000,
-	33429=>1000,33430=>1000,33431=>1000,33432=>1000,33433=>1000,33434=>1000,33435=>1000,33436=>1000,33437=>1000,33438=>1000,33439=>1000,33440=>1000,33441=>1000,33442=>1000,33443=>1000,33444=>1000,
-	33445=>1000,33446=>1000,33447=>1000,33448=>1000,33449=>1000,33450=>1000,33451=>1000,33452=>1000,33453=>1000,33454=>1000,33455=>1000,33456=>1000,33457=>1000,33458=>1000,33459=>1000,33460=>1000,
-	33461=>1000,33462=>1000,33463=>1000,33464=>1000,33465=>1000,33466=>1000,33467=>1000,33468=>1000,33469=>1000,33470=>1000,33471=>1000,33472=>1000,33473=>1000,33474=>1000,33475=>1000,33476=>1000,
-	33477=>1000,33478=>1000,33479=>1000,33480=>1000,33481=>1000,33482=>1000,33483=>1000,33484=>1000,33485=>1000,33486=>1000,33487=>1000,33488=>1000,33489=>1000,33490=>1000,33491=>1000,33492=>1000,
-	33493=>1000,33494=>1000,33495=>1000,33496=>1000,33497=>1000,33498=>1000,33499=>1000,33500=>1000,33501=>1000,33502=>1000,33503=>1000,33504=>1000,33505=>1000,33506=>1000,33507=>1000,33508=>1000,
-	33509=>1000,33510=>1000,33511=>1000,33512=>1000,33513=>1000,33514=>1000,33515=>1000,33516=>1000,33517=>1000,33518=>1000,33519=>1000,33520=>1000,33521=>1000,33522=>1000,33523=>1000,33524=>1000,
-	33525=>1000,33526=>1000,33527=>1000,33528=>1000,33529=>1000,33530=>1000,33531=>1000,33532=>1000,33533=>1000,33534=>1000,33535=>1000,33536=>1000,33537=>1000,33538=>1000,33539=>1000,33540=>1000,
-	33541=>1000,33542=>1000,33543=>1000,33544=>1000,33545=>1000,33546=>1000,33547=>1000,33548=>1000,33549=>1000,33550=>1000,33551=>1000,33552=>1000,33553=>1000,33554=>1000,33555=>1000,33556=>1000,
-	33557=>1000,33558=>1000,33559=>1000,33560=>1000,33561=>1000,33562=>1000,33563=>1000,33564=>1000,33565=>1000,33566=>1000,33567=>1000,33568=>1000,33569=>1000,33570=>1000,33571=>1000,33572=>1000,
-	33573=>1000,33574=>1000,33575=>1000,33576=>1000,33577=>1000,33578=>1000,33579=>1000,33580=>1000,33581=>1000,33582=>1000,33583=>1000,33584=>1000,33585=>1000,33586=>1000,33587=>1000,33588=>1000,
-	33589=>1000,33590=>1000,33591=>1000,33592=>1000,33593=>1000,33594=>1000,33595=>1000,33596=>1000,33597=>1000,33598=>1000,33599=>1000,33600=>1000,33601=>1000,33602=>1000,33603=>1000,33604=>1000,
-	33605=>1000,33606=>1000,33607=>1000,33608=>1000,33609=>1000,33610=>1000,33611=>1000,33612=>1000,33613=>1000,33614=>1000,33615=>1000,33616=>1000,33617=>1000,33618=>1000,33619=>1000,33620=>1000,
-	33621=>1000,33622=>1000,33623=>1000,33624=>1000,33625=>1000,33626=>1000,33627=>1000,33628=>1000,33629=>1000,33630=>1000,33631=>1000,33632=>1000,33633=>1000,33634=>1000,33635=>1000,33636=>1000,
-	33637=>1000,33638=>1000,33639=>1000,33640=>1000,33641=>1000,33642=>1000,33643=>1000,33644=>1000,33645=>1000,33646=>1000,33647=>1000,33648=>1000,33649=>1000,33650=>1000,33651=>1000,33652=>1000,
-	33653=>1000,33654=>1000,33655=>1000,33656=>1000,33657=>1000,33658=>1000,33659=>1000,33660=>1000,33661=>1000,33662=>1000,33663=>1000,33664=>1000,33665=>1000,33666=>1000,33667=>1000,33668=>1000,
-	33669=>1000,33670=>1000,33671=>1000,33672=>1000,33673=>1000,33674=>1000,33675=>1000,33676=>1000,33677=>1000,33678=>1000,33679=>1000,33680=>1000,33681=>1000,33682=>1000,33683=>1000,33684=>1000,
-	33685=>1000,33686=>1000,33687=>1000,33688=>1000,33689=>1000,33690=>1000,33691=>1000,33692=>1000,33693=>1000,33694=>1000,33695=>1000,33696=>1000,33697=>1000,33698=>1000,33699=>1000,33700=>1000,
-	33701=>1000,33702=>1000,33703=>1000,33704=>1000,33705=>1000,33706=>1000,33707=>1000,33708=>1000,33709=>1000,33710=>1000,33711=>1000,33712=>1000,33713=>1000,33714=>1000,33715=>1000,33716=>1000,
-	33717=>1000,33718=>1000,33719=>1000,33720=>1000,33721=>1000,33722=>1000,33723=>1000,33724=>1000,33725=>1000,33726=>1000,33727=>1000,33728=>1000,33729=>1000,33730=>1000,33731=>1000,33732=>1000,
-	33733=>1000,33734=>1000,33735=>1000,33736=>1000,33737=>1000,33738=>1000,33739=>1000,33740=>1000,33741=>1000,33742=>1000,33743=>1000,33744=>1000,33745=>1000,33746=>1000,33747=>1000,33748=>1000,
-	33749=>1000,33750=>1000,33751=>1000,33752=>1000,33753=>1000,33754=>1000,33755=>1000,33756=>1000,33757=>1000,33758=>1000,33759=>1000,33760=>1000,33761=>1000,33762=>1000,33763=>1000,33764=>1000,
-	33765=>1000,33766=>1000,33767=>1000,33768=>1000,33769=>1000,33770=>1000,33771=>1000,33772=>1000,33773=>1000,33774=>1000,33775=>1000,33776=>1000,33777=>1000,33778=>1000,33779=>1000,33780=>1000,
-	33781=>1000,33782=>1000,33783=>1000,33784=>1000,33785=>1000,33786=>1000,33787=>1000,33788=>1000,33789=>1000,33790=>1000,33791=>1000,33792=>1000,33793=>1000,33794=>1000,33795=>1000,33796=>1000,
-	33797=>1000,33798=>1000,33799=>1000,33800=>1000,33801=>1000,33802=>1000,33803=>1000,33804=>1000,33805=>1000,33806=>1000,33807=>1000,33808=>1000,33809=>1000,33810=>1000,33811=>1000,33812=>1000,
-	33813=>1000,33814=>1000,33815=>1000,33816=>1000,33817=>1000,33818=>1000,33819=>1000,33820=>1000,33821=>1000,33822=>1000,33823=>1000,33824=>1000,33825=>1000,33826=>1000,33827=>1000,33828=>1000,
-	33829=>1000,33830=>1000,33831=>1000,33832=>1000,33833=>1000,33834=>1000,33835=>1000,33836=>1000,33837=>1000,33838=>1000,33839=>1000,33840=>1000,33841=>1000,33842=>1000,33843=>1000,33844=>1000,
-	33845=>1000,33846=>1000,33847=>1000,33848=>1000,33849=>1000,33850=>1000,33851=>1000,33852=>1000,33853=>1000,33854=>1000,33855=>1000,33856=>1000,33857=>1000,33858=>1000,33859=>1000,33860=>1000,
-	33861=>1000,33862=>1000,33863=>1000,33864=>1000,33865=>1000,33866=>1000,33867=>1000,33868=>1000,33869=>1000,33870=>1000,33871=>1000,33872=>1000,33873=>1000,33874=>1000,33875=>1000,33876=>1000,
-	33877=>1000,33878=>1000,33879=>1000,33880=>1000,33881=>1000,33882=>1000,33883=>1000,33884=>1000,33885=>1000,33886=>1000,33887=>1000,33888=>1000,33889=>1000,33890=>1000,33891=>1000,33892=>1000,
-	33893=>1000,33894=>1000,33895=>1000,33896=>1000,33897=>1000,33898=>1000,33899=>1000,33900=>1000,33901=>1000,33902=>1000,33903=>1000,33904=>1000,33905=>1000,33906=>1000,33907=>1000,33908=>1000,
-	33909=>1000,33910=>1000,33911=>1000,33912=>1000,33913=>1000,33914=>1000,33915=>1000,33916=>1000,33917=>1000,33918=>1000,33919=>1000,33920=>1000,33921=>1000,33922=>1000,33923=>1000,33924=>1000,
-	33925=>1000,33926=>1000,33927=>1000,33928=>1000,33929=>1000,33930=>1000,33931=>1000,33932=>1000,33933=>1000,33934=>1000,33935=>1000,33936=>1000,33937=>1000,33938=>1000,33939=>1000,33940=>1000,
-	33941=>1000,33942=>1000,33943=>1000,33944=>1000,33945=>1000,33946=>1000,33947=>1000,33948=>1000,33949=>1000,33950=>1000,33951=>1000,33952=>1000,33953=>1000,33954=>1000,33955=>1000,33956=>1000,
-	33957=>1000,33958=>1000,33959=>1000,33960=>1000,33961=>1000,33962=>1000,33963=>1000,33964=>1000,33965=>1000,33966=>1000,33967=>1000,33968=>1000,33969=>1000,33970=>1000,33971=>1000,33972=>1000,
-	33973=>1000,33974=>1000,33975=>1000,33976=>1000,33977=>1000,33978=>1000,33979=>1000,33980=>1000,33981=>1000,33982=>1000,33983=>1000,33984=>1000,33985=>1000,33986=>1000,33987=>1000,33988=>1000,
-	33989=>1000,33990=>1000,33991=>1000,33992=>1000,33993=>1000,33994=>1000,33995=>1000,33996=>1000,33997=>1000,33998=>1000,33999=>1000,34000=>1000,34001=>1000,34002=>1000,34003=>1000,34004=>1000,
-	34005=>1000,34006=>1000,34007=>1000,34008=>1000,34009=>1000,34010=>1000,34011=>1000,34012=>1000,34013=>1000,34014=>1000,34015=>1000,34016=>1000,34017=>1000,34018=>1000,34019=>1000,34020=>1000,
-	34021=>1000,34022=>1000,34023=>1000,34024=>1000,34025=>1000,34026=>1000,34027=>1000,34028=>1000,34029=>1000,34030=>1000,34031=>1000,34032=>1000,34033=>1000,34034=>1000,34035=>1000,34036=>1000,
-	34037=>1000,34038=>1000,34039=>1000,34040=>1000,34041=>1000,34042=>1000,34043=>1000,34044=>1000,34045=>1000,34046=>1000,34047=>1000,34048=>1000,34049=>1000,34050=>1000,34051=>1000,34052=>1000,
-	34053=>1000,34054=>1000,34055=>1000,34056=>1000,34057=>1000,34058=>1000,34059=>1000,34060=>1000,34061=>1000,34062=>1000,34063=>1000,34064=>1000,34065=>1000,34066=>1000,34067=>1000,34068=>1000,
-	34069=>1000,34070=>1000,34071=>1000,34072=>1000,34073=>1000,34074=>1000,34075=>1000,34076=>1000,34077=>1000,34078=>1000,34079=>1000,34080=>1000,34081=>1000,34082=>1000,34083=>1000,34084=>1000,
-	34085=>1000,34086=>1000,34087=>1000,34088=>1000,34089=>1000,34090=>1000,34091=>1000,34092=>1000,34093=>1000,34094=>1000,34095=>1000,34096=>1000,34097=>1000,34098=>1000,34099=>1000,34100=>1000,
-	34101=>1000,34102=>1000,34103=>1000,34104=>1000,34105=>1000,34106=>1000,34107=>1000,34108=>1000,34109=>1000,34110=>1000,34111=>1000,34112=>1000,34113=>1000,34114=>1000,34115=>1000,34116=>1000,
-	34117=>1000,34118=>1000,34119=>1000,34120=>1000,34121=>1000,34122=>1000,34123=>1000,34124=>1000,34125=>1000,34126=>1000,34127=>1000,34128=>1000,34129=>1000,34130=>1000,34131=>1000,34132=>1000,
-	34133=>1000,34134=>1000,34135=>1000,34136=>1000,34137=>1000,34138=>1000,34139=>1000,34140=>1000,34141=>1000,34142=>1000,34143=>1000,34144=>1000,34145=>1000,34146=>1000,34147=>1000,34148=>1000,
-	34149=>1000,34150=>1000,34151=>1000,34152=>1000,34153=>1000,34154=>1000,34155=>1000,34156=>1000,34157=>1000,34158=>1000,34159=>1000,34160=>1000,34161=>1000,34162=>1000,34163=>1000,34164=>1000,
-	34165=>1000,34166=>1000,34167=>1000,34168=>1000,34169=>1000,34170=>1000,34171=>1000,34172=>1000,34173=>1000,34174=>1000,34175=>1000,34176=>1000,34177=>1000,34178=>1000,34179=>1000,34180=>1000,
-	34181=>1000,34182=>1000,34183=>1000,34184=>1000,34185=>1000,34186=>1000,34187=>1000,34188=>1000,34189=>1000,34190=>1000,34191=>1000,34192=>1000,34193=>1000,34194=>1000,34195=>1000,34196=>1000,
-	34197=>1000,34198=>1000,34199=>1000,34200=>1000,34201=>1000,34202=>1000,34203=>1000,34204=>1000,34205=>1000,34206=>1000,34207=>1000,34208=>1000,34209=>1000,34210=>1000,34211=>1000,34212=>1000,
-	34213=>1000,34214=>1000,34215=>1000,34216=>1000,34217=>1000,34218=>1000,34219=>1000,34220=>1000,34221=>1000,34222=>1000,34223=>1000,34224=>1000,34225=>1000,34226=>1000,34227=>1000,34228=>1000,
-	34229=>1000,34230=>1000,34231=>1000,34232=>1000,34233=>1000,34234=>1000,34235=>1000,34236=>1000,34237=>1000,34238=>1000,34239=>1000,34240=>1000,34241=>1000,34242=>1000,34243=>1000,34244=>1000,
-	34245=>1000,34246=>1000,34247=>1000,34248=>1000,34249=>1000,34250=>1000,34251=>1000,34252=>1000,34253=>1000,34254=>1000,34255=>1000,34256=>1000,34257=>1000,34258=>1000,34259=>1000,34260=>1000,
-	34261=>1000,34262=>1000,34263=>1000,34264=>1000,34265=>1000,34266=>1000,34267=>1000,34268=>1000,34269=>1000,34270=>1000,34271=>1000,34272=>1000,34273=>1000,34274=>1000,34275=>1000,34276=>1000,
-	34277=>1000,34278=>1000,34279=>1000,34280=>1000,34281=>1000,34282=>1000,34283=>1000,34284=>1000,34285=>1000,34286=>1000,34287=>1000,34288=>1000,34289=>1000,34290=>1000,34291=>1000,34292=>1000,
-	34293=>1000,34294=>1000,34295=>1000,34296=>1000,34297=>1000,34298=>1000,34299=>1000,34300=>1000,34301=>1000,34302=>1000,34303=>1000,34304=>1000,34305=>1000,34306=>1000,34307=>1000,34308=>1000,
-	34309=>1000,34310=>1000,34311=>1000,34312=>1000,34313=>1000,34314=>1000,34315=>1000,34316=>1000,34317=>1000,34318=>1000,34319=>1000,34320=>1000,34321=>1000,34322=>1000,34323=>1000,34324=>1000,
-	34325=>1000,34326=>1000,34327=>1000,34328=>1000,34329=>1000,34330=>1000,34331=>1000,34332=>1000,34333=>1000,34334=>1000,34335=>1000,34336=>1000,34337=>1000,34338=>1000,34339=>1000,34340=>1000,
-	34341=>1000,34342=>1000,34343=>1000,34344=>1000,34345=>1000,34346=>1000,34347=>1000,34348=>1000,34349=>1000,34350=>1000,34351=>1000,34352=>1000,34353=>1000,34354=>1000,34355=>1000,34356=>1000,
-	34357=>1000,34358=>1000,34359=>1000,34360=>1000,34361=>1000,34362=>1000,34363=>1000,34364=>1000,34365=>1000,34366=>1000,34367=>1000,34368=>1000,34369=>1000,34370=>1000,34371=>1000,34372=>1000,
-	34373=>1000,34374=>1000,34375=>1000,34376=>1000,34377=>1000,34378=>1000,34379=>1000,34380=>1000,34381=>1000,34382=>1000,34383=>1000,34384=>1000,34385=>1000,34386=>1000,34387=>1000,34388=>1000,
-	34389=>1000,34390=>1000,34391=>1000,34392=>1000,34393=>1000,34394=>1000,34395=>1000,34396=>1000,34397=>1000,34398=>1000,34399=>1000,34400=>1000,34401=>1000,34402=>1000,34403=>1000,34404=>1000,
-	34405=>1000,34406=>1000,34407=>1000,34408=>1000,34409=>1000,34410=>1000,34411=>1000,34412=>1000,34413=>1000,34414=>1000,34415=>1000,34416=>1000,34417=>1000,34418=>1000,34419=>1000,34420=>1000,
-	34421=>1000,34422=>1000,34423=>1000,34424=>1000,34425=>1000,34426=>1000,34427=>1000,34428=>1000,34429=>1000,34430=>1000,34431=>1000,34432=>1000,34433=>1000,34434=>1000,34435=>1000,34436=>1000,
-	34437=>1000,34438=>1000,34439=>1000,34440=>1000,34441=>1000,34442=>1000,34443=>1000,34444=>1000,34445=>1000,34446=>1000,34447=>1000,34448=>1000,34449=>1000,34450=>1000,34451=>1000,34452=>1000,
-	34453=>1000,34454=>1000,34455=>1000,34456=>1000,34457=>1000,34458=>1000,34459=>1000,34460=>1000,34461=>1000,34462=>1000,34463=>1000,34464=>1000,34465=>1000,34466=>1000,34467=>1000,34468=>1000,
-	34469=>1000,34470=>1000,34471=>1000,34472=>1000,34473=>1000,34474=>1000,34475=>1000,34476=>1000,34477=>1000,34478=>1000,34479=>1000,34480=>1000,34481=>1000,34482=>1000,34483=>1000,34484=>1000,
-	34485=>1000,34486=>1000,34487=>1000,34488=>1000,34489=>1000,34490=>1000,34491=>1000,34492=>1000,34493=>1000,34494=>1000,34495=>1000,34496=>1000,34497=>1000,34498=>1000,34499=>1000,34500=>1000,
-	34501=>1000,34502=>1000,34503=>1000,34504=>1000,34505=>1000,34506=>1000,34507=>1000,34508=>1000,34509=>1000,34510=>1000,34511=>1000,34512=>1000,34513=>1000,34514=>1000,34515=>1000,34516=>1000,
-	34517=>1000,34518=>1000,34519=>1000,34520=>1000,34521=>1000,34522=>1000,34523=>1000,34524=>1000,34525=>1000,34526=>1000,34527=>1000,34528=>1000,34529=>1000,34530=>1000,34531=>1000,34532=>1000,
-	34533=>1000,34534=>1000,34535=>1000,34536=>1000,34537=>1000,34538=>1000,34539=>1000,34540=>1000,34541=>1000,34542=>1000,34543=>1000,34544=>1000,34545=>1000,34546=>1000,34547=>1000,34548=>1000,
-	34549=>1000,34550=>1000,34551=>1000,34552=>1000,34553=>1000,34554=>1000,34555=>1000,34556=>1000,34557=>1000,34558=>1000,34559=>1000,34560=>1000,34561=>1000,34562=>1000,34563=>1000,34564=>1000,
-	34565=>1000,34566=>1000,34567=>1000,34568=>1000,34569=>1000,34570=>1000,34571=>1000,34572=>1000,34573=>1000,34574=>1000,34575=>1000,34576=>1000,34577=>1000,34578=>1000,34579=>1000,34580=>1000,
-	34581=>1000,34582=>1000,34583=>1000,34584=>1000,34585=>1000,34586=>1000,34587=>1000,34588=>1000,34589=>1000,34590=>1000,34591=>1000,34592=>1000,34593=>1000,34594=>1000,34595=>1000,34596=>1000,
-	34597=>1000,34598=>1000,34599=>1000,34600=>1000,34601=>1000,34602=>1000,34603=>1000,34604=>1000,34605=>1000,34606=>1000,34607=>1000,34608=>1000,34609=>1000,34610=>1000,34611=>1000,34612=>1000,
-	34613=>1000,34614=>1000,34615=>1000,34616=>1000,34617=>1000,34618=>1000,34619=>1000,34620=>1000,34621=>1000,34622=>1000,34623=>1000,34624=>1000,34625=>1000,34626=>1000,34627=>1000,34628=>1000,
-	34629=>1000,34630=>1000,34631=>1000,34632=>1000,34633=>1000,34634=>1000,34635=>1000,34636=>1000,34637=>1000,34638=>1000,34639=>1000,34640=>1000,34641=>1000,34642=>1000,34643=>1000,34644=>1000,
-	34645=>1000,34646=>1000,34647=>1000,34648=>1000,34649=>1000,34650=>1000,34651=>1000,34652=>1000,34653=>1000,34654=>1000,34655=>1000,34656=>1000,34657=>1000,34658=>1000,34659=>1000,34660=>1000,
-	34661=>1000,34662=>1000,34663=>1000,34664=>1000,34665=>1000,34666=>1000,34667=>1000,34668=>1000,34669=>1000,34670=>1000,34671=>1000,34672=>1000,34673=>1000,34674=>1000,34675=>1000,34676=>1000,
-	34677=>1000,34678=>1000,34679=>1000,34680=>1000,34681=>1000,34682=>1000,34683=>1000,34684=>1000,34685=>1000,34686=>1000,34687=>1000,34688=>1000,34689=>1000,34690=>1000,34691=>1000,34692=>1000,
-	34693=>1000,34694=>1000,34695=>1000,34696=>1000,34697=>1000,34698=>1000,34699=>1000,34700=>1000,34701=>1000,34702=>1000,34703=>1000,34704=>1000,34705=>1000,34706=>1000,34707=>1000,34708=>1000,
-	34709=>1000,34710=>1000,34711=>1000,34712=>1000,34713=>1000,34714=>1000,34715=>1000,34716=>1000,34717=>1000,34718=>1000,34719=>1000,34720=>1000,34721=>1000,34722=>1000,34723=>1000,34724=>1000,
-	34725=>1000,34726=>1000,34727=>1000,34728=>1000,34729=>1000,34730=>1000,34731=>1000,34732=>1000,34733=>1000,34734=>1000,34735=>1000,34736=>1000,34737=>1000,34738=>1000,34739=>1000,34740=>1000,
-	34741=>1000,34742=>1000,34743=>1000,34744=>1000,34745=>1000,34746=>1000,34747=>1000,34748=>1000,34749=>1000,34750=>1000,34751=>1000,34752=>1000,34753=>1000,34754=>1000,34755=>1000,34756=>1000,
-	34757=>1000,34758=>1000,34759=>1000,34760=>1000,34761=>1000,34762=>1000,34763=>1000,34764=>1000,34765=>1000,34766=>1000,34767=>1000,34768=>1000,34769=>1000,34770=>1000,34771=>1000,34772=>1000,
-	34773=>1000,34774=>1000,34775=>1000,34776=>1000,34777=>1000,34778=>1000,34779=>1000,34780=>1000,34781=>1000,34782=>1000,34783=>1000,34784=>1000,34785=>1000,34786=>1000,34787=>1000,34788=>1000,
-	34789=>1000,34790=>1000,34791=>1000,34792=>1000,34793=>1000,34794=>1000,34795=>1000,34796=>1000,34797=>1000,34798=>1000,34799=>1000,34800=>1000,34801=>1000,34802=>1000,34803=>1000,34804=>1000,
-	34805=>1000,34806=>1000,34807=>1000,34808=>1000,34809=>1000,34810=>1000,34811=>1000,34812=>1000,34813=>1000,34814=>1000,34815=>1000,34816=>1000,34817=>1000,34818=>1000,34819=>1000,34820=>1000,
-	34821=>1000,34822=>1000,34823=>1000,34824=>1000,34825=>1000,34826=>1000,34827=>1000,34828=>1000,34829=>1000,34830=>1000,34831=>1000,34832=>1000,34833=>1000,34834=>1000,34835=>1000,34836=>1000,
-	34837=>1000,34838=>1000,34839=>1000,34840=>1000,34841=>1000,34842=>1000,34843=>1000,34844=>1000,34845=>1000,34846=>1000,34847=>1000,34848=>1000,34849=>1000,34850=>1000,34851=>1000,34852=>1000,
-	34853=>1000,34854=>1000,34855=>1000,34856=>1000,34857=>1000,34858=>1000,34859=>1000,34860=>1000,34861=>1000,34862=>1000,34863=>1000,34864=>1000,34865=>1000,34866=>1000,34867=>1000,34868=>1000,
-	34869=>1000,34870=>1000,34871=>1000,34872=>1000,34873=>1000,34874=>1000,34875=>1000,34876=>1000,34877=>1000,34878=>1000,34879=>1000,34880=>1000,34881=>1000,34882=>1000,34883=>1000,34884=>1000,
-	34885=>1000,34886=>1000,34887=>1000,34888=>1000,34889=>1000,34890=>1000,34891=>1000,34892=>1000,34893=>1000,34894=>1000,34895=>1000,34896=>1000,34897=>1000,34898=>1000,34899=>1000,34900=>1000,
-	34901=>1000,34902=>1000,34903=>1000,34904=>1000,34905=>1000,34906=>1000,34907=>1000,34908=>1000,34909=>1000,34910=>1000,34911=>1000,34912=>1000,34913=>1000,34914=>1000,34915=>1000,34916=>1000,
-	34917=>1000,34918=>1000,34919=>1000,34920=>1000,34921=>1000,34922=>1000,34923=>1000,34924=>1000,34925=>1000,34926=>1000,34927=>1000,34928=>1000,34929=>1000,34930=>1000,34931=>1000,34932=>1000,
-	34933=>1000,34934=>1000,34935=>1000,34936=>1000,34937=>1000,34938=>1000,34939=>1000,34940=>1000,34941=>1000,34942=>1000,34943=>1000,34944=>1000,34945=>1000,34946=>1000,34947=>1000,34948=>1000,
-	34949=>1000,34950=>1000,34951=>1000,34952=>1000,34953=>1000,34954=>1000,34955=>1000,34956=>1000,34957=>1000,34958=>1000,34959=>1000,34960=>1000,34961=>1000,34962=>1000,34963=>1000,34964=>1000,
-	34965=>1000,34966=>1000,34967=>1000,34968=>1000,34969=>1000,34970=>1000,34971=>1000,34972=>1000,34973=>1000,34974=>1000,34975=>1000,34976=>1000,34977=>1000,34978=>1000,34979=>1000,34980=>1000,
-	34981=>1000,34982=>1000,34983=>1000,34984=>1000,34985=>1000,34986=>1000,34987=>1000,34988=>1000,34989=>1000,34990=>1000,34991=>1000,34992=>1000,34993=>1000,34994=>1000,34995=>1000,34996=>1000,
-	34997=>1000,34998=>1000,34999=>1000,35000=>1000,35001=>1000,35002=>1000,35003=>1000,35004=>1000,35005=>1000,35006=>1000,35007=>1000,35008=>1000,35009=>1000,35010=>1000,35011=>1000,35012=>1000,
-	35013=>1000,35014=>1000,35015=>1000,35016=>1000,35017=>1000,35018=>1000,35019=>1000,35020=>1000,35021=>1000,35022=>1000,35023=>1000,35024=>1000,35025=>1000,35026=>1000,35027=>1000,35028=>1000,
-	35029=>1000,35030=>1000,35031=>1000,35032=>1000,35033=>1000,35034=>1000,35035=>1000,35036=>1000,35037=>1000,35038=>1000,35039=>1000,35040=>1000,35041=>1000,35042=>1000,35043=>1000,35044=>1000,
-	35045=>1000,35046=>1000,35047=>1000,35048=>1000,35049=>1000,35050=>1000,35051=>1000,35052=>1000,35053=>1000,35054=>1000,35055=>1000,35056=>1000,35057=>1000,35058=>1000,35059=>1000,35060=>1000,
-	35061=>1000,35062=>1000,35063=>1000,35064=>1000,35065=>1000,35066=>1000,35067=>1000,35068=>1000,35069=>1000,35070=>1000,35071=>1000,35072=>1000,35073=>1000,35074=>1000,35075=>1000,35076=>1000,
-	35077=>1000,35078=>1000,35079=>1000,35080=>1000,35081=>1000,35082=>1000,35083=>1000,35084=>1000,35085=>1000,35086=>1000,35087=>1000,35088=>1000,35089=>1000,35090=>1000,35091=>1000,35092=>1000,
-	35093=>1000,35094=>1000,35095=>1000,35096=>1000,35097=>1000,35098=>1000,35099=>1000,35100=>1000,35101=>1000,35102=>1000,35103=>1000,35104=>1000,35105=>1000,35106=>1000,35107=>1000,35108=>1000,
-	35109=>1000,35110=>1000,35111=>1000,35112=>1000,35113=>1000,35114=>1000,35115=>1000,35116=>1000,35117=>1000,35118=>1000,35119=>1000,35120=>1000,35121=>1000,35122=>1000,35123=>1000,35124=>1000,
-	35125=>1000,35126=>1000,35127=>1000,35128=>1000,35129=>1000,35130=>1000,35131=>1000,35132=>1000,35133=>1000,35134=>1000,35135=>1000,35136=>1000,35137=>1000,35138=>1000,35139=>1000,35140=>1000,
-	35141=>1000,35142=>1000,35143=>1000,35144=>1000,35145=>1000,35146=>1000,35147=>1000,35148=>1000,35149=>1000,35150=>1000,35151=>1000,35152=>1000,35153=>1000,35154=>1000,35155=>1000,35156=>1000,
-	35157=>1000,35158=>1000,35159=>1000,35160=>1000,35161=>1000,35162=>1000,35163=>1000,35164=>1000,35165=>1000,35166=>1000,35167=>1000,35168=>1000,35169=>1000,35170=>1000,35171=>1000,35172=>1000,
-	35173=>1000,35174=>1000,35175=>1000,35176=>1000,35177=>1000,35178=>1000,35179=>1000,35180=>1000,35181=>1000,35182=>1000,35183=>1000,35184=>1000,35185=>1000,35186=>1000,35187=>1000,35188=>1000,
-	35189=>1000,35190=>1000,35191=>1000,35192=>1000,35193=>1000,35194=>1000,35195=>1000,35196=>1000,35197=>1000,35198=>1000,35199=>1000,35200=>1000,35201=>1000,35202=>1000,35203=>1000,35204=>1000,
-	35205=>1000,35206=>1000,35207=>1000,35208=>1000,35209=>1000,35210=>1000,35211=>1000,35212=>1000,35213=>1000,35214=>1000,35215=>1000,35216=>1000,35217=>1000,35218=>1000,35219=>1000,35220=>1000,
-	35221=>1000,35222=>1000,35223=>1000,35224=>1000,35225=>1000,35226=>1000,35227=>1000,35228=>1000,35229=>1000,35230=>1000,35231=>1000,35232=>1000,35233=>1000,35234=>1000,35235=>1000,35236=>1000,
-	35237=>1000,35238=>1000,35239=>1000,35240=>1000,35241=>1000,35242=>1000,35243=>1000,35244=>1000,35245=>1000,35246=>1000,35247=>1000,35248=>1000,35249=>1000,35250=>1000,35251=>1000,35252=>1000,
-	35253=>1000,35254=>1000,35255=>1000,35256=>1000,35257=>1000,35258=>1000,35259=>1000,35260=>1000,35261=>1000,35262=>1000,35263=>1000,35264=>1000,35265=>1000,35266=>1000,35267=>1000,35268=>1000,
-	35269=>1000,35270=>1000,35271=>1000,35272=>1000,35273=>1000,35274=>1000,35275=>1000,35276=>1000,35277=>1000,35278=>1000,35279=>1000,35280=>1000,35281=>1000,35282=>1000,35283=>1000,35284=>1000,
-	35285=>1000,35286=>1000,35287=>1000,35288=>1000,35289=>1000,35290=>1000,35291=>1000,35292=>1000,35293=>1000,35294=>1000,35295=>1000,35296=>1000,35297=>1000,35298=>1000,35299=>1000,35300=>1000,
-	35301=>1000,35302=>1000,35303=>1000,35304=>1000,35305=>1000,35306=>1000,35307=>1000,35308=>1000,35309=>1000,35310=>1000,35311=>1000,35312=>1000,35313=>1000,35314=>1000,35315=>1000,35316=>1000,
-	35317=>1000,35318=>1000,35319=>1000,35320=>1000,35321=>1000,35322=>1000,35323=>1000,35324=>1000,35325=>1000,35326=>1000,35327=>1000,35328=>1000,35329=>1000,35330=>1000,35331=>1000,35332=>1000,
-	35333=>1000,35334=>1000,35335=>1000,35336=>1000,35337=>1000,35338=>1000,35339=>1000,35340=>1000,35341=>1000,35342=>1000,35343=>1000,35344=>1000,35345=>1000,35346=>1000,35347=>1000,35348=>1000,
-	35349=>1000,35350=>1000,35351=>1000,35352=>1000,35353=>1000,35354=>1000,35355=>1000,35356=>1000,35357=>1000,35358=>1000,35359=>1000,35360=>1000,35361=>1000,35362=>1000,35363=>1000,35364=>1000,
-	35365=>1000,35366=>1000,35367=>1000,35368=>1000,35369=>1000,35370=>1000,35371=>1000,35372=>1000,35373=>1000,35374=>1000,35375=>1000,35376=>1000,35377=>1000,35378=>1000,35379=>1000,35380=>1000,
-	35381=>1000,35382=>1000,35383=>1000,35384=>1000,35385=>1000,35386=>1000,35387=>1000,35388=>1000,35389=>1000,35390=>1000,35391=>1000,35392=>1000,35393=>1000,35394=>1000,35395=>1000,35396=>1000,
-	35397=>1000,35398=>1000,35399=>1000,35400=>1000,35401=>1000,35402=>1000,35403=>1000,35404=>1000,35405=>1000,35406=>1000,35407=>1000,35408=>1000,35409=>1000,35410=>1000,35411=>1000,35412=>1000,
-	35413=>1000,35414=>1000,35415=>1000,35416=>1000,35417=>1000,35418=>1000,35419=>1000,35420=>1000,35421=>1000,35422=>1000,35423=>1000,35424=>1000,35425=>1000,35426=>1000,35427=>1000,35428=>1000,
-	35429=>1000,35430=>1000,35431=>1000,35432=>1000,35433=>1000,35434=>1000,35435=>1000,35436=>1000,35437=>1000,35438=>1000,35439=>1000,35440=>1000,35441=>1000,35442=>1000,35443=>1000,35444=>1000,
-	35445=>1000,35446=>1000,35447=>1000,35448=>1000,35449=>1000,35450=>1000,35451=>1000,35452=>1000,35453=>1000,35454=>1000,35455=>1000,35456=>1000,35457=>1000,35458=>1000,35459=>1000,35460=>1000,
-	35461=>1000,35462=>1000,35463=>1000,35464=>1000,35465=>1000,35466=>1000,35467=>1000,35468=>1000,35469=>1000,35470=>1000,35471=>1000,35472=>1000,35473=>1000,35474=>1000,35475=>1000,35476=>1000,
-	35477=>1000,35478=>1000,35479=>1000,35480=>1000,35481=>1000,35482=>1000,35483=>1000,35484=>1000,35485=>1000,35486=>1000,35487=>1000,35488=>1000,35489=>1000,35490=>1000,35491=>1000,35492=>1000,
-	35493=>1000,35494=>1000,35495=>1000,35496=>1000,35497=>1000,35498=>1000,35499=>1000,35500=>1000,35501=>1000,35502=>1000,35503=>1000,35504=>1000,35505=>1000,35506=>1000,35507=>1000,35508=>1000,
-	35509=>1000,35510=>1000,35511=>1000,35512=>1000,35513=>1000,35514=>1000,35515=>1000,35516=>1000,35517=>1000,35518=>1000,35519=>1000,35520=>1000,35521=>1000,35522=>1000,35523=>1000,35524=>1000,
-	35525=>1000,35526=>1000,35527=>1000,35528=>1000,35529=>1000,35530=>1000,35531=>1000,35532=>1000,35533=>1000,35534=>1000,35535=>1000,35536=>1000,35537=>1000,35538=>1000,35539=>1000,35540=>1000,
-	35541=>1000,35542=>1000,35543=>1000,35544=>1000,35545=>1000,35546=>1000,35547=>1000,35548=>1000,35549=>1000,35550=>1000,35551=>1000,35552=>1000,35553=>1000,35554=>1000,35555=>1000,35556=>1000,
-	35557=>1000,35558=>1000,35559=>1000,35560=>1000,35561=>1000,35562=>1000,35563=>1000,35564=>1000,35565=>1000,35566=>1000,35567=>1000,35568=>1000,35569=>1000,35570=>1000,35571=>1000,35572=>1000,
-	35573=>1000,35574=>1000,35575=>1000,35576=>1000,35577=>1000,35578=>1000,35579=>1000,35580=>1000,35581=>1000,35582=>1000,35583=>1000,35584=>1000,35585=>1000,35586=>1000,35587=>1000,35588=>1000,
-	35589=>1000,35590=>1000,35591=>1000,35592=>1000,35593=>1000,35594=>1000,35595=>1000,35596=>1000,35597=>1000,35598=>1000,35599=>1000,35600=>1000,35601=>1000,35602=>1000,35603=>1000,35604=>1000,
-	35605=>1000,35606=>1000,35607=>1000,35608=>1000,35609=>1000,35610=>1000,35611=>1000,35612=>1000,35613=>1000,35614=>1000,35615=>1000,35616=>1000,35617=>1000,35618=>1000,35619=>1000,35620=>1000,
-	35621=>1000,35622=>1000,35623=>1000,35624=>1000,35625=>1000,35626=>1000,35627=>1000,35628=>1000,35629=>1000,35630=>1000,35631=>1000,35632=>1000,35633=>1000,35634=>1000,35635=>1000,35636=>1000,
-	35637=>1000,35638=>1000,35639=>1000,35640=>1000,35641=>1000,35642=>1000,35643=>1000,35644=>1000,35645=>1000,35646=>1000,35647=>1000,35648=>1000,35649=>1000,35650=>1000,35651=>1000,35652=>1000,
-	35653=>1000,35654=>1000,35655=>1000,35656=>1000,35657=>1000,35658=>1000,35659=>1000,35660=>1000,35661=>1000,35662=>1000,35663=>1000,35664=>1000,35665=>1000,35666=>1000,35667=>1000,35668=>1000,
-	35669=>1000,35670=>1000,35671=>1000,35672=>1000,35673=>1000,35674=>1000,35675=>1000,35676=>1000,35677=>1000,35678=>1000,35679=>1000,35680=>1000,35681=>1000,35682=>1000,35683=>1000,35684=>1000,
-	35685=>1000,35686=>1000,35687=>1000,35688=>1000,35689=>1000,35690=>1000,35691=>1000,35692=>1000,35693=>1000,35694=>1000,35695=>1000,35696=>1000,35697=>1000,35698=>1000,35699=>1000,35700=>1000,
-	35701=>1000,35702=>1000,35703=>1000,35704=>1000,35705=>1000,35706=>1000,35707=>1000,35708=>1000,35709=>1000,35710=>1000,35711=>1000,35712=>1000,35713=>1000,35714=>1000,35715=>1000,35716=>1000,
-	35717=>1000,35718=>1000,35719=>1000,35720=>1000,35721=>1000,35722=>1000,35723=>1000,35724=>1000,35725=>1000,35726=>1000,35727=>1000,35728=>1000,35729=>1000,35730=>1000,35731=>1000,35732=>1000,
-	35733=>1000,35734=>1000,35735=>1000,35736=>1000,35737=>1000,35738=>1000,35739=>1000,35740=>1000,35741=>1000,35742=>1000,35743=>1000,35744=>1000,35745=>1000,35746=>1000,35747=>1000,35748=>1000,
-	35749=>1000,35750=>1000,35751=>1000,35752=>1000,35753=>1000,35754=>1000,35755=>1000,35756=>1000,35757=>1000,35758=>1000,35759=>1000,35760=>1000,35761=>1000,35762=>1000,35763=>1000,35764=>1000,
-	35765=>1000,35766=>1000,35767=>1000,35768=>1000,35769=>1000,35770=>1000,35771=>1000,35772=>1000,35773=>1000,35774=>1000,35775=>1000,35776=>1000,35777=>1000,35778=>1000,35779=>1000,35780=>1000,
-	35781=>1000,35782=>1000,35783=>1000,35784=>1000,35785=>1000,35786=>1000,35787=>1000,35788=>1000,35789=>1000,35790=>1000,35791=>1000,35792=>1000,35793=>1000,35794=>1000,35795=>1000,35796=>1000,
-	35797=>1000,35798=>1000,35799=>1000,35800=>1000,35801=>1000,35802=>1000,35803=>1000,35804=>1000,35805=>1000,35806=>1000,35807=>1000,35808=>1000,35809=>1000,35810=>1000,35811=>1000,35812=>1000,
-	35813=>1000,35814=>1000,35815=>1000,35816=>1000,35817=>1000,35818=>1000,35819=>1000,35820=>1000,35821=>1000,35822=>1000,35823=>1000,35824=>1000,35825=>1000,35826=>1000,35827=>1000,35828=>1000,
-	35829=>1000,35830=>1000,35831=>1000,35832=>1000,35833=>1000,35834=>1000,35835=>1000,35836=>1000,35837=>1000,35838=>1000,35839=>1000,35840=>1000,35841=>1000,35842=>1000,35843=>1000,35844=>1000,
-	35845=>1000,35846=>1000,35847=>1000,35848=>1000,35849=>1000,35850=>1000,35851=>1000,35852=>1000,35853=>1000,35854=>1000,35855=>1000,35856=>1000,35857=>1000,35858=>1000,35859=>1000,35860=>1000,
-	35861=>1000,35862=>1000,35863=>1000,35864=>1000,35865=>1000,35866=>1000,35867=>1000,35868=>1000,35869=>1000,35870=>1000,35871=>1000,35872=>1000,35873=>1000,35874=>1000,35875=>1000,35876=>1000,
-	35877=>1000,35878=>1000,35879=>1000,35880=>1000,35881=>1000,35882=>1000,35883=>1000,35884=>1000,35885=>1000,35886=>1000,35887=>1000,35888=>1000,35889=>1000,35890=>1000,35891=>1000,35892=>1000,
-	35893=>1000,35894=>1000,35895=>1000,35896=>1000,35897=>1000,35898=>1000,35899=>1000,35900=>1000,35901=>1000,35902=>1000,35903=>1000,35904=>1000,35905=>1000,35906=>1000,35907=>1000,35908=>1000,
-	35909=>1000,35910=>1000,35911=>1000,35912=>1000,35913=>1000,35914=>1000,35915=>1000,35916=>1000,35917=>1000,35918=>1000,35919=>1000,35920=>1000,35921=>1000,35922=>1000,35923=>1000,35924=>1000,
-	35925=>1000,35926=>1000,35927=>1000,35928=>1000,35929=>1000,35930=>1000,35931=>1000,35932=>1000,35933=>1000,35934=>1000,35935=>1000,35936=>1000,35937=>1000,35938=>1000,35939=>1000,35940=>1000,
-	35941=>1000,35942=>1000,35943=>1000,35944=>1000,35945=>1000,35946=>1000,35947=>1000,35948=>1000,35949=>1000,35950=>1000,35951=>1000,35952=>1000,35953=>1000,35954=>1000,35955=>1000,35956=>1000,
-	35957=>1000,35958=>1000,35959=>1000,35960=>1000,35961=>1000,35962=>1000,35963=>1000,35964=>1000,35965=>1000,35966=>1000,35967=>1000,35968=>1000,35969=>1000,35970=>1000,35971=>1000,35972=>1000,
-	35973=>1000,35974=>1000,35975=>1000,35976=>1000,35977=>1000,35978=>1000,35979=>1000,35980=>1000,35981=>1000,35982=>1000,35983=>1000,35984=>1000,35985=>1000,35986=>1000,35987=>1000,35988=>1000,
-	35989=>1000,35990=>1000,35991=>1000,35992=>1000,35993=>1000,35994=>1000,35995=>1000,35996=>1000,35997=>1000,35998=>1000,35999=>1000,36000=>1000,36001=>1000,36002=>1000,36003=>1000,36004=>1000,
-	36005=>1000,36006=>1000,36007=>1000,36008=>1000,36009=>1000,36010=>1000,36011=>1000,36012=>1000,36013=>1000,36014=>1000,36015=>1000,36016=>1000,36017=>1000,36018=>1000,36019=>1000,36020=>1000,
-	36021=>1000,36022=>1000,36023=>1000,36024=>1000,36025=>1000,36026=>1000,36027=>1000,36028=>1000,36029=>1000,36030=>1000,36031=>1000,36032=>1000,36033=>1000,36034=>1000,36035=>1000,36036=>1000,
-	36037=>1000,36038=>1000,36039=>1000,36040=>1000,36041=>1000,36042=>1000,36043=>1000,36044=>1000,36045=>1000,36046=>1000,36047=>1000,36048=>1000,36049=>1000,36050=>1000,36051=>1000,36052=>1000,
-	36053=>1000,36054=>1000,36055=>1000,36056=>1000,36057=>1000,36058=>1000,36059=>1000,36060=>1000,36061=>1000,36062=>1000,36063=>1000,36064=>1000,36065=>1000,36066=>1000,36067=>1000,36068=>1000,
-	36069=>1000,36070=>1000,36071=>1000,36072=>1000,36073=>1000,36074=>1000,36075=>1000,36076=>1000,36077=>1000,36078=>1000,36079=>1000,36080=>1000,36081=>1000,36082=>1000,36083=>1000,36084=>1000,
-	36085=>1000,36086=>1000,36087=>1000,36088=>1000,36089=>1000,36090=>1000,36091=>1000,36092=>1000,36093=>1000,36094=>1000,36095=>1000,36096=>1000,36097=>1000,36098=>1000,36099=>1000,36100=>1000,
-	36101=>1000,36102=>1000,36103=>1000,36104=>1000,36105=>1000,36106=>1000,36107=>1000,36108=>1000,36109=>1000,36110=>1000,36111=>1000,36112=>1000,36113=>1000,36114=>1000,36115=>1000,36116=>1000,
-	36117=>1000,36118=>1000,36119=>1000,36120=>1000,36121=>1000,36122=>1000,36123=>1000,36124=>1000,36125=>1000,36126=>1000,36127=>1000,36128=>1000,36129=>1000,36130=>1000,36131=>1000,36132=>1000,
-	36133=>1000,36134=>1000,36135=>1000,36136=>1000,36137=>1000,36138=>1000,36139=>1000,36140=>1000,36141=>1000,36142=>1000,36143=>1000,36144=>1000,36145=>1000,36146=>1000,36147=>1000,36148=>1000,
-	36149=>1000,36150=>1000,36151=>1000,36152=>1000,36153=>1000,36154=>1000,36155=>1000,36156=>1000,36157=>1000,36158=>1000,36159=>1000,36160=>1000,36161=>1000,36162=>1000,36163=>1000,36164=>1000,
-	36165=>1000,36166=>1000,36167=>1000,36168=>1000,36169=>1000,36170=>1000,36171=>1000,36172=>1000,36173=>1000,36174=>1000,36175=>1000,36176=>1000,36177=>1000,36178=>1000,36179=>1000,36180=>1000,
-	36181=>1000,36182=>1000,36183=>1000,36184=>1000,36185=>1000,36186=>1000,36187=>1000,36188=>1000,36189=>1000,36190=>1000,36191=>1000,36192=>1000,36193=>1000,36194=>1000,36195=>1000,36196=>1000,
-	36197=>1000,36198=>1000,36199=>1000,36200=>1000,36201=>1000,36202=>1000,36203=>1000,36204=>1000,36205=>1000,36206=>1000,36207=>1000,36208=>1000,36209=>1000,36210=>1000,36211=>1000,36212=>1000,
-	36213=>1000,36214=>1000,36215=>1000,36216=>1000,36217=>1000,36218=>1000,36219=>1000,36220=>1000,36221=>1000,36222=>1000,36223=>1000,36224=>1000,36225=>1000,36226=>1000,36227=>1000,36228=>1000,
-	36229=>1000,36230=>1000,36231=>1000,36232=>1000,36233=>1000,36234=>1000,36235=>1000,36236=>1000,36237=>1000,36238=>1000,36239=>1000,36240=>1000,36241=>1000,36242=>1000,36243=>1000,36244=>1000,
-	36245=>1000,36246=>1000,36247=>1000,36248=>1000,36249=>1000,36250=>1000,36251=>1000,36252=>1000,36253=>1000,36254=>1000,36255=>1000,36256=>1000,36257=>1000,36258=>1000,36259=>1000,36260=>1000,
-	36261=>1000,36262=>1000,36263=>1000,36264=>1000,36265=>1000,36266=>1000,36267=>1000,36268=>1000,36269=>1000,36270=>1000,36271=>1000,36272=>1000,36273=>1000,36274=>1000,36275=>1000,36276=>1000,
-	36277=>1000,36278=>1000,36279=>1000,36280=>1000,36281=>1000,36282=>1000,36283=>1000,36284=>1000,36285=>1000,36286=>1000,36287=>1000,36288=>1000,36289=>1000,36290=>1000,36291=>1000,36292=>1000,
-	36293=>1000,36294=>1000,36295=>1000,36296=>1000,36297=>1000,36298=>1000,36299=>1000,36300=>1000,36301=>1000,36302=>1000,36303=>1000,36304=>1000,36305=>1000,36306=>1000,36307=>1000,36308=>1000,
-	36309=>1000,36310=>1000,36311=>1000,36312=>1000,36313=>1000,36314=>1000,36315=>1000,36316=>1000,36317=>1000,36318=>1000,36319=>1000,36320=>1000,36321=>1000,36322=>1000,36323=>1000,36324=>1000,
-	36325=>1000,36326=>1000,36327=>1000,36328=>1000,36329=>1000,36330=>1000,36331=>1000,36332=>1000,36333=>1000,36334=>1000,36335=>1000,36336=>1000,36337=>1000,36338=>1000,36339=>1000,36340=>1000,
-	36341=>1000,36342=>1000,36343=>1000,36344=>1000,36345=>1000,36346=>1000,36347=>1000,36348=>1000,36349=>1000,36350=>1000,36351=>1000,36352=>1000,36353=>1000,36354=>1000,36355=>1000,36356=>1000,
-	36357=>1000,36358=>1000,36359=>1000,36360=>1000,36361=>1000,36362=>1000,36363=>1000,36364=>1000,36365=>1000,36366=>1000,36367=>1000,36368=>1000,36369=>1000,36370=>1000,36371=>1000,36372=>1000,
-	36373=>1000,36374=>1000,36375=>1000,36376=>1000,36377=>1000,36378=>1000,36379=>1000,36380=>1000,36381=>1000,36382=>1000,36383=>1000,36384=>1000,36385=>1000,36386=>1000,36387=>1000,36388=>1000,
-	36389=>1000,36390=>1000,36391=>1000,36392=>1000,36393=>1000,36394=>1000,36395=>1000,36396=>1000,36397=>1000,36398=>1000,36399=>1000,36400=>1000,36401=>1000,36402=>1000,36403=>1000,36404=>1000,
-	36405=>1000,36406=>1000,36407=>1000,36408=>1000,36409=>1000,36410=>1000,36411=>1000,36412=>1000,36413=>1000,36414=>1000,36415=>1000,36416=>1000,36417=>1000,36418=>1000,36419=>1000,36420=>1000,
-	36421=>1000,36422=>1000,36423=>1000,36424=>1000,36425=>1000,36426=>1000,36427=>1000,36428=>1000,36429=>1000,36430=>1000,36431=>1000,36432=>1000,36433=>1000,36434=>1000,36435=>1000,36436=>1000,
-	36437=>1000,36438=>1000,36439=>1000,36440=>1000,36441=>1000,36442=>1000,36443=>1000,36444=>1000,36445=>1000,36446=>1000,36447=>1000,36448=>1000,36449=>1000,36450=>1000,36451=>1000,36452=>1000,
-	36453=>1000,36454=>1000,36455=>1000,36456=>1000,36457=>1000,36458=>1000,36459=>1000,36460=>1000,36461=>1000,36462=>1000,36463=>1000,36464=>1000,36465=>1000,36466=>1000,36467=>1000,36468=>1000,
-	36469=>1000,36470=>1000,36471=>1000,36472=>1000,36473=>1000,36474=>1000,36475=>1000,36476=>1000,36477=>1000,36478=>1000,36479=>1000,36480=>1000,36481=>1000,36482=>1000,36483=>1000,36484=>1000,
-	36485=>1000,36486=>1000,36487=>1000,36488=>1000,36489=>1000,36490=>1000,36491=>1000,36492=>1000,36493=>1000,36494=>1000,36495=>1000,36496=>1000,36497=>1000,36498=>1000,36499=>1000,36500=>1000,
-	36501=>1000,36502=>1000,36503=>1000,36504=>1000,36505=>1000,36506=>1000,36507=>1000,36508=>1000,36509=>1000,36510=>1000,36511=>1000,36512=>1000,36513=>1000,36514=>1000,36515=>1000,36516=>1000,
-	36517=>1000,36518=>1000,36519=>1000,36520=>1000,36521=>1000,36522=>1000,36523=>1000,36524=>1000,36525=>1000,36526=>1000,36527=>1000,36528=>1000,36529=>1000,36530=>1000,36531=>1000,36532=>1000,
-	36533=>1000,36534=>1000,36535=>1000,36536=>1000,36537=>1000,36538=>1000,36539=>1000,36540=>1000,36541=>1000,36542=>1000,36543=>1000,36544=>1000,36545=>1000,36546=>1000,36547=>1000,36548=>1000,
-	36549=>1000,36550=>1000,36551=>1000,36552=>1000,36553=>1000,36554=>1000,36555=>1000,36556=>1000,36557=>1000,36558=>1000,36559=>1000,36560=>1000,36561=>1000,36562=>1000,36563=>1000,36564=>1000,
-	36565=>1000,36566=>1000,36567=>1000,36568=>1000,36569=>1000,36570=>1000,36571=>1000,36572=>1000,36573=>1000,36574=>1000,36575=>1000,36576=>1000,36577=>1000,36578=>1000,36579=>1000,36580=>1000,
-	36581=>1000,36582=>1000,36583=>1000,36584=>1000,36585=>1000,36586=>1000,36587=>1000,36588=>1000,36589=>1000,36590=>1000,36591=>1000,36592=>1000,36593=>1000,36594=>1000,36595=>1000,36596=>1000,
-	36597=>1000,36598=>1000,36599=>1000,36600=>1000,36601=>1000,36602=>1000,36603=>1000,36604=>1000,36605=>1000,36606=>1000,36607=>1000,36608=>1000,36609=>1000,36610=>1000,36611=>1000,36612=>1000,
-	36613=>1000,36614=>1000,36615=>1000,36616=>1000,36617=>1000,36618=>1000,36619=>1000,36620=>1000,36621=>1000,36622=>1000,36623=>1000,36624=>1000,36625=>1000,36626=>1000,36627=>1000,36628=>1000,
-	36629=>1000,36630=>1000,36631=>1000,36632=>1000,36633=>1000,36634=>1000,36635=>1000,36636=>1000,36637=>1000,36638=>1000,36639=>1000,36640=>1000,36641=>1000,36642=>1000,36643=>1000,36644=>1000,
-	36645=>1000,36646=>1000,36647=>1000,36648=>1000,36649=>1000,36650=>1000,36651=>1000,36652=>1000,36653=>1000,36654=>1000,36655=>1000,36656=>1000,36657=>1000,36658=>1000,36659=>1000,36660=>1000,
-	36661=>1000,36662=>1000,36663=>1000,36664=>1000,36665=>1000,36666=>1000,36667=>1000,36668=>1000,36669=>1000,36670=>1000,36671=>1000,36672=>1000,36673=>1000,36674=>1000,36675=>1000,36676=>1000,
-	36677=>1000,36678=>1000,36679=>1000,36680=>1000,36681=>1000,36682=>1000,36683=>1000,36684=>1000,36685=>1000,36686=>1000,36687=>1000,36688=>1000,36689=>1000,36690=>1000,36691=>1000,36692=>1000,
-	36693=>1000,36694=>1000,36695=>1000,36696=>1000,36697=>1000,36698=>1000,36699=>1000,36700=>1000,36701=>1000,36702=>1000,36703=>1000,36704=>1000,36705=>1000,36706=>1000,36707=>1000,36708=>1000,
-	36709=>1000,36710=>1000,36711=>1000,36712=>1000,36713=>1000,36714=>1000,36715=>1000,36716=>1000,36717=>1000,36718=>1000,36719=>1000,36720=>1000,36721=>1000,36722=>1000,36723=>1000,36724=>1000,
-	36725=>1000,36726=>1000,36727=>1000,36728=>1000,36729=>1000,36730=>1000,36731=>1000,36732=>1000,36733=>1000,36734=>1000,36735=>1000,36736=>1000,36737=>1000,36738=>1000,36739=>1000,36740=>1000,
-	36741=>1000,36742=>1000,36743=>1000,36744=>1000,36745=>1000,36746=>1000,36747=>1000,36748=>1000,36749=>1000,36750=>1000,36751=>1000,36752=>1000,36753=>1000,36754=>1000,36755=>1000,36756=>1000,
-	36757=>1000,36758=>1000,36759=>1000,36760=>1000,36761=>1000,36762=>1000,36763=>1000,36764=>1000,36765=>1000,36766=>1000,36767=>1000,36768=>1000,36769=>1000,36770=>1000,36771=>1000,36772=>1000,
-	36773=>1000,36774=>1000,36775=>1000,36776=>1000,36777=>1000,36778=>1000,36779=>1000,36780=>1000,36781=>1000,36782=>1000,36783=>1000,36784=>1000,36785=>1000,36786=>1000,36787=>1000,36788=>1000,
-	36789=>1000,36790=>1000,36791=>1000,36792=>1000,36793=>1000,36794=>1000,36795=>1000,36796=>1000,36797=>1000,36798=>1000,36799=>1000,36800=>1000,36801=>1000,36802=>1000,36803=>1000,36804=>1000,
-	36805=>1000,36806=>1000,36807=>1000,36808=>1000,36809=>1000,36810=>1000,36811=>1000,36812=>1000,36813=>1000,36814=>1000,36815=>1000,36816=>1000,36817=>1000,36818=>1000,36819=>1000,36820=>1000,
-	36821=>1000,36822=>1000,36823=>1000,36824=>1000,36825=>1000,36826=>1000,36827=>1000,36828=>1000,36829=>1000,36830=>1000,36831=>1000,36832=>1000,36833=>1000,36834=>1000,36835=>1000,36836=>1000,
-	36837=>1000,36838=>1000,36839=>1000,36840=>1000,36841=>1000,36842=>1000,36843=>1000,36844=>1000,36845=>1000,36846=>1000,36847=>1000,36848=>1000,36849=>1000,36850=>1000,36851=>1000,36852=>1000,
-	36853=>1000,36854=>1000,36855=>1000,36856=>1000,36857=>1000,36858=>1000,36859=>1000,36860=>1000,36861=>1000,36862=>1000,36863=>1000,36864=>1000,36865=>1000,36866=>1000,36867=>1000,36868=>1000,
-	36869=>1000,36870=>1000,36871=>1000,36872=>1000,36873=>1000,36874=>1000,36875=>1000,36876=>1000,36877=>1000,36878=>1000,36879=>1000,36880=>1000,36881=>1000,36882=>1000,36883=>1000,36884=>1000,
-	36885=>1000,36886=>1000,36887=>1000,36888=>1000,36889=>1000,36890=>1000,36891=>1000,36892=>1000,36893=>1000,36894=>1000,36895=>1000,36896=>1000,36897=>1000,36898=>1000,36899=>1000,36900=>1000,
-	36901=>1000,36902=>1000,36903=>1000,36904=>1000,36905=>1000,36906=>1000,36907=>1000,36908=>1000,36909=>1000,36910=>1000,36911=>1000,36912=>1000,36913=>1000,36914=>1000,36915=>1000,36916=>1000,
-	36917=>1000,36918=>1000,36919=>1000,36920=>1000,36921=>1000,36922=>1000,36923=>1000,36924=>1000,36925=>1000,36926=>1000,36927=>1000,36928=>1000,36929=>1000,36930=>1000,36931=>1000,36932=>1000,
-	36933=>1000,36934=>1000,36935=>1000,36936=>1000,36937=>1000,36938=>1000,36939=>1000,36940=>1000,36941=>1000,36942=>1000,36943=>1000,36944=>1000,36945=>1000,36946=>1000,36947=>1000,36948=>1000,
-	36949=>1000,36950=>1000,36951=>1000,36952=>1000,36953=>1000,36954=>1000,36955=>1000,36956=>1000,36957=>1000,36958=>1000,36959=>1000,36960=>1000,36961=>1000,36962=>1000,36963=>1000,36964=>1000,
-	36965=>1000,36966=>1000,36967=>1000,36968=>1000,36969=>1000,36970=>1000,36971=>1000,36972=>1000,36973=>1000,36974=>1000,36975=>1000,36976=>1000,36977=>1000,36978=>1000,36979=>1000,36980=>1000,
-	36981=>1000,36982=>1000,36983=>1000,36984=>1000,36985=>1000,36986=>1000,36987=>1000,36988=>1000,36989=>1000,36990=>1000,36991=>1000,36992=>1000,36993=>1000,36994=>1000,36995=>1000,36996=>1000,
-	36997=>1000,36998=>1000,36999=>1000,37000=>1000,37001=>1000,37002=>1000,37003=>1000,37004=>1000,37005=>1000,37006=>1000,37007=>1000,37008=>1000,37009=>1000,37010=>1000,37011=>1000,37012=>1000,
-	37013=>1000,37014=>1000,37015=>1000,37016=>1000,37017=>1000,37018=>1000,37019=>1000,37020=>1000,37021=>1000,37022=>1000,37023=>1000,37024=>1000,37025=>1000,37026=>1000,37027=>1000,37028=>1000,
-	37029=>1000,37030=>1000,37031=>1000,37032=>1000,37033=>1000,37034=>1000,37035=>1000,37036=>1000,37037=>1000,37038=>1000,37039=>1000,37040=>1000,37041=>1000,37042=>1000,37043=>1000,37044=>1000,
-	37045=>1000,37046=>1000,37047=>1000,37048=>1000,37049=>1000,37050=>1000,37051=>1000,37052=>1000,37053=>1000,37054=>1000,37055=>1000,37056=>1000,37057=>1000,37058=>1000,37059=>1000,37060=>1000,
-	37061=>1000,37062=>1000,37063=>1000,37064=>1000,37065=>1000,37066=>1000,37067=>1000,37068=>1000,37069=>1000,37070=>1000,37071=>1000,37072=>1000,37073=>1000,37074=>1000,37075=>1000,37076=>1000,
-	37077=>1000,37078=>1000,37079=>1000,37080=>1000,37081=>1000,37082=>1000,37083=>1000,37084=>1000,37085=>1000,37086=>1000,37087=>1000,37088=>1000,37089=>1000,37090=>1000,37091=>1000,37092=>1000,
-	37093=>1000,37094=>1000,37095=>1000,37096=>1000,37097=>1000,37098=>1000,37099=>1000,37100=>1000,37101=>1000,37102=>1000,37103=>1000,37104=>1000,37105=>1000,37106=>1000,37107=>1000,37108=>1000,
-	37109=>1000,37110=>1000,37111=>1000,37112=>1000,37113=>1000,37114=>1000,37115=>1000,37116=>1000,37117=>1000,37118=>1000,37119=>1000,37120=>1000,37121=>1000,37122=>1000,37123=>1000,37124=>1000,
-	37125=>1000,37126=>1000,37127=>1000,37128=>1000,37129=>1000,37130=>1000,37131=>1000,37132=>1000,37133=>1000,37134=>1000,37135=>1000,37136=>1000,37137=>1000,37138=>1000,37139=>1000,37140=>1000,
-	37141=>1000,37142=>1000,37143=>1000,37144=>1000,37145=>1000,37146=>1000,37147=>1000,37148=>1000,37149=>1000,37150=>1000,37151=>1000,37152=>1000,37153=>1000,37154=>1000,37155=>1000,37156=>1000,
-	37157=>1000,37158=>1000,37159=>1000,37160=>1000,37161=>1000,37162=>1000,37163=>1000,37164=>1000,37165=>1000,37166=>1000,37167=>1000,37168=>1000,37169=>1000,37170=>1000,37171=>1000,37172=>1000,
-	37173=>1000,37174=>1000,37175=>1000,37176=>1000,37177=>1000,37178=>1000,37179=>1000,37180=>1000,37181=>1000,37182=>1000,37183=>1000,37184=>1000,37185=>1000,37186=>1000,37187=>1000,37188=>1000,
-	37189=>1000,37190=>1000,37191=>1000,37192=>1000,37193=>1000,37194=>1000,37195=>1000,37196=>1000,37197=>1000,37198=>1000,37199=>1000,37200=>1000,37201=>1000,37202=>1000,37203=>1000,37204=>1000,
-	37205=>1000,37206=>1000,37207=>1000,37208=>1000,37209=>1000,37210=>1000,37211=>1000,37212=>1000,37213=>1000,37214=>1000,37215=>1000,37216=>1000,37217=>1000,37218=>1000,37219=>1000,37220=>1000,
-	37221=>1000,37222=>1000,37223=>1000,37224=>1000,37225=>1000,37226=>1000,37227=>1000,37228=>1000,37229=>1000,37230=>1000,37231=>1000,37232=>1000,37233=>1000,37234=>1000,37235=>1000,37236=>1000,
-	37237=>1000,37238=>1000,37239=>1000,37240=>1000,37241=>1000,37242=>1000,37243=>1000,37244=>1000,37245=>1000,37246=>1000,37247=>1000,37248=>1000,37249=>1000,37250=>1000,37251=>1000,37252=>1000,
-	37253=>1000,37254=>1000,37255=>1000,37256=>1000,37257=>1000,37258=>1000,37259=>1000,37260=>1000,37261=>1000,37262=>1000,37263=>1000,37264=>1000,37265=>1000,37266=>1000,37267=>1000,37268=>1000,
-	37269=>1000,37270=>1000,37271=>1000,37272=>1000,37273=>1000,37274=>1000,37275=>1000,37276=>1000,37277=>1000,37278=>1000,37279=>1000,37280=>1000,37281=>1000,37282=>1000,37283=>1000,37284=>1000,
-	37285=>1000,37286=>1000,37287=>1000,37288=>1000,37289=>1000,37290=>1000,37291=>1000,37292=>1000,37293=>1000,37294=>1000,37295=>1000,37296=>1000,37297=>1000,37298=>1000,37299=>1000,37300=>1000,
-	37301=>1000,37302=>1000,37303=>1000,37304=>1000,37305=>1000,37306=>1000,37307=>1000,37308=>1000,37309=>1000,37310=>1000,37311=>1000,37312=>1000,37313=>1000,37314=>1000,37315=>1000,37316=>1000,
-	37317=>1000,37318=>1000,37319=>1000,37320=>1000,37321=>1000,37322=>1000,37323=>1000,37324=>1000,37325=>1000,37326=>1000,37327=>1000,37328=>1000,37329=>1000,37330=>1000,37331=>1000,37332=>1000,
-	37333=>1000,37334=>1000,37335=>1000,37336=>1000,37337=>1000,37338=>1000,37339=>1000,37340=>1000,37341=>1000,37342=>1000,37343=>1000,37344=>1000,37345=>1000,37346=>1000,37347=>1000,37348=>1000,
-	37349=>1000,37350=>1000,37351=>1000,37352=>1000,37353=>1000,37354=>1000,37355=>1000,37356=>1000,37357=>1000,37358=>1000,37359=>1000,37360=>1000,37361=>1000,37362=>1000,37363=>1000,37364=>1000,
-	37365=>1000,37366=>1000,37367=>1000,37368=>1000,37369=>1000,37370=>1000,37371=>1000,37372=>1000,37373=>1000,37374=>1000,37375=>1000,37376=>1000,37377=>1000,37378=>1000,37379=>1000,37380=>1000,
-	37381=>1000,37382=>1000,37383=>1000,37384=>1000,37385=>1000,37386=>1000,37387=>1000,37388=>1000,37389=>1000,37390=>1000,37391=>1000,37392=>1000,37393=>1000,37394=>1000,37395=>1000,37396=>1000,
-	37397=>1000,37398=>1000,37399=>1000,37400=>1000,37401=>1000,37402=>1000,37403=>1000,37404=>1000,37405=>1000,37406=>1000,37407=>1000,37408=>1000,37409=>1000,37410=>1000,37411=>1000,37412=>1000,
-	37413=>1000,37414=>1000,37415=>1000,37416=>1000,37417=>1000,37418=>1000,37419=>1000,37420=>1000,37421=>1000,37422=>1000,37423=>1000,37424=>1000,37425=>1000,37426=>1000,37427=>1000,37428=>1000,
-	37429=>1000,37430=>1000,37431=>1000,37432=>1000,37433=>1000,37434=>1000,37435=>1000,37436=>1000,37437=>1000,37438=>1000,37439=>1000,37440=>1000,37441=>1000,37442=>1000,37443=>1000,37444=>1000,
-	37445=>1000,37446=>1000,37447=>1000,37448=>1000,37449=>1000,37450=>1000,37451=>1000,37452=>1000,37453=>1000,37454=>1000,37455=>1000,37456=>1000,37457=>1000,37458=>1000,37459=>1000,37460=>1000,
-	37461=>1000,37462=>1000,37463=>1000,37464=>1000,37465=>1000,37466=>1000,37467=>1000,37468=>1000,37469=>1000,37470=>1000,37471=>1000,37472=>1000,37473=>1000,37474=>1000,37475=>1000,37476=>1000,
-	37477=>1000,37478=>1000,37479=>1000,37480=>1000,37481=>1000,37482=>1000,37483=>1000,37484=>1000,37485=>1000,37486=>1000,37487=>1000,37488=>1000,37489=>1000,37490=>1000,37491=>1000,37492=>1000,
-	37493=>1000,37494=>1000,37495=>1000,37496=>1000,37497=>1000,37498=>1000,37499=>1000,37500=>1000,37501=>1000,37502=>1000,37503=>1000,37504=>1000,37505=>1000,37506=>1000,37507=>1000,37508=>1000,
-	37509=>1000,37510=>1000,37511=>1000,37512=>1000,37513=>1000,37514=>1000,37515=>1000,37516=>1000,37517=>1000,37518=>1000,37519=>1000,37520=>1000,37521=>1000,37522=>1000,37523=>1000,37524=>1000,
-	37525=>1000,37526=>1000,37527=>1000,37528=>1000,37529=>1000,37530=>1000,37531=>1000,37532=>1000,37533=>1000,37534=>1000,37535=>1000,37536=>1000,37537=>1000,37538=>1000,37539=>1000,37540=>1000,
-	37541=>1000,37542=>1000,37543=>1000,37544=>1000,37545=>1000,37546=>1000,37547=>1000,37548=>1000,37549=>1000,37550=>1000,37551=>1000,37552=>1000,37553=>1000,37554=>1000,37555=>1000,37556=>1000,
-	37557=>1000,37558=>1000,37559=>1000,37560=>1000,37561=>1000,37562=>1000,37563=>1000,37564=>1000,37565=>1000,37566=>1000,37567=>1000,37568=>1000,37569=>1000,37570=>1000,37571=>1000,37572=>1000,
-	37573=>1000,37574=>1000,37575=>1000,37576=>1000,37577=>1000,37578=>1000,37579=>1000,37580=>1000,37581=>1000,37582=>1000,37583=>1000,37584=>1000,37585=>1000,37586=>1000,37587=>1000,37588=>1000,
-	37589=>1000,37590=>1000,37591=>1000,37592=>1000,37593=>1000,37594=>1000,37595=>1000,37596=>1000,37597=>1000,37598=>1000,37599=>1000,37600=>1000,37601=>1000,37602=>1000,37603=>1000,37604=>1000,
-	37605=>1000,37606=>1000,37607=>1000,37608=>1000,37609=>1000,37610=>1000,37611=>1000,37612=>1000,37613=>1000,37614=>1000,37615=>1000,37616=>1000,37617=>1000,37618=>1000,37619=>1000,37620=>1000,
-	37621=>1000,37622=>1000,37623=>1000,37624=>1000,37625=>1000,37626=>1000,37627=>1000,37628=>1000,37629=>1000,37630=>1000,37631=>1000,37632=>1000,37633=>1000,37634=>1000,37635=>1000,37636=>1000,
-	37637=>1000,37638=>1000,37639=>1000,37640=>1000,37641=>1000,37642=>1000,37643=>1000,37644=>1000,37645=>1000,37646=>1000,37647=>1000,37648=>1000,37649=>1000,37650=>1000,37651=>1000,37652=>1000,
-	37653=>1000,37654=>1000,37655=>1000,37656=>1000,37657=>1000,37658=>1000,37659=>1000,37660=>1000,37661=>1000,37662=>1000,37663=>1000,37664=>1000,37665=>1000,37666=>1000,37667=>1000,37668=>1000,
-	37669=>1000,37670=>1000,37671=>1000,37672=>1000,37673=>1000,37674=>1000,37675=>1000,37676=>1000,37677=>1000,37678=>1000,37679=>1000,37680=>1000,37681=>1000,37682=>1000,37683=>1000,37684=>1000,
-	37685=>1000,37686=>1000,37687=>1000,37688=>1000,37689=>1000,37690=>1000,37691=>1000,37692=>1000,37693=>1000,37694=>1000,37695=>1000,37696=>1000,37697=>1000,37698=>1000,37699=>1000,37700=>1000,
-	37701=>1000,37702=>1000,37703=>1000,37704=>1000,37705=>1000,37706=>1000,37707=>1000,37708=>1000,37709=>1000,37710=>1000,37711=>1000,37712=>1000,37713=>1000,37714=>1000,37715=>1000,37716=>1000,
-	37717=>1000,37718=>1000,37719=>1000,37720=>1000,37721=>1000,37722=>1000,37723=>1000,37724=>1000,37725=>1000,37726=>1000,37727=>1000,37728=>1000,37729=>1000,37730=>1000,37731=>1000,37732=>1000,
-	37733=>1000,37734=>1000,37735=>1000,37736=>1000,37737=>1000,37738=>1000,37739=>1000,37740=>1000,37741=>1000,37742=>1000,37743=>1000,37744=>1000,37745=>1000,37746=>1000,37747=>1000,37748=>1000,
-	37749=>1000,37750=>1000,37751=>1000,37752=>1000,37753=>1000,37754=>1000,37755=>1000,37756=>1000,37757=>1000,37758=>1000,37759=>1000,37760=>1000,37761=>1000,37762=>1000,37763=>1000,37764=>1000,
-	37765=>1000,37766=>1000,37767=>1000,37768=>1000,37769=>1000,37770=>1000,37771=>1000,37772=>1000,37773=>1000,37774=>1000,37775=>1000,37776=>1000,37777=>1000,37778=>1000,37779=>1000,37780=>1000,
-	37781=>1000,37782=>1000,37783=>1000,37784=>1000,37785=>1000,37786=>1000,37787=>1000,37788=>1000,37789=>1000,37790=>1000,37791=>1000,37792=>1000,37793=>1000,37794=>1000,37795=>1000,37796=>1000,
-	37797=>1000,37798=>1000,37799=>1000,37800=>1000,37801=>1000,37802=>1000,37803=>1000,37804=>1000,37805=>1000,37806=>1000,37807=>1000,37808=>1000,37809=>1000,37810=>1000,37811=>1000,37812=>1000,
-	37813=>1000,37814=>1000,37815=>1000,37816=>1000,37817=>1000,37818=>1000,37819=>1000,37820=>1000,37821=>1000,37822=>1000,37823=>1000,37824=>1000,37825=>1000,37826=>1000,37827=>1000,37828=>1000,
-	37829=>1000,37830=>1000,37831=>1000,37832=>1000,37833=>1000,37834=>1000,37835=>1000,37836=>1000,37837=>1000,37838=>1000,37839=>1000,37840=>1000,37841=>1000,37842=>1000,37843=>1000,37844=>1000,
-	37845=>1000,37846=>1000,37847=>1000,37848=>1000,37849=>1000,37850=>1000,37851=>1000,37852=>1000,37853=>1000,37854=>1000,37855=>1000,37856=>1000,37857=>1000,37858=>1000,37859=>1000,37860=>1000,
-	37861=>1000,37862=>1000,37863=>1000,37864=>1000,37865=>1000,37866=>1000,37867=>1000,37868=>1000,37869=>1000,37870=>1000,37871=>1000,37872=>1000,37873=>1000,37874=>1000,37875=>1000,37876=>1000,
-	37877=>1000,37878=>1000,37879=>1000,37880=>1000,37881=>1000,37882=>1000,37883=>1000,37884=>1000,37885=>1000,37886=>1000,37887=>1000,37888=>1000,37889=>1000,37890=>1000,37891=>1000,37892=>1000,
-	37893=>1000,37894=>1000,37895=>1000,37896=>1000,37897=>1000,37898=>1000,37899=>1000,37900=>1000,37901=>1000,37902=>1000,37903=>1000,37904=>1000,37905=>1000,37906=>1000,37907=>1000,37908=>1000,
-	37909=>1000,37910=>1000,37911=>1000,37912=>1000,37913=>1000,37914=>1000,37915=>1000,37916=>1000,37917=>1000,37918=>1000,37919=>1000,37920=>1000,37921=>1000,37922=>1000,37923=>1000,37924=>1000,
-	37925=>1000,37926=>1000,37927=>998,37928=>1000,37929=>1000,37930=>1000,37931=>1000,37932=>1000,37933=>1000,37934=>1000,37935=>1000,37936=>1000,37937=>1000,37938=>1000,37939=>1000,37940=>1000,
-	37941=>1000,37942=>1000,37943=>1000,37944=>1000,37945=>1000,37946=>1000,37947=>1000,37948=>1000,37949=>1000,37950=>1000,37951=>1000,37952=>1000,37953=>1000,37954=>1000,37955=>1000,37956=>1000,
-	37957=>1000,37958=>1000,37959=>1000,37960=>1000,37961=>1000,37962=>1000,37963=>1000,37964=>1000,37965=>1000,37966=>1000,37967=>1000,37968=>1000,37969=>1000,37970=>1000,37971=>1000,37972=>1000,
-	37973=>1000,37974=>1000,37975=>1000,37976=>1000,37977=>1000,37978=>1000,37979=>1000,37980=>1000,37981=>1000,37982=>1000,37983=>1000,37984=>1000,37985=>1000,37986=>1000,37987=>1000,37988=>1000,
-	37989=>1000,37990=>1000,37991=>1000,37992=>1000,37993=>1000,37994=>1000,37995=>1000,37996=>1000,37997=>1000,37998=>1000,37999=>1000,38000=>1000,38001=>1000,38002=>1000,38003=>1000,38004=>1000,
-	38005=>1000,38006=>1000,38007=>1000,38008=>1000,38009=>1000,38010=>1000,38011=>1000,38012=>1000,38013=>1000,38014=>1000,38015=>1000,38016=>1000,38017=>1000,38018=>1000,38019=>1000,38020=>1000,
-	38021=>1000,38022=>1000,38023=>1000,38024=>1000,38025=>1000,38026=>1000,38027=>1000,38028=>1000,38029=>1000,38030=>1000,38031=>1000,38032=>1000,38033=>1000,38034=>1000,38035=>1000,38036=>1000,
-	38037=>1000,38038=>1000,38039=>1000,38040=>1000,38041=>1000,38042=>1000,38043=>1000,38044=>1000,38045=>1000,38046=>1000,38047=>1000,38048=>1000,38049=>1000,38050=>1000,38051=>1000,38052=>1000,
-	38053=>1000,38054=>1000,38055=>1000,38056=>1000,38057=>1000,38058=>1000,38059=>1000,38060=>1000,38061=>1000,38062=>1000,38063=>1000,38064=>1000,38065=>1000,38066=>1000,38067=>1000,38068=>1000,
-	38069=>1000,38070=>1000,38071=>1000,38072=>1000,38073=>1000,38074=>1000,38075=>1000,38076=>1000,38077=>1000,38078=>1000,38079=>1000,38080=>1000,38081=>1000,38082=>1000,38083=>1000,38084=>1000,
-	38085=>1000,38086=>1000,38087=>1000,38088=>1000,38089=>1000,38090=>1000,38091=>1000,38092=>1000,38093=>1000,38094=>1000,38095=>1000,38096=>1000,38097=>1000,38098=>1000,38099=>1000,38100=>1000,
-	38101=>1000,38102=>1000,38103=>1000,38104=>1000,38105=>1000,38106=>1000,38107=>1000,38108=>1000,38109=>1000,38110=>1000,38111=>1000,38112=>1000,38113=>1000,38114=>1000,38115=>1000,38116=>1000,
-	38117=>1000,38118=>1000,38119=>1000,38120=>1000,38121=>1000,38122=>1000,38123=>1000,38124=>1000,38125=>1000,38126=>1000,38127=>1000,38128=>1000,38129=>1000,38130=>1000,38131=>1000,38132=>1000,
-	38133=>1000,38134=>1000,38135=>1000,38136=>1000,38137=>1000,38138=>1000,38139=>1000,38140=>1000,38141=>1000,38142=>1000,38143=>1000,38144=>1000,38145=>1000,38146=>1000,38147=>1000,38148=>1000,
-	38149=>1000,38150=>1000,38151=>1000,38152=>1000,38153=>1000,38154=>1000,38155=>1000,38156=>1000,38157=>1000,38158=>1000,38159=>1000,38160=>1000,38161=>1000,38162=>1000,38163=>1000,38164=>1000,
-	38165=>1000,38166=>1000,38167=>1000,38168=>1000,38169=>1000,38170=>1000,38171=>1000,38172=>1000,38173=>1000,38174=>1000,38175=>1000,38176=>1000,38177=>1000,38178=>1000,38179=>1000,38180=>1000,
-	38181=>1000,38182=>1000,38183=>1000,38184=>1000,38185=>1000,38186=>1000,38187=>1000,38188=>1000,38189=>1000,38190=>1000,38191=>1000,38192=>1000,38193=>1000,38194=>1000,38195=>1000,38196=>1000,
-	38197=>1000,38198=>1000,38199=>1000,38200=>1000,38201=>1000,38202=>1000,38203=>1000,38204=>1000,38205=>1000,38206=>1000,38207=>1000,38208=>1000,38209=>1000,38210=>1000,38211=>1000,38212=>1000,
-	38213=>1000,38214=>1000,38215=>1000,38216=>1000,38217=>1000,38218=>1000,38219=>1000,38220=>1000,38221=>1000,38222=>1000,38223=>1000,38224=>1000,38225=>1000,38226=>1000,38227=>1000,38228=>1000,
-	38229=>1000,38230=>1000,38231=>1000,38232=>1000,38233=>1000,38234=>1000,38235=>1000,38236=>1000,38237=>1000,38238=>1000,38239=>1000,38240=>1000,38241=>1000,38242=>1000,38243=>1000,38244=>1000,
-	38245=>1000,38246=>1000,38247=>1000,38248=>1000,38249=>1000,38250=>1000,38251=>1000,38252=>1000,38253=>1000,38254=>1000,38255=>1000,38256=>1000,38257=>1000,38258=>1000,38259=>1000,38260=>1000,
-	38261=>1000,38262=>1000,38263=>1000,38264=>1000,38265=>1000,38266=>1000,38267=>1000,38268=>1000,38269=>1000,38270=>1000,38271=>1000,38272=>1000,38273=>1000,38274=>1000,38275=>1000,38276=>1000,
-	38277=>1000,38278=>1000,38279=>1000,38280=>1000,38281=>1000,38282=>1000,38283=>1000,38284=>1000,38285=>1000,38286=>1000,38287=>1000,38288=>1000,38289=>1000,38290=>1000,38291=>1000,38292=>1000,
-	38293=>1000,38294=>1000,38295=>1000,38296=>1000,38297=>1000,38298=>1000,38299=>1000,38300=>1000,38301=>1000,38302=>1000,38303=>1000,38304=>1000,38305=>1000,38306=>1000,38307=>1000,38308=>1000,
-	38309=>1000,38310=>1000,38311=>1000,38312=>1000,38313=>1000,38314=>1000,38315=>1000,38316=>1000,38317=>1000,38318=>1000,38319=>1000,38320=>1000,38321=>1000,38322=>1000,38323=>1000,38324=>1000,
-	38325=>1000,38326=>1000,38327=>1000,38328=>1000,38329=>1000,38330=>1000,38331=>1000,38332=>1000,38333=>1000,38334=>1000,38335=>1000,38336=>1000,38337=>1000,38338=>1000,38339=>1000,38340=>1000,
-	38341=>1000,38342=>1000,38343=>1000,38344=>1000,38345=>1000,38346=>1000,38347=>1000,38348=>1000,38349=>1000,38350=>1000,38351=>1000,38352=>1000,38353=>1000,38354=>1000,38355=>1000,38356=>1000,
-	38357=>1000,38358=>1000,38359=>1000,38360=>1000,38361=>1000,38362=>1000,38363=>1000,38364=>1000,38365=>1000,38366=>1000,38367=>1000,38368=>1000,38369=>1000,38370=>1000,38371=>1000,38372=>1000,
-	38373=>1000,38374=>1000,38375=>1000,38376=>1000,38377=>1000,38378=>1000,38379=>1000,38380=>1000,38381=>1000,38382=>1000,38383=>1000,38384=>1000,38385=>1000,38386=>1000,38387=>1000,38388=>1000,
-	38389=>1000,38390=>1000,38391=>1000,38392=>1000,38393=>1000,38394=>1000,38395=>1000,38396=>1000,38397=>1000,38398=>1000,38399=>1000,38400=>1000,38401=>1000,38402=>1000,38403=>1000,38404=>1000,
-	38405=>1000,38406=>1000,38407=>1000,38408=>1000,38409=>1000,38410=>1000,38411=>1000,38412=>1000,38413=>1000,38414=>1000,38415=>1000,38416=>1000,38417=>1000,38418=>1000,38419=>1000,38420=>1000,
-	38421=>1000,38422=>1000,38423=>1000,38424=>1000,38425=>1000,38426=>1000,38427=>1000,38428=>1000,38429=>1000,38430=>1000,38431=>1000,38432=>1000,38433=>1000,38434=>1000,38435=>1000,38436=>1000,
-	38437=>1000,38438=>1000,38439=>1000,38440=>1000,38441=>1000,38442=>1000,38443=>1000,38444=>1000,38445=>1000,38446=>1000,38447=>1000,38448=>1000,38449=>1000,38450=>1000,38451=>1000,38452=>1000,
-	38453=>1000,38454=>1000,38455=>1000,38456=>1000,38457=>1000,38458=>1000,38459=>1000,38460=>1000,38461=>1000,38462=>1000,38463=>1000,38464=>1000,38465=>1000,38466=>1000,38467=>1000,38468=>1000,
-	38469=>1000,38470=>1000,38471=>1000,38472=>1000,38473=>1000,38474=>1000,38475=>1000,38476=>1000,38477=>1000,38478=>1000,38479=>1000,38480=>1000,38481=>1000,38482=>1000,38483=>1000,38484=>1000,
-	38485=>1000,38486=>1000,38487=>1000,38488=>1000,38489=>1000,38490=>1000,38491=>1000,38492=>1000,38493=>1000,38494=>1000,38495=>1000,38496=>1000,38497=>1000,38498=>1000,38499=>1000,38500=>1000,
-	38501=>1000,38502=>1000,38503=>1000,38504=>1000,38505=>1000,38506=>1000,38507=>1000,38508=>1000,38509=>1000,38510=>1000,38511=>1000,38512=>1000,38513=>1000,38514=>1000,38515=>1000,38516=>1000,
-	38517=>1000,38518=>1000,38519=>1000,38520=>1000,38521=>1000,38522=>1000,38523=>1000,38524=>1000,38525=>1000,38526=>1000,38527=>1000,38528=>1000,38529=>1000,38530=>1000,38531=>1000,38532=>1000,
-	38533=>1000,38534=>1000,38535=>1000,38536=>1000,38537=>1000,38538=>1000,38539=>1000,38540=>1000,38541=>1000,38542=>1000,38543=>1000,38544=>1000,38545=>1000,38546=>1000,38547=>1000,38548=>1000,
-	38549=>1000,38550=>1000,38551=>1000,38552=>1000,38553=>1000,38554=>1000,38555=>1000,38556=>1000,38557=>1000,38558=>1000,38559=>1000,38560=>1000,38561=>1000,38562=>1000,38563=>1000,38564=>1000,
-	38565=>1000,38566=>1000,38567=>1000,38568=>1000,38569=>1000,38570=>1000,38571=>1000,38572=>1000,38573=>1000,38574=>1000,38575=>1000,38576=>1000,38577=>1000,38578=>1000,38579=>1000,38580=>1000,
-	38581=>1000,38582=>1000,38583=>1000,38584=>1000,38585=>1000,38586=>1000,38587=>1000,38588=>1000,38589=>1000,38590=>1000,38591=>1000,38592=>1000,38593=>1000,38594=>1000,38595=>1000,38596=>1000,
-	38597=>1000,38598=>1000,38599=>1000,38600=>1000,38601=>1000,38602=>1000,38603=>1000,38604=>1000,38605=>1000,38606=>1000,38607=>1000,38608=>1000,38609=>1000,38610=>1000,38611=>1000,38612=>1000,
-	38613=>1000,38614=>1000,38615=>1000,38616=>1000,38617=>1000,38618=>1000,38619=>1000,38620=>1000,38621=>1000,38622=>1000,38623=>1000,38624=>1000,38625=>1000,38626=>1000,38627=>1000,38628=>1000,
-	38629=>1000,38630=>1000,38631=>1000,38632=>1000,38633=>1000,38634=>1000,38635=>1000,38636=>1000,38637=>1000,38638=>1000,38639=>1000,38640=>1000,38641=>1000,38642=>1000,38643=>1000,38644=>1000,
-	38645=>1000,38646=>1000,38647=>1000,38648=>1000,38649=>1000,38650=>1000,38651=>1000,38652=>1000,38653=>1000,38654=>1000,38655=>1000,38656=>1000,38657=>1000,38658=>1000,38659=>1000,38660=>1000,
-	38661=>1000,38662=>1000,38663=>1000,38664=>1000,38665=>1000,38666=>1000,38667=>1000,38668=>1000,38669=>1000,38670=>1000,38671=>1000,38672=>1000,38673=>1000,38674=>1000,38675=>1000,38676=>1000,
-	38677=>1000,38678=>1000,38679=>1000,38680=>1000,38681=>1000,38682=>1000,38683=>1000,38684=>1000,38685=>1000,38686=>1000,38687=>1000,38688=>1000,38689=>1000,38690=>1000,38691=>1000,38692=>1000,
-	38693=>1000,38694=>1000,38695=>1000,38696=>1000,38697=>1000,38698=>1000,38699=>1000,38700=>1000,38701=>1000,38702=>1000,38703=>1000,38704=>1000,38705=>1000,38706=>1000,38707=>1000,38708=>1000,
-	38709=>1000,38710=>1000,38711=>1000,38712=>1000,38713=>1000,38714=>1000,38715=>1000,38716=>1000,38717=>1000,38718=>1000,38719=>1000,38720=>1000,38721=>1000,38722=>1000,38723=>1000,38724=>1000,
-	38725=>1000,38726=>1000,38727=>1000,38728=>1000,38729=>1000,38730=>1000,38731=>1000,38732=>1000,38733=>1000,38734=>1000,38735=>1000,38736=>1000,38737=>1000,38738=>1000,38739=>1000,38740=>1000,
-	38741=>1000,38742=>1000,38743=>1000,38744=>1000,38745=>1000,38746=>1000,38747=>1000,38748=>1000,38749=>1000,38750=>1000,38751=>1000,38752=>1000,38753=>1000,38754=>1000,38755=>1000,38756=>1000,
-	38757=>1000,38758=>1000,38759=>1000,38760=>1000,38761=>1000,38762=>1000,38763=>1000,38764=>1000,38765=>1000,38766=>1000,38767=>1000,38768=>1000,38769=>1000,38770=>1000,38771=>1000,38772=>1000,
-	38773=>1000,38774=>1000,38775=>1000,38776=>1000,38777=>1000,38778=>1000,38779=>1000,38780=>1000,38781=>1000,38782=>1000,38783=>1000,38784=>1000,38785=>1000,38786=>1000,38787=>1000,38788=>1000,
-	38789=>1000,38790=>1000,38791=>1000,38792=>1000,38793=>1000,38794=>1000,38795=>1000,38796=>1000,38797=>1000,38798=>1000,38799=>1000,38800=>1000,38801=>1000,38802=>1000,38803=>1000,38804=>1000,
-	38805=>1000,38806=>1000,38807=>1000,38808=>1000,38809=>1000,38810=>1000,38811=>1000,38812=>1000,38813=>1000,38814=>1000,38815=>1000,38816=>1000,38817=>1000,38818=>1000,38819=>1000,38820=>1000,
-	38821=>1000,38822=>1000,38823=>1000,38824=>1000,38825=>1000,38826=>1000,38827=>1000,38828=>1000,38829=>1000,38830=>1000,38831=>1000,38832=>1000,38833=>1000,38834=>1000,38835=>1000,38836=>1000,
-	38837=>1000,38838=>1000,38839=>1000,38840=>1000,38841=>1000,38842=>1000,38843=>1000,38844=>1000,38845=>1000,38846=>1000,38847=>1000,38848=>1000,38849=>1000,38850=>1000,38851=>1000,38852=>1000,
-	38853=>1000,38854=>1000,38855=>1000,38856=>1000,38857=>1000,38858=>1000,38859=>1000,38860=>1000,38861=>1000,38862=>1000,38863=>1000,38864=>1000,38865=>1000,38866=>1000,38867=>1000,38868=>1000,
-	38869=>1000,38870=>1000,38871=>1000,38872=>1000,38873=>1000,38874=>1000,38875=>1000,38876=>1000,38877=>1000,38878=>1000,38879=>1000,38880=>1000,38881=>1000,38882=>1000,38883=>1000,38884=>1000,
-	38885=>1000,38886=>1000,38887=>1000,38888=>1000,38889=>1000,38890=>1000,38891=>1000,38892=>1000,38893=>1000,38894=>1000,38895=>1000,38896=>1000,38897=>1000,38898=>1000,38899=>1000,38900=>1000,
-	38901=>1000,38902=>1000,38903=>1000,38904=>1000,38905=>1000,38906=>1000,38907=>1000,38908=>1000,38909=>1000,38910=>1000,38911=>1000,38912=>1000,38913=>1000,38914=>1000,38915=>1000,38916=>1000,
-	38917=>1000,38918=>1000,38919=>1000,38920=>1000,38921=>1000,38922=>1000,38923=>1000,38924=>1000,38925=>1000,38926=>1000,38927=>1000,38928=>1000,38929=>1000,38930=>1000,38931=>1000,38932=>1000,
-	38933=>1000,38934=>1000,38935=>1000,38936=>1000,38937=>1000,38938=>1000,38939=>1000,38940=>1000,38941=>1000,38942=>1000,38943=>1000,38944=>1000,38945=>1000,38946=>1000,38947=>1000,38948=>1000,
-	38949=>1000,38950=>1000,38951=>1000,38952=>1000,38953=>1000,38954=>1000,38955=>1000,38956=>1000,38957=>1000,38958=>1000,38959=>1000,38960=>1000,38961=>1000,38962=>1000,38963=>1000,38964=>1000,
-	38965=>1000,38966=>1000,38967=>1000,38968=>1000,38969=>1000,38970=>1000,38971=>1000,38972=>1000,38973=>1000,38974=>1000,38975=>1000,38976=>1000,38977=>1000,38978=>1000,38979=>1000,38980=>1000,
-	38981=>1000,38982=>1000,38983=>1000,38984=>1000,38985=>1000,38986=>1000,38987=>1000,38988=>1000,38989=>1000,38990=>1000,38991=>1000,38992=>1000,38993=>1000,38994=>1000,38995=>1000,38996=>1000,
-	38997=>1000,38998=>1000,38999=>1000,39000=>1000,39001=>1000,39002=>1000,39003=>1000,39004=>1000,39005=>1000,39006=>1000,39007=>1000,39008=>1000,39009=>1000,39010=>1000,39011=>1000,39012=>1000,
-	39013=>1000,39014=>1000,39015=>1000,39016=>1000,39017=>1000,39018=>1000,39019=>1000,39020=>1000,39021=>1000,39022=>1000,39023=>1000,39024=>1000,39025=>1000,39026=>1000,39027=>1000,39028=>1000,
-	39029=>1000,39030=>1000,39031=>1000,39032=>1000,39033=>1000,39034=>1000,39035=>1000,39036=>1000,39037=>1000,39038=>1000,39039=>1000,39040=>1000,39041=>1000,39042=>1000,39043=>1000,39044=>1000,
-	39045=>1000,39046=>1000,39047=>1000,39048=>1000,39049=>1000,39050=>1000,39051=>1000,39052=>1000,39053=>1000,39054=>1000,39055=>1000,39056=>1000,39057=>1000,39058=>1000,39059=>1000,39060=>1000,
-	39061=>1000,39062=>1000,39063=>1000,39064=>1000,39065=>1000,39066=>1000,39067=>1000,39068=>1000,39069=>1000,39070=>1000,39071=>1000,39072=>1000,39073=>1000,39074=>1000,39075=>1000,39076=>1000,
-	39077=>1000,39078=>1000,39079=>1000,39080=>1000,39081=>1000,39082=>1000,39083=>1000,39084=>1000,39085=>1000,39086=>1000,39087=>1000,39088=>1000,39089=>1000,39090=>1000,39091=>1000,39092=>1000,
-	39093=>1000,39094=>1000,39095=>1000,39096=>1000,39097=>1000,39098=>1000,39099=>1000,39100=>1000,39101=>1000,39102=>1000,39103=>1000,39104=>1000,39105=>1000,39106=>1000,39107=>1000,39108=>1000,
-	39109=>1000,39110=>1000,39111=>1000,39112=>1000,39113=>1000,39114=>1000,39115=>1000,39116=>1000,39117=>1000,39118=>1000,39119=>1000,39120=>1000,39121=>1000,39122=>1000,39123=>1000,39124=>1000,
-	39125=>1000,39126=>1000,39127=>1000,39128=>1000,39129=>1000,39130=>1000,39131=>1000,39132=>1000,39133=>1000,39134=>1000,39135=>1000,39136=>1000,39137=>1000,39138=>1000,39139=>1000,39140=>1000,
-	39141=>1000,39142=>1000,39143=>1000,39144=>1000,39145=>1000,39146=>1000,39147=>1000,39148=>1000,39149=>1000,39150=>1000,39151=>1000,39152=>1000,39153=>1000,39154=>1000,39155=>1000,39156=>1000,
-	39157=>1000,39158=>1000,39159=>1000,39160=>1000,39161=>1000,39162=>1000,39163=>1000,39164=>1000,39165=>1000,39166=>1000,39167=>1000,39168=>1000,39169=>1000,39170=>1000,39171=>1000,39172=>1000,
-	39173=>1000,39174=>1000,39175=>1000,39176=>1000,39177=>1000,39178=>1000,39179=>1000,39180=>1000,39181=>1000,39182=>1000,39183=>1000,39184=>1000,39185=>1000,39186=>1000,39187=>1000,39188=>1000,
-	39189=>1000,39190=>1000,39191=>1000,39192=>1000,39193=>1000,39194=>1000,39195=>1000,39196=>1000,39197=>1000,39198=>1000,39199=>1000,39200=>1000,39201=>1000,39202=>1000,39203=>1000,39204=>1000,
-	39205=>1000,39206=>1000,39207=>1000,39208=>1000,39209=>1000,39210=>1000,39211=>1000,39212=>1000,39213=>1000,39214=>1000,39215=>1000,39216=>1000,39217=>1000,39218=>1000,39219=>1000,39220=>1000,
-	39221=>1000,39222=>1000,39223=>1000,39224=>1000,39225=>1000,39226=>1000,39227=>1000,39228=>1000,39229=>1000,39230=>1000,39231=>1000,39232=>1000,39233=>1000,39234=>1000,39235=>1000,39236=>1000,
-	39237=>1000,39238=>1000,39239=>1000,39240=>1000,39241=>1000,39242=>1000,39243=>1000,39244=>1000,39245=>1000,39246=>1000,39247=>1000,39248=>1000,39249=>1000,39250=>1000,39251=>1000,39252=>1000,
-	39253=>1000,39254=>1000,39255=>1000,39256=>1000,39257=>1000,39258=>1000,39259=>1000,39260=>1000,39261=>1000,39262=>1000,39263=>1000,39264=>1000,39265=>1000,39266=>1000,39267=>1000,39268=>1000,
-	39269=>1000,39270=>1000,39271=>1000,39272=>1000,39273=>1000,39274=>1000,39275=>1000,39276=>1000,39277=>1000,39278=>1000,39279=>1000,39280=>1000,39281=>1000,39282=>1000,39283=>1000,39284=>1000,
-	39285=>1000,39286=>1000,39287=>1000,39288=>1000,39289=>1000,39290=>1000,39291=>1000,39292=>1000,39293=>1000,39294=>1000,39295=>1000,39296=>1000,39297=>1000,39298=>1000,39299=>1000,39300=>1000,
-	39301=>1000,39302=>1000,39303=>1000,39304=>1000,39305=>1000,39306=>1000,39307=>1000,39308=>1000,39309=>1000,39310=>1000,39311=>1000,39312=>1000,39313=>1000,39314=>1000,39315=>1000,39316=>1000,
-	39317=>1000,39318=>1000,39319=>1000,39320=>1000,39321=>1000,39322=>1000,39323=>1000,39324=>1000,39325=>1000,39326=>1000,39327=>1000,39328=>1000,39329=>1000,39330=>1000,39331=>1000,39332=>1000,
-	39333=>1000,39334=>1000,39335=>1000,39336=>1000,39337=>1000,39338=>1000,39339=>1000,39340=>1000,39341=>1000,39342=>1000,39343=>1000,39344=>1000,39345=>1000,39346=>1000,39347=>1000,39348=>1000,
-	39349=>1000,39350=>1000,39351=>1000,39352=>1000,39353=>1000,39354=>1000,39355=>1000,39356=>1000,39357=>1000,39358=>1000,39359=>1000,39360=>1000,39361=>1000,39362=>1000,39363=>1000,39364=>1000,
-	39365=>1000,39366=>1000,39367=>1000,39368=>1000,39369=>1000,39370=>1000,39371=>1000,39372=>1000,39373=>1000,39374=>1000,39375=>1000,39376=>1000,39377=>1000,39378=>1000,39379=>1000,39380=>1000,
-	39381=>1000,39382=>1000,39383=>1000,39384=>1000,39385=>1000,39386=>1000,39387=>1000,39388=>1000,39389=>1000,39390=>1000,39391=>1000,39392=>1000,39393=>1000,39394=>1000,39395=>1000,39396=>1000,
-	39397=>1000,39398=>1000,39399=>1000,39400=>1000,39401=>1000,39402=>1000,39403=>1000,39404=>1000,39405=>1000,39406=>1000,39407=>1000,39408=>1000,39409=>1000,39410=>1000,39411=>1000,39412=>1000,
-	39413=>1000,39414=>1000,39415=>1000,39416=>1000,39417=>1000,39418=>1000,39419=>1000,39420=>1000,39421=>1000,39422=>1000,39423=>1000,39424=>1000,39425=>1000,39426=>1000,39427=>1000,39428=>1000,
-	39429=>1000,39430=>1000,39431=>1000,39432=>1000,39433=>1000,39434=>1000,39435=>1000,39436=>1000,39437=>1000,39438=>1000,39439=>1000,39440=>1000,39441=>1000,39442=>1000,39443=>1000,39444=>1000,
-	39445=>1000,39446=>1000,39447=>1000,39448=>1000,39449=>1000,39450=>1000,39451=>1000,39452=>1000,39453=>1000,39454=>1000,39455=>1000,39456=>1000,39457=>1000,39458=>1000,39459=>1000,39460=>1000,
-	39461=>1000,39462=>1000,39463=>1000,39464=>1000,39465=>1000,39466=>1000,39467=>1000,39468=>1000,39469=>1000,39470=>1000,39471=>1000,39472=>1000,39473=>1000,39474=>1000,39475=>1000,39476=>1000,
-	39477=>1000,39478=>1000,39479=>1000,39480=>1000,39481=>1000,39482=>1000,39483=>1000,39484=>1000,39485=>1000,39486=>1000,39487=>1000,39488=>1000,39489=>1000,39490=>1000,39491=>1000,39492=>1000,
-	39493=>1000,39494=>1000,39495=>1000,39496=>1000,39497=>1000,39498=>1000,39499=>1000,39500=>1000,39501=>1000,39502=>1000,39503=>1000,39504=>1000,39505=>1000,39506=>1000,39507=>1000,39508=>1000,
-	39509=>1000,39510=>1000,39511=>1000,39512=>1000,39513=>1000,39514=>1000,39515=>1000,39516=>1000,39517=>1000,39518=>1000,39519=>1000,39520=>1000,39521=>1000,39522=>1000,39523=>1000,39524=>1000,
-	39525=>1000,39526=>1000,39527=>1000,39528=>1000,39529=>1000,39530=>1000,39531=>1000,39532=>1000,39533=>1000,39534=>1000,39535=>1000,39536=>1000,39537=>1000,39538=>1000,39539=>1000,39540=>1000,
-	39541=>1000,39542=>1000,39543=>1000,39544=>1000,39545=>1000,39546=>1000,39547=>1000,39548=>1000,39549=>1000,39550=>1000,39551=>1000,39552=>1000,39553=>1000,39554=>1000,39555=>1000,39556=>1000,
-	39557=>1000,39558=>1000,39559=>1000,39560=>1000,39561=>1000,39562=>1000,39563=>1000,39564=>1000,39565=>1000,39566=>1000,39567=>1000,39568=>1000,39569=>1000,39570=>1000,39571=>1000,39572=>1000,
-	39573=>1000,39574=>1000,39575=>1000,39576=>1000,39577=>1000,39578=>1000,39579=>1000,39580=>1000,39581=>1000,39582=>1000,39583=>1000,39584=>1000,39585=>1000,39586=>1000,39587=>1000,39588=>1000,
-	39589=>1000,39590=>1000,39591=>1000,39592=>1000,39593=>1000,39594=>1000,39595=>1000,39596=>1000,39597=>1000,39598=>1000,39599=>1000,39600=>1000,39601=>1000,39602=>1000,39603=>1000,39604=>1000,
-	39605=>1000,39606=>1000,39607=>1000,39608=>1000,39609=>1000,39610=>1000,39611=>1000,39612=>1000,39613=>1000,39614=>1000,39615=>1000,39616=>1000,39617=>1000,39618=>1000,39619=>1000,39620=>1000,
-	39621=>1000,39622=>1000,39623=>1000,39624=>1000,39625=>1000,39626=>1000,39627=>1000,39628=>1000,39629=>1000,39630=>1000,39631=>1000,39632=>1000,39633=>1000,39634=>1000,39635=>1000,39636=>1000,
-	39637=>1000,39638=>1000,39639=>1000,39640=>1000,39641=>1000,39642=>1000,39643=>1000,39644=>1000,39645=>1000,39646=>1000,39647=>1000,39648=>1000,39649=>1000,39650=>1000,39651=>1000,39652=>1000,
-	39653=>1000,39654=>1000,39655=>1000,39656=>1000,39657=>1000,39658=>1000,39659=>1000,39660=>1000,39661=>1000,39662=>1000,39663=>1000,39664=>1000,39665=>1000,39666=>1000,39667=>1000,39668=>1000,
-	39669=>1000,39670=>1000,39671=>1000,39672=>1000,39673=>1000,39674=>1000,39675=>1000,39676=>1000,39677=>1000,39678=>1000,39679=>1000,39680=>1000,39681=>1000,39682=>1000,39683=>1000,39684=>1000,
-	39685=>1000,39686=>1000,39687=>1000,39688=>1000,39689=>1000,39690=>1000,39691=>1000,39692=>1000,39693=>1000,39694=>1000,39695=>1000,39696=>1000,39697=>1000,39698=>1000,39699=>1000,39700=>1000,
-	39701=>1000,39702=>1000,39703=>1000,39704=>1000,39705=>1000,39706=>1000,39707=>1000,39708=>1000,39709=>1000,39710=>1000,39711=>1000,39712=>1000,39713=>1000,39714=>1000,39715=>1000,39716=>1000,
-	39717=>1000,39718=>1000,39719=>1000,39720=>1000,39721=>1000,39722=>1000,39723=>1000,39724=>1000,39725=>1000,39726=>1000,39727=>1000,39728=>1000,39729=>1000,39730=>1000,39731=>1000,39732=>1000,
-	39733=>1000,39734=>1000,39735=>1000,39736=>1000,39737=>1000,39738=>1000,39739=>1000,39740=>1000,39741=>1000,39742=>1000,39743=>1000,39744=>1000,39745=>1000,39746=>1000,39747=>1000,39748=>1000,
-	39749=>1000,39750=>1000,39751=>1000,39752=>1000,39753=>1000,39754=>1000,39755=>1000,39756=>1000,39757=>1000,39758=>1000,39759=>1000,39760=>1000,39761=>1000,39762=>1000,39763=>1000,39764=>1000,
-	39765=>1000,39766=>1000,39767=>1000,39768=>1000,39769=>1000,39770=>1000,39771=>1000,39772=>1000,39773=>1000,39774=>1000,39775=>1000,39776=>1000,39777=>1000,39778=>1000,39779=>1000,39780=>1000,
-	39781=>1000,39782=>1000,39783=>1000,39784=>1000,39785=>1000,39786=>1000,39787=>1000,39788=>1000,39789=>1000,39790=>1000,39791=>1000,39792=>1000,39793=>1000,39794=>1000,39795=>1000,39796=>1000,
-	39797=>1000,39798=>1000,39799=>1000,39800=>1000,39801=>1000,39802=>1000,39803=>1000,39804=>1000,39805=>1000,39806=>1000,39807=>1000,39808=>1000,39809=>1000,39810=>1000,39811=>1000,39812=>1000,
-	39813=>1000,39814=>1000,39815=>1000,39816=>1000,39817=>1000,39818=>1000,39819=>1000,39820=>1000,39821=>1000,39822=>1000,39823=>1000,39824=>1000,39825=>1000,39826=>1000,39827=>1000,39828=>1000,
-	39829=>1000,39830=>1000,39831=>1000,39832=>1000,39833=>1000,39834=>1000,39835=>1000,39836=>1000,39837=>1000,39838=>1000,39839=>1000,39840=>1000,39841=>1000,39842=>1000,39843=>1000,39844=>1000,
-	39845=>1000,39846=>1000,39847=>1000,39848=>1000,39849=>1000,39850=>1000,39851=>1000,39852=>1000,39853=>1000,39854=>1000,39855=>1000,39856=>1000,39857=>1000,39858=>1000,39859=>1000,39860=>1000,
-	39861=>1000,39862=>1000,39863=>1000,39864=>1000,39865=>1000,39866=>1000,39867=>1000,39868=>1000,39869=>1000,39870=>1000,39871=>1000,39872=>1000,39873=>1000,39874=>1000,39875=>1000,39876=>1000,
-	39877=>1000,39878=>1000,39879=>1000,39880=>1000,39881=>1000,39882=>1000,39883=>1000,39884=>1000,39885=>1000,39886=>1000,39887=>1000,39888=>1000,39889=>1000,39890=>1000,39891=>1000,39892=>1000,
-	39893=>1000,39894=>1000,39895=>1000,39896=>1000,39897=>1000,39898=>1000,39899=>1000,39900=>1000,39901=>1000,39902=>1000,39903=>1000,39904=>1000,39905=>1000,39906=>1000,39907=>1000,39908=>1000,
-	39909=>1000,39910=>1000,39911=>1000,39912=>1000,39913=>1000,39914=>1000,39915=>1000,39916=>1000,39917=>1000,39918=>1000,39919=>1000,39920=>1000,39921=>1000,39922=>1000,39923=>1000,39924=>1000,
-	39925=>1000,39926=>1000,39927=>1000,39928=>1000,39929=>1000,39930=>1000,39931=>1000,39932=>1000,39933=>1000,39934=>1000,39935=>1000,39936=>1000,39937=>1000,39938=>1000,39939=>1000,39940=>1000,
-	39941=>1000,39942=>1000,39943=>1000,39944=>1000,39945=>1000,39946=>1000,39947=>1000,39948=>1000,39949=>1000,39950=>1000,39951=>1000,39952=>1000,39953=>1000,39954=>1000,39955=>1000,39956=>1000,
-	39957=>1000,39958=>1000,39959=>1000,39960=>1000,39961=>1000,39962=>1000,39963=>1000,39964=>1000,39965=>1000,39966=>1000,39967=>1000,39968=>1000,39969=>1000,39970=>1000,39971=>1000,39972=>1000,
-	39973=>1000,39974=>1000,39975=>1000,39976=>1000,39977=>1000,39978=>1000,39979=>1000,39980=>1000,39981=>1000,39982=>1000,39983=>1000,39984=>1000,39985=>1000,39986=>1000,39987=>1000,39988=>1000,
-	39989=>1000,39990=>1000,39991=>1000,39992=>1000,39993=>1000,39994=>1000,39995=>1000,39996=>1000,39997=>1000,39998=>1000,39999=>1000,40000=>1000,40001=>1000,40002=>1000,40003=>1000,40004=>1000,
-	40005=>1000,40006=>1000,40007=>1000,40008=>1000,40009=>1000,40010=>1000,40011=>1000,40012=>1000,40013=>1000,40014=>1000,40015=>1000,40016=>1000,40017=>1000,40018=>1000,40019=>1000,40020=>1000,
-	40021=>1000,40022=>1000,40023=>1000,40024=>1000,40025=>1000,40026=>1000,40027=>1000,40028=>1000,40029=>1000,40030=>1000,40031=>1000,40032=>1000,40033=>1000,40034=>1000,40035=>1000,40036=>1000,
-	40037=>1000,40038=>1000,40039=>1000,40040=>1000,40041=>1000,40042=>1000,40043=>1000,40044=>1000,40045=>1000,40046=>1000,40047=>1000,40048=>1000,40049=>1000,40050=>1000,40051=>1000,40052=>1000,
-	40053=>1000,40054=>1000,40055=>1000,40056=>1000,40057=>1000,40058=>1000,40059=>1000,40060=>1000,40061=>1000,40062=>1000,40063=>1000,40064=>1000,40065=>1000,40066=>1000,40067=>1000,40068=>1000,
-	40069=>1000,40070=>1000,40071=>1000,40072=>1000,40073=>1000,40074=>1000,40075=>1000,40076=>1000,40077=>1000,40078=>1000,40079=>1000,40080=>1000,40081=>1000,40082=>1000,40083=>1000,40084=>1000,
-	40085=>1000,40086=>1000,40087=>1000,40088=>1000,40089=>1000,40090=>1000,40091=>1000,40092=>1000,40093=>1000,40094=>1000,40095=>1000,40096=>1000,40097=>1000,40098=>1000,40099=>1000,40100=>1000,
-	40101=>1000,40102=>1000,40103=>1000,40104=>1000,40105=>1000,40106=>1000,40107=>1000,40108=>1000,40109=>1000,40110=>1000,40111=>1000,40112=>1000,40113=>1000,40114=>1000,40115=>1000,40116=>1000,
-	40117=>1000,40118=>1000,40119=>1000,40120=>1000,40121=>1000,40122=>1000,40123=>1000,40124=>1000,40125=>1000,40126=>1000,40127=>1000,40128=>1000,40129=>1000,40130=>1000,40131=>1000,40132=>1000,
-	40133=>1000,40134=>1000,40135=>1000,40136=>1000,40137=>1000,40138=>1000,40139=>1000,40140=>1000,40141=>1000,40142=>1000,40143=>1000,40144=>1000,40145=>1000,40146=>1000,40147=>1000,40148=>1000,
-	40149=>1000,40150=>1000,40151=>1000,40152=>1000,40153=>1000,40154=>1000,40155=>1000,40156=>1000,40157=>1000,40158=>1000,40159=>1000,40160=>1000,40161=>1000,40162=>1000,40163=>1000,40164=>1000,
-	40165=>1000,40166=>1000,40167=>1000,40168=>1000,40169=>1000,40170=>1000,40171=>1000,40172=>1000,40173=>1000,40174=>1000,40175=>1000,40176=>1000,40177=>1000,40178=>1000,40179=>1000,40180=>1000,
-	40181=>1000,40182=>1000,40183=>1000,40184=>1000,40185=>1000,40186=>1000,40187=>1000,40188=>1000,40189=>1000,40190=>1000,40191=>1000,40192=>1000,40193=>1000,40194=>1000,40195=>1000,40196=>1000,
-	40197=>1000,40198=>1000,40199=>1000,40200=>1000,40201=>1000,40202=>1000,40203=>1000,40204=>1000,40205=>1000,40206=>1000,40207=>1000,40208=>1000,40209=>1000,40210=>1000,40211=>1000,40212=>1000,
-	40213=>1000,40214=>1000,40215=>1000,40216=>1000,40217=>1000,40218=>1000,40219=>1000,40220=>1000,40221=>1000,40222=>1000,40223=>1000,40224=>1000,40225=>1000,40226=>1000,40227=>1000,40228=>1000,
-	40229=>1000,40230=>1000,40231=>1000,40232=>1000,40233=>1000,40234=>1000,40235=>1000,40236=>1000,40237=>1000,40238=>1000,40239=>1000,40240=>1000,40241=>1000,40242=>1000,40243=>1000,40244=>1000,
-	40245=>1000,40246=>1000,40247=>1000,40248=>1000,40249=>1000,40250=>1000,40251=>1000,40252=>1000,40253=>1000,40254=>1000,40255=>1000,40256=>1000,40257=>1000,40258=>1000,40259=>1000,40260=>1000,
-	40261=>1000,40262=>1000,40263=>1000,40264=>1000,40265=>1000,40266=>1000,40267=>1000,40268=>1000,40269=>1000,40270=>1000,40271=>1000,40272=>1000,40273=>1000,40274=>1000,40275=>1000,40276=>1000,
-	40277=>1000,40278=>1000,40279=>1000,40280=>1000,40281=>1000,40282=>1000,40283=>1000,40284=>1000,40285=>1000,40286=>1000,40287=>1000,40288=>1000,40289=>1000,40290=>1000,40291=>1000,40292=>1000,
-	40293=>1000,40294=>1000,40295=>1000,40296=>1000,40297=>1000,40298=>1000,40299=>1000,40300=>1000,40301=>1000,40302=>1000,40303=>1000,40304=>1000,40305=>1000,40306=>1000,40307=>1000,40308=>1000,
-	40309=>1000,40310=>1000,40311=>1000,40312=>1000,40313=>1000,40314=>1000,40315=>1000,40316=>1000,40317=>1000,40318=>1000,40319=>1000,40320=>1000,40321=>1000,40322=>1000,40323=>1000,40324=>1000,
-	40325=>1000,40326=>1000,40327=>1000,40328=>1000,40329=>1000,40330=>1000,40331=>1000,40332=>1000,40333=>1000,40334=>1000,40335=>1000,40336=>1000,40337=>1000,40338=>1000,40339=>1000,40340=>1000,
-	40341=>1000,40342=>1000,40343=>1000,40344=>1000,40345=>1000,40346=>1000,40347=>1000,40348=>1000,40349=>1000,40350=>1000,40351=>1000,40352=>1000,40353=>1000,40354=>1000,40355=>1000,40356=>1000,
-	40357=>1000,40358=>1000,40359=>1000,40360=>1000,40361=>1000,40362=>1000,40363=>1000,40364=>1000,40365=>1000,40366=>1000,40367=>1000,40368=>1000,40369=>1000,40370=>1000,40371=>1000,40372=>1000,
-	40373=>1000,40374=>1000,40375=>1000,40376=>1000,40377=>1000,40378=>1000,40379=>1000,40380=>1000,40381=>1000,40382=>1000,40383=>1000,40384=>1000,40385=>1000,40386=>1000,40387=>1000,40388=>1000,
-	40389=>1000,40390=>1000,40391=>1000,40392=>1000,40393=>1000,40394=>1000,40395=>1000,40396=>1000,40397=>1000,40398=>1000,40399=>1000,40400=>1000,40401=>1000,40402=>1000,40403=>1000,40404=>1000,
-	40405=>1000,40406=>1000,40407=>1000,40408=>1000,40409=>1000,40410=>1000,40411=>1000,40412=>1000,40413=>1000,40414=>1000,40415=>1000,40416=>1000,40417=>1000,40418=>1000,40419=>1000,40420=>1000,
-	40421=>1000,40422=>1000,40423=>1000,40424=>1000,40425=>1000,40426=>1000,40427=>1000,40428=>1000,40429=>1000,40430=>1000,40431=>1000,40432=>1000,40433=>1000,40434=>1000,40435=>1000,40436=>1000,
-	40437=>1000,40438=>1000,40439=>1000,40440=>1000,40441=>1000,40442=>1000,40443=>1000,40444=>1000,40445=>1000,40446=>1000,40447=>1000,40448=>1000,40449=>1000,40450=>1000,40451=>1000,40452=>1000,
-	40453=>1000,40454=>1000,40455=>1000,40456=>1000,40457=>1000,40458=>1000,40459=>1000,40460=>1000,40461=>1000,40462=>1000,40463=>1000,40464=>1000,40465=>1000,40466=>1000,40467=>1000,40468=>1000,
-	40469=>1000,40470=>1000,40471=>1000,40472=>1000,40473=>1000,40474=>1000,40475=>1000,40476=>1000,40477=>1000,40478=>1000,40479=>1000,40480=>1000,40481=>1000,40482=>1000,40483=>1000,40484=>1000,
-	40485=>1000,40486=>1000,40487=>1000,40488=>1000,40489=>1000,40490=>1000,40491=>1000,40492=>1000,40493=>1000,40494=>1000,40495=>1000,40496=>1000,40497=>1000,40498=>1000,40499=>1000,40500=>1000,
-	40501=>1000,40502=>1000,40503=>1000,40504=>1000,40505=>1000,40506=>1000,40507=>1000,40508=>1000,40509=>1000,40510=>1000,40511=>1000,40512=>1000,40513=>1000,40514=>1000,40515=>1000,40516=>1000,
-	40517=>1000,40518=>1000,40519=>1000,40520=>1000,40521=>1000,40522=>1000,40523=>1000,40524=>1000,40525=>1000,40526=>1000,40527=>1000,40528=>1000,40529=>1000,40530=>1000,40531=>1000,40532=>1000,
-	40533=>1000,40534=>1000,40535=>1000,40536=>1000,40537=>1000,40538=>1000,40539=>1000,40540=>1000,40541=>1000,40542=>1000,40543=>1000,40544=>1000,40545=>1000,40546=>1000,40547=>1000,40548=>1000,
-	40549=>1000,40550=>1000,40551=>1000,40552=>1000,40553=>1000,40554=>1000,40555=>1000,40556=>1000,40557=>1000,40558=>1000,40559=>1000,40560=>1000,40561=>1000,40562=>1000,40563=>1000,40564=>1000,
-	40565=>1000,40566=>1000,40567=>1000,40568=>1000,40569=>1000,40570=>1000,40571=>1000,40572=>1000,40573=>1000,40574=>1000,40575=>1000,40576=>1000,40577=>1000,40578=>1000,40579=>1000,40580=>1000,
-	40581=>1000,40582=>1000,40583=>1000,40584=>1000,40585=>1000,40586=>1000,40587=>1000,40588=>1000,40589=>1000,40590=>1000,40591=>1000,40592=>1000,40593=>1000,40594=>1000,40595=>1000,40596=>1000,
-	40597=>1000,40598=>1000,40599=>1000,40600=>1000,40601=>1000,40602=>1000,40603=>1000,40604=>1000,40605=>1000,40606=>1000,40607=>1000,40608=>1000,40609=>1000,40610=>1000,40611=>1000,40612=>1000,
-	40613=>1000,40614=>1000,40615=>1000,40616=>1000,40617=>1000,40618=>1000,40619=>1000,40620=>1000,40621=>1000,40622=>1000,40623=>1000,40624=>1000,40625=>1000,40626=>1000,40627=>1000,40628=>1000,
-	40629=>1000,40630=>1000,40631=>1000,40632=>1000,40633=>1000,40634=>1000,40635=>1000,40636=>1000,40637=>1000,40638=>1000,40639=>1000,40640=>1000,40641=>1000,40642=>1000,40643=>1000,40644=>1000,
-	40645=>1000,40646=>1000,40647=>1000,40648=>1000,40649=>1000,40650=>1000,40651=>1000,40652=>1000,40653=>1000,40654=>1000,40655=>1000,40656=>1000,40657=>1000,40658=>1000,40659=>1000,40660=>1000,
-	40661=>1000,40662=>1000,40663=>1000,40664=>1000,40665=>1000,40666=>1000,40667=>1000,40668=>1000,40669=>1000,40670=>1000,40671=>1000,40672=>1000,40673=>1000,40674=>1000,40675=>1000,40676=>1000,
-	40677=>1000,40678=>1000,40679=>1000,40680=>1000,40681=>1000,40682=>1000,40683=>1000,40684=>1000,40685=>1000,40686=>1000,40687=>1000,40688=>1000,40689=>1000,40690=>1000,40691=>1000,40692=>1000,
-	40693=>1000,40694=>1000,40695=>1000,40696=>1000,40697=>1000,40698=>1000,40699=>1000,40700=>1000,40701=>1000,40702=>1000,40703=>1000,40704=>1000,40705=>1000,40706=>1000,40707=>1000,40708=>1000,
-	40709=>1000,40710=>1000,40711=>1000,40712=>1000,40713=>1000,40714=>1000,40715=>1000,40716=>1000,40717=>1000,40718=>1000,40719=>1000,40720=>1000,40721=>1000,40722=>1000,40723=>1000,40724=>1000,
-	40725=>1000,40726=>1000,40727=>1000,40728=>1000,40729=>1000,40730=>1000,40731=>1000,40732=>1000,40733=>1000,40734=>1000,40735=>1000,40736=>1000,40737=>1000,40738=>1000,40739=>1000,40740=>1000,
-	40741=>1000,40742=>1000,40743=>1000,40744=>1000,40745=>1000,40746=>1000,40747=>1000,40748=>1000,40749=>1000,40750=>1000,40751=>1000,40752=>1000,40753=>1000,40754=>1000,40755=>1000,40756=>1000,
-	40757=>1000,40758=>1000,40759=>1000,40760=>1000,40761=>1000,40762=>1000,40763=>1000,40764=>1000,40765=>1000,40766=>1000,40767=>1000,40768=>1000,40769=>1000,40770=>1000,40771=>1000,40772=>1000,
-	40773=>1000,40774=>1000,40775=>1000,40776=>1000,40777=>1000,40778=>1000,40779=>1000,40780=>1000,40781=>1000,40782=>1000,40783=>1000,40784=>1000,40785=>1000,40786=>1000,40787=>1000,40788=>1000,
-	40789=>1000,40790=>1000,40791=>1000,40792=>1000,40793=>1000,40794=>1000,40795=>1000,40796=>1000,40797=>1000,40798=>1000,40799=>1000,40800=>1000,40801=>1000,40802=>1000,40803=>1000,40804=>1000,
-	40805=>1000,40806=>1000,40807=>1000,40808=>1000,40809=>1000,40810=>1000,40811=>1000,40812=>1000,40813=>1000,40814=>1000,40815=>1000,40816=>1000,40817=>1000,40818=>1000,40819=>1000,40820=>1000,
-	40821=>1000,40822=>1000,40823=>1000,40824=>1000,40825=>1000,40826=>1000,40827=>1000,40828=>1000,40829=>1000,40830=>1000,40831=>1000,40832=>1000,40833=>1000,40834=>1000,40835=>1000,40836=>1000,
-	40837=>1000,40838=>1000,40839=>1000,40840=>1000,40841=>1000,40842=>1000,40843=>1000,40844=>1000,40845=>1000,40846=>1000,40847=>1000,40848=>1000,40849=>1000,40850=>1000,40851=>1000,40852=>1000,
-	40853=>1000,40854=>1000,40855=>1000,40856=>1000,40857=>1000,40858=>1000,40859=>1000,40860=>1000,40861=>1000,40862=>1000,40863=>1000,40864=>1000,40865=>1000,40866=>1000,40867=>1000,40868=>1000,
-	40869=>1000);
-$diff='';
-$originalsize=23275812;
-
-// CID Information
-// Select your language
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ac16.tar.Z,ag15.tar.Z,ak12.tar.Z and aj16.tar.Z.
-
-//$enc='UniCNS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'CNS1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ac15.php');
-
-//$enc='UniGB-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'GB1','Supplement'=>2);
-//include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-//$enc='UniKS-UTF16-H';
-//$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Korea1','Supplement'=>0);
-//include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-$enc='UniJIS-UTF16-H';
-$cidinfo=array('Registry'=>'Adobe','Ordering'=>'Japan1','Supplement'=>5);
-include(dirname(__FILE__).'/uni2cid_aj16.php');
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/chinese.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/chinese.php
deleted file mode 100644
index d63e55851f9..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/chinese.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// CHINESE TRADITIONAL
-$type='cidfont0';
-$dw=1000;
-$name='DFKaiShu-SB-Estd-BF';
-$desc=array('Ascent'=>801,'Descent'=>-199,'CapHeight'=>27,'Flags'=>33,'FontBBox'=>'[0 -199 949 801]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-107;
-$ut=49;
-$cw=array(1=>500,2=>500,3=>500,4=>500,5=>500,6=>500,7=>500,8=>500,9=>500,10=>500,11=>500,12=>500,13=>500,14=>500,15=>500,16=>500,17=>500,18=>500,19=>500,20=>500,21=>500,22=>500,23=>500,24=>500,25=>500,26=>500,27=>500,28=>500,29=>500,30=>500,31=>500,32=>500,33=>500,34=>500,35=>500,36=>500,37=>500,38=>500,39=>500,40=>500,41=>500,42=>500,43=>500,44=>500,45=>500,46=>500,47=>500,48=>500,49=>500,50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>500,59=>500,60=>500,61=>500,62=>500,63=>500,64=>500,65=>500,66=>500,67=>500,68=>500,69=>500,70=>500,71=>500,72=>500,73=>500,74=>500,75=>500,76=>500,77=>500,78=>500,79=>500,80=>500,81=>500,82=>500,83=>500,84=>500,85=>500,86=>500,87=>500,88=>500,89=>500,90=>500,91=>500,92=>500,93=>500,94=>500,95=>500,96=>500,97=>500,98=>500,99=>500,100=>500,101=>500,102=>500,103=>500,104=>500,105=>500,106=>500,107=>500,108=>500,109=>500,110=>500,111=>500,112=>500,113=>500,114=>500,115=>500,116=>500,117=>500,118=>500,119=>500,120=>500,121=>500,122=>500,123=>500,124=>500,125=>500,126=>500,127=>500,8364=>1000,129=>500,130=>500,131=>500,132=>500,8230=>1000,134=>500,135=>500,136=>500,137=>500,138=>500,139=>500,140=>500,141=>500,142=>500,143=>500,144=>500,8216=>1000,8217=>1000,8220=>1000,8221=>1000,8226=>1000,8211=>1000,8212=>1000,152=>500,153=>500,154=>500,155=>500,156=>500,157=>500,158=>500,159=>500,160=>500,161=>500,162=>500,163=>500,164=>500,165=>500,166=>500,167=>500,168=>500,169=>500,170=>500,171=>500,172=>500,173=>500,174=>500,175=>500,176=>500,177=>500,178=>500,179=>500,180=>500,181=>500,182=>500,183=>500,184=>500,185=>500,186=>500,187=>500,188=>500,189=>500,190=>500,191=>500,192=>500,193=>500,194=>500,195=>500,196=>500,197=>500,198=>500,199=>500,200=>500,201=>500,202=>500,203=>500,204=>500,205=>500,206=>500,207=>500,208=>500,209=>500,210=>500,211=>500,212=>500,213=>500,214=>500,215=>500,216=>500,217=>500,218=>500,219=>500,220=>500,221=>500,222=>500,223=>500,224=>500,225=>500,226=>500,227=>500,228=>500,229=>500,230=>500,231=>500,232=>500,233=>500,234=>500,235=>500,236=>500,237=>500,238=>500,239=>500,240=>500,241=>500,242=>500,243=>500,244=>500,245=>500,246=>500,247=>500,248=>500,249=>500,250=>500,251=>500,252=>500,253=>500,254=>500,255=>500);
-$diff='';
-$originalsize=5172084;
-$enc='UniGB-UTF16-H';
-$cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'GB1','Supplement'=>2);
-include(dirname(__FILE__).'/uni2cid_ag15.php');
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/courier.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/courier.php
deleted file mode 100644
index d6ab661c094..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/courier.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=600;
-$cw=array(0=>600,1=>600,2=>600,3=>600,4=>600,5=>600,6=>600,7=>600,8=>600,9=>600,
-10=>600,11=>600,12=>600,13=>600,14=>600,15=>600,16=>600,17=>600,18=>600,19=>600,
-20=>600,21=>600,22=>600,23=>600,24=>600,25=>600,26=>600,27=>600,28=>600,29=>600,
-30=>600,31=>600,32=>600,33=>600,34=>600,35=>600,36=>600,37=>600,38=>600,39=>600,
-40=>600,41=>600,42=>600,43=>600,44=>600,45=>600,46=>600,47=>600,48=>600,49=>600,
-50=>600,51=>600,52=>600,53=>600,54=>600,55=>600,56=>600,57=>600,58=>600,59=>600,
-60=>600,61=>600,62=>600,63=>600,64=>600,65=>600,66=>600,67=>600,68=>600,69=>600,
-70=>600,71=>600,72=>600,73=>600,74=>600,75=>600,76=>600,77=>600,78=>600,79=>600,
-80=>600,81=>600,82=>600,83=>600,84=>600,85=>600,86=>600,87=>600,88=>600,89=>600,
-90=>600,91=>600,92=>600,93=>600,94=>600,95=>600,96=>600,97=>600,98=>600,99=>600,
-100=>600,101=>600,102=>600,103=>600,104=>600,105=>600,106=>600,107=>600,108=>600,
-109=>600,110=>600,111=>600,112=>600,113=>600,114=>600,115=>600,116=>600,117=>600,
-118=>600,119=>600,120=>600,121=>600,122=>600,123=>600,124=>600,125=>600,126=>600,
-127=>600,128=>600,129=>600,130=>600,131=>600,132=>600,133=>600,134=>600,135=>600,
-136=>600,137=>600,138=>600,139=>600,140=>600,141=>600,142=>600,143=>600,144=>600,
-145=>600,146=>600,147=>600,148=>600,149=>600,150=>600,151=>600,152=>600,153=>600,
-154=>600,155=>600,156=>600,157=>600,158=>600,159=>600,160=>600,161=>600,162=>600,
-163=>600,164=>600,165=>600,166=>600,167=>600,168=>600,169=>600,170=>600,171=>600,
-172=>600,173=>600,174=>600,175=>600,176=>600,177=>600,178=>600,179=>600,180=>600,
-181=>600,182=>600,183=>600,184=>600,185=>600,186=>600,187=>600,188=>600,189=>600,
-190=>600,191=>600,192=>600,193=>600,194=>600,195=>600,196=>600,197=>600,198=>600,
-199=>600,200=>600,201=>600,202=>600,203=>600,204=>600,205=>600,206=>600,207=>600,
-208=>600,209=>600,210=>600,211=>600,212=>600,213=>600,214=>600,215=>600,216=>600,
-217=>600,218=>600,219=>600,220=>600,221=>600,222=>600,223=>600,224=>600,225=>600,
-226=>600,227=>600,228=>600,229=>600,230=>600,231=>600,232=>600,233=>600,234=>600,
-235=>600,236=>600,237=>600,238=>600,239=>600,240=>600,241=>600,242=>600,243=>600,
-244=>600,245=>600,246=>600,247=>600,248=>600,249=>600,250=>600,251=>600,252=>600,
-253=>600,254=>600,255=>600);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS
deleted file mode 100644
index b1289139717..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/AUTHORS
+++ /dev/null
@@ -1,45 +0,0 @@
-abysta at yandex.ru
-Adrian Schroeter
-Andrey Valentinovich Panov
-Ben Laenen
-Besarion Gugushvili
-Bhikkhu Pesala
-Clayborne Arevalo
-Dafydd Harries
-Danilo Segan
-Davide Viti
-David Jez
-David Lawrence Ramsey
-Denis Jacquerye
-Dwayne Bailey
-Eugeniy Meshcheryakov
-Gee Fung Sit
-Heikki Lindroos
-James Cloos
-James Crippen
-John Karp
-Keenan Pepper
-Lars Naesbye Christensen
-Mashrab Kuvatov
-Max Berger
-Mederic Boquien
-Michael Everson
-Misu Moldovan
-Nguyen Thai Ngoc Duy
-Nicolas Mailhot
-Ognyan Kulev
-Ondrej Koala Vacha
-Peter Cernak
-Remy Oudompheng
-Roozbeh Pournader
-Sahak Petrosyan
-Sander Vesik
-Stepan Roh
-Stephen Hartke
-Steve Tinney
-Tavmjong Bah
-Tim May
-Valentin Stoykov
-Vasek Stodulka
-Wesley Transue
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/BUGS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/BUGS
deleted file mode 100644
index 4a3269075c3..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/BUGS
+++ /dev/null
@@ -1,2 +0,0 @@
-See http://dejavu.sourceforge.net/wiki/index.php/Bugs
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE
deleted file mode 100644
index 8bf880e2b47..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/LICENSE
+++ /dev/null
@@ -1,98 +0,0 @@
-Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
-Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
-
-Bitstream Vera Fonts Copyright
-------------------------------
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute the
-Font Software, including without limitation the rights to use, copy, merge,
-publish, distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright and trademark notices and this permission notice shall
-be included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and
-additional glyphs or characters may be added to the Fonts, only if the fonts
-are renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream
-Vera" names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
-FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
-ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
-FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font Software
-without prior written authorization from the Gnome Foundation or Bitstream
-Inc., respectively. For further information, contact: fonts at gnome dot
-org. 
-
-Arev Fonts Copyright
-------------------------------
-
-Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and
-associated documentation files (the "Font Software"), to reproduce
-and distribute the modifications to the Bitstream Vera Font Software,
-including without limitation the rights to use, copy, merge, publish,
-distribute, and/or sell copies of the Font Software, and to permit
-persons to whom the Font Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Tavmjong Bah" or the word "Arev".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the 
-"Tavmjong Bah Arev" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the name of Tavmjong Bah shall not
-be used in advertising or otherwise to promote the sale, use or other
-dealings in this Font Software without prior written authorization
-from Tavmjong Bah. For further information, contact: tavmjong @ free
-. fr.
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/NEWS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/NEWS
deleted file mode 100644
index 08d74af8d4b..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/NEWS
+++ /dev/null
@@ -1,1214 +0,0 @@
-Changes from 2.29 to 2.30
-
-* added U+0462-U+0463 to Mono (by Denis Jacquerye) 
-* corrected U+1E53 in Serif (by Gee Fung Sit) 
-* added U+1E4C-U+1E4D to Mono and Serif (by Gee Fung Sit) 
-* added U+1E78-U+1E79 to Mono (by Gee Fung Sit) 
-* fixed missing diacritics in Latin Extended Additional in Sans ExtraLight
-  (moved stacked diacritics out of PUA in the process) (by Gee Fung Sit) 
-* fixed anchors on U+1E78 in Serif (by Gee Fung Sit) 
-* added U+1DC4-U+1DC9 to Serif (by Denis Jacquerye) 
-* renamed above-mark to above-mark in Serif-Italic (by Denis Jacquerye) 
-* added U+1DC4-U+1DC9 to context class for dotless substitution (by Denis
-  Jacquerye) 
-* changed Doubleacute to Doublegrave in Sans ExtraLight (by Gee Fung Sit) 
-* removed redundant reference in U+01FB in Sans Oblique (by Gee Fung Sit) 
-* added U+A726-U+A727 to Mono (Denis Jacquerye) 
-* changed U+04BE and U+04BF according to recommedations of Sasha Ankwab in Sans
-  (by Andrey V. Panov) 
-* remove "Symbol Charset" from set of codepages in Sans (by Eugeniy
-  Meshcheryakov)
-
-Changes from 2.28 to 2.29
-
-* modified U+10FB in Sans to be a mirror image of U+2056, since U+10FB is not
-  Georgian-specific (by Roozbeh Pournader)
-* added U+2B1F, U+2B24, U+2B53, U+2B54 in Sans (by Roozbeh Pournader)
-* fixed TUR opentype language tag to TRK in Serif (bug 19825) (by Ben Laenen)
-* early implementation of Abkhaz letter U+0524-U+0525 in Sans
-  (by Michael Everson and abysta)
-* flipped U+1D538 in Sans (by Gee Fung Sit)
-* added U+26B3-U+26B8, U+1D7D8-U+1D7E1 in Sans (by Gee Fung Sit)
-* corrected U+1D7A9 in Sans Bold Oblique (by Gee Fung Sit)
-* Fixed U+0649 to be dual-joining in Sans Mono (by Roozbeh Pournader)
-* Remove unnecessary 'isol' feature from Sans Mono (by Roozbeh Pournader)
-* Remove 'cmap' mappings for U+066E, U+066F, U+067C, U+067D, U+0681, U+0682,
-  U+0685, U+0692, U+06A1, U+06B5, U+06BA, U+06C6, U+06CE, and U+06D5
-  in Sans Mono (bug 20323) (by Roozbeh Pournader)
-* add half brackets (U+2E22 - U+2E25, by Steve Tinney) 
-
-Changes from 2.27 to 2.28
-
-* added U+A789, U+A78A in Sans and Sans Mono (by Denis Jacquerye)
-* modified U+02D6, U+02D7, U+02EE in Sans and Sans Mono (by Denis Jacquerye)
-* added U+1E9E (German capital ß) to Sans and Serif (by Denis Jacquerye)
-* adjusted width of U+01B7-U+01B9 in Serif Italic (by Denis Jacquerye)
-* modified U+021C, U+021D in Sans (by Denis Jacquerye)
-* added U+021C, U+021D in Mono (by Denis Jacquerye)
-* added U+F428 (Georgian Nuskhuri "f") in private use area (by Besarion
-  Gugushvili)
-* updated Georgian mkhedruli (U+10D0-U+10FA) with new version (by Besarion
-  Gugushvili)
-* updated Georgian asomtavruli (U+10A0-U+10C5) with new version (by Besarion
-  Gugushvili)
-* added Georgian nuskhuri (U+2D00-U+2D25) (by Besarion Gugushvili)
-* added Georgian mtavruli in private use area (U+F400-U+F426) (by Besarion
-  Gugushvili)
-* added mark anchors above to Cyrillic U+0430-U+0438, U+043A-U+044F,
-  U+0454-U+0455 in Mono (by Ben Laenen)
-* modified/moved up U+0318-U+0319, U+031C-U+031F, U+0329-U+032A, U+032C-U+032D,
-  U+0339-U+033B, U+0348 and U+0353 in Sans to prevent cut-off (by Gee Fung Sit)
-* added U+035A to Sans (by Gee Fung Sit)
-* updated fontconfig files (by Nicolas Mailhot)
-* added U+2032-2037 to Mono (by Denis Jacquerye)
-* added Ogham to Sans ExtraLight (by Gee Fung Sit)
-* added U+2C6F, U+2C79, U+2C7C-2C7D to Mono (by Gee Fung Sit)
-* added U+210F to Serif and Sans ExtraLight (by Gee Fung Sit)
-* changed U+210F to a more common glyph in Sans and Mono (by Gee Fung Sit)
-
-Changes from 2.26 to 2.27
-
-* added some of Michael Everson's new Cyrillic glyphs to Sans (by Wesley
-  Transue)
-* removed blank glyph at U+05EF from Sans Bold Oblique (by Gee Fung Sit)
-* small adjustments to existing tone bars in Sans and Mono (by Gee Fung Sit)
-* added U+0372-U+0373, U+0376-U+0377, U+03CF, U+A668-U+A66E, U+A708-U+A711,
-  U+A71B-U+A71F to Sans (by Gee Fung Sit)
-* copied U+02E5-U+02E9 over from Sans to fix inconsistencies in Serif (by Gee
-  Fung Sit)
-* added U+021C-U+021D, U+0370-U+0371, U+037B-U+037D, U+0470-U+0471,
-  U+0510-U+0515, U+051A-U+051D, U+1E9F, U+2C64, U+2C6E-U+2C6F, U+2C79,
-  U+2C7C-U+2C7D, U+A644-U+A647, U+A650-U+A651, U+A654-U+A657, U+A708-U+A716,
-  U+A71B-U+A71F to Serif (by Gee Fung Sit)
-* added U+A708-U+A716, U+A71B-U+A71F to Mono (by Gee Fung Sit)
-* added anchors to U+017F (ſ) and fixed U+1E9B (ẛ) in Serif (by Gee Fung Sit)
-* made U+0325 smaller in Sans Bold and Serif to match Sans Book (by Gee Fung
-  Sit)
-* fixes to U+02F3 (moved up), U+228F-U+2294 (more square-like) and
-  U+22CE-U+22CF (stroke width) in Sans (by Gee Fung Sit)
-* replaced U+2202 ∂ (Sans and Mono) and U+221D ∝, U+221E ∞ (Sans) with glyphs
-  from Arev (with small changes) (by Gee Fung Sit)
-* added U+22B0-U+22B1, U+22C7, U+22D0-U+22D5 from Arev to Sans to complete the
-  block (by Gee Fung Sit)
-* added U+0514-U+0515 to Sans ExtraLight (by Gee Fung Sit)
-* skewed U+A78C in all Oblique/Italic fonts (by Gee Fung Sit)
-* moved U+2215 to U+2044 in Sans and Serif and replaced U+2215 with reference
-  to U+002F in all fonts (by Gee Fung Sit)
-* added U+2C6E to Mono (by Denis Jacquerye)
-* added U+A782 and U+A783 in Sans (by Wesley Transue)
-* added U+0244, U+024C-024D, U+2C64 in Sans Mono (by Denis Jacquerye)
-* modified U+01AE in Sans Mono (by Denis Jacquerye)
-* added U+2C7A to all fonts (by Gee Fung Sit)
-* italicized/small changes to U+2C76 in Serif (Bold) Italic (by Gee Fung Sit)
-* improved outlines of U+2C68, U+2C6A, U+2C6C in Serif (Bold) Italic (by Gee
-  Fung Sit)
-* rounded U+2C77 at the bottom in Serif (by Gee Fung Sit)
-* added joining behavior for tone letters (U+02E5-U+02E9) in Sans (bug #15669)
-  (by Gee Fung Sit)
-* fixed outline of y.alt in Sans Regular (by Denis Jacquerye) 
-* changed references of U+1D5A8, U+1D5C5, U+1D5DC, U+1D5F9, U+1D610, U+1D62D,
-  U+1D644 and U+1D661 to stylistic alternates to have a better distinction (by
-  Gee Fung Sit)
-* hinted I.alt in Sans Regular (by Gee Fung Sit)
-* added U+0487, completing Cyrillic block (by Gee Fung Sit)
-* extended the bar of U+0463 to the right and moved the anchor (by Gee Fung
-  Sit)
-* added anchors to glyphs in Cyrillic block (by Gee Fung Sit)
-* added (preliminary) hints to tone letter forms (U+02E5.5, U+02E9.1, stem) in
-  Sans Book (by Gee Fung Sit)
-
-Changes from 2.25 to 2.26
-
-- added glyphs for Cyrillic-B to Sans (by Wesley Transue) 
-- added U+0370-U+0371 to Sans (by Wesley Transue) 
-- added U+019C, U+01A2-U+01A3, U+01A6, U+01E4-U+01E5, U+024C-U+024D, U+0285,
-  U+0290, U+02A0, U+0370-U+0371, U+03F1, U+03FC to Sans ExtraLight (by Wesley
-  Transue) 
-- added U+20A0-U+20A5, U+20A7-U+20B3, U+2105, U+210D, U+210F, U+2115, U+2117,
-  U+2119-U+211A, U+211D, U+2124, U+212E, U+2200-U+2204 to Mono (by Heikki
-  Lindroos) 
-- added U+01BA and U+01BF to Mono (by Heikki Lindroos) 
-- merged OpenType "aalt" feature in Latin in Sans (by Denis Jacquerye) 
-- added alternative shape for y in Sans (by Denis Jacquerye) 
-- added saltillo (U+A78B-U+A78C) to all faces (by James Cloos) 
-- changed U+047C-U+047D to references instead of outlines in Sans (by Wesley
-  Transue) 
-- added Latin letter tresillo U+A72A-U+A72B to Sans (by Wesley Transue) 
-- added U+A734-U+A737 to Sans (by Wesley Transue) 
-- added U+2053 to Serif and fixed it bug:9425 in Sans (by Gee Fung Sit) 
-- removed problematic hints for U+0423 bug:10025 (by Gee Fung Sit) 
-- added U+27C5-U+27C6 bug:10255 to all faces (by Gee Fung Sit) 
-- fixed width of U+2016 in Sans Oblique (by Gee Fung Sit) 
-- added U+2016, U+2032-U+2038, U+2042, U+2045-U+2046, U+204B-U+204F,
-  U+2051-U+2052, U+2057 to Serif (by Gee Fung Sit) 
-- made U+2140 bigger to match other n-ary operators (by Gee Fung Sit) 
-- added U+0606-U+0607, U+0609-U+060A to Sans (by Gee Fung Sit) 
-- added U+221B-U+221C to Mono (by Gee Fung Sit) 
-- small adjustments to U+221B-U+221C in Sans and Serif (by Gee Fung Sit) 
-- update U+04B4-U+04B5 in Serif (by Andrey V. Panov) 
-- increased max-storage value from maxp table to 153 (by Andrey V. Panov) 
-- added U+0472-U+0473, U+0510-U+0511, U+051A-U+051D, U+0606-U+0607,
-  U+0609-U+060A, U+1E26-U+1E27, U+1E54-U+1E55, U+1E7C-U+1E7D, U+1E8C-U+1E8D,
-  U+1E90-U+1E91, U+1E97-U+1E99, U+1E9F, U+1EAC-U+1EAD, U+1EB6-U+1EB7,
-  U+1EC6-U+1EC7, U+1ED8-U+1EDD, U+1EE0-U+1EE3, U+1EE8-U+1EEB, U+1EEE-U+1EF1 to
-  Mono (by Gee Fung Sit) 
-- added locl rules for S/T cedilla for Romanian and Moldavian so they get
-  rendered as S/T with comma accent (see Redhat bug #455981) (by Ben Laenen) 
-- removed ligature rule from Armenian U+0587 bug:16113 (by Gee Fung Sit)
-
-Changes from 2.24 to 2.25
-
-- moved/added U+2E18 (by Gee Fung Sit)
-- added empty glyph for U+2064 in Sans and Serif (by Gee Fung Sit)
-- added U+22CE-U+22CF to Sans (by Gee Fung Sit)
-- Sans Oblique and Bold Oblique, Serif: reverted digits hinting instructions back to before revision 1590, which fixed mistaken debian bug #471024. This fixes Debian bug #411308. The original bug was in freetype not in the fonts (by Denis Jacquerye)
-- added U+A726-U+A729, U+A730-U+A733, U+A738-U+A73F, U+A746-U+A74B, U+A74E-U+A74F, U+A780-U+A781, U+A7FB-U+A7FF to Sans (by Gee Fung Sit)
-- added Macedonian italic glyph shape for U+0453 in Serif (by Ben Laenen)
-- changed descenders in U+0446, U+0449, U+0497, U+04A3, U+04AD (by Andrey V. Panov)
-- updated main SFD files to SplineFontDB 3.0 (Denis Jacquerye and Gee Fung Sit)
-- moved U+0561 2 up since it wasn't aligned with the baseline well (by Ben Laenen)
-- added U+2E2E to Sans (by Gee Fung Sit)
-- replaced U+2699 with simpler version in Sans (by Gee Fung Sit)
-- added a lot of hinting instructions to Latin Extended B, Greek and Coptic glyphs Sans Book (by Wesley Transue)
-- differentiated U+2219 from U+22C5 and adjusted affected references in Sans and Mono (by Gee Fung Sit)
-- made Hebrew narrower in Sans Bold and Sans Bold Oblique (by Denis Jacquerye)
-- added Kurdish and Chuvash letters from Unicode 5.1 Cyrillic Extended block (by Wesley Transue)
-- added U+1E9F, U+A644-U+A647, U+A64C-U+A64D, U+A650-U+A651, U+A654-U+A655, U+A712U+A716 to Sans (by Gee Fung Sit)
-- added several glyphs to Sans ExtraLight (by Gee Fung Sit)
-- added hinting instructions to U+046A-U+046B, U+0508-U+0509, U+050B, U+0512-U+0513 in Sans Book (by Wesley Transue)
-- corrected width of U+027E in Sans Book (by Gee Fung Sit)
-- added U+2C79, U+2C7B-U+2C7D to Sans (by Gee Fung Sit)
-- added a bunch of glyphs+small corrections to Sans Light (by Gee Fung Sit)
-- added U+0496, U+0497, U+04B0, U+04B1 (by Andrey V. Panov)
-- updated U+0493, U+049B, U+04B3, U+04B7, U+04F7 (by Andrey V. Panov)
-- further improvements in extended Cyrillic (by Andrey V. Panov) 
-
-Changes from 2.23 to 2.24
-
-- instructions for U+05C0 ׀, U+05C3 ׃, U+05F3 ׳, and U+05F4 ״ in DejaVu 
-   Sans. (by Wesley Transue)
-- instructions for U+2116 in Sans (by Andrey V. Panov)
-- Unicode 5.1 update: moved U+F208 to U+2C6D, U+F25F to U+2C71, added 
-  U+2C6E-U+2C6F, U+2C72-U+2C73, updated outline of U+2C71 in Sans. (by 
-  Denis Jacquerye)
-- updated and instructed U+0401 in Sans (by Andrey V. Panov)
-- fixed the bug in Sans faces where U+02EC ˬ faced the wrong direction. 
-  Also, added a few more glyph instructions. (by Wesley Transue)
-- removed OS2Sub and OS2Strike that weren't intentional in Sans 
-  ExtraLight. (by Denis Jacquerye)
-- updated instructions for U+401, U+44F in Serif Book. (by Andrey V. 
-  Panov)
-- instructions for U+02C4 ˄, U+02C5 ˅, U+03D8 Ϙ, U+03D9 ϙ, U+0494 Ҕ, and 
-  U+0495 ҕ in Sans Book. (by Wesley Transue)
-- instructions for U+01A6 Ʀ, U+0238 ȸ, U+0239 ȹ, U+02EC ˬ, and U+05C6 ׆ 
-  in Sans Book. (by Wesley Transue)
-- DejaVuSans.sfd DejaVuSerif.sfd: updated instructions for U+447 and 
-  U+451 using code generated with xgridfit (by Andrey V. Panov)
-- instructions for a few glyphs in the Latin Extended-B Block, Greek 
-  Block, Cyrillic Block, and N'Ko block. (by Wesley Transue)
-- updated sfdnormalize.pl, and SFD files to new SFD format with empty 
-  lines. (by Denis Jacquerye) 
-
-Changes from 2.22 to 2.23
-
-- fixed bug which made Condensed fonts appear instead of normal width ones
-- added U+20DB, U+20DC, and U+20E1 to Sans (by Roozbeh Pournader)
-- added hinting instructions to U+01A7, U+01AA-U+01AC, U+01AE-U+01AF,
-  U+01BC-U+01BD, U+01BF, U+01F7, U+0277, U+027F, U+0285-U+0286, U+0297, U+02AF,
-  U+02B4-U+02B5, U+02BD, U+030D, U+0311, U+0329, U+04A0-U+04A1 in Sans Book (by
-  Wesley Transue)
-- modified hinting instructions of U+04A2 in Sans Book (by Wesley Transue)
-- added hinting instructions to U+237D, U+2423 in Mono Book and Mono Bold (by
-  Wesley Transue)
-- added mathematical alphanumeric symbols to all styles (by Max Berger)
-- added Unicode 5.1 U+2E18 as U+2E18.u51 (not yet usable) to Sans (by Roozbeh
-  Pournader) 
-- dereferenced all glyphs with mixed references and outlines (by Denis
-  Jacquerye)
-- removed non-zero width from U+0344 in Sans (by Denis Jacquerye)
-
-Changes from 2.21 to 2.22
-
-- directory structure has changed, we now use the Makefile
-- modified Armenian U+0565 in Sans (by Սահակ Պետրոսյան)
-- added double struck letters and numbers U+2102, U+210D, U+2115,
-  U+2119-U+211A, U+211D, U+2124, U+213C-U+2140, U+2145-U+2149, U+1D538-U+1D539,
-  U+1D53B-U+1D53E, U+1D540-U+1D544, U+1D546, U+1D54A-U+1D550, U+1D552-U+1D56B,
-  U+1D7D8-U+1D7E1 to Serif (by Stephen Hartke)
-- added letterlike symbols U+2103, U+2109, U+2127, U+214B, U+2141-U+2144 to
-  Serif (by Ben Laenen)
-- fixed outline direction of U+2143 in Sans Bold/Bold Oblique (by Ben Laenen)
-- added arrow set in Serif: arrows: U+2194-U+21FF; dingbats: U+27A1;
-  supplemental arrows A: U+27F0-U+27FF; supplemental arrows B: U+2900-U+2975,
-  U+297A; miscellaneous symbols and arrows: U+2B00-U+2B11 (by Ben Laenen)
-- added U+0180, U+01DE, U+01E0-01E1, U+022A, U+022C, U+0230, U+1E08-U+1E09,
-  U+1E10-U+1E11, U+1EB0-U+1EB1 to Mono (by Denis Jacquerye)
-- adjusted U+01D5, U+01D7, U+01D9, U+1DB in Mono (by Denis Jacquerye)
-- added Ogham in Sans (by Wesley Transue)
-- added Yijing Hexagram Symbols in Sans (by Wesley Transue)
-- hinting instructions added to Cyrillic U+0460, U+04A6-U+04A7, U+04AC-U+04AD,
-  U+04C7-U+04C8, U+04F6-U+04F7, U+04FA-U+04FB, U+050C-U+050D in Sans Book (by
-  Wesley Transue)
-- adjusted Cyrillic letters U+042A, U+044A, U+044C, U+0459-U+045B, U+0462,
-  U+048C-U+048D in Serif (by Andrey V. Panov)
-- hinting instructions added to Lao U+0EB7 in Sans (by Wesley Transue)
-- added Roman numerals and Claudian letter U+2160-U+2184 in Serif (by Ben
-  Laenen)
-- added U+FFF9-U+FFFD to Sans, Serif and Mono (by Lars Næsbye Christensen)
-- added mathematical symbols to Serif: U+2200, U+2203-U+2204, U+2213-U+2214,
-  U+2217-U+2218, U+2223-U+2226, U+2250-U+2255, U+2295-U+22AF, U+22C5 (by Ben
-  Laenen)
-- modified bullet symbol U+2219 in Serif (by Ben Laenen)
-
-Changes from 2.20 to 2.21
-
-- added U+FE20-U+FE23 (half diacritics) to Sans (by Denis Jacquerye)
-- added anchor "half" to position right half of double marks, U+FE21 or U+FE23
-  to Sans (by Denis Jacquerye)
-- shifted U+0360 up to avoid collision with some outlines in Sans (by Denis
-  Jacquerye)
-- added anchor above-mark anchor to U+035D, U+035E, U+0360, U+0361 in Sans (by
-  Denis Jacquerye)
-- added instructions for ff, ffi, ffl ligatures in Serif Bold (by Eugeniy
-  Meshcheryakov)
-- added instructions to some N'Ko glyphs (by Wesley Transue)
-- added instructions to some Lao glyphs (by Wesley Transue)
-- cleaning up 'liga' Standard Ligature in Latin, in Sans and Sans Mono (by
-  Denis Jacquerye)
-- added U+046A, U+046B (big yus) in Serif (by Andrey V. Panov)
-- added box drawing symbols to Sans and Serif (by Lars Næsbye Christensen)
-- added Makefile to improve font and packages generating (by Nicolas Mailhot)
-
-Changes from 2.19 to 2.20
-
-- removed TeX and TeXData tags from all sfd files (by Eugeniy  Meshcheryakov)
-- removed all 'frac' lookups (by Eugeniy  Meshcheryakov)
-- fixed duplicate glyph names (by Eugeniy  Meshcheryakov)
-- removed standard ligatures with U+00B7 in Mono (by Eugeniy  Meshcheryakov)
-- use reference to U+002D in U+00AD in Sans Oblique, and adjust instructions
-  (by Eugeniy  Meshcheryakov)
-- updated Cyrillic in Sans Extra Light (by Andrey V. Panov)
-- added instructions to N'Ko U+07C1-U+07C6, U+07CA, U+07CE-U+07CF, U+07D1,
-  U+07D3-U+07D4, U+07D8, U+07DB and U+07EB in Sans (by Wesley Transue)
-- added instructions to Lao U+0E8A, U+0E95, U+0E97, U+EA5, U+0EB4 and U+0EB5
-  (by Wesley Transue)
-- adjusted instructions for Hebrew glyphs (by Denis Jacquerye)
-- added instructions for U+0265 in Sans Bold (by Denis Jacquerye)
-- fix U+1D68 in Sans: it had the shape of delta, where it should be a rho (by
-  Ben Laenen)
-- remove U+1D5C glyph in Sans Oblique (it was empty) (by Ben Laenen)
-- fix instructions of U+01AD in Sans Bold  (by Ben Laenen)
-- fix instructions of U+042D in Serif (by Ben Laenen)
-- remove buggy instructions of U+2328 in Serif (by Ben Laenen)
-- corrected width of U+2C75-U+2C76 in Sans Bold and Serif Bold (by Gee Fung Sit)
-- added U+2C75-U+2C77 to Mono (by Gee Fung Sit)
-
-Changes from 2.18 to 2.19
-
-- fixed misplaced symbols (U+2325,2326) in Sans Oblique (by John Karp) 
-- added Mark to Base anchors: 'cedilla' for combining cedilla and
-  'above-legacy' for stacking above precomposed glyphs (just a,e,i,o,u with
-  macron for now) in Sans (by Denis Jacquerye).
-- added contextual substitution for Case and Dotless forms in all Sans variants
-  (by Denis Jacquerye).
-- renamed 'ccmp' lookups for RTL and Basic (LGC, etc.) (by Denis Jacquerye)
-- added anchor 'cedilla' for vowels in Sans. (by Denis Jacquerye)
-- extended contextual dotless and case substitutions to handle both below and
-  above diacritics (by Denis Jacquerye)
-- renamed Dotless and Case Form GSUB lookups in Sans with meaningful names (by
-  Denis Jacquerye)
-
-Changes from 2.17 to 2.18
-
-- Re-encoded the source files for Full Unicode (by Ben Laenen)
-- Re-enabled the "ff", "fl", "fi", "ffl", "ffi" ligatures by default in Serif
-  (by Ben Laenen)
-- Disabled the "fi", "ffi" ligatures for languages with dotless i in Serif (by
-  Ben Laenen)
-- added Tifinagh to Sans Book and Bold, U+2D30-U+2D65, U+2D6F, partially hinted
-  in Sans Book. (by Denis Jacquerye)
-- added Tai Xuan Jing Symbols (U+1D300-1D356) to Sans (by Remy Oudompheng)
-- added double-struck letters (U+1D538-U+1D56B minus reserved code points) to
-  Sans (by Gee Fung Sit)
-- added U+22EE-U+22F1 to Sans (by Gee Fung Sit)
-- added U+2C67-U+2C6C, U+2C75-U+2C77 to Serif (by Gee Fung Sit)
-- italicized various glyphs in Latin Extended-B, IPA Extensions, Spacing
-  Modifier Letters, Phonetic Extension (Supplement) and Super- and Subscripts
-  in Serif Oblique fonts (by Gee Fung Sit)
-- modified outlines, bearings of Hebrew U+05D6, U+05D8, U+05DB, U+05DE, U+05E0,
-  U+05E1, U+05E2, U+05EA in Sans Book and Oblique, adjusted hinting in Book
-  based on Yotam Benshalom's comments. (by Denis Jacquerye)
-- added Braille Patterns (U+2800-U+28FF) to Serif fonts (by Gee Fung Sit)
-- added N'Ko to Sans Book and Bold: U+07C0-U+07E7, U+07EB-U+07F5, U+07F8-U+07FA
-  (by Eugeniy  Meshcheryakov)
-- added U+0ED8 (Lao digit 8) to Sans (by Remy Oudompheng)
-- added Lao diacritics U+0EB0-0EB9, U+0EBB-0EBC, U+0EC8-0ECD to Mono (by Remy
-  Oudompheng)
-- renamed Serif [Bold] Oblique, make it Italic (by Eugeniy  Meshcheryakov)
-- added U+29FA-U+29FB to Sans and Sans Mono (by Gee Fung Sit)
-- swapped glyphs for Eng U+014A from Sami Eng to African Eng, the latter being
-  more common (by Denis Jacquerye)
-- swapped ae U+00E6 and ae.alt in Serif Italics fonts, thus fixing #8213 (by
-  Denis Jacquerye)
-- minor improvements to Misc. Symbols in Sans (by Gee Fung Sit)
-- minor improvements and additions to Sans ExtraLight (by Gee Fung Sit)
-- improved instructions for various Cyrillic letters (by Eugeniy  Meshcheryakov)
-- fixed hinting of theta and chi in Sans Book (by Ben Laenen)
-- added Georgian Mkhedruli to Sans, Serif and Mono, ASumtavruli to Sans and
-  Serif (by Besarion Gugushvili)
-
-Changes from 2.16 to 2.17
-
-- Sans fonts: fix position for certain combinations of Arabic fatha, kasra,
-  shadda, damma, kasratan, dammatan, fathatan and hamza (by Ben Laenen)
-- added 'ae.alt' to Serif Oblique fonts, with design matching shape of italic
-  'a' instead of slanted 'a', see bug #8213 (by Denis Jacquerye)
-- added super- and subscripts to Serif and Mono: U+1D2C-U+1D2E, U+1D30-U+1D3C,
-  U+1D3E-U+1D42, U+1D62-U+1D65, U+1D78, U+2071, U+207A-U+207E, U+208A-U+208E,
-  U+2090-U+2094 (by Gee Fung Sit)
-
-Changes from 2.15 to 2.16
-
-- fixed hinting instructions for digits in DejaVu Sans Oblique, Bold Oblique,
-  and Serif Book to not change glyph width (by Eugeniy  Meshcheryakov)
-- added instructions for U+0404, U+0411, U+0413, U+0414, U+0417-U+041B, U+041F,
-  U+0423, U+0424, U+0426-U+0429, U+042C, U+042E, U+042F, U+0490 in Serif Bold
-  (by Eugeniy  Meshcheryakov)
-- added U+0220 and Eng.alt to Serif fonts (by Denis Jacquerye)
-- added U+232C, U+2394, U+23E3 to Sans fonts (by John Karp)
-- added U+230C-U+230F, U+231C-U+231F to Sans fonts, fixing bug:9547
-  (by John Karp)
-- adjusted dot below, dot above, dieresis above, dieresis below in Sans fonts
-  (by Denis Jacquerye)
-- added U+2300, U+2301, U+2303, U+2304, U+2305, U+2307, U+2326, U+2327, U+232B,
-  arrow.base to Sans fonts (by John Karp)
-- adjusted dot and dieresis below and above in Serif fonts (by Denis Jacquerye)
-- added U+1E1C-U+1E1D to Serif fonts (by Denis Jacquerye)
-- added U+22BE, U+22BF (by Wesley Transue)
-- added U+2324; modified U+2325: more standard proportions, and matches U+2324 
-  and U+2387; added U+2387 : flipped U+2325 with standard arrowhead 
-  (by John Karp)
-- added Lao digits U+0ED0-0ED7, U+0ED9 (by Remy Oudompheng)
-- added to Mono in Arabic block : U+060C, U+0615, U+061B, U+061F, 
-  U+0621-U+063A, U+0640-0655, U+065A, U+0660-066F, U+0674, U+0679-0687, U+0691, 
-  U+0692, U+0698, U+06A1, U+06A4, U+06A9, U+06AF, U+06B5, U+06BA, U+06BE, 
-  U+06C6, U+06CC, U+06CE, U+06D5, U+06F0-06F9 (by Remy Oudompheng)
-- added to Mono in Arabic Presentations Forms-A : U+FB52-FB81, U+FB8A-FB95, 
-  U+FB9E, U+FB9F, U+FBAA-FBAD, U+FBE8, U+FBE9, U+FBFC-FBFF (by Remy Oudompheng)
-- added to Mono in Arabic Presentations Forms-B : U+FE70-FE74, U+FE76-FEFC, 
-  U+FEFF (by Remy Oudompheng)
-- added U+05BA, U+05BE, U+05F3, U+05F4, U+FB1E, U+FB21-U+FB28, U+FB4F to Sans 
-  (by Eugeniy  Meshcheryakov)
-- added U+2102 to Mono (by Eugeniy  Meshcheryakov)
-- added U+2983-U+2984 to Sans (by Gee Fung Sit)
-- added U+2A2F to Sans, Serif and Mono (by Gee Fung Sit)
-- added U+2373-2375, U+237A to Sans (by John Karp)
-- converted kern pairs to kern classes with Tavmjong Bah's scripts 
-  (by Denis Jacquerye)
-- set ScriptLang of kerning classes to just latn because of Pango bug
-  (by Denis Jacquerye)
-- added DNK to ScriptLang latn otherwise it is excluded, and SRB and MDK to
-  cyrl (by Denis Jacquerye)
-- removed flag 0x80 in generate.pe, otherwise it generates kerning tables some
-  systems don't like; thus loosing Apple tables (by Denis Jacquerye)
-- removed ligature for precomposed legacy characters of Sans Oblique fonts
-  (by Denis Jacquerye)
-- added bearings to en dash U+2013, em dash U+2014 and figure dash U+2012
-  by making dashes shorter, preserving character width (by Denis Jacquerye)
-- reduced U+031C, U+0325 (ring below), U+0339 to be entirely visible; 
-  added instructions in Sans Book; changed U+1e00-U+1e01 to use new ring below
-  (by Denis Jacquerye)
-- adjusted circumflex below on U+1E12-U+1E13, U+1E18-U+1E19, U+1E3C-U+1E3D,
-  U+1E4A-U+1E4B, U+1E70-U+1E71, U+1E76-U+1E77 in Sans fonts (by Denis Jacquerye)
-- Added U+0ED4, U+0ED5 to DejaVu Sans (by Remy Oudompheng)
-- Lao-specific anchors (by Remy Oudompheng)
-- added alternate I to match the small capital in Sans (by Gee Fung Sit)
-
-Changes from 2.14 to 2.15
-
-- improved hinting in Sans Oblique to deal with some spacing and inconsistency
-  issues (by Ben Laenen)
-- added anchors to Mono Book, and added GPOS rules for combining diacritics to
-  show up as zero width glyphs (by Ben Laenen)
-- removed U+F21C (PUA), it was copy of U+2C64 from Latin Extended C (by Eugeniy
-  Meshcheryakov)
-- added U+27E6-U+27E7 to Sans (by Gee Fung Sit)
-- added U+1407, U+1409, U+140C-U+141B, U+141D-U+1425, U+1427-U+142E,
-  U+1435-U+1438, U+143A-U+1449, U+1452, U+1454, U+1457-U+1465, U+1467-U+146A,
-  U+1471, U+1474-U+1482, U+1484-U+1488, U+148F, U+1492, U+14A0, U+14A2, U+14A9,
-  U+14AC-U+14BA, U+14BC, U+14BD, U+14C6, U+14C9-U+14CF, U+14D1, U+14D2, U+14D9,
-  U+14DC-U+14E9, U+14EC, U+14F3, U+14F6-U+1504, U+1506, U+1507, U+1510-U+1525,
-  U+152C, U+152F-U+153D, U+1540, U+1541, U+154E, U+154F, U+1552, U+155B, U+155C,
-  U+1568, U+1569, U+1574-U+157B, U+157D, U+15A7-U+15AE, U+1646, U+1647 (by
-  Eugeniy Meshcheryakov)
-- fixed several contours to not intersect, use horizontal or vertical tangents,
-  use integer coordinates, etc in Sans Book (by Denis Jacquerye)
-- added U+0496-U+0497 in Serif (by Andrey V. Panov)
-
-Changes from 2.13 to 2.14
-
-- added Philippine peso glyph U+20B1 (by Clayborne Arevalo)
-- made U+2012 have the same width as digits, according to Unicode 5.0, 
-  page 206 (by Roozbeh Pournader)
-- made all of the "above" combining characters remove the dot of "i", 
-  "j", etc (Soft_Dotted characters), according to Unicode 5.0, 
-  page 228 (by Roozbeh Pournader)
-- made U+012F, U+03F3, U+0456, U+0458, U+1E2D, and U+1ECB (all fonts 
-  except Mono), U+0249, U+2148, and U+2149 (Sans and Sans Condensed), 
-  U+0268 (Sans ExtraLight, Serif and Serif Condensed), and U+029D (Serif 
-  and Serif Condensed) respect the Soft_Dotted property (by Roozbeh 
-  Pournader)
-- added U+223E, U+223F, U+2240, U+22C2, U+22C3 to Sans (by Remy Oudompheng)
-- added U+203D to Serif (by Gee Fung Sit)
-- added zero-width glyphs for U+2061-U+2063 to Sans and Serif (by Gee 
-  Fung Sit)
-- changed isolated forms of Arabic waw (U+0648, U+0624 and U+06C6) (bug #9432) 
-  (by Ben Laenen)
-- added Lao consonants U+0E81, U+0E82, U+0E84, U+0E87, U+0E88, U+0E8A, 
-  U+0E8D, U+0E94-0E97, U+0E99-0E9F, U+0EA1-0EA3, U+0EA5, U+0EA7, U+0EAA, 
-  U+0EAB, U+0EAD-0EAF to Sans Mono (by Remy Oudompheng)
-- added U+0200-U+0217, U+0226-U+0229, U+02F3, U+1E00-U+1E07, 
-  U+1E0A-U+1E0B, U+1E18-U+1E1F, U+1E22-U+1E23, U+1E28-U+1E2D, 
-  U+1E3A-U+1E3B, U+1E40, U+1E48-U+1E49, U+1E56, U+1E58-U+1E59, 
-  U+1E5E-U+1E5F, U+1E60, U+1E68-U+1E6B, U+1E6E-U+1E6F, U+1E72-U+1E77, 
-  U+1E86-U+1E8B, U+1E92-U+1E96, U+1EA0-U+1EA1, U+1EF4-U+1EF5 to Mono 
-  (by Ben Laenen)
-- renamed uppercase variants of diacritics (macron, breve, double grave, 
-  double acute, inverted breve, dot above) to "uni03XX.case" in Mono 
-  (by Ben Laenen)
-- moved uppercase variants of diacritics up in Mono so they properly 
-  vertically align on capitals (by Ben Laenen)
-- precomposed glyphs with macron, breve, double grave, double acute, 
-  inverted breve, dot above, macron below, breve below, inverted breve 
-  below, dot below, cedilla, caron below, circumflex below, diaeresis 
-  below, tilde below now reference to combining diacritics instead of 
-  space modifiers in Mono (by Ben Laenen)
-- made ring below (U+0325), and half rings below (U+031C and U+0339) 
-  smaller in Mono (by Ben Laenen)
-- added U+205F to all fonts (by Roozbeh Pournader)
-- added U+035E-U+035F to Sans (by Roozbeh Pournader)
-- added empty glyphs for U+034F, U+202A-U+202E, U+2060, U+206A-206F, 
-  U+FE00-U+FE0F to non-Mono fonts (by Roozbeh Pournader)
-- added U+2101, U+2107-U+2108, U+210B, U+210C, U+2110, U+2112, U+211B, 
-  U+211F, U+2123, U+2125, U+2128-U+2129, U+212C-U+212D, U+212F, 
-  U+2130-U+2131, U+2133, U+2136-U+213A, U+2141-U+2144, U+2B00-U+2B11, 
-  U+2B20-U+2B23 to Sans (by John Karp)
-- reshaped omega (U+03C9) in Mono (by Ben Laenen)
-- added U+2205, U+22C6, U+2300-U+2301, U+2303-U+2306, U+230C-U+230F, 
-  U+2312-U+2315, U+231C-U+231F, U+2335, U+2337-U+233E, U+2341-U+2344, 
-  U+2347-U+2348, U+234B-U+234D, U+2349-U+2350, U+2352-U+2354, 
-  U+2357-U+2359, U+235A-U+235C, U+235E-U+2360, U+2363-U+2365, 
-  U+2368-U+2369, U+236B-U+2370, U+2373-U+237A, U+2380-U+2383, 
-  U+2388-U+238B, U+2395 in Mono (by Ben Laenen)
-
-Changes from 2.12 to 2.13
-
-- adjusted U+0198B, U+01B3-U+01B4 in Sans, hinted U+01B4 in Sans Book 
-  (by Denis Jacquerye)
-- added U+27F0-U+27FF, U+2906-U+2907, U+290A-U+290B, U+2940-U+2941 to Sans 
-  (by Denis Jacquerye)
-- added U+01E6-U+01E9, U+01EE-U+01EF, U+01F4-U+01F5, U+01FC-U+01FF, 
-  U+021E-U+021F, U+0245, U+02BD, U+02C9, U+1E9B, U+2045-U+2046, U+2213, U+22C5,
-  U+22EF to Sans Mono (by Roozbeh Pournader)
-- added U+04FA-U+04FD to Sans (by Michael Everson)
-- removed U+2329 and U+232A because of their CJK properties, added U+27E8 
-  and U+27E9 in their stead, fixing part of bug #9038 (by Roozbeh Pournader)
-- corrected and improvised U+0466-U+0469, U+046E-U+0471, U+047C-U+047D, U+0482, 
-  U+0484-U+0486, U+0492-U+0493, U+04B0-U+04B1, U+050C-U+050D, and U+204A 
-  in Sans (by Michael Everson)
-- added instructions for U+0402, U+0409, U+040A, U+040B, U+044D, U+040F, 
-  U+0452, U+0459-U+045B, U+045F to Sans Book (by Eugeniy Meshcheryakov)
-- made italic shape for U+431, U+432, U+437, U+43B, U+43C, U+43D, U+444, U+447, 
-  U+44D, U+44F, U+459, U+45A in SerifOblique and SerifBoldOblique 
-  (by Andrey V. Panov)
-- modified U+024C to match glyph in Unicode chart, fixing bug #9039 
-  (by Denis Jacquerye)
-- made some canonically equivalent characters share the same glyph: 
-  U+02B9 = U+0374, U+0343 = U+0313, and U+0387 = U+00B7 also adjusting U+02BA 
-  to look like double U+02B9, fixing parts of bug #9038 (by Roozbeh Pournader)
-- changed shapes for U+0478 and U+0479 in Sans to those in the Unicode charts, 
-  based on a recent decision by Unicode Technical Committee to only use 
-  the digraph form (by Michael Everson)
-- adjusted width of NBSP U+00A0 and NNBSP U+202F, fixing bug #8401 
-  (by Denis Jacquerye)
-- fixed several contours to not intersect, use horizontal or vertical tangents, 
-  use integer coordinates, etc (by Roozbeh Pournader and Denis Jacquerye)
-- added U+1402, U+1430, U+144D, U+146C, U+148A, U+14A4, U+14C1, U+14D4, U+14EE, 
-  U+1527, U+1545, U+157E, U+158E, U+15AF to Sans (by Eugeniy Meshcheryakov)
-- enlarged width of U+459 and U+45A in Serif (by Andrey V. Panov)
-- made traditional shape for U+452, U+45B (by Andrey V. Panov)
-- added euro sign U+20AC to Sans ExtraLight, making fontconfig recognize 
-  the font as supporting English (by Denis Jacquerye)
-
-Changes from 2.11 to 2.12
-
-- added U+0180 to Serif (by Denis Jacquerye)
-- improved and/or hinted Armenian letters U+0542, U+0546, U+0562,
-  U+0563, U+0564, U+0577, U+0582 in Sans (by Ben Laenen)
-- added U+4FE-U+4FF, U+512-U+513, U+2114, U+214E, U+26B2 to Sans
-  (by Gee Fung Sit)
-- adjusted U+0496-U+0497, U+049A-U+04A1 in Sans to match U+0416,
-  U+041A, U+0436 and U+043A (by Gee Fung Sit)
-- Mathematical Operators in Sans: changed U+22C0-U+22C1 to match
-  other n-ary operators, adjusted U+2203-U+2204, changed U+2220 in
-  Sans to match the style of U+2221 (by Gee Fung Sit)
-- added U+1401, U+1403-U+1406, U+140A, U+140B, U+1426, U+142F,
-  U+1431-U+1434, U+1438, U+1439, U+1449, U+144A, U+144C,
-  U+144E-U+1451, U+1455, U+1456, U+1466, U+146B, U+146D-U+1470,
-  U+1472, U+1473, U+1483, U+1489, U+148B-U+148E, U+1490, U+1491,
-  U+14A1, U+14A3, U+14A5-U+14A8, U+14AA, U+14AB, U+14BB, U+14C0,
-  U+14C2-U+14C5, U+14C7, U+14C8, U+14D0, U+14D3, U+14D5-U+14D8,
-  U+14DA, U+14DB, U+14EA, U+14ED, U+14EF-U+14F2, U+14F4, U+14F5,
-  U+1405, U+1526, U+1528-U+152B, U+152D, U+152E, U+153E,
-  U+1542-U+1544, U+1546-U+154D, U+1550, U+1553, U+1555-U+155A,
-  U+1567, U+156A, U+157C, U+157F-U+1585, U+158A-U+158D,
-  U+158F-U+1596, U+15A0-U+15A6, U+15DE, U+15E1, U+166E-U+1676 to
-  Sans (by Eugeniy Meshcheryakov)
-- re-enabled Latin ligatures fi, ffi, fl, ffl and ff in Sans
-  (by Ben Laenen)
-- made italic shape for U+436, U+44A, U+44B, U+44C, U+44E, U+45F,
-  U+463 in SerifOblique and SerifBoldOblique (by Andrey V. Panov)
-- fixed sub- and superscript metrics in Condensed Sans (bug #8848)
-  (by Ben Laenen)
-- added U+474, U+475 in Serif (by Andrey V. Panov)
-- hinted Greek glyphs U+03B7, U+30B8, U+03B9, U+03C1, U+03C3,
-  U+03C6 in Mono Book (by Ben Laenen)
-
-Changes from 2.10 to 2.11
-
-- added instructions for Hebrew glyphs (Sans Book, by Eugeniy
-  Meshcheryakov)
-- changed U+01A6 (Latin Yr) after bug #8212, in Sans, Serif and
-  Sans Mono fonts (by Denis Jacquerye).
-- removed instruction for U+2600-U+26A1 (by Mederic Boquien)
-- added U+202F and set width of U+00A0 (nobreakingspace) to the
-  same as U+0020, space (by Denis Jacquerye).
-- added and improved instructions for various Cyrillic letters
-  (by Eugeniy Meshcheryakov)
-- Changed U+416, U+42F, U+427 (non-Bold), U+436, U+447 (non-Bold),
-  U+44F, U+437 (Bold), corrected U+40F, U+414, U+424, U+426, U+429,
-  U+434, U+438 (Bold), U+446, U+449, U+44D (non-Bold), U+45F in
-  Sans Mono (by Andrey V. Panov)
-- made small corrections to Cyrillic, most appreciable to U+409,
-  U+413, U+41B, U+427 and U+433, U+434, U+43B, U+447, U+459
-  (upright fonts) to Serif (by Andrey V. Panov)
-- adjusted bearings of U+410, U+416, U+41A, U+42F, U+436, U+43A,
-  U+443, U+44F in Serif (by Andrey V. Panov)
-- enlarged width of U+44A, U+44B, U+44C, U+463 in Serif
-  (by Andrey V. Panov)
-- added ligature "iacute" as "afii10103" (U+456) "acutecomb" in
-  Serif (by Andrey V. Panov)
-- made italic shape to U+446, U+448, U+449 in Serif (by Andrey V.
-  Panov)
-- added "afii10831" (U+F6C7), "afii10832" (U+F6C8) in Serif (by
-  Andrey V. Panov)
-- new minimum version of fontforge is 20061014 (by Ben Laenen)
-
-Changes from 2.9 to 2.10:
-
-- added U+0242, U+024A-U+024B, U+024E-U+024F, U+037C-U+037D, U+0E3F, 
-  U+1D2C-U+1D2E, U+1D30-U+1D42, U+1D5D-U+1D6A, U+1D78, U+1DB8, 
-  U+2090-U+2094, U+20D0-U+20D1, U+2C60-U+2C66, U+2C6B-U+2C6C, U+2C74 and 
-  U+FB29 to Sans (by Gee Fung Sit)
-- added Lao glyphs : U+0E81-0E82, U+E084, U+0E87-0E88, U+0E8A, U+0E8D, 
-  U+0E94-0E97, U+0E99-0E9F, U+0EA1-0EA3, U+0EA5, U+0EA7, U+0EAA-0EAB, 
-  U+0EAD-0EB9, U+0EBB-0EBD, U+0EC0-0EC4, U+0EC6, U+0EC8-0ECD, U+0EDC-0EDD 
-  (by Remy Oudompheng)
-- fixed U+0193 not showing in Windows (bug #7897) (by Ben Laenen)
-- changes to U+222B-222D in Sans Mono (by Remy Oudompheng)
-- ported the three remaining currency symbols from Arev (U+20B0, 
-  U+20B2-U+20B3), and replaced one (U+20AF) in Sans (by Lars Naesbye 
-  Christensen)
-- corrected U+20A5 in Sans (by Gee Fung Sit)
-- merged Double-Struck Letters from Arev: U+2102, U+210D, U+2115, 
-  U+2119-U+211A, U+2124, U+213C-U+2140 (by Gee Fung Sit)
-- added U+2308-U+230B and U+2329-U+232A to Sans Mono and Serif faces, 
-  fixed incorrect direction of U+2329 in Sans faces, and improved 
-  U+2308-U+230B in Sans faces per Ben Laenen's suggestions (by David 
-  Lawrence Ramsey)
-- added U+06D5 and final form of it (needed for Kurdish) (by Ben Laenen)
-- added two special glyphs U+F000 and U+F001 in Sans Book that show the 
-  current ppem size (horizontal and vertical) (by Ben Laenen)
-- added U+2318 and U+2325 to Sans Mono faces, based on the Sans versions 
-  (by David Lawrence Ramsey)
-- added U+2B14-U+2B1A to all faces except Sans ExtraLight (by David 
-  Lawrence Ramsey)
-- respaced all Geometric Shapes characters in Serif faces to match those 
-  in Sans faces again, respaced U+23CF in Sans, Sans ExtraLight, and 
-  Serif faces to match U+25A0 (or Sans in Sans ExtraLight's case) again, 
-  and respaced U+2B12-U+2B13 in Sans and Serif faces to match U+25A1 
-  again (by David Lawrence Ramsey)
-- corrected width of Modifier Small Letters U+1D43-1D5B in Sans Oblique 
-  and U+1D9B-U+1DBF in Sans Oblique and Sans Bold Oblique (by Gee Fung Sit)
-- added a bunch of glyphs to Sans ExtraLight (see SVN for details) (by 
-  Gee Fung Sit)
-- adjusted Cyrillic descenders in Sans ExtraLight to sync with Sans (by 
-  Gee Fung Sit)
-- added U+0242, U+0245 to Serif (by Gee Fung Sit)
-- replaced the SHPIX routines which gave them bad spacing at certain 
-  sizes in FreeType for A, V, Z, v and z in Sans Bold (by Ben Laenen) 
-
-Changes from 2.8 to 2.9:
-
-- DejaVuSansExtraLight.sfd: changed family name from "DejaVu Sans" to
-  "DejaVu Sans Light" (in case we add a Light weight variant), so legacy
-  apps that understand only 4 styles are happy. (by Denis Jacquerye)
-- added Name ID 16, aka preferred family name, and Name ID 17, aka
-  preferred style name, so contemporary apps that understand more that 4
-  styles can use big fonts families "DejaVu Sans" and "DejaVu Serif". For
-  those, Extralight and Condensed are just styles not different families.
-  (by Denis Jacquerye)
-- added U+22B6-22BD, U+22C0-22C1, U+22D6-22D7 to Sans. (by Remy Oudompheng)
-- added U+037B, U+2184, U+2C67-U+2C6A and U+2C75-U+2C77 to Sans (by Gee
-  Fung Sit)
-- adjusted asteriskmath (U+2217) for consistency with other mathematical
-  operators in Sans (by Ben Laenen)
-- hinted some Armenian capitals in Sans Book (by Ben Laenen)
-- added U+0246 - U+0249 (by Ben Laenen)
-- BUGFIX : swapped U+224E and U+224F, in Sans, Sans Condensed and Sans Mono
-  (by Remy Oudompheng)
-- adjusted U+20B5 (by Mederic Boquien)
-- swapped U+21DA and U+21DB which were in wrong order (by Heikki Lindroos)
-- added U+222E-2233, U+239B-23AD, U+2A00-2A02, U+2A0F-2A1C to Sans (by Remy
-  Oudompheng)
-- added U+239B-23AD to Mono (by Remy Oudompheng)
-- added U+2024-2025 to Serif (by Mederic Boquien)
-- added U+222C-222D, U+2A0C-2A0E to Serif (by Remy Oudompheng)
-- added U+2190-21FF to Mono (by Heikki Lindroos)
-- added Hebrew glyphs - U+05B0-U+05BD, U+05BF-U+05C3, U+05C6, U+05C7,
-  U+05D0-U+05EA, U+05F0-U+05F2, U+FB1F, U+FB20, U+FB2A-U+FB36,
-  U+FB38-U+FB3C, U+FB3E, U+FB40, U+FB41, U+FB43, U+FB44, U+FB46-U+FB4E (by
-  Gee Fung Sit and Eugeniy Meshcheryakov)
-- adjustments for Cyrillic in Sans (by Andrey V. Panov)
-- made italic shape for U+0434, U+0456, U+0457 in SerifOblique and Serif
-  Bold Oblique (by Andrey V. Panov)
-
-Changes from 2.7 to 2.8:
-
-- fixed instructions for U+0423, U+0427, U+0447, U+0448 in Serif, so they
-  look good at large sizes too (by Eugeniy Meshcheryakov)
-- added U+FB00 and U+FB03 to U+FB06 to Serif typefaces (by Heikki Lindroos)
-- added U+26B0-U+26B1, U+2701-U+2704, U+2706-U+2709, U+270C-U+2727, U+2729
-  to U+274B, U+274D, U+274F to U+2752, U+2756, U+2758-U+275E, U+2761 to
-  U+2775 (by Heikki Lindroos)
-- added and improved instructions for Cyrillic letters in Mono and Serif
-  (Book, by Eugeniy Meshcheryakov)
-- rotated U+26B0 (was too small in mono) (by Gee Fung Sit)
-- adjusted U+1EDA-U+1EDD, U+1EE8-U+1EEB, capitals using capital specific
-  accent and moved diacritics to match position on U+00F2 (ograve), etc.
-  (by Denis Jacquerye)
-- added U+20D6, U+20D7 to Sans (by Gee Fung Sit)
-- made Armenian ligatures discretionary since the Firefox ligature problem
-  still isn't fixed (by Ben Laenen)
-- moved Armenian hyphen U+058A to a higher position (bug #7436) (by Ben
-  Laenen)
-- hinted Greek glyphs in Sans Bold (by Ben Laenen)
-- enabled Arabic lam-alif ligatures when diacritics are used (by Ben Laenen)
-
-Changes from 2.6 to 2.7:
-
-- added glyphs needed for Kurdish: U+0695, U+06B5, U+06C6, U+06CE and their
-  init/medi/fina forms in Sans (by Ben Laenen)
-- added U+02CD, U+01F8 - U+01F9, U+1E3E - U+1E3F, U+1E30 - U+1E35, U+1EBC -
-  U+1EBD, U+1EF8 - U+1EF9 (includes glyphs needed for Yoruba, Maori, Guarani
-  and Twi) (by Ben Laenen)
-- added U+22C8-22CC, U+29CE-29D5, U+2A7D-2AA0, U+2AAE-2ABA, U+2AF9-2AFA to
-  Sans (by Remy Oudompheng)
-- adjusted diacritics on Vietnamese, Pinyin and other characters:
-  U+01A0-U+01A1, U+01AF-U+01B0, U+01D5-U+01DC, U+01DE-01E1, U+01FA-U+01FB
-  U+022A-U+022D, U+0230-U+0231, U+1E14-U+1E17, U+1E4C-U+1E53, U+1E78-U+1E7B,
-  U+1EA4-U+1EF1 in Sans (Book, Bold and Oblique) (by Denis Jacquerye)
-- added basic arrows U+2190-U+2193 in Serif, which completes MES-1 compliance
-  for Serif (by Ben Laenen)
-- added U+01E4, U+01E5, U+01FA, U+01FB, U+02BD, U+02C9 and U+02EE to Serif
-  (by Ben Laenen)
-- fixed U+0209 in Serif Bold Oblique (by Ben Laenen)
-- adjusted Box Drawing block characters U+2500-257F in Mono to fit character
-  cell, shifting them up by 416 (Denis Jacquerye)
-- redid U+0194 in Sans (by Ben Laenen)
-- added U+2217-2218, U+2295-22A1 to Mono (by Remy Oudompheng)
-- added U+0462 to Serif (by Andrey V. Panov)
-- added U+226C, U+228C-228E, U+2293-2294, U+22F2-22FF to Sans (by Remy
-  Oudompheng)
-- adjusted U+2208-220D in Sans (by Remy Oudompheng)
-- improved some Cyrillic glyphs in Mono (by Andrey V. Panov), rewritten
-  instructions for changed glyphs (by Eugeniy Meshcheryakov)
-- added U+1E0E-1E0F, U+1E8E-1E8F to Mono fonts (by Denis Jacquerye). (bug
-  #7166)
-- renamed 'Dotabove' to 'Dotaccent' in Mono Sans Oblique to match other fonts
-  (by Denis Jacquerye).
-- added U+200B-U+200F in Sans faces and Serif faces, U+200B and U+200C were
-  in Sans already (by Lars Naesbye Christensen)
-- added U+2601-U+262F, U+263D, U+263E, U+2648-U+265F, U+2668, U+2670-U+268B,
-  U+2690-U+269C, U+26A0, U+26A1, U+2794, U+2798-U+27AF, U+27B1-U+27BE to Mono
-  (by Heikki Lindroos)
-- replaced the references with unshifted ones for both κ U+03BA and к U+043A
-  in Mono Book (by Denis Jacquerye)
-- fixing glyph for U+04ED in Mono Book, consisted only of dieresis (by Andrey
-  V. Panov).
-
-Changes from 2.5 to 2.6:
-
-- redid U+2032 - U+2037, U+2057 based on Arev in Sans (by Gee Fung Sit)
-- added U+0195, corrected U+039E, U+204B in Sans ExtraLight (by Gee Fung Sit)
-- added instructions for some Cyrillic letters in Sans Bold (by Eugeniy
-  Meshcheryakov)
-- added vulgar fractions U+2153-U+215F for Serif, made with references (by
-  Lars Naesbye Christensen)
-- added U+228F-2292, U+2299-22AF, U+22B2-22B5, U+22CD, U+22D8-22ED to Sans
-  (by Remy Oudompheng)
-- added U+2208-220D, U+2238-223D, U+2278-2281, U+228A-228B, U+228F-2292,
-  U+22CD, U+22DA-22E9 to Mono (by Remy Oudompheng)
-- fixed misplaced dot in U+2250 in Mono (by Remy Oudompheng)
-- added instructions for some Cyrillic letters in Mono Book and Bold(by
-  Eugeniy Meshcheryakov)
-- minor changes to U+2241, U+2261-2263, U+22A4, U+22A5 in Sans (by Remy
-  Oudompheng)
-- added hinting instructions to lowercase Armenian glyphs in Sans Book (by
-  Ben Laenen)
-- changed U+2208, U+220B to match U+2209 and U+220C in Sans Bold (by Remy
-  Oudompheng)
-- added Braille patterns U+2800-U+28FF to Sans (by Mederic Boquien)
-- added instructions for some Cyrillic letters in Serif Book (by Eugeniy
-  Meshcheryakov)
-- renamed BoldOblique fonts to Bold Oblique in TTF Name as originally in
-  Bitstream Vera fonts (by Denis Jacquerye)
-- added hinting instructions to some Latin-B Extended and IPA characters in
-  Sans Book (by Denis Jacquerye and Ben Laenen)
-- adjusted bearings, replaced diacritics, hinted hook and horn for
-  Vietnamese in Sans Book (by Denis Jacquerye)
-- made FAX, TM, TEL, etc. discritionary ligatures in Sans and Serif fonts
-  (by Denis Jacquerye)
-- removed ligatures of precomposed characters in Sans and Serif fonts (by
-  Denis Jacquerye)
-- added U+F208, U+F20A, U+F215-F217, U+F21A-F21B, U+F25F in PUA (from SIL's
-  PUA, probably in Unicode 5.0): U+0243, U+0244, U+0245, U+024C, U+024D,
-  U+2C64, (U+2C6D), (U+2C71)
-- modified some glyphs in Serif Oblique to make them more italic (by Denis
-  Jacquerye)
-
-Changes from 2.4 to 2.5:
-
-- fixed excessive kerning bug that occurs with Pango (by Denis Jacquerye)
-- added U+20AF to Sans and Serif (by Lars Naesbye Christensen)
-- regenerated Condensed faces (by Ben Laenen)
-- added U+035C-U+035D to Sans, fixed U+0361 (by Denis Jacquerye)
-- integrated 255 characters from Arev fonts: Latin Extended-B, Spacing
-  Modifiers, Combining Diacritical Marks, Cyrillic, Cyrillic supplement,
-  General Punctuation, Letterlike Symbols, Arrows, Mathematical Operators,
-  Miscellaneous Technical, Dingbats, Alphabetic Presentation Forms (by Denis
-  Jacquerye)
-- added basic Cyrillic and basic Greek to Sans ExtraLight (by Denis Jacquerye)
-- added U+0498, U+049A, U+04AA, U+04AB, U+04AF to Serif (by Eugeniy
-  Meshcheryakov)
-- added U+0494, U+0495, U+0498, U+0499, U+04AA, U+04AB, U+04C3, U+04C4,
-  U+04C7, U+04C8 to Mono (by Eugeniy Meshcheryakov)
-- adjusted weight of U+0256, U+0257, U+0260, U+0272, U+0273, U+0277, U+029B,
-  U+02A0 and modifed  U+028B and U+027A in Mono (by Denis Jacquerye)
-- added U+2000-200A to Mono (by Denis Jacquerye)
-- added vulgar fractions U+2153 - U+215F to Mono (by Gee Fung Sit)
-- adapted metrics of Arabic glyphs so they stay above cut-off height in Sans
-  (by Ben Laenen)
-- fixed mkmk anchors for Arabic diacritics so they stack properly in Sans (by
-  Ben Laenen)
-- fixed weight of lowercase upsilon in Sans Bold, make small adjustment to
-  lowercase omega in Sans (by Ben Laenen)
-- added U+210E (by Mederic Boquien)
-- unslanted U+2201, U+221B and U+221C in Sans Oblique (by Mederic Boquien)
-- added several mathematical relation symbols to Sans and Mono (U+2241-224C,
-  U+2250-2255, U+2260-2269, U+226E-2277, U+2282-2287) modified U+223C to match
-  other tildes, and U+2282-2284 to have the same shape. (by Remy Oudompheng)
-- made U+2234-U+2237 refer to U+2219 instead of U+00B7 in Sans (by Mederic
-  Boquien)
-- added U+2238-223B, U+226A-226B, U+2278-2281, U+2288-228B to Sans (by Remy
-  Oudompheng)
-- unslanted and changed reference of U+22C5 from U+00B7 to U+2219 in Sans (by
-  Mederic Boquien)
-- added U+224D-225F, U+226D, U+22C6 to Sans and unslanted U+2219 in Sans
-  Oblique. (by Remy Oudompheng)
-- added U+224D-225F, U+226D to Mono, shifted U+2266-2269 higher upwards and
-  unslanted U+2219 in Oblique. (by Remy Oudompheng)
-- merged Coptic glyphs from Arev 0.2 (by Lars Naesbye Christensen)
-- fixed and adjusted various Cyrillic glyphs in Serif (by Andrey V. Panov)
-- made fi, fl... ligatures discretionary ligatures (by Ben Laenen)
-
-Changes from 2.3 to 2.4:
-
-- added U+04A2, U+04A3, U+04AC - U+04AF, U+04BA, U+04BB, U+04C0 -
-  U+04C2, U+04CB, U+04CD, U+04D8 - U+04DF, U+04E2 - U+04E5, U+04E8 - U+04F5,
-  U+04F6 - U+04F9 to Mono (by Eugeniy Meshcheryakov)
-- added U+048C, U+048D, U+0494, U+0495, U+049E - U+04A7, U+04AC -
-  U+04AE, U+04B4- U+04B7, U+04BA, U+04BB, U+04C0 - U+04C4, U+04C7, U+04C8,
-  U+04CB, U+04CC, U+04D8 - U+04DF, U+04E2 - U+04E5, U+04EC - U+04F9 to Serif
-  (by Eugeniy Meshcheryakov)
-- added U+2134 to Sans (by Gee Fung Sit)
-- added U+2080 - U+2089 to all faces (by Gee Fung Sit)
-- several minor corrections to Sans (by Gee Fung Sit)
-- major corrections to Sans Condensed (by Gee Fung Sit)
-- corrected Superscripts and Subscripts in Sans (by Gee Fung Sit)
-- corrected anchors of U+0316-U+0319 (by Denis Jacquerye)
-- Verajja integrated (by Stepan Roh)
-- copied U+2328, U+2600, U+2639-U+263C, U+263F-U+2647, U+2660-U+2667,
-  and U+2669-U+266F from Sans to Serif, and copied scaled-down versions of
-  them to Sans Mono (by David Lawrence Ramsey)
-- added U+20B4 to all faces (by Eugeniy Meshcheryakov)
-- added more minor positional adjustments to U+2638 in all faces to
-  match the other miscellaneous symbols in Verajja, and rescale it in Sans
-  Mono so that it looks better (by David Lawrence Ramsey)
-- added U+2242, U+2243 and U+22A4 (by Mederic Boquien)
-- corrected U+2245 in Sans (by Mederic Boquien)
-- added U+0221, U+0234-0236 (by Denis Jacquerye)
-- added in Arabic block to Sans: U+060C, U+0615, U+061B, U+061F, U+0621
-- U+063A, U+0640 - U+0655, U+0660 - U+066F, U+0679 - U+0687, U+0698, U+06A1,
-  U+06A9, U+06AF, U+06BA, U+06BF, U+06CC, U+06F0 - U+06F9 (by Ben Laenen)
-- added in Arabic Presentation Forms A to Sans: U+FB52 - U+FB81, U+FB8A
-- U+FB95, U+FB9E - U+FB9F, U+FBE8 - U+FBE9, U+FBFC - U+FBFF (by Ben Laenen)
-- added complete Arabic Presentation Forms B to Sans: U+FE70 - U+FE74,
-  U+FE76 - U+FEFC, U+FEFF (by Ben Laenen)
-- added complete Greek Extended block to Mono (by Ben Laenen)
-- modified Greek capitals with tonos in Mono (by Ben Laenen)
-- added U+01C4-01CC, U+01D5, U+01DE, U+01E0-U+01E1, U+01E6-U+01E9,
-  U+01EE-U+01F5, U+01F8-U+0217, U+021E-U+021F, U+0226-U+022A, U+022C to Serif
-  (by Denis Jacquerye)
-- adjusted U+043B and U+044F in Serif (by Denis Jacquerye)
-- added U+2000-U+200A (by Denis Jacquerye)
-- added U+1E00-U+1E0B, U+1E0E-U+1E11, U+1E14-U+1E1C, U+1E1E-U+1E23,
-  U+1E26-U+1E2D, U+1E30-U+1E35, U+1E3A-U+1E3B, U+1E3E-U+1E40, U+1E48-U+1E49,
-  U+1E50-U+1E56, U+1E58-U+1E59, U+1E5E-U+1E60, U+1E68-U+1E6B, U+1E6E-U+1E6F,
-  U+1E72-U+1E7D, U+1E86-U+1E9B, U+1EA0-U+1EA3, U+1EAC-U+1EB7, U+1EBA-U+1EBD,
-  U+1EC6-U+1ECF, U+1ED8-U+1ED9, U+1EE6-U+1EE7, U+1EF4-U+1EF9 to Serif (by
-  Denis Jacquerye)
-- added U+048E, U+048F, U+049C-U+049F, U+04B8, U+04B9, U+04BC-U+04BF,
-  U+04C3, U+04C4 to Sans (by Eugeniy Meshcheryakov)
-- added DejaVu Sans Extra Light (by Denis Jacquerye)
-- Adjusted underline position for (hopefully) improved legibility in
-  Sans, Serif, Mono (Tim May)
-- added auto-generated DejaVu LGC (by Stepan Roh) 
-
-Changes from 2.2 to 2.3:
-
-- fixed bug U+042B and U+044B behave badly in Sans Bold or Oblique (by
-  Keenan Pepper)
-- added and improved TrueType instructions and related settings (by
-  Keenan Pepper)
-- added U+04D0-U+04D7, U+04E6, U+04E7 to Mono (by Eugeniy Meshcheryakov)
-- added U+048A - U+048D, U+0498, U+0499, U+04AA, U+04AB, U+04B0, U+04B1,
-  U+04C0, U+04C9, U+04CA, U+04CE, U+04CD, U+04DA, U+04DB, U+04DE, U+04DF,
-  U+04E2 - U+04E5, U+04EC - U+04F8, U+04F9 to Sans (by Eugeniy Meshcheryakov)
-- added U+04E0, U+04E1 to all faces (by Eugeniy Meshcheryakov)
-- added Greek Extended to Sans and Serif: U+1F00-U+1F15, U+1F18-U+1F1D,
-  U+1F20-U+1F45, U+1F48-U+1F4D, U+1F50-U+1F57, U+1F59, U+1F5B, U+1F5D,
-  U+1F5F-U+1F7D, U+1F80-U+1FB4, U+1FB6-U+1FC4, U+1FC6-U+1FD3, U+1FD6-U+1FDB,
-  U+1FDD-U+1FEF, U+1FF2-U+1FF4, U+1FF6-U+1FFE (by Ben Laenen)
-- added Greek variant letterforms, archaic letters and symbols to Mono:
-  U+03D0-U+03E1, U+03F0-U+03FF (by Ben Laenen)
-- added Armenian block and Armenian ligatures to Sans (U+0531 - U+0556,
-  U+0559 - U+055F, U+0561 - U+0587, U+0589 - U+058A, U+FB13 - U+FB17) (by Ben
-  Laenen)
-- redid some Greek characters in Sans and Mono to make them look better
-  and to correct some errors (by Ben Laenen)
-- added U+27E0 to all faces (by David Lawrence Ramsey)
-- added underscore (U+005F) consistency fixes: extended the Sans Mono
-  and Sans Mono Oblique underscores to touch both horizontal edges, and
-  reduced the height of the Sans Bold Oblique underscore to match the Sans
-  Bold underscore (by David Lawrence Ramsey)
-- added underscore (U+005F) derivatives and consistency fixes for them:
-  made U+0332 a reference to underscore at Denis Jacquerye's suggestion; made
-  U+0333 two references to underscore; made U+033F two references to U+203E;
-  added U+2017 as two references to underscore, and made U+0333 a reference to
-  it; and added U+203E as a reference to underscore, and made U+0305 a
-  reference to it (by David Lawrence Ramsey)
-- added U+201B, U+2220, U+2320-U+2321, U+23AE, U+23CF, all remaining
-  Geometric Shapes glyphs (U+25A0-U+25C9, U+25CB-U+25D7, U+25D9-U+25E5,
-  U+25E7-U+25FF), and U+2B12-U+2B13 to all faces (by David Lawrence Ramsey)
-- added minor positional adjustments to U+2638 in all faces (by David
-  Lawrence Ramsey)
-- added U+201F to Sans Mono and Serif faces (by David Lawrence Ramsey)
-- added U+01B7, U+01F6, U+0464 - U+0465, U+2160 - U+2180, U+2183,
-  U+220A, U+220D, U+2329, U+232A, U+2422, U+27E8 - U+27EB, U+2680 - U+2685 to
-  Sans (by Gee Fung Sit ???)
-- added U+2116 to Sans and Serif (by Gee Fung Sit)
-- changed florin sign U+0192 in Sans (by Gee Fung Sit)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- adjusted height of IPA superscripts U+02B0-02B8, U+02C0-02C1,
-  U+02E0-02E4, U+207F to match with height of U+00B2 (by Denis Jacquerye)
-- added U+0184-U+0185, U+019C, U+019F, U+01A0-U+01A3, U+01A6, U+01AA,
-  U+01AF-U+01B0, U+01B2-U+01B4, U+01B7-U+01B8, U+01BC-U+01BC, U+0224-U+0225,
-  U+023A-U+0240, U+1D16-U+1D17, U+1D1D-U+1D1E, U+1D43-U+1D5B, U+1D7B,
-  U+1D85,U+1D9B-1DB7, U+1DB9-U+1DBF, U+20A6 to all fonts (by Denis Jacquerye)
-- added added U+0182, U+018B, U+018E, U+01A0-U+01A1, U+01B1, U+01B9,
-  U+01C0-U+01C3, U+0238-U+0239, U+1D02, U+1D08-U+1D09, U+1D14, U+1D1F, U+1D77
-  to Serif and Mono (by Denis Jacquerye)
-- added U+0181, U+0183, U+0187-U+0188, U+018A-U+018F, U+0191, U+0193,
-  U+0195-U+019B, U+019D-U+019E, U+01A4-U+01A5, U+01AC-U+01AE, U+01B5-U+01B6,
-  U+01B9, U+01BB, U+01F6 to Serif (by Denis Jacquerye)
-- added U+0181, U+0187-U+0188, U+018A, U+018D, U+018F, U+0191, U+0193,
-  U+0195-U+019F, U+01A4-01A5, U+01AC-01AD, U+01B5-U+01B6, U+1BB, U+01F6,
-  U+01D7-U+01DC, U+0238-U+0239, U+0241 to Mono (by Denis Jacquerye)
-- added to Mono and Serif (by Denis Jacquerye) 
-
-Changes from 2.1 to 2.2:
-
-- reworked the vertical orientation of the Blocks Elements characters
-  in all faces to remove their overly large descenders, in order to fix
-  problems with e.g. terminal emulators (by David Lawrence Ramsey)
-- copied bullet in Sans faces to Serif faces for consistency (by David
-  Lawrence Ramsey)
-- added U+2023, U+25D8, U+25E6, and U+29EB to all faces (by David
-  Lawrence Ramsey)
-- added U+1EB8, U+1EB9, U+1ECA - U+1ECD, U+1EE4, U+1EE5 (by Tim May)
-- added U+01DD, U+02BE, U+02BF, U+02D3 to all, changed U+02D2 in
-  non-Condensed and U+1EE5 in Serif (by Tim May)
-- fixed U+01CE, replacing wrong circumflex by caron (by Denis Jacquerye)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- added U+20B5 (by Denis Jacquerye)
-- added U+0181 - U+0183, U+0187, U+0188, U+018A - U+018D, U+0191,
-  U+0193, U+0195 - U+019B, U+019D, U+019E, U+01A4, U+01A7 - U+01A9, U+01AB -
-  U+01AE, U+01B1, U+01B5, U+01B6, U+01BB, U+01C0 - U+01C3, U+01F1 - U+01F3,
-  U+0238, U+0239, U+1D02, U+1D08, U+1D09, U+1D14, U+1D1F, U+1D77, U+2103,
-  U+2126, U+2127, U+212A, U+212B, U+2132, U+214B, U+2210, U+2217, U+2218,
-  U+2A0C - U+2A0E, U+FB00, U+FB03 and U+FB04 to Sans (by Gee Fung Sit)
-- added U+01A9, U+01C3 and U+2126 to Mono and Serif (by Gee Fung Sit)
-- adjusted bearings of U+028B in Sans (by Gee Fung Sit)
-- added U+018F, U+0494-U+0497, U+04A0-U+04A7, U+04AC-U+04AF,
-  U+04B4-U+04B7, U+04BA-U+04BB, U+04C1-U+04C2, U+04C5-U+04C8, U+04CB-U+04CC,
-  U+04D0-U+04D9, U+04DC-U+04DD, U+04E6-U+04EB to Sans (by Eugeniy
-  Meshcheryakov)
-- replaced with references U+0391-U+0393, U+0395-U+0397, U+0399, U+039A,
-  U+039C, U+039D, U+039F-U+03A1, U+03A4, U+03A5, U+03A7, U+03BF, U+03DC,
-  U+0405, U+0406, U+0408, U+0410, U+0412, U+0415, U+0417, U+041A,
-  U+041C-U+041E, U+0420-U+0422, U+0425, U+0430, U+0435, U+043E, U+0440,
-  U+0441, U+0443, U+0445, U+0455-U+0458 in Serif and Mono (by Eugeniy
-  Meshcheryakov)
-- added U+04D0-U+04D7, U+04E6-U+04EB to Serif (by Eugeniy Meshcheryakov)
-- added U+212A and U+212B to the rest of the faces (by Lars Naesbye
-  Christensen)
-- added U+2318 and U+2325 to Sans and Serif (by Lars Naesbye Christensen)
-- added and improved TrueType instructions and related settings (by
-  Keenan Pepper)
-- completed basic Greek alphabet: added U+0374-U+0375, U+037A, U+037E,
-  U+0384-U+038A, U+038C, U+038E-U+0390, U+03AC-U+03BF, U+03C1-U+03CE (by Ben
-  Laenen)
-- added U+2070 and U+2074-U+2079 (by Mederic Boquien) 
-
-Changes from 2.0 to 2.1:
-
-*** Be aware that names of some TTF files changed since version 2.0. ***
-
-- added U+0323, U+1E0C, U+1E0D, U+1E24, U+1E25, U+1E36 - U+1E39, U+1E42,
-  U+1E43, U+1E46, U+1E47, U+1E5A - U+1E5D, U+1E62, U+1E63, U+1E6C, U+1E6D,
-  U+1E7E, U+1E7F (by Tim May)
-- fixed bug where GNOME applications used Mono Bold Oblique instead of
-  Mono Oblique (by Keenan Pepper)
-- added and improved TrueType instructions and related settings (by
-  Keenan Pepper)
-- added U+1E41, U+1E57, U+1E61 (by Sander Vesik)
-- added U+0189, U+0309, U+0313, U+0314, U+031A, U+031B, U+0327, U+0328,
-  U+032B, U+0333, U+033C (by Denis Jacquerye)
-- adjusted and fixed U+0186, U+0254, U+0291, U+0316 - U+0319, U+031C -
-  U+0320, U+0323 - U+0326, U+0329 - U+032A, U+032C - U+0332, U+0339 - U+033B,
-  U+033E, U+033F (by Denis Jacquerye)
-- fixed U+1E12, U+1E3C, U+1E4A, U+1E70 to have normal below diacritics
-  (by Denis Jacquerye)
-- fixed U+1E82, U+1E84 and U+1EF2 to have uppercase above diacritics (by
-  Denis Jacquerye)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- dropped "-Roman" from font names - affects both internal TTF names and
-  names of generated files (by Stepan Roh)
-- attempt to fix bug Vertical spacing too big for Mono by exchanging
-  LineGap and OS2TypoLinegap values (proofed by Stefan Rank)
-- added Greek capitals U+0391 - U+03A1, U+03A3 - U+03A9, U+03AA, U+03AB
-  in Mono (by Ben Laenen)
-- added the per ten thousand sign U+2031 (by Mederic Boquien)
-- added U+2207, U+221D, U+221F, U+2227 - U+222A, and U+2261 (by David
-  Lawrence Ramsey)
-- new logo (by Gee Fung Sit)
-- added U+0180, U+018E, U+201F, U+2024, U+2025, U+203D, U+2200, U+2203,
-  U+2213, U+222C, U+222D, U+2263 to Sans (by Gee Fung Sit) 
-
-Changes from 1.15 to 2.0:
-
-- "Italized" basic glyphs in all Serif Oblique and their Condensed faces
-  (by David Jez)
-- added and improved TrueType instructions and related settings (by Keenan
-  Pepper)
-- added anchor points to some glyphs (by Denis Jacquerye)
-- many new spacing and combining accents (by Denis Jacquerye)
-- smart substitutions for transforming i and j to dottless form and for
-  using uppercase diacritics (by Denis Jacquerye)
-- fixed remaining erroneously slanted characters in Serif Oblique faces (by
-  David Lawrence Ramsey)
-- copied bullet in Sans faces to Sans Oblique faces for consistency (by
-  David Lawrence Ramsey)
-- added U+203C and U+2047-U+2049 (by David Lawrence Ramsey)
-- added Greek glyphs to Serif (by Ben Laenen, Condensed merge by David Jez)
-- fixed bug LTR glyphs behaving like RTL (by Ben Laenen)
-- fixed wrong glyph directions (by David Jez)
-- fixed repositioned accents in Condensed faces (by David Jez)
-
-Changes from 1.14 to 1.15:
-
-- added and improved TrueType instructions and related settings (by Keenan
-  Pepper)
-- fixed U+2302, U+2319 (by David Lawrence Ramsey)
-- fixed yet another monospace bug (by Stepan Roh)
-- fixed potential "too big ascender/descender" bug (by Stepan Roh)
-- fixed U+026E and U+028E (by Denis Jacquerye)
-- added U+0186, U+0190, U+0300 - U+0304, U+0306 - U+0308, U+030A - U+030C,
-  U+0321, U+0322 (by Denis Jacquerye)
-- added rest of Block Elements: U+2591 - U+2593 (by David Lawrence Ramsey)
-- added U+2311, U+237D and U+2638 (by David Lawrence Ramsey)
-- added U+01CD - U+01D4 (by Denis Jacquerye)
-- fixed accents of U+00F2 - U+00F6 by replacing them with references in Mono
-  Bold (by David Jez)
-- added U+0490, U+0491 (by Eugeniy Meshcheryakov)
-- added hints to U+0404 and U+0454 in Sans (by Eugeniy Meshcheryakov)
-- completed Greek glyphs from U+0370 to U+03CF in Serif (by Ben Laenen)
-- fixed shape of U+0255 in Sans Bold and Sans Bold Oblique (by Denis
-  Jacquerye)
-
-Changes from 1.13 to 1.14:
-
-- fixed bug where Mono faces were not recognized as fixed pitch in Windows
-  by correcting Venda glyphs (by David Jez)
-- added and improved TrueType instructions (by Keenan Pepper)
-- added 6 Uzbekian glyphs (by Mashrab Kuvatov)
-- added Greek glyphs to Sans and Serif, changed pi and omega to fit in (by
-  Ben Laenen)
-- added IPA and related superscript glyphs (by Denis Jacquerye)
-- fixed buggy Venda glyphs (by David Lawrence Ramsey and Stepan Roh)
-- added U+2302, U+2310, U+2319 (by David Lawrence Ramsey)
-- fixed slanted U+00AC in Serif Oblique faces (by David Lawrence Ramsey)
-- added 29 glyphs from Block Elements (by David Lawrence Ramsey)
-
-Changes from 1.12 to 1.13:
-
-- removed all stems (PS hints) (requested by David Jez)
-- added U+01D6, U+01DF, U+022B, U+022D and U+0231 (by Sander Vesik)
-- added 10 Venda glyphs (by Dwayne Bailey)
-- fixed bug when fonts had no name on Microsoft Windows (by Stepan Roh)
-- updated 'missing' glyph U+FFFD (by David Jez)
-- set TTF flag fsType to 'Installable Embedding' (= unrestricted usage)
-  (idea by C. Tiffany)
-
-Changes from 1.11 to 1.12:
-
-- added long s (by James Cloos)
-- prettier comma accent in gcommaaccent (by David Jez)
-- added Hbar, hbar, kgreenlandic, napostrophe, Eng, eng, Tbar, tbar,
-  afii57929 (by David Jez)
-- changed Iogonek, iogonek, IJ, ij to look better (by David Jez)
-- glyph uni0237 renamed to dotlessj (requested by David Jez)
-- fixed accents for dcaron, lcaron, tcaron, Uogonek, uogonek in Serif (by
-  David Jez)
-- added U+2500 - U+257F box drawing glyphs to Sans Mono (by David Jez)
-- fixed accents in Wcircumflex, Ycircumflex and Zdotaccent (by David Jez)
-- extra kerning for F (by Sander Vesik)
-- added 'missing' glyph U+FFFD (by David Jez)
-
-Changes from 1.10 to 1.11:
-
-- kerning updates (by Sander Vesik)
-- added Iogonek, iogonek, IJ, ij, Uogonek, uogonek (from SuSE standard fonts
-  by Adrian Schroeter, SuSE AG)
-- added Gcommaaccent, gcommaaccent, Kcommaaccent, kcommaaccent,
-  Lcommaaccent, lcommaaccent, Ncommaaccent, ncommaaccent, Rcommaaccent,
-  rcommaaccent (by Stepan Roh)
-
-Changes from 1.9 to 1.10:
-
-- added U+022E, U+022F (by Sander Vesik)
-- kerning updates for DejaVu Sans (by Sander Vesik)
-- fixed too wide cyrillic glyphs in DejaVu Sans Mono (by Valentin Stoykov)
-- fixed ligatures bug in Mono (by Stepan Roh)
-
-Changes from 1.8 to 1.9:
-
-- integrated Arev Cyrillics (by Danilo Segan)
-- added U+01EA, U+01EB, U+01EC, U+01ED (by Sander Vesik)
-
-Changes from 1.7 to 1.8:
-
-- fixed accents in Serif Oblique and Serif Bold Oblique (by Stepan Roh)
-
-Changes from 1.6 to 1.7:
-
-- added automatically generated Condensed typefaces (by Stepan Roh)
-
-Changes from 1.5 to 1.6:
-
-- monospace bug fixed (by Stepan Roh)
-- incorrect Bitstream foundry assigned by fontconfig and KDE Font Installer
-fixed (by Stepan Roh)
-- added automatically generated Oblique version of Serif typefaces (by
-Stepan Roh)
-- corrected cyrillic D and d (by Danilo Segan and David Jez)
-- fixed accents position in Oblique version of Serif typefaces (by Danilo
-Segan and Sander Vesik)
-- fixed incorrect computation of OS2Win* fields (by Stepan Roh)
-- added visiblespace U+2423 (by David Jez)
-- fixed 'line height' bug by fixing ascender and descender values (by David
-Jez and Stepan Roh)
-- fixed part of 'worse than Vera' bug (by Peter Cernak)
-- smaller comma accent U+0326 (by David Jez)
-
-Changes from 1.4 to 1.5:
-
-- added Cyrillics (96 characters) and Dcroat to the rest of typefaces (by
-Danilo Segan)
-- fixed bugs in some Cyrillic characters, some of them reported by Sander
-Vesik (by Danilo Segan)
-- added U+0100, U+0101, U+0112, U+0113, U+012A, U+012B, U+014C, U+014D,
-U+016A, U+016B, U+01E2, U+01E3, U+0232 and U+0233 (by Sander Vesik)
-- added Romanian characters (by Misu Moldovan)
-- added U+0108, U+0109, U+010A, U+010B, U+0114, U+0115, U+0116, U+0117,
-U+011C, U+011D, U+0120, U+0121, U+0124, U+0125, U+0128, U+0129, U+012C,
-U+012D, U+0134, U+0135, U+014E, U+014F, U+0150, U+0151, U+015C, U+015D,
-U+0168, U+0169, U+016C, U+016D, U+0170, U+0171 and U+0237 (by James
-Crippen)
-- added U+02BB, U+2010, U+2011, U+2012 and U+2015 (by Stepan Roh)
-
-Changes from 1.3 to 1.4:
-
-- added Polish characters (Aogonek, aogonek, Eogonek, eogonek, Nacute,
-nacute, Sacute, sacute, Zacute, zacute, Zdotaccent, zdotaccent) (by Stepan
-Roh)
-
-Changes from 1.2 to 1.3:
-
-- added Cyrillics (96 characters) and Dcroat to Sans typefaces (by Danilo
-Segan from his BePa fonts)
-
-Changes from 1.1 to 1.2:
-
-- added Ldot, ldot, Wcircumflex, wcircumflex, Ycircumflex, ycircumflex,
-  Wgrave, wgrave, Wacute, wacute, Wdieresis, wdieresis, Ygrave and ygrave
-  (from The Olwen Font Family 0.2 by Dafydd Harries)
-
-Changes from 1.0 to 1.1:
-
-- added Lacute, lacute, Lcaron, lcaron, Racute and racute (by Peter Cernak)
-
-Changes from 0.9.4 to 1.0:
-
-- none, just changed version and updated README
-
-Changes from 0.9.3 to 0.9.4:
-
-- fixed TTF generation (kerning tables were missing)
-
-Changes from 0.9.2 to 0.9.3:
-
-- kerning of added characters
-- proper caron shape for dcaron in Mono (by Ondrej Koala Vacha)
-- minor visual changes
-
-Changes from 0.9.1 to 0.9.2:
-
-- internal bugged version
-
-Changes from 0.9 to 0.9.1:
-
-- proper caron shape for dcaron and tcaron
-- minor visual changes
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/README b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/README
deleted file mode 100644
index f394259967f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/README
+++ /dev/null
@@ -1,58 +0,0 @@
-DejaVu fonts 2.30 (c)2004-2009 DejaVu fonts team
-------------------------------------------------
-
-The DejaVu fonts are a font family based on the Bitstream Vera Fonts
-(http://gnome.org/fonts/). Its purpose is to provide a wider range of
-characters (see status.txt for more information) while maintaining the
-original look and feel.
-
-DejaVu fonts are based on Bitstream Vera fonts version 1.10.
-
-Available fonts (Sans = sans serif, Mono = monospaced):
-
-DejaVu Sans Mono
-DejaVu Sans Mono Bold
-DejaVu Sans Mono Bold Oblique
-DejaVu Sans Mono Oblique
-DejaVu Sans
-DejaVu Sans Bold
-DejaVu Sans Bold Oblique
-DejaVu Sans Oblique
-DejaVu Sans ExtraLight (experimental)
-DejaVu Serif
-DejaVu Serif Bold
-DejaVu Serif Bold Italic (experimental)
-DejaVu Serif Italic (experimental)
-DejaVu Sans Condensed (experimental)
-DejaVu Sans Condensed Bold (experimental)
-DejaVu Sans Condensed Bold Oblique (experimental)
-DejaVu Sans Condensed Oblique (experimental)
-DejaVu Serif Condensed (experimental)
-DejaVu Serif Condensed Bold (experimental)
-DejaVu Serif Condensed Bold Italic (experimental)
-DejaVu Serif Condensed Italic (experimental)
-
-All fonts are also available as derivative called DejaVu LGC with support
-only for Latin, Greek and Cyrillic scripts.
-
-For license information see LICENSE. What's new is described in NEWS. Known
-bugs are in BUGS. All authors are mentioned in AUTHORS.
-
-Fonts are published in source form as SFD files (Spline Font Database from
-FontForge - http://fontforge.sf.net/) and in compiled form as TTF files
-(TrueType fonts).
-
-For more information go to http://dejavu.sourceforge.net/.
-
-Characters from Arev fonts, Copyright (c) 2006 by Tavmjong Bah:
----------------------------
-U+01BA, U+01BF, U+01F7, U+021C-U+021D, U+0220, U+0222-U+0223,
-U+02B9, U+02BA, U+02BD, U+02C2-U+02C5, U+02d4-U+02D5,
-U+02D7, U+02EC-U+02EE, U+0346-U+034E, U+0360, U+0362,
-U+03E2-03EF, U+0460-0463, U+0466-U+0486, U+0488-U+0489, U+04A8-U+04A9,
-U+0500-U+050F, U+2055-205E, U+20B0, U+20B2-U+20B3, U+2102, U+210D, U+210F,
-U+2111, U+2113, U+2115, U+2118-U+211A, U+211C-U+211D, U+2124, U+2135,
-U+213C-U+2140, U+2295-U+2298, U+2308-U+230B, U+26A2-U+26B1, U+2701-U+2704,
-U+2706-U+2709, U+270C-U+274B, U+2758-U+275A, U+2761-U+2775, U+2780-U+2794,
-U+2798-U+27AF, U+27B1-U+27BE, U+FB05-U+FB06
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/langcover.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/langcover.txt
deleted file mode 100644
index 6b2bdd000f7..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/langcover.txt
+++ /dev/null
@@ -1,241 +0,0 @@
-This is the language coverage file for DejaVu fonts
-
-                                                Sans               Serif              Sans Mono          
-aa     Afar                                     100% (62/62)       100% (62/62)       100% (62/62)      
-ab     Abkhazia                                 100% (90/90)        93% (84/90)        84% (76/90)      
-af     Afrikaans                                100% (69/69)       100% (69/69)       100% (69/69)      
-ak     Akan                                     100% (73/73)       100% (73/73)       100% (73/73)      
-am     Amharic                                       (0/264)            (0/264)            (0/264)      
-an     Aragonese                                100% (66/66)       100% (66/66)       100% (66/66)      
-ar     Arabic                                   100% (125/125)          (0/125)       100% (125/125)    
-as     Assamese                                      (0/64)             (0/64)             (0/64)       
-ast    Asturian/Bable/Leonese/Asturleonese      100% (66/66)       100% (66/66)       100% (66/66)      
-av     Avaric                                   100% (67/67)       100% (67/67)       100% (67/67)      
-ay     Aymara                                   100% (60/60)       100% (60/60)       100% (60/60)      
-az-az  Azerbaijani in Azerbaijan                100% (66/66)       100% (66/66)       100% (66/66)      
-az-ir  Azerbaijani in Iran                      100% (130/130)          (0/130)       100% (130/130)    
-ba     Bashkir                                  100% (82/82)       100% (82/82)        97% (80/82)      
-be     Byelorussian                             100% (68/68)       100% (68/68)       100% (68/68)      
-ber-dz Berber in Algeria                        100% (70/70)       100% (70/70)       100% (70/70)      
-ber-ma Berber in Morocco                        100% (32/32)            (0/32)             (0/32)       
-bg     Bulgarian                                100% (60/60)       100% (60/60)       100% (60/60)      
-bh     Bihari (Devanagari script)                    (0/68)             (0/68)             (0/68)       
-bho    Bhojpuri (Devanagari script)                  (0/68)             (0/68)             (0/68)       
-bi     Bislama                                  100% (58/58)       100% (58/58)       100% (58/58)      
-bin    Edo or Bini                              100% (78/78)       100% (78/78)       100% (78/78)      
-bm     Bambara                                  100% (60/60)       100% (60/60)       100% (60/60)      
-bn     Bengali                                       (0/63)             (0/63)             (0/63)       
-bo     Tibetan                                       (0/95)             (0/95)             (0/95)       
-br     Breton                                   100% (64/64)       100% (64/64)       100% (64/64)      
-bs     Bosnian                                  100% (62/62)       100% (62/62)       100% (62/62)      
-bua    Buriat (Buryat)                          100% (70/70)       100% (70/70)       100% (70/70)      
-byn    Blin/Bilin                                    (0/255)            (0/255)            (0/255)      
-ca     Catalan                                  100% (74/74)       100% (74/74)       100% (74/74)      
-ce     Chechen                                  100% (67/67)       100% (67/67)       100% (67/67)      
-ch     Chamorro                                 100% (58/58)       100% (58/58)       100% (58/58)      
-chm    Mari (Lower Cheremis / Upper Cheremis)   100% (76/76)       100% (76/76)        97% (74/76)      
-chr    Cherokee                                      (0/85)             (0/85)             (0/85)       
-co     Corsican                                 100% (84/84)       100% (84/84)       100% (84/84)      
-crh    Crimean Tatar/Crimean Turkish            100% (68/68)       100% (68/68)       100% (68/68)      
-cs     Czech                                    100% (82/82)       100% (82/82)       100% (82/82)      
-csb    Kashubian                                100% (74/74)       100% (74/74)       100% (74/74)      
-cu     Old Church Slavonic                      100% (103/103)      86% (89/103)       78% (81/103)     
-cv     Chuvash                                  100% (74/74)       100% (74/74)       100% (74/74)      
-cy     Welsh                                    100% (78/78)       100% (78/78)       100% (78/78)      
-da     Danish                                   100% (70/70)       100% (70/70)       100% (70/70)      
-de     German                                   100% (59/59)       100% (59/59)       100% (59/59)      
-dv     Divehi/Dhivehi/Maldivian                      (0/49)             (0/49)             (0/49)       
-dz     Dzongkha                                      (0/95)             (0/95)             (0/95)       
-ee     Ewe                                      100% (99/99)       100% (99/99)       100% (99/99)      
-el     Greek                                    100% (69/69)       100% (69/69)       100% (69/69)      
-en     English                                  100% (72/72)       100% (72/72)       100% (72/72)      
-eo     Esperanto                                100% (64/64)       100% (64/64)       100% (64/64)      
-es     Spanish                                  100% (66/66)       100% (66/66)       100% (66/66)      
-et     Estonian                                 100% (64/64)       100% (64/64)       100% (64/64)      
-eu     Basque                                   100% (56/56)       100% (56/56)       100% (56/56)      
-fa     Persian                                  100% (129/129)          (0/129)       100% (129/129)    
-fat    Fanti                                    100% (73/73)       100% (73/73)       100% (73/73)      
-ff     Fulah (Fula)                             100% (62/62)       100% (62/62)       100% (62/62)      
-fi     Finnish                                  100% (62/62)       100% (62/62)       100% (62/62)      
-fil    Filipino                                 100% (84/84)       100% (84/84)       100% (84/84)      
-fj     Fijian                                   100% (52/52)       100% (52/52)       100% (52/52)      
-fo     Faroese                                  100% (68/68)       100% (68/68)       100% (68/68)      
-fr     French                                   100% (84/84)       100% (84/84)       100% (84/84)      
-fur    Friulian                                 100% (66/66)       100% (66/66)       100% (66/66)      
-fy     Frisian                                  100% (75/75)       100% (75/75)       100% (75/75)      
-ga     Irish                                    100% (80/80)       100% (80/80)       100% (80/80)      
-gd     Scots Gaelic                             100% (70/70)       100% (70/70)       100% (70/70)      
-gez    Ethiopic (Geez)                               (0/218)            (0/218)            (0/218)      
-gl     Galician                                 100% (66/66)       100% (66/66)       100% (66/66)      
-gn     Guarani                                  100% (70/70)       100% (70/70)       100% (70/70)      
-gu     Gujarati                                      (0/68)             (0/68)             (0/68)       
-gv     Manx Gaelic                              100% (54/54)       100% (54/54)       100% (54/54)      
-ha     Hausa                                    100% (60/60)       100% (60/60)       100% (60/60)      
-haw    Hawaiian                                 100% (63/63)       100% (63/63)       100% (63/63)      
-he     Hebrew                                   100% (27/27)            (0/27)             (0/27)       
-hi     Hindi (Devanagari script)                     (0/68)             (0/68)             (0/68)       
-hne    Chhattisgarhi                                 (0/68)             (0/68)             (0/68)       
-ho     Hiri Motu                                100% (52/52)       100% (52/52)       100% (52/52)      
-hr     Croatian                                 100% (62/62)       100% (62/62)       100% (62/62)      
-hsb    Upper Sorbian                            100% (72/72)       100% (72/72)       100% (72/72)      
-ht     Haitian/Haitian Creole                   100% (56/56)       100% (56/56)       100% (56/56)      
-hu     Hungarian                                100% (70/70)       100% (70/70)       100% (70/70)      
-hy     Armenian                                 100% (77/77)            (0/77)             (0/77)       
-hz     Herero                                   100% (57/57)       100% (57/57)       100% (57/57)      
-ia     Interlingua                              100% (52/52)       100% (52/52)       100% (52/52)      
-id     Indonesian                               100% (54/54)       100% (54/54)       100% (54/54)      
-ie     Interlingue                              100% (52/52)       100% (52/52)       100% (52/52)      
-ig     Igbo                                     100% (58/58)       100% (58/58)       100% (58/58)      
-ii     Sichuan Yi/Nuosu                              (0/1165)           (0/1165)           (0/1165)     
-ik     Inupiaq (Inupiak, Eskimo)                100% (68/68)       100% (68/68)       100% (68/68)      
-io     Ido                                      100% (52/52)       100% (52/52)       100% (52/52)      
-is     Icelandic                                100% (70/70)       100% (70/70)       100% (70/70)      
-it     Italian                                  100% (72/72)       100% (72/72)       100% (72/72)      
-iu     Inuktitut                                100% (161/161)          (0/161)            (0/161)      
-ja     Japanese                                      (0/6537)           (0/6537)           (0/6537)     
-jv     Javanese                                 100% (56/56)       100% (56/56)       100% (56/56)      
-ka     Georgian                                 100% (33/33)       100% (33/33)       100% (33/33)      
-kaa    Kara-Kalpak (Karakalpak)                 100% (78/78)       100% (78/78)       100% (78/78)      
-kab    Kabyle                                   100% (70/70)       100% (70/70)       100% (70/70)      
-ki     Kikuyu                                   100% (56/56)       100% (56/56)       100% (56/56)      
-kj     Kuanyama/Kwanyama                        100% (52/52)       100% (52/52)       100% (52/52)      
-kk     Kazakh                                   100% (77/77)       100% (77/77)       100% (77/77)      
-kl     Greenlandic                              100% (81/81)       100% (81/81)       100% (81/81)      
-km     Central Khmer                                 (0/63)             (0/63)             (0/63)       
-kn     Kannada                                       (0/70)             (0/70)             (0/70)       
-ko     Korean                                        (0/2443)           (0/2443)           (0/2443)     
-kok    Kokani (Devanagari script)                    (0/68)             (0/68)             (0/68)       
-kr     Kanuri                                   100% (56/56)        96% (54/56)       100% (56/56)      
-ks     Kashmiri                                  94% (137/145)          (0/145)        97% (141/145)    
-ku-am  Kurdish in Armenia                       100% (64/64)       100% (64/64)       100% (64/64)      
-ku-iq  Kurdish in Iraq                          100% (32/32)            (0/32)         87% (28/32)      
-ku-ir  Kurdish in Iran                          100% (32/32)            (0/32)         87% (28/32)      
-ku-tr  Kurdish in Turkey                        100% (62/62)       100% (62/62)       100% (62/62)      
-kum    Kumyk                                    100% (66/66)       100% (66/66)       100% (66/66)      
-kv     Komi (Komi-Permyak/Komi-Siryan)          100% (70/70)       100% (70/70)       100% (70/70)      
-kw     Cornish                                  100% (64/64)       100% (64/64)       100% (64/64)      
-kwm    Kwambi                                   100% (52/52)       100% (52/52)       100% (52/52)      
-ky     Kirgiz                                   100% (70/70)       100% (70/70)       100% (70/70)      
-la     Latin                                    100% (68/68)       100% (68/68)       100% (68/68)      
-lah    Lahnda                                    94% (137/145)          (0/145)        97% (141/145)    
-lb     Luxembourgish (Letzeburgesch)            100% (75/75)       100% (75/75)       100% (75/75)      
-lez    Lezghian (Lezgian)                       100% (67/67)       100% (67/67)       100% (67/67)      
-lg     Ganda                                    100% (54/54)       100% (54/54)       100% (54/54)      
-li     Limburgan/Limburger/Limburgish           100% (62/62)       100% (62/62)       100% (62/62)      
-ln     Lingala                                  100% (81/81)       100% (81/81)       100% (81/81)      
-lo     Lao                                      100% (55/55)            (0/55)         83% (46/55)      
-lt     Lithuanian                               100% (70/70)       100% (70/70)       100% (70/70)      
-lv     Latvian                                  100% (78/78)       100% (78/78)       100% (78/78)      
-mai    Maithili (Devanagari script)                  (0/68)             (0/68)             (0/68)       
-mg     Malagasy                                 100% (56/56)       100% (56/56)       100% (56/56)      
-mh     Marshallese                              100% (62/62)       100% (62/62)       100% (62/62)      
-mi     Maori                                    100% (64/64)       100% (64/64)       100% (64/64)      
-mk     Macedonian                               100% (42/42)       100% (42/42)       100% (42/42)      
-ml     Malayalam                                     (0/68)             (0/68)             (0/68)       
-mn-cn  Mongolian in China                            (0/130)            (0/130)            (0/130)      
-mn-mn  Mongolian in Mongolia                    100% (70/70)       100% (70/70)       100% (70/70)      
-mo     Moldavian                                100% (128/128)     100% (128/128)     100% (128/128)    
-mr     Marathi (Devanagari script)                   (0/68)             (0/68)             (0/68)       
-ms     Malay                                    100% (52/52)       100% (52/52)       100% (52/52)      
-mt     Maltese                                  100% (72/72)       100% (72/72)       100% (72/72)      
-my     Burmese (Myanmar)                             (0/48)             (0/48)             (0/48)       
-na     Nauru                                    100% (60/60)       100% (60/60)       100% (60/60)      
-nb     Norwegian Bokmal                         100% (70/70)       100% (70/70)       100% (70/70)      
-nds    Low Saxon                                100% (59/59)       100% (59/59)       100% (59/59)      
-ne     Nepali (Devanagari script)                    (0/68)             (0/68)             (0/68)       
-ng     Ndonga                                   100% (52/52)       100% (52/52)       100% (52/52)      
-nl     Dutch                                    100% (82/82)       100% (82/82)       100% (82/82)      
-nn     Norwegian Nynorsk                        100% (76/76)       100% (76/76)       100% (76/76)      
-no     Norwegian (Bokmal)                       100% (70/70)       100% (70/70)       100% (70/70)      
-nr     Ndebele, South                           100% (52/52)       100% (52/52)       100% (52/52)      
-nso    Northern Sotho                           100% (58/58)       100% (58/58)       100% (58/58)      
-nv     Navajo/Navaho                            100% (72/72)       100% (72/72)       100% (72/72)      
-ny     Chichewa                                 100% (54/54)       100% (54/54)       100% (54/54)      
-oc     Occitan                                  100% (70/70)       100% (70/70)       100% (70/70)      
-om     Oromo or Galla                           100% (52/52)       100% (52/52)       100% (52/52)      
-or     Oriya                                         (0/68)             (0/68)             (0/68)       
-os     Ossetic                                  100% (66/66)       100% (66/66)       100% (66/66)      
-ota    Ottoman Turkish                           97% (36/37)            (0/37)         97% (36/37)      
-pa     Panjabi/Punjabi                               (0/63)             (0/63)             (0/63)       
-pa-pk  Panjabi/Punjabi in Pakistan               94% (137/145)          (0/145)        97% (141/145)    
-pap-an Papiamento in Netherlands Antilles       100% (72/72)       100% (72/72)       100% (72/72)      
-pap-aw Papiamento in Aruba                      100% (54/54)       100% (54/54)       100% (54/54)      
-pl     Polish                                   100% (70/70)       100% (70/70)       100% (70/70)      
-ps-af  Pashto in Afghanistan                     83% (41/49)            (0/49)         77% (38/49)      
-ps-pk  Pashto in Pakistan                        81% (40/49)            (0/49)         75% (37/49)      
-pt     Portuguese                               100% (82/82)       100% (82/82)       100% (82/82)      
-qu     Quechua                                  100% (55/55)       100% (55/55)       100% (55/55)      
-rm     Rhaeto-Romance (Romansch)                100% (66/66)       100% (66/66)       100% (66/66)      
-rn     Rundi                                    100% (52/52)       100% (52/52)       100% (52/52)      
-ro     Romanian                                 100% (62/62)       100% (62/62)       100% (62/62)      
-ru     Russian                                  100% (66/66)       100% (66/66)       100% (66/66)      
-rw     Kinyarwanda                              100% (52/52)       100% (52/52)       100% (52/52)      
-sa     Sanskrit (Devanagari script)                  (0/68)             (0/68)             (0/68)       
-sah    Yakut                                    100% (76/76)       100% (76/76)        97% (74/76)      
-sc     Sardinian                                100% (62/62)       100% (62/62)       100% (62/62)      
-sco    Scots                                    100% (56/56)       100% (56/56)       100% (56/56)      
-sd     Sindhi                                    81% (44/54)            (0/54)         79% (43/54)      
-se     North Sami                               100% (66/66)       100% (66/66)       100% (66/66)      
-sel    Selkup (Ostyak-Samoyed)                  100% (66/66)       100% (66/66)       100% (66/66)      
-sg     Sango                                    100% (72/72)       100% (72/72)       100% (72/72)      
-sh     Serbo-Croatian                           100% (156/156)     100% (156/156)      98% (154/156)    
-shs    Secwepemctsin                            100% (48/48)       100% (48/48)       100% (48/48)      
-si     Sinhala/Sinhalese                             (0/73)             (0/73)             (0/73)       
-sid    Sidamo                                        (0/281)            (0/281)            (0/281)      
-sk     Slovak                                   100% (86/86)       100% (86/86)       100% (86/86)      
-sl     Slovenian                                100% (62/62)       100% (62/62)       100% (62/62)      
-sm     Samoan                                   100% (53/53)       100% (53/53)       100% (53/53)      
-sma    South Sami                               100% (60/60)       100% (60/60)       100% (60/60)      
-smj    Lule Sami                                100% (60/60)       100% (60/60)       100% (60/60)      
-smn    Inari Sami                               100% (68/68)       100% (68/68)       100% (68/68)      
-sms    Skolt Sami                               100% (80/80)       100% (80/80)        97% (78/80)      
-sn     Shona                                    100% (52/52)       100% (52/52)       100% (52/52)      
-so     Somali                                   100% (52/52)       100% (52/52)       100% (52/52)      
-sq     Albanian                                 100% (56/56)       100% (56/56)       100% (56/56)      
-sr     Serbian                                  100% (60/60)       100% (60/60)       100% (60/60)      
-ss     Swati                                    100% (52/52)       100% (52/52)       100% (52/52)      
-st     Sotho, Southern                          100% (52/52)       100% (52/52)       100% (52/52)      
-su     Sundanese                                100% (54/54)       100% (54/54)       100% (54/54)      
-sv     Swedish                                  100% (68/68)       100% (68/68)       100% (68/68)      
-sw     Swahili                                  100% (52/52)       100% (52/52)       100% (52/52)      
-syr    Syriac                                        (0/45)             (0/45)             (0/45)       
-ta     Tamil                                         (0/48)             (0/48)             (0/48)       
-te     Telugu                                        (0/70)             (0/70)             (0/70)       
-tg     Tajik                                    100% (78/78)       100% (78/78)        97% (76/78)      
-th     Thai                                       1% (1/74)             (0/74)             (0/74)       
-ti-er  Eritrean Tigrinya                             (0/255)            (0/255)            (0/255)      
-ti-et  Ethiopian Tigrinya                            (0/281)            (0/281)            (0/281)      
-tig    Tigre                                         (0/221)            (0/221)            (0/221)      
-tk     Turkmen                                  100% (68/68)       100% (68/68)       100% (68/68)      
-tl     Tagalog                                  100% (84/84)       100% (84/84)       100% (84/84)      
-tn     Tswana                                   100% (58/58)       100% (58/58)       100% (58/58)      
-to     Tonga                                    100% (53/53)       100% (53/53)       100% (53/53)      
-tr     Turkish                                  100% (70/70)       100% (70/70)       100% (70/70)      
-ts     Tsonga                                   100% (52/52)       100% (52/52)       100% (52/52)      
-tt     Tatar                                    100% (76/76)       100% (76/76)       100% (76/76)      
-tw     Twi                                      100% (73/73)       100% (73/73)       100% (73/73)      
-ty     Tahitian                                 100% (65/65)       100% (65/65)       100% (65/65)      
-tyv    Tuvinian                                 100% (70/70)       100% (70/70)       100% (70/70)      
-ug     Uighur                                   100% (125/125)          (0/125)       100% (125/125)    
-uk     Ukrainian                                100% (72/72)       100% (72/72)       100% (72/72)      
-ur     Urdu                                      94% (137/145)          (0/145)        97% (141/145)    
-uz     Uzbek                                    100% (52/52)       100% (52/52)       100% (52/52)      
-ve     Venda                                    100% (62/62)       100% (62/62)       100% (62/62)      
-vi     Vietnamese                               100% (194/194)      77% (150/194)      76% (148/194)    
-vo     Volapuk                                  100% (54/54)       100% (54/54)       100% (54/54)      
-vot    Votic                                    100% (62/62)       100% (62/62)       100% (62/62)      
-wa     Walloon                                  100% (70/70)       100% (70/70)       100% (70/70)      
-wal    Wolaitta/Wolaytta                             (0/281)            (0/281)            (0/281)      
-wen    Sorbian languages (lower and upper)      100% (76/76)       100% (76/76)       100% (76/76)      
-wo     Wolof                                    100% (66/66)       100% (66/66)       100% (66/66)      
-xh     Xhosa                                    100% (52/52)       100% (52/52)       100% (52/52)      
-yap    Yapese                                   100% (58/58)       100% (58/58)       100% (58/58)      
-yi     Yiddish                                  100% (27/27)            (0/27)             (0/27)       
-yo     Yoruba                                   100% (119/119)     100% (119/119)     100% (119/119)    
-za     Zhuang/Chuang                            100% (52/52)       100% (52/52)       100% (52/52)      
-zh-cn  Chinese (simplified)                       0% (2/6765)        0% (2/6765)        0% (2/6765)     
-zh-hk  Chinese Hong Kong Supplementary Character Set      (0/2213)           (0/2213)           (0/2213)     
-zh-mo  Chinese in Macau                              (0/2213)           (0/2213)           (0/2213)     
-zh-sg  Chinese in Singapore                       0% (2/6765)        0% (2/6765)        0% (2/6765)     
-zh-tw  Chinese (traditional)                         (0/13063)          (0/13063)          (0/13063)    
-zu     Zulu                                     100% (52/52)       100% (52/52)       100% (52/52)      
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/status.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/status.txt
deleted file mode 100644
index ec4519c3165..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/status.txt
+++ /dev/null
@@ -1,6236 +0,0 @@
-This is the status file for DejaVu fonts
-
-original = present in original Bitstream Vera 1.10
-<version> = added in DejaVu fonts <version>
-
-U+0020 space                original
-U+0021 exclam               original
-U+0022 quotedbl             original
-U+0023 numbersign           original
-U+0024 dollar               original
-U+0025 percent              original
-U+0026 ampersand            original
-U+0027 quotesingle          original
-U+0028 parenleft            original
-U+0029 parenright           original
-U+002a asterisk             original
-U+002b plus                 original
-U+002c comma                original
-U+002d hyphen               original
-U+002e period               original
-U+002f slash                original
-U+0030 zero                 original
-U+0031 one                  original
-U+0032 two                  original
-U+0033 three                original
-U+0034 four                 original
-U+0035 five                 original
-U+0036 six                  original
-U+0037 seven                original
-U+0038 eight                original
-U+0039 nine                 original
-U+003a colon                original
-U+003b semicolon            original
-U+003c less                 original
-U+003d equal                original
-U+003e greater              original
-U+003f question             original
-U+0040 at                   original
-U+0041 A                    original
-U+0042 B                    original
-U+0043 C                    original
-U+0044 D                    original
-U+0045 E                    original
-U+0046 F                    original
-U+0047 G                    original
-U+0048 H                    original
-U+0049 I                    original
-U+004a J                    original
-U+004b K                    original
-U+004c L                    original
-U+004d M                    original
-U+004e N                    original
-U+004f O                    original
-U+0050 P                    original
-U+0051 Q                    original
-U+0052 R                    original
-U+0053 S                    original
-U+0054 T                    original
-U+0055 U                    original
-U+0056 V                    original
-U+0057 W                    original
-U+0058 X                    original
-U+0059 Y                    original
-U+005a Z                    original
-U+005b bracketleft          original
-U+005c backslash            original
-U+005d bracketright         original
-U+005e asciicircum          original
-U+005f underscore           original
-U+0060 grave                original
-U+0061 a                    original
-U+0062 b                    original
-U+0063 c                    original
-U+0064 d                    original
-U+0065 e                    original
-U+0066 f                    original
-U+0067 g                    original
-U+0068 h                    original
-U+0069 i                    original
-U+006a j                    original
-U+006b k                    original
-U+006c l                    original
-U+006d m                    original
-U+006e n                    original
-U+006f o                    original
-U+0070 p                    original
-U+0071 q                    original
-U+0072 r                    original
-U+0073 s                    original
-U+0074 t                    original
-U+0075 u                    original
-U+0076 v                    original
-U+0077 w                    original
-U+0078 x                    original
-U+0079 y                    original
-U+007a z                    original
-U+007b braceleft            original
-U+007c bar                  original
-U+007d braceright           original
-U+007e asciitilde           original
-U+00a0 nonbreakingspace     original
-U+00a1 exclamdown           original
-U+00a2 cent                 original
-U+00a3 sterling             original
-U+00a4 currency             original
-U+00a5 yen                  original
-U+00a6 brokenbar            original
-U+00a7 section              original
-U+00a8 dieresis             original
-U+00a9 copyright            original
-U+00aa ordfeminine          original
-U+00ab guillemotleft        original
-U+00ac logicalnot           original
-U+00ad sfthyphen            original
-U+00ae registered           original
-U+00af macron               original
-U+00b0 degree               original
-U+00b1 plusminus            original
-U+00b2 twosuperior          original
-U+00b3 threesuperior        original
-U+00b4 acute                original
-U+00b5 mu                   original
-U+00b6 paragraph            original
-U+00b7 periodcentered       original
-U+00b8 cedilla              original
-U+00b9 onesuperior          original
-U+00ba ordmasculine         original
-U+00bb guillemotright       original
-U+00bc onequarter           original
-U+00bd onehalf              original
-U+00be threequarters        original
-U+00bf questiondown         original
-U+00c0 Agrave               original
-U+00c1 Aacute               original
-U+00c2 Acircumflex          original
-U+00c3 Atilde               original
-U+00c4 Adieresis            original
-U+00c5 Aring                original
-U+00c6 AE                   original
-U+00c7 Ccedilla             original
-U+00c8 Egrave               original
-U+00c9 Eacute               original
-U+00ca Ecircumflex          original
-U+00cb Edieresis            original
-U+00cc Igrave               original
-U+00cd Iacute               original
-U+00ce Icircumflex          original
-U+00cf Idieresis            original
-U+00d0 Eth                  original
-U+00d1 Ntilde               original
-U+00d2 Ograve               original
-U+00d3 Oacute               original
-U+00d4 Ocircumflex          original
-U+00d5 Otilde               original
-U+00d6 Odieresis            original
-U+00d7 multiply             original
-U+00d8 Oslash               original
-U+00d9 Ugrave               original
-U+00da Uacute               original
-U+00db Ucircumflex          original
-U+00dc Udieresis            original
-U+00dd Yacute               original
-U+00de Thorn                original
-U+00df germandbls           original
-U+00e0 agrave               original
-U+00e1 aacute               original
-U+00e2 acircumflex          original
-U+00e3 atilde               original
-U+00e4 adieresis            original
-U+00e5 aring                original
-U+00e6 ae                   original
-U+00e7 ccedilla             original
-U+00e8 egrave               original
-U+00e9 eacute               original
-U+00ea ecircumflex          original
-U+00eb edieresis            original
-U+00ec igrave               original
-U+00ed iacute               original
-U+00ee icircumflex          original
-U+00ef idieresis            original
-U+00f0 eth                  original
-U+00f1 ntilde               original
-U+00f2 ograve               original
-U+00f3 oacute               original
-U+00f4 ocircumflex          original
-U+00f5 otilde               original
-U+00f6 odieresis            original
-U+00f7 divide               original
-U+00f8 oslash               original
-U+00f9 ugrave               original
-U+00fa uacute               original
-U+00fb ucircumflex          original
-U+00fc udieresis            original
-U+00fd yacute               original
-U+00fe thorn                original
-U+00ff ydieresis            original
-U+0100 Amacron              1.5
-U+0101 amacron              1.5
-U+0102 Abreve               1.5
-U+0103 abreve               1.5
-U+0104 Aogonek              1.4
-U+0105 aogonek              1.4
-U+0106 Cacute               original
-U+0107 cacute               original
-U+0108 Ccircumflex          1.5
-U+0109 ccircumflex          1.5
-U+010a Cdotaccent           1.5
-U+010b cdotaccent           1.5
-U+010c Ccaron               original
-U+010d ccaron               original
-U+010e Dcaron               1.0
-U+010f dcaron               1.0
-U+0110 Dcroat               1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0111 dcroat               original
-U+0112 Emacron              1.5
-U+0113 emacron              1.5
-U+0114 Ebreve               1.5
-U+0115 ebreve               1.5
-U+0116 Edotaccent           1.5
-U+0117 edotaccent           1.5
-U+0118 Eogonek              1.4
-U+0119 eogonek              1.4
-U+011a Ecaron               1.0
-U+011b ecaron               1.0
-U+011c Gcircumflex          1.5
-U+011d gcircumflex          1.5
-U+011e Gbreve               original
-U+011f gbreve               original
-U+0120 Gdotaccent           1.5
-U+0121 gdotaccent           1.5
-U+0122 Gcommaaccent         1.11
-U+0123 gcommaaccent         1.11
-U+0124 Hcircumflex          1.5
-U+0125 hcircumflex          1.5
-U+0126 Hbar                 1.12
-U+0127 hbar                 1.12
-U+0128 Itilde               1.5
-U+0129 itilde               1.5
-U+012a Imacron              1.5
-U+012b imacron              1.5
-U+012c Ibreve               1.5
-U+012d ibreve               1.5
-U+012e Iogonek              1.11
-U+012f iogonek              1.11
-U+0130 Idotaccent           original
-U+0131 dotlessi             original
-U+0132 IJ                   1.11
-U+0133 ij                   1.11
-U+0134 Jcircumflex          1.5
-U+0135 jcircumflex          1.5
-U+0136 Kcommaaccent         1.11
-U+0137 kcommaaccent         1.11
-U+0138 kgreenlandic         1.12
-U+0139 Lacute               1.1
-U+013a lacute               1.1
-U+013b Lcommaaccent         1.11
-U+013c lcommaaccent         1.11
-U+013d Lcaron               1.1
-U+013e lcaron               1.1
-U+013f Ldot                 1.2
-U+0140 ldot                 1.2
-U+0141 Lslash               original
-U+0142 lslash               original
-U+0143 Nacute               1.4
-U+0144 nacute               1.4
-U+0145 Ncommaaccent         1.11
-U+0146 ncommaaccent         1.11
-U+0147 Ncaron               1.0
-U+0148 ncaron               1.0
-U+0149 napostrophe          1.12
-U+014a Eng                  1.12
-U+014b eng                  1.12
-U+014c Omacron              1.5
-U+014d omacron              1.5
-U+014e Obreve               1.5
-U+014f obreve               1.5
-U+0150 Ohungarumlaut        1.5
-U+0151 ohungarumlaut        1.5
-U+0152 OE                   original
-U+0153 oe                   original
-U+0154 Racute               1.1
-U+0155 racute               1.1
-U+0156 Rcommaaccent         1.11
-U+0157 rcommaaccent         1.11
-U+0158 Rcaron               1.0
-U+0159 rcaron               1.0
-U+015a Sacute               1.4
-U+015b sacute               1.4
-U+015c Scircumflex          1.5
-U+015d scircumflex          1.5
-U+015e Scedilla             original
-U+015f scedilla             original
-U+0160 Scaron               original
-U+0161 scaron               original
-U+0162 Tcommaaccent         1.5
-U+0163 tcommaaccent         1.5
-U+0164 Tcaron               1.0
-U+0165 tcaron               1.0
-U+0166 Tbar                 1.12
-U+0167 tbar                 1.12
-U+0168 Utilde               1.5
-U+0169 utilde               1.5
-U+016a Umacron              1.5
-U+016b umacron              1.5
-U+016c Ubreve               1.5
-U+016d ubreve               1.5
-U+016e Uring                1.0
-U+016f uring                1.0
-U+0170 Uhungarumlaut        1.5
-U+0171 uhungarumlaut        1.5
-U+0172 Uogonek              1.11
-U+0173 uogonek              1.11
-U+0174 Wcircumflex          1.2
-U+0175 wcircumflex          1.2
-U+0176 Ycircumflex          1.2
-U+0177 ycircumflex          1.2
-U+0178 Ydieresis            original
-U+0179 Zacute               1.4
-U+017a zacute               1.4
-U+017b Zdotaccent           1.4
-U+017c zdotaccent           1.4
-U+017d Zcaron               original
-U+017e zcaron               original
-U+017f longs                1.12
-U+0180 uni0180              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.12 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0181 uni0181              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0182 uni0182              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0183 uni0183              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0184 uni0184              2.3
-U+0185 uni0185              2.3
-U+0186 uni0186              1.15
-U+0187 uni0187              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0188 uni0188              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0189 uni0189              2.1
-U+018a uni018A              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018b uni018B              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018c uni018C              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018d uni018D              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018e uni018E              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+018f uni018F              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0190 uni0190              1.15
-U+0191 uni0191              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0192 florin               original
-U+0193 uni0193              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0194 uni0194              1.14
-U+0195 uni0195              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.6 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0196 uni0196              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0197 uni0197              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0198 uni0198              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0199 uni0199              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019a uni019A              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019b uni019B              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+019c uni019C              2.3
-U+019d uni019D              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019e uni019E              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+019f uni019F              2.3
-U+01a0 Ohorn                2.3
-U+01a1 ohorn                2.3
-U+01a2 uni01A2              2.3
-U+01a3 uni01A3              2.3
-U+01a4 uni01A4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a5 uni01A5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a6 uni01A6              2.3
-U+01a7 uni01A7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a8 uni01A8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01a9 uni01A9              2.2
-U+01aa uni01AA              2.3
-U+01ab uni01AB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01ac uni01AC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01ad uni01AD              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01ae uni01AE              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01af Uhorn                2.3
-U+01b0 uhorn                2.3
-U+01b1 uni01B1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01b2 uni01B2              2.3
-U+01b3 uni01B3              2.3
-U+01b4 uni01B4              2.3
-U+01b5 uni01B5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01b6 uni01B6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01b7 uni01B7              2.3
-U+01b8 uni01B8              2.3
-U+01b9 uni01B9              2.3
-U+01ba uni01BA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+01bb uni01BB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01bc uni01BC              2.3
-U+01bd uni01BD              2.3
-U+01be uni01BE              2.3
-U+01bf uni01BF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+01c0 uni01C0              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01c1 uni01C1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01c2 uni01C2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+01c3 uni01C3              2.2
-U+01c4 uni01C4              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c5 uni01C5              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c6 uni01C6              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c7 uni01C7              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c8 uni01C8              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01c9 uni01C9              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01ca uni01CA              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01cb uni01CB              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01cc uni01CC              1.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01cd uni01CD              1.15
-U+01ce uni01CE              1.15
-U+01cf uni01CF              1.15
-U+01d0 uni01D0              1.15
-U+01d1 uni01D1              1.15
-U+01d2 uni01D2              1.15
-U+01d3 uni01D3              1.15
-U+01d4 uni01D4              1.15
-U+01d5 uni01D5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01d6 uni01D6              1.13
-U+01d7 uni01D7              2.3
-U+01d8 uni01D8              2.3
-U+01d9 uni01D9              2.3
-U+01da uni01DA              2.3
-U+01db uni01DB              2.3
-U+01dc uni01DC              2.3
-U+01dd uni01DD              2.2
-U+01de uni01DE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique) 2.23 (Serif Italic Condensed)
-U+01df uni01DF              1.13
-U+01e0 uni01E0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e1 uni01E1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e2 uni01E2              1.5
-U+01e3 uni01E3              1.5
-U+01e4 uni01E4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+01e5 uni01E5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+01e6 Gcaron               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e7 gcaron               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e8 uni01E8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01e9 uni01E9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01ea uni01EA              1.9
-U+01eb uni01EB              1.9
-U+01ec uni01EC              1.9
-U+01ed uni01ED              1.9
-U+01ee uni01EE              2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01ef uni01EF              2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f0 uni01F0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono) 2.22 (Sans Mono Bold) 2.23 (Serif Italic Condensed)
-U+01f1 uni01F1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01f2 uni01F2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01f3 uni01F3              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01f4 uni01F4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f5 uni01F5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f6 uni01F6              2.3
-U+01f7 uni01F7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+01f8 uni01F8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01f9 uni01F9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01fa Aringacute           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01fb aringacute           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+01fc AEacute              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01fd aeacute              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01fe Oslashacute          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+01ff oslashacute          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0200 uni0200              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0201 uni0201              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0202 uni0202              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0203 uni0203              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0204 uni0204              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0205 uni0205              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0206 uni0206              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0207 uni0207              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0208 uni0208              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0209 uni0209              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020a uni020A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020b uni020B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020c uni020C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020d uni020D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020e uni020E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+020f uni020F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0210 uni0210              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0211 uni0211              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0212 uni0212              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0213 uni0213              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0214 uni0214              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0215 uni0215              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0216 uni0216              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0217 uni0217              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0218 Scommaaccent         1.5
-U+0219 scommaaccent         1.5
-U+021a uni021A              1.5
-U+021b uni021B              1.5
-U+021c uni021C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+021d uni021D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+021e uni021E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+021f uni021F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0220 uni0220              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.16 (Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.18 (Sans Mono, Sans Mono Bold) 2.23 (Serif Italic Condensed)
-U+0221 uni0221              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0222 uni0222              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0223 uni0223              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0224 uni0224              2.3
-U+0225 uni0225              2.3
-U+0226 uni0226              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0227 uni0227              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0228 uni0228              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0229 uni0229              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+022a uni022A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+022b uni022B              1.13
-U+022c uni022C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+022d uni022D              1.13
-U+022e uni022E              1.10
-U+022f uni022F              1.10
-U+0230 uni0230              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0231 uni0231              1.13
-U+0232 uni0232              1.5
-U+0233 uni0233              1.5
-U+0234 uni0234              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0235 uni0235              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0236 uni0236              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0237 dotlessj             1.5
-U+0238 uni0238              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0239 uni0239              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+023a uni023A              2.3
-U+023b uni023B              2.3
-U+023c uni023C              2.3
-U+023d uni023D              2.3
-U+023e uni023E              2.3
-U+023f uni023F              2.3
-U+0240 uni0240              2.3
-U+0241 uni0241              2.3
-U+0242 uni0242              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+0243 uni0243              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0244 uni0244              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0245 uni0245              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0246 uni0246              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0247 uni0247              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0248 uni0248              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0249 uni0249              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+024a uni024A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+024b uni024B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans ExtraLight)
-U+024c uni024C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+024d uni024D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+024e uni024E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+024f uni024F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0250 uni0250              1.14
-U+0251 uni0251              1.14
-U+0252 uni0252              1.14
-U+0253 uni0253              1.14
-U+0254 uni0254              1.14
-U+0255 uni0255              1.14
-U+0256 uni0256              1.14
-U+0257 uni0257              1.14
-U+0258 uni0258              1.14
-U+0259 uni0259              1.14
-U+025a uni025A              1.14
-U+025b uni025B              1.14
-U+025c uni025C              1.14
-U+025d uni025D              1.14
-U+025e uni025E              1.14
-U+025f uni025F              1.14
-U+0260 uni0260              1.14
-U+0261 uni0261              1.14
-U+0262 uni0262              1.14
-U+0263 uni0263              1.14
-U+0264 uni0264              1.14
-U+0265 uni0265              1.14
-U+0266 uni0266              1.14
-U+0267 uni0267              1.14
-U+0268 uni0268              1.14
-U+0269 uni0269              1.14
-U+026a uni026A              1.14
-U+026b uni026B              1.14
-U+026c uni026C              1.14
-U+026d uni026D              1.14
-U+026e uni026E              1.14
-U+026f uni026F              1.14
-U+0270 uni0270              1.14
-U+0271 uni0271              1.14
-U+0272 uni0272              1.14
-U+0273 uni0273              1.14
-U+0274 uni0274              1.14
-U+0275 uni0275              1.14
-U+0276 uni0276              1.14
-U+0277 uni0277              1.14
-U+0278 uni0278              1.14
-U+0279 uni0279              1.14
-U+027a uni027A              1.14
-U+027b uni027B              1.14
-U+027c uni027C              1.14
-U+027d uni027D              1.14
-U+027e uni027E              1.14
-U+027f uni027F              1.14
-U+0280 uni0280              1.14
-U+0281 uni0281              1.14
-U+0282 uni0282              1.14
-U+0283 uni0283              1.14
-U+0284 uni0284              1.14
-U+0285 uni0285              1.14
-U+0286 uni0286              1.14
-U+0287 uni0287              1.14
-U+0288 uni0288              1.14
-U+0289 uni0289              1.14
-U+028a uni028A              1.14
-U+028b uni028B              1.14
-U+028c uni028C              1.14
-U+028d uni028D              1.14
-U+028e uni028E              1.14
-U+028f uni028F              1.14
-U+0290 uni0290              1.14
-U+0291 uni0291              1.14
-U+0292 uni0292              1.14
-U+0293 uni0293              1.14
-U+0294 uni0294              1.14
-U+0295 uni0295              1.14
-U+0296 uni0296              1.14
-U+0297 uni0297              1.14
-U+0298 uni0298              1.14
-U+0299 uni0299              1.14
-U+029a uni029A              1.14
-U+029b uni029B              1.14
-U+029c uni029C              1.14
-U+029d uni029D              1.14
-U+029e uni029E              1.14
-U+029f uni029F              1.14
-U+02a0 uni02A0              1.14
-U+02a1 uni02A1              1.14
-U+02a2 uni02A2              1.14
-U+02a3 uni02A3              1.14
-U+02a4 uni02A4              1.14
-U+02a5 uni02A5              1.14
-U+02a6 uni02A6              1.14
-U+02a7 uni02A7              1.14
-U+02a8 uni02A8              1.14
-U+02a9 uni02A9              1.14
-U+02aa uni02AA              1.14
-U+02ab uni02AB              1.14
-U+02ac uni02AC              1.14
-U+02ad uni02AD              1.14
-U+02ae uni02AE              1.14
-U+02af uni02AF              1.14
-U+02b0 uni02B0              1.14
-U+02b1 uni02B1              1.14
-U+02b2 uni02B2              1.14
-U+02b3 uni02B3              1.14
-U+02b4 uni02B4              1.14
-U+02b5 uni02B5              1.14
-U+02b6 uni02B6              1.14
-U+02b7 uni02B7              1.14
-U+02b8 uni02B8              1.14
-U+02b9 uni02B9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+02ba uni02BA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02bb uni02BB              1.5
-U+02bc uni02BC              1.12
-U+02bd uni02BD              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+02be uni02BE              2.2
-U+02bf uni02BF              2.2
-U+02c0 uni02C0              1.14
-U+02c1 uni02C1              1.14
-U+02c2 uni02C2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c3 uni02C3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c4 uni02C4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c5 uni02C5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02c6 circumflex           original
-U+02c7 caron                original
-U+02c8 uni02C8              2.0
-U+02c9 uni02C9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+02ca uni02CA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02cb uni02CB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02cc uni02CC              2.0
-U+02cd uni02CD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02ce uni02CE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02cf uni02CF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+02d0 uni02D0              1.14
-U+02d1 uni02D1              1.14
-U+02d2 uni02D2              2.0
-U+02d3 uni02D3              2.2
-U+02d4 uni02D4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02d5 uni02D5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02d6 uni02D6              2.0
-U+02d7 uni02D7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02d8 breve                original
-U+02d9 dotaccent            original
-U+02da ring                 original
-U+02db ogonek               original
-U+02dc tilde                original
-U+02dd hungarumlaut         original
-U+02de uni02DE              2.0
-U+02df uni02DF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02e0 uni02E0              1.14
-U+02e1 uni02E1              1.14
-U+02e2 uni02E2              1.14
-U+02e3 uni02E3              1.14
-U+02e4 uni02E4              1.14
-U+02e5 uni02E5              2.0
-U+02e6 uni02E6              2.0
-U+02e7 uni02E7              2.0
-U+02e8 uni02E8              2.0
-U+02e9 uni02E9              2.0
-U+02ec uni02EC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02ed uni02ED              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+02ee uni02EE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02f3 uni02F3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+02f7 uni02F7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0300 gravecomb            1.15
-U+0301 acutecomb            1.15
-U+0302 uni0302              1.15
-U+0303 tildecomb            1.15
-U+0304 uni0304              1.15
-U+0305 uni0305              2.0
-U+0306 uni0306              1.15
-U+0307 uni0307              1.15
-U+0308 uni0308              1.15
-U+0309 hookabovecomb        2.1
-U+030a uni030A              1.15
-U+030b uni030B              1.15
-U+030c uni030C              1.15
-U+030d uni030D              2.0
-U+030e uni030E              2.0
-U+030f uni030F              2.0
-U+0310 uni0310              2.0
-U+0311 uni0311              2.0
-U+0312 uni0312              1.11
-U+0313 uni0313              2.1
-U+0314 uni0314              2.1
-U+0315 uni0315              2.0
-U+0316 uni0316              2.0
-U+0317 uni0317              2.0
-U+0318 uni0318              2.0
-U+0319 uni0319              2.0
-U+031a uni031A              2.1
-U+031b uni031B              2.1
-U+031c uni031C              2.0
-U+031d uni031D              2.0
-U+031e uni031E              2.0
-U+031f uni031F              2.0
-U+0320 uni0320              2.0
-U+0321 uni0321              1.15
-U+0322 uni0322              1.15
-U+0323 dotbelowcomb         2.1
-U+0324 uni0324              2.0
-U+0325 uni0325              2.0
-U+0326 uni0326              1.5
-U+0327 uni0327              2.1
-U+0328 uni0328              2.1
-U+0329 uni0329              2.0
-U+032a uni032A              2.0
-U+032b uni032B              2.1
-U+032c uni032C              2.0
-U+032d uni032D              2.0
-U+032e uni032E              2.0
-U+032f uni032F              2.0
-U+0330 uni0330              2.0
-U+0331 uni0331              2.0
-U+0332 uni0332              2.0
-U+0333 uni0333              2.1
-U+0334 uni0334              2.3
-U+0335 uni0335              2.3
-U+0336 uni0336              2.3
-U+0337 uni0337              2.3
-U+0338 uni0338              2.3
-U+0339 uni0339              2.0
-U+033a uni033A              2.0
-U+033b uni033B              2.0
-U+033c uni033C              2.1
-U+033d uni033D              2.0
-U+033e uni033E              2.1
-U+033f uni033F              2.1
-U+0340 uni0340              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0341 uni0341              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0342 uni0342              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0343 uni0343              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0344 uni0344              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0345 uni0345              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0346 uni0346              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0347 uni0347              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0348 uni0348              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0349 uni0349              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034a uni034A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034b uni034B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034c uni034C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034d uni034D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034e uni034E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+034f uni034F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0351 uni0351              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0352 uni0352              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique) 2.28 (Sans Condensed Oblique, Sans Oblique)
-U+0353 uni0353              2.5 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0357 uni0357              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0358 uni0358              2.3
-U+035a uni035A              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+035c uni035C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+035d uni035D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+035e uni035E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+035f uni035F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0360 uni0360              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0361 uni0361              2.0
-U+0362 uni0362              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0370 uni0370              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0371 uni0371              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0372 uni0372              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0373 uni0373              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0374 uni0374              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0375 uni0375              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0376 uni0376              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+0377 uni0377              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+037a uni037A              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+037b uni037B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+037c uni037C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+037d uni037D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+037e uni037E              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0384 tonos                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0385 dieresistonos        1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0386 Alphatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0387 anoteleia            1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0388 Epsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0389 Etatonos             1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038a Iotatonos            1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038c Omicrontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038e Upsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+038f Omegatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0390 iotadieresistonos    1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0391 Alpha                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0392 Beta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0393 Gamma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0394 uni0394              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0395 Epsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0396 Zeta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0397 Eta                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0398 Theta                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0399 Iota                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039a Kappa                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039b Lambda               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039c Mu                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039d Nu                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039e Xi                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+039f Omicron              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a0 Pi                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a1 Rho                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a3 Sigma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a4 Tau                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a5 Upsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a6 Phi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a7 Chi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a8 Psi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03a9 Omega                original
-U+03aa Iotadieresis         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ab Upsilondieresis      1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.1 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ac alphatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ad epsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ae etatonos             1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03af iotatonos            1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b0 upsilondieresistonos 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b1 alpha                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b2 beta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b3 gamma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b4 delta                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b5 epsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b6 zeta                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b7 eta                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b8 theta                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03b9 iota                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ba kappa                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bb lambda               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bc uni03BC              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bd nu                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03be xi                   1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03bf omicron              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c0 pi                   original
-U+03c1 rho                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c2 sigma1               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c3 sigma                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c4 tau                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c5 upsilon              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c6 phi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c7 chi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c8 psi                  1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03c9 omega                1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ca iotadieresis         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cb upsilondieresis      1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cc omicrontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cd upsilontonos         1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ce omegatonos           1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 1.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.2 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03cf uni03CF              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+03d0 uni03D0              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d1 theta1               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d2 Upsilon1             1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d3 uni03D3              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d4 uni03D4              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d5 phi1                 1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.18 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03d6 omega1               1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03d7 uni03D7              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03d8 uni03D8              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03d9 uni03D9              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03da uni03DA              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03db uni03DB              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03dc uni03DC              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03dd uni03DD              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03de uni03DE              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03df uni03DF              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03e0 uni03E0              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03e1 uni03E1              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03e2 uni03E2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e3 uni03E3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e4 uni03E4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e5 uni03E5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e6 uni03E6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e7 uni03E7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e8 uni03E8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03e9 uni03E9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ea uni03EA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03eb uni03EB              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ec uni03EC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ed uni03ED              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ee uni03EE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03ef uni03EF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+03f0 uni03F0              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03f1 uni03F1              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03f2 uni03F2              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f3 uni03F3              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f4 uni03F4              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f5 uni03F5              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f6 uni03F6              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f7 uni03F7              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f8 uni03F8              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03f9 uni03F9              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03fa uni03FA              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03fb uni03FB              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+03fc uni03FC              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+03fd uni03FD              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03fe uni03FE              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+03ff uni03FF              1.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.0 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0400 uni0400              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0401 uni0401              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0402 uni0402              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0403 uni0403              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0404 uni0404              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0405 uni0405              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0406 uni0406              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0407 uni0407              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0408 uni0408              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0409 uni0409              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040a uni040A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040b uni040B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040c uni040C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040d uni040D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040e uni040E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+040f uni040F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0410 uni0410              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0411 uni0411              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0412 uni0412              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0413 uni0413              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0414 uni0414              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0415 uni0415              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0416 uni0416              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0417 uni0417              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0418 uni0418              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0419 uni0419              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041a uni041A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041b uni041B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041c uni041C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041d uni041D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041e uni041E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+041f uni041F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0420 uni0420              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0421 uni0421              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0422 uni0422              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0423 uni0423              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0424 uni0424              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0425 uni0425              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0426 uni0426              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0427 uni0427              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0428 uni0428              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0429 uni0429              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042a uni042A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042b uni042B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042c uni042C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042d uni042D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042e uni042E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+042f uni042F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0430 uni0430              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0431 uni0431              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0432 uni0432              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0433 uni0433              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0434 uni0434              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0435 uni0435              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0436 uni0436              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0437 uni0437              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0438 uni0438              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0439 uni0439              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043a uni043A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043b uni043B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043c uni043C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043d uni043D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043e uni043E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+043f uni043F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0440 uni0440              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0441 uni0441              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0442 uni0442              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0443 uni0443              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0444 uni0444              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0445 uni0445              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0446 uni0446              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0447 uni0447              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0448 uni0448              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0449 uni0449              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044a uni044A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044b uni044B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044c uni044C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044d uni044D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044e uni044E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+044f uni044F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0450 uni0450              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0451 uni0451              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0452 uni0452              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0453 uni0453              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0454 uni0454              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0455 uni0455              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0456 uni0456              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0457 uni0457              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0458 uni0458              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0459 uni0459              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045a uni045A              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045b uni045B              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045c uni045C              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045d uni045D              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045e uni045E              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+045f uni045F              1.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 1.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold) 1.6 (Serif Bold Italic, Serif Italic) 1.7 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+0460 uni0460              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0461 uni0461              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0462 uni0462              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0463 uni0463              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0464 uni0464              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0465 uni0465              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0466 uni0466              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0467 uni0467              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0468 uni0468              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0469 uni0469              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046a uni046A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.21 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+046b uni046B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.21 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+046c uni046C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046d uni046D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046e uni046E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+046f uni046F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0470 uni0470              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0471 uni0471              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0472 uni0472              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0473 uni0473              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0474 uni0474              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.12 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0475 uni0475              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.12 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0476 uni0476              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0477 uni0477              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0478 uni0478              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0479 uni0479              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047a uni047A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047b uni047B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047c uni047C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047d uni047D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047e uni047E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+047f uni047F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0480 uni0480              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0481 uni0481              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0482 uni0482              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0483 uni0483              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0484 uni0484              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0485 uni0485              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0486 uni0486              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0487 uni0487              2.9 (Sans, Sans Condensed) 2.27 (Sans Bold, Sans Bold Oblique, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0488 uni0488              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0489 uni0489              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048a uni048A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048b uni048B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048c uni048C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+048d uni048D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+048e uni048E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+048f uni048F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0490 uni0490              1.15
-U+0491 uni0491              1.15
-U+0492 uni0492              1.14
-U+0493 uni0493              1.14
-U+0494 uni0494              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0495 uni0495              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+0496 uni0496              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0497 uni0497              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.15 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0498 uni0498              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+0499 uni0499              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+049a uni049A              1.14
-U+049b uni049B              1.14
-U+049c uni049C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+049d uni049D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+049e uni049E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+049f uni049F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a0 uni04A0              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04a1 uni04A1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04a2 uni04A2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a3 uni04A3              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a4 uni04A4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04a5 uni04A5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04a6 uni04A6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a7 uni04A7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04a8 uni04A8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04a9 uni04A9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04aa uni04AA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ab uni04AB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ac uni04AC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ad uni04AD              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04ae uni04AE              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04af uni04AF              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04b0 uni04B0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+04b1 uni04B1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+04b2 uni04B2              1.14
-U+04b3 uni04B3              1.14
-U+04b4 uni04B4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04b5 uni04B5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04b6 uni04B6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04b7 uni04B7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04b8 uni04B8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04b9 uni04B9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04ba uni04BA              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04bb uni04BB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04bc uni04BC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04bd uni04BD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04be uni04BE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04bf uni04BF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04c0 uni04C0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04c1 uni04C1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04c2 uni04C2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04c3 uni04C3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04c4 uni04C4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04c5 uni04C5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04c6 uni04C6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04c7 uni04C7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04c8 uni04C8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+04c9 uni04C9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04ca uni04CA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04cb uni04CB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04cc uni04CC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04cd uni04CD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04ce uni04CE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04cf uni04CF              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04d0 uni04D0              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d1 uni04D1              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d2 uni04D2              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d3 uni04D3              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d4 uni04D4              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d5 uni04D5              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d6 uni04D6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d7 uni04D7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04d8 uni04D8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04d9 uni04D9              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04da uni04DA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04db uni04DB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04dc uni04DC              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04dd uni04DD              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04de uni04DE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04df uni04DF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e0 uni04E0              2.3
-U+04e1 uni04E1              2.3
-U+04e2 uni04E2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e3 uni04E3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e4 uni04E4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e5 uni04E5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04e6 uni04E6              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04e7 uni04E7              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04e8 uni04E8              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04e9 uni04E9              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04ea uni04EA              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04eb uni04EB              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+04ec uni04EC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04ed uni04ED              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04ee uni04EE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04ef uni04EF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f0 uni04F0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f1 uni04F1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f2 uni04F2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f3 uni04F3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f4 uni04F4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f5 uni04F5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04f6 uni04F6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f7 uni04F7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f8 uni04F8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+04f9 uni04F9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+04fa uni04FA              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fb uni04FB              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fc uni04FC              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fd uni04FD              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+04fe uni04FE              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+04ff uni04FF              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0500 uni0500              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0501 uni0501              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0502 uni0502              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0503 uni0503              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0504 uni0504              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0505 uni0505              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0506 uni0506              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0507 uni0507              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0508 uni0508              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0509 uni0509              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050a uni050A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050b uni050B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050c uni050C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050d uni050D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050e uni050E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+050f uni050F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0510 uni0510              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0511 uni0511              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0512 uni0512              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0513 uni0513              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0514 uni0514              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0515 uni0515              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0516 uni0516              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0517 uni0517              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0518 uni0518              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0519 uni0519              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+051a uni051A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+051b uni051B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+051c uni051C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+051d uni051D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+0520 uni0520              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0521 uni0521              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0522 uni0522              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0523 uni0523              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0524 uni0524              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0525 uni0525              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0531 uni0531              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0532 uni0532              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0533 uni0533              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0534 uni0534              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0535 uni0535              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0536 uni0536              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0537 uni0537              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0538 uni0538              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0539 uni0539              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053a uni053A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053b uni053B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053c uni053C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053d uni053D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053e uni053E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+053f uni053F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0540 uni0540              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0541 uni0541              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0542 uni0542              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0543 uni0543              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0544 uni0544              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0545 uni0545              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0546 uni0546              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0547 uni0547              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0548 uni0548              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+0549 uni0549              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054a uni054A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054b uni054B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054c uni054C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054d uni054D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+054e uni054E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+054f uni054F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0550 uni0550              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0551 uni0551              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0552 uni0552              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0553 uni0553              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+0554 uni0554              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0555 uni0555              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0556 uni0556              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0559 uni0559              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055a uni055A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+055b uni055B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055c uni055C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055d uni055D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+055e uni055E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+055f uni055F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0561 uni0561              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+0562 uni0562              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0563 uni0563              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0564 uni0564              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0565 uni0565              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0566 uni0566              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0567 uni0567              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0568 uni0568              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0569 uni0569              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+056a uni056A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+056b uni056B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+056c uni056C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+056d uni056D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+056e uni056E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+056f uni056F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0570 uni0570              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0571 uni0571              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0572 uni0572              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0573 uni0573              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0574 uni0574              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0575 uni0575              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0576 uni0576              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0577 uni0577              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0578 uni0578              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0579 uni0579              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+057a uni057A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+057b uni057B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+057c uni057C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+057d uni057D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+057e uni057E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+057f uni057F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0580 uni0580              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0581 uni0581              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0582 uni0582              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0583 uni0583              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+0584 uni0584              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0585 uni0585              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+0586 uni0586              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0587 uni0587              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+0589 uni0589              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight)
-U+058a uni058A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b0 uni05B0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b1 uni05B1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b2 uni05B2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b3 uni05B3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b4 uni05B4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b5 uni05B5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b6 uni05B6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b7 uni05B7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b8 uni05B8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05b9 uni05B9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05ba uni05BA              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+05bb uni05BB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05bc uni05BC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05bd uni05BD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05be uni05BE              2.9 (Sans Condensed Oblique, Sans Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique)
-U+05bf uni05BF              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c0 uni05C0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c1 uni05C1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c2 uni05C2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c3 uni05C3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c6 uni05C6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05c7 uni05C7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d0 uni05D0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d1 uni05D1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d2 uni05D2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d3 uni05D3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d4 uni05D4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d5 uni05D5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d6 uni05D6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d7 uni05D7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d8 uni05D8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05d9 uni05D9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05da uni05DA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05db uni05DB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05dc uni05DC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05dd uni05DD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05de uni05DE              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05df uni05DF              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e0 uni05E0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e1 uni05E1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e2 uni05E2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e3 uni05E3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e4 uni05E4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e5 uni05E5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e6 uni05E6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e7 uni05E7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e8 uni05E8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05e9 uni05E9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05ea uni05EA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f0 uni05F0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f1 uni05F1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f2 uni05F2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+05f3 uni05F3              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+05f4 uni05F4              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0606 uni0606              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+0607 uni0607              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+0609 uni0609              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+060a uni060A              2.26 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold)
-U+060c uni060C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0615 uni0615              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+061b uni061B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+061f uni061F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0621 uni0621              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0622 uni0622              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0623 uni0623              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0624 uni0624              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0625 uni0625              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0626 uni0626              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0627 uni0627              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0628 uni0628              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0629 uni0629              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062a uni062A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062b uni062B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062c uni062C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062d uni062D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062e uni062E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+062f uni062F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0630 uni0630              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0631 uni0631              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0632 uni0632              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0633 uni0633              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0634 uni0634              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0635 uni0635              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0636 uni0636              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0637 uni0637              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0638 uni0638              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0639 uni0639              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+063a uni063A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0640 uni0640              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0641 uni0641              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0642 uni0642              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0643 uni0643              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0644 uni0644              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0645 uni0645              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0646 uni0646              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0647 uni0647              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0648 uni0648              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0649 uni0649              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064a uni064A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064b uni064B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064c uni064C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064d uni064D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064e uni064E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+064f uni064F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0650 uni0650              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0651 uni0651              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0652 uni0652              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0653 uni0653              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0654 uni0654              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0655 uni0655              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+065a uni065A              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0660 uni0660              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0661 uni0661              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0662 uni0662              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0663 uni0663              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0664 uni0664              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0665 uni0665              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0666 uni0666              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0667 uni0667              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0668 uni0668              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0669 uni0669              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066a uni066A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066b uni066B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066c uni066C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066d uni066D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066e uni066E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+066f uni066F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0674 uni0674              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans ExtraLight) 2.16 (Sans Mono, Sans Mono Bold)
-U+0679 uni0679              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067a uni067A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067b uni067B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067c uni067C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067d uni067D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067e uni067E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+067f uni067F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0680 uni0680              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0681 uni0681              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0682 uni0682              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0683 uni0683              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0684 uni0684              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0685 uni0685              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0686 uni0686              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0687 uni0687              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0691 uni0691              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0692 uni0692              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+0695 uni0695              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+0698 uni0698              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06a1 uni06A1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06a4 uni06A4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06a6 uni06A6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+06a9 uni06A9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06af uni06AF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06b5 uni06B5              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06ba uni06BA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06be uni06BE              2.16 (Sans Mono, Sans Mono Bold)
-U+06bf uni06BF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+06c6 uni06C6              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06cc uni06CC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06ce uni06CE              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06d5 uni06D5              2.10 (Sans, Sans Bold) 2.11 (Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f0 uni06F0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f1 uni06F1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f2 uni06F2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f3 uni06F3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f4 uni06F4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f5 uni06F5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f6 uni06F6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f7 uni06F7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f8 uni06F8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+06f9 uni06F9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+07c0 uni07C0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c1 uni07C1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c2 uni07C2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c3 uni07C3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c4 uni07C4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c5 uni07C5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c6 uni07C6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c7 uni07C7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c8 uni07C8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07c9 uni07C9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ca uni07CA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cb uni07CB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cc uni07CC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cd uni07CD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ce uni07CE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07cf uni07CF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d0 uni07D0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d1 uni07D1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d2 uni07D2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d3 uni07D3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d4 uni07D4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d5 uni07D5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d6 uni07D6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d7 uni07D7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d8 uni07D8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07d9 uni07D9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07da uni07DA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07db uni07DB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07dc uni07DC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07dd uni07DD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07de uni07DE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07df uni07DF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e0 uni07E0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e1 uni07E1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e2 uni07E2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e3 uni07E3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e4 uni07E4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e5 uni07E5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e6 uni07E6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07e7 uni07E7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07eb uni07EB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ec uni07EC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ed uni07ED              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ee uni07EE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07ef uni07EF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f0 uni07F0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f1 uni07F1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f2 uni07F2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f3 uni07F3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f4 uni07F4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f5 uni07F5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f8 uni07F8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07f9 uni07F9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+07fa uni07FA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+0e3f uni0E3F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0e81 uni0E81              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e82 uni0E82              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e84 uni0E84              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e87 uni0E87              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e88 uni0E88              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e8a uni0E8A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e8d uni0E8D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e94 uni0E94              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e95 uni0E95              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e96 uni0E96              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e97 uni0E97              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e99 uni0E99              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9a uni0E9A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9b uni0E9B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9c uni0E9C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9d uni0E9D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9e uni0E9E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0e9f uni0E9F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea1 uni0EA1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea2 uni0EA2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea3 uni0EA3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea5 uni0EA5              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ea7 uni0EA7              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eaa uni0EAA              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eab uni0EAB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ead uni0EAD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eae uni0EAE              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eaf uni0EAF              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb0 uni0EB0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb1 uni0EB1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb2 uni0EB2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb3 uni0EB3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb4 uni0EB4              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb5 uni0EB5              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb6 uni0EB6              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb7 uni0EB7              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb8 uni0EB8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eb9 uni0EB9              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ebb uni0EBB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ebc uni0EBC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ebd uni0EBD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec0 uni0EC0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec1 uni0EC1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec2 uni0EC2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec3 uni0EC3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec4 uni0EC4              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec6 uni0EC6              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ec8 uni0EC8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ec9 uni0EC9              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0eca uni0ECA              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ecb uni0ECB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ecc uni0ECC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ecd uni0ECD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+0ed0 uni0ED0              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed1 uni0ED1              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed2 uni0ED2              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed3 uni0ED3              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed4 uni0ED4              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed5 uni0ED5              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed6 uni0ED6              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed7 uni0ED7              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0ed8 uni0ED8              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+0ed9 uni0ED9              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0edc uni0EDC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+0edd uni0EDD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+10a0 uni10A0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a1 uni10A1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a2 uni10A2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a3 uni10A3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a4 uni10A4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a5 uni10A5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a6 uni10A6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a7 uni10A7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a8 uni10A8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10a9 uni10A9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10aa uni10AA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ab uni10AB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ac uni10AC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ad uni10AD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ae uni10AE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10af uni10AF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b0 uni10B0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b1 uni10B1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b2 uni10B2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b3 uni10B3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b4 uni10B4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b5 uni10B5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b6 uni10B6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b7 uni10B7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b8 uni10B8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10b9 uni10B9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ba uni10BA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bb uni10BB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bc uni10BC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bd uni10BD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10be uni10BE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10bf uni10BF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c0 uni10C0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c1 uni10C1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c2 uni10C2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c3 uni10C3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c4 uni10C4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10c5 uni10C5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d0 uni10D0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d1 uni10D1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d2 uni10D2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d3 uni10D3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d4 uni10D4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d5 uni10D5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d6 uni10D6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d7 uni10D7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d8 uni10D8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10d9 uni10D9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10da uni10DA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10db uni10DB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10dc uni10DC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10dd uni10DD              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10de uni10DE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10df uni10DF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e0 uni10E0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e1 uni10E1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e2 uni10E2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e3 uni10E3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e4 uni10E4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e5 uni10E5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e6 uni10E6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e7 uni10E7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e8 uni10E8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10e9 uni10E9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ea uni10EA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10eb uni10EB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ec uni10EC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ed uni10ED              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ee uni10EE              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10ef uni10EF              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f0 uni10F0              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f1 uni10F1              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f2 uni10F2              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f3 uni10F3              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f4 uni10F4              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f5 uni10F5              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f6 uni10F6              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f7 uni10F7              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f8 uni10F8              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10f9 uni10F9              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10fa uni10FA              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10fb uni10FB              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+10fc uni10FC              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Mono, Sans Mono Bold, Serif, Serif Bold, Serif Condensed, Serif Condensed Bold) 2.20 (Sans Bold Oblique, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+1401 uni1401              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1402 uni1402              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1403 uni1403              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1404 uni1404              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1405 uni1405              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1406 uni1406              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1407 uni1407              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1409 uni1409              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140a uni140A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140b uni140B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140c uni140C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140d uni140D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140e uni140E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+140f uni140F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1410 uni1410              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1411 uni1411              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1412 uni1412              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1413 uni1413              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1414 uni1414              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1415 uni1415              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1416 uni1416              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1417 uni1417              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1418 uni1418              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1419 uni1419              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141a uni141A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141b uni141B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141d uni141D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141e uni141E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+141f uni141F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1420 uni1420              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1421 uni1421              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1422 uni1422              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1423 uni1423              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1424 uni1424              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1425 uni1425              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1426 uni1426              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1427 uni1427              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1428 uni1428              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1429 uni1429              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142a uni142A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142b uni142B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142c uni142C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142d uni142D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142e uni142E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+142f uni142F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1430 uni1430              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1431 uni1431              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1432 uni1432              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1433 uni1433              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1434 uni1434              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1435 uni1435              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1437 uni1437              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1438 uni1438              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1439 uni1439              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143a uni143A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143b uni143B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143c uni143C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143d uni143D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143e uni143E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+143f uni143F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1440 uni1440              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1441 uni1441              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1442 uni1442              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1443 uni1443              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1444 uni1444              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1445 uni1445              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1446 uni1446              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1447 uni1447              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1448 uni1448              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1449 uni1449              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144a uni144A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144c uni144C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144d uni144D              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144e uni144E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+144f uni144F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1450 uni1450              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1451 uni1451              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1452 uni1452              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1454 uni1454              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1455 uni1455              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1456 uni1456              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1457 uni1457              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1458 uni1458              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1459 uni1459              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145a uni145A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145b uni145B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145c uni145C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145d uni145D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145e uni145E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+145f uni145F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1460 uni1460              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1461 uni1461              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1462 uni1462              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1463 uni1463              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1464 uni1464              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1465 uni1465              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1466 uni1466              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1467 uni1467              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1468 uni1468              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1469 uni1469              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146a uni146A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146b uni146B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146c uni146C              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146d uni146D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146e uni146E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+146f uni146F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1470 uni1470              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1471 uni1471              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1472 uni1472              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1473 uni1473              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1474 uni1474              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1475 uni1475              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1476 uni1476              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1477 uni1477              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1478 uni1478              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1479 uni1479              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147a uni147A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147b uni147B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147c uni147C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147d uni147D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147e uni147E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+147f uni147F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1480 uni1480              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1481 uni1481              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1482 uni1482              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1483 uni1483              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1484 uni1484              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1485 uni1485              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1486 uni1486              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1487 uni1487              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1488 uni1488              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1489 uni1489              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148a uni148A              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148b uni148B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148c uni148C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148d uni148D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148e uni148E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+148f uni148F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1490 uni1490              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1491 uni1491              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1492 uni1492              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1493 uni1493              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1494 uni1494              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1495 uni1495              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1496 uni1496              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1497 uni1497              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1498 uni1498              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1499 uni1499              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149a uni149A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149b uni149B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149c uni149C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149d uni149D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149e uni149E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+149f uni149F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a0 uni14A0              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a1 uni14A1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a2 uni14A2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a3 uni14A3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a4 uni14A4              2.13 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.15 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+14a5 uni14A5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a6 uni14A6              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a7 uni14A7              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a8 uni14A8              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14a9 uni14A9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14aa uni14AA              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ab uni14AB              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ac uni14AC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ad uni14AD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ae uni14AE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14af uni14AF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b0 uni14B0              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b1 uni14B1              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b2 uni14B2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b3 uni14B3              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b4 uni14B4              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b5 uni14B5              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b6 uni14B6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b7 uni14B7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b8 uni14B8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14b9 uni14B9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ba uni14BA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14bb uni14BB              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14bc uni14BC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14bd uni14BD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c0 uni14C0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c1 uni14C1              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c2 uni14C2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c3 uni14C3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c4 uni14C4              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c5 uni14C5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c6 uni14C6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c7 uni14C7              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c8 uni14C8              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14c9 uni14C9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ca uni14CA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cb uni14CB              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cc uni14CC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cd uni14CD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ce uni14CE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14cf uni14CF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d0 uni14D0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d1 uni14D1              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d2 uni14D2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d3 uni14D3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d4 uni14D4              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d5 uni14D5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d6 uni14D6              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d7 uni14D7              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d8 uni14D8              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14d9 uni14D9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14da uni14DA              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14db uni14DB              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14dc uni14DC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14dd uni14DD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14de uni14DE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14df uni14DF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e0 uni14E0              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e1 uni14E1              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e2 uni14E2              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e3 uni14E3              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e4 uni14E4              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e5 uni14E5              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e6 uni14E6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e7 uni14E7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e8 uni14E8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14e9 uni14E9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ea uni14EA              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ec uni14EC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ed uni14ED              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ee uni14EE              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ef uni14EF              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f0 uni14F0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f1 uni14F1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f2 uni14F2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f3 uni14F3              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f4 uni14F4              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f5 uni14F5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f6 uni14F6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f7 uni14F7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f8 uni14F8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14f9 uni14F9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fa uni14FA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fb uni14FB              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fc uni14FC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fd uni14FD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14fe uni14FE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+14ff uni14FF              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1500 uni1500              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1501 uni1501              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1502 uni1502              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1503 uni1503              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1504 uni1504              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1505 uni1505              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1506 uni1506              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1507 uni1507              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1510 uni1510              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1511 uni1511              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1512 uni1512              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1513 uni1513              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1514 uni1514              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1515 uni1515              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1516 uni1516              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1517 uni1517              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1518 uni1518              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1519 uni1519              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151a uni151A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151b uni151B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151c uni151C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151d uni151D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151e uni151E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+151f uni151F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1520 uni1520              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1521 uni1521              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1522 uni1522              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1523 uni1523              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1524 uni1524              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1525 uni1525              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1526 uni1526              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1527 uni1527              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1528 uni1528              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1529 uni1529              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152a uni152A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152b uni152B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152c uni152C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152d uni152D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152e uni152E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+152f uni152F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1530 uni1530              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1531 uni1531              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1532 uni1532              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1533 uni1533              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1534 uni1534              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1535 uni1535              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1536 uni1536              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1537 uni1537              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1538 uni1538              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1539 uni1539              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153a uni153A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153b uni153B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153c uni153C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153d uni153D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+153e uni153E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1540 uni1540              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1541 uni1541              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1542 uni1542              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1543 uni1543              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1544 uni1544              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1545 uni1545              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1546 uni1546              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1547 uni1547              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1548 uni1548              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1549 uni1549              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154a uni154A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154b uni154B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154c uni154C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154d uni154D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154e uni154E              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+154f uni154F              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1550 uni1550              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1552 uni1552              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1553 uni1553              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1554 uni1554              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1555 uni1555              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1556 uni1556              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1557 uni1557              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1558 uni1558              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1559 uni1559              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155a uni155A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155b uni155B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155c uni155C              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155d uni155D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155e uni155E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+155f uni155F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1560 uni1560              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1561 uni1561              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1562 uni1562              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1563 uni1563              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1564 uni1564              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1565 uni1565              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1566 uni1566              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1567 uni1567              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1568 uni1568              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1569 uni1569              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+156a uni156A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1574 uni1574              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1575 uni1575              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1576 uni1576              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1577 uni1577              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1578 uni1578              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1579 uni1579              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157a uni157A              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157b uni157B              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157c uni157C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157d uni157D              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157e uni157E              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+157f uni157F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1580 uni1580              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1581 uni1581              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1582 uni1582              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1583 uni1583              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1584 uni1584              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1585 uni1585              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158a uni158A              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158b uni158B              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158c uni158C              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158d uni158D              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158e uni158E              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+158f uni158F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1590 uni1590              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1591 uni1591              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1592 uni1592              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1593 uni1593              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1594 uni1594              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1595 uni1595              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1596 uni1596              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a0 uni15A0              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a1 uni15A1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a2 uni15A2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a3 uni15A3              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a4 uni15A4              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a5 uni15A5              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a6 uni15A6              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a7 uni15A7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a8 uni15A8              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15a9 uni15A9              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15aa uni15AA              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ab uni15AB              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ac uni15AC              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ad uni15AD              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15ae uni15AE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15af uni15AF              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15de uni15DE              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+15e1 uni15E1              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1646 uni1646              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1647 uni1647              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+166e uni166E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+166f uni166F              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1670 uni1670              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1671 uni1671              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1672 uni1672              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1673 uni1673              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1674 uni1674              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1675 uni1675              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1676 uni1676              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1680 uni1680              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1681 uni1681              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1682 uni1682              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1683 uni1683              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1684 uni1684              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1685 uni1685              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1686 uni1686              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1687 uni1687              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1688 uni1688              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1689 uni1689              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168a uni168A              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168b uni168B              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168c uni168C              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168d uni168D              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168e uni168E              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+168f uni168F              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1690 uni1690              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1691 uni1691              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1692 uni1692              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1693 uni1693              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1694 uni1694              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1695 uni1695              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1696 uni1696              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1697 uni1697              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1698 uni1698              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1699 uni1699              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+169a uni169A              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+169b uni169B              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+169c uni169C              2.22 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.28 (Sans ExtraLight)
-U+1d00 uni1D00              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d01 uni1D01              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d02 uni1D02              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d03 uni1D03              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d04 uni1D04              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d05 uni1D05              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d06 uni1D06              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d07 uni1D07              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d08 uni1D08              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+1d09 uni1D09              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d0a uni1D0A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d0b uni1D0B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d0c uni1D0C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d0d uni1D0D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d0e uni1D0E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d0f uni1D0F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d10 uni1D10              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d11 uni1D11              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d12 uni1D12              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d13 uni1D13              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d14 uni1D14              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d16 uni1D16              2.3
-U+1d17 uni1D17              2.3
-U+1d18 uni1D18              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d19 uni1D19              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+1d1a uni1D1A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+1d1b uni1D1B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d1c uni1D1C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d1d uni1D1D              2.3
-U+1d1e uni1D1E              2.3
-U+1d1f uni1D1F              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+1d20 uni1D20              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d21 uni1D21              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d22 uni1D22              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d23 uni1D23              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d26 uni1D26              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d27 uni1D27              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d28 uni1D28              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+1d29 uni1D29              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d2a uni1D2A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d2b uni1D2B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans ExtraLight)
-U+1d2c uni1D2C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d2d uni1D2D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d2e uni1D2E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d30 uni1D30              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d31 uni1D31              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d32 uni1D32              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d33 uni1D33              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d34 uni1D34              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d35 uni1D35              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d36 uni1D36              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d37 uni1D37              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d38 uni1D38              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d39 uni1D39              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3a uni1D3A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3b uni1D3B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3c uni1D3C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3d uni1D3D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono Oblique)
-U+1d3e uni1D3E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d3f uni1D3F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d40 uni1D40              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d41 uni1D41              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d42 uni1D42              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d43 uni1D43              2.3
-U+1d44 uni1D44              2.3
-U+1d45 uni1D45              2.3
-U+1d46 uni1D46              2.3
-U+1d47 uni1D47              2.3
-U+1d48 uni1D48              2.3
-U+1d49 uni1D49              2.3
-U+1d4a uni1D4A              2.3
-U+1d4b uni1D4B              2.3
-U+1d4c uni1D4C              2.3
-U+1d4d uni1D4D              2.3
-U+1d4e uni1D4E              2.3
-U+1d4f uni1D4F              2.3
-U+1d50 uni1D50              2.3
-U+1d51 uni1D51              2.3
-U+1d52 uni1D52              2.3
-U+1d53 uni1D53              2.3
-U+1d54 uni1D54              2.3
-U+1d55 uni1D55              2.3
-U+1d56 uni1D56              2.3
-U+1d57 uni1D57              2.3
-U+1d58 uni1D58              2.3
-U+1d59 uni1D59              2.3
-U+1d5a uni1D5A              2.3
-U+1d5b uni1D5B              2.3
-U+1d5d uni1D5D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d5e uni1D5E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d5f uni1D5F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d60 uni1D60              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d61 uni1D61              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d62 uni1D62              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d63 uni1D63              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d64 uni1D64              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d65 uni1D65              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d66 uni1D66              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d67 uni1D67              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d68 uni1D68              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d69 uni1D69              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d6a uni1D6A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1d77 uni1D77              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1d78 uni1D78              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1d7b uni1D7B              2.3
-U+1d85 uni1D85              2.3
-U+1d9b uni1D9B              2.3
-U+1d9c uni1D9C              2.3
-U+1d9d uni1D9D              2.3
-U+1d9e uni1D9E              2.3
-U+1d9f uni1D9F              2.3
-U+1da0 uni1DA0              2.3
-U+1da1 uni1DA1              2.3
-U+1da2 uni1DA2              2.3
-U+1da3 uni1DA3              2.3
-U+1da4 uni1DA4              2.3
-U+1da5 uni1DA5              2.3
-U+1da6 uni1DA6              2.3
-U+1da7 uni1DA7              2.3
-U+1da8 uni1DA8              2.3
-U+1da9 uni1DA9              2.3
-U+1daa uni1DAA              2.3
-U+1dab uni1DAB              2.3
-U+1dac uni1DAC              2.3
-U+1dad uni1DAD              2.3
-U+1dae uni1DAE              2.3
-U+1daf uni1DAF              2.3
-U+1db0 uni1DB0              2.3
-U+1db1 uni1DB1              2.3
-U+1db2 uni1DB2              2.3
-U+1db3 uni1DB3              2.3
-U+1db4 uni1DB4              2.3
-U+1db5 uni1DB5              2.3
-U+1db6 uni1DB6              2.3
-U+1db7 uni1DB7              2.3
-U+1db8 uni1DB8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+1db9 uni1DB9              2.3
-U+1dba uni1DBA              2.3
-U+1dbb uni1DBB              2.3
-U+1dbc uni1DBC              2.3
-U+1dbd uni1DBD              2.3
-U+1dbe uni1DBE              2.3
-U+1dbf uni1DBF              2.3
-U+1dc4 uni1DC4              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc5 uni1DC5              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc6 uni1DC6              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc7 uni1DC7              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc8 uni1DC8              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1dc9 uni1DC9              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e00 uni1E00              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e01 uni1E01              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e02 uni1E02              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e03 uni1E03              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e04 uni1E04              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e05 uni1E05              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e06 uni1E06              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e07 uni1E07              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e08 uni1E08              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e09 uni1E09              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0a uni1E0A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0b uni1E0B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0c uni1E0C              2.1
-U+1e0d uni1E0D              2.1
-U+1e0e uni1E0E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e0f uni1E0F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e10 uni1E10              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e11 uni1E11              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e12 uni1E12              1.13
-U+1e13 uni1E13              1.13
-U+1e14 uni1E14              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e15 uni1E15              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e16 uni1E16              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e17 uni1E17              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e18 uni1E18              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e19 uni1E19              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1a uni1E1A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1b uni1E1B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1c uni1E1C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1e1d uni1E1D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+1e1e uni1E1E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e1f uni1E1F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e20 uni1E20              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e21 uni1E21              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e22 uni1E22              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e23 uni1E23              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e24 uni1E24              2.1
-U+1e25 uni1E25              2.1
-U+1e26 uni1E26              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e27 uni1E27              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e28 uni1E28              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e29 uni1E29              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2a uni1E2A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2b uni1E2B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2c uni1E2C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2d uni1E2D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e2e uni1E2E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e2f uni1E2F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e30 uni1E30              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e31 uni1E31              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e32 uni1E32              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e33 uni1E33              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e34 uni1E34              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e35 uni1E35              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e36 uni1E36              2.1
-U+1e37 uni1E37              2.1
-U+1e38 uni1E38              2.1
-U+1e39 uni1E39              2.1
-U+1e3a uni1E3A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e3b uni1E3B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e3c uni1E3C              1.13
-U+1e3d uni1E3D              1.13
-U+1e3e uni1E3E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e3f uni1E3F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e40 uni1E40              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e41 uni1E41              2.1
-U+1e42 uni1E42              2.1
-U+1e43 uni1E43              2.1
-U+1e44 uni1E44              1.13
-U+1e45 uni1E45              1.13
-U+1e46 uni1E46              2.1
-U+1e47 uni1E47              2.1
-U+1e48 uni1E48              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e49 uni1E49              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e4a uni1E4A              1.13
-U+1e4b uni1E4B              1.13
-U+1e4c uni1E4C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e4d uni1E4D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e4e uni1E4E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e4f uni1E4F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e50 uni1E50              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e51 uni1E51              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e52 uni1E52              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e53 uni1E53              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e54 uni1E54              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e55 uni1E55              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e56 uni1E56              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e57 uni1E57              2.1
-U+1e58 uni1E58              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e59 uni1E59              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e5a uni1E5A              2.1
-U+1e5b uni1E5B              2.1
-U+1e5c uni1E5C              2.1
-U+1e5d uni1E5D              2.1
-U+1e5e uni1E5E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e5f uni1E5F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e60 uni1E60              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e61 uni1E61              2.1
-U+1e62 uni1E62              2.1
-U+1e63 uni1E63              2.1
-U+1e64 uni1E64              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+1e65 uni1E65              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+1e66 uni1E66              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e67 uni1E67              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1e68 uni1E68              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e69 uni1E69              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6a uni1E6A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6b uni1E6B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6c uni1E6C              2.1
-U+1e6d uni1E6D              2.1
-U+1e6e uni1E6E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e6f uni1E6F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e70 uni1E70              1.13
-U+1e71 uni1E71              1.13
-U+1e72 uni1E72              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e73 uni1E73              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e74 uni1E74              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e75 uni1E75              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e76 uni1E76              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e77 uni1E77              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e78 uni1E78              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e79 uni1E79              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e7a uni1E7A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e7b uni1E7B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e7c uni1E7C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e7d uni1E7D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e7e uni1E7E              2.1
-U+1e7f uni1E7F              2.1
-U+1e80 Wgrave               1.2
-U+1e81 wgrave               1.2
-U+1e82 Wacute               1.2
-U+1e83 wacute               1.2
-U+1e84 Wdieresis            1.2
-U+1e85 wdieresis            1.2
-U+1e86 uni1E86              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e87 uni1E87              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e88 uni1E88              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e89 uni1E89              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8a uni1E8A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8b uni1E8B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8c uni1E8C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e8d uni1E8D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e8e uni1E8E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e8f uni1E8F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e90 uni1E90              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e91 uni1E91              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e92 uni1E92              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e93 uni1E93              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e94 uni1E94              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e95 uni1E95              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e96 uni1E96              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e97 uni1E97              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e98 uni1E98              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e99 uni1E99              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1e9a uni1E9A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1e9b uni1E9B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1e9e uni1E9E              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1e9f uni1E9F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+1ea0 uni1EA0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ea1 uni1EA1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ea2 uni1EA2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ea3 uni1EA3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ea4 uni1EA4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea5 uni1EA5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea6 uni1EA6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea7 uni1EA7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea8 uni1EA8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ea9 uni1EA9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eaa uni1EAA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eab uni1EAB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eac uni1EAC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ead uni1EAD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eae uni1EAE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eaf uni1EAF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb0 uni1EB0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1eb1 uni1EB1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.22 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1eb2 uni1EB2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb3 uni1EB3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb4 uni1EB4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb5 uni1EB5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eb6 uni1EB6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eb7 uni1EB7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eb8 uni1EB8              2.2
-U+1eb9 uni1EB9              2.2
-U+1eba uni1EBA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ebb uni1EBB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ebc uni1EBC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ebd uni1EBD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ebe uni1EBE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ebf uni1EBF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec0 uni1EC0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec1 uni1EC1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec2 uni1EC2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec3 uni1EC3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec4 uni1EC4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec5 uni1EC5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ec6 uni1EC6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ec7 uni1EC7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ec8 uni1EC8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ec9 uni1EC9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1eca uni1ECA              2.2
-U+1ecb uni1ECB              2.2
-U+1ecc uni1ECC              2.2
-U+1ecd uni1ECD              2.2
-U+1ece uni1ECE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ecf uni1ECF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ed0 uni1ED0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed1 uni1ED1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed2 uni1ED2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed3 uni1ED3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed4 uni1ED4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed5 uni1ED5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed6 uni1ED6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed7 uni1ED7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ed8 uni1ED8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ed9 uni1ED9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eda uni1EDA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1edb uni1EDB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1edc uni1EDC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1edd uni1EDD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ede uni1EDE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1edf uni1EDF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1ee0 uni1EE0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee1 uni1EE1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee2 uni1EE2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee3 uni1EE3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee4 uni1EE4              2.2
-U+1ee5 uni1EE5              2.2
-U+1ee6 uni1EE6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ee7 uni1EE7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ee8 uni1EE8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ee9 uni1EE9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eea uni1EEA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eeb uni1EEB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eec uni1EEC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eed uni1EED              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+1eee uni1EEE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1eef uni1EEF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ef0 uni1EF0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ef1 uni1EF1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+1ef2 Ygrave               1.2
-U+1ef3 ygrave               1.2
-U+1ef4 uni1EF4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ef5 uni1EF5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ef6 uni1EF6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ef7 uni1EF7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ef8 uni1EF8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ef9 uni1EF9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f00 uni1F00              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f01 uni1F01              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f02 uni1F02              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f03 uni1F03              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f04 uni1F04              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f05 uni1F05              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f06 uni1F06              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f07 uni1F07              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f08 uni1F08              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f09 uni1F09              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0a uni1F0A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0b uni1F0B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0c uni1F0C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0d uni1F0D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0e uni1F0E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f0f uni1F0F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f10 uni1F10              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f11 uni1F11              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f12 uni1F12              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f13 uni1F13              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f14 uni1F14              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f15 uni1F15              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f18 uni1F18              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f19 uni1F19              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1a uni1F1A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1b uni1F1B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1c uni1F1C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f1d uni1F1D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f20 uni1F20              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f21 uni1F21              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f22 uni1F22              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f23 uni1F23              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f24 uni1F24              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f25 uni1F25              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f26 uni1F26              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f27 uni1F27              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f28 uni1F28              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f29 uni1F29              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2a uni1F2A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2b uni1F2B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2c uni1F2C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2d uni1F2D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2e uni1F2E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f2f uni1F2F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f30 uni1F30              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f31 uni1F31              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f32 uni1F32              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f33 uni1F33              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f34 uni1F34              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f35 uni1F35              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f36 uni1F36              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f37 uni1F37              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f38 uni1F38              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f39 uni1F39              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3a uni1F3A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3b uni1F3B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3c uni1F3C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3d uni1F3D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3e uni1F3E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f3f uni1F3F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f40 uni1F40              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f41 uni1F41              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f42 uni1F42              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f43 uni1F43              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f44 uni1F44              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f45 uni1F45              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f48 uni1F48              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f49 uni1F49              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4a uni1F4A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4b uni1F4B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4c uni1F4C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f4d uni1F4D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f50 uni1F50              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f51 uni1F51              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f52 uni1F52              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f53 uni1F53              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f54 uni1F54              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f55 uni1F55              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f56 uni1F56              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f57 uni1F57              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f59 uni1F59              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f5b uni1F5B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f5d uni1F5D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f5f uni1F5F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f60 uni1F60              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f61 uni1F61              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f62 uni1F62              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f63 uni1F63              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f64 uni1F64              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f65 uni1F65              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f66 uni1F66              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f67 uni1F67              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f68 uni1F68              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f69 uni1F69              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6a uni1F6A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6b uni1F6B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6c uni1F6C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6d uni1F6D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6e uni1F6E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f6f uni1F6F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f70 uni1F70              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f71 uni1F71              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f72 uni1F72              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f73 uni1F73              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f74 uni1F74              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f75 uni1F75              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f76 uni1F76              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f77 uni1F77              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f78 uni1F78              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f79 uni1F79              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1f7a uni1F7A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f7b uni1F7B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f7c uni1F7C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f7d uni1F7D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f80 uni1F80              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f81 uni1F81              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f82 uni1F82              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f83 uni1F83              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f84 uni1F84              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f85 uni1F85              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f86 uni1F86              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f87 uni1F87              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f88 uni1F88              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f89 uni1F89              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8a uni1F8A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8b uni1F8B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8c uni1F8C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8d uni1F8D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8e uni1F8E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f8f uni1F8F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f90 uni1F90              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f91 uni1F91              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f92 uni1F92              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f93 uni1F93              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f94 uni1F94              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f95 uni1F95              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f96 uni1F96              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f97 uni1F97              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f98 uni1F98              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f99 uni1F99              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9a uni1F9A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9b uni1F9B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9c uni1F9C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9d uni1F9D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9e uni1F9E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1f9f uni1F9F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa0 uni1FA0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa1 uni1FA1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa2 uni1FA2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa3 uni1FA3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa4 uni1FA4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa5 uni1FA5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa6 uni1FA6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa7 uni1FA7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa8 uni1FA8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fa9 uni1FA9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1faa uni1FAA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fab uni1FAB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fac uni1FAC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fad uni1FAD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fae uni1FAE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1faf uni1FAF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb0 uni1FB0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb1 uni1FB1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb2 uni1FB2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb3 uni1FB3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb4 uni1FB4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb6 uni1FB6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb7 uni1FB7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fb8 uni1FB8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fb9 uni1FB9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fba uni1FBA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fbb uni1FBB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fbc uni1FBC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fbd uni1FBD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fbe uni1FBE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fbf uni1FBF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc0 uni1FC0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc1 uni1FC1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc2 uni1FC2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc3 uni1FC3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc4 uni1FC4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc6 uni1FC6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc7 uni1FC7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fc8 uni1FC8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fc9 uni1FC9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fca uni1FCA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fcb uni1FCB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fcc uni1FCC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fcd uni1FCD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fce uni1FCE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fcf uni1FCF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd0 uni1FD0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd1 uni1FD1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd2 uni1FD2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd3 uni1FD3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd6 uni1FD6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd7 uni1FD7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fd8 uni1FD8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fd9 uni1FD9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fda uni1FDA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fdb uni1FDB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fdd uni1FDD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fde uni1FDE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fdf uni1FDF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe0 uni1FE0              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe1 uni1FE1              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe2 uni1FE2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe3 uni1FE3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe4 uni1FE4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe5 uni1FE5              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe6 uni1FE6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe7 uni1FE7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fe8 uni1FE8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fe9 uni1FE9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fea uni1FEA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1feb uni1FEB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fec uni1FEC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1fed uni1FED              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fee uni1FEE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1fef uni1FEF              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ff2 uni1FF2              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff3 uni1FF3              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff4 uni1FF4              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff6 uni1FF6              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff7 uni1FF7              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ff8 uni1FF8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ff9 uni1FF9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ffa uni1FFA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ffb uni1FFB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.10 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ffc uni1FFC              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+1ffd uni1FFD              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+1ffe uni1FFE              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.5 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+2000 uni2000              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2001 uni2001              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2002 uni2002              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2003 uni2003              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2004 uni2004              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2005 uni2005              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2006 uni2006              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2007 uni2007              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2008 uni2008              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2009 uni2009              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+200a uni200A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+200b uni200B              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200c uni200C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200d uni200D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200e uni200E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+200f uni200F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.8 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2010 uni2010              1.5
-U+2011 uni2011              1.5
-U+2012 figuredash           1.5
-U+2013 endash               original
-U+2014 emdash               original
-U+2015 uni2015              1.5
-U+2016 uni2016              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2017 underscoredbl        2.3
-U+2018 quoteleft            original
-U+2019 quoteright           original
-U+201a quotesinglbase       original
-U+201b quotereversed        2.3
-U+201c quotedblleft         original
-U+201d quotedblright        original
-U+201e quotedblbase         original
-U+201f uni201F              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.3 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+2020 dagger               original
-U+2021 daggerdbl            original
-U+2022 bullet               original
-U+2023 uni2023              2.2
-U+2024 onedotenleader       2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2025 twodotenleader       2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2026 ellipsis             original
-U+2027 uni2027              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+202a uni202A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202b uni202B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202c uni202C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202d uni202D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202e uni202E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+202f uni202F              2.11 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.23 (Serif Italic Condensed)
-U+2030 perthousand          original
-U+2031 uni2031              2.1
-U+2032 minute               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2033 second               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2034 uni2034              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2035 uni2035              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2036 uni2036              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2037 uni2037              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2038 uni2038              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2039 guilsinglleft        original
-U+203a guilsinglright       original
-U+203b uni203B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+203c exclamdbl            2.0
-U+203d uni203D              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.11 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.14 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+203e uni203E              2.3
-U+203f uni203F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2040 uni2040              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2041 uni2041              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2042 uni2042              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2043 uni2043              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2044 fraction             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2045 uni2045              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2046 uni2046              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2047 uni2047              2.0
-U+2048 uni2048              2.0
-U+2049 uni2049              2.0
-U+204a uni204A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+204b uni204B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204c uni204C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204d uni204D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204e uni204E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+204f uni204F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2050 uni2050              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2051 uni2051              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2052 uni2052              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2053 uni2053              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2054 uni2054              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2055 uni2055              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2056 uni2056              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2057 uni2057              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2058 uni2058              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2059 uni2059              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205a uni205A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205b uni205B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205c uni205C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205d uni205D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205e uni205E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+205f uni205F              2.14
-U+2060 uni2060              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2061 uni2061              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2062 uni2062              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2063 uni2063              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2064 uni2064              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+206a uni206A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206b uni206B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206c uni206C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206d uni206D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206e uni206E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+206f uni206F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2070 uni2070              2.2
-U+2071 uni2071              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2074 uni2074              2.2
-U+2075 uni2075              2.2
-U+2076 uni2076              2.2
-U+2077 uni2077              2.2
-U+2078 uni2078              2.2
-U+2079 uni2079              2.2
-U+207a uni207A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207b uni207B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207c uni207C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207d uni207D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207e uni207E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+207f uni207F              1.14
-U+2080 uni2080              2.4
-U+2081 uni2081              2.4
-U+2082 uni2082              2.4
-U+2083 uni2083              2.4
-U+2084 uni2084              2.4
-U+2085 uni2085              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2086 uni2086              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2087 uni2087              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2088 uni2088              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2089 uni2089              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+208a uni208A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208b uni208B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208c uni208C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208d uni208D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+208e uni208E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2090 uni2090              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2091 uni2091              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2092 uni2092              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2093 uni2093              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2094 uni2094              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.17 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.18 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+20a0 uni20A0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a1 colonmonetary        2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a2 uni20A2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a3 franc                2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a4 lira                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a5 uni20A5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a6 uni20A6              2.3
-U+20a7 peseta               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a8 uni20A8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20a9 uni20A9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20aa uni20AA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20ab dong                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20ac Euro                 original
-U+20ad uni20AD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20ae uni20AE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20af uni20AF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b0 uni20B0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b1 uni20B1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+20b2 uni20B2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b3 uni20B3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+20b4 uni20B4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+20b5 uni20B5              2.2
-U+20d0 uni20D0              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+20d1 uni20D1              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+20d6 uni20D6              2.8 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20d7 uni20D7              2.8 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20db uni20DB              2.23 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20dc uni20DC              2.23 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+20e1 uni20E1              2.23 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2100 uni2100              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2101 uni2101              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2102 uni2102              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.16 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Condensed)
-U+2103 uni2103              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2104 uni2104              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2105 uni2105              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2106 uni2106              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2107 uni2107              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2108 uni2108              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2109 uni2109              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+210b uni210B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+210c uni210C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+210d uni210D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+210e uni210E              2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.23 (Serif Italic Condensed) 2.26 (Sans ExtraLight)
-U+210f uni210F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.28 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2110 uni2110              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2111 Ifraktur             2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2112 uni2112              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2113 uni2113              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2114 uni2114              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2115 uni2115              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2116 uni2116              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2117 uni2117              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2118 weierstrass          2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2119 uni2119              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+211a uni211A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+211b uni211B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+211c Rfraktur             2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+211d uni211D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+211e prescription         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+211f uni211F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2120 uni2120              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2121 uni2121              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2122 trademark            original
-U+2123 uni2123              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2124 uni2124              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2125 uni2125              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2126 uni2126              2.2
-U+2127 uni2127              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2128 uni2128              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2129 uni2129              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+212a uni212A              2.2
-U+212b uni212B              2.2
-U+212c uni212C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+212d uni212D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+212e estimated            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+212f uni212F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2130 uni2130              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2131 uni2131              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2132 uni2132              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight)
-U+2133 uni2133              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2134 uni2134              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2135 aleph                2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2136 uni2136              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2137 uni2137              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2138 uni2138              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2139 uni2139              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+213a uni213A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+213b uni213B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+213c uni213C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+213d uni213D              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+213e uni213E              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+213f uni213F              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2140 uni2140              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2141 uni2141              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2142 uni2142              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2143 uni2143              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2144 uni2144              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2145 uni2145              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2146 uni2146              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2147 uni2147              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2148 uni2148              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+2149 uni2149              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.22 (Serif, Serif Condensed)
-U+214b uni214B              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+214e uni214E              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2153 onethird             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2154 twothirds            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2155 uni2155              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2156 uni2156              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2157 uni2157              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2158 uni2158              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2159 uni2159              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215a uni215A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215b oneeighth            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215c threeeighths         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215d fiveeighths          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215e seveneighths         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+215f uni215F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.6 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2160 uni2160              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2161 uni2161              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2162 uni2162              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2163 uni2163              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2164 uni2164              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2165 uni2165              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2166 uni2166              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2167 uni2167              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2168 uni2168              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2169 uni2169              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216a uni216A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216b uni216B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216c uni216C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216d uni216D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216e uni216E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+216f uni216F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2170 uni2170              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2171 uni2171              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2172 uni2172              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2173 uni2173              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2174 uni2174              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2175 uni2175              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2176 uni2176              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2177 uni2177              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2178 uni2178              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2179 uni2179              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217a uni217A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217b uni217B              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217c uni217C              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217d uni217D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217e uni217E              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+217f uni217F              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2180 uni2180              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2181 uni2181              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2182 uni2182              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2183 uni2183              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2184 uni2184              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2190 arrowleft            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2191 arrowup              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2192 arrowright           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2193 arrowdown            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2194 arrowboth            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2195 arrowupdn            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2196 uni2196              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2197 uni2197              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2198 uni2198              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2199 uni2199              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219a uni219A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219b uni219B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219c uni219C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219d uni219D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219e uni219E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+219f uni219F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a0 uni21A0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a1 uni21A1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a2 uni21A2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a3 uni21A3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a4 uni21A4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a5 uni21A5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a6 uni21A6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a7 uni21A7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a8 arrowupdnbse         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21a9 uni21A9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21aa uni21AA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ab uni21AB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ac uni21AC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ad uni21AD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ae uni21AE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21af uni21AF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b0 uni21B0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b1 uni21B1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b2 uni21B2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b3 uni21B3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b4 uni21B4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b5 carriagereturn       2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b6 uni21B6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b7 uni21B7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b8 uni21B8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21b9 uni21B9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ba uni21BA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bb uni21BB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bc uni21BC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bd uni21BD              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21be uni21BE              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21bf uni21BF              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c0 uni21C0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c1 uni21C1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c2 uni21C2              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c3 uni21C3              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c4 uni21C4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c5 uni21C5              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c6 uni21C6              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c7 uni21C7              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c8 uni21C8              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21c9 uni21C9              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ca uni21CA              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cb uni21CB              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cc uni21CC              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cd uni21CD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ce uni21CE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21cf uni21CF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d0 arrowdblleft         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d1 arrowdblup           2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d2 arrowdblright        2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d3 arrowdbldown         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d4 arrowdblboth         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d5 uni21D5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d6 uni21D6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d7 uni21D7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d8 uni21D8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21d9 uni21D9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21da uni21DA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21db uni21DB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21dc uni21DC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21dd uni21DD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21de uni21DE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21df uni21DF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e0 uni21E0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e1 uni21E1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e2 uni21E2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e3 uni21E3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e4 uni21E4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e5 uni21E5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e6 uni21E6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e7 uni21E7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e8 uni21E8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21e9 uni21E9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ea uni21EA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21eb uni21EB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ec uni21EC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ed uni21ED              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ee uni21EE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ef uni21EF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f0 uni21F0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f1 uni21F1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f2 uni21F2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f3 uni21F3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f4 uni21F4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f5 uni21F5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f6 uni21F6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f7 uni21F7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f8 uni21F8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21f9 uni21F9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fa uni21FA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fb uni21FB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fc uni21FC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fd uni21FD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21fe uni21FE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+21ff uni21FF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2200 universal            2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2201 uni2201              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2202 partialdiff          original
-U+2203 existential          2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans ExtraLight) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2204 uni2204              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2205 emptyset             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2206 Delta                original
-U+2207 gradient             2.1
-U+2208 element              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2209 notelement           2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+220a uni220A              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+220b suchthat             2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+220c uni220C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+220d uni220D              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+220e uni220E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+220f product              original
-U+2210 uni2210              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2211 summation            original
-U+2212 minus                original
-U+2213 uni2213              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2214 uni2214              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2215 uni2215              original
-U+2216 uni2216              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2217 asteriskmath         2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2218 uni2218              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2219 uni2219              original
-U+221a radical              original
-U+221b uni221B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+221c uni221C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed) 2.26 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+221d proportional         2.1
-U+221e infinity             original
-U+221f orthogonal           2.1
-U+2220 angle                2.3
-U+2221 uni2221              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2222 uni2222              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2223 uni2223              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2224 uni2224              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2225 uni2225              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2226 uni2226              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2227 logicaland           2.1
-U+2228 logicalor            2.1
-U+2229 intersection         2.1
-U+222a union                2.1
-U+222b integral             original
-U+222c uni222C              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+222d uni222D              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+222e uni222E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+222f uni222F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2230 uni2230              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2231 uni2231              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2232 uni2232              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2233 uni2233              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2234 therefore            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2235 uni2235              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2236 uni2236              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2237 uni2237              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2238 uni2238              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2239 uni2239              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223a uni223A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223b uni223B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223c similar              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223d uni223D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+223e uni223E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+223f uni223F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2240 uni2240              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2241 uni2241              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2242 uni2242              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2243 uni2243              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2244 uni2244              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2245 congruent            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2246 uni2246              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2247 uni2247              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2248 approxequal          original
-U+2249 uni2249              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224a uni224A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224b uni224B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224c uni224C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224d uni224D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224e uni224E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+224f uni224F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2250 uni2250              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2251 uni2251              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2252 uni2252              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2253 uni2253              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2254 uni2254              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2255 uni2255              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2256 uni2256              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2257 uni2257              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2258 uni2258              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2259 uni2259              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225a uni225A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225b uni225B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225c uni225C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225d uni225D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225e uni225E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+225f uni225F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2260 notequal             original
-U+2261 equivalence          2.1
-U+2262 uni2262              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2263 uni2263              2.1 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2264 lessequal            original
-U+2265 greaterequal         original
-U+2266 uni2266              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2267 uni2267              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2268 uni2268              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2269 uni2269              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+226a uni226A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+226b uni226B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+226c uni226C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+226d uni226D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+226e uni226E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+226f uni226F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2270 uni2270              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2271 uni2271              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2272 uni2272              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2273 uni2273              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2274 uni2274              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2275 uni2275              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2276 uni2276              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2277 uni2277              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2278 uni2278              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2279 uni2279              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227a uni227A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227b uni227B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227c uni227C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227d uni227D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227e uni227E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+227f uni227F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2280 uni2280              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2281 uni2281              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2282 propersubset         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2283 propersuperset       2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2284 notsubset            2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2285 uni2285              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2286 reflexsubset         2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2287 reflexsuperset       2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2288 uni2288              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2289 uni2289              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+228a uni228A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+228b uni228B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.6 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+228c uni228C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+228d uni228D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+228e uni228E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+228f uni228F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2290 uni2290              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2291 uni2291              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2292 uni2292              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2293 uni2293              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2294 uni2294              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2295 circleplus           2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2296 uni2296              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2297 circlemultiply       2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2298 uni2298              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2299 uni2299              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229a uni229A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229b uni229B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229c uni229C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229d uni229D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229e uni229E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+229f uni229F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a0 uni22A0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a1 uni22A1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a2 uni22A2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a3 uni22A3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a4 uni22A4              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a5 perpendicular        2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a6 uni22A6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a7 uni22A7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a8 uni22A8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22a9 uni22A9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22aa uni22AA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ab uni22AB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ac uni22AC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ad uni22AD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22ae uni22AE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22af uni22AF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22b0 uni22B0              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b1 uni22B1              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b2 uni22B2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b3 uni22B3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b4 uni22B4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b5 uni22B5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b6 uni22B6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b7 uni22B7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b8 uni22B8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22b9 uni22B9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ba uni22BA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22bb uni22BB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22bc uni22BC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22bd uni22BD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22be uni22BE              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+22bf uni22BF              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+22c0 uni22C0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c1 uni22C1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c2 uni22C2              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c3 uni22C3              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c4 uni22C4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c5 dotmath              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+22c6 uni22C6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+22c7 uni22C7              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c8 uni22C8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22c9 uni22C9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ca uni22CA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cb uni22CB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cc uni22CC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cd uni22CD              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22ce uni22CE              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22cf uni22CF              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d0 uni22D0              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d1 uni22D1              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d2 uni22D2              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d3 uni22D3              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d4 uni22D4              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d5 uni22D5              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d6 uni22D6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d7 uni22D7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22d8 uni22D8              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22d9 uni22D9              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22da uni22DA              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22db uni22DB              2.6 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique) 2.7 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+22dc uni22DC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22dd uni22DD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22de uni22DE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22df uni22DF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e0 uni22E0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e1 uni22E1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e2 uni22E2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e3 uni22E3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e4 uni22E4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e5 uni22E5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e6 uni22E6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e7 uni22E7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e8 uni22E8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22e9 uni22E9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+22ea uni22EA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22eb uni22EB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ec uni22EC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ed uni22ED              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ee uni22EE              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ef uni22EF              2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f0 uni22F0              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f1 uni22F1              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f2 uni22F2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f3 uni22F3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f4 uni22F4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f5 uni22F5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f6 uni22F6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f7 uni22F7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f8 uni22F8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22f9 uni22F9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fa uni22FA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fb uni22FB              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fc uni22FC              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fd uni22FD              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22fe uni22FE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+22ff uni22FF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2300 uni2300              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2301 uni2301              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2302 house                1.14
-U+2303 uni2303              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2304 uni2304              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2305 uni2305              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2306 uni2306              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2307 uni2307              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2308 uni2308              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2309 uni2309              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+230a uni230A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+230b uni230B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+230c uni230C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+230d uni230D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+230e uni230E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+230f uni230F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2310 revlogicalnot        1.14
-U+2311 uni2311              1.15
-U+2312 uni2312              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2313 uni2313              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2314 uni2314              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2315 uni2315              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2318 uni2318              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2319 uni2319              1.14
-U+231c uni231C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+231d uni231D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+231e uni231E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+231f uni231F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2320 integraltp           2.3
-U+2321 integralbt           2.3
-U+2324 uni2324              2.16 (Sans, Sans Bold, Sans Bold Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique) 2.19 (Sans Condensed Oblique, Sans Oblique)
-U+2325 uni2325              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2326 uni2326              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2327 uni2327              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2328 uni2328              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2329 angleleft            2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic)
-U+232a angleright           2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.10 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic)
-U+232b uni232B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+232c uni232C              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2335 uni2335              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2337 uni2337              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2338 uni2338              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2339 uni2339              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233a uni233A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233b uni233B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233c uni233C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233d uni233D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+233e uni233E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2341 uni2341              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2342 uni2342              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2343 uni2343              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2344 uni2344              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2347 uni2347              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2348 uni2348              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2349 uni2349              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+234b uni234B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+234c uni234C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+234d uni234D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2350 uni2350              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2352 uni2352              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2353 uni2353              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2354 uni2354              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2357 uni2357              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2358 uni2358              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2359 uni2359              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235a uni235A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235b uni235B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235c uni235C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235e uni235E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+235f uni235F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2360 uni2360              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2363 uni2363              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2364 uni2364              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2365 uni2365              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2368 uni2368              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2369 uni2369              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236b uni236B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236c uni236C              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236d uni236D              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236e uni236E              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+236f uni236F              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2370 uni2370              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2373 uni2373              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2374 uni2374              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2375 uni2375              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2376 uni2376              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2377 uni2377              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2378 uni2378              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2379 uni2379              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+237a uni237A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+237d uni237D              1.15
-U+2380 uni2380              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2381 uni2381              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2382 uni2382              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2383 uni2383              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2387 uni2387              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2388 uni2388              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2389 uni2389              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+238a uni238A              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+238b uni238B              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2394 uni2394              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2395 uni2395              2.14 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+239b uni239B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239c uni239C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239d uni239D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239e uni239E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+239f uni239F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a0 uni23A0              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a1 uni23A1              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a2 uni23A2              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a3 uni23A3              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a4 uni23A4              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a5 uni23A5              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a6 uni23A6              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a7 uni23A7              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a8 uni23A8              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23a9 uni23A9              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23aa uni23AA              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ab uni23AB              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ac uni23AC              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ad uni23AD              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23ae uni23AE              2.3
-U+23ce uni23CE              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+23cf uni23CF              2.3
-U+23e3 uni23E3              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+23e5 uni23E5              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2422 uni2422              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2423 uni2423              1.6
-U+2460 uni2460              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2461 uni2461              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2462 uni2462              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2463 uni2463              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2464 uni2464              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2465 uni2465              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2466 uni2466              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2467 uni2467              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2468 uni2468              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2469 uni2469              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2500 SF100000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2501 uni2501              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2502 SF110000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2503 uni2503              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2504 uni2504              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2505 uni2505              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2506 uni2506              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2507 uni2507              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2508 uni2508              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2509 uni2509              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250a uni250A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250b uni250B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250c SF010000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250d uni250D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250e uni250E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+250f uni250F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2510 SF030000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2511 uni2511              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2512 uni2512              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2513 uni2513              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2514 SF020000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2515 uni2515              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2516 uni2516              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2517 uni2517              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2518 SF040000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2519 uni2519              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251a uni251A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251b uni251B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251c SF080000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251d uni251D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251e uni251E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+251f uni251F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2520 uni2520              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2521 uni2521              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2522 uni2522              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2523 uni2523              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2524 SF090000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2525 uni2525              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2526 uni2526              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2527 uni2527              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2528 uni2528              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2529 uni2529              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252a uni252A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252b uni252B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252c SF060000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252d uni252D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252e uni252E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+252f uni252F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2530 uni2530              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2531 uni2531              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2532 uni2532              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2533 uni2533              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2534 SF070000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2535 uni2535              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2536 uni2536              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2537 uni2537              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2538 uni2538              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2539 uni2539              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253a uni253A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253b uni253B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253c SF050000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253d uni253D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253e uni253E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+253f uni253F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2540 uni2540              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2541 uni2541              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2542 uni2542              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2543 uni2543              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2544 uni2544              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2545 uni2545              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2546 uni2546              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2547 uni2547              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2548 uni2548              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2549 uni2549              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254a uni254A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254b uni254B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254c uni254C              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254d uni254D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254e uni254E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+254f uni254F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2550 SF430000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2551 SF240000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2552 SF510000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2553 SF520000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2554 SF390000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2555 SF220000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2556 SF210000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2557 SF250000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2558 SF500000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2559 SF490000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255a SF380000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255b SF280000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255c SF270000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255d SF260000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255e SF360000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+255f SF370000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2560 SF420000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2561 SF190000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2562 SF200000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2563 SF230000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2564 SF470000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2565 SF480000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2566 SF410000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2567 SF450000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2568 SF460000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2569 SF400000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256a SF540000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256b SF530000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256c SF440000             1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256d uni256D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256e uni256E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+256f uni256F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2570 uni2570              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2571 uni2571              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2572 uni2572              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2573 uni2573              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2574 uni2574              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2575 uni2575              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2576 uni2576              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2577 uni2577              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2578 uni2578              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2579 uni2579              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257a uni257A              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257b uni257B              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257c uni257C              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257d uni257D              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257e uni257E              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+257f uni257F              1.12 (Sans Mono, Sans Mono Oblique) 2.21 (Sans, Sans Condensed, Sans Condensed Oblique, Sans Oblique, Serif, Serif Condensed, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2580 upblock              1.14
-U+2581 uni2581              1.14
-U+2582 uni2582              1.14
-U+2583 uni2583              1.14
-U+2584 dnblock              1.14
-U+2585 uni2585              1.14
-U+2586 uni2586              1.14
-U+2587 uni2587              1.14
-U+2588 block                1.14
-U+2589 uni2589              1.14
-U+258a uni258A              1.14
-U+258b uni258B              1.14
-U+258c lfblock              1.14
-U+258d uni258D              1.14
-U+258e uni258E              1.14
-U+258f uni258F              1.14
-U+2590 rtblock              1.14
-U+2591 ltshade              1.15
-U+2592 shade                1.15
-U+2593 dkshade              1.15
-U+2594 uni2594              1.14
-U+2595 uni2595              1.14
-U+2596 uni2596              1.14
-U+2597 uni2597              1.14
-U+2598 uni2598              1.14
-U+2599 uni2599              1.14
-U+259a uni259A              1.14
-U+259b uni259B              1.14
-U+259c uni259C              1.14
-U+259d uni259D              1.14
-U+259e uni259E              1.14
-U+259f uni259F              1.14
-U+25a0 filledbox            2.3
-U+25a1 H22073               2.3
-U+25a2 uni25A2              2.3
-U+25a3 uni25A3              2.3
-U+25a4 uni25A4              2.3
-U+25a5 uni25A5              2.3
-U+25a6 uni25A6              2.3
-U+25a7 uni25A7              2.3
-U+25a8 uni25A8              2.3
-U+25a9 uni25A9              2.3
-U+25aa H18543               2.3
-U+25ab H18551               2.3
-U+25ac filledrect           2.3
-U+25ad uni25AD              2.3
-U+25ae uni25AE              2.3
-U+25af uni25AF              2.3
-U+25b0 uni25B0              2.3
-U+25b1 uni25B1              2.3
-U+25b2 triagup              2.3
-U+25b3 uni25B3              2.3
-U+25b4 uni25B4              2.3
-U+25b5 uni25B5              2.3
-U+25b6 uni25B6              2.3
-U+25b7 uni25B7              2.3
-U+25b8 uni25B8              2.3
-U+25b9 uni25B9              2.3
-U+25ba triagrt              2.3
-U+25bb uni25BB              2.3
-U+25bc triagdn              2.3
-U+25bd uni25BD              2.3
-U+25be uni25BE              2.3
-U+25bf uni25BF              2.3
-U+25c0 uni25C0              2.3
-U+25c1 uni25C1              2.3
-U+25c2 uni25C2              2.3
-U+25c3 uni25C3              2.3
-U+25c4 triaglf              2.3
-U+25c5 uni25C5              2.3
-U+25c6 uni25C6              2.3
-U+25c7 uni25C7              2.3
-U+25c8 uni25C8              2.3
-U+25c9 uni25C9              2.3
-U+25ca lozenge              original
-U+25cb circle               2.3
-U+25cc uni25CC              2.3
-U+25cd uni25CD              2.3
-U+25ce uni25CE              2.3
-U+25cf H18533               2.3
-U+25d0 uni25D0              2.3
-U+25d1 uni25D1              2.3
-U+25d2 uni25D2              2.3
-U+25d3 uni25D3              2.3
-U+25d4 uni25D4              2.3
-U+25d5 uni25D5              2.3
-U+25d6 uni25D6              2.3
-U+25d7 uni25D7              2.3
-U+25d8 invbullet            2.2
-U+25d9 invcircle            2.3
-U+25da uni25DA              2.3
-U+25db uni25DB              2.3
-U+25dc uni25DC              2.3
-U+25dd uni25DD              2.3
-U+25de uni25DE              2.3
-U+25df uni25DF              2.3
-U+25e0 uni25E0              2.3
-U+25e1 uni25E1              2.3
-U+25e2 uni25E2              2.3
-U+25e3 uni25E3              2.3
-U+25e4 uni25E4              2.3
-U+25e5 uni25E5              2.3
-U+25e6 openbullet           2.2
-U+25e7 uni25E7              2.3
-U+25e8 uni25E8              2.3
-U+25e9 uni25E9              2.3
-U+25ea uni25EA              2.3
-U+25eb uni25EB              2.3
-U+25ec uni25EC              2.3
-U+25ed uni25ED              2.3
-U+25ee uni25EE              2.3
-U+25ef uni25EF              2.3
-U+25f0 uni25F0              2.3
-U+25f1 uni25F1              2.3
-U+25f2 uni25F2              2.3
-U+25f3 uni25F3              2.3
-U+25f4 uni25F4              2.3
-U+25f5 uni25F5              2.3
-U+25f6 uni25F6              2.3
-U+25f7 uni25F7              2.3
-U+25f8 uni25F8              2.3
-U+25f9 uni25F9              2.3
-U+25fa uni25FA              2.3
-U+25fb uni25FB              2.3
-U+25fc uni25FC              2.3
-U+25fd uni25FD              2.3
-U+25fe uni25FE              2.3
-U+25ff uni25FF              2.3
-U+2600 uni2600              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2601 uni2601              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2602 uni2602              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2603 uni2603              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2604 uni2604              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2605 uni2605              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2606 uni2606              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2607 uni2607              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2608 uni2608              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2609 uni2609              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260a uni260A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260b uni260B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260c uni260C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260d uni260D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260e uni260E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+260f uni260F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2610 uni2610              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2611 uni2611              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2612 uni2612              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2613 uni2613              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2614 uni2614              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2615 uni2615              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2616 uni2616              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2617 uni2617              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2618 uni2618              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2619 uni2619              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261a uni261A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261b uni261B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261c uni261C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261d uni261D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261e uni261E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+261f uni261F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2620 uni2620              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2621 uni2621              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2622 uni2622              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2623 uni2623              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2624 uni2624              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2625 uni2625              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2626 uni2626              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2627 uni2627              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2628 uni2628              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2629 uni2629              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262a uni262A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262b uni262B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262c uni262C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262d uni262D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262e uni262E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+262f uni262F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2630 uni2630              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2631 uni2631              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2632 uni2632              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2633 uni2633              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2634 uni2634              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2635 uni2635              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2636 uni2636              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2637 uni2637              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2638 uni2638              1.15
-U+2639 uni2639              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263a smileface            2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263b invsmileface         2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263c sun                  2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+263d uni263D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+263e uni263E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+263f uni263F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2640 female               2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2641 uni2641              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2642 male                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2643 uni2643              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2644 uni2644              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2645 uni2645              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2646 uni2646              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2647 uni2647              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2648 uni2648              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2649 uni2649              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264a uni264A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264b uni264B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264c uni264C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264d uni264D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264e uni264E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+264f uni264F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2650 uni2650              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2651 uni2651              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2652 uni2652              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2653 uni2653              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2654 uni2654              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2655 uni2655              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2656 uni2656              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2657 uni2657              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2658 uni2658              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2659 uni2659              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265a uni265A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265b uni265B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265c uni265C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265d uni265D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265e uni265E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+265f uni265F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2660 spade                2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2661 uni2661              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2662 uni2662              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2663 club                 2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2664 uni2664              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2665 heart                2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2666 diamond              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2667 uni2667              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2668 uni2668              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2669 uni2669              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266a musicalnote          2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266b musicalnotedbl       2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266c uni266C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266d uni266D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266e uni266E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+266f uni266F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2670 uni2670              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2671 uni2671              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2672 uni2672              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2673 uni2673              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2674 uni2674              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2675 uni2675              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2676 uni2676              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2677 uni2677              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2678 uni2678              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2679 uni2679              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267a uni267A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267b uni267B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267c uni267C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267d uni267D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267e uni267E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+267f uni267F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2680 uni2680              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2681 uni2681              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2682 uni2682              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2683 uni2683              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2684 uni2684              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2685 uni2685              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.4 (Sans ExtraLight) 2.7 (Sans Mono, Sans Mono Bold)
-U+2686 uni2686              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2687 uni2687              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2688 uni2688              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2689 uni2689              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+268a uni268A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+268b uni268B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+268c uni268C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+268d uni268D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+268e uni268E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+268f uni268F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+2690 uni2690              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2691 uni2691              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2692 uni2692              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2693 uni2693              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2694 uni2694              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2695 uni2695              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2696 uni2696              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2697 uni2697              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2698 uni2698              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2699 uni2699              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+269a uni269A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+269b uni269B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+269c uni269C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+26a0 uni26A0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+26a1 uni26A1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+26a2 uni26A2              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a3 uni26A3              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a4 uni26A4              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a5 uni26A5              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a6 uni26A6              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a7 uni26A7              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a8 uni26A8              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26a9 uni26A9              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26aa uni26AA              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ab uni26AB              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ac uni26AC              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ad uni26AD              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26ae uni26AE              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26af uni26AF              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+26b0 uni26B0              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+26b1 uni26B1              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+26b2 uni26B2              2.12 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b3 uni26B3              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b4 uni26B4              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b5 uni26B5              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b6 uni26B6              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b7 uni26B7              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+26b8 uni26B8              2.29 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2701 uni2701              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2702 uni2702              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2703 uni2703              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2704 uni2704              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2706 uni2706              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2707 uni2707              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2708 uni2708              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2709 uni2709              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270c uni270C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270d uni270D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270e uni270E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+270f uni270F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2710 uni2710              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2711 uni2711              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2712 uni2712              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2713 uni2713              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2714 uni2714              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2715 uni2715              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2716 uni2716              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2717 uni2717              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2718 uni2718              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2719 uni2719              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271a uni271A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271b uni271B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271c uni271C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271d uni271D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271e uni271E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+271f uni271F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2720 uni2720              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2721 uni2721              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2722 uni2722              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2723 uni2723              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2724 uni2724              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2725 uni2725              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2726 uni2726              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2727 uni2727              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2729 uni2729              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272a uni272A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272b uni272B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272c uni272C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272d uni272D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272e uni272E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+272f uni272F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2730 uni2730              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2731 uni2731              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2732 uni2732              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2733 uni2733              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2734 uni2734              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2735 uni2735              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2736 uni2736              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2737 uni2737              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2738 uni2738              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2739 uni2739              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273a uni273A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273b uni273B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273c uni273C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273d uni273D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273e uni273E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+273f uni273F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2740 uni2740              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2741 uni2741              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2742 uni2742              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2743 uni2743              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2744 uni2744              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2745 uni2745              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2746 uni2746              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2747 uni2747              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2748 uni2748              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2749 uni2749              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274a uni274A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274b uni274B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274d uni274D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+274f uni274F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2750 uni2750              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2751 uni2751              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2752 uni2752              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2756 uni2756              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2758 uni2758              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2759 uni2759              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275a uni275A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275b uni275B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275c uni275C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275d uni275D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+275e uni275E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2761 uni2761              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2762 uni2762              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2763 uni2763              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2764 uni2764              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2765 uni2765              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2766 uni2766              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2767 uni2767              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2768 uni2768              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2769 uni2769              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276a uni276A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276b uni276B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276c uni276C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276d uni276D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276e uni276E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+276f uni276F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2770 uni2770              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2771 uni2771              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2772 uni2772              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2773 uni2773              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2774 uni2774              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2775 uni2775              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Sans Mono, Sans Mono Bold)
-U+2776 uni2776              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2777 uni2777              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2778 uni2778              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2779 uni2779              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277a uni277A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277b uni277B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277c uni277C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277d uni277D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277e uni277E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+277f uni277F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2780 uni2780              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2781 uni2781              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2782 uni2782              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2783 uni2783              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2784 uni2784              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2785 uni2785              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2786 uni2786              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2787 uni2787              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2788 uni2788              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2789 uni2789              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278a uni278A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278b uni278B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278c uni278C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278d uni278D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278e uni278E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+278f uni278F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2790 uni2790              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2791 uni2791              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2792 uni2792              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2793 uni2793              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2794 uni2794              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2798 uni2798              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+2799 uni2799              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279a uni279A              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279b uni279B              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279c uni279C              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279d uni279D              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279e uni279E              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+279f uni279F              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a0 uni27A0              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a1 uni27A1              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27a2 uni27A2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a3 uni27A3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a4 uni27A4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a5 uni27A5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a6 uni27A6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a7 uni27A7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a8 uni27A8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27a9 uni27A9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27aa uni27AA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ab uni27AB              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ac uni27AC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ad uni27AD              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ae uni27AE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27af uni27AF              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b1 uni27B1              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b2 uni27B2              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b3 uni27B3              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b4 uni27B4              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b5 uni27B5              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b6 uni27B6              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b7 uni27B7              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b8 uni27B8              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27b9 uni27B9              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27ba uni27BA              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bb uni27BB              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bc uni27BC              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bd uni27BD              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27be uni27BE              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.7 (Sans Mono, Sans Mono Bold)
-U+27bf uni27BF              2.7 (Sans Mono Bold)
-U+27c5 uni27C5              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+27c6 uni27C6              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+27e0 uni27E0              2.3
-U+27e6 uni27E6              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27e7 uni27E7              2.15 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27e8 uni27E8              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27e9 uni27E9              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.13 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27ea uni27EA              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27eb uni27EB              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+27f0 uni27F0              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f1 uni27F1              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f2 uni27F2              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f3 uni27F3              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f4 uni27F4              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f5 uni27F5              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f6 uni27F6              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f7 uni27F7              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f8 uni27F8              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27f9 uni27F9              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fa uni27FA              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fb uni27FB              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fc uni27FC              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fd uni27FD              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27fe uni27FE              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+27ff uni27FF              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2800 uni2800              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2801 uni2801              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2802 uni2802              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2803 uni2803              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2804 uni2804              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2805 uni2805              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2806 uni2806              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2807 uni2807              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2808 uni2808              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2809 uni2809              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280a uni280A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280b uni280B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280c uni280C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280d uni280D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280e uni280E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+280f uni280F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2810 uni2810              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2811 uni2811              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2812 uni2812              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2813 uni2813              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2814 uni2814              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2815 uni2815              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2816 uni2816              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2817 uni2817              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2818 uni2818              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2819 uni2819              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281a uni281A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281b uni281B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281c uni281C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281d uni281D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281e uni281E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+281f uni281F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2820 uni2820              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2821 uni2821              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2822 uni2822              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2823 uni2823              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2824 uni2824              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2825 uni2825              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2826 uni2826              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2827 uni2827              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2828 uni2828              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2829 uni2829              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282a uni282A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282b uni282B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282c uni282C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282d uni282D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282e uni282E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+282f uni282F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2830 uni2830              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2831 uni2831              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2832 uni2832              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2833 uni2833              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2834 uni2834              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2835 uni2835              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2836 uni2836              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2837 uni2837              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2838 uni2838              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2839 uni2839              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283a uni283A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283b uni283B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283c uni283C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283d uni283D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283e uni283E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+283f uni283F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2840 uni2840              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2841 uni2841              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2842 uni2842              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2843 uni2843              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2844 uni2844              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2845 uni2845              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2846 uni2846              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2847 uni2847              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2848 uni2848              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2849 uni2849              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284a uni284A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284b uni284B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284c uni284C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284d uni284D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284e uni284E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+284f uni284F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2850 uni2850              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2851 uni2851              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2852 uni2852              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2853 uni2853              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2854 uni2854              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2855 uni2855              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2856 uni2856              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2857 uni2857              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2858 uni2858              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2859 uni2859              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285a uni285A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285b uni285B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285c uni285C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285d uni285D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285e uni285E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+285f uni285F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2860 uni2860              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2861 uni2861              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2862 uni2862              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2863 uni2863              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2864 uni2864              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2865 uni2865              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2866 uni2866              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2867 uni2867              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2868 uni2868              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2869 uni2869              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286a uni286A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286b uni286B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286c uni286C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286d uni286D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286e uni286E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+286f uni286F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2870 uni2870              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2871 uni2871              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2872 uni2872              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2873 uni2873              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2874 uni2874              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2875 uni2875              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2876 uni2876              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2877 uni2877              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2878 uni2878              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2879 uni2879              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287a uni287A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287b uni287B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287c uni287C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287d uni287D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287e uni287E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+287f uni287F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2880 uni2880              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2881 uni2881              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2882 uni2882              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2883 uni2883              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2884 uni2884              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2885 uni2885              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2886 uni2886              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2887 uni2887              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2888 uni2888              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2889 uni2889              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288a uni288A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288b uni288B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288c uni288C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288d uni288D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288e uni288E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+288f uni288F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2890 uni2890              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2891 uni2891              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2892 uni2892              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2893 uni2893              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2894 uni2894              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2895 uni2895              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2896 uni2896              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2897 uni2897              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2898 uni2898              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2899 uni2899              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289a uni289A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289b uni289B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289c uni289C              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289d uni289D              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289e uni289E              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+289f uni289F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a0 uni28A0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a1 uni28A1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a2 uni28A2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a3 uni28A3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a4 uni28A4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a5 uni28A5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a6 uni28A6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a7 uni28A7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a8 uni28A8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28a9 uni28A9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28aa uni28AA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ab uni28AB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ac uni28AC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ad uni28AD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ae uni28AE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28af uni28AF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b0 uni28B0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b1 uni28B1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b2 uni28B2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b3 uni28B3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b4 uni28B4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b5 uni28B5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b6 uni28B6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b7 uni28B7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b8 uni28B8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28b9 uni28B9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ba uni28BA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bb uni28BB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bc uni28BC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bd uni28BD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28be uni28BE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28bf uni28BF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c0 uni28C0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c1 uni28C1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c2 uni28C2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c3 uni28C3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c4 uni28C4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c5 uni28C5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c6 uni28C6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c7 uni28C7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c8 uni28C8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28c9 uni28C9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ca uni28CA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cb uni28CB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cc uni28CC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cd uni28CD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ce uni28CE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28cf uni28CF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d0 uni28D0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d1 uni28D1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d2 uni28D2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d3 uni28D3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d4 uni28D4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d5 uni28D5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d6 uni28D6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d7 uni28D7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d8 uni28D8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28d9 uni28D9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28da uni28DA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28db uni28DB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28dc uni28DC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28dd uni28DD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28de uni28DE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28df uni28DF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e0 uni28E0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e1 uni28E1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e2 uni28E2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e3 uni28E3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e4 uni28E4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e5 uni28E5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e6 uni28E6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e7 uni28E7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e8 uni28E8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28e9 uni28E9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ea uni28EA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28eb uni28EB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ec uni28EC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ed uni28ED              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ee uni28EE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ef uni28EF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f0 uni28F0              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f1 uni28F1              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f2 uni28F2              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f3 uni28F3              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f4 uni28F4              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f5 uni28F5              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f6 uni28F6              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f7 uni28F7              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f8 uni28F8              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28f9 uni28F9              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fa uni28FA              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fb uni28FB              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fc uni28FC              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fd uni28FD              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28fe uni28FE              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+28ff uni28FF              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2900 uni2900              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2901 uni2901              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2902 uni2902              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2903 uni2903              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2904 uni2904              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2905 uni2905              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2906 uni2906              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2907 uni2907              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2908 uni2908              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2909 uni2909              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290a uni290A              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290b uni290B              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290c uni290C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290d uni290D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290e uni290E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+290f uni290F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2910 uni2910              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2911 uni2911              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2912 uni2912              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2913 uni2913              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2914 uni2914              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2915 uni2915              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2916 uni2916              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2917 uni2917              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2918 uni2918              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2919 uni2919              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291a uni291A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291b uni291B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291c uni291C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291d uni291D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291e uni291E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+291f uni291F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2920 uni2920              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2921 uni2921              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2922 uni2922              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2923 uni2923              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2924 uni2924              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2925 uni2925              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2926 uni2926              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2927 uni2927              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2928 uni2928              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2929 uni2929              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292a uni292A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292b uni292B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292c uni292C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292d uni292D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292e uni292E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+292f uni292F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2930 uni2930              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2931 uni2931              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2932 uni2932              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2933 uni2933              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2934 uni2934              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2935 uni2935              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2936 uni2936              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2937 uni2937              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2938 uni2938              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2939 uni2939              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293a uni293A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293b uni293B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293c uni293C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293d uni293D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293e uni293E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+293f uni293F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2940 uni2940              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2941 uni2941              2.13 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2942 uni2942              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2943 uni2943              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2944 uni2944              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2945 uni2945              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2946 uni2946              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2947 uni2947              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2948 uni2948              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2949 uni2949              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294a uni294A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294b uni294B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294c uni294C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294d uni294D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294e uni294E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+294f uni294F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2950 uni2950              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2951 uni2951              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2952 uni2952              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2953 uni2953              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2954 uni2954              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2955 uni2955              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2956 uni2956              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2957 uni2957              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2958 uni2958              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2959 uni2959              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295a uni295A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295b uni295B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295c uni295C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295d uni295D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295e uni295E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+295f uni295F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2960 uni2960              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2961 uni2961              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2962 uni2962              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2963 uni2963              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2964 uni2964              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2965 uni2965              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2966 uni2966              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2967 uni2967              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2968 uni2968              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2969 uni2969              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296a uni296A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296b uni296B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296c uni296C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296d uni296D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296e uni296E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+296f uni296F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2970 uni2970              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2971 uni2971              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2972 uni2972              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2973 uni2973              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2974 uni2974              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2975 uni2975              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2976 uni2976              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2977 uni2977              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2978 uni2978              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2979 uni2979              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297a uni297A              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297b uni297B              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297c uni297C              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297d uni297D              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297e uni297E              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+297f uni297F              2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2983 uni2983              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2984 uni2984              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+29ce uni29CE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29cf uni29CF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d0 uni29D0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d1 uni29D1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d2 uni29D2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d3 uni29D3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d4 uni29D4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29d5 uni29D5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+29eb uni29EB              2.2
-U+29fa uni29FA              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+29fb uni29FB              2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+2a00 uni2A00              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a01 uni2A01              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a02 uni2A02              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a0c uni2A0C              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2a0d uni2A0D              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2a0e uni2A0E              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.9 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2a0f uni2A0F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a10 uni2A10              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a11 uni2A11              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a12 uni2A12              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a13 uni2A13              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a14 uni2A14              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a15 uni2A15              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a16 uni2A16              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a17 uni2A17              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a18 uni2A18              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a19 uni2A19              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a1a uni2A1A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a1b uni2A1B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a1c uni2A1C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a2f uni2A2F              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2a7d uni2A7D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a7e uni2A7E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a7f uni2A7F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a80 uni2A80              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a81 uni2A81              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a82 uni2A82              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a83 uni2A83              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a84 uni2A84              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a85 uni2A85              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a86 uni2A86              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a87 uni2A87              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a88 uni2A88              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a89 uni2A89              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8a uni2A8A              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8b uni2A8B              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8c uni2A8C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8d uni2A8D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8e uni2A8E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a8f uni2A8F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a90 uni2A90              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a91 uni2A91              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a92 uni2A92              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a93 uni2A93              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a94 uni2A94              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a95 uni2A95              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a96 uni2A96              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a97 uni2A97              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a98 uni2A98              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a99 uni2A99              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9a uni2A9A              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9b uni2A9B              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9c uni2A9C              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9d uni2A9D              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9e uni2A9E              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2a9f uni2A9F              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aa0 uni2AA0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aae uni2AAE              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aaf uni2AAF              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab0 uni2AB0              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab1 uni2AB1              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab2 uni2AB2              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab3 uni2AB3              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab4 uni2AB4              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab5 uni2AB5              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab6 uni2AB6              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab7 uni2AB7              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab8 uni2AB8              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2ab9 uni2AB9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2aba uni2ABA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2af9 uni2AF9              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2afa uni2AFA              2.7 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b00 uni2B00              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b01 uni2B01              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b02 uni2B02              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b03 uni2B03              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b04 uni2B04              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b05 uni2B05              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b06 uni2B06              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b07 uni2B07              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b08 uni2B08              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b09 uni2B09              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0a uni2B0A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0b uni2B0B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0c uni2B0C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0d uni2B0D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0e uni2B0E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b0f uni2B0F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b10 uni2B10              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b11 uni2B11              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2b12 uni2B12              2.3
-U+2b13 uni2B13              2.3
-U+2b14 uni2B14              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b15 uni2B15              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b16 uni2B16              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b17 uni2B17              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b18 uni2B18              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b19 uni2B19              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b1a uni2B1A              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Italic) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+2b1f uni2B1F              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2b20 uni2B20              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b21 uni2B21              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b22 uni2B22              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b23 uni2B23              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2b24 uni2B24              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2b53 uni2B53              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2b54 uni2B54              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+2c60 uni2C60              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c61 uni2C61              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c62 uni2C62              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c63 uni2C63              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c64 uni2C64              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2c65 uni2C65              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c66 uni2C66              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c67 uni2C67              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c68 uni2C68              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c69 uni2C69              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6a uni2C6A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6b uni2C6B              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6c uni2C6C              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique) 2.18 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+2c6d uni2C6D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c6e uni2C6E              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2c6f uni2C6F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2c71 uni2C71              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c72 uni2C72              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c73 uni2C73              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c74 uni2C74              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+2c75 uni2C75              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2c76 uni2C76              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2c77 uni2C77              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.20 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.23 (Serif Italic Condensed)
-U+2c79 uni2C79              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2c7a uni2C7A              2.27
-U+2c7b uni2C7B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+2c7c uni2C7C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2c7d uni2C7D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.28 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+2d00 uni2D00              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d01 uni2D01              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d02 uni2D02              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d03 uni2D03              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d04 uni2D04              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d05 uni2D05              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d06 uni2D06              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d07 uni2D07              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d08 uni2D08              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d09 uni2D09              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0a uni2D0A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0b uni2D0B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0c uni2D0C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0d uni2D0D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0e uni2D0E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d0f uni2D0F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d10 uni2D10              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d11 uni2D11              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d12 uni2D12              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d13 uni2D13              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d14 uni2D14              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d15 uni2D15              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d16 uni2D16              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d17 uni2D17              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d18 uni2D18              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d19 uni2D19              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1a uni2D1A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1b uni2D1B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1c uni2D1C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1d uni2D1D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1e uni2D1E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d1f uni2D1F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d20 uni2D20              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d21 uni2D21              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d22 uni2D22              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d23 uni2D23              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d24 uni2D24              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d25 uni2D25              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+2d30 uni2D30              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d31 uni2D31              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d32 uni2D32              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d33 uni2D33              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d34 uni2D34              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d35 uni2D35              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d36 uni2D36              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d37 uni2D37              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d38 uni2D38              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d39 uni2D39              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3a uni2D3A              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3b uni2D3B              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3c uni2D3C              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3d uni2D3D              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3e uni2D3E              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d3f uni2D3F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d40 uni2D40              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d41 uni2D41              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d42 uni2D42              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d43 uni2D43              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d44 uni2D44              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d45 uni2D45              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d46 uni2D46              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d47 uni2D47              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d48 uni2D48              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d49 uni2D49              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4a uni2D4A              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4b uni2D4B              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4c uni2D4C              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4d uni2D4D              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4e uni2D4E              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d4f uni2D4F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d50 uni2D50              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d51 uni2D51              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d52 uni2D52              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d53 uni2D53              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d54 uni2D54              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d55 uni2D55              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d56 uni2D56              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d57 uni2D57              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d58 uni2D58              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d59 uni2D59              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5a uni2D5A              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5b uni2D5B              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5c uni2D5C              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5d uni2D5D              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5e uni2D5E              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d5f uni2D5F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d60 uni2D60              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d61 uni2D61              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d62 uni2D62              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d63 uni2D63              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d64 uni2D64              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d65 uni2D65              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2d6f uni2D6F              2.18 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+2e18 uni2E18              2.26
-U+2e22 uni2E22              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e23 uni2E23              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e24 uni2E24              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e25 uni2E25              2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed) 2.30 (Sans Bold)
-U+2e2e uni2E2E              2.26
-U+4dc0 uni4DC0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc1 uni4DC1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc2 uni4DC2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc3 uni4DC3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc4 uni4DC4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc5 uni4DC5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc6 uni4DC6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc7 uni4DC7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc8 uni4DC8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dc9 uni4DC9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dca uni4DCA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcb uni4DCB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcc uni4DCC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcd uni4DCD              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dce uni4DCE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dcf uni4DCF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd0 uni4DD0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd1 uni4DD1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd2 uni4DD2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd3 uni4DD3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd4 uni4DD4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd5 uni4DD5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd6 uni4DD6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd7 uni4DD7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd8 uni4DD8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dd9 uni4DD9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dda uni4DDA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddb uni4DDB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddc uni4DDC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddd uni4DDD              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dde uni4DDE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ddf uni4DDF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de0 uni4DE0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de1 uni4DE1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de2 uni4DE2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de3 uni4DE3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de4 uni4DE4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de5 uni4DE5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de6 uni4DE6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de7 uni4DE7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de8 uni4DE8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4de9 uni4DE9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dea uni4DEA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4deb uni4DEB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dec uni4DEC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4ded uni4DED              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dee uni4DEE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4def uni4DEF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df0 uni4DF0              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df1 uni4DF1              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df2 uni4DF2              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df3 uni4DF3              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df4 uni4DF4              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df5 uni4DF5              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df6 uni4DF6              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df7 uni4DF7              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df8 uni4DF8              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4df9 uni4DF9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfa uni4DFA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfb uni4DFB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfc uni4DFC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfd uni4DFD              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dfe uni4DFE              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+4dff uni4DFF              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a644 uniA644              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a645 uniA645              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a646 uniA646              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a647 uniA647              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a64c uniA64C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a64d uniA64D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a650 uniA650              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a651 uniA651              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a654 uniA654              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a655 uniA655              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a656 uniA656              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a657 uniA657              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a662 uniA662              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a663 uniA663              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a664 uniA664              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a665 uniA665              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a666 uniA666              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a667 uniA667              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a668 uniA668              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a669 uniA669              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66a uniA66A              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66b uniA66B              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66c uniA66C              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66d uniA66D              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a66e uniA66E              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a68a uniA68A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a68b uniA68B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a68c uniA68C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a68d uniA68D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a694 uniA694              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a695 uniA695              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a708 uniA708              2.27
-U+a709 uniA709              2.27
-U+a70a uniA70A              2.27
-U+a70b uniA70B              2.27
-U+a70c uniA70C              2.27
-U+a70d uniA70D              2.27
-U+a70e uniA70E              2.27
-U+a70f uniA70F              2.27
-U+a710 uniA710              2.27
-U+a711 uniA711              2.27
-U+a712 uniA712              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a713 uniA713              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a714 uniA714              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a715 uniA715              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a716 uniA716              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.27 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+a71b uniA71B              2.27
-U+a71c uniA71C              2.27
-U+a71d uniA71D              2.27
-U+a71e uniA71E              2.27
-U+a71f uniA71F              2.27
-U+a726 uniA726              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+a727 uniA727              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique) 2.30 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique)
-U+a728 uniA728              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a729 uniA729              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a72a uniA72A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a72b uniA72B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a730 uniA730              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a731 uniA731              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a732 uniA732              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a733 uniA733              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a734 uniA734              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a735 uniA735              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a736 uniA736              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a737 uniA737              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a738 uniA738              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a739 uniA739              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73a uniA73A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73b uniA73B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73c uniA73C              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73d uniA73D              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a73e uniA73E              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a73f uniA73F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a746 uniA746              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a747 uniA747              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a748 uniA748              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a749 uniA749              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a74a uniA74A              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a74b uniA74B              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a74e uniA74E              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a74f uniA74F              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a780 uniA780              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a781 uniA781              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a782 uniA782              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a783 uniA783              2.27 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+a789 uniA789              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+a78a uniA78A              2.28 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique)
-U+a78b uniA78B              2.26
-U+a78c uniA78C              2.26
-U+a7fb uniA7FB              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7fc uniA7FC              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7fd uniA7FD              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7fe uniA7FE              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+a7ff uniA7FF              2.26 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e000 uniE000              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e001 uniE001              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e002 uniE002              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e003 uniE003              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e004 uniE004              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e005 uniE005              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e006 uniE006              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e007 uniE007              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e008 uniE008              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique)
-U+e009 uniE009              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00a uniE00A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00b uniE00B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00c uniE00C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00d uniE00D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00e uniE00E              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e00f uniE00F              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e010 uniE010              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e011 uniE011              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e012 uniE012              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e013 uniE013              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e014 uniE014              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight)
-U+e015 uniE015              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e016 uniE016              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e017 uniE017              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e018 uniE018              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e019 uniE019              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01a uniE01A              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01b uniE01B              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01c uniE01C              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+e01d uniE01D              2.4 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f000 uniF000              2.10 (Sans) 2.11 (Sans Condensed)
-U+f001 uniF001              2.10 (Sans) 2.11 (Sans Condensed)
-U+f208 uniF208              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f20a uniF20A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f215 uniF215              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f216 uniF216              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f217 uniF217              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f21a uniF21A              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f21b uniF21B              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f25f uniF25F              2.6 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+f400 uniF400              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f401 uniF401              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f402 uniF402              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f403 uniF403              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f404 uniF404              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f405 uniF405              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f406 uniF406              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f407 uniF407              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f408 uniF408              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f409 uniF409              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40a uniF40A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40b uniF40B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40c uniF40C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40d uniF40D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40e uniF40E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f40f uniF40F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f410 uniF410              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f411 uniF411              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f412 uniF412              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f413 uniF413              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f414 uniF414              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f415 uniF415              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f416 uniF416              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f417 uniF417              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f418 uniF418              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f419 uniF419              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41a uniF41A              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41b uniF41B              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41c uniF41C              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41d uniF41D              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41e uniF41E              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f41f uniF41F              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f420 uniF420              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f421 uniF421              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f422 uniF422              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f423 uniF423              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f424 uniF424              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f425 uniF425              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f426 uniF426              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f428 uniF428              2.28 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Italic, Serif Italic Condensed)
-U+f5c5 uniF5C5              2.9 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+f6c4 uniF6C4              2.10 (Serif Bold Italic, Serif Italic) 2.11 (Serif Condensed Bold Italic, Serif Condensed Italic) 2.23 (Serif Italic Condensed)
-U+f6c5 uniF6C5              2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.7 (Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique) 2.9 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold, Sans Condensed Oblique, Sans Oblique) 2.18 (Sans ExtraLight) 2.23 (Serif Italic Condensed)
-U+f6c6 uniF6C6              2.5 (Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6c7 uniF6C7              2.11 (Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6c8 uniF6C8              2.11 (Serif Bold Italic, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6d1 cyrBreve             2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+f6d4 cyrbreve             2.5 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb00 uniFB00              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb01 fi                   original
-U+fb02 fl                   original
-U+fb03 uniFB03              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb04 uniFB04              2.2 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.5 (Sans ExtraLight) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb05 uniFB05              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb06 uniFB06              2.5 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.8 (Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fb13 uniFB13              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb14 uniFB14              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb15 uniFB15              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb16 uniFB16              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb17 uniFB17              2.3 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb1d uniFB1D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb1e uniFB1E              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb1f uniFB1F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb20 uniFB20              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb21 uniFB21              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb22 uniFB22              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb23 uniFB23              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb24 uniFB24              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb25 uniFB25              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb26 uniFB26              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb27 uniFB27              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb28 uniFB28              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb29 uniFB29              2.10 (Sans, Sans Bold, Sans Bold Oblique, Sans ExtraLight, Sans Oblique) 2.11 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb2a uniFB2A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2b uniFB2B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2c uniFB2C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2d uniFB2D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2e uniFB2E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb2f uniFB2F              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb30 uniFB30              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb31 uniFB31              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb32 uniFB32              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb33 uniFB33              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb34 uniFB34              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb35 uniFB35              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb36 uniFB36              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb37 uniFB37              2.11 (Sans Condensed Oblique, Sans Oblique)
-U+fb38 uniFB38              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb39 uniFB39              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3a uniFB3A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3b uniFB3B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3c uniFB3C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb3e uniFB3E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb40 uniFB40              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb41 uniFB41              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb43 uniFB43              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb44 uniFB44              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb46 uniFB46              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb47 uniFB47              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb48 uniFB48              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb49 uniFB49              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4a uniFB4A              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4b uniFB4B              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4c uniFB4C              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4d uniFB4D              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4e uniFB4E              2.9 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fb4f uniFB4F              2.16 (Sans, Sans Bold, Sans Bold Oblique, Sans Oblique) 2.17 (Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique)
-U+fb52 uniFB52              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb53 uniFB53              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb54 uniFB54              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb55 uniFB55              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb56 uniFB56              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb57 uniFB57              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb58 uniFB58              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb59 uniFB59              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5a uniFB5A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5b uniFB5B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5c uniFB5C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5d uniFB5D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5e uniFB5E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb5f uniFB5F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb60 uniFB60              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb61 uniFB61              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb62 uniFB62              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb63 uniFB63              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb64 uniFB64              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb65 uniFB65              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb66 uniFB66              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb67 uniFB67              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb68 uniFB68              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb69 uniFB69              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6a uniFB6A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6b uniFB6B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6c uniFB6C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6d uniFB6D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6e uniFB6E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb6f uniFB6F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb70 uniFB70              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb71 uniFB71              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb72 uniFB72              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb73 uniFB73              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb74 uniFB74              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb75 uniFB75              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb76 uniFB76              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb77 uniFB77              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb78 uniFB78              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb79 uniFB79              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7a uniFB7A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7b uniFB7B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7c uniFB7C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7d uniFB7D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7e uniFB7E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb7f uniFB7F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb80 uniFB80              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb81 uniFB81              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8a uniFB8A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8b uniFB8B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8c uniFB8C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8d uniFB8D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8e uniFB8E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb8f uniFB8F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb90 uniFB90              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb91 uniFB91              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb92 uniFB92              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb93 uniFB93              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb94 uniFB94              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb95 uniFB95              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb9e uniFB9E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fb9f uniFB9F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbaa uniFBAA              2.16 (Sans Mono, Sans Mono Bold)
-U+fbab uniFBAB              2.16 (Sans Mono, Sans Mono Bold)
-U+fbac uniFBAC              2.16 (Sans Mono, Sans Mono Bold)
-U+fbad uniFBAD              2.16 (Sans Mono, Sans Mono Bold)
-U+fbd9 uniFBD9              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+fbda uniFBDA              2.7 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold)
-U+fbe8 uniFBE8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbe9 uniFBE9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbfc uniFBFC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbfd uniFBFD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbfe uniFBFE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fbff uniFBFF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe00 uniFE00              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe01 uniFE01              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe02 uniFE02              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe03 uniFE03              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe04 uniFE04              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe05 uniFE05              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe06 uniFE06              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe07 uniFE07              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe08 uniFE08              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe09 uniFE09              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0a uniFE0A              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0b uniFE0B              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0c uniFE0C              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0d uniFE0D              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0e uniFE0E              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe0f uniFE0F              2.14 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans ExtraLight, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fe20 uniFE20              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe21 uniFE21              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe22 uniFE22              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe23 uniFE23              2.21 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+fe70 uniFE70              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe71 uniFE71              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe72 uniFE72              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe73 uniFE73              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe74 uniFE74              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe76 uniFE76              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe77 uniFE77              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe78 uniFE78              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe79 uniFE79              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7a uniFE7A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7b uniFE7B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7c uniFE7C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7d uniFE7D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7e uniFE7E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe7f uniFE7F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe80 uniFE80              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe81 uniFE81              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe82 uniFE82              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe83 uniFE83              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe84 uniFE84              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe85 uniFE85              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe86 uniFE86              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe87 uniFE87              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe88 uniFE88              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe89 uniFE89              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8a uniFE8A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8b uniFE8B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8c uniFE8C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8d uniFE8D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8e uniFE8E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe8f uniFE8F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe90 uniFE90              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe91 uniFE91              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe92 uniFE92              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe93 uniFE93              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe94 uniFE94              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe95 uniFE95              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe96 uniFE96              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe97 uniFE97              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe98 uniFE98              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe99 uniFE99              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9a uniFE9A              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9b uniFE9B              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9c uniFE9C              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9d uniFE9D              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9e uniFE9E              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fe9f uniFE9F              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea0 uniFEA0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea1 uniFEA1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea2 uniFEA2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea3 uniFEA3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea4 uniFEA4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea5 uniFEA5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea6 uniFEA6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea7 uniFEA7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea8 uniFEA8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fea9 uniFEA9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feaa uniFEAA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feab uniFEAB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feac uniFEAC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fead uniFEAD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feae uniFEAE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feaf uniFEAF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb0 uniFEB0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb1 uniFEB1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb2 uniFEB2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb3 uniFEB3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb4 uniFEB4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb5 uniFEB5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb6 uniFEB6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb7 uniFEB7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb8 uniFEB8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feb9 uniFEB9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feba uniFEBA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febb uniFEBB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febc uniFEBC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febd uniFEBD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febe uniFEBE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+febf uniFEBF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec0 uniFEC0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec1 uniFEC1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec2 uniFEC2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec3 uniFEC3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec4 uniFEC4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec5 uniFEC5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec6 uniFEC6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec7 uniFEC7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec8 uniFEC8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fec9 uniFEC9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feca uniFECA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecb uniFECB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecc uniFECC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecd uniFECD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fece uniFECE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fecf uniFECF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed0 uniFED0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed1 uniFED1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed2 uniFED2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed3 uniFED3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed4 uniFED4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed5 uniFED5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed6 uniFED6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed7 uniFED7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed8 uniFED8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fed9 uniFED9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feda uniFEDA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedb uniFEDB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedc uniFEDC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedd uniFEDD              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fede uniFEDE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fedf uniFEDF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee0 uniFEE0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee1 uniFEE1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee2 uniFEE2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee3 uniFEE3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee4 uniFEE4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee5 uniFEE5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee6 uniFEE6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee7 uniFEE7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee8 uniFEE8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fee9 uniFEE9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feea uniFEEA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feeb uniFEEB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feec uniFEEC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feed uniFEED              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feee uniFEEE              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feef uniFEEF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef0 uniFEF0              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef1 uniFEF1              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef2 uniFEF2              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef3 uniFEF3              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef4 uniFEF4              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef5 uniFEF5              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef6 uniFEF6              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef7 uniFEF7              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef8 uniFEF8              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fef9 uniFEF9              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fefa uniFEFA              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fefb uniFEFB              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fefc uniFEFC              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+feff uniFEFF              2.4 (Sans, Sans Bold, Sans Condensed, Sans Condensed Bold) 2.16 (Sans Mono, Sans Mono Bold)
-U+fff9 uniFFF9              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffa uniFFFA              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffb uniFFFB              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffc uniFFFC              2.22 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Mono, Sans Mono Bold, Sans Mono Bold Oblique, Sans Mono Oblique, Sans Oblique, Serif, Serif Bold, Serif Bold Italic, Serif Condensed, Serif Condensed Bold, Serif Condensed Bold Italic, Serif Condensed Italic, Serif Italic) 2.23 (Serif Italic Condensed)
-U+fffd uniFFFD              1.12
-U+1d300 u1D300               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d301 u1D301               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d302 u1D302               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d303 u1D303               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d304 u1D304               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d305 u1D305               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d306 u1D306               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d307 u1D307               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d308 u1D308               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d309 u1D309               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30a u1D30A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30b u1D30B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30c u1D30C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30d u1D30D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30e u1D30E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d30f u1D30F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d310 u1D310               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d311 u1D311               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d312 u1D312               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d313 u1D313               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d314 u1D314               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d315 u1D315               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d316 u1D316               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d317 u1D317               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d318 u1D318               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d319 u1D319               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31a u1D31A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31b u1D31B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31c u1D31C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31d u1D31D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31e u1D31E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d31f u1D31F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d320 u1D320               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d321 u1D321               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d322 u1D322               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d323 u1D323               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d324 u1D324               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d325 u1D325               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d326 u1D326               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d327 u1D327               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d328 u1D328               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d329 u1D329               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32a u1D32A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32b u1D32B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32c u1D32C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32d u1D32D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32e u1D32E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d32f u1D32F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d330 u1D330               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d331 u1D331               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d332 u1D332               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d333 u1D333               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d334 u1D334               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d335 u1D335               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d336 u1D336               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d337 u1D337               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d338 u1D338               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d339 u1D339               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33a u1D33A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33b u1D33B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33c u1D33C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33d u1D33D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33e u1D33E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d33f u1D33F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d340 u1D340               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d341 u1D341               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d342 u1D342               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d343 u1D343               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d344 u1D344               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d345 u1D345               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d346 u1D346               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d347 u1D347               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d348 u1D348               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d349 u1D349               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34a u1D34A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34b u1D34B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34c u1D34C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34d u1D34D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34e u1D34E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d34f u1D34F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d350 u1D350               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d351 u1D351               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d352 u1D352               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d353 u1D353               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d354 u1D354               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d355 u1D355               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d356 u1D356               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique)
-U+1d400 u1D400               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d401 u1D401               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d402 u1D402               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d403 u1D403               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d404 u1D404               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d405 u1D405               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d406 u1D406               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d407 u1D407               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d408 u1D408               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d409 u1D409               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40a u1D40A               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40b u1D40B               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40c u1D40C               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40d u1D40D               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40e u1D40E               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d40f u1D40F               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d410 u1D410               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d411 u1D411               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d412 u1D412               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d413 u1D413               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d414 u1D414               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d415 u1D415               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d416 u1D416               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d417 u1D417               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d418 u1D418               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d419 u1D419               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41a u1D41A               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41b u1D41B               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41c u1D41C               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41d u1D41D               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41e u1D41E               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d41f u1D41F               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d420 u1D420               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d421 u1D421               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d422 u1D422               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d423 u1D423               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d424 u1D424               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d425 u1D425               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d426 u1D426               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d427 u1D427               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d428 u1D428               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d429 u1D429               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42a u1D42A               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42b u1D42B               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42c u1D42C               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42d u1D42D               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42e u1D42E               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d42f u1D42F               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d430 u1D430               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d431 u1D431               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d432 u1D432               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d433 u1D433               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d434 u1D434               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d435 u1D435               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d436 u1D436               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d437 u1D437               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d438 u1D438               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d439 u1D439               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43a u1D43A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43b u1D43B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43c u1D43C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43d u1D43D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43e u1D43E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d43f u1D43F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d440 u1D440               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d441 u1D441               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d442 u1D442               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d443 u1D443               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d444 u1D444               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d445 u1D445               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d446 u1D446               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d447 u1D447               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d448 u1D448               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d449 u1D449               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44a u1D44A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44b u1D44B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44c u1D44C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44d u1D44D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44e u1D44E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d44f u1D44F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d450 u1D450               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d451 u1D451               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d452 u1D452               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d453 u1D453               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d454 u1D454               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d456 u1D456               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d457 u1D457               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d458 u1D458               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d459 u1D459               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45a u1D45A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45b u1D45B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45c u1D45C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45d u1D45D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45e u1D45E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d45f u1D45F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d460 u1D460               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d461 u1D461               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d462 u1D462               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d463 u1D463               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d464 u1D464               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d465 u1D465               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d466 u1D466               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d467 u1D467               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d468 u1D468               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d469 u1D469               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46a u1D46A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46b u1D46B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46c u1D46C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46d u1D46D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46e u1D46E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d46f u1D46F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d470 u1D470               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d471 u1D471               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d472 u1D472               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d473 u1D473               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d474 u1D474               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d475 u1D475               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d476 u1D476               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d477 u1D477               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d478 u1D478               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d479 u1D479               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47a u1D47A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47b u1D47B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47c u1D47C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47d u1D47D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47e u1D47E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d47f u1D47F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d480 u1D480               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d481 u1D481               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d482 u1D482               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d483 u1D483               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d484 u1D484               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d485 u1D485               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d486 u1D486               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d487 u1D487               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d488 u1D488               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d489 u1D489               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48a u1D48A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48b u1D48B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48c u1D48C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48d u1D48D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48e u1D48E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d48f u1D48F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d490 u1D490               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d491 u1D491               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d492 u1D492               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d493 u1D493               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d494 u1D494               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d495 u1D495               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d496 u1D496               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d497 u1D497               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d498 u1D498               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d499 u1D499               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d49a u1D49A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d49b u1D49B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d538 u1D538               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d539 u1D539               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53b u1D53B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53c u1D53C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53d u1D53D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d53e u1D53E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d540 u1D540               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d541 u1D541               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d542 u1D542               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d543 u1D543               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d544 u1D544               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d546 u1D546               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54a u1D54A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54b u1D54B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54c u1D54C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54d u1D54D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54e u1D54E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d54f u1D54F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d550 u1D550               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d552 u1D552               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d553 u1D553               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d554 u1D554               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d555 u1D555               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d556 u1D556               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d557 u1D557               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d558 u1D558               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d559 u1D559               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55a u1D55A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55b u1D55B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55c u1D55C               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55d u1D55D               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55e u1D55E               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d55f u1D55F               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d560 u1D560               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d561 u1D561               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d562 u1D562               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d563 u1D563               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d564 u1D564               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d565 u1D565               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d566 u1D566               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d567 u1D567               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d568 u1D568               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d569 u1D569               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d56a u1D56A               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d56b u1D56B               2.18 (Sans, Sans Bold, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.22 (Serif, Serif Condensed)
-U+1d5a0 u1D5A0               2.23 (Sans, Sans Condensed)
-U+1d5a1 u1D5A1               2.23 (Sans, Sans Condensed)
-U+1d5a2 u1D5A2               2.23 (Sans, Sans Condensed)
-U+1d5a3 u1D5A3               2.23 (Sans, Sans Condensed)
-U+1d5a4 u1D5A4               2.23 (Sans, Sans Condensed)
-U+1d5a5 u1D5A5               2.23 (Sans, Sans Condensed)
-U+1d5a6 u1D5A6               2.23 (Sans, Sans Condensed)
-U+1d5a7 u1D5A7               2.23 (Sans, Sans Condensed)
-U+1d5a8 u1D5A8               2.23 (Sans, Sans Condensed)
-U+1d5a9 u1D5A9               2.23 (Sans, Sans Condensed)
-U+1d5aa u1D5AA               2.23 (Sans, Sans Condensed)
-U+1d5ab u1D5AB               2.23 (Sans, Sans Condensed)
-U+1d5ac u1D5AC               2.23 (Sans, Sans Condensed)
-U+1d5ad u1D5AD               2.23 (Sans, Sans Condensed)
-U+1d5ae u1D5AE               2.23 (Sans, Sans Condensed)
-U+1d5af u1D5AF               2.23 (Sans, Sans Condensed)
-U+1d5b0 u1D5B0               2.23 (Sans, Sans Condensed)
-U+1d5b1 u1D5B1               2.23 (Sans, Sans Condensed)
-U+1d5b2 u1D5B2               2.23 (Sans, Sans Condensed)
-U+1d5b3 u1D5B3               2.23 (Sans, Sans Condensed)
-U+1d5b4 u1D5B4               2.23 (Sans, Sans Condensed)
-U+1d5b5 u1D5B5               2.23 (Sans, Sans Condensed)
-U+1d5b6 u1D5B6               2.23 (Sans, Sans Condensed)
-U+1d5b7 u1D5B7               2.23 (Sans, Sans Condensed)
-U+1d5b8 u1D5B8               2.23 (Sans, Sans Condensed)
-U+1d5b9 u1D5B9               2.23 (Sans, Sans Condensed)
-U+1d5ba u1D5BA               2.23 (Sans, Sans Condensed)
-U+1d5bb u1D5BB               2.23 (Sans, Sans Condensed)
-U+1d5bc u1D5BC               2.23 (Sans, Sans Condensed)
-U+1d5bd u1D5BD               2.23 (Sans, Sans Condensed)
-U+1d5be u1D5BE               2.23 (Sans, Sans Condensed)
-U+1d5bf u1D5BF               2.23 (Sans, Sans Condensed)
-U+1d5c0 u1D5C0               2.23 (Sans, Sans Condensed)
-U+1d5c1 u1D5C1               2.23 (Sans, Sans Condensed)
-U+1d5c2 u1D5C2               2.23 (Sans, Sans Condensed)
-U+1d5c3 u1D5C3               2.23 (Sans, Sans Condensed)
-U+1d5c4 u1D5C4               2.23 (Sans, Sans Condensed)
-U+1d5c5 u1D5C5               2.23 (Sans, Sans Condensed)
-U+1d5c6 u1D5C6               2.23 (Sans, Sans Condensed)
-U+1d5c7 u1D5C7               2.23 (Sans, Sans Condensed)
-U+1d5c8 u1D5C8               2.23 (Sans, Sans Condensed)
-U+1d5c9 u1D5C9               2.23 (Sans, Sans Condensed)
-U+1d5ca u1D5CA               2.23 (Sans, Sans Condensed)
-U+1d5cb u1D5CB               2.23 (Sans, Sans Condensed)
-U+1d5cc u1D5CC               2.23 (Sans, Sans Condensed)
-U+1d5cd u1D5CD               2.23 (Sans, Sans Condensed)
-U+1d5ce u1D5CE               2.23 (Sans, Sans Condensed)
-U+1d5cf u1D5CF               2.23 (Sans, Sans Condensed)
-U+1d5d0 u1D5D0               2.23 (Sans, Sans Condensed)
-U+1d5d1 u1D5D1               2.23 (Sans, Sans Condensed)
-U+1d5d2 u1D5D2               2.23 (Sans, Sans Condensed)
-U+1d5d3 u1D5D3               2.23 (Sans, Sans Condensed)
-U+1d5d4 u1D5D4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d5 u1D5D5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d6 u1D5D6               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d7 u1D5D7               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d8 u1D5D8               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5d9 u1D5D9               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5da u1D5DA               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5db u1D5DB               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5dc u1D5DC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5dd u1D5DD               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5de u1D5DE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5df u1D5DF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e0 u1D5E0               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e1 u1D5E1               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e2 u1D5E2               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e3 u1D5E3               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e4 u1D5E4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e5 u1D5E5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e6 u1D5E6               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e7 u1D5E7               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e8 u1D5E8               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5e9 u1D5E9               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ea u1D5EA               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5eb u1D5EB               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ec u1D5EC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ed u1D5ED               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ee u1D5EE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ef u1D5EF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f0 u1D5F0               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f1 u1D5F1               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f2 u1D5F2               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f3 u1D5F3               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f4 u1D5F4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f5 u1D5F5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f6 u1D5F6               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f7 u1D5F7               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f8 u1D5F8               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5f9 u1D5F9               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fa u1D5FA               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fb u1D5FB               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fc u1D5FC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fd u1D5FD               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5fe u1D5FE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d5ff u1D5FF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d600 u1D600               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d601 u1D601               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d602 u1D602               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d603 u1D603               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d604 u1D604               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d605 u1D605               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d606 u1D606               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d607 u1D607               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d608 u1D608               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d609 u1D609               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60a u1D60A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60b u1D60B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60c u1D60C               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60d u1D60D               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60e u1D60E               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d60f u1D60F               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d610 u1D610               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d611 u1D611               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d612 u1D612               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d613 u1D613               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d614 u1D614               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d615 u1D615               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d616 u1D616               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d617 u1D617               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d618 u1D618               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d619 u1D619               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61a u1D61A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61b u1D61B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61c u1D61C               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61d u1D61D               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61e u1D61E               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d61f u1D61F               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d620 u1D620               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d621 u1D621               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d622 u1D622               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d623 u1D623               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d624 u1D624               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d625 u1D625               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d626 u1D626               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d627 u1D627               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d628 u1D628               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d629 u1D629               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62a u1D62A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62b u1D62B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62c u1D62C               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62d u1D62D               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62e u1D62E               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d62f u1D62F               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d630 u1D630               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d631 u1D631               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d632 u1D632               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d633 u1D633               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d634 u1D634               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d635 u1D635               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d636 u1D636               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d637 u1D637               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d638 u1D638               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d639 u1D639               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d63a u1D63A               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d63b u1D63B               2.23 (Sans Condensed Oblique, Sans Oblique)
-U+1d63c u1D63C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d63d u1D63D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d63e u1D63E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d63f u1D63F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d640 u1D640               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d641 u1D641               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d642 u1D642               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d643 u1D643               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d644 u1D644               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d645 u1D645               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d646 u1D646               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d647 u1D647               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d648 u1D648               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d649 u1D649               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64a u1D64A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64b u1D64B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64c u1D64C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64d u1D64D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64e u1D64E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d64f u1D64F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d650 u1D650               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d651 u1D651               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d652 u1D652               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d653 u1D653               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d654 u1D654               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d655 u1D655               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d656 u1D656               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d657 u1D657               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d658 u1D658               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d659 u1D659               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65a u1D65A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65b u1D65B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65c u1D65C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65d u1D65D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65e u1D65E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d65f u1D65F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d660 u1D660               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d661 u1D661               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d662 u1D662               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d663 u1D663               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d664 u1D664               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d665 u1D665               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d666 u1D666               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d667 u1D667               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d668 u1D668               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d669 u1D669               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66a u1D66A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66b u1D66B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66c u1D66C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66d u1D66D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66e u1D66E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d66f u1D66F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d670 u1D670               2.23 (Sans Mono)
-U+1d671 u1D671               2.23 (Sans Mono)
-U+1d672 u1D672               2.23 (Sans Mono)
-U+1d673 u1D673               2.23 (Sans Mono)
-U+1d674 u1D674               2.23 (Sans Mono)
-U+1d675 u1D675               2.23 (Sans Mono)
-U+1d676 u1D676               2.23 (Sans Mono)
-U+1d677 u1D677               2.23 (Sans Mono)
-U+1d678 u1D678               2.23 (Sans Mono)
-U+1d679 u1D679               2.23 (Sans Mono)
-U+1d67a u1D67A               2.23 (Sans Mono)
-U+1d67b u1D67B               2.23 (Sans Mono)
-U+1d67c u1D67C               2.23 (Sans Mono)
-U+1d67d u1D67D               2.23 (Sans Mono)
-U+1d67e u1D67E               2.23 (Sans Mono)
-U+1d67f u1D67F               2.23 (Sans Mono)
-U+1d680 u1D680               2.23 (Sans Mono)
-U+1d681 u1D681               2.23 (Sans Mono)
-U+1d682 u1D682               2.23 (Sans Mono)
-U+1d683 u1D683               2.23 (Sans Mono)
-U+1d684 u1D684               2.23 (Sans Mono)
-U+1d685 u1D685               2.23 (Sans Mono)
-U+1d686 u1D686               2.23 (Sans Mono)
-U+1d687 u1D687               2.23 (Sans Mono)
-U+1d688 u1D688               2.23 (Sans Mono)
-U+1d689 u1D689               2.23 (Sans Mono)
-U+1d68a u1D68A               2.23 (Sans Mono)
-U+1d68b u1D68B               2.23 (Sans Mono)
-U+1d68c u1D68C               2.23 (Sans Mono)
-U+1d68d u1D68D               2.23 (Sans Mono)
-U+1d68e u1D68E               2.23 (Sans Mono)
-U+1d68f u1D68F               2.23 (Sans Mono)
-U+1d690 u1D690               2.23 (Sans Mono)
-U+1d691 u1D691               2.23 (Sans Mono)
-U+1d692 u1D692               2.23 (Sans Mono)
-U+1d693 u1D693               2.23 (Sans Mono)
-U+1d694 u1D694               2.23 (Sans Mono)
-U+1d695 u1D695               2.23 (Sans Mono)
-U+1d696 u1D696               2.23 (Sans Mono)
-U+1d697 u1D697               2.23 (Sans Mono)
-U+1d698 u1D698               2.23 (Sans Mono)
-U+1d699 u1D699               2.23 (Sans Mono)
-U+1d69a u1D69A               2.23 (Sans Mono)
-U+1d69b u1D69B               2.23 (Sans Mono)
-U+1d69c u1D69C               2.23 (Sans Mono)
-U+1d69d u1D69D               2.23 (Sans Mono)
-U+1d69e u1D69E               2.23 (Sans Mono)
-U+1d69f u1D69F               2.23 (Sans Mono)
-U+1d6a0 u1D6A0               2.23 (Sans Mono)
-U+1d6a1 u1D6A1               2.23 (Sans Mono)
-U+1d6a2 u1D6A2               2.23 (Sans Mono)
-U+1d6a3 u1D6A3               2.23 (Sans Mono)
-U+1d6a4 u1D6A4               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6a5 u1D6A5               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6a8 u1D6A8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6a9 u1D6A9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6aa u1D6AA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ab u1D6AB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ac u1D6AC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ad u1D6AD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ae u1D6AE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6af u1D6AF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b0 u1D6B0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b1 u1D6B1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b2 u1D6B2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b3 u1D6B3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b4 u1D6B4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b5 u1D6B5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b6 u1D6B6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b7 u1D6B7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b8 u1D6B8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6b9 u1D6B9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ba u1D6BA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bb u1D6BB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bc u1D6BC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bd u1D6BD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6be u1D6BE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6bf u1D6BF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c0 u1D6C0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c1 u1D6C1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c2 u1D6C2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c3 u1D6C3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c4 u1D6C4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c5 u1D6C5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c6 u1D6C6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c7 u1D6C7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c8 u1D6C8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6c9 u1D6C9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ca u1D6CA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cb u1D6CB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cc u1D6CC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cd u1D6CD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6ce u1D6CE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6cf u1D6CF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d0 u1D6D0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d1 u1D6D1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d2 u1D6D2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d3 u1D6D3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d4 u1D6D4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d5 u1D6D5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d6 u1D6D6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d7 u1D6D7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d8 u1D6D8               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6d9 u1D6D9               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6da u1D6DA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6db u1D6DB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6dc u1D6DC               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6dd u1D6DD               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6de u1D6DE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6df u1D6DF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6e0 u1D6E0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6e1 u1D6E1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d6e2 u1D6E2               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e3 u1D6E3               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e4 u1D6E4               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e5 u1D6E5               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e6 u1D6E6               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e7 u1D6E7               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e8 u1D6E8               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6e9 u1D6E9               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ea u1D6EA               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6eb u1D6EB               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ec u1D6EC               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ed u1D6ED               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ee u1D6EE               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ef u1D6EF               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f0 u1D6F0               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f1 u1D6F1               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f2 u1D6F2               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f3 u1D6F3               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f4 u1D6F4               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f5 u1D6F5               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f6 u1D6F6               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f7 u1D6F7               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f8 u1D6F8               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6f9 u1D6F9               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fa u1D6FA               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fb u1D6FB               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fc u1D6FC               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fd u1D6FD               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6fe u1D6FE               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d6ff u1D6FF               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d700 u1D700               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d701 u1D701               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d702 u1D702               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d703 u1D703               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d704 u1D704               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d705 u1D705               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d706 u1D706               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d707 u1D707               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d708 u1D708               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d709 u1D709               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70a u1D70A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70b u1D70B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70c u1D70C               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70d u1D70D               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70e u1D70E               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d70f u1D70F               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d710 u1D710               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d711 u1D711               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d712 u1D712               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d713 u1D713               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d714 u1D714               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d715 u1D715               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d716 u1D716               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d717 u1D717               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d718 u1D718               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d719 u1D719               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d71a u1D71A               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d71b u1D71B               2.23 (Serif Italic, Serif Italic Condensed)
-U+1d71c u1D71C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d71d u1D71D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d71e u1D71E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d71f u1D71F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d720 u1D720               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d721 u1D721               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d722 u1D722               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d723 u1D723               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d724 u1D724               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d725 u1D725               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d726 u1D726               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d727 u1D727               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d728 u1D728               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d729 u1D729               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72a u1D72A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72b u1D72B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72c u1D72C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72d u1D72D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72e u1D72E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d72f u1D72F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d730 u1D730               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d731 u1D731               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d732 u1D732               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d733 u1D733               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d734 u1D734               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d735 u1D735               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d736 u1D736               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d737 u1D737               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d738 u1D738               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d739 u1D739               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73a u1D73A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73b u1D73B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73c u1D73C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73d u1D73D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73e u1D73E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d73f u1D73F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d740 u1D740               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d741 u1D741               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d742 u1D742               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d743 u1D743               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d744 u1D744               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d745 u1D745               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d746 u1D746               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d747 u1D747               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d748 u1D748               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d749 u1D749               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74a u1D74A               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74b u1D74B               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74c u1D74C               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74d u1D74D               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74e u1D74E               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d74f u1D74F               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d750 u1D750               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d751 u1D751               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d752 u1D752               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d753 u1D753               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d754 u1D754               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d755 u1D755               2.23 (Serif Bold Italic, Serif Condensed Bold Italic)
-U+1d756 u1D756               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d757 u1D757               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d758 u1D758               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d759 u1D759               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75a u1D75A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75b u1D75B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75c u1D75C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75d u1D75D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75e u1D75E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d75f u1D75F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d760 u1D760               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d761 u1D761               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d762 u1D762               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d763 u1D763               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d764 u1D764               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d765 u1D765               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d766 u1D766               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d767 u1D767               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d768 u1D768               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d769 u1D769               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76a u1D76A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76b u1D76B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76c u1D76C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76d u1D76D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76e u1D76E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d76f u1D76F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d770 u1D770               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d771 u1D771               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d772 u1D772               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d773 u1D773               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d774 u1D774               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d775 u1D775               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d776 u1D776               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d777 u1D777               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d778 u1D778               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d779 u1D779               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77a u1D77A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77b u1D77B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77c u1D77C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77d u1D77D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77e u1D77E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d77f u1D77F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d780 u1D780               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d781 u1D781               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d782 u1D782               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d783 u1D783               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d784 u1D784               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d785 u1D785               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d786 u1D786               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d787 u1D787               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d788 u1D788               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d789 u1D789               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78a u1D78A               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78b u1D78B               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78c u1D78C               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78d u1D78D               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78e u1D78E               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d78f u1D78F               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d790 u1D790               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d791 u1D791               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d792 u1D792               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d793 u1D793               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d794 u1D794               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d795 u1D795               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d796 u1D796               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d797 u1D797               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d798 u1D798               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d799 u1D799               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79a u1D79A               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79b u1D79B               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79c u1D79C               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79d u1D79D               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79e u1D79E               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d79f u1D79F               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a0 u1D7A0               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a1 u1D7A1               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a2 u1D7A2               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a3 u1D7A3               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a4 u1D7A4               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a5 u1D7A5               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a6 u1D7A6               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a7 u1D7A7               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a8 u1D7A8               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7a9 u1D7A9               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7aa u1D7AA               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ab u1D7AB               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ac u1D7AC               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ad u1D7AD               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ae u1D7AE               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7af u1D7AF               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b0 u1D7B0               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b1 u1D7B1               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b2 u1D7B2               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b3 u1D7B3               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b4 u1D7B4               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b5 u1D7B5               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b6 u1D7B6               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b7 u1D7B7               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b8 u1D7B8               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7b9 u1D7B9               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ba u1D7BA               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bb u1D7BB               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bc u1D7BC               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bd u1D7BD               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7be u1D7BE               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7bf u1D7BF               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c0 u1D7C0               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c1 u1D7C1               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c2 u1D7C2               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c3 u1D7C3               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c4 u1D7C4               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c5 u1D7C5               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c6 u1D7C6               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c7 u1D7C7               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c8 u1D7C8               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7c9 u1D7C9               2.23 (Sans Bold Oblique, Sans Condensed Bold Oblique)
-U+1d7ca u1D7CA               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7cb u1D7CB               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7ce u1D7CE               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7cf u1D7CF               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d0 u1D7D0               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d1 u1D7D1               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d2 u1D7D2               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d3 u1D7D3               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d4 u1D7D4               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d5 u1D7D5               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d6 u1D7D6               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d7 u1D7D7               2.23 (Serif Bold, Serif Condensed Bold)
-U+1d7d8 u1D7D8               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7d9 u1D7D9               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7da u1D7DA               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7db u1D7DB               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7dc u1D7DC               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7dd u1D7DD               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7de u1D7DE               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7df u1D7DF               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7e0 u1D7E0               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7e1 u1D7E1               2.22 (Serif, Serif Condensed) 2.29 (Sans, Sans Bold Oblique, Sans Condensed, Sans Condensed Bold, Sans Condensed Bold Oblique, Sans Condensed Oblique, Sans Oblique) 2.30 (Sans Bold)
-U+1d7e2 u1D7E2               2.23 (Sans, Sans Condensed)
-U+1d7e3 u1D7E3               2.23 (Sans, Sans Condensed)
-U+1d7e4 u1D7E4               2.23 (Sans, Sans Condensed)
-U+1d7e5 u1D7E5               2.23 (Sans, Sans Condensed)
-U+1d7e6 u1D7E6               2.23 (Sans, Sans Condensed)
-U+1d7e7 u1D7E7               2.23 (Sans, Sans Condensed)
-U+1d7e8 u1D7E8               2.23 (Sans, Sans Condensed)
-U+1d7e9 u1D7E9               2.23 (Sans, Sans Condensed)
-U+1d7ea u1D7EA               2.23 (Sans, Sans Condensed)
-U+1d7eb u1D7EB               2.23 (Sans, Sans Condensed)
-U+1d7ec u1D7EC               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7ed u1D7ED               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7ee u1D7EE               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7ef u1D7EF               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f0 u1D7F0               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f1 u1D7F1               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f2 u1D7F2               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f3 u1D7F3               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f4 u1D7F4               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f5 u1D7F5               2.23 (Sans Bold, Sans Condensed Bold)
-U+1d7f6 u1D7F6               2.23 (Sans Mono)
-U+1d7f7 u1D7F7               2.23 (Sans Mono)
-U+1d7f8 u1D7F8               2.23 (Sans Mono)
-U+1d7f9 u1D7F9               2.23 (Sans Mono)
-U+1d7fa u1D7FA               2.23 (Sans Mono)
-U+1d7fb u1D7FB               2.23 (Sans Mono)
-U+1d7fc u1D7FC               2.23 (Sans Mono)
-U+1d7fd u1D7FD               2.23 (Sans Mono)
-U+1d7fe u1D7FE               2.23 (Sans Mono)
-U+1d7ff u1D7FF               2.23 (Sans Mono)
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/unicover.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/unicover.txt
deleted file mode 100644
index 49034b25d31..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavu-fonts-ttf-2.30/unicover.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-This is the Unicode coverage file for DejaVu fonts
-
-Control and similar characters are discounted from totals.
-
-                                                Sans               Serif              Sans Mono          
-U+0000 Basic Latin                              100% (95/95)       100% (95/95)       100% (95/95)      
-U+0080 Latin-1 Supplement                       100% (96/96)       100% (96/96)       100% (96/96)      
-U+0100 Latin Extended-A                         100% (128/128)     100% (128/128)     100% (128/128)    
-U+0180 Latin Extended-B                         100% (208/208)      91% (191/208)      86% (179/208)    
-U+0250 IPA Extensions                           100% (96/96)       100% (96/96)       100% (96/96)      
-U+02b0 Spacing Modifier Letters                  78% (63/80)        56% (45/80)        60% (48/80)      
-U+0300 Combining Diacritical Marks               83% (93/112)       60% (68/112)       59% (67/112)     
-U+0370 Greek and Coptic                         100% (134/134)      85% (115/134)      82% (110/134)    
-U+0400 Cyrillic                                 100% (256/256)      78% (200/256)      69% (178/256)    
-U+0500 Cyrillic Supplement                       94% (34/36)        27% (10/36)        16% (6/36)       
-U+0530 Armenian                                 100% (86/86)            (0/86)             (0/86)       
-U+0590 Hebrew                                    62% (54/87)            (0/87)             (0/87)       
-U+0600 Arabic                                    46% (115/250)          (0/250)        39% (99/250)     
-U+0700 Syriac                                        (0/77)             (0/77)             (0/77)       
-U+0750 Arabic Supplement                             (0/48)             (0/48)             (0/48)       
-U+0780 Thaana                                        (0/50)             (0/50)             (0/50)       
-U+07c0 NKo                                       91% (54/59)            (0/59)             (0/59)       
-U+0900 Devanagari                                    (0/113)            (0/113)            (0/113)      
-U+0980 Bengali                                       (0/91)             (0/91)             (0/91)       
-U+0a00 Gurmukhi                                      (0/79)             (0/79)             (0/79)       
-U+0a80 Gujarati                                      (0/83)             (0/83)             (0/83)       
-U+0b00 Oriya                                         (0/84)             (0/84)             (0/84)       
-U+0b80 Tamil                                         (0/72)             (0/72)             (0/72)       
-U+0c00 Telugu                                        (0/93)             (0/93)             (0/93)       
-U+0c80 Kannada                                       (0/86)             (0/86)             (0/86)       
-U+0d00 Malayalam                                     (0/95)             (0/95)             (0/95)       
-U+0d80 Sinhala                                       (0/80)             (0/80)             (0/80)       
-U+0e00 Thai                                       1% (1/87)             (0/87)             (0/87)       
-U+0e80 Lao                                      100% (65/65)            (0/65)         70% (46/65)      
-U+0f00 Tibetan                                       (0/201)            (0/201)            (0/201)      
-U+1000 Myanmar                                       (0/156)            (0/156)            (0/156)      
-U+10a0 Georgian                                 100% (83/83)       100% (83/83)        54% (45/83)      
-U+1100 Hangul Jamo                                   (0/240)            (0/240)            (0/240)      
-U+1200 Ethiopic                                      (0/356)            (0/356)            (0/356)      
-U+1380 Ethiopic Supplement                           (0/26)             (0/26)             (0/26)       
-U+13a0 Cherokee                                      (0/85)             (0/85)             (0/85)       
-U+1400 Unified Canadian Aboriginal Syllabics     64% (404/630)          (0/630)            (0/630)      
-U+1680 Ogham                                    100% (29/29)            (0/29)             (0/29)       
-U+16a0 Runic                                         (0/81)             (0/81)             (0/81)       
-U+1700 Tagalog                                       (0/20)             (0/20)             (0/20)       
-U+1720 Hanunoo                                       (0/23)             (0/23)             (0/23)       
-U+1740 Buhid                                         (0/20)             (0/20)             (0/20)       
-U+1760 Tagbanwa                                      (0/18)             (0/18)             (0/18)       
-U+1780 Khmer                                         (0/114)            (0/114)            (0/114)      
-U+1800 Mongolian                                     (0/156)            (0/156)            (0/156)      
-U+1900 Limbu                                         (0/66)             (0/66)             (0/66)       
-U+1950 Tai Le                                        (0/35)             (0/35)             (0/35)       
-U+1980 New Tai Lue                                   (0/80)             (0/80)             (0/80)       
-U+19e0 Khmer Symbols                                 (0/32)             (0/32)             (0/32)       
-U+1a00 Buginese                                      (0/30)             (0/30)             (0/30)       
-U+1b00 Balinese                                      (0/121)            (0/121)            (0/121)      
-U+1b80 Sundanese                                     (0/55)             (0/55)             (0/55)       
-U+1c00 Lepcha                                        (0/74)             (0/74)             (0/74)       
-U+1c50 Ol Chiki                                      (0/48)             (0/48)             (0/48)       
-U+1d00 Phonetic Extensions                       82% (105/128)      48% (62/128)       48% (62/128)     
-U+1d80 Phonetic Extensions Supplement            59% (38/64)        57% (37/64)        57% (37/64)      
-U+1dc0 Combining Diacritical Marks Supplement    14% (6/41)         14% (6/41)             (0/41)       
-U+1e00 Latin Extended Additional                 96% (248/256)      76% (196/256)      71% (182/256)    
-U+1f00 Greek Extended                           100% (233/233)     100% (233/233)     100% (233/233)    
-U+2000 General Punctuation                       98% (105/107)      81% (87/107)       47% (51/107)     
-U+2070 Superscripts and Subscripts              100% (34/34)       100% (34/34)       100% (34/34)      
-U+20a0 Currency Symbols                         100% (22/22)        27% (6/22)        100% (22/22)      
-U+20d0 Combining Diacritical Marks for Symbols   21% (7/33)             (0/33)             (0/33)       
-U+2100 Letterlike Symbols                        93% (75/80)        40% (32/80)        21% (17/80)      
-U+2150 Number Forms                              92% (50/54)        92% (50/54)        24% (13/54)      
-U+2190 Arrows                                   100% (112/112)     100% (112/112)     100% (112/112)    
-U+2200 Mathematical Operators                   100% (256/256)      39% (100/256)      58% (151/256)    
-U+2300 Miscellaneous Technical                   27% (64/232)        6% (16/232)       50% (117/232)    
-U+2400 Control Pictures                           5% (2/39)          2% (1/39)          2% (1/39)       
-U+2440 Optical Character Recognition                 (0/11)             (0/11)             (0/11)       
-U+2460 Enclosed Alphanumerics                     6% (10/160)           (0/160)            (0/160)      
-U+2500 Box Drawing                              100% (128/128)     100% (128/128)     100% (128/128)    
-U+2580 Block Elements                           100% (32/32)       100% (32/32)       100% (32/32)      
-U+25a0 Geometric Shapes                         100% (96/96)       100% (96/96)       100% (96/96)      
-U+2600 Miscellaneous Symbols                     95% (182/191)      15% (30/191)       78% (149/191)    
-U+2700 Dingbats                                 100% (174/174)       0% (1/174)        82% (144/174)    
-U+27c0 Miscellaneous Mathematical Symbols-A      20% (9/44)         11% (5/44)         11% (5/44)       
-U+27f0 Supplemental Arrows-A                    100% (16/16)       100% (16/16)            (0/16)       
-U+2800 Braille Patterns                         100% (256/256)     100% (256/256)          (0/256)      
-U+2900 Supplemental Arrows-B                      4% (6/128)       100% (128/128)          (0/128)      
-U+2980 Miscellaneous Mathematical Symbols-B      10% (13/128)        0% (1/128)         2% (3/128)      
-U+2a00 Supplemental Mathematical Operators       28% (72/256)        1% (4/256)         0% (1/256)      
-U+2b00 Miscellaneous Symbols and Arrows          42% (35/82)        32% (27/82)        10% (9/82)       
-U+2c00 Glagolitic                                    (0/94)             (0/94)             (0/94)       
-U+2c60 Latin Extended-C                          96% (28/29)        55% (16/29)        34% (10/29)      
-U+2c80 Coptic                                        (0/114)            (0/114)            (0/114)      
-U+2d00 Georgian Supplement                           (0/38)        100% (38/38)            (0/38)       
-U+2d30 Tifinagh                                 100% (55/55)            (0/55)             (0/55)       
-U+2d80 Ethiopic Extended                             (0/79)             (0/79)             (0/79)       
-U+2de0 Cyrillic Extended-A                           (0/32)             (0/32)             (0/32)       
-U+2e00 Supplemental Punctuation                  12% (6/49)         12% (6/49)         12% (6/49)       
-U+2e80 CJK Radicals Supplement                       (0/115)            (0/115)            (0/115)      
-U+2f00 Kangxi Radicals                               (0/214)            (0/214)            (0/214)      
-U+2ff0 Ideographic Description Characters            (0/12)             (0/12)             (0/12)       
-U+3000 CJK Symbols and Punctuation                   (0/64)             (0/64)             (0/64)       
-U+3040 Hiragana                                      (0/93)             (0/93)             (0/93)       
-U+30a0 Katakana                                      (0/96)             (0/96)             (0/96)       
-U+3100 Bopomofo                                      (0/41)             (0/41)             (0/41)       
-U+3130 Hangul Compatibility Jamo                     (0/94)             (0/94)             (0/94)       
-U+3190 Kanbun                                        (0/16)             (0/16)             (0/16)       
-U+31a0 Bopomofo Extended                             (0/24)             (0/24)             (0/24)       
-U+31c0 CJK Strokes                                   (0/36)             (0/36)             (0/36)       
-U+31f0 Katakana Phonetic Extensions                  (0/16)             (0/16)             (0/16)       
-U+3200 Enclosed CJK Letters and Months               (0/242)            (0/242)            (0/242)      
-U+3300 CJK Compatibility                             (0/256)            (0/256)            (0/256)      
-U+3400 CJK Unified Ideographs Extension A            (0/0)              (0/0)              (0/0)        
-U+4dc0 Yijing Hexagram Symbols                  100% (64/64)            (0/64)             (0/64)       
-U+4e00 CJK Unified Ideographs                        (0/0)              (0/0)              (0/0)        
-U+a000 Yi Syllables                                  (0/1165)           (0/1165)           (0/1165)     
-U+a490 Yi Radicals                                   (0/55)             (0/55)             (0/55)       
-U+a500 Vai                                           (0/300)            (0/300)            (0/300)      
-U+a640 Cyrillic Extended-B                       39% (31/78)        12% (10/78)            (0/78)       
-U+a700 Modifier Tone Letters                     62% (20/32)        62% (20/32)        62% (20/32)      
-U+a720 Latin Extended-D                          37% (43/114)        1% (2/114)         5% (6/114)      
-U+a800 Syloti Nagri                                  (0/44)             (0/44)             (0/44)       
-U+a840 Phags-pa                                      (0/56)             (0/56)             (0/56)       
-U+a880 Saurashtra                                    (0/81)             (0/81)             (0/81)       
-U+a900 Kayah Li                                      (0/48)             (0/48)             (0/48)       
-U+a930 Rejang                                        (0/37)             (0/37)             (0/37)       
-U+aa00 Cham                                          (0/83)             (0/83)             (0/83)       
-U+ac00 Hangul Syllables                              (0/0)              (0/0)              (0/0)        
-U+d800 High Surrogates                               (0/0)              (0/0)              (0/0)        
-U+db80 High Private Use Surrogates                   (0/0)              (0/0)              (0/0)        
-U+dc00 Low Surrogates                                (0/0)              (0/0)              (0/0)        
-U+e000 Private Use Area                              (0/0)              (0/0)              (0/0)        
-U+f900 CJK Compatibility Ideographs                  (0/467)            (0/467)            (0/467)      
-U+fb00 Alphabetic Presentation Forms            100% (58/58)        12% (7/58)          3% (2/58)       
-U+fb50 Arabic Presentation Forms-A               11% (70/595)           (0/595)        12% (72/595)     
-U+fe00 Variation Selectors                      100% (16/16)       100% (16/16)            (0/16)       
-U+fe10 Vertical Forms                                (0/10)             (0/10)             (0/10)       
-U+fe20 Combining Half Marks                      57% (4/7)              (0/7)              (0/7)        
-U+fe30 CJK Compatibility Forms                       (0/32)             (0/32)             (0/32)       
-U+fe50 Small Form Variants                           (0/26)             (0/26)             (0/26)       
-U+fe70 Arabic Presentation Forms-B              100% (141/141)          (0/141)       100% (141/141)    
-U+ff00 Halfwidth and Fullwidth Forms                 (0/225)            (0/225)            (0/225)      
-U+fff0 Specials                                 100% (5/5)         100% (5/5)         100% (5/5)        
-U+10000 Linear B Syllabary                            (0/88)             (0/88)             (0/88)       
-U+10080 Linear B Ideograms                            (0/123)            (0/123)            (0/123)      
-U+10100 Aegean Numbers                                (0/57)             (0/57)             (0/57)       
-U+10140 Ancient Greek Numbers                         (0/75)             (0/75)             (0/75)       
-U+10190 Ancient Symbols                               (0/12)             (0/12)             (0/12)       
-U+101d0 Phaistos Disc                                 (0/46)             (0/46)             (0/46)       
-U+10280 Lycian                                        (0/29)             (0/29)             (0/29)       
-U+102a0 Carian                                        (0/49)             (0/49)             (0/49)       
-U+10300 Old Italic                                    (0/35)             (0/35)             (0/35)       
-U+10330 Gothic                                        (0/27)             (0/27)             (0/27)       
-U+10380 Ugaritic                                      (0/31)             (0/31)             (0/31)       
-U+103a0 Old Persian                                   (0/50)             (0/50)             (0/50)       
-U+10400 Deseret                                       (0/80)             (0/80)             (0/80)       
-U+10450 Shavian                                       (0/48)             (0/48)             (0/48)       
-U+10480 Osmanya                                       (0/40)             (0/40)             (0/40)       
-U+10800 Cypriot Syllabary                             (0/55)             (0/55)             (0/55)       
-U+10900 Phoenician                                    (0/27)             (0/27)             (0/27)       
-U+10920 Lydian                                        (0/27)             (0/27)             (0/27)       
-U+10a00 Kharoshthi                                    (0/65)             (0/65)             (0/65)       
-U+12000 Cuneiform                                     (0/879)            (0/879)            (0/879)      
-U+12400 Cuneiform Numbers and Punctuation             (0/103)            (0/103)            (0/103)      
-U+1d000 Byzantine Musical Symbols                     (0/246)            (0/246)            (0/246)      
-U+1d100 Musical Symbols                               (0/220)            (0/220)            (0/220)      
-U+1d200 Ancient Greek Musical Notation                (0/70)             (0/70)             (0/70)       
-U+1d300 Tai Xuan Jing Symbols                    100% (87/87)            (0/87)             (0/87)       
-U+1d360 Counting Rod Numerals                         (0/18)             (0/18)             (0/18)       
-U+1d400 Mathematical Alphanumeric Symbols         11% (117/996)       5% (55/996)        6% (62/996)     
-U+1f000 Mahjong Tiles                                 (0/44)             (0/44)             (0/44)       
-U+1f030 Domino Tiles                                  (0/100)            (0/100)            (0/100)      
-U+20000 CJK Unified Ideographs Extension B            (0/0)              (0/0)              (0/0)        
-U+2f800 CJK Compatibility Ideographs Supplement       (0/542)            (0/542)            (0/542)      
-U+e0000 Tags                                          (0/98)             (0/98)             (0/98)       
-U+e0100 Variation Selectors Supplement                (0/240)            (0/240)            (0/240)      
-U+f0000 Supplementary Private Use Area-A              (0/0)              (0/0)              (0/0)        
-U+100000 Supplementary Private Use Area-B              (0/0)              (0/0)              (0/0)        
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusans.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusans.php
deleted file mode 100644
index 872dd9428e0..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusans.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>30,'Flags'=>96,'FontBBox'=>'[-1021 -350 1681 1167]','ItalicAngle'=>20.8,'StemV'=>70,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>318,33=>401,34=>460,35=>838,36=>636,37=>950,38=>780,39=>275,40=>390,
-41=>390,42=>500,43=>838,44=>318,45=>361,46=>318,47=>337,48=>636,49=>636,50=>636,
-51=>636,52=>636,53=>636,54=>636,55=>636,56=>636,57=>636,58=>337,59=>337,60=>838,
-61=>838,62=>838,63=>531,64=>1000,65=>684,66=>686,67=>698,68=>770,69=>632,70=>575,
-71=>775,72=>752,73=>295,74=>295,75=>656,76=>557,77=>863,78=>748,79=>787,80=>603,
-81=>787,82=>695,83=>635,84=>611,85=>732,86=>684,87=>989,88=>685,89=>611,90=>685,
-91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>613,98=>635,99=>550,100=>635,
-101=>615,102=>352,103=>635,104=>634,105=>278,106=>278,107=>579,108=>278,109=>974,110=>634,
-111=>612,112=>635,113=>635,114=>411,115=>521,116=>392,117=>634,118=>592,119=>818,120=>592,
-121=>592,122=>525,123=>636,124=>337,125=>636,126=>838,8364=>636,8218=>318,402=>352,8222=>518,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1342,352=>635,8249=>400,338=>1070,381=>685,8216=>318,
-8217=>318,8220=>518,8221=>518,8226=>590,8211=>500,8212=>1000,732=>500,8482=>1000,353=>521,8250=>400,
-339=>1023,382=>525,376=>611,160=>318,161=>401,162=>636,163=>636,164=>636,165=>636,166=>337,
-167=>500,168=>500,169=>1000,170=>471,171=>612,172=>838,173=>361,174=>1000,175=>500,176=>500,
-177=>838,178=>401,179=>401,180=>500,181=>636,182=>636,183=>318,184=>500,185=>401,186=>471,
-187=>612,188=>969,189=>969,190=>969,191=>531,192=>684,193=>684,194=>684,195=>684,196=>684,
-197=>684,198=>974,199=>698,200=>632,201=>632,202=>632,203=>632,204=>295,205=>295,206=>295,
-207=>295,208=>775,209=>748,210=>787,211=>787,212=>787,213=>787,214=>787,215=>838,216=>787,
-217=>732,218=>732,219=>732,220=>732,221=>611,222=>605,223=>630,224=>613,225=>613,226=>613,
-227=>613,228=>613,229=>613,230=>982,231=>550,232=>615,233=>615,234=>615,235=>615,236=>278,
-237=>278,238=>278,239=>278,240=>612,241=>634,242=>612,243=>612,244=>612,245=>612,246=>612,
-247=>838,248=>612,249=>634,250=>634,251=>634,252=>634,253=>592,254=>635,255=>592,256=>684,
-257=>613,258=>684,259=>613,260=>684,261=>613,262=>698,263=>550,264=>698,265=>550,266=>698,
-267=>550,268=>698,269=>550,270=>770,271=>635,272=>775,273=>635,274=>632,275=>615,276=>632,
-277=>615,278=>632,279=>615,280=>632,281=>615,282=>632,283=>615,284=>775,285=>635,286=>775,
-287=>635,288=>775,289=>635,290=>775,291=>635,292=>752,293=>634,294=>916,295=>695,296=>295,
-297=>278,298=>295,299=>278,300=>295,301=>278,302=>295,303=>278,304=>295,305=>278,306=>590,
-307=>556,308=>295,309=>278,310=>656,311=>579,312=>579,313=>557,314=>278,315=>557,316=>278,
-317=>557,318=>375,319=>557,320=>342,321=>562,322=>284,323=>748,324=>634,325=>748,326=>634,
-327=>748,328=>634,329=>813,330=>748,331=>634,332=>787,333=>612,334=>787,335=>612,336=>787,
-337=>612,340=>695,341=>411,342=>695,343=>411,344=>695,345=>411,346=>635,347=>521,348=>635,
-349=>521,350=>635,351=>521,354=>611,355=>392,356=>611,357=>392,358=>611,359=>392,360=>732,
-361=>634,362=>732,363=>634,364=>732,365=>634,366=>732,367=>634,368=>732,369=>634,370=>732,
-371=>634,372=>989,373=>818,374=>611,375=>592,377=>685,378=>525,379=>685,380=>525,383=>352,
-384=>635,385=>735,386=>686,387=>635,388=>686,389=>635,390=>703,391=>698,392=>550,393=>775,
-394=>819,395=>686,396=>635,397=>612,398=>632,399=>787,400=>614,401=>575,403=>775,404=>687,
-405=>984,406=>354,407=>295,408=>746,409=>579,410=>278,411=>592,412=>974,413=>748,414=>634,
-415=>787,416=>913,417=>612,418=>949,419=>759,420=>652,421=>635,422=>695,423=>635,424=>521,
-425=>632,426=>336,427=>392,428=>611,429=>392,430=>611,431=>858,432=>634,433=>764,434=>721,
-435=>744,436=>730,437=>685,438=>525,439=>666,440=>666,441=>578,442=>525,443=>636,444=>666,
-445=>578,446=>510,447=>635,448=>295,449=>492,450=>459,451=>295,452=>1422,453=>1299,454=>1154,
-455=>835,456=>787,457=>457,458=>931,459=>924,460=>797,461=>684,462=>613,463=>295,464=>278,
-465=>787,466=>612,467=>732,468=>634,469=>732,470=>634,471=>732,472=>634,473=>732,474=>634,
-475=>732,476=>634,477=>615,478=>684,479=>613,480=>684,481=>613,482=>974,483=>982,484=>775,
-485=>635,486=>775,487=>635,488=>656,489=>579,490=>787,491=>612,492=>787,493=>612,494=>666,
-495=>578,496=>278,497=>1422,498=>1299,499=>1154,500=>775,501=>635,502=>1113,503=>682,504=>748,
-505=>634,506=>684,507=>613,508=>974,509=>982,510=>787,511=>612,512=>684,513=>613,514=>684,
-515=>613,516=>632,517=>615,518=>632,519=>615,520=>295,521=>278,522=>295,523=>278,524=>787,
-525=>612,526=>787,527=>612,528=>695,529=>411,530=>695,531=>411,532=>732,533=>634,534=>732,
-535=>634,536=>635,537=>521,538=>611,539=>392,540=>627,541=>521,542=>752,543=>634,544=>735,
-545=>838,546=>698,547=>610,548=>685,549=>525,550=>684,551=>613,552=>632,553=>615,554=>787,
-555=>612,556=>787,557=>612,558=>787,559=>612,560=>787,561=>612,562=>611,563=>592,564=>475,
-565=>843,566=>477,567=>278,568=>998,569=>998,570=>684,571=>698,572=>550,573=>557,574=>611,
-575=>521,576=>525,577=>603,578=>479,579=>686,580=>732,581=>684,582=>632,583=>615,584=>295,
-585=>278,586=>781,587=>635,588=>695,589=>411,590=>611,591=>592,592=>600,593=>635,594=>635,
-595=>635,596=>549,597=>550,598=>635,599=>696,600=>615,601=>615,602=>819,603=>541,604=>532,
-605=>775,606=>664,607=>278,608=>696,609=>635,610=>629,611=>596,612=>596,613=>634,614=>634,
-615=>634,616=>278,617=>338,618=>372,619=>396,620=>487,621=>278,622=>706,623=>974,624=>974,
-625=>974,626=>646,627=>642,628=>634,629=>612,630=>858,631=>728,632=>660,633=>414,634=>414,
-635=>414,636=>411,637=>411,638=>530,639=>530,640=>604,641=>604,642=>521,643=>336,644=>336,
-645=>461,646=>336,647=>392,648=>392,649=>634,650=>618,651=>598,652=>592,653=>818,654=>592,
-655=>611,656=>525,657=>525,658=>578,659=>578,660=>510,661=>510,662=>510,663=>510,664=>787,
-665=>580,666=>664,667=>708,668=>654,669=>292,670=>667,671=>507,672=>727,673=>510,674=>510,
-675=>1014,676=>1058,677=>1013,678=>824,679=>610,680=>778,681=>848,682=>641,683=>654,684=>515,
-685=>515,686=>661,687=>664,688=>404,689=>399,690=>175,691=>259,692=>295,693=>296,694=>379,
-695=>515,696=>373,697=>278,698=>460,699=>318,700=>318,701=>318,702=>307,703=>307,704=>370,
-705=>370,706=>500,707=>500,708=>500,709=>500,711=>500,712=>275,713=>500,714=>500,715=>500,
-716=>275,717=>500,718=>500,719=>500,720=>337,721=>337,722=>307,723=>307,724=>500,725=>500,
-726=>390,727=>317,728=>500,729=>500,730=>500,731=>500,733=>500,734=>315,735=>500,736=>426,
-737=>166,738=>373,739=>444,740=>370,741=>493,742=>493,743=>493,744=>493,745=>493,748=>500,
-749=>500,750=>518,755=>500,759=>500,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>654,881=>568,882=>862,
-883=>647,884=>278,885=>278,886=>748,887=>650,890=>500,891=>549,892=>550,893=>549,894=>337,
-900=>500,901=>500,902=>692,903=>318,904=>746,905=>871,906=>408,908=>813,910=>825,911=>826,
-912=>338,913=>684,914=>686,915=>557,916=>684,917=>632,918=>685,919=>752,920=>787,921=>295,
-922=>656,923=>684,924=>863,925=>748,926=>632,927=>787,928=>752,929=>603,931=>632,932=>611,
-933=>611,934=>787,935=>685,936=>787,937=>764,938=>295,939=>611,940=>659,941=>541,942=>634,
-943=>338,944=>579,945=>659,946=>638,947=>592,948=>612,949=>541,950=>544,951=>634,952=>612,
-953=>338,954=>589,955=>592,956=>636,957=>559,958=>558,959=>612,960=>602,961=>635,962=>587,
-963=>634,964=>602,965=>579,966=>660,967=>578,968=>660,969=>837,970=>338,971=>579,972=>612,
-973=>579,974=>837,975=>656,976=>614,977=>619,978=>699,979=>842,980=>699,981=>660,982=>837,
-983=>664,984=>787,985=>612,986=>648,987=>587,988=>575,989=>458,990=>660,991=>660,992=>865,
-993=>627,994=>934,995=>837,996=>758,997=>659,998=>792,999=>615,1000=>687,1001=>607,1002=>768,
-1003=>625,1004=>699,1005=>612,1006=>611,1007=>536,1008=>664,1009=>635,1010=>550,1011=>278,1012=>787,
-1013=>615,1014=>615,1015=>605,1016=>635,1017=>698,1018=>863,1019=>651,1020=>635,1021=>703,1022=>698,
-1023=>703,1024=>632,1025=>632,1026=>786,1027=>610,1028=>698,1029=>635,1030=>295,1031=>295,1032=>295,
-1033=>1094,1034=>1045,1035=>786,1036=>710,1037=>748,1038=>609,1039=>752,1040=>684,1041=>686,1042=>686,
-1043=>610,1044=>781,1045=>632,1046=>1077,1047=>641,1048=>748,1049=>748,1050=>710,1051=>752,1052=>863,
-1053=>752,1054=>787,1055=>752,1056=>603,1057=>698,1058=>611,1059=>609,1060=>861,1061=>685,1062=>776,
-1063=>686,1064=>1069,1065=>1094,1066=>833,1067=>882,1068=>686,1069=>698,1070=>1080,1071=>695,1072=>613,
-1073=>617,1074=>589,1075=>525,1076=>691,1077=>615,1078=>901,1079=>532,1080=>650,1081=>650,1082=>604,
-1083=>639,1084=>754,1085=>654,1086=>612,1087=>654,1088=>635,1089=>550,1090=>583,1091=>592,1092=>855,
-1093=>592,1094=>681,1095=>591,1096=>915,1097=>942,1098=>707,1099=>790,1100=>589,1101=>549,1102=>842,
-1103=>602,1104=>615,1105=>615,1106=>625,1107=>525,1108=>549,1109=>521,1110=>278,1111=>278,1112=>278,
-1113=>902,1114=>898,1115=>652,1116=>604,1117=>650,1118=>592,1119=>654,1120=>934,1121=>837,1122=>771,
-1123=>672,1124=>942,1125=>749,1126=>879,1127=>783,1128=>1160,1129=>1001,1130=>787,1131=>612,1132=>1027,
-1133=>824,1134=>636,1135=>541,1136=>856,1137=>876,1138=>787,1139=>612,1140=>781,1141=>665,1142=>781,
-1143=>665,1144=>992,1145=>904,1146=>953,1147=>758,1148=>1180,1149=>1028,1150=>934,1151=>837,1152=>698,
-1153=>550,1154=>502,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>772,
-1163=>677,1164=>686,1165=>589,1166=>603,1167=>635,1168=>610,1169=>525,1170=>675,1171=>590,1172=>624,
-1173=>530,1174=>1077,1175=>901,1176=>641,1177=>532,1178=>710,1179=>604,1180=>710,1181=>604,1182=>710,
-1183=>604,1184=>856,1185=>832,1186=>752,1187=>661,1188=>1014,1189=>877,1190=>1081,1191=>916,1192=>878,
-1193=>693,1194=>698,1195=>550,1196=>611,1197=>583,1198=>611,1199=>592,1200=>611,1201=>592,1202=>685,
-1203=>592,1204=>934,1205=>807,1206=>686,1207=>591,1208=>686,1209=>591,1210=>686,1211=>634,1212=>941,
-1213=>728,1214=>941,1215=>728,1216=>295,1217=>1077,1218=>901,1219=>656,1220=>604,1221=>776,1222=>670,
-1223=>752,1224=>661,1225=>776,1226=>681,1227=>686,1228=>591,1229=>888,1230=>774,1231=>278,1232=>684,
-1233=>613,1234=>684,1235=>613,1236=>974,1237=>982,1238=>632,1239=>615,1240=>787,1241=>615,1242=>787,
-1243=>615,1244=>1077,1245=>901,1246=>641,1247=>532,1248=>666,1249=>578,1250=>748,1251=>650,1252=>748,
-1253=>650,1254=>787,1255=>612,1256=>787,1257=>612,1258=>787,1259=>612,1260=>698,1261=>549,1262=>609,
-1263=>592,1264=>609,1265=>592,1266=>609,1267=>592,1268=>686,1269=>591,1270=>610,1271=>525,1272=>882,
-1273=>790,1274=>675,1275=>590,1276=>685,1277=>592,1278=>685,1279=>592,1280=>686,1281=>589,1282=>1006,
-1283=>897,1284=>975,1285=>869,1286=>679,1287=>588,1288=>1072,1289=>957,1290=>1113,1291=>967,1292=>775,
-1293=>660,1294=>773,1295=>711,1296=>614,1297=>541,1298=>752,1299=>639,1300=>1169,1301=>994,1302=>894,
-1303=>864,1304=>1032,1305=>986,1306=>787,1307=>635,1308=>989,1309=>818,1312=>1081,1313=>905,1314=>1081,
-1315=>912,1316=>793,1317=>683,1329=>867,1330=>732,1331=>882,1332=>882,1333=>732,1334=>644,1335=>682,
-1336=>732,1337=>851,1338=>882,1339=>732,1340=>557,1341=>824,1342=>986,1343=>732,1344=>707,1345=>644,
-1346=>882,1347=>777,1348=>882,1349=>732,1350=>840,1351=>732,1352=>732,1353=>732,1354=>791,1355=>644,
-1356=>882,1357=>732,1358=>882,1359=>635,1360=>732,1361=>732,1362=>799,1363=>787,1364=>790,1365=>787,
-1366=>635,1369=>307,1370=>318,1371=>500,1372=>500,1373=>392,1374=>526,1375=>500,1377=>974,1378=>634,
-1379=>762,1380=>767,1381=>634,1382=>697,1383=>533,1384=>634,1385=>700,1386=>697,1387=>634,1388=>404,
-1389=>894,1390=>641,1391=>634,1392=>634,1393=>635,1394=>702,1395=>634,1396=>659,1397=>278,1398=>760,
-1399=>516,1400=>634,1401=>453,1402=>974,1403=>516,1404=>769,1405=>634,1406=>696,1407=>974,1408=>634,
-1409=>635,1410=>501,1411=>974,1412=>648,1413=>612,1414=>629,1415=>763,1417=>337,1418=>433,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>361,1471=>0,1472=>295,1473=>0,1474=>0,1475=>295,1478=>441,
-1479=>0,1488=>629,1489=>608,1490=>448,1491=>594,1492=>640,1493=>272,1494=>374,1495=>640,1496=>648,
-1497=>272,1498=>592,1499=>556,1500=>599,1501=>640,1502=>659,1503=>272,1504=>441,1505=>700,1506=>563,
-1507=>640,1508=>604,1509=>521,1510=>581,1511=>663,1512=>592,1513=>808,1514=>657,1520=>471,1521=>454,
-1522=>471,1523=>416,1524=>645,1542=>637,1543=>637,1545=>757,1546=>977,1548=>323,1557=>0,1563=>318,
-1567=>531,1569=>470,1570=>278,1571=>278,1572=>483,1573=>278,1574=>783,1575=>278,1576=>941,1577=>524,
-1578=>941,1579=>941,1580=>646,1581=>646,1582=>646,1583=>445,1584=>445,1585=>483,1586=>483,1587=>1221,
-1588=>1221,1589=>1209,1590=>1209,1591=>925,1592=>925,1593=>597,1594=>597,1600=>293,1601=>1037,1602=>776,
-1603=>824,1604=>727,1605=>619,1606=>734,1607=>524,1608=>483,1609=>783,1610=>783,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>500,
-1632=>537,1633=>537,1634=>537,1635=>537,1636=>537,1637=>537,1638=>537,1639=>537,1640=>537,1641=>537,
-1642=>537,1643=>325,1644=>318,1645=>545,1646=>941,1647=>776,1652=>292,1657=>941,1658=>941,1659=>941,
-1660=>941,1661=>941,1662=>941,1663=>941,1664=>941,1665=>646,1666=>646,1667=>646,1668=>646,1669=>646,
-1670=>646,1671=>646,1681=>483,1682=>483,1685=>610,1688=>483,1697=>1037,1700=>1037,1702=>1037,1705=>895,
-1711=>895,1717=>727,1722=>734,1727=>646,1734=>483,1740=>783,1742=>783,1749=>524,1776=>537,1777=>537,
-1778=>537,1779=>537,1780=>537,1781=>537,1782=>537,1783=>537,1784=>537,1785=>537,1984=>636,1985=>636,
-1986=>636,1987=>636,1988=>636,1989=>636,1990=>636,1991=>636,1992=>636,1993=>636,1994=>278,1995=>571,
-1996=>424,1997=>592,1998=>654,1999=>654,2000=>594,2001=>654,2002=>829,2003=>438,2004=>438,2005=>559,
-2006=>612,2007=>350,2008=>959,2009=>473,2010=>783,2011=>654,2012=>625,2013=>734,2014=>530,2015=>724,
-2016=>473,2017=>625,2018=>594,2019=>530,2020=>530,2021=>522,2022=>594,2023=>594,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>313,2037=>313,2040=>560,
-2041=>560,2042=>361,3647=>652,3713=>670,3714=>684,3716=>688,3719=>482,3720=>628,3722=>684,3725=>688,
-3732=>669,3733=>642,3734=>645,3735=>655,3737=>659,3738=>625,3739=>625,3740=>745,3741=>767,3742=>687,
-3743=>687,3745=>702,3746=>688,3747=>684,3749=>649,3751=>632,3754=>703,3755=>819,3757=>633,3758=>684,
-3759=>788,3760=>632,3761=>0,3762=>539,3763=>539,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>663,3776=>375,3777=>657,3778=>460,3779=>547,3780=>491,3782=>674,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>636,3793=>641,3794=>641,3795=>670,
-3796=>625,3797=>625,3798=>703,3799=>670,3800=>674,3801=>677,3804=>1028,3805=>1028,4256=>840,4257=>690,
-4258=>642,4259=>759,4260=>591,4261=>686,4262=>789,4263=>811,4264=>467,4265=>565,4266=>789,4267=>793,
-4268=>584,4269=>837,4270=>750,4271=>688,4272=>811,4273=>584,4274=>584,4275=>837,4276=>837,4277=>646,
-4278=>604,4279=>584,4280=>596,4281=>584,4282=>721,4283=>795,4284=>584,4285=>566,4286=>584,4287=>669,
-4288=>799,4289=>542,4290=>664,4291=>542,4292=>565,4293=>674,4304=>508,4305=>508,4306=>533,4307=>785,
-4308=>522,4309=>517,4310=>508,4311=>797,4312=>507,4313=>518,4314=>1058,4315=>522,4316=>523,4317=>783,
-4318=>518,4319=>523,4320=>792,4321=>523,4322=>656,4323=>524,4324=>788,4325=>523,4326=>782,4327=>523,
-4328=>522,4329=>522,4330=>566,4331=>523,4332=>523,4333=>489,4334=>522,4335=>498,4336=>517,4337=>560,
-4338=>508,4339=>508,4340=>508,4341=>563,4342=>824,4343=>595,4344=>522,4345=>554,4346=>553,4347=>586,
-4348=>304,5121=>684,5122=>684,5123=>684,5124=>684,5125=>769,5126=>769,5127=>769,5129=>769,5130=>769,
-5131=>769,5132=>835,5133=>834,5134=>835,5135=>834,5136=>835,5137=>834,5138=>967,5139=>1007,5140=>967,
-5141=>1007,5142=>769,5143=>967,5144=>1007,5145=>967,5146=>1007,5147=>769,5149=>256,5150=>543,5151=>423,
-5152=>423,5153=>389,5154=>389,5155=>393,5156=>389,5157=>466,5158=>385,5159=>256,5160=>389,5161=>389,
-5162=>389,5163=>1090,5164=>909,5165=>953,5166=>1117,5167=>684,5168=>684,5169=>684,5170=>684,5171=>729,
-5172=>729,5173=>729,5175=>729,5176=>729,5177=>729,5178=>835,5179=>684,5180=>835,5181=>834,5182=>835,
-5183=>834,5184=>967,5185=>1007,5186=>967,5187=>1007,5188=>967,5189=>1007,5190=>967,5191=>1007,5192=>729,
-5193=>508,5194=>192,5196=>732,5197=>732,5198=>732,5199=>732,5200=>730,5201=>730,5202=>730,5204=>730,
-5205=>730,5206=>730,5207=>921,5208=>889,5209=>921,5210=>889,5211=>921,5212=>889,5213=>928,5214=>900,
-5215=>928,5216=>900,5217=>947,5218=>900,5219=>947,5220=>900,5221=>947,5222=>434,5223=>877,5224=>877,
-5225=>866,5226=>890,5227=>628,5228=>628,5229=>628,5230=>628,5231=>628,5232=>628,5233=>628,5234=>628,
-5235=>628,5236=>860,5237=>771,5238=>815,5239=>816,5240=>815,5241=>816,5242=>860,5243=>771,5244=>860,
-5245=>771,5246=>815,5247=>816,5248=>815,5249=>816,5250=>815,5251=>407,5252=>407,5253=>750,5254=>775,
-5255=>750,5256=>775,5257=>628,5258=>628,5259=>628,5260=>628,5261=>628,5262=>628,5263=>628,5264=>628,
-5265=>628,5266=>860,5267=>771,5268=>815,5269=>816,5270=>815,5271=>816,5272=>860,5273=>771,5274=>860,
-5275=>771,5276=>815,5277=>816,5278=>815,5279=>816,5280=>815,5281=>435,5282=>435,5283=>610,5284=>557,
-5285=>557,5286=>557,5287=>610,5288=>610,5289=>610,5290=>557,5291=>557,5292=>749,5293=>769,5294=>746,
-5295=>764,5296=>746,5297=>764,5298=>749,5299=>769,5300=>749,5301=>769,5302=>746,5303=>764,5304=>746,
-5305=>764,5306=>746,5307=>386,5308=>508,5309=>386,5312=>852,5313=>852,5314=>852,5315=>852,5316=>852,
-5317=>852,5318=>852,5319=>852,5320=>852,5321=>1069,5322=>1035,5323=>1059,5324=>852,5325=>1059,5326=>852,
-5327=>852,5328=>600,5329=>453,5330=>600,5331=>852,5332=>852,5333=>852,5334=>852,5335=>852,5336=>852,
-5337=>852,5338=>852,5339=>852,5340=>1069,5341=>1035,5342=>1059,5343=>1030,5344=>1059,5345=>1030,5346=>1069,
-5347=>1035,5348=>1069,5349=>1035,5350=>1083,5351=>1030,5352=>1083,5353=>1030,5354=>600,5356=>729,5357=>603,
-5358=>603,5359=>603,5360=>603,5361=>603,5362=>603,5363=>603,5364=>603,5365=>603,5366=>834,5367=>754,
-5368=>792,5369=>771,5370=>792,5371=>771,5372=>834,5373=>754,5374=>834,5375=>754,5376=>792,5377=>771,
-5378=>792,5379=>771,5380=>792,5381=>418,5382=>420,5383=>418,5392=>712,5393=>712,5394=>712,5395=>892,
-5396=>892,5397=>892,5398=>892,5399=>910,5400=>872,5401=>910,5402=>872,5403=>910,5404=>872,5405=>1140,
-5406=>1100,5407=>1140,5408=>1100,5409=>1140,5410=>1100,5411=>1140,5412=>1100,5413=>641,5414=>627,5415=>627,
-5416=>627,5417=>627,5418=>627,5419=>627,5420=>627,5421=>627,5422=>627,5423=>844,5424=>781,5425=>816,
-5426=>818,5427=>816,5428=>818,5429=>844,5430=>781,5431=>844,5432=>781,5433=>816,5434=>818,5435=>816,
-5436=>818,5437=>816,5438=>418,5440=>389,5441=>484,5442=>916,5443=>916,5444=>916,5445=>916,5446=>916,
-5447=>916,5448=>603,5449=>603,5450=>603,5451=>603,5452=>603,5453=>603,5454=>834,5455=>754,5456=>418,
-5458=>729,5459=>684,5460=>684,5461=>684,5462=>684,5463=>726,5464=>726,5465=>726,5466=>726,5467=>924,
-5468=>1007,5469=>508,5470=>732,5471=>732,5472=>732,5473=>732,5474=>732,5475=>732,5476=>730,5477=>730,
-5478=>730,5479=>730,5480=>947,5481=>900,5482=>508,5492=>831,5493=>831,5494=>831,5495=>831,5496=>831,
-5497=>831,5498=>831,5499=>563,5500=>752,5501=>484,5502=>1047,5503=>1047,5504=>1047,5505=>1047,5506=>1047,
-5507=>1047,5508=>1047,5509=>825,5514=>831,5515=>831,5516=>831,5517=>831,5518=>1259,5519=>1259,5520=>1259,
-5521=>1002,5522=>1002,5523=>1259,5524=>1259,5525=>700,5526=>1073,5536=>852,5537=>852,5538=>852,5539=>852,
-5540=>852,5541=>852,5542=>600,5543=>643,5544=>643,5545=>643,5546=>643,5547=>643,5548=>643,5549=>643,
-5550=>418,5551=>628,5598=>770,5601=>767,5702=>468,5703=>468,5742=>444,5743=>1047,5744=>1310,5745=>1632,
-5746=>1632,5747=>1375,5748=>1375,5749=>1632,5750=>1632,5760=>477,5761=>493,5762=>712,5763=>931,5764=>1150,
-5765=>1370,5766=>493,5767=>712,5768=>931,5769=>1150,5770=>1370,5771=>498,5772=>718,5773=>938,5774=>1159,
-5775=>1379,5776=>493,5777=>712,5778=>930,5779=>1149,5780=>1370,5781=>498,5782=>752,5783=>789,5784=>1205,
-5785=>1150,5786=>683,5787=>507,5788=>507,7424=>592,7425=>717,7426=>982,7427=>586,7428=>550,7429=>605,
-7430=>605,7431=>491,7432=>541,7433=>278,7434=>395,7435=>579,7436=>583,7437=>754,7438=>650,7439=>612,
-7440=>550,7441=>684,7442=>684,7443=>684,7444=>1023,7446=>612,7447=>612,7448=>524,7449=>602,7450=>602,
-7451=>583,7452=>574,7453=>737,7454=>948,7455=>638,7456=>592,7457=>818,7458=>525,7459=>526,7462=>583,
-7463=>592,7464=>564,7465=>524,7466=>590,7467=>639,7468=>431,7469=>613,7470=>432,7472=>485,7473=>398,
-7474=>398,7475=>488,7476=>474,7477=>186,7478=>186,7479=>413,7480=>351,7481=>543,7482=>471,7483=>471,
-7484=>496,7485=>439,7486=>380,7487=>438,7488=>385,7489=>461,7490=>623,7491=>392,7492=>392,7493=>405,
-7494=>648,7495=>428,7496=>405,7497=>417,7498=>417,7499=>360,7500=>359,7501=>405,7502=>179,7503=>426,
-7504=>623,7505=>409,7506=>414,7507=>370,7508=>414,7509=>414,7510=>428,7511=>295,7512=>405,7513=>470,
-7514=>623,7515=>417,7517=>402,7518=>373,7519=>385,7520=>416,7521=>364,7522=>179,7523=>259,7524=>405,
-7525=>417,7526=>402,7527=>373,7528=>412,7529=>416,7530=>364,7543=>635,7544=>474,7547=>372,7557=>278,
-7579=>405,7580=>370,7581=>370,7582=>414,7583=>360,7584=>296,7585=>233,7586=>405,7587=>405,7588=>261,
-7589=>250,7590=>261,7591=>261,7592=>234,7593=>250,7594=>235,7595=>376,7596=>623,7597=>623,7598=>411,
-7599=>479,7600=>409,7601=>414,7602=>414,7603=>360,7604=>287,7605=>295,7606=>508,7607=>418,7608=>361,
-7609=>406,7610=>417,7611=>366,7612=>437,7613=>366,7614=>392,7615=>414,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>684,7681=>613,7682=>686,7683=>635,7684=>686,7685=>635,7686=>686,
-7687=>635,7688=>698,7689=>550,7690=>770,7691=>635,7692=>770,7693=>635,7694=>770,7695=>635,7696=>770,
-7697=>635,7698=>770,7699=>635,7700=>632,7701=>615,7702=>632,7703=>615,7704=>632,7705=>615,7706=>632,
-7707=>615,7708=>632,7709=>615,7710=>575,7711=>352,7712=>775,7713=>635,7714=>752,7715=>634,7716=>752,
-7717=>634,7718=>752,7719=>634,7720=>752,7721=>634,7722=>752,7723=>634,7724=>295,7725=>278,7726=>295,
-7727=>278,7728=>656,7729=>579,7730=>656,7731=>579,7732=>656,7733=>579,7734=>557,7735=>288,7736=>557,
-7737=>288,7738=>557,7739=>278,7740=>557,7741=>278,7742=>863,7743=>974,7744=>863,7745=>974,7746=>863,
-7747=>974,7748=>748,7749=>634,7750=>748,7751=>634,7752=>748,7753=>634,7754=>748,7755=>634,7756=>787,
-7757=>612,7758=>787,7759=>612,7760=>787,7761=>612,7762=>787,7763=>612,7764=>603,7765=>635,7766=>603,
-7767=>635,7768=>695,7769=>411,7770=>695,7771=>411,7772=>695,7773=>411,7774=>695,7775=>411,7776=>635,
-7777=>521,7778=>635,7779=>521,7780=>635,7781=>521,7782=>635,7783=>521,7784=>635,7785=>521,7786=>611,
-7787=>392,7788=>611,7789=>392,7790=>611,7791=>392,7792=>611,7793=>392,7794=>732,7795=>634,7796=>732,
-7797=>634,7798=>732,7799=>634,7800=>732,7801=>634,7802=>732,7803=>634,7804=>684,7805=>592,7806=>684,
-7807=>592,7808=>989,7809=>818,7810=>989,7811=>818,7812=>989,7813=>818,7814=>989,7815=>818,7816=>989,
-7817=>818,7818=>685,7819=>592,7820=>685,7821=>592,7822=>611,7823=>592,7824=>685,7825=>525,7826=>685,
-7827=>525,7828=>685,7829=>525,7830=>634,7831=>392,7832=>818,7833=>592,7834=>613,7835=>352,7838=>769,
-7839=>612,7840=>684,7841=>613,7842=>684,7843=>613,7844=>684,7845=>613,7846=>684,7847=>613,7848=>684,
-7849=>613,7850=>684,7851=>613,7852=>684,7853=>613,7854=>684,7855=>613,7856=>684,7857=>613,7858=>684,
-7859=>613,7860=>684,7861=>613,7862=>684,7863=>613,7864=>632,7865=>615,7866=>632,7867=>615,7868=>632,
-7869=>615,7870=>632,7871=>615,7872=>632,7873=>615,7874=>632,7875=>615,7876=>632,7877=>615,7878=>632,
-7879=>615,7880=>295,7881=>278,7882=>295,7883=>278,7884=>787,7885=>612,7886=>787,7887=>612,7888=>787,
-7889=>612,7890=>787,7891=>612,7892=>787,7893=>612,7894=>787,7895=>612,7896=>787,7897=>612,7898=>913,
-7899=>612,7900=>913,7901=>612,7902=>913,7903=>612,7904=>913,7905=>612,7906=>913,7907=>612,7908=>732,
-7909=>634,7910=>732,7911=>634,7912=>858,7913=>634,7914=>858,7915=>634,7916=>858,7917=>634,7918=>858,
-7919=>634,7920=>858,7921=>634,7922=>611,7923=>592,7924=>611,7925=>592,7926=>611,7927=>592,7928=>611,
-7929=>592,7936=>659,7937=>659,7938=>659,7939=>659,7940=>659,7941=>659,7942=>659,7943=>659,7944=>684,
-7945=>684,7946=>877,7947=>877,7948=>769,7949=>801,7950=>708,7951=>743,7952=>541,7953=>541,7954=>541,
-7955=>541,7956=>541,7957=>541,7960=>711,7961=>711,7962=>966,7963=>975,7964=>898,7965=>928,7968=>634,
-7969=>634,7970=>634,7971=>634,7972=>634,7973=>634,7974=>634,7975=>634,7976=>837,7977=>835,7978=>1086,
-7979=>1089,7980=>1027,7981=>1051,7982=>934,7983=>947,7984=>338,7985=>338,7986=>338,7987=>338,7988=>338,
-7989=>338,7990=>338,7991=>338,7992=>380,7993=>374,7994=>635,7995=>635,7996=>570,7997=>600,7998=>489,
-7999=>493,8000=>612,8001=>612,8002=>612,8003=>612,8004=>612,8005=>612,8008=>804,8009=>848,8010=>1095,
-8011=>1100,8012=>938,8013=>970,8016=>579,8017=>579,8018=>579,8019=>579,8020=>579,8021=>579,8022=>579,
-8023=>579,8025=>784,8027=>998,8029=>1012,8031=>897,8032=>837,8033=>837,8034=>837,8035=>837,8036=>837,
-8037=>837,8038=>837,8039=>837,8040=>802,8041=>843,8042=>1089,8043=>1095,8044=>946,8045=>972,8046=>921,
-8047=>952,8048=>659,8049=>659,8050=>541,8051=>548,8052=>634,8053=>654,8054=>338,8055=>338,8056=>612,
-8057=>612,8058=>579,8059=>579,8060=>837,8061=>837,8064=>659,8065=>659,8066=>659,8067=>659,8068=>659,
-8069=>659,8070=>659,8071=>659,8072=>684,8073=>684,8074=>877,8075=>877,8076=>769,8077=>801,8078=>708,
-8079=>743,8080=>634,8081=>634,8082=>634,8083=>634,8084=>634,8085=>634,8086=>634,8087=>634,8088=>837,
-8089=>835,8090=>1086,8091=>1089,8092=>1027,8093=>1051,8094=>934,8095=>947,8096=>837,8097=>837,8098=>837,
-8099=>837,8100=>837,8101=>837,8102=>837,8103=>837,8104=>802,8105=>843,8106=>1089,8107=>1095,8108=>946,
-8109=>972,8110=>921,8111=>952,8112=>659,8113=>659,8114=>659,8115=>659,8116=>659,8118=>659,8119=>659,
-8120=>684,8121=>684,8122=>716,8123=>692,8124=>684,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,
-8130=>634,8131=>634,8132=>654,8134=>634,8135=>634,8136=>805,8137=>746,8138=>931,8139=>871,8140=>752,
-8141=>500,8142=>500,8143=>500,8144=>338,8145=>338,8146=>338,8147=>338,8150=>338,8151=>338,8152=>295,
-8153=>295,8154=>475,8155=>408,8157=>500,8158=>500,8159=>500,8160=>579,8161=>579,8162=>579,8163=>579,
-8164=>635,8165=>635,8166=>579,8167=>579,8168=>611,8169=>611,8170=>845,8171=>825,8172=>685,8173=>500,
-8174=>500,8175=>500,8178=>837,8179=>837,8180=>837,8182=>837,8183=>837,8184=>941,8185=>813,8186=>922,
-8187=>826,8188=>764,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,
-8198=>167,8199=>636,8200=>318,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>361,8209=>361,8210=>636,8213=>1000,8214=>500,8215=>500,8219=>318,8223=>518,8227=>590,8228=>334,
-8229=>667,8231=>318,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8241=>1735,8242=>227,
-8243=>374,8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,8251=>838,8252=>485,8253=>531,8254=>500,
-8255=>804,8256=>804,8257=>250,8258=>1000,8259=>500,8260=>167,8261=>390,8262=>390,8263=>922,8264=>733,
-8265=>733,8266=>497,8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,8272=>804,8273=>500,8274=>450,
-8275=>1000,8276=>804,8277=>838,8278=>586,8279=>663,8280=>838,8281=>838,8282=>318,8283=>797,8284=>838,
-8285=>318,8286=>318,8287=>222,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,
-8300=>0,8301=>0,8302=>0,8303=>0,8304=>401,8305=>179,8308=>401,8309=>401,8310=>401,8311=>401,
-8312=>401,8313=>401,8314=>528,8315=>528,8316=>528,8317=>246,8318=>246,8319=>398,8320=>401,8321=>401,
-8322=>401,8323=>401,8324=>401,8325=>401,8326=>401,8327=>401,8328=>401,8329=>401,8330=>528,8331=>528,
-8332=>528,8333=>246,8334=>246,8336=>392,8337=>417,8338=>414,8339=>444,8340=>417,8352=>877,8353=>636,
-8354=>636,8355=>636,8356=>636,8357=>974,8358=>748,8359=>1272,8360=>1074,8361=>989,8362=>784,8363=>635,
-8365=>636,8366=>636,8367=>1272,8368=>636,8369=>636,8370=>636,8371=>636,8372=>774,8373=>641,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1019,8449=>1019,8450=>698,8451=>1123,
-8452=>642,8453=>1019,8454=>1067,8455=>614,8456=>698,8457=>952,8459=>988,8460=>754,8461=>850,8462=>634,
-8463=>634,8464=>470,8465=>697,8466=>720,8467=>413,8468=>818,8469=>801,8470=>1040,8471=>1000,8472=>697,
-8473=>701,8474=>787,8475=>798,8476=>814,8477=>792,8478=>896,8479=>684,8480=>1020,8481=>1074,8483=>684,
-8484=>745,8485=>578,8486=>764,8487=>764,8488=>616,8489=>338,8490=>656,8491=>684,8492=>786,8493=>703,
-8494=>854,8495=>592,8496=>605,8497=>786,8498=>575,8499=>1069,8500=>462,8501=>745,8502=>674,8503=>466,
-8504=>645,8505=>380,8506=>926,8507=>1194,8508=>702,8509=>728,8510=>654,8511=>849,8512=>811,8513=>775,
-8514=>557,8515=>557,8516=>611,8517=>819,8518=>708,8519=>615,8520=>351,8521=>351,8523=>780,8526=>526,
-8531=>969,8532=>969,8533=>969,8534=>969,8535=>969,8536=>969,8537=>969,8538=>969,8539=>969,8540=>969,
-8541=>969,8542=>969,8543=>568,8544=>295,8545=>492,8546=>689,8547=>923,8548=>684,8549=>922,8550=>1120,
-8551=>1317,8552=>917,8553=>685,8554=>933,8555=>1131,8556=>557,8557=>698,8558=>770,8559=>863,8560=>278,
-8561=>458,8562=>637,8563=>812,8564=>592,8565=>811,8566=>991,8567=>1170,8568=>819,8569=>592,8570=>822,
-8571=>1002,8572=>278,8573=>550,8574=>635,8575=>974,8576=>1245,8577=>770,8578=>1245,8579=>703,8580=>549,
-8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,8598=>838,8599=>838,8600=>838,8601=>838,
-8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,8608=>838,8609=>838,8610=>838,8611=>838,
-8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,8618=>838,8619=>838,8620=>838,8621=>838,
-8622=>838,8623=>838,8624=>838,8625=>838,8626=>838,8627=>838,8628=>838,8629=>838,8630=>838,8631=>838,
-8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,8638=>838,8639=>838,8640=>838,8641=>838,
-8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,8648=>838,8649=>838,8650=>838,8651=>838,
-8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,8658=>838,8659=>838,8660=>838,8661=>838,
-8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,8668=>838,8669=>838,8670=>838,8671=>838,
-8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,8678=>838,8679=>838,8680=>838,8681=>838,
-8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,8688=>838,8689=>838,8690=>838,8691=>838,
-8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,8698=>838,8699=>838,8700=>838,8701=>838,
-8702=>838,8703=>838,8704=>684,8705=>636,8706=>517,8707=>632,8708=>632,8709=>871,8710=>669,8711=>669,
-8712=>871,8713=>871,8714=>718,8715=>871,8716=>871,8717=>718,8718=>636,8719=>757,8720=>757,8721=>674,
-8722=>838,8723=>838,8724=>838,8725=>337,8726=>637,8727=>838,8728=>626,8729=>626,8730=>637,8731=>637,
-8732=>637,8733=>714,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,8740=>500,8741=>500,
-8742=>500,8743=>732,8744=>732,8745=>732,8746=>732,8747=>521,8748=>789,8749=>1057,8750=>521,8751=>789,
-8752=>1057,8753=>521,8754=>521,8755=>521,8756=>636,8757=>636,8758=>260,8759=>636,8760=>838,8761=>838,
-8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,8770=>838,8771=>838,
-8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,8780=>838,8781=>838,
-8782=>838,8783=>838,8784=>838,8785=>838,8786=>839,8787=>839,8788=>1000,8789=>1000,8790=>838,8791=>838,
-8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,8800=>838,8801=>838,
-8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>838,8809=>838,8810=>1047,8811=>1047,
-8812=>464,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,8820=>838,8821=>838,
-8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,8830=>838,8831=>838,
-8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8840=>838,8841=>838,
-8842=>838,8843=>838,8844=>732,8845=>732,8846=>732,8847=>838,8848=>838,8849=>838,8850=>838,8851=>780,
-8852=>780,8853=>838,8854=>838,8855=>838,8856=>838,8857=>838,8858=>838,8859=>838,8860=>838,8861=>838,
-8862=>838,8863=>838,8864=>838,8865=>838,8866=>871,8867=>871,8868=>871,8869=>871,8870=>521,8871=>521,
-8872=>871,8873=>871,8874=>871,8875=>871,8876=>871,8877=>871,8878=>871,8879=>871,8880=>838,8881=>838,
-8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,8890=>521,8891=>732,
-8892=>732,8893=>732,8894=>838,8895=>838,8896=>820,8897=>820,8898=>820,8899=>820,8900=>494,8901=>318,
-8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,8910=>732,8911=>732,
-8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,8920=>1422,8921=>1422,
-8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,8930=>838,8931=>838,
-8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,8940=>838,8941=>838,
-8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1000,8947=>871,8948=>718,8949=>871,8950=>871,8951=>718,
-8952=>871,8953=>871,8954=>1000,8955=>871,8956=>718,8957=>871,8958=>718,8959=>871,8960=>602,8961=>602,
-8962=>635,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>390,8969=>390,8970=>390,8971=>390,
-8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>513,8984=>1000,8985=>838,8988=>469,8989=>469,
-8990=>469,8991=>469,8992=>521,8993=>521,8996=>1152,8997=>1152,8998=>1414,8999=>1152,9000=>1443,9003=>1414,
-9004=>873,9075=>338,9076=>635,9077=>837,9082=>659,9085=>757,9095=>1152,9108=>873,9115=>500,9116=>500,
-9117=>500,9118=>500,9119=>500,9120=>500,9121=>500,9122=>500,9123=>500,9124=>500,9125=>500,9126=>500,
-9127=>750,9128=>750,9129=>750,9130=>750,9131=>750,9132=>750,9133=>750,9134=>521,9166=>838,9167=>945,
-9187=>873,9189=>769,9250=>635,9251=>635,9312=>896,9313=>896,9314=>896,9315=>896,9316=>896,9317=>896,
-9318=>896,9319=>896,9320=>896,9321=>896,9472=>602,9473=>602,9474=>602,9475=>602,9476=>602,9477=>602,
-9478=>602,9479=>602,9480=>602,9481=>602,9482=>602,9483=>602,9484=>602,9485=>602,9486=>602,9487=>602,
-9488=>602,9489=>602,9490=>602,9491=>602,9492=>602,9493=>602,9494=>602,9495=>602,9496=>602,9497=>602,
-9498=>602,9499=>602,9500=>602,9501=>602,9502=>602,9503=>602,9504=>602,9505=>602,9506=>602,9507=>602,
-9508=>602,9509=>602,9510=>602,9511=>602,9512=>602,9513=>602,9514=>602,9515=>602,9516=>602,9517=>602,
-9518=>602,9519=>602,9520=>602,9521=>602,9522=>602,9523=>602,9524=>602,9525=>602,9526=>602,9527=>602,
-9528=>602,9529=>602,9530=>602,9531=>602,9532=>602,9533=>602,9534=>602,9535=>602,9536=>602,9537=>602,
-9538=>602,9539=>602,9540=>602,9541=>602,9542=>602,9543=>602,9544=>602,9545=>602,9546=>602,9547=>602,
-9548=>602,9549=>602,9550=>602,9551=>602,9552=>602,9553=>602,9554=>602,9555=>602,9556=>602,9557=>602,
-9558=>602,9559=>602,9560=>602,9561=>602,9562=>602,9563=>602,9564=>602,9565=>602,9566=>602,9567=>602,
-9568=>602,9569=>602,9570=>602,9571=>602,9572=>602,9573=>602,9574=>602,9575=>602,9576=>602,9577=>602,
-9578=>602,9579=>602,9580=>602,9581=>602,9582=>602,9583=>602,9584=>602,9585=>602,9586=>602,9587=>602,
-9588=>602,9589=>602,9590=>602,9591=>602,9592=>602,9593=>602,9594=>602,9595=>602,9596=>602,9597=>602,
-9598=>602,9599=>602,9600=>769,9601=>769,9602=>769,9603=>769,9604=>769,9605=>769,9606=>769,9607=>769,
-9608=>769,9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,9614=>769,9615=>769,9616=>769,9617=>769,
-9618=>769,9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,9624=>769,9625=>769,9626=>769,9627=>769,
-9628=>769,9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,9634=>945,9635=>945,9636=>945,9637=>945,
-9638=>945,9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,9644=>945,9645=>945,9646=>550,9647=>550,
-9648=>769,9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,9654=>769,9655=>769,9656=>502,9657=>502,
-9658=>769,9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,9664=>769,9665=>769,9666=>502,9667=>502,
-9668=>769,9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,9674=>494,9675=>873,9676=>873,9677=>873,
-9678=>873,9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,9684=>873,9685=>873,9686=>527,9687=>527,
-9688=>791,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,9696=>873,9697=>873,
-9698=>769,9699=>769,9700=>769,9701=>769,9702=>590,9703=>945,9704=>945,9705=>945,9706=>945,9707=>945,
-9708=>769,9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,9714=>945,9715=>945,9716=>873,9717=>873,
-9718=>873,9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,9724=>830,9725=>732,9726=>732,9727=>769,
-9728=>896,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,9736=>896,9737=>896,
-9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,9746=>896,9747=>532,
-9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,9756=>896,9757=>609,
-9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,9766=>649,9767=>784,
-9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,9776=>896,9777=>896,
-9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,9784=>896,9785=>896,9786=>896,9787=>896,
-9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,9796=>896,9797=>896,
-9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,9806=>896,9807=>896,
-9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,9816=>896,9817=>896,
-9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,9826=>896,9827=>896,
-9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,
-9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,9846=>896,9847=>896,
-9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,9856=>869,9857=>869,
-9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,9864=>896,9865=>896,9866=>896,9867=>896,
-9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,9874=>896,9875=>896,9876=>896,9877=>541,
-9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,9884=>896,9888=>896,9889=>702,9890=>1003,
-9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,9899=>838,9900=>838,
-9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,9907=>732,9908=>732,9909=>732,9910=>850,
-9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,9992=>838,9993=>838,
-9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,10004=>838,10005=>838,
-10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,10014=>838,10015=>838,
-10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,10025=>838,10026=>838,
-10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,10035=>838,10036=>838,
-10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,10045=>838,10046=>838,
-10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,10055=>838,10056=>838,
-10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,10070=>896,10072=>838,
-10073=>838,10074=>838,10075=>322,10076=>322,10077=>538,10078=>538,10081=>838,10082=>838,10083=>838,10084=>838,
-10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,10093=>838,10094=>838,
-10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>896,10103=>896,10104=>896,
-10105=>896,10106=>896,10107=>896,10108=>896,10109=>896,10110=>896,10111=>896,10112=>838,10113=>838,10114=>838,
-10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,10123=>838,10124=>838,
-10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,10136=>838,10137=>838,
-10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,10146=>838,10147=>838,
-10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,10156=>838,10157=>838,
-10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,10167=>838,10168=>838,
-10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>390,10182=>390,10208=>494,10214=>495,
-10215=>495,10216=>390,10217=>390,10218=>556,10219=>556,10224=>838,10225=>838,10226=>838,10227=>838,10228=>1157,
-10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,10237=>1434,10238=>1434,
-10239=>1434,10240=>732,10241=>732,10242=>732,10243=>732,10244=>732,10245=>732,10246=>732,10247=>732,10248=>732,
-10249=>732,10250=>732,10251=>732,10252=>732,10253=>732,10254=>732,10255=>732,10256=>732,10257=>732,10258=>732,
-10259=>732,10260=>732,10261=>732,10262=>732,10263=>732,10264=>732,10265=>732,10266=>732,10267=>732,10268=>732,
-10269=>732,10270=>732,10271=>732,10272=>732,10273=>732,10274=>732,10275=>732,10276=>732,10277=>732,10278=>732,
-10279=>732,10280=>732,10281=>732,10282=>732,10283=>732,10284=>732,10285=>732,10286=>732,10287=>732,10288=>732,
-10289=>732,10290=>732,10291=>732,10292=>732,10293=>732,10294=>732,10295=>732,10296=>732,10297=>732,10298=>732,
-10299=>732,10300=>732,10301=>732,10302=>732,10303=>732,10304=>732,10305=>732,10306=>732,10307=>732,10308=>732,
-10309=>732,10310=>732,10311=>732,10312=>732,10313=>732,10314=>732,10315=>732,10316=>732,10317=>732,10318=>732,
-10319=>732,10320=>732,10321=>732,10322=>732,10323=>732,10324=>732,10325=>732,10326=>732,10327=>732,10328=>732,
-10329=>732,10330=>732,10331=>732,10332=>732,10333=>732,10334=>732,10335=>732,10336=>732,10337=>732,10338=>732,
-10339=>732,10340=>732,10341=>732,10342=>732,10343=>732,10344=>732,10345=>732,10346=>732,10347=>732,10348=>732,
-10349=>732,10350=>732,10351=>732,10352=>732,10353=>732,10354=>732,10355=>732,10356=>732,10357=>732,10358=>732,
-10359=>732,10360=>732,10361=>732,10362=>732,10363=>732,10364=>732,10365=>732,10366=>732,10367=>732,10368=>732,
-10369=>732,10370=>732,10371=>732,10372=>732,10373=>732,10374=>732,10375=>732,10376=>732,10377=>732,10378=>732,
-10379=>732,10380=>732,10381=>732,10382=>732,10383=>732,10384=>732,10385=>732,10386=>732,10387=>732,10388=>732,
-10389=>732,10390=>732,10391=>732,10392=>732,10393=>732,10394=>732,10395=>732,10396=>732,10397=>732,10398=>732,
-10399=>732,10400=>732,10401=>732,10402=>732,10403=>732,10404=>732,10405=>732,10406=>732,10407=>732,10408=>732,
-10409=>732,10410=>732,10411=>732,10412=>732,10413=>732,10414=>732,10415=>732,10416=>732,10417=>732,10418=>732,
-10419=>732,10420=>732,10421=>732,10422=>732,10423=>732,10424=>732,10425=>732,10426=>732,10427=>732,10428=>732,
-10429=>732,10430=>732,10431=>732,10432=>732,10433=>732,10434=>732,10435=>732,10436=>732,10437=>732,10438=>732,
-10439=>732,10440=>732,10441=>732,10442=>732,10443=>732,10444=>732,10445=>732,10446=>732,10447=>732,10448=>732,
-10449=>732,10450=>732,10451=>732,10452=>732,10453=>732,10454=>732,10455=>732,10456=>732,10457=>732,10458=>732,
-10459=>732,10460=>732,10461=>732,10462=>732,10463=>732,10464=>732,10465=>732,10466=>732,10467=>732,10468=>732,
-10469=>732,10470=>732,10471=>732,10472=>732,10473=>732,10474=>732,10475=>732,10476=>732,10477=>732,10478=>732,
-10479=>732,10480=>732,10481=>732,10482=>732,10483=>732,10484=>732,10485=>732,10486=>732,10487=>732,10488=>732,
-10489=>732,10490=>732,10491=>732,10492=>732,10493=>732,10494=>732,10495=>732,10502=>838,10503=>838,10506=>838,
-10507=>838,10560=>683,10561=>683,10627=>734,10628=>734,10702=>838,10703=>1000,10704=>1000,10705=>1000,10706=>1000,
-10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,10754=>1000,10764=>1325,
-10765=>521,10766=>521,10767=>521,10768=>521,10769=>521,10770=>521,10771=>521,10772=>521,10773=>521,10774=>521,
-10775=>521,10776=>521,10777=>521,10778=>521,10779=>521,10780=>521,10799=>838,10877=>838,10878=>838,10879=>838,
-10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,10888=>838,10889=>838,
-10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,10898=>838,10899=>838,
-10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,10908=>838,10909=>838,
-10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,10931=>838,10932=>838,
-10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>838,11008=>838,11009=>838,
-11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,11016=>838,11017=>838,11018=>838,11019=>838,
-11020=>838,11021=>838,11022=>836,11023=>836,11024=>836,11025=>836,11026=>945,11027=>945,11028=>945,11029=>945,
-11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11039=>869,11040=>869,11041=>873,11042=>873,11043=>873,
-11044=>1119,11091=>869,11092=>869,11360=>557,11361=>278,11362=>557,11363=>603,11364=>695,11365=>613,11366=>392,
-11367=>752,11368=>634,11369=>656,11370=>579,11371=>685,11372=>525,11373=>781,11374=>863,11375=>684,11377=>734,
-11378=>1128,11379=>961,11380=>592,11381=>654,11382=>568,11383=>660,11385=>414,11386=>612,11387=>491,11388=>175,
-11389=>431,11568=>646,11569=>888,11570=>888,11571=>682,11572=>684,11573=>635,11574=>562,11575=>684,11576=>684,
-11577=>632,11578=>632,11579=>683,11580=>875,11581=>685,11582=>491,11583=>685,11584=>888,11585=>888,11586=>300,
-11587=>627,11588=>752,11589=>656,11590=>527,11591=>685,11592=>645,11593=>632,11594=>502,11595=>953,11596=>778,
-11597=>748,11598=>621,11599=>295,11600=>778,11601=>295,11602=>752,11603=>633,11604=>888,11605=>888,11606=>752,
-11607=>320,11608=>749,11609=>888,11610=>888,11611=>698,11612=>768,11613=>685,11614=>698,11615=>622,11616=>684,
-11617=>752,11618=>632,11619=>788,11620=>567,11621=>788,11631=>515,11800=>531,11810=>390,11811=>390,11812=>390,
-11813=>390,11822=>531,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,
-19912=>896,19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,
-19922=>896,19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,
-19932=>896,19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,
-19942=>896,19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,
-19952=>896,19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,
-19962=>896,19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42564=>635,42565=>521,42566=>354,42567=>338,
-42572=>1180,42573=>1028,42576=>1029,42577=>906,42580=>1080,42581=>842,42582=>977,42583=>843,42594=>1062,42595=>912,
-42596=>1066,42597=>901,42598=>1178,42599=>1008,42600=>787,42601=>612,42602=>855,42603=>712,42604=>1358,42605=>1019,
-42606=>879,42634=>782,42635=>685,42636=>611,42637=>583,42644=>686,42645=>634,42760=>493,42761=>493,42762=>493,
-42763=>493,42764=>493,42765=>493,42766=>493,42767=>493,42768=>493,42769=>493,42770=>493,42771=>493,42772=>493,
-42773=>493,42774=>493,42779=>369,42780=>369,42781=>252,42782=>252,42783=>252,42790=>752,42791=>634,42792=>878,
-42793=>709,42794=>614,42795=>541,42800=>491,42801=>521,42802=>1250,42803=>985,42804=>1203,42805=>990,42806=>1142,
-42807=>981,42808=>971,42809=>818,42810=>971,42811=>818,42812=>959,42813=>818,42814=>703,42815=>549,42822=>680,
-42823=>392,42824=>582,42825=>427,42826=>807,42827=>704,42830=>1358,42831=>1019,42880=>557,42881=>278,42882=>735,
-42883=>634,42889=>337,42890=>376,42891=>401,42892=>275,43003=>575,43004=>603,43005=>863,43006=>295,43007=>1199,
-61440=>977,61441=>977,63173=>612,64256=>689,64257=>630,64258=>630,64259=>967,64260=>967,64261=>686,64262=>861,
-64275=>1202,64276=>1202,64277=>1196,64278=>1186,64279=>1529,64285=>272,64286=>0,64287=>471,64288=>636,64289=>856,
-64290=>774,64291=>906,64292=>771,64293=>843,64294=>855,64295=>807,64296=>875,64297=>838,64298=>808,64299=>808,
-64300=>808,64301=>808,64302=>629,64303=>629,64304=>629,64305=>608,64306=>448,64307=>594,64308=>640,64309=>272,
-64310=>374,64312=>648,64313=>336,64314=>592,64315=>556,64316=>599,64318=>659,64320=>441,64321=>700,64323=>640,
-64324=>604,64326=>581,64327=>663,64328=>592,64329=>808,64330=>657,64331=>272,64332=>608,64333=>556,64334=>604,
-64335=>629,64338=>941,64339=>982,64340=>278,64341=>302,64342=>941,64343=>982,64344=>278,64345=>302,64346=>941,
-64347=>982,64348=>278,64349=>302,64350=>941,64351=>982,64352=>278,64353=>302,64354=>941,64355=>982,64356=>278,
-64357=>302,64358=>941,64359=>982,64360=>278,64361=>302,64362=>1037,64363=>1035,64364=>478,64365=>506,64366=>1037,
-64367=>1035,64368=>478,64369=>506,64370=>646,64371=>646,64372=>618,64373=>646,64374=>646,64375=>646,64376=>618,
-64377=>646,64378=>646,64379=>646,64380=>618,64381=>646,64382=>646,64383=>646,64384=>618,64385=>646,64394=>483,
-64395=>552,64396=>483,64397=>552,64398=>895,64399=>895,64400=>476,64401=>552,64402=>895,64403=>895,64404=>476,
-64405=>552,64414=>734,64415=>761,64473=>483,64474=>517,64488=>278,64489=>302,64508=>783,64509=>833,64510=>278,
-64511=>302,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,
-65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>293,65137=>293,65138=>293,65139=>262,65140=>293,65142=>293,65143=>293,65144=>293,65145=>293,
-65146=>293,65147=>293,65148=>293,65149=>293,65150=>293,65151=>293,65152=>470,65153=>278,65154=>305,65155=>278,
-65156=>305,65157=>483,65158=>517,65159=>278,65160=>305,65161=>783,65162=>833,65163=>278,65164=>302,65165=>278,
-65166=>305,65167=>941,65168=>982,65169=>278,65170=>302,65171=>524,65172=>536,65173=>941,65174=>982,65175=>278,
-65176=>302,65177=>941,65178=>982,65179=>278,65180=>302,65181=>646,65182=>646,65183=>618,65184=>646,65185=>646,
-65186=>646,65187=>618,65188=>646,65189=>646,65190=>646,65191=>618,65192=>646,65193=>445,65194=>525,65195=>445,
-65196=>525,65197=>483,65198=>552,65199=>483,65200=>552,65201=>1221,65202=>1275,65203=>838,65204=>892,65205=>1221,
-65206=>1275,65207=>838,65208=>892,65209=>1209,65210=>1225,65211=>849,65212=>867,65213=>1209,65214=>1225,65215=>849,
-65216=>867,65217=>925,65218=>949,65219=>796,65220=>820,65221=>925,65222=>949,65223=>796,65224=>820,65225=>597,
-65226=>532,65227=>597,65228=>482,65229=>597,65230=>532,65231=>523,65232=>482,65233=>1037,65234=>1035,65235=>478,
-65236=>506,65237=>776,65238=>834,65239=>478,65240=>506,65241=>824,65242=>843,65243=>476,65244=>552,65245=>727,
-65246=>757,65247=>305,65248=>331,65249=>619,65250=>666,65251=>536,65252=>578,65253=>734,65254=>761,65255=>278,
-65256=>302,65257=>524,65258=>536,65259=>527,65260=>461,65261=>483,65262=>517,65263=>783,65264=>833,65265=>783,
-65266=>833,65267=>278,65268=>302,65269=>570,65270=>597,65271=>570,65272=>597,65273=>570,65274=>597,65275=>570,
-65276=>597,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1025);
-$enc='';
-$diff='';
-$file='dejavusans.z';
-$ctg='dejavusans.ctg.z';
-$originalsize=622280;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansb.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansb.php
deleted file mode 100644
index 188881c13b4..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansb.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans-Bold';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>19,'Flags'=>32,'FontBBox'=>'[-1069 -385 1975 1174]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>348,33=>456,34=>521,35=>838,36=>696,37=>1002,38=>872,39=>306,40=>457,
-41=>457,42=>523,43=>838,44=>380,45=>415,46=>380,47=>365,48=>696,49=>696,50=>696,
-51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>400,59=>400,60=>838,
-61=>838,62=>838,63=>580,64=>1000,65=>774,66=>762,67=>734,68=>830,69=>683,70=>683,
-71=>821,72=>837,73=>372,74=>372,75=>775,76=>637,77=>995,78=>837,79=>850,80=>733,
-81=>850,82=>770,83=>720,84=>682,85=>812,86=>774,87=>1103,88=>771,89=>724,90=>725,
-91=>457,92=>365,93=>457,94=>838,95=>500,96=>500,97=>675,98=>716,99=>593,100=>716,
-101=>678,102=>435,103=>716,104=>712,105=>343,106=>343,107=>665,108=>343,109=>1042,110=>712,
-111=>687,112=>716,113=>716,114=>493,115=>595,116=>478,117=>712,118=>652,119=>924,120=>645,
-121=>652,122=>582,123=>712,124=>365,125=>712,126=>838,8364=>696,8218=>380,402=>435,8222=>657,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1440,352=>720,8249=>412,338=>1167,381=>725,8216=>380,
-8217=>380,8220=>657,8221=>657,8226=>639,8211=>500,8212=>1000,732=>500,8482=>1000,353=>595,8250=>412,
-339=>1094,382=>582,376=>724,160=>348,161=>456,162=>696,163=>696,164=>636,165=>696,166=>365,
-167=>500,168=>500,169=>1000,170=>564,171=>646,172=>838,173=>415,174=>1000,175=>500,176=>500,
-177=>838,178=>438,179=>438,180=>500,181=>736,182=>636,183=>380,184=>500,185=>438,186=>564,
-187=>646,188=>1035,189=>1035,190=>1035,191=>580,192=>774,193=>774,194=>774,195=>774,196=>774,
-197=>774,198=>1085,199=>734,200=>683,201=>683,202=>683,203=>683,204=>372,205=>372,206=>372,
-207=>372,208=>838,209=>837,210=>850,211=>850,212=>850,213=>850,214=>850,215=>838,216=>850,
-217=>812,218=>812,219=>812,220=>812,221=>724,222=>738,223=>719,224=>675,225=>675,226=>675,
-227=>675,228=>675,229=>675,230=>1048,231=>593,232=>678,233=>678,234=>678,235=>678,236=>343,
-237=>343,238=>343,239=>343,240=>687,241=>712,242=>687,243=>687,244=>687,245=>687,246=>687,
-247=>838,248=>687,249=>712,250=>712,251=>712,252=>712,253=>652,254=>716,255=>652,256=>774,
-257=>675,258=>774,259=>675,260=>774,261=>675,262=>734,263=>593,264=>734,265=>593,266=>734,
-267=>593,268=>734,269=>593,270=>830,271=>716,272=>838,273=>716,274=>683,275=>678,276=>683,
-277=>678,278=>683,279=>678,280=>683,281=>678,282=>683,283=>678,284=>821,285=>716,286=>821,
-287=>716,288=>821,289=>716,290=>821,291=>716,292=>837,293=>712,294=>974,295=>790,296=>372,
-297=>343,298=>372,299=>343,300=>372,301=>343,302=>372,303=>343,304=>372,305=>343,306=>744,
-307=>686,308=>372,309=>343,310=>775,311=>665,312=>665,313=>637,314=>343,315=>637,316=>343,
-317=>637,318=>479,319=>637,320=>557,321=>642,322=>371,323=>837,324=>712,325=>837,326=>712,
-327=>837,328=>712,329=>983,330=>837,331=>712,332=>850,333=>687,334=>850,335=>687,336=>850,
-337=>687,340=>770,341=>493,342=>770,343=>493,344=>770,345=>493,346=>720,347=>595,348=>720,
-349=>595,350=>720,351=>595,354=>682,355=>478,356=>682,357=>478,358=>682,359=>478,360=>812,
-361=>712,362=>812,363=>712,364=>812,365=>712,366=>812,367=>712,368=>812,369=>712,370=>812,
-371=>712,372=>1103,373=>924,374=>724,375=>652,377=>725,378=>582,379=>725,380=>582,383=>435,
-384=>716,385=>811,386=>762,387=>716,388=>762,389=>716,390=>734,391=>734,392=>593,393=>838,
-394=>879,395=>757,396=>716,397=>688,398=>683,399=>849,400=>696,401=>683,403=>821,404=>793,
-405=>1045,406=>436,407=>389,408=>775,409=>665,410=>360,411=>592,412=>1042,413=>837,414=>712,
-415=>850,416=>874,417=>687,418=>1083,419=>912,420=>782,421=>716,422=>770,423=>720,424=>595,
-425=>683,426=>552,427=>478,428=>707,429=>478,430=>682,431=>835,432=>712,433=>850,434=>813,
-435=>797,436=>778,437=>725,438=>582,439=>772,440=>772,441=>641,442=>582,443=>696,444=>772,
-445=>641,446=>573,447=>716,448=>372,449=>659,450=>544,451=>372,452=>1555,453=>1412,454=>1298,
-455=>1009,456=>980,457=>686,458=>1209,459=>1180,460=>1055,461=>774,462=>675,463=>372,464=>343,
-465=>850,466=>687,467=>812,468=>712,469=>812,470=>712,471=>812,472=>712,473=>812,474=>712,
-475=>812,476=>712,477=>678,478=>774,479=>675,480=>774,481=>675,482=>1085,483=>1048,484=>821,
-485=>716,486=>821,487=>716,488=>775,489=>665,490=>850,491=>687,492=>850,493=>687,494=>772,
-495=>582,496=>343,497=>1555,498=>1412,499=>1298,500=>821,501=>716,502=>1289,503=>787,504=>837,
-505=>712,506=>774,507=>675,508=>1085,509=>1048,510=>850,511=>687,512=>774,513=>675,514=>774,
-515=>675,516=>683,517=>678,518=>683,519=>678,520=>372,521=>343,522=>372,523=>343,524=>850,
-525=>687,526=>850,527=>687,528=>770,529=>493,530=>770,531=>493,532=>812,533=>712,534=>812,
-535=>712,536=>720,537=>595,538=>682,539=>478,540=>690,541=>607,542=>837,543=>712,544=>837,
-545=>865,546=>809,547=>659,548=>725,549=>582,550=>774,551=>675,552=>683,553=>678,554=>850,
-555=>687,556=>850,557=>687,558=>850,559=>687,560=>850,561=>687,562=>724,563=>652,564=>492,
-565=>867,566=>512,567=>343,568=>1088,569=>1088,570=>774,571=>734,572=>593,573=>637,574=>682,
-575=>595,576=>582,577=>782,578=>614,579=>762,580=>812,581=>774,582=>683,583=>678,584=>372,
-585=>343,586=>860,587=>791,588=>770,589=>493,590=>724,591=>652,592=>675,593=>716,594=>716,
-595=>716,596=>593,597=>593,598=>717,599=>792,600=>678,601=>678,602=>876,603=>557,604=>545,
-605=>815,606=>731,607=>343,608=>792,609=>716,610=>627,611=>644,612=>635,613=>712,614=>712,
-615=>712,616=>545,617=>440,618=>545,619=>559,620=>693,621=>343,622=>841,623=>1042,624=>1042,
-625=>1042,626=>712,627=>793,628=>707,629=>687,630=>909,631=>681,632=>796,633=>538,634=>538,
-635=>650,636=>493,637=>493,638=>596,639=>596,640=>642,641=>642,642=>595,643=>415,644=>435,
-645=>605,646=>552,647=>478,648=>478,649=>920,650=>772,651=>670,652=>652,653=>924,654=>652,
-655=>724,656=>694,657=>684,658=>641,659=>641,660=>573,661=>573,662=>573,663=>573,664=>850,
-665=>633,666=>731,667=>685,668=>691,669=>343,670=>732,671=>539,672=>792,673=>573,674=>573,
-675=>1156,676=>1214,677=>1155,678=>974,679=>769,680=>929,681=>1026,682=>792,683=>780,684=>591,
-685=>415,686=>677,687=>789,688=>456,689=>456,690=>219,691=>315,692=>315,693=>315,694=>411,
-695=>591,696=>417,697=>302,698=>521,699=>380,700=>380,701=>380,702=>366,703=>366,704=>326,
-705=>326,706=>500,707=>500,708=>500,709=>500,711=>500,712=>306,713=>500,714=>500,715=>500,
-716=>306,717=>500,718=>500,719=>500,720=>337,721=>337,722=>366,723=>366,724=>500,725=>500,
-726=>416,727=>328,728=>500,729=>500,730=>500,731=>500,733=>500,734=>351,735=>500,736=>412,
-737=>219,738=>381,739=>413,740=>326,741=>500,742=>500,743=>500,744=>500,745=>500,748=>500,
-749=>500,750=>657,755=>500,759=>500,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>698,881=>565,882=>1022,
-883=>836,884=>302,885=>302,886=>837,887=>701,890=>500,891=>593,892=>550,893=>549,894=>400,
-900=>441,901=>500,902=>797,903=>380,904=>846,905=>1009,906=>563,908=>891,910=>980,911=>894,
-912=>390,913=>774,914=>762,915=>637,916=>774,917=>683,918=>725,919=>837,920=>850,921=>372,
-922=>775,923=>774,924=>995,925=>837,926=>632,927=>850,928=>837,929=>733,931=>683,932=>682,
-933=>724,934=>850,935=>771,936=>850,937=>850,938=>372,939=>724,940=>687,941=>557,942=>712,
-943=>390,944=>675,945=>687,946=>716,947=>681,948=>687,949=>557,950=>591,951=>712,952=>687,
-953=>390,954=>710,955=>633,956=>736,957=>681,958=>591,959=>687,960=>791,961=>716,962=>593,
-963=>779,964=>638,965=>675,966=>782,967=>645,968=>794,969=>869,970=>390,971=>675,972=>687,
-973=>675,974=>869,975=>775,976=>651,977=>661,978=>746,979=>981,980=>746,981=>796,982=>869,
-983=>744,984=>850,985=>687,986=>734,987=>593,988=>683,989=>494,990=>702,991=>660,992=>919,
-993=>627,994=>1093,995=>837,996=>832,997=>716,998=>928,999=>744,1000=>733,1001=>650,1002=>789,
-1003=>671,1004=>752,1005=>716,1006=>682,1007=>590,1008=>744,1009=>716,1010=>593,1011=>343,1012=>850,
-1013=>645,1014=>644,1015=>738,1016=>716,1017=>734,1018=>995,1019=>732,1020=>716,1021=>698,1022=>734,
-1023=>698,1024=>683,1025=>683,1026=>878,1027=>637,1028=>734,1029=>720,1030=>372,1031=>372,1032=>372,
-1033=>1154,1034=>1130,1035=>878,1036=>817,1037=>837,1038=>771,1039=>837,1040=>774,1041=>762,1042=>762,
-1043=>637,1044=>891,1045=>683,1046=>1224,1047=>710,1048=>837,1049=>837,1050=>817,1051=>831,1052=>995,
-1053=>837,1054=>850,1055=>837,1056=>733,1057=>734,1058=>682,1059=>771,1060=>992,1061=>771,1062=>928,
-1063=>808,1064=>1235,1065=>1326,1066=>939,1067=>1036,1068=>762,1069=>734,1070=>1174,1071=>770,1072=>675,
-1073=>698,1074=>633,1075=>522,1076=>808,1077=>678,1078=>995,1079=>581,1080=>701,1081=>701,1082=>679,
-1083=>732,1084=>817,1085=>691,1086=>687,1087=>691,1088=>716,1089=>593,1090=>580,1091=>652,1092=>992,
-1093=>645,1094=>741,1095=>687,1096=>1062,1097=>1105,1098=>751,1099=>904,1100=>632,1101=>593,1102=>972,
-1103=>642,1104=>678,1105=>678,1106=>714,1107=>522,1108=>593,1109=>595,1110=>343,1111=>343,1112=>343,
-1113=>991,1114=>956,1115=>734,1116=>679,1117=>701,1118=>652,1119=>691,1120=>1093,1121=>869,1122=>840,
-1123=>736,1124=>1012,1125=>839,1126=>992,1127=>832,1128=>1358,1129=>1121,1130=>850,1131=>687,1132=>1236,
-1133=>1007,1134=>696,1135=>557,1136=>1075,1137=>1061,1138=>850,1139=>687,1140=>850,1141=>695,1142=>850,
-1143=>695,1144=>1148,1145=>1043,1146=>1074,1147=>863,1148=>1405,1149=>1173,1150=>1093,1151=>869,1152=>734,
-1153=>593,1154=>652,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>957,
-1163=>807,1164=>762,1165=>611,1166=>733,1167=>716,1168=>637,1169=>522,1170=>666,1171=>543,1172=>808,
-1173=>669,1174=>1224,1175=>995,1176=>710,1177=>581,1178=>775,1179=>679,1180=>817,1181=>679,1182=>817,
-1183=>679,1184=>1015,1185=>826,1186=>956,1187=>808,1188=>1103,1189=>874,1190=>1273,1191=>1017,1192=>952,
-1193=>858,1194=>734,1195=>593,1196=>682,1197=>580,1198=>724,1199=>652,1200=>724,1201=>652,1202=>771,
-1203=>645,1204=>1112,1205=>1000,1206=>808,1207=>687,1208=>808,1209=>687,1210=>808,1211=>712,1212=>1026,
-1213=>810,1214=>1026,1215=>810,1216=>372,1217=>1224,1218=>995,1219=>775,1220=>630,1221=>951,1222=>805,
-1223=>837,1224=>691,1225=>957,1226=>807,1227=>808,1228=>687,1229=>1115,1230=>933,1231=>343,1232=>774,
-1233=>675,1234=>774,1235=>675,1236=>1085,1237=>1048,1238=>683,1239=>678,1240=>849,1241=>678,1242=>849,
-1243=>678,1244=>1224,1245=>995,1246=>710,1247=>581,1248=>772,1249=>641,1250=>837,1251=>701,1252=>837,
-1253=>701,1254=>850,1255=>687,1256=>850,1257=>687,1258=>850,1259=>687,1260=>734,1261=>593,1262=>771,
-1263=>652,1264=>771,1265=>652,1266=>771,1267=>652,1268=>808,1269=>687,1270=>637,1271=>522,1272=>1036,
-1273=>904,1274=>666,1275=>543,1276=>771,1277=>645,1278=>771,1279=>645,1280=>762,1281=>608,1282=>1159,
-1283=>893,1284=>1119,1285=>920,1286=>828,1287=>693,1288=>1242,1289=>1017,1290=>1289,1291=>1013,1292=>839,
-1293=>638,1294=>938,1295=>803,1296=>696,1297=>557,1298=>831,1299=>732,1300=>1286,1301=>1068,1302=>1065,
-1303=>979,1304=>1082,1305=>1013,1306=>850,1307=>716,1308=>1103,1309=>924,1312=>1267,1313=>1059,1314=>1273,
-1315=>1017,1316=>957,1317=>807,1329=>984,1330=>812,1331=>984,1332=>984,1333=>812,1334=>777,1335=>812,
-1336=>812,1337=>975,1338=>984,1339=>812,1340=>710,1341=>1078,1342=>1136,1343=>812,1344=>710,1345=>757,
-1346=>984,1347=>876,1348=>984,1349=>793,1350=>984,1351=>812,1352=>812,1353=>812,1354=>958,1355=>777,
-1356=>984,1357=>812,1358=>984,1359=>720,1360=>812,1361=>793,1362=>895,1363=>850,1364=>936,1365=>850,
-1366=>720,1369=>366,1370=>380,1371=>550,1372=>550,1373=>380,1374=>546,1375=>521,1377=>1042,1378=>712,
-1379=>866,1380=>868,1381=>712,1382=>817,1383=>653,1384=>712,1385=>811,1386=>817,1387=>712,1388=>498,
-1389=>1018,1390=>716,1391=>712,1392=>712,1393=>716,1394=>819,1395=>712,1396=>751,1397=>343,1398=>882,
-1399=>559,1400=>712,1401=>559,1402=>1042,1403=>559,1404=>863,1405=>712,1406=>813,1407=>1042,1408=>712,
-1409=>716,1410=>571,1411=>1042,1412=>778,1413=>687,1414=>720,1415=>862,1417=>400,1418=>487,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>415,1471=>0,1472=>372,1473=>0,1474=>0,1475=>372,1478=>497,
-1479=>0,1488=>751,1489=>673,1490=>537,1491=>654,1492=>712,1493=>343,1494=>491,1495=>712,1496=>724,
-1497=>343,1498=>649,1499=>650,1500=>679,1501=>712,1502=>775,1503=>343,1504=>497,1505=>773,1506=>678,
-1507=>718,1508=>687,1509=>628,1510=>751,1511=>729,1512=>649,1513=>949,1514=>751,1520=>664,1521=>664,
-1522=>663,1523=>444,1524=>710,1542=>667,1543=>667,1545=>884,1546=>1157,1548=>380,1557=>0,1563=>400,
-1567=>580,1569=>511,1570=>343,1571=>343,1572=>622,1573=>343,1574=>917,1575=>343,1576=>1005,1577=>590,
-1578=>1005,1579=>1005,1580=>721,1581=>721,1582=>721,1583=>513,1584=>513,1585=>576,1586=>576,1587=>1380,
-1588=>1380,1589=>1345,1590=>1345,1591=>1039,1592=>1039,1593=>683,1594=>683,1600=>342,1601=>1162,1602=>894,
-1603=>917,1604=>868,1605=>733,1606=>854,1607=>590,1608=>622,1609=>917,1610=>917,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>500,
-1632=>610,1633=>610,1634=>610,1635=>610,1636=>610,1637=>610,1638=>610,1639=>610,1640=>610,1641=>610,
-1642=>610,1643=>374,1644=>380,1645=>545,1646=>1005,1647=>894,1652=>292,1657=>1005,1658=>1005,1659=>1005,
-1660=>1005,1661=>1005,1662=>1005,1663=>1005,1664=>1005,1665=>721,1666=>721,1667=>721,1668=>721,1669=>721,
-1670=>721,1671=>721,1681=>576,1682=>576,1685=>681,1688=>576,1697=>1162,1700=>1162,1702=>1162,1705=>1024,
-1711=>1024,1717=>868,1722=>854,1727=>721,1734=>622,1740=>917,1742=>917,1749=>590,1776=>610,1777=>610,
-1778=>610,1779=>610,1780=>610,1781=>610,1782=>610,1783=>610,1784=>610,1785=>610,1984=>696,1985=>696,
-1986=>696,1987=>696,1988=>696,1989=>696,1990=>696,1991=>696,1992=>696,1993=>696,1994=>343,1995=>547,
-1996=>543,1997=>652,1998=>691,1999=>691,2000=>594,2001=>691,2002=>904,2003=>551,2004=>551,2005=>627,
-2006=>688,2007=>444,2008=>1022,2009=>506,2010=>826,2011=>691,2012=>652,2013=>912,2014=>627,2015=>707,
-2016=>506,2017=>652,2018=>574,2019=>627,2020=>627,2021=>627,2022=>574,2023=>574,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>380,2037=>380,2040=>691,
-2041=>691,2042=>415,3647=>743,3713=>790,3714=>748,3716=>749,3719=>569,3720=>742,3722=>744,3725=>761,
-3732=>706,3733=>704,3734=>747,3735=>819,3737=>730,3738=>727,3739=>727,3740=>922,3741=>827,3742=>866,
-3743=>866,3745=>836,3746=>761,3747=>770,3749=>769,3751=>713,3754=>827,3755=>1031,3757=>724,3758=>784,
-3759=>934,3760=>688,3761=>0,3762=>610,3763=>610,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>670,3776=>516,3777=>860,3778=>516,3779=>650,3780=>632,3782=>759,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>771,3793=>771,3794=>693,3795=>836,
-3796=>729,3797=>729,3798=>849,3799=>790,3800=>759,3801=>910,3804=>1363,3805=>1363,4256=>918,4257=>744,
-4258=>739,4259=>837,4260=>649,4261=>773,4262=>857,4263=>889,4264=>530,4265=>633,4266=>857,4267=>900,
-4268=>643,4269=>903,4270=>814,4271=>752,4272=>869,4273=>643,4274=>643,4275=>886,4276=>886,4277=>733,
-4278=>653,4279=>643,4280=>646,4281=>643,4282=>790,4283=>902,4284=>633,4285=>619,4286=>643,4287=>778,
-4288=>892,4289=>601,4290=>742,4291=>616,4292=>633,4293=>742,4304=>553,4305=>552,4306=>596,4307=>815,
-4308=>562,4309=>563,4310=>553,4311=>827,4312=>553,4313=>543,4314=>1074,4315=>563,4316=>563,4317=>812,
-4318=>552,4319=>591,4320=>822,4321=>563,4322=>690,4323=>583,4324=>813,4325=>562,4326=>813,4327=>563,
-4328=>563,4329=>563,4330=>632,4331=>563,4332=>563,4333=>552,4334=>563,4335=>563,4336=>558,4337=>604,
-4338=>552,4339=>552,4340=>553,4341=>605,4342=>852,4343=>635,4344=>563,4345=>596,4346=>542,4347=>684,
-4348=>368,5121=>774,5122=>774,5123=>774,5124=>774,5125=>905,5126=>905,5127=>905,5129=>905,5130=>905,
-5131=>905,5132=>1018,5133=>1009,5134=>1018,5135=>1009,5136=>1018,5137=>1009,5138=>1149,5139=>1140,5140=>1149,
-5141=>1140,5142=>905,5143=>1149,5144=>1142,5145=>1149,5146=>1142,5147=>905,5149=>310,5150=>529,5151=>425,
-5152=>425,5153=>395,5154=>395,5155=>395,5156=>395,5157=>564,5158=>470,5159=>310,5160=>395,5161=>395,
-5162=>395,5163=>1213,5164=>986,5165=>1216,5166=>1297,5167=>774,5168=>774,5169=>774,5170=>774,5171=>886,
-5172=>886,5173=>886,5175=>886,5176=>886,5177=>886,5178=>1018,5179=>1009,5180=>1018,5181=>1009,5182=>1018,
-5183=>1009,5184=>1149,5185=>1140,5186=>1149,5187=>1140,5188=>1149,5189=>1142,5190=>1149,5191=>1142,5192=>886,
-5193=>576,5194=>229,5196=>812,5197=>812,5198=>812,5199=>812,5200=>815,5201=>815,5202=>815,5204=>815,
-5205=>815,5206=>815,5207=>1056,5208=>1048,5209=>1056,5210=>1048,5211=>1056,5212=>1048,5213=>1060,5214=>1054,
-5215=>1060,5216=>1054,5217=>1060,5218=>1052,5219=>1060,5220=>1052,5221=>1060,5222=>483,5223=>1005,5224=>1005,
-5225=>1023,5226=>1017,5227=>743,5228=>743,5229=>743,5230=>743,5231=>743,5232=>743,5233=>743,5234=>743,
-5235=>743,5236=>1029,5237=>975,5238=>980,5239=>975,5240=>980,5241=>975,5242=>1029,5243=>975,5244=>1029,
-5245=>975,5246=>980,5247=>975,5248=>980,5249=>975,5250=>980,5251=>501,5252=>501,5253=>938,5254=>938,
-5255=>938,5256=>938,5257=>743,5258=>743,5259=>743,5260=>743,5261=>743,5262=>743,5263=>743,5264=>743,
-5265=>743,5266=>1029,5267=>975,5268=>1029,5269=>975,5270=>1029,5271=>975,5272=>1029,5273=>975,5274=>1029,
-5275=>975,5276=>1029,5277=>975,5278=>1029,5279=>975,5280=>1029,5281=>501,5282=>501,5283=>626,5284=>626,
-5285=>626,5286=>626,5287=>626,5288=>626,5289=>626,5290=>626,5291=>626,5292=>881,5293=>854,5294=>863,
-5295=>874,5296=>863,5297=>874,5298=>881,5299=>874,5300=>881,5301=>874,5302=>863,5303=>874,5304=>863,
-5305=>874,5306=>863,5307=>436,5308=>548,5309=>436,5312=>988,5313=>988,5314=>988,5315=>988,5316=>931,
-5317=>931,5318=>931,5319=>931,5320=>931,5321=>1238,5322=>1247,5323=>1200,5324=>1228,5325=>1200,5326=>1228,
-5327=>931,5328=>660,5329=>497,5330=>660,5331=>988,5332=>988,5333=>988,5334=>988,5335=>931,5336=>931,
-5337=>931,5338=>931,5339=>931,5340=>1231,5341=>1247,5342=>1283,5343=>1228,5344=>1283,5345=>1228,5346=>1228,
-5347=>1214,5348=>1228,5349=>1214,5350=>1283,5351=>1228,5352=>1283,5353=>1228,5354=>660,5356=>886,5357=>730,
-5358=>730,5359=>730,5360=>730,5361=>730,5362=>730,5363=>730,5364=>730,5365=>730,5366=>998,5367=>958,
-5368=>967,5369=>989,5370=>967,5371=>989,5372=>998,5373=>958,5374=>998,5375=>958,5376=>967,5377=>989,
-5378=>967,5379=>989,5380=>967,5381=>493,5382=>460,5383=>493,5392=>923,5393=>923,5394=>923,5395=>1136,
-5396=>1136,5397=>1136,5398=>1136,5399=>1209,5400=>1202,5401=>1209,5402=>1202,5403=>1209,5404=>1202,5405=>1431,
-5406=>1420,5407=>1431,5408=>1420,5409=>1431,5410=>1420,5411=>1431,5412=>1420,5413=>746,5414=>776,5415=>776,
-5416=>776,5417=>776,5418=>776,5419=>776,5420=>776,5421=>776,5422=>776,5423=>1003,5424=>1003,5425=>1013,
-5426=>996,5427=>1013,5428=>996,5429=>1003,5430=>1003,5431=>1003,5432=>1003,5433=>1013,5434=>996,5435=>1013,
-5436=>996,5437=>1013,5438=>495,5440=>395,5441=>510,5442=>1033,5443=>1033,5444=>976,5445=>976,5446=>976,
-5447=>976,5448=>733,5449=>733,5450=>733,5451=>733,5452=>733,5453=>733,5454=>1003,5455=>959,5456=>495,
-5458=>886,5459=>774,5460=>774,5461=>774,5462=>774,5463=>928,5464=>928,5465=>928,5466=>928,5467=>1172,
-5468=>1142,5469=>602,5470=>812,5471=>812,5472=>812,5473=>812,5474=>812,5475=>812,5476=>815,5477=>815,
-5478=>815,5479=>815,5480=>1060,5481=>1052,5482=>548,5492=>977,5493=>977,5494=>977,5495=>977,5496=>977,
-5497=>977,5498=>977,5499=>618,5500=>837,5501=>510,5502=>1238,5503=>1238,5504=>1238,5505=>1238,5506=>1238,
-5507=>1238,5508=>1238,5509=>989,5514=>977,5515=>977,5516=>977,5517=>977,5518=>1591,5519=>1591,5520=>1591,
-5521=>1295,5522=>1295,5523=>1591,5524=>1591,5525=>848,5526=>1273,5536=>988,5537=>988,5538=>931,5539=>931,
-5540=>931,5541=>931,5542=>660,5543=>776,5544=>776,5545=>776,5546=>776,5547=>776,5548=>776,5549=>776,
-5550=>495,5551=>743,5598=>830,5601=>830,5702=>496,5703=>496,5742=>413,5743=>1238,5744=>1591,5745=>2016,
-5746=>2016,5747=>1720,5748=>1678,5749=>2016,5750=>2016,5760=>543,5761=>637,5762=>945,5763=>1254,5764=>1563,
-5765=>1871,5766=>627,5767=>936,5768=>1254,5769=>1559,5770=>1871,5771=>569,5772=>877,5773=>1187,5774=>1497,
-5775=>1807,5776=>637,5777=>945,5778=>1240,5779=>1555,5780=>1871,5781=>569,5782=>569,5783=>789,5784=>1234,
-5785=>1559,5786=>740,5787=>638,5788=>638,7424=>652,7425=>833,7426=>1048,7427=>608,7428=>593,7429=>676,
-7430=>676,7431=>559,7432=>557,7433=>343,7434=>494,7435=>665,7436=>539,7437=>817,7438=>701,7439=>687,
-7440=>593,7441=>660,7442=>660,7443=>660,7444=>1094,7446=>687,7447=>687,7448=>556,7449=>642,7450=>642,
-7451=>580,7452=>634,7453=>737,7454=>948,7455=>695,7456=>652,7457=>924,7458=>582,7459=>646,7462=>539,
-7463=>652,7464=>691,7465=>556,7466=>781,7467=>732,7468=>487,7469=>683,7470=>480,7472=>523,7473=>430,
-7474=>430,7475=>517,7476=>527,7477=>234,7478=>234,7479=>488,7480=>401,7481=>626,7482=>527,7483=>527,
-7484=>535,7485=>509,7486=>461,7487=>485,7488=>430,7489=>511,7490=>695,7491=>458,7492=>458,7493=>479,
-7494=>712,7495=>479,7496=>479,7497=>479,7498=>479,7499=>386,7500=>386,7501=>479,7502=>219,7503=>487,
-7504=>664,7505=>456,7506=>488,7507=>414,7508=>488,7509=>488,7510=>479,7511=>388,7512=>456,7513=>462,
-7514=>664,7515=>501,7517=>451,7518=>429,7519=>433,7520=>493,7521=>406,7522=>219,7523=>315,7524=>456,
-7525=>501,7526=>451,7527=>429,7528=>451,7529=>493,7530=>406,7543=>716,7544=>527,7547=>545,7557=>514,
-7579=>479,7580=>414,7581=>414,7582=>488,7583=>386,7584=>377,7585=>348,7586=>479,7587=>456,7588=>347,
-7589=>281,7590=>347,7591=>347,7592=>431,7593=>326,7594=>330,7595=>370,7596=>664,7597=>664,7598=>562,
-7599=>562,7600=>448,7601=>488,7602=>542,7603=>422,7604=>396,7605=>388,7606=>583,7607=>494,7608=>399,
-7609=>451,7610=>501,7611=>417,7612=>523,7613=>470,7614=>455,7615=>425,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>774,7681=>675,7682=>762,7683=>716,7684=>762,7685=>716,7686=>762,
-7687=>716,7688=>734,7689=>593,7690=>830,7691=>716,7692=>830,7693=>716,7694=>830,7695=>716,7696=>830,
-7697=>716,7698=>830,7699=>716,7700=>683,7701=>678,7702=>683,7703=>678,7704=>683,7705=>678,7706=>683,
-7707=>678,7708=>683,7709=>678,7710=>683,7711=>435,7712=>821,7713=>716,7714=>837,7715=>712,7716=>837,
-7717=>712,7718=>837,7719=>712,7720=>837,7721=>712,7722=>837,7723=>712,7724=>372,7725=>343,7726=>372,
-7727=>343,7728=>775,7729=>665,7730=>775,7731=>665,7732=>775,7733=>665,7734=>637,7735=>343,7736=>637,
-7737=>343,7738=>637,7739=>343,7740=>637,7741=>343,7742=>995,7743=>1042,7744=>995,7745=>1042,7746=>995,
-7747=>1042,7748=>837,7749=>712,7750=>837,7751=>712,7752=>837,7753=>712,7754=>837,7755=>712,7756=>850,
-7757=>687,7758=>850,7759=>687,7760=>850,7761=>687,7762=>850,7763=>687,7764=>733,7765=>716,7766=>733,
-7767=>716,7768=>770,7769=>493,7770=>770,7771=>493,7772=>770,7773=>493,7774=>770,7775=>493,7776=>720,
-7777=>595,7778=>720,7779=>595,7780=>720,7781=>595,7782=>720,7783=>595,7784=>720,7785=>595,7786=>682,
-7787=>478,7788=>682,7789=>478,7790=>682,7791=>478,7792=>682,7793=>478,7794=>812,7795=>712,7796=>812,
-7797=>712,7798=>812,7799=>712,7800=>812,7801=>712,7802=>812,7803=>712,7804=>774,7805=>652,7806=>774,
-7807=>652,7808=>1103,7809=>924,7810=>1103,7811=>924,7812=>1103,7813=>924,7814=>1103,7815=>924,7816=>1103,
-7817=>924,7818=>771,7819=>645,7820=>771,7821=>645,7822=>724,7823=>652,7824=>725,7825=>582,7826=>725,
-7827=>582,7828=>725,7829=>582,7830=>712,7831=>478,7832=>924,7833=>652,7834=>675,7835=>435,7838=>896,
-7839=>687,7840=>774,7841=>675,7842=>774,7843=>675,7844=>774,7845=>675,7846=>774,7847=>675,7848=>774,
-7849=>675,7850=>774,7851=>675,7852=>774,7853=>675,7854=>774,7855=>675,7856=>774,7857=>675,7858=>774,
-7859=>675,7860=>774,7861=>675,7862=>774,7863=>675,7864=>683,7865=>678,7866=>683,7867=>678,7868=>683,
-7869=>678,7870=>683,7871=>678,7872=>683,7873=>678,7874=>683,7875=>678,7876=>683,7877=>678,7878=>683,
-7879=>678,7880=>372,7881=>343,7882=>372,7883=>343,7884=>850,7885=>687,7886=>850,7887=>687,7888=>850,
-7889=>687,7890=>850,7891=>687,7892=>850,7893=>687,7894=>850,7895=>687,7896=>850,7897=>687,7898=>874,
-7899=>687,7900=>874,7901=>687,7902=>874,7903=>687,7904=>874,7905=>687,7906=>874,7907=>687,7908=>812,
-7909=>712,7910=>812,7911=>712,7912=>835,7913=>712,7914=>835,7915=>712,7916=>835,7917=>712,7918=>835,
-7919=>712,7920=>835,7921=>712,7922=>724,7923=>652,7924=>724,7925=>652,7926=>724,7927=>652,7928=>724,
-7929=>652,7936=>687,7937=>687,7938=>687,7939=>687,7940=>687,7941=>687,7942=>687,7943=>687,7944=>774,
-7945=>774,7946=>1041,7947=>1043,7948=>935,7949=>963,7950=>835,7951=>859,7952=>557,7953=>557,7954=>557,
-7955=>557,7956=>557,7957=>557,7960=>792,7961=>794,7962=>1100,7963=>1096,7964=>1023,7965=>1052,7968=>712,
-7969=>712,7970=>712,7971=>712,7972=>712,7973=>712,7974=>712,7975=>712,7976=>945,7977=>951,7978=>1250,
-7979=>1250,7980=>1180,7981=>1206,7982=>1054,7983=>1063,7984=>390,7985=>390,7986=>390,7987=>390,7988=>390,
-7989=>390,7990=>390,7991=>390,7992=>483,7993=>489,7994=>777,7995=>785,7996=>712,7997=>738,7998=>604,
-7999=>604,8000=>687,8001=>687,8002=>687,8003=>687,8004=>687,8005=>687,8008=>892,8009=>933,8010=>1221,
-8011=>1224,8012=>1053,8013=>1082,8016=>675,8017=>675,8018=>675,8019=>675,8020=>675,8021=>675,8022=>675,
-8023=>675,8025=>930,8027=>1184,8029=>1199,8031=>1049,8032=>869,8033=>869,8034=>869,8035=>869,8036=>869,
-8037=>869,8038=>869,8039=>869,8040=>909,8041=>958,8042=>1246,8043=>1251,8044=>1076,8045=>1105,8046=>1028,
-8047=>1076,8048=>687,8049=>687,8050=>557,8051=>557,8052=>712,8053=>712,8054=>390,8055=>390,8056=>687,
-8057=>687,8058=>675,8059=>675,8060=>869,8061=>869,8064=>687,8065=>687,8066=>687,8067=>687,8068=>687,
-8069=>687,8070=>687,8071=>687,8072=>774,8073=>774,8074=>1041,8075=>1043,8076=>935,8077=>963,8078=>835,
-8079=>859,8080=>712,8081=>712,8082=>712,8083=>712,8084=>712,8085=>712,8086=>712,8087=>712,8088=>945,
-8089=>951,8090=>1250,8091=>1250,8092=>1180,8093=>1206,8094=>1054,8095=>1063,8096=>869,8097=>869,8098=>869,
-8099=>869,8100=>869,8101=>869,8102=>869,8103=>869,8104=>909,8105=>958,8106=>1246,8107=>1251,8108=>1076,
-8109=>1105,8110=>1028,8111=>1076,8112=>687,8113=>687,8114=>687,8115=>687,8116=>687,8118=>687,8119=>687,
-8120=>774,8121=>774,8122=>876,8123=>797,8124=>774,8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,
-8130=>712,8131=>712,8132=>712,8134=>712,8135=>712,8136=>929,8137=>846,8138=>1080,8139=>1009,8140=>837,
-8141=>500,8142=>500,8143=>500,8144=>390,8145=>390,8146=>390,8147=>390,8150=>390,8151=>390,8152=>372,
-8153=>372,8154=>621,8155=>563,8157=>500,8158=>500,8159=>500,8160=>675,8161=>675,8162=>675,8163=>675,
-8164=>716,8165=>716,8166=>675,8167=>675,8168=>724,8169=>724,8170=>1020,8171=>980,8172=>838,8173=>500,
-8174=>500,8175=>500,8178=>869,8179=>869,8180=>869,8182=>869,8183=>869,8184=>1065,8185=>891,8186=>1084,
-8187=>894,8188=>850,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,
-8198=>167,8199=>696,8200=>380,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>415,8209=>415,8210=>696,8213=>1000,8214=>500,8215=>500,8219=>380,8223=>657,8227=>639,8228=>333,
-8229=>667,8231=>348,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,8241=>1887,8242=>264,
-8243=>447,8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,8251=>972,8252=>627,8253=>580,8254=>500,
-8255=>828,8256=>828,8257=>329,8258=>1023,8259=>500,8260=>167,8261=>457,8262=>457,8263=>1030,8264=>829,
-8265=>829,8266=>513,8267=>636,8268=>500,8269=>500,8270=>523,8271=>400,8272=>828,8273=>523,8274=>556,
-8275=>1000,8276=>828,8277=>838,8278=>684,8279=>813,8280=>838,8281=>838,8282=>380,8283=>872,8284=>838,
-8285=>380,8286=>380,8287=>222,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,
-8300=>0,8301=>0,8302=>0,8303=>0,8304=>438,8305=>219,8308=>438,8309=>438,8310=>438,8311=>438,
-8312=>438,8313=>438,8314=>528,8315=>528,8316=>528,8317=>288,8318=>288,8319=>456,8320=>438,8321=>438,
-8322=>438,8323=>438,8324=>438,8325=>438,8326=>438,8327=>438,8328=>438,8329=>438,8330=>528,8331=>528,
-8332=>528,8333=>288,8334=>288,8336=>458,8337=>479,8338=>488,8339=>413,8340=>479,8352=>929,8353=>696,
-8354=>696,8355=>696,8356=>696,8357=>1042,8358=>837,8359=>1518,8360=>1205,8361=>1103,8362=>904,8363=>696,
-8365=>696,8366=>682,8367=>1392,8368=>696,8369=>696,8370=>696,8371=>696,8372=>859,8373=>696,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1120,8449=>1170,8450=>734,8451=>1211,
-8452=>896,8453=>1091,8454=>1144,8455=>614,8456=>698,8457=>1086,8459=>1073,8460=>913,8461=>888,8462=>712,
-8463=>712,8464=>597,8465=>697,8466=>856,8467=>472,8468=>974,8469=>837,8470=>1203,8471=>1000,8472=>697,
-8473=>750,8474=>850,8475=>938,8476=>814,8477=>801,8478=>896,8479=>710,8480=>1020,8481=>1281,8483=>755,
-8484=>754,8485=>578,8486=>850,8487=>850,8488=>763,8489=>338,8490=>775,8491=>774,8492=>928,8493=>818,
-8494=>854,8495=>636,8496=>729,8497=>808,8498=>683,8499=>1184,8500=>465,8501=>794,8502=>731,8503=>494,
-8504=>684,8505=>380,8506=>945,8507=>1348,8508=>790,8509=>737,8510=>654,8511=>863,8512=>840,8513=>775,
-8514=>557,8515=>637,8516=>760,8517=>830,8518=>716,8519=>678,8520=>343,8521=>343,8523=>872,8526=>547,
-8531=>1035,8532=>1035,8533=>1035,8534=>1035,8535=>1035,8536=>1035,8537=>1035,8538=>1035,8539=>1035,8540=>1035,
-8541=>1035,8542=>1035,8543=>615,8544=>372,8545=>659,8546=>945,8547=>1099,8548=>774,8549=>1099,8550=>1386,
-8551=>1672,8552=>1121,8553=>771,8554=>1120,8555=>1407,8556=>637,8557=>734,8558=>830,8559=>995,8560=>343,
-8561=>607,8562=>872,8563=>984,8564=>652,8565=>962,8566=>1227,8567=>1491,8568=>969,8569=>645,8570=>969,
-8571=>1233,8572=>343,8573=>593,8574=>716,8575=>1042,8576=>1289,8577=>830,8578=>1289,8579=>734,8580=>593,
-8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,8598=>838,8599=>838,8600=>838,8601=>838,
-8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,8608=>838,8609=>838,8610=>838,8611=>838,
-8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,8618=>838,8619=>838,8620=>838,8621=>838,
-8622=>838,8623=>838,8624=>838,8625=>838,8626=>838,8627=>838,8628=>838,8629=>838,8630=>838,8631=>838,
-8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,8638=>838,8639=>838,8640=>838,8641=>838,
-8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,8648=>838,8649=>838,8650=>838,8651=>838,
-8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,8658=>838,8659=>838,8660=>838,8661=>838,
-8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,8668=>838,8669=>838,8670=>838,8671=>838,
-8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,8678=>838,8679=>838,8680=>838,8681=>838,
-8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,8688=>838,8689=>838,8690=>838,8691=>838,
-8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,8698=>838,8699=>838,8700=>838,8701=>838,
-8702=>838,8703=>838,8704=>774,8705=>696,8706=>544,8707=>683,8708=>683,8709=>856,8710=>697,8711=>697,
-8712=>896,8713=>896,8714=>750,8715=>896,8716=>896,8717=>750,8718=>636,8719=>787,8720=>787,8721=>718,
-8722=>838,8723=>838,8724=>696,8725=>365,8726=>696,8727=>838,8728=>626,8729=>380,8730=>667,8731=>667,
-8732=>667,8733=>712,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,8740=>500,8741=>500,
-8742=>500,8743=>812,8744=>812,8745=>812,8746=>812,8747=>610,8748=>929,8749=>1295,8750=>563,8751=>977,
-8752=>1313,8753=>563,8754=>563,8755=>563,8756=>696,8757=>696,8758=>294,8759=>696,8760=>838,8761=>838,
-8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,8770=>838,8771=>838,
-8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,8780=>838,8781=>838,
-8782=>838,8783=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1063,8789=>1063,8790=>838,8791=>838,
-8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,8800=>838,8801=>838,
-8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>841,8809=>841,8810=>1047,8811=>1047,
-8812=>500,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,8820=>838,8821=>838,
-8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,8830=>838,8831=>838,
-8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8840=>838,8841=>838,
-8842=>838,8843=>838,8844=>812,8845=>812,8846=>812,8847=>838,8848=>838,8849=>838,8850=>838,8851=>796,
-8852=>796,8853=>838,8854=>838,8855=>838,8856=>838,8857=>838,8858=>838,8859=>838,8860=>838,8861=>838,
-8862=>838,8863=>838,8864=>838,8865=>838,8866=>914,8867=>914,8868=>914,8869=>914,8870=>542,8871=>542,
-8872=>914,8873=>914,8874=>914,8875=>914,8876=>914,8877=>914,8878=>914,8879=>914,8880=>838,8881=>838,
-8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,8890=>542,8891=>812,
-8892=>812,8893=>812,8894=>838,8895=>838,8896=>843,8897=>843,8898=>843,8899=>843,8900=>494,8901=>380,
-8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,8910=>812,8911=>812,
-8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,8920=>1422,8921=>1422,
-8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,8930=>838,8931=>838,
-8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,8940=>838,8941=>838,
-8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1158,8947=>896,8948=>750,8949=>896,8950=>896,8951=>750,
-8952=>896,8953=>896,8954=>1158,8955=>896,8956=>750,8957=>896,8958=>750,8959=>896,8960=>602,8961=>602,
-8962=>716,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>457,8969=>457,8970=>457,8971=>457,
-8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>539,8984=>928,8985=>838,8988=>469,8989=>469,
-8990=>469,8991=>469,8992=>610,8993=>610,8996=>1152,8997=>1152,8998=>1414,8999=>1152,9000=>1443,9003=>1414,
-9004=>873,9075=>390,9076=>716,9077=>869,9082=>687,9085=>863,9095=>1152,9108=>873,9115=>500,9116=>500,
-9117=>500,9118=>500,9119=>500,9120=>500,9121=>500,9122=>500,9123=>500,9124=>500,9125=>500,9126=>500,
-9127=>750,9128=>750,9129=>750,9130=>750,9131=>750,9132=>750,9133=>750,9134=>610,9166=>838,9167=>945,
-9187=>873,9189=>769,9250=>716,9251=>716,9312=>847,9313=>847,9314=>847,9315=>847,9316=>847,9317=>847,
-9318=>847,9319=>847,9320=>847,9321=>847,9600=>769,9601=>769,9602=>769,9603=>769,9604=>769,9605=>769,
-9606=>769,9607=>769,9608=>769,9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,9614=>769,9615=>769,
-9616=>769,9617=>769,9618=>769,9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,9624=>769,9625=>769,
-9626=>769,9627=>769,9628=>769,9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,9634=>945,9635=>945,
-9636=>945,9637=>945,9638=>945,9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,9644=>945,9645=>945,
-9646=>550,9647=>550,9648=>769,9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,9654=>769,9655=>769,
-9656=>502,9657=>502,9658=>769,9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,9664=>769,9665=>769,
-9666=>502,9667=>502,9668=>769,9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,9674=>494,9675=>873,
-9676=>873,9677=>873,9678=>873,9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,9684=>873,9685=>873,
-9686=>527,9687=>527,9688=>840,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,
-9696=>769,9697=>769,9698=>769,9699=>769,9700=>769,9701=>769,9702=>639,9703=>945,9704=>945,9705=>945,
-9706=>945,9707=>945,9708=>769,9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,9714=>945,9715=>945,
-9716=>873,9717=>873,9718=>873,9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,9724=>830,9725=>732,
-9726=>732,9727=>769,9728=>896,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,
-9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,
-9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,
-9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,
-9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,
-9776=>896,9777=>896,9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,9784=>896,9785=>896,
-9786=>896,9787=>896,9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,
-9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,
-9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,
-9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,
-9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,
-9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,
-9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,
-9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,9864=>896,9865=>896,
-9866=>896,9867=>896,9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,9874=>896,9875=>896,
-9876=>896,9877=>541,9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,9884=>896,9888=>896,
-9889=>702,9890=>1003,9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,
-9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,9907=>732,9908=>732,
-9909=>732,9910=>850,9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,
-9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,
-10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,
-10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,
-10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,
-10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,
-10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,
-10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,
-10070=>896,10072=>838,10073=>838,10074=>838,10075=>347,10076=>347,10077=>587,10078=>587,10081=>838,10082=>838,
-10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,
-10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>847,
-10103=>847,10104=>847,10105=>847,10106=>847,10107=>847,10108=>847,10109=>847,10110=>847,10111=>847,10112=>838,
-10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,
-10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,
-10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,
-10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,
-10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,
-10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>457,10182=>457,
-10208=>494,10214=>487,10215=>487,10216=>457,10217=>457,10218=>721,10219=>721,10224=>838,10225=>838,10226=>838,
-10227=>838,10228=>1157,10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,
-10237=>1434,10238=>1434,10239=>1434,10240=>781,10241=>781,10242=>781,10243=>781,10244=>781,10245=>781,10246=>781,
-10247=>781,10248=>781,10249=>781,10250=>781,10251=>781,10252=>781,10253=>781,10254=>781,10255=>781,10256=>781,
-10257=>781,10258=>781,10259=>781,10260=>781,10261=>781,10262=>781,10263=>781,10264=>781,10265=>781,10266=>781,
-10267=>781,10268=>781,10269=>781,10270=>781,10271=>781,10272=>781,10273=>781,10274=>781,10275=>781,10276=>781,
-10277=>781,10278=>781,10279=>781,10280=>781,10281=>781,10282=>781,10283=>781,10284=>781,10285=>781,10286=>781,
-10287=>781,10288=>781,10289=>781,10290=>781,10291=>781,10292=>781,10293=>781,10294=>781,10295=>781,10296=>781,
-10297=>781,10298=>781,10299=>781,10300=>781,10301=>781,10302=>781,10303=>781,10304=>781,10305=>781,10306=>781,
-10307=>781,10308=>781,10309=>781,10310=>781,10311=>781,10312=>781,10313=>781,10314=>781,10315=>781,10316=>781,
-10317=>781,10318=>781,10319=>781,10320=>781,10321=>781,10322=>781,10323=>781,10324=>781,10325=>781,10326=>781,
-10327=>781,10328=>781,10329=>781,10330=>781,10331=>781,10332=>781,10333=>781,10334=>781,10335=>781,10336=>781,
-10337=>781,10338=>781,10339=>781,10340=>781,10341=>781,10342=>781,10343=>781,10344=>781,10345=>781,10346=>781,
-10347=>781,10348=>781,10349=>781,10350=>781,10351=>781,10352=>781,10353=>781,10354=>781,10355=>781,10356=>781,
-10357=>781,10358=>781,10359=>781,10360=>781,10361=>781,10362=>781,10363=>781,10364=>781,10365=>781,10366=>781,
-10367=>781,10368=>781,10369=>781,10370=>781,10371=>781,10372=>781,10373=>781,10374=>781,10375=>781,10376=>781,
-10377=>781,10378=>781,10379=>781,10380=>781,10381=>781,10382=>781,10383=>781,10384=>781,10385=>781,10386=>781,
-10387=>781,10388=>781,10389=>781,10390=>781,10391=>781,10392=>781,10393=>781,10394=>781,10395=>781,10396=>781,
-10397=>781,10398=>781,10399=>781,10400=>781,10401=>781,10402=>781,10403=>781,10404=>781,10405=>781,10406=>781,
-10407=>781,10408=>781,10409=>781,10410=>781,10411=>781,10412=>781,10413=>781,10414=>781,10415=>781,10416=>781,
-10417=>781,10418=>781,10419=>781,10420=>781,10421=>781,10422=>781,10423=>781,10424=>781,10425=>781,10426=>781,
-10427=>781,10428=>781,10429=>781,10430=>781,10431=>781,10432=>781,10433=>781,10434=>781,10435=>781,10436=>781,
-10437=>781,10438=>781,10439=>781,10440=>781,10441=>781,10442=>781,10443=>781,10444=>781,10445=>781,10446=>781,
-10447=>781,10448=>781,10449=>781,10450=>781,10451=>781,10452=>781,10453=>781,10454=>781,10455=>781,10456=>781,
-10457=>781,10458=>781,10459=>781,10460=>781,10461=>781,10462=>781,10463=>781,10464=>781,10465=>781,10466=>781,
-10467=>781,10468=>781,10469=>781,10470=>781,10471=>781,10472=>781,10473=>781,10474=>781,10475=>781,10476=>781,
-10477=>781,10478=>781,10479=>781,10480=>781,10481=>781,10482=>781,10483=>781,10484=>781,10485=>781,10486=>781,
-10487=>781,10488=>781,10489=>781,10490=>781,10491=>781,10492=>781,10493=>781,10494=>781,10495=>781,10502=>838,
-10503=>838,10506=>838,10507=>838,10560=>838,10561=>838,10627=>753,10628=>753,10702=>838,10703=>1046,10704=>1046,
-10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,
-10754=>1000,10764=>1661,10765=>563,10766=>563,10767=>563,10768=>563,10769=>563,10770=>563,10771=>563,10772=>563,
-10773=>563,10774=>563,10775=>563,10776=>563,10777=>563,10778=>563,10779=>563,10780=>563,10799=>838,10877=>838,
-10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,
-10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,
-10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,
-10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,
-10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>838,
-11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,11016=>838,11017=>838,
-11018=>838,11019=>838,11020=>838,11021=>838,11022=>838,11023=>838,11024=>838,11025=>838,11026=>945,11027=>945,
-11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11039=>869,11040=>869,11041=>873,
-11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>637,11361=>360,11362=>637,11363=>733,11364=>770,
-11365=>675,11366=>478,11367=>956,11368=>712,11369=>775,11370=>665,11371=>725,11372=>582,11373=>860,11374=>995,
-11375=>774,11377=>778,11378=>1221,11379=>1056,11380=>652,11381=>698,11382=>565,11383=>782,11385=>538,11386=>687,
-11387=>559,11388=>219,11389=>487,11568=>691,11569=>941,11570=>941,11571=>725,11572=>725,11573=>725,11574=>676,
-11575=>774,11576=>774,11577=>683,11578=>683,11579=>802,11580=>989,11581=>761,11582=>623,11583=>761,11584=>941,
-11585=>941,11586=>373,11587=>740,11588=>837,11589=>914,11590=>672,11591=>737,11592=>680,11593=>683,11594=>602,
-11595=>1039,11596=>778,11597=>837,11598=>683,11599=>372,11600=>778,11601=>373,11602=>725,11603=>691,11604=>941,
-11605=>941,11606=>837,11607=>373,11608=>836,11609=>941,11610=>941,11611=>734,11612=>876,11613=>771,11614=>734,
-11615=>683,11616=>774,11617=>837,11618=>683,11619=>850,11620=>697,11621=>850,11631=>716,11800=>580,11810=>457,
-11811=>457,11812=>457,11813=>457,11822=>580,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,
-19910=>896,19911=>896,19912=>896,19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,
-19920=>896,19921=>896,19922=>896,19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,
-19930=>896,19931=>896,19932=>896,19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,
-19940=>896,19941=>896,19942=>896,19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,
-19950=>896,19951=>896,19952=>896,19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,
-19960=>896,19961=>896,19962=>896,19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42564=>720,42565=>595,
-42566=>436,42567=>440,42572=>1405,42573=>1173,42576=>1234,42577=>1027,42580=>1174,42581=>972,42582=>1093,42583=>958,
-42594=>1085,42595=>924,42596=>1096,42597=>912,42598=>1260,42599=>997,42600=>850,42601=>687,42602=>1037,42603=>868,
-42604=>1406,42605=>1106,42606=>961,42634=>963,42635=>787,42636=>682,42637=>580,42644=>808,42645=>712,42760=>500,
-42761=>500,42762=>500,42763=>500,42764=>500,42765=>500,42766=>500,42767=>500,42768=>500,42769=>500,42770=>500,
-42771=>500,42772=>500,42773=>500,42774=>500,42779=>400,42780=>400,42781=>287,42782=>287,42783=>287,42790=>837,
-42791=>712,42792=>1031,42793=>857,42794=>696,42795=>557,42800=>559,42801=>595,42802=>1349,42803=>1052,42804=>1284,
-42805=>1064,42806=>1216,42807=>1054,42808=>1079,42809=>922,42810=>1079,42811=>922,42812=>1035,42813=>922,42814=>698,
-42815=>549,42822=>850,42823=>542,42824=>683,42825=>531,42826=>918,42827=>814,42830=>1406,42831=>1106,42880=>637,
-42881=>343,42882=>837,42883=>712,42889=>400,42890=>386,42891=>456,42892=>306,43003=>683,43004=>733,43005=>995,
-43006=>372,43007=>1325,63173=>687,64256=>810,64257=>741,64258=>741,64259=>1115,64260=>1116,64261=>808,64262=>1020,
-64275=>1388,64276=>1384,64277=>1378,64278=>1384,64279=>1713,64285=>343,64286=>0,64287=>663,64288=>720,64289=>963,
-64290=>890,64291=>988,64292=>963,64293=>938,64294=>988,64295=>988,64296=>976,64297=>838,64298=>949,64299=>949,
-64300=>949,64301=>949,64302=>751,64303=>751,64304=>751,64305=>673,64306=>537,64307=>654,64308=>712,64309=>438,
-64310=>491,64312=>724,64313=>438,64314=>649,64315=>650,64316=>679,64318=>775,64320=>497,64321=>773,64323=>718,
-64324=>687,64326=>751,64327=>729,64328=>649,64329=>949,64330=>751,64331=>343,64332=>673,64333=>650,64334=>687,
-64335=>751,64338=>1005,64339=>1059,64340=>375,64341=>408,64342=>1005,64343=>1059,64344=>375,64345=>408,64346=>1005,
-64347=>1059,64348=>375,64349=>408,64350=>1005,64351=>1059,64352=>375,64353=>408,64354=>1005,64355=>1059,64356=>375,
-64357=>408,64358=>1005,64359=>1059,64360=>375,64361=>408,64362=>1162,64363=>1191,64364=>655,64365=>720,64366=>1162,
-64367=>1191,64368=>655,64369=>720,64370=>721,64371=>721,64372=>721,64373=>721,64374=>721,64375=>721,64376=>721,
-64377=>721,64378=>721,64379=>721,64380=>721,64381=>721,64382=>721,64383=>721,64384=>721,64385=>721,64394=>576,
-64395=>622,64396=>576,64397=>622,64398=>1024,64399=>1024,64400=>582,64401=>582,64402=>1024,64403=>1024,64404=>582,
-64405=>582,64414=>854,64415=>900,64473=>622,64474=>627,64488=>375,64489=>408,64508=>917,64509=>1012,64510=>375,
-64511=>408,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,
-65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>342,65137=>342,65138=>342,65139=>346,65140=>342,65142=>342,65143=>342,65144=>342,65145=>342,
-65146=>342,65147=>342,65148=>342,65149=>342,65150=>342,65151=>342,65152=>511,65153=>343,65154=>375,65155=>343,
-65156=>375,65157=>622,65158=>627,65159=>343,65160=>375,65161=>917,65162=>917,65163=>375,65164=>408,65165=>343,
-65166=>375,65167=>1005,65168=>1059,65169=>375,65170=>408,65171=>590,65172=>606,65173=>1005,65174=>1059,65175=>375,
-65176=>408,65177=>1005,65178=>1059,65179=>375,65180=>408,65181=>721,65182=>721,65183=>721,65184=>721,65185=>721,
-65186=>721,65187=>721,65188=>721,65189=>721,65190=>721,65191=>721,65192=>721,65193=>513,65194=>578,65195=>513,
-65196=>578,65197=>576,65198=>622,65199=>576,65200=>622,65201=>1380,65202=>1414,65203=>983,65204=>1018,65205=>1380,
-65206=>1414,65207=>983,65208=>1018,65209=>1345,65210=>1364,65211=>966,65212=>985,65213=>1345,65214=>1364,65215=>966,
-65216=>985,65217=>1039,65218=>1071,65219=>942,65220=>974,65221=>1039,65222=>1071,65223=>942,65224=>974,65225=>683,
-65226=>683,65227=>683,65228=>564,65229=>683,65230=>683,65231=>683,65232=>564,65233=>1162,65234=>1191,65235=>655,
-65236=>720,65237=>894,65238=>901,65239=>655,65240=>720,65241=>917,65242=>931,65243=>582,65244=>582,65245=>868,
-65246=>893,65247=>375,65248=>408,65249=>733,65250=>784,65251=>619,65252=>670,65253=>854,65254=>900,65255=>375,
-65256=>408,65257=>590,65258=>606,65259=>693,65260=>660,65261=>622,65262=>627,65263=>917,65264=>1012,65265=>917,
-65266=>1012,65267=>375,65268=>408,65269=>745,65270=>759,65271=>745,65272=>759,65273=>745,65274=>759,65275=>745,
-65276=>759,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1113);
-$enc='';
-$diff='';
-$file='dejavusansb.z';
-$ctg='dejavusansb.ctg.z';
-$originalsize=573136;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansbi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansbi.php
deleted file mode 100644
index 0c68378d440..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansbi.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans-BoldOblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-51,'Flags'=>96,'FontBBox'=>'[-1067 -385 2005 1121]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>348,33=>456,34=>521,35=>696,36=>696,37=>1002,38=>872,39=>306,40=>457,
-41=>457,42=>523,43=>838,44=>380,45=>415,46=>380,47=>365,48=>696,49=>696,50=>696,
-51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>400,59=>400,60=>838,
-61=>838,62=>838,63=>580,64=>1000,65=>774,66=>762,67=>734,68=>830,69=>683,70=>683,
-71=>821,72=>837,73=>372,74=>372,75=>775,76=>637,77=>995,78=>837,79=>850,80=>733,
-81=>850,82=>770,83=>720,84=>682,85=>812,86=>774,87=>1103,88=>771,89=>724,90=>725,
-91=>457,92=>365,93=>457,94=>838,95=>500,96=>500,97=>675,98=>716,99=>593,100=>716,
-101=>678,102=>435,103=>716,104=>712,105=>343,106=>343,107=>665,108=>343,109=>1042,110=>712,
-111=>687,112=>716,113=>716,114=>493,115=>595,116=>478,117=>712,118=>652,119=>924,120=>645,
-121=>652,122=>582,123=>712,124=>365,125=>712,126=>838,8364=>696,8218=>380,402=>435,8222=>644,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1454,352=>720,8249=>412,338=>1167,381=>725,8216=>380,
-8217=>380,8220=>644,8221=>644,8226=>639,8211=>500,8212=>1000,732=>500,8482=>1000,353=>595,8250=>412,
-339=>1094,382=>582,376=>724,160=>348,161=>456,162=>696,163=>696,164=>636,165=>696,166=>365,
-167=>500,168=>500,169=>1000,170=>564,171=>650,172=>838,173=>415,174=>1000,175=>500,176=>500,
-177=>838,178=>438,179=>438,180=>500,181=>736,182=>636,183=>380,184=>500,185=>438,186=>564,
-187=>650,188=>1035,189=>1035,190=>1035,191=>580,192=>774,193=>774,194=>774,195=>774,196=>774,
-197=>774,198=>1085,199=>734,200=>683,201=>683,202=>683,203=>683,204=>372,205=>372,206=>372,
-207=>372,208=>845,209=>837,210=>850,211=>850,212=>850,213=>850,214=>850,215=>838,216=>850,
-217=>812,218=>812,219=>812,220=>812,221=>724,222=>742,223=>719,224=>675,225=>675,226=>675,
-227=>675,228=>675,229=>675,230=>1048,231=>593,232=>678,233=>678,234=>678,235=>678,236=>343,
-237=>343,238=>343,239=>343,240=>687,241=>712,242=>687,243=>687,244=>687,245=>687,246=>687,
-247=>838,248=>687,249=>712,250=>712,251=>712,252=>712,253=>652,254=>716,255=>652,256=>774,
-257=>675,258=>774,259=>675,260=>774,261=>675,262=>734,263=>593,264=>734,265=>593,266=>734,
-267=>593,268=>734,269=>593,270=>830,271=>716,272=>845,273=>716,274=>683,275=>678,276=>683,
-277=>678,278=>683,279=>678,280=>683,281=>678,282=>683,283=>678,284=>821,285=>716,286=>821,
-287=>716,288=>821,289=>716,290=>821,291=>716,292=>837,293=>712,294=>974,295=>790,296=>372,
-297=>343,298=>372,299=>343,300=>372,301=>343,302=>372,303=>343,304=>372,305=>343,306=>744,
-307=>686,308=>372,309=>343,310=>775,311=>665,312=>665,313=>637,314=>343,315=>637,316=>343,
-317=>637,318=>343,319=>637,320=>343,321=>660,322=>375,323=>837,324=>712,325=>837,326=>712,
-327=>837,328=>712,329=>983,330=>837,331=>712,332=>850,333=>687,334=>850,335=>687,336=>850,
-337=>687,340=>770,341=>493,342=>770,343=>493,344=>770,345=>493,346=>720,347=>595,348=>720,
-349=>595,350=>720,351=>595,354=>682,355=>478,356=>682,357=>478,358=>682,359=>478,360=>812,
-361=>712,362=>812,363=>712,364=>812,365=>712,366=>812,367=>712,368=>812,369=>712,370=>812,
-371=>712,372=>1103,373=>924,374=>724,375=>652,377=>725,378=>582,379=>725,380=>582,383=>435,
-384=>716,385=>811,386=>762,387=>716,388=>762,389=>716,390=>734,391=>734,392=>593,393=>845,
-394=>879,395=>762,396=>716,397=>687,398=>683,399=>850,400=>696,401=>683,403=>821,404=>793,
-405=>1045,406=>436,407=>389,408=>775,409=>665,410=>360,411=>592,412=>1042,413=>837,414=>712,
-415=>850,416=>850,417=>687,418=>1114,419=>962,420=>782,421=>716,422=>770,423=>720,424=>595,
-425=>683,426=>552,427=>478,428=>707,429=>478,430=>682,431=>812,432=>712,433=>769,434=>813,
-435=>797,436=>778,437=>725,438=>582,439=>772,440=>772,441=>641,442=>582,443=>696,444=>772,
-445=>641,446=>573,447=>716,448=>372,449=>659,450=>544,451=>372,452=>1548,453=>1450,454=>1307,
-455=>977,456=>979,457=>670,458=>1193,459=>1213,460=>1063,461=>774,462=>675,463=>372,464=>343,
-465=>850,466=>687,467=>812,468=>712,469=>812,470=>712,471=>812,472=>712,473=>812,474=>712,
-475=>812,476=>712,477=>678,478=>774,479=>675,480=>774,481=>675,482=>1085,483=>1048,484=>821,
-485=>716,486=>821,487=>716,488=>775,489=>665,490=>850,491=>687,492=>850,493=>687,494=>772,
-495=>582,496=>343,497=>1548,498=>1450,499=>1307,500=>821,501=>716,502=>1289,503=>787,504=>837,
-505=>712,506=>774,507=>675,508=>1085,509=>1048,510=>850,511=>687,512=>774,513=>675,514=>774,
-515=>675,516=>683,517=>678,518=>683,519=>678,520=>372,521=>343,522=>372,523=>343,524=>850,
-525=>687,526=>850,527=>687,528=>770,529=>493,530=>770,531=>493,532=>812,533=>712,534=>812,
-535=>712,536=>720,537=>595,538=>682,539=>478,540=>690,541=>607,542=>837,543=>712,544=>837,
-545=>865,546=>809,547=>659,548=>725,549=>582,550=>774,551=>675,552=>683,553=>678,554=>850,
-555=>687,556=>850,557=>687,558=>850,559=>687,560=>850,561=>687,562=>724,563=>652,564=>492,
-565=>867,566=>512,567=>343,568=>1088,569=>1088,570=>774,571=>734,572=>593,573=>637,574=>682,
-575=>595,576=>582,577=>782,578=>614,579=>762,580=>812,581=>774,582=>683,583=>678,584=>372,
-585=>343,586=>860,587=>791,588=>770,589=>493,590=>724,591=>652,592=>675,593=>716,594=>716,
-595=>716,596=>593,597=>593,598=>791,599=>792,600=>678,601=>678,602=>876,603=>557,604=>545,
-605=>774,606=>731,607=>343,608=>792,609=>716,610=>627,611=>735,612=>635,613=>712,614=>712,
-615=>712,616=>545,617=>440,618=>545,619=>559,620=>693,621=>343,622=>841,623=>1042,624=>1042,
-625=>1042,626=>712,627=>793,628=>642,629=>687,630=>909,631=>682,632=>796,633=>538,634=>538,
-635=>650,636=>493,637=>493,638=>596,639=>596,640=>642,641=>642,642=>595,643=>415,644=>435,
-645=>605,646=>552,647=>478,648=>478,649=>920,650=>769,651=>670,652=>652,653=>924,654=>652,
-655=>724,656=>694,657=>684,658=>641,659=>641,660=>573,661=>573,662=>573,663=>573,664=>850,
-665=>633,666=>731,667=>685,668=>691,669=>343,670=>732,671=>539,672=>792,673=>573,674=>573,
-675=>1156,676=>1214,677=>1155,678=>974,679=>769,680=>929,681=>1026,682=>792,683=>780,684=>591,
-685=>415,686=>677,687=>789,688=>456,689=>456,690=>219,691=>315,692=>315,693=>315,694=>411,
-695=>591,696=>417,697=>302,698=>521,699=>380,700=>380,701=>380,702=>366,703=>366,704=>326,
-705=>326,706=>500,707=>500,708=>500,709=>500,711=>500,712=>306,713=>500,714=>500,715=>500,
-716=>306,717=>500,718=>500,719=>500,720=>337,721=>337,722=>366,723=>366,724=>500,725=>500,
-726=>416,727=>328,728=>500,729=>500,730=>500,731=>500,733=>500,734=>351,735=>500,736=>412,
-737=>219,738=>381,739=>413,740=>326,741=>500,742=>500,743=>500,744=>500,745=>500,748=>500,
-749=>500,750=>644,755=>500,759=>500,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>698,881=>565,882=>1022,
-883=>836,884=>302,885=>302,886=>837,887=>701,890=>500,891=>593,892=>550,893=>549,894=>400,
-900=>441,901=>500,902=>797,903=>380,904=>846,905=>1009,906=>563,908=>891,910=>980,911=>894,
-912=>390,913=>774,914=>762,915=>637,916=>774,917=>683,918=>725,919=>837,920=>850,921=>372,
-922=>775,923=>774,924=>995,925=>837,926=>632,927=>850,928=>837,929=>733,931=>683,932=>682,
-933=>724,934=>850,935=>771,936=>850,937=>850,938=>372,939=>724,940=>687,941=>557,942=>712,
-943=>390,944=>675,945=>687,946=>716,947=>681,948=>687,949=>557,950=>591,951=>712,952=>687,
-953=>390,954=>710,955=>633,956=>736,957=>681,958=>591,959=>687,960=>791,961=>716,962=>593,
-963=>779,964=>638,965=>675,966=>782,967=>645,968=>794,969=>869,970=>390,971=>675,972=>687,
-973=>675,974=>869,975=>775,976=>651,977=>661,978=>746,979=>981,980=>746,981=>796,982=>869,
-983=>744,984=>850,985=>687,986=>734,987=>593,988=>683,989=>494,990=>702,991=>660,992=>919,
-993=>627,994=>1093,995=>837,996=>832,997=>716,998=>928,999=>744,1000=>733,1001=>650,1002=>789,
-1003=>671,1004=>752,1005=>716,1006=>682,1007=>590,1008=>744,1009=>716,1010=>593,1011=>343,1012=>850,
-1013=>645,1014=>645,1015=>742,1016=>716,1017=>734,1018=>995,1019=>732,1020=>716,1021=>734,1022=>734,
-1023=>698,1024=>683,1025=>683,1026=>878,1027=>637,1028=>734,1029=>720,1030=>372,1031=>372,1032=>372,
-1033=>1154,1034=>1130,1035=>878,1036=>817,1037=>837,1038=>771,1039=>837,1040=>774,1041=>762,1042=>762,
-1043=>637,1044=>891,1045=>683,1046=>1224,1047=>710,1048=>837,1049=>837,1050=>817,1051=>831,1052=>995,
-1053=>837,1054=>850,1055=>837,1056=>733,1057=>734,1058=>682,1059=>771,1060=>992,1061=>771,1062=>928,
-1063=>808,1064=>1235,1065=>1326,1066=>939,1067=>1036,1068=>762,1069=>734,1070=>1174,1071=>770,1072=>675,
-1073=>698,1074=>633,1075=>522,1076=>808,1077=>678,1078=>995,1079=>581,1080=>701,1081=>701,1082=>679,
-1083=>732,1084=>817,1085=>691,1086=>687,1087=>691,1088=>716,1089=>593,1090=>580,1091=>652,1092=>992,
-1093=>645,1094=>741,1095=>687,1096=>1062,1097=>1105,1098=>751,1099=>904,1100=>632,1101=>593,1102=>972,
-1103=>642,1104=>678,1105=>678,1106=>714,1107=>522,1108=>593,1109=>595,1110=>343,1111=>343,1112=>343,
-1113=>991,1114=>956,1115=>734,1116=>679,1117=>701,1118=>652,1119=>691,1120=>1093,1121=>869,1122=>840,
-1123=>736,1124=>1012,1125=>839,1126=>992,1127=>832,1128=>1358,1129=>1121,1130=>850,1131=>687,1132=>1236,
-1133=>1007,1134=>696,1135=>557,1136=>1075,1137=>1061,1138=>850,1139=>687,1140=>850,1141=>695,1142=>850,
-1143=>695,1144=>1148,1145=>1043,1146=>1074,1147=>863,1148=>1405,1149=>1173,1150=>1093,1151=>869,1152=>734,
-1153=>593,1154=>652,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>938,
-1163=>806,1164=>762,1165=>611,1166=>736,1167=>718,1168=>637,1169=>522,1170=>666,1171=>543,1172=>789,
-1173=>522,1174=>1224,1175=>995,1176=>710,1177=>581,1178=>775,1179=>679,1180=>817,1181=>679,1182=>817,
-1183=>679,1184=>1015,1185=>826,1186=>837,1187=>691,1188=>1103,1189=>871,1190=>1254,1191=>979,1192=>946,
-1193=>859,1194=>734,1195=>593,1196=>682,1197=>580,1198=>724,1199=>652,1200=>724,1201=>652,1202=>771,
-1203=>645,1204=>1104,1205=>1001,1206=>808,1207=>687,1208=>808,1209=>687,1210=>808,1211=>712,1212=>1026,
-1213=>810,1214=>1026,1215=>810,1216=>372,1217=>1224,1218=>995,1219=>778,1220=>629,1221=>933,1222=>804,
-1223=>837,1224=>691,1225=>938,1226=>806,1227=>808,1228=>687,1229=>1096,1230=>932,1231=>343,1232=>774,
-1233=>675,1234=>774,1235=>675,1236=>1085,1237=>1048,1238=>683,1239=>678,1240=>850,1241=>678,1242=>850,
-1243=>678,1244=>1224,1245=>995,1246=>710,1247=>581,1248=>772,1249=>641,1250=>837,1251=>701,1252=>837,
-1253=>701,1254=>850,1255=>687,1256=>850,1257=>687,1258=>850,1259=>687,1260=>734,1261=>593,1262=>771,
-1263=>652,1264=>771,1265=>652,1266=>771,1267=>652,1268=>808,1269=>687,1270=>637,1271=>522,1272=>1036,
-1273=>904,1274=>666,1275=>543,1276=>771,1277=>645,1278=>771,1279=>645,1280=>762,1281=>608,1282=>1159,
-1283=>893,1284=>1119,1285=>920,1286=>828,1287=>693,1288=>1242,1289=>1017,1290=>1289,1291=>1013,1292=>839,
-1293=>638,1294=>938,1295=>803,1296=>696,1297=>557,1298=>831,1299=>732,1300=>1286,1301=>1070,1302=>1065,
-1303=>982,1304=>1082,1305=>960,1306=>850,1307=>716,1308=>1103,1309=>924,1312=>1248,1313=>1022,1314=>1254,
-1315=>979,1316=>957,1317=>807,1329=>984,1330=>812,1331=>984,1332=>984,1333=>812,1334=>777,1335=>812,
-1336=>812,1337=>975,1338=>984,1339=>812,1340=>710,1341=>1078,1342=>1136,1343=>812,1344=>710,1345=>757,
-1346=>984,1347=>876,1348=>984,1349=>793,1350=>984,1351=>812,1352=>812,1353=>812,1354=>958,1355=>777,
-1356=>984,1357=>812,1358=>984,1359=>720,1360=>812,1361=>793,1362=>895,1363=>850,1364=>936,1365=>850,
-1366=>720,1369=>366,1370=>380,1371=>550,1372=>550,1373=>380,1374=>546,1375=>521,1377=>1042,1378=>712,
-1379=>866,1380=>868,1381=>712,1382=>817,1383=>653,1384=>712,1385=>811,1386=>817,1387=>712,1388=>498,
-1389=>1018,1390=>716,1391=>712,1392=>712,1393=>716,1394=>819,1395=>712,1396=>751,1397=>343,1398=>882,
-1399=>559,1400=>712,1401=>559,1402=>1042,1403=>559,1404=>863,1405=>712,1406=>813,1407=>1042,1408=>712,
-1409=>716,1410=>571,1411=>1042,1412=>778,1413=>687,1414=>720,1415=>862,1417=>400,1418=>487,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>415,1471=>0,1472=>372,1473=>0,1474=>0,1475=>372,1478=>497,
-1479=>0,1488=>751,1489=>673,1490=>537,1491=>654,1492=>712,1493=>343,1494=>491,1495=>712,1496=>724,
-1497=>343,1498=>649,1499=>650,1500=>679,1501=>712,1502=>775,1503=>343,1504=>497,1505=>773,1506=>678,
-1507=>718,1508=>687,1509=>628,1510=>751,1511=>729,1512=>649,1513=>949,1514=>751,1520=>664,1521=>664,
-1522=>663,1523=>444,1524=>710,3647=>743,3713=>815,3714=>748,3716=>749,3719=>569,3720=>742,3722=>744,
-3725=>761,3732=>706,3733=>704,3734=>747,3735=>819,3737=>730,3738=>727,3739=>727,3740=>922,3741=>827,
-3742=>866,3743=>866,3745=>836,3746=>761,3747=>770,3749=>769,3751=>713,3754=>827,3755=>1031,3757=>724,
-3758=>784,3759=>934,3760=>688,3761=>0,3762=>610,3763=>610,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>670,3776=>516,3777=>860,3778=>516,3779=>650,3780=>632,
-3782=>759,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>771,3793=>771,3794=>693,
-3795=>836,3796=>729,3797=>729,3798=>849,3799=>790,3800=>759,3801=>910,3804=>1363,3805=>1363,4256=>918,
-4257=>744,4258=>739,4259=>837,4260=>649,4261=>773,4262=>857,4263=>889,4264=>530,4265=>633,4266=>857,
-4267=>900,4268=>643,4269=>903,4270=>814,4271=>752,4272=>869,4273=>643,4274=>643,4275=>886,4276=>886,
-4277=>733,4278=>653,4279=>643,4280=>646,4281=>643,4282=>790,4283=>902,4284=>633,4285=>619,4286=>643,
-4287=>778,4288=>892,4289=>601,4290=>742,4291=>616,4292=>633,4293=>742,4304=>553,4305=>552,4306=>596,
-4307=>815,4308=>562,4309=>563,4310=>553,4311=>827,4312=>553,4313=>543,4314=>1074,4315=>563,4316=>563,
-4317=>812,4318=>552,4319=>591,4320=>822,4321=>563,4322=>690,4323=>583,4324=>813,4325=>562,4326=>813,
-4327=>563,4328=>563,4329=>563,4330=>632,4331=>563,4332=>563,4333=>552,4334=>563,4335=>563,4336=>558,
-4337=>604,4338=>552,4339=>552,4340=>553,4341=>605,4342=>852,4343=>635,4344=>563,4345=>596,4346=>542,
-4347=>684,4348=>368,5121=>774,5122=>774,5123=>774,5124=>774,5125=>905,5126=>905,5127=>905,5129=>905,
-5130=>905,5131=>905,5132=>1018,5133=>1009,5134=>1018,5135=>1009,5136=>1018,5137=>1009,5138=>1149,5139=>1140,
-5140=>1149,5141=>1140,5142=>905,5143=>1149,5144=>1142,5145=>1149,5146=>1142,5147=>905,5149=>310,5150=>529,
-5151=>425,5152=>425,5153=>395,5154=>395,5155=>395,5156=>395,5157=>564,5158=>470,5159=>310,5160=>395,
-5161=>395,5162=>395,5163=>1213,5164=>986,5165=>1216,5166=>1297,5167=>774,5168=>774,5169=>774,5170=>774,
-5171=>886,5172=>886,5173=>886,5175=>886,5176=>886,5177=>886,5178=>1018,5179=>1009,5180=>1018,5181=>1009,
-5182=>1018,5183=>1009,5184=>1149,5185=>1140,5186=>1149,5187=>1140,5188=>1149,5189=>1142,5190=>1149,5191=>1142,
-5192=>886,5193=>576,5194=>229,5196=>812,5197=>812,5198=>812,5199=>812,5200=>815,5201=>815,5202=>815,
-5204=>815,5205=>815,5206=>815,5207=>1056,5208=>1048,5209=>1056,5210=>1048,5211=>1056,5212=>1048,5213=>1060,
-5214=>1054,5215=>1060,5216=>1054,5217=>1060,5218=>1052,5219=>1060,5220=>1052,5221=>1060,5222=>483,5223=>1005,
-5224=>1005,5225=>1023,5226=>1017,5227=>743,5228=>743,5229=>743,5230=>743,5231=>743,5232=>743,5233=>743,
-5234=>743,5235=>743,5236=>1029,5237=>975,5238=>980,5239=>975,5240=>980,5241=>975,5242=>1029,5243=>975,
-5244=>1029,5245=>975,5246=>980,5247=>975,5248=>980,5249=>975,5250=>980,5251=>501,5252=>501,5253=>938,
-5254=>938,5255=>938,5256=>938,5257=>743,5258=>743,5259=>743,5260=>743,5261=>743,5262=>743,5263=>743,
-5264=>743,5265=>743,5266=>1029,5267=>975,5268=>1029,5269=>975,5270=>1029,5271=>975,5272=>1029,5273=>975,
-5274=>1029,5275=>975,5276=>1029,5277=>975,5278=>1029,5279=>975,5280=>1029,5281=>501,5282=>501,5283=>626,
-5284=>626,5285=>626,5286=>626,5287=>626,5288=>626,5289=>626,5290=>626,5291=>626,5292=>881,5293=>854,
-5294=>863,5295=>874,5296=>863,5297=>874,5298=>881,5299=>874,5300=>881,5301=>874,5302=>863,5303=>874,
-5304=>863,5305=>874,5306=>863,5307=>436,5308=>548,5309=>436,5312=>988,5313=>988,5314=>988,5315=>988,
-5316=>931,5317=>931,5318=>931,5319=>931,5320=>931,5321=>1238,5322=>1247,5323=>1200,5324=>1228,5325=>1200,
-5326=>1228,5327=>931,5328=>660,5329=>497,5330=>660,5331=>988,5332=>988,5333=>988,5334=>988,5335=>931,
-5336=>931,5337=>931,5338=>931,5339=>931,5340=>1231,5341=>1247,5342=>1283,5343=>1228,5344=>1283,5345=>1228,
-5346=>1228,5347=>1214,5348=>1228,5349=>1214,5350=>1283,5351=>1228,5352=>1283,5353=>1228,5354=>660,5356=>886,
-5357=>730,5358=>730,5359=>730,5360=>730,5361=>730,5362=>730,5363=>730,5364=>730,5365=>730,5366=>998,
-5367=>958,5368=>967,5369=>989,5370=>967,5371=>989,5372=>998,5373=>958,5374=>998,5375=>958,5376=>967,
-5377=>989,5378=>967,5379=>989,5380=>967,5381=>493,5382=>460,5383=>493,5392=>923,5393=>923,5394=>923,
-5395=>1136,5396=>1136,5397=>1136,5398=>1136,5399=>1209,5400=>1202,5401=>1209,5402=>1202,5403=>1209,5404=>1202,
-5405=>1431,5406=>1420,5407=>1431,5408=>1420,5409=>1431,5410=>1420,5411=>1431,5412=>1420,5413=>746,5414=>776,
-5415=>776,5416=>776,5417=>776,5418=>776,5419=>776,5420=>776,5421=>776,5422=>776,5423=>1003,5424=>1003,
-5425=>1013,5426=>996,5427=>1013,5428=>996,5429=>1003,5430=>1003,5431=>1003,5432=>1003,5433=>1013,5434=>996,
-5435=>1013,5436=>996,5437=>1013,5438=>495,5440=>395,5441=>510,5442=>1033,5443=>1033,5444=>976,5445=>976,
-5446=>976,5447=>976,5448=>733,5449=>733,5450=>733,5451=>733,5452=>733,5453=>733,5454=>1003,5455=>959,
-5456=>495,5458=>886,5459=>774,5460=>774,5461=>774,5462=>774,5463=>928,5464=>928,5465=>928,5466=>928,
-5467=>1172,5468=>1142,5469=>602,5470=>812,5471=>812,5472=>812,5473=>812,5474=>812,5475=>812,5476=>815,
-5477=>815,5478=>815,5479=>815,5480=>1060,5481=>1052,5482=>548,5492=>977,5493=>977,5494=>977,5495=>977,
-5496=>977,5497=>977,5498=>977,5499=>618,5500=>837,5501=>510,5502=>1238,5503=>1238,5504=>1238,5505=>1238,
-5506=>1238,5507=>1238,5508=>1238,5509=>989,5514=>977,5515=>977,5516=>977,5517=>977,5518=>1591,5519=>1591,
-5520=>1591,5521=>1295,5522=>1295,5523=>1591,5524=>1591,5525=>848,5526=>1273,5536=>988,5537=>988,5538=>931,
-5539=>931,5540=>931,5541=>931,5542=>660,5543=>776,5544=>776,5545=>776,5546=>776,5547=>776,5548=>776,
-5549=>776,5550=>495,5551=>743,5598=>830,5601=>830,5702=>496,5703=>496,5742=>413,5743=>1238,5744=>1591,
-5745=>2016,5746=>2016,5747=>1720,5748=>1678,5749=>2016,5750=>2016,7424=>652,7425=>833,7426=>1048,7427=>608,
-7428=>593,7429=>676,7430=>676,7431=>559,7432=>557,7433=>343,7434=>494,7435=>665,7436=>539,7437=>817,
-7438=>701,7439=>687,7440=>593,7441=>660,7442=>660,7443=>660,7444=>1094,7446=>687,7447=>687,7448=>556,
-7449=>642,7450=>642,7451=>580,7452=>634,7453=>737,7454=>948,7455=>695,7456=>652,7457=>924,7458=>582,
-7459=>646,7462=>539,7463=>652,7464=>691,7465=>556,7466=>781,7467=>732,7468=>487,7469=>683,7470=>480,
-7472=>523,7473=>430,7474=>430,7475=>517,7476=>527,7477=>234,7478=>234,7479=>488,7480=>401,7481=>626,
-7482=>527,7483=>527,7484=>535,7485=>509,7486=>461,7487=>485,7488=>430,7489=>511,7490=>695,7491=>458,
-7492=>458,7493=>479,7494=>712,7495=>479,7496=>479,7497=>479,7498=>479,7499=>386,7500=>386,7501=>479,
-7502=>219,7503=>487,7504=>664,7505=>456,7506=>488,7507=>414,7508=>488,7509=>488,7510=>479,7511=>388,
-7512=>456,7513=>462,7514=>664,7515=>501,7517=>451,7518=>429,7519=>433,7520=>493,7521=>406,7522=>219,
-7523=>315,7524=>456,7525=>501,7526=>451,7527=>429,7528=>451,7529=>493,7530=>406,7543=>716,7544=>527,
-7547=>545,7557=>514,7579=>479,7580=>414,7581=>414,7582=>488,7583=>386,7584=>377,7585=>348,7586=>479,
-7587=>456,7588=>347,7589=>281,7590=>347,7591=>347,7592=>431,7593=>326,7594=>330,7595=>370,7596=>664,
-7597=>664,7598=>562,7599=>562,7600=>448,7601=>488,7602=>542,7603=>422,7604=>396,7605=>388,7606=>583,
-7607=>494,7608=>399,7609=>451,7610=>501,7611=>417,7612=>523,7613=>470,7614=>455,7615=>425,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>774,7681=>675,7682=>762,7683=>716,7684=>762,
-7685=>716,7686=>762,7687=>716,7688=>734,7689=>593,7690=>830,7691=>716,7692=>830,7693=>716,7694=>830,
-7695=>716,7696=>830,7697=>716,7698=>830,7699=>716,7700=>683,7701=>678,7702=>683,7703=>678,7704=>683,
-7705=>678,7706=>683,7707=>678,7708=>683,7709=>678,7710=>683,7711=>435,7712=>821,7713=>716,7714=>837,
-7715=>712,7716=>837,7717=>712,7718=>837,7719=>712,7720=>837,7721=>712,7722=>837,7723=>712,7724=>372,
-7725=>343,7726=>372,7727=>343,7728=>775,7729=>665,7730=>775,7731=>665,7732=>775,7733=>665,7734=>637,
-7735=>343,7736=>637,7737=>343,7738=>637,7739=>343,7740=>637,7741=>343,7742=>995,7743=>1042,7744=>995,
-7745=>1042,7746=>995,7747=>1042,7748=>837,7749=>712,7750=>837,7751=>712,7752=>837,7753=>712,7754=>837,
-7755=>712,7756=>850,7757=>687,7758=>850,7759=>687,7760=>850,7761=>687,7762=>850,7763=>687,7764=>733,
-7765=>716,7766=>733,7767=>716,7768=>770,7769=>493,7770=>770,7771=>493,7772=>770,7773=>493,7774=>770,
-7775=>493,7776=>720,7777=>595,7778=>720,7779=>595,7780=>720,7781=>595,7782=>720,7783=>595,7784=>720,
-7785=>595,7786=>682,7787=>478,7788=>682,7789=>478,7790=>682,7791=>478,7792=>682,7793=>478,7794=>812,
-7795=>712,7796=>812,7797=>712,7798=>812,7799=>712,7800=>812,7801=>712,7802=>812,7803=>712,7804=>774,
-7805=>652,7806=>774,7807=>652,7808=>1103,7809=>924,7810=>1103,7811=>924,7812=>1103,7813=>924,7814=>1103,
-7815=>924,7816=>1103,7817=>924,7818=>771,7819=>645,7820=>771,7821=>645,7822=>724,7823=>652,7824=>725,
-7825=>582,7826=>725,7827=>582,7828=>725,7829=>582,7830=>712,7831=>478,7832=>924,7833=>652,7834=>675,
-7835=>435,7838=>896,7839=>687,7840=>774,7841=>675,7842=>774,7843=>675,7844=>774,7845=>675,7846=>774,
-7847=>675,7848=>774,7849=>675,7850=>774,7851=>675,7852=>774,7853=>675,7854=>774,7855=>675,7856=>774,
-7857=>675,7858=>774,7859=>675,7860=>774,7861=>675,7862=>774,7863=>675,7864=>683,7865=>678,7866=>683,
-7867=>678,7868=>683,7869=>678,7870=>683,7871=>678,7872=>683,7873=>678,7874=>683,7875=>678,7876=>683,
-7877=>678,7878=>683,7879=>678,7880=>372,7881=>343,7882=>372,7883=>343,7884=>850,7885=>687,7886=>850,
-7887=>687,7888=>850,7889=>687,7890=>850,7891=>687,7892=>850,7893=>687,7894=>850,7895=>687,7896=>850,
-7897=>687,7898=>850,7899=>687,7900=>850,7901=>687,7902=>850,7903=>687,7904=>850,7905=>687,7906=>850,
-7907=>687,7908=>812,7909=>712,7910=>812,7911=>712,7912=>812,7913=>712,7914=>812,7915=>712,7916=>812,
-7917=>712,7918=>812,7919=>712,7920=>812,7921=>712,7922=>724,7923=>652,7924=>724,7925=>652,7926=>724,
-7927=>652,7928=>724,7929=>652,7936=>687,7937=>687,7938=>687,7939=>687,7940=>687,7941=>687,7942=>687,
-7943=>687,7944=>774,7945=>774,7946=>1041,7947=>1043,7948=>935,7949=>963,7950=>835,7951=>859,7952=>557,
-7953=>557,7954=>557,7955=>557,7956=>557,7957=>557,7960=>792,7961=>794,7962=>1100,7963=>1096,7964=>1023,
-7965=>1052,7968=>712,7969=>712,7970=>712,7971=>712,7972=>712,7973=>712,7974=>712,7975=>712,7976=>945,
-7977=>951,7978=>1250,7979=>1250,7980=>1180,7981=>1206,7982=>1054,7983=>1063,7984=>390,7985=>390,7986=>390,
-7987=>390,7988=>390,7989=>390,7990=>390,7991=>390,7992=>483,7993=>489,7994=>777,7995=>785,7996=>712,
-7997=>738,7998=>604,7999=>604,8000=>687,8001=>687,8002=>687,8003=>687,8004=>687,8005=>687,8008=>892,
-8009=>933,8010=>1221,8011=>1224,8012=>1053,8013=>1082,8016=>675,8017=>675,8018=>675,8019=>675,8020=>675,
-8021=>675,8022=>675,8023=>675,8025=>930,8027=>1184,8029=>1199,8031=>1049,8032=>869,8033=>869,8034=>869,
-8035=>869,8036=>869,8037=>869,8038=>869,8039=>869,8040=>909,8041=>958,8042=>1246,8043=>1251,8044=>1076,
-8045=>1105,8046=>1028,8047=>1076,8048=>687,8049=>687,8050=>557,8051=>557,8052=>712,8053=>712,8054=>390,
-8055=>390,8056=>687,8057=>687,8058=>675,8059=>675,8060=>869,8061=>869,8064=>687,8065=>687,8066=>687,
-8067=>687,8068=>687,8069=>687,8070=>687,8071=>687,8072=>774,8073=>774,8074=>1041,8075=>1043,8076=>935,
-8077=>963,8078=>835,8079=>859,8080=>712,8081=>712,8082=>712,8083=>712,8084=>712,8085=>712,8086=>712,
-8087=>712,8088=>945,8089=>951,8090=>1250,8091=>1250,8092=>1180,8093=>1206,8094=>1054,8095=>1063,8096=>869,
-8097=>869,8098=>869,8099=>869,8100=>869,8101=>869,8102=>869,8103=>869,8104=>909,8105=>958,8106=>1246,
-8107=>1251,8108=>1076,8109=>1105,8110=>1028,8111=>1076,8112=>687,8113=>687,8114=>687,8115=>687,8116=>687,
-8118=>687,8119=>687,8120=>774,8121=>774,8122=>876,8123=>797,8124=>774,8125=>500,8126=>500,8127=>500,
-8128=>500,8129=>500,8130=>712,8131=>712,8132=>712,8134=>712,8135=>712,8136=>929,8137=>846,8138=>1080,
-8139=>1009,8140=>837,8141=>500,8142=>500,8143=>500,8144=>390,8145=>390,8146=>390,8147=>390,8150=>390,
-8151=>390,8152=>372,8153=>372,8154=>621,8155=>563,8157=>500,8158=>500,8159=>500,8160=>675,8161=>675,
-8162=>675,8163=>675,8164=>716,8165=>716,8166=>675,8167=>675,8168=>724,8169=>724,8170=>1020,8171=>980,
-8172=>838,8173=>500,8174=>500,8175=>500,8178=>869,8179=>869,8180=>869,8182=>869,8183=>869,8184=>1065,
-8185=>891,8186=>1084,8187=>894,8188=>850,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,
-8196=>330,8197=>250,8198=>167,8199=>696,8200=>380,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,
-8206=>0,8207=>0,8208=>415,8209=>415,8210=>696,8213=>1000,8214=>500,8215=>500,8219=>380,8223=>657,
-8227=>639,8228=>380,8229=>685,8231=>348,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,
-8241=>1908,8242=>264,8243=>447,8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,8251=>972,8252=>627,
-8253=>580,8254=>500,8255=>828,8256=>828,8257=>329,8258=>1023,8259=>500,8260=>167,8261=>457,8262=>457,
-8263=>1030,8264=>829,8265=>829,8266=>513,8267=>687,8268=>500,8269=>500,8270=>523,8271=>400,8272=>828,
-8273=>523,8274=>556,8275=>838,8276=>828,8277=>838,8278=>684,8279=>813,8280=>838,8281=>838,8282=>380,
-8283=>872,8284=>838,8285=>380,8286=>380,8287=>222,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>438,8305=>219,8308=>438,8309=>438,
-8310=>438,8311=>438,8312=>438,8313=>438,8314=>528,8315=>528,8316=>528,8317=>288,8318=>288,8319=>456,
-8320=>438,8321=>438,8322=>438,8323=>438,8324=>438,8325=>438,8326=>438,8327=>438,8328=>438,8329=>438,
-8330=>528,8331=>528,8332=>528,8333=>288,8334=>288,8336=>458,8337=>479,8338=>488,8339=>413,8340=>479,
-8352=>929,8353=>696,8354=>696,8355=>696,8356=>696,8357=>1042,8358=>837,8359=>1488,8360=>1205,8361=>1103,
-8362=>854,8363=>714,8365=>696,8366=>682,8367=>1392,8368=>696,8369=>696,8370=>696,8371=>696,8372=>859,
-8373=>696,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1106,8449=>1106,
-8450=>734,8451=>1211,8452=>896,8453=>1114,8454=>1148,8455=>696,8456=>698,8457=>952,8459=>1073,8460=>913,
-8461=>888,8462=>712,8463=>712,8464=>597,8465=>697,8466=>856,8467=>472,8468=>974,8469=>837,8470=>1203,
-8471=>1000,8472=>697,8473=>750,8474=>850,8475=>938,8476=>814,8477=>801,8478=>896,8479=>710,8480=>1020,
-8481=>1239,8483=>834,8484=>754,8485=>622,8486=>850,8487=>769,8488=>763,8489=>303,8490=>775,8491=>774,
-8492=>928,8493=>818,8494=>854,8495=>636,8496=>729,8497=>808,8498=>683,8499=>1184,8500=>465,8501=>794,
-8502=>731,8503=>494,8504=>684,8505=>380,8506=>945,8507=>1370,8508=>790,8509=>737,8510=>654,8511=>863,
-8512=>840,8513=>786,8514=>576,8515=>637,8516=>760,8517=>830,8518=>716,8519=>678,8520=>343,8521=>343,
-8523=>872,8526=>547,8531=>1035,8532=>1035,8533=>1035,8534=>1035,8535=>1035,8536=>1035,8537=>1035,8538=>1035,
-8539=>1035,8540=>1035,8541=>1035,8542=>1035,8543=>615,8544=>372,8545=>659,8546=>945,8547=>1099,8548=>774,
-8549=>1099,8550=>1386,8551=>1672,8552=>1121,8553=>771,8554=>1120,8555=>1407,8556=>637,8557=>734,8558=>830,
-8559=>995,8560=>343,8561=>607,8562=>872,8563=>984,8564=>652,8565=>962,8566=>1227,8567=>1491,8568=>969,
-8569=>645,8570=>969,8571=>1233,8572=>343,8573=>593,8574=>716,8575=>1042,8576=>1289,8577=>830,8578=>1289,
-8579=>734,8580=>593,8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,8598=>838,8599=>838,
-8600=>838,8601=>838,8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,8608=>838,8609=>838,
-8610=>838,8611=>838,8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,8618=>838,8619=>838,
-8620=>838,8621=>838,8622=>838,8623=>838,8624=>838,8625=>838,8626=>838,8627=>838,8628=>838,8629=>838,
-8630=>838,8631=>838,8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,8638=>838,8639=>838,
-8640=>838,8641=>838,8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,8648=>838,8649=>838,
-8650=>838,8651=>838,8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,8658=>838,8659=>838,
-8660=>838,8661=>838,8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,8668=>838,8669=>838,
-8670=>838,8671=>838,8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,8678=>838,8679=>838,
-8680=>838,8681=>838,8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,8688=>838,8689=>838,
-8690=>838,8691=>838,8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,8698=>838,8699=>838,
-8700=>838,8701=>838,8702=>838,8703=>838,8704=>774,8705=>696,8706=>544,8707=>683,8708=>683,8709=>856,
-8710=>697,8711=>697,8712=>896,8713=>896,8714=>750,8715=>896,8716=>896,8717=>750,8718=>636,8719=>787,
-8720=>787,8721=>718,8722=>838,8723=>838,8724=>696,8725=>365,8726=>696,8727=>838,8728=>626,8729=>380,
-8730=>667,8731=>667,8732=>667,8733=>712,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,
-8740=>500,8741=>500,8742=>500,8743=>812,8744=>812,8745=>812,8746=>812,8747=>610,8748=>929,8749=>1295,
-8750=>563,8751=>977,8752=>1313,8753=>563,8754=>563,8755=>563,8756=>696,8757=>696,8758=>294,8759=>696,
-8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,
-8770=>838,8771=>838,8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,
-8780=>838,8781=>838,8782=>838,8783=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1063,8789=>1063,
-8790=>838,8791=>838,8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,
-8800=>838,8801=>838,8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>841,8809=>841,
-8810=>1047,8811=>1047,8812=>500,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,
-8820=>838,8821=>838,8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,
-8830=>838,8831=>838,8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,
-8840=>838,8841=>838,8842=>838,8843=>838,8844=>812,8845=>812,8846=>812,8847=>838,8848=>838,8849=>838,
-8850=>838,8851=>796,8852=>796,8853=>838,8854=>838,8855=>838,8856=>838,8857=>838,8858=>838,8859=>838,
-8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,8865=>838,8866=>914,8867=>914,8868=>914,8869=>914,
-8870=>542,8871=>542,8872=>914,8873=>914,8874=>914,8875=>914,8876=>914,8877=>914,8878=>914,8879=>914,
-8880=>838,8881=>838,8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,
-8890=>542,8891=>812,8892=>812,8893=>812,8894=>838,8895=>838,8896=>843,8897=>843,8898=>843,8899=>843,
-8900=>494,8901=>380,8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,
-8910=>812,8911=>812,8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,
-8920=>1422,8921=>1422,8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,
-8930=>838,8931=>838,8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,
-8940=>838,8941=>838,8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1158,8947=>896,8948=>750,8949=>896,
-8950=>896,8951=>750,8952=>896,8953=>896,8954=>1158,8955=>896,8956=>750,8957=>896,8958=>750,8959=>896,
-8960=>602,8961=>602,8962=>716,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>457,8969=>457,
-8970=>457,8971=>457,8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>539,8984=>928,8985=>838,
-8988=>469,8989=>469,8990=>469,8991=>469,8992=>610,8993=>610,8996=>1152,8997=>1152,8998=>1414,8999=>1152,
-9000=>1443,9003=>1414,9004=>873,9075=>390,9076=>716,9077=>869,9082=>687,9085=>863,9095=>1152,9108=>873,
-9115=>500,9116=>500,9117=>500,9118=>500,9119=>500,9120=>500,9121=>500,9122=>500,9123=>500,9124=>500,
-9125=>500,9126=>500,9127=>750,9128=>750,9129=>750,9130=>750,9131=>750,9132=>750,9133=>750,9134=>610,
-9166=>838,9167=>945,9187=>873,9189=>769,9250=>716,9251=>716,9312=>847,9313=>847,9314=>847,9315=>847,
-9316=>847,9317=>847,9318=>847,9319=>847,9320=>847,9321=>847,9600=>769,9601=>769,9602=>769,9603=>769,
-9604=>769,9605=>769,9606=>769,9607=>769,9608=>769,9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,
-9614=>769,9615=>769,9616=>769,9617=>769,9618=>769,9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,
-9624=>769,9625=>769,9626=>769,9627=>769,9628=>769,9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,
-9634=>945,9635=>945,9636=>945,9637=>945,9638=>945,9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,
-9644=>945,9645=>945,9646=>550,9647=>550,9648=>769,9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,
-9654=>769,9655=>769,9656=>502,9657=>502,9658=>769,9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,
-9664=>769,9665=>769,9666=>502,9667=>502,9668=>769,9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,
-9674=>494,9675=>873,9676=>873,9677=>873,9678=>873,9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,
-9684=>873,9685=>873,9686=>527,9687=>527,9688=>840,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,
-9694=>387,9695=>387,9696=>769,9697=>769,9698=>769,9699=>769,9700=>769,9701=>769,9702=>639,9703=>945,
-9704=>945,9705=>945,9706=>945,9707=>945,9708=>769,9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,
-9714=>945,9715=>945,9716=>873,9717=>873,9718=>873,9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,
-9724=>830,9725=>732,9726=>732,9727=>769,9728=>896,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,
-9734=>896,9735=>573,9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,
-9744=>896,9745=>896,9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,
-9754=>896,9755=>896,9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,
-9764=>669,9765=>746,9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,
-9774=>896,9775=>896,9776=>896,9777=>896,9778=>896,9779=>896,9780=>896,9781=>896,9782=>896,9783=>896,
-9784=>896,9785=>896,9786=>896,9787=>896,9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,
-9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,
-9804=>896,9805=>896,9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,
-9814=>896,9815=>896,9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,
-9824=>896,9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,
-9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,
-9844=>896,9845=>896,9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,
-9854=>896,9855=>896,9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>896,9863=>896,
-9864=>896,9865=>896,9866=>896,9867=>896,9868=>896,9869=>896,9870=>896,9871=>896,9872=>896,9873=>896,
-9874=>896,9875=>896,9876=>896,9877=>541,9878=>896,9879=>896,9880=>896,9881=>896,9882=>896,9883=>896,
-9884=>896,9888=>896,9889=>702,9890=>1003,9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,
-9897=>838,9898=>838,9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,
-9907=>732,9908=>732,9909=>732,9910=>850,9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,
-9990=>838,9991=>838,9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,
-10002=>838,10003=>838,10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,
-10012=>838,10013=>838,10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,
-10022=>838,10023=>838,10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,
-10033=>838,10034=>838,10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,
-10043=>838,10044=>838,10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,
-10053=>838,10054=>838,10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,
-10065=>896,10066=>896,10070=>896,10072=>838,10073=>838,10074=>838,10075=>322,10076=>322,10077=>538,10078=>538,
-10081=>838,10082=>838,10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,
-10091=>838,10092=>838,10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,
-10101=>838,10102=>847,10103=>847,10104=>847,10105=>847,10106=>847,10107=>847,10108=>847,10109=>847,10110=>847,
-10111=>847,10112=>838,10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,
-10121=>838,10122=>838,10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,
-10131=>838,10132=>838,10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,
-10144=>838,10145=>838,10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,
-10154=>838,10155=>838,10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,
-10165=>838,10166=>838,10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,
-10181=>457,10182=>457,10208=>494,10214=>487,10215=>487,10216=>457,10217=>457,10218=>721,10219=>721,10224=>838,
-10225=>838,10226=>838,10227=>838,10228=>1157,10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,
-10235=>1434,10236=>1434,10237=>1434,10238=>1434,10239=>1434,10240=>781,10241=>781,10242=>781,10243=>781,10244=>781,
-10245=>781,10246=>781,10247=>781,10248=>781,10249=>781,10250=>781,10251=>781,10252=>781,10253=>781,10254=>781,
-10255=>781,10256=>781,10257=>781,10258=>781,10259=>781,10260=>781,10261=>781,10262=>781,10263=>781,10264=>781,
-10265=>781,10266=>781,10267=>781,10268=>781,10269=>781,10270=>781,10271=>781,10272=>781,10273=>781,10274=>781,
-10275=>781,10276=>781,10277=>781,10278=>781,10279=>781,10280=>781,10281=>781,10282=>781,10283=>781,10284=>781,
-10285=>781,10286=>781,10287=>781,10288=>781,10289=>781,10290=>781,10291=>781,10292=>781,10293=>781,10294=>781,
-10295=>781,10296=>781,10297=>781,10298=>781,10299=>781,10300=>781,10301=>781,10302=>781,10303=>781,10304=>781,
-10305=>781,10306=>781,10307=>781,10308=>781,10309=>781,10310=>781,10311=>781,10312=>781,10313=>781,10314=>781,
-10315=>781,10316=>781,10317=>781,10318=>781,10319=>781,10320=>781,10321=>781,10322=>781,10323=>781,10324=>781,
-10325=>781,10326=>781,10327=>781,10328=>781,10329=>781,10330=>781,10331=>781,10332=>781,10333=>781,10334=>781,
-10335=>781,10336=>781,10337=>781,10338=>781,10339=>781,10340=>781,10341=>781,10342=>781,10343=>781,10344=>781,
-10345=>781,10346=>781,10347=>781,10348=>781,10349=>781,10350=>781,10351=>781,10352=>781,10353=>781,10354=>781,
-10355=>781,10356=>781,10357=>781,10358=>781,10359=>781,10360=>781,10361=>781,10362=>781,10363=>781,10364=>781,
-10365=>781,10366=>781,10367=>781,10368=>781,10369=>781,10370=>781,10371=>781,10372=>781,10373=>781,10374=>781,
-10375=>781,10376=>781,10377=>781,10378=>781,10379=>781,10380=>781,10381=>781,10382=>781,10383=>781,10384=>781,
-10385=>781,10386=>781,10387=>781,10388=>781,10389=>781,10390=>781,10391=>781,10392=>781,10393=>781,10394=>781,
-10395=>781,10396=>781,10397=>781,10398=>781,10399=>781,10400=>781,10401=>781,10402=>781,10403=>781,10404=>781,
-10405=>781,10406=>781,10407=>781,10408=>781,10409=>781,10410=>781,10411=>781,10412=>781,10413=>781,10414=>781,
-10415=>781,10416=>781,10417=>781,10418=>781,10419=>781,10420=>781,10421=>781,10422=>781,10423=>781,10424=>781,
-10425=>781,10426=>781,10427=>781,10428=>781,10429=>781,10430=>781,10431=>781,10432=>781,10433=>781,10434=>781,
-10435=>781,10436=>781,10437=>781,10438=>781,10439=>781,10440=>781,10441=>781,10442=>781,10443=>781,10444=>781,
-10445=>781,10446=>781,10447=>781,10448=>781,10449=>781,10450=>781,10451=>781,10452=>781,10453=>781,10454=>781,
-10455=>781,10456=>781,10457=>781,10458=>781,10459=>781,10460=>781,10461=>781,10462=>781,10463=>781,10464=>781,
-10465=>781,10466=>781,10467=>781,10468=>781,10469=>781,10470=>781,10471=>781,10472=>781,10473=>781,10474=>781,
-10475=>781,10476=>781,10477=>781,10478=>781,10479=>781,10480=>781,10481=>781,10482=>781,10483=>781,10484=>781,
-10485=>781,10486=>781,10487=>781,10488=>781,10489=>781,10490=>781,10491=>781,10492=>781,10493=>781,10494=>781,
-10495=>781,10502=>838,10503=>838,10506=>838,10507=>838,10560=>838,10561=>838,10627=>753,10628=>753,10702=>838,
-10703=>1046,10704=>1046,10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,
-10752=>1000,10753=>1000,10754=>1000,10764=>1661,10765=>563,10766=>563,10767=>563,10768=>563,10769=>563,10770=>563,
-10771=>563,10772=>563,10773=>563,10774=>563,10775=>563,10776=>563,10777=>563,10778=>563,10779=>563,10780=>563,
-10799=>838,10877=>838,10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,
-10886=>838,10887=>838,10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,
-10896=>838,10897=>838,10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,
-10906=>838,10907=>838,10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,
-10929=>838,10930=>838,10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,
-11001=>838,11002=>838,11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,
-11016=>838,11017=>838,11018=>838,11019=>838,11020=>838,11021=>838,11022=>838,11023=>838,11024=>838,11025=>838,
-11026=>945,11027=>945,11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11039=>869,
-11040=>869,11041=>873,11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>637,11361=>360,11362=>637,
-11363=>733,11364=>770,11365=>675,11366=>478,11367=>956,11368=>712,11369=>775,11370=>665,11371=>725,11372=>582,
-11373=>860,11374=>995,11375=>774,11377=>778,11378=>1221,11379=>1056,11380=>652,11381=>698,11382=>565,11383=>782,
-11385=>538,11386=>687,11387=>559,11388=>219,11389=>487,11800=>586,11810=>457,11811=>457,11812=>457,11813=>457,
-11822=>580,19904=>896,19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,19912=>896,
-19913=>896,19914=>896,19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,19922=>896,
-19923=>896,19924=>896,19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,19932=>896,
-19933=>896,19934=>896,19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,19942=>896,
-19943=>896,19944=>896,19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,19952=>896,
-19953=>896,19954=>896,19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,19962=>896,
-19963=>896,19964=>896,19965=>896,19966=>896,19967=>896,42564=>720,42565=>595,42566=>436,42567=>440,42572=>1405,
-42573=>1173,42576=>1234,42577=>1027,42580=>1174,42581=>972,42582=>1100,42583=>969,42594=>1100,42595=>940,42596=>1096,
-42597=>915,42598=>1260,42599=>997,42600=>850,42601=>687,42602=>1037,42603=>868,42604=>1406,42605=>1106,42606=>961,
-42634=>944,42635=>749,42636=>682,42637=>580,42644=>808,42645=>712,42760=>500,42761=>500,42762=>500,42763=>500,
-42764=>500,42765=>500,42766=>500,42767=>500,42768=>500,42769=>500,42770=>500,42771=>500,42772=>500,42773=>500,
-42774=>500,42779=>400,42780=>400,42781=>287,42782=>287,42783=>287,42790=>837,42791=>712,42792=>1031,42793=>857,
-42794=>696,42795=>557,42800=>559,42801=>595,42802=>1349,42803=>1052,42804=>1285,42805=>1065,42806=>1245,42807=>1052,
-42808=>1079,42809=>922,42810=>1079,42811=>922,42812=>1035,42813=>922,42814=>698,42815=>549,42822=>850,42823=>542,
-42824=>683,42825=>531,42826=>918,42827=>814,42830=>1406,42831=>1106,42880=>637,42881=>343,42882=>837,42883=>712,
-42889=>400,42890=>396,42891=>456,42892=>306,43003=>683,43004=>733,43005=>995,43006=>372,43007=>1325,62917=>687,
-64256=>833,64257=>787,64258=>787,64259=>1138,64260=>1139,64261=>808,64262=>1020,64275=>1388,64276=>1384,64277=>1378,
-64278=>1384,64279=>1713,64285=>343,64286=>0,64287=>663,64288=>720,64289=>963,64290=>890,64291=>988,64292=>963,
-64293=>938,64294=>988,64295=>988,64296=>976,64297=>838,64298=>949,64299=>949,64300=>949,64301=>949,64302=>751,
-64303=>751,64304=>751,64305=>673,64306=>537,64307=>654,64308=>712,64309=>343,64310=>491,64312=>724,64313=>467,
-64314=>649,64315=>650,64316=>679,64318=>775,64320=>497,64321=>773,64323=>718,64324=>687,64326=>751,64327=>729,
-64328=>649,64329=>949,64330=>751,64331=>343,64332=>673,64333=>650,64334=>687,64335=>751,65024=>0,65025=>0,
-65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,
-65036=>0,65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,
-65531=>0,65532=>0,65533=>1113);
-$enc='';
-$diff='';
-$file='dejavusansbi.z';
-$ctg='dejavusansbi.ctg.z';
-$originalsize=524056;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensed.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensed.php
deleted file mode 100644
index 2dd9c238e10..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensed.php
+++ /dev/null
@@ -1,517 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>26,'Flags'=>96,'FontBBox'=>'[-918 -350 1513 1167]','ItalicAngle'=>-18.9,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>360,34=>414,35=>754,36=>572,37=>855,38=>702,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>325,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>478,64=>900,65=>615,66=>617,67=>628,68=>693,69=>568,70=>518,
-71=>697,72=>677,73=>265,74=>265,75=>590,76=>501,77=>776,78=>673,79=>708,80=>542,
-81=>708,82=>625,83=>571,84=>549,85=>659,86=>615,87=>890,88=>616,89=>549,90=>616,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>551,98=>571,99=>495,100=>571,
-101=>554,102=>316,103=>571,104=>570,105=>250,106=>250,107=>521,108=>250,109=>876,110=>570,
-111=>550,112=>571,113=>571,114=>370,115=>469,116=>353,117=>570,118=>532,119=>736,120=>532,
-121=>532,122=>472,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>316,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1208,352=>571,8249=>360,338=>962,381=>616,8216=>286,
-8217=>286,8220=>466,8221=>466,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>469,8250=>360,
-339=>920,382=>472,376=>549,160=>286,161=>360,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>424,171=>550,172=>754,173=>325,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>572,182=>572,183=>286,184=>450,185=>360,186=>424,
-187=>550,188=>872,189=>872,190=>872,191=>478,192=>615,193=>615,194=>615,195=>615,196=>615,
-197=>615,198=>876,199=>628,200=>568,201=>568,202=>568,203=>568,204=>265,205=>265,206=>265,
-207=>265,208=>697,209=>673,210=>708,211=>708,212=>708,213=>708,214=>708,215=>754,216=>708,
-217=>659,218=>659,219=>659,220=>659,221=>549,222=>544,223=>567,224=>551,225=>551,226=>551,
-227=>551,228=>551,229=>551,230=>883,231=>495,232=>554,233=>554,234=>554,235=>554,236=>250,
-237=>250,238=>250,239=>250,240=>550,241=>570,242=>550,243=>550,244=>550,245=>550,246=>550,
-247=>754,248=>550,249=>570,250=>570,251=>570,252=>570,253=>532,254=>571,255=>532,256=>615,
-257=>551,258=>615,259=>551,260=>615,261=>551,262=>628,263=>495,264=>628,265=>495,266=>628,
-267=>495,268=>628,269=>495,270=>693,271=>571,272=>697,273=>571,274=>568,275=>554,276=>568,
-277=>554,278=>568,279=>554,280=>568,281=>554,282=>568,283=>554,284=>697,285=>571,286=>697,
-287=>571,288=>697,289=>571,290=>697,291=>571,292=>677,293=>570,294=>824,295=>625,296=>265,
-297=>250,298=>265,299=>250,300=>265,301=>250,302=>265,303=>250,304=>265,305=>250,306=>531,
-307=>500,308=>265,309=>250,310=>590,311=>521,312=>521,313=>501,314=>250,315=>501,316=>250,
-317=>501,318=>337,319=>501,320=>308,321=>505,322=>255,323=>673,324=>570,325=>673,326=>570,
-327=>673,328=>570,329=>732,330=>673,331=>570,332=>708,333=>550,334=>708,335=>550,336=>708,
-337=>550,340=>625,341=>370,342=>625,343=>370,344=>625,345=>370,346=>571,347=>469,348=>571,
-349=>469,350=>571,351=>469,354=>549,355=>353,356=>549,357=>353,358=>549,359=>353,360=>659,
-361=>570,362=>659,363=>570,364=>659,365=>570,366=>659,367=>570,368=>659,369=>570,370=>659,
-371=>570,372=>890,373=>736,374=>549,375=>532,377=>616,378=>472,379=>616,380=>472,383=>316,
-384=>571,385=>661,386=>617,387=>571,388=>617,389=>571,390=>633,391=>628,392=>495,393=>697,
-394=>737,395=>617,396=>571,397=>550,398=>568,399=>708,400=>553,401=>518,403=>697,404=>618,
-405=>885,406=>318,407=>265,408=>671,409=>521,410=>250,411=>532,412=>876,413=>673,414=>570,
-415=>708,416=>822,417=>550,418=>854,419=>683,420=>586,421=>571,422=>625,423=>571,424=>469,
-425=>568,426=>302,427=>353,428=>549,429=>353,430=>549,431=>772,432=>570,433=>688,434=>648,
-435=>669,436=>657,437=>616,438=>472,439=>599,440=>599,441=>520,442=>472,443=>572,444=>599,
-445=>520,446=>459,447=>571,448=>265,449=>443,450=>413,451=>266,452=>1279,453=>1169,454=>1039,
-455=>751,456=>708,457=>411,458=>838,459=>831,460=>717,461=>615,462=>551,463=>265,464=>250,
-465=>708,466=>550,467=>659,468=>570,469=>659,470=>570,471=>659,472=>570,473=>659,474=>570,
-475=>659,476=>570,477=>554,478=>615,479=>551,480=>615,481=>551,482=>876,483=>883,484=>697,
-485=>571,486=>697,487=>571,488=>590,489=>521,490=>708,491=>550,492=>708,493=>550,494=>599,
-495=>520,496=>250,497=>1279,498=>1169,499=>1039,500=>697,501=>571,502=>1001,503=>614,504=>673,
-505=>570,506=>615,507=>551,508=>876,509=>883,510=>708,511=>550,512=>615,513=>551,514=>615,
-515=>551,516=>568,517=>554,518=>568,519=>554,520=>265,521=>250,522=>265,523=>250,524=>708,
-525=>550,526=>708,527=>550,528=>625,529=>370,530=>625,531=>370,532=>659,533=>570,534=>659,
-535=>570,536=>571,537=>469,538=>549,539=>353,540=>564,541=>469,542=>677,543=>570,544=>662,
-545=>754,546=>628,547=>549,548=>616,549=>472,550=>615,551=>551,552=>568,553=>554,554=>708,
-555=>550,556=>708,557=>550,558=>708,559=>550,560=>708,561=>550,562=>549,563=>532,564=>427,
-565=>758,566=>429,567=>250,568=>898,569=>898,570=>615,571=>628,572=>495,573=>501,574=>549,
-575=>469,576=>472,577=>542,578=>431,579=>617,580=>659,581=>615,582=>568,583=>554,584=>265,
-585=>250,586=>703,587=>571,588=>625,589=>370,590=>549,591=>532,592=>540,593=>571,594=>571,
-595=>571,596=>494,597=>495,598=>571,599=>626,600=>554,601=>554,602=>737,603=>486,604=>479,
-605=>698,606=>598,607=>250,608=>626,609=>571,610=>566,611=>536,612=>536,613=>570,614=>570,
-615=>570,616=>250,617=>304,618=>334,619=>356,620=>438,621=>250,622=>635,623=>876,624=>876,
-625=>876,626=>581,627=>578,628=>570,629=>550,630=>772,631=>655,632=>593,633=>373,634=>373,
-635=>372,636=>370,637=>369,638=>477,639=>477,640=>543,641=>543,642=>469,643=>302,644=>302,
-645=>415,646=>302,647=>353,648=>353,649=>570,650=>556,651=>538,652=>532,653=>736,654=>532,
-655=>549,656=>472,657=>472,658=>520,659=>520,660=>459,661=>459,662=>459,663=>459,664=>708,
-665=>521,666=>598,667=>637,668=>588,669=>263,670=>600,671=>456,672=>654,673=>459,674=>459,
-675=>913,676=>952,677=>911,678=>742,679=>549,680=>700,681=>763,682=>576,683=>589,684=>463,
-685=>463,686=>595,687=>597,688=>364,689=>359,690=>157,691=>233,692=>266,693=>266,694=>341,
-695=>463,696=>335,697=>250,698=>414,699=>286,700=>286,701=>286,702=>276,703=>276,704=>333,
-705=>333,706=>450,707=>450,708=>450,709=>450,711=>450,712=>247,713=>450,714=>450,715=>450,
-716=>247,717=>450,718=>450,719=>450,720=>303,721=>303,722=>276,723=>276,724=>450,725=>450,
-726=>351,727=>286,728=>450,729=>450,730=>450,731=>450,733=>450,734=>284,735=>450,736=>383,
-737=>149,738=>335,739=>399,740=>333,741=>444,742=>444,743=>444,744=>444,745=>444,748=>450,
-749=>450,750=>466,755=>450,759=>450,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>589,881=>511,882=>775,
-883=>583,884=>250,885=>250,886=>673,887=>584,890=>450,891=>494,892=>495,893=>494,894=>303,
-900=>450,901=>450,902=>623,903=>286,904=>671,905=>784,906=>367,908=>731,910=>742,911=>743,
-912=>304,913=>615,914=>617,915=>501,916=>615,917=>568,918=>616,919=>677,920=>708,921=>265,
-922=>590,923=>615,924=>776,925=>673,926=>568,927=>708,928=>677,929=>542,931=>568,932=>549,
-933=>549,934=>708,935=>616,936=>708,937=>688,938=>265,939=>549,940=>593,941=>486,942=>570,
-943=>304,944=>521,945=>593,946=>574,947=>532,948=>550,949=>486,950=>489,951=>570,952=>550,
-953=>304,954=>530,955=>532,956=>572,957=>502,958=>501,959=>550,960=>542,961=>571,962=>528,
-963=>570,964=>542,965=>521,966=>593,967=>520,968=>593,969=>753,970=>304,971=>521,972=>550,
-973=>521,974=>753,975=>590,976=>553,977=>557,978=>628,979=>758,980=>628,981=>593,982=>753,
-983=>597,984=>708,985=>550,986=>583,987=>528,988=>518,989=>413,990=>593,991=>593,992=>778,
-993=>564,994=>840,995=>753,996=>682,997=>593,998=>712,999=>553,1000=>618,1001=>546,1002=>690,
-1003=>563,1004=>629,1005=>550,1006=>549,1007=>482,1008=>597,1009=>571,1010=>495,1011=>250,1012=>708,
-1013=>554,1014=>554,1015=>544,1016=>571,1017=>628,1018=>776,1019=>585,1020=>571,1021=>633,1022=>628,
-1023=>633,1024=>568,1025=>568,1026=>708,1027=>549,1028=>628,1029=>571,1030=>265,1031=>265,1032=>265,
-1033=>984,1034=>940,1035=>708,1036=>639,1037=>673,1038=>548,1039=>677,1040=>615,1041=>617,1042=>617,
-1043=>549,1044=>703,1045=>568,1046=>969,1047=>577,1048=>673,1049=>673,1050=>639,1051=>677,1052=>776,
-1053=>677,1054=>708,1055=>677,1056=>542,1057=>628,1058=>549,1059=>548,1060=>774,1061=>616,1062=>699,
-1063=>617,1064=>962,1065=>984,1066=>749,1067=>794,1068=>617,1069=>628,1070=>971,1071=>625,1072=>551,
-1073=>555,1074=>530,1075=>473,1076=>622,1077=>554,1078=>811,1079=>479,1080=>584,1081=>584,1082=>543,
-1083=>575,1084=>679,1085=>588,1086=>550,1087=>588,1088=>571,1089=>495,1090=>524,1091=>532,1092=>769,
-1093=>532,1094=>612,1095=>532,1096=>823,1097=>848,1098=>636,1099=>710,1100=>530,1101=>494,1102=>757,
-1103=>541,1104=>554,1105=>554,1106=>563,1107=>473,1108=>494,1109=>469,1110=>250,1111=>250,1112=>250,
-1113=>812,1114=>809,1115=>586,1116=>543,1117=>584,1118=>532,1119=>588,1120=>840,1121=>753,1122=>693,
-1123=>604,1124=>848,1125=>674,1126=>791,1127=>705,1128=>1043,1129=>901,1130=>708,1131=>550,1132=>924,
-1133=>742,1134=>572,1135=>486,1136=>771,1137=>789,1138=>708,1139=>550,1140=>703,1141=>598,1142=>703,
-1143=>598,1144=>893,1145=>813,1146=>857,1147=>682,1148=>1062,1149=>925,1150=>840,1151=>753,1152=>628,
-1153=>495,1154=>452,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>695,
-1163=>609,1164=>617,1165=>530,1166=>542,1167=>571,1168=>549,1169=>473,1170=>607,1171=>531,1172=>562,
-1173=>477,1174=>969,1175=>811,1176=>577,1177=>479,1178=>639,1179=>543,1180=>639,1181=>543,1182=>639,
-1183=>543,1184=>771,1185=>748,1186=>677,1187=>594,1188=>913,1189=>789,1190=>973,1191=>824,1192=>790,
-1193=>624,1194=>628,1195=>495,1196=>549,1197=>524,1198=>549,1199=>532,1200=>549,1201=>532,1202=>616,
-1203=>532,1204=>840,1205=>726,1206=>617,1207=>532,1208=>617,1209=>532,1210=>617,1211=>570,1212=>847,
-1213=>655,1214=>847,1215=>655,1216=>265,1217=>969,1218=>811,1219=>590,1220=>543,1221=>698,1222=>603,
-1223=>677,1224=>594,1225=>699,1226=>612,1227=>617,1228=>532,1229=>799,1230=>697,1231=>250,1232=>615,
-1233=>551,1234=>615,1235=>551,1236=>876,1237=>883,1238=>568,1239=>554,1240=>708,1241=>554,1242=>708,
-1243=>554,1244=>969,1245=>811,1246=>577,1247=>479,1248=>599,1249=>520,1250=>673,1251=>584,1252=>673,
-1253=>584,1254=>708,1255=>550,1256=>708,1257=>550,1258=>708,1259=>550,1260=>628,1261=>494,1262=>548,
-1263=>532,1264=>548,1265=>532,1266=>548,1267=>532,1268=>617,1269=>532,1270=>549,1271=>473,1272=>794,
-1273=>710,1274=>607,1275=>531,1276=>616,1277=>532,1278=>616,1279=>532,1280=>617,1281=>530,1282=>905,
-1283=>807,1284=>877,1285=>782,1286=>611,1287=>529,1288=>964,1289=>861,1290=>1001,1291=>870,1292=>697,
-1293=>593,1294=>695,1295=>640,1296=>553,1297=>486,1298=>677,1299=>575,1300=>1052,1301=>894,1302=>804,
-1303=>778,1304=>928,1305=>887,1306=>708,1307=>571,1308=>890,1309=>736,1312=>972,1313=>814,1314=>973,
-1315=>821,1316=>713,1317=>614,1329=>780,1330=>659,1331=>794,1332=>794,1333=>659,1334=>579,1335=>613,
-1336=>659,1337=>765,1338=>794,1339=>659,1340=>501,1341=>741,1342=>888,1343=>659,1344=>636,1345=>579,
-1346=>794,1347=>699,1348=>794,1349=>659,1350=>756,1351=>659,1352=>659,1353=>659,1354=>711,1355=>579,
-1356=>794,1357=>659,1358=>794,1359=>571,1360=>659,1361=>659,1362=>719,1363=>708,1364=>711,1365=>708,
-1366=>571,1369=>276,1370=>286,1371=>450,1372=>450,1373=>352,1374=>474,1375=>450,1377=>876,1378=>570,
-1379=>686,1380=>690,1381=>570,1382=>627,1383=>479,1384=>570,1385=>630,1386=>627,1387=>570,1388=>363,
-1389=>804,1390=>576,1391=>570,1392=>570,1393=>571,1394=>631,1395=>570,1396=>593,1397=>250,1398=>684,
-1399=>464,1400=>570,1401=>407,1402=>876,1403=>464,1404=>691,1405=>570,1406=>626,1407=>876,1408=>570,
-1409=>571,1410=>451,1411=>876,1412=>583,1413=>550,1414=>566,1415=>686,1417=>303,1418=>390,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>325,1471=>0,1472=>265,1473=>0,1474=>0,1475=>265,1478=>397,
-1479=>0,1488=>566,1489=>547,1490=>403,1491=>534,1492=>576,1493=>245,1494=>336,1495=>576,1496=>583,
-1497=>245,1498=>532,1499=>500,1500=>539,1501=>576,1502=>593,1503=>245,1504=>397,1505=>629,1506=>506,
-1507=>576,1508=>543,1509=>468,1510=>523,1511=>596,1512=>532,1513=>727,1514=>591,1520=>423,1521=>409,
-1522=>423,1523=>374,1524=>580,1542=>573,1543=>573,1545=>681,1546=>879,1548=>290,1557=>0,1563=>286,
-1567=>478,1569=>423,1570=>250,1571=>250,1572=>435,1573=>250,1574=>704,1575=>250,1576=>847,1577=>471,
-1578=>847,1579=>847,1580=>581,1581=>581,1582=>581,1583=>400,1584=>400,1585=>435,1586=>435,1587=>1099,
-1588=>1099,1589=>1088,1590=>1088,1591=>832,1592=>832,1593=>537,1594=>537,1600=>264,1601=>933,1602=>698,
-1603=>742,1604=>654,1605=>557,1606=>661,1607=>471,1608=>435,1609=>704,1610=>704,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>450,
-1632=>483,1633=>483,1634=>483,1635=>483,1636=>483,1637=>483,1638=>483,1639=>483,1640=>483,1641=>483,
-1642=>483,1643=>292,1644=>286,1645=>490,1646=>847,1647=>698,1652=>263,1657=>847,1658=>847,1659=>847,
-1660=>847,1661=>847,1662=>847,1663=>847,1664=>847,1665=>581,1666=>581,1667=>581,1668=>581,1669=>581,
-1670=>581,1671=>581,1681=>435,1682=>435,1685=>549,1688=>435,1697=>933,1700=>933,1702=>933,1705=>805,
-1711=>805,1717=>654,1722=>661,1727=>581,1734=>435,1740=>704,1742=>704,1749=>471,1776=>483,1777=>483,
-1778=>483,1779=>483,1780=>483,1781=>483,1782=>483,1783=>483,1784=>483,1785=>483,1984=>572,1985=>572,
-1986=>572,1987=>572,1988=>572,1989=>572,1990=>572,1991=>572,1992=>572,1993=>572,1994=>250,1995=>514,
-1996=>381,1997=>532,1998=>588,1999=>588,2000=>534,2001=>588,2002=>746,2003=>394,2004=>394,2005=>502,
-2006=>550,2007=>315,2008=>863,2009=>425,2010=>705,2011=>588,2012=>563,2013=>660,2014=>477,2015=>651,
-2016=>425,2017=>563,2018=>534,2019=>477,2020=>477,2021=>470,2022=>534,2023=>534,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>282,2037=>282,2040=>504,
-2041=>504,2042=>325,3647=>586,3713=>603,3714=>615,3716=>619,3719=>434,3720=>565,3722=>615,3725=>619,
-3732=>602,3733=>577,3734=>580,3735=>589,3737=>593,3738=>563,3739=>563,3740=>670,3741=>690,3742=>618,
-3743=>618,3745=>631,3746=>619,3747=>615,3749=>584,3751=>569,3754=>633,3755=>737,3757=>569,3758=>615,
-3759=>708,3760=>569,3761=>0,3762=>485,3763=>485,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>597,3776=>337,3777=>591,3778=>414,3779=>492,3780=>442,3782=>606,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>572,3793=>576,3794=>576,3795=>603,
-3796=>563,3797=>563,3798=>633,3799=>603,3800=>606,3801=>609,3804=>925,3805=>925,4256=>756,4257=>621,
-4258=>577,4259=>683,4260=>532,4261=>617,4262=>710,4263=>729,4264=>420,4265=>508,4266=>710,4267=>713,
-4268=>526,4269=>753,4270=>675,4271=>620,4272=>729,4273=>526,4274=>526,4275=>753,4276=>753,4277=>581,
-4278=>543,4279=>526,4280=>536,4281=>526,4282=>649,4283=>715,4284=>526,4285=>510,4286=>526,4287=>602,
-4288=>719,4289=>488,4290=>598,4291=>488,4292=>508,4293=>606,4304=>457,4305=>457,4306=>479,4307=>706,
-4308=>470,4309=>465,4310=>457,4311=>717,4312=>457,4313=>466,4314=>952,4315=>470,4316=>470,4317=>704,
-4318=>466,4319=>470,4320=>713,4321=>470,4322=>590,4323=>471,4324=>709,4325=>470,4326=>704,4327=>470,
-4328=>470,4329=>470,4330=>510,4331=>470,4332=>470,4333=>439,4334=>470,4335=>448,4336=>465,4337=>504,
-4338=>457,4339=>457,4340=>457,4341=>507,4342=>741,4343=>536,4344=>470,4345=>498,4346=>498,4347=>527,
-4348=>273,5121=>615,5122=>615,5123=>615,5124=>615,5125=>692,5126=>692,5127=>692,5129=>692,5130=>692,
-5131=>692,5132=>751,5133=>751,5134=>751,5135=>751,5136=>751,5137=>751,5138=>870,5139=>906,5140=>870,
-5141=>906,5142=>692,5143=>870,5144=>906,5145=>870,5146=>906,5147=>692,5149=>230,5150=>488,5151=>381,
-5152=>381,5153=>350,5154=>350,5155=>354,5156=>350,5157=>419,5158=>347,5159=>230,5160=>350,5161=>350,
-5162=>350,5163=>980,5164=>817,5165=>857,5166=>1005,5167=>615,5168=>615,5169=>615,5170=>615,5171=>656,
-5172=>656,5173=>656,5175=>656,5176=>656,5177=>656,5178=>751,5179=>615,5180=>751,5181=>751,5182=>751,
-5183=>751,5184=>870,5185=>906,5186=>870,5187=>906,5188=>870,5189=>906,5190=>870,5191=>906,5192=>656,
-5193=>457,5194=>172,5196=>659,5197=>659,5198=>659,5199=>659,5200=>657,5201=>657,5202=>657,5204=>657,
-5205=>657,5206=>657,5207=>829,5208=>800,5209=>829,5210=>800,5211=>829,5212=>800,5213=>835,5214=>810,
-5215=>835,5216=>810,5217=>853,5218=>810,5219=>853,5220=>810,5221=>853,5222=>391,5223=>790,5224=>790,
-5225=>779,5226=>801,5227=>565,5228=>565,5229=>565,5230=>565,5231=>565,5232=>565,5233=>565,5234=>565,
-5235=>565,5236=>773,5237=>693,5238=>733,5239=>734,5240=>733,5241=>734,5242=>773,5243=>693,5244=>773,
-5245=>693,5246=>733,5247=>734,5248=>733,5249=>734,5250=>733,5251=>366,5252=>366,5253=>675,5254=>697,
-5255=>675,5256=>697,5257=>565,5258=>565,5259=>565,5260=>565,5261=>565,5262=>565,5263=>565,5264=>565,
-5265=>565,5266=>773,5267=>693,5268=>733,5269=>734,5270=>733,5271=>734,5272=>773,5273=>693,5274=>773,
-5275=>693,5276=>733,5277=>734,5278=>733,5279=>734,5280=>733,5281=>391,5282=>391,5283=>549,5284=>501,
-5285=>501,5286=>501,5287=>549,5288=>549,5289=>549,5290=>501,5291=>501,5292=>674,5293=>691,5294=>671,
-5295=>687,5296=>671,5297=>687,5298=>674,5299=>691,5300=>674,5301=>691,5302=>671,5303=>687,5304=>671,
-5305=>687,5306=>671,5307=>347,5308=>457,5309=>347,5312=>766,5313=>766,5314=>766,5315=>766,5316=>766,
-5317=>766,5318=>766,5319=>766,5320=>766,5321=>962,5322=>931,5323=>953,5324=>766,5325=>953,5326=>766,
-5327=>766,5328=>540,5329=>407,5330=>540,5331=>766,5332=>766,5333=>766,5334=>766,5335=>766,5336=>766,
-5337=>766,5338=>766,5339=>766,5340=>962,5341=>931,5342=>953,5343=>927,5344=>953,5345=>927,5346=>962,
-5347=>931,5348=>962,5349=>931,5350=>975,5351=>927,5352=>975,5353=>927,5354=>540,5356=>656,5357=>542,
-5358=>542,5359=>542,5360=>542,5361=>542,5362=>542,5363=>542,5364=>542,5365=>542,5366=>751,5367=>678,
-5368=>712,5369=>694,5370=>712,5371=>694,5372=>751,5373=>678,5374=>751,5375=>678,5376=>712,5377=>694,
-5378=>712,5379=>694,5380=>712,5381=>376,5382=>378,5383=>376,5392=>641,5393=>641,5394=>641,5395=>802,
-5396=>802,5397=>802,5398=>802,5399=>818,5400=>785,5401=>818,5402=>785,5403=>818,5404=>785,5405=>1026,
-5406=>989,5407=>1026,5408=>989,5409=>1026,5410=>989,5411=>1026,5412=>989,5413=>576,5414=>564,5415=>564,
-5416=>564,5417=>564,5418=>564,5419=>564,5420=>564,5421=>564,5422=>564,5423=>760,5424=>703,5425=>734,
-5426=>736,5427=>734,5428=>736,5429=>760,5430=>703,5431=>760,5432=>703,5433=>734,5434=>736,5435=>734,
-5436=>736,5437=>734,5438=>376,5440=>350,5441=>436,5442=>824,5443=>824,5444=>824,5445=>824,5446=>824,
-5447=>824,5448=>542,5449=>542,5450=>542,5451=>542,5452=>542,5453=>542,5454=>751,5455=>678,5456=>376,
-5458=>656,5459=>615,5460=>615,5461=>615,5462=>615,5463=>653,5464=>653,5465=>653,5466=>653,5467=>831,
-5468=>906,5469=>457,5470=>659,5471=>659,5472=>659,5473=>659,5474=>659,5475=>659,5476=>657,5477=>657,
-5478=>657,5479=>657,5480=>853,5481=>810,5482=>457,5492=>747,5493=>747,5494=>747,5495=>747,5496=>747,
-5497=>747,5498=>747,5499=>507,5500=>677,5501=>436,5502=>942,5503=>942,5504=>942,5505=>942,5506=>942,
-5507=>942,5508=>942,5509=>743,5514=>747,5515=>747,5516=>747,5517=>747,5518=>1133,5519=>1133,5520=>1133,
-5521=>901,5522=>901,5523=>1133,5524=>1133,5525=>629,5526=>965,5536=>766,5537=>766,5538=>766,5539=>766,
-5540=>766,5541=>766,5542=>540,5543=>579,5544=>579,5545=>579,5546=>579,5547=>579,5548=>579,5549=>579,
-5550=>376,5551=>565,5598=>693,5601=>690,5702=>421,5703=>421,5742=>399,5743=>942,5744=>1178,5745=>1469,
-5746=>1469,5747=>1237,5748=>1237,5749=>1469,5750=>1469,5760=>429,5761=>443,5762=>641,5763=>838,5764=>1035,
-5765=>1232,5766=>443,5767=>641,5768=>838,5769=>1035,5770=>1232,5771=>448,5772=>646,5773=>844,5774=>1042,
-5775=>1241,5776=>443,5777=>641,5778=>836,5779=>1034,5780=>1232,5781=>448,5782=>677,5783=>709,5784=>1084,
-5785=>1035,5786=>615,5787=>457,5788=>456,7424=>532,7425=>646,7426=>883,7427=>527,7428=>495,7429=>544,
-7430=>544,7431=>441,7432=>486,7433=>250,7434=>355,7435=>521,7436=>524,7437=>679,7438=>584,7439=>550,
-7440=>495,7441=>615,7442=>615,7443=>615,7444=>920,7446=>550,7447=>550,7448=>472,7449=>541,7450=>541,
-7451=>524,7452=>517,7453=>663,7454=>853,7455=>574,7456=>532,7457=>736,7458=>472,7459=>473,7462=>524,
-7463=>532,7464=>507,7465=>472,7466=>531,7467=>575,7468=>387,7469=>552,7470=>389,7472=>436,7473=>358,
-7474=>358,7475=>439,7476=>426,7477=>167,7478=>167,7479=>372,7480=>315,7481=>489,7482=>424,7483=>424,
-7484=>446,7485=>396,7486=>342,7487=>394,7488=>346,7489=>415,7490=>560,7491=>352,7492=>352,7493=>365,
-7494=>583,7495=>385,7496=>365,7497=>375,7498=>375,7499=>324,7500=>323,7501=>365,7502=>161,7503=>383,
-7504=>561,7505=>368,7506=>372,7507=>333,7508=>372,7509=>372,7510=>385,7511=>265,7512=>364,7513=>422,
-7514=>561,7515=>375,7517=>361,7518=>335,7519=>347,7520=>374,7521=>327,7522=>161,7523=>233,7524=>364,
-7525=>375,7526=>361,7527=>335,7528=>370,7529=>374,7530=>327,7543=>571,7544=>426,7547=>334,7557=>250,
-7579=>365,7580=>333,7581=>333,7582=>372,7583=>324,7584=>267,7585=>209,7586=>365,7587=>364,7588=>235,
-7589=>224,7590=>234,7591=>235,7592=>211,7593=>224,7594=>211,7595=>338,7596=>561,7597=>561,7598=>369,
-7599=>431,7600=>368,7601=>372,7602=>372,7603=>324,7604=>258,7605=>265,7606=>457,7607=>376,7608=>325,
-7609=>365,7610=>375,7611=>330,7612=>393,7613=>330,7614=>353,7615=>372,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>615,7681=>551,7682=>617,7683=>571,7684=>617,7685=>571,7686=>617,
-7687=>571,7688=>628,7689=>495,7690=>693,7691=>571,7692=>693,7693=>571,7694=>693,7695=>571,7696=>693,
-7697=>571,7698=>693,7699=>571,7700=>568,7701=>554,7702=>568,7703=>554,7704=>568,7705=>554,7706=>568,
-7707=>554,7708=>568,7709=>554,7710=>518,7711=>316,7712=>697,7713=>571,7714=>677,7715=>570,7716=>677,
-7717=>570,7718=>677,7719=>570,7720=>677,7721=>570,7722=>677,7723=>570,7724=>265,7725=>250,7726=>265,
-7727=>250,7728=>590,7729=>521,7730=>590,7731=>521,7732=>590,7733=>521,7734=>501,7735=>259,7736=>501,
-7737=>259,7738=>501,7739=>250,7740=>501,7741=>250,7742=>776,7743=>876,7744=>776,7745=>876,7746=>776,
-7747=>876,7748=>673,7749=>570,7750=>673,7751=>570,7752=>673,7753=>570,7754=>673,7755=>570,7756=>708,
-7757=>550,7758=>708,7759=>550,7760=>708,7761=>550,7762=>708,7763=>550,7764=>542,7765=>571,7766=>542,
-7767=>571,7768=>625,7769=>370,7770=>625,7771=>370,7772=>625,7773=>370,7774=>625,7775=>370,7776=>571,
-7777=>469,7778=>571,7779=>469,7780=>571,7781=>469,7782=>571,7783=>469,7784=>571,7785=>469,7786=>549,
-7787=>353,7788=>549,7789=>353,7790=>549,7791=>353,7792=>549,7793=>353,7794=>659,7795=>570,7796=>659,
-7797=>570,7798=>659,7799=>570,7800=>659,7801=>570,7802=>659,7803=>570,7804=>615,7805=>532,7806=>615,
-7807=>532,7808=>890,7809=>736,7810=>890,7811=>736,7812=>890,7813=>736,7814=>890,7815=>736,7816=>890,
-7817=>736,7818=>616,7819=>532,7820=>616,7821=>532,7822=>549,7823=>532,7824=>616,7825=>472,7826=>616,
-7827=>472,7828=>616,7829=>472,7830=>570,7831=>353,7832=>736,7833=>532,7834=>551,7835=>316,7838=>691,
-7839=>550,7840=>615,7841=>551,7842=>615,7843=>551,7844=>615,7845=>551,7846=>615,7847=>551,7848=>615,
-7849=>551,7850=>615,7851=>551,7852=>615,7853=>551,7854=>615,7855=>551,7856=>615,7857=>551,7858=>615,
-7859=>551,7860=>615,7861=>551,7862=>615,7863=>551,7864=>568,7865=>554,7866=>568,7867=>554,7868=>568,
-7869=>554,7870=>568,7871=>554,7872=>568,7873=>554,7874=>568,7875=>554,7876=>568,7877=>554,7878=>568,
-7879=>554,7880=>265,7881=>250,7882=>265,7883=>250,7884=>708,7885=>550,7886=>708,7887=>550,7888=>708,
-7889=>550,7890=>708,7891=>550,7892=>708,7893=>550,7894=>708,7895=>550,7896=>708,7897=>550,7898=>822,
-7899=>550,7900=>822,7901=>550,7902=>822,7903=>550,7904=>822,7905=>550,7906=>822,7907=>550,7908=>659,
-7909=>570,7910=>659,7911=>570,7912=>772,7913=>570,7914=>772,7915=>570,7916=>772,7917=>570,7918=>772,
-7919=>570,7920=>772,7921=>570,7922=>549,7923=>532,7924=>549,7925=>532,7926=>549,7927=>532,7928=>549,
-7929=>532,7936=>593,7937=>593,7938=>593,7939=>593,7940=>593,7941=>593,7942=>593,7943=>593,7944=>615,
-7945=>615,7946=>790,7947=>790,7948=>692,7949=>721,7950=>637,7951=>668,7952=>486,7953=>486,7954=>486,
-7955=>486,7956=>486,7957=>486,7960=>640,7961=>640,7962=>869,7963=>877,7964=>809,7965=>835,7968=>570,
-7969=>570,7970=>570,7971=>570,7972=>570,7973=>570,7974=>570,7975=>570,7976=>753,7977=>751,7978=>977,
-7979=>980,7980=>924,7981=>945,7982=>840,7983=>852,7984=>304,7985=>304,7986=>304,7987=>304,7988=>304,
-7989=>304,7990=>304,7991=>304,7992=>342,7993=>336,7994=>571,7995=>571,7996=>513,7997=>540,7998=>440,
-7999=>443,8000=>550,8001=>550,8002=>550,8003=>550,8004=>550,8005=>550,8008=>724,8009=>763,8010=>985,
-8011=>989,8012=>844,8013=>873,8016=>521,8017=>521,8018=>521,8019=>521,8020=>521,8021=>521,8022=>521,
-8023=>521,8025=>705,8027=>897,8029=>911,8031=>808,8032=>753,8033=>753,8034=>753,8035=>753,8036=>753,
-8037=>753,8038=>753,8039=>753,8040=>722,8041=>759,8042=>980,8043=>985,8044=>851,8045=>875,8046=>829,
-8047=>857,8048=>593,8049=>593,8050=>486,8051=>493,8052=>570,8053=>589,8054=>304,8055=>304,8056=>550,
-8057=>550,8058=>521,8059=>521,8060=>753,8061=>753,8064=>593,8065=>593,8066=>593,8067=>593,8068=>593,
-8069=>593,8070=>593,8071=>593,8072=>615,8073=>615,8074=>790,8075=>790,8076=>692,8077=>721,8078=>637,
-8079=>668,8080=>570,8081=>570,8082=>570,8083=>570,8084=>570,8085=>570,8086=>570,8087=>570,8088=>753,
-8089=>751,8090=>977,8091=>980,8092=>924,8093=>945,8094=>840,8095=>852,8096=>753,8097=>753,8098=>753,
-8099=>753,8100=>753,8101=>753,8102=>753,8103=>753,8104=>722,8105=>759,8106=>980,8107=>985,8108=>851,
-8109=>875,8110=>829,8111=>857,8112=>593,8113=>593,8114=>593,8115=>593,8116=>593,8118=>593,8119=>593,
-8120=>615,8121=>615,8122=>645,8123=>623,8124=>615,8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,
-8130=>570,8131=>570,8132=>589,8134=>570,8135=>570,8136=>724,8137=>671,8138=>837,8139=>784,8140=>677,
-8141=>450,8142=>450,8143=>450,8144=>304,8145=>304,8146=>304,8147=>304,8150=>304,8151=>304,8152=>265,
-8153=>265,8154=>427,8155=>367,8157=>450,8158=>450,8159=>450,8160=>521,8161=>521,8162=>521,8163=>521,
-8164=>571,8165=>571,8166=>521,8167=>521,8168=>549,8169=>549,8170=>760,8171=>742,8172=>616,8173=>450,
-8174=>450,8175=>450,8178=>753,8179=>753,8180=>753,8182=>753,8183=>753,8184=>847,8185=>731,8186=>830,
-8187=>743,8188=>688,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,
-8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>325,8209=>325,8210=>572,8213=>900,8214=>450,8215=>450,8219=>286,8223=>466,8227=>531,8228=>301,
-8229=>601,8231=>286,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,8241=>1562,8242=>204,
-8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,8251=>754,8252=>437,8253=>478,8254=>450,
-8255=>723,8256=>723,8257=>225,8258=>900,8259=>450,8260=>150,8261=>351,8262=>351,8263=>830,8264=>659,
-8265=>659,8266=>447,8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8272=>723,8273=>450,8274=>404,
-8275=>900,8276=>723,8277=>754,8278=>527,8279=>597,8280=>754,8281=>754,8282=>286,8283=>717,8284=>754,
-8285=>286,8286=>286,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,
-8300=>0,8301=>0,8302=>0,8303=>0,8304=>360,8305=>161,8308=>360,8309=>360,8310=>360,8311=>360,
-8312=>360,8313=>360,8314=>475,8315=>475,8316=>475,8317=>221,8318=>221,8319=>358,8320=>360,8321=>360,
-8322=>360,8323=>360,8324=>360,8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,8330=>475,8331=>475,
-8332=>475,8333=>221,8334=>221,8336=>352,8337=>375,8338=>372,8339=>399,8340=>375,8352=>789,8353=>572,
-8354=>572,8355=>572,8356=>572,8357=>876,8358=>673,8359=>1145,8360=>966,8361=>890,8362=>706,8363=>571,
-8365=>572,8366=>572,8367=>1145,8368=>572,8369=>572,8370=>572,8371=>572,8372=>696,8373=>577,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>917,8449=>917,8450=>628,8451=>1011,
-8452=>578,8453=>917,8454=>960,8455=>553,8456=>628,8457=>856,8459=>889,8460=>679,8461=>765,8462=>570,
-8463=>570,8464=>422,8465=>627,8466=>648,8467=>372,8468=>736,8469=>721,8470=>936,8471=>900,8472=>627,
-8473=>631,8474=>708,8475=>718,8476=>732,8477=>712,8478=>807,8479=>615,8480=>917,8481=>967,8483=>615,
-8484=>670,8485=>520,8486=>688,8487=>688,8488=>554,8489=>304,8490=>590,8491=>615,8492=>708,8493=>633,
-8494=>769,8495=>532,8496=>545,8497=>708,8498=>518,8499=>962,8500=>416,8501=>670,8502=>606,8503=>419,
-8504=>580,8505=>342,8506=>833,8507=>1074,8508=>632,8509=>655,8510=>589,8511=>764,8512=>729,8513=>697,
-8514=>501,8515=>501,8516=>549,8517=>737,8518=>637,8519=>554,8520=>316,8521=>316,8523=>702,8526=>474,
-8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,8537=>872,8538=>872,8539=>872,8540=>872,
-8541=>872,8542=>872,8543=>511,8544=>265,8545=>443,8546=>620,8547=>831,8548=>615,8549=>830,8550=>1007,
-8551=>1185,8552=>826,8553=>616,8554=>839,8555=>1018,8556=>501,8557=>628,8558=>693,8559=>776,8560=>250,
-8561=>412,8562=>573,8563=>730,8564=>532,8565=>729,8566=>892,8567=>1053,8568=>737,8569=>532,8570=>740,
-8571=>901,8572=>250,8573=>495,8574=>571,8575=>876,8576=>1121,8577=>693,8578=>1121,8579=>633,8580=>494,
-8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,8600=>754,8601=>754,
-8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,8610=>754,8611=>754,
-8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,8620=>754,8621=>754,
-8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,8630=>754,8631=>754,
-8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,8640=>754,8641=>754,
-8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,8650=>754,8651=>754,
-8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,8660=>754,8661=>754,
-8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,8670=>754,8671=>754,
-8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,8680=>754,8681=>754,
-8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,8690=>754,8691=>754,
-8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,8700=>754,8701=>754,
-8702=>754,8703=>754,8704=>615,8705=>572,8706=>465,8707=>568,8708=>568,8709=>784,8710=>602,8711=>602,
-8712=>784,8713=>784,8714=>646,8715=>784,8716=>784,8717=>646,8718=>572,8719=>681,8720=>681,8721=>606,
-8722=>754,8723=>754,8724=>754,8725=>303,8726=>573,8727=>754,8728=>563,8729=>563,8730=>573,8731=>573,
-8732=>573,8733=>643,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,8740=>450,8741=>450,
-8742=>450,8743=>659,8744=>659,8745=>659,8746=>659,8747=>469,8748=>710,8749=>951,8750=>469,8751=>710,
-8752=>951,8753=>469,8754=>469,8755=>469,8756=>572,8757=>572,8758=>234,8759=>572,8760=>754,8761=>754,
-8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,8770=>754,8771=>754,
-8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,8780=>754,8781=>754,
-8782=>754,8783=>754,8784=>754,8785=>754,8786=>755,8787=>755,8788=>900,8789=>900,8790=>754,8791=>754,
-8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,8800=>754,8801=>754,
-8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>754,8809=>754,8810=>942,8811=>942,
-8812=>417,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,8820=>754,8821=>754,
-8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,8830=>754,8831=>754,
-8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8840=>754,8841=>754,
-8842=>754,8843=>754,8844=>659,8845=>659,8846=>659,8847=>754,8848=>754,8849=>754,8850=>754,8851=>702,
-8852=>702,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,
-8862=>754,8863=>754,8864=>754,8865=>754,8866=>784,8867=>784,8868=>784,8869=>784,8870=>468,8871=>468,
-8872=>784,8873=>784,8874=>784,8875=>784,8876=>784,8877=>784,8878=>784,8879=>784,8880=>754,8881=>754,
-8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,8890=>468,8891=>659,
-8892=>659,8893=>659,8894=>754,8895=>754,8896=>738,8897=>738,8898=>738,8899=>738,8900=>444,8901=>286,
-8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,8910=>659,8911=>659,
-8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,8920=>1280,8921=>1280,
-8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,8930=>754,8931=>754,
-8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,8940=>754,8941=>754,
-8942=>900,8943=>900,8944=>900,8945=>900,8946=>900,8947=>784,8948=>646,8949=>784,8950=>784,8951=>646,
-8952=>784,8953=>784,8954=>900,8955=>784,8956=>646,8957=>784,8958=>646,8959=>784,8960=>542,8961=>542,
-8962=>571,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>351,8969=>351,8970=>351,8971=>351,
-8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>461,8984=>900,8985=>754,8988=>422,8989=>422,
-8990=>422,8991=>422,8992=>469,8993=>469,8996=>1037,8997=>1037,8998=>1272,8999=>1037,9000=>1299,9003=>1272,
-9004=>786,9075=>304,9076=>571,9077=>753,9082=>593,9085=>681,9095=>1037,9108=>786,9115=>450,9116=>450,
-9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,9125=>450,9126=>450,
-9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>469,9166=>754,9167=>850,
-9187=>786,9189=>692,9250=>571,9251=>571,9312=>807,9313=>807,9314=>807,9315=>807,9316=>807,9317=>807,
-9318=>807,9319=>807,9320=>807,9321=>807,9472=>542,9473=>542,9474=>542,9475=>542,9476=>542,9477=>542,
-9478=>542,9479=>542,9480=>542,9481=>542,9482=>542,9483=>542,9484=>542,9485=>542,9486=>542,9487=>542,
-9488=>542,9489=>542,9490=>542,9491=>542,9492=>542,9493=>542,9494=>542,9495=>542,9496=>542,9497=>542,
-9498=>542,9499=>542,9500=>542,9501=>542,9502=>542,9503=>542,9504=>542,9505=>542,9506=>542,9507=>542,
-9508=>542,9509=>542,9510=>542,9511=>542,9512=>542,9513=>542,9514=>542,9515=>542,9516=>542,9517=>542,
-9518=>542,9519=>542,9520=>542,9521=>542,9522=>542,9523=>542,9524=>542,9525=>542,9526=>542,9527=>542,
-9528=>542,9529=>542,9530=>542,9531=>542,9532=>542,9533=>542,9534=>542,9535=>542,9536=>542,9537=>542,
-9538=>542,9539=>542,9540=>542,9541=>542,9542=>542,9543=>542,9544=>542,9545=>542,9546=>542,9547=>542,
-9548=>542,9549=>542,9550=>542,9551=>542,9552=>542,9553=>542,9554=>542,9555=>542,9556=>542,9557=>542,
-9558=>542,9559=>542,9560=>542,9561=>542,9562=>542,9563=>542,9564=>542,9565=>542,9566=>542,9567=>542,
-9568=>542,9569=>542,9570=>542,9571=>542,9572=>542,9573=>542,9574=>542,9575=>542,9576=>542,9577=>542,
-9578=>542,9579=>542,9580=>542,9581=>542,9582=>542,9583=>542,9584=>542,9585=>542,9586=>542,9587=>542,
-9588=>542,9589=>542,9590=>542,9591=>542,9592=>542,9593=>542,9594=>542,9595=>542,9596=>542,9597=>542,
-9598=>542,9599=>542,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,9607=>692,
-9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,9617=>692,
-9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,9627=>692,
-9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,9637=>850,
-9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,9647=>495,
-9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,9657=>452,
-9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,9667=>452,
-9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,9677=>785,
-9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,9687=>474,
-9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,9697=>785,
-9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,9707=>850,
-9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,9717=>785,
-9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,9727=>692,
-9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,9734=>807,9735=>515,9736=>806,9737=>807,
-9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,9744=>807,9745=>807,9746=>807,9747=>479,
-9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,9754=>807,9755=>807,9756=>807,9757=>548,
-9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,9764=>602,9765=>671,9766=>584,9767=>705,
-9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,9774=>807,9775=>807,9776=>807,9777=>807,
-9778=>807,9779=>807,9780=>807,9781=>807,9782=>807,9783=>807,9784=>807,9785=>807,9786=>807,9787=>807,
-9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,9796=>807,9797=>807,
-9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,9804=>807,9805=>807,9806=>807,9807=>807,
-9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,9814=>807,9815=>807,9816=>807,9817=>807,
-9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,9824=>807,9825=>807,9826=>807,9827=>807,
-9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,
-9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,9844=>807,9845=>807,9846=>807,9847=>807,
-9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,9854=>807,9855=>807,9856=>782,9857=>782,
-9858=>782,9859=>782,9860=>782,9861=>782,9862=>807,9863=>807,9864=>807,9865=>807,9866=>807,9867=>807,
-9868=>807,9869=>807,9870=>807,9871=>807,9872=>807,9873=>807,9874=>807,9875=>807,9876=>807,9877=>487,
-9878=>807,9879=>807,9880=>807,9881=>807,9882=>807,9883=>807,9884=>807,9888=>807,9889=>632,9890=>903,
-9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,9897=>754,9898=>754,9899=>754,9900=>754,
-9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,9907=>659,9908=>659,9909=>659,9910=>765,
-9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,9990=>754,9991=>754,9992=>754,9993=>754,
-9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,10002=>754,10003=>754,10004=>754,10005=>754,
-10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,10012=>754,10013=>754,10014=>754,10015=>754,
-10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,10022=>754,10023=>754,10025=>754,10026=>754,
-10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,10033=>754,10034=>754,10035=>754,10036=>754,
-10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,10043=>754,10044=>754,10045=>754,10046=>754,
-10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,10053=>754,10054=>754,10055=>754,10056=>754,
-10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,10065=>807,10066=>807,10070=>807,10072=>754,
-10073=>754,10074=>754,10075=>290,10076=>290,10077=>484,10078=>484,10081=>754,10082=>754,10083=>754,10084=>754,
-10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,10091=>754,10092=>754,10093=>754,10094=>754,
-10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,10101=>754,10102=>807,10103=>807,10104=>807,
-10105=>807,10106=>807,10107=>807,10108=>807,10109=>807,10110=>807,10111=>807,10112=>754,10113=>754,10114=>754,
-10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,10121=>754,10122=>754,10123=>754,10124=>754,
-10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,10131=>754,10132=>754,10136=>754,10137=>754,
-10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,10144=>754,10145=>754,10146=>754,10147=>754,
-10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,10154=>754,10155=>754,10156=>754,10157=>754,
-10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,10165=>754,10166=>754,10167=>754,10168=>754,
-10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,10181=>351,10182=>351,10208=>444,10214=>445,
-10215=>445,10216=>351,10217=>351,10218=>500,10219=>500,10224=>754,10225=>754,10226=>754,10227=>754,10228=>1042,
-10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,10237=>1290,10238=>1290,
-10239=>1290,10240=>659,10241=>659,10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,10247=>659,10248=>659,
-10249=>659,10250=>659,10251=>659,10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,10257=>659,10258=>659,
-10259=>659,10260=>659,10261=>659,10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,10267=>659,10268=>659,
-10269=>659,10270=>659,10271=>659,10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,10277=>659,10278=>659,
-10279=>659,10280=>659,10281=>659,10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,10287=>659,10288=>659,
-10289=>659,10290=>659,10291=>659,10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,10297=>659,10298=>659,
-10299=>659,10300=>659,10301=>659,10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,10307=>659,10308=>659,
-10309=>659,10310=>659,10311=>659,10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,10317=>659,10318=>659,
-10319=>659,10320=>659,10321=>659,10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,10327=>659,10328=>659,
-10329=>659,10330=>659,10331=>659,10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,10337=>659,10338=>659,
-10339=>659,10340=>659,10341=>659,10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,10347=>659,10348=>659,
-10349=>659,10350=>659,10351=>659,10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,10357=>659,10358=>659,
-10359=>659,10360=>659,10361=>659,10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,10367=>659,10368=>659,
-10369=>659,10370=>659,10371=>659,10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,10377=>659,10378=>659,
-10379=>659,10380=>659,10381=>659,10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,10387=>659,10388=>659,
-10389=>659,10390=>659,10391=>659,10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,10397=>659,10398=>659,
-10399=>659,10400=>659,10401=>659,10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,10407=>659,10408=>659,
-10409=>659,10410=>659,10411=>659,10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,10417=>659,10418=>659,
-10419=>659,10420=>659,10421=>659,10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,10427=>659,10428=>659,
-10429=>659,10430=>659,10431=>659,10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,10437=>659,10438=>659,
-10439=>659,10440=>659,10441=>659,10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,10447=>659,10448=>659,
-10449=>659,10450=>659,10451=>659,10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,10457=>659,10458=>659,
-10459=>659,10460=>659,10461=>659,10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,10467=>659,10468=>659,
-10469=>659,10470=>659,10471=>659,10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,10477=>659,10478=>659,
-10479=>659,10480=>659,10481=>659,10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,10487=>659,10488=>659,
-10489=>659,10490=>659,10491=>659,10492=>659,10493=>659,10494=>659,10495=>659,10502=>754,10503=>754,10506=>754,
-10507=>754,10560=>615,10561=>615,10627=>660,10628=>660,10702=>754,10703=>900,10704=>900,10705=>900,10706=>900,
-10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,10752=>900,10753=>900,10754=>900,10764=>1192,
-10765=>469,10766=>469,10767=>469,10768=>469,10769=>469,10770=>469,10771=>469,10772=>469,10773=>469,10774=>469,
-10775=>469,10776=>469,10777=>469,10778=>469,10779=>469,10780=>469,10799=>754,10877=>754,10878=>754,10879=>754,
-10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,10886=>754,10887=>754,10888=>754,10889=>754,
-10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,10896=>754,10897=>754,10898=>754,10899=>754,
-10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,10906=>754,10907=>754,10908=>754,10909=>754,
-10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,10929=>754,10930=>754,10931=>754,10932=>754,
-10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,11001=>754,11002=>754,11008=>754,11009=>754,
-11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,11018=>754,11019=>754,
-11020=>754,11021=>754,11022=>752,11023=>752,11024=>752,11025=>752,11026=>850,11027=>850,11028=>850,11029=>850,
-11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,11040=>782,11041=>786,11042=>786,11043=>786,
-11044=>1007,11091=>782,11092=>782,11360=>501,11361=>250,11362=>501,11363=>542,11364=>625,11365=>551,11366=>353,
-11367=>677,11368=>570,11369=>590,11370=>521,11371=>616,11372=>472,11373=>703,11374=>776,11375=>615,11377=>661,
-11378=>1015,11379=>865,11380=>532,11381=>589,11382=>511,11383=>593,11385=>373,11386=>550,11387=>441,11388=>157,
-11389=>387,11568=>582,11569=>799,11570=>799,11571=>614,11572=>615,11573=>571,11574=>505,11575=>615,11576=>615,
-11577=>568,11578=>568,11579=>614,11580=>787,11581=>616,11582=>441,11583=>616,11584=>799,11585=>799,11586=>270,
-11587=>564,11588=>677,11589=>590,11590=>475,11591=>616,11592=>580,11593=>568,11594=>452,11595=>857,11596=>700,
-11597=>673,11598=>558,11599=>265,11600=>700,11601=>265,11602=>677,11603=>569,11604=>799,11605=>799,11606=>677,
-11607=>288,11608=>674,11609=>799,11610=>799,11611=>628,11612=>690,11613=>616,11614=>628,11615=>560,11616=>615,
-11617=>677,11618=>568,11619=>709,11620=>510,11621=>709,11631=>463,11800=>478,11810=>351,11811=>351,11812=>351,
-11813=>351,11822=>478,19904=>807,19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,19910=>807,19911=>807,
-19912=>807,19913=>807,19914=>807,19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,19920=>807,19921=>807,
-19922=>807,19923=>807,19924=>807,19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,19930=>807,19931=>807,
-19932=>807,19933=>807,19934=>807,19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,19940=>807,19941=>807,
-19942=>807,19943=>807,19944=>807,19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,19950=>807,19951=>807,
-19952=>807,19953=>807,19954=>807,19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,19960=>807,19961=>807,
-19962=>807,19963=>807,19964=>807,19965=>807,19966=>807,19967=>807,42564=>571,42565=>469,42566=>318,42567=>304,
-42572=>1062,42573=>925,42576=>926,42577=>815,42580=>971,42581=>757,42582=>879,42583=>758,42594=>956,42595=>820,
-42596=>959,42597=>811,42598=>1060,42599=>907,42600=>708,42601=>550,42602=>770,42603=>641,42604=>1222,42605=>917,
-42606=>791,42634=>704,42635=>616,42636=>549,42637=>524,42644=>617,42645=>570,42760=>444,42761=>444,42762=>444,
-42763=>444,42764=>444,42765=>444,42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,
-42773=>444,42774=>444,42779=>332,42780=>332,42781=>227,42782=>227,42783=>227,42790=>677,42791=>570,42792=>790,
-42793=>638,42794=>553,42795=>486,42800=>441,42801=>469,42802=>1125,42803=>886,42804=>1083,42805=>891,42806=>1028,
-42807=>883,42808=>874,42809=>736,42810=>874,42811=>736,42812=>863,42813=>736,42814=>633,42815=>494,42822=>612,
-42823=>353,42824=>523,42825=>384,42826=>726,42827=>633,42830=>1222,42831=>917,42880=>501,42881=>250,42882=>662,
-42883=>570,42889=>303,42890=>338,42891=>360,42892=>247,43003=>518,43004=>542,43005=>776,43006=>265,43007=>1079,
-61440=>879,61441=>879,63173=>550,64256=>620,64257=>567,64258=>567,64259=>870,64260=>870,64261=>617,64262=>774,
-64275=>1081,64276=>1081,64277=>1076,64278=>1067,64279=>1376,64285=>245,64286=>0,64287=>423,64288=>572,64289=>770,
-64290=>696,64291=>815,64292=>694,64293=>759,64294=>769,64295=>726,64296=>788,64297=>754,64298=>727,64299=>727,
-64300=>727,64301=>727,64302=>566,64303=>566,64304=>566,64305=>547,64306=>403,64307=>534,64308=>576,64309=>245,
-64310=>336,64312=>583,64313=>302,64314=>532,64315=>500,64316=>539,64318=>593,64320=>397,64321=>629,64323=>576,
-64324=>543,64326=>523,64327=>596,64328=>532,64329=>727,64330=>591,64331=>245,64332=>547,64333=>500,64334=>543,
-64335=>566,64338=>847,64339=>883,64340=>250,64341=>271,64342=>847,64343=>883,64344=>250,64345=>271,64346=>847,
-64347=>883,64348=>250,64349=>271,64350=>847,64351=>883,64352=>250,64353=>271,64354=>847,64355=>883,64356=>250,
-64357=>271,64358=>847,64359=>883,64360=>250,64361=>271,64362=>933,64363=>932,64364=>430,64365=>455,64366=>933,
-64367=>932,64368=>430,64369=>455,64370=>581,64371=>581,64372=>556,64373=>581,64374=>581,64375=>581,64376=>556,
-64377=>581,64378=>581,64379=>581,64380=>556,64381=>581,64382=>581,64383=>581,64384=>556,64385=>581,64394=>435,
-64395=>497,64396=>435,64397=>497,64398=>805,64399=>805,64400=>428,64401=>497,64402=>805,64403=>805,64404=>428,
-64405=>497,64414=>661,64415=>685,64473=>435,64474=>465,64488=>250,64489=>271,64508=>704,64509=>750,64510=>250,
-64511=>271,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,
-65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>264,65137=>264,65138=>264,65139=>235,65140=>264,65142=>264,65143=>264,65144=>264,65145=>264,
-65146=>264,65147=>264,65148=>264,65149=>264,65150=>264,65151=>264,65152=>423,65153=>250,65154=>274,65155=>250,
-65156=>274,65157=>435,65158=>465,65159=>250,65160=>274,65161=>704,65162=>750,65163=>250,65164=>271,65165=>250,
-65166=>274,65167=>847,65168=>883,65169=>250,65170=>271,65171=>471,65172=>482,65173=>847,65174=>883,65175=>250,
-65176=>271,65177=>847,65178=>883,65179=>250,65180=>271,65181=>581,65182=>581,65183=>556,65184=>581,65185=>581,
-65186=>581,65187=>556,65188=>581,65189=>581,65190=>581,65191=>556,65192=>581,65193=>400,65194=>472,65195=>400,
-65196=>472,65197=>435,65198=>497,65199=>435,65200=>497,65201=>1099,65202=>1147,65203=>754,65204=>803,65205=>1099,
-65206=>1147,65207=>754,65208=>803,65209=>1088,65210=>1103,65211=>764,65212=>780,65213=>1088,65214=>1103,65215=>764,
-65216=>780,65217=>832,65218=>854,65219=>716,65220=>738,65221=>832,65222=>854,65223=>716,65224=>738,65225=>537,
-65226=>479,65227=>537,65228=>434,65229=>537,65230=>479,65231=>470,65232=>434,65233=>933,65234=>932,65235=>430,
-65236=>455,65237=>698,65238=>750,65239=>430,65240=>455,65241=>742,65242=>758,65243=>428,65244=>497,65245=>654,
-65246=>681,65247=>274,65248=>298,65249=>557,65250=>599,65251=>482,65252=>520,65253=>661,65254=>685,65255=>250,
-65256=>271,65257=>471,65258=>482,65259=>475,65260=>415,65261=>435,65262=>465,65263=>704,65264=>750,65265=>704,
-65266=>750,65267=>250,65268=>271,65269=>513,65270=>537,65271=>513,65272=>537,65273=>513,65274=>537,65275=>513,
-65276=>537,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>923);
-$enc='';
-$diff='';
-$file='dejavusanscondensed.z';
-$ctg='dejavusanscondensed.ctg.z';
-$originalsize=544636;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedb.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedb.php
deleted file mode 100644
index f53d0a6b626..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedb.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed-Bold';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>17,'Flags'=>32,'FontBBox'=>'[-962 -385 1777 1174]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>410,34=>469,35=>754,36=>626,37=>901,38=>785,39=>275,40=>411,
-41=>411,42=>470,43=>754,44=>342,45=>374,46=>342,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>360,59=>360,60=>754,
-61=>754,62=>754,63=>522,64=>900,65=>696,66=>686,67=>660,68=>747,69=>615,70=>615,
-71=>738,72=>753,73=>334,74=>334,75=>697,76=>573,77=>896,78=>753,79=>765,80=>659,
-81=>765,82=>693,83=>648,84=>614,85=>730,86=>696,87=>993,88=>694,89=>651,90=>652,
-91=>411,92=>329,93=>411,94=>754,95=>450,96=>450,97=>607,98=>644,99=>533,100=>644,
-101=>610,102=>391,103=>644,104=>641,105=>308,106=>308,107=>598,108=>308,109=>938,110=>641,
-111=>618,112=>644,113=>644,114=>444,115=>536,116=>430,117=>641,118=>586,119=>831,120=>580,
-121=>586,122=>523,123=>641,124=>329,125=>641,126=>754,8364=>626,8218=>342,402=>391,8222=>591,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1296,352=>648,8249=>371,338=>1050,381=>652,8216=>342,
-8217=>342,8220=>591,8221=>591,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>536,8250=>371,
-339=>984,382=>523,376=>651,160=>313,161=>410,162=>626,163=>626,164=>572,165=>626,166=>329,
-167=>450,168=>450,169=>900,170=>507,171=>581,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>662,182=>572,183=>342,184=>450,185=>394,186=>507,
-187=>581,188=>932,189=>932,190=>932,191=>522,192=>696,193=>696,194=>696,195=>696,196=>696,
-197=>696,198=>976,199=>660,200=>615,201=>615,202=>615,203=>615,204=>334,205=>334,206=>334,
-207=>334,208=>754,209=>753,210=>765,211=>765,212=>765,213=>765,214=>765,215=>754,216=>765,
-217=>730,218=>730,219=>730,220=>730,221=>651,222=>664,223=>647,224=>607,225=>607,226=>607,
-227=>607,228=>607,229=>607,230=>943,231=>533,232=>610,233=>610,234=>610,235=>610,236=>308,
-237=>308,238=>308,239=>308,240=>618,241=>641,242=>618,243=>618,244=>618,245=>618,246=>618,
-247=>754,248=>618,249=>641,250=>641,251=>641,252=>641,253=>586,254=>644,255=>586,256=>696,
-257=>607,258=>696,259=>607,260=>696,261=>607,262=>660,263=>533,264=>660,265=>533,266=>660,
-267=>533,268=>660,269=>533,270=>747,271=>644,272=>754,273=>644,274=>615,275=>610,276=>615,
-277=>610,278=>615,279=>610,280=>615,281=>610,282=>615,283=>610,284=>738,285=>644,286=>738,
-287=>644,288=>738,289=>644,290=>738,291=>644,292=>753,293=>641,294=>876,295=>711,296=>334,
-297=>308,298=>334,299=>308,300=>334,301=>308,302=>334,303=>308,304=>334,305=>308,306=>669,
-307=>617,308=>334,309=>308,310=>697,311=>598,312=>598,313=>573,314=>308,315=>573,316=>308,
-317=>573,318=>431,319=>573,320=>501,321=>578,322=>334,323=>753,324=>641,325=>753,326=>641,
-327=>753,328=>641,329=>884,330=>753,331=>641,332=>765,333=>618,334=>765,335=>618,336=>765,
-337=>618,340=>693,341=>444,342=>693,343=>444,344=>693,345=>444,346=>648,347=>536,348=>648,
-349=>536,350=>648,351=>536,354=>614,355=>430,356=>614,357=>430,358=>614,359=>430,360=>730,
-361=>641,362=>730,363=>641,364=>730,365=>641,366=>730,367=>641,368=>730,369=>641,370=>730,
-371=>641,372=>993,373=>831,374=>651,375=>586,377=>652,378=>523,379=>652,380=>523,383=>391,
-384=>644,385=>729,386=>686,387=>644,388=>686,389=>644,390=>660,391=>660,392=>533,393=>754,
-394=>791,395=>681,396=>644,397=>619,398=>615,399=>764,400=>626,401=>615,403=>738,404=>713,
-405=>940,406=>392,407=>350,408=>697,409=>598,410=>324,411=>532,412=>938,413=>753,414=>641,
-415=>765,416=>786,417=>618,418=>974,419=>821,420=>703,421=>644,422=>693,423=>648,424=>536,
-425=>615,426=>497,427=>430,428=>636,429=>430,430=>614,431=>751,432=>641,433=>765,434=>732,
-435=>717,436=>700,437=>652,438=>523,439=>695,440=>695,441=>576,442=>523,443=>626,444=>695,
-445=>576,446=>515,447=>644,448=>334,449=>593,450=>489,451=>334,452=>1399,453=>1271,454=>1168,
-455=>908,456=>882,457=>617,458=>1088,459=>1062,460=>949,461=>696,462=>607,463=>334,464=>308,
-465=>765,466=>618,467=>730,468=>641,469=>730,470=>641,471=>730,472=>641,473=>730,474=>641,
-475=>730,476=>641,477=>610,478=>696,479=>607,480=>696,481=>607,482=>976,483=>943,484=>738,
-485=>644,486=>738,487=>644,488=>697,489=>598,490=>765,491=>618,492=>765,493=>618,494=>695,
-495=>523,496=>308,497=>1399,498=>1271,499=>1168,500=>738,501=>644,502=>1160,503=>708,504=>753,
-505=>641,506=>696,507=>607,508=>976,509=>943,510=>765,511=>618,512=>696,513=>607,514=>696,
-515=>607,516=>615,517=>610,518=>615,519=>610,520=>334,521=>308,522=>334,523=>308,524=>765,
-525=>618,526=>765,527=>618,528=>693,529=>444,530=>693,531=>444,532=>730,533=>641,534=>730,
-535=>641,536=>648,537=>536,538=>614,539=>430,540=>621,541=>546,542=>753,543=>641,544=>753,
-545=>778,546=>728,547=>593,548=>652,549=>523,550=>696,551=>607,552=>615,553=>610,554=>765,
-555=>618,556=>765,557=>618,558=>765,559=>618,560=>765,561=>618,562=>651,563=>586,564=>442,
-565=>780,566=>460,567=>308,568=>979,569=>979,570=>696,571=>660,572=>533,573=>573,574=>614,
-575=>536,576=>523,577=>703,578=>553,579=>686,580=>730,581=>696,582=>615,583=>610,584=>334,
-585=>308,586=>774,587=>712,588=>693,589=>444,590=>651,591=>586,592=>607,593=>644,594=>644,
-595=>644,596=>533,597=>533,598=>645,599=>712,600=>610,601=>610,602=>788,603=>501,604=>490,
-605=>733,606=>658,607=>308,608=>712,609=>644,610=>564,611=>579,612=>571,613=>641,614=>641,
-615=>641,616=>491,617=>396,618=>491,619=>502,620=>624,621=>308,622=>757,623=>938,624=>938,
-625=>938,626=>641,627=>713,628=>636,629=>618,630=>817,631=>613,632=>716,633=>484,634=>484,
-635=>584,636=>444,637=>444,638=>536,639=>536,640=>578,641=>578,642=>536,643=>374,644=>391,
-645=>544,646=>497,647=>430,648=>430,649=>828,650=>695,651=>603,652=>586,653=>831,654=>586,
-655=>651,656=>624,657=>615,658=>576,659=>576,660=>515,661=>515,662=>515,663=>515,664=>765,
-665=>569,666=>658,667=>616,668=>622,669=>308,670=>659,671=>485,672=>712,673=>515,674=>515,
-675=>1040,676=>1093,677=>1039,678=>876,679=>691,680=>836,681=>923,682=>712,683=>702,684=>532,
-685=>374,686=>609,687=>710,688=>410,689=>410,690=>197,691=>284,692=>284,693=>284,694=>369,
-695=>532,696=>375,697=>271,698=>469,699=>342,700=>342,701=>342,702=>330,703=>330,704=>293,
-705=>293,706=>450,707=>450,708=>450,709=>450,711=>450,712=>275,713=>450,714=>450,715=>450,
-716=>275,717=>450,718=>450,719=>450,720=>303,721=>303,722=>330,723=>330,724=>450,725=>450,
-726=>374,727=>295,728=>450,729=>450,730=>450,731=>450,733=>450,734=>315,735=>450,736=>370,
-737=>197,738=>343,739=>371,740=>293,741=>450,742=>450,743=>450,744=>450,745=>450,748=>450,
-749=>450,750=>591,755=>450,759=>450,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>628,881=>508,882=>919,
-883=>752,884=>271,885=>271,886=>753,887=>630,890=>450,891=>533,892=>495,893=>494,894=>360,
-900=>397,901=>450,902=>717,903=>342,904=>761,905=>908,906=>507,908=>801,910=>882,911=>804,
-912=>351,913=>696,914=>686,915=>573,916=>696,917=>615,918=>652,919=>753,920=>765,921=>334,
-922=>697,923=>696,924=>896,925=>753,926=>568,927=>765,928=>753,929=>659,931=>615,932=>614,
-933=>651,934=>765,935=>694,936=>765,937=>765,938=>334,939=>651,940=>618,941=>501,942=>641,
-943=>351,944=>607,945=>618,946=>644,947=>613,948=>618,949=>501,950=>532,951=>641,952=>618,
-953=>351,954=>639,955=>569,956=>662,957=>613,958=>532,959=>618,960=>712,961=>644,962=>533,
-963=>701,964=>574,965=>607,966=>704,967=>580,968=>714,969=>782,970=>351,971=>607,972=>618,
-973=>607,974=>782,975=>697,976=>585,977=>594,978=>671,979=>883,980=>671,981=>716,982=>782,
-983=>669,984=>765,985=>618,986=>660,987=>533,988=>615,989=>444,990=>632,991=>593,992=>827,
-993=>564,994=>983,995=>753,996=>749,997=>644,998=>835,999=>669,1000=>660,1001=>585,1002=>709,
-1003=>604,1004=>677,1005=>644,1006=>614,1007=>531,1008=>669,1009=>644,1010=>533,1011=>308,1012=>765,
-1013=>580,1014=>580,1015=>664,1016=>644,1017=>660,1018=>896,1019=>659,1020=>644,1021=>628,1022=>660,
-1023=>628,1024=>615,1025=>615,1026=>791,1027=>573,1028=>660,1029=>648,1030=>334,1031=>334,1032=>334,
-1033=>1039,1034=>1017,1035=>791,1036=>735,1037=>753,1038=>694,1039=>753,1040=>696,1041=>686,1042=>686,
-1043=>573,1044=>801,1045=>615,1046=>1102,1047=>639,1048=>753,1049=>753,1050=>735,1051=>747,1052=>896,
-1053=>753,1054=>765,1055=>753,1056=>659,1057=>660,1058=>614,1059=>694,1060=>892,1061=>694,1062=>835,
-1063=>727,1064=>1112,1065=>1193,1066=>845,1067=>932,1068=>686,1069=>660,1070=>1056,1071=>693,1072=>607,
-1073=>628,1074=>569,1075=>470,1076=>727,1077=>610,1078=>896,1079=>523,1080=>630,1081=>630,1082=>611,
-1083=>659,1084=>735,1085=>622,1086=>618,1087=>622,1088=>644,1089=>533,1090=>521,1091=>586,1092=>893,
-1093=>580,1094=>667,1095=>618,1096=>956,1097=>995,1098=>676,1099=>813,1100=>569,1101=>533,1102=>875,
-1103=>578,1104=>610,1105=>610,1106=>642,1107=>470,1108=>533,1109=>536,1110=>308,1111=>308,1112=>308,
-1113=>892,1114=>860,1115=>661,1116=>611,1117=>630,1118=>586,1119=>622,1120=>983,1121=>782,1122=>756,
-1123=>662,1124=>911,1125=>755,1126=>893,1127=>749,1128=>1222,1129=>1009,1130=>765,1131=>618,1132=>1112,
-1133=>906,1134=>626,1135=>501,1136=>967,1137=>955,1138=>765,1139=>618,1140=>765,1141=>625,1142=>765,
-1143=>625,1144=>1033,1145=>939,1146=>967,1147=>776,1148=>1265,1149=>1055,1150=>983,1151=>782,1152=>660,
-1153=>533,1154=>587,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>861,
-1163=>726,1164=>686,1165=>550,1166=>659,1167=>644,1168=>573,1169=>470,1170=>599,1171=>488,1172=>727,
-1173=>602,1174=>1102,1175=>896,1176=>639,1177=>523,1178=>697,1179=>611,1180=>735,1181=>611,1182=>735,
-1183=>611,1184=>914,1185=>743,1186=>860,1187=>727,1188=>992,1189=>787,1190=>1146,1191=>915,1192=>856,
-1193=>772,1194=>660,1195=>533,1196=>614,1197=>521,1198=>651,1199=>586,1200=>651,1201=>586,1202=>694,
-1203=>580,1204=>1001,1205=>900,1206=>727,1207=>618,1208=>727,1209=>618,1210=>727,1211=>641,1212=>923,
-1213=>729,1214=>923,1215=>729,1216=>334,1217=>1102,1218=>896,1219=>697,1220=>567,1221=>855,1222=>725,
-1223=>753,1224=>622,1225=>861,1226=>726,1227=>727,1228=>618,1229=>1003,1230=>839,1231=>308,1232=>696,
-1233=>607,1234=>696,1235=>607,1236=>976,1237=>943,1238=>615,1239=>610,1240=>764,1241=>610,1242=>764,
-1243=>610,1244=>1102,1245=>896,1246=>639,1247=>523,1248=>695,1249=>576,1250=>753,1251=>630,1252=>753,
-1253=>630,1254=>765,1255=>618,1256=>765,1257=>618,1258=>765,1259=>618,1260=>660,1261=>533,1262=>694,
-1263=>586,1264=>694,1265=>586,1266=>694,1267=>586,1268=>727,1269=>618,1270=>573,1271=>470,1272=>932,
-1273=>813,1274=>599,1275=>488,1276=>694,1277=>580,1278=>694,1279=>580,1280=>686,1281=>547,1282=>1043,
-1283=>804,1284=>1007,1285=>828,1286=>745,1287=>624,1288=>1117,1289=>915,1290=>1160,1291=>912,1292=>755,
-1293=>574,1294=>844,1295=>722,1296=>626,1297=>501,1298=>747,1299=>659,1300=>1157,1301=>961,1302=>958,
-1303=>881,1304=>973,1305=>912,1306=>765,1307=>644,1308=>993,1309=>831,1312=>1140,1313=>953,1314=>1146,
-1315=>915,1316=>861,1317=>726,1329=>886,1330=>730,1331=>886,1332=>886,1333=>730,1334=>699,1335=>730,
-1336=>730,1337=>877,1338=>886,1339=>730,1340=>639,1341=>970,1342=>1022,1343=>730,1344=>639,1345=>681,
-1346=>886,1347=>789,1348=>886,1349=>714,1350=>886,1351=>730,1352=>730,1353=>730,1354=>862,1355=>699,
-1356=>886,1357=>730,1358=>886,1359=>648,1360=>730,1361=>714,1362=>805,1363=>765,1364=>842,1365=>765,
-1366=>648,1369=>330,1370=>342,1371=>495,1372=>495,1373=>342,1374=>491,1375=>468,1377=>938,1378=>641,
-1379=>779,1380=>781,1381=>641,1382=>735,1383=>588,1384=>641,1385=>729,1386=>735,1387=>641,1388=>448,
-1389=>916,1390=>644,1391=>641,1392=>641,1393=>644,1394=>737,1395=>641,1396=>676,1397=>308,1398=>794,
-1399=>502,1400=>641,1401=>502,1402=>938,1403=>502,1404=>777,1405=>641,1406=>732,1407=>938,1408=>641,
-1409=>644,1410=>514,1411=>938,1412=>700,1413=>618,1414=>648,1415=>776,1417=>360,1418=>438,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>374,1471=>0,1472=>334,1473=>0,1474=>0,1475=>334,1478=>447,
-1479=>0,1488=>676,1489=>605,1490=>483,1491=>589,1492=>641,1493=>308,1494=>442,1495=>641,1496=>651,
-1497=>308,1498=>584,1499=>584,1500=>611,1501=>641,1502=>698,1503=>308,1504=>447,1505=>696,1506=>610,
-1507=>646,1508=>618,1509=>565,1510=>676,1511=>656,1512=>584,1513=>854,1514=>676,1520=>598,1521=>598,
-1522=>597,1523=>399,1524=>639,1542=>600,1543=>600,1545=>795,1546=>1042,1548=>342,1557=>0,1563=>360,
-1567=>522,1569=>460,1570=>308,1571=>308,1572=>559,1573=>308,1574=>825,1575=>308,1576=>904,1577=>531,
-1578=>904,1579=>904,1580=>648,1581=>648,1582=>648,1583=>461,1584=>461,1585=>518,1586=>518,1587=>1242,
-1588=>1242,1589=>1210,1590=>1210,1591=>935,1592=>935,1593=>615,1594=>615,1600=>308,1601=>1045,1602=>804,
-1603=>825,1604=>781,1605=>659,1606=>768,1607=>531,1608=>559,1609=>825,1610=>825,1611=>0,1612=>0,
-1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1619=>0,1620=>0,1621=>0,1626=>450,
-1632=>549,1633=>549,1634=>549,1635=>549,1636=>549,1637=>549,1638=>549,1639=>549,1640=>549,1641=>549,
-1642=>549,1643=>336,1644=>342,1645=>490,1646=>904,1647=>804,1652=>263,1657=>904,1658=>904,1659=>904,
-1660=>904,1661=>904,1662=>904,1663=>904,1664=>904,1665=>648,1666=>648,1667=>648,1668=>648,1669=>648,
-1670=>648,1671=>648,1681=>518,1682=>518,1685=>613,1688=>518,1697=>1045,1700=>1045,1702=>1045,1705=>921,
-1711=>921,1717=>781,1722=>768,1727=>648,1734=>559,1740=>825,1742=>825,1749=>531,1776=>549,1777=>549,
-1778=>549,1779=>549,1780=>549,1781=>549,1782=>549,1783=>549,1784=>549,1785=>549,1984=>626,1985=>626,
-1986=>626,1987=>626,1988=>626,1989=>626,1990=>626,1991=>626,1992=>626,1993=>626,1994=>308,1995=>492,
-1996=>489,1997=>586,1998=>622,1999=>622,2000=>534,2001=>622,2002=>813,2003=>496,2004=>496,2005=>564,
-2006=>619,2007=>399,2008=>920,2009=>456,2010=>743,2011=>622,2012=>586,2013=>821,2014=>564,2015=>636,
-2016=>456,2017=>586,2018=>517,2019=>564,2020=>564,2021=>564,2022=>517,2023=>517,2027=>0,2028=>0,
-2029=>0,2030=>0,2031=>0,2032=>0,2033=>0,2034=>0,2035=>0,2036=>342,2037=>342,2040=>622,
-2041=>622,2042=>374,3647=>668,3713=>710,3714=>673,3716=>674,3719=>512,3720=>668,3722=>669,3725=>685,
-3732=>635,3733=>633,3734=>672,3735=>737,3737=>657,3738=>654,3739=>654,3740=>830,3741=>744,3742=>779,
-3743=>779,3745=>752,3746=>685,3747=>692,3749=>691,3751=>642,3754=>744,3755=>928,3757=>651,3758=>705,
-3759=>840,3760=>620,3761=>0,3762=>549,3763=>549,3764=>0,3765=>0,3766=>0,3767=>0,3768=>0,
-3769=>0,3771=>0,3772=>0,3773=>603,3776=>464,3777=>774,3778=>464,3779=>584,3780=>569,3782=>683,
-3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>694,3793=>694,3794=>624,3795=>752,
-3796=>655,3797=>655,3798=>764,3799=>710,3800=>683,3801=>818,3804=>1227,3805=>1227,4256=>826,4257=>669,
-4258=>665,4259=>753,4260=>584,4261=>696,4262=>771,4263=>800,4264=>477,4265=>570,4266=>771,4267=>810,
-4268=>579,4269=>813,4270=>732,4271=>677,4272=>782,4273=>579,4274=>579,4275=>797,4276=>797,4277=>660,
-4278=>587,4279=>579,4280=>582,4281=>579,4282=>710,4283=>812,4284=>570,4285=>557,4286=>579,4287=>700,
-4288=>802,4289=>541,4290=>668,4291=>554,4292=>570,4293=>668,4304=>497,4305=>497,4306=>536,4307=>734,
-4308=>505,4309=>506,4310=>497,4311=>744,4312=>497,4313=>488,4314=>967,4315=>506,4316=>507,4317=>730,
-4318=>497,4319=>532,4320=>740,4321=>506,4322=>621,4323=>525,4324=>732,4325=>505,4326=>731,4327=>506,
-4328=>506,4329=>507,4330=>568,4331=>506,4332=>506,4333=>497,4334=>506,4335=>506,4336=>501,4337=>543,
-4338=>497,4339=>497,4340=>497,4341=>544,4342=>767,4343=>571,4344=>506,4345=>536,4346=>487,4347=>615,
-4348=>331,5121=>696,5122=>696,5123=>696,5124=>696,5125=>814,5126=>814,5127=>814,5129=>814,5130=>814,
-5131=>814,5132=>916,5133=>908,5134=>916,5135=>908,5136=>916,5137=>908,5138=>1034,5139=>1025,5140=>1034,
-5141=>1025,5142=>814,5143=>1034,5144=>1028,5145=>1034,5146=>1028,5147=>814,5149=>278,5150=>476,5151=>382,
-5152=>382,5153=>355,5154=>355,5155=>355,5156=>355,5157=>507,5158=>423,5159=>278,5160=>355,5161=>355,
-5162=>355,5163=>1092,5164=>888,5165=>1094,5166=>1167,5167=>696,5168=>696,5169=>696,5170=>696,5171=>797,
-5172=>797,5173=>797,5175=>797,5176=>797,5177=>797,5178=>916,5179=>908,5180=>916,5181=>908,5182=>916,
-5183=>908,5184=>1034,5185=>1025,5186=>1034,5187=>1025,5188=>1034,5189=>1028,5190=>1034,5191=>1028,5192=>797,
-5193=>518,5194=>206,5196=>730,5197=>730,5198=>730,5199=>730,5200=>734,5201=>734,5202=>734,5204=>734,
-5205=>734,5206=>734,5207=>950,5208=>943,5209=>950,5210=>943,5211=>950,5212=>943,5213=>954,5214=>949,
-5215=>954,5216=>949,5217=>954,5218=>946,5219=>954,5220=>946,5221=>954,5222=>435,5223=>904,5224=>904,
-5225=>921,5226=>915,5227=>668,5228=>668,5229=>668,5230=>668,5231=>668,5232=>668,5233=>668,5234=>668,
-5235=>668,5236=>926,5237=>877,5238=>882,5239=>877,5240=>882,5241=>877,5242=>926,5243=>877,5244=>926,
-5245=>877,5246=>882,5247=>877,5248=>882,5249=>877,5250=>882,5251=>451,5252=>451,5253=>844,5254=>844,
-5255=>844,5256=>844,5257=>668,5258=>668,5259=>668,5260=>668,5261=>668,5262=>668,5263=>668,5264=>668,
-5265=>668,5266=>926,5267=>877,5268=>926,5269=>877,5270=>926,5271=>877,5272=>926,5273=>877,5274=>926,
-5275=>877,5276=>926,5277=>877,5278=>926,5279=>877,5280=>926,5281=>451,5282=>451,5283=>563,5284=>563,
-5285=>563,5286=>563,5287=>563,5288=>563,5289=>563,5290=>563,5291=>563,5292=>793,5293=>769,5294=>777,
-5295=>786,5296=>777,5297=>786,5298=>793,5299=>786,5300=>793,5301=>786,5302=>777,5303=>786,5304=>777,
-5305=>786,5306=>777,5307=>392,5308=>493,5309=>392,5312=>889,5313=>889,5314=>889,5315=>889,5316=>838,
-5317=>838,5318=>838,5319=>838,5320=>838,5321=>1114,5322=>1122,5323=>1080,5324=>1105,5325=>1080,5326=>1105,
-5327=>838,5328=>593,5329=>447,5330=>593,5331=>889,5332=>889,5333=>889,5334=>889,5335=>838,5336=>838,
-5337=>838,5338=>838,5339=>838,5340=>1107,5341=>1122,5342=>1155,5343=>1105,5344=>1155,5345=>1105,5346=>1105,
-5347=>1093,5348=>1105,5349=>1093,5350=>1155,5351=>1105,5352=>1155,5353=>1105,5354=>593,5356=>797,5357=>657,
-5358=>657,5359=>657,5360=>657,5361=>657,5362=>657,5363=>657,5364=>657,5365=>657,5366=>897,5367=>862,
-5368=>870,5369=>890,5370=>870,5371=>890,5372=>897,5373=>862,5374=>897,5375=>862,5376=>870,5377=>890,
-5378=>870,5379=>890,5380=>870,5381=>443,5382=>414,5383=>443,5392=>831,5393=>831,5394=>831,5395=>1022,
-5396=>1022,5397=>1022,5398=>1022,5399=>1088,5400=>1081,5401=>1088,5402=>1081,5403=>1088,5404=>1081,5405=>1288,
-5406=>1278,5407=>1288,5408=>1278,5409=>1288,5410=>1278,5411=>1288,5412=>1278,5413=>671,5414=>698,5415=>698,
-5416=>698,5417=>698,5418=>698,5419=>698,5420=>698,5421=>698,5422=>698,5423=>902,5424=>903,5425=>911,
-5426=>896,5427=>911,5428=>896,5429=>902,5430=>903,5431=>902,5432=>903,5433=>911,5434=>896,5435=>911,
-5436=>896,5437=>911,5438=>445,5440=>355,5441=>458,5442=>929,5443=>929,5444=>878,5445=>878,5446=>878,
-5447=>878,5448=>659,5449=>659,5450=>659,5451=>659,5452=>659,5453=>659,5454=>902,5455=>863,5456=>445,
-5458=>797,5459=>696,5460=>696,5461=>696,5462=>696,5463=>835,5464=>835,5465=>835,5466=>835,5467=>1055,
-5468=>1028,5469=>542,5470=>730,5471=>730,5472=>730,5473=>730,5474=>730,5475=>730,5476=>734,5477=>734,
-5478=>734,5479=>734,5480=>954,5481=>946,5482=>493,5492=>879,5493=>879,5494=>879,5495=>879,5496=>879,
-5497=>879,5498=>879,5499=>556,5500=>753,5501=>458,5502=>1114,5503=>1114,5504=>1114,5505=>1114,5506=>1114,
-5507=>1114,5508=>1114,5509=>890,5514=>879,5515=>879,5516=>879,5517=>879,5518=>1432,5519=>1432,5520=>1432,
-5521=>1165,5522=>1165,5523=>1432,5524=>1432,5525=>763,5526=>1146,5536=>889,5537=>889,5538=>838,5539=>838,
-5540=>838,5541=>838,5542=>593,5543=>698,5544=>698,5545=>698,5546=>698,5547=>698,5548=>698,5549=>698,
-5550=>445,5551=>668,5598=>747,5601=>747,5702=>446,5703=>446,5742=>371,5743=>1114,5744=>1432,5745=>1814,
-5746=>1814,5747=>1548,5748=>1510,5749=>1814,5750=>1814,5760=>489,5761=>573,5762=>851,5763=>1128,5764=>1406,
-5765=>1684,5766=>564,5767=>842,5768=>1128,5769=>1403,5770=>1684,5771=>512,5772=>789,5773=>1068,5774=>1347,
-5775=>1626,5776=>573,5777=>851,5778=>1116,5779=>1399,5780=>1684,5781=>512,5782=>512,5783=>709,5784=>1110,
-5785=>1403,5786=>666,5787=>574,5788=>574,7424=>586,7425=>750,7426=>943,7427=>547,7428=>533,7429=>608,
-7430=>608,7431=>502,7432=>501,7433=>308,7434=>444,7435=>598,7436=>485,7437=>735,7438=>630,7439=>618,
-7440=>533,7441=>594,7442=>594,7443=>594,7444=>984,7446=>618,7447=>618,7448=>500,7449=>578,7450=>578,
-7451=>521,7452=>571,7453=>663,7454=>853,7455=>625,7456=>586,7457=>831,7458=>523,7459=>581,7462=>485,
-7463=>586,7464=>622,7465=>500,7466=>703,7467=>659,7468=>438,7469=>615,7470=>432,7472=>470,7473=>387,
-7474=>387,7475=>465,7476=>474,7477=>211,7478=>211,7479=>439,7480=>361,7481=>563,7482=>474,7483=>474,
-7484=>481,7485=>458,7486=>415,7487=>436,7488=>387,7489=>460,7490=>625,7491=>412,7492=>412,7493=>431,
-7494=>641,7495=>431,7496=>431,7497=>431,7498=>431,7499=>347,7500=>347,7501=>431,7502=>197,7503=>438,
-7504=>597,7505=>410,7506=>439,7507=>372,7508=>439,7509=>439,7510=>431,7511=>349,7512=>410,7513=>416,
-7514=>597,7515=>451,7517=>405,7518=>386,7519=>389,7520=>443,7521=>365,7522=>197,7523=>284,7524=>410,
-7525=>451,7526=>405,7527=>386,7528=>405,7529=>443,7530=>365,7543=>644,7544=>474,7547=>491,7557=>462,
-7579=>431,7580=>372,7581=>372,7582=>439,7583=>347,7584=>339,7585=>313,7586=>431,7587=>410,7588=>312,
-7589=>253,7590=>312,7591=>312,7592=>388,7593=>293,7594=>296,7595=>333,7596=>598,7597=>597,7598=>505,
-7599=>505,7600=>403,7601=>439,7602=>488,7603=>379,7604=>356,7605=>349,7606=>524,7607=>444,7608=>359,
-7609=>405,7610=>451,7611=>375,7612=>471,7613=>422,7614=>409,7615=>382,7620=>0,7621=>0,7622=>0,
-7623=>0,7624=>0,7625=>0,7680=>696,7681=>607,7682=>686,7683=>644,7684=>686,7685=>644,7686=>686,
-7687=>644,7688=>660,7689=>533,7690=>747,7691=>644,7692=>747,7693=>644,7694=>747,7695=>644,7696=>747,
-7697=>644,7698=>747,7699=>644,7700=>615,7701=>610,7702=>615,7703=>610,7704=>615,7705=>610,7706=>615,
-7707=>610,7708=>615,7709=>610,7710=>615,7711=>391,7712=>738,7713=>644,7714=>753,7715=>641,7716=>753,
-7717=>641,7718=>753,7719=>641,7720=>753,7721=>641,7722=>753,7723=>641,7724=>334,7725=>308,7726=>334,
-7727=>308,7728=>697,7729=>598,7730=>697,7731=>598,7732=>697,7733=>598,7734=>573,7735=>308,7736=>573,
-7737=>308,7738=>573,7739=>308,7740=>573,7741=>308,7742=>896,7743=>938,7744=>896,7745=>938,7746=>896,
-7747=>938,7748=>753,7749=>641,7750=>753,7751=>641,7752=>753,7753=>641,7754=>753,7755=>641,7756=>765,
-7757=>618,7758=>765,7759=>618,7760=>765,7761=>618,7762=>765,7763=>618,7764=>659,7765=>644,7766=>659,
-7767=>644,7768=>693,7769=>444,7770=>693,7771=>444,7772=>693,7773=>444,7774=>693,7775=>444,7776=>648,
-7777=>536,7778=>648,7779=>536,7780=>648,7781=>536,7782=>648,7783=>536,7784=>648,7785=>536,7786=>614,
-7787=>430,7788=>614,7789=>430,7790=>614,7791=>430,7792=>614,7793=>430,7794=>730,7795=>641,7796=>730,
-7797=>641,7798=>730,7799=>641,7800=>730,7801=>641,7802=>730,7803=>641,7804=>696,7805=>586,7806=>696,
-7807=>586,7808=>993,7809=>831,7810=>993,7811=>831,7812=>993,7813=>831,7814=>993,7815=>831,7816=>993,
-7817=>831,7818=>694,7819=>580,7820=>694,7821=>580,7822=>651,7823=>586,7824=>652,7825=>523,7826=>652,
-7827=>523,7828=>652,7829=>523,7830=>641,7831=>430,7832=>831,7833=>586,7834=>607,7835=>391,7838=>806,
-7839=>618,7840=>696,7841=>607,7842=>696,7843=>607,7844=>696,7845=>607,7846=>696,7847=>607,7848=>696,
-7849=>607,7850=>696,7851=>607,7852=>696,7853=>607,7854=>696,7855=>607,7856=>696,7857=>607,7858=>696,
-7859=>607,7860=>696,7861=>607,7862=>696,7863=>607,7864=>615,7865=>610,7866=>615,7867=>610,7868=>615,
-7869=>610,7870=>615,7871=>610,7872=>615,7873=>610,7874=>615,7875=>610,7876=>615,7877=>610,7878=>615,
-7879=>610,7880=>334,7881=>308,7882=>334,7883=>308,7884=>765,7885=>618,7886=>765,7887=>618,7888=>765,
-7889=>618,7890=>765,7891=>618,7892=>765,7893=>618,7894=>765,7895=>618,7896=>765,7897=>618,7898=>786,
-7899=>618,7900=>786,7901=>618,7902=>786,7903=>618,7904=>786,7905=>618,7906=>786,7907=>618,7908=>730,
-7909=>641,7910=>730,7911=>641,7912=>751,7913=>641,7914=>751,7915=>641,7916=>751,7917=>641,7918=>751,
-7919=>641,7920=>751,7921=>641,7922=>651,7923=>586,7924=>651,7925=>586,7926=>651,7927=>586,7928=>651,
-7929=>586,7936=>618,7937=>618,7938=>618,7939=>618,7940=>618,7941=>618,7942=>618,7943=>618,7944=>696,
-7945=>696,7946=>937,7947=>939,7948=>841,7949=>866,7950=>751,7951=>773,7952=>501,7953=>501,7954=>501,
-7955=>501,7956=>501,7957=>501,7960=>712,7961=>715,7962=>989,7963=>986,7964=>920,7965=>947,7968=>641,
-7969=>641,7970=>641,7971=>641,7972=>641,7973=>641,7974=>641,7975=>641,7976=>851,7977=>856,7978=>1125,
-7979=>1125,7980=>1062,7981=>1085,7982=>948,7983=>956,7984=>351,7985=>351,7986=>351,7987=>351,7988=>351,
-7989=>351,7990=>351,7991=>351,7992=>435,7993=>440,7994=>699,7995=>707,7996=>641,7997=>664,7998=>544,
-7999=>544,8000=>618,8001=>618,8002=>618,8003=>618,8004=>618,8005=>618,8008=>802,8009=>839,8010=>1099,
-8011=>1101,8012=>947,8013=>974,8016=>607,8017=>607,8018=>607,8019=>607,8020=>607,8021=>607,8022=>607,
-8023=>607,8025=>837,8027=>1065,8029=>1079,8031=>944,8032=>782,8033=>782,8034=>782,8035=>782,8036=>782,
-8037=>782,8038=>782,8039=>782,8040=>817,8041=>862,8042=>1121,8043=>1126,8044=>968,8045=>994,8046=>925,
-8047=>968,8048=>618,8049=>618,8050=>501,8051=>501,8052=>641,8053=>641,8054=>351,8055=>351,8056=>618,
-8057=>618,8058=>607,8059=>607,8060=>782,8061=>782,8064=>618,8065=>618,8066=>618,8067=>618,8068=>618,
-8069=>618,8070=>618,8071=>618,8072=>696,8073=>696,8074=>937,8075=>939,8076=>841,8077=>866,8078=>751,
-8079=>773,8080=>641,8081=>641,8082=>641,8083=>641,8084=>641,8085=>641,8086=>641,8087=>641,8088=>851,
-8089=>856,8090=>1125,8091=>1125,8092=>1062,8093=>1085,8094=>948,8095=>956,8096=>782,8097=>782,8098=>782,
-8099=>782,8100=>782,8101=>782,8102=>782,8103=>782,8104=>817,8105=>862,8106=>1121,8107=>1126,8108=>968,
-8109=>994,8110=>925,8111=>968,8112=>618,8113=>618,8114=>618,8115=>618,8116=>618,8118=>618,8119=>618,
-8120=>696,8121=>696,8122=>789,8123=>717,8124=>696,8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,
-8130=>641,8131=>641,8132=>641,8134=>641,8135=>641,8136=>836,8137=>761,8138=>972,8139=>908,8140=>753,
-8141=>450,8142=>450,8143=>450,8144=>351,8145=>351,8146=>351,8147=>351,8150=>351,8151=>351,8152=>334,
-8153=>334,8154=>559,8155=>507,8157=>450,8158=>450,8159=>450,8160=>607,8161=>607,8162=>607,8163=>607,
-8164=>644,8165=>644,8166=>607,8167=>607,8168=>651,8169=>651,8170=>918,8171=>882,8172=>754,8173=>450,
-8174=>450,8175=>450,8178=>782,8179=>782,8180=>782,8182=>782,8183=>782,8184=>958,8185=>801,8186=>976,
-8187=>804,8188=>765,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,
-8198=>150,8199=>626,8200=>342,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,8215=>450,8219=>342,8223=>591,8227=>575,8228=>299,
-8229=>600,8231=>313,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,8241=>1698,8242=>237,
-8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,8251=>875,8252=>564,8253=>522,8254=>450,
-8255=>745,8256=>745,8257=>296,8258=>920,8259=>450,8260=>150,8261=>411,8262=>411,8263=>927,8264=>746,
-8265=>746,8266=>461,8267=>572,8268=>450,8269=>450,8270=>470,8271=>360,8272=>745,8273=>470,8274=>500,
-8275=>900,8276=>745,8277=>754,8278=>615,8279=>731,8280=>754,8281=>754,8282=>342,8283=>784,8284=>754,
-8285=>342,8286=>342,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,
-8300=>0,8301=>0,8302=>0,8303=>0,8304=>394,8305=>197,8308=>394,8309=>394,8310=>394,8311=>394,
-8312=>394,8313=>394,8314=>475,8315=>475,8316=>475,8317=>259,8318=>259,8319=>410,8320=>394,8321=>394,
-8322=>394,8323=>394,8324=>394,8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,8330=>475,8331=>475,
-8332=>475,8333=>259,8334=>259,8336=>412,8337=>431,8338=>439,8339=>371,8340=>431,8352=>836,8353=>626,
-8354=>626,8355=>626,8356=>626,8357=>938,8358=>753,8359=>1366,8360=>1084,8361=>993,8362=>813,8363=>626,
-8365=>626,8366=>614,8367=>1252,8368=>626,8369=>626,8370=>626,8371=>626,8372=>773,8373=>626,8400=>0,
-8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>1007,8449=>1053,8450=>660,8451=>1090,
-8452=>806,8453=>982,8454=>1029,8455=>553,8456=>628,8457=>978,8459=>965,8460=>822,8461=>799,8462=>641,
-8463=>641,8464=>537,8465=>627,8466=>771,8467=>424,8468=>876,8469=>753,8470=>1083,8471=>900,8472=>627,
-8473=>675,8474=>765,8475=>844,8476=>732,8477=>721,8478=>807,8479=>639,8480=>917,8481=>1152,8483=>679,
-8484=>679,8485=>520,8486=>765,8487=>765,8488=>686,8489=>304,8490=>697,8491=>696,8492=>835,8493=>736,
-8494=>769,8495=>572,8496=>656,8497=>727,8498=>615,8499=>1065,8500=>418,8501=>714,8502=>658,8503=>444,
-8504=>615,8505=>342,8506=>851,8507=>1213,8508=>710,8509=>663,8510=>589,8511=>776,8512=>756,8513=>697,
-8514=>501,8515=>573,8516=>684,8517=>747,8518=>644,8519=>610,8520=>308,8521=>308,8523=>785,8526=>492,
-8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,8537=>932,8538=>932,8539=>932,8540=>932,
-8541=>932,8542=>932,8543=>554,8544=>334,8545=>593,8546=>851,8547=>989,8548=>696,8549=>989,8550=>1247,
-8551=>1505,8552=>1008,8553=>694,8554=>1008,8555=>1266,8556=>573,8557=>660,8558=>747,8559=>896,8560=>308,
-8561=>546,8562=>785,8563=>885,8564=>586,8565=>866,8566=>1104,8567=>1342,8568=>872,8569=>580,8570=>872,
-8571=>1110,8572=>308,8573=>533,8574=>644,8575=>938,8576=>1160,8577=>747,8578=>1160,8579=>660,8580=>533,
-8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,8600=>754,8601=>754,
-8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,8610=>754,8611=>754,
-8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,8620=>754,8621=>754,
-8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,8630=>754,8631=>754,
-8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,8640=>754,8641=>754,
-8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,8650=>754,8651=>754,
-8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,8660=>754,8661=>754,
-8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,8670=>754,8671=>754,
-8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,8680=>754,8681=>754,
-8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,8690=>754,8691=>754,
-8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,8700=>754,8701=>754,
-8702=>754,8703=>754,8704=>696,8705=>626,8706=>489,8707=>615,8708=>615,8709=>771,8710=>627,8711=>627,
-8712=>807,8713=>807,8714=>675,8715=>807,8716=>807,8717=>675,8718=>572,8719=>708,8720=>708,8721=>646,
-8722=>754,8723=>754,8724=>626,8725=>329,8726=>626,8727=>754,8728=>563,8729=>342,8730=>600,8731=>600,
-8732=>600,8733=>641,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,8740=>450,8741=>450,
-8742=>450,8743=>730,8744=>730,8745=>730,8746=>730,8747=>549,8748=>835,8749=>1165,8750=>506,8751=>879,
-8752=>1181,8753=>506,8754=>506,8755=>506,8756=>626,8757=>626,8758=>264,8759=>626,8760=>754,8761=>754,
-8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,8770=>754,8771=>754,
-8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,8780=>754,8781=>754,
-8782=>754,8783=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>956,8789=>956,8790=>754,8791=>754,
-8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,8800=>754,8801=>754,
-8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>756,8809=>756,8810=>942,8811=>942,
-8812=>450,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,8820=>754,8821=>754,
-8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,8830=>754,8831=>754,
-8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8840=>754,8841=>754,
-8842=>754,8843=>754,8844=>730,8845=>730,8846=>730,8847=>754,8848=>754,8849=>754,8850=>754,8851=>716,
-8852=>716,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,
-8862=>754,8863=>754,8864=>754,8865=>754,8866=>822,8867=>822,8868=>822,8869=>822,8870=>488,8871=>488,
-8872=>822,8873=>822,8874=>822,8875=>822,8876=>822,8877=>822,8878=>822,8879=>822,8880=>754,8881=>754,
-8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,8890=>488,8891=>730,
-8892=>730,8893=>730,8894=>754,8895=>754,8896=>758,8897=>758,8898=>758,8899=>758,8900=>444,8901=>342,
-8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,8910=>730,8911=>730,
-8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,8920=>1280,8921=>1280,
-8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,8930=>754,8931=>754,
-8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,8940=>754,8941=>754,
-8942=>900,8943=>900,8944=>900,8945=>900,8946=>1042,8947=>807,8948=>675,8949=>807,8950=>807,8951=>675,
-8952=>807,8953=>807,8954=>1042,8955=>807,8956=>675,8957=>807,8958=>675,8959=>807,8960=>542,8961=>542,
-8962=>644,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>411,8969=>411,8970=>411,8971=>411,
-8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>484,8984=>835,8985=>754,8988=>422,8989=>422,
-8990=>422,8991=>422,8992=>549,8993=>549,8996=>1037,8997=>1037,8998=>1272,8999=>1037,9000=>1299,9003=>1272,
-9004=>786,9075=>351,9076=>644,9077=>782,9082=>618,9085=>776,9095=>1037,9108=>786,9115=>450,9116=>450,
-9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,9125=>450,9126=>450,
-9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>549,9166=>754,9167=>850,
-9187=>786,9189=>692,9250=>644,9251=>644,9312=>762,9313=>762,9314=>762,9315=>762,9316=>762,9317=>762,
-9318=>762,9319=>762,9320=>762,9321=>762,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,
-9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,
-9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,
-9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,
-9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,
-9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,
-9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,
-9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,
-9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,
-9686=>474,9687=>474,9688=>756,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,
-9696=>692,9697=>692,9698=>692,9699=>692,9700=>692,9701=>692,9702=>575,9703=>850,9704=>850,9705=>850,
-9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,
-9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,
-9726=>659,9727=>692,9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,9734=>807,9735=>515,
-9736=>806,9737=>807,9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,9744=>807,9745=>807,
-9746=>807,9747=>479,9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,9754=>807,9755=>807,
-9756=>807,9757=>548,9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,9764=>602,9765=>671,
-9766=>584,9767=>705,9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,9774=>807,9775=>807,
-9776=>807,9777=>807,9778=>807,9779=>807,9780=>807,9781=>807,9782=>807,9783=>807,9784=>807,9785=>807,
-9786=>807,9787=>807,9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,
-9796=>807,9797=>807,9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,9804=>807,9805=>807,
-9806=>807,9807=>807,9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,9814=>807,9815=>807,
-9816=>807,9817=>807,9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,9824=>807,9825=>807,
-9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,9834=>574,9835=>807,
-9836=>807,9837=>424,9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,9844=>807,9845=>807,
-9846=>807,9847=>807,9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,9854=>807,9855=>807,
-9856=>782,9857=>782,9858=>782,9859=>782,9860=>782,9861=>782,9862=>807,9863=>807,9864=>807,9865=>807,
-9866=>807,9867=>807,9868=>807,9869=>807,9870=>807,9871=>807,9872=>807,9873=>807,9874=>807,9875=>807,
-9876=>807,9877=>487,9878=>807,9879=>807,9880=>807,9881=>807,9882=>807,9883=>807,9884=>807,9888=>807,
-9889=>632,9890=>903,9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,9897=>754,9898=>754,
-9899=>754,9900=>754,9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,9907=>659,9908=>659,
-9909=>659,9910=>765,9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,9990=>754,9991=>754,
-9992=>754,9993=>754,9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,10002=>754,10003=>754,
-10004=>754,10005=>754,10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,10012=>754,10013=>754,
-10014=>754,10015=>754,10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,10022=>754,10023=>754,
-10025=>754,10026=>754,10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,10033=>754,10034=>754,
-10035=>754,10036=>754,10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,10043=>754,10044=>754,
-10045=>754,10046=>754,10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,10053=>754,10054=>754,
-10055=>754,10056=>754,10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,10065=>807,10066=>807,
-10070=>807,10072=>754,10073=>754,10074=>754,10075=>312,10076=>312,10077=>528,10078=>528,10081=>754,10082=>754,
-10083=>754,10084=>754,10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,10091=>754,10092=>754,
-10093=>754,10094=>754,10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,10101=>754,10102=>762,
-10103=>762,10104=>762,10105=>762,10106=>762,10107=>762,10108=>762,10109=>762,10110=>762,10111=>762,10112=>754,
-10113=>754,10114=>754,10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,10121=>754,10122=>754,
-10123=>754,10124=>754,10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,10131=>754,10132=>754,
-10136=>754,10137=>754,10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,10144=>754,10145=>754,
-10146=>754,10147=>754,10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,10154=>754,10155=>754,
-10156=>754,10157=>754,10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,10165=>754,10166=>754,
-10167=>754,10168=>754,10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,10181=>411,10182=>411,
-10208=>444,10214=>438,10215=>438,10216=>411,10217=>411,10218=>648,10219=>648,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>1042,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,10245=>703,10246=>703,
-10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,10255=>703,10256=>703,
-10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,10265=>703,10266=>703,
-10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,10275=>703,10276=>703,
-10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,10285=>703,10286=>703,
-10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,10295=>703,10296=>703,
-10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,10305=>703,10306=>703,
-10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,10315=>703,10316=>703,
-10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,10325=>703,10326=>703,
-10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,10335=>703,10336=>703,
-10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,10345=>703,10346=>703,
-10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,10355=>703,10356=>703,
-10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,10365=>703,10366=>703,
-10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,10375=>703,10376=>703,
-10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,10385=>703,10386=>703,
-10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,10395=>703,10396=>703,
-10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,10405=>703,10406=>703,
-10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,10415=>703,10416=>703,
-10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,10425=>703,10426=>703,
-10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,10435=>703,10436=>703,
-10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,10445=>703,10446=>703,
-10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,10455=>703,10456=>703,
-10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,10465=>703,10466=>703,
-10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,10475=>703,10476=>703,
-10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,10485=>703,10486=>703,
-10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,10495=>703,10502=>754,
-10503=>754,10506=>754,10507=>754,10560=>754,10561=>754,10627=>678,10628=>678,10702=>754,10703=>941,10704=>941,
-10705=>900,10706=>900,10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,10752=>900,10753=>900,
-10754=>900,10764=>1495,10765=>506,10766=>506,10767=>506,10768=>506,10769=>506,10770=>506,10771=>506,10772=>506,
-10773=>506,10774=>506,10775=>506,10776=>506,10777=>506,10778=>506,10779=>506,10780=>506,10799=>754,10877=>754,
-10878=>754,10879=>754,10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,10886=>754,10887=>754,
-10888=>754,10889=>754,10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,10896=>754,10897=>754,
-10898=>754,10899=>754,10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,10906=>754,10907=>754,
-10908=>754,10909=>754,10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,10929=>754,10930=>754,
-10931=>754,10932=>754,10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,11001=>754,11002=>754,
-11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,
-11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,11026=>850,11027=>850,
-11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,11040=>782,11041=>786,
-11042=>786,11043=>786,11044=>1007,11091=>782,11092=>782,11360=>573,11361=>324,11362=>573,11363=>659,11364=>693,
-11365=>607,11366=>430,11367=>860,11368=>641,11369=>697,11370=>598,11371=>652,11372=>523,11373=>774,11374=>896,
-11375=>696,11377=>700,11378=>1099,11379=>950,11380=>586,11381=>628,11382=>508,11383=>704,11385=>484,11386=>618,
-11387=>502,11388=>197,11389=>438,11568=>622,11569=>847,11570=>847,11571=>652,11572=>652,11573=>652,11574=>608,
-11575=>696,11576=>696,11577=>615,11578=>615,11579=>721,11580=>890,11581=>685,11582=>561,11583=>685,11584=>847,
-11585=>847,11586=>335,11587=>666,11588=>753,11589=>822,11590=>604,11591=>663,11592=>612,11593=>615,11594=>542,
-11595=>935,11596=>700,11597=>753,11598=>615,11599=>334,11600=>700,11601=>335,11602=>652,11603=>622,11604=>847,
-11605=>847,11606=>753,11607=>335,11608=>752,11609=>847,11610=>847,11611=>660,11612=>789,11613=>694,11614=>660,
-11615=>615,11616=>696,11617=>753,11618=>615,11619=>765,11620=>627,11621=>765,11631=>644,11800=>522,11810=>411,
-11811=>411,11812=>411,11813=>411,11822=>522,19904=>807,19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,
-19910=>807,19911=>807,19912=>807,19913=>807,19914=>807,19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,
-19920=>807,19921=>807,19922=>807,19923=>807,19924=>807,19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,
-19930=>807,19931=>807,19932=>807,19933=>807,19934=>807,19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,
-19940=>807,19941=>807,19942=>807,19943=>807,19944=>807,19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,
-19950=>807,19951=>807,19952=>807,19953=>807,19954=>807,19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,
-19960=>807,19961=>807,19962=>807,19963=>807,19964=>807,19965=>807,19966=>807,19967=>807,42564=>648,42565=>536,
-42566=>392,42567=>396,42572=>1265,42573=>1055,42576=>1110,42577=>924,42580=>1056,42581=>875,42582=>983,42583=>862,
-42594=>976,42595=>832,42596=>986,42597=>821,42598=>1134,42599=>897,42600=>765,42601=>618,42602=>933,42603=>781,
-42604=>1266,42605=>995,42606=>865,42634=>867,42635=>708,42636=>614,42637=>521,42644=>727,42645=>641,42760=>450,
-42761=>450,42762=>450,42763=>450,42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,
-42771=>450,42772=>450,42773=>450,42774=>450,42779=>360,42780=>360,42781=>258,42782=>258,42783=>258,42790=>753,
-42791=>641,42792=>928,42793=>771,42794=>626,42795=>501,42800=>502,42801=>536,42802=>1214,42803=>946,42804=>1156,
-42805=>958,42806=>1094,42807=>949,42808=>971,42809=>830,42810=>971,42811=>830,42812=>932,42813=>830,42814=>628,
-42815=>494,42822=>765,42823=>488,42824=>614,42825=>478,42826=>826,42827=>732,42830=>1266,42831=>995,42880=>573,
-42881=>308,42882=>753,42883=>641,42889=>360,42890=>347,42891=>410,42892=>275,43003=>615,43004=>659,43005=>896,
-43006=>334,43007=>1192,63173=>618,64256=>729,64257=>667,64258=>667,64259=>1003,64260=>1004,64261=>727,64262=>917,
-64275=>1249,64276=>1245,64277=>1240,64278=>1245,64279=>1542,64285=>308,64286=>0,64287=>597,64288=>647,64289=>867,
-64290=>801,64291=>889,64292=>867,64293=>844,64294=>889,64295=>889,64296=>878,64297=>754,64298=>854,64299=>854,
-64300=>854,64301=>854,64302=>676,64303=>676,64304=>676,64305=>605,64306=>483,64307=>589,64308=>641,64309=>394,
-64310=>442,64312=>651,64313=>394,64314=>584,64315=>584,64316=>611,64318=>698,64320=>447,64321=>696,64323=>646,
-64324=>618,64326=>676,64327=>656,64328=>584,64329=>854,64330=>676,64331=>308,64332=>605,64333=>584,64334=>618,
-64335=>676,64338=>904,64339=>953,64340=>338,64341=>367,64342=>904,64343=>953,64344=>338,64345=>367,64346=>904,
-64347=>953,64348=>338,64349=>367,64350=>904,64351=>953,64352=>338,64353=>367,64354=>904,64355=>953,64356=>338,
-64357=>367,64358=>904,64359=>953,64360=>338,64361=>367,64362=>1045,64363=>1072,64364=>589,64365=>647,64366=>1045,
-64367=>1072,64368=>589,64369=>647,64370=>648,64371=>648,64372=>648,64373=>648,64374=>648,64375=>648,64376=>648,
-64377=>648,64378=>648,64379=>648,64380=>648,64381=>648,64382=>648,64383=>648,64384=>648,64385=>648,64394=>518,
-64395=>560,64396=>518,64397=>560,64398=>921,64399=>921,64400=>523,64401=>523,64402=>921,64403=>921,64404=>523,
-64405=>523,64414=>768,64415=>810,64473=>559,64474=>564,64488=>338,64489=>367,64508=>825,64509=>910,64510=>338,
-64511=>367,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,
-65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,
-65059=>0,65136=>308,65137=>308,65138=>308,65139=>311,65140=>308,65142=>308,65143=>308,65144=>308,65145=>308,
-65146=>308,65147=>308,65148=>308,65149=>308,65150=>308,65151=>308,65152=>460,65153=>308,65154=>338,65155=>308,
-65156=>338,65157=>559,65158=>564,65159=>308,65160=>338,65161=>825,65162=>825,65163=>338,65164=>367,65165=>308,
-65166=>338,65167=>904,65168=>953,65169=>338,65170=>367,65171=>531,65172=>545,65173=>904,65174=>953,65175=>338,
-65176=>367,65177=>904,65178=>953,65179=>338,65180=>367,65181=>648,65182=>648,65183=>648,65184=>648,65185=>648,
-65186=>648,65187=>648,65188=>648,65189=>648,65190=>648,65191=>648,65192=>648,65193=>461,65194=>520,65195=>461,
-65196=>520,65197=>518,65198=>560,65199=>518,65200=>560,65201=>1242,65202=>1272,65203=>885,65204=>916,65205=>1242,
-65206=>1272,65207=>885,65208=>916,65209=>1210,65210=>1228,65211=>870,65212=>887,65213=>1210,65214=>1228,65215=>870,
-65216=>887,65217=>935,65218=>963,65219=>848,65220=>876,65221=>935,65222=>963,65223=>848,65224=>876,65225=>615,
-65226=>615,65227=>615,65228=>508,65229=>615,65230=>615,65231=>615,65232=>508,65233=>1045,65234=>1072,65235=>589,
-65236=>647,65237=>804,65238=>811,65239=>589,65240=>647,65241=>825,65242=>838,65243=>523,65244=>523,65245=>781,
-65246=>803,65247=>338,65248=>367,65249=>659,65250=>706,65251=>557,65252=>603,65253=>768,65254=>810,65255=>338,
-65256=>367,65257=>531,65258=>545,65259=>624,65260=>594,65261=>559,65262=>564,65263=>825,65264=>910,65265=>825,
-65266=>910,65267=>338,65268=>367,65269=>670,65270=>683,65271=>670,65272=>683,65273=>670,65274=>683,65275=>670,
-65276=>683,65279=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1002);
-$enc='';
-$diff='';
-$file='dejavusanscondensedb.z';
-$ctg='dejavusanscondensedb.ctg.z';
-$originalsize=534464;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedbi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedbi.php
deleted file mode 100644
index 6a86288e186..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedbi.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed-BoldOblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-46,'Flags'=>96,'FontBBox'=>'[-960 -385 1804 1121]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>410,34=>469,35=>626,36=>626,37=>901,38=>785,39=>275,40=>411,
-41=>411,42=>470,43=>754,44=>342,45=>374,46=>342,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>360,59=>360,60=>754,
-61=>754,62=>754,63=>522,64=>900,65=>696,66=>686,67=>660,68=>747,69=>615,70=>615,
-71=>738,72=>753,73=>334,74=>334,75=>697,76=>573,77=>896,78=>753,79=>765,80=>659,
-81=>765,82=>693,83=>648,84=>614,85=>730,86=>696,87=>993,88=>694,89=>651,90=>652,
-91=>411,92=>329,93=>411,94=>754,95=>450,96=>450,97=>607,98=>644,99=>533,100=>644,
-101=>610,102=>391,103=>644,104=>641,105=>308,106=>308,107=>598,108=>308,109=>938,110=>641,
-111=>618,112=>644,113=>644,114=>444,115=>536,116=>430,117=>641,118=>586,119=>831,120=>580,
-121=>586,122=>523,123=>641,124=>329,125=>641,126=>754,8364=>626,8218=>342,402=>391,8222=>580,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1309,352=>648,8249=>371,338=>1050,381=>652,8216=>342,
-8217=>342,8220=>580,8221=>580,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>536,8250=>371,
-339=>984,382=>523,376=>651,160=>313,161=>410,162=>626,163=>626,164=>572,165=>626,166=>329,
-167=>450,168=>450,169=>900,170=>507,171=>584,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>662,182=>572,183=>342,184=>450,185=>394,186=>507,
-187=>584,188=>932,189=>932,190=>932,191=>522,192=>696,193=>696,194=>696,195=>696,196=>696,
-197=>696,198=>976,199=>660,200=>615,201=>615,202=>615,203=>615,204=>334,205=>334,206=>334,
-207=>334,208=>760,209=>753,210=>765,211=>765,212=>765,213=>765,214=>765,215=>754,216=>765,
-217=>730,218=>730,219=>730,220=>730,221=>651,222=>668,223=>647,224=>607,225=>607,226=>607,
-227=>607,228=>607,229=>607,230=>943,231=>533,232=>610,233=>610,234=>610,235=>610,236=>308,
-237=>308,238=>308,239=>308,240=>618,241=>641,242=>618,243=>618,244=>618,245=>618,246=>618,
-247=>754,248=>618,249=>641,250=>641,251=>641,252=>641,253=>586,254=>644,255=>586,256=>696,
-257=>607,258=>696,259=>607,260=>696,261=>607,262=>660,263=>533,264=>660,265=>533,266=>660,
-267=>533,268=>660,269=>533,270=>747,271=>644,272=>760,273=>644,274=>615,275=>610,276=>615,
-277=>610,278=>615,279=>610,280=>615,281=>610,282=>615,283=>610,284=>738,285=>644,286=>738,
-287=>644,288=>738,289=>644,290=>738,291=>644,292=>753,293=>641,294=>876,295=>711,296=>334,
-297=>308,298=>334,299=>308,300=>334,301=>308,302=>334,303=>308,304=>334,305=>308,306=>669,
-307=>617,308=>334,309=>308,310=>697,311=>598,312=>598,313=>573,314=>308,315=>573,316=>308,
-317=>573,318=>308,319=>573,320=>308,321=>594,322=>337,323=>753,324=>641,325=>753,326=>641,
-327=>753,328=>641,329=>884,330=>753,331=>641,332=>765,333=>618,334=>765,335=>618,336=>765,
-337=>618,340=>693,341=>444,342=>693,343=>444,344=>693,345=>444,346=>648,347=>536,348=>648,
-349=>536,350=>648,351=>536,354=>614,355=>430,356=>614,357=>430,358=>614,359=>430,360=>730,
-361=>641,362=>730,363=>641,364=>730,365=>641,366=>730,367=>641,368=>730,369=>641,370=>730,
-371=>641,372=>993,373=>831,374=>651,375=>586,377=>652,378=>523,379=>652,380=>523,383=>391,
-384=>644,385=>729,386=>686,387=>644,388=>686,389=>644,390=>660,391=>660,392=>533,393=>760,
-394=>791,395=>686,396=>644,397=>618,398=>615,399=>765,400=>626,401=>615,403=>738,404=>713,
-405=>940,406=>392,407=>350,408=>697,409=>598,410=>324,411=>532,412=>938,413=>753,414=>641,
-415=>765,416=>765,417=>618,418=>1002,419=>866,420=>703,421=>644,422=>693,423=>648,424=>536,
-425=>615,426=>497,427=>430,428=>636,429=>430,430=>614,431=>730,432=>641,433=>692,434=>732,
-435=>717,436=>700,437=>652,438=>523,439=>695,440=>695,441=>576,442=>523,443=>626,444=>695,
-445=>576,446=>515,447=>644,448=>334,449=>593,450=>489,451=>334,452=>1393,453=>1305,454=>1176,
-455=>879,456=>881,457=>603,458=>1074,459=>1091,460=>957,461=>696,462=>607,463=>334,464=>308,
-465=>765,466=>618,467=>730,468=>641,469=>730,470=>641,471=>730,472=>641,473=>730,474=>641,
-475=>730,476=>641,477=>610,478=>696,479=>607,480=>696,481=>607,482=>976,483=>943,484=>738,
-485=>644,486=>738,487=>644,488=>697,489=>598,490=>765,491=>618,492=>765,493=>618,494=>695,
-495=>523,496=>308,497=>1393,498=>1305,499=>1176,500=>738,501=>644,502=>1160,503=>708,504=>753,
-505=>641,506=>696,507=>607,508=>976,509=>943,510=>765,511=>618,512=>696,513=>607,514=>696,
-515=>607,516=>615,517=>610,518=>615,519=>610,520=>334,521=>308,522=>334,523=>308,524=>765,
-525=>618,526=>765,527=>618,528=>693,529=>444,530=>693,531=>444,532=>730,533=>641,534=>730,
-535=>641,536=>648,537=>536,538=>614,539=>430,540=>621,541=>546,542=>753,543=>641,544=>753,
-545=>778,546=>728,547=>593,548=>652,549=>523,550=>696,551=>607,552=>615,553=>610,554=>765,
-555=>618,556=>765,557=>618,558=>765,559=>618,560=>765,561=>618,562=>651,563=>586,564=>442,
-565=>780,566=>460,567=>308,568=>979,569=>979,570=>696,571=>660,572=>533,573=>573,574=>614,
-575=>536,576=>523,577=>703,578=>553,579=>686,580=>730,581=>696,582=>615,583=>610,584=>334,
-585=>308,586=>774,587=>712,588=>693,589=>444,590=>651,591=>586,592=>607,593=>644,594=>644,
-595=>644,596=>533,597=>533,598=>712,599=>712,600=>610,601=>610,602=>788,603=>501,604=>490,
-605=>696,606=>658,607=>308,608=>712,609=>644,610=>564,611=>661,612=>571,613=>641,614=>641,
-615=>641,616=>491,617=>396,618=>491,619=>502,620=>624,621=>308,622=>757,623=>938,624=>938,
-625=>938,626=>641,627=>713,628=>578,629=>618,630=>817,631=>613,632=>716,633=>484,634=>484,
-635=>584,636=>444,637=>444,638=>536,639=>536,640=>578,641=>578,642=>536,643=>374,644=>391,
-645=>544,646=>497,647=>430,648=>430,649=>828,650=>692,651=>603,652=>586,653=>831,654=>586,
-655=>651,656=>624,657=>615,658=>576,659=>576,660=>515,661=>515,662=>515,663=>515,664=>765,
-665=>569,666=>658,667=>616,668=>622,669=>308,670=>659,671=>485,672=>712,673=>515,674=>515,
-675=>1040,676=>1093,677=>1039,678=>876,679=>691,680=>836,681=>923,682=>712,683=>702,684=>532,
-685=>374,686=>609,687=>710,688=>410,689=>410,690=>197,691=>284,692=>284,693=>284,694=>369,
-695=>532,696=>375,697=>271,698=>469,699=>342,700=>342,701=>342,702=>330,703=>330,704=>293,
-705=>293,706=>450,707=>450,708=>450,709=>450,711=>450,712=>275,713=>450,714=>450,715=>450,
-716=>275,717=>450,718=>450,719=>450,720=>303,721=>303,722=>330,723=>330,724=>450,725=>450,
-726=>374,727=>295,728=>450,729=>450,730=>450,731=>450,733=>450,734=>315,735=>450,736=>370,
-737=>197,738=>343,739=>371,740=>293,741=>450,742=>450,743=>450,744=>450,745=>450,748=>450,
-749=>450,750=>580,755=>450,759=>450,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>628,881=>508,882=>919,
-883=>752,884=>271,885=>271,886=>753,887=>630,890=>450,891=>533,892=>495,893=>494,894=>360,
-900=>397,901=>450,902=>717,903=>342,904=>761,905=>908,906=>507,908=>801,910=>882,911=>804,
-912=>351,913=>696,914=>686,915=>573,916=>696,917=>615,918=>652,919=>753,920=>765,921=>334,
-922=>697,923=>696,924=>896,925=>753,926=>568,927=>765,928=>753,929=>659,931=>615,932=>614,
-933=>651,934=>765,935=>694,936=>765,937=>765,938=>334,939=>651,940=>618,941=>501,942=>641,
-943=>351,944=>607,945=>618,946=>644,947=>613,948=>618,949=>501,950=>532,951=>641,952=>618,
-953=>351,954=>639,955=>569,956=>662,957=>613,958=>532,959=>618,960=>712,961=>644,962=>533,
-963=>701,964=>574,965=>607,966=>704,967=>580,968=>714,969=>782,970=>351,971=>607,972=>618,
-973=>607,974=>782,975=>697,976=>585,977=>594,978=>671,979=>883,980=>671,981=>716,982=>782,
-983=>669,984=>765,985=>618,986=>660,987=>533,988=>615,989=>444,990=>632,991=>593,992=>827,
-993=>564,994=>983,995=>753,996=>749,997=>644,998=>835,999=>669,1000=>660,1001=>585,1002=>709,
-1003=>604,1004=>677,1005=>644,1006=>614,1007=>531,1008=>669,1009=>644,1010=>533,1011=>308,1012=>765,
-1013=>580,1014=>580,1015=>668,1016=>644,1017=>660,1018=>896,1019=>659,1020=>644,1021=>660,1022=>660,
-1023=>628,1024=>615,1025=>615,1026=>791,1027=>573,1028=>660,1029=>648,1030=>334,1031=>334,1032=>334,
-1033=>1039,1034=>1017,1035=>791,1036=>735,1037=>753,1038=>694,1039=>753,1040=>696,1041=>686,1042=>686,
-1043=>573,1044=>801,1045=>615,1046=>1102,1047=>639,1048=>753,1049=>753,1050=>735,1051=>747,1052=>896,
-1053=>753,1054=>765,1055=>753,1056=>659,1057=>660,1058=>614,1059=>694,1060=>892,1061=>694,1062=>835,
-1063=>727,1064=>1112,1065=>1193,1066=>845,1067=>932,1068=>686,1069=>660,1070=>1056,1071=>693,1072=>607,
-1073=>628,1074=>569,1075=>470,1076=>727,1077=>610,1078=>896,1079=>523,1080=>630,1081=>630,1082=>611,
-1083=>659,1084=>735,1085=>622,1086=>618,1087=>622,1088=>644,1089=>533,1090=>521,1091=>586,1092=>893,
-1093=>580,1094=>667,1095=>618,1096=>956,1097=>995,1098=>676,1099=>813,1100=>569,1101=>533,1102=>875,
-1103=>578,1104=>610,1105=>610,1106=>642,1107=>470,1108=>533,1109=>536,1110=>308,1111=>308,1112=>308,
-1113=>892,1114=>860,1115=>661,1116=>611,1117=>630,1118=>586,1119=>622,1120=>983,1121=>782,1122=>756,
-1123=>662,1124=>911,1125=>755,1126=>893,1127=>749,1128=>1222,1129=>1009,1130=>765,1131=>618,1132=>1112,
-1133=>906,1134=>626,1135=>501,1136=>967,1137=>955,1138=>765,1139=>618,1140=>765,1141=>625,1142=>765,
-1143=>625,1144=>1033,1145=>939,1146=>967,1147=>776,1148=>1265,1149=>1055,1150=>983,1151=>782,1152=>660,
-1153=>533,1154=>587,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>844,
-1163=>725,1164=>686,1165=>550,1166=>662,1167=>646,1168=>573,1169=>470,1170=>599,1171=>488,1172=>709,
-1173=>470,1174=>1102,1175=>896,1176=>639,1177=>523,1178=>697,1179=>611,1180=>735,1181=>611,1182=>735,
-1183=>611,1184=>914,1185=>743,1186=>753,1187=>622,1188=>992,1189=>783,1190=>1129,1191=>880,1192=>851,
-1193=>773,1194=>660,1195=>533,1196=>614,1197=>521,1198=>651,1199=>586,1200=>651,1201=>586,1202=>694,
-1203=>580,1204=>993,1205=>901,1206=>727,1207=>618,1208=>727,1209=>618,1210=>727,1211=>641,1212=>923,
-1213=>729,1214=>923,1215=>729,1216=>334,1217=>1102,1218=>896,1219=>700,1220=>566,1221=>839,1222=>724,
-1223=>753,1224=>622,1225=>844,1226=>725,1227=>727,1228=>618,1229=>986,1230=>838,1231=>308,1232=>696,
-1233=>607,1234=>696,1235=>607,1236=>976,1237=>943,1238=>615,1239=>610,1240=>765,1241=>610,1242=>765,
-1243=>610,1244=>1102,1245=>896,1246=>639,1247=>523,1248=>695,1249=>576,1250=>753,1251=>630,1252=>753,
-1253=>630,1254=>765,1255=>618,1256=>765,1257=>618,1258=>765,1259=>618,1260=>660,1261=>533,1262=>694,
-1263=>586,1264=>694,1265=>586,1266=>694,1267=>586,1268=>727,1269=>618,1270=>573,1271=>470,1272=>932,
-1273=>813,1274=>599,1275=>488,1276=>694,1277=>580,1278=>694,1279=>580,1280=>686,1281=>547,1282=>1043,
-1283=>804,1284=>1007,1285=>828,1286=>745,1287=>624,1288=>1117,1289=>915,1290=>1160,1291=>912,1292=>755,
-1293=>574,1294=>844,1295=>722,1296=>626,1297=>501,1298=>747,1299=>659,1300=>1157,1301=>963,1302=>958,
-1303=>883,1304=>973,1305=>864,1306=>765,1307=>644,1308=>993,1309=>831,1312=>1123,1313=>920,1314=>1128,
-1315=>880,1316=>861,1317=>726,1329=>886,1330=>730,1331=>886,1332=>886,1333=>730,1334=>699,1335=>730,
-1336=>730,1337=>877,1338=>886,1339=>730,1340=>639,1341=>970,1342=>1022,1343=>730,1344=>639,1345=>681,
-1346=>886,1347=>789,1348=>886,1349=>714,1350=>886,1351=>730,1352=>730,1353=>730,1354=>862,1355=>699,
-1356=>886,1357=>730,1358=>886,1359=>648,1360=>730,1361=>714,1362=>805,1363=>765,1364=>842,1365=>765,
-1366=>648,1369=>330,1370=>342,1371=>495,1372=>495,1373=>342,1374=>491,1375=>468,1377=>938,1378=>641,
-1379=>779,1380=>781,1381=>641,1382=>735,1383=>588,1384=>641,1385=>729,1386=>735,1387=>641,1388=>448,
-1389=>916,1390=>644,1391=>641,1392=>641,1393=>644,1394=>737,1395=>641,1396=>676,1397=>308,1398=>794,
-1399=>502,1400=>641,1401=>502,1402=>938,1403=>502,1404=>777,1405=>641,1406=>732,1407=>938,1408=>641,
-1409=>644,1410=>514,1411=>938,1412=>700,1413=>618,1414=>648,1415=>776,1417=>360,1418=>438,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>374,1471=>0,1472=>334,1473=>0,1474=>0,1475=>334,1478=>447,
-1479=>0,1488=>676,1489=>605,1490=>483,1491=>589,1492=>641,1493=>308,1494=>442,1495=>641,1496=>651,
-1497=>308,1498=>584,1499=>584,1500=>611,1501=>641,1502=>698,1503=>308,1504=>447,1505=>696,1506=>610,
-1507=>646,1508=>618,1509=>565,1510=>676,1511=>656,1512=>584,1513=>854,1514=>676,1520=>598,1521=>598,
-1522=>597,1523=>399,1524=>639,3647=>668,3713=>734,3714=>673,3716=>674,3719=>512,3720=>668,3722=>669,
-3725=>685,3732=>635,3733=>633,3734=>672,3735=>737,3737=>657,3738=>654,3739=>654,3740=>830,3741=>744,
-3742=>779,3743=>779,3745=>752,3746=>685,3747=>692,3749=>691,3751=>642,3754=>744,3755=>928,3757=>651,
-3758=>705,3759=>840,3760=>620,3761=>0,3762=>549,3763=>549,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>603,3776=>464,3777=>774,3778=>464,3779=>584,3780=>569,
-3782=>683,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>694,3793=>694,3794=>624,
-3795=>752,3796=>655,3797=>655,3798=>764,3799=>710,3800=>683,3801=>818,3804=>1227,3805=>1227,4256=>826,
-4257=>669,4258=>665,4259=>753,4260=>584,4261=>696,4262=>771,4263=>800,4264=>477,4265=>570,4266=>771,
-4267=>810,4268=>579,4269=>813,4270=>732,4271=>677,4272=>782,4273=>579,4274=>579,4275=>797,4276=>797,
-4277=>660,4278=>587,4279=>579,4280=>582,4281=>579,4282=>710,4283=>812,4284=>570,4285=>557,4286=>579,
-4287=>700,4288=>802,4289=>541,4290=>668,4291=>554,4292=>570,4293=>668,4304=>497,4305=>497,4306=>536,
-4307=>734,4308=>505,4309=>506,4310=>497,4311=>744,4312=>497,4313=>488,4314=>967,4315=>506,4316=>507,
-4317=>730,4318=>497,4319=>532,4320=>740,4321=>506,4322=>621,4323=>525,4324=>732,4325=>505,4326=>731,
-4327=>506,4328=>506,4329=>507,4330=>568,4331=>506,4332=>506,4333=>497,4334=>506,4335=>506,4336=>501,
-4337=>543,4338=>497,4339=>497,4340=>497,4341=>544,4342=>767,4343=>571,4344=>506,4345=>536,4346=>487,
-4347=>615,4348=>331,5121=>696,5122=>696,5123=>696,5124=>696,5125=>814,5126=>814,5127=>814,5129=>814,
-5130=>814,5131=>814,5132=>916,5133=>908,5134=>916,5135=>908,5136=>916,5137=>908,5138=>1034,5139=>1025,
-5140=>1034,5141=>1025,5142=>814,5143=>1034,5144=>1028,5145=>1034,5146=>1028,5147=>814,5149=>278,5150=>476,
-5151=>382,5152=>382,5153=>355,5154=>355,5155=>355,5156=>355,5157=>507,5158=>423,5159=>278,5160=>355,
-5161=>355,5162=>355,5163=>1092,5164=>888,5165=>1094,5166=>1167,5167=>696,5168=>696,5169=>696,5170=>696,
-5171=>797,5172=>797,5173=>797,5175=>797,5176=>797,5177=>797,5178=>916,5179=>908,5180=>916,5181=>908,
-5182=>916,5183=>908,5184=>1034,5185=>1025,5186=>1034,5187=>1025,5188=>1034,5189=>1028,5190=>1034,5191=>1028,
-5192=>797,5193=>518,5194=>206,5196=>730,5197=>730,5198=>730,5199=>730,5200=>734,5201=>734,5202=>734,
-5204=>734,5205=>734,5206=>734,5207=>950,5208=>943,5209=>950,5210=>943,5211=>950,5212=>943,5213=>954,
-5214=>949,5215=>954,5216=>949,5217=>954,5218=>946,5219=>954,5220=>946,5221=>954,5222=>435,5223=>904,
-5224=>904,5225=>921,5226=>915,5227=>668,5228=>668,5229=>668,5230=>668,5231=>668,5232=>668,5233=>668,
-5234=>668,5235=>668,5236=>926,5237=>877,5238=>882,5239=>877,5240=>882,5241=>877,5242=>926,5243=>877,
-5244=>926,5245=>877,5246=>882,5247=>877,5248=>882,5249=>877,5250=>882,5251=>451,5252=>451,5253=>844,
-5254=>844,5255=>844,5256=>844,5257=>668,5258=>668,5259=>668,5260=>668,5261=>668,5262=>668,5263=>668,
-5264=>668,5265=>668,5266=>926,5267=>877,5268=>926,5269=>877,5270=>926,5271=>877,5272=>926,5273=>877,
-5274=>926,5275=>877,5276=>926,5277=>877,5278=>926,5279=>877,5280=>926,5281=>451,5282=>451,5283=>563,
-5284=>563,5285=>563,5286=>563,5287=>563,5288=>563,5289=>563,5290=>563,5291=>563,5292=>793,5293=>769,
-5294=>777,5295=>786,5296=>777,5297=>786,5298=>793,5299=>786,5300=>793,5301=>786,5302=>777,5303=>786,
-5304=>777,5305=>786,5306=>777,5307=>392,5308=>493,5309=>392,5312=>889,5313=>889,5314=>889,5315=>889,
-5316=>838,5317=>838,5318=>838,5319=>838,5320=>838,5321=>1114,5322=>1122,5323=>1080,5324=>1105,5325=>1080,
-5326=>1105,5327=>838,5328=>593,5329=>447,5330=>593,5331=>889,5332=>889,5333=>889,5334=>889,5335=>838,
-5336=>838,5337=>838,5338=>838,5339=>838,5340=>1107,5341=>1122,5342=>1155,5343=>1105,5344=>1155,5345=>1105,
-5346=>1105,5347=>1093,5348=>1105,5349=>1093,5350=>1155,5351=>1105,5352=>1155,5353=>1105,5354=>593,5356=>797,
-5357=>657,5358=>657,5359=>657,5360=>657,5361=>657,5362=>657,5363=>657,5364=>657,5365=>657,5366=>897,
-5367=>862,5368=>870,5369=>890,5370=>870,5371=>890,5372=>897,5373=>862,5374=>897,5375=>862,5376=>870,
-5377=>890,5378=>870,5379=>890,5380=>870,5381=>443,5382=>414,5383=>443,5392=>831,5393=>831,5394=>831,
-5395=>1022,5396=>1022,5397=>1022,5398=>1022,5399=>1088,5400=>1081,5401=>1088,5402=>1081,5403=>1088,5404=>1081,
-5405=>1288,5406=>1278,5407=>1288,5408=>1278,5409=>1288,5410=>1278,5411=>1288,5412=>1278,5413=>671,5414=>698,
-5415=>698,5416=>698,5417=>698,5418=>698,5419=>698,5420=>698,5421=>698,5422=>698,5423=>902,5424=>903,
-5425=>911,5426=>896,5427=>911,5428=>896,5429=>902,5430=>903,5431=>902,5432=>903,5433=>911,5434=>896,
-5435=>911,5436=>896,5437=>911,5438=>445,5440=>355,5441=>458,5442=>929,5443=>929,5444=>878,5445=>878,
-5446=>878,5447=>878,5448=>659,5449=>659,5450=>659,5451=>659,5452=>659,5453=>659,5454=>902,5455=>863,
-5456=>445,5458=>797,5459=>696,5460=>696,5461=>696,5462=>696,5463=>835,5464=>835,5465=>835,5466=>835,
-5467=>1055,5468=>1028,5469=>542,5470=>730,5471=>730,5472=>730,5473=>730,5474=>730,5475=>730,5476=>734,
-5477=>734,5478=>734,5479=>734,5480=>954,5481=>946,5482=>493,5492=>879,5493=>879,5494=>879,5495=>879,
-5496=>879,5497=>879,5498=>879,5499=>556,5500=>753,5501=>458,5502=>1114,5503=>1114,5504=>1114,5505=>1114,
-5506=>1114,5507=>1114,5508=>1114,5509=>890,5514=>879,5515=>879,5516=>879,5517=>879,5518=>1432,5519=>1432,
-5520=>1432,5521=>1165,5522=>1165,5523=>1432,5524=>1432,5525=>763,5526=>1146,5536=>889,5537=>889,5538=>838,
-5539=>838,5540=>838,5541=>838,5542=>593,5543=>698,5544=>698,5545=>698,5546=>698,5547=>698,5548=>698,
-5549=>698,5550=>445,5551=>668,5598=>747,5601=>747,5702=>446,5703=>446,5742=>371,5743=>1114,5744=>1432,
-5745=>1814,5746=>1814,5747=>1548,5748=>1510,5749=>1814,5750=>1814,7424=>586,7425=>750,7426=>943,7427=>547,
-7428=>533,7429=>608,7430=>608,7431=>502,7432=>501,7433=>308,7434=>444,7435=>598,7436=>485,7437=>735,
-7438=>630,7439=>618,7440=>533,7441=>594,7442=>594,7443=>594,7444=>984,7446=>618,7447=>618,7448=>500,
-7449=>578,7450=>578,7451=>521,7452=>571,7453=>663,7454=>853,7455=>625,7456=>586,7457=>831,7458=>523,
-7459=>581,7462=>485,7463=>586,7464=>622,7465=>500,7466=>703,7467=>659,7468=>438,7469=>615,7470=>432,
-7472=>470,7473=>387,7474=>387,7475=>465,7476=>474,7477=>211,7478=>211,7479=>439,7480=>361,7481=>563,
-7482=>474,7483=>474,7484=>481,7485=>458,7486=>415,7487=>436,7488=>387,7489=>460,7490=>625,7491=>412,
-7492=>412,7493=>431,7494=>641,7495=>431,7496=>431,7497=>431,7498=>431,7499=>347,7500=>347,7501=>431,
-7502=>197,7503=>438,7504=>597,7505=>410,7506=>439,7507=>372,7508=>439,7509=>439,7510=>431,7511=>349,
-7512=>410,7513=>416,7514=>597,7515=>451,7517=>405,7518=>386,7519=>389,7520=>443,7521=>365,7522=>197,
-7523=>284,7524=>410,7525=>451,7526=>405,7527=>386,7528=>405,7529=>443,7530=>365,7543=>644,7544=>474,
-7547=>491,7557=>462,7579=>431,7580=>372,7581=>372,7582=>439,7583=>347,7584=>339,7585=>313,7586=>431,
-7587=>410,7588=>312,7589=>253,7590=>312,7591=>312,7592=>388,7593=>293,7594=>296,7595=>333,7596=>598,
-7597=>597,7598=>505,7599=>505,7600=>403,7601=>439,7602=>488,7603=>379,7604=>356,7605=>349,7606=>524,
-7607=>444,7608=>359,7609=>405,7610=>451,7611=>375,7612=>471,7613=>422,7614=>409,7615=>382,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>696,7681=>607,7682=>686,7683=>644,7684=>686,
-7685=>644,7686=>686,7687=>644,7688=>660,7689=>533,7690=>747,7691=>644,7692=>747,7693=>644,7694=>747,
-7695=>644,7696=>747,7697=>644,7698=>747,7699=>644,7700=>615,7701=>610,7702=>615,7703=>610,7704=>615,
-7705=>610,7706=>615,7707=>610,7708=>615,7709=>610,7710=>615,7711=>391,7712=>738,7713=>644,7714=>753,
-7715=>641,7716=>753,7717=>641,7718=>753,7719=>641,7720=>753,7721=>641,7722=>753,7723=>641,7724=>334,
-7725=>308,7726=>334,7727=>308,7728=>697,7729=>598,7730=>697,7731=>598,7732=>697,7733=>598,7734=>573,
-7735=>308,7736=>573,7737=>308,7738=>573,7739=>308,7740=>573,7741=>308,7742=>896,7743=>938,7744=>896,
-7745=>938,7746=>896,7747=>938,7748=>753,7749=>641,7750=>753,7751=>641,7752=>753,7753=>641,7754=>753,
-7755=>641,7756=>765,7757=>618,7758=>765,7759=>618,7760=>765,7761=>618,7762=>765,7763=>618,7764=>659,
-7765=>644,7766=>659,7767=>644,7768=>693,7769=>444,7770=>693,7771=>444,7772=>693,7773=>444,7774=>693,
-7775=>444,7776=>648,7777=>536,7778=>648,7779=>536,7780=>648,7781=>536,7782=>648,7783=>536,7784=>648,
-7785=>536,7786=>614,7787=>430,7788=>614,7789=>430,7790=>614,7791=>430,7792=>614,7793=>430,7794=>730,
-7795=>641,7796=>730,7797=>641,7798=>730,7799=>641,7800=>730,7801=>641,7802=>730,7803=>641,7804=>696,
-7805=>586,7806=>696,7807=>586,7808=>993,7809=>831,7810=>993,7811=>831,7812=>993,7813=>831,7814=>993,
-7815=>831,7816=>993,7817=>831,7818=>694,7819=>580,7820=>694,7821=>580,7822=>651,7823=>586,7824=>652,
-7825=>523,7826=>652,7827=>523,7828=>652,7829=>523,7830=>641,7831=>430,7832=>831,7833=>586,7834=>607,
-7835=>391,7838=>806,7839=>618,7840=>696,7841=>607,7842=>696,7843=>607,7844=>696,7845=>607,7846=>696,
-7847=>607,7848=>696,7849=>607,7850=>696,7851=>607,7852=>696,7853=>607,7854=>696,7855=>607,7856=>696,
-7857=>607,7858=>696,7859=>607,7860=>696,7861=>607,7862=>696,7863=>607,7864=>615,7865=>610,7866=>615,
-7867=>610,7868=>615,7869=>610,7870=>615,7871=>610,7872=>615,7873=>610,7874=>615,7875=>610,7876=>615,
-7877=>610,7878=>615,7879=>610,7880=>334,7881=>308,7882=>334,7883=>308,7884=>765,7885=>618,7886=>765,
-7887=>618,7888=>765,7889=>618,7890=>765,7891=>618,7892=>765,7893=>618,7894=>765,7895=>618,7896=>765,
-7897=>618,7898=>765,7899=>618,7900=>765,7901=>618,7902=>765,7903=>618,7904=>765,7905=>618,7906=>765,
-7907=>618,7908=>730,7909=>641,7910=>730,7911=>641,7912=>730,7913=>641,7914=>730,7915=>641,7916=>730,
-7917=>641,7918=>730,7919=>641,7920=>730,7921=>641,7922=>651,7923=>586,7924=>651,7925=>586,7926=>651,
-7927=>586,7928=>651,7929=>586,7936=>618,7937=>618,7938=>618,7939=>618,7940=>618,7941=>618,7942=>618,
-7943=>618,7944=>696,7945=>696,7946=>937,7947=>939,7948=>841,7949=>866,7950=>751,7951=>773,7952=>501,
-7953=>501,7954=>501,7955=>501,7956=>501,7957=>501,7960=>712,7961=>715,7962=>989,7963=>986,7964=>920,
-7965=>947,7968=>641,7969=>641,7970=>641,7971=>641,7972=>641,7973=>641,7974=>641,7975=>641,7976=>851,
-7977=>856,7978=>1125,7979=>1125,7980=>1062,7981=>1085,7982=>948,7983=>956,7984=>351,7985=>351,7986=>351,
-7987=>351,7988=>351,7989=>351,7990=>351,7991=>351,7992=>435,7993=>440,7994=>699,7995=>707,7996=>641,
-7997=>664,7998=>544,7999=>544,8000=>618,8001=>618,8002=>618,8003=>618,8004=>618,8005=>618,8008=>802,
-8009=>839,8010=>1099,8011=>1101,8012=>947,8013=>974,8016=>607,8017=>607,8018=>607,8019=>607,8020=>607,
-8021=>607,8022=>607,8023=>607,8025=>837,8027=>1065,8029=>1079,8031=>944,8032=>782,8033=>782,8034=>782,
-8035=>782,8036=>782,8037=>782,8038=>782,8039=>782,8040=>817,8041=>862,8042=>1121,8043=>1126,8044=>968,
-8045=>994,8046=>925,8047=>968,8048=>618,8049=>618,8050=>501,8051=>501,8052=>641,8053=>641,8054=>351,
-8055=>351,8056=>618,8057=>618,8058=>607,8059=>607,8060=>782,8061=>782,8064=>618,8065=>618,8066=>618,
-8067=>618,8068=>618,8069=>618,8070=>618,8071=>618,8072=>696,8073=>696,8074=>937,8075=>939,8076=>841,
-8077=>866,8078=>751,8079=>773,8080=>641,8081=>641,8082=>641,8083=>641,8084=>641,8085=>641,8086=>641,
-8087=>641,8088=>851,8089=>856,8090=>1125,8091=>1125,8092=>1062,8093=>1085,8094=>948,8095=>956,8096=>782,
-8097=>782,8098=>782,8099=>782,8100=>782,8101=>782,8102=>782,8103=>782,8104=>817,8105=>862,8106=>1121,
-8107=>1126,8108=>968,8109=>994,8110=>925,8111=>968,8112=>618,8113=>618,8114=>618,8115=>618,8116=>618,
-8118=>618,8119=>618,8120=>696,8121=>696,8122=>789,8123=>717,8124=>696,8125=>450,8126=>450,8127=>450,
-8128=>450,8129=>450,8130=>641,8131=>641,8132=>641,8134=>641,8135=>641,8136=>836,8137=>761,8138=>972,
-8139=>908,8140=>753,8141=>450,8142=>450,8143=>450,8144=>351,8145=>351,8146=>351,8147=>351,8150=>351,
-8151=>351,8152=>334,8153=>334,8154=>559,8155=>507,8157=>450,8158=>450,8159=>450,8160=>607,8161=>607,
-8162=>607,8163=>607,8164=>644,8165=>644,8166=>607,8167=>607,8168=>651,8169=>651,8170=>918,8171=>882,
-8172=>754,8173=>450,8174=>450,8175=>450,8178=>782,8179=>782,8180=>782,8182=>782,8183=>782,8184=>958,
-8185=>801,8186=>976,8187=>804,8188=>765,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,
-8196=>296,8197=>225,8198=>150,8199=>626,8200=>342,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,
-8206=>0,8207=>0,8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,8215=>450,8219=>342,8223=>591,
-8227=>575,8228=>342,8229=>616,8231=>313,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,
-8241=>1717,8242=>237,8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,8251=>875,8252=>564,
-8253=>522,8254=>450,8255=>745,8256=>745,8257=>296,8258=>920,8259=>450,8260=>150,8261=>411,8262=>411,
-8263=>927,8264=>746,8265=>746,8266=>461,8267=>618,8268=>450,8269=>450,8270=>470,8271=>360,8272=>745,
-8273=>470,8274=>500,8275=>754,8276=>745,8277=>754,8278=>615,8279=>731,8280=>754,8281=>754,8282=>342,
-8283=>784,8284=>754,8285=>342,8286=>342,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>394,8305=>197,8308=>394,8309=>394,
-8310=>394,8311=>394,8312=>394,8313=>394,8314=>475,8315=>475,8316=>475,8317=>259,8318=>259,8319=>410,
-8320=>394,8321=>394,8322=>394,8323=>394,8324=>394,8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,
-8330=>475,8331=>475,8332=>475,8333=>259,8334=>259,8336=>412,8337=>431,8338=>439,8339=>371,8340=>431,
-8352=>836,8353=>626,8354=>626,8355=>626,8356=>626,8357=>938,8358=>753,8359=>1339,8360=>1084,8361=>993,
-8362=>768,8363=>642,8365=>626,8366=>614,8367=>1252,8368=>626,8369=>626,8370=>626,8371=>626,8372=>773,
-8373=>626,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>995,8449=>995,
-8450=>660,8451=>1090,8452=>807,8453=>1002,8454=>1033,8455=>626,8456=>628,8457=>856,8459=>965,8460=>822,
-8461=>799,8462=>641,8463=>641,8464=>537,8465=>627,8466=>771,8467=>424,8468=>876,8469=>753,8470=>1083,
-8471=>900,8472=>627,8473=>675,8474=>765,8475=>844,8476=>732,8477=>721,8478=>807,8479=>639,8480=>917,
-8481=>1115,8483=>751,8484=>679,8485=>560,8486=>765,8487=>692,8488=>686,8489=>272,8490=>697,8491=>696,
-8492=>835,8493=>736,8494=>769,8495=>572,8496=>656,8497=>727,8498=>615,8499=>1065,8500=>418,8501=>714,
-8502=>658,8503=>444,8504=>615,8505=>342,8506=>851,8507=>1232,8508=>710,8509=>663,8510=>589,8511=>776,
-8512=>756,8513=>707,8514=>518,8515=>573,8516=>684,8517=>747,8518=>644,8519=>610,8520=>308,8521=>308,
-8523=>785,8526=>492,8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,8537=>932,8538=>932,
-8539=>932,8540=>932,8541=>932,8542=>932,8543=>554,8544=>334,8545=>593,8546=>851,8547=>989,8548=>696,
-8549=>989,8550=>1247,8551=>1505,8552=>1008,8553=>694,8554=>1008,8555=>1266,8556=>573,8557=>660,8558=>747,
-8559=>896,8560=>308,8561=>546,8562=>785,8563=>885,8564=>586,8565=>866,8566=>1104,8567=>1342,8568=>872,
-8569=>580,8570=>872,8571=>1110,8572=>308,8573=>533,8574=>644,8575=>938,8576=>1160,8577=>747,8578=>1160,
-8579=>660,8580=>533,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,
-8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,
-8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,
-8620=>754,8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,
-8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,
-8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,
-8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,
-8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,
-8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,
-8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,
-8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,
-8700=>754,8701=>754,8702=>754,8703=>754,8704=>696,8705=>626,8706=>489,8707=>615,8708=>615,8709=>771,
-8710=>627,8711=>627,8712=>807,8713=>807,8714=>675,8715=>807,8716=>807,8717=>675,8718=>572,8719=>708,
-8720=>708,8721=>646,8722=>754,8723=>754,8724=>626,8725=>329,8726=>626,8727=>754,8728=>563,8729=>342,
-8730=>600,8731=>600,8732=>600,8733=>641,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,
-8740=>450,8741=>450,8742=>450,8743=>730,8744=>730,8745=>730,8746=>730,8747=>549,8748=>835,8749=>1165,
-8750=>506,8751=>879,8752=>1181,8753=>506,8754=>506,8755=>506,8756=>626,8757=>626,8758=>264,8759=>626,
-8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,
-8770=>754,8771=>754,8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,
-8780=>754,8781=>754,8782=>754,8783=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>956,8789=>956,
-8790=>754,8791=>754,8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,
-8800=>754,8801=>754,8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>756,8809=>756,
-8810=>942,8811=>942,8812=>450,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,
-8820=>754,8821=>754,8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,
-8830=>754,8831=>754,8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,
-8840=>754,8841=>754,8842=>754,8843=>754,8844=>730,8845=>730,8846=>730,8847=>754,8848=>754,8849=>754,
-8850=>754,8851=>716,8852=>716,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,
-8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,8865=>754,8866=>822,8867=>822,8868=>822,8869=>822,
-8870=>488,8871=>488,8872=>822,8873=>822,8874=>822,8875=>822,8876=>822,8877=>822,8878=>822,8879=>822,
-8880=>754,8881=>754,8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,
-8890=>488,8891=>730,8892=>730,8893=>730,8894=>754,8895=>754,8896=>758,8897=>758,8898=>758,8899=>758,
-8900=>444,8901=>342,8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,
-8910=>730,8911=>730,8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,
-8920=>1280,8921=>1280,8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,
-8930=>754,8931=>754,8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,
-8940=>754,8941=>754,8942=>900,8943=>900,8944=>900,8945=>900,8946=>1042,8947=>807,8948=>675,8949=>807,
-8950=>807,8951=>675,8952=>807,8953=>807,8954=>1042,8955=>807,8956=>675,8957=>807,8958=>675,8959=>807,
-8960=>542,8961=>542,8962=>644,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>411,8969=>411,
-8970=>411,8971=>411,8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>484,8984=>835,8985=>754,
-8988=>422,8989=>422,8990=>422,8991=>422,8992=>549,8993=>549,8996=>1037,8997=>1037,8998=>1272,8999=>1037,
-9000=>1299,9003=>1272,9004=>786,9075=>351,9076=>644,9077=>782,9082=>618,9085=>776,9095=>1037,9108=>786,
-9115=>450,9116=>450,9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,
-9125=>450,9126=>450,9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>549,
-9166=>754,9167=>850,9187=>786,9189=>692,9250=>644,9251=>644,9312=>762,9313=>762,9314=>762,9315=>762,
-9316=>762,9317=>762,9318=>762,9319=>762,9320=>762,9321=>762,9600=>692,9601=>692,9602=>692,9603=>692,
-9604=>692,9605=>692,9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,
-9614=>692,9615=>692,9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,
-9624=>692,9625=>692,9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,
-9634=>850,9635=>850,9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,
-9644=>850,9645=>850,9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,
-9654=>692,9655=>692,9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,
-9664=>692,9665=>692,9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,
-9674=>444,9675=>785,9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,
-9684=>785,9685=>785,9686=>474,9687=>474,9688=>756,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,
-9694=>348,9695=>348,9696=>692,9697=>692,9698=>692,9699=>692,9700=>692,9701=>692,9702=>575,9703=>850,
-9704=>850,9705=>850,9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,
-9714=>850,9715=>850,9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,
-9724=>747,9725=>659,9726=>659,9727=>692,9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,
-9734=>807,9735=>515,9736=>806,9737=>807,9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,
-9744=>807,9745=>807,9746=>807,9747=>479,9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,
-9754=>807,9755=>807,9756=>807,9757=>548,9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,
-9764=>602,9765=>671,9766=>584,9767=>705,9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,
-9774=>807,9775=>807,9776=>807,9777=>807,9778=>807,9779=>807,9780=>807,9781=>807,9782=>807,9783=>807,
-9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,
-9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,
-9804=>807,9805=>807,9806=>807,9807=>807,9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,
-9814=>807,9815=>807,9816=>807,9817=>807,9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,
-9824=>807,9825=>807,9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,
-9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,
-9844=>807,9845=>807,9846=>807,9847=>807,9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,
-9854=>807,9855=>807,9856=>782,9857=>782,9858=>782,9859=>782,9860=>782,9861=>782,9862=>807,9863=>807,
-9864=>807,9865=>807,9866=>807,9867=>807,9868=>807,9869=>807,9870=>807,9871=>807,9872=>807,9873=>807,
-9874=>807,9875=>807,9876=>807,9877=>487,9878=>807,9879=>807,9880=>807,9881=>807,9882=>807,9883=>807,
-9884=>807,9888=>807,9889=>632,9890=>903,9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,
-9897=>754,9898=>754,9899=>754,9900=>754,9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,
-9907=>659,9908=>659,9909=>659,9910=>765,9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,
-9990=>754,9991=>754,9992=>754,9993=>754,9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,
-10002=>754,10003=>754,10004=>754,10005=>754,10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,
-10012=>754,10013=>754,10014=>754,10015=>754,10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,
-10022=>754,10023=>754,10025=>754,10026=>754,10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,
-10033=>754,10034=>754,10035=>754,10036=>754,10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,
-10043=>754,10044=>754,10045=>754,10046=>754,10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,
-10053=>754,10054=>754,10055=>754,10056=>754,10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,
-10065=>807,10066=>807,10070=>807,10072=>754,10073=>754,10074=>754,10075=>290,10076=>290,10077=>484,10078=>484,
-10081=>754,10082=>754,10083=>754,10084=>754,10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,
-10091=>754,10092=>754,10093=>754,10094=>754,10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,
-10101=>754,10102=>762,10103=>762,10104=>762,10105=>762,10106=>762,10107=>762,10108=>762,10109=>762,10110=>762,
-10111=>762,10112=>754,10113=>754,10114=>754,10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,
-10121=>754,10122=>754,10123=>754,10124=>754,10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,
-10131=>754,10132=>754,10136=>754,10137=>754,10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,
-10144=>754,10145=>754,10146=>754,10147=>754,10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,
-10154=>754,10155=>754,10156=>754,10157=>754,10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,
-10165=>754,10166=>754,10167=>754,10168=>754,10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,
-10181=>411,10182=>411,10208=>444,10214=>438,10215=>438,10216=>411,10217=>411,10218=>648,10219=>648,10224=>754,
-10225=>754,10226=>754,10227=>754,10228=>1042,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,
-10235=>1290,10236=>1290,10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,
-10245=>703,10246=>703,10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,
-10255=>703,10256=>703,10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,
-10265=>703,10266=>703,10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,
-10275=>703,10276=>703,10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,
-10285=>703,10286=>703,10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,
-10295=>703,10296=>703,10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,
-10305=>703,10306=>703,10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,
-10315=>703,10316=>703,10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,
-10325=>703,10326=>703,10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,
-10335=>703,10336=>703,10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,
-10345=>703,10346=>703,10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,
-10355=>703,10356=>703,10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,
-10365=>703,10366=>703,10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,
-10375=>703,10376=>703,10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,
-10385=>703,10386=>703,10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,
-10395=>703,10396=>703,10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,
-10405=>703,10406=>703,10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,
-10415=>703,10416=>703,10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,
-10425=>703,10426=>703,10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,
-10435=>703,10436=>703,10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,
-10445=>703,10446=>703,10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,
-10455=>703,10456=>703,10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,
-10465=>703,10466=>703,10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,
-10475=>703,10476=>703,10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,
-10485=>703,10486=>703,10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,
-10495=>703,10502=>754,10503=>754,10506=>754,10507=>754,10560=>754,10561=>754,10627=>678,10628=>678,10702=>754,
-10703=>941,10704=>941,10705=>900,10706=>900,10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,
-10752=>900,10753=>900,10754=>900,10764=>1495,10765=>506,10766=>506,10767=>506,10768=>506,10769=>506,10770=>506,
-10771=>506,10772=>506,10773=>506,10774=>506,10775=>506,10776=>506,10777=>506,10778=>506,10779=>506,10780=>506,
-10799=>754,10877=>754,10878=>754,10879=>754,10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,
-10886=>754,10887=>754,10888=>754,10889=>754,10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,
-10896=>754,10897=>754,10898=>754,10899=>754,10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,
-10906=>754,10907=>754,10908=>754,10909=>754,10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,
-10929=>754,10930=>754,10931=>754,10932=>754,10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,
-11001=>754,11002=>754,11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,
-11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,
-11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,
-11040=>782,11041=>786,11042=>786,11043=>786,11044=>1007,11091=>782,11092=>782,11360=>573,11361=>324,11362=>573,
-11363=>659,11364=>693,11365=>607,11366=>430,11367=>860,11368=>641,11369=>697,11370=>598,11371=>652,11372=>523,
-11373=>774,11374=>896,11375=>696,11377=>700,11378=>1099,11379=>950,11380=>586,11381=>628,11382=>508,11383=>704,
-11385=>484,11386=>618,11387=>502,11388=>197,11389=>438,11800=>527,11810=>411,11811=>411,11812=>411,11813=>411,
-11822=>522,19904=>807,19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,19910=>807,19911=>807,19912=>807,
-19913=>807,19914=>807,19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,19920=>807,19921=>807,19922=>807,
-19923=>807,19924=>807,19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,19930=>807,19931=>807,19932=>807,
-19933=>807,19934=>807,19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,19940=>807,19941=>807,19942=>807,
-19943=>807,19944=>807,19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,19950=>807,19951=>807,19952=>807,
-19953=>807,19954=>807,19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,19960=>807,19961=>807,19962=>807,
-19963=>807,19964=>807,19965=>807,19966=>807,19967=>807,42564=>648,42565=>536,42566=>392,42567=>396,42572=>1265,
-42573=>1055,42576=>1110,42577=>924,42580=>1056,42581=>875,42582=>990,42583=>872,42594=>990,42595=>846,42596=>986,
-42597=>823,42598=>1134,42599=>896,42600=>765,42601=>618,42602=>933,42603=>781,42604=>1266,42605=>995,42606=>865,
-42634=>849,42635=>673,42636=>614,42637=>521,42644=>727,42645=>641,42760=>450,42761=>450,42762=>450,42763=>450,
-42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,42771=>450,42772=>450,42773=>450,
-42774=>450,42779=>360,42780=>360,42781=>258,42782=>258,42783=>258,42790=>753,42791=>641,42792=>928,42793=>771,
-42794=>626,42795=>501,42800=>502,42801=>536,42802=>1214,42803=>946,42804=>1156,42805=>958,42806=>1120,42807=>947,
-42808=>971,42809=>830,42810=>971,42811=>830,42812=>932,42813=>830,42814=>628,42815=>494,42822=>765,42823=>488,
-42824=>614,42825=>478,42826=>826,42827=>732,42830=>1266,42831=>995,42880=>573,42881=>308,42882=>753,42883=>641,
-42889=>360,42890=>356,42891=>410,42892=>275,43003=>615,43004=>659,43005=>896,43006=>334,43007=>1192,62917=>618,
-64256=>749,64257=>708,64258=>708,64259=>1024,64260=>1024,64261=>727,64262=>917,64275=>1249,64276=>1245,64277=>1240,
-64278=>1245,64279=>1542,64285=>308,64286=>0,64287=>597,64288=>647,64289=>867,64290=>801,64291=>889,64292=>867,
-64293=>844,64294=>889,64295=>889,64296=>878,64297=>754,64298=>854,64299=>854,64300=>854,64301=>854,64302=>676,
-64303=>676,64304=>676,64305=>605,64306=>483,64307=>589,64308=>641,64309=>308,64310=>442,64312=>651,64313=>420,
-64314=>584,64315=>584,64316=>611,64318=>698,64320=>447,64321=>696,64323=>646,64324=>618,64326=>676,64327=>656,
-64328=>584,64329=>854,64330=>676,64331=>308,64332=>605,64333=>584,64334=>618,64335=>676,65024=>0,65025=>0,
-65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,
-65036=>0,65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,
-65531=>0,65532=>0,65533=>1002);
-$enc='';
-$diff='';
-$file='dejavusanscondensedbi.z';
-$ctg='dejavusanscondensedbi.ctg.z';
-$originalsize=493196;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedi.php
deleted file mode 100644
index b2a62c041b3..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusanscondensedi.php
+++ /dev/null
@@ -1,471 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansCondensed-Oblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-39,'Flags'=>96,'FontBBox'=>'[-914 -350 1493 1068]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>360,34=>414,35=>754,36=>572,37=>855,38=>702,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>325,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>478,64=>900,65=>615,66=>617,67=>628,68=>693,69=>568,70=>518,
-71=>697,72=>677,73=>265,74=>265,75=>590,76=>501,77=>776,78=>673,79=>708,80=>542,
-81=>708,82=>625,83=>571,84=>549,85=>659,86=>615,87=>890,88=>616,89=>549,90=>616,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>551,98=>571,99=>495,100=>571,
-101=>554,102=>316,103=>571,104=>570,105=>250,106=>250,107=>521,108=>250,109=>876,110=>570,
-111=>550,112=>571,113=>571,114=>370,115=>469,116=>353,117=>570,118=>532,119=>736,120=>532,
-121=>532,122=>472,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>316,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1215,352=>571,8249=>360,338=>962,381=>616,8216=>286,
-8217=>286,8220=>466,8221=>466,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>469,8250=>360,
-339=>925,382=>472,376=>549,160=>286,161=>360,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>424,171=>555,172=>754,173=>325,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>572,182=>572,183=>286,184=>450,185=>360,186=>424,
-187=>555,188=>872,189=>872,190=>872,191=>478,192=>615,193=>615,194=>615,195=>615,196=>615,
-197=>615,198=>876,199=>628,200=>568,201=>568,202=>568,203=>568,204=>265,205=>265,206=>265,
-207=>265,208=>697,209=>673,210=>708,211=>708,212=>708,213=>708,214=>708,215=>754,216=>708,
-217=>659,218=>659,219=>659,220=>659,221=>549,222=>547,223=>567,224=>551,225=>551,226=>551,
-227=>551,228=>551,229=>551,230=>896,231=>495,232=>554,233=>554,234=>554,235=>554,236=>250,
-237=>250,238=>250,239=>250,240=>550,241=>570,242=>550,243=>550,244=>550,245=>550,246=>550,
-247=>754,248=>550,249=>570,250=>570,251=>570,252=>570,253=>532,254=>571,255=>532,256=>615,
-257=>551,258=>615,259=>551,260=>615,261=>551,262=>628,263=>495,264=>628,265=>495,266=>628,
-267=>495,268=>628,269=>495,270=>693,271=>571,272=>697,273=>571,274=>568,275=>554,276=>568,
-277=>554,278=>568,279=>554,280=>568,281=>554,282=>568,283=>554,284=>697,285=>571,286=>697,
-287=>571,288=>697,289=>571,290=>697,291=>571,292=>677,293=>570,294=>824,295=>625,296=>265,
-297=>250,298=>265,299=>250,300=>265,301=>250,302=>265,303=>250,304=>265,305=>250,306=>531,
-307=>500,308=>265,309=>250,310=>590,311=>521,312=>521,313=>501,314=>250,315=>501,316=>250,
-317=>501,318=>250,319=>501,320=>250,321=>505,322=>258,323=>673,324=>570,325=>673,326=>570,
-327=>673,328=>570,329=>732,330=>673,331=>570,332=>708,333=>550,334=>708,335=>550,336=>708,
-337=>550,340=>625,341=>370,342=>625,343=>370,344=>625,345=>370,346=>571,347=>469,348=>571,
-349=>469,350=>571,351=>469,354=>549,355=>353,356=>549,357=>353,358=>549,359=>353,360=>659,
-361=>570,362=>659,363=>570,364=>659,365=>570,366=>659,367=>570,368=>659,369=>570,370=>659,
-371=>570,372=>890,373=>736,374=>549,375=>532,377=>616,378=>472,379=>616,380=>472,383=>316,
-384=>571,385=>661,386=>617,387=>571,388=>617,389=>571,390=>633,391=>628,392=>495,393=>697,
-394=>737,395=>617,396=>571,397=>550,398=>568,399=>708,400=>553,401=>518,403=>697,404=>618,
-405=>885,406=>318,407=>265,408=>671,409=>521,410=>250,411=>532,412=>876,413=>673,414=>570,
-415=>708,416=>822,417=>550,418=>844,419=>663,420=>586,421=>571,422=>625,423=>571,424=>469,
-425=>568,426=>302,427=>353,428=>549,429=>353,430=>549,431=>754,432=>570,433=>688,434=>648,
-435=>669,436=>657,437=>616,438=>472,439=>599,440=>599,441=>520,442=>472,443=>572,444=>599,
-445=>520,446=>459,447=>571,448=>265,449=>443,450=>413,451=>266,452=>1310,453=>1165,454=>1043,
-455=>767,456=>751,457=>500,458=>938,459=>923,460=>820,461=>615,462=>551,463=>265,464=>250,
-465=>708,466=>550,467=>659,468=>570,469=>659,470=>570,471=>659,472=>570,473=>659,474=>570,
-475=>659,476=>570,477=>554,478=>615,479=>551,480=>615,481=>551,482=>876,483=>896,484=>697,
-485=>571,486=>697,487=>571,488=>590,489=>521,490=>708,491=>550,492=>708,493=>550,494=>599,
-495=>472,496=>250,497=>1310,498=>1165,499=>1043,500=>697,501=>571,502=>1001,503=>614,504=>673,
-505=>570,506=>615,507=>551,508=>876,509=>896,510=>708,511=>550,512=>615,513=>551,514=>615,
-515=>551,516=>568,517=>554,518=>568,519=>554,520=>265,521=>250,522=>265,523=>250,524=>708,
-525=>550,526=>708,527=>550,528=>625,529=>370,530=>625,531=>370,532=>659,533=>570,534=>659,
-535=>570,536=>571,537=>469,538=>549,539=>353,540=>564,541=>469,542=>677,543=>570,544=>662,
-545=>754,546=>628,547=>549,548=>616,549=>472,550=>615,551=>551,552=>568,553=>554,554=>708,
-555=>550,556=>708,557=>550,558=>708,559=>550,560=>708,561=>550,562=>549,563=>532,564=>427,
-565=>758,566=>429,567=>250,568=>898,569=>898,570=>615,571=>628,572=>495,573=>501,574=>549,
-575=>469,576=>472,577=>542,578=>431,579=>617,580=>659,581=>615,582=>568,583=>554,584=>265,
-585=>250,586=>703,587=>571,588=>625,589=>370,590=>549,591=>532,592=>551,593=>571,594=>571,
-595=>571,596=>495,597=>495,598=>571,599=>654,600=>554,601=>554,602=>759,603=>490,604=>490,
-605=>698,606=>598,607=>293,608=>626,609=>571,610=>566,611=>536,612=>536,613=>570,614=>570,
-615=>570,616=>334,617=>348,618=>334,619=>356,620=>438,621=>250,622=>635,623=>876,624=>876,
-625=>876,626=>581,627=>578,628=>570,629=>550,630=>772,631=>655,632=>593,633=>422,634=>422,
-635=>422,636=>422,637=>422,638=>477,639=>477,640=>541,641=>541,642=>469,643=>302,644=>302,
-645=>415,646=>302,647=>353,648=>353,649=>570,650=>556,651=>538,652=>532,653=>736,654=>532,
-655=>549,656=>472,657=>472,658=>520,659=>520,660=>459,661=>459,662=>459,663=>459,664=>708,
-665=>521,666=>598,667=>637,668=>588,669=>263,670=>600,671=>456,672=>654,673=>459,674=>459,
-675=>913,676=>952,677=>911,678=>742,679=>549,680=>700,681=>763,682=>576,683=>589,684=>463,
-685=>463,686=>513,687=>597,688=>359,689=>359,690=>157,691=>233,692=>266,693=>266,694=>341,
-695=>463,696=>335,697=>250,698=>414,699=>286,700=>286,701=>286,702=>276,703=>276,704=>333,
-705=>333,706=>450,707=>450,708=>450,709=>450,711=>450,712=>247,713=>450,714=>450,715=>450,
-716=>247,717=>450,718=>450,719=>450,720=>303,721=>303,722=>276,723=>276,724=>450,725=>450,
-726=>351,727=>286,728=>450,729=>450,730=>450,731=>450,733=>450,734=>284,735=>450,736=>383,
-737=>149,738=>335,739=>399,740=>333,741=>444,742=>444,743=>444,744=>444,745=>444,748=>450,
-749=>450,750=>466,755=>450,759=>450,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>589,881=>511,882=>775,
-883=>583,884=>250,885=>250,886=>673,887=>584,890=>450,891=>494,892=>495,893=>494,894=>303,
-900=>450,901=>450,902=>615,903=>286,904=>690,905=>813,906=>391,908=>755,910=>773,911=>814,
-912=>304,913=>615,914=>617,915=>501,916=>615,917=>568,918=>616,919=>677,920=>708,921=>265,
-922=>590,923=>615,924=>776,925=>673,926=>568,927=>708,928=>677,929=>542,931=>568,932=>549,
-933=>549,934=>708,935=>616,936=>708,937=>688,938=>265,939=>549,940=>593,941=>486,942=>570,
-943=>304,944=>521,945=>593,946=>574,947=>532,948=>550,949=>486,950=>489,951=>570,952=>550,
-953=>304,954=>530,955=>532,956=>572,957=>502,958=>501,959=>550,960=>542,961=>571,962=>528,
-963=>570,964=>542,965=>521,966=>593,967=>532,968=>593,969=>753,970=>304,971=>521,972=>550,
-973=>521,974=>753,975=>590,976=>553,977=>557,978=>628,979=>758,980=>628,981=>593,982=>753,
-983=>597,984=>708,985=>550,986=>583,987=>528,988=>518,989=>413,990=>593,991=>593,992=>778,
-993=>564,994=>840,995=>753,996=>682,997=>593,998=>712,999=>553,1000=>618,1001=>546,1002=>690,
-1003=>563,1004=>629,1005=>550,1006=>549,1007=>482,1008=>597,1009=>571,1010=>495,1011=>250,1012=>708,
-1013=>554,1014=>554,1015=>547,1016=>571,1017=>628,1018=>776,1019=>585,1020=>571,1021=>633,1022=>628,
-1023=>633,1024=>568,1025=>568,1026=>708,1027=>501,1028=>628,1029=>571,1030=>265,1031=>265,1032=>265,
-1033=>984,1034=>940,1035=>708,1036=>639,1037=>673,1038=>548,1039=>677,1040=>615,1041=>617,1042=>617,
-1043=>501,1044=>703,1045=>568,1046=>969,1047=>577,1048=>673,1049=>673,1050=>639,1051=>677,1052=>776,
-1053=>677,1054=>708,1055=>677,1056=>542,1057=>628,1058=>549,1059=>548,1060=>774,1061=>616,1062=>699,
-1063=>617,1064=>962,1065=>984,1066=>749,1067=>736,1068=>617,1069=>628,1070=>971,1071=>625,1072=>551,
-1073=>555,1074=>530,1075=>473,1076=>622,1077=>554,1078=>811,1079=>479,1080=>584,1081=>584,1082=>543,
-1083=>575,1084=>679,1085=>588,1086=>550,1087=>588,1088=>571,1089=>495,1090=>524,1091=>532,1092=>769,
-1093=>532,1094=>612,1095=>532,1096=>823,1097=>848,1098=>636,1099=>710,1100=>530,1101=>494,1102=>757,
-1103=>541,1104=>554,1105=>554,1106=>563,1107=>473,1108=>494,1109=>469,1110=>250,1111=>250,1112=>250,
-1113=>812,1114=>809,1115=>586,1116=>543,1117=>584,1118=>532,1119=>588,1120=>840,1121=>753,1122=>693,
-1123=>604,1124=>848,1125=>674,1126=>791,1127=>705,1128=>1043,1129=>901,1130=>708,1131=>550,1132=>924,
-1133=>742,1134=>572,1135=>486,1136=>771,1137=>789,1138=>708,1139=>550,1140=>703,1141=>598,1142=>703,
-1143=>598,1144=>893,1145=>813,1146=>857,1147=>682,1148=>1062,1149=>925,1150=>840,1151=>753,1152=>628,
-1153=>495,1154=>452,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>376,1161=>376,1162=>673,
-1163=>591,1164=>617,1165=>530,1166=>542,1167=>571,1168=>549,1169=>473,1170=>607,1171=>500,1172=>501,
-1173=>441,1174=>969,1175=>811,1176=>577,1177=>479,1178=>639,1179=>543,1180=>639,1181=>543,1182=>639,
-1183=>543,1184=>771,1185=>748,1186=>677,1187=>594,1188=>913,1189=>789,1190=>1002,1191=>855,1192=>801,
-1193=>636,1194=>628,1195=>495,1196=>549,1197=>476,1198=>549,1199=>532,1200=>549,1201=>532,1202=>616,
-1203=>532,1204=>840,1205=>726,1206=>617,1207=>532,1208=>617,1209=>532,1210=>617,1211=>570,1212=>836,
-1213=>658,1214=>836,1215=>658,1216=>265,1217=>969,1218=>811,1219=>589,1220=>543,1221=>677,1222=>575,
-1223=>677,1224=>594,1225=>677,1226=>594,1227=>617,1228=>532,1229=>776,1230=>679,1231=>250,1232=>615,
-1233=>551,1234=>615,1235=>551,1236=>876,1237=>896,1238=>568,1239=>554,1240=>708,1241=>554,1242=>708,
-1243=>554,1244=>969,1245=>811,1246=>577,1247=>479,1248=>599,1249=>520,1250=>673,1251=>584,1252=>673,
-1253=>584,1254=>708,1255=>550,1256=>708,1257=>550,1258=>708,1259=>550,1260=>628,1261=>494,1262=>548,
-1263=>532,1264=>548,1265=>532,1266=>548,1267=>532,1268=>617,1269=>532,1270=>501,1271=>442,1272=>736,
-1273=>710,1274=>607,1275=>500,1276=>616,1277=>532,1278=>616,1279=>532,1280=>617,1281=>530,1282=>905,
-1283=>807,1284=>877,1285=>782,1286=>611,1287=>529,1288=>964,1289=>861,1290=>1001,1291=>870,1292=>697,
-1293=>593,1294=>695,1295=>640,1296=>553,1297=>486,1298=>677,1299=>575,1300=>1076,1301=>896,1302=>810,
-1303=>780,1304=>927,1305=>890,1306=>708,1307=>571,1308=>890,1309=>736,1312=>1002,1313=>848,1314=>1002,
-1315=>854,1316=>713,1317=>614,1329=>780,1330=>659,1331=>794,1332=>794,1333=>659,1334=>579,1335=>613,
-1336=>659,1337=>765,1338=>794,1339=>659,1340=>501,1341=>741,1342=>888,1343=>659,1344=>636,1345=>579,
-1346=>794,1347=>699,1348=>794,1349=>659,1350=>756,1351=>659,1352=>659,1353=>659,1354=>711,1355=>579,
-1356=>794,1357=>659,1358=>794,1359=>571,1360=>659,1361=>659,1362=>719,1363=>774,1364=>711,1365=>708,
-1366=>571,1369=>276,1370=>286,1371=>450,1372=>450,1373=>352,1374=>474,1375=>450,1377=>876,1378=>570,
-1379=>686,1380=>690,1381=>570,1382=>627,1383=>479,1384=>570,1385=>630,1386=>627,1387=>570,1388=>363,
-1389=>804,1390=>576,1391=>570,1392=>570,1393=>571,1394=>631,1395=>570,1396=>593,1397=>250,1398=>684,
-1399=>464,1400=>570,1401=>407,1402=>876,1403=>464,1404=>691,1405=>570,1406=>626,1407=>876,1408=>570,
-1409=>571,1410=>451,1411=>876,1412=>583,1413=>550,1414=>566,1415=>686,1417=>303,1418=>390,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>325,1471=>0,1472=>265,1473=>0,1474=>0,1475=>265,1478=>410,
-1479=>0,1488=>566,1489=>547,1490=>403,1491=>534,1492=>576,1493=>245,1494=>336,1495=>576,1496=>583,
-1497=>245,1498=>532,1499=>500,1500=>539,1501=>576,1502=>593,1503=>245,1504=>397,1505=>629,1506=>506,
-1507=>576,1508=>543,1509=>468,1510=>523,1511=>596,1512=>532,1513=>727,1514=>591,1520=>423,1521=>409,
-1522=>423,1523=>374,1524=>580,3647=>586,3713=>603,3714=>615,3716=>619,3719=>434,3720=>565,3722=>615,
-3725=>619,3732=>577,3733=>577,3734=>605,3735=>589,3737=>576,3738=>533,3739=>533,3740=>670,3741=>690,
-3742=>618,3743=>618,3745=>631,3746=>619,3747=>615,3749=>584,3751=>569,3754=>633,3755=>737,3757=>569,
-3758=>615,3759=>708,3760=>569,3761=>0,3762=>485,3763=>485,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>597,3776=>324,3777=>611,3778=>414,3779=>492,3780=>442,
-3782=>606,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>572,3793=>576,3794=>576,
-3795=>603,3796=>563,3797=>563,3798=>633,3799=>603,3800=>606,3801=>609,3804=>925,3805=>925,4256=>756,
-4257=>621,4258=>577,4259=>683,4260=>532,4261=>617,4262=>710,4263=>729,4264=>420,4265=>508,4266=>710,
-4267=>713,4268=>526,4269=>753,4270=>675,4271=>620,4272=>729,4273=>526,4274=>526,4275=>753,4276=>753,
-4277=>581,4278=>543,4279=>526,4280=>536,4281=>526,4282=>649,4283=>715,4284=>526,4285=>510,4286=>526,
-4287=>602,4288=>719,4289=>488,4290=>598,4291=>488,4292=>508,4293=>606,4304=>457,4305=>457,4306=>479,
-4307=>706,4308=>470,4309=>465,4310=>457,4311=>717,4312=>457,4313=>466,4314=>952,4315=>470,4316=>470,
-4317=>704,4318=>466,4319=>470,4320=>713,4321=>470,4322=>590,4323=>471,4324=>709,4325=>470,4326=>704,
-4327=>470,4328=>470,4329=>470,4330=>510,4331=>470,4332=>470,4333=>439,4334=>470,4335=>448,4336=>465,
-4337=>504,4338=>457,4339=>457,4340=>457,4341=>507,4342=>741,4343=>536,4344=>470,4345=>498,4346=>498,
-4347=>527,4348=>273,5121=>615,5122=>615,5123=>615,5124=>615,5125=>692,5126=>692,5127=>692,5129=>692,
-5130=>692,5131=>692,5132=>751,5133=>751,5134=>751,5135=>751,5136=>751,5137=>751,5138=>870,5139=>906,
-5140=>870,5141=>906,5142=>692,5143=>870,5144=>906,5145=>870,5146=>906,5147=>692,5149=>230,5150=>488,
-5151=>381,5152=>381,5153=>350,5154=>350,5155=>354,5156=>350,5157=>419,5158=>347,5159=>230,5160=>350,
-5161=>350,5162=>350,5163=>980,5164=>817,5165=>857,5166=>1005,5167=>615,5168=>615,5169=>615,5170=>615,
-5171=>656,5172=>656,5173=>656,5175=>656,5176=>656,5177=>656,5178=>751,5179=>615,5180=>751,5181=>751,
-5182=>751,5183=>751,5184=>870,5185=>906,5186=>870,5187=>906,5188=>870,5189=>906,5190=>870,5191=>906,
-5192=>656,5193=>457,5194=>172,5196=>659,5197=>659,5198=>659,5199=>659,5200=>657,5201=>657,5202=>657,
-5204=>657,5205=>657,5206=>657,5207=>829,5208=>800,5209=>829,5210=>800,5211=>829,5212=>800,5213=>835,
-5214=>810,5215=>835,5216=>810,5217=>853,5218=>810,5219=>853,5220=>810,5221=>853,5222=>391,5223=>790,
-5224=>790,5225=>779,5226=>801,5227=>565,5228=>565,5229=>565,5230=>565,5231=>565,5232=>565,5233=>565,
-5234=>565,5235=>565,5236=>773,5237=>693,5238=>733,5239=>734,5240=>733,5241=>734,5242=>773,5243=>693,
-5244=>773,5245=>693,5246=>733,5247=>734,5248=>733,5249=>734,5250=>733,5251=>366,5252=>366,5253=>675,
-5254=>697,5255=>675,5256=>697,5257=>565,5258=>565,5259=>565,5260=>565,5261=>565,5262=>565,5263=>565,
-5264=>565,5265=>565,5266=>773,5267=>693,5268=>733,5269=>734,5270=>733,5271=>734,5272=>773,5273=>693,
-5274=>773,5275=>693,5276=>733,5277=>734,5278=>733,5279=>734,5280=>733,5281=>391,5282=>391,5283=>549,
-5284=>501,5285=>501,5286=>501,5287=>549,5288=>549,5289=>549,5290=>501,5291=>501,5292=>674,5293=>691,
-5294=>671,5295=>687,5296=>671,5297=>687,5298=>674,5299=>691,5300=>674,5301=>691,5302=>671,5303=>687,
-5304=>671,5305=>687,5306=>671,5307=>347,5308=>457,5309=>347,5312=>766,5313=>766,5314=>766,5315=>766,
-5316=>766,5317=>766,5318=>766,5319=>766,5320=>766,5321=>962,5322=>931,5323=>953,5324=>766,5325=>953,
-5326=>766,5327=>766,5328=>540,5329=>407,5330=>540,5331=>766,5332=>766,5333=>766,5334=>766,5335=>766,
-5336=>766,5337=>766,5338=>766,5339=>766,5340=>962,5341=>931,5342=>953,5343=>927,5344=>953,5345=>927,
-5346=>962,5347=>931,5348=>962,5349=>931,5350=>975,5351=>927,5352=>975,5353=>927,5354=>540,5356=>656,
-5357=>542,5358=>542,5359=>542,5360=>542,5361=>542,5362=>542,5363=>542,5364=>542,5365=>542,5366=>751,
-5367=>678,5368=>712,5369=>694,5370=>712,5371=>694,5372=>751,5373=>678,5374=>751,5375=>678,5376=>712,
-5377=>694,5378=>712,5379=>694,5380=>712,5381=>376,5382=>378,5383=>376,5392=>641,5393=>641,5394=>641,
-5395=>802,5396=>802,5397=>802,5398=>802,5399=>818,5400=>785,5401=>818,5402=>785,5403=>818,5404=>785,
-5405=>1026,5406=>989,5407=>1026,5408=>989,5409=>1026,5410=>989,5411=>1026,5412=>989,5413=>576,5414=>564,
-5415=>564,5416=>564,5417=>564,5418=>564,5419=>564,5420=>564,5421=>564,5422=>564,5423=>760,5424=>703,
-5425=>734,5426=>736,5427=>734,5428=>736,5429=>760,5430=>703,5431=>760,5432=>703,5433=>734,5434=>736,
-5435=>734,5436=>736,5437=>734,5438=>376,5440=>350,5441=>436,5442=>824,5443=>824,5444=>776,5445=>824,
-5446=>776,5447=>776,5448=>542,5449=>542,5450=>542,5451=>542,5452=>542,5453=>542,5454=>751,5455=>678,
-5456=>376,5458=>656,5459=>615,5460=>615,5461=>615,5462=>615,5463=>653,5464=>653,5465=>653,5466=>653,
-5467=>831,5468=>906,5469=>457,5470=>659,5471=>659,5472=>659,5473=>659,5474=>659,5475=>659,5476=>657,
-5477=>657,5478=>657,5479=>657,5480=>853,5481=>810,5482=>457,5492=>747,5493=>747,5494=>747,5495=>747,
-5496=>747,5497=>747,5498=>747,5499=>507,5500=>677,5501=>436,5502=>942,5503=>942,5504=>942,5505=>942,
-5506=>942,5507=>942,5508=>942,5509=>743,5514=>747,5515=>747,5516=>747,5517=>747,5518=>1133,5519=>1133,
-5520=>1133,5521=>901,5522=>901,5523=>1133,5524=>1133,5525=>629,5526=>965,5536=>766,5537=>766,5538=>719,
-5539=>719,5540=>719,5541=>719,5542=>540,5543=>579,5544=>579,5545=>579,5546=>579,5547=>579,5548=>579,
-5549=>579,5550=>376,5551=>565,5598=>693,5601=>693,5702=>421,5703=>421,5742=>399,5743=>942,5744=>1178,
-5745=>1469,5746=>1469,5747=>1237,5748=>1237,5749=>1469,5750=>1469,7424=>532,7425=>646,7426=>883,7427=>527,
-7428=>495,7429=>544,7430=>544,7431=>441,7432=>486,7433=>250,7434=>355,7435=>521,7436=>524,7437=>679,
-7438=>584,7439=>550,7440=>495,7441=>615,7442=>615,7443=>615,7444=>920,7446=>550,7447=>550,7448=>472,
-7449=>541,7450=>541,7451=>524,7452=>517,7453=>663,7454=>853,7455=>574,7456=>532,7457=>736,7458=>472,
-7459=>473,7462=>524,7463=>532,7464=>507,7465=>472,7466=>531,7467=>575,7468=>387,7469=>552,7470=>389,
-7472=>436,7473=>358,7474=>358,7475=>439,7476=>426,7477=>167,7478=>167,7479=>372,7480=>315,7481=>489,
-7482=>424,7483=>424,7484=>446,7485=>396,7486=>342,7487=>394,7488=>346,7489=>415,7490=>560,7491=>352,
-7492=>352,7493=>365,7494=>583,7495=>385,7496=>365,7497=>375,7498=>375,7499=>324,7500=>323,7501=>365,
-7502=>161,7503=>383,7504=>561,7505=>368,7506=>372,7507=>333,7508=>372,7509=>372,7510=>385,7511=>265,
-7512=>364,7513=>422,7514=>561,7515=>375,7517=>361,7518=>335,7519=>347,7520=>374,7521=>327,7522=>161,
-7523=>233,7524=>364,7525=>375,7526=>361,7527=>335,7528=>370,7529=>374,7530=>327,7543=>571,7544=>426,
-7547=>334,7557=>250,7579=>365,7580=>333,7581=>333,7582=>372,7583=>324,7584=>267,7585=>209,7586=>365,
-7587=>364,7588=>235,7589=>224,7590=>234,7591=>235,7592=>211,7593=>224,7594=>211,7595=>338,7596=>561,
-7597=>561,7598=>369,7599=>431,7600=>368,7601=>372,7602=>372,7603=>324,7604=>258,7605=>265,7606=>457,
-7607=>376,7608=>325,7609=>365,7610=>375,7611=>330,7612=>393,7613=>330,7614=>353,7615=>372,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>615,7681=>551,7682=>617,7683=>571,7684=>617,
-7685=>571,7686=>617,7687=>571,7688=>628,7689=>495,7690=>693,7691=>571,7692=>693,7693=>571,7694=>693,
-7695=>571,7696=>693,7697=>571,7698=>693,7699=>571,7700=>568,7701=>554,7702=>568,7703=>554,7704=>568,
-7705=>554,7706=>568,7707=>554,7708=>568,7709=>554,7710=>518,7711=>316,7712=>697,7713=>571,7714=>677,
-7715=>570,7716=>677,7717=>570,7718=>677,7719=>570,7720=>677,7721=>570,7722=>677,7723=>570,7724=>265,
-7725=>250,7726=>265,7727=>250,7728=>590,7729=>521,7730=>590,7731=>521,7732=>590,7733=>521,7734=>501,
-7735=>250,7736=>501,7737=>250,7738=>501,7739=>250,7740=>501,7741=>250,7742=>776,7743=>876,7744=>776,
-7745=>876,7746=>776,7747=>876,7748=>673,7749=>570,7750=>673,7751=>570,7752=>673,7753=>570,7754=>673,
-7755=>570,7756=>708,7757=>550,7758=>708,7759=>550,7760=>708,7761=>550,7762=>708,7763=>550,7764=>542,
-7765=>571,7766=>542,7767=>571,7768=>625,7769=>370,7770=>625,7771=>370,7772=>625,7773=>370,7774=>625,
-7775=>370,7776=>571,7777=>469,7778=>571,7779=>469,7780=>571,7781=>469,7782=>571,7783=>469,7784=>571,
-7785=>469,7786=>549,7787=>353,7788=>549,7789=>353,7790=>549,7791=>353,7792=>549,7793=>353,7794=>659,
-7795=>570,7796=>659,7797=>570,7798=>659,7799=>570,7800=>659,7801=>570,7802=>659,7803=>570,7804=>615,
-7805=>532,7806=>615,7807=>532,7808=>890,7809=>736,7810=>890,7811=>736,7812=>890,7813=>736,7814=>890,
-7815=>736,7816=>890,7817=>736,7818=>616,7819=>532,7820=>616,7821=>532,7822=>549,7823=>532,7824=>616,
-7825=>472,7826=>616,7827=>472,7828=>616,7829=>472,7830=>570,7831=>353,7832=>736,7833=>532,7834=>551,
-7835=>316,7838=>691,7839=>550,7840=>615,7841=>551,7842=>615,7843=>551,7844=>615,7845=>551,7846=>615,
-7847=>551,7848=>615,7849=>551,7850=>615,7851=>551,7852=>615,7853=>551,7854=>615,7855=>551,7856=>615,
-7857=>551,7858=>615,7859=>551,7860=>615,7861=>551,7862=>615,7863=>551,7864=>568,7865=>554,7866=>568,
-7867=>554,7868=>568,7869=>554,7870=>568,7871=>554,7872=>568,7873=>554,7874=>568,7875=>554,7876=>568,
-7877=>554,7878=>568,7879=>554,7880=>265,7881=>250,7882=>265,7883=>250,7884=>708,7885=>550,7886=>708,
-7887=>550,7888=>708,7889=>550,7890=>708,7891=>550,7892=>708,7893=>550,7894=>708,7895=>550,7896=>708,
-7897=>550,7898=>822,7899=>550,7900=>822,7901=>550,7902=>822,7903=>550,7904=>822,7905=>550,7906=>822,
-7907=>550,7908=>659,7909=>570,7910=>659,7911=>570,7912=>754,7913=>570,7914=>754,7915=>570,7916=>754,
-7917=>570,7918=>754,7919=>570,7920=>754,7921=>570,7922=>549,7923=>532,7924=>549,7925=>532,7926=>549,
-7927=>532,7928=>549,7929=>532,7936=>593,7937=>593,7938=>593,7939=>593,7940=>593,7941=>593,7942=>593,
-7943=>593,7944=>615,7945=>615,7946=>790,7947=>790,7948=>692,7949=>721,7950=>637,7951=>668,7952=>486,
-7953=>486,7954=>486,7955=>486,7956=>486,7957=>486,7960=>640,7961=>640,7962=>869,7963=>877,7964=>809,
-7965=>835,7968=>570,7969=>570,7970=>570,7971=>570,7972=>570,7973=>570,7974=>570,7975=>570,7976=>753,
-7977=>751,7978=>977,7979=>980,7980=>924,7981=>945,7982=>840,7983=>852,7984=>304,7985=>304,7986=>304,
-7987=>304,7988=>304,7989=>304,7990=>304,7991=>304,7992=>342,7993=>336,7994=>571,7995=>571,7996=>513,
-7997=>540,7998=>440,7999=>443,8000=>550,8001=>550,8002=>550,8003=>550,8004=>550,8005=>550,8008=>724,
-8009=>763,8010=>985,8011=>989,8012=>844,8013=>873,8016=>521,8017=>521,8018=>521,8019=>521,8020=>521,
-8021=>521,8022=>521,8023=>521,8025=>705,8027=>897,8029=>911,8031=>808,8032=>753,8033=>753,8034=>753,
-8035=>753,8036=>753,8037=>753,8038=>753,8039=>753,8040=>722,8041=>759,8042=>980,8043=>985,8044=>851,
-8045=>875,8046=>829,8047=>857,8048=>593,8049=>593,8050=>486,8051=>493,8052=>570,8053=>589,8054=>304,
-8055=>304,8056=>550,8057=>550,8058=>521,8059=>521,8060=>753,8061=>753,8064=>593,8065=>593,8066=>593,
-8067=>593,8068=>593,8069=>593,8070=>593,8071=>593,8072=>615,8073=>615,8074=>790,8075=>790,8076=>692,
-8077=>721,8078=>637,8079=>668,8080=>570,8081=>570,8082=>570,8083=>570,8084=>570,8085=>570,8086=>570,
-8087=>570,8088=>753,8089=>751,8090=>977,8091=>980,8092=>924,8093=>945,8094=>840,8095=>852,8096=>753,
-8097=>753,8098=>753,8099=>753,8100=>753,8101=>753,8102=>753,8103=>753,8104=>722,8105=>759,8106=>980,
-8107=>985,8108=>851,8109=>875,8110=>829,8111=>857,8112=>593,8113=>593,8114=>593,8115=>593,8116=>593,
-8118=>593,8119=>593,8120=>615,8121=>615,8122=>645,8123=>623,8124=>615,8125=>450,8126=>450,8127=>450,
-8128=>450,8129=>450,8130=>570,8131=>570,8132=>589,8134=>570,8135=>570,8136=>724,8137=>671,8138=>837,
-8139=>784,8140=>677,8141=>450,8142=>450,8143=>450,8144=>304,8145=>304,8146=>304,8147=>304,8150=>304,
-8151=>304,8152=>265,8153=>265,8154=>427,8155=>367,8157=>450,8158=>450,8159=>450,8160=>521,8161=>521,
-8162=>521,8163=>521,8164=>571,8165=>571,8166=>521,8167=>521,8168=>549,8169=>549,8170=>760,8171=>742,
-8172=>616,8173=>450,8174=>450,8175=>450,8178=>753,8179=>753,8180=>753,8182=>753,8183=>753,8184=>847,
-8185=>731,8186=>830,8187=>743,8188=>688,8189=>450,8190=>450,8192=>450,8193=>900,8194=>450,8195=>900,
-8196=>296,8197=>225,8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,8203=>0,8204=>0,8205=>0,
-8206=>0,8207=>0,8208=>325,8209=>325,8210=>572,8213=>900,8214=>450,8215=>450,8219=>286,8223=>466,
-8227=>531,8228=>299,8229=>600,8231=>286,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>180,
-8241=>1521,8242=>204,8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,8251=>754,8252=>437,
-8253=>478,8254=>450,8255=>723,8256=>723,8257=>225,8258=>900,8259=>450,8260=>150,8261=>351,8262=>351,
-8263=>830,8264=>659,8265=>659,8266=>447,8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8272=>723,
-8273=>450,8274=>404,8275=>900,8276=>723,8277=>754,8278=>527,8279=>597,8280=>754,8281=>754,8282=>286,
-8283=>717,8284=>754,8285=>286,8286=>286,8287=>200,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>360,8305=>161,8308=>360,8309=>360,
-8310=>360,8311=>360,8312=>360,8313=>360,8314=>475,8315=>475,8316=>475,8317=>221,8318=>221,8319=>359,
-8320=>360,8321=>360,8322=>360,8323=>360,8324=>360,8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,
-8330=>475,8331=>475,8332=>475,8333=>221,8334=>221,8336=>352,8337=>375,8338=>372,8339=>399,8340=>375,
-8352=>789,8353=>572,8354=>572,8355=>572,8356=>572,8357=>876,8358=>673,8359=>1143,8360=>966,8361=>890,
-8362=>754,8363=>572,8365=>590,8366=>549,8367=>1145,8368=>572,8369=>572,8370=>572,8371=>572,8372=>696,
-8373=>577,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>873,8449=>873,
-8450=>628,8451=>1011,8452=>807,8453=>872,8454=>929,8455=>553,8456=>628,8457=>856,8459=>889,8460=>679,
-8461=>765,8462=>570,8463=>570,8464=>422,8465=>627,8466=>648,8467=>372,8468=>736,8469=>721,8470=>936,
-8471=>900,8472=>627,8473=>631,8474=>708,8475=>718,8476=>732,8477=>712,8478=>807,8479=>615,8480=>917,
-8481=>912,8483=>615,8484=>670,8485=>520,8486=>688,8487=>688,8488=>554,8489=>304,8490=>590,8491=>615,
-8492=>708,8493=>633,8494=>769,8495=>532,8496=>545,8497=>708,8498=>518,8499=>962,8500=>416,8501=>670,
-8502=>606,8503=>419,8504=>580,8505=>342,8506=>833,8507=>1041,8508=>632,8509=>655,8510=>589,8511=>764,
-8512=>729,8513=>697,8514=>501,8515=>501,8516=>549,8517=>737,8518=>637,8519=>554,8520=>316,8521=>316,
-8523=>702,8526=>474,8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,8537=>872,8538=>872,
-8539=>872,8540=>872,8541=>872,8542=>872,8543=>511,8544=>265,8545=>443,8546=>620,8547=>831,8548=>615,
-8549=>830,8550=>1007,8551=>1185,8552=>826,8553=>616,8554=>839,8555=>1018,8556=>501,8557=>628,8558=>693,
-8559=>776,8560=>250,8561=>412,8562=>573,8563=>730,8564=>532,8565=>729,8566=>892,8567=>1053,8568=>737,
-8569=>532,8570=>740,8571=>901,8572=>250,8573=>495,8574=>571,8575=>876,8576=>1121,8577=>693,8578=>1121,
-8579=>633,8580=>494,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,
-8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,
-8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,
-8620=>754,8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,
-8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,
-8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,
-8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,
-8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,
-8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,
-8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,
-8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,
-8700=>754,8701=>754,8702=>754,8703=>754,8704=>615,8705=>572,8706=>465,8707=>568,8708=>568,8709=>784,
-8710=>602,8711=>602,8712=>784,8713=>784,8714=>646,8715=>784,8716=>784,8717=>646,8718=>572,8719=>681,
-8720=>681,8721=>606,8722=>754,8723=>754,8724=>754,8725=>303,8726=>573,8727=>754,8728=>563,8729=>563,
-8730=>573,8731=>573,8732=>573,8733=>643,8734=>750,8735=>754,8736=>807,8737=>807,8738=>754,8739=>450,
-8740=>450,8741=>450,8742=>450,8743=>659,8744=>659,8745=>659,8746=>659,8747=>469,8748=>710,8749=>951,
-8750=>469,8751=>710,8752=>951,8753=>469,8754=>469,8755=>469,8756=>572,8757=>572,8758=>234,8759=>572,
-8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,8766=>754,8767=>754,8768=>337,8769=>754,
-8770=>754,8771=>754,8772=>754,8773=>754,8774=>754,8775=>754,8776=>754,8777=>754,8778=>754,8779=>754,
-8780=>754,8781=>754,8782=>754,8783=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>900,8789=>900,
-8790=>754,8791=>754,8792=>754,8793=>754,8794=>754,8795=>754,8796=>754,8797=>754,8798=>754,8799=>754,
-8800=>754,8801=>754,8802=>754,8803=>754,8804=>754,8805=>754,8806=>754,8807=>754,8808=>754,8809=>754,
-8810=>942,8811=>942,8812=>417,8813=>754,8814=>754,8815=>754,8816=>754,8817=>754,8818=>754,8819=>754,
-8820=>754,8821=>754,8822=>754,8823=>754,8824=>754,8825=>754,8826=>754,8827=>754,8828=>754,8829=>754,
-8830=>754,8831=>754,8832=>754,8833=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,
-8840=>754,8841=>754,8842=>754,8843=>754,8844=>659,8845=>659,8846=>659,8847=>754,8848=>754,8849=>754,
-8850=>754,8851=>702,8852=>702,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,
-8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,8865=>754,8866=>784,8867=>784,8868=>784,8869=>784,
-8870=>468,8871=>468,8872=>784,8873=>784,8874=>784,8875=>784,8876=>784,8877=>784,8878=>784,8879=>784,
-8880=>754,8881=>754,8882=>754,8883=>754,8884=>754,8885=>754,8886=>900,8887=>900,8888=>754,8889=>754,
-8890=>468,8891=>659,8892=>659,8893=>659,8894=>754,8895=>754,8896=>738,8897=>738,8898=>738,8899=>738,
-8900=>444,8901=>286,8902=>563,8903=>754,8904=>900,8905=>900,8906=>900,8907=>900,8908=>900,8909=>754,
-8910=>659,8911=>659,8912=>754,8913=>754,8914=>754,8915=>754,8916=>754,8917=>754,8918=>754,8919=>754,
-8920=>1280,8921=>1280,8922=>754,8923=>754,8924=>754,8925=>754,8926=>754,8927=>754,8928=>754,8929=>754,
-8930=>754,8931=>754,8932=>754,8933=>754,8934=>754,8935=>754,8936=>754,8937=>754,8938=>754,8939=>754,
-8940=>754,8941=>754,8942=>900,8943=>900,8944=>900,8945=>900,8946=>900,8947=>784,8948=>646,8949=>784,
-8950=>784,8951=>646,8952=>784,8953=>784,8954=>900,8955=>784,8956=>646,8957=>784,8958=>646,8959=>784,
-8960=>542,8961=>542,8962=>571,8963=>754,8964=>754,8965=>754,8966=>754,8967=>439,8968=>351,8969=>351,
-8970=>351,8971=>351,8972=>728,8973=>728,8974=>728,8975=>728,8976=>754,8977=>461,8984=>900,8985=>754,
-8988=>422,8989=>422,8990=>422,8991=>422,8992=>469,8993=>469,8996=>1037,8997=>1037,8998=>1272,8999=>1037,
-9000=>1299,9003=>1272,9004=>786,9075=>304,9076=>571,9077=>753,9082=>593,9085=>681,9095=>1037,9108=>786,
-9115=>450,9116=>450,9117=>450,9118=>450,9119=>450,9120=>450,9121=>450,9122=>450,9123=>450,9124=>450,
-9125=>450,9126=>450,9127=>675,9128=>675,9129=>675,9130=>675,9131=>675,9132=>675,9133=>675,9134=>469,
-9166=>754,9167=>850,9187=>786,9189=>692,9250=>571,9251=>571,9312=>807,9313=>807,9314=>807,9315=>807,
-9316=>807,9317=>807,9318=>807,9319=>807,9320=>807,9321=>807,9472=>542,9473=>542,9474=>542,9475=>542,
-9476=>542,9477=>542,9478=>542,9479=>542,9480=>542,9481=>542,9482=>542,9483=>542,9484=>542,9485=>542,
-9486=>542,9487=>542,9488=>542,9489=>542,9490=>542,9491=>542,9492=>542,9493=>542,9494=>542,9495=>542,
-9496=>542,9497=>542,9498=>542,9499=>542,9500=>542,9501=>542,9502=>542,9503=>542,9504=>542,9505=>542,
-9506=>542,9507=>542,9508=>542,9509=>542,9510=>542,9511=>542,9512=>542,9513=>542,9514=>542,9515=>542,
-9516=>542,9517=>542,9518=>542,9519=>542,9520=>542,9521=>542,9522=>542,9523=>542,9524=>542,9525=>542,
-9526=>542,9527=>542,9528=>542,9529=>542,9530=>542,9531=>542,9532=>542,9533=>542,9534=>542,9535=>542,
-9536=>542,9537=>542,9538=>542,9539=>542,9540=>542,9541=>542,9542=>542,9543=>542,9544=>542,9545=>542,
-9546=>542,9547=>542,9548=>542,9549=>542,9550=>542,9551=>542,9552=>542,9553=>542,9554=>542,9555=>542,
-9556=>542,9557=>542,9558=>542,9559=>542,9560=>542,9561=>542,9562=>542,9563=>542,9564=>542,9565=>542,
-9566=>542,9567=>542,9568=>542,9569=>542,9570=>542,9571=>542,9572=>542,9573=>542,9574=>542,9575=>542,
-9576=>542,9577=>542,9578=>542,9579=>542,9580=>542,9581=>542,9582=>542,9583=>542,9584=>542,9585=>542,
-9586=>542,9587=>542,9588=>542,9589=>542,9590=>542,9591=>542,9592=>542,9593=>542,9594=>542,9595=>542,
-9596=>542,9597=>542,9598=>542,9599=>542,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,
-9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,
-9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,
-9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,
-9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,
-9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,
-9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,
-9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,
-9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,
-9686=>474,9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,
-9696=>692,9697=>692,9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,
-9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,
-9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,
-9726=>659,9727=>692,9728=>807,9729=>900,9730=>807,9731=>807,9732=>807,9733=>807,9734=>807,9735=>515,
-9736=>806,9737=>807,9738=>799,9739=>799,9740=>604,9741=>911,9742=>1121,9743=>1125,9744=>807,9745=>807,
-9746=>807,9747=>479,9748=>807,9749=>807,9750=>807,9751=>807,9752=>807,9753=>807,9754=>807,9755=>807,
-9756=>807,9757=>548,9758=>807,9759=>548,9760=>807,9761=>807,9762=>807,9763=>807,9764=>602,9765=>671,
-9766=>584,9767=>705,9768=>490,9769=>807,9770=>807,9771=>807,9772=>639,9773=>807,9774=>807,9775=>807,
-9776=>800,9777=>800,9778=>800,9779=>800,9780=>800,9781=>800,9782=>800,9783=>800,9784=>807,9785=>807,
-9786=>807,9787=>807,9788=>807,9789=>807,9790=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,
-9796=>807,9797=>807,9798=>807,9799=>807,9800=>807,9801=>807,9802=>807,9803=>807,9804=>807,9805=>807,
-9806=>807,9807=>807,9808=>807,9809=>807,9810=>807,9811=>807,9812=>807,9813=>807,9814=>807,9815=>807,
-9816=>807,9817=>807,9818=>807,9819=>807,9820=>807,9821=>807,9822=>807,9823=>807,9824=>807,9825=>807,
-9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9832=>807,9833=>424,9834=>574,9835=>807,
-9836=>807,9837=>424,9838=>321,9839=>435,9840=>673,9841=>689,9842=>807,9843=>807,9844=>807,9845=>807,
-9846=>807,9847=>807,9848=>807,9849=>807,9850=>807,9851=>807,9852=>807,9853=>807,9854=>807,9855=>807,
-9856=>782,9857=>782,9858=>782,9859=>782,9860=>782,9861=>782,9862=>800,9863=>800,9864=>800,9865=>800,
-9866=>800,9867=>800,9868=>800,9869=>800,9870=>800,9871=>800,9872=>675,9873=>675,9874=>800,9875=>734,
-9876=>644,9877=>483,9878=>766,9879=>800,9880=>615,9881=>800,9882=>637,9883=>800,9884=>800,9888=>800,
-9889=>632,9890=>903,9891=>977,9892=>1028,9893=>811,9894=>754,9895=>754,9896=>754,9897=>754,9898=>754,
-9899=>754,9900=>754,9901=>754,9902=>754,9903=>754,9904=>759,9905=>754,9906=>658,9907=>659,9908=>659,
-9909=>659,9910=>765,9911=>659,9912=>659,9985=>754,9986=>754,9987=>754,9988=>754,9990=>754,9991=>754,
-9992=>754,9993=>754,9996=>754,9997=>754,9998=>754,9999=>754,10000=>754,10001=>754,10002=>754,10003=>754,
-10004=>754,10005=>754,10006=>754,10007=>754,10008=>754,10009=>754,10010=>754,10011=>754,10012=>754,10013=>754,
-10014=>754,10015=>754,10016=>754,10017=>754,10018=>754,10019=>754,10020=>754,10021=>754,10022=>754,10023=>754,
-10025=>754,10026=>754,10027=>754,10028=>754,10029=>754,10030=>754,10031=>754,10032=>754,10033=>754,10034=>754,
-10035=>754,10036=>754,10037=>754,10038=>754,10039=>754,10040=>754,10041=>754,10042=>754,10043=>754,10044=>754,
-10045=>754,10046=>754,10047=>754,10048=>754,10049=>754,10050=>754,10051=>754,10052=>754,10053=>754,10054=>754,
-10055=>754,10056=>754,10057=>754,10058=>754,10059=>754,10061=>807,10063=>807,10064=>807,10065=>807,10066=>807,
-10070=>807,10072=>754,10073=>754,10074=>754,10075=>290,10076=>290,10077=>484,10078=>484,10081=>754,10082=>754,
-10083=>754,10084=>754,10085=>754,10086=>754,10087=>754,10088=>754,10089=>754,10090=>754,10091=>754,10092=>754,
-10093=>754,10094=>754,10095=>754,10096=>754,10097=>754,10098=>754,10099=>754,10100=>754,10101=>754,10102=>807,
-10103=>807,10104=>807,10105=>807,10106=>807,10107=>807,10108=>807,10109=>807,10110=>807,10111=>807,10112=>754,
-10113=>754,10114=>754,10115=>754,10116=>754,10117=>754,10118=>754,10119=>754,10120=>754,10121=>754,10122=>754,
-10123=>754,10124=>754,10125=>754,10126=>754,10127=>754,10128=>754,10129=>754,10130=>754,10131=>754,10132=>754,
-10136=>754,10137=>754,10138=>754,10139=>754,10140=>754,10141=>754,10142=>754,10143=>754,10144=>754,10145=>754,
-10146=>754,10147=>754,10148=>754,10149=>754,10150=>754,10151=>754,10152=>754,10153=>754,10154=>754,10155=>754,
-10156=>754,10157=>754,10158=>754,10159=>754,10161=>754,10162=>754,10163=>754,10164=>754,10165=>754,10166=>754,
-10167=>754,10168=>754,10169=>754,10170=>754,10171=>754,10172=>754,10173=>754,10174=>754,10181=>351,10182=>351,
-10208=>444,10214=>445,10215=>445,10216=>351,10217=>351,10218=>500,10219=>500,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>1042,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>659,10241=>659,10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,
-10247=>659,10248=>659,10249=>659,10250=>659,10251=>659,10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,
-10257=>659,10258=>659,10259=>659,10260=>659,10261=>659,10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,
-10267=>659,10268=>659,10269=>659,10270=>659,10271=>659,10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,
-10277=>659,10278=>659,10279=>659,10280=>659,10281=>659,10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,
-10287=>659,10288=>659,10289=>659,10290=>659,10291=>659,10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,
-10297=>659,10298=>659,10299=>659,10300=>659,10301=>659,10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,
-10307=>659,10308=>659,10309=>659,10310=>659,10311=>659,10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,
-10317=>659,10318=>659,10319=>659,10320=>659,10321=>659,10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,
-10327=>659,10328=>659,10329=>659,10330=>659,10331=>659,10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,
-10337=>659,10338=>659,10339=>659,10340=>659,10341=>659,10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,
-10347=>659,10348=>659,10349=>659,10350=>659,10351=>659,10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,
-10357=>659,10358=>659,10359=>659,10360=>659,10361=>659,10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,
-10367=>659,10368=>659,10369=>659,10370=>659,10371=>659,10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,
-10377=>659,10378=>659,10379=>659,10380=>659,10381=>659,10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,
-10387=>659,10388=>659,10389=>659,10390=>659,10391=>659,10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,
-10397=>659,10398=>659,10399=>659,10400=>659,10401=>659,10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,
-10407=>659,10408=>659,10409=>659,10410=>659,10411=>659,10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,
-10417=>659,10418=>659,10419=>659,10420=>659,10421=>659,10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,
-10427=>659,10428=>659,10429=>659,10430=>659,10431=>659,10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,
-10437=>659,10438=>659,10439=>659,10440=>659,10441=>659,10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,
-10447=>659,10448=>659,10449=>659,10450=>659,10451=>659,10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,
-10457=>659,10458=>659,10459=>659,10460=>659,10461=>659,10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,
-10467=>659,10468=>659,10469=>659,10470=>659,10471=>659,10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,
-10477=>659,10478=>659,10479=>659,10480=>659,10481=>659,10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,
-10487=>659,10488=>659,10489=>659,10490=>659,10491=>659,10492=>659,10493=>659,10494=>659,10495=>659,10502=>754,
-10503=>754,10506=>754,10507=>754,10560=>615,10561=>615,10627=>660,10628=>660,10702=>754,10703=>900,10704=>900,
-10705=>900,10706=>900,10707=>900,10708=>900,10709=>900,10731=>444,10746=>754,10747=>754,10752=>900,10753=>900,
-10754=>900,10764=>1192,10765=>469,10766=>469,10767=>469,10768=>469,10769=>469,10770=>469,10771=>469,10772=>469,
-10773=>469,10774=>469,10775=>469,10776=>469,10777=>469,10778=>469,10779=>469,10780=>469,10799=>754,10877=>754,
-10878=>754,10879=>754,10880=>754,10881=>754,10882=>754,10883=>754,10884=>754,10885=>754,10886=>754,10887=>754,
-10888=>754,10889=>754,10890=>754,10891=>754,10892=>754,10893=>754,10894=>754,10895=>754,10896=>754,10897=>754,
-10898=>754,10899=>754,10900=>754,10901=>754,10902=>754,10903=>754,10904=>754,10905=>754,10906=>754,10907=>754,
-10908=>754,10909=>754,10910=>754,10911=>754,10912=>754,10926=>754,10927=>754,10928=>754,10929=>754,10930=>754,
-10931=>754,10932=>754,10933=>754,10934=>754,10935=>754,10936=>754,10937=>754,10938=>754,11001=>754,11002=>754,
-11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,
-11018=>754,11019=>754,11020=>754,11021=>754,11022=>752,11023=>752,11024=>752,11025=>752,11026=>850,11027=>850,
-11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11039=>782,11040=>782,11041=>786,
-11042=>786,11043=>786,11044=>1007,11091=>782,11092=>782,11360=>501,11361=>250,11362=>501,11363=>542,11364=>625,
-11365=>551,11366=>353,11367=>677,11368=>570,11369=>590,11370=>521,11371=>616,11372=>472,11373=>703,11374=>776,
-11375=>615,11377=>661,11378=>1015,11379=>865,11380=>532,11381=>589,11382=>511,11383=>593,11385=>373,11386=>550,
-11387=>441,11388=>157,11389=>387,11800=>478,11810=>351,11811=>351,11812=>351,11813=>351,11822=>478,19904=>807,
-19905=>807,19906=>807,19907=>807,19908=>807,19909=>807,19910=>807,19911=>807,19912=>807,19913=>807,19914=>807,
-19915=>807,19916=>807,19917=>807,19918=>807,19919=>807,19920=>807,19921=>807,19922=>807,19923=>807,19924=>807,
-19925=>807,19926=>807,19927=>807,19928=>807,19929=>807,19930=>807,19931=>807,19932=>807,19933=>807,19934=>807,
-19935=>807,19936=>807,19937=>807,19938=>807,19939=>807,19940=>807,19941=>807,19942=>807,19943=>807,19944=>807,
-19945=>807,19946=>807,19947=>807,19948=>807,19949=>807,19950=>807,19951=>807,19952=>807,19953=>807,19954=>807,
-19955=>807,19956=>807,19957=>807,19958=>807,19959=>807,19960=>807,19961=>807,19962=>807,19963=>807,19964=>807,
-19965=>807,19966=>807,19967=>807,42564=>571,42565=>469,42566=>318,42567=>304,42572=>1062,42573=>925,42576=>926,
-42577=>815,42580=>971,42581=>757,42582=>886,42583=>762,42594=>922,42595=>833,42596=>912,42597=>810,42598=>776,
-42599=>907,42600=>708,42601=>550,42602=>770,42603=>641,42604=>1222,42605=>917,42606=>791,42634=>725,42635=>649,
-42636=>549,42637=>524,42644=>617,42645=>570,42760=>444,42761=>444,42762=>444,42763=>444,42764=>444,42765=>444,
-42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,42773=>444,42774=>444,42779=>332,
-42780=>332,42781=>227,42782=>227,42783=>227,42790=>677,42791=>570,42792=>790,42793=>638,42794=>553,42795=>486,
-42800=>441,42801=>469,42802=>1125,42803=>886,42804=>1097,42805=>900,42806=>1039,42807=>896,42808=>874,42809=>736,
-42810=>874,42811=>736,42812=>863,42813=>736,42814=>628,42815=>494,42822=>612,42823=>353,42824=>523,42825=>384,
-42826=>726,42827=>633,42830=>1222,42831=>917,42880=>501,42881=>250,42882=>662,42883=>570,42889=>303,42890=>338,
-42891=>360,42892=>247,43003=>518,43004=>542,43005=>776,43006=>265,43007=>1079,63173=>550,64256=>649,64257=>581,
-64258=>581,64259=>899,64260=>899,64261=>617,64262=>774,64275=>1081,64276=>1081,64277=>1076,64278=>1067,64279=>1376,
-64285=>245,64286=>0,64287=>423,64288=>572,64289=>770,64290=>696,64291=>815,64292=>694,64293=>759,64294=>769,
-64295=>726,64296=>788,64297=>754,64298=>727,64299=>727,64300=>727,64301=>727,64302=>566,64303=>566,64304=>566,
-64305=>547,64306=>403,64307=>534,64308=>576,64309=>245,64310=>336,64311=>900,64312=>583,64313=>302,64314=>532,
-64315=>500,64316=>539,64318=>593,64320=>397,64321=>629,64323=>576,64324=>543,64326=>523,64327=>596,64328=>532,
-64329=>727,64330=>591,64331=>245,64332=>547,64333=>500,64334=>543,64335=>566,65024=>0,65025=>0,65026=>0,
-65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,
-65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,65531=>0,
-65532=>0,65533=>923);
-$enc='';
-$diff='';
-$file='dejavusanscondensedi.z';
-$ctg='dejavusanscondensedi.ctg.z';
-$originalsize=488440;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansi.php
deleted file mode 100644
index 721eab7b0ed..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansi.php
+++ /dev/null
@@ -1,471 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSans-Oblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-43,'Flags'=>96,'FontBBox'=>'[-1016 -350 1659 1068]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>318,33=>401,34=>460,35=>838,36=>636,37=>950,38=>780,39=>275,40=>390,
-41=>390,42=>500,43=>838,44=>318,45=>361,46=>318,47=>337,48=>636,49=>636,50=>636,
-51=>636,52=>636,53=>636,54=>636,55=>636,56=>636,57=>636,58=>337,59=>337,60=>838,
-61=>838,62=>838,63=>531,64=>1000,65=>684,66=>686,67=>698,68=>770,69=>632,70=>575,
-71=>775,72=>752,73=>295,74=>295,75=>656,76=>557,77=>863,78=>748,79=>787,80=>603,
-81=>787,82=>695,83=>635,84=>611,85=>732,86=>684,87=>989,88=>685,89=>611,90=>685,
-91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>613,98=>635,99=>550,100=>635,
-101=>615,102=>352,103=>635,104=>634,105=>278,106=>278,107=>579,108=>278,109=>974,110=>634,
-111=>612,112=>635,113=>635,114=>411,115=>521,116=>392,117=>634,118=>592,119=>818,120=>592,
-121=>592,122=>525,123=>636,124=>337,125=>636,126=>838,8364=>636,8218=>318,402=>352,8222=>518,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1350,352=>635,8249=>400,338=>1070,381=>685,8216=>318,
-8217=>318,8220=>518,8221=>518,8226=>590,8211=>500,8212=>1000,732=>500,8482=>1000,353=>521,8250=>400,
-339=>1028,382=>525,376=>611,160=>318,161=>401,162=>636,163=>636,164=>636,165=>636,166=>337,
-167=>500,168=>500,169=>1000,170=>471,171=>617,172=>838,173=>361,174=>1000,175=>500,176=>500,
-177=>838,178=>401,179=>401,180=>500,181=>636,182=>636,183=>318,184=>500,185=>401,186=>471,
-187=>617,188=>969,189=>969,190=>969,191=>531,192=>684,193=>684,194=>684,195=>684,196=>684,
-197=>684,198=>974,199=>698,200=>632,201=>632,202=>632,203=>632,204=>295,205=>295,206=>295,
-207=>295,208=>775,209=>748,210=>787,211=>787,212=>787,213=>787,214=>787,215=>838,216=>787,
-217=>732,218=>732,219=>732,220=>732,221=>611,222=>608,223=>630,224=>613,225=>613,226=>613,
-227=>613,228=>613,229=>613,230=>995,231=>550,232=>615,233=>615,234=>615,235=>615,236=>278,
-237=>278,238=>278,239=>278,240=>612,241=>634,242=>612,243=>612,244=>612,245=>612,246=>612,
-247=>838,248=>612,249=>634,250=>634,251=>634,252=>634,253=>592,254=>635,255=>592,256=>684,
-257=>613,258=>684,259=>613,260=>684,261=>613,262=>698,263=>550,264=>698,265=>550,266=>698,
-267=>550,268=>698,269=>550,270=>770,271=>635,272=>775,273=>635,274=>632,275=>615,276=>632,
-277=>615,278=>632,279=>615,280=>632,281=>615,282=>632,283=>615,284=>775,285=>635,286=>775,
-287=>635,288=>775,289=>635,290=>775,291=>635,292=>752,293=>634,294=>916,295=>695,296=>295,
-297=>278,298=>295,299=>278,300=>295,301=>278,302=>295,303=>278,304=>295,305=>278,306=>590,
-307=>556,308=>295,309=>278,310=>656,311=>579,312=>579,313=>557,314=>278,315=>557,316=>278,
-317=>557,318=>278,319=>557,320=>278,321=>562,322=>287,323=>748,324=>634,325=>748,326=>634,
-327=>748,328=>634,329=>813,330=>748,331=>634,332=>787,333=>612,334=>787,335=>612,336=>787,
-337=>612,340=>695,341=>411,342=>695,343=>411,344=>695,345=>411,346=>635,347=>521,348=>635,
-349=>521,350=>635,351=>521,354=>611,355=>392,356=>611,357=>392,358=>611,359=>392,360=>732,
-361=>634,362=>732,363=>634,364=>732,365=>634,366=>732,367=>634,368=>732,369=>634,370=>732,
-371=>634,372=>989,373=>818,374=>611,375=>592,377=>685,378=>525,379=>685,380=>525,383=>352,
-384=>635,385=>735,386=>686,387=>635,388=>686,389=>635,390=>703,391=>698,392=>550,393=>775,
-394=>819,395=>686,396=>635,397=>612,398=>632,399=>787,400=>614,401=>575,403=>775,404=>687,
-405=>984,406=>354,407=>295,408=>746,409=>579,410=>278,411=>592,412=>974,413=>748,414=>634,
-415=>787,416=>913,417=>612,418=>938,419=>737,420=>652,421=>635,422=>695,423=>635,424=>521,
-425=>632,426=>336,427=>392,428=>611,429=>392,430=>611,431=>838,432=>634,433=>764,434=>721,
-435=>744,436=>730,437=>685,438=>525,439=>666,440=>666,441=>578,442=>525,443=>636,444=>666,
-445=>578,446=>510,447=>635,448=>295,449=>492,450=>459,451=>295,452=>1455,453=>1295,454=>1160,
-455=>852,456=>835,457=>556,458=>1043,459=>1026,460=>912,461=>684,462=>613,463=>295,464=>278,
-465=>787,466=>612,467=>732,468=>634,469=>732,470=>634,471=>732,472=>634,473=>732,474=>634,
-475=>732,476=>634,477=>615,478=>684,479=>613,480=>684,481=>613,482=>974,483=>995,484=>775,
-485=>635,486=>775,487=>635,488=>656,489=>579,490=>787,491=>612,492=>787,493=>612,494=>666,
-495=>525,496=>278,497=>1455,498=>1295,499=>1160,500=>775,501=>635,502=>1113,503=>682,504=>748,
-505=>634,506=>684,507=>613,508=>974,509=>995,510=>787,511=>612,512=>684,513=>613,514=>684,
-515=>613,516=>632,517=>615,518=>632,519=>615,520=>295,521=>278,522=>295,523=>278,524=>787,
-525=>612,526=>787,527=>612,528=>695,529=>411,530=>695,531=>411,532=>732,533=>634,534=>732,
-535=>634,536=>635,537=>521,538=>611,539=>392,540=>627,541=>521,542=>752,543=>634,544=>735,
-545=>838,546=>698,547=>610,548=>685,549=>525,550=>684,551=>613,552=>632,553=>615,554=>787,
-555=>612,556=>787,557=>612,558=>787,559=>612,560=>787,561=>612,562=>611,563=>592,564=>475,
-565=>843,566=>477,567=>278,568=>998,569=>998,570=>684,571=>698,572=>550,573=>557,574=>611,
-575=>521,576=>525,577=>603,578=>479,579=>686,580=>732,581=>684,582=>632,583=>615,584=>295,
-585=>278,586=>781,587=>635,588=>695,589=>411,590=>611,591=>592,592=>613,593=>635,594=>635,
-595=>635,596=>550,597=>550,598=>635,599=>727,600=>615,601=>615,602=>844,603=>545,604=>545,
-605=>775,606=>664,607=>326,608=>696,609=>635,610=>629,611=>596,612=>596,613=>634,614=>634,
-615=>634,616=>372,617=>387,618=>372,619=>396,620=>487,621=>278,622=>706,623=>974,624=>974,
-625=>974,626=>646,627=>642,628=>634,629=>612,630=>858,631=>728,632=>660,633=>469,634=>469,
-635=>469,636=>469,637=>469,638=>530,639=>530,640=>602,641=>602,642=>521,643=>336,644=>336,
-645=>461,646=>336,647=>392,648=>392,649=>634,650=>618,651=>598,652=>592,653=>818,654=>592,
-655=>611,656=>525,657=>525,658=>578,659=>578,660=>510,661=>510,662=>510,663=>510,664=>787,
-665=>580,666=>664,667=>708,668=>654,669=>292,670=>667,671=>507,672=>727,673=>510,674=>510,
-675=>1014,676=>1058,677=>1013,678=>824,679=>610,680=>778,681=>848,682=>641,683=>654,684=>515,
-685=>515,686=>570,687=>664,688=>399,689=>399,690=>175,691=>259,692=>295,693=>296,694=>379,
-695=>515,696=>373,697=>278,698=>460,699=>318,700=>318,701=>318,702=>307,703=>307,704=>370,
-705=>370,706=>500,707=>500,708=>500,709=>500,711=>500,712=>275,713=>500,714=>500,715=>500,
-716=>275,717=>500,718=>500,719=>500,720=>337,721=>337,722=>307,723=>307,724=>500,725=>500,
-726=>390,727=>317,728=>500,729=>500,730=>500,731=>500,733=>500,734=>315,735=>500,736=>426,
-737=>166,738=>373,739=>444,740=>370,741=>493,742=>493,743=>493,744=>493,745=>493,748=>500,
-749=>500,750=>518,755=>500,759=>500,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,
-774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,
-784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,
-794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,
-844=>0,845=>0,846=>0,847=>0,849=>0,850=>0,851=>0,855=>0,856=>0,858=>0,
-860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,880=>654,881=>568,882=>862,
-883=>647,884=>278,885=>278,886=>748,887=>650,890=>500,891=>549,892=>550,893=>549,894=>337,
-900=>500,901=>500,902=>684,903=>318,904=>767,905=>903,906=>435,908=>839,910=>860,911=>905,
-912=>338,913=>684,914=>686,915=>557,916=>684,917=>632,918=>685,919=>752,920=>787,921=>295,
-922=>656,923=>684,924=>863,925=>748,926=>632,927=>787,928=>752,929=>603,931=>632,932=>611,
-933=>611,934=>787,935=>685,936=>787,937=>764,938=>295,939=>611,940=>659,941=>541,942=>634,
-943=>338,944=>579,945=>659,946=>638,947=>592,948=>612,949=>541,950=>544,951=>634,952=>612,
-953=>338,954=>589,955=>592,956=>636,957=>559,958=>558,959=>612,960=>602,961=>635,962=>587,
-963=>634,964=>602,965=>579,966=>660,967=>592,968=>660,969=>837,970=>338,971=>579,972=>612,
-973=>579,974=>837,975=>656,976=>614,977=>619,978=>699,979=>842,980=>699,981=>660,982=>837,
-983=>664,984=>787,985=>612,986=>648,987=>587,988=>575,989=>458,990=>660,991=>660,992=>865,
-993=>627,994=>934,995=>837,996=>758,997=>659,998=>792,999=>615,1000=>687,1001=>607,1002=>768,
-1003=>625,1004=>699,1005=>612,1006=>611,1007=>536,1008=>664,1009=>635,1010=>550,1011=>278,1012=>787,
-1013=>615,1014=>615,1015=>608,1016=>635,1017=>698,1018=>863,1019=>651,1020=>635,1021=>703,1022=>698,
-1023=>703,1024=>632,1025=>632,1026=>786,1027=>557,1028=>698,1029=>635,1030=>295,1031=>295,1032=>295,
-1033=>1094,1034=>1045,1035=>786,1036=>710,1037=>748,1038=>609,1039=>752,1040=>684,1041=>686,1042=>686,
-1043=>557,1044=>781,1045=>632,1046=>1077,1047=>641,1048=>748,1049=>748,1050=>710,1051=>752,1052=>863,
-1053=>752,1054=>787,1055=>752,1056=>603,1057=>698,1058=>611,1059=>609,1060=>861,1061=>685,1062=>776,
-1063=>686,1064=>1069,1065=>1094,1066=>833,1067=>818,1068=>686,1069=>698,1070=>1080,1071=>695,1072=>613,
-1073=>617,1074=>589,1075=>525,1076=>691,1077=>615,1078=>901,1079=>532,1080=>650,1081=>650,1082=>604,
-1083=>639,1084=>754,1085=>654,1086=>612,1087=>654,1088=>635,1089=>550,1090=>583,1091=>592,1092=>855,
-1093=>592,1094=>681,1095=>591,1096=>915,1097=>942,1098=>707,1099=>790,1100=>589,1101=>549,1102=>842,
-1103=>602,1104=>615,1105=>615,1106=>625,1107=>525,1108=>549,1109=>521,1110=>278,1111=>278,1112=>278,
-1113=>902,1114=>898,1115=>652,1116=>604,1117=>650,1118=>592,1119=>654,1120=>934,1121=>837,1122=>771,
-1123=>672,1124=>942,1125=>749,1126=>879,1127=>783,1128=>1160,1129=>1001,1130=>787,1131=>612,1132=>1027,
-1133=>824,1134=>636,1135=>541,1136=>856,1137=>876,1138=>787,1139=>612,1140=>781,1141=>665,1142=>781,
-1143=>665,1144=>992,1145=>904,1146=>953,1147=>758,1148=>1180,1149=>1028,1150=>934,1151=>837,1152=>698,
-1153=>550,1154=>502,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>418,1161=>418,1162=>748,
-1163=>657,1164=>686,1165=>589,1166=>603,1167=>635,1168=>610,1169=>525,1170=>675,1171=>556,1172=>557,
-1173=>491,1174=>1077,1175=>901,1176=>641,1177=>532,1178=>710,1179=>604,1180=>710,1181=>604,1182=>710,
-1183=>604,1184=>856,1185=>832,1186=>752,1187=>661,1188=>1014,1189=>877,1190=>1113,1191=>950,1192=>890,
-1193=>707,1194=>698,1195=>550,1196=>611,1197=>529,1198=>611,1199=>592,1200=>611,1201=>592,1202=>685,
-1203=>592,1204=>934,1205=>807,1206=>686,1207=>591,1208=>686,1209=>591,1210=>686,1211=>634,1212=>929,
-1213=>731,1214=>929,1215=>731,1216=>295,1217=>1077,1218=>901,1219=>655,1220=>604,1221=>752,1222=>639,
-1223=>752,1224=>661,1225=>752,1226=>661,1227=>686,1228=>591,1229=>863,1230=>754,1231=>278,1232=>684,
-1233=>613,1234=>684,1235=>613,1236=>974,1237=>995,1238=>632,1239=>615,1240=>787,1241=>615,1242=>787,
-1243=>615,1244=>1077,1245=>901,1246=>641,1247=>532,1248=>666,1249=>578,1250=>748,1251=>650,1252=>748,
-1253=>650,1254=>787,1255=>612,1256=>787,1257=>612,1258=>787,1259=>612,1260=>698,1261=>549,1262=>609,
-1263=>592,1264=>609,1265=>592,1266=>609,1267=>592,1268=>686,1269=>591,1270=>557,1271=>491,1272=>818,
-1273=>790,1274=>675,1275=>556,1276=>685,1277=>592,1278=>685,1279=>592,1280=>686,1281=>589,1282=>1006,
-1283=>897,1284=>975,1285=>869,1286=>679,1287=>588,1288=>1072,1289=>957,1290=>1113,1291=>967,1292=>775,
-1293=>660,1294=>773,1295=>711,1296=>614,1297=>541,1298=>752,1299=>639,1300=>1195,1301=>997,1302=>900,
-1303=>867,1304=>1031,1305=>989,1306=>787,1307=>635,1308=>989,1309=>818,1312=>1113,1313=>942,1314=>1113,
-1315=>949,1316=>793,1317=>683,1329=>867,1330=>732,1331=>882,1332=>882,1333=>732,1334=>644,1335=>682,
-1336=>732,1337=>851,1338=>882,1339=>732,1340=>557,1341=>824,1342=>986,1343=>732,1344=>707,1345=>644,
-1346=>882,1347=>777,1348=>882,1349=>732,1350=>840,1351=>732,1352=>732,1353=>732,1354=>791,1355=>644,
-1356=>882,1357=>732,1358=>882,1359=>635,1360=>732,1361=>732,1362=>799,1363=>861,1364=>790,1365=>787,
-1366=>635,1369=>307,1370=>318,1371=>500,1372=>500,1373=>392,1374=>526,1375=>500,1377=>974,1378=>634,
-1379=>762,1380=>767,1381=>634,1382=>697,1383=>533,1384=>634,1385=>700,1386=>697,1387=>634,1388=>404,
-1389=>894,1390=>641,1391=>634,1392=>634,1393=>635,1394=>702,1395=>634,1396=>659,1397=>278,1398=>760,
-1399=>516,1400=>634,1401=>453,1402=>974,1403=>516,1404=>769,1405=>634,1406=>696,1407=>974,1408=>634,
-1409=>635,1410=>501,1411=>974,1412=>648,1413=>612,1414=>629,1415=>763,1417=>337,1418=>433,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>361,1471=>0,1472=>295,1473=>0,1474=>0,1475=>295,1478=>456,
-1479=>0,1488=>629,1489=>608,1490=>448,1491=>594,1492=>640,1493=>272,1494=>374,1495=>640,1496=>648,
-1497=>272,1498=>592,1499=>556,1500=>599,1501=>640,1502=>659,1503=>272,1504=>441,1505=>700,1506=>563,
-1507=>640,1508=>604,1509=>521,1510=>581,1511=>663,1512=>592,1513=>808,1514=>657,1520=>471,1521=>454,
-1522=>471,1523=>416,1524=>645,3647=>652,3713=>670,3714=>684,3716=>688,3719=>482,3720=>628,3722=>684,
-3725=>688,3732=>642,3733=>642,3734=>672,3735=>655,3737=>641,3738=>592,3739=>592,3740=>745,3741=>767,
-3742=>687,3743=>687,3745=>702,3746=>688,3747=>684,3749=>649,3751=>632,3754=>703,3755=>819,3757=>633,
-3758=>684,3759=>788,3760=>632,3761=>0,3762=>539,3763=>539,3764=>0,3765=>0,3766=>0,3767=>0,
-3768=>0,3769=>0,3771=>0,3772=>0,3773=>663,3776=>360,3777=>679,3778=>460,3779=>547,3780=>491,
-3782=>674,3784=>0,3785=>0,3786=>0,3787=>0,3788=>0,3789=>0,3792=>636,3793=>641,3794=>641,
-3795=>670,3796=>625,3797=>625,3798=>703,3799=>670,3800=>674,3801=>677,3804=>1028,3805=>1028,4256=>840,
-4257=>690,4258=>642,4259=>759,4260=>591,4261=>686,4262=>789,4263=>811,4264=>467,4265=>565,4266=>789,
-4267=>793,4268=>584,4269=>837,4270=>750,4271=>688,4272=>811,4273=>584,4274=>584,4275=>837,4276=>837,
-4277=>646,4278=>604,4279=>584,4280=>596,4281=>584,4282=>721,4283=>795,4284=>584,4285=>566,4286=>584,
-4287=>669,4288=>799,4289=>542,4290=>664,4291=>542,4292=>565,4293=>674,4304=>508,4305=>508,4306=>533,
-4307=>785,4308=>522,4309=>517,4310=>508,4311=>797,4312=>507,4313=>518,4314=>1058,4315=>522,4316=>523,
-4317=>783,4318=>518,4319=>523,4320=>792,4321=>523,4322=>656,4323=>524,4324=>788,4325=>523,4326=>782,
-4327=>523,4328=>522,4329=>522,4330=>566,4331=>523,4332=>523,4333=>489,4334=>522,4335=>498,4336=>517,
-4337=>560,4338=>508,4339=>508,4340=>508,4341=>563,4342=>824,4343=>595,4344=>522,4345=>554,4346=>553,
-4347=>586,4348=>304,5121=>684,5122=>684,5123=>684,5124=>684,5125=>769,5126=>769,5127=>769,5129=>769,
-5130=>769,5131=>769,5132=>835,5133=>834,5134=>835,5135=>834,5136=>835,5137=>834,5138=>967,5139=>1007,
-5140=>967,5141=>1007,5142=>769,5143=>967,5144=>1007,5145=>967,5146=>1007,5147=>769,5149=>256,5150=>543,
-5151=>423,5152=>423,5153=>389,5154=>389,5155=>393,5156=>389,5157=>466,5158=>385,5159=>256,5160=>389,
-5161=>389,5162=>389,5163=>1090,5164=>909,5165=>953,5166=>1117,5167=>684,5168=>684,5169=>684,5170=>684,
-5171=>729,5172=>729,5173=>729,5175=>729,5176=>729,5177=>729,5178=>835,5179=>684,5180=>835,5181=>834,
-5182=>835,5183=>834,5184=>967,5185=>1007,5186=>967,5187=>1007,5188=>967,5189=>1007,5190=>967,5191=>1007,
-5192=>729,5193=>508,5194=>192,5196=>732,5197=>732,5198=>732,5199=>732,5200=>730,5201=>730,5202=>730,
-5204=>730,5205=>730,5206=>730,5207=>921,5208=>889,5209=>921,5210=>889,5211=>921,5212=>889,5213=>928,
-5214=>900,5215=>928,5216=>900,5217=>947,5218=>900,5219=>947,5220=>900,5221=>947,5222=>434,5223=>877,
-5224=>877,5225=>866,5226=>890,5227=>628,5228=>628,5229=>628,5230=>628,5231=>628,5232=>628,5233=>628,
-5234=>628,5235=>628,5236=>860,5237=>771,5238=>815,5239=>816,5240=>815,5241=>816,5242=>860,5243=>771,
-5244=>860,5245=>771,5246=>815,5247=>816,5248=>815,5249=>816,5250=>815,5251=>407,5252=>407,5253=>750,
-5254=>775,5255=>750,5256=>775,5257=>628,5258=>628,5259=>628,5260=>628,5261=>628,5262=>628,5263=>628,
-5264=>628,5265=>628,5266=>860,5267=>771,5268=>815,5269=>816,5270=>815,5271=>816,5272=>860,5273=>771,
-5274=>860,5275=>771,5276=>815,5277=>816,5278=>815,5279=>816,5280=>815,5281=>435,5282=>435,5283=>610,
-5284=>557,5285=>557,5286=>557,5287=>610,5288=>610,5289=>610,5290=>557,5291=>557,5292=>749,5293=>769,
-5294=>746,5295=>764,5296=>746,5297=>764,5298=>749,5299=>769,5300=>749,5301=>769,5302=>746,5303=>764,
-5304=>746,5305=>764,5306=>746,5307=>386,5308=>508,5309=>386,5312=>852,5313=>852,5314=>852,5315=>852,
-5316=>852,5317=>852,5318=>852,5319=>852,5320=>852,5321=>1069,5322=>1035,5323=>1059,5324=>852,5325=>1059,
-5326=>852,5327=>852,5328=>600,5329=>453,5330=>600,5331=>852,5332=>852,5333=>852,5334=>852,5335=>852,
-5336=>852,5337=>852,5338=>852,5339=>852,5340=>1069,5341=>1035,5342=>1059,5343=>1030,5344=>1059,5345=>1030,
-5346=>1069,5347=>1035,5348=>1069,5349=>1035,5350=>1083,5351=>1030,5352=>1083,5353=>1030,5354=>600,5356=>729,
-5357=>603,5358=>603,5359=>603,5360=>603,5361=>603,5362=>603,5363=>603,5364=>603,5365=>603,5366=>834,
-5367=>754,5368=>792,5369=>771,5370=>792,5371=>771,5372=>834,5373=>754,5374=>834,5375=>754,5376=>792,
-5377=>771,5378=>792,5379=>771,5380=>792,5381=>418,5382=>420,5383=>418,5392=>712,5393=>712,5394=>712,
-5395=>892,5396=>892,5397=>892,5398=>892,5399=>910,5400=>872,5401=>910,5402=>872,5403=>910,5404=>872,
-5405=>1140,5406=>1100,5407=>1140,5408=>1100,5409=>1140,5410=>1100,5411=>1140,5412=>1100,5413=>641,5414=>627,
-5415=>627,5416=>627,5417=>627,5418=>627,5419=>627,5420=>627,5421=>627,5422=>627,5423=>844,5424=>781,
-5425=>816,5426=>818,5427=>816,5428=>818,5429=>844,5430=>781,5431=>844,5432=>781,5433=>816,5434=>818,
-5435=>816,5436=>818,5437=>816,5438=>418,5440=>389,5441=>484,5442=>916,5443=>916,5444=>863,5445=>916,
-5446=>863,5447=>863,5448=>603,5449=>603,5450=>603,5451=>603,5452=>603,5453=>603,5454=>834,5455=>754,
-5456=>418,5458=>729,5459=>684,5460=>684,5461=>684,5462=>684,5463=>726,5464=>726,5465=>726,5466=>726,
-5467=>924,5468=>1007,5469=>508,5470=>732,5471=>732,5472=>732,5473=>732,5474=>732,5475=>732,5476=>730,
-5477=>730,5478=>730,5479=>730,5480=>947,5481=>900,5482=>508,5492=>831,5493=>831,5494=>831,5495=>831,
-5496=>831,5497=>831,5498=>831,5499=>563,5500=>752,5501=>484,5502=>1047,5503=>1047,5504=>1047,5505=>1047,
-5506=>1047,5507=>1047,5508=>1047,5509=>825,5514=>831,5515=>831,5516=>831,5517=>831,5518=>1259,5519=>1259,
-5520=>1259,5521=>1002,5522=>1002,5523=>1259,5524=>1259,5525=>700,5526=>1073,5536=>852,5537=>852,5538=>799,
-5539=>799,5540=>799,5541=>799,5542=>600,5543=>643,5544=>643,5545=>643,5546=>643,5547=>643,5548=>643,
-5549=>643,5550=>418,5551=>628,5598=>770,5601=>770,5702=>468,5703=>468,5742=>444,5743=>1047,5744=>1310,
-5745=>1632,5746=>1632,5747=>1375,5748=>1375,5749=>1632,5750=>1632,7424=>592,7425=>717,7426=>982,7427=>586,
-7428=>550,7429=>605,7430=>605,7431=>491,7432=>541,7433=>278,7434=>395,7435=>579,7436=>583,7437=>754,
-7438=>650,7439=>612,7440=>550,7441=>684,7442=>684,7443=>684,7444=>1023,7446=>612,7447=>612,7448=>524,
-7449=>602,7450=>602,7451=>583,7452=>574,7453=>737,7454=>948,7455=>638,7456=>592,7457=>818,7458=>525,
-7459=>526,7462=>583,7463=>592,7464=>564,7465=>524,7466=>590,7467=>639,7468=>431,7469=>613,7470=>432,
-7472=>485,7473=>398,7474=>398,7475=>488,7476=>474,7477=>186,7478=>186,7479=>413,7480=>351,7481=>543,
-7482=>471,7483=>471,7484=>496,7485=>439,7486=>380,7487=>438,7488=>385,7489=>461,7490=>623,7491=>392,
-7492=>392,7493=>405,7494=>648,7495=>428,7496=>405,7497=>417,7498=>417,7499=>360,7500=>359,7501=>405,
-7502=>179,7503=>426,7504=>623,7505=>409,7506=>414,7507=>370,7508=>414,7509=>414,7510=>428,7511=>295,
-7512=>405,7513=>470,7514=>623,7515=>417,7517=>402,7518=>373,7519=>385,7520=>416,7521=>364,7522=>179,
-7523=>259,7524=>405,7525=>417,7526=>402,7527=>373,7528=>412,7529=>416,7530=>364,7543=>635,7544=>474,
-7547=>372,7557=>278,7579=>405,7580=>370,7581=>370,7582=>414,7583=>360,7584=>296,7585=>233,7586=>405,
-7587=>405,7588=>261,7589=>250,7590=>261,7591=>261,7592=>234,7593=>250,7594=>235,7595=>376,7596=>623,
-7597=>623,7598=>411,7599=>479,7600=>409,7601=>414,7602=>414,7603=>360,7604=>287,7605=>295,7606=>508,
-7607=>418,7608=>361,7609=>406,7610=>417,7611=>366,7612=>437,7613=>366,7614=>392,7615=>414,7620=>0,
-7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,7680=>684,7681=>613,7682=>686,7683=>635,7684=>686,
-7685=>635,7686=>686,7687=>635,7688=>698,7689=>550,7690=>770,7691=>635,7692=>770,7693=>635,7694=>770,
-7695=>635,7696=>770,7697=>635,7698=>770,7699=>635,7700=>632,7701=>615,7702=>632,7703=>615,7704=>632,
-7705=>615,7706=>632,7707=>615,7708=>632,7709=>615,7710=>575,7711=>352,7712=>775,7713=>635,7714=>752,
-7715=>634,7716=>752,7717=>634,7718=>752,7719=>634,7720=>752,7721=>634,7722=>752,7723=>634,7724=>295,
-7725=>278,7726=>295,7727=>278,7728=>656,7729=>579,7730=>656,7731=>579,7732=>656,7733=>579,7734=>557,
-7735=>278,7736=>557,7737=>278,7738=>557,7739=>278,7740=>557,7741=>278,7742=>863,7743=>974,7744=>863,
-7745=>974,7746=>863,7747=>974,7748=>748,7749=>634,7750=>748,7751=>634,7752=>748,7753=>634,7754=>748,
-7755=>634,7756=>787,7757=>612,7758=>787,7759=>612,7760=>787,7761=>612,7762=>787,7763=>612,7764=>603,
-7765=>635,7766=>603,7767=>635,7768=>695,7769=>411,7770=>695,7771=>411,7772=>695,7773=>411,7774=>695,
-7775=>411,7776=>635,7777=>521,7778=>635,7779=>521,7780=>635,7781=>521,7782=>635,7783=>521,7784=>635,
-7785=>521,7786=>611,7787=>392,7788=>611,7789=>392,7790=>611,7791=>392,7792=>611,7793=>392,7794=>732,
-7795=>634,7796=>732,7797=>634,7798=>732,7799=>634,7800=>732,7801=>634,7802=>732,7803=>634,7804=>684,
-7805=>592,7806=>684,7807=>592,7808=>989,7809=>818,7810=>989,7811=>818,7812=>989,7813=>818,7814=>989,
-7815=>818,7816=>989,7817=>818,7818=>685,7819=>592,7820=>685,7821=>592,7822=>611,7823=>592,7824=>685,
-7825=>525,7826=>685,7827=>525,7828=>685,7829=>525,7830=>634,7831=>392,7832=>818,7833=>592,7834=>613,
-7835=>352,7838=>769,7839=>612,7840=>684,7841=>613,7842=>684,7843=>613,7844=>684,7845=>613,7846=>684,
-7847=>613,7848=>684,7849=>613,7850=>684,7851=>613,7852=>684,7853=>613,7854=>684,7855=>613,7856=>684,
-7857=>613,7858=>684,7859=>613,7860=>684,7861=>613,7862=>684,7863=>613,7864=>632,7865=>615,7866=>632,
-7867=>615,7868=>632,7869=>615,7870=>632,7871=>615,7872=>632,7873=>615,7874=>632,7875=>615,7876=>632,
-7877=>615,7878=>632,7879=>615,7880=>295,7881=>278,7882=>295,7883=>278,7884=>787,7885=>612,7886=>787,
-7887=>612,7888=>787,7889=>612,7890=>787,7891=>612,7892=>787,7893=>612,7894=>787,7895=>612,7896=>787,
-7897=>612,7898=>913,7899=>612,7900=>913,7901=>612,7902=>913,7903=>612,7904=>913,7905=>612,7906=>913,
-7907=>612,7908=>732,7909=>634,7910=>732,7911=>634,7912=>838,7913=>634,7914=>838,7915=>634,7916=>838,
-7917=>634,7918=>838,7919=>634,7920=>838,7921=>634,7922=>611,7923=>592,7924=>611,7925=>592,7926=>611,
-7927=>592,7928=>611,7929=>592,7936=>659,7937=>659,7938=>659,7939=>659,7940=>659,7941=>659,7942=>659,
-7943=>659,7944=>684,7945=>684,7946=>877,7947=>877,7948=>769,7949=>801,7950=>708,7951=>743,7952=>541,
-7953=>541,7954=>541,7955=>541,7956=>541,7957=>541,7960=>711,7961=>711,7962=>966,7963=>975,7964=>898,
-7965=>928,7968=>634,7969=>634,7970=>634,7971=>634,7972=>634,7973=>634,7974=>634,7975=>634,7976=>837,
-7977=>835,7978=>1086,7979=>1089,7980=>1027,7981=>1051,7982=>934,7983=>947,7984=>338,7985=>338,7986=>338,
-7987=>338,7988=>338,7989=>338,7990=>338,7991=>338,7992=>380,7993=>374,7994=>635,7995=>635,7996=>570,
-7997=>600,7998=>489,7999=>493,8000=>612,8001=>612,8002=>612,8003=>612,8004=>612,8005=>612,8008=>804,
-8009=>848,8010=>1095,8011=>1100,8012=>938,8013=>970,8016=>579,8017=>579,8018=>579,8019=>579,8020=>579,
-8021=>579,8022=>579,8023=>579,8025=>784,8027=>998,8029=>1012,8031=>897,8032=>837,8033=>837,8034=>837,
-8035=>837,8036=>837,8037=>837,8038=>837,8039=>837,8040=>802,8041=>843,8042=>1089,8043=>1095,8044=>946,
-8045=>972,8046=>921,8047=>952,8048=>659,8049=>659,8050=>541,8051=>548,8052=>634,8053=>654,8054=>338,
-8055=>338,8056=>612,8057=>612,8058=>579,8059=>579,8060=>837,8061=>837,8064=>659,8065=>659,8066=>659,
-8067=>659,8068=>659,8069=>659,8070=>659,8071=>659,8072=>684,8073=>684,8074=>877,8075=>877,8076=>769,
-8077=>801,8078=>708,8079=>743,8080=>634,8081=>634,8082=>634,8083=>634,8084=>634,8085=>634,8086=>634,
-8087=>634,8088=>837,8089=>835,8090=>1086,8091=>1089,8092=>1027,8093=>1051,8094=>934,8095=>947,8096=>837,
-8097=>837,8098=>837,8099=>837,8100=>837,8101=>837,8102=>837,8103=>837,8104=>802,8105=>843,8106=>1089,
-8107=>1095,8108=>946,8109=>972,8110=>921,8111=>952,8112=>659,8113=>659,8114=>659,8115=>659,8116=>659,
-8118=>659,8119=>659,8120=>684,8121=>684,8122=>716,8123=>692,8124=>684,8125=>500,8126=>500,8127=>500,
-8128=>500,8129=>500,8130=>634,8131=>634,8132=>654,8134=>634,8135=>634,8136=>805,8137=>746,8138=>931,
-8139=>871,8140=>752,8141=>500,8142=>500,8143=>500,8144=>338,8145=>338,8146=>338,8147=>338,8150=>338,
-8151=>338,8152=>295,8153=>295,8154=>475,8155=>408,8157=>500,8158=>500,8159=>500,8160=>579,8161=>579,
-8162=>579,8163=>579,8164=>635,8165=>635,8166=>579,8167=>579,8168=>611,8169=>611,8170=>845,8171=>825,
-8172=>685,8173=>500,8174=>500,8175=>500,8178=>837,8179=>837,8180=>837,8182=>837,8183=>837,8184=>941,
-8185=>813,8186=>922,8187=>826,8188=>764,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,
-8196=>330,8197=>250,8198=>167,8199=>636,8200=>318,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,
-8206=>0,8207=>0,8208=>361,8209=>361,8210=>636,8213=>1000,8214=>500,8215=>500,8219=>318,8223=>518,
-8227=>590,8228=>333,8229=>667,8231=>318,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>200,
-8241=>1690,8242=>227,8243=>374,8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,8251=>838,8252=>485,
-8253=>531,8254=>500,8255=>804,8256=>804,8257=>250,8258=>1000,8259=>500,8260=>167,8261=>390,8262=>390,
-8263=>922,8264=>733,8265=>733,8266=>497,8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,8272=>804,
-8273=>500,8274=>450,8275=>1000,8276=>804,8277=>838,8278=>586,8279=>663,8280=>838,8281=>838,8282=>318,
-8283=>797,8284=>838,8285=>318,8286=>318,8287=>222,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,8303=>0,8304=>401,8305=>179,8308=>401,8309=>401,
-8310=>401,8311=>401,8312=>401,8313=>401,8314=>528,8315=>528,8316=>528,8317=>246,8318=>246,8319=>399,
-8320=>401,8321=>401,8322=>401,8323=>401,8324=>401,8325=>401,8326=>401,8327=>401,8328=>401,8329=>401,
-8330=>528,8331=>528,8332=>528,8333=>246,8334=>246,8336=>392,8337=>417,8338=>414,8339=>444,8340=>417,
-8352=>877,8353=>636,8354=>636,8355=>636,8356=>636,8357=>974,8358=>748,8359=>1271,8360=>1074,8361=>989,
-8362=>838,8363=>636,8365=>656,8366=>611,8367=>1272,8368=>636,8369=>636,8370=>636,8371=>636,8372=>774,
-8373=>641,8400=>0,8401=>0,8406=>0,8407=>0,8411=>0,8412=>0,8417=>0,8448=>970,8449=>970,
-8450=>698,8451=>1123,8452=>896,8453=>969,8454=>1032,8455=>614,8456=>698,8457=>952,8459=>988,8460=>754,
-8461=>850,8462=>634,8463=>634,8464=>470,8465=>697,8466=>720,8467=>413,8468=>818,8469=>801,8470=>1040,
-8471=>1000,8472=>697,8473=>701,8474=>787,8475=>798,8476=>814,8477=>792,8478=>896,8479=>684,8480=>1020,
-8481=>1014,8483=>684,8484=>745,8485=>578,8486=>764,8487=>764,8488=>616,8489=>338,8490=>656,8491=>684,
-8492=>786,8493=>703,8494=>854,8495=>592,8496=>605,8497=>786,8498=>575,8499=>1069,8500=>462,8501=>745,
-8502=>674,8503=>466,8504=>645,8505=>380,8506=>926,8507=>1157,8508=>702,8509=>728,8510=>654,8511=>849,
-8512=>811,8513=>775,8514=>557,8515=>557,8516=>611,8517=>819,8518=>708,8519=>615,8520=>351,8521=>351,
-8523=>780,8526=>526,8531=>969,8532=>969,8533=>969,8534=>969,8535=>969,8536=>969,8537=>969,8538=>969,
-8539=>969,8540=>969,8541=>969,8542=>969,8543=>568,8544=>295,8545=>492,8546=>689,8547=>923,8548=>684,
-8549=>922,8550=>1120,8551=>1317,8552=>917,8553=>685,8554=>933,8555=>1131,8556=>557,8557=>698,8558=>770,
-8559=>863,8560=>278,8561=>458,8562=>637,8563=>812,8564=>592,8565=>811,8566=>991,8567=>1170,8568=>819,
-8569=>592,8570=>822,8571=>1002,8572=>278,8573=>550,8574=>635,8575=>974,8576=>1245,8577=>770,8578=>1245,
-8579=>703,8580=>549,8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,8598=>838,8599=>838,
-8600=>838,8601=>838,8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,8608=>838,8609=>838,
-8610=>838,8611=>838,8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,8618=>838,8619=>838,
-8620=>838,8621=>838,8622=>838,8623=>838,8624=>838,8625=>838,8626=>838,8627=>838,8628=>838,8629=>838,
-8630=>838,8631=>838,8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,8638=>838,8639=>838,
-8640=>838,8641=>838,8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,8648=>838,8649=>838,
-8650=>838,8651=>838,8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,8658=>838,8659=>838,
-8660=>838,8661=>838,8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,8668=>838,8669=>838,
-8670=>838,8671=>838,8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,8678=>838,8679=>838,
-8680=>838,8681=>838,8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,8688=>838,8689=>838,
-8690=>838,8691=>838,8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,8698=>838,8699=>838,
-8700=>838,8701=>838,8702=>838,8703=>838,8704=>684,8705=>636,8706=>517,8707=>632,8708=>632,8709=>871,
-8710=>669,8711=>669,8712=>871,8713=>871,8714=>718,8715=>871,8716=>871,8717=>718,8718=>636,8719=>757,
-8720=>757,8721=>674,8722=>838,8723=>838,8724=>838,8725=>337,8726=>637,8727=>838,8728=>626,8729=>626,
-8730=>637,8731=>637,8732=>637,8733=>714,8734=>833,8735=>838,8736=>896,8737=>896,8738=>838,8739=>500,
-8740=>500,8741=>500,8742=>500,8743=>732,8744=>732,8745=>732,8746=>732,8747=>521,8748=>789,8749=>1057,
-8750=>521,8751=>789,8752=>1057,8753=>521,8754=>521,8755=>521,8756=>636,8757=>636,8758=>260,8759=>636,
-8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8766=>838,8767=>838,8768=>375,8769=>838,
-8770=>838,8771=>838,8772=>838,8773=>838,8774=>838,8775=>838,8776=>838,8777=>838,8778=>838,8779=>838,
-8780=>838,8781=>838,8782=>838,8783=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1000,8789=>1000,
-8790=>838,8791=>838,8792=>838,8793=>838,8794=>838,8795=>838,8796=>838,8797=>838,8798=>838,8799=>838,
-8800=>838,8801=>838,8802=>838,8803=>838,8804=>838,8805=>838,8806=>838,8807=>838,8808=>838,8809=>838,
-8810=>1047,8811=>1047,8812=>464,8813=>838,8814=>838,8815=>838,8816=>838,8817=>838,8818=>838,8819=>838,
-8820=>838,8821=>838,8822=>838,8823=>838,8824=>838,8825=>838,8826=>838,8827=>838,8828=>838,8829=>838,
-8830=>838,8831=>838,8832=>838,8833=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,
-8840=>838,8841=>838,8842=>838,8843=>838,8844=>732,8845=>732,8846=>732,8847=>838,8848=>838,8849=>838,
-8850=>838,8851=>780,8852=>780,8853=>838,8854=>838,8855=>838,8856=>838,8857=>838,8858=>838,8859=>838,
-8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,8865=>838,8866=>871,8867=>871,8868=>871,8869=>871,
-8870=>521,8871=>521,8872=>871,8873=>871,8874=>871,8875=>871,8876=>871,8877=>871,8878=>871,8879=>871,
-8880=>838,8881=>838,8882=>838,8883=>838,8884=>838,8885=>838,8886=>1000,8887=>1000,8888=>838,8889=>838,
-8890=>521,8891=>732,8892=>732,8893=>732,8894=>838,8895=>838,8896=>820,8897=>820,8898=>820,8899=>820,
-8900=>494,8901=>318,8902=>626,8903=>838,8904=>1000,8905=>1000,8906=>1000,8907=>1000,8908=>1000,8909=>838,
-8910=>732,8911=>732,8912=>838,8913=>838,8914=>838,8915=>838,8916=>838,8917=>838,8918=>838,8919=>838,
-8920=>1422,8921=>1422,8922=>838,8923=>838,8924=>838,8925=>838,8926=>838,8927=>838,8928=>838,8929=>838,
-8930=>838,8931=>838,8932=>838,8933=>838,8934=>838,8935=>838,8936=>838,8937=>838,8938=>838,8939=>838,
-8940=>838,8941=>838,8942=>1000,8943=>1000,8944=>1000,8945=>1000,8946=>1000,8947=>871,8948=>718,8949=>871,
-8950=>871,8951=>718,8952=>871,8953=>871,8954=>1000,8955=>871,8956=>718,8957=>871,8958=>718,8959=>871,
-8960=>602,8961=>602,8962=>635,8963=>838,8964=>838,8965=>838,8966=>838,8967=>488,8968=>390,8969=>390,
-8970=>390,8971=>390,8972=>809,8973=>809,8974=>809,8975=>809,8976=>838,8977=>513,8984=>1000,8985=>838,
-8988=>469,8989=>469,8990=>469,8991=>469,8992=>521,8993=>521,8996=>1152,8997=>1152,8998=>1414,8999=>1152,
-9000=>1443,9003=>1414,9004=>873,9075=>338,9076=>635,9077=>837,9082=>659,9085=>757,9095=>1152,9108=>873,
-9115=>500,9116=>500,9117=>500,9118=>500,9119=>500,9120=>500,9121=>500,9122=>500,9123=>500,9124=>500,
-9125=>500,9126=>500,9127=>750,9128=>750,9129=>750,9130=>750,9131=>750,9132=>750,9133=>750,9134=>521,
-9166=>838,9167=>945,9187=>873,9189=>769,9250=>635,9251=>635,9312=>896,9313=>896,9314=>896,9315=>896,
-9316=>896,9317=>896,9318=>896,9319=>896,9320=>896,9321=>896,9472=>602,9473=>602,9474=>602,9475=>602,
-9476=>602,9477=>602,9478=>602,9479=>602,9480=>602,9481=>602,9482=>602,9483=>602,9484=>602,9485=>602,
-9486=>602,9487=>602,9488=>602,9489=>602,9490=>602,9491=>602,9492=>602,9493=>602,9494=>602,9495=>602,
-9496=>602,9497=>602,9498=>602,9499=>602,9500=>602,9501=>602,9502=>602,9503=>602,9504=>602,9505=>602,
-9506=>602,9507=>602,9508=>602,9509=>602,9510=>602,9511=>602,9512=>602,9513=>602,9514=>602,9515=>602,
-9516=>602,9517=>602,9518=>602,9519=>602,9520=>602,9521=>602,9522=>602,9523=>602,9524=>602,9525=>602,
-9526=>602,9527=>602,9528=>602,9529=>602,9530=>602,9531=>602,9532=>602,9533=>602,9534=>602,9535=>602,
-9536=>602,9537=>602,9538=>602,9539=>602,9540=>602,9541=>602,9542=>602,9543=>602,9544=>602,9545=>602,
-9546=>602,9547=>602,9548=>602,9549=>602,9550=>602,9551=>602,9552=>602,9553=>602,9554=>602,9555=>602,
-9556=>602,9557=>602,9558=>602,9559=>602,9560=>602,9561=>602,9562=>602,9563=>602,9564=>602,9565=>602,
-9566=>602,9567=>602,9568=>602,9569=>602,9570=>602,9571=>602,9572=>602,9573=>602,9574=>602,9575=>602,
-9576=>602,9577=>602,9578=>602,9579=>602,9580=>602,9581=>602,9582=>602,9583=>602,9584=>602,9585=>602,
-9586=>602,9587=>602,9588=>602,9589=>602,9590=>602,9591=>602,9592=>602,9593=>602,9594=>602,9595=>602,
-9596=>602,9597=>602,9598=>602,9599=>602,9600=>769,9601=>769,9602=>769,9603=>769,9604=>769,9605=>769,
-9606=>769,9607=>769,9608=>769,9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,9614=>769,9615=>769,
-9616=>769,9617=>769,9618=>769,9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,9624=>769,9625=>769,
-9626=>769,9627=>769,9628=>769,9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,9634=>945,9635=>945,
-9636=>945,9637=>945,9638=>945,9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,9644=>945,9645=>945,
-9646=>550,9647=>550,9648=>769,9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,9654=>769,9655=>769,
-9656=>502,9657=>502,9658=>769,9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,9664=>769,9665=>769,
-9666=>502,9667=>502,9668=>769,9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,9674=>494,9675=>873,
-9676=>873,9677=>873,9678=>873,9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,9684=>873,9685=>873,
-9686=>527,9687=>527,9688=>791,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,
-9696=>769,9697=>769,9698=>769,9699=>769,9700=>769,9701=>769,9702=>590,9703=>945,9704=>945,9705=>945,
-9706=>945,9707=>945,9708=>769,9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,9714=>945,9715=>945,
-9716=>873,9717=>873,9718=>873,9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,9724=>830,9725=>732,
-9726=>732,9727=>769,9728=>896,9729=>1000,9730=>896,9731=>896,9732=>896,9733=>896,9734=>896,9735=>573,
-9736=>896,9737=>896,9738=>888,9739=>888,9740=>671,9741=>1013,9742=>1246,9743=>1250,9744=>896,9745=>896,
-9746=>896,9747=>532,9748=>896,9749=>896,9750=>896,9751=>896,9752=>896,9753=>896,9754=>896,9755=>896,
-9756=>896,9757=>609,9758=>896,9759=>609,9760=>896,9761=>896,9762=>896,9763=>896,9764=>669,9765=>746,
-9766=>649,9767=>784,9768=>545,9769=>896,9770=>896,9771=>896,9772=>710,9773=>896,9774=>896,9775=>896,
-9776=>890,9777=>890,9778=>890,9779=>890,9780=>890,9781=>890,9782=>890,9783=>890,9784=>896,9785=>896,
-9786=>896,9787=>896,9788=>896,9789=>896,9790=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,
-9796=>896,9797=>896,9798=>896,9799=>896,9800=>896,9801=>896,9802=>896,9803=>896,9804=>896,9805=>896,
-9806=>896,9807=>896,9808=>896,9809=>896,9810=>896,9811=>896,9812=>896,9813=>896,9814=>896,9815=>896,
-9816=>896,9817=>896,9818=>896,9819=>896,9820=>896,9821=>896,9822=>896,9823=>896,9824=>896,9825=>896,
-9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9832=>896,9833=>472,9834=>638,9835=>896,
-9836=>896,9837=>472,9838=>357,9839=>484,9840=>748,9841=>766,9842=>896,9843=>896,9844=>896,9845=>896,
-9846=>896,9847=>896,9848=>896,9849=>896,9850=>896,9851=>896,9852=>896,9853=>896,9854=>896,9855=>896,
-9856=>869,9857=>869,9858=>869,9859=>869,9860=>869,9861=>869,9862=>890,9863=>890,9864=>890,9865=>890,
-9866=>890,9867=>890,9868=>890,9869=>890,9870=>890,9871=>890,9872=>750,9873=>750,9874=>890,9875=>816,
-9876=>716,9877=>537,9878=>852,9879=>890,9880=>684,9881=>890,9882=>708,9883=>890,9884=>890,9888=>890,
-9889=>702,9890=>1003,9891=>1085,9892=>1143,9893=>901,9894=>838,9895=>838,9896=>838,9897=>838,9898=>838,
-9899=>838,9900=>838,9901=>838,9902=>838,9903=>838,9904=>844,9905=>838,9906=>731,9907=>732,9908=>732,
-9909=>732,9910=>850,9911=>732,9912=>732,9985=>838,9986=>838,9987=>838,9988=>838,9990=>838,9991=>838,
-9992=>838,9993=>838,9996=>838,9997=>838,9998=>838,9999=>838,10000=>838,10001=>838,10002=>838,10003=>838,
-10004=>838,10005=>838,10006=>838,10007=>838,10008=>838,10009=>838,10010=>838,10011=>838,10012=>838,10013=>838,
-10014=>838,10015=>838,10016=>838,10017=>838,10018=>838,10019=>838,10020=>838,10021=>838,10022=>838,10023=>838,
-10025=>838,10026=>838,10027=>838,10028=>838,10029=>838,10030=>838,10031=>838,10032=>838,10033=>838,10034=>838,
-10035=>838,10036=>838,10037=>838,10038=>838,10039=>838,10040=>838,10041=>838,10042=>838,10043=>838,10044=>838,
-10045=>838,10046=>838,10047=>838,10048=>838,10049=>838,10050=>838,10051=>838,10052=>838,10053=>838,10054=>838,
-10055=>838,10056=>838,10057=>838,10058=>838,10059=>838,10061=>896,10063=>896,10064=>896,10065=>896,10066=>896,
-10070=>896,10072=>838,10073=>838,10074=>838,10075=>322,10076=>322,10077=>538,10078=>538,10081=>838,10082=>838,
-10083=>838,10084=>838,10085=>838,10086=>838,10087=>838,10088=>838,10089=>838,10090=>838,10091=>838,10092=>838,
-10093=>838,10094=>838,10095=>838,10096=>838,10097=>838,10098=>838,10099=>838,10100=>838,10101=>838,10102=>896,
-10103=>896,10104=>896,10105=>896,10106=>896,10107=>896,10108=>896,10109=>896,10110=>896,10111=>896,10112=>838,
-10113=>838,10114=>838,10115=>838,10116=>838,10117=>838,10118=>838,10119=>838,10120=>838,10121=>838,10122=>838,
-10123=>838,10124=>838,10125=>838,10126=>838,10127=>838,10128=>838,10129=>838,10130=>838,10131=>838,10132=>838,
-10136=>838,10137=>838,10138=>838,10139=>838,10140=>838,10141=>838,10142=>838,10143=>838,10144=>838,10145=>838,
-10146=>838,10147=>838,10148=>838,10149=>838,10150=>838,10151=>838,10152=>838,10153=>838,10154=>838,10155=>838,
-10156=>838,10157=>838,10158=>838,10159=>838,10161=>838,10162=>838,10163=>838,10164=>838,10165=>838,10166=>838,
-10167=>838,10168=>838,10169=>838,10170=>838,10171=>838,10172=>838,10173=>838,10174=>838,10181=>390,10182=>390,
-10208=>494,10214=>495,10215=>495,10216=>390,10217=>390,10218=>556,10219=>556,10224=>838,10225=>838,10226=>838,
-10227=>838,10228=>1157,10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,
-10237=>1434,10238=>1434,10239=>1434,10240=>732,10241=>732,10242=>732,10243=>732,10244=>732,10245=>732,10246=>732,
-10247=>732,10248=>732,10249=>732,10250=>732,10251=>732,10252=>732,10253=>732,10254=>732,10255=>732,10256=>732,
-10257=>732,10258=>732,10259=>732,10260=>732,10261=>732,10262=>732,10263=>732,10264=>732,10265=>732,10266=>732,
-10267=>732,10268=>732,10269=>732,10270=>732,10271=>732,10272=>732,10273=>732,10274=>732,10275=>732,10276=>732,
-10277=>732,10278=>732,10279=>732,10280=>732,10281=>732,10282=>732,10283=>732,10284=>732,10285=>732,10286=>732,
-10287=>732,10288=>732,10289=>732,10290=>732,10291=>732,10292=>732,10293=>732,10294=>732,10295=>732,10296=>732,
-10297=>732,10298=>732,10299=>732,10300=>732,10301=>732,10302=>732,10303=>732,10304=>732,10305=>732,10306=>732,
-10307=>732,10308=>732,10309=>732,10310=>732,10311=>732,10312=>732,10313=>732,10314=>732,10315=>732,10316=>732,
-10317=>732,10318=>732,10319=>732,10320=>732,10321=>732,10322=>732,10323=>732,10324=>732,10325=>732,10326=>732,
-10327=>732,10328=>732,10329=>732,10330=>732,10331=>732,10332=>732,10333=>732,10334=>732,10335=>732,10336=>732,
-10337=>732,10338=>732,10339=>732,10340=>732,10341=>732,10342=>732,10343=>732,10344=>732,10345=>732,10346=>732,
-10347=>732,10348=>732,10349=>732,10350=>732,10351=>732,10352=>732,10353=>732,10354=>732,10355=>732,10356=>732,
-10357=>732,10358=>732,10359=>732,10360=>732,10361=>732,10362=>732,10363=>732,10364=>732,10365=>732,10366=>732,
-10367=>732,10368=>732,10369=>732,10370=>732,10371=>732,10372=>732,10373=>732,10374=>732,10375=>732,10376=>732,
-10377=>732,10378=>732,10379=>732,10380=>732,10381=>732,10382=>732,10383=>732,10384=>732,10385=>732,10386=>732,
-10387=>732,10388=>732,10389=>732,10390=>732,10391=>732,10392=>732,10393=>732,10394=>732,10395=>732,10396=>732,
-10397=>732,10398=>732,10399=>732,10400=>732,10401=>732,10402=>732,10403=>732,10404=>732,10405=>732,10406=>732,
-10407=>732,10408=>732,10409=>732,10410=>732,10411=>732,10412=>732,10413=>732,10414=>732,10415=>732,10416=>732,
-10417=>732,10418=>732,10419=>732,10420=>732,10421=>732,10422=>732,10423=>732,10424=>732,10425=>732,10426=>732,
-10427=>732,10428=>732,10429=>732,10430=>732,10431=>732,10432=>732,10433=>732,10434=>732,10435=>732,10436=>732,
-10437=>732,10438=>732,10439=>732,10440=>732,10441=>732,10442=>732,10443=>732,10444=>732,10445=>732,10446=>732,
-10447=>732,10448=>732,10449=>732,10450=>732,10451=>732,10452=>732,10453=>732,10454=>732,10455=>732,10456=>732,
-10457=>732,10458=>732,10459=>732,10460=>732,10461=>732,10462=>732,10463=>732,10464=>732,10465=>732,10466=>732,
-10467=>732,10468=>732,10469=>732,10470=>732,10471=>732,10472=>732,10473=>732,10474=>732,10475=>732,10476=>732,
-10477=>732,10478=>732,10479=>732,10480=>732,10481=>732,10482=>732,10483=>732,10484=>732,10485=>732,10486=>732,
-10487=>732,10488=>732,10489=>732,10490=>732,10491=>732,10492=>732,10493=>732,10494=>732,10495=>732,10502=>838,
-10503=>838,10506=>838,10507=>838,10560=>683,10561=>683,10627=>734,10628=>734,10702=>838,10703=>1000,10704=>1000,
-10705=>1000,10706=>1000,10707=>1000,10708=>1000,10709=>1000,10731=>494,10746=>838,10747=>838,10752=>1000,10753=>1000,
-10754=>1000,10764=>1325,10765=>521,10766=>521,10767=>521,10768=>521,10769=>521,10770=>521,10771=>521,10772=>521,
-10773=>521,10774=>521,10775=>521,10776=>521,10777=>521,10778=>521,10779=>521,10780=>521,10799=>838,10877=>838,
-10878=>838,10879=>838,10880=>838,10881=>838,10882=>838,10883=>838,10884=>838,10885=>838,10886=>838,10887=>838,
-10888=>838,10889=>838,10890=>838,10891=>838,10892=>838,10893=>838,10894=>838,10895=>838,10896=>838,10897=>838,
-10898=>838,10899=>838,10900=>838,10901=>838,10902=>838,10903=>838,10904=>838,10905=>838,10906=>838,10907=>838,
-10908=>838,10909=>838,10910=>838,10911=>838,10912=>838,10926=>838,10927=>838,10928=>838,10929=>838,10930=>838,
-10931=>838,10932=>838,10933=>838,10934=>838,10935=>838,10936=>838,10937=>838,10938=>838,11001=>838,11002=>838,
-11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,11016=>838,11017=>838,
-11018=>838,11019=>838,11020=>838,11021=>838,11022=>836,11023=>836,11024=>836,11025=>836,11026=>945,11027=>945,
-11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11039=>869,11040=>869,11041=>873,
-11042=>873,11043=>873,11044=>1119,11091=>869,11092=>869,11360=>557,11361=>278,11362=>557,11363=>603,11364=>695,
-11365=>613,11366=>392,11367=>752,11368=>634,11369=>656,11370=>579,11371=>685,11372=>525,11373=>781,11374=>863,
-11375=>684,11377=>734,11378=>1128,11379=>961,11380=>592,11381=>654,11382=>568,11383=>660,11385=>414,11386=>612,
-11387=>491,11388=>175,11389=>431,11800=>531,11810=>390,11811=>390,11812=>390,11813=>390,11822=>531,19904=>896,
-19905=>896,19906=>896,19907=>896,19908=>896,19909=>896,19910=>896,19911=>896,19912=>896,19913=>896,19914=>896,
-19915=>896,19916=>896,19917=>896,19918=>896,19919=>896,19920=>896,19921=>896,19922=>896,19923=>896,19924=>896,
-19925=>896,19926=>896,19927=>896,19928=>896,19929=>896,19930=>896,19931=>896,19932=>896,19933=>896,19934=>896,
-19935=>896,19936=>896,19937=>896,19938=>896,19939=>896,19940=>896,19941=>896,19942=>896,19943=>896,19944=>896,
-19945=>896,19946=>896,19947=>896,19948=>896,19949=>896,19950=>896,19951=>896,19952=>896,19953=>896,19954=>896,
-19955=>896,19956=>896,19957=>896,19958=>896,19959=>896,19960=>896,19961=>896,19962=>896,19963=>896,19964=>896,
-19965=>896,19966=>896,19967=>896,42564=>635,42565=>521,42566=>354,42567=>338,42572=>1180,42573=>1028,42576=>1029,
-42577=>906,42580=>1080,42581=>842,42582=>985,42583=>847,42594=>1024,42595=>925,42596=>1014,42597=>900,42598=>863,
-42599=>1008,42600=>787,42601=>612,42602=>855,42603=>712,42604=>1358,42605=>1019,42606=>879,42634=>805,42635=>722,
-42636=>611,42637=>583,42644=>686,42645=>634,42760=>493,42761=>493,42762=>493,42763=>493,42764=>493,42765=>493,
-42766=>493,42767=>493,42768=>493,42769=>493,42770=>493,42771=>493,42772=>493,42773=>493,42774=>493,42779=>369,
-42780=>369,42781=>252,42782=>252,42783=>252,42790=>752,42791=>634,42792=>878,42793=>709,42794=>614,42795=>541,
-42800=>491,42801=>521,42802=>1250,42803=>985,42804=>1219,42805=>1000,42806=>1155,42807=>996,42808=>971,42809=>818,
-42810=>971,42811=>818,42812=>959,42813=>818,42814=>698,42815=>549,42822=>680,42823=>392,42824=>582,42825=>427,
-42826=>807,42827=>704,42830=>1358,42831=>1019,42880=>557,42881=>278,42882=>735,42883=>634,42889=>337,42890=>376,
-42891=>401,42892=>275,43003=>575,43004=>603,43005=>863,43006=>295,43007=>1199,63173=>612,64256=>722,64257=>646,
-64258=>646,64259=>1000,64260=>1000,64261=>686,64262=>861,64275=>1202,64276=>1202,64277=>1196,64278=>1186,64279=>1529,
-64285=>272,64286=>0,64287=>471,64288=>636,64289=>856,64290=>774,64291=>906,64292=>771,64293=>843,64294=>855,
-64295=>807,64296=>875,64297=>838,64298=>808,64299=>808,64300=>808,64301=>808,64302=>629,64303=>629,64304=>629,
-64305=>608,64306=>448,64307=>594,64308=>640,64309=>272,64310=>374,64311=>1000,64312=>648,64313=>336,64314=>592,
-64315=>556,64316=>599,64318=>659,64320=>441,64321=>700,64323=>640,64324=>604,64326=>581,64327=>663,64328=>592,
-64329=>808,64330=>657,64331=>272,64332=>608,64333=>556,64334=>604,64335=>629,65024=>0,65025=>0,65026=>0,
-65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,
-65037=>0,65038=>0,65039=>0,65056=>0,65057=>0,65058=>0,65059=>0,65529=>0,65530=>0,65531=>0,
-65532=>0,65533=>1025);
-$enc='';
-$diff='';
-$file='dejavusansi.z';
-$ctg='dejavusansi.ctg.z';
-$originalsize=523804;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmono.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmono.php
deleted file mode 100644
index ce70b1e67d5..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmono.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>9,'Flags'=>33,'FontBBox'=>'[-558 -375 718 1042]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,478=>602,479=>602,480=>602,481=>602,482=>602,483=>602,
-486=>602,487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,
-496=>602,500=>602,501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,
-512=>602,513=>602,514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,
-522=>602,523=>602,524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,
-532=>602,533=>602,534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,
-542=>602,543=>602,544=>602,545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,
-554=>602,555=>602,556=>602,557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,
-564=>602,565=>602,566=>602,567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,
-574=>602,575=>602,576=>602,577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,
-594=>602,595=>602,596=>602,597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,
-604=>602,605=>602,606=>602,607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,
-614=>602,615=>602,616=>602,617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,
-624=>602,625=>602,626=>602,627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,
-634=>602,635=>602,636=>602,637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,
-644=>602,645=>602,646=>602,647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,
-654=>602,655=>602,656=>602,657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,
-664=>602,665=>602,666=>602,667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,
-674=>602,675=>602,676=>602,677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,
-684=>602,685=>602,686=>602,687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,
-694=>602,695=>602,696=>602,697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,
-705=>602,711=>602,712=>602,713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,
-726=>602,727=>602,728=>602,729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,
-738=>602,739=>602,740=>602,741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,
-768=>602,769=>602,770=>602,771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,
-778=>602,779=>602,780=>602,781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,
-788=>602,789=>602,790=>602,791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,
-798=>602,799=>602,800=>602,801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,
-808=>602,809=>602,810=>602,811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,
-818=>602,819=>602,820=>602,821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,
-828=>602,829=>602,830=>602,831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,
-894=>602,900=>602,901=>602,902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,
-911=>602,912=>602,913=>602,914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,
-921=>602,922=>602,923=>602,924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,
-932=>602,933=>602,934=>602,935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,
-942=>602,943=>602,944=>602,945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,
-952=>602,953=>602,954=>602,955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,
-962=>602,963=>602,964=>602,965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,
-972=>602,973=>602,974=>602,976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,
-983=>602,984=>602,985=>602,986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,
-993=>602,1008=>602,1009=>602,1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,
-1017=>602,1018=>602,1019=>602,1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,
-1027=>602,1028=>602,1029=>602,1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,
-1037=>602,1038=>602,1039=>602,1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,
-1047=>602,1048=>602,1049=>602,1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,
-1057=>602,1058=>602,1059=>602,1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,
-1067=>602,1068=>602,1069=>602,1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,
-1077=>602,1078=>602,1079=>602,1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,
-1087=>602,1088=>602,1089=>602,1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,
-1097=>602,1098=>602,1099=>602,1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,
-1107=>602,1108=>602,1109=>602,1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,
-1117=>602,1118=>602,1119=>602,1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,
-1171=>602,1172=>602,1173=>602,1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,
-1187=>602,1194=>602,1195=>602,1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,
-1203=>602,1210=>602,1211=>602,1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,
-1227=>602,1228=>602,1231=>602,1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,
-1239=>602,1240=>602,1241=>602,1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,
-1249=>602,1250=>602,1251=>602,1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,
-1259=>602,1260=>602,1261=>602,1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,
-1269=>602,1270=>602,1271=>602,1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,
-1309=>602,1542=>602,1543=>602,1545=>602,1546=>602,1548=>602,1557=>602,1563=>602,1567=>602,1569=>602,
-1570=>602,1571=>602,1572=>602,1573=>602,1574=>602,1575=>602,1576=>602,1577=>602,1578=>602,1579=>602,
-1580=>602,1581=>602,1582=>602,1583=>602,1584=>602,1585=>602,1586=>602,1587=>602,1588=>602,1589=>602,
-1590=>602,1591=>602,1592=>602,1593=>602,1594=>602,1600=>602,1601=>602,1602=>602,1603=>602,1604=>602,
-1605=>602,1606=>602,1607=>602,1608=>602,1609=>602,1610=>602,1611=>602,1612=>602,1613=>602,1614=>602,
-1615=>602,1616=>602,1617=>602,1618=>602,1619=>602,1620=>602,1621=>602,1626=>602,1632=>602,1633=>602,
-1634=>602,1635=>602,1636=>602,1637=>602,1638=>602,1639=>602,1640=>602,1641=>602,1642=>602,1643=>602,
-1644=>602,1645=>602,1652=>602,1657=>602,1658=>602,1659=>602,1662=>602,1663=>602,1664=>602,1667=>602,
-1668=>602,1670=>602,1671=>602,1681=>602,1688=>602,1700=>602,1705=>602,1711=>602,1726=>602,1740=>602,
-1776=>602,1777=>602,1778=>602,1779=>602,1780=>602,1781=>602,1782=>602,1783=>602,1784=>602,1785=>602,
-3713=>602,3714=>602,3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,
-3735=>602,3737=>602,3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,
-3747=>602,3749=>602,3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,
-3762=>602,3763=>602,3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,
-3784=>602,3785=>602,3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,
-4308=>602,4309=>602,4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,
-4318=>602,4319=>602,4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,
-4328=>602,4329=>602,4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,
-4338=>602,4339=>602,4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,
-4348=>602,7426=>602,7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,
-7468=>602,7469=>602,7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,
-7479=>602,7480=>602,7481=>602,7482=>602,7483=>602,7484=>602,7486=>602,7487=>602,7488=>602,7489=>602,
-7490=>602,7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,
-7500=>602,7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,
-7510=>602,7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,
-7543=>602,7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,
-7585=>602,7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,
-7595=>602,7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,
-7605=>602,7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,
-7680=>602,7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,
-7690=>602,7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,
-7704=>602,7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,
-7714=>602,7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,
-7724=>602,7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,
-7736=>602,7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,
-7746=>602,7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,
-7756=>602,7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,
-7772=>602,7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,
-7786=>602,7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,
-7796=>602,7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,
-7808=>602,7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,
-7818=>602,7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,
-7828=>602,7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,
-7852=>602,7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,
-7878=>602,7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,
-7900=>602,7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,
-7914=>602,7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,
-7928=>602,7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,
-7944=>602,7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,
-7954=>602,7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,
-7968=>602,7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,
-7978=>602,7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,
-7988=>602,7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,
-7998=>602,7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,
-8010=>602,8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,
-8022=>602,8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,
-8036=>602,8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,
-8046=>602,8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,
-8056=>602,8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,
-8068=>602,8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,
-8078=>602,8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,
-8088=>602,8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,
-8098=>602,8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,
-8108=>602,8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,
-8119=>602,8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,
-8129=>602,8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,
-8140=>602,8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,
-8152=>602,8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,
-8163=>602,8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,
-8173=>602,8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,
-8186=>602,8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,
-8197=>602,8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,
-8215=>602,8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,
-8246=>602,8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,
-8287=>602,8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,
-8315=>602,8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,
-8325=>602,8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,
-8336=>602,8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,
-8357=>602,8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,
-8368=>602,8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,
-8463=>602,8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,
-8491=>602,8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,
-8539=>602,8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,
-8597=>602,8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,
-8607=>602,8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,
-8617=>602,8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,
-8627=>602,8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,
-8637=>602,8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,
-8647=>602,8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,
-8657=>602,8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,
-8667=>602,8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,
-8677=>602,8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,
-8687=>602,8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,
-8697=>602,8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,
-8707=>602,8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,
-8717=>602,8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,
-8731=>602,8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,
-8747=>602,8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,
-8770=>602,8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,
-8780=>602,8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,
-8790=>602,8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,
-8800=>602,8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,
-8813=>602,8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,
-8823=>602,8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,
-8833=>602,8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,
-8843=>602,8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,
-8858=>602,8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,
-8909=>602,8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,
-8931=>602,8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,
-8962=>602,8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,
-8973=>602,8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,
-8985=>602,8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,
-9000=>602,9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,
-9022=>602,9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,
-9037=>602,9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,
-9052=>602,9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,
-9068=>602,9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,
-9080=>602,9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,
-9098=>602,9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,
-9122=>602,9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,
-9132=>602,9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,9472=>602,9473=>602,9474=>602,9475=>602,
-9476=>602,9477=>602,9478=>602,9479=>602,9480=>602,9481=>602,9482=>602,9483=>602,9484=>602,9485=>602,
-9486=>602,9487=>602,9488=>602,9489=>602,9490=>602,9491=>602,9492=>602,9493=>602,9494=>602,9495=>602,
-9496=>602,9497=>602,9498=>602,9499=>602,9500=>602,9501=>602,9502=>602,9503=>602,9504=>602,9505=>602,
-9506=>602,9507=>602,9508=>602,9509=>602,9510=>602,9511=>602,9512=>602,9513=>602,9514=>602,9515=>602,
-9516=>602,9517=>602,9518=>602,9519=>602,9520=>602,9521=>602,9522=>602,9523=>602,9524=>602,9525=>602,
-9526=>602,9527=>602,9528=>602,9529=>602,9530=>602,9531=>602,9532=>602,9533=>602,9534=>602,9535=>602,
-9536=>602,9537=>602,9538=>602,9539=>602,9540=>602,9541=>602,9542=>602,9543=>602,9544=>602,9545=>602,
-9546=>602,9547=>602,9548=>602,9549=>602,9550=>602,9551=>602,9552=>602,9553=>602,9554=>602,9555=>602,
-9556=>602,9557=>602,9558=>602,9559=>602,9560=>602,9561=>602,9562=>602,9563=>602,9564=>602,9565=>602,
-9566=>602,9567=>602,9568=>602,9569=>602,9570=>602,9571=>602,9572=>602,9573=>602,9574=>602,9575=>602,
-9576=>602,9577=>602,9578=>602,9579=>602,9580=>602,9581=>602,9582=>602,9583=>602,9584=>602,9585=>602,
-9586=>602,9587=>602,9588=>602,9589=>602,9590=>602,9591=>602,9592=>602,9593=>602,9594=>602,9595=>602,
-9596=>602,9597=>602,9598=>602,9599=>602,9600=>602,9601=>602,9602=>602,9603=>602,9604=>602,9605=>602,
-9606=>602,9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,9614=>602,9615=>602,
-9616=>602,9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,9624=>602,9625=>602,
-9626=>602,9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,9634=>602,9635=>602,
-9636=>602,9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,9644=>602,9645=>602,
-9646=>602,9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,9654=>602,9655=>602,
-9656=>602,9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,9664=>602,9665=>602,
-9666=>602,9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,9674=>602,9675=>602,
-9676=>602,9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,9684=>602,9685=>602,
-9686=>602,9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,9694=>602,9695=>602,
-9696=>602,9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,9704=>602,9705=>602,
-9706=>602,9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,9714=>602,9715=>602,
-9716=>602,9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,9724=>602,9725=>602,
-9726=>602,9727=>602,9728=>602,9729=>602,9730=>602,9731=>602,9732=>602,9733=>602,9734=>602,9735=>602,
-9736=>602,9737=>602,9738=>602,9739=>602,9740=>602,9741=>602,9742=>602,9743=>602,9744=>602,9745=>602,
-9746=>602,9747=>602,9748=>602,9749=>602,9750=>602,9751=>602,9752=>602,9753=>602,9754=>602,9755=>602,
-9756=>602,9757=>602,9758=>602,9759=>602,9760=>602,9761=>602,9762=>602,9763=>602,9764=>602,9765=>602,
-9766=>602,9767=>602,9768=>602,9769=>602,9770=>602,9771=>602,9772=>602,9773=>602,9774=>602,9775=>602,
-9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9789=>602,9790=>602,9791=>602,9792=>602,9793=>602,
-9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9800=>602,9801=>602,9802=>602,9803=>602,
-9804=>602,9805=>602,9806=>602,9807=>602,9808=>602,9809=>602,9810=>602,9811=>602,9812=>602,9813=>602,
-9814=>602,9815=>602,9816=>602,9817=>602,9818=>602,9819=>602,9820=>602,9821=>602,9822=>602,9823=>602,
-9824=>602,9825=>602,9826=>602,9827=>602,9828=>602,9829=>602,9830=>602,9831=>602,9832=>602,9833=>602,
-9834=>602,9835=>602,9836=>602,9837=>602,9838=>602,9839=>602,9840=>602,9841=>602,9842=>602,9843=>602,
-9844=>602,9845=>602,9846=>602,9847=>602,9848=>602,9849=>602,9850=>602,9851=>602,9852=>602,9853=>602,
-9854=>602,9855=>602,9856=>602,9857=>602,9858=>602,9859=>602,9860=>602,9861=>602,9862=>602,9863=>602,
-9864=>602,9865=>602,9866=>602,9867=>602,9872=>602,9873=>602,9874=>602,9875=>602,9876=>602,9877=>602,
-9878=>602,9879=>602,9880=>602,9881=>602,9882=>602,9883=>602,9884=>602,9888=>602,9889=>602,9904=>602,
-9905=>602,9985=>602,9986=>602,9987=>602,9988=>602,9990=>602,9991=>602,9992=>602,9993=>602,9996=>602,
-9997=>602,9998=>602,9999=>602,10000=>602,10001=>602,10002=>602,10003=>602,10004=>602,10005=>602,10006=>602,
-10007=>602,10008=>602,10009=>602,10010=>602,10011=>602,10012=>602,10013=>602,10014=>602,10015=>602,10016=>602,
-10017=>602,10018=>602,10019=>602,10020=>602,10021=>602,10022=>602,10023=>602,10025=>602,10026=>602,10027=>602,
-10028=>602,10029=>602,10030=>602,10031=>602,10032=>602,10033=>602,10034=>602,10035=>602,10036=>602,10037=>602,
-10038=>602,10039=>602,10040=>602,10041=>602,10042=>602,10043=>602,10044=>602,10045=>602,10046=>602,10047=>602,
-10048=>602,10049=>602,10050=>602,10051=>602,10052=>602,10053=>602,10054=>602,10055=>602,10056=>602,10057=>602,
-10058=>602,10059=>602,10061=>602,10063=>602,10064=>602,10065=>602,10066=>602,10070=>602,10072=>602,10073=>602,
-10074=>602,10075=>602,10076=>602,10077=>602,10078=>602,10081=>602,10082=>602,10083=>602,10084=>602,10085=>602,
-10086=>602,10087=>602,10088=>602,10089=>602,10090=>602,10091=>602,10092=>602,10093=>602,10094=>602,10095=>602,
-10096=>602,10097=>602,10098=>602,10099=>602,10100=>602,10101=>602,10132=>602,10136=>602,10137=>602,10138=>602,
-10139=>602,10140=>602,10141=>602,10142=>602,10143=>602,10144=>602,10145=>602,10146=>602,10147=>602,10148=>602,
-10149=>602,10150=>602,10151=>602,10152=>602,10153=>602,10154=>602,10155=>602,10156=>602,10157=>602,10158=>602,
-10159=>602,10161=>602,10162=>602,10163=>602,10164=>602,10165=>602,10166=>602,10167=>602,10168=>602,10169=>602,
-10170=>602,10171=>602,10172=>602,10173=>602,10174=>602,10181=>602,10182=>602,10208=>602,10216=>602,10217=>602,
-10731=>602,10746=>602,10747=>602,10799=>602,11026=>602,11027=>602,11028=>602,11029=>602,11030=>602,11031=>602,
-11032=>602,11033=>602,11034=>602,11364=>602,11374=>602,11375=>602,11381=>602,11382=>602,11383=>602,11385=>602,
-11386=>602,11388=>602,11389=>602,11800=>602,11810=>602,11811=>602,11812=>602,11813=>602,11822=>602,42760=>602,
-42761=>602,42762=>602,42763=>602,42764=>602,42765=>602,42766=>602,42767=>602,42768=>602,42769=>602,42770=>602,
-42771=>602,42772=>602,42773=>602,42774=>602,42779=>602,42780=>602,42781=>602,42782=>602,42783=>602,42790=>602,
-42791=>602,42889=>602,42890=>602,42891=>602,42892=>602,63173=>602,64257=>602,64258=>602,64338=>602,64339=>602,
-64340=>602,64341=>602,64342=>602,64343=>602,64344=>602,64345=>602,64346=>602,64347=>602,64348=>602,64349=>602,
-64350=>602,64351=>602,64352=>602,64353=>602,64354=>602,64355=>602,64356=>602,64357=>602,64358=>602,64359=>602,
-64360=>602,64361=>602,64362=>602,64363=>602,64364=>602,64365=>602,64366=>602,64367=>602,64368=>602,64369=>602,
-64370=>602,64371=>602,64372=>602,64373=>602,64374=>602,64375=>602,64376=>602,64377=>602,64378=>602,64379=>602,
-64380=>602,64381=>602,64382=>602,64383=>602,64384=>602,64385=>602,64394=>602,64395=>602,64396=>602,64397=>602,
-64398=>602,64399=>602,64400=>602,64401=>602,64402=>602,64403=>602,64404=>602,64405=>602,64414=>602,64415=>602,
-64426=>602,64427=>602,64428=>602,64429=>602,64488=>602,64489=>602,64508=>602,64509=>602,64510=>602,64511=>602,
-65136=>602,65137=>602,65138=>602,65139=>602,65140=>602,65142=>602,65143=>602,65144=>602,65145=>602,65146=>602,
-65147=>602,65148=>602,65149=>602,65150=>602,65151=>602,65152=>602,65153=>602,65154=>602,65155=>602,65156=>602,
-65157=>602,65158=>602,65159=>602,65160=>602,65161=>602,65162=>602,65163=>602,65164=>602,65165=>602,65166=>602,
-65167=>602,65168=>602,65169=>602,65170=>602,65171=>602,65172=>602,65173=>602,65174=>602,65175=>602,65176=>602,
-65177=>602,65178=>602,65179=>602,65180=>602,65181=>602,65182=>602,65183=>602,65184=>602,65185=>602,65186=>602,
-65187=>602,65188=>602,65189=>602,65190=>602,65191=>602,65192=>602,65193=>602,65194=>602,65195=>602,65196=>602,
-65197=>602,65198=>602,65199=>602,65200=>602,65201=>602,65202=>602,65203=>602,65204=>602,65205=>602,65206=>602,
-65207=>602,65208=>602,65209=>602,65210=>602,65211=>602,65212=>602,65213=>602,65214=>602,65215=>602,65216=>602,
-65217=>602,65218=>602,65219=>602,65220=>602,65221=>602,65222=>602,65223=>602,65224=>602,65225=>602,65226=>602,
-65227=>602,65228=>602,65229=>602,65230=>602,65231=>602,65232=>602,65233=>602,65234=>602,65235=>602,65236=>602,
-65237=>602,65238=>602,65239=>602,65240=>602,65241=>602,65242=>602,65243=>602,65244=>602,65245=>602,65246=>602,
-65247=>602,65248=>602,65249=>602,65250=>602,65251=>602,65252=>602,65253=>602,65254=>602,65255=>602,65256=>602,
-65257=>602,65258=>602,65259=>602,65260=>602,65261=>602,65262=>602,65263=>602,65264=>602,65265=>602,65266=>602,
-65267=>602,65268=>602,65269=>602,65270=>602,65271=>602,65272=>602,65273=>602,65274=>602,65275=>602,65276=>602,
-65279=>602,65529=>602,65530=>602,65531=>602,65532=>602,65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmono.z';
-$ctg='dejavusansmono.ctg.z';
-$originalsize=321524;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonob.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonob.php
deleted file mode 100644
index a13bc838d42..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonob.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono-Bold';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>13,'Flags'=>33,'FontBBox'=>'[-446 -394 731 1052]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,478=>602,479=>602,480=>602,481=>602,482=>602,483=>602,
-486=>602,487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,
-496=>602,500=>602,501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,
-512=>602,513=>602,514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,
-522=>602,523=>602,524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,
-532=>602,533=>602,534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,
-542=>602,543=>602,544=>602,545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,
-554=>602,555=>602,556=>602,557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,
-564=>602,565=>602,566=>602,567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,
-574=>602,575=>602,576=>602,577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,
-594=>602,595=>602,596=>602,597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,
-604=>602,605=>602,606=>602,607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,
-614=>602,615=>602,616=>602,617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,
-624=>602,625=>602,626=>602,627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,
-634=>602,635=>602,636=>602,637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,
-644=>602,645=>602,646=>602,647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,
-654=>602,655=>602,656=>602,657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,
-664=>602,665=>602,666=>602,667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,
-674=>602,675=>602,676=>602,677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,
-684=>602,685=>602,686=>602,687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,
-694=>602,695=>602,696=>602,697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,
-705=>602,711=>602,712=>602,713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,
-726=>602,727=>602,728=>602,729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,
-738=>602,739=>602,740=>602,741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,
-768=>602,769=>602,770=>602,771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,
-778=>602,779=>602,780=>602,781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,
-788=>602,789=>602,790=>602,791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,
-798=>602,799=>602,800=>602,801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,
-808=>602,809=>602,810=>602,811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,
-818=>602,819=>602,820=>602,821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,
-828=>602,829=>602,830=>602,831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,
-894=>602,900=>602,901=>602,902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,
-911=>602,912=>602,913=>602,914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,
-921=>602,922=>602,923=>602,924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,
-932=>602,933=>602,934=>602,935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,
-942=>602,943=>602,944=>602,945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,
-952=>602,953=>602,954=>602,955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,
-962=>602,963=>602,964=>602,965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,
-972=>602,973=>602,974=>602,976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,
-983=>602,984=>602,985=>602,986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,
-993=>602,1008=>602,1009=>602,1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,
-1017=>602,1018=>602,1019=>602,1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,
-1027=>602,1028=>602,1029=>602,1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,
-1037=>602,1038=>602,1039=>602,1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,
-1047=>602,1048=>602,1049=>602,1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,
-1057=>602,1058=>602,1059=>602,1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,
-1067=>602,1068=>602,1069=>602,1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,
-1077=>602,1078=>602,1079=>602,1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,
-1087=>602,1088=>602,1089=>602,1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,
-1097=>602,1098=>602,1099=>602,1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,
-1107=>602,1108=>602,1109=>602,1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,
-1117=>602,1118=>602,1119=>602,1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,
-1171=>602,1172=>602,1173=>602,1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,
-1187=>602,1194=>602,1195=>602,1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,
-1203=>602,1210=>602,1211=>602,1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,
-1227=>602,1228=>602,1231=>602,1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,
-1239=>602,1240=>602,1241=>602,1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,
-1249=>602,1250=>602,1251=>602,1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,
-1259=>602,1260=>602,1261=>602,1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,
-1269=>602,1270=>602,1271=>602,1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,
-1309=>602,1542=>602,1543=>602,1545=>602,1546=>602,1548=>602,1557=>602,1563=>602,1567=>602,1569=>602,
-1570=>602,1571=>602,1572=>602,1573=>602,1574=>602,1575=>602,1576=>602,1577=>602,1578=>602,1579=>602,
-1580=>602,1581=>602,1582=>602,1583=>602,1584=>602,1585=>602,1586=>602,1587=>602,1588=>602,1589=>602,
-1590=>602,1591=>602,1592=>602,1593=>602,1594=>602,1600=>602,1601=>602,1602=>602,1603=>602,1604=>602,
-1605=>602,1606=>602,1607=>602,1608=>602,1609=>602,1610=>602,1611=>602,1612=>602,1613=>602,1614=>602,
-1615=>602,1616=>602,1617=>602,1618=>602,1619=>602,1620=>602,1621=>602,1626=>602,1632=>602,1633=>602,
-1634=>602,1635=>602,1636=>602,1637=>602,1638=>602,1639=>602,1640=>602,1641=>602,1642=>602,1643=>602,
-1644=>602,1645=>602,1652=>602,1657=>602,1658=>602,1659=>602,1662=>602,1663=>602,1664=>602,1667=>602,
-1668=>602,1670=>602,1671=>602,1681=>602,1688=>602,1700=>602,1705=>602,1711=>602,1726=>602,1740=>602,
-1776=>602,1777=>602,1778=>602,1779=>602,1780=>602,1781=>602,1782=>602,1783=>602,1784=>602,1785=>602,
-3713=>602,3714=>602,3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,
-3735=>602,3737=>602,3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,
-3747=>602,3749=>602,3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,
-3762=>602,3763=>602,3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,
-3784=>602,3785=>602,3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,
-4308=>602,4309=>602,4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,
-4318=>602,4319=>602,4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,
-4328=>602,4329=>602,4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,
-4338=>602,4339=>602,4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,
-4348=>602,7426=>602,7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,
-7468=>602,7469=>602,7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,
-7479=>602,7480=>602,7481=>602,7482=>602,7483=>602,7484=>602,7486=>602,7487=>602,7488=>602,7489=>602,
-7490=>602,7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,
-7500=>602,7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,
-7510=>602,7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,
-7543=>602,7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,
-7585=>602,7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,
-7595=>602,7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,
-7605=>602,7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,
-7680=>602,7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,
-7690=>602,7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,
-7704=>602,7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,
-7714=>602,7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,
-7724=>602,7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,
-7736=>602,7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,
-7746=>602,7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,
-7756=>602,7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,
-7772=>602,7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,
-7786=>602,7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,
-7796=>602,7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,
-7808=>602,7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,
-7818=>602,7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,
-7828=>602,7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,
-7852=>602,7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,
-7878=>602,7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,
-7900=>602,7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,
-7914=>602,7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,
-7928=>602,7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,
-7944=>602,7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,
-7954=>602,7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,
-7968=>602,7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,
-7978=>602,7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,
-7988=>602,7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,
-7998=>602,7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,
-8010=>602,8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,
-8022=>602,8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,
-8036=>602,8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,
-8046=>602,8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,
-8056=>602,8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,
-8068=>602,8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,
-8078=>602,8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,
-8088=>602,8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,
-8098=>602,8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,
-8108=>602,8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,
-8119=>602,8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,
-8129=>602,8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,
-8140=>602,8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,
-8152=>602,8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,
-8163=>602,8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,
-8173=>602,8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,
-8186=>602,8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,
-8197=>602,8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,
-8215=>602,8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,
-8246=>602,8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,
-8287=>602,8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,
-8315=>602,8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,
-8325=>602,8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,
-8336=>602,8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,
-8357=>602,8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,
-8368=>602,8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,
-8463=>602,8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,
-8491=>602,8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,
-8539=>602,8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,
-8597=>602,8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,
-8607=>602,8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,
-8617=>602,8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,
-8627=>602,8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,
-8637=>602,8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,
-8647=>602,8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,
-8657=>602,8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,
-8667=>602,8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,
-8677=>602,8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,
-8687=>602,8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,
-8697=>602,8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,
-8707=>602,8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,
-8717=>602,8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,
-8731=>602,8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,
-8747=>602,8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,
-8770=>602,8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,
-8780=>602,8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,
-8790=>602,8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,
-8800=>602,8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,
-8813=>602,8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,
-8823=>602,8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,
-8833=>602,8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,
-8843=>602,8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,
-8858=>602,8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,
-8909=>602,8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,
-8931=>602,8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,
-8962=>602,8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,
-8973=>602,8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,
-8985=>602,8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,
-9000=>602,9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,
-9022=>602,9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,
-9037=>602,9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,
-9052=>602,9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,
-9068=>602,9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,
-9080=>602,9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,
-9098=>602,9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,
-9122=>602,9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,
-9132=>602,9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,9600=>602,9601=>602,9602=>602,9603=>602,
-9604=>602,9605=>602,9606=>602,9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,
-9614=>602,9615=>602,9616=>602,9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,
-9624=>602,9625=>602,9626=>602,9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,
-9634=>602,9635=>602,9636=>602,9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,
-9644=>602,9645=>602,9646=>602,9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,
-9654=>602,9655=>602,9656=>602,9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,
-9664=>602,9665=>602,9666=>602,9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,
-9674=>602,9675=>602,9676=>602,9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,
-9684=>602,9685=>602,9686=>602,9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,
-9694=>602,9695=>602,9696=>602,9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,
-9704=>602,9705=>602,9706=>602,9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,
-9714=>602,9715=>602,9716=>602,9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,
-9724=>602,9725=>602,9726=>602,9727=>602,9728=>602,9729=>602,9730=>602,9731=>602,9732=>602,9733=>602,
-9734=>602,9735=>602,9736=>602,9737=>602,9738=>602,9739=>602,9740=>602,9741=>602,9742=>602,9743=>602,
-9744=>602,9745=>602,9746=>602,9747=>602,9748=>602,9749=>602,9750=>602,9751=>602,9752=>602,9753=>602,
-9754=>602,9755=>602,9756=>602,9757=>602,9758=>602,9759=>602,9760=>602,9761=>602,9762=>602,9763=>602,
-9764=>602,9765=>602,9766=>602,9767=>602,9768=>602,9769=>602,9770=>602,9771=>602,9772=>602,9773=>602,
-9774=>602,9775=>602,9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9789=>602,9790=>602,9791=>602,
-9792=>602,9793=>602,9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9800=>602,9801=>602,
-9802=>602,9803=>602,9804=>602,9805=>602,9806=>602,9807=>602,9808=>602,9809=>602,9810=>602,9811=>602,
-9812=>602,9813=>602,9814=>602,9815=>602,9816=>602,9817=>602,9818=>602,9819=>602,9820=>602,9821=>602,
-9822=>602,9823=>602,9824=>602,9825=>602,9826=>602,9827=>602,9828=>602,9829=>602,9830=>602,9831=>602,
-9832=>602,9833=>602,9834=>602,9835=>602,9836=>602,9837=>602,9838=>602,9839=>602,9840=>602,9841=>602,
-9842=>602,9843=>602,9844=>602,9845=>602,9846=>602,9847=>602,9848=>602,9849=>602,9850=>602,9851=>602,
-9852=>602,9853=>602,9854=>602,9855=>602,9856=>602,9857=>602,9858=>602,9859=>602,9860=>602,9861=>602,
-9862=>602,9863=>602,9864=>602,9865=>602,9866=>602,9867=>602,9872=>602,9873=>602,9874=>602,9875=>602,
-9876=>602,9877=>602,9878=>602,9879=>602,9880=>602,9881=>602,9882=>602,9883=>602,9884=>602,9888=>602,
-9889=>602,9904=>602,9905=>602,9985=>602,9986=>602,9987=>602,9988=>602,9990=>602,9991=>602,9992=>602,
-9993=>602,9996=>602,9997=>602,9998=>602,9999=>602,10000=>602,10001=>602,10002=>602,10003=>602,10004=>602,
-10005=>602,10006=>602,10007=>602,10008=>602,10009=>602,10010=>602,10011=>602,10012=>602,10013=>602,10014=>602,
-10015=>602,10016=>602,10017=>602,10018=>602,10019=>602,10020=>602,10021=>602,10022=>602,10023=>602,10025=>602,
-10026=>602,10027=>602,10028=>602,10029=>602,10030=>602,10031=>602,10032=>602,10033=>602,10034=>602,10035=>602,
-10036=>602,10037=>602,10038=>602,10039=>602,10040=>602,10041=>602,10042=>602,10043=>602,10044=>602,10045=>602,
-10046=>602,10047=>602,10048=>602,10049=>602,10050=>602,10051=>602,10052=>602,10053=>602,10054=>602,10055=>602,
-10056=>602,10057=>602,10058=>602,10059=>602,10061=>602,10063=>602,10064=>602,10065=>602,10066=>602,10070=>602,
-10072=>602,10073=>602,10074=>602,10075=>602,10076=>602,10077=>602,10078=>602,10081=>602,10082=>602,10083=>602,
-10084=>602,10085=>602,10086=>602,10087=>602,10088=>602,10089=>602,10090=>602,10091=>602,10092=>602,10093=>602,
-10094=>602,10095=>602,10096=>602,10097=>602,10098=>602,10099=>602,10100=>602,10101=>602,10132=>602,10136=>602,
-10137=>602,10138=>602,10139=>602,10140=>602,10141=>602,10142=>602,10143=>602,10144=>602,10145=>602,10146=>602,
-10147=>602,10148=>602,10149=>602,10150=>602,10151=>602,10152=>602,10153=>602,10154=>602,10155=>602,10156=>602,
-10157=>602,10158=>602,10159=>602,10161=>602,10162=>602,10163=>602,10164=>602,10165=>602,10166=>602,10167=>602,
-10168=>602,10169=>602,10170=>602,10171=>602,10172=>602,10173=>602,10174=>602,10175=>602,10181=>602,10182=>602,
-10208=>602,10216=>602,10217=>602,10731=>602,10746=>602,10747=>602,10799=>602,11026=>602,11027=>602,11028=>602,
-11029=>602,11030=>602,11031=>602,11032=>602,11033=>602,11034=>602,11364=>602,11374=>602,11375=>602,11381=>602,
-11382=>602,11383=>602,11385=>602,11386=>602,11388=>602,11389=>602,11800=>602,11810=>602,11811=>602,11812=>602,
-11813=>602,11822=>602,42760=>602,42761=>602,42762=>602,42763=>602,42764=>602,42765=>602,42766=>602,42767=>602,
-42768=>602,42769=>602,42770=>602,42771=>602,42772=>602,42773=>602,42774=>602,42779=>602,42780=>602,42781=>602,
-42782=>602,42783=>602,42790=>602,42791=>602,42889=>602,42890=>602,42891=>602,42892=>602,63173=>602,64257=>602,
-64258=>602,64338=>602,64339=>602,64340=>602,64341=>602,64342=>602,64343=>602,64344=>602,64345=>602,64346=>602,
-64347=>602,64348=>602,64349=>602,64350=>602,64351=>602,64352=>602,64353=>602,64354=>602,64355=>602,64356=>602,
-64357=>602,64358=>602,64359=>602,64360=>602,64361=>602,64362=>602,64363=>602,64364=>602,64365=>602,64366=>602,
-64367=>602,64368=>602,64369=>602,64370=>602,64371=>602,64372=>602,64373=>602,64374=>602,64375=>602,64376=>602,
-64377=>602,64378=>602,64379=>602,64380=>602,64381=>602,64382=>602,64383=>602,64384=>602,64385=>602,64394=>602,
-64395=>602,64396=>602,64397=>602,64398=>602,64399=>602,64400=>602,64401=>602,64402=>602,64403=>602,64404=>602,
-64405=>602,64414=>602,64415=>602,64426=>602,64427=>602,64428=>602,64429=>602,64488=>602,64489=>602,64508=>602,
-64509=>602,64510=>602,64511=>602,65136=>602,65137=>602,65138=>602,65139=>602,65140=>602,65142=>602,65143=>602,
-65144=>602,65145=>602,65146=>602,65147=>602,65148=>602,65149=>602,65150=>602,65151=>602,65152=>602,65153=>602,
-65154=>602,65155=>602,65156=>602,65157=>602,65158=>602,65159=>602,65160=>602,65161=>602,65162=>602,65163=>602,
-65164=>602,65165=>602,65166=>602,65167=>602,65168=>602,65169=>602,65170=>602,65171=>602,65172=>602,65173=>602,
-65174=>602,65175=>602,65176=>602,65177=>602,65178=>602,65179=>602,65180=>602,65181=>602,65182=>602,65183=>602,
-65184=>602,65185=>602,65186=>602,65187=>602,65188=>602,65189=>602,65190=>602,65191=>602,65192=>602,65193=>602,
-65194=>602,65195=>602,65196=>602,65197=>602,65198=>602,65199=>602,65200=>602,65201=>602,65202=>602,65203=>602,
-65204=>602,65205=>602,65206=>602,65207=>602,65208=>602,65209=>602,65210=>602,65211=>602,65212=>602,65213=>602,
-65214=>602,65215=>602,65216=>602,65217=>602,65218=>602,65219=>602,65220=>602,65221=>602,65222=>602,65223=>602,
-65224=>602,65225=>602,65226=>602,65227=>602,65228=>602,65229=>602,65230=>602,65231=>602,65232=>602,65233=>602,
-65234=>602,65235=>602,65236=>602,65237=>602,65238=>602,65239=>602,65240=>602,65241=>602,65242=>602,65243=>602,
-65244=>602,65245=>602,65246=>602,65247=>602,65248=>602,65249=>602,65250=>602,65251=>602,65252=>602,65253=>602,
-65254=>602,65255=>602,65256=>602,65257=>602,65258=>602,65259=>602,65260=>602,65261=>602,65262=>602,65263=>602,
-65264=>602,65265=>602,65266=>602,65267=>602,65268=>602,65269=>602,65270=>602,65271=>602,65272=>602,65273=>602,
-65274=>602,65275=>602,65276=>602,65279=>602,65529=>602,65530=>602,65531=>602,65532=>602,65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmonob.z';
-$ctg='dejavusansmonob.ctg.z';
-$originalsize=301928;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonobi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonobi.php
deleted file mode 100644
index b1b57b37917..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonobi.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono-BoldOblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-70,'Flags'=>97,'FontBBox'=>'[-428 -394 808 1053]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,478=>602,479=>602,480=>602,481=>602,482=>602,483=>602,
-486=>602,487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,
-500=>602,501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,512=>602,
-513=>602,514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,522=>602,
-523=>602,524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,532=>602,
-533=>602,534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,542=>602,
-543=>602,545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,554=>602,555=>602,
-556=>602,557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,564=>602,565=>602,
-566=>602,567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,574=>602,575=>602,
-576=>602,577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,594=>602,595=>602,
-596=>602,597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,604=>602,605=>602,
-606=>602,607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,614=>602,615=>602,
-616=>602,617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,624=>602,625=>602,
-626=>602,627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,634=>602,635=>602,
-636=>602,637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,644=>602,645=>602,
-646=>602,647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,654=>602,655=>602,
-656=>602,657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,664=>602,665=>602,
-666=>602,667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,674=>602,675=>602,
-676=>602,677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,684=>602,685=>602,
-686=>602,687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,694=>602,695=>602,
-696=>602,697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,705=>602,711=>602,
-712=>602,713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,726=>602,727=>602,
-728=>602,729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,738=>602,739=>602,
-740=>602,741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,768=>602,769=>602,
-770=>602,771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,778=>602,779=>602,
-780=>602,781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,788=>602,789=>602,
-790=>602,791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,798=>602,799=>602,
-800=>602,801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,808=>602,809=>602,
-810=>602,811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,818=>602,819=>602,
-820=>602,821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,828=>602,829=>602,
-830=>602,831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,894=>602,900=>602,
-901=>602,902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,911=>602,912=>602,
-913=>602,914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,921=>602,922=>602,
-923=>602,924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,932=>602,933=>602,
-934=>602,935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,942=>602,943=>602,
-944=>602,945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,952=>602,953=>602,
-954=>602,955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,962=>602,963=>602,
-964=>602,965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,972=>602,973=>602,
-974=>602,976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,983=>602,984=>602,
-985=>602,986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,993=>602,1008=>602,
-1009=>602,1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,1017=>602,1018=>602,
-1019=>602,1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,1027=>602,1028=>602,
-1029=>602,1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,1037=>602,1038=>602,
-1039=>602,1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,1047=>602,1048=>602,
-1049=>602,1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,1057=>602,1058=>602,
-1059=>602,1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,1067=>602,1068=>602,
-1069=>602,1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,1077=>602,1078=>602,
-1079=>602,1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,1087=>602,1088=>602,
-1089=>602,1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,1097=>602,1098=>602,
-1099=>602,1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,1107=>602,1108=>602,
-1109=>602,1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,1117=>602,1118=>602,
-1119=>602,1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,1171=>602,1172=>602,
-1173=>602,1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,1187=>602,1194=>602,
-1195=>602,1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,1203=>602,1210=>602,
-1211=>602,1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,1227=>602,1228=>602,
-1231=>602,1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,1239=>602,1240=>602,
-1241=>602,1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,1249=>602,1250=>602,
-1251=>602,1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,1259=>602,1260=>602,
-1261=>602,1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,1269=>602,1270=>602,
-1271=>602,1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,1309=>602,3713=>602,
-3714=>602,3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,3735=>602,
-3737=>602,3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,3747=>602,
-3749=>602,3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,3762=>602,
-3763=>602,3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,3784=>602,
-3785=>602,3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,4308=>602,
-4309=>602,4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,4318=>602,
-4319=>602,4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,4328=>602,
-4329=>602,4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,4338=>602,
-4339=>602,4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,4348=>602,
-7426=>602,7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,7468=>602,
-7469=>602,7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,7479=>602,
-7480=>602,7481=>602,7482=>602,7483=>602,7484=>602,7486=>602,7487=>602,7488=>602,7489=>602,7490=>602,
-7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,7500=>602,
-7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,7510=>602,
-7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,7543=>602,
-7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,7585=>602,
-7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,7595=>602,
-7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,7605=>602,
-7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,7680=>602,
-7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,7690=>602,
-7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,7704=>602,
-7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,7714=>602,
-7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,7724=>602,
-7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,7736=>602,
-7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,7746=>602,
-7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,7756=>602,
-7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,7772=>602,
-7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,7786=>602,
-7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,7796=>602,
-7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,7808=>602,
-7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,7818=>602,
-7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,7828=>602,
-7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,7852=>602,
-7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,7878=>602,
-7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,7900=>602,
-7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,7914=>602,
-7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,7928=>602,
-7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,7944=>602,
-7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,7954=>602,
-7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,7968=>602,
-7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,7978=>602,
-7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,7988=>602,
-7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,7998=>602,
-7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,8010=>602,
-8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,8022=>602,
-8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,8036=>602,
-8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,8046=>602,
-8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,8056=>602,
-8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,8068=>602,
-8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,8078=>602,
-8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,8088=>602,
-8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,8098=>602,
-8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,8108=>602,
-8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,8119=>602,
-8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,8129=>602,
-8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,8140=>602,
-8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,8152=>602,
-8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,8163=>602,
-8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,8173=>602,
-8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,8186=>602,
-8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,8197=>602,
-8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,8215=>602,
-8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,8246=>602,
-8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,8287=>602,
-8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,8315=>602,
-8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,8325=>602,
-8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,8336=>602,
-8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,8357=>602,
-8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,8368=>602,
-8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,8463=>602,
-8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,8491=>602,
-8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,8539=>602,
-8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,8597=>602,
-8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,8607=>602,
-8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,8617=>602,
-8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,8627=>602,
-8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,8637=>602,
-8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,8647=>602,
-8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,8657=>602,
-8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,8667=>602,
-8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,8677=>602,
-8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,8687=>602,
-8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,8697=>602,
-8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,8707=>602,
-8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,8717=>602,
-8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,8731=>602,
-8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,8747=>602,
-8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,8770=>602,
-8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,8780=>602,
-8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,8790=>602,
-8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,8800=>602,
-8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,8813=>602,
-8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,8823=>602,
-8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,8833=>602,
-8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,8843=>602,
-8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,8858=>602,
-8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,8909=>602,
-8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,8931=>602,
-8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,8962=>602,
-8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,8973=>602,
-8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,8985=>602,
-8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,9000=>602,
-9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,9022=>602,
-9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,9037=>602,
-9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,9052=>602,
-9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,9068=>602,
-9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,9080=>602,
-9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,9098=>602,
-9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,9122=>602,
-9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,9132=>602,
-9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,9600=>602,9601=>602,9602=>602,9603=>602,9604=>602,
-9605=>602,9606=>602,9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,9614=>602,
-9615=>602,9616=>602,9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,9624=>602,
-9625=>602,9626=>602,9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,9634=>602,
-9635=>602,9636=>602,9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,9644=>602,
-9645=>602,9646=>602,9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,9654=>602,
-9655=>602,9656=>602,9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,9664=>602,
-9665=>602,9666=>602,9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,9674=>602,
-9675=>602,9676=>602,9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,9684=>602,
-9685=>602,9686=>602,9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,9694=>602,
-9695=>602,9696=>602,9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,9704=>602,
-9705=>602,9706=>602,9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,9714=>602,
-9715=>602,9716=>602,9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,9724=>602,
-9725=>602,9726=>602,9727=>602,9728=>602,9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9791=>602,
-9792=>602,9793=>602,9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9824=>602,9825=>602,
-9826=>602,9827=>602,9828=>602,9829=>602,9830=>602,9831=>602,9833=>602,9834=>602,9835=>602,9836=>602,
-9837=>602,9838=>602,9839=>602,10181=>602,10182=>602,10208=>602,10216=>602,10217=>602,10731=>602,10746=>602,
-10747=>602,10799=>602,11026=>602,11027=>602,11028=>602,11029=>602,11030=>602,11031=>602,11032=>602,11033=>602,
-11034=>602,11364=>602,11374=>602,11375=>602,11381=>602,11382=>602,11383=>602,11385=>602,11386=>602,11388=>602,
-11389=>602,11800=>602,11810=>602,11811=>602,11812=>602,11813=>602,11822=>602,42760=>602,42761=>602,42762=>602,
-42763=>602,42764=>602,42765=>602,42766=>602,42767=>602,42768=>602,42769=>602,42770=>602,42771=>602,42772=>602,
-42773=>602,42774=>602,42779=>602,42780=>602,42781=>602,42782=>602,42783=>602,42790=>602,42791=>602,42889=>602,
-42890=>602,42891=>602,42892=>602,63173=>602,64257=>602,64258=>602,65529=>602,65530=>602,65531=>602,65532=>602,
-65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmonobi.z';
-$ctg='dejavusansmonobi.ctg.z';
-$originalsize=223408;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonoi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonoi.php
deleted file mode 100644
index 68cf9234169..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavusansmonoi.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSansMono-Oblique';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-62,'Flags'=>97,'FontBBox'=>'[-406 -375 746 1028]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>602);
-$up=-63;
-$ut=44;
-$dw=602;
-$cw=array(
-0=>602,32=>602,33=>602,34=>602,35=>602,36=>602,37=>602,38=>602,39=>602,40=>602,
-41=>602,42=>602,43=>602,44=>602,45=>602,46=>602,47=>602,48=>602,49=>602,50=>602,
-51=>602,52=>602,53=>602,54=>602,55=>602,56=>602,57=>602,58=>602,59=>602,60=>602,
-61=>602,62=>602,63=>602,64=>602,65=>602,66=>602,67=>602,68=>602,69=>602,70=>602,
-71=>602,72=>602,73=>602,74=>602,75=>602,76=>602,77=>602,78=>602,79=>602,80=>602,
-81=>602,82=>602,83=>602,84=>602,85=>602,86=>602,87=>602,88=>602,89=>602,90=>602,
-91=>602,92=>602,93=>602,94=>602,95=>602,96=>602,97=>602,98=>602,99=>602,100=>602,
-101=>602,102=>602,103=>602,104=>602,105=>602,106=>602,107=>602,108=>602,109=>602,110=>602,
-111=>602,112=>602,113=>602,114=>602,115=>602,116=>602,117=>602,118=>602,119=>602,120=>602,
-121=>602,122=>602,123=>602,124=>602,125=>602,126=>602,8364=>602,8218=>602,402=>602,8222=>602,
-8230=>602,8224=>602,8225=>602,710=>602,8240=>602,352=>602,8249=>602,338=>602,381=>602,8216=>602,
-8217=>602,8220=>602,8221=>602,8226=>602,8211=>602,8212=>602,732=>602,8482=>602,353=>602,8250=>602,
-339=>602,382=>602,376=>602,160=>602,161=>602,162=>602,163=>602,164=>602,165=>602,166=>602,
-167=>602,168=>602,169=>602,170=>602,171=>602,172=>602,173=>602,174=>602,175=>602,176=>602,
-177=>602,178=>602,179=>602,180=>602,181=>602,182=>602,183=>602,184=>602,185=>602,186=>602,
-187=>602,188=>602,189=>602,190=>602,191=>602,192=>602,193=>602,194=>602,195=>602,196=>602,
-197=>602,198=>602,199=>602,200=>602,201=>602,202=>602,203=>602,204=>602,205=>602,206=>602,
-207=>602,208=>602,209=>602,210=>602,211=>602,212=>602,213=>602,214=>602,215=>602,216=>602,
-217=>602,218=>602,219=>602,220=>602,221=>602,222=>602,223=>602,224=>602,225=>602,226=>602,
-227=>602,228=>602,229=>602,230=>602,231=>602,232=>602,233=>602,234=>602,235=>602,236=>602,
-237=>602,238=>602,239=>602,240=>602,241=>602,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>602,248=>602,249=>602,250=>602,251=>602,252=>602,253=>602,254=>602,255=>602,256=>602,
-257=>602,258=>602,259=>602,260=>602,261=>602,262=>602,263=>602,264=>602,265=>602,266=>602,
-267=>602,268=>602,269=>602,270=>602,271=>602,272=>602,273=>602,274=>602,275=>602,276=>602,
-277=>602,278=>602,279=>602,280=>602,281=>602,282=>602,283=>602,284=>602,285=>602,286=>602,
-287=>602,288=>602,289=>602,290=>602,291=>602,292=>602,293=>602,294=>602,295=>602,296=>602,
-297=>602,298=>602,299=>602,300=>602,301=>602,302=>602,303=>602,304=>602,305=>602,306=>602,
-307=>602,308=>602,309=>602,310=>602,311=>602,312=>602,313=>602,314=>602,315=>602,316=>602,
-317=>602,318=>602,319=>602,320=>602,321=>602,322=>602,323=>602,324=>602,325=>602,326=>602,
-327=>602,328=>602,329=>602,330=>602,331=>602,332=>602,333=>602,334=>602,335=>602,336=>602,
-337=>602,340=>602,341=>602,342=>602,343=>602,344=>602,345=>602,346=>602,347=>602,348=>602,
-349=>602,350=>602,351=>602,354=>602,355=>602,356=>602,357=>602,358=>602,359=>602,360=>602,
-361=>602,362=>602,363=>602,364=>602,365=>602,366=>602,367=>602,368=>602,369=>602,370=>602,
-371=>602,372=>602,373=>602,374=>602,375=>602,377=>602,378=>602,379=>602,380=>602,383=>602,
-384=>602,385=>602,386=>602,387=>602,388=>602,389=>602,390=>602,391=>602,392=>602,393=>602,
-394=>602,395=>602,396=>602,397=>602,398=>602,399=>602,400=>602,401=>602,403=>602,404=>602,
-405=>602,406=>602,407=>602,408=>602,409=>602,410=>602,411=>602,412=>602,413=>602,414=>602,
-415=>602,416=>602,417=>602,418=>602,419=>602,420=>602,421=>602,422=>602,423=>602,424=>602,
-425=>602,426=>602,427=>602,428=>602,429=>602,430=>602,431=>602,432=>602,433=>602,434=>602,
-435=>602,436=>602,437=>602,438=>602,439=>602,440=>602,441=>602,442=>602,443=>602,444=>602,
-445=>602,446=>602,447=>602,448=>602,449=>602,450=>602,451=>602,461=>602,462=>602,463=>602,
-464=>602,465=>602,466=>602,467=>602,468=>602,469=>602,470=>602,471=>602,472=>602,473=>602,
-474=>602,475=>602,476=>602,477=>602,479=>602,480=>602,481=>602,482=>602,483=>602,486=>602,
-487=>602,488=>602,489=>602,490=>602,491=>602,492=>602,493=>602,494=>602,495=>602,500=>602,
-501=>602,502=>602,504=>602,505=>602,508=>602,509=>602,510=>602,511=>602,512=>602,513=>602,
-514=>602,515=>602,516=>602,517=>602,518=>602,519=>602,520=>602,521=>602,522=>602,523=>602,
-524=>602,525=>602,526=>602,527=>602,528=>602,529=>602,530=>602,531=>602,532=>602,533=>602,
-534=>602,535=>602,536=>602,537=>602,538=>602,539=>602,540=>602,541=>602,542=>602,543=>602,
-545=>602,548=>602,549=>602,550=>602,551=>602,552=>602,553=>602,554=>602,555=>602,556=>602,
-557=>602,558=>602,559=>602,560=>602,561=>602,562=>602,563=>602,564=>602,565=>602,566=>602,
-567=>602,568=>602,569=>602,570=>602,571=>602,572=>602,573=>602,574=>602,575=>602,576=>602,
-577=>602,580=>602,581=>602,588=>602,589=>602,592=>602,593=>602,594=>602,595=>602,596=>602,
-597=>602,598=>602,599=>602,600=>602,601=>602,602=>602,603=>602,604=>602,605=>602,606=>602,
-607=>602,608=>602,609=>602,610=>602,611=>602,612=>602,613=>602,614=>602,615=>602,616=>602,
-617=>602,618=>602,619=>602,620=>602,621=>602,622=>602,623=>602,624=>602,625=>602,626=>602,
-627=>602,628=>602,629=>602,630=>602,631=>602,632=>602,633=>602,634=>602,635=>602,636=>602,
-637=>602,638=>602,639=>602,640=>602,641=>602,642=>602,643=>602,644=>602,645=>602,646=>602,
-647=>602,648=>602,649=>602,650=>602,651=>602,652=>602,653=>602,654=>602,655=>602,656=>602,
-657=>602,658=>602,659=>602,660=>602,661=>602,662=>602,663=>602,664=>602,665=>602,666=>602,
-667=>602,668=>602,669=>602,670=>602,671=>602,672=>602,673=>602,674=>602,675=>602,676=>602,
-677=>602,678=>602,679=>602,680=>602,681=>602,682=>602,683=>602,684=>602,685=>602,686=>602,
-687=>602,688=>602,689=>602,690=>602,691=>602,692=>602,693=>602,694=>602,695=>602,696=>602,
-697=>602,699=>602,700=>602,701=>602,702=>602,703=>602,704=>602,705=>602,711=>602,712=>602,
-713=>602,716=>602,717=>602,720=>602,721=>602,722=>602,723=>602,726=>602,727=>602,728=>602,
-729=>602,730=>602,731=>602,733=>602,734=>602,736=>602,737=>602,738=>602,739=>602,740=>602,
-741=>602,742=>602,743=>602,744=>602,745=>602,750=>602,755=>602,768=>602,769=>602,770=>602,
-771=>602,772=>602,773=>602,774=>602,775=>602,776=>602,777=>602,778=>602,779=>602,780=>602,
-781=>602,782=>602,783=>602,784=>602,785=>602,786=>602,787=>602,788=>602,789=>602,790=>602,
-791=>602,792=>602,793=>602,794=>602,795=>602,796=>602,797=>602,798=>602,799=>602,800=>602,
-801=>602,802=>602,803=>602,804=>602,805=>602,806=>602,807=>602,808=>602,809=>602,810=>602,
-811=>602,812=>602,813=>602,814=>602,815=>602,816=>602,817=>602,818=>602,819=>602,820=>602,
-821=>602,822=>602,823=>602,824=>602,825=>602,826=>602,827=>602,828=>602,829=>602,830=>602,
-831=>602,835=>602,856=>602,865=>602,884=>602,885=>602,890=>602,894=>602,900=>602,901=>602,
-902=>602,903=>602,904=>602,905=>602,906=>602,908=>602,910=>602,911=>602,912=>602,913=>602,
-914=>602,915=>602,916=>602,917=>602,918=>602,919=>602,920=>602,921=>602,922=>602,923=>602,
-924=>602,925=>602,926=>602,927=>602,928=>602,929=>602,931=>602,932=>602,933=>602,934=>602,
-935=>602,936=>602,937=>602,938=>602,939=>602,940=>602,941=>602,942=>602,943=>602,944=>602,
-945=>602,946=>602,947=>602,948=>602,949=>602,950=>602,951=>602,952=>602,953=>602,954=>602,
-955=>602,956=>602,957=>602,958=>602,959=>602,960=>602,961=>602,962=>602,963=>602,964=>602,
-965=>602,966=>602,967=>602,968=>602,969=>602,970=>602,971=>602,972=>602,973=>602,974=>602,
-976=>602,977=>602,978=>602,979=>602,980=>602,981=>602,982=>602,983=>602,984=>602,985=>602,
-986=>602,987=>602,988=>602,989=>602,990=>602,991=>602,992=>602,993=>602,1008=>602,1009=>602,
-1010=>602,1011=>602,1012=>602,1013=>602,1014=>602,1015=>602,1016=>602,1017=>602,1018=>602,1019=>602,
-1020=>602,1021=>602,1022=>602,1023=>602,1024=>602,1025=>602,1026=>602,1027=>602,1028=>602,1029=>602,
-1030=>602,1031=>602,1032=>602,1033=>602,1034=>602,1035=>602,1036=>602,1037=>602,1038=>602,1039=>602,
-1040=>602,1041=>602,1042=>602,1043=>602,1044=>602,1045=>602,1046=>602,1047=>602,1048=>602,1049=>602,
-1050=>602,1051=>602,1052=>602,1053=>602,1054=>602,1055=>602,1056=>602,1057=>602,1058=>602,1059=>602,
-1060=>602,1061=>602,1062=>602,1063=>602,1064=>602,1065=>602,1066=>602,1067=>602,1068=>602,1069=>602,
-1070=>602,1071=>602,1072=>602,1073=>602,1074=>602,1075=>602,1076=>602,1077=>602,1078=>602,1079=>602,
-1080=>602,1081=>602,1082=>602,1083=>602,1084=>602,1085=>602,1086=>602,1087=>602,1088=>602,1089=>602,
-1090=>602,1091=>602,1092=>602,1093=>602,1094=>602,1095=>602,1096=>602,1097=>602,1098=>602,1099=>602,
-1100=>602,1101=>602,1102=>602,1103=>602,1104=>602,1105=>602,1106=>602,1107=>602,1108=>602,1109=>602,
-1110=>602,1111=>602,1112=>602,1113=>602,1114=>602,1115=>602,1116=>602,1117=>602,1118=>602,1119=>602,
-1122=>602,1123=>602,1138=>602,1139=>602,1168=>602,1169=>602,1170=>602,1171=>602,1172=>602,1173=>602,
-1174=>602,1175=>602,1176=>602,1177=>602,1178=>602,1179=>602,1186=>602,1187=>602,1194=>602,1195=>602,
-1196=>602,1197=>602,1198=>602,1199=>602,1200=>602,1201=>602,1202=>602,1203=>602,1210=>602,1211=>602,
-1216=>602,1217=>602,1218=>602,1219=>602,1220=>602,1223=>602,1224=>602,1227=>602,1228=>602,1231=>602,
-1232=>602,1233=>602,1234=>602,1235=>602,1236=>602,1237=>602,1238=>602,1239=>602,1240=>602,1241=>602,
-1242=>602,1243=>602,1244=>602,1245=>602,1246=>602,1247=>602,1248=>602,1249=>602,1250=>602,1251=>602,
-1252=>602,1253=>602,1254=>602,1255=>602,1256=>602,1257=>602,1258=>602,1259=>602,1260=>602,1261=>602,
-1262=>602,1263=>602,1264=>602,1265=>602,1266=>602,1267=>602,1268=>602,1269=>602,1270=>602,1271=>602,
-1272=>602,1273=>602,1296=>602,1297=>602,1306=>602,1307=>602,1308=>602,1309=>602,3713=>602,3714=>602,
-3716=>602,3719=>602,3720=>602,3722=>602,3725=>602,3732=>602,3733=>602,3734=>602,3735=>602,3737=>602,
-3738=>602,3739=>602,3740=>602,3741=>602,3742=>602,3743=>602,3745=>602,3746=>602,3747=>602,3749=>602,
-3751=>602,3754=>602,3755=>602,3757=>602,3758=>602,3759=>602,3760=>602,3761=>602,3762=>602,3763=>602,
-3764=>602,3765=>602,3766=>602,3767=>602,3768=>602,3769=>602,3771=>602,3772=>602,3784=>602,3785=>602,
-3786=>602,3787=>602,3788=>602,3789=>602,4304=>602,4305=>602,4306=>602,4307=>602,4308=>602,4309=>602,
-4310=>602,4311=>602,4312=>602,4313=>602,4314=>602,4315=>602,4316=>602,4317=>602,4318=>602,4319=>602,
-4320=>602,4321=>602,4322=>602,4323=>602,4324=>602,4325=>602,4326=>602,4327=>602,4328=>602,4329=>602,
-4330=>602,4331=>602,4332=>602,4333=>602,4334=>602,4335=>602,4336=>602,4337=>602,4338=>602,4339=>602,
-4340=>602,4341=>602,4342=>602,4343=>602,4344=>602,4345=>602,4346=>602,4347=>602,4348=>602,7426=>602,
-7432=>602,7433=>602,7444=>602,7446=>602,7447=>602,7453=>602,7454=>602,7455=>602,7468=>602,7469=>602,
-7470=>602,7472=>602,7473=>602,7474=>602,7475=>602,7476=>602,7477=>602,7478=>602,7479=>602,7480=>602,
-7481=>602,7482=>602,7483=>602,7484=>602,7485=>602,7486=>602,7487=>602,7488=>602,7489=>602,7490=>602,
-7491=>602,7492=>602,7493=>602,7494=>602,7495=>602,7496=>602,7497=>602,7498=>602,7499=>602,7500=>602,
-7501=>602,7502=>602,7503=>602,7504=>602,7505=>602,7506=>602,7507=>602,7508=>602,7509=>602,7510=>602,
-7511=>602,7512=>602,7513=>602,7514=>602,7515=>602,7522=>602,7523=>602,7524=>602,7525=>602,7543=>602,
-7544=>602,7547=>602,7557=>602,7579=>602,7580=>602,7581=>602,7582=>602,7583=>602,7584=>602,7585=>602,
-7586=>602,7587=>602,7588=>602,7589=>602,7590=>602,7591=>602,7592=>602,7593=>602,7594=>602,7595=>602,
-7596=>602,7597=>602,7598=>602,7599=>602,7600=>602,7601=>602,7602=>602,7603=>602,7604=>602,7605=>602,
-7606=>602,7607=>602,7609=>602,7610=>602,7611=>602,7612=>602,7613=>602,7614=>602,7615=>602,7680=>602,
-7681=>602,7682=>602,7683=>602,7684=>602,7685=>602,7686=>602,7687=>602,7688=>602,7689=>602,7690=>602,
-7691=>602,7692=>602,7693=>602,7694=>602,7695=>602,7696=>602,7697=>602,7698=>602,7699=>602,7704=>602,
-7705=>602,7706=>602,7707=>602,7708=>602,7709=>602,7710=>602,7711=>602,7712=>602,7713=>602,7714=>602,
-7715=>602,7716=>602,7717=>602,7718=>602,7719=>602,7720=>602,7721=>602,7722=>602,7723=>602,7724=>602,
-7725=>602,7728=>602,7729=>602,7730=>602,7731=>602,7732=>602,7733=>602,7734=>602,7735=>602,7736=>602,
-7737=>602,7738=>602,7739=>602,7740=>602,7741=>602,7742=>602,7743=>602,7744=>602,7745=>602,7746=>602,
-7747=>602,7748=>602,7749=>602,7750=>602,7751=>602,7752=>602,7753=>602,7754=>602,7755=>602,7756=>602,
-7757=>602,7764=>602,7765=>602,7766=>602,7767=>602,7768=>602,7769=>602,7770=>602,7771=>602,7772=>602,
-7773=>602,7774=>602,7775=>602,7776=>602,7777=>602,7778=>602,7779=>602,7784=>602,7785=>602,7786=>602,
-7787=>602,7788=>602,7789=>602,7790=>602,7791=>602,7792=>602,7793=>602,7794=>602,7795=>602,7796=>602,
-7797=>602,7798=>602,7799=>602,7800=>602,7801=>602,7804=>602,7805=>602,7806=>602,7807=>602,7808=>602,
-7809=>602,7810=>602,7811=>602,7812=>602,7813=>602,7814=>602,7815=>602,7816=>602,7817=>602,7818=>602,
-7819=>602,7820=>602,7821=>602,7822=>602,7823=>602,7824=>602,7825=>602,7826=>602,7827=>602,7828=>602,
-7829=>602,7830=>602,7831=>602,7832=>602,7833=>602,7835=>602,7839=>602,7840=>602,7841=>602,7852=>602,
-7853=>602,7856=>602,7857=>602,7862=>602,7863=>602,7864=>602,7865=>602,7868=>602,7869=>602,7878=>602,
-7879=>602,7882=>602,7883=>602,7884=>602,7885=>602,7896=>602,7897=>602,7898=>602,7899=>602,7900=>602,
-7901=>602,7904=>602,7905=>602,7906=>602,7907=>602,7908=>602,7909=>602,7912=>602,7913=>602,7914=>602,
-7915=>602,7918=>602,7919=>602,7920=>602,7921=>602,7922=>602,7923=>602,7924=>602,7925=>602,7928=>602,
-7929=>602,7936=>602,7937=>602,7938=>602,7939=>602,7940=>602,7941=>602,7942=>602,7943=>602,7944=>602,
-7945=>602,7946=>602,7947=>602,7948=>602,7949=>602,7950=>602,7951=>602,7952=>602,7953=>602,7954=>602,
-7955=>602,7956=>602,7957=>602,7960=>602,7961=>602,7962=>602,7963=>602,7964=>602,7965=>602,7968=>602,
-7969=>602,7970=>602,7971=>602,7972=>602,7973=>602,7974=>602,7975=>602,7976=>602,7977=>602,7978=>602,
-7979=>602,7980=>602,7981=>602,7982=>602,7983=>602,7984=>602,7985=>602,7986=>602,7987=>602,7988=>602,
-7989=>602,7990=>602,7991=>602,7992=>602,7993=>602,7994=>602,7995=>602,7996=>602,7997=>602,7998=>602,
-7999=>602,8000=>602,8001=>602,8002=>602,8003=>602,8004=>602,8005=>602,8008=>602,8009=>602,8010=>602,
-8011=>602,8012=>602,8013=>602,8016=>602,8017=>602,8018=>602,8019=>602,8020=>602,8021=>602,8022=>602,
-8023=>602,8025=>602,8027=>602,8029=>602,8031=>602,8032=>602,8033=>602,8034=>602,8035=>602,8036=>602,
-8037=>602,8038=>602,8039=>602,8040=>602,8041=>602,8042=>602,8043=>602,8044=>602,8045=>602,8046=>602,
-8047=>602,8048=>602,8049=>602,8050=>602,8051=>602,8052=>602,8053=>602,8054=>602,8055=>602,8056=>602,
-8057=>602,8058=>602,8059=>602,8060=>602,8061=>602,8064=>602,8065=>602,8066=>602,8067=>602,8068=>602,
-8069=>602,8070=>602,8071=>602,8072=>602,8073=>602,8074=>602,8075=>602,8076=>602,8077=>602,8078=>602,
-8079=>602,8080=>602,8081=>602,8082=>602,8083=>602,8084=>602,8085=>602,8086=>602,8087=>602,8088=>602,
-8089=>602,8090=>602,8091=>602,8092=>602,8093=>602,8094=>602,8095=>602,8096=>602,8097=>602,8098=>602,
-8099=>602,8100=>602,8101=>602,8102=>602,8103=>602,8104=>602,8105=>602,8106=>602,8107=>602,8108=>602,
-8109=>602,8110=>602,8111=>602,8112=>602,8113=>602,8114=>602,8115=>602,8116=>602,8118=>602,8119=>602,
-8120=>602,8121=>602,8122=>602,8123=>602,8124=>602,8125=>602,8126=>602,8127=>602,8128=>602,8129=>602,
-8130=>602,8131=>602,8132=>602,8134=>602,8135=>602,8136=>602,8137=>602,8138=>602,8139=>602,8140=>602,
-8141=>602,8142=>602,8143=>602,8144=>602,8145=>602,8146=>602,8147=>602,8150=>602,8151=>602,8152=>602,
-8153=>602,8154=>602,8155=>602,8157=>602,8158=>602,8159=>602,8160=>602,8161=>602,8162=>602,8163=>602,
-8164=>602,8165=>602,8166=>602,8167=>602,8168=>602,8169=>602,8170=>602,8171=>602,8172=>602,8173=>602,
-8174=>602,8175=>602,8178=>602,8179=>602,8180=>602,8182=>602,8183=>602,8184=>602,8185=>602,8186=>602,
-8187=>602,8188=>602,8189=>602,8190=>602,8192=>602,8193=>602,8194=>602,8195=>602,8196=>602,8197=>602,
-8198=>602,8199=>602,8200=>602,8201=>602,8202=>602,8208=>602,8209=>602,8210=>602,8213=>602,8215=>602,
-8219=>602,8223=>602,8227=>602,8239=>602,8241=>602,8242=>602,8243=>602,8244=>602,8245=>602,8246=>602,
-8247=>602,8252=>602,8253=>602,8254=>602,8261=>602,8262=>602,8263=>602,8264=>602,8265=>602,8287=>602,
-8304=>602,8305=>602,8308=>602,8309=>602,8310=>602,8311=>602,8312=>602,8313=>602,8314=>602,8315=>602,
-8316=>602,8317=>602,8318=>602,8319=>602,8320=>602,8321=>602,8322=>602,8323=>602,8324=>602,8325=>602,
-8326=>602,8327=>602,8328=>602,8329=>602,8330=>602,8331=>602,8332=>602,8333=>602,8334=>602,8336=>602,
-8337=>602,8338=>602,8339=>602,8340=>602,8352=>602,8353=>602,8354=>602,8355=>602,8356=>602,8357=>602,
-8358=>602,8359=>602,8360=>602,8361=>602,8362=>602,8363=>602,8365=>602,8366=>602,8367=>602,8368=>602,
-8369=>602,8370=>602,8371=>602,8372=>602,8373=>602,8450=>602,8453=>602,8461=>602,8462=>602,8463=>602,
-8469=>602,8470=>602,8471=>602,8473=>602,8474=>602,8477=>602,8484=>602,8486=>602,8490=>602,8491=>602,
-8494=>602,8531=>602,8532=>602,8533=>602,8534=>602,8535=>602,8536=>602,8537=>602,8538=>602,8539=>602,
-8540=>602,8541=>602,8542=>602,8543=>602,8592=>602,8593=>602,8594=>602,8595=>602,8596=>602,8597=>602,
-8598=>602,8599=>602,8600=>602,8601=>602,8602=>602,8603=>602,8604=>602,8605=>602,8606=>602,8607=>602,
-8608=>602,8609=>602,8610=>602,8611=>602,8612=>602,8613=>602,8614=>602,8615=>602,8616=>602,8617=>602,
-8618=>602,8619=>602,8620=>602,8621=>602,8622=>602,8623=>602,8624=>602,8625=>602,8626=>602,8627=>602,
-8628=>602,8629=>602,8630=>602,8631=>602,8632=>602,8633=>602,8634=>602,8635=>602,8636=>602,8637=>602,
-8638=>602,8639=>602,8640=>602,8641=>602,8642=>602,8643=>602,8644=>602,8645=>602,8646=>602,8647=>602,
-8648=>602,8649=>602,8650=>602,8651=>602,8652=>602,8653=>602,8654=>602,8655=>602,8656=>602,8657=>602,
-8658=>602,8659=>602,8660=>602,8661=>602,8662=>602,8663=>602,8664=>602,8665=>602,8666=>602,8667=>602,
-8668=>602,8669=>602,8670=>602,8671=>602,8672=>602,8673=>602,8674=>602,8675=>602,8676=>602,8677=>602,
-8678=>602,8679=>602,8680=>602,8681=>602,8682=>602,8683=>602,8684=>602,8685=>602,8686=>602,8687=>602,
-8688=>602,8689=>602,8690=>602,8691=>602,8692=>602,8693=>602,8694=>602,8695=>602,8696=>602,8697=>602,
-8698=>602,8699=>602,8700=>602,8701=>602,8702=>602,8703=>602,8704=>602,8705=>602,8706=>602,8707=>602,
-8708=>602,8709=>602,8710=>602,8711=>602,8712=>602,8713=>602,8714=>602,8715=>602,8716=>602,8717=>602,
-8719=>602,8721=>602,8722=>602,8723=>602,8725=>602,8727=>602,8728=>602,8729=>602,8730=>602,8731=>602,
-8732=>602,8733=>602,8734=>602,8735=>602,8736=>602,8743=>602,8744=>602,8745=>602,8746=>602,8747=>602,
-8748=>602,8749=>602,8760=>602,8761=>602,8762=>602,8763=>602,8764=>602,8765=>602,8769=>602,8770=>602,
-8771=>602,8772=>602,8773=>602,8774=>602,8775=>602,8776=>602,8777=>602,8778=>602,8779=>602,8780=>602,
-8781=>602,8782=>602,8783=>602,8784=>602,8785=>602,8786=>602,8787=>602,8788=>602,8789=>602,8790=>602,
-8791=>602,8792=>602,8793=>602,8794=>602,8795=>602,8796=>602,8797=>602,8798=>602,8799=>602,8800=>602,
-8801=>602,8802=>602,8803=>602,8804=>602,8805=>602,8806=>602,8807=>602,8808=>602,8809=>602,8813=>602,
-8814=>602,8815=>602,8816=>602,8817=>602,8818=>602,8819=>602,8820=>602,8821=>602,8822=>602,8823=>602,
-8824=>602,8825=>602,8826=>602,8827=>602,8828=>602,8829=>602,8830=>602,8831=>602,8832=>602,8833=>602,
-8834=>602,8835=>602,8836=>602,8837=>602,8838=>602,8839=>602,8840=>602,8841=>602,8842=>602,8843=>602,
-8847=>602,8848=>602,8849=>602,8850=>602,8853=>602,8854=>602,8855=>602,8856=>602,8857=>602,8858=>602,
-8859=>602,8860=>602,8861=>602,8862=>602,8863=>602,8864=>602,8865=>602,8901=>602,8902=>602,8909=>602,
-8922=>602,8923=>602,8924=>602,8925=>602,8926=>602,8927=>602,8928=>602,8929=>602,8930=>602,8931=>602,
-8932=>602,8933=>602,8934=>602,8935=>602,8936=>602,8937=>602,8943=>602,8960=>602,8961=>602,8962=>602,
-8963=>602,8964=>602,8965=>602,8966=>602,8968=>602,8969=>602,8970=>602,8971=>602,8972=>602,8973=>602,
-8974=>602,8975=>602,8976=>602,8977=>602,8978=>602,8979=>602,8980=>602,8981=>602,8984=>602,8985=>602,
-8988=>602,8989=>602,8990=>602,8991=>602,8992=>602,8993=>602,8997=>602,8998=>602,8999=>602,9000=>602,
-9003=>602,9013=>602,9015=>602,9016=>602,9017=>602,9018=>602,9019=>602,9020=>602,9021=>602,9022=>602,
-9025=>602,9026=>602,9027=>602,9028=>602,9031=>602,9032=>602,9033=>602,9035=>602,9036=>602,9037=>602,
-9040=>602,9042=>602,9043=>602,9044=>602,9047=>602,9048=>602,9049=>602,9050=>602,9051=>602,9052=>602,
-9054=>602,9055=>602,9056=>602,9059=>602,9060=>602,9061=>602,9064=>602,9065=>602,9067=>602,9068=>602,
-9069=>602,9070=>602,9071=>602,9072=>602,9075=>602,9076=>602,9077=>602,9078=>602,9079=>602,9080=>602,
-9081=>602,9082=>602,9085=>602,9088=>602,9089=>602,9090=>602,9091=>602,9096=>602,9097=>602,9098=>602,
-9099=>602,9109=>602,9115=>602,9116=>602,9117=>602,9118=>602,9119=>602,9120=>602,9121=>602,9122=>602,
-9123=>602,9124=>602,9125=>602,9126=>602,9127=>602,9128=>602,9129=>602,9130=>602,9131=>602,9132=>602,
-9133=>602,9134=>602,9166=>602,9167=>602,9251=>602,9472=>602,9473=>602,9474=>602,9475=>602,9476=>602,
-9477=>602,9478=>602,9479=>602,9480=>602,9481=>602,9482=>602,9483=>602,9484=>602,9485=>602,9486=>602,
-9487=>602,9488=>602,9489=>602,9490=>602,9491=>602,9492=>602,9493=>602,9494=>602,9495=>602,9496=>602,
-9497=>602,9498=>602,9499=>602,9500=>602,9501=>602,9502=>602,9503=>602,9504=>602,9505=>602,9506=>602,
-9507=>602,9508=>602,9509=>602,9510=>602,9511=>602,9512=>602,9513=>602,9514=>602,9515=>602,9516=>602,
-9517=>602,9518=>602,9519=>602,9520=>602,9521=>602,9522=>602,9523=>602,9524=>602,9525=>602,9526=>602,
-9527=>602,9528=>602,9529=>602,9530=>602,9531=>602,9532=>602,9533=>602,9534=>602,9535=>602,9536=>602,
-9537=>602,9538=>602,9539=>602,9540=>602,9541=>602,9542=>602,9543=>602,9544=>602,9545=>602,9546=>602,
-9547=>602,9548=>602,9549=>602,9550=>602,9551=>602,9552=>602,9553=>602,9554=>602,9555=>602,9556=>602,
-9557=>602,9558=>602,9559=>602,9560=>602,9561=>602,9562=>602,9563=>602,9564=>602,9565=>602,9566=>602,
-9567=>602,9568=>602,9569=>602,9570=>602,9571=>602,9572=>602,9573=>602,9574=>602,9575=>602,9576=>602,
-9577=>602,9578=>602,9579=>602,9580=>602,9581=>602,9582=>602,9583=>602,9584=>602,9585=>602,9586=>602,
-9587=>602,9588=>602,9589=>602,9590=>602,9591=>602,9592=>602,9593=>602,9594=>602,9595=>602,9596=>602,
-9597=>602,9598=>602,9599=>602,9600=>602,9601=>602,9602=>602,9603=>602,9604=>602,9605=>602,9606=>602,
-9607=>602,9608=>602,9609=>602,9610=>602,9611=>602,9612=>602,9613=>602,9614=>602,9615=>602,9616=>602,
-9617=>602,9618=>602,9619=>602,9620=>602,9621=>602,9622=>602,9623=>602,9624=>602,9625=>602,9626=>602,
-9627=>602,9628=>602,9629=>602,9630=>602,9631=>602,9632=>602,9633=>602,9634=>602,9635=>602,9636=>602,
-9637=>602,9638=>602,9639=>602,9640=>602,9641=>602,9642=>602,9643=>602,9644=>602,9645=>602,9646=>602,
-9647=>602,9648=>602,9649=>602,9650=>602,9651=>602,9652=>602,9653=>602,9654=>602,9655=>602,9656=>602,
-9657=>602,9658=>602,9659=>602,9660=>602,9661=>602,9662=>602,9663=>602,9664=>602,9665=>602,9666=>602,
-9667=>602,9668=>602,9669=>602,9670=>602,9671=>602,9672=>602,9673=>602,9674=>602,9675=>602,9676=>602,
-9677=>602,9678=>602,9679=>602,9680=>602,9681=>602,9682=>602,9683=>602,9684=>602,9685=>602,9686=>602,
-9687=>602,9688=>602,9689=>602,9690=>602,9691=>602,9692=>602,9693=>602,9694=>602,9695=>602,9696=>602,
-9697=>602,9698=>602,9699=>602,9700=>602,9701=>602,9702=>602,9703=>602,9704=>602,9705=>602,9706=>602,
-9707=>602,9708=>602,9709=>602,9710=>602,9711=>602,9712=>602,9713=>602,9714=>602,9715=>602,9716=>602,
-9717=>602,9718=>602,9719=>602,9720=>602,9721=>602,9722=>602,9723=>602,9724=>602,9725=>602,9726=>602,
-9727=>602,9728=>602,9784=>602,9785=>602,9786=>602,9787=>602,9788=>602,9791=>602,9792=>602,9793=>602,
-9794=>602,9795=>602,9796=>602,9797=>602,9798=>602,9799=>602,9824=>602,9825=>602,9826=>602,9827=>602,
-9828=>602,9829=>602,9830=>602,9831=>602,9833=>602,9834=>602,9835=>602,9836=>602,9837=>602,9838=>602,
-9839=>602,10181=>602,10182=>602,10208=>602,10216=>602,10217=>602,10731=>602,10746=>602,10747=>602,10799=>602,
-11026=>602,11027=>602,11028=>602,11029=>602,11030=>602,11031=>602,11032=>602,11033=>602,11034=>602,11364=>602,
-11374=>602,11375=>602,11381=>602,11382=>602,11383=>602,11385=>602,11386=>602,11388=>602,11389=>602,11800=>602,
-11810=>602,11811=>602,11812=>602,11813=>602,11822=>602,42760=>602,42761=>602,42762=>602,42763=>602,42764=>602,
-42765=>602,42766=>602,42767=>602,42768=>602,42769=>602,42770=>602,42771=>602,42772=>602,42773=>602,42774=>602,
-42779=>602,42780=>602,42781=>602,42782=>602,42783=>602,42790=>602,42791=>602,42889=>602,42890=>602,42891=>602,
-42892=>602,63173=>602,64257=>602,64258=>602,65529=>602,65530=>602,65531=>602,65532=>602,65533=>602);
-$enc='';
-$diff='';
-$file='dejavusansmonoi.z';
-$ctg='dejavusansmonoi.ctg.z';
-$originalsize=229284;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserif.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserif.php
deleted file mode 100644
index 058684d0f51..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserif.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>6,'Flags'=>32,'FontBBox'=>'[-770 -347 1679 1242]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>318,33=>402,34=>460,35=>838,36=>636,37=>950,38=>890,39=>275,40=>390,
-41=>390,42=>500,43=>838,44=>318,45=>338,46=>318,47=>337,48=>636,49=>636,50=>636,
-51=>636,52=>636,53=>636,54=>636,55=>636,56=>636,57=>636,58=>337,59=>337,60=>838,
-61=>838,62=>838,63=>536,64=>1000,65=>722,66=>735,67=>765,68=>802,69=>730,70=>694,
-71=>799,72=>872,73=>395,74=>401,75=>747,76=>664,77=>1024,78=>875,79=>820,80=>673,
-81=>820,82=>753,83=>685,84=>667,85=>843,86=>722,87=>1028,88=>712,89=>660,90=>695,
-91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>596,98=>640,99=>560,100=>640,
-101=>592,102=>370,103=>640,104=>644,105=>320,106=>310,107=>606,108=>320,109=>948,110=>644,
-111=>602,112=>640,113=>640,114=>478,115=>513,116=>402,117=>644,118=>565,119=>856,120=>564,
-121=>565,122=>527,123=>636,124=>337,125=>636,126=>838,8364=>636,8218=>318,402=>370,8222=>518,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1342,352=>685,8249=>400,338=>1137,381=>695,8216=>318,
-8217=>318,8220=>511,8221=>511,8226=>590,8211=>500,8212=>1000,732=>500,8482=>1000,353=>513,8250=>400,
-339=>989,382=>527,376=>660,160=>318,161=>402,162=>636,163=>636,164=>636,165=>636,166=>337,
-167=>500,168=>500,169=>1000,170=>475,171=>612,172=>838,173=>338,174=>1000,175=>500,176=>500,
-177=>838,178=>401,179=>401,180=>500,181=>650,182=>636,183=>318,184=>500,185=>401,186=>470,
-187=>612,188=>969,189=>969,190=>969,191=>536,192=>722,193=>722,194=>722,195=>722,196=>722,
-197=>722,198=>1001,199=>765,200=>730,201=>730,202=>730,203=>730,204=>395,205=>395,206=>395,
-207=>395,208=>807,209=>875,210=>820,211=>820,212=>820,213=>820,214=>820,215=>838,216=>820,
-217=>843,218=>843,219=>843,220=>843,221=>660,222=>676,223=>668,224=>596,225=>596,226=>596,
-227=>596,228=>596,229=>596,230=>940,231=>560,232=>592,233=>592,234=>592,235=>592,236=>320,
-237=>320,238=>320,239=>320,240=>602,241=>644,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>838,248=>602,249=>644,250=>644,251=>644,252=>644,253=>565,254=>640,255=>565,256=>722,
-257=>596,258=>722,259=>596,260=>722,261=>596,262=>765,263=>560,264=>765,265=>560,266=>765,
-267=>560,268=>765,269=>560,270=>802,271=>640,272=>807,273=>640,274=>730,275=>592,276=>730,
-277=>592,278=>730,279=>592,280=>730,281=>592,282=>730,283=>592,284=>799,285=>640,286=>799,
-287=>640,288=>799,289=>640,290=>799,291=>640,292=>872,293=>644,294=>872,295=>644,296=>395,
-297=>320,298=>395,299=>320,300=>395,301=>320,302=>395,303=>320,304=>395,305=>320,306=>801,
-307=>533,308=>401,309=>310,310=>747,311=>606,312=>606,313=>664,314=>320,315=>664,316=>320,
-317=>664,318=>320,319=>664,320=>320,321=>669,322=>324,323=>875,324=>644,325=>875,326=>644,
-327=>875,328=>644,329=>866,330=>843,331=>644,332=>820,333=>602,334=>820,335=>602,336=>820,
-337=>602,340=>753,341=>478,342=>753,343=>478,344=>753,345=>478,346=>685,347=>513,348=>685,
-349=>513,350=>685,351=>513,354=>667,355=>402,356=>667,357=>402,358=>667,359=>402,360=>843,
-361=>644,362=>843,363=>644,364=>843,365=>644,366=>843,367=>644,368=>843,369=>644,370=>843,
-371=>644,372=>1028,373=>856,374=>660,375=>565,377=>695,378=>527,379=>695,380=>527,383=>370,
-384=>640,385=>735,386=>735,387=>640,388=>735,389=>640,390=>765,391=>765,392=>560,393=>807,
-394=>802,395=>735,396=>640,397=>602,398=>730,399=>820,400=>623,401=>694,403=>799,404=>712,
-405=>932,406=>395,407=>395,408=>747,409=>606,410=>320,411=>634,412=>948,413=>875,414=>644,
-415=>820,416=>820,417=>602,418=>1040,419=>807,420=>673,421=>640,422=>753,423=>685,424=>513,
-425=>707,426=>324,427=>402,428=>667,429=>402,430=>667,431=>843,432=>644,433=>829,434=>760,
-435=>738,436=>663,437=>695,438=>527,439=>564,440=>564,441=>564,443=>636,444=>687,445=>564,
-446=>536,448=>295,449=>492,450=>459,451=>295,452=>1497,453=>1329,454=>1167,455=>1065,456=>974,
-457=>630,458=>1276,459=>1185,460=>954,461=>722,462=>596,463=>395,464=>320,465=>820,466=>602,
-467=>843,468=>644,469=>843,470=>644,471=>843,472=>644,473=>843,474=>644,475=>843,476=>644,
-477=>592,478=>722,479=>596,480=>722,481=>596,482=>1001,483=>940,484=>848,485=>640,486=>799,
-487=>640,488=>747,489=>606,490=>820,491=>602,492=>820,493=>602,494=>564,495=>564,496=>320,
-497=>1497,498=>1329,499=>1167,500=>799,501=>640,502=>1154,504=>875,505=>644,506=>722,507=>596,
-508=>1001,509=>940,510=>820,511=>602,512=>722,513=>596,514=>722,515=>596,516=>730,517=>592,
-518=>730,519=>592,520=>395,521=>320,522=>395,523=>320,524=>820,525=>602,526=>820,527=>602,
-528=>753,529=>478,530=>753,531=>478,532=>843,533=>644,534=>843,535=>644,536=>685,537=>513,
-538=>667,539=>402,540=>627,541=>521,542=>872,543=>644,544=>843,545=>814,548=>695,549=>527,
-550=>722,551=>596,552=>730,553=>592,554=>820,555=>602,556=>820,557=>602,558=>820,559=>602,
-560=>820,561=>602,562=>660,563=>565,564=>500,565=>832,566=>494,567=>310,568=>960,569=>960,
-570=>722,571=>765,572=>560,573=>664,574=>667,575=>513,576=>527,577=>583,578=>464,581=>722,
-592=>596,593=>640,594=>640,595=>640,596=>560,597=>560,598=>647,599=>683,600=>592,601=>592,
-602=>843,603=>518,604=>509,605=>773,606=>613,607=>315,608=>683,609=>640,610=>544,611=>712,
-612=>564,613=>644,614=>644,615=>644,616=>320,617=>392,618=>320,619=>380,620=>454,621=>363,
-622=>704,623=>948,624=>948,625=>948,626=>644,627=>694,628=>646,629=>602,630=>790,631=>647,
-632=>602,633=>501,634=>501,635=>551,636=>478,637=>478,638=>453,639=>453,640=>594,641=>594,
-642=>513,643=>271,644=>370,645=>487,646=>324,647=>402,648=>402,649=>644,650=>620,651=>608,
-652=>565,653=>856,654=>565,655=>655,656=>597,657=>560,658=>564,659=>560,660=>536,661=>536,
-662=>536,663=>513,664=>820,665=>563,666=>613,667=>654,668=>667,669=>366,670=>606,671=>646,
-672=>683,673=>536,674=>536,675=>996,676=>1033,677=>998,678=>809,679=>598,680=>782,681=>894,
-682=>646,683=>676,684=>598,685=>443,686=>781,687=>767,688=>433,689=>430,690=>264,691=>347,
-692=>347,693=>430,694=>392,695=>585,696=>423,697=>278,699=>318,700=>318,701=>318,702=>307,
-703=>307,704=>280,705=>281,711=>500,712=>275,713=>500,716=>275,720=>337,721=>337,722=>307,
-723=>307,726=>329,728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>447,737=>243,
-738=>337,739=>424,740=>281,741=>493,742=>493,743=>493,744=>493,745=>493,750=>484,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>740,881=>531,884=>278,
-885=>278,890=>500,891=>560,892=>560,893=>560,894=>337,900=>500,901=>500,902=>722,903=>318,
-904=>900,905=>1039,906=>562,908=>835,910=>897,911=>853,912=>392,913=>722,914=>735,915=>694,
-916=>722,917=>730,918=>695,919=>872,920=>820,921=>395,922=>747,923=>722,924=>1024,925=>875,
-926=>704,927=>820,928=>872,929=>673,931=>707,932=>667,933=>660,934=>820,935=>712,936=>877,
-937=>829,938=>395,939=>660,940=>675,941=>518,942=>599,943=>392,944=>608,945=>675,946=>578,
-947=>598,948=>602,949=>518,950=>542,951=>599,952=>602,953=>392,954=>625,955=>634,956=>650,
-957=>608,958=>551,959=>602,960=>657,961=>588,962=>560,963=>683,964=>553,965=>608,966=>700,
-967=>606,968=>784,969=>815,970=>392,971=>608,972=>602,973=>608,974=>815,976=>583,977=>715,
-978=>687,979=>874,980=>687,981=>682,982=>815,983=>624,984=>820,985=>602,986=>765,987=>560,
-988=>694,989=>463,990=>590,991=>660,992=>782,993=>577,1008=>624,1009=>588,1010=>560,1011=>310,
-1012=>820,1013=>560,1014=>560,1015=>676,1016=>640,1017=>765,1018=>1024,1019=>708,1020=>588,1021=>765,
-1022=>765,1023=>765,1024=>730,1025=>730,1026=>799,1027=>662,1028=>765,1029=>685,1030=>395,1031=>395,
-1032=>401,1033=>1084,1034=>1118,1035=>872,1036=>774,1037=>872,1038=>723,1039=>872,1040=>757,1041=>735,
-1042=>735,1043=>662,1044=>813,1045=>730,1046=>1124,1047=>623,1048=>872,1049=>872,1050=>774,1051=>834,
-1052=>1024,1053=>872,1054=>820,1055=>872,1056=>673,1057=>765,1058=>667,1059=>723,1060=>830,1061=>712,
-1062=>872,1063=>773,1064=>1141,1065=>1141,1066=>794,1067=>984,1068=>674,1069=>765,1070=>1193,1071=>808,
-1072=>596,1073=>602,1074=>563,1075=>524,1076=>616,1077=>592,1078=>920,1079=>545,1080=>667,1081=>667,
-1082=>625,1083=>635,1084=>778,1085=>667,1086=>602,1087=>667,1088=>640,1089=>560,1090=>553,1091=>588,
-1092=>783,1093=>564,1094=>643,1095=>661,1096=>930,1097=>930,1098=>636,1099=>796,1100=>544,1101=>560,
-1102=>871,1103=>631,1104=>592,1105=>592,1106=>624,1107=>524,1108=>560,1109=>513,1110=>320,1111=>320,
-1112=>310,1113=>843,1114=>860,1115=>644,1116=>625,1117=>667,1118=>588,1119=>656,1122=>762,1123=>603,
-1124=>1129,1125=>834,1130=>1124,1131=>920,1136=>944,1137=>902,1138=>820,1139=>552,1140=>859,1141=>678,
-1164=>707,1165=>544,1168=>672,1169=>529,1170=>662,1171=>523,1172=>728,1173=>614,1174=>1124,1175=>920,
-1176=>636,1177=>537,1178=>774,1179=>606,1182=>774,1183=>625,1184=>891,1185=>717,1186=>872,1187=>641,
-1188=>1139,1189=>852,1190=>1205,1191=>941,1194=>765,1195=>560,1196=>667,1197=>553,1198=>660,1199=>565,
-1200=>660,1201=>565,1202=>712,1203=>564,1204=>952,1205=>732,1206=>749,1207=>690,1210=>749,1211=>644,
-1216=>395,1217=>1124,1218=>920,1219=>747,1220=>606,1223=>872,1224=>667,1227=>749,1228=>667,1231=>320,
-1232=>757,1233=>596,1234=>757,1235=>596,1236=>1001,1237=>940,1238=>730,1239=>592,1240=>820,1241=>592,
-1242=>820,1243=>592,1244=>1124,1245=>920,1246=>623,1247=>545,1248=>564,1249=>564,1250=>872,1251=>667,
-1252=>872,1253=>667,1254=>820,1255=>602,1256=>820,1257=>602,1258=>820,1259=>602,1260=>765,1261=>560,
-1262=>723,1263=>588,1264=>723,1265=>588,1266=>723,1267=>588,1268=>773,1269=>661,1270=>662,1271=>524,
-1272=>984,1273=>796,1296=>623,1297=>545,1298=>834,1299=>635,1300=>1198,1301=>919,1306=>820,1307=>640,
-1308=>1028,1309=>856,4256=>723,4257=>850,4258=>828,4259=>859,4260=>733,4261=>981,4262=>916,4263=>1101,
-4264=>566,4265=>750,4266=>962,4267=>941,4268=>743,4269=>1075,4270=>896,4271=>829,4272=>1040,4273=>733,
-4274=>669,4275=>1015,4276=>937,4277=>1020,4278=>731,4279=>733,4280=>732,4281=>733,4282=>879,4283=>937,
-4284=>714,4285=>755,4286=>733,4287=>958,4288=>1000,4289=>702,4290=>864,4291=>734,4292=>837,4293=>951,
-4304=>541,4305=>571,4306=>589,4307=>833,4308=>561,4309=>557,4310=>618,4311=>861,4312=>560,4313=>546,
-4314=>1066,4315=>586,4316=>586,4317=>825,4318=>570,4319=>581,4320=>824,4321=>607,4322=>748,4323=>698,
-4324=>815,4325=>585,4326=>858,4327=>568,4328=>594,4329=>586,4330=>675,4331=>587,4332=>582,4333=>576,
-4334=>612,4335=>683,4336=>572,4337=>603,4338=>571,4339=>572,4340=>570,4341=>649,4342=>886,4343=>626,
-4344=>582,4345=>619,4346=>571,4347=>437,4348=>354,7426=>940,7432=>509,7433=>320,7444=>989,7446=>602,
-7447=>602,7453=>737,7454=>948,7455=>948,7468=>455,7469=>630,7470=>463,7472=>505,7473=>459,7474=>459,
-7475=>503,7476=>549,7477=>249,7478=>252,7479=>470,7480=>418,7481=>645,7482=>551,7483=>551,7484=>516,
-7486=>424,7487=>474,7488=>420,7489=>531,7490=>647,7491=>386,7492=>386,7493=>400,7494=>618,7495=>400,
-7496=>400,7497=>387,7498=>387,7499=>340,7500=>340,7501=>400,7502=>175,7503=>365,7504=>613,7505=>399,
-7506=>385,7507=>346,7508=>385,7509=>385,7510=>400,7511=>247,7512=>399,7513=>464,7514=>613,7515=>373,
-7522=>201,7523=>347,7524=>399,7525=>373,7543=>640,7544=>549,7547=>372,7557=>320,7579=>400,7580=>346,
-7581=>346,7582=>385,7583=>340,7584=>222,7585=>229,7586=>400,7587=>399,7588=>234,7589=>244,7590=>234,
-7591=>234,7592=>230,7593=>175,7594=>175,7595=>367,7596=>613,7597=>613,7598=>407,7599=>404,7600=>399,
-7601=>385,7602=>385,7603=>328,7604=>211,7605=>247,7606=>399,7607=>389,7609=>376,7610=>373,7611=>331,
-7612=>331,7613=>331,7614=>364,7615=>385,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>722,7681=>596,7682=>735,7683=>640,7684=>735,7685=>640,7686=>735,7687=>640,7688=>765,7689=>560,
-7690=>802,7691=>640,7692=>802,7693=>640,7694=>802,7695=>640,7696=>802,7697=>640,7698=>802,7699=>640,
-7700=>730,7701=>592,7702=>730,7703=>592,7704=>730,7705=>592,7706=>730,7707=>592,7708=>730,7709=>592,
-7710=>694,7711=>370,7712=>799,7713=>640,7714=>872,7715=>644,7716=>872,7717=>644,7718=>872,7719=>644,
-7720=>872,7721=>644,7722=>872,7723=>644,7724=>395,7725=>320,7728=>747,7729=>606,7730=>747,7731=>606,
-7732=>747,7733=>606,7734=>664,7735=>320,7736=>664,7737=>320,7738=>664,7739=>320,7740=>664,7741=>320,
-7742=>1024,7743=>948,7744=>1024,7745=>948,7746=>1024,7747=>948,7748=>875,7749=>644,7750=>875,7751=>644,
-7752=>875,7753=>644,7754=>875,7755=>644,7756=>820,7757=>602,7760=>820,7761=>602,7762=>820,7763=>602,
-7764=>673,7765=>640,7766=>673,7767=>640,7768=>753,7769=>478,7770=>753,7771=>478,7772=>753,7773=>478,
-7774=>753,7775=>478,7776=>685,7777=>513,7778=>685,7779=>513,7784=>685,7785=>513,7786=>667,7787=>402,
-7788=>667,7789=>402,7790=>667,7791=>402,7792=>667,7793=>402,7794=>843,7795=>644,7796=>843,7797=>644,
-7798=>843,7799=>644,7800=>843,7801=>644,7802=>843,7803=>644,7804=>722,7805=>565,7806=>722,7807=>565,
-7808=>1028,7809=>856,7810=>1028,7811=>856,7812=>1028,7813=>856,7814=>1028,7815=>856,7816=>1028,7817=>856,
-7818=>712,7819=>564,7820=>712,7821=>564,7822=>660,7823=>565,7824=>695,7825=>527,7826=>695,7827=>527,
-7828=>695,7829=>527,7830=>644,7831=>402,7832=>856,7833=>565,7834=>903,7835=>370,7838=>829,7839=>602,
-7840=>722,7841=>596,7842=>722,7843=>596,7852=>722,7853=>596,7854=>722,7855=>596,7856=>722,7857=>596,
-7858=>722,7859=>596,7860=>722,7861=>596,7862=>722,7863=>596,7864=>730,7865=>592,7866=>730,7867=>592,
-7868=>730,7869=>592,7878=>730,7879=>592,7880=>395,7881=>320,7882=>395,7883=>320,7884=>820,7885=>602,
-7886=>820,7887=>602,7896=>820,7897=>602,7908=>843,7909=>644,7910=>843,7911=>644,7922=>660,7923=>565,
-7924=>660,7925=>565,7926=>660,7927=>565,7928=>660,7929=>565,7936=>675,7937=>675,7938=>675,7939=>675,
-7940=>675,7941=>675,7942=>675,7943=>675,7944=>722,7945=>722,7946=>869,7947=>869,7948=>734,7949=>763,
-7950=>722,7951=>722,7952=>537,7953=>537,7954=>537,7955=>537,7956=>537,7957=>537,7960=>853,7961=>841,
-7962=>1067,7963=>1077,7964=>1008,7965=>1035,7968=>599,7969=>599,7970=>599,7971=>599,7972=>599,7973=>599,
-7974=>599,7975=>599,7976=>998,7977=>992,7978=>1212,7979=>1224,7980=>1159,7981=>1183,7982=>1098,7983=>1095,
-7984=>392,7985=>392,7986=>392,7987=>392,7988=>392,7989=>392,7990=>392,7991=>392,7992=>521,7993=>512,
-7994=>735,7995=>738,7996=>679,7997=>706,7998=>624,7999=>615,8000=>602,8001=>602,8002=>602,8003=>602,
-8004=>602,8005=>602,8008=>820,8009=>859,8010=>1120,8011=>1127,8012=>937,8013=>964,8016=>608,8017=>608,
-8018=>608,8019=>608,8020=>608,8021=>608,8022=>608,8023=>608,8025=>851,8027=>1079,8029=>1044,8031=>953,
-8032=>815,8033=>815,8034=>815,8035=>815,8036=>815,8037=>815,8038=>815,8039=>815,8040=>829,8041=>870,
-8042=>1131,8043=>1137,8044=>946,8045=>976,8046=>938,8047=>970,8048=>675,8049=>675,8050=>537,8051=>537,
-8052=>599,8053=>599,8054=>392,8055=>392,8056=>602,8057=>602,8058=>608,8059=>608,8060=>815,8061=>815,
-8064=>675,8065=>675,8066=>675,8067=>675,8068=>675,8069=>675,8070=>675,8071=>675,8072=>722,8073=>722,
-8074=>869,8075=>869,8076=>734,8077=>763,8078=>722,8079=>722,8080=>599,8081=>599,8082=>599,8083=>599,
-8084=>599,8085=>599,8086=>599,8087=>599,8088=>998,8089=>992,8090=>1212,8091=>1224,8092=>1159,8093=>1183,
-8094=>1098,8095=>1095,8096=>815,8097=>815,8098=>815,8099=>815,8100=>815,8101=>815,8102=>815,8103=>815,
-8104=>829,8105=>870,8106=>1131,8107=>1137,8108=>946,8109=>976,8110=>938,8111=>970,8112=>675,8113=>675,
-8114=>675,8115=>675,8116=>675,8118=>675,8119=>675,8120=>722,8121=>722,8122=>722,8123=>722,8124=>722,
-8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,8130=>599,8131=>599,8132=>599,8134=>599,8135=>599,
-8136=>912,8137=>900,8138=>1063,8139=>1039,8140=>872,8141=>500,8142=>500,8143=>500,8144=>392,8145=>392,
-8146=>392,8147=>392,8150=>392,8151=>392,8152=>395,8153=>395,8154=>588,8155=>562,8157=>500,8158=>500,
-8159=>500,8160=>608,8161=>608,8162=>608,8163=>608,8164=>588,8165=>588,8166=>608,8167=>608,8168=>660,
-8169=>660,8170=>921,8171=>897,8172=>790,8173=>500,8174=>500,8175=>500,8178=>815,8179=>815,8180=>815,
-8182=>815,8183=>815,8184=>961,8185=>835,8186=>984,8187=>853,8188=>829,8189=>500,8190=>500,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,8198=>167,8199=>636,8200=>318,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>338,8209=>338,8210=>636,8213=>1000,8214=>500,
-8215=>500,8219=>318,8223=>511,8227=>590,8228=>334,8229=>667,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>200,8241=>1734,8242=>227,8243=>374,8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,
-8252=>527,8253=>536,8254=>500,8258=>1000,8260=>167,8261=>390,8262=>390,8263=>976,8264=>753,8265=>753,
-8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,8273=>500,8274=>450,8275=>1000,8279=>663,8287=>222,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>401,8305=>201,8308=>401,8309=>401,8310=>401,8311=>401,8312=>401,8313=>401,8314=>528,
-8315=>528,8316=>528,8317=>246,8318=>246,8319=>433,8320=>401,8321=>401,8322=>401,8323=>401,8324=>401,
-8325=>401,8326=>401,8327=>401,8328=>401,8329=>401,8330=>528,8331=>528,8332=>528,8333=>246,8334=>246,
-8336=>386,8337=>387,8338=>385,8339=>424,8340=>387,8358=>660,8367=>1057,8369=>706,8372=>780,8373=>636,
-8450=>796,8451=>1119,8457=>1047,8461=>945,8462=>644,8463=>644,8469=>914,8470=>946,8473=>752,8474=>871,
-8477=>831,8484=>730,8486=>829,8487=>829,8490=>747,8491=>722,8508=>732,8509=>660,8510=>710,8511=>944,
-8512=>714,8513=>775,8514=>557,8515=>557,8516=>611,8517=>867,8518=>699,8519=>636,8520=>380,8521=>362,
-8523=>890,8531=>969,8532=>969,8533=>969,8534=>969,8535=>969,8536=>969,8537=>969,8538=>969,8539=>969,
-8540=>969,8541=>969,8542=>969,8543=>568,8544=>395,8545=>590,8546=>786,8547=>966,8548=>722,8549=>981,
-8550=>1176,8551=>1372,8552=>932,8553=>712,8554=>932,8555=>1127,8556=>664,8557=>765,8558=>802,8559=>1024,
-8560=>320,8561=>640,8562=>959,8563=>885,8564=>565,8565=>885,8566=>1205,8567=>1524,8568=>884,8569=>564,
-8570=>884,8571=>1204,8572=>320,8573=>560,8574=>640,8575=>948,8576=>1206,8577=>802,8578=>1206,8579=>765,
-8580=>560,8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,8598=>838,8599=>838,8600=>838,
-8601=>838,8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,8608=>838,8609=>838,8610=>838,
-8611=>838,8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,8618=>838,8619=>838,8620=>838,
-8621=>838,8622=>838,8623=>838,8624=>838,8625=>838,8626=>838,8627=>838,8628=>838,8629=>838,8630=>838,
-8631=>838,8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,8638=>838,8639=>838,8640=>838,
-8641=>838,8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,8648=>838,8649=>838,8650=>838,
-8651=>838,8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,8658=>838,8659=>838,8660=>838,
-8661=>838,8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,8668=>838,8669=>838,8670=>838,
-8671=>838,8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,8678=>838,8679=>838,8680=>838,
-8681=>838,8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,8688=>838,8689=>838,8690=>838,
-8691=>838,8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,8698=>838,8699=>838,8700=>838,
-8701=>838,8702=>838,8703=>838,8704=>604,8706=>517,8707=>542,8708=>542,8710=>698,8711=>698,8712=>740,
-8713=>740,8715=>740,8716=>740,8719=>796,8720=>796,8721=>714,8722=>838,8723=>838,8724=>838,8725=>337,
-8727=>680,8728=>490,8729=>490,8730=>637,8731=>637,8732=>637,8733=>677,8734=>833,8735=>838,8736=>838,
-8739=>291,8740=>479,8741=>462,8742=>634,8743=>732,8744=>732,8745=>838,8746=>838,8747=>521,8748=>852,
-8749=>1182,8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,8770=>838,8771=>838,8776=>838,
-8784=>838,8785=>838,8786=>838,8787=>838,8788=>1033,8789=>1033,8800=>838,8801=>838,8804=>838,8805=>838,
-8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8844=>838,8845=>838,8846=>838,8847=>846,
-8848=>846,8849=>846,8850=>846,8851=>838,8852=>838,8853=>838,8854=>838,8855=>838,8856=>838,8857=>838,
-8858=>838,8859=>838,8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,8865=>838,8866=>860,8867=>860,
-8868=>940,8869=>940,8870=>567,8871=>567,8872=>860,8873=>860,8874=>860,8875=>1031,8876=>860,8877=>860,
-8878=>860,8879=>1031,8901=>342,8962=>764,8968=>390,8969=>390,8970=>390,8971=>390,8976=>838,8977=>513,
-8984=>1000,8985=>838,8992=>521,8993=>521,8997=>1000,9000=>1443,9085=>919,9134=>521,9167=>945,9251=>764,
-9472=>602,9473=>602,9474=>602,9475=>602,9476=>602,9477=>602,9478=>602,9479=>602,9480=>602,9481=>602,
-9482=>602,9483=>602,9484=>602,9485=>602,9486=>602,9487=>602,9488=>602,9489=>602,9490=>602,9491=>602,
-9492=>602,9493=>602,9494=>602,9495=>602,9496=>602,9497=>602,9498=>602,9499=>602,9500=>602,9501=>602,
-9502=>602,9503=>602,9504=>602,9505=>602,9506=>602,9507=>602,9508=>602,9509=>602,9510=>602,9511=>602,
-9512=>602,9513=>602,9514=>602,9515=>602,9516=>602,9517=>602,9518=>602,9519=>602,9520=>602,9521=>602,
-9522=>602,9523=>602,9524=>602,9525=>602,9526=>602,9527=>602,9528=>602,9529=>602,9530=>602,9531=>602,
-9532=>602,9533=>602,9534=>602,9535=>602,9536=>602,9537=>602,9538=>602,9539=>602,9540=>602,9541=>602,
-9542=>602,9543=>602,9544=>602,9545=>602,9546=>602,9547=>602,9548=>602,9549=>602,9550=>602,9551=>602,
-9552=>602,9553=>602,9554=>602,9555=>602,9556=>602,9557=>602,9558=>602,9559=>602,9560=>602,9561=>602,
-9562=>602,9563=>602,9564=>602,9565=>602,9566=>602,9567=>602,9568=>602,9569=>602,9570=>602,9571=>602,
-9572=>602,9573=>602,9574=>602,9575=>602,9576=>602,9577=>602,9578=>602,9579=>602,9580=>602,9581=>602,
-9582=>602,9583=>602,9584=>602,9585=>602,9586=>602,9587=>602,9588=>602,9589=>602,9590=>602,9591=>602,
-9592=>602,9593=>602,9594=>602,9595=>602,9596=>602,9597=>602,9598=>602,9599=>602,9600=>769,9601=>769,
-9602=>769,9603=>769,9604=>769,9605=>769,9606=>769,9607=>769,9608=>769,9609=>769,9610=>769,9611=>769,
-9612=>769,9613=>769,9614=>769,9615=>769,9616=>769,9617=>769,9618=>769,9619=>769,9620=>769,9621=>769,
-9622=>769,9623=>769,9624=>769,9625=>769,9626=>769,9627=>769,9628=>769,9629=>769,9630=>769,9631=>769,
-9632=>945,9633=>945,9634=>945,9635=>945,9636=>945,9637=>945,9638=>945,9639=>945,9640=>945,9641=>945,
-9642=>678,9643=>678,9644=>945,9645=>945,9646=>550,9647=>550,9648=>769,9649=>769,9650=>769,9651=>769,
-9652=>502,9653=>502,9654=>769,9655=>769,9656=>502,9657=>502,9658=>769,9659=>769,9660=>769,9661=>769,
-9662=>502,9663=>502,9664=>769,9665=>769,9666=>502,9667=>502,9668=>769,9669=>769,9670=>769,9671=>769,
-9672=>769,9673=>873,9674=>494,9675=>873,9676=>873,9677=>873,9678=>873,9679=>873,9680=>873,9681=>873,
-9682=>873,9683=>873,9684=>873,9685=>873,9686=>527,9687=>527,9688=>791,9689=>970,9690=>970,9691=>970,
-9692=>387,9693=>387,9694=>387,9695=>387,9696=>873,9697=>873,9698=>769,9699=>769,9700=>769,9701=>769,
-9702=>590,9703=>945,9704=>945,9705=>945,9706=>945,9707=>945,9708=>769,9709=>769,9710=>769,9711=>1119,
-9712=>945,9713=>945,9714=>945,9715=>945,9716=>873,9717=>873,9718=>873,9719=>873,9720=>769,9721=>769,
-9722=>769,9723=>830,9724=>830,9725=>732,9726=>732,9727=>769,9728=>896,9784=>896,9785=>896,9786=>896,
-9787=>896,9788=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,
-9799=>896,9824=>896,9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,9830=>896,9831=>896,9833=>472,
-9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,9839=>484,10145=>838,10181=>390,10182=>390,10208=>494,
-10216=>390,10217=>390,10224=>838,10225=>838,10226=>838,10227=>838,10228=>1033,10229=>1434,10230=>1434,10231=>1434,
-10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,10237=>1434,10238=>1434,10239=>1434,10240=>732,10241=>732,
-10242=>732,10243=>732,10244=>732,10245=>732,10246=>732,10247=>732,10248=>732,10249=>732,10250=>732,10251=>732,
-10252=>732,10253=>732,10254=>732,10255=>732,10256=>732,10257=>732,10258=>732,10259=>732,10260=>732,10261=>732,
-10262=>732,10263=>732,10264=>732,10265=>732,10266=>732,10267=>732,10268=>732,10269=>732,10270=>732,10271=>732,
-10272=>732,10273=>732,10274=>732,10275=>732,10276=>732,10277=>732,10278=>732,10279=>732,10280=>732,10281=>732,
-10282=>732,10283=>732,10284=>732,10285=>732,10286=>732,10287=>732,10288=>732,10289=>732,10290=>732,10291=>732,
-10292=>732,10293=>732,10294=>732,10295=>732,10296=>732,10297=>732,10298=>732,10299=>732,10300=>732,10301=>732,
-10302=>732,10303=>732,10304=>732,10305=>732,10306=>732,10307=>732,10308=>732,10309=>732,10310=>732,10311=>732,
-10312=>732,10313=>732,10314=>732,10315=>732,10316=>732,10317=>732,10318=>732,10319=>732,10320=>732,10321=>732,
-10322=>732,10323=>732,10324=>732,10325=>732,10326=>732,10327=>732,10328=>732,10329=>732,10330=>732,10331=>732,
-10332=>732,10333=>732,10334=>732,10335=>732,10336=>732,10337=>732,10338=>732,10339=>732,10340=>732,10341=>732,
-10342=>732,10343=>732,10344=>732,10345=>732,10346=>732,10347=>732,10348=>732,10349=>732,10350=>732,10351=>732,
-10352=>732,10353=>732,10354=>732,10355=>732,10356=>732,10357=>732,10358=>732,10359=>732,10360=>732,10361=>732,
-10362=>732,10363=>732,10364=>732,10365=>732,10366=>732,10367=>732,10368=>732,10369=>732,10370=>732,10371=>732,
-10372=>732,10373=>732,10374=>732,10375=>732,10376=>732,10377=>732,10378=>732,10379=>732,10380=>732,10381=>732,
-10382=>732,10383=>732,10384=>732,10385=>732,10386=>732,10387=>732,10388=>732,10389=>732,10390=>732,10391=>732,
-10392=>732,10393=>732,10394=>732,10395=>732,10396=>732,10397=>732,10398=>732,10399=>732,10400=>732,10401=>732,
-10402=>732,10403=>732,10404=>732,10405=>732,10406=>732,10407=>732,10408=>732,10409=>732,10410=>732,10411=>732,
-10412=>732,10413=>732,10414=>732,10415=>732,10416=>732,10417=>732,10418=>732,10419=>732,10420=>732,10421=>732,
-10422=>732,10423=>732,10424=>732,10425=>732,10426=>732,10427=>732,10428=>732,10429=>732,10430=>732,10431=>732,
-10432=>732,10433=>732,10434=>732,10435=>732,10436=>732,10437=>732,10438=>732,10439=>732,10440=>732,10441=>732,
-10442=>732,10443=>732,10444=>732,10445=>732,10446=>732,10447=>732,10448=>732,10449=>732,10450=>732,10451=>732,
-10452=>732,10453=>732,10454=>732,10455=>732,10456=>732,10457=>732,10458=>732,10459=>732,10460=>732,10461=>732,
-10462=>732,10463=>732,10464=>732,10465=>732,10466=>732,10467=>732,10468=>732,10469=>732,10470=>732,10471=>732,
-10472=>732,10473=>732,10474=>732,10475=>732,10476=>732,10477=>732,10478=>732,10479=>732,10480=>732,10481=>732,
-10482=>732,10483=>732,10484=>732,10485=>732,10486=>732,10487=>732,10488=>732,10489=>732,10490=>732,10491=>732,
-10492=>732,10493=>732,10494=>732,10495=>732,10496=>838,10497=>838,10498=>838,10499=>838,10500=>838,10501=>838,
-10502=>838,10503=>838,10504=>838,10505=>838,10506=>838,10507=>838,10508=>838,10509=>838,10510=>838,10511=>838,
-10512=>838,10513=>838,10514=>838,10515=>838,10516=>838,10517=>838,10518=>838,10519=>838,10520=>838,10521=>838,
-10522=>838,10523=>838,10524=>838,10525=>838,10526=>838,10527=>838,10528=>838,10529=>838,10530=>838,10531=>838,
-10532=>838,10533=>838,10534=>838,10535=>838,10536=>838,10537=>838,10538=>838,10539=>838,10540=>838,10541=>838,
-10542=>838,10543=>838,10544=>838,10545=>838,10546=>838,10547=>838,10548=>838,10549=>838,10550=>838,10551=>838,
-10552=>838,10553=>838,10554=>838,10555=>838,10556=>838,10557=>838,10558=>838,10559=>838,10560=>838,10561=>838,
-10562=>838,10563=>838,10564=>838,10565=>838,10566=>838,10567=>838,10568=>838,10569=>838,10570=>838,10571=>838,
-10572=>838,10573=>838,10574=>838,10575=>838,10576=>838,10577=>838,10578=>838,10579=>838,10580=>838,10581=>838,
-10582=>838,10583=>838,10584=>838,10585=>838,10586=>838,10587=>838,10588=>838,10589=>838,10590=>838,10591=>838,
-10592=>838,10593=>838,10594=>838,10595=>838,10596=>838,10597=>838,10598=>838,10599=>838,10600=>838,10601=>838,
-10602=>838,10603=>838,10604=>838,10605=>838,10606=>838,10607=>838,10608=>838,10609=>838,10610=>838,10611=>838,
-10612=>838,10613=>838,10614=>838,10615=>981,10616=>838,10617=>838,10618=>984,10619=>838,10620=>838,10621=>838,
-10622=>838,10623=>838,10731=>494,10764=>1513,10765=>521,10766=>521,10799=>838,11008=>838,11009=>838,11010=>838,
-11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,11016=>838,11017=>838,11018=>838,11019=>838,11020=>838,
-11021=>838,11022=>838,11023=>838,11024=>838,11025=>838,11026=>945,11027=>945,11028=>945,11029=>945,11030=>769,
-11031=>769,11032=>769,11033=>769,11034=>945,11364=>753,11367=>872,11368=>644,11369=>747,11370=>606,11371=>695,
-11372=>527,11374=>1024,11375=>722,11381=>740,11382=>556,11383=>700,11385=>501,11386=>602,11388=>264,11389=>455,
-11520=>773,11521=>635,11522=>633,11523=>658,11524=>631,11525=>962,11526=>756,11527=>960,11528=>617,11529=>646,
-11530=>962,11531=>632,11532=>646,11533=>962,11534=>645,11535=>866,11536=>961,11537=>645,11538=>645,11539=>959,
-11540=>945,11541=>863,11542=>644,11543=>646,11544=>645,11545=>649,11546=>688,11547=>634,11548=>982,11549=>681,
-11550=>676,11551=>852,11552=>957,11553=>632,11554=>645,11555=>646,11556=>749,11557=>914,11800=>536,11810=>390,
-11811=>390,11812=>390,11813=>390,11822=>536,42564=>685,42565=>513,42566=>395,42567=>392,42576=>1104,42577=>888,
-42580=>1193,42581=>871,42582=>1140,42583=>899,42760=>493,42761=>493,42762=>493,42763=>493,42764=>493,42765=>493,
-42766=>493,42767=>493,42768=>493,42769=>493,42770=>493,42771=>493,42772=>493,42773=>493,42774=>493,42779=>369,
-42780=>369,42781=>253,42782=>253,42783=>253,42891=>402,42892=>275,62464=>654,62465=>665,62466=>714,62467=>947,
-62468=>665,62469=>659,62470=>725,62471=>986,62472=>665,62473=>665,62474=>1257,62475=>683,62476=>682,62477=>953,
-62478=>665,62479=>682,62480=>999,62481=>746,62482=>798,62483=>748,62484=>944,62485=>681,62486=>936,62487=>680,
-62488=>688,62489=>682,62490=>729,62491=>682,62492=>688,62493=>666,62494=>729,62495=>884,62496=>665,62497=>706,
-62498=>666,62499=>665,62500=>665,62501=>722,62502=>961,62504=>904,63173=>602,63185=>500,63188=>500,64256=>710,
-64257=>667,64258=>667,64259=>1028,64260=>1030,64261=>771,64262=>933,65024=>0,65025=>0,65026=>0,65027=>0,
-65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,
-65038=>0,65039=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1025);
-$enc='';
-$diff='';
-$file='dejavuserif.z';
-$ctg='dejavuserif.ctg.z';
-$originalsize=328908;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifb.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifb.php
deleted file mode 100644
index c91ee28c301..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifb.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif-Bold';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>5,'Flags'=>32,'FontBBox'=>'[-836 -389 1796 1235]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>348,33=>439,34=>521,35=>838,36=>696,37=>950,38=>903,39=>306,40=>473,
-41=>473,42=>523,43=>838,44=>348,45=>415,46=>348,47=>365,48=>696,49=>696,50=>696,
-51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>369,59=>369,60=>838,
-61=>838,62=>838,63=>586,64=>1000,65=>776,66=>845,67=>796,68=>867,69=>762,70=>710,
-71=>854,72=>945,73=>468,74=>473,75=>869,76=>703,77=>1107,78=>914,79=>871,80=>752,
-81=>871,82=>831,83=>722,84=>744,85=>872,86=>776,87=>1123,88=>776,89=>714,90=>730,
-91=>473,92=>365,93=>473,94=>838,95=>500,96=>500,97=>648,98=>699,99=>609,100=>699,
-101=>636,102=>430,103=>699,104=>727,105=>380,106=>362,107=>693,108=>380,109=>1058,110=>727,
-111=>667,112=>699,113=>699,114=>527,115=>563,116=>462,117=>727,118=>581,119=>861,120=>596,
-121=>581,122=>568,123=>643,124=>364,125=>643,126=>838,8364=>696,8218=>348,402=>430,8222=>575,
-8230=>1000,8224=>523,8225=>523,710=>500,8240=>1385,352=>722,8249=>400,338=>1180,381=>730,8216=>348,
-8217=>348,8220=>575,8221=>575,8226=>639,8211=>500,8212=>1000,732=>500,8482=>1000,353=>563,8250=>400,
-339=>1028,382=>568,376=>714,160=>348,161=>439,162=>696,163=>696,164=>636,165=>696,166=>364,
-167=>523,168=>500,169=>1000,170=>487,171=>625,172=>838,173=>415,174=>1000,175=>500,176=>500,
-177=>838,178=>438,179=>438,180=>500,181=>732,182=>636,183=>348,184=>500,185=>438,186=>500,
-187=>625,188=>1043,189=>1043,190=>1043,191=>586,192=>776,193=>776,194=>776,195=>776,196=>776,
-197=>776,198=>1034,199=>796,200=>762,201=>762,202=>762,203=>762,204=>468,205=>468,206=>468,
-207=>468,208=>874,209=>914,210=>871,211=>871,212=>871,213=>871,214=>871,215=>838,216=>871,
-217=>872,218=>872,219=>872,220=>872,221=>714,222=>757,223=>760,224=>648,225=>648,226=>648,
-227=>648,228=>648,229=>648,230=>975,231=>609,232=>636,233=>636,234=>636,235=>636,236=>380,
-237=>380,238=>380,239=>380,240=>667,241=>727,242=>667,243=>667,244=>667,245=>667,246=>667,
-247=>838,248=>667,249=>727,250=>727,251=>727,252=>727,253=>581,254=>699,255=>581,256=>776,
-257=>648,258=>776,259=>648,260=>776,261=>648,262=>796,263=>609,264=>796,265=>609,266=>796,
-267=>609,268=>796,269=>609,270=>867,271=>699,272=>874,273=>699,274=>762,275=>636,276=>762,
-277=>636,278=>762,279=>636,280=>762,281=>636,282=>762,283=>636,284=>854,285=>699,286=>854,
-287=>699,288=>854,289=>699,290=>854,291=>699,292=>945,293=>727,294=>945,295=>727,296=>468,
-297=>380,298=>468,299=>380,300=>468,301=>380,302=>468,303=>380,304=>468,305=>380,306=>942,
-307=>751,308=>473,309=>362,310=>869,311=>693,312=>693,313=>703,314=>380,315=>703,316=>380,
-317=>703,318=>380,319=>703,320=>380,321=>710,322=>385,323=>914,324=>727,325=>914,326=>727,
-327=>914,328=>727,329=>1008,330=>872,331=>727,332=>871,333=>667,334=>871,335=>667,336=>871,
-337=>667,340=>831,341=>527,342=>831,343=>527,344=>831,345=>527,346=>722,347=>563,348=>722,
-349=>563,350=>722,351=>563,354=>744,355=>462,356=>744,357=>462,358=>744,359=>462,360=>872,
-361=>727,362=>872,363=>727,364=>872,365=>727,366=>872,367=>727,368=>872,369=>727,370=>872,
-371=>727,372=>1123,373=>861,374=>714,375=>581,377=>730,378=>568,379=>730,380=>568,383=>430,
-384=>699,385=>845,386=>854,387=>699,388=>854,389=>699,390=>796,391=>796,392=>609,393=>874,
-394=>867,395=>854,396=>699,397=>667,398=>762,399=>871,400=>721,401=>710,403=>854,404=>771,
-405=>1043,406=>468,407=>468,408=>869,409=>693,410=>380,411=>701,412=>1058,413=>914,414=>727,
-415=>871,416=>871,417=>667,418=>1200,419=>943,420=>752,421=>699,422=>831,423=>722,424=>563,
-425=>707,426=>331,427=>462,428=>744,429=>462,430=>744,431=>872,432=>727,433=>890,434=>890,
-435=>714,436=>708,437=>730,438=>568,439=>657,440=>657,441=>657,443=>696,444=>754,445=>568,
-446=>536,448=>295,449=>492,450=>459,451=>295,452=>1597,453=>1435,454=>1267,455=>1176,456=>1065,
-457=>742,458=>1387,459=>1276,460=>1089,461=>776,462=>648,463=>468,464=>380,465=>871,466=>667,
-467=>872,468=>727,469=>872,470=>727,471=>872,472=>727,473=>872,474=>727,475=>872,476=>727,
-477=>636,478=>776,479=>648,480=>776,481=>648,482=>1034,483=>975,484=>896,485=>699,486=>854,
-487=>699,488=>869,489=>693,490=>871,491=>667,492=>871,493=>667,494=>657,495=>568,496=>380,
-497=>1597,498=>1435,499=>1267,500=>854,501=>699,502=>1221,504=>914,505=>727,506=>776,507=>648,
-508=>1034,509=>975,510=>871,511=>667,512=>776,513=>648,514=>776,515=>648,516=>762,517=>636,
-518=>762,519=>636,520=>468,521=>380,522=>468,523=>380,524=>871,525=>667,526=>871,527=>667,
-528=>831,529=>527,530=>831,531=>527,532=>872,533=>727,534=>872,535=>727,536=>722,537=>563,
-538=>744,539=>462,540=>690,541=>607,542=>945,543=>727,544=>872,545=>791,548=>730,549=>568,
-550=>776,551=>648,552=>762,553=>636,554=>871,555=>667,556=>871,557=>667,558=>871,559=>667,
-560=>871,561=>667,562=>714,563=>581,564=>573,565=>922,566=>564,567=>362,568=>1031,569=>1031,
-570=>776,571=>796,572=>609,573=>703,574=>744,575=>563,576=>568,577=>660,578=>547,581=>776,
-592=>648,593=>699,594=>699,595=>699,596=>609,597=>609,598=>699,599=>730,600=>636,601=>636,
-602=>907,603=>608,604=>562,605=>907,606=>720,607=>387,608=>699,609=>699,610=>626,611=>712,
-612=>627,613=>727,614=>727,615=>727,616=>380,617=>380,618=>380,619=>409,620=>514,621=>380,
-622=>795,623=>1058,624=>1058,625=>1058,626=>727,627=>727,628=>712,629=>667,630=>1061,631=>749,
-632=>667,633=>571,634=>571,635=>571,636=>527,637=>527,638=>452,639=>487,640=>801,641=>801,
-642=>563,643=>331,644=>430,645=>540,646=>331,647=>492,648=>462,649=>727,650=>679,651=>694,
-652=>641,653=>907,654=>635,655=>727,656=>568,657=>568,658=>568,659=>568,660=>536,661=>536,
-662=>536,663=>545,664=>871,665=>695,666=>720,667=>626,668=>732,669=>384,670=>740,671=>646,
-672=>699,673=>536,674=>536,675=>1117,676=>1179,677=>1117,678=>911,679=>715,680=>909,681=>1039,
-682=>790,683=>795,684=>662,685=>443,686=>613,687=>717,688=>521,689=>519,690=>313,691=>414,
-692=>414,693=>480,694=>527,695=>662,696=>485,697=>302,699=>348,700=>348,701=>348,702=>366,
-703=>366,704=>313,705=>313,711=>500,712=>282,713=>500,716=>282,720=>369,721=>369,722=>366,
-723=>366,726=>392,728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>458,737=>292,
-738=>395,739=>475,740=>313,741=>500,742=>500,743=>500,744=>500,745=>500,750=>553,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>779,881=>576,884=>302,
-885=>302,890=>500,891=>609,892=>609,893=>609,894=>369,900=>500,901=>500,902=>776,903=>348,
-904=>947,905=>1118,906=>662,908=>887,910=>953,911=>911,912=>484,913=>776,914=>845,915=>710,
-916=>776,917=>762,918=>730,919=>945,920=>871,921=>468,922=>869,923=>776,924=>1107,925=>914,
-926=>704,927=>871,928=>944,929=>752,931=>707,932=>744,933=>714,934=>871,935=>776,936=>913,
-937=>890,938=>468,939=>714,940=>770,941=>608,942=>727,943=>484,944=>694,945=>770,946=>664,
-947=>660,948=>667,949=>608,950=>592,951=>727,952=>667,953=>484,954=>750,955=>701,956=>732,
-957=>694,958=>592,959=>667,960=>732,961=>665,962=>609,963=>737,964=>673,965=>694,966=>905,
-967=>658,968=>941,969=>952,970=>484,971=>694,972=>667,973=>694,974=>952,976=>667,977=>849,
-978=>764,979=>969,980=>764,981=>941,982=>952,983=>655,984=>871,985=>667,986=>796,987=>609,
-988=>710,989=>527,990=>590,991=>660,992=>796,993=>667,1008=>655,1009=>665,1010=>609,1011=>362,
-1012=>871,1013=>609,1014=>609,1015=>757,1016=>699,1017=>796,1018=>1107,1019=>860,1020=>692,1021=>796,
-1022=>796,1023=>796,1024=>762,1025=>762,1026=>901,1027=>690,1028=>795,1029=>722,1030=>468,1031=>468,
-1032=>473,1033=>1202,1034=>1262,1035=>963,1036=>910,1037=>945,1038=>812,1039=>945,1040=>814,1041=>854,
-1042=>845,1043=>690,1044=>889,1045=>762,1046=>1312,1047=>721,1048=>945,1049=>945,1050=>910,1051=>884,
-1052=>1107,1053=>945,1054=>871,1055=>944,1056=>752,1057=>796,1058=>744,1059=>812,1060=>949,1061=>776,
-1062=>966,1063=>913,1064=>1268,1065=>1293,1066=>957,1067=>1202,1068=>825,1069=>795,1070=>1287,1071=>882,
-1072=>648,1073=>667,1074=>695,1075=>613,1076=>667,1077=>636,1078=>1010,1079=>638,1080=>742,1081=>742,
-1082=>722,1083=>705,1084=>869,1085=>732,1086=>667,1087=>732,1088=>699,1089=>609,1090=>620,1091=>640,
-1092=>902,1093=>596,1094=>739,1095=>732,1096=>1075,1097=>1082,1098=>767,1099=>1002,1100=>679,1101=>609,
-1102=>1025,1103=>739,1104=>636,1105=>636,1106=>719,1107=>613,1108=>609,1109=>563,1110=>380,1111=>380,
-1112=>362,1113=>988,1114=>1015,1115=>727,1116=>722,1117=>742,1118=>640,1119=>732,1122=>880,1123=>703,
-1124=>1195,1125=>963,1130=>1312,1131=>1010,1136=>1096,1137=>1105,1138=>871,1139=>652,1140=>916,1141=>749,
-1164=>846,1165=>673,1168=>700,1169=>618,1170=>690,1171=>613,1172=>868,1173=>716,1174=>1312,1175=>1010,
-1176=>721,1177=>638,1178=>947,1179=>744,1182=>910,1183=>722,1184=>1041,1185=>827,1186=>966,1187=>739,
-1188=>1167,1189=>956,1190=>1345,1191=>1059,1194=>796,1195=>609,1196=>744,1197=>620,1198=>714,1199=>581,
-1200=>714,1201=>581,1202=>866,1203=>649,1204=>1022,1205=>807,1206=>928,1207=>739,1210=>910,1211=>727,
-1216=>468,1217=>1312,1218=>1010,1219=>869,1220=>693,1223=>945,1224=>732,1227=>913,1228=>732,1231=>380,
-1232=>814,1233=>648,1234=>814,1235=>648,1236=>1034,1237=>975,1238=>762,1239=>636,1240=>871,1241=>636,
-1242=>871,1243=>636,1244=>1312,1245=>1010,1246=>721,1247=>638,1248=>657,1249=>568,1250=>945,1251=>742,
-1252=>945,1253=>742,1254=>871,1255=>667,1256=>871,1257=>667,1258=>871,1259=>667,1260=>795,1261=>609,
-1262=>812,1263=>640,1264=>812,1265=>640,1266=>812,1267=>640,1268=>913,1269=>732,1270=>690,1271=>613,
-1272=>1202,1273=>1002,1296=>721,1297=>638,1298=>884,1299=>705,1300=>1248,1301=>945,1306=>820,1307=>640,
-1308=>1028,1309=>856,4256=>755,4257=>936,4258=>866,4259=>874,4260=>781,4261=>1078,4262=>1014,4263=>1213,
-4264=>643,4265=>818,4266=>1051,4267=>1051,4268=>796,4269=>1135,4270=>969,4271=>902,4272=>1109,4273=>792,
-4274=>756,4275=>1076,4276=>976,4277=>1066,4278=>811,4279=>833,4280=>821,4281=>833,4282=>908,4283=>1077,
-4284=>769,4285=>822,4286=>813,4287=>1111,4288=>1123,4289=>802,4290=>892,4291=>802,4292=>880,4293=>1063,
-4304=>594,4305=>625,4306=>643,4307=>887,4308=>615,4309=>611,4310=>667,4311=>915,4312=>613,4313=>600,
-4314=>1120,4315=>640,4316=>640,4317=>879,4318=>624,4319=>634,4320=>877,4321=>666,4322=>780,4323=>751,
-4324=>869,4325=>639,4326=>912,4327=>622,4328=>647,4329=>640,4330=>729,4331=>641,4332=>630,4333=>629,
-4334=>670,4335=>753,4336=>625,4337=>657,4338=>625,4339=>625,4340=>624,4341=>670,4342=>940,4343=>680,
-4344=>636,4345=>672,4346=>625,4347=>588,4348=>354,7426=>940,7432=>509,7433=>320,7444=>989,7446=>667,
-7447=>667,7453=>737,7454=>948,7455=>948,7468=>489,7469=>651,7470=>532,7472=>546,7473=>480,7474=>480,
-7475=>538,7476=>595,7477=>294,7478=>298,7479=>547,7480=>443,7481=>697,7482=>576,7483=>576,7484=>548,
-7486=>474,7487=>523,7488=>455,7489=>469,7490=>549,7491=>466,7492=>466,7493=>498,7494=>657,7495=>499,
-7496=>498,7497=>444,7498=>444,7499=>412,7500=>412,7501=>498,7502=>300,7503=>523,7504=>729,7505=>473,
-7506=>467,7507=>427,7508=>467,7509=>467,7510=>499,7511=>371,7512=>520,7513=>434,7514=>729,7515=>491,
-7522=>239,7523=>414,7524=>520,7525=>491,7543=>640,7544=>595,7547=>380,7557=>380,7579=>498,7580=>427,
-7581=>427,7582=>467,7583=>412,7584=>383,7585=>373,7586=>498,7587=>522,7588=>300,7589=>307,7590=>300,
-7591=>300,7592=>370,7593=>368,7594=>321,7595=>430,7596=>682,7597=>729,7598=>588,7599=>587,7600=>472,
-7601=>467,7602=>522,7603=>400,7604=>387,7605=>371,7606=>520,7607=>475,7609=>489,7610=>491,7611=>412,
-7612=>527,7613=>412,7614=>452,7615=>467,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>776,7681=>648,7682=>845,7683=>699,7684=>845,7685=>699,7686=>845,7687=>699,7688=>796,7689=>609,
-7690=>867,7691=>699,7692=>867,7693=>699,7694=>867,7695=>699,7696=>867,7697=>699,7698=>867,7699=>699,
-7700=>762,7701=>636,7702=>762,7703=>636,7704=>762,7705=>636,7706=>762,7707=>636,7708=>762,7709=>636,
-7710=>710,7711=>430,7712=>854,7713=>699,7714=>945,7715=>727,7716=>945,7717=>727,7718=>945,7719=>727,
-7720=>945,7721=>727,7722=>945,7723=>727,7724=>468,7725=>380,7728=>869,7729=>693,7730=>869,7731=>693,
-7732=>869,7733=>693,7734=>703,7735=>380,7736=>703,7737=>380,7738=>703,7739=>380,7740=>703,7741=>380,
-7742=>1107,7743=>1058,7744=>1107,7745=>1058,7746=>1107,7747=>1058,7748=>914,7749=>727,7750=>914,7751=>727,
-7752=>914,7753=>727,7754=>914,7755=>727,7756=>871,7757=>667,7760=>871,7761=>667,7762=>871,7763=>667,
-7764=>752,7765=>699,7766=>752,7767=>699,7768=>831,7769=>527,7770=>831,7771=>527,7772=>831,7773=>527,
-7774=>831,7775=>527,7776=>722,7777=>563,7778=>722,7779=>563,7784=>722,7785=>563,7786=>744,7787=>462,
-7788=>744,7789=>462,7790=>744,7791=>462,7792=>744,7793=>462,7794=>872,7795=>727,7796=>872,7797=>727,
-7798=>872,7799=>727,7800=>872,7801=>727,7802=>872,7803=>727,7804=>776,7805=>581,7806=>776,7807=>581,
-7808=>1123,7809=>861,7810=>1123,7811=>861,7812=>1123,7813=>861,7814=>1123,7815=>861,7816=>1123,7817=>861,
-7818=>776,7819=>596,7820=>776,7821=>596,7822=>714,7823=>581,7824=>730,7825=>568,7826=>730,7827=>568,
-7828=>730,7829=>568,7830=>727,7831=>462,7832=>861,7833=>581,7834=>1014,7835=>430,7838=>947,7839=>667,
-7840=>776,7841=>648,7842=>776,7843=>648,7852=>776,7853=>648,7854=>776,7855=>648,7856=>776,7857=>648,
-7858=>776,7859=>648,7860=>776,7861=>648,7862=>776,7863=>648,7864=>762,7865=>636,7866=>762,7867=>636,
-7868=>762,7869=>636,7878=>762,7879=>636,7880=>468,7881=>380,7882=>468,7883=>380,7884=>871,7885=>667,
-7886=>871,7887=>667,7896=>871,7897=>667,7908=>872,7909=>727,7910=>872,7911=>727,7922=>714,7923=>581,
-7924=>714,7925=>581,7926=>714,7927=>581,7928=>714,7929=>581,7936=>770,7937=>770,7938=>770,7939=>770,
-7940=>770,7941=>770,7942=>770,7943=>770,7944=>776,7945=>776,7946=>978,7947=>978,7948=>832,7949=>849,
-7950=>776,7951=>776,7952=>608,7953=>608,7954=>608,7955=>608,7956=>608,7957=>608,7960=>917,7961=>909,
-7962=>1169,7963=>1169,7964=>1093,7965=>1120,7968=>727,7969=>727,7970=>727,7971=>727,7972=>727,7973=>727,
-7974=>727,7975=>727,7976=>1100,7977=>1094,7978=>1358,7979=>1361,7980=>1279,7981=>1308,7982=>1197,7983=>1194,
-7984=>484,7985=>484,7986=>484,7987=>484,7988=>484,7989=>484,7990=>484,7991=>484,7992=>629,7993=>617,
-7994=>878,7995=>881,7996=>799,7997=>831,7998=>723,7999=>714,8000=>667,8001=>667,8002=>667,8003=>667,
-8004=>667,8005=>667,8008=>900,8009=>935,8010=>1240,8011=>1237,8012=>1035,8013=>1066,8016=>694,8017=>694,
-8018=>694,8019=>694,8020=>694,8021=>694,8022=>694,8023=>694,8025=>922,8027=>1186,8029=>1133,8031=>1019,
-8032=>952,8033=>952,8034=>952,8035=>952,8036=>952,8037=>952,8038=>952,8039=>952,8040=>931,8041=>963,
-8042=>1268,8043=>1274,8044=>1054,8045=>1088,8046=>1023,8047=>1060,8048=>770,8049=>770,8050=>608,8051=>608,
-8052=>727,8053=>727,8054=>484,8055=>484,8056=>667,8057=>667,8058=>694,8059=>694,8060=>952,8061=>952,
-8064=>770,8065=>770,8066=>770,8067=>770,8068=>770,8069=>770,8070=>770,8071=>770,8072=>776,8073=>776,
-8074=>978,8075=>978,8076=>832,8077=>849,8078=>776,8079=>776,8080=>727,8081=>727,8082=>727,8083=>727,
-8084=>727,8085=>727,8086=>727,8087=>727,8088=>1100,8089=>1094,8090=>1358,8091=>1361,8092=>1279,8093=>1308,
-8094=>1197,8095=>1194,8096=>952,8097=>952,8098=>952,8099=>952,8100=>952,8101=>952,8102=>952,8103=>952,
-8104=>931,8105=>963,8106=>1268,8107=>1274,8108=>1054,8109=>1088,8110=>1023,8111=>1060,8112=>770,8113=>770,
-8114=>770,8115=>770,8116=>770,8118=>770,8119=>770,8120=>776,8121=>776,8122=>811,8123=>776,8124=>776,
-8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,8130=>727,8131=>727,8132=>727,8134=>727,8135=>727,
-8136=>1000,8137=>947,8138=>1191,8139=>1118,8140=>945,8141=>500,8142=>500,8143=>500,8144=>484,8145=>484,
-8146=>484,8147=>484,8150=>484,8151=>484,8152=>468,8153=>468,8154=>714,8155=>662,8157=>500,8158=>500,
-8159=>500,8160=>694,8161=>694,8162=>694,8163=>694,8164=>665,8165=>665,8166=>694,8167=>694,8168=>714,
-8169=>714,8170=>1019,8171=>953,8172=>910,8173=>500,8174=>500,8175=>500,8178=>952,8179=>952,8180=>952,
-8182=>952,8183=>952,8184=>1069,8185=>887,8186=>1101,8187=>911,8188=>890,8189=>500,8190=>500,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,8198=>167,8199=>696,8200=>348,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>415,8209=>415,8210=>696,8213=>1000,8214=>500,
-8215=>500,8219=>348,8223=>575,8227=>639,8228=>348,8229=>674,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>200,8241=>1820,8242=>264,8243=>447,8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,
-8252=>629,8253=>586,8254=>500,8258=>1023,8260=>167,8261=>473,8262=>473,8263=>1082,8264=>856,8265=>856,
-8267=>636,8268=>500,8269=>500,8270=>523,8271=>369,8273=>523,8274=>556,8275=>1000,8279=>813,8287=>222,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>438,8305=>239,8308=>438,8309=>438,8310=>438,8311=>438,8312=>438,8313=>438,8314=>528,
-8315=>528,8316=>528,8317=>298,8318=>298,8319=>519,8320=>438,8321=>438,8322=>438,8323=>438,8324=>438,
-8325=>438,8326=>438,8327=>438,8328=>438,8329=>438,8330=>528,8331=>528,8332=>528,8333=>298,8334=>298,
-8336=>466,8337=>444,8338=>467,8339=>475,8340=>444,8358=>696,8367=>1155,8369=>790,8372=>876,8373=>696,
-8451=>1198,8457=>1112,8462=>727,8463=>727,8470=>1087,8486=>890,8487=>890,8490=>869,8491=>776,8513=>775,
-8514=>557,8515=>637,8516=>760,8523=>903,8531=>1035,8532=>1035,8533=>1035,8534=>1035,8535=>1035,8536=>1035,
-8537=>1035,8538=>1035,8539=>1035,8540=>1035,8541=>1035,8542=>1035,8543=>615,8544=>468,8545=>736,8546=>1005,
-8547=>1093,8548=>776,8549=>1127,8550=>1396,8551=>1664,8552=>1069,8553=>776,8554=>1078,8555=>1347,8556=>703,
-8557=>796,8558=>867,8559=>1107,8560=>380,8561=>760,8562=>1140,8563=>961,8564=>581,8565=>961,8566=>1341,
-8567=>1721,8568=>976,8569=>596,8570=>976,8571=>1356,8572=>380,8573=>609,8574=>699,8575=>1058,8576=>1255,
-8577=>867,8578=>1268,8579=>796,8580=>609,8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,
-8598=>838,8599=>838,8600=>838,8601=>838,8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,
-8608=>838,8609=>838,8610=>838,8611=>838,8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,
-8618=>838,8619=>838,8620=>838,8621=>838,8622=>838,8623=>850,8624=>838,8625=>838,8626=>838,8627=>838,
-8628=>838,8629=>838,8630=>838,8631=>838,8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,
-8638=>838,8639=>838,8640=>838,8641=>838,8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,
-8648=>838,8649=>838,8650=>838,8651=>838,8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,
-8658=>838,8659=>838,8660=>838,8661=>838,8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,
-8668=>838,8669=>838,8670=>838,8671=>838,8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,
-8678=>838,8679=>838,8680=>838,8681=>838,8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,
-8688=>838,8689=>838,8690=>838,8691=>838,8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,
-8698=>838,8699=>838,8700=>838,8701=>838,8702=>838,8703=>838,8704=>641,8706=>534,8707=>620,8708=>620,
-8710=>753,8711=>753,8712=>740,8713=>740,8715=>740,8716=>740,8719=>842,8720=>842,8721=>753,8722=>838,
-8723=>838,8724=>838,8725=>365,8727=>691,8728=>519,8729=>519,8730=>657,8731=>657,8732=>657,8733=>672,
-8734=>833,8735=>838,8736=>838,8739=>324,8740=>607,8741=>529,8742=>773,8743=>812,8744=>812,8745=>838,
-8746=>838,8747=>579,8748=>1000,8749=>1391,8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,
-8770=>838,8771=>838,8776=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1082,8789=>1082,8800=>838,
-8801=>838,8804=>838,8805=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8844=>838,
-8845=>838,8846=>838,8847=>838,8848=>838,8849=>838,8850=>838,8851=>838,8852=>838,8853=>838,8854=>838,
-8855=>838,8856=>838,8857=>838,8858=>838,8859=>838,8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,
-8865=>838,8866=>884,8867=>884,8868=>960,8869=>960,8870=>616,8871=>616,8872=>884,8873=>884,8874=>884,
-8875=>1080,8876=>884,8877=>884,8878=>884,8879=>1080,8901=>398,8962=>834,8968=>473,8969=>473,8970=>473,
-8971=>473,8976=>838,8977=>539,8984=>928,8985=>838,8992=>579,8993=>579,8997=>1000,9000=>1443,9085=>1008,
-9134=>579,9167=>945,9251=>834,9600=>769,9601=>769,9602=>769,9603=>769,9604=>769,9605=>769,9606=>769,
-9607=>769,9608=>769,9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,9614=>769,9615=>769,9616=>769,
-9617=>769,9618=>769,9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,9624=>769,9625=>769,9626=>769,
-9627=>769,9628=>769,9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,9634=>945,9635=>945,9636=>945,
-9637=>945,9638=>945,9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,9644=>945,9645=>945,9646=>550,
-9647=>550,9648=>769,9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,9654=>769,9655=>769,9656=>502,
-9657=>502,9658=>769,9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,9664=>769,9665=>769,9666=>502,
-9667=>502,9668=>769,9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,9674=>494,9675=>873,9676=>873,
-9677=>873,9678=>873,9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,9684=>873,9685=>873,9686=>527,
-9687=>527,9688=>791,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,9696=>873,
-9697=>873,9698=>769,9699=>769,9700=>769,9701=>769,9702=>590,9703=>945,9704=>945,9705=>945,9706=>945,
-9707=>945,9708=>769,9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,9714=>945,9715=>945,9716=>873,
-9717=>873,9718=>873,9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,9724=>830,9725=>732,9726=>732,
-9727=>769,9728=>896,9784=>896,9785=>896,9786=>896,9787=>896,9788=>896,9791=>614,9792=>731,9793=>731,
-9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,9799=>896,9824=>896,9825=>896,9826=>896,9827=>896,
-9828=>896,9829=>896,9830=>896,9831=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,
-9839=>484,10145=>838,10181=>457,10182=>457,10208=>494,10216=>457,10217=>457,10224=>838,10225=>838,10226=>838,
-10227=>838,10228=>1033,10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,
-10237=>1434,10238=>1434,10239=>1434,10240=>781,10241=>781,10242=>781,10243=>781,10244=>781,10245=>781,10246=>781,
-10247=>781,10248=>781,10249=>781,10250=>781,10251=>781,10252=>781,10253=>781,10254=>781,10255=>781,10256=>781,
-10257=>781,10258=>781,10259=>781,10260=>781,10261=>781,10262=>781,10263=>781,10264=>781,10265=>781,10266=>781,
-10267=>781,10268=>781,10269=>781,10270=>781,10271=>781,10272=>781,10273=>781,10274=>781,10275=>781,10276=>781,
-10277=>781,10278=>781,10279=>781,10280=>781,10281=>781,10282=>781,10283=>781,10284=>781,10285=>781,10286=>781,
-10287=>781,10288=>781,10289=>781,10290=>781,10291=>781,10292=>781,10293=>781,10294=>781,10295=>781,10296=>781,
-10297=>781,10298=>781,10299=>781,10300=>781,10301=>781,10302=>781,10303=>781,10304=>781,10305=>781,10306=>781,
-10307=>781,10308=>781,10309=>781,10310=>781,10311=>781,10312=>781,10313=>781,10314=>781,10315=>781,10316=>781,
-10317=>781,10318=>781,10319=>781,10320=>781,10321=>781,10322=>781,10323=>781,10324=>781,10325=>781,10326=>781,
-10327=>781,10328=>781,10329=>781,10330=>781,10331=>781,10332=>781,10333=>781,10334=>781,10335=>781,10336=>781,
-10337=>781,10338=>781,10339=>781,10340=>781,10341=>781,10342=>781,10343=>781,10344=>781,10345=>781,10346=>781,
-10347=>781,10348=>781,10349=>781,10350=>781,10351=>781,10352=>781,10353=>781,10354=>781,10355=>781,10356=>781,
-10357=>781,10358=>781,10359=>781,10360=>781,10361=>781,10362=>781,10363=>781,10364=>781,10365=>781,10366=>781,
-10367=>781,10368=>781,10369=>781,10370=>781,10371=>781,10372=>781,10373=>781,10374=>781,10375=>781,10376=>781,
-10377=>781,10378=>781,10379=>781,10380=>781,10381=>781,10382=>781,10383=>781,10384=>781,10385=>781,10386=>781,
-10387=>781,10388=>781,10389=>781,10390=>781,10391=>781,10392=>781,10393=>781,10394=>781,10395=>781,10396=>781,
-10397=>781,10398=>781,10399=>781,10400=>781,10401=>781,10402=>781,10403=>781,10404=>781,10405=>781,10406=>781,
-10407=>781,10408=>781,10409=>781,10410=>781,10411=>781,10412=>781,10413=>781,10414=>781,10415=>781,10416=>781,
-10417=>781,10418=>781,10419=>781,10420=>781,10421=>781,10422=>781,10423=>781,10424=>781,10425=>781,10426=>781,
-10427=>781,10428=>781,10429=>781,10430=>781,10431=>781,10432=>781,10433=>781,10434=>781,10435=>781,10436=>781,
-10437=>781,10438=>781,10439=>781,10440=>781,10441=>781,10442=>781,10443=>781,10444=>781,10445=>781,10446=>781,
-10447=>781,10448=>781,10449=>781,10450=>781,10451=>781,10452=>781,10453=>781,10454=>781,10455=>781,10456=>781,
-10457=>781,10458=>781,10459=>781,10460=>781,10461=>781,10462=>781,10463=>781,10464=>781,10465=>781,10466=>781,
-10467=>781,10468=>781,10469=>781,10470=>781,10471=>781,10472=>781,10473=>781,10474=>781,10475=>781,10476=>781,
-10477=>781,10478=>781,10479=>781,10480=>781,10481=>781,10482=>781,10483=>781,10484=>781,10485=>781,10486=>781,
-10487=>781,10488=>781,10489=>781,10490=>781,10491=>781,10492=>781,10493=>781,10494=>781,10495=>781,10496=>838,
-10497=>838,10498=>838,10499=>838,10500=>838,10501=>838,10502=>838,10503=>838,10504=>838,10505=>838,10506=>838,
-10507=>838,10508=>838,10509=>838,10510=>838,10511=>838,10512=>838,10513=>838,10514=>838,10515=>838,10516=>838,
-10517=>838,10518=>838,10519=>838,10520=>838,10521=>838,10522=>838,10523=>838,10524=>838,10525=>838,10526=>838,
-10527=>838,10528=>838,10529=>838,10530=>838,10531=>838,10532=>838,10533=>838,10534=>838,10535=>838,10536=>838,
-10537=>838,10538=>838,10539=>838,10540=>838,10541=>838,10542=>838,10543=>838,10544=>838,10545=>838,10546=>838,
-10547=>838,10548=>838,10549=>838,10550=>838,10551=>838,10552=>838,10553=>838,10554=>838,10555=>838,10556=>838,
-10557=>838,10558=>838,10559=>838,10560=>838,10561=>838,10562=>838,10563=>838,10564=>838,10565=>838,10566=>838,
-10567=>838,10568=>838,10569=>838,10570=>838,10571=>838,10572=>838,10573=>838,10574=>838,10575=>838,10576=>838,
-10577=>838,10578=>838,10579=>838,10580=>838,10581=>838,10582=>838,10583=>838,10584=>838,10585=>838,10586=>838,
-10587=>838,10588=>838,10589=>838,10590=>838,10591=>838,10592=>838,10593=>838,10594=>838,10595=>838,10596=>838,
-10597=>838,10598=>838,10599=>838,10600=>838,10601=>838,10602=>838,10603=>838,10604=>838,10605=>838,10606=>838,
-10607=>838,10608=>838,10609=>838,10610=>838,10611=>838,10612=>838,10613=>838,10614=>838,10615=>1032,10616=>838,
-10617=>838,10618=>960,10619=>838,10620=>838,10621=>838,10622=>838,10623=>838,10731=>494,10764=>1782,10765=>610,
-10766=>610,10799=>838,11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,
-11016=>838,11017=>838,11018=>838,11019=>838,11020=>838,11021=>838,11022=>838,11023=>838,11024=>838,11025=>838,
-11026=>945,11027=>945,11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11364=>831,
-11367=>945,11368=>727,11369=>869,11370=>693,11371=>730,11372=>568,11374=>1107,11375=>776,11381=>779,11382=>601,
-11383=>905,11385=>571,11386=>667,11388=>313,11389=>489,11520=>773,11521=>635,11522=>804,11523=>658,11524=>788,
-11525=>962,11526=>756,11527=>960,11528=>617,11529=>646,11530=>962,11531=>631,11532=>646,11533=>962,11534=>846,
-11535=>866,11536=>961,11537=>645,11538=>645,11539=>959,11540=>945,11541=>863,11542=>644,11543=>646,11544=>645,
-11545=>649,11546=>688,11547=>936,11548=>982,11549=>681,11550=>676,11551=>852,11552=>1113,11553=>632,11554=>645,
-11555=>646,11556=>749,11557=>914,11800=>586,11810=>473,11811=>473,11812=>473,11813=>473,11822=>586,42564=>722,
-42565=>563,42566=>468,42567=>380,42576=>1333,42577=>1092,42580=>1287,42581=>1025,42582=>1287,42583=>1039,42760=>500,
-42761=>500,42762=>500,42763=>500,42764=>500,42765=>500,42766=>500,42767=>500,42768=>500,42769=>500,42770=>500,
-42771=>500,42772=>500,42773=>500,42774=>500,42779=>384,42780=>384,42781=>276,42782=>276,42783=>276,42891=>439,
-42892=>306,62464=>705,62465=>716,62466=>765,62467=>999,62468=>716,62469=>710,62470=>776,62471=>1038,62472=>716,
-62473=>716,62474=>1309,62475=>734,62476=>733,62477=>1004,62478=>716,62479=>733,62480=>1050,62481=>797,62482=>850,
-62483=>799,62484=>996,62485=>732,62486=>987,62487=>731,62488=>739,62489=>733,62490=>780,62491=>733,62492=>739,
-62493=>717,62494=>780,62495=>936,62496=>716,62497=>826,62498=>717,62499=>716,62500=>716,62501=>773,62502=>1013,
-62504=>904,63173=>667,63185=>500,63188=>500,64256=>821,64257=>727,64258=>727,64259=>1120,64260=>1117,64261=>871,
-64262=>971,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,
-65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65529=>0,65530=>0,65531=>0,
-65532=>0,65533=>1113);
-$enc='';
-$diff='';
-$file='dejavuserifb.z';
-$ctg='dejavuserifb.ctg.z';
-$originalsize=306532;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifbi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifbi.php
deleted file mode 100644
index 89c46f4e208..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifbi.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif-BoldItalic';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>-53,'Flags'=>96,'FontBBox'=>'[-906 -389 1760 1235]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>348,33=>439,34=>521,35=>838,36=>696,37=>950,38=>903,39=>306,40=>473,
-41=>473,42=>523,43=>838,44=>348,45=>415,46=>348,47=>365,48=>696,49=>696,50=>696,
-51=>696,52=>696,53=>696,54=>696,55=>696,56=>696,57=>696,58=>369,59=>369,60=>838,
-61=>838,62=>838,63=>586,64=>1000,65=>776,66=>845,67=>796,68=>867,69=>762,70=>710,
-71=>854,72=>945,73=>468,74=>473,75=>869,76=>703,77=>1107,78=>914,79=>871,80=>752,
-81=>871,82=>831,83=>722,84=>744,85=>872,86=>776,87=>1123,88=>776,89=>714,90=>730,
-91=>473,92=>365,93=>473,94=>838,95=>500,96=>500,97=>648,98=>699,99=>609,100=>699,
-101=>636,102=>430,103=>699,104=>727,105=>380,106=>362,107=>693,108=>380,109=>1058,110=>727,
-111=>667,112=>699,113=>699,114=>527,115=>563,116=>462,117=>727,118=>581,119=>861,120=>596,
-121=>581,122=>568,123=>643,124=>364,125=>643,126=>838,8364=>696,8218=>348,402=>430,8222=>575,
-8230=>1000,8224=>523,8225=>523,710=>500,8240=>1385,352=>722,8249=>400,338=>1180,381=>730,8216=>348,
-8217=>348,8220=>575,8221=>575,8226=>639,8211=>500,8212=>1000,732=>500,8482=>1000,353=>563,8250=>400,
-339=>1028,382=>568,376=>714,160=>348,161=>439,162=>696,163=>696,164=>636,165=>696,166=>364,
-167=>523,168=>500,169=>1000,170=>487,171=>625,172=>838,173=>415,174=>1000,175=>500,176=>500,
-177=>838,178=>438,179=>438,180=>500,181=>732,182=>636,183=>348,184=>500,185=>438,186=>500,
-187=>625,188=>1043,189=>1043,190=>1043,191=>586,192=>776,193=>776,194=>776,195=>776,196=>776,
-197=>776,198=>1034,199=>796,200=>762,201=>762,202=>762,203=>762,204=>468,205=>468,206=>468,
-207=>468,208=>874,209=>914,210=>871,211=>871,212=>871,213=>871,214=>871,215=>838,216=>871,
-217=>872,218=>872,219=>872,220=>872,221=>714,222=>757,223=>760,224=>648,225=>648,226=>648,
-227=>648,228=>648,229=>648,230=>932,231=>609,232=>636,233=>636,234=>636,235=>636,236=>380,
-237=>380,238=>380,239=>380,240=>667,241=>727,242=>667,243=>667,244=>667,245=>667,246=>667,
-247=>838,248=>667,249=>727,250=>727,251=>727,252=>727,253=>581,254=>699,255=>581,256=>776,
-257=>648,258=>776,259=>648,260=>776,261=>648,262=>796,263=>609,264=>796,265=>609,266=>796,
-267=>609,268=>796,269=>609,270=>867,271=>699,272=>874,273=>699,274=>762,275=>636,276=>762,
-277=>636,278=>762,279=>636,280=>762,281=>636,282=>762,283=>636,284=>854,285=>699,286=>854,
-287=>699,288=>854,289=>699,290=>854,291=>699,292=>945,293=>727,294=>945,295=>727,296=>468,
-297=>380,298=>468,299=>380,300=>468,301=>380,302=>468,303=>380,304=>468,305=>380,306=>942,
-307=>751,308=>473,309=>362,310=>869,311=>693,312=>693,313=>703,314=>380,315=>703,316=>380,
-317=>703,318=>508,319=>703,320=>557,321=>710,322=>385,323=>914,324=>727,325=>914,326=>727,
-327=>914,328=>727,329=>1008,330=>872,331=>727,332=>871,333=>667,334=>871,335=>667,336=>871,
-337=>667,340=>831,341=>527,342=>831,343=>527,344=>831,345=>527,346=>722,347=>563,348=>722,
-349=>563,350=>722,351=>563,354=>744,355=>462,356=>744,357=>462,358=>744,359=>462,360=>872,
-361=>727,362=>872,363=>727,364=>872,365=>727,366=>872,367=>727,368=>872,369=>727,370=>872,
-371=>727,372=>1123,373=>861,374=>714,375=>581,377=>730,378=>568,379=>730,380=>568,383=>430,
-384=>699,385=>845,386=>854,387=>699,388=>854,389=>699,390=>796,391=>796,392=>609,393=>874,
-394=>867,395=>854,396=>699,397=>667,398=>762,399=>871,400=>721,401=>710,403=>854,404=>771,
-405=>1043,406=>468,407=>468,408=>869,409=>693,410=>380,411=>701,412=>1058,413=>914,414=>727,
-415=>871,416=>871,417=>667,418=>1200,419=>943,420=>752,421=>699,422=>831,423=>722,424=>563,
-425=>707,426=>331,427=>462,428=>744,429=>462,430=>744,431=>872,432=>727,433=>890,434=>890,
-435=>714,436=>699,437=>730,438=>568,439=>657,440=>657,441=>657,443=>696,444=>754,445=>568,
-446=>536,448=>295,449=>492,450=>459,451=>295,452=>1597,453=>1435,454=>1267,455=>1176,456=>1065,
-457=>742,458=>1387,459=>1276,460=>1089,461=>776,462=>648,463=>468,464=>380,465=>871,466=>667,
-467=>872,468=>727,469=>872,470=>727,471=>872,472=>727,473=>872,474=>727,475=>872,476=>727,
-477=>636,478=>776,479=>648,480=>776,481=>648,482=>1034,483=>975,484=>896,485=>699,486=>854,
-487=>699,488=>869,489=>693,490=>871,491=>667,492=>871,493=>667,494=>657,495=>568,496=>362,
-497=>1597,498=>1435,499=>1267,500=>854,501=>699,502=>1221,504=>914,505=>727,506=>776,507=>648,
-508=>1034,509=>932,510=>871,511=>667,512=>776,513=>648,514=>776,515=>648,516=>762,517=>636,
-518=>762,519=>636,520=>468,521=>380,522=>468,523=>380,524=>871,525=>667,526=>871,527=>667,
-528=>831,529=>527,530=>831,531=>527,532=>872,533=>727,534=>872,535=>727,536=>722,537=>563,
-538=>744,539=>462,540=>690,541=>607,542=>945,543=>727,544=>872,545=>791,548=>730,549=>568,
-550=>776,551=>648,552=>762,553=>636,554=>871,555=>667,556=>871,557=>667,558=>871,559=>667,
-560=>871,561=>667,562=>714,563=>581,564=>573,565=>922,566=>564,567=>362,568=>1031,569=>1031,
-570=>776,571=>796,572=>609,573=>703,574=>744,575=>563,576=>568,577=>660,578=>547,581=>776,
-592=>648,593=>699,594=>699,595=>699,596=>609,597=>609,598=>699,599=>730,600=>636,601=>636,
-602=>907,603=>608,604=>562,605=>907,606=>720,607=>387,608=>699,609=>699,610=>626,611=>712,
-612=>627,613=>727,614=>727,615=>727,616=>380,617=>380,618=>380,619=>409,620=>514,621=>380,
-622=>795,623=>1058,624=>1058,625=>1058,626=>727,627=>727,628=>712,629=>667,630=>1061,631=>749,
-632=>667,633=>571,634=>571,635=>571,636=>527,637=>527,638=>452,639=>487,640=>801,641=>801,
-642=>563,643=>331,644=>430,645=>540,646=>331,647=>492,648=>462,649=>727,650=>679,651=>694,
-652=>581,653=>861,654=>635,655=>727,656=>568,657=>568,658=>568,659=>568,660=>536,661=>536,
-662=>536,663=>545,664=>871,665=>695,666=>720,667=>626,668=>732,669=>384,670=>740,671=>646,
-672=>699,673=>536,674=>536,675=>1117,676=>1179,677=>1117,678=>911,679=>715,680=>909,681=>1039,
-682=>790,683=>795,684=>662,685=>443,686=>613,687=>717,688=>521,689=>519,690=>313,691=>414,
-692=>414,693=>480,694=>527,695=>542,696=>366,697=>302,699=>348,700=>348,701=>348,702=>366,
-703=>366,704=>313,705=>313,711=>500,712=>282,713=>500,716=>282,720=>369,721=>369,722=>366,
-723=>366,726=>392,728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>448,737=>292,
-738=>395,739=>375,740=>313,741=>500,742=>500,743=>500,744=>500,745=>500,750=>553,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>779,881=>576,884=>302,
-885=>302,890=>500,891=>609,892=>609,893=>609,894=>369,900=>500,901=>500,902=>776,903=>348,
-904=>947,905=>1136,906=>662,908=>887,910=>953,911=>911,912=>484,913=>776,914=>845,915=>710,
-916=>776,917=>762,918=>730,919=>945,920=>871,921=>468,922=>869,923=>776,924=>1107,925=>914,
-926=>704,927=>871,928=>945,929=>752,931=>707,932=>744,933=>714,934=>871,935=>776,936=>913,
-937=>890,938=>468,939=>714,940=>770,941=>608,942=>727,943=>484,944=>694,945=>770,946=>664,
-947=>660,948=>667,949=>608,950=>592,951=>727,952=>667,953=>484,954=>750,955=>701,956=>732,
-957=>694,958=>592,959=>667,960=>732,961=>665,962=>609,963=>737,964=>673,965=>694,966=>905,
-967=>658,968=>941,969=>952,970=>484,971=>694,972=>667,973=>694,974=>952,976=>667,977=>849,
-978=>764,979=>969,980=>764,981=>941,982=>952,983=>655,984=>871,985=>667,986=>796,987=>609,
-988=>710,989=>527,990=>590,991=>660,992=>796,993=>667,1008=>655,1009=>665,1010=>609,1011=>362,
-1012=>871,1013=>609,1014=>609,1015=>757,1016=>699,1017=>796,1018=>1107,1019=>860,1020=>692,1021=>796,
-1022=>796,1023=>796,1024=>762,1025=>762,1026=>901,1027=>690,1028=>795,1029=>722,1030=>468,1031=>468,
-1032=>473,1033=>1202,1034=>1262,1035=>963,1036=>910,1037=>945,1038=>812,1039=>945,1040=>814,1041=>854,
-1042=>845,1043=>690,1044=>889,1045=>762,1046=>1312,1047=>721,1048=>945,1049=>945,1050=>910,1051=>884,
-1052=>1107,1053=>945,1054=>871,1055=>945,1056=>752,1057=>796,1058=>744,1059=>812,1060=>949,1061=>776,
-1062=>966,1063=>913,1064=>1268,1065=>1293,1066=>957,1067=>1202,1068=>825,1069=>795,1070=>1287,1071=>882,
-1072=>648,1073=>722,1074=>657,1075=>563,1076=>695,1077=>636,1078=>1306,1079=>638,1080=>727,1081=>727,
-1082=>677,1083=>732,1084=>951,1085=>729,1086=>667,1087=>727,1088=>699,1089=>609,1090=>1058,1091=>598,
-1092=>902,1093=>596,1094=>803,1095=>715,1096=>1058,1097=>1134,1098=>727,1099=>1018,1100=>660,1101=>645,
-1102=>1001,1103=>796,1104=>636,1105=>636,1106=>719,1107=>563,1108=>609,1109=>563,1110=>380,1111=>380,
-1112=>362,1113=>1014,1114=>1011,1115=>727,1116=>677,1117=>727,1118=>598,1119=>727,1122=>880,1123=>1050,
-1124=>1195,1125=>963,1130=>1312,1131=>1010,1136=>1096,1137=>1105,1138=>871,1139=>652,1140=>916,1141=>749,
-1164=>846,1165=>673,1168=>700,1169=>618,1170=>690,1171=>563,1172=>854,1173=>705,1174=>1312,1175=>1306,
-1176=>721,1177=>638,1178=>902,1179=>703,1182=>910,1183=>677,1184=>1041,1185=>760,1186=>952,1187=>805,
-1188=>1167,1189=>955,1190=>1324,1191=>1013,1194=>796,1195=>609,1196=>744,1197=>1142,1198=>714,1199=>572,
-1200=>713,1201=>572,1202=>789,1203=>596,1204=>1010,1205=>833,1206=>913,1207=>792,1210=>910,1211=>727,
-1216=>468,1217=>1312,1218=>1306,1219=>869,1220=>693,1223=>945,1224=>732,1227=>984,1228=>732,1231=>380,
-1232=>814,1233=>648,1234=>814,1235=>648,1236=>1034,1237=>975,1238=>762,1239=>636,1240=>871,1241=>636,
-1242=>871,1243=>636,1244=>1312,1245=>1306,1246=>721,1247=>638,1248=>657,1249=>568,1250=>945,1251=>727,
-1252=>945,1253=>727,1254=>871,1255=>667,1256=>871,1257=>667,1258=>871,1259=>667,1260=>795,1261=>645,
-1262=>812,1263=>598,1264=>812,1265=>598,1266=>812,1267=>598,1268=>913,1269=>715,1270=>690,1271=>563,
-1272=>1202,1273=>1018,1296=>721,1297=>638,1298=>884,1299=>732,1300=>1248,1301=>1005,1306=>820,1307=>640,
-1308=>1028,1309=>856,4256=>765,4257=>945,4258=>876,4259=>884,4260=>791,4261=>1087,4262=>1024,4263=>1223,
-4264=>653,4265=>828,4266=>1061,4267=>1061,4268=>806,4269=>1145,4270=>979,4271=>912,4272=>1119,4273=>802,
-4274=>766,4275=>1085,4276=>986,4277=>1076,4278=>820,4279=>843,4280=>831,4281=>843,4282=>918,4283=>1086,
-4284=>779,4285=>832,4286=>822,4287=>1121,4288=>1132,4289=>812,4290=>902,4291=>812,4292=>890,4293=>1073,
-4304=>594,4305=>625,4306=>643,4307=>887,4308=>615,4309=>611,4310=>666,4311=>915,4312=>613,4313=>600,
-4314=>1120,4315=>654,4316=>640,4317=>879,4318=>624,4319=>634,4320=>877,4321=>657,4322=>802,4323=>751,
-4324=>869,4325=>639,4326=>912,4327=>622,4328=>647,4329=>640,4330=>729,4331=>641,4332=>639,4333=>629,
-4334=>674,4335=>737,4336=>625,4337=>657,4338=>625,4339=>625,4340=>624,4341=>670,4342=>940,4343=>680,
-4344=>636,4345=>672,4346=>625,4347=>446,4348=>363,7426=>940,7432=>509,7433=>320,7444=>989,7446=>667,
-7447=>667,7453=>737,7454=>948,7455=>948,7468=>489,7469=>651,7470=>532,7472=>546,7473=>480,7474=>480,
-7475=>538,7476=>595,7477=>294,7478=>298,7479=>547,7480=>443,7481=>697,7482=>576,7483=>576,7484=>548,
-7486=>474,7487=>523,7488=>469,7489=>549,7490=>708,7491=>466,7492=>466,7493=>498,7494=>657,7495=>499,
-7496=>498,7497=>444,7498=>444,7499=>412,7500=>412,7501=>498,7502=>300,7503=>523,7504=>729,7505=>473,
-7506=>467,7507=>427,7508=>467,7509=>467,7510=>499,7511=>371,7512=>520,7513=>434,7514=>729,7515=>491,
-7522=>239,7523=>414,7524=>520,7525=>491,7543=>640,7544=>595,7547=>380,7557=>380,7579=>498,7580=>427,
-7581=>427,7582=>467,7583=>412,7584=>271,7585=>373,7586=>498,7587=>522,7588=>300,7589=>307,7590=>300,
-7591=>300,7592=>370,7593=>368,7594=>321,7595=>430,7596=>682,7597=>729,7598=>588,7599=>587,7600=>472,
-7601=>467,7602=>522,7603=>400,7604=>387,7605=>371,7606=>520,7607=>475,7609=>489,7610=>366,7611=>357,
-7612=>527,7613=>412,7614=>452,7615=>467,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>776,7681=>648,7682=>845,7683=>699,7684=>845,7685=>699,7686=>845,7687=>699,7688=>796,7689=>609,
-7690=>867,7691=>699,7692=>867,7693=>699,7694=>867,7695=>699,7696=>867,7697=>699,7698=>867,7699=>699,
-7700=>762,7701=>636,7702=>762,7703=>636,7704=>762,7705=>636,7706=>762,7707=>636,7708=>762,7709=>636,
-7710=>710,7711=>430,7712=>854,7713=>699,7714=>945,7715=>727,7716=>945,7717=>727,7718=>945,7719=>727,
-7720=>945,7721=>727,7722=>945,7723=>727,7724=>468,7725=>380,7728=>869,7729=>693,7730=>869,7731=>693,
-7732=>869,7733=>693,7734=>703,7735=>380,7736=>703,7737=>380,7738=>703,7739=>380,7740=>703,7741=>380,
-7742=>1107,7743=>1058,7744=>1107,7745=>1058,7746=>1107,7747=>1058,7748=>914,7749=>727,7750=>914,7751=>727,
-7752=>914,7753=>727,7754=>914,7755=>727,7756=>871,7757=>667,7760=>871,7761=>667,7762=>871,7763=>667,
-7764=>752,7765=>699,7766=>752,7767=>699,7768=>831,7769=>527,7770=>831,7771=>527,7772=>831,7773=>527,
-7774=>831,7775=>527,7776=>722,7777=>563,7778=>722,7779=>563,7784=>722,7785=>563,7786=>744,7787=>462,
-7788=>744,7789=>462,7790=>744,7791=>462,7792=>744,7793=>462,7794=>872,7795=>727,7796=>872,7797=>727,
-7798=>872,7799=>727,7800=>872,7801=>727,7802=>872,7803=>727,7804=>776,7805=>581,7806=>776,7807=>581,
-7808=>1123,7809=>861,7810=>1123,7811=>861,7812=>1123,7813=>861,7814=>1123,7815=>861,7816=>1123,7817=>861,
-7818=>776,7819=>596,7820=>776,7821=>596,7822=>714,7823=>581,7824=>730,7825=>568,7826=>730,7827=>568,
-7828=>730,7829=>568,7830=>727,7831=>462,7832=>861,7833=>581,7834=>1014,7835=>430,7838=>947,7839=>667,
-7840=>776,7841=>648,7842=>776,7843=>648,7852=>776,7853=>648,7854=>776,7855=>648,7856=>776,7857=>648,
-7858=>776,7859=>648,7860=>776,7861=>648,7862=>776,7863=>648,7864=>762,7865=>636,7866=>762,7867=>636,
-7868=>762,7869=>636,7878=>762,7879=>636,7880=>468,7881=>380,7882=>468,7883=>380,7884=>871,7885=>667,
-7886=>871,7887=>667,7896=>871,7897=>667,7908=>872,7909=>727,7910=>872,7911=>727,7922=>714,7923=>581,
-7924=>714,7925=>581,7926=>714,7927=>581,7928=>714,7929=>581,7936=>770,7937=>770,7938=>770,7939=>770,
-7940=>770,7941=>770,7942=>770,7943=>770,7944=>776,7945=>776,7946=>978,7947=>978,7948=>832,7949=>849,
-7950=>776,7951=>776,7952=>608,7953=>608,7954=>608,7955=>608,7956=>608,7957=>608,7960=>917,7961=>909,
-7962=>1169,7963=>1169,7964=>1093,7965=>1120,7968=>727,7969=>727,7970=>727,7971=>727,7972=>727,7973=>727,
-7974=>727,7975=>727,7976=>1100,7977=>1094,7978=>1358,7979=>1361,7980=>1279,7981=>1308,7982=>1197,7983=>1194,
-7984=>484,7985=>484,7986=>484,7987=>484,7988=>484,7989=>484,7990=>484,7991=>484,7992=>629,7993=>617,
-7994=>878,7995=>881,7996=>799,7997=>831,7998=>723,7999=>714,8000=>667,8001=>667,8002=>667,8003=>667,
-8004=>667,8005=>667,8008=>900,8009=>935,8010=>1240,8011=>1237,8012=>1035,8013=>1066,8016=>694,8017=>694,
-8018=>694,8019=>694,8020=>694,8021=>694,8022=>694,8023=>694,8025=>922,8027=>1186,8029=>1133,8031=>1019,
-8032=>952,8033=>952,8034=>952,8035=>952,8036=>952,8037=>952,8038=>952,8039=>952,8040=>931,8041=>963,
-8042=>1268,8043=>1274,8044=>1054,8045=>1088,8046=>1023,8047=>1060,8048=>770,8049=>770,8050=>608,8051=>608,
-8052=>727,8053=>727,8054=>484,8055=>484,8056=>667,8057=>667,8058=>694,8059=>694,8060=>952,8061=>952,
-8064=>770,8065=>770,8066=>770,8067=>770,8068=>770,8069=>770,8070=>770,8071=>770,8072=>776,8073=>776,
-8074=>978,8075=>978,8076=>832,8077=>849,8078=>776,8079=>776,8080=>727,8081=>727,8082=>727,8083=>727,
-8084=>727,8085=>727,8086=>727,8087=>727,8088=>1100,8089=>1094,8090=>1358,8091=>1361,8092=>1279,8093=>1308,
-8094=>1197,8095=>1194,8096=>952,8097=>952,8098=>952,8099=>952,8100=>952,8101=>952,8102=>952,8103=>952,
-8104=>931,8105=>963,8106=>1268,8107=>1274,8108=>1054,8109=>1088,8110=>1023,8111=>1060,8112=>770,8113=>770,
-8114=>770,8115=>770,8116=>770,8118=>770,8119=>770,8120=>776,8121=>776,8122=>811,8123=>776,8124=>776,
-8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,8130=>727,8131=>727,8132=>727,8134=>727,8135=>727,
-8136=>1000,8137=>947,8138=>1191,8139=>1118,8140=>945,8141=>500,8142=>500,8143=>500,8144=>484,8145=>484,
-8146=>484,8147=>484,8150=>484,8151=>484,8152=>468,8153=>468,8154=>714,8155=>662,8157=>500,8158=>500,
-8159=>500,8160=>694,8161=>694,8162=>694,8163=>694,8164=>665,8165=>665,8166=>694,8167=>694,8168=>714,
-8169=>714,8170=>1019,8171=>953,8172=>910,8173=>500,8174=>500,8175=>500,8178=>952,8179=>952,8180=>952,
-8182=>952,8183=>952,8184=>1069,8185=>887,8186=>1101,8187=>911,8188=>890,8189=>500,8190=>500,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,8198=>167,8199=>696,8200=>348,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>415,8209=>415,8210=>696,8213=>1000,8214=>500,
-8215=>500,8219=>348,8223=>575,8227=>639,8228=>348,8229=>674,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>200,8241=>1813,8242=>264,8243=>447,8244=>630,8245=>264,8246=>447,8247=>630,8248=>733,
-8252=>629,8253=>586,8254=>500,8258=>1023,8260=>167,8261=>473,8262=>473,8263=>1082,8264=>856,8265=>856,
-8267=>636,8268=>500,8269=>500,8270=>523,8271=>369,8273=>523,8274=>556,8275=>1000,8279=>813,8287=>222,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>438,8305=>239,8308=>438,8309=>438,8310=>438,8311=>438,8312=>438,8313=>438,8314=>528,
-8315=>528,8316=>528,8317=>298,8318=>298,8319=>458,8320=>438,8321=>438,8322=>438,8323=>438,8324=>438,
-8325=>438,8326=>438,8327=>438,8328=>438,8329=>438,8330=>528,8331=>528,8332=>528,8333=>298,8334=>298,
-8336=>466,8337=>444,8338=>467,8339=>375,8340=>444,8358=>696,8367=>1155,8369=>790,8372=>876,8373=>696,
-8451=>1198,8457=>1112,8462=>727,8463=>727,8470=>1087,8486=>890,8487=>890,8490=>869,8491=>776,8513=>786,
-8514=>576,8515=>637,8516=>760,8523=>903,8531=>1035,8532=>1035,8533=>1035,8534=>1035,8535=>1035,8536=>1035,
-8537=>1035,8538=>1035,8539=>1035,8540=>1035,8541=>1035,8542=>1035,8543=>615,8544=>468,8545=>736,8546=>1005,
-8547=>1093,8548=>776,8549=>1127,8550=>1396,8551=>1664,8552=>1069,8553=>776,8554=>1078,8555=>1347,8556=>703,
-8557=>796,8558=>867,8559=>1107,8560=>380,8561=>760,8562=>1140,8563=>961,8564=>581,8565=>961,8566=>1341,
-8567=>1721,8568=>976,8569=>596,8570=>976,8571=>1356,8572=>380,8573=>609,8574=>699,8575=>1058,8576=>1255,
-8577=>867,8578=>1268,8579=>796,8580=>609,8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,
-8598=>838,8599=>838,8600=>838,8601=>838,8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,
-8608=>838,8609=>838,8610=>838,8611=>838,8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,
-8618=>838,8619=>838,8620=>838,8621=>838,8622=>838,8623=>850,8624=>838,8625=>838,8626=>838,8627=>838,
-8628=>838,8629=>838,8630=>838,8631=>838,8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,
-8638=>838,8639=>838,8640=>838,8641=>838,8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,
-8648=>838,8649=>838,8650=>838,8651=>838,8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,
-8658=>838,8659=>838,8660=>838,8661=>838,8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,
-8668=>838,8669=>838,8670=>838,8671=>838,8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,
-8678=>838,8679=>838,8680=>838,8681=>838,8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,
-8688=>838,8689=>838,8690=>838,8691=>838,8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,
-8698=>838,8699=>838,8700=>838,8701=>838,8702=>838,8703=>838,8704=>641,8706=>534,8707=>620,8708=>620,
-8710=>753,8711=>753,8712=>740,8713=>740,8715=>740,8716=>740,8719=>842,8720=>842,8721=>753,8722=>838,
-8723=>838,8724=>838,8725=>365,8727=>691,8728=>519,8729=>519,8730=>657,8731=>657,8732=>657,8733=>672,
-8734=>833,8735=>838,8736=>838,8739=>324,8740=>607,8741=>529,8742=>773,8743=>812,8744=>812,8745=>838,
-8746=>838,8747=>579,8748=>1000,8749=>1391,8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,
-8770=>838,8771=>838,8776=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1082,8789=>1082,8800=>838,
-8801=>838,8804=>838,8805=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8844=>838,
-8845=>838,8846=>838,8847=>838,8848=>838,8849=>838,8850=>838,8851=>838,8852=>838,8853=>838,8854=>838,
-8855=>838,8856=>838,8857=>838,8858=>838,8859=>838,8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,
-8865=>838,8866=>884,8867=>884,8868=>960,8869=>960,8870=>616,8871=>616,8872=>884,8873=>884,8874=>884,
-8875=>1080,8876=>884,8877=>884,8878=>884,8879=>1080,8901=>398,8962=>834,8968=>473,8969=>473,8970=>473,
-8971=>473,8976=>838,8977=>539,8984=>928,8985=>838,8992=>579,8993=>579,8997=>1000,9000=>1443,9085=>1008,
-9134=>579,9167=>945,9251=>834,9600=>769,9601=>769,9602=>769,9603=>769,9604=>769,9605=>769,9606=>769,
-9607=>769,9608=>769,9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,9614=>769,9615=>769,9616=>769,
-9617=>769,9618=>769,9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,9624=>769,9625=>769,9626=>769,
-9627=>769,9628=>769,9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,9634=>945,9635=>945,9636=>945,
-9637=>945,9638=>945,9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,9644=>945,9645=>945,9646=>550,
-9647=>550,9648=>769,9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,9654=>769,9655=>769,9656=>502,
-9657=>502,9658=>769,9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,9664=>769,9665=>769,9666=>502,
-9667=>502,9668=>769,9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,9674=>494,9675=>873,9676=>873,
-9677=>873,9678=>873,9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,9684=>873,9685=>873,9686=>527,
-9687=>527,9688=>791,9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,9696=>873,
-9697=>873,9698=>769,9699=>769,9700=>769,9701=>769,9702=>590,9703=>945,9704=>945,9705=>945,9706=>945,
-9707=>945,9708=>769,9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,9714=>945,9715=>945,9716=>873,
-9717=>873,9718=>873,9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,9724=>830,9725=>732,9726=>732,
-9727=>769,9728=>896,9784=>896,9785=>896,9786=>896,9787=>896,9788=>896,9791=>614,9792=>731,9793=>731,
-9794=>896,9795=>896,9796=>896,9797=>896,9798=>896,9799=>896,9824=>896,9825=>896,9826=>896,9827=>896,
-9828=>896,9829=>896,9830=>896,9831=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,
-9839=>484,10145=>838,10181=>457,10182=>457,10208=>494,10216=>457,10217=>457,10224=>838,10225=>838,10226=>838,
-10227=>838,10228=>1033,10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,
-10237=>1434,10238=>1434,10239=>1434,10240=>781,10241=>781,10242=>781,10243=>781,10244=>781,10245=>781,10246=>781,
-10247=>781,10248=>781,10249=>781,10250=>781,10251=>781,10252=>781,10253=>781,10254=>781,10255=>781,10256=>781,
-10257=>781,10258=>781,10259=>781,10260=>781,10261=>781,10262=>781,10263=>781,10264=>781,10265=>781,10266=>781,
-10267=>781,10268=>781,10269=>781,10270=>781,10271=>781,10272=>781,10273=>781,10274=>781,10275=>781,10276=>781,
-10277=>781,10278=>781,10279=>781,10280=>781,10281=>781,10282=>781,10283=>781,10284=>781,10285=>781,10286=>781,
-10287=>781,10288=>781,10289=>781,10290=>781,10291=>781,10292=>781,10293=>781,10294=>781,10295=>781,10296=>781,
-10297=>781,10298=>781,10299=>781,10300=>781,10301=>781,10302=>781,10303=>781,10304=>781,10305=>781,10306=>781,
-10307=>781,10308=>781,10309=>781,10310=>781,10311=>781,10312=>781,10313=>781,10314=>781,10315=>781,10316=>781,
-10317=>781,10318=>781,10319=>781,10320=>781,10321=>781,10322=>781,10323=>781,10324=>781,10325=>781,10326=>781,
-10327=>781,10328=>781,10329=>781,10330=>781,10331=>781,10332=>781,10333=>781,10334=>781,10335=>781,10336=>781,
-10337=>781,10338=>781,10339=>781,10340=>781,10341=>781,10342=>781,10343=>781,10344=>781,10345=>781,10346=>781,
-10347=>781,10348=>781,10349=>781,10350=>781,10351=>781,10352=>781,10353=>781,10354=>781,10355=>781,10356=>781,
-10357=>781,10358=>781,10359=>781,10360=>781,10361=>781,10362=>781,10363=>781,10364=>781,10365=>781,10366=>781,
-10367=>781,10368=>781,10369=>781,10370=>781,10371=>781,10372=>781,10373=>781,10374=>781,10375=>781,10376=>781,
-10377=>781,10378=>781,10379=>781,10380=>781,10381=>781,10382=>781,10383=>781,10384=>781,10385=>781,10386=>781,
-10387=>781,10388=>781,10389=>781,10390=>781,10391=>781,10392=>781,10393=>781,10394=>781,10395=>781,10396=>781,
-10397=>781,10398=>781,10399=>781,10400=>781,10401=>781,10402=>781,10403=>781,10404=>781,10405=>781,10406=>781,
-10407=>781,10408=>781,10409=>781,10410=>781,10411=>781,10412=>781,10413=>781,10414=>781,10415=>781,10416=>781,
-10417=>781,10418=>781,10419=>781,10420=>781,10421=>781,10422=>781,10423=>781,10424=>781,10425=>781,10426=>781,
-10427=>781,10428=>781,10429=>781,10430=>781,10431=>781,10432=>781,10433=>781,10434=>781,10435=>781,10436=>781,
-10437=>781,10438=>781,10439=>781,10440=>781,10441=>781,10442=>781,10443=>781,10444=>781,10445=>781,10446=>781,
-10447=>781,10448=>781,10449=>781,10450=>781,10451=>781,10452=>781,10453=>781,10454=>781,10455=>781,10456=>781,
-10457=>781,10458=>781,10459=>781,10460=>781,10461=>781,10462=>781,10463=>781,10464=>781,10465=>781,10466=>781,
-10467=>781,10468=>781,10469=>781,10470=>781,10471=>781,10472=>781,10473=>781,10474=>781,10475=>781,10476=>781,
-10477=>781,10478=>781,10479=>781,10480=>781,10481=>781,10482=>781,10483=>781,10484=>781,10485=>781,10486=>781,
-10487=>781,10488=>781,10489=>781,10490=>781,10491=>781,10492=>781,10493=>781,10494=>781,10495=>781,10496=>838,
-10497=>838,10498=>838,10499=>838,10500=>838,10501=>838,10502=>838,10503=>838,10504=>838,10505=>838,10506=>838,
-10507=>838,10508=>838,10509=>838,10510=>838,10511=>838,10512=>838,10513=>838,10514=>838,10515=>838,10516=>838,
-10517=>838,10518=>838,10519=>838,10520=>838,10521=>838,10522=>838,10523=>838,10524=>838,10525=>838,10526=>838,
-10527=>838,10528=>838,10529=>838,10530=>838,10531=>838,10532=>838,10533=>838,10534=>838,10535=>838,10536=>838,
-10537=>838,10538=>838,10539=>838,10540=>838,10541=>838,10542=>838,10543=>838,10544=>838,10545=>838,10546=>838,
-10547=>838,10548=>838,10549=>838,10550=>838,10551=>838,10552=>838,10553=>838,10554=>838,10555=>838,10556=>838,
-10557=>838,10558=>838,10559=>838,10560=>838,10561=>838,10562=>838,10563=>838,10564=>838,10565=>838,10566=>838,
-10567=>838,10568=>838,10569=>838,10570=>838,10571=>838,10572=>838,10573=>838,10574=>838,10575=>838,10576=>838,
-10577=>838,10578=>838,10579=>838,10580=>838,10581=>838,10582=>838,10583=>838,10584=>838,10585=>838,10586=>838,
-10587=>838,10588=>838,10589=>838,10590=>838,10591=>838,10592=>838,10593=>838,10594=>838,10595=>838,10596=>838,
-10597=>838,10598=>838,10599=>838,10600=>838,10601=>838,10602=>838,10603=>838,10604=>838,10605=>838,10606=>838,
-10607=>838,10608=>838,10609=>838,10610=>838,10611=>838,10612=>838,10613=>838,10614=>838,10615=>1032,10616=>838,
-10617=>838,10618=>960,10619=>838,10620=>838,10621=>838,10622=>838,10623=>838,10731=>494,10764=>1782,10765=>610,
-10766=>610,10799=>838,11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,
-11016=>838,11017=>838,11018=>838,11019=>838,11020=>838,11021=>838,11022=>838,11023=>838,11024=>838,11025=>838,
-11026=>945,11027=>945,11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11364=>831,
-11367=>945,11368=>727,11369=>869,11370=>693,11371=>730,11372=>568,11374=>1107,11375=>776,11381=>779,11382=>576,
-11383=>905,11385=>571,11386=>667,11388=>313,11389=>489,11520=>773,11521=>635,11522=>804,11523=>658,11524=>788,
-11525=>962,11526=>756,11527=>960,11528=>617,11529=>646,11530=>962,11531=>631,11532=>646,11533=>962,11534=>846,
-11535=>866,11536=>961,11537=>645,11538=>645,11539=>959,11540=>945,11541=>863,11542=>644,11543=>646,11544=>645,
-11545=>649,11546=>688,11547=>936,11548=>982,11549=>681,11550=>676,11551=>852,11552=>1113,11553=>632,11554=>645,
-11555=>646,11556=>749,11557=>914,11800=>586,11810=>473,11811=>473,11812=>473,11813=>473,11822=>586,42564=>722,
-42565=>563,42566=>468,42567=>380,42576=>1333,42577=>1085,42580=>1287,42581=>1025,42582=>1287,42583=>1029,42760=>500,
-42761=>500,42762=>500,42763=>500,42764=>500,42765=>500,42766=>500,42767=>500,42768=>500,42769=>500,42770=>500,
-42771=>500,42772=>500,42773=>500,42774=>500,42779=>384,42780=>384,42781=>276,42782=>276,42783=>276,42891=>439,
-42892=>306,62464=>726,62465=>737,62466=>786,62467=>1019,62468=>737,62469=>731,62470=>796,62471=>1058,62472=>737,
-62473=>737,62474=>1329,62475=>754,62476=>753,62477=>1024,62478=>737,62479=>753,62480=>1070,62481=>818,62482=>870,
-62483=>819,62484=>1016,62485=>753,62486=>1008,62487=>752,62488=>760,62489=>753,62490=>800,62491=>753,62492=>760,
-62493=>738,62494=>801,62495=>956,62496=>736,62497=>847,62498=>737,62499=>737,62500=>737,62501=>793,62502=>1033,
-62504=>904,63172=>563,63173=>667,63174=>699,63175=>727,63176=>1058,63185=>500,63188=>500,64256=>827,64257=>727,
-64258=>727,64259=>1108,64260=>1146,64261=>879,64262=>971,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,
-65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,
-65039=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1113);
-$enc='';
-$diff='';
-$file='dejavuserifbi.z';
-$ctg='dejavuserifbi.ctg.z';
-$originalsize=294244;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensed.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensed.php
deleted file mode 100644
index 669b0bd348d..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensed.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>5,'Flags'=>32,'FontBBox'=>'[-692 -347 1511 1242]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>361,34=>414,35=>754,36=>572,37=>855,38=>801,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>304,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>482,64=>900,65=>650,66=>661,67=>688,68=>721,69=>657,70=>624,
-71=>719,72=>785,73=>355,74=>360,75=>672,76=>598,77=>921,78=>787,79=>738,80=>605,
-81=>738,82=>677,83=>616,84=>600,85=>758,86=>650,87=>925,88=>641,89=>594,90=>625,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>536,98=>576,99=>504,100=>576,
-101=>532,102=>333,103=>576,104=>580,105=>288,106=>279,107=>545,108=>288,109=>853,110=>580,
-111=>542,112=>576,113=>576,114=>430,115=>461,116=>361,117=>580,118=>508,119=>770,120=>507,
-121=>508,122=>474,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>333,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1208,352=>616,8249=>360,338=>1023,381=>625,8216=>286,
-8217=>286,8220=>460,8221=>460,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>461,8250=>360,
-339=>890,382=>474,376=>594,160=>286,161=>361,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>427,171=>550,172=>754,173=>304,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>584,182=>572,183=>286,184=>450,185=>360,186=>423,
-187=>550,188=>872,189=>872,190=>872,191=>482,192=>650,193=>650,194=>650,195=>650,196=>650,
-197=>650,198=>901,199=>688,200=>657,201=>657,202=>657,203=>657,204=>355,205=>355,206=>355,
-207=>355,208=>726,209=>787,210=>738,211=>738,212=>738,213=>738,214=>738,215=>754,216=>738,
-217=>758,218=>758,219=>758,220=>758,221=>594,222=>608,223=>601,224=>536,225=>536,226=>536,
-227=>536,228=>536,229=>536,230=>846,231=>504,232=>532,233=>532,234=>532,235=>532,236=>288,
-237=>288,238=>288,239=>288,240=>542,241=>580,242=>542,243=>542,244=>542,245=>542,246=>542,
-247=>754,248=>542,249=>580,250=>580,251=>580,252=>580,253=>508,254=>576,255=>508,256=>650,
-257=>536,258=>650,259=>536,260=>650,261=>536,262=>688,263=>504,264=>688,265=>504,266=>688,
-267=>504,268=>688,269=>504,270=>721,271=>576,272=>726,273=>576,274=>657,275=>532,276=>657,
-277=>532,278=>657,279=>532,280=>657,281=>532,282=>657,283=>532,284=>719,285=>576,286=>719,
-287=>576,288=>719,289=>576,290=>719,291=>576,292=>785,293=>580,294=>785,295=>580,296=>355,
-297=>288,298=>355,299=>288,300=>355,301=>288,302=>355,303=>288,304=>355,305=>288,306=>721,
-307=>479,308=>360,309=>279,310=>672,311=>545,312=>545,313=>598,314=>288,315=>598,316=>288,
-317=>598,318=>288,319=>598,320=>288,321=>602,322=>292,323=>787,324=>580,325=>787,326=>580,
-327=>787,328=>580,329=>779,330=>758,331=>580,332=>738,333=>542,334=>738,335=>542,336=>738,
-337=>542,340=>677,341=>430,342=>677,343=>430,344=>677,345=>430,346=>616,347=>461,348=>616,
-349=>461,350=>616,351=>461,354=>600,355=>361,356=>600,357=>361,358=>600,359=>361,360=>758,
-361=>580,362=>758,363=>580,364=>758,365=>580,366=>758,367=>580,368=>758,369=>580,370=>758,
-371=>580,372=>925,373=>770,374=>594,375=>508,377=>625,378=>474,379=>625,380=>474,383=>333,
-384=>576,385=>661,386=>661,387=>576,388=>661,389=>576,390=>688,391=>688,392=>504,393=>726,
-394=>721,395=>661,396=>576,397=>542,398=>657,399=>738,400=>561,401=>624,403=>719,404=>641,
-405=>839,406=>355,407=>355,408=>672,409=>545,410=>288,411=>570,412=>853,413=>787,414=>580,
-415=>738,416=>738,417=>542,418=>936,419=>726,420=>605,421=>576,422=>677,423=>616,424=>461,
-425=>636,426=>292,427=>361,428=>600,429=>361,430=>600,431=>758,432=>580,433=>746,434=>684,
-435=>664,436=>596,437=>625,438=>474,439=>508,440=>508,441=>508,443=>572,444=>618,445=>508,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1347,453=>1195,454=>1050,455=>958,456=>876,
-457=>567,458=>1148,459=>1066,460=>858,461=>650,462=>536,463=>355,464=>288,465=>738,466=>542,
-467=>758,468=>580,469=>758,470=>580,471=>758,472=>580,473=>758,474=>580,475=>758,476=>580,
-477=>532,478=>650,479=>536,480=>650,481=>536,482=>901,483=>846,484=>763,485=>576,486=>719,
-487=>576,488=>672,489=>545,490=>738,491=>542,492=>738,493=>542,494=>508,495=>508,496=>288,
-497=>1347,498=>1195,499=>1050,500=>719,501=>576,502=>1038,504=>787,505=>580,506=>650,507=>536,
-508=>901,509=>846,510=>738,511=>542,512=>650,513=>536,514=>650,515=>536,516=>657,517=>532,
-518=>657,519=>532,520=>355,521=>288,522=>355,523=>288,524=>738,525=>542,526=>738,527=>542,
-528=>677,529=>430,530=>677,531=>430,532=>758,533=>580,534=>758,535=>580,536=>616,537=>461,
-538=>600,539=>361,540=>564,541=>469,542=>785,543=>580,544=>758,545=>732,548=>625,549=>474,
-550=>650,551=>536,552=>657,553=>532,554=>738,555=>542,556=>738,557=>542,558=>738,559=>542,
-560=>738,561=>542,562=>594,563=>508,564=>450,565=>748,566=>444,567=>279,568=>864,569=>864,
-570=>650,571=>688,572=>504,573=>598,574=>600,575=>461,576=>474,577=>525,578=>417,581=>650,
-592=>536,593=>576,594=>576,595=>576,596=>504,597=>504,598=>582,599=>614,600=>532,601=>532,
-602=>759,603=>466,604=>458,605=>695,606=>552,607=>283,608=>615,609=>576,610=>489,611=>641,
-612=>507,613=>580,614=>580,615=>580,616=>288,617=>353,618=>288,619=>342,620=>409,621=>326,
-622=>633,623=>853,624=>853,625=>853,626=>579,627=>624,628=>581,629=>542,630=>711,631=>583,
-632=>542,633=>451,634=>451,635=>496,636=>430,637=>430,638=>407,639=>407,640=>534,641=>534,
-642=>461,643=>244,644=>333,645=>438,646=>292,647=>361,648=>361,649=>580,650=>558,651=>547,
-652=>508,653=>770,654=>508,655=>589,656=>537,657=>504,658=>508,659=>504,660=>482,661=>482,
-662=>482,663=>461,664=>738,665=>506,666=>552,667=>588,668=>600,669=>329,670=>545,671=>581,
-672=>615,673=>482,674=>482,675=>896,676=>930,677=>898,678=>728,679=>538,680=>704,681=>804,
-682=>582,683=>608,684=>538,685=>398,686=>703,687=>690,688=>389,689=>387,690=>237,691=>312,
-692=>312,693=>387,694=>352,695=>527,696=>381,697=>250,699=>286,700=>286,701=>286,702=>276,
-703=>276,704=>252,705=>252,711=>450,712=>247,713=>450,716=>247,720=>303,721=>303,722=>276,
-723=>276,726=>295,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>402,737=>218,
-738=>303,739=>381,740=>252,741=>444,742=>444,743=>444,744=>444,745=>444,750=>435,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>666,881=>478,884=>250,
-885=>250,890=>450,891=>504,892=>504,893=>504,894=>303,900=>450,901=>450,902=>650,903=>286,
-904=>810,905=>935,906=>505,908=>751,910=>808,911=>767,912=>353,913=>650,914=>661,915=>624,
-916=>650,917=>657,918=>625,919=>785,920=>738,921=>355,922=>672,923=>650,924=>921,925=>787,
-926=>633,927=>738,928=>785,929=>605,931=>636,932=>600,933=>594,934=>738,935=>641,936=>789,
-937=>746,938=>355,939=>594,940=>607,941=>466,942=>539,943=>353,944=>547,945=>607,946=>520,
-947=>538,948=>542,949=>466,950=>488,951=>539,952=>542,953=>353,954=>563,955=>570,956=>584,
-957=>547,958=>496,959=>542,960=>591,961=>529,962=>504,963=>614,964=>498,965=>547,966=>630,
-967=>545,968=>706,969=>734,970=>353,971=>547,972=>542,973=>547,974=>734,976=>524,977=>643,
-978=>618,979=>787,980=>618,981=>613,982=>734,983=>561,984=>738,985=>542,986=>688,987=>504,
-988=>624,989=>417,990=>531,991=>593,992=>704,993=>519,1008=>561,1009=>529,1010=>504,1011=>279,
-1012=>738,1013=>504,1014=>504,1015=>608,1016=>576,1017=>688,1018=>921,1019=>637,1020=>529,1021=>688,
-1022=>688,1023=>688,1024=>657,1025=>657,1026=>719,1027=>596,1028=>688,1029=>616,1030=>355,1031=>355,
-1032=>360,1033=>976,1034=>1006,1035=>785,1036=>696,1037=>785,1038=>650,1039=>785,1040=>681,1041=>661,
-1042=>661,1043=>596,1044=>731,1045=>657,1046=>1011,1047=>561,1048=>785,1049=>785,1050=>696,1051=>751,
-1052=>921,1053=>785,1054=>738,1055=>785,1056=>605,1057=>688,1058=>600,1059=>650,1060=>747,1061=>641,
-1062=>785,1063=>695,1064=>1027,1065=>1027,1066=>715,1067=>885,1068=>606,1069=>688,1070=>1074,1071=>727,
-1072=>536,1073=>542,1074=>506,1075=>471,1076=>554,1077=>532,1078=>828,1079=>491,1080=>600,1081=>600,
-1082=>563,1083=>571,1084=>700,1085=>600,1086=>542,1087=>600,1088=>576,1089=>504,1090=>498,1091=>529,
-1092=>704,1093=>507,1094=>579,1095=>595,1096=>836,1097=>836,1098=>572,1099=>716,1100=>490,1101=>504,
-1102=>783,1103=>567,1104=>532,1105=>532,1106=>561,1107=>471,1108=>504,1109=>461,1110=>288,1111=>288,
-1112=>279,1113=>759,1114=>774,1115=>580,1116=>563,1117=>600,1118=>529,1119=>590,1122=>686,1123=>542,
-1124=>1016,1125=>750,1130=>1011,1131=>828,1136=>849,1137=>812,1138=>738,1139=>497,1140=>773,1141=>610,
-1164=>636,1165=>490,1168=>604,1169=>476,1170=>596,1171=>471,1172=>655,1173=>552,1174=>1011,1175=>828,
-1176=>572,1177=>483,1178=>696,1179=>545,1182=>696,1183=>563,1184=>801,1185=>645,1186=>785,1187=>577,
-1188=>1025,1189=>767,1190=>1084,1191=>847,1194=>688,1195=>504,1196=>600,1197=>498,1198=>594,1199=>508,
-1200=>594,1201=>508,1202=>641,1203=>507,1204=>856,1205=>659,1206=>674,1207=>621,1210=>674,1211=>580,
-1216=>355,1217=>1011,1218=>828,1219=>672,1220=>545,1223=>785,1224=>600,1227=>674,1228=>600,1231=>288,
-1232=>681,1233=>536,1234=>681,1235=>536,1236=>901,1237=>846,1238=>657,1239=>532,1240=>738,1241=>532,
-1242=>738,1243=>532,1244=>1011,1245=>828,1246=>561,1247=>491,1248=>508,1249=>508,1250=>785,1251=>600,
-1252=>785,1253=>600,1254=>738,1255=>542,1256=>738,1257=>542,1258=>738,1259=>542,1260=>688,1261=>504,
-1262=>650,1263=>529,1264=>650,1265=>529,1266=>650,1267=>529,1268=>695,1269=>595,1270=>596,1271=>471,
-1272=>885,1273=>716,1296=>561,1297=>491,1298=>751,1299=>571,1300=>1078,1301=>827,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>650,4257=>765,4258=>745,4259=>773,4260=>659,4261=>883,4262=>824,4263=>991,
-4264=>510,4265=>675,4266=>866,4267=>847,4268=>668,4269=>967,4270=>807,4271=>746,4272=>936,4273=>660,
-4274=>602,4275=>914,4276=>843,4277=>917,4278=>658,4279=>659,4280=>659,4281=>660,4282=>791,4283=>843,
-4284=>642,4285=>679,4286=>660,4287=>862,4288=>900,4289=>632,4290=>777,4291=>660,4292=>753,4293=>855,
-4304=>486,4305=>514,4306=>530,4307=>750,4308=>505,4309=>501,4310=>556,4311=>774,4312=>503,4313=>491,
-4314=>959,4315=>527,4316=>527,4317=>743,4318=>513,4319=>522,4320=>741,4321=>546,4322=>673,4323=>628,
-4324=>733,4325=>526,4326=>772,4327=>511,4328=>534,4329=>527,4330=>607,4331=>528,4332=>523,4333=>518,
-4334=>550,4335=>615,4336=>514,4337=>542,4338=>514,4339=>514,4340=>513,4341=>584,4342=>797,4343=>563,
-4344=>523,4345=>557,4346=>514,4347=>393,4348=>318,7426=>846,7432=>458,7433=>288,7444=>890,7446=>542,
-7447=>542,7453=>663,7454=>853,7455=>853,7468=>409,7469=>567,7470=>417,7472=>454,7473=>413,7474=>413,
-7475=>453,7476=>494,7477=>224,7478=>227,7479=>423,7480=>376,7481=>580,7482=>496,7483=>496,7484=>464,
-7486=>381,7487=>426,7488=>378,7489=>478,7490=>583,7491=>347,7492=>347,7493=>360,7494=>556,7495=>360,
-7496=>360,7497=>348,7498=>348,7499=>306,7500=>306,7501=>360,7502=>157,7503=>328,7504=>552,7505=>359,
-7506=>347,7507=>312,7508=>347,7509=>347,7510=>360,7511=>222,7512=>359,7513=>417,7514=>552,7515=>335,
-7522=>181,7523=>312,7524=>359,7525=>335,7543=>576,7544=>494,7547=>334,7557=>288,7579=>360,7580=>312,
-7581=>312,7582=>347,7583=>306,7584=>199,7585=>206,7586=>360,7587=>359,7588=>210,7589=>219,7590=>210,
-7591=>210,7592=>207,7593=>158,7594=>157,7595=>330,7596=>552,7597=>552,7598=>366,7599=>364,7600=>359,
-7601=>347,7602=>347,7603=>295,7604=>190,7605=>222,7606=>359,7607=>350,7609=>338,7610=>335,7611=>297,
-7612=>297,7613=>297,7614=>327,7615=>347,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>650,7681=>536,7682=>661,7683=>576,7684=>661,7685=>576,7686=>661,7687=>576,7688=>688,7689=>504,
-7690=>721,7691=>576,7692=>721,7693=>576,7694=>721,7695=>576,7696=>721,7697=>576,7698=>721,7699=>576,
-7700=>657,7701=>532,7702=>657,7703=>532,7704=>657,7705=>532,7706=>657,7707=>532,7708=>657,7709=>532,
-7710=>624,7711=>333,7712=>719,7713=>576,7714=>785,7715=>580,7716=>785,7717=>580,7718=>785,7719=>580,
-7720=>785,7721=>580,7722=>785,7723=>580,7724=>355,7725=>288,7728=>672,7729=>545,7730=>672,7731=>545,
-7732=>672,7733=>545,7734=>598,7735=>288,7736=>598,7737=>288,7738=>598,7739=>288,7740=>598,7741=>288,
-7742=>921,7743=>853,7744=>921,7745=>853,7746=>921,7747=>853,7748=>787,7749=>580,7750=>787,7751=>580,
-7752=>787,7753=>580,7754=>787,7755=>580,7756=>738,7757=>542,7760=>738,7761=>542,7762=>738,7763=>542,
-7764=>605,7765=>576,7766=>605,7767=>576,7768=>677,7769=>430,7770=>677,7771=>430,7772=>677,7773=>430,
-7774=>677,7775=>430,7776=>616,7777=>461,7778=>616,7779=>461,7784=>616,7785=>461,7786=>600,7787=>361,
-7788=>600,7789=>361,7790=>600,7791=>361,7792=>600,7793=>361,7794=>758,7795=>580,7796=>758,7797=>580,
-7798=>758,7799=>580,7800=>758,7801=>580,7802=>758,7803=>580,7804=>650,7805=>508,7806=>650,7807=>508,
-7808=>925,7809=>770,7810=>925,7811=>770,7812=>925,7813=>770,7814=>925,7815=>770,7816=>925,7817=>770,
-7818=>641,7819=>507,7820=>641,7821=>507,7822=>594,7823=>508,7824=>625,7825=>474,7826=>625,7827=>474,
-7828=>625,7829=>474,7830=>580,7831=>361,7832=>770,7833=>508,7834=>813,7835=>333,7838=>746,7839=>542,
-7840=>650,7841=>536,7842=>650,7843=>536,7852=>650,7853=>536,7854=>650,7855=>536,7856=>650,7857=>536,
-7858=>650,7859=>536,7860=>650,7861=>536,7862=>650,7863=>536,7864=>657,7865=>532,7866=>657,7867=>532,
-7868=>657,7869=>532,7878=>657,7879=>532,7880=>355,7881=>288,7882=>355,7883=>288,7884=>738,7885=>542,
-7886=>738,7887=>542,7896=>738,7897=>542,7908=>758,7909=>580,7910=>758,7911=>580,7922=>594,7923=>508,
-7924=>594,7925=>508,7926=>594,7927=>508,7928=>594,7929=>508,7936=>607,7937=>607,7938=>607,7939=>607,
-7940=>607,7941=>607,7942=>607,7943=>607,7944=>650,7945=>650,7946=>782,7947=>782,7948=>660,7949=>687,
-7950=>650,7951=>650,7952=>483,7953=>483,7954=>483,7955=>483,7956=>483,7957=>483,7960=>768,7961=>757,
-7962=>960,7963=>969,7964=>907,7965=>931,7968=>539,7969=>539,7970=>539,7971=>539,7972=>539,7973=>539,
-7974=>539,7975=>539,7976=>898,7977=>893,7978=>1090,7979=>1101,7980=>1043,7981=>1064,7982=>988,7983=>985,
-7984=>353,7985=>353,7986=>353,7987=>353,7988=>353,7989=>353,7990=>353,7991=>353,7992=>469,7993=>461,
-7994=>661,7995=>664,7996=>611,7997=>635,7998=>561,7999=>553,8000=>542,8001=>542,8002=>542,8003=>542,
-8004=>542,8005=>542,8008=>738,8009=>773,8010=>1008,8011=>1015,8012=>843,8013=>867,8016=>547,8017=>547,
-8018=>547,8019=>547,8020=>547,8021=>547,8022=>547,8023=>547,8025=>765,8027=>971,8029=>939,8031=>857,
-8032=>734,8033=>734,8034=>734,8035=>734,8036=>734,8037=>734,8038=>734,8039=>734,8040=>746,8041=>783,
-8042=>1018,8043=>1023,8044=>852,8045=>878,8046=>844,8047=>873,8048=>607,8049=>607,8050=>483,8051=>483,
-8052=>539,8053=>539,8054=>353,8055=>353,8056=>542,8057=>542,8058=>547,8059=>547,8060=>734,8061=>734,
-8064=>607,8065=>607,8066=>607,8067=>607,8068=>607,8069=>607,8070=>607,8071=>607,8072=>650,8073=>650,
-8074=>782,8075=>782,8076=>660,8077=>687,8078=>650,8079=>650,8080=>539,8081=>539,8082=>539,8083=>539,
-8084=>539,8085=>539,8086=>539,8087=>539,8088=>898,8089=>893,8090=>1090,8091=>1101,8092=>1043,8093=>1064,
-8094=>988,8095=>985,8096=>734,8097=>734,8098=>734,8099=>734,8100=>734,8101=>734,8102=>734,8103=>734,
-8104=>746,8105=>783,8106=>1018,8107=>1023,8108=>852,8109=>878,8110=>844,8111=>873,8112=>607,8113=>607,
-8114=>607,8115=>607,8116=>607,8118=>607,8119=>607,8120=>650,8121=>650,8122=>650,8123=>650,8124=>650,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>539,8131=>539,8132=>539,8134=>539,8135=>539,
-8136=>820,8137=>810,8138=>956,8139=>935,8140=>785,8141=>450,8142=>450,8143=>450,8144=>353,8145=>353,
-8146=>353,8147=>353,8150=>353,8151=>353,8152=>355,8153=>355,8154=>529,8155=>505,8157=>450,8158=>450,
-8159=>450,8160=>547,8161=>547,8162=>547,8163=>547,8164=>529,8165=>529,8166=>547,8167=>547,8168=>594,
-8169=>594,8170=>829,8171=>808,8172=>711,8173=>450,8174=>450,8175=>450,8178=>734,8179=>734,8180=>734,
-8182=>734,8183=>734,8184=>865,8185=>751,8186=>886,8187=>767,8188=>746,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>304,8209=>304,8210=>572,8213=>900,8214=>450,
-8215=>450,8219=>286,8223=>460,8227=>531,8228=>300,8229=>600,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1560,8242=>204,8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,
-8252=>475,8253=>482,8254=>450,8258=>900,8260=>150,8261=>351,8262=>351,8263=>878,8264=>678,8265=>678,
-8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8273=>450,8274=>404,8275=>900,8279=>597,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>360,8305=>181,8308=>360,8309=>360,8310=>360,8311=>360,8312=>360,8313=>360,8314=>475,
-8315=>475,8316=>475,8317=>221,8318=>221,8319=>389,8320=>360,8321=>360,8322=>360,8323=>360,8324=>360,
-8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,8330=>475,8331=>475,8332=>475,8333=>221,8334=>221,
-8336=>347,8337=>348,8338=>347,8339=>381,8340=>348,8358=>594,8367=>951,8369=>635,8372=>702,8373=>572,
-8450=>716,8451=>1006,8457=>942,8461=>850,8462=>580,8463=>580,8469=>822,8470=>852,8473=>677,8474=>784,
-8477=>748,8484=>657,8486=>746,8487=>746,8490=>672,8491=>650,8508=>659,8509=>594,8510=>639,8511=>850,
-8512=>642,8513=>697,8514=>501,8515=>501,8516=>549,8517=>780,8518=>629,8519=>572,8520=>342,8521=>325,
-8523=>801,8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,8537=>872,8538=>872,8539=>872,
-8540=>872,8541=>872,8542=>872,8543=>511,8544=>355,8545=>531,8546=>707,8547=>870,8548=>650,8549=>883,
-8550=>1059,8551=>1234,8552=>838,8553=>641,8554=>839,8555=>1015,8556=>598,8557=>688,8558=>721,8559=>921,
-8560=>288,8561=>576,8562=>863,8563=>796,8564=>508,8565=>796,8566=>1084,8567=>1372,8568=>795,8569=>507,
-8570=>795,8571=>1083,8572=>288,8573=>504,8574=>576,8575=>853,8576=>1085,8577=>721,8578=>1085,8579=>688,
-8580=>504,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,8598=>754,8599=>754,8600=>754,
-8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,8608=>754,8609=>754,8610=>754,
-8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,8618=>754,8619=>754,8620=>754,
-8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,8628=>754,8629=>754,8630=>754,
-8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,8638=>754,8639=>754,8640=>754,
-8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,8648=>754,8649=>754,8650=>754,
-8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,8658=>754,8659=>754,8660=>754,
-8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,8668=>754,8669=>754,8670=>754,
-8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,8678=>754,8679=>754,8680=>754,
-8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,8688=>754,8689=>754,8690=>754,
-8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,8698=>754,8699=>754,8700=>754,
-8701=>754,8702=>754,8703=>754,8704=>543,8706=>465,8707=>488,8708=>488,8710=>628,8711=>628,8712=>666,
-8713=>666,8715=>666,8716=>666,8719=>716,8720=>716,8721=>642,8722=>754,8723=>754,8724=>754,8725=>303,
-8727=>611,8728=>441,8729=>441,8730=>573,8731=>573,8732=>573,8733=>609,8734=>750,8735=>754,8736=>754,
-8739=>262,8740=>431,8741=>416,8742=>570,8743=>659,8744=>659,8745=>754,8746=>754,8747=>469,8748=>766,
-8749=>1063,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,8770=>754,8771=>754,8776=>754,
-8784=>754,8785=>754,8786=>754,8787=>754,8788=>930,8789=>930,8800=>754,8801=>754,8804=>754,8805=>754,
-8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,8845=>754,8846=>754,8847=>761,
-8848=>761,8849=>761,8850=>761,8851=>754,8852=>754,8853=>754,8854=>754,8855=>754,8856=>754,8857=>754,
-8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,8865=>754,8866=>773,8867=>773,
-8868=>846,8869=>846,8870=>510,8871=>510,8872=>773,8873=>773,8874=>773,8875=>927,8876=>773,8877=>773,
-8878=>773,8879=>927,8901=>308,8962=>687,8968=>351,8969=>351,8970=>351,8971=>351,8976=>754,8977=>461,
-8984=>900,8985=>754,8992=>469,8993=>469,8997=>900,9000=>1299,9085=>827,9134=>469,9167=>850,9251=>687,
-9472=>542,9473=>542,9474=>542,9475=>542,9476=>542,9477=>542,9478=>542,9479=>542,9480=>542,9481=>542,
-9482=>542,9483=>542,9484=>542,9485=>542,9486=>542,9487=>542,9488=>542,9489=>542,9490=>542,9491=>542,
-9492=>542,9493=>542,9494=>542,9495=>542,9496=>542,9497=>542,9498=>542,9499=>542,9500=>542,9501=>542,
-9502=>542,9503=>542,9504=>542,9505=>542,9506=>542,9507=>542,9508=>542,9509=>542,9510=>542,9511=>542,
-9512=>542,9513=>542,9514=>542,9515=>542,9516=>542,9517=>542,9518=>542,9519=>542,9520=>542,9521=>542,
-9522=>542,9523=>542,9524=>542,9525=>542,9526=>542,9527=>542,9528=>542,9529=>542,9530=>542,9531=>542,
-9532=>542,9533=>542,9534=>542,9535=>542,9536=>542,9537=>542,9538=>542,9539=>542,9540=>542,9541=>542,
-9542=>542,9543=>542,9544=>542,9545=>542,9546=>542,9547=>542,9548=>542,9549=>542,9550=>542,9551=>542,
-9552=>542,9553=>542,9554=>542,9555=>542,9556=>542,9557=>542,9558=>542,9559=>542,9560=>542,9561=>542,
-9562=>542,9563=>542,9564=>542,9565=>542,9566=>542,9567=>542,9568=>542,9569=>542,9570=>542,9571=>542,
-9572=>542,9573=>542,9574=>542,9575=>542,9576=>542,9577=>542,9578=>542,9579=>542,9580=>542,9581=>542,
-9582=>542,9583=>542,9584=>542,9585=>542,9586=>542,9587=>542,9588=>542,9589=>542,9590=>542,9591=>542,
-9592=>542,9593=>542,9594=>542,9595=>542,9596=>542,9597=>542,9598=>542,9599=>542,9600=>692,9601=>692,
-9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,
-9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,
-9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,
-9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,
-9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,
-9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,
-9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,
-9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,
-9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,
-9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,9697=>785,9698=>692,9699=>692,9700=>692,9701=>692,
-9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,
-9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,
-9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,9727=>692,9728=>807,9784=>807,9785=>807,9786=>807,
-9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,
-9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,9828=>807,9829=>807,9830=>807,9831=>807,9833=>424,
-9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,9839=>435,10145=>754,10181=>351,10182=>351,10208=>444,
-10216=>351,10217=>351,10224=>754,10225=>754,10226=>754,10227=>754,10228=>930,10229=>1290,10230=>1290,10231=>1290,
-10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,10237=>1290,10238=>1290,10239=>1290,10240=>659,10241=>659,
-10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,10247=>659,10248=>659,10249=>659,10250=>659,10251=>659,
-10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,10257=>659,10258=>659,10259=>659,10260=>659,10261=>659,
-10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,10267=>659,10268=>659,10269=>659,10270=>659,10271=>659,
-10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,10277=>659,10278=>659,10279=>659,10280=>659,10281=>659,
-10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,10287=>659,10288=>659,10289=>659,10290=>659,10291=>659,
-10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,10297=>659,10298=>659,10299=>659,10300=>659,10301=>659,
-10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,10307=>659,10308=>659,10309=>659,10310=>659,10311=>659,
-10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,10317=>659,10318=>659,10319=>659,10320=>659,10321=>659,
-10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,10327=>659,10328=>659,10329=>659,10330=>659,10331=>659,
-10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,10337=>659,10338=>659,10339=>659,10340=>659,10341=>659,
-10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,10347=>659,10348=>659,10349=>659,10350=>659,10351=>659,
-10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,10357=>659,10358=>659,10359=>659,10360=>659,10361=>659,
-10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,10367=>659,10368=>659,10369=>659,10370=>659,10371=>659,
-10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,10377=>659,10378=>659,10379=>659,10380=>659,10381=>659,
-10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,10387=>659,10388=>659,10389=>659,10390=>659,10391=>659,
-10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,10397=>659,10398=>659,10399=>659,10400=>659,10401=>659,
-10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,10407=>659,10408=>659,10409=>659,10410=>659,10411=>659,
-10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,10417=>659,10418=>659,10419=>659,10420=>659,10421=>659,
-10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,10427=>659,10428=>659,10429=>659,10430=>659,10431=>659,
-10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,10437=>659,10438=>659,10439=>659,10440=>659,10441=>659,
-10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,10447=>659,10448=>659,10449=>659,10450=>659,10451=>659,
-10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,10457=>659,10458=>659,10459=>659,10460=>659,10461=>659,
-10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,10467=>659,10468=>659,10469=>659,10470=>659,10471=>659,
-10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,10477=>659,10478=>659,10479=>659,10480=>659,10481=>659,
-10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,10487=>659,10488=>659,10489=>659,10490=>659,10491=>659,
-10492=>659,10493=>659,10494=>659,10495=>659,10496=>754,10497=>754,10498=>754,10499=>754,10500=>754,10501=>754,
-10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,10507=>754,10508=>754,10509=>754,10510=>754,10511=>754,
-10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,10517=>754,10518=>754,10519=>754,10520=>754,10521=>754,
-10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,10527=>754,10528=>754,10529=>754,10530=>754,10531=>754,
-10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,10537=>754,10538=>754,10539=>754,10540=>754,10541=>754,
-10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,10547=>754,10548=>754,10549=>754,10550=>754,10551=>754,
-10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,10557=>754,10558=>754,10559=>754,10560=>754,10561=>754,
-10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,10567=>754,10568=>754,10569=>754,10570=>754,10571=>754,
-10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,10577=>754,10578=>754,10579=>754,10580=>754,10581=>754,
-10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,10587=>754,10588=>754,10589=>754,10590=>754,10591=>754,
-10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,10597=>754,10598=>754,10599=>754,10600=>754,10601=>754,
-10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,10607=>754,10608=>754,10609=>754,10610=>754,10611=>754,
-10612=>754,10613=>754,10614=>754,10615=>883,10616=>754,10617=>754,10618=>886,10619=>754,10620=>754,10621=>754,
-10622=>754,10623=>754,10731=>444,10764=>1361,10765=>469,10766=>469,10799=>754,11008=>754,11009=>754,11010=>754,
-11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,
-11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,
-11031=>692,11032=>692,11033=>692,11034=>850,11364=>677,11367=>785,11368=>580,11369=>672,11370=>545,11371=>625,
-11372=>474,11374=>921,11375=>650,11381=>666,11382=>500,11383=>630,11385=>451,11386=>542,11388=>237,11389=>409,
-11520=>695,11521=>571,11522=>569,11523=>592,11524=>568,11525=>866,11526=>680,11527=>864,11528=>555,11529=>581,
-11530=>866,11531=>568,11532=>581,11533=>866,11534=>580,11535=>779,11536=>865,11537=>580,11538=>580,11539=>863,
-11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,11545=>584,11546=>619,11547=>571,11548=>883,11549=>613,
-11550=>608,11551=>766,11552=>861,11553=>569,11554=>580,11555=>582,11556=>674,11557=>822,11800=>482,11810=>351,
-11811=>351,11812=>351,11813=>351,11822=>482,42564=>616,42565=>461,42566=>355,42567=>353,42576=>994,42577=>799,
-42580=>1074,42581=>783,42582=>1025,42583=>809,42760=>444,42761=>444,42762=>444,42763=>444,42764=>444,42765=>444,
-42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,42773=>444,42774=>444,42779=>332,
-42780=>332,42781=>228,42782=>228,42783=>228,42891=>361,42892=>247,62464=>588,62465=>598,62466=>642,62467=>853,
-62468=>598,62469=>593,62470=>652,62471=>888,62472=>598,62473=>598,62474=>1131,62475=>614,62476=>613,62477=>857,
-62478=>598,62479=>613,62480=>898,62481=>671,62482=>718,62483=>672,62484=>850,62485=>613,62486=>842,62487=>612,
-62488=>619,62489=>613,62490=>655,62491=>613,62492=>619,62493=>599,62494=>656,62495=>795,62496=>598,62497=>635,
-62498=>599,62499=>598,62500=>598,62501=>649,62502=>865,62504=>813,63173=>542,63185=>450,63188=>450,64256=>639,
-64257=>600,64258=>600,64259=>925,64260=>927,64261=>694,64262=>839,65024=>0,65025=>0,65026=>0,65027=>0,
-65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,
-65038=>0,65039=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>923);
-$enc='';
-$diff='';
-$file='dejavuserifcondensed.z';
-$ctg='dejavuserifcondensed.ctg.z';
-$originalsize=295840;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedb.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedb.php
deleted file mode 100644
index a7db677a5d5..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedb.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed-Bold';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>4,'Flags'=>32,'FontBBox'=>'[-752 -389 1616 1235]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>395,34=>469,35=>754,36=>626,37=>855,38=>813,39=>275,40=>426,
-41=>426,42=>470,43=>754,44=>313,45=>374,46=>313,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>332,59=>332,60=>754,
-61=>754,62=>754,63=>527,64=>900,65=>698,66=>760,67=>716,68=>780,69=>686,70=>639,
-71=>769,72=>850,73=>421,74=>426,75=>782,76=>633,77=>996,78=>822,79=>784,80=>677,
-81=>784,82=>748,83=>650,84=>669,85=>785,86=>698,87=>1011,88=>698,89=>642,90=>657,
-91=>426,92=>329,93=>426,94=>754,95=>450,96=>450,97=>583,98=>629,99=>548,100=>629,
-101=>572,102=>387,103=>629,104=>654,105=>342,106=>325,107=>624,108=>342,109=>952,110=>654,
-111=>600,112=>629,113=>629,114=>474,115=>506,116=>416,117=>654,118=>523,119=>774,120=>536,
-121=>523,122=>511,123=>579,124=>327,125=>579,126=>754,8364=>626,8218=>313,402=>387,8222=>518,
-8230=>900,8224=>470,8225=>470,710=>450,8240=>1246,352=>650,8249=>360,338=>1062,381=>657,8216=>313,
-8217=>313,8220=>518,8221=>518,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>506,8250=>360,
-339=>925,382=>511,376=>642,160=>313,161=>395,162=>626,163=>626,164=>572,165=>626,166=>327,
-167=>470,168=>450,169=>900,170=>438,171=>563,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>659,182=>572,183=>313,184=>450,185=>394,186=>450,
-187=>563,188=>938,189=>938,190=>938,191=>527,192=>698,193=>698,194=>698,195=>698,196=>698,
-197=>698,198=>931,199=>716,200=>686,201=>686,202=>686,203=>686,204=>421,205=>421,206=>421,
-207=>421,208=>787,209=>822,210=>784,211=>784,212=>784,213=>784,214=>784,215=>754,216=>784,
-217=>785,218=>785,219=>785,220=>785,221=>642,222=>681,223=>684,224=>583,225=>583,226=>583,
-227=>583,228=>583,229=>583,230=>877,231=>548,232=>572,233=>572,234=>572,235=>572,236=>342,
-237=>342,238=>342,239=>342,240=>600,241=>654,242=>600,243=>600,244=>600,245=>600,246=>600,
-247=>754,248=>600,249=>654,250=>654,251=>654,252=>654,253=>523,254=>629,255=>523,256=>698,
-257=>583,258=>698,259=>583,260=>698,261=>583,262=>716,263=>548,264=>716,265=>548,266=>716,
-267=>548,268=>716,269=>548,270=>780,271=>629,272=>787,273=>629,274=>686,275=>572,276=>686,
-277=>572,278=>686,279=>572,280=>686,281=>572,282=>686,283=>572,284=>769,285=>629,286=>769,
-287=>629,288=>769,289=>629,290=>769,291=>629,292=>850,293=>654,294=>850,295=>654,296=>421,
-297=>342,298=>421,299=>342,300=>421,301=>342,302=>421,303=>342,304=>421,305=>342,306=>848,
-307=>676,308=>426,309=>325,310=>782,311=>624,312=>624,313=>633,314=>342,315=>633,316=>342,
-317=>633,318=>342,319=>633,320=>342,321=>639,322=>346,323=>822,324=>654,325=>822,326=>654,
-327=>822,328=>654,329=>907,330=>785,331=>654,332=>784,333=>600,334=>784,335=>600,336=>784,
-337=>600,340=>748,341=>474,342=>748,343=>474,344=>748,345=>474,346=>650,347=>506,348=>650,
-349=>506,350=>650,351=>506,354=>669,355=>416,356=>669,357=>416,358=>669,359=>416,360=>785,
-361=>654,362=>785,363=>654,364=>785,365=>654,366=>785,367=>654,368=>785,369=>654,370=>785,
-371=>654,372=>1011,373=>774,374=>642,375=>523,377=>657,378=>511,379=>657,380=>511,383=>387,
-384=>629,385=>760,386=>769,387=>629,388=>769,389=>629,390=>716,391=>716,392=>548,393=>787,
-394=>780,395=>769,396=>629,397=>600,398=>686,399=>784,400=>649,401=>639,403=>769,404=>693,
-405=>938,406=>421,407=>421,408=>782,409=>624,410=>342,411=>631,412=>952,413=>822,414=>654,
-415=>784,416=>784,417=>600,418=>1080,419=>849,420=>677,421=>629,422=>748,423=>650,424=>506,
-425=>636,426=>298,427=>416,428=>669,429=>416,430=>669,431=>785,432=>654,433=>801,434=>801,
-435=>642,436=>637,437=>657,438=>511,439=>591,440=>591,441=>591,443=>626,444=>678,445=>511,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1437,453=>1292,454=>1140,455=>1059,456=>958,
-457=>667,458=>1248,459=>1148,460=>980,461=>698,462=>583,463=>421,464=>342,465=>784,466=>600,
-467=>785,468=>654,469=>785,470=>654,471=>785,472=>654,473=>785,474=>654,475=>785,476=>654,
-477=>572,478=>698,479=>583,480=>698,481=>583,482=>931,483=>877,484=>806,485=>629,486=>769,
-487=>629,488=>782,489=>624,490=>784,491=>600,492=>784,493=>600,494=>591,495=>511,496=>342,
-497=>1437,498=>1292,499=>1140,500=>769,501=>629,502=>1099,504=>822,505=>654,506=>698,507=>583,
-508=>931,509=>877,510=>784,511=>600,512=>698,513=>583,514=>698,515=>583,516=>686,517=>572,
-518=>686,519=>572,520=>421,521=>342,522=>421,523=>342,524=>784,525=>600,526=>784,527=>600,
-528=>748,529=>474,530=>748,531=>474,532=>785,533=>654,534=>785,535=>654,536=>650,537=>506,
-538=>669,539=>416,540=>621,541=>546,542=>850,543=>654,544=>785,545=>711,548=>657,549=>511,
-550=>698,551=>583,552=>686,553=>572,554=>784,555=>600,556=>784,557=>600,558=>784,559=>600,
-560=>784,561=>600,562=>642,563=>523,564=>516,565=>830,566=>508,567=>325,568=>928,569=>928,
-570=>698,571=>716,572=>548,573=>633,574=>669,575=>506,576=>511,577=>594,578=>492,581=>698,
-592=>583,593=>629,594=>629,595=>629,596=>548,597=>548,598=>629,599=>657,600=>572,601=>572,
-602=>816,603=>547,604=>505,605=>816,606=>647,607=>348,608=>629,609=>629,610=>563,611=>641,
-612=>564,613=>654,614=>654,615=>654,616=>342,617=>342,618=>342,619=>368,620=>462,621=>342,
-622=>716,623=>952,624=>952,625=>952,626=>654,627=>654,628=>641,629=>600,630=>955,631=>674,
-632=>600,633=>514,634=>514,635=>514,636=>474,637=>474,638=>406,639=>438,640=>721,641=>721,
-642=>506,643=>298,644=>387,645=>486,646=>298,647=>443,648=>416,649=>654,650=>611,651=>624,
-652=>577,653=>816,654=>571,655=>654,656=>511,657=>511,658=>511,659=>511,660=>482,661=>482,
-662=>482,663=>490,664=>784,665=>625,666=>647,667=>563,668=>659,669=>345,670=>666,671=>581,
-672=>629,673=>482,674=>482,675=>1005,676=>1061,677=>1005,678=>819,679=>643,680=>817,681=>935,
-682=>711,683=>716,684=>596,685=>398,686=>552,687=>646,688=>469,689=>466,690=>282,691=>372,
-692=>372,693=>432,694=>474,695=>595,696=>436,697=>271,699=>313,700=>313,701=>313,702=>330,
-703=>330,704=>282,705=>282,711=>450,712=>254,713=>450,716=>254,720=>332,721=>332,722=>330,
-723=>330,726=>353,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>412,737=>263,
-738=>355,739=>427,740=>282,741=>450,742=>450,743=>450,744=>450,745=>450,750=>498,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>701,881=>519,884=>271,
-885=>271,890=>450,891=>548,892=>548,893=>548,894=>332,900=>450,901=>450,902=>698,903=>313,
-904=>852,905=>1006,906=>595,908=>798,910=>857,911=>820,912=>435,913=>698,914=>760,915=>639,
-916=>698,917=>686,918=>657,919=>850,920=>784,921=>421,922=>782,923=>698,924=>996,925=>822,
-926=>633,927=>784,928=>850,929=>677,931=>636,932=>669,933=>642,934=>784,935=>698,936=>822,
-937=>801,938=>421,939=>642,940=>692,941=>547,942=>654,943=>435,944=>624,945=>692,946=>598,
-947=>594,948=>600,949=>547,950=>533,951=>654,952=>600,953=>435,954=>674,955=>631,956=>659,
-957=>624,958=>533,959=>600,960=>659,961=>598,962=>548,963=>664,964=>605,965=>624,966=>814,
-967=>592,968=>847,969=>857,970=>435,971=>624,972=>600,973=>624,974=>857,976=>600,977=>764,
-978=>687,979=>872,980=>687,981=>847,982=>857,983=>589,984=>784,985=>600,986=>716,987=>548,
-988=>639,989=>475,990=>531,991=>593,992=>716,993=>600,1008=>589,1009=>598,1010=>548,1011=>325,
-1012=>784,1013=>548,1014=>548,1015=>681,1016=>629,1017=>716,1018=>996,1019=>774,1020=>623,1021=>716,
-1022=>716,1023=>716,1024=>686,1025=>686,1026=>811,1027=>621,1028=>716,1029=>650,1030=>421,1031=>421,
-1032=>426,1033=>1081,1034=>1135,1035=>866,1036=>818,1037=>850,1038=>730,1039=>850,1040=>733,1041=>769,
-1042=>760,1043=>621,1044=>800,1045=>686,1046=>1181,1047=>649,1048=>850,1049=>850,1050=>818,1051=>795,
-1052=>996,1053=>850,1054=>784,1055=>850,1056=>677,1057=>716,1058=>669,1059=>730,1060=>854,1061=>698,
-1062=>870,1063=>822,1064=>1141,1065=>1164,1066=>861,1067=>1081,1068=>743,1069=>716,1070=>1158,1071=>793,
-1072=>583,1073=>600,1074=>625,1075=>551,1076=>600,1077=>572,1078=>909,1079=>574,1080=>667,1081=>667,
-1082=>650,1083=>634,1084=>782,1085=>659,1086=>600,1087=>659,1088=>629,1089=>548,1090=>558,1091=>576,
-1092=>812,1093=>536,1094=>665,1095=>659,1096=>967,1097=>974,1098=>690,1099=>902,1100=>611,1101=>548,
-1102=>923,1103=>665,1104=>572,1105=>572,1106=>646,1107=>551,1108=>548,1109=>506,1110=>342,1111=>342,
-1112=>325,1113=>889,1114=>913,1115=>654,1116=>650,1117=>667,1118=>576,1119=>659,1122=>792,1123=>633,
-1124=>1076,1125=>867,1130=>1181,1131=>909,1136=>986,1137=>995,1138=>784,1139=>587,1140=>824,1141=>673,
-1164=>761,1165=>606,1168=>630,1169=>556,1170=>621,1171=>551,1172=>781,1173=>645,1174=>1181,1175=>909,
-1176=>649,1177=>574,1178=>852,1179=>669,1182=>818,1183=>650,1184=>937,1185=>744,1186=>870,1187=>665,
-1188=>1050,1189=>860,1190=>1210,1191=>953,1194=>716,1195=>548,1196=>669,1197=>558,1198=>642,1199=>523,
-1200=>642,1201=>523,1202=>779,1203=>584,1204=>919,1205=>726,1206=>835,1207=>665,1210=>819,1211=>654,
-1216=>421,1217=>1181,1218=>909,1219=>782,1220=>624,1223=>850,1224=>659,1227=>822,1228=>659,1231=>342,
-1232=>733,1233=>583,1234=>733,1235=>583,1236=>931,1237=>877,1238=>686,1239=>572,1240=>784,1241=>572,
-1242=>784,1243=>572,1244=>1181,1245=>909,1246=>649,1247=>574,1248=>591,1249=>511,1250=>850,1251=>667,
-1252=>850,1253=>667,1254=>784,1255=>600,1256=>784,1257=>600,1258=>784,1259=>600,1260=>716,1261=>548,
-1262=>730,1263=>576,1264=>730,1265=>576,1266=>730,1267=>576,1268=>822,1269=>659,1270=>621,1271=>551,
-1272=>1081,1273=>902,1296=>649,1297=>574,1298=>795,1299=>634,1300=>1123,1301=>851,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>680,4257=>842,4258=>779,4259=>787,4260=>703,4261=>970,4262=>913,4263=>1091,
-4264=>579,4265=>736,4266=>946,4267=>945,4268=>716,4269=>1021,4270=>872,4271=>812,4272=>998,4273=>712,
-4274=>680,4275=>968,4276=>878,4277=>959,4278=>729,4279=>750,4280=>739,4281=>750,4282=>817,4283=>969,
-4284=>692,4285=>739,4286=>731,4287=>1000,4288=>1010,4289=>721,4290=>803,4291=>722,4292=>792,4293=>957,
-4304=>535,4305=>563,4306=>579,4307=>798,4308=>553,4309=>549,4310=>600,4311=>823,4312=>552,4313=>540,
-4314=>1008,4315=>576,4316=>576,4317=>791,4318=>561,4319=>571,4320=>790,4321=>599,4322=>702,4323=>676,
-4324=>782,4325=>575,4326=>820,4327=>559,4328=>583,4329=>576,4330=>656,4331=>577,4332=>567,4333=>566,
-4334=>603,4335=>678,4336=>563,4337=>591,4338=>563,4339=>563,4340=>562,4341=>603,4342=>846,4343=>612,
-4344=>572,4345=>605,4346=>562,4347=>529,4348=>318,7426=>846,7432=>458,7433=>288,7444=>890,7446=>600,
-7447=>600,7453=>663,7454=>853,7455=>853,7468=>439,7469=>586,7470=>479,7472=>491,7473=>432,7474=>432,
-7475=>483,7476=>536,7477=>265,7478=>268,7479=>492,7480=>398,7481=>627,7482=>518,7483=>518,7484=>493,
-7486=>426,7487=>471,7488=>409,7489=>422,7490=>494,7491=>419,7492=>419,7493=>448,7494=>591,7495=>448,
-7496=>448,7497=>400,7498=>400,7499=>370,7500=>370,7501=>448,7502=>270,7503=>471,7504=>655,7505=>426,
-7506=>420,7507=>384,7508=>420,7509=>420,7510=>448,7511=>333,7512=>468,7513=>390,7514=>655,7515=>442,
-7522=>215,7523=>372,7524=>468,7525=>442,7543=>576,7544=>536,7547=>342,7557=>342,7579=>448,7580=>384,
-7581=>384,7582=>420,7583=>370,7584=>345,7585=>335,7586=>448,7587=>470,7588=>270,7589=>276,7590=>270,
-7591=>270,7592=>333,7593=>331,7594=>289,7595=>387,7596=>613,7597=>655,7598=>529,7599=>528,7600=>425,
-7601=>420,7602=>470,7603=>360,7604=>348,7605=>333,7606=>468,7607=>427,7609=>439,7610=>442,7611=>371,
-7612=>474,7613=>371,7614=>407,7615=>420,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>698,7681=>583,7682=>760,7683=>629,7684=>760,7685=>629,7686=>760,7687=>629,7688=>716,7689=>548,
-7690=>780,7691=>629,7692=>780,7693=>629,7694=>780,7695=>629,7696=>780,7697=>629,7698=>780,7699=>629,
-7700=>686,7701=>572,7702=>686,7703=>572,7704=>686,7705=>572,7706=>686,7707=>572,7708=>686,7709=>572,
-7710=>639,7711=>387,7712=>769,7713=>629,7714=>850,7715=>654,7716=>850,7717=>654,7718=>850,7719=>654,
-7720=>850,7721=>654,7722=>850,7723=>654,7724=>421,7725=>342,7728=>782,7729=>624,7730=>782,7731=>624,
-7732=>782,7733=>624,7734=>633,7735=>342,7736=>633,7737=>342,7738=>633,7739=>342,7740=>633,7741=>342,
-7742=>996,7743=>952,7744=>996,7745=>952,7746=>996,7747=>952,7748=>822,7749=>654,7750=>822,7751=>654,
-7752=>822,7753=>654,7754=>822,7755=>654,7756=>784,7757=>600,7760=>784,7761=>600,7762=>784,7763=>600,
-7764=>677,7765=>629,7766=>677,7767=>629,7768=>748,7769=>474,7770=>748,7771=>474,7772=>748,7773=>474,
-7774=>748,7775=>474,7776=>650,7777=>506,7778=>650,7779=>506,7784=>650,7785=>506,7786=>669,7787=>416,
-7788=>669,7789=>416,7790=>669,7791=>416,7792=>669,7793=>416,7794=>785,7795=>654,7796=>785,7797=>654,
-7798=>785,7799=>654,7800=>785,7801=>654,7802=>785,7803=>654,7804=>698,7805=>523,7806=>698,7807=>523,
-7808=>1011,7809=>774,7810=>1011,7811=>774,7812=>1011,7813=>774,7814=>1011,7815=>774,7816=>1011,7817=>774,
-7818=>698,7819=>536,7820=>698,7821=>536,7822=>642,7823=>523,7824=>657,7825=>511,7826=>657,7827=>511,
-7828=>657,7829=>511,7830=>654,7831=>416,7832=>774,7833=>523,7834=>913,7835=>387,7838=>852,7839=>600,
-7840=>698,7841=>583,7842=>698,7843=>583,7852=>698,7853=>583,7854=>698,7855=>583,7856=>698,7857=>583,
-7858=>698,7859=>583,7860=>698,7861=>583,7862=>698,7863=>583,7864=>686,7865=>572,7866=>686,7867=>572,
-7868=>686,7869=>572,7878=>686,7879=>572,7880=>421,7881=>342,7882=>421,7883=>342,7884=>784,7885=>600,
-7886=>784,7887=>600,7896=>784,7897=>600,7908=>785,7909=>654,7910=>785,7911=>654,7922=>642,7923=>523,
-7924=>642,7925=>523,7926=>642,7927=>523,7928=>642,7929=>523,7936=>692,7937=>692,7938=>692,7939=>692,
-7940=>692,7941=>692,7942=>692,7943=>692,7944=>698,7945=>698,7946=>880,7947=>880,7948=>748,7949=>764,
-7950=>698,7951=>698,7952=>547,7953=>547,7954=>547,7955=>547,7956=>547,7957=>547,7960=>826,7961=>817,
-7962=>1052,7963=>1052,7964=>984,7965=>1007,7968=>654,7969=>654,7970=>654,7971=>654,7972=>654,7973=>654,
-7974=>654,7975=>654,7976=>990,7977=>984,7978=>1222,7979=>1225,7980=>1151,7981=>1177,7982=>1077,7983=>1074,
-7984=>435,7985=>435,7986=>435,7987=>435,7988=>435,7989=>435,7990=>435,7991=>435,7992=>566,7993=>555,
-7994=>790,7995=>792,7996=>719,7997=>748,7998=>650,7999=>642,8000=>600,8001=>600,8002=>600,8003=>600,
-8004=>600,8005=>600,8008=>810,8009=>841,8010=>1116,8011=>1113,8012=>931,8013=>959,8016=>624,8017=>624,
-8018=>624,8019=>624,8020=>624,8021=>624,8022=>624,8023=>624,8025=>830,8027=>1067,8029=>1020,8031=>917,
-8032=>857,8033=>857,8034=>857,8035=>857,8036=>857,8037=>857,8038=>857,8039=>857,8040=>838,8041=>867,
-8042=>1141,8043=>1146,8044=>949,8045=>979,8046=>920,8047=>954,8048=>692,8049=>692,8050=>547,8051=>547,
-8052=>654,8053=>654,8054=>435,8055=>435,8056=>600,8057=>600,8058=>624,8059=>624,8060=>857,8061=>857,
-8064=>692,8065=>692,8066=>692,8067=>692,8068=>692,8069=>692,8070=>692,8071=>692,8072=>698,8073=>698,
-8074=>880,8075=>880,8076=>748,8077=>764,8078=>698,8079=>698,8080=>654,8081=>654,8082=>654,8083=>654,
-8084=>654,8085=>654,8086=>654,8087=>654,8088=>990,8089=>984,8090=>1222,8091=>1225,8092=>1151,8093=>1177,
-8094=>1077,8095=>1074,8096=>857,8097=>857,8098=>857,8099=>857,8100=>857,8101=>857,8102=>857,8103=>857,
-8104=>838,8105=>867,8106=>1141,8107=>1146,8108=>949,8109=>979,8110=>920,8111=>954,8112=>692,8113=>692,
-8114=>692,8115=>692,8116=>692,8118=>692,8119=>692,8120=>698,8121=>698,8122=>729,8123=>698,8124=>698,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>654,8131=>654,8132=>654,8134=>654,8135=>654,
-8136=>899,8137=>852,8138=>1072,8139=>1006,8140=>850,8141=>450,8142=>450,8143=>450,8144=>435,8145=>435,
-8146=>435,8147=>435,8150=>435,8151=>435,8152=>421,8153=>421,8154=>642,8155=>595,8157=>450,8158=>450,
-8159=>450,8160=>624,8161=>624,8162=>624,8163=>624,8164=>598,8165=>598,8166=>624,8167=>624,8168=>642,
-8169=>642,8170=>917,8171=>857,8172=>819,8173=>450,8174=>450,8175=>450,8178=>857,8179=>857,8180=>857,
-8182=>857,8183=>857,8184=>962,8185=>798,8186=>991,8187=>820,8188=>801,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>626,8200=>313,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,
-8215=>450,8219=>313,8223=>518,8227=>575,8228=>313,8229=>606,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1638,8242=>237,8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,
-8252=>566,8253=>527,8254=>450,8258=>920,8260=>150,8261=>426,8262=>426,8263=>974,8264=>770,8265=>770,
-8267=>572,8268=>450,8269=>450,8270=>470,8271=>332,8273=>470,8274=>500,8275=>900,8279=>731,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>394,8305=>215,8308=>394,8309=>394,8310=>394,8311=>394,8312=>394,8313=>394,8314=>475,
-8315=>475,8316=>475,8317=>268,8318=>268,8319=>467,8320=>394,8321=>394,8322=>394,8323=>394,8324=>394,
-8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,8330=>475,8331=>475,8332=>475,8333=>268,8334=>268,
-8336=>419,8337=>400,8338=>420,8339=>427,8340=>400,8358=>626,8367=>1039,8369=>710,8372=>788,8373=>626,
-8451=>1078,8457=>1001,8462=>654,8463=>654,8470=>978,8486=>801,8487=>801,8490=>782,8491=>698,8513=>697,
-8514=>501,8515=>573,8516=>684,8523=>813,8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,
-8537=>932,8538=>932,8539=>932,8540=>932,8541=>932,8542=>932,8543=>554,8544=>421,8545=>663,8546=>904,
-8547=>984,8548=>698,8549=>1014,8550=>1256,8551=>1498,8552=>962,8553=>698,8554=>970,8555=>1212,8556=>633,
-8557=>716,8558=>780,8559=>996,8560=>342,8561=>684,8562=>1025,8563=>865,8564=>523,8565=>865,8566=>1207,
-8567=>1548,8568=>878,8569=>536,8570=>878,8571=>1220,8572=>342,8573=>548,8574=>629,8575=>952,8576=>1129,
-8577=>780,8578=>1141,8579=>716,8580=>548,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,
-8598=>754,8599=>754,8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,
-8608=>754,8609=>754,8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,
-8618=>754,8619=>754,8620=>754,8621=>754,8622=>754,8623=>765,8624=>754,8625=>754,8626=>754,8627=>754,
-8628=>754,8629=>754,8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,
-8638=>754,8639=>754,8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,
-8648=>754,8649=>754,8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,
-8658=>754,8659=>754,8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,
-8668=>754,8669=>754,8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,
-8678=>754,8679=>754,8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,
-8688=>754,8689=>754,8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,
-8698=>754,8699=>754,8700=>754,8701=>754,8702=>754,8703=>754,8704=>577,8706=>480,8707=>558,8708=>558,
-8710=>677,8711=>677,8712=>666,8713=>666,8715=>666,8716=>666,8719=>757,8720=>757,8721=>677,8722=>754,
-8723=>754,8724=>754,8725=>329,8727=>622,8728=>466,8729=>466,8730=>591,8731=>591,8732=>591,8733=>604,
-8734=>750,8735=>754,8736=>754,8739=>292,8740=>546,8741=>476,8742=>696,8743=>730,8744=>730,8745=>754,
-8746=>754,8747=>521,8748=>900,8749=>1252,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,
-8770=>754,8771=>754,8776=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>974,8789=>974,8800=>754,
-8801=>754,8804=>754,8805=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,
-8845=>754,8846=>754,8847=>754,8848=>754,8849=>754,8850=>754,8851=>754,8852=>754,8853=>754,8854=>754,
-8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,
-8865=>754,8866=>795,8867=>795,8868=>864,8869=>864,8870=>554,8871=>554,8872=>795,8873=>795,8874=>795,
-8875=>971,8876=>795,8877=>795,8878=>795,8879=>971,8901=>358,8962=>751,8968=>426,8969=>426,8970=>426,
-8971=>426,8976=>754,8977=>484,8984=>835,8985=>754,8992=>521,8993=>521,8997=>900,9000=>1299,9085=>907,
-9134=>521,9167=>850,9251=>751,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,
-9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,
-9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,
-9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,
-9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,
-9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,
-9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,
-9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,
-9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,
-9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,
-9697=>785,9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,
-9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,
-9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,
-9727=>692,9728=>807,9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,
-9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,
-9828=>807,9829=>807,9830=>807,9831=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,
-9839=>435,10145=>754,10181=>411,10182=>411,10208=>444,10216=>411,10217=>411,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>930,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,10245=>703,10246=>703,
-10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,10255=>703,10256=>703,
-10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,10265=>703,10266=>703,
-10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,10275=>703,10276=>703,
-10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,10285=>703,10286=>703,
-10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,10295=>703,10296=>703,
-10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,10305=>703,10306=>703,
-10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,10315=>703,10316=>703,
-10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,10325=>703,10326=>703,
-10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,10335=>703,10336=>703,
-10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,10345=>703,10346=>703,
-10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,10355=>703,10356=>703,
-10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,10365=>703,10366=>703,
-10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,10375=>703,10376=>703,
-10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,10385=>703,10386=>703,
-10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,10395=>703,10396=>703,
-10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,10405=>703,10406=>703,
-10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,10415=>703,10416=>703,
-10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,10425=>703,10426=>703,
-10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,10435=>703,10436=>703,
-10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,10445=>703,10446=>703,
-10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,10455=>703,10456=>703,
-10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,10465=>703,10466=>703,
-10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,10475=>703,10476=>703,
-10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,10485=>703,10486=>703,
-10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,10495=>703,10496=>754,
-10497=>754,10498=>754,10499=>754,10500=>754,10501=>754,10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,
-10507=>754,10508=>754,10509=>754,10510=>754,10511=>754,10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,
-10517=>754,10518=>754,10519=>754,10520=>754,10521=>754,10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,
-10527=>754,10528=>754,10529=>754,10530=>754,10531=>754,10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,
-10537=>754,10538=>754,10539=>754,10540=>754,10541=>754,10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,
-10547=>754,10548=>754,10549=>754,10550=>754,10551=>754,10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,
-10557=>754,10558=>754,10559=>754,10560=>754,10561=>754,10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,
-10567=>754,10568=>754,10569=>754,10570=>754,10571=>754,10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,
-10577=>754,10578=>754,10579=>754,10580=>754,10581=>754,10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,
-10587=>754,10588=>754,10589=>754,10590=>754,10591=>754,10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,
-10597=>754,10598=>754,10599=>754,10600=>754,10601=>754,10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,
-10607=>754,10608=>754,10609=>754,10610=>754,10611=>754,10612=>754,10613=>754,10614=>754,10615=>929,10616=>754,
-10617=>754,10618=>864,10619=>754,10620=>754,10621=>754,10622=>754,10623=>754,10731=>444,10764=>1604,10765=>549,
-10766=>549,10799=>754,11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,
-11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,
-11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11364=>748,
-11367=>850,11368=>654,11369=>782,11370=>624,11371=>657,11372=>511,11374=>996,11375=>698,11381=>701,11382=>541,
-11383=>814,11385=>514,11386=>600,11388=>282,11389=>439,11520=>695,11521=>571,11522=>723,11523=>592,11524=>708,
-11525=>866,11526=>680,11527=>864,11528=>555,11529=>581,11530=>866,11531=>567,11532=>581,11533=>866,11534=>761,
-11535=>779,11536=>865,11537=>580,11538=>580,11539=>863,11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,
-11545=>584,11546=>619,11547=>842,11548=>883,11549=>613,11550=>608,11551=>766,11552=>1002,11553=>569,11554=>580,
-11555=>582,11556=>674,11557=>822,11800=>527,11810=>426,11811=>426,11812=>426,11813=>426,11822=>527,42564=>650,
-42565=>506,42566=>421,42567=>342,42576=>1200,42577=>982,42580=>1158,42581=>923,42582=>1158,42583=>935,42760=>450,
-42761=>450,42762=>450,42763=>450,42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,
-42771=>450,42772=>450,42773=>450,42774=>450,42779=>346,42780=>346,42781=>249,42782=>249,42783=>249,42891=>395,
-42892=>275,62464=>634,62465=>645,62466=>688,62467=>898,62468=>645,62469=>639,62470=>698,62471=>934,62472=>645,
-62473=>645,62474=>1178,62475=>660,62476=>659,62477=>903,62478=>645,62479=>659,62480=>945,62481=>717,62482=>765,
-62483=>719,62484=>896,62485=>659,62486=>888,62487=>658,62488=>665,62489=>659,62490=>702,62491=>659,62492=>665,
-62493=>646,62494=>702,62495=>842,62496=>644,62497=>743,62498=>645,62499=>645,62500=>645,62501=>695,62502=>911,
-62504=>813,63173=>600,63185=>450,63188=>450,64256=>738,64257=>654,64258=>654,64259=>1007,64260=>1005,64261=>784,
-64262=>874,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,65031=>0,65032=>0,
-65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65529=>0,65530=>0,65531=>0,
-65532=>0,65533=>1002);
-$enc='';
-$diff='';
-$file='dejavuserifcondensedb.z';
-$ctg='dejavuserifcondensedb.ctg.z';
-$originalsize=282092;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedbi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedbi.php
deleted file mode 100644
index 88cb607beb1..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedbi.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed-BoldItalic';
-$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>-48,'Flags'=>96,'FontBBox'=>'[-815 -389 1584 1235]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>313,33=>395,34=>469,35=>754,36=>626,37=>855,38=>813,39=>275,40=>426,
-41=>426,42=>470,43=>754,44=>313,45=>374,46=>313,47=>329,48=>626,49=>626,50=>626,
-51=>626,52=>626,53=>626,54=>626,55=>626,56=>626,57=>626,58=>332,59=>332,60=>754,
-61=>754,62=>754,63=>527,64=>900,65=>698,66=>760,67=>716,68=>780,69=>686,70=>639,
-71=>769,72=>850,73=>421,74=>426,75=>782,76=>633,77=>996,78=>822,79=>784,80=>677,
-81=>784,82=>748,83=>650,84=>669,85=>785,86=>698,87=>1011,88=>698,89=>642,90=>657,
-91=>426,92=>329,93=>426,94=>754,95=>450,96=>450,97=>583,98=>629,99=>548,100=>629,
-101=>572,102=>387,103=>629,104=>654,105=>342,106=>325,107=>624,108=>342,109=>952,110=>654,
-111=>600,112=>629,113=>629,114=>474,115=>506,116=>416,117=>654,118=>523,119=>774,120=>536,
-121=>523,122=>511,123=>579,124=>327,125=>579,126=>754,8364=>626,8218=>313,402=>387,8222=>518,
-8230=>900,8224=>470,8225=>470,710=>450,8240=>1246,352=>650,8249=>360,338=>1062,381=>657,8216=>313,
-8217=>313,8220=>518,8221=>518,8226=>575,8211=>450,8212=>900,732=>450,8482=>900,353=>506,8250=>360,
-339=>925,382=>511,376=>642,160=>313,161=>395,162=>626,163=>626,164=>572,165=>626,166=>327,
-167=>470,168=>450,169=>900,170=>438,171=>563,172=>754,173=>374,174=>900,175=>450,176=>450,
-177=>754,178=>394,179=>394,180=>450,181=>659,182=>572,183=>313,184=>450,185=>394,186=>450,
-187=>563,188=>938,189=>938,190=>938,191=>527,192=>698,193=>698,194=>698,195=>698,196=>698,
-197=>698,198=>931,199=>716,200=>686,201=>686,202=>686,203=>686,204=>421,205=>421,206=>421,
-207=>421,208=>787,209=>822,210=>784,211=>784,212=>784,213=>784,214=>784,215=>754,216=>784,
-217=>785,218=>785,219=>785,220=>785,221=>642,222=>681,223=>684,224=>583,225=>583,226=>583,
-227=>583,228=>583,229=>583,230=>838,231=>548,232=>572,233=>572,234=>572,235=>572,236=>342,
-237=>342,238=>342,239=>342,240=>600,241=>654,242=>600,243=>600,244=>600,245=>600,246=>600,
-247=>754,248=>600,249=>654,250=>654,251=>654,252=>654,253=>523,254=>629,255=>523,256=>698,
-257=>583,258=>698,259=>583,260=>698,261=>583,262=>716,263=>548,264=>716,265=>548,266=>716,
-267=>548,268=>716,269=>548,270=>780,271=>629,272=>787,273=>629,274=>686,275=>572,276=>686,
-277=>572,278=>686,279=>572,280=>686,281=>572,282=>686,283=>572,284=>769,285=>629,286=>769,
-287=>629,288=>769,289=>629,290=>769,291=>629,292=>850,293=>654,294=>850,295=>654,296=>421,
-297=>342,298=>421,299=>342,300=>421,301=>342,302=>421,303=>342,304=>421,305=>342,306=>848,
-307=>676,308=>426,309=>325,310=>782,311=>624,312=>624,313=>633,314=>342,315=>633,316=>342,
-317=>633,318=>457,319=>633,320=>501,321=>639,322=>346,323=>822,324=>654,325=>822,326=>654,
-327=>822,328=>654,329=>907,330=>785,331=>654,332=>784,333=>600,334=>784,335=>600,336=>784,
-337=>600,340=>748,341=>474,342=>748,343=>474,344=>748,345=>474,346=>650,347=>506,348=>650,
-349=>506,350=>650,351=>506,354=>669,355=>416,356=>669,357=>416,358=>669,359=>416,360=>785,
-361=>654,362=>785,363=>654,364=>785,365=>654,366=>785,367=>654,368=>785,369=>654,370=>785,
-371=>654,372=>1011,373=>774,374=>642,375=>523,377=>657,378=>511,379=>657,380=>511,383=>387,
-384=>629,385=>760,386=>769,387=>629,388=>769,389=>629,390=>716,391=>716,392=>548,393=>787,
-394=>780,395=>769,396=>629,397=>600,398=>686,399=>784,400=>649,401=>639,403=>769,404=>693,
-405=>938,406=>421,407=>421,408=>782,409=>624,410=>342,411=>631,412=>952,413=>822,414=>654,
-415=>784,416=>784,417=>600,418=>1080,419=>849,420=>677,421=>629,422=>748,423=>650,424=>506,
-425=>636,426=>298,427=>416,428=>669,429=>416,430=>669,431=>785,432=>654,433=>801,434=>801,
-435=>642,436=>628,437=>657,438=>511,439=>591,440=>591,441=>591,443=>626,444=>678,445=>511,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1437,453=>1292,454=>1140,455=>1059,456=>958,
-457=>667,458=>1248,459=>1148,460=>980,461=>698,462=>583,463=>421,464=>342,465=>784,466=>600,
-467=>785,468=>654,469=>785,470=>654,471=>785,472=>654,473=>785,474=>654,475=>785,476=>654,
-477=>572,478=>698,479=>583,480=>698,481=>583,482=>931,483=>877,484=>806,485=>629,486=>769,
-487=>629,488=>782,489=>624,490=>784,491=>600,492=>784,493=>600,494=>591,495=>511,496=>325,
-497=>1437,498=>1292,499=>1140,500=>769,501=>629,502=>1099,504=>822,505=>654,506=>698,507=>583,
-508=>931,509=>838,510=>784,511=>600,512=>698,513=>583,514=>698,515=>583,516=>686,517=>572,
-518=>686,519=>572,520=>421,521=>342,522=>421,523=>342,524=>784,525=>600,526=>784,527=>600,
-528=>748,529=>474,530=>748,531=>474,532=>785,533=>654,534=>785,535=>654,536=>650,537=>506,
-538=>669,539=>416,540=>621,541=>546,542=>850,543=>654,544=>785,545=>711,548=>657,549=>511,
-550=>698,551=>583,552=>686,553=>572,554=>784,555=>600,556=>784,557=>600,558=>784,559=>600,
-560=>784,561=>600,562=>642,563=>523,564=>516,565=>830,566=>508,567=>325,568=>928,569=>928,
-570=>698,571=>716,572=>548,573=>633,574=>669,575=>506,576=>511,577=>594,578=>492,581=>698,
-592=>583,593=>629,594=>629,595=>629,596=>548,597=>548,598=>629,599=>657,600=>572,601=>572,
-602=>816,603=>547,604=>505,605=>816,606=>647,607=>348,608=>629,609=>629,610=>563,611=>641,
-612=>564,613=>654,614=>654,615=>654,616=>342,617=>342,618=>342,619=>368,620=>462,621=>342,
-622=>716,623=>952,624=>952,625=>952,626=>654,627=>654,628=>641,629=>600,630=>955,631=>674,
-632=>600,633=>514,634=>514,635=>514,636=>474,637=>474,638=>406,639=>438,640=>721,641=>721,
-642=>506,643=>298,644=>387,645=>486,646=>298,647=>443,648=>416,649=>654,650=>611,651=>624,
-652=>523,653=>774,654=>571,655=>654,656=>511,657=>511,658=>511,659=>511,660=>482,661=>482,
-662=>482,663=>490,664=>784,665=>625,666=>647,667=>563,668=>659,669=>345,670=>666,671=>581,
-672=>629,673=>482,674=>482,675=>1005,676=>1061,677=>1005,678=>819,679=>643,680=>817,681=>935,
-682=>711,683=>716,684=>596,685=>398,686=>552,687=>646,688=>469,689=>466,690=>282,691=>372,
-692=>372,693=>432,694=>474,695=>488,696=>329,697=>271,699=>313,700=>313,701=>313,702=>330,
-703=>330,704=>282,705=>282,711=>450,712=>254,713=>450,716=>254,720=>332,721=>332,722=>330,
-723=>330,726=>353,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>403,737=>263,
-738=>355,739=>338,740=>282,741=>450,742=>450,743=>450,744=>450,745=>450,750=>498,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>701,881=>519,884=>271,
-885=>271,890=>450,891=>548,892=>548,893=>548,894=>332,900=>450,901=>450,902=>698,903=>313,
-904=>852,905=>1022,906=>595,908=>798,910=>857,911=>820,912=>435,913=>698,914=>760,915=>639,
-916=>698,917=>686,918=>657,919=>850,920=>784,921=>421,922=>782,923=>698,924=>996,925=>822,
-926=>633,927=>784,928=>850,929=>677,931=>636,932=>669,933=>642,934=>784,935=>698,936=>822,
-937=>801,938=>421,939=>642,940=>692,941=>547,942=>654,943=>435,944=>624,945=>692,946=>598,
-947=>594,948=>600,949=>547,950=>533,951=>654,952=>600,953=>435,954=>674,955=>631,956=>659,
-957=>624,958=>533,959=>600,960=>659,961=>598,962=>548,963=>664,964=>605,965=>624,966=>814,
-967=>592,968=>847,969=>857,970=>435,971=>624,972=>600,973=>624,974=>857,976=>600,977=>764,
-978=>687,979=>872,980=>687,981=>847,982=>857,983=>589,984=>784,985=>600,986=>716,987=>548,
-988=>639,989=>475,990=>531,991=>593,992=>716,993=>600,1008=>589,1009=>598,1010=>548,1011=>325,
-1012=>784,1013=>548,1014=>548,1015=>681,1016=>629,1017=>716,1018=>996,1019=>774,1020=>623,1021=>716,
-1022=>716,1023=>716,1024=>686,1025=>686,1026=>811,1027=>621,1028=>716,1029=>650,1030=>421,1031=>421,
-1032=>426,1033=>1081,1034=>1135,1035=>866,1036=>818,1037=>850,1038=>730,1039=>850,1040=>733,1041=>769,
-1042=>760,1043=>621,1044=>800,1045=>686,1046=>1181,1047=>649,1048=>850,1049=>850,1050=>818,1051=>795,
-1052=>996,1053=>850,1054=>784,1055=>850,1056=>677,1057=>716,1058=>669,1059=>730,1060=>854,1061=>698,
-1062=>870,1063=>822,1064=>1141,1065=>1164,1066=>861,1067=>1081,1068=>743,1069=>716,1070=>1158,1071=>793,
-1072=>583,1073=>650,1074=>591,1075=>506,1076=>625,1077=>572,1078=>1175,1079=>574,1080=>654,1081=>654,
-1082=>609,1083=>659,1084=>855,1085=>656,1086=>600,1087=>654,1088=>629,1089=>548,1090=>952,1091=>538,
-1092=>812,1093=>536,1094=>723,1095=>643,1096=>952,1097=>1021,1098=>654,1099=>916,1100=>593,1101=>580,
-1102=>901,1103=>716,1104=>572,1105=>572,1106=>646,1107=>506,1108=>548,1109=>506,1110=>342,1111=>342,
-1112=>325,1113=>913,1114=>910,1115=>654,1116=>609,1117=>654,1118=>538,1119=>654,1122=>792,1123=>945,
-1124=>1076,1125=>867,1130=>1181,1131=>909,1136=>986,1137=>995,1138=>784,1139=>587,1140=>824,1141=>673,
-1164=>761,1165=>606,1168=>630,1169=>556,1170=>621,1171=>506,1172=>768,1173=>634,1174=>1181,1175=>1175,
-1176=>649,1177=>574,1178=>812,1179=>633,1182=>818,1183=>609,1184=>937,1185=>684,1186=>856,1187=>725,
-1188=>1050,1189=>859,1190=>1191,1191=>911,1194=>716,1195=>548,1196=>669,1197=>1028,1198=>642,1199=>515,
-1200=>642,1201=>515,1202=>709,1203=>536,1204=>909,1205=>749,1206=>822,1207=>712,1210=>819,1211=>654,
-1216=>421,1217=>1181,1218=>1175,1219=>782,1220=>624,1223=>850,1224=>659,1227=>885,1228=>659,1231=>342,
-1232=>733,1233=>583,1234=>733,1235=>583,1236=>931,1237=>877,1238=>686,1239=>572,1240=>784,1241=>572,
-1242=>784,1243=>572,1244=>1181,1245=>1175,1246=>649,1247=>574,1248=>591,1249=>511,1250=>850,1251=>654,
-1252=>850,1253=>654,1254=>784,1255=>600,1256=>784,1257=>600,1258=>784,1259=>600,1260=>716,1261=>580,
-1262=>730,1263=>538,1264=>730,1265=>538,1266=>730,1267=>538,1268=>822,1269=>643,1270=>621,1271=>506,
-1272=>1081,1273=>916,1296=>649,1297=>574,1298=>795,1299=>659,1300=>1123,1301=>904,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>688,4257=>851,4258=>788,4259=>795,4260=>712,4261=>979,4262=>921,4263=>1100,
-4264=>587,4265=>745,4266=>955,4267=>954,4268=>725,4269=>1030,4270=>880,4271=>820,4272=>1007,4273=>721,
-4274=>689,4275=>977,4276=>887,4277=>968,4278=>738,4279=>758,4280=>748,4281=>759,4282=>826,4283=>978,
-4284=>701,4285=>748,4286=>740,4287=>1008,4288=>1019,4289=>730,4290=>812,4291=>730,4292=>801,4293=>965,
-4304=>535,4305=>563,4306=>579,4307=>798,4308=>553,4309=>549,4310=>599,4311=>823,4312=>552,4313=>540,
-4314=>1008,4315=>589,4316=>576,4317=>791,4318=>561,4319=>571,4320=>790,4321=>591,4322=>721,4323=>676,
-4324=>782,4325=>575,4326=>820,4327=>559,4328=>583,4329=>576,4330=>656,4331=>577,4332=>575,4333=>566,
-4334=>606,4335=>663,4336=>563,4337=>591,4338=>563,4339=>563,4340=>562,4341=>603,4342=>846,4343=>612,
-4344=>572,4345=>605,4346=>562,4347=>401,4348=>327,7426=>846,7432=>458,7433=>288,7444=>890,7446=>600,
-7447=>600,7453=>663,7454=>853,7455=>853,7468=>439,7469=>586,7470=>479,7472=>491,7473=>432,7474=>432,
-7475=>483,7476=>536,7477=>265,7478=>268,7479=>492,7480=>398,7481=>627,7482=>518,7483=>518,7484=>493,
-7486=>426,7487=>471,7488=>422,7489=>494,7490=>637,7491=>419,7492=>419,7493=>448,7494=>591,7495=>448,
-7496=>448,7497=>400,7498=>400,7499=>370,7500=>370,7501=>448,7502=>270,7503=>471,7504=>655,7505=>426,
-7506=>420,7507=>384,7508=>420,7509=>420,7510=>448,7511=>333,7512=>468,7513=>390,7514=>655,7515=>442,
-7522=>215,7523=>372,7524=>468,7525=>442,7543=>576,7544=>536,7547=>342,7557=>342,7579=>448,7580=>384,
-7581=>384,7582=>420,7583=>370,7584=>244,7585=>335,7586=>448,7587=>470,7588=>270,7589=>276,7590=>270,
-7591=>270,7592=>333,7593=>331,7594=>289,7595=>387,7596=>613,7597=>655,7598=>529,7599=>528,7600=>425,
-7601=>420,7602=>470,7603=>360,7604=>348,7605=>333,7606=>468,7607=>427,7609=>439,7610=>329,7611=>321,
-7612=>474,7613=>371,7614=>407,7615=>420,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>698,7681=>583,7682=>760,7683=>629,7684=>760,7685=>629,7686=>760,7687=>629,7688=>716,7689=>548,
-7690=>780,7691=>629,7692=>780,7693=>629,7694=>780,7695=>629,7696=>780,7697=>629,7698=>780,7699=>629,
-7700=>686,7701=>572,7702=>686,7703=>572,7704=>686,7705=>572,7706=>686,7707=>572,7708=>686,7709=>572,
-7710=>639,7711=>387,7712=>769,7713=>629,7714=>850,7715=>654,7716=>850,7717=>654,7718=>850,7719=>654,
-7720=>850,7721=>654,7722=>850,7723=>654,7724=>421,7725=>342,7728=>782,7729=>624,7730=>782,7731=>624,
-7732=>782,7733=>624,7734=>633,7735=>342,7736=>633,7737=>342,7738=>633,7739=>342,7740=>633,7741=>342,
-7742=>996,7743=>952,7744=>996,7745=>952,7746=>996,7747=>952,7748=>822,7749=>654,7750=>822,7751=>654,
-7752=>822,7753=>654,7754=>822,7755=>654,7756=>784,7757=>600,7760=>784,7761=>600,7762=>784,7763=>600,
-7764=>677,7765=>629,7766=>677,7767=>629,7768=>748,7769=>474,7770=>748,7771=>474,7772=>748,7773=>474,
-7774=>748,7775=>474,7776=>650,7777=>506,7778=>650,7779=>506,7784=>650,7785=>506,7786=>669,7787=>416,
-7788=>669,7789=>416,7790=>669,7791=>416,7792=>669,7793=>416,7794=>785,7795=>654,7796=>785,7797=>654,
-7798=>785,7799=>654,7800=>785,7801=>654,7802=>785,7803=>654,7804=>698,7805=>523,7806=>698,7807=>523,
-7808=>1011,7809=>774,7810=>1011,7811=>774,7812=>1011,7813=>774,7814=>1011,7815=>774,7816=>1011,7817=>774,
-7818=>698,7819=>536,7820=>698,7821=>536,7822=>642,7823=>523,7824=>657,7825=>511,7826=>657,7827=>511,
-7828=>657,7829=>511,7830=>654,7831=>416,7832=>774,7833=>523,7834=>913,7835=>387,7838=>852,7839=>600,
-7840=>698,7841=>583,7842=>698,7843=>583,7852=>698,7853=>583,7854=>698,7855=>583,7856=>698,7857=>583,
-7858=>698,7859=>583,7860=>698,7861=>583,7862=>698,7863=>583,7864=>686,7865=>572,7866=>686,7867=>572,
-7868=>686,7869=>572,7878=>686,7879=>572,7880=>421,7881=>342,7882=>421,7883=>342,7884=>784,7885=>600,
-7886=>784,7887=>600,7896=>784,7897=>600,7908=>785,7909=>654,7910=>785,7911=>654,7922=>642,7923=>523,
-7924=>642,7925=>523,7926=>642,7927=>523,7928=>642,7929=>523,7936=>692,7937=>692,7938=>692,7939=>692,
-7940=>692,7941=>692,7942=>692,7943=>692,7944=>698,7945=>698,7946=>880,7947=>880,7948=>748,7949=>764,
-7950=>698,7951=>698,7952=>547,7953=>547,7954=>547,7955=>547,7956=>547,7957=>547,7960=>826,7961=>817,
-7962=>1052,7963=>1052,7964=>984,7965=>1007,7968=>654,7969=>654,7970=>654,7971=>654,7972=>654,7973=>654,
-7974=>654,7975=>654,7976=>990,7977=>984,7978=>1222,7979=>1225,7980=>1151,7981=>1177,7982=>1077,7983=>1074,
-7984=>435,7985=>435,7986=>435,7987=>435,7988=>435,7989=>435,7990=>435,7991=>435,7992=>566,7993=>555,
-7994=>790,7995=>792,7996=>719,7997=>748,7998=>650,7999=>642,8000=>600,8001=>600,8002=>600,8003=>600,
-8004=>600,8005=>600,8008=>810,8009=>841,8010=>1116,8011=>1113,8012=>931,8013=>959,8016=>624,8017=>624,
-8018=>624,8019=>624,8020=>624,8021=>624,8022=>624,8023=>624,8025=>830,8027=>1067,8029=>1020,8031=>917,
-8032=>857,8033=>857,8034=>857,8035=>857,8036=>857,8037=>857,8038=>857,8039=>857,8040=>838,8041=>867,
-8042=>1141,8043=>1146,8044=>949,8045=>979,8046=>920,8047=>954,8048=>692,8049=>692,8050=>547,8051=>547,
-8052=>654,8053=>654,8054=>435,8055=>435,8056=>600,8057=>600,8058=>624,8059=>624,8060=>857,8061=>857,
-8064=>692,8065=>692,8066=>692,8067=>692,8068=>692,8069=>692,8070=>692,8071=>692,8072=>698,8073=>698,
-8074=>880,8075=>880,8076=>748,8077=>764,8078=>698,8079=>698,8080=>654,8081=>654,8082=>654,8083=>654,
-8084=>654,8085=>654,8086=>654,8087=>654,8088=>990,8089=>984,8090=>1222,8091=>1225,8092=>1151,8093=>1177,
-8094=>1077,8095=>1074,8096=>857,8097=>857,8098=>857,8099=>857,8100=>857,8101=>857,8102=>857,8103=>857,
-8104=>838,8105=>867,8106=>1141,8107=>1146,8108=>949,8109=>979,8110=>920,8111=>954,8112=>692,8113=>692,
-8114=>692,8115=>692,8116=>692,8118=>692,8119=>692,8120=>698,8121=>698,8122=>729,8123=>698,8124=>698,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>654,8131=>654,8132=>654,8134=>654,8135=>654,
-8136=>899,8137=>852,8138=>1072,8139=>1006,8140=>850,8141=>450,8142=>450,8143=>450,8144=>435,8145=>435,
-8146=>435,8147=>435,8150=>435,8151=>435,8152=>421,8153=>421,8154=>642,8155=>595,8157=>450,8158=>450,
-8159=>450,8160=>624,8161=>624,8162=>624,8163=>624,8164=>598,8165=>598,8166=>624,8167=>624,8168=>642,
-8169=>642,8170=>917,8171=>857,8172=>819,8173=>450,8174=>450,8175=>450,8178=>857,8179=>857,8180=>857,
-8182=>857,8183=>857,8184=>962,8185=>798,8186=>991,8187=>820,8188=>801,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>626,8200=>313,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>374,8209=>374,8210=>626,8213=>900,8214=>450,
-8215=>450,8219=>313,8223=>518,8227=>575,8228=>313,8229=>606,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1631,8242=>237,8243=>402,8244=>567,8245=>237,8246=>402,8247=>567,8248=>659,
-8252=>566,8253=>527,8254=>450,8258=>920,8260=>150,8261=>426,8262=>426,8263=>974,8264=>770,8265=>770,
-8267=>572,8268=>450,8269=>450,8270=>470,8271=>332,8273=>470,8274=>500,8275=>900,8279=>731,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>394,8305=>215,8308=>394,8309=>394,8310=>394,8311=>394,8312=>394,8313=>394,8314=>475,
-8315=>475,8316=>475,8317=>268,8318=>268,8319=>412,8320=>394,8321=>394,8322=>394,8323=>394,8324=>394,
-8325=>394,8326=>394,8327=>394,8328=>394,8329=>394,8330=>475,8331=>475,8332=>475,8333=>268,8334=>268,
-8336=>419,8337=>400,8338=>420,8339=>338,8340=>400,8358=>626,8367=>1039,8369=>710,8372=>788,8373=>626,
-8451=>1078,8457=>1001,8462=>654,8463=>654,8470=>978,8486=>801,8487=>801,8490=>782,8491=>698,8513=>707,
-8514=>518,8515=>573,8516=>684,8523=>813,8531=>932,8532=>932,8533=>932,8534=>932,8535=>932,8536=>932,
-8537=>932,8538=>932,8539=>932,8540=>932,8541=>932,8542=>932,8543=>554,8544=>421,8545=>663,8546=>904,
-8547=>984,8548=>698,8549=>1014,8550=>1256,8551=>1498,8552=>962,8553=>698,8554=>970,8555=>1212,8556=>633,
-8557=>716,8558=>780,8559=>996,8560=>342,8561=>684,8562=>1025,8563=>865,8564=>523,8565=>865,8566=>1207,
-8567=>1548,8568=>878,8569=>536,8570=>878,8571=>1220,8572=>342,8573=>548,8574=>629,8575=>952,8576=>1129,
-8577=>780,8578=>1141,8579=>716,8580=>548,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,
-8598=>754,8599=>754,8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,
-8608=>754,8609=>754,8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,
-8618=>754,8619=>754,8620=>754,8621=>754,8622=>754,8623=>765,8624=>754,8625=>754,8626=>754,8627=>754,
-8628=>754,8629=>754,8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,
-8638=>754,8639=>754,8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,
-8648=>754,8649=>754,8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,
-8658=>754,8659=>754,8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,
-8668=>754,8669=>754,8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,
-8678=>754,8679=>754,8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,
-8688=>754,8689=>754,8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,
-8698=>754,8699=>754,8700=>754,8701=>754,8702=>754,8703=>754,8704=>577,8706=>480,8707=>558,8708=>558,
-8710=>677,8711=>677,8712=>666,8713=>666,8715=>666,8716=>666,8719=>757,8720=>757,8721=>677,8722=>754,
-8723=>754,8724=>754,8725=>329,8727=>622,8728=>466,8729=>466,8730=>591,8731=>591,8732=>591,8733=>604,
-8734=>750,8735=>754,8736=>754,8739=>292,8740=>546,8741=>476,8742=>696,8743=>730,8744=>730,8745=>754,
-8746=>754,8747=>521,8748=>900,8749=>1252,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,
-8770=>754,8771=>754,8776=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>974,8789=>974,8800=>754,
-8801=>754,8804=>754,8805=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,
-8845=>754,8846=>754,8847=>754,8848=>754,8849=>754,8850=>754,8851=>754,8852=>754,8853=>754,8854=>754,
-8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,
-8865=>754,8866=>795,8867=>795,8868=>864,8869=>864,8870=>554,8871=>554,8872=>795,8873=>795,8874=>795,
-8875=>971,8876=>795,8877=>795,8878=>795,8879=>971,8901=>358,8962=>751,8968=>426,8969=>426,8970=>426,
-8971=>426,8976=>754,8977=>484,8984=>835,8985=>754,8992=>521,8993=>521,8997=>900,9000=>1299,9085=>907,
-9134=>521,9167=>850,9251=>751,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,
-9607=>692,9608=>692,9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,
-9617=>692,9618=>692,9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,
-9627=>692,9628=>692,9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,
-9637=>850,9638=>850,9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,
-9647=>495,9648=>692,9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,
-9657=>452,9658=>692,9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,
-9667=>452,9668=>692,9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,
-9677=>785,9678=>785,9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,
-9687=>474,9688=>712,9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,
-9697=>785,9698=>692,9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,
-9707=>850,9708=>692,9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,
-9717=>785,9718=>785,9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,
-9727=>692,9728=>807,9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,
-9794=>807,9795=>807,9796=>807,9797=>807,9798=>807,9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,
-9828=>807,9829=>807,9830=>807,9831=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,
-9839=>435,10145=>754,10181=>411,10182=>411,10208=>444,10216=>411,10217=>411,10224=>754,10225=>754,10226=>754,
-10227=>754,10228=>930,10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,
-10237=>1290,10238=>1290,10239=>1290,10240=>703,10241=>703,10242=>703,10243=>703,10244=>703,10245=>703,10246=>703,
-10247=>703,10248=>703,10249=>703,10250=>703,10251=>703,10252=>703,10253=>703,10254=>703,10255=>703,10256=>703,
-10257=>703,10258=>703,10259=>703,10260=>703,10261=>703,10262=>703,10263=>703,10264=>703,10265=>703,10266=>703,
-10267=>703,10268=>703,10269=>703,10270=>703,10271=>703,10272=>703,10273=>703,10274=>703,10275=>703,10276=>703,
-10277=>703,10278=>703,10279=>703,10280=>703,10281=>703,10282=>703,10283=>703,10284=>703,10285=>703,10286=>703,
-10287=>703,10288=>703,10289=>703,10290=>703,10291=>703,10292=>703,10293=>703,10294=>703,10295=>703,10296=>703,
-10297=>703,10298=>703,10299=>703,10300=>703,10301=>703,10302=>703,10303=>703,10304=>703,10305=>703,10306=>703,
-10307=>703,10308=>703,10309=>703,10310=>703,10311=>703,10312=>703,10313=>703,10314=>703,10315=>703,10316=>703,
-10317=>703,10318=>703,10319=>703,10320=>703,10321=>703,10322=>703,10323=>703,10324=>703,10325=>703,10326=>703,
-10327=>703,10328=>703,10329=>703,10330=>703,10331=>703,10332=>703,10333=>703,10334=>703,10335=>703,10336=>703,
-10337=>703,10338=>703,10339=>703,10340=>703,10341=>703,10342=>703,10343=>703,10344=>703,10345=>703,10346=>703,
-10347=>703,10348=>703,10349=>703,10350=>703,10351=>703,10352=>703,10353=>703,10354=>703,10355=>703,10356=>703,
-10357=>703,10358=>703,10359=>703,10360=>703,10361=>703,10362=>703,10363=>703,10364=>703,10365=>703,10366=>703,
-10367=>703,10368=>703,10369=>703,10370=>703,10371=>703,10372=>703,10373=>703,10374=>703,10375=>703,10376=>703,
-10377=>703,10378=>703,10379=>703,10380=>703,10381=>703,10382=>703,10383=>703,10384=>703,10385=>703,10386=>703,
-10387=>703,10388=>703,10389=>703,10390=>703,10391=>703,10392=>703,10393=>703,10394=>703,10395=>703,10396=>703,
-10397=>703,10398=>703,10399=>703,10400=>703,10401=>703,10402=>703,10403=>703,10404=>703,10405=>703,10406=>703,
-10407=>703,10408=>703,10409=>703,10410=>703,10411=>703,10412=>703,10413=>703,10414=>703,10415=>703,10416=>703,
-10417=>703,10418=>703,10419=>703,10420=>703,10421=>703,10422=>703,10423=>703,10424=>703,10425=>703,10426=>703,
-10427=>703,10428=>703,10429=>703,10430=>703,10431=>703,10432=>703,10433=>703,10434=>703,10435=>703,10436=>703,
-10437=>703,10438=>703,10439=>703,10440=>703,10441=>703,10442=>703,10443=>703,10444=>703,10445=>703,10446=>703,
-10447=>703,10448=>703,10449=>703,10450=>703,10451=>703,10452=>703,10453=>703,10454=>703,10455=>703,10456=>703,
-10457=>703,10458=>703,10459=>703,10460=>703,10461=>703,10462=>703,10463=>703,10464=>703,10465=>703,10466=>703,
-10467=>703,10468=>703,10469=>703,10470=>703,10471=>703,10472=>703,10473=>703,10474=>703,10475=>703,10476=>703,
-10477=>703,10478=>703,10479=>703,10480=>703,10481=>703,10482=>703,10483=>703,10484=>703,10485=>703,10486=>703,
-10487=>703,10488=>703,10489=>703,10490=>703,10491=>703,10492=>703,10493=>703,10494=>703,10495=>703,10496=>754,
-10497=>754,10498=>754,10499=>754,10500=>754,10501=>754,10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,
-10507=>754,10508=>754,10509=>754,10510=>754,10511=>754,10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,
-10517=>754,10518=>754,10519=>754,10520=>754,10521=>754,10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,
-10527=>754,10528=>754,10529=>754,10530=>754,10531=>754,10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,
-10537=>754,10538=>754,10539=>754,10540=>754,10541=>754,10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,
-10547=>754,10548=>754,10549=>754,10550=>754,10551=>754,10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,
-10557=>754,10558=>754,10559=>754,10560=>754,10561=>754,10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,
-10567=>754,10568=>754,10569=>754,10570=>754,10571=>754,10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,
-10577=>754,10578=>754,10579=>754,10580=>754,10581=>754,10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,
-10587=>754,10588=>754,10589=>754,10590=>754,10591=>754,10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,
-10597=>754,10598=>754,10599=>754,10600=>754,10601=>754,10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,
-10607=>754,10608=>754,10609=>754,10610=>754,10611=>754,10612=>754,10613=>754,10614=>754,10615=>929,10616=>754,
-10617=>754,10618=>864,10619=>754,10620=>754,10621=>754,10622=>754,10623=>754,10731=>444,10764=>1604,10765=>549,
-10766=>549,10799=>754,11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,
-11016=>754,11017=>754,11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,
-11026=>850,11027=>850,11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11364=>748,
-11367=>850,11368=>654,11369=>782,11370=>624,11371=>657,11372=>511,11374=>996,11375=>698,11381=>701,11382=>519,
-11383=>814,11385=>514,11386=>600,11388=>282,11389=>439,11520=>695,11521=>571,11522=>723,11523=>592,11524=>708,
-11525=>866,11526=>680,11527=>864,11528=>555,11529=>581,11530=>866,11531=>567,11532=>581,11533=>866,11534=>761,
-11535=>779,11536=>865,11537=>580,11538=>580,11539=>863,11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,
-11545=>584,11546=>619,11547=>842,11548=>883,11549=>613,11550=>608,11551=>766,11552=>1002,11553=>569,11554=>580,
-11555=>582,11556=>674,11557=>822,11800=>527,11810=>426,11811=>426,11812=>426,11813=>426,11822=>527,42564=>650,
-42565=>506,42566=>421,42567=>342,42576=>1200,42577=>976,42580=>1158,42581=>923,42582=>1158,42583=>926,42760=>450,
-42761=>450,42762=>450,42763=>450,42764=>450,42765=>450,42766=>450,42767=>450,42768=>450,42769=>450,42770=>450,
-42771=>450,42772=>450,42773=>450,42774=>450,42779=>346,42780=>346,42781=>249,42782=>249,42783=>249,42891=>395,
-42892=>275,62464=>653,62465=>663,62466=>707,62467=>917,62468=>663,62469=>658,62470=>716,62471=>952,62472=>663,
-62473=>663,62474=>1196,62475=>679,62476=>678,62477=>922,62478=>663,62479=>678,62480=>963,62481=>736,62482=>783,
-62483=>737,62484=>914,62485=>677,62486=>907,62487=>677,62488=>684,62489=>678,62490=>720,62491=>678,62492=>684,
-62493=>664,62494=>721,62495=>860,62496=>663,62497=>762,62498=>664,62499=>663,62500=>663,62501=>714,62502=>930,
-62504=>813,63172=>506,63173=>600,63174=>629,63175=>654,63176=>952,63185=>450,63188=>450,64256=>744,64257=>654,
-64258=>654,64259=>998,64260=>1031,64261=>791,64262=>874,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,
-65029=>0,65030=>0,65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,
-65039=>0,65529=>0,65530=>0,65531=>0,65532=>0,65533=>1002);
-$enc='';
-$diff='';
-$file='dejavuserifcondensedbi.z';
-$ctg='dejavuserifcondensedbi.ctg.z';
-$originalsize=293472;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedi.php
deleted file mode 100644
index 024d59d13ac..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifcondensedi.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerifCondensed-Italic';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-59,'Flags'=>96,'FontBBox'=>'[-755 -347 1485 1227]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>540);
-$up=-63;
-$ut=44;
-$dw=540;
-$cw=array(
-0=>540,32=>286,33=>361,34=>414,35=>754,36=>572,37=>855,38=>801,39=>247,40=>351,
-41=>351,42=>450,43=>754,44=>286,45=>304,46=>286,47=>303,48=>572,49=>572,50=>572,
-51=>572,52=>572,53=>572,54=>572,55=>572,56=>572,57=>572,58=>303,59=>303,60=>754,
-61=>754,62=>754,63=>482,64=>900,65=>650,66=>661,67=>688,68=>721,69=>657,70=>624,
-71=>719,72=>785,73=>355,74=>360,75=>672,76=>598,77=>921,78=>787,79=>738,80=>605,
-81=>738,82=>677,83=>616,84=>600,85=>758,86=>650,87=>925,88=>641,89=>594,90=>625,
-91=>351,92=>303,93=>351,94=>754,95=>450,96=>450,97=>536,98=>576,99=>504,100=>576,
-101=>532,102=>333,103=>576,104=>580,105=>288,106=>279,107=>545,108=>288,109=>853,110=>580,
-111=>542,112=>576,113=>576,114=>430,115=>461,116=>361,117=>580,118=>508,119=>770,120=>507,
-121=>508,122=>474,123=>572,124=>303,125=>572,126=>754,8364=>572,8218=>286,402=>333,8222=>466,
-8230=>900,8224=>450,8225=>450,710=>450,8240=>1208,352=>616,8249=>360,338=>1023,381=>625,8216=>286,
-8217=>286,8220=>460,8221=>460,8226=>531,8211=>450,8212=>900,732=>450,8482=>900,353=>461,8250=>360,
-339=>890,382=>474,376=>594,160=>286,161=>361,162=>572,163=>572,164=>572,165=>572,166=>303,
-167=>450,168=>450,169=>900,170=>427,171=>550,172=>754,173=>304,174=>900,175=>450,176=>450,
-177=>754,178=>360,179=>360,180=>450,181=>584,182=>572,183=>286,184=>450,185=>360,186=>423,
-187=>550,188=>872,189=>872,190=>872,191=>482,192=>650,193=>650,194=>650,195=>650,196=>650,
-197=>650,198=>901,199=>688,200=>657,201=>657,202=>657,203=>657,204=>355,205=>355,206=>355,
-207=>355,208=>726,209=>787,210=>738,211=>738,212=>738,213=>738,214=>738,215=>754,216=>738,
-217=>758,218=>758,219=>758,220=>758,221=>594,222=>608,223=>601,224=>536,225=>536,226=>536,
-227=>536,228=>536,229=>536,230=>846,231=>504,232=>532,233=>532,234=>532,235=>532,236=>288,
-237=>288,238=>288,239=>288,240=>542,241=>580,242=>542,243=>542,244=>542,245=>542,246=>542,
-247=>754,248=>542,249=>580,250=>580,251=>580,252=>580,253=>508,254=>576,255=>508,256=>650,
-257=>536,258=>650,259=>536,260=>650,261=>536,262=>688,263=>504,264=>688,265=>504,266=>688,
-267=>504,268=>688,269=>504,270=>721,271=>576,272=>726,273=>576,274=>657,275=>532,276=>657,
-277=>532,278=>657,279=>532,280=>657,281=>532,282=>657,283=>532,284=>719,285=>576,286=>719,
-287=>576,288=>719,289=>576,290=>719,291=>576,292=>785,293=>580,294=>785,295=>580,296=>355,
-297=>288,298=>355,299=>288,300=>355,301=>288,302=>355,303=>288,304=>355,305=>288,306=>721,
-307=>479,308=>360,309=>279,310=>672,311=>545,312=>545,313=>598,314=>288,315=>598,316=>288,
-317=>598,318=>360,319=>604,320=>418,321=>602,322=>292,323=>787,324=>580,325=>787,326=>580,
-327=>787,328=>580,329=>779,330=>758,331=>580,332=>738,333=>542,334=>738,335=>542,336=>738,
-337=>542,340=>677,341=>430,342=>677,343=>430,344=>677,345=>430,346=>616,347=>461,348=>616,
-349=>461,350=>616,351=>461,354=>600,355=>361,356=>600,357=>361,358=>600,359=>361,360=>758,
-361=>580,362=>758,363=>580,364=>758,365=>580,366=>758,367=>580,368=>758,369=>580,370=>758,
-371=>580,372=>925,373=>770,374=>594,375=>508,377=>625,378=>474,379=>625,380=>474,383=>333,
-384=>576,385=>661,386=>661,387=>576,388=>661,389=>576,390=>688,391=>688,392=>504,393=>726,
-394=>721,395=>661,396=>576,397=>542,398=>657,399=>738,400=>561,401=>624,403=>719,404=>641,
-405=>839,406=>355,407=>355,408=>672,409=>545,410=>288,411=>570,412=>853,413=>787,414=>580,
-415=>738,416=>738,417=>542,418=>936,419=>726,420=>605,421=>576,422=>677,423=>616,424=>461,
-425=>636,426=>292,427=>361,428=>600,429=>361,430=>600,431=>758,432=>580,433=>746,434=>684,
-435=>664,436=>670,437=>625,438=>474,439=>508,440=>508,441=>508,443=>572,444=>618,445=>508,
-446=>482,448=>265,449=>443,450=>413,451=>265,452=>1347,453=>1195,454=>1050,455=>958,456=>876,
-457=>567,458=>1148,459=>1066,460=>858,461=>650,462=>536,463=>355,464=>288,465=>738,466=>542,
-467=>758,468=>580,469=>758,470=>580,471=>758,472=>580,473=>758,474=>580,475=>758,476=>580,
-477=>532,478=>650,479=>536,480=>650,481=>536,482=>901,483=>846,484=>763,485=>576,486=>719,
-487=>576,488=>672,489=>545,490=>738,491=>542,492=>738,493=>542,494=>508,495=>508,496=>288,
-497=>1347,498=>1195,499=>1050,500=>719,501=>576,502=>1038,504=>787,505=>580,506=>650,507=>536,
-508=>901,509=>846,510=>738,511=>542,512=>650,513=>536,514=>650,515=>536,516=>657,517=>532,
-518=>657,519=>532,520=>355,521=>288,522=>355,523=>288,524=>738,525=>542,526=>738,527=>542,
-528=>677,529=>430,530=>677,531=>430,532=>758,533=>580,534=>758,535=>580,536=>616,537=>461,
-538=>600,539=>361,540=>564,541=>469,542=>785,543=>580,544=>758,545=>732,548=>625,549=>474,
-550=>650,551=>536,552=>657,553=>532,554=>738,555=>542,556=>738,557=>542,558=>738,559=>542,
-560=>738,561=>542,562=>594,563=>508,564=>450,565=>748,566=>444,567=>279,568=>864,569=>864,
-570=>650,571=>688,572=>504,573=>598,574=>600,575=>461,576=>474,577=>525,578=>417,581=>650,
-592=>536,593=>576,594=>607,595=>576,596=>504,597=>504,598=>582,599=>614,600=>532,601=>532,
-602=>759,603=>483,604=>458,605=>695,606=>552,607=>283,608=>615,609=>576,610=>489,611=>641,
-612=>507,613=>580,614=>580,615=>580,616=>288,617=>353,618=>288,619=>342,620=>409,621=>326,
-622=>633,623=>853,624=>853,625=>853,626=>579,627=>624,628=>581,629=>542,630=>711,631=>583,
-632=>542,633=>451,634=>451,635=>496,636=>430,637=>430,638=>407,639=>407,640=>534,641=>534,
-642=>461,643=>244,644=>333,645=>438,646=>292,647=>361,648=>361,649=>580,650=>558,651=>547,
-652=>508,653=>770,654=>508,655=>589,656=>537,657=>504,658=>508,659=>504,660=>482,661=>482,
-662=>482,663=>461,664=>738,665=>506,666=>552,667=>588,668=>600,669=>329,670=>545,671=>581,
-672=>615,673=>482,674=>482,675=>896,676=>930,677=>898,678=>728,679=>538,680=>704,681=>804,
-682=>582,683=>608,684=>538,685=>398,686=>703,687=>690,688=>389,689=>387,690=>237,691=>312,
-692=>312,693=>387,694=>352,695=>485,696=>320,697=>250,699=>286,700=>286,701=>286,702=>276,
-703=>276,704=>252,705=>252,711=>450,712=>254,713=>450,716=>254,720=>303,721=>303,722=>276,
-723=>276,726=>353,728=>450,729=>450,730=>450,731=>450,733=>450,734=>375,736=>403,737=>218,
-738=>303,739=>319,740=>252,741=>444,742=>444,743=>444,744=>444,745=>444,750=>435,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>666,881=>478,884=>250,
-885=>250,890=>450,891=>504,892=>504,893=>504,894=>303,900=>450,901=>450,902=>650,903=>286,
-904=>810,905=>935,906=>505,908=>751,910=>808,911=>767,912=>353,913=>650,914=>661,915=>624,
-916=>650,917=>657,918=>625,919=>785,920=>738,921=>355,922=>672,923=>650,924=>921,925=>787,
-926=>633,927=>738,928=>785,929=>605,931=>636,932=>600,933=>594,934=>738,935=>641,936=>789,
-937=>746,938=>355,939=>594,940=>607,941=>483,942=>539,943=>353,944=>547,945=>607,946=>520,
-947=>538,948=>542,949=>483,950=>488,951=>539,952=>542,953=>353,954=>590,955=>570,956=>584,
-957=>547,958=>496,959=>542,960=>591,961=>529,962=>504,963=>614,964=>498,965=>547,966=>630,
-967=>545,968=>706,969=>734,970=>353,971=>547,972=>542,973=>547,974=>734,976=>524,977=>643,
-978=>618,979=>787,980=>618,981=>613,982=>734,983=>561,984=>738,985=>542,986=>688,987=>504,
-988=>624,989=>417,990=>531,991=>593,992=>704,993=>519,1008=>561,1009=>529,1010=>504,1011=>279,
-1012=>738,1013=>504,1014=>504,1015=>608,1016=>576,1017=>688,1018=>921,1019=>637,1020=>529,1021=>688,
-1022=>688,1023=>688,1024=>657,1025=>657,1026=>719,1027=>596,1028=>688,1029=>616,1030=>355,1031=>355,
-1032=>360,1033=>976,1034=>1006,1035=>785,1036=>696,1037=>785,1038=>650,1039=>785,1040=>681,1041=>661,
-1042=>661,1043=>596,1044=>731,1045=>657,1046=>1011,1047=>561,1048=>785,1049=>785,1050=>696,1051=>751,
-1052=>921,1053=>785,1054=>738,1055=>785,1056=>605,1057=>688,1058=>600,1059=>650,1060=>747,1061=>641,
-1062=>785,1063=>695,1064=>1027,1065=>1027,1066=>715,1067=>885,1068=>606,1069=>688,1070=>1074,1071=>727,
-1072=>536,1073=>549,1074=>523,1075=>455,1076=>570,1077=>532,1078=>1023,1079=>491,1080=>580,1081=>580,
-1082=>537,1083=>573,1084=>746,1085=>593,1086=>542,1087=>580,1088=>576,1089=>504,1090=>853,1091=>522,
-1092=>704,1093=>507,1094=>628,1095=>560,1096=>853,1097=>901,1098=>600,1099=>733,1100=>490,1101=>504,
-1102=>792,1103=>596,1104=>532,1105=>532,1106=>561,1107=>455,1108=>504,1109=>461,1110=>288,1111=>288,
-1112=>279,1113=>773,1114=>790,1115=>580,1116=>537,1117=>580,1118=>522,1119=>580,1122=>686,1123=>794,
-1124=>1016,1125=>750,1130=>1011,1131=>828,1136=>849,1137=>812,1138=>738,1139=>497,1140=>773,1141=>610,
-1164=>636,1165=>490,1168=>604,1169=>476,1170=>596,1171=>455,1172=>657,1173=>552,1174=>1011,1175=>1023,
-1176=>561,1177=>491,1178=>696,1179=>544,1182=>696,1183=>537,1184=>803,1185=>602,1186=>785,1187=>641,
-1188=>1025,1189=>771,1190=>1085,1191=>848,1194=>688,1195=>504,1196=>600,1197=>911,1198=>594,1199=>514,
-1200=>594,1201=>514,1202=>641,1203=>566,1204=>842,1205=>659,1206=>674,1207=>609,1210=>674,1211=>580,
-1216=>355,1217=>1011,1218=>1023,1219=>672,1220=>545,1223=>785,1224=>600,1227=>674,1228=>600,1231=>288,
-1232=>681,1233=>536,1234=>681,1235=>536,1236=>901,1237=>846,1238=>657,1239=>532,1240=>738,1241=>532,
-1242=>738,1243=>532,1244=>1011,1245=>1023,1246=>561,1247=>491,1248=>508,1249=>508,1250=>785,1251=>580,
-1252=>785,1253=>580,1254=>738,1255=>542,1256=>738,1257=>542,1258=>738,1259=>542,1260=>688,1261=>504,
-1262=>650,1263=>522,1264=>650,1265=>522,1266=>650,1267=>522,1268=>695,1269=>560,1270=>596,1271=>455,
-1272=>885,1273=>733,1296=>561,1297=>491,1298=>751,1299=>573,1300=>1079,1301=>845,1306=>738,1307=>576,
-1308=>925,1309=>770,4256=>659,4257=>773,4258=>753,4259=>782,4260=>668,4261=>892,4262=>833,4263=>1000,
-4264=>519,4265=>684,4266=>875,4267=>856,4268=>677,4269=>976,4270=>815,4271=>754,4272=>944,4273=>668,
-4274=>611,4275=>922,4276=>852,4277=>926,4278=>667,4279=>668,4280=>668,4281=>668,4282=>800,4283=>852,
-4284=>651,4285=>688,4286=>668,4287=>871,4288=>909,4289=>641,4290=>786,4291=>669,4292=>762,4293=>864,
-4304=>495,4305=>523,4306=>539,4307=>759,4308=>514,4309=>510,4310=>558,4311=>783,4312=>512,4313=>500,
-4314=>968,4315=>536,4316=>536,4317=>751,4318=>521,4319=>531,4320=>750,4321=>546,4322=>682,4323=>631,
-4324=>742,4325=>535,4326=>781,4327=>520,4328=>543,4329=>536,4330=>616,4331=>537,4332=>501,4333=>527,
-4334=>562,4335=>624,4336=>523,4337=>551,4338=>523,4339=>523,4340=>522,4341=>593,4342=>806,4343=>572,
-4344=>532,4345=>565,4346=>522,4347=>410,4348=>335,7426=>846,7432=>458,7433=>288,7444=>890,7446=>542,
-7447=>542,7453=>663,7454=>853,7455=>853,7468=>409,7469=>567,7470=>417,7472=>454,7473=>413,7474=>413,
-7475=>453,7476=>494,7477=>224,7478=>227,7479=>423,7480=>376,7481=>580,7482=>496,7483=>496,7484=>464,
-7486=>381,7487=>426,7488=>378,7489=>478,7490=>583,7491=>347,7492=>347,7493=>360,7494=>556,7495=>360,
-7496=>360,7497=>348,7498=>348,7499=>385,7500=>306,7501=>360,7502=>157,7503=>328,7504=>552,7505=>359,
-7506=>347,7507=>312,7508=>347,7509=>347,7510=>360,7511=>222,7512=>359,7513=>417,7514=>552,7515=>335,
-7522=>181,7523=>312,7524=>359,7525=>335,7543=>576,7544=>494,7547=>334,7557=>288,7579=>439,7580=>317,
-7581=>317,7582=>426,7583=>385,7584=>209,7585=>285,7586=>439,7587=>359,7588=>181,7589=>181,7590=>181,
-7591=>181,7592=>286,7593=>237,7594=>236,7595=>409,7596=>552,7597=>552,7598=>445,7599=>443,7600=>438,
-7601=>347,7602=>426,7603=>374,7604=>269,7605=>301,7606=>359,7607=>429,7609=>417,7610=>320,7611=>298,
-7612=>376,7613=>376,7614=>406,7615=>426,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>650,7681=>536,7682=>661,7683=>576,7684=>661,7685=>576,7686=>661,7687=>576,7688=>688,7689=>504,
-7690=>721,7691=>576,7692=>721,7693=>576,7694=>721,7695=>576,7696=>721,7697=>576,7698=>721,7699=>576,
-7700=>657,7701=>532,7702=>657,7703=>532,7704=>657,7705=>532,7706=>657,7707=>532,7708=>657,7709=>532,
-7710=>624,7711=>333,7712=>719,7713=>576,7714=>785,7715=>580,7716=>785,7717=>580,7718=>785,7719=>580,
-7720=>785,7721=>580,7722=>785,7723=>580,7724=>355,7725=>288,7728=>672,7729=>545,7730=>672,7731=>545,
-7732=>672,7733=>545,7734=>598,7735=>288,7736=>598,7737=>288,7738=>598,7739=>288,7740=>598,7741=>288,
-7742=>921,7743=>853,7744=>921,7745=>853,7746=>921,7747=>857,7748=>787,7749=>580,7750=>787,7751=>580,
-7752=>787,7753=>580,7754=>787,7755=>580,7756=>738,7757=>542,7760=>738,7761=>542,7762=>738,7763=>542,
-7764=>605,7765=>576,7766=>605,7767=>576,7768=>677,7769=>430,7770=>677,7771=>430,7772=>677,7773=>430,
-7774=>677,7775=>430,7776=>616,7777=>461,7778=>616,7779=>461,7784=>616,7785=>461,7786=>600,7787=>361,
-7788=>600,7789=>361,7790=>600,7791=>361,7792=>600,7793=>361,7794=>758,7795=>580,7796=>758,7797=>580,
-7798=>758,7799=>580,7800=>758,7801=>580,7802=>758,7803=>580,7804=>650,7805=>508,7806=>650,7807=>508,
-7808=>925,7809=>770,7810=>925,7811=>770,7812=>925,7813=>770,7814=>925,7815=>770,7816=>925,7817=>770,
-7818=>641,7819=>507,7820=>641,7821=>507,7822=>594,7823=>508,7824=>625,7825=>474,7826=>625,7827=>474,
-7828=>625,7829=>474,7830=>580,7831=>361,7832=>770,7833=>508,7834=>813,7835=>333,7838=>746,7839=>542,
-7840=>650,7841=>536,7842=>650,7843=>536,7852=>650,7853=>536,7854=>650,7855=>536,7856=>650,7857=>536,
-7858=>650,7859=>536,7860=>650,7861=>536,7862=>650,7863=>536,7864=>657,7865=>532,7866=>657,7867=>532,
-7868=>657,7869=>532,7878=>657,7879=>532,7880=>355,7881=>288,7882=>355,7883=>288,7884=>738,7885=>542,
-7886=>738,7887=>542,7896=>738,7897=>542,7908=>758,7909=>580,7910=>758,7911=>580,7922=>594,7923=>508,
-7924=>594,7925=>508,7926=>594,7927=>508,7928=>594,7929=>508,7936=>607,7937=>607,7938=>607,7939=>607,
-7940=>607,7941=>607,7942=>607,7943=>607,7944=>650,7945=>650,7946=>782,7947=>782,7948=>660,7949=>687,
-7950=>650,7951=>650,7952=>483,7953=>483,7954=>483,7955=>483,7956=>483,7957=>483,7960=>768,7961=>757,
-7962=>960,7963=>969,7964=>907,7965=>931,7968=>539,7969=>539,7970=>539,7971=>539,7972=>539,7973=>539,
-7974=>539,7975=>539,7976=>898,7977=>893,7978=>1090,7979=>1101,7980=>1043,7981=>1064,7982=>988,7983=>985,
-7984=>353,7985=>353,7986=>353,7987=>353,7988=>353,7989=>353,7990=>353,7991=>353,7992=>469,7993=>461,
-7994=>661,7995=>664,7996=>611,7997=>635,7998=>561,7999=>553,8000=>542,8001=>542,8002=>542,8003=>542,
-8004=>542,8005=>542,8008=>738,8009=>773,8010=>1008,8011=>1015,8012=>843,8013=>867,8016=>547,8017=>547,
-8018=>547,8019=>547,8020=>547,8021=>547,8022=>547,8023=>547,8025=>765,8027=>971,8029=>939,8031=>857,
-8032=>734,8033=>734,8034=>734,8035=>734,8036=>734,8037=>734,8038=>734,8039=>734,8040=>746,8041=>783,
-8042=>1018,8043=>1023,8044=>852,8045=>878,8046=>844,8047=>873,8048=>607,8049=>607,8050=>483,8051=>483,
-8052=>539,8053=>539,8054=>353,8055=>353,8056=>542,8057=>542,8058=>547,8059=>547,8060=>734,8061=>734,
-8064=>607,8065=>607,8066=>607,8067=>607,8068=>607,8069=>607,8070=>607,8071=>607,8072=>650,8073=>650,
-8074=>782,8075=>782,8076=>660,8077=>687,8078=>650,8079=>650,8080=>539,8081=>539,8082=>539,8083=>539,
-8084=>539,8085=>539,8086=>539,8087=>539,8088=>898,8089=>893,8090=>1090,8091=>1101,8092=>1043,8093=>1064,
-8094=>988,8095=>985,8096=>734,8097=>734,8098=>734,8099=>734,8100=>734,8101=>734,8102=>734,8103=>734,
-8104=>746,8105=>783,8106=>1018,8107=>1023,8108=>852,8109=>878,8110=>844,8111=>873,8112=>607,8113=>607,
-8114=>607,8115=>607,8116=>607,8118=>607,8119=>607,8120=>650,8121=>650,8122=>650,8123=>650,8124=>650,
-8125=>450,8126=>450,8127=>450,8128=>450,8129=>450,8130=>539,8131=>539,8132=>539,8134=>539,8135=>539,
-8136=>820,8137=>810,8138=>956,8139=>935,8140=>785,8141=>450,8142=>450,8143=>450,8144=>353,8145=>353,
-8146=>353,8147=>353,8150=>353,8151=>353,8152=>355,8153=>355,8154=>529,8155=>505,8157=>450,8158=>450,
-8159=>450,8160=>547,8161=>547,8162=>547,8163=>547,8164=>529,8165=>529,8166=>547,8167=>547,8168=>594,
-8169=>594,8170=>829,8171=>808,8172=>711,8173=>450,8174=>450,8175=>450,8178=>734,8179=>734,8180=>734,
-8182=>734,8183=>734,8184=>865,8185=>751,8186=>886,8187=>767,8188=>746,8189=>450,8190=>450,8192=>450,
-8193=>900,8194=>450,8195=>900,8196=>296,8197=>225,8198=>150,8199=>572,8200=>286,8201=>180,8202=>89,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>304,8209=>304,8210=>572,8213=>900,8214=>450,
-8215=>450,8219=>286,8223=>460,8227=>531,8228=>301,8229=>600,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>180,8241=>1560,8242=>204,8243=>336,8244=>468,8245=>204,8246=>336,8247=>468,8248=>305,
-8252=>475,8253=>482,8254=>450,8258=>900,8260=>150,8261=>351,8262=>351,8263=>878,8264=>678,8265=>678,
-8267=>572,8268=>450,8269=>450,8270=>450,8271=>303,8273=>450,8274=>404,8275=>900,8279=>597,8287=>200,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>360,8305=>181,8308=>360,8309=>360,8310=>360,8311=>360,8312=>360,8313=>360,8314=>475,
-8315=>475,8316=>475,8317=>221,8318=>221,8319=>365,8320=>360,8321=>360,8322=>360,8323=>360,8324=>360,
-8325=>360,8326=>360,8327=>360,8328=>360,8329=>360,8330=>475,8331=>475,8332=>475,8333=>221,8334=>221,
-8336=>347,8337=>348,8338=>347,8339=>319,8340=>348,8358=>594,8367=>951,8369=>635,8372=>702,8373=>572,
-8451=>1006,8457=>942,8462=>580,8463=>580,8470=>852,8486=>746,8487=>746,8490=>672,8491=>650,8513=>697,
-8514=>501,8515=>501,8516=>549,8523=>801,8531=>872,8532=>872,8533=>872,8534=>872,8535=>872,8536=>872,
-8537=>872,8538=>872,8539=>872,8540=>872,8541=>872,8542=>872,8543=>511,8544=>355,8545=>531,8546=>707,
-8547=>870,8548=>650,8549=>883,8550=>1059,8551=>1234,8552=>838,8553=>641,8554=>839,8555=>1015,8556=>598,
-8557=>688,8558=>721,8559=>921,8560=>288,8561=>576,8562=>863,8563=>796,8564=>508,8565=>796,8566=>1084,
-8567=>1372,8568=>795,8569=>507,8570=>795,8571=>1083,8572=>288,8573=>504,8574=>576,8575=>853,8576=>1085,
-8577=>721,8578=>1085,8579=>688,8580=>504,8592=>754,8593=>754,8594=>754,8595=>754,8596=>754,8597=>754,
-8598=>754,8599=>754,8600=>754,8601=>754,8602=>754,8603=>754,8604=>754,8605=>754,8606=>754,8607=>754,
-8608=>754,8609=>754,8610=>754,8611=>754,8612=>754,8613=>754,8614=>754,8615=>754,8616=>754,8617=>754,
-8618=>754,8619=>754,8620=>754,8621=>754,8622=>754,8623=>754,8624=>754,8625=>754,8626=>754,8627=>754,
-8628=>754,8629=>754,8630=>754,8631=>754,8632=>754,8633=>754,8634=>754,8635=>754,8636=>754,8637=>754,
-8638=>754,8639=>754,8640=>754,8641=>754,8642=>754,8643=>754,8644=>754,8645=>754,8646=>754,8647=>754,
-8648=>754,8649=>754,8650=>754,8651=>754,8652=>754,8653=>754,8654=>754,8655=>754,8656=>754,8657=>754,
-8658=>754,8659=>754,8660=>754,8661=>754,8662=>754,8663=>754,8664=>754,8665=>754,8666=>754,8667=>754,
-8668=>754,8669=>754,8670=>754,8671=>754,8672=>754,8673=>754,8674=>754,8675=>754,8676=>754,8677=>754,
-8678=>754,8679=>754,8680=>754,8681=>754,8682=>754,8683=>754,8684=>754,8685=>754,8686=>754,8687=>754,
-8688=>754,8689=>754,8690=>754,8691=>754,8692=>754,8693=>754,8694=>754,8695=>754,8696=>754,8697=>754,
-8698=>754,8699=>754,8700=>754,8701=>754,8702=>754,8703=>754,8704=>543,8706=>465,8707=>488,8708=>488,
-8710=>628,8711=>628,8712=>666,8713=>666,8715=>666,8716=>666,8719=>716,8720=>716,8721=>642,8722=>754,
-8723=>754,8724=>754,8725=>303,8727=>611,8728=>441,8729=>441,8730=>573,8731=>573,8732=>573,8733=>609,
-8734=>750,8735=>754,8736=>754,8739=>262,8740=>431,8741=>416,8742=>570,8743=>659,8744=>659,8745=>754,
-8746=>754,8747=>469,8748=>766,8749=>1063,8760=>754,8761=>754,8762=>754,8763=>754,8764=>754,8765=>754,
-8770=>754,8771=>754,8776=>754,8784=>754,8785=>754,8786=>754,8787=>754,8788=>930,8789=>930,8800=>754,
-8801=>754,8804=>754,8805=>754,8834=>754,8835=>754,8836=>754,8837=>754,8838=>754,8839=>754,8844=>754,
-8845=>754,8846=>754,8847=>761,8848=>761,8849=>761,8850=>761,8851=>754,8852=>754,8853=>754,8854=>754,
-8855=>754,8856=>754,8857=>754,8858=>754,8859=>754,8860=>754,8861=>754,8862=>754,8863=>754,8864=>754,
-8865=>754,8866=>773,8867=>773,8868=>846,8869=>846,8870=>510,8871=>510,8872=>773,8873=>773,8874=>773,
-8875=>927,8876=>773,8877=>773,8878=>773,8879=>927,8901=>308,8962=>687,8968=>351,8969=>351,8970=>351,
-8971=>351,8976=>754,8977=>461,8984=>900,8985=>754,8992=>469,8993=>469,8997=>900,9000=>1299,9085=>827,
-9134=>469,9167=>850,9251=>687,9472=>542,9473=>542,9474=>542,9475=>542,9476=>542,9477=>542,9478=>542,
-9479=>542,9480=>542,9481=>542,9482=>542,9483=>542,9484=>542,9485=>542,9486=>542,9487=>542,9488=>542,
-9489=>542,9490=>542,9491=>542,9492=>542,9493=>542,9494=>542,9495=>542,9496=>542,9497=>542,9498=>542,
-9499=>542,9500=>542,9501=>542,9502=>542,9503=>542,9504=>542,9505=>542,9506=>542,9507=>542,9508=>542,
-9509=>542,9510=>542,9511=>542,9512=>542,9513=>542,9514=>542,9515=>542,9516=>542,9517=>542,9518=>542,
-9519=>542,9520=>542,9521=>542,9522=>542,9523=>542,9524=>542,9525=>542,9526=>542,9527=>542,9528=>542,
-9529=>542,9530=>542,9531=>542,9532=>542,9533=>542,9534=>542,9535=>542,9536=>542,9537=>542,9538=>542,
-9539=>542,9540=>542,9541=>542,9542=>542,9543=>542,9544=>542,9545=>542,9546=>542,9547=>542,9548=>542,
-9549=>542,9550=>542,9551=>542,9552=>542,9553=>542,9554=>542,9555=>542,9556=>542,9557=>542,9558=>542,
-9559=>542,9560=>542,9561=>542,9562=>542,9563=>542,9564=>542,9565=>542,9566=>542,9567=>542,9568=>542,
-9569=>542,9570=>542,9571=>542,9572=>542,9573=>542,9574=>542,9575=>542,9576=>542,9577=>542,9578=>542,
-9579=>542,9580=>542,9581=>542,9582=>542,9583=>542,9584=>542,9585=>542,9586=>542,9587=>542,9588=>542,
-9589=>542,9590=>542,9591=>542,9592=>542,9593=>542,9594=>542,9595=>542,9596=>542,9597=>542,9598=>542,
-9599=>542,9600=>692,9601=>692,9602=>692,9603=>692,9604=>692,9605=>692,9606=>692,9607=>692,9608=>692,
-9609=>692,9610=>692,9611=>692,9612=>692,9613=>692,9614=>692,9615=>692,9616=>692,9617=>692,9618=>692,
-9619=>692,9620=>692,9621=>692,9622=>692,9623=>692,9624=>692,9625=>692,9626=>692,9627=>692,9628=>692,
-9629=>692,9630=>692,9631=>692,9632=>850,9633=>850,9634=>850,9635=>850,9636=>850,9637=>850,9638=>850,
-9639=>850,9640=>850,9641=>850,9642=>610,9643=>610,9644=>850,9645=>850,9646=>495,9647=>495,9648=>692,
-9649=>692,9650=>692,9651=>692,9652=>452,9653=>452,9654=>692,9655=>692,9656=>452,9657=>452,9658=>692,
-9659=>692,9660=>692,9661=>692,9662=>452,9663=>452,9664=>692,9665=>692,9666=>452,9667=>452,9668=>692,
-9669=>692,9670=>692,9671=>692,9672=>692,9673=>785,9674=>444,9675=>785,9676=>785,9677=>785,9678=>785,
-9679=>785,9680=>785,9681=>785,9682=>785,9683=>785,9684=>785,9685=>785,9686=>474,9687=>474,9688=>712,
-9689=>873,9690=>873,9691=>873,9692=>348,9693=>348,9694=>348,9695=>348,9696=>785,9697=>785,9698=>692,
-9699=>692,9700=>692,9701=>692,9702=>531,9703=>850,9704=>850,9705=>850,9706=>850,9707=>850,9708=>692,
-9709=>692,9710=>692,9711=>1007,9712=>850,9713=>850,9714=>850,9715=>850,9716=>785,9717=>785,9718=>785,
-9719=>785,9720=>692,9721=>692,9722=>692,9723=>747,9724=>747,9725=>659,9726=>659,9727=>692,9728=>807,
-9784=>807,9785=>807,9786=>807,9787=>807,9788=>807,9791=>552,9792=>658,9793=>658,9794=>807,9795=>807,
-9796=>807,9797=>807,9798=>807,9799=>807,9824=>807,9825=>807,9826=>807,9827=>807,9828=>807,9829=>807,
-9830=>807,9831=>807,9833=>424,9834=>574,9835=>807,9836=>807,9837=>424,9838=>321,9839=>435,10145=>754,
-10181=>351,10182=>351,10208=>444,10216=>351,10217=>351,10224=>754,10225=>754,10226=>754,10227=>754,10228=>930,
-10229=>1290,10230=>1290,10231=>1290,10232=>1290,10233=>1290,10234=>1290,10235=>1290,10236=>1290,10237=>1290,10238=>1290,
-10239=>1290,10240=>659,10241=>659,10242=>659,10243=>659,10244=>659,10245=>659,10246=>659,10247=>659,10248=>659,
-10249=>659,10250=>659,10251=>659,10252=>659,10253=>659,10254=>659,10255=>659,10256=>659,10257=>659,10258=>659,
-10259=>659,10260=>659,10261=>659,10262=>659,10263=>659,10264=>659,10265=>659,10266=>659,10267=>659,10268=>659,
-10269=>659,10270=>659,10271=>659,10272=>659,10273=>659,10274=>659,10275=>659,10276=>659,10277=>659,10278=>659,
-10279=>659,10280=>659,10281=>659,10282=>659,10283=>659,10284=>659,10285=>659,10286=>659,10287=>659,10288=>659,
-10289=>659,10290=>659,10291=>659,10292=>659,10293=>659,10294=>659,10295=>659,10296=>659,10297=>659,10298=>659,
-10299=>659,10300=>659,10301=>659,10302=>659,10303=>659,10304=>659,10305=>659,10306=>659,10307=>659,10308=>659,
-10309=>659,10310=>659,10311=>659,10312=>659,10313=>659,10314=>659,10315=>659,10316=>659,10317=>659,10318=>659,
-10319=>659,10320=>659,10321=>659,10322=>659,10323=>659,10324=>659,10325=>659,10326=>659,10327=>659,10328=>659,
-10329=>659,10330=>659,10331=>659,10332=>659,10333=>659,10334=>659,10335=>659,10336=>659,10337=>659,10338=>659,
-10339=>659,10340=>659,10341=>659,10342=>659,10343=>659,10344=>659,10345=>659,10346=>659,10347=>659,10348=>659,
-10349=>659,10350=>659,10351=>659,10352=>659,10353=>659,10354=>659,10355=>659,10356=>659,10357=>659,10358=>659,
-10359=>659,10360=>659,10361=>659,10362=>659,10363=>659,10364=>659,10365=>659,10366=>659,10367=>659,10368=>659,
-10369=>659,10370=>659,10371=>659,10372=>659,10373=>659,10374=>659,10375=>659,10376=>659,10377=>659,10378=>659,
-10379=>659,10380=>659,10381=>659,10382=>659,10383=>659,10384=>659,10385=>659,10386=>659,10387=>659,10388=>659,
-10389=>659,10390=>659,10391=>659,10392=>659,10393=>659,10394=>659,10395=>659,10396=>659,10397=>659,10398=>659,
-10399=>659,10400=>659,10401=>659,10402=>659,10403=>659,10404=>659,10405=>659,10406=>659,10407=>659,10408=>659,
-10409=>659,10410=>659,10411=>659,10412=>659,10413=>659,10414=>659,10415=>659,10416=>659,10417=>659,10418=>659,
-10419=>659,10420=>659,10421=>659,10422=>659,10423=>659,10424=>659,10425=>659,10426=>659,10427=>659,10428=>659,
-10429=>659,10430=>659,10431=>659,10432=>659,10433=>659,10434=>659,10435=>659,10436=>659,10437=>659,10438=>659,
-10439=>659,10440=>659,10441=>659,10442=>659,10443=>659,10444=>659,10445=>659,10446=>659,10447=>659,10448=>659,
-10449=>659,10450=>659,10451=>659,10452=>659,10453=>659,10454=>659,10455=>659,10456=>659,10457=>659,10458=>659,
-10459=>659,10460=>659,10461=>659,10462=>659,10463=>659,10464=>659,10465=>659,10466=>659,10467=>659,10468=>659,
-10469=>659,10470=>659,10471=>659,10472=>659,10473=>659,10474=>659,10475=>659,10476=>659,10477=>659,10478=>659,
-10479=>659,10480=>659,10481=>659,10482=>659,10483=>659,10484=>659,10485=>659,10486=>659,10487=>659,10488=>659,
-10489=>659,10490=>659,10491=>659,10492=>659,10493=>659,10494=>659,10495=>659,10496=>754,10497=>754,10498=>754,
-10499=>754,10500=>754,10501=>754,10502=>754,10503=>754,10504=>754,10505=>754,10506=>754,10507=>754,10508=>754,
-10509=>754,10510=>754,10511=>754,10512=>754,10513=>754,10514=>754,10515=>754,10516=>754,10517=>754,10518=>754,
-10519=>754,10520=>754,10521=>754,10522=>754,10523=>754,10524=>754,10525=>754,10526=>754,10527=>754,10528=>754,
-10529=>754,10530=>754,10531=>754,10532=>754,10533=>754,10534=>754,10535=>754,10536=>754,10537=>754,10538=>754,
-10539=>754,10540=>754,10541=>754,10542=>754,10543=>754,10544=>754,10545=>754,10546=>754,10547=>754,10548=>754,
-10549=>754,10550=>754,10551=>754,10552=>754,10553=>754,10554=>754,10555=>754,10556=>754,10557=>754,10558=>754,
-10559=>754,10560=>754,10561=>754,10562=>754,10563=>754,10564=>754,10565=>754,10566=>754,10567=>754,10568=>754,
-10569=>754,10570=>754,10571=>754,10572=>754,10573=>754,10574=>754,10575=>754,10576=>754,10577=>754,10578=>754,
-10579=>754,10580=>754,10581=>754,10582=>754,10583=>754,10584=>754,10585=>754,10586=>754,10587=>754,10588=>754,
-10589=>754,10590=>754,10591=>754,10592=>754,10593=>754,10594=>754,10595=>754,10596=>754,10597=>754,10598=>754,
-10599=>754,10600=>754,10601=>754,10602=>754,10603=>754,10604=>754,10605=>754,10606=>754,10607=>754,10608=>754,
-10609=>754,10610=>754,10611=>754,10612=>754,10613=>754,10614=>754,10615=>883,10616=>754,10617=>754,10618=>886,
-10619=>754,10620=>754,10621=>754,10622=>754,10623=>754,10731=>444,10764=>1361,10765=>469,10766=>469,10799=>754,
-11008=>754,11009=>754,11010=>754,11011=>754,11012=>754,11013=>754,11014=>754,11015=>754,11016=>754,11017=>754,
-11018=>754,11019=>754,11020=>754,11021=>754,11022=>754,11023=>754,11024=>754,11025=>754,11026=>850,11027=>850,
-11028=>850,11029=>850,11030=>692,11031=>692,11032=>692,11033=>692,11034=>850,11364=>677,11367=>785,11368=>580,
-11369=>672,11370=>545,11371=>625,11372=>474,11374=>921,11375=>650,11381=>666,11382=>478,11383=>630,11385=>451,
-11386=>542,11388=>237,11389=>409,11520=>695,11521=>571,11522=>569,11523=>592,11524=>568,11525=>866,11526=>680,
-11527=>864,11528=>555,11529=>581,11530=>866,11531=>568,11532=>581,11533=>866,11534=>580,11535=>779,11536=>865,
-11537=>580,11538=>580,11539=>863,11540=>851,11541=>777,11542=>580,11543=>581,11544=>580,11545=>584,11546=>619,
-11547=>571,11548=>883,11549=>613,11550=>608,11551=>766,11552=>861,11553=>569,11554=>580,11555=>582,11556=>674,
-11557=>822,11800=>482,11810=>351,11811=>351,11812=>351,11813=>351,11822=>482,42564=>616,42565=>461,42566=>355,
-42567=>353,42576=>994,42577=>845,42580=>1074,42581=>783,42582=>1025,42583=>787,42760=>444,42761=>444,42762=>444,
-42763=>444,42764=>444,42765=>444,42766=>444,42767=>444,42768=>444,42769=>444,42770=>444,42771=>444,42772=>444,
-42773=>444,42774=>444,42779=>332,42780=>332,42781=>228,42782=>228,42783=>228,42891=>361,42892=>247,62464=>598,
-62465=>607,62466=>651,62467=>861,62468=>607,62469=>602,62470=>661,62471=>896,62472=>607,62473=>607,62474=>1141,
-62475=>624,62476=>623,62477=>866,62478=>607,62479=>623,62480=>908,62481=>681,62482=>728,62483=>682,62484=>859,
-62485=>622,62486=>852,62487=>621,62488=>628,62489=>623,62490=>665,62491=>623,62492=>628,62493=>608,62494=>665,
-62495=>805,62496=>607,62497=>707,62498=>608,62499=>607,62500=>607,62501=>659,62502=>875,62504=>813,63172=>455,
-63173=>542,63174=>576,63175=>580,63176=>853,63185=>450,63188=>450,64256=>637,64257=>600,64258=>600,64259=>847,
-64260=>887,64261=>669,64262=>824,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,
-65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65529=>0,
-65530=>0,65531=>0,65532=>0,65533=>923);
-$enc='';
-$diff='';
-$file='dejavuserifcondensedi.z';
-$ctg='dejavuserifcondensedi.ctg.z';
-$originalsize=301244;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifi.php
deleted file mode 100644
index c1d452c1299..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/dejavuserifi.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='DejaVuSerif-Italic';
-$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>-65,'Flags'=>96,'FontBBox'=>'[-839 -347 1650 1227]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>600);
-$up=-63;
-$ut=44;
-$dw=600;
-$cw=array(
-0=>600,32=>318,33=>402,34=>460,35=>838,36=>636,37=>950,38=>890,39=>275,40=>390,
-41=>390,42=>500,43=>838,44=>318,45=>338,46=>318,47=>337,48=>636,49=>636,50=>636,
-51=>636,52=>636,53=>636,54=>636,55=>636,56=>636,57=>636,58=>337,59=>337,60=>838,
-61=>838,62=>838,63=>536,64=>1000,65=>722,66=>735,67=>765,68=>802,69=>730,70=>694,
-71=>799,72=>872,73=>395,74=>401,75=>747,76=>664,77=>1024,78=>875,79=>820,80=>673,
-81=>820,82=>753,83=>685,84=>667,85=>843,86=>722,87=>1028,88=>712,89=>660,90=>695,
-91=>390,92=>337,93=>390,94=>838,95=>500,96=>500,97=>596,98=>640,99=>560,100=>640,
-101=>592,102=>370,103=>640,104=>644,105=>320,106=>310,107=>606,108=>320,109=>948,110=>644,
-111=>602,112=>640,113=>640,114=>478,115=>513,116=>402,117=>644,118=>565,119=>856,120=>564,
-121=>565,122=>527,123=>636,124=>337,125=>636,126=>838,8364=>636,8218=>318,402=>370,8222=>518,
-8230=>1000,8224=>500,8225=>500,710=>500,8240=>1342,352=>685,8249=>400,338=>1137,381=>695,8216=>318,
-8217=>318,8220=>511,8221=>511,8226=>590,8211=>500,8212=>1000,732=>500,8482=>1000,353=>513,8250=>400,
-339=>989,382=>527,376=>660,160=>318,161=>402,162=>636,163=>636,164=>636,165=>636,166=>337,
-167=>500,168=>500,169=>1000,170=>475,171=>612,172=>838,173=>338,174=>1000,175=>500,176=>500,
-177=>838,178=>401,179=>401,180=>500,181=>650,182=>636,183=>318,184=>500,185=>401,186=>470,
-187=>612,188=>969,189=>969,190=>969,191=>536,192=>722,193=>722,194=>722,195=>722,196=>722,
-197=>722,198=>1001,199=>765,200=>730,201=>730,202=>730,203=>730,204=>395,205=>395,206=>395,
-207=>395,208=>807,209=>875,210=>820,211=>820,212=>820,213=>820,214=>820,215=>838,216=>820,
-217=>843,218=>843,219=>843,220=>843,221=>660,222=>676,223=>668,224=>596,225=>596,226=>596,
-227=>596,228=>596,229=>596,230=>940,231=>560,232=>592,233=>592,234=>592,235=>592,236=>320,
-237=>320,238=>320,239=>320,240=>602,241=>644,242=>602,243=>602,244=>602,245=>602,246=>602,
-247=>838,248=>602,249=>644,250=>644,251=>644,252=>644,253=>565,254=>640,255=>565,256=>722,
-257=>596,258=>722,259=>596,260=>722,261=>596,262=>765,263=>560,264=>765,265=>560,266=>765,
-267=>560,268=>765,269=>560,270=>802,271=>640,272=>807,273=>640,274=>730,275=>592,276=>730,
-277=>592,278=>730,279=>592,280=>730,281=>592,282=>730,283=>592,284=>799,285=>640,286=>799,
-287=>640,288=>799,289=>640,290=>799,291=>640,292=>872,293=>644,294=>872,295=>644,296=>395,
-297=>320,298=>395,299=>320,300=>395,301=>320,302=>395,303=>320,304=>395,305=>320,306=>801,
-307=>533,308=>401,309=>310,310=>747,311=>606,312=>606,313=>664,314=>320,315=>664,316=>320,
-317=>664,318=>400,319=>671,320=>465,321=>669,322=>324,323=>875,324=>644,325=>875,326=>644,
-327=>875,328=>644,329=>866,330=>843,331=>644,332=>820,333=>602,334=>820,335=>602,336=>820,
-337=>602,340=>753,341=>478,342=>753,343=>478,344=>753,345=>478,346=>685,347=>513,348=>685,
-349=>513,350=>685,351=>513,354=>667,355=>402,356=>667,357=>402,358=>667,359=>402,360=>843,
-361=>644,362=>843,363=>644,364=>843,365=>644,366=>843,367=>644,368=>843,369=>644,370=>843,
-371=>644,372=>1028,373=>856,374=>660,375=>565,377=>695,378=>527,379=>695,380=>527,383=>370,
-384=>640,385=>735,386=>735,387=>640,388=>735,389=>640,390=>765,391=>765,392=>560,393=>807,
-394=>802,395=>735,396=>640,397=>602,398=>730,399=>820,400=>623,401=>694,403=>799,404=>712,
-405=>932,406=>395,407=>395,408=>747,409=>606,410=>320,411=>634,412=>948,413=>875,414=>644,
-415=>820,416=>820,417=>602,418=>1040,419=>807,420=>673,421=>640,422=>753,423=>685,424=>513,
-425=>707,426=>324,427=>402,428=>667,429=>402,430=>667,431=>843,432=>644,433=>829,434=>760,
-435=>738,436=>745,437=>695,438=>527,439=>564,440=>564,441=>564,443=>636,444=>687,445=>564,
-446=>536,448=>295,449=>492,450=>459,451=>295,452=>1497,453=>1329,454=>1167,455=>1065,456=>974,
-457=>630,458=>1276,459=>1185,460=>954,461=>722,462=>596,463=>395,464=>320,465=>820,466=>602,
-467=>843,468=>644,469=>843,470=>644,471=>843,472=>644,473=>843,474=>644,475=>843,476=>644,
-477=>592,478=>722,479=>596,480=>722,481=>596,482=>1001,483=>940,484=>848,485=>640,486=>799,
-487=>640,488=>747,489=>606,490=>820,491=>602,492=>820,493=>602,494=>564,495=>564,496=>320,
-497=>1497,498=>1329,499=>1167,500=>799,501=>640,502=>1154,504=>875,505=>644,506=>722,507=>596,
-508=>1001,509=>940,510=>820,511=>602,512=>722,513=>596,514=>722,515=>596,516=>730,517=>592,
-518=>730,519=>592,520=>395,521=>320,522=>395,523=>320,524=>820,525=>602,526=>820,527=>602,
-528=>753,529=>478,530=>753,531=>478,532=>843,533=>644,534=>843,535=>644,536=>685,537=>513,
-538=>667,539=>402,540=>627,541=>521,542=>872,543=>644,544=>843,545=>814,548=>695,549=>527,
-550=>722,551=>596,552=>730,553=>592,554=>820,555=>602,556=>820,557=>602,558=>820,559=>602,
-560=>820,561=>602,562=>660,563=>565,564=>500,565=>832,566=>494,567=>310,568=>960,569=>960,
-570=>722,571=>765,572=>560,573=>664,574=>667,575=>513,576=>527,577=>583,578=>464,581=>722,
-592=>596,593=>640,594=>675,595=>640,596=>560,597=>560,598=>647,599=>683,600=>592,601=>592,
-602=>843,603=>537,604=>509,605=>773,606=>613,607=>315,608=>683,609=>640,610=>544,611=>712,
-612=>564,613=>644,614=>644,615=>644,616=>320,617=>392,618=>320,619=>380,620=>454,621=>363,
-622=>704,623=>948,624=>948,625=>948,626=>644,627=>694,628=>646,629=>602,630=>790,631=>647,
-632=>602,633=>501,634=>501,635=>551,636=>478,637=>478,638=>453,639=>453,640=>594,641=>594,
-642=>513,643=>271,644=>370,645=>487,646=>324,647=>402,648=>402,649=>644,650=>620,651=>608,
-652=>565,653=>856,654=>565,655=>655,656=>597,657=>560,658=>564,659=>560,660=>536,661=>536,
-662=>536,663=>513,664=>820,665=>563,666=>613,667=>654,668=>667,669=>366,670=>606,671=>646,
-672=>683,673=>536,674=>536,675=>996,676=>1033,677=>998,678=>809,679=>598,680=>782,681=>894,
-682=>646,683=>676,684=>598,685=>443,686=>781,687=>767,688=>433,689=>430,690=>264,691=>347,
-692=>347,693=>430,694=>392,695=>539,696=>355,697=>278,699=>318,700=>318,701=>318,702=>307,
-703=>307,704=>280,705=>281,711=>500,712=>282,713=>500,716=>282,720=>337,721=>337,722=>307,
-723=>307,726=>392,728=>500,729=>500,730=>500,731=>500,733=>500,734=>417,736=>448,737=>243,
-738=>337,739=>355,740=>281,741=>493,742=>493,743=>493,744=>493,745=>493,750=>484,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,835=>0,847=>0,856=>0,865=>0,880=>740,881=>531,884=>278,
-885=>278,890=>500,891=>560,892=>560,893=>560,894=>337,900=>500,901=>500,902=>722,903=>318,
-904=>900,905=>1039,906=>562,908=>835,910=>897,911=>853,912=>392,913=>722,914=>735,915=>694,
-916=>722,917=>730,918=>695,919=>872,920=>820,921=>395,922=>747,923=>722,924=>1024,925=>875,
-926=>704,927=>820,928=>872,929=>673,931=>707,932=>667,933=>660,934=>820,935=>712,936=>877,
-937=>829,938=>395,939=>660,940=>675,941=>537,942=>599,943=>392,944=>608,945=>675,946=>578,
-947=>598,948=>602,949=>537,950=>542,951=>599,952=>602,953=>392,954=>656,955=>634,956=>650,
-957=>608,958=>551,959=>602,960=>657,961=>588,962=>560,963=>683,964=>553,965=>608,966=>700,
-967=>606,968=>784,969=>815,970=>392,971=>608,972=>602,973=>608,974=>815,976=>583,977=>715,
-978=>687,979=>874,980=>687,981=>682,982=>815,983=>624,984=>820,985=>602,986=>765,987=>560,
-988=>694,989=>463,990=>590,991=>660,992=>782,993=>577,1008=>624,1009=>588,1010=>560,1011=>310,
-1012=>820,1013=>560,1014=>560,1015=>676,1016=>640,1017=>765,1018=>1024,1019=>708,1020=>588,1021=>765,
-1022=>765,1023=>765,1024=>730,1025=>730,1026=>799,1027=>662,1028=>765,1029=>685,1030=>395,1031=>395,
-1032=>401,1033=>1084,1034=>1118,1035=>872,1036=>774,1037=>872,1038=>723,1039=>872,1040=>757,1041=>735,
-1042=>735,1043=>662,1044=>813,1045=>730,1046=>1124,1047=>623,1048=>872,1049=>872,1050=>774,1051=>834,
-1052=>1024,1053=>872,1054=>820,1055=>872,1056=>673,1057=>765,1058=>667,1059=>723,1060=>830,1061=>712,
-1062=>872,1063=>773,1064=>1141,1065=>1141,1066=>794,1067=>984,1068=>674,1069=>765,1070=>1193,1071=>808,
-1072=>596,1073=>610,1074=>582,1075=>505,1076=>634,1077=>592,1078=>1137,1079=>545,1080=>644,1081=>644,
-1082=>597,1083=>637,1084=>829,1085=>659,1086=>602,1087=>644,1088=>640,1089=>560,1090=>948,1091=>580,
-1092=>783,1093=>564,1094=>698,1095=>622,1096=>947,1097=>1001,1098=>667,1099=>814,1100=>544,1101=>560,
-1102=>880,1103=>662,1104=>592,1105=>592,1106=>624,1107=>505,1108=>560,1109=>513,1110=>320,1111=>320,
-1112=>310,1113=>859,1114=>878,1115=>644,1116=>597,1117=>644,1118=>580,1119=>644,1122=>762,1123=>882,
-1124=>1129,1125=>834,1130=>1124,1131=>920,1136=>944,1137=>902,1138=>820,1139=>552,1140=>859,1141=>678,
-1164=>707,1165=>544,1168=>672,1169=>529,1170=>662,1171=>505,1172=>730,1173=>614,1174=>1124,1175=>1137,
-1176=>623,1177=>545,1178=>774,1179=>604,1182=>774,1183=>597,1184=>892,1185=>669,1186=>872,1187=>712,
-1188=>1139,1189=>857,1190=>1206,1191=>943,1194=>765,1195=>560,1196=>667,1197=>1013,1198=>660,1199=>571,
-1200=>660,1201=>571,1202=>712,1203=>629,1204=>936,1205=>732,1206=>749,1207=>677,1210=>749,1211=>644,
-1216=>395,1217=>1124,1218=>1137,1219=>747,1220=>606,1223=>872,1224=>667,1227=>749,1228=>667,1231=>320,
-1232=>757,1233=>596,1234=>757,1235=>596,1236=>1001,1237=>940,1238=>730,1239=>592,1240=>820,1241=>592,
-1242=>820,1243=>592,1244=>1124,1245=>1137,1246=>623,1247=>545,1248=>564,1249=>564,1250=>872,1251=>644,
-1252=>872,1253=>644,1254=>820,1255=>602,1256=>820,1257=>602,1258=>820,1259=>602,1260=>765,1261=>560,
-1262=>723,1263=>580,1264=>723,1265=>580,1266=>723,1267=>580,1268=>773,1269=>622,1270=>662,1271=>505,
-1272=>984,1273=>814,1296=>623,1297=>545,1298=>834,1299=>637,1300=>1199,1301=>939,1306=>820,1307=>640,
-1308=>1028,1309=>856,4256=>732,4257=>860,4258=>837,4259=>869,4260=>743,4261=>991,4262=>925,4263=>1111,
-4264=>576,4265=>760,4266=>972,4267=>951,4268=>753,4269=>1084,4270=>906,4271=>838,4272=>1049,4273=>743,
-4274=>679,4275=>1025,4276=>946,4277=>1029,4278=>741,4279=>743,4280=>742,4281=>743,4282=>889,4283=>946,
-4284=>724,4285=>765,4286=>743,4287=>968,4288=>1010,4289=>712,4290=>874,4291=>744,4292=>847,4293=>960,
-4304=>550,4305=>581,4306=>599,4307=>843,4308=>571,4309=>567,4310=>620,4311=>871,4312=>569,4313=>556,
-4314=>1076,4315=>596,4316=>596,4317=>835,4318=>580,4319=>590,4320=>833,4321=>607,4322=>758,4323=>701,
-4324=>825,4325=>595,4326=>868,4327=>578,4328=>604,4329=>596,4330=>685,4331=>597,4332=>557,4333=>585,
-4334=>625,4335=>693,4336=>582,4337=>613,4338=>581,4339=>582,4340=>580,4341=>659,4342=>896,4343=>636,
-4344=>592,4345=>628,4346=>581,4347=>456,4348=>373,7426=>940,7432=>509,7433=>320,7444=>989,7446=>602,
-7447=>602,7453=>737,7454=>948,7455=>948,7468=>455,7469=>630,7470=>463,7472=>505,7473=>459,7474=>459,
-7475=>503,7476=>549,7477=>249,7478=>252,7479=>470,7480=>418,7481=>645,7482=>551,7483=>551,7484=>516,
-7486=>424,7487=>474,7488=>420,7489=>531,7490=>647,7491=>386,7492=>386,7493=>400,7494=>618,7495=>400,
-7496=>400,7497=>387,7498=>387,7499=>428,7500=>340,7501=>400,7502=>175,7503=>365,7504=>613,7505=>399,
-7506=>385,7507=>346,7508=>385,7509=>385,7510=>400,7511=>247,7512=>399,7513=>464,7514=>613,7515=>373,
-7522=>201,7523=>347,7524=>399,7525=>373,7543=>640,7544=>549,7547=>372,7557=>320,7579=>488,7580=>353,
-7581=>353,7582=>473,7583=>428,7584=>233,7585=>316,7586=>488,7587=>399,7588=>201,7589=>201,7590=>201,
-7591=>201,7592=>318,7593=>263,7594=>263,7595=>455,7596=>613,7597=>613,7598=>495,7599=>492,7600=>487,
-7601=>385,7602=>473,7603=>416,7604=>299,7605=>334,7606=>399,7607=>477,7609=>464,7610=>355,7611=>332,
-7612=>418,7613=>418,7614=>452,7615=>473,7620=>0,7621=>0,7622=>0,7623=>0,7624=>0,7625=>0,
-7680=>722,7681=>596,7682=>735,7683=>640,7684=>735,7685=>640,7686=>735,7687=>640,7688=>765,7689=>560,
-7690=>802,7691=>640,7692=>802,7693=>640,7694=>802,7695=>640,7696=>802,7697=>640,7698=>802,7699=>640,
-7700=>730,7701=>592,7702=>730,7703=>592,7704=>730,7705=>592,7706=>730,7707=>592,7708=>730,7709=>592,
-7710=>694,7711=>370,7712=>799,7713=>640,7714=>872,7715=>644,7716=>872,7717=>644,7718=>872,7719=>644,
-7720=>872,7721=>644,7722=>872,7723=>644,7724=>395,7725=>320,7728=>747,7729=>606,7730=>747,7731=>606,
-7732=>747,7733=>606,7734=>664,7735=>320,7736=>664,7737=>320,7738=>664,7739=>320,7740=>664,7741=>320,
-7742=>1024,7743=>948,7744=>1024,7745=>948,7746=>1024,7747=>953,7748=>875,7749=>644,7750=>875,7751=>644,
-7752=>875,7753=>644,7754=>875,7755=>644,7756=>820,7757=>602,7760=>820,7761=>602,7762=>820,7763=>602,
-7764=>673,7765=>640,7766=>673,7767=>640,7768=>753,7769=>478,7770=>753,7771=>478,7772=>753,7773=>478,
-7774=>753,7775=>478,7776=>685,7777=>513,7778=>685,7779=>513,7784=>685,7785=>513,7786=>667,7787=>402,
-7788=>667,7789=>402,7790=>667,7791=>402,7792=>667,7793=>402,7794=>843,7795=>644,7796=>843,7797=>644,
-7798=>843,7799=>644,7800=>843,7801=>644,7802=>843,7803=>644,7804=>722,7805=>565,7806=>722,7807=>565,
-7808=>1028,7809=>856,7810=>1028,7811=>856,7812=>1028,7813=>856,7814=>1028,7815=>856,7816=>1028,7817=>856,
-7818=>712,7819=>564,7820=>712,7821=>564,7822=>660,7823=>565,7824=>695,7825=>527,7826=>695,7827=>527,
-7828=>695,7829=>527,7830=>644,7831=>402,7832=>856,7833=>565,7834=>903,7835=>370,7838=>829,7839=>602,
-7840=>722,7841=>596,7842=>722,7843=>596,7852=>722,7853=>596,7854=>722,7855=>596,7856=>722,7857=>596,
-7858=>722,7859=>596,7860=>722,7861=>596,7862=>722,7863=>596,7864=>730,7865=>592,7866=>730,7867=>592,
-7868=>730,7869=>592,7878=>730,7879=>592,7880=>395,7881=>320,7882=>395,7883=>320,7884=>820,7885=>602,
-7886=>820,7887=>602,7896=>820,7897=>602,7908=>843,7909=>644,7910=>843,7911=>644,7922=>660,7923=>565,
-7924=>660,7925=>565,7926=>660,7927=>565,7928=>660,7929=>565,7936=>675,7937=>675,7938=>675,7939=>675,
-7940=>675,7941=>675,7942=>675,7943=>675,7944=>722,7945=>722,7946=>869,7947=>869,7948=>734,7949=>763,
-7950=>722,7951=>722,7952=>537,7953=>537,7954=>537,7955=>537,7956=>537,7957=>537,7960=>853,7961=>841,
-7962=>1067,7963=>1077,7964=>1008,7965=>1035,7968=>599,7969=>599,7970=>599,7971=>599,7972=>599,7973=>599,
-7974=>599,7975=>599,7976=>998,7977=>992,7978=>1212,7979=>1224,7980=>1159,7981=>1183,7982=>1098,7983=>1095,
-7984=>392,7985=>392,7986=>392,7987=>392,7988=>392,7989=>392,7990=>392,7991=>392,7992=>521,7993=>512,
-7994=>735,7995=>738,7996=>679,7997=>706,7998=>624,7999=>615,8000=>602,8001=>602,8002=>602,8003=>602,
-8004=>602,8005=>602,8008=>820,8009=>859,8010=>1120,8011=>1127,8012=>937,8013=>964,8016=>608,8017=>608,
-8018=>608,8019=>608,8020=>608,8021=>608,8022=>608,8023=>608,8025=>851,8027=>1079,8029=>1044,8031=>953,
-8032=>815,8033=>815,8034=>815,8035=>815,8036=>815,8037=>815,8038=>815,8039=>815,8040=>829,8041=>870,
-8042=>1131,8043=>1137,8044=>946,8045=>976,8046=>938,8047=>970,8048=>675,8049=>675,8050=>537,8051=>537,
-8052=>599,8053=>599,8054=>392,8055=>392,8056=>602,8057=>602,8058=>608,8059=>608,8060=>815,8061=>815,
-8064=>675,8065=>675,8066=>675,8067=>675,8068=>675,8069=>675,8070=>675,8071=>675,8072=>722,8073=>722,
-8074=>869,8075=>869,8076=>734,8077=>763,8078=>722,8079=>722,8080=>599,8081=>599,8082=>599,8083=>599,
-8084=>599,8085=>599,8086=>599,8087=>599,8088=>998,8089=>992,8090=>1212,8091=>1224,8092=>1159,8093=>1183,
-8094=>1098,8095=>1095,8096=>815,8097=>815,8098=>815,8099=>815,8100=>815,8101=>815,8102=>815,8103=>815,
-8104=>829,8105=>870,8106=>1131,8107=>1137,8108=>946,8109=>976,8110=>938,8111=>970,8112=>675,8113=>675,
-8114=>675,8115=>675,8116=>675,8118=>675,8119=>675,8120=>722,8121=>722,8122=>722,8123=>722,8124=>722,
-8125=>500,8126=>500,8127=>500,8128=>500,8129=>500,8130=>599,8131=>599,8132=>599,8134=>599,8135=>599,
-8136=>912,8137=>900,8138=>1063,8139=>1039,8140=>872,8141=>500,8142=>500,8143=>500,8144=>392,8145=>392,
-8146=>392,8147=>392,8150=>392,8151=>392,8152=>395,8153=>395,8154=>588,8155=>562,8157=>500,8158=>500,
-8159=>500,8160=>608,8161=>608,8162=>608,8163=>608,8164=>588,8165=>588,8166=>608,8167=>608,8168=>660,
-8169=>660,8170=>921,8171=>897,8172=>790,8173=>500,8174=>500,8175=>500,8178=>815,8179=>815,8180=>815,
-8182=>815,8183=>815,8184=>961,8185=>835,8186=>984,8187=>853,8188=>829,8189=>500,8190=>500,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>330,8197=>250,8198=>167,8199=>636,8200=>318,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>338,8209=>338,8210=>636,8213=>1000,8214=>500,
-8215=>500,8219=>318,8223=>511,8227=>590,8228=>334,8229=>667,8234=>0,8235=>0,8236=>0,8237=>0,
-8238=>0,8239=>200,8241=>1734,8242=>227,8243=>374,8244=>520,8245=>227,8246=>374,8247=>520,8248=>339,
-8252=>527,8253=>536,8254=>500,8258=>1000,8260=>167,8261=>390,8262=>390,8263=>976,8264=>753,8265=>753,
-8267=>636,8268=>500,8269=>500,8270=>500,8271=>337,8273=>500,8274=>450,8275=>1000,8279=>663,8287=>222,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8298=>0,8299=>0,8300=>0,8301=>0,8302=>0,
-8303=>0,8304=>401,8305=>201,8308=>401,8309=>401,8310=>401,8311=>401,8312=>401,8313=>401,8314=>528,
-8315=>528,8316=>528,8317=>246,8318=>246,8319=>405,8320=>401,8321=>401,8322=>401,8323=>401,8324=>401,
-8325=>401,8326=>401,8327=>401,8328=>401,8329=>401,8330=>528,8331=>528,8332=>528,8333=>246,8334=>246,
-8336=>386,8337=>387,8338=>385,8339=>355,8340=>387,8358=>660,8367=>1057,8369=>706,8372=>780,8373=>636,
-8451=>1119,8457=>1047,8462=>644,8463=>644,8470=>946,8486=>829,8487=>829,8490=>747,8491=>722,8513=>775,
-8514=>557,8515=>557,8516=>611,8523=>890,8531=>969,8532=>969,8533=>969,8534=>969,8535=>969,8536=>969,
-8537=>969,8538=>969,8539=>969,8540=>969,8541=>969,8542=>969,8543=>568,8544=>395,8545=>590,8546=>786,
-8547=>966,8548=>722,8549=>981,8550=>1176,8551=>1372,8552=>932,8553=>712,8554=>932,8555=>1127,8556=>664,
-8557=>765,8558=>802,8559=>1024,8560=>320,8561=>640,8562=>959,8563=>885,8564=>565,8565=>885,8566=>1205,
-8567=>1524,8568=>884,8569=>564,8570=>884,8571=>1204,8572=>320,8573=>560,8574=>640,8575=>948,8576=>1206,
-8577=>802,8578=>1206,8579=>765,8580=>560,8592=>838,8593=>838,8594=>838,8595=>838,8596=>838,8597=>838,
-8598=>838,8599=>838,8600=>838,8601=>838,8602=>838,8603=>838,8604=>838,8605=>838,8606=>838,8607=>838,
-8608=>838,8609=>838,8610=>838,8611=>838,8612=>838,8613=>838,8614=>838,8615=>838,8616=>838,8617=>838,
-8618=>838,8619=>838,8620=>838,8621=>838,8622=>838,8623=>838,8624=>838,8625=>838,8626=>838,8627=>838,
-8628=>838,8629=>838,8630=>838,8631=>838,8632=>838,8633=>838,8634=>838,8635=>838,8636=>838,8637=>838,
-8638=>838,8639=>838,8640=>838,8641=>838,8642=>838,8643=>838,8644=>838,8645=>838,8646=>838,8647=>838,
-8648=>838,8649=>838,8650=>838,8651=>838,8652=>838,8653=>838,8654=>838,8655=>838,8656=>838,8657=>838,
-8658=>838,8659=>838,8660=>838,8661=>838,8662=>838,8663=>838,8664=>838,8665=>838,8666=>838,8667=>838,
-8668=>838,8669=>838,8670=>838,8671=>838,8672=>838,8673=>838,8674=>838,8675=>838,8676=>838,8677=>838,
-8678=>838,8679=>838,8680=>838,8681=>838,8682=>838,8683=>838,8684=>838,8685=>838,8686=>838,8687=>838,
-8688=>838,8689=>838,8690=>838,8691=>838,8692=>838,8693=>838,8694=>838,8695=>838,8696=>838,8697=>838,
-8698=>838,8699=>838,8700=>838,8701=>838,8702=>838,8703=>838,8704=>604,8706=>517,8707=>542,8708=>542,
-8710=>698,8711=>698,8712=>740,8713=>740,8715=>740,8716=>740,8719=>796,8720=>796,8721=>714,8722=>838,
-8723=>838,8724=>838,8725=>337,8727=>680,8728=>490,8729=>490,8730=>637,8731=>637,8732=>637,8733=>677,
-8734=>833,8735=>838,8736=>838,8739=>291,8740=>479,8741=>462,8742=>634,8743=>732,8744=>732,8745=>838,
-8746=>838,8747=>521,8748=>852,8749=>1182,8760=>838,8761=>838,8762=>838,8763=>838,8764=>838,8765=>838,
-8770=>838,8771=>838,8776=>838,8784=>838,8785=>838,8786=>838,8787=>838,8788=>1033,8789=>1033,8800=>838,
-8801=>838,8804=>838,8805=>838,8834=>838,8835=>838,8836=>838,8837=>838,8838=>838,8839=>838,8844=>838,
-8845=>838,8846=>838,8847=>846,8848=>846,8849=>846,8850=>846,8851=>838,8852=>838,8853=>838,8854=>838,
-8855=>838,8856=>838,8857=>838,8858=>838,8859=>838,8860=>838,8861=>838,8862=>838,8863=>838,8864=>838,
-8865=>838,8866=>860,8867=>860,8868=>940,8869=>940,8870=>567,8871=>567,8872=>860,8873=>860,8874=>860,
-8875=>1031,8876=>860,8877=>860,8878=>860,8879=>1031,8901=>342,8962=>764,8968=>390,8969=>390,8970=>390,
-8971=>390,8976=>838,8977=>513,8984=>1000,8985=>838,8992=>521,8993=>521,8997=>1000,9000=>1443,9085=>919,
-9134=>521,9167=>945,9251=>764,9472=>602,9473=>602,9474=>602,9475=>602,9476=>602,9477=>602,9478=>602,
-9479=>602,9480=>602,9481=>602,9482=>602,9483=>602,9484=>602,9485=>602,9486=>602,9487=>602,9488=>602,
-9489=>602,9490=>602,9491=>602,9492=>602,9493=>602,9494=>602,9495=>602,9496=>602,9497=>602,9498=>602,
-9499=>602,9500=>602,9501=>602,9502=>602,9503=>602,9504=>602,9505=>602,9506=>602,9507=>602,9508=>602,
-9509=>602,9510=>602,9511=>602,9512=>602,9513=>602,9514=>602,9515=>602,9516=>602,9517=>602,9518=>602,
-9519=>602,9520=>602,9521=>602,9522=>602,9523=>602,9524=>602,9525=>602,9526=>602,9527=>602,9528=>602,
-9529=>602,9530=>602,9531=>602,9532=>602,9533=>602,9534=>602,9535=>602,9536=>602,9537=>602,9538=>602,
-9539=>602,9540=>602,9541=>602,9542=>602,9543=>602,9544=>602,9545=>602,9546=>602,9547=>602,9548=>602,
-9549=>602,9550=>602,9551=>602,9552=>602,9553=>602,9554=>602,9555=>602,9556=>602,9557=>602,9558=>602,
-9559=>602,9560=>602,9561=>602,9562=>602,9563=>602,9564=>602,9565=>602,9566=>602,9567=>602,9568=>602,
-9569=>602,9570=>602,9571=>602,9572=>602,9573=>602,9574=>602,9575=>602,9576=>602,9577=>602,9578=>602,
-9579=>602,9580=>602,9581=>602,9582=>602,9583=>602,9584=>602,9585=>602,9586=>602,9587=>602,9588=>602,
-9589=>602,9590=>602,9591=>602,9592=>602,9593=>602,9594=>602,9595=>602,9596=>602,9597=>602,9598=>602,
-9599=>602,9600=>769,9601=>769,9602=>769,9603=>769,9604=>769,9605=>769,9606=>769,9607=>769,9608=>769,
-9609=>769,9610=>769,9611=>769,9612=>769,9613=>769,9614=>769,9615=>769,9616=>769,9617=>769,9618=>769,
-9619=>769,9620=>769,9621=>769,9622=>769,9623=>769,9624=>769,9625=>769,9626=>769,9627=>769,9628=>769,
-9629=>769,9630=>769,9631=>769,9632=>945,9633=>945,9634=>945,9635=>945,9636=>945,9637=>945,9638=>945,
-9639=>945,9640=>945,9641=>945,9642=>678,9643=>678,9644=>945,9645=>945,9646=>550,9647=>550,9648=>769,
-9649=>769,9650=>769,9651=>769,9652=>502,9653=>502,9654=>769,9655=>769,9656=>502,9657=>502,9658=>769,
-9659=>769,9660=>769,9661=>769,9662=>502,9663=>502,9664=>769,9665=>769,9666=>502,9667=>502,9668=>769,
-9669=>769,9670=>769,9671=>769,9672=>769,9673=>873,9674=>494,9675=>873,9676=>873,9677=>873,9678=>873,
-9679=>873,9680=>873,9681=>873,9682=>873,9683=>873,9684=>873,9685=>873,9686=>527,9687=>527,9688=>791,
-9689=>970,9690=>970,9691=>970,9692=>387,9693=>387,9694=>387,9695=>387,9696=>873,9697=>873,9698=>769,
-9699=>769,9700=>769,9701=>769,9702=>590,9703=>945,9704=>945,9705=>945,9706=>945,9707=>945,9708=>769,
-9709=>769,9710=>769,9711=>1119,9712=>945,9713=>945,9714=>945,9715=>945,9716=>873,9717=>873,9718=>873,
-9719=>873,9720=>769,9721=>769,9722=>769,9723=>830,9724=>830,9725=>732,9726=>732,9727=>769,9728=>896,
-9784=>896,9785=>896,9786=>896,9787=>896,9788=>896,9791=>614,9792=>731,9793=>731,9794=>896,9795=>896,
-9796=>896,9797=>896,9798=>896,9799=>896,9824=>896,9825=>896,9826=>896,9827=>896,9828=>896,9829=>896,
-9830=>896,9831=>896,9833=>472,9834=>638,9835=>896,9836=>896,9837=>472,9838=>357,9839=>484,10145=>838,
-10181=>390,10182=>390,10208=>494,10216=>390,10217=>390,10224=>838,10225=>838,10226=>838,10227=>838,10228=>1033,
-10229=>1434,10230=>1434,10231=>1434,10232=>1434,10233=>1434,10234=>1434,10235=>1434,10236=>1434,10237=>1434,10238=>1434,
-10239=>1434,10240=>732,10241=>732,10242=>732,10243=>732,10244=>732,10245=>732,10246=>732,10247=>732,10248=>732,
-10249=>732,10250=>732,10251=>732,10252=>732,10253=>732,10254=>732,10255=>732,10256=>732,10257=>732,10258=>732,
-10259=>732,10260=>732,10261=>732,10262=>732,10263=>732,10264=>732,10265=>732,10266=>732,10267=>732,10268=>732,
-10269=>732,10270=>732,10271=>732,10272=>732,10273=>732,10274=>732,10275=>732,10276=>732,10277=>732,10278=>732,
-10279=>732,10280=>732,10281=>732,10282=>732,10283=>732,10284=>732,10285=>732,10286=>732,10287=>732,10288=>732,
-10289=>732,10290=>732,10291=>732,10292=>732,10293=>732,10294=>732,10295=>732,10296=>732,10297=>732,10298=>732,
-10299=>732,10300=>732,10301=>732,10302=>732,10303=>732,10304=>732,10305=>732,10306=>732,10307=>732,10308=>732,
-10309=>732,10310=>732,10311=>732,10312=>732,10313=>732,10314=>732,10315=>732,10316=>732,10317=>732,10318=>732,
-10319=>732,10320=>732,10321=>732,10322=>732,10323=>732,10324=>732,10325=>732,10326=>732,10327=>732,10328=>732,
-10329=>732,10330=>732,10331=>732,10332=>732,10333=>732,10334=>732,10335=>732,10336=>732,10337=>732,10338=>732,
-10339=>732,10340=>732,10341=>732,10342=>732,10343=>732,10344=>732,10345=>732,10346=>732,10347=>732,10348=>732,
-10349=>732,10350=>732,10351=>732,10352=>732,10353=>732,10354=>732,10355=>732,10356=>732,10357=>732,10358=>732,
-10359=>732,10360=>732,10361=>732,10362=>732,10363=>732,10364=>732,10365=>732,10366=>732,10367=>732,10368=>732,
-10369=>732,10370=>732,10371=>732,10372=>732,10373=>732,10374=>732,10375=>732,10376=>732,10377=>732,10378=>732,
-10379=>732,10380=>732,10381=>732,10382=>732,10383=>732,10384=>732,10385=>732,10386=>732,10387=>732,10388=>732,
-10389=>732,10390=>732,10391=>732,10392=>732,10393=>732,10394=>732,10395=>732,10396=>732,10397=>732,10398=>732,
-10399=>732,10400=>732,10401=>732,10402=>732,10403=>732,10404=>732,10405=>732,10406=>732,10407=>732,10408=>732,
-10409=>732,10410=>732,10411=>732,10412=>732,10413=>732,10414=>732,10415=>732,10416=>732,10417=>732,10418=>732,
-10419=>732,10420=>732,10421=>732,10422=>732,10423=>732,10424=>732,10425=>732,10426=>732,10427=>732,10428=>732,
-10429=>732,10430=>732,10431=>732,10432=>732,10433=>732,10434=>732,10435=>732,10436=>732,10437=>732,10438=>732,
-10439=>732,10440=>732,10441=>732,10442=>732,10443=>732,10444=>732,10445=>732,10446=>732,10447=>732,10448=>732,
-10449=>732,10450=>732,10451=>732,10452=>732,10453=>732,10454=>732,10455=>732,10456=>732,10457=>732,10458=>732,
-10459=>732,10460=>732,10461=>732,10462=>732,10463=>732,10464=>732,10465=>732,10466=>732,10467=>732,10468=>732,
-10469=>732,10470=>732,10471=>732,10472=>732,10473=>732,10474=>732,10475=>732,10476=>732,10477=>732,10478=>732,
-10479=>732,10480=>732,10481=>732,10482=>732,10483=>732,10484=>732,10485=>732,10486=>732,10487=>732,10488=>732,
-10489=>732,10490=>732,10491=>732,10492=>732,10493=>732,10494=>732,10495=>732,10496=>838,10497=>838,10498=>838,
-10499=>838,10500=>838,10501=>838,10502=>838,10503=>838,10504=>838,10505=>838,10506=>838,10507=>838,10508=>838,
-10509=>838,10510=>838,10511=>838,10512=>838,10513=>838,10514=>838,10515=>838,10516=>838,10517=>838,10518=>838,
-10519=>838,10520=>838,10521=>838,10522=>838,10523=>838,10524=>838,10525=>838,10526=>838,10527=>838,10528=>838,
-10529=>838,10530=>838,10531=>838,10532=>838,10533=>838,10534=>838,10535=>838,10536=>838,10537=>838,10538=>838,
-10539=>838,10540=>838,10541=>838,10542=>838,10543=>838,10544=>838,10545=>838,10546=>838,10547=>838,10548=>838,
-10549=>838,10550=>838,10551=>838,10552=>838,10553=>838,10554=>838,10555=>838,10556=>838,10557=>838,10558=>838,
-10559=>838,10560=>838,10561=>838,10562=>838,10563=>838,10564=>838,10565=>838,10566=>838,10567=>838,10568=>838,
-10569=>838,10570=>838,10571=>838,10572=>838,10573=>838,10574=>838,10575=>838,10576=>838,10577=>838,10578=>838,
-10579=>838,10580=>838,10581=>838,10582=>838,10583=>838,10584=>838,10585=>838,10586=>838,10587=>838,10588=>838,
-10589=>838,10590=>838,10591=>838,10592=>838,10593=>838,10594=>838,10595=>838,10596=>838,10597=>838,10598=>838,
-10599=>838,10600=>838,10601=>838,10602=>838,10603=>838,10604=>838,10605=>838,10606=>838,10607=>838,10608=>838,
-10609=>838,10610=>838,10611=>838,10612=>838,10613=>838,10614=>838,10615=>981,10616=>838,10617=>838,10618=>984,
-10619=>838,10620=>838,10621=>838,10622=>838,10623=>838,10731=>494,10764=>1513,10765=>521,10766=>521,10799=>838,
-11008=>838,11009=>838,11010=>838,11011=>838,11012=>838,11013=>838,11014=>838,11015=>838,11016=>838,11017=>838,
-11018=>838,11019=>838,11020=>838,11021=>838,11022=>838,11023=>838,11024=>838,11025=>838,11026=>945,11027=>945,
-11028=>945,11029=>945,11030=>769,11031=>769,11032=>769,11033=>769,11034=>945,11364=>753,11367=>872,11368=>644,
-11369=>747,11370=>606,11371=>695,11372=>527,11374=>1024,11375=>722,11381=>740,11382=>531,11383=>700,11385=>501,
-11386=>602,11388=>264,11389=>455,11520=>773,11521=>635,11522=>633,11523=>658,11524=>631,11525=>962,11526=>756,
-11527=>960,11528=>617,11529=>646,11530=>962,11531=>632,11532=>646,11533=>962,11534=>645,11535=>866,11536=>961,
-11537=>645,11538=>645,11539=>959,11540=>945,11541=>863,11542=>644,11543=>646,11544=>645,11545=>649,11546=>688,
-11547=>634,11548=>982,11549=>681,11550=>676,11551=>852,11552=>957,11553=>632,11554=>645,11555=>646,11556=>749,
-11557=>914,11800=>536,11810=>390,11811=>390,11812=>390,11813=>390,11822=>536,42564=>685,42565=>513,42566=>395,
-42567=>392,42576=>1104,42577=>939,42580=>1193,42581=>871,42582=>1140,42583=>875,42760=>493,42761=>493,42762=>493,
-42763=>493,42764=>493,42765=>493,42766=>493,42767=>493,42768=>493,42769=>493,42770=>493,42771=>493,42772=>493,
-42773=>493,42774=>493,42779=>369,42780=>369,42781=>253,42782=>253,42783=>253,42891=>402,42892=>275,62464=>664,
-62465=>675,62466=>724,62467=>958,62468=>675,62469=>669,62470=>735,62471=>997,62472=>675,62473=>675,62474=>1268,
-62475=>693,62476=>692,62477=>963,62478=>675,62479=>692,62480=>1009,62481=>756,62482=>809,62483=>758,62484=>955,
-62485=>691,62486=>946,62487=>690,62488=>698,62489=>692,62490=>739,62491=>692,62492=>698,62493=>676,62494=>739,
-62495=>895,62496=>675,62497=>785,62498=>676,62499=>675,62500=>675,62501=>732,62502=>972,62504=>904,63172=>505,
-63173=>602,63174=>640,63175=>644,63176=>947,63185=>500,63188=>500,64256=>708,64257=>667,64258=>667,64259=>941,
-64260=>986,64261=>744,64262=>916,65024=>0,65025=>0,65026=>0,65027=>0,65028=>0,65029=>0,65030=>0,
-65031=>0,65032=>0,65033=>0,65034=>0,65035=>0,65036=>0,65037=>0,65038=>0,65039=>0,65529=>0,
-65530=>0,65531=>0,65532=>0,65533=>1025);
-$enc='';
-$diff='';
-$file='dejavuserifi.z';
-$ctg='dejavuserifi.ctg.z';
-$originalsize=301828;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/AUTHORS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/AUTHORS
deleted file mode 100644
index 9b0ad4d0270..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/AUTHORS
+++ /dev/null
@@ -1,207 +0,0 @@
--*- mode:text; coding:utf-8; -*-
-                        GNU FreeFont Authors
-                        ====================
-
-The FreeFont collection is being maintained by
-	Steve White <stevan.white AT googlemail.com>
-The folowing list cites the other contributors that contributed to
-particular ISO 10646 blocks.
-
-* URW++ Design & Development GmbH <http://www.urwpp.de/>
-
-	Basic Latin				(U+0041-U+007A)
-	Latin-1 Supplement                      (U+00C0-U+00FF) (most)
-	Latin Extended-A                        (U+0100-U+017F)
-	Spacing Modifier Letters		(U+02B0-U+02FF)
-	Mathematical Operators			(U+2200-U+22FF) (parts)
-	Block Elements				(U+2580-U+259F)
-	Dingbats				(U+2700-U+27BF)
-
-* Yannis Haralambous <yannis.haralambous AT enst-bretagne.fr> and John
-  Plaice <plaice AT omega.cse.unsw.edu.au>
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-	Greek					(U+0370-U+03FF)
-	Armenian				(U+0530-U+058F)
-	Hebrew					(U+0590-U+05FF)
-	Arabic					(U+0600-U+06FF)
-	Currency Symbols			(U+20A0-U+20CF)
-	Arabic Presentation Forms-A		(U+FB50-U+FDFF)
-	Arabic Presentation Forms-B		(U+FE70-U+FEFF)
-
-* Young U. Ryu <ryoung AT utdallas.edu>
-
-	Arrows					(U+2190-U+21FF)
-	Mathematical Symbols			(U+2200-U+22FF)
-	Mathematical Alphanumeric Symbols       (U+1D400-U+1D7FF)
-
-* Valek Filippov <frob AT df.ru>
-
-	Cyrillic				(U+0400-U+04FF)
-
-* Wadalab Kanji Comittee
-
-	Hiragana				(U+3040-U+309F)
-	Katakana				(U+30A0-U+30FF)
-
-* Angelo Haritsis <ah AT computer.org>
-
-	Greek					(U+0370-U+03FF)
-
-* Yannis Haralambous and Virach Sornlertlamvanich
-
-	Thai					(U+0E00-U+0E7F)
-
-* Shaheed R. Haque <srhaque AT iee.org>
-
-	Bengali					(U+0980-U+09FF)
-
-* Sam Stepanyan <sam AT arminco.com>
-
-	Armenian				(U+0530-U+058F)
-
-* Mohamed Ishan <ishan AT mitf.f2s.com>
-
-	Thaana					(U+0780-U+07BF)
-
-* Sushant Kumar Dash <sushant AT writeme.com>
-
-	Oriya					(U+0B00-U+0B7F)
-
-* Harsh Kumar <harshkumar AT vsnl.com>
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-
-* Prasad A. Chodavarapu <chprasad AT hotmail.com>
-
-	Telugu					(U+0C00-U+0C7F)
-
-* Frans Velthuis <velthuis AT rc.rug.nl> and Anshuman Pandey
-  <apandey AT u.washington.edu> 
-
-	Devanagari				(U+0900-U+097F)
-
-* Hardip Singh Pannu <HSPannu AT aol.com>
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-* Jeroen Hellingman <jehe AT kabelfoon.nl>
-
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-
-* Thomas Ridgeway <email needed>
-
-	Tamil					(U+0B80-U+0BFF)
-
-* Berhanu Beyene <1beyene AT informatik.uni-hamburg.de>,
-  Prof. Dr. Manfred Kudlek <kudlek AT informatik.uni-hamburg.de>, Olaf
-  Kummer <kummer AT informatik.uni-hamburg.de>, and Jochen Metzinger <?>
-
-	Ethiopic				(U+1200-U+137F)
-
-* Maxim Iorsh <iorsh AT users.sourceforge.net>
-
-	Hebrew					(U+0590-U+05FF)
-
-* Vyacheslav Dikonov <sdiconov AT mail.ru>
-
-	Syriac					(U+0700-U+074A)
-	Braille					(U+2800-U+28FF)
-
-* Panayotis Katsaloulis <panayotis AT panayotis.com>
-
-	Greek Extended				(U+1F00-U+1FFF)
-
-* M.S. Sridhar <mssridhar AT vsnl.com>
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Tamil					(U+0B80-U+0BFF)
-	Telugu					(U+0C00-U+0C7F)
-	Kannada					(U+0C80-U+0CFF)	
-	Malayalam				(U+0D00-U+0D7F)
-
-* DMS Electronics, The Sri Lanka Tipitaka Project, and Noah Levitt
-  <nlevitt AT columbia.edu>
-
-	Sinhala					(U+0D80-U+0DFF)
-        
-* Dan Shurovich Chirkov <dansh AT chirkov.com>
-
-	Cyrillic				(U+0400-U+04FF)
-
-* Abbas Izad <abbasizad AT hotmail.com>
-
-	Arabic					(U+0600-U+06FF)
-	Arabic Presentation Forms-A		(U+FB50-U+FDFF)
-	Arabic Presentation Forms-B		(U+FE70-U+FEFF)
-
-* Denis Jacquerye <moyogo AT gmail.com>
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-
-* K.H. Hussain <hussain AT kfri.org> and R. Chitrajan
-
-	Malayalam				(U+0D00-U+0D7F)
-
-* Solaiman Karim <solaiman AT ekushey.org> and Omi Azad <omi AT ekushey.org>
-
-	Bengali					(U+0980-U+09FF)
-
-* Sonali Sonania <sonalisonania AT gmail.com> and Monika Shah
-  <monikapatira AT gmail.com>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-
-* Pravin Satpute <pravin_ind21 AT hotmail.com>, Bageshri Salvi
-  <sbagrshri AT yahoo.co.in>, Rahul Bhalerao <rahul_pb_india AT
-  yahoo.com> and Sandeep Shedmake <surgs2k47 AT yahoo.co.in>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-	Tamil					(U+0B80-U+0BFF)
-
-* Kulbir Singh Thind
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-* Gia Shervashidze <giasher AT telenet.ge>
-
-        Georgian				(U+10A0-U+10FF)
-
-* Daniel Johnson
-
-	Cherokee                                (U+13A0-U+13FF)
-
-* George Douros
-
-	Gothic                                  (U+10330-U+1034F)
-	Phoenecian                              (U+10900-U+1091F)
-	Byzantine Musical Symbols               (U+1D000-U+1D0FF)
-	Western Musical Symbols                 (U+1D100-U+1D1DF)
-	Mathematical Alphanumeric Symbols       (U+1D400-U+1D7FF)
-	Mah Jong Tiles                          (U+1F000-U+1F02B)
-	Dominoes                                (U+1F030-U+1F093)
-
-* Steve White <stevan_white AT gmail.com>
-	Coptic                                  (U+2C80-U+2CFF)
-
-* Primož Peterlin <primoz.peterlin AT biofiz.mf.uni-lj.si>
-  maintained FreeFont for several years, and is thanked for all his work.
-
-Please see the CREDITS file for details on who contributed particular
-subsets of the glyphs in font files.
-
---------------------------------------------------------------------------
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/COPYING b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/COPYING
deleted file mode 100644
index 94a9ed024d3..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/CREDITS b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/CREDITS
deleted file mode 100644
index f578e5d4fea..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/CREDITS
+++ /dev/null
@@ -1,527 +0,0 @@
--*- mode:text; coding:utf-8; -*-
-                         GNU FreeFont Credits
-                         ====================
-
-This file lists contributors and contributions to the GNU FreeFont project.
-
-
-* URW++ Design & Development GmbH <http://www.urwpp.de/>
-
-URW++ donated a set of 35 core PostScript Type 1 fonts to the
-Ghostscript project <http://www.cs.wisc.edu/~ghost/>, to be available
-under the terms of GNU General Public License (GPL).
-
-	Basic Latin				(U+0041-U+007A)
-	Latin-1 Supplement                      (U+00C0-U+00FF)
-	Latin Extended-A                        (U+0100-U+017F)
-	Spacing Modifier Letters		(U+02B0-U+02FF)
-	Mathematical Operators			(U+2200-U+22FF)
-	Block Elements				(U+2580-U+259F)
-	Dingbats				(U+2700-U+27BF)
-
-
-* Yannis Haralambous <yannis.haralambous AT enst-bretagne.fr> and John
-  Plaice <plaice AT omega.cse.unsw.edu.au>
-
-Yannis Haralambous and John Plaice are the authors of Omega typesetting
-system, <http://omega.enstb.org/>. Omega is an extension of TeX.
-Its first release, aims primarily at improving TeX's multilingual abilities.
-In Omega all characters and pointers into data-structures are 16-bit wide,
-instead of 8-bit, thereby eliminating many of the trivial limitations of TeX.
-Omega also allows multiple input and output character sets, and uses
-programmable filters to translate from one encoding to another, to perform
-contextual analysis, etc. Internally, Omega uses the universal 16-bit Unicode
-standard character set, based on ISO-10646. These improvements not only make
-it a lot easier for TeX users to cope with multiple or complex languages,
-like Arabic, Indic, Khmer, Chinese, Japanese or Korean, in one document, but
-will also form the basis for future developments in other areas, such as
-native color support and hypertext features. ... Fonts for UT1 (omlgc family)
-and UT2 (omah family) are under development: these fonts are in PostScript
-format and visually close to Times and Helvetica font families. 
-Omega fonts are available subject to GPL
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-	Greek					(U+0370-U+03FF)
-	Armenian				(U+0530-U+058F)
-	Hebrew					(U+0590-U+05FF)
-	Arabic					(U+0600-U+06FF)
-	Currency Symbols			(U+20A0-U+20CF)
-	Arabic Presentation Forms-A		(U+FB50-U+FDFF)
-	Arabic Presentation Forms-B		(U+FE70-U+FEFF)
-
-Current info: <http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=omega>
-
-* Valek Filippov <frob AT df.ru>
-
-Valek Filippov added Cyrillic glyphs and composite Latin Extended A to
-the whole set of the abovementioned URW set of 35 PostScript core fonts,
-<ftp://ftp.gnome.ru/fonts/urw/>. The fonts are available under GPL.
-
-	Latin Extended-A                        (U+0100-U+017F)
-	Cyrillic				(U+0400-U+04FF)
-
-
-* Wadalab Kanji Comittee
-
-Between April 1990 and March 1992, Wadalab Kanji Comittee put together
-a series of scalable font files with Japanese scripts, in four forms:
-Sai Micho, Chu Mincho, Cho Kaku and Saimaru. The font files are
-written in custom file format, while tools for conversion into
-Metafont and PostScript Type 1 are also supplied. The Wadalab Kanji
-Comittee has later been dismissed, and the resulting files can be now
-found on the FTP server of the Depertment of Mathematical Engineering
-and Information Physics, Faculty of Engineering, University of Tokyo
-<ftp://ftp.ipl.t.u-tokyo.ac.jp/Font/>.
-
-	Hiragana				(U+3040-U+309F)
-	Katakana				(U+30A0-U+30FF)
-
-
-* Young U. Ryu <ryoung AT utdallas.edu>
-
-Young Ryu is the author of Txfonts, a set of mathematical symbols
-designed to accompany text typeset in Times or its variants. In the
-documentation, Young adresses the design of mathematical symbols: "The
-Adobe Times fonts are thicker than the CM fonts. Designing math fonts
-for Times based on the rule thickness of Times = , , + , / , < ,
-etc. would result in too thick math symbols, in my opinion. In the TX
-fonts, these glyphs are thinner than those of original Times
-fonts. That is, the rule thickness of these glyphs is around 85% of
-that of the Times fonts, but still thicker than that of the CM fonts."
-TX fonts are are distributed under the GNU public license (GPL). 
-<http://www.ctan.org/tex-archive/fonts/txfonts/>.
-
-	Arrows					(U+2190-U+21FF)
-	Mathematical Symbols			(U+2200-U+22FF)
-
-
-* Angelo Haritsis <ah AT computer.org>
-
-Angelo Haritsis has compiled a set of Greek Type 1 fonts, available on
-<ftp://ftp.hellug.gr/pub/unix/linux/GREEK/fonts/greekXfonts-Type1-1.1.tgz>.
-The glyphs from this source has been used to compose Greek glyphs in
-FreeSans and FreeMono.
-
-Angelo's licence says: "You can enjoy free use of these fonts for
-educational or commercial purposes.  All derived works should include
-this paragraph.  If you want to change something please let me have
-your changes (via email) so that they can go into the next
-version. You can also send comments etc to the above address."
-
-	Greek					(U+0370-U+03FF)
-
-
-* Yannis Haralambous and Virach Sornlertlamvanich
-
-In 1999, Yannis Haralambous and Virach Sornlertlamvanich made a set of
-glyphs covering the Thai national standard Nf3, in both upright and
-slanted shape. The collection of glyphs have been made part of GNU
-intlfonts 1.2 package and is available under the GPL at
-<ftp://ftp.gnu.org/pub/gnu/intlfonts/>.
-
-	Thai					(U+0E00-U+0E7F)
-
-
-* Shaheed R. Haque <srhaque AT iee.org>
-
-Shaheed Haque has developed a basic set of basic Bengali glyphs
-(without ligatures), using ISO10646 encoding. They are available under
-the XFree86 license at <http://www.btinternet.com/~shaheedhaque/>.
-
-Copyright (C) 2001 S.R.Haque <srhaque AT iee.org>.  All Rights Reserved.
-
-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 S.R.HAQUE 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.
-
-Except as contained in this notice, the name of S.R.Haque shall not be
-used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from
-S.R.Haque.
-
-	Bengali					(U+0980-U+09FF)
-
-
-* Sam Stepanyan <sam AT arminco.com>
-
-Sam Stepanyan created a set of Armenian sans serif glyphs visually
-compatible with Helvetica or Arial. Available on
-<http://www.editum.com.ar/mashtots/html/fonts/ara.tar.gz>. On
-2002-01-24, Sam writes: "Arial Armenian font is free for
-non-commercial use, so it is OK to use under GPL license."
-
-	Armenian				(U+0530-U+058F)
-
-
-* Mohamed Ishan <ishan AT mitf.f2s.com>
-
-Mohamed Ishan has started a Thaana Unicode Project
-<http://thaana.sourceforge.net/> and among other things created a
-couple of Thaana fonts, available under FDL or BDF license.
-
-	Thaana					(U+0780-U+07BF)
-
-
-* Sushant Kumar Dash <sushant AT writeme.com> (*)
-
-Sushant Dash has created a font in his mother tongue, Oriya. As he
-states on his web page <http://members.tripod.com/~sushantdash/>:
-"Please feel free to foreword this mail to your Oriya friends. No
-copyright law is applied for this font. It is totally free!!! Feel
-free to modify this using any font editing tools. This is designed for
-people like me, who are away from Orissa and want to write letters
-home using Computers, but suffer due to unavailability of Oriya
-fonts.(Or the cost of the available packages are too much)."
-
-	Oriya					(U+0B00-U+0B7F)
-
-
-* Harsh Kumar <harshkumar AT vsnl.com>
-
-Harsh Kumar has started BharatBhasha <http://www.bharatbhasha.net/> -
-an effort to provide "FREE software, Tutorial, Source Codes
-etc. available for working in Hindi, Marathi, Gujarati, Gurmukhi and
-Bangla. You can type text, write Web pages or develop Indian Languages
-Applications on Windows and on Linux. We also offer FREE help to
-users, enthusiasts and software developers for their work in Indian
-languages."
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-
-
-* Prasad A. Chodavarapu <chprasad AT hotmail.com>
-
-Prasad A. Chodavarapu created Tikkana, a Telugu font available in Type
-1 and TrueType format on <http://chaitanya.bhaavana.net/fonts/>. 
-Tikkana exceeds the Unicode Telugu range with some composite glyphs.
-Available under the GNU General Public License.
-
-	Telugu					(U+0C00-U+0C7F)
-
-
-* Frans Velthuis <velthuis AT rc.rug.nl> and Anshuman Pandey
-  <apandey AT u.washington.edu>
-
-In 1991, Frans Velthuis from the Groningen University, The
-Netherlands, released a Devanagari font as Metafont source, available
-under the terms of GNU GPL. Later, Anshuman Pandey from the Washington
-University, Seattle, USA, took over the maintenance of font. Fonts can
-be found on CTAN, <ftp://ftp.dante.de/tex-archive/language/devanagari/>. I
-converted the font to Type 1 format using Péter Szabó's TeXtrace
-program <http://www.inf.bme.hu/~pts/textrace/> and removed some
-redundant control points with PfaEdit.
-
-	Devanagari				(U+0900-U+097F)
-
-
-* Hardip Singh Pannu <HSPannu AT aol.com>
-
-In 1991, Hardip Singh Pannu has created a free Gurmukhi TrueType font,
-available as regular, bold, oblique and bold oblique form. Its license
-says "Please remember that these fonts are copyrighted (by me) and are
-for non-profit use only." 
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-
-* Jeroen Hellingman <jehe AT kabelfoon.nl>
-
-Jeroen Hellingman created a set of Malayalam metafonts in 1994, and a
-set of Oriya metafonts in 1996. Malayalam fonts were created as
-uniform stroke only, while Oriya metafonts exist in both uniform and
-modulated stroke. From private communication: "It is my intention to
-release the fonts under GPL, but not all copies around have this
-notice on them." Metafonts can be found on CTAN,
-<ftp://ftp.dante.de/tex-archive/language/oriya/> and
-<ftp://ftp.dante.de/tex-archive/language/malayalam/>.
-
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-
-
-* Thomas Ridgeway <> (*)
-
-Thomas Ridgeway, then at the Humanities And Arts Computing Center,
-Washington University, Seattle, USA, (now defunct), created a Tamil
-metafont in 1990. Anshuman Pandey from the same university took over
-the maintenance of font. Fonts can be found at CTAN,
-<ftp://ftp.dante.de/tex-archive/language/tamil/wntamil/>.
-
-	Tamil					(U+0B80-U+0BFF)
-
-
-* Berhanu Beyene <1beyene AT informatik.uni-hamburg.de>,
-  Prof. Dr. Manfred Kudlek <kudlek AT informatik.uni-hamburg.de>, Olaf
-  Kummer <kummer AT informatik.uni-hamburg.de>, and Jochen Metzinger <?>
-
-Beyene, Kudlek, Kummer and Metzinger from the Theoretical Foundations
-of Computer Science, University of Hamburg, prepared a set of Ethiopic
-metafonts, found on
-<ftp://ftp.dante.de/tex-archive/language/ethiopia/ethiop/>. They also
-maintain home page on the Ethiopic font project,
-<http://www.informatik.uni-hamburg.de/TGI/mitarbeiter/wimis/kummer/ethiop_eng.html>,
-and can be reached at <ethiop AT informatik.uni-hamburg.de>. The current
-version of fonts is 0.7 (1998), and they are released under GNU GPL. I
-converted the fonts to Type 1 format using Péter Szabó's TeXtrace-A
-program <http://www.inf.bme.hu/~pts/textrace/> and removed some
-redundant control points with PfaEdit.
-
-	Ethiopic				(U+1200-U+137F)
-
-
-* Maxim Iorsh <iorsh AT users.sourceforge.net>
-
-In 2002, Maxim Iorsh started the Culmus project, aiming at providing
-Hebrew-speaking Linux and Unix community with a basic collection of
-Hebrew fonts for X Windows. The fonts are visually compatible with
-URW++ Century Schoolbook L, URW++ Nimbus Sans L and URW++ Nimbus Mono
-L families, respectively, and are released under GNU GPL license. See
-also <http://culmus.sourceforge.net/>.
-
-	Hebrew					(U+0590-U+05FF)
-
-
-* Panayotis Katsaloulis <panayotis AT panayotis.com>
-
-Panayotis Katsaloulis helped fixing Greek accents in the Greek
-Extended area.
-
-	Greek Extended				(U+1F00-U+1FFF)
-
-
-* Vyacheslav Dikonov <sdiconov AT mail.ru>
-
-Vyacheslav Dikonov made a Braille unicode font that could be merged
-with the UCS fonts to fill the 2800-28FF range completely. (uniform
-scaling is possible to adapt it to any cell size). He also contributed
-a free syriac font, whose glyphs (about half of them) are borrowed
-from the "Carlo Ator" font freely downloadable from
-<http://www.aacf.asso.fr/>. Vyacheslav also filled in a few missing
-spots in the U+2000-U+27FF area, e.g. the box drawing section, sets of
-subscript and superscript digits and capital Roman numbers.
-
-	Syriac					(U+0700-U+074A)
-	Box Drawing				(U+2500-U+257F)
-	Braille					(U+2800-U+28FF)
-
-
-* M.S. Sridhar <mssridhar AT vsnl.com>
-
-M/S Cyberscape Multimedia Limited, Mumbai, developers of Akruti
-Software for Indian Languages (http://www.akruti.com/), have released
-a set of TTF fonts for nine Indian scripts (Devanagari, Gujarati,
-Telugu, Tamil, Malayalam, Kannada, Bengali, Oriya, and Gurumukhi)
-under the GNU General Public License (GPL). You can download the fonts
-from the Free Software Foundation of India WWW site
-(http://www.gnu.org.in/akruti-fonts/) or from the Akruti website.
-
-For any further information or assistance regarding these fonts,
-please contact mssridhar AT vsnl.com.
-
-	Devanagari				(U+0900-U+097F)
-	Bengali					(U+0980-U+09FF)
-	Gurmukhi				(U+0A00-U+0A7F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Tamil					(U+0B80-U+0BFF)
-	Telugu					(U+0C00-U+0C7F)
-	Kannada					(U+0C80-U+0CFF)	
-	Malayalam				(U+0D00-U+0D7F)
-
-
-* DMS Electronics, The Sri Lanka Tipitaka Project, and Noah Levitt
-  <nlevitt AT columbia.edu>
-
-Noah Levitt found out that the Sinhalese fonts available on the site
-<http://www.metta.lk/fonts/> are released under GNU GPL, or,
-precisely, "Public Domain under GNU Licence
 Produced by DMS
-Electronics for The Sri Lanka Tipitaka Project" (taken from the font
-comment), and took the effort of recoding the font to Unicode.
-
-	Sinhala					(U+0D80-U+0DFF)
-       
-
-* Daniel Shurovich Chirkov <dansh AT chirkov.com>
-
-Dan Chirkov updated the FreeSerif font with the missing Cyrillic
-glyphs needed for conformance to Unicode 3.2. The effort is part of
-the Slavjanskij package for Mac OS X,
-<http://www.versiontracker.com/dyn/moreinfo/macosx/18680>.
-
-	Cyrillic				(U+0400-U+04FF)
-
-
-* Denis Jacquerye <moyogo AT gmail.com>
-
-Denis Jacquerye added new glyphs and corrected existing ones in the
-Latin Extended-B and IPA Extensions ranges.
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-
-
-* K.H. Hussain <hussain AT kfri.org> and R. Chitrajan
-
-`Rachana' in Malayalam means `to write', `to create'. Rachana Akshara Vedi,
-a team of socially committed information technology professionals and
-philologists, has applied developments in computer technology and desktop
-publishing to resurrect the Malayalam language from the disorder,
-fragmentation and degeneration it had suffered since the attempt to adapt
-the Malayalam script for using with a regular mechanical typewriter, which
-took place in 1967-69. K.H. Hussein at the Kerala Forest Research Institute
-has released "Rachana Normal" fonts with approximately 900 glyphs required
-to typeset traditional Malayalam. R. Chitrajan apparently encoded the
-glyphs in the OpenType table.
-
-In 2008, the Malayalam ranges in FreeSerif were updated under the advise 
-and supervision of Hiran Venugopalan of Swathanthra Malayalam Computing,
-to reflect the revised edition Rachana_04.
-
-	Malayalam				(U+0D00-U+0D7F)
-
-
-* Solaiman Karim <solaiman AT ekushey.org>
-
-	Bengali					(U+0980-U+09FF)
-
-Solaiman Karim has developed several OpenType Bangla fonts and
-released them under GNU GPL on <http://www.ekushey.org>.
-
-
-* Sonali Sonania <sonalisonania AT gmail.com> and Monika Shah
-  <monikapatira AT gmail.com>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-
-Glyphs were drawn by Cyberscape Multimedia Ltd., #101,Mahalakshmi
-Mansion 21st Main 22nd "A" Cross Banashankari 2nd stage Banglore
-560070, India. Converted to OTF by IndicTrans Team, Powai, Mumbai,
-lead by Prof. Jitendra Shah. Maintained by Monika Shah and Sonali
-Sonania of janabhaaratii Team, C-DAC, Mumbai. This font is released
-under GPL by Dr. Alka Irani and Prof Jitendra Shah, janabhaaratii
-Team, C-DAC, Mumabi. janabhaaratii is localisation project at C-DAC
-Mumbai (formerly National Centre for Software Technology); funded by
-TDIL, Govt. of India. Contact:monika_shah AT lycos.com,
-sonalisonania AT yahoo.com, jitendras AT vsnl.com, alka AT ncst.ernet.in.
-website: www.janabhaaratii.org.in.
-
-
-* Pravin Satpute <pravin_ind21 AT hotmail.com>, Bageshri Salvi
-  <sbagrshri AT yahoo.co.in>, Rahul Bhalerao <rahul_pb_india AT
-  yahoo.com> and Sandeep Shedmake <surgs2k47 AT yahoo.co.in>
-
-	Devanagari				(U+0900-U+097F)
-	Gujarati				(U+0A80-U+0AFF)
-	Oriya					(U+0B00-U+0B7F)
-	Malayalam				(U+0D00-U+0D7F)
-	Tamil					(U+0B80-U+0BFF)
-
-In December 2005 the team at www.gnowledge.org released a set of two
-Unicode pan-Indic fonts: "Samyak" and "Samyak Sans". "Samyak" font
-belongs to serif style and is an original work of the team; "Samyak
-Sans" font belongs to sans serif style and is actually a compilation
-of already released Indic fonts (Gargi, Padma, Mukti, Utkal, Akruti
-and ThendralUni). Both fonts are based on Unicode standard. You can
-download the font files (released under GNU/GPL License) from
-http://www.gnowledge.org/Gnoware/localization/font.htm
-
-
-* Kulbir Singh Thind
-
-	Gurmukhi				(U+0A00-U+0A7F)
-
-Dr. Kulbir Singh Thind designed a set of Gurmukhi Unicode fonts,
-AnmolUni and AnmolUni-Bold, which are available under the terms of GNU
-Generel Public Licens from the Punjabu Computing Resource Center,
-http://guca.sourceforge.net/typography/fonts/anmoluni/.
-
-
-* Gia Shervashidze <giasher AT telenet.ge>
-
-        Georgian				(U+10A0-U+10FF)
-
-Starting in mid-1990s, Gia Shervashidze designed many
-Unicode-compliant Georgian fonts: Times New Roman Georgian, Arial
-Georgian, Courier New Georgian. His work on Georgian localization can
-be reached at http://www.gia.ge/.
-
-
-* Primož Peterlin <primoz.peterlin AT biofiz.mf.uni-lj.si>
-
-Primož Peterlin filled in missing glyphs here and there (e.g. Latin
-Extended-B and IPA Extensions ranges in the FreeMono familiy), and
-created the following UCS blocks:
-
-	Latin Extended-B                        (U+0180-U+024F)
-	IPA Extensions				(U+0250-U+02AF)
-	Arrows					(U+2190-U+21FF)
-	Box Drawing				(U+2500-U+257F)
-	Block Elements				(U+2580-U+259F)
-	Geometrical Shapes			(U+25A0-U+25FF)
-
-* Mark Williamson
-
-Made the MPH 2 Damase font, from which 
-	Hanunóo                                 (U+1720-U+173F)
-	Buginese                                (U+1A00-U+1A1F)
-	Tai Le                                  (U+1950-U+197F)
-	Ugaritic                                (U+10380-U+1039F)
-	Old Persian                             (U+103A0-U+103DF)
-
-* Jacob Poon
-
-Submitted a very thorough survey of glyph problems and other suggestions.
-
-* Alexey Kryukov
-
-Made the TemporaLCGUni fonts, based on the URW++ fonts, from which at one 
-point FreeSerif Cyrillic, and some of the Greek, was drawn.  He also provided
-valuable direction about Cyrillic and Greek typesetting.
-
-* George Douros
-
-The creator of several fonts focusing on ancient scripts and symbols.
-Many of the glyphs are created by making outlines from scanned images
-of ancient sources.
-
-	Aegean:   Phoenecian
-	Analecta: Gothic                        (U+10330-U+1034F)
-	Musical:  Byzantine & Western                  
-	Unicode:  many Miscellaneous Symbols, Miscellaneous Technical,
-	          supplemental Symbols, and Mathematical Alphanumeric symbols,
-		  Mah Jong, and the outline of the Domino.
-
-* Daniel Johnson
-
-Created by hand a Cherokee range specially for FreeFont to be "in line with
-the classic Cherokee typefaces used in 19th century printing", but also to
-fit well with ranges previously in FreeFont.
-	Cherokee                                (U+13A0-U+13FF)
-
-Notes:
-
-*: The glyph collection looks license-compatible, but its author has
-   not yet replied and agreed on their work being used in part of
-   this glyph collection.
-
---------------------------------------------------------------------------
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/ChangeLog b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/ChangeLog
deleted file mode 100644
index 7527390d2d2..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/ChangeLog
+++ /dev/null
@@ -1,4524 +0,0 @@
-2009-01-04 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added 2009 to copyright dates
-
-	* AUTHORS, CREDITS:
-
-	Removed Glagolitic range author
-
-	* FreeSans.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added some TrueType names
-
-2009-01-01 Stevan_White
-	* FreeSerif.sfd:
-
-	Removde Glagolitic range, since have not (yet) received OK from author.
-	
-	Added some TrueType Names
-
-2008-12-31 Stevan_White
-	* COPYING:
-
-	Updated license to GPL v3
-
-2008-12-30 Stevan_White
-	* FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Oblique versions of Daniel Johnson's Cherokee.
-
-	* FreeSerifBold.sfd:
-
-	Cherokee Bold range from Daniel Johnson.
-
-2008-12-27 Stevan_White
-	* isMonoMono.py:
-
-	900 EM -> 800
-
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd:
-
-	Made glyphs to lie between -200 and 800 EM
-
-	* isMonoMono.py:
-
-	check that glyphs lie in vertical bounding boxes
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Extensible bracket characters didn't exactly line up.  Fixed.
-	Mono: a couple of glyphs had gotten out of their bounding boxes again.
-
-2008-12-26 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Final pre-release cleanup
-
-	* FreeSerif.sfd:
-
-	Buginese vowel u was misnamed
-
-	* FreeMono.sfd:
-
-	Yatcyrillic somehow was a mark character ... fixed
-
-	* FreeSans.sfd, FreeSansOblique.sfd:
-
-	Had to un-link references in
-	        Sans: uni02B2, uni02B5
-		SansOblique: uni0363
-	because validation of the TTF file said the glyph
-		"is drawn in wrong direction"
-	I would have preferred to have understand this...
-
-	* Makefile:
-
-	Added quick test for FontForge version.
-
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd:
-
-	Removed kerning tables (?? what were they doing here anyway??)
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Kerning tables for Thai.
-	Handles one common case: short letter followed by a tall one with
-	an overhang to the left.
-
-2008-12-25 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	More putzing with kerning tables
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Copied kerning classes
-		Serif -> SerifBold
-		SerifItalic -> SerifBoldItalic
-		Sans -> SansOblique SansBold SansBoldOblique
-	Some associated naming of characters, etc
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Additions and correction in Spacing Modifier letters and IPA Extensions
-
-2008-12-23 Stevan_White
-	* FreeSerif.sfd:
-
-	Applied patch to Cherokee range
-
-2008-12-20 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Fixed kern classes that end in space (crashes FontForge)
-
-	* FreeSerifItalic.sfd, FreeSerif.sfd:
-
-	kerning
-
-2008-12-19 Stevan_White
-	* FreeSerifItalic.sfd:
-
-	kerning
-
-	* FreeSerif.sfd:
-
-	kerning
-	Some adjustments to Glagolitc spacing, mark positioning
-
-2008-12-18 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-2008-12-17 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-2008-12-11 Stevan_White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	kerning
-
-2008-12-10 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	kerning
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd:
-
-	kerning
-
-2008-12-09 Stevan_White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-2008-12-08 Stevan_White
-	* FreeSansOblique.sfd:
-
-	Slanted small final sigma.  Remedies
-	bug #24993: U+03C2 "Greek small letter final sigma" not slanted in
-	Free Sans Oblique
-	https://savannah.gnu.org/bugs/index.php?24993
-
-2008-12-07 Stevan_White
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	kerning, etc
-
-2008-12-06 Stevan_White
-	* FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	kerning
-	Tweek in Sans having to do with addition of Latin Extended
-
-2008-12-05 Stevan_White
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd:
-
-	Tweeks to Latin Extended Additional
-
-	* FreeSansBoldOblique.sfd:
-
-	Added Latin Extended Additional range
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Extra space at end of kern class names has bad effect on FornForge
-	script that try to run through kern classes.  Some FontForge call
-	corrupts memory.
-	Got rid of extra space.
-
-2008-12-02 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Replaced U+0387 GREEK ANO TELEIA with top dot of colon.
-	See bug #24987: U+0387 GREEK ANO TELEIA too low
-	https://savannah.gnu.org/bugs/index.php?24987
-
-	* FreeSerif.sfd:
-
-	more kerning in Cyrillic (broke into two tables of classes)
-
-2008-12-01 Stevan_White
-	* FreeSerif.sfd:
-
-	tweeks to kernin
-
-	* FreeSerifBoldItalic.sfd:
-
-	kerning
-
-2008-11-30 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Kerning for Latin and Cyrillic fairly complete in Serif faces.
-	Complete in sense that it looks pretty good under Pango for
-		English French German Spanish Polish Czech Latvian
-	But have not done Vietnamese (will require many more entries).
-	I adjust roman and italic, then copy tables by hand to bold and
-	bolditalic.
-	Misgiving: bolditalic is much too crammed
-	Overall, I may have over-kerned.  (A difficult temptation to master.)
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	kerning
-	In Serif, modified widths of some extended latin glyphs
-
-2008-11-29 Stevan_White
-	* FreeSerif.sfd:
-
-	Broke Latin kerning subtable into four, hoping it will be easier to
-	understand and maintain.
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd,
-	FreeSerifItalic.sfd, FreeSerifBold.sfd, FreeSansOblique.sfd,
-	FreeSans.sfd:
-
-	kerninig
-
-2008-11-28 Stevan_White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	more kerning;
-	made guillemot narrower
-
-	* FreeSansOblique.sfd, FreeSerif.sfd:
-
-	previous commit was incomplete
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Adjusted width of single quotes (and apostrophe) to be "punctuation width"
-	More fiddling with kerning.
-
-2008-11-27 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	much fiddling with kerning
-
-2008-11-26 Stevan_White
-	* FreeSerifBold.sfd:
-
-	Basic kerning, named main Cyrillic letters
-
-	* FreeSerifItalic.sfd:
-
-	Basic Cyrillic kerning
-
-	* FreeSerif.sfd:
-
-	Tweeks to Cyrillic kerning
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd, Makefile:
-
-	Much fiddling with kerning, tables, and generating fonts whose kerning
-	tables work with OpenOffice.
-
-2008-11-24 Stevan_White
-	* FreeSerif.sfd:
-
-	regularized padding in Miscellaneous symbols.
-	At least within related ranges tried to make similar.
-	Made to validate
-
-2008-11-23 Stevan_White
-	* FreeSerif.sfd:
-
-	Filled out Miscellaneous Symbols.  Used George Douros' Unicode font.
-	Completed Miscellaneous Symbols, with some drawings from George Douros'
-	Unicode Symbols, and some of mine.
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Replaced Greek Exteded psili and dasia with scaled versions of the
-	"bent quote" mark.  I think it's distinctive enough, but not so silly.
-	
-	Remedies bug #22997: Mono: Greek Extended psili is ugly
-	https://savannah.gnu.org/bugs/?22997
-
-	* FreeSerif.sfd:
-
-	Made some recycling symbols
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Finished with Hebrew Pointed letters in all faces.
-
-2008-11-22 Stevan_White
-	* FreeSans.sfd:
-
-	Fiddled with Hebrew Pointed letters
-
-	* FreeSerifItalic.sfd:
-
-	Marks for Vietnamese
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Letter pe had strange thick middle ear that looked awful.  lamed had ben
-	bumped at some point.  Fixed.  Adjusted some of the points.
-
-2008-11-21 Stevan_White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	repairs to Pointed Hebrew
-
-	* FreeSerif.sfd:
-
-	Numeral line positioning marks for Gothic
-
-	* FreeSerifItalic.sfd:
-
-	Added Combining Marks for Symbols (some question about obliqueness of
-	some symbols)
-	Cleaned up some empty glyphs in Pointed Hebrew.
-
-2008-11-20 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Provided Hebrew pointed letters, with lookups, for all Serif faces.
-
-2008-11-19 Stevan_White
-	* FreeSerifBoldItalic.sfd:
-
-	renamed Hebrew lookups
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Completed Hebrew in Bold faces.
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	More tweeks to Hebrew points
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Adjustments corrections and additions to Hebrew points
-
-2008-11-18 Stevan_White
-	* FreeSansBold.sfd:
-
-	Cleaned out a lot of ridiculous kernings
-
-2008-11-17 Stevan_White
-	* FreeSansBoldOblique.sfd:
-
-	fiddled with Armenian ligatures
-
-	* FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added Armenian (with ligatures) to BoldOblique
-	Fiddled with character spacing
-
-2008-11-16 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added U+01f9 and paragraph end marker to Georgian
-	Fiddled with Armenian ligatures
-
-2008-11-15 Stevan_White
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Another pass at letter spacing in Cyrillic. 
-	Also went through ancient letters.
-	
-	Added Georgian paragraph separator 10FB
-	Added Georgian turned gan 10F9 (because it was easy)
-
-	Re-worked letter spacing through modern Cyrillic range.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSerif.sfd:
-
-	Letter spacing
-
-2008-11-14 Stevan_White
-	* FreeSerif.sfd:
-
-	Added several characters to Cyrillic Extended-B
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd:
-
-	Made Cyrillic hooked e U+04BC-F to look less goofy.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Based on assertion on Pechatnyj Dvor's web site, Cyrillic Fita
-	U+0472-3 and "Barred O" U+04E8-9 are different styles the same letter,
-	and the fact that the tilde in the O never looked good in Sans, I
-	made them all barred O's.
-
-	* FreeSerif.sfd:
-
-	Added Cyrillic Yn, yn (U+a65e-f)
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Synced up Cyrillic and Combining Diacritics ranges,
-	Couple of tweeks in Gujarati to make TT validate
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Changes to older Cyrillic letters, in response to further information.
-	Made omegas, omegas with titlo, and OT to all be of the same size and
-	shape in Serif.
-	Un-linked Cyrillic Psi and psi from Greek, made squarer versions.
-	
-	Some more Cyrillic diacritical marks in Sans.  Re-worked U+04bc-f .
-	Experimenting with mark positioning for Cyrillic
-
-2008-11-12 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Strove to make Euro look more like the EC logo design, while making
-	glyph fit better with the design of its face.  Bug #3576: Euro design
-		https://savannah.gnu.org/bugs/?23576
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Adjustments mostly to GPOS tables having to do with Vietnamese marks.
-	The WAZU Vietnamese test page looks pretty good in Sans now.
-	Still not thrilled with below-dot when it appears with a mark over
-	e.g. U+0102. Pango positions one or the other but not both.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Extensive modification of GPOS lookup tables for mark positioning.
-	I think they're now all functional (except styled Mono faces have none).
-	Also added lots of marks to faces that didn't have them, and also
-	fiddled with Combining Diacritical Marks.
-
-2008-11-10 Stevan_White
-	* FreeSerif.sfd:
-
-	Made one combining mark really combining
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made a few combining characters to be zero-width in Mono,
-	Added them to other styles.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Figured out why below marks in Thai weren't working in the lowest
-	letters.  I think Pango and other font renderers ignore 'blwm'. 
-	However, 'mark' works.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Tweeks to Thai marks
-
-2008-11-09 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Several bugfixes in Thai, mostly having to do with mark placement and
-	ligatures.  Implemented ru-saraaa and lu-saraaa with ligatures.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	added and named dottedcircle (used by Pango to render
-	combining mark base)
-
-	* FreeSerif.sfd:
-
-	Tweeks to Coptic, after viewing more papyrus samples and web pages.
-
-	* FreeSerif.sfd:
-
-	Weight of Coptic small letters made to match that of Latin and Greek ones.
-
-2008-11-08 Stevan_White
-	* FreeSerif.sfd:
-
-	Made Coptic to comply better with
-		http://www.wazu.jp/gallery/Test_Coptic.html
-	Made a flourish at foot of letters with long diagonal.
-
-	More tweeks to Coptic; put in a mark lookup table.
-	
-	Note: for small letters I made scaled references to captials.
-	Results in those letters looking quite light next to the capitals and
-	next to small Latin letters.  Also, there are a few variant forms for
-	capitals (Unicode samples don't show this).  It would be good to
-	re-work
-
-	Added Coptic alphabet in u+2C80-2CB1 and u+03E2-u+03EF, drawn/built by
-	me, based on Unicode samples, TeX font copte, and scans at WikiPedia.
-
-2008-11-07 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Further tweeks to dieresis in Greek and Cyrillic
-
-	* FreeSerif.sfd:
-
-	replaced Greek I dieresis with references, tweeked height of dieresis.
-
-2008-11-04 Stevan_White
-	* FreeSerif.sfd:
-
-	Added a few Cyrillic Extended-B letters seen in web pages while looking
-	for Glagolitic text.
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Added a few old Cyrillic characters.
-
-	* FreeSerif.sfd:
-
-	Several corrections and tweeks to Glagolitic.
-	Still missing six slots from Unicode, but don't see them in the TeX
-	fonts.
-	On the other hand, several on-line Glagolitic pages (bibles etc) don't
-	seem to use these.  Maybe it's OK as-is.
-
-2008-11-03 Stevan_White
-	* FreeSerif.sfd:
-
-	Added lowercase range to Glagolitic, as a facile scaling of the
-	uppercase.
-
-	Added letter to Glagolitic, scaled range.
-
-2008-11-02 Stevan_White
-	* FreeSerif.sfd:
-
-	Replaced fraktur bold from Mathematical Alphanumeric Symbols with that
-	from TX Fonts by Young Ryu.
-	One concern: letter k is damaged (in both medium and bold).  I just
-	hacked something up.
-	
-	Added Glagolitic "round type" font (Croation capitols only) from the
-	collection of Croatian fonts for LaTeX by Darko Zubrinić
-	ftp://ftp.dante.de/tex-archive/languages/croatian/
-	http://www.tug.org/TUGboat/Articles/tb17-1/tb50zubr.pdf
-	
-	Several letters are missing besides the small letters.
-
-	* FreeSerifBoldItalic.sfd:
-
-	A couple of Thai references got obliqued twice.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	By popular demand, removed 'ears' from Greek Upsilon and Psi.
-	Copied resulting glyphs to Serif Mathematical Alphanumeric Symbols.
-
-	* FreeSerif.sfd:
-
-	Some pointwise cleanup of main Tamil range
-
-	Tried some things with lookups.  Didn't make much headway.
-
-2008-11-01 Stevan_White
-	* FreeMono.sfd:
-
-	somehow made a letter with wrong width
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added similar lookups and ligatures to Thai ranges.
-
-	* FreeSerif.sfd:
-
-	Lookups now work no worse than those for other Thai fonts, at least
-	in Pango.  Still perplexed by behaviour of "Required" lookups.
-
-	For Thai, made ligatures and lookups for yoying and thothan combined
-	with a lower vowel.  These work well.
-	Attempted looksups for saraaa with ru and lu, and for saraam. 
-	Not working.
-
-	Cleaned up a few of the Bengali ligatures
-
-	* FreeSerifBold.sfd:
-
-	Tweek Thai
-
-2008-10-31 Stevan_White
-	* FreeSerif.sfd:
-
-	Fixed ligatures and mark positioning for Hanunóo.
-	Problem with ligatures: Gnome pango doesn't do 'rlig', only 'liga'
-
-	* FreeSerifItalic.sfd:
-
-	Changed lookup table scripts for Devanagari and Bengali.
-	Find Problems -> ATT found several problems showing lookups acting on
-	glyphs that weren't listed in the script ranges, including dev2, bng2
-	(why not deva and beng, I don't know).
-	
-	danda and doubledanda of Devanagari I understand are to be shared among
-	Indic scripts.  So included bng2 and dev2 in the 'aalt' table for those.
-	
-	The 'init' and 'half' tables for Bengali made active for bng2.
-	
-	The 'locl' table for Bengali didn't do anything I could see: It mapped
-	the Devanagari danda to itself, and the doubledanda to itself.  Deleted.
-
-	Cleaned up some kern tables.
-	adjustments of under 5 EM are invisible.  Some others I just didn't like.
-	Some were putting a letter beneath another, with is wrong.
-
-	* FreeSerifBoldItalic.sfd:
-
-	Added Thai
-
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Changes to mark positioning lookups, esp. in Italic.
-	Widened numerals in Bold
-
-2008-10-27 Stevan_White
-	* FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Tweeks regarding Armenian and lookups
-
-	* FreeSansBold.sfd:
-
-	Added Armenian ligatures FB13-FB17 with lookups
-	Also made a historical ligature ('hlig') table for u+0587.
-	
-	Toward bug #15183: missing characters from Armenian range
-	https://savannah.gnu.org/bugs/index.php?15183
-
-	* FreeSansOblique.sfd:
-
-	Added Armenian ligatures, lookups.  Cleaned up contours.
-
-	* FreeSans.sfd:
-
-	Added 5 Armenian ligatures to U+FB13 – FB17, and made corresponding
-	'liga' lookup.  Found there one ligature u+0587 that according to
-		http://en.wikipedia.org/wiki/Armenian_alphabet
-	
-	"in new orthography the և character is not a typographical ligature anymore, and must never be treated as such. It is a distinct letter and has its place in the new alphabetic sequence."
-	So moved this out of the 'liga' lookup and into a new 'hlig' lookup.
-
-2008-10-26 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Lots of improvements to Thai.
-	Completely revised letter spacing in Italic, and fiddled with combining
-	marks in all.
-	Still aren't working quite right, especially in Italic.
-	Still need to work over digits (in Bold they aren't even bold yet)
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Bold Thai : added (painstakingly) constructed glyphs, lookups
-	roman Thai: tweeks
-	Italic Thai: tweeks (Note this still has multiple problems)
-
-2008-10-25 Stevan_White
-	* FreeSerif.sfd:
-
-	WAZU says
-	http://www.wazu.jp/gallery/Fonts_Hanunoo.html
-	
-	MPH 2B Damase doesn't support the consonant-vowel ligatures necessary
-	to render Buhid writing.
-	
-	OK, so I made 'mark' lookups for combining marks and a bunch of
-	ligatures in an 'rlig' lookup.  The latter still not working:
-	don't know why.
-	
-	Made page to match the example of the combining forms at
-	http://www.omniglot.com/writing/hanunoo.htm
-
-2008-10-24 Stevan_White
-	* FreeSerif.sfd:
-
-	Removed some marks from Mathematical Alphanumeric Symbols
-
-	* FreeSerif.sfd:
-
-	Tweeked combining marks for Vietnamese.  Made to satisfy
-		WAZU JAPAN Comprehensive Unicode Test Page for Vietnamese
-		http://www.wazu.jp/gallery/Test_Vietnamese.html
-	Could still use some tweeking...
-
-	* FreeSerif.sfd:
-
-	Added marks for composition of Vietnamese
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Put "below" combining mark on lots of vowels and derivatives,
-	for Vietnamese.
-	Named a bunch of composit Latin, expecting to make substitutions.
-
-2008-10-23 Stevan_White
-	* FreeSerif.sfd:
-
-	Thai spacing alterations based on advice of a native speaker.
-
-2008-10-22 Stevan_White
-	* FreeSerif.sfd:
-
-	re-named Thai lookups according to order
-
-2008-10-21 Stevan_White
-	* FreeSans.sfd:
-
-	Cleanup of glyphs in Gujarati, Devanagari.
-	
-	Note:  Serious problem with Sans GPOS abvm in Devanagari
-	"'abvm' Above Base Mark in Devanagari subtable" "gujr-0"
-	But all the characters that list gujr-0 are in Gujarati.
-	Not sure how this got broken or how to fix it.
-
-	* FreeSerif.sfd:
-
-	Fiddled with Thai mark positioning: passes my tests now OK.
-	Made a few more references in Math Symbols; more regularization of
-	stroke.
-
-	* FreeSerif.sfd:
-
-	Added mark class for Vietnamese "horn"
-	Several references made in General Punctuation, Arrows
-
-	* FreeMono.sfd:
-
-	added some Combining Diacritical Marks
-
-2008-10-20 Stevan_White
-	* FreeSerif.sfd:
-
-	Made some references from serifed Latin capitals to Greek counterparts.
-
-	* FreeSerif.sfd:
-
-	Made a few repeated glyphs into references in Musical Symbols
-
-2008-10-19 Stevan_White
-	* FreeSerif.sfd:
-
-	Moved several glypns from Mathematical Alphanumeric Symbols to
-	Letterlike Symbols.
-	Couple tweeks in Mathematical Symbols.
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Fiddling with Mathematical Symbols.
-	In Serif, trying to make stroke width more consistent.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd:
-
-	Added some Greek symbols in Mono and Sans to make a little more regular
-	and correspond better with TeX.
-	Tweek of serif.
-
-	* FreeSansBold.sfd:
-
-	a few more improvements.
-	
-	One problem with the Mathematical Alphanumeric area is, one must
-	remember to change it any time another face is altered...
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerifBold.sfd:
-
-	Several improvements and additions to Sans faces (mostly in Greek) from
-	experience of pasting into FreeSerif Mathematical Alphanumeric Symbols.
-
-	* FreeSerif.sfd:
-
-	Replaced most of Mathematical Alphanumeric Symbols
-		roman italic bold (latin and greek)
-		gothic italic bold (latin and greek)
-		typewriter
-		and numerals
-	with glyphs from FreeFont.  These were scaled to uniform height.
-	
-	Remains: Blackboard Bold, Fraktur, Calligraphic, Script
-
-	* FreeSerif.sfd:
-
-	Tidied lookup table names for Malayalam
-
-	* FreeSerif.sfd:
-
-	Applied Malayalam patch from Hiran Venugopalan
-
-	* FreeMono.sfd:
-
-	Added/corrected many Mathematical Symbols
-
-	* FreeSansOblique.sfd:
-
-	more IPA
-
-2008-10-18 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made lots more IPA and Phonetic Extensions
-	Note: fontforge is reporting an error in a few glyphs made by scaling
-	another, that the glyphs are drawn in the wrong direction--only in
-	TrueType though.  Suspect a FontForge bug.
-
-	Added several Combining Diacritical Marks
-
-2008-10-17 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made several Spacing Modifier Letters, Combining Diacritical Marks,
-	and IPA and Phonetic Extensions
-
-2008-10-16 Stevan_White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added some Superscripts and Subscripts
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Finished off Superscripts and subscripts
-
-	Completed General Punctuation for Mono faces
-
-	Added some General Punctuation
-
-2008-10-15 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	more Letterlike Symbols, Currency Symbols
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made some Combining Diacritical Marks for Symbols, Letterlike Symbols
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Added some General Punctuation
-
-2008-10-14 Stevan_White
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added double slanted hyphen, made General Punctuaton Supplement like
-	Serif's
-
-	* FreeSansBoldOblique.sfd:
-
-	Filled out Greek Extended
-
-	* FreeMono.sfd, FreeSerifItalic.sfd:
-
-	fixes to last 2 commits
-
-	* FreeSerifItalic.sfd:
-
-	Last character to General Punctuation
-
-	* FreeMono.sfd:
-
-	Built some Enclosed Alphanumerics (1-10)
-
-	* FreeSerif.sfd:
-
-	Copied in Daniel Johnson's changes to Cherokee.
-
-2008-10-12 Stevan_White
-	* FreeSerif.sfd:
-
-	Included Daniel Johnson's Cherokee glyphs.
-
-2008-10-05 Stevan_White
-	* FreeMono.sfd:
-
-	Further corrections to diaresis in Cyrillic -- legibility in small sizes
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd, FreeSerif.sfd:
-
-	Regularized placement of diaresis in Cyrillic
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added same set of glyphs to Cyrillic Supplement
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added some of the easier letters from Cyrillic Supplement
-
-2008-10-04 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSerifItalic.sfd:
-
-	Finished high Cyrillic range for MonoBold and MonoBoldOblique.
-	(Remaining: historic ranges, Cyrillic extensions)
-	Tweeked others.
-
-	* FreeMonoBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Serif*Italic: Added last Abkhazian letters to Cyrillic
-	MonoBold: tweek
-
-2008-10-03 Stevan_White
-	* FreeMono.sfd, FreeMonoOblique.sfd, FreeSerif.sfd, FreeSerifBoldItalic.sfd:
-
-	Mono: Some additions to historic letters
-
-	* FreeSerif.sfd:
-
-	Added some punctuation and combining numeric marks from
-	Cyrillic Extended B
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Various technical tweeks, mostly concerning recent additions.
-	Also did a bit more "Points too close" and "irrelevant control points".
-	Cyrillic millions redesign meant could not maintain use of refrences
-	for it.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More high Cyrillic
-	Included old Cyrillic millions combining mark in Sans, changed design
-	in Serif
-
-2008-10-02 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	More high Cyrillic
-
-	* FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBoldItalic.sfd:
-
-	More high Cyrillic glyphs
-
-	* FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More glyphs in high Cyrillic.  Remains only some whose form I'm unsure
-	of in italic.
-
-	* FreeSerifBoldItalic.sfd:
-
-	More glyphs in higher Cyrillic range
-
-	* FreeSerifItalic.sfd:
-
-	Same process of tightening el, em, ge (but a P.S. to previous commit:
-	also did ya, ze for SerifBold.)
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	BoldItalic:  Tightened up spacing on left of el, em, ge (could go
-	farther, but it is partly a problem with glyph design...
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More additions to Cyrillic.  Finished SerifBold except for Nivkh
-	additions.
-	Used references on number combining forms.
-
-2008-09-30 Stevan_White
-	* FreeSerif.sfd:
-
-	Added four (obsolete) Chuvash letters to Cyrillic Supplement
-	- completing it.
-
-2008-09-29 Stevan_White
-	* FreeSerif.sfd:
-
-	Greek adjustments
-	Adjusted spacing of kappa slightly
-	Got rid of ears on Psi, following similar request for Upsilon.
-
-2008-09-28 Stevan_White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Adding and fiddling with Spacing Modifiers and Combining Diacriticals
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Revisions of several Combining Diacritical marks
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	A few Combining Diacriticals and Spacing Modifiers
-
-	MonoBoldOblique: Primarily filling out Spacing Modifier Letters
-	others: little fixes found along the way
-
-2008-09-27 Stevan_White
-	* FreeSerif.sfd:
-
-	Replaced Malayalam range with that from Rachana_04 found on
-	Swathanthra Malayalam Computing project page
-		http://savannah.nongnu.org/projects/smc/
-	Besides scaling and converting to cubic, performed much clean-up of
-	glyphs, added an r2 character, and re-named a bunch of characters.
-
-2008-09-22 Stevan_White
-	* FreeSerif.sfd:
-
-	Filled in as much of Phonetic Extensions as I could without artistic
-	abilities.
-	Note 1D48-9 are not references due to apparent FontForge bug, that says
-	scaled references go in wrong direction.
-
-	* FreeSerif.sfd:
-
-	Cleaup of some Bengali glyphs.
-	Note many of the ligatures remain very very messy.
-
-	* Makefile:
-
-	added more validations
-	made to work with GenerateOpenType
-
-	* FreeSerif.sfd:
-
-	Built two more easy Phonetic Extensions
-
-	* FreeSerif.sfd:
-
-	Built some Phonetic Extensions letters, those with middle tilde
-
-2008-09-21 Stevan_White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Added lots of Spacing Modifier Letters and Combining Diacritical Marks.
-
-	* FreeMono.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	Wrote script to check if glyph encodings were in stated ranges, fixed
-	most discrepancies.
-	
-	There were a bunch of incompletely deleted characters in several faces.
-	
-	Sans: found several other problems in the process
-	# Tamil
-	Four slots labelled 0BDA-D have glyphs, not in Unicode.  also 0BE1
-	I think they are misplaced; added 0010 to each of them
-	
-	# Devanagari
-	Slot labelled U+093B is not in Unicode--can't find glyph: deleted
-	likewise 094F (may have been meant to be 0954)
-	0955, 0973-0976
-	
-	0954 should be a combining mark, but it appears on the wrong side of 0.
-	0971 was just wrong--made into simple dot.
-	0972 is also wrong--made my own Candra A.
-	
-	# Gujarati
-	Slots labelled 0AE4-5 are not in Unicode; seem not to belong at all.
-	Deleted.  2800 is a dup of 2790.  Deleted
-	
-	Serif: phillipine_double u1736 was misplaced
-	
-	A bunch of the Math Alphanumeric symbols are empty in the standard,
-	because they're represented elsewhere.  These should be deleted
-	First need to make style consistent with existing symbols.
-
-	* FreeSerif.sfd:
-
-	Applied patch from Daniel J
-	Remedies bug
-		FreeSerif: Missing glyphs with palatal hook
-		https://savannah.gnu.org/bugs/index.php?24298
-	Adding several letters to Phoenetic Extensions range U+1D80-BF
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made four characters U+200C-F to be zero-width
-	Remedy to bug #23593: Mono 0-width chars: zero-width or space?
-		https://savannah.gnu.org/bugs/index.php?23593
-
-	* FreeSerif.sfd:
-
-	Made Mahjong tiles to take up less space using references
-	Cleaned up several validation problems
-
-2008-09-19 Stevan_White
-	* FreeSerif.sfd:
-
-	Added several Hebrew Alphabetic Presentation Forms (some easy ones), to
-	make its coverage the same as Serif Bold.
-
-	* FreeSerifBold.sfd:
-
-	Re-encoded.
-	Deleted several glyphs in Hebrew Alphabetic Presentation Forms that
-	didn't correspond valid Unicode
-
-	* FreeMonoBold.sfd, FreeSans.sfd, FreeSerifItalic.sfd:
-
-	Ran script to find mis-numbered glyphs.  Several were simply typos,
-	some offset by one.
-
-	* FreeSansOblique.sfd:
-
-	Numerous cases of glyphs in Private Use area incorrectly assigned
-	Unicode numbers and names.  Gave all -1 for Unicode and named like
-	"slot.XXXX".
-
-	* FreeSerif.sfd:
-
-	Adapted Mahjong Tiles from George Douros' Unicode Symbols font.
-
-	* FreeSerif.sfd:
-
-	Added Domino Tiles.  Domino outline is copied from George Douros'
-	Unicode Symbols, but the rest I preferred to do with references.
-
-2008-09-18 Stevan_White
-	* FreeSerif.sfd:
-
-	Adapted Mathematical Alphanumeric Symbols from George Douros' Unicode
-	Symbols font.
-
-	* FreeMonoBoldOblique.sfd:
-
-	This one got away from me--I don't know what I did.
-	Looks like some small contour edits.
-
-	* FreeSansBoldOblique.sfd:
-
-	Fixed one mis-numberd character in Latin Extended-B
-
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Fixed several mis-numbered characters.
-
-	* FreeSansBold.sfd:
-
-	SansBold: one Georgian letter with no name, one Zapf Dingbat was
-	unnumbered
-	ATT test shows a bunch of problems with Gurmukhi and 'blwf' table
-	indeed shows those letters at 0x10000+
-	Sans names them like uni0A30_uni0A4D.blwf: they are in range
-	ECC6 to ED06
-	
-	I meant to move this range into Private Use in last release, and
-	missed it.  So now it is moved, into same range as Sans.
-	
-	Both Sans and SansBold in nukt table for Gurmukhi have duplicate
-	entries for uni0A15 uni0A3C.  Deleted dups.
-
-	* FreeMonoOblique.sfd:
-
-	fixed a number of Unassigned Code Points in Greek Extended
-
-	* FreeSansOblique.sfd:
-
-	mis-numbered Combining Diacritics
-
-	* FreeSansOblique.sfd:
-
-	Several chars in Latin Extended hadn't been named.
-	One spurious letter in Letterlike Symbols
-
-2008-09-16 Stevan_White
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	Lots of additions: unless otherwise noted, they are from George Duros'
-	fonts Analecta, Music, and Unicode (haven't got final confirmation of
-	the eligibility of these glyphs, so this is just for testing.)
-	
-	Added some combining marks, fiddled a bit.  In both Serif & Mono, tried
-	to get a key symbol characters to fit inside the key combining mark
-	
-	Serif
-	Got rid of ears on Upsilon
-	Added:
-	        # Gothic
-		# Western & Byzantine Musical Symbols
-	
-		# Misc Symbols, Misc Technical Symbols (drew many myself)
-		# Supplemental Symbols and Arrows
-	
-	Mono
-	Added:
-		# lotsa Misc Technical Symbols
-		# OCR Symbols
-		# drew many Supplemental Symbols and Arrows, Misc Technical
-	
-	Sans
-	Added	# Phoenecian
-	Made a few Letterlike Symbols; Made Re and Im to be sans-serif.
-
-2008-09-11 Stevan_White
-	* FreeSerif.sfd:
-
-	Removed pointless entries from Latin kern table
-	
-	Tidied points in Sinhala
-
-2008-09-07 Stevan_White
-	* FreeSerif.sfd:
-
-	Tidied up Tamil ligatures EEA8-EEAB to fix TT build warning
-		"MonotonicFindAlong: Never found our spline."
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, Makefile:
-
-	
-	Added APL characters to FreeMono (why?...)
-	
-	Fixed several last-minute problems, including
-	
-	Serif: Tweeked GPOS mark table for Cyrillic
-	Sans: Added a GPOS table for Cyrillic (but several diacritics missing)
-	
-	Serif, Mono: tweeked some bugs in extensible brackets & integrals
-	
-	Serif: Vietnamese o circumflex: accent was a bit high. fixed.
-	
-	MonoBoldOblique OTF build
-		uni213b intersects self
-	
-	Generation of TT fonts complains about several things to stderr,
-	including:
-	
-	SerifBold: "There exists a 'fpgm' code that seems incompatible with FontForge's. Instructions generated will be of lower quality. If legacy hinting is to be scrapped, it is suggested to clear the `fpgm` and repeat autoinstructing. It will be then possible to append user's code to FontForge's 'fpgm', but due to possible future updates, it is extremely advised to use high numbers for user's functions."
-	Probably has been there since I first copied the TT instructions in. 
-	Just repeated the copying process carefully, and the warning went away.
-	
-	Serif:  "FindMatchingHVEdge fell into an impossible position"
-	        fixed a bunch of point too close
-	
-	REMAINING PROBLEM in Serif TT build
-		"MonotonicFindAlong: Never found our spline."
-		        fixed several bad TT matrices-- there are several more
-			fixed many "control points too close" no luck
-
-2008-09-03 Stevan_White
-	* FreeSans.sfd, FreeSansOblique.sfd:
-
-	Added/corrected some Misc. Symbols by copying from Serif.
-	Note this is only a stopgap solution.  Want real sans-serif symbols.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added minimal Miscellaneous Symbols: card suites and some musical notes.
-	Note not happy with shapes...some I just drew.  Sans isn't really sans.
-	
-	Fixed one APL symbol in Mono so it verified in OTF version
-
-2008-08-31 Stevan_White
-	* FreeMono.sfd:
-
-	Built set of APL symbols.
-
-2008-08-30 Stevan_White
-	* FreeSans.sfd:
-
-	Un-linked references in uni02B2 and uni02B5, because when validating the
-	TrueType version, FontForge gave an error "is drawn in wrong direction".
-	I suspect a bug in FontForge.  Other similar glyphs make no errors.
-
-	Fixed missing extrema in TrueType.
-	These were the last cases being reported by validate in all the faces.
-
-	* FreeSerifItalic.sfd:
-
-	fixed last missing extrema in TrueType
-
-	* Makefile:
-
-	restructured validation to look in a directory
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd:
-
-	Fixed missing extrema in TrueType versions
-
-2008-08-15 Stevan_White
-	* FreeSans.sfd:
-
-	Same problem with uni0A83 as with bn_llikaar.  Just made zero-width.
-
-2008-08-14 Stevan_White
-	* FreeSans.sfd, FreeSansOblique.sfd:
-
-	Glyph bn_llikaar, U+09E3 BENGALI VOWEL SIGN VOCALIC LL,
-	has right bound positioned far into the negative.  Causes a warning in
-	FontForge when opening OTF version.
-	Comparing with other fonts supporting Bengali, found no others that
-	do this.
-	Serif makes glyph width 0 (which sounds right according to Unicode)
-	and puts glyph wholly to left of 0.  But, I haven't found this letter
-	in text anywhere.  I wonder if it is really used in writing.
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Further TrueType validation fixes. 
-	Sans still has two glyps in wrong direction.
-
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Fixed more TrueType problems...all missing extrema in TTF validation
-
-2008-08-13 Stevan_White
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	fixed all the TrueType validation problems of type "intersects itself"
-	and all but two of the "wrong directions", as well as a lot of
-	"missing extrema".  But there remain hundreds of missing extrema in the
-	TrueType version.
-	Also, bn_llikaar in Sans and Oblique still has a problem in OTF version.
-
-	* FreeMono.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd:
-
-	Made .ttf files to validate.  Other faces have many more problems still.
-
-2008-08-12 Stevan_White
-	* FreeMonoOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Continuing to make OTF versions validate.
-	
-	* FreeMonoOblique.sfd:
-		lots of missing points at extrema
-	* FreeSerif.sfd:
-		12 wrong directions, 1 missing extrema
-	* FreeSerifItalic.sfd:
-		many missing points at extrema, 1 self-intersecting
-	
-	What was wrong: in several oblique cases, an already-italic glyph was
-	made more italic, thereby fouling up extrema (although why it passed
-	validation in the SFD I don't know).  Some glyphs were
-	overly-complicated with many near points.  Cleaned up, rounded to int.
-	
-	Remaining problem: OTF FreeSansOblique FreeSans. one Bengali glyph in
-	each whose advance width and htmx don't match.
-	
-	Moral of story: validate the OTF and TTF versions too before a release.
-
-	* FreeSansOblique.sfd:
-
-	Reverse a mistake from last commit: somehow this file was converted to
-	quadratic, or something.
-
-2008-08-11 Stevan_White
-	* FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Found that SFD files that validated produced OpenType files that don't.
-	These represent the easy fixes.  Some were result of conversion to
-	quadratic; some shouldn't have validated in the SFD...
-	
-	* MonoBoldOblique: uni0250 missing pts at extrema [reference glyph rotated...]
-	* Sans:            uni0AC4 wrong direction [simplified, rounded to int]
-	* SansOblique:     uni01EA wrong direction [rounded to int]
-	* SerifBold:       uni023f wrong direction [round to int]
-	* SerifBoldItalic: uni0245 missing pts at extrema [ungrouped ref, added extrema]
-
-2008-08-06 Stevan_White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd:
-
-	Re-set font metrics, which were somehow making uneven vertical spacing.
-
-2008-06-22 Steve White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Made to validate
-
-	* ranges.py:
-
-	Brought more into line with OpenType
-	Added some ranges
-	Fixed bug with ranges outside of font
-
-	* CREDITS:
-
-	3 new ranges
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Cyrillic: tweeked accents for consistency, and for readability in small
-	sizes.
-
-	* FreeSerif.sfd:
-
-	Thanna range: tweeking
-
-	Thaana range: Scaled up by about 15%, raised by 100EM, tightened
-	some of the diacritics to get inside 900 to -300 EM limits.
-
-	* FreeSans.sfd:
-
-	Added Old Persian and Ugaritic from MPH2BDamase font.
-
-2008-06-21 Steve White
-	* FreeSerif.sfd:
-
-	Added Tai Le range adapted from MPH2BDamase font.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Added some ancient Greek numerals from Tempora to high Unicode area,
-	(partly just to show it can now be done.)
-
-	* FreeSerifItalic.sfd:
-
-	Couple of tweeks putting glyphs above -300EM.
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Surgery to Thai letter 'tho than', u+0e10, to push it above -300 EM.
-	This makes Thai range completely between 900 and -300 EM.
-
-	* FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Many auxilary characters (esp. for Malayalam, Bengla, and Tamil)
-	representing ligatures and alternative forms without their own Unicode,
-	were moved from
-	ranges above 0xFFFF (which ought to have been slots for other defined
-	Unicode ranges) into the Private Use area.
-	
-	In Serif, I segregated the scripts, in Sans it was hard to see where one
-	began and another ended, so I moved them en masse.
-	
-	Note several problems with wrongly-named characters:
-	I already re-named glyph570 and glyph582.
-	But there are others with names starting with A...
-
-	* FreeSansBold.sfd, FreeSansOblique.sfd:
-
-	Fixed (I hope the last) problem with scripts in lookups
-	Find Problems -> ATT (all selected) finds multiple issues,
-	
-	* FreeSansBold.sfd:
-	In addition to script 'guru', added 'gur2' to the scripts for these
-	lookups
-		'nukt' Nukta forms in Gurmukhi
-		'blwf' Below Base Forms in Gurmukhi
-		'pstf' Post Base Forms in Gurmukhi
-		'blws' Below Base Substitutions in Gurmukhi
-		'abvs' Above Base Substitutions in Gurmukhi
-		'psts' Post Base Substitutions in Gurmukhi
-	
-	* FreeSansOblique.sfd:
-	In addition to script 'beng', added 'bng2' to the scripts for the lookup
-		'half' Half Forms in Bengali
-	
-	Moreover, the lookup
-		'aalt' Access All Alternates in Latin
-	contains only Bengali letters.
-	Re-named as Bengali, made to work on beng, bng2 scripts
-
-2008-06-20 Steve White
-	* FreeSerif.sfd:
-
-	Scaled Sinhala range.
-	Remedies bug #23656: Sinhala letters over-sized
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Mostly messing with Greek Extended accents again.
-	re-positioned ypogegrammani on advice of Alexey Kryukov
-	Put prosgegrammani beneath main letters in Mono, to make narrower glyphs
-	Implemented more distinction between tonos and acute.
-
-2008-06-19 Steve White
-	* FreeMonoBoldOblique.sfd:
-
-	Completed fit of Mono to 800 to -200 EM.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd:
-
-	Set Metrics to recommended values
-
-	* FreeMonoOblique.sfd:
-
-	Now Mono Oblique, as well as roman and Bold, are within 800 to -200 EM.
-	Just BoldOblique to go.
-
-	* FreeMono.sfd, FreeMonoBold.sfd:
-
-	More toward fitting to 800 to -200 EM.
-	Basically, reduced Georgian by 92%.
-	Also made an over-all offset, so Georgian is somehow centered (Bold...I
-	guess I already did this in roman).
-	Want to also do an emboldening to make stroke like rest of font, but
-	current FontForge has a nasty crash that loses data on this function.
-
-	* FreeMono.sfd:
-
-	In effort to make fit in 800 to -200 EM,
-	Scaled Georgian by 92%, centered on 600 wide box.
-	Next: Embolden a bit.
-
-2008-06-18 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Toward making all glyphs lie between -200 and 800 EM.
-	Numerous small changes, especially raising descenders of some Hebrew
-	letters.
-	Georgian remains a problem
-
-2008-06-13 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Moved prosgegrammeni up to baseline,
-	(and then moved all references down to baseline)
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added Control Picture "blank" to all faces.
-	Switched U+0222-3 from TemporaLGCUni
-
-2008-06-11 Steve White
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More fiddling with Greek Extended accents
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Tweeks to accents etc in Greek Extended and Cyrillic
-
-2008-06-10 Steve White
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Fixed a few big horizontal spacing problems
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Implemented TemporaLCGUni glyphs in Cyrillic ranges.
-	Added a breve_cyrillic for the moustache breve mark.
-
-2008-06-08 Steve White
-	* FreeSerif.sfd:
-
-	Replaced most of Cyrillic range with TemporaLGCUni.
-	Remodelled many of the derived Cyrillic characters after these.
-	Fiddled globally with spacing of small letters.
-	Unclear on diacritics 485-6, unhappy with breve.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Started implementing TemporaLCGUni in Greek ranges.
-	
-	Replaced 3DC-3E1 from Tempora, because I thought they looked nicer and
-	more like the other existing FreeFont glyphs.
-	Replaced 3DA-B from Tempora, because they look more like Unicode
-	samples, and nicer.
-	Added 03f3-4, 03F7-F.
-	Prefer my own lunate epsilon.
-	Replaced Phi and Omega from Tempora.
-	These plainly fit the other FreeFont glyphs better than the origninals.
-	(How did this happen?)
-	
-	In bold, replaced U+03D7
-	
-	Copied lbbar u+2114
-
-	Small italic greek--replaced most except phi, psi, omega
-	
-	Based on new information, broke the identification of oxia with Latin
-	acute.
-
-2008-06-07 Steve White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Efforts to control heights of characters
-
-2008-06-06 Steve White
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made to validate
-
-2008-06-05 Steve White
-	* FreeSans.sfd:
-
-	Fixed undefined character in kerning classes
-
-2008-06-04 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	tweeks and additions to General Punctuation
-
-2008-06-03 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansOblique.sfd:
-
-	Completed/tweeked Number Forms
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Added some Miscellaneous Technical symbols
-
-2008-06-02 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Tweeks...mostly Letterlike
-
-2008-06-01 Steve White
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Added Box Drawing characters to Serif.
-	Tweeked a glyph in Mono
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Added several glyphs to Letterlike Characters
-
-2008-05-31 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Validation pass
-	
-	SansOblique and SansBoldOblique had validation problem with BlueValues
-		Private Dictionary
-		Elements in BlueValues/OtherBlues array are disordered
-		Elements in BlueValues/OtherBlues array are too close
-		(Change BlueFuzz)
-		StemSnapV does not contain StdVW value.
-	So I ordered the array, and based on other slanted fonts,
-	removed StemSnapV.
-	
-	Note however, I still think the two top Blues lines are too close
-	But I don't even know what the second-to-top line is meant to do.
-
-	* FreeSerif.sfd:
-
-	Added to Block Elements, Geometric Shapes
-	Made to validate
-
-2008-05-29 Steve White
-	* FreeMono.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Looking at special symbols.
-	Drew several Miscellaneous Symbols in Mono and Serif
-	> Completed/corrected planetary symbols, added Dice,
-	some other easy ones
-	> Completed Dingbats in Serif (using URW Dingbats)
-	Added some Block Elements to Serif
-
-2008-05-26 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More changes stemming from J. Poon's report.
-
-2008-05-25 Steve White
-	* FreeSerif.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Height surgery on SerifBoldItalic.
-	More fiddling with accents in others.
-
-	* FreeSerifItalic.sfd:
-
-	More height surgery.  Only a few left in Benglai and Thai
-
-	* FreeSerifBold.sfd:
-
-	Re-applied surgery to make glyphs between 900 and -300EM
-
-	*** Regression
-	Inadvertently un-linked all references in SerifBold in r1.83.
-	This reverses that error (but also un-does the surgery mentioned there)
-
-	* FreeSerifBold.sfd, FreeSerifItalic.sfd:
-
-	Applied surgery to make Latin letters go under 900EM. 
-	One exception yet...
-
-2008-05-24 Steve White
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Serif: much fiddling with accents in Latin ranges.
-	Re-thought some glyphs (there are still a few messy ones, especially
-	in bold)
-	Checked horizontal spacing...fixed a number of problems.
-
-2008-05-23 Steve White
-	* FreeSansBold.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Made Latin Extended-B coverage consistent across Serif; cleaned up some
-	glyphs
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Filled more of General Punctuation in Sans and Serif
-	Made all agree on coverage of Latin Extended Additional
-
-2008-05-22 Steve White
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansOblique.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Added Latin Extended Additional to SansOblique.
-	Made Latin Extended Additional coverage consistent across Sans, B, I
-	Made Latin Extended-B coverage same in SerifBold.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeSansBold.sfd:
-
-	Mono* made Latin-B coverage consistent across faces
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Made set of Latin Extended-B consistent across Sans faces
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	More filling in General Punctuation
-
-	* FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Another bunch of J. Poon's reports
-	also, filling in some Combining Diacriticals, Spacing Modifiers, and
-	General Punctuation in bold faces
-
-2008-05-21 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Mucking about with mark tables in Thai (Serif)
-	Other faces: Making changes from J. Poon's report
-
-2008-05-20 Steve White
-	* CREDITS:
-
-	Mark Williamson
-	Jacob Poon
-
-	* Makefile:
-
-	added tests target
-
-2008-05-18 Steve White
-	* ranges.py:
-
-	Put table explanation back in
-
-	Improved behaviour for high Unicode
-
-	* FreeSans.sfd:
-
-	Revision of kerning
-
-	* FreeSerif.sfd:
-
-	Made Latin kerning a little more reasonable:
-		reduced many excessive kerns (some had letters apparently
-			overlapping, which shouldn't happen)
-		made kerns increment by 5EM for ease of reading
-		got rid of kerns too small to be seen
-
-	* FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSerifBold.sfd:
-
-	Made to verify
-
-2008-05-13 Steve White
-	* FreeSerif.sfd:
-
-	Made to validate
-
-	* FreeSerif.sfd:
-
-	Gurmukhi: filled range in Serif, taking glyphs from the original
-	Punjabi font by Hardip Singh Pannu
-	http://members.aol.com/hspannu/punjabi.html   (file pb_win95.exe)
-
-2008-05-12 Steve White
-	* FreeSans.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Hebrew, basic.  Some faces missing punctuation marks, added.
-
-	* FreeMono.sfd, FreeSans.sfd:
-
-	Armenian: Sans tried to make verticals and horizontals of more uniform
-	width both, finddled with punctuation
-
-	* FreeMonoOblique.sfd:
-
-	made to validate
-
-	* FreeMonoBold.sfd:
-
-	made to validate
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	Armenian in Sans: regularized letter spacing
-
-	* FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd:
-
-	Armenian: fill out ranges and clean up
-	SansBold especially had a lot of incorrect references.
-	Now all the ranges with Armenian at least share the same set of
-	characters.
-
-	* FreeMono.sfd:
-
-	Fixed glyph with wrong width.
-
-2008-05-11 Steve White
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerifItalic.sfd:
-
-	1) made to validate
-	2) Mono: copied in Spacing Modifier Letters (glyphs not yet named)
-	3) SerifItalic: Filled in General Punctuation
-
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made to validate, and pass all other FontForge tests.
-	Expedient: rounded everything to int
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Made to have the same Greek Symbols,
-	Made to validate
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	Made Greek Symbols as full as rest of Sans.  Changed a name in Sans.
-
-	* FreeMonoOblique.sfd:
-
-	Made Greek as full as other faces
-	Made to validate
-
-	* FreeSansBold.sfd:
-
-	Deleted seven orphaned Arabic characters; looks like somebody started,
-	didn't get very far, putting Arabic in bold.
-
-	Deleted orphaned Arabic glyph from Arabic Presentation forms-B
-
-	* FreeSerifBold.sfd:
-
-	Deleted the single Arabic character: it was clearly there by mistake.
-
-	* FreeSansOblique.sfd:
-
-	Made Greek Symbols as full as rest of Sans
-
-	Tweeks to Armenian
-
-	Comment from previous commit of FreeSans was meant for FreeSansOblique.
-	In FreeSans, only tweeked a few letters during putting more characters
-	in this face.
-	
-	Filled in Spacing Modifier Letters, increased General Punctuation.
-
-	* FreeSans.sfd:
-
-	Filled in Spacing Modifier Letters, increased General Punctuation
-
-	* FreeMono.sfd:
-
-	Made Armenian as full as other roman faces.
-
-	Completed Spacing Modifier Letters
-	Added a couple of Greek Punctuation
-
-	added more Spacing Modifier Letters
-
-2008-05-10 Steve White
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Did same process of scaling and sizing for Thai in Sans as in Serif.
-	Added mark tables to Sans.  Improvement, but there are questions...
-
-	* FreeSans.sfd:
-
-	Tidied some Gurmukhi glyphs, validated.
-
-	Deleted ranges for Oriya, Kannada, on account of
-	1) they only contained a subset of the consonant glyphs of the scripts,
-	   few if any vowels, and had no ligature lookups as required
-	2) Kannada was based on the Akurti fonts, which have copyright issues.
-	
-	See
-	bug #23225: Oriya range only partial
-	bug #23224: Kannada range only partial
-
-	* FreeMonoBoldOblique.sfd:
-
-	Made metrics like rest of Mono
-
-2008-05-09 Steve White
-	* ranges.py:
-
-	More info on range intervals
-
-	* FreeSerif.sfd:
-
-	Deleted Telugu range.
-	It didn't represent a complete writing system for the language.
-	
-	See notes at https://savannah.gnu.org/bugs/index.php?23202
-	Serif: Telugu range missing many characters; many wrong
-
-	Got a copy of the original Tikkana font,
-	Copied in remaining consonants and vowels that I could find there.
-	I think one vowel 0C55 is missing according to unicode).
-	Strangely, the Telugu digits are alo missing.
-	In Tikkana, the default "checkmark" structural mark is missing from many
-	consonants, according to Unicode, but is a separate glyph.  I put
-	the checkmark on.
-	This, and scaled up by 150% and cleaned up intersecting glyphs and
-	many unnecessary points.
-
-2008-05-08 Steve White
-	* FreeSerif.sfd:
-
-	Filled out Telugu consonants.
-	Vowels still need to be done
-
-2008-05-07 Steve White
-	* FreeSerif.sfd:
-
-	Operated on Latin glyphs with stacked accents to make them fit under
-	900EM.
-	Scaled Telugu bu 150%.
-
-2008-05-06 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSansBold.sfd, FreeSerif.sfd:
-
-	Corrected further fontforge "find problems"
-	Added some math characters to FreeSerif
-
-2008-05-05 Steve White
-	* FreeSansBold.sfd:
-
-	Made to validate, and fixed bad TT transformations
-
-2008-05-04 Steve White
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Mainly TeX additions trying to satisfy Markus Kuhn's TeX-as-Unicode page
-
-	* FreeMono.sfd:
-
-	Adjusted heights of extensible brackets
-
-	Fixed problems with extensible brackets, thanks to Markus Kuhn's page
-	http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-demo.txt
-
-	* ranges.py:
-
-	fiddled with ranges, doc
-
-	made some ranges more correct?
-
-	fixed some bugs in ranges
-	better error reporting
-
-	Got rid of Unicode 1.1 references
-
-	made to use OpenType table
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	made to validate
-
-2008-05-03 Steve White
-	* FreeMono.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Removed digits from Private Use Area.
-	See bug 23050.
-
-	* FreeMono.sfd, FreeSans.sfd:
-
-	Completed General Punctuation
-
-	* FreeSans.sfd:
-
-	Completed IPA Extensions
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd:
-
-	More work on Superscripts and Subscripts, Spacing Modifiers.
-	Sans is now complete in both.
-	Added Pfennig to Sans and Mono.
-
-	* ranges.py:
-
-	Restructure text output
-	Rearrangement and cosmetic ...except I had broken it.  now fixed
-	Seems to be in a useful form at this point.
-	More docs, date
-
-	* FreeSerif.sfd:
-
-	Added a hand-drawn old German Pfennig to Currency Symbols
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Further additions to General Punctuation, Super and Sub Scripts,
-	Spacing Modifiers, etc.
-
-2008-05-02 Steve White
-	* FreeSans.sfd:
-
-	additions to Spacing Modifiers, IPA
-
-	* FreeSerifItalic.sfd:
-
-	Shortening stacked accents to maintain readability when clipped
-
-2008-05-01 Steve White
-	* FreeSans.sfd:
-
-	Additions to Spacing Modifiers and changes to Combining Diacritics
-
-	* FreeSerif.sfd:
-
-	Made sure all the half rings in Combining Diacriticals and Spacing
-	Modifiers were really half rings  (J. Poon had complained about this)
-
-	Filled out General Punctuation
-	Some work on Spacing Modifiers
-
-	Filled out Mathematical Operators
-		still needs lots of work
-	Made to validate
-
-	Filled out Latin Extended B
-	Added some letters with curls to Latin Extended B
-	More fiddling with Latin Extended B accents
-
-2008-04-30 Steve White
-	* FreeSerif.sfd:
-
-	Added Hanunóo script, with characters based on those in
-	font MPH2BDamase, on request from the maintainer of that font,
-	http://packages.debian.org/sid/ttf-mph-2b-damase
-	
-	Glyphs are simple vector strokes.  Could be a little more uniform.
-
-	Added Buginese script "Lontara", with characters based on those in
-	font MPH2BDamase, on request from the maintainer of that font,
-	http://packages.debian.org/sid/ttf-mph-2b-damase
-	
-	Note the glyphs are pretty rough, clearly a digitization of handwriting.
-	I just cleaned them up, and corrected discrepancies with Unicode,
-	and compared with some pictorial samples of the script I could find.
-
-2008-04-29 Steve White
-	* ranges.py:
-
-	Improved look a lot--still unhappy with some ranges
-	OS/2 seems sometimes bang-on, sometimes unrelated to anything (including
-	fontforge's OS/2 listing)
-
-	* FreeSerif.sfd:
-
-	Much fiddling with Tamil range.
-	First scaled to 78% (avoiding the references)
-	This gets it in the ballpark height-wise.  [A bit taller than the Latin
-	letters, but the stroke is narrower, but then the glyphs are busier.]
-	Then had to re-align combined references, the trickiest being the
-	halants.
-	Checked with other fonts with Tamil text.
-
-2008-04-28 Steve White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Cleanup of control points in Arabic and Thaana
-
-	* FreeSerif.sfd:
-
-	Cleanup of missing extrema in Arabic and Thaana
-
-	Many changes to Thai, trying to make the script fit between some lines,
-	so accents won't get clipped, etc.
-	Also, stroke weight was heavier than that of Latin.
-	
-	Scaled whole thing by 93%.
-	Shrank the tallest letters 0E42-4 to get them under 900EM.
-	Shaved off top of maiek.
-	Fiddled with positioning of all accents.
-	Made positioning tables for accents.
-		Note: unclear these are working correctly
-	
-	Fixed a bug having to do with character replacements for characters
-	named 'ng' and 'nj'; these names had been taken on by other characters.
-	
-	Made to validate
-	
-	Unicode positions of two Cyrillic Extended characters were switched.
-	Fiddled with a couple of Cyrillic combining diacritics
-
-2008-04-27 Steve White
-	* FreeSans.sfd:
-
-	bugfix: a left harpoon mysteriously appeared to the left of letter p!
-
-2008-04-26 Steve White
-	* FreeMono.sfd:
-
-	Made to validate
-
-	* FreeSans.sfd:
-
-	Made to validate
-
-	Toward J. Poons report
-	Made 032B more like proper double-arches (and distinct fro 033C seagull)
-	Made 032b more like a seagull
-
-	* FreeSans.sfd, FreeSansBold.sfd:
-
-	Sans: fiddling with widths and terminators of math symbols,
-		toward J. Poon's report
-	R & B: removed u+2741 because it didn't match the Unicode description
-
-	* FreeMono.sfd:
-
-	Extensible parenthesis symbols weight/terminators
-	Toward bug # 23064: https://savannah.gnu.org/bugs/index.php?23064
-	Rounded a bunch of terminators
-
-2008-04-22 Steve White
-	* FreeSerif.sfd:
-
-	Small alignment problem in Greek Extended
-
-	One more tweek to spacing in Cyrillic Extended
-
-	Corrected spacing in Cyrillic Supplement
-
-	Added Cyrillic Supplement letters for
-	Enets, Khanty, Chukchi, Itelmen, Mordvin, Kurdish, Aleut
-
-	Added Cyrillic letters for Nivkh (completing Cyrillic range)
-	More tightening of accents in Latin Extended.
-
-	* FreeSans.sfd:
-
-	Fiddled with math--consequences of changing the "similar" operator
-
-	More tightening of accents
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Adjustments to h and k with caron and cedilla in Latin A and B
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd:
-
-	FreeSerifBold: deleted 3 dotted Hebrew letters in Private/Corporate use
-	(E801-3).  They weren't ligatures or in any other lookup, and they
-	weren't present in FreeSerif.
-	
-	* FreeSansBold:
-	Unlinked and deleted F6C3, which called itself commaaccent.
-	Made some new spacing and non-spacing accents to make up for it.
-	
-	* FreeSansBoldOblique: 
-	Made references of many Latin Extended.
-	Also corrected several wrong ones.
-	
-	* Freeserif: 
-	Re-named commaaccent
-
-2008-04-21 Steve White
-	* FreeMono.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSerif.sfd, FreeSerifBold.sfd:
-
-	Deleted Hiragana and Katakana ranges, as discussed on bugs list.
-	Cleaned up some encoding issues, unnamed glyphs
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Roman: added 'sine' -- not beautiful, but I liked drawing it
-	All: Made special lookup for Dutch ligatures 'IJ' and 'ij'
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Roman: ffi etc Latin ligatures from 'liga' to 'dlig' (these weren't
-	really ligatures anyway, and only looked very bad when used. 
-	Retain for condensed type.
-	Others: deleted Latin 'liga' table altogether
-	BoldOblique : added j to ij ligature
-
-	Toward J. Poon's Report:
-	Except for issues of terminators not always vertical or horizontal,
-	and a few things that were too hard or I was unsure of.
-
-2008-04-20 Steve White
-	* FreeSerif.sfd:
-
-	Futzing with accents in Latin Extended Additional and Latin Extended-B
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Added primemod character, referenced by Greek number sign
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Following J. Poon's report, disconnected NJ (01CA)
-
-2008-04-19 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	First pass throught J. Poon's bug list.
-	See bug reports for details.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made underscore slanted in Oblique faces, made all to be width of
-	space character.
-	Towards J. Poon's report.
-	Disturbed that xterm and some other apps put small space between
-	characters when none was called for.
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeSans.sfd, FreeSansOblique.sfd:
-
-	Corrections on Currency Symbols
-
-	* FreeMono.sfd, FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More corrections, additions to Currency Symbols
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Filled out and corrected Currency Symbols
-
-2008-04-18 Steve White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Adjustments to Combining Marks for Symbols
-	Additions to range in Sans, and re-structured its marks table so that
-	"middle" can apply to any range
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Made reference between combining koronis and lenis of Greek Extended.
-	In Serif, re-worked combining marks lookup tables, added anchors in 
-	Latin, moved so without marks they work in kedit (but now I'm doubting
-	kedit does a reasonable thing...what is a better application for
-	testing this?)
-
-2008-04-16 Steve White
-	* FreeSerifItalic.sfd:
-
-	Adjusting of spacing and accents in Greek
-
-	* FreeMono.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansOblique.sfd, FreeSerif.sfd:
-
-	Much futzing with Greek letter spacing and accents.
-	Added lenis to FreeMono.
-
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Adjusted spacing of dots of Greek dieresistonons in Serif
-	Whipped up something for Greek kappascript in Mono (could use revision)
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Raised dots on double-dotted Cyrillic i, to match that of i and j.
-
-2008-04-14 Steve White
-	* FreeMono.sfd:
-
-	Corrected 27e6-7 "white bracket"
-	Note it is probably a FontForge bug these symbols aren't showing up.
-	FontForge thinks they are in Supplemental Arrows, but they should be
-	in Supplemental Math-A
-
-	Named some Greek characters
-
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd:
-
-	Spacing of some Cyrillic characters
-
-2008-04-13 Steve White
-	* FreeSerif.sfd:
-
-	Some fiddling with accents
-	'yogh' was too wide
-
-	* FreeSansBold.sfd, FreeSansOblique.sfd:
-
-	Character spacing was chaos--tried to improve.  BoldOblique also needs
-	it.
-
-	* FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd:
-
-	Completed the fix of bug #12798, Greek glyphs with accents to side
-	Much mucking with accents here, and fixed a few things that were just
-	wrong.
-
-2008-04-12 Steve White
-	* FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Made Mono curly quotes "bent"
-
-	* FreeMono.sfd:
-
-	More fiddling with Greek accents
-	Made quotes "bent"
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Adjustments on Greek diaresistonos etc.
-	Adjustments in Serif on combining marks for symbols
-
-	* FreeSerif.sfd:
-
-	More additions to Combining marks for Symbols
-
-	Additions to Combining marks for Symbols -- now mostly full.
-	Lots of adjustments to middle anchor point in Latin to make big circle
-	(nearly) encircle preceding latter
-
-2008-04-11 Steve White
-	* FreeMono.sfd:
-
-	Bugfix:
-	Had indroduce a glyph of width other than 600, making kterminal not
-	recognize it as a monospace font.
-
-2008-04-10 Steve White
-	* FreeSans.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More messing with accents.
-	Further to bug #12798, Greek glyphs with accents to side
-	Much messing with glyphs in Greek Extended range
-
-2008-04-09 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSerif.sfd:
-
-	Revisited Latin-1 and Latin-A accents.
-	Glyph B7 was called "periodcentered", but Unicode callse it Mid Dot,
-	and the description doesn't refer to the period.  I made it like the
-	dot accent.  throughout, and referred L-dot to it.
-	
-	Also double-checked "commaaccent" characters (some in Unicode called
-	cedilla, but the Unicode example shows a comma...mystery)
-	
-	Also the funny IPA upside-down f often had two bars, incorrectly.
-	
-	To do:  go through rest of Serif, and Sans
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Completed re-structuring of stacked Latin accents in Mono.
-	Also: lots of associated adjustments of Greek Extended accents.
-	(Trying to at least center extremely wide characters on their box)
-	Repaired some victems of "find overlaps" sweeps
-	Worked on glyphs with apostrope/comma parts
-	Corrected a few wrong glyphs.
-	
-	Trying out a "bent quotes" solution to making primes distinct from
-	quotes.
-
-2008-04-08 Steve White
-	* FreeMonoOblique.sfd:
-
-	Toward reducing overall height
-	Did similar process as for Mono, fixing a few errors along the way.
-	Also the Greek Extended range was very messed up vertical and
-	horizontally.
-	Horizonal spacing of the heavily accented Greek is a real problem in
-	Mono...
-	To do:
-		revisit "commaaccent" characters in all faces: do some have 
-		edillas?
-		some Hebrew glyphs are a little low
-		Georgian generally is way out of bounds
-
-2008-04-07 Steve White
-	* INSTALL:
-
-	Various updates and corrections, tweeked formatting
-
-	* FreeMonoBold.sfd:
-
-	Tweeking of accents
-
-2008-04-06 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd:
-
-	Re-worked accents in FreeMonoBold.sfd to make Latin ranges lie between
-	800 and -200 EM, as with FreeMono.
-
-	* FreeMono.sfd:
-
-	Latin Extended ranges: Implemented new policy of shortening the letters
-	of the characters with the highest-stacked accents.
-	
-	At this point all the Latin glyphs lie betweeen 800 and -200 EM.
-	
-	Also checked for readability of all the Latin extended letters in xterm.
-	(Issue: it chops letters outside their bounding boxes; many accents had
-	been a bit outside.  Made sure that if they were chopped, they were at
-	least still recognizable.)
-
-2008-04-05 Steve White
-	* FreeMono.sfd:
-
-	Following exchange about Mono on freefont-bugs with Joe Wells, who
-		> doesn't like the curly quote marks
-		> wants combining diacritics to work
-		> wants tight line spacing
-	
-	Trying to reduce font height:
-	> exclamdown was below -200
-	> Throughout Extended Greek, ypogegrammeni were too low.  Shortened
-	glyph, and raised all references.
-	> Lots of messing with Latin Extended ranges to make glyphs mostly
-	fit into 800 height.  Mostly succeeded.  A couple will get chopped.
-	> Messed with "commaaccent" glyphs, which were very low
-	> Cyrillic 04B1 had a tail that was incorrectly low
-	> Much mucking with Georgian range.  Moved up by 95 (read that Georgian
-	is written as though centered between two horizontal lines, rather than
-	as sitting on a baseline)  There are still a few very high glyphs.
-	
-	FontForge U+0122 called Gcommaaccent, glyph looks like that, but
-	Unicode says it's Gcedilla.  Made the ones called cedilla by Unicode
-	to be cedillas
-	
-	Note bug in Unicode: standard for 0122, 0123, 0136, 0137, 013B, 013C,
-	0145, 0146, 0156, 0157 all talk about cedilla, say to make it with
-	cedilla, but example shows comma.
-	
-	By the way:
-	> Got rid of commaaccent and dotlessj in Corporate Use
-	> Replaced shadedark, with little squares now not overlapping.
-	> Corrected IPA symbol 'ts' 02A6, added 02a8, 02a9, 02aa, 02ab, 02ac,
-	  02ad, 02ae, 02af
-	
-	(so many changes...the CVS server was down...)
-
-	* FreeSerif.sfd:
-
-	Re-named arabic and hebrew characters
-	Big adjustment to comma-accents.  Mostly effects Greek Extended.
-	Made such accents to be like comma, rather than like Russian apostrophe
-	(and de-referenced that symbol)
-
-2008-04-04 Steve White
-	* FreeMono.sfd, FreeSerif.sfd:
-
-	Raised dot on superscript i (2071) -- more distinct at small sizes
-
-	* FreeMono.sfd:
-
-	added two IPA symbols
-
-2008-04-02 Steve White
-	* FreeSerif.sfd:
-
-	fixed a few more control points too close
-
-	Fixed names of languages in ligature table for latn "w/i".
-	This fixes a crash when FontForge opened the ttf table
-
-	Motivated by bug crashing FontForge when opening ttf file,
-	started cleanup of useless control points.  Not finished.
-	Got partway through Sinhala
-
-2008-03-31 Steve White
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoOblique.sfd, FreeSans.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Fixed various "Find Problems", including glyphs with mixed-up names,
-	and bad TT matrices.  (lots more bad TT matrices remain)
-
-	* FreeSerif.sfd:
-
-	Re-named a bunch of Cyrillic letters
-
-	* FreeSerif.sfd:
-
-	Put above mark on Cyrillic i and double-dot i for Slavonic number forms
-
-2008-03-30 Steve White
-	* FreeSans.sfd:
-
-	Tightened spacing on glyphs of last commit
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Concerning bug  #16120, Include upper case Wynn and upper case Yogh
-	Adapted Herman Miller's Thyromanes letters  01F7 021C 021D for Serif
-	Drew my own versions for Sans.
-
-	* FreeSerif.sfd:
-
-	Added 04F6,7
-
-	* FreeSerif.sfd, FreeSerifItalic.sfd:
-
-	Made more Cyrillic diacritics really combine.
-	Made a mark lookup just for Cyrillic diacritics,
-	Marked most of the unadorned Cyrillic alphabet.
-	
-	Still not clear on correct shapes for some of the marks.
-
-	* FreeMono.sfd, FreeMonoOblique.sfd:
-
-	Tweeks to accents
-
-2008-03-29 Steve White
-	* FreeSans.sfd, FreeSerifItalic.sfd:
-
-	Small adjustments in Cyrillic
-
-	* FreeSerif.sfd:
-
-	Corrected small palochka
-	Made Cyrillic combining hundred-thousands and millions really combine
-	Named some combining diacriticals
-
-	* FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd:
-
-	Mostly adjusted horizontal spacing of mono oblique faces
-
-	* FreeMono.sfd, FreeMonoBold.sfd, FreeMonoBoldOblique.sfd, FreeMonoOblique.sfd, FreeSansBold.sfd, FreeSansBoldOblique.sfd, FreeSansOblique.sfd, FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	More cleanup of Cyrillic ranges
-	
-	Completely re-did horizontal spacing of SerifItalic and SerifBoldItalic.
-	See bug #17912, poor kerning in Cyrillic oblique...
-	https://savannah.gnu.org/bugs/index.php?17912
-	It looked like chaos to me. 
-	Only so much can be done: the font is flawed.
-	But I think the changes make text readable in these faces.
-	
-	There were dozens of incorrect glyphs in higher-numbered characters.
-	I deleted all those I found.  No glyph is better than a wrong glyph.
-	
-	Futzt with accents, shooting for consistency and readability.
-	
-	A maintenance thing: making correct references (acyrillic vs a,
-	although they may be the same glyph)  I made a lot of headway, but
-	it isn't finished.
-	
-	Likewise, a large fraction of these are compound characters, which can
-	be made with references, resulting in easier maintenance, reduced
-	likelihood of errors, and smaller files.  I replaced many.
-
-	* FreeSerif.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Cyrillic italic
-	Added italic, bolditalic
-		0493, 04a7, 04AD
-	because their form clearly varies in italic.  But was just guessing...
-
-	* FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Cyrillic italic
-	
-	Added italic, bolditalic
-		0493, 04AD
-	because their form clearly varies in italic.
-	But was just guessing as to exact form.
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Overhaul of Cyrillic
-	
-	Italic, BoldItalic
-		added small yat for bug #22588 (note Times New Roman doesn't use
-		alternate form in Italic)
-	
-	All forms of Serif have big problems in Cyrillic.
-	
-	The ugliest is in roman.  The letters, even of the Russian alphabet, are
-	of inconsistent height (awfully, small 0438 (ii) 0446 (tse))
-	and they vary from the height of Latin
-	and they vary from the height of italic and bold.
-	They are a mish-mash of letters from several fonts, of similar (but not
-	quite identical) weight, and similar, (but not quite identical) size.
-	
-	I think the best solution would be to identify the face that best
-	matches Latin, and fill the range with that.  I think this is possible
-	because the rarer letters seem to be better: the common letters are the
-	ones that are wrong.
-	
-	For now, I just increased the sized of 0438 and 0446, and 048a, 048b,
-	also 0459 (lje) 045A (nje) 0464 (dje)
-	
-	Other issues
-
-2008-03-27 Steve White
-	* FreeSerifBoldItalic.sfd:
-
-	Moving all Greek capitals with accent so they don't cover previous
-	letter.  Remedies bug #12798
-
-	* FreeSerif.sfd, FreeSerifBold.sfd, FreeSerifBoldItalic.sfd, FreeSerifItalic.sfd:
-
-	Various tweeks to accented Latin letters.
-	Connected O-ogonek correctly
-
-	* FreeSerifItalic.sfd:
-
-	Accents of numerous accented Latin letters got shifted in a previous
-	commit.  This fixes it.
-
-	* FreeSerif.sfd:
-
-	Adjusted combining tack left and right (0318-0319) to be above -300 EM.
-
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Added some "middle" marks for positioning of diacritics
-
-	* FreeSans.sfd:
-
-	Copied 4 enclosing combining diacriticals from Serif 20DD - 20E0
-
-	* FreeSerif.sfd:
-
-	Adjusted and added some enclosing diacritics 20DD - 20E0
-	In response to Debian bug #472566
-		ttf-freefont: U+20DD COMBINING ENCOLSING CIRCLE doesn't combine
-		http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=472566
-
-2008-03-26 Steve White
-	* FreeSerif.sfd:
-
-	Lowered a few over-high Latin accents
-
-	* FreeSansBold:
-
-		Devangari--only digits 1 and 2, and nothing else.  Deleted
-	
-	* FreeMonoBold, FreeMonoOblique,
-	FreeSerifBold, FreeSeriftalic, FreeSerifBoldItalic,
-	FreeSansOblique, FreeSansBold, FreeSansBoldOblique:
-
-	Got rid of dotlessj, comma in Corporate Use
-	Single Substitution lookup, ccmp table
-	Made proper dotlessj, re-linked j-circumflex
-	
-	Note:
-	FreeSansBold has a commaaccent in Corporate Use, used by several other
-	characers.  Haven't done anything about this.
-
-2008-03-25 Steve White
-	* FreeSerif.sfd:
-
-	Added/corrected glyphs for yeh hamza in Arabic,
-	Added init and medi lookups for yeh hamza.
-
-2008-03-24 Steve White
-	* FreeSerif.sfd:
-
-	Added isolated and final forms for
-	0629	teh marbuta
-	0624	waw hamza
-	0626	yeh hamza
-	0649	alef maksura
-	A previous commit had added lookups that referred to these,
-
-	More fiddling with super/subscripts
-
-	* Makefile, Makefile, GenerateTrueType:
-
-	Scripts and Make targets to generate OpenType fonts and zip file
-
-	* maintenance.txt:
-
-	Added gnupload and info about tagging
-
-2008-03-23  Steve White
-	* FreeSerif.sfd:
-
-	Last of Find Problems -> ATT
-	'mark' Latin lookup: afii10026 is in 'cyrl', also afii10074
-	Upper and lower Cyrillic i.  Just removed mark from both letters.
-
-	'half' Bengali lookup Khanda_Ta is in 'bng2'. Added bng2 to lookup
-	Added TtTable etc
-
-	Clean-up of Points too Close through to end of font.
-	This episode completes the paths/points clean-up of Serif.
-	But note: many ranges, esp. Ethiopic, Japanese, and Indic, have way
-	too many points, resulting in lumpiness.
-
-	At this point, FontForge can convert splines to quadratic, auto-hint,
-	and auto-instrument without segfault.
-
-	* Makefile, sfd/Makefile, tools/GenerateTrueType:
-
-	Alterations to build process: added a Makefile, and made to work
-	on my system.  Now auto-hints before generating TrueType.
-
-2008-03-22  Steve White
-	* sfd/FreeSans.sfd:
-	Lots of additions of math characters.  Should complete for
-	LaTeX 2e, except for extensible brackets.
-
-2008-03-21  Steve White
-	* *.sfd:
-
-	Regularized stacking of accents in Latin Extended Additional
-	Changed name of 00B5 from 'mu' to 'micro',
-		2206 from 'Delta' to 'Delta.math',
-		0308 from 'diaerisis' to 'diaerisiscomb'
-
-	* FreeMono.sfd:
-
-	additions to IPA
-
-	* FreeMonoBoldOblique.sfd:
-
-	Moved dotlessj from Corporate Use,
-	Deleted commaaccent there
-	Fixed mis-named glyphs tcommaaccent, Tcommaaccent
-	Changed name of 030A from 'dieresis' to 'ringcomb'
-
-	* FreeSans.sfd:
-
-	Added some arrows, and a couple of blackboard bold characters
-
-	Several characters in U+F600 Corporate Use range
-	        dotlessj, onefitted, commaaccent
-
-		dotlessj referred to by: jcircumflex, uni01F0:  
-		renamed it to uFFFF, re-linked others by hand
-
-		commaaccent
-			http://diacritics.typo.cz/index.php?id=9
-		should be u+0326 but wasn't linked to anything 
-
-	* FreeSansBold.sfd:
-
-	U+0617 etc: read glyphs "4GWglm". It should be Arabic.  Deleted
-
-	* FreeSansBold.sfd, FreeSansOblique.sfd, FreeSansBoldOblique.sfd:
-
-	Removed bogus glyphs for 200C 200D, ZWJ and ZWNJ
-
-	* FreeSerif.sfd:
-
-	Split lookup for ligatures in latin into two classes;
-	ff, ffl, fl which are appropriate for all languages,
-	and fi, ffi, which are not appropriate in Turkish (due to distinction
-	between short and long i)
-	Needs to be done for other faces.
-
-	Filled set of extensible brackets in Miscellaneous Technical
-
-	Think IPA is now complete.
-	
-2008-03-18  Steve White
-	* FreeSans.sfd:
-
-	clean-up of all path issues and points too close
-
-2008-03-18  Steve White
-	* FreeSans.sfd:
-
-	Something was causing crashing effects in Windows.  Cleanup of
-	problems eventually made it go away.  Now works well.
-
-	Cleaned up many "points too close"
-
-	Cleaned up all ATT problems, of which there were many and various.
-
-	# Incorrectly labelled zero-width joiner used in a ligature
-
-	# Incorrect substitution of dotlessi and dotlessj with i and j was
-	  somehow connected with FontForge crash.  Attemts to remove the
-	  substitution would damage a 'ccmp' table; subsequent changes would
-	  result in FontForge crashing on save, and truncating the sfd file. 
-	  Surgically removed with vi.
-
-	# A couple of Indic lookups had incorrect script DFLT; one had 'latn'.
-
-	# Don't understand why there are scripts named
-		dev2 bng2 grj2 gur2 when there are already deva beng gurj guru
-	  But anyway, lots of 'vatu' 'pres' 'haln' and 'liga' lookups contained
-	  characters in the '2' scripts but were lablled only for the 'non-2' 
-	  ones.  Added the '2' scripts to all these lookups. Suspect a mistake.
-
-	Note: several of these problems are repeated in other Sans faces.
-
-2008-03-16  Steve White
-	* FreeMono.sfd:
-
-	Cleanup of many path problems "points too close"
-
-	Strove to make accents Latin Extended range legible at small sizes
-
-	Named some unnamed characters; removed a duplicate
-
-	At this point, all fonts are passing FontForge Validate.
-
-2008-03-15  Steve White
-	* FreeSerif.sfd:
-
-	CJK punctuation: made some of the very high glyphs smaller (under 900EM)
-	The brackets in Sans were very ugly, and not even Sans-serif.
-	Serif: added extensible square brackets, diddled with integral
-	corrected direction of some added glyphs
-
-	Several bugs having to do with missing glyphs in Tamil range.
-	Also a buggy ligature in Devangari.
-
-	Shortened names of many lookup tables
-
-	Futzt with some combining diacriticals
-
-	Added extensible square brackets.
-
-	* FreeSans.sfd:
-
-	Changed names of a bunch of glyphs with invalid
-	TrueType names, in range 0x1025f+ (not real Unicode).
-	Took pains to retain information contained in the names.
-	Wonder if these glyphs have ever been of any use.
-
-	CJK Punctuation: brackets were hand-drawn and very ugly.  Improved.
-
-	* *.sfd:
-
-	Set OS/2 Metrics back to absolute 900/300.  Offsets are not 
-	interpreted uniformly.
-
-	Cleanup of many path problems up to extrema and self-intersecting
-
-	Ordered PS Blue values.
-
-2008-03-14  Steve White
-	* FreeSerif.sfd:
-
-	Got rid of mixed references and contours
-	Cleanup of many path problems "points too close"
-
-	Started clean-up to satisfy FontForge Validate
-
-	Changed names of three glyphs in the
-	Tamil ligatures range...all clearly bugs. 
-
-	* FreeSans.sfd:
-
-	Added slanted-hyphen
-
-	* *.sfd:
-
-	Unified OS/2 Metrics
-	Added Grid Fit
-
-2008-03-13  Steve White
-	* FreeSans.sfd:
-
-	Rearranged PS BluesValues so they were in increasing order,
-	Made all 20 in width. 
-
-2008-03-12  Steve White
-	* FreeSans.sfd, FreeMono.sfd:
-
-	Added TrueType hinting tables.
-	Fixed glyphs that didn't convert well to quadratics
-	Got rid of mixed contours and refs
-
-	* FreeSerifBold.sfd:
-
-	Cleanup of path problems
-
-2008-03-11  Steve White
-	* FreeMonoOblique.sfd:
-
-	Cleanup of path problems
-
-2008-03-09  Steve White
-	* FreeSerif.sfd:
-
-	Corrected L-dot
-	Further cleanup of path/ref problems
-
-	Found several ligatures that referred to a missing glyph "ZWJ".
-	Took this to mean the "zero width joiner" u+200D
-
-	* *.sfd:
-
-	Changed OS/2 metrics to be absolute 900/300
-
-	* FreeSerifItalic.sfd:
-
-	Added Greek lunate epsilon
-
-	* FreeMono.sfd:
-
-	Many additions in math range
-	Reduced size of binary union, intersection, vee, wedge
-	Corrected empty set
-	Corrected logical 'assert' relations, etc. 22a2-22af
-	Efforts to make Math glyphs legible at small point sizes
-
-	* FreeSans.sfd:
-
-	Added Greek lunate epsilon and rho symbol
-	Unstacked more stacked diacriticals
-
-	Further cleanup of path/reference problems
-
-2008-03-08  Steve White
-	* FreeSans.sfd, FreeSerif.sfd:
-
-	Added some "n-ary" Math operators
-
-	* FreeSerif.sfd:
-
-	Further clean-up of path problems...up to Ethiopic
-	> Started adding and correcting Math operators for LaTeX 2e
-	> Corrected n-ary union, intersection, and spikes to be larger
-	than the binary operators
-	> Made (many of) the operators based on + - = to use those
-	symbols directly (by reference or copying).
-	> Added lunate epsilon
-	> Corrected empty set
-	> Tightened up spacing of some other technical characters
-	> Worked on some more math operators involving =
-	> triangle
-	> Several arrows
-	> Supplemental Arrows-A
-
-	* FreeSans.sfd:
-
-	Clean-up of font paths
-	Open self-intersecting outermost-clockwise missing-extrema
-	also flipped references (unlinked)
-
-	Added Greek lunate epsilon and rho symbol
-
-2008-03-06  Steve White
-	* sfd/FreeSerif.sfd: Shortened and thickened the combining hook mark,
-	U+0309, to make more like Unicode samples.
-	Also see (bug #22499) un-stacked incorrectly stacked accents
-
-2008-03-05  Steve White
-	* sfd/FreeSerif.sfd: vertical lines: combining diacritical marks
-	corrected 0300 030D 0329 0348 (were rendered as straight apostrophes)
-	Spacing Modifier letters added 02C8 02CC 
-		02B9 02Ba prime and double-prime
-	Fixed positioning U+1EC8, 9, I with hook above
-
-2008-03-03  Steve White
-	* sfd/FreeSerif.sfd: TT strings updates.
-		updated Copyright to 2008
-		Added Vendor URL as the Savannah freefont site
-	* sfd/FreeMono.sfd: A standard pangram as the Sample Text for Russian
-		It reads: In the thickets of the South once there was a citrus
-		...--yes, but a fake specimen!
-	* sfd/*.sfd: Set the OS/2 Sup/Sub settings, which by default looked
-		like random trash.
-
-2008-03-02  Steve White
-	* sfd/FreeSerif.sfd: began cleanup of problems given by FontForge
-	"Find Problems" feature.  (bug #22454)
-		
-2008-03-01  Steve White
-	* sfd/FreeSerif.sfd: made Arabic work for text display (bug #22329)
-		Added required contextual replacement tables,
-		Made a few missing characters,
-	* sfd/*.sfd: Removde all back layers from glyphs that had them.
-
-2008-02-27  Steve White
-	* sfd/FreeSans.sfd: filled in Combining Diacriticals
-	* sfd/FreeSerif.sfd: shifted whole Arabic range down by 200EM.
-
-2008-02-26  Steve White
-	* sfd/FreeSerif.sfd: enabled DPOS table.
-
-2008-02-24  Steve White
-	* sfd/*.sfd: Much fiddling with the "combining diacriticals"
-		range 0300-036F.  Made to align with medium-size lowercase
-		preceding character if not using DPOS table.
-
-2008-02-23  Steve White
-	* sfd/FreeSerif.sfd, FreeSans.sfd, FreeMono.sfd: (bug #21784) Filled
-	in set of HTML 4 Character Entities.
-
-	* sfd/FreeSerif.sfd, FreeSans.sfd, FreeMono.sfd: (bug  #18413)
-	undertie too low -- went on to tidy other similar characters in
-	Combining Diacriticals range.
-	
-2008-02-21  Steve White
-	* sfd/*.sfd: Moved capital Greek letters with tonos so tonos doesn't
-	cover preceding letter (bug #12798)
-
-	* sfd/FreeSerif.sfd, FreeSans.sfd: (bug #13370) made extended
-	integrals to line up.
-	
-2008-02-20  Steve White
-	* sfd/*.sfd: started removing glyphs with back layers (printing bug)
-	* sfd/*.sfd: adjusted vulgar fractions (bug #17756)
-	* sfd/*.sfd: adjusted numerical superscripts (bug #20278)
-
-2008-02-18  Steve White
-	* sfd/FreeSerif.sfd: Offset Hiragana and Katakana ranges (bug #22326)
-	* sfd/FreeSerif.sfd: U+30FB, KATAKANA MIDDLE DOT to be full width
-				(bug #18326)
-
-	* sfd/FreeSerif.sfd: Re-promoted
-	        ff ffi ffl fi fl
-		as standard ligatures in Latin.
-
-2008-02-17  Steve White
-	* sfd/*.sfd: committed to FontForge Spline Font Database (SFD) 2
-	format.
-	
-2008-02-10  Steve White
-	* sfd/*.sfd: brought into line with Debian ttf-freefont
-	Deleted a couple of patches, and applied those applied to Debian.
-
-2006-09-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* INSTALL: added installation procedure for MacOS X, courtesy
-	Philipp Kempgen.
-
-2006-05-04  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd: deleted Russian sample text, which did not
-	conform to UTF-7.
-
-2006-04-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: corrected U+10D3.
-
-	* sfd/FreeSans.sfd: ligature U+FB06 (LATIN SMALL LIGATURE S T)
-	changed from mandatory ("liga") to discretionary ("dlig") (bug
-	#16253).
-
-	* sfd/FreeMono.sfd: deleted incomplete glyph U+FB06 (LATIN SMALL
-	LIGATURE S T); deleted U+FB00, U+FB01, U+FB02, U+FB05 as
-	ligatures (bug #16253).
-
-	* sfd/FreeMonoOblique.sfd, sfd/FreeMonoBoldOblique.sfd: added
-	U+FB00; deleted U+FB01, U+FB02 as ligatures (bug #16253).
-
-	* sfd/FreeMonoBold.sfd: deleted U+FB00, U+FB01, U+FB02 as
-	ligatures (bug #16253).
-	
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd: added Georgian letters, donated by
-	Gia Shervashidze
-
-2006-02-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd: ligature U+FB4F
-	changed from mandatory ("liga") to discretionary ("dlig"). This is
-	respons to Bug#349657: [bug #15792] Freefont Alef and Lamed
-	combine
-
-2006-02-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBoldOblique.sfd,
-	sfd/FreeSansBold.sfd: ligature U+FB4F changed from mandatory
-	("liga") to discretionary ("dlig"). This is respons to Bug#349657:
-	[bug #15792] Freefont Alef and Lamed combine
-
-	* sfd/FreeSerif.sfd: corrected bug#275759: [bug #15790] FreeSerif
-	glyphs for U+2198/U+2199 were reversed.
-
-2006-02-15  Denis Jacquerye <moyogo@gmail.com>
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, 
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeMonoBold.sfd: removed ij 
-	and IJ ligatures.
-
-2006-02-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: added small Georgian letters (mkhedruli),
-	donated by Gia Shervashidze
-
-	* AUTHORS: Added Gia Shervashidze
-
-	* CREDITS: Added Gia Shervashidze
-
-2006-01-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* notes/maintenance.txt: Added information on the Makefile now
-	used; username for FTP login is anonymous.
-
-	* sfd/FreeSansBold.sfd: added U+0569, U+0571, U+0579, U+057B,
-	U+0586. Armenian small letters completed.
-	
-	* sfd/FreeSerif.sfd: added U+0297, U+02AD-02AF. IPA Extensions
-	section is now complete. Copied a dozen of glyphs from Omega IPA
-	to Phonetic Extension section.
-
-2006-01-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+01A, U+01A3, U+01A6, U+01B2, U+01BA,
-	U+01BB, U+01BE, U+01BF.
-	
-	* sfd/FreeSans.sfd: aligned small Armenian letters to x-height in
-	response to bug #15480. Armenian in Free Sans needs a major
-	cleanup.
-
-2006-01-24  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: changed U+0452, U+045B. Cleanup: U+0460,
-	U+0461, U+04Bc, U+04BD, U+0508.
-
-	* sfd/FreeSansOblique.sfd: replaced accented chars in Latin-1 and
-	Latin Extended-B sections with references, where possible.
-
-	* sfd/FreeSerif.sfd: changed U+0285.
-
-2006-01-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0195, U+01AA, U+0297, U+03D7,
-	U+03F0. Several flipped references replaced by outlines.
-
-	* sfd/FreeSansOblique.sfd: Latin Extended-B section more or less
-	brought in sync with FreeSans.
-
-	* sfd/FreeMonoBoldOblique.sfd: added glyphs from FreeMonoBold in
-	the Latin Extended-B and IPA Extensions sections.
-
-	* sfd/FreeSerifBold.sfd: Added U+0224, U+0225. Changed U+01B7,
-	U+01B8, U+04E0, U+0452, U+045B. Replaced accented characters in
-	the Cyrillic region with references.
-
-2006-01-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0255, U+0264, U+0277, U+0286,
-	U+029D. Changed U+0261. Deleted spurious glyphs in the control
-	code area.
-
-2006-01-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: replaced Hardip Pannu Singh's Gurmukhi with
-	AnmolUni by Kulbir Singh Thind.
-
-2006-01-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd: Added U+018D, U+0194, U+01B5, U+01B6,
-	U+01BE, U+0262, U+02A2.
-	
-	* sfd/FreeSansBold.sfd: Changed U+0261 in order to distinguish it
-	from U+0067. Changed U+0251, U+0252.
-	
-	* sfd/FreeSerifBold.sfd: Small changes in the Cyrillic
-	section. Added U+0183, U+018C.
-	
-	* sfd/FreeSans.sfd: Added U+2045, U+2046.
-	
-	* sfd/FreeSansBold.sfd: Filled in the Gurkmukhi part with the
-	AnmolUni-Bold by Kulbir Singh Thind. Also some minor corrections
-	in the Cyrillic part.
-
-	* CREDITS: Added Kulbir Singh Thind.
-
-	* AUTHORS: Added Kulbir Singh Thind.
-	
-2006-01-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: Thomas Ridgeway's Tamil characters replaced
-	by the ones released by the Samyak font project.
-
-	* CREDITS: Added Pravin Satpute, Bageshri Salvi, Rahul Bhalerao
-	and Sandeep Shedmake
-
-	* AUTHORS: Added Pravin Satpute, Bageshri Salvi, Rahul Bhalerao
-	and Sandeep Shedmake
-
-2006-01-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd, sfd/FreeMonoBoldOblique.sfd: minor changes.
-
-2006-01-05  Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd: added cedi sign U+20B5, Ghanaian
-	currency
-
-2005-12-29  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: minor cleanup in the Gujarati part.
-
-2005-12-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: Devanagari and Gujarati parts cleared; once
-	again merged with Gargi 1.9 and Padmaa 0.6, this time correctly so
-	that the anchor points survived the merger.
-
-2005-12-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0577.
-
-2005-12-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0559, U+055F, U+2024.
-
-	* sfd/FreeSansBold.sfd: added U+056E, U+0573.
-
-2005-12-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: Merged with Gargi 1.9 and Padmaa 0.6,
-	courtesy Monika Shah and Sonali Sonania from C-DAC, Mumbai.
-
-	* CREDITS: Added Monika Shah and Sonali Sonania.
-
-	* AUTHORS: Added Monika Shah and Sonali Sonania.
-	
-2005-12-13  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Removed Sinhala glyphs.
-
-	* sfd/FreeSerif.sfd - Added Sinhala glyphs, formerly in FreeSans.
-
-2005-12-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: added U+20AF, U+211E. Changed U+20AC (EURO
-	SIGN).
-	
-	* tools/freefont-ttf.spec: Added specification file for building
-	RPM package, courtesy Rok Papez.
-
-	* sfd/FreeSerifBold.sfd: added more glyphs from Txfonts to the
-	Arrows and Mathematical Symbols ranges.
-
-	* sfd/FreeSerifBoldItalic.sfd: added U+03F5 from Txfonts.
-
-2005-12-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: added U+0567, U+056A, U+056C, U+0582.
-	
-	* sfd/FreeSerifBold.sfd: copied Box Drawing range from FreeSans.
-
-	* sfd/FreeSerifBold.sfd: added glyphs from Txfonts to the Arrows
-	and Mathematical Symbols ranges.
-	
-	* sfd/FreeSerif.sfd: added U+2259-225A, U+22BA, U+2308-230B,
-	U+2322-2323. Cyrillic composite characters replaced with
-	references.
-
-2005-12-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd: added U+025A, U+025D, U+026B, U+029B,
-	U+02AE, U+02AF, U+02DE.
-	
-	* sfd/FreeSerifBold.sfd: updated Hebrew part with Drugulin font
-	from the Culmus project.
-
-	* sfd/FreeSerif.sfd: added U+207A-207C, U+208A-208C, U+2215-2216.
-	
-	* sfd/FreeSans.sfd: added U+2320 TOP HALF INTEGRAL, U+23AE
-	INTEGRAL EXTENSION, U+2321 BOTTOM HALF INTEGRAL (bug #13370).
-	
-2005-12-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd: added U+0294-0296, U+02A1-02A2. Started
-	adding "below" anchors. Performed hinting on characters that were
-	not hinted "en masse".
-
-2005-12-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: fixed some more metrics problems in the
-	Extended Greek area; performed hinting on characters that were not
-	hinted "en masse".
-	
-	* Makefile: clean also signature files.
-
-	* sfd/FreeMonoBoldOblique.sfd, sfd/FreeMonoBold.sfd: cosmetic
-	changes; cleaning background of referenced composed characters.
-
-2005-12-05  Panayotis Katsaloulis  <panayotis@panayotis.com>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd: Some changes to the greek glyphs,
-	mostly having to do with "tonos" (accent)
-
-2005-12-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: minor cosmetic changes.
-
-	* sfd/FreeSans.sfd: adjusted widths of characters in the Extended
-	Greek range; accents are not any more considerably overhanging on
-	the left side. Added U+1EDA-1EE3, U+1EE8-1EF1.
-	
-	* sfd/FreeSans.sfd: continued working on Extended Greek range;
-	metrics still not finished.
-
-2005-12-03  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd: fixed combined Greek accents (bug
-	#12800). Width of characters still need to be adjusted as in
-	FreeSerif.
-
-	* sfd/FreeSerif.sfd: fixed positions of Greek accents (bug #12798).
-
-	* CREDITS: Added Panayotis Katsaloulis.
-
-	* AUTHORS: Added Panayotis Katsaloulis.
-
-	* Makefile: minor changes; now creating also a tarfile with sfds.
-
-2005-12-01  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd: added U+0183, U+018C, U+01C0, U+01C1,
-	U+01C3, U+01E0, U+01E1, U+01F8, U+01F9.
-	
-	* Makefile: created a Makefile to assist building.
-
-	* README: an update.
-
-	* COPYING: added GNU General Public License, version 2.
-
-	* tools/GenerateTrueType: wrote a FontForge script for conversion
-	to TrueType.
-
-	* sfd/FreeSerif.sfd: merged with SolaimanLipi Bangla OpenType font
-	from www.ekushey.org, courtesy Solaiman Karim.
-
-	* sfd/FreeSerifItalic.sfd: merged with SolaimanLipi Bangla
-	OpenType font from www.ekushey.org, slanted by 15.5 degrees.
-
-	* sfd/FreeSans.sfd: merged with Rupali Bangla OpenType font from
-	www.ekushey.org
-
-	* sfd/FreeSansOblique.sfd: merged with Rupali Bangla OpenType font from
-	www.ekushey.org, slanted by 12 degrees.
-
-	* CREDITS: added Solaiman Karim
-
-	* AUTHORS: added Solaiman Karim
-
-2005-11-30  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd: merged with the Rachana Normal.
-
-	* AUTHORS: added K.H. Hussain and R. Chitrajan
-
-	* CREDITS: added K.H. Hussain and R. Chitrajan
-
-2005-11-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - cleaned some background images.
-
-	* sfd/FreeSans.sfd - added U+01A0-01A1, U+01AF-01B0, U+026E,
-	U+028F, U+0291, U+02A3-02A5, U+031B. Modified U+0198.
-
-2005-11-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+2504-250B.
-
-	* sfd/FreeSans.sfd - added U+2591-25A1, U+25A3-25A5, U+25AA, U+25AC.
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd - added U+0263.
-	
-2005-11-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - corrected positions of some Greek diacritics
-	on page 0x1F.
-
-	* sfd/FreeMonoOblique.sfd - working on bringing it in sync with
-	FreeMono.sfd.
-
-	* sfd/FreeSerifBoldItalic.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Added a couple of
-	glyphs in the IPA Extensions region.
-
-	* sfd/FreeSansBold.sfd - added U+0574, U+0576. Removed overlaps.
-	
-2005-11-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+02AA-02AC, U+02B0-02B2.
-
-2005-11-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+01B7-01B9, U+0196, U+019A, U+01C3,
-	U+0224-0225, U+025E, U+029A, U+2422. Changed U+0184-0185, U+0192,
-	U+01B4, U+0282, U+0284.
-	
-2005-11-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+02EE, U+207F.
-
-	* sfd/FreeSans.sfd - started Box Drawing area.
-
-2005-11-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd - added glyphs from the Omega project to
-	Latin Extended-B, IPA Extensions and Greek ranges.
-
-	* sfd/FreeSerifBoldItalic.sfd - added glyphs from the Omega
-	project to Latin Extended-B, IPA Extensions and Greek ranges.
-
-	* sfd/FreeSerifItalic.sfd - added glyphs from the Omega
-	project to Latin Extended-B, IPA Extensions and Greek ranges.
-
-	* sfd/FreeSerifItalic.sfd - added U+018B, U+025C, U+0265, U+026F,
-	U+0279, U+0287, U+028C-028E, U+029E.
-
-	* sfd/FreeSerifBoldItalic.sfd - added U+1EDA-1EE3, U+1EE8-1EF1,
-	U+2190-219B, U+219E-21A8, U+21B9-21BA, U+21C4-21CA, U+21E4-21E5,
-	U+2669-266F. MES-1 compliant.
-	
-	* sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBold.sfd, sfd/FreeSansBoldOblique.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - added U+FFFD.
-
-	* sfd/FreeSerif.sfd - removed overlaps in Latin Extended-B and IPA
-	Extensions ranges.
-	
-2005-11-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd - applied the sequence suggested by
-        Werner Lemberg for reducing redundant points.
-
-	* sfd/papers/eurotex2003/freefont.tex,
-	sfd/papers/eurotex2003/freefont.bib - Revised version, sent back
-	by Karl Berry on 20050110, that should match the one published in
-	TUGboat.
-
-	* sfd/FreeSerifItalic.sfd - started added accent anchors. Added a
-	handful of Greek letters from Omega font collection.
-
-	* sfd/FreeSerif.sfd - added a handful of letters in the Latin
-	Extended-B and IPA Extension ranges from the Omega font collection.
-
-2005-11-16  Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - moved U+0263 to U+0264; added U+0263
-
-	* sfd/FreeSerifItalic.sfd - fixe U+01EE; added U+01B7-U+01B9
-
-2005-11-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Made small Greek letters the same height as
-	Latin and Cyrillic ones and replaced them with references, where
-	applicable.
-
-	* sfd/FreeSerif.sfd - replaced Greek letters with references,
-	where applicable. Added U+03D7, U+03F0-03F2.
-
-	* sfd/FreeSerif.sfd - added U+0255, U+025A, U+025D, U+025F,
-	U+0262-0263, U+026B-026C, U+0274, U+0276-0277, U+028F, U+0291,
-	U+029D.
-
-	* sfd/FreeMonoOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Added U+F6BE.
-
-	* sfd/FreeSansOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points.
-
-	* sfd/FreeSans.sfd - changed U+01A5.
-
-2005-11-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - applied the sequence suggested by Werner
-	Lemberg for reducing redundant points. Replaced accented glyphs in
-	the Latin-1 and Latin Extended-A areas with references. Made
-	capital Greek letters the same height as Latin and Cyrillic ones
-	and replaced them with references, where applicable.
-
-2005-11-15  Denis Jacquerye <moyog@gmail.com>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd, 
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSansOblique.sfd - fixed 
-	U+026A, it was a dotlessi and therefore like U+0069 when 
-	accented.
-
-2005-11-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - corrected Greek tonos (slanted instead of
-	a vertical line).
-
-	* sfd/FreeMonoBoldOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Replaced accented
-	glyphs in the Latin-1 and Latin Extended-A areas with references.
-
-2005-11-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Added 2005 in copyright info.
-
-	* sfd/FreeSansBoldOblique.sfd - applied the sequence suggested by
-	Werner Lemberg for reducing redundant points. Replaced accented
-	glyphs in the Latin-1 area with references.
-
-	* sfd/FreeSansBoldOblique.sfd - added U+0180, U+0184, U+0185,
-	U+0195, U+01A0-01A2, U+01AF-01B0, U+025E, U+026E, U+0292,
-	U+0294-0296, U+029A, U+02A1, U+2126-2127, U+2190-219B,
-	U+219E-21A8, U+21C4-21CA, U+2669-266F. MES-1 compliant.
-
-	* sfd/FreeMono.sfd - Replaced accented glyphs in the Greek and
-	Cyrillic areas with references.
-
-	* sfd/FreeMonoBold.sfd - applied the sequence suggested by Werner
-	Lemberg for reducing redundant points. Replaced accented glyphs in
-	the Latin-1 and Latin Extended-A areas with references.
-
-2005-11-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - applied the sequence suggested by Werner
-	Lemberg for reducing redundant points.
-              
-	* sfd/FreeSansBold.sfd - added U+219A, U+219B, U+2669-266F.
-
-	* sfd/FreeSerifBold.sfd - added U+2669-266F.
-
-2005-11-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+0180, U+0181, U+0183, U+0187,
-	U+0188, U+018A, U+018C, U+018D, U+0193, U+019C, U+01A0, U+01A1,
-	U+01AC, U+01AF, U+01B0, U+025C, U+0260, U+026E, U+0277, U+0281,
-	U+0284.
-
-2005-11-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+195, U+1A6, U+025E, U+026E,
-	U+029A, U+0313, U+0314, U+0342, U+0344, U+0345. Started adding
-	accent anchors.
-
-	* sfd/FreeMono.sfd - applied the sequence for reducing redundant
-	points, suggested by Werner Lemberg.
-
-	* sfd/FreeMono.sfd - corrected Greek letters (using tonos instead
-	of a vertical line). Added U+026E, U+F6BE. Accented characters in
-	Latin 1, Latin Extended A and partly Latin Extended B replaced by
-	references.
-
-	* sfd/FreeSerifBold.sfd - applied the sequence for reducing
-	redundant points, suggested by Werner Lemberg. Added U+01A5,
-	U+02A0, U+2190-219B, U+219E-21A8, U+21B8, U+21B9, U+21C4-21CA,
-	U+21E4, U+21E5.
-	
-2005-11-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansOblique - changed U+0192, U+01A5; added U+01C0-01C3.
-
-	* sfd/FreeSansBold.sfd - replaced glyphs with references in the
-	Cyrillic area. Removed U+04A8, U+04A9. Added U+04C5, U+04C6,
-	U+04C9, U+04CA, U+04CD, U+04CE, U+0535, U+053F, U+0546, U+0565,
-	U+0584, U+0587, U+0589.
-
-2005-11-10  Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSans.sfd - added U+028A-U+028B
-
-	* sfd/FreeSansOblique - added U+028A-U+028B, U+0276, 
-	U+0292, U+0294-U+0296, U+0298-U+0299 and U+029B; fixed some 
-	other glyphs
-
-2005-11-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+01A6. Simplified outlines in the
-	ASCII range.
-
-	* sfd/FreeSansBold.sfd - added U+00A0, U+00AD, U+0531, U+2126,
-	U+2190-2199, U+219E-21A8, U+21C4-21CA.
-
-	* sfd/FreeSansBold.sfd - applied the sequence for reducing
-	redundant points, suggested by Werner Lemberg. Added automatically
-	constructed accented characters in page 0x1E.
-
-2005-11-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+0183, U+018C.	
-	
-	* sfd/FreeSans.sfd - added U+1EA2, U+1EA3, U+1EA8, U+1EA9, U+1EB2,
-	U+1EB3, U+1EBA, U+1EBB, U+1EC2, U+1EC3, U+1EC8, U+1EC9, U+1ECE,
-	U+1ECF, U+1ED4, U+1ED5, U+1EE6, U+1EE7, U+1EF6, U+1EF7, U+220A,
-	U+220B, U+220D, U+2272, U+2273, U+2282, U+2283.
-
-	* sfd/FreeSerifItalic.sfd - changed U+03D5.
-
-	* sfd/FreeSerifBoldItalic.sfd - changed U+03C6; added U+2070,
-	U+2075-2079, U+207F, U+2080, U+2085-2089, U+2155-217F.
-
-	* sfd/FreeSerif.sfd - added U+0184, U+0185, U+018D, U+0195,
-	U+0197, U+019A, U+019B, U+01A0, U+01A1, U+01AC, U+01B5, U+01B6,
-	U+01C0, U+01C1, U+01C3, U+01F6, U+0294-0296, U+1E9A, U+1EDA-1EE3,
-	U+1EE8-1EF1.
-
-2005-11-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+0562, U+056D. U+0575.
-
-	* sfd/FreeMono.sfd - added U+0589.
-
-2005-11-06  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSans.sfd - added U+0278, U+03D5, U+2248. Corrected
-	U+2071, U+222E, U+2242, U+2243 in response to bug reports
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276118
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276120
-
-	* sfd/FreeMono.sfd - added U+2227, U+2228, U+2262. Corrected
-	U+2299-229D in response to bug report
-	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=276121
-
-	* sfd/FreeMonoBold.sfd - added U+2010, U+2012 in response to bug
-	report http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=289032
-	Swapped U+03C6 (Greek small letter phi) and U+03D5 (Greek phi
-	symbol) in order to conform to Unicode standard. Simplified glyph
-	shapes in ASCII range. Started adding "above" and "below" anchors.
-	
-2005-11-05  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSerif.sfd - accented letters in Latin Extended-A
-	replaced by references wherever possible.
-
-	* sfd/FreeSerif.sfd - added U+0180, U+0181, U+0187, U+0188,
-	U+018A, U+0193, U+019C, U+01A4, U+01A5, U+01A7, U+01A8, U+01AF,
-	U+01B0, U+026E, U+0270, U+0278, U+0280, U+0281, U+028B, U+0299,
-	U+029C, U+029F.
-	
-2005-11-03  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSansBold.sfd - added U+0180, U+0184, U+0185, U+0192,
-	U+019B, U+01A0-01A2, U+01AF, U+01B0, U+01EE, U+01EF, U+0292,
-	U+0294-0296, U+02A1, U+0532, U+054C, U+057C, U+222B. Changed
-	U+014B, U+01A5, U+01B4, U+03BB.
-
-	* sfd/FreeSans.sfd - added U+04C5, U+04C6, U+04C9, U+04CA, U+04D,
-	U+04CE.
-
-	* sfd/FreeSansBold.sfd - cleaner Arabic outlines. Added U+01E4,
-	U+01E5.
-
-2005-11-02  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - started Armenian; added U+0538, U+0542,
-	U+0544, U+0548, U+054D, U+054F, U+0550, U+0553, U+0555, U+0561,
-	U+0563, U+0564, U+0566, U+0568 U+056B, U+056F, U+0570, U+0572,
-	U+0578, U+057A, U+057D-057F, U+0580, U+0581, U+0583, U+0585.
-
-	* sfd/FreeMono.sfd - swapped U+03C6 (Greek small letter phi) and
-	U+03D5 (Greek phi symbol) in order to conform to Unicode standard.
-	Added U+04C5, U+04C6, U+04C9, U+04CA, U+04D, U+04CE.
-	
-2005-11-01  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSansBold.sfd - modified U+019C.
-
-	* sfd/FreeSansBoldOblique.sfd - added U+00A0, U+00AD, U+019C,
-	U+01B7, U+01B8, U+0275, U+0278, U+0298, U+2012, U+2015,
-	U+2070-207F, U+2080-208E, U+2153-217F, U+2213, U+2215.
-
-2005-10-31  Primoz Peterlin  <peterlin@localhost.localdomain>
-
-	* sfd/FreeSerif.sfd - added U+0199, U+01AB, U+0265, U+0282,
-	U+0288, U+028C-028E, U+0290, U+029E, U+02A0.
-
-2005-10-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd - added U+019E, U+01AB, U+01AD, U+01B1,
-	U+0256, U+025F, U+0265, U+0269, U+026F, U+0270, U+0279-027F,
-	U+0282, U+0287, U+0288, U+028C-028E, U+0290.
-
-	* sfd/FreeSerifBold.sfd - added U+2070, U+2075-2079, U+2080,
-	U+2085-2089, U+2153-215E, U+2113-2115, U+2119.
-
-	* sfd/FreeSerifBold.sfd - added U+0199, U+019B, U+01B8, U+01B9,
-	U+01BE, U+01C0, U+0262, U+0274, U+0278, U+0280, U+028F, U+0298,
-	U+0299, U+029C, U+029E, U+029F, U+2012, U+2015, U+2016, U+2129,
-	U+2217.
-	
-2005-10-27  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+018D, U+0194, U+019B, U+019C, U+01B5,
-	U+01B6, U+0295, U+0296, U+029B, U+02A2, U+0472, U+0473, U+2114,
-	U+2119.
-
-	* sfd/FreeSerifItalic.sfd - minor cleanup in the superscript range
-	(U+2070-2079).
-
-	* sfd/FreeSansBold.sfd - added subscripts and superscripts
-	(U+2070-208F), completed fractions (U+2152-215F) and Roman
-	numerals (U+2160-217F).
-
-	* sfd/FreeSerifBold.sfd - added U+018B, U+018E, U+018F, U+0191,
-	U+019D, U+01A7, U+01A8, U+01AE, U+0253, U+0266, U+0267, U+026A,
-	U+0271-0273, U+0283, U+0285.
-	
-2005-10-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added "above" anchors to selected Cyrillic
-	characters. Added U+0294, U+02A1.
-
-	* sfd/FreeMono.sfd - added U+2011, U+2012, U+203B, U+204A, U+2071,
-	U+2129, U+2232, U+2233. Changed and/or corrected U+2106, U+211E,
-	U+2126, U+2127, U+2153-215F, U+2202.
-
-	* sfd/FreeMono.sfd - a try to imitate Denis' work on adding
-	anchors by adding "above" anchor to a couple of basic Latin
-	characters.
-
-	* sfd/FreeSansBold.sfd - added U+0278, U+0298. Cleaned up outlines
-	of most Greek letters. 
-
-	* sfd/FreeSansBold.sfd - Added U+2010-2012, U+2015, U+2032,
-	U+203C, U+2047-2049.
-
-	* sfd/FreeSans.sfd - Added U+01C0-01C2, U+0276, U+0292,
-	U+0298. Changed U+0251, U+0294, U+02A1.
-	
-2005-10-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd - added U+00A0, U+00AD, U+2010-2012,
-	U+2015, U+2126, U+2127, U+2153-215E, U+2160-217F, U+2190-2193,
-	U+2669-266F. FreeSerifItalic is now MES-1 compliant.
-
-	* sfd/FreeSerif.sfd - added U+0191, U+019D, U+01AE, U+027E,
-	U+027F, U+0283, U+0285.
-
-	* sfd/FreeSerif.sfd - added U+019E, U+01AD, U+01B8, U+01B9,
-	U+0253, U+0256, U+0257, U+025C, U+0260, U+0266, U+0267, U+0269,
-	U+026D, U+0271-0273, U+0279-027D.
-	
-	* sfd/FreeSerifBoldItalic.sfd - added U+00A0, U+00AD, U+2010-2012,
-	U+2015, U+2032-2034, U+203C, U+2047-204A, U+2074, U+2081-2084,
-	U+2126, U+2153, U+2154, U+215F, U+2215.  Corrected positions of
-	diacritics on U+0200-0217.
-
-	* sfd/FreeSansOblique.sfd, sfd/FreeSans.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeMonoBoldOblique.sfd,
-	sfd/FreeMonoBold.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd sfd/FreeSerifBoldItalic.sfd - brought in
-	sync with Valek Filipov's urw-fonts-1.0.7pre41.
-
-	* sfd/FreeSansOblique.sfd - added U+00A0, U+2011-2012, U+2015,
-	U+2070, U+2071, U+2074-2079, U+2080-2089, U+2126, U+2153-215F,
-	U+2190-2195, U+2215, U+266A. FreeSansOblique is now MES-1
-	compliant.
-	
-2005-10-24 Denis Jacquerye <moyogo@altern.org>
-	
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd, 
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBoldOblique.sfd - added 
-	ccmp for i and j to be substituted with dotless i or j when 
-	followed by above diacritic
-
-2005-10-24  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added U+2011, U+2012, U+2015. FreeSans is now
-	MES-1 conformant.
-
-2005-10-23 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSans.sfd - added above, below, abovemk and belowmk 
-	anchors for diacritics placement to many Basic Latin characters, 
-	some Latin Extented A and B, and some IPA characters; fixed a 
-	couple of precomposed characters to have diacritics at the same 
-	height as similar characters.
-
-2005-10-21  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - added U+02B9, U+02BA, U+02CD, U+2017,
-	U+2036, U+2037, U+203C, U+203E, U+2047-204A.
-
-2005-10-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd - added U+0182, U+0189, U+0192, U+019F,
-	U+01A9, U+01B7, U+01C4-01CC, U+01E0-1E2, U+01F0-01F3, U+F6BE.
-	Corrected position of diacritics on U+0200-0217.
-
-	* sfd/FreeSerif.sfd - added U+00A0, U+00AD, U+0182, U+0189,
-	U+018B, U+018E, U+018F, U+0192, U+019F, U+01A9, U+01B1, U+01B7,
-	U+01DD, U+2010-2013, U+2015. FreeSerif is now MES-1 conformant.
-
-2005-10-19 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - added U+0268, U+026A, U+0289, U+0292; and 
-	anchor "above" to more base glyphs.
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSerifItalic.sfd, 
-	sfd/FreeSerifBoldItalic.sfd - added U+0250-0252, U+0258-0259, 
-	U+0261, U+0268, U+026A, U+0279, U+0289
-
-	* sfd/FreeSerifBold.sfd - added anchor "above" to marks 
-	U+0300-0314, and to base glyphs (vowels).
-
-2005-10-18 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - added anchor "above" to marks U+0300-0314, 
-	and bases vowel of the U+0041-007A range, U+00E6, U+0186, U+0190, 
-	U+0254 and U+025B; fixed Latin-1 Supplement block accented glyphs 
-	to use references.
-
-2005-10-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - added U+01B7, U+01B8, U+0275.
-
-2005-10-16 Denis Jacquerye <moyogo@gmail.com>
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd - added some Latin 
-	Extended-B African letters: U+0181, U+018A, U+0197-0198, U+01A4, 
-	U+01AC, U+01B1, U+01B3-01B4;
-
-	* sfd/FreeSansBold.sfd, sfd/FreeSansBoldOblique.sfd - added Latin 
-	Extended-B U+0187, 018E-018F, U+0191, U+0193, U+0197-0199, 
-	U+019D-019F, U+01AB-01AE; correcting width of non-space 
-	Combining Diacrtical Marks; added more glyphs to IPA Extensions 
-	to match non Bold
-	
-	* sfd/FreeSansBoldOblique.sfd - added many accented glyphs to
-	Latin Extended-B
-
-2005-10-15 Denis Jacquerye <moyogo@gmail.com>
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd - added IPA Extensions
-	U+0262,U+0274,U+0280-0281, U+0299, U+029F, and Spacing Modifier
-	Letters U+02C9-02CB; fixed U+0287,029E height to baseline; added
-	stroke to U+0268
-
-	* sfd/FreeSansOblique.sfd - fixed skew on U+027F
-
-	* sfd/FreeSansBold.sfd, sfd/FreeSansBoldOblique.sfd - added to Latin
-	Extended-B U+01A7-01A8, IPA Extensions U+0251-0253, U+0256-0257,
-	U+0261, U+0265-026A, U+026F-0273, U+0289, U+028C-028E
-
-	* sfd/FreeSansBoldOblique.sfd - added to Latin extended-B U+0189,
-	U+01A8, U+01B1, U+0283, U+02C9 and Spacing Modifiers U+02C9-02CB
-	
-2005-10-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - Added a couple of composite glyphs,
-	mostly in the IPA and Latin Extended B ranges.
-
-2005-10-13 Denis Jacquerye <moyogo@gmail.com>
-
-	* FreeSans.sfd - removed overlap and simplified U+0187, 0191, 
-	0193, 01A5, 01AE, 0260, 0271, 0272, 0273, 027B; fixed diacritics 
-	placement on U+0200-0217; fixed glyph for U+0283 to correct esh 
-	without stroke; added U+025F and fixed U+025F from it; fixed 
-	height of glyph at U+0285; arranged U+027E,027F to make more 
-	distinguishable from U+0072.
-
-	* FreeSansOblique.sfd - added the corrected or new glyphs from 
-	FreeSans; diacritics on U+200-0217 will need height readjustements.
-
-	* FreeSansBold.sfd, FreeSansBoldOblique.sfd - added U+0186, 0190, 
-	0250, 0254, 0258, 0259, 025B, 025C
-
-2005-10-13  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Minor changes: U+22A2, U+22A3, U+22A6, U+23AE.
-	Added U+0250, U+0251, U+0258, U+0259, U+0275.
-
-	* sfd/FreeSerifItalic.sfd - Added glyphs U+222B-U+222F, U+2320,
-	U+2321. Fixed diacritics on U+0200-U+0217.
-
-2005-10-12 Denis Jacquerye <moyogo@gmail.com>
-
-	* sfd/FreeSerif.sfd - Corrected diacritics position on 
-	U+01D5-01D9,01DB,01EA-01ED,0200-0217 and U+022A.
-	
-	* sfd/FreeSerif.sfd, sfd/FreeSerifBold.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBoldItalic.sfd - added U+0186,0190,0254 and U+025B.
-	
-2005-10-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Fixed bug #13399 (glyphs for U+0360 and
-	U+0361 were swapped).
-	
-	* sfd/FreeSerif.sfd - Attempt to correct bug #13370: INTEGRAL
-	EXTENSION does not align with TOP/BOTTOM HALF INTEGRAL; added
-	glyph U+23AE.
-	
-2005-05-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Corrected shapes for Cross of Lorraine and
-	Cross of Jerusalem.
-
-2005-04-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSansBold.sfd - Added some combining accents, just to
-	test the a version of FontForge.
-
-2003-12-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Some composite Latin characters rebuilt, as
-	they had accents 600 points to the left due to changes on October
-	2. Some other minor changes in the mathematics area.
-
-2003-10-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoOblique.sfd, sfd/FreeSerifBoldItalic.sfd,
-	FreeSerifItalic.sfd - applied Josef Segur's corrections from
-	Oct. 5.
-
-2003-10-02  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Abbas Izad's contributed Arabic/Farsi
-	characters added.
-	
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Combining characters (U+0300 -
-	U+036F) moved left, so that they have negative horizontal values
-	and zero advance width.
-
-2003-09-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSerifItalic.sfd - Started working
-	on super- and subscripts. 
-
-2003-09-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSerif.sfd - Added some missing
-	 Hiragana and Katakana characters.
-
-	* sfd/FreeSansBold.sfd - Cleared background characters in Latin
-	Extended-A. Added some automatically constructed characters in
-	Latin Extended-B. Started with superscripts and subscripts.
-
-	* sfd/FreeSans.sfd - Subscript numerals (U+2080-U+2089) completed.
-	
-2003-05-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Thai characters po pla and bo baimai
-	swapped; Thai character fongman corrected; all courtesy Theppitak
-	Karoonboonyanan.
-
-2003-05-17  Panayotis Katsaloulis  <panayotis@panayotis.com>
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - Full support
-	of all ancient greek glyphs
-
-2003-05-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/KerningNumerals.pl - A Perl script for moving kerning
-	information from ASCII numerals (U+0030...) to characters in the
-	Adobe corporate use area (U+F6xx).
-
-	* sfd/FreeSansBold.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBoldOblique.sfd - Created kerned numerals in the Adobe
-	corporate use area (U+F6xx) and moved kerning information from
-	ASCII numerals to the kerned numerals.
-
-2003-05-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - First approximation of super- and subscript
-	numerals and vulgar fractions.
-
-	* sfd/FreeSerif.sfd - Super- and subscript numerals complete,
-	vulgar fractions completed and redone as references rather than
-	outlines.
-
-2003-05-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Clean-up of the Cyrillic letters added on
-	March 27; super- and subscripts, vulgar fractions.
-
-2003-05-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - Added a couple of characters to
-	the Latin Extended-B area and the IPA extensions area.
-
-2003-05-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifBoldItalic.sfd - Added a couple of characters to
-	the Latin Extended-B area.
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - ASCII
-	numerals now monospaced; kerned numerals moved to Adobe corporate
-	use area
-	(U+F6xx).
-
-2003-05-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Roman numerals now more complete.
-
-	* sfd/FreeSansOblique.sfd, sfd/FreeSansBoldOblique.sfd - Accented
-	characters added in the Latin Extended-B area.
-
-	* sfd/FreeSans.sfd - Greek accents added in the Greek Extended
-	area, characters added in the Latin Extended-B area, Roman
-	numerals added.
-
-	* sfd/FreeMonoOblique.sfd - Kerning pairs removed (what were they
-	doing in a monospaced font, anyway?).
-
-	* sfd/FreeMonoBoldOblique.sfd - Additions in Latin Extended-B and
-	Basic Greek.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoBold.sfd, sfd/FreeMonoOblique.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansBold.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBoldOblique.sfd - Major cleanup (fixed widths, open
-	paths, path directions (clockwise/counter-clockwise), points
-	rounded to integer values; outlines simplified etc.)
-
-2003-05-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/OS2UnicodeRange - A simple script to display OS/2 Unicode
-	range table in TrueType fonts.
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd - ASCII numerals now
-	monospaced; kerned numerals moved to Adobe corporate use area
-	(U+F6xx). FreeSans is done, FreeSansBold half-way.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Added 2003 in copyright info.
-
-2003-03-27  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Cyrillic and Cyrillic Supplement blocks
-	brought to conformance with Unicode 3.2, courtesy Daniel Shurovich
-	Chirkov.
-
-2003-03-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd - somewhat wider
-	germandbls (U+00DF), due to complaints by Walter Schmidt.
-
-2003-03-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Added Sinhala glyphs from the Tipitaka
-	project <http://www.metta.lk>, recoded to Unicode by Noah Levitt.
-
-2003-02-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Minor changes on mathematical operators.
-
-2003-02-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - minor cleanup of glyph backgrounds; changed
-	integral signs (U+222B - U+2230)
-
-2003-02-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - added a couple of glyphs in the IPA and
-	African Latin ranges.
-
-2003-01-30  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd - Corrected Maltese Hbar (U+0126)
-	and/or hbar (U+0127).
-
-2003-01-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerifItalic.sfd - Corrected Maltese hbar (U+0127).
-
-2002-12-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/ConvertFont - PfaEdit script for converting SFD files to
-	TrueType fonts.
-
-	* sfd/FreeSans.sfd - Added Tamil and Kannada glyphs from the
-	Akruti Indic fonts.
-
-2002-12-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Added Devanagari and Gujarati glyphs from the
-	Akruti Indic fonts.
-
-	* www/index.html - Added information on Rogier van Dalen's tools.
-
-	* AUTHORS - Added M.S. Sridhar.
-
-	* CREDITS - Correct spelling of Culmus project. Added M.S. Sridhar.
-
-2002-12-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added Braille glyphs, courtesy Vyacheslav
-	Dikonov.
-
-	* sfd/FreeSans.sfd - Added Unicode Syriac glyphs, courtesy
-	Vyacheslav Dikonov.
-
-2002-10-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/index.html - Added information on the availability of the
-	Debian GNU/Linux package.
-
-	* sfd/FreeSerif.sfd, sfd/FreeSans.sfd - added some kern pairs
-	beyond Latin-1 area.
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - re-introduced
-	all the emtpy glyph slots (changes from Sep 23 made PfaEdit
-	crash). 
-
-2002-09-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd, sfd/FreeSerifItalic.sfd,
-	sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd - imported
-	kerning information from the URW++ AFM files
-
-2002-09-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoOblique.sfd - updated Hebrew parts to comply with
-	Culmus v0.6.
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansOblique.sfd - Added Danilo Segan's Serbian Cyrillic
-	glyphs; updated Hebrew parts to comply with Culmus v0.6.
-
-2002-09-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansOblique.sfd - Updated Cyrillic part to match
-	Filippov's 1.0.7pre14
-
-	* sfd/FreeSansOblique.sfd - added Sam Stepanyan's Armenian glyphs
-	from FreeSans (skewed for 12 degrees).
-
-2002-09-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansOblique.sfd,
-	sfd/FreeSansBold.sfd, sfd/FreeSansOblique.sfd - Added Maxim
-	Iorsh's Hebrew characters.
-
-2002-08-29  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd,
-	sfd/FreeMonoBold.sfd, sfd/FreeMonoOblique.sfd - Added Maxim
-	Iorsh's Hebrew characters.
-
-	* AUTHORS, CREDITS - Added Maxim Iorsh as author.
-
-2002-08-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/index.html - Added information of Microsoft's withdrawal of
-	freely available Unicode TrueType fonts
-
-	* www/resources.html - Added link to Maxim Iorsh's Culmus project.
-	
-2002-07-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added a couple of characters (Arrows area).
-
-2002-06-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Applied Michalis Kabrianis's patch concerning
-	perispomeni in Greek politoniko.
-
-2002-05-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Applied Michalis Kabrianis's patch concerning
-	psili in Greek politoniko. Also added two working variants of
-	chars in the IPA range.
-
-2002-05-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd, sfd/FreeSansBold.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifBold.sfd - Deleted explicit ".notdef" character with
-	no contours.
-
-2002-05-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - The new version of PfaEdit saves
-	correctly formed Panose and LineGap lines.
-
-	* sfd/FreeSansBoldOblique.sfd - Filled-in the missing TTFWidth and
-	TTFWeight values.
-
-2002-05-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Added diacritics to the Spacing Modifier
-	Letters and Combining Diacritical Marks areas. Added composed
-	glyphs to the Latin Extended-B area.
-
-2002-05-07  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Updated Panose information with data
-	provided by Josef W. Segur. Updated TTF headers with English and
-	Slovenian text.
-
-2002-04-30  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - Working on Greek small letters. Several
-	minor changes (lower carons etc.)
-
-2002-04-29  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* FreeMonoBoldOblique.sfd - Started adding Greek.
-
-	* sfd/FreeMonoBold.sfd - Added glyphs in the Geometrical Shapes
-	and Miscellaneous Symbols area. Harmonizing Greek with Latin. Done
-	with capitals.
-
-	* sfd/FreeMono.sfd - Deleted the explicit .notdef character. Added
-	one glyph to the Geometrical Shapes area, which is now completed;
-	added three glyphs to the Miscellaneous Symbols area. Harmonizing
-	Greek with Latin. Done with the capitals.
-
-2002-04-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - Adjusted accent positions on several glyphs
-	in the Latin Extended-A area.
-
-2002-04-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - Box Drawing area completed. Added a
-	couple of glyphs in the Geometrical Shapes area.
-
-	* sfd/FreeMono.sfd - Small corrections in the Box Drawing area.
-
-2002-04-24  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Box Drawing area completed.
-
-2002-04-23  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/WGL4.lst - corrected.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoBold.sfd - Working on Box Drawing
-	area.
-
-2002-04-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoBold.sfd - Working on Latin
-	Extended-B and Greek.
-
-2002-04-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Somewhat cleaner chess figures.
-
-	* tools/MES-2.txt, tools/MES-2.lst - Corrected list (it is not
-	203C-203E, it is 203C and 203E).
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd, sfd/FreeSans.sfd,
-	sfd/FreeSansOblique.sfd, sfd/FreeSansBold.sfd,
-	sfd/FreeSansBoldOblique.sfd, sfd/FreeSerif.sfd,
-	sfd/FreeSerifItalic.sfd, sfd/FreeSerifBold.sfd,
-	sfd/FreeSerifBoldItalic.sfd - Changed "Family Name" from Free to
-	FreeSerif, FreeSans and FreeMono, as appropriate. Changed Font
-	Modifiers from MonoBold etc. to Bold, Italic, Oblique, BoldOblique
-	and BoldItalic.
-
-2002-04-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd, sfd/FreeMonoBold.sfd,
-	sfd/FreeMonoBoldOblique.sfd - Corrected metrics; now all character
-	widths are set to 600.
-
-2002-04-17  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Corrected glyphs in the Box Drawing area and
-	Block Elements area, which should extend through the ascender *and
-	descender* height.
-
-	* sfd/FreeMonoBold.sfd - Continued working on harmonizing Greek
-	letters with Latin and Cyrillic.
-
-	* sfd/FreeMonoBold.sfd - Added some box drawing characters.
-
-2002-04-16  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/design-notes.html - Updated notes on stroke width for
-	symbols in Free Mono Bold.
-
-	* sfd/FreeMono.sfd - Added a handful of characters in the
-	Miscellaneous Symbols area.
-
-	* sfd/FreeMonoBoldOblique.sfd - Added subscripts, superscripts and
-	vulgar fractions.
-
-	* sfd/FreeMonoBold.sfd - Started harmonizing Greek letters with
-	Latin and Cyrillic.
-
-	* sfd/FreeMonoBold.sfd - Added subscripts, superscripts and vulgar
-	fractions.
-
-2002-04-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/design-notes.html - Updated notes on super-/subscripts in
-	Free Mono Bold. Separate subsections for Free Mono regular and
-	Free Mono Bold.
-
-2002-04-12  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added Ethiopian glyphs, converted from the
-	Metafont sources from TGI, Universität Hamburg (authors Berhanu
-	Beyene, Prof. Dr. Manfred Kudlek, Olaf Kummer, and Jochen
-	Metzinger) using Szabo's TeXtrace and retouched using
-	PfaEdit. Ethiopian metafonts are released under GNU GPL,
-	<http://www.informatik.uni-hamburg.de/TGI/mitarbeiter/wimis/kummer/ethiop_eng.html>.
-
-	* sfd/FreeMonoBold.sfd - Added 40 characters, mostly in the Latin
-	Extended-B and IPA Extensions areas.
-
-2002-04-11  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added a handful of characters in the Latin
-	Extended-B, IPA Extensions, Currency Symbols and Miscellaneous
-	Symbols areas.
-
-2002-04-09  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Correcting accent positioning in the Extended
-	Greek area; adding a couple of characters here and there. Still 20
-	characters short of MES-2 conformance.
-
-2002-04-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added some characters in the Arrows area;
-	more or less completed Extended Greek area (accents still need to
-	be fine-tuned).
-
-2002-04-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Modern non-Russian Cyrilic mostly completed.
-
-	* sfd/FreeMonoOblique.sfd - Synchronized with FreeMono.
-
-	* sfd/FreeSerif.sfd - Added Thomas Ridgeway's Tamil characters
-	(converted from Metafont and edited somehwat).
-	
-2002-04-04  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoOblique.sfd - Armenian letters added.
-
-	* sfd/FreeMonoBold.sfd - Serbian Cyrillic letters dje, tshe, lje
-	and nje corrected.
-
-	* sfd/FreeMono.sfd - Serbian Cyrillic letters dje and tshe
-	corrected. Some other non-Russian Cyrillic letters modified and
-	"welded together".
-
-2002-04-03  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added more or less complete Armenian
-	area. The glyphs are a tidied-up version based on the Armenian
-	Courier on the <http://www.cilicia.com/armo8.html>. Now we have
-	1673 characters.
-
-2002-03-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Added some mathematical symbols.
-
-2002-03-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSans.sfd - took H.S. Pannu's Gurmukhi from FreeSerif. It
-	actually fits to FreeSans much better. It seems I'll have to look
-	for another Gurmukhi font with modulated stroke for FreeSerif.
-
-	* sfd/FreeSerifItalic.sfd - replaced existing Hebrew glyphs by
-	those from FreeSerif (slanted for 15.5 degrees).
-
-	* sfd/FreeSerif.sfd - Added dotted Hebrew letters. Changed barred H.
-
-	* sfd/FreeMono.sfd - Completed vulgar fractions; minor changes in
-	Greek; added some mathematical operators.
-
-	* sfd/FreeMonoBold.sfd - added 12 characters to Latin Extended-B
-	and IPA Extensions areas (total 984).
-
-2002-03-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMonoBold.sfd - started adding Latin Extended-B and IPA
-	Extensions.
-
-	* sfd/FreeMono.sfd - Minor cosmetic changes; cleaning up Greek
-	(removing redundant control points), added some non-European
-	Cyrillic glyphs as a test.
-
-2002-03-22  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - Some minor modifications; letters in Latin
-	Extended-B area "welded" together.
-
-2002-03-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* www/index.html - finally linked the resources and design notes
-	pages.
-
-	* www/design-notes.html - added scaling information for super- and
-	subscript numerals in FreeMono.
-
-2002-03-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - the Latin Extended-B and IPA Extension area
-	characters moved from FreeMono and skewed for 12 degrees.
-
-2002-03-18  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - added a dozen or two of new characters, in
-	particular in the Latin Extended-B and IPA Extension area.
-
-2002-03-15  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - added a dozen of two of new characters, in
-	particular in the IPA Extension area.
-
-	* www/design-notes.html - Corrected data for x-height in FreeMono;
-	information on constructing small caps.
-
-2002-03-14  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeMono.sfd - added three smiley characters to the
-	Miscallaneous Symbols area.
-
-2002-03-10  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Anshuman Pandey has only converted Gurmukhi
-	from TrueType to Metafont; the original author of Gurkmukhi font
-	is Hardip Singh Pannu <http://members.aol.com/hspannu/punjabi.html>.
-	Got the permission from him to include the Gurmukhi glyph set.
-
-2002-03-08  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added some more glyphs in the Mathematical
-	Symbols area to a total number of 3374.
-
-2002-03-06  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added a basic Gurmukhi set.
-
-	* www/design-notes.html - started a page on design notes
-
-	* sfd/FreeMono.sfd - realized that glyphs in the Box Drawing area
-	and Block Elements area should extend through the ascender *and
-	descender* height, and corrected it.
-
-	* sfd/FreeMono.sfd, sfd/FreeMonoOblique.sfd - added some musical
-	glyphs, linking "no-break space" to space, "soft hyphen" to
-	hyphen-minus etc.
-
-2002-03-05  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* tools/WGL4.lst - Added Windows Glyph List 4.0
-
-	* tools/LigatureList.pl - Wrote a Perl script, which lists the
-	GSUB list (ligature list) of a OpenType font.
-
-	* sfd/FreeSerifBold.sfd, sfd/FreeSerifBoldItalic.sfd,
-	sfd/FreeSerifItalic.sfd - auxilliary Hebrew glyphs added. They are
-	too light compared with Latin and will be substituted with better
-	ones.
-
-2002-03-04  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added some more glyphs to the Mathematical
-	Operators area (page 0x22).
-
-	* sfd/FreeSerif.sfd - Incomplete and fragmentary support for
-	Devanagari, originating from Harsh Kumar's Shusha fonts was
-	replaced by Frans Velthuis' Devanagari metafont, now maintained by
-	Anshuman Pandey <apandey@u.washington.edu> and available under
-	GPL. Until I figure out how to provide glyph substitution table in
-	OpenType, only the Unicode part is there.
-
-2002-02-28  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* ChangeLog file created
-
-	* sfd/FreeSerif.sfd - Added some Telugu glyphs to page 0x0C,
-	courtesy  Prasad A. Chodavarapu <http://chaitanya.bhaavana.net/fonts/>
-
-	* sfd/FreeSerif.sfd - Added some glyphs to the Miscellaneous
-	Symbols page (0x26).
-	
-2002-02-26  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* mailing lists freefont-announce and freefont-bugs created
-
-2002-02-25  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/FreeSerif.sfd - Added a couple of glyphs in Mathematics
-	Operators area.
-
-	* sfd/FreeMono.sfd 
-	- Added some more glyphs, in particular in the Mathematical
-	Operators section.
-	- Changed FamilyName to Free, FontName to FreeMono, and Full name
-	to "Free Monospaced".
-
-2002-02-20  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* sfd/ directory added containing FreeSerif, FreeSans and FreeMono
-	families.
-
-	* tools/ directory added containing lists with characters required
-	for MES (Multilinguag European Subset) compliance.
-
-	* tools/mes-list-expand.pl created - a Perl script for expanding MES
-	ranges into simple one-char-per-line format
-
-	* tools/CheckConformance.pl created - a Perl script for checking
-	conformance of a font file with a given coded character set
-
-	* homepage <http://www.freesoftware.fsf.org/freefont/> created
-
-2002-02-19  Primoz Peterlin  <primoz.peterlin@biofiz.mf.uni-lj.si>
-
-	* freefont (Free UCS Scalable Fonts) project approved on
-	savannah.gnu.org: <http://savannah.gnu.org/projects/freefont/>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/INSTALL b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/INSTALL
deleted file mode 100644
index fcc5cf7e70a..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/INSTALL
+++ /dev/null
@@ -1,85 +0,0 @@
-                          Installing GNU FreeFont
-                          =======================
-
-GNU FreeFont can be used in any modern operating system.
-
-This document explains how to install FreeFont on some common systems.
-
-UNIX/GNU/Linux/BSD Systems
---------------------------
-
-FreeFont works with any system using the free font rasterizer FreeType
-<http://www.freetype.org/>.
-
-* Debian GNU/Linux
-
-Users of Debian GNU/Linux system will probably want to use the Debian package,
-available from the Debian site, 
-
-	<http://packages.debian.org/unstable/x11/ttf-freefont.html>,
-
-or any of its mirrors.
-
-Install them by issuing the command
-	apt-get install ttf-freefont
-
-
-* KDE local installation
-
-Users of KDE can install .ttf files on a per-user basis using the KDE 
-Control Center module "kcmfontinst", which may appear in the menu as
-
-	Settings -> System Administration -> Font Installer
-
-This is especially helpful for developers and testers.
-
-
-* Generic X-windows
-
-	1) Fetch the freefont-ttf.tar.gz package with Free UCS outline fonts
-	   in the TrueType format.
-
-	2) Unpack TrueType fonts into a suitable directory,
-	   e.g. /usr/local/share/fonts/default/TrueType/
-
-	3) If you have chosen any other directory, make sure the directory you
-	   used to install the fonts is listed in the path searched by the X
-	   Font Server by editing the config file in /etc/X11/.
-
-	   In some systems, you list the directory in the item "catalogue="
-	   in the file /etc/X11/fs/config.
-
-	4) Run ttmkfdir in the directory where you unpacked the fonts.
-
-
-Windows 95/98/NT/2000/XP; Vista
--------------------------------
-
-Note that in at least Vista, XP and 2000, the OpenType versions perform much
-better than, and are recommended over, the TrueType ones.
-
-* Vista:
-	1) From the Start menu, open Control Panels
-	2) Drag-n-drop font files onto Fonts control panel
-           You may get a dialog saying
-        	"Windows needs your permission to continue"
-	   a) Click Continue
-
-* 95/98/NT:
-	The font installation is similar to Vista.
-
-	In order to use OpenType, users of Windows 95, 98 and NT 4.0 can
-	install Adobe's 'Type Manager Light'.  It is available for download
-	without cost from Adobe's web site.
-
-	Otherwise, use the TrueType versions.
-
-Mac OS X
---------
-
-Installing on Mac OS X consists of moving the .ttf files to either
-	/Library/Fonts/  or  ~/Library/Fonts/
-depending on whether they should be available to all users on your system
-or just to yourself.
-
---------------------------------------------------------------------------
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/README b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/README
deleted file mode 100644
index 82afafc0a81..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freefont-20090104/README
+++ /dev/null
@@ -1,107 +0,0 @@
--*-text-*-
-                          GNU FreeFont
-
-The GNU FreeFont project aims to provide a useful set of free scalable
-(i.e., OpenType) fonts covering as much as possible of the ISO 10646/Unicode
-UCS (Universal Character Set).
-
-Statement of Purpose
---------------------
-
-The practical reason for putting glyphs together in a single font face is
-to conveniently mix symbols and characters from different writing systems,
-without having to switch fonts.
-
-Coverage
---------
-
-FreeFont covers the following character sets
-
-* ISO 8859 parts 1-15
-* CEN MES-3 European Unicode Subset
-  http://www.evertype.com/standards/iso10646/pdf/cwa13873.pdf
-* IBM/Microsoft code pages 437, 850, 852, 1250, 1252 and more
-* Microsoft/Adobe Windows Glyph List 4 (WGL4)
-  http://www.microsoft.com/typography/otspec/WGL4.htm
-* KOI8-R and KOI8-RU
-* DEC VT100 graphics symbols
-* International Phonetic Alphabet
-* Arabic, Hebrew, Armenian, Georgian, Ethiopian and Thai alphabets,
-  including Arabic presentation forms A/B
-* mathematical symbols, including the whole TeX repertoire of symbols
-* APL symbols
-  etc.
-
-Editing
--------
-
-The free outline font editor, George Williams's FontForge
-<http://fontforge.sourceforge.net/> is used for editing the fonts.
-
-Design Issues
--------------
-
-Which font shapes should be made?  Historical style terms like Renaissance
-or Baroque letterforms cannot be applied beyond Latin/Cyrillic/Greek
-scripts to any greater extent than Kufi or Nashki can be applied beyond
-Arabic script; "italic" is really only meaningful for Latin letters. 
-
-However, most modern writing systems have typographic formulations for
-contrasting uniform and modulated character stroke widths, and have some
-history with "oblique", faces.  Since the advent of the typewriter, most
-have developed a typographic style with uniform-width characters.
-
-Accordingly, the FreeFont family has one monospaced - FreeMono - and two
-proportional faces (one with uniform stroke - FreeSans - and one with
-modulated stroke - FreeSerif).
-
-To make text from different writing systems look good side-by-side, each
-FreeFont face is meant to contain characters of similar style and weight.
-
-Licensing
----------
-
-Free UCS scalable fonts 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.
-
-The fonts are distributed in the hope that they will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-As a special exception, if you create a document which uses this font, and
-embed this font or unaltered portions of this font into the document, this
-font does not by itself cause the resulting document to be covered by the
-GNU General Public License. This exception does not however invalidate any
-other reasons why the document might be covered by the GNU General Public
-License. If you modify this font, you may extend this exception to your
-version of the font, but you are not obligated to do so.  If you do not
-wish to do so, delete this exception statement from your version.
-
-
-Files and their suffixes
-------------------------
-
-The files with .sfd (Spline Font Database) are in FontForge's native format. 
-Please use these if you plan to modify the font files.
-
-TrueType fonts for immediate consumption are the files with the .ttf
-(TrueType Font) suffix.  These are ready to use in Xwindows based
-systems using FreeType, on Mac OS, and on older Windows systems.
-
-OpenType fonts (with suffix .otf) are for use in Windows Vista. 
-Note that although they can be installed on Linux, but many applications
-in Linux still don't support them.
-
-
---------------------------------------------------------------------------
-Primoz Peterlin, <primoz.peterlin@biofiz.mf.uni-lj.si>
-Steve White <stevan.white@googlemail.com>
-
-Free UCS scalable fonts: http://savannah.gnu.org/projects/freefont/
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemono.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemono.php
deleted file mode 100644
index 5d45caebf50..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemono.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMono';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>40,'Flags'=>32,'FontBBox'=>'[-793 -200 699 800]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>600,33=>600,34=>600,35=>600,36=>600,37=>600,38=>600,39=>600,40=>600,41=>600,
-42=>600,43=>600,44=>600,45=>600,46=>600,47=>600,48=>600,49=>600,50=>600,51=>600,
-52=>600,53=>600,54=>600,55=>600,56=>600,57=>600,58=>600,59=>600,60=>600,61=>600,
-62=>600,63=>600,64=>600,65=>600,66=>600,67=>600,68=>600,69=>600,70=>600,71=>600,
-72=>600,73=>600,74=>600,75=>600,76=>600,77=>600,78=>600,79=>600,80=>600,81=>600,
-82=>600,83=>600,84=>600,85=>600,86=>600,87=>600,88=>600,89=>600,90=>600,91=>600,
-92=>600,93=>600,94=>600,95=>600,96=>600,97=>600,98=>600,99=>600,100=>600,101=>600,
-102=>600,103=>600,104=>600,105=>600,106=>600,107=>600,108=>600,109=>600,110=>600,111=>600,
-112=>600,113=>600,114=>600,115=>600,116=>600,117=>600,118=>600,119=>600,120=>600,121=>600,
-122=>600,123=>600,124=>600,125=>600,126=>600,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>600,160=>600,161=>600,162=>600,163=>600,164=>600,165=>600,166=>600,167=>600,
-168=>600,169=>600,170=>600,171=>600,172=>600,173=>600,174=>600,175=>600,176=>600,177=>600,
-178=>600,179=>600,180=>600,181=>600,182=>600,183=>600,184=>600,185=>600,186=>600,187=>600,
-188=>600,189=>600,190=>600,191=>600,192=>600,193=>600,194=>600,195=>600,196=>600,197=>600,
-198=>600,199=>600,200=>600,201=>600,202=>600,203=>600,204=>600,205=>600,206=>600,207=>600,
-208=>600,209=>600,210=>600,211=>600,212=>600,213=>600,214=>600,215=>600,216=>600,217=>600,
-218=>600,219=>600,220=>600,221=>600,222=>600,223=>600,224=>600,225=>600,226=>600,227=>600,
-228=>600,229=>600,230=>600,231=>600,232=>600,233=>600,234=>600,235=>600,236=>600,237=>600,
-238=>600,239=>600,240=>600,241=>600,242=>600,243=>600,244=>600,245=>600,246=>600,247=>600,
-248=>600,249=>600,250=>600,251=>600,252=>600,253=>600,254=>600,255=>600,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-597=>600,598=>600,599=>600,600=>600,601=>600,602=>600,603=>600,604=>600,605=>600,606=>600,
-607=>600,608=>600,609=>600,610=>600,611=>600,612=>600,613=>600,614=>600,615=>600,616=>600,
-617=>600,618=>600,619=>600,620=>600,621=>600,622=>600,623=>600,624=>600,625=>600,626=>600,
-627=>600,628=>600,629=>600,630=>600,631=>600,632=>600,633=>600,634=>600,635=>600,636=>600,
-637=>600,638=>600,639=>600,640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,646=>600,
-647=>600,648=>600,649=>600,650=>600,651=>600,652=>600,653=>600,654=>600,655=>600,656=>600,
-657=>600,658=>600,659=>600,660=>600,661=>600,662=>600,663=>600,664=>600,665=>600,666=>600,
-667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,673=>600,674=>600,675=>600,676=>600,
-677=>600,678=>600,679=>600,680=>600,681=>600,682=>600,683=>600,684=>600,685=>600,686=>600,
-687=>600,688=>600,689=>600,690=>600,691=>600,692=>600,693=>600,694=>600,695=>600,696=>600,
-697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,705=>600,706=>600,
-707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,716=>600,717=>600,
-718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,726=>600,727=>600,
-728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,736=>600,737=>600,738=>600,
-739=>600,740=>600,741=>600,742=>600,743=>600,744=>600,745=>600,746=>600,747=>600,748=>600,
-749=>600,750=>600,751=>600,752=>600,753=>600,754=>600,755=>600,756=>600,757=>600,758=>600,
-759=>600,760=>600,761=>600,762=>600,763=>600,764=>600,765=>600,766=>600,767=>600,768=>0,
-769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,
-779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,
-789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,
-799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,
-809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,
-829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,
-839=>0,840=>0,841=>0,843=>0,844=>0,845=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,884=>600,885=>600,890=>600,
-894=>600,900=>600,901=>600,902=>600,903=>600,904=>600,905=>600,906=>600,908=>600,910=>600,
-911=>600,912=>600,913=>600,914=>600,915=>600,916=>600,917=>600,918=>600,919=>600,920=>600,
-921=>600,922=>600,923=>600,924=>600,925=>600,926=>600,927=>600,928=>600,929=>600,931=>600,
-932=>600,933=>600,934=>600,935=>600,936=>600,937=>600,938=>600,939=>600,940=>600,941=>600,
-942=>600,943=>600,944=>600,945=>600,946=>600,947=>600,948=>600,949=>600,950=>600,951=>600,
-952=>600,953=>600,954=>600,955=>600,956=>600,957=>600,958=>600,959=>600,960=>600,961=>600,
-962=>600,963=>600,964=>600,965=>600,966=>600,967=>600,968=>600,969=>600,970=>600,971=>600,
-972=>600,973=>600,974=>600,976=>600,977=>600,978=>600,979=>600,980=>600,981=>600,982=>600,
-986=>600,987=>600,988=>600,1008=>600,1009=>600,1012=>600,1013=>600,1024=>600,1025=>600,1026=>600,
-1027=>600,1028=>600,1029=>600,1030=>600,1031=>600,1032=>600,1033=>600,1034=>600,1035=>600,1036=>600,
-1037=>600,1038=>600,1039=>600,1040=>600,1041=>600,1042=>600,1043=>600,1044=>600,1045=>600,1046=>600,
-1047=>600,1048=>600,1049=>600,1050=>600,1051=>600,1052=>600,1053=>600,1054=>600,1055=>600,1056=>600,
-1057=>600,1058=>600,1059=>600,1060=>600,1061=>600,1062=>600,1063=>600,1064=>600,1065=>600,1066=>600,
-1067=>600,1068=>600,1069=>600,1070=>600,1071=>600,1072=>600,1073=>600,1074=>600,1075=>600,1076=>600,
-1077=>600,1078=>600,1079=>600,1080=>600,1081=>600,1082=>600,1083=>600,1084=>600,1085=>600,1086=>600,
-1087=>600,1088=>600,1089=>600,1090=>600,1091=>600,1092=>600,1093=>600,1094=>600,1095=>600,1096=>600,
-1097=>600,1098=>600,1099=>600,1100=>600,1101=>600,1102=>600,1103=>600,1104=>600,1105=>600,1106=>600,
-1107=>600,1108=>600,1109=>600,1110=>600,1111=>600,1112=>600,1113=>600,1114=>600,1115=>600,1116=>600,
-1117=>600,1118=>600,1119=>600,1120=>600,1121=>600,1122=>600,1123=>600,1124=>600,1126=>600,1127=>600,
-1128=>600,1130=>600,1131=>600,1132=>600,1133=>600,1136=>600,1137=>600,1138=>600,1140=>600,1141=>600,
-1142=>600,1143=>600,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1162=>600,1163=>600,1164=>600,
-1165=>600,1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,1171=>600,1172=>600,1173=>600,1174=>600,
-1175=>600,1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,1181=>600,1182=>600,1183=>600,1184=>600,
-1185=>600,1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,1191=>600,1192=>600,1193=>600,1194=>600,
-1195=>600,1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,1201=>600,1202=>600,1203=>600,1204=>600,
-1205=>600,1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,1211=>600,1212=>600,1213=>600,1214=>600,
-1215=>600,1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,1221=>600,1222=>600,1223=>600,1224=>600,
-1225=>600,1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,1231=>600,1232=>600,1233=>600,1234=>600,
-1235=>600,1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,1241=>600,1242=>600,1243=>600,1244=>600,
-1245=>600,1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,1251=>600,1252=>600,1253=>600,1254=>600,
-1255=>600,1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,1261=>600,1262=>600,1263=>600,1264=>600,
-1265=>600,1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,1271=>600,1272=>600,1273=>600,1296=>600,
-1297=>600,1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,1309=>600,1310=>600,1311=>600,1329=>600,
-1330=>600,1331=>600,1332=>600,1333=>600,1334=>600,1335=>600,1336=>600,1337=>600,1338=>600,1339=>600,
-1340=>600,1341=>600,1342=>600,1343=>600,1344=>600,1345=>600,1346=>600,1347=>600,1348=>600,1349=>600,
-1350=>600,1351=>600,1352=>600,1353=>600,1354=>600,1355=>600,1356=>600,1357=>600,1358=>600,1359=>600,
-1360=>600,1361=>600,1362=>600,1363=>600,1364=>600,1365=>600,1366=>600,1369=>600,1370=>600,1371=>600,
-1372=>600,1373=>600,1374=>600,1375=>600,1377=>600,1378=>600,1379=>600,1380=>600,1381=>600,1382=>600,
-1383=>600,1384=>600,1385=>600,1386=>600,1387=>600,1388=>600,1389=>600,1390=>600,1391=>600,1392=>600,
-1393=>600,1394=>600,1395=>600,1396=>600,1397=>600,1398=>600,1399=>600,1400=>600,1401=>600,1402=>600,
-1403=>600,1404=>600,1405=>600,1406=>600,1407=>600,1408=>600,1409=>600,1410=>600,1411=>600,1412=>600,
-1413=>600,1414=>600,1415=>600,1417=>600,1418=>600,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,
-1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,1470=>600,1471=>0,
-1472=>600,1473=>0,1474=>0,1475=>600,1476=>0,1488=>600,1489=>600,1490=>600,1491=>600,1492=>600,
-1493=>600,1494=>600,1495=>600,1496=>600,1497=>600,1498=>600,1499=>600,1500=>600,1501=>600,1502=>600,
-1503=>600,1504=>600,1505=>600,1506=>600,1507=>600,1508=>600,1509=>600,1510=>600,1511=>600,1512=>600,
-1513=>600,1514=>600,1520=>600,1521=>600,1522=>600,1523=>600,1524=>600,4304=>600,4305=>600,4306=>600,
-4307=>600,4308=>600,4309=>600,4310=>600,4311=>600,4312=>600,4313=>600,4314=>600,4315=>600,4316=>600,
-4317=>600,4318=>600,4319=>600,4320=>600,4321=>600,4322=>600,4323=>600,4324=>600,4325=>600,4326=>600,
-4327=>600,4328=>600,4329=>600,4330=>600,4331=>600,4332=>600,4333=>600,4334=>600,4335=>600,4336=>600,
-4337=>600,4338=>600,4339=>600,4340=>600,4341=>600,4345=>600,4347=>600,5792=>600,5793=>600,5794=>600,
-5795=>600,5796=>600,5797=>600,5798=>600,5799=>600,5800=>600,5801=>600,5802=>600,5803=>600,5804=>600,
-5805=>600,5806=>600,5807=>600,5808=>600,5809=>600,5810=>600,5811=>600,5812=>600,5813=>600,5814=>600,
-5815=>600,5816=>600,5817=>600,5818=>600,5819=>600,5820=>600,5821=>600,5822=>600,5823=>600,5824=>600,
-5825=>600,5826=>600,5827=>600,5828=>600,5829=>600,5830=>600,5831=>600,5832=>600,5833=>600,5834=>600,
-5835=>600,5836=>600,5837=>600,5838=>600,5839=>600,5840=>600,5841=>600,5842=>600,5843=>600,5844=>600,
-5845=>600,5846=>600,5847=>600,5848=>600,5849=>600,5850=>600,5851=>600,5852=>600,5853=>600,5854=>600,
-5855=>600,5856=>600,5857=>600,5858=>600,5859=>600,5860=>600,5861=>600,5862=>600,5863=>600,5864=>600,
-5865=>600,5866=>600,5867=>600,5868=>600,5869=>600,5870=>600,5871=>600,5872=>600,7680=>600,7681=>600,
-7682=>600,7683=>600,7684=>600,7685=>600,7686=>600,7687=>600,7688=>600,7689=>600,7690=>600,7691=>600,
-7692=>600,7693=>600,7694=>600,7695=>600,7696=>600,7697=>600,7698=>600,7699=>600,7700=>600,7701=>600,
-7702=>600,7703=>600,7704=>600,7705=>600,7706=>600,7707=>600,7708=>600,7709=>600,7710=>600,7711=>600,
-7712=>600,7713=>600,7714=>600,7715=>600,7716=>600,7717=>600,7718=>600,7719=>600,7720=>600,7721=>600,
-7722=>600,7723=>600,7724=>600,7725=>600,7726=>600,7727=>600,7728=>600,7729=>600,7730=>600,7731=>600,
-7732=>600,7733=>600,7734=>600,7735=>600,7736=>600,7737=>600,7738=>600,7739=>600,7740=>600,7741=>600,
-7742=>600,7743=>600,7744=>600,7745=>600,7746=>600,7747=>600,7748=>600,7749=>600,7750=>600,7751=>600,
-7752=>600,7753=>600,7754=>600,7755=>600,7756=>600,7757=>600,7758=>600,7759=>600,7760=>600,7761=>600,
-7762=>600,7763=>600,7764=>600,7765=>600,7766=>600,7767=>600,7768=>600,7769=>600,7770=>600,7771=>600,
-7772=>600,7773=>600,7774=>600,7775=>600,7776=>600,7777=>600,7778=>600,7779=>600,7780=>600,7781=>600,
-7782=>600,7783=>600,7784=>600,7785=>600,7786=>600,7787=>600,7788=>600,7789=>600,7790=>600,7791=>600,
-7792=>600,7793=>600,7794=>600,7795=>600,7796=>600,7797=>600,7798=>600,7799=>600,7800=>600,7801=>600,
-7802=>600,7803=>600,7804=>600,7805=>600,7806=>600,7807=>600,7808=>600,7809=>600,7810=>600,7811=>600,
-7812=>600,7813=>600,7814=>600,7815=>600,7816=>600,7817=>600,7818=>600,7819=>600,7820=>600,7821=>600,
-7822=>600,7823=>600,7824=>600,7825=>600,7826=>600,7827=>600,7828=>600,7829=>600,7830=>600,7831=>600,
-7832=>600,7833=>600,7834=>600,7835=>600,7840=>600,7841=>600,7842=>600,7843=>600,7844=>600,7845=>600,
-7846=>600,7847=>600,7848=>600,7849=>600,7850=>600,7851=>600,7852=>600,7853=>600,7854=>600,7855=>600,
-7856=>600,7857=>600,7858=>600,7859=>600,7860=>600,7861=>600,7862=>600,7863=>600,7864=>600,7865=>600,
-7866=>600,7867=>600,7868=>600,7869=>600,7870=>600,7871=>600,7872=>600,7873=>600,7874=>600,7875=>600,
-7876=>600,7877=>600,7878=>600,7879=>600,7880=>600,7881=>600,7882=>600,7883=>600,7884=>600,7885=>600,
-7886=>600,7887=>600,7888=>600,7889=>600,7890=>600,7891=>600,7892=>600,7893=>600,7894=>600,7895=>600,
-7896=>600,7897=>600,7898=>600,7899=>600,7900=>600,7901=>600,7902=>600,7903=>600,7904=>600,7905=>600,
-7906=>600,7907=>600,7908=>600,7909=>600,7910=>600,7911=>600,7912=>600,7913=>600,7914=>600,7915=>600,
-7916=>600,7917=>600,7918=>600,7919=>600,7920=>600,7921=>600,7922=>600,7923=>600,7924=>600,7925=>600,
-7926=>600,7927=>600,7928=>600,7929=>600,7936=>600,7937=>600,7938=>600,7939=>600,7940=>600,7941=>600,
-7942=>600,7943=>600,7944=>600,7945=>600,7946=>600,7947=>600,7948=>600,7949=>600,7950=>600,7951=>600,
-7952=>600,7953=>600,7954=>600,7955=>600,7956=>600,7957=>600,7960=>600,7961=>600,7962=>600,7963=>600,
-7964=>600,7965=>600,7968=>600,7969=>600,7970=>600,7971=>600,7972=>600,7973=>600,7974=>600,7975=>600,
-7976=>600,7977=>600,7978=>600,7979=>600,7980=>600,7981=>600,7982=>600,7983=>600,7984=>600,7985=>600,
-7986=>600,7987=>600,7988=>600,7989=>600,7990=>600,7991=>600,7992=>600,7993=>600,7994=>600,7995=>600,
-7996=>600,7997=>600,7998=>600,7999=>600,8000=>600,8001=>600,8002=>600,8003=>600,8004=>600,8005=>600,
-8008=>600,8009=>600,8010=>600,8011=>600,8012=>600,8013=>600,8016=>600,8017=>600,8018=>600,8019=>600,
-8020=>600,8021=>600,8022=>600,8023=>600,8025=>600,8027=>600,8029=>600,8031=>600,8032=>600,8033=>600,
-8034=>600,8035=>600,8036=>600,8037=>600,8038=>600,8039=>600,8040=>600,8041=>600,8042=>600,8043=>600,
-8044=>600,8045=>600,8046=>600,8047=>600,8048=>600,8049=>600,8050=>600,8051=>600,8052=>600,8053=>600,
-8054=>600,8055=>600,8056=>600,8057=>600,8058=>600,8059=>600,8060=>600,8061=>600,8064=>600,8065=>600,
-8066=>600,8067=>600,8068=>600,8069=>600,8070=>600,8071=>600,8072=>600,8073=>600,8074=>600,8075=>600,
-8076=>600,8077=>600,8078=>600,8079=>600,8080=>600,8081=>600,8082=>600,8083=>600,8084=>600,8085=>600,
-8086=>600,8087=>600,8088=>600,8089=>600,8090=>600,8091=>600,8092=>600,8093=>600,8094=>600,8095=>600,
-8096=>600,8097=>600,8098=>600,8099=>600,8100=>600,8101=>600,8102=>600,8103=>600,8104=>600,8105=>600,
-8106=>600,8107=>600,8108=>600,8109=>600,8110=>600,8111=>600,8112=>600,8113=>600,8114=>600,8115=>600,
-8116=>600,8118=>600,8119=>600,8120=>600,8121=>600,8122=>600,8123=>600,8124=>600,8125=>600,8126=>600,
-8127=>600,8128=>600,8129=>600,8130=>600,8131=>600,8132=>600,8134=>600,8135=>600,8136=>600,8137=>600,
-8138=>600,8139=>600,8140=>600,8141=>600,8142=>600,8143=>600,8144=>600,8145=>600,8146=>600,8147=>600,
-8150=>600,8151=>600,8152=>600,8153=>600,8154=>600,8155=>600,8157=>600,8158=>600,8159=>600,8160=>600,
-8161=>600,8162=>600,8163=>600,8164=>600,8165=>600,8166=>600,8167=>600,8168=>600,8169=>600,8170=>600,
-8171=>600,8172=>600,8173=>600,8174=>600,8175=>600,8178=>600,8179=>600,8180=>600,8182=>600,8183=>600,
-8184=>600,8185=>600,8186=>600,8187=>600,8188=>600,8189=>600,8190=>600,8192=>600,8193=>600,8194=>600,
-8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,8202=>600,8203=>600,8204=>0,
-8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,8214=>600,8215=>600,8219=>600,
-8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,8234=>600,8235=>600,8236=>600,
-8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,8245=>600,8246=>600,8247=>600,
-8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,8257=>600,8258=>600,8259=>600,
-8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,8267=>600,8268=>600,8269=>600,
-8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,8277=>600,8278=>600,8279=>600,
-8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,8287=>600,8288=>600,8289=>600,
-8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,8302=>600,8303=>600,8304=>600,
-8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,8314=>600,8315=>600,8316=>600,
-8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,8324=>600,8325=>600,8326=>600,
-8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,8334=>600,8336=>600,8337=>600,
-8338=>600,8339=>600,8340=>600,8353=>600,8354=>600,8355=>600,8356=>600,8357=>600,8358=>600,8359=>600,
-8360=>600,8361=>600,8362=>600,8363=>600,8365=>600,8366=>600,8368=>600,8369=>600,8370=>600,8371=>600,
-8372=>600,8373=>600,8400=>0,8401=>0,8402=>0,8406=>0,8407=>0,8411=>0,8412=>0,8413=>0,
-8414=>0,8415=>0,8416=>0,8417=>0,8418=>0,8419=>0,8428=>0,8429=>0,8430=>0,8431=>0,
-8448=>600,8449=>600,8450=>600,8451=>600,8453=>600,8454=>600,8455=>600,8457=>600,8461=>600,8463=>600,
-8464=>600,8465=>600,8466=>600,8467=>600,8468=>600,8469=>600,8470=>600,8471=>600,8472=>600,8473=>600,
-8474=>600,8476=>600,8477=>600,8478=>600,8481=>600,8484=>600,8486=>600,8487=>600,8489=>600,8490=>600,
-8491=>600,8498=>600,8501=>600,8502=>600,8503=>600,8504=>600,8505=>600,8506=>600,8507=>600,8523=>600,
-8526=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,8536=>600,8537=>600,8538=>600,8539=>600,
-8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,8546=>600,8547=>600,8548=>600,8549=>600,
-8550=>600,8551=>600,8552=>600,8553=>600,8554=>600,8555=>600,8556=>600,8557=>600,8558=>600,8559=>600,
-8560=>600,8561=>600,8562=>600,8563=>600,8564=>600,8565=>600,8566=>600,8567=>600,8568=>600,8569=>600,
-8570=>600,8571=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,8595=>600,
-8596=>600,8597=>600,8598=>600,8599=>600,8600=>600,8601=>600,8602=>600,8603=>600,8604=>600,8605=>600,
-8606=>600,8607=>600,8608=>600,8609=>600,8610=>600,8611=>600,8612=>600,8613=>600,8614=>600,8615=>600,
-8616=>600,8617=>600,8618=>600,8619=>600,8620=>600,8621=>600,8622=>600,8623=>600,8624=>600,8625=>600,
-8626=>600,8627=>600,8628=>600,8629=>600,8630=>600,8631=>600,8632=>600,8633=>600,8634=>600,8635=>600,
-8636=>600,8637=>600,8638=>600,8639=>600,8640=>600,8641=>600,8642=>600,8643=>600,8644=>600,8645=>600,
-8646=>600,8647=>600,8648=>600,8649=>600,8650=>600,8651=>600,8652=>600,8653=>600,8654=>600,8655=>600,
-8656=>600,8657=>600,8658=>600,8659=>600,8660=>600,8661=>600,8669=>600,8678=>600,8679=>600,8680=>600,
-8681=>600,8691=>600,8704=>600,8705=>600,8706=>600,8707=>600,8708=>600,8709=>600,8710=>600,8711=>600,
-8712=>600,8713=>600,8714=>600,8715=>600,8716=>600,8717=>600,8718=>600,8719=>600,8720=>600,8721=>600,
-8722=>600,8723=>600,8724=>600,8725=>600,8726=>600,8727=>600,8728=>600,8729=>600,8730=>600,8731=>600,
-8732=>600,8733=>600,8734=>600,8735=>600,8736=>600,8737=>600,8738=>600,8739=>600,8740=>600,8741=>600,
-8742=>600,8743=>600,8744=>600,8745=>600,8746=>600,8747=>600,8748=>600,8749=>600,8750=>600,8751=>600,
-8752=>600,8754=>600,8755=>600,8756=>600,8757=>600,8758=>600,8759=>600,8760=>600,8761=>600,8762=>600,
-8763=>600,8764=>600,8765=>600,8768=>600,8769=>600,8770=>600,8771=>600,8772=>600,8773=>600,8774=>600,
-8775=>600,8776=>600,8777=>600,8778=>600,8779=>600,8780=>600,8781=>600,8784=>600,8785=>600,8786=>600,
-8787=>600,8788=>600,8789=>600,8790=>600,8791=>600,8792=>600,8793=>600,8794=>600,8795=>600,8796=>600,
-8797=>600,8798=>600,8799=>600,8800=>600,8801=>600,8802=>600,8803=>600,8804=>600,8805=>600,8806=>600,
-8807=>600,8808=>600,8809=>600,8810=>600,8811=>600,8812=>600,8813=>600,8814=>600,8815=>600,8816=>600,
-8817=>600,8818=>600,8819=>600,8820=>600,8821=>600,8822=>600,8823=>600,8824=>600,8825=>600,8826=>600,
-8827=>600,8828=>600,8829=>600,8830=>600,8831=>600,8832=>600,8833=>600,8834=>600,8835=>600,8836=>600,
-8837=>600,8838=>600,8839=>600,8840=>600,8841=>600,8842=>600,8843=>600,8844=>600,8845=>600,8846=>600,
-8847=>600,8848=>600,8849=>600,8850=>600,8851=>600,8852=>600,8853=>600,8854=>600,8855=>600,8856=>600,
-8857=>600,8858=>600,8859=>600,8860=>600,8861=>600,8862=>600,8863=>600,8866=>600,8867=>600,8868=>600,
-8869=>600,8870=>600,8871=>600,8872=>600,8873=>600,8874=>600,8875=>600,8876=>600,8877=>600,8878=>600,
-8879=>600,8882=>600,8883=>600,8884=>600,8885=>600,8891=>600,8892=>600,8893=>600,8894=>600,8896=>600,
-8897=>600,8898=>600,8899=>600,8900=>600,8901=>600,8902=>600,8903=>600,8904=>600,8909=>600,8910=>600,
-8911=>600,8912=>600,8913=>600,8914=>600,8915=>600,8924=>600,8925=>600,8926=>600,8927=>600,8928=>600,
-8929=>600,8930=>600,8931=>600,8938=>600,8939=>600,8940=>600,8941=>600,8942=>600,8943=>600,8944=>600,
-8945=>600,8960=>600,8962=>600,8963=>600,8964=>600,8965=>600,8966=>600,8968=>600,8969=>600,8970=>600,
-8971=>600,8972=>600,8973=>600,8974=>600,8975=>600,8976=>600,8978=>600,8980=>600,8981=>600,8984=>600,
-8985=>600,8988=>600,8989=>600,8990=>600,8991=>600,8992=>600,8993=>600,8994=>600,8995=>600,8996=>600,
-8997=>600,8998=>600,8999=>600,9001=>600,9002=>600,9003=>600,9004=>600,9014=>600,9015=>600,9016=>600,
-9017=>600,9018=>600,9019=>600,9020=>600,9021=>600,9022=>600,9023=>600,9024=>600,9025=>600,9026=>600,
-9027=>600,9028=>600,9029=>600,9030=>600,9031=>600,9032=>600,9033=>600,9034=>600,9035=>600,9036=>600,
-9037=>600,9038=>600,9039=>600,9040=>600,9041=>600,9042=>600,9043=>600,9044=>600,9045=>600,9046=>600,
-9047=>600,9048=>600,9049=>600,9050=>600,9051=>600,9052=>600,9053=>600,9054=>600,9055=>600,9056=>600,
-9057=>600,9058=>600,9059=>600,9060=>600,9061=>600,9062=>600,9063=>600,9064=>600,9065=>600,9066=>600,
-9067=>600,9068=>600,9069=>600,9070=>600,9071=>600,9072=>600,9073=>600,9074=>600,9075=>600,9076=>600,
-9077=>600,9078=>600,9079=>600,9080=>600,9081=>600,9082=>600,9084=>600,9085=>600,9086=>600,9087=>600,
-9088=>600,9089=>600,9090=>600,9091=>600,9092=>600,9093=>600,9094=>600,9095=>600,9096=>600,9097=>600,
-9098=>600,9099=>600,9100=>600,9101=>600,9102=>600,9103=>600,9104=>600,9105=>600,9106=>600,9107=>600,
-9108=>600,9109=>600,9110=>600,9111=>600,9112=>600,9113=>600,9114=>600,9115=>600,9116=>600,9117=>600,
-9118=>600,9119=>600,9120=>600,9121=>600,9122=>600,9123=>600,9124=>600,9125=>600,9126=>600,9127=>600,
-9128=>600,9129=>600,9130=>600,9131=>600,9132=>600,9133=>600,9134=>600,9135=>600,9136=>600,9137=>600,
-9138=>600,9139=>600,9140=>600,9141=>600,9142=>600,9143=>600,9146=>600,9147=>600,9148=>600,9149=>600,
-9150=>600,9151=>600,9152=>600,9153=>600,9154=>600,9155=>600,9156=>600,9157=>600,9158=>600,9159=>600,
-9160=>600,9161=>600,9162=>600,9163=>600,9164=>600,9165=>600,9166=>600,9167=>600,9178=>600,9179=>600,
-9182=>600,9183=>600,9186=>600,9187=>600,9188=>600,9189=>600,9190=>600,9251=>600,9280=>600,9281=>600,
-9282=>600,9283=>600,9284=>600,9285=>600,9286=>600,9287=>600,9288=>600,9289=>600,9290=>600,9312=>600,
-9313=>600,9314=>600,9315=>600,9316=>600,9317=>600,9318=>600,9319=>600,9320=>600,9321=>600,9472=>600,
-9473=>600,9474=>600,9475=>600,9476=>600,9477=>600,9478=>600,9479=>600,9480=>600,9481=>600,9482=>600,
-9483=>600,9484=>600,9485=>600,9486=>600,9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,
-9493=>600,9494=>600,9495=>600,9496=>600,9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,
-9503=>600,9504=>600,9505=>600,9506=>600,9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,9512=>600,
-9513=>600,9514=>600,9515=>600,9516=>600,9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,
-9523=>600,9524=>600,9525=>600,9526=>600,9527=>600,9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,
-9533=>600,9534=>600,9535=>600,9536=>600,9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,
-9543=>600,9544=>600,9545=>600,9546=>600,9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,
-9553=>600,9554=>600,9555=>600,9556=>600,9557=>600,9558=>600,9559=>600,9560=>600,9561=>600,9562=>600,
-9563=>600,9564=>600,9565=>600,9566=>600,9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,
-9573=>600,9574=>600,9575=>600,9576=>600,9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,
-9583=>600,9584=>600,9585=>600,9586=>600,9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,9592=>600,
-9593=>600,9594=>600,9595=>600,9596=>600,9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,
-9603=>600,9604=>600,9605=>600,9606=>600,9607=>600,9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,
-9613=>600,9614=>600,9615=>600,9616=>600,9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9622=>600,
-9623=>600,9624=>600,9625=>600,9626=>600,9627=>600,9628=>600,9629=>600,9630=>600,9631=>600,9632=>600,
-9633=>600,9634=>600,9635=>600,9636=>600,9637=>600,9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,
-9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,9648=>600,9649=>600,9650=>600,9651=>600,9652=>600,
-9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,9658=>600,9659=>600,9660=>600,9661=>600,9662=>600,
-9663=>600,9664=>600,9665=>600,9666=>600,9667=>600,9668=>600,9669=>600,9670=>600,9671=>600,9672=>600,
-9673=>600,9674=>600,9675=>600,9676=>600,9677=>600,9678=>600,9679=>600,9680=>600,9681=>600,9682=>600,
-9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9690=>600,9691=>600,9692=>600,
-9693=>600,9694=>600,9695=>600,9696=>600,9697=>600,9698=>600,9699=>600,9700=>600,9701=>600,9702=>600,
-9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,9710=>600,9711=>600,9712=>600,
-9713=>600,9714=>600,9715=>600,9716=>600,9717=>600,9718=>600,9719=>600,9720=>600,9721=>600,9722=>600,
-9723=>600,9724=>600,9725=>600,9726=>600,9727=>600,9728=>600,9729=>600,9730=>600,9731=>600,9733=>600,
-9734=>600,9735=>600,9736=>600,9737=>600,9744=>600,9745=>600,9746=>600,9754=>600,9755=>600,9756=>600,
-9757=>600,9758=>600,9759=>600,9766=>600,9768=>600,9769=>600,9774=>600,9775=>600,9776=>600,9777=>600,
-9778=>600,9779=>600,9780=>600,9781=>600,9782=>600,9783=>600,9785=>600,9786=>600,9787=>600,9788=>600,
-9789=>600,9790=>600,9791=>600,9792=>600,9793=>600,9794=>600,9795=>600,9796=>600,9797=>600,9798=>600,
-9799=>600,9800=>600,9801=>600,9802=>600,9803=>600,9804=>600,9805=>600,9806=>600,9807=>600,9808=>600,
-9809=>600,9810=>600,9811=>600,9824=>600,9825=>600,9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,
-9831=>600,9833=>600,9834=>600,9835=>600,9836=>600,9837=>600,9838=>600,9839=>600,9856=>600,9857=>600,
-9858=>600,9859=>600,9860=>600,9861=>600,10176=>600,10177=>600,10178=>600,10179=>600,10180=>600,10181=>600,
-10182=>600,10183=>600,10184=>600,10185=>600,10186=>600,10188=>600,10192=>600,10193=>600,10194=>600,10195=>600,
-10196=>600,10197=>600,10198=>600,10199=>600,10212=>600,10213=>600,10214=>600,10215=>600,10216=>600,10217=>600,
-10218=>600,10219=>600,10226=>600,10227=>600,10229=>600,10230=>600,10231=>600,10232=>600,10233=>600,10234=>600,
-10235=>600,10236=>600,10240=>600,10241=>600,10242=>600,10243=>600,10244=>600,10245=>600,10246=>600,10247=>600,
-10248=>600,10249=>600,10250=>600,10251=>600,10252=>600,10253=>600,10254=>600,10255=>600,10256=>600,10257=>600,
-10258=>600,10259=>600,10260=>600,10261=>600,10262=>600,10263=>600,10264=>600,10265=>600,10266=>600,10267=>600,
-10268=>600,10269=>600,10270=>600,10271=>600,10272=>600,10273=>600,10274=>600,10275=>600,10276=>600,10277=>600,
-10278=>600,10279=>600,10280=>600,10281=>600,10282=>600,10283=>600,10284=>600,10285=>600,10286=>600,10287=>600,
-10288=>600,10289=>600,10290=>600,10291=>600,10292=>600,10293=>600,10294=>600,10295=>600,10296=>600,10297=>600,
-10298=>600,10299=>600,10300=>600,10301=>600,10302=>600,10303=>600,10304=>600,10305=>600,10306=>600,10307=>600,
-10308=>600,10309=>600,10310=>600,10311=>600,10312=>600,10313=>600,10314=>600,10315=>600,10316=>600,10317=>600,
-10318=>600,10319=>600,10320=>600,10321=>600,10322=>600,10323=>600,10324=>600,10325=>600,10326=>600,10327=>600,
-10328=>600,10329=>600,10330=>600,10331=>600,10332=>600,10333=>600,10334=>600,10335=>600,10336=>600,10337=>600,
-10338=>600,10339=>600,10340=>600,10341=>600,10342=>600,10343=>600,10344=>600,10345=>600,10346=>600,10347=>600,
-10348=>600,10349=>600,10350=>600,10351=>600,10352=>600,10353=>600,10354=>600,10355=>600,10356=>600,10357=>600,
-10358=>600,10359=>600,10360=>600,10361=>600,10362=>600,10363=>600,10364=>600,10365=>600,10366=>600,10367=>600,
-10368=>600,10369=>600,10370=>600,10371=>600,10372=>600,10373=>600,10374=>600,10375=>600,10376=>600,10377=>600,
-10378=>600,10379=>600,10380=>600,10381=>600,10382=>600,10383=>600,10384=>600,10385=>600,10386=>600,10387=>600,
-10388=>600,10389=>600,10390=>600,10391=>600,10392=>600,10393=>600,10394=>600,10395=>600,10396=>600,10397=>600,
-10398=>600,10399=>600,10400=>600,10401=>600,10402=>600,10403=>600,10404=>600,10405=>600,10406=>600,10407=>600,
-10408=>600,10409=>600,10410=>600,10411=>600,10412=>600,10413=>600,10414=>600,10415=>600,10416=>600,10417=>600,
-10418=>600,10419=>600,10420=>600,10421=>600,10422=>600,10423=>600,10424=>600,10425=>600,10426=>600,10427=>600,
-10428=>600,10429=>600,10430=>600,10431=>600,10432=>600,10433=>600,10434=>600,10435=>600,10436=>600,10437=>600,
-10438=>600,10439=>600,10440=>600,10441=>600,10442=>600,10443=>600,10444=>600,10445=>600,10446=>600,10447=>600,
-10448=>600,10449=>600,10450=>600,10451=>600,10452=>600,10453=>600,10454=>600,10455=>600,10456=>600,10457=>600,
-10458=>600,10459=>600,10460=>600,10461=>600,10462=>600,10463=>600,10464=>600,10465=>600,10466=>600,10467=>600,
-10468=>600,10469=>600,10470=>600,10471=>600,10472=>600,10473=>600,10474=>600,10475=>600,10476=>600,10477=>600,
-10478=>600,10479=>600,10480=>600,10481=>600,10482=>600,10483=>600,10484=>600,10485=>600,10486=>600,10487=>600,
-10488=>600,10489=>600,10490=>600,10491=>600,10492=>600,10493=>600,10494=>600,10495=>600,10752=>600,10753=>600,
-10754=>600,10755=>600,10756=>600,10757=>600,10758=>600,10781=>600,10815=>600,11008=>600,11009=>600,11010=>600,
-11011=>600,11012=>600,11013=>600,11014=>600,11015=>600,11016=>600,11017=>600,11018=>600,11019=>600,11020=>600,
-11021=>600,11026=>600,11027=>600,11028=>600,11029=>600,11030=>600,11031=>600,11032=>600,11033=>600,11035=>600,
-11036=>600,11037=>600,11038=>600,11039=>600,11040=>600,11041=>600,11042=>600,11043=>600,11044=>600,11045=>600,
-11046=>600,11047=>600,11048=>600,11049=>600,11050=>600,11051=>600,11091=>600,11092=>600,64256=>600,64257=>600,
-64258=>600,64259=>600,64260=>600,64261=>600,64285=>600,64286=>600,64287=>600,64288=>600,64289=>600,64290=>600,
-64291=>600,64292=>600,64293=>600,64294=>600,64295=>600,64296=>600,64297=>600,64298=>600,64299=>600,64300=>600,
-64301=>600,64302=>600,64303=>600,64304=>600,64305=>600,64306=>600,64307=>600,64308=>600,64309=>600,64310=>600,
-64312=>600,64313=>600,64314=>600,64315=>600,64316=>600,64318=>600,64320=>600,64321=>600,64323=>600,64324=>600,
-64326=>600,64327=>600,64328=>600,64329=>600,64330=>600,64331=>600,64332=>600,64333=>600,64334=>600,64335=>600,
-65533=>600);
-$enc='';
-$diff='';
-$file='freemono.z';
-$ctg='freemono.ctg.z';
-$originalsize=314348;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonob.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonob.php
deleted file mode 100644
index 83f454ec217..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonob.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMonoBold';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>10,'Flags'=>32,'FontBBox'=>'[-604 -200 754 800]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>600,33=>600,34=>600,35=>600,36=>600,37=>600,38=>600,39=>600,40=>600,41=>600,
-42=>600,43=>600,44=>600,45=>600,46=>600,47=>600,48=>600,49=>600,50=>600,51=>600,
-52=>600,53=>600,54=>600,55=>600,56=>600,57=>600,58=>600,59=>600,60=>600,61=>600,
-62=>600,63=>600,64=>600,65=>600,66=>600,67=>600,68=>600,69=>600,70=>600,71=>600,
-72=>600,73=>600,74=>600,75=>600,76=>600,77=>600,78=>600,79=>600,80=>600,81=>600,
-82=>600,83=>600,84=>600,85=>600,86=>600,87=>600,88=>600,89=>600,90=>600,91=>600,
-92=>600,93=>600,94=>600,95=>600,96=>600,97=>600,98=>600,99=>600,100=>600,101=>600,
-102=>600,103=>600,104=>600,105=>600,106=>600,107=>600,108=>600,109=>600,110=>600,111=>600,
-112=>600,113=>600,114=>600,115=>600,116=>600,117=>600,118=>600,119=>600,120=>600,121=>600,
-122=>600,123=>600,124=>600,125=>600,126=>600,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>600,160=>600,161=>600,162=>600,163=>600,164=>600,165=>600,166=>600,167=>600,
-168=>600,169=>600,170=>600,171=>600,172=>600,173=>600,174=>600,175=>600,176=>600,177=>600,
-178=>600,179=>600,180=>600,181=>600,182=>600,183=>600,184=>600,185=>600,186=>600,187=>600,
-188=>600,189=>600,190=>600,191=>600,192=>600,193=>600,194=>600,195=>600,196=>600,197=>600,
-198=>600,199=>600,200=>600,201=>600,202=>600,203=>600,204=>600,205=>600,206=>600,207=>600,
-208=>600,209=>600,210=>600,211=>600,212=>600,213=>600,214=>600,215=>600,216=>600,217=>600,
-218=>600,219=>600,220=>600,221=>600,222=>600,223=>600,224=>600,225=>600,226=>600,227=>600,
-228=>600,229=>600,230=>600,231=>600,232=>600,233=>600,234=>600,235=>600,236=>600,237=>600,
-238=>600,239=>600,240=>600,241=>600,242=>600,243=>600,244=>600,245=>600,246=>600,247=>600,
-248=>600,249=>600,250=>600,251=>600,252=>600,253=>600,254=>600,255=>600,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-598=>600,599=>600,600=>600,601=>600,603=>600,604=>600,607=>600,608=>600,609=>600,613=>600,
-614=>600,615=>600,616=>600,617=>600,618=>600,619=>600,621=>600,623=>600,624=>600,625=>600,
-626=>600,627=>600,628=>600,629=>600,633=>600,634=>600,635=>600,636=>600,637=>600,638=>600,
-639=>600,640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,647=>600,648=>600,649=>600,
-652=>600,653=>600,654=>600,656=>600,657=>600,658=>600,659=>600,660=>600,661=>600,662=>600,
-663=>600,664=>600,665=>600,666=>600,667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,
-673=>600,674=>600,688=>600,689=>600,690=>600,691=>600,692=>600,693=>600,694=>600,695=>600,
-696=>600,697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,705=>600,
-706=>600,707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,716=>600,
-717=>600,718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,726=>600,
-727=>600,728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,736=>600,737=>600,
-738=>600,739=>600,740=>600,741=>600,742=>600,743=>600,744=>600,745=>600,746=>600,747=>600,
-748=>600,749=>600,750=>600,751=>600,752=>600,753=>600,754=>600,755=>600,756=>600,757=>600,
-758=>600,759=>600,760=>600,761=>600,762=>600,763=>600,764=>600,765=>600,766=>600,767=>600,
-768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,
-778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,
-788=>0,789=>0,790=>0,791=>0,795=>0,796=>0,800=>0,801=>0,802=>0,803=>0,
-804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,812=>0,813=>0,814=>0,
-815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,826=>0,
-827=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,838=>0,839=>0,840=>0,
-844=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,884=>600,885=>600,
-890=>600,894=>600,900=>600,901=>600,902=>600,903=>600,904=>600,905=>600,906=>600,908=>600,
-910=>600,911=>600,912=>600,913=>600,914=>600,915=>600,916=>600,917=>600,918=>600,919=>600,
-920=>600,921=>600,922=>600,923=>600,924=>600,925=>600,926=>600,927=>600,928=>600,929=>600,
-931=>600,932=>600,933=>600,934=>600,935=>600,936=>600,937=>600,938=>600,939=>600,940=>600,
-941=>600,942=>600,943=>600,944=>600,945=>600,946=>600,947=>600,948=>600,949=>600,950=>600,
-951=>600,952=>600,953=>600,954=>600,955=>600,956=>600,957=>600,958=>600,959=>600,960=>600,
-961=>600,962=>600,963=>600,964=>600,965=>600,966=>600,967=>600,968=>600,969=>600,970=>600,
-971=>600,972=>600,973=>600,974=>600,976=>600,977=>600,978=>600,979=>600,980=>600,981=>600,
-982=>600,986=>600,987=>600,988=>600,1008=>600,1009=>600,1012=>600,1013=>600,1024=>600,1025=>600,
-1026=>600,1027=>600,1028=>600,1029=>600,1030=>600,1031=>600,1032=>600,1033=>600,1034=>600,1035=>600,
-1036=>600,1037=>600,1038=>600,1039=>600,1040=>600,1041=>600,1042=>600,1043=>600,1044=>600,1045=>600,
-1046=>600,1047=>600,1048=>600,1049=>600,1050=>600,1051=>600,1052=>600,1053=>600,1054=>600,1055=>600,
-1056=>600,1057=>600,1058=>600,1059=>600,1060=>600,1061=>600,1062=>600,1063=>600,1064=>600,1065=>600,
-1066=>600,1067=>600,1068=>600,1069=>600,1070=>600,1071=>600,1072=>600,1073=>600,1074=>600,1075=>600,
-1076=>600,1077=>600,1078=>600,1079=>600,1080=>600,1081=>600,1082=>600,1083=>600,1084=>600,1085=>600,
-1086=>600,1087=>600,1088=>600,1089=>600,1090=>600,1091=>600,1092=>600,1093=>600,1094=>600,1095=>600,
-1096=>600,1097=>600,1098=>600,1099=>600,1100=>600,1101=>600,1102=>600,1103=>600,1104=>600,1105=>600,
-1106=>600,1107=>600,1108=>600,1109=>600,1110=>600,1111=>600,1112=>600,1113=>600,1114=>600,1115=>600,
-1116=>600,1117=>600,1118=>600,1119=>600,1136=>600,1137=>600,1138=>600,1156=>0,1157=>0,1158=>0,
-1162=>600,1163=>600,1164=>600,1165=>600,1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,1171=>600,
-1172=>600,1173=>600,1174=>600,1175=>600,1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,1181=>600,
-1182=>600,1183=>600,1184=>600,1185=>600,1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,1191=>600,
-1192=>600,1193=>600,1194=>600,1195=>600,1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,1201=>600,
-1202=>600,1203=>600,1204=>600,1205=>600,1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,1211=>600,
-1212=>600,1213=>600,1214=>600,1215=>600,1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,1221=>600,
-1222=>600,1223=>600,1224=>600,1225=>600,1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,1231=>600,
-1232=>600,1233=>600,1234=>600,1235=>600,1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,1241=>600,
-1242=>600,1243=>600,1244=>600,1245=>600,1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,1251=>600,
-1252=>600,1253=>600,1254=>600,1255=>600,1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,1261=>600,
-1262=>600,1263=>600,1264=>600,1265=>600,1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,1271=>600,
-1272=>600,1273=>600,1296=>600,1297=>600,1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,1309=>600,
-1310=>600,1311=>600,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,
-1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,1470=>600,1471=>0,1472=>600,1473=>0,1474=>0,
-1475=>600,1476=>0,1488=>600,1489=>600,1490=>600,1491=>600,1492=>600,1493=>600,1494=>600,1495=>600,
-1496=>600,1497=>600,1498=>600,1499=>600,1500=>600,1501=>600,1502=>600,1503=>600,1504=>600,1505=>600,
-1506=>600,1507=>600,1508=>600,1509=>600,1510=>600,1511=>600,1512=>600,1513=>600,1514=>600,1520=>600,
-1521=>600,1522=>600,1523=>600,1524=>600,4304=>600,4305=>600,4306=>600,4307=>600,4308=>600,4309=>600,
-4310=>600,4311=>600,4312=>600,4313=>600,4314=>600,4315=>600,4316=>600,4317=>600,4318=>600,4319=>600,
-4320=>600,4321=>600,4322=>600,4323=>600,4324=>600,4325=>600,4326=>600,4327=>600,4328=>600,4329=>600,
-4330=>600,4331=>600,4332=>600,4333=>600,4334=>600,4335=>600,4336=>600,4337=>600,4338=>600,4339=>600,
-4340=>600,4341=>600,4345=>600,4347=>600,7680=>600,7681=>600,7682=>600,7683=>600,7684=>600,7685=>600,
-7686=>600,7687=>600,7688=>600,7689=>600,7690=>600,7691=>600,7692=>600,7693=>600,7694=>600,7695=>600,
-7696=>600,7697=>600,7698=>600,7699=>600,7700=>600,7701=>600,7702=>600,7703=>600,7704=>600,7705=>600,
-7706=>600,7707=>600,7708=>600,7709=>600,7710=>600,7711=>600,7712=>600,7713=>600,7714=>600,7715=>600,
-7716=>600,7717=>600,7718=>600,7719=>600,7720=>600,7721=>600,7722=>600,7723=>600,7724=>600,7725=>600,
-7726=>600,7727=>600,7728=>600,7729=>600,7730=>600,7731=>600,7732=>600,7733=>600,7734=>600,7735=>600,
-7736=>600,7737=>600,7738=>600,7739=>600,7740=>600,7741=>600,7742=>600,7743=>600,7744=>600,7745=>600,
-7746=>600,7747=>600,7748=>600,7749=>600,7750=>600,7751=>600,7752=>600,7753=>600,7754=>600,7755=>600,
-7756=>600,7757=>600,7758=>600,7759=>600,7760=>600,7761=>600,7762=>600,7763=>600,7764=>600,7765=>600,
-7766=>600,7767=>600,7768=>600,7769=>600,7770=>600,7771=>600,7772=>600,7773=>600,7774=>600,7775=>600,
-7776=>600,7777=>600,7778=>600,7779=>600,7780=>600,7781=>600,7782=>600,7783=>600,7784=>600,7785=>600,
-7786=>600,7787=>600,7788=>600,7789=>600,7790=>600,7791=>600,7792=>600,7793=>600,7794=>600,7795=>600,
-7796=>600,7797=>600,7798=>600,7799=>600,7800=>600,7801=>600,7802=>600,7803=>600,7804=>600,7805=>600,
-7806=>600,7807=>600,7808=>600,7809=>600,7810=>600,7811=>600,7812=>600,7813=>600,7814=>600,7815=>600,
-7816=>600,7817=>600,7818=>600,7819=>600,7820=>600,7821=>600,7822=>600,7823=>600,7824=>600,7825=>600,
-7826=>600,7827=>600,7828=>600,7829=>600,7830=>600,7831=>600,7832=>600,7833=>600,7834=>600,7835=>600,
-7840=>600,7841=>600,7842=>600,7843=>600,7844=>600,7845=>600,7846=>600,7847=>600,7848=>600,7849=>600,
-7850=>600,7851=>600,7852=>600,7853=>600,7854=>600,7855=>600,7856=>600,7857=>600,7858=>600,7859=>600,
-7860=>600,7861=>600,7862=>600,7863=>600,7864=>600,7865=>600,7866=>600,7867=>600,7868=>600,7869=>600,
-7870=>600,7871=>600,7872=>600,7873=>600,7874=>600,7875=>600,7876=>600,7877=>600,7878=>600,7879=>600,
-7880=>600,7881=>600,7882=>600,7883=>600,7884=>600,7885=>600,7886=>600,7887=>600,7888=>600,7889=>600,
-7890=>600,7891=>600,7892=>600,7893=>600,7894=>600,7895=>600,7896=>600,7897=>600,7898=>600,7899=>600,
-7900=>600,7901=>600,7902=>600,7903=>600,7904=>600,7905=>600,7906=>600,7907=>600,7908=>600,7909=>600,
-7910=>600,7911=>600,7912=>600,7913=>600,7914=>600,7915=>600,7916=>600,7917=>600,7918=>600,7919=>600,
-7920=>600,7921=>600,7922=>600,7923=>600,7924=>600,7925=>600,7926=>600,7927=>600,7928=>600,7929=>600,
-8192=>600,8193=>600,8194=>600,8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,
-8202=>600,8203=>600,8204=>0,8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,
-8214=>600,8215=>600,8219=>600,8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,
-8234=>600,8235=>600,8236=>600,8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,
-8245=>600,8246=>600,8247=>600,8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,
-8257=>600,8258=>600,8259=>600,8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,
-8267=>600,8268=>600,8269=>600,8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,
-8277=>600,8278=>600,8279=>600,8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,
-8287=>600,8288=>600,8289=>600,8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,
-8302=>600,8303=>600,8304=>600,8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,
-8314=>600,8315=>600,8316=>600,8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,
-8324=>600,8325=>600,8326=>600,8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,
-8334=>600,8336=>600,8337=>600,8338=>600,8339=>600,8340=>600,8355=>600,8356=>600,8362=>600,8373=>600,
-8448=>600,8449=>600,8451=>600,8453=>600,8454=>600,8457=>600,8465=>600,8466=>600,8470=>600,8472=>600,
-8476=>600,8481=>600,8486=>600,8487=>600,8489=>600,8490=>600,8491=>600,8498=>600,8501=>600,8502=>600,
-8503=>600,8504=>600,8506=>600,8507=>600,8523=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,
-8536=>600,8537=>600,8538=>600,8539=>600,8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,
-8546=>600,8547=>600,8548=>600,8549=>600,8550=>600,8553=>600,8556=>600,8557=>600,8558=>600,8559=>600,
-8560=>600,8564=>600,8569=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,
-8595=>600,8704=>600,8706=>600,8707=>600,8709=>600,8710=>600,8711=>600,8712=>600,8713=>600,8715=>600,
-8716=>600,8721=>600,8722=>600,8723=>600,8725=>600,8730=>600,8733=>600,8734=>600,8735=>600,8756=>600,
-8800=>600,8801=>600,8804=>600,8805=>600,8834=>600,8835=>600,8836=>600,8837=>600,8838=>600,8839=>600,
-8869=>600,8976=>600,9001=>600,9002=>600,9251=>600,9472=>600,9473=>600,9474=>600,9475=>600,9476=>600,
-9477=>600,9478=>600,9479=>600,9480=>600,9481=>600,9482=>600,9483=>600,9484=>600,9485=>600,9486=>600,
-9487=>600,9488=>600,9489=>600,9490=>600,9491=>600,9492=>600,9493=>600,9494=>600,9495=>600,9496=>600,
-9497=>600,9498=>600,9499=>600,9500=>600,9501=>600,9502=>600,9503=>600,9504=>600,9505=>600,9506=>600,
-9507=>600,9508=>600,9509=>600,9510=>600,9511=>600,9512=>600,9513=>600,9514=>600,9515=>600,9516=>600,
-9517=>600,9518=>600,9519=>600,9520=>600,9521=>600,9522=>600,9523=>600,9524=>600,9525=>600,9526=>600,
-9527=>600,9528=>600,9529=>600,9530=>600,9531=>600,9532=>600,9533=>600,9534=>600,9535=>600,9536=>600,
-9537=>600,9538=>600,9539=>600,9540=>600,9541=>600,9542=>600,9543=>600,9544=>600,9545=>600,9546=>600,
-9547=>600,9548=>600,9549=>600,9550=>600,9551=>600,9552=>600,9553=>600,9554=>600,9555=>600,9556=>600,
-9557=>600,9558=>600,9559=>600,9560=>600,9561=>600,9562=>600,9563=>600,9564=>600,9565=>600,9566=>600,
-9567=>600,9568=>600,9569=>600,9570=>600,9571=>600,9572=>600,9573=>600,9574=>600,9575=>600,9576=>600,
-9577=>600,9578=>600,9579=>600,9580=>600,9581=>600,9582=>600,9583=>600,9584=>600,9585=>600,9586=>600,
-9587=>600,9588=>600,9589=>600,9590=>600,9591=>600,9592=>600,9593=>600,9594=>600,9595=>600,9596=>600,
-9597=>600,9598=>600,9599=>600,9600=>600,9601=>600,9602=>600,9603=>600,9604=>600,9605=>600,9606=>600,
-9607=>600,9608=>600,9609=>600,9610=>600,9611=>600,9612=>600,9613=>600,9614=>600,9615=>600,9616=>600,
-9617=>600,9618=>600,9619=>600,9620=>600,9621=>600,9632=>600,9633=>600,9635=>600,9636=>600,9637=>600,
-9638=>600,9639=>600,9640=>600,9641=>600,9642=>600,9643=>600,9644=>600,9645=>600,9646=>600,9647=>600,
-9648=>600,9649=>600,9650=>600,9651=>600,9652=>600,9653=>600,9654=>600,9655=>600,9656=>600,9657=>600,
-9658=>600,9660=>600,9661=>600,9662=>600,9663=>600,9664=>600,9665=>600,9666=>600,9667=>600,9668=>600,
-9669=>600,9670=>600,9671=>600,9673=>600,9674=>600,9675=>600,9677=>600,9679=>600,9680=>600,9681=>600,
-9682=>600,9683=>600,9684=>600,9685=>600,9686=>600,9687=>600,9688=>600,9689=>600,9698=>600,9699=>600,
-9700=>600,9701=>600,9702=>600,9703=>600,9704=>600,9705=>600,9706=>600,9707=>600,9708=>600,9709=>600,
-9710=>600,9712=>600,9713=>600,9714=>600,9715=>600,9716=>600,9717=>600,9718=>600,9719=>600,9735=>600,
-9736=>600,9737=>600,9776=>600,9777=>600,9778=>600,9779=>600,9780=>600,9781=>600,9782=>600,9783=>600,
-9785=>600,9786=>600,9787=>600,9824=>600,9825=>600,9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,
-9831=>600,9833=>600,9834=>600,9835=>600,9836=>600,9837=>600,9838=>600,9839=>600,64256=>600,64257=>600,
-64258=>600,64285=>600,64287=>600,64288=>600,64298=>600,64299=>600,64300=>600,64301=>600,64302=>600,64303=>600,
-64304=>600,64305=>600,64306=>600,64307=>600,64308=>600,64309=>600,64310=>600,64312=>600,64313=>600,64314=>600,
-64315=>600,64316=>600,64318=>600,64320=>600,64321=>600,64323=>600,64324=>600,64326=>600,64327=>600,64328=>600,
-64329=>600,64330=>600,64331=>600,64332=>600,64333=>600,64334=>600,64335=>600,65533=>600);
-$enc='';
-$diff='';
-$file='freemonob.z';
-$ctg='freemonob.ctg.z';
-$originalsize=164212;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonobi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonobi.php
deleted file mode 100644
index d24713f4c89..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonobi.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMonoBoldOblique';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>19,'Flags'=>96,'FontBBox'=>'[-644 -200 833 800]','ItalicAngle'=>-12,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>600,33=>600,34=>600,35=>600,36=>600,37=>600,38=>600,39=>600,40=>600,41=>600,
-42=>600,43=>600,44=>600,45=>600,46=>600,47=>600,48=>600,49=>600,50=>600,51=>600,
-52=>600,53=>600,54=>600,55=>600,56=>600,57=>600,58=>600,59=>600,60=>600,61=>600,
-62=>600,63=>600,64=>600,65=>600,66=>600,67=>600,68=>600,69=>600,70=>600,71=>600,
-72=>600,73=>600,74=>600,75=>600,76=>600,77=>600,78=>600,79=>600,80=>600,81=>600,
-82=>600,83=>600,84=>600,85=>600,86=>600,87=>600,88=>600,89=>600,90=>600,91=>600,
-92=>600,93=>600,94=>600,95=>600,96=>600,97=>600,98=>600,99=>600,100=>600,101=>600,
-102=>600,103=>600,104=>600,105=>600,106=>600,107=>600,108=>600,109=>600,110=>600,111=>600,
-112=>600,113=>600,114=>600,115=>600,116=>600,117=>600,118=>600,119=>600,120=>600,121=>600,
-122=>600,123=>600,124=>600,125=>600,126=>600,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>600,160=>600,161=>600,162=>600,163=>600,164=>600,165=>600,166=>600,167=>600,
-168=>600,169=>600,170=>600,171=>600,172=>600,173=>600,174=>600,175=>600,176=>600,177=>600,
-178=>600,179=>600,180=>600,181=>600,182=>600,183=>600,184=>600,185=>600,186=>600,187=>600,
-188=>600,189=>600,190=>600,191=>600,192=>600,193=>600,194=>600,195=>600,196=>600,197=>600,
-198=>600,199=>600,200=>600,201=>600,202=>600,203=>600,204=>600,205=>600,206=>600,207=>600,
-208=>600,209=>600,210=>600,211=>600,212=>600,213=>600,214=>600,215=>600,216=>600,217=>600,
-218=>600,219=>600,220=>600,221=>600,222=>600,223=>600,224=>600,225=>600,226=>600,227=>600,
-228=>600,229=>600,230=>600,231=>600,232=>600,233=>600,234=>600,235=>600,236=>600,237=>600,
-238=>600,239=>600,240=>600,241=>600,242=>600,243=>600,244=>600,245=>600,246=>600,247=>600,
-248=>600,249=>600,250=>600,251=>600,252=>600,253=>600,254=>600,255=>600,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-598=>600,599=>600,600=>600,601=>600,603=>600,604=>600,607=>600,608=>600,609=>600,613=>600,
-614=>600,615=>600,616=>600,617=>600,618=>600,619=>600,621=>600,623=>600,624=>600,625=>600,
-626=>600,627=>600,628=>600,629=>600,633=>600,634=>600,635=>600,636=>600,637=>600,638=>600,
-639=>600,640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,647=>600,648=>600,649=>600,
-652=>600,653=>600,654=>600,656=>600,657=>600,658=>600,659=>600,660=>600,661=>600,662=>600,
-663=>600,664=>600,665=>600,666=>600,667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,
-673=>600,674=>600,697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,
-705=>600,706=>600,707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,
-716=>600,717=>600,718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,
-726=>600,727=>600,728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,741=>600,
-742=>600,743=>600,744=>600,745=>600,746=>600,747=>600,748=>600,749=>600,750=>600,751=>600,
-752=>600,753=>600,754=>600,755=>600,756=>600,757=>600,758=>600,759=>600,760=>600,761=>600,
-762=>600,763=>600,764=>600,765=>600,766=>600,767=>600,768=>0,769=>0,770=>0,771=>0,
-772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,
-782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,
-795=>0,796=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,
-808=>0,809=>0,810=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,
-819=>0,820=>0,821=>0,822=>0,825=>0,826=>0,827=>0,831=>0,832=>0,833=>0,
-834=>0,835=>0,836=>0,838=>0,839=>0,840=>0,844=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,884=>600,885=>600,890=>600,894=>600,900=>600,901=>600,
-902=>600,903=>600,904=>600,905=>600,906=>600,908=>600,910=>600,911=>600,912=>600,913=>600,
-914=>600,915=>600,916=>600,917=>600,918=>600,919=>600,920=>600,921=>600,922=>600,923=>600,
-924=>600,925=>600,926=>600,927=>600,928=>600,929=>600,931=>600,932=>600,933=>600,934=>600,
-935=>600,936=>600,937=>600,938=>600,939=>600,940=>600,941=>600,942=>600,943=>600,944=>600,
-945=>600,946=>600,947=>600,948=>600,949=>600,950=>600,951=>600,952=>600,953=>600,954=>600,
-955=>600,956=>600,957=>600,958=>600,959=>600,960=>600,961=>600,962=>600,963=>600,964=>600,
-965=>600,966=>600,967=>600,968=>600,969=>600,970=>600,971=>600,972=>600,973=>600,974=>600,
-976=>600,977=>600,978=>600,979=>600,980=>600,981=>600,982=>600,986=>600,987=>600,988=>600,
-1008=>600,1009=>600,1012=>600,1013=>600,1024=>600,1025=>600,1026=>600,1027=>600,1028=>600,1029=>600,
-1030=>600,1031=>600,1032=>600,1033=>600,1034=>600,1035=>600,1036=>600,1037=>600,1038=>600,1039=>600,
-1040=>600,1041=>600,1042=>600,1043=>600,1044=>600,1045=>600,1046=>600,1047=>600,1048=>600,1049=>600,
-1050=>600,1051=>600,1052=>600,1053=>600,1054=>600,1055=>600,1056=>600,1057=>600,1058=>600,1059=>600,
-1060=>600,1061=>600,1062=>600,1063=>600,1064=>600,1065=>600,1066=>600,1067=>600,1068=>600,1069=>600,
-1070=>600,1071=>600,1072=>600,1073=>600,1074=>600,1075=>600,1076=>600,1077=>600,1078=>600,1079=>600,
-1080=>600,1081=>600,1082=>600,1083=>600,1084=>600,1085=>600,1086=>600,1087=>600,1088=>600,1089=>600,
-1090=>600,1091=>600,1092=>600,1093=>600,1094=>600,1095=>600,1096=>600,1097=>600,1098=>600,1099=>600,
-1100=>600,1101=>600,1102=>600,1103=>600,1104=>600,1105=>600,1106=>600,1107=>600,1108=>600,1109=>600,
-1110=>600,1111=>600,1112=>600,1113=>600,1114=>600,1115=>600,1116=>600,1117=>600,1118=>600,1119=>600,
-1136=>600,1137=>600,1138=>600,1156=>0,1157=>0,1158=>0,1162=>600,1163=>600,1164=>600,1165=>600,
-1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,1171=>600,1172=>600,1173=>600,1174=>600,1175=>600,
-1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,1181=>600,1182=>600,1183=>600,1184=>600,1185=>600,
-1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,1191=>600,1192=>600,1193=>600,1194=>600,1195=>600,
-1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,1201=>600,1202=>600,1203=>600,1204=>600,1205=>600,
-1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,1211=>600,1212=>600,1213=>600,1214=>600,1215=>600,
-1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,1221=>600,1222=>600,1223=>600,1224=>600,1225=>600,
-1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,1231=>600,1232=>600,1233=>600,1234=>600,1235=>600,
-1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,1241=>600,1242=>600,1243=>600,1244=>600,1245=>600,
-1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,1251=>600,1252=>600,1253=>600,1254=>600,1255=>600,
-1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,1261=>600,1262=>600,1263=>600,1264=>600,1265=>600,
-1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,1271=>600,1272=>600,1273=>600,1296=>600,1297=>600,
-1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,1309=>600,1310=>600,1311=>600,1456=>0,1457=>0,
-1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,
-1469=>0,1470=>0,1471=>0,1472=>600,1473=>0,1474=>0,1475=>600,1476=>0,1488=>600,1489=>600,
-1490=>600,1491=>600,1492=>600,1493=>600,1494=>600,1495=>600,1496=>600,1497=>600,1498=>600,1499=>600,
-1500=>600,1501=>600,1502=>600,1503=>600,1504=>600,1505=>600,1506=>600,1507=>600,1508=>600,1509=>600,
-1510=>600,1511=>600,1512=>600,1513=>600,1514=>600,1520=>600,1521=>600,1522=>600,1523=>600,1524=>600,
-4304=>600,4305=>600,4306=>600,4307=>600,4308=>600,4309=>600,4310=>600,4311=>600,4312=>600,4313=>600,
-4314=>600,4315=>600,4316=>600,4317=>600,4318=>600,4319=>600,4320=>600,4321=>600,4322=>600,4323=>600,
-4324=>600,4325=>600,4326=>600,4327=>600,4328=>600,4329=>600,4330=>600,4331=>600,4332=>600,4333=>600,
-4334=>600,4335=>600,4336=>600,4337=>600,4338=>600,4339=>600,4340=>600,4341=>600,4345=>600,4347=>600,
-8192=>600,8193=>600,8194=>600,8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,
-8202=>600,8203=>600,8204=>0,8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,
-8214=>600,8215=>600,8219=>600,8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,
-8234=>600,8235=>600,8236=>600,8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,
-8245=>600,8246=>600,8247=>600,8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,
-8257=>600,8258=>600,8259=>600,8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,
-8267=>600,8268=>600,8269=>600,8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,
-8277=>600,8278=>600,8279=>600,8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,
-8287=>600,8288=>600,8289=>600,8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,
-8302=>600,8303=>600,8304=>600,8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,
-8314=>600,8315=>600,8316=>600,8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,
-8324=>600,8325=>600,8326=>600,8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,
-8334=>600,8336=>600,8337=>600,8338=>600,8339=>600,8340=>600,8362=>600,8373=>600,8448=>600,8449=>600,
-8451=>600,8453=>600,8454=>600,8457=>600,8465=>600,8466=>600,8470=>600,8472=>600,8476=>600,8481=>600,
-8486=>600,8487=>600,8489=>600,8490=>600,8491=>600,8498=>600,8501=>600,8502=>600,8503=>600,8504=>600,
-8506=>600,8507=>600,8523=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,8536=>600,8537=>600,
-8538=>600,8539=>600,8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,8546=>600,8547=>600,
-8548=>600,8549=>600,8550=>600,8553=>600,8556=>600,8557=>600,8558=>600,8559=>600,8560=>600,8564=>600,
-8569=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,8595=>600,8704=>600,
-8706=>600,8707=>600,8710=>600,8711=>600,8712=>600,8713=>600,8715=>600,8716=>600,8721=>600,8722=>600,
-8723=>600,8725=>600,8730=>600,8733=>600,8734=>600,8756=>600,8800=>600,8801=>600,8804=>600,8805=>600,
-9251=>600,9674=>600,9824=>600,9825=>600,9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,9831=>600,
-9833=>600,9834=>600,9835=>600,9836=>600,9837=>600,9838=>600,9839=>600,64256=>600,64257=>600,64258=>600,
-64285=>600,64287=>600,64288=>600,64298=>600,64299=>600,64300=>600,64301=>600,64302=>600,64303=>600,64304=>600,
-64305=>600,64306=>600,64307=>600,64308=>600,64309=>600,64310=>600,64312=>600,64313=>600,64314=>600,64315=>600,
-64316=>600,64318=>600,64320=>600,64321=>600,64323=>600,64324=>600,64326=>600,64327=>600,64328=>600,64329=>600,
-64330=>600,64331=>600,64332=>600,64333=>600,64334=>600,64335=>600,65533=>600);
-$enc='';
-$diff='';
-$file='freemonobi.z';
-$ctg='freemonobi.ctg.z';
-$originalsize=145080;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonoi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonoi.php
deleted file mode 100644
index 5d71754c061..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freemonoi.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeMonoOblique';
-$desc=array('Ascent'=>800,'Descent'=>-200,'CapHeight'=>44,'Flags'=>96,'FontBBox'=>'[-644 -200 816 800]','ItalicAngle'=>-12,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>600,33=>600,34=>600,35=>600,36=>600,37=>600,38=>600,39=>600,40=>600,41=>600,
-42=>600,43=>600,44=>600,45=>600,46=>600,47=>600,48=>600,49=>600,50=>600,51=>600,
-52=>600,53=>600,54=>600,55=>600,56=>600,57=>600,58=>600,59=>600,60=>600,61=>600,
-62=>600,63=>600,64=>600,65=>600,66=>600,67=>600,68=>600,69=>600,70=>600,71=>600,
-72=>600,73=>600,74=>600,75=>600,76=>600,77=>600,78=>600,79=>600,80=>600,81=>600,
-82=>600,83=>600,84=>600,85=>600,86=>600,87=>600,88=>600,89=>600,90=>600,91=>600,
-92=>600,93=>600,94=>600,95=>600,96=>600,97=>600,98=>600,99=>600,100=>600,101=>600,
-102=>600,103=>600,104=>600,105=>600,106=>600,107=>600,108=>600,109=>600,110=>600,111=>600,
-112=>600,113=>600,114=>600,115=>600,116=>600,117=>600,118=>600,119=>600,120=>600,121=>600,
-122=>600,123=>600,124=>600,125=>600,126=>600,8364=>600,8218=>600,402=>600,8222=>600,8230=>600,
-8224=>600,8225=>600,710=>600,8240=>600,352=>600,8249=>600,338=>600,381=>600,8216=>600,8217=>600,
-8220=>600,8221=>600,8226=>600,8211=>600,8212=>600,732=>600,8482=>600,353=>600,8250=>600,339=>600,
-382=>600,376=>600,160=>600,161=>600,162=>600,163=>600,164=>600,165=>600,166=>600,167=>600,
-168=>600,169=>600,170=>600,171=>600,172=>600,173=>600,174=>600,175=>600,176=>600,177=>600,
-178=>600,179=>600,180=>600,181=>600,182=>600,183=>600,184=>600,185=>600,186=>600,187=>600,
-188=>600,189=>600,190=>600,191=>600,192=>600,193=>600,194=>600,195=>600,196=>600,197=>600,
-198=>600,199=>600,200=>600,201=>600,202=>600,203=>600,204=>600,205=>600,206=>600,207=>600,
-208=>600,209=>600,210=>600,211=>600,212=>600,213=>600,214=>600,215=>600,216=>600,217=>600,
-218=>600,219=>600,220=>600,221=>600,222=>600,223=>600,224=>600,225=>600,226=>600,227=>600,
-228=>600,229=>600,230=>600,231=>600,232=>600,233=>600,234=>600,235=>600,236=>600,237=>600,
-238=>600,239=>600,240=>600,241=>600,242=>600,243=>600,244=>600,245=>600,246=>600,247=>600,
-248=>600,249=>600,250=>600,251=>600,252=>600,253=>600,254=>600,255=>600,256=>600,257=>600,
-258=>600,259=>600,260=>600,261=>600,262=>600,263=>600,264=>600,265=>600,266=>600,267=>600,
-268=>600,269=>600,270=>600,271=>600,272=>600,273=>600,274=>600,275=>600,276=>600,277=>600,
-278=>600,279=>600,280=>600,281=>600,282=>600,283=>600,284=>600,285=>600,286=>600,287=>600,
-288=>600,289=>600,290=>600,291=>600,292=>600,293=>600,294=>600,295=>600,296=>600,297=>600,
-298=>600,299=>600,300=>600,301=>600,302=>600,303=>600,304=>600,305=>600,306=>600,307=>600,
-308=>600,309=>600,310=>600,311=>600,312=>600,313=>600,314=>600,315=>600,316=>600,317=>600,
-318=>600,319=>600,320=>600,321=>600,322=>600,323=>600,324=>600,325=>600,326=>600,327=>600,
-328=>600,329=>600,330=>600,331=>600,332=>600,333=>600,334=>600,335=>600,336=>600,337=>600,
-340=>600,341=>600,342=>600,343=>600,344=>600,345=>600,346=>600,347=>600,348=>600,349=>600,
-350=>600,351=>600,354=>600,355=>600,356=>600,357=>600,358=>600,359=>600,360=>600,361=>600,
-362=>600,363=>600,364=>600,365=>600,366=>600,367=>600,368=>600,369=>600,370=>600,371=>600,
-372=>600,373=>600,374=>600,375=>600,377=>600,378=>600,379=>600,380=>600,383=>600,384=>600,
-385=>600,386=>600,387=>600,388=>600,389=>600,390=>600,391=>600,392=>600,393=>600,394=>600,
-395=>600,396=>600,397=>600,398=>600,399=>600,400=>600,401=>600,403=>600,404=>600,405=>600,
-406=>600,407=>600,408=>600,409=>600,410=>600,411=>600,412=>600,413=>600,414=>600,415=>600,
-416=>600,417=>600,418=>600,419=>600,420=>600,421=>600,422=>600,423=>600,424=>600,425=>600,
-426=>600,427=>600,428=>600,429=>600,430=>600,431=>600,432=>600,433=>600,434=>600,435=>600,
-436=>600,437=>600,438=>600,439=>600,440=>600,441=>600,442=>600,443=>600,444=>600,445=>600,
-446=>600,447=>600,448=>600,449=>600,450=>600,451=>600,452=>600,453=>600,454=>600,455=>600,
-456=>600,457=>600,458=>600,459=>600,460=>600,461=>600,462=>600,463=>600,464=>600,465=>600,
-466=>600,467=>600,468=>600,469=>600,470=>600,471=>600,472=>600,473=>600,474=>600,475=>600,
-476=>600,477=>600,478=>600,479=>600,480=>600,481=>600,482=>600,483=>600,484=>600,485=>600,
-486=>600,487=>600,488=>600,489=>600,490=>600,491=>600,492=>600,493=>600,494=>600,495=>600,
-496=>600,497=>600,498=>600,499=>600,500=>600,501=>600,502=>600,503=>600,504=>600,505=>600,
-506=>600,507=>600,508=>600,509=>600,510=>600,511=>600,512=>600,513=>600,514=>600,515=>600,
-516=>600,517=>600,518=>600,519=>600,520=>600,521=>600,522=>600,523=>600,524=>600,525=>600,
-526=>600,527=>600,528=>600,529=>600,530=>600,531=>600,532=>600,533=>600,534=>600,535=>600,
-536=>600,537=>600,538=>600,539=>600,540=>600,541=>600,542=>600,543=>600,548=>600,549=>600,
-550=>600,551=>600,552=>600,553=>600,554=>600,555=>600,556=>600,557=>600,558=>600,559=>600,
-560=>600,561=>600,562=>600,563=>600,567=>600,592=>600,593=>600,594=>600,595=>600,596=>600,
-597=>600,598=>600,599=>600,600=>600,601=>600,602=>600,603=>600,604=>600,607=>600,608=>600,
-609=>600,610=>600,611=>600,612=>600,613=>600,614=>600,615=>600,616=>600,617=>600,618=>600,
-619=>600,620=>600,621=>600,622=>600,623=>600,624=>600,625=>600,626=>600,627=>600,628=>600,
-629=>600,630=>600,632=>600,633=>600,634=>600,635=>600,636=>600,637=>600,638=>600,639=>600,
-640=>600,641=>600,642=>600,643=>600,644=>600,645=>600,646=>600,647=>600,648=>600,649=>600,
-651=>600,652=>600,653=>600,654=>600,655=>600,656=>600,657=>600,658=>600,660=>600,661=>600,
-662=>600,663=>600,664=>600,665=>600,667=>600,668=>600,669=>600,670=>600,671=>600,672=>600,
-673=>600,674=>600,679=>600,688=>600,689=>600,690=>600,691=>600,692=>600,693=>600,694=>600,
-695=>600,696=>600,697=>600,698=>600,699=>600,700=>600,701=>600,702=>600,703=>600,704=>600,
-705=>600,706=>600,707=>600,708=>600,709=>600,711=>600,712=>600,713=>600,714=>600,715=>600,
-716=>600,717=>600,718=>600,719=>600,720=>600,721=>600,722=>600,723=>600,724=>600,725=>600,
-726=>600,727=>600,728=>600,729=>600,730=>600,731=>600,733=>600,734=>600,735=>600,736=>600,
-737=>600,738=>600,739=>600,740=>600,741=>600,742=>600,743=>600,744=>600,745=>600,746=>600,
-747=>600,748=>600,749=>600,750=>600,751=>600,752=>600,753=>600,754=>600,755=>600,756=>600,
-757=>600,758=>600,759=>600,760=>600,761=>600,762=>600,763=>600,764=>600,765=>600,766=>600,
-767=>600,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,
-777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,
-787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,795=>0,796=>0,800=>0,
-803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,812=>0,813=>0,
-814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,
-824=>0,825=>0,826=>0,827=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,
-838=>0,839=>0,840=>0,844=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,
-855=>0,884=>600,885=>600,890=>600,894=>600,900=>600,901=>600,902=>600,903=>600,904=>600,
-905=>600,906=>600,908=>600,910=>600,911=>600,912=>600,913=>600,914=>600,915=>600,916=>600,
-917=>600,918=>600,919=>600,920=>600,921=>600,922=>600,923=>600,924=>600,925=>600,926=>600,
-927=>600,928=>600,929=>600,931=>600,932=>600,933=>600,934=>600,935=>600,936=>600,937=>600,
-938=>600,939=>600,940=>600,941=>600,942=>600,943=>600,944=>600,945=>600,946=>600,947=>600,
-948=>600,949=>600,950=>600,951=>600,952=>600,953=>600,954=>600,955=>600,956=>600,957=>600,
-958=>600,959=>600,960=>600,961=>600,962=>600,963=>600,964=>600,965=>600,966=>600,967=>600,
-968=>600,969=>600,970=>600,971=>600,972=>600,973=>600,974=>600,976=>600,977=>600,978=>600,
-979=>600,980=>600,981=>600,982=>600,986=>600,987=>600,988=>600,1008=>600,1009=>600,1012=>600,
-1013=>600,1024=>600,1025=>600,1026=>600,1027=>600,1028=>600,1029=>600,1030=>600,1031=>600,1032=>600,
-1033=>600,1034=>600,1035=>600,1036=>600,1037=>600,1038=>600,1039=>600,1040=>600,1041=>600,1042=>600,
-1043=>600,1044=>600,1045=>600,1046=>600,1047=>600,1048=>600,1049=>600,1050=>600,1051=>600,1052=>600,
-1053=>600,1054=>600,1055=>600,1056=>600,1057=>600,1058=>600,1059=>600,1060=>600,1061=>600,1062=>600,
-1063=>600,1064=>600,1065=>600,1066=>600,1067=>600,1068=>600,1069=>600,1070=>600,1071=>600,1072=>600,
-1073=>600,1074=>600,1075=>600,1076=>600,1077=>600,1078=>600,1079=>600,1080=>600,1081=>600,1082=>600,
-1083=>600,1084=>600,1085=>600,1086=>600,1087=>600,1088=>600,1089=>600,1090=>600,1091=>600,1092=>600,
-1093=>600,1094=>600,1095=>600,1096=>600,1097=>600,1098=>600,1099=>600,1100=>600,1101=>600,1102=>600,
-1103=>600,1104=>600,1105=>600,1106=>600,1107=>600,1108=>600,1109=>600,1110=>600,1111=>600,1112=>600,
-1113=>600,1114=>600,1115=>600,1116=>600,1117=>600,1118=>600,1119=>600,1120=>600,1121=>600,1122=>600,
-1123=>600,1124=>600,1126=>600,1127=>600,1128=>600,1130=>600,1131=>600,1132=>600,1133=>600,1136=>600,
-1137=>600,1138=>600,1140=>600,1141=>600,1142=>600,1143=>600,1155=>0,1156=>0,1157=>0,1158=>0,
-1159=>0,1162=>600,1163=>600,1164=>600,1165=>600,1166=>600,1167=>600,1168=>600,1169=>600,1170=>600,
-1171=>600,1172=>600,1173=>600,1174=>600,1175=>600,1176=>600,1177=>600,1178=>600,1179=>600,1180=>600,
-1181=>600,1182=>600,1183=>600,1184=>600,1185=>600,1186=>600,1187=>600,1188=>600,1189=>600,1190=>600,
-1191=>600,1192=>600,1193=>600,1194=>600,1195=>600,1196=>600,1197=>600,1198=>600,1199=>600,1200=>600,
-1201=>600,1202=>600,1203=>600,1204=>600,1205=>600,1206=>600,1207=>600,1208=>600,1209=>600,1210=>600,
-1211=>600,1212=>600,1213=>600,1214=>600,1215=>600,1216=>600,1217=>600,1218=>600,1219=>600,1220=>600,
-1221=>600,1222=>600,1223=>600,1224=>600,1225=>600,1226=>600,1227=>600,1228=>600,1229=>600,1230=>600,
-1231=>600,1232=>600,1233=>600,1234=>600,1235=>600,1236=>600,1237=>600,1238=>600,1239=>600,1240=>600,
-1241=>600,1242=>600,1243=>600,1244=>600,1245=>600,1246=>600,1247=>600,1248=>600,1249=>600,1250=>600,
-1251=>600,1252=>600,1253=>600,1254=>600,1255=>600,1256=>600,1257=>600,1258=>600,1259=>600,1260=>600,
-1261=>600,1262=>600,1263=>600,1264=>600,1265=>600,1266=>600,1267=>600,1268=>600,1269=>600,1270=>600,
-1271=>600,1272=>600,1273=>600,1296=>600,1297=>600,1298=>600,1299=>600,1306=>600,1307=>600,1308=>600,
-1309=>600,1310=>600,1311=>600,1329=>600,1330=>600,1331=>600,1332=>600,1333=>600,1334=>600,1335=>600,
-1336=>600,1337=>600,1338=>600,1339=>600,1340=>600,1341=>600,1342=>600,1343=>600,1344=>600,1345=>600,
-1346=>600,1347=>600,1348=>600,1349=>600,1350=>600,1351=>600,1352=>600,1353=>600,1354=>600,1355=>600,
-1356=>600,1357=>600,1358=>600,1359=>600,1360=>600,1361=>600,1362=>600,1363=>600,1364=>600,1365=>600,
-1366=>600,1369=>600,1370=>600,1371=>600,1372=>600,1373=>600,1374=>600,1375=>600,1377=>600,1378=>600,
-1379=>600,1380=>600,1381=>600,1382=>600,1383=>600,1384=>600,1385=>600,1386=>600,1387=>600,1388=>600,
-1389=>600,1390=>600,1391=>600,1392=>600,1393=>600,1394=>600,1395=>600,1396=>600,1397=>600,1398=>600,
-1399=>600,1400=>600,1401=>600,1402=>600,1403=>600,1404=>600,1405=>600,1406=>600,1407=>600,1408=>600,
-1409=>600,1410=>600,1411=>600,1412=>600,1413=>600,1414=>600,1415=>600,1417=>600,1418=>600,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,
-1468=>0,1469=>0,1470=>600,1471=>0,1472=>600,1473=>0,1474=>0,1475=>600,1476=>0,1488=>600,
-1489=>600,1490=>600,1491=>600,1492=>600,1493=>600,1494=>600,1495=>600,1496=>600,1497=>600,1498=>600,
-1499=>600,1500=>600,1501=>600,1502=>600,1503=>600,1504=>600,1505=>600,1506=>600,1507=>600,1508=>600,
-1509=>600,1510=>600,1511=>600,1512=>600,1513=>600,1514=>600,1520=>600,1521=>600,1522=>600,1523=>600,
-1524=>600,4304=>600,4305=>600,4306=>600,4307=>600,4308=>600,4309=>600,4310=>600,4311=>600,4312=>600,
-4313=>600,4314=>600,4315=>600,4316=>600,4317=>600,4318=>600,4319=>600,4320=>600,4321=>600,4322=>600,
-4323=>600,4324=>600,4325=>600,4326=>600,4327=>600,4328=>600,4329=>600,4330=>600,4331=>600,4332=>600,
-4333=>600,4334=>600,4335=>600,4336=>600,4337=>600,4338=>600,4339=>600,4340=>600,4341=>600,4345=>600,
-4347=>600,7680=>600,7681=>600,7682=>600,7683=>600,7684=>600,7685=>600,7686=>600,7687=>600,7688=>600,
-7689=>600,7690=>600,7691=>600,7692=>600,7693=>600,7694=>600,7695=>600,7696=>600,7697=>600,7698=>600,
-7699=>600,7700=>600,7701=>600,7702=>600,7703=>600,7704=>600,7705=>600,7706=>600,7707=>600,7708=>600,
-7709=>600,7710=>600,7711=>600,7712=>600,7713=>600,7714=>600,7715=>600,7716=>600,7717=>600,7718=>600,
-7719=>600,7720=>600,7721=>600,7722=>600,7723=>600,7724=>600,7725=>600,7726=>600,7727=>600,7728=>600,
-7729=>600,7730=>600,7731=>600,7732=>600,7733=>600,7734=>600,7735=>600,7736=>600,7737=>600,7738=>600,
-7739=>600,7740=>600,7741=>600,7742=>600,7743=>600,7744=>600,7745=>600,7746=>600,7747=>600,7748=>600,
-7749=>600,7750=>600,7751=>600,7752=>600,7753=>600,7754=>600,7755=>600,7756=>600,7757=>600,7758=>600,
-7759=>600,7760=>600,7761=>600,7762=>600,7763=>600,7764=>600,7765=>600,7766=>600,7767=>600,7768=>600,
-7769=>600,7770=>600,7771=>600,7772=>600,7773=>600,7774=>600,7775=>600,7776=>600,7777=>600,7778=>600,
-7779=>600,7780=>600,7781=>600,7782=>600,7783=>600,7784=>600,7785=>600,7786=>600,7787=>600,7788=>600,
-7789=>600,7790=>600,7791=>600,7792=>600,7793=>600,7794=>600,7795=>600,7796=>600,7797=>600,7798=>600,
-7799=>600,7800=>600,7801=>600,7802=>600,7803=>600,7804=>600,7805=>600,7806=>600,7807=>600,7808=>600,
-7809=>600,7810=>600,7811=>600,7812=>600,7813=>600,7814=>600,7815=>600,7816=>600,7817=>600,7818=>600,
-7819=>600,7820=>600,7821=>600,7822=>600,7823=>600,7824=>600,7825=>600,7826=>600,7827=>600,7828=>600,
-7829=>600,7830=>600,7831=>600,7832=>600,7833=>600,7834=>600,7835=>600,7840=>600,7841=>600,7842=>600,
-7843=>600,7844=>600,7845=>600,7846=>600,7847=>600,7848=>600,7849=>600,7850=>600,7851=>600,7852=>600,
-7853=>600,7854=>600,7855=>600,7856=>600,7857=>600,7858=>600,7859=>600,7860=>600,7861=>600,7862=>600,
-7863=>600,7864=>600,7865=>600,7866=>600,7867=>600,7868=>600,7869=>600,7870=>600,7871=>600,7872=>600,
-7873=>600,7874=>600,7875=>600,7876=>600,7877=>600,7878=>600,7879=>600,7880=>600,7881=>600,7882=>600,
-7883=>600,7884=>600,7885=>600,7886=>600,7887=>600,7888=>600,7889=>600,7890=>600,7891=>600,7892=>600,
-7893=>600,7894=>600,7895=>600,7896=>600,7897=>600,7898=>600,7899=>600,7900=>600,7901=>600,7902=>600,
-7903=>600,7904=>600,7905=>600,7906=>600,7907=>600,7908=>600,7909=>600,7910=>600,7911=>600,7912=>600,
-7913=>600,7914=>600,7915=>600,7916=>600,7917=>600,7918=>600,7919=>600,7920=>600,7921=>600,7922=>600,
-7923=>600,7924=>600,7925=>600,7926=>600,7927=>600,7928=>600,7929=>600,7936=>600,7937=>600,7938=>600,
-7939=>600,7940=>600,7941=>600,7942=>600,7943=>600,7944=>600,7945=>600,7946=>600,7947=>600,7948=>600,
-7949=>600,7950=>600,7951=>600,7952=>600,7953=>600,7954=>600,7955=>600,7956=>600,7957=>600,7960=>600,
-7961=>600,7962=>600,7963=>600,7964=>600,7965=>600,7968=>600,7969=>600,7970=>600,7971=>600,7972=>600,
-7973=>600,7974=>600,7975=>600,7976=>600,7977=>600,7978=>600,7979=>600,7980=>600,7981=>600,7982=>600,
-7983=>600,7984=>600,7985=>600,7986=>600,7987=>600,7988=>600,7989=>600,7990=>600,7991=>600,7992=>600,
-7993=>600,7994=>600,7995=>600,7996=>600,7997=>600,7998=>600,7999=>600,8000=>600,8001=>600,8002=>600,
-8003=>600,8004=>600,8005=>600,8008=>600,8009=>600,8010=>600,8011=>600,8012=>600,8013=>600,8016=>600,
-8017=>600,8018=>600,8019=>600,8020=>600,8021=>600,8022=>600,8023=>600,8025=>600,8027=>600,8029=>600,
-8031=>600,8032=>600,8033=>600,8034=>600,8035=>600,8036=>600,8037=>600,8038=>600,8039=>600,8040=>600,
-8041=>600,8042=>600,8043=>600,8044=>600,8045=>600,8046=>600,8047=>600,8048=>600,8049=>600,8050=>600,
-8051=>600,8052=>600,8053=>600,8054=>600,8055=>600,8056=>600,8057=>600,8058=>600,8059=>600,8060=>600,
-8061=>600,8064=>600,8065=>600,8066=>600,8067=>600,8068=>600,8069=>600,8070=>600,8071=>600,8072=>600,
-8073=>600,8074=>600,8075=>600,8076=>600,8077=>600,8078=>600,8079=>600,8080=>600,8081=>600,8082=>600,
-8083=>600,8084=>600,8085=>600,8086=>600,8087=>600,8088=>600,8089=>600,8090=>600,8091=>600,8092=>600,
-8093=>600,8094=>600,8095=>600,8096=>600,8097=>600,8098=>600,8099=>600,8100=>600,8101=>600,8102=>600,
-8103=>600,8104=>600,8105=>600,8106=>600,8107=>600,8108=>600,8109=>600,8110=>600,8111=>600,8112=>600,
-8113=>600,8114=>600,8115=>600,8116=>600,8118=>600,8119=>600,8120=>600,8121=>600,8122=>600,8123=>600,
-8124=>600,8125=>600,8126=>600,8127=>600,8128=>600,8129=>600,8130=>600,8131=>600,8132=>600,8134=>600,
-8135=>600,8136=>600,8137=>600,8138=>600,8139=>600,8140=>600,8141=>600,8142=>600,8143=>600,8144=>600,
-8145=>600,8146=>600,8147=>600,8150=>600,8151=>600,8152=>600,8153=>600,8154=>600,8155=>600,8157=>600,
-8158=>600,8159=>600,8160=>600,8161=>600,8162=>600,8163=>600,8164=>600,8165=>600,8166=>600,8167=>600,
-8168=>600,8169=>600,8170=>600,8171=>600,8172=>600,8173=>600,8174=>600,8175=>600,8178=>600,8179=>600,
-8180=>600,8182=>600,8183=>600,8184=>600,8185=>600,8186=>600,8187=>600,8188=>600,8189=>600,8190=>600,
-8192=>600,8193=>600,8194=>600,8195=>600,8196=>600,8197=>600,8198=>600,8199=>600,8200=>600,8201=>600,
-8202=>600,8203=>600,8204=>0,8205=>0,8206=>0,8207=>0,8208=>600,8209=>600,8210=>600,8213=>600,
-8214=>600,8215=>600,8219=>600,8223=>600,8227=>600,8228=>600,8229=>600,8231=>600,8232=>600,8233=>600,
-8234=>600,8235=>600,8236=>600,8237=>600,8238=>600,8239=>600,8241=>600,8242=>600,8243=>600,8244=>600,
-8245=>600,8246=>600,8247=>600,8248=>600,8251=>600,8252=>600,8253=>600,8254=>600,8255=>600,8256=>600,
-8257=>600,8258=>600,8259=>600,8260=>600,8261=>600,8262=>600,8263=>600,8264=>600,8265=>600,8266=>600,
-8267=>600,8268=>600,8269=>600,8270=>600,8271=>600,8272=>600,8273=>600,8274=>600,8275=>600,8276=>600,
-8277=>600,8278=>600,8279=>600,8280=>600,8281=>600,8282=>600,8283=>600,8284=>600,8285=>600,8286=>600,
-8287=>600,8288=>600,8289=>600,8290=>600,8291=>600,8292=>600,8298=>600,8299=>600,8300=>600,8301=>600,
-8302=>600,8303=>600,8304=>600,8305=>600,8308=>600,8309=>600,8310=>600,8311=>600,8312=>600,8313=>600,
-8314=>600,8315=>600,8316=>600,8317=>600,8318=>600,8319=>600,8320=>600,8321=>600,8322=>600,8323=>600,
-8324=>600,8325=>600,8326=>600,8327=>600,8328=>600,8329=>600,8330=>600,8331=>600,8332=>600,8333=>600,
-8334=>600,8336=>600,8337=>600,8338=>600,8339=>600,8340=>600,8355=>600,8356=>600,8359=>600,8362=>600,
-8373=>600,8448=>600,8449=>600,8450=>600,8451=>600,8453=>600,8454=>600,8455=>600,8457=>600,8461=>600,
-8464=>600,8465=>600,8466=>600,8467=>600,8468=>600,8469=>600,8470=>600,8471=>600,8472=>600,8473=>600,
-8474=>600,8476=>600,8477=>600,8478=>600,8481=>600,8484=>600,8486=>600,8487=>600,8489=>600,8490=>600,
-8491=>600,8498=>600,8501=>600,8502=>600,8503=>600,8504=>600,8506=>600,8507=>600,8523=>600,8525=>600,
-8526=>600,8531=>600,8532=>600,8533=>600,8534=>600,8535=>600,8536=>600,8537=>600,8538=>600,8539=>600,
-8540=>600,8541=>600,8542=>600,8543=>600,8544=>600,8545=>600,8546=>600,8547=>600,8548=>600,8549=>600,
-8550=>600,8551=>600,8552=>600,8553=>600,8554=>600,8555=>600,8556=>600,8557=>600,8558=>600,8559=>600,
-8560=>600,8561=>600,8562=>600,8563=>600,8564=>600,8565=>600,8566=>600,8567=>600,8568=>600,8569=>600,
-8570=>600,8571=>600,8572=>600,8573=>600,8574=>600,8575=>600,8592=>600,8593=>600,8594=>600,8595=>600,
-8596=>600,8597=>600,8598=>600,8599=>600,8600=>600,8601=>600,8616=>600,8704=>600,8706=>600,8707=>600,
-8709=>600,8710=>600,8711=>600,8712=>600,8713=>600,8715=>600,8716=>600,8721=>600,8722=>600,8723=>600,
-8725=>600,8729=>600,8730=>600,8733=>600,8734=>600,8745=>600,8746=>600,8747=>600,8756=>600,8764=>600,
-8769=>600,8770=>600,8773=>600,8776=>600,8800=>600,8801=>600,8804=>600,8805=>600,8834=>600,8835=>600,
-8836=>600,8837=>600,8838=>600,8839=>600,9001=>600,9002=>600,9251=>600,9674=>600,9824=>600,9825=>600,
-9826=>600,9827=>600,9828=>600,9829=>600,9830=>600,9831=>600,9833=>600,9834=>600,9835=>600,9836=>600,
-9837=>600,9838=>600,9839=>600,64256=>600,64257=>600,64258=>600,64285=>600,64286=>600,64287=>600,64288=>600,
-64289=>600,64290=>600,64291=>600,64292=>600,64293=>600,64294=>600,64295=>600,64296=>600,64297=>600,64298=>600,
-64299=>600,64300=>600,64301=>600,64302=>600,64303=>600,64304=>600,64305=>600,64306=>600,64307=>600,64308=>600,
-64309=>600,64310=>600,64312=>600,64313=>600,64314=>600,64315=>600,64316=>600,64318=>600,64320=>600,64321=>600,
-64323=>600,64324=>600,64326=>600,64327=>600,64328=>600,64329=>600,64330=>600,64331=>600,64332=>600,64333=>600,
-64334=>600,64335=>600,65533=>600);
-$enc='';
-$diff='';
-$file='freemonoi.z';
-$ctg='freemonoi.ctg.z';
-$originalsize=196732;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesans.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesans.php
deleted file mode 100644
index 7d258b86c5d..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesans.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSans';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>32,'FontBBox'=>'[-958 -550 1632 1050]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
-$up=-176;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,40=>333,41=>333,
-42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,50=>556,51=>556,
-52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,60=>584,61=>584,
-62=>584,63=>556,64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,70=>611,71=>778,
-72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,80=>667,81=>778,
-82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>278,
-92=>278,93=>277,94=>469,95=>556,96=>333,97=>556,98=>556,99=>500,100=>556,101=>556,
-102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,109=>833,110=>556,111=>556,
-112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,118=>500,119=>722,120=>500,121=>500,
-122=>500,123=>334,124=>260,125=>334,126=>584,8364=>655,8218=>222,402=>278,8222=>333,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>250,338=>1000,381=>611,8216=>222,8217=>221,
-8220=>333,8221=>333,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>500,8250=>250,339=>944,
-382=>500,376=>667,160=>278,161=>278,162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,
-168=>333,169=>737,170=>370,171=>448,172=>584,173=>333,174=>737,175=>333,176=>606,177=>584,
-178=>350,179=>350,180=>333,181=>556,182=>537,183=>278,184=>333,185=>350,186=>365,187=>448,
-188=>869,189=>869,190=>869,191=>556,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,
-198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,
-218=>722,219=>722,220=>722,221=>667,222=>666,223=>611,224=>556,225=>556,226=>556,227=>556,
-228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,
-238=>278,239=>278,240=>556,241=>556,242=>556,243=>556,244=>556,245=>556,246=>556,247=>584,
-248=>611,249=>556,250=>556,251=>556,252=>556,253=>500,254=>555,255=>500,256=>667,257=>556,
-258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,
-268=>722,269=>500,270=>722,271=>722,272=>722,273=>556,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,
-288=>778,289=>556,290=>778,291=>556,292=>722,293=>556,294=>722,295=>556,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>222,304=>278,305=>278,306=>700,307=>374,
-308=>500,309=>222,310=>667,311=>500,312=>500,313=>556,314=>222,315=>556,316=>222,317=>556,
-318=>387,319=>556,320=>500,321=>556,322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>722,330=>722,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,
-350=>667,351=>500,354=>611,355=>278,356=>611,357=>443,358=>611,359=>278,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>944,373=>722,374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>278,384=>556,
-385=>854,386=>668,387=>556,388=>667,389=>556,390=>722,391=>722,392=>500,393=>722,394=>899,
-395=>667,396=>556,397=>564,398=>667,399=>722,400=>667,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>333,408=>667,409=>500,410=>333,411=>560,412=>833,413=>722,414=>556,415=>778,
-416=>788,417=>565,418=>944,419=>722,420=>842,421=>556,422=>666,423=>667,424=>500,425=>611,
-426=>333,427=>278,428=>611,429=>278,430=>611,431=>776,432=>624,433=>778,434=>722,435=>722,
-436=>556,437=>611,438=>500,439=>611,440=>611,441=>500,442=>500,443=>556,446=>556,447=>556,
-448=>260,449=>370,450=>584,451=>278,452=>1311,453=>1208,454=>1056,455=>1056,456=>778,457=>444,
-458=>1158,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,
-468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,476=>556,477=>556,
-478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,
-488=>667,489=>500,490=>778,491=>556,492=>778,493=>556,494=>611,495=>500,496=>222,497=>1333,
-498=>1222,499=>1056,500=>778,501=>556,503=>630,504=>722,505=>556,506=>667,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,526=>778,527=>556,528=>722,
-529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,536=>667,537=>500,538=>611,
-539=>278,540=>521,541=>393,542=>722,543=>556,548=>611,549=>500,550=>667,551=>556,552=>667,
-553=>556,554=>778,555=>556,556=>778,557=>556,558=>778,559=>556,560=>778,561=>556,562=>667,
-563=>500,567=>222,592=>556,593=>556,594=>556,595=>556,596=>500,597=>500,598=>556,599=>556,
-600=>556,601=>556,602=>804,603=>500,604=>499,605=>742,606=>500,607=>222,608=>556,609=>556,
-610=>546,611=>500,612=>556,613=>556,614=>556,615=>556,616=>222,617=>222,618=>278,619=>473,
-620=>427,621=>222,622=>611,623=>833,624=>833,625=>833,626=>556,627=>556,628=>567,629=>556,
-630=>778,631=>722,632=>741,633=>333,634=>333,635=>333,636=>333,637=>333,638=>384,639=>369,
-640=>546,641=>546,642=>500,643=>278,644=>278,645=>278,646=>444,647=>278,648=>278,649=>556,
-650=>626,651=>539,652=>500,653=>722,654=>500,655=>556,656=>500,657=>500,658=>500,659=>552,
-660=>556,661=>556,662=>556,663=>722,664=>778,665=>506,666=>500,667=>546,668=>558,669=>444,
-670=>500,671=>430,672=>556,673=>556,674=>556,675=>944,676=>944,677=>944,678=>689,679=>506,
-680=>764,681=>766,682=>660,683=>577,684=>530,685=>486,686=>565,687=>621,688=>333,689=>333,
-690=>167,691=>236,692=>236,693=>276,694=>359,695=>500,696=>330,697=>278,698=>454,699=>278,
-700=>278,701=>278,702=>333,703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,
-711=>333,712=>333,713=>333,714=>333,715=>333,716=>272,717=>333,718=>333,719=>333,720=>333,
-721=>333,722=>333,723=>333,724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,
-731=>333,733=>333,734=>333,735=>510,736=>333,737=>186,738=>333,739=>333,740=>334,741=>526,
-742=>526,743=>526,744=>526,745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,
-752=>333,753=>333,754=>333,755=>327,756=>261,757=>437,758=>437,759=>333,760=>278,761=>200,
-762=>200,763=>200,764=>200,765=>333,766=>333,767=>333,768=>0,769=>0,770=>0,771=>0,
-772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,
-782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,
-792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,
-802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,
-812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,
-832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,
-842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,
-862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,
-872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,878=>0,879=>0,884=>278,885=>199,
-890=>332,894=>278,900=>333,901=>333,902=>667,903=>275,904=>786,905=>828,906=>369,908=>833,
-910=>845,911=>778,912=>286,913=>667,914=>667,915=>582,916=>778,917=>667,918=>628,919=>722,
-920=>778,921=>278,922=>667,923=>667,924=>833,925=>722,926=>630,927=>778,928=>722,929=>667,
-931=>628,932=>611,933=>667,934=>717,935=>667,936=>745,937=>778,938=>278,939=>667,940=>608,
-941=>528,942=>548,943=>307,944=>538,945=>596,946=>542,947=>531,948=>564,949=>512,950=>455,
-951=>548,952=>525,953=>286,954=>510,955=>551,956=>540,957=>500,958=>470,959=>546,960=>619,
-961=>569,962=>547,963=>620,964=>492,965=>538,966=>741,967=>571,968=>662,969=>740,970=>286,
-971=>538,972=>546,973=>538,974=>740,977=>580,978=>742,979=>845,980=>620,981=>741,982=>740,
-983=>556,1008=>556,1009=>566,1012=>778,1013=>328,1024=>667,1025=>657,1026=>766,1027=>582,1028=>722,
-1029=>667,1030=>278,1031=>278,1032=>500,1033=>1080,1034=>1014,1035=>766,1036=>628,1037=>730,1038=>613,
-1039=>722,1040=>666,1041=>668,1042=>668,1043=>582,1044=>812,1045=>657,1046=>905,1047=>667,1048=>730,
-1049=>730,1050=>632,1051=>674,1052=>846,1053=>721,1054=>796,1055=>721,1056=>654,1057=>722,1058=>611,
-1059=>613,1060=>861,1061=>657,1062=>742,1063=>626,1064=>830,1065=>851,1066=>841,1067=>874,1068=>670,
-1069=>717,1070=>1001,1071=>686,1072=>552,1073=>550,1074=>506,1075=>404,1076=>602,1077=>547,1078=>755,
-1079=>499,1080=>567,1081=>567,1082=>489,1083=>517,1084=>618,1085=>558,1086=>550,1087=>557,1088=>577,
-1089=>520,1090=>444,1091=>468,1092=>865,1093=>466,1094=>578,1095=>498,1096=>692,1097=>712,1098=>664,
-1099=>690,1100=>521,1101=>520,1102=>759,1103=>543,1104=>549,1105=>549,1106=>577,1107=>404,1108=>519,
-1109=>502,1110=>224,1111=>278,1112=>223,1113=>813,1114=>853,1115=>577,1116=>489,1117=>567,1118=>468,
-1119=>558,1120=>942,1121=>693,1136=>762,1137=>662,1138=>800,1139=>550,1148=>942,1149=>693,1150=>942,
-1151=>693,1154=>468,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,1162=>763,
-1163=>583,1164=>689,1165=>526,1166=>652,1167=>572,1168=>601,1169=>397,1170=>589,1171=>392,1172=>591,
-1173=>475,1174=>927,1175=>830,1176=>661,1177=>493,1178=>658,1179=>510,1180=>675,1181=>519,1182=>684,
-1183=>514,1184=>839,1185=>653,1186=>740,1187=>570,1188=>987,1189=>714,1190=>1058,1191=>808,1192=>722,
-1193=>510,1194=>722,1195=>516,1196=>611,1197=>402,1198=>668,1199=>578,1200=>668,1201=>588,1202=>664,
-1203=>488,1204=>936,1205=>679,1206=>638,1207=>521,1208=>630,1209=>498,1210=>630,1211=>498,1212=>927,
-1213=>699,1214=>919,1215=>703,1216=>254,1217=>905,1218=>755,1219=>668,1220=>512,1221=>696,1222=>524,
-1223=>721,1224=>558,1225=>744,1226=>571,1227=>630,1228=>498,1229=>869,1230=>631,1231=>254,1232=>666,
-1233=>552,1234=>666,1235=>552,1236=>1000,1237=>879,1238=>657,1239=>547,1240=>722,1241=>543,1242=>722,
-1243=>543,1244=>905,1245=>755,1246=>667,1247=>499,1248=>611,1249=>540,1250=>730,1251=>567,1252=>730,
-1253=>567,1254=>796,1255=>550,1256=>800,1257=>550,1258=>800,1259=>550,1260=>717,1261=>520,1262=>613,
-1263=>468,1264=>613,1265=>468,1266=>613,1267=>468,1268=>626,1269=>498,1270=>582,1271=>395,1272=>874,
-1273=>690,1296=>667,1297=>491,1298=>665,1299=>509,1306=>778,1307=>575,1308=>934,1309=>712,1310=>627,
-1311=>489,1329=>720,1330=>696,1331=>750,1332=>725,1333=>699,1334=>751,1335=>446,1336=>703,1337=>790,
-1338=>656,1339=>697,1340=>390,1341=>852,1342=>791,1343=>698,1344=>585,1345=>656,1346=>651,1347=>658,
-1348=>759,1349=>595,1350=>772,1351=>603,1352=>703,1353=>648,1354=>698,1355=>744,1356=>738,1357=>703,
-1358=>739,1359=>660,1360=>693,1361=>623,1362=>385,1363=>788,1364=>632,1365=>775,1366=>714,1369=>333,
-1370=>222,1371=>200,1372=>333,1373=>333,1374=>333,1375=>333,1377=>833,1378=>551,1379=>572,1380=>569,
-1381=>546,1382=>581,1383=>353,1384=>551,1385=>568,1386=>569,1387=>552,1388=>276,1389=>795,1390=>535,
-1391=>553,1392=>537,1393=>512,1394=>568,1395=>552,1396=>531,1397=>249,1398=>527,1399=>405,1400=>551,
-1401=>390,1402=>833,1403=>509,1404=>523,1405=>545,1406=>584,1407=>879,1408=>552,1409=>552,1410=>301,
-1411=>884,1412=>578,1413=>556,1414=>668,1415=>544,1417=>278,1418=>333,1456=>0,1457=>0,1458=>0,
-1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,
-1470=>488,1471=>0,1472=>212,1473=>0,1474=>0,1475=>278,1476=>0,1488=>640,1489=>591,1490=>466,
-1491=>598,1492=>622,1493=>212,1494=>351,1495=>623,1496=>608,1497=>200,1498=>526,1499=>550,1500=>600,
-1501=>623,1502=>621,1503=>212,1504=>378,1505=>607,1506=>587,1507=>575,1508=>568,1509=>540,1510=>590,
-1511=>606,1512=>547,1513=>776,1514=>687,1520=>424,1521=>412,1522=>400,1523=>184,1524=>344,1792=>600,
-1793=>201,1794=>201,1795=>201,1796=>201,1797=>500,1798=>500,1799=>500,1800=>370,1801=>370,1802=>574,
-1803=>574,1804=>645,1805=>574,1807=>0,1808=>452,1809=>452,1810=>574,1811=>645,1812=>645,1813=>509,
-1814=>509,1815=>682,1816=>585,1817=>404,1818=>627,1819=>718,1820=>718,1821=>484,1822=>682,1823=>600,
-1824=>660,1825=>682,1826=>538,1827=>718,1828=>718,1829=>718,1830=>574,1831=>574,1832=>638,1833=>585,
-1834=>509,1835=>682,1836=>682,1840=>0,1841=>0,1842=>0,1843=>0,1844=>0,1845=>0,1846=>0,
-1847=>0,1848=>0,1849=>0,1850=>0,1851=>0,1852=>0,1853=>0,1854=>0,1855=>0,1856=>0,
-1857=>0,1858=>0,1859=>0,1860=>0,1861=>0,1862=>0,1863=>0,1864=>0,1865=>0,1866=>0,
-2305=>6,2306=>0,2307=>305,2308=>717,2309=>717,2310=>829,2311=>463,2312=>463,2313=>581,2314=>803,
-2315=>920,2316=>639,2317=>430,2318=>430,2319=>430,2320=>430,2321=>856,2322=>828,2323=>837,2324=>856,
-2325=>749,2326=>779,2327=>522,2328=>587,2329=>650,2330=>619,2331=>641,2332=>703,2333=>691,2334=>677,
-2335=>568,2336=>529,2337=>611,2338=>536,2339=>607,2340=>564,2341=>659,2342=>500,2343=>591,2344=>521,
-2345=>568,2346=>477,2347=>728,2348=>490,2349=>577,2350=>517,2351=>554,2352=>433,2353=>433,2354=>656,
-2355=>660,2356=>660,2357=>490,2358=>645,2359=>477,2360=>666,2361=>484,2364=>6,2365=>442,2366=>211,
-2367=>211,2368=>211,2369=>6,2370=>3,2371=>6,2372=>0,2373=>6,2374=>84,2375=>6,2376=>6,
-2377=>224,2378=>234,2379=>211,2380=>211,2381=>6,2384=>839,2385=>15,2386=>0,2387=>9,2388=>9,
-2392=>750,2393=>779,2394=>522,2395=>703,2396=>613,2397=>536,2398=>728,2399=>554,2400=>899,2401=>625,
-2402=>625,2403=>625,2404=>674,2405=>674,2406=>575,2407=>575,2408=>575,2409=>575,2410=>575,2411=>575,
-2412=>575,2413=>575,2414=>575,2415=>575,2416=>365,2417=>387,2418=>717,2433=>0,2434=>300,2435=>264,
-2437=>594,2438=>790,2439=>469,2440=>513,2441=>520,2442=>549,2443=>594,2444=>481,2447=>580,2448=>627,
-2451=>540,2452=>613,2453=>570,2454=>467,2455=>471,2456=>428,2457=>483,2458=>408,2459=>509,2460=>591,
-2461=>563,2462=>771,2463=>381,2464=>404,2465=>522,2466=>408,2467=>450,2468=>543,2469=>477,2470=>418,
-2471=>433,2472=>445,2474=>499,2475=>584,2476=>377,2477=>555,2478=>448,2479=>423,2480=>390,2482=>498,
-2486=>498,2487=>425,2488=>495,2489=>440,2492=>22,2493=>440,2494=>193,2495=>189,2496=>180,2497=>0,
-2498=>0,2499=>0,2500=>0,2503=>252,2504=>243,2507=>889,2508=>865,2509=>0,2510=>356,2519=>219,
-2524=>523,2525=>408,2527=>428,2528=>594,2529=>481,2530=>0,2531=>0,2534=>500,2535=>437,2536=>479,
-2537=>530,2538=>497,2539=>500,2540=>482,2541=>503,2542=>517,2543=>481,2544=>377,2545=>377,2546=>429,
-2547=>383,2548=>429,2549=>478,2550=>545,2551=>158,2552=>365,2553=>280,2554=>357,2561=>0,2562=>0,
-2563=>351,2565=>860,2566=>1088,2567=>869,2568=>928,2569=>723,2570=>723,2575=>665,2576=>857,2579=>716,
-2580=>858,2581=>682,2582=>634,2583=>696,2584=>744,2585=>649,2586=>674,2587=>656,2588=>653,2589=>629,
-2590=>639,2591=>641,2592=>657,2593=>650,2594=>653,2595=>651,2596=>640,2597=>634,2598=>662,2599=>630,
-2600=>625,2602=>645,2603=>653,2604=>624,2605=>613,2606=>658,2607=>734,2608=>620,2610=>676,2611=>719,
-2613=>626,2614=>666,2616=>666,2617=>614,2620=>0,2622=>286,2623=>322,2624=>301,2625=>0,2626=>0,
-2631=>0,2632=>0,2635=>0,2636=>0,2637=>0,2649=>636,2650=>762,2651=>652,2652=>653,2654=>656,
-2662=>672,2663=>543,2664=>622,2665=>622,2666=>576,2667=>589,2668=>509,2669=>645,2670=>661,2671=>655,
-2672=>0,2673=>0,2674=>666,2675=>726,2676=>1217,2689=>22,2690=>23,2691=>0,2693=>775,2694=>979,
-2695=>588,2696=>563,2697=>525,2698=>724,2699=>942,2701=>775,2703=>775,2704=>775,2705=>979,2707=>979,
-2708=>979,2709=>610,2710=>706,2711=>623,2712=>610,2713=>601,2714=>614,2715=>642,2716=>684,2717=>634,
-2718=>644,2719=>509,2720=>541,2721=>539,2722=>524,2723=>657,2724=>547,2725=>616,2726=>494,2727=>601,
-2728=>627,2730=>524,2731=>620,2732=>691,2733=>687,2734=>468,2735=>590,2736=>509,2738=>571,2739=>687,
-2741=>526,2742=>620,2743=>575,2744=>620,2745=>549,2748=>53,2749=>415,2750=>241,2751=>186,2752=>217,
-2753=>32,2754=>21,2755=>38,2756=>27,2757=>45,2759=>41,2760=>46,2761=>207,2763=>190,2764=>182,
-2765=>16,2768=>962,2784=>949,2790=>479,2791=>502,2792=>484,2793=>471,2794=>501,2795=>527,2796=>462,
-2797=>524,2798=>454,2799=>495,2801=>752,2946=>479,2947=>893,2949=>1018,2950=>1170,2951=>916,2952=>676,
-2953=>836,2954=>1225,2958=>744,2959=>744,2960=>848,2962=>813,2963=>813,2964=>813,2965=>688,2969=>744,
-2970=>676,2972=>848,2974=>984,2975=>777,2979=>1338,2980=>664,2984=>561,2985=>1029,2986=>607,2990=>697,
-2991=>697,2992=>434,2993=>617,2994=>869,2995=>859,2996=>697,2997=>869,2999=>1145,3000=>1064,3001=>1316,
-3006=>424,3007=>125,3008=>596,3009=>539,3014=>596,3015=>650,3016=>973,3018=>1286,3019=>1286,3020=>1706,
-3021=>333,3031=>859,3050=>778,3051=>881,3052=>876,3053=>648,3057=>744,4256=>587,4257=>620,4258=>642,
-4259=>815,4260=>600,4261=>595,4262=>799,4263=>893,4264=>622,4265=>597,4266=>939,4267=>602,4268=>603,
-4269=>790,4270=>587,4271=>623,4272=>799,4273=>601,4274=>792,4275=>724,4276=>847,4277=>599,4278=>812,
-4279=>603,4280=>653,4281=>590,4282=>754,4283=>596,4284=>653,4285=>651,4286=>596,4287=>888,4288=>593,
-4304=>436,4305=>491,4306=>528,4307=>692,4308=>447,4309=>447,4310=>628,4311=>734,4312=>449,4313=>445,
-4314=>843,4315=>449,4316=>449,4317=>682,4318=>449,4319=>480,4320=>682,4321=>468,4322=>710,4323=>623,
-4324=>697,4325=>447,4326=>702,4327=>447,4328=>470,4329=>440,4330=>632,4331=>449,4332=>470,4333=>536,
-4334=>449,4335=>656,4336=>474,4337=>630,4338=>394,4339=>419,4340=>422,4341=>436,4345=>528,4347=>515,
-7680=>667,7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,
-7690=>722,7691=>556,7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,
-7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,7708=>667,7709=>556,
-7710=>611,7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,
-7720=>722,7721=>556,7722=>722,7723=>556,7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,
-7730=>667,7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,
-7740=>556,7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,
-7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,7756=>778,7757=>556,7758=>778,7759=>556,
-7760=>778,7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,
-7770=>722,7771=>333,7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,
-7780=>667,7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,7788=>611,7789=>278,
-7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,
-7800=>722,7801=>556,7802=>722,7803=>556,7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,
-7810=>944,7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,
-7820=>667,7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,
-7830=>556,7831=>278,7832=>722,7833=>500,7834=>555,7835=>278,7840=>667,7841=>556,7842=>667,7843=>556,
-7844=>667,7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,
-7854=>667,7855=>556,7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,
-7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,7872=>667,7873=>556,
-7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,
-7884=>778,7885=>556,7886=>778,7887=>556,7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,
-7894=>778,7895=>556,7896=>778,7897=>556,7898=>788,7899=>565,7900=>788,7901=>565,7902=>788,7903=>565,
-7904=>788,7905=>565,7906=>788,7907=>565,7908=>722,7909=>556,7910=>722,7911=>556,7912=>776,7913=>624,
-7914=>776,7915=>624,7916=>776,7917=>624,7918=>776,7919=>624,7920=>776,7921=>624,7922=>667,7923=>500,
-7924=>667,7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>596,7937=>596,7938=>596,7939=>596,
-7940=>596,7941=>596,7942=>596,7943=>596,7944=>667,7945=>667,7946=>742,7947=>756,7948=>692,7949=>699,
-7950=>673,7951=>667,7952=>512,7953=>512,7954=>512,7955=>512,7956=>512,7957=>512,7960=>730,7961=>714,
-7962=>900,7963=>882,7964=>867,7965=>879,7968=>548,7969=>548,7970=>548,7971=>548,7972=>548,7973=>548,
-7974=>548,7975=>548,7976=>772,7977=>778,7978=>945,7979=>947,7980=>943,7981=>946,7982=>853,7983=>853,
-7984=>286,7985=>286,7986=>286,7987=>286,7988=>286,7989=>286,7990=>286,7991=>286,7992=>322,7993=>321,
-7994=>482,7995=>485,7996=>477,7997=>484,7998=>394,7999=>390,8000=>546,8001=>546,8002=>546,8003=>546,
-8004=>546,8005=>546,8008=>775,8009=>784,8010=>990,8011=>987,8012=>887,8013=>897,8016=>538,8017=>538,
-8018=>538,8019=>538,8020=>538,8021=>538,8022=>538,8023=>538,8025=>747,8027=>915,8029=>971,8031=>863,
-8032=>740,8033=>740,8034=>740,8035=>740,8036=>740,8037=>740,8038=>740,8039=>740,8040=>769,8041=>774,
-8042=>972,8043=>970,8044=>879,8045=>918,8046=>901,8047=>901,8048=>596,8049=>596,8050=>512,8051=>512,
-8052=>548,8053=>548,8054=>286,8055=>286,8056=>546,8057=>546,8058=>538,8059=>538,8060=>740,8061=>740,
-8064=>596,8065=>596,8066=>596,8067=>596,8068=>596,8069=>596,8070=>596,8071=>596,8072=>830,8073=>828,
-8074=>916,8075=>916,8076=>853,8077=>860,8078=>835,8079=>827,8080=>548,8081=>548,8082=>548,8083=>548,
-8084=>548,8085=>548,8086=>548,8087=>548,8088=>928,8089=>931,8090=>1104,8091=>1109,8092=>1099,8093=>1102,
-8094=>1009,8095=>1012,8096=>740,8097=>740,8098=>740,8099=>740,8100=>740,8101=>740,8102=>740,8103=>740,
-8104=>934,8105=>934,8106=>1130,8107=>1128,8108=>1045,8109=>1077,8110=>1062,8111=>1065,8112=>596,8113=>596,
-8114=>596,8115=>596,8116=>596,8118=>596,8119=>596,8120=>667,8121=>667,8122=>667,8123=>667,8124=>832,
-8125=>333,8126=>200,8127=>333,8128=>333,8129=>333,8130=>548,8131=>548,8132=>548,8134=>548,8135=>548,
-8136=>833,8137=>776,8138=>944,8139=>896,8140=>875,8141=>400,8142=>400,8143=>333,8144=>286,8145=>286,
-8146=>286,8147=>286,8150=>286,8151=>286,8152=>278,8153=>278,8154=>385,8155=>376,8157=>400,8158=>400,
-8159=>333,8160=>538,8161=>538,8162=>538,8163=>538,8164=>569,8165=>569,8166=>538,8167=>514,8168=>667,
-8169=>667,8170=>817,8171=>827,8172=>741,8173=>393,8174=>393,8175=>333,8178=>740,8179=>740,8180=>740,
-8182=>740,8183=>740,8184=>833,8185=>833,8186=>848,8187=>814,8188=>939,8189=>333,8190=>333,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>556,8213=>1000,8214=>312,
-8215=>566,8219=>221,8223=>333,8227=>350,8228=>278,8229=>666,8231=>278,8232=>0,8233=>0,8234=>0,
-8235=>0,8236=>0,8237=>0,8238=>0,8239=>500,8241=>1360,8242=>278,8243=>469,8244=>680,8245=>278,
-8246=>469,8247=>680,8248=>376,8251=>622,8252=>556,8253=>556,8254=>556,8255=>658,8256=>658,8257=>438,
-8258=>840,8259=>400,8260=>167,8261=>334,8262=>334,8263=>1112,8264=>834,8265=>834,8266=>556,8267=>537,
-8268=>537,8269=>537,8270=>389,8271=>278,8272=>658,8273=>389,8274=>634,8275=>500,8276=>658,8277=>787,
-8278=>515,8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,8285=>224,8286=>224,8287=>0,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>350,8305=>350,8308=>350,8309=>350,8310=>350,
-8311=>350,8312=>350,8313=>350,8314=>350,8315=>350,8316=>350,8317=>350,8318=>350,8319=>350,8320=>350,
-8321=>350,8322=>350,8323=>350,8324=>350,8325=>350,8326=>350,8327=>350,8328=>350,8329=>350,8330=>350,
-8331=>350,8332=>350,8333=>350,8334=>350,8336=>350,8337=>349,8338=>350,8339=>350,8340=>350,8353=>615,
-8354=>601,8355=>611,8356=>556,8357=>833,8358=>682,8359=>1317,8360=>1202,8361=>879,8362=>869,8363=>538,
-8365=>667,8366=>611,8368=>570,8369=>684,8370=>717,8371=>667,8372=>667,8373=>640,8400=>0,8401=>0,
-8402=>0,8403=>0,8406=>0,8407=>0,8411=>0,8412=>0,8413=>0,8414=>0,8415=>0,8416=>0,
-8417=>0,8421=>0,8422=>0,8423=>0,8424=>0,8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,
-8430=>0,8431=>0,8432=>0,8448=>970,8449=>979,8451=>1017,8452=>556,8453=>876,8454=>922,8455=>667,
-8457=>919,8459=>969,8460=>615,8462=>556,8463=>572,8464=>809,8465=>606,8466=>874,8467=>417,8468=>747,
-8470=>934,8471=>737,8472=>600,8475=>850,8476=>699,8480=>1000,8481=>1230,8486=>778,8487=>778,8488=>512,
-8489=>286,8490=>667,8491=>667,8492=>908,8493=>623,8494=>556,8495=>444,8496=>562,8497=>895,8498=>588,
-8499=>1080,8501=>640,8502=>592,8503=>466,8504=>598,8505=>278,8506=>871,8507=>1230,8513=>778,8514=>556,
-8515=>556,8516=>667,8522=>516,8523=>655,8525=>936,8526=>482,8531=>869,8532=>869,8533=>869,8534=>869,
-8535=>869,8536=>869,8537=>869,8538=>869,8539=>869,8540=>869,8541=>869,8542=>869,8543=>869,8544=>278,
-8545=>556,8546=>834,8547=>945,8548=>667,8549=>945,8550=>1223,8551=>1501,8552=>945,8553=>667,8554=>945,
-8555=>1223,8556=>556,8557=>722,8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>722,8564=>500,
-8565=>722,8566=>944,8567=>1166,8568=>722,8569=>500,8570=>722,8571=>944,8572=>222,8573=>500,8574=>556,
-8575=>833,8592=>987,8593=>603,8594=>987,8595=>603,8596=>1042,8597=>1042,8598=>800,8599=>800,8600=>800,
-8601=>800,8614=>987,8617=>987,8618=>987,8629=>658,8636=>987,8637=>987,8638=>380,8639=>393,8640=>987,
-8641=>987,8642=>380,8643=>379,8652=>987,8656=>987,8657=>603,8658=>987,8659=>603,8660=>1042,8661=>603,
-8669=>1092,8704=>667,8706=>556,8707=>667,8709=>823,8710=>711,8711=>711,8712=>584,8713=>584,8714=>584,
-8715=>584,8716=>584,8717=>713,8719=>823,8720=>823,8721=>804,8722=>584,8723=>584,8724=>584,8725=>510,
-8726=>392,8727=>584,8729=>584,8730=>542,8733=>713,8734=>713,8736=>768,8739=>200,8740=>288,8741=>312,
-8742=>340,8743=>603,8744=>603,8745=>768,8746=>768,8747=>556,8748=>796,8749=>956,8750=>556,8756=>863,
-8764=>584,8765=>584,8766=>573,8768=>244,8769=>584,8770=>584,8771=>584,8772=>584,8773=>584,8774=>584,
-8775=>584,8776=>584,8777=>584,8781=>554,8784=>584,8800=>584,8801=>584,8802=>584,8804=>584,8805=>584,
-8810=>955,8811=>955,8813=>554,8814=>584,8815=>584,8816=>584,8817=>584,8818=>584,8819=>584,8826=>584,
-8827=>584,8828=>584,8829=>584,8832=>584,8833=>584,8834=>584,8835=>584,8836=>584,8837=>584,8838=>584,
-8839=>584,8840=>584,8841=>584,8844=>768,8847=>636,8848=>636,8849=>636,8850=>636,8851=>636,8852=>636,
-8853=>768,8854=>768,8855=>768,8856=>768,8857=>768,8866=>658,8867=>658,8868=>658,8869=>658,8870=>600,
-8871=>608,8882=>636,8883=>636,8884=>636,8885=>636,8896=>744,8897=>744,8898=>764,8899=>764,8901=>278,
-8902=>471,8904=>710,8928=>584,8929=>584,8930=>636,8931=>636,8960=>823,8968=>456,8969=>455,8970=>455,
-8971=>456,8992=>556,8993=>556,8994=>658,8995=>658,9001=>329,9002=>329,9115=>384,9116=>384,9117=>384,
-9118=>384,9119=>384,9120=>384,9121=>388,9122=>388,9123=>388,9124=>388,9125=>388,9126=>388,9134=>556,
-9250=>556,9251=>500,9312=>788,9313=>788,9314=>788,9315=>788,9316=>788,9317=>788,9318=>788,9319=>788,
-9320=>788,9321=>788,9472=>1000,9473=>1000,9474=>1000,9475=>1000,9476=>1000,9477=>1000,9478=>1000,9479=>1000,
-9480=>1000,9481=>1000,9482=>1000,9483=>1000,9484=>1000,9485=>1000,9486=>1000,9487=>1000,9488=>1000,9489=>1000,
-9490=>1000,9491=>1000,9492=>1000,9493=>1000,9494=>1000,9495=>1000,9496=>1000,9497=>1000,9498=>1000,9499=>1000,
-9500=>1000,9501=>1000,9502=>1000,9503=>1000,9504=>1000,9505=>1000,9506=>1000,9507=>1000,9508=>1000,9509=>1000,
-9510=>1000,9511=>1000,9512=>1000,9513=>1000,9514=>1000,9515=>1000,9516=>1000,9517=>1000,9518=>1000,9519=>1000,
-9520=>1000,9521=>1000,9522=>1000,9523=>1000,9524=>1000,9525=>1000,9526=>1000,9527=>1000,9528=>1000,9529=>1000,
-9530=>1000,9531=>1000,9532=>1000,9533=>1000,9534=>1000,9535=>1000,9536=>1000,9537=>1000,9538=>1000,9539=>1000,
-9540=>1000,9541=>1000,9542=>1000,9543=>1000,9544=>1000,9545=>1000,9546=>1000,9547=>1000,9552=>1000,9553=>1000,
-9554=>1000,9555=>1000,9556=>1000,9557=>1000,9558=>1000,9559=>1000,9560=>1000,9561=>1000,9562=>1000,9563=>1000,
-9564=>1000,9565=>1000,9566=>1000,9567=>1000,9568=>1000,9569=>1000,9570=>1000,9571=>1000,9572=>1000,9573=>1000,
-9574=>1000,9575=>1000,9576=>1000,9577=>1000,9578=>1000,9579=>1000,9580=>1000,9600=>1000,9601=>1000,9602=>1000,
-9603=>1000,9604=>1000,9605=>1000,9606=>1000,9607=>1000,9608=>1000,9609=>1000,9610=>1000,9611=>1000,9612=>1000,
-9613=>1000,9614=>1000,9615=>1000,9616=>1000,9617=>1000,9618=>1000,9619=>1000,9620=>1000,9621=>1000,9622=>1000,
-9623=>1000,9624=>1000,9625=>1000,9626=>1000,9627=>1000,9628=>1000,9629=>1000,9630=>1000,9631=>1000,9632=>1000,
-9633=>1000,9635=>1000,9636=>1000,9637=>1000,9642=>1000,9644=>1000,9651=>892,9661=>892,9671=>788,9674=>489,
-9675=>791,9711=>882,9772=>929,9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,
-9831=>776,9833=>333,9834=>555,9835=>722,9836=>722,9837=>415,9838=>377,9839=>402,10048=>1161,10752=>791,
-10753=>791,10754=>791,10755=>764,10756=>764,10761=>584,11799=>333,64256=>495,64257=>460,64258=>465,64259=>652,
-64260=>645,64261=>520,64275=>1004,64276=>1044,64277=>1042,64278=>1037,64279=>1256,64285=>200,64286=>305,64287=>400,
-64288=>587,64289=>890,64290=>848,64291=>872,64292=>800,64293=>850,64294=>873,64295=>797,64296=>937,64297=>584,
-64298=>776,64299=>776,64300=>776,64301=>776,64302=>640,64303=>640,64304=>640,64305=>591,64306=>466,64307=>598,
-64308=>622,64309=>262,64310=>351,64312=>608,64313=>270,64314=>526,64315=>550,64316=>600,64318=>621,64320=>378,
-64321=>607,64323=>575,64324=>568,64326=>590,64327=>606,64328=>547,64329=>776,64330=>687,64331=>212,64332=>591,
-64333=>550,64334=>568,64335=>640,65533=>788);
-$enc='';
-$diff='';
-$file='freesans.z';
-$ctg='freesans.ctg.z';
-$originalsize=568896;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansb.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansb.php
deleted file mode 100644
index 0f12960582e..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansb.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSansBold';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>32,'FontBBox'=>'[-967 -1175 1556 1639]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-189;
-$ut=69;
-$dw=600;
-$cw=array(
-32=>278,33=>333,34=>474,35=>556,36=>556,37=>889,38=>722,39=>238,40=>333,41=>333,
-42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,50=>556,51=>556,
-52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>333,59=>333,60=>584,61=>584,
-62=>584,63=>611,64=>975,65=>722,66=>722,67=>722,68=>722,69=>667,70=>611,71=>778,
-72=>722,73=>278,74=>556,75=>722,76=>611,77=>833,78=>722,79=>778,80=>667,81=>778,
-82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>333,
-92=>278,93=>333,94=>584,95=>556,96=>333,97=>556,98=>611,99=>556,100=>611,101=>556,
-102=>333,103=>611,104=>611,105=>278,106=>278,107=>556,108=>278,109=>889,110=>611,111=>611,
-112=>611,113=>611,114=>389,115=>556,116=>333,117=>611,118=>556,119=>778,120=>556,121=>556,
-122=>500,123=>389,124=>280,125=>389,126=>584,8364=>640,8218=>278,402=>333,8222=>500,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,381=>611,8216=>278,8217=>278,
-8220=>500,8221=>500,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>556,8250=>333,339=>944,
-382=>500,376=>667,160=>278,161=>333,162=>556,163=>556,164=>556,165=>556,166=>280,167=>556,
-168=>333,169=>737,170=>370,171=>556,172=>584,173=>333,174=>737,175=>333,176=>606,177=>584,
-178=>351,179=>351,180=>333,181=>611,182=>556,183=>278,184=>333,185=>300,186=>365,187=>556,
-188=>869,189=>869,190=>869,191=>611,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,
-198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,
-218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,226=>556,227=>556,
-228=>556,229=>556,230=>889,231=>556,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,
-238=>278,239=>278,240=>611,241=>611,242=>611,243=>611,244=>611,245=>611,246=>611,247=>584,
-248=>611,249=>611,250=>611,251=>611,252=>611,253=>556,254=>611,255=>556,256=>722,257=>556,
-258=>722,259=>556,260=>722,261=>556,262=>722,263=>556,264=>722,265=>556,266=>722,267=>556,
-268=>722,269=>556,270=>722,271=>723,272=>722,273=>611,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>611,286=>778,287=>611,
-288=>778,289=>611,290=>778,291=>611,292=>722,293=>611,294=>722,295=>611,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>278,304=>278,305=>278,306=>808,307=>492,
-308=>556,309=>278,310=>722,311=>556,312=>559,313=>611,314=>278,315=>611,316=>278,317=>611,
-318=>362,319=>611,320=>556,321=>611,322=>278,323=>722,324=>611,325=>722,326=>611,327=>722,
-328=>611,329=>611,330=>722,331=>611,332=>778,333=>611,334=>778,335=>611,336=>778,337=>611,
-340=>722,341=>389,342=>722,343=>389,344=>722,345=>389,346=>667,347=>556,348=>667,349=>556,
-350=>667,351=>556,354=>611,355=>333,356=>611,357=>414,358=>611,359=>333,360=>722,361=>611,
-362=>722,363=>611,364=>722,365=>611,366=>722,367=>611,368=>722,369=>611,370=>722,371=>611,
-372=>944,373=>778,374=>667,375=>556,377=>611,378=>500,379=>611,380=>500,383=>333,384=>611,
-385=>963,386=>704,387=>611,388=>687,389=>611,390=>722,391=>752,392=>562,393=>722,394=>968,
-395=>722,396=>611,397=>609,398=>667,399=>778,400=>672,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>395,408=>778,409=>556,410=>333,411=>620,412=>944,413=>722,414=>611,415=>778,
-416=>791,417=>653,418=>1111,419=>722,420=>914,421=>611,422=>647,423=>667,424=>556,425=>673,
-426=>441,427=>333,428=>742,429=>333,430=>611,431=>769,432=>656,433=>766,434=>722,435=>667,
-436=>620,437=>611,438=>500,439=>556,440=>556,441=>645,442=>569,443=>579,446=>611,447=>608,
-448=>260,449=>370,450=>584,451=>278,452=>1333,453=>1222,454=>1111,455=>1167,456=>889,457=>556,
-458=>1278,459=>1000,460=>889,461=>722,462=>556,463=>278,464=>278,465=>778,466=>611,467=>722,
-468=>611,469=>722,470=>611,471=>722,472=>611,473=>722,474=>611,475=>722,476=>611,477=>556,
-478=>722,479=>556,480=>722,481=>556,482=>1000,483=>889,484=>778,485=>611,486=>778,487=>611,
-488=>722,489=>556,490=>778,491=>611,492=>778,493=>611,494=>556,495=>556,496=>278,497=>1333,
-498=>1222,499=>1111,500=>778,501=>611,503=>630,504=>722,505=>611,506=>722,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>722,513=>556,514=>722,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>611,526=>778,527=>611,528=>722,
-529=>389,530=>722,531=>389,532=>722,533=>611,534=>722,535=>611,536=>667,537=>556,538=>611,
-539=>333,540=>569,541=>486,542=>722,543=>611,548=>645,549=>500,550=>722,551=>556,552=>667,
-553=>556,554=>778,555=>611,556=>778,557=>611,558=>778,559=>611,560=>778,561=>611,562=>667,
-563=>556,567=>278,592=>556,593=>667,594=>667,595=>611,596=>556,597=>600,598=>611,599=>611,
-600=>556,601=>556,602=>834,603=>541,604=>557,605=>820,606=>570,607=>278,608=>611,609=>611,
-610=>556,611=>556,612=>656,613=>619,614=>611,615=>611,616=>278,617=>344,618=>278,619=>473,
-620=>527,621=>298,622=>778,623=>889,624=>889,625=>889,626=>611,627=>611,628=>615,629=>606,
-630=>878,631=>822,632=>778,633=>389,634=>389,635=>389,636=>389,637=>389,638=>455,639=>455,
-640=>620,641=>620,642=>556,643=>333,644=>278,645=>333,646=>544,647=>328,648=>333,649=>623,
-650=>726,651=>639,652=>556,653=>778,654=>556,655=>556,656=>500,657=>571,658=>556,659=>642,
-660=>611,661=>611,662=>611,664=>611,665=>554,666=>570,667=>616,668=>603,669=>552,670=>556,
-671=>454,672=>611,673=>611,674=>611,684=>522,688=>377,689=>377,690=>202,691=>272,692=>272,
-693=>299,694=>395,695=>534,696=>364,697=>278,698=>454,699=>278,700=>278,701=>278,702=>333,
-703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,711=>333,712=>333,713=>333,
-714=>333,715=>333,716=>272,717=>333,718=>333,719=>333,720=>333,721=>333,722=>333,723=>333,
-724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-735=>510,736=>372,737=>210,738=>363,739=>373,740=>334,741=>526,742=>526,743=>526,744=>526,
-745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,752=>333,753=>333,754=>333,
-755=>333,756=>333,757=>437,758=>437,759=>400,760=>333,761=>200,762=>200,763=>200,764=>200,
-765=>333,766=>333,767=>333,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,
-775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,
-785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,
-795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,
-805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,
-815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,
-825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,
-835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,
-845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,
-855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,
-865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,
-875=>0,876=>0,877=>0,878=>0,879=>0,884=>379,885=>379,890=>333,894=>333,900=>363,
-901=>333,902=>761,903=>333,904=>864,905=>903,906=>454,908=>796,910=>991,911=>867,912=>315,
-913=>696,914=>640,915=>585,916=>726,917=>589,918=>581,919=>654,920=>783,921=>215,922=>648,
-923=>710,924=>829,925=>683,926=>645,927=>738,928=>726,929=>645,931=>673,932=>674,933=>771,
-934=>773,935=>780,936=>778,937=>766,938=>263,939=>771,940=>660,941=>541,942=>560,943=>356,
-944=>568,945=>632,946=>560,947=>591,948=>609,949=>541,950=>488,951=>608,952=>562,953=>315,
-954=>533,955=>603,956=>582,957=>586,958=>513,959=>611,960=>658,961=>595,962=>590,963=>657,
-964=>557,965=>568,966=>768,967=>632,968=>708,969=>778,970=>315,971=>568,972=>599,973=>568,
-974=>778,977=>580,978=>742,979=>857,980=>620,981=>706,982=>740,983=>556,1008=>556,1009=>566,
-1012=>778,1013=>328,1024=>670,1025=>670,1026=>800,1027=>611,1028=>714,1029=>667,1030=>314,1031=>300,
-1032=>576,1033=>1100,1034=>1114,1035=>806,1036=>740,1037=>757,1038=>711,1039=>754,1040=>707,1041=>704,
-1042=>704,1043=>611,1044=>900,1045=>670,1046=>1076,1047=>667,1048=>757,1049=>757,1050=>740,1051=>729,
-1052=>874,1053=>753,1054=>774,1055=>753,1056=>675,1057=>711,1058=>611,1059=>711,1060=>904,1061=>666,
-1062=>816,1063=>698,1064=>1057,1065=>1157,1066=>837,1067=>980,1068=>675,1069=>711,1070=>1093,1071=>708,
-1072=>552,1073=>593,1074=>554,1075=>423,1076=>685,1077=>573,1078=>782,1079=>557,1080=>615,1081=>615,
-1082=>559,1083=>568,1084=>666,1085=>603,1086=>606,1087=>603,1088=>612,1089=>556,1090=>440,1091=>549,
-1092=>964,1093=>539,1094=>652,1095=>554,1096=>886,1097=>968,1098=>699,1099=>778,1100=>568,1101=>556,
-1102=>848,1103=>586,1104=>573,1105=>573,1106=>606,1107=>423,1108=>556,1109=>555,1110=>260,1111=>278,
-1112=>270,1113=>898,1114=>898,1115=>626,1116=>559,1117=>615,1118=>549,1119=>604,1136=>832,1137=>748,
-1138=>774,1139=>606,1154=>449,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,
-1162=>832,1163=>675,1164=>678,1165=>611,1166=>675,1167=>612,1168=>636,1169=>440,1170=>622,1171=>449,
-1172=>647,1173=>574,1174=>1096,1175=>803,1176=>683,1177=>555,1178=>759,1179=>573,1180=>730,1181=>554,
-1182=>737,1183=>555,1184=>892,1185=>680,1186=>825,1187=>653,1188=>999,1189=>763,1190=>1105,1191=>925,
-1192=>714,1193=>558,1194=>722,1195=>558,1196=>614,1197=>438,1198=>643,1199=>573,1200=>643,1201=>603,
-1202=>670,1203=>548,1204=>952,1205=>738,1206=>781,1207=>615,1208=>698,1209=>588,1210=>687,1211=>588,
-1212=>993,1213=>761,1214=>965,1215=>759,1216=>314,1217=>1076,1218=>809,1219=>700,1220=>543,1221=>793,
-1222=>634,1223=>753,1224=>603,1225=>819,1226=>663,1227=>706,1228=>588,1229=>935,1230=>720,1231=>314,
-1232=>707,1233=>564,1234=>707,1235=>566,1236=>1004,1237=>898,1238=>670,1239=>573,1240=>722,1241=>573,
-1242=>722,1243=>573,1244=>1076,1245=>782,1246=>667,1247=>557,1248=>556,1249=>552,1250=>757,1251=>615,
-1252=>757,1253=>615,1254=>778,1255=>611,1256=>774,1257=>606,1258=>774,1259=>606,1260=>711,1261=>556,
-1262=>700,1263=>544,1264=>701,1265=>539,1266=>700,1267=>537,1268=>698,1269=>554,1270=>611,1271=>432,
-1272=>980,1273=>778,1296=>672,1297=>546,1298=>729,1299=>577,1306=>778,1307=>612,1308=>944,1309=>776,
-1310=>730,1311=>554,1329=>730,1330=>713,1331=>765,1332=>752,1333=>708,1334=>801,1335=>496,1336=>713,
-1337=>855,1338=>686,1339=>727,1340=>420,1341=>897,1342=>841,1343=>708,1344=>660,1345=>666,1346=>747,
-1347=>698,1348=>757,1349=>630,1350=>747,1351=>651,1352=>743,1353=>657,1354=>728,1355=>799,1356=>752,
-1357=>743,1358=>768,1359=>691,1360=>713,1361=>640,1362=>425,1363=>818,1364=>672,1365=>805,1366=>754,
-1369=>333,1370=>222,1371=>250,1372=>333,1373=>333,1374=>352,1375=>362,1377=>873,1378=>613,1379=>634,
-1380=>636,1381=>593,1382=>639,1383=>417,1384=>613,1385=>658,1386=>711,1387=>609,1388=>318,1389=>836,
-1390=>670,1391=>613,1392=>607,1393=>611,1394=>626,1395=>619,1396=>618,1397=>324,1398=>613,1399=>540,
-1400=>591,1401=>392,1402=>873,1403=>577,1404=>603,1405=>600,1406=>626,1407=>951,1408=>613,1409=>612,
-1410=>348,1411=>951,1412=>616,1413=>606,1414=>763,1415=>626,1417=>333,1418=>398,1456=>0,1457=>0,
-1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,
-1469=>0,1470=>516,1471=>0,1472=>297,1473=>0,1474=>0,1475=>333,1476=>0,1488=>714,1489=>651,
-1490=>557,1491=>638,1492=>682,1493=>297,1494=>443,1495=>682,1496=>670,1497=>284,1498=>590,1499=>595,
-1500=>667,1501=>683,1502=>704,1503=>297,1504=>429,1505=>670,1506=>653,1507=>661,1508=>660,1509=>616,
-1510=>671,1511=>672,1512=>600,1513=>840,1514=>756,1520=>554,1521=>550,1522=>542,1523=>238,1524=>474,
-2561=>0,2562=>122,2563=>313,2565=>897,2566=>1157,2567=>930,2568=>966,2569=>762,2570=>762,2575=>729,
-2576=>904,2579=>773,2580=>903,2581=>726,2582=>672,2583=>741,2584=>790,2585=>702,2586=>723,2587=>693,
-2588=>688,2589=>673,2590=>683,2591=>686,2592=>711,2593=>680,2594=>693,2595=>729,2596=>691,2597=>694,
-2598=>699,2599=>666,2600=>669,2602=>683,2603=>690,2604=>660,2605=>659,2606=>692,2607=>772,2608=>673,
-2610=>731,2611=>814,2613=>663,2614=>704,2616=>702,2617=>650,2620=>0,2622=>307,2623=>304,2624=>306,
-2625=>7,2626=>7,2631=>7,2632=>8,2635=>6,2636=>5,2637=>8,2649=>684,2650=>813,2651=>715,
-2652=>695,2654=>709,2662=>697,2663=>630,2664=>696,2665=>690,2666=>646,2667=>636,2668=>571,2669=>682,
-2670=>718,2671=>730,2672=>9,2673=>162,2674=>722,2675=>760,2676=>1110,4256=>616,4257=>645,4258=>664,
-4259=>839,4260=>627,4261=>630,4262=>827,4263=>928,4264=>639,4265=>630,4266=>951,4267=>606,4268=>608,
-4269=>835,4270=>630,4271=>610,4272=>804,4273=>615,4274=>823,4275=>747,4276=>870,4277=>627,4278=>840,
-4279=>627,4280=>665,4281=>610,4282=>799,4283=>598,4284=>665,4285=>664,4286=>608,4287=>886,4288=>629,
-4304=>463,4305=>516,4306=>564,4307=>706,4308=>459,4309=>476,4310=>623,4311=>711,4312=>494,4313=>476,
-4314=>894,4315=>500,4316=>500,4317=>712,4318=>493,4319=>503,4320=>712,4321=>503,4322=>710,4323=>670,
-4324=>707,4325=>459,4326=>691,4327=>465,4328=>492,4329=>480,4330=>656,4331=>500,4332=>492,4333=>524,
-4334=>500,4335=>688,4336=>510,4337=>739,4338=>450,4339=>479,4340=>502,4341=>501,4345=>564,4347=>515,
-7680=>722,7681=>556,7682=>722,7683=>611,7684=>722,7685=>611,7686=>722,7687=>611,7688=>722,7689=>556,
-7690=>722,7691=>611,7692=>722,7693=>611,7694=>722,7695=>611,7696=>722,7697=>611,7698=>722,7699=>611,
-7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,7708=>667,7709=>556,
-7710=>611,7711=>333,7712=>778,7713=>611,7714=>722,7715=>611,7716=>722,7717=>611,7718=>722,7719=>611,
-7720=>722,7721=>611,7722=>722,7723=>611,7724=>278,7725=>278,7726=>278,7727=>278,7728=>722,7729=>556,
-7730=>722,7731=>556,7732=>722,7733=>556,7734=>611,7735=>278,7736=>611,7737=>278,7738=>611,7739=>278,
-7740=>611,7741=>278,7742=>833,7743=>889,7744=>833,7745=>889,7746=>833,7747=>889,7748=>722,7749=>611,
-7750=>722,7751=>611,7752=>722,7753=>611,7754=>722,7755=>611,7756=>778,7757=>611,7758=>778,7759=>611,
-7760=>778,7761=>611,7762=>778,7763=>611,7764=>667,7765=>611,7766=>667,7767=>611,7768=>722,7769=>389,
-7770=>722,7771=>389,7772=>722,7773=>389,7774=>722,7775=>389,7776=>667,7777=>556,7778=>667,7779=>556,
-7780=>667,7781=>556,7782=>667,7783=>556,7784=>667,7785=>556,7786=>611,7787=>333,7788=>611,7789=>333,
-7790=>611,7791=>333,7792=>611,7793=>333,7794=>722,7795=>611,7796=>722,7797=>611,7798=>722,7799=>611,
-7800=>722,7801=>611,7802=>722,7803=>611,7804=>667,7805=>556,7806=>667,7807=>556,7808=>944,7809=>778,
-7810=>944,7811=>778,7812=>944,7813=>778,7814=>944,7815=>778,7816=>944,7817=>778,7818=>667,7819=>556,
-7820=>667,7821=>556,7822=>667,7823=>556,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,
-7830=>611,7831=>333,7832=>778,7833=>556,7834=>555,7835=>333,7840=>722,7841=>556,7842=>722,7843=>556,
-7844=>722,7845=>556,7846=>722,7847=>556,7848=>667,7849=>556,7850=>722,7851=>556,7852=>722,7853=>556,
-7854=>722,7855=>556,7856=>722,7857=>556,7858=>722,7859=>556,7860=>722,7861=>556,7862=>722,7863=>556,
-7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,7872=>667,7873=>556,
-7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>278,
-7884=>778,7885=>611,7886=>778,7887=>611,7888=>778,7889=>611,7890=>778,7891=>611,7892=>778,7893=>611,
-7894=>778,7895=>611,7896=>778,7897=>611,7898=>791,7899=>653,7900=>791,7901=>653,7902=>791,7903=>653,
-7904=>791,7905=>653,7906=>791,7907=>653,7908=>722,7909=>611,7910=>722,7911=>611,7912=>769,7913=>656,
-7914=>769,7915=>656,7916=>769,7917=>656,7918=>769,7919=>656,7920=>769,7921=>656,7922=>667,7923=>556,
-7924=>667,7925=>556,7926=>667,7927=>556,7928=>667,7929=>556,7936=>632,7937=>632,7938=>632,7939=>632,
-7940=>632,7941=>632,7942=>632,7943=>632,7944=>696,7945=>696,7946=>865,7947=>849,7948=>796,7949=>807,
-7950=>730,7951=>750,7952=>541,7953=>541,7954=>541,7955=>541,7956=>541,7957=>541,7960=>758,7961=>760,
-7962=>957,7963=>943,7964=>939,7965=>945,7968=>608,7969=>608,7970=>608,7971=>608,7972=>608,7973=>608,
-7974=>608,7975=>608,7976=>823,7977=>831,7978=>1026,7979=>1017,7980=>1002,7981=>1024,7982=>908,7983=>909,
-7984=>315,7985=>315,7986=>373,7987=>375,7988=>378,7989=>374,7990=>370,7991=>384,7992=>378,7993=>383,
-7994=>596,7995=>579,7996=>572,7997=>576,7998=>474,7999=>459,8000=>610,8001=>610,8002=>610,8003=>610,
-8004=>610,8005=>610,8008=>800,8009=>871,8010=>1084,8011=>1079,8012=>975,8013=>973,8016=>568,8017=>568,
-8018=>568,8019=>568,8020=>568,8021=>568,8022=>568,8023=>568,8025=>906,8027=>1080,8029=>1115,8031=>977,
-8032=>778,8033=>778,8034=>778,8035=>778,8036=>778,8037=>778,8038=>778,8039=>778,8040=>837,8041=>860,
-8042=>1062,8043=>1072,8044=>962,8045=>985,8046=>922,8047=>959,8048=>632,8049=>632,8050=>541,8051=>541,
-8052=>608,8053=>608,8054=>315,8055=>315,8056=>610,8057=>610,8058=>568,8059=>568,8060=>778,8061=>778,
-8064=>632,8065=>632,8066=>632,8067=>632,8068=>632,8069=>632,8070=>632,8071=>632,8072=>909,8073=>906,
-8074=>1061,8075=>1035,8076=>984,8077=>994,8078=>910,8079=>916,8080=>608,8081=>608,8082=>608,8083=>608,
-8084=>608,8085=>608,8086=>608,8087=>608,8088=>1006,8089=>1015,8090=>1204,8091=>1207,8092=>1188,8093=>1209,
-8094=>1096,8095=>1105,8096=>778,8097=>778,8098=>778,8099=>778,8100=>778,8101=>778,8102=>778,8103=>778,
-8104=>1026,8105=>1048,8106=>1251,8107=>1260,8108=>1150,8109=>1177,8110=>1106,8111=>1142,8112=>632,8113=>632,
-8114=>632,8115=>632,8116=>660,8118=>632,8119=>632,8120=>696,8121=>696,8122=>696,8123=>696,8124=>907,
-8125=>278,8126=>346,8127=>278,8128=>278,8129=>333,8130=>608,8131=>608,8132=>560,8134=>608,8135=>608,
-8136=>776,8137=>793,8138=>847,8139=>854,8140=>848,8141=>492,8142=>489,8143=>394,8144=>335,8145=>354,
-8146=>367,8147=>368,8150=>353,8151=>366,8152=>240,8153=>259,8154=>418,8155=>416,8157=>481,8158=>589,
-8159=>333,8160=>568,8161=>568,8162=>568,8163=>568,8164=>595,8165=>595,8166=>568,8167=>568,8168=>771,
-8169=>771,8170=>951,8171=>982,8172=>806,8173=>333,8174=>333,8175=>333,8178=>778,8179=>778,8180=>778,
-8182=>778,8183=>778,8184=>909,8185=>809,8186=>897,8187=>825,8188=>978,8189=>333,8190=>278,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>556,8213=>1000,8214=>437,
-8215=>556,8219=>278,8223=>500,8227=>350,8228=>278,8229=>666,8231=>278,8232=>0,8233=>0,8234=>0,
-8235=>0,8236=>0,8237=>0,8238=>0,8239=>500,8241=>1367,8242=>238,8243=>426,8244=>614,8245=>238,
-8246=>379,8247=>571,8248=>450,8251=>622,8252=>666,8253=>614,8254=>556,8255=>658,8256=>658,8257=>438,
-8258=>840,8259=>400,8260=>167,8261=>334,8262=>334,8263=>1222,8264=>944,8265=>944,8266=>556,8267=>537,
-8268=>537,8269=>537,8270=>389,8271=>333,8272=>658,8273=>389,8274=>634,8275=>568,8276=>658,8277=>793,
-8278=>515,8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,8285=>224,8286=>224,8287=>0,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>351,8305=>351,8308=>351,8309=>351,8310=>351,
-8311=>351,8312=>351,8313=>351,8314=>351,8315=>351,8316=>351,8317=>351,8318=>351,8319=>351,8320=>351,
-8321=>301,8322=>351,8323=>351,8324=>351,8325=>351,8326=>351,8327=>351,8328=>351,8329=>351,8330=>350,
-8331=>350,8332=>350,8333=>350,8334=>350,8355=>611,8356=>591,8357=>889,8358=>727,8360=>1265,8362=>1049,
-8363=>580,8368=>605,8373=>591,8400=>0,8401=>0,8402=>0,8403=>0,8406=>0,8407=>0,8411=>0,
-8412=>0,8413=>0,8414=>0,8415=>0,8416=>0,8417=>0,8421=>0,8422=>0,8423=>0,8424=>0,
-8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,8432=>0,8448=>985,8449=>1007,
-8451=>1034,8453=>981,8454=>1042,8455=>667,8457=>919,8465=>606,8468=>881,8470=>979,8471=>784,8476=>699,
-8480=>1000,8481=>1230,8486=>766,8487=>778,8489=>315,8490=>741,8491=>729,8494=>556,8498=>588,8501=>714,
-8502=>651,8503=>557,8504=>638,8506=>871,8507=>1230,8513=>778,8514=>611,8515=>611,8516=>667,8523=>669,
-8525=>1072,8526=>482,8531=>869,8532=>869,8533=>869,8534=>869,8535=>869,8536=>869,8537=>869,8538=>869,
-8539=>869,8540=>869,8541=>869,8542=>869,8543=>869,8544=>278,8545=>556,8546=>834,8547=>945,8548=>667,
-8549=>945,8550=>1223,8551=>1501,8552=>945,8553=>667,8554=>945,8555=>1223,8556=>611,8557=>722,8558=>722,
-8559=>833,8560=>278,8561=>556,8562=>834,8563=>834,8564=>556,8565=>834,8566=>1112,8567=>1390,8568=>834,
-8569=>556,8570=>834,8571=>1112,8572=>278,8573=>556,8574=>611,8575=>889,8592=>964,8593=>964,8594=>964,
-8595=>964,8596=>964,8597=>964,8598=>964,8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8606=>964,
-8607=>964,8608=>964,8609=>964,8610=>964,8611=>964,8612=>964,8613=>964,8614=>964,8615=>964,8616=>964,
-8644=>964,8645=>964,8646=>964,8647=>964,8648=>964,8649=>964,8650=>964,8704=>722,8706=>556,8707=>667,
-8710=>729,8711=>729,8721=>856,8722=>584,8725=>869,8730=>594,8747=>608,8800=>548,8804=>584,8805=>584,
-9251=>500,9674=>541,9772=>923,9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,
-9831=>776,9833=>333,9834=>556,9835=>778,9836=>778,9837=>556,9838=>556,9839=>556,10048=>1453,11799=>333,
-64256=>607,64257=>576,64258=>603,64259=>849,64260=>849,64275=>1243,64276=>1226,64277=>1233,64278=>1238,64279=>1448,
-64285=>284,64286=>305,64287=>542,64288=>653,64289=>964,64290=>888,64291=>932,64292=>845,64293=>917,64294=>933,
-64295=>850,64296=>1006,64297=>584,64298=>840,64299=>840,64300=>840,64301=>840,64302=>714,64303=>714,64304=>714,
-64305=>651,64306=>557,64307=>638,64308=>682,64309=>348,64310=>443,64312=>670,64313=>354,64314=>590,64315=>595,
-64316=>667,64318=>704,64320=>429,64321=>670,64323=>661,64324=>660,64326=>671,64327=>672,64328=>600,64329=>840,
-64330=>756,64331=>212,64332=>591,64333=>550,64334=>568,64335=>714,65533=>788);
-$enc='';
-$diff='';
-$file='freesansb.z';
-$ctg='freesansb.ctg.z';
-$originalsize=283180;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansbi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansbi.php
deleted file mode 100644
index dab2c9755a1..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansbi.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSansBoldOblique';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>96,'FontBBox'=>'[-769 -1175 1591 1639]','ItalicAngle'=>-12,'StemV'=>120,'MissingWidth'=>600);
-$up=-145;
-$ut=69;
-$dw=600;
-$cw=array(
-32=>278,33=>333,34=>474,35=>556,36=>556,37=>889,38=>722,39=>238,40=>333,41=>333,
-42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,50=>556,51=>556,
-52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>333,59=>333,60=>584,61=>584,
-62=>584,63=>611,64=>975,65=>722,66=>722,67=>722,68=>722,69=>667,70=>611,71=>778,
-72=>722,73=>278,74=>556,75=>722,76=>611,77=>833,78=>722,79=>778,80=>667,81=>778,
-82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>333,
-92=>278,93=>333,94=>584,95=>556,96=>333,97=>556,98=>611,99=>556,100=>611,101=>556,
-102=>333,103=>611,104=>611,105=>278,106=>278,107=>556,108=>278,109=>889,110=>611,111=>611,
-112=>611,113=>611,114=>389,115=>556,116=>333,117=>611,118=>556,119=>778,120=>556,121=>556,
-122=>500,123=>389,124=>280,125=>389,126=>584,8364=>640,8218=>278,402=>556,8222=>500,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>333,338=>1000,381=>611,8216=>278,8217=>278,
-8220=>500,8221=>500,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>556,8250=>333,339=>944,
-382=>500,376=>667,160=>278,161=>333,162=>556,163=>556,164=>556,165=>556,166=>280,167=>556,
-168=>333,169=>737,170=>370,171=>556,172=>584,173=>333,174=>737,175=>333,176=>606,177=>584,
-178=>350,179=>350,180=>333,181=>667,182=>556,183=>278,184=>333,185=>248,186=>365,187=>556,
-188=>869,189=>869,190=>869,191=>611,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,
-198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,
-218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,226=>556,227=>556,
-228=>556,229=>556,230=>889,231=>556,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,
-238=>278,239=>278,240=>611,241=>611,242=>611,243=>611,244=>611,245=>611,246=>611,247=>584,
-248=>611,249=>611,250=>611,251=>611,252=>611,253=>556,254=>611,255=>556,256=>722,257=>556,
-258=>722,259=>556,260=>722,261=>556,262=>722,263=>556,264=>722,265=>556,266=>722,267=>556,
-268=>722,269=>556,270=>722,271=>722,272=>722,273=>611,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>611,286=>778,287=>611,
-288=>778,289=>611,290=>778,291=>611,292=>722,293=>611,294=>722,295=>611,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>268,304=>278,305=>278,306=>796,307=>487,
-308=>556,309=>278,310=>722,311=>556,312=>529,313=>611,314=>278,315=>611,316=>278,317=>611,
-318=>384,319=>611,320=>556,321=>611,322=>278,323=>722,324=>611,325=>722,326=>611,327=>722,
-328=>611,329=>611,330=>722,331=>611,332=>778,333=>611,334=>778,335=>611,336=>778,337=>611,
-340=>722,341=>389,342=>722,343=>389,344=>722,345=>389,346=>667,347=>556,348=>667,349=>556,
-350=>667,351=>556,354=>611,355=>333,356=>611,357=>404,358=>611,359=>404,360=>722,361=>611,
-362=>722,363=>611,364=>722,365=>611,366=>722,367=>611,368=>722,369=>611,370=>722,371=>611,
-372=>944,373=>778,374=>667,375=>556,377=>611,378=>500,379=>611,380=>500,383=>333,384=>611,
-385=>963,386=>722,387=>611,388=>687,389=>611,390=>722,391=>752,392=>562,393=>722,394=>968,
-395=>722,396=>611,397=>609,398=>667,399=>778,400=>672,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>395,408=>778,409=>556,410=>333,411=>620,412=>889,413=>722,414=>611,415=>778,
-416=>778,417=>611,418=>1111,419=>722,420=>914,421=>611,422=>647,423=>667,424=>556,425=>688,
-426=>441,427=>333,428=>742,429=>333,430=>611,431=>722,432=>611,433=>780,434=>722,435=>667,
-436=>706,437=>611,438=>500,439=>556,440=>556,441=>645,442=>569,443=>579,446=>611,447=>608,
-448=>260,449=>370,450=>584,451=>278,452=>1333,453=>1222,454=>1111,455=>1167,456=>889,457=>556,
-458=>1278,459=>1000,460=>889,461=>722,462=>556,463=>278,464=>278,465=>778,466=>611,467=>722,
-468=>611,469=>722,470=>611,471=>722,472=>611,473=>722,474=>611,475=>722,476=>611,477=>556,
-478=>722,479=>556,480=>722,481=>556,482=>1000,483=>889,484=>811,485=>641,486=>778,487=>611,
-488=>722,489=>556,490=>778,491=>611,492=>778,493=>611,494=>556,495=>556,496=>278,497=>1333,
-498=>1222,499=>1111,500=>778,501=>611,503=>630,504=>722,505=>611,506=>722,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>722,513=>556,514=>722,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>611,526=>778,527=>611,528=>722,
-529=>389,530=>722,531=>389,532=>722,533=>611,534=>722,535=>611,536=>667,537=>556,538=>611,
-539=>333,540=>569,541=>486,542=>722,543=>611,548=>645,549=>500,550=>722,551=>556,552=>667,
-553=>556,554=>778,555=>611,556=>778,557=>611,558=>778,559=>611,560=>778,561=>611,562=>667,
-563=>556,567=>278,592=>556,593=>611,594=>611,595=>611,596=>556,597=>600,598=>611,599=>611,
-600=>556,601=>556,602=>834,603=>570,604=>546,605=>820,606=>570,607=>278,608=>611,609=>611,
-610=>556,611=>556,612=>656,613=>619,614=>611,615=>611,616=>278,617=>344,618=>278,619=>473,
-620=>527,621=>298,622=>778,623=>889,624=>889,625=>889,626=>611,627=>611,628=>615,629=>590,
-630=>878,631=>822,632=>778,633=>389,634=>389,635=>389,636=>389,637=>389,638=>455,639=>455,
-640=>620,641=>586,642=>556,643=>333,644=>278,645=>333,646=>544,647=>328,648=>333,649=>623,
-650=>726,651=>639,652=>556,653=>778,654=>556,655=>556,656=>500,657=>571,658=>556,659=>642,
-660=>611,661=>611,662=>611,664=>611,665=>572,666=>570,667=>616,668=>603,669=>552,670=>556,
-671=>454,672=>611,673=>611,674=>611,684=>520,688=>500,689=>500,690=>167,691=>333,692=>333,
-693=>333,694=>348,695=>500,696=>345,697=>278,698=>454,699=>278,700=>333,701=>278,702=>333,
-703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,711=>333,712=>333,713=>333,
-714=>333,715=>333,716=>272,717=>333,718=>333,719=>333,720=>333,721=>333,722=>333,723=>333,
-724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,
-735=>510,736=>333,737=>333,738=>333,739=>357,740=>334,741=>526,742=>526,743=>526,744=>526,
-745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,752=>333,753=>333,754=>333,
-755=>333,756=>333,757=>437,758=>437,759=>400,760=>333,761=>200,762=>200,763=>200,764=>200,
-765=>332,766=>333,767=>333,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,
-775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,
-785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,
-795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,
-805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,
-815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,
-825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,
-835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,
-845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,
-855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,
-865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,
-875=>0,876=>0,877=>0,878=>0,879=>0,884=>208,885=>247,890=>364,894=>333,900=>239,
-901=>446,902=>688,903=>333,904=>903,905=>962,906=>448,908=>904,910=>991,911=>932,912=>346,
-913=>764,914=>688,915=>642,916=>744,917=>710,918=>688,919=>743,920=>810,921=>296,922=>744,
-923=>744,924=>860,925=>714,926=>690,927=>822,928=>781,929=>698,931=>688,932=>688,933=>744,
-934=>777,935=>783,936=>805,937=>780,938=>296,939=>744,940=>640,941=>530,942=>597,943=>339,
-944=>575,945=>656,946=>576,947=>591,948=>620,949=>570,950=>522,951=>586,952=>586,953=>346,
-954=>576,955=>620,956=>667,957=>564,958=>530,959=>610,960=>721,961=>626,962=>595,963=>676,
-964=>592,965=>575,966=>801,967=>632,968=>722,969=>800,970=>346,971=>575,972=>609,973=>604,
-974=>769,977=>580,978=>742,979=>857,980=>620,981=>778,982=>740,983=>601,1008=>556,1009=>566,
-1012=>778,1013=>328,1024=>667,1025=>667,1026=>790,1027=>617,1028=>731,1029=>667,1030=>278,1031=>278,
-1032=>556,1033=>1110,1034=>1088,1035=>790,1036=>722,1037=>757,1038=>698,1039=>722,1040=>722,1041=>722,
-1042=>722,1043=>617,1044=>876,1045=>667,1046=>1100,1047=>670,1048=>757,1049=>757,1050=>722,1051=>715,
-1052=>874,1053=>753,1054=>778,1055=>753,1056=>680,1057=>722,1058=>611,1059=>698,1060=>909,1061=>657,
-1062=>845,1063=>688,1064=>1132,1065=>1217,1066=>835,1067=>980,1068=>678,1069=>735,1070=>1142,1071=>708,
-1072=>553,1073=>591,1074=>574,1075=>429,1076=>745,1077=>572,1078=>792,1079=>554,1080=>603,1081=>603,
-1082=>559,1083=>583,1084=>664,1085=>603,1086=>588,1087=>603,1088=>605,1089=>549,1090=>440,1091=>541,
-1092=>948,1093=>539,1094=>690,1095=>564,1096=>901,1097=>987,1098=>692,1099=>806,1100=>572,1101=>546,
-1102=>893,1103=>586,1104=>572,1105=>572,1106=>616,1107=>429,1108=>549,1109=>562,1110=>281,1111=>281,
-1112=>282,1113=>888,1114=>897,1115=>606,1116=>559,1117=>603,1118=>541,1119=>603,1136=>830,1137=>761,
-1138=>778,1139=>590,1154=>456,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,
-1162=>791,1163=>662,1164=>639,1165=>581,1166=>670,1167=>649,1168=>623,1169=>450,1170=>623,1171=>472,
-1172=>674,1173=>528,1174=>1091,1175=>803,1176=>659,1177=>548,1178=>739,1179=>569,1180=>742,1181=>560,
-1182=>737,1183=>559,1184=>900,1185=>679,1186=>808,1187=>673,1188=>1004,1189=>761,1190=>1114,1191=>876,
-1192=>721,1193=>548,1194=>724,1195=>554,1196=>611,1197=>454,1198=>667,1199=>584,1200=>652,1201=>632,
-1202=>667,1203=>550,1204=>951,1205=>748,1206=>759,1207=>630,1208=>669,1209=>580,1210=>672,1211=>576,
-1212=>977,1213=>752,1214=>957,1215=>752,1216=>318,1217=>1087,1218=>792,1219=>726,1220=>530,1221=>782,
-1222=>674,1223=>749,1224=>603,1225=>823,1226=>682,1227=>675,1228=>573,1229=>941,1230=>754,1231=>310,
-1232=>704,1233=>553,1234=>711,1235=>553,1236=>1000,1237=>889,1238=>667,1239=>569,1240=>738,1241=>561,
-1242=>738,1243=>561,1244=>1086,1245=>792,1246=>670,1247=>554,1248=>558,1249=>546,1250=>753,1251=>603,
-1252=>753,1253=>603,1254=>778,1255=>588,1256=>778,1257=>590,1258=>778,1259=>590,1260=>735,1261=>546,
-1262=>698,1263=>541,1264=>698,1265=>541,1266=>698,1267=>541,1268=>686,1269=>564,1270=>617,1271=>475,
-1272=>976,1273=>806,1296=>672,1297=>546,1298=>729,1299=>577,1306=>778,1307=>611,1308=>944,1309=>776,
-1310=>750,1311=>573,1329=>730,1330=>713,1331=>765,1332=>752,1333=>708,1334=>801,1335=>496,1336=>713,
-1337=>855,1338=>686,1339=>727,1340=>420,1341=>897,1342=>841,1343=>708,1344=>660,1345=>666,1346=>747,
-1347=>698,1348=>757,1349=>630,1350=>747,1351=>651,1352=>743,1353=>657,1354=>728,1355=>799,1356=>752,
-1357=>743,1358=>768,1359=>691,1360=>713,1361=>640,1362=>425,1363=>818,1364=>672,1365=>805,1366=>754,
-1369=>333,1370=>222,1371=>250,1372=>333,1373=>333,1374=>352,1375=>362,1377=>873,1378=>613,1379=>634,
-1380=>636,1381=>593,1382=>639,1383=>417,1384=>613,1385=>658,1386=>711,1387=>609,1388=>318,1389=>836,
-1390=>670,1391=>613,1392=>607,1393=>611,1394=>626,1395=>619,1396=>618,1397=>324,1398=>613,1399=>540,
-1400=>591,1401=>392,1402=>873,1403=>577,1404=>603,1405=>600,1406=>626,1407=>951,1408=>613,1409=>612,
-1410=>348,1411=>951,1412=>616,1413=>606,1414=>763,1415=>626,1417=>333,1418=>398,1456=>0,1457=>0,
-1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,
-1469=>0,1470=>516,1471=>0,1472=>297,1473=>0,1474=>0,1475=>333,1476=>0,1488=>714,1489=>651,
-1490=>557,1491=>638,1492=>682,1493=>297,1494=>443,1495=>682,1496=>670,1497=>284,1498=>590,1499=>595,
-1500=>667,1501=>683,1502=>704,1503=>297,1504=>429,1505=>670,1506=>653,1507=>661,1508=>660,1509=>616,
-1510=>671,1511=>672,1512=>600,1513=>840,1514=>756,1520=>554,1521=>550,1522=>542,1523=>238,1524=>474,
-4256=>616,4257=>645,4258=>664,4259=>839,4260=>627,4261=>630,4262=>827,4263=>928,4264=>639,4265=>630,
-4266=>951,4267=>606,4268=>608,4269=>835,4270=>630,4271=>610,4272=>804,4273=>615,4274=>823,4275=>747,
-4276=>870,4277=>627,4278=>840,4279=>627,4280=>665,4281=>610,4282=>799,4283=>598,4284=>665,4285=>664,
-4286=>608,4287=>886,4288=>629,4304=>463,4305=>516,4306=>564,4307=>706,4308=>459,4309=>476,4310=>623,
-4311=>711,4312=>494,4313=>476,4314=>894,4315=>500,4316=>500,4317=>712,4318=>493,4319=>503,4320=>712,
-4321=>503,4322=>710,4323=>670,4324=>707,4325=>459,4326=>691,4327=>465,4328=>492,4329=>480,4330=>656,
-4331=>500,4332=>492,4333=>524,4334=>500,4335=>688,4336=>510,4337=>739,4338=>450,4339=>479,4340=>502,
-4341=>501,4345=>564,4347=>515,7680=>722,7681=>556,7682=>722,7683=>611,7684=>722,7685=>611,7686=>722,
-7687=>611,7688=>722,7689=>556,7690=>722,7691=>611,7692=>722,7693=>611,7694=>722,7695=>611,7696=>722,
-7697=>611,7698=>722,7699=>611,7700=>667,7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,
-7707=>556,7708=>667,7709=>556,7710=>611,7711=>333,7712=>778,7713=>611,7714=>722,7715=>611,7716=>722,
-7717=>611,7718=>722,7719=>611,7720=>722,7721=>611,7722=>722,7723=>611,7724=>278,7725=>278,7726=>278,
-7727=>278,7728=>722,7729=>556,7730=>722,7731=>556,7732=>722,7733=>556,7734=>611,7735=>278,7736=>611,
-7737=>278,7738=>611,7739=>278,7740=>611,7741=>278,7742=>833,7743=>889,7744=>833,7745=>889,7746=>833,
-7747=>889,7748=>722,7749=>611,7750=>722,7751=>611,7752=>722,7753=>611,7754=>722,7755=>611,7756=>778,
-7757=>611,7758=>778,7759=>611,7760=>778,7761=>611,7762=>778,7763=>611,7764=>667,7765=>611,7766=>667,
-7767=>611,7768=>722,7769=>389,7770=>722,7771=>389,7772=>722,7773=>389,7774=>722,7775=>389,7776=>667,
-7777=>556,7778=>667,7779=>556,7780=>667,7781=>556,7782=>667,7783=>556,7784=>667,7785=>556,7786=>611,
-7787=>333,7788=>611,7789=>333,7790=>611,7791=>333,7792=>611,7793=>333,7794=>722,7795=>611,7796=>722,
-7797=>611,7798=>722,7799=>611,7800=>722,7801=>611,7802=>722,7803=>611,7804=>667,7805=>556,7806=>667,
-7807=>556,7808=>944,7809=>778,7810=>944,7811=>778,7812=>944,7813=>778,7814=>944,7815=>778,7816=>944,
-7817=>778,7818=>667,7819=>556,7820=>667,7821=>556,7822=>667,7823=>556,7824=>611,7825=>500,7826=>611,
-7827=>500,7828=>611,7829=>500,7830=>611,7831=>333,7832=>778,7833=>556,7834=>555,7835=>333,7840=>722,
-7841=>556,7842=>722,7843=>556,7844=>722,7845=>556,7846=>722,7847=>556,7848=>722,7849=>556,7850=>722,
-7851=>556,7852=>722,7853=>556,7854=>722,7855=>556,7856=>722,7857=>556,7858=>722,7859=>556,7860=>722,
-7861=>556,7862=>722,7863=>556,7864=>667,7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,
-7871=>556,7872=>667,7873=>556,7874=>667,7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,
-7881=>278,7882=>278,7883=>278,7884=>778,7885=>611,7886=>778,7887=>611,7888=>778,7889=>611,7890=>778,
-7891=>611,7892=>778,7893=>611,7894=>778,7895=>611,7896=>778,7897=>611,7898=>778,7899=>611,7900=>778,
-7901=>611,7902=>778,7903=>611,7904=>778,7905=>611,7906=>778,7907=>611,7908=>722,7909=>611,7910=>722,
-7911=>611,7912=>722,7913=>611,7914=>722,7915=>611,7916=>722,7917=>611,7918=>722,7919=>611,7920=>722,
-7921=>611,7922=>667,7923=>556,7924=>667,7925=>556,7926=>667,7927=>556,7928=>667,7929=>556,7936=>656,
-7937=>656,7938=>656,7939=>656,7940=>656,7941=>656,7942=>656,7943=>656,7944=>764,7945=>764,7946=>916,
-7947=>940,7948=>908,7949=>891,7950=>844,7951=>869,7952=>570,7953=>570,7954=>570,7955=>570,7956=>570,
-7957=>570,7960=>842,7961=>836,7962=>1025,7963=>1051,7964=>1035,7965=>1049,7968=>586,7969=>586,7970=>586,
-7971=>586,7972=>586,7973=>586,7974=>586,7975=>586,7976=>891,7977=>886,7978=>1081,7979=>1108,7980=>1085,
-7981=>1096,7982=>1009,7983=>1023,7984=>346,7985=>346,7986=>346,7987=>346,7988=>346,7989=>346,7990=>346,
-7991=>346,7992=>467,7993=>476,7994=>631,7995=>661,7996=>631,7997=>633,7998=>568,7999=>571,8000=>610,
-8001=>610,8002=>610,8003=>610,8004=>610,8005=>610,8008=>945,8009=>905,8010=>1118,8011=>1121,8012=>1064,
-8013=>1062,8016=>575,8017=>575,8018=>575,8019=>575,8020=>575,8021=>575,8022=>575,8023=>575,8025=>964,
-8027=>1148,8029=>1162,8031=>1081,8032=>800,8033=>800,8034=>800,8035=>800,8036=>800,8037=>800,8038=>800,
-8039=>800,8040=>904,8041=>875,8042=>1092,8043=>1087,8044=>1003,8045=>1002,8046=>1001,8047=>1025,8048=>656,
-8049=>656,8050=>570,8051=>570,8052=>586,8053=>586,8054=>346,8055=>346,8056=>610,8057=>610,8058=>575,
-8059=>575,8060=>800,8061=>800,8064=>656,8065=>656,8066=>656,8067=>656,8068=>656,8069=>656,8070=>656,
-8071=>656,8072=>854,8073=>855,8074=>1006,8075=>1030,8076=>996,8077=>977,8078=>938,8079=>959,8080=>586,
-8081=>586,8082=>586,8083=>586,8084=>586,8085=>586,8086=>586,8087=>586,8088=>960,8089=>960,8090=>1155,
-8091=>1186,8092=>1161,8093=>1171,8094=>1087,8095=>1102,8096=>800,8097=>800,8098=>800,8099=>800,8100=>800,
-8101=>800,8102=>800,8103=>800,8104=>1005,8105=>980,8106=>1201,8107=>1192,8108=>1109,8109=>1108,8110=>1106,
-8111=>1130,8112=>656,8113=>656,8114=>656,8115=>656,8116=>640,8118=>656,8119=>656,8120=>764,8121=>764,
-8122=>764,8123=>764,8124=>854,8125=>278,8126=>201,8127=>147,8128=>278,8129=>333,8130=>586,8131=>586,
-8132=>597,8134=>586,8135=>586,8136=>911,8137=>925,8138=>941,8139=>948,8140=>826,8141=>402,8142=>403,
-8143=>147,8144=>346,8145=>346,8146=>346,8147=>346,8150=>346,8151=>346,8152=>296,8153=>296,8154=>511,
-8155=>521,8157=>434,8158=>433,8159=>333,8160=>575,8161=>575,8162=>575,8163=>575,8164=>626,8165=>626,
-8166=>575,8167=>575,8168=>744,8169=>744,8170=>901,8171=>975,8172=>837,8173=>353,8174=>351,8175=>303,
-8178=>800,8179=>800,8180=>800,8182=>800,8183=>800,8184=>979,8185=>918,8186=>936,8187=>877,8188=>895,
-8189=>333,8190=>159,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,
-8200=>278,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,
-8210=>556,8213=>1000,8214=>437,8215=>556,8219=>278,8223=>503,8227=>350,8228=>278,8229=>666,8231=>278,
-8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>500,8241=>1372,8242=>238,
-8243=>426,8244=>614,8245=>238,8246=>379,8247=>571,8248=>450,8251=>622,8252=>666,8253=>617,8254=>556,
-8255=>658,8256=>658,8257=>438,8258=>840,8259=>400,8260=>167,8261=>334,8262=>334,8263=>1222,8264=>944,
-8265=>944,8266=>556,8267=>556,8268=>537,8269=>537,8270=>389,8271=>333,8272=>658,8273=>389,8274=>634,
-8275=>568,8276=>658,8277=>793,8278=>515,8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,
-8285=>224,8286=>224,8287=>0,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>351,8305=>351,
-8308=>351,8309=>351,8310=>351,8311=>351,8312=>351,8313=>351,8314=>351,8315=>351,8316=>351,8317=>351,
-8318=>351,8319=>351,8320=>351,8321=>251,8322=>351,8323=>351,8324=>351,8325=>351,8326=>351,8327=>351,
-8328=>351,8329=>351,8330=>350,8331=>350,8332=>350,8333=>350,8334=>350,8355=>611,8356=>576,8357=>833,
-8358=>724,8360=>1286,8362=>1049,8363=>571,8368=>594,8373=>591,8448=>985,8449=>1007,8451=>1020,8453=>981,
-8454=>1042,8455=>667,8457=>930,8465=>606,8468=>883,8470=>1006,8471=>784,8476=>699,8480=>1000,8481=>1230,
-8486=>780,8487=>780,8489=>286,8490=>722,8491=>722,8494=>556,8498=>626,8501=>714,8502=>651,8503=>557,
-8504=>638,8506=>906,8507=>1155,8513=>778,8514=>611,8515=>611,8516=>667,8523=>710,8525=>1072,8526=>500,
-8531=>869,8532=>869,8533=>869,8534=>869,8535=>869,8536=>869,8537=>869,8538=>869,8539=>869,8540=>869,
-8541=>869,8542=>869,8543=>869,8544=>278,8545=>556,8546=>834,8547=>945,8548=>667,8549=>945,8550=>1223,
-8551=>1501,8552=>945,8553=>667,8554=>945,8555=>1223,8556=>611,8557=>722,8558=>722,8559=>833,8560=>278,
-8561=>556,8562=>834,8563=>834,8564=>556,8565=>834,8566=>1112,8567=>1390,8568=>834,8569=>556,8570=>834,
-8571=>1112,8572=>278,8573=>556,8574=>611,8575=>889,8592=>964,8593=>964,8594=>964,8595=>964,8596=>964,
-8597=>964,8598=>964,8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8606=>964,8607=>964,8608=>964,
-8609=>964,8610=>964,8611=>964,8612=>964,8613=>964,8614=>964,8615=>964,8616=>964,8644=>964,8645=>964,
-8646=>964,8647=>964,8648=>964,8649=>964,8650=>964,8706=>608,8710=>729,8721=>856,8722=>584,8723=>584,
-8725=>1107,8730=>597,8800=>584,8804=>584,8805=>584,9251=>500,9674=>489,9824=>626,9825=>694,9826=>595,
-9827=>776,9828=>626,9829=>694,9830=>595,9831=>776,9833=>333,9834=>556,9835=>778,9836=>778,9837=>556,
-9838=>556,9839=>556,11799=>333,64256=>607,64257=>576,64258=>603,64259=>849,64260=>849,64275=>1243,64276=>1226,
-64277=>1233,64278=>1238,64279=>1448,64285=>284,64286=>305,64287=>542,64288=>653,64289=>964,64290=>888,64291=>932,
-64292=>845,64293=>917,64294=>933,64295=>850,64296=>1006,64297=>584,64298=>840,64299=>840,64300=>840,64301=>840,
-64302=>714,64303=>714,64304=>714,64305=>651,64306=>557,64307=>638,64308=>682,64309=>348,64310=>443,64312=>670,
-64313=>354,64314=>590,64315=>595,64316=>667,64318=>704,64320=>429,64321=>670,64323=>661,64324=>660,64326=>671,
-64327=>672,64328=>600,64329=>840,64330=>756,64331=>212,64332=>591,64333=>550,64334=>568,64335=>714,65533=>788);
-$enc='';
-$diff='';
-$file='freesansbi.z';
-$ctg='freesansbi.ctg.z';
-$originalsize=269952;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansi.php
deleted file mode 100644
index 898bb41b178..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freesansi.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSansOblique';
-$desc=array('Ascent'=>1000,'Descent'=>-300,'CapHeight'=>22,'Flags'=>96,'FontBBox'=>'[-898 -431 1572 1072]','ItalicAngle'=>-12,'StemV'=>70,'MissingWidth'=>600);
-$up=-176;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,40=>333,41=>333,
-42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,50=>556,51=>556,
-52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,60=>584,61=>584,
-62=>584,63=>556,64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,70=>611,71=>778,
-72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,80=>667,81=>778,
-82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,90=>611,91=>278,
-92=>278,93=>278,94=>469,95=>556,96=>333,97=>556,98=>556,99=>500,100=>556,101=>556,
-102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,109=>833,110=>556,111=>556,
-112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,118=>500,119=>722,120=>500,121=>500,
-122=>500,123=>334,124=>260,125=>334,126=>584,8364=>655,8218=>222,402=>278,8222=>333,8230=>1000,
-8224=>556,8225=>556,710=>333,8240=>1000,352=>667,8249=>250,338=>1000,381=>611,8216=>222,8217=>222,
-8220=>333,8221=>333,8226=>350,8211=>556,8212=>1000,732=>333,8482=>1000,353=>500,8250=>250,339=>944,
-382=>500,376=>667,160=>278,161=>333,162=>556,163=>556,164=>556,165=>556,166=>260,167=>556,
-168=>333,169=>737,170=>370,171=>444,172=>584,173=>333,174=>737,175=>333,176=>606,177=>584,
-178=>352,179=>352,180=>333,181=>556,182=>537,183=>278,184=>333,185=>250,186=>365,187=>444,
-188=>947,189=>947,190=>947,191=>611,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,
-198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,217=>722,
-218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,226=>556,227=>556,
-228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,235=>556,236=>278,237=>278,
-238=>278,239=>278,240=>556,241=>556,242=>556,243=>556,244=>556,245=>556,246=>556,247=>584,
-248=>611,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>667,257=>556,
-258=>667,259=>556,260=>667,261=>556,262=>722,263=>500,264=>722,265=>500,266=>722,267=>500,
-268=>722,269=>500,270=>722,271=>722,272=>722,273=>556,274=>667,275=>556,276=>667,277=>556,
-278=>667,279=>556,280=>667,281=>556,282=>667,283=>556,284=>778,285=>556,286=>778,287=>556,
-288=>778,289=>556,290=>778,291=>527,292=>722,293=>556,294=>722,295=>556,296=>278,297=>278,
-298=>278,299=>278,300=>278,301=>278,302=>278,303=>222,304=>278,305=>278,306=>742,307=>362,
-308=>500,309=>222,310=>667,311=>500,312=>510,313=>556,314=>222,315=>556,316=>222,317=>556,
-318=>387,319=>556,320=>409,321=>556,322=>222,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>722,330=>722,331=>556,332=>778,333=>556,334=>778,335=>556,336=>778,337=>556,
-340=>722,341=>333,342=>722,343=>333,344=>722,345=>333,346=>667,347=>500,348=>667,349=>500,
-350=>667,351=>500,354=>611,355=>278,356=>611,357=>443,358=>611,359=>278,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>944,373=>722,374=>667,375=>500,377=>611,378=>500,379=>611,380=>500,383=>278,384=>556,
-385=>854,386=>667,387=>556,388=>667,389=>556,390=>722,391=>722,392=>500,393=>722,394=>899,
-395=>667,396=>556,397=>566,398=>667,399=>778,400=>667,401=>611,403=>778,404=>667,405=>889,
-406=>278,407=>333,408=>741,409=>500,410=>333,411=>560,412=>833,413=>722,414=>556,415=>778,
-416=>778,417=>556,418=>944,419=>722,420=>842,421=>556,422=>666,423=>667,424=>500,425=>611,
-426=>333,427=>278,428=>611,429=>278,430=>611,431=>722,432=>556,433=>768,434=>722,435=>788,
-436=>616,437=>611,438=>500,439=>611,440=>611,441=>500,442=>500,443=>556,446=>556,447=>556,
-448=>260,449=>520,450=>584,451=>278,452=>1311,453=>1208,454=>1056,455=>1056,456=>778,457=>444,
-458=>1158,459=>944,460=>778,461=>667,462=>556,463=>278,464=>278,465=>778,466=>556,467=>722,
-468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,476=>556,477=>556,
-478=>667,479=>556,480=>667,481=>556,482=>1000,483=>889,484=>778,485=>556,486=>778,487=>556,
-488=>667,489=>500,490=>778,491=>556,492=>778,493=>556,494=>611,495=>500,496=>222,497=>1333,
-498=>1222,499=>1056,500=>778,501=>556,503=>630,504=>722,505=>556,506=>667,507=>556,508=>1000,
-509=>889,510=>778,511=>611,512=>667,513=>556,514=>667,515=>556,516=>667,517=>556,518=>667,
-519=>556,520=>278,521=>278,522=>278,523=>278,524=>778,525=>556,526=>778,527=>556,528=>722,
-529=>333,530=>722,531=>333,532=>722,533=>556,534=>722,535=>556,536=>667,537=>500,538=>611,
-539=>278,540=>521,541=>393,542=>722,543=>556,548=>611,549=>500,550=>667,551=>556,552=>667,
-553=>556,554=>778,555=>556,556=>778,557=>556,558=>778,559=>556,560=>778,561=>556,562=>667,
-563=>500,567=>222,592=>556,593=>556,594=>659,595=>556,596=>500,597=>500,598=>556,599=>556,
-600=>556,601=>556,602=>804,603=>500,604=>500,605=>742,606=>500,607=>222,608=>556,609=>556,
-610=>546,611=>621,612=>556,613=>556,614=>556,615=>556,616=>222,617=>222,618=>278,619=>473,
-620=>427,621=>222,622=>611,623=>833,624=>833,625=>833,626=>556,627=>556,628=>560,629=>556,
-630=>778,631=>722,632=>728,633=>333,634=>333,635=>393,636=>333,637=>333,638=>384,639=>369,
-640=>546,641=>546,642=>500,643=>278,644=>278,645=>278,646=>444,647=>278,648=>278,649=>556,
-650=>626,651=>539,652=>500,653=>722,654=>500,655=>556,656=>500,657=>500,658=>500,659=>552,
-660=>556,661=>556,662=>556,663=>1000,664=>556,665=>521,666=>500,667=>546,668=>500,669=>444,
-670=>500,671=>430,672=>556,673=>556,674=>556,675=>944,676=>944,677=>944,678=>689,679=>506,
-680=>764,681=>766,682=>660,683=>577,684=>476,685=>486,686=>565,687=>621,688=>500,689=>500,
-690=>167,691=>333,692=>333,693=>393,694=>500,695=>500,696=>330,697=>278,698=>454,699=>278,
-700=>278,701=>278,702=>333,703=>333,704=>333,705=>333,706=>333,707=>333,708=>333,709=>333,
-711=>333,712=>333,713=>333,714=>333,715=>333,716=>333,717=>333,718=>333,719=>333,720=>333,
-721=>333,722=>333,723=>333,724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,
-731=>333,733=>333,734=>333,735=>510,736=>333,737=>333,738=>333,739=>333,740=>334,741=>526,
-742=>526,743=>526,744=>526,745=>526,746=>519,747=>519,748=>333,749=>333,750=>333,751=>333,
-752=>383,753=>294,754=>294,755=>327,756=>261,757=>437,758=>437,759=>333,760=>278,761=>200,
-762=>200,763=>200,764=>200,765=>333,766=>333,767=>333,768=>0,769=>0,770=>0,771=>0,
-772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,
-782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,
-792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,
-802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,
-812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,
-832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,
-842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,859=>0,860=>0,861=>0,
-862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,868=>0,869=>0,870=>0,871=>0,
-872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,878=>0,879=>0,884=>199,885=>199,
-890=>332,894=>278,900=>291,901=>624,902=>659,903=>278,904=>870,905=>870,906=>315,908=>876,
-910=>903,911=>882,912=>333,913=>765,914=>643,915=>589,916=>760,917=>659,918=>682,919=>707,
-920=>769,921=>256,922=>689,923=>765,924=>825,925=>687,926=>649,927=>766,928=>730,929=>649,
-931=>678,932=>655,933=>733,934=>753,935=>783,936=>773,937=>768,938=>285,939=>733,940=>593,
-941=>523,942=>595,943=>271,944=>549,945=>596,946=>534,947=>531,948=>566,949=>523,950=>470,
-951=>557,952=>547,953=>293,954=>516,955=>579,956=>571,957=>518,958=>499,959=>561,960=>636,
-961=>551,962=>564,963=>627,964=>505,965=>549,966=>715,967=>579,968=>662,969=>746,970=>335,
-971=>549,972=>535,973=>503,974=>725,977=>580,978=>742,979=>809,980=>620,981=>728,982=>740,
-983=>556,1008=>556,1009=>566,1012=>778,1013=>328,1024=>657,1025=>657,1026=>781,1027=>590,1028=>709,
-1029=>655,1030=>254,1031=>254,1032=>532,1033=>1002,1034=>1166,1035=>772,1036=>674,1037=>730,1038=>605,
-1039=>721,1040=>667,1041=>665,1042=>665,1043=>590,1044=>807,1045=>657,1046=>914,1047=>653,1048=>730,
-1049=>730,1050=>674,1051=>656,1052=>846,1053=>721,1054=>778,1055=>720,1056=>649,1057=>709,1058=>606,
-1059=>605,1060=>875,1061=>660,1062=>754,1063=>612,1064=>830,1065=>872,1066=>839,1067=>885,1068=>668,
-1069=>708,1070=>1099,1071=>676,1072=>556,1073=>545,1074=>521,1075=>375,1076=>572,1077=>538,1078=>815,
-1079=>488,1080=>557,1081=>557,1082=>519,1083=>508,1084=>618,1085=>558,1086=>533,1087=>557,1088=>569,
-1089=>511,1090=>392,1091=>469,1092=>922,1093=>475,1094=>588,1095=>482,1096=>693,1097=>722,1098=>644,
-1099=>731,1100=>521,1101=>509,1102=>790,1103=>550,1104=>538,1105=>538,1106=>566,1107=>375,1108=>506,
-1109=>488,1110=>224,1111=>272,1112=>226,1113=>793,1114=>849,1115=>576,1116=>519,1117=>557,1118=>469,
-1119=>557,1120=>942,1121=>693,1136=>749,1137=>666,1138=>785,1139=>528,1154=>456,1155=>0,1156=>0,
-1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,1162=>751,1163=>588,1164=>685,1165=>554,1166=>656,
-1167=>606,1168=>598,1169=>396,1170=>611,1171=>409,1172=>592,1173=>448,1174=>921,1175=>826,1176=>657,
-1177=>493,1178=>680,1179=>529,1180=>678,1181=>524,1182=>695,1183=>528,1184=>846,1185=>650,1186=>741,
-1187=>578,1188=>992,1189=>700,1190=>1047,1191=>778,1192=>687,1193=>507,1194=>709,1195=>509,1196=>611,
-1197=>393,1198=>664,1199=>580,1200=>668,1201=>617,1202=>664,1203=>489,1204=>905,1205=>662,1206=>631,
-1207=>498,1208=>597,1209=>472,1210=>597,1211=>471,1212=>927,1213=>716,1214=>927,1215=>716,1216=>254,
-1217=>915,1218=>815,1219=>665,1220=>510,1221=>678,1222=>533,1223=>721,1224=>558,1225=>751,1226=>589,
-1227=>599,1228=>472,1229=>876,1230=>649,1231=>254,1232=>667,1233=>552,1234=>667,1235=>552,1236=>1000,
-1237=>889,1238=>657,1239=>538,1240=>722,1241=>511,1242=>722,1243=>511,1244=>914,1245=>815,1246=>653,
-1247=>488,1248=>611,1249=>546,1250=>730,1251=>557,1252=>730,1253=>557,1254=>774,1255=>529,1256=>785,
-1257=>528,1258=>785,1259=>528,1260=>708,1261=>509,1262=>605,1263=>469,1264=>605,1265=>469,1266=>605,
-1267=>469,1268=>612,1269=>482,1270=>601,1271=>430,1272=>885,1273=>731,1296=>667,1297=>500,1298=>673,
-1299=>557,1306=>778,1307=>556,1308=>944,1309=>722,1310=>667,1311=>510,1329=>722,1330=>705,1331=>774,
-1332=>754,1333=>722,1334=>751,1335=>485,1336=>722,1337=>782,1338=>655,1339=>699,1340=>417,1341=>853,
-1342=>791,1343=>711,1344=>588,1345=>663,1346=>665,1347=>665,1348=>756,1349=>623,1350=>773,1351=>603,
-1352=>722,1353=>648,1354=>722,1355=>751,1356=>750,1357=>722,1358=>748,1359=>667,1360=>699,1361=>623,
-1362=>417,1363=>785,1364=>638,1365=>778,1366=>716,1369=>333,1370=>222,1371=>133,1372=>325,1373=>333,
-1374=>333,1375=>333,1377=>833,1378=>556,1379=>572,1380=>581,1381=>546,1382=>588,1383=>448,1384=>556,
-1385=>568,1386=>582,1387=>552,1388=>301,1389=>799,1390=>556,1391=>554,1392=>533,1393=>548,1394=>552,
-1395=>552,1396=>544,1397=>222,1398=>544,1399=>456,1400=>556,1401=>390,1402=>833,1403=>509,1404=>547,
-1405=>533,1406=>610,1407=>887,1408=>556,1409=>545,1410=>301,1411=>853,1412=>632,1413=>579,1414=>690,
-1415=>545,1417=>278,1418=>367,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,
-1463=>0,1464=>0,1465=>0,1467=>0,1468=>0,1469=>0,1470=>488,1471=>0,1472=>212,1473=>0,
-1474=>0,1475=>278,1476=>0,1488=>640,1489=>591,1490=>466,1491=>598,1492=>622,1493=>212,1494=>351,
-1495=>623,1496=>608,1497=>200,1498=>526,1499=>550,1500=>600,1501=>623,1502=>621,1503=>212,1504=>378,
-1505=>607,1506=>587,1507=>575,1508=>568,1509=>540,1510=>590,1511=>606,1512=>547,1513=>776,1514=>687,
-1520=>424,1521=>412,1522=>400,1523=>184,1524=>344,2433=>0,2434=>300,2435=>264,2437=>594,2438=>790,
-2439=>469,2440=>513,2441=>520,2442=>549,2443=>594,2444=>481,2447=>580,2448=>627,2451=>540,2452=>613,
-2453=>570,2454=>467,2455=>471,2456=>428,2457=>483,2458=>408,2459=>509,2460=>591,2461=>563,2462=>771,
-2463=>381,2464=>404,2465=>522,2466=>408,2467=>450,2468=>543,2469=>477,2470=>418,2471=>433,2472=>445,
-2474=>499,2475=>584,2476=>377,2477=>555,2478=>448,2479=>423,2480=>390,2482=>498,2486=>498,2487=>425,
-2488=>495,2489=>440,2492=>22,2493=>440,2494=>193,2495=>189,2496=>180,2497=>0,2498=>0,2499=>0,
-2500=>0,2503=>252,2504=>243,2507=>889,2508=>865,2509=>0,2510=>356,2519=>219,2524=>523,2525=>408,
-2527=>428,2528=>594,2529=>481,2530=>0,2531=>0,2534=>500,2535=>437,2536=>479,2537=>530,2538=>497,
-2539=>500,2540=>482,2541=>503,2542=>517,2543=>481,2544=>377,2545=>377,2546=>429,2547=>383,2548=>429,
-2549=>478,2550=>545,2551=>158,2552=>365,2553=>280,2554=>357,4256=>587,4257=>620,4258=>642,4259=>815,
-4260=>600,4261=>595,4262=>799,4263=>893,4264=>622,4265=>597,4266=>939,4267=>602,4268=>603,4269=>790,
-4270=>587,4271=>623,4272=>799,4273=>601,4274=>792,4275=>724,4276=>847,4277=>599,4278=>812,4279=>603,
-4280=>653,4281=>590,4282=>754,4283=>596,4284=>653,4285=>651,4286=>596,4287=>888,4288=>593,4304=>436,
-4305=>491,4306=>528,4307=>692,4308=>447,4309=>447,4310=>628,4311=>734,4312=>449,4313=>445,4314=>843,
-4315=>449,4316=>449,4317=>682,4318=>449,4319=>480,4320=>682,4321=>468,4322=>710,4323=>623,4324=>697,
-4325=>447,4326=>702,4327=>447,4328=>470,4329=>440,4330=>632,4331=>449,4332=>470,4333=>536,4334=>449,
-4335=>656,4336=>474,4337=>630,4338=>394,4339=>419,4340=>422,4341=>436,4345=>528,4347=>515,7680=>667,
-7681=>556,7682=>667,7683=>556,7684=>667,7685=>556,7686=>667,7687=>556,7688=>722,7689=>500,7690=>722,
-7691=>556,7692=>722,7693=>556,7694=>722,7695=>556,7696=>722,7697=>556,7698=>722,7699=>556,7700=>667,
-7701=>556,7702=>667,7703=>556,7704=>667,7705=>556,7706=>667,7707=>556,7708=>667,7709=>556,7710=>611,
-7711=>278,7712=>778,7713=>556,7714=>722,7715=>556,7716=>722,7717=>556,7718=>722,7719=>556,7720=>722,
-7721=>556,7722=>722,7723=>556,7724=>278,7725=>222,7726=>278,7727=>278,7728=>667,7729=>500,7730=>667,
-7731=>500,7732=>667,7733=>500,7734=>556,7735=>222,7736=>556,7737=>222,7738=>556,7739=>222,7740=>556,
-7741=>222,7742=>833,7743=>833,7744=>833,7745=>833,7746=>833,7747=>833,7748=>722,7749=>556,7750=>722,
-7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,7756=>778,7757=>556,7758=>778,7759=>556,7760=>778,
-7761=>556,7762=>778,7763=>556,7764=>667,7765=>556,7766=>667,7767=>556,7768=>722,7769=>333,7770=>722,
-7771=>333,7772=>722,7773=>333,7774=>722,7775=>333,7776=>667,7777=>500,7778=>667,7779=>500,7780=>667,
-7781=>500,7782=>667,7783=>500,7784=>667,7785=>500,7786=>611,7787=>278,7788=>611,7789=>278,7790=>611,
-7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,
-7801=>556,7802=>722,7803=>556,7804=>667,7805=>500,7806=>667,7807=>500,7808=>944,7809=>722,7810=>944,
-7811=>722,7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>667,7819=>500,7820=>667,
-7821=>500,7822=>667,7823=>500,7824=>611,7825=>500,7826=>611,7827=>500,7828=>611,7829=>500,7830=>556,
-7831=>278,7832=>722,7833=>500,7834=>555,7835=>278,7840=>667,7841=>556,7842=>667,7843=>556,7844=>667,
-7845=>556,7846=>667,7847=>556,7848=>667,7849=>556,7850=>667,7851=>556,7852=>667,7853=>556,7854=>667,
-7855=>556,7856=>667,7857=>556,7858=>667,7859=>556,7860=>667,7861=>556,7862=>667,7863=>556,7864=>667,
-7865=>556,7866=>667,7867=>556,7868=>667,7869=>556,7870=>667,7871=>556,7872=>667,7873=>556,7874=>667,
-7875=>556,7876=>667,7877=>556,7878=>667,7879=>556,7880=>278,7881=>278,7882=>278,7883=>222,7884=>778,
-7885=>556,7886=>778,7887=>556,7888=>778,7889=>556,7890=>778,7891=>556,7892=>778,7893=>556,7894=>778,
-7895=>556,7896=>778,7897=>556,7898=>778,7899=>556,7900=>778,7901=>556,7902=>778,7903=>556,7904=>778,
-7905=>556,7906=>778,7907=>556,7908=>722,7909=>556,7910=>722,7911=>556,7912=>722,7913=>556,7914=>722,
-7915=>556,7916=>722,7917=>556,7918=>722,7919=>556,7920=>722,7921=>556,7922=>667,7923=>500,7924=>667,
-7925=>500,7926=>667,7927=>500,7928=>667,7929=>500,7936=>596,7937=>596,7938=>596,7939=>596,7940=>596,
-7941=>596,7942=>596,7943=>596,7944=>718,7945=>718,7946=>796,7947=>780,7948=>746,7949=>744,7950=>718,
-7951=>718,7952=>523,7953=>523,7954=>523,7955=>523,7956=>523,7957=>523,7960=>759,7961=>751,7962=>962,
-7963=>957,7964=>958,7965=>947,7968=>557,7969=>557,7970=>557,7971=>557,7972=>557,7973=>557,7974=>557,
-7975=>557,7976=>807,7977=>796,7978=>1013,7979=>1002,7980=>1009,7981=>1000,7982=>882,7983=>919,7984=>293,
-7985=>293,7986=>361,7987=>382,7988=>347,7989=>329,7990=>352,7991=>347,7992=>353,7993=>348,7994=>555,
-7995=>557,7996=>557,7997=>545,7998=>435,7999=>448,8000=>561,8001=>561,8002=>561,8003=>561,8004=>561,
-8005=>561,8008=>792,8009=>801,8010=>1031,8011=>1029,8012=>931,8013=>931,8016=>549,8017=>549,8018=>549,
-8019=>549,8020=>549,8021=>549,8022=>549,8023=>549,8025=>838,8027=>1004,8029=>1036,8031=>936,8032=>746,
-8033=>746,8034=>746,8035=>746,8036=>746,8037=>746,8038=>746,8039=>746,8040=>768,8041=>794,8042=>1003,
-8043=>1002,8044=>922,8045=>918,8046=>871,8047=>893,8048=>596,8049=>596,8050=>523,8051=>523,8052=>557,
-8053=>557,8054=>293,8055=>293,8056=>561,8057=>561,8058=>549,8059=>549,8060=>746,8061=>746,8064=>596,
-8065=>596,8066=>596,8067=>596,8068=>596,8069=>596,8070=>596,8071=>596,8072=>859,8073=>861,8074=>948,
-8075=>928,8076=>886,8077=>895,8078=>865,8079=>864,8080=>557,8081=>557,8082=>557,8083=>557,8084=>557,
-8085=>557,8086=>557,8087=>557,8088=>890,8089=>894,8090=>1092,8091=>1084,8092=>1095,8093=>1080,8094=>953,
-8095=>986,8096=>746,8097=>746,8098=>746,8099=>746,8100=>746,8101=>746,8102=>746,8103=>746,8104=>892,
-8105=>907,8106=>1113,8107=>1095,8108=>1034,8109=>1030,8110=>983,8111=>1002,8112=>596,8113=>596,8114=>596,
-8115=>596,8116=>593,8118=>596,8119=>596,8120=>765,8121=>765,8122=>765,8123=>765,8124=>861,8125=>147,
-8126=>201,8127=>147,8128=>278,8129=>333,8130=>557,8131=>557,8132=>595,8134=>557,8135=>557,8136=>835,
-8137=>849,8138=>895,8139=>861,8140=>786,8141=>602,8142=>601,8143=>333,8144=>335,8145=>322,8146=>357,
-8147=>336,8150=>340,8151=>320,8152=>300,8153=>298,8154=>439,8155=>408,8157=>434,8158=>433,8159=>333,
-8160=>549,8161=>549,8162=>549,8163=>549,8164=>551,8165=>551,8166=>549,8167=>549,8168=>733,8169=>733,
-8170=>794,8171=>832,8172=>739,8173=>333,8174=>624,8175=>303,8178=>746,8179=>746,8180=>725,8182=>746,
-8183=>746,8184=>889,8185=>828,8186=>836,8187=>811,8188=>867,8189=>333,8190=>159,8192=>500,8193=>1000,
-8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>556,8200=>278,8201=>200,8202=>100,8203=>0,
-8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>556,8213=>1000,8214=>312,8215=>567,
-8219=>221,8223=>333,8227=>350,8228=>278,8229=>666,8231=>278,8232=>0,8233=>0,8234=>0,8235=>0,
-8236=>0,8237=>0,8238=>0,8239=>500,8241=>1360,8242=>278,8243=>469,8244=>680,8245=>278,8246=>469,
-8247=>680,8248=>376,8251=>622,8252=>556,8253=>556,8254=>556,8255=>658,8256=>658,8257=>438,8258=>840,
-8259=>400,8260=>167,8261=>334,8262=>334,8263=>1112,8264=>834,8265=>834,8266=>556,8267=>537,8268=>537,
-8269=>537,8270=>389,8271=>278,8272=>658,8273=>389,8274=>634,8275=>500,8276=>658,8277=>1000,8278=>515,
-8279=>855,8280=>722,8281=>725,8282=>224,8283=>722,8284=>604,8285=>224,8286=>224,8287=>0,8288=>0,
-8289=>0,8290=>0,8291=>0,8292=>0,8304=>351,8305=>350,8308=>351,8309=>351,8310=>351,8311=>351,
-8312=>351,8313=>351,8314=>350,8315=>350,8316=>350,8317=>350,8318=>350,8319=>350,8320=>351,8321=>251,
-8322=>351,8323=>351,8324=>351,8325=>353,8326=>351,8327=>351,8328=>351,8329=>351,8330=>350,8331=>350,
-8332=>350,8333=>350,8334=>350,8353=>615,8354=>601,8355=>611,8356=>556,8357=>833,8358=>682,8359=>1205,
-8360=>1222,8361=>879,8362=>869,8363=>538,8365=>667,8366=>611,8368=>570,8369=>684,8370=>717,8371=>667,
-8372=>667,8373=>640,8400=>0,8401=>0,8402=>0,8403=>0,8406=>0,8407=>0,8411=>0,8412=>0,
-8413=>0,8414=>0,8415=>0,8416=>0,8417=>0,8421=>0,8422=>0,8423=>0,8424=>0,8425=>0,
-8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,8432=>0,8448=>970,8449=>979,8451=>1019,
-8452=>556,8453=>876,8454=>922,8455=>667,8457=>867,8459=>969,8460=>615,8462=>556,8463=>572,8464=>809,
-8465=>606,8466=>874,8468=>747,8470=>934,8471=>737,8472=>600,8475=>850,8476=>699,8480=>1000,8481=>1220,
-8486=>768,8487=>744,8488=>512,8489=>286,8490=>722,8491=>722,8492=>908,8493=>623,8494=>556,8496=>562,
-8498=>556,8499=>1080,8501=>520,8502=>591,8503=>456,8504=>598,8506=>843,8507=>1220,8513=>778,8514=>556,
-8515=>556,8516=>667,8522=>516,8523=>640,8525=>936,8526=>477,8531=>869,8532=>869,8533=>869,8534=>869,
-8535=>869,8536=>869,8537=>869,8538=>869,8539=>869,8540=>869,8541=>869,8542=>869,8543=>869,8544=>278,
-8545=>556,8546=>834,8547=>945,8548=>667,8549=>945,8550=>1223,8551=>1501,8552=>945,8553=>667,8554=>945,
-8555=>1223,8556=>556,8557=>722,8558=>722,8559=>833,8560=>222,8561=>444,8562=>666,8563=>722,8564=>500,
-8565=>722,8566=>944,8567=>1166,8568=>722,8569=>500,8570=>722,8571=>944,8572=>222,8573=>500,8574=>556,
-8575=>833,8592=>987,8593=>603,8594=>987,8595=>603,8596=>1042,8597=>1042,8706=>556,8710=>712,8721=>804,
-8722=>584,8725=>947,8730=>542,8739=>200,8741=>312,8800=>584,8804=>584,8805=>584,9251=>500,9674=>489,
-9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,9831=>776,9833=>333,9834=>556,
-9835=>722,9836=>722,9837=>415,9838=>377,9839=>402,11799=>333,64256=>494,64257=>471,64258=>474,64259=>659,
-64260=>654,64261=>530,64275=>1027,64276=>1056,64277=>1058,64278=>1073,64279=>1301,64285=>200,64286=>305,64287=>400,
-64288=>587,64289=>890,64290=>848,64291=>872,64292=>800,64293=>850,64294=>873,64295=>797,64296=>937,64297=>584,
-64298=>776,64299=>776,64300=>776,64301=>776,64302=>640,64303=>640,64304=>640,64305=>591,64306=>466,64307=>598,
-64308=>622,64309=>262,64310=>351,64312=>608,64313=>270,64314=>526,64315=>550,64316=>600,64318=>621,64320=>378,
-64321=>607,64323=>575,64324=>568,64326=>590,64327=>606,64328=>547,64329=>776,64330=>687,64331=>212,64332=>591,
-64333=>550,64334=>568,64335=>640,65533=>788);
-$enc='';
-$diff='';
-$file='freesansi.z';
-$ctg='freesansi.ctg.z';
-$originalsize=410728;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserif.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserif.php
deleted file mode 100644
index 0fbefe781f8..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserif.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerif';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>10,'Flags'=>96,'FontBBox'=>'[-879 -1201 1767 2606]','ItalicAngle'=>-33.2,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>250,33=>333,34=>408,35=>500,36=>500,37=>833,38=>778,39=>180,40=>333,41=>333,
-42=>500,43=>564,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,50=>500,51=>500,
-52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>278,59=>278,60=>564,61=>564,
-62=>564,63=>444,64=>921,65=>722,66=>667,67=>667,68=>722,69=>611,70=>556,71=>722,
-72=>722,73=>333,74=>389,75=>722,76=>611,77=>889,78=>722,79=>722,80=>556,81=>722,
-82=>667,83=>556,84=>611,85=>722,86=>722,87=>944,88=>722,89=>722,90=>611,91=>333,
-92=>278,93=>333,94=>469,95=>500,96=>333,97=>444,98=>500,99=>444,100=>500,101=>444,
-102=>333,103=>500,104=>500,105=>278,106=>278,107=>500,108=>278,109=>778,110=>500,111=>500,
-112=>500,113=>500,114=>333,115=>389,116=>278,117=>500,118=>500,119=>722,120=>500,121=>500,
-122=>444,123=>480,124=>200,125=>480,126=>541,8364=>741,8218=>250,402=>333,8222=>444,8230=>1000,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>556,8249=>250,338=>889,381=>611,8216=>250,8217=>250,
-8220=>444,8221=>444,8226=>350,8211=>500,8212=>1000,732=>333,8482=>980,353=>389,8250=>250,339=>722,
-382=>444,376=>722,160=>250,161=>333,162=>500,163=>500,164=>500,165=>500,166=>200,167=>500,
-168=>333,169=>760,170=>276,171=>444,172=>564,173=>333,174=>760,175=>333,176=>400,177=>564,
-178=>320,179=>320,180=>333,181=>500,182=>453,183=>250,184=>333,185=>320,186=>310,187=>441,
-188=>750,189=>750,190=>750,191=>444,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,
-198=>889,199=>667,200=>611,201=>611,202=>611,203=>611,204=>333,205=>333,206=>333,207=>333,
-208=>722,209=>722,210=>722,211=>722,212=>722,213=>722,214=>722,215=>564,216=>722,217=>722,
-218=>722,219=>722,220=>722,221=>722,222=>576,223=>500,224=>444,225=>444,226=>444,227=>444,
-228=>444,229=>444,230=>667,231=>444,232=>444,233=>444,234=>444,235=>444,236=>278,237=>278,
-238=>278,239=>278,240=>501,241=>500,242=>500,243=>500,244=>500,245=>500,246=>500,247=>564,
-248=>500,249=>500,250=>500,251=>500,252=>500,253=>500,254=>496,255=>500,256=>722,257=>444,
-258=>722,259=>444,260=>722,261=>444,262=>667,263=>444,264=>667,265=>444,266=>667,267=>444,
-268=>667,269=>444,270=>722,271=>600,272=>722,273=>500,274=>611,275=>444,276=>611,277=>444,
-278=>611,279=>444,280=>611,281=>444,282=>611,283=>444,284=>722,285=>500,286=>722,287=>500,
-288=>722,289=>500,290=>722,291=>500,292=>722,293=>500,294=>722,295=>548,296=>333,297=>278,
-298=>333,299=>278,300=>333,301=>278,302=>333,303=>278,304=>333,305=>278,306=>703,307=>529,
-308=>389,309=>278,310=>722,311=>500,312=>500,313=>611,314=>278,315=>611,316=>278,317=>611,
-318=>348,319=>611,320=>444,321=>611,322=>278,323=>722,324=>500,325=>722,326=>500,327=>722,
-328=>500,329=>556,330=>722,331=>500,332=>722,333=>500,334=>722,335=>500,336=>722,337=>500,
-340=>667,341=>333,342=>667,343=>333,344=>667,345=>333,346=>556,347=>389,348=>556,349=>389,
-350=>556,351=>389,354=>611,355=>278,356=>611,357=>278,358=>611,359=>278,360=>722,361=>500,
-362=>722,363=>500,364=>722,365=>500,366=>722,367=>500,368=>722,369=>500,370=>722,371=>500,
-372=>944,373=>722,374=>722,375=>500,377=>611,378=>444,379=>611,380=>444,383=>333,384=>500,
-385=>667,386=>576,387=>500,388=>646,389=>500,390=>667,391=>667,392=>444,393=>722,394=>722,
-395=>646,396=>500,397=>534,398=>611,399=>722,400=>518,401=>556,403=>722,404=>665,405=>729,
-406=>333,407=>333,408=>810,409=>500,410=>278,411=>480,412=>944,413=>722,414=>500,415=>726,
-416=>722,417=>516,418=>1043,419=>778,420=>556,421=>500,422=>667,423=>556,424=>389,425=>627,
-426=>592,427=>278,428=>611,429=>278,430=>611,431=>800,432=>518,433=>743,434=>722,435=>822,
-436=>667,437=>611,438=>444,439=>530,440=>556,441=>389,442=>394,443=>500,444=>615,445=>439,
-446=>421,447=>500,448=>200,449=>400,450=>600,451=>333,452=>1333,453=>1166,454=>944,455=>1000,
-456=>889,457=>556,458=>1111,459=>1000,460=>778,461=>722,462=>444,463=>333,464=>278,465=>722,
-466=>500,467=>722,468=>500,469=>722,470=>500,471=>722,472=>500,473=>722,474=>500,475=>722,
-476=>500,477=>444,478=>722,479=>444,480=>722,481=>444,482=>889,483=>667,484=>722,485=>500,
-486=>722,487=>500,488=>722,489=>500,490=>722,491=>500,492=>722,493=>500,494=>530,495=>389,
-496=>278,497=>1333,498=>1166,499=>944,500=>722,501=>500,502=>944,503=>522,504=>722,505=>500,
-506=>722,507=>444,508=>889,509=>667,510=>722,511=>500,512=>722,513=>444,514=>722,515=>444,
-516=>611,517=>444,518=>611,519=>444,520=>333,521=>278,522=>333,523=>278,524=>722,525=>500,
-526=>722,527=>500,528=>667,529=>333,530=>667,531=>333,532=>500,533=>500,534=>722,535=>500,
-536=>556,537=>389,538=>611,539=>278,540=>424,541=>455,542=>722,543=>500,544=>715,545=>588,
-546=>565,547=>468,548=>611,549=>444,550=>722,551=>444,552=>611,553=>444,554=>722,555=>500,
-556=>722,557=>500,558=>722,559=>500,560=>722,561=>500,562=>722,563=>500,564=>407,565=>597,
-566=>379,567=>278,568=>771,569=>760,570=>722,571=>667,572=>444,573=>611,574=>611,575=>389,
-576=>444,577=>444,578=>444,579=>667,580=>722,581=>722,582=>611,583=>444,584=>389,585=>278,
-586=>796,587=>590,588=>667,589=>333,590=>722,591=>500,592=>444,593=>500,594=>507,595=>500,
-596=>444,597=>444,598=>500,599=>500,600=>444,601=>444,602=>722,603=>426,604=>426,605=>674,
-606=>454,607=>278,608=>500,609=>500,610=>484,611=>500,612=>582,613=>500,614=>500,615=>500,
-616=>278,617=>278,618=>278,619=>278,620=>278,621=>278,622=>556,623=>778,624=>778,625=>778,
-626=>500,627=>500,628=>500,629=>491,630=>668,631=>693,632=>640,633=>333,634=>333,635=>333,
-636=>333,637=>333,638=>333,639=>333,640=>446,641=>446,642=>389,643=>333,644=>500,645=>333,
-646=>500,647=>278,648=>278,649=>500,650=>517,651=>514,652=>500,653=>722,654=>500,655=>510,
-656=>524,657=>444,658=>389,659=>456,660=>444,661=>444,662=>444,663=>444,664=>722,665=>468,
-666=>454,667=>665,668=>524,669=>347,670=>500,671=>443,672=>500,673=>444,674=>444,675=>798,
-676=>795,677=>805,678=>554,679=>561,680=>678,681=>722,682=>554,683=>554,684=>500,685=>500,
-686=>611,687=>611,688=>300,689=>300,690=>278,691=>278,692=>278,693=>309,694=>306,695=>432,
-696=>310,697=>250,698=>408,699=>333,700=>333,701=>333,702=>333,703=>333,704=>258,705=>258,
-706=>374,707=>374,708=>383,709=>383,711=>333,712=>250,713=>333,714=>333,715=>333,716=>250,
-717=>333,718=>333,719=>333,720=>278,721=>278,722=>333,723=>333,724=>333,725=>333,726=>333,
-727=>333,728=>333,729=>333,730=>333,731=>333,733=>382,734=>336,735=>352,736=>311,737=>200,
-738=>243,739=>328,740=>300,741=>460,742=>460,743=>460,744=>460,745=>460,746=>477,747=>475,
-748=>339,749=>333,750=>444,751=>383,752=>383,753=>294,754=>294,755=>327,756=>261,757=>437,
-758=>437,759=>333,760=>278,761=>175,762=>175,763=>175,764=>175,765=>337,766=>337,767=>326,
-768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,
-778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,
-788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,
-798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,
-808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,
-818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,
-828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,
-848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,
-858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,
-868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,
-878=>0,879=>0,884=>199,885=>199,890=>332,894=>278,900=>267,901=>333,902=>722,903=>250,
-904=>800,905=>902,906=>507,908=>818,910=>861,911=>871,912=>286,913=>722,914=>667,915=>586,
-916=>660,917=>611,918=>611,919=>722,920=>726,921=>333,922=>722,923=>722,924=>889,925=>722,
-926=>628,927=>722,928=>722,929=>556,931=>627,932=>611,933=>696,934=>742,935=>722,936=>808,
-937=>743,938=>333,939=>718,940=>583,941=>426,942=>536,943=>286,944=>514,945=>583,946=>527,
-947=>480,948=>534,949=>426,950=>466,951=>536,952=>534,953=>286,954=>544,955=>476,956=>536,
-957=>480,958=>514,959=>500,960=>587,961=>528,962=>452,963=>537,964=>420,965=>514,966=>643,
-967=>480,968=>693,969=>693,970=>286,971=>514,972=>500,973=>514,974=>693,976=>534,977=>587,
-978=>620,979=>809,980=>620,981=>640,982=>684,983=>534,984=>556,985=>500,986=>594,987=>426,
-988=>556,989=>445,990=>656,991=>400,992=>722,993=>570,994=>960,995=>673,996=>581,997=>429,
-998=>560,999=>407,1000=>450,1001=>321,1002=>842,1003=>593,1004=>564,1005=>413,1006=>618,1007=>438,
-1008=>534,1009=>534,1010=>485,1011=>278,1012=>726,1013=>361,1014=>361,1015=>576,1016=>542,1017=>667,
-1018=>889,1019=>709,1020=>534,1021=>667,1022=>1000,1023=>1000,1024=>615,1025=>613,1026=>748,1027=>570,
-1028=>659,1029=>487,1030=>329,1031=>329,1032=>381,1033=>943,1034=>985,1035=>827,1036=>669,1037=>723,
-1038=>709,1039=>723,1040=>711,1041=>576,1042=>626,1043=>570,1044=>639,1045=>613,1046=>937,1047=>580,
-1048=>723,1049=>723,1050=>669,1051=>684,1052=>891,1053=>723,1054=>722,1055=>723,1056=>576,1057=>659,
-1058=>608,1059=>709,1060=>750,1061=>714,1062=>728,1063=>682,1064=>984,1065=>988,1066=>725,1067=>863,
-1068=>576,1069=>659,1070=>966,1071=>648,1072=>434,1073=>495,1074=>468,1075=>386,1076=>488,1077=>436,
-1078=>662,1079=>404,1080=>524,1081=>524,1082=>498,1083=>490,1084=>632,1085=>524,1086=>491,1087=>524,
-1088=>500,1089=>422,1090=>422,1091=>471,1092=>694,1093=>482,1094=>522,1095=>506,1096=>756,1097=>754,
-1098=>503,1099=>626,1100=>431,1101=>430,1102=>664,1103=>492,1104=>434,1105=>434,1106=>479,1107=>386,
-1108=>430,1109=>347,1110=>269,1111=>278,1112=>278,1113=>677,1114=>711,1115=>514,1116=>498,1117=>524,
-1118=>471,1119=>524,1120=>978,1121=>664,1122=>718,1123=>506,1124=>939,1125=>647,1126=>912,1127=>643,
-1128=>1248,1129=>894,1130=>948,1131=>662,1132=>1299,1133=>911,1134=>516,1135=>391,1136=>870,1137=>694,
-1138=>726,1139=>491,1140=>780,1141=>550,1142=>780,1143=>550,1144=>1207,1145=>946,1146=>877,1147=>611,
-1148=>978,1149=>664,1150=>978,1151=>664,1152=>594,1153=>428,1154=>232,1155=>0,1156=>0,1157=>0,
-1158=>0,1159=>0,1160=>0,1161=>0,1162=>715,1163=>522,1164=>562,1165=>430,1166=>556,1167=>511,
-1168=>564,1169=>398,1170=>586,1171=>402,1172=>573,1173=>463,1174=>1001,1175=>688,1176=>580,1177=>414,
-1178=>698,1179=>517,1180=>734,1181=>537,1182=>671,1183=>498,1184=>842,1185=>573,1186=>732,1187=>524,
-1188=>926,1189=>652,1190=>1014,1191=>721,1192=>671,1193=>531,1194=>667,1195=>437,1196=>611,1197=>454,
-1198=>722,1199=>563,1200=>722,1201=>562,1202=>783,1203=>517,1204=>967,1205=>693,1206=>691,1207=>510,
-1208=>718,1209=>538,1210=>674,1211=>508,1212=>866,1213=>566,1214=>866,1215=>566,1216=>333,1217=>937,
-1218=>662,1219=>626,1220=>446,1221=>702,1222=>489,1223=>722,1224=>497,1225=>823,1226=>545,1227=>674,
-1228=>504,1229=>889,1230=>630,1231=>333,1232=>711,1233=>434,1234=>711,1235=>434,1236=>889,1237=>644,
-1238=>613,1239=>449,1240=>722,1241=>449,1242=>722,1243=>449,1244=>937,1245=>662,1246=>580,1247=>404,
-1248=>530,1249=>366,1250=>723,1251=>524,1252=>723,1253=>524,1254=>722,1255=>491,1256=>722,1257=>491,
-1258=>722,1259=>491,1260=>659,1261=>430,1262=>709,1263=>471,1264=>709,1265=>471,1266=>709,1267=>471,
-1268=>682,1269=>506,1270=>564,1271=>388,1272=>863,1273=>626,1274=>556,1275=>388,1276=>720,1277=>445,
-1278=>722,1279=>495,1280=>556,1281=>504,1282=>900,1283=>634,1284=>553,1285=>471,1286=>803,1287=>518,
-1288=>964,1289=>637,1290=>968,1291=>682,1292=>722,1293=>433,1294=>710,1295=>504,1296=>532,1297=>409,
-1298=>702,1299=>489,1300=>960,1301=>644,1302=>823,1303=>702,1304=>961,1305=>766,1306=>722,1307=>504,
-1308=>944,1309=>693,1310=>690,1311=>502,1312=>994,1313=>695,1314=>1011,1315=>727,1425=>0,1426=>0,
-1427=>0,1428=>0,1429=>0,1430=>0,1431=>418,1432=>0,1433=>0,1434=>0,1435=>0,1436=>0,
-1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,1442=>0,1443=>0,1444=>0,1445=>0,1446=>0,
-1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,1452=>0,1453=>0,1454=>0,1455=>0,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>440,1471=>0,1472=>126,1473=>0,1474=>0,1475=>418,1476=>0,
-1477=>0,1478=>350,1479=>0,1488=>537,1489=>537,1490=>350,1491=>537,1492=>537,1493=>350,1494=>350,
-1495=>537,1496=>537,1497=>350,1498=>537,1499=>537,1500=>537,1501=>537,1502=>537,1503=>350,1504=>350,
-1505=>537,1506=>537,1507=>537,1508=>537,1509=>537,1510=>537,1511=>537,1512=>537,1513=>537,1514=>537,
-1520=>537,1521=>537,1522=>537,1523=>396,1524=>396,1548=>226,1563=>250,1567=>473,1569=>350,1570=>321,
-1571=>249,1572=>399,1573=>249,1574=>776,1575=>249,1576=>950,1577=>424,1578=>925,1579=>924,1580=>738,
-1581=>748,1582=>701,1583=>397,1584=>399,1585=>328,1586=>331,1587=>951,1588=>949,1589=>949,1590=>949,
-1591=>557,1592=>550,1593=>625,1594=>602,1601=>801,1602=>696,1603=>757,1604=>655,1605=>549,1606=>651,
-1607=>424,1608=>399,1609=>776,1610=>776,1611=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,
-1618=>0,1619=>0,1620=>0,1621=>0,1632=>297,1633=>254,1634=>427,1635=>497,1636=>440,1637=>465,
-1638=>466,1639=>421,1640=>459,1641=>424,1643=>212,1652=>300,1662=>926,1670=>750,1688=>338,1711=>874,
-1740=>776,1748=>176,1920=>450,1921=>501,1922=>582,1923=>544,1924=>482,1925=>433,1926=>448,1927=>462,
-1928=>474,1929=>471,1930=>469,1931=>537,1932=>499,1933=>514,1934=>471,1935=>572,1936=>880,1937=>440,
-1938=>476,1939=>594,1940=>469,1941=>448,1942=>441,1943=>519,1944=>573,1945=>459,1946=>447,1947=>496,
-1948=>541,1949=>887,1950=>883,1951=>964,1952=>558,1953=>505,1954=>471,1955=>554,1956=>459,1957=>486,
-1958=>36,1959=>36,1960=>43,1961=>45,1962=>43,1963=>45,1964=>45,1965=>45,1966=>45,1967=>45,
-1968=>0,2305=>415,2306=>398,2307=>398,2309=>862,2310=>1042,2311=>553,2312=>553,2313=>597,2314=>848,
-2315=>967,2316=>828,2317=>654,2319=>654,2321=>1042,2323=>1042,2324=>1042,2325=>743,2326=>798,2327=>694,
-2328=>694,2329=>730,2330=>734,2331=>888,2332=>814,2333=>834,2334=>734,2335=>629,2336=>629,2337=>653,
-2338=>609,2339=>694,2340=>654,2341=>694,2342=>588,2343=>694,2344=>654,2345=>654,2346=>615,2347=>788,
-2348=>621,2349=>694,2350=>694,2351=>694,2352=>575,2353=>575,2354=>787,2355=>848,2356=>848,2357=>621,
-2359=>615,2360=>734,2361=>609,2364=>398,2365=>569,2366=>341,2367=>341,2368=>341,2369=>0,2370=>0,
-2371=>0,2372=>0,2373=>415,2375=>615,2376=>615,2377=>341,2379=>341,2380=>341,2381=>0,2384=>1047,
-2392=>743,2393=>798,2394=>694,2395=>814,2396=>653,2397=>609,2398=>788,2400=>967,2401=>828,2402=>0,
-2403=>0,2404=>398,2405=>478,2406=>455,2407=>420,2408=>569,2409=>509,2410=>702,2411=>629,2412=>569,
-2413=>702,2414=>609,2415=>609,2416=>626,2433=>0,2434=>300,2435=>312,2437=>594,2438=>776,2439=>469,
-2440=>513,2441=>535,2442=>561,2443=>604,2444=>481,2447=>580,2448=>604,2451=>540,2452=>620,2453=>570,
-2454=>485,2455=>484,2456=>471,2457=>457,2458=>408,2459=>452,2460=>591,2461=>551,2462=>771,2463=>414,
-2464=>404,2465=>522,2466=>415,2467=>450,2468=>551,2469=>477,2470=>478,2471=>449,2472=>448,2474=>535,
-2475=>611,2476=>443,2477=>534,2478=>492,2479=>474,2480=>442,2482=>542,2486=>507,2487=>467,2488=>523,
-2489=>419,2492=>0,2493=>419,2494=>202,2495=>189,2496=>202,2497=>0,2498=>0,2499=>0,2500=>0,
-2503=>294,2504=>289,2507=>774,2508=>825,2509=>0,2510=>356,2519=>219,2524=>523,2525=>420,2527=>469,
-2528=>604,2529=>481,2530=>0,2531=>0,2534=>500,2535=>437,2536=>479,2537=>507,2538=>497,2539=>500,
-2540=>482,2541=>503,2542=>517,2543=>481,2544=>443,2545=>443,2546=>429,2547=>383,2548=>432,2549=>478,
-2550=>539,2551=>158,2552=>365,2553=>280,2554=>357,2561=>0,2562=>0,2563=>385,2565=>728,2566=>884,
-2567=>656,2568=>656,2569=>580,2570=>580,2575=>482,2576=>728,2579=>580,2580=>728,2581=>534,2582=>518,
-2583=>602,2584=>674,2585=>530,2586=>502,2587=>576,2588=>476,2589=>558,2590=>501,2591=>510,2592=>540,
-2593=>508,2594=>512,2595=>558,2596=>468,2597=>518,2598=>488,2599=>518,2600=>522,2602=>518,2603=>490,
-2604=>546,2605=>500,2606=>530,2607=>654,2608=>522,2610=>710,2611=>710,2613=>498,2614=>530,2616=>530,
-2617=>501,2620=>286,2622=>156,2623=>174,2624=>174,2625=>0,2626=>0,2631=>0,2632=>0,2635=>0,
-2636=>0,2637=>0,2641=>0,2649=>534,2650=>618,2651=>492,2652=>484,2654=>506,2662=>616,2663=>480,
-2664=>560,2665=>480,2666=>468,2667=>492,2668=>514,2669=>538,2670=>572,2671=>560,2672=>0,2673=>0,
-2674=>498,2675=>596,2676=>900,2677=>0,2946=>345,2947=>616,2949=>910,2950=>1072,2951=>848,2952=>591,
-2953=>492,2954=>1123,2958=>602,2959=>602,2960=>691,2962=>753,2963=>753,2964=>1597,2965=>677,2969=>697,
-2970=>607,2972=>691,2974=>871,2975=>589,2979=>1230,2980=>688,2984=>560,2985=>911,2986=>477,2990=>625,
-2991=>672,2992=>452,2993=>553,2994=>651,2995=>804,2996=>645,2997=>740,2999=>865,3000=>870,3001=>1067,
-3006=>452,3007=>176,3008=>293,3009=>404,3010=>601,3014=>690,3015=>503,3016=>839,3018=>1188,3019=>982,
-3020=>1519,3021=>234,3031=>804,3330=>417,3331=>221,3333=>1055,3334=>1195,3335=>792,3336=>1467,3337=>569,
-3338=>1243,3339=>676,3340=>897,3342=>1008,3343=>1004,3344=>1538,3346=>585,3347=>981,3348=>1254,3349=>775,
-3350=>798,3351=>691,3352=>1095,3353=>809,3354=>726,3355=>963,3356=>703,3357=>1244,3358=>1103,3359=>462,
-3360=>531,3361=>983,3362=>1027,3363=>1102,3364=>779,3365=>731,3366=>485,3367=>737,3368=>747,3370=>779,
-3371=>961,3372=>1023,3373=>500,3374=>510,3375=>792,3376=>527,3377=>511,3378=>713,3379=>553,3380=>516,
-3381=>715,3382=>785,3383=>920,3384=>977,3385=>977,3389=>375,3390=>403,3391=>283,3392=>323,3393=>275,
-3394=>258,3395=>378,3396=>378,3398=>542,3399=>478,3400=>1069,3402=>1127,3403=>1038,3404=>676,3405=>89,
-3415=>676,3424=>676,3425=>1006,3430=>559,3431=>659,3432=>674,3433=>933,3434=>671,3435=>699,3436=>703,
-3437=>688,3438=>677,3439=>684,3440=>375,3458=>355,3459=>241,3461=>501,3465=>591,3466=>613,3467=>630,
-3473=>636,3476=>653,3481=>760,3482=>739,3483=>653,3484=>757,3486=>562,3488=>636,3489=>673,3490=>673,
-3492=>984,3493=>984,3495=>636,3496=>653,3497=>653,3498=>653,3499=>1066,3501=>739,3502=>636,3503=>501,
-3504=>653,3505=>739,3507=>501,3508=>673,3509=>636,3510=>653,3511=>739,3512=>636,3513=>653,3514=>673,
-3515=>613,3517=>630,3520=>636,3521=>739,3522=>673,3523=>673,3524=>739,3525=>630,3526=>739,3530=>0,
-3535=>328,3536=>288,3537=>319,3538=>0,3539=>0,3540=>0,3542=>0,3544=>380,3545=>495,3551=>492,
-3585=>532,3586=>472,3587=>534,3588=>532,3589=>544,3590=>583,3591=>417,3592=>488,3593=>604,3594=>472,
-3595=>534,3596=>716,3597=>717,3598=>568,3599=>568,3600=>457,3601=>637,3602=>731,3603=>790,3604=>531,
-3605=>542,3606=>522,3607=>577,3608=>468,3609=>603,3610=>554,3611=>554,3612=>556,3613=>556,3614=>604,
-3615=>604,3616=>568,3617=>542,3618=>496,3619=>442,3620=>530,3621=>512,3622=>568,3623=>478,3624=>543,
-3625=>614,3626=>525,3627=>578,3628=>659,3629=>514,3630=>514,3631=>450,3632=>402,3633=>0,3634=>378,
-3635=>415,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,3647=>620,3648=>286,
-3649=>521,3650=>447,3651=>426,3652=>424,3653=>333,3654=>453,3655=>0,3656=>0,3657=>0,3658=>0,
-3659=>0,3660=>0,3661=>0,3662=>0,3663=>657,3664=>528,3665=>528,3666=>571,3667=>594,3668=>631,
-3669=>632,3670=>478,3671=>713,3672=>597,3673=>565,3674=>615,3675=>1381,4256=>453,4257=>448,4258=>546,
-4259=>619,4260=>478,4261=>481,4262=>459,4263=>707,4264=>467,4265=>471,4266=>842,4267=>464,4268=>443,
-4269=>707,4270=>460,4271=>465,4272=>686,4273=>440,4274=>550,4275=>561,4276=>580,4277=>467,4278=>630,
-4279=>466,4280=>517,4281=>456,4282=>502,4283=>464,4284=>534,4285=>440,4286=>443,4287=>522,4288=>460,
-4289=>463,4290=>536,4291=>455,4292=>468,4293=>449,4304=>454,4305=>452,4306=>544,4307=>629,4308=>451,
-4309=>452,4310=>452,4311=>702,4312=>451,4313=>452,4314=>820,4315=>451,4316=>453,4317=>695,4318=>449,
-4319=>448,4320=>694,4321=>501,4322=>544,4323=>517,4324=>560,4325=>450,4326=>627,4327=>452,4328=>491,
-4329=>452,4330=>485,4331=>452,4332=>485,4333=>443,4334=>500,4335=>582,4336=>455,4337=>451,4338=>480,
-4339=>414,4340=>453,4341=>418,4345=>528,4347=>410,4608=>583,4609=>770,4610=>560,4611=>525,4612=>525,
-4613=>583,4614=>758,4616=>598,4617=>787,4618=>817,4619=>583,4620=>758,4621=>612,4622=>875,4623=>817,
-4624=>817,4625=>1050,4626=>1050,4627=>817,4628=>1050,4629=>817,4630=>787,4631=>1021,4632=>933,4633=>1137,
-4634=>1067,4635=>980,4636=>1065,4637=>962,4638=>962,4639=>1097,4640=>831,4641=>1021,4642=>851,4643=>735,
-4644=>875,4645=>968,4646=>817,4647=>881,4648=>583,4649=>642,4650=>583,4651=>758,4652=>700,4653=>583,
-4654=>700,4655=>758,4656=>583,4657=>787,4658=>787,4659=>583,4660=>729,4661=>583,4662=>583,4663=>817,
-4664=>642,4665=>817,4666=>846,4667=>642,4668=>758,4669=>744,4670=>642,4671=>817,4672=>700,4673=>700,
-4674=>700,4675=>758,4676=>700,4677=>700,4678=>729,4680=>846,4682=>1079,4683=>700,4684=>700,4685=>1021,
-4688=>700,4689=>700,4690=>700,4691=>758,4692=>700,4693=>758,4694=>729,4696=>846,4698=>1079,4699=>700,
-4700=>700,4701=>1021,4704=>525,4705=>758,4706=>758,4707=>525,4708=>700,4709=>773,4710=>525,4711=>787,
-4712=>525,4713=>758,4714=>758,4715=>525,4716=>700,4717=>773,4718=>525,4719=>525,4720=>729,4721=>729,
-4722=>729,4723=>802,4724=>729,4725=>729,4726=>758,4727=>729,4728=>758,4729=>758,4730=>758,4731=>817,
-4732=>758,4733=>817,4734=>758,4735=>758,4736=>612,4737=>817,4738=>817,4739=>612,4740=>787,4741=>583,
-4742=>875,4744=>962,4746=>992,4747=>700,4748=>758,4749=>904,4752=>408,4753=>583,4754=>525,4755=>554,
-4756=>481,4757=>554,4758=>642,4759=>671,4760=>700,4761=>758,4762=>729,4763=>700,4764=>671,4765=>700,
-4766=>758,4767=>700,4768=>583,4769=>735,4770=>822,4771=>583,4772=>793,4773=>583,4774=>583,4775=>694,
-4776=>554,4777=>729,4778=>773,4779=>554,4780=>700,4781=>554,4782=>554,4784=>992,4786=>1021,4787=>671,
-4788=>787,4789=>904,4792=>729,4793=>904,4794=>948,4795=>729,4796=>875,4797=>729,4798=>729,4800=>1137,
-4802=>1167,4803=>758,4804=>875,4805=>1108,4808=>758,4809=>875,4810=>700,4811=>700,4812=>700,4813=>992,
-4814=>758,4816=>554,4817=>787,4818=>758,4819=>583,4820=>758,4821=>496,4822=>612,4824=>525,4825=>700,
-4826=>700,4827=>525,4828=>685,4829=>729,4830=>510,4831=>729,4832=>962,4833=>962,4834=>962,4835=>962,
-4836=>962,4837=>1021,4838=>962,4839=>962,4840=>467,4841=>525,4842=>671,4843=>612,4844=>612,4845=>671,
-4846=>671,4848=>612,4849=>875,4850=>817,4851=>642,4852=>729,4853=>729,4854=>758,4855=>817,4856=>700,
-4857=>758,4858=>715,4859=>700,4860=>700,4861=>787,4862=>758,4863=>700,4864=>700,4865=>758,4866=>715,
-4867=>700,4868=>700,4869=>787,4870=>758,4871=>700,4872=>467,4873=>671,4874=>671,4875=>612,4876=>612,
-4877=>583,4878=>525,4880=>846,4882=>904,4883=>554,4884=>700,4885=>817,4888=>525,4889=>729,4890=>729,
-4891=>612,4892=>671,4893=>583,4894=>525,4896=>817,4897=>1021,4898=>1021,4899=>817,4900=>992,4901=>758,
-4902=>817,4903=>1021,4904=>1079,4905=>1137,4906=>1137,4907=>1050,4908=>1312,4909=>1050,4910=>1050,4911=>1123,
-4912=>647,4913=>793,4914=>822,4915=>647,4916=>793,4917=>764,4918=>583,4919=>647,4920=>583,4921=>793,
-4922=>822,4923=>583,4924=>793,4925=>764,4926=>583,4927=>793,4928=>540,4929=>758,4930=>583,4931=>467,
-4932=>583,4933=>481,4934=>612,4936=>758,4937=>700,4938=>758,4939=>700,4940=>831,4941=>671,4942=>758,
-4943=>700,4944=>758,4945=>758,4946=>758,4947=>817,4948=>758,4949=>758,4950=>817,4951=>758,4952=>642,
-4953=>980,4954=>758,4961=>233,4962=>583,4963=>408,4964=>408,4965=>525,4966=>525,4967=>233,4968=>700,
-4969=>671,4970=>612,4971=>642,4972=>642,4973=>642,4974=>583,4975=>700,4976=>758,4977=>642,4978=>583,
-4979=>700,4980=>729,4981=>720,4982=>583,4983=>758,4984=>700,4985=>904,4986=>612,4987=>583,4988=>875,
-5024=>711,5025=>678,5026=>604,5027=>667,5028=>796,5029=>301,5030=>516,5031=>544,5032=>457,5033=>716,
-5034=>703,5035=>383,5036=>628,5037=>709,5038=>455,5039=>601,5040=>472,5041=>574,5042=>730,5043=>939,
-5044=>498,5045=>528,5046=>667,5047=>891,5048=>505,5049=>792,5050=>957,5051=>725,5052=>595,5053=>733,
-5054=>698,5055=>638,5056=>720,5057=>732,5058=>624,5059=>638,5060=>565,5061=>903,5062=>655,5063=>681,
-5064=>675,5065=>949,5066=>683,5067=>547,5068=>693,5069=>732,5070=>529,5071=>569,5072=>536,5073=>677,
-5074=>631,5075=>382,5076=>973,5077=>543,5078=>607,5079=>652,5080=>652,5081=>693,5082=>514,5083=>803,
-5084=>658,5085=>597,5086=>627,5087=>659,5088=>679,5089=>706,5090=>563,5091=>618,5092=>767,5093=>776,
-5094=>731,5095=>492,5096=>808,5097=>823,5098=>796,5099=>689,5100=>716,5101=>518,5102=>521,5103=>719,
-5104=>563,5105=>776,5106=>634,5107=>822,5108=>621,5920=>502,5921=>502,5922=>500,5923=>498,5924=>500,
-5925=>502,5926=>502,5927=>502,5928=>500,5929=>503,5930=>502,5931=>502,5932=>500,5933=>500,5934=>500,
-5935=>796,5936=>500,5937=>502,5938=>0,5939=>0,5940=>0,5941=>230,5942=>397,6480=>537,6481=>537,
-6482=>531,6483=>678,6484=>682,6485=>628,6486=>732,6487=>721,6488=>598,6489=>583,6490=>702,6491=>554,
-6492=>683,6493=>554,6494=>710,6495=>695,6496=>523,6497=>678,6498=>589,6499=>272,6500=>506,6501=>515,
-6502=>515,6503=>210,6504=>210,6505=>515,6506=>515,6507=>515,6508=>229,6509=>705,6512=>649,6513=>538,
-6514=>568,6515=>520,6516=>544,6656=>820,6657=>958,6658=>758,6659=>859,6660=>958,6661=>727,6662=>904,
-6663=>940,6664=>850,6665=>905,6666=>838,6667=>961,6668=>1000,6669=>880,6670=>1189,6671=>1246,6672=>1177,
-6673=>757,6674=>1246,6675=>1192,6676=>709,6677=>1192,6678=>1075,6679=>0,6680=>0,6681=>534,6682=>690,
-6683=>0,6686=>697,6687=>500,7424=>484,7425=>595,7426=>667,7427=>446,7428=>446,7429=>483,7430=>483,
-7431=>409,7432=>426,7433=>278,7434=>260,7435=>483,7436=>409,7437=>595,7438=>483,7439=>483,7440=>426,
-7441=>500,7442=>489,7443=>668,7444=>722,7445=>378,7448=>372,7449=>446,7450=>446,7451=>409,7452=>483,
-7453=>488,7454=>660,7455=>500,7456=>483,7457=>632,7458=>409,7459=>355,7462=>392,7463=>483,7464=>483,
-7465=>372,7466=>541,7467=>470,7468=>484,7469=>595,7470=>446,7471=>446,7472=>483,7473=>409,7474=>409,
-7475=>483,7476=>483,7477=>223,7478=>260,7479=>483,7480=>409,7481=>595,7482=>483,7483=>483,7484=>483,
-7485=>378,7486=>372,7487=>446,7488=>409,7489=>483,7490=>632,7491=>297,7492=>297,7493=>335,7494=>446,
-7495=>335,7496=>335,7497=>297,7498=>297,7499=>285,7500=>285,7501=>335,7502=>186,7503=>335,7504=>521,
-7505=>335,7506=>335,7507=>297,7510=>335,7511=>186,7512=>335,7513=>326,7514=>521,7515=>335,7517=>353,
-7518=>321,7519=>357,7520=>430,7521=>321,7522=>186,7523=>223,7524=>335,7525=>335,7526=>353,7527=>321,
-7528=>353,7529=>430,7530=>321,7531=>754,7532=>500,7533=>500,7534=>333,7535=>778,7536=>500,7537=>500,
-7538=>333,7539=>333,7540=>389,7541=>278,7542=>444,7543=>500,7544=>483,7546=>774,7547=>217,7548=>278,
-7549=>500,7550=>483,7551=>514,7552=>500,7553=>500,7554=>333,7555=>676,7556=>525,7557=>278,7558=>802,
-7559=>507,7560=>500,7561=>333,7562=>389,7563=>384,7564=>500,7565=>500,7566=>444,7680=>722,7681=>444,
-7682=>667,7683=>500,7684=>667,7685=>500,7686=>667,7687=>500,7688=>667,7689=>444,7690=>722,7691=>500,
-7692=>722,7693=>500,7694=>722,7695=>500,7696=>720,7697=>500,7698=>722,7699=>500,7700=>611,7701=>444,
-7702=>611,7703=>444,7704=>611,7705=>444,7706=>611,7707=>444,7708=>611,7709=>444,7710=>556,7711=>333,
-7712=>722,7713=>500,7714=>722,7715=>500,7716=>722,7717=>500,7718=>722,7719=>500,7720=>722,7721=>500,
-7722=>722,7723=>500,7724=>333,7725=>278,7726=>333,7727=>278,7728=>722,7729=>500,7730=>722,7731=>500,
-7732=>722,7733=>500,7734=>611,7735=>278,7736=>611,7737=>278,7738=>611,7739=>278,7740=>611,7741=>278,
-7742=>889,7743=>778,7744=>889,7745=>778,7746=>889,7747=>778,7748=>722,7749=>500,7750=>722,7751=>500,
-7752=>722,7753=>500,7754=>722,7755=>500,7756=>722,7757=>500,7758=>722,7759=>500,7760=>722,7761=>500,
-7762=>722,7763=>500,7764=>556,7765=>500,7766=>556,7767=>500,7768=>667,7769=>333,7770=>667,7771=>333,
-7772=>667,7773=>333,7774=>667,7775=>333,7776=>556,7777=>389,7778=>556,7779=>389,7780=>556,7781=>389,
-7782=>556,7783=>389,7784=>556,7785=>389,7786=>611,7787=>278,7788=>611,7789=>278,7790=>611,7791=>278,
-7792=>611,7793=>278,7794=>722,7795=>500,7796=>722,7797=>500,7798=>722,7799=>500,7800=>722,7801=>500,
-7802=>722,7803=>500,7804=>722,7805=>500,7806=>722,7807=>500,7808=>944,7809=>722,7810=>944,7811=>722,
-7812=>944,7813=>722,7814=>944,7815=>722,7816=>944,7817=>722,7818=>722,7819=>500,7820=>722,7821=>500,
-7822=>722,7823=>500,7824=>611,7825=>444,7826=>611,7827=>444,7828=>611,7829=>444,7830=>500,7831=>278,
-7832=>722,7833=>500,7834=>444,7835=>333,7840=>722,7841=>444,7842=>807,7843=>529,7844=>722,7845=>444,
-7846=>722,7847=>444,7848=>722,7849=>454,7850=>722,7851=>444,7852=>722,7853=>444,7854=>722,7855=>444,
-7856=>722,7857=>444,7858=>722,7859=>454,7860=>722,7861=>444,7862=>722,7863=>444,7864=>611,7865=>444,
-7866=>611,7867=>444,7868=>611,7869=>444,7870=>611,7871=>444,7872=>611,7873=>444,7874=>613,7875=>444,
-7876=>611,7877=>444,7878=>611,7879=>444,7880=>333,7881=>278,7882=>333,7883=>278,7884=>722,7885=>500,
-7886=>722,7887=>500,7888=>722,7889=>500,7890=>722,7891=>500,7892=>722,7893=>500,7894=>722,7895=>500,
-7896=>722,7897=>500,7898=>722,7899=>516,7900=>722,7901=>516,7902=>720,7903=>516,7904=>722,7905=>516,
-7906=>722,7907=>516,7908=>722,7909=>500,7910=>717,7911=>500,7912=>800,7913=>518,7914=>800,7915=>518,
-7916=>800,7917=>518,7918=>800,7919=>518,7920=>800,7921=>518,7922=>722,7923=>500,7924=>722,7925=>500,
-7926=>722,7927=>501,7928=>722,7929=>500,7936=>583,7937=>583,7938=>583,7939=>583,7940=>583,7941=>583,
-7942=>583,7943=>583,7944=>722,7945=>722,7946=>813,7947=>817,7948=>763,7949=>765,7950=>720,7951=>722,
-7952=>426,7953=>426,7954=>426,7955=>426,7956=>426,7957=>426,7960=>770,7961=>770,7962=>902,7963=>919,
-7964=>940,7965=>936,7968=>536,7969=>536,7970=>536,7971=>536,7972=>536,7973=>536,7974=>536,7975=>536,
-7976=>847,7977=>859,7978=>986,7979=>1010,7980=>1026,7981=>1029,7982=>918,7983=>921,7984=>286,7985=>286,
-7986=>302,7987=>320,7988=>300,7989=>306,7990=>312,7991=>303,7992=>475,7993=>507,7994=>617,7995=>654,
-7996=>655,7997=>660,7998=>551,7999=>566,8000=>500,8001=>500,8002=>500,8003=>500,8004=>500,8005=>500,
-8008=>816,8009=>825,8010=>969,8011=>995,8012=>938,8013=>955,8016=>514,8017=>514,8018=>514,8019=>514,
-8020=>514,8021=>514,8022=>514,8023=>514,8025=>818,8027=>988,8029=>989,8031=>893,8032=>693,8033=>693,
-8034=>693,8035=>693,8036=>693,8037=>693,8038=>693,8039=>693,8040=>836,8041=>843,8042=>1006,8043=>1024,
-8044=>974,8045=>986,8046=>905,8047=>896,8048=>583,8049=>583,8050=>426,8051=>426,8052=>536,8053=>536,
-8054=>286,8055=>286,8056=>500,8057=>500,8058=>514,8059=>514,8060=>693,8061=>693,8064=>583,8065=>583,
-8066=>583,8067=>583,8068=>583,8069=>583,8070=>583,8071=>583,8072=>888,8073=>889,8074=>984,8075=>991,
-8076=>943,8077=>948,8078=>884,8079=>886,8080=>536,8081=>536,8082=>536,8083=>536,8084=>536,8085=>536,
-8086=>536,8087=>536,8088=>1017,8089=>1026,8090=>1153,8091=>1179,8092=>1195,8093=>1199,8094=>1088,8095=>1088,
-8096=>693,8097=>693,8098=>693,8099=>693,8100=>693,8101=>693,8102=>693,8103=>693,8104=>1034,8105=>1040,
-8106=>1210,8107=>1229,8108=>1176,8109=>1186,8110=>1098,8111=>1090,8112=>583,8113=>583,8114=>583,8115=>583,
-8116=>583,8118=>583,8119=>583,8120=>722,8121=>722,8122=>722,8123=>722,8124=>889,8125=>250,8126=>332,
-8127=>500,8128=>500,8129=>534,8130=>536,8131=>536,8132=>536,8134=>536,8135=>536,8136=>761,8137=>800,
-8138=>829,8139=>893,8140=>883,8141=>500,8142=>500,8143=>500,8144=>286,8145=>286,8146=>286,8147=>286,
-8150=>286,8151=>286,8152=>333,8153=>333,8154=>447,8155=>537,8157=>500,8158=>500,8159=>500,8160=>514,
-8161=>514,8162=>514,8163=>514,8164=>528,8165=>528,8166=>514,8167=>514,8168=>696,8169=>696,8170=>816,
-8171=>828,8172=>721,8173=>333,8174=>333,8175=>500,8178=>693,8179=>693,8180=>693,8182=>693,8183=>693,
-8184=>832,8185=>899,8186=>847,8187=>852,8188=>928,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,
-8195=>1000,8196=>333,8197=>250,8198=>167,8199=>500,8200=>250,8201=>200,8202=>100,8203=>0,8204=>0,
-8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>500,8213=>1000,8214=>293,8215=>478,8219=>250,
-8223=>444,8227=>350,8228=>620,8229=>620,8231=>250,8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,
-8237=>0,8238=>0,8239=>250,8241=>1363,8242=>247,8243=>411,8244=>611,8245=>220,8246=>440,8247=>660,
-8248=>469,8251=>629,8252=>666,8253=>444,8254=>500,8255=>953,8256=>953,8257=>314,8258=>931,8259=>333,
-8260=>167,8261=>383,8262=>383,8263=>888,8264=>777,8265=>777,8266=>500,8267=>453,8268=>453,8269=>450,
-8270=>500,8271=>278,8272=>882,8273=>500,8274=>497,8275=>500,8276=>953,8277=>512,8278=>410,8279=>855,
-8280=>620,8281=>620,8282=>179,8283=>621,8284=>564,8285=>179,8286=>179,8287=>111,8288=>0,8289=>0,
-8290=>0,8291=>0,8292=>0,8304=>320,8305=>300,8308=>320,8309=>320,8310=>320,8311=>320,8312=>320,
-8313=>320,8314=>300,8315=>300,8316=>300,8317=>216,8318=>216,8319=>300,8320=>320,8321=>320,8322=>320,
-8323=>320,8324=>320,8325=>320,8326=>320,8327=>320,8328=>320,8329=>320,8330=>300,8331=>300,8332=>300,
-8333=>216,8334=>216,8336=>320,8337=>320,8338=>320,8339=>320,8340=>320,8352=>698,8353=>667,8354=>667,
-8355=>556,8356=>500,8357=>778,8358=>722,8359=>940,8360=>1026,8361=>813,8362=>869,8363=>512,8365=>722,
-8366=>611,8367=>1340,8368=>489,8369=>601,8370=>619,8371=>722,8372=>556,8373=>611,8400=>0,8401=>0,
-8402=>0,8403=>0,8404=>0,8405=>0,8406=>0,8407=>0,8408=>0,8409=>0,8410=>0,8411=>0,
-8412=>0,8413=>0,8414=>0,8415=>0,8416=>0,8417=>0,8418=>0,8419=>0,8420=>0,8421=>0,
-8422=>0,8423=>0,8424=>0,8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,
-8432=>0,8448=>751,8449=>723,8450=>674,8451=>954,8452=>556,8453=>781,8454=>806,8455=>518,8456=>667,
-8457=>822,8458=>490,8459=>824,8460=>663,8461=>818,8462=>500,8463=>500,8464=>578,8465=>613,8466=>715,
-8467=>417,8468=>778,8469=>751,8470=>880,8471=>760,8472=>832,8473=>589,8474=>729,8475=>892,8476=>711,
-8477=>755,8478=>667,8479=>667,8480=>879,8481=>1156,8483=>722,8484=>659,8485=>389,8486=>743,8487=>757,
-8488=>663,8489=>286,8490=>722,8491=>722,8492=>846,8493=>613,8494=>533,8495=>363,8496=>587,8497=>690,
-8498=>556,8499=>1021,8500=>387,8501=>537,8502=>537,8503=>350,8504=>537,8505=>417,8506=>906,8507=>1155,
-8513=>663,8514=>485,8515=>485,8516=>637,8522=>516,8523=>778,8525=>899,8526=>500,8531=>750,8532=>750,
-8533=>750,8534=>750,8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,8541=>750,8542=>750,
-8543=>750,8544=>333,8545=>630,8546=>927,8547=>1019,8548=>722,8549=>1019,8550=>1316,8551=>1629,8552=>1019,
-8553=>722,8554=>1019,8555=>1316,8556=>611,8557=>667,8558=>722,8559=>889,8560=>278,8561=>556,8562=>834,
-8563=>778,8564=>500,8565=>778,8566=>1056,8567=>1334,8568=>778,8569=>500,8570=>778,8571=>1056,8572=>278,
-8573=>444,8574=>500,8575=>778,8592=>964,8593=>472,8594=>964,8595=>500,8596=>964,8597=>499,8598=>964,
-8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8604=>1009,8605=>1009,8606=>964,8607=>500,8608=>964,
-8609=>499,8610=>1093,8611=>1093,8612=>1093,8613=>500,8614=>1093,8615=>500,8616=>500,8617=>964,8618=>964,
-8619=>964,8620=>964,8621=>1151,8622=>964,8624=>482,8625=>482,8626=>482,8627=>482,8628=>658,8629=>658,
-8630=>1069,8631=>1069,8634=>939,8635=>939,8636=>964,8637=>964,8638=>499,8639=>499,8640=>964,8641=>964,
-8642=>499,8643=>499,8644=>964,8645=>840,8646=>964,8647=>964,8648=>840,8649=>964,8650=>840,8651=>964,
-8652=>964,8653=>964,8654=>964,8655=>964,8656=>964,8657=>550,8658=>964,8659=>550,8660=>964,8661=>550,
-8662=>1047,8663=>1047,8664=>1047,8665=>1047,8666=>964,8667=>964,8668=>1092,8669=>1092,8672=>964,8674=>964,
-8704=>587,8705=>716,8706=>494,8707=>587,8708=>587,8709=>746,8710=>612,8711=>612,8712=>536,8713=>536,
-8714=>439,8715=>536,8716=>536,8717=>439,8718=>506,8719=>823,8720=>823,8721=>713,8722=>564,8723=>564,
-8724=>564,8725=>636,8726=>636,8727=>471,8728=>497,8729=>497,8730=>549,8731=>549,8732=>549,8733=>636,
-8734=>853,8735=>509,8736=>575,8737=>559,8738=>509,8739=>200,8740=>250,8741=>320,8742=>320,8743=>564,
-8744=>564,8745=>654,8746=>654,8747=>416,8748=>750,8749=>1083,8750=>722,8751=>750,8752=>1083,8753=>697,
-8754=>722,8755=>722,8756=>565,8757=>568,8758=>250,8759=>629,8760=>564,8761=>758,8762=>564,8763=>636,
-8764=>636,8765=>636,8766=>503,8767=>614,8768=>636,8769=>636,8770=>636,8771=>636,8772=>636,8773=>636,
-8774=>636,8775=>636,8776=>636,8777=>636,8778=>636,8779=>636,8780=>636,8781=>636,8782=>636,8783=>636,
-8784=>564,8785=>564,8786=>564,8787=>564,8788=>735,8789=>755,8790=>564,8791=>564,8792=>564,8793=>564,
-8794=>564,8795=>564,8796=>600,8797=>564,8798=>564,8799=>564,8800=>564,8801=>636,8802=>636,8803=>636,
-8804=>636,8805=>636,8806=>636,8807=>636,8808=>636,8809=>636,8810=>900,8811=>899,8812=>410,8813=>636,
-8814=>636,8815=>636,8816=>636,8817=>636,8818=>636,8819=>636,8820=>636,8821=>636,8822=>636,8823=>636,
-8824=>636,8825=>636,8826=>636,8827=>636,8828=>636,8829=>636,8830=>636,8831=>636,8832=>636,8833=>636,
-8834=>636,8835=>636,8836=>636,8837=>636,8838=>636,8839=>636,8840=>636,8841=>636,8842=>636,8843=>636,
-8844=>654,8845=>654,8846=>654,8847=>636,8848=>636,8849=>636,8850=>636,8851=>636,8852=>636,8853=>636,
-8854=>636,8855=>636,8856=>636,8857=>636,8858=>636,8859=>636,8860=>636,8861=>636,8862=>636,8863=>636,
-8864=>636,8865=>636,8866=>600,8867=>600,8868=>712,8869=>712,8870=>466,8871=>466,8872=>595,8873=>588,
-8874=>710,8875=>706,8876=>595,8877=>596,8878=>588,8879=>706,8880=>636,8881=>636,8882=>636,8883=>636,
-8884=>636,8885=>636,8886=>1296,8887=>1296,8888=>966,8889=>564,8890=>626,8891=>564,8892=>564,8893=>566,
-8894=>570,8895=>582,8896=>744,8897=>744,8898=>764,8899=>764,8900=>512,8901=>250,8902=>471,8903=>629,
-8904=>636,8905=>636,8906=>636,8907=>816,8908=>816,8909=>636,8910=>636,8911=>636,8912=>636,8913=>636,
-8914=>654,8915=>654,8916=>654,8917=>636,8918=>564,8919=>564,8920=>1215,8921=>1215,8922=>636,8923=>636,
-8924=>636,8925=>636,8926=>636,8927=>636,8928=>636,8929=>636,8930=>636,8931=>636,8932=>636,8933=>636,
-8934=>636,8935=>636,8936=>636,8937=>636,8938=>636,8939=>636,8940=>636,8941=>636,8942=>250,8943=>1000,
-8944=>1000,8945=>1000,8946=>601,8947=>536,8948=>464,8949=>536,8950=>536,8951=>464,8952=>536,8953=>536,
-8954=>601,8955=>536,8956=>464,8957=>536,8958=>464,8959=>600,8960=>780,8961=>442,8962=>794,8968=>474,
-8969=>474,8970=>474,8971=>474,8976=>564,8977=>503,8978=>791,8979=>791,8980=>593,8981=>560,8982=>563,
-8983=>563,8984=>800,8985=>564,8986=>805,8988=>474,8989=>474,8990=>474,8991=>474,8992=>686,8993=>686,
-8994=>658,8995=>658,8996=>800,9000=>800,9001=>329,9002=>329,9031=>777,9032=>777,9040=>777,9047=>777,
-9054=>777,9088=>800,9089=>800,9090=>800,9091=>800,9094=>800,9095=>800,9096=>800,9097=>800,9098=>800,
-9100=>800,9103=>788,9104=>788,9105=>788,9106=>788,9108=>800,9109=>800,9110=>800,9111=>800,9112=>800,
-9113=>800,9114=>800,9115=>384,9116=>384,9117=>384,9118=>384,9119=>384,9120=>384,9121=>388,9122=>388,
-9123=>388,9124=>388,9125=>388,9126=>388,9127=>494,9128=>494,9129=>494,9130=>494,9131=>494,9132=>494,
-9133=>494,9134=>686,9138=>1287,9139=>1287,9140=>860,9141=>861,9166=>800,9167=>800,9180=>896,9181=>896,
-9182=>903,9183=>904,9184=>910,9185=>910,9186=>761,9187=>910,9189=>942,9190=>817,9251=>500,9312=>788,
-9313=>788,9314=>788,9315=>788,9316=>788,9317=>788,9318=>788,9319=>788,9320=>788,9321=>788,9472=>889,
-9473=>889,9474=>889,9475=>889,9484=>889,9485=>889,9486=>889,9487=>889,9488=>889,9489=>889,9490=>889,
-9491=>889,9492=>889,9493=>889,9494=>889,9495=>889,9496=>889,9497=>889,9498=>889,9499=>889,9500=>889,
-9501=>889,9502=>889,9503=>889,9504=>889,9505=>889,9506=>889,9507=>889,9508=>889,9509=>889,9510=>889,
-9511=>889,9512=>889,9513=>889,9514=>889,9515=>889,9516=>889,9517=>889,9518=>889,9519=>889,9520=>889,
-9521=>889,9522=>889,9523=>889,9524=>889,9525=>889,9526=>889,9527=>889,9528=>889,9529=>889,9530=>889,
-9531=>889,9532=>889,9533=>889,9534=>889,9535=>889,9536=>889,9537=>889,9538=>889,9539=>889,9540=>889,
-9541=>889,9542=>889,9543=>889,9544=>889,9545=>889,9546=>889,9547=>889,9552=>889,9553=>889,9554=>889,
-9555=>889,9556=>889,9557=>889,9558=>889,9559=>889,9560=>889,9561=>889,9562=>889,9563=>889,9564=>889,
-9565=>889,9566=>889,9567=>889,9568=>889,9569=>889,9570=>889,9571=>889,9572=>889,9573=>889,9574=>889,
-9575=>889,9576=>889,9577=>889,9578=>889,9579=>889,9580=>889,9581=>889,9582=>889,9583=>889,9584=>889,
-9585=>889,9586=>889,9587=>889,9588=>889,9589=>889,9590=>889,9591=>889,9592=>889,9593=>889,9594=>889,
-9595=>889,9596=>600,9597=>889,9598=>600,9599=>889,9600=>761,9601=>761,9602=>761,9603=>761,9604=>761,
-9605=>761,9606=>761,9607=>761,9608=>761,9609=>761,9610=>761,9611=>761,9612=>761,9613=>761,9614=>761,
-9615=>761,9616=>761,9617=>1000,9619=>1000,9620=>761,9621=>761,9622=>761,9623=>761,9624=>761,9625=>761,
-9626=>761,9627=>761,9628=>761,9629=>761,9630=>761,9631=>761,9632=>761,9633=>761,9634=>761,9635=>761,
-9636=>761,9637=>761,9638=>761,9639=>761,9640=>761,9641=>761,9642=>532,9643=>532,9644=>761,9645=>761,
-9646=>761,9647=>761,9648=>761,9649=>761,9650=>892,9651=>892,9652=>446,9653=>446,9654=>892,9655=>892,
-9656=>446,9657=>446,9658=>892,9659=>892,9660=>892,9661=>892,9662=>446,9663=>446,9664=>892,9665=>892,
-9666=>446,9667=>446,9668=>892,9669=>892,9670=>788,9671=>788,9672=>788,9673=>791,9674=>494,9675=>791,
-9676=>791,9677=>785,9678=>791,9679=>791,9680=>791,9681=>791,9682=>791,9683=>791,9684=>791,9685=>791,
-9686=>791,9687=>791,9688=>761,9689=>761,9690=>761,9691=>761,9692=>791,9693=>791,9694=>791,9695=>791,
-9696=>791,9697=>791,9698=>761,9699=>761,9700=>761,9701=>761,9702=>791,9703=>761,9704=>761,9705=>761,
-9706=>761,9707=>761,9708=>892,9709=>892,9710=>892,9711=>851,9712=>761,9713=>761,9714=>761,9715=>761,
-9716=>791,9717=>791,9718=>791,9719=>791,9720=>761,9721=>761,9722=>761,9723=>761,9724=>761,9725=>570,
-9726=>570,9727=>761,9728=>800,9729=>800,9730=>748,9731=>800,9732=>800,9733=>811,9734=>816,9735=>468,
-9736=>677,9737=>724,9738=>944,9739=>944,9740=>686,9741=>944,9742=>715,9743=>715,9744=>757,9745=>755,
-9746=>755,9747=>756,9748=>800,9749=>837,9750=>719,9751=>719,9752=>782,9753=>822,9754=>954,9755=>954,
-9756=>933,9757=>489,9758=>933,9759=>489,9760=>517,9761=>660,9762=>724,9763=>732,9764=>886,9765=>577,
-9766=>489,9767=>563,9768=>490,9769=>770,9770=>725,9771=>860,9772=>668,9773=>753,9774=>724,9775=>730,
-9776=>600,9777=>600,9778=>600,9779=>600,9780=>600,9781=>600,9782=>600,9783=>600,9784=>730,9785=>724,
-9786=>724,9787=>724,9788=>799,9789=>659,9790=>659,9791=>495,9792=>495,9793=>495,9794=>686,9795=>661,
-9796=>544,9797=>608,9798=>605,9799=>545,9800=>804,9801=>583,9802=>796,9803=>1006,9804=>825,9805=>1189,
-9806=>1144,9807=>1189,9808=>683,9809=>808,9810=>1146,9811=>797,9812=>758,9813=>757,9814=>758,9815=>758,
-9816=>758,9817=>758,9818=>758,9819=>758,9820=>758,9821=>758,9822=>758,9823=>758,9824=>770,9825=>770,
-9826=>770,9827=>770,9828=>770,9829=>770,9830=>770,9831=>770,9832=>895,9833=>333,9834=>555,9835=>722,
-9836=>722,9837=>415,9838=>377,9839=>402,9840=>642,9841=>655,9842=>869,9843=>905,9844=>905,9845=>905,
-9846=>905,9847=>905,9848=>905,9849=>905,9850=>905,9851=>1016,9852=>1064,9853=>1064,9854=>954,9855=>606,
-9856=>522,9857=>522,9858=>522,9859=>522,9860=>522,9861=>522,9862=>845,9863=>844,9864=>844,9865=>844,
-9866=>748,9867=>748,9868=>748,9869=>748,9870=>748,9871=>748,9872=>726,9873=>726,9874=>963,9875=>770,
-9876=>1038,9877=>388,9878=>997,9879=>787,9880=>508,9881=>809,9882=>1014,9883=>859,9884=>818,9885=>972,
-9888=>1000,9889=>546,9890=>784,9891=>786,9892=>738,9893=>542,9894=>601,9895=>700,9896=>511,9897=>861,
-9898=>611,9899=>611,9900=>544,9901=>782,9902=>1025,9903=>1141,9904=>1000,9905=>513,9906=>510,9907=>642,
-9908=>722,9909=>719,9910=>777,9911=>495,9912=>602,9913=>836,9914=>666,9915=>666,9916=>691,9920=>689,
-9921=>689,9922=>689,9923=>689,9985=>974,9986=>961,9987=>974,9988=>980,9990=>789,9991=>790,9992=>791,
-9993=>690,9996=>549,9997=>855,9998=>911,9999=>933,10000=>911,10001=>945,10002=>974,10003=>755,10004=>846,
-10005=>762,10006=>761,10007=>571,10008=>677,10009=>763,10010=>760,10011=>759,10012=>754,10013=>494,10014=>552,
-10015=>537,10016=>577,10017=>692,10018=>786,10019=>788,10020=>788,10021=>790,10022=>793,10023=>794,10025=>823,
-10026=>789,10027=>841,10028=>823,10029=>833,10030=>816,10031=>831,10032=>923,10033=>744,10034=>723,10035=>749,
-10036=>790,10037=>792,10038=>695,10039=>776,10040=>768,10041=>792,10042=>759,10043=>707,10044=>708,10045=>682,
-10046=>701,10047=>826,10048=>815,10049=>789,10050=>789,10051=>707,10052=>687,10053=>696,10054=>689,10055=>786,
-10056=>787,10057=>713,10058=>791,10059=>785,10061=>873,10063=>762,10064=>762,10065=>759,10066=>759,10070=>784,
-10072=>138,10073=>277,10074=>415,10075=>392,10076=>392,10077=>668,10078=>668,10081=>732,10082=>544,10083=>544,
-10084=>910,10085=>667,10086=>760,10087=>760,10088=>390,10089=>390,10090=>317,10091=>317,10092=>276,10093=>276,
-10094=>509,10095=>509,10096=>410,10097=>410,10098=>234,10099=>234,10100=>334,10101=>334,10102=>788,10103=>788,
-10104=>788,10105=>788,10106=>788,10107=>788,10108=>788,10109=>788,10110=>788,10111=>788,10112=>788,10113=>788,
-10114=>788,10115=>788,10116=>788,10117=>788,10118=>788,10119=>788,10120=>788,10121=>788,10122=>788,10123=>788,
-10124=>788,10125=>788,10126=>788,10127=>788,10128=>788,10129=>788,10130=>788,10131=>788,10132=>894,10136=>748,
-10137=>924,10138=>748,10139=>918,10140=>927,10141=>928,10142=>928,10143=>834,10144=>873,10145=>828,10146=>924,
-10147=>924,10148=>917,10149=>930,10150=>931,10151=>463,10152=>883,10153=>836,10154=>836,10155=>867,10156=>867,
-10157=>696,10158=>696,10159=>874,10161=>874,10162=>760,10163=>946,10164=>771,10165=>865,10166=>771,10167=>888,
-10168=>967,10169=>888,10170=>831,10171=>873,10172=>927,10173=>970,10174=>918,10214=>545,10215=>545,10216=>329,
-10217=>329,10218=>496,10219=>496,10229=>1000,10230=>1000,10231=>1000,10232=>1000,10233=>1000,10234=>1000,10235=>1000,
-10236=>1000,10752=>860,10753=>860,10754=>860,10755=>766,10756=>766,10757=>756,10758=>756,10761=>745,10781=>702,
-10815=>722,11008=>1000,11009=>1000,11010=>1000,11011=>1000,11012=>1222,11013=>1000,11014=>1000,11015=>1000,11016=>1000,
-11017=>1000,11018=>1000,11019=>1000,11020=>1244,11021=>1000,11026=>770,11027=>770,11028=>770,11029=>770,11030=>770,
-11031=>770,11032=>770,11033=>770,11034=>770,11035=>1000,11036=>1000,11037=>283,11038=>283,11039=>846,11040=>846,
-11041=>799,11042=>799,11043=>807,11044=>1000,11045=>461,11046=>461,11047=>461,11048=>461,11049=>360,11050=>360,
-11051=>283,11052=>854,11053=>854,11054=>628,11055=>628,11088=>589,11089=>443,11090=>443,11091=>802,11092=>803,
-11392=>677,11393=>463,11394=>532,11395=>381,11396=>615,11397=>438,11398=>969,11399=>660,11400=>647,11401=>440,
-11402=>593,11403=>402,11404=>573,11405=>407,11406=>698,11407=>512,11408=>726,11409=>493,11410=>267,11411=>201,
-11412=>610,11413=>433,11414=>654,11415=>468,11416=>735,11417=>536,11418=>698,11419=>511,11420=>555,11421=>378,
-11422=>722,11423=>489,11424=>724,11425=>528,11426=>517,11427=>388,11428=>647,11429=>438,11430=>615,11431=>436,
-11432=>651,11433=>462,11434=>762,11435=>538,11436=>654,11437=>461,11438=>635,11439=>461,11440=>964,11441=>677,
-11456=>689,11457=>464,11493=>499,11494=>496,11495=>986,11496=>466,11497=>444,11498=>934,11517=>256,11518=>617,
-11519=>287,11799=>333,42560=>611,42561=>444,42562=>611,42563=>444,42564=>556,42565=>389,42566=>368,42567=>286,
-42572=>1145,42573=>775,42576=>1016,42577=>736,42578=>915,42579=>684,42580=>966,42581=>664,42582=>1042,42583=>648,
-42584=>722,42585=>491,42588=>1042,42589=>648,42590=>780,42591=>550,42594=>911,42595=>633,42596=>957,42597=>635,
-42598=>1139,42599=>777,42607=>0,42608=>0,42609=>0,42610=>0,42611=>519,42620=>0,42622=>510,64256=>589,
-64257=>534,64258=>530,64259=>805,64260=>799,64262=>677,64285=>350,64286=>0,64287=>537,64288=>537,64297=>564,
-64298=>537,64299=>537,64300=>537,64301=>537,64302=>537,64303=>537,64304=>537,64305=>537,64306=>350,64307=>537,
-64308=>537,64309=>350,64310=>350,64312=>537,64313=>350,64314=>537,64315=>537,64316=>537,64318=>537,64320=>350,
-64321=>537,64323=>537,64324=>537,64326=>537,64327=>537,64328=>537,64329=>537,64330=>537,64331=>350,64332=>537,
-64333=>537,64334=>537,64335=>537,64342=>926,64343=>926,64344=>308,64345=>308,64378=>750,64379=>750,64380=>580,
-64381=>580,64394=>338,64395=>338,64402=>874,64403=>874,64404=>329,64405=>329,64508=>776,64509=>700,64510=>304,
-64511=>304,65010=>640,65020=>837,65136=>300,65140=>300,65142=>300,65144=>300,65146=>300,65148=>300,65152=>724,
-65153=>321,65154=>275,65155=>249,65156=>275,65157=>399,65158=>399,65159=>249,65160=>275,65161=>776,65162=>776,
-65163=>301,65164=>264,65165=>249,65166=>275,65167=>950,65168=>950,65169=>293,65170=>293,65171=>424,65172=>622,
-65173=>925,65174=>925,65175=>308,65176=>308,65177=>924,65178=>924,65179=>298,65180=>298,65181=>738,65182=>738,
-65183=>574,65184=>574,65185=>748,65186=>750,65187=>600,65188=>600,65189=>701,65190=>775,65191=>596,65192=>596,
-65193=>397,65194=>397,65195=>399,65196=>399,65197=>328,65198=>328,65199=>331,65200=>331,65201=>951,65202=>951,
-65203=>600,65204=>600,65205=>949,65206=>949,65207=>649,65208=>649,65209=>949,65210=>949,65211=>823,65212=>823,
-65213=>949,65214=>949,65215=>805,65216=>805,65217=>557,65218=>557,65219=>460,65220=>460,65221=>550,65222=>550,
-65223=>455,65224=>550,65225=>625,65226=>575,65227=>674,65228=>550,65229=>602,65230=>577,65231=>578,65232=>577,
-65233=>801,65234=>801,65235=>300,65236=>300,65237=>696,65238=>696,65239=>650,65240=>650,65241=>757,65242=>757,
-65243=>318,65244=>318,65245=>655,65246=>655,65247=>206,65248=>206,65249=>549,65250=>549,65251=>403,65252=>403,
-65253=>651,65254=>651,65255=>323,65256=>323,65257=>424,65258=>622,65259=>525,65260=>476,65261=>399,65262=>399,
-65263=>776,65264=>776,65265=>776,65266=>776,65267=>296,65268=>264,65269=>676,65270=>724,65271=>676,65272=>724,
-65273=>676,65274=>724,65275=>676,65276=>724,65279=>0,65533=>788);
-$enc='';
-$diff='';
-$file='freeserif.z';
-$ctg='freeserif.ctg.z';
-$originalsize=1483772;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifb.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifb.php
deleted file mode 100644
index 37006e9d216..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifb.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerifBold';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>16,'Flags'=>32,'FontBBox'=>'[-796 -306 1860 932]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>250,33=>333,34=>555,35=>500,36=>500,37=>1000,38=>833,39=>278,40=>333,41=>333,
-42=>507,43=>676,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,50=>500,51=>500,
-52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,60=>676,61=>676,
-62=>676,63=>500,64=>930,65=>722,66=>667,67=>722,68=>724,69=>667,70=>611,71=>778,
-72=>774,73=>386,74=>500,75=>764,76=>664,77=>943,78=>722,79=>778,80=>611,81=>778,
-82=>712,83=>556,84=>667,85=>722,86=>722,87=>1000,88=>722,89=>722,90=>667,91=>333,
-92=>278,93=>333,94=>581,95=>500,96=>333,97=>500,98=>556,99=>444,100=>556,101=>444,
-102=>333,103=>500,104=>556,105=>278,106=>333,107=>556,108=>278,109=>833,110=>556,111=>500,
-112=>556,113=>556,114=>444,115=>389,116=>333,117=>556,118=>500,119=>722,120=>500,121=>500,
-122=>444,123=>394,124=>220,125=>394,126=>520,8364=>761,8218=>250,402=>333,8222=>500,8230=>1000,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>556,8249=>333,338=>1000,381=>667,8216=>250,8217=>250,
-8220=>500,8221=>500,8226=>524,8211=>500,8212=>1000,732=>333,8482=>1000,353=>389,8250=>333,339=>722,
-382=>444,376=>722,160=>250,161=>333,162=>500,163=>500,164=>500,165=>500,166=>220,167=>500,
-168=>333,169=>747,170=>300,171=>500,172=>680,173=>333,174=>747,175=>333,176=>400,177=>676,
-178=>300,179=>300,180=>333,181=>556,182=>540,183=>250,184=>333,185=>270,186=>330,187=>500,
-188=>750,189=>750,190=>750,191=>500,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,
-198=>1000,199=>722,200=>667,201=>667,202=>667,203=>667,204=>389,205=>389,206=>389,207=>389,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>676,216=>778,217=>722,
-218=>722,219=>722,220=>722,221=>722,222=>632,223=>556,224=>500,225=>500,226=>500,227=>500,
-228=>500,229=>500,230=>722,231=>444,232=>444,233=>444,234=>444,235=>444,236=>278,237=>278,
-238=>278,239=>278,240=>500,241=>556,242=>500,243=>500,244=>500,245=>500,246=>500,247=>676,
-248=>500,249=>556,250=>556,251=>556,252=>556,253=>500,254=>556,255=>500,256=>722,257=>500,
-258=>722,259=>500,260=>722,261=>500,262=>722,263=>444,264=>722,265=>444,266=>722,267=>444,
-268=>722,269=>444,270=>722,271=>616,272=>722,273=>556,274=>667,275=>444,276=>667,277=>444,
-278=>667,279=>444,280=>667,281=>444,282=>667,283=>444,284=>778,285=>500,286=>778,287=>500,
-288=>778,289=>500,290=>778,291=>500,292=>778,293=>556,294=>778,295=>556,296=>389,297=>278,
-298=>389,299=>278,300=>389,301=>278,302=>389,303=>278,304=>389,305=>278,306=>882,307=>486,
-308=>500,309=>338,310=>778,311=>556,312=>534,313=>667,314=>278,315=>667,316=>278,317=>667,
-318=>398,319=>667,320=>528,321=>667,322=>278,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>556,330=>722,331=>556,332=>778,333=>500,334=>778,335=>500,336=>778,337=>500,
-340=>722,341=>444,342=>722,343=>444,344=>722,345=>444,346=>556,347=>389,348=>556,349=>389,
-350=>556,351=>389,354=>667,355=>333,356=>667,357=>449,358=>667,359=>333,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>1000,373=>722,374=>722,375=>500,377=>667,378=>444,379=>667,380=>444,383=>333,384=>556,
-385=>805,386=>648,387=>556,388=>667,389=>556,390=>722,391=>915,392=>605,393=>722,394=>862,
-395=>667,396=>556,397=>550,398=>667,399=>778,400=>631,401=>611,403=>903,404=>776,405=>807,
-406=>327,407=>389,408=>887,409=>556,410=>278,411=>495,412=>1000,413=>864,414=>556,415=>778,
-416=>778,417=>550,418=>1192,419=>795,420=>749,421=>556,422=>748,423=>556,424=>389,425=>650,
-426=>465,427=>333,428=>667,429=>333,430=>667,431=>839,432=>629,433=>811,434=>685,435=>853,
-436=>705,437=>667,438=>444,439=>593,440=>654,441=>508,442=>500,443=>500,444=>654,445=>520,
-446=>444,447=>611,448=>220,449=>418,450=>570,451=>333,452=>1391,453=>1168,454=>1000,455=>1164,
-456=>997,457=>611,458=>1222,459=>1055,460=>889,461=>722,462=>500,463=>386,464=>278,465=>778,
-466=>500,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,
-476=>556,477=>444,478=>722,479=>500,480=>722,481=>500,482=>1000,483=>722,484=>778,485=>500,
-486=>778,487=>500,488=>764,489=>556,490=>778,491=>500,492=>778,493=>500,494=>593,495=>502,
-496=>338,497=>1391,498=>1168,499=>1000,500=>778,501=>500,502=>995,503=>603,504=>722,505=>556,
-506=>722,507=>500,508=>1000,509=>722,510=>778,511=>500,512=>722,513=>500,514=>722,515=>500,
-516=>667,517=>444,518=>667,519=>444,520=>386,521=>278,522=>386,523=>278,524=>778,525=>500,
-526=>778,527=>500,528=>712,529=>444,530=>712,531=>444,532=>722,533=>556,534=>722,535=>556,
-536=>556,537=>389,538=>667,539=>333,540=>464,541=>455,542=>774,543=>556,544=>731,545=>649,
-546=>568,547=>494,548=>667,549=>444,550=>722,551=>500,552=>667,553=>444,554=>778,555=>500,
-556=>778,557=>500,558=>778,559=>500,560=>778,561=>500,562=>722,563=>500,564=>437,565=>636,
-566=>415,567=>338,568=>776,569=>760,570=>722,571=>722,572=>444,573=>664,574=>667,575=>389,
-576=>451,577=>505,578=>479,579=>686,580=>750,581=>722,582=>667,583=>478,584=>500,585=>333,
-586=>808,587=>608,588=>712,589=>444,590=>757,591=>500,592=>500,593=>523,594=>523,595=>556,
-596=>444,598=>556,599=>556,600=>444,601=>444,602=>611,603=>440,604=>440,605=>611,607=>333,
-608=>500,609=>500,610=>556,613=>556,614=>556,615=>556,616=>278,617=>333,618=>278,619=>278,
-621=>278,622=>667,623=>833,624=>833,625=>833,626=>556,627=>556,628=>556,629=>500,631=>715,
-632=>667,633=>444,634=>444,635=>444,636=>444,637=>444,638=>394,639=>394,640=>556,641=>556,
-642=>389,643=>333,644=>333,645=>433,647=>333,648=>333,649=>500,650=>557,651=>529,652=>500,
-653=>722,654=>500,655=>500,656=>444,658=>502,660=>500,661=>500,662=>500,664=>778,665=>510,
-667=>722,668=>556,670=>556,671=>444,672=>556,673=>500,674=>500,686=>611,687=>722,697=>250,
-698=>408,699=>250,700=>250,701=>250,702=>300,703=>300,706=>333,707=>333,708=>333,709=>333,
-711=>333,712=>333,713=>333,714=>333,715=>333,716=>300,717=>333,718=>333,719=>333,720=>278,
-721=>278,722=>300,723=>300,724=>333,725=>333,726=>333,727=>333,728=>333,729=>333,730=>333,
-731=>333,733=>400,734=>333,735=>352,741=>526,742=>526,743=>526,744=>526,745=>526,746=>519,
-747=>519,748=>333,749=>333,750=>480,751=>333,752=>333,753=>333,754=>333,755=>327,756=>261,
-757=>437,758=>437,759=>400,760=>278,761=>175,762=>175,763=>175,764=>175,765=>333,766=>337,
-767=>432,768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,
-777=>0,778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,
-787=>0,788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,
-797=>0,798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,
-807=>0,808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,
-817=>0,818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,
-827=>0,828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,
-837=>0,838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,
-847=>0,848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,856=>0,
-857=>0,858=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,884=>199,885=>199,
-890=>0,894=>333,900=>330,901=>415,902=>722,903=>250,904=>811,905=>938,906=>556,908=>840,
-910=>886,911=>879,912=>330,913=>722,914=>667,915=>611,916=>759,917=>667,918=>667,919=>774,
-920=>778,921=>386,922=>777,923=>722,924=>943,925=>722,926=>650,927=>778,928=>812,929=>611,
-931=>650,932=>667,933=>738,934=>868,935=>722,936=>924,937=>811,938=>386,939=>738,940=>605,
-941=>440,942=>605,943=>330,944=>550,945=>605,946=>550,947=>550,948=>550,949=>440,950=>495,
-951=>605,952=>550,953=>330,954=>608,955=>495,956=>605,957=>495,958=>495,959=>550,960=>605,
-961=>550,962=>440,963=>550,964=>440,965=>550,966=>660,967=>495,968=>715,969=>715,970=>330,
-971=>550,972=>550,973=>550,974=>715,976=>550,977=>605,978=>722,979=>871,980=>722,981=>660,
-982=>715,983=>550,984=>611,985=>550,986=>650,987=>514,988=>611,989=>513,990=>715,991=>439,
-992=>722,993=>605,1008=>550,1009=>550,1010=>477,1011=>333,1012=>778,1013=>424,1014=>424,1015=>632,
-1016=>575,1017=>722,1018=>943,1019=>809,1020=>550,1021=>722,1022=>722,1023=>722,1024=>667,1025=>667,
-1026=>848,1027=>611,1028=>722,1029=>556,1030=>386,1031=>386,1032=>500,1033=>1042,1034=>1032,1035=>912,
-1036=>770,1037=>774,1038=>738,1039=>778,1040=>722,1041=>648,1042=>667,1043=>599,1044=>708,1045=>667,
-1046=>1106,1047=>652,1048=>774,1049=>774,1050=>770,1051=>788,1052=>943,1053=>774,1054=>778,1055=>812,
-1056=>611,1057=>722,1058=>667,1059=>738,1060=>868,1061=>722,1062=>774,1063=>754,1064=>1115,1065=>1115,
-1066=>782,1067=>970,1068=>630,1069=>722,1070=>1114,1071=>729,1072=>500,1073=>500,1074=>510,1075=>430,
-1076=>545,1077=>438,1078=>781,1079=>445,1080=>556,1081=>556,1082=>556,1083=>542,1084=>668,1085=>558,
-1086=>500,1087=>558,1088=>549,1089=>444,1090=>494,1091=>486,1092=>809,1093=>500,1094=>560,1095=>556,
-1096=>818,1097=>820,1098=>612,1099=>756,1100=>512,1101=>496,1102=>770,1103=>546,1104=>438,1105=>444,
-1106=>549,1107=>430,1108=>488,1109=>386,1110=>272,1111=>278,1112=>333,1113=>784,1114=>786,1115=>552,
-1116=>556,1117=>556,1118=>484,1119=>556,1120=>1018,1121=>699,1122=>781,1123=>612,1124=>1033,1125=>778,
-1126=>993,1127=>692,1128=>1371,1129=>975,1130=>1106,1131=>781,1132=>1474,1133=>1066,1134=>650,1135=>424,
-1136=>970,1137=>769,1138=>770,1139=>590,1140=>808,1141=>578,1142=>808,1143=>650,1144=>1284,1145=>973,
-1146=>928,1147=>672,1148=>1018,1149=>693,1150=>1018,1151=>699,1152=>650,1153=>444,1154=>258,1155=>0,
-1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,1162=>774,1163=>558,1164=>630,1165=>512,
-1166=>611,1167=>556,1168=>614,1169=>458,1170=>614,1171=>443,1172=>631,1173=>562,1174=>1155,1175=>828,
-1176=>652,1177=>452,1178=>819,1179=>600,1180=>816,1181=>590,1182=>920,1183=>664,1184=>967,1185=>633,
-1186=>774,1187=>562,1188=>984,1189=>698,1190=>1069,1191=>841,1192=>722,1193=>524,1194=>722,1195=>444,
-1196=>667,1197=>494,1198=>722,1199=>606,1200=>722,1201=>606,1202=>722,1203=>560,1204=>1046,1205=>778,
-1206=>754,1207=>560,1208=>810,1209=>590,1210=>754,1211=>556,1212=>945,1213=>606,1214=>945,1215=>606,
-1216=>386,1217=>1106,1218=>781,1219=>770,1220=>534,1221=>788,1222=>550,1223=>774,1224=>556,1225=>774,
-1226=>558,1227=>778,1228=>556,1229=>943,1230=>677,1231=>386,1232=>722,1233=>500,1234=>722,1235=>500,
-1236=>1000,1237=>722,1238=>667,1239=>444,1240=>778,1241=>444,1242=>778,1243=>444,1244=>1106,1245=>781,
-1246=>652,1247=>445,1248=>654,1249=>389,1250=>774,1251=>556,1252=>774,1253=>556,1254=>778,1255=>500,
-1256=>778,1257=>500,1258=>778,1259=>500,1260=>722,1261=>496,1262=>738,1263=>500,1264=>738,1265=>500,
-1266=>738,1267=>500,1268=>754,1269=>556,1270=>599,1271=>443,1272=>970,1273=>756,1296=>652,1297=>452,
-1298=>788,1299=>550,1306=>778,1307=>556,1308=>1000,1309=>722,1310=>770,1311=>558,1425=>0,1426=>0,
-1427=>0,1428=>0,1429=>0,1430=>0,1431=>0,1432=>0,1433=>0,1434=>0,1435=>0,1436=>0,
-1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,1442=>0,1443=>0,1444=>0,1445=>0,1446=>0,
-1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,1452=>0,1453=>0,1454=>0,1455=>0,1456=>0,
-1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,
-1467=>0,1468=>0,1469=>0,1470=>433,1471=>0,1472=>155,1473=>0,1474=>0,1475=>400,1476=>0,
-1477=>0,1478=>347,1479=>0,1488=>593,1489=>498,1490=>339,1491=>523,1492=>561,1493=>266,1494=>291,
-1495=>559,1496=>576,1497=>266,1498=>496,1499=>501,1500=>510,1501=>542,1502=>581,1503=>273,1504=>347,
-1505=>512,1506=>552,1507=>493,1508=>491,1509=>537,1510=>561,1511=>544,1512=>502,1513=>716,1514=>571,
-1520=>532,1521=>532,1522=>532,1523=>396,1524=>432,3585=>590,3586=>578,3587=>661,3588=>592,3589=>592,
-3590=>699,3591=>447,3592=>534,3593=>692,3594=>578,3595=>659,3596=>899,3597=>804,3598=>633,3599=>637,
-3600=>484,3601=>730,3602=>876,3603=>915,3604=>592,3605=>592,3606=>578,3607=>670,3608=>542,3609=>671,
-3610=>621,3611=>618,3612=>621,3613=>617,3614=>708,3615=>708,3616=>637,3617=>589,3618=>552,3619=>484,
-3620=>590,3621=>569,3622=>637,3623=>526,3624=>599,3625=>802,3626=>579,3627=>668,3628=>778,3629=>560,
-3630=>514,3631=>510,3632=>412,3633=>0,3634=>423,3635=>452,3636=>0,3637=>0,3638=>0,3639=>0,
-3640=>0,3641=>0,3642=>0,3647=>665,3648=>357,3649=>624,3650=>529,3651=>486,3652=>475,3653=>423,
-3654=>500,3655=>0,3656=>0,3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,3663=>657,
-3664=>548,3665=>548,3666=>592,3667=>614,3668=>631,3669=>643,3670=>508,3671=>744,3672=>622,3673=>585,
-3674=>721,3675=>1381,4256=>475,4257=>469,4258=>573,4259=>650,4260=>502,4261=>506,4262=>481,4263=>746,
-4264=>491,4265=>495,4266=>888,4267=>488,4268=>464,4269=>745,4270=>483,4271=>489,4272=>721,4273=>464,
-4274=>578,4275=>590,4276=>611,4277=>491,4278=>663,4279=>489,4280=>544,4281=>479,4282=>527,4283=>488,
-4284=>560,4285=>461,4286=>467,4287=>546,4288=>483,4289=>487,4290=>562,4291=>477,4292=>491,4293=>471,
-4304=>522,4305=>518,4306=>621,4307=>716,4308=>517,4309=>519,4310=>518,4311=>796,4312=>518,4313=>518,
-4314=>934,4315=>517,4316=>519,4317=>787,4318=>515,4319=>514,4320=>788,4321=>573,4322=>620,4323=>593,
-4324=>639,4325=>516,4326=>714,4327=>518,4328=>572,4329=>518,4330=>555,4331=>518,4332=>562,4333=>509,
-4334=>572,4335=>677,4336=>523,4337=>517,4338=>595,4339=>480,4340=>519,4341=>484,4345=>621,4347=>450,
-5024=>718,5025=>768,5026=>633,5027=>878,5028=>1001,5029=>371,5030=>576,5031=>754,5032=>531,5033=>774,
-5034=>692,5035=>499,5036=>668,5037=>829,5038=>575,5039=>681,5040=>485,5041=>607,5042=>885,5043=>974,
-5044=>588,5045=>583,5046=>726,5047=>947,5048=>558,5049=>832,5050=>1096,5051=>780,5052=>595,5053=>869,
-5054=>752,5055=>710,5056=>761,5057=>802,5058=>760,5059=>656,5060=>655,5061=>982,5062=>684,5063=>801,
-5064=>805,5065=>1042,5066=>755,5067=>612,5068=>707,5069=>889,5070=>584,5071=>623,5072=>536,5073=>763,
-5074=>763,5075=>498,5076=>1052,5077=>600,5078=>730,5079=>714,5080=>714,5081=>697,5082=>543,5083=>943,
-5084=>718,5085=>630,5086=>660,5087=>692,5088=>841,5089=>861,5090=>617,5091=>733,5092=>898,5093=>896,
-5094=>781,5095=>612,5096=>830,5097=>948,5098=>886,5099=>757,5100=>796,5101=>578,5102=>601,5103=>797,
-5104=>623,5105=>886,5106=>730,5107=>827,5108=>648,7680=>722,7681=>500,7682=>667,7683=>556,7684=>667,
-7685=>556,7686=>667,7687=>556,7688=>722,7689=>444,7690=>724,7691=>556,7692=>724,7693=>556,7694=>724,
-7695=>556,7696=>724,7697=>556,7698=>724,7699=>556,7700=>667,7701=>444,7702=>667,7703=>444,7704=>667,
-7705=>444,7706=>667,7707=>444,7708=>667,7709=>444,7710=>611,7711=>333,7712=>778,7713=>500,7714=>774,
-7715=>556,7716=>774,7717=>556,7718=>774,7719=>556,7720=>774,7721=>556,7722=>774,7723=>556,7724=>386,
-7725=>278,7726=>389,7727=>278,7728=>764,7729=>556,7730=>764,7731=>556,7732=>764,7733=>556,7734=>664,
-7735=>278,7736=>664,7737=>278,7738=>664,7739=>278,7740=>664,7741=>278,7742=>943,7743=>833,7744=>943,
-7745=>833,7746=>943,7747=>833,7748=>722,7749=>556,7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,
-7755=>556,7756=>778,7757=>500,7758=>778,7759=>500,7760=>778,7761=>500,7762=>778,7763=>500,7764=>611,
-7765=>556,7766=>611,7767=>556,7768=>712,7769=>444,7770=>712,7771=>444,7772=>712,7773=>444,7774=>712,
-7775=>444,7776=>556,7777=>389,7778=>556,7779=>389,7780=>556,7781=>389,7782=>556,7783=>389,7784=>556,
-7785=>389,7786=>667,7787=>333,7788=>667,7789=>333,7790=>667,7791=>333,7792=>667,7793=>333,7794=>722,
-7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,7800=>722,7801=>556,7802=>722,7803=>556,7804=>722,
-7805=>500,7806=>722,7807=>500,7808=>1000,7809=>722,7810=>1000,7811=>722,7812=>1000,7813=>722,7814=>1000,
-7815=>722,7816=>1000,7817=>722,7818=>722,7819=>500,7820=>722,7821=>500,7822=>722,7823=>500,7824=>667,
-7825=>444,7826=>667,7827=>444,7828=>667,7829=>444,7830=>556,7831=>333,7832=>722,7833=>500,7834=>507,
-7835=>333,7840=>722,7841=>500,7842=>722,7843=>500,7844=>722,7845=>500,7846=>722,7847=>500,7848=>722,
-7849=>500,7850=>722,7851=>500,7852=>722,7853=>500,7854=>722,7855=>500,7856=>722,7857=>500,7858=>825,
-7859=>603,7860=>722,7861=>500,7862=>722,7863=>500,7864=>667,7865=>444,7866=>667,7867=>444,7868=>667,
-7869=>444,7870=>667,7871=>444,7872=>667,7873=>444,7874=>667,7875=>444,7876=>667,7877=>444,7878=>667,
-7879=>444,7880=>386,7881=>278,7882=>386,7883=>278,7884=>778,7885=>500,7886=>778,7887=>500,7888=>778,
-7889=>500,7890=>778,7891=>500,7892=>778,7893=>500,7894=>778,7895=>500,7896=>778,7897=>500,7898=>774,
-7899=>550,7900=>774,7901=>550,7902=>774,7903=>549,7904=>778,7905=>550,7906=>778,7907=>550,7908=>722,
-7909=>556,7910=>722,7911=>556,7912=>838,7913=>672,7914=>838,7915=>672,7916=>825,7917=>659,7918=>839,
-7919=>629,7920=>839,7921=>629,7922=>722,7923=>500,7924=>722,7925=>500,7926=>722,7927=>500,7928=>722,
-7929=>500,7936=>605,7937=>605,7938=>605,7939=>605,7940=>605,7941=>605,7942=>605,7943=>605,7944=>722,
-7945=>722,7946=>830,7947=>833,7948=>761,7949=>798,7950=>721,7951=>722,7952=>440,7953=>440,7954=>440,
-7955=>440,7956=>440,7957=>440,7960=>817,7961=>826,7962=>944,7963=>970,7964=>964,7965=>1009,7968=>605,
-7969=>605,7970=>605,7971=>605,7972=>605,7973=>605,7974=>605,7975=>605,7976=>926,7977=>921,7978=>1038,
-7979=>1064,7980=>1092,7981=>1102,7982=>1005,7983=>991,7984=>330,7985=>330,7986=>330,7987=>330,7988=>330,
-7989=>330,7990=>330,7991=>330,7992=>534,7993=>541,7994=>653,7995=>659,7996=>705,7997=>714,7998=>612,
-7999=>614,8000=>550,8001=>550,8002=>550,8003=>550,8004=>550,8005=>550,8008=>885,8009=>886,8010=>1038,
-8011=>1052,8012=>997,8013=>1021,8016=>550,8017=>550,8018=>550,8019=>550,8020=>550,8021=>550,8022=>550,
-8023=>550,8025=>870,8027=>1014,8029=>1043,8031=>944,8032=>715,8033=>715,8034=>715,8035=>715,8036=>715,
-8037=>715,8038=>715,8039=>715,8040=>905,8041=>913,8042=>1066,8043=>1085,8044=>1034,8045=>1044,8046=>980,
-8047=>961,8048=>605,8049=>605,8050=>440,8051=>440,8052=>605,8053=>605,8054=>330,8055=>330,8056=>550,
-8057=>550,8058=>550,8059=>550,8060=>715,8061=>715,8064=>605,8065=>605,8066=>605,8067=>605,8068=>605,
-8069=>605,8070=>605,8071=>605,8072=>886,8073=>887,8074=>985,8075=>993,8076=>937,8077=>956,8078=>874,
-8079=>878,8080=>605,8081=>605,8082=>605,8083=>605,8084=>605,8085=>605,8086=>605,8087=>605,8088=>1096,
-8089=>1092,8090=>1223,8091=>1250,8092=>1270,8093=>1283,8094=>1174,8095=>1162,8096=>715,8097=>715,8098=>715,
-8099=>715,8100=>715,8101=>715,8102=>715,8103=>715,8104=>1057,8105=>1073,8106=>1228,8107=>1251,8108=>1202,
-8109=>1210,8110=>1151,8111=>1131,8112=>605,8113=>605,8114=>605,8115=>605,8116=>605,8118=>605,8119=>605,
-8120=>722,8121=>722,8122=>722,8123=>722,8124=>883,8125=>500,8126=>0,8127=>500,8128=>500,8129=>550,
-8130=>605,8131=>605,8132=>605,8134=>605,8135=>605,8136=>790,8137=>830,8138=>909,8139=>931,8140=>950,
-8141=>500,8142=>500,8143=>500,8144=>330,8145=>330,8146=>330,8147=>330,8150=>330,8151=>330,8152=>386,
-8153=>386,8154=>506,8155=>550,8157=>500,8158=>500,8159=>500,8160=>550,8161=>550,8162=>550,8163=>550,
-8164=>550,8165=>550,8166=>550,8167=>550,8168=>738,8169=>738,8170=>858,8171=>880,8172=>764,8173=>550,
-8174=>550,8175=>500,8178=>715,8179=>715,8180=>715,8182=>715,8183=>715,8184=>884,8185=>857,8186=>927,
-8187=>892,8188=>988,8189=>500,8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,
-8198=>167,8199=>500,8200=>250,8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,
-8208=>333,8209=>333,8210=>500,8213=>1000,8214=>333,8215=>478,8219=>250,8223=>500,8227=>560,8228=>250,
-8229=>500,8231=>250,8232=>0,8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>250,
-8241=>1588,8242=>270,8243=>492,8244=>714,8245=>270,8246=>484,8247=>693,8248=>469,8251=>727,8252=>666,
-8253=>695,8254=>500,8255=>953,8256=>953,8257=>338,8258=>931,8259=>333,8260=>167,8261=>332,8262=>332,
-8263=>1000,8264=>833,8265=>833,8266=>500,8267=>540,8268=>528,8269=>523,8270=>500,8271=>333,8272=>953,
-8273=>500,8274=>497,8275=>576,8276=>953,8277=>785,8278=>450,8279=>881,8280=>620,8281=>620,8282=>179,
-8283=>621,8284=>569,8285=>179,8286=>179,8287=>111,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,
-8304=>300,8305=>278,8308=>300,8309=>300,8310=>300,8311=>300,8312=>300,8313=>300,8314=>300,8315=>300,
-8316=>300,8317=>216,8318=>216,8319=>318,8320=>300,8321=>274,8322=>300,8323=>300,8324=>300,8325=>300,
-8326=>300,8327=>300,8328=>300,8329=>300,8330=>300,8331=>300,8332=>300,8333=>216,8334=>216,8352=>710,
-8353=>722,8354=>783,8355=>611,8356=>500,8357=>833,8358=>722,8359=>960,8360=>1101,8361=>1000,8362=>889,
-8363=>532,8365=>742,8366=>631,8369=>609,8370=>639,8371=>660,8372=>556,8373=>500,8448=>752,8449=>746,
-8451=>1009,8457=>923,8458=>500,8459=>1035,8462=>556,8463=>556,8464=>792,8465=>737,8466=>800,8467=>427,
-8468=>835,8470=>879,8471=>1048,8472=>666,8475=>747,8476=>955,8478=>722,8479=>722,8480=>891,8481=>1156,
-8483=>722,8486=>811,8487=>811,8489=>333,8490=>764,8491=>722,8492=>806,8494=>551,8497=>723,8498=>611,
-8499=>1203,8501=>593,8502=>498,8503=>339,8504=>523,8506=>906,8507=>1156,8523=>778,8525=>866,8526=>500,
-8531=>750,8532=>750,8533=>750,8534=>750,8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,
-8541=>750,8542=>750,8543=>750,8544=>386,8545=>772,8546=>1158,8547=>1108,8548=>722,8549=>1108,8550=>1494,
-8551=>1880,8552=>1108,8553=>722,8554=>1108,8555=>1494,8556=>664,8557=>722,8558=>724,8559=>943,8560=>278,
-8561=>556,8562=>834,8563=>778,8564=>500,8565=>778,8566=>1056,8567=>1334,8568=>778,8569=>500,8570=>778,
-8571=>1056,8572=>278,8573=>444,8574=>556,8575=>833,8592=>964,8593=>523,8594=>964,8595=>523,8596=>964,
-8597=>964,8598=>964,8599=>964,8600=>964,8601=>964,8602=>964,8603=>964,8604=>1152,8605=>1152,8606=>964,
-8607=>964,8608=>964,8609=>964,8610=>1078,8611=>1078,8612=>964,8613=>964,8614=>964,8615=>964,8616=>964,
-8617=>964,8618=>964,8619=>964,8620=>964,8621=>1168,8622=>964,8624=>622,8625=>622,8630=>1069,8631=>1069,
-8632=>964,8633=>964,8634=>980,8635=>980,8636=>964,8637=>964,8638=>557,8639=>556,8640=>964,8641=>964,
-8642=>557,8643=>556,8644=>964,8645=>964,8646=>964,8647=>964,8648=>964,8649=>964,8650=>964,8651=>964,
-8652=>964,8653=>964,8654=>964,8655=>964,8656=>964,8657=>630,8658=>964,8659=>630,8660=>964,8661=>630,
-8662=>1063,8663=>1063,8664=>1063,8665=>1063,8666=>964,8667=>964,8668=>1100,8669=>1100,8672=>964,8674=>964,
-8676=>964,8677=>964,8704=>627,8705=>716,8706=>558,8707=>627,8708=>627,8709=>500,8710=>612,8711=>719,
-8713=>576,8714=>576,8716=>576,8717=>576,8720=>733,8721=>713,8722=>676,8723=>676,8724=>676,8725=>750,
-8727=>570,8729=>570,8730=>549,8733=>676,8734=>752,8736=>555,8737=>555,8738=>555,8739=>240,8740=>531,
-8741=>478,8742=>705,8743=>694,8744=>694,8745=>694,8746=>694,8747=>323,8756=>629,8757=>629,8761=>947,
-8764=>676,8765=>676,8766=>763,8768=>305,8769=>676,8770=>676,8771=>676,8773=>676,8776=>676,8777=>676,
-8778=>676,8781=>676,8782=>676,8783=>676,8784=>676,8785=>676,8786=>676,8787=>676,8788=>947,8789=>947,
-8790=>676,8791=>676,8796=>676,8800=>570,8801=>676,8802=>676,8804=>570,8805=>570,8806=>676,8807=>676,
-8808=>676,8809=>676,8810=>1047,8811=>1047,8812=>450,8813=>676,8814=>676,8815=>676,8816=>676,8817=>676,
-8818=>676,8819=>676,8820=>676,8821=>676,8822=>676,8823=>676,8824=>676,8825=>676,8826=>676,8827=>676,
-8828=>676,8829=>676,8830=>676,8831=>676,8832=>676,8833=>676,8834=>676,8835=>676,8836=>676,8837=>676,
-8838=>676,8839=>676,8840=>676,8841=>676,8842=>676,8843=>676,8846=>694,8847=>676,8848=>676,8849=>676,
-8850=>676,8851=>694,8852=>694,8853=>738,8854=>738,8855=>738,8856=>738,8857=>738,8858=>738,8859=>738,
-8861=>738,8862=>678,8863=>678,8864=>678,8865=>678,8866=>487,8867=>487,8868=>752,8869=>752,8871=>487,
-8873=>659,8874=>831,8876=>487,8877=>487,8878=>659,8879=>659,8882=>676,8883=>676,8884=>676,8885=>676,
-8886=>1380,8887=>1380,8888=>1027,8890=>626,8891=>694,8892=>694,8893=>694,8900=>512,8903=>676,8904=>759,
-8905=>632,8906=>632,8907=>1000,8908=>1000,8909=>676,8910=>694,8911=>694,8912=>676,8913=>676,8914=>694,
-8915=>694,8916=>694,8918=>676,8919=>676,8920=>1441,8921=>1441,8922=>676,8923=>676,8924=>676,8925=>676,
-8926=>676,8927=>676,8928=>676,8929=>676,8930=>676,8931=>676,8934=>676,8935=>676,8936=>676,8937=>676,
-8938=>676,8939=>676,8940=>676,8941=>676,8960=>737,8968=>411,8969=>411,8970=>411,8971=>411,8976=>680,
-8994=>951,8995=>951,9001=>398,9002=>398,9251=>500,9472=>1000,9473=>1000,9474=>1000,9475=>1000,9476=>1000,
-9477=>1000,9478=>1000,9479=>1000,9480=>1000,9481=>1000,9482=>1000,9483=>1000,9484=>1000,9485=>1000,9486=>1000,
-9487=>1000,9488=>1000,9489=>1000,9490=>1000,9491=>1000,9492=>1000,9493=>1000,9494=>1000,9495=>1000,9496=>1000,
-9497=>1000,9498=>1000,9499=>1000,9500=>1000,9501=>1000,9502=>1000,9503=>1000,9504=>1000,9505=>1000,9506=>1000,
-9507=>1000,9508=>1000,9509=>1000,9510=>1000,9511=>1000,9512=>1000,9513=>1000,9514=>1000,9515=>1000,9516=>1000,
-9517=>1000,9518=>1000,9519=>1000,9520=>1000,9521=>1000,9522=>1000,9523=>1000,9524=>1000,9525=>1000,9526=>1000,
-9527=>1000,9528=>1000,9529=>1000,9530=>1000,9531=>1000,9532=>1000,9533=>1000,9534=>1000,9535=>1000,9536=>1000,
-9537=>1000,9538=>1000,9539=>1000,9540=>1000,9541=>1000,9542=>1000,9543=>1000,9544=>1000,9545=>1000,9546=>1000,
-9547=>1000,9552=>1000,9553=>1000,9554=>1000,9555=>1000,9556=>1000,9557=>1000,9558=>1000,9559=>1000,9560=>1000,
-9561=>1000,9562=>1000,9563=>1000,9564=>1000,9565=>1000,9566=>1000,9567=>1000,9568=>1000,9569=>1000,9570=>1000,
-9571=>1000,9572=>1000,9573=>1000,9574=>1000,9575=>1000,9576=>1000,9577=>1000,9578=>1000,9579=>1000,9580=>1000,
-9600=>1000,9601=>1000,9602=>1000,9603=>1000,9604=>1000,9605=>1000,9606=>1000,9607=>1000,9608=>1000,9609=>1000,
-9610=>1000,9611=>1000,9612=>1000,9613=>1000,9614=>1000,9615=>1000,9616=>1000,9617=>1000,9618=>1000,9620=>1000,
-9621=>1000,9622=>1000,9623=>1000,9624=>1000,9625=>1000,9626=>1000,9627=>1000,9628=>1000,9629=>1000,9630=>1000,
-9631=>1000,9632=>678,9633=>678,9642=>309,9650=>681,9651=>681,9654=>681,9655=>681,9660=>681,9661=>681,
-9664=>681,9665=>681,9670=>580,9671=>580,9674=>494,9675=>738,9676=>732,9679=>738,9702=>524,9711=>851,
-9733=>1003,9734=>1003,9824=>618,9825=>645,9826=>587,9827=>582,9828=>582,9829=>645,9830=>587,9831=>618,
-9833=>333,9834=>556,9835=>778,9836=>778,9837=>556,9838=>556,9839=>556,10214=>561,10215=>561,11799=>333,
-64256=>613,64257=>559,64258=>559,64259=>846,64260=>836,64262=>723,64285=>266,64286=>0,64287=>532,64288=>552,
-64297=>570,64298=>716,64299=>716,64300=>716,64301=>716,64302=>593,64303=>593,64304=>593,64305=>498,64306=>339,
-64307=>523,64308=>561,64309=>266,64310=>291,64312=>576,64313=>266,64314=>496,64315=>501,64316=>510,64318=>581,
-64320=>347,64321=>512,64323=>493,64324=>491,64326=>561,64327=>544,64328=>502,64329=>716,64330=>571,64331=>266,
-64332=>498,64333=>501,64334=>491,64335=>593,65533=>788);
-$enc='';
-$diff='';
-$file='freeserifb.z';
-$ctg='freeserifb.ctg.z';
-$originalsize=467208;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifbi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifbi.php
deleted file mode 100644
index d45a4f5f613..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifbi.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerifBoldItalic';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>-24,'Flags'=>96,'FontBBox'=>'[-787 -1120 1867 1571]','ItalicAngle'=>-16.3,'StemV'=>120,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>250,33=>389,34=>555,35=>500,36=>500,37=>833,38=>778,39=>278,40=>333,41=>333,
-42=>500,43=>570,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,50=>500,51=>500,
-52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,60=>570,61=>570,
-62=>570,63=>500,64=>832,65=>667,66=>667,67=>667,68=>744,69=>670,70=>656,71=>722,
-72=>778,73=>393,74=>500,75=>664,76=>609,77=>896,78=>722,79=>722,80=>614,81=>722,
-82=>672,83=>556,84=>611,85=>722,86=>667,87=>889,88=>667,89=>611,90=>611,91=>333,
-92=>278,93=>333,94=>570,95=>500,96=>333,97=>500,98=>500,99=>444,100=>500,101=>444,
-102=>333,103=>500,104=>556,105=>278,106=>278,107=>500,108=>278,109=>778,110=>556,111=>500,
-112=>500,113=>500,114=>389,115=>389,116=>278,117=>556,118=>444,119=>667,120=>500,121=>444,
-122=>389,123=>348,124=>220,125=>348,126=>570,8364=>761,8218=>250,402=>333,8222=>500,8230=>1000,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>556,8249=>333,338=>944,381=>611,8216=>250,8217=>250,
-8220=>500,8221=>500,8226=>350,8211=>500,8212=>1000,732=>333,8482=>1000,353=>389,8250=>333,339=>722,
-382=>389,376=>611,160=>250,161=>389,162=>500,163=>500,164=>500,165=>500,166=>220,167=>500,
-168=>333,169=>747,170=>266,171=>500,172=>606,173=>333,174=>747,175=>333,176=>400,177=>570,
-178=>300,179=>300,180=>333,181=>576,182=>500,183=>250,184=>333,185=>272,186=>300,187=>500,
-188=>750,189=>750,190=>750,191=>500,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,
-198=>944,199=>667,200=>667,201=>667,202=>667,203=>667,204=>389,205=>389,206=>389,207=>389,
-208=>722,209=>722,210=>722,211=>722,212=>722,213=>722,214=>722,215=>570,216=>722,217=>722,
-218=>722,219=>722,220=>722,221=>611,222=>609,223=>500,224=>500,225=>500,226=>500,227=>500,
-228=>500,229=>500,230=>722,231=>444,232=>444,233=>444,234=>444,235=>444,236=>278,237=>278,
-238=>278,239=>278,240=>500,241=>556,242=>500,243=>500,244=>500,245=>500,246=>500,247=>570,
-248=>500,249=>556,250=>556,251=>556,252=>556,253=>444,254=>500,255=>444,256=>667,257=>500,
-258=>667,259=>500,260=>667,261=>500,262=>667,263=>444,264=>667,265=>444,266=>667,267=>444,
-268=>667,269=>444,270=>722,271=>616,272=>722,273=>500,274=>667,275=>444,276=>667,277=>444,
-278=>667,279=>444,280=>667,281=>444,282=>667,283=>444,284=>722,285=>500,286=>722,287=>500,
-288=>722,289=>500,290=>722,291=>500,292=>778,293=>556,294=>778,295=>556,296=>389,297=>278,
-298=>389,299=>278,300=>389,301=>278,302=>389,303=>278,304=>389,305=>278,306=>826,307=>547,
-308=>500,309=>278,310=>667,311=>500,312=>534,313=>611,314=>278,315=>611,316=>278,317=>638,
-318=>424,319=>611,320=>424,321=>611,322=>278,323=>722,324=>556,325=>722,326=>556,327=>722,
-328=>556,329=>556,330=>722,331=>547,332=>722,333=>500,334=>722,335=>500,336=>722,337=>500,
-340=>667,341=>389,342=>667,343=>389,344=>667,345=>389,346=>556,347=>389,348=>556,349=>389,
-350=>556,351=>389,354=>611,355=>278,356=>611,357=>308,358=>611,359=>278,360=>722,361=>556,
-362=>722,363=>556,364=>722,365=>556,366=>722,367=>556,368=>722,369=>556,370=>722,371=>556,
-372=>889,373=>667,374=>611,375=>444,377=>611,378=>389,379=>611,380=>389,383=>333,384=>500,
-385=>850,386=>667,387=>575,388=>630,389=>500,390=>722,391=>929,392=>654,393=>722,394=>864,
-395=>684,396=>500,397=>546,398=>670,399=>722,400=>631,401=>769,403=>929,404=>716,405=>745,
-406=>278,407=>389,408=>829,409=>500,410=>278,411=>495,412=>853,413=>919,414=>556,415=>722,
-416=>908,417=>640,418=>1014,419=>778,420=>757,421=>500,422=>611,423=>556,424=>389,425=>730,
-426=>455,427=>349,428=>611,429=>298,430=>611,431=>902,432=>714,433=>811,434=>678,435=>611,
-436=>581,437=>611,438=>389,439=>619,440=>614,441=>461,442=>445,443=>500,444=>614,445=>500,
-446=>389,447=>504,448=>220,449=>418,450=>570,451=>333,452=>1355,453=>1133,454=>889,455=>1109,
-456=>887,457=>556,458=>1222,459=>1000,460=>834,461=>667,462=>500,463=>393,464=>278,465=>722,
-466=>500,467=>722,468=>556,469=>722,470=>556,471=>722,472=>556,473=>722,474=>556,475=>722,
-476=>556,477=>444,478=>667,479=>500,480=>667,481=>500,482=>944,483=>722,484=>722,485=>500,
-486=>722,487=>500,488=>664,489=>500,490=>722,491=>500,492=>722,493=>500,494=>619,495=>513,
-496=>278,497=>1355,498=>1133,499=>889,500=>722,501=>500,502=>944,503=>660,504=>722,505=>556,
-506=>667,507=>500,508=>944,509=>722,510=>722,511=>500,512=>667,513=>500,514=>667,515=>500,
-516=>670,517=>444,518=>670,519=>444,520=>393,521=>278,522=>393,523=>278,524=>722,525=>500,
-526=>722,527=>500,528=>672,529=>389,530=>672,531=>389,532=>722,533=>556,534=>722,535=>556,
-536=>556,537=>389,538=>611,539=>278,540=>424,541=>455,542=>778,543=>556,544=>731,545=>618,
-546=>568,547=>500,548=>667,549=>444,550=>667,551=>500,552=>670,553=>444,554=>722,555=>500,
-556=>722,557=>500,558=>722,559=>500,560=>722,561=>500,562=>611,563=>444,564=>422,565=>621,
-566=>413,567=>278,568=>800,569=>784,570=>644,571=>667,572=>444,573=>664,574=>611,575=>389,
-576=>451,577=>444,578=>444,579=>667,580=>722,581=>722,582=>670,583=>444,584=>500,585=>278,
-586=>808,587=>608,588=>672,589=>389,590=>611,591=>444,592=>500,593=>590,594=>590,595=>500,
-596=>444,599=>668,600=>444,601=>444,603=>430,608=>569,609=>500,613=>556,616=>278,617=>320,
-618=>278,623=>778,629=>500,633=>389,643=>333,648=>278,649=>500,650=>557,651=>492,652=>444,
-653=>667,654=>444,658=>513,670=>500,697=>250,698=>408,699=>250,700=>250,701=>250,702=>300,
-703=>300,706=>333,707=>333,708=>333,709=>333,711=>333,712=>333,713=>333,714=>333,715=>333,
-716=>300,717=>333,718=>333,719=>333,720=>278,721=>278,722=>300,723=>300,724=>333,725=>333,
-726=>333,727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>333,735=>352,741=>526,
-742=>526,743=>526,744=>526,745=>526,746=>519,747=>519,748=>333,749=>333,750=>480,751=>333,
-752=>333,753=>333,754=>333,755=>327,756=>261,757=>437,758=>437,759=>400,760=>278,761=>175,
-762=>175,763=>175,764=>175,765=>0,766=>337,767=>432,768=>0,769=>0,770=>0,771=>0,
-772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,778=>0,779=>0,780=>0,781=>0,
-782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,788=>0,789=>0,790=>0,791=>0,
-792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,798=>0,799=>0,800=>0,801=>0,
-802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,808=>0,809=>0,810=>0,811=>0,
-812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,818=>0,819=>0,820=>0,821=>0,
-822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,828=>0,829=>0,830=>0,831=>0,
-832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,838=>0,839=>0,840=>0,841=>0,
-842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,848=>0,849=>0,850=>0,851=>0,
-852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,858=>0,860=>0,861=>0,862=>0,
-863=>0,864=>0,865=>0,884=>199,885=>199,890=>0,894=>333,900=>330,901=>333,902=>667,
-903=>250,904=>819,905=>955,906=>539,908=>835,910=>961,911=>889,912=>320,913=>667,914=>667,
-915=>637,916=>740,917=>667,918=>611,919=>778,920=>722,921=>389,922=>677,923=>667,924=>889,
-925=>722,926=>650,927=>722,928=>778,929=>611,931=>730,932=>621,933=>722,934=>748,935=>667,
-936=>858,937=>741,938=>389,939=>722,940=>590,941=>430,942=>548,943=>320,944=>536,945=>590,
-946=>536,947=>548,948=>550,949=>430,950=>482,951=>548,952=>525,953=>320,954=>564,955=>510,
-956=>589,957=>522,958=>482,959=>536,960=>629,961=>536,962=>470,963=>536,964=>464,965=>536,
-966=>643,967=>482,968=>715,969=>715,970=>320,971=>536,972=>536,973=>536,974=>715,976=>508,
-977=>589,978=>722,979=>931,980=>722,981=>660,982=>715,983=>536,984=>611,985=>536,986=>620,
-987=>524,988=>667,989=>535,990=>708,991=>428,992=>671,993=>633,1008=>550,1009=>550,1010=>477,
-1011=>278,1012=>722,1013=>411,1014=>411,1015=>609,1016=>500,1017=>667,1018=>896,1019=>769,1020=>536,
-1021=>667,1022=>667,1023=>667,1024=>670,1025=>670,1026=>762,1027=>637,1028=>667,1029=>556,1030=>393,
-1031=>393,1032=>500,1033=>1085,1034=>1049,1035=>747,1036=>736,1037=>778,1038=>746,1039=>778,1040=>667,
-1041=>667,1042=>667,1043=>637,1044=>778,1045=>670,1046=>1044,1047=>650,1048=>778,1049=>778,1050=>736,
-1051=>814,1052=>896,1053=>778,1054=>722,1055=>778,1056=>614,1057=>667,1058=>611,1059=>746,1060=>748,
-1061=>667,1062=>778,1063=>742,1064=>1136,1065=>1135,1066=>779,1067=>984,1068=>664,1069=>732,1070=>1069,
-1071=>779,1072=>500,1073=>508,1074=>486,1075=>414,1076=>486,1077=>444,1078=>982,1079=>476,1080=>556,
-1081=>556,1082=>564,1083=>585,1084=>757,1085=>552,1086=>500,1087=>556,1088=>500,1089=>444,1090=>778,
-1091=>532,1092=>764,1093=>500,1094=>556,1095=>556,1096=>806,1097=>806,1098=>644,1099=>744,1100=>470,
-1101=>488,1102=>757,1103=>586,1104=>444,1105=>444,1106=>524,1107=>414,1108=>488,1109=>389,1110=>278,
-1111=>278,1112=>278,1113=>772,1114=>745,1115=>556,1116=>564,1117=>556,1118=>532,1119=>556,1120=>990,
-1121=>690,1122=>804,1123=>751,1124=>1017,1125=>752,1126=>900,1127=>728,1128=>1236,1129=>927,1130=>1044,
-1131=>826,1132=>1401,1133=>1016,1134=>620,1135=>476,1136=>858,1137=>769,1138=>722,1139=>544,1140=>796,
-1141=>584,1142=>796,1143=>584,1144=>1268,1145=>1023,1146=>895,1147=>612,1148=>990,1149=>690,1150=>990,
-1151=>635,1152=>620,1153=>444,1154=>372,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,
-1161=>0,1162=>778,1163=>556,1164=>664,1165=>470,1166=>614,1167=>473,1168=>624,1169=>448,1170=>624,
-1171=>448,1172=>733,1173=>485,1174=>1080,1175=>982,1176=>650,1177=>476,1178=>772,1179=>564,1180=>772,
-1181=>590,1182=>738,1183=>499,1184=>862,1185=>718,1186=>778,1187=>552,1188=>976,1189=>682,1190=>1085,
-1191=>787,1192=>667,1193=>480,1194=>667,1195=>444,1196=>534,1197=>778,1198=>611,1199=>640,1200=>611,
-1201=>640,1202=>694,1203=>500,1204=>1004,1205=>518,1206=>742,1207=>556,1208=>742,1209=>556,1210=>716,
-1211=>556,1212=>844,1213=>530,1214=>844,1215=>530,1216=>393,1217=>1044,1218=>982,1219=>736,1220=>534,
-1221=>814,1222=>585,1223=>778,1224=>552,1225=>778,1226=>552,1227=>742,1228=>556,1229=>896,1230=>757,
-1231=>393,1232=>667,1233=>500,1234=>667,1235=>500,1236=>891,1237=>646,1238=>670,1239=>444,1240=>659,
-1241=>372,1242=>619,1243=>372,1244=>1044,1245=>994,1246=>650,1247=>476,1248=>604,1249=>459,1250=>778,
-1251=>539,1252=>778,1253=>539,1254=>722,1255=>500,1256=>722,1257=>500,1258=>722,1259=>500,1260=>732,
-1261=>488,1262=>746,1263=>532,1264=>746,1265=>532,1266=>746,1267=>532,1268=>742,1269=>556,1270=>637,
-1271=>448,1272=>984,1273=>744,1296=>652,1297=>452,1298=>814,1299=>585,1306=>722,1307=>500,1308=>889,
-1309=>656,1310=>736,1311=>564,1425=>0,1426=>0,1427=>0,1428=>0,1429=>0,1430=>0,1431=>0,
-1432=>0,1433=>0,1434=>0,1435=>0,1436=>0,1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,
-1442=>0,1443=>0,1444=>0,1445=>0,1446=>0,1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,
-1452=>0,1453=>0,1454=>0,1455=>0,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,
-1462=>0,1463=>0,1464=>0,1465=>0,1466=>0,1467=>0,1468=>0,1469=>0,1470=>433,1471=>0,
-1472=>155,1473=>0,1474=>0,1475=>400,1476=>0,1477=>0,1478=>347,1479=>0,1488=>593,1489=>498,
-1490=>339,1491=>523,1492=>561,1493=>266,1494=>291,1495=>559,1496=>576,1497=>266,1498=>496,1499=>501,
-1500=>510,1501=>542,1502=>581,1503=>273,1504=>347,1505=>512,1506=>552,1507=>493,1508=>491,1509=>537,
-1510=>561,1511=>544,1512=>502,1513=>716,1514=>571,1520=>532,1521=>532,1522=>532,1523=>396,1524=>432,
-3585=>590,3586=>578,3587=>661,3588=>592,3589=>592,3590=>699,3591=>447,3592=>534,3593=>692,3594=>578,
-3595=>659,3596=>899,3597=>804,3598=>633,3599=>637,3600=>484,3601=>730,3602=>876,3603=>915,3604=>592,
-3605=>592,3606=>578,3607=>670,3608=>542,3609=>671,3610=>621,3611=>618,3612=>621,3613=>617,3614=>708,
-3615=>708,3616=>637,3617=>589,3618=>552,3619=>484,3620=>590,3621=>569,3622=>637,3623=>526,3624=>599,
-3625=>802,3626=>579,3627=>668,3628=>778,3629=>560,3630=>514,3631=>510,3632=>442,3633=>0,3634=>423,
-3635=>452,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,3647=>665,3648=>357,
-3649=>624,3650=>529,3651=>486,3652=>475,3653=>423,3654=>500,3655=>0,3656=>0,3657=>0,3658=>0,
-3659=>0,3660=>0,3661=>0,3662=>0,3663=>657,3664=>548,3665=>548,3666=>592,3667=>614,3668=>631,
-3669=>643,3670=>508,3671=>744,3672=>622,3673=>585,3674=>721,3675=>1381,4256=>475,4257=>469,4258=>573,
-4259=>650,4260=>502,4261=>506,4262=>481,4263=>746,4264=>491,4265=>495,4266=>888,4267=>488,4268=>464,
-4269=>745,4270=>483,4271=>489,4272=>721,4273=>464,4274=>578,4275=>590,4276=>611,4277=>491,4278=>663,
-4279=>489,4280=>544,4281=>479,4282=>527,4283=>488,4284=>560,4285=>461,4286=>467,4287=>546,4288=>483,
-4289=>487,4290=>562,4291=>477,4292=>491,4293=>471,4304=>522,4305=>518,4306=>621,4307=>716,4308=>517,
-4309=>519,4310=>518,4311=>796,4312=>518,4313=>518,4314=>934,4315=>517,4316=>519,4317=>787,4318=>515,
-4319=>514,4320=>788,4321=>573,4322=>620,4323=>593,4324=>639,4325=>516,4326=>714,4327=>518,4328=>572,
-4329=>518,4330=>555,4331=>518,4332=>562,4333=>509,4334=>572,4335=>677,4336=>523,4337=>517,4338=>595,
-4339=>480,4340=>519,4341=>484,4345=>621,4347=>410,5024=>718,5025=>768,5026=>633,5027=>878,5028=>1001,
-5029=>371,5030=>576,5031=>754,5032=>531,5033=>774,5034=>692,5035=>499,5036=>668,5037=>829,5038=>575,
-5039=>681,5040=>485,5041=>607,5042=>885,5043=>974,5044=>588,5045=>583,5046=>726,5047=>947,5048=>558,
-5049=>832,5050=>1096,5051=>780,5052=>595,5053=>869,5054=>752,5055=>710,5056=>761,5057=>802,5058=>760,
-5059=>656,5060=>655,5061=>982,5062=>684,5063=>801,5064=>805,5065=>1042,5066=>755,5067=>612,5068=>707,
-5069=>889,5070=>584,5071=>623,5072=>536,5073=>763,5074=>763,5075=>498,5076=>1052,5077=>600,5078=>730,
-5079=>714,5080=>714,5081=>697,5082=>543,5083=>943,5084=>718,5085=>630,5086=>660,5087=>692,5088=>841,
-5089=>861,5090=>617,5091=>733,5092=>898,5093=>896,5094=>781,5095=>612,5096=>830,5097=>948,5098=>886,
-5099=>757,5100=>796,5101=>578,5102=>601,5103=>797,5104=>623,5105=>886,5106=>730,5107=>827,5108=>648,
-7680=>667,7681=>500,7682=>667,7683=>500,7684=>667,7685=>500,7686=>667,7687=>500,7688=>667,7689=>444,
-7690=>744,7691=>500,7692=>744,7693=>500,7694=>744,7695=>500,7696=>744,7697=>500,7698=>744,7699=>500,
-7700=>667,7701=>444,7702=>667,7703=>444,7704=>670,7705=>444,7706=>670,7707=>444,7708=>670,7709=>444,
-7710=>656,7711=>333,7712=>722,7713=>500,7714=>778,7715=>556,7716=>778,7717=>556,7718=>778,7719=>556,
-7720=>778,7721=>556,7722=>778,7723=>556,7724=>393,7725=>278,7726=>389,7727=>278,7728=>664,7729=>500,
-7730=>664,7731=>500,7732=>664,7733=>500,7734=>609,7735=>278,7736=>609,7737=>278,7738=>609,7739=>278,
-7740=>609,7741=>278,7742=>896,7743=>778,7744=>896,7745=>778,7746=>896,7747=>778,7748=>722,7749=>556,
-7750=>722,7751=>556,7752=>722,7753=>556,7754=>722,7755=>556,7756=>722,7757=>500,7758=>722,7759=>500,
-7760=>722,7761=>500,7762=>722,7763=>500,7764=>614,7765=>500,7766=>614,7767=>500,7768=>672,7769=>389,
-7770=>672,7771=>389,7772=>672,7773=>389,7774=>672,7775=>389,7776=>556,7777=>389,7778=>556,7779=>389,
-7780=>556,7781=>389,7782=>556,7783=>389,7784=>556,7785=>389,7786=>611,7787=>278,7788=>611,7789=>278,
-7790=>611,7791=>278,7792=>611,7793=>278,7794=>722,7795=>556,7796=>722,7797=>556,7798=>722,7799=>556,
-7800=>722,7801=>556,7802=>722,7803=>556,7804=>667,7805=>444,7806=>667,7807=>444,7808=>889,7809=>667,
-7810=>889,7811=>667,7812=>889,7813=>667,7814=>889,7815=>667,7816=>889,7817=>667,7818=>667,7819=>500,
-7820=>667,7821=>500,7822=>611,7823=>444,7824=>611,7825=>389,7826=>611,7827=>389,7828=>611,7829=>389,
-7830=>556,7831=>278,7832=>667,7833=>444,7834=>507,7835=>333,7840=>667,7841=>500,7842=>667,7843=>500,
-7844=>667,7845=>500,7846=>667,7847=>500,7848=>667,7849=>500,7850=>667,7851=>500,7852=>667,7853=>500,
-7854=>667,7855=>500,7856=>667,7857=>500,7858=>667,7859=>500,7860=>667,7861=>500,7862=>667,7863=>500,
-7864=>670,7865=>444,7866=>670,7867=>444,7868=>670,7869=>444,7870=>667,7871=>444,7872=>667,7873=>444,
-7874=>667,7875=>444,7876=>667,7877=>444,7878=>670,7879=>444,7880=>393,7881=>278,7882=>393,7883=>278,
-7884=>722,7885=>500,7886=>722,7887=>500,7888=>722,7889=>500,7890=>722,7891=>500,7892=>722,7893=>500,
-7894=>722,7895=>500,7896=>722,7897=>500,7898=>908,7899=>640,7900=>908,7901=>640,7902=>908,7903=>640,
-7904=>908,7905=>640,7906=>908,7907=>640,7908=>722,7909=>556,7910=>722,7911=>556,7912=>902,7913=>714,
-7914=>902,7915=>714,7916=>902,7917=>714,7918=>902,7919=>714,7920=>902,7921=>714,7922=>611,7923=>444,
-7924=>611,7925=>444,7926=>611,7927=>444,7928=>611,7929=>444,7936=>590,7937=>590,7938=>590,7939=>590,
-7940=>590,7941=>590,7942=>590,7943=>590,7944=>724,7945=>753,7946=>891,7947=>912,7948=>822,7949=>853,
-7950=>796,7951=>787,7952=>430,7953=>430,7954=>430,7955=>430,7956=>430,7957=>430,7960=>864,7961=>905,
-7962=>1034,7963=>1038,7964=>1031,7965=>1045,7968=>548,7969=>548,7970=>548,7971=>548,7972=>548,7973=>548,
-7974=>548,7975=>548,7976=>976,7977=>1009,7978=>1132,7979=>1141,7980=>1138,7981=>1154,7982=>1079,7983=>1071,
-7984=>320,7985=>320,7986=>320,7987=>320,7988=>320,7989=>320,7990=>320,7991=>320,7992=>593,7993=>620,
-7994=>746,7995=>762,7996=>742,7997=>773,7998=>691,7999=>683,8000=>536,8001=>536,8002=>536,8003=>536,
-8004=>536,8005=>536,8008=>899,8009=>928,8010=>1086,8011=>1118,8012=>1020,8013=>1028,8016=>536,8017=>536,
-8018=>536,8019=>536,8020=>536,8021=>536,8022=>536,8023=>536,8025=>959,8027=>1085,8029=>1108,8031=>1027,
-8032=>715,8033=>715,8034=>715,8035=>715,8036=>715,8037=>715,8038=>715,8039=>715,8040=>946,8041=>960,
-8042=>1133,8043=>1148,8044=>1059,8045=>1081,8046=>1020,8047=>1016,8048=>590,8049=>590,8050=>430,8051=>430,
-8052=>548,8053=>548,8054=>320,8055=>320,8056=>536,8057=>536,8058=>536,8059=>536,8060=>715,8061=>715,
-8064=>590,8065=>590,8066=>590,8067=>590,8068=>590,8069=>590,8070=>590,8071=>590,8072=>842,8073=>877,
-8074=>1011,8075=>1031,8076=>947,8077=>975,8078=>907,8079=>893,8080=>548,8081=>548,8082=>548,8083=>548,
-8084=>548,8085=>548,8086=>548,8087=>548,8088=>1030,8089=>1066,8090=>1188,8091=>1199,8092=>1196,8093=>1211,
-8094=>1134,8095=>1129,8096=>715,8097=>715,8098=>715,8099=>715,8100=>715,8101=>715,8102=>715,8103=>715,
-8104=>1060,8105=>1076,8106=>1264,8107=>1287,8108=>1179,8109=>1204,8110=>1137,8111=>1135,8112=>590,8113=>590,
-8114=>590,8115=>590,8116=>590,8118=>590,8119=>590,8120=>667,8121=>667,8122=>752,8123=>728,8124=>775,
-8125=>250,8126=>0,8127=>500,8128=>500,8129=>550,8130=>548,8131=>548,8132=>548,8134=>548,8135=>548,
-8136=>884,8137=>859,8138=>982,8139=>968,8140=>839,8141=>500,8142=>500,8143=>500,8144=>320,8145=>320,
-8146=>320,8147=>320,8150=>320,8151=>320,8152=>389,8153=>389,8154=>599,8155=>592,8157=>500,8158=>500,
-8159=>500,8160=>536,8161=>536,8162=>536,8163=>536,8164=>536,8165=>536,8166=>536,8167=>536,8168=>722,
-8169=>722,8170=>1007,8171=>932,8172=>842,8173=>550,8174=>550,8175=>500,8178=>715,8179=>715,8180=>715,
-8182=>715,8183=>715,8184=>971,8185=>853,8186=>1004,8187=>875,8188=>862,8189=>500,8190=>500,8192=>500,
-8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>500,8200=>250,8201=>200,8202=>100,
-8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>500,8213=>1000,8214=>333,
-8215=>478,8219=>250,8223=>500,8227=>560,8228=>250,8229=>478,8231=>0,8232=>0,8233=>0,8234=>0,
-8235=>0,8236=>0,8237=>0,8238=>250,8239=>0,8241=>1618,8242=>278,8243=>556,8244=>834,8245=>270,
-8246=>468,8247=>630,8248=>469,8251=>727,8252=>778,8253=>733,8254=>500,8255=>953,8256=>953,8257=>338,
-8258=>931,8259=>333,8260=>167,8261=>332,8262=>332,8263=>1000,8264=>889,8265=>889,8266=>500,8267=>453,
-8268=>479,8269=>492,8270=>500,8271=>333,8272=>953,8273=>500,8274=>521,8275=>576,8276=>953,8277=>785,
-8278=>410,8279=>881,8280=>620,8281=>620,8282=>179,8283=>621,8284=>569,8285=>179,8286=>179,8287=>111,
-8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>300,8305=>219,8308=>300,8309=>300,8310=>300,
-8311=>300,8312=>300,8313=>300,8314=>300,8315=>300,8316=>300,8317=>216,8318=>216,8319=>300,8320=>300,
-8321=>274,8322=>300,8323=>300,8324=>300,8325=>300,8326=>300,8327=>300,8328=>300,8329=>300,8330=>300,
-8331=>300,8332=>300,8333=>216,8334=>216,8352=>667,8353=>667,8354=>667,8355=>667,8356=>500,8357=>742,
-8358=>722,8359=>1008,8360=>953,8361=>889,8362=>889,8363=>532,8365=>742,8366=>631,8369=>609,8370=>639,
-8371=>742,8372=>576,8373=>500,8448=>664,8449=>665,8451=>925,8453=>693,8454=>787,8455=>631,8457=>867,
-8462=>556,8463=>556,8468=>778,8470=>806,8471=>747,8480=>879,8481=>1050,8483=>667,8486=>741,8487=>741,
-8489=>320,8490=>664,8491=>667,8494=>551,8495=>444,8498=>667,8500=>500,8501=>537,8502=>537,8503=>350,
-8504=>537,8506=>942,8507=>1050,8523=>698,8525=>856,8526=>462,8531=>750,8532=>750,8533=>750,8534=>750,
-8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,8541=>750,8542=>750,8543=>750,8544=>393,
-8545=>786,8546=>1179,8547=>1060,8548=>667,8549=>1060,8550=>1453,8551=>1846,8552=>1060,8553=>667,8554=>1060,
-8555=>1453,8556=>609,8557=>667,8558=>744,8559=>896,8560=>278,8561=>556,8562=>834,8563=>722,8564=>444,
-8565=>722,8566=>1000,8567=>1278,8568=>778,8569=>500,8570=>778,8571=>1056,8572=>278,8573=>444,8574=>500,
-8575=>778,8592=>964,8593=>964,8594=>964,8595=>964,8596=>964,8597=>964,8598=>964,8599=>964,8600=>964,
-8601=>964,8602=>964,8603=>964,8606=>964,8607=>964,8608=>964,8609=>964,8610=>964,8611=>964,8612=>964,
-8613=>964,8614=>964,8615=>964,8616=>964,8633=>964,8634=>964,8644=>964,8645=>964,8646=>964,8647=>964,
-8648=>964,8649=>964,8650=>964,8676=>964,8677=>964,8706=>494,8710=>612,8721=>713,8722=>606,8725=>750,
-8730=>549,8734=>752,8800=>570,8804=>570,8805=>570,9251=>500,9674=>494,9676=>732,9824=>618,9825=>645,
-9826=>587,9827=>582,9828=>582,9829=>645,9830=>587,9831=>618,9833=>333,9834=>556,9835=>778,9836=>778,
-9837=>556,9838=>556,9839=>556,11799=>333,64256=>583,64257=>558,64258=>551,64259=>822,64260=>818,64262=>662,
-64285=>266,64286=>0,64287=>532,64288=>552,64297=>570,64298=>716,64299=>716,64300=>716,64301=>716,64302=>593,
-64303=>593,64304=>593,64305=>498,64306=>339,64307=>523,64308=>561,64309=>266,64310=>291,64312=>576,64313=>266,
-64314=>496,64315=>501,64316=>510,64318=>581,64320=>347,64321=>512,64323=>493,64324=>491,64326=>561,64327=>544,
-64328=>502,64329=>716,64330=>571,64331=>266,64332=>498,64333=>501,64334=>491,64335=>593,65533=>788);
-$enc='';
-$diff='';
-$file='freeserifbi.z';
-$ctg='freeserifbi.ctg.z';
-$originalsize=452752;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifi.php
deleted file mode 100644
index 93853603a6d..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/freeserifi.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-$type='TrueTypeUnicode';
-$name='FreeSerifItalic';
-$desc=array('Ascent'=>900,'Descent'=>-300,'CapHeight'=>-29,'Flags'=>96,'FontBBox'=>'[-879 -434 1673 900]','ItalicAngle'=>-16.5,'StemV'=>70,'MissingWidth'=>600);
-$up=-125;
-$ut=50;
-$dw=600;
-$cw=array(
-32=>250,33=>333,34=>420,35=>500,36=>500,37=>833,38=>778,39=>214,40=>333,41=>333,
-42=>500,43=>675,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,50=>500,51=>500,
-52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,60=>675,61=>675,
-62=>675,63=>500,64=>920,65=>611,66=>611,67=>667,68=>722,69=>604,70=>611,71=>722,
-72=>722,73=>339,74=>444,75=>652,76=>556,77=>828,78=>657,79=>722,80=>603,81=>722,
-82=>616,83=>500,84=>556,85=>722,86=>611,87=>833,88=>611,89=>556,90=>556,91=>389,
-92=>278,93=>389,94=>422,95=>500,96=>333,97=>500,98=>500,99=>444,100=>500,101=>444,
-102=>278,103=>500,104=>500,105=>278,106=>278,107=>444,108=>278,109=>722,110=>500,111=>500,
-112=>500,113=>500,114=>389,115=>389,116=>278,117=>500,118=>444,119=>667,120=>444,121=>444,
-122=>389,123=>400,124=>275,125=>400,126=>541,8364=>741,8218=>250,402=>278,8222=>444,8230=>889,
-8224=>500,8225=>500,710=>333,8240=>1000,352=>500,8249=>250,338=>944,381=>556,8216=>250,8217=>250,
-8220=>444,8221=>444,8226=>350,8211=>500,8212=>1000,732=>333,8482=>980,353=>389,8250=>250,339=>667,
-382=>389,376=>556,160=>250,161=>389,162=>500,163=>500,164=>500,165=>500,166=>275,167=>500,
-168=>333,169=>760,170=>276,171=>444,172=>675,173=>333,174=>760,175=>333,176=>400,177=>675,
-178=>300,179=>300,180=>333,181=>500,182=>523,183=>250,184=>333,185=>250,186=>310,187=>444,
-188=>750,189=>750,190=>750,191=>500,192=>611,193=>611,194=>611,195=>611,196=>611,197=>611,
-198=>889,199=>667,200=>611,201=>611,202=>611,203=>611,204=>333,205=>333,206=>333,207=>333,
-208=>722,209=>667,210=>722,211=>722,212=>722,213=>722,214=>722,215=>675,216=>722,217=>722,
-218=>722,219=>722,220=>722,221=>556,222=>611,223=>500,224=>500,225=>500,226=>500,227=>500,
-228=>500,229=>500,230=>667,231=>444,232=>444,233=>444,234=>444,235=>444,236=>278,237=>278,
-238=>278,239=>278,240=>500,241=>500,242=>500,243=>500,244=>500,245=>500,246=>500,247=>675,
-248=>500,249=>500,250=>500,251=>500,252=>500,253=>444,254=>500,255=>444,256=>611,257=>500,
-258=>611,259=>500,260=>611,261=>500,262=>667,263=>444,264=>667,265=>444,266=>667,267=>444,
-268=>667,269=>444,270=>722,271=>500,272=>722,273=>500,274=>611,275=>444,276=>611,277=>444,
-278=>611,279=>444,280=>611,281=>444,282=>611,283=>444,284=>722,285=>500,286=>722,287=>500,
-288=>722,289=>500,290=>722,291=>500,292=>722,293=>500,294=>722,295=>500,296=>333,297=>278,
-298=>333,299=>278,300=>333,301=>278,302=>333,303=>278,304=>333,305=>278,306=>707,307=>553,
-308=>444,309=>278,310=>667,311=>444,312=>444,313=>556,314=>278,315=>556,316=>278,317=>556,
-318=>278,319=>556,320=>278,321=>556,322=>278,323=>667,324=>500,325=>667,326=>500,327=>667,
-328=>500,329=>500,330=>667,331=>500,332=>722,333=>500,334=>722,335=>500,336=>722,337=>500,
-340=>611,341=>389,342=>611,343=>389,344=>611,345=>389,346=>500,347=>389,348=>500,349=>389,
-350=>500,351=>389,354=>556,355=>278,356=>556,357=>278,358=>556,359=>278,360=>722,361=>500,
-362=>722,363=>500,364=>722,365=>500,366=>722,367=>500,368=>722,369=>500,370=>722,371=>500,
-372=>833,373=>667,374=>556,375=>444,377=>556,378=>389,379=>556,380=>389,383=>278,384=>500,
-385=>781,386=>610,387=>551,388=>611,389=>549,390=>667,391=>866,392=>703,393=>722,394=>892,
-395=>682,396=>500,397=>520,398=>611,399=>722,400=>518,401=>611,403=>863,404=>611,405=>728,
-406=>278,407=>333,408=>792,409=>444,410=>278,411=>480,412=>900,413=>779,414=>500,415=>722,
-416=>932,417=>608,418=>908,419=>722,420=>772,421=>500,422=>611,423=>500,424=>389,425=>657,
-426=>461,427=>313,428=>556,429=>335,430=>556,431=>948,432=>721,433=>747,434=>755,435=>636,
-436=>549,437=>556,438=>389,439=>525,440=>556,441=>424,442=>416,443=>500,444=>615,445=>439,
-446=>389,447=>500,448=>275,449=>500,450=>600,451=>333,452=>1278,453=>1111,454=>889,455=>1000,
-456=>834,457=>556,458=>1101,459=>935,460=>778,461=>611,462=>500,463=>339,464=>278,465=>722,
-466=>500,467=>722,468=>500,469=>722,470=>500,471=>722,472=>500,473=>722,474=>500,475=>722,
-476=>500,477=>444,478=>611,479=>500,480=>611,481=>500,482=>889,483=>667,484=>722,485=>500,
-486=>722,487=>500,488=>652,489=>444,490=>730,491=>500,492=>730,493=>500,494=>525,495=>446,
-496=>278,497=>1278,498=>1111,499=>889,500=>817,501=>595,502=>944,503=>607,504=>657,505=>500,
-506=>611,507=>500,508=>889,509=>667,510=>722,511=>500,512=>611,513=>500,514=>611,515=>500,
-516=>604,517=>444,518=>604,519=>444,520=>339,521=>278,522=>339,523=>278,524=>722,525=>500,
-526=>722,527=>500,528=>616,529=>389,530=>616,531=>389,532=>722,533=>500,534=>722,535=>500,
-536=>500,537=>389,538=>556,539=>278,540=>424,541=>455,542=>722,543=>500,544=>781,545=>588,
-546=>568,547=>468,548=>611,549=>444,550=>611,551=>500,552=>604,553=>444,554=>722,555=>500,
-556=>722,557=>500,558=>722,559=>500,560=>722,561=>500,562=>556,563=>444,564=>405,565=>597,
-566=>377,567=>278,568=>775,569=>767,570=>722,571=>667,572=>444,573=>611,574=>611,575=>389,
-576=>444,577=>444,578=>444,579=>667,580=>750,581=>697,582=>611,583=>444,584=>389,585=>278,
-586=>796,587=>590,588=>667,589=>333,590=>722,591=>500,592=>500,593=>564,594=>564,595=>500,
-596=>444,597=>444,598=>500,599=>697,600=>444,601=>444,602=>722,603=>416,604=>426,605=>674,
-606=>454,607=>278,608=>640,609=>500,610=>484,611=>500,612=>582,613=>500,614=>500,615=>500,
-616=>278,617=>278,618=>278,619=>278,620=>278,621=>278,622=>556,623=>722,624=>722,625=>716,
-626=>500,627=>500,628=>500,629=>500,630=>668,631=>693,632=>640,633=>389,634=>389,635=>333,
-636=>389,637=>333,638=>333,639=>333,640=>487,641=>487,642=>389,643=>278,644=>500,645=>333,
-646=>500,647=>278,648=>278,649=>500,650=>517,651=>500,652=>444,653=>667,654=>444,655=>510,
-656=>524,657=>444,658=>446,659=>456,660=>444,661=>444,662=>444,663=>444,664=>722,665=>442,
-666=>454,667=>665,668=>585,669=>347,670=>444,671=>443,672=>500,673=>444,674=>444,675=>798,
-676=>795,677=>805,678=>554,679=>561,680=>678,681=>614,682=>554,683=>554,684=>500,685=>500,
-686=>611,687=>611,688=>300,689=>300,690=>278,691=>278,692=>278,693=>309,694=>306,695=>432,
-696=>310,697=>250,698=>408,699=>333,700=>500,701=>500,702=>333,703=>333,704=>258,705=>258,
-706=>374,707=>374,708=>383,709=>383,711=>333,712=>250,713=>333,714=>333,715=>333,716=>250,
-717=>333,718=>333,719=>333,720=>278,721=>278,722=>333,723=>333,724=>333,725=>333,726=>333,
-727=>333,728=>333,729=>333,730=>333,731=>333,733=>333,734=>336,735=>352,736=>311,737=>200,
-738=>243,739=>328,740=>300,741=>460,742=>460,743=>460,744=>460,745=>460,746=>477,747=>475,
-748=>339,749=>330,750=>444,751=>383,752=>383,753=>294,754=>294,755=>327,756=>261,757=>437,
-758=>437,759=>333,760=>278,761=>175,762=>175,763=>175,764=>175,765=>337,766=>337,767=>326,
-768=>0,769=>0,770=>0,771=>0,772=>0,773=>0,774=>0,775=>0,776=>0,777=>0,
-778=>0,779=>0,780=>0,781=>0,782=>0,783=>0,784=>0,785=>0,786=>0,787=>0,
-788=>0,789=>0,790=>0,791=>0,792=>0,793=>0,794=>0,795=>0,796=>0,797=>0,
-798=>0,799=>0,800=>0,801=>0,802=>0,803=>0,804=>0,805=>0,806=>0,807=>0,
-808=>0,809=>0,810=>0,811=>0,812=>0,813=>0,814=>0,815=>0,816=>0,817=>0,
-818=>0,819=>0,820=>0,821=>0,822=>0,823=>0,824=>0,825=>0,826=>0,827=>0,
-828=>0,829=>0,830=>0,831=>0,832=>0,833=>0,834=>0,835=>0,836=>0,837=>0,
-838=>0,839=>0,840=>0,841=>0,842=>0,843=>0,844=>0,845=>0,846=>0,847=>0,
-848=>0,849=>0,850=>0,851=>0,852=>0,853=>0,854=>0,855=>0,856=>0,857=>0,
-858=>0,859=>0,860=>0,861=>0,862=>0,863=>0,864=>0,865=>0,866=>0,867=>0,
-868=>0,869=>0,870=>0,871=>0,872=>0,873=>0,874=>0,875=>0,876=>0,877=>0,
-878=>0,879=>0,884=>199,885=>199,890=>332,894=>333,900=>257,901=>333,902=>661,903=>250,
-904=>841,905=>950,906=>559,908=>815,910=>877,911=>899,912=>270,913=>661,914=>581,915=>611,
-916=>660,917=>611,918=>606,919=>742,920=>672,921=>333,922=>667,923=>641,924=>833,925=>657,
-926=>678,927=>682,928=>749,929=>611,931=>657,932=>596,933=>676,934=>722,935=>611,936=>812,
-937=>743,938=>333,939=>696,940=>564,941=>416,942=>506,943=>270,944=>504,945=>564,946=>509,
-947=>496,948=>520,949=>416,950=>398,951=>506,952=>533,953=>270,954=>491,955=>488,956=>501,
-957=>486,958=>430,959=>510,960=>608,961=>506,962=>423,963=>524,964=>425,965=>504,966=>618,
-967=>459,968=>693,969=>693,970=>270,971=>504,972=>510,973=>504,974=>693,976=>534,977=>587,
-978=>620,979=>820,980=>620,981=>640,982=>684,983=>504,984=>555,985=>534,986=>548,987=>496,
-988=>610,989=>470,990=>633,991=>410,992=>687,993=>544,1008=>534,1009=>534,1010=>485,1011=>278,
-1012=>722,1013=>280,1014=>280,1015=>610,1016=>500,1017=>704,1018=>832,1019=>703,1020=>533,1021=>704,
-1022=>704,1023=>704,1024=>604,1025=>604,1026=>668,1027=>611,1028=>666,1029=>500,1030=>339,1031=>339,
-1032=>444,1033=>972,1034=>977,1035=>703,1036=>664,1037=>720,1038=>728,1039=>728,1040=>611,1041=>610,
-1042=>611,1043=>611,1044=>682,1045=>604,1046=>976,1047=>592,1048=>720,1049=>720,1050=>664,1051=>719,
-1052=>828,1053=>722,1054=>722,1055=>749,1056=>603,1057=>667,1058=>556,1059=>728,1060=>722,1061=>611,
-1062=>728,1063=>666,1064=>997,1065=>1005,1066=>710,1067=>891,1068=>594,1069=>632,1070=>1024,1071=>696,
-1072=>500,1073=>500,1074=>442,1075=>344,1076=>503,1077=>440,1078=>932,1079=>402,1080=>500,1081=>500,
-1082=>491,1083=>487,1084=>624,1085=>500,1086=>500,1087=>500,1088=>500,1089=>441,1090=>722,1091=>500,
-1092=>741,1093=>444,1094=>500,1095=>500,1096=>750,1097=>750,1098=>545,1099=>683,1100=>433,1101=>432,
-1102=>700,1103=>503,1104=>440,1105=>440,1106=>500,1107=>344,1108=>442,1109=>389,1110=>278,1111=>278,
-1112=>278,1113=>686,1114=>696,1115=>500,1116=>491,1117=>500,1118=>500,1119=>500,1120=>964,1121=>684,
-1122=>708,1123=>690,1124=>975,1125=>646,1126=>800,1127=>628,1128=>1096,1129=>795,1130=>952,1131=>730,
-1132=>1260,1133=>892,1134=>574,1135=>400,1136=>812,1137=>694,1138=>721,1139=>500,1140=>745,1141=>533,
-1142=>745,1143=>533,1144=>1193,1145=>967,1146=>868,1147=>602,1148=>964,1149=>684,1150=>964,1151=>684,
-1152=>548,1153=>443,1154=>320,1155=>0,1156=>0,1157=>0,1158=>0,1159=>0,1160=>0,1161=>0,
-1162=>720,1163=>500,1164=>602,1165=>433,1166=>611,1167=>500,1168=>552,1169=>424,1170=>593,1171=>424,
-1172=>611,1173=>432,1174=>992,1175=>932,1176=>592,1177=>396,1178=>681,1179=>491,1180=>700,1181=>532,
-1182=>664,1183=>491,1184=>776,1185=>690,1186=>729,1187=>500,1188=>908,1189=>660,1190=>1034,1191=>694,
-1192=>667,1193=>531,1194=>666,1195=>443,1196=>556,1197=>775,1198=>556,1199=>574,1200=>555,1201=>574,
-1202=>660,1203=>443,1204=>798,1205=>581,1206=>674,1207=>500,1208=>690,1209=>516,1210=>640,1211=>500,
-1212=>785,1213=>558,1214=>787,1215=>559,1216=>339,1217=>976,1218=>932,1219=>664,1220=>491,1221=>719,
-1222=>487,1223=>722,1224=>500,1225=>722,1226=>500,1227=>666,1228=>500,1229=>828,1230=>624,1231=>339,
-1232=>611,1233=>500,1234=>611,1235=>500,1236=>889,1237=>667,1238=>604,1239=>444,1240=>722,1241=>444,
-1242=>722,1243=>444,1244=>976,1245=>932,1246=>592,1247=>402,1248=>525,1249=>446,1250=>720,1251=>500,
-1252=>720,1253=>500,1254=>722,1255=>500,1256=>722,1257=>500,1258=>722,1259=>500,1260=>632,1261=>432,
-1262=>728,1263=>500,1264=>728,1265=>500,1266=>728,1267=>500,1268=>666,1269=>500,1270=>611,1271=>424,
-1272=>891,1273=>683,1296=>532,1297=>409,1298=>719,1299=>487,1306=>722,1307=>500,1308=>833,1309=>656,
-1310=>664,1311=>491,1425=>0,1426=>0,1427=>0,1428=>0,1429=>0,1430=>0,1431=>418,1432=>0,
-1433=>0,1434=>0,1435=>0,1436=>0,1437=>0,1438=>0,1439=>0,1440=>0,1441=>0,1442=>0,
-1443=>0,1444=>0,1445=>0,1446=>0,1447=>0,1448=>0,1449=>0,1450=>0,1451=>0,1452=>0,
-1453=>0,1454=>0,1455=>0,1456=>0,1457=>0,1458=>0,1459=>0,1460=>0,1461=>0,1462=>0,
-1463=>0,1464=>0,1465=>0,1466=>0,1467=>0,1468=>0,1469=>0,1470=>440,1471=>0,1472=>126,
-1473=>0,1474=>0,1475=>418,1476=>0,1477=>0,1478=>350,1479=>0,1488=>537,1489=>537,1490=>350,
-1491=>537,1492=>537,1493=>350,1494=>350,1495=>537,1496=>537,1497=>350,1498=>537,1499=>537,1500=>537,
-1501=>537,1502=>537,1503=>350,1504=>350,1505=>537,1506=>537,1507=>537,1508=>537,1509=>537,1510=>537,
-1511=>537,1512=>537,1513=>537,1514=>537,1520=>537,1521=>537,1522=>537,1523=>396,1524=>396,2404=>318,
-2405=>446,2433=>0,2434=>300,2435=>312,2437=>594,2438=>776,2439=>469,2440=>513,2441=>535,2442=>561,
-2443=>604,2444=>481,2447=>580,2448=>604,2451=>540,2452=>620,2453=>570,2454=>485,2455=>484,2456=>471,
-2457=>457,2458=>408,2459=>452,2460=>591,2461=>551,2462=>771,2463=>414,2464=>404,2465=>522,2466=>415,
-2467=>450,2468=>551,2469=>477,2470=>478,2471=>449,2472=>448,2474=>535,2475=>611,2476=>443,2477=>534,
-2478=>492,2479=>474,2480=>442,2482=>542,2486=>507,2487=>467,2488=>523,2489=>419,2492=>0,2493=>419,
-2494=>202,2495=>189,2496=>202,2497=>0,2498=>0,2499=>0,2500=>0,2503=>294,2504=>289,2507=>774,
-2508=>825,2509=>0,2510=>356,2519=>219,2524=>523,2525=>420,2527=>469,2528=>604,2529=>481,2530=>0,
-2531=>0,2534=>500,2535=>437,2536=>479,2537=>507,2538=>497,2539=>500,2540=>482,2541=>503,2542=>517,
-2543=>481,2544=>443,2545=>443,2546=>429,2547=>383,2548=>432,2549=>478,2550=>539,2551=>158,2552=>365,
-2553=>280,2554=>357,3585=>512,3586=>453,3587=>512,3588=>519,3589=>529,3590=>561,3591=>411,3592=>437,
-3593=>552,3594=>452,3595=>509,3596=>707,3597=>707,3598=>574,3599=>570,3600=>406,3601=>607,3602=>686,
-3603=>749,3604=>494,3605=>497,3606=>509,3607=>552,3608=>461,3609=>565,3610=>527,3611=>523,3612=>556,
-3613=>551,3614=>570,3615=>570,3616=>571,3617=>531,3618=>493,3619=>433,3620=>513,3621=>491,3622=>571,
-3623=>439,3624=>510,3625=>594,3626=>484,3627=>554,3628=>616,3629=>493,3630=>496,3631=>417,3632=>392,
-3633=>0,3634=>366,3635=>366,3636=>0,3637=>0,3638=>0,3639=>0,3640=>0,3641=>0,3642=>0,
-3647=>662,3648=>297,3649=>544,3650=>298,3651=>329,3652=>328,3653=>326,3654=>488,3655=>0,3656=>0,
-3657=>0,3658=>0,3659=>0,3660=>0,3661=>0,3662=>0,3663=>725,3664=>624,3665=>624,3666=>624,
-3667=>624,3668=>624,3669=>624,3670=>624,3671=>624,3672=>624,3673=>624,3674=>645,3675=>872,4256=>453,
-4257=>448,4258=>546,4259=>619,4260=>478,4261=>481,4262=>459,4263=>707,4264=>467,4265=>471,4266=>842,
-4267=>464,4268=>443,4269=>707,4270=>460,4271=>465,4272=>686,4273=>440,4274=>550,4275=>561,4276=>580,
-4277=>467,4278=>630,4279=>466,4280=>517,4281=>456,4282=>502,4283=>464,4284=>534,4285=>440,4286=>443,
-4287=>522,4288=>460,4289=>463,4290=>536,4291=>455,4292=>468,4293=>449,4304=>454,4305=>452,4306=>544,
-4307=>629,4308=>451,4309=>452,4310=>452,4311=>702,4312=>451,4313=>452,4314=>820,4315=>451,4316=>453,
-4317=>695,4318=>449,4319=>448,4320=>694,4321=>501,4322=>544,4323=>517,4324=>560,4325=>450,4326=>627,
-4327=>452,4328=>491,4329=>452,4330=>485,4331=>452,4332=>485,4333=>443,4334=>500,4335=>582,4336=>455,
-4337=>451,4338=>480,4339=>414,4340=>453,4341=>418,4345=>544,4347=>410,5024=>711,5025=>678,5026=>604,
-5027=>667,5028=>796,5029=>301,5030=>516,5031=>544,5032=>457,5033=>716,5034=>703,5035=>383,5036=>628,
-5037=>709,5038=>455,5039=>601,5040=>472,5041=>574,5042=>730,5043=>939,5044=>498,5045=>528,5046=>667,
-5047=>891,5048=>505,5049=>792,5050=>957,5051=>725,5052=>595,5053=>733,5054=>698,5055=>638,5056=>720,
-5057=>732,5058=>624,5059=>638,5060=>565,5061=>903,5062=>655,5063=>681,5064=>675,5065=>949,5066=>683,
-5067=>547,5068=>693,5069=>732,5070=>529,5071=>569,5072=>536,5073=>677,5074=>631,5075=>382,5076=>973,
-5077=>543,5078=>607,5079=>652,5080=>652,5081=>693,5082=>514,5083=>803,5084=>658,5085=>597,5086=>627,
-5087=>659,5088=>679,5089=>706,5090=>563,5091=>618,5092=>767,5093=>776,5094=>731,5095=>492,5096=>808,
-5097=>823,5098=>796,5099=>689,5100=>716,5101=>518,5102=>521,5103=>719,5104=>563,5105=>776,5106=>634,
-5107=>822,5108=>621,7680=>611,7681=>500,7682=>611,7683=>500,7684=>611,7685=>500,7686=>611,7687=>500,
-7688=>667,7689=>444,7690=>722,7691=>500,7692=>722,7693=>500,7694=>722,7695=>500,7696=>722,7697=>500,
-7698=>722,7699=>500,7700=>611,7701=>444,7702=>611,7703=>444,7704=>604,7705=>444,7706=>604,7707=>444,
-7708=>604,7709=>444,7710=>611,7711=>278,7712=>722,7713=>500,7714=>722,7715=>500,7716=>722,7717=>500,
-7718=>722,7719=>500,7720=>722,7721=>500,7722=>722,7723=>500,7724=>339,7725=>278,7726=>333,7727=>278,
-7728=>652,7729=>444,7730=>652,7731=>444,7732=>652,7733=>444,7734=>556,7735=>278,7736=>556,7737=>278,
-7738=>556,7739=>278,7740=>556,7741=>278,7742=>828,7743=>722,7744=>828,7745=>722,7746=>828,7747=>722,
-7748=>657,7749=>500,7750=>657,7751=>500,7752=>657,7753=>500,7754=>657,7755=>500,7756=>722,7757=>500,
-7758=>722,7759=>500,7760=>722,7761=>500,7762=>722,7763=>500,7764=>603,7765=>500,7766=>603,7767=>500,
-7768=>616,7769=>389,7770=>616,7771=>389,7772=>616,7773=>389,7774=>616,7775=>389,7776=>500,7777=>389,
-7778=>500,7779=>389,7780=>500,7781=>389,7782=>500,7783=>389,7784=>500,7785=>389,7786=>556,7787=>278,
-7788=>556,7789=>278,7790=>556,7791=>278,7792=>556,7793=>278,7794=>722,7795=>500,7796=>722,7797=>500,
-7798=>722,7799=>500,7800=>722,7801=>500,7802=>722,7803=>500,7804=>611,7805=>444,7806=>611,7807=>444,
-7808=>833,7809=>667,7810=>833,7811=>667,7812=>833,7813=>667,7814=>833,7815=>667,7816=>833,7817=>667,
-7818=>611,7819=>444,7820=>611,7821=>444,7822=>556,7823=>444,7824=>556,7825=>389,7826=>556,7827=>389,
-7828=>556,7829=>389,7830=>500,7831=>278,7832=>667,7833=>444,7834=>444,7835=>278,7840=>611,7841=>500,
-7842=>611,7843=>500,7844=>611,7845=>500,7846=>611,7847=>500,7848=>611,7849=>500,7850=>611,7851=>500,
-7852=>611,7853=>500,7854=>611,7855=>500,7856=>611,7857=>500,7858=>611,7859=>500,7860=>611,7861=>500,
-7862=>611,7863=>500,7864=>604,7865=>444,7866=>604,7867=>444,7868=>604,7869=>444,7870=>611,7871=>444,
-7872=>611,7873=>444,7874=>611,7875=>444,7876=>611,7877=>444,7878=>604,7879=>444,7880=>339,7881=>278,
-7882=>339,7883=>278,7884=>722,7885=>500,7886=>722,7887=>500,7888=>722,7889=>500,7890=>722,7891=>500,
-7892=>722,7893=>500,7894=>722,7895=>500,7896=>722,7897=>500,7898=>932,7899=>608,7900=>932,7901=>608,
-7902=>807,7903=>585,7904=>932,7905=>608,7906=>932,7907=>608,7908=>722,7909=>500,7910=>722,7911=>500,
-7912=>948,7913=>721,7914=>948,7915=>721,7916=>807,7917=>585,7918=>948,7919=>721,7920=>948,7921=>721,
-7922=>556,7923=>444,7924=>556,7925=>444,7926=>556,7927=>444,7928=>556,7929=>444,7936=>564,7937=>564,
-7938=>564,7939=>564,7940=>564,7941=>564,7942=>564,7943=>564,7944=>661,7945=>661,7946=>794,7947=>811,
-7948=>792,7949=>803,7950=>661,7951=>648,7952=>416,7953=>416,7954=>416,7955=>416,7956=>416,7957=>416,
-7960=>740,7961=>795,7962=>923,7963=>940,7964=>996,7965=>986,7968=>506,7969=>506,7970=>506,7971=>506,
-7972=>506,7973=>506,7974=>506,7975=>506,7976=>879,7977=>901,7978=>1036,7979=>1035,7980=>1099,7981=>1100,
-7982=>954,7983=>959,7984=>270,7985=>270,7986=>267,7987=>267,7988=>267,7989=>267,7990=>267,7991=>267,
-7992=>490,7993=>529,7994=>655,7995=>654,7996=>705,7997=>713,7998=>570,7999=>573,8000=>558,8001=>510,
-8002=>510,8003=>510,8004=>510,8005=>510,8008=>797,8009=>867,8010=>1026,8011=>1022,8012=>993,8013=>1017,
-8016=>504,8017=>504,8018=>504,8019=>504,8020=>504,8021=>504,8022=>504,8023=>504,8025=>916,8027=>1062,
-8029=>1100,8031=>933,8032=>693,8033=>693,8034=>693,8035=>693,8036=>693,8037=>693,8038=>693,8039=>693,
-8040=>852,8041=>909,8042=>1072,8043=>1072,8044=>1032,8045=>1047,8046=>930,8047=>946,8048=>564,8049=>564,
-8050=>416,8051=>416,8052=>506,8053=>506,8054=>270,8055=>270,8056=>510,8057=>510,8058=>504,8059=>504,
-8060=>693,8061=>693,8064=>564,8065=>564,8066=>564,8067=>564,8068=>564,8069=>564,8070=>564,8071=>564,
-8072=>821,8073=>854,8074=>998,8075=>1011,8076=>992,8077=>1001,8078=>866,8079=>858,8080=>506,8081=>506,
-8082=>506,8083=>506,8084=>506,8085=>506,8086=>506,8087=>506,8088=>999,8089=>1044,8090=>1179,8091=>1165,
-8092=>1227,8093=>1229,8094=>1080,8095=>1085,8096=>693,8097=>693,8098=>693,8099=>693,8100=>693,8101=>693,
-8102=>693,8103=>693,8104=>1037,8105=>1113,8106=>1264,8107=>1264,8108=>1219,8109=>1241,8110=>1120,8111=>1132,
-8112=>564,8113=>564,8114=>564,8115=>564,8116=>564,8118=>564,8119=>564,8120=>661,8121=>661,8122=>661,
-8123=>661,8124=>831,8125=>192,8126=>332,8127=>500,8128=>500,8129=>534,8130=>506,8131=>506,8132=>506,
-8134=>506,8135=>506,8136=>611,8137=>816,8138=>889,8139=>908,8140=>881,8141=>500,8142=>500,8143=>500,
-8144=>270,8145=>270,8146=>270,8147=>270,8150=>270,8151=>270,8152=>333,8153=>333,8154=>497,8155=>521,
-8157=>500,8158=>500,8159=>500,8160=>504,8161=>504,8162=>504,8163=>504,8164=>506,8165=>506,8166=>504,
-8167=>504,8168=>676,8169=>676,8170=>905,8171=>901,8172=>783,8173=>333,8174=>333,8175=>500,8178=>693,
-8179=>693,8180=>693,8182=>693,8183=>693,8184=>907,8185=>833,8186=>963,8187=>875,8188=>952,8189=>500,
-8190=>500,8192=>500,8193=>1000,8194=>500,8195=>1000,8196=>333,8197=>250,8198=>167,8199=>500,8200=>250,
-8201=>200,8202=>100,8203=>0,8204=>0,8205=>0,8206=>0,8207=>0,8208=>333,8209=>333,8210=>500,
-8213=>1000,8214=>293,8215=>465,8219=>250,8223=>444,8227=>350,8228=>250,8229=>500,8231=>250,8232=>0,
-8233=>0,8234=>0,8235=>0,8236=>0,8237=>0,8238=>0,8239=>250,8241=>1601,8242=>247,8243=>411,
-8244=>611,8245=>220,8246=>440,8247=>660,8248=>469,8251=>629,8252=>666,8253=>500,8254=>500,8255=>953,
-8256=>1000,8257=>314,8258=>931,8259=>333,8260=>167,8261=>480,8262=>480,8263=>1000,8264=>833,8265=>833,
-8266=>500,8267=>453,8268=>453,8269=>450,8270=>500,8271=>278,8272=>882,8273=>500,8274=>497,8275=>500,
-8276=>953,8277=>512,8278=>410,8279=>855,8280=>620,8281=>620,8282=>179,8283=>621,8284=>564,8285=>179,
-8286=>179,8287=>111,8288=>0,8289=>0,8290=>0,8291=>0,8292=>0,8304=>300,8305=>235,8308=>300,
-8309=>300,8310=>300,8311=>300,8312=>300,8313=>300,8314=>300,8315=>300,8316=>300,8317=>216,8318=>216,
-8319=>318,8320=>300,8321=>250,8322=>300,8323=>300,8324=>300,8325=>300,8326=>300,8327=>300,8328=>300,
-8329=>300,8330=>300,8331=>300,8332=>300,8333=>216,8334=>216,8352=>698,8353=>667,8354=>667,8355=>611,
-8356=>500,8357=>722,8358=>667,8359=>988,8360=>953,8361=>833,8362=>869,8363=>512,8365=>722,8366=>611,
-8369=>589,8370=>619,8371=>722,8372=>556,8373=>611,8400=>0,8401=>0,8402=>0,8403=>0,8404=>0,
-8405=>0,8406=>0,8407=>0,8408=>0,8409=>0,8410=>0,8411=>0,8412=>0,8413=>0,8414=>0,
-8415=>0,8416=>0,8417=>0,8418=>0,8419=>0,8420=>0,8421=>0,8422=>0,8423=>0,8424=>0,
-8425=>0,8426=>0,8427=>0,8428=>0,8429=>0,8430=>0,8431=>0,8432=>0,8448=>664,8449=>665,
-8451=>954,8453=>693,8454=>787,8457=>822,8462=>500,8463=>500,8468=>777,8470=>823,8471=>760,8478=>616,
-8479=>610,8480=>879,8481=>1156,8483=>611,8486=>743,8487=>743,8489=>286,8490=>722,8491=>722,8494=>533,
-8498=>556,8501=>537,8502=>537,8503=>350,8504=>537,8506=>906,8507=>1155,8523=>778,8525=>856,8526=>500,
-8531=>750,8532=>750,8533=>750,8534=>750,8535=>750,8536=>750,8537=>750,8538=>750,8539=>750,8540=>750,
-8541=>750,8542=>750,8543=>750,8544=>339,8545=>678,8546=>1017,8547=>950,8548=>611,8549=>950,8550=>1289,
-8551=>1628,8552=>950,8553=>611,8554=>950,8555=>1289,8556=>556,8557=>667,8558=>722,8559=>828,8560=>278,
-8561=>556,8562=>834,8563=>722,8564=>444,8565=>722,8566=>1000,8567=>1278,8568=>722,8569=>444,8570=>722,
-8571=>1000,8572=>278,8573=>444,8574=>500,8575=>722,8592=>964,8593=>499,8594=>964,8595=>499,8706=>494,
-8710=>612,8721=>713,8722=>675,8723=>675,8725=>750,8730=>549,8734=>677,8747=>416,8748=>750,8749=>1083,
-8750=>722,8751=>750,8800=>564,8804=>675,8805=>675,8992=>686,8993=>686,9251=>500,9674=>494,9676=>791,
-9824=>626,9825=>694,9826=>595,9827=>776,9828=>626,9829=>694,9830=>595,9831=>776,9833=>333,9834=>555,
-9835=>722,9836=>722,9837=>415,9838=>377,9839=>402,11799=>333,64256=>526,64257=>500,64258=>500,64259=>747,
-64260=>748,64262=>665,64285=>350,64286=>0,64287=>537,64288=>537,64297=>564,64298=>537,64299=>537,64300=>537,
-64301=>537,64302=>537,64303=>537,64304=>537,64305=>537,64306=>350,64307=>537,64308=>537,64309=>350,64310=>350,
-64312=>537,64313=>350,64314=>537,64315=>537,64316=>537,64318=>537,64320=>350,64321=>537,64323=>537,64324=>537,
-64326=>537,64327=>537,64328=>537,64329=>537,64330=>537,64331=>350,64332=>537,64333=>537,64334=>537,64335=>537,
-65533=>788);
-$enc='';
-$diff='';
-$file='freeserifi.z';
-$ctg='freeserifi.ctg.z';
-$originalsize=629968;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helvetica.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helvetica.php
deleted file mode 100644
index c5eba6d68f4..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helvetica.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=556;
-$cw=array(0=>278,1=>278,2=>278,3=>278,4=>278,5=>278,6=>278,7=>278,8=>278,9=>278,
-10=>278,11=>278,12=>278,13=>278,14=>278,15=>278,16=>278,17=>278,18=>278,19=>278,
-20=>278,21=>278,22=>278,23=>278,24=>278,25=>278,26=>278,27=>278,28=>278,29=>278,
-30=>278,31=>278,32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,
-40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,
-50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,
-60=>584,61=>584,62=>584,63=>556,64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,
-90=>611,91=>278,92=>278,93=>278,94=>469,95=>556,96=>333,97=>556,98=>556,99=>500,
-100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,
-109=>833,110=>556,111=>556,112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,
-118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,
-127=>350,128=>556,129=>350,130=>222,131=>556,132=>333,133=>1000,134=>556,135=>556,
-136=>333,137=>1000,138=>667,139=>333,140=>1000,141=>350,142=>611,143=>350,144=>350,
-145=>222,146=>222,147=>333,148=>333,149=>350,150=>556,151=>1000,152=>333,153=>1000,
-154=>500,155=>333,156=>944,157=>350,158=>500,159=>667,160=>278,161=>333,162=>556,
-163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,
-172=>584,173=>333,174=>737,175=>333,176=>400,177=>584,178=>333,179=>333,180=>333,
-181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,
-190=>834,191=>611,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,
-235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,242=>556,243=>556,
-244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,
-253=>500,254=>556,255=>500);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticab.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticab.php
deleted file mode 100644
index 8635a72746f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticab.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=556;
-$cw=array(0=>278,1=>278,2=>278,3=>278,4=>278,5=>278,6=>278,7=>278,8=>278,9=>278,
-10=>278,11=>278,12=>278,13=>278,14=>278,15=>278,16=>278,17=>278,18=>278,19=>278,
-20=>278,21=>278,22=>278,23=>278,24=>278,25=>278,26=>278,27=>278,28=>278,29=>278,
-30=>278,31=>278,32=>278,33=>333,34=>474,35=>556,36=>556,37=>889,38=>722,39=>238,
-40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,
-50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>333,59=>333,
-60=>584,61=>584,62=>584,63=>611,64=>975,65=>722,66=>722,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>722,73=>278,74=>556,75=>722,76=>611,77=>833,78=>722,79=>778,
-80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,
-90=>611,91=>333,92=>278,93=>333,94=>584,95=>556,96=>333,97=>556,98=>611,99=>556,
-100=>611,101=>556,102=>333,103=>611,104=>611,105=>278,106=>278,107=>556,108=>278,
-109=>889,110=>611,111=>611,112=>611,113=>611,114=>389,115=>556,116=>333,117=>611,
-118=>556,119=>778,120=>556,121=>556,122=>500,123=>389,124=>280,125=>389,126=>584,
-127=>350,128=>556,129=>350,130=>278,131=>556,132=>500,133=>1000,134=>556,135=>556,
-136=>333,137=>1000,138=>667,139=>333,140=>1000,141=>350,142=>611,143=>350,144=>350,
-145=>278,146=>278,147=>500,148=>500,149=>350,150=>556,151=>1000,152=>333,153=>1000,
-154=>556,155=>333,156=>944,157=>350,158=>500,159=>667,160=>278,161=>333,162=>556,
-163=>556,164=>556,165=>556,166=>280,167=>556,168=>333,169=>737,170=>370,171=>556,
-172=>584,173=>333,174=>737,175=>333,176=>400,177=>584,178=>333,179=>333,180=>333,
-181=>611,182=>556,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,
-190=>834,191=>611,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-226=>556,227=>556,228=>556,229=>556,230=>889,231=>556,232=>556,233=>556,234=>556,
-235=>556,236=>278,237=>278,238=>278,239=>278,240=>611,241=>611,242=>611,243=>611,
-244=>611,245=>611,246=>611,247=>584,248=>611,249=>611,250=>611,251=>611,252=>611,
-253=>556,254=>611,255=>556);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticabi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticabi.php
deleted file mode 100644
index 8635a72746f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticabi.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=556;
-$cw=array(0=>278,1=>278,2=>278,3=>278,4=>278,5=>278,6=>278,7=>278,8=>278,9=>278,
-10=>278,11=>278,12=>278,13=>278,14=>278,15=>278,16=>278,17=>278,18=>278,19=>278,
-20=>278,21=>278,22=>278,23=>278,24=>278,25=>278,26=>278,27=>278,28=>278,29=>278,
-30=>278,31=>278,32=>278,33=>333,34=>474,35=>556,36=>556,37=>889,38=>722,39=>238,
-40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,
-50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>333,59=>333,
-60=>584,61=>584,62=>584,63=>611,64=>975,65=>722,66=>722,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>722,73=>278,74=>556,75=>722,76=>611,77=>833,78=>722,79=>778,
-80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,
-90=>611,91=>333,92=>278,93=>333,94=>584,95=>556,96=>333,97=>556,98=>611,99=>556,
-100=>611,101=>556,102=>333,103=>611,104=>611,105=>278,106=>278,107=>556,108=>278,
-109=>889,110=>611,111=>611,112=>611,113=>611,114=>389,115=>556,116=>333,117=>611,
-118=>556,119=>778,120=>556,121=>556,122=>500,123=>389,124=>280,125=>389,126=>584,
-127=>350,128=>556,129=>350,130=>278,131=>556,132=>500,133=>1000,134=>556,135=>556,
-136=>333,137=>1000,138=>667,139=>333,140=>1000,141=>350,142=>611,143=>350,144=>350,
-145=>278,146=>278,147=>500,148=>500,149=>350,150=>556,151=>1000,152=>333,153=>1000,
-154=>556,155=>333,156=>944,157=>350,158=>500,159=>667,160=>278,161=>333,162=>556,
-163=>556,164=>556,165=>556,166=>280,167=>556,168=>333,169=>737,170=>370,171=>556,
-172=>584,173=>333,174=>737,175=>333,176=>400,177=>584,178=>333,179=>333,180=>333,
-181=>611,182=>556,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,
-190=>834,191=>611,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-226=>556,227=>556,228=>556,229=>556,230=>889,231=>556,232=>556,233=>556,234=>556,
-235=>556,236=>278,237=>278,238=>278,239=>278,240=>611,241=>611,242=>611,243=>611,
-244=>611,245=>611,246=>611,247=>584,248=>611,249=>611,250=>611,251=>611,252=>611,
-253=>556,254=>611,255=>556);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticai.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticai.php
deleted file mode 100644
index c5eba6d68f4..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/helveticai.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=556;
-$cw=array(0=>278,1=>278,2=>278,3=>278,4=>278,5=>278,6=>278,7=>278,8=>278,9=>278,
-10=>278,11=>278,12=>278,13=>278,14=>278,15=>278,16=>278,17=>278,18=>278,19=>278,
-20=>278,21=>278,22=>278,23=>278,24=>278,25=>278,26=>278,27=>278,28=>278,29=>278,
-30=>278,31=>278,32=>278,33=>278,34=>355,35=>556,36=>556,37=>889,38=>667,39=>191,
-40=>333,41=>333,42=>389,43=>584,44=>278,45=>333,46=>278,47=>278,48=>556,49=>556,
-50=>556,51=>556,52=>556,53=>556,54=>556,55=>556,56=>556,57=>556,58=>278,59=>278,
-60=>584,61=>584,62=>584,63=>556,64=>1015,65=>667,66=>667,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>722,73=>278,74=>500,75=>667,76=>556,77=>833,78=>722,79=>778,
-80=>667,81=>778,82=>722,83=>667,84=>611,85=>722,86=>667,87=>944,88=>667,89=>667,
-90=>611,91=>278,92=>278,93=>278,94=>469,95=>556,96=>333,97=>556,98=>556,99=>500,
-100=>556,101=>556,102=>278,103=>556,104=>556,105=>222,106=>222,107=>500,108=>222,
-109=>833,110=>556,111=>556,112=>556,113=>556,114=>333,115=>500,116=>278,117=>556,
-118=>500,119=>722,120=>500,121=>500,122=>500,123=>334,124=>260,125=>334,126=>584,
-127=>350,128=>556,129=>350,130=>222,131=>556,132=>333,133=>1000,134=>556,135=>556,
-136=>333,137=>1000,138=>667,139=>333,140=>1000,141=>350,142=>611,143=>350,144=>350,
-145=>222,146=>222,147=>333,148=>333,149=>350,150=>556,151=>1000,152=>333,153=>1000,
-154=>500,155=>333,156=>944,157=>350,158=>500,159=>667,160=>278,161=>333,162=>556,
-163=>556,164=>556,165=>556,166=>260,167=>556,168=>333,169=>737,170=>370,171=>556,
-172=>584,173=>333,174=>737,175=>333,176=>400,177=>584,178=>333,179=>333,180=>333,
-181=>556,182=>537,183=>278,184=>333,185=>333,186=>365,187=>556,188=>834,189=>834,
-190=>834,191=>611,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>278,205=>278,206=>278,207=>278,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>584,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>667,222=>667,223=>611,224=>556,225=>556,
-226=>556,227=>556,228=>556,229=>556,230=>889,231=>500,232=>556,233=>556,234=>556,
-235=>556,236=>278,237=>278,238=>278,239=>278,240=>556,241=>556,242=>556,243=>556,
-244=>556,245=>556,246=>556,247=>584,248=>611,249=>556,250=>556,251=>556,252=>556,
-253=>500,254=>556,255=>500);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/hysmyeongjostdmedium.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/hysmyeongjostdmedium.php
deleted file mode 100644
index 9e8b23b426d..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/hysmyeongjostdmedium.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-$type='cidfont0';
-$name='HYSMyeongJoStd-Medium-Acro'; // AdobeMyungjoStd-Medium-Acro in acrobat 6
-$displayname = 'MyungJo Medium (Korean)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 720,
-	'Flags' => 6,
-	'FontBBox' => '[-28 -148 1001 880]',
-	'ItalicAngle' => 0,
-	'StemV' => 60,
-	'Style' => '<< /Panose <000000000600000000000000> >>',
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'Korea1',
-	'Supplement' => '1',
-);
-$enc = 'UniKS-UCS2-H';
-
-// underline position, needs checking:
-$up = -130;
-$ut = 40;
-
-$dw = 1000;
-$cw = array(
-	32 => 333, 33 => 416, 34 => 416, 35 => 833, 36 => 625, 37 => 916, 38 => 833, 39 => 250, 40 => 500, 41 => 500,
-	42 => 500, 43 => 833, 44 => 291, 45 => 450, 46 => 291, 47 => 375, 48 => 625, 49 => 625, 50 => 625, 51 => 625,
-	52 => 625, 53 => 625, 54 => 625, 55 => 625, 56 => 625, 57 => 625, 58 => 333, 59 => 333, 60 => 833, 61 => 833,
-	62 => 916, 63 => 500, 64 => 1000, 65 => 791, 66 => 708, 67 => 708, 68 => 750, 69 => 708, 70 => 666, 71 => 750,
-	72 => 791, 73 => 375, 74 => 500, 75 => 791, 76 => 666, 77 => 916, 78 => 791, 79 => 750, 80 => 666, 81 => 750,
-	82 => 708, 83 => 666, 84 => 791, 85 => 791, 86 => 750, 87 => 1000, 88 => 708, 89 => 708, 90 => 666, 91 => 500,
-	92 => 375, 93 => 500, 94 => 500, 95 => 500, 96 => 333, 97 => 541, 98 => 583, 99 => 541, 100 => 583, 101 => 583,
-	102 => 375, 103 => 583, 104 => 583, 105 => 291, 106 => 333, 107 => 583, 108 => 291, 109 => 875, 110 => 583, 111 => 583,
-	112 => 583, 113 => 583, 114 => 458, 115 => 541, 116 => 375, 117 => 583, 118 => 583, 119 => 833, 120 => 625, 121 => 625,
-	122 => 500, 123 => 583, 124 => 583, 125 => 583, 126 => 750,
-);
-$_cr = array(
-	//array(97, 97, 500),
-	array(8094, 8190, 500)
-);
-foreach($_cr as $_r) {
-	for($i = $_r[0]; $i <= $_r[1]; $i++) {
-		$cw[$i+31] = $_r[2];
-	}
-}
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/kozgopromedium.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/kozgopromedium.php
deleted file mode 100644
index 72783b76098..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/kozgopromedium.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'KozGoPro-Medium-Acro';
-$displayname = 'Kozuka Gothic Pro (Japanese Sans-Serif)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 763,
-	'Flags' => 4,
-	'FontBBox' => '[-149 -374 1254 1008]',
-	'ItalicAngle' => 0,
-	'StemV' => 99,
-	'Style' => '<< /Panose <0000020b0700000000000000> >>',
-	'XHeight' => 549,
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'Japan1',
-	'Supplement' => '4',
-);
-$enc = 'UniJIS-UCS2-H';
-
-// underline position, needs checking:
-$up = -75;
-$ut = 50;
-
-$dw = 1000;
-$cw = array(
-	32 => 224, 33 => 266, 34 => 392, 35 => 551, 36 => 562, 37 => 883, 38 => 677, 39 => 213, 40 => 322, 41 => 322,
-	42 => 470, 43 => 677, 44 => 247, 45 => 343, 46 => 245, 47 => 370, 48 => 562, 49 => 562, 50 => 562, 51 => 562,
-	52 => 562, 53 => 562, 54 => 562, 55 => 562, 56 => 562, 57 => 562, 58 => 245, 59 => 247, 60 => 677, 61 => 677,
-	62 => 677, 63 => 447, 64 => 808, 65 => 661, 66 => 602, 67 => 610, 68 => 708, 69 => 535, 70 => 528, 71 => 689,
-	72 => 703, 73 => 275, 74 => 404, 75 => 602, 76 => 514, 77 => 871, 78 => 708, 79 => 727, 80 => 585, 81 => 727,
-	82 => 595, 83 => 539, 84 => 541, 85 => 696, 86 => 619, 87 => 922, 88 => 612, 89 => 591, 90 => 584, 91 => 322,
-	92 => 562, 93 => 322, 94 => 677, 95 => 568, 96 => 340, 97 => 532, 98 => 612, 99 => 475, 100 => 608, 101 => 543,
-	102 => 332, 103 => 603, 104 => 601, 105 => 265, 106 => 276, 107 => 524, 108 => 264, 109 => 901, 110 => 601, 111 => 590,
-	112 => 612, 113 => 607, 114 => 367, 115 => 433, 116 => 369, 117 => 597, 118 => 527, 119 => 800, 120 => 511, 121 => 518,
-	122 => 468, 123 => 321, 124 => 273, 125 => 321, 126 => 341, 127 => 241, 128 => 362, 129 => 241, 130 => 273, 131 => 677,
-	132 => 266, 133 => 562, 134 => 562, 135 => 456, 136 => 562, 137 => 571, 138 => 562, 139 => 416, 140 => 472, 141 => 283,
-	142 => 283, 143 => 587, 144 => 588, 145 => 568, 146 => 545, 147 => 545, 148 => 247, 149 => 561, 150 => 330, 151 => 239,
-	152 => 418, 153 => 416, 154 => 472, 155 => 1136, 156 => 1288, 157 => 447, 158 => 340, 159 => 340, 160 => 340, 161 => 340,
-	162 => 340, 163 => 340, 164 => 455, 165 => 340, 166 => 340, 167 => 340, 168 => 340, 169 => 1136, 170 => 857, 171 => 384,
-	172 => 519, 173 => 727, 174 => 952, 175 => 398, 176 => 834, 177 => 264, 178 => 275, 179 => 590, 180 => 918, 181 => 605,
-	182 => 677, 183 => 769, 184 => 677, 185 => 473, 186 => 361, 187 => 677, 188 => 347, 189 => 340, 190 => 599, 191 => 284,
-	192 => 845, 193 => 845, 194 => 845, 195 => 661, 196 => 661, 197 => 661, 198 => 661, 199 => 661, 200 => 661, 201 => 610,
-	202 => 535, 203 => 535, 204 => 535, 205 => 535, 206 => 275, 207 => 275, 208 => 275, 209 => 275, 210 => 715, 211 => 708,
-	212 => 727, 213 => 727, 214 => 727, 215 => 727, 216 => 727, 217 => 677, 218 => 696, 219 => 696, 220 => 696, 221 => 696,
-	222 => 591, 223 => 584, 224 => 532, 225 => 532, 226 => 532, 227 => 532, 228 => 532, 229 => 532, 230 => 475, 231 => 543,
-	232 => 543, 233 => 543, 234 => 543, 235 => 264, 236 => 264, 237 => 264, 238 => 264, 239 => 584, 240 => 601, 241 => 590,
-	242 => 590, 243 => 590, 244 => 590, 245 => 590, 246 => 677, 247 => 597, 248 => 597, 249 => 597, 250 => 597, 251 => 518,
-	252 => 612, 253 => 518, 254 => 539, 255 => 591, 256 => 584, 257 => 446, 258 => 433, 259 => 683, 260 => 468, 261 => 562,
-);
-$_cr = array(
-	array(231, 632, 500), // half-width
-	array(8718, 8718, 500),
-	array(9738, 9757, 250), // quarter-width
-	array(9758, 9778, 333), // third-width
-	array(12063, 12087, 500)
-);
-foreach($_cr as $_r) {
-	for($i = $_r[0]; $i <= $_r[1]; $i++) {
-		$cw[$i+31] = $_r[2];
-	}
-}
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/kozminproregular.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/kozminproregular.php
deleted file mode 100644
index c308d41db82..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/kozminproregular.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'KozMinPro-Regular-Acro';
-$displayname = 'Kozuka Mincho Pro (Japanese Serif)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 740,
-	'Flags' => 6,
-	'FontBBox' => '[-195 -272 1110 1075]',
-	'ItalicAngle' => 0,
-	'StemV' => 86,
-	'XHeight' => 502,
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'Japan1',
-	'Supplement' => '4',
-);
-$enc = 'UniJIS-UCS2-H';
-
-$up = -75;
-$ut = 50;
-
-$dw = 1000;
-$cw = array(
-	32 => 278, 33 => 299, 34 => 353, 35 => 614, 36 => 614, 37 => 721, 38 => 735, 39 => 216, 40 => 323, 41 => 323,
-	42 => 449, 43 => 529, 44 => 219, 45 => 306, 46 => 219, 47 => 453, 48 => 614, 49 => 614, 50 => 614, 51 => 614,
-	52 => 614, 53 => 614, 54 => 614, 55 => 614, 56 => 614, 57 => 614, 58 => 219, 59 => 219, 60 => 529, 61 => 529,
-	62 => 529, 63 => 486, 64 => 744, 65 => 646, 66 => 604, 67 => 617, 68 => 681, 69 => 567, 70 => 537, 71 => 647,
-	72 => 738, 73 => 320, 74 => 433, 75 => 637, 76 => 566, 77 => 904, 78 => 710, 79 => 716, 80 => 605, 81 => 716,
-	82 => 623, 83 => 517, 84 => 601, 85 => 690, 86 => 668, 87 => 990, 88 => 681, 89 => 634, 90 => 578, 91 => 316,
-	92 => 614, 93 => 316, 94 => 529, 95 => 500, 96 => 387, 97 => 509, 98 => 566, 99 => 478, 100 => 565, 101 => 503,
-	102 => 337, 103 => 549, 104 => 580, 105 => 275, 106 => 266, 107 => 544, 108 => 276, 109 => 854, 110 => 579, 111 => 550,
-	112 => 578, 113 => 566, 114 => 410, 115 => 444, 116 => 340, 117 => 575, 118 => 512, 119 => 760, 120 => 503, 121 => 529,
-	122 => 453, 123 => 326, 124 => 380, 125 => 326, 126 => 387, 127 => 216, 128 => 453, 129 => 216, 130 => 380, 131 => 529,
-	132 => 299, 133 => 614, 134 => 614, 135 => 265, 136 => 614, 137 => 475, 138 => 614, 139 => 353, 140 => 451, 141 => 291,
-	142 => 291, 143 => 588, 144 => 589, 145 => 500, 146 => 476, 147 => 476, 148 => 219, 149 => 494, 150 => 452, 151 => 216,
-	152 => 353, 153 => 353, 154 => 451, 156 => 1075, 157 => 486, 158 => 387, 159 => 387, 160 => 387, 161 => 387,
-	162 => 387,	163 => 387, 164 => 387, 165 => 387, 166 => 387, 167 => 387, 168 => 387, 170 => 880, 171 => 448,
-	172 => 566, 173 => 716,	174 => 903, 175 => 460, 176 => 805, 177 => 275, 178 => 276, 179 => 550, 180 => 886, 181 => 582,
-	182 => 529, 183 => 738,	184 => 529, 185 => 738, 186 => 357, 187 => 529, 188 => 406, 189 => 406, 190 => 575, 191 => 406,
-	192 => 934, 193 => 934,	194 => 934, 195 => 646, 196 => 646, 197 => 646, 198 => 646, 199 => 646, 200 => 646, 201 => 617,
-	202 => 567, 203 => 567, 204 => 567, 205 => 567, 206 => 320, 207 => 320, 208 => 320, 209 => 320, 210 => 681, 211 => 710,
-	212 => 716, 213 => 716, 214 => 716, 215 => 716, 216 => 716, 217 => 529, 218 => 690, 219 => 690, 220 => 690, 221 => 690,
-	222 => 634, 223 => 605, 224 => 509, 225 => 509, 226 => 509, 227 => 509, 228 => 509, 229 => 509, 230 => 478, 231 => 503,
-	232 => 503, 233 => 503, 234 => 503, 235 => 275, 236 => 275, 237 => 275, 238 => 275, 239 => 550, 240 => 579, 241 => 550,
-	242 => 550, 243 => 550, 244 => 550, 245 => 550, 246 => 529, 247 => 575, 248 => 575, 249 => 575, 250 => 575, 251 => 529,
-	252 => 578, 253 => 529, 254 => 517, 255 => 634, 256 => 578, 257 => 445, 258 => 444, 259 => 842, 260 => 453, 261 => 614,
-);
-$_cr = array(
-	array(231, 632, 500), // half-width
-	array(8718, 8718, 500),
-	array(9738, 9757, 250), // quarter-width
-	array(9758, 9778, 333), // third-width
-	array(12063, 12087, 500),
-);
-foreach($_cr as $_r) {
-	for($i = $_r[0]; $i <= $_r[1]; $i++) {
-		$cw[$i+31] = $_r[2];
-	}
-}
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/msungstdlight.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/msungstdlight.php
deleted file mode 100644
index a71ea295364..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/msungstdlight.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'MSungStd-Light-Acro';
-$displayname = 'MSung Light (Trad. Chinese)';
-$desc = array(
-	'Ascent' => 880,
-	'Descent' => -120,
-	'CapHeight' => 880,
-	'Flags' => 6,
-	'FontBBox' => '[-160 -249 1015 1071]',
-	'ItalicAngle' => 0,
-	'StemV' => 93,
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'CNS1',
-	'Supplement' => '3',
-);
-$enc = 'UniCNS-UCS2-H';
-
-$up = -130;
-$ut = 40;
-
-$dw = 1000;
-$cw = array(
-	32 => 250, 33 => 250, 34 => 408, 35 => 668, 36 => 490, 37 => 875, 38 => 698, 39 => 250, 40 => 240, 41 => 240,
-	42 => 417, 43 => 667, 44 => 250, 45 => 313, 46 => 250, 47 => 520, 48 => 500, 49 => 500, 50 => 500, 51 => 500,
-	52 => 500, 53 => 500, 54 => 500, 55 => 500, 56 => 500, 57 => 500, 58 => 250, 59 => 250, 60 => 667, 61 => 667,
-	62 => 667, 63 => 396, 64 => 921, 65 => 677, 66 => 615, 67 => 719, 68 => 760, 69 => 625, 70 => 552, 71 => 771,
-	72 => 802, 73 => 354, 74 => 354, 75 => 781, 76 => 604, 77 => 927, 78 => 750, 79 => 823, 80 => 563, 81 => 823,
-	82 => 729, 83 => 542, 84 => 698, 85 => 771, 86 => 729, 87 => 948, 88 => 771, 89 => 677, 90 => 635, 91 => 344,
-	92 => 520, 93 => 344, 94 => 469, 95 => 500, 96 => 250, 97 => 469, 98 => 521, 99 => 427, 100 => 521, 101 => 438,
-	102 => 271, 103 => 469, 104 => 531, 105 => 250, 106 => 250, 107 => 458, 108 => 240, 109 => 802, 110 => 531, 111 => 500,
-	112 => 521, 113 => 521, 114 => 365, 115 => 333, 116 => 292, 117 => 521, 118 => 458, 119 => 677, 120 => 479, 121 => 458,
-	122 => 427, 123 => 480, 124 => 496, 125 => 480, 126 => 667,
-	17601 => 500,
-);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/stsongstdlight.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/stsongstdlight.php
deleted file mode 100644
index 1c74c62d668..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/stsongstdlight.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$type = 'cidfont0';
-$name = 'STSongStd-Light-Acro';
-$displayname = 'STSong Light (Simp. Chinese)';
-$desc = array(
-	'Ascent' => 752,
-	'Descent' => -271,
-	'CapHeight' => 737,
-	'Flags' => 6,
-	'FontBBox' => '[-25 -254 1000 880]',
-	'ItalicAngle' => 0,
-	'StemV' => 58,
-	'Style' => '<< /Panose <000000000400000000000000> >>',
-);
-$cidinfo = array(
-	'Registry' => 'Adobe',
-	'Ordering' => 'GB1',
-	'Supplement' => '2',
-);
-$enc = 'UniGB-UCS2-H';
-
-// underline position, needs checking:
-$up = -130;
-$ut = 40;
-
-$dw = 1000;
-$cw = array(
-	32 => 207, 33 => 270, 34 => 342, 35 => 467, 36 => 462, 37 => 797, 38 => 710, 39 => 239, 40 => 374, 41 => 374,
-	42 => 423, 43 => 605, 44 => 238, 45 => 375, 46 => 238, 47 => 334, 48 => 462, 49 => 462, 50 => 462, 51 => 462,
-	52 => 462, 53 => 462, 54 => 462, 55 => 462, 56 => 462, 57 => 462, 58 => 238, 59 => 238, 60 => 605, 61 => 605,
-	62 => 605, 63 => 344, 64 => 748, 65 => 684, 66 => 560, 67 => 695, 68 => 739, 69 => 563, 70 => 511, 71 => 729,
-	72 => 793, 73 => 318, 74 => 312, 75 => 666, 76 => 526, 77 => 896, 78 => 758, 79 => 772, 80 => 544, 81 => 772,
-	82 => 628, 83 => 465, 84 => 607, 85 => 753, 86 => 711, 87 => 972, 88 => 647, 89 => 620, 90 => 607, 91 => 374,
-	92 => 333, 93 => 374, 94 => 606, 95 => 500, 96 => 239, 97 => 417, 98 => 503, 99 => 427, 100 => 529, 101 => 415,
-	102 => 264, 103 => 444, 104 => 518, 105 => 241, 106 => 230, 107 => 495, 108 => 228, 109 => 793, 110 => 527, 111 => 524,
-	112 => 524, 113 => 504, 114 => 338, 115 => 336, 116 => 277, 117 => 517, 118 => 450, 119 => 652, 120 => 466, 121 => 452,
-	122 => 407, 123 => 370, 124 => 258, 125 => 370, 126 => 605
-);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/symbol.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/symbol.php
deleted file mode 100644
index e315f536545..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/symbol.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>713,35=>500,36=>549,37=>833,38=>778,39=>439,
-40=>333,41=>333,42=>500,43=>549,44=>250,45=>549,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>278,59=>278,
-60=>549,61=>549,62=>549,63=>444,64=>549,65=>722,66=>667,67=>722,68=>612,69=>611,
-70=>763,71=>603,72=>722,73=>333,74=>631,75=>722,76=>686,77=>889,78=>722,79=>722,
-80=>768,81=>741,82=>556,83=>592,84=>611,85=>690,86=>439,87=>768,88=>645,89=>795,
-90=>611,91=>333,92=>863,93=>333,94=>658,95=>500,96=>500,97=>631,98=>549,99=>549,
-100=>494,101=>439,102=>521,103=>411,104=>603,105=>329,106=>603,107=>549,108=>549,
-109=>576,110=>521,111=>549,112=>549,113=>521,114=>549,115=>603,116=>439,117=>576,
-118=>713,119=>686,120=>493,121=>686,122=>494,123=>480,124=>200,125=>480,126=>549,
-127=>0,128=>0,129=>0,130=>0,131=>0,132=>0,133=>0,134=>0,135=>0,136=>0,137=>0,
-138=>0,139=>0,140=>0,141=>0,142=>0,143=>0,144=>0,145=>0,146=>0,147=>0,148=>0,
-149=>0,150=>0,151=>0,152=>0,153=>0,154=>0,155=>0,156=>0,157=>0,158=>0,159=>0,
-160=>750,161=>620,162=>247,163=>549,164=>167,165=>713,166=>500,167=>753,168=>753,
-169=>753,170=>753,171=>1042,172=>987,173=>603,174=>987,175=>603,176=>400,177=>549,
-178=>411,179=>549,180=>549,181=>713,182=>494,183=>460,184=>549,185=>549,186=>549,
-187=>549,188=>1000,189=>603,190=>1000,191=>658,192=>823,193=>686,194=>795,195=>987,
-196=>768,197=>768,198=>823,199=>768,200=>768,201=>713,202=>713,203=>713,204=>713,
-205=>713,206=>713,207=>713,208=>768,209=>713,210=>790,211=>790,212=>890,213=>823,
-214=>549,215=>250,216=>713,217=>603,218=>603,219=>1042,220=>987,221=>603,222=>987,
-223=>603,224=>494,225=>329,226=>790,227=>790,228=>786,229=>713,230=>384,231=>384,
-232=>384,233=>384,234=>384,235=>384,236=>494,237=>494,238=>494,239=>494,240=>0,
-241=>329,242=>274,243=>686,244=>686,245=>686,246=>384,247=>384,248=>384,249=>384,
-250=>384,251=>384,252=>494,253=>494,254=>494,255=>0);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/times.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/times.php
deleted file mode 100644
index 9914386167a..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/times.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>408,35=>500,36=>500,37=>833,38=>778,39=>180,
-40=>333,41=>333,42=>500,43=>564,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>278,59=>278,
-60=>564,61=>564,62=>564,63=>444,64=>921,65=>722,66=>667,67=>667,68=>722,69=>611,
-70=>556,71=>722,72=>722,73=>333,74=>389,75=>722,76=>611,77=>889,78=>722,79=>722,
-80=>556,81=>722,82=>667,83=>556,84=>611,85=>722,86=>722,87=>944,88=>722,89=>722,
-90=>611,91=>333,92=>278,93=>333,94=>469,95=>500,96=>333,97=>444,98=>500,99=>444,
-100=>500,101=>444,102=>333,103=>500,104=>500,105=>278,106=>278,107=>500,108=>278,
-109=>778,110=>500,111=>500,112=>500,113=>500,114=>333,115=>389,116=>278,117=>500,
-118=>500,119=>722,120=>500,121=>500,122=>444,123=>480,124=>200,125=>480,126=>541,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>444,133=>1000,134=>500,135=>500,
-136=>333,137=>1000,138=>556,139=>333,140=>889,141=>350,142=>611,143=>350,144=>350,
-145=>333,146=>333,147=>444,148=>444,149=>350,150=>500,151=>1000,152=>333,153=>980,
-154=>389,155=>333,156=>722,157=>350,158=>444,159=>722,160=>250,161=>333,162=>500,
-163=>500,164=>500,165=>500,166=>200,167=>500,168=>333,169=>760,170=>276,171=>500,
-172=>564,173=>333,174=>760,175=>333,176=>400,177=>564,178=>300,179=>300,180=>333,
-181=>500,182=>453,183=>250,184=>333,185=>300,186=>310,187=>500,188=>750,189=>750,
-190=>750,191=>444,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>889,
-199=>667,200=>611,201=>611,202=>611,203=>611,204=>333,205=>333,206=>333,207=>333,
-208=>722,209=>722,210=>722,211=>722,212=>722,213=>722,214=>722,215=>564,216=>722,
-217=>722,218=>722,219=>722,220=>722,221=>722,222=>556,223=>500,224=>444,225=>444,
-226=>444,227=>444,228=>444,229=>444,230=>667,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>500,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>564,248=>500,249=>500,250=>500,251=>500,252=>500,
-253=>500,254=>500,255=>500);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesb.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesb.php
deleted file mode 100644
index b6625be575a..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesb.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>555,35=>500,36=>500,37=>1000,38=>833,39=>278,
-40=>333,41=>333,42=>500,43=>570,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,
-60=>570,61=>570,62=>570,63=>500,64=>930,65=>722,66=>667,67=>722,68=>722,69=>667,
-70=>611,71=>778,72=>778,73=>389,74=>500,75=>778,76=>667,77=>944,78=>722,79=>778,
-80=>611,81=>778,82=>722,83=>556,84=>667,85=>722,86=>722,87=>1000,88=>722,89=>722,
-90=>667,91=>333,92=>278,93=>333,94=>581,95=>500,96=>333,97=>500,98=>556,99=>444,
-100=>556,101=>444,102=>333,103=>500,104=>556,105=>278,106=>333,107=>556,108=>278,
-109=>833,110=>556,111=>500,112=>556,113=>556,114=>444,115=>389,116=>333,117=>556,
-118=>500,119=>722,120=>500,121=>500,122=>444,123=>394,124=>220,125=>394,126=>520,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>500,133=>1000,134=>500,135=>500,
-136=>333,137=>1000,138=>556,139=>333,140=>1000,141=>350,142=>667,143=>350,144=>350,
-145=>333,146=>333,147=>500,148=>500,149=>350,150=>500,151=>1000,152=>333,153=>1000,
-154=>389,155=>333,156=>722,157=>350,158=>444,159=>722,160=>250,161=>333,162=>500,
-163=>500,164=>500,165=>500,166=>220,167=>500,168=>333,169=>747,170=>300,171=>500,
-172=>570,173=>333,174=>747,175=>333,176=>400,177=>570,178=>300,179=>300,180=>333,
-181=>556,182=>540,183=>250,184=>333,185=>300,186=>330,187=>500,188=>750,189=>750,
-190=>750,191=>500,192=>722,193=>722,194=>722,195=>722,196=>722,197=>722,198=>1000,
-199=>722,200=>667,201=>667,202=>667,203=>667,204=>389,205=>389,206=>389,207=>389,
-208=>722,209=>722,210=>778,211=>778,212=>778,213=>778,214=>778,215=>570,216=>778,
-217=>722,218=>722,219=>722,220=>722,221=>722,222=>611,223=>556,224=>500,225=>500,
-226=>500,227=>500,228=>500,229=>500,230=>722,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>556,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>570,248=>500,249=>556,250=>556,251=>556,252=>556,
-253=>500,254=>556,255=>500);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesbi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesbi.php
deleted file mode 100644
index ff18a4b8ffd..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesbi.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>389,34=>555,35=>500,36=>500,37=>833,38=>778,39=>278,
-40=>333,41=>333,42=>500,43=>570,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,
-60=>570,61=>570,62=>570,63=>500,64=>832,65=>667,66=>667,67=>667,68=>722,69=>667,
-70=>667,71=>722,72=>778,73=>389,74=>500,75=>667,76=>611,77=>889,78=>722,79=>722,
-80=>611,81=>722,82=>667,83=>556,84=>611,85=>722,86=>667,87=>889,88=>667,89=>611,
-90=>611,91=>333,92=>278,93=>333,94=>570,95=>500,96=>333,97=>500,98=>500,99=>444,
-100=>500,101=>444,102=>333,103=>500,104=>556,105=>278,106=>278,107=>500,108=>278,
-109=>778,110=>556,111=>500,112=>500,113=>500,114=>389,115=>389,116=>278,117=>556,
-118=>444,119=>667,120=>500,121=>444,122=>389,123=>348,124=>220,125=>348,126=>570,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>500,133=>1000,134=>500,135=>500,
-136=>333,137=>1000,138=>556,139=>333,140=>944,141=>350,142=>611,143=>350,144=>350,
-145=>333,146=>333,147=>500,148=>500,149=>350,150=>500,151=>1000,152=>333,153=>1000,
-154=>389,155=>333,156=>722,157=>350,158=>389,159=>611,160=>250,161=>389,162=>500,
-163=>500,164=>500,165=>500,166=>220,167=>500,168=>333,169=>747,170=>266,171=>500,
-172=>606,173=>333,174=>747,175=>333,176=>400,177=>570,178=>300,179=>300,180=>333,
-181=>576,182=>500,183=>250,184=>333,185=>300,186=>300,187=>500,188=>750,189=>750,
-190=>750,191=>500,192=>667,193=>667,194=>667,195=>667,196=>667,197=>667,198=>944,
-199=>667,200=>667,201=>667,202=>667,203=>667,204=>389,205=>389,206=>389,207=>389,
-208=>722,209=>722,210=>722,211=>722,212=>722,213=>722,214=>722,215=>570,216=>722,
-217=>722,218=>722,219=>722,220=>722,221=>611,222=>611,223=>500,224=>500,225=>500,
-226=>500,227=>500,228=>500,229=>500,230=>722,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>556,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>570,248=>500,249=>556,250=>556,251=>556,252=>556,
-253=>444,254=>500,255=>444);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesi.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesi.php
deleted file mode 100644
index c86d3ab6a07..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/timesi.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=500;
-$cw=array(0=>250,1=>250,2=>250,3=>250,4=>250,5=>250,6=>250,7=>250,8=>250,9=>250,
-10=>250,11=>250,12=>250,13=>250,14=>250,15=>250,16=>250,17=>250,18=>250,19=>250,
-20=>250,21=>250,22=>250,23=>250,24=>250,25=>250,26=>250,27=>250,28=>250,29=>250,
-30=>250,31=>250,32=>250,33=>333,34=>420,35=>500,36=>500,37=>833,38=>778,39=>214,
-40=>333,41=>333,42=>500,43=>675,44=>250,45=>333,46=>250,47=>278,48=>500,49=>500,
-50=>500,51=>500,52=>500,53=>500,54=>500,55=>500,56=>500,57=>500,58=>333,59=>333,
-60=>675,61=>675,62=>675,63=>500,64=>920,65=>611,66=>611,67=>667,68=>722,69=>611,
-70=>611,71=>722,72=>722,73=>333,74=>444,75=>667,76=>556,77=>833,78=>667,79=>722,
-80=>611,81=>722,82=>611,83=>500,84=>556,85=>722,86=>611,87=>833,88=>611,89=>556,
-90=>556,91=>389,92=>278,93=>389,94=>422,95=>500,96=>333,97=>500,98=>500,99=>444,
-100=>500,101=>444,102=>278,103=>500,104=>500,105=>278,106=>278,107=>444,108=>278,
-109=>722,110=>500,111=>500,112=>500,113=>500,114=>389,115=>389,116=>278,117=>500,
-118=>444,119=>667,120=>444,121=>444,122=>389,123=>400,124=>275,125=>400,126=>541,
-127=>350,128=>500,129=>350,130=>333,131=>500,132=>556,133=>889,134=>500,135=>500,
-136=>333,137=>1000,138=>500,139=>333,140=>944,141=>350,142=>556,143=>350,144=>350,
-145=>333,146=>333,147=>556,148=>556,149=>350,150=>500,151=>889,152=>333,153=>980,
-154=>389,155=>333,156=>667,157=>350,158=>389,159=>556,160=>250,161=>389,162=>500,
-163=>500,164=>500,165=>500,166=>275,167=>500,168=>333,169=>760,170=>276,171=>500,
-172=>675,173=>333,174=>760,175=>333,176=>400,177=>675,178=>300,179=>300,180=>333,
-181=>500,182=>523,183=>250,184=>333,185=>300,186=>310,187=>500,188=>750,189=>750,
-190=>750,191=>500,192=>611,193=>611,194=>611,195=>611,196=>611,197=>611,198=>889,
-199=>667,200=>611,201=>611,202=>611,203=>611,204=>333,205=>333,206=>333,207=>333,
-208=>722,209=>667,210=>722,211=>722,212=>722,213=>722,214=>722,215=>675,216=>722,
-217=>722,218=>722,219=>722,220=>722,221=>556,222=>611,223=>500,224=>500,225=>500,
-226=>500,227=>500,228=>500,229=>500,230=>667,231=>444,232=>444,233=>444,234=>444,
-235=>444,236=>278,237=>278,238=>278,239=>278,240=>500,241=>500,242=>500,243=>500,
-244=>500,245=>500,246=>500,247=>675,248=>500,249=>500,250=>500,251=>500,252=>500,
-253=>444,254=>500,255=>444);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ac15.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ac15.php
deleted file mode 100644
index 503a071ffb5..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ac15.php
+++ /dev/null
@@ -1,23613 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ag15.tar.Z
-$cidinfo['uni2cid'] = array(
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-92=>61,
-93=>62,
-94=>63,
-95=>64,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-124=>93,
-125=>94,
-126=>95,
-12288=>99,
-65292=>100,
-12289=>101,
-12290=>102,
-65294=>103,
-8226=>104,
-8231=>104,
-65307=>105,
-65306=>106,
-65311=>107,
-65281=>108,
-65072=>109,
-8230=>110,
-8943=>110,
-8229=>111,
-65104=>112,
-65380=>113,
-65105=>113,
-65106=>114,
-183=>115,
-65108=>116,
-65109=>117,
-65110=>118,
-65111=>119,
-65372=>120,
-8211=>121,
-65073=>122,
-8212=>123,
-65288=>128,
-65289=>129,
-65077=>130,
-65078=>131,
-65371=>132,
-65373=>133,
-65079=>134,
-65080=>135,
-12308=>136,
-12309=>137,
-65081=>138,
-65082=>139,
-12304=>140,
-12305=>141,
-65083=>142,
-65084=>143,
-12298=>144,
-12299=>145,
-65085=>146,
-65086=>147,
-12296=>148,
-12297=>149,
-65087=>150,
-65088=>151,
-12300=>152,
-12301=>153,
-65089=>154,
-65090=>155,
-12302=>156,
-12303=>157,
-65091=>158,
-65092=>159,
-65113=>160,
-65114=>161,
-65115=>162,
-65116=>163,
-65117=>164,
-65118=>165,
-8216=>166,
-8217=>167,
-8220=>168,
-8221=>169,
-12317=>170,
-12318=>171,
-8245=>172,
-8242=>173,
-65283=>174,
-65286=>175,
-65290=>176,
-8251=>177,
-167=>178,
-12291=>179,
-9675=>180,
-9679=>181,
-9651=>182,
-9650=>183,
-9678=>184,
-9734=>185,
-9733=>186,
-9671=>187,
-9670=>188,
-9633=>189,
-9632=>190,
-9661=>191,
-9660=>192,
-12963=>193,
-8453=>194,
-175=>195,
-772=>195,
-8254=>195,
-65507=>196,
-65343=>197,
-717=>198,
-65097=>199,
-65098=>200,
-65101=>201,
-65102=>202,
-65099=>203,
-65100=>204,
-65119=>205,
-65120=>206,
-65121=>207,
-65291=>208,
-65293=>209,
-215=>210,
-247=>211,
-177=>212,
-8730=>213,
-65308=>214,
-65310=>215,
-65309=>216,
-8806=>217,
-8807=>218,
-8800=>219,
-8734=>220,
-8786=>221,
-8801=>222,
-65122=>223,
-65123=>224,
-65124=>225,
-65125=>226,
-65126=>227,
-8764=>228,
-65374=>228,
-8745=>229,
-8746=>230,
-8869=>231,
-8736=>232,
-8735=>233,
-8895=>234,
-13266=>235,
-13265=>236,
-8747=>237,
-8750=>238,
-8757=>239,
-8756=>240,
-9792=>241,
-9794=>242,
-8853=>243,
-9793=>243,
-8857=>244,
-9737=>244,
-8593=>245,
-8595=>246,
-8594=>247,
-8592=>248,
-8598=>249,
-8599=>250,
-8601=>251,
-8600=>252,
-8741=>253,
-8739=>254,
-8725=>257,
-65295=>257,
-65128=>258,
-65340=>258,
-65284=>259,
-165=>260,
-65509=>260,
-12306=>261,
-162=>262,
-65504=>262,
-163=>263,
-65505=>263,
-65285=>264,
-65312=>265,
-8451=>266,
-8457=>267,
-65129=>268,
-65130=>269,
-65131=>270,
-13269=>271,
-13212=>272,
-13213=>273,
-13214=>274,
-13262=>275,
-13217=>276,
-13198=>277,
-13199=>278,
-13252=>279,
-176=>280,
-20825=>281,
-58834=>281,
-20827=>282,
-58835=>282,
-20830=>283,
-58837=>283,
-20829=>284,
-58836=>284,
-20833=>285,
-20835=>286,
-21991=>287,
-29929=>288,
-58044=>288,
-31950=>289,
-58191=>289,
-9601=>290,
-9602=>291,
-9603=>292,
-9604=>293,
-9605=>294,
-9606=>295,
-9607=>296,
-9608=>297,
-9615=>298,
-9614=>299,
-9613=>300,
-9612=>301,
-9611=>302,
-9610=>303,
-9609=>304,
-9532=>305,
-9524=>306,
-9516=>307,
-9508=>308,
-9500=>309,
-9620=>310,
-9472=>311,
-9474=>312,
-9621=>313,
-9484=>314,
-9488=>315,
-9492=>316,
-9496=>317,
-9581=>318,
-9582=>319,
-9584=>320,
-9583=>321,
-9552=>322,
-9566=>323,
-9578=>324,
-9569=>325,
-9698=>326,
-9699=>327,
-9701=>328,
-9700=>329,
-9585=>330,
-9586=>331,
-9587=>332,
-65296=>333,
-65297=>334,
-65298=>335,
-65299=>336,
-65300=>337,
-65301=>338,
-65302=>339,
-65303=>340,
-65304=>341,
-65305=>342,
-8544=>343,
-8545=>344,
-8546=>345,
-8547=>346,
-8548=>347,
-8549=>348,
-8550=>349,
-8551=>350,
-8552=>351,
-8553=>352,
-12321=>353,
-12322=>354,
-12323=>355,
-12324=>356,
-12325=>357,
-12326=>358,
-12327=>359,
-12328=>360,
-12329=>361,
-12344=>362,
-21316=>363,
-57443=>363,
-12345=>363,
-12346=>364,
-65313=>365,
-65314=>366,
-65315=>367,
-65316=>368,
-65317=>369,
-65318=>370,
-65319=>371,
-65320=>372,
-65321=>373,
-65322=>374,
-65323=>375,
-65324=>376,
-65325=>377,
-65326=>378,
-65327=>379,
-65328=>380,
-65329=>381,
-65330=>382,
-65331=>383,
-65332=>384,
-65333=>385,
-65334=>386,
-65335=>387,
-65336=>388,
-65337=>389,
-65338=>390,
-65345=>391,
-65346=>392,
-65347=>393,
-65348=>394,
-65349=>395,
-65350=>396,
-65351=>397,
-65352=>398,
-65353=>399,
-65354=>400,
-65355=>401,
-65356=>402,
-65357=>403,
-65358=>404,
-65359=>405,
-65360=>406,
-65361=>407,
-65362=>408,
-65363=>409,
-65364=>410,
-65365=>411,
-65366=>412,
-65367=>413,
-65368=>414,
-65369=>415,
-65370=>416,
-913=>417,
-914=>418,
-915=>419,
-916=>420,
-917=>421,
-918=>422,
-919=>423,
-920=>424,
-921=>425,
-922=>426,
-923=>427,
-924=>428,
-925=>429,
-926=>430,
-927=>431,
-928=>432,
-929=>433,
-931=>434,
-932=>435,
-933=>436,
-934=>437,
-935=>438,
-936=>439,
-937=>440,
-945=>441,
-946=>442,
-947=>443,
-948=>444,
-949=>445,
-950=>446,
-951=>447,
-952=>448,
-953=>449,
-954=>450,
-955=>451,
-956=>452,
-957=>453,
-958=>454,
-959=>455,
-960=>456,
-961=>457,
-963=>458,
-964=>459,
-965=>460,
-966=>461,
-967=>462,
-968=>463,
-969=>464,
-12549=>465,
-12550=>466,
-12551=>467,
-12552=>468,
-12553=>469,
-12554=>470,
-12555=>471,
-12556=>472,
-12557=>473,
-12558=>474,
-12559=>475,
-12560=>476,
-12561=>477,
-12562=>478,
-12563=>479,
-12564=>480,
-12565=>481,
-12566=>482,
-12567=>483,
-12568=>484,
-12569=>485,
-12570=>486,
-12571=>487,
-12572=>488,
-12573=>489,
-12574=>490,
-12575=>491,
-12576=>492,
-12577=>493,
-12578=>494,
-12579=>495,
-12580=>496,
-12581=>497,
-12582=>498,
-12583=>499,
-12584=>500,
-12585=>501,
-729=>502,
-714=>503,
-711=>504,
-780=>504,
-715=>505,
-9312=>506,
-63153=>506,
-9313=>507,
-63154=>507,
-9314=>508,
-63155=>508,
-9315=>509,
-63156=>509,
-9316=>510,
-63157=>510,
-9317=>511,
-63158=>511,
-9318=>512,
-63159=>512,
-9319=>513,
-63160=>513,
-9320=>514,
-63161=>514,
-9321=>515,
-63162=>515,
-9332=>516,
-63163=>516,
-9333=>517,
-63164=>517,
-9334=>518,
-63165=>518,
-9335=>519,
-63166=>519,
-9336=>520,
-63167=>520,
-9337=>521,
-63168=>521,
-9338=>522,
-63169=>522,
-9339=>523,
-63170=>523,
-9340=>524,
-63171=>524,
-9341=>525,
-63172=>525,
-8560=>526,
-63173=>526,
-8561=>527,
-63174=>527,
-8562=>528,
-63175=>528,
-8563=>529,
-63176=>529,
-8564=>530,
-63177=>530,
-8565=>531,
-63178=>531,
-8566=>532,
-63179=>532,
-8567=>533,
-63180=>533,
-8568=>534,
-63181=>534,
-8569=>535,
-63182=>535,
-20008=>536,
-12033=>536,
-20022=>537,
-12034=>537,
-63183=>537,
-20031=>538,
-12035=>538,
-63184=>538,
-12037=>539,
-20101=>539,
-63185=>539,
-12039=>540,
-20128=>540,
-63186=>540,
-20866=>541,
-12044=>541,
-63187=>541,
-20886=>542,
-12045=>542,
-63188=>542,
-20907=>543,
-12046=>543,
-63189=>543,
-12051=>544,
-21241=>544,
-63190=>544,
-12054=>545,
-21304=>545,
-63191=>545,
-12057=>546,
-21353=>546,
-63192=>546,
-12059=>547,
-21430=>547,
-63193=>547,
-12065=>548,
-12066=>548,
-22786=>548,
-22794=>548,
-63194=>548,
-12071=>549,
-23424=>549,
-63195=>549,
-12078=>550,
-24027=>550,
-63196=>550,
-24186=>551,
-12083=>551,
-63197=>551,
-24191=>552,
-12084=>552,
-63198=>552,
-24308=>553,
-12085=>553,
-24400=>554,
-12089=>554,
-63200=>554,
-24417=>555,
-12090=>555,
-63201=>555,
-12097=>556,
-25908=>556,
-63202=>556,
-12102=>557,
-26080=>557,
-30098=>558,
-63204=>558,
-12135=>558,
-30326=>559,
-12136=>559,
-12193=>560,
-36789=>560,
-63206=>560,
-12202=>561,
-38582=>561,
-9216=>562,
-9217=>563,
-9218=>564,
-9219=>565,
-9220=>566,
-9221=>567,
-9222=>568,
-9223=>569,
-9224=>570,
-9225=>571,
-9226=>572,
-9227=>573,
-9228=>574,
-9229=>575,
-9230=>576,
-9231=>577,
-9232=>578,
-9233=>579,
-9234=>580,
-9235=>581,
-9236=>582,
-9237=>583,
-9238=>584,
-9239=>585,
-9240=>586,
-9241=>587,
-9242=>588,
-9243=>589,
-9244=>590,
-9245=>591,
-9246=>592,
-9247=>593,
-9249=>594,
-12032=>595,
-19968=>595,
-12036=>596,
-20057=>596,
-19969=>597,
-19971=>598,
-20035=>599,
-20061=>600,
-20102=>601,
-12038=>602,
-20108=>602,
-20154=>603,
-12040=>603,
-20799=>604,
-12041=>604,
-20837=>605,
-12042=>605,
-20843=>606,
-12043=>606,
-12047=>607,
-20960=>607,
-12049=>608,
-20992=>608,
-20993=>609,
-12050=>610,
-21147=>610,
-12052=>611,
-21269=>611,
-21313=>612,
-12055=>612,
-21340=>613,
-12056=>613,
-12060=>614,
-21448=>614,
-19977=>615,
-19979=>616,
-19976=>617,
-19978=>618,
-20011=>619,
-20024=>620,
-20961=>621,
-20037=>622,
-20040=>623,
-20063=>624,
-20062=>625,
-20110=>626,
-20129=>627,
-20800=>628,
-64012=>628,
-20995=>629,
-21242=>630,
-21315=>631,
-21449=>632,
-12061=>633,
-21475=>633,
-22303=>634,
-12063=>634,
-22763=>635,
-12064=>635,
-22805=>636,
-12067=>636,
-22823=>637,
-12068=>637,
-22899=>638,
-12069=>638,
-12070=>639,
-23376=>639,
-23377=>640,
-23379=>641,
-23544=>642,
-12072=>642,
-23567=>643,
-12073=>643,
-23586=>644,
-12074=>644,
-23608=>645,
-12075=>645,
-12077=>646,
-23665=>646,
-24029=>647,
-24037=>648,
-12079=>648,
-12080=>649,
-24049=>649,
-24050=>650,
-24051=>651,
-24062=>652,
-12081=>652,
-24178=>653,
-12082=>653,
-24318=>654,
-12086=>654,
-24331=>655,
-12087=>655,
-24339=>656,
-12088=>656,
-25165=>657,
-19985=>658,
-19984=>659,
-19981=>660,
-20013=>661,
-20016=>662,
-20025=>663,
-20043=>664,
-23609=>665,
-20104=>666,
-20113=>667,
-20117=>668,
-20114=>669,
-20116=>670,
-20130=>671,
-20161=>672,
-20160=>673,
-20163=>674,
-20166=>675,
-20167=>676,
-20173=>677,
-20170=>678,
-20171=>679,
-20164=>680,
-20803=>681,
-20801=>682,
-20839=>683,
-20845=>684,
-20846=>685,
-20844=>686,
-20887=>687,
-20982=>688,
-20998=>689,
-20999=>690,
-21000=>691,
-21243=>692,
-21246=>693,
-21247=>694,
-21270=>695,
-21305=>696,
-21320=>697,
-21319=>698,
-21317=>699,
-21342=>700,
-21380=>701,
-21451=>702,
-21450=>703,
-21453=>704,
-22764=>705,
-22825=>706,
-22827=>707,
-22826=>708,
-22829=>709,
-23380=>710,
-23569=>711,
-23588=>712,
-23610=>713,
-23663=>714,
-24052=>715,
-24187=>716,
-24319=>717,
-24340=>718,
-24341=>719,
-24515=>720,
-12092=>720,
-25096=>721,
-12093=>721,
-25142=>722,
-12094=>722,
-25163=>723,
-12095=>723,
-25166=>724,
-12096=>725,
-25903=>725,
-25991=>726,
-12098=>726,
-26007=>727,
-12099=>727,
-26020=>728,
-12100=>728,
-26041=>729,
-12101=>729,
-26085=>730,
-12103=>730,
-26352=>731,
-12104=>731,
-26376=>732,
-12105=>732,
-26408=>733,
-12106=>733,
-27424=>734,
-12107=>734,
-27490=>735,
-12108=>735,
-27513=>736,
-12109=>736,
-27595=>737,
-12111=>737,
-27604=>738,
-12112=>738,
-27611=>739,
-12113=>739,
-27663=>740,
-12114=>740,
-27700=>741,
-12116=>741,
-28779=>742,
-12117=>742,
-29226=>743,
-12118=>743,
-29238=>744,
-12119=>744,
-29243=>745,
-12120=>745,
-29255=>746,
-12122=>746,
-29273=>747,
-12123=>747,
-29275=>748,
-12124=>748,
-29356=>749,
-12125=>749,
-29579=>750,
-19993=>751,
-19990=>752,
-19989=>753,
-19988=>754,
-19992=>755,
-20027=>756,
-20045=>757,
-20047=>758,
-20046=>759,
-20197=>760,
-20184=>761,
-20180=>762,
-20181=>763,
-20182=>764,
-20183=>765,
-20195=>766,
-20196=>767,
-20185=>768,
-20190=>769,
-20805=>770,
-20804=>771,
-20873=>772,
-20874=>773,
-20908=>774,
-20985=>775,
-20986=>776,
-20984=>777,
-21002=>778,
-21152=>779,
-21151=>780,
-57435=>781,
-21253=>781,
-21254=>782,
-21271=>783,
-21277=>784,
-20191=>785,
-21322=>786,
-21321=>787,
-21345=>788,
-21344=>789,
-21359=>790,
-21358=>791,
-21435=>792,
-21487=>793,
-21476=>794,
-21491=>795,
-21484=>796,
-21486=>797,
-21481=>798,
-21480=>799,
-21500=>800,
-21496=>801,
-21493=>802,
-21483=>803,
-21478=>804,
-21482=>805,
-21490=>806,
-21489=>807,
-21488=>808,
-21477=>809,
-21485=>810,
-21499=>811,
-22235=>812,
-22234=>813,
-22806=>814,
-22830=>815,
-22833=>816,
-22900=>817,
-22902=>818,
-23381=>819,
-23427=>820,
-23612=>821,
-24040=>822,
-24039=>823,
-24038=>824,
-24066=>825,
-24067=>826,
-24179=>827,
-24188=>828,
-24321=>829,
-24344=>830,
-24343=>831,
-24517=>832,
-25098=>833,
-25171=>834,
-25172=>835,
-25170=>836,
-25169=>837,
-26021=>838,
-26086=>839,
-26414=>840,
-26412=>841,
-26410=>842,
-26411=>843,
-26413=>844,
-27491=>845,
-27597=>846,
-27665=>847,
-27664=>848,
-27704=>849,
-27713=>850,
-27712=>851,
-27710=>852,
-29359=>853,
-29572=>854,
-12126=>854,
-29577=>855,
-12127=>855,
-29916=>856,
-12128=>856,
-29926=>857,
-12129=>857,
-29976=>858,
-12130=>858,
-29983=>859,
-12131=>859,
-12132=>860,
-29992=>860,
-29993=>861,
-12133=>862,
-30000=>862,
-30001=>863,
-30002=>864,
-30003=>865,
-12134=>866,
-30091=>866,
-30333=>867,
-12137=>867,
-30382=>868,
-12138=>868,
-30399=>869,
-12139=>869,
-30446=>870,
-12140=>870,
-30683=>871,
-12141=>871,
-30690=>872,
-12142=>872,
-30707=>873,
-12143=>873,
-31034=>874,
-12144=>874,
-31166=>875,
-12146=>875,
-31348=>876,
-12147=>876,
-31435=>877,
-12148=>877,
-19998=>878,
-19999=>879,
-20050=>880,
-20051=>881,
-20073=>882,
-20121=>883,
-20132=>884,
-20134=>885,
-20133=>886,
-20223=>887,
-20233=>888,
-20249=>889,
-20234=>890,
-20245=>891,
-20237=>892,
-20240=>893,
-20241=>894,
-20239=>895,
-20210=>896,
-20214=>897,
-20219=>898,
-20208=>899,
-20211=>900,
-20221=>901,
-20225=>902,
-20235=>903,
-20809=>904,
-20807=>905,
-20806=>906,
-20808=>907,
-20840=>908,
-20849=>909,
-20877=>910,
-20912=>911,
-21015=>912,
-21009=>913,
-21010=>914,
-21006=>915,
-21014=>916,
-21155=>917,
-21256=>918,
-21281=>919,
-21280=>920,
-21360=>921,
-21361=>922,
-21513=>923,
-21519=>924,
-21516=>925,
-21514=>926,
-21520=>927,
-21505=>928,
-21515=>929,
-21508=>930,
-21521=>931,
-21517=>932,
-21512=>933,
-21507=>934,
-21518=>935,
-21510=>936,
-21522=>937,
-22240=>938,
-22238=>939,
-22237=>940,
-22323=>941,
-22320=>942,
-22312=>943,
-22317=>944,
-22316=>945,
-22319=>946,
-22313=>947,
-22809=>948,
-22810=>949,
-22839=>950,
-22840=>951,
-22916=>952,
-22904=>953,
-22915=>954,
-22909=>955,
-22905=>956,
-22914=>957,
-22913=>958,
-23383=>959,
-23384=>960,
-23431=>961,
-23432=>962,
-23429=>963,
-23433=>964,
-23546=>965,
-23574=>966,
-23673=>967,
-24030=>968,
-24070=>969,
-24182=>970,
-24180=>971,
-24335=>972,
-24347=>973,
-24537=>974,
-24534=>975,
-25102=>976,
-25100=>977,
-25101=>978,
-25104=>979,
-25187=>980,
-25179=>981,
-25176=>982,
-25910=>983,
-26089=>984,
-26088=>985,
-26092=>986,
-26093=>987,
-26354=>988,
-26355=>989,
-26377=>990,
-26429=>991,
-26420=>992,
-26417=>993,
-26421=>994,
-27425=>995,
-27492=>996,
-27515=>997,
-27670=>998,
-27741=>999,
-27735=>1000,
-27737=>1001,
-27743=>1002,
-27744=>1003,
-27728=>1004,
-27733=>1005,
-27745=>1006,
-27739=>1007,
-27725=>1008,
-27726=>1009,
-28784=>1010,
-29279=>1011,
-29277=>1012,
-30334=>1013,
-31481=>1014,
-12149=>1014,
-31859=>1015,
-12150=>1015,
-31992=>1016,
-12151=>1016,
-32566=>1017,
-12152=>1017,
-32650=>1018,
-12154=>1018,
-32701=>1019,
-12155=>1019,
-32769=>1020,
-12156=>1020,
-32771=>1021,
-32780=>1022,
-12157=>1022,
-32786=>1023,
-12158=>1023,
-32819=>1024,
-12159=>1024,
-32895=>1025,
-12160=>1025,
-32905=>1026,
-12161=>1026,
-32907=>1027,
-32908=>1028,
-33251=>1029,
-12162=>1029,
-33258=>1030,
-12163=>1030,
-33267=>1031,
-12164=>1031,
-33276=>1032,
-12165=>1032,
-33292=>1033,
-12166=>1033,
-33307=>1034,
-12167=>1034,
-33311=>1035,
-12168=>1035,
-33390=>1036,
-12169=>1036,
-33394=>1037,
-12170=>1037,
-33406=>1038,
-34411=>1039,
-12173=>1039,
-34880=>1040,
-12174=>1040,
-34892=>1041,
-12175=>1041,
-34915=>1042,
-12176=>1042,
-35199=>1043,
-38433=>1044,
-20018=>1045,
-20136=>1046,
-20301=>1047,
-20303=>1048,
-20295=>1049,
-20311=>1050,
-20318=>1051,
-20276=>1052,
-20315=>1053,
-20309=>1054,
-20272=>1055,
-20304=>1056,
-20305=>1057,
-20285=>1058,
-20282=>1059,
-20280=>1060,
-20291=>1061,
-20308=>1062,
-20284=>1063,
-20294=>1064,
-20323=>1065,
-20316=>1066,
-20320=>1067,
-20271=>1068,
-20302=>1069,
-20278=>1070,
-20313=>1071,
-20317=>1072,
-20296=>1073,
-20314=>1074,
-20812=>1075,
-20811=>1076,
-20813=>1077,
-20853=>1078,
-20918=>1079,
-20919=>1080,
-21029=>1081,
-21028=>1082,
-21033=>1083,
-21034=>1084,
-21032=>1085,
-21163=>1086,
-21161=>1087,
-21162=>1088,
-21164=>1089,
-21283=>1090,
-21363=>1091,
-21365=>1092,
-21533=>1093,
-21549=>1094,
-21534=>1095,
-21566=>1096,
-21542=>1097,
-21582=>1098,
-21543=>1099,
-21574=>1100,
-21571=>1101,
-21555=>1102,
-21576=>1103,
-21570=>1104,
-21531=>1105,
-21545=>1106,
-21578=>1107,
-21561=>1108,
-21563=>1109,
-21560=>1110,
-21550=>1111,
-21557=>1112,
-21558=>1113,
-21536=>1114,
-21564=>1115,
-21568=>1116,
-21553=>1117,
-21547=>1118,
-21535=>1119,
-21548=>1120,
-22250=>1121,
-22256=>1122,
-22244=>1123,
-22251=>1124,
-22346=>1125,
-22353=>1126,
-22336=>1127,
-22349=>1128,
-22343=>1129,
-22350=>1130,
-22334=>1131,
-22352=>1132,
-22351=>1133,
-22331=>1134,
-22767=>1135,
-22846=>1136,
-22941=>1137,
-22930=>1138,
-22952=>1139,
-22942=>1140,
-22947=>1141,
-22937=>1142,
-22934=>1143,
-22925=>1144,
-22948=>1145,
-22931=>1146,
-22922=>1147,
-22949=>1148,
-23389=>1149,
-23388=>1150,
-23386=>1151,
-23387=>1152,
-23436=>1153,
-23435=>1154,
-23439=>1155,
-23596=>1156,
-23616=>1157,
-23617=>1158,
-23615=>1159,
-23614=>1160,
-23696=>1161,
-23697=>1162,
-23700=>1163,
-23692=>1164,
-24043=>1165,
-24076=>1166,
-24207=>1167,
-24199=>1168,
-24202=>1169,
-24311=>1170,
-24324=>1171,
-24351=>1172,
-24420=>1173,
-24418=>1174,
-24439=>1175,
-24441=>1176,
-24536=>1177,
-24524=>1178,
-24535=>1179,
-24525=>1180,
-24561=>1181,
-24555=>1182,
-24568=>1183,
-24554=>1184,
-25106=>1185,
-25105=>1186,
-25220=>1187,
-25239=>1188,
-25238=>1189,
-25216=>1190,
-25206=>1191,
-25225=>1192,
-25197=>1193,
-25226=>1194,
-25212=>1195,
-25214=>1196,
-25209=>1197,
-25203=>1198,
-25234=>1199,
-25199=>1200,
-25240=>1201,
-25198=>1202,
-25237=>1203,
-25235=>1204,
-25233=>1205,
-25222=>1206,
-25913=>1207,
-25915=>1208,
-25912=>1209,
-26097=>1210,
-26356=>1211,
-26463=>1212,
-26446=>1213,
-26447=>1214,
-26448=>1215,
-26449=>1216,
-26460=>1217,
-26454=>1218,
-26462=>1219,
-57801=>1219,
-26441=>1220,
-26438=>1221,
-26464=>1222,
-26451=>1223,
-26455=>1224,
-27493=>1225,
-27599=>1226,
-27714=>1227,
-27742=>1228,
-27801=>1229,
-27777=>1230,
-27784=>1231,
-27785=>1232,
-27781=>1233,
-27803=>1234,
-27754=>1235,
-27770=>1236,
-27792=>1237,
-27760=>1238,
-27788=>1239,
-27752=>1240,
-27798=>1241,
-27794=>1242,
-27773=>1243,
-27779=>1244,
-27762=>1245,
-27774=>1246,
-27764=>1247,
-27782=>1248,
-27766=>1249,
-27789=>1250,
-27796=>1251,
-27800=>1252,
-27778=>1253,
-28790=>1254,
-28796=>1255,
-28797=>1256,
-28792=>1257,
-29282=>1258,
-29281=>1259,
-29280=>1260,
-29380=>1261,
-29378=>1262,
-29590=>1263,
-29996=>1264,
-29995=>1265,
-30007=>1266,
-30008=>1267,
-30338=>1268,
-30447=>1269,
-30691=>1270,
-31169=>1271,
-31168=>1272,
-31167=>1273,
-31350=>1274,
-31995=>1275,
-32597=>1276,
-32918=>1277,
-32915=>1278,
-32925=>1279,
-32920=>1280,
-32923=>1281,
-32922=>1282,
-32946=>1283,
-33391=>1284,
-33426=>1285,
-33419=>1286,
-33421=>1287,
-35211=>1288,
-12178=>1288,
-35282=>1289,
-12179=>1289,
-35328=>1290,
-12180=>1290,
-35895=>1291,
-12181=>1291,
-35910=>1292,
-12182=>1292,
-35925=>1293,
-12183=>1293,
-35997=>1294,
-12185=>1294,
-36196=>1295,
-12186=>1295,
-36208=>1296,
-12187=>1296,
-36275=>1297,
-12188=>1297,
-36523=>1298,
-12189=>1298,
-36554=>1299,
-12190=>1299,
-36763=>1300,
-12191=>1300,
-36784=>1301,
-12192=>1301,
-36802=>1302,
-36806=>1303,
-36805=>1304,
-36804=>1305,
-24033=>1306,
-12194=>1307,
-37009=>1307,
-37026=>1308,
-37034=>1309,
-37030=>1310,
-37027=>1311,
-37193=>1312,
-12195=>1312,
-37318=>1313,
-12196=>1313,
-37324=>1314,
-12197=>1314,
-38450=>1315,
-38446=>1316,
-38449=>1317,
-38442=>1318,
-38444=>1319,
-20006=>1320,
-20054=>1321,
-20083=>1322,
-20107=>1323,
-20123=>1324,
-20126=>1325,
-20139=>1326,
-20140=>1327,
-20335=>1328,
-20381=>1329,
-20365=>1330,
-20339=>1331,
-20351=>1332,
-20332=>1333,
-20379=>1334,
-20363=>1335,
-20358=>1336,
-20355=>1337,
-20336=>1338,
-20341=>1339,
-20360=>1340,
-20329=>1341,
-20347=>1342,
-20374=>1343,
-20350=>1344,
-20367=>1345,
-20369=>1346,
-20346=>1347,
-20820=>1348,
-20818=>1349,
-20821=>1350,
-20841=>1351,
-20855=>1352,
-20854=>1353,
-20856=>1354,
-20925=>1355,
-20989=>1356,
-21051=>1357,
-21048=>1358,
-21047=>1359,
-21050=>1360,
-21040=>1361,
-21038=>1362,
-21046=>1363,
-21057=>1364,
-21182=>1365,
-21179=>1366,
-21330=>1367,
-21332=>1368,
-21331=>1369,
-21329=>1370,
-21350=>1371,
-21367=>1372,
-21368=>1373,
-21369=>1374,
-21462=>1375,
-21460=>1376,
-21463=>1377,
-21619=>1378,
-21621=>1379,
-21654=>1380,
-21624=>1381,
-21653=>1382,
-21632=>1383,
-21627=>1384,
-21623=>1385,
-21636=>1386,
-21650=>1387,
-21638=>1388,
-21628=>1389,
-21648=>1390,
-21617=>1391,
-21622=>1392,
-21644=>1393,
-21658=>1394,
-21602=>1395,
-21608=>1396,
-21643=>1397,
-21629=>1398,
-21646=>1399,
-22266=>1400,
-22403=>1401,
-22391=>1402,
-22378=>1403,
-22377=>1404,
-22369=>1405,
-22374=>1406,
-22372=>1407,
-22396=>1408,
-22812=>1409,
-22857=>1410,
-22855=>1411,
-22856=>1412,
-22852=>1413,
-22868=>1414,
-22974=>1415,
-22971=>1416,
-22996=>1417,
-22969=>1418,
-22958=>1419,
-22993=>1420,
-22982=>1421,
-22992=>1422,
-22989=>1423,
-22987=>1424,
-22995=>1425,
-22986=>1426,
-22959=>1427,
-22963=>1428,
-22994=>1429,
-22981=>1430,
-23391=>1431,
-23396=>1432,
-23395=>1433,
-23447=>1434,
-23450=>1435,
-23448=>1436,
-23452=>1437,
-23449=>1438,
-23451=>1439,
-23578=>1440,
-23624=>1441,
-23621=>1442,
-23622=>1443,
-23735=>1444,
-23713=>1445,
-23736=>1446,
-23721=>1447,
-23723=>1448,
-23729=>1449,
-23731=>1450,
-24088=>1451,
-24090=>1452,
-24086=>1453,
-24085=>1454,
-24091=>1455,
-24081=>1456,
-24184=>1457,
-24218=>1458,
-24215=>1459,
-24220=>1460,
-24213=>1461,
-24214=>1462,
-24310=>1463,
-24358=>1464,
-24359=>1465,
-24361=>1466,
-24448=>1467,
-24449=>1468,
-24447=>1469,
-24444=>1470,
-24541=>1471,
-24544=>1472,
-24573=>1473,
-24565=>1474,
-24575=>1475,
-24591=>1476,
-24596=>1477,
-24623=>1478,
-24629=>1479,
-24598=>1480,
-24618=>1481,
-24597=>1482,
-24609=>1483,
-24615=>1484,
-24617=>1485,
-24619=>1486,
-24603=>1487,
-25110=>1488,
-25109=>1489,
-25151=>1490,
-25150=>1491,
-25152=>1492,
-25215=>1493,
-25289=>1494,
-25292=>1495,
-25284=>1496,
-25279=>1497,
-25282=>1498,
-25273=>1499,
-25298=>1500,
-25307=>1501,
-25259=>1502,
-25299=>1503,
-25300=>1504,
-25291=>1505,
-25288=>1506,
-25256=>1507,
-25277=>1508,
-25276=>1509,
-25296=>1510,
-60582=>1510,
-25305=>1511,
-25287=>1512,
-25293=>1513,
-25269=>1514,
-25306=>1515,
-25265=>1516,
-25304=>1517,
-25302=>1518,
-25303=>1519,
-25286=>1520,
-25260=>1521,
-25294=>1522,
-61010=>1522,
-25918=>1523,
-26023=>1524,
-26044=>1525,
-26106=>1526,
-26132=>1527,
-26131=>1528,
-26124=>1529,
-26118=>1530,
-26114=>1531,
-26126=>1532,
-26112=>1533,
-26127=>1534,
-26133=>1535,
-26122=>1536,
-26119=>1537,
-26381=>1538,
-26379=>1539,
-26477=>1540,
-26507=>1541,
-26517=>1542,
-26481=>1543,
-26524=>1544,
-26483=>1545,
-26487=>1546,
-26503=>1547,
-26525=>1548,
-26519=>1549,
-26479=>1550,
-26480=>1551,
-26495=>1552,
-26505=>1553,
-26494=>1554,
-26512=>1555,
-26485=>1556,
-26522=>1557,
-26515=>1558,
-26492=>1559,
-26474=>1560,
-26482=>1561,
-27427=>1562,
-27494=>1563,
-27495=>1564,
-27519=>1565,
-27667=>1566,
-27675=>1567,
-27875=>1568,
-27880=>1569,
-27891=>1570,
-27825=>1571,
-27852=>1572,
-27877=>1573,
-27827=>1574,
-27837=>1575,
-27838=>1576,
-27836=>1577,
-27874=>1578,
-27819=>1579,
-27861=>1580,
-27859=>1581,
-27832=>1582,
-27844=>1583,
-27833=>1584,
-27841=>1585,
-27822=>1586,
-27863=>1587,
-27845=>1588,
-27889=>1589,
-27839=>1590,
-27835=>1591,
-27873=>1592,
-27867=>1593,
-27850=>1594,
-27820=>1595,
-27887=>1596,
-27868=>1597,
-27862=>1598,
-27872=>1599,
-28821=>1600,
-28814=>1601,
-28818=>1602,
-28810=>1603,
-28825=>1604,
-29228=>1605,
-29229=>1606,
-29240=>1607,
-29256=>1608,
-29287=>1609,
-29289=>1610,
-29376=>1611,
-29390=>1612,
-29401=>1613,
-29399=>1614,
-29392=>1615,
-29609=>1616,
-29608=>1617,
-29599=>1618,
-29611=>1619,
-29605=>1620,
-30013=>1621,
-30109=>1622,
-30105=>1623,
-30106=>1624,
-30340=>1625,
-30402=>1626,
-30450=>1627,
-30452=>1628,
-30693=>1629,
-30717=>1630,
-31038=>1631,
-31040=>1632,
-31041=>1633,
-31177=>1634,
-31176=>1635,
-31354=>1636,
-31353=>1637,
-31482=>1638,
-31998=>1639,
-32596=>1640,
-32652=>1641,
-32651=>1642,
-32773=>1643,
-58236=>1643,
-32954=>1644,
-32933=>1645,
-32930=>1646,
-32945=>1647,
-32929=>1648,
-32939=>1649,
-32937=>1650,
-32948=>1651,
-32938=>1652,
-32943=>1653,
-33253=>1654,
-33278=>1655,
-33293=>1656,
-33459=>1657,
-33437=>1658,
-33433=>1659,
-33453=>1660,
-33469=>1661,
-33439=>1662,
-33465=>1663,
-33457=>1664,
-33452=>1665,
-33445=>1666,
-33455=>1667,
-33464=>1668,
-33443=>1669,
-33456=>1670,
-33470=>1671,
-33463=>1672,
-34382=>1673,
-34417=>1674,
-21021=>1675,
-34920=>1676,
-36555=>1677,
-36814=>1678,
-36820=>1679,
-36817=>1680,
-37045=>1681,
-37048=>1682,
-37041=>1683,
-37046=>1684,
-37319=>1685,
-37329=>1686,
-12198=>1686,
-38263=>1687,
-12199=>1687,
-38272=>1688,
-12200=>1688,
-38428=>1689,
-12201=>1689,
-38464=>1690,
-38463=>1691,
-38459=>1692,
-38468=>1693,
-38466=>1694,
-38585=>1695,
-12203=>1695,
-38632=>1696,
-12204=>1696,
-38738=>1697,
-12206=>1698,
-38750=>1698,
-20127=>1699,
-20141=>1700,
-20142=>1701,
-20449=>1702,
-20405=>1703,
-20399=>1704,
-20415=>1705,
-20448=>1706,
-20433=>1707,
-20431=>1708,
-20445=>1709,
-20419=>1710,
-20406=>1711,
-20440=>1712,
-20447=>1713,
-20426=>1714,
-20439=>1715,
-20398=>1716,
-20432=>1717,
-20420=>1718,
-20418=>1719,
-20442=>1720,
-20430=>1721,
-20446=>1722,
-20407=>1723,
-20823=>1724,
-20882=>1725,
-20881=>1726,
-20896=>1727,
-21070=>1728,
-21059=>1729,
-21066=>1730,
-21069=>1731,
-21068=>1732,
-21067=>1733,
-21063=>1734,
-21191=>1735,
-21193=>1736,
-21187=>1737,
-21185=>1738,
-21261=>1739,
-21335=>1740,
-21371=>1741,
-21402=>1742,
-21467=>1743,
-21676=>1744,
-21696=>1745,
-21672=>1746,
-21710=>1747,
-21705=>1748,
-21688=>1749,
-21670=>1750,
-21683=>1751,
-21703=>1752,
-21698=>1753,
-21693=>1754,
-21674=>1755,
-21697=>1756,
-21700=>1757,
-21704=>1758,
-21679=>1759,
-21675=>1760,
-21681=>1761,
-21691=>1762,
-21673=>1763,
-21671=>1764,
-21695=>1765,
-22271=>1766,
-22402=>1767,
-22411=>1768,
-22432=>1769,
-22435=>1770,
-22434=>1771,
-22478=>1772,
-22446=>1773,
-22419=>1774,
-22869=>1775,
-22865=>1776,
-22863=>1777,
-22862=>1778,
-22864=>1779,
-23004=>1780,
-23000=>1781,
-23039=>1782,
-23011=>1783,
-23016=>1784,
-23043=>1785,
-23013=>1786,
-23018=>1787,
-23002=>1788,
-23014=>1789,
-23041=>1790,
-23035=>1791,
-23401=>1792,
-23459=>1793,
-23462=>1794,
-23460=>1795,
-23458=>1796,
-23461=>1797,
-23553=>1798,
-23630=>1799,
-23631=>1800,
-23629=>1801,
-23627=>1802,
-23769=>1803,
-23762=>1804,
-24055=>1805,
-24093=>1806,
-24101=>1807,
-24095=>1808,
-24189=>1809,
-24224=>1810,
-24230=>1811,
-24314=>1812,
-24328=>1813,
-24365=>1814,
-24421=>1815,
-24456=>1816,
-24453=>1817,
-24458=>1818,
-24459=>1819,
-24455=>1820,
-24460=>1821,
-24457=>1822,
-24594=>1823,
-24605=>1824,
-24608=>1825,
-24613=>1826,
-24590=>1827,
-24616=>1828,
-24653=>1829,
-24688=>1830,
-24680=>1831,
-24674=>1832,
-60712=>1832,
-24646=>1833,
-24643=>1834,
-24684=>1835,
-24683=>1836,
-24682=>1837,
-24676=>1838,
-25153=>1839,
-25308=>1840,
-25366=>1841,
-25353=>1842,
-25340=>1843,
-25325=>1844,
-25345=>1845,
-25326=>1846,
-25341=>1847,
-25351=>1848,
-25329=>1849,
-25335=>1850,
-25327=>1851,
-25324=>1852,
-25342=>1853,
-25332=>1854,
-25361=>1855,
-25346=>1856,
-25919=>1857,
-25925=>1858,
-26027=>1859,
-26045=>1860,
-26082=>1861,
-26149=>1862,
-26157=>1863,
-26144=>1864,
-26151=>1865,
-26159=>1866,
-26143=>1867,
-26152=>1868,
-26161=>1869,
-26148=>1870,
-26359=>1871,
-26623=>1872,
-26579=>1873,
-26609=>1874,
-26580=>1875,
-26576=>1876,
-26604=>1877,
-26550=>1878,
-26543=>1879,
-26613=>1880,
-26601=>1881,
-26607=>1882,
-26564=>1883,
-26577=>1884,
-26548=>1885,
-26586=>1886,
-26597=>1887,
-26552=>1888,
-26575=>1889,
-26590=>1890,
-26611=>1891,
-26544=>1892,
-26585=>1893,
-26594=>1894,
-26589=>1895,
-26578=>1896,
-27498=>1897,
-27523=>1898,
-27526=>1899,
-27573=>1900,
-27602=>1901,
-27607=>1902,
-27679=>1903,
-27849=>1904,
-27915=>1905,
-27954=>1906,
-27946=>1907,
-27969=>1908,
-27941=>1909,
-27916=>1910,
-27953=>1911,
-27934=>1912,
-27927=>1913,
-27963=>1914,
-27965=>1915,
-27966=>1916,
-27958=>1917,
-27931=>1918,
-27893=>1919,
-27961=>1920,
-27943=>1921,
-27960=>1922,
-27945=>1923,
-27950=>1924,
-27957=>1925,
-27918=>1926,
-27947=>1927,
-28843=>1928,
-28858=>1929,
-28851=>1930,
-28844=>1931,
-28847=>1932,
-28845=>1933,
-28856=>1934,
-28846=>1935,
-28836=>1936,
-29232=>1937,
-29298=>1938,
-29295=>1939,
-29300=>1940,
-29417=>1941,
-29408=>1942,
-29409=>1943,
-29623=>1944,
-29642=>1945,
-29627=>1946,
-29618=>1947,
-29645=>1948,
-29632=>1949,
-29619=>1950,
-29978=>1951,
-29997=>1952,
-30031=>1953,
-30028=>1954,
-30030=>1955,
-30027=>1956,
-30123=>1957,
-30116=>1958,
-30117=>1959,
-30114=>1960,
-30115=>1961,
-30328=>1962,
-30342=>1963,
-30343=>1964,
-30344=>1965,
-30408=>1966,
-30406=>1967,
-30403=>1968,
-30405=>1969,
-30465=>1970,
-30457=>1971,
-30456=>1972,
-30473=>1973,
-30475=>1974,
-30462=>1975,
-30460=>1976,
-30471=>1977,
-30684=>1978,
-30722=>1979,
-30740=>1980,
-30732=>1981,
-30733=>1982,
-31046=>1983,
-31049=>1984,
-31048=>1985,
-31047=>1986,
-31161=>1987,
-31162=>1988,
-31185=>1989,
-31186=>1990,
-31179=>1991,
-31359=>1992,
-31361=>1993,
-31487=>1994,
-31485=>1995,
-31869=>1996,
-32002=>1997,
-32005=>1998,
-32000=>1999,
-32009=>2000,
-32007=>2001,
-32004=>2002,
-32006=>2003,
-32568=>2004,
-32654=>2005,
-32703=>2006,
-32784=>2007,
-32781=>2008,
-32785=>2009,
-32822=>2010,
-32982=>2011,
-32997=>2012,
-32986=>2013,
-32963=>2014,
-32964=>2015,
-32972=>2016,
-32993=>2017,
-32987=>2018,
-32974=>2019,
-32990=>2020,
-32996=>2021,
-32989=>2022,
-33268=>2023,
-33314=>2024,
-33511=>2025,
-33539=>2026,
-33541=>2027,
-33507=>2028,
-33499=>2029,
-33510=>2030,
-33540=>2031,
-33509=>2032,
-33538=>2033,
-33545=>2034,
-33490=>2035,
-33495=>2036,
-33521=>2037,
-33537=>2038,
-33500=>2039,
-33492=>2040,
-33489=>2041,
-33502=>2042,
-33491=>2043,
-33503=>2044,
-33519=>2045,
-33542=>2046,
-34384=>2047,
-34425=>2048,
-34427=>2049,
-34426=>2050,
-34893=>2051,
-34923=>2052,
-35201=>2053,
-35284=>2054,
-35336=>2055,
-35330=>2056,
-35331=>2057,
-35998=>2058,
-36000=>2059,
-36212=>2060,
-36211=>2061,
-36276=>2062,
-36557=>2063,
-36556=>2064,
-36848=>2065,
-36838=>2066,
-36834=>2067,
-36842=>2068,
-36837=>2069,
-36845=>2070,
-36843=>2071,
-36836=>2072,
-36840=>2073,
-37066=>2074,
-37070=>2075,
-37057=>2076,
-37059=>2077,
-37195=>2078,
-37194=>2079,
-37325=>2080,
-38274=>2081,
-38480=>2082,
-38475=>2083,
-38476=>2084,
-38477=>2085,
-38754=>2086,
-12207=>2086,
-38761=>2087,
-12208=>2087,
-38859=>2088,
-12209=>2088,
-38893=>2089,
-12210=>2089,
-38899=>2090,
-12211=>2090,
-38913=>2091,
-12212=>2091,
-39080=>2092,
-12213=>2092,
-39131=>2093,
-12214=>2093,
-39135=>2094,
-12215=>2094,
-39318=>2095,
-12216=>2095,
-39321=>2096,
-12217=>2096,
-20056=>2097,
-20147=>2098,
-20492=>2099,
-20493=>2100,
-20515=>2101,
-20463=>2102,
-20518=>2103,
-20517=>2104,
-20472=>2105,
-20521=>2106,
-57375=>2106,
-20502=>2107,
-20486=>2108,
-20540=>2109,
-20511=>2110,
-20506=>2111,
-20498=>2112,
-20497=>2113,
-20474=>2114,
-20480=>2115,
-20500=>2116,
-20520=>2117,
-20465=>2118,
-20513=>2119,
-20491=>2120,
-20505=>2121,
-20504=>2122,
-20467=>2123,
-20462=>2124,
-20525=>2125,
-20522=>2126,
-20478=>2127,
-20523=>2128,
-20489=>2129,
-20860=>2130,
-20900=>2131,
-20901=>2132,
-20898=>2133,
-20941=>2134,
-20940=>2135,
-20934=>2136,
-20939=>2137,
-21078=>2138,
-21084=>2139,
-21076=>2140,
-21083=>2141,
-21085=>2142,
-21290=>2143,
-21375=>2144,
-57459=>2144,
-21407=>2145,
-21405=>2146,
-21471=>2147,
-21736=>2148,
-21776=>2149,
-21761=>2150,
-21815=>2151,
-21756=>2152,
-21733=>2153,
-21746=>2154,
-21766=>2155,
-21754=>2156,
-21780=>2157,
-21737=>2158,
-21741=>2159,
-21729=>2160,
-21769=>2161,
-21742=>2162,
-21738=>2163,
-21734=>2164,
-21799=>2165,
-21767=>2166,
-21757=>2167,
-21775=>2168,
-22275=>2169,
-22276=>2170,
-22466=>2171,
-22484=>2172,
-22475=>2173,
-22467=>2174,
-22537=>2175,
-22799=>2176,
-22871=>2177,
-22872=>2178,
-22874=>2179,
-23057=>2180,
-23064=>2181,
-23068=>2182,
-23071=>2183,
-23067=>2184,
-23059=>2185,
-23020=>2186,
-23072=>2187,
-23075=>2188,
-23081=>2189,
-23077=>2190,
-23052=>2191,
-23049=>2192,
-23403=>2193,
-23640=>2194,
-23472=>2195,
-23475=>2196,
-23478=>2197,
-23476=>2198,
-23470=>2199,
-23477=>2200,
-23481=>2201,
-23480=>2202,
-23556=>2203,
-23633=>2204,
-23637=>2205,
-23632=>2206,
-23789=>2207,
-23805=>2208,
-23803=>2209,
-23786=>2210,
-23784=>2211,
-23792=>2212,
-23798=>2213,
-23809=>2214,
-23796=>2215,
-24046=>2216,
-24109=>2217,
-24107=>2218,
-24235=>2219,
-24237=>2220,
-24231=>2221,
-24369=>2222,
-24466=>2223,
-24465=>2224,
-24464=>2225,
-24665=>2226,
-24675=>2227,
-24677=>2228,
-24656=>2229,
-24661=>2230,
-24685=>2231,
-24681=>2232,
-24687=>2233,
-24708=>2234,
-24735=>2235,
-24730=>2236,
-24717=>2237,
-24724=>2238,
-24716=>2239,
-24709=>2240,
-24726=>2241,
-25159=>2242,
-25331=>2243,
-25352=>2244,
-25343=>2245,
-25422=>2246,
-25406=>2247,
-25391=>2248,
-25429=>2249,
-25410=>2250,
-25414=>2251,
-25423=>2252,
-25417=>2253,
-25402=>2254,
-25424=>2255,
-25405=>2256,
-25386=>2257,
-25387=>2258,
-25384=>2259,
-25421=>2260,
-25420=>2261,
-25928=>2262,
-25929=>2263,
-26009=>2264,
-26049=>2265,
-26053=>2266,
-26178=>2267,
-26185=>2268,
-26191=>2269,
-26179=>2270,
-26194=>2271,
-26188=>2272,
-26181=>2273,
-26177=>2274,
-26360=>2275,
-26388=>2276,
-26389=>2277,
-26391=>2278,
-26657=>2279,
-26680=>2280,
-26696=>2281,
-26694=>2282,
-26707=>2283,
-26681=>2284,
-26690=>2285,
-26708=>2286,
-26665=>2287,
-26803=>2288,
-26647=>2289,
-26700=>2290,
-26705=>2291,
-26685=>2292,
-26612=>2293,
-26704=>2294,
-26688=>2295,
-26684=>2296,
-26691=>2297,
-26666=>2298,
-26693=>2299,
-26643=>2300,
-26648=>2301,
-26689=>2302,
-27530=>2303,
-27529=>2304,
-27575=>2305,
-27683=>2306,
-27687=>2307,
-27688=>2308,
-27686=>2309,
-27684=>2310,
-27888=>2311,
-28010=>2312,
-28053=>2313,
-28040=>2314,
-28039=>2315,
-28006=>2316,
-28024=>2317,
-28023=>2318,
-27993=>2319,
-28051=>2320,
-28012=>2321,
-28041=>2322,
-28014=>2323,
-27994=>2324,
-28020=>2325,
-28009=>2326,
-28044=>2327,
-28042=>2328,
-28025=>2329,
-28037=>2330,
-28005=>2331,
-28052=>2332,
-28874=>2333,
-28888=>2334,
-28900=>2335,
-28889=>2336,
-28872=>2337,
-28879=>2338,
-29241=>2339,
-29305=>2340,
-29436=>2341,
-29433=>2342,
-29437=>2343,
-29432=>2344,
-29431=>2345,
-29574=>2346,
-29677=>2347,
-29705=>2348,
-29678=>2349,
-29664=>2350,
-29674=>2351,
-29662=>2352,
-30036=>2353,
-30045=>2354,
-30044=>2355,
-30042=>2356,
-30041=>2357,
-30142=>2358,
-30149=>2359,
-30151=>2360,
-30130=>2361,
-30131=>2362,
-30141=>2363,
-30140=>2364,
-30137=>2365,
-30146=>2366,
-30136=>2367,
-30347=>2368,
-30384=>2369,
-30410=>2370,
-30413=>2371,
-30414=>2372,
-30505=>2373,
-30495=>2374,
-30496=>2375,
-30504=>2376,
-30697=>2377,
-30768=>2378,
-30759=>2379,
-30776=>2380,
-30749=>2381,
-30772=>2382,
-30775=>2383,
-30757=>2384,
-30765=>2385,
-30752=>2386,
-30751=>2387,
-30770=>2388,
-31061=>2389,
-31056=>2390,
-31072=>2391,
-31071=>2392,
-31062=>2393,
-31070=>2394,
-31069=>2395,
-31063=>2396,
-31066=>2397,
-31204=>2398,
-31203=>2399,
-60418=>2399,
-31207=>2400,
-31199=>2401,
-31206=>2402,
-31209=>2403,
-31192=>2404,
-31364=>2405,
-31368=>2406,
-31449=>2407,
-31494=>2408,
-31505=>2409,
-31881=>2410,
-32033=>2411,
-32023=>2412,
-32011=>2413,
-32010=>2414,
-32032=>2415,
-32034=>2416,
-32020=>2417,
-32016=>2418,
-32021=>2419,
-32026=>2420,
-32028=>2421,
-32013=>2422,
-32025=>2423,
-32027=>2424,
-32570=>2425,
-32607=>2426,
-32660=>2427,
-32709=>2428,
-32705=>2429,
-32774=>2430,
-32772=>2431,
-32792=>2432,
-32789=>2433,
-32793=>2434,
-32791=>2435,
-32829=>2436,
-32831=>2437,
-33009=>2438,
-33026=>2439,
-33008=>2440,
-33029=>2441,
-33005=>2442,
-33012=>2443,
-33030=>2444,
-33016=>2445,
-33011=>2446,
-33032=>2447,
-33021=>2448,
-33034=>2449,
-33020=>2450,
-33007=>2451,
-33261=>2452,
-33260=>2453,
-33280=>2454,
-33296=>2455,
-33322=>2456,
-33323=>2457,
-33320=>2458,
-33324=>2459,
-33467=>2460,
-33579=>2461,
-33618=>2462,
-33620=>2463,
-33610=>2464,
-33592=>2465,
-33616=>2466,
-33609=>2467,
-33589=>2468,
-33588=>2469,
-33615=>2470,
-33586=>2471,
-33593=>2472,
-33590=>2473,
-33559=>2474,
-33600=>2475,
-33585=>2476,
-33576=>2477,
-33603=>2478,
-34388=>2479,
-34442=>2480,
-34474=>2481,
-34451=>2482,
-34468=>2483,
-34473=>2484,
-34444=>2485,
-34467=>2486,
-34460=>2487,
-34928=>2488,
-34935=>2489,
-34945=>2490,
-34946=>2491,
-34941=>2492,
-34937=>2493,
-35352=>2494,
-35344=>2495,
-35342=>2496,
-35340=>2497,
-35349=>2498,
-35338=>2499,
-35351=>2500,
-35347=>2501,
-35350=>2502,
-35343=>2503,
-35345=>2504,
-35912=>2505,
-35962=>2506,
-35961=>2507,
-36001=>2508,
-36002=>2509,
-36215=>2510,
-58442=>2510,
-36524=>2511,
-36562=>2512,
-36564=>2513,
-36559=>2514,
-36785=>2515,
-36865=>2516,
-36870=>2517,
-36855=>2518,
-36864=>2519,
-36858=>2520,
-36852=>2521,
-36867=>2522,
-36861=>2523,
-36869=>2524,
-36856=>2525,
-37013=>2526,
-37089=>2527,
-37085=>2528,
-37090=>2529,
-37202=>2530,
-37197=>2531,
-37196=>2532,
-37336=>2533,
-37341=>2534,
-37335=>2535,
-37340=>2536,
-37337=>2537,
-38275=>2538,
-38498=>2539,
-38499=>2540,
-38497=>2541,
-38491=>2542,
-38493=>2543,
-38500=>2544,
-38488=>2545,
-38494=>2546,
-38587=>2547,
-39138=>2548,
-39340=>2549,
-12218=>2549,
-39592=>2550,
-12219=>2550,
-39640=>2551,
-12220=>2551,
-12222=>2552,
-39717=>2552,
-39730=>2553,
-12224=>2553,
-39740=>2554,
-12225=>2554,
-20094=>2555,
-20602=>2556,
-20605=>2557,
-57382=>2557,
-20572=>2558,
-20551=>2559,
-20547=>2560,
-20556=>2561,
-20570=>2562,
-20553=>2563,
-20581=>2564,
-20598=>2565,
-20558=>2566,
-20565=>2567,
-20597=>2568,
-20596=>2569,
-20599=>2570,
-20559=>2571,
-20495=>2572,
-20591=>2573,
-20589=>2574,
-20828=>2575,
-20885=>2576,
-20976=>2577,
-21098=>2578,
-21103=>2579,
-21202=>2580,
-21209=>2581,
-21208=>2582,
-21205=>2583,
-21264=>2584,
-21263=>2585,
-21273=>2586,
-21311=>2587,
-21312=>2588,
-21310=>2589,
-21443=>2590,
-26364=>2591,
-21830=>2592,
-21866=>2593,
-21862=>2594,
-21828=>2595,
-21854=>2596,
-21857=>2597,
-21827=>2598,
-21834=>2599,
-21809=>2600,
-21846=>2601,
-21839=>2602,
-21845=>2603,
-21807=>2604,
-21860=>2605,
-21816=>2606,
-21806=>2607,
-21852=>2608,
-21804=>2609,
-21859=>2610,
-21811=>2611,
-21825=>2612,
-21847=>2613,
-22280=>2614,
-22283=>2615,
-22281=>2616,
-22495=>2617,
-22533=>2618,
-22538=>2619,
-22534=>2620,
-22496=>2621,
-22500=>2622,
-22522=>2623,
-22530=>2624,
-22581=>2625,
-22519=>2626,
-22521=>2627,
-22816=>2628,
-22882=>2629,
-23094=>2630,
-23105=>2631,
-23113=>2632,
-23142=>2633,
-23146=>2634,
-23104=>2635,
-23100=>2636,
-23138=>2637,
-23130=>2638,
-23110=>2639,
-23114=>2640,
-23408=>2641,
-23495=>2642,
-23493=>2643,
-23492=>2644,
-23490=>2645,
-23487=>2646,
-23494=>2647,
-23561=>2648,
-23560=>2649,
-23559=>2650,
-23648=>2651,
-23644=>2652,
-23645=>2653,
-23815=>2654,
-23814=>2655,
-23822=>2656,
-23835=>2657,
-23830=>2658,
-23842=>2659,
-23825=>2660,
-23849=>2661,
-23828=>2662,
-23833=>2663,
-23844=>2664,
-23847=>2665,
-23831=>2666,
-24034=>2667,
-24120=>2668,
-24118=>2669,
-24115=>2670,
-24119=>2671,
-24247=>2672,
-24248=>2673,
-24246=>2674,
-24245=>2675,
-24254=>2676,
-24373=>2677,
-24375=>2678,
-24407=>2679,
-24428=>2680,
-24425=>2681,
-24427=>2682,
-24471=>2683,
-24473=>2684,
-24478=>2685,
-24472=>2686,
-24481=>2687,
-24480=>2688,
-24476=>2689,
-24703=>2690,
-24739=>2691,
-24713=>2692,
-24736=>2693,
-24744=>2694,
-24779=>2695,
-24756=>2696,
-24806=>2697,
-24765=>2698,
-24773=>2699,
-24763=>2700,
-24757=>2701,
-24796=>2702,
-24764=>2703,
-24792=>2704,
-24789=>2705,
-24774=>2706,
-24799=>2707,
-24760=>2708,
-24794=>2709,
-24775=>2710,
-25114=>2711,
-25115=>2712,
-25160=>2713,
-25504=>2714,
-25511=>2715,
-25458=>2716,
-25494=>2717,
-25506=>2718,
-25509=>2719,
-25463=>2720,
-25447=>2721,
-25496=>2722,
-25514=>2723,
-25457=>2724,
-25513=>2725,
-25481=>2726,
-25475=>2727,
-25499=>2728,
-25451=>2729,
-25512=>2730,
-25476=>2731,
-25480=>2732,
-25497=>2733,
-25505=>2734,
-25516=>2735,
-25490=>2736,
-25487=>2737,
-25472=>2738,
-25467=>2739,
-25449=>2740,
-25448=>2741,
-25466=>2742,
-25949=>2743,
-25942=>2744,
-25937=>2745,
-25945=>2746,
-25943=>2747,
-21855=>2748,
-25935=>2749,
-25944=>2750,
-25941=>2751,
-25940=>2752,
-26012=>2753,
-26011=>2754,
-26028=>2755,
-26063=>2756,
-26059=>2757,
-26060=>2758,
-26062=>2759,
-26205=>2760,
-26202=>2761,
-26212=>2762,
-26216=>2763,
-26214=>2764,
-26206=>2765,
-26361=>2766,
-21207=>2767,
-26395=>2768,
-26753=>2769,
-26799=>2770,
-26786=>2771,
-26771=>2772,
-26805=>2773,
-26751=>2774,
-26742=>2775,
-26801=>2776,
-26791=>2777,
-26775=>2778,
-26800=>2779,
-26755=>2780,
-26820=>2781,
-26797=>2782,
-26758=>2783,
-26757=>2784,
-26772=>2785,
-26781=>2786,
-26792=>2787,
-26783=>2788,
-26785=>2789,
-26754=>2790,
-27442=>2791,
-27578=>2792,
-27627=>2793,
-27628=>2794,
-27691=>2795,
-28046=>2796,
-28092=>2797,
-28147=>2798,
-28121=>2799,
-28082=>2800,
-28129=>2801,
-28108=>2802,
-28132=>2803,
-28155=>2804,
-28154=>2805,
-28165=>2806,
-28103=>2807,
-28107=>2808,
-28079=>2809,
-28113=>2810,
-28078=>2811,
-28126=>2812,
-28153=>2813,
-28088=>2814,
-28151=>2815,
-28149=>2816,
-28101=>2817,
-28114=>2818,
-28186=>2819,
-28085=>2820,
-28122=>2821,
-28139=>2822,
-28120=>2823,
-28138=>2824,
-28145=>2825,
-28142=>2826,
-28136=>2827,
-28102=>2828,
-28100=>2829,
-28074=>2830,
-28140=>2831,
-28095=>2832,
-28134=>2833,
-28921=>2834,
-28937=>2835,
-28938=>2836,
-28925=>2837,
-28911=>2838,
-29245=>2839,
-29309=>2840,
-29313=>2841,
-29468=>2842,
-29467=>2843,
-29462=>2844,
-29459=>2845,
-29465=>2846,
-29575=>2847,
-29701=>2848,
-29706=>2849,
-29699=>2850,
-29702=>2851,
-29694=>2852,
-29709=>2853,
-29920=>2854,
-29942=>2855,
-29943=>2856,
-29980=>2857,
-29986=>2858,
-30053=>2859,
-30054=>2860,
-30050=>2861,
-30064=>2862,
-30095=>2863,
-30164=>2864,
-30165=>2865,
-30133=>2866,
-30154=>2867,
-30157=>2868,
-30350=>2869,
-30420=>2870,
-30418=>2871,
-30427=>2872,
-30519=>2873,
-30526=>2874,
-30524=>2875,
-30518=>2876,
-30520=>2877,
-30522=>2878,
-30827=>2879,
-30787=>2880,
-30798=>2881,
-31077=>2882,
-31080=>2883,
-31085=>2884,
-31227=>2885,
-31378=>2886,
-31381=>2887,
-31520=>2888,
-31528=>2889,
-31515=>2890,
-31532=>2891,
-31526=>2892,
-31513=>2893,
-31518=>2894,
-31534=>2895,
-31890=>2896,
-31895=>2897,
-31893=>2898,
-32070=>2899,
-32067=>2900,
-32113=>2901,
-32046=>2902,
-32057=>2903,
-32060=>2904,
-32064=>2905,
-32048=>2906,
-32051=>2907,
-32068=>2908,
-32047=>2909,
-32066=>2910,
-32050=>2911,
-32049=>2912,
-32573=>2913,
-32670=>2914,
-32666=>2915,
-32716=>2916,
-32718=>2917,
-32722=>2918,
-32796=>2919,
-32842=>2920,
-32838=>2921,
-33071=>2922,
-33046=>2923,
-33059=>2924,
-33067=>2925,
-33065=>2926,
-33072=>2927,
-33060=>2928,
-33282=>2929,
-33333=>2930,
-33335=>2931,
-33334=>2932,
-33337=>2933,
-33678=>2934,
-33694=>2935,
-33688=>2936,
-33656=>2937,
-33698=>2938,
-33686=>2939,
-33725=>2940,
-33707=>2941,
-33682=>2942,
-33674=>2943,
-33683=>2944,
-33673=>2945,
-33696=>2946,
-33655=>2947,
-33659=>2948,
-33660=>2949,
-33670=>2950,
-33703=>2951,
-34389=>2952,
-24426=>2953,
-34503=>2954,
-34496=>2955,
-34486=>2956,
-34500=>2957,
-34485=>2958,
-34502=>2959,
-34507=>2960,
-34481=>2961,
-34479=>2962,
-34505=>2963,
-34899=>2964,
-34974=>2965,
-34952=>2966,
-34987=>2967,
-34962=>2968,
-34966=>2969,
-34957=>2970,
-34955=>2971,
-35219=>2972,
-35215=>2973,
-35370=>2974,
-35357=>2975,
-35363=>2976,
-35365=>2977,
-35377=>2978,
-35373=>2979,
-35359=>2980,
-35355=>2981,
-35362=>2982,
-35913=>2983,
-35930=>2984,
-36009=>2985,
-36012=>2986,
-36011=>2987,
-36008=>2988,
-36010=>2989,
-36007=>2990,
-36199=>2991,
-36198=>2992,
-36286=>2993,
-36282=>2994,
-36571=>2995,
-36575=>2996,
-36889=>2997,
-36877=>2998,
-36890=>2999,
-36887=>3000,
-36899=>3001,
-36895=>3002,
-36893=>3003,
-36880=>3004,
-36885=>3005,
-36894=>3006,
-36896=>3007,
-36879=>3008,
-36898=>3009,
-36886=>3010,
-36891=>3011,
-36884=>3012,
-37096=>3013,
-37101=>3014,
-37117=>3015,
-58488=>3015,
-37207=>3016,
-37326=>3017,
-37365=>3018,
-37350=>3019,
-37347=>3020,
-37351=>3021,
-37357=>3022,
-37353=>3023,
-38281=>3024,
-38506=>3025,
-38517=>3026,
-38515=>3027,
-38520=>3028,
-38512=>3029,
-38516=>3030,
-38518=>3031,
-38519=>3032,
-38508=>3033,
-38592=>3034,
-38634=>3035,
-38633=>3036,
-31456=>3037,
-31455=>3038,
-38914=>3039,
-38915=>3040,
-39770=>3041,
-12226=>3041,
-40165=>3042,
-12227=>3042,
-40565=>3043,
-12228=>3043,
-40575=>3044,
-12229=>3044,
-40613=>3045,
-12230=>3045,
-40635=>3046,
-12231=>3046,
-20642=>3047,
-20621=>3048,
-20613=>3049,
-20633=>3050,
-20625=>3051,
-20608=>3052,
-20630=>3053,
-20632=>3054,
-20634=>3055,
-26368=>3056,
-20977=>3057,
-21106=>3058,
-21108=>3059,
-21109=>3060,
-21097=>3061,
-21214=>3062,
-21213=>3063,
-21211=>3064,
-21338=>3065,
-21413=>3066,
-21883=>3067,
-21888=>3068,
-21927=>3069,
-21884=>3070,
-21898=>3071,
-21917=>3072,
-21912=>3073,
-21890=>3074,
-21916=>3075,
-21930=>3076,
-21908=>3077,
-21895=>3078,
-21899=>3079,
-21891=>3080,
-21939=>3081,
-21934=>3082,
-21919=>3083,
-21822=>3084,
-21938=>3085,
-21914=>3086,
-21947=>3087,
-21932=>3088,
-21937=>3089,
-21886=>3090,
-21897=>3091,
-21931=>3092,
-21913=>3093,
-22285=>3094,
-22575=>3095,
-22570=>3096,
-22580=>3097,
-22564=>3098,
-22576=>3099,
-22577=>3100,
-22561=>3101,
-22557=>3102,
-22560=>3103,
-22777=>3104,
-22778=>3105,
-22880=>3106,
-23159=>3107,
-57587=>3107,
-23194=>3108,
-23167=>3109,
-23186=>3110,
-23195=>3111,
-23207=>3112,
-23411=>3113,
-23409=>3114,
-23506=>3115,
-23500=>3116,
-23507=>3117,
-23504=>3118,
-23562=>3119,
-23563=>3120,
-23601=>3121,
-23884=>3122,
-23888=>3123,
-23860=>3124,
-23879=>3125,
-24061=>3126,
-24133=>3127,
-24125=>3128,
-24128=>3129,
-24131=>3130,
-24190=>3131,
-24266=>3132,
-24257=>3133,
-24258=>3134,
-24260=>3135,
-24380=>3136,
-24429=>3137,
-24489=>3138,
-24490=>3139,
-24488=>3140,
-24785=>3141,
-24801=>3142,
-24754=>3143,
-24758=>3144,
-24800=>3145,
-24860=>3146,
-24867=>3147,
-24826=>3148,
-24853=>3149,
-24816=>3150,
-24827=>3151,
-24820=>3152,
-24936=>3153,
-24817=>3154,
-24846=>3155,
-24822=>3156,
-24841=>3157,
-24832=>3158,
-24850=>3159,
-25119=>3160,
-25161=>3161,
-25507=>3162,
-25484=>3163,
-25551=>3164,
-25536=>3165,
-25577=>3166,
-25545=>3167,
-25542=>3168,
-25549=>3169,
-25554=>3170,
-25571=>3171,
-25552=>3172,
-25569=>3173,
-25558=>3174,
-25581=>3175,
-25582=>3176,
-25462=>3177,
-25588=>3178,
-25578=>3179,
-25563=>3180,
-25682=>3181,
-25562=>3182,
-25593=>3183,
-25950=>3184,
-25958=>3185,
-25954=>3186,
-25955=>3187,
-26001=>3188,
-26000=>3189,
-26031=>3190,
-26222=>3191,
-26224=>3192,
-26228=>3193,
-57786=>3193,
-26230=>3194,
-26223=>3195,
-26257=>3196,
-26234=>3197,
-26238=>3198,
-26231=>3199,
-26366=>3200,
-26367=>3201,
-26399=>3202,
-26397=>3203,
-26874=>3204,
-26837=>3205,
-26848=>3206,
-26840=>3207,
-26839=>3208,
-26885=>3209,
-26847=>3210,
-26869=>3211,
-26862=>3212,
-26855=>3213,
-26873=>3214,
-26834=>3215,
-26866=>3216,
-26851=>3217,
-26827=>3218,
-26829=>3219,
-26893=>3220,
-26898=>3221,
-26894=>3222,
-26825=>3223,
-26842=>3224,
-26990=>3225,
-26875=>3226,
-27454=>3227,
-27450=>3228,
-27453=>3229,
-27544=>3230,
-27542=>3231,
-27580=>3232,
-27631=>3233,
-27694=>3234,
-27695=>3235,
-27692=>3236,
-28207=>3237,
-57904=>3237,
-28216=>3238,
-28244=>3239,
-28193=>3240,
-28210=>3241,
-28263=>3242,
-28234=>3243,
-28192=>3244,
-28197=>3245,
-28195=>3246,
-28187=>3247,
-28251=>3248,
-28248=>3249,
-28196=>3250,
-28246=>3251,
-28270=>3252,
-28205=>3253,
-28198=>3254,
-28271=>3255,
-28212=>3256,
-28237=>3257,
-28218=>3258,
-28204=>3259,
-28227=>3260,
-28189=>3261,
-57901=>3261,
-28222=>3262,
-28363=>3263,
-28297=>3264,
-28185=>3265,
-28238=>3266,
-28259=>3267,
-28228=>3268,
-28274=>3269,
-28265=>3270,
-28255=>3271,
-28953=>3272,
-28954=>3273,
-28966=>3274,
-28976=>3275,
-28961=>3276,
-28982=>3277,
-29038=>3278,
-57958=>3278,
-28956=>3279,
-29260=>3280,
-29316=>3281,
-29312=>3282,
-29494=>3283,
-29477=>3284,
-29492=>3285,
-29481=>3286,
-29754=>3287,
-29738=>3288,
-29747=>3289,
-29730=>3290,
-29733=>3291,
-29749=>3292,
-29750=>3293,
-29748=>3294,
-29743=>3295,
-29723=>3296,
-29734=>3297,
-29736=>3298,
-29989=>3299,
-29990=>3300,
-30059=>3301,
-30058=>3302,
-30178=>3303,
-30171=>3304,
-30179=>3305,
-30169=>3306,
-30168=>3307,
-30174=>3308,
-30176=>3309,
-30331=>3310,
-30332=>3311,
-30358=>3312,
-30355=>3313,
-30388=>3314,
-30428=>3315,
-30543=>3316,
-30701=>3317,
-30813=>3318,
-30828=>3319,
-30831=>3320,
-31245=>3321,
-31240=>3322,
-31243=>3323,
-31237=>3324,
-31232=>3325,
-31384=>3326,
-31383=>3327,
-31382=>3328,
-31461=>3329,
-31459=>3330,
-31561=>3331,
-31574=>3332,
-31558=>3333,
-31568=>3334,
-31570=>3335,
-31572=>3336,
-31565=>3337,
-31563=>3338,
-31567=>3339,
-31569=>3340,
-60510=>3340,
-31903=>3341,
-31909=>3342,
-32094=>3343,
-32080=>3344,
-32104=>3345,
-32085=>3346,
-32043=>3347,
-32110=>3348,
-32114=>3349,
-32097=>3350,
-32102=>3351,
-32098=>3352,
-32112=>3353,
-32115=>3354,
-21892=>3355,
-32724=>3356,
-32725=>3357,
-32779=>3358,
-32850=>3359,
-32901=>3360,
-33109=>3361,
-33108=>3362,
-33099=>3363,
-33105=>3364,
-33102=>3365,
-33081=>3366,
-33094=>3367,
-33086=>3368,
-33100=>3369,
-33107=>3370,
-33140=>3371,
-33298=>3372,
-33308=>3373,
-33769=>3374,
-33795=>3375,
-33784=>3376,
-33805=>3377,
-33760=>3378,
-33733=>3379,
-33803=>3380,
-33729=>3381,
-58309=>3381,
-33775=>3382,
-33777=>3383,
-33780=>3384,
-33879=>3385,
-33802=>3386,
-33776=>3387,
-33804=>3388,
-33740=>3389,
-33789=>3390,
-33778=>3391,
-33738=>3392,
-33848=>3393,
-33806=>3394,
-33796=>3395,
-33756=>3396,
-33799=>3397,
-33748=>3398,
-33759=>3399,
-34395=>3400,
-34527=>3401,
-34521=>3402,
-34541=>3403,
-34516=>3404,
-34523=>3405,
-34532=>3406,
-34512=>3407,
-34526=>3408,
-34903=>3409,
-35009=>3410,
-35010=>3411,
-34993=>3412,
-35203=>3413,
-35222=>3414,
-35387=>3415,
-35424=>3416,
-35413=>3417,
-35422=>3418,
-35388=>3419,
-35393=>3420,
-35412=>3421,
-35419=>3422,
-35408=>3423,
-35398=>3424,
-35380=>3425,
-35386=>3426,
-35382=>3427,
-35414=>3428,
-35937=>3429,
-35970=>3430,
-36015=>3431,
-36028=>3432,
-36019=>3433,
-36029=>3434,
-36033=>3435,
-36027=>3436,
-36032=>3437,
-36020=>3438,
-36023=>3439,
-36022=>3440,
-36031=>3441,
-36024=>3442,
-36234=>3443,
-36229=>3444,
-36225=>3445,
-36302=>3446,
-36317=>3447,
-36299=>3448,
-36314=>3449,
-36305=>3450,
-36300=>3451,
-36315=>3452,
-36294=>3453,
-36603=>3454,
-36600=>3455,
-36604=>3456,
-36764=>3457,
-36910=>3458,
-36917=>3459,
-36913=>3460,
-36920=>3461,
-36914=>3462,
-36918=>3463,
-37122=>3464,
-37109=>3465,
-37129=>3466,
-37118=>3467,
-37219=>3468,
-37221=>3469,
-37327=>3470,
-37396=>3471,
-37397=>3472,
-37411=>3473,
-37385=>3474,
-37406=>3475,
-37389=>3476,
-37392=>3477,
-37383=>3478,
-37393=>3479,
-38292=>3480,
-38287=>3481,
-38283=>3482,
-38289=>3483,
-38291=>3484,
-38290=>3485,
-38286=>3486,
-38538=>3487,
-38542=>3488,
-38539=>3489,
-38525=>3490,
-38533=>3491,
-38534=>3492,
-38541=>3493,
-38514=>3494,
-38532=>3495,
-38593=>3496,
-38597=>3497,
-38596=>3498,
-38598=>3499,
-38599=>3500,
-38639=>3501,
-38642=>3502,
-38860=>3503,
-38917=>3504,
-38918=>3505,
-38920=>3506,
-39143=>3507,
-39146=>3508,
-39151=>3509,
-39145=>3510,
-39154=>3511,
-39149=>3512,
-39342=>3513,
-39341=>3514,
-40643=>3515,
-12232=>3515,
-40653=>3516,
-12233=>3516,
-40657=>3517,
-12234=>3517,
-20098=>3518,
-20653=>3519,
-20661=>3520,
-20658=>3521,
-20659=>3522,
-20677=>3523,
-20670=>3524,
-20652=>3525,
-20663=>3526,
-20667=>3527,
-20655=>3528,
-20679=>3529,
-21119=>3530,
-21111=>3531,
-21117=>3532,
-21215=>3533,
-21222=>3534,
-21220=>3535,
-21218=>3536,
-21219=>3537,
-21295=>3538,
-21983=>3539,
-21992=>3540,
-21971=>3541,
-21990=>3542,
-21966=>3543,
-21980=>3544,
-21959=>3545,
-21969=>3546,
-21987=>3547,
-21988=>3548,
-21999=>3549,
-21978=>3550,
-21985=>3551,
-21957=>3552,
-21958=>3553,
-21989=>3554,
-21961=>3555,
-22290=>3556,
-22291=>3557,
-22622=>3558,
-22609=>3559,
-22616=>3560,
-22615=>3561,
-22618=>3562,
-22612=>3563,
-22635=>3564,
-22604=>3565,
-22637=>3566,
-22602=>3567,
-22626=>3568,
-22610=>3569,
-22603=>3570,
-22887=>3571,
-23233=>3572,
-23241=>3573,
-23244=>3574,
-23230=>3575,
-23229=>3576,
-23228=>3577,
-23219=>3578,
-23234=>3579,
-23218=>3580,
-23913=>3581,
-23919=>3582,
-24140=>3583,
-24185=>3584,
-24265=>3585,
-24264=>3586,
-24338=>3587,
-24409=>3588,
-24492=>3589,
-24494=>3590,
-24858=>3591,
-24847=>3592,
-24904=>3593,
-24863=>3594,
-24819=>3595,
-24859=>3596,
-24825=>3597,
-24833=>3598,
-24840=>3599,
-24910=>3600,
-24908=>3601,
-24900=>3602,
-24909=>3603,
-24894=>3604,
-24884=>3605,
-24871=>3606,
-24845=>3607,
-24838=>3608,
-24887=>3609,
-25121=>3610,
-25122=>3611,
-25619=>3612,
-25662=>3613,
-25630=>3614,
-25642=>3615,
-25645=>3616,
-25661=>3617,
-25644=>3618,
-25615=>3619,
-25628=>3620,
-25620=>3621,
-25613=>3622,
-25654=>3623,
-25622=>3624,
-25623=>3625,
-25606=>3626,
-25964=>3627,
-26015=>3628,
-26032=>3629,
-26263=>3630,
-26249=>3631,
-26247=>3632,
-26248=>3633,
-26262=>3634,
-26244=>3635,
-26264=>3636,
-26253=>3637,
-26371=>3638,
-27028=>3639,
-26989=>3640,
-26970=>3641,
-26999=>3642,
-26976=>3643,
-26964=>3644,
-26997=>3645,
-26928=>3646,
-27010=>3647,
-26954=>3648,
-26984=>3649,
-26987=>3650,
-26974=>3651,
-26963=>3652,
-27001=>3653,
-27014=>3654,
-26973=>3655,
-26979=>3656,
-26971=>3657,
-27463=>3658,
-27506=>3659,
-27584=>3660,
-27583=>3661,
-27603=>3662,
-27645=>3663,
-28322=>3664,
-28335=>3665,
-28371=>3666,
-28342=>3667,
-28354=>3668,
-28304=>3669,
-28317=>3670,
-28359=>3671,
-28357=>3672,
-28325=>3673,
-28312=>3674,
-28348=>3675,
-28346=>3676,
-28331=>3677,
-28369=>3678,
-28310=>3679,
-28316=>3680,
-28356=>3681,
-28372=>3682,
-28330=>3683,
-28327=>3684,
-28340=>3685,
-29006=>3686,
-29017=>3687,
-29033=>3688,
-29028=>3689,
-29001=>3690,
-29031=>3691,
-29020=>3692,
-29036=>3693,
-29030=>3694,
-29004=>3695,
-29029=>3696,
-29022=>3697,
-28998=>3698,
-29032=>3699,
-29014=>3700,
-29242=>3701,
-29266=>3702,
-29495=>3703,
-29509=>3704,
-29503=>3705,
-29502=>3706,
-29807=>3707,
-29786=>3708,
-29781=>3709,
-29791=>3710,
-29790=>3711,
-29761=>3712,
-29759=>3713,
-29785=>3714,
-29787=>3715,
-58019=>3716,
-29788=>3716,
-30070=>3717,
-30072=>3718,
-30208=>3719,
-30192=>3720,
-30209=>3721,
-30194=>3722,
-30193=>3723,
-30202=>3724,
-30207=>3725,
-30196=>3726,
-30195=>3727,
-30430=>3728,
-30431=>3729,
-30555=>3730,
-30571=>3731,
-30566=>3732,
-30558=>3733,
-30563=>3734,
-30585=>3735,
-30570=>3736,
-30572=>3737,
-30556=>3738,
-30565=>3739,
-30568=>3740,
-30562=>3741,
-30702=>3742,
-30862=>3743,
-30896=>3744,
-30871=>3745,
-30872=>3746,
-30860=>3747,
-30857=>3748,
-30844=>3749,
-30865=>3750,
-30867=>3751,
-30847=>3752,
-31098=>3753,
-31103=>3754,
-31105=>3755,
-33836=>3756,
-31165=>3757,
-31260=>3758,
-31258=>3759,
-31264=>3760,
-31252=>3761,
-31263=>3762,
-31262=>3763,
-31391=>3764,
-31392=>3765,
-31607=>3766,
-31680=>3767,
-31584=>3768,
-31598=>3769,
-31591=>3770,
-31921=>3771,
-31923=>3772,
-31925=>3773,
-32147=>3774,
-32121=>3775,
-32145=>3776,
-32129=>3777,
-32143=>3778,
-32091=>3779,
-32622=>3780,
-32617=>3781,
-32618=>3782,
-32626=>3783,
-32681=>3784,
-32680=>3785,
-32676=>3786,
-32854=>3787,
-32856=>3788,
-32902=>3789,
-32900=>3790,
-33137=>3791,
-33136=>3792,
-33144=>3793,
-33125=>3794,
-33134=>3795,
-33139=>3796,
-33131=>3797,
-33145=>3798,
-33146=>3799,
-33126=>3800,
-33285=>3801,
-33351=>3802,
-33922=>3803,
-33911=>3804,
-33853=>3805,
-33841=>3806,
-33909=>3807,
-33894=>3808,
-33899=>3809,
-33865=>3810,
-33900=>3811,
-33883=>3812,
-33852=>3813,
-33845=>3814,
-33889=>3815,
-33891=>3816,
-33897=>3817,
-33901=>3818,
-33862=>3819,
-34398=>3820,
-34396=>3821,
-34399=>3822,
-34553=>3823,
-34579=>3824,
-34568=>3825,
-34567=>3826,
-34560=>3827,
-34558=>3828,
-34555=>3829,
-34562=>3830,
-34563=>3831,
-34566=>3832,
-34570=>3833,
-34905=>3834,
-35039=>3835,
-35028=>3836,
-35033=>3837,
-35036=>3838,
-35032=>3839,
-35037=>3840,
-35041=>3841,
-35018=>3842,
-35029=>3843,
-35026=>3844,
-35228=>3845,
-35299=>3846,
-35435=>3847,
-35442=>3848,
-35443=>3849,
-35430=>3850,
-35433=>3851,
-35440=>3852,
-35463=>3853,
-35452=>3854,
-35427=>3855,
-35488=>3856,
-35441=>3857,
-35461=>3858,
-35437=>3859,
-35426=>3860,
-35438=>3861,
-35436=>3862,
-35449=>3863,
-35451=>3864,
-35390=>3865,
-35432=>3866,
-35938=>3867,
-35978=>3868,
-35977=>3869,
-36042=>3870,
-36039=>3871,
-36040=>3872,
-36036=>3873,
-36018=>3874,
-36035=>3875,
-36034=>3876,
-36037=>3877,
-36321=>3878,
-36319=>3879,
-36328=>3880,
-36335=>3881,
-36339=>3882,
-36346=>3883,
-36330=>3884,
-36324=>3885,
-36326=>3886,
-36530=>3887,
-36611=>3888,
-36617=>3889,
-36606=>3890,
-36618=>3891,
-36767=>3892,
-36786=>3893,
-36939=>3894,
-36938=>3895,
-36947=>3896,
-36930=>3897,
-36948=>3898,
-36924=>3899,
-36949=>3900,
-36944=>3901,
-36935=>3902,
-36943=>3903,
-36942=>3904,
-36941=>3905,
-36945=>3906,
-36926=>3907,
-36929=>3908,
-37138=>3909,
-37143=>3910,
-37228=>3911,
-37226=>3912,
-37225=>3913,
-37321=>3914,
-37431=>3915,
-37463=>3916,
-37432=>3917,
-37437=>3918,
-37440=>3919,
-37438=>3920,
-37467=>3921,
-37451=>3922,
-37476=>3923,
-37457=>3924,
-37428=>3925,
-37449=>3926,
-37453=>3927,
-37445=>3928,
-37433=>3929,
-37439=>3930,
-37466=>3931,
-38296=>3932,
-38552=>3933,
-38548=>3934,
-38549=>3935,
-38605=>3936,
-38603=>3937,
-38601=>3938,
-38602=>3939,
-38647=>3940,
-38651=>3941,
-38649=>3942,
-38646=>3943,
-38742=>3944,
-38772=>3945,
-38774=>3946,
-38928=>3947,
-38929=>3948,
-38931=>3949,
-38922=>3950,
-38930=>3951,
-38924=>3952,
-39164=>3953,
-39156=>3954,
-39165=>3955,
-39166=>3956,
-39347=>3957,
-39345=>3958,
-39348=>3959,
-39649=>3960,
-40169=>3961,
-40578=>3962,
-40718=>3963,
-12237=>3963,
-40723=>3964,
-12238=>3964,
-40736=>3965,
-12239=>3965,
-20711=>3966,
-20718=>3967,
-20709=>3968,
-20694=>3969,
-20717=>3970,
-60903=>3970,
-20698=>3971,
-20693=>3972,
-20687=>3973,
-20689=>3974,
-20721=>3975,
-20686=>3976,
-20713=>3977,
-20834=>3978,
-20979=>3979,
-21123=>3980,
-21122=>3981,
-21297=>3982,
-21421=>3983,
-22014=>3984,
-22016=>3985,
-22043=>3986,
-22039=>3987,
-22013=>3988,
-22036=>3989,
-22022=>3990,
-22025=>3991,
-22029=>3992,
-22030=>3993,
-22007=>3994,
-22038=>3995,
-22047=>3996,
-22024=>3997,
-22032=>3998,
-22006=>3999,
-22296=>4000,
-22294=>4001,
-22645=>4002,
-22654=>4003,
-22659=>4004,
-22675=>4005,
-22666=>4006,
-22649=>4007,
-22661=>4008,
-22653=>4009,
-22781=>4010,
-22821=>4011,
-22818=>4012,
-22820=>4013,
-22890=>4014,
-22889=>4015,
-23265=>4016,
-23270=>4017,
-23273=>4018,
-23255=>4019,
-23254=>4020,
-23256=>4021,
-23267=>4022,
-23413=>4023,
-23518=>4024,
-23527=>4025,
-23521=>4026,
-23525=>4027,
-23526=>4028,
-23528=>4029,
-23522=>4030,
-23524=>4031,
-23519=>4032,
-23565=>4033,
-23650=>4034,
-23940=>4035,
-23943=>4036,
-24155=>4037,
-24163=>4038,
-24149=>4039,
-24151=>4040,
-24148=>4041,
-24275=>4042,
-24278=>4043,
-24330=>4044,
-24390=>4045,
-24432=>4046,
-24505=>4047,
-24903=>4048,
-24895=>4049,
-24907=>4050,
-24951=>4051,
-24930=>4052,
-24931=>4053,
-24927=>4054,
-24922=>4055,
-24920=>4056,
-24949=>4057,
-25130=>4058,
-25735=>4059,
-25688=>4060,
-25684=>4061,
-25764=>4062,
-25720=>4063,
-25695=>4064,
-25722=>4065,
-25681=>4066,
-25703=>4067,
-25652=>4068,
-25709=>4069,
-25723=>4070,
-25970=>4071,
-26017=>4072,
-26071=>4073,
-26070=>4074,
-26274=>4075,
-26280=>4076,
-26269=>4077,
-27036=>4078,
-27048=>4079,
-27029=>4080,
-27073=>4081,
-27054=>4082,
-27091=>4083,
-27083=>4084,
-27035=>4085,
-27063=>4086,
-27067=>4087,
-27051=>4088,
-27060=>4089,
-27088=>4090,
-27085=>4091,
-27053=>4092,
-27084=>4093,
-27046=>4094,
-27075=>4095,
-27043=>4096,
-27465=>4097,
-27468=>4098,
-27699=>4099,
-28467=>4100,
-28436=>4101,
-28414=>4102,
-28435=>4103,
-28404=>4104,
-28457=>4105,
-28478=>4106,
-28448=>4107,
-28460=>4108,
-28431=>4109,
-28418=>4110,
-28450=>4111,
-28415=>4112,
-28399=>4113,
-28422=>4114,
-28465=>4115,
-28472=>4116,
-28466=>4117,
-28451=>4118,
-28437=>4119,
-28459=>4120,
-28463=>4121,
-28552=>4122,
-28458=>4123,
-28396=>4124,
-28417=>4125,
-28402=>4126,
-28364=>4127,
-28407=>4128,
-29076=>4129,
-29081=>4130,
-29053=>4131,
-29066=>4132,
-29060=>4133,
-29074=>4134,
-29246=>4135,
-29330=>4136,
-29334=>4137,
-29508=>4138,
-29520=>4139,
-29796=>4140,
-29795=>4141,
-29802=>4142,
-29808=>4143,
-29805=>4144,
-29956=>4145,
-30097=>4146,
-30247=>4147,
-30221=>4148,
-30219=>4149,
-30217=>4150,
-30227=>4151,
-30433=>4152,
-30435=>4153,
-30596=>4154,
-30589=>4155,
-30591=>4156,
-30561=>4157,
-30913=>4158,
-30879=>4159,
-30887=>4160,
-30899=>4161,
-30889=>4162,
-30883=>4163,
-31118=>4164,
-31119=>4165,
-31117=>4166,
-31278=>4167,
-31281=>4168,
-31402=>4169,
-31401=>4170,
-31469=>4171,
-31471=>4172,
-31649=>4173,
-31637=>4174,
-31627=>4175,
-31605=>4176,
-31639=>4177,
-31645=>4178,
-31636=>4179,
-31631=>4180,
-31672=>4181,
-58170=>4181,
-31623=>4182,
-31620=>4183,
-31929=>4184,
-31933=>4185,
-31934=>4186,
-32187=>4187,
-32176=>4188,
-32156=>4189,
-32189=>4190,
-32190=>4191,
-32160=>4192,
-32202=>4193,
-32180=>4194,
-32178=>4195,
-32177=>4196,
-32186=>4197,
-32162=>4198,
-32191=>4199,
-32181=>4200,
-32184=>4201,
-32173=>4202,
-32210=>4203,
-58202=>4203,
-32199=>4204,
-32172=>4205,
-32624=>4206,
-32736=>4207,
-32737=>4208,
-32735=>4209,
-32862=>4210,
-32858=>4211,
-32903=>4212,
-33104=>4213,
-33152=>4214,
-33167=>4215,
-33160=>4216,
-33162=>4217,
-33151=>4218,
-33154=>4219,
-33255=>4220,
-33274=>4221,
-33287=>4222,
-33300=>4223,
-33310=>4224,
-33355=>4225,
-33993=>4226,
-33983=>4227,
-33990=>4228,
-33988=>4229,
-33945=>4230,
-33950=>4231,
-33970=>4232,
-33948=>4233,
-33995=>4234,
-33976=>4235,
-33984=>4236,
-34003=>4237,
-33936=>4238,
-33980=>4239,
-34001=>4240,
-33994=>4241,
-34623=>4242,
-34588=>4243,
-34619=>4244,
-34594=>4245,
-34597=>4246,
-34612=>4247,
-34584=>4248,
-34645=>4249,
-34615=>4250,
-34601=>4251,
-35059=>4252,
-35074=>4253,
-35060=>4254,
-35065=>4255,
-35064=>4256,
-35069=>4257,
-35048=>4258,
-35098=>4259,
-35055=>4260,
-35494=>4261,
-35468=>4262,
-35486=>4263,
-35491=>4264,
-35469=>4265,
-35489=>4266,
-35475=>4267,
-35492=>4268,
-35498=>4269,
-35493=>4270,
-35496=>4271,
-35480=>4272,
-35473=>4273,
-35482=>4274,
-35495=>4275,
-35946=>4276,
-35981=>4277,
-35980=>4278,
-36051=>4279,
-36049=>4280,
-36050=>4281,
-36203=>4282,
-36249=>4283,
-36245=>4284,
-36348=>4285,
-36628=>4286,
-36626=>4287,
-36629=>4288,
-36627=>4289,
-36771=>4290,
-36960=>4291,
-36952=>4292,
-36956=>4293,
-36963=>4294,
-36953=>4295,
-36958=>4296,
-36962=>4297,
-36957=>4298,
-36955=>4299,
-37145=>4300,
-37144=>4301,
-37150=>4302,
-37237=>4303,
-37240=>4304,
-37239=>4305,
-37236=>4306,
-37496=>4307,
-37548=>4308,
-37504=>4309,
-37509=>4310,
-37528=>4311,
-37526=>4312,
-37499=>4313,
-37523=>4314,
-37532=>4315,
-37544=>4316,
-37500=>4317,
-37521=>4318,
-38305=>4319,
-38312=>4320,
-38313=>4321,
-38307=>4322,
-38309=>4323,
-38308=>4324,
-38553=>4325,
-38556=>4326,
-38555=>4327,
-38604=>4328,
-38610=>4329,
-38656=>4330,
-38780=>4331,
-38789=>4332,
-38902=>4333,
-38935=>4334,
-38936=>4335,
-39087=>4336,
-39089=>4337,
-39171=>4338,
-39173=>4339,
-39180=>4340,
-39177=>4341,
-39361=>4342,
-39599=>4343,
-39600=>4344,
-39654=>4345,
-39745=>4346,
-39746=>4347,
-40180=>4348,
-40182=>4349,
-40179=>4350,
-40636=>4351,
-40763=>4352,
-12240=>4352,
-40778=>4353,
-12241=>4353,
-20740=>4354,
-20736=>4355,
-20731=>4356,
-20725=>4357,
-20729=>4358,
-20738=>4359,
-20744=>4360,
-20745=>4361,
-20741=>4362,
-20956=>4363,
-21127=>4364,
-21128=>4365,
-21129=>4366,
-21133=>4367,
-21130=>4368,
-21232=>4369,
-21426=>4370,
-22062=>4371,
-22075=>4372,
-22073=>4373,
-22066=>4374,
-22079=>4375,
-22068=>4376,
-22057=>4377,
-22099=>4378,
-22094=>4379,
-22103=>4380,
-22132=>4381,
-22070=>4382,
-22063=>4383,
-22064=>4384,
-22656=>4385,
-22687=>4386,
-22686=>4387,
-22707=>4388,
-22684=>4389,
-22702=>4390,
-22697=>4391,
-22694=>4392,
-22893=>4393,
-23305=>4394,
-23291=>4395,
-23307=>4396,
-23285=>4397,
-23308=>4398,
-23304=>4399,
-23534=>4400,
-23532=>4401,
-23529=>4402,
-23531=>4403,
-23652=>4404,
-23653=>4405,
-23965=>4406,
-23956=>4407,
-24162=>4408,
-24159=>4409,
-24161=>4410,
-24290=>4411,
-24282=>4412,
-24287=>4413,
-24285=>4414,
-24291=>4415,
-24288=>4416,
-24392=>4417,
-24433=>4418,
-24503=>4419,
-24501=>4420,
-24950=>4421,
-24935=>4422,
-24942=>4423,
-24925=>4424,
-24917=>4425,
-24962=>4426,
-24956=>4427,
-24944=>4428,
-24939=>4429,
-24958=>4430,
-24999=>4431,
-24976=>4432,
-25003=>4433,
-24974=>4434,
-25004=>4435,
-24986=>4436,
-24996=>4437,
-24980=>4438,
-25006=>4439,
-25134=>4440,
-25705=>4441,
-25711=>4442,
-25721=>4443,
-25758=>4444,
-25778=>4445,
-25736=>4446,
-25744=>4447,
-57745=>4447,
-25776=>4448,
-25765=>4449,
-25747=>4450,
-25749=>4451,
-25769=>4452,
-25746=>4453,
-25774=>4454,
-25773=>4455,
-25771=>4456,
-25754=>4457,
-25772=>4458,
-25753=>4459,
-25762=>4460,
-25779=>4461,
-25973=>4462,
-25975=>4463,
-25976=>4464,
-26286=>4465,
-26283=>4466,
-26292=>4467,
-26289=>4468,
-27171=>4469,
-27167=>4470,
-27112=>4471,
-27137=>4472,
-27166=>4473,
-27161=>4474,
-27133=>4475,
-27169=>4476,
-27155=>4477,
-27146=>4478,
-27123=>4479,
-27138=>4480,
-27141=>4481,
-27117=>4482,
-27153=>4483,
-27472=>4484,
-27470=>4485,
-27556=>4486,
-27589=>4487,
-27590=>4488,
-28479=>4489,
-28540=>4490,
-28548=>4491,
-28497=>4492,
-28518=>4493,
-28500=>4494,
-28550=>4495,
-28525=>4496,
-28507=>4497,
-28536=>4498,
-28526=>4499,
-28558=>4500,
-28538=>4501,
-28528=>4502,
-28516=>4503,
-28567=>4504,
-28504=>4505,
-28373=>4506,
-28527=>4507,
-28512=>4508,
-28511=>4509,
-29087=>4510,
-29100=>4511,
-29105=>4512,
-29096=>4513,
-29270=>4514,
-29339=>4515,
-29518=>4516,
-29527=>4517,
-29801=>4518,
-29835=>4519,
-29827=>4520,
-29822=>4521,
-29824=>4522,
-30079=>4523,
-30240=>4524,
-30249=>4525,
-30239=>4526,
-30244=>4527,
-30246=>4528,
-30241=>4529,
-30242=>4530,
-30362=>4531,
-30394=>4532,
-30436=>4533,
-30606=>4534,
-30599=>4535,
-30604=>4536,
-30609=>4537,
-30603=>4538,
-30923=>4539,
-30917=>4540,
-30906=>4541,
-30922=>4542,
-30910=>4543,
-30933=>4544,
-30908=>4545,
-30928=>4546,
-31295=>4547,
-31292=>4548,
-31296=>4549,
-31293=>4550,
-31287=>4551,
-31291=>4552,
-31407=>4553,
-31406=>4554,
-31661=>4555,
-31665=>4556,
-31684=>4557,
-31668=>4558,
-31686=>4559,
-31687=>4560,
-31681=>4561,
-31648=>4562,
-31692=>4563,
-31946=>4564,
-32224=>4565,
-32244=>4566,
-32239=>4567,
-32251=>4568,
-32216=>4569,
-32236=>4570,
-32221=>4571,
-32232=>4572,
-32227=>4573,
-32218=>4574,
-32222=>4575,
-32233=>4576,
-32158=>4577,
-32217=>4578,
-32242=>4579,
-32249=>4580,
-32629=>4581,
-32631=>4582,
-32687=>4583,
-32745=>4584,
-32806=>4585,
-33179=>4586,
-33180=>4587,
-33181=>4588,
-33184=>4589,
-33178=>4590,
-33176=>4591,
-34071=>4592,
-34109=>4593,
-34074=>4594,
-34030=>4595,
-34092=>4596,
-34093=>4597,
-34067=>4598,
-34065=>4599,
-34083=>4600,
-34081=>4601,
-34068=>4602,
-34028=>4603,
-34085=>4604,
-34047=>4605,
-34054=>4606,
-34690=>4607,
-34676=>4608,
-34678=>4609,
-34656=>4610,
-34662=>4611,
-34680=>4612,
-34664=>4613,
-34649=>4614,
-34647=>4615,
-34636=>4616,
-34643=>4617,
-34907=>4618,
-34909=>4619,
-35088=>4620,
-35079=>4621,
-35090=>4622,
-35091=>4623,
-35093=>4624,
-35082=>4625,
-35516=>4626,
-35538=>4627,
-35527=>4628,
-35524=>4629,
-35477=>4630,
-35531=>4631,
-35576=>4632,
-35506=>4633,
-35529=>4634,
-35522=>4635,
-35519=>4636,
-35504=>4637,
-35542=>4638,
-35533=>4639,
-35510=>4640,
-35513=>4641,
-35547=>4642,
-35916=>4643,
-35918=>4644,
-35948=>4645,
-36064=>4646,
-36062=>4647,
-36070=>4648,
-36068=>4649,
-36076=>4650,
-36077=>4651,
-36066=>4652,
-36067=>4653,
-36060=>4654,
-36074=>4655,
-36065=>4656,
-36205=>4657,
-36255=>4658,
-36259=>4659,
-36395=>4660,
-36368=>4661,
-36381=>4662,
-36386=>4663,
-36367=>4664,
-36393=>4665,
-36383=>4666,
-36385=>4667,
-36382=>4668,
-36538=>4669,
-36637=>4670,
-36635=>4671,
-36639=>4672,
-36649=>4673,
-36646=>4674,
-36650=>4675,
-36636=>4676,
-36638=>4677,
-36645=>4678,
-36969=>4679,
-36974=>4680,
-36968=>4681,
-36973=>4682,
-36983=>4683,
-37168=>4684,
-37165=>4685,
-37159=>4686,
-37169=>4687,
-37255=>4688,
-37257=>4689,
-37259=>4690,
-37251=>4691,
-37573=>4692,
-37563=>4693,
-37559=>4694,
-37610=>4695,
-37604=>4696,
-37569=>4697,
-37555=>4698,
-37564=>4699,
-37586=>4700,
-37575=>4701,
-37616=>4702,
-37554=>4703,
-38317=>4704,
-38321=>4705,
-38660=>4706,
-38662=>4707,
-38663=>4708,
-38665=>4709,
-38752=>4710,
-38797=>4711,
-38795=>4712,
-38799=>4713,
-38945=>4714,
-38955=>4715,
-38940=>4716,
-39091=>4717,
-39178=>4718,
-39187=>4719,
-39186=>4720,
-39192=>4721,
-39389=>4722,
-39376=>4723,
-39391=>4724,
-39387=>4725,
-39377=>4726,
-39381=>4727,
-39378=>4728,
-39385=>4729,
-39607=>4730,
-39662=>4731,
-39663=>4732,
-39719=>4733,
-39749=>4734,
-39748=>4735,
-39799=>4736,
-39791=>4737,
-40198=>4738,
-40201=>4739,
-40195=>4740,
-40617=>4741,
-40638=>4742,
-40654=>4743,
-22696=>4744,
-12242=>4745,
-40786=>4745,
-20754=>4746,
-20760=>4747,
-20756=>4748,
-20752=>4749,
-20757=>4750,
-20864=>4751,
-20906=>4752,
-20957=>4753,
-21137=>4754,
-21139=>4755,
-21235=>4756,
-22105=>4757,
-22123=>4758,
-22137=>4759,
-22121=>4760,
-22116=>4761,
-22136=>4762,
-22122=>4763,
-22120=>4764,
-22117=>4765,
-22129=>4766,
-22127=>4767,
-22124=>4768,
-22114=>4769,
-22134=>4770,
-22721=>4771,
-22718=>4772,
-22727=>4773,
-22725=>4774,
-22894=>4775,
-23325=>4776,
-23348=>4777,
-23416=>4778,
-23536=>4779,
-23566=>4780,
-24394=>4781,
-25010=>4782,
-24977=>4783,
-25001=>4784,
-24970=>4785,
-25037=>4786,
-25014=>4787,
-25022=>4788,
-25034=>4789,
-25032=>4790,
-25136=>4791,
-25797=>4792,
-25793=>4793,
-25803=>4794,
-25787=>4795,
-25788=>4796,
-25818=>4797,
-25796=>4798,
-25799=>4799,
-25794=>4800,
-25805=>4801,
-25791=>4802,
-25810=>4803,
-25812=>4804,
-25790=>4805,
-25972=>4806,
-26310=>4807,
-26313=>4808,
-26297=>4809,
-26308=>4810,
-26311=>4811,
-26296=>4812,
-27197=>4813,
-27192=>4814,
-27194=>4815,
-27225=>4816,
-27243=>4817,
-27224=>4818,
-27193=>4819,
-27204=>4820,
-27234=>4821,
-27233=>4822,
-27211=>4823,
-27207=>4824,
-27189=>4825,
-27231=>4826,
-27208=>4827,
-27481=>4828,
-27511=>4829,
-27653=>4830,
-28610=>4831,
-28593=>4832,
-28577=>4833,
-28611=>4834,
-28580=>4835,
-28609=>4836,
-28583=>4837,
-28595=>4838,
-28608=>4839,
-28601=>4840,
-28598=>4841,
-60318=>4841,
-28582=>4842,
-28576=>4843,
-28596=>4844,
-29118=>4845,
-29129=>4846,
-29136=>4847,
-29138=>4848,
-29128=>4849,
-29141=>4850,
-29113=>4851,
-29134=>4852,
-29145=>4853,
-29148=>4854,
-29123=>4855,
-29124=>4856,
-29544=>4857,
-29852=>4858,
-29859=>4859,
-29848=>4860,
-29855=>4861,
-29854=>4862,
-29922=>4863,
-29964=>4864,
-29965=>4865,
-30260=>4866,
-30264=>4867,
-30266=>4868,
-30439=>4869,
-30437=>4870,
-30624=>4871,
-30622=>4872,
-30623=>4873,
-30629=>4874,
-30952=>4875,
-30938=>4876,
-30956=>4877,
-30951=>4878,
-31142=>4879,
-31309=>4880,
-31310=>4881,
-31302=>4882,
-31308=>4883,
-31307=>4884,
-31418=>4885,
-31705=>4886,
-31761=>4887,
-31689=>4888,
-31716=>4889,
-31707=>4890,
-31713=>4891,
-31721=>4892,
-31718=>4893,
-31957=>4894,
-31958=>4895,
-32266=>4896,
-32273=>4897,
-32264=>4898,
-32283=>4899,
-32291=>4900,
-32286=>4901,
-32285=>4902,
-58211=>4902,
-32265=>4903,
-32272=>4904,
-32633=>4905,
-32690=>4906,
-32752=>4907,
-32753=>4908,
-32750=>4909,
-32808=>4910,
-58239=>4910,
-33203=>4911,
-33193=>4912,
-33192=>4913,
-33275=>4914,
-33288=>4915,
-33368=>4916,
-33369=>4917,
-34122=>4918,
-34137=>4919,
-34120=>4920,
-34152=>4921,
-34153=>4922,
-34115=>4923,
-34121=>4924,
-34157=>4925,
-34154=>4926,
-34142=>4927,
-34691=>4928,
-34719=>4929,
-34718=>4930,
-34722=>4931,
-34701=>4932,
-34913=>4933,
-35114=>4934,
-35122=>4935,
-35109=>4936,
-35115=>4937,
-35105=>4938,
-35242=>4939,
-35238=>4940,
-58391=>4940,
-35558=>4941,
-35578=>4942,
-35563=>4943,
-35569=>4944,
-35584=>4945,
-35548=>4946,
-35559=>4947,
-35566=>4948,
-35582=>4949,
-35585=>4950,
-35586=>4951,
-35575=>4952,
-35565=>4953,
-35571=>4954,
-35574=>4955,
-35580=>4956,
-35947=>4957,
-35949=>4958,
-35987=>4959,
-36084=>4960,
-36420=>4961,
-36401=>4962,
-36404=>4963,
-36418=>4964,
-36409=>4965,
-36405=>4966,
-36667=>4967,
-36655=>4968,
-36664=>4969,
-36659=>4970,
-36776=>4971,
-36774=>4972,
-36981=>4973,
-36980=>4974,
-36984=>4975,
-36978=>4976,
-36988=>4977,
-36986=>4978,
-37172=>4979,
-37266=>4980,
-37664=>4981,
-37686=>4982,
-37624=>4983,
-37683=>4984,
-37679=>4985,
-37666=>4986,
-37628=>4987,
-37675=>4988,
-37636=>4989,
-37658=>4990,
-37648=>4991,
-37670=>4992,
-37665=>4993,
-37653=>4994,
-37678=>4995,
-37657=>4996,
-38331=>4997,
-38567=>4998,
-38568=>4999,
-38570=>5000,
-38613=>5001,
-38670=>5002,
-38673=>5003,
-38678=>5004,
-38669=>5005,
-38675=>5006,
-38671=>5007,
-38747=>5008,
-58565=>5009,
-38748=>5009,
-38758=>5010,
-38808=>5011,
-38960=>5012,
-38968=>5013,
-38971=>5014,
-38967=>5015,
-38957=>5016,
-38969=>5017,
-38948=>5018,
-39184=>5019,
-39208=>5020,
-39198=>5021,
-39195=>5022,
-39201=>5023,
-39194=>5024,
-39405=>5025,
-39394=>5026,
-39409=>5027,
-39608=>5028,
-39612=>5029,
-39675=>5030,
-39661=>5031,
-39720=>5032,
-39825=>5033,
-40213=>5034,
-40227=>5035,
-40230=>5036,
-40232=>5037,
-40210=>5038,
-40219=>5039,
-40664=>5040,
-40660=>5041,
-40845=>5042,
-12243=>5042,
-40860=>5043,
-12244=>5043,
-20778=>5044,
-20767=>5045,
-20769=>5046,
-20786=>5047,
-21237=>5048,
-22158=>5049,
-22144=>5050,
-22160=>5051,
-22149=>5052,
-22151=>5053,
-22159=>5054,
-22741=>5055,
-22739=>5056,
-22737=>5057,
-22734=>5058,
-23344=>5059,
-23338=>5060,
-23332=>5061,
-23418=>5062,
-23607=>5063,
-23656=>5064,
-23996=>5065,
-23994=>5066,
-23997=>5067,
-23992=>5068,
-24171=>5069,
-24396=>5070,
-24509=>5071,
-25033=>5072,
-25026=>5073,
-25031=>5074,
-25062=>5075,
-25035=>5076,
-25138=>5077,
-25140=>5078,
-25806=>5079,
-25802=>5080,
-25816=>5081,
-25824=>5082,
-25840=>5083,
-25830=>5084,
-25836=>5085,
-25841=>5086,
-25826=>5087,
-25837=>5088,
-25986=>5089,
-25987=>5090,
-26329=>5091,
-26326=>5092,
-27264=>5093,
-27284=>5094,
-27268=>5095,
-27298=>5096,
-27292=>5097,
-27355=>5098,
-27299=>5099,
-27262=>5100,
-27287=>5101,
-27280=>5102,
-27296=>5103,
-27484=>5104,
-27566=>5105,
-27610=>5106,
-27656=>5107,
-28632=>5108,
-28657=>5109,
-28639=>5110,
-28640=>5111,
-28635=>5112,
-28644=>5113,
-28651=>5114,
-28655=>5115,
-28544=>5116,
-28652=>5117,
-28641=>5118,
-28649=>5119,
-28629=>5120,
-28654=>5121,
-28656=>5122,
-29159=>5123,
-29151=>5124,
-60361=>5124,
-29166=>5125,
-29158=>5126,
-29157=>5127,
-29165=>5128,
-29164=>5129,
-29172=>5130,
-29152=>5131,
-29237=>5132,
-29254=>5133,
-29552=>5134,
-29554=>5135,
-29865=>5136,
-29872=>5137,
-29862=>5138,
-29864=>5139,
-30278=>5140,
-30274=>5141,
-30284=>5142,
-30442=>5143,
-30643=>5144,
-30634=>5145,
-30640=>5146,
-30636=>5147,
-30631=>5148,
-30637=>5149,
-30703=>5150,
-30967=>5151,
-30970=>5152,
-30964=>5153,
-30959=>5154,
-30977=>5155,
-31143=>5156,
-31146=>5157,
-31319=>5158,
-31423=>5159,
-31751=>5160,
-31757=>5161,
-31742=>5162,
-31735=>5163,
-31756=>5164,
-31712=>5165,
-31968=>5166,
-31964=>5167,
-31966=>5168,
-31970=>5169,
-31967=>5170,
-31961=>5171,
-31965=>5172,
-32302=>5173,
-32318=>5174,
-32326=>5175,
-32311=>5176,
-32306=>5177,
-32323=>5178,
-32299=>5179,
-32317=>5180,
-32305=>5181,
-32325=>5182,
-32321=>5183,
-32308=>5184,
-32313=>5185,
-32328=>5186,
-32309=>5187,
-32319=>5188,
-32303=>5189,
-32580=>5190,
-32755=>5191,
-32764=>5192,
-32881=>5193,
-32882=>5194,
-32880=>5195,
-32879=>5196,
-32883=>5197,
-33222=>5198,
-33219=>5199,
-33210=>5200,
-33218=>5201,
-33216=>5202,
-33215=>5203,
-33213=>5204,
-33225=>5205,
-33214=>5206,
-33256=>5207,
-33289=>5208,
-33393=>5209,
-34218=>5210,
-34180=>5211,
-34174=>5212,
-34204=>5213,
-34193=>5214,
-34196=>5215,
-34223=>5216,
-34203=>5217,
-34183=>5218,
-34216=>5219,
-34186=>5220,
-34214=>5221,
-34407=>5222,
-34752=>5223,
-34769=>5224,
-34739=>5225,
-34770=>5226,
-34758=>5227,
-34731=>5228,
-34747=>5229,
-34746=>5230,
-34760=>5231,
-34763=>5232,
-35131=>5233,
-35126=>5234,
-35140=>5235,
-35128=>5236,
-35133=>5237,
-35244=>5238,
-35598=>5239,
-35607=>5240,
-35609=>5241,
-35611=>5242,
-35594=>5243,
-35616=>5244,
-35613=>5245,
-35588=>5246,
-35600=>5247,
-35905=>5248,
-35903=>5249,
-35955=>5250,
-36090=>5251,
-36093=>5252,
-36092=>5253,
-36088=>5254,
-36091=>5255,
-36264=>5256,
-36425=>5257,
-36427=>5258,
-36424=>5259,
-36426=>5260,
-36676=>5261,
-36670=>5262,
-36674=>5263,
-36677=>5264,
-36671=>5265,
-36991=>5266,
-36989=>5267,
-36996=>5268,
-36993=>5269,
-36994=>5270,
-36992=>5271,
-37177=>5272,
-37283=>5273,
-37278=>5274,
-37276=>5275,
-37709=>5276,
-37762=>5277,
-37672=>5278,
-37749=>5279,
-37706=>5280,
-37733=>5281,
-37707=>5282,
-37656=>5283,
-37758=>5284,
-37740=>5285,
-37723=>5286,
-37744=>5287,
-37722=>5288,
-37716=>5289,
-38346=>5290,
-38347=>5291,
-38348=>5292,
-38344=>5293,
-38342=>5294,
-38577=>5295,
-38584=>5296,
-38614=>5297,
-38684=>5298,
-38686=>5299,
-38816=>5300,
-38867=>5301,
-38982=>5302,
-39094=>5303,
-39221=>5304,
-39425=>5305,
-39423=>5306,
-39854=>5307,
-39851=>5308,
-39850=>5309,
-39853=>5310,
-40251=>5311,
-40255=>5312,
-40587=>5313,
-40655=>5314,
-40670=>5315,
-40668=>5316,
-40669=>5317,
-40667=>5318,
-40766=>5319,
-40779=>5320,
-21474=>5321,
-22165=>5322,
-22190=>5323,
-22745=>5324,
-22744=>5325,
-23352=>5326,
-24413=>5327,
-25059=>5328,
-25139=>5329,
-25844=>5330,
-25842=>5331,
-25854=>5332,
-25862=>5333,
-25850=>5334,
-25851=>5335,
-25847=>5336,
-26039=>5337,
-26332=>5338,
-26406=>5339,
-27315=>5340,
-27308=>5341,
-27331=>5342,
-27323=>5343,
-27320=>5344,
-27330=>5345,
-27310=>5346,
-27311=>5347,
-27487=>5348,
-27512=>5349,
-27567=>5350,
-28681=>5351,
-28683=>5352,
-28670=>5353,
-28678=>5354,
-28666=>5355,
-28689=>5356,
-28687=>5357,
-29179=>5358,
-29180=>5359,
-29182=>5360,
-29176=>5361,
-29559=>5362,
-29557=>5363,
-29863=>5364,
-29887=>5365,
-29973=>5366,
-30294=>5367,
-30296=>5368,
-30290=>5369,
-30653=>5370,
-30655=>5371,
-30651=>5372,
-30652=>5373,
-30990=>5374,
-31150=>5375,
-31329=>5376,
-31330=>5377,
-31328=>5378,
-31428=>5379,
-31429=>5380,
-31787=>5381,
-31783=>5382,
-31786=>5383,
-31774=>5384,
-31779=>5385,
-31777=>5386,
-31975=>5387,
-32340=>5388,
-32341=>5389,
-32350=>5390,
-32346=>5391,
-32353=>5392,
-32338=>5393,
-32345=>5394,
-32584=>5395,
-32761=>5396,
-32763=>5397,
-32887=>5398,
-32886=>5399,
-33229=>5400,
-33231=>5401,
-33290=>5402,
-34255=>5403,
-34217=>5404,
-34253=>5405,
-34256=>5406,
-34249=>5407,
-34224=>5408,
-34234=>5409,
-34233=>5410,
-34799=>5411,
-34796=>5412,
-34802=>5413,
-34784=>5414,
-35206=>5415,
-35250=>5416,
-35316=>5417,
-35624=>5418,
-35641=>5419,
-35628=>5420,
-35627=>5421,
-35920=>5422,
-36101=>5423,
-36441=>5424,
-36451=>5425,
-36454=>5426,
-36452=>5427,
-36447=>5428,
-36437=>5429,
-36544=>5430,
-36681=>5431,
-36685=>5432,
-36999=>5433,
-36995=>5434,
-37000=>5435,
-37291=>5436,
-37292=>5437,
-37328=>5438,
-37780=>5439,
-37770=>5440,
-37782=>5441,
-37794=>5442,
-37811=>5443,
-37806=>5444,
-37804=>5445,
-37808=>5446,
-37784=>5447,
-37786=>5448,
-37783=>5449,
-38356=>5450,
-38358=>5451,
-38352=>5452,
-38357=>5453,
-38626=>5454,
-38620=>5455,
-38617=>5456,
-38619=>5457,
-38622=>5458,
-38692=>5459,
-38819=>5460,
-38822=>5461,
-38829=>5462,
-38905=>5463,
-38989=>5464,
-38991=>5465,
-38988=>5466,
-38990=>5467,
-38995=>5468,
-39098=>5469,
-39230=>5470,
-39231=>5471,
-39229=>5472,
-39214=>5473,
-39333=>5474,
-39438=>5475,
-39617=>5476,
-39683=>5477,
-39686=>5478,
-39759=>5479,
-39758=>5480,
-39757=>5481,
-39882=>5482,
-39881=>5483,
-39933=>5484,
-39880=>5485,
-39872=>5486,
-40273=>5487,
-40285=>5488,
-40288=>5489,
-40672=>5490,
-40725=>5491,
-40748=>5492,
-20787=>5493,
-22181=>5494,
-22184=>5495,
-22750=>5496,
-22751=>5497,
-22754=>5498,
-23541=>5499,
-40848=>5500,
-24300=>5501,
-25074=>5502,
-25079=>5503,
-25078=>5504,
-25077=>5505,
-25856=>5506,
-25871=>5507,
-26336=>5508,
-26333=>5509,
-27365=>5510,
-27357=>5511,
-27354=>5512,
-27347=>5513,
-28699=>5514,
-28703=>5515,
-28712=>5516,
-28698=>5517,
-28701=>5518,
-28693=>5519,
-28696=>5520,
-29190=>5521,
-29197=>5522,
-29272=>5523,
-29346=>5524,
-29560=>5525,
-29562=>5526,
-29885=>5527,
-29898=>5528,
-29923=>5529,
-30087=>5530,
-30086=>5531,
-30303=>5532,
-30305=>5533,
-30663=>5534,
-31001=>5535,
-31153=>5536,
-31339=>5537,
-31337=>5538,
-31806=>5539,
-31807=>5540,
-31800=>5541,
-31805=>5542,
-31799=>5543,
-31808=>5544,
-32363=>5545,
-32365=>5546,
-32377=>5547,
-32361=>5548,
-32362=>5549,
-32371=>5550,
-32645=>5551,
-32694=>5552,
-32697=>5553,
-32696=>5554,
-33240=>5555,
-34281=>5556,
-34269=>5557,
-34282=>5558,
-34261=>5559,
-34276=>5560,
-34277=>5561,
-34295=>5562,
-34811=>5563,
-34821=>5564,
-34829=>5565,
-34809=>5566,
-34814=>5567,
-35168=>5568,
-35167=>5569,
-35158=>5570,
-35166=>5571,
-35649=>5572,
-35676=>5573,
-35672=>5574,
-35657=>5575,
-35674=>5576,
-35662=>5577,
-35663=>5578,
-35654=>5579,
-35673=>5580,
-36104=>5581,
-36106=>5582,
-36476=>5583,
-36466=>5584,
-36487=>5585,
-36470=>5586,
-36460=>5587,
-36474=>5588,
-36468=>5589,
-36692=>5590,
-36686=>5591,
-36781=>5592,
-37002=>5593,
-37003=>5594,
-37297=>5595,
-37294=>5596,
-37857=>5597,
-37841=>5598,
-37855=>5599,
-37827=>5600,
-37832=>5601,
-37852=>5602,
-37853=>5603,
-37846=>5604,
-37858=>5605,
-37837=>5606,
-37848=>5607,
-37860=>5608,
-37847=>5609,
-37864=>5610,
-38364=>5611,
-38580=>5612,
-38627=>5613,
-38698=>5614,
-38695=>5615,
-38753=>5616,
-38876=>5617,
-38907=>5618,
-39006=>5619,
-39000=>5620,
-39003=>5621,
-39100=>5622,
-39237=>5623,
-39241=>5624,
-39446=>5625,
-39449=>5626,
-39693=>5627,
-39912=>5628,
-39911=>5629,
-39894=>5630,
-39899=>5631,
-40329=>5632,
-40289=>5633,
-40306=>5634,
-40298=>5635,
-40300=>5636,
-40594=>5637,
-40599=>5638,
-40595=>5639,
-40628=>5640,
-21240=>5641,
-22199=>5642,
-22198=>5643,
-22196=>5644,
-22204=>5645,
-22756=>5646,
-23360=>5647,
-23363=>5648,
-23421=>5649,
-23542=>5650,
-24009=>5651,
-25080=>5652,
-25082=>5653,
-25880=>5654,
-25876=>5655,
-25881=>5656,
-26342=>5657,
-26407=>5658,
-27372=>5659,
-28734=>5660,
-28720=>5661,
-28722=>5662,
-29200=>5663,
-29563=>5664,
-29903=>5665,
-30306=>5666,
-30309=>5667,
-31014=>5668,
-31018=>5669,
-31020=>5670,
-31019=>5671,
-31431=>5672,
-31478=>5673,
-31820=>5674,
-31811=>5675,
-31821=>5676,
-31983=>5677,
-31984=>5678,
-36782=>5679,
-32381=>5680,
-32380=>5681,
-32386=>5682,
-32588=>5683,
-32768=>5684,
-33242=>5685,
-33382=>5686,
-34299=>5687,
-34297=>5688,
-34321=>5689,
-34298=>5690,
-34310=>5691,
-34315=>5692,
-34311=>5693,
-34314=>5694,
-34836=>5695,
-34837=>5696,
-35172=>5697,
-35258=>5698,
-35320=>5699,
-35696=>5700,
-35692=>5701,
-35686=>5702,
-35695=>5703,
-35679=>5704,
-35691=>5705,
-36111=>5706,
-36109=>5707,
-36489=>5708,
-36481=>5709,
-36485=>5710,
-36482=>5711,
-37300=>5712,
-37323=>5713,
-37912=>5714,
-37891=>5715,
-37885=>5716,
-38369=>5717,
-38704=>5718,
-39108=>5719,
-39250=>5720,
-39249=>5721,
-39336=>5722,
-39467=>5723,
-39472=>5724,
-39479=>5725,
-39477=>5726,
-39955=>5727,
-39949=>5728,
-40569=>5729,
-40629=>5730,
-40680=>5731,
-40751=>5732,
-40799=>5733,
-40803=>5734,
-40801=>5735,
-20791=>5736,
-20792=>5737,
-22209=>5738,
-22208=>5739,
-22210=>5740,
-22804=>5741,
-23660=>5742,
-24013=>5743,
-25084=>5744,
-25086=>5745,
-25885=>5746,
-25884=>5747,
-26005=>5748,
-26345=>5749,
-27387=>5750,
-27396=>5751,
-27386=>5752,
-27570=>5753,
-28748=>5754,
-29211=>5755,
-29351=>5756,
-29910=>5757,
-29908=>5758,
-30313=>5759,
-30675=>5760,
-31824=>5761,
-32399=>5762,
-32396=>5763,
-32700=>5764,
-34327=>5765,
-34349=>5766,
-34330=>5767,
-34851=>5768,
-34850=>5769,
-34849=>5770,
-34847=>5771,
-35178=>5772,
-35180=>5773,
-35261=>5774,
-35700=>5775,
-35703=>5776,
-35709=>5777,
-36115=>5778,
-36490=>5779,
-36493=>5780,
-36491=>5781,
-36703=>5782,
-36783=>5783,
-37306=>5784,
-37934=>5785,
-37939=>5786,
-37941=>5787,
-37946=>5788,
-37944=>5789,
-37938=>5790,
-37931=>5791,
-38370=>5792,
-38712=>5793,
-38713=>5794,
-38706=>5795,
-38911=>5796,
-58586=>5796,
-39015=>5797,
-39013=>5798,
-39255=>5799,
-39493=>5800,
-39491=>5801,
-39488=>5802,
-39486=>5803,
-39631=>5804,
-39764=>5805,
-39761=>5806,
-39981=>5807,
-39973=>5808,
-40367=>5809,
-40372=>5810,
-40386=>5811,
-40376=>5812,
-40605=>5813,
-40687=>5814,
-40729=>5815,
-40796=>5816,
-40806=>5817,
-40807=>5818,
-20796=>5819,
-20795=>5820,
-22216=>5821,
-22218=>5822,
-22217=>5823,
-23423=>5824,
-24020=>5825,
-24018=>5826,
-24398=>5827,
-25087=>5828,
-25892=>5829,
-27402=>5830,
-27489=>5831,
-28753=>5832,
-28760=>5833,
-29568=>5834,
-29924=>5835,
-30090=>5836,
-30318=>5837,
-30316=>5838,
-31155=>5839,
-31840=>5840,
-31839=>5841,
-32894=>5842,
-32893=>5843,
-33247=>5844,
-35186=>5845,
-35183=>5846,
-35324=>5847,
-35712=>5848,
-36118=>5849,
-36119=>5850,
-36497=>5851,
-36499=>5852,
-36705=>5853,
-37192=>5854,
-37956=>5855,
-37969=>5856,
-37970=>5857,
-38717=>5858,
-38718=>5859,
-38851=>5860,
-38849=>5861,
-39019=>5862,
-39253=>5863,
-39509=>5864,
-39501=>5865,
-39634=>5866,
-39706=>5867,
-40009=>5868,
-39985=>5869,
-39998=>5870,
-39995=>5871,
-40403=>5872,
-40407=>5873,
-40756=>5874,
-40812=>5875,
-40810=>5876,
-40852=>5877,
-22220=>5878,
-24022=>5879,
-25088=>5880,
-25891=>5881,
-25899=>5882,
-25898=>5883,
-26348=>5884,
-27408=>5885,
-29914=>5886,
-31434=>5887,
-31844=>5888,
-31843=>5889,
-31845=>5890,
-32403=>5891,
-32406=>5892,
-32404=>5893,
-33250=>5894,
-34360=>5895,
-34367=>5896,
-34865=>5897,
-35722=>5898,
-37008=>5899,
-37007=>5900,
-37987=>5901,
-37984=>5902,
-37988=>5903,
-38760=>5904,
-39023=>5905,
-39260=>5906,
-39514=>5907,
-39515=>5908,
-39511=>5909,
-39635=>5910,
-39636=>5911,
-39633=>5912,
-40020=>5913,
-40023=>5914,
-40022=>5915,
-40421=>5916,
-40607=>5917,
-40692=>5918,
-22225=>5919,
-22761=>5920,
-25900=>5921,
-28766=>5922,
-30321=>5923,
-30322=>5924,
-30679=>5925,
-60226=>5925,
-32592=>5926,
-32648=>5927,
-34870=>5928,
-34873=>5929,
-34914=>5930,
-35731=>5931,
-35730=>5932,
-35734=>5933,
-33399=>5934,
-36123=>5935,
-37312=>5936,
-37994=>5937,
-38722=>5938,
-38728=>5939,
-38724=>5940,
-38854=>5941,
-39024=>5942,
-39519=>5943,
-39714=>5944,
-39768=>5945,
-40031=>5946,
-40441=>5947,
-40442=>5948,
-40572=>5949,
-40573=>5950,
-40711=>5951,
-40823=>5952,
-40818=>5953,
-24307=>5954,
-27414=>5955,
-28771=>5956,
-31852=>5957,
-31854=>5958,
-34875=>5959,
-35264=>5960,
-36513=>5961,
-37313=>5962,
-38002=>5963,
-38000=>5964,
-39025=>5965,
-39262=>5966,
-39638=>5967,
-39715=>5968,
-40652=>5969,
-28772=>5970,
-30682=>5971,
-35738=>5972,
-38007=>5973,
-38857=>5974,
-39522=>5975,
-39525=>5976,
-32412=>5977,
-35740=>5978,
-36522=>5979,
-37317=>5980,
-38013=>5981,
-38014=>5982,
-38012=>5983,
-40055=>5984,
-40056=>5985,
-40695=>5986,
-35924=>5987,
-38015=>5988,
-40474=>5989,
-29224=>5990,
-39530=>5991,
-39729=>5992,
-40475=>5993,
-40478=>5994,
-31858=>5995,
-20034=>5996,
-20060=>5997,
-12048=>5998,
-20981=>5998,
-12053=>5999,
-21274=>5999,
-12058=>6000,
-21378=>6000,
-19975=>6001,
-19980=>6002,
-20039=>6003,
-20109=>6004,
-12062=>6005,
-22231=>6005,
-12076=>6006,
-23662=>6006,
-12091=>6007,
-24435=>6007,
-19983=>6008,
-20871=>6009,
-19982=>6010,
-20014=>6011,
-20115=>6012,
-20162=>6013,
-20169=>6014,
-20168=>6015,
-20888=>6016,
-21244=>6017,
-21356=>6018,
-21433=>6019,
-22304=>6020,
-22787=>6021,
-22828=>6022,
-23568=>6023,
-60417=>6023,
-24063=>6024,
-26081=>6025,
-12110=>6026,
-27571=>6026,
-27596=>6027,
-12115=>6028,
-27668=>6028,
-12121=>6029,
-29247=>6029,
-20017=>6030,
-20028=>6031,
-20200=>6032,
-20188=>6033,
-20201=>6034,
-20193=>6035,
-20189=>6036,
-20186=>6037,
-21004=>6038,
-21001=>6039,
-21276=>6040,
-21324=>6041,
-22306=>6042,
-22307=>6043,
-22807=>6044,
-22831=>6045,
-23425=>6046,
-23428=>6047,
-23570=>6048,
-23611=>6049,
-23668=>6050,
-23667=>6051,
-24068=>6052,
-24192=>6053,
-24194=>6054,
-24521=>6055,
-25097=>6056,
-25168=>6057,
-27669=>6058,
-27702=>6059,
-27715=>6060,
-27711=>6061,
-27707=>6062,
-29358=>6063,
-29360=>6064,
-29578=>6065,
-12145=>6066,
-31160=>6066,
-32906=>6067,
-38430=>6068,
-20238=>6069,
-20248=>6070,
-20268=>6071,
-20213=>6072,
-20244=>6073,
-20209=>6074,
-20224=>6075,
-20215=>6076,
-20232=>6077,
-20253=>6078,
-20226=>6079,
-20229=>6080,
-20258=>6081,
-20243=>6082,
-20228=>6083,
-20212=>6084,
-20242=>6085,
-20913=>6086,
-21011=>6087,
-21008=>6088,
-21158=>6089,
-21282=>6090,
-21279=>6091,
-21325=>6092,
-21386=>6093,
-21511=>6094,
-22241=>6095,
-22239=>6096,
-22318=>6097,
-22314=>6098,
-22324=>6099,
-22844=>6100,
-22912=>6101,
-22908=>6102,
-22917=>6103,
-22907=>6104,
-22910=>6105,
-22903=>6106,
-22911=>6107,
-23382=>6108,
-23573=>6109,
-23589=>6110,
-23676=>6111,
-23674=>6112,
-23675=>6113,
-23678=>6114,
-24031=>6115,
-24181=>6116,
-57646=>6116,
-24196=>6117,
-24322=>6118,
-24346=>6119,
-24436=>6120,
-24533=>6121,
-24532=>6122,
-24527=>6123,
-25180=>6124,
-25182=>6125,
-25188=>6126,
-25185=>6127,
-25190=>6128,
-25186=>6129,
-25177=>6130,
-25184=>6131,
-25178=>6132,
-25189=>6133,
-25911=>6134,
-26095=>6135,
-26094=>6136,
-26430=>6137,
-26425=>6138,
-26424=>6139,
-26427=>6140,
-26426=>6141,
-26431=>6142,
-26428=>6143,
-26419=>6144,
-27672=>6145,
-27718=>6146,
-27730=>6147,
-27740=>6148,
-27727=>6149,
-27722=>6150,
-60796=>6150,
-27732=>6151,
-27723=>6152,
-27724=>6153,
-28785=>6154,
-29278=>6155,
-29364=>6156,
-29365=>6157,
-29582=>6158,
-29994=>6159,
-30335=>6160,
-31349=>6161,
-12153=>6162,
-32593=>6162,
-12171=>6163,
-33400=>6163,
-33404=>6164,
-33408=>6165,
-33405=>6166,
-33407=>6167,
-12172=>6168,
-34381=>6168,
-12177=>6169,
-35198=>6169,
-37017=>6170,
-59347=>6171,
-37015=>6171,
-37016=>6172,
-37019=>6173,
-37012=>6174,
-38434=>6175,
-38436=>6176,
-38432=>6177,
-38435=>6178,
-20310=>6179,
-20283=>6180,
-20322=>6181,
-20297=>6182,
-20307=>6183,
-20324=>6184,
-20286=>6185,
-20327=>6186,
-20306=>6187,
-20319=>6188,
-20289=>6189,
-20312=>6190,
-20269=>6191,
-20275=>6192,
-20287=>6193,
-20321=>6194,
-20879=>6195,
-20921=>6196,
-21020=>6197,
-21022=>6198,
-21025=>6199,
-21165=>6200,
-21166=>6201,
-21257=>6202,
-21347=>6203,
-21362=>6204,
-21390=>6205,
-21391=>6206,
-21552=>6207,
-21559=>6208,
-21546=>6209,
-21588=>6210,
-21573=>6211,
-21529=>6212,
-21532=>6213,
-21541=>6214,
-21528=>6215,
-21565=>6216,
-21583=>6217,
-21569=>6218,
-21544=>6219,
-21540=>6220,
-21575=>6221,
-22254=>6222,
-22247=>6223,
-22245=>6224,
-22337=>6225,
-22341=>6226,
-22348=>6227,
-22345=>6228,
-22347=>6229,
-22354=>6230,
-22790=>6231,
-22848=>6232,
-22950=>6233,
-22936=>6234,
-22944=>6235,
-22935=>6236,
-22926=>6237,
-22946=>6238,
-22928=>6239,
-22927=>6240,
-22951=>6241,
-22945=>6242,
-23438=>6243,
-23442=>6244,
-23592=>6245,
-23594=>6246,
-23693=>6247,
-23695=>6248,
-23688=>6249,
-23691=>6250,
-23689=>6251,
-23698=>6252,
-23690=>6253,
-23686=>6254,
-23699=>6255,
-23701=>6256,
-24032=>6257,
-24074=>6258,
-24078=>6259,
-24203=>6260,
-24201=>6261,
-24204=>6262,
-24200=>6263,
-24205=>6264,
-24325=>6265,
-24349=>6266,
-24440=>6267,
-24438=>6268,
-24530=>6269,
-24529=>6270,
-24528=>6271,
-24557=>6272,
-24552=>6273,
-24558=>6274,
-24563=>6275,
-24545=>6276,
-24548=>6277,
-24547=>6278,
-24570=>6279,
-24559=>6280,
-24567=>6281,
-24571=>6282,
-24576=>6283,
-24564=>6284,
-25146=>6285,
-25219=>6286,
-25228=>6287,
-25230=>6288,
-25231=>6289,
-25236=>6290,
-25223=>6291,
-25201=>6292,
-25211=>6293,
-25210=>6294,
-25200=>6295,
-25217=>6296,
-25224=>6297,
-25207=>6298,
-25213=>6299,
-25202=>6300,
-25204=>6301,
-26096=>6302,
-26100=>6303,
-26099=>6304,
-26098=>6305,
-26101=>6306,
-26437=>6307,
-26439=>6308,
-26457=>6309,
-26453=>6310,
-26444=>6311,
-26440=>6312,
-26461=>6313,
-26445=>6314,
-26458=>6315,
-26443=>6316,
-27600=>6317,
-27673=>6318,
-27674=>6319,
-27768=>6320,
-27751=>6321,
-27755=>6322,
-27780=>6323,
-27787=>6324,
-27791=>6325,
-27761=>6326,
-27759=>6327,
-27753=>6328,
-27802=>6329,
-27757=>6330,
-27783=>6331,
-27797=>6332,
-27804=>6333,
-57900=>6333,
-27750=>6334,
-27763=>6335,
-27749=>6336,
-27771=>6337,
-27790=>6338,
-28788=>6339,
-28794=>6340,
-29283=>6341,
-29375=>6342,
-29373=>6343,
-29379=>6344,
-29382=>6345,
-29377=>6346,
-29370=>6347,
-29381=>6348,
-29589=>6349,
-29591=>6350,
-29587=>6351,
-29588=>6352,
-29586=>6353,
-30010=>6354,
-30009=>6355,
-30100=>6356,
-30101=>6357,
-30337=>6358,
-31037=>6359,
-32820=>6360,
-32917=>6361,
-32921=>6362,
-32912=>6363,
-32914=>6364,
-32924=>6365,
-33424=>6366,
-33423=>6367,
-33413=>6368,
-33422=>6369,
-33425=>6370,
-33427=>6371,
-33418=>6372,
-33411=>6373,
-33412=>6374,
-12184=>6375,
-35960=>6375,
-36809=>6376,
-36799=>6377,
-37023=>6378,
-37025=>6379,
-37029=>6380,
-37022=>6381,
-37031=>6382,
-37024=>6383,
-38448=>6384,
-38440=>6385,
-38447=>6386,
-38445=>6387,
-20019=>6388,
-20376=>6389,
-20348=>6390,
-20357=>6391,
-20349=>6392,
-20352=>6393,
-20359=>6394,
-20342=>6395,
-20340=>6396,
-20361=>6397,
-20356=>6398,
-20343=>6399,
-20300=>6400,
-20375=>6401,
-20330=>6402,
-20378=>6403,
-20345=>6404,
-20353=>6405,
-20344=>6406,
-20368=>6407,
-20380=>6408,
-20372=>6409,
-20382=>6410,
-20370=>6411,
-20354=>6412,
-20373=>6413,
-20331=>6414,
-20334=>6415,
-20894=>6416,
-20924=>6417,
-20926=>6418,
-21045=>6419,
-21042=>6420,
-21043=>6421,
-21062=>6422,
-21041=>6423,
-21180=>6424,
-21258=>6425,
-21259=>6426,
-21308=>6427,
-21394=>6428,
-21396=>6429,
-21639=>6430,
-21631=>6431,
-21633=>6432,
-21649=>6433,
-21634=>6434,
-21640=>6435,
-21611=>6436,
-21626=>6437,
-21630=>6438,
-21605=>6439,
-21612=>6440,
-21620=>6441,
-21606=>6442,
-21645=>6443,
-21615=>6444,
-21601=>6445,
-21600=>6446,
-21656=>6447,
-21603=>6448,
-21607=>6449,
-21604=>6450,
-22263=>6451,
-22265=>6452,
-22383=>6453,
-22386=>6454,
-22381=>6455,
-22379=>6456,
-22385=>6457,
-22384=>6458,
-22390=>6459,
-22400=>6460,
-22389=>6461,
-22395=>6462,
-22387=>6463,
-22388=>6464,
-22370=>6465,
-22376=>6466,
-22397=>6467,
-22796=>6468,
-22853=>6469,
-22965=>6470,
-22970=>6471,
-22991=>6472,
-22990=>6473,
-22962=>6474,
-22988=>6475,
-22977=>6476,
-22966=>6477,
-22972=>6478,
-22979=>6479,
-22998=>6480,
-22961=>6481,
-22973=>6482,
-22976=>6483,
-22984=>6484,
-22964=>6485,
-22983=>6486,
-23394=>6487,
-23397=>6488,
-23443=>6489,
-23445=>6490,
-23620=>6491,
-23623=>6492,
-23726=>6493,
-23716=>6494,
-23712=>6495,
-23733=>6496,
-23727=>6497,
-23720=>6498,
-23724=>6499,
-23711=>6500,
-23715=>6501,
-23725=>6502,
-23714=>6503,
-23722=>6504,
-23719=>6505,
-23709=>6506,
-23717=>6507,
-23734=>6508,
-23728=>6509,
-23718=>6510,
-24087=>6511,
-24084=>6512,
-24089=>6513,
-24360=>6514,
-24354=>6515,
-24355=>6516,
-24356=>6517,
-24404=>6518,
-24450=>6519,
-24446=>6520,
-24445=>6521,
-24542=>6522,
-24549=>6523,
-24621=>6524,
-24614=>6525,
-24601=>6526,
-24626=>6527,
-24587=>6528,
-24628=>6529,
-24586=>6530,
-24599=>6531,
-24627=>6532,
-24602=>6533,
-24606=>6534,
-24620=>6535,
-24610=>6536,
-24589=>6537,
-24592=>6538,
-24622=>6539,
-24595=>6540,
-24593=>6541,
-24588=>6542,
-24585=>6543,
-24604=>6544,
-25108=>6545,
-25149=>6546,
-25261=>6547,
-25268=>6548,
-25297=>6549,
-25278=>6550,
-25258=>6551,
-25270=>6552,
-25290=>6553,
-25262=>6554,
-25267=>6555,
-25263=>6556,
-25275=>6557,
-25257=>6558,
-25264=>6559,
-25272=>6560,
-25917=>6561,
-26024=>6562,
-26043=>6563,
-26121=>6564,
-26108=>6565,
-26116=>6566,
-26130=>6567,
-26120=>6568,
-26107=>6569,
-26115=>6570,
-26123=>6571,
-26125=>6572,
-26117=>6573,
-26109=>6574,
-26129=>6575,
-26128=>6576,
-26358=>6577,
-26378=>6578,
-26501=>6579,
-26476=>6580,
-26510=>6581,
-26514=>6582,
-26486=>6583,
-26491=>6584,
-26520=>6585,
-26502=>6586,
-26500=>6587,
-26484=>6588,
-26509=>6589,
-26508=>6590,
-26490=>6591,
-26527=>6592,
-26513=>6593,
-26521=>6594,
-26499=>6595,
-26493=>6596,
-26497=>6597,
-26488=>6598,
-26489=>6599,
-26516=>6600,
-27429=>6601,
-27520=>6602,
-27518=>6603,
-27614=>6604,
-27677=>6605,
-27795=>6606,
-27884=>6607,
-27883=>6608,
-27886=>6609,
-27865=>6610,
-27830=>6611,
-27860=>6612,
-27821=>6613,
-27879=>6614,
-27831=>6615,
-27856=>6616,
-27842=>6617,
-27834=>6618,
-27843=>6619,
-27846=>6620,
-27885=>6621,
-27890=>6622,
-27858=>6623,
-27869=>6624,
-27828=>6625,
-27786=>6626,
-27805=>6627,
-27776=>6628,
-27870=>6629,
-27840=>6630,
-27952=>6631,
-27853=>6632,
-27847=>6633,
-27824=>6634,
-27897=>6635,
-27855=>6636,
-27881=>6637,
-27857=>6638,
-28820=>6639,
-28824=>6640,
-28805=>6641,
-28819=>6642,
-28806=>6643,
-28804=>6644,
-28817=>6645,
-28822=>6646,
-28802=>6647,
-28826=>6648,
-28803=>6649,
-29290=>6650,
-29398=>6651,
-29387=>6652,
-29400=>6653,
-29385=>6654,
-29404=>6655,
-29394=>6656,
-29396=>6657,
-29402=>6658,
-29388=>6659,
-29393=>6660,
-29604=>6661,
-29601=>6662,
-29613=>6663,
-29606=>6664,
-29602=>6665,
-29600=>6666,
-29612=>6667,
-29597=>6668,
-29917=>6669,
-29928=>6670,
-30015=>6671,
-30016=>6672,
-30014=>6673,
-30092=>6674,
-30104=>6675,
-30383=>6676,
-30451=>6677,
-30449=>6678,
-30448=>6679,
-30453=>6680,
-30712=>6681,
-30716=>6682,
-30713=>6683,
-30715=>6684,
-30714=>6685,
-30711=>6686,
-31042=>6687,
-31039=>6688,
-31173=>6689,
-31352=>6690,
-31355=>6691,
-31483=>6692,
-31861=>6693,
-31997=>6694,
-32821=>6695,
-32911=>6696,
-32942=>6697,
-32931=>6698,
-32952=>6699,
-32949=>6700,
-32941=>6701,
-33312=>6702,
-33440=>6703,
-33472=>6704,
-33451=>6705,
-33434=>6706,
-33432=>6707,
-33435=>6708,
-33461=>6709,
-33447=>6710,
-33454=>6711,
-33468=>6712,
-33438=>6713,
-33466=>6714,
-33460=>6715,
-33448=>6716,
-33441=>6717,
-33449=>6718,
-33474=>6719,
-33444=>6720,
-33475=>6721,
-33462=>6722,
-33442=>6723,
-34416=>6724,
-34415=>6725,
-34413=>6726,
-34414=>6727,
-35926=>6728,
-36818=>6729,
-36811=>6730,
-36819=>6731,
-36813=>6732,
-36822=>6733,
-36821=>6734,
-36823=>6735,
-37042=>6736,
-37044=>6737,
-37039=>6738,
-37043=>6739,
-37040=>6740,
-38457=>6741,
-38461=>6742,
-38460=>6743,
-38458=>6744,
-38467=>6745,
-20429=>6746,
-20421=>6747,
-20435=>6748,
-20402=>6749,
-20425=>6750,
-20427=>6751,
-20417=>6752,
-20436=>6753,
-20444=>6754,
-20441=>6755,
-20411=>6756,
-60346=>6756,
-20403=>6757,
-20443=>6758,
-20423=>6759,
-20438=>6760,
-20410=>6761,
-20416=>6762,
-20409=>6763,
-20460=>6764,
-21060=>6765,
-21065=>6766,
-21184=>6767,
-21186=>6768,
-21309=>6769,
-21372=>6770,
-21399=>6771,
-21398=>6772,
-21401=>6773,
-21400=>6774,
-21690=>6775,
-21665=>6776,
-21677=>6777,
-21669=>6778,
-21711=>6779,
-21699=>6780,
-33549=>6781,
-21687=>6782,
-21678=>6783,
-21718=>6784,
-21686=>6785,
-21701=>6786,
-21702=>6787,
-21664=>6788,
-21616=>6789,
-21692=>6790,
-21666=>6791,
-21694=>6792,
-21618=>6793,
-21726=>6794,
-21680=>6795,
-22453=>6796,
-22430=>6797,
-22431=>6798,
-22436=>6799,
-22412=>6800,
-22423=>6801,
-22429=>6802,
-22427=>6803,
-22420=>6804,
-22424=>6805,
-22415=>6806,
-22425=>6807,
-22437=>6808,
-22426=>6809,
-22421=>6810,
-22772=>6811,
-22797=>6812,
-22867=>6813,
-23009=>6814,
-23006=>6815,
-23022=>6816,
-23040=>6817,
-23025=>6818,
-23005=>6819,
-23034=>6820,
-23037=>6821,
-23036=>6822,
-23030=>6823,
-23012=>6824,
-23026=>6825,
-23031=>6826,
-23003=>6827,
-23017=>6828,
-23027=>6829,
-23029=>6830,
-23008=>6831,
-23038=>6832,
-23028=>6833,
-23021=>6834,
-23464=>6835,
-23628=>6836,
-23760=>6837,
-23768=>6838,
-23756=>6839,
-23767=>6840,
-23755=>6841,
-23771=>6842,
-23774=>6843,
-23770=>6844,
-23753=>6845,
-23751=>6846,
-23754=>6847,
-23766=>6848,
-23763=>6849,
-23764=>6850,
-23759=>6851,
-23752=>6852,
-23750=>6853,
-23758=>6854,
-23775=>6855,
-23800=>6856,
-24057=>6857,
-24097=>6858,
-24098=>6859,
-24099=>6860,
-24096=>6861,
-24100=>6862,
-24240=>6863,
-24228=>6864,
-24226=>6865,
-24219=>6866,
-24227=>6867,
-24229=>6868,
-24327=>6869,
-24366=>6870,
-24406=>6871,
-24454=>6872,
-24631=>6873,
-24633=>6874,
-24660=>6875,
-24690=>6876,
-24670=>6877,
-24645=>6878,
-24659=>6879,
-24647=>6880,
-24649=>6881,
-24667=>6882,
-24652=>6883,
-24640=>6884,
-24642=>6885,
-24671=>6886,
-24612=>6887,
-24644=>6888,
-24664=>6889,
-24678=>6890,
-24686=>6891,
-25154=>6892,
-25155=>6893,
-25295=>6894,
-25357=>6895,
-25355=>6896,
-25333=>6897,
-25358=>6898,
-25347=>6899,
-25323=>6900,
-25337=>6901,
-25359=>6902,
-25356=>6903,
-25336=>6904,
-25334=>6905,
-25344=>6906,
-25363=>6907,
-25364=>6908,
-25338=>6909,
-25365=>6910,
-25339=>6911,
-25328=>6912,
-25921=>6913,
-25923=>6914,
-26026=>6915,
-26047=>6916,
-26166=>6917,
-26145=>6918,
-26162=>6919,
-26165=>6920,
-26140=>6921,
-26150=>6922,
-26146=>6923,
-26163=>6924,
-26155=>6925,
-26170=>6926,
-26141=>6927,
-26164=>6928,
-26169=>6929,
-26158=>6930,
-26383=>6931,
-26384=>6932,
-26561=>6933,
-26610=>6934,
-26568=>6935,
-26554=>6936,
-26588=>6937,
-26555=>6938,
-26616=>6939,
-26584=>6940,
-26560=>6941,
-26551=>6942,
-26565=>6943,
-26603=>6944,
-26596=>6945,
-26591=>6946,
-26549=>6947,
-26573=>6948,
-26547=>6949,
-26615=>6950,
-26614=>6951,
-26606=>6952,
-26595=>6953,
-26562=>6954,
-26553=>6955,
-26574=>6956,
-26599=>6957,
-26608=>6958,
-26546=>6959,
-26620=>6960,
-26566=>6961,
-26605=>6962,
-26572=>6963,
-26542=>6964,
-26598=>6965,
-26587=>6966,
-26618=>6967,
-26569=>6968,
-26570=>6969,
-26563=>6970,
-26602=>6971,
-26571=>6972,
-27432=>6973,
-27522=>6974,
-27524=>6975,
-27574=>6976,
-27606=>6977,
-27608=>6978,
-27616=>6979,
-27680=>6980,
-27681=>6981,
-27944=>6982,
-27956=>6983,
-27949=>6984,
-27935=>6985,
-27964=>6986,
-27967=>6987,
-27922=>6988,
-27914=>6989,
-27866=>6990,
-27955=>6991,
-27908=>6992,
-27929=>6993,
-27962=>6994,
-27930=>6995,
-27921=>6996,
-27904=>6997,
-27933=>6998,
-27970=>6999,
-27905=>7000,
-27928=>7001,
-27959=>7002,
-27907=>7003,
-27919=>7004,
-27968=>7005,
-27911=>7006,
-27936=>7007,
-27948=>7008,
-27912=>7009,
-27938=>7010,
-27913=>7011,
-27920=>7012,
-28855=>7013,
-28831=>7014,
-28862=>7015,
-28849=>7016,
-28848=>7017,
-28833=>7018,
-28852=>7019,
-28853=>7020,
-28841=>7021,
-29249=>7022,
-29257=>7023,
-29258=>7024,
-29292=>7025,
-29296=>7026,
-29299=>7027,
-29294=>7028,
-29386=>7029,
-29412=>7030,
-29416=>7031,
-29419=>7032,
-29407=>7033,
-29418=>7034,
-29414=>7035,
-29411=>7036,
-29573=>7037,
-29644=>7038,
-29634=>7039,
-29640=>7040,
-29637=>7041,
-29625=>7042,
-29622=>7043,
-29621=>7044,
-29620=>7045,
-29675=>7046,
-29631=>7047,
-29639=>7048,
-29630=>7049,
-29635=>7050,
-29638=>7051,
-29624=>7052,
-29643=>7053,
-29932=>7054,
-29934=>7055,
-29998=>7056,
-30023=>7057,
-30024=>7058,
-30119=>7059,
-30122=>7060,
-30329=>7061,
-30404=>7062,
-30472=>7063,
-30467=>7064,
-30468=>7065,
-30469=>7066,
-30474=>7067,
-30455=>7068,
-30459=>7069,
-30458=>7070,
-30695=>7071,
-30696=>7072,
-30726=>7073,
-30737=>7074,
-30738=>7075,
-30725=>7076,
-30736=>7077,
-30735=>7078,
-30734=>7079,
-30729=>7080,
-58095=>7080,
-30723=>7081,
-30739=>7082,
-31050=>7083,
-31052=>7084,
-31051=>7085,
-31045=>7086,
-31044=>7087,
-31189=>7088,
-31181=>7089,
-31183=>7090,
-31190=>7091,
-31182=>7092,
-31360=>7093,
-31358=>7094,
-31441=>7095,
-31488=>7096,
-31489=>7097,
-31866=>7098,
-31864=>7099,
-31865=>7100,
-31871=>7101,
-31872=>7102,
-31873=>7103,
-32003=>7104,
-32008=>7105,
-32001=>7106,
-32600=>7107,
-32657=>7108,
-32653=>7109,
-32702=>7110,
-32775=>7111,
-32782=>7112,
-32783=>7113,
-32788=>7114,
-32823=>7115,
-32984=>7116,
-32967=>7117,
-32992=>7118,
-32977=>7119,
-32968=>7120,
-32962=>7121,
-32976=>7122,
-32965=>7123,
-32995=>7124,
-32985=>7125,
-32988=>7126,
-32970=>7127,
-32981=>7128,
-32969=>7129,
-32975=>7130,
-32983=>7131,
-32998=>7132,
-32973=>7133,
-33279=>7134,
-33313=>7135,
-33428=>7136,
-33497=>7137,
-33534=>7138,
-33529=>7139,
-33543=>7140,
-33512=>7141,
-33536=>7142,
-33493=>7143,
-33594=>7144,
-33515=>7145,
-33494=>7146,
-33524=>7147,
-33516=>7148,
-33505=>7149,
-33522=>7150,
-33525=>7151,
-33548=>7152,
-33531=>7153,
-33526=>7154,
-33520=>7155,
-33514=>7156,
-33508=>7157,
-33504=>7158,
-33530=>7159,
-33523=>7160,
-33517=>7161,
-34423=>7162,
-34420=>7163,
-34428=>7164,
-34419=>7165,
-34881=>7166,
-34894=>7167,
-34919=>7168,
-34922=>7169,
-34921=>7170,
-35283=>7171,
-35332=>7172,
-35335=>7173,
-36210=>7174,
-36835=>7175,
-36833=>7176,
-36846=>7177,
-36832=>7178,
-37105=>7179,
-37053=>7180,
-37055=>7181,
-37077=>7182,
-37061=>7183,
-37054=>7184,
-37063=>7185,
-37067=>7186,
-37064=>7187,
-37332=>7188,
-60294=>7188,
-37331=>7189,
-38484=>7190,
-38479=>7191,
-38481=>7192,
-38483=>7193,
-38474=>7194,
-38478=>7195,
-20510=>7196,
-20485=>7197,
-20487=>7198,
-20499=>7199,
-20514=>7200,
-20528=>7201,
-20507=>7202,
-20469=>7203,
-20468=>7204,
-20531=>7205,
-20535=>7206,
-20524=>7207,
-20470=>7208,
-20471=>7209,
-20503=>7210,
-20508=>7211,
-20512=>7212,
-20519=>7213,
-20533=>7214,
-20527=>7215,
-20529=>7216,
-20494=>7217,
-20826=>7218,
-20884=>7219,
-20883=>7220,
-20938=>7221,
-20932=>7222,
-20933=>7223,
-20936=>7224,
-20942=>7225,
-21089=>7226,
-21082=>7227,
-21074=>7228,
-21086=>7229,
-21087=>7230,
-21077=>7231,
-21090=>7232,
-21197=>7233,
-21262=>7234,
-21406=>7235,
-21798=>7236,
-21730=>7237,
-21783=>7238,
-21778=>7239,
-21735=>7240,
-21747=>7241,
-21732=>7242,
-21786=>7243,
-21759=>7244,
-21764=>7245,
-21768=>7246,
-21739=>7247,
-21777=>7248,
-21765=>7249,
-21745=>7250,
-21770=>7251,
-21755=>7252,
-21751=>7253,
-21752=>7254,
-21728=>7255,
-21774=>7256,
-21763=>7257,
-21771=>7258,
-22273=>7259,
-22274=>7260,
-22476=>7261,
-22578=>7262,
-22485=>7263,
-22482=>7264,
-22458=>7265,
-22470=>7266,
-22461=>7267,
-22460=>7268,
-22456=>7269,
-22454=>7270,
-22463=>7271,
-22471=>7272,
-22480=>7273,
-22457=>7274,
-22465=>7275,
-22798=>7276,
-22858=>7277,
-23065=>7278,
-23062=>7279,
-23085=>7280,
-23086=>7281,
-23061=>7282,
-23055=>7283,
-23063=>7284,
-23050=>7285,
-23070=>7286,
-23091=>7287,
-23404=>7288,
-23463=>7289,
-23469=>7290,
-23468=>7291,
-23555=>7292,
-23638=>7293,
-23636=>7294,
-23788=>7295,
-23807=>7296,
-23790=>7297,
-23793=>7298,
-23799=>7299,
-23808=>7300,
-23801=>7301,
-24105=>7302,
-24104=>7303,
-24232=>7304,
-24238=>7305,
-24234=>7306,
-24236=>7307,
-24371=>7308,
-24368=>7309,
-24423=>7310,
-24669=>7311,
-24666=>7312,
-24679=>7313,
-24641=>7314,
-24738=>7315,
-24712=>7316,
-24704=>7317,
-24722=>7318,
-24705=>7319,
-24733=>7320,
-24707=>7321,
-24725=>7322,
-24731=>7323,
-24727=>7324,
-24711=>7325,
-24732=>7326,
-24718=>7327,
-25113=>7328,
-25158=>7329,
-25330=>7330,
-25360=>7331,
-25430=>7332,
-25388=>7333,
-25412=>7334,
-25413=>7335,
-25398=>7336,
-25411=>7337,
-25572=>7338,
-25401=>7339,
-25419=>7340,
-25418=>7341,
-25404=>7342,
-25385=>7343,
-25409=>7344,
-25396=>7345,
-25432=>7346,
-25428=>7347,
-25433=>7348,
-25389=>7349,
-25415=>7350,
-25395=>7351,
-25434=>7352,
-25425=>7353,
-25400=>7354,
-25431=>7355,
-25408=>7356,
-25416=>7357,
-25930=>7358,
-25926=>7359,
-26054=>7360,
-26051=>7361,
-26052=>7362,
-26050=>7363,
-26186=>7364,
-26207=>7365,
-26183=>7366,
-26193=>7367,
-26386=>7368,
-26387=>7369,
-26655=>7370,
-26650=>7371,
-26697=>7372,
-26674=>7373,
-26675=>7374,
-26683=>7375,
-26699=>7376,
-26703=>7377,
-26646=>7378,
-26673=>7379,
-26652=>7380,
-26677=>7381,
-26667=>7382,
-26669=>7383,
-26671=>7384,
-26702=>7385,
-26692=>7386,
-26676=>7387,
-26653=>7388,
-26642=>7389,
-26644=>7390,
-26662=>7391,
-26664=>7392,
-26670=>7393,
-26701=>7394,
-26682=>7395,
-26661=>7396,
-26656=>7397,
-27436=>7398,
-27439=>7399,
-27437=>7400,
-27441=>7401,
-27444=>7402,
-27501=>7403,
-32898=>7404,
-27528=>7405,
-27622=>7406,
-27620=>7407,
-27624=>7408,
-27619=>7409,
-27618=>7410,
-27623=>7411,
-27685=>7412,
-28026=>7413,
-28003=>7414,
-28004=>7415,
-28022=>7416,
-27917=>7417,
-28001=>7418,
-28050=>7419,
-27992=>7420,
-28002=>7421,
-28013=>7422,
-28015=>7423,
-28049=>7424,
-28045=>7425,
-28143=>7426,
-28031=>7427,
-28038=>7428,
-27998=>7429,
-28007=>7430,
-59078=>7430,
-28000=>7431,
-28055=>7432,
-28016=>7433,
-28028=>7434,
-27999=>7435,
-28034=>7436,
-28056=>7437,
-27951=>7438,
-28008=>7439,
-28043=>7440,
-28030=>7441,
-28032=>7442,
-28036=>7443,
-27926=>7444,
-28035=>7445,
-28027=>7446,
-28029=>7447,
-28021=>7448,
-28048=>7449,
-28892=>7450,
-28883=>7451,
-28881=>7452,
-28893=>7453,
-28875=>7454,
-32569=>7455,
-28898=>7456,
-28887=>7457,
-28882=>7458,
-28894=>7459,
-28896=>7460,
-28884=>7461,
-28877=>7462,
-28869=>7463,
-28870=>7464,
-28871=>7465,
-28890=>7466,
-28878=>7467,
-28897=>7468,
-29250=>7469,
-29304=>7470,
-29303=>7471,
-29302=>7472,
-29440=>7473,
-29434=>7474,
-29428=>7475,
-29438=>7476,
-29430=>7477,
-29427=>7478,
-29435=>7479,
-29441=>7480,
-29651=>7481,
-29657=>7482,
-29669=>7483,
-29654=>7484,
-29628=>7485,
-29671=>7486,
-29667=>7487,
-29673=>7488,
-29660=>7489,
-29650=>7490,
-29659=>7491,
-29652=>7492,
-29661=>7493,
-29658=>7494,
-29655=>7495,
-29656=>7496,
-29672=>7497,
-29918=>7498,
-29919=>7499,
-29940=>7500,
-29941=>7501,
-29985=>7502,
-30043=>7503,
-30047=>7504,
-30128=>7505,
-30145=>7506,
-30139=>7507,
-30148=>7508,
-30144=>7509,
-30143=>7510,
-30134=>7511,
-30138=>7512,
-30346=>7513,
-30409=>7514,
-30493=>7515,
-30491=>7516,
-30480=>7517,
-30483=>7518,
-30482=>7519,
-30499=>7520,
-30481=>7521,
-30485=>7522,
-30489=>7523,
-30490=>7524,
-30498=>7525,
-30503=>7526,
-30755=>7527,
-30764=>7528,
-30754=>7529,
-30773=>7530,
-30767=>7531,
-30760=>7532,
-30766=>7533,
-30763=>7534,
-30753=>7535,
-30761=>7536,
-30771=>7537,
-30762=>7538,
-30769=>7539,
-31060=>7540,
-31067=>7541,
-31055=>7542,
-31068=>7543,
-31059=>7544,
-31058=>7545,
-31057=>7546,
-31211=>7547,
-31212=>7548,
-31200=>7549,
-31214=>7550,
-31213=>7551,
-31210=>7552,
-31196=>7553,
-31198=>7554,
-31197=>7555,
-31366=>7556,
-31369=>7557,
-31365=>7558,
-31371=>7559,
-31372=>7560,
-31370=>7561,
-31367=>7562,
-31448=>7563,
-31504=>7564,
-31492=>7565,
-31507=>7566,
-31493=>7567,
-31503=>7568,
-31496=>7569,
-31498=>7570,
-31502=>7571,
-31497=>7572,
-31506=>7573,
-31876=>7574,
-31889=>7575,
-31882=>7576,
-31884=>7577,
-31880=>7578,
-31885=>7579,
-31877=>7580,
-32030=>7581,
-32029=>7582,
-32017=>7583,
-32014=>7584,
-32024=>7585,
-32022=>7586,
-32019=>7587,
-32031=>7588,
-32018=>7589,
-32015=>7590,
-32012=>7591,
-32604=>7592,
-32609=>7593,
-32606=>7594,
-32608=>7595,
-32605=>7596,
-32603=>7597,
-32662=>7598,
-32658=>7599,
-32707=>7600,
-32706=>7601,
-32704=>7602,
-32790=>7603,
-32830=>7604,
-32825=>7605,
-33018=>7606,
-33010=>7607,
-33017=>7608,
-33013=>7609,
-33025=>7610,
-33019=>7611,
-33024=>7612,
-33281=>7613,
-33327=>7614,
-33317=>7615,
-33587=>7616,
-33581=>7617,
-33604=>7618,
-33561=>7619,
-33617=>7620,
-33573=>7621,
-33622=>7622,
-33599=>7623,
-33601=>7624,
-33574=>7625,
-33564=>7626,
-33570=>7627,
-33602=>7628,
-33614=>7629,
-33563=>7630,
-33578=>7631,
-33544=>7632,
-33596=>7633,
-33613=>7634,
-33558=>7635,
-33572=>7636,
-33568=>7637,
-33591=>7638,
-33583=>7639,
-33577=>7640,
-33607=>7641,
-33605=>7642,
-33612=>7643,
-33619=>7644,
-33566=>7645,
-33580=>7646,
-33611=>7647,
-33575=>7648,
-33608=>7649,
-34387=>7650,
-34386=>7651,
-34466=>7652,
-34472=>7653,
-34454=>7654,
-34445=>7655,
-34449=>7656,
-34462=>7657,
-34439=>7658,
-34455=>7659,
-34438=>7660,
-34443=>7661,
-34458=>7662,
-34437=>7663,
-34469=>7664,
-34457=>7665,
-34465=>7666,
-34471=>7667,
-34453=>7668,
-34456=>7669,
-34446=>7670,
-34461=>7671,
-34448=>7672,
-34452=>7673,
-34883=>7674,
-34884=>7675,
-34925=>7676,
-34933=>7677,
-34934=>7678,
-34930=>7679,
-34944=>7680,
-34929=>7681,
-34943=>7682,
-34927=>7683,
-34947=>7684,
-34942=>7685,
-34932=>7686,
-34940=>7687,
-35346=>7688,
-35911=>7689,
-35927=>7690,
-35963=>7691,
-36004=>7692,
-36003=>7693,
-36214=>7694,
-36216=>7695,
-36277=>7696,
-36279=>7697,
-36278=>7698,
-36561=>7699,
-36563=>7700,
-36862=>7701,
-36853=>7702,
-36866=>7703,
-36863=>7704,
-36859=>7705,
-36868=>7706,
-36860=>7707,
-36854=>7708,
-37078=>7709,
-37088=>7710,
-37081=>7711,
-37082=>7712,
-37091=>7713,
-37087=>7714,
-37093=>7715,
-37080=>7716,
-37083=>7717,
-37079=>7718,
-37084=>7719,
-37092=>7720,
-37200=>7721,
-37198=>7722,
-37199=>7723,
-37333=>7724,
-37346=>7725,
-37338=>7726,
-38492=>7727,
-38495=>7728,
-38588=>7729,
-39139=>7730,
-12221=>7731,
-39647=>7731,
-12223=>7732,
-39727=>7732,
-20095=>7733,
-20592=>7734,
-20586=>7735,
-20577=>7736,
-20574=>7737,
-20576=>7738,
-20563=>7739,
-20555=>7740,
-20573=>7741,
-20594=>7742,
-20552=>7743,
-20557=>7744,
-20545=>7745,
-20571=>7746,
-20554=>7747,
-20578=>7748,
-20501=>7749,
-20549=>7750,
-20575=>7751,
-20585=>7752,
-20587=>7753,
-20579=>7754,
-20580=>7755,
-20550=>7756,
-20544=>7757,
-20590=>7758,
-20595=>7759,
-20567=>7760,
-20561=>7761,
-20944=>7762,
-21099=>7763,
-21101=>7764,
-21100=>7765,
-21102=>7766,
-21206=>7767,
-21203=>7768,
-21293=>7769,
-21404=>7770,
-21877=>7771,
-21878=>7772,
-21820=>7773,
-21837=>7774,
-21840=>7775,
-21812=>7776,
-21802=>7777,
-21841=>7778,
-21858=>7779,
-21814=>7780,
-21813=>7781,
-21808=>7782,
-21842=>7783,
-21829=>7784,
-21772=>7785,
-21810=>7786,
-21861=>7787,
-21838=>7788,
-21817=>7789,
-21832=>7790,
-21805=>7791,
-21819=>7792,
-21824=>7793,
-21835=>7794,
-22282=>7795,
-22279=>7796,
-22523=>7797,
-22548=>7798,
-22498=>7799,
-22518=>7800,
-22492=>7801,
-22516=>7802,
-22528=>7803,
-22509=>7804,
-22525=>7805,
-22536=>7806,
-22520=>7807,
-22539=>7808,
-22515=>7809,
-22479=>7810,
-22535=>7811,
-22510=>7812,
-22499=>7813,
-22514=>7814,
-22501=>7815,
-22508=>7816,
-22497=>7817,
-22542=>7818,
-22524=>7819,
-22544=>7820,
-22503=>7821,
-22529=>7822,
-22540=>7823,
-22513=>7824,
-22505=>7825,
-22512=>7826,
-22541=>7827,
-22532=>7828,
-22876=>7829,
-23136=>7830,
-23128=>7831,
-23125=>7832,
-23143=>7833,
-60437=>7833,
-23134=>7834,
-23096=>7835,
-23093=>7836,
-23149=>7837,
-23120=>7838,
-23135=>7839,
-23141=>7840,
-23148=>7841,
-23123=>7842,
-23140=>7843,
-23127=>7844,
-23107=>7845,
-23133=>7846,
-23122=>7847,
-23108=>7848,
-23131=>7849,
-23112=>7850,
-23182=>7851,
-23102=>7852,
-23117=>7853,
-23097=>7854,
-23116=>7855,
-23152=>7856,
-23145=>7857,
-23111=>7858,
-23121=>7859,
-23126=>7860,
-23106=>7861,
-23132=>7862,
-23410=>7863,
-23406=>7864,
-23489=>7865,
-23488=>7866,
-23641=>7867,
-23838=>7868,
-23819=>7869,
-23837=>7870,
-23834=>7871,
-23840=>7872,
-23820=>7873,
-23848=>7874,
-23821=>7875,
-23846=>7876,
-23845=>7877,
-23823=>7878,
-23856=>7879,
-23826=>7880,
-23843=>7881,
-23839=>7882,
-23854=>7883,
-24126=>7884,
-24116=>7885,
-24241=>7886,
-24244=>7887,
-24249=>7888,
-24242=>7889,
-24243=>7890,
-24374=>7891,
-24376=>7892,
-24475=>7893,
-24470=>7894,
-24479=>7895,
-24714=>7896,
-24720=>7897,
-24710=>7898,
-24766=>7899,
-24752=>7900,
-24762=>7901,
-24787=>7902,
-24788=>7903,
-24783=>7904,
-24804=>7905,
-24793=>7906,
-24797=>7907,
-24776=>7908,
-24753=>7909,
-24795=>7910,
-24759=>7911,
-24778=>7912,
-24767=>7913,
-24771=>7914,
-24781=>7915,
-24768=>7916,
-25394=>7917,
-25445=>7918,
-25482=>7919,
-25474=>7920,
-25469=>7921,
-25533=>7922,
-25502=>7923,
-25517=>7924,
-25501=>7925,
-25495=>7926,
-25515=>7927,
-25486=>7928,
-25455=>7929,
-25479=>7930,
-25488=>7931,
-25454=>7932,
-25519=>7933,
-25461=>7934,
-25500=>7935,
-25453=>7936,
-25518=>7937,
-25468=>7938,
-25508=>7939,
-25403=>7940,
-25503=>7941,
-25464=>7942,
-25477=>7943,
-25473=>7944,
-25489=>7945,
-25485=>7946,
-25456=>7947,
-25939=>7948,
-26061=>7949,
-26213=>7950,
-26209=>7951,
-26203=>7952,
-26201=>7953,
-26204=>7954,
-26210=>7955,
-26392=>7956,
-26745=>7957,
-26759=>7958,
-26768=>7959,
-26780=>7960,
-26733=>7961,
-26734=>7962,
-26798=>7963,
-26795=>7964,
-26966=>7965,
-26735=>7966,
-26787=>7967,
-26796=>7968,
-26793=>7969,
-26741=>7970,
-26740=>7971,
-26802=>7972,
-26767=>7973,
-26743=>7974,
-26770=>7975,
-26748=>7976,
-26731=>7977,
-26738=>7978,
-26794=>7979,
-26752=>7980,
-26737=>7981,
-26750=>7982,
-26779=>7983,
-26774=>7984,
-26763=>7985,
-26784=>7986,
-26761=>7987,
-26788=>7988,
-26744=>7989,
-26747=>7990,
-26769=>7991,
-26764=>7992,
-26762=>7993,
-26749=>7994,
-27446=>7995,
-27443=>7996,
-27447=>7997,
-27448=>7998,
-27537=>7999,
-27535=>8000,
-27533=>8001,
-27534=>8002,
-27532=>8003,
-27690=>8004,
-28096=>8005,
-28075=>8006,
-28084=>8007,
-28083=>8008,
-28276=>8009,
-28076=>8010,
-28137=>8011,
-28130=>8012,
-28087=>8013,
-28150=>8014,
-28116=>8015,
-28160=>8016,
-28104=>8017,
-28128=>8018,
-28127=>8019,
-28118=>8020,
-28094=>8021,
-28133=>8022,
-28124=>8023,
-28125=>8024,
-28123=>8025,
-28148=>8026,
-28106=>8027,
-28093=>8028,
-28141=>8029,
-28144=>8030,
-28090=>8031,
-28117=>8032,
-28098=>8033,
-28111=>8034,
-28105=>8035,
-28112=>8036,
-28146=>8037,
-28115=>8038,
-28157=>8039,
-28119=>8040,
-28109=>8041,
-28131=>8042,
-28091=>8043,
-28922=>8044,
-28941=>8045,
-28919=>8046,
-28951=>8047,
-28916=>8048,
-28940=>8049,
-28912=>8050,
-28932=>8051,
-28915=>8052,
-28944=>8053,
-28924=>8054,
-28927=>8055,
-28934=>8056,
-28947=>8057,
-28928=>8058,
-28920=>8059,
-28918=>8060,
-28939=>8061,
-28930=>8062,
-28942=>8063,
-29310=>8064,
-29307=>8065,
-29308=>8066,
-29311=>8067,
-29469=>8068,
-29463=>8069,
-29447=>8070,
-29457=>8071,
-29464=>8072,
-29450=>8073,
-29448=>8074,
-29439=>8075,
-29455=>8076,
-29470=>8077,
-29576=>8078,
-29686=>8079,
-29688=>8080,
-29685=>8081,
-29700=>8082,
-29697=>8083,
-29693=>8084,
-29703=>8085,
-29696=>8086,
-29690=>8087,
-29692=>8088,
-29695=>8089,
-29708=>8090,
-29707=>8091,
-29684=>8092,
-29704=>8093,
-30052=>8094,
-30051=>8095,
-30158=>8096,
-30162=>8097,
-30159=>8098,
-30155=>8099,
-30156=>8100,
-30161=>8101,
-30160=>8102,
-30351=>8103,
-30345=>8104,
-30419=>8105,
-30521=>8106,
-30511=>8107,
-30509=>8108,
-30513=>8109,
-30514=>8110,
-30516=>8111,
-30515=>8112,
-30525=>8113,
-30501=>8114,
-30523=>8115,
-30517=>8116,
-30792=>8117,
-30802=>8118,
-30793=>8119,
-30797=>8120,
-30794=>8121,
-30796=>8122,
-30758=>8123,
-30789=>8124,
-30800=>8125,
-31076=>8126,
-31079=>8127,
-31081=>8128,
-31082=>8129,
-31075=>8130,
-31083=>8131,
-31073=>8132,
-31163=>8133,
-31226=>8134,
-31224=>8135,
-31222=>8136,
-31223=>8137,
-31375=>8138,
-31380=>8139,
-31376=>8140,
-31541=>8141,
-31547=>8142,
-31540=>8143,
-31525=>8144,
-31536=>8145,
-31522=>8146,
-31524=>8147,
-31539=>8148,
-31512=>8149,
-31530=>8150,
-31517=>8151,
-31537=>8152,
-31531=>8153,
-31533=>8154,
-31535=>8155,
-31538=>8156,
-31544=>8157,
-31514=>8158,
-31523=>8159,
-31892=>8160,
-31896=>8161,
-31894=>8162,
-31907=>8163,
-32053=>8164,
-32061=>8165,
-32056=>8166,
-32054=>8167,
-32058=>8168,
-32069=>8169,
-32044=>8170,
-32041=>8171,
-32065=>8172,
-32071=>8173,
-32062=>8174,
-32063=>8175,
-32074=>8176,
-32059=>8177,
-32040=>8178,
-32611=>8179,
-32661=>8180,
-32668=>8181,
-32669=>8182,
-32667=>8183,
-32714=>8184,
-32715=>8185,
-32717=>8186,
-32720=>8187,
-32721=>8188,
-32711=>8189,
-32719=>8190,
-32713=>8191,
-32799=>8192,
-32798=>8193,
-32795=>8194,
-32839=>8195,
-32835=>8196,
-32840=>8197,
-33048=>8198,
-33061=>8199,
-33049=>8200,
-33051=>8201,
-33069=>8202,
-33055=>8203,
-33068=>8204,
-33054=>8205,
-33057=>8206,
-33045=>8207,
-33063=>8208,
-33053=>8209,
-33058=>8210,
-33297=>8211,
-33336=>8212,
-33331=>8213,
-33338=>8214,
-33332=>8215,
-33330=>8216,
-33396=>8217,
-33680=>8218,
-33699=>8219,
-33704=>8220,
-33677=>8221,
-33658=>8222,
-33651=>8223,
-33700=>8224,
-33652=>8225,
-33679=>8226,
-33665=>8227,
-33685=>8228,
-33689=>8229,
-33653=>8230,
-33684=>8231,
-33705=>8232,
-33661=>8233,
-33667=>8234,
-33676=>8235,
-33693=>8236,
-33691=>8237,
-33706=>8238,
-33675=>8239,
-33662=>8240,
-33701=>8241,
-33711=>8242,
-33672=>8243,
-33687=>8244,
-33712=>8245,
-33663=>8246,
-33702=>8247,
-33671=>8248,
-33710=>8249,
-33654=>8250,
-34393=>8251,
-34390=>8252,
-34495=>8253,
-34487=>8254,
-34498=>8255,
-34497=>8256,
-34501=>8257,
-34490=>8258,
-34480=>8259,
-34504=>8260,
-34489=>8261,
-34483=>8262,
-34488=>8263,
-34508=>8264,
-34484=>8265,
-34491=>8266,
-34492=>8267,
-34499=>8268,
-34493=>8269,
-34494=>8270,
-34898=>8271,
-34953=>8272,
-34965=>8273,
-34984=>8274,
-34978=>8275,
-34986=>8276,
-34970=>8277,
-34961=>8278,
-34977=>8279,
-34975=>8280,
-34968=>8281,
-34983=>8282,
-34969=>8283,
-34971=>8284,
-34967=>8285,
-34980=>8286,
-34988=>8287,
-34956=>8288,
-34963=>8289,
-34958=>8290,
-35202=>8291,
-35286=>8292,
-35289=>8293,
-35285=>8294,
-35376=>8295,
-35367=>8296,
-35372=>8297,
-35358=>8298,
-35897=>8299,
-35899=>8300,
-35932=>8301,
-35933=>8302,
-35965=>8303,
-36005=>8304,
-36221=>8305,
-36219=>8306,
-36217=>8307,
-36284=>8308,
-36290=>8309,
-36281=>8310,
-36287=>8311,
-36289=>8312,
-36568=>8313,
-36574=>8314,
-36573=>8315,
-36572=>8316,
-36567=>8317,
-36576=>8318,
-36577=>8319,
-36900=>8320,
-36875=>8321,
-36881=>8322,
-36892=>8323,
-36876=>8324,
-36897=>8325,
-37103=>8326,
-37098=>8327,
-37104=>8328,
-37108=>8329,
-37106=>8330,
-37107=>8331,
-37076=>8332,
-37099=>8333,
-37100=>8334,
-37097=>8335,
-37206=>8336,
-37208=>8337,
-37210=>8338,
-37203=>8339,
-37205=>8340,
-37356=>8341,
-37364=>8342,
-37361=>8343,
-37363=>8344,
-37368=>8345,
-37348=>8346,
-37369=>8347,
-37354=>8348,
-37355=>8349,
-37367=>8350,
-37352=>8351,
-37358=>8352,
-38266=>8353,
-38278=>8354,
-38280=>8355,
-38524=>8356,
-38509=>8357,
-38507=>8358,
-38513=>8359,
-38511=>8360,
-38591=>8361,
-38762=>8362,
-38916=>8363,
-39141=>8364,
-39319=>8365,
-20635=>8366,
-20629=>8367,
-20628=>8368,
-20638=>8369,
-20619=>8370,
-20643=>8371,
-20611=>8372,
-20620=>8373,
-20622=>8374,
-20637=>8375,
-20584=>8376,
-20636=>8377,
-20626=>8378,
-20610=>8379,
-20615=>8380,
-20831=>8381,
-20948=>8382,
-21266=>8383,
-21265=>8384,
-21412=>8385,
-21415=>8386,
-21905=>8387,
-21928=>8388,
-21925=>8389,
-21933=>8390,
-21879=>8391,
-22085=>8392,
-21922=>8393,
-21907=>8394,
-21896=>8395,
-21903=>8396,
-21941=>8397,
-21889=>8398,
-21923=>8399,
-21906=>8400,
-21924=>8401,
-21885=>8402,
-21900=>8403,
-21926=>8404,
-21887=>8405,
-21909=>8406,
-21921=>8407,
-21902=>8408,
-22284=>8409,
-22569=>8410,
-22583=>8411,
-22553=>8412,
-22558=>8413,
-22567=>8414,
-22563=>8415,
-22568=>8416,
-22517=>8417,
-22600=>8418,
-22565=>8419,
-22556=>8420,
-22555=>8421,
-22579=>8422,
-22591=>8423,
-22582=>8424,
-22574=>8425,
-22585=>8426,
-22584=>8427,
-22573=>8428,
-22572=>8429,
-22587=>8430,
-22881=>8431,
-23215=>8432,
-23188=>8433,
-23199=>8434,
-23162=>8435,
-23202=>8436,
-23198=>8437,
-23160=>8438,
-23206=>8439,
-23164=>8440,
-23205=>8441,
-23212=>8442,
-23189=>8443,
-23214=>8444,
-23095=>8445,
-23172=>8446,
-23178=>8447,
-23191=>8448,
-23171=>8449,
-23179=>8450,
-23209=>8451,
-23163=>8452,
-23165=>8453,
-23180=>8454,
-23196=>8455,
-23183=>8456,
-23187=>8457,
-23197=>8458,
-23530=>8459,
-23501=>8460,
-23499=>8461,
-23508=>8462,
-23505=>8463,
-23498=>8464,
-23502=>8465,
-23564=>8466,
-23600=>8467,
-23863=>8468,
-23875=>8469,
-23915=>8470,
-23873=>8471,
-23883=>8472,
-23871=>8473,
-23861=>8474,
-23889=>8475,
-23886=>8476,
-23893=>8477,
-23859=>8478,
-23866=>8479,
-23890=>8480,
-23869=>8481,
-23857=>8482,
-23897=>8483,
-23874=>8484,
-23865=>8485,
-23881=>8486,
-23864=>8487,
-23868=>8488,
-23858=>8489,
-23862=>8490,
-23872=>8491,
-23877=>8492,
-24132=>8493,
-24129=>8494,
-24408=>8495,
-57673=>8495,
-24486=>8496,
-24485=>8497,
-24491=>8498,
-24777=>8499,
-24761=>8500,
-24780=>8501,
-24802=>8502,
-24782=>8503,
-24772=>8504,
-24852=>8505,
-24818=>8506,
-24842=>8507,
-24854=>8508,
-24837=>8509,
-24821=>8510,
-24851=>8511,
-24824=>8512,
-24828=>8513,
-24830=>8514,
-24769=>8515,
-24835=>8516,
-24856=>8517,
-24861=>8518,
-24848=>8519,
-24831=>8520,
-24836=>8521,
-24843=>8522,
-25162=>8523,
-25492=>8524,
-25521=>8525,
-25520=>8526,
-25550=>8527,
-25573=>8528,
-25576=>8529,
-25583=>8530,
-25539=>8531,
-25757=>8532,
-25587=>8533,
-25546=>8534,
-25568=>8535,
-25590=>8536,
-25557=>8537,
-25586=>8538,
-25589=>8539,
-25697=>8540,
-25567=>8541,
-25534=>8542,
-25565=>8543,
-25564=>8544,
-25540=>8545,
-25560=>8546,
-25555=>8547,
-25538=>8548,
-25543=>8549,
-25548=>8550,
-25547=>8551,
-25544=>8552,
-25584=>8553,
-25559=>8554,
-25561=>8555,
-25906=>8556,
-25959=>8557,
-25962=>8558,
-25956=>8559,
-25948=>8560,
-25960=>8561,
-25957=>8562,
-25996=>8563,
-26013=>8564,
-26014=>8565,
-26030=>8566,
-26064=>8567,
-26066=>8568,
-26236=>8569,
-26220=>8570,
-26235=>8571,
-26240=>8572,
-26225=>8573,
-26233=>8574,
-26218=>8575,
-26226=>8576,
-26369=>8577,
-26892=>8578,
-26835=>8579,
-26884=>8580,
-26844=>8581,
-26922=>8582,
-26860=>8583,
-26858=>8584,
-26865=>8585,
-26895=>8586,
-26838=>8587,
-26871=>8588,
-26859=>8589,
-26852=>8590,
-26870=>8591,
-26899=>8592,
-26896=>8593,
-26867=>8594,
-26849=>8595,
-26887=>8596,
-26828=>8597,
-26888=>8598,
-26992=>8599,
-26804=>8600,
-26897=>8601,
-26863=>8602,
-26822=>8603,
-26900=>8604,
-26872=>8605,
-26832=>8606,
-26877=>8607,
-26876=>8608,
-26856=>8609,
-26891=>8610,
-26890=>8611,
-26903=>8612,
-26830=>8613,
-26824=>8614,
-26845=>8615,
-26846=>8616,
-26854=>8617,
-26868=>8618,
-26833=>8619,
-26886=>8620,
-26836=>8621,
-26857=>8622,
-26901=>8623,
-26917=>8624,
-26823=>8625,
-27449=>8626,
-27451=>8627,
-27455=>8628,
-27452=>8629,
-27540=>8630,
-27543=>8631,
-27545=>8632,
-27541=>8633,
-27581=>8634,
-27632=>8635,
-27634=>8636,
-27635=>8637,
-27696=>8638,
-28156=>8639,
-28230=>8640,
-28231=>8641,
-28191=>8642,
-28233=>8643,
-28296=>8644,
-28220=>8645,
-28221=>8646,
-28229=>8647,
-28258=>8648,
-28203=>8649,
-28223=>8650,
-28225=>8651,
-28253=>8652,
-28275=>8653,
-28188=>8654,
-28211=>8655,
-28235=>8656,
-28224=>8657,
-28241=>8658,
-28219=>8659,
-28163=>8660,
-28206=>8661,
-28254=>8662,
-28264=>8663,
-28252=>8664,
-28257=>8665,
-28209=>8666,
-28200=>8667,
-28256=>8668,
-28273=>8669,
-28267=>8670,
-28217=>8671,
-28194=>8672,
-28208=>8673,
-28243=>8674,
-28261=>8675,
-28199=>8676,
-28280=>8677,
-28260=>8678,
-28279=>8679,
-28245=>8680,
-28281=>8681,
-28242=>8682,
-28262=>8683,
-28213=>8684,
-28214=>8685,
-28250=>8686,
-28960=>8687,
-28958=>8688,
-28975=>8689,
-28923=>8690,
-28974=>8691,
-28977=>8692,
-28963=>8693,
-28965=>8694,
-28962=>8695,
-28978=>8696,
-28959=>8697,
-28968=>8698,
-28986=>8699,
-28955=>8700,
-29259=>8701,
-29274=>8702,
-29320=>8703,
-29321=>8704,
-29318=>8705,
-29317=>8706,
-29323=>8707,
-29458=>8708,
-29451=>8709,
-29488=>8710,
-29474=>8711,
-29489=>8712,
-29491=>8713,
-29479=>8714,
-29490=>8715,
-29485=>8716,
-29478=>8717,
-29475=>8718,
-29493=>8719,
-29452=>8720,
-29742=>8721,
-29740=>8722,
-29744=>8723,
-29739=>8724,
-29718=>8725,
-29722=>8726,
-29729=>8727,
-29741=>8728,
-29745=>8729,
-29732=>8730,
-29731=>8731,
-29725=>8732,
-29737=>8733,
-29728=>8734,
-29746=>8735,
-29947=>8736,
-29999=>8737,
-30063=>8738,
-30060=>8739,
-30183=>8740,
-30170=>8741,
-30177=>8742,
-30182=>8743,
-30173=>8744,
-30175=>8745,
-30180=>8746,
-30167=>8747,
-30357=>8748,
-30354=>8749,
-30426=>8750,
-30534=>8751,
-30535=>8752,
-30532=>8753,
-30541=>8754,
-30533=>8755,
-30538=>8756,
-30542=>8757,
-30539=>8758,
-30540=>8759,
-30686=>8760,
-30700=>8761,
-30816=>8762,
-30820=>8763,
-30821=>8764,
-30812=>8765,
-30829=>8766,
-30833=>8767,
-30826=>8768,
-30830=>8769,
-30832=>8770,
-30825=>8771,
-30824=>8772,
-30814=>8773,
-30818=>8774,
-31092=>8775,
-31091=>8776,
-31090=>8777,
-31088=>8778,
-31234=>8779,
-31242=>8780,
-31235=>8781,
-31244=>8782,
-31236=>8783,
-31385=>8784,
-31462=>8785,
-31460=>8786,
-31562=>8787,
-31559=>8788,
-31556=>8789,
-31560=>8790,
-31564=>8791,
-31566=>8792,
-31552=>8793,
-31576=>8794,
-31557=>8795,
-31906=>8796,
-31902=>8797,
-31912=>8798,
-31905=>8799,
-32088=>8800,
-32111=>8801,
-32099=>8802,
-32083=>8803,
-32086=>8804,
-32103=>8805,
-32106=>8806,
-32079=>8807,
-32109=>8808,
-32092=>8809,
-32107=>8810,
-32082=>8811,
-32084=>8812,
-32105=>8813,
-32081=>8814,
-32095=>8815,
-32078=>8816,
-32574=>8817,
-32575=>8818,
-32613=>8819,
-32614=>8820,
-32674=>8821,
-32672=>8822,
-32673=>8823,
-32727=>8824,
-32849=>8825,
-32847=>8826,
-32848=>8827,
-33022=>8828,
-32980=>8829,
-33091=>8830,
-33098=>8831,
-33106=>8832,
-33103=>8833,
-33095=>8834,
-33085=>8835,
-33101=>8836,
-33082=>8837,
-33254=>8838,
-33262=>8839,
-33271=>8840,
-33272=>8841,
-33273=>8842,
-33284=>8843,
-33340=>8844,
-33341=>8845,
-33343=>8846,
-33397=>8847,
-33595=>8848,
-33743=>8849,
-60382=>8849,
-33785=>8850,
-33827=>8851,
-33728=>8852,
-33768=>8853,
-33810=>8854,
-33767=>8855,
-33764=>8856,
-33788=>8857,
-33782=>8858,
-33808=>8859,
-33734=>8860,
-33736=>8861,
-33771=>8862,
-33763=>8863,
-33727=>8864,
-33793=>8865,
-33757=>8866,
-33765=>8867,
-33752=>8868,
-33791=>8869,
-33761=>8870,
-33739=>8871,
-33742=>8872,
-33750=>8873,
-33781=>8874,
-33737=>8875,
-33801=>8876,
-33807=>8877,
-58332=>8877,
-33758=>8878,
-33809=>8879,
-33798=>8880,
-33730=>8881,
-33779=>8882,
-33749=>8883,
-33786=>8884,
-33735=>8885,
-33745=>8886,
-33770=>8887,
-33811=>8888,
-33690=>8889,
-33731=>8890,
-33772=>8891,
-33774=>8892,
-33732=>8893,
-33787=>8894,
-33751=>8895,
-33762=>8896,
-33819=>8897,
-33755=>8898,
-33790=>8899,
-34520=>8900,
-34530=>8901,
-34534=>8902,
-34515=>8903,
-34531=>8904,
-34522=>8905,
-34538=>8906,
-34525=>8907,
-34539=>8908,
-34524=>8909,
-34540=>8910,
-34537=>8911,
-34519=>8912,
-34536=>8913,
-34513=>8914,
-34888=>8915,
-34902=>8916,
-34901=>8917,
-35002=>8918,
-35031=>8919,
-35001=>8920,
-35000=>8921,
-35008=>8922,
-35006=>8923,
-34998=>8924,
-35004=>8925,
-34999=>8926,
-35005=>8927,
-34994=>8928,
-35073=>8929,
-35017=>8930,
-35221=>8931,
-35224=>8932,
-35223=>8933,
-35293=>8934,
-35290=>8935,
-35291=>8936,
-35406=>8937,
-35405=>8938,
-35385=>8939,
-35417=>8940,
-35392=>8941,
-35415=>8942,
-35416=>8943,
-35396=>8944,
-35397=>8945,
-35410=>8946,
-35400=>8947,
-35409=>8948,
-35402=>8949,
-35404=>8950,
-35407=>8951,
-35935=>8952,
-35969=>8953,
-35968=>8954,
-36026=>8955,
-36030=>8956,
-36016=>8957,
-36025=>8958,
-36021=>8959,
-36228=>8960,
-36224=>8961,
-36233=>8962,
-36312=>8963,
-36307=>8964,
-36301=>8965,
-36295=>8966,
-36310=>8967,
-36316=>8968,
-36303=>8969,
-36309=>8970,
-36313=>8971,
-36296=>8972,
-36311=>8973,
-36293=>8974,
-36591=>8975,
-36599=>8976,
-36602=>8977,
-36601=>8978,
-36582=>8979,
-36590=>8980,
-36581=>8981,
-36597=>8982,
-36583=>8983,
-36584=>8984,
-36598=>8985,
-36587=>8986,
-36593=>8987,
-36588=>8988,
-36596=>8989,
-36585=>8990,
-36909=>8991,
-36916=>8992,
-36911=>8993,
-37126=>8994,
-37164=>8995,
-37124=>8996,
-60367=>8996,
-37119=>8997,
-37116=>8998,
-37128=>8999,
-37113=>9000,
-37115=>9001,
-37121=>9002,
-37120=>9003,
-37127=>9004,
-37125=>9005,
-37123=>9006,
-37217=>9007,
-37220=>9008,
-37215=>9009,
-37218=>9010,
-37216=>9011,
-37377=>9012,
-37386=>9013,
-37413=>9014,
-37379=>9015,
-37402=>9016,
-37414=>9017,
-37391=>9018,
-37388=>9019,
-37376=>9020,
-37394=>9021,
-37375=>9022,
-37373=>9023,
-37382=>9024,
-37380=>9025,
-37415=>9026,
-37378=>9027,
-37404=>9028,
-37412=>9029,
-37401=>9030,
-37399=>9031,
-37381=>9032,
-37398=>9033,
-38267=>9034,
-38285=>9035,
-38284=>9036,
-38288=>9037,
-38535=>9038,
-38526=>9039,
-38536=>9040,
-38537=>9041,
-38531=>9042,
-38528=>9043,
-38594=>9044,
-38600=>9045,
-38595=>9046,
-38641=>9047,
-38640=>9048,
-38764=>9049,
-38768=>9050,
-38766=>9051,
-38919=>9052,
-39081=>9053,
-39147=>9054,
-40166=>9055,
-12235=>9056,
-40697=>9056,
-20099=>9057,
-20100=>9058,
-20150=>9059,
-20669=>9060,
-20671=>9061,
-20678=>9062,
-20654=>9063,
-20676=>9064,
-20682=>9065,
-20660=>9066,
-20680=>9067,
-20674=>9068,
-20656=>9069,
-20673=>9070,
-20666=>9071,
-20657=>9072,
-20683=>9073,
-20681=>9074,
-20662=>9075,
-20664=>9076,
-20951=>9077,
-21114=>9078,
-21112=>9079,
-21115=>9080,
-21116=>9081,
-21955=>9082,
-21979=>9083,
-21964=>9084,
-21968=>9085,
-21963=>9086,
-21962=>9087,
-21981=>9088,
-21952=>9089,
-64013=>9089,
-21972=>9090,
-21956=>9091,
-21993=>9092,
-21951=>9093,
-21970=>9094,
-21901=>9095,
-21967=>9096,
-21973=>9097,
-21986=>9098,
-21974=>9099,
-21960=>9100,
-22002=>9101,
-21965=>9102,
-21977=>9103,
-21954=>9104,
-22292=>9105,
-22611=>9106,
-22632=>9107,
-22628=>9108,
-22607=>9109,
-22605=>9110,
-22601=>9111,
-22639=>9112,
-22613=>9113,
-22606=>9114,
-22621=>9115,
-22617=>9116,
-22629=>9117,
-22619=>9118,
-22589=>9119,
-22627=>9120,
-22641=>9121,
-22780=>9122,
-23239=>9123,
-23236=>9124,
-23243=>9125,
-23226=>9126,
-23224=>9127,
-23217=>9128,
-23221=>9129,
-23216=>9130,
-23231=>9131,
-23240=>9132,
-23227=>9133,
-23238=>9134,
-23223=>9135,
-23232=>9136,
-23242=>9137,
-23220=>9138,
-23222=>9139,
-23245=>9140,
-23225=>9141,
-23184=>9142,
-23510=>9143,
-23512=>9144,
-23513=>9145,
-23583=>9146,
-23603=>9147,
-23921=>9148,
-23907=>9149,
-23882=>9150,
-23909=>9151,
-23922=>9152,
-23916=>9153,
-23902=>9154,
-23912=>9155,
-23911=>9156,
-23906=>9157,
-24048=>9158,
-24143=>9159,
-24142=>9160,
-24138=>9161,
-24141=>9162,
-24139=>9163,
-24261=>9164,
-24268=>9165,
-24262=>9166,
-24267=>9167,
-24263=>9168,
-24384=>9169,
-24495=>9170,
-24493=>9171,
-24823=>9172,
-24905=>9173,
-24906=>9174,
-24875=>9175,
-24901=>9176,
-24886=>9177,
-24882=>9178,
-24878=>9179,
-24902=>9180,
-24879=>9181,
-24911=>9182,
-24873=>9183,
-24896=>9184,
-25120=>9185,
-37224=>9186,
-25123=>9187,
-25125=>9188,
-25124=>9189,
-25541=>9190,
-25585=>9191,
-25579=>9192,
-25616=>9193,
-25618=>9194,
-25609=>9195,
-25632=>9196,
-25636=>9197,
-25651=>9198,
-25667=>9199,
-25631=>9200,
-25621=>9201,
-25624=>9202,
-25657=>9203,
-25655=>9204,
-25634=>9205,
-25635=>9206,
-25612=>9207,
-25638=>9208,
-25648=>9209,
-25640=>9210,
-25665=>9211,
-25653=>9212,
-25647=>9213,
-25610=>9214,
-25626=>9215,
-25664=>9216,
-25637=>9217,
-25639=>9218,
-25611=>9219,
-25575=>9220,
-25627=>9221,
-25646=>9222,
-25633=>9223,
-25614=>9224,
-25967=>9225,
-26002=>9226,
-26067=>9227,
-26246=>9228,
-26252=>9229,
-26261=>9230,
-26256=>9231,
-26251=>9232,
-26250=>9233,
-26265=>9234,
-26260=>9235,
-26232=>9236,
-26400=>9237,
-26982=>9238,
-26975=>9239,
-26936=>9240,
-26958=>9241,
-26978=>9242,
-26993=>9243,
-26943=>9244,
-26949=>9245,
-26986=>9246,
-26937=>9247,
-26946=>9248,
-26967=>9249,
-26969=>9250,
-27002=>9251,
-26952=>9252,
-26953=>9253,
-26933=>9254,
-26988=>9255,
-26931=>9256,
-26941=>9257,
-26981=>9258,
-26864=>9259,
-27000=>9260,
-26932=>9261,
-26985=>9262,
-26944=>9263,
-26991=>9264,
-26948=>9265,
-26998=>9266,
-26968=>9267,
-26945=>9268,
-26996=>9269,
-26956=>9270,
-26939=>9271,
-26955=>9272,
-26935=>9273,
-26972=>9274,
-26959=>9275,
-26961=>9276,
-26930=>9277,
-26962=>9278,
-26927=>9279,
-27003=>9280,
-26940=>9281,
-27462=>9282,
-27461=>9283,
-27459=>9284,
-27458=>9285,
-27464=>9286,
-27457=>9287,
-27547=>9288,
-27643=>9289,
-27644=>9290,
-27641=>9291,
-27639=>9292,
-27640=>9293,
-28315=>9294,
-28374=>9295,
-28360=>9296,
-28303=>9297,
-28352=>9298,
-28319=>9299,
-28307=>9300,
-28308=>9301,
-28320=>9302,
-28337=>9303,
-28345=>9304,
-28358=>9305,
-28370=>9306,
-28349=>9307,
-28353=>9308,
-28318=>9309,
-28361=>9310,
-28343=>9311,
-28336=>9312,
-28365=>9313,
-28326=>9314,
-28367=>9315,
-28338=>9316,
-28350=>9317,
-28355=>9318,
-28380=>9319,
-28376=>9320,
-28313=>9321,
-28306=>9322,
-28302=>9323,
-28301=>9324,
-28324=>9325,
-28321=>9326,
-28351=>9327,
-28339=>9328,
-28368=>9329,
-28362=>9330,
-28311=>9331,
-28334=>9332,
-28323=>9333,
-28999=>9334,
-29012=>9335,
-29010=>9336,
-29027=>9337,
-29024=>9338,
-28993=>9339,
-29021=>9340,
-29026=>9341,
-61080=>9341,
-29042=>9342,
-29048=>9343,
-29034=>9344,
-29025=>9345,
-28994=>9346,
-29016=>9347,
-28995=>9348,
-29003=>9349,
-29040=>9350,
-29023=>9351,
-29008=>9352,
-29011=>9353,
-28996=>9354,
-29005=>9355,
-29018=>9356,
-29263=>9357,
-29325=>9358,
-29324=>9359,
-29329=>9360,
-29328=>9361,
-29326=>9362,
-29500=>9363,
-29506=>9364,
-29499=>9365,
-29498=>9366,
-29504=>9367,
-29514=>9368,
-29513=>9369,
-29764=>9370,
-29770=>9371,
-29771=>9372,
-29778=>9373,
-29777=>9374,
-29783=>9375,
-29760=>9376,
-29775=>9377,
-29776=>9378,
-29774=>9379,
-29762=>9380,
-29766=>9381,
-29773=>9382,
-29780=>9383,
-29921=>9384,
-29951=>9385,
-29950=>9386,
-29949=>9387,
-29981=>9388,
-30073=>9389,
-30071=>9390,
-27011=>9391,
-30191=>9392,
-30223=>9393,
-30211=>9394,
-30199=>9395,
-30206=>9396,
-30204=>9397,
-30201=>9398,
-60782=>9398,
-30200=>9399,
-30224=>9400,
-30203=>9401,
-30198=>9402,
-30189=>9403,
-30197=>9404,
-30205=>9405,
-30361=>9406,
-30389=>9407,
-30429=>9408,
-30549=>9409,
-30559=>9410,
-30560=>9411,
-30546=>9412,
-30550=>9413,
-30554=>9414,
-30569=>9415,
-30567=>9416,
-30548=>9417,
-30553=>9418,
-30573=>9419,
-30688=>9420,
-30855=>9421,
-30874=>9422,
-30868=>9423,
-30863=>9424,
-30852=>9425,
-30869=>9426,
-30853=>9427,
-30854=>9428,
-30881=>9429,
-30851=>9430,
-30841=>9431,
-30873=>9432,
-30848=>9433,
-30870=>9434,
-30843=>9435,
-31100=>9436,
-31106=>9437,
-31101=>9438,
-31097=>9439,
-31249=>9440,
-31256=>9441,
-31257=>9442,
-31250=>9443,
-31255=>9444,
-31253=>9445,
-31266=>9446,
-31251=>9447,
-31259=>9448,
-31248=>9449,
-31395=>9450,
-31394=>9451,
-31390=>9452,
-31467=>9453,
-31590=>9454,
-31588=>9455,
-31597=>9456,
-31604=>9457,
-31593=>9458,
-31602=>9459,
-31589=>9460,
-31603=>9461,
-31601=>9462,
-31600=>9463,
-31585=>9464,
-31608=>9465,
-31606=>9466,
-31587=>9467,
-31922=>9468,
-31924=>9469,
-31919=>9470,
-32136=>9471,
-32134=>9472,
-32128=>9473,
-32141=>9474,
-32127=>9475,
-32133=>9476,
-32122=>9477,
-32142=>9478,
-32123=>9479,
-32131=>9480,
-32124=>9481,
-32140=>9482,
-32148=>9483,
-32132=>9484,
-32125=>9485,
-32146=>9486,
-32621=>9487,
-32619=>9488,
-32615=>9489,
-32616=>9490,
-32620=>9491,
-32678=>9492,
-32677=>9493,
-32679=>9494,
-32731=>9495,
-32732=>9496,
-32801=>9497,
-33124=>9498,
-33120=>9499,
-33143=>9500,
-33116=>9501,
-33129=>9502,
-33115=>9503,
-33122=>9504,
-33138=>9505,
-26401=>9506,
-33118=>9507,
-33142=>9508,
-33127=>9509,
-33135=>9510,
-33092=>9511,
-33121=>9512,
-33309=>9513,
-33353=>9514,
-33348=>9515,
-33344=>9516,
-33346=>9517,
-33349=>9518,
-34033=>9519,
-33855=>9520,
-33878=>9521,
-33910=>9522,
-33913=>9523,
-33935=>9524,
-33933=>9525,
-33893=>9526,
-33873=>9527,
-33856=>9528,
-33926=>9529,
-33895=>9530,
-33840=>9531,
-33869=>9532,
-33917=>9533,
-33882=>9534,
-33881=>9535,
-33908=>9536,
-33907=>9537,
-33885=>9538,
-34055=>9539,
-33886=>9540,
-33847=>9541,
-33850=>9542,
-33844=>9543,
-33914=>9544,
-33859=>9545,
-33912=>9546,
-33842=>9547,
-33861=>9548,
-33833=>9549,
-33753=>9550,
-33867=>9551,
-33839=>9552,
-33858=>9553,
-33837=>9554,
-33887=>9555,
-33904=>9556,
-33849=>9557,
-33870=>9558,
-33868=>9559,
-33874=>9560,
-33903=>9561,
-33989=>9562,
-33934=>9563,
-33851=>9564,
-33863=>9565,
-33846=>9566,
-33843=>9567,
-33896=>9568,
-33918=>9569,
-33860=>9570,
-33835=>9571,
-33888=>9572,
-33876=>9573,
-33902=>9574,
-33872=>9575,
-34571=>9576,
-34564=>9577,
-34551=>9578,
-34572=>9579,
-34554=>9580,
-34518=>9581,
-34549=>9582,
-34637=>9583,
-34552=>9584,
-34574=>9585,
-34569=>9586,
-34561=>9587,
-34550=>9588,
-34573=>9589,
-34565=>9590,
-35030=>9591,
-35019=>9592,
-35021=>9593,
-35022=>9594,
-35038=>9595,
-35035=>9596,
-35034=>9597,
-35020=>9598,
-35024=>9599,
-35205=>9600,
-35227=>9601,
-35295=>9602,
-35301=>9603,
-35300=>9604,
-35297=>9605,
-35296=>9606,
-35298=>9607,
-35292=>9608,
-35302=>9609,
-35446=>9610,
-35462=>9611,
-35455=>9612,
-35425=>9613,
-35391=>9614,
-35447=>9615,
-35458=>9616,
-35460=>9617,
-35445=>9618,
-35459=>9619,
-35457=>9620,
-35444=>9621,
-35450=>9622,
-35900=>9623,
-35915=>9624,
-35914=>9625,
-35941=>9626,
-35940=>9627,
-35942=>9628,
-35974=>9629,
-35972=>9630,
-35973=>9631,
-36044=>9632,
-36200=>9633,
-36201=>9634,
-36241=>9635,
-36236=>9636,
-36238=>9637,
-36239=>9638,
-36237=>9639,
-36243=>9640,
-36244=>9641,
-36240=>9642,
-36242=>9643,
-36336=>9644,
-36320=>9645,
-36332=>9646,
-36337=>9647,
-36334=>9648,
-36304=>9649,
-36329=>9650,
-36323=>9651,
-36322=>9652,
-36327=>9653,
-36338=>9654,
-36331=>9655,
-36340=>9656,
-36614=>9657,
-36607=>9658,
-36609=>9659,
-36608=>9660,
-36613=>9661,
-36615=>9662,
-36616=>9663,
-36610=>9664,
-36619=>9665,
-60507=>9665,
-36946=>9666,
-36927=>9667,
-36932=>9668,
-36937=>9669,
-36925=>9670,
-37136=>9671,
-37133=>9672,
-37135=>9673,
-37137=>9674,
-37142=>9675,
-37140=>9676,
-37131=>9677,
-37134=>9678,
-37230=>9679,
-37231=>9680,
-37448=>9681,
-37458=>9682,
-37424=>9683,
-37434=>9684,
-37478=>9685,
-37427=>9686,
-37477=>9687,
-37470=>9688,
-37507=>9689,
-37422=>9690,
-37450=>9691,
-37446=>9692,
-37485=>9693,
-37484=>9694,
-37455=>9695,
-37472=>9696,
-37479=>9697,
-37487=>9698,
-37430=>9699,
-37473=>9700,
-37488=>9701,
-37425=>9702,
-37460=>9703,
-37475=>9704,
-37456=>9705,
-37490=>9706,
-37454=>9707,
-37459=>9708,
-37452=>9709,
-37462=>9710,
-37426=>9711,
-38303=>9712,
-38300=>9713,
-38302=>9714,
-38299=>9715,
-38546=>9716,
-38547=>9717,
-38545=>9718,
-38551=>9719,
-38606=>9720,
-38650=>9721,
-38653=>9722,
-38648=>9723,
-38645=>9724,
-38771=>9725,
-38775=>9726,
-38776=>9727,
-38770=>9728,
-38927=>9729,
-38925=>9730,
-38926=>9731,
-39084=>9732,
-39158=>9733,
-39161=>9734,
-39343=>9735,
-39346=>9736,
-39344=>9737,
-39349=>9738,
-39597=>9739,
-39595=>9740,
-39771=>9741,
-40170=>9742,
-40173=>9743,
-40167=>9744,
-40576=>9745,
-12236=>9746,
-40701=>9746,
-20710=>9747,
-20692=>9748,
-20695=>9749,
-20712=>9750,
-20723=>9751,
-20699=>9752,
-20714=>9753,
-20701=>9754,
-20708=>9755,
-20691=>9756,
-20716=>9757,
-20720=>9758,
-20719=>9759,
-20707=>9760,
-20704=>9761,
-20952=>9762,
-21120=>9763,
-21121=>9764,
-21225=>9765,
-21227=>9766,
-21296=>9767,
-21420=>9768,
-22055=>9769,
-22037=>9770,
-22028=>9771,
-22034=>9772,
-22012=>9773,
-22031=>9774,
-22044=>9775,
-22017=>9776,
-22035=>9777,
-22018=>9778,
-22010=>9779,
-22045=>9780,
-22020=>9781,
-22015=>9782,
-22009=>9783,
-22665=>9784,
-22652=>9785,
-22672=>9786,
-22680=>9787,
-22662=>9788,
-22657=>9789,
-22655=>9790,
-22644=>9791,
-22667=>9792,
-22650=>9793,
-22663=>9794,
-22673=>9795,
-22670=>9796,
-22646=>9797,
-22658=>9798,
-22664=>9799,
-22651=>9800,
-22676=>9801,
-22671=>9802,
-22782=>9803,
-22891=>9804,
-23260=>9805,
-23278=>9806,
-23269=>9807,
-23253=>9808,
-23274=>9809,
-23258=>9810,
-23277=>9811,
-23275=>9812,
-23283=>9813,
-23266=>9814,
-23264=>9815,
-23259=>9816,
-23276=>9817,
-23262=>9818,
-23261=>9819,
-23257=>9820,
-23272=>9821,
-23263=>9822,
-23415=>9823,
-23520=>9824,
-23523=>9825,
-23651=>9826,
-23938=>9827,
-23936=>9828,
-23933=>9829,
-23942=>9830,
-23930=>9831,
-23937=>9832,
-23927=>9833,
-23946=>9834,
-23945=>9835,
-23944=>9836,
-23934=>9837,
-23932=>9838,
-23949=>9839,
-23929=>9840,
-23935=>9841,
-24152=>9842,
-24153=>9843,
-24147=>9844,
-24280=>9845,
-24273=>9846,
-24279=>9847,
-24270=>9848,
-24284=>9849,
-24277=>9850,
-24281=>9851,
-24274=>9852,
-24276=>9853,
-24388=>9854,
-24387=>9855,
-24431=>9856,
-24502=>9857,
-24876=>9858,
-24872=>9859,
-24897=>9860,
-24926=>9861,
-24945=>9862,
-24947=>9863,
-24914=>9864,
-24915=>9865,
-24946=>9866,
-24940=>9867,
-24960=>9868,
-24948=>9869,
-24916=>9870,
-24954=>9871,
-24923=>9872,
-24933=>9873,
-24891=>9874,
-24938=>9875,
-24929=>9876,
-24918=>9877,
-25129=>9878,
-25127=>9879,
-25131=>9880,
-25643=>9881,
-25677=>9882,
-25691=>9883,
-25693=>9884,
-25716=>9885,
-25718=>9886,
-25714=>9887,
-25715=>9888,
-25725=>9889,
-25717=>9890,
-25702=>9891,
-25766=>9892,
-25678=>9893,
-25730=>9894,
-25694=>9895,
-25692=>9896,
-25675=>9897,
-25683=>9898,
-25696=>9899,
-25680=>9900,
-25727=>9901,
-25663=>9902,
-25708=>9903,
-25707=>9904,
-25689=>9905,
-25701=>9906,
-25719=>9907,
-25971=>9908,
-26016=>9909,
-26273=>9910,
-26272=>9911,
-26271=>9912,
-26373=>9913,
-26372=>9914,
-26402=>9915,
-27057=>9916,
-27062=>9917,
-27081=>9918,
-27040=>9919,
-27086=>9920,
-27030=>9921,
-27056=>9922,
-27052=>9923,
-27068=>9924,
-27025=>9925,
-27033=>9926,
-27022=>9927,
-27047=>9928,
-27021=>9929,
-27049=>9930,
-27070=>9931,
-27055=>9932,
-27071=>9933,
-27076=>9934,
-27069=>9935,
-27044=>9936,
-27092=>9937,
-27065=>9938,
-27082=>9939,
-27034=>9940,
-27087=>9941,
-27059=>9942,
-27027=>9943,
-27050=>9944,
-27041=>9945,
-27038=>9946,
-27097=>9947,
-27031=>9948,
-27024=>9949,
-27074=>9950,
-27061=>9951,
-27045=>9952,
-27078=>9953,
-27466=>9954,
-27469=>9955,
-27467=>9956,
-27550=>9957,
-27551=>9958,
-27552=>9959,
-27587=>9960,
-27588=>9961,
-27646=>9962,
-28366=>9963,
-28405=>9964,
-28401=>9965,
-28419=>9966,
-28453=>9967,
-28408=>9968,
-28471=>9969,
-28411=>9970,
-28462=>9971,
-28425=>9972,
-28494=>9973,
-28441=>9974,
-28442=>9975,
-28455=>9976,
-28440=>9977,
-28475=>9978,
-28434=>9979,
-28397=>9980,
-28426=>9981,
-28470=>9982,
-28531=>9983,
-28409=>9984,
-28398=>9985,
-28461=>9986,
-28480=>9987,
-28464=>9988,
-28476=>9989,
-28469=>9990,
-28395=>9991,
-28423=>9992,
-28430=>9993,
-28483=>9994,
-28421=>9995,
-28413=>9996,
-28406=>9997,
-28473=>9998,
-28444=>9999,
-28412=>10000,
-28474=>10001,
-28447=>10002,
-28429=>10003,
-28446=>10004,
-28424=>10005,
-28449=>10006,
-29063=>10007,
-29072=>10008,
-29065=>10009,
-29056=>10010,
-29061=>10011,
-29058=>10012,
-29071=>10013,
-29051=>10014,
-29062=>10015,
-29057=>10016,
-29079=>10017,
-29252=>10018,
-29267=>10019,
-29335=>10020,
-29333=>10021,
-29331=>10022,
-29507=>10023,
-29517=>10024,
-29521=>10025,
-29516=>10026,
-29794=>10027,
-29811=>10028,
-29809=>10029,
-29813=>10030,
-29810=>10031,
-29799=>10032,
-29806=>10033,
-29952=>10034,
-29954=>10035,
-29955=>10036,
-30077=>10037,
-30096=>10038,
-30230=>10039,
-30216=>10040,
-30220=>10041,
-30229=>10042,
-30225=>10043,
-30218=>10044,
-30228=>10045,
-30392=>10046,
-30593=>10047,
-30588=>10048,
-30597=>10049,
-30594=>10050,
-30574=>10051,
-30592=>10052,
-30575=>10053,
-30590=>10054,
-30595=>10055,
-30898=>10056,
-30890=>10057,
-30900=>10058,
-30893=>10059,
-30888=>10060,
-30846=>10061,
-30891=>10062,
-30878=>10063,
-30885=>10064,
-30880=>10065,
-30892=>10066,
-30882=>10067,
-30884=>10068,
-31128=>10069,
-31114=>10070,
-31115=>10071,
-31126=>10072,
-31125=>10073,
-31124=>10074,
-31123=>10075,
-31127=>10076,
-31112=>10077,
-31122=>10078,
-31120=>10079,
-31275=>10080,
-31306=>10081,
-31280=>10082,
-31279=>10083,
-31272=>10084,
-31270=>10085,
-31400=>10086,
-31403=>10087,
-31404=>10088,
-31470=>10089,
-31624=>10090,
-31644=>10091,
-31626=>10092,
-31633=>10093,
-31632=>10094,
-31638=>10095,
-31629=>10096,
-31628=>10097,
-31643=>10098,
-31630=>10099,
-31621=>10100,
-31640=>10101,
-21124=>10102,
-31641=>10103,
-31652=>10104,
-31618=>10105,
-31931=>10106,
-31935=>10107,
-31932=>10108,
-31930=>10109,
-32167=>10110,
-32183=>10111,
-32194=>10112,
-32163=>10113,
-32170=>10114,
-32193=>10115,
-32192=>10116,
-32197=>10117,
-32157=>10118,
-32206=>10119,
-32196=>10120,
-32198=>10121,
-32203=>10122,
-32204=>10123,
-32175=>10124,
-32185=>10125,
-32150=>10126,
-32188=>10127,
-32159=>10128,
-32166=>10129,
-32174=>10130,
-32169=>10131,
-32161=>10132,
-32201=>10133,
-32627=>10134,
-32738=>10135,
-32739=>10136,
-32741=>10137,
-32734=>10138,
-32804=>10139,
-32861=>10140,
-32860=>10141,
-33161=>10142,
-33158=>10143,
-33155=>10144,
-33159=>10145,
-33165=>10146,
-33164=>10147,
-33163=>10148,
-33301=>10149,
-33943=>10150,
-33956=>10151,
-33953=>10152,
-33951=>10153,
-33978=>10154,
-33998=>10155,
-33986=>10156,
-33964=>10157,
-33966=>10158,
-33963=>10159,
-33977=>10160,
-33972=>10161,
-33985=>10162,
-33997=>10163,
-33962=>10164,
-33946=>10165,
-33969=>10166,
-34000=>10167,
-33949=>10168,
-33959=>10169,
-33979=>10170,
-33954=>10171,
-33940=>10172,
-33991=>10173,
-33996=>10174,
-33947=>10175,
-33961=>10176,
-33967=>10177,
-33960=>10178,
-58327=>10178,
-34006=>10179,
-33944=>10180,
-33974=>10181,
-33999=>10182,
-33952=>10183,
-34007=>10184,
-34004=>10185,
-34002=>10186,
-34011=>10187,
-33968=>10188,
-33937=>10189,
-34401=>10190,
-34611=>10191,
-34595=>10192,
-34600=>10193,
-34667=>10194,
-34624=>10195,
-34606=>10196,
-34590=>10197,
-34593=>10198,
-34585=>10199,
-34587=>10200,
-34627=>10201,
-34604=>10202,
-34625=>10203,
-34622=>10204,
-34630=>10205,
-34592=>10206,
-34610=>10207,
-34602=>10208,
-34605=>10209,
-34620=>10210,
-34578=>10211,
-34618=>10212,
-34609=>10213,
-34613=>10214,
-34626=>10215,
-34598=>10216,
-34599=>10217,
-34616=>10218,
-34596=>10219,
-34586=>10220,
-34608=>10221,
-34577=>10222,
-35063=>10223,
-35047=>10224,
-35057=>10225,
-35058=>10226,
-35066=>10227,
-35070=>10228,
-35054=>10229,
-35068=>10230,
-35062=>10231,
-35067=>10232,
-35056=>10233,
-35052=>10234,
-35051=>10235,
-35229=>10236,
-35233=>10237,
-35231=>10238,
-35230=>10239,
-35305=>10240,
-35307=>10241,
-35304=>10242,
-35499=>10243,
-35481=>10244,
-35467=>10245,
-35474=>10246,
-35471=>10247,
-35478=>10248,
-35901=>10249,
-35944=>10250,
-35945=>10251,
-36053=>10252,
-36047=>10253,
-36055=>10254,
-36246=>10255,
-36361=>10256,
-36354=>10257,
-36351=>10258,
-36365=>10259,
-36349=>10260,
-36362=>10261,
-36355=>10262,
-36359=>10263,
-36358=>10264,
-36357=>10265,
-36350=>10266,
-36352=>10267,
-36356=>10268,
-36624=>10269,
-36625=>10270,
-36622=>10271,
-36621=>10272,
-37155=>10273,
-37148=>10274,
-37152=>10275,
-37154=>10276,
-37151=>10277,
-37149=>10278,
-37146=>10279,
-37156=>10280,
-37153=>10281,
-37147=>10282,
-37242=>10283,
-37234=>10284,
-37241=>10285,
-37235=>10286,
-37541=>10287,
-37540=>10288,
-37494=>10289,
-37531=>10290,
-37498=>10291,
-37536=>10292,
-37524=>10293,
-37546=>10294,
-37517=>10295,
-37542=>10296,
-37530=>10297,
-37547=>10298,
-37497=>10299,
-37527=>10300,
-37503=>10301,
-37539=>10302,
-37614=>10303,
-37518=>10304,
-37506=>10305,
-37525=>10306,
-37538=>10307,
-37501=>10308,
-37512=>10309,
-37537=>10310,
-37514=>10311,
-37510=>10312,
-37516=>10313,
-37529=>10314,
-37543=>10315,
-37502=>10316,
-37511=>10317,
-37545=>10318,
-37533=>10319,
-37515=>10320,
-37421=>10321,
-38558=>10322,
-38561=>10323,
-38655=>10324,
-38744=>10325,
-38781=>10326,
-38778=>10327,
-38782=>10328,
-38787=>10329,
-38784=>10330,
-38786=>10331,
-38779=>10332,
-38788=>10333,
-38785=>10334,
-38783=>10335,
-38862=>10336,
-38861=>10337,
-38934=>10338,
-39085=>10339,
-39086=>10340,
-39170=>10341,
-39168=>10342,
-39175=>10343,
-39325=>10344,
-39324=>10345,
-39363=>10346,
-39353=>10347,
-39355=>10348,
-39354=>10349,
-39362=>10350,
-39357=>10351,
-39367=>10352,
-39601=>10353,
-39651=>10354,
-39655=>10355,
-39742=>10356,
-39743=>10357,
-39776=>10358,
-39777=>10359,
-39775=>10360,
-40177=>10361,
-40178=>10362,
-40181=>10363,
-40615=>10364,
-20735=>10365,
-20739=>10366,
-20784=>10367,
-20728=>10368,
-20742=>10369,
-20743=>10370,
-20726=>10371,
-20734=>10372,
-20747=>10373,
-20748=>10374,
-20733=>10375,
-20746=>10376,
-21131=>10377,
-21132=>10378,
-21233=>10379,
-21231=>10380,
-22088=>10381,
-22082=>10382,
-22092=>10383,
-22069=>10384,
-22081=>10385,
-22090=>10386,
-22089=>10387,
-22086=>10388,
-22104=>10389,
-22106=>10390,
-22080=>10391,
-22067=>10392,
-22077=>10393,
-22060=>10394,
-22078=>10395,
-22072=>10396,
-22058=>10397,
-22074=>10398,
-22298=>10399,
-22699=>10400,
-22685=>10401,
-22705=>10402,
-22688=>10403,
-22691=>10404,
-22703=>10405,
-22700=>10406,
-22693=>10407,
-22689=>10408,
-22783=>10409,
-23295=>10410,
-23284=>10411,
-23293=>10412,
-23287=>10413,
-23286=>10414,
-23299=>10415,
-23288=>10416,
-23298=>10417,
-23289=>10418,
-23297=>10419,
-23303=>10420,
-23301=>10421,
-23311=>10422,
-23655=>10423,
-23961=>10424,
-23959=>10425,
-23967=>10426,
-23954=>10427,
-23970=>10428,
-23955=>10429,
-23957=>10430,
-23968=>10431,
-23964=>10432,
-23969=>10433,
-23962=>10434,
-23966=>10435,
-24169=>10436,
-24157=>10437,
-24160=>10438,
-24156=>10439,
-32243=>10440,
-24283=>10441,
-24286=>10442,
-24289=>10443,
-24393=>10444,
-24498=>10445,
-24971=>10446,
-24963=>10447,
-24953=>10448,
-25009=>10449,
-25008=>10450,
-24994=>10451,
-24969=>10452,
-24987=>10453,
-24979=>10454,
-25007=>10455,
-25005=>10456,
-24991=>10457,
-24978=>10458,
-25002=>10459,
-24993=>10460,
-24973=>10461,
-24934=>10462,
-25011=>10463,
-25133=>10464,
-25710=>10465,
-25712=>10466,
-25750=>10467,
-25760=>10468,
-25733=>10469,
-25751=>10470,
-25756=>10471,
-25743=>10472,
-25739=>10473,
-25738=>10474,
-25740=>10475,
-25763=>10476,
-25759=>10477,
-25704=>10478,
-25777=>10479,
-25752=>10480,
-25974=>10481,
-25978=>10482,
-25977=>10483,
-25979=>10484,
-26034=>10485,
-26035=>10486,
-26293=>10487,
-26288=>10488,
-26281=>10489,
-26290=>10490,
-26295=>10491,
-26282=>10492,
-26287=>10493,
-27136=>10494,
-27142=>10495,
-27159=>10496,
-27109=>10497,
-27128=>10498,
-27157=>10499,
-27121=>10500,
-27108=>10501,
-27168=>10502,
-27135=>10503,
-27116=>10504,
-27106=>10505,
-27163=>10506,
-27165=>10507,
-27134=>10508,
-27175=>10509,
-27122=>10510,
-27118=>10511,
-27156=>10512,
-27127=>10513,
-27111=>10514,
-27200=>10515,
-27144=>10516,
-27110=>10517,
-27131=>10518,
-27149=>10519,
-27132=>10520,
-27115=>10521,
-27145=>10522,
-27140=>10523,
-27160=>10524,
-27173=>10525,
-27151=>10526,
-27126=>10527,
-27174=>10528,
-27143=>10529,
-27124=>10530,
-27158=>10531,
-27473=>10532,
-27557=>10533,
-27555=>10534,
-27554=>10535,
-27558=>10536,
-27649=>10537,
-27648=>10538,
-27647=>10539,
-27650=>10540,
-28481=>10541,
-28454=>10542,
-28542=>10543,
-28551=>10544,
-28614=>10545,
-28562=>10546,
-28557=>10547,
-28553=>10548,
-28556=>10549,
-28514=>10550,
-28495=>10551,
-28549=>10552,
-28506=>10553,
-28566=>10554,
-28534=>10555,
-28524=>10556,
-28546=>10557,
-28501=>10558,
-28530=>10559,
-28498=>10560,
-28496=>10561,
-28503=>10562,
-28564=>10563,
-28563=>10564,
-28509=>10565,
-28416=>10566,
-28513=>10567,
-28523=>10568,
-28541=>10569,
-28519=>10570,
-28560=>10571,
-28499=>10572,
-28555=>10573,
-28521=>10574,
-28543=>10575,
-28565=>10576,
-28515=>10577,
-28535=>10578,
-28522=>10579,
-28539=>10580,
-29106=>10581,
-29103=>10582,
-29083=>10583,
-29104=>10584,
-29088=>10585,
-29082=>10586,
-29097=>10587,
-29109=>10588,
-29085=>10589,
-29093=>10590,
-29086=>10591,
-29092=>10592,
-29089=>10593,
-29098=>10594,
-29084=>10595,
-29095=>10596,
-29107=>10597,
-29336=>10598,
-29338=>10599,
-29528=>10600,
-29522=>10601,
-29534=>10602,
-29535=>10603,
-29536=>10604,
-29533=>10605,
-29531=>10606,
-29537=>10607,
-29530=>10608,
-29529=>10609,
-29538=>10610,
-29831=>10611,
-29833=>10612,
-29834=>10613,
-29830=>10614,
-29825=>10615,
-29821=>10616,
-29829=>10617,
-29832=>10618,
-29820=>10619,
-29817=>10620,
-58868=>10620,
-29960=>10621,
-29959=>10622,
-30078=>10623,
-30245=>10624,
-30238=>10625,
-30233=>10626,
-30237=>10627,
-30236=>10628,
-30243=>10629,
-30234=>10630,
-30248=>10631,
-30235=>10632,
-30364=>10633,
-30365=>10634,
-30366=>10635,
-30363=>10636,
-30605=>10637,
-30607=>10638,
-30601=>10639,
-30600=>10640,
-30925=>10641,
-30907=>10642,
-30927=>10643,
-30924=>10644,
-30929=>10645,
-30926=>10646,
-30932=>10647,
-30920=>10648,
-30915=>10649,
-30916=>10650,
-30921=>10651,
-31130=>10652,
-31137=>10653,
-31136=>10654,
-31132=>10655,
-31138=>10656,
-31131=>10657,
-59175=>10657,
-27510=>10658,
-31289=>10659,
-31410=>10660,
-31412=>10661,
-31411=>10662,
-31671=>10663,
-31691=>10664,
-31678=>10665,
-31660=>10666,
-31694=>10667,
-31663=>10668,
-31673=>10669,
-31690=>10670,
-31669=>10671,
-31941=>10672,
-31944=>10673,
-31948=>10674,
-31947=>10675,
-32247=>10676,
-32219=>10677,
-32234=>10678,
-32231=>10679,
-32215=>10680,
-32225=>10681,
-32259=>10682,
-32250=>10683,
-32230=>10684,
-32246=>10685,
-32241=>10686,
-32240=>10687,
-32238=>10688,
-32223=>10689,
-32630=>10690,
-32684=>10691,
-32688=>10692,
-32685=>10693,
-32749=>10694,
-32747=>10695,
-32746=>10696,
-32748=>10697,
-32742=>10698,
-32744=>10699,
-32868=>10700,
-32871=>10701,
-33187=>10702,
-33183=>10703,
-33182=>10704,
-33173=>10705,
-33186=>10706,
-33177=>10707,
-33175=>10708,
-33302=>10709,
-33359=>10710,
-33363=>10711,
-33362=>10712,
-33360=>10713,
-33358=>10714,
-33361=>10715,
-34084=>10716,
-34107=>10717,
-34063=>10718,
-34048=>10719,
-34089=>10720,
-34062=>10721,
-34057=>10722,
-34061=>10723,
-34079=>10724,
-34058=>10725,
-34087=>10726,
-34076=>10727,
-34043=>10728,
-34091=>10729,
-34042=>10730,
-34056=>10731,
-34060=>10732,
-34036=>10733,
-34090=>10734,
-34034=>10735,
-34069=>10736,
-34039=>10737,
-34027=>10738,
-34035=>10739,
-34044=>10740,
-34066=>10741,
-34026=>10742,
-34025=>10743,
-34070=>10744,
-34046=>10745,
-34088=>10746,
-34077=>10747,
-34094=>10748,
-34050=>10749,
-34045=>10750,
-34078=>10751,
-34038=>10752,
-34097=>10753,
-34086=>10754,
-34023=>10755,
-34024=>10756,
-34032=>10757,
-34031=>10758,
-34041=>10759,
-34072=>10760,
-34080=>10761,
-34096=>10762,
-34059=>10763,
-34073=>10764,
-34095=>10765,
-34402=>10766,
-34646=>10767,
-34659=>10768,
-34660=>10769,
-34679=>10770,
-34785=>10771,
-34675=>10772,
-34648=>10773,
-34644=>10774,
-34651=>10775,
-34642=>10776,
-34657=>10777,
-34650=>10778,
-34641=>10779,
-34654=>10780,
-34669=>10781,
-34666=>10782,
-34640=>10783,
-34638=>10784,
-34655=>10785,
-34653=>10786,
-34671=>10787,
-34668=>10788,
-34682=>10789,
-34670=>10790,
-34652=>10791,
-34661=>10792,
-34639=>10793,
-34683=>10794,
-34677=>10795,
-34658=>10796,
-34663=>10797,
-34665=>10798,
-34906=>10799,
-35077=>10800,
-35084=>10801,
-35092=>10802,
-35083=>10803,
-35095=>10804,
-35096=>10805,
-35097=>10806,
-35078=>10807,
-35094=>10808,
-35089=>10809,
-35086=>10810,
-35081=>10811,
-35234=>10812,
-35236=>10813,
-35235=>10814,
-35309=>10815,
-35312=>10816,
-35308=>10817,
-35535=>10818,
-35526=>10819,
-35512=>10820,
-35539=>10821,
-35537=>10822,
-35540=>10823,
-35541=>10824,
-35515=>10825,
-35543=>10826,
-35518=>10827,
-35520=>10828,
-35525=>10829,
-35544=>10830,
-35523=>10831,
-35514=>10832,
-35517=>10833,
-35545=>10834,
-35902=>10835,
-35917=>10836,
-35983=>10837,
-36069=>10838,
-36063=>10839,
-36057=>10840,
-36072=>10841,
-36058=>10842,
-36061=>10843,
-36071=>10844,
-36256=>10845,
-36252=>10846,
-36257=>10847,
-36251=>10848,
-36384=>10849,
-36387=>10850,
-36389=>10851,
-36388=>10852,
-36398=>10853,
-36373=>10854,
-36379=>10855,
-36374=>10856,
-36369=>10857,
-36377=>10858,
-36390=>10859,
-36391=>10860,
-36372=>10861,
-36370=>10862,
-36376=>10863,
-36371=>10864,
-36380=>10865,
-36375=>10866,
-36378=>10867,
-36652=>10868,
-36644=>10869,
-36632=>10870,
-36634=>10871,
-36640=>10872,
-36643=>10873,
-36630=>10874,
-36631=>10875,
-36979=>10876,
-36976=>10877,
-36975=>10878,
-36967=>10879,
-36971=>10880,
-37167=>10881,
-37163=>10882,
-37161=>10883,
-37162=>10884,
-37170=>10885,
-37158=>10886,
-37166=>10887,
-37253=>10888,
-37254=>10889,
-37258=>10890,
-37249=>10891,
-37250=>10892,
-37252=>10893,
-37248=>10894,
-37584=>10895,
-37571=>10896,
-37572=>10897,
-37568=>10898,
-37593=>10899,
-37558=>10900,
-37583=>10901,
-37617=>10902,
-37599=>10903,
-37592=>10904,
-37609=>10905,
-37591=>10906,
-37597=>10907,
-37580=>10908,
-37615=>10909,
-37570=>10910,
-37608=>10911,
-37578=>10912,
-37576=>10913,
-37582=>10914,
-37606=>10915,
-37581=>10916,
-37589=>10917,
-37577=>10918,
-37600=>10919,
-37598=>10920,
-37607=>10921,
-37585=>10922,
-37587=>10923,
-37557=>10924,
-37601=>10925,
-37669=>10926,
-37574=>10927,
-37556=>10928,
-38268=>10929,
-38316=>10930,
-38315=>10931,
-38318=>10932,
-38320=>10933,
-38564=>10934,
-38562=>10935,
-38611=>10936,
-38661=>10937,
-38664=>10938,
-38658=>10939,
-38746=>10940,
-38794=>10941,
-38798=>10942,
-38792=>10943,
-38864=>10944,
-38863=>10945,
-38942=>10946,
-38941=>10947,
-38950=>10948,
-38953=>10949,
-38952=>10950,
-38944=>10951,
-38939=>10952,
-38951=>10953,
-39090=>10954,
-39176=>10955,
-39162=>10956,
-39185=>10957,
-39188=>10958,
-39190=>10959,
-39191=>10960,
-39189=>10961,
-39388=>10962,
-39373=>10963,
-39375=>10964,
-39379=>10965,
-39380=>10966,
-39374=>10967,
-39369=>10968,
-39382=>10969,
-60270=>10969,
-39384=>10970,
-39371=>10971,
-39383=>10972,
-39372=>10973,
-39603=>10974,
-39660=>10975,
-39659=>10976,
-39667=>10977,
-39666=>10978,
-39665=>10979,
-39750=>10980,
-39747=>10981,
-39783=>10982,
-39796=>10983,
-39793=>10984,
-39782=>10985,
-39798=>10986,
-39797=>10987,
-39792=>10988,
-39784=>10989,
-39780=>10990,
-39788=>10991,
-40188=>10992,
-40186=>10993,
-40189=>10994,
-40191=>10995,
-40183=>10996,
-40199=>10997,
-40192=>10998,
-40185=>10999,
-40187=>11000,
-40200=>11001,
-40197=>11002,
-40196=>11003,
-40579=>11004,
-40659=>11005,
-40719=>11006,
-40720=>11007,
-20764=>11008,
-20755=>11009,
-20759=>11010,
-20762=>11011,
-20753=>11012,
-20958=>11013,
-21300=>11014,
-21473=>11015,
-22128=>11016,
-22112=>11017,
-22126=>11018,
-22131=>11019,
-22118=>11020,
-22115=>11021,
-22125=>11022,
-22130=>11023,
-22110=>11024,
-22135=>11025,
-22300=>11026,
-22299=>11027,
-22728=>11028,
-22717=>11029,
-22729=>11030,
-22719=>11031,
-22714=>11032,
-22722=>11033,
-22716=>11034,
-22726=>11035,
-23319=>11036,
-23321=>11037,
-23323=>11038,
-23329=>11039,
-23316=>11040,
-23315=>11041,
-23312=>11042,
-23318=>11043,
-23336=>11044,
-59539=>11044,
-23322=>11045,
-23328=>11046,
-23326=>11047,
-23535=>11048,
-23980=>11049,
-23985=>11050,
-23977=>11051,
-23975=>11052,
-23989=>11053,
-23984=>11054,
-23982=>11055,
-23978=>11056,
-23976=>11057,
-23986=>11058,
-23981=>11059,
-23983=>11060,
-23988=>11061,
-24167=>11062,
-24168=>11063,
-24166=>11064,
-24175=>11065,
-24297=>11066,
-24295=>11067,
-24294=>11068,
-24296=>11069,
-24293=>11070,
-24395=>11071,
-24508=>11072,
-24507=>11073,
-24989=>11074,
-25000=>11075,
-24982=>11076,
-25029=>11077,
-25012=>11078,
-25030=>11079,
-25025=>11080,
-25036=>11081,
-25018=>11082,
-25023=>11083,
-25016=>11084,
-24972=>11085,
-25815=>11086,
-25814=>11087,
-25808=>11088,
-25807=>11089,
-25801=>11090,
-25789=>11091,
-25737=>11092,
-25795=>11093,
-25819=>11094,
-25843=>11095,
-25817=>11096,
-25907=>11097,
-25983=>11098,
-25980=>11099,
-26018=>11100,
-26312=>11101,
-26302=>11102,
-26304=>11103,
-26314=>11104,
-26315=>11105,
-26319=>11106,
-26301=>11107,
-26299=>11108,
-26298=>11109,
-26316=>11110,
-26403=>11111,
-27188=>11112,
-27238=>11113,
-27209=>11114,
-27239=>11115,
-27186=>11116,
-27240=>11117,
-27198=>11118,
-27229=>11119,
-27245=>11120,
-27254=>11121,
-27227=>11122,
-27217=>11123,
-27176=>11124,
-27226=>11125,
-27195=>11126,
-27199=>11127,
-27201=>11128,
-27242=>11129,
-27236=>11130,
-27216=>11131,
-27215=>11132,
-27220=>11133,
-27247=>11134,
-27241=>11135,
-27232=>11136,
-27196=>11137,
-27230=>11138,
-27222=>11139,
-27221=>11140,
-27213=>11141,
-27214=>11142,
-27206=>11143,
-27477=>11144,
-27476=>11145,
-27478=>11146,
-27559=>11147,
-27562=>11148,
-27563=>11149,
-27592=>11150,
-27591=>11151,
-27652=>11152,
-27651=>11153,
-27654=>11154,
-28589=>11155,
-28619=>11156,
-28579=>11157,
-28615=>11158,
-28604=>11159,
-28622=>11160,
-28616=>11161,
-28510=>11162,
-28612=>11163,
-28605=>11164,
-28574=>11165,
-28618=>11166,
-28584=>11167,
-28676=>11168,
-28581=>11169,
-28590=>11170,
-28602=>11171,
-28588=>11172,
-28586=>11173,
-28623=>11174,
-28607=>11175,
-28600=>11176,
-28578=>11177,
-28617=>11178,
-28587=>11179,
-28621=>11180,
-28591=>11181,
-28594=>11182,
-28592=>11183,
-29125=>11184,
-29122=>11185,
-29119=>11186,
-29112=>11187,
-29142=>11188,
-29120=>11189,
-29121=>11190,
-29131=>11191,
-29140=>11192,
-29130=>11193,
-29127=>11194,
-29135=>11195,
-29117=>11196,
-29144=>11197,
-29116=>11198,
-29126=>11199,
-29146=>11200,
-29147=>11201,
-29341=>11202,
-29342=>11203,
-29545=>11204,
-29542=>11205,
-29543=>11206,
-29548=>11207,
-29541=>11208,
-29547=>11209,
-29546=>11210,
-29823=>11211,
-29850=>11212,
-29856=>11213,
-29844=>11214,
-29842=>11215,
-29845=>11216,
-29857=>11217,
-29963=>11218,
-30080=>11219,
-30255=>11220,
-30253=>11221,
-30257=>11222,
-30269=>11223,
-30259=>11224,
-30268=>11225,
-30261=>11226,
-30258=>11227,
-30256=>11228,
-30395=>11229,
-30438=>11230,
-30618=>11231,
-30621=>11232,
-30625=>11233,
-30620=>11234,
-30619=>11235,
-30626=>11236,
-30627=>11237,
-30613=>11238,
-30617=>11239,
-30615=>11240,
-30941=>11241,
-30953=>11242,
-30949=>11243,
-30954=>11244,
-30942=>11245,
-30947=>11246,
-30939=>11247,
-30945=>11248,
-30946=>11249,
-30957=>11250,
-30943=>11251,
-30944=>11252,
-31140=>11253,
-31300=>11254,
-31304=>11255,
-31303=>11256,
-31414=>11257,
-31416=>11258,
-31413=>11259,
-31409=>11260,
-31415=>11261,
-31710=>11262,
-31715=>11263,
-31719=>11264,
-31709=>11265,
-31701=>11266,
-31717=>11267,
-31706=>11268,
-31720=>11269,
-31737=>11270,
-31700=>11271,
-31722=>11272,
-31714=>11273,
-31708=>11274,
-31723=>11275,
-31704=>11276,
-31711=>11277,
-31954=>11278,
-31956=>11279,
-31959=>11280,
-31952=>11281,
-31953=>11282,
-32274=>11283,
-32289=>11284,
-32279=>11285,
-32268=>11286,
-32287=>11287,
-32288=>11288,
-32275=>11289,
-32270=>11290,
-32284=>11291,
-32277=>11292,
-32282=>11293,
-32290=>11294,
-32267=>11295,
-32271=>11296,
-32278=>11297,
-32269=>11298,
-32276=>11299,
-32293=>11300,
-32292=>11301,
-32579=>11302,
-32635=>11303,
-32636=>11304,
-32634=>11305,
-32689=>11306,
-32751=>11307,
-32810=>11308,
-32809=>11309,
-32876=>11310,
-33201=>11311,
-33190=>11312,
-33198=>11313,
-33209=>11314,
-33205=>11315,
-33195=>11316,
-33200=>11317,
-33196=>11318,
-33204=>11319,
-33202=>11320,
-33207=>11321,
-33191=>11322,
-33266=>11323,
-33365=>11324,
-33366=>11325,
-33367=>11326,
-34134=>11327,
-34117=>11328,
-34155=>11329,
-34125=>11330,
-34131=>11331,
-34145=>11332,
-34136=>11333,
-34112=>11334,
-34118=>11335,
-34148=>11336,
-34113=>11337,
-34146=>11338,
-34116=>11339,
-34129=>11340,
-34119=>11341,
-34147=>11342,
-34110=>11343,
-34139=>11344,
-34161=>11345,
-34126=>11346,
-34158=>11347,
-34165=>11348,
-34133=>11349,
-34151=>11350,
-34144=>11351,
-34188=>11352,
-34150=>11353,
-34141=>11354,
-34132=>11355,
-34149=>11356,
-34156=>11357,
-34403=>11358,
-34405=>11359,
-34404=>11360,
-34724=>11361,
-34715=>11362,
-34703=>11363,
-34711=>11364,
-34707=>11365,
-34706=>11366,
-34696=>11367,
-34689=>11368,
-34710=>11369,
-34712=>11370,
-34681=>11371,
-34695=>11372,
-34723=>11373,
-34693=>11374,
-34704=>11375,
-34705=>11376,
-34717=>11377,
-34692=>11378,
-34708=>11379,
-34716=>11380,
-34714=>11381,
-34697=>11382,
-35102=>11383,
-35110=>11384,
-35120=>11385,
-35117=>11386,
-35118=>11387,
-35111=>11388,
-35121=>11389,
-35106=>11390,
-35113=>11391,
-35107=>11392,
-35119=>11393,
-35116=>11394,
-35103=>11395,
-35313=>11396,
-35552=>11397,
-35554=>11398,
-35570=>11399,
-35572=>11400,
-35573=>11401,
-35549=>11402,
-35604=>11403,
-35556=>11404,
-35551=>11405,
-35568=>11406,
-35528=>11407,
-35550=>11408,
-35553=>11409,
-35560=>11410,
-35583=>11411,
-35567=>11412,
-35579=>11413,
-35985=>11414,
-35986=>11415,
-35984=>11416,
-36085=>11417,
-36078=>11418,
-36081=>11419,
-36080=>11420,
-36083=>11421,
-36204=>11422,
-36206=>11423,
-36261=>11424,
-36263=>11425,
-36403=>11426,
-36414=>11427,
-36408=>11428,
-36416=>11429,
-36421=>11430,
-36406=>11431,
-36412=>11432,
-36413=>11433,
-36417=>11434,
-36400=>11435,
-36415=>11436,
-36541=>11437,
-36662=>11438,
-60329=>11438,
-36654=>11439,
-36661=>11440,
-36658=>11441,
-36665=>11442,
-36663=>11443,
-36660=>11444,
-36982=>11445,
-36985=>11446,
-36987=>11447,
-36998=>11448,
-37114=>11449,
-37171=>11450,
-37173=>11451,
-37174=>11452,
-37267=>11453,
-37264=>11454,
-37265=>11455,
-37261=>11456,
-37263=>11457,
-37671=>11458,
-37662=>11459,
-37640=>11460,
-37663=>11461,
-37638=>11462,
-37647=>11463,
-37754=>11464,
-37688=>11465,
-37692=>11466,
-37659=>11467,
-37667=>11468,
-37650=>11469,
-37633=>11470,
-37702=>11471,
-37677=>11472,
-37646=>11473,
-37645=>11474,
-37579=>11475,
-37661=>11476,
-37626=>11477,
-37651=>11478,
-37625=>11479,
-37623=>11480,
-37684=>11481,
-37634=>11482,
-37668=>11483,
-37631=>11484,
-37673=>11485,
-37689=>11486,
-37685=>11487,
-37674=>11488,
-37652=>11489,
-37644=>11490,
-37643=>11491,
-37630=>11492,
-37641=>11493,
-37632=>11494,
-37627=>11495,
-37654=>11496,
-38332=>11497,
-38349=>11498,
-38334=>11499,
-38329=>11500,
-38330=>11501,
-38326=>11502,
-38335=>11503,
-38325=>11504,
-38333=>11505,
-38569=>11506,
-38612=>11507,
-38667=>11508,
-38674=>11509,
-38672=>11510,
-38809=>11511,
-38807=>11512,
-38804=>11513,
-38896=>11514,
-38904=>11515,
-38965=>11516,
-38959=>11517,
-38962=>11518,
-39204=>11519,
-39199=>11520,
-39207=>11521,
-39209=>11522,
-39326=>11523,
-39406=>11524,
-39404=>11525,
-39397=>11526,
-39396=>11527,
-39408=>11528,
-39395=>11529,
-39402=>11530,
-39401=>11531,
-39399=>11532,
-39609=>11533,
-39615=>11534,
-39604=>11535,
-39611=>11536,
-39670=>11537,
-39674=>11538,
-39673=>11539,
-39671=>11540,
-39731=>11541,
-39808=>11542,
-39813=>11543,
-39815=>11544,
-39804=>11545,
-39806=>11546,
-39803=>11547,
-39810=>11548,
-39827=>11549,
-39826=>11550,
-39824=>11551,
-39802=>11552,
-39829=>11553,
-39805=>11554,
-39816=>11555,
-40229=>11556,
-40215=>11557,
-40224=>11558,
-40222=>11559,
-40212=>11560,
-40233=>11561,
-40221=>11562,
-40216=>11563,
-40226=>11564,
-40208=>11565,
-40217=>11566,
-40223=>11567,
-40584=>11568,
-40582=>11569,
-40583=>11570,
-40622=>11571,
-40621=>11572,
-40661=>11573,
-40662=>11574,
-40698=>11575,
-40722=>11576,
-40765=>11577,
-20774=>11578,
-20773=>11579,
-20770=>11580,
-20772=>11581,
-20768=>11582,
-20777=>11583,
-21236=>11584,
-22163=>11585,
-22156=>11586,
-22157=>11587,
-22150=>11588,
-22148=>11589,
-22147=>11590,
-22142=>11591,
-22146=>11592,
-22143=>11593,
-22145=>11594,
-22742=>11595,
-22740=>11596,
-22735=>11597,
-22738=>11598,
-23341=>11599,
-23333=>11600,
-23346=>11601,
-23331=>11602,
-23340=>11603,
-23335=>11604,
-23334=>11605,
-23343=>11606,
-23342=>11607,
-23419=>11608,
-23537=>11609,
-23538=>11610,
-23991=>11611,
-24172=>11612,
-24170=>11613,
-24510=>11614,
-25027=>11615,
-25013=>11616,
-25020=>11617,
-25063=>11618,
-25056=>11619,
-25061=>11620,
-25060=>11621,
-25064=>11622,
-25054=>11623,
-25839=>11624,
-25833=>11625,
-25827=>11626,
-25835=>11627,
-25828=>11628,
-25832=>11629,
-25985=>11630,
-25984=>11631,
-26038=>11632,
-26074=>11633,
-26322=>11634,
-27277=>11635,
-27286=>11636,
-27265=>11637,
-27301=>11638,
-27273=>11639,
-27295=>11640,
-27291=>11641,
-27297=>11642,
-27294=>11643,
-27271=>11644,
-27283=>11645,
-27278=>11646,
-27285=>11647,
-27267=>11648,
-27304=>11649,
-27300=>11650,
-27281=>11651,
-27263=>11652,
-27302=>11653,
-27290=>11654,
-27269=>11655,
-27276=>11656,
-27282=>11657,
-27483=>11658,
-27565=>11659,
-27657=>11660,
-28620=>11661,
-28585=>11662,
-28660=>11663,
-28628=>11664,
-28643=>11665,
-28636=>11666,
-28653=>11667,
-28647=>11668,
-28646=>11669,
-28638=>11670,
-28658=>11671,
-28637=>11672,
-28642=>11673,
-28648=>11674,
-29153=>11675,
-29169=>11676,
-29160=>11677,
-29170=>11678,
-29156=>11679,
-29168=>11680,
-29154=>11681,
-29555=>11682,
-29550=>11683,
-29551=>11684,
-29847=>11685,
-29874=>11686,
-29867=>11687,
-29840=>11688,
-29866=>11689,
-29869=>11690,
-29873=>11691,
-29861=>11692,
-29871=>11693,
-29968=>11694,
-29969=>11695,
-29970=>11696,
-29967=>11697,
-30084=>11698,
-30275=>11699,
-30280=>11700,
-30281=>11701,
-30279=>11702,
-30372=>11703,
-30441=>11704,
-30645=>11705,
-30635=>11706,
-30642=>11707,
-30647=>11708,
-30646=>11709,
-30644=>11710,
-30641=>11711,
-30632=>11712,
-30704=>11713,
-30963=>11714,
-30973=>11715,
-30978=>11716,
-30971=>11717,
-30972=>11718,
-30975=>11719,
-30962=>11720,
-30981=>11721,
-30969=>11722,
-30974=>11723,
-30980=>11724,
-31147=>11725,
-31144=>11726,
-31324=>11727,
-31323=>11728,
-31318=>11729,
-31320=>11730,
-31316=>11731,
-31322=>11732,
-31422=>11733,
-31424=>11734,
-31425=>11735,
-31749=>11736,
-31759=>11737,
-31730=>11738,
-31744=>11739,
-31743=>11740,
-31739=>11741,
-31758=>11742,
-31732=>11743,
-31755=>11744,
-31731=>11745,
-31746=>11746,
-31753=>11747,
-31747=>11748,
-31745=>11749,
-31736=>11750,
-31741=>11751,
-31750=>11752,
-58176=>11752,
-31728=>11753,
-31729=>11754,
-31760=>11755,
-31754=>11756,
-31976=>11757,
-32301=>11758,
-32316=>11759,
-32322=>11760,
-32307=>11761,
-38984=>11762,
-32312=>11763,
-32298=>11764,
-32329=>11765,
-32320=>11766,
-32327=>11767,
-32297=>11768,
-32332=>11769,
-32304=>11770,
-32315=>11771,
-32310=>11772,
-32324=>11773,
-32314=>11774,
-32581=>11775,
-32639=>11776,
-32638=>11777,
-32637=>11778,
-32756=>11779,
-32754=>11780,
-32812=>11781,
-33211=>11782,
-33220=>11783,
-33228=>11784,
-33226=>11785,
-33221=>11786,
-33223=>11787,
-33212=>11788,
-33257=>11789,
-33371=>11790,
-33370=>11791,
-33372=>11792,
-34179=>11793,
-34176=>11794,
-34191=>11795,
-34215=>11796,
-34197=>11797,
-34208=>11798,
-34187=>11799,
-34211=>11800,
-34171=>11801,
-34212=>11802,
-34202=>11803,
-34206=>11804,
-34167=>11805,
-34172=>11806,
-34185=>11807,
-34209=>11808,
-34170=>11809,
-34168=>11810,
-34135=>11811,
-34190=>11812,
-34198=>11813,
-34182=>11814,
-34189=>11815,
-34201=>11816,
-34205=>11817,
-34177=>11818,
-34210=>11819,
-34178=>11820,
-34184=>11821,
-34181=>11822,
-34169=>11823,
-34166=>11824,
-34200=>11825,
-34192=>11826,
-34207=>11827,
-34408=>11828,
-34750=>11829,
-34730=>11830,
-34733=>11831,
-34757=>11832,
-34736=>11833,
-34732=>11834,
-34745=>11835,
-34741=>11836,
-34748=>11837,
-34734=>11838,
-34761=>11839,
-34755=>11840,
-34754=>11841,
-34764=>11842,
-34743=>11843,
-34735=>11844,
-34756=>11845,
-34762=>11846,
-34740=>11847,
-34742=>11848,
-34751=>11849,
-34744=>11850,
-34749=>11851,
-34782=>11852,
-34738=>11853,
-35125=>11854,
-35123=>11855,
-35132=>11856,
-35134=>11857,
-35137=>11858,
-35154=>11859,
-35127=>11860,
-35138=>11861,
-35245=>11862,
-35247=>11863,
-35246=>11864,
-35314=>11865,
-35315=>11866,
-35614=>11867,
-35608=>11868,
-35606=>11869,
-35601=>11870,
-35589=>11871,
-35595=>11872,
-35618=>11873,
-35599=>11874,
-35602=>11875,
-35605=>11876,
-35591=>11877,
-35597=>11878,
-35592=>11879,
-35590=>11880,
-35612=>11881,
-35603=>11882,
-35610=>11883,
-35919=>11884,
-35952=>11885,
-35954=>11886,
-35953=>11887,
-35951=>11888,
-35989=>11889,
-35988=>11890,
-36089=>11891,
-36207=>11892,
-36430=>11893,
-36429=>11894,
-36435=>11895,
-36432=>11896,
-36428=>11897,
-36423=>11898,
-36675=>11899,
-36672=>11900,
-36997=>11901,
-36990=>11902,
-37176=>11903,
-37274=>11904,
-37282=>11905,
-37275=>11906,
-37273=>11907,
-37279=>11908,
-37281=>11909,
-37277=>11910,
-37280=>11911,
-37793=>11912,
-37763=>11913,
-37807=>11914,
-37732=>11915,
-37718=>11916,
-37703=>11917,
-37756=>11918,
-37720=>11919,
-37724=>11920,
-37750=>11921,
-37705=>11922,
-37712=>11923,
-37713=>11924,
-37728=>11925,
-37741=>11926,
-37775=>11927,
-37708=>11928,
-37738=>11929,
-37753=>11930,
-37719=>11931,
-37717=>11932,
-37714=>11933,
-37711=>11934,
-37745=>11935,
-37751=>11936,
-37755=>11937,
-37729=>11938,
-37726=>11939,
-37731=>11940,
-37735=>11941,
-37710=>11942,
-37721=>11943,
-38343=>11944,
-38336=>11945,
-38345=>11946,
-38339=>11947,
-38341=>11948,
-38327=>11949,
-38574=>11950,
-38576=>11951,
-38572=>11952,
-38688=>11953,
-38687=>11954,
-38680=>11955,
-38685=>11956,
-38681=>11957,
-38810=>11958,
-38817=>11959,
-38812=>11960,
-38814=>11961,
-38813=>11962,
-38869=>11963,
-38868=>11964,
-38897=>11965,
-38977=>11966,
-38980=>11967,
-38986=>11968,
-38985=>11969,
-38981=>11970,
-38979=>11971,
-39205=>11972,
-39211=>11973,
-39212=>11974,
-39210=>11975,
-39219=>11976,
-39218=>11977,
-39215=>11978,
-39213=>11979,
-39217=>11980,
-39216=>11981,
-39320=>11982,
-39331=>11983,
-39329=>11984,
-39426=>11985,
-39418=>11986,
-39412=>11987,
-39415=>11988,
-39417=>11989,
-39416=>11990,
-39414=>11991,
-39419=>11992,
-39421=>11993,
-39422=>11994,
-39420=>11995,
-39427=>11996,
-39614=>11997,
-39678=>11998,
-39677=>11999,
-39681=>12000,
-39676=>12001,
-39752=>12002,
-39834=>12003,
-39848=>12004,
-39838=>12005,
-39835=>12006,
-39846=>12007,
-39841=>12008,
-39845=>12009,
-39844=>12010,
-39814=>12011,
-39842=>12012,
-39840=>12013,
-39855=>12014,
-40243=>12015,
-40257=>12016,
-40295=>12017,
-40246=>12018,
-40238=>12019,
-40239=>12020,
-40241=>12021,
-40248=>12022,
-40240=>12023,
-40261=>12024,
-40258=>12025,
-40259=>12026,
-40254=>12027,
-40247=>12028,
-40256=>12029,
-40253=>12030,
-32757=>12031,
-40237=>12032,
-40586=>12033,
-40585=>12034,
-40589=>12035,
-40624=>12036,
-40648=>12037,
-40666=>12038,
-40699=>12039,
-40703=>12040,
-40740=>12041,
-40739=>12042,
-40738=>12043,
-40788=>12044,
-12245=>12045,
-40864=>12045,
-20785=>12046,
-20781=>12047,
-20782=>12048,
-22168=>12049,
-22172=>12050,
-22167=>12051,
-22170=>12052,
-22173=>12053,
-22169=>12054,
-22896=>12055,
-23356=>12056,
-23657=>12057,
-23658=>12058,
-24000=>12059,
-24173=>12060,
-24174=>12061,
-25048=>12062,
-25055=>12063,
-25069=>12064,
-25070=>12065,
-25073=>12066,
-25066=>12067,
-25072=>12068,
-25067=>12069,
-25046=>12070,
-25065=>12071,
-25855=>12072,
-25860=>12073,
-25853=>12074,
-25848=>12075,
-25857=>12076,
-25859=>12077,
-25852=>12078,
-26004=>12079,
-26075=>12080,
-26330=>12081,
-26331=>12082,
-26328=>12083,
-27333=>12084,
-27321=>12085,
-27325=>12086,
-27361=>12087,
-27334=>12088,
-27322=>12089,
-27318=>12090,
-27319=>12091,
-27335=>12092,
-27316=>12093,
-27309=>12094,
-27486=>12095,
-27593=>12096,
-27659=>12097,
-28679=>12098,
-28684=>12099,
-28685=>12100,
-28673=>12101,
-28677=>12102,
-28692=>12103,
-28686=>12104,
-28671=>12105,
-28672=>12106,
-28667=>12107,
-28710=>12108,
-28668=>12109,
-28663=>12110,
-28682=>12111,
-29185=>12112,
-60224=>12112,
-29183=>12113,
-29177=>12114,
-29187=>12115,
-29181=>12116,
-29558=>12117,
-29880=>12118,
-29888=>12119,
-29877=>12120,
-29889=>12121,
-29886=>12122,
-29878=>12123,
-29883=>12124,
-29890=>12125,
-29972=>12126,
-29971=>12127,
-30300=>12128,
-30308=>12129,
-30297=>12130,
-30288=>12131,
-30291=>12132,
-30295=>12133,
-30298=>12134,
-30374=>12135,
-30397=>12136,
-30444=>12137,
-30658=>12138,
-30650=>12139,
-30988=>12140,
-30995=>12141,
-30996=>12142,
-30985=>12143,
-30992=>12144,
-30994=>12145,
-30993=>12146,
-31149=>12147,
-31148=>12148,
-31327=>12149,
-31772=>12150,
-31785=>12151,
-31769=>12152,
-31776=>12153,
-31775=>12154,
-31789=>12155,
-31773=>12156,
-31782=>12157,
-31784=>12158,
-31778=>12159,
-31781=>12160,
-31792=>12161,
-32348=>12162,
-32336=>12163,
-32342=>12164,
-32355=>12165,
-32344=>12166,
-32354=>12167,
-32351=>12168,
-32337=>12169,
-32352=>12170,
-32343=>12171,
-32339=>12172,
-32693=>12173,
-32691=>12174,
-32759=>12175,
-32760=>12176,
-32885=>12177,
-33233=>12178,
-33234=>12179,
-33232=>12180,
-33375=>12181,
-33374=>12182,
-34228=>12183,
-34246=>12184,
-34240=>12185,
-34243=>12186,
-34242=>12187,
-34227=>12188,
-34229=>12189,
-34237=>12190,
-34247=>12191,
-34244=>12192,
-34239=>12193,
-34251=>12194,
-34254=>12195,
-34248=>12196,
-34245=>12197,
-34225=>12198,
-34230=>12199,
-34258=>12200,
-34340=>12201,
-34232=>12202,
-34231=>12203,
-34238=>12204,
-34409=>12205,
-34791=>12206,
-34790=>12207,
-34786=>12208,
-34779=>12209,
-34795=>12210,
-34794=>12211,
-34789=>12212,
-34783=>12213,
-34803=>12214,
-34788=>12215,
-34772=>12216,
-34780=>12217,
-34771=>12218,
-34797=>12219,
-34776=>12220,
-34787=>12221,
-34775=>12222,
-34777=>12223,
-34817=>12224,
-34804=>12225,
-34792=>12226,
-34781=>12227,
-35155=>12228,
-35147=>12229,
-35151=>12230,
-35148=>12231,
-35142=>12232,
-35152=>12233,
-35153=>12234,
-35145=>12235,
-35626=>12236,
-35623=>12237,
-35619=>12238,
-35635=>12239,
-35632=>12240,
-35637=>12241,
-35655=>12242,
-35631=>12243,
-35644=>12244,
-35646=>12245,
-35633=>12246,
-35621=>12247,
-35639=>12248,
-35622=>12249,
-35638=>12250,
-35630=>12251,
-35620=>12252,
-35643=>12253,
-35645=>12254,
-35642=>12255,
-35906=>12256,
-35957=>12257,
-35993=>12258,
-35992=>12259,
-35991=>12260,
-36094=>12261,
-36100=>12262,
-36098=>12263,
-36096=>12264,
-36444=>12265,
-36450=>12266,
-36448=>12267,
-36439=>12268,
-36438=>12269,
-36446=>12270,
-36453=>12271,
-36455=>12272,
-36443=>12273,
-36442=>12274,
-36449=>12275,
-36445=>12276,
-36457=>12277,
-36436=>12278,
-36678=>12279,
-36679=>12280,
-36680=>12281,
-36683=>12282,
-37160=>12283,
-37178=>12284,
-37179=>12285,
-37182=>12286,
-37288=>12287,
-37285=>12288,
-37287=>12289,
-37295=>12290,
-37290=>12291,
-37813=>12292,
-37772=>12293,
-37778=>12294,
-37815=>12295,
-37787=>12296,
-37789=>12297,
-37769=>12298,
-37799=>12299,
-37774=>12300,
-37802=>12301,
-37790=>12302,
-37798=>12303,
-37781=>12304,
-37768=>12305,
-37785=>12306,
-37791=>12307,
-37760=>12308,
-37773=>12309,
-37809=>12310,
-37777=>12311,
-37810=>12312,
-37796=>12313,
-37800=>12314,
-37812=>12315,
-37795=>12316,
-38354=>12317,
-38355=>12318,
-38353=>12319,
-38579=>12320,
-38615=>12321,
-38618=>12322,
-24002=>12323,
-38623=>12324,
-38616=>12325,
-38621=>12326,
-38691=>12327,
-38690=>12328,
-38693=>12329,
-38828=>12330,
-38830=>12331,
-38824=>12332,
-38827=>12333,
-38820=>12334,
-38826=>12335,
-38818=>12336,
-38821=>12337,
-38871=>12338,
-38873=>12339,
-38870=>12340,
-38872=>12341,
-38906=>12342,
-38992=>12343,
-38993=>12344,
-38994=>12345,
-39096=>12346,
-39233=>12347,
-39228=>12348,
-39226=>12349,
-39439=>12350,
-39435=>12351,
-39433=>12352,
-39437=>12353,
-39428=>12354,
-39441=>12355,
-39434=>12356,
-39429=>12357,
-39431=>12358,
-39430=>12359,
-39616=>12360,
-39644=>12361,
-39688=>12362,
-39684=>12363,
-39685=>12364,
-39721=>12365,
-39733=>12366,
-39754=>12367,
-39756=>12368,
-39755=>12369,
-39879=>12370,
-39878=>12371,
-39875=>12372,
-39871=>12373,
-39873=>12374,
-39861=>12375,
-39864=>12376,
-39891=>12377,
-39862=>12378,
-39876=>12379,
-39865=>12380,
-39869=>12381,
-40284=>12382,
-40275=>12383,
-40271=>12384,
-40266=>12385,
-40283=>12386,
-40267=>12387,
-40281=>12388,
-40278=>12389,
-40268=>12390,
-40279=>12391,
-40274=>12392,
-40276=>12393,
-40287=>12394,
-40280=>12395,
-40282=>12396,
-40590=>12397,
-40588=>12398,
-40671=>12399,
-40705=>12400,
-40704=>12401,
-40726=>12402,
-58693=>12402,
-40741=>12403,
-40747=>12404,
-40746=>12405,
-40745=>12406,
-40744=>12407,
-40780=>12408,
-40789=>12409,
-20788=>12410,
-20789=>12411,
-21142=>12412,
-21239=>12413,
-21428=>12414,
-22187=>12415,
-22189=>12416,
-22182=>12417,
-22183=>12418,
-22186=>12419,
-22188=>12420,
-22746=>12421,
-22749=>12422,
-22747=>12423,
-22802=>12424,
-23357=>12425,
-23358=>12426,
-23359=>12427,
-24003=>12428,
-24176=>12429,
-24511=>12430,
-25083=>12431,
-25863=>12432,
-25872=>12433,
-25869=>12434,
-25865=>12435,
-25868=>12436,
-25870=>12437,
-25988=>12438,
-26078=>12439,
-26077=>12440,
-26334=>12441,
-27367=>12442,
-27360=>12443,
-27340=>12444,
-27345=>12445,
-27353=>12446,
-27339=>12447,
-27359=>12448,
-27356=>12449,
-27344=>12450,
-27371=>12451,
-27343=>12452,
-27341=>12453,
-27358=>12454,
-27488=>12455,
-27568=>12456,
-27660=>12457,
-28697=>12458,
-28711=>12459,
-28704=>12460,
-28694=>12461,
-28715=>12462,
-28705=>12463,
-28706=>12464,
-28707=>12465,
-28713=>12466,
-28695=>12467,
-28708=>12468,
-28700=>12469,
-29196=>12470,
-29194=>12471,
-29191=>12472,
-29186=>12473,
-29189=>12474,
-29349=>12475,
-29350=>12476,
-29348=>12477,
-29347=>12478,
-29345=>12479,
-29899=>12480,
-29893=>12481,
-29879=>12482,
-29891=>12483,
-29974=>12484,
-30304=>12485,
-30665=>12486,
-30666=>12487,
-30660=>12488,
-30705=>12489,
-31005=>12490,
-31003=>12491,
-31009=>12492,
-31004=>12493,
-30999=>12494,
-31006=>12495,
-31152=>12496,
-31335=>12497,
-31336=>12498,
-31795=>12499,
-31804=>12500,
-31801=>12501,
-31788=>12502,
-31803=>12503,
-31980=>12504,
-31978=>12505,
-32374=>12506,
-32373=>12507,
-32376=>12508,
-32368=>12509,
-32375=>12510,
-32367=>12511,
-32378=>12512,
-32370=>12513,
-32372=>12514,
-32360=>12515,
-32587=>12516,
-32586=>12517,
-32643=>12518,
-32646=>12519,
-32695=>12520,
-32765=>12521,
-32766=>12522,
-32888=>12523,
-33239=>12524,
-33237=>12525,
-33291=>12526,
-33380=>12527,
-33377=>12528,
-33379=>12529,
-34283=>12530,
-34289=>12531,
-34285=>12532,
-34265=>12533,
-34273=>12534,
-34280=>12535,
-34266=>12536,
-34263=>12537,
-34284=>12538,
-34290=>12539,
-34296=>12540,
-34264=>12541,
-34271=>12542,
-34275=>12543,
-34268=>12544,
-34257=>12545,
-34288=>12546,
-34278=>12547,
-34287=>12548,
-34270=>12549,
-34274=>12550,
-34816=>12551,
-34810=>12552,
-34819=>12553,
-34806=>12554,
-34807=>12555,
-34825=>12556,
-34828=>12557,
-34827=>12558,
-34822=>12559,
-34812=>12560,
-34824=>12561,
-34815=>12562,
-34826=>12563,
-34818=>12564,
-35170=>12565,
-35162=>12566,
-35163=>12567,
-35159=>12568,
-35169=>12569,
-35164=>12570,
-35160=>12571,
-35165=>12572,
-35161=>12573,
-35208=>12574,
-35255=>12575,
-35254=>12576,
-35318=>12577,
-35664=>12578,
-35656=>12579,
-35658=>12580,
-35648=>12581,
-35667=>12582,
-35670=>12583,
-35668=>12584,
-35659=>12585,
-35669=>12586,
-35665=>12587,
-35650=>12588,
-35666=>12589,
-35671=>12590,
-35907=>12591,
-35959=>12592,
-35958=>12593,
-35994=>12594,
-36102=>12595,
-36103=>12596,
-36105=>12597,
-36268=>12598,
-36266=>12599,
-36269=>12600,
-36267=>12601,
-36461=>12602,
-36472=>12603,
-36467=>12604,
-36458=>12605,
-36463=>12606,
-36475=>12607,
-36546=>12608,
-36690=>12609,
-36689=>12610,
-36687=>12611,
-36688=>12612,
-36691=>12613,
-36788=>12614,
-37184=>12615,
-37183=>12616,
-37296=>12617,
-37293=>12618,
-37854=>12619,
-37831=>12620,
-37839=>12621,
-37826=>12622,
-37850=>12623,
-37840=>12624,
-37881=>12625,
-37868=>12626,
-37836=>12627,
-37849=>12628,
-37801=>12629,
-37862=>12630,
-37834=>12631,
-37844=>12632,
-37870=>12633,
-37859=>12634,
-37845=>12635,
-37828=>12636,
-37838=>12637,
-37824=>12638,
-37842=>12639,
-37797=>12640,
-37863=>12641,
-38269=>12642,
-38362=>12643,
-38363=>12644,
-38625=>12645,
-38697=>12646,
-38699=>12647,
-38700=>12648,
-38696=>12649,
-38694=>12650,
-38835=>12651,
-38839=>12652,
-38838=>12653,
-38877=>12654,
-38878=>12655,
-38879=>12656,
-39004=>12657,
-39001=>12658,
-39005=>12659,
-38999=>12660,
-39103=>12661,
-39101=>12662,
-39099=>12663,
-39102=>12664,
-39240=>12665,
-39239=>12666,
-39235=>12667,
-39334=>12668,
-39335=>12669,
-39450=>12670,
-39445=>12671,
-39461=>12672,
-39453=>12673,
-39460=>12674,
-39451=>12675,
-39458=>12676,
-39456=>12677,
-39463=>12678,
-39459=>12679,
-39454=>12680,
-39452=>12681,
-39444=>12682,
-39618=>12683,
-39691=>12684,
-39690=>12685,
-39694=>12686,
-39692=>12687,
-39735=>12688,
-39914=>12689,
-39915=>12690,
-39904=>12691,
-39902=>12692,
-39908=>12693,
-39910=>12694,
-39906=>12695,
-39920=>12696,
-39892=>12697,
-39895=>12698,
-39916=>12699,
-39900=>12700,
-39897=>12701,
-39909=>12702,
-39893=>12703,
-39905=>12704,
-39898=>12705,
-40311=>12706,
-40321=>12707,
-40330=>12708,
-40324=>12709,
-40328=>12710,
-40305=>12711,
-40320=>12712,
-40312=>12713,
-40326=>12714,
-40331=>12715,
-40332=>12716,
-40317=>12717,
-40299=>12718,
-40308=>12719,
-40309=>12720,
-40304=>12721,
-40297=>12722,
-40325=>12723,
-40307=>12724,
-40315=>12725,
-40322=>12726,
-40303=>12727,
-40313=>12728,
-40319=>12729,
-40327=>12730,
-40296=>12731,
-40596=>12732,
-40593=>12733,
-40640=>12734,
-40700=>12735,
-40749=>12736,
-40768=>12737,
-40769=>12738,
-40781=>12739,
-40790=>12740,
-40791=>12741,
-40792=>12742,
-21303=>12743,
-22194=>12744,
-22197=>12745,
-22195=>12746,
-22755=>12747,
-23365=>12748,
-24006=>12749,
-24007=>12750,
-24302=>12751,
-24303=>12752,
-24512=>12753,
-24513=>12754,
-25081=>12755,
-25879=>12756,
-25878=>12757,
-25877=>12758,
-25875=>12759,
-26079=>12760,
-26344=>12761,
-26339=>12762,
-26340=>12763,
-27379=>12764,
-27376=>12765,
-27370=>12766,
-27368=>12767,
-27385=>12768,
-27377=>12769,
-27374=>12770,
-27375=>12771,
-28732=>12772,
-28725=>12773,
-28719=>12774,
-28727=>12775,
-28724=>12776,
-28721=>12777,
-28738=>12778,
-28728=>12779,
-28735=>12780,
-28730=>12781,
-28729=>12782,
-28714=>12783,
-28736=>12784,
-28731=>12785,
-28723=>12786,
-28737=>12787,
-29203=>12788,
-29204=>12789,
-29352=>12790,
-29565=>12791,
-29564=>12792,
-29882=>12793,
-30379=>12794,
-30378=>12795,
-30398=>12796,
-30445=>12797,
-30668=>12798,
-30670=>12799,
-30671=>12800,
-30669=>12801,
-30706=>12802,
-31013=>12803,
-31011=>12804,
-31015=>12805,
-31016=>12806,
-31012=>12807,
-31017=>12808,
-31154=>12809,
-31342=>12810,
-31340=>12811,
-31341=>12812,
-31479=>12813,
-31817=>12814,
-31816=>12815,
-31818=>12816,
-31815=>12817,
-31813=>12818,
-31982=>12819,
-32379=>12820,
-32382=>12821,
-32385=>12822,
-32384=>12823,
-32698=>12824,
-32767=>12825,
-32889=>12826,
-33243=>12827,
-33241=>12828,
-33384=>12829,
-33385=>12830,
-34338=>12831,
-34303=>12832,
-34305=>12833,
-34302=>12834,
-34331=>12835,
-34304=>12836,
-34294=>12837,
-34308=>12838,
-34313=>12839,
-34309=>12840,
-34316=>12841,
-34301=>12842,
-34841=>12843,
-34832=>12844,
-34833=>12845,
-34839=>12846,
-34835=>12847,
-34838=>12848,
-35171=>12849,
-35174=>12850,
-35257=>12851,
-35319=>12852,
-35680=>12853,
-35690=>12854,
-35677=>12855,
-35688=>12856,
-35683=>12857,
-35685=>12858,
-35687=>12859,
-35693=>12860,
-36270=>12861,
-36486=>12862,
-36488=>12863,
-36484=>12864,
-36697=>12865,
-36694=>12866,
-36695=>12867,
-36693=>12868,
-36696=>12869,
-36698=>12870,
-37005=>12871,
-37187=>12872,
-37185=>12873,
-37303=>12874,
-37301=>12875,
-37298=>12876,
-37299=>12877,
-37899=>12878,
-37907=>12879,
-37883=>12880,
-37920=>12881,
-37903=>12882,
-37908=>12883,
-37886=>12884,
-37909=>12885,
-37904=>12886,
-37928=>12887,
-37913=>12888,
-37901=>12889,
-37877=>12890,
-37888=>12891,
-37879=>12892,
-37895=>12893,
-37902=>12894,
-37910=>12895,
-37906=>12896,
-37882=>12897,
-37897=>12898,
-37880=>12899,
-37948=>12900,
-37898=>12901,
-37887=>12902,
-37884=>12903,
-37900=>12904,
-37878=>12905,
-37905=>12906,
-37894=>12907,
-38366=>12908,
-38368=>12909,
-38367=>12910,
-38702=>12911,
-38703=>12912,
-38841=>12913,
-38843=>12914,
-38909=>12915,
-38910=>12916,
-39008=>12917,
-39010=>12918,
-39011=>12919,
-39007=>12920,
-39105=>12921,
-39106=>12922,
-39248=>12923,
-39246=>12924,
-39257=>12925,
-39244=>12926,
-39243=>12927,
-39251=>12928,
-39474=>12929,
-39476=>12930,
-39473=>12931,
-39468=>12932,
-39466=>12933,
-39478=>12934,
-39465=>12935,
-39470=>12936,
-39480=>12937,
-39469=>12938,
-39623=>12939,
-39626=>12940,
-39622=>12941,
-39696=>12942,
-39698=>12943,
-39697=>12944,
-39947=>12945,
-39944=>12946,
-39927=>12947,
-39941=>12948,
-39954=>12949,
-39928=>12950,
-40000=>12951,
-39943=>12952,
-39950=>12953,
-39942=>12954,
-39959=>12955,
-39956=>12956,
-39945=>12957,
-40351=>12958,
-40345=>12959,
-40356=>12960,
-40349=>12961,
-40338=>12962,
-40344=>12963,
-40336=>12964,
-40347=>12965,
-40352=>12966,
-40340=>12967,
-40348=>12968,
-40362=>12969,
-40343=>12970,
-40353=>12971,
-40346=>12972,
-40354=>12973,
-40360=>12974,
-40350=>12975,
-40355=>12976,
-40383=>12977,
-40361=>12978,
-40342=>12979,
-40358=>12980,
-40359=>12981,
-40601=>12982,
-40603=>12983,
-40602=>12984,
-40677=>12985,
-40676=>12986,
-40679=>12987,
-40678=>12988,
-40752=>12989,
-40750=>12990,
-40795=>12991,
-40800=>12992,
-40798=>12993,
-40797=>12994,
-40793=>12995,
-40849=>12996,
-20794=>12997,
-20793=>12998,
-21144=>12999,
-21143=>13000,
-22211=>13001,
-22205=>13002,
-22206=>13003,
-23368=>13004,
-23367=>13005,
-24011=>13006,
-24015=>13007,
-24305=>13008,
-25085=>13009,
-25883=>13010,
-27394=>13011,
-27388=>13012,
-27395=>13013,
-27384=>13014,
-27392=>13015,
-28739=>13016,
-28740=>13017,
-28746=>13018,
-28744=>13019,
-28745=>13020,
-28741=>13021,
-28742=>13022,
-29213=>13023,
-29210=>13024,
-29209=>13025,
-29566=>13026,
-29975=>13027,
-30314=>13028,
-30672=>13029,
-31021=>13030,
-31025=>13031,
-31023=>13032,
-31828=>13033,
-31827=>13034,
-31986=>13035,
-32394=>13036,
-60229=>13037,
-32391=>13037,
-32392=>13038,
-32395=>13039,
-32390=>13040,
-32397=>13041,
-32589=>13042,
-32699=>13043,
-32816=>13044,
-33245=>13045,
-34328=>13046,
-34346=>13047,
-34342=>13048,
-34335=>13049,
-34339=>13050,
-34332=>13051,
-34329=>13052,
-34343=>13053,
-34350=>13054,
-34337=>13055,
-34336=>13056,
-34345=>13057,
-34334=>13058,
-34341=>13059,
-34857=>13060,
-34845=>13061,
-34843=>13062,
-34848=>13063,
-34852=>13064,
-34844=>13065,
-34859=>13066,
-34890=>13067,
-35181=>13068,
-35177=>13069,
-35182=>13070,
-35179=>13071,
-35322=>13072,
-35705=>13073,
-35704=>13074,
-35653=>13075,
-35706=>13076,
-35707=>13077,
-36112=>13078,
-36116=>13079,
-36271=>13080,
-36494=>13081,
-36492=>13082,
-36702=>13083,
-36699=>13084,
-36701=>13085,
-37190=>13086,
-37188=>13087,
-37189=>13088,
-37305=>13089,
-37951=>13090,
-37947=>13091,
-37942=>13092,
-37929=>13093,
-37949=>13094,
-37936=>13095,
-37945=>13096,
-37930=>13097,
-37943=>13098,
-37932=>13099,
-37952=>13100,
-37937=>13101,
-38373=>13102,
-38372=>13103,
-38371=>13104,
-38709=>13105,
-38714=>13106,
-38847=>13107,
-38881=>13108,
-39012=>13109,
-39113=>13110,
-39110=>13111,
-39104=>13112,
-39256=>13113,
-39254=>13114,
-39481=>13115,
-39485=>13116,
-39494=>13117,
-39492=>13118,
-39490=>13119,
-39489=>13120,
-39482=>13121,
-39487=>13122,
-39629=>13123,
-39701=>13124,
-39703=>13125,
-39704=>13126,
-39702=>13127,
-39738=>13128,
-39762=>13129,
-39979=>13130,
-39965=>13131,
-39964=>13132,
-39980=>13133,
-39971=>13134,
-39976=>13135,
-39977=>13136,
-39972=>13137,
-39969=>13138,
-40375=>13139,
-40374=>13140,
-40380=>13141,
-40385=>13142,
-40391=>13143,
-40394=>13144,
-40399=>13145,
-40382=>13146,
-40389=>13147,
-40387=>13148,
-40379=>13149,
-40373=>13150,
-40398=>13151,
-40377=>13152,
-40378=>13153,
-40364=>13154,
-40392=>13155,
-40369=>13156,
-40365=>13157,
-40396=>13158,
-40371=>13159,
-40397=>13160,
-40370=>13161,
-40570=>13162,
-40604=>13163,
-40683=>13164,
-40686=>13165,
-40685=>13166,
-40731=>13167,
-40728=>13168,
-40730=>13169,
-40753=>13170,
-40782=>13171,
-40805=>13172,
-40804=>13173,
-40850=>13174,
-20153=>13175,
-22214=>13176,
-22213=>13177,
-22219=>13178,
-22897=>13179,
-23371=>13180,
-23372=>13181,
-24021=>13182,
-24017=>13183,
-24306=>13184,
-25889=>13185,
-25888=>13186,
-25894=>13187,
-25890=>13188,
-27403=>13189,
-27400=>13190,
-27401=>13191,
-27661=>13192,
-28757=>13193,
-28758=>13194,
-28759=>13195,
-28754=>13196,
-29214=>13197,
-29215=>13198,
-29353=>13199,
-29567=>13200,
-29912=>13201,
-29909=>13202,
-29913=>13203,
-29911=>13204,
-30317=>13205,
-30381=>13206,
-31029=>13207,
-31156=>13208,
-31344=>13209,
-31345=>13210,
-31831=>13211,
-31836=>13212,
-31833=>13213,
-31835=>13214,
-31834=>13215,
-31988=>13216,
-31985=>13217,
-32401=>13218,
-32591=>13219,
-32647=>13220,
-33246=>13221,
-33387=>13222,
-34356=>13223,
-34357=>13224,
-34355=>13225,
-34348=>13226,
-34354=>13227,
-34358=>13228,
-34860=>13229,
-34856=>13230,
-34854=>13231,
-34858=>13232,
-34853=>13233,
-35185=>13234,
-35263=>13235,
-35262=>13236,
-35323=>13237,
-35710=>13238,
-35716=>13239,
-35714=>13240,
-35718=>13241,
-35717=>13242,
-35711=>13243,
-36117=>13244,
-36501=>13245,
-36500=>13246,
-36506=>13247,
-36498=>13248,
-36496=>13249,
-36502=>13250,
-36503=>13251,
-36704=>13252,
-36706=>13253,
-37191=>13254,
-37964=>13255,
-37968=>13256,
-37962=>13257,
-37963=>13258,
-37967=>13259,
-37959=>13260,
-37957=>13261,
-37960=>13262,
-37961=>13263,
-37958=>13264,
-38719=>13265,
-38883=>13266,
-39018=>13267,
-39017=>13268,
-39115=>13269,
-39252=>13270,
-39259=>13271,
-39502=>13272,
-39507=>13273,
-39508=>13274,
-39500=>13275,
-39503=>13276,
-39496=>13277,
-39498=>13278,
-39497=>13279,
-39506=>13280,
-39504=>13281,
-39632=>13282,
-39705=>13283,
-39723=>13284,
-39739=>13285,
-39766=>13286,
-39765=>13287,
-40006=>13288,
-40008=>13289,
-39999=>13290,
-40004=>13291,
-39993=>13292,
-39987=>13293,
-40001=>13294,
-39996=>13295,
-39991=>13296,
-39988=>13297,
-39986=>13298,
-39997=>13299,
-39990=>13300,
-40411=>13301,
-40402=>13302,
-40414=>13303,
-40410=>13304,
-40395=>13305,
-40400=>13306,
-40412=>13307,
-40401=>13308,
-40415=>13309,
-40425=>13310,
-40409=>13311,
-40408=>13312,
-40406=>13313,
-40437=>13314,
-40405=>13315,
-40413=>13316,
-40630=>13317,
-40688=>13318,
-40757=>13319,
-40755=>13320,
-40754=>13321,
-40770=>13322,
-40811=>13323,
-40853=>13324,
-40866=>13325,
-20797=>13326,
-21145=>13327,
-22760=>13328,
-22759=>13329,
-22898=>13330,
-23373=>13331,
-24024=>13332,
-34863=>13333,
-24399=>13334,
-25089=>13335,
-25091=>13336,
-25092=>13337,
-25897=>13338,
-25893=>13339,
-26006=>13340,
-26347=>13341,
-27409=>13342,
-27410=>13343,
-27407=>13344,
-27594=>13345,
-28763=>13346,
-28762=>13347,
-29218=>13348,
-29570=>13349,
-29569=>13350,
-29571=>13351,
-30320=>13352,
-30676=>13353,
-31847=>13354,
-31846=>13355,
-32405=>13356,
-33388=>13357,
-34362=>13358,
-34368=>13359,
-34361=>13360,
-34364=>13361,
-34353=>13362,
-34363=>13363,
-34366=>13364,
-34864=>13365,
-34866=>13366,
-34862=>13367,
-34867=>13368,
-35190=>13369,
-35188=>13370,
-35187=>13371,
-35326=>13372,
-35724=>13373,
-35726=>13374,
-35723=>13375,
-35720=>13376,
-35909=>13377,
-36121=>13378,
-36504=>13379,
-36708=>13380,
-36707=>13381,
-37308=>13382,
-37986=>13383,
-37973=>13384,
-37981=>13385,
-37975=>13386,
-37982=>13387,
-38852=>13388,
-38853=>13389,
-38912=>13390,
-39510=>13391,
-39513=>13392,
-39710=>13393,
-39711=>13394,
-39712=>13395,
-40018=>13396,
-40024=>13397,
-40016=>13398,
-40010=>13399,
-40013=>13400,
-40011=>13401,
-40021=>13402,
-40025=>13403,
-40012=>13404,
-40014=>13405,
-40443=>13406,
-40439=>13407,
-40431=>13408,
-40419=>13409,
-40427=>13410,
-40440=>13411,
-40420=>13412,
-40438=>13413,
-40417=>13414,
-40430=>13415,
-40422=>13416,
-40434=>13417,
-40432=>13418,
-60370=>13418,
-40418=>13419,
-40428=>13420,
-40436=>13421,
-40435=>13422,
-40424=>13423,
-40429=>13424,
-40642=>13425,
-40656=>13426,
-40690=>13427,
-40691=>13428,
-40710=>13429,
-40732=>13430,
-40760=>13431,
-40759=>13432,
-40758=>13433,
-40771=>13434,
-40783=>13435,
-40817=>13436,
-40816=>13437,
-40814=>13438,
-40815=>13439,
-22227=>13440,
-22221=>13441,
-23374=>13442,
-23661=>13443,
-25901=>13444,
-26349=>13445,
-26350=>13446,
-27411=>13447,
-28767=>13448,
-28769=>13449,
-28765=>13450,
-28768=>13451,
-29219=>13452,
-29915=>13453,
-29925=>13454,
-30677=>13455,
-31032=>13456,
-31159=>13457,
-31158=>13458,
-31850=>13459,
-32407=>13460,
-32649=>13461,
-33389=>13462,
-34371=>13463,
-34872=>13464,
-34871=>13465,
-34869=>13466,
-34891=>13467,
-35732=>13468,
-35733=>13469,
-36510=>13470,
-36511=>13471,
-36512=>13472,
-36509=>13473,
-37310=>13474,
-37309=>13475,
-37314=>13476,
-37995=>13477,
-37992=>13478,
-37993=>13479,
-38629=>13480,
-38726=>13481,
-38723=>13482,
-38727=>13483,
-38855=>13484,
-38885=>13485,
-39518=>13486,
-39637=>13487,
-39769=>13488,
-40035=>13489,
-40039=>13490,
-40038=>13491,
-40034=>13492,
-40030=>13493,
-40032=>13494,
-40450=>13495,
-40446=>13496,
-40455=>13497,
-40451=>13498,
-40454=>13499,
-40453=>13500,
-40448=>13501,
-40449=>13502,
-40457=>13503,
-40447=>13504,
-40445=>13505,
-40452=>13506,
-40608=>13507,
-40734=>13508,
-40774=>13509,
-40820=>13510,
-40821=>13511,
-40822=>13512,
-22228=>13513,
-25902=>13514,
-26040=>13515,
-27416=>13516,
-27417=>13517,
-27415=>13518,
-27418=>13519,
-28770=>13520,
-29222=>13521,
-29354=>13522,
-30680=>13523,
-30681=>13524,
-31033=>13525,
-31849=>13526,
-31851=>13527,
-31990=>13528,
-32410=>13529,
-32408=>13530,
-32411=>13531,
-32409=>13532,
-33248=>13533,
-33249=>13534,
-34374=>13535,
-34375=>13536,
-34376=>13537,
-35193=>13538,
-35194=>13539,
-35196=>13540,
-35195=>13541,
-35327=>13542,
-35736=>13543,
-35737=>13544,
-36517=>13545,
-36516=>13546,
-36515=>13547,
-37998=>13548,
-37997=>13549,
-37999=>13550,
-38001=>13551,
-38003=>13552,
-38729=>13553,
-39026=>13554,
-39263=>13555,
-40040=>13556,
-40046=>13557,
-40045=>13558,
-40459=>13559,
-40461=>13560,
-40464=>13561,
-40463=>13562,
-40466=>13563,
-40465=>13564,
-40609=>13565,
-40693=>13566,
-40713=>13567,
-40775=>13568,
-40824=>13569,
-40827=>13570,
-40826=>13571,
-40825=>13572,
-22302=>13573,
-28774=>13574,
-31855=>13575,
-34876=>13576,
-36274=>13577,
-36518=>13578,
-37315=>13579,
-38004=>13580,
-38008=>13581,
-38006=>13582,
-38005=>13583,
-39520=>13584,
-39726=>13585,
-60830=>13585,
-40052=>13586,
-40051=>13587,
-40049=>13588,
-40053=>13589,
-40468=>13590,
-40467=>13591,
-40694=>13592,
-40714=>13593,
-40868=>13594,
-28776=>13595,
-28773=>13596,
-31991=>13597,
-34410=>13598,
-34878=>13599,
-34877=>13600,
-34879=>13601,
-35742=>13602,
-35996=>13603,
-36521=>13604,
-36553=>13605,
-38731=>13606,
-39027=>13607,
-39028=>13608,
-39116=>13609,
-39265=>13610,
-39339=>13611,
-39524=>13612,
-39526=>13613,
-39527=>13614,
-39716=>13615,
-40469=>13616,
-40471=>13617,
-40776=>13618,
-25095=>13619,
-27422=>13620,
-29223=>13621,
-34380=>13622,
-36520=>13623,
-38018=>13624,
-38016=>13625,
-38017=>13626,
-39529=>13627,
-39528=>13628,
-40473=>13629,
-34379=>13630,
-35743=>13631,
-38019=>13632,
-40057=>13633,
-40631=>13634,
-30325=>13635,
-39531=>13636,
-40058=>13637,
-40477=>13638,
-28777=>13639,
-28778=>13640,
-29225=>13641,
-40612=>13642,
-40830=>13643,
-40777=>13644,
-40856=>13645,
-65049=>13646,
-65075=>13743,
-9588=>13744,
-65076=>13745,
-65103=>13746,
-168=>13747,
-776=>13747,
-63208=>13747,
-710=>13748,
-65342=>13748,
-63209=>13748,
-12541=>13749,
-63210=>13749,
-12542=>13750,
-63211=>13750,
-12445=>13751,
-63212=>13751,
-12446=>13752,
-63213=>13752,
-12293=>13754,
-63216=>13754,
-12294=>13755,
-63217=>13755,
-12295=>13756,
-63218=>13756,
-12540=>13757,
-63219=>13757,
-65339=>13758,
-63220=>13758,
-65341=>13759,
-63221=>13759,
-10045=>13760,
-63222=>13760,
-12353=>13761,
-63223=>13761,
-12354=>13762,
-63224=>13762,
-12355=>13763,
-63225=>13763,
-12356=>13764,
-63226=>13764,
-12357=>13765,
-63227=>13765,
-12358=>13766,
-63228=>13766,
-12359=>13767,
-63229=>13767,
-12360=>13768,
-63230=>13768,
-12361=>13769,
-63231=>13769,
-12362=>13770,
-63232=>13770,
-12363=>13771,
-63233=>13771,
-12364=>13772,
-63234=>13772,
-12365=>13773,
-63235=>13773,
-12366=>13774,
-63236=>13774,
-12367=>13775,
-63237=>13775,
-12368=>13776,
-63238=>13776,
-12369=>13777,
-63239=>13777,
-12370=>13778,
-63240=>13778,
-12371=>13779,
-63241=>13779,
-12372=>13780,
-63242=>13780,
-12373=>13781,
-63243=>13781,
-12374=>13782,
-63244=>13782,
-12375=>13783,
-63245=>13783,
-12376=>13784,
-63246=>13784,
-12377=>13785,
-63247=>13785,
-12378=>13786,
-63248=>13786,
-12379=>13787,
-63249=>13787,
-12380=>13788,
-63250=>13788,
-12381=>13789,
-63251=>13789,
-12382=>13790,
-63252=>13790,
-12383=>13791,
-63253=>13791,
-12384=>13792,
-63254=>13792,
-12385=>13793,
-63255=>13793,
-12386=>13794,
-63256=>13794,
-12387=>13795,
-63257=>13795,
-12388=>13796,
-63258=>13796,
-12389=>13797,
-63259=>13797,
-12390=>13798,
-63260=>13798,
-12391=>13799,
-63261=>13799,
-12392=>13800,
-63262=>13800,
-12393=>13801,
-63263=>13801,
-12394=>13802,
-63264=>13802,
-12395=>13803,
-63265=>13803,
-12396=>13804,
-63266=>13804,
-12397=>13805,
-63267=>13805,
-12398=>13806,
-63268=>13806,
-12399=>13807,
-63269=>13807,
-12400=>13808,
-63270=>13808,
-12401=>13809,
-63271=>13809,
-12402=>13810,
-63272=>13810,
-12403=>13811,
-63273=>13811,
-12404=>13812,
-63274=>13812,
-12405=>13813,
-63275=>13813,
-12406=>13814,
-63276=>13814,
-12407=>13815,
-63277=>13815,
-12408=>13816,
-63278=>13816,
-12409=>13817,
-63279=>13817,
-12410=>13818,
-63280=>13818,
-12411=>13819,
-63281=>13819,
-12412=>13820,
-63282=>13820,
-12413=>13821,
-63283=>13821,
-12414=>13822,
-63284=>13822,
-12415=>13823,
-63285=>13823,
-12416=>13824,
-63286=>13824,
-12417=>13825,
-63287=>13825,
-12418=>13826,
-63288=>13826,
-12419=>13827,
-63289=>13827,
-12420=>13828,
-63290=>13828,
-12421=>13829,
-63291=>13829,
-12422=>13830,
-63292=>13830,
-12423=>13831,
-63293=>13831,
-12424=>13832,
-63294=>13832,
-12425=>13833,
-63295=>13833,
-12426=>13834,
-63296=>13834,
-12427=>13835,
-63297=>13835,
-12428=>13836,
-63298=>13836,
-12429=>13837,
-63299=>13837,
-12430=>13838,
-63300=>13838,
-12431=>13839,
-63301=>13839,
-12432=>13840,
-63302=>13840,
-12433=>13841,
-63303=>13841,
-12434=>13842,
-63304=>13842,
-12435=>13843,
-63305=>13843,
-12449=>13844,
-63306=>13844,
-12450=>13845,
-63307=>13845,
-12451=>13846,
-63308=>13846,
-12452=>13847,
-63309=>13847,
-12453=>13848,
-63310=>13848,
-12454=>13849,
-63311=>13849,
-12455=>13850,
-63312=>13850,
-12456=>13851,
-63313=>13851,
-12457=>13852,
-63314=>13852,
-12458=>13853,
-63315=>13853,
-12459=>13854,
-63316=>13854,
-12460=>13855,
-63317=>13855,
-12461=>13856,
-63318=>13856,
-12462=>13857,
-63319=>13857,
-12463=>13858,
-63320=>13858,
-12464=>13859,
-63321=>13859,
-12465=>13860,
-63322=>13860,
-12466=>13861,
-63323=>13861,
-12467=>13862,
-63324=>13862,
-12468=>13863,
-63325=>13863,
-12469=>13864,
-63326=>13864,
-12470=>13865,
-63327=>13865,
-12471=>13866,
-63328=>13866,
-12472=>13867,
-63329=>13867,
-12473=>13868,
-63330=>13868,
-12474=>13869,
-63331=>13869,
-12475=>13870,
-63332=>13870,
-12476=>13871,
-63333=>13871,
-12477=>13872,
-63334=>13872,
-12478=>13873,
-63335=>13873,
-12479=>13874,
-63336=>13874,
-12480=>13875,
-63337=>13875,
-12481=>13876,
-63338=>13876,
-12482=>13877,
-63339=>13877,
-12483=>13878,
-63340=>13878,
-12484=>13879,
-63341=>13879,
-12485=>13880,
-63342=>13880,
-12486=>13881,
-63343=>13881,
-12487=>13882,
-63344=>13882,
-12488=>13883,
-63345=>13883,
-12489=>13884,
-63346=>13884,
-12490=>13885,
-63347=>13885,
-12491=>13886,
-63348=>13886,
-12492=>13887,
-63349=>13887,
-12493=>13888,
-63350=>13888,
-12494=>13889,
-63351=>13889,
-12495=>13890,
-63352=>13890,
-12496=>13891,
-63353=>13891,
-12497=>13892,
-63354=>13892,
-12498=>13893,
-63355=>13893,
-12499=>13894,
-63356=>13894,
-12500=>13895,
-63357=>13895,
-12501=>13896,
-63358=>13896,
-12502=>13897,
-63359=>13897,
-12503=>13898,
-63360=>13898,
-12504=>13899,
-63361=>13899,
-12505=>13900,
-63362=>13900,
-12506=>13901,
-63363=>13901,
-12507=>13902,
-63364=>13902,
-12508=>13903,
-63365=>13903,
-12509=>13904,
-63366=>13904,
-12510=>13905,
-63367=>13905,
-12511=>13906,
-63368=>13906,
-12512=>13907,
-63369=>13907,
-12513=>13908,
-63370=>13908,
-12514=>13909,
-63371=>13909,
-12515=>13910,
-63372=>13910,
-12516=>13911,
-63373=>13911,
-12517=>13912,
-63374=>13912,
-12518=>13913,
-63375=>13913,
-12519=>13914,
-63376=>13914,
-12520=>13915,
-63377=>13915,
-12521=>13916,
-63378=>13916,
-12522=>13917,
-63379=>13917,
-12523=>13918,
-63380=>13918,
-12524=>13919,
-63381=>13919,
-12525=>13920,
-63382=>13920,
-12526=>13921,
-63383=>13921,
-12527=>13922,
-63384=>13922,
-12528=>13923,
-63385=>13923,
-12529=>13924,
-63386=>13924,
-12530=>13925,
-63387=>13925,
-12531=>13926,
-63388=>13926,
-12532=>13927,
-63389=>13927,
-12533=>13928,
-63390=>13928,
-12534=>13929,
-63391=>13929,
-1040=>13930,
-63392=>13930,
-1041=>13931,
-63393=>13931,
-1042=>13932,
-63394=>13932,
-1043=>13933,
-63395=>13933,
-1044=>13934,
-63396=>13934,
-1045=>13935,
-63397=>13935,
-1025=>13936,
-63398=>13936,
-1046=>13937,
-63399=>13937,
-1047=>13938,
-63400=>13938,
-1048=>13939,
-63401=>13939,
-1049=>13940,
-63402=>13940,
-1050=>13941,
-63403=>13941,
-1051=>13942,
-63404=>13942,
-1052=>13943,
-63405=>13943,
-1053=>13944,
-63406=>13944,
-1054=>13945,
-63407=>13945,
-1055=>13946,
-63408=>13946,
-1056=>13947,
-63409=>13947,
-1057=>13948,
-63410=>13948,
-1058=>13949,
-63411=>13949,
-1059=>13950,
-63412=>13950,
-1060=>13951,
-63413=>13951,
-1061=>13952,
-63414=>13952,
-1062=>13953,
-63415=>13953,
-1063=>13954,
-63416=>13954,
-1064=>13955,
-63417=>13955,
-1065=>13956,
-63418=>13956,
-1066=>13957,
-63419=>13957,
-1067=>13958,
-63420=>13958,
-1068=>13959,
-63421=>13959,
-1069=>13960,
-63422=>13960,
-1070=>13961,
-63423=>13961,
-1071=>13962,
-63424=>13962,
-1072=>13963,
-63425=>13963,
-1073=>13964,
-63426=>13964,
-1074=>13965,
-63427=>13965,
-1075=>13966,
-63428=>13966,
-1076=>13967,
-63429=>13967,
-1077=>13968,
-63430=>13968,
-1105=>13969,
-63431=>13969,
-1078=>13970,
-63432=>13970,
-1079=>13971,
-63433=>13971,
-1080=>13972,
-63434=>13972,
-1081=>13973,
-63435=>13973,
-1082=>13974,
-63436=>13974,
-1083=>13975,
-63437=>13975,
-1084=>13976,
-63438=>13976,
-1085=>13977,
-63439=>13977,
-1086=>13978,
-63440=>13978,
-1087=>13979,
-63441=>13979,
-1088=>13980,
-63442=>13980,
-1089=>13981,
-63443=>13981,
-1090=>13982,
-63444=>13982,
-1091=>13983,
-63445=>13983,
-1092=>13984,
-63446=>13984,
-1093=>13985,
-63447=>13985,
-1094=>13986,
-63448=>13986,
-1095=>13987,
-63449=>13987,
-1096=>13988,
-63450=>13988,
-1097=>13989,
-63451=>13989,
-1098=>13990,
-63452=>13990,
-1099=>13991,
-63453=>13991,
-1100=>13992,
-63454=>13992,
-1101=>13993,
-63455=>13993,
-1102=>13994,
-63456=>13994,
-1103=>13995,
-63457=>13995,
-8679=>13996,
-63458=>13996,
-8632=>13997,
-63459=>13997,
-8633=>13998,
-63460=>13998,
-12751=>13999,
-20033=>13999,
-63461=>13999,
-131276=>14000,
-63462=>14000,
-20058=>14001,
-63463=>14001,
-131210=>14002,
-63464=>14002,
-20994=>14003,
-63465=>14003,
-17553=>14004,
-63466=>14004,
-40880=>14005,
-63467=>14005,
-20872=>14006,
-63468=>14006,
-13853=>14007,
-40881=>14007,
-63469=>14007,
-161287=>14008,
-63470=>14008,
-172=>14049,
-65506=>14049,
-63511=>14049,
-65508=>14050,
-63512=>14050,
-65287=>14051,
-63513=>14051,
-65282=>14052,
-63514=>14052,
-12849=>14053,
-63515=>14053,
-8470=>14054,
-63516=>14054,
-8481=>14055,
-63517=>14055,
-30849=>14056,
-37561=>14057,
-58501=>14057,
-35023=>14058,
-22715=>14059,
-24658=>14060,
-31911=>14061,
-23290=>14062,
-9556=>14063,
-9574=>14064,
-9559=>14065,
-9568=>14066,
-9580=>14067,
-9571=>14068,
-9562=>14069,
-9577=>14070,
-9565=>14071,
-9554=>14072,
-9572=>14073,
-9557=>14074,
-9560=>14078,
-9575=>14079,
-9563=>14080,
-9555=>14081,
-9573=>14082,
-9558=>14083,
-9567=>14084,
-9579=>14085,
-9570=>14086,
-9561=>14087,
-9576=>14088,
-9564=>14089,
-9553=>14090,
-9619=>14096,
-65517=>14096,
-65040=>14099,
-65041=>14100,
-65042=>14101,
-65044=>14103,
-65043=>14104,
-65046=>14105,
-65045=>14106,
-147159=>14123,
-58129=>14123,
-22462=>14124,
-58130=>14124,
-159443=>14125,
-58131=>14125,
-28990=>14126,
-58132=>14126,
-153568=>14127,
-58133=>14127,
-27042=>14128,
-58135=>14128,
-166889=>14129,
-58136=>14129,
-23412=>14130,
-58137=>14130,
-31305=>14131,
-58138=>14131,
-153825=>14132,
-58139=>14132,
-169177=>14133,
-58140=>14133,
-31333=>14134,
-58141=>14134,
-31357=>14135,
-58142=>14135,
-154028=>14136,
-58143=>14136,
-31419=>14137,
-58144=>14137,
-31408=>14138,
-58145=>14138,
-31426=>14139,
-58146=>14139,
-31427=>14140,
-58147=>14140,
-29137=>14141,
-58148=>14141,
-156813=>14142,
-58149=>14142,
-16842=>14143,
-58150=>14143,
-31450=>14144,
-58151=>14144,
-31453=>14145,
-58152=>14145,
-31466=>14146,
-58153=>14146,
-16879=>14147,
-58154=>14147,
-21682=>14148,
-58155=>14148,
-154625=>14149,
-58156=>14149,
-31499=>14150,
-58157=>14150,
-31573=>14151,
-58158=>14151,
-31529=>14152,
-58159=>14152,
-152334=>14153,
-58160=>14153,
-154878=>14154,
-58161=>14154,
-31650=>14155,
-58162=>14155,
-31599=>14156,
-58163=>14156,
-33692=>14157,
-58164=>14157,
-154548=>14158,
-58165=>14158,
-158847=>14159,
-58166=>14159,
-31696=>14160,
-58167=>14160,
-33825=>14161,
-58168=>14161,
-31634=>14162,
-58169=>14162,
-58171=>14164,
-154912=>14164,
-33938=>14166,
-58174=>14166,
-31738=>14167,
-58175=>14167,
-31797=>14169,
-58177=>14169,
-154817=>14170,
-58178=>14170,
-31812=>14171,
-58179=>14171,
-31875=>14172,
-58180=>14172,
-149634=>14173,
-58181=>14173,
-31910=>14174,
-58182=>14174,
-148856=>14175,
-58184=>14175,
-31945=>14176,
-58185=>14176,
-31943=>14177,
-58186=>14177,
-31974=>14178,
-58187=>14178,
-31987=>14180,
-58189=>14180,
-31989=>14181,
-58190=>14181,
-32359=>14182,
-58192=>14182,
-17693=>14183,
-58193=>14183,
-159300=>14184,
-58194=>14184,
-32093=>14185,
-58195=>14185,
-159446=>14186,
-58196=>14186,
-32137=>14187,
-58198=>14187,
-32171=>14188,
-58199=>14188,
-28981=>14189,
-58200=>14189,
-32179=>14190,
-58201=>14190,
-32214=>14191,
-147543=>14192,
-58203=>14192,
-155689=>14193,
-58204=>14193,
-32228=>14194,
-58205=>14194,
-15635=>14195,
-58206=>14195,
-32245=>14196,
-58207=>14196,
-137209=>14197,
-58208=>14197,
-32229=>14198,
-58209=>14198,
-164717=>14199,
-58210=>14199,
-155937=>14201,
-58212=>14201,
-155994=>14202,
-58213=>14202,
-32366=>14203,
-58214=>14203,
-17195=>14205,
-58216=>14205,
-37996=>14206,
-58217=>14206,
-32295=>14207,
-58218=>14207,
-32576=>14208,
-58219=>14208,
-32577=>14209,
-58220=>14209,
-32583=>14210,
-58221=>14210,
-31030=>14211,
-58222=>14211,
-156368=>14212,
-58223=>14212,
-39393=>14213,
-58224=>14213,
-32663=>14214,
-58225=>14214,
-156497=>14215,
-58226=>14215,
-32675=>14216,
-58227=>14216,
-136801=>14217,
-58228=>14217,
-131176=>14218,
-58229=>14218,
-17756=>14219,
-58230=>14219,
-145254=>14220,
-58231=>14220,
-164666=>14221,
-58233=>14221,
-32762=>14222,
-58234=>14222,
-156809=>14223,
-58235=>14223,
-64091=>14224,
-32776=>14225,
-58237=>14225,
-32797=>14226,
-58238=>14226,
-32815=>14228,
-58240=>14228,
-172167=>14229,
-58241=>14229,
-158915=>14230,
-58242=>14230,
-32827=>14231,
-58243=>14231,
-32828=>14232,
-58244=>14232,
-32865=>14233,
-58245=>14233,
-141076=>14234,
-58246=>14234,
-18825=>14235,
-58247=>14235,
-157222=>14236,
-58248=>14236,
-146915=>14237,
-58249=>14237,
-157416=>14238,
-58250=>14238,
-26405=>14239,
-58251=>14239,
-32935=>14240,
-58252=>14240,
-166472=>14241,
-58253=>14241,
-33031=>14242,
-58254=>14242,
-33050=>14243,
-58255=>14243,
-22704=>14244,
-58256=>14244,
-141046=>14245,
-58257=>14245,
-27775=>14246,
-58258=>14246,
-156824=>14247,
-58259=>14247,
-25831=>14248,
-58261=>14248,
-136330=>14249,
-58262=>14249,
-33304=>14250,
-58263=>14250,
-137310=>14251,
-58264=>14251,
-27219=>14252,
-58265=>14252,
-150117=>14253,
-58266=>14253,
-150165=>14254,
-58267=>14254,
-17530=>14255,
-58268=>14255,
-33321=>14256,
-58269=>14256,
-158290=>14257,
-58271=>14257,
-146814=>14258,
-58272=>14258,
-20473=>14259,
-58273=>14259,
-136445=>14260,
-58274=>14260,
-34018=>14261,
-58275=>14261,
-33634=>14262,
-58276=>14262,
-194959=>14263,
-149927=>14264,
-58278=>14264,
-144688=>14265,
-58279=>14265,
-137075=>14266,
-58280=>14266,
-146936=>14267,
-58281=>14267,
-33450=>14268,
-58282=>14268,
-26907=>14269,
-58283=>14269,
-194964=>14270,
-58284=>14270,
-16859=>14271,
-58285=>14271,
-34123=>14272,
-58286=>14272,
-33488=>14273,
-58287=>14273,
-33562=>14274,
-58288=>14274,
-134678=>14275,
-58289=>14275,
-137140=>14276,
-58290=>14276,
-14017=>14277,
-58291=>14277,
-143741=>14278,
-58292=>14278,
-144730=>14279,
-58293=>14279,
-33403=>14280,
-58294=>14280,
-33506=>14281,
-58295=>14281,
-33560=>14282,
-58296=>14282,
-147083=>14283,
-58297=>14283,
-159139=>14284,
-58298=>14284,
-158469=>14285,
-58299=>14285,
-158615=>14286,
-58300=>14286,
-144846=>14287,
-58301=>14287,
-15807=>14288,
-58302=>14288,
-33565=>14289,
-58303=>14289,
-21996=>14290,
-58304=>14290,
-33669=>14291,
-58305=>14291,
-17675=>14292,
-58306=>14292,
-159141=>14293,
-58307=>14293,
-33708=>14294,
-58308=>14294,
-33747=>14296,
-58310=>14296,
-159444=>14297,
-58312=>14297,
-27223=>14298,
-58313=>14298,
-34138=>14299,
-58314=>14299,
-13462=>14300,
-58315=>14300,
-159298=>14301,
-58316=>14301,
-33880=>14302,
-58318=>14302,
-154596=>14303,
-58319=>14303,
-33905=>14304,
-58320=>14304,
-15827=>14305,
-58321=>14305,
-17636=>14306,
-58322=>14306,
-27303=>14307,
-58323=>14307,
-33866=>14308,
-58324=>14308,
-31064=>14309,
-58326=>14309,
-158614=>14311,
-58328=>14311,
-159351=>14312,
-58329=>14312,
-159299=>14313,
-58330=>14313,
-34014=>14314,
-58331=>14314,
-33681=>14316,
-58333=>14316,
-17568=>14317,
-58334=>14317,
-33939=>14318,
-58335=>14318,
-34020=>14319,
-58336=>14319,
-154769=>14320,
-58337=>14320,
-16960=>14321,
-58338=>14321,
-154816=>14322,
-58339=>14322,
-17731=>14323,
-58340=>14323,
-34100=>14324,
-58341=>14324,
-23282=>14325,
-58342=>14325,
-17699=>14326,
-17703=>14327,
-58344=>14327,
-34163=>14328,
-58345=>14328,
-17686=>14329,
-58346=>14329,
-26559=>14330,
-58347=>14330,
-34326=>14331,
-58348=>14331,
-165413=>14332,
-58349=>14332,
-165435=>14333,
-58350=>14333,
-34241=>14334,
-58351=>14334,
-159880=>14335,
-58352=>14335,
-34306=>14336,
-58353=>14336,
-136578=>14337,
-58354=>14337,
-159949=>14338,
-58355=>14338,
-194994=>14339,
-58356=>14339,
-17770=>14340,
-58357=>14340,
-34344=>14341,
-58358=>14341,
-13896=>14342,
-58359=>14342,
-137378=>14343,
-58360=>14343,
-21495=>14344,
-58361=>14344,
-160666=>14345,
-58362=>14345,
-34430=>14346,
-58363=>14346,
-172280=>14348,
-58365=>14348,
-34798=>14349,
-58366=>14349,
-142375=>14350,
-58367=>14350,
-34737=>14351,
-58368=>14351,
-34778=>14352,
-58369=>14352,
-34831=>14353,
-60990=>14353,
-58370=>14353,
-22113=>14354,
-58371=>14354,
-34412=>14355,
-58372=>14355,
-26710=>14356,
-58373=>14356,
-17935=>14357,
-58374=>14357,
-34885=>14358,
-58375=>14358,
-34886=>14359,
-58376=>14359,
-161248=>14360,
-58377=>14360,
-146873=>14361,
-58378=>14361,
-161252=>14362,
-58379=>14362,
-34910=>14363,
-58380=>14363,
-34972=>14364,
-58381=>14364,
-18011=>14365,
-58382=>14365,
-34996=>14366,
-58383=>14366,
-34997=>14367,
-58384=>14367,
-35013=>14368,
-58386=>14368,
-161551=>14369,
-58388=>14369,
-35207=>14370,
-58389=>14370,
-35239=>14374,
-58393=>14374,
-35260=>14375,
-58394=>14375,
-166437=>14376,
-58395=>14376,
-35303=>14377,
-58396=>14377,
-162084=>14378,
-58397=>14378,
-162493=>14379,
-58398=>14379,
-35484=>14380,
-58399=>14380,
-30611=>14381,
-58400=>14381,
-37374=>14382,
-58401=>14382,
-35472=>14383,
-58402=>14383,
-162393=>14384,
-58403=>14384,
-31465=>14385,
-58404=>14385,
-162618=>14386,
-58405=>14386,
-18195=>14387,
-58407=>14387,
-162616=>14388,
-58408=>14388,
-29052=>14389,
-58409=>14389,
-35596=>14390,
-58410=>14390,
-35615=>14391,
-58411=>14391,
-152624=>14392,
-58412=>14392,
-152933=>14393,
-58413=>14393,
-35647=>14394,
-58414=>14394,
-35661=>14396,
-58416=>14396,
-35497=>14397,
-58417=>14397,
-150138=>14398,
-58418=>14398,
-35728=>14399,
-58419=>14399,
-35739=>14400,
-58420=>14400,
-35503=>14401,
-58421=>14401,
-136927=>14402,
-58422=>14402,
-17941=>14403,
-58423=>14403,
-34895=>14404,
-58424=>14404,
-35995=>14405,
-58425=>14405,
-163156=>14406,
-58426=>14406,
-163215=>14407,
-58427=>14407,
-195028=>14408,
-58428=>14408,
-14117=>14409,
-58429=>14409,
-163155=>14410,
-58430=>14410,
-36054=>14411,
-58431=>14411,
-163224=>14412,
-58432=>14412,
-163261=>14413,
-58433=>14413,
-36114=>14414,
-58434=>14414,
-36099=>14415,
-58435=>14415,
-137488=>14416,
-58436=>14416,
-36059=>14417,
-58437=>14417,
-28764=>14418,
-58438=>14418,
-36113=>14419,
-58439=>14419,
-16080=>14420,
-58441=>14420,
-195031=>14421,
-36265=>14422,
-58443=>14422,
-163842=>14423,
-58444=>14423,
-135188=>14424,
-58445=>14424,
-149898=>14425,
-58446=>14425,
-15228=>14426,
-58447=>14426,
-164284=>14427,
-58448=>14427,
-160012=>14428,
-58449=>14428,
-31463=>14429,
-58450=>14429,
-36525=>14430,
-58451=>14430,
-36534=>14431,
-58452=>14431,
-36547=>14432,
-58453=>14432,
-37588=>14433,
-58454=>14433,
-36633=>14434,
-58455=>14434,
-36653=>14435,
-58456=>14435,
-164709=>14436,
-58457=>14436,
-164882=>14437,
-58458=>14437,
-36773=>14438,
-58459=>14438,
-37635=>14439,
-58460=>14439,
-172703=>14440,
-58461=>14440,
-133712=>14441,
-58462=>14441,
-36787=>14442,
-58463=>14442,
-166366=>14444,
-58465=>14444,
-165181=>14445,
-58466=>14445,
-146875=>14446,
-58467=>14446,
-24312=>14447,
-58468=>14447,
-143970=>14448,
-58469=>14448,
-36857=>14449,
-58470=>14449,
-140069=>14451,
-58474=>14451,
-14720=>14452,
-58475=>14452,
-159447=>14453,
-58476=>14453,
-36919=>14454,
-58477=>14454,
-165180=>14455,
-58478=>14455,
-162494=>14456,
-58479=>14456,
-36961=>14457,
-58480=>14457,
-165228=>14458,
-58481=>14458,
-165387=>14459,
-58482=>14459,
-37032=>14460,
-58483=>14460,
-165651=>14461,
-58484=>14461,
-37060=>14462,
-58485=>14462,
-165606=>14463,
-58486=>14463,
-37038=>14464,
-58487=>14464,
-64038=>14465,
-37223=>14466,
-58489=>14466,
-37289=>14467,
-58491=>14467,
-37316=>14468,
-58492=>14468,
-31916=>14469,
-58493=>14469,
-166195=>14470,
-58494=>14470,
-138889=>14471,
-58495=>14471,
-37390=>14472,
-58496=>14472,
-27807=>14473,
-58497=>14473,
-37441=>14474,
-58498=>14474,
-37474=>14475,
-58499=>14475,
-153017=>14476,
-58500=>14476,
-166598=>14477,
-58502=>14477,
-146587=>14478,
-58503=>14478,
-166668=>14479,
-58504=>14479,
-153051=>14480,
-58505=>14480,
-134449=>14481,
-58506=>14481,
-37676=>14482,
-58507=>14482,
-37739=>14483,
-58508=>14483,
-166625=>14484,
-58509=>14484,
-166891=>14485,
-58510=>14485,
-23235=>14486,
-58512=>14486,
-166626=>14487,
-58513=>14487,
-166629=>14488,
-58514=>14488,
-18789=>14489,
-58515=>14489,
-37444=>14490,
-58516=>14490,
-166892=>14491,
-58517=>14491,
-166969=>14492,
-58518=>14492,
-166911=>14493,
-58519=>14493,
-37747=>14494,
-58520=>14494,
-37979=>14495,
-58521=>14495,
-36540=>14496,
-58522=>14496,
-38277=>14497,
-58523=>14497,
-38310=>14498,
-58524=>14498,
-37926=>14499,
-58525=>14499,
-38304=>14500,
-58526=>14500,
-28662=>14501,
-58527=>14501,
-17081=>14502,
-58528=>14502,
-165592=>14503,
-58530=>14503,
-135804=>14504,
-58531=>14504,
-146990=>14505,
-58532=>14505,
-18911=>14506,
-58533=>14506,
-27676=>14507,
-58534=>14507,
-38523=>14508,
-58535=>14508,
-38550=>14509,
-58536=>14509,
-16748=>14510,
-58537=>14510,
-38563=>14511,
-58538=>14511,
-159445=>14512,
-58539=>14512,
-25050=>14513,
-58540=>14513,
-58541=>14514,
-30965=>14515,
-58542=>14515,
-166624=>14516,
-58543=>14516,
-38589=>14517,
-58544=>14517,
-21452=>14518,
-58545=>14518,
-18849=>14519,
-58546=>14519,
-158904=>14520,
-58547=>14520,
-131700=>14521,
-58548=>14521,
-156688=>14522,
-58549=>14522,
-168111=>14523,
-58550=>14523,
-168165=>14524,
-58551=>14524,
-150225=>14525,
-58552=>14525,
-137493=>14526,
-58553=>14526,
-144138=>14527,
-58554=>14527,
-38705=>14528,
-58555=>14528,
-34370=>14529,
-58556=>14529,
-38710=>14530,
-58557=>14530,
-18959=>14531,
-58558=>14531,
-17725=>14532,
-58559=>14532,
-17797=>14533,
-58560=>14533,
-150249=>14534,
-58561=>14534,
-28789=>14535,
-58562=>14535,
-23361=>14536,
-58563=>14536,
-38683=>14537,
-58564=>14537,
-168405=>14539,
-58566=>14539,
-38743=>14540,
-58567=>14540,
-23370=>14541,
-58568=>14541,
-168427=>14542,
-58569=>14542,
-38751=>14543,
-58570=>14543,
-37925=>14544,
-58571=>14544,
-20688=>14545,
-58572=>14545,
-143543=>14546,
-58573=>14546,
-143548=>14547,
-58574=>14547,
-38793=>14548,
-58575=>14548,
-38815=>14549,
-58576=>14549,
-38833=>14550,
-58577=>14550,
-38846=>14551,
-58578=>14551,
-38848=>14552,
-58579=>14552,
-38866=>14553,
-58580=>14553,
-38880=>14554,
-58581=>14554,
-152684=>14555,
-58582=>14555,
-38894=>14556,
-58583=>14556,
-29724=>14557,
-58584=>14557,
-169011=>14558,
-58585=>14558,
-38901=>14560,
-58587=>14560,
-168989=>14561,
-58588=>14561,
-162170=>14562,
-58589=>14562,
-19153=>14563,
-58590=>14563,
-38964=>14564,
-58591=>14564,
-38963=>14565,
-58592=>14565,
-38987=>14566,
-58593=>14566,
-39014=>14567,
-58594=>14567,
-15118=>14568,
-58595=>14568,
-160117=>14569,
-58596=>14569,
-15697=>14570,
-58597=>14570,
-132656=>14571,
-58598=>14571,
-147804=>14572,
-58599=>14572,
-153350=>14573,
-58600=>14573,
-39114=>14574,
-58601=>14574,
-39095=>14575,
-58602=>14575,
-39112=>14576,
-58603=>14576,
-39111=>14577,
-58604=>14577,
-19199=>14578,
-58605=>14578,
-159015=>14579,
-58606=>14579,
-136915=>14580,
-58607=>14580,
-21936=>14581,
-58608=>14581,
-39137=>14582,
-58609=>14582,
-39142=>14583,
-58610=>14583,
-39148=>14584,
-58611=>14584,
-37752=>14585,
-58612=>14585,
-39225=>14586,
-58613=>14586,
-150057=>14587,
-58614=>14587,
-19314=>14588,
-58615=>14588,
-170071=>14589,
-58616=>14589,
-170245=>14590,
-58617=>14590,
-39413=>14591,
-58618=>14591,
-39436=>14592,
-58619=>14592,
-39483=>14593,
-58620=>14593,
-39440=>14594,
-58621=>14594,
-39512=>14595,
-58622=>14595,
-153381=>14596,
-58623=>14596,
-14020=>14597,
-58624=>14597,
-168113=>14598,
-58625=>14598,
-170965=>14599,
-58626=>14599,
-39648=>14600,
-58627=>14600,
-39650=>14601,
-58628=>14601,
-170757=>14602,
-58629=>14602,
-39668=>14603,
-58630=>14603,
-19470=>14604,
-58631=>14604,
-39700=>14605,
-58632=>14605,
-39725=>14606,
-58633=>14606,
-165376=>14607,
-58634=>14607,
-20532=>14608,
-58635=>14608,
-39732=>14609,
-58636=>14609,
-14531=>14610,
-58638=>14610,
-143485=>14611,
-58639=>14611,
-39760=>14612,
-58640=>14612,
-39744=>14613,
-58641=>14613,
-171326=>14614,
-58642=>14614,
-23109=>14615,
-58643=>14615,
-137315=>14616,
-58644=>14616,
-39822=>14617,
-58645=>14617,
-39938=>14618,
-58647=>14618,
-39935=>14619,
-58648=>14619,
-39948=>14620,
-58649=>14620,
-171624=>14621,
-58650=>14621,
-40404=>14622,
-58651=>14622,
-171959=>14623,
-58652=>14623,
-172434=>14624,
-58653=>14624,
-172459=>14625,
-58654=>14625,
-172257=>14626,
-58655=>14626,
-172323=>14627,
-58656=>14627,
-172511=>14628,
-58657=>14628,
-40318=>14629,
-58658=>14629,
-40323=>14630,
-58659=>14630,
-172340=>14631,
-58660=>14631,
-40462=>14632,
-58661=>14632,
-40388=>14633,
-58663=>14633,
-172435=>14634,
-58665=>14634,
-172576=>14635,
-58666=>14635,
-137531=>14636,
-58667=>14636,
-172595=>14637,
-58668=>14637,
-40249=>14638,
-58669=>14638,
-172217=>14639,
-58670=>14639,
-172724=>14640,
-58671=>14640,
-40592=>14641,
-58672=>14641,
-40597=>14642,
-58673=>14642,
-40606=>14643,
-58674=>14643,
-40610=>14644,
-58675=>14644,
-19764=>14645,
-58676=>14645,
-40618=>14646,
-58677=>14646,
-40623=>14647,
-58678=>14647,
-148324=>14648,
-58679=>14648,
-40641=>14649,
-58680=>14649,
-15200=>14650,
-58681=>14650,
-14821=>14651,
-58682=>14651,
-15645=>14652,
-58683=>14652,
-20274=>14653,
-58684=>14653,
-14270=>14654,
-58685=>14654,
-166955=>14655,
-58686=>14655,
-40706=>14656,
-58687=>14656,
-40712=>14657,
-58688=>14657,
-19350=>14658,
-58689=>14658,
-37924=>14659,
-58690=>14659,
-159138=>14660,
-58691=>14660,
-40727=>14661,
-60836=>14661,
-58692=>14661,
-195099=>14662,
-40761=>14663,
-58694=>14663,
-22175=>14664,
-58695=>14664,
-22154=>14665,
-58696=>14665,
-40773=>14666,
-58697=>14666,
-39352=>14667,
-58698=>14667,
-168075=>14668,
-58699=>14668,
-38898=>14669,
-58700=>14669,
-33919=>14670,
-58701=>14670,
-40809=>14672,
-58703=>14672,
-31452=>14673,
-58704=>14673,
-40846=>14674,
-58705=>14674,
-29206=>14675,
-58706=>14675,
-19390=>14676,
-58707=>14676,
-149877=>14677,
-58708=>14677,
-149947=>14678,
-58709=>14678,
-29047=>14679,
-58710=>14679,
-150008=>14680,
-58711=>14680,
-148296=>14681,
-58712=>14681,
-150097=>14682,
-58713=>14682,
-29598=>14683,
-58714=>14683,
-166874=>14684,
-58715=>14684,
-137466=>14685,
-58716=>14685,
-31135=>14686,
-58717=>14686,
-166270=>14687,
-58718=>14687,
-167478=>14688,
-58719=>14688,
-37737=>14689,
-58720=>14689,
-37875=>14690,
-58721=>14690,
-166468=>14691,
-58722=>14691,
-37612=>14692,
-58723=>14692,
-37761=>14693,
-58724=>14693,
-37835=>14694,
-58725=>14694,
-166252=>14695,
-58726=>14695,
-148665=>14696,
-58727=>14696,
-29207=>14697,
-58728=>14697,
-16107=>14698,
-58729=>14698,
-30578=>14699,
-58730=>14699,
-31299=>14700,
-58731=>14700,
-28880=>14701,
-58732=>14701,
-148595=>14702,
-58733=>14702,
-148472=>14703,
-58734=>14703,
-29054=>14704,
-58735=>14704,
-137199=>14705,
-58736=>14705,
-28835=>14706,
-58737=>14706,
-137406=>14707,
-58738=>14707,
-144793=>14708,
-58739=>14708,
-16071=>14709,
-58740=>14709,
-137349=>14710,
-58741=>14710,
-152623=>14711,
-58742=>14711,
-137208=>14712,
-58743=>14712,
-14114=>14713,
-58744=>14713,
-136955=>14714,
-58745=>14714,
-137273=>14715,
-58746=>14715,
-14049=>14716,
-58747=>14716,
-137076=>14717,
-58748=>14717,
-137425=>14718,
-58749=>14718,
-155467=>14719,
-58750=>14719,
-14115=>14720,
-58751=>14720,
-136896=>14721,
-58752=>14721,
-22363=>14722,
-58753=>14722,
-150053=>14723,
-58754=>14723,
-136190=>14724,
-58755=>14724,
-135848=>14725,
-58756=>14725,
-136134=>14726,
-58757=>14726,
-136374=>14727,
-58758=>14727,
-34051=>14728,
-58761=>14728,
-58759=>14728,
-145062=>14729,
-58760=>14729,
-33877=>14731,
-58762=>14731,
-149908=>14732,
-58763=>14732,
-160101=>14733,
-58764=>14733,
-146993=>14734,
-58765=>14734,
-152924=>14735,
-58766=>14735,
-147195=>14736,
-58767=>14736,
-159826=>14737,
-58768=>14737,
-17652=>14738,
-58769=>14738,
-145134=>14739,
-58770=>14739,
-170397=>14740,
-58771=>14740,
-159526=>14741,
-58772=>14741,
-26617=>14742,
-58773=>14742,
-14131=>14743,
-58774=>14743,
-15381=>14744,
-58775=>14744,
-15847=>14745,
-58776=>14745,
-22636=>14746,
-58777=>14746,
-137506=>14747,
-58778=>14747,
-26640=>14748,
-58779=>14748,
-16471=>14749,
-58780=>14749,
-145215=>14750,
-58781=>14750,
-147681=>14751,
-58782=>14751,
-147595=>14752,
-58783=>14752,
-147727=>14753,
-58784=>14753,
-158753=>14754,
-58785=>14754,
-21707=>14755,
-58786=>14755,
-22174=>14756,
-58787=>14756,
-157361=>14757,
-58788=>14757,
-22162=>14758,
-58789=>14758,
-135135=>14759,
-58790=>14759,
-134056=>14760,
-58791=>14760,
-134669=>14761,
-58792=>14761,
-166675=>14763,
-58794=>14763,
-37788=>14764,
-58795=>14764,
-20216=>14765,
-58796=>14765,
-20779=>14766,
-58797=>14766,
-14361=>14767,
-58798=>14767,
-148534=>14768,
-58799=>14768,
-20156=>14769,
-58800=>14769,
-132197=>14770,
-58801=>14770,
-20299=>14772,
-58803=>14772,
-20362=>14773,
-58804=>14773,
-153169=>14774,
-58805=>14774,
-23144=>14775,
-58806=>14775,
-131499=>14776,
-58807=>14776,
-132043=>14777,
-58808=>14777,
-14745=>14778,
-58809=>14778,
-131850=>14779,
-58810=>14779,
-132116=>14780,
-58811=>14780,
-13365=>14781,
-58812=>14781,
-20265=>14782,
-58813=>14782,
-131776=>14783,
-58814=>14783,
-167603=>14784,
-58815=>14784,
-131701=>14785,
-58816=>14785,
-35546=>14786,
-58817=>14786,
-131596=>14787,
-58818=>14787,
-20120=>14788,
-58819=>14788,
-20685=>14789,
-58820=>14789,
-20749=>14790,
-58821=>14790,
-20386=>14791,
-58822=>14791,
-20227=>14792,
-58823=>14792,
-150030=>14793,
-58824=>14793,
-147082=>14794,
-58825=>14794,
-20290=>14795,
-58826=>14795,
-20526=>14796,
-58827=>14796,
-20588=>14797,
-58828=>14797,
-20609=>14798,
-58829=>14798,
-20428=>14799,
-58830=>14799,
-20453=>14800,
-58831=>14800,
-20568=>14801,
-58832=>14801,
-20732=>14802,
-58833=>14802,
-28278=>14803,
-58838=>14803,
-144789=>14804,
-58839=>14804,
-147001=>14805,
-58840=>14805,
-147135=>14806,
-58841=>14806,
-28018=>14807,
-58842=>14807,
-137348=>14808,
-58843=>14808,
-147081=>14809,
-58844=>14809,
-20904=>14810,
-58845=>14810,
-20931=>14811,
-58846=>14811,
-132576=>14812,
-58847=>14812,
-17629=>14813,
-58848=>14813,
-132259=>14814,
-58849=>14814,
-132242=>14815,
-58850=>14815,
-132241=>14816,
-58851=>14816,
-36218=>14817,
-58852=>14817,
-166556=>14818,
-58853=>14818,
-132878=>14819,
-58854=>14819,
-21081=>14820,
-58855=>14820,
-21156=>14821,
-58856=>14821,
-133235=>14822,
-58857=>14822,
-21217=>14823,
-58858=>14823,
-18042=>14825,
-58860=>14825,
-29068=>14826,
-58861=>14826,
-148364=>14827,
-58862=>14827,
-134176=>14828,
-58863=>14828,
-149932=>14829,
-58864=>14829,
-135396=>14830,
-58865=>14830,
-27089=>14831,
-58866=>14831,
-134685=>14832,
-58867=>14832,
-16094=>14834,
-58869=>14834,
-29849=>14835,
-58870=>14835,
-29716=>14836,
-58871=>14836,
-29782=>14837,
-58872=>14837,
-29592=>14838,
-58873=>14838,
-19342=>14839,
-58874=>14839,
-150204=>14840,
-58875=>14840,
-147597=>14841,
-58876=>14841,
-21456=>14842,
-58877=>14842,
-13700=>14843,
-58878=>14843,
-29199=>14844,
-58879=>14844,
-147657=>14845,
-58880=>14845,
-21940=>14846,
-58881=>14846,
-131909=>14847,
-58882=>14847,
-21709=>14848,
-58883=>14848,
-134086=>14849,
-58884=>14849,
-22301=>14850,
-58885=>14850,
-37469=>14851,
-58886=>14851,
-38644=>14852,
-58887=>14852,
-22493=>14853,
-58889=>14853,
-22413=>14854,
-58890=>14854,
-22399=>14855,
-58891=>14855,
-13886=>14856,
-58892=>14856,
-22731=>14857,
-58893=>14857,
-23193=>14858,
-58894=>14858,
-166470=>14859,
-58895=>14859,
-136954=>14860,
-58896=>14860,
-137071=>14861,
-58897=>14861,
-136976=>14862,
-58898=>14862,
-23084=>14863,
-58899=>14863,
-22968=>14864,
-58900=>14864,
-23166=>14865,
-58902=>14865,
-23247=>14866,
-58903=>14866,
-23058=>14867,
-58904=>14867,
-153926=>14868,
-58905=>14868,
-137715=>14869,
-58906=>14869,
-137313=>14870,
-58907=>14870,
-148117=>14871,
-58908=>14871,
-14069=>14872,
-58909=>14872,
-27909=>14873,
-58910=>14873,
-29763=>14874,
-58911=>14874,
-23073=>14875,
-58912=>14875,
-155267=>14876,
-58913=>14876,
-23169=>14877,
-58914=>14877,
-166871=>14878,
-58915=>14878,
-132115=>14879,
-58916=>14879,
-37856=>14880,
-58917=>14880,
-29836=>14881,
-58918=>14881,
-135939=>14882,
-58919=>14882,
-28933=>14883,
-58920=>14883,
-18802=>14884,
-58921=>14884,
-37896=>14885,
-58922=>14885,
-166395=>14886,
-58923=>14886,
-37821=>14887,
-58924=>14887,
-14240=>14888,
-58925=>14888,
-23582=>14889,
-58926=>14889,
-23710=>14890,
-58927=>14890,
-24158=>14891,
-58928=>14891,
-24136=>14892,
-58929=>14892,
-137622=>14893,
-58930=>14893,
-137596=>14894,
-58931=>14894,
-146158=>14895,
-58932=>14895,
-24269=>14896,
-58933=>14896,
-23375=>14897,
-58934=>14897,
-58935=>14898,
-137475=>14898,
-58936=>14899,
-137476=>14899,
-14081=>14900,
-58937=>14900,
-137376=>14901,
-58938=>14901,
-14045=>14902,
-58939=>14902,
-136958=>14903,
-58940=>14903,
-14035=>14904,
-58941=>14904,
-33066=>14905,
-58942=>14905,
-166471=>14906,
-58943=>14906,
-138682=>14907,
-58944=>14907,
-144498=>14908,
-58945=>14908,
-166312=>14909,
-58946=>14909,
-24332=>14910,
-60916=>14910,
-58947=>14910,
-24334=>14911,
-58948=>14911,
-137511=>14912,
-58949=>14912,
-137131=>14913,
-58950=>14913,
-23147=>14914,
-58951=>14914,
-137019=>14915,
-58952=>14915,
-23364=>14916,
-58953=>14916,
-161277=>14917,
-58955=>14917,
-34912=>14918,
-58956=>14918,
-24702=>14919,
-58957=>14919,
-141408=>14920,
-58958=>14920,
-140843=>14921,
-58959=>14921,
-24539=>14922,
-58960=>14922,
-16056=>14923,
-58961=>14923,
-140719=>14924,
-58962=>14924,
-140734=>14925,
-58963=>14925,
-168072=>14926,
-58964=>14926,
-159603=>14927,
-58965=>14927,
-25024=>14928,
-58966=>14928,
-131134=>14929,
-58967=>14929,
-131142=>14930,
-58968=>14930,
-140827=>14931,
-58969=>14931,
-24985=>14932,
-58970=>14932,
-24984=>14933,
-58971=>14933,
-24693=>14934,
-58972=>14934,
-142491=>14935,
-58973=>14935,
-142599=>14936,
-58974=>14936,
-149204=>14937,
-58975=>14937,
-168269=>14938,
-58976=>14938,
-25713=>14939,
-58977=>14939,
-149093=>14940,
-58978=>14940,
-142186=>14941,
-58979=>14941,
-14889=>14942,
-58980=>14942,
-142114=>14943,
-58981=>14943,
-144464=>14944,
-58982=>14944,
-170218=>14945,
-58983=>14945,
-142968=>14946,
-58984=>14946,
-25399=>14947,
-58985=>14947,
-25782=>14948,
-58987=>14948,
-25393=>14949,
-58988=>14949,
-25553=>14950,
-58989=>14950,
-149987=>14951,
-58990=>14951,
-142695=>14952,
-58991=>14952,
-25252=>14953,
-58992=>14953,
-142497=>14954,
-58993=>14954,
-25659=>14955,
-58994=>14955,
-25963=>14956,
-58995=>14956,
-26994=>14957,
-58996=>14957,
-15348=>14958,
-58997=>14958,
-143502=>14959,
-58998=>14959,
-144045=>14960,
-58999=>14960,
-149897=>14961,
-59000=>14961,
-144043=>14962,
-59001=>14962,
-21773=>14963,
-59002=>14963,
-144096=>14964,
-59003=>14964,
-137433=>14965,
-59004=>14965,
-169023=>14966,
-59005=>14966,
-26318=>14967,
-59006=>14967,
-144009=>14968,
-59007=>14968,
-143795=>14969,
-59008=>14969,
-15072=>14970,
-59009=>14970,
-152964=>14971,
-59011=>14971,
-166690=>14972,
-59012=>14972,
-152975=>14973,
-59013=>14973,
-136956=>14974,
-59014=>14974,
-152923=>14975,
-59015=>14975,
-152613=>14976,
-59016=>14976,
-30958=>14977,
-59017=>14977,
-143619=>14978,
-59018=>14978,
-137258=>14979,
-59019=>14979,
-143924=>14980,
-59020=>14980,
-13412=>14981,
-59021=>14981,
-143887=>14982,
-59022=>14982,
-143746=>14983,
-59023=>14983,
-148169=>14984,
-59024=>14984,
-26254=>14985,
-59025=>14985,
-159012=>14986,
-59026=>14986,
-26219=>14987,
-59027=>14987,
-19347=>14988,
-59028=>14988,
-26160=>14989,
-59029=>14989,
-161904=>14990,
-59030=>14990,
-138731=>14991,
-59031=>14991,
-26211=>14992,
-59032=>14992,
-144082=>14993,
-59033=>14993,
-144097=>14994,
-59034=>14994,
-26142=>14995,
-59035=>14995,
-153714=>14996,
-59036=>14996,
-14545=>14997,
-59037=>14997,
-145466=>14998,
-59038=>14998,
-145340=>14999,
-59039=>14999,
-15257=>15000,
-59040=>15000,
-145314=>15001,
-59041=>15001,
-144382=>15002,
-59042=>15002,
-29904=>15003,
-59043=>15003,
-15254=>15004,
-59044=>15004,
-149034=>15005,
-59046=>15005,
-26806=>15006,
-59047=>15006,
-15300=>15008,
-59049=>15008,
-27326=>15009,
-59050=>15009,
-145365=>15010,
-59052=>15010,
-148615=>15011,
-59053=>15011,
-27187=>15012,
-59054=>15012,
-27218=>15013,
-59055=>15013,
-27337=>15014,
-59056=>15014,
-27397=>15015,
-59057=>15015,
-137490=>15016,
-59058=>15016,
-25873=>15017,
-59059=>15017,
-26776=>15018,
-59060=>15018,
-27212=>15019,
-59061=>15019,
-15319=>15020,
-59062=>15020,
-27258=>15021,
-59063=>15021,
-27479=>15022,
-59064=>15022,
-147392=>15023,
-59065=>15023,
-146586=>15024,
-59066=>15024,
-37792=>15025,
-59067=>15025,
-37618=>15026,
-59068=>15026,
-166890=>15027,
-59069=>15027,
-166603=>15028,
-59070=>15028,
-37513=>15029,
-59071=>15029,
-163870=>15030,
-59072=>15030,
-166364=>15031,
-59073=>15031,
-37991=>15032,
-59074=>15032,
-28069=>15033,
-59075=>15033,
-28427=>15034,
-59076=>15034,
-147327=>15036,
-59079=>15036,
-15759=>15037,
-59080=>15037,
-28164=>15038,
-59081=>15038,
-147516=>15039,
-59082=>15039,
-23101=>15040,
-59083=>15040,
-28170=>15041,
-59084=>15041,
-22599=>15042,
-59085=>15042,
-27940=>15043,
-59086=>15043,
-30786=>15044,
-59087=>15044,
-28987=>15045,
-59088=>15045,
-148250=>15046,
-59089=>15046,
-148086=>15047,
-59090=>15047,
-28913=>15048,
-59091=>15048,
-29264=>15049,
-61085=>15049,
-59092=>15049,
-29319=>15050,
-59093=>15050,
-29332=>15051,
-59094=>15051,
-149391=>15052,
-59095=>15052,
-149285=>15053,
-59096=>15053,
-20857=>15054,
-59097=>15054,
-150180=>15055,
-59098=>15055,
-132587=>15056,
-59099=>15056,
-29818=>15057,
-59100=>15057,
-147192=>15058,
-59101=>15058,
-144991=>15059,
-59102=>15059,
-150090=>15060,
-59103=>15060,
-149783=>15061,
-59104=>15061,
-155617=>15062,
-59105=>15062,
-16134=>15063,
-59106=>15063,
-16049=>15064,
-59107=>15064,
-150239=>15065,
-59108=>15065,
-166947=>15066,
-59109=>15066,
-147253=>15067,
-59110=>15067,
-24743=>15068,
-59111=>15068,
-16115=>15069,
-59112=>15069,
-29900=>15070,
-59113=>15070,
-29756=>15071,
-59114=>15071,
-37767=>15072,
-59115=>15072,
-29751=>15073,
-59116=>15073,
-17567=>15074,
-59117=>15074,
-159210=>15075,
-59118=>15075,
-17745=>15076,
-59119=>15076,
-30083=>15077,
-59120=>15077,
-16227=>15078,
-59121=>15078,
-150745=>15079,
-59122=>15079,
-150790=>15080,
-59123=>15080,
-16216=>15081,
-59124=>15081,
-30037=>15082,
-59125=>15082,
-30323=>15083,
-59126=>15083,
-173510=>15084,
-59127=>15084,
-29800=>15086,
-61070=>15086,
-59129=>15086,
-166604=>15087,
-59130=>15087,
-149931=>15088,
-59131=>15088,
-149902=>15089,
-59132=>15089,
-15099=>15090,
-59133=>15090,
-15821=>15091,
-59134=>15091,
-150094=>15092,
-59135=>15092,
-16127=>15093,
-59136=>15093,
-149957=>15094,
-59137=>15094,
-149747=>15095,
-59138=>15095,
-37370=>15096,
-59139=>15096,
-22322=>15097,
-59140=>15097,
-37698=>15098,
-59141=>15098,
-166627=>15099,
-59142=>15099,
-137316=>15100,
-59143=>15100,
-20703=>15101,
-59144=>15101,
-152097=>15102,
-59145=>15102,
-152039=>15103,
-59146=>15103,
-30584=>15104,
-59147=>15104,
-143922=>15105,
-59148=>15105,
-30478=>15106,
-59149=>15106,
-30479=>15107,
-59150=>15107,
-30587=>15108,
-59151=>15108,
-149143=>15109,
-59152=>15109,
-145281=>15110,
-59153=>15110,
-14942=>15111,
-59154=>15111,
-149744=>15112,
-59155=>15112,
-29752=>15113,
-59156=>15113,
-29851=>15114,
-59157=>15114,
-16063=>15115,
-59158=>15115,
-150202=>15116,
-59159=>15116,
-150215=>15117,
-59160=>15117,
-16584=>15118,
-59161=>15118,
-150166=>15119,
-59162=>15119,
-156078=>15120,
-59163=>15120,
-37639=>15121,
-59164=>15121,
-152961=>15122,
-59165=>15122,
-30750=>15123,
-59166=>15123,
-30861=>15124,
-59167=>15124,
-30856=>15125,
-59168=>15125,
-30930=>15126,
-59169=>15126,
-29648=>15127,
-59170=>15127,
-31065=>15128,
-59171=>15128,
-161601=>15129,
-59172=>15129,
-153315=>15130,
-59173=>15130,
-16654=>15131,
-59174=>15131,
-31141=>15134,
-59177=>15134,
-27181=>15135,
-59178=>15135,
-147194=>15136,
-59179=>15136,
-31290=>15137,
-59180=>15137,
-31220=>15138,
-59181=>15138,
-16750=>15139,
-59182=>15139,
-136934=>15140,
-59183=>15140,
-16690=>15141,
-59184=>15141,
-37429=>15142,
-59185=>15142,
-31217=>15143,
-59186=>15143,
-134476=>15144,
-59187=>15144,
-149900=>15145,
-59188=>15145,
-131737=>15146,
-59189=>15146,
-146874=>15147,
-59190=>15147,
-137070=>15148,
-59191=>15148,
-13719=>15149,
-59192=>15149,
-21867=>15150,
-59193=>15150,
-13680=>15151,
-59194=>15151,
-13994=>15152,
-59195=>15152,
-131540=>15153,
-59196=>15153,
-134157=>15154,
-59197=>15154,
-31458=>15155,
-59198=>15155,
-23129=>15156,
-59199=>15156,
-141045=>15157,
-59200=>15157,
-154287=>15158,
-59201=>15158,
-154268=>15159,
-59202=>15159,
-23053=>15160,
-59203=>15160,
-131675=>15161,
-59204=>15161,
-30960=>15162,
-59205=>15162,
-23082=>15163,
-59206=>15163,
-154566=>15164,
-59207=>15164,
-31486=>15165,
-59208=>15165,
-16889=>15166,
-59209=>15166,
-31837=>15167,
-59210=>15167,
-31853=>15168,
-59211=>15168,
-16913=>15169,
-59212=>15169,
-154547=>15170,
-59213=>15170,
-155324=>15171,
-59214=>15171,
-155302=>15172,
-59215=>15172,
-31949=>15173,
-59216=>15173,
-150009=>15174,
-59217=>15174,
-137136=>15175,
-59218=>15175,
-31886=>15176,
-59219=>15176,
-31868=>15177,
-59220=>15177,
-31918=>15178,
-59221=>15178,
-27314=>15179,
-59222=>15179,
-32220=>15180,
-59223=>15180,
-32263=>15181,
-59224=>15181,
-32211=>15182,
-59225=>15182,
-32590=>15183,
-59226=>15183,
-156257=>15184,
-59227=>15184,
-155996=>15185,
-59228=>15185,
-162632=>15186,
-59229=>15186,
-32151=>15187,
-59230=>15187,
-155266=>15188,
-59231=>15188,
-17002=>15189,
-59232=>15189,
-158581=>15190,
-59233=>15190,
-133398=>15191,
-59234=>15191,
-26582=>15192,
-59235=>15192,
-131150=>15193,
-59236=>15193,
-144847=>15194,
-59237=>15194,
-22468=>15195,
-59238=>15195,
-156690=>15196,
-59239=>15196,
-156664=>15197,
-59240=>15197,
-32733=>15198,
-59242=>15198,
-31527=>15199,
-59243=>15199,
-133164=>15200,
-59244=>15200,
-154345=>15201,
-59245=>15201,
-154947=>15202,
-59246=>15202,
-31500=>15203,
-59247=>15203,
-155150=>15204,
-59248=>15204,
-39398=>15205,
-59249=>15205,
-34373=>15206,
-59250=>15206,
-39523=>15207,
-59251=>15207,
-27164=>15208,
-59252=>15208,
-144447=>15209,
-59253=>15209,
-150007=>15210,
-59255=>15210,
-157101=>15211,
-59256=>15211,
-39455=>15212,
-59257=>15212,
-157088=>15213,
-59258=>15213,
-33941=>15214,
-160039=>15215,
-59260=>15215,
-158929=>15216,
-59261=>15216,
-17642=>15217,
-59262=>15217,
-33079=>15218,
-59263=>15218,
-17410=>15219,
-59264=>15219,
-32966=>15220,
-59265=>15220,
-33033=>15221,
-59266=>15221,
-33090=>15222,
-59267=>15222,
-157620=>15223,
-59268=>15223,
-39107=>15224,
-59269=>15224,
-158274=>15225,
-59270=>15225,
-33378=>15226,
-59271=>15226,
-33381=>15227,
-59272=>15227,
-158289=>15228,
-59273=>15228,
-33875=>15229,
-59274=>15229,
-159143=>15230,
-59275=>15230,
-34320=>15231,
-59276=>15231,
-160283=>15232,
-59277=>15232,
-23174=>15233,
-59278=>15233,
-16767=>15234,
-59279=>15234,
-137280=>15235,
-59280=>15235,
-23339=>15236,
-59281=>15236,
-137377=>15237,
-59282=>15237,
-23268=>15238,
-59283=>15238,
-137432=>15239,
-59284=>15239,
-34464=>15240,
-59285=>15240,
-195004=>15241,
-59286=>15241,
-146831=>15242,
-59287=>15242,
-34861=>15243,
-59288=>15243,
-160802=>15244,
-59289=>15244,
-23042=>15245,
-59290=>15245,
-34926=>15246,
-59291=>15246,
-20293=>15247,
-59292=>15247,
-34951=>15248,
-59293=>15248,
-35007=>15249,
-59294=>15249,
-35046=>15250,
-59295=>15250,
-35173=>15251,
-59296=>15251,
-35149=>15252,
-59297=>15252,
-153219=>15253,
-59298=>15253,
-35156=>15254,
-59299=>15254,
-161669=>15255,
-59300=>15255,
-161668=>15256,
-59301=>15256,
-166901=>15257,
-59302=>15257,
-166873=>15258,
-59303=>15258,
-166812=>15259,
-59304=>15259,
-166393=>15260,
-59305=>15260,
-16045=>15261,
-59306=>15261,
-33955=>15262,
-59307=>15262,
-18165=>15263,
-59308=>15263,
-18127=>15264,
-59309=>15264,
-14322=>15265,
-59310=>15265,
-35389=>15266,
-59311=>15266,
-35356=>15267,
-59312=>15267,
-169032=>15268,
-59313=>15268,
-24397=>15269,
-59314=>15269,
-37419=>15270,
-59315=>15270,
-148100=>15271,
-59316=>15271,
-26068=>15272,
-59317=>15272,
-28969=>15273,
-59318=>15273,
-28868=>15274,
-59319=>15274,
-137285=>15275,
-59320=>15275,
-40301=>15276,
-59321=>15276,
-35999=>15277,
-59322=>15277,
-36073=>15278,
-59323=>15278,
-163292=>15279,
-59324=>15279,
-22938=>15280,
-59325=>15280,
-30659=>15281,
-59326=>15281,
-23024=>15282,
-59327=>15282,
-14036=>15283,
-59329=>15283,
-36394=>15284,
-59330=>15284,
-36519=>15285,
-59331=>15285,
-150537=>15286,
-59332=>15286,
-36656=>15287,
-59333=>15287,
-36682=>15288,
-59334=>15288,
-17140=>15289,
-59335=>15289,
-27736=>15290,
-59336=>15290,
-28603=>15291,
-59337=>15291,
-140065=>15292,
-59338=>15292,
-18587=>15293,
-59339=>15293,
-28537=>15294,
-59340=>15294,
-28299=>15295,
-59341=>15295,
-137178=>15296,
-59342=>15296,
-39913=>15297,
-59343=>15297,
-14005=>15298,
-59344=>15298,
-149807=>15299,
-59345=>15299,
-37051=>15300,
-59346=>15300,
-18612=>15301,
-21873=>15302,
-59348=>15302,
-18694=>15303,
-59349=>15303,
-37307=>15304,
-59350=>15304,
-37892=>15305,
-59351=>15305,
-166475=>15306,
-59352=>15306,
-16482=>15307,
-59353=>15307,
-166652=>15308,
-59354=>15308,
-37927=>15309,
-59355=>15309,
-166941=>15310,
-59356=>15310,
-166971=>15311,
-59357=>15311,
-34021=>15312,
-59358=>15312,
-35371=>15313,
-59359=>15313,
-38297=>15314,
-59360=>15314,
-38311=>15315,
-59361=>15315,
-38295=>15316,
-59362=>15316,
-38294=>15317,
-59363=>15317,
-167220=>15318,
-59364=>15318,
-29765=>15319,
-59365=>15319,
-16066=>15320,
-59366=>15320,
-149759=>15321,
-59367=>15321,
-150082=>15322,
-59368=>15322,
-148458=>15323,
-59369=>15323,
-16103=>15324,
-59370=>15324,
-143909=>15325,
-59371=>15325,
-38543=>15326,
-59372=>15326,
-167655=>15327,
-59373=>15327,
-167526=>15328,
-59374=>15328,
-167525=>15329,
-59375=>15329,
-16076=>15330,
-59376=>15330,
-149997=>15331,
-59377=>15331,
-150136=>15332,
-59378=>15332,
-147438=>15333,
-59379=>15333,
-29714=>15334,
-59380=>15334,
-29803=>15335,
-59381=>15335,
-16124=>15336,
-59382=>15336,
-38721=>15337,
-59383=>15337,
-168112=>15338,
-59384=>15338,
-26695=>15339,
-59385=>15339,
-18973=>15340,
-59386=>15340,
-168083=>15341,
-59387=>15341,
-153567=>15342,
-59388=>15342,
-37736=>15344,
-59390=>15344,
-166281=>15345,
-59391=>15345,
-166950=>15346,
-59392=>15346,
-166703=>15347,
-59393=>15347,
-156606=>15348,
-59394=>15348,
-37562=>15349,
-59395=>15349,
-23313=>15350,
-59396=>15350,
-35689=>15351,
-59397=>15351,
-18748=>15352,
-59398=>15352,
-29689=>15353,
-59399=>15353,
-147995=>15354,
-59400=>15354,
-38811=>15355,
-59401=>15355,
-39224=>15357,
-59403=>15357,
-134950=>15358,
-59404=>15358,
-24001=>15359,
-59405=>15359,
-166853=>15360,
-59406=>15360,
-150194=>15361,
-59407=>15361,
-38943=>15362,
-59408=>15362,
-169178=>15363,
-59409=>15363,
-37622=>15364,
-59410=>15364,
-169431=>15365,
-59411=>15365,
-37349=>15366,
-59412=>15366,
-17600=>15367,
-59413=>15367,
-166736=>15368,
-59414=>15368,
-150119=>15369,
-59415=>15369,
-166756=>15370,
-59416=>15370,
-39132=>15371,
-59417=>15371,
-166469=>15372,
-59418=>15372,
-16128=>15373,
-59419=>15373,
-37418=>15374,
-59420=>15374,
-18725=>15375,
-59421=>15375,
-33812=>15376,
-59422=>15376,
-39227=>15377,
-59423=>15377,
-39245=>15378,
-59424=>15378,
-162566=>15379,
-59425=>15379,
-15869=>15380,
-59426=>15380,
-19311=>15382,
-59428=>15382,
-39338=>15383,
-59429=>15383,
-39516=>15384,
-59430=>15384,
-166757=>15385,
-59431=>15385,
-153800=>15386,
-59432=>15386,
-27279=>15387,
-59433=>15387,
-39457=>15388,
-59434=>15388,
-23294=>15389,
-59435=>15389,
-39471=>15390,
-59436=>15390,
-170225=>15391,
-59437=>15391,
-19344=>15392,
-59438=>15392,
-170312=>15393,
-59439=>15393,
-39356=>15394,
-59440=>15394,
-19389=>15395,
-59441=>15395,
-19351=>15396,
-59442=>15396,
-37757=>15397,
-59443=>15397,
-22642=>15398,
-59444=>15398,
-135938=>15399,
-59445=>15399,
-22562=>15400,
-59446=>15400,
-149944=>15401,
-59447=>15401,
-136424=>15402,
-59448=>15402,
-30788=>15403,
-59449=>15403,
-141087=>15404,
-59450=>15404,
-146872=>15405,
-59451=>15405,
-26821=>15406,
-59452=>15406,
-15741=>15407,
-59453=>15407,
-37976=>15408,
-59454=>15408,
-14631=>15409,
-59455=>15409,
-24912=>15410,
-59456=>15410,
-141185=>15411,
-59457=>15411,
-141675=>15412,
-59458=>15412,
-24839=>15413,
-59459=>15413,
-40015=>15414,
-59460=>15414,
-40019=>15415,
-59461=>15415,
-40059=>15416,
-59462=>15416,
-39989=>15417,
-59463=>15417,
-39952=>15418,
-59464=>15418,
-39807=>15419,
-59465=>15419,
-39887=>15420,
-59466=>15420,
-171565=>15421,
-59467=>15421,
-39839=>15422,
-59468=>15422,
-172533=>15423,
-59469=>15423,
-172286=>15424,
-59470=>15424,
-40225=>15425,
-59471=>15425,
-19630=>15426,
-59472=>15426,
-147716=>15427,
-59473=>15427,
-40472=>15428,
-59474=>15428,
-19632=>15429,
-59475=>15429,
-40204=>15430,
-59476=>15430,
-172468=>15431,
-59477=>15431,
-172269=>15432,
-59478=>15432,
-172275=>15433,
-59479=>15433,
-170287=>15434,
-59480=>15434,
-40357=>15435,
-59481=>15435,
-33981=>15436,
-59482=>15436,
-159250=>15437,
-59483=>15437,
-159711=>15438,
-59484=>15438,
-158594=>15439,
-59485=>15439,
-34300=>15440,
-59486=>15440,
-17715=>15441,
-59487=>15441,
-159140=>15442,
-59488=>15442,
-159364=>15443,
-59489=>15443,
-159216=>15444,
-59490=>15444,
-33824=>15445,
-59491=>15445,
-34286=>15446,
-59492=>15446,
-159232=>15447,
-59493=>15447,
-145367=>15448,
-59494=>15448,
-155748=>15449,
-59495=>15449,
-31202=>15450,
-59496=>15450,
-144796=>15451,
-59497=>15451,
-144960=>15452,
-59498=>15452,
-149982=>15453,
-59500=>15453,
-15714=>15454,
-59501=>15454,
-37851=>15455,
-59502=>15455,
-37566=>15456,
-59503=>15456,
-37704=>15457,
-59504=>15457,
-131775=>15458,
-59505=>15458,
-30905=>15459,
-59506=>15459,
-37495=>15460,
-59507=>15460,
-37965=>15461,
-59508=>15461,
-20452=>15462,
-59509=>15462,
-13376=>15463,
-59510=>15463,
-36964=>15464,
-59511=>15464,
-152925=>15465,
-59512=>15465,
-30781=>15466,
-59513=>15466,
-30804=>15467,
-59514=>15467,
-30902=>15468,
-59515=>15468,
-30795=>15469,
-59516=>15469,
-137047=>15470,
-59517=>15470,
-143817=>15471,
-59518=>15471,
-149825=>15472,
-59519=>15472,
-13978=>15473,
-59520=>15473,
-20338=>15474,
-59521=>15474,
-28634=>15475,
-59522=>15475,
-28633=>15476,
-59523=>15476,
-28702=>15478,
-59524=>15478,
-59525=>15478,
-21524=>15479,
-59526=>15479,
-147893=>15480,
-59527=>15480,
-22459=>15481,
-59528=>15481,
-22771=>15482,
-59529=>15482,
-22410=>15483,
-59530=>15483,
-40214=>15484,
-59531=>15484,
-22487=>15485,
-59532=>15485,
-28980=>15486,
-59533=>15486,
-13487=>15487,
-59534=>15487,
-147884=>15488,
-59535=>15488,
-29163=>15489,
-59536=>15489,
-158784=>15490,
-59537=>15490,
-151447=>15491,
-59538=>15491,
-137141=>15493,
-59540=>15493,
-166473=>15494,
-59541=>15494,
-24844=>15495,
-59542=>15495,
-23246=>15496,
-59543=>15496,
-23051=>15497,
-59544=>15497,
-17084=>15498,
-59545=>15498,
-148616=>15499,
-59546=>15499,
-14124=>15500,
-59547=>15500,
-19323=>15501,
-59548=>15501,
-166396=>15502,
-59549=>15502,
-37819=>15503,
-59550=>15503,
-37816=>15504,
-59551=>15504,
-137430=>15505,
-59552=>15505,
-134941=>15506,
-59553=>15506,
-33906=>15507,
-59554=>15507,
-158912=>15508,
-59555=>15508,
-136211=>15509,
-59556=>15509,
-148218=>15510,
-59557=>15510,
-142374=>15511,
-59558=>15511,
-148417=>15512,
-59559=>15512,
-22932=>15513,
-59560=>15513,
-146871=>15514,
-59561=>15514,
-157505=>15515,
-59562=>15515,
-32168=>15516,
-59563=>15516,
-155995=>15517,
-59564=>15517,
-155812=>15518,
-59565=>15518,
-149945=>15519,
-59566=>15519,
-149899=>15520,
-59567=>15520,
-166394=>15521,
-59568=>15521,
-37605=>15522,
-59569=>15522,
-29666=>15523,
-59570=>15523,
-16105=>15524,
-59571=>15524,
-29876=>15525,
-59572=>15525,
-166755=>15526,
-59573=>15526,
-137375=>15527,
-59574=>15527,
-16097=>15528,
-59575=>15528,
-150195=>15529,
-59576=>15529,
-27352=>15530,
-59577=>15530,
-29683=>15531,
-59578=>15531,
-29691=>15532,
-59579=>15532,
-16086=>15533,
-59580=>15533,
-150078=>15534,
-59581=>15534,
-150164=>15535,
-59582=>15535,
-137177=>15536,
-59583=>15536,
-150118=>15537,
-59584=>15537,
-132007=>15538,
-59585=>15538,
-136228=>15539,
-59586=>15539,
-149989=>15540,
-59587=>15540,
-29768=>15541,
-59588=>15541,
-149782=>15542,
-59589=>15542,
-28837=>15543,
-59590=>15543,
-149878=>15544,
-59591=>15544,
-37508=>15545,
-59592=>15545,
-29670=>15546,
-59593=>15546,
-37727=>15547,
-59594=>15547,
-132350=>15548,
-59595=>15548,
-37681=>15549,
-59596=>15549,
-166606=>15550,
-59597=>15550,
-166422=>15551,
-59598=>15551,
-37766=>15552,
-59599=>15552,
-166887=>15553,
-59600=>15553,
-153045=>15554,
-59601=>15554,
-18741=>15555,
-59602=>15555,
-166530=>15556,
-59603=>15556,
-29035=>15557,
-59604=>15557,
-149827=>15558,
-59605=>15558,
-134399=>15559,
-59606=>15559,
-22180=>15560,
-59607=>15560,
-132634=>15561,
-59608=>15561,
-134123=>15562,
-59609=>15562,
-134328=>15563,
-59610=>15563,
-21762=>15564,
-59611=>15564,
-31172=>15565,
-59612=>15565,
-137210=>15566,
-59613=>15566,
-32254=>15567,
-59614=>15567,
-136898=>15568,
-59615=>15568,
-150096=>15569,
-59616=>15569,
-137298=>15570,
-59617=>15570,
-17710=>15571,
-59618=>15571,
-37889=>15572,
-59619=>15572,
-14090=>15573,
-59620=>15573,
-166592=>15574,
-59621=>15574,
-149933=>15575,
-59622=>15575,
-22960=>15576,
-59623=>15576,
-137407=>15577,
-59624=>15577,
-137347=>15578,
-59625=>15578,
-160900=>15579,
-59626=>15579,
-23201=>15580,
-59627=>15580,
-14050=>15581,
-59628=>15581,
-146779=>15582,
-59629=>15582,
-14000=>15583,
-59630=>15583,
-37471=>15584,
-59631=>15584,
-23161=>15585,
-59632=>15585,
-166529=>15586,
-59633=>15586,
-137314=>15587,
-59634=>15587,
-37748=>15588,
-59635=>15588,
-15565=>15589,
-59636=>15589,
-133812=>15590,
-59637=>15590,
-19094=>15591,
-59638=>15591,
-14730=>15592,
-59639=>15592,
-20724=>15593,
-59640=>15593,
-15721=>15594,
-59641=>15594,
-15692=>15595,
-59642=>15595,
-136092=>15596,
-59643=>15596,
-29045=>15597,
-59644=>15597,
-17147=>15598,
-59645=>15598,
-164376=>15599,
-59646=>15599,
-28175=>15600,
-59647=>15600,
-168164=>15601,
-59648=>15601,
-17643=>15602,
-59649=>15602,
-27991=>15603,
-59650=>15603,
-163407=>15604,
-59651=>15604,
-28775=>15605,
-59652=>15605,
-27823=>15606,
-59653=>15606,
-15574=>15607,
-59654=>15607,
-147437=>15608,
-59655=>15608,
-146989=>15609,
-59656=>15609,
-28162=>15610,
-59657=>15610,
-28428=>15611,
-59658=>15611,
-15727=>15612,
-59659=>15612,
-132085=>15613,
-59660=>15613,
-30033=>15614,
-59661=>15614,
-14012=>15615,
-59662=>15615,
-13512=>15616,
-59663=>15616,
-18048=>15617,
-59664=>15617,
-16090=>15618,
-59665=>15618,
-18545=>15619,
-59666=>15619,
-22980=>15620,
-59667=>15620,
-37486=>15621,
-59668=>15621,
-18750=>15622,
-59669=>15622,
-36673=>15623,
-59670=>15623,
-166940=>15624,
-59671=>15624,
-158656=>15625,
-59672=>15625,
-22546=>15626,
-59673=>15626,
-22472=>15627,
-59674=>15627,
-14038=>15628,
-59675=>15628,
-136274=>15629,
-59676=>15629,
-28926=>15630,
-59677=>15630,
-148322=>15631,
-59678=>15631,
-150129=>15632,
-59679=>15632,
-143331=>15633,
-59680=>15633,
-135856=>15634,
-59681=>15634,
-140221=>15635,
-59682=>15635,
-26809=>15636,
-59683=>15636,
-26983=>15637,
-59684=>15637,
-136088=>15638,
-59685=>15638,
-144613=>15639,
-59686=>15639,
-162804=>15640,
-59687=>15640,
-145119=>15641,
-59688=>15641,
-166531=>15642,
-59689=>15642,
-145366=>15643,
-59690=>15643,
-144378=>15644,
-59691=>15644,
-150687=>15645,
-59692=>15645,
-27162=>15646,
-59693=>15646,
-145069=>15647,
-59694=>15647,
-158903=>15648,
-59695=>15648,
-33854=>15649,
-59696=>15649,
-17631=>15650,
-59697=>15650,
-17614=>15651,
-59698=>15651,
-159014=>15652,
-59699=>15652,
-159057=>15653,
-59700=>15653,
-158850=>15654,
-59701=>15654,
-159710=>15655,
-59702=>15655,
-33597=>15658,
-59705=>15658,
-137018=>15659,
-59706=>15659,
-33773=>15660,
-59707=>15660,
-158848=>15661,
-59708=>15661,
-159827=>15662,
-59709=>15662,
-137179=>15663,
-59710=>15663,
-22921=>15664,
-59711=>15664,
-23170=>15665,
-59712=>15665,
-137139=>15666,
-59713=>15666,
-23137=>15667,
-59714=>15667,
-23153=>15668,
-59715=>15668,
-137477=>15669,
-59716=>15669,
-147964=>15670,
-59717=>15670,
-14125=>15671,
-59718=>15671,
-23023=>15672,
-59719=>15672,
-137020=>15673,
-59720=>15673,
-14023=>15674,
-59721=>15674,
-29070=>15675,
-59722=>15675,
-37776=>15676,
-59723=>15676,
-26266=>15677,
-59724=>15677,
-148133=>15678,
-59725=>15678,
-23150=>15679,
-59726=>15679,
-23083=>15680,
-59727=>15680,
-148115=>15681,
-59728=>15681,
-27179=>15682,
-59729=>15682,
-147193=>15683,
-59730=>15683,
-161590=>15684,
-59731=>15684,
-148571=>15685,
-59732=>15685,
-148170=>15686,
-59733=>15686,
-28957=>15687,
-59734=>15687,
-148057=>15688,
-59735=>15688,
-166369=>15689,
-59736=>15689,
-20400=>15690,
-59737=>15690,
-159016=>15691,
-59738=>15691,
-23746=>15692,
-59739=>15692,
-148686=>15693,
-59740=>15693,
-163405=>15694,
-59741=>15694,
-148413=>15695,
-59742=>15695,
-27148=>15696,
-59743=>15696,
-148054=>15697,
-59744=>15697,
-135940=>15698,
-59745=>15698,
-28979=>15700,
-59747=>15700,
-148457=>15701,
-59748=>15701,
-15781=>15702,
-59749=>15702,
-27871=>15703,
-59750=>15703,
-194597=>15704,
-59751=>15704,
-23019=>15705,
-59754=>15705,
-24412=>15706,
-59757=>15706,
-59764=>15707,
-144128=>15707,
-31955=>15708,
-59776=>15708,
-59783=>15709,
-162548=>15709,
-59786=>15710,
-153334=>15710,
-162584=>15711,
-59790=>15711,
-36972=>15712,
-59791=>15712,
-33270=>15713,
-59795=>15713,
-30476=>15714,
-59797=>15714,
-27810=>15715,
-59799=>15715,
-22269=>15716,
-59800=>15716,
-22633=>15717,
-59828=>15717,
-26465=>15718,
-59832=>15718,
-23646=>15719,
-59838=>15719,
-22770=>15720,
-59841=>15720,
-28857=>15721,
-59843=>15721,
-26627=>15722,
-59853=>15722,
-59859=>15723,
-36795=>15723,
-59861=>15724,
-36796=>15724,
-20001=>15725,
-59871=>15725,
-31545=>15726,
-59898=>15726,
-15820=>15727,
-59902=>15727,
-29482=>15728,
-57990=>15728,
-59909=>15728,
-30048=>15729,
-59912=>15729,
-22586=>15730,
-59920=>15730,
-33446=>15731,
-59932=>15731,
-27018=>15732,
-59940=>15732,
-24803=>15733,
-59944=>15733,
-20206=>15734,
-59984=>15734,
-39364=>15735,
-60002=>15735,
-40639=>15736,
-60023=>15736,
-21249=>15737,
-60025=>15737,
-26528=>15738,
-60038=>15738,
-24808=>15739,
-60046=>15739,
-20916=>15740,
-60053=>15740,
-31363=>15741,
-60064=>15741,
-39994=>15742,
-60075=>15742,
-31432=>15743,
-60093=>15743,
-26906=>15744,
-60098=>15744,
-22956=>15745,
-60100=>15745,
-22592=>15746,
-60102=>15746,
-21610=>15747,
-60114=>15747,
-24807=>15748,
-60123=>15748,
-22138=>15749,
-60125=>15749,
-26965=>15750,
-60132=>15750,
-39983=>15751,
-60133=>15751,
-34725=>15752,
-60134=>15752,
-23584=>15753,
-60141=>15753,
-24075=>15754,
-60143=>15754,
-26398=>15755,
-60147=>15755,
-33965=>15756,
-60157=>15756,
-35713=>15757,
-60161=>15757,
-20088=>15758,
-60166=>15758,
-25283=>15759,
-60176=>15759,
-26709=>15760,
-60180=>15760,
-33533=>15762,
-60190=>15762,
-35237=>15763,
-60194=>15763,
-36768=>15764,
-60196=>15764,
-38840=>15765,
-60198=>15765,
-38983=>15766,
-60200=>15766,
-39613=>15767,
-60201=>15767,
-24497=>15768,
-60218=>15768,
-26184=>15769,
-60219=>15769,
-26303=>15770,
-60220=>15770,
-162425=>15771,
-60221=>15771,
-60225=>15773,
-149946=>15773,
-60230=>15776,
-131910=>15776,
-26382=>15777,
-60232=>15777,
-26904=>15778,
-60233=>15778,
-161367=>15779,
-60235=>15779,
-155618=>15780,
-60236=>15780,
-161278=>15781,
-60239=>15781,
-139418=>15782,
-60240=>15782,
-18640=>15783,
-60241=>15783,
-19128=>15784,
-60242=>15784,
-60244=>15785,
-166554=>15785,
-60247=>15786,
-147515=>15786,
-150085=>15787,
-60250=>15787,
-132554=>15788,
-60251=>15788,
-20946=>15789,
-60252=>15789,
-132625=>15790,
-60253=>15790,
-22943=>15791,
-60254=>15791,
-138920=>15792,
-60255=>15792,
-15294=>15793,
-60256=>15793,
-146687=>15794,
-60257=>15794,
-14747=>15795,
-60262=>15795,
-165352=>15796,
-60264=>15796,
-170441=>15797,
-60265=>15797,
-14178=>15798,
-60266=>15798,
-139715=>15799,
-60267=>15799,
-35678=>15800,
-60268=>15800,
-166734=>15801,
-60269=>15801,
-29193=>15803,
-60274=>15803,
-60276=>15804,
-134264=>15804,
-132985=>15805,
-60280=>15805,
-36570=>15806,
-60281=>15806,
-21135=>15807,
-60283=>15807,
-29041=>15808,
-60285=>15808,
-147274=>15809,
-60288=>15809,
-150183=>15810,
-60289=>15810,
-21948=>15811,
-60290=>15811,
-60293=>15812,
-158546=>15812,
-13427=>15813,
-60295=>15813,
-60297=>15814,
-161330=>15814,
-18200=>15815,
-60299=>15815,
-60303=>15816,
-149823=>15816,
-20582=>15817,
-60305=>15817,
-13563=>15818,
-60306=>15818,
-144332=>15819,
-60307=>15819,
-18300=>15821,
-60310=>15821,
-166216=>15822,
-60311=>15822,
-60315=>15823,
-138640=>15823,
-162834=>15825,
-60320=>15825,
-36950=>15826,
-60321=>15826,
-151450=>15827,
-60323=>15827,
-35682=>15828,
-60324=>15828,
-23899=>15829,
-60327=>15829,
-158711=>15830,
-60328=>15830,
-137500=>15832,
-60331=>15832,
-35562=>15833,
-60332=>15833,
-150006=>15834,
-60333=>15834,
-60335=>15835,
-147439=>15835,
-19392=>15836,
-60337=>15836,
-141083=>15837,
-60340=>15837,
-37989=>15838,
-60341=>15838,
-153569=>15839,
-60342=>15839,
-24981=>15840,
-60343=>15840,
-23079=>15841,
-60344=>15841,
-194765=>15842,
-60345=>15842,
-194566=>15843,
-60348=>15844,
-148769=>15844,
-20074=>15845,
-60350=>15845,
-149812=>15846,
-60351=>15846,
-38486=>15847,
-60352=>15847,
-28047=>15848,
-60353=>15848,
-158909=>15849,
-60354=>15849,
-35191=>15850,
-60356=>15850,
-60359=>15851,
-156689=>15851,
-31554=>15853,
-60363=>15853,
-168128=>15854,
-60364=>15854,
-133649=>15855,
-60365=>15855,
-31301=>15857,
-60369=>15857,
-39462=>15858,
-60372=>15858,
-13919=>15859,
-60374=>15859,
-156777=>15860,
-60375=>15860,
-131105=>15861,
-60376=>15861,
-31107=>15862,
-60377=>15862,
-23852=>15863,
-60380=>15863,
-144665=>15864,
-60381=>15864,
-18128=>15866,
-60384=>15866,
-30011=>15867,
-60386=>15867,
-34917=>15868,
-60387=>15868,
-22710=>15869,
-60389=>15869,
-14108=>15870,
-60390=>15870,
-140685=>15871,
-60391=>15871,
-15444=>15872,
-60394=>15872,
-37505=>15873,
-60397=>15873,
-139642=>15874,
-60398=>15874,
-37680=>15875,
-60400=>15875,
-149968=>15876,
-60402=>15876,
-27705=>15877,
-60403=>15877,
-134904=>15878,
-60406=>15878,
-34855=>15879,
-60407=>15879,
-35061=>15880,
-60408=>15880,
-141606=>15881,
-60409=>15881,
-164979=>15882,
-60410=>15882,
-137137=>15883,
-60411=>15883,
-28344=>15884,
-60412=>15884,
-150058=>15885,
-60413=>15885,
-137248=>15886,
-60414=>15886,
-14756=>15887,
-60415=>15887,
-17727=>15890,
-60419=>15890,
-26294=>15891,
-60420=>15891,
-171181=>15892,
-60421=>15892,
-170148=>15893,
-60422=>15893,
-35139=>15894,
-60423=>15894,
-16607=>15895,
-60427=>15895,
-136714=>15896,
-60428=>15896,
-14753=>15897,
-60429=>15897,
-145199=>15898,
-60430=>15898,
-164072=>15899,
-60431=>15899,
-136133=>15900,
-60432=>15900,
-29101=>15901,
-60433=>15901,
-33638=>15902,
-60434=>15902,
-60436=>15903,
-168360=>15903,
-19639=>15905,
-60438=>15905,
-159919=>15906,
-60439=>15906,
-166315=>15907,
-60440=>15907,
-147834=>15908,
-60445=>15908,
-31555=>15909,
-60446=>15909,
-31102=>15910,
-60447=>15910,
-28597=>15911,
-60449=>15911,
-172767=>15912,
-60450=>15912,
-27139=>15913,
-60451=>15913,
-164632=>15914,
-60452=>15914,
-21410=>15915,
-60453=>15915,
-159239=>15916,
-60454=>15916,
-37823=>15917,
-60455=>15917,
-26678=>15918,
-60456=>15918,
-38749=>15919,
-59389=>15919,
-60457=>15919,
-164207=>15920,
-60458=>15920,
-158133=>15921,
-60460=>15921,
-136173=>15922,
-60461=>15922,
-143919=>15923,
-60462=>15923,
-23941=>15924,
-60464=>15924,
-166960=>15925,
-60465=>15925,
-22293=>15926,
-60467=>15926,
-38947=>15927,
-60468=>15927,
-166217=>15928,
-60469=>15928,
-23979=>15929,
-60470=>15929,
-149896=>15930,
-60471=>15930,
-26046=>15931,
-60472=>15931,
-27093=>15932,
-60473=>15932,
-21458=>15933,
-60474=>15933,
-150181=>15934,
-60475=>15934,
-147329=>15935,
-60476=>15935,
-15377=>15936,
-60477=>15936,
-26422=>15937,
-60478=>15937,
-60482=>15938,
-139169=>15938,
-13770=>15939,
-60490=>15939,
-18682=>15940,
-60493=>15940,
-30728=>15942,
-60496=>15942,
-37461=>15943,
-60497=>15943,
-17394=>15944,
-60499=>15944,
-17375=>15945,
-60501=>15945,
-23032=>15946,
-60505=>15946,
-22155=>15948,
-60518=>15948,
-60520=>15949,
-169449=>15949,
-36882=>15950,
-60541=>15950,
-21953=>15951,
-60546=>15951,
-17673=>15952,
-60551=>15952,
-32383=>15953,
-60552=>15953,
-28502=>15954,
-60553=>15954,
-27313=>15955,
-60554=>15955,
-13540=>15956,
-60556=>15956,
-161949=>15957,
-60558=>15957,
-14138=>15958,
-60559=>15958,
-60562=>15960,
-163876=>15960,
-60565=>15961,
-162366=>15961,
-15851=>15962,
-60567=>15962,
-60569=>15963,
-146615=>15963,
-156248=>15964,
-60574=>15964,
-22207=>15965,
-60575=>15965,
-36366=>15966,
-60577=>15966,
-23405=>15967,
-60578=>15967,
-25566=>15968,
-60581=>15968,
-25904=>15970,
-60585=>15970,
-22061=>15971,
-60586=>15971,
-21530=>15972,
-60588=>15972,
-171416=>15973,
-60591=>15973,
-19581=>15974,
-60592=>15974,
-22050=>15975,
-60593=>15975,
-22046=>15976,
-60594=>15976,
-32585=>15977,
-60595=>15977,
-22901=>15978,
-60597=>15978,
-146752=>15979,
-60598=>15979,
-34672=>15980,
-60599=>15980,
-33047=>15981,
-60604=>15981,
-40286=>15982,
-60605=>15982,
-36120=>15983,
-60606=>15983,
-30267=>15984,
-60607=>15984,
-40005=>15985,
-60608=>15985,
-30286=>15986,
-60609=>15986,
-30649=>15987,
-60610=>15987,
-37701=>15988,
-60611=>15988,
-21554=>15989,
-60612=>15989,
-33096=>15990,
-60613=>15990,
-33527=>15991,
-60614=>15991,
-22053=>15992,
-60615=>15992,
-33074=>15993,
-60616=>15993,
-33816=>15994,
-60617=>15994,
-32957=>15995,
-60618=>15995,
-21994=>15996,
-60619=>15996,
-31074=>15997,
-60620=>15997,
-22083=>15998,
-60621=>15998,
-21526=>15999,
-60622=>15999,
-134813=>16000,
-60623=>16000,
-13774=>16001,
-60624=>16001,
-22021=>16002,
-57509=>16002,
-60625=>16002,
-22001=>16003,
-60626=>16003,
-26353=>16004,
-60627=>16004,
-164578=>16005,
-60628=>16005,
-13869=>16006,
-60629=>16006,
-30004=>16007,
-60630=>16007,
-22000=>16008,
-60631=>16008,
-21946=>16009,
-60632=>16009,
-21655=>16010,
-60633=>16010,
-21874=>16011,
-60634=>16011,
-134209=>16012,
-60635=>16012,
-134294=>16013,
-60636=>16013,
-24272=>16014,
-57652=>16014,
-60637=>16014,
-134774=>16015,
-60639=>16015,
-142434=>16016,
-60640=>16016,
-134818=>16017,
-60641=>16017,
-40619=>16018,
-60642=>16018,
-32090=>16019,
-60643=>16019,
-135285=>16021,
-60645=>16021,
-25245=>16022,
-60646=>16022,
-38765=>16023,
-60647=>16023,
-21652=>16024,
-60648=>16024,
-36045=>16025,
-60649=>16025,
-29174=>16026,
-60650=>16026,
-37238=>16027,
-60651=>16027,
-25596=>16028,
-60652=>16028,
-25529=>16029,
-60653=>16029,
-25598=>16030,
-60654=>16030,
-21865=>16031,
-60655=>16031,
-142147=>16032,
-60656=>16032,
-40050=>16033,
-60657=>16033,
-143027=>16034,
-60658=>16034,
-20890=>16035,
-60659=>16035,
-13535=>16036,
-60660=>16036,
-134567=>16037,
-60661=>16037,
-20903=>16038,
-60662=>16038,
-21581=>16039,
-60663=>16039,
-21790=>16040,
-60664=>16040,
-21779=>16041,
-60665=>16041,
-30310=>16042,
-60666=>16042,
-36397=>16043,
-60667=>16043,
-157834=>16044,
-60668=>16044,
-30129=>16045,
-60669=>16045,
-32950=>16046,
-60670=>16046,
-34820=>16047,
-60671=>16047,
-35015=>16049,
-60673=>16049,
-33206=>16050,
-60674=>16050,
-33820=>16051,
-60675=>16051,
-17644=>16052,
-60677=>16052,
-29444=>16053,
-60678=>16053,
-33547=>16054,
-60681=>16054,
-22139=>16055,
-60683=>16055,
-37232=>16056,
-60690=>16056,
-37384=>16057,
-60692=>16057,
-134905=>16058,
-60696=>16058,
-29286=>16059,
-60697=>16059,
-18254=>16060,
-60699=>16060,
-60701=>16061,
-163833=>16061,
-16634=>16062,
-60703=>16062,
-40029=>16063,
-60704=>16063,
-25887=>16064,
-60705=>16064,
-18675=>16065,
-60707=>16065,
-149472=>16066,
-60708=>16066,
-171388=>16067,
-60709=>16067,
-60713=>16069,
-161187=>16069,
-60715=>16070,
-155720=>16071,
-60716=>16071,
-29091=>16072,
-60718=>16072,
-32398=>16073,
-60719=>16073,
-40272=>16074,
-60720=>16074,
-13687=>16075,
-60723=>16075,
-27826=>16076,
-60725=>16076,
-21351=>16077,
-60726=>16077,
-14812=>16078,
-60728=>16078,
-60731=>16079,
-149016=>16079,
-33325=>16080,
-60734=>16080,
-21579=>16081,
-60735=>16081,
-60739=>16082,
-14930=>16083,
-60740=>16083,
-29556=>16084,
-60742=>16084,
-171692=>16085,
-60743=>16085,
-19721=>16086,
-60744=>16086,
-39917=>16087,
-60745=>16087,
-19547=>16089,
-60748=>16089,
-171998=>16090,
-60751=>16090,
-33884=>16091,
-60752=>16091,
-60754=>16092,
-160434=>16092,
-25390=>16093,
-60757=>16093,
-32037=>16094,
-60758=>16094,
-14890=>16095,
-60761=>16095,
-36872=>16096,
-60762=>16096,
-21196=>16097,
-60763=>16097,
-15988=>16098,
-60764=>16098,
-13946=>16099,
-60765=>16099,
-17897=>16100,
-60766=>16100,
-132238=>16101,
-60767=>16101,
-30272=>16102,
-60768=>16102,
-23280=>16103,
-60769=>16103,
-134838=>16104,
-60770=>16104,
-30842=>16105,
-60771=>16105,
-18358=>16106,
-163630=>16106,
-60772=>16106,
-22695=>16107,
-60773=>16107,
-16575=>16108,
-60774=>16108,
-22140=>16109,
-60775=>16109,
-39819=>16110,
-60776=>16110,
-23924=>16111,
-60777=>16111,
-30292=>16112,
-60778=>16112,
-173108=>16113,
-60779=>16113,
-40581=>16114,
-60780=>16114,
-19681=>16115,
-60781=>16115,
-14331=>16117,
-60783=>16117,
-24857=>16118,
-60784=>16118,
-148466=>16119,
-60786=>16119,
-60787=>16120,
-22109=>16121,
-60788=>16121,
-171526=>16122,
-60792=>16122,
-21044=>16123,
-60793=>16123,
-13741=>16124,
-60795=>16124,
-40316=>16126,
-60797=>16126,
-31830=>16127,
-60798=>16127,
-39737=>16128,
-60799=>16128,
-22494=>16129,
-60800=>16129,
-23635=>16130,
-60802=>16130,
-25811=>16131,
-60803=>16131,
-169168=>16132,
-60804=>16132,
-156469=>16133,
-60805=>16133,
-34477=>16134,
-60807=>16134,
-134440=>16135,
-60808=>16135,
-134513=>16136,
-60811=>16136,
-60812=>16137,
-20990=>16138,
-60813=>16138,
-139023=>16139,
-60814=>16139,
-23950=>16140,
-60815=>16140,
-38659=>16141,
-60816=>16141,
-138705=>16142,
-60817=>16142,
-40577=>16143,
-60818=>16143,
-36940=>16144,
-60819=>16144,
-31519=>16145,
-60820=>16145,
-39682=>16146,
-60821=>16146,
-23761=>16147,
-60822=>16147,
-31651=>16148,
-60823=>16148,
-25192=>16149,
-60824=>16149,
-25397=>16150,
-60825=>16150,
-39679=>16151,
-60826=>16151,
-31695=>16152,
-60827=>16152,
-39722=>16153,
-60828=>16153,
-31870=>16154,
-60829=>16154,
-31810=>16156,
-60831=>16156,
-31878=>16157,
-60832=>16157,
-39957=>16158,
-60833=>16158,
-31740=>16159,
-60834=>16159,
-39689=>16160,
-60835=>16160,
-39982=>16162,
-40794=>16163,
-60839=>16163,
-21875=>16164,
-60840=>16164,
-23491=>16165,
-60841=>16165,
-20477=>16166,
-60842=>16166,
-40600=>16167,
-60843=>16167,
-20466=>16168,
-60844=>16168,
-21088=>16169,
-60845=>16169,
-21201=>16170,
-60847=>16170,
-22375=>16171,
-60848=>16171,
-20566=>16172,
-60849=>16172,
-22967=>16173,
-60850=>16173,
-24082=>16174,
-60851=>16174,
-38856=>16175,
-60852=>16175,
-40363=>16176,
-60853=>16176,
-36700=>16177,
-60854=>16177,
-21609=>16178,
-60855=>16178,
-38836=>16179,
-60856=>16179,
-39232=>16180,
-60857=>16180,
-38842=>16181,
-60858=>16181,
-21292=>16182,
-60859=>16182,
-24880=>16183,
-60860=>16183,
-26924=>16184,
-60861=>16184,
-21466=>16185,
-60862=>16185,
-39946=>16186,
-60863=>16186,
-40194=>16187,
-60864=>16187,
-19515=>16188,
-60865=>16188,
-38465=>16189,
-60866=>16189,
-27008=>16190,
-60867=>16190,
-20646=>16191,
-60868=>16191,
-30022=>16192,
-60869=>16192,
-137069=>16193,
-60870=>16193,
-39386=>16194,
-60871=>16194,
-21107=>16195,
-60872=>16195,
-60873=>16196,
-37209=>16197,
-60874=>16197,
-38529=>16198,
-60875=>16198,
-37212=>16199,
-60876=>16199,
-60877=>16200,
-37201=>16201,
-60878=>16201,
-167575=>16202,
-60879=>16202,
-25471=>16203,
-60880=>16203,
-27338=>16204,
-60882=>16204,
-22033=>16205,
-60883=>16205,
-37262=>16206,
-60884=>16206,
-30074=>16207,
-60885=>16207,
-25221=>16208,
-60886=>16208,
-29519=>16209,
-60888=>16209,
-31856=>16210,
-60889=>16210,
-154657=>16211,
-60890=>16211,
-60892=>16212,
-30422=>16213,
-60894=>16213,
-39837=>16214,
-60895=>16214,
-20010=>16215,
-60896=>16215,
-134356=>16216,
-60897=>16216,
-33726=>16217,
-60898=>16217,
-34882=>16218,
-60899=>16218,
-60900=>16219,
-23626=>16220,
-60901=>16220,
-27072=>16221,
-60902=>16221,
-21023=>16224,
-60905=>16224,
-24053=>16225,
-60906=>16225,
-20174=>16226,
-60907=>16226,
-27697=>16227,
-60908=>16227,
-131570=>16228,
-60909=>16228,
-20281=>16229,
-60910=>16229,
-21660=>16230,
-60911=>16230,
-21146=>16232,
-60913=>16232,
-36226=>16233,
-60914=>16233,
-13822=>16234,
-60915=>16234,
-13811=>16236,
-60917=>16236,
-60918=>16237,
-27474=>16238,
-60919=>16238,
-37244=>16239,
-60920=>16239,
-40869=>16240,
-60921=>16240,
-39831=>16241,
-60922=>16241,
-38958=>16242,
-60923=>16242,
-39092=>16243,
-60924=>16243,
-39610=>16244,
-60925=>16244,
-40616=>16245,
-60926=>16245,
-40580=>16246,
-60927=>16246,
-31508=>16247,
-60929=>16247,
-60930=>16248,
-27642=>16249,
-60931=>16249,
-34840=>16250,
-60932=>16250,
-32632=>16251,
-60933=>16251,
-60934=>16252,
-22048=>16253,
-60935=>16253,
-173642=>16254,
-60936=>16254,
-36471=>16255,
-60937=>16255,
-40787=>16256,
-60938=>16256,
-60939=>16257,
-36308=>16258,
-60940=>16258,
-36431=>16259,
-60941=>16259,
-40476=>16260,
-60942=>16260,
-36353=>16261,
-60943=>16261,
-25218=>16262,
-60944=>16262,
-164733=>16263,
-60945=>16263,
-36392=>16264,
-60946=>16264,
-36469=>16265,
-60947=>16265,
-31443=>16266,
-60948=>16266,
-31294=>16267,
-60950=>16267,
-30936=>16268,
-60951=>16268,
-27882=>16269,
-60952=>16269,
-35431=>16270,
-60953=>16270,
-30215=>16271,
-60954=>16271,
-40742=>16272,
-60956=>16272,
-27854=>16273,
-60957=>16273,
-34774=>16274,
-60958=>16274,
-30147=>16275,
-60959=>16275,
-172722=>16276,
-60960=>16276,
-30803=>16277,
-60961=>16277,
-36108=>16278,
-60963=>16278,
-29410=>16279,
-60964=>16279,
-29553=>16280,
-60965=>16280,
-35629=>16281,
-60966=>16281,
-29442=>16282,
-60967=>16282,
-29937=>16283,
-60968=>16283,
-36075=>16284,
-60969=>16284,
-150203=>16285,
-60970=>16285,
-34351=>16286,
-60971=>16286,
-24506=>16287,
-60972=>16287,
-34976=>16288,
-60973=>16288,
-17591=>16289,
-60974=>16289,
-60975=>16290,
-159237=>16291,
-60977=>16291,
-60978=>16292,
-35454=>16293,
-60979=>16293,
-140571=>16294,
-60980=>16294,
-60981=>16295,
-24829=>16296,
-60982=>16296,
-30311=>16297,
-60983=>16297,
-39639=>16298,
-60984=>16298,
-40260=>16299,
-60985=>16299,
-37742=>16300,
-58859=>16300,
-60986=>16300,
-39823=>16301,
-60987=>16301,
-34805=>16302,
-60988=>16302,
-60989=>16303,
-36087=>16305,
-60991=>16305,
-29484=>16306,
-60992=>16306,
-38689=>16307,
-60993=>16307,
-39856=>16308,
-60994=>16308,
-13782=>16309,
-60995=>16309,
-29362=>16310,
-60996=>16310,
-19463=>16311,
-60997=>16311,
-31825=>16312,
-60998=>16312,
-39242=>16313,
-60999=>16313,
-24921=>16314,
-61001=>16314,
-19460=>16315,
-61002=>16315,
-40598=>16316,
-61003=>16316,
-24957=>16317,
-61004=>16317,
-61005=>16318,
-22367=>16319,
-61006=>16319,
-24943=>16320,
-61007=>16320,
-25254=>16321,
-61008=>16321,
-25145=>16322,
-61009=>16322,
-14940=>16324,
-61011=>16324,
-25058=>16325,
-61012=>16325,
-21418=>16326,
-61013=>16326,
-25444=>16327,
-61015=>16327,
-26626=>16328,
-61016=>16328,
-13778=>16329,
-61017=>16329,
-23895=>16330,
-61018=>16330,
-36826=>16331,
-61020=>16331,
-167481=>16332,
-61021=>16332,
-61022=>16333,
-20697=>16334,
-61023=>16334,
-30982=>16335,
-61025=>16335,
-21298=>16336,
-61026=>16336,
-38456=>16337,
-61027=>16337,
-134971=>16338,
-61028=>16338,
-16485=>16339,
-61029=>16339,
-61030=>16340,
-30718=>16341,
-61031=>16341,
-61032=>16342,
-31938=>16343,
-61033=>16343,
-155418=>16344,
-61034=>16344,
-31962=>16345,
-61035=>16345,
-31277=>16346,
-61036=>16346,
-32870=>16347,
-61037=>16347,
-32867=>16348,
-61038=>16348,
-32077=>16349,
-61039=>16349,
-29957=>16350,
-61040=>16350,
-29938=>16351,
-61041=>16351,
-35220=>16352,
-61042=>16352,
-33306=>16353,
-61043=>16353,
-26380=>16354,
-61044=>16354,
-32866=>16355,
-61045=>16355,
-160902=>16356,
-61046=>16356,
-32859=>16357,
-61047=>16357,
-29936=>16358,
-61048=>16358,
-33027=>16359,
-61049=>16359,
-30500=>16360,
-61050=>16360,
-35209=>16361,
-61051=>16361,
-157644=>16362,
-61052=>16362,
-30035=>16363,
-61053=>16363,
-34729=>16364,
-61055=>16364,
-34766=>16365,
-61056=>16365,
-33224=>16366,
-61057=>16366,
-34700=>16367,
-61058=>16367,
-35401=>16368,
-61059=>16368,
-36013=>16369,
-61060=>16369,
-35651=>16370,
-61061=>16370,
-30507=>16371,
-61062=>16371,
-29944=>16372,
-61063=>16372,
-34010=>16373,
-61064=>16373,
-27058=>16374,
-61066=>16374,
-36262=>16375,
-61067=>16375,
-61068=>16376,
-35241=>16377,
-58392=>16377,
-61069=>16377,
-28089=>16379,
-61071=>16379,
-34753=>16380,
-61072=>16380,
-147473=>16381,
-61073=>16381,
-29927=>16382,
-61074=>16382,
-15835=>16383,
-61075=>16383,
-29046=>16384,
-61076=>16384,
-24740=>16385,
-57702=>16385,
-61077=>16385,
-24988=>16386,
-61078=>16386,
-15569=>16387,
-61079=>16387,
-24695=>16389,
-61081=>16389,
-61082=>16390,
-32625=>16391,
-61083=>16391,
-194850=>16392,
-24809=>16393,
-61086=>16393,
-19326=>16394,
-61087=>16394,
-132423=>16395,
-57344=>16395,
-37595=>16396,
-57345=>16396,
-132575=>16397,
-57346=>16397,
-147397=>16398,
-57347=>16398,
-34124=>16399,
-57348=>16399,
-17077=>16400,
-57349=>16400,
-29679=>16401,
-57350=>16401,
-20917=>16402,
-57351=>16402,
-13897=>16403,
-57352=>16403,
-149826=>16404,
-57353=>16404,
-166372=>16405,
-57354=>16405,
-37700=>16406,
-57355=>16406,
-137691=>16407,
-57356=>16407,
-33518=>16408,
-57357=>16408,
-146632=>16409,
-57358=>16409,
-30780=>16410,
-57359=>16410,
-26436=>16411,
-57360=>16411,
-25311=>16412,
-57361=>16412,
-149811=>16413,
-57362=>16413,
-166314=>16414,
-57363=>16414,
-131744=>16415,
-57364=>16415,
-158643=>16416,
-57365=>16416,
-135941=>16417,
-57366=>16417,
-20395=>16418,
-57367=>16418,
-140525=>16419,
-57368=>16419,
-20488=>16420,
-57369=>16420,
-159017=>16421,
-57370=>16421,
-162436=>16422,
-57371=>16422,
-144896=>16423,
-57372=>16423,
-150193=>16424,
-57373=>16424,
-140563=>16425,
-57374=>16425,
-131966=>16427,
-57376=>16427,
-24484=>16428,
-57377=>16428,
-131968=>16429,
-57378=>16429,
-131911=>16430,
-57379=>16430,
-28379=>16431,
-57380=>16431,
-132127=>16432,
-57381=>16432,
-20702=>16433,
-20737=>16434,
-57383=>16434,
-13434=>16435,
-57384=>16435,
-20750=>16436,
-57385=>16436,
-39020=>16437,
-57386=>16437,
-14147=>16438,
-57387=>16438,
-33814=>16439,
-57388=>16439,
-149924=>16440,
-57389=>16440,
-132231=>16441,
-57390=>16441,
-20832=>16442,
-57391=>16442,
-144308=>16443,
-57392=>16443,
-20842=>16444,
-57393=>16444,
-134143=>16445,
-57394=>16445,
-139516=>16446,
-57395=>16446,
-131813=>16447,
-57396=>16447,
-140592=>16448,
-57397=>16448,
-132494=>16449,
-57398=>16449,
-143923=>16450,
-57399=>16450,
-137603=>16451,
-57400=>16451,
-23426=>16452,
-57401=>16452,
-34685=>16453,
-57402=>16453,
-132531=>16454,
-57403=>16454,
-146585=>16455,
-57404=>16455,
-20914=>16456,
-57405=>16456,
-20920=>16457,
-57406=>16457,
-40244=>16458,
-57407=>16458,
-20937=>16459,
-57408=>16459,
-20943=>16460,
-57409=>16460,
-20945=>16461,
-57410=>16461,
-15580=>16462,
-57411=>16462,
-20947=>16463,
-57412=>16463,
-150182=>16464,
-57413=>16464,
-20915=>16465,
-57414=>16465,
-20973=>16468,
-57417=>16468,
-33741=>16469,
-57418=>16469,
-26942=>16470,
-57419=>16470,
-145197=>16471,
-57420=>16471,
-24443=>16472,
-57421=>16472,
-21003=>16473,
-57422=>16473,
-21030=>16474,
-57423=>16474,
-21052=>16475,
-57424=>16475,
-21173=>16476,
-57425=>16476,
-21079=>16477,
-57426=>16477,
-21140=>16478,
-57427=>16478,
-21177=>16479,
-57428=>16479,
-21189=>16480,
-57429=>16480,
-31765=>16481,
-57430=>16481,
-34114=>16482,
-57431=>16482,
-21216=>16483,
-57432=>16483,
-34317=>16484,
-57433=>16484,
-158483=>16485,
-57434=>16485,
-194601=>16486,
-166622=>16487,
-57436=>16487,
-21833=>16488,
-57437=>16488,
-28377=>16489,
-57438=>16489,
-147328=>16490,
-57439=>16490,
-133460=>16491,
-57440=>16491,
-147436=>16492,
-57441=>16492,
-21299=>16493,
-57442=>16493,
-134114=>16495,
-57444=>16495,
-27851=>16496,
-57445=>16496,
-136998=>16497,
-57446=>16497,
-26651=>16498,
-57447=>16498,
-29653=>16499,
-57448=>16499,
-24650=>16500,
-57449=>16500,
-16042=>16501,
-57450=>16501,
-14540=>16502,
-57451=>16502,
-136936=>16503,
-57452=>16503,
-29149=>16504,
-57453=>16504,
-17570=>16505,
-57454=>16505,
-21357=>16506,
-57455=>16506,
-21364=>16507,
-57456=>16507,
-165547=>16508,
-57457=>16508,
-21374=>16509,
-57458=>16509,
-194610=>16510,
-136598=>16511,
-57460=>16511,
-136723=>16512,
-57461=>16512,
-30694=>16513,
-57462=>16513,
-21395=>16514,
-57463=>16514,
-166555=>16515,
-57464=>16515,
-21408=>16516,
-57465=>16516,
-21419=>16517,
-57466=>16517,
-21422=>16518,
-57467=>16518,
-29607=>16519,
-57468=>16519,
-153458=>16520,
-57469=>16520,
-16217=>16521,
-57470=>16521,
-29596=>16522,
-57471=>16522,
-21441=>16523,
-57472=>16523,
-21445=>16524,
-57473=>16524,
-27721=>16525,
-57474=>16525,
-20041=>16526,
-57475=>16526,
-22526=>16527,
-57476=>16527,
-21465=>16528,
-57477=>16528,
-15019=>16529,
-57478=>16529,
-134031=>16530,
-57479=>16530,
-21472=>16531,
-57480=>16531,
-147435=>16532,
-57481=>16532,
-142755=>16533,
-57482=>16533,
-21494=>16534,
-57483=>16534,
-134263=>16535,
-57484=>16535,
-21523=>16536,
-57485=>16536,
-28793=>16537,
-57486=>16537,
-21803=>16538,
-57487=>16538,
-26199=>16539,
-57488=>16539,
-27995=>16540,
-57489=>16540,
-21613=>16541,
-57490=>16541,
-158547=>16542,
-57491=>16542,
-134516=>16543,
-57492=>16543,
-21853=>16544,
-57493=>16544,
-21647=>16545,
-57494=>16545,
-21668=>16546,
-57495=>16546,
-18342=>16547,
-57496=>16547,
-136973=>16548,
-57497=>16548,
-134877=>16549,
-57498=>16549,
-15796=>16550,
-57499=>16550,
-134477=>16551,
-57500=>16551,
-166332=>16552,
-57501=>16552,
-140952=>16553,
-57502=>16553,
-21831=>16554,
-57503=>16554,
-19693=>16555,
-57504=>16555,
-21551=>16556,
-57505=>16556,
-29719=>16557,
-57506=>16557,
-21894=>16558,
-57507=>16558,
-21929=>16559,
-57508=>16559,
-137431=>16561,
-57510=>16561,
-147514=>16562,
-57511=>16562,
-17746=>16563,
-57512=>16563,
-148533=>16564,
-57513=>16564,
-26291=>16565,
-57514=>16565,
-135348=>16566,
-57515=>16566,
-22071=>16567,
-57516=>16567,
-26317=>16568,
-57517=>16568,
-144010=>16569,
-57518=>16569,
-26276=>16570,
-57519=>16570,
-22093=>16572,
-57521=>16572,
-22095=>16573,
-57522=>16573,
-30961=>16574,
-57523=>16574,
-22257=>16575,
-57524=>16575,
-38791=>16576,
-57525=>16576,
-21502=>16577,
-57526=>16577,
-22272=>16578,
-57527=>16578,
-22255=>16579,
-57528=>16579,
-22253=>16580,
-57529=>16580,
-166758=>16581,
-57530=>16581,
-13859=>16582,
-57531=>16582,
-135759=>16583,
-57532=>16583,
-22342=>16584,
-57533=>16584,
-147877=>16585,
-57534=>16585,
-27758=>16586,
-57535=>16586,
-28811=>16587,
-57536=>16587,
-22338=>16588,
-57537=>16588,
-14001=>16589,
-57538=>16589,
-158846=>16590,
-57539=>16590,
-22502=>16591,
-57540=>16591,
-136214=>16592,
-57541=>16592,
-22531=>16593,
-57542=>16593,
-136276=>16594,
-57543=>16594,
-148323=>16595,
-57544=>16595,
-22566=>16596,
-57545=>16596,
-150517=>16597,
-57546=>16597,
-22559=>16598,
-22698=>16599,
-57548=>16599,
-13665=>16600,
-57549=>16600,
-22752=>16601,
-57550=>16601,
-22748=>16602,
-57551=>16602,
-135740=>16603,
-57552=>16603,
-22779=>16604,
-57553=>16604,
-23551=>16605,
-57554=>16605,
-22339=>16606,
-57555=>16606,
-172368=>16607,
-57556=>16607,
-148088=>16608,
-57557=>16608,
-37843=>16609,
-57558=>16609,
-13729=>16610,
-57559=>16610,
-22815=>16611,
-57560=>16611,
-26790=>16612,
-57561=>16612,
-14019=>16613,
-57562=>16613,
-28249=>16614,
-57563=>16614,
-136766=>16615,
-57564=>16615,
-23076=>16616,
-57565=>16616,
-136850=>16618,
-57567=>16618,
-34053=>16619,
-57568=>16619,
-22985=>16620,
-57569=>16620,
-134478=>16621,
-57570=>16621,
-158849=>16622,
-57571=>16622,
-159018=>16623,
-57572=>16623,
-137180=>16624,
-57573=>16624,
-23001=>16625,
-57574=>16625,
-137211=>16626,
-57575=>16626,
-137138=>16627,
-57576=>16627,
-159142=>16628,
-57577=>16628,
-28017=>16629,
-57578=>16629,
-137256=>16630,
-57579=>16630,
-136917=>16631,
-57580=>16631,
-23033=>16632,
-57581=>16632,
-159301=>16633,
-57582=>16633,
-23211=>16634,
-57583=>16634,
-23139=>16635,
-57584=>16635,
-14054=>16636,
-57585=>16636,
-149929=>16637,
-57586=>16637,
-14088=>16639,
-57588=>16639,
-23190=>16640,
-57589=>16640,
-29797=>16641,
-57590=>16641,
-23251=>16642,
-57591=>16642,
-159649=>16643,
-57592=>16643,
-140628=>16644,
-57593=>16644,
-137489=>16645,
-57595=>16645,
-14130=>16646,
-57596=>16646,
-136888=>16647,
-57597=>16647,
-24195=>16648,
-57598=>16648,
-21200=>16649,
-57599=>16649,
-23414=>16650,
-57600=>16650,
-25992=>16651,
-57601=>16651,
-23420=>16652,
-57602=>16652,
-162318=>16653,
-57603=>16653,
-16388=>16654,
-57604=>16654,
-18525=>16655,
-57605=>16655,
-131588=>16656,
-57606=>16656,
-23509=>16657,
-57607=>16657,
-137780=>16658,
-57609=>16658,
-154060=>16659,
-57610=>16659,
-132517=>16660,
-57611=>16660,
-23539=>16661,
-57612=>16661,
-23453=>16662,
-57613=>16662,
-19728=>16663,
-57614=>16663,
-23557=>16664,
-57615=>16664,
-138052=>16665,
-57616=>16665,
-23571=>16666,
-57617=>16666,
-29646=>16667,
-57618=>16667,
-23572=>16668,
-57619=>16668,
-138405=>16669,
-57620=>16669,
-158504=>16670,
-57621=>16670,
-23625=>16671,
-57622=>16671,
-18653=>16672,
-57623=>16672,
-23685=>16673,
-57624=>16673,
-23785=>16674,
-57625=>16674,
-23791=>16675,
-57626=>16675,
-23947=>16676,
-57627=>16676,
-138745=>16677,
-57628=>16677,
-138807=>16678,
-57629=>16678,
-23824=>16679,
-57630=>16679,
-23832=>16680,
-57631=>16680,
-23878=>16681,
-57632=>16681,
-138916=>16682,
-57633=>16682,
-23738=>16683,
-57634=>16683,
-24023=>16684,
-57635=>16684,
-33532=>16685,
-57636=>16685,
-14381=>16686,
-57637=>16686,
-149761=>16687,
-57638=>16687,
-139337=>16688,
-57639=>16688,
-139635=>16689,
-57640=>16689,
-33415=>16690,
-57641=>16690,
-14390=>16691,
-57642=>16691,
-15298=>16692,
-57643=>16692,
-24110=>16693,
-57644=>16693,
-27274=>16694,
-57645=>16694,
-57647=>16696,
-148668=>16697,
-57648=>16697,
-134355=>16698,
-57649=>16698,
-21414=>16699,
-57650=>16699,
-20151=>16700,
-57651=>16700,
-21416=>16702,
-57653=>16702,
-137073=>16703,
-57654=>16703,
-24073=>16704,
-57655=>16704,
-57656=>16705,
-164994=>16706,
-57657=>16706,
-24313=>16707,
-57658=>16707,
-24315=>16708,
-57659=>16708,
-14496=>16709,
-57660=>16709,
-24316=>16710,
-57661=>16710,
-26686=>16711,
-57662=>16711,
-37915=>16712,
-57663=>16712,
-24333=>16713,
-57664=>16713,
-131521=>16714,
-57665=>16714,
-194708=>16715,
-57666=>16715,
-15070=>16716,
-57667=>16716,
-135994=>16717,
-57669=>16717,
-24378=>16718,
-57670=>16718,
-157832=>16719,
-57671=>16719,
-140240=>16720,
-57672=>16720,
-140401=>16721,
-57674=>16721,
-24419=>16722,
-57675=>16722,
-159342=>16723,
-57677=>16723,
-24434=>16724,
-57678=>16724,
-37696=>16725,
-57679=>16725,
-166454=>16726,
-57680=>16726,
-24487=>16727,
-57681=>16727,
-23990=>16728,
-57682=>16728,
-15711=>16729,
-57683=>16729,
-152144=>16730,
-57684=>16730,
-139114=>16731,
-57685=>16731,
-159992=>16732,
-57686=>16732,
-140904=>16733,
-57687=>16733,
-37334=>16734,
-57688=>16734,
-131742=>16735,
-57689=>16735,
-166441=>16736,
-57690=>16736,
-24625=>16737,
-57691=>16737,
-26245=>16738,
-57692=>16738,
-14691=>16739,
-57694=>16739,
-15815=>16740,
-57695=>16740,
-13881=>16741,
-57696=>16741,
-22416=>16742,
-57697=>16742,
-141236=>16743,
-57698=>16743,
-31089=>16744,
-57699=>16744,
-15936=>16745,
-57700=>16745,
-24734=>16746,
-57701=>16746,
-24810=>16748,
-149890=>16749,
-57704=>16749,
-149903=>16750,
-57705=>16750,
-162387=>16751,
-57706=>16751,
-29860=>16752,
-57707=>16752,
-20705=>16753,
-57708=>16753,
-23200=>16754,
-57709=>16754,
-24932=>16755,
-57710=>16755,
-24898=>16756,
-57712=>16756,
-194726=>16757,
-57713=>16757,
-159442=>16758,
-57714=>16758,
-24961=>16759,
-57715=>16759,
-20980=>16760,
-57716=>16760,
-132694=>16761,
-57717=>16761,
-24967=>16762,
-57718=>16762,
-23466=>16763,
-57719=>16763,
-147383=>16764,
-57720=>16764,
-141407=>16765,
-57721=>16765,
-25043=>16766,
-57722=>16766,
-166813=>16767,
-57723=>16767,
-170333=>16768,
-57724=>16768,
-25040=>16769,
-57725=>16769,
-14642=>16770,
-57726=>16770,
-141696=>16771,
-57727=>16771,
-141505=>16772,
-57728=>16772,
-24611=>16773,
-57729=>16773,
-24924=>16774,
-57730=>16774,
-25886=>16775,
-57731=>16775,
-25483=>16776,
-57732=>16776,
-131352=>16777,
-57733=>16777,
-25285=>16778,
-57734=>16778,
-137072=>16779,
-57735=>16779,
-25301=>16780,
-57736=>16780,
-142861=>16781,
-57737=>16781,
-25452=>16782,
-57738=>16782,
-149983=>16783,
-57739=>16783,
-14871=>16784,
-57740=>16784,
-25656=>16785,
-57741=>16785,
-25592=>16786,
-57742=>16786,
-136078=>16787,
-57743=>16787,
-137212=>16788,
-57744=>16788,
-28554=>16789,
-57746=>16789,
-142902=>16790,
-57747=>16790,
-153373=>16792,
-57750=>16792,
-25825=>16793,
-57751=>16793,
-25829=>16794,
-57752=>16794,
-38011=>16795,
-57753=>16795,
-14950=>16796,
-57754=>16796,
-25658=>16797,
-57755=>16797,
-14935=>16798,
-57756=>16798,
-25933=>16799,
-57757=>16799,
-28438=>16800,
-57758=>16800,
-150056=>16801,
-57759=>16801,
-150051=>16802,
-57760=>16802,
-25989=>16803,
-57761=>16803,
-25965=>16804,
-57762=>16804,
-25951=>16805,
-57763=>16805,
-26037=>16807,
-57765=>16807,
-149824=>16808,
-57766=>16808,
-19255=>16809,
-57767=>16809,
-26065=>16810,
-57768=>16810,
-16600=>16811,
-57769=>16811,
-137257=>16812,
-57770=>16812,
-57771=>16813,
-26083=>16814,
-57772=>16814,
-24543=>16815,
-57773=>16815,
-144384=>16816,
-57774=>16816,
-26136=>16817,
-57775=>16817,
-57776=>16818,
-143863=>16818,
-57777=>16819,
-143864=>16819,
-26180=>16820,
-57778=>16820,
-57779=>16821,
-143780=>16821,
-57780=>16822,
-143781=>16822,
-26187=>16823,
-57781=>16823,
-134773=>16824,
-57782=>16824,
-26215=>16825,
-57783=>16825,
-152038=>16826,
-57784=>16826,
-26227=>16827,
-57785=>16827,
-64018=>16828,
-143921=>16829,
-57788=>16829,
-165364=>16830,
-57789=>16830,
-143816=>16831,
-57790=>16831,
-152339=>16832,
-57791=>16832,
-30661=>16833,
-57792=>16833,
-141559=>16834,
-57793=>16834,
-39332=>16835,
-57794=>16835,
-26370=>16836,
-57795=>16836,
-148380=>16837,
-57796=>16837,
-150049=>16838,
-57797=>16838,
-27130=>16839,
-57799=>16839,
-145346=>16840,
-57800=>16840,
-194779=>16841,
-26471=>16842,
-57802=>16842,
-26466=>16843,
-57803=>16843,
-147917=>16844,
-57804=>16844,
-168173=>16845,
-57805=>16845,
-26583=>16846,
-57806=>16846,
-17641=>16847,
-57807=>16847,
-26658=>16848,
-57808=>16848,
-28240=>16849,
-57809=>16849,
-37436=>16850,
-57810=>16850,
-26625=>16851,
-57811=>16851,
-144358=>16852,
-57812=>16852,
-159136=>16853,
-57813=>16853,
-26717=>16854,
-57814=>16854,
-144495=>16855,
-57815=>16855,
-27105=>16856,
-57816=>16856,
-27147=>16857,
-57817=>16857,
-166623=>16858,
-57818=>16858,
-26995=>16859,
-57819=>16859,
-26819=>16860,
-57820=>16860,
-144845=>16861,
-57821=>16861,
-26881=>16862,
-57822=>16862,
-26880=>16863,
-57823=>16863,
-14849=>16864,
-57825=>16864,
-144956=>16865,
-57826=>16865,
-15232=>16866,
-57827=>16866,
-26540=>16867,
-57828=>16867,
-26977=>16868,
-57829=>16868,
-166474=>16869,
-57830=>16869,
-17148=>16870,
-57831=>16870,
-26934=>16871,
-57832=>16871,
-27032=>16872,
-57833=>16872,
-15265=>16873,
-57834=>16873,
-132041=>16874,
-57835=>16874,
-33635=>16875,
-57836=>16875,
-20624=>16876,
-57837=>16876,
-27129=>16877,
-57838=>16877,
-144985=>16878,
-57839=>16878,
-139562=>16879,
-57840=>16879,
-27205=>16880,
-57841=>16880,
-145155=>16881,
-57842=>16881,
-27293=>16882,
-57843=>16882,
-15347=>16883,
-57844=>16883,
-26545=>16884,
-57845=>16884,
-27336=>16885,
-57846=>16885,
-168348=>16886,
-57847=>16886,
-15373=>16887,
-57848=>16887,
-27421=>16888,
-57849=>16888,
-133411=>16889,
-57850=>16889,
-24798=>16890,
-60308=>16890,
-57851=>16890,
-27445=>16891,
-57852=>16891,
-27508=>16892,
-57853=>16892,
-141261=>16893,
-57854=>16893,
-28341=>16894,
-57855=>16894,
-57856=>16895,
-146139=>16895,
-137560=>16897,
-57858=>16897,
-14144=>16898,
-57859=>16898,
-21537=>16899,
-57860=>16899,
-146266=>16900,
-57861=>16900,
-27617=>16901,
-57862=>16901,
-147196=>16902,
-57863=>16902,
-27612=>16903,
-57864=>16903,
-27703=>16904,
-57865=>16904,
-140427=>16905,
-57866=>16905,
-149745=>16906,
-57867=>16906,
-158545=>16907,
-57868=>16907,
-27738=>16908,
-57869=>16908,
-33318=>16909,
-57870=>16909,
-27769=>16910,
-57871=>16910,
-146876=>16911,
-57872=>16911,
-17605=>16912,
-57873=>16912,
-146877=>16913,
-57874=>16913,
-147876=>16914,
-57875=>16914,
-149772=>16915,
-57876=>16915,
-149760=>16916,
-57877=>16916,
-146633=>16917,
-57878=>16917,
-14053=>16918,
-57879=>16918,
-15595=>16919,
-57880=>16919,
-134450=>16920,
-57881=>16920,
-39811=>16921,
-57882=>16921,
-143865=>16922,
-57883=>16922,
-140433=>16923,
-57884=>16923,
-32655=>16924,
-57885=>16924,
-26679=>16925,
-57886=>16925,
-159013=>16926,
-57887=>16926,
-159137=>16927,
-57888=>16927,
-159211=>16928,
-57889=>16928,
-28054=>16929,
-57890=>16929,
-27996=>16930,
-57891=>16930,
-28284=>16931,
-57892=>16931,
-28420=>16932,
-57893=>16932,
-149887=>16933,
-57894=>16933,
-147589=>16934,
-57895=>16934,
-159346=>16935,
-57896=>16935,
-34099=>16936,
-57897=>16936,
-159604=>16937,
-57898=>16937,
-20935=>16938,
-57899=>16938,
-33838=>16941,
-57902=>16941,
-166689=>16942,
-57903=>16942,
-194824=>16943,
-146991=>16944,
-57905=>16944,
-29779=>16945,
-57906=>16945,
-147330=>16946,
-57907=>16946,
-31180=>16947,
-57908=>16947,
-28239=>16948,
-57909=>16948,
-23185=>16949,
-57910=>16949,
-143435=>16950,
-57911=>16950,
-28664=>16951,
-57912=>16951,
-14093=>16952,
-57913=>16952,
-28573=>16953,
-57914=>16953,
-146992=>16954,
-57915=>16954,
-28410=>16955,
-57916=>16955,
-136343=>16956,
-57917=>16956,
-147517=>16957,
-57918=>16957,
-17749=>16958,
-57919=>16958,
-37872=>16959,
-57920=>16959,
-28484=>16960,
-57921=>16960,
-28508=>16961,
-57922=>16961,
-15694=>16962,
-57923=>16962,
-28532=>16963,
-57924=>16963,
-168304=>16964,
-57925=>16964,
-15675=>16965,
-57926=>16965,
-28575=>16966,
-57927=>16966,
-147780=>16967,
-57928=>16967,
-28627=>16968,
-57929=>16968,
-147601=>16969,
-57930=>16969,
-147797=>16970,
-57931=>16970,
-147513=>16971,
-57932=>16971,
-147440=>16972,
-57933=>16972,
-147380=>16973,
-57934=>16973,
-147775=>16974,
-57935=>16974,
-20959=>16975,
-57936=>16975,
-57937=>16976,
-147798=>16976,
-57938=>16977,
-147799=>16977,
-147776=>16978,
-57939=>16978,
-156125=>16979,
-57940=>16979,
-28747=>16980,
-57941=>16980,
-28798=>16981,
-57942=>16981,
-28839=>16982,
-57943=>16982,
-28876=>16984,
-57945=>16984,
-28885=>16985,
-57946=>16985,
-28886=>16986,
-57947=>16986,
-28895=>16987,
-57948=>16987,
-16644=>16988,
-57949=>16988,
-15848=>16989,
-57950=>16989,
-29108=>16990,
-57951=>16990,
-29078=>16991,
-57952=>16991,
-148087=>16992,
-57953=>16992,
-28971=>16993,
-57954=>16993,
-28997=>16994,
-57955=>16994,
-23176=>16995,
-57956=>16995,
-29002=>16996,
-57957=>16996,
-64072=>16997,
-148325=>16998,
-57960=>16998,
-29007=>16999,
-57961=>16999,
-37730=>17000,
-57962=>17000,
-148161=>17001,
-57963=>17001,
-28972=>17002,
-57964=>17002,
-148570=>17003,
-57965=>17003,
-150055=>17004,
-57966=>17004,
-150050=>17005,
-57967=>17005,
-29114=>17006,
-57968=>17006,
-166888=>17007,
-57969=>17007,
-28861=>17008,
-57970=>17008,
-29198=>17009,
-57971=>17009,
-37954=>17010,
-57972=>17010,
-29205=>17011,
-57973=>17011,
-22801=>17012,
-57974=>17012,
-37955=>17013,
-57975=>17013,
-29220=>17014,
-57976=>17014,
-37697=>17015,
-57977=>17015,
-153093=>17016,
-57978=>17016,
-29230=>17017,
-57979=>17017,
-29248=>17018,
-57980=>17018,
-149876=>17019,
-57981=>17019,
-26813=>17020,
-57982=>17020,
-29269=>17021,
-57983=>17021,
-29271=>17022,
-57984=>17022,
-15957=>17023,
-57985=>17023,
-143428=>17024,
-57986=>17024,
-26637=>17025,
-57987=>17025,
-28477=>17026,
-57988=>17026,
-29314=>17027,
-57989=>17027,
-29483=>17029,
-57991=>17029,
-149539=>17030,
-57992=>17030,
-165931=>17031,
-57993=>17031,
-18669=>17032,
-57994=>17032,
-165892=>17033,
-57995=>17033,
-29480=>17034,
-57996=>17034,
-29486=>17035,
-57997=>17035,
-29647=>17036,
-57998=>17036,
-29610=>17037,
-57999=>17037,
-134202=>17038,
-58000=>17038,
-158254=>17039,
-58001=>17039,
-29641=>17040,
-58002=>17040,
-29769=>17041,
-58003=>17041,
-147938=>17042,
-58004=>17042,
-136935=>17043,
-58005=>17043,
-150052=>17044,
-58006=>17044,
-26147=>17045,
-58007=>17045,
-14021=>17046,
-58008=>17046,
-149943=>17047,
-58009=>17047,
-149901=>17048,
-58010=>17048,
-150011=>17049,
-58011=>17049,
-29687=>17050,
-58012=>17050,
-29717=>17051,
-58013=>17051,
-26883=>17052,
-58014=>17052,
-150054=>17053,
-58015=>17053,
-29753=>17054,
-58016=>17054,
-16087=>17055,
-58018=>17055,
-194863=>17056,
-141485=>17057,
-58020=>17057,
-29792=>17058,
-58021=>17058,
-167602=>17059,
-58022=>17059,
-29767=>17060,
-58023=>17060,
-29668=>17061,
-58024=>17061,
-29814=>17062,
-58025=>17062,
-33721=>17063,
-58026=>17063,
-29804=>17064,
-58027=>17064,
-29812=>17065,
-58029=>17065,
-37873=>17066,
-58030=>17066,
-27180=>17067,
-58031=>17067,
-29826=>17068,
-58032=>17068,
-18771=>17069,
-58033=>17069,
-150156=>17070,
-58034=>17070,
-147807=>17071,
-58035=>17071,
-150137=>17072,
-58036=>17072,
-166799=>17073,
-58037=>17073,
-23366=>17074,
-58038=>17074,
-166915=>17075,
-58039=>17075,
-137374=>17076,
-58040=>17076,
-29896=>17077,
-58041=>17077,
-137608=>17078,
-58042=>17078,
-29966=>17079,
-58043=>17079,
-29982=>17080,
-58045=>17080,
-167641=>17081,
-58046=>17081,
-137803=>17082,
-58047=>17082,
-23511=>17083,
-58048=>17083,
-167596=>17084,
-58049=>17084,
-37765=>17085,
-58050=>17085,
-30029=>17086,
-58051=>17086,
-30026=>17087,
-58052=>17087,
-30055=>17088,
-58053=>17088,
-30062=>17089,
-58054=>17089,
-151426=>17090,
-58055=>17090,
-16132=>17091,
-58056=>17091,
-150803=>17092,
-58057=>17092,
-30094=>17093,
-58058=>17093,
-29789=>17094,
-58059=>17094,
-30110=>17095,
-58060=>17095,
-30132=>17096,
-58061=>17096,
-30210=>17097,
-58062=>17097,
-30252=>17098,
-58063=>17098,
-30289=>17099,
-58064=>17099,
-30287=>17100,
-58065=>17100,
-30319=>17101,
-58066=>17101,
-58067=>17102,
-156661=>17103,
-58068=>17103,
-30352=>17104,
-58069=>17104,
-33263=>17105,
-58070=>17105,
-14328=>17106,
-58071=>17106,
-157969=>17107,
-58072=>17107,
-157966=>17108,
-58073=>17108,
-30369=>17109,
-58074=>17109,
-30373=>17110,
-58075=>17110,
-30391=>17111,
-58076=>17111,
-30412=>17112,
-58077=>17112,
-159647=>17113,
-58078=>17113,
-33890=>17114,
-58079=>17114,
-151709=>17115,
-58080=>17115,
-151933=>17116,
-58081=>17116,
-138780=>17117,
-58082=>17117,
-30494=>17118,
-58083=>17118,
-30502=>17119,
-58084=>17119,
-30528=>17120,
-58085=>17120,
-25775=>17121,
-58086=>17121,
-152096=>17122,
-58087=>17122,
-30552=>17123,
-58088=>17123,
-144044=>17124,
-58089=>17124,
-30639=>17125,
-58090=>17125,
-166244=>17126,
-58091=>17126,
-166248=>17127,
-58092=>17127,
-136897=>17128,
-58093=>17128,
-30708=>17129,
-58094=>17129,
-26826=>17131,
-58098=>17131,
-30895=>17132,
-58099=>17132,
-30919=>17133,
-58100=>17133,
-30931=>17134,
-58101=>17134,
-38565=>17135,
-58102=>17135,
-31022=>17136,
-58103=>17136,
-153056=>17137,
-58104=>17137,
-30935=>17138,
-58105=>17138,
-31028=>17139,
-58106=>17139,
-30897=>17140,
-58107=>17140,
-161292=>17141,
-58108=>17141,
-36792=>17142,
-58109=>17142,
-34948=>17143,
-58110=>17143,
-140828=>17144,
-58113=>17144,
-31110=>17145,
-58114=>17145,
-35072=>17146,
-58115=>17146,
-26882=>17147,
-58116=>17147,
-31104=>17148,
-58117=>17148,
-153687=>17149,
-58118=>17149,
-31133=>17150,
-58119=>17150,
-162617=>17151,
-58120=>17151,
-31036=>17152,
-58121=>17152,
-31145=>17153,
-58122=>17153,
-28202=>17154,
-58123=>17154,
-160038=>17155,
-58124=>17155,
-16040=>17156,
-58125=>17156,
-31174=>17157,
-58126=>17157,
-168205=>17158,
-58127=>17158,
-31188=>17159,
-58128=>17159,
-21797=>17161,
-62526=>17161,
-134210=>17163,
-62528=>17163,
-134421=>17164,
-62529=>17164,
-151851=>17165,
-62530=>17165,
-21904=>17166,
-62531=>17166,
-142534=>17167,
-62532=>17167,
-14828=>17168,
-62533=>17168,
-131905=>17169,
-62534=>17169,
-36422=>17170,
-62535=>17170,
-150968=>17171,
-62536=>17171,
-169189=>17172,
-62537=>17172,
-164030=>17174,
-62539=>17174,
-30586=>17175,
-62540=>17175,
-142392=>17176,
-62541=>17176,
-14900=>17177,
-62542=>17177,
-18389=>17178,
-62543=>17178,
-164189=>17179,
-62544=>17179,
-158194=>17180,
-62545=>17180,
-151018=>17181,
-62546=>17181,
-25821=>17182,
-62547=>17182,
-134524=>17183,
-62548=>17183,
-135092=>17184,
-62549=>17184,
-134357=>17185,
-62550=>17185,
-25741=>17187,
-62552=>17187,
-36478=>17188,
-62553=>17188,
-134806=>17189,
-62554=>17189,
-135012=>17191,
-62556=>17191,
-142505=>17192,
-62557=>17192,
-164438=>17193,
-62558=>17193,
-148691=>17194,
-62559=>17194,
-134470=>17196,
-62561=>17196,
-170573=>17197,
-62562=>17197,
-164073=>17198,
-62563=>17198,
-18420=>17199,
-62564=>17199,
-151207=>17200,
-62565=>17200,
-142530=>17201,
-62566=>17201,
-39602=>17202,
-62567=>17202,
-14951=>17203,
-62568=>17203,
-169460=>17204,
-62569=>17204,
-16365=>17205,
-62570=>17205,
-13574=>17206,
-62571=>17206,
-152263=>17207,
-62572=>17207,
-169940=>17208,
-62573=>17208,
-142660=>17210,
-62575=>17210,
-40302=>17211,
-62576=>17211,
-38933=>17212,
-62577=>17212,
-17369=>17214,
-62579=>17214,
-25780=>17216,
-62581=>17216,
-21731=>17217,
-62582=>17217,
-62584=>17219,
-142282=>17219,
-14843=>17221,
-62586=>17221,
-157402=>17223,
-62588=>17223,
-157462=>17224,
-62589=>17224,
-162208=>17225,
-62590=>17225,
-25834=>17226,
-62591=>17226,
-151634=>17227,
-62592=>17227,
-134211=>17228,
-62593=>17228,
-36456=>17229,
-62594=>17229,
-166732=>17231,
-62596=>17231,
-132913=>17232,
-62597=>17232,
-18443=>17234,
-62599=>17234,
-131497=>17235,
-62600=>17235,
-16378=>17236,
-62601=>17236,
-22643=>17237,
-62602=>17237,
-142733=>17238,
-62603=>17238,
-148936=>17240,
-62605=>17240,
-132348=>17241,
-62606=>17241,
-155799=>17242,
-62607=>17242,
-134988=>17243,
-62608=>17243,
-21881=>17245,
-62610=>17245,
-17338=>17247,
-62612=>17247,
-19124=>17249,
-62614=>17249,
-141926=>17250,
-62615=>17250,
-135325=>17251,
-62616=>17251,
-33194=>17252,
-62617=>17252,
-39157=>17253,
-62618=>17253,
-134556=>17254,
-62619=>17254,
-25465=>17255,
-62620=>17255,
-14846=>17256,
-62621=>17256,
-141173=>17257,
-62622=>17257,
-36288=>17258,
-62623=>17258,
-22177=>17259,
-62624=>17259,
-25724=>17260,
-62625=>17260,
-15939=>17261,
-62626=>17261,
-173569=>17263,
-62628=>17263,
-134665=>17264,
-62629=>17264,
-142031=>17265,
-62630=>17265,
-135368=>17268,
-62633=>17268,
-145858=>17269,
-62634=>17269,
-14738=>17270,
-62635=>17270,
-14854=>17271,
-62636=>17271,
-164507=>17272,
-62637=>17272,
-13688=>17273,
-62638=>17273,
-155209=>17274,
-62639=>17274,
-139463=>17275,
-62640=>17275,
-142514=>17278,
-62643=>17278,
-169760=>17279,
-62644=>17279,
-13500=>17280,
-62645=>17280,
-27709=>17281,
-62646=>17281,
-151099=>17282,
-62647=>17282,
-161140=>17285,
-62650=>17285,
-142987=>17286,
-62651=>17286,
-139784=>17287,
-62652=>17287,
-173659=>17288,
-62653=>17288,
-167117=>17289,
-62654=>17289,
-134778=>17290,
-62655=>17290,
-134196=>17291,
-62656=>17291,
-161337=>17292,
-62683=>17292,
-142286=>17293,
-62684=>17293,
-62687=>17294,
-142417=>17294,
-14872=>17295,
-62689=>17295,
-62691=>17296,
-135367=>17296,
-62693=>17297,
-173618=>17297,
-167122=>17298,
-62695=>17298,
-167321=>17299,
-62696=>17299,
-167114=>17300,
-62697=>17300,
-38314=>17301,
-62698=>17301,
-62706=>17303,
-161630=>17303,
-28992=>17304,
-62708=>17304,
-20822=>17306,
-62385=>17306,
-20222=>17307,
-20616=>17308,
-62487=>17308,
-13459=>17310,
-62489=>17310,
-20870=>17311,
-62491=>17311,
-24130=>17312,
-63037=>17312,
-20997=>17313,
-62495=>17313,
-21031=>17314,
-62436=>17314,
-21113=>17315,
-62497=>17315,
-194600=>17316,
-13651=>17317,
-62504=>17317,
-21442=>17318,
-62505=>17318,
-21343=>17319,
-62715=>17319,
-21823=>17321,
-62520=>17321,
-21976=>17323,
-59986=>17323,
-13789=>17324,
-62722=>17324,
-22049=>17325,
-63067=>17325,
-22100=>17327,
-60044=>17327,
-60148=>17328,
-135291=>17328,
-60153=>17330,
-135379=>17330,
-61095=>17332,
-135934=>17332,
-14265=>17335,
-60104=>17335,
-23745=>17336,
-61099=>17336,
-23829=>17337,
-63066=>17337,
-23894=>17338,
-63030=>17338,
-14392=>17339,
-63036=>17339,
-20097=>17340,
-62477=>17340,
-24253=>17341,
-63038=>17341,
-14612=>17342,
-63042=>17342,
-25017=>17343,
-63050=>17343,
-25232=>17344,
-63054=>17344,
-25368=>17345,
-63056=>17345,
-25690=>17346,
-63063=>17346,
-25745=>17347,
-62381=>17347,
-33133=>17348,
-62709=>17348,
-33156=>17349,
-59922=>17349,
-33171=>17350,
-59924=>17350,
-26624=>17351,
-63080=>17351,
-15292=>17352,
-63093=>17352,
-29327=>17353,
-60517=>17353,
-29389=>17354,
-59781=>17354,
-149487=>17355,
-29497=>17356,
-59785=>17356,
-30018=>17357,
-59811=>17357,
-30172=>17358,
-59817=>17358,
-16320=>17359,
-59818=>17359,
-60278=>17360,
-151205=>17360,
-16343=>17361,
-59820=>17361,
-30336=>17363,
-30348=>17364,
-59824=>17364,
-151388=>17364,
-16552=>17365,
-59845=>17365,
-30777=>17366,
-59846=>17366,
-16643=>17367,
-59855=>17367,
-31377=>17368,
-59863=>17368,
-31771=>17369,
-59876=>17369,
-31981=>17370,
-59884=>17370,
-32659=>17371,
-62658=>17371,
-32686=>17372,
-59892=>17372,
-33535=>17374,
-59936=>17374,
-22623=>17375,
-59981=>17375,
-34482=>17376,
-59960=>17376,
-17836=>17377,
-34699=>17378,
-59963=>17378,
-35143=>17379,
-59969=>17379,
-35369=>17381,
-59972=>17381,
-36465=>17383,
-59988=>17383,
-60484=>17384,
-164233=>17384,
-36528=>17385,
-59990=>17385,
-37214=>17387,
-62443=>17387,
-37260=>17388,
-62441=>17388,
-39182=>17389,
-60051=>17389,
-39196=>17390,
-60054=>17390,
-39809=>17393,
-60066=>17393,
-40384=>17394,
-60080=>17394,
-40339=>17395,
-60078=>17395,
-40620=>17396,
-60085=>17396,
-19857=>17397,
-60540=>17397,
-37818=>17399,
-40571=>17400,
-60084=>17400,
-28809=>17401,
-63148=>17401,
-29512=>17402,
-59788=>17402,
-31129=>17404,
-59858=>17404,
-36791=>17405,
-59997=>17405,
-39234=>17407,
-60056=>17407,
-8364=>17601,
-12443=>17606,
-63518=>17606,
-12444=>17607,
-63519=>17607,
-11904=>17608,
-63520=>17608,
-12736=>17609,
-62211=>17609,
-12737=>17610,
-62212=>17610,
-12738=>17611,
-62213=>17611,
-12739=>17612,
-62214=>17612,
-12740=>17613,
-62215=>17613,
-131340=>17614,
-62216=>17614,
-12741=>17615,
-62217=>17615,
-131281=>17616,
-62218=>17616,
-131277=>17617,
-62219=>17617,
-12742=>17618,
-62220=>17618,
-12743=>17619,
-62221=>17619,
-131275=>17620,
-62222=>17620,
-139240=>17621,
-62223=>17621,
-12744=>17622,
-62224=>17622,
-131274=>17623,
-62225=>17623,
-12745=>17624,
-62226=>17624,
-12746=>17625,
-62227=>17625,
-12747=>17626,
-62228=>17626,
-12748=>17627,
-62229=>17627,
-131342=>17628,
-62230=>17628,
-12749=>17629,
-62231=>17629,
-12750=>17630,
-62232=>17630,
-62776=>17631,
-62777=>17632,
-138177=>17633,
-62778=>17633,
-194680=>17634,
-62779=>17634,
-12205=>17635,
-38737=>17635,
-62780=>17635,
-131206=>17636,
-62781=>17636,
-20059=>17637,
-62782=>17637,
-20155=>17638,
-62783=>17638,
-13630=>17639,
-62784=>17639,
-23587=>17640,
-62785=>17640,
-24401=>17641,
-62786=>17641,
-24516=>17642,
-62787=>17642,
-14586=>17643,
-62788=>17643,
-25164=>17644,
-62789=>17644,
-25909=>17645,
-62790=>17645,
-27514=>17646,
-62791=>17646,
-27701=>17647,
-62792=>17647,
-27706=>17648,
-62793=>17648,
-28780=>17649,
-62794=>17649,
-29227=>17650,
-62795=>17650,
-20012=>17651,
-62796=>17651,
-29357=>17652,
-62797=>17652,
-149737=>17653,
-62798=>17653,
-32594=>17654,
-62799=>17654,
-31035=>17655,
-62800=>17655,
-31993=>17656,
-62801=>17656,
-32595=>17657,
-62802=>17657,
-156266=>17658,
-62803=>17658,
-13505=>17659,
-62804=>17659,
-156491=>17660,
-62806=>17660,
-32770=>17661,
-62807=>17661,
-32896=>17662,
-62808=>17662,
-157202=>17663,
-62809=>17663,
-158033=>17664,
-62810=>17664,
-21341=>17665,
-62811=>17665,
-34916=>17666,
-62812=>17666,
-35265=>17667,
-62813=>17667,
-161970=>17668,
-62814=>17668,
-35744=>17669,
-62815=>17669,
-36125=>17670,
-62816=>17670,
-38021=>17671,
-62817=>17671,
-38264=>17672,
-62818=>17672,
-38271=>17673,
-62819=>17673,
-38376=>17674,
-62820=>17674,
-167439=>17675,
-62821=>17675,
-38886=>17676,
-62822=>17676,
-39029=>17677,
-62823=>17677,
-39118=>17678,
-62824=>17678,
-39134=>17679,
-62825=>17679,
-39267=>17680,
-62826=>17680,
-170000=>17681,
-62827=>17681,
-40060=>17682,
-62828=>17682,
-40479=>17683,
-62829=>17683,
-40644=>17684,
-62830=>17684,
-27503=>17685,
-62831=>17685,
-63751=>17686,
-62832=>17686,
-20023=>17687,
-62833=>17687,
-131207=>17688,
-62834=>17688,
-38429=>17689,
-62835=>17689,
-25143=>17690,
-62836=>17690,
-38050=>17691,
-62837=>17691,
-11908=>17692,
-63521=>17692,
-11910=>17693,
-63522=>17693,
-11911=>17694,
-63523=>17694,
-11912=>17695,
-63524=>17695,
-11914=>17696,
-63525=>17696,
-11916=>17697,
-63526=>17697,
-11917=>17698,
-63527=>17698,
-11925=>17699,
-63528=>17699,
-11932=>17700,
-63529=>17700,
-11941=>17701,
-63531=>17701,
-11943=>17702,
-63532=>17702,
-11946=>17703,
-63533=>17703,
-11948=>17704,
-63534=>17704,
-11950=>17705,
-63535=>17705,
-11958=>17706,
-63536=>17706,
-11964=>17707,
-63537=>17707,
-11966=>17708,
-63538=>17708,
-11978=>17709,
-63540=>17709,
-11980=>17710,
-63541=>17710,
-11981=>17711,
-63542=>17711,
-11983=>17712,
-63543=>17712,
-11990=>17713,
-63544=>17713,
-11991=>17714,
-63545=>17714,
-11998=>17715,
-63546=>17715,
-172969=>17716,
-62368=>17716,
-135493=>17717,
-62369=>17717,
-25866=>17718,
-62371=>17718,
-20029=>17719,
-62374=>17719,
-28381=>17720,
-62375=>17720,
-40270=>17721,
-62376=>17721,
-37343=>17722,
-62377=>17722,
-62380=>17723,
-161589=>17723,
-20250=>17724,
-62382=>17724,
-20264=>17725,
-62383=>17725,
-20392=>17726,
-62384=>17726,
-20852=>17727,
-62386=>17727,
-20892=>17728,
-62387=>17728,
-20964=>17729,
-62388=>17729,
-21153=>17730,
-62389=>17730,
-21160=>17731,
-62390=>17731,
-21307=>17732,
-62391=>17732,
-21326=>17733,
-62392=>17733,
-21457=>17734,
-62393=>17734,
-21464=>17735,
-62394=>17735,
-22242=>17736,
-62395=>17736,
-22768=>17737,
-62396=>17737,
-22788=>17738,
-62397=>17738,
-22791=>17739,
-62398=>17739,
-22834=>17740,
-62399=>17740,
-22836=>17741,
-62400=>17741,
-23398=>17742,
-62401=>17742,
-23454=>17743,
-62402=>17743,
-23455=>17744,
-62403=>17744,
-23706=>17745,
-62404=>17745,
-24198=>17746,
-62405=>17746,
-24635=>17747,
-62406=>17747,
-25993=>17748,
-62407=>17748,
-26622=>17749,
-62408=>17749,
-26628=>17750,
-62409=>17750,
-26725=>17751,
-62410=>17751,
-27982=>17752,
-62411=>17752,
-28860=>17753,
-62412=>17753,
-30005=>17754,
-62413=>17754,
-32420=>17755,
-62414=>17755,
-32428=>17756,
-62415=>17756,
-32442=>17757,
-62416=>17757,
-32455=>17758,
-62417=>17758,
-32463=>17759,
-62418=>17759,
-32479=>17760,
-62419=>17760,
-32518=>17761,
-62420=>17761,
-32567=>17762,
-62421=>17762,
-33402=>17763,
-62422=>17763,
-33487=>17764,
-62423=>17764,
-33647=>17765,
-62424=>17765,
-35270=>17766,
-62425=>17766,
-35774=>17767,
-62426=>17767,
-35810=>17768,
-62427=>17768,
-36710=>17769,
-62428=>17769,
-36711=>17770,
-62429=>17770,
-36718=>17771,
-62430=>17771,
-29713=>17772,
-62431=>17772,
-31996=>17773,
-62432=>17773,
-32205=>17774,
-62433=>17774,
-26950=>17775,
-62434=>17775,
-31433=>17776,
-62435=>17776,
-30904=>17777,
-62442=>17777,
-32956=>17778,
-62444=>17778,
-36107=>17779,
-62446=>17779,
-33014=>17780,
-62447=>17780,
-133607=>17781,
-62448=>17781,
-32927=>17782,
-62451=>17782,
-40647=>17783,
-62452=>17783,
-19661=>17784,
-62453=>17784,
-40393=>17785,
-62454=>17785,
-40460=>17786,
-62455=>17786,
-19518=>17787,
-62456=>17787,
-171510=>17788,
-62457=>17788,
-159758=>17789,
-62458=>17789,
-40458=>17790,
-62459=>17790,
-172339=>17791,
-62460=>17791,
-13761=>17792,
-62461=>17792,
-28314=>17793,
-62463=>17793,
-33342=>17794,
-62464=>17794,
-29977=>17795,
-62465=>17795,
-18705=>17796,
-62467=>17796,
-39532=>17797,
-62468=>17797,
-39567=>17798,
-62469=>17798,
-40857=>17799,
-62470=>17799,
-31111=>17800,
-62471=>17800,
-164972=>17801,
-62472=>17801,
-138698=>17802,
-62473=>17802,
-132560=>17803,
-62474=>17803,
-142054=>17804,
-62475=>17804,
-20004=>17805,
-62476=>17805,
-20096=>17806,
-62478=>17806,
-20103=>17807,
-62479=>17807,
-20159=>17808,
-62480=>17808,
-20203=>17809,
-62481=>17809,
-20279=>17810,
-62482=>17810,
-13388=>17811,
-62483=>17811,
-20413=>17812,
-62484=>17812,
-15944=>17813,
-62485=>17813,
-20483=>17814,
-62486=>17814,
-13437=>17815,
-62488=>17815,
-13477=>17816,
-62490=>17816,
-22789=>17817,
-62492=>17817,
-20955=>17818,
-62493=>17818,
-20988=>17819,
-62494=>17819,
-20105=>17820,
-62496=>17820,
-21136=>17821,
-62498=>17821,
-21287=>17822,
-62499=>17822,
-13767=>17823,
-62500=>17823,
-21417=>17824,
-62501=>17824,
-13649=>17825,
-62502=>17825,
-21424=>17826,
-62503=>17826,
-21539=>17827,
-62506=>17827,
-13677=>17828,
-62507=>17828,
-13682=>17829,
-62508=>17829,
-13953=>17830,
-62509=>17830,
-21651=>17831,
-62510=>17831,
-21667=>17832,
-62511=>17832,
-21684=>17833,
-62512=>17833,
-21689=>17834,
-62513=>17834,
-21712=>17835,
-62514=>17835,
-21743=>17836,
-62515=>17836,
-21784=>17837,
-62516=>17837,
-21795=>17838,
-62517=>17838,
-21800=>17839,
-62518=>17839,
-13720=>17840,
-62519=>17840,
-13733=>17841,
-62521=>17841,
-13759=>17842,
-62522=>17842,
-21975=>17843,
-62523=>17843,
-13765=>17844,
-62524=>17844,
-163204=>17845,
-62525=>17845,
-16467=>17846,
-62538=>17846,
-62551=>17847,
-135412=>17847,
-62555=>17848,
-134155=>17848,
-62574=>17849,
-161992=>17849,
-62580=>17850,
-155813=>17850,
-62583=>17851,
-142668=>17851,
-62585=>17852,
-135287=>17852,
-62587=>17853,
-135279=>17853,
-62595=>17854,
-139681=>17854,
-62609=>17855,
-134550=>17855,
-16571=>17856,
-62611=>17856,
-62631=>17857,
-142537=>17857,
-22098=>17858,
-62641=>17858,
-134961=>17859,
-62642=>17859,
-62657=>17860,
-157724=>17860,
-135375=>17861,
-62659=>17861,
-141315=>17862,
-62660=>17862,
-141625=>17863,
-62661=>17863,
-13819=>17864,
-62662=>17864,
-152035=>17865,
-62663=>17865,
-134796=>17866,
-62664=>17866,
-135053=>17867,
-62665=>17867,
-134826=>17868,
-62666=>17868,
-16275=>17869,
-62667=>17869,
-134960=>17870,
-62668=>17870,
-134471=>17871,
-62669=>17871,
-135503=>17872,
-62670=>17872,
-134732=>17873,
-62671=>17873,
-134827=>17874,
-62673=>17874,
-134057=>17875,
-62674=>17875,
-134472=>17876,
-62675=>17876,
-135360=>17877,
-62676=>17877,
-135485=>17878,
-62677=>17878,
-16377=>17879,
-62678=>17879,
-140950=>17880,
-62679=>17880,
-25650=>17881,
-62680=>17881,
-135085=>17882,
-62681=>17882,
-144372=>17883,
-62682=>17883,
-62685=>17884,
-134526=>17884,
-62686=>17885,
-134527=>17885,
-62688=>17886,
-142421=>17886,
-62690=>17887,
-134808=>17887,
-62692=>17888,
-134958=>17888,
-62694=>17889,
-158544=>17889,
-21708=>17890,
-62699=>17890,
-33476=>17891,
-62700=>17891,
-21945=>17892,
-62701=>17892,
-171715=>17893,
-62703=>17893,
-39974=>17894,
-62704=>17894,
-39606=>17895,
-62705=>17895,
-62707=>17896,
-142830=>17896,
-33004=>17897,
-62710=>17897,
-23580=>17898,
-62711=>17898,
-157042=>17899,
-62712=>17899,
-33076=>17900,
-62713=>17900,
-14231=>17901,
-62714=>17901,
-164029=>17902,
-62716=>17902,
-37302=>17903,
-62717=>17903,
-134906=>17904,
-62718=>17904,
-134671=>17905,
-62719=>17905,
-134775=>17906,
-62720=>17906,
-134907=>17907,
-62721=>17907,
-151019=>17908,
-62723=>17908,
-13833=>17909,
-62724=>17909,
-134358=>17910,
-62725=>17910,
-22191=>17911,
-62726=>17911,
-141237=>17912,
-62727=>17912,
-135369=>17913,
-62728=>17913,
-134672=>17914,
-62729=>17914,
-134776=>17915,
-62730=>17915,
-135288=>17916,
-62731=>17916,
-135496=>17917,
-62732=>17917,
-164359=>17918,
-62733=>17918,
-136277=>17919,
-62734=>17919,
-134777=>17920,
-62735=>17920,
-151120=>17921,
-62736=>17921,
-142756=>17922,
-62737=>17922,
-23124=>17923,
-62738=>17923,
-62739=>17924,
-135197=>17924,
-62740=>17925,
-135198=>17925,
-62741=>17926,
-135413=>17926,
-62742=>17927,
-135414=>17927,
-22428=>17928,
-62743=>17928,
-134673=>17929,
-62744=>17929,
-161428=>17930,
-62745=>17930,
-164557=>17931,
-62746=>17931,
-135093=>17932,
-62747=>17932,
-134779=>17933,
-62748=>17933,
-151934=>17934,
-62749=>17934,
-14083=>17935,
-62750=>17935,
-135094=>17936,
-62751=>17936,
-135552=>17937,
-62752=>17937,
-152280=>17938,
-62753=>17938,
-172733=>17939,
-62754=>17939,
-149978=>17940,
-62755=>17940,
-137274=>17941,
-62756=>17941,
-147831=>17942,
-62757=>17942,
-164476=>17943,
-62758=>17943,
-22681=>17944,
-62759=>17944,
-21096=>17945,
-62760=>17945,
-13850=>17946,
-62761=>17946,
-153405=>17947,
-62762=>17947,
-31666=>17948,
-62763=>17948,
-23400=>17949,
-62764=>17949,
-18432=>17950,
-62765=>17950,
-19244=>17951,
-62766=>17951,
-40743=>17952,
-62767=>17952,
-18919=>17953,
-62768=>17953,
-39967=>17954,
-62769=>17954,
-39821=>17955,
-62770=>17955,
-154484=>17956,
-62771=>17956,
-143677=>17957,
-62772=>17957,
-22011=>17958,
-62773=>17958,
-13810=>17959,
-62774=>17959,
-22153=>17960,
-62775=>17960,
-23870=>17961,
-63028=>17961,
-23880=>17962,
-63029=>17962,
-15868=>17963,
-63031=>17963,
-14351=>17964,
-63032=>17964,
-23972=>17965,
-63033=>17965,
-23993=>17966,
-63034=>17966,
-14368=>17967,
-63035=>17967,
-24357=>17968,
-63039=>17968,
-24451=>17969,
-63040=>17969,
-14600=>17970,
-63041=>17970,
-14655=>17971,
-63043=>17971,
-14669=>17972,
-63044=>17972,
-24791=>17973,
-63045=>17973,
-24893=>17974,
-63046=>17974,
-23781=>17975,
-63047=>17975,
-14729=>17976,
-63048=>17976,
-25015=>17977,
-63049=>17977,
-25039=>17978,
-63051=>17978,
-14776=>17979,
-63052=>17979,
-25132=>17980,
-63053=>17980,
-25317=>17981,
-63055=>17981,
-14840=>17982,
-63057=>17982,
-22193=>17983,
-63058=>17983,
-14851=>17984,
-63059=>17984,
-25570=>17985,
-63060=>17985,
-25595=>17986,
-63061=>17986,
-25607=>17987,
-63062=>17987,
-14923=>17988,
-63064=>17988,
-25792=>17989,
-63065=>17989,
-40863=>17990,
-63068=>17990,
-14999=>17991,
-63069=>17991,
-25990=>17992,
-63070=>17992,
-15037=>17993,
-63071=>17993,
-26111=>17994,
-63072=>17994,
-26195=>17995,
-63073=>17995,
-15090=>17996,
-63074=>17996,
-26258=>17997,
-63075=>17997,
-15138=>17998,
-63076=>17998,
-26390=>17999,
-63077=>17999,
-15170=>18000,
-63078=>18000,
-26532=>18001,
-63079=>18001,
-15192=>18002,
-63081=>18002,
-26698=>18003,
-63082=>18003,
-26756=>18004,
-63083=>18004,
-15218=>18005,
-63084=>18005,
-15217=>18006,
-63085=>18006,
-15227=>18007,
-63086=>18007,
-26889=>18008,
-63087=>18008,
-26947=>18009,
-63088=>18009,
-29276=>18010,
-63089=>18010,
-26980=>18011,
-63090=>18011,
-27039=>18012,
-63091=>18012,
-27013=>18013,
-63092=>18013,
-27094=>18014,
-63094=>18014,
-15325=>18015,
-63095=>18015,
-27237=>18016,
-63096=>18016,
-27252=>18017,
-63097=>18017,
-27249=>18018,
-63098=>18018,
-27266=>18019,
-63099=>18019,
-15340=>18020,
-63100=>18020,
-27289=>18021,
-63101=>18021,
-15346=>18022,
-63102=>18022,
-27307=>18023,
-63103=>18023,
-27317=>18024,
-63104=>18024,
-27348=>18025,
-63105=>18025,
-27382=>18026,
-63106=>18026,
-27521=>18027,
-63107=>18027,
-27585=>18028,
-63108=>18028,
-27626=>18029,
-63109=>18029,
-27765=>18030,
-63110=>18030,
-27818=>18031,
-63111=>18031,
-15563=>18032,
-63112=>18032,
-27906=>18033,
-63113=>18033,
-27910=>18034,
-63114=>18034,
-27942=>18035,
-63115=>18035,
-28033=>18036,
-63116=>18036,
-15599=>18037,
-63117=>18037,
-28068=>18038,
-63118=>18038,
-28081=>18039,
-63119=>18039,
-28181=>18040,
-63120=>18040,
-28184=>18041,
-63121=>18041,
-28201=>18042,
-63122=>18042,
-28294=>18043,
-63123=>18043,
-166336=>18044,
-63124=>18044,
-28347=>18045,
-63125=>18045,
-28386=>18046,
-63126=>18046,
-28378=>18047,
-63127=>18047,
-40831=>18048,
-63128=>18048,
-28392=>18049,
-63129=>18049,
-28393=>18050,
-63130=>18050,
-28452=>18051,
-63131=>18051,
-28468=>18052,
-63132=>18052,
-15686=>18053,
-63133=>18053,
-147265=>18054,
-63134=>18054,
-28545=>18055,
-63135=>18055,
-28606=>18056,
-63136=>18056,
-15722=>18057,
-63137=>18057,
-15733=>18058,
-63138=>18058,
-29111=>18059,
-63139=>18059,
-23705=>18060,
-63140=>18060,
-15754=>18061,
-63141=>18061,
-28716=>18062,
-63142=>18062,
-15761=>18063,
-63143=>18063,
-28752=>18064,
-63144=>18064,
-28756=>18065,
-63145=>18065,
-28783=>18066,
-63146=>18066,
-28799=>18067,
-63147=>18067,
-131877=>18068,
-63149=>18068,
-17345=>18069,
-63150=>18069,
-13809=>18070,
-63151=>18070,
-134872=>18071,
-63152=>18071,
-13902=>18072,
-58134=>18072,
-15789=>18073,
-58172=>18073,
-154725=>18074,
-58173=>18074,
-26237=>18075,
-58183=>18075,
-31860=>18076,
-58188=>18076,
-29837=>18077,
-58197=>18077,
-32402=>18078,
-58215=>18078,
-17667=>18079,
-58232=>18079,
-58260=>18080,
-151480=>18080,
-58270=>18081,
-133901=>18081,
-58277=>18082,
-158474=>18082,
-13438=>18083,
-58311=>18083,
-58317=>18084,
-143087=>18084,
-58325=>18085,
-146613=>18085,
-58343=>18086,
-159385=>18086,
-34673=>18087,
-58364=>18087,
-25537=>18088,
-58385=>18088,
-30583=>18089,
-58387=>18089,
-35210=>18090,
-58390=>18090,
-58406=>18091,
-147343=>18091,
-35660=>18092,
-58415=>18092,
-58440=>18093,
-150729=>18093,
-18730=>18094,
-58464=>18094,
-172052=>18095,
-58471=>18095,
-165564=>18096,
-58472=>18096,
-165121=>18097,
-58473=>18097,
-15088=>18098,
-58490=>18098,
-28815=>18099,
-58511=>18099,
-58529=>18100,
-140922=>18100,
-58637=>18101,
-158120=>18101,
-58646=>18102,
-148043=>18102,
-26760=>18103,
-58662=>18103,
-58664=>18104,
-139611=>18104,
-40802=>18105,
-58702=>18105,
-37830=>18106,
-58793=>18106,
-58802=>18107,
-131967=>18107,
-37734=>18108,
-58888=>18108,
-37519=>18109,
-58901=>18109,
-34324=>18110,
-58954=>18110,
-58986=>18111,
-173147=>18111,
-16784=>18112,
-59010=>18112,
-26511=>18113,
-59045=>18113,
-26654=>18114,
-59048=>18114,
-14435=>18115,
-59051=>18115,
-59077=>18116,
-149996=>18116,
-15129=>18117,
-59128=>18117,
-33942=>18118,
-59176=>18118,
-59241=>18119,
-149858=>18119,
-14818=>18120,
-59254=>18120,
-33920=>18121,
-59259=>18121,
-17262=>18122,
-59328=>18122,
-38769=>18123,
-59402=>18123,
-39323=>18124,
-59427=>18124,
-18733=>18125,
-59499=>18125,
-28439=>18126,
-59703=>18126,
-160009=>18127,
-59704=>18127,
-28838=>18128,
-59746=>18128,
-150095=>18129,
-59752=>18129,
-32357=>18130,
-59753=>18130,
-23855=>18131,
-59755=>18131,
-15859=>18132,
-59756=>18132,
-150109=>18133,
-59758=>18133,
-137183=>18134,
-59759=>18134,
-32164=>18135,
-59760=>18135,
-33830=>18136,
-59761=>18136,
-21637=>18137,
-59762=>18137,
-146170=>18138,
-59763=>18138,
-131604=>18139,
-59765=>18139,
-22398=>18140,
-59766=>18140,
-133333=>18141,
-59767=>18141,
-132633=>18142,
-59768=>18142,
-16357=>18143,
-59769=>18143,
-139166=>18144,
-59770=>18144,
-172726=>18145,
-59771=>18145,
-28675=>18146,
-59772=>18146,
-168283=>18147,
-59773=>18147,
-23920=>18148,
-59774=>18148,
-29583=>18149,
-59775=>18149,
-166489=>18150,
-59777=>18150,
-168992=>18151,
-59778=>18151,
-20424=>18152,
-59779=>18152,
-32743=>18153,
-59780=>18153,
-29456=>18154,
-59782=>18154,
-29496=>18155,
-59784=>18155,
-29505=>18156,
-59787=>18156,
-16041=>18157,
-59789=>18157,
-29173=>18158,
-59792=>18158,
-149746=>18159,
-59793=>18159,
-29665=>18160,
-59794=>18160,
-16074=>18161,
-59796=>18161,
-16081=>18162,
-59798=>18162,
-29721=>18163,
-59801=>18163,
-29726=>18164,
-59802=>18164,
-29727=>18165,
-59803=>18165,
-16098=>18166,
-59804=>18166,
-16112=>18167,
-59805=>18167,
-16116=>18168,
-59806=>18168,
-16122=>18169,
-59807=>18169,
-29907=>18170,
-59808=>18170,
-16142=>18171,
-59809=>18171,
-16211=>18172,
-59810=>18172,
-30061=>18173,
-59812=>18173,
-30066=>18174,
-59813=>18174,
-30093=>18175,
-59814=>18175,
-16252=>18176,
-59815=>18176,
-30152=>18177,
-59816=>18177,
-30285=>18178,
-59819=>18178,
-30324=>18179,
-59821=>18179,
-16348=>18180,
-59822=>18180,
-30330=>18181,
-59823=>18181,
-29064=>18182,
-59825=>18182,
-22051=>18183,
-59826=>18183,
-35200=>18184,
-59827=>18184,
-16413=>18185,
-59829=>18185,
-30531=>18186,
-59830=>18186,
-16441=>18187,
-59831=>18187,
-16453=>18188,
-59833=>18188,
-13787=>18189,
-59834=>18189,
-30616=>18190,
-59835=>18190,
-16490=>18191,
-59836=>18191,
-16495=>18192,
-59837=>18192,
-30654=>18193,
-59839=>18193,
-30667=>18194,
-59840=>18194,
-30744=>18195,
-59842=>18195,
-30748=>18196,
-59844=>18196,
-30791=>18197,
-59847=>18197,
-30801=>18198,
-59848=>18198,
-30822=>18199,
-59849=>18199,
-33864=>18200,
-59850=>18200,
-152885=>18201,
-59851=>18201,
-31027=>18202,
-59852=>18202,
-31026=>18203,
-59854=>18203,
-16649=>18204,
-59856=>18204,
-31121=>18205,
-59857=>18205,
-31238=>18206,
-59860=>18206,
-16743=>18207,
-59862=>18207,
-16818=>18208,
-59864=>18208,
-31420=>18209,
-59865=>18209,
-33401=>18210,
-59866=>18210,
-16836=>18211,
-59867=>18211,
-31439=>18212,
-59868=>18212,
-31451=>18213,
-59869=>18213,
-16847=>18214,
-59870=>18214,
-31586=>18215,
-59872=>18215,
-31596=>18216,
-59873=>18216,
-31611=>18217,
-59874=>18217,
-31762=>18218,
-59875=>18218,
-16992=>18219,
-59877=>18219,
-17018=>18220,
-59878=>18220,
-31867=>18221,
-59879=>18221,
-31900=>18222,
-59880=>18222,
-17036=>18223,
-59881=>18223,
-31928=>18224,
-59882=>18224,
-17044=>18225,
-59883=>18225,
-36755=>18226,
-59885=>18226,
-28864=>18227,
-59886=>18227,
-134351=>18228,
-59887=>18228,
-32207=>18229,
-59888=>18229,
-32212=>18230,
-59889=>18230,
-32208=>18231,
-59890=>18231,
-32253=>18232,
-59891=>18232,
-32692=>18233,
-59893=>18233,
-29343=>18234,
-59894=>18234,
-17303=>18235,
-59895=>18235,
-32800=>18236,
-59896=>18236,
-32805=>18237,
-59897=>18237,
-32814=>18238,
-59899=>18238,
-32817=>18239,
-59900=>18239,
-32852=>18240,
-59901=>18240,
-22452=>18241,
-59903=>18241,
-28832=>18242,
-59904=>18242,
-32951=>18243,
-59905=>18243,
-33001=>18244,
-59906=>18244,
-17389=>18245,
-59907=>18245,
-33036=>18246,
-59908=>18246,
-33038=>18247,
-59910=>18247,
-33042=>18248,
-59911=>18248,
-33044=>18249,
-59913=>18249,
-17409=>18250,
-59914=>18250,
-15161=>18251,
-59915=>18251,
-33110=>18252,
-59916=>18252,
-33113=>18253,
-59917=>18253,
-33114=>18254,
-59918=>18254,
-17427=>18255,
-59919=>18255,
-33148=>18256,
-59921=>18256,
-17445=>18257,
-59923=>18257,
-17453=>18258,
-59925=>18258,
-33189=>18259,
-59926=>18259,
-22511=>18260,
-59927=>18260,
-33217=>18261,
-59928=>18261,
-33252=>18262,
-59929=>18262,
-33364=>18263,
-59930=>18263,
-17551=>18264,
-59931=>18264,
-33398=>18265,
-59933=>18265,
-33482=>18266,
-59934=>18266,
-33496=>18267,
-59935=>18267,
-17584=>18268,
-59937=>18268,
-33623=>18269,
-59938=>18269,
-38505=>18270,
-59939=>18270,
-33797=>18271,
-59941=>18271,
-28917=>18272,
-59942=>18272,
-33892=>18273,
-59943=>18273,
-33928=>18274,
-59945=>18274,
-17668=>18275,
-59946=>18275,
-33982=>18276,
-59947=>18276,
-34017=>18277,
-59948=>18277,
-34040=>18278,
-59949=>18278,
-34064=>18279,
-59950=>18279,
-34104=>18280,
-59951=>18280,
-34130=>18281,
-59952=>18281,
-17723=>18282,
-59953=>18282,
-34159=>18283,
-59954=>18283,
-34160=>18284,
-59955=>18284,
-34272=>18285,
-59956=>18285,
-17783=>18286,
-59957=>18286,
-34418=>18287,
-59958=>18287,
-34450=>18288,
-59959=>18288,
-34543=>18289,
-59961=>18289,
-38469=>18290,
-59962=>18290,
-17926=>18291,
-59964=>18291,
-17943=>18292,
-59965=>18292,
-34990=>18293,
-59966=>18293,
-35071=>18294,
-59967=>18294,
-35108=>18295,
-59968=>18295,
-35217=>18296,
-59970=>18296,
-162151=>18297,
-59971=>18297,
-35384=>18298,
-59973=>18298,
-35476=>18299,
-59974=>18299,
-35508=>18300,
-59975=>18300,
-35921=>18301,
-59976=>18301,
-36052=>18302,
-59977=>18302,
-36082=>18303,
-59978=>18303,
-36124=>18304,
-59979=>18304,
-18328=>18305,
-59980=>18305,
-36291=>18306,
-59982=>18306,
-18413=>18307,
-59983=>18307,
-36410=>18308,
-59985=>18308,
-22356=>18309,
-59987=>18309,
-22005=>18310,
-59989=>18310,
-18487=>18311,
-59991=>18311,
-36558=>18312,
-59992=>18312,
-36578=>18313,
-59993=>18313,
-36580=>18314,
-59994=>18314,
-36589=>18315,
-59995=>18315,
-36594=>18316,
-59996=>18316,
-36801=>18317,
-59998=>18317,
-36810=>18318,
-59999=>18318,
-36812=>18319,
-60000=>18319,
-36915=>18320,
-60001=>18320,
-18605=>18321,
-60003=>18321,
-39136=>18322,
-60004=>18322,
-37395=>18323,
-60005=>18323,
-18718=>18324,
-60006=>18324,
-37416=>18325,
-60007=>18325,
-37464=>18326,
-60008=>18326,
-37483=>18327,
-60009=>18327,
-37553=>18328,
-60010=>18328,
-37550=>18329,
-60011=>18329,
-37567=>18330,
-60012=>18330,
-37603=>18331,
-60013=>18331,
-37611=>18332,
-60014=>18332,
-37619=>18333,
-60015=>18333,
-37620=>18334,
-60016=>18334,
-37629=>18335,
-60017=>18335,
-37699=>18336,
-60018=>18336,
-37764=>18337,
-60019=>18337,
-37805=>18338,
-60020=>18338,
-18757=>18339,
-60021=>18339,
-18769=>18340,
-60022=>18340,
-37911=>18341,
-60024=>18341,
-37917=>18342,
-60026=>18342,
-37933=>18343,
-60027=>18343,
-37950=>18344,
-60028=>18344,
-18794=>18345,
-60029=>18345,
-37972=>18346,
-60030=>18346,
-38009=>18347,
-60031=>18347,
-38189=>18348,
-60032=>18348,
-38306=>18349,
-60033=>18349,
-18855=>18350,
-60034=>18350,
-38388=>18351,
-60035=>18351,
-38451=>18352,
-60036=>18352,
-18917=>18353,
-60037=>18353,
-18980=>18354,
-60039=>18354,
-38720=>18355,
-60040=>18355,
-18997=>18356,
-60041=>18356,
-38834=>18357,
-60042=>18357,
-38850=>18358,
-60043=>18358,
-19172=>18359,
-60045=>18359,
-39097=>18360,
-60047=>18360,
-19225=>18361,
-60048=>18361,
-39153=>18362,
-60049=>18362,
-22596=>18363,
-60050=>18363,
-39193=>18364,
-60052=>18364,
-39223=>18365,
-60055=>18365,
-39261=>18366,
-60057=>18366,
-39266=>18367,
-60058=>18367,
-19312=>18368,
-60059=>18368,
-39365=>18369,
-60060=>18369,
-19357=>18370,
-60061=>18370,
-39484=>18371,
-60062=>18371,
-39695=>18372,
-60063=>18372,
-39785=>18373,
-60065=>18373,
-39901=>18374,
-60067=>18374,
-39921=>18375,
-60068=>18375,
-39924=>18376,
-60069=>18376,
-19565=>18377,
-60070=>18377,
-39968=>18378,
-60071=>18378,
-14191=>18379,
-60072=>18379,
-138178=>18380,
-60073=>18380,
-40265=>18381,
-60074=>18381,
-40702=>18382,
-60076=>18382,
-22096=>18383,
-60077=>18383,
-40381=>18384,
-60079=>18384,
-40444=>18385,
-60081=>18385,
-38134=>18386,
-60082=>18386,
-36790=>18387,
-60083=>18387,
-40625=>18388,
-60086=>18388,
-40637=>18389,
-60087=>18389,
-40646=>18390,
-60088=>18390,
-38108=>18391,
-60089=>18391,
-40674=>18392,
-60090=>18392,
-40689=>18393,
-60091=>18393,
-40696=>18394,
-60092=>18394,
-40772=>18395,
-60094=>18395,
-131220=>18396,
-60095=>18396,
-131767=>18397,
-60096=>18397,
-132000=>18398,
-60097=>18398,
-38083=>18399,
-60099=>18399,
-60101=>18400,
-132311=>18400,
-38081=>18401,
-60103=>18401,
-132565=>18402,
-60105=>18402,
-132629=>18403,
-60106=>18403,
-132726=>18404,
-60107=>18404,
-136890=>18405,
-60108=>18405,
-22359=>18406,
-60109=>18406,
-29043=>18407,
-60110=>18407,
-133826=>18408,
-60111=>18408,
-133837=>18409,
-60112=>18409,
-134079=>18410,
-60113=>18410,
-194619=>18411,
-60115=>18411,
-134091=>18412,
-60116=>18412,
-21662=>18413,
-60117=>18413,
-134139=>18414,
-60118=>18414,
-134203=>18415,
-60119=>18415,
-134227=>18416,
-60120=>18416,
-134245=>18417,
-60121=>18417,
-134268=>18418,
-60122=>18418,
-60124=>18419,
-134285=>18419,
-134325=>18420,
-60126=>18420,
-134365=>18421,
-60127=>18421,
-134381=>18422,
-60128=>18422,
-134511=>18423,
-60129=>18423,
-134578=>18424,
-60130=>18424,
-134600=>18425,
-60131=>18425,
-134660=>18426,
-60135=>18426,
-134670=>18427,
-60136=>18427,
-134871=>18428,
-60137=>18428,
-135056=>18429,
-60138=>18429,
-134957=>18430,
-60139=>18430,
-134771=>18431,
-60140=>18431,
-60142=>18432,
-135100=>18432,
-135260=>18433,
-60144=>18433,
-135247=>18434,
-60145=>18434,
-135286=>18435,
-60146=>18435,
-135304=>18436,
-60149=>18436,
-135318=>18437,
-60150=>18437,
-13895=>18438,
-60151=>18438,
-135359=>18439,
-60152=>18439,
-135471=>18440,
-60154=>18440,
-135483=>18441,
-60155=>18441,
-21348=>18442,
-60156=>18442,
-135907=>18443,
-60158=>18443,
-136053=>18444,
-60159=>18444,
-60160=>18445,
-135990=>18445,
-136567=>18446,
-60162=>18446,
-136729=>18447,
-60163=>18447,
-137155=>18448,
-60164=>18448,
-137159=>18449,
-60165=>18449,
-28859=>18450,
-60167=>18450,
-137261=>18451,
-60168=>18451,
-137578=>18452,
-60169=>18452,
-137773=>18453,
-60170=>18453,
-137797=>18454,
-60171=>18454,
-138282=>18455,
-60172=>18455,
-138352=>18456,
-60173=>18456,
-138412=>18457,
-60174=>18457,
-138952=>18458,
-60175=>18458,
-138965=>18459,
-60177=>18459,
-139029=>18460,
-60178=>18460,
-29080=>18461,
-60179=>18461,
-139333=>18462,
-60181=>18462,
-27113=>18463,
-60182=>18463,
-14024=>18464,
-60183=>18464,
-139900=>18465,
-60184=>18465,
-140247=>18466,
-60185=>18466,
-140282=>18467,
-60186=>18467,
-141098=>18468,
-60187=>18468,
-141425=>18469,
-60188=>18469,
-141647=>18470,
-60189=>18470,
-141671=>18471,
-60191=>18471,
-141715=>18472,
-60192=>18472,
-142037=>18473,
-60193=>18473,
-60195=>18474,
-142056=>18474,
-60197=>18475,
-142094=>18475,
-60199=>18476,
-142143=>18476,
-60202=>18477,
-142412=>18477,
-142472=>18478,
-60204=>18478,
-142519=>18479,
-60205=>18479,
-154600=>18480,
-60206=>18480,
-142600=>18481,
-60207=>18481,
-142610=>18482,
-60208=>18482,
-142775=>18483,
-60209=>18483,
-142741=>18484,
-60210=>18484,
-142914=>18485,
-60211=>18485,
-143220=>18486,
-60212=>18486,
-143308=>18487,
-60213=>18487,
-143411=>18488,
-60214=>18488,
-143462=>18489,
-60215=>18489,
-144159=>18490,
-60216=>18490,
-144350=>18491,
-60217=>18491,
-144743=>18492,
-60222=>18492,
-144883=>18493,
-60223=>18493,
-144922=>18494,
-60227=>18494,
-145174=>18495,
-60228=>18495,
-22709=>18496,
-60231=>18496,
-60234=>18497,
-146087=>18497,
-146961=>18498,
-60237=>18498,
-147129=>18499,
-60238=>18499,
-60243=>18500,
-147737=>18500,
-148206=>18501,
-60245=>18501,
-148237=>18502,
-60246=>18502,
-148276=>18503,
-60248=>18503,
-148374=>18504,
-60249=>18504,
-148484=>18505,
-60258=>18505,
-148694=>18506,
-60259=>18506,
-22408=>18507,
-60260=>18507,
-149108=>18508,
-60261=>18508,
-60263=>18509,
-149295=>18509,
-149522=>18510,
-60271=>18510,
-149755=>18511,
-60272=>18511,
-150037=>18512,
-60273=>18512,
-60275=>18513,
-150208=>18513,
-22885=>18514,
-60277=>18514,
-60279=>18515,
-151430=>18515,
-60282=>18516,
-151596=>18516,
-22335=>18517,
-60284=>18517,
-152217=>18518,
-60286=>18518,
-152601=>18519,
-60287=>18519,
-152646=>18520,
-60291=>18520,
-152686=>18521,
-60292=>18521,
-60296=>18522,
-152895=>18522,
-60298=>18523,
-152926=>18523,
-152930=>18524,
-60300=>18524,
-152934=>18525,
-60301=>18525,
-153543=>18526,
-60302=>18526,
-60304=>18527,
-153693=>18527,
-60309=>18528,
-153859=>18528,
-154286=>18529,
-60312=>18529,
-154505=>18530,
-60313=>18530,
-154630=>18531,
-60314=>18531,
-22433=>18532,
-60316=>18532,
-29009=>18533,
-60317=>18533,
-60319=>18534,
-155906=>18534,
-60322=>18535,
-156082=>18535,
-156674=>18536,
-60325=>18536,
-156746=>18537,
-60326=>18537,
-60330=>18538,
-156804=>18538,
-60334=>18539,
-156808=>18539,
-60336=>18540,
-156946=>18540,
-157119=>18541,
-60338=>18541,
-157365=>18542,
-60339=>18542,
-22201=>18543,
-60347=>18543,
-60349=>18544,
-157436=>18544,
-13848=>18545,
-60355=>18545,
-157593=>18546,
-60357=>18546,
-157806=>18547,
-60358=>18547,
-60360=>18548,
-157790=>18548,
-60362=>18549,
-157895=>18549,
-60366=>18550,
-157990=>18550,
-60368=>18551,
-158009=>18551,
-60371=>18552,
-158202=>18552,
-60373=>18553,
-158253=>18553,
-158260=>18554,
-60378=>18554,
-158555=>18555,
-60379=>18555,
-60383=>18556,
-158621=>18556,
-60385=>18557,
-158884=>18557,
-60388=>18558,
-159150=>18558,
-159819=>18559,
-60392=>18559,
-160205=>18560,
-60393=>18560,
-160384=>18561,
-60395=>18561,
-160389=>18562,
-60396=>18562,
-60399=>18563,
-160395=>18563,
-60401=>18564,
-160486=>18564,
-38047=>18565,
-60404=>18565,
-160848=>18566,
-60405=>18566,
-14009=>18567,
-60416=>18567,
-161740=>18568,
-60424=>18568,
-161880=>18569,
-60425=>18569,
-22230=>18570,
-60426=>18570,
-60435=>18571,
-162269=>18571,
-162301=>18572,
-60441=>18572,
-162314=>18573,
-60442=>18573,
-162571=>18574,
-60443=>18574,
-163174=>18575,
-60444=>18575,
-60448=>18576,
-163849=>18576,
-60459=>18577,
-163875=>18577,
-60463=>18578,
-163912=>18578,
-60466=>18579,
-163971=>18579,
-163984=>18580,
-60479=>18580,
-164084=>18581,
-60480=>18581,
-164142=>18582,
-60481=>18582,
-60483=>18583,
-164175=>18583,
-164271=>18584,
-60485=>18584,
-164378=>18585,
-60486=>18585,
-164614=>18586,
-60487=>18586,
-164655=>18587,
-60488=>18587,
-164746=>18588,
-60489=>18588,
-164968=>18589,
-60491=>18589,
-165546=>18590,
-60492=>18590,
-25574=>18591,
-60494=>18591,
-166230=>18592,
-60495=>18592,
-60498=>18593,
-166328=>18593,
-60500=>18594,
-166375=>18594,
-60502=>18595,
-166376=>18595,
-166726=>18596,
-60503=>18596,
-166868=>18597,
-60504=>18597,
-60506=>18598,
-166921=>18598,
-167877=>18599,
-60508=>18599,
-168172=>18600,
-60509=>18600,
-168208=>18601,
-60511=>18601,
-168252=>18602,
-60512=>18602,
-15863=>18603,
-60513=>18603,
-168286=>18604,
-60514=>18604,
-150218=>18605,
-60515=>18605,
-36816=>18606,
-60516=>18606,
-60519=>18607,
-169191=>18607,
-169392=>18608,
-60521=>18608,
-169400=>18609,
-60522=>18609,
-169778=>18610,
-60523=>18610,
-170193=>18611,
-60524=>18611,
-170313=>18612,
-60525=>18612,
-170346=>18613,
-60526=>18613,
-170435=>18614,
-60527=>18614,
-170536=>18615,
-60528=>18615,
-170766=>18616,
-60529=>18616,
-171354=>18617,
-60530=>18617,
-171419=>18618,
-60531=>18618,
-32415=>18619,
-60532=>18619,
-171768=>18620,
-60533=>18620,
-171811=>18621,
-60534=>18621,
-19620=>18622,
-60535=>18622,
-38215=>18623,
-60536=>18623,
-172691=>18624,
-60537=>18624,
-29090=>18625,
-60538=>18625,
-172799=>18626,
-60539=>18626,
-173515=>18627,
-60542=>18627,
-19868=>18628,
-60543=>18628,
-134300=>18629,
-60544=>18629,
-36798=>18630,
-60545=>18630,
-36794=>18631,
-60547=>18631,
-140464=>18632,
-60548=>18632,
-36793=>18633,
-60549=>18633,
-150163=>18634,
-60550=>18634,
-20202=>18635,
-60555=>18635,
-60557=>18636,
-166700=>18636,
-36480=>18637,
-60560=>18637,
-137205=>18638,
-60561=>18638,
-166764=>18639,
-60563=>18639,
-166809=>18640,
-60564=>18640,
-60566=>18641,
-157359=>18641,
-60568=>18642,
-161365=>18642,
-153141=>18643,
-60570=>18643,
-153942=>18644,
-60571=>18644,
-20122=>18645,
-60572=>18645,
-155265=>18646,
-60573=>18646,
-60576=>18647,
-134765=>18647,
-147080=>18648,
-60579=>18648,
-150686=>18649,
-60580=>18649,
-137206=>18650,
-60583=>18650,
-137339=>18651,
-60584=>18651,
-60587=>18652,
-154698=>18652,
-152337=>18653,
-60589=>18653,
-15814=>18654,
-60590=>18654,
-60596=>18655,
-155352=>18655,
-19996=>18656,
-60600=>18656,
-135146=>18657,
-60601=>18657,
-134473=>18658,
-60602=>18658,
-145082=>18659,
-60603=>18659,
-60638=>18660,
-151880=>18660,
-21982=>18661,
-60644=>18661,
-34694=>18662,
-60672=>18662,
-60676=>18663,
-135361=>18663,
-149254=>18664,
-60679=>18664,
-23440=>18665,
-60680=>18665,
-60682=>18666,
-157843=>18666,
-141044=>18667,
-60684=>18667,
-163119=>18668,
-60685=>18668,
-147875=>18669,
-60686=>18669,
-163187=>18670,
-60687=>18670,
-159440=>18671,
-60688=>18671,
-160438=>18672,
-60689=>18672,
-60691=>18673,
-135641=>18673,
-146684=>18674,
-60693=>18674,
-173737=>18675,
-60694=>18675,
-134828=>18676,
-60695=>18676,
-60698=>18677,
-138402=>18677,
-60700=>18678,
-151490=>18678,
-60702=>18679,
-135147=>18679,
-60706=>18680,
-142752=>18680,
-135148=>18681,
-60710=>18681,
-134666=>18682,
-60711=>18682,
-60714=>18683,
-135149=>18683,
-60717=>18684,
-135559=>18684,
-19994=>18685,
-60721=>18685,
-19972=>18686,
-60722=>18686,
-23309=>18687,
-60724=>18687,
-13996=>18688,
-60727=>18688,
-21373=>18689,
-60729=>18689,
-13989=>18690,
-60730=>18690,
-22682=>18691,
-60732=>18691,
-150382=>18692,
-60733=>18692,
-22442=>18693,
-60736=>18693,
-154261=>18694,
-60737=>18694,
-133497=>18695,
-60738=>18695,
-60741=>18696,
-140389=>18696,
-146686=>18697,
-60746=>18697,
-171824=>18698,
-60747=>18698,
-151465=>18699,
-60749=>18699,
-169374=>18700,
-60750=>18700,
-60753=>18701,
-146870=>18701,
-157619=>18702,
-60755=>18702,
-145184=>18703,
-60756=>18703,
-147191=>18704,
-60759=>18704,
-146988=>18705,
-60760=>18705,
-60785=>18706,
-143578=>18706,
-135849=>18707,
-60789=>18707,
-22439=>18708,
-60790=>18708,
-149859=>18709,
-60791=>18709,
-60794=>18710,
-159918=>18710,
-60801=>18711,
-137068=>18711,
-60806=>18712,
-160100=>18712,
-159010=>18713,
-60809=>18713,
-150242=>18714,
-60810=>18714,
-39963=>18715,
-60837=>18715,
-149822=>18716,
-60838=>18716,
-15878=>18717,
-60846=>18717,
-60881=>18718,
-159011=>18718,
-60887=>18719,
-132092=>18719,
-60891=>18720,
-146685=>18720,
-60893=>18721,
-149785=>18721,
-22394=>18722,
-60904=>18722,
-21722=>18723,
-60912=>18723,
-29050=>18724,
-60928=>18724,
-60949=>18725,
-150135=>18725,
-60955=>18726,
-166490=>18726,
-60962=>18727,
-194624=>18727,
-60976=>18728,
-137275=>18728,
-61000=>18729,
-155993=>18729,
-61014=>18730,
-144373=>18730,
-61019=>18731,
-166850=>18731,
-61024=>18732,
-138566=>18732,
-61054=>18733,
-159441=>18733,
-13877=>18734,
-61065=>18734,
-61084=>18735,
-166701=>18735,
-21024=>18736,
-61088=>18736,
-15384=>18737,
-61089=>18737,
-146631=>18738,
-61090=>18738,
-155351=>18739,
-61091=>18739,
-161366=>18740,
-61092=>18740,
-152881=>18741,
-61093=>18741,
-137540=>18742,
-61094=>18742,
-170243=>18743,
-61096=>18743,
-159196=>18744,
-61097=>18744,
-159917=>18745,
-61098=>18745,
-156077=>18746,
-61100=>18746,
-166415=>18747,
-61101=>18747,
-145015=>18748,
-61102=>18748,
-131310=>18749,
-61103=>18749,
-157766=>18750,
-61104=>18750,
-151310=>18751,
-61105=>18751,
-17762=>18752,
-61106=>18752,
-23327=>18753,
-61107=>18753,
-156492=>18754,
-61108=>18754,
-40784=>18755,
-61109=>18755,
-40614=>18756,
-61110=>18756,
-156267=>18757,
-61111=>18757,
-20962=>18758,
-57415=>18758,
-21314=>18759,
-57416=>18759,
-26285=>18760,
-57520=>18760,
-22620=>18761,
-57547=>18761,
-21843=>18762,
-57566=>18762,
-15749=>18763,
-57594=>18763,
-24928=>18764,
-57608=>18764,
-18606=>18765,
-57668=>18765,
-38845=>18766,
-57676=>18766,
-57693=>18767,
-137335=>18767,
-24755=>18768,
-57703=>18768,
-33828=>18769,
-57711=>18769,
-38932=>18770,
-57748=>18770,
-147596=>18771,
-57749=>18771,
-57764=>18772,
-143486=>18772,
-57787=>18773,
-138813=>18773,
-15147=>18774,
-57798=>18774,
-15666=>18775,
-57824=>18775,
-57857=>18776,
-132021=>18776,
-28801=>18777,
-57944=>18777,
-23708=>18778,
-57959=>18778,
-58017=>18779,
-132547=>18779,
-14128=>18780,
-58028=>18780,
-136054=>18781,
-58096=>18781,
-150034=>18782,
-58097=>18782,
-58111=>18783,
-166699=>18783,
-58112=>18784,
-155779=>18784,
-256=>18785,
-62233=>18785,
-193=>18786,
-62234=>18786,
-461=>18787,
-62235=>18787,
-192=>18788,
-62236=>18788,
-274=>18789,
-62237=>18789,
-201=>18790,
-62238=>18790,
-282=>18791,
-62239=>18791,
-200=>18792,
-62240=>18792,
-332=>18793,
-62241=>18793,
-211=>18794,
-62242=>18794,
-465=>18795,
-62243=>18795,
-210=>18796,
-62244=>18796,
-62245=>18797,
-7870=>18798,
-62246=>18798,
-62247=>18799,
-7872=>18800,
-62248=>18800,
-202=>18801,
-62249=>18801,
-257=>18802,
-62250=>18802,
-225=>18803,
-62251=>18803,
-462=>18804,
-62252=>18804,
-224=>18805,
-62253=>18805,
-593=>18806,
-62254=>18806,
-275=>18807,
-62255=>18807,
-233=>18808,
-62256=>18808,
-283=>18809,
-62257=>18809,
-232=>18810,
-62258=>18810,
-299=>18811,
-62259=>18811,
-237=>18812,
-62260=>18812,
-464=>18813,
-62261=>18813,
-236=>18814,
-62262=>18814,
-333=>18815,
-62263=>18815,
-243=>18816,
-62264=>18816,
-466=>18817,
-62265=>18817,
-242=>18818,
-62266=>18818,
-363=>18819,
-62267=>18819,
-250=>18820,
-62268=>18820,
-468=>18821,
-62269=>18821,
-249=>18822,
-62270=>18822,
-470=>18823,
-62271=>18823,
-472=>18824,
-62272=>18824,
-474=>18825,
-62273=>18825,
-476=>18826,
-62274=>18826,
-252=>18827,
-62275=>18827,
-62276=>18828,
-7871=>18829,
-62277=>18829,
-62278=>18830,
-7873=>18831,
-62279=>18831,
-234=>18832,
-62280=>18832,
-609=>18833,
-62281=>18833,
-643=>18834,
-63551=>18834,
-592=>18835,
-63552=>18835,
-603=>18836,
-63553=>18836,
-596=>18837,
-63554=>18837,
-629=>18838,
-63555=>18838,
-339=>18839,
-63556=>18839,
-248=>18840,
-63557=>18840,
-331=>18841,
-63558=>18841,
-650=>18842,
-63559=>18842,
-618=>18843,
-63560=>18843,
-9178=>18844,
-62282=>18844,
-9179=>18845,
-62283=>18845,
-11933=>18846,
-63530=>18846,
-11974=>18847,
-63539=>18847,
-12003=>18848,
-63547=>18848,
-20539=>18849,
-28158=>18850,
-171123=>18851,
-62841=>18851,
-40870=>18852,
-62842=>18852,
-15817=>18853,
-62843=>18853,
-34959=>18854,
-62845=>18855,
-147790=>18855,
-28791=>18856,
-23797=>18857,
-19232=>18858,
-62848=>18858,
-152013=>18859,
-62849=>18859,
-13657=>18860,
-62850=>18860,
-154928=>18861,
-62851=>18861,
-24866=>18862,
-62853=>18863,
-166450=>18863,
-36775=>18864,
-37366=>18865,
-29073=>18866,
-26393=>18867,
-29626=>18868,
-144001=>18869,
-62859=>18869,
-172295=>18870,
-62860=>18870,
-15499=>18871,
-62861=>18871,
-137600=>18872,
-62862=>18872,
-19216=>18873,
-62863=>18873,
-30948=>18874,
-29698=>18875,
-20910=>18876,
-165647=>18877,
-62867=>18877,
-16393=>18878,
-62868=>18878,
-27235=>18879,
-172730=>18880,
-62870=>18880,
-16931=>18881,
-62871=>18881,
-34319=>18882,
-31274=>18883,
-170311=>18884,
-62875=>18884,
-166634=>18885,
-62876=>18885,
-38741=>18886,
-28749=>18887,
-21284=>18888,
-62880=>18889,
-139390=>18889,
-37876=>18890,
-30425=>18891,
-166371=>18892,
-62883=>18892,
-40871=>18893,
-62884=>18893,
-30685=>18894,
-20131=>18895,
-20464=>18896,
-20668=>18897,
-20015=>18898,
-20247=>18899,
-40872=>18900,
-62891=>18900,
-21556=>18901,
-32139=>18902,
-22674=>18903,
-22736=>18904,
-62896=>18905,
-138678=>18905,
-24210=>18906,
-24217=>18907,
-24514=>18908,
-62900=>18909,
-141074=>18909,
-25995=>18910,
-62902=>18911,
-144377=>18911,
-26905=>18912,
-27203=>18913,
-62905=>18914,
-146531=>18914,
-27903=>18915,
-29184=>18916,
-62909=>18917,
-148741=>18917,
-29580=>18918,
-16091=>18919,
-62911=>18919,
-150035=>18920,
-62912=>18920,
-23317=>18921,
-29881=>18922,
-35715=>18923,
-154788=>18924,
-62916=>18924,
-153237=>18925,
-62917=>18925,
-31379=>18926,
-31724=>18927,
-31939=>18928,
-32364=>18929,
-33528=>18930,
-34199=>18931,
-40873=>18932,
-62924=>18932,
-34960=>18933,
-40874=>18934,
-62926=>18934,
-36537=>18935,
-40875=>18936,
-62928=>18936,
-36815=>18937,
-34143=>18938,
-39392=>18939,
-37409=>18940,
-40876=>18941,
-62933=>18941,
-167353=>18942,
-62934=>18942,
-136255=>18943,
-62935=>18943,
-16497=>18944,
-62936=>18944,
-17058=>18945,
-62937=>18945,
-23066=>18946,
-39016=>18947,
-26475=>18948,
-17014=>18949,
-62944=>18949,
-22333=>18950,
-34262=>18951,
-62948=>18952,
-149883=>18952,
-33471=>18953,
-160013=>18954,
-62950=>18954,
-19585=>18955,
-62951=>18955,
-159092=>18956,
-62952=>18956,
-23931=>18957,
-158485=>18958,
-62954=>18958,
-159678=>18959,
-62955=>18959,
-40877=>18960,
-62956=>18960,
-40878=>18961,
-62957=>18961,
-23446=>18962,
-40879=>18963,
-62959=>18963,
-32347=>18964,
-17392=>18965,
-19506=>18966,
-17923=>18967,
-17830=>18968,
-17784=>18969,
-160359=>18970,
-19831=>18971,
-17843=>18972,
-162993=>18973,
-19682=>18974,
-163013=>18975,
-15253=>18976,
-18230=>18977,
-18244=>18978,
-19527=>18979,
-19520=>18980,
-148159=>18981,
-144919=>18982,
-160594=>18983,
-159371=>18984,
-159954=>18985,
-19543=>18986,
-172881=>18987,
-18255=>18988,
-17882=>18989,
-19589=>18990,
-162924=>18991,
-19719=>18992,
-19108=>18993,
-18081=>18994,
-158499=>18995,
-29221=>18996,
-154196=>18997,
-137827=>18998,
-146950=>18999,
-147297=>19000,
-26189=>19001,
-22267=>19002,
-32149=>19003,
-22813=>19004,
-166841=>19005,
-15860=>19006,
-38708=>19007,
-162799=>19008,
-23515=>19009,
-138590=>19010,
-23204=>19011,
-13861=>19012,
-171696=>19013,
-23249=>19014,
-23479=>19015,
-23804=>19016,
-26478=>19017,
-34195=>19018,
-170309=>19019,
-29793=>19020,
-29853=>19021,
-133743=>19022,
-26343=>19023,
-28247=>19024,
-31178=>19025,
-15752=>19026,
-17603=>19027,
-143958=>19028,
-141206=>19029,
-17306=>19030,
-17718=>19031,
-23765=>19032,
-146202=>19033,
-35577=>19034,
-23672=>19035,
-15634=>19036,
-144721=>19037,
-23928=>19038,
-40882=>19039,
-29015=>19040,
-17752=>19041,
-147692=>19042,
-138787=>19043,
-19575=>19044,
-14712=>19045,
-13386=>19046,
-131492=>19047,
-158785=>19048,
-35532=>19049,
-20404=>19050,
-131641=>19051,
-22975=>19052,
-33132=>19053,
-38998=>19054,
-170234=>19055,
-24379=>19056,
-134047=>19057,
-139713=>19058,
-166253=>19059,
-16642=>19060,
-18107=>19061,
-168057=>19062,
-16135=>19063,
-40883=>19064,
-172469=>19065,
-16632=>19066,
-14294=>19067,
-18167=>19068,
-158790=>19069,
-16764=>19070,
-165554=>19071,
-160767=>19072,
-17773=>19073,
-14548=>19074,
-152730=>19075,
-17761=>19076,
-17691=>19077,
-19849=>19078,
-19579=>19079,
-19830=>19080,
-17898=>19081,
-16328=>19082,
-150287=>19083,
-13921=>19084,
-17630=>19085,
-17597=>19086,
-16877=>19087,
-);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ag15.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ag15.php
deleted file mode 100644
index ae64905814f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ag15.php
+++ /dev/null
@@ -1,30222 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ag15.tar.Z
-$cidinfo['uni2cid'] = array(
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-92=>61,
-93=>62,
-94=>63,
-95=>64,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-124=>93,
-125=>94,
-126=>95,
-12288=>96,
-12289=>97,
-12290=>98,
-183=>99,
-12539=>99,
-713=>100,
-711=>101,
-168=>102,
-12291=>103,
-12293=>104,
-8212=>105,
-65374=>106,
-8214=>107,
-8230=>108,
-8943=>108,
-8216=>109,
-8217=>110,
-8220=>111,
-8221=>112,
-12308=>113,
-12309=>114,
-12296=>115,
-12297=>116,
-12298=>117,
-12299=>118,
-12300=>119,
-12301=>120,
-12302=>121,
-12303=>122,
-12310=>123,
-12311=>124,
-12304=>125,
-12305=>126,
-177=>127,
-215=>128,
-247=>129,
-8758=>130,
-8743=>131,
-8744=>132,
-8721=>133,
-8719=>134,
-8746=>135,
-8745=>136,
-8712=>137,
-8759=>138,
-8730=>139,
-8869=>140,
-8741=>141,
-8736=>142,
-8978=>143,
-8857=>144,
-8747=>145,
-8750=>146,
-8801=>147,
-8780=>148,
-8776=>149,
-8765=>150,
-8733=>151,
-8800=>152,
-8814=>153,
-8815=>154,
-8804=>155,
-8805=>156,
-8734=>157,
-8757=>158,
-8756=>159,
-9794=>160,
-9792=>161,
-176=>162,
-8242=>163,
-8243=>164,
-8451=>165,
-65284=>166,
-164=>167,
-65504=>168,
-65505=>169,
-8240=>170,
-167=>171,
-8470=>172,
-9734=>173,
-9733=>174,
-9675=>175,
-9679=>176,
-9678=>177,
-9671=>178,
-9670=>179,
-9633=>180,
-9632=>181,
-9651=>182,
-9650=>183,
-8251=>184,
-8594=>185,
-8592=>186,
-8593=>187,
-8595=>188,
-12307=>189,
-9352=>190,
-9353=>191,
-9354=>192,
-9355=>193,
-9356=>194,
-9357=>195,
-9358=>196,
-9359=>197,
-9360=>198,
-9361=>199,
-9362=>200,
-9363=>201,
-9364=>202,
-9365=>203,
-9366=>204,
-9367=>205,
-9368=>206,
-9369=>207,
-9370=>208,
-9371=>209,
-9332=>210,
-9333=>211,
-9334=>212,
-9335=>213,
-9336=>214,
-9337=>215,
-9338=>216,
-9339=>217,
-9340=>218,
-9341=>219,
-9342=>220,
-9343=>221,
-9344=>222,
-9345=>223,
-9346=>224,
-9347=>225,
-9348=>226,
-9349=>227,
-9350=>228,
-9351=>229,
-9312=>230,
-9313=>231,
-9314=>232,
-9315=>233,
-9316=>234,
-9317=>235,
-9318=>236,
-9319=>237,
-9320=>238,
-9321=>239,
-12832=>240,
-12833=>241,
-12834=>242,
-12835=>243,
-12836=>244,
-12837=>245,
-12838=>246,
-12839=>247,
-12840=>248,
-12841=>249,
-8544=>250,
-8545=>251,
-8546=>252,
-8547=>253,
-8548=>254,
-8549=>255,
-8550=>256,
-8551=>257,
-8552=>258,
-8553=>259,
-8554=>260,
-8555=>261,
-65281=>262,
-65282=>263,
-65283=>264,
-65509=>265,
-65285=>266,
-65286=>267,
-65287=>268,
-65288=>269,
-65289=>270,
-65290=>271,
-65291=>272,
-65292=>273,
-65293=>274,
-65294=>275,
-65295=>276,
-65296=>277,
-65297=>278,
-65298=>279,
-65299=>280,
-65300=>281,
-65301=>282,
-65302=>283,
-65303=>284,
-65304=>285,
-65305=>286,
-65306=>287,
-65307=>288,
-65308=>289,
-65309=>290,
-65310=>291,
-65311=>292,
-65312=>293,
-65313=>294,
-65314=>295,
-65315=>296,
-65316=>297,
-65317=>298,
-65318=>299,
-65319=>300,
-65320=>301,
-65321=>302,
-65322=>303,
-65323=>304,
-65324=>305,
-65325=>306,
-65326=>307,
-65327=>308,
-65328=>309,
-65329=>310,
-65330=>311,
-65331=>312,
-65332=>313,
-65333=>314,
-65334=>315,
-65335=>316,
-65336=>317,
-65337=>318,
-65338=>319,
-65339=>320,
-65340=>321,
-65341=>322,
-65342=>323,
-65343=>324,
-65344=>325,
-65345=>326,
-65346=>327,
-65347=>328,
-65348=>329,
-65349=>330,
-65350=>331,
-65351=>332,
-65352=>333,
-65353=>334,
-65354=>335,
-65355=>336,
-65356=>337,
-65357=>338,
-65358=>339,
-65359=>340,
-65360=>341,
-65361=>342,
-65362=>343,
-65363=>344,
-65364=>345,
-65365=>346,
-65366=>347,
-65367=>348,
-65368=>349,
-65369=>350,
-65370=>351,
-65371=>352,
-65372=>353,
-65373=>354,
-65507=>355,
-12353=>356,
-12354=>357,
-12355=>358,
-12356=>359,
-12357=>360,
-12358=>361,
-12359=>362,
-12360=>363,
-12361=>364,
-12362=>365,
-12363=>366,
-12364=>367,
-12365=>368,
-12366=>369,
-12367=>370,
-12368=>371,
-12369=>372,
-12370=>373,
-12371=>374,
-12372=>375,
-12373=>376,
-12374=>377,
-12375=>378,
-12376=>379,
-12377=>380,
-12378=>381,
-12379=>382,
-12380=>383,
-12381=>384,
-12382=>385,
-12383=>386,
-12384=>387,
-12385=>388,
-12386=>389,
-12387=>390,
-12388=>391,
-12389=>392,
-12390=>393,
-12391=>394,
-12392=>395,
-12393=>396,
-12394=>397,
-12395=>398,
-12396=>399,
-12397=>400,
-12398=>401,
-12399=>402,
-12400=>403,
-12401=>404,
-12402=>405,
-12403=>406,
-12404=>407,
-12405=>408,
-12406=>409,
-12407=>410,
-12408=>411,
-12409=>412,
-12410=>413,
-12411=>414,
-12412=>415,
-12413=>416,
-12414=>417,
-12415=>418,
-12416=>419,
-12417=>420,
-12418=>421,
-12419=>422,
-12420=>423,
-12421=>424,
-12422=>425,
-12423=>426,
-12424=>427,
-12425=>428,
-12426=>429,
-12427=>430,
-12428=>431,
-12429=>432,
-12430=>433,
-12431=>434,
-12432=>435,
-12433=>436,
-12434=>437,
-12435=>438,
-12449=>439,
-12450=>440,
-12451=>441,
-12452=>442,
-12453=>443,
-12454=>444,
-12455=>445,
-12456=>446,
-12457=>447,
-12458=>448,
-12459=>449,
-12460=>450,
-12461=>451,
-12462=>452,
-12463=>453,
-12464=>454,
-12465=>455,
-12466=>456,
-12467=>457,
-12468=>458,
-12469=>459,
-12470=>460,
-12471=>461,
-12472=>462,
-12473=>463,
-12474=>464,
-12475=>465,
-12476=>466,
-12477=>467,
-12478=>468,
-12479=>469,
-12480=>470,
-12481=>471,
-12482=>472,
-12483=>473,
-12484=>474,
-12485=>475,
-12486=>476,
-12487=>477,
-12488=>478,
-12489=>479,
-12490=>480,
-12491=>481,
-12492=>482,
-12493=>483,
-12494=>484,
-12495=>485,
-12496=>486,
-12497=>487,
-12498=>488,
-12499=>489,
-12500=>490,
-12501=>491,
-12502=>492,
-12503=>493,
-12504=>494,
-12505=>495,
-12506=>496,
-12507=>497,
-12508=>498,
-12509=>499,
-12510=>500,
-12511=>501,
-12512=>502,
-12513=>503,
-12514=>504,
-12515=>505,
-12516=>506,
-12517=>507,
-12518=>508,
-12519=>509,
-12520=>510,
-12521=>511,
-12522=>512,
-12523=>513,
-12524=>514,
-12525=>515,
-12526=>516,
-12527=>517,
-12528=>518,
-12529=>519,
-12530=>520,
-12531=>521,
-12532=>522,
-12533=>523,
-12534=>524,
-913=>525,
-914=>526,
-915=>527,
-916=>528,
-917=>529,
-918=>530,
-919=>531,
-920=>532,
-921=>533,
-922=>534,
-923=>535,
-924=>536,
-925=>537,
-926=>538,
-927=>539,
-928=>540,
-929=>541,
-931=>542,
-932=>543,
-933=>544,
-934=>545,
-935=>546,
-936=>547,
-937=>548,
-945=>549,
-946=>550,
-947=>551,
-948=>552,
-949=>553,
-950=>554,
-951=>555,
-952=>556,
-953=>557,
-954=>558,
-955=>559,
-956=>560,
-957=>561,
-958=>562,
-959=>563,
-960=>564,
-961=>565,
-963=>566,
-964=>567,
-965=>568,
-966=>569,
-967=>570,
-968=>571,
-969=>572,
-65040=>573,
-59277=>573,
-65042=>574,
-59278=>574,
-65041=>575,
-59279=>575,
-59280=>576,
-65043=>576,
-59281=>577,
-65044=>577,
-59282=>578,
-65045=>578,
-59283=>579,
-65046=>579,
-65077=>580,
-65078=>581,
-65081=>582,
-65082=>583,
-65087=>584,
-65088=>585,
-65085=>586,
-65086=>587,
-65089=>588,
-65090=>589,
-65091=>590,
-65092=>591,
-59284=>592,
-65047=>592,
-59285=>593,
-65048=>593,
-65083=>594,
-65084=>595,
-65079=>596,
-65080=>597,
-65073=>598,
-8285=>599,
-59286=>599,
-65049=>599,
-65075=>600,
-65076=>601,
-1040=>602,
-1041=>603,
-1042=>604,
-1043=>605,
-1044=>606,
-1045=>607,
-1025=>608,
-1046=>609,
-1047=>610,
-1048=>611,
-1049=>612,
-1050=>613,
-1051=>614,
-1052=>615,
-1053=>616,
-1054=>617,
-1055=>618,
-1056=>619,
-1057=>620,
-1058=>621,
-1059=>622,
-1060=>623,
-1061=>624,
-1062=>625,
-1063=>626,
-1064=>627,
-1065=>628,
-1066=>629,
-1067=>630,
-1068=>631,
-1069=>632,
-1070=>633,
-1071=>634,
-1072=>635,
-1073=>636,
-1074=>637,
-1075=>638,
-1076=>639,
-1077=>640,
-1105=>641,
-1078=>642,
-1079=>643,
-1080=>644,
-1081=>645,
-1082=>646,
-1083=>647,
-1084=>648,
-1085=>649,
-1086=>650,
-1087=>651,
-1088=>652,
-1089=>653,
-1090=>654,
-1091=>655,
-1092=>656,
-1093=>657,
-1094=>658,
-1095=>659,
-1096=>660,
-1097=>661,
-1098=>662,
-1099=>663,
-1100=>664,
-1101=>665,
-1102=>666,
-1103=>667,
-257=>668,
-225=>669,
-462=>670,
-224=>671,
-275=>672,
-233=>673,
-283=>674,
-232=>675,
-299=>676,
-237=>677,
-464=>678,
-236=>679,
-333=>680,
-243=>681,
-466=>682,
-242=>683,
-363=>684,
-250=>685,
-468=>686,
-249=>687,
-470=>688,
-472=>689,
-474=>690,
-476=>691,
-252=>692,
-234=>693,
-593=>694,
-7743=>695,
-59335=>695,
-324=>696,
-328=>697,
-505=>698,
-59336=>698,
-609=>699,
-12549=>700,
-12550=>701,
-12551=>702,
-12552=>703,
-12553=>704,
-12554=>705,
-12555=>706,
-12556=>707,
-12557=>708,
-12558=>709,
-12559=>710,
-12560=>711,
-12561=>712,
-12562=>713,
-12563=>714,
-12564=>715,
-12565=>716,
-12566=>717,
-12567=>718,
-12568=>719,
-12569=>720,
-12570=>721,
-12571=>722,
-12572=>723,
-12573=>724,
-12574=>725,
-12575=>726,
-12576=>727,
-12577=>728,
-12578=>729,
-12579=>730,
-12580=>731,
-12581=>732,
-12582=>733,
-12583=>734,
-12584=>735,
-12585=>736,
-9472=>738,
-9473=>739,
-9474=>740,
-9475=>741,
-9476=>742,
-9477=>743,
-9478=>744,
-9479=>745,
-9480=>746,
-9481=>747,
-9482=>748,
-9483=>749,
-9484=>750,
-9485=>751,
-9486=>752,
-9487=>753,
-9488=>754,
-9489=>755,
-9490=>756,
-9491=>757,
-9492=>758,
-9493=>759,
-9494=>760,
-9495=>761,
-9496=>762,
-9497=>763,
-9498=>764,
-9499=>765,
-9500=>766,
-9501=>767,
-9502=>768,
-9503=>769,
-9504=>770,
-9505=>771,
-9506=>772,
-9507=>773,
-9508=>774,
-9509=>775,
-9510=>776,
-9511=>777,
-9512=>778,
-9513=>779,
-9514=>780,
-9515=>781,
-9516=>782,
-9517=>783,
-9518=>784,
-9519=>785,
-9520=>786,
-9521=>787,
-9522=>788,
-9523=>789,
-9524=>790,
-9525=>791,
-9526=>792,
-9527=>793,
-9528=>794,
-9529=>795,
-9530=>796,
-9531=>797,
-9532=>798,
-9533=>799,
-9534=>800,
-9535=>801,
-9536=>802,
-9537=>803,
-9538=>804,
-9539=>805,
-9540=>806,
-9541=>807,
-9542=>808,
-9543=>809,
-9544=>810,
-9545=>811,
-9546=>812,
-9547=>813,
-21834=>940,
-38463=>941,
-22467=>942,
-25384=>943,
-21710=>944,
-21769=>945,
-21696=>946,
-30353=>947,
-30284=>948,
-34108=>949,
-30702=>950,
-33406=>951,
-30861=>952,
-29233=>953,
-38552=>954,
-38797=>955,
-27688=>956,
-23433=>957,
-20474=>958,
-25353=>959,
-26263=>960,
-23736=>961,
-33018=>962,
-26696=>963,
-32942=>964,
-26114=>965,
-30414=>966,
-20985=>967,
-25942=>968,
-29100=>969,
-32753=>970,
-34948=>971,
-20658=>972,
-22885=>973,
-25034=>974,
-28595=>975,
-33453=>976,
-25420=>977,
-25170=>978,
-21485=>979,
-21543=>980,
-31494=>981,
-12043=>982,
-20843=>982,
-30116=>983,
-24052=>984,
-25300=>985,
-36299=>986,
-38774=>987,
-25226=>988,
-32793=>989,
-22365=>990,
-38712=>991,
-32610=>992,
-29240=>993,
-12137=>994,
-30333=>994,
-26575=>995,
-30334=>996,
-25670=>997,
-20336=>998,
-36133=>999,
-25308=>1000,
-31255=>1001,
-26001=>1002,
-29677=>1003,
-25644=>1004,
-25203=>1005,
-33324=>1006,
-39041=>1007,
-26495=>1008,
-29256=>1009,
-25198=>1010,
-25292=>1011,
-20276=>1012,
-29923=>1013,
-21322=>1014,
-21150=>1015,
-32458=>1016,
-37030=>1017,
-24110=>1018,
-26758=>1019,
-27036=>1020,
-33152=>1021,
-32465=>1022,
-26834=>1023,
-30917=>1024,
-34444=>1025,
-38225=>1026,
-20621=>1027,
-35876=>1028,
-33502=>1029,
-32990=>1030,
-21253=>1031,
-35090=>1032,
-21093=>1033,
-34180=>1034,
-38649=>1035,
-20445=>1036,
-22561=>1037,
-39281=>1038,
-23453=>1039,
-25265=>1040,
-25253=>1041,
-26292=>1042,
-35961=>1043,
-40077=>1044,
-29190=>1045,
-26479=>1046,
-30865=>1047,
-24754=>1048,
-21329=>1049,
-21271=>1050,
-36744=>1051,
-32972=>1052,
-36125=>1053,
-38049=>1054,
-20493=>1055,
-29384=>1056,
-22791=>1057,
-24811=>1058,
-28953=>1059,
-34987=>1060,
-22868=>1061,
-33519=>1062,
-26412=>1063,
-31528=>1064,
-23849=>1065,
-32503=>1066,
-29997=>1067,
-27893=>1068,
-36454=>1069,
-36856=>1070,
-36924=>1071,
-12240=>1072,
-40763=>1072,
-12112=>1073,
-27604=>1073,
-37145=>1074,
-31508=>1075,
-24444=>1076,
-30887=>1077,
-34006=>1078,
-34109=>1079,
-27605=>1080,
-27609=>1081,
-27606=>1082,
-24065=>1083,
-24199=>1084,
-30201=>1085,
-38381=>1086,
-25949=>1087,
-24330=>1088,
-24517=>1089,
-36767=>1090,
-22721=>1091,
-33218=>1092,
-36991=>1093,
-38491=>1094,
-38829=>1095,
-36793=>1096,
-32534=>1097,
-36140=>1098,
-25153=>1099,
-20415=>1100,
-21464=>1101,
-21342=>1102,
-36776=>1103,
-36777=>1104,
-36779=>1105,
-36941=>1106,
-26631=>1107,
-24426=>1108,
-33176=>1109,
-34920=>1110,
-40150=>1111,
-24971=>1112,
-21035=>1113,
-30250=>1114,
-24428=>1115,
-25996=>1116,
-28626=>1117,
-28392=>1118,
-23486=>1119,
-25672=>1120,
-20853=>1121,
-20912=>1122,
-26564=>1123,
-19993=>1124,
-31177=>1125,
-39292=>1126,
-28851=>1127,
-30149=>1128,
-24182=>1129,
-29627=>1130,
-33760=>1131,
-25773=>1132,
-25320=>1133,
-38069=>1134,
-27874=>1135,
-21338=>1136,
-21187=>1137,
-25615=>1138,
-38082=>1139,
-31636=>1140,
-20271=>1141,
-24091=>1142,
-33334=>1143,
-33046=>1144,
-33162=>1145,
-28196=>1146,
-27850=>1147,
-39539=>1148,
-25429=>1149,
-12056=>1150,
-21340=>1150,
-21754=>1151,
-34917=>1152,
-22496=>1153,
-19981=>1154,
-24067=>1155,
-27493=>1156,
-31807=>1157,
-37096=>1158,
-24598=>1159,
-25830=>1160,
-29468=>1161,
-35009=>1162,
-26448=>1163,
-25165=>1164,
-36130=>1165,
-30572=>1166,
-36393=>1167,
-37319=>1168,
-24425=>1169,
-33756=>1170,
-34081=>1171,
-39184=>1172,
-21442=>1173,
-34453=>1174,
-27531=>1175,
-24813=>1176,
-24808=>1177,
-28799=>1178,
-33485=>1179,
-33329=>1180,
-20179=>1181,
-27815=>1182,
-34255=>1183,
-25805=>1184,
-31961=>1185,
-27133=>1186,
-26361=>1187,
-33609=>1188,
-21397=>1189,
-31574=>1190,
-20391=>1191,
-20876=>1192,
-27979=>1193,
-23618=>1194,
-36461=>1195,
-25554=>1196,
-21449=>1197,
-33580=>1198,
-33590=>1199,
-26597=>1200,
-30900=>1201,
-25661=>1202,
-23519=>1203,
-23700=>1204,
-24046=>1205,
-35815=>1206,
-25286=>1207,
-26612=>1208,
-35962=>1209,
-25600=>1210,
-25530=>1211,
-34633=>1212,
-39307=>1213,
-35863=>1214,
-32544=>1215,
-38130=>1216,
-20135=>1217,
-38416=>1218,
-39076=>1219,
-26124=>1220,
-29462=>1221,
-22330=>1222,
-23581=>1223,
-24120=>1224,
-38271=>1225,
-20607=>1226,
-32928=>1227,
-12058=>1228,
-21378=>1228,
-25950=>1229,
-30021=>1230,
-21809=>1231,
-20513=>1232,
-36229=>1233,
-25220=>1234,
-38046=>1235,
-26397=>1236,
-22066=>1237,
-28526=>1238,
-24034=>1239,
-21557=>1240,
-28818=>1241,
-36710=>1242,
-25199=>1243,
-25764=>1244,
-25507=>1245,
-24443=>1246,
-28552=>1247,
-37108=>1248,
-12162=>1249,
-33251=>1249,
-12192=>1250,
-36784=>1250,
-23576=>1251,
-26216=>1252,
-24561=>1253,
-27785=>1254,
-38472=>1255,
-36225=>1256,
-34924=>1257,
-25745=>1258,
-31216=>1259,
-22478=>1260,
-27225=>1261,
-25104=>1262,
-21576=>1263,
-20056=>1264,
-31243=>1265,
-24809=>1266,
-28548=>1267,
-35802=>1268,
-25215=>1269,
-36894=>1270,
-39563=>1271,
-31204=>1272,
-21507=>1273,
-30196=>1274,
-25345=>1275,
-21273=>1276,
-27744=>1277,
-36831=>1278,
-24347=>1279,
-39536=>1280,
-32827=>1281,
-40831=>1282,
-20360=>1283,
-23610=>1284,
-12186=>1285,
-36196=>1285,
-32709=>1286,
-26021=>1287,
-28861=>1288,
-20805=>1289,
-20914=>1290,
-12173=>1291,
-34411=>1291,
-23815=>1292,
-23456=>1293,
-25277=>1294,
-37228=>1295,
-30068=>1296,
-36364=>1297,
-31264=>1298,
-24833=>1299,
-31609=>1300,
-20167=>1301,
-32504=>1302,
-30597=>1303,
-19985=>1304,
-33261=>1305,
-21021=>1306,
-20986=>1307,
-27249=>1308,
-21416=>1309,
-36487=>1310,
-38148=>1311,
-38607=>1312,
-28353=>1313,
-38500=>1314,
-26970=>1315,
-30784=>1316,
-20648=>1317,
-30679=>1318,
-25616=>1319,
-35302=>1320,
-22788=>1321,
-25571=>1322,
-24029=>1323,
-31359=>1324,
-26941=>1325,
-20256=>1326,
-33337=>1327,
-21912=>1328,
-20018=>1329,
-30126=>1330,
-31383=>1331,
-24162=>1332,
-24202=>1333,
-38383=>1334,
-21019=>1335,
-21561=>1336,
-28810=>1337,
-25462=>1338,
-38180=>1339,
-22402=>1340,
-26149=>1341,
-26943=>1342,
-37255=>1343,
-21767=>1344,
-28147=>1345,
-32431=>1346,
-34850=>1347,
-25139=>1348,
-32496=>1349,
-30133=>1350,
-33576=>1351,
-30913=>1352,
-38604=>1353,
-36766=>1354,
-24904=>1355,
-29943=>1356,
-35789=>1357,
-27492=>1358,
-21050=>1359,
-36176=>1360,
-27425=>1361,
-32874=>1362,
-33905=>1363,
-22257=>1364,
-21254=>1365,
-20174=>1366,
-19995=>1367,
-20945=>1368,
-31895=>1369,
-37259=>1370,
-31751=>1371,
-20419=>1372,
-36479=>1373,
-31713=>1374,
-31388=>1375,
-25703=>1376,
-23828=>1377,
-20652=>1378,
-33030=>1379,
-30209=>1380,
-31929=>1381,
-28140=>1382,
-32736=>1383,
-26449=>1384,
-23384=>1385,
-12072=>1386,
-23544=>1386,
-30923=>1387,
-25774=>1388,
-25619=>1389,
-25514=>1390,
-25387=>1391,
-38169=>1392,
-25645=>1393,
-36798=>1394,
-31572=>1395,
-30249=>1396,
-25171=>1397,
-12068=>1398,
-22823=>1398,
-21574=>1399,
-12109=>1400,
-27513=>1400,
-20643=>1401,
-25140=>1402,
-24102=>1403,
-27526=>1404,
-20195=>1405,
-36151=>1406,
-34955=>1407,
-24453=>1408,
-36910=>1409,
-24608=>1410,
-32829=>1411,
-25285=>1412,
-20025=>1413,
-21333=>1414,
-37112=>1415,
-25528=>1416,
-32966=>1417,
-26086=>1418,
-27694=>1419,
-20294=>1420,
-24814=>1421,
-28129=>1422,
-35806=>1423,
-24377=>1424,
-34507=>1425,
-24403=>1426,
-25377=>1427,
-20826=>1428,
-33633=>1429,
-26723=>1430,
-12049=>1431,
-20992=>1431,
-25443=>1432,
-36424=>1433,
-20498=>1434,
-23707=>1435,
-31095=>1436,
-23548=>1437,
-21040=>1438,
-31291=>1439,
-24764=>1440,
-36947=>1441,
-30423=>1442,
-24503=>1443,
-24471=>1444,
-30340=>1445,
-36460=>1446,
-28783=>1447,
-30331=>1448,
-31561=>1449,
-30634=>1450,
-20979=>1451,
-37011=>1452,
-22564=>1453,
-20302=>1454,
-28404=>1455,
-36842=>1456,
-25932=>1457,
-31515=>1458,
-29380=>1459,
-28068=>1460,
-32735=>1461,
-23265=>1462,
-25269=>1463,
-24213=>1464,
-22320=>1465,
-33922=>1466,
-31532=>1467,
-24093=>1468,
-24351=>1469,
-36882=>1470,
-32532=>1471,
-39072=>1472,
-25474=>1473,
-28359=>1474,
-30872=>1475,
-28857=>1476,
-20856=>1477,
-38747=>1478,
-22443=>1479,
-30005=>1480,
-20291=>1481,
-30008=>1482,
-24215=>1483,
-24806=>1484,
-22880=>1485,
-28096=>1486,
-27583=>1487,
-30857=>1488,
-21500=>1489,
-38613=>1490,
-20939=>1491,
-20993=>1492,
-25481=>1493,
-21514=>1494,
-38035=>1495,
-35843=>1496,
-36300=>1497,
-29241=>1498,
-30879=>1499,
-34678=>1500,
-36845=>1501,
-35853=>1502,
-21472=>1503,
-19969=>1504,
-30447=>1505,
-21486=>1506,
-38025=>1507,
-39030=>1508,
-12237=>1509,
-40718=>1509,
-38189=>1510,
-23450=>1511,
-35746=>1512,
-20002=>1513,
-19996=>1514,
-20908=>1515,
-33891=>1516,
-25026=>1517,
-21160=>1518,
-26635=>1519,
-20375=>1520,
-24683=>1521,
-20923=>1522,
-27934=>1523,
-20828=>1524,
-25238=>1525,
-12099=>1526,
-26007=>1526,
-38497=>1527,
-12182=>1528,
-35910=>1528,
-36887=>1529,
-30168=>1530,
-37117=>1531,
-30563=>1532,
-27602=>1533,
-29322=>1534,
-29420=>1535,
-35835=>1536,
-22581=>1537,
-30585=>1538,
-36172=>1539,
-26460=>1540,
-38208=>1541,
-32922=>1542,
-24230=>1543,
-28193=>1544,
-22930=>1545,
-31471=>1546,
-30701=>1547,
-38203=>1548,
-27573=>1549,
-26029=>1550,
-32526=>1551,
-22534=>1552,
-20817=>1553,
-38431=>1554,
-23545=>1555,
-22697=>1556,
-21544=>1557,
-36466=>1558,
-25958=>1559,
-39039=>1560,
-22244=>1561,
-38045=>1562,
-30462=>1563,
-36929=>1564,
-25479=>1565,
-21702=>1566,
-22810=>1567,
-22842=>1568,
-22427=>1569,
-36530=>1570,
-26421=>1571,
-36346=>1572,
-33333=>1573,
-21057=>1574,
-24816=>1575,
-22549=>1576,
-34558=>1577,
-23784=>1578,
-40517=>1579,
-20420=>1580,
-39069=>1581,
-35769=>1582,
-23077=>1583,
-24694=>1584,
-21380=>1585,
-25212=>1586,
-36943=>1587,
-37122=>1588,
-39295=>1589,
-24681=>1590,
-12157=>1591,
-32780=>1591,
-12041=>1592,
-20799=>1592,
-12159=>1593,
-32819=>1593,
-23572=>1594,
-39285=>1595,
-27953=>1596,
-12038=>1597,
-20108=>1597,
-36144=>1598,
-21457=>1599,
-32602=>1600,
-31567=>1601,
-20240=>1602,
-20047=>1603,
-38400=>1604,
-27861=>1605,
-29648=>1606,
-34281=>1607,
-24070=>1608,
-30058=>1609,
-32763=>1610,
-27146=>1611,
-30718=>1612,
-38034=>1613,
-32321=>1614,
-20961=>1615,
-28902=>1616,
-21453=>1617,
-36820=>1618,
-33539=>1619,
-36137=>1620,
-29359=>1621,
-39277=>1622,
-27867=>1623,
-22346=>1624,
-33459=>1625,
-12101=>1626,
-26041=>1626,
-32938=>1627,
-25151=>1628,
-38450=>1629,
-22952=>1630,
-20223=>1631,
-35775=>1632,
-32442=>1633,
-25918=>1634,
-33778=>1635,
-12206=>1636,
-38750=>1636,
-21857=>1637,
-39134=>1638,
-32933=>1639,
-21290=>1640,
-35837=>1641,
-21536=>1642,
-32954=>1643,
-24223=>1644,
-27832=>1645,
-36153=>1646,
-33452=>1647,
-37210=>1648,
-21545=>1649,
-27675=>1650,
-20998=>1651,
-32439=>1652,
-22367=>1653,
-28954=>1654,
-27774=>1655,
-31881=>1656,
-22859=>1657,
-20221=>1658,
-24575=>1659,
-24868=>1660,
-31914=>1661,
-20016=>1662,
-23553=>1663,
-26539=>1664,
-34562=>1665,
-23792=>1666,
-38155=>1667,
-39118=>1668,
-30127=>1669,
-28925=>1670,
-36898=>1671,
-20911=>1672,
-32541=>1673,
-35773=>1674,
-22857=>1675,
-20964=>1676,
-20315=>1677,
-21542=>1678,
-22827=>1679,
-25975=>1680,
-32932=>1681,
-23413=>1682,
-25206=>1683,
-25282=>1684,
-36752=>1685,
-24133=>1686,
-27679=>1687,
-31526=>1688,
-20239=>1689,
-20440=>1690,
-26381=>1691,
-28014=>1692,
-28074=>1693,
-31119=>1694,
-34993=>1695,
-24343=>1696,
-29995=>1697,
-25242=>1698,
-36741=>1699,
-20463=>1700,
-37340=>1701,
-26023=>1702,
-33071=>1703,
-33105=>1704,
-24220=>1705,
-33104=>1706,
-36212=>1707,
-21103=>1708,
-35206=>1709,
-36171=>1710,
-22797=>1711,
-20613=>1712,
-20184=>1713,
-12201=>1714,
-38428=>1714,
-12119=>1715,
-29238=>1715,
-33145=>1716,
-36127=>1717,
-23500=>1718,
-35747=>1719,
-38468=>1720,
-22919=>1721,
-32538=>1722,
-21648=>1723,
-22134=>1724,
-22030=>1725,
-35813=>1726,
-25913=>1727,
-27010=>1728,
-38041=>1729,
-30422=>1730,
-28297=>1731,
-12082=>1732,
-24178=>1732,
-12130=>1733,
-29976=>1733,
-26438=>1734,
-26577=>1735,
-31487=>1736,
-32925=>1737,
-36214=>1738,
-24863=>1739,
-31174=>1740,
-25954=>1741,
-36195=>1742,
-20872=>1743,
-21018=>1744,
-38050=>1745,
-32568=>1746,
-32923=>1747,
-32434=>1748,
-23703=>1749,
-28207=>1750,
-26464=>1751,
-31705=>1752,
-30347=>1753,
-12220=>1754,
-39640=>1754,
-33167=>1755,
-32660=>1756,
-31957=>1757,
-25630=>1758,
-38224=>1759,
-31295=>1760,
-21578=>1761,
-21733=>1762,
-27468=>1763,
-25601=>1764,
-12093=>1765,
-25096=>1765,
-40509=>1766,
-33011=>1767,
-30105=>1768,
-21106=>1769,
-12208=>1770,
-38761=>1770,
-33883=>1771,
-26684=>1772,
-34532=>1773,
-38401=>1774,
-38548=>1775,
-38124=>1776,
-20010=>1777,
-21508=>1778,
-32473=>1779,
-26681=>1780,
-36319=>1781,
-32789=>1782,
-26356=>1783,
-24218=>1784,
-32697=>1785,
-22466=>1786,
-32831=>1787,
-26775=>1788,
-12079=>1789,
-24037=>1789,
-25915=>1790,
-21151=>1791,
-24685=>1792,
-40858=>1793,
-20379=>1794,
-36524=>1795,
-20844=>1796,
-23467=>1797,
-12088=>1798,
-24339=>1798,
-24041=>1799,
-27742=>1800,
-25329=>1801,
-36129=>1802,
-20849=>1803,
-38057=>1804,
-21246=>1805,
-27807=>1806,
-33503=>1807,
-29399=>1808,
-22434=>1809,
-26500=>1810,
-36141=>1811,
-22815=>1812,
-36764=>1813,
-33735=>1814,
-21653=>1815,
-31629=>1816,
-20272=>1817,
-27837=>1818,
-23396=>1819,
-22993=>1820,
-12238=>1821,
-40723=>1821,
-21476=>1822,
-34506=>1823,
-12219=>1824,
-39592=>1824,
-12181=>1825,
-35895=>1825,
-32929=>1826,
-25925=>1827,
-39038=>1828,
-22266=>1829,
-38599=>1830,
-21038=>1831,
-12128=>1832,
-29916=>1832,
-21072=>1833,
-23521=>1834,
-25346=>1835,
-35074=>1836,
-20054=>1837,
-25296=>1838,
-24618=>1839,
-26874=>1840,
-20851=>1841,
-23448=>1842,
-20896=>1843,
-35266=>1844,
-31649=>1845,
-39302=>1846,
-32592=>1847,
-24815=>1848,
-28748=>1849,
-36143=>1850,
-20809=>1851,
-12084=>1852,
-24191=>1852,
-36891=>1853,
-29808=>1854,
-35268=>1855,
-22317=>1856,
-30789=>1857,
-24402=>1858,
-40863=>1859,
-38394=>1860,
-36712=>1861,
-12225=>1862,
-39740=>1862,
-35809=>1863,
-30328=>1864,
-26690=>1865,
-26588=>1866,
-36330=>1867,
-36149=>1868,
-21053=>1869,
-36746=>1870,
-28378=>1871,
-26829=>1872,
-38149=>1873,
-37101=>1874,
-22269=>1875,
-26524=>1876,
-35065=>1877,
-36807=>1878,
-21704=>1879,
-39608=>1880,
-23401=>1881,
-28023=>1882,
-27686=>1883,
-20133=>1884,
-23475=>1885,
-39559=>1886,
-37219=>1887,
-25000=>1888,
-37039=>1889,
-38889=>1890,
-21547=>1891,
-28085=>1892,
-23506=>1893,
-20989=>1894,
-21898=>1895,
-32597=>1896,
-32752=>1897,
-25788=>1898,
-25421=>1899,
-26097=>1900,
-25022=>1901,
-24717=>1902,
-28938=>1903,
-27735=>1904,
-27721=>1905,
-22831=>1906,
-26477=>1907,
-33322=>1908,
-22741=>1909,
-22158=>1910,
-35946=>1911,
-27627=>1912,
-37085=>1913,
-22909=>1914,
-32791=>1915,
-21495=>1916,
-28009=>1917,
-21621=>1918,
-21917=>1919,
-33655=>1920,
-33743=>1921,
-26680=>1922,
-12146=>1923,
-31166=>1923,
-21644=>1924,
-20309=>1925,
-21512=>1926,
-30418=>1927,
-35977=>1928,
-38402=>1929,
-27827=>1930,
-28088=>1931,
-36203=>1932,
-35088=>1933,
-40548=>1934,
-36154=>1935,
-22079=>1936,
-12234=>1937,
-40657=>1937,
-30165=>1938,
-24456=>1939,
-29408=>1940,
-24680=>1941,
-21756=>1942,
-20136=>1943,
-27178=>1944,
-34913=>1945,
-24658=>1946,
-36720=>1947,
-21700=>1948,
-28888=>1949,
-34425=>1950,
-40511=>1951,
-27946=>1952,
-23439=>1953,
-24344=>1954,
-32418=>1955,
-21897=>1956,
-20399=>1957,
-29492=>1958,
-21564=>1959,
-21402=>1960,
-20505=>1961,
-21518=>1962,
-21628=>1963,
-20046=>1964,
-24573=>1965,
-29786=>1966,
-22774=>1967,
-33899=>1968,
-32993=>1969,
-34676=>1970,
-29392=>1971,
-31946=>1972,
-28246=>1973,
-24359=>1974,
-34382=>1975,
-21804=>1976,
-25252=>1977,
-20114=>1978,
-27818=>1979,
-25143=>1980,
-33457=>1981,
-21719=>1982,
-21326=>1983,
-29502=>1984,
-28369=>1985,
-30011=>1986,
-21010=>1987,
-21270=>1988,
-35805=>1989,
-27088=>1990,
-24458=>1991,
-24576=>1992,
-28142=>1993,
-22351=>1994,
-27426=>1995,
-29615=>1996,
-26707=>1997,
-36824=>1998,
-32531=>1999,
-25442=>2000,
-24739=>2001,
-21796=>2002,
-30186=>2003,
-35938=>2004,
-28949=>2005,
-28067=>2006,
-23462=>2007,
-24187=>2008,
-33618=>2009,
-24908=>2010,
-40644=>2011,
-30970=>2012,
-34647=>2013,
-31783=>2014,
-30343=>2015,
-20976=>2016,
-24822=>2017,
-29004=>2018,
-26179=>2019,
-24140=>2020,
-24653=>2021,
-35854=>2022,
-28784=>2023,
-25381=>2024,
-36745=>2025,
-24509=>2026,
-24674=>2027,
-34516=>2028,
-22238=>2029,
-27585=>2030,
-24724=>2031,
-24935=>2032,
-21321=>2033,
-24800=>2034,
-26214=>2035,
-36159=>2036,
-31229=>2037,
-20250=>2038,
-28905=>2039,
-27719=>2040,
-35763=>2041,
-35826=>2042,
-32472=>2043,
-33636=>2044,
-26127=>2045,
-23130=>2046,
-39746=>2047,
-27985=>2048,
-28151=>2049,
-35905=>2050,
-27963=>2051,
-20249=>2052,
-12117=>2053,
-28779=>2053,
-33719=>2054,
-25110=>2055,
-24785=>2056,
-38669=>2057,
-36135=>2058,
-31096=>2059,
-20987=>2060,
-22334=>2061,
-22522=>2062,
-26426=>2063,
-30072=>2064,
-31293=>2065,
-31215=>2066,
-31637=>2067,
-32908=>2068,
-39269=>2069,
-36857=>2070,
-28608=>2071,
-35749=>2072,
-40481=>2073,
-23020=>2074,
-32489=>2075,
-32521=>2076,
-21513=>2077,
-26497=>2078,
-26840=>2079,
-36753=>2080,
-31821=>2081,
-38598=>2082,
-21450=>2083,
-24613=>2084,
-30142=>2085,
-27762=>2086,
-21363=>2087,
-23241=>2088,
-32423=>2089,
-25380=>2090,
-12047=>2091,
-20960=>2091,
-33034=>2092,
-12080=>2093,
-24049=>2093,
-34015=>2094,
-25216=>2095,
-20864=>2096,
-23395=>2097,
-20238=>2098,
-31085=>2099,
-21058=>2100,
-24760=>2101,
-27982=>2102,
-23492=>2103,
-23490=>2104,
-35745=>2105,
-35760=>2106,
-26082=>2107,
-24524=>2108,
-38469=>2109,
-22931=>2110,
-32487=>2111,
-32426=>2112,
-22025=>2113,
-26551=>2114,
-22841=>2115,
-20339=>2116,
-23478=>2117,
-21152=>2118,
-33626=>2119,
-39050=>2120,
-36158=>2121,
-30002=>2122,
-38078=>2123,
-20551=>2124,
-31292=>2125,
-20215=>2126,
-26550=>2127,
-39550=>2128,
-23233=>2129,
-27516=>2130,
-30417=>2131,
-22362=>2132,
-23574=>2133,
-31546=>2134,
-38388=>2135,
-29006=>2136,
-20860=>2137,
-32937=>2138,
-33392=>2139,
-22904=>2140,
-32516=>2141,
-33575=>2142,
-26816=>2143,
-26604=>2144,
-30897=>2145,
-30839=>2146,
-25315=>2147,
-25441=>2148,
-31616=>2149,
-20461=>2150,
-21098=>2151,
-20943=>2152,
-33616=>2153,
-27099=>2154,
-37492=>2155,
-36341=>2156,
-36145=>2157,
-35265=>2158,
-38190=>2159,
-31661=>2160,
-20214=>2161,
-20581=>2162,
-33328=>2163,
-21073=>2164,
-39279=>2165,
-28176=>2166,
-28293=>2167,
-28071=>2168,
-24314=>2169,
-20725=>2170,
-23004=>2171,
-23558=>2172,
-27974=>2173,
-27743=>2174,
-30086=>2175,
-33931=>2176,
-26728=>2177,
-22870=>2178,
-35762=>2179,
-21280=>2180,
-37233=>2181,
-38477=>2182,
-34121=>2183,
-26898=>2184,
-30977=>2185,
-28966=>2186,
-33014=>2187,
-20132=>2188,
-37066=>2189,
-27975=>2190,
-39556=>2191,
-23047=>2192,
-22204=>2193,
-25605=>2194,
-38128=>2195,
-30699=>2196,
-20389=>2197,
-33050=>2198,
-29409=>2199,
-12179=>2200,
-35282=>2200,
-39290=>2201,
-32564=>2202,
-32478=>2203,
-21119=>2204,
-25945=>2205,
-37237=>2206,
-36735=>2207,
-36739=>2208,
-21483=>2209,
-31382=>2210,
-25581=>2211,
-25509=>2212,
-30342=>2213,
-31224=>2214,
-34903=>2215,
-38454=>2216,
-25130=>2217,
-21163=>2218,
-33410=>2219,
-26708=>2220,
-26480=>2221,
-25463=>2222,
-30571=>2223,
-31469=>2224,
-27905=>2225,
-32467=>2226,
-35299=>2227,
-22992=>2228,
-25106=>2229,
-34249=>2230,
-33445=>2231,
-30028=>2232,
-20511=>2233,
-20171=>2234,
-30117=>2235,
-35819=>2236,
-23626=>2237,
-12081=>2238,
-24062=>2238,
-31563=>2239,
-12100=>2240,
-26020=>2240,
-12198=>2241,
-37329=>2241,
-20170=>2242,
-27941=>2243,
-35167=>2244,
-32039=>2245,
-38182=>2246,
-20165=>2247,
-35880=>2248,
-36827=>2249,
-38771=>2250,
-26187=>2251,
-31105=>2252,
-36817=>2253,
-28908=>2254,
-28024=>2255,
-23613=>2256,
-21170=>2257,
-33606=>2258,
-20834=>2259,
-33550=>2260,
-30555=>2261,
-26230=>2262,
-40120=>2263,
-20140=>2264,
-24778=>2265,
-31934=>2266,
-31923=>2267,
-32463=>2268,
-20117=>2269,
-35686=>2270,
-26223=>2271,
-39048=>2272,
-38745=>2273,
-22659=>2274,
-25964=>2275,
-38236=>2276,
-24452=>2277,
-30153=>2278,
-38742=>2279,
-31455=>2280,
-31454=>2281,
-20928=>2282,
-28847=>2283,
-31384=>2284,
-25578=>2285,
-31350=>2286,
-32416=>2287,
-29590=>2288,
-12210=>2289,
-38893=>2289,
-20037=>2290,
-28792=>2291,
-20061=>2292,
-37202=>2293,
-21417=>2294,
-25937=>2295,
-26087=>2296,
-12165=>2297,
-33276=>2297,
-33285=>2298,
-21646=>2299,
-23601=>2300,
-30106=>2301,
-38816=>2302,
-25304=>2303,
-29401=>2304,
-30141=>2305,
-23621=>2306,
-39545=>2307,
-33738=>2308,
-23616=>2309,
-21632=>2310,
-30697=>2311,
-20030=>2312,
-27822=>2313,
-32858=>2314,
-25298=>2315,
-25454=>2316,
-24040=>2317,
-20855=>2318,
-36317=>2319,
-36382=>2320,
-38191=>2321,
-20465=>2322,
-21477=>2323,
-24807=>2324,
-28844=>2325,
-21095=>2326,
-25424=>2327,
-40515=>2328,
-23071=>2329,
-20518=>2330,
-30519=>2331,
-21367=>2332,
-32482=>2333,
-25733=>2334,
-25899=>2335,
-25225=>2336,
-25496=>2337,
-20500=>2338,
-29237=>2339,
-35273=>2340,
-20915=>2341,
-35776=>2342,
-32477=>2343,
-22343=>2344,
-33740=>2345,
-38055=>2346,
-20891=>2347,
-21531=>2348,
-23803=>2349,
-20426=>2350,
-31459=>2351,
-27994=>2352,
-37089=>2353,
-39567=>2354,
-21888=>2355,
-21654=>2356,
-21345=>2357,
-21679=>2358,
-24320=>2359,
-25577=>2360,
-26999=>2361,
-20975=>2362,
-24936=>2363,
-21002=>2364,
-22570=>2365,
-21208=>2366,
-22350=>2367,
-30733=>2368,
-30475=>2369,
-24247=>2370,
-24951=>2371,
-31968=>2372,
-25179=>2373,
-25239=>2374,
-20130=>2375,
-28821=>2376,
-32771=>2377,
-25335=>2378,
-28900=>2379,
-38752=>2380,
-22391=>2381,
-33499=>2382,
-26607=>2383,
-26869=>2384,
-30933=>2385,
-39063=>2386,
-31185=>2387,
-22771=>2388,
-21683=>2389,
-21487=>2390,
-28212=>2391,
-20811=>2392,
-21051=>2393,
-23458=>2394,
-35838=>2395,
-32943=>2396,
-21827=>2397,
-22438=>2398,
-24691=>2399,
-22353=>2400,
-21549=>2401,
-31354=>2402,
-24656=>2403,
-23380=>2404,
-25511=>2405,
-25248=>2406,
-12061=>2407,
-21475=>2407,
-25187=>2408,
-23495=>2409,
-26543=>2410,
-21741=>2411,
-31391=>2412,
-33510=>2413,
-37239=>2414,
-24211=>2415,
-35044=>2416,
-22840=>2417,
-22446=>2418,
-25358=>2419,
-36328=>2420,
-33007=>2421,
-22359=>2422,
-31607=>2423,
-20393=>2424,
-24555=>2425,
-23485=>2426,
-27454=>2427,
-21281=>2428,
-31568=>2429,
-29378=>2430,
-26694=>2431,
-30719=>2432,
-30518=>2433,
-26103=>2434,
-20917=>2435,
-20111=>2436,
-30420=>2437,
-23743=>2438,
-31397=>2439,
-33909=>2440,
-22862=>2441,
-39745=>2442,
-20608=>2443,
-39304=>2444,
-24871=>2445,
-28291=>2446,
-22372=>2447,
-26118=>2448,
-25414=>2449,
-22256=>2450,
-25324=>2451,
-25193=>2452,
-24275=>2453,
-38420=>2454,
-22403=>2455,
-25289=>2456,
-21895=>2457,
-34593=>2458,
-33098=>2459,
-36771=>2460,
-21862=>2461,
-33713=>2462,
-26469=>2463,
-36182=>2464,
-34013=>2465,
-23146=>2466,
-26639=>2467,
-25318=>2468,
-31726=>2469,
-38417=>2470,
-20848=>2471,
-28572=>2472,
-35888=>2473,
-25597=>2474,
-35272=>2475,
-25042=>2476,
-32518=>2477,
-28866=>2478,
-28389=>2479,
-29701=>2480,
-27028=>2481,
-29436=>2482,
-24266=>2483,
-37070=>2484,
-26391=>2485,
-28010=>2486,
-25438=>2487,
-21171=>2488,
-29282=>2489,
-12156=>2490,
-32769=>2490,
-20332=>2491,
-23013=>2492,
-37226=>2493,
-28889=>2494,
-28061=>2495,
-21202=>2496,
-20048=>2497,
-38647=>2498,
-38253=>2499,
-34174=>2500,
-30922=>2501,
-32047=>2502,
-20769=>2503,
-22418=>2504,
-25794=>2505,
-32907=>2506,
-31867=>2507,
-27882=>2508,
-26865=>2509,
-26974=>2510,
-20919=>2511,
-21400=>2512,
-26792=>2513,
-29313=>2514,
-40654=>2515,
-31729=>2516,
-29432=>2517,
-31163=>2518,
-28435=>2519,
-29702=>2520,
-26446=>2521,
-12197=>2522,
-37324=>2522,
-40100=>2523,
-31036=>2524,
-33673=>2525,
-33620=>2526,
-21519=>2527,
-26647=>2528,
-20029=>2529,
-21385=>2530,
-21169=>2531,
-30782=>2532,
-21382=>2533,
-21033=>2534,
-20616=>2535,
-20363=>2536,
-20432=>2537,
-30178=>2538,
-12148=>2539,
-31435=>2539,
-31890=>2540,
-27813=>2541,
-12202=>2542,
-38582=>2542,
-12050=>2543,
-21147=>2543,
-29827=>2544,
-21737=>2545,
-20457=>2546,
-32852=>2547,
-33714=>2548,
-36830=>2549,
-38256=>2550,
-24265=>2551,
-24604=>2552,
-28063=>2553,
-24088=>2554,
-25947=>2555,
-33080=>2556,
-38142=>2557,
-24651=>2558,
-28860=>2559,
-32451=>2560,
-31918=>2561,
-20937=>2562,
-63865=>2562,
-26753=>2563,
-31921=>2564,
-33391=>2565,
-20004=>2566,
-36742=>2567,
-37327=>2568,
-26238=>2569,
-20142=>2570,
-35845=>2571,
-25769=>2572,
-32842=>2573,
-20698=>2574,
-30103=>2575,
-29134=>2576,
-23525=>2577,
-36797=>2578,
-28518=>2579,
-20102=>2580,
-25730=>2581,
-38243=>2582,
-24278=>2583,
-26009=>2584,
-21015=>2585,
-35010=>2586,
-28872=>2587,
-21155=>2588,
-29454=>2589,
-29747=>2590,
-26519=>2591,
-30967=>2592,
-38678=>2593,
-20020=>2594,
-37051=>2595,
-40158=>2596,
-28107=>2597,
-20955=>2598,
-36161=>2599,
-21533=>2600,
-25294=>2601,
-29618=>2602,
-33777=>2603,
-38646=>2604,
-40836=>2605,
-38083=>2606,
-20278=>2607,
-32666=>2608,
-20940=>2609,
-28789=>2610,
-38517=>2611,
-23725=>2612,
-39046=>2613,
-21478=>2614,
-20196=>2615,
-28316=>2616,
-29705=>2617,
-27060=>2618,
-30827=>2619,
-39311=>2620,
-30041=>2621,
-21016=>2622,
-30244=>2623,
-27969=>2624,
-26611=>2625,
-20845=>2626,
-40857=>2627,
-32843=>2628,
-21657=>2629,
-31548=>2630,
-31423=>2631,
-38534=>2632,
-22404=>2633,
-25314=>2634,
-38471=>2635,
-27004=>2636,
-23044=>2637,
-25602=>2638,
-31699=>2639,
-28431=>2640,
-38475=>2641,
-33446=>2642,
-21346=>2643,
-39045=>2644,
-24208=>2645,
-28809=>2646,
-25523=>2647,
-21348=>2648,
-34383=>2649,
-40065=>2650,
-40595=>2651,
-30860=>2652,
-38706=>2653,
-36335=>2654,
-36162=>2655,
-12229=>2656,
-40575=>2656,
-28510=>2657,
-31108=>2658,
-24405=>2659,
-38470=>2660,
-25134=>2661,
-39540=>2662,
-21525=>2663,
-38109=>2664,
-20387=>2665,
-26053=>2666,
-23653=>2667,
-23649=>2668,
-32533=>2669,
-34385=>2670,
-27695=>2671,
-24459=>2672,
-29575=>2673,
-28388=>2674,
-32511=>2675,
-23782=>2676,
-25371=>2677,
-23402=>2678,
-28390=>2679,
-21365=>2680,
-20081=>2681,
-25504=>2682,
-30053=>2683,
-25249=>2684,
-36718=>2685,
-20262=>2686,
-20177=>2687,
-27814=>2688,
-32438=>2689,
-35770=>2690,
-33821=>2691,
-34746=>2692,
-32599=>2693,
-36923=>2694,
-38179=>2695,
-31657=>2696,
-39585=>2697,
-35064=>2698,
-33853=>2699,
-27931=>2700,
-39558=>2701,
-32476=>2702,
-22920=>2703,
-12231=>2704,
-40635=>2704,
-29595=>2705,
-30721=>2706,
-34434=>2707,
-39532=>2708,
-39554=>2709,
-22043=>2710,
-21527=>2711,
-22475=>2712,
-20080=>2713,
-40614=>2714,
-21334=>2715,
-36808=>2716,
-33033=>2717,
-30610=>2718,
-39314=>2719,
-34542=>2720,
-28385=>2721,
-34067=>2722,
-26364=>2723,
-24930=>2724,
-28459=>2725,
-35881=>2726,
-33426=>2727,
-33579=>2728,
-30450=>2729,
-27667=>2730,
-24537=>2731,
-33725=>2732,
-29483=>2733,
-33541=>2734,
-38170=>2735,
-12113=>2736,
-27611=>2736,
-12141=>2737,
-30683=>2737,
-38086=>2738,
-21359=>2739,
-33538=>2740,
-20882=>2741,
-24125=>2742,
-35980=>2743,
-36152=>2744,
-20040=>2745,
-29611=>2746,
-26522=>2747,
-26757=>2748,
-37238=>2749,
-38665=>2750,
-29028=>2751,
-27809=>2752,
-30473=>2753,
-23186=>2754,
-38209=>2755,
-27599=>2756,
-32654=>2757,
-26151=>2758,
-23504=>2759,
-22969=>2760,
-23194=>2761,
-38376=>2762,
-38391=>2763,
-20204=>2764,
-33804=>2765,
-33945=>2766,
-27308=>2767,
-30431=>2768,
-38192=>2769,
-29467=>2770,
-26790=>2771,
-23391=>2772,
-30511=>2773,
-37274=>2774,
-38753=>2775,
-31964=>2776,
-36855=>2777,
-35868=>2778,
-24357=>2779,
-12150=>2780,
-31859=>2780,
-31192=>2781,
-35269=>2782,
-27852=>2783,
-34588=>2784,
-23494=>2785,
-24130=>2786,
-26825=>2787,
-30496=>2788,
-32501=>2789,
-20885=>2790,
-20813=>2791,
-21193=>2792,
-23081=>2793,
-32517=>2794,
-12207=>2795,
-38754=>2795,
-33495=>2796,
-25551=>2797,
-30596=>2798,
-34256=>2799,
-31186=>2800,
-28218=>2801,
-24217=>2802,
-22937=>2803,
-34065=>2804,
-28781=>2805,
-27665=>2806,
-25279=>2807,
-12139=>2808,
-30399=>2808,
-25935=>2809,
-24751=>2810,
-38397=>2811,
-26126=>2812,
-34719=>2813,
-40483=>2814,
-38125=>2815,
-21517=>2816,
-21629=>2817,
-35884=>2818,
-25720=>2819,
-25721=>2820,
-34321=>2821,
-27169=>2822,
-33180=>2823,
-30952=>2824,
-25705=>2825,
-39764=>2826,
-25273=>2827,
-26411=>2828,
-33707=>2829,
-22696=>2830,
-40664=>2831,
-27819=>2832,
-28448=>2833,
-23518=>2834,
-38476=>2835,
-35851=>2836,
-29279=>2837,
-26576=>2838,
-25287=>2839,
-29281=>2840,
-20137=>2841,
-22982=>2842,
-27597=>2843,
-22675=>2844,
-26286=>2845,
-24149=>2846,
-21215=>2847,
-24917=>2848,
-12106=>2849,
-26408=>2849,
-12140=>2850,
-30446=>2850,
-30566=>2851,
-29287=>2852,
-31302=>2853,
-25343=>2854,
-21738=>2855,
-21584=>2856,
-38048=>2857,
-37027=>2858,
-23068=>2859,
-32435=>2860,
-27670=>2861,
-20035=>2862,
-22902=>2863,
-32784=>2864,
-22856=>2865,
-21335=>2866,
-30007=>2867,
-38590=>2868,
-22218=>2869,
-25376=>2870,
-33041=>2871,
-24700=>2872,
-38393=>2873,
-28118=>2874,
-21602=>2875,
-39297=>2876,
-20869=>2877,
-23273=>2878,
-33021=>2879,
-22958=>2880,
-38675=>2881,
-20522=>2882,
-27877=>2883,
-23612=>2884,
-25311=>2885,
-20320=>2886,
-21311=>2887,
-33147=>2888,
-36870=>2889,
-28346=>2890,
-34091=>2891,
-25288=>2892,
-24180=>2893,
-30910=>2894,
-25781=>2895,
-25467=>2896,
-24565=>2897,
-23064=>2898,
-37247=>2899,
-40479=>2900,
-23615=>2901,
-25423=>2902,
-32834=>2903,
-23421=>2904,
-21870=>2905,
-38218=>2906,
-38221=>2907,
-28037=>2908,
-24744=>2909,
-26592=>2910,
-29406=>2911,
-20957=>2912,
-23425=>2913,
-25319=>2914,
-27870=>2915,
-12124=>2916,
-29275=>2916,
-25197=>2917,
-38062=>2918,
-32445=>2919,
-33043=>2920,
-27987=>2921,
-20892=>2922,
-24324=>2923,
-22900=>2924,
-21162=>2925,
-24594=>2926,
-12069=>2927,
-22899=>2927,
-26262=>2928,
-34384=>2929,
-30111=>2930,
-25386=>2931,
-25062=>2932,
-31983=>2933,
-35834=>2934,
-21734=>2935,
-27431=>2936,
-40485=>2937,
-27572=>2938,
-34261=>2939,
-21589=>2940,
-20598=>2941,
-27812=>2942,
-21866=>2943,
-36276=>2944,
-29228=>2945,
-24085=>2946,
-24597=>2947,
-29750=>2948,
-25293=>2949,
-25490=>2950,
-29260=>2951,
-24472=>2952,
-28227=>2953,
-27966=>2954,
-25856=>2955,
-28504=>2956,
-30424=>2957,
-30928=>2958,
-30460=>2959,
-30036=>2960,
-21028=>2961,
-21467=>2962,
-20051=>2963,
-24222=>2964,
-26049=>2965,
-32810=>2966,
-32982=>2967,
-25243=>2968,
-21638=>2969,
-21032=>2970,
-28846=>2971,
-34957=>2972,
-36305=>2973,
-27873=>2974,
-21624=>2975,
-32986=>2976,
-22521=>2977,
-35060=>2978,
-36180=>2979,
-38506=>2980,
-37197=>2981,
-20329=>2982,
-27803=>2983,
-21943=>2984,
-30406=>2985,
-30768=>2986,
-25256=>2987,
-28921=>2988,
-28558=>2989,
-24429=>2990,
-34028=>2991,
-26842=>2992,
-30844=>2993,
-31735=>2994,
-33192=>2995,
-26379=>2996,
-40527=>2997,
-25447=>2998,
-30896=>2999,
-22383=>3000,
-30738=>3001,
-38713=>3002,
-25209=>3003,
-25259=>3004,
-21128=>3005,
-29749=>3006,
-27607=>3007,
-21860=>3008,
-33086=>3009,
-30130=>3010,
-12138=>3011,
-30382=>3011,
-21305=>3012,
-30174=>3013,
-20731=>3014,
-23617=>3015,
-35692=>3016,
-31687=>3017,
-20559=>3018,
-12122=>3019,
-29255=>3019,
-39575=>3020,
-39128=>3021,
-28418=>3022,
-29922=>3023,
-31080=>3024,
-25735=>3025,
-30629=>3026,
-25340=>3027,
-39057=>3028,
-36139=>3029,
-21697=>3030,
-32856=>3031,
-20050=>3032,
-22378=>3033,
-33529=>3034,
-33805=>3035,
-24179=>3036,
-20973=>3037,
-29942=>3038,
-35780=>3039,
-23631=>3040,
-22369=>3041,
-27900=>3042,
-39047=>3043,
-23110=>3044,
-30772=>3045,
-39748=>3046,
-36843=>3047,
-31893=>3048,
-21078=>3049,
-25169=>3050,
-38138=>3051,
-20166=>3052,
-33670=>3053,
-33889=>3054,
-33769=>3055,
-33970=>3056,
-22484=>3057,
-26420=>3058,
-22275=>3059,
-26222=>3060,
-28006=>3061,
-35889=>3062,
-26333=>3063,
-28689=>3064,
-26399=>3065,
-27450=>3066,
-26646=>3067,
-25114=>3068,
-22971=>3069,
-19971=>3070,
-20932=>3071,
-28422=>3072,
-26578=>3073,
-27791=>3074,
-20854=>3075,
-26827=>3076,
-22855=>3077,
-27495=>3078,
-30054=>3079,
-23822=>3080,
-33040=>3081,
-40784=>3082,
-26071=>3083,
-31048=>3084,
-31041=>3085,
-39569=>3086,
-36215=>3087,
-23682=>3088,
-20062=>3089,
-20225=>3090,
-21551=>3091,
-22865=>3092,
-30732=>3093,
-22120=>3094,
-12115=>3095,
-27668=>3095,
-36804=>3096,
-24323=>3097,
-27773=>3098,
-27875=>3099,
-35755=>3100,
-25488=>3101,
-24688=>3102,
-27965=>3103,
-29301=>3104,
-25190=>3105,
-38030=>3106,
-38085=>3107,
-21315=>3108,
-36801=>3109,
-31614=>3110,
-20191=>3111,
-35878=>3112,
-20094=>3113,
-40660=>3114,
-38065=>3115,
-38067=>3116,
-21069=>3117,
-28508=>3118,
-36963=>3119,
-27973=>3120,
-35892=>3121,
-22545=>3122,
-23884=>3123,
-12107=>3124,
-27424=>3124,
-27465=>3125,
-26538=>3126,
-21595=>3127,
-33108=>3128,
-32652=>3129,
-22681=>3130,
-34103=>3131,
-24378=>3132,
-25250=>3133,
-27207=>3134,
-38201=>3135,
-25970=>3136,
-24708=>3137,
-26725=>3138,
-30631=>3139,
-20052=>3140,
-20392=>3141,
-24039=>3142,
-38808=>3143,
-25772=>3144,
-32728=>3145,
-23789=>3146,
-20431=>3147,
-31373=>3148,
-20999=>3149,
-33540=>3150,
-19988=>3151,
-24623=>3152,
-31363=>3153,
-38054=>3154,
-20405=>3155,
-20146=>3156,
-31206=>3157,
-29748=>3158,
-21220=>3159,
-33465=>3160,
-25810=>3161,
-31165=>3162,
-23517=>3163,
-27777=>3164,
-38738=>3165,
-36731=>3166,
-27682=>3167,
-20542=>3168,
-21375=>3169,
-28165=>3170,
-25806=>3171,
-26228=>3172,
-27696=>3173,
-24773=>3174,
-39031=>3175,
-35831=>3176,
-24198=>3177,
-29756=>3178,
-31351=>3179,
-31179=>3180,
-19992=>3181,
-37041=>3182,
-29699=>3183,
-27714=>3184,
-22234=>3185,
-37195=>3186,
-27845=>3187,
-36235=>3188,
-21306=>3189,
-34502=>3190,
-26354=>3191,
-36527=>3192,
-23624=>3193,
-39537=>3194,
-28192=>3195,
-21462=>3196,
-23094=>3197,
-40843=>3198,
-36259=>3199,
-21435=>3200,
-22280=>3201,
-39079=>3202,
-26435=>3203,
-37275=>3204,
-27849=>3205,
-20840=>3206,
-30154=>3207,
-25331=>3208,
-12125=>3209,
-29356=>3209,
-21048=>3210,
-21149=>3211,
-32570=>3212,
-28820=>3213,
-30264=>3214,
-21364=>3215,
-40522=>3216,
-27063=>3217,
-30830=>3218,
-38592=>3219,
-35033=>3220,
-32676=>3221,
-28982=>3222,
-29123=>3223,
-20873=>3224,
-26579=>3225,
-29924=>3226,
-22756=>3227,
-25880=>3228,
-22199=>3229,
-35753=>3230,
-39286=>3231,
-25200=>3232,
-32469=>3233,
-24825=>3234,
-28909=>3235,
-22764=>3236,
-20161=>3237,
-12040=>3238,
-20154=>3238,
-24525=>3239,
-38887=>3240,
-20219=>3241,
-35748=>3242,
-20995=>3243,
-22922=>3244,
-32427=>3245,
-25172=>3246,
-20173=>3247,
-12103=>3248,
-26085=>3248,
-25102=>3249,
-33592=>3250,
-33993=>3251,
-33635=>3252,
-34701=>3253,
-29076=>3254,
-28342=>3255,
-23481=>3256,
-32466=>3257,
-20887=>3258,
-25545=>3259,
-26580=>3260,
-12161=>3261,
-32905=>3261,
-33593=>3262,
-34837=>3263,
-20754=>3264,
-23418=>3265,
-22914=>3266,
-36785=>3267,
-20083=>3268,
-27741=>3269,
-12042=>3270,
-20837=>3270,
-35109=>3271,
-36719=>3272,
-38446=>3273,
-34122=>3274,
-29790=>3275,
-38160=>3276,
-38384=>3277,
-28070=>3278,
-33509=>3279,
-24369=>3280,
-25746=>3281,
-27922=>3282,
-33832=>3283,
-33134=>3284,
-40131=>3285,
-22622=>3286,
-36187=>3287,
-19977=>3288,
-21441=>3289,
-20254=>3290,
-25955=>3291,
-26705=>3292,
-21971=>3293,
-20007=>3294,
-25620=>3295,
-39578=>3296,
-25195=>3297,
-23234=>3298,
-29791=>3299,
-12170=>3300,
-33394=>3300,
-28073=>3301,
-26862=>3302,
-20711=>3303,
-33678=>3304,
-30722=>3305,
-26432=>3306,
-21049=>3307,
-27801=>3308,
-32433=>3309,
-20667=>3310,
-21861=>3311,
-29022=>3312,
-31579=>3313,
-26194=>3314,
-29642=>3315,
-33515=>3316,
-26441=>3317,
-12077=>3318,
-23665=>3318,
-21024=>3319,
-29053=>3320,
-34923=>3321,
-38378=>3322,
-38485=>3323,
-25797=>3324,
-36193=>3325,
-33203=>3326,
-21892=>3327,
-27733=>3328,
-25159=>3329,
-32558=>3330,
-22674=>3331,
-20260=>3332,
-21830=>3333,
-36175=>3334,
-26188=>3335,
-19978=>3336,
-23578=>3337,
-35059=>3338,
-26786=>3339,
-25422=>3340,
-31245=>3341,
-28903=>3342,
-33421=>3343,
-21242=>3344,
-38902=>3345,
-23569=>3346,
-21736=>3347,
-37045=>3348,
-32461=>3349,
-22882=>3350,
-36170=>3351,
-34503=>3352,
-12166=>3353,
-33292=>3353,
-33293=>3354,
-36198=>3355,
-25668=>3356,
-23556=>3357,
-24913=>3358,
-28041=>3359,
-31038=>3360,
-35774=>3361,
-30775=>3362,
-30003=>3363,
-21627=>3364,
-20280=>3365,
-12189=>3366,
-36523=>3366,
-28145=>3367,
-23072=>3368,
-32453=>3369,
-31070=>3370,
-27784=>3371,
-23457=>3372,
-23158=>3373,
-29978=>3374,
-32958=>3375,
-24910=>3376,
-28183=>3377,
-22768=>3378,
-12131=>3379,
-29983=>3379,
-29989=>3380,
-29298=>3381,
-21319=>3382,
-32499=>3383,
-30465=>3384,
-30427=>3385,
-21097=>3386,
-32988=>3387,
-22307=>3388,
-24072=>3389,
-22833=>3390,
-29422=>3391,
-26045=>3392,
-28287=>3393,
-35799=>3394,
-12075=>3395,
-23608=>3395,
-34417=>3396,
-12055=>3397,
-21313=>3397,
-12143=>3398,
-30707=>3398,
-25342=>3399,
-26102=>3400,
-20160=>3401,
-12215=>3402,
-39135=>3402,
-34432=>3403,
-23454=>3404,
-35782=>3405,
-21490=>3406,
-12142=>3407,
-30690=>3407,
-20351=>3408,
-23630=>3409,
-39542=>3410,
-22987=>3411,
-24335=>3412,
-12144=>3413,
-31034=>3413,
-12064=>3414,
-22763=>3414,
-19990=>3415,
-26623=>3416,
-20107=>3417,
-25325=>3418,
-35475=>3419,
-36893=>3420,
-21183=>3421,
-26159=>3422,
-21980=>3423,
-22124=>3424,
-36866=>3425,
-20181=>3426,
-20365=>3427,
-37322=>3428,
-39280=>3429,
-12114=>3430,
-27663=>3430,
-24066=>3431,
-24643=>3432,
-23460=>3433,
-35270=>3434,
-35797=>3435,
-25910=>3436,
-12095=>3437,
-25163=>3437,
-12216=>3438,
-39318=>3438,
-23432=>3439,
-23551=>3440,
-25480=>3441,
-21806=>3442,
-21463=>3443,
-30246=>3444,
-20861=>3445,
-34092=>3446,
-26530=>3447,
-26803=>3448,
-27530=>3449,
-25234=>3450,
-36755=>3451,
-21460=>3452,
-33298=>3453,
-28113=>3454,
-30095=>3455,
-20070=>3456,
-36174=>3457,
-23408=>3458,
-29087=>3459,
-34223=>3460,
-26257=>3461,
-26329=>3462,
-32626=>3463,
-34560=>3464,
-12233=>3465,
-40653=>3465,
-12239=>3466,
-40736=>3466,
-23646=>3467,
-26415=>3468,
-36848=>3469,
-26641=>3470,
-26463=>3471,
-25101=>3472,
-31446=>3473,
-22661=>3474,
-24246=>3475,
-25968=>3476,
-28465=>3477,
-24661=>3478,
-21047=>3479,
-32781=>3480,
-25684=>3481,
-34928=>3482,
-29993=>3483,
-24069=>3484,
-26643=>3485,
-25332=>3486,
-38684=>3487,
-21452=>3488,
-29245=>3489,
-35841=>3490,
-12116=>3491,
-27700=>3491,
-30561=>3492,
-31246=>3493,
-21550=>3494,
-30636=>3495,
-39034=>3496,
-33308=>3497,
-35828=>3498,
-30805=>3499,
-26388=>3500,
-28865=>3501,
-26031=>3502,
-25749=>3503,
-22070=>3504,
-24605=>3505,
-31169=>3506,
-21496=>3507,
-19997=>3508,
-27515=>3509,
-32902=>3510,
-23546=>3511,
-21987=>3512,
-22235=>3513,
-20282=>3514,
-20284=>3515,
-39282=>3516,
-24051=>3517,
-26494=>3518,
-32824=>3519,
-24578=>3520,
-39042=>3521,
-36865=>3522,
-23435=>3523,
-35772=>3524,
-35829=>3525,
-25628=>3526,
-33368=>3527,
-25822=>3528,
-22013=>3529,
-33487=>3530,
-37221=>3531,
-20439=>3532,
-32032=>3533,
-36895=>3534,
-31903=>3535,
-20723=>3536,
-22609=>3537,
-28335=>3538,
-23487=>3539,
-35785=>3540,
-32899=>3541,
-37240=>3542,
-33948=>3543,
-31639=>3544,
-34429=>3545,
-38539=>3546,
-38543=>3547,
-32485=>3548,
-39635=>3549,
-30862=>3550,
-23681=>3551,
-31319=>3552,
-36930=>3553,
-38567=>3554,
-31071=>3555,
-23385=>3556,
-25439=>3557,
-31499=>3558,
-34001=>3559,
-26797=>3560,
-21766=>3561,
-32553=>3562,
-29712=>3563,
-32034=>3564,
-38145=>3565,
-25152=>3566,
-22604=>3567,
-20182=>3568,
-23427=>3569,
-22905=>3570,
-22612=>3571,
-29549=>3572,
-25374=>3573,
-36427=>3574,
-36367=>3575,
-32974=>3576,
-33492=>3577,
-25260=>3578,
-21488=>3579,
-27888=>3580,
-37214=>3581,
-22826=>3582,
-24577=>3583,
-27760=>3584,
-22349=>3585,
-25674=>3586,
-36138=>3587,
-30251=>3588,
-28393=>3589,
-22363=>3590,
-27264=>3591,
-30192=>3592,
-28525=>3593,
-35885=>3594,
-35848=>3595,
-22374=>3596,
-27631=>3597,
-34962=>3598,
-30899=>3599,
-25506=>3600,
-21497=>3601,
-28845=>3602,
-27748=>3603,
-22616=>3604,
-25642=>3605,
-22530=>3606,
-26848=>3607,
-33179=>3608,
-21776=>3609,
-31958=>3610,
-20504=>3611,
-36538=>3612,
-28108=>3613,
-36255=>3614,
-28907=>3615,
-25487=>3616,
-28059=>3617,
-28372=>3618,
-32486=>3619,
-33796=>3620,
-26691=>3621,
-36867=>3622,
-28120=>3623,
-38518=>3624,
-35752=>3625,
-22871=>3626,
-29305=>3627,
-34276=>3628,
-33150=>3629,
-30140=>3630,
-35466=>3631,
-26799=>3632,
-21076=>3633,
-36386=>3634,
-38161=>3635,
-25552=>3636,
-39064=>3637,
-36420=>3638,
-21884=>3639,
-20307=>3640,
-26367=>3641,
-22159=>3642,
-24789=>3643,
-28053=>3644,
-21059=>3645,
-23625=>3646,
-22825=>3647,
-28155=>3648,
-22635=>3649,
-12133=>3650,
-30000=>3650,
-29980=>3651,
-24684=>3652,
-33300=>3653,
-33094=>3654,
-25361=>3655,
-26465=>3656,
-36834=>3657,
-30522=>3658,
-36339=>3659,
-36148=>3660,
-38081=>3661,
-24086=>3662,
-21381=>3663,
-21548=>3664,
-28867=>3665,
-27712=>3666,
-24311=>3667,
-20572=>3668,
-20141=>3669,
-24237=>3670,
-25402=>3671,
-33351=>3672,
-36890=>3673,
-26704=>3674,
-37230=>3675,
-30643=>3676,
-21516=>3677,
-38108=>3678,
-24420=>3679,
-31461=>3680,
-26742=>3681,
-25413=>3682,
-31570=>3683,
-32479=>3684,
-30171=>3685,
-20599=>3686,
-25237=>3687,
-22836=>3688,
-36879=>3689,
-20984=>3690,
-31171=>3691,
-31361=>3692,
-22270=>3693,
-24466=>3694,
-36884=>3695,
-28034=>3696,
-23648=>3697,
-12063=>3698,
-22303=>3698,
-21520=>3699,
-20820=>3700,
-28237=>3701,
-22242=>3702,
-25512=>3703,
-39059=>3704,
-33151=>3705,
-34581=>3706,
-35114=>3707,
-36864=>3708,
-21534=>3709,
-23663=>3710,
-33216=>3711,
-25302=>3712,
-25176=>3713,
-33073=>3714,
-40501=>3715,
-38464=>3716,
-39534=>3717,
-39548=>3718,
-26925=>3719,
-22949=>3720,
-25299=>3721,
-21822=>3722,
-25366=>3723,
-21703=>3724,
-34521=>3725,
-27964=>3726,
-23043=>3727,
-12129=>3728,
-29926=>3728,
-34972=>3729,
-27498=>3730,
-22806=>3731,
-35916=>3732,
-24367=>3733,
-28286=>3734,
-29609=>3735,
-39037=>3736,
-20024=>3737,
-28919=>3738,
-23436=>3739,
-30871=>3740,
-25405=>3741,
-26202=>3742,
-30358=>3743,
-24779=>3744,
-23451=>3745,
-23113=>3746,
-19975=>3747,
-33109=>3748,
-27754=>3749,
-29579=>3750,
-20129=>3751,
-26505=>3752,
-12153=>3753,
-32593=>3753,
-24448=>3754,
-26106=>3755,
-26395=>3756,
-24536=>3757,
-22916=>3758,
-23041=>3759,
-24013=>3760,
-24494=>3761,
-21361=>3762,
-38886=>3763,
-36829=>3764,
-26693=>3765,
-22260=>3766,
-21807=>3767,
-24799=>3768,
-20026=>3769,
-28493=>3770,
-32500=>3771,
-33479=>3772,
-33806=>3773,
-22996=>3774,
-20255=>3775,
-20266=>3776,
-23614=>3777,
-32428=>3778,
-26410=>3779,
-34074=>3780,
-21619=>3781,
-30031=>3782,
-32963=>3783,
-21890=>3784,
-39759=>3785,
-20301=>3786,
-28205=>3787,
-35859=>3788,
-23561=>3789,
-24944=>3790,
-21355=>3791,
-30239=>3792,
-28201=>3793,
-34442=>3794,
-12098=>3795,
-25991=>3795,
-38395=>3796,
-32441=>3797,
-21563=>3798,
-31283=>3799,
-32010=>3800,
-38382=>3801,
-21985=>3802,
-32705=>3803,
-29934=>3804,
-25373=>3805,
-34583=>3806,
-28065=>3807,
-31389=>3808,
-25105=>3809,
-26017=>3810,
-21351=>3811,
-25569=>3812,
-27779=>3813,
-24043=>3814,
-21596=>3815,
-38056=>3816,
-20044=>3817,
-27745=>3818,
-35820=>3819,
-23627=>3820,
-12102=>3821,
-26080=>3821,
-33436=>3822,
-26791=>3823,
-21566=>3824,
-21556=>3825,
-12111=>3826,
-27595=>3826,
-27494=>3827,
-20116=>3828,
-25410=>3829,
-21320=>3830,
-33310=>3831,
-20237=>3832,
-20398=>3833,
-22366=>3834,
-25098=>3835,
-38654=>3836,
-26212=>3837,
-29289=>3838,
-21247=>3839,
-21153=>3840,
-24735=>3841,
-35823=>3842,
-26132=>3843,
-29081=>3844,
-26512=>3845,
-35199=>3846,
-30802=>3847,
-30717=>3848,
-26224=>3849,
-22075=>3850,
-21560=>3851,
-38177=>3852,
-29306=>3853,
-31232=>3854,
-24687=>3855,
-24076=>3856,
-24713=>3857,
-33181=>3858,
-12067=>3859,
-22805=>3859,
-24796=>3860,
-29060=>3861,
-28911=>3862,
-28330=>3863,
-27728=>3864,
-29312=>3865,
-27268=>3866,
-34989=>3867,
-24109=>3868,
-20064=>3869,
-23219=>3870,
-21916=>3871,
-38115=>3872,
-27927=>3873,
-31995=>3874,
-38553=>3875,
-25103=>3876,
-32454=>3877,
-30606=>3878,
-34430=>3879,
-21283=>3880,
-38686=>3881,
-36758=>3882,
-26247=>3883,
-23777=>3884,
-20384=>3885,
-29421=>3886,
-19979=>3887,
-21414=>3888,
-22799=>3889,
-21523=>3890,
-25472=>3891,
-38184=>3892,
-20808=>3893,
-20185=>3894,
-40092=>3895,
-32420=>3896,
-21688=>3897,
-36132=>3898,
-34900=>3899,
-33335=>3900,
-38386=>3901,
-28046=>3902,
-24358=>3903,
-23244=>3904,
-26174=>3905,
-38505=>3906,
-29616=>3907,
-29486=>3908,
-21439=>3909,
-33146=>3910,
-39301=>3911,
-32673=>3912,
-23466=>3913,
-38519=>3914,
-38480=>3915,
-32447=>3916,
-30456=>3917,
-21410=>3918,
-38262=>3919,
-12217=>3920,
-39321=>3920,
-31665=>3921,
-35140=>3922,
-28248=>3923,
-20065=>3924,
-32724=>3925,
-31077=>3926,
-35814=>3927,
-24819=>3928,
-21709=>3929,
-20139=>3930,
-39033=>3931,
-24055=>3932,
-27233=>3933,
-20687=>3934,
-21521=>3935,
-35937=>3936,
-33831=>3937,
-30813=>3938,
-38660=>3939,
-21066=>3940,
-21742=>3941,
-22179=>3942,
-38144=>3943,
-28040=>3944,
-23477=>3945,
-28102=>3946,
-26195=>3947,
-12073=>3948,
-23567=>3948,
-23389=>3949,
-26657=>3950,
-32918=>3951,
-21880=>3952,
-31505=>3953,
-25928=>3954,
-26964=>3955,
-20123=>3956,
-27463=>3957,
-34638=>3958,
-38795=>3959,
-21327=>3960,
-25375=>3961,
-25658=>3962,
-37034=>3963,
-26012=>3964,
-32961=>3965,
-35856=>3966,
-20889=>3967,
-26800=>3968,
-21368=>3969,
-34809=>3970,
-25032=>3971,
-27844=>3972,
-27899=>3973,
-35874=>3974,
-23633=>3975,
-34218=>3976,
-33455=>3977,
-38156=>3978,
-27427=>3979,
-12191=>3980,
-36763=>3980,
-26032=>3981,
-24571=>3982,
-12092=>3983,
-24515=>3983,
-20449=>3984,
-34885=>3985,
-26143=>3986,
-33125=>3987,
-29481=>3988,
-24826=>3989,
-20852=>3990,
-21009=>3991,
-22411=>3992,
-24418=>3993,
-37026=>3994,
-12175=>3995,
-34892=>3995,
-37266=>3996,
-24184=>3997,
-26447=>3998,
-24615=>3999,
-22995=>4000,
-20804=>4001,
-20982=>4002,
-33016=>4003,
-21256=>4004,
-27769=>4005,
-38596=>4006,
-29066=>4007,
-20241=>4008,
-20462=>4009,
-32670=>4010,
-26429=>4011,
-21957=>4012,
-38152=>4013,
-31168=>4014,
-34966=>4015,
-32483=>4016,
-22687=>4017,
-25100=>4018,
-38656=>4019,
-34394=>4020,
-22040=>4021,
-39035=>4022,
-24464=>4023,
-35768=>4024,
-33988=>4025,
-37207=>4026,
-21465=>4027,
-26093=>4028,
-24207=>4029,
-30044=>4030,
-24676=>4031,
-32110=>4032,
-23167=>4033,
-32490=>4034,
-32493=>4035,
-36713=>4036,
-21927=>4037,
-23459=>4038,
-24748=>4039,
-26059=>4040,
-12126=>4041,
-29572=>4041,
-36873=>4042,
-30307=>4043,
-30505=>4044,
-32474=>4045,
-38772=>4046,
-34203=>4047,
-23398=>4048,
-12147=>4049,
-31348=>4049,
-38634=>4050,
-12174=>4051,
-34880=>4051,
-21195=>4052,
-29071=>4053,
-24490=>4054,
-26092=>4055,
-35810=>4056,
-23547=>4057,
-39535=>4058,
-24033=>4059,
-27529=>4060,
-27739=>4061,
-35757=>4062,
-35759=>4063,
-36874=>4064,
-36805=>4065,
-21387=>4066,
-25276=>4067,
-40486=>4068,
-40493=>4069,
-21568=>4070,
-20011=>4071,
-33469=>4072,
-12123=>4073,
-29273=>4073,
-34460=>4074,
-23830=>4075,
-34905=>4076,
-28079=>4077,
-38597=>4078,
-21713=>4079,
-20122=>4080,
-35766=>4081,
-28937=>4082,
-21693=>4083,
-38409=>4084,
-28895=>4085,
-28153=>4086,
-30416=>4087,
-20005=>4088,
-30740=>4089,
-34578=>4090,
-23721=>4091,
-24310=>4092,
-12180=>4093,
-35328=>4093,
-39068=>4094,
-38414=>4095,
-28814=>4096,
-27839=>4097,
-22852=>4098,
-25513=>4099,
-30524=>4100,
-34893=>4101,
-28436=>4102,
-33395=>4103,
-22576=>4104,
-29141=>4105,
-21388=>4106,
-30746=>4107,
-38593=>4108,
-21761=>4109,
-24422=>4110,
-28976=>4111,
-23476=>4112,
-35866=>4113,
-39564=>4114,
-27523=>4115,
-22830=>4116,
-40495=>4117,
-31207=>4118,
-26472=>4119,
-25196=>4120,
-20335=>4121,
-30113=>4122,
-12154=>4123,
-32650=>4123,
-27915=>4124,
-38451=>4125,
-27687=>4126,
-20208=>4127,
-30162=>4128,
-20859=>4129,
-26679=>4130,
-28478=>4131,
-36992=>4132,
-33136=>4133,
-22934=>4134,
-29814=>4135,
-25671=>4136,
-23591=>4137,
-36965=>4138,
-31377=>4139,
-35875=>4140,
-23002=>4141,
-21676=>4142,
-33280=>4143,
-33647=>4144,
-35201=>4145,
-32768=>4146,
-26928=>4147,
-22094=>4148,
-32822=>4149,
-29239=>4150,
-37326=>4151,
-20918=>4152,
-20063=>4153,
-39029=>4154,
-25494=>4155,
-19994=>4156,
-21494=>4157,
-26355=>4158,
-33099=>4159,
-22812=>4160,
-28082=>4161,
-12032=>4162,
-19968=>4162,
-22777=>4163,
-21307=>4164,
-25558=>4165,
-38129=>4166,
-20381=>4167,
-20234=>4168,
-12176=>4169,
-34915=>4169,
-39056=>4170,
-22839=>4171,
-36951=>4172,
-31227=>4173,
-20202=>4174,
-33008=>4175,
-30097=>4176,
-27778=>4177,
-23452=>4178,
-23016=>4179,
-24413=>4180,
-26885=>4181,
-34433=>4182,
-20506=>4183,
-24050=>4184,
-12036=>4185,
-20057=>4185,
-30691=>4186,
-20197=>4187,
-33402=>4188,
-25233=>4189,
-26131=>4190,
-12194=>4191,
-37009=>4191,
-23673=>4192,
-20159=>4193,
-24441=>4194,
-33222=>4195,
-36920=>4196,
-32900=>4197,
-30123=>4198,
-20134=>4199,
-35028=>4200,
-24847=>4201,
-27589=>4202,
-24518=>4203,
-20041=>4204,
-30410=>4205,
-28322=>4206,
-35811=>4207,
-35758=>4208,
-35850=>4209,
-35793=>4210,
-24322=>4211,
-32764=>4212,
-32716=>4213,
-32462=>4214,
-33589=>4215,
-33643=>4216,
-22240=>4217,
-27575=>4218,
-12211=>4219,
-38899=>4219,
-38452=>4220,
-23035=>4221,
-21535=>4222,
-38134=>4223,
-28139=>4224,
-23493=>4225,
-39278=>4226,
-23609=>4227,
-24341=>4228,
-38544=>4229,
-21360=>4230,
-33521=>4231,
-27185=>4232,
-23156=>4233,
-40560=>4234,
-24212=>4235,
-32552=>4236,
-33721=>4237,
-33828=>4238,
-33829=>4239,
-33639=>4240,
-34631=>4241,
-36814=>4242,
-36194=>4243,
-30408=>4244,
-24433=>4245,
-39062=>4246,
-30828=>4247,
-26144=>4248,
-21727=>4249,
-25317=>4250,
-20323=>4251,
-33219=>4252,
-30152=>4253,
-24248=>4254,
-38605=>4255,
-36362=>4256,
-34553=>4257,
-21647=>4258,
-27891=>4259,
-28044=>4260,
-27704=>4261,
-24703=>4262,
-21191=>4263,
-12132=>4264,
-29992=>4264,
-24189=>4265,
-20248=>4266,
-24736=>4267,
-24551=>4268,
-23588=>4269,
-30001=>4270,
-37038=>4271,
-38080=>4272,
-29369=>4273,
-27833=>4274,
-28216=>4275,
-12195=>4276,
-37193=>4276,
-26377=>4277,
-21451=>4278,
-21491=>4279,
-20305=>4280,
-37321=>4281,
-35825=>4282,
-12060=>4283,
-21448=>4283,
-24188=>4284,
-36802=>4285,
-28132=>4286,
-20110=>4287,
-30402=>4288,
-27014=>4289,
-34398=>4290,
-24858=>4291,
-33286=>4292,
-20313=>4293,
-20446=>4294,
-36926=>4295,
-40060=>4296,
-24841=>4297,
-28189=>4298,
-28180=>4299,
-38533=>4300,
-20104=>4301,
-23089=>4302,
-12204=>4303,
-38632=>4303,
-19982=>4304,
-23679=>4305,
-31161=>4306,
-23431=>4307,
-35821=>4308,
-12155=>4309,
-32701=>4309,
-12127=>4310,
-29577=>4310,
-22495=>4311,
-33419=>4312,
-37057=>4313,
-21505=>4314,
-36935=>4315,
-21947=>4316,
-23786=>4317,
-24481=>4318,
-24840=>4319,
-27442=>4320,
-29425=>4321,
-32946=>4322,
-35465=>4323,
-28020=>4324,
-23507=>4325,
-35029=>4326,
-39044=>4327,
-35947=>4328,
-39533=>4329,
-40499=>4330,
-28170=>4331,
-20900=>4332,
-20803=>4333,
-22435=>4334,
-34945=>4335,
-21407=>4336,
-25588=>4337,
-36757=>4338,
-22253=>4339,
-21592=>4340,
-22278=>4341,
-29503=>4342,
-28304=>4343,
-32536=>4344,
-36828=>4345,
-33489=>4346,
-24895=>4347,
-24616=>4348,
-38498=>4349,
-12104=>4350,
-26352=>4350,
-32422=>4351,
-36234=>4352,
-36291=>4353,
-38053=>4354,
-23731=>4355,
-31908=>4356,
-12105=>4357,
-26376=>4357,
-24742=>4358,
-38405=>4359,
-32792=>4360,
-20113=>4361,
-37095=>4362,
-21248=>4363,
-38504=>4364,
-20801=>4365,
-36816=>4366,
-34164=>4367,
-37213=>4368,
-26197=>4369,
-38901=>4370,
-23381=>4371,
-21277=>4372,
-30776=>4373,
-26434=>4374,
-26685=>4375,
-21705=>4376,
-28798=>4377,
-23472=>4378,
-36733=>4379,
-20877=>4380,
-22312=>4381,
-21681=>4382,
-25874=>4383,
-26242=>4384,
-36190=>4385,
-36163=>4386,
-33039=>4387,
-33900=>4388,
-36973=>4389,
-31967=>4390,
-20991=>4391,
-34299=>4392,
-26531=>4393,
-26089=>4394,
-28577=>4395,
-34468=>4396,
-36481=>4397,
-22122=>4398,
-36896=>4399,
-30338=>4400,
-28790=>4401,
-29157=>4402,
-36131=>4403,
-25321=>4404,
-21017=>4405,
-27901=>4406,
-36156=>4407,
-24590=>4408,
-22686=>4409,
-24974=>4410,
-26366=>4411,
-36192=>4412,
-25166=>4413,
-21939=>4414,
-28195=>4415,
-26413=>4416,
-36711=>4417,
-38113=>4418,
-38392=>4419,
-30504=>4420,
-26629=>4421,
-27048=>4422,
-21643=>4423,
-20045=>4424,
-28856=>4425,
-35784=>4426,
-25688=>4427,
-25995=>4428,
-23429=>4429,
-31364=>4430,
-20538=>4431,
-23528=>4432,
-30651=>4433,
-27617=>4434,
-35449=>4435,
-31896=>4436,
-27838=>4437,
-30415=>4438,
-26025=>4439,
-36759=>4440,
-23853=>4441,
-23637=>4442,
-34360=>4443,
-26632=>4444,
-21344=>4445,
-25112=>4446,
-31449=>4447,
-28251=>4448,
-32509=>4449,
-27167=>4450,
-31456=>4451,
-24432=>4452,
-28467=>4453,
-24352=>4454,
-25484=>4455,
-28072=>4456,
-26454=>4457,
-19976=>4458,
-24080=>4459,
-36134=>4460,
-20183=>4461,
-32960=>4462,
-30260=>4463,
-38556=>4464,
-25307=>4465,
-26157=>4466,
-25214=>4467,
-27836=>4468,
-36213=>4469,
-29031=>4470,
-32617=>4471,
-20806=>4472,
-32903=>4473,
-21484=>4474,
-36974=>4475,
-25240=>4476,
-21746=>4477,
-34544=>4478,
-36761=>4479,
-32773=>4480,
-38167=>4481,
-34071=>4482,
-36825=>4483,
-27993=>4484,
-29645=>4485,
-26015=>4486,
-30495=>4487,
-29956=>4488,
-30759=>4489,
-33275=>4490,
-36126=>4491,
-38024=>4492,
-20390=>4493,
-26517=>4494,
-30137=>4495,
-35786=>4496,
-38663=>4497,
-25391=>4498,
-38215=>4499,
-38453=>4500,
-33976=>4501,
-25379=>4502,
-30529=>4503,
-24449=>4504,
-29424=>4505,
-20105=>4506,
-24596=>4507,
-25972=>4508,
-25327=>4509,
-27491=>4510,
-25919=>4511,
-24103=>4512,
-30151=>4513,
-37073=>4514,
-35777=>4515,
-33437=>4516,
-26525=>4517,
-12096=>4518,
-25903=>4518,
-21553=>4519,
-34584=>4520,
-30693=>4521,
-32930=>4522,
-33026=>4523,
-27713=>4524,
-20043=>4525,
-32455=>4526,
-32844=>4527,
-30452=>4528,
-26893=>4529,
-27542=>4530,
-25191=>4531,
-20540=>4532,
-20356=>4533,
-22336=>4534,
-25351=>4535,
-12108=>4536,
-27490=>4536,
-36286=>4537,
-21482=>4538,
-26088=>4539,
-32440=>4540,
-24535=>4541,
-25370=>4542,
-25527=>4543,
-12164=>4544,
-33267=>4544,
-33268=>4545,
-32622=>4546,
-24092=>4547,
-23769=>4548,
-21046=>4549,
-26234=>4550,
-31209=>4551,
-31258=>4552,
-36136=>4553,
-28825=>4554,
-30164=>4555,
-28382=>4556,
-27835=>4557,
-31378=>4558,
-20013=>4559,
-30405=>4560,
-24544=>4561,
-38047=>4562,
-34935=>4563,
-32456=>4564,
-31181=>4565,
-32959=>4566,
-37325=>4567,
-20210=>4568,
-20247=>4569,
-12168=>4570,
-33311=>4570,
-21608=>4571,
-24030=>4572,
-27954=>4573,
-35788=>4574,
-31909=>4575,
-36724=>4576,
-32920=>4577,
-24090=>4578,
-21650=>4579,
-30385=>4580,
-23449=>4581,
-26172=>4582,
-39588=>4583,
-29664=>4584,
-26666=>4585,
-34523=>4586,
-26417=>4587,
-29482=>4588,
-35832=>4589,
-35803=>4590,
-36880=>4591,
-12149=>4592,
-31481=>4592,
-28891=>4593,
-29038=>4594,
-25284=>4595,
-30633=>4596,
-22065=>4597,
-20027=>4598,
-33879=>4599,
-26609=>4600,
-21161=>4601,
-34496=>4602,
-36142=>4603,
-38136=>4604,
-31569=>4605,
-20303=>4606,
-27880=>4607,
-31069=>4608,
-39547=>4609,
-25235=>4610,
-12118=>4611,
-29226=>4611,
-25341=>4612,
-19987=>4613,
-30742=>4614,
-36716=>4615,
-25776=>4616,
-36186=>4617,
-31686=>4618,
-26729=>4619,
-24196=>4620,
-35013=>4621,
-22918=>4622,
-25758=>4623,
-22766=>4624,
-29366=>4625,
-26894=>4626,
-38181=>4627,
-36861=>4628,
-36184=>4629,
-22368=>4630,
-32512=>4631,
-35846=>4632,
-20934=>4633,
-25417=>4634,
-25305=>4635,
-21331=>4636,
-26700=>4637,
-29730=>4638,
-33537=>4639,
-37196=>4640,
-21828=>4641,
-30528=>4642,
-28796=>4643,
-27978=>4644,
-20857=>4645,
-21672=>4646,
-36164=>4647,
-23039=>4648,
-28363=>4649,
-28100=>4650,
-23388=>4651,
-32043=>4652,
-20180=>4653,
-31869=>4654,
-28371=>4655,
-12070=>4656,
-23376=>4656,
-12163=>4657,
-33258=>4657,
-28173=>4658,
-23383=>4659,
-39683=>4660,
-26837=>4661,
-36394=>4662,
-23447=>4663,
-32508=>4664,
-24635=>4665,
-32437=>4666,
-37049=>4667,
-12187=>4668,
-36208=>4668,
-22863=>4669,
-25549=>4670,
-31199=>4671,
-12188=>4672,
-36275=>4672,
-21330=>4673,
-26063=>4674,
-31062=>4675,
-35781=>4676,
-38459=>4677,
-32452=>4678,
-38075=>4679,
-32386=>4680,
-22068=>4681,
-37257=>4682,
-26368=>4683,
-32618=>4684,
-23562=>4685,
-36981=>4686,
-26152=>4687,
-24038=>4688,
-20304=>4689,
-26590=>4690,
-20570=>4691,
-20316=>4692,
-22352=>4693,
-24231=>4694,
-20109=>4695,
-19980=>4696,
-20800=>4697,
-64012=>4697,
-19984=>4698,
-24319=>4699,
-21317=>4700,
-19989=>4701,
-20120=>4702,
-19998=>4703,
-12224=>4704,
-39730=>4704,
-23404=>4705,
-22121=>4706,
-12033=>4707,
-20008=>4707,
-31162=>4708,
-12035=>4709,
-20031=>4709,
-12052=>4710,
-21269=>4710,
-20039=>4711,
-22829=>4712,
-12120=>4713,
-29243=>4713,
-21358=>4714,
-27664=>4715,
-22239=>4716,
-32996=>4717,
-39319=>4718,
-27603=>4719,
-30590=>4720,
-40727=>4721,
-12034=>4722,
-20022=>4722,
-20127=>4723,
-40720=>4724,
-20060=>4725,
-20073=>4726,
-20115=>4727,
-33416=>4728,
-23387=>4729,
-21868=>4730,
-22031=>4731,
-20164=>4732,
-21389=>4733,
-21405=>4734,
-21411=>4735,
-21413=>4736,
-21422=>4737,
-38757=>4738,
-36189=>4739,
-12053=>4740,
-21274=>4740,
-21493=>4741,
-21286=>4742,
-21294=>4743,
-21310=>4744,
-36188=>4745,
-21350=>4746,
-21347=>4747,
-20994=>4748,
-21000=>4749,
-21006=>4750,
-21037=>4751,
-21043=>4752,
-21055=>4753,
-21056=>4754,
-21068=>4755,
-21086=>4756,
-21089=>4757,
-21084=>4758,
-33967=>4759,
-21117=>4760,
-21122=>4761,
-21121=>4762,
-21136=>4763,
-21139=>4764,
-12044=>4765,
-20866=>4765,
-32596=>4766,
-20155=>4767,
-20163=>4768,
-20169=>4769,
-20162=>4770,
-20200=>4771,
-20193=>4772,
-20203=>4773,
-20190=>4774,
-20251=>4775,
-20211=>4776,
-20258=>4777,
-20324=>4778,
-20213=>4779,
-20261=>4780,
-20263=>4781,
-20233=>4782,
-20267=>4783,
-20318=>4784,
-20327=>4785,
-25912=>4786,
-20314=>4787,
-20317=>4788,
-20319=>4789,
-20311=>4790,
-20274=>4791,
-20285=>4792,
-20342=>4793,
-20340=>4794,
-20369=>4795,
-20361=>4796,
-20355=>4797,
-20367=>4798,
-20350=>4799,
-20347=>4800,
-20394=>4801,
-20348=>4802,
-20396=>4803,
-20372=>4804,
-20454=>4805,
-20456=>4806,
-20458=>4807,
-20421=>4808,
-20442=>4809,
-20451=>4810,
-20444=>4811,
-20433=>4812,
-20447=>4813,
-20472=>4814,
-20521=>4815,
-20556=>4816,
-20467=>4817,
-20524=>4818,
-20495=>4819,
-20526=>4820,
-20525=>4821,
-20478=>4822,
-20508=>4823,
-20492=>4824,
-20517=>4825,
-20520=>4826,
-20606=>4827,
-20547=>4828,
-20565=>4829,
-20552=>4830,
-20558=>4831,
-20588=>4832,
-20603=>4833,
-20645=>4834,
-20647=>4835,
-20649=>4836,
-20666=>4837,
-20694=>4838,
-20742=>4839,
-20717=>4840,
-20716=>4841,
-20710=>4842,
-20718=>4843,
-20743=>4844,
-20747=>4845,
-20189=>4846,
-27709=>4847,
-20312=>4848,
-20325=>4849,
-20430=>4850,
-12245=>4851,
-40864=>4851,
-27718=>4852,
-31860=>4853,
-20846=>4854,
-24061=>4855,
-40649=>4856,
-39320=>4857,
-20865=>4858,
-22804=>4859,
-12051=>4860,
-21241=>4860,
-21261=>4861,
-35335=>4862,
-21264=>4863,
-20971=>4864,
-22809=>4865,
-20821=>4866,
-12039=>4867,
-20128=>4867,
-20822=>4868,
-20147=>4869,
-34926=>4870,
-34980=>4871,
-20149=>4872,
-33044=>4873,
-35026=>4874,
-31104=>4875,
-23348=>4876,
-34819=>4877,
-32696=>4878,
-12046=>4879,
-20907=>4879,
-20913=>4880,
-20925=>4881,
-20924=>4882,
-20935=>4883,
-12045=>4884,
-20886=>4884,
-20898=>4885,
-20901=>4886,
-35744=>4887,
-35750=>4888,
-35751=>4889,
-35754=>4890,
-35764=>4891,
-35765=>4892,
-35767=>4893,
-35778=>4894,
-35779=>4895,
-35787=>4896,
-35791=>4897,
-35790=>4898,
-35794=>4899,
-35795=>4900,
-35796=>4901,
-35798=>4902,
-35800=>4903,
-35801=>4904,
-35804=>4905,
-35807=>4906,
-35808=>4907,
-35812=>4908,
-35816=>4909,
-35817=>4910,
-35822=>4911,
-35824=>4912,
-35827=>4913,
-35830=>4914,
-35833=>4915,
-35836=>4916,
-35839=>4917,
-35840=>4918,
-35842=>4919,
-35844=>4920,
-35847=>4921,
-35852=>4922,
-35855=>4923,
-35857=>4924,
-35858=>4925,
-35860=>4926,
-35861=>4927,
-35862=>4928,
-35865=>4929,
-35867=>4930,
-35864=>4931,
-35869=>4932,
-35871=>4933,
-35872=>4934,
-35873=>4935,
-35877=>4936,
-35879=>4937,
-35882=>4938,
-35883=>4939,
-35886=>4940,
-35887=>4941,
-35890=>4942,
-35891=>4943,
-35893=>4944,
-35894=>4945,
-12057=>4946,
-21353=>4946,
-21370=>4947,
-38429=>4948,
-38434=>4949,
-38433=>4950,
-38449=>4951,
-38442=>4952,
-38461=>4953,
-38460=>4954,
-38466=>4955,
-38473=>4956,
-38484=>4957,
-38495=>4958,
-38503=>4959,
-38508=>4960,
-38514=>4961,
-38516=>4962,
-38536=>4963,
-38541=>4964,
-38551=>4965,
-38576=>4966,
-37015=>4967,
-37019=>4968,
-37021=>4969,
-37017=>4970,
-37036=>4971,
-37025=>4972,
-37044=>4973,
-37043=>4974,
-37046=>4975,
-37050=>4976,
-37048=>4977,
-37040=>4978,
-37071=>4979,
-37061=>4980,
-37054=>4981,
-37072=>4982,
-37060=>4983,
-37063=>4984,
-37075=>4985,
-37094=>4986,
-37090=>4987,
-37084=>4988,
-37079=>4989,
-37083=>4990,
-37099=>4991,
-37103=>4992,
-37118=>4993,
-37124=>4994,
-37154=>4995,
-37150=>4996,
-37155=>4997,
-37169=>4998,
-37167=>4999,
-37177=>5000,
-37187=>5001,
-37190=>5002,
-21005=>5003,
-22850=>5004,
-21154=>5005,
-21164=>5006,
-21165=>5007,
-21182=>5008,
-21759=>5009,
-21200=>5010,
-21206=>5011,
-21232=>5012,
-21471=>5013,
-29166=>5014,
-30669=>5015,
-12085=>5016,
-24308=>5016,
-12048=>5017,
-20981=>5017,
-20988=>5018,
-12223=>5019,
-39727=>5019,
-12059=>5020,
-21430=>5020,
-24321=>5021,
-30042=>5022,
-24047=>5023,
-22348=>5024,
-22441=>5025,
-22433=>5026,
-22654=>5027,
-22716=>5028,
-22725=>5029,
-22737=>5030,
-22313=>5031,
-22316=>5032,
-22314=>5033,
-22323=>5034,
-22329=>5035,
-22318=>5036,
-22319=>5037,
-22364=>5038,
-22331=>5039,
-22338=>5040,
-22377=>5041,
-22405=>5042,
-22379=>5043,
-22406=>5044,
-22396=>5045,
-22395=>5046,
-22376=>5047,
-22381=>5048,
-22390=>5049,
-22387=>5050,
-22445=>5051,
-22436=>5052,
-22412=>5053,
-22450=>5054,
-22479=>5055,
-22439=>5056,
-22452=>5057,
-22419=>5058,
-22432=>5059,
-22485=>5060,
-22488=>5061,
-22490=>5062,
-22489=>5063,
-22482=>5064,
-22456=>5065,
-22516=>5066,
-22511=>5067,
-22520=>5068,
-22500=>5069,
-22493=>5070,
-22539=>5071,
-22541=>5072,
-22525=>5073,
-22509=>5074,
-22528=>5075,
-22558=>5076,
-22553=>5077,
-22596=>5078,
-22560=>5079,
-22629=>5080,
-22636=>5081,
-22657=>5082,
-22665=>5083,
-22682=>5084,
-22656=>5085,
-39336=>5086,
-40729=>5087,
-25087=>5088,
-33401=>5089,
-33405=>5090,
-33407=>5091,
-33423=>5092,
-33418=>5093,
-33448=>5094,
-33412=>5095,
-33422=>5096,
-33425=>5097,
-33431=>5098,
-33433=>5099,
-33451=>5100,
-33464=>5101,
-33470=>5102,
-33456=>5103,
-33480=>5104,
-33482=>5105,
-33507=>5106,
-33432=>5107,
-33463=>5108,
-33454=>5109,
-33483=>5110,
-33484=>5111,
-33473=>5112,
-33449=>5113,
-33460=>5114,
-33441=>5115,
-33450=>5116,
-33439=>5117,
-33476=>5118,
-33486=>5119,
-33444=>5120,
-33505=>5121,
-33545=>5122,
-33527=>5123,
-33508=>5124,
-33551=>5125,
-33543=>5126,
-33500=>5127,
-33524=>5128,
-33490=>5129,
-33496=>5130,
-33548=>5131,
-33531=>5132,
-33491=>5133,
-33553=>5134,
-33562=>5135,
-33542=>5136,
-33556=>5137,
-33557=>5138,
-33504=>5139,
-33493=>5140,
-33564=>5141,
-33617=>5142,
-33627=>5143,
-33628=>5144,
-33544=>5145,
-33682=>5146,
-33596=>5147,
-33588=>5148,
-33585=>5149,
-33691=>5150,
-33630=>5151,
-33583=>5152,
-33615=>5153,
-33607=>5154,
-33603=>5155,
-33631=>5156,
-33600=>5157,
-33559=>5158,
-33632=>5159,
-33581=>5160,
-33594=>5161,
-33587=>5162,
-33638=>5163,
-33637=>5164,
-33640=>5165,
-33563=>5166,
-33641=>5167,
-33644=>5168,
-33642=>5169,
-33645=>5170,
-33646=>5171,
-33712=>5172,
-33656=>5173,
-33715=>5174,
-33716=>5175,
-33696=>5176,
-33706=>5177,
-33683=>5178,
-33692=>5179,
-33669=>5180,
-33660=>5181,
-33718=>5182,
-33705=>5183,
-33661=>5184,
-33720=>5185,
-33659=>5186,
-33688=>5187,
-33694=>5188,
-33704=>5189,
-33722=>5190,
-33724=>5191,
-33729=>5192,
-33793=>5193,
-33765=>5194,
-33752=>5195,
-22535=>5196,
-33816=>5197,
-33803=>5198,
-33757=>5199,
-33789=>5200,
-33750=>5201,
-33820=>5202,
-33848=>5203,
-33809=>5204,
-33798=>5205,
-33748=>5206,
-33759=>5207,
-33807=>5208,
-33795=>5209,
-33784=>5210,
-33785=>5211,
-33770=>5212,
-33733=>5213,
-33728=>5214,
-33830=>5215,
-33776=>5216,
-33761=>5217,
-33884=>5218,
-33873=>5219,
-33882=>5220,
-33881=>5221,
-33907=>5222,
-33927=>5223,
-33928=>5224,
-33914=>5225,
-33929=>5226,
-33912=>5227,
-33852=>5228,
-33862=>5229,
-33897=>5230,
-33910=>5231,
-33932=>5232,
-33934=>5233,
-33841=>5234,
-33901=>5235,
-33985=>5236,
-33997=>5237,
-34000=>5238,
-34022=>5239,
-33981=>5240,
-34003=>5241,
-33994=>5242,
-33983=>5243,
-33978=>5244,
-34016=>5245,
-33953=>5246,
-33977=>5247,
-33972=>5248,
-33943=>5249,
-34021=>5250,
-34019=>5251,
-34060=>5252,
-29965=>5253,
-34104=>5254,
-34032=>5255,
-34105=>5256,
-34079=>5257,
-34106=>5258,
-34134=>5259,
-34107=>5260,
-34047=>5261,
-34044=>5262,
-34137=>5263,
-34120=>5264,
-34152=>5265,
-34148=>5266,
-34142=>5267,
-34170=>5268,
-30626=>5269,
-34115=>5270,
-34162=>5271,
-34171=>5272,
-34212=>5273,
-34216=>5274,
-34183=>5275,
-34191=>5276,
-34169=>5277,
-34222=>5278,
-34204=>5279,
-34181=>5280,
-34233=>5281,
-34231=>5282,
-34224=>5283,
-34259=>5284,
-34241=>5285,
-34268=>5286,
-34303=>5287,
-34343=>5288,
-34309=>5289,
-34345=>5290,
-34326=>5291,
-34364=>5292,
-12086=>5293,
-24318=>5293,
-24328=>5294,
-22844=>5295,
-22849=>5296,
-32823=>5297,
-22869=>5298,
-22874=>5299,
-22872=>5300,
-21263=>5301,
-12074=>5302,
-23586=>5302,
-23589=>5303,
-23596=>5304,
-23604=>5305,
-25164=>5306,
-25194=>5307,
-25247=>5308,
-25275=>5309,
-25290=>5310,
-25306=>5311,
-25303=>5312,
-25326=>5313,
-25378=>5314,
-25334=>5315,
-25401=>5316,
-25419=>5317,
-25411=>5318,
-25517=>5319,
-25590=>5320,
-25457=>5321,
-25466=>5322,
-25486=>5323,
-25524=>5324,
-25453=>5325,
-25516=>5326,
-25482=>5327,
-25449=>5328,
-25518=>5329,
-25532=>5330,
-25586=>5331,
-25592=>5332,
-25568=>5333,
-25599=>5334,
-25540=>5335,
-25566=>5336,
-25550=>5337,
-25682=>5338,
-25542=>5339,
-25534=>5340,
-25669=>5341,
-25665=>5342,
-25611=>5343,
-25627=>5344,
-25632=>5345,
-25612=>5346,
-25638=>5347,
-25633=>5348,
-25694=>5349,
-25732=>5350,
-25709=>5351,
-25750=>5352,
-25722=>5353,
-25783=>5354,
-25784=>5355,
-25753=>5356,
-25786=>5357,
-25792=>5358,
-25808=>5359,
-25815=>5360,
-25828=>5361,
-25826=>5362,
-25865=>5363,
-25893=>5364,
-25902=>5365,
-12087=>5366,
-24331=>5366,
-24530=>5367,
-29977=>5368,
-24337=>5369,
-21343=>5370,
-21489=>5371,
-21501=>5372,
-21481=>5373,
-21480=>5374,
-21499=>5375,
-21522=>5376,
-21526=>5377,
-21510=>5378,
-21579=>5379,
-21586=>5380,
-21587=>5381,
-21588=>5382,
-21590=>5383,
-21571=>5384,
-21537=>5385,
-21591=>5386,
-21593=>5387,
-21539=>5388,
-21554=>5389,
-21634=>5390,
-21652=>5391,
-21623=>5392,
-21617=>5393,
-21604=>5394,
-21658=>5395,
-21659=>5396,
-21636=>5397,
-21622=>5398,
-21606=>5399,
-21661=>5400,
-21712=>5401,
-21677=>5402,
-21698=>5403,
-21684=>5404,
-21714=>5405,
-21671=>5406,
-21670=>5407,
-21715=>5408,
-21716=>5409,
-21618=>5410,
-21667=>5411,
-21717=>5412,
-21691=>5413,
-21695=>5414,
-21708=>5415,
-21721=>5416,
-21722=>5417,
-21724=>5418,
-21673=>5419,
-21674=>5420,
-21668=>5421,
-21725=>5422,
-21711=>5423,
-21726=>5424,
-21787=>5425,
-21735=>5426,
-21792=>5427,
-21757=>5428,
-21780=>5429,
-21747=>5430,
-21794=>5431,
-21795=>5432,
-21775=>5433,
-21777=>5434,
-21799=>5435,
-21802=>5436,
-21863=>5437,
-21903=>5438,
-21941=>5439,
-21833=>5440,
-21869=>5441,
-21825=>5442,
-21845=>5443,
-21823=>5444,
-21840=>5445,
-21820=>5446,
-21815=>5447,
-21846=>5448,
-21877=>5449,
-21878=>5450,
-21879=>5451,
-21811=>5452,
-21808=>5453,
-21852=>5454,
-21899=>5455,
-21970=>5456,
-21891=>5457,
-21937=>5458,
-21945=>5459,
-21896=>5460,
-21889=>5461,
-21919=>5462,
-21886=>5463,
-21974=>5464,
-21905=>5465,
-21883=>5466,
-21983=>5467,
-21949=>5468,
-21950=>5469,
-21908=>5470,
-21913=>5471,
-21994=>5472,
-22007=>5473,
-21961=>5474,
-22047=>5475,
-21969=>5476,
-21995=>5477,
-21996=>5478,
-21972=>5479,
-21990=>5480,
-21981=>5481,
-21956=>5482,
-21999=>5483,
-21989=>5484,
-22002=>5485,
-22003=>5486,
-21964=>5487,
-21965=>5488,
-21992=>5489,
-22005=>5490,
-21988=>5491,
-36756=>5492,
-22046=>5493,
-22024=>5494,
-22028=>5495,
-22017=>5496,
-22052=>5497,
-22051=>5498,
-22014=>5499,
-22016=>5500,
-22055=>5501,
-22061=>5502,
-22104=>5503,
-22073=>5504,
-22103=>5505,
-22060=>5506,
-22093=>5507,
-22114=>5508,
-22105=>5509,
-22108=>5510,
-22092=>5511,
-22100=>5512,
-22150=>5513,
-22116=>5514,
-22129=>5515,
-22123=>5516,
-22139=>5517,
-22140=>5518,
-22149=>5519,
-22163=>5520,
-22191=>5521,
-22228=>5522,
-12062=>5523,
-22231=>5523,
-22237=>5524,
-22241=>5525,
-22261=>5526,
-22251=>5527,
-22265=>5528,
-22271=>5529,
-22276=>5530,
-22282=>5531,
-22281=>5532,
-22300=>5533,
-24079=>5534,
-24089=>5535,
-24084=>5536,
-24081=>5537,
-24113=>5538,
-24123=>5539,
-24124=>5540,
-24119=>5541,
-24132=>5542,
-24148=>5543,
-24155=>5544,
-24158=>5545,
-24161=>5546,
-23692=>5547,
-23674=>5548,
-23693=>5549,
-23696=>5550,
-23702=>5551,
-23688=>5552,
-23704=>5553,
-23705=>5554,
-23697=>5555,
-23706=>5556,
-23708=>5557,
-23733=>5558,
-23714=>5559,
-23741=>5560,
-23724=>5561,
-23723=>5562,
-23729=>5563,
-23715=>5564,
-23745=>5565,
-23735=>5566,
-23748=>5567,
-23762=>5568,
-23780=>5569,
-23755=>5570,
-23781=>5571,
-23810=>5572,
-23811=>5573,
-23847=>5574,
-23846=>5575,
-23854=>5576,
-23844=>5577,
-23838=>5578,
-23814=>5579,
-23835=>5580,
-23896=>5581,
-23870=>5582,
-23860=>5583,
-23869=>5584,
-23916=>5585,
-23899=>5586,
-23919=>5587,
-23901=>5588,
-23915=>5589,
-23883=>5590,
-23882=>5591,
-23913=>5592,
-23924=>5593,
-23938=>5594,
-23961=>5595,
-23965=>5596,
-35955=>5597,
-23991=>5598,
-24005=>5599,
-12091=>5600,
-24435=>5600,
-24439=>5601,
-24450=>5602,
-24455=>5603,
-24457=>5604,
-24460=>5605,
-24469=>5606,
-24473=>5607,
-24476=>5608,
-24488=>5609,
-24493=>5610,
-24501=>5611,
-24508=>5612,
-34914=>5613,
-12090=>5614,
-24417=>5614,
-29357=>5615,
-29360=>5616,
-29364=>5617,
-29367=>5618,
-29368=>5619,
-29379=>5620,
-29377=>5621,
-29390=>5622,
-29389=>5623,
-29394=>5624,
-29416=>5625,
-29423=>5626,
-29417=>5627,
-29426=>5628,
-29428=>5629,
-29431=>5630,
-29441=>5631,
-29427=>5632,
-29443=>5633,
-29434=>5634,
-29435=>5635,
-29463=>5636,
-29459=>5637,
-29473=>5638,
-29450=>5639,
-29470=>5640,
-29469=>5641,
-29461=>5642,
-29474=>5643,
-29497=>5644,
-29477=>5645,
-29484=>5646,
-29496=>5647,
-29489=>5648,
-29520=>5649,
-29517=>5650,
-29527=>5651,
-29536=>5652,
-29548=>5653,
-29551=>5654,
-29566=>5655,
-12167=>5656,
-33307=>5656,
-22821=>5657,
-39143=>5658,
-22820=>5659,
-12065=>5660,
-22786=>5660,
-39267=>5661,
-39271=>5662,
-39272=>5663,
-39273=>5664,
-39274=>5665,
-39275=>5666,
-39276=>5667,
-39284=>5668,
-39287=>5669,
-39293=>5670,
-39296=>5671,
-39300=>5672,
-39303=>5673,
-39306=>5674,
-39309=>5675,
-39312=>5676,
-39313=>5677,
-39315=>5678,
-39316=>5679,
-39317=>5680,
-24192=>5681,
-24209=>5682,
-24203=>5683,
-24214=>5684,
-24229=>5685,
-24224=>5686,
-24249=>5687,
-24245=>5688,
-24254=>5689,
-24243=>5690,
-36179=>5691,
-24274=>5692,
-24273=>5693,
-24283=>5694,
-24296=>5695,
-24298=>5696,
-33210=>5697,
-24516=>5698,
-24521=>5699,
-24534=>5700,
-24527=>5701,
-24579=>5702,
-24558=>5703,
-24580=>5704,
-24545=>5705,
-24548=>5706,
-24574=>5707,
-24581=>5708,
-24582=>5709,
-24554=>5710,
-24557=>5711,
-24568=>5712,
-24601=>5713,
-24629=>5714,
-24614=>5715,
-24603=>5716,
-24591=>5717,
-24589=>5718,
-24617=>5719,
-24619=>5720,
-24586=>5721,
-24639=>5722,
-24609=>5723,
-24696=>5724,
-24697=>5725,
-24699=>5726,
-24698=>5727,
-24642=>5728,
-24682=>5729,
-24701=>5730,
-24726=>5731,
-24730=>5732,
-24749=>5733,
-24733=>5734,
-24707=>5735,
-24722=>5736,
-24716=>5737,
-24731=>5738,
-24812=>5739,
-24763=>5740,
-24753=>5741,
-24797=>5742,
-24792=>5743,
-24774=>5744,
-24794=>5745,
-24756=>5746,
-24864=>5747,
-24870=>5748,
-24853=>5749,
-24867=>5750,
-24820=>5751,
-24832=>5752,
-24846=>5753,
-24875=>5754,
-24906=>5755,
-24949=>5756,
-25004=>5757,
-24980=>5758,
-24999=>5759,
-25015=>5760,
-25044=>5761,
-25077=>5762,
-24541=>5763,
-38579=>5764,
-38377=>5765,
-38379=>5766,
-38385=>5767,
-38387=>5768,
-38389=>5769,
-38390=>5770,
-38396=>5771,
-38398=>5772,
-38403=>5773,
-38404=>5774,
-38406=>5775,
-38408=>5776,
-38410=>5777,
-38411=>5778,
-38412=>5779,
-38413=>5780,
-38415=>5781,
-38418=>5782,
-38421=>5783,
-38422=>5784,
-38423=>5785,
-38425=>5786,
-38426=>5787,
-20012=>5788,
-12121=>5789,
-29247=>5789,
-25109=>5790,
-27701=>5791,
-27732=>5792,
-27740=>5793,
-27722=>5794,
-27811=>5795,
-27781=>5796,
-27792=>5797,
-27796=>5798,
-27788=>5799,
-27752=>5800,
-27753=>5801,
-27764=>5802,
-27766=>5803,
-27782=>5804,
-27817=>5805,
-27856=>5806,
-27860=>5807,
-27821=>5808,
-27895=>5809,
-27896=>5810,
-27889=>5811,
-27863=>5812,
-27826=>5813,
-27872=>5814,
-27862=>5815,
-27898=>5816,
-27883=>5817,
-27886=>5818,
-27825=>5819,
-27859=>5820,
-27887=>5821,
-27902=>5822,
-27961=>5823,
-27943=>5824,
-27916=>5825,
-27971=>5826,
-27976=>5827,
-27911=>5828,
-27908=>5829,
-27929=>5830,
-27918=>5831,
-27947=>5832,
-27981=>5833,
-27950=>5834,
-27957=>5835,
-27930=>5836,
-27983=>5837,
-27986=>5838,
-27988=>5839,
-27955=>5840,
-28049=>5841,
-28015=>5842,
-28062=>5843,
-28064=>5844,
-27998=>5845,
-28051=>5846,
-28052=>5847,
-27996=>5848,
-28000=>5849,
-28028=>5850,
-28003=>5851,
-28186=>5852,
-28103=>5853,
-28101=>5854,
-28126=>5855,
-28174=>5856,
-28095=>5857,
-28128=>5858,
-28177=>5859,
-28134=>5860,
-28125=>5861,
-28121=>5862,
-28182=>5863,
-28075=>5864,
-28172=>5865,
-28078=>5866,
-28203=>5867,
-28270=>5868,
-28238=>5869,
-28267=>5870,
-28338=>5871,
-28255=>5872,
-28294=>5873,
-28243=>5874,
-28244=>5875,
-28210=>5876,
-28197=>5877,
-28228=>5878,
-28383=>5879,
-28337=>5880,
-28312=>5881,
-28384=>5882,
-28461=>5883,
-28386=>5884,
-28325=>5885,
-28327=>5886,
-28349=>5887,
-28347=>5888,
-28343=>5889,
-28375=>5890,
-28340=>5891,
-28367=>5892,
-28303=>5893,
-28354=>5894,
-28319=>5895,
-28514=>5896,
-28486=>5897,
-28487=>5898,
-28452=>5899,
-28437=>5900,
-28409=>5901,
-28463=>5902,
-28470=>5903,
-28491=>5904,
-28532=>5905,
-28458=>5906,
-28425=>5907,
-28457=>5908,
-28553=>5909,
-28557=>5910,
-28556=>5911,
-28536=>5912,
-28530=>5913,
-28540=>5914,
-28538=>5915,
-28625=>5916,
-28617=>5917,
-28583=>5918,
-28601=>5919,
-28598=>5920,
-28610=>5921,
-28641=>5922,
-28654=>5923,
-28638=>5924,
-28640=>5925,
-28655=>5926,
-28698=>5927,
-28707=>5928,
-28699=>5929,
-28729=>5930,
-28725=>5931,
-28751=>5932,
-28766=>5933,
-12071=>5934,
-23424=>5934,
-23428=>5935,
-23445=>5936,
-23443=>5937,
-23461=>5938,
-23480=>5939,
-29999=>5940,
-39582=>5941,
-25652=>5942,
-23524=>5943,
-23534=>5944,
-35120=>5945,
-23536=>5946,
-36423=>5947,
-35591=>5948,
-36790=>5949,
-36819=>5950,
-36821=>5951,
-36837=>5952,
-36846=>5953,
-36836=>5954,
-36841=>5955,
-36838=>5956,
-36851=>5957,
-36840=>5958,
-36869=>5959,
-36868=>5960,
-36875=>5961,
-36902=>5962,
-36881=>5963,
-36877=>5964,
-36886=>5965,
-36897=>5966,
-36917=>5967,
-36918=>5968,
-36909=>5969,
-36911=>5970,
-36932=>5971,
-36945=>5972,
-36946=>5973,
-36944=>5974,
-36968=>5975,
-36952=>5976,
-36962=>5977,
-36955=>5978,
-26297=>5979,
-36980=>5980,
-36989=>5981,
-36994=>5982,
-37000=>5983,
-36995=>5984,
-37003=>5985,
-12089=>5986,
-24400=>5986,
-24407=>5987,
-24406=>5988,
-24408=>5989,
-23611=>5990,
-21675=>5991,
-23632=>5992,
-23641=>5993,
-23409=>5994,
-23651=>5995,
-23654=>5996,
-32700=>5997,
-24362=>5998,
-24361=>5999,
-24365=>6000,
-33396=>6001,
-24380=>6002,
-39739=>6003,
-12076=>6004,
-23662=>6004,
-22913=>6005,
-22915=>6006,
-22925=>6007,
-22953=>6008,
-22954=>6009,
-22947=>6010,
-22935=>6011,
-22986=>6012,
-22955=>6013,
-22942=>6014,
-22948=>6015,
-22994=>6016,
-22962=>6017,
-22959=>6018,
-22999=>6019,
-22974=>6020,
-23045=>6021,
-23046=>6022,
-23005=>6023,
-23048=>6024,
-23011=>6025,
-23000=>6026,
-23033=>6027,
-23052=>6028,
-23049=>6029,
-23090=>6030,
-23092=>6031,
-23057=>6032,
-23075=>6033,
-23059=>6034,
-23104=>6035,
-23143=>6036,
-23114=>6037,
-23125=>6038,
-23100=>6039,
-23138=>6040,
-23157=>6041,
-33004=>6042,
-23210=>6043,
-23195=>6044,
-23159=>6045,
-23162=>6046,
-23230=>6047,
-23275=>6048,
-23218=>6049,
-23250=>6050,
-23252=>6051,
-23224=>6052,
-23264=>6053,
-23267=>6054,
-23281=>6055,
-23254=>6056,
-23270=>6057,
-23256=>6058,
-23260=>6059,
-23305=>6060,
-23319=>6061,
-23318=>6062,
-23346=>6063,
-23351=>6064,
-23360=>6065,
-23573=>6066,
-23580=>6067,
-23386=>6068,
-23397=>6069,
-23411=>6070,
-23377=>6071,
-23379=>6072,
-23394=>6073,
-39541=>6074,
-39543=>6075,
-39544=>6076,
-39546=>6077,
-39551=>6078,
-39549=>6079,
-39552=>6080,
-39553=>6081,
-39557=>6082,
-39560=>6083,
-39562=>6084,
-39568=>6085,
-39570=>6086,
-39571=>6087,
-39574=>6088,
-39576=>6089,
-39579=>6090,
-39580=>6091,
-39581=>6092,
-39583=>6093,
-39584=>6094,
-39586=>6095,
-39587=>6096,
-39589=>6097,
-39591=>6098,
-32415=>6099,
-32417=>6100,
-32419=>6101,
-32421=>6102,
-32424=>6103,
-32425=>6104,
-32429=>6105,
-32432=>6106,
-32446=>6107,
-32448=>6108,
-32449=>6109,
-32450=>6110,
-32457=>6111,
-32459=>6112,
-32460=>6113,
-32464=>6114,
-32468=>6115,
-32471=>6116,
-32475=>6117,
-32480=>6118,
-32481=>6119,
-32488=>6120,
-32491=>6121,
-32494=>6122,
-32495=>6123,
-32497=>6124,
-32498=>6125,
-32525=>6126,
-32502=>6127,
-32506=>6128,
-32507=>6129,
-32510=>6130,
-32513=>6131,
-32514=>6132,
-32515=>6133,
-32519=>6134,
-32520=>6135,
-32523=>6136,
-32524=>6137,
-32527=>6138,
-32529=>6139,
-32530=>6140,
-32535=>6141,
-32537=>6142,
-32540=>6143,
-32539=>6144,
-32543=>6145,
-32545=>6146,
-32546=>6147,
-32547=>6148,
-32548=>6149,
-32549=>6150,
-32550=>6151,
-32551=>6152,
-32554=>6153,
-32555=>6154,
-32556=>6155,
-32557=>6156,
-32559=>6157,
-32560=>6158,
-32561=>6159,
-32562=>6160,
-32563=>6161,
-32565=>6162,
-12083=>6163,
-24186=>6163,
-30079=>6164,
-12078=>6165,
-24027=>6165,
-30014=>6166,
-37013=>6167,
-29582=>6168,
-29585=>6169,
-29614=>6170,
-29602=>6171,
-29599=>6172,
-29647=>6173,
-29634=>6174,
-29649=>6175,
-29623=>6176,
-29619=>6177,
-29632=>6178,
-29641=>6179,
-29640=>6180,
-29669=>6181,
-29657=>6182,
-39036=>6183,
-29706=>6184,
-29673=>6185,
-29671=>6186,
-29662=>6187,
-29626=>6188,
-29682=>6189,
-29711=>6190,
-29738=>6191,
-29787=>6192,
-29734=>6193,
-29733=>6194,
-29736=>6195,
-29744=>6196,
-29742=>6197,
-29740=>6198,
-29723=>6199,
-29722=>6200,
-29761=>6201,
-29788=>6202,
-29783=>6203,
-29781=>6204,
-29785=>6205,
-29815=>6206,
-29805=>6207,
-29822=>6208,
-29852=>6209,
-29838=>6210,
-29824=>6211,
-29825=>6212,
-29831=>6213,
-29835=>6214,
-29854=>6215,
-29864=>6216,
-29865=>6217,
-29840=>6218,
-29863=>6219,
-29906=>6220,
-29882=>6221,
-38890=>6222,
-38891=>6223,
-38892=>6224,
-26444=>6225,
-26451=>6226,
-26462=>6227,
-26440=>6228,
-26473=>6229,
-26533=>6230,
-26503=>6231,
-26474=>6232,
-26483=>6233,
-26520=>6234,
-26535=>6235,
-26485=>6236,
-26536=>6237,
-26526=>6238,
-26541=>6239,
-26507=>6240,
-26487=>6241,
-26492=>6242,
-26608=>6243,
-26633=>6244,
-26584=>6245,
-26634=>6246,
-26601=>6247,
-26544=>6248,
-26636=>6249,
-26585=>6250,
-26549=>6251,
-26586=>6252,
-26547=>6253,
-26589=>6254,
-26624=>6255,
-26563=>6256,
-26552=>6257,
-26594=>6258,
-26638=>6259,
-26561=>6260,
-26621=>6261,
-26674=>6262,
-26675=>6263,
-26720=>6264,
-26721=>6265,
-26702=>6266,
-26722=>6267,
-26692=>6268,
-26724=>6269,
-26755=>6270,
-26653=>6271,
-26709=>6272,
-26726=>6273,
-26689=>6274,
-26727=>6275,
-26688=>6276,
-26686=>6277,
-26698=>6278,
-26697=>6279,
-26665=>6280,
-26805=>6281,
-26767=>6282,
-26740=>6283,
-26743=>6284,
-26771=>6285,
-26731=>6286,
-26818=>6287,
-26990=>6288,
-26876=>6289,
-26911=>6290,
-26912=>6291,
-26873=>6292,
-26916=>6293,
-26864=>6294,
-26891=>6295,
-26881=>6296,
-26967=>6297,
-26851=>6298,
-26896=>6299,
-26993=>6300,
-26937=>6301,
-26976=>6302,
-26946=>6303,
-26973=>6304,
-27012=>6305,
-26987=>6306,
-27008=>6307,
-27032=>6308,
-27000=>6309,
-26932=>6310,
-27084=>6311,
-27015=>6312,
-27016=>6313,
-27086=>6314,
-27017=>6315,
-26982=>6316,
-26979=>6317,
-27001=>6318,
-27035=>6319,
-27047=>6320,
-27067=>6321,
-27051=>6322,
-27053=>6323,
-27092=>6324,
-27057=>6325,
-27073=>6326,
-27082=>6327,
-27103=>6328,
-27029=>6329,
-27104=>6330,
-27021=>6331,
-27135=>6332,
-27183=>6333,
-27117=>6334,
-27159=>6335,
-27160=>6336,
-27237=>6337,
-27122=>6338,
-27204=>6339,
-27198=>6340,
-27296=>6341,
-27216=>6342,
-27227=>6343,
-27189=>6344,
-27278=>6345,
-27257=>6346,
-27197=>6347,
-27176=>6348,
-27224=>6349,
-27260=>6350,
-27281=>6351,
-27280=>6352,
-27305=>6353,
-27287=>6354,
-27307=>6355,
-29495=>6356,
-29522=>6357,
-27521=>6358,
-27522=>6359,
-27527=>6360,
-27524=>6361,
-27538=>6362,
-27539=>6363,
-27533=>6364,
-27546=>6365,
-27547=>6366,
-27553=>6367,
-27562=>6368,
-36715=>6369,
-36717=>6370,
-36721=>6371,
-36722=>6372,
-36723=>6373,
-36725=>6374,
-36726=>6375,
-36728=>6376,
-36727=>6377,
-36729=>6378,
-36730=>6379,
-36732=>6380,
-36734=>6381,
-36737=>6382,
-36738=>6383,
-36740=>6384,
-36743=>6385,
-36747=>6386,
-36749=>6387,
-36750=>6388,
-36751=>6389,
-36760=>6390,
-36762=>6391,
-36558=>6392,
-25099=>6393,
-25111=>6394,
-25115=>6395,
-25119=>6396,
-25122=>6397,
-25121=>6398,
-25125=>6399,
-25124=>6400,
-25132=>6401,
-33255=>6402,
-29935=>6403,
-29940=>6404,
-29951=>6405,
-29967=>6406,
-29969=>6407,
-29971=>6408,
-12097=>6409,
-25908=>6409,
-26094=>6410,
-26095=>6411,
-26096=>6412,
-26122=>6413,
-26137=>6414,
-26482=>6415,
-26115=>6416,
-26133=>6417,
-26112=>6418,
-28805=>6419,
-26359=>6420,
-26141=>6421,
-26164=>6422,
-26161=>6423,
-26166=>6424,
-26165=>6425,
-32774=>6426,
-26207=>6427,
-26196=>6428,
-26177=>6429,
-26191=>6430,
-26198=>6431,
-26209=>6432,
-26199=>6433,
-26231=>6434,
-26244=>6435,
-26252=>6436,
-26279=>6437,
-26269=>6438,
-26302=>6439,
-26331=>6440,
-26332=>6441,
-26342=>6442,
-26345=>6443,
-36146=>6444,
-36147=>6445,
-36150=>6446,
-36155=>6447,
-36157=>6448,
-36160=>6449,
-36165=>6450,
-36166=>6451,
-36168=>6452,
-36169=>6453,
-36167=>6454,
-36173=>6455,
-36181=>6456,
-36185=>6457,
-35271=>6458,
-35274=>6459,
-35275=>6460,
-35276=>6461,
-35278=>6462,
-35279=>6463,
-35280=>6464,
-35281=>6465,
-29294=>6466,
-29343=>6467,
-29277=>6468,
-29286=>6469,
-29295=>6470,
-29310=>6471,
-29311=>6472,
-29316=>6473,
-29323=>6474,
-29325=>6475,
-29327=>6476,
-29330=>6477,
-25352=>6478,
-25394=>6479,
-25520=>6480,
-25663=>6481,
-25816=>6482,
-32772=>6483,
-27626=>6484,
-27635=>6485,
-27645=>6486,
-27637=>6487,
-27641=>6488,
-27653=>6489,
-27655=>6490,
-27654=>6491,
-27661=>6492,
-27669=>6493,
-27672=>6494,
-27673=>6495,
-27674=>6496,
-27681=>6497,
-27689=>6498,
-27684=>6499,
-27690=>6500,
-27698=>6501,
-25909=>6502,
-25941=>6503,
-25963=>6504,
-29261=>6505,
-29266=>6506,
-29270=>6507,
-29232=>6508,
-34402=>6509,
-21014=>6510,
-32927=>6511,
-32924=>6512,
-32915=>6513,
-32956=>6514,
-26378=>6515,
-32957=>6516,
-32945=>6517,
-32939=>6518,
-32941=>6519,
-32948=>6520,
-32951=>6521,
-32999=>6522,
-33000=>6523,
-33001=>6524,
-33002=>6525,
-32987=>6526,
-32962=>6527,
-32964=>6528,
-32985=>6529,
-32973=>6530,
-32983=>6531,
-26384=>6532,
-32989=>6533,
-33003=>6534,
-33009=>6535,
-33012=>6536,
-33005=>6537,
-33037=>6538,
-33038=>6539,
-33010=>6540,
-33020=>6541,
-26389=>6542,
-33042=>6543,
-35930=>6544,
-33078=>6545,
-33054=>6546,
-33068=>6547,
-33048=>6548,
-33074=>6549,
-33096=>6550,
-33100=>6551,
-33107=>6552,
-33140=>6553,
-33113=>6554,
-33114=>6555,
-33137=>6556,
-33120=>6557,
-33129=>6558,
-33148=>6559,
-33149=>6560,
-33133=>6561,
-33127=>6562,
-22605=>6563,
-23221=>6564,
-33160=>6565,
-33154=>6566,
-33169=>6567,
-28373=>6568,
-33187=>6569,
-33194=>6570,
-33228=>6571,
-26406=>6572,
-33226=>6573,
-33211=>6574,
-33217=>6575,
-33190=>6576,
-27428=>6577,
-27447=>6578,
-27449=>6579,
-27459=>6580,
-27462=>6581,
-27481=>6582,
-39121=>6583,
-39122=>6584,
-39123=>6585,
-39125=>6586,
-39129=>6587,
-39130=>6588,
-12110=>6589,
-27571=>6589,
-24384=>6590,
-27586=>6591,
-35315=>6592,
-26000=>6593,
-40785=>6594,
-26003=>6595,
-26044=>6596,
-26054=>6597,
-26052=>6598,
-26051=>6599,
-26060=>6600,
-26062=>6601,
-26066=>6602,
-26070=>6603,
-28800=>6604,
-28828=>6605,
-28822=>6606,
-28829=>6607,
-28859=>6608,
-28864=>6609,
-28855=>6610,
-28843=>6611,
-28849=>6612,
-28904=>6613,
-28874=>6614,
-28944=>6615,
-28947=>6616,
-28950=>6617,
-28975=>6618,
-28977=>6619,
-29043=>6620,
-29020=>6621,
-29032=>6622,
-28997=>6623,
-29042=>6624,
-29002=>6625,
-29048=>6626,
-29050=>6627,
-29080=>6628,
-29107=>6629,
-29109=>6630,
-29096=>6631,
-29088=>6632,
-29152=>6633,
-29140=>6634,
-29159=>6635,
-29177=>6636,
-29213=>6637,
-29224=>6638,
-28780=>6639,
-28952=>6640,
-29030=>6641,
-29113=>6642,
-25150=>6643,
-25149=>6644,
-25155=>6645,
-25160=>6646,
-25161=>6647,
-31035=>6648,
-31040=>6649,
-31046=>6650,
-31049=>6651,
-31067=>6652,
-31068=>6653,
-31059=>6654,
-31066=>6655,
-31074=>6656,
-31063=>6657,
-31072=>6658,
-31087=>6659,
-31079=>6660,
-31098=>6661,
-31109=>6662,
-31114=>6663,
-31130=>6664,
-31143=>6665,
-31155=>6666,
-24529=>6667,
-24528=>6668,
-24636=>6669,
-24669=>6670,
-24666=>6671,
-24679=>6672,
-24641=>6673,
-24665=>6674,
-24675=>6675,
-24747=>6676,
-24838=>6677,
-24845=>6678,
-24925=>6679,
-25001=>6680,
-24989=>6681,
-25035=>6682,
-25041=>6683,
-25094=>6684,
-32896=>6685,
-12160=>6686,
-32895=>6686,
-27795=>6687,
-27894=>6688,
-28156=>6689,
-30710=>6690,
-30712=>6691,
-30720=>6692,
-30729=>6693,
-30743=>6694,
-30744=>6695,
-30737=>6696,
-26027=>6697,
-30765=>6698,
-30748=>6699,
-30749=>6700,
-30777=>6701,
-30778=>6702,
-30779=>6703,
-30751=>6704,
-30780=>6705,
-30757=>6706,
-30764=>6707,
-30755=>6708,
-30761=>6709,
-30798=>6710,
-30829=>6711,
-30806=>6712,
-30807=>6713,
-30758=>6714,
-30800=>6715,
-30791=>6716,
-30796=>6717,
-30826=>6718,
-30875=>6719,
-30867=>6720,
-30874=>6721,
-30855=>6722,
-30876=>6723,
-30881=>6724,
-30883=>6725,
-30898=>6726,
-30905=>6727,
-30885=>6728,
-30932=>6729,
-30937=>6730,
-30921=>6731,
-30956=>6732,
-30962=>6733,
-30981=>6734,
-30964=>6735,
-30995=>6736,
-31012=>6737,
-31006=>6738,
-31028=>6739,
-40859=>6740,
-12235=>6741,
-40697=>6741,
-40699=>6742,
-40700=>6743,
-30449=>6744,
-30468=>6745,
-30477=>6746,
-30457=>6747,
-30471=>6748,
-30472=>6749,
-30490=>6750,
-30498=>6751,
-30489=>6752,
-30509=>6753,
-30502=>6754,
-30517=>6755,
-30520=>6756,
-30544=>6757,
-30545=>6758,
-30535=>6759,
-30531=>6760,
-30554=>6761,
-30568=>6762,
-30562=>6763,
-30565=>6764,
-30591=>6765,
-30605=>6766,
-30589=>6767,
-30592=>6768,
-30604=>6769,
-30609=>6770,
-30623=>6771,
-30624=>6772,
-30640=>6773,
-30645=>6774,
-30653=>6775,
-30010=>6776,
-30016=>6777,
-30030=>6778,
-30027=>6779,
-30024=>6780,
-30043=>6781,
-30066=>6782,
-30073=>6783,
-30083=>6784,
-32600=>6785,
-32609=>6786,
-32607=>6787,
-35400=>6788,
-32616=>6789,
-32628=>6790,
-32625=>6791,
-32633=>6792,
-32641=>6793,
-32638=>6794,
-30413=>6795,
-30437=>6796,
-34866=>6797,
-38021=>6798,
-38022=>6799,
-38023=>6800,
-38027=>6801,
-38026=>6802,
-38028=>6803,
-38029=>6804,
-38031=>6805,
-38032=>6806,
-38036=>6807,
-38039=>6808,
-38037=>6809,
-38042=>6810,
-38043=>6811,
-38044=>6812,
-38051=>6813,
-38052=>6814,
-38059=>6815,
-38058=>6816,
-38061=>6817,
-38060=>6818,
-38063=>6819,
-38064=>6820,
-38066=>6821,
-38068=>6822,
-38070=>6823,
-38071=>6824,
-38072=>6825,
-38073=>6826,
-38074=>6827,
-38076=>6828,
-38077=>6829,
-38079=>6830,
-38084=>6831,
-38088=>6832,
-38089=>6833,
-38090=>6834,
-38091=>6835,
-38092=>6836,
-38093=>6837,
-38094=>6838,
-38096=>6839,
-38097=>6840,
-38098=>6841,
-38101=>6842,
-38102=>6843,
-38103=>6844,
-38105=>6845,
-38104=>6846,
-38107=>6847,
-38110=>6848,
-38111=>6849,
-38112=>6850,
-38114=>6851,
-38116=>6852,
-38117=>6853,
-38119=>6854,
-38120=>6855,
-38122=>6856,
-38121=>6857,
-38123=>6858,
-38126=>6859,
-38127=>6860,
-38131=>6861,
-38132=>6862,
-38133=>6863,
-38135=>6864,
-38137=>6865,
-38140=>6866,
-38141=>6867,
-38143=>6868,
-38147=>6869,
-38146=>6870,
-38150=>6871,
-38151=>6872,
-38153=>6873,
-38154=>6874,
-38157=>6875,
-38158=>6876,
-38159=>6877,
-38162=>6878,
-38163=>6879,
-38164=>6880,
-38165=>6881,
-38166=>6882,
-38168=>6883,
-38171=>6884,
-38173=>6885,
-38174=>6886,
-38175=>6887,
-38178=>6888,
-38186=>6889,
-38187=>6890,
-38185=>6891,
-38188=>6892,
-38193=>6893,
-38194=>6894,
-38196=>6895,
-38198=>6896,
-38199=>6897,
-38200=>6898,
-38204=>6899,
-38206=>6900,
-38207=>6901,
-38210=>6902,
-38197=>6903,
-38212=>6904,
-38213=>6905,
-38214=>6906,
-38217=>6907,
-38220=>6908,
-38222=>6909,
-38223=>6910,
-38226=>6911,
-38227=>6912,
-38228=>6913,
-38230=>6914,
-38231=>6915,
-38232=>6916,
-38233=>6917,
-38235=>6918,
-38238=>6919,
-38239=>6920,
-38237=>6921,
-38241=>6922,
-38242=>6923,
-38244=>6924,
-38245=>6925,
-38246=>6926,
-38247=>6927,
-38248=>6928,
-38249=>6929,
-38250=>6930,
-38251=>6931,
-38252=>6932,
-38255=>6933,
-38257=>6934,
-38258=>6935,
-38259=>6936,
-38202=>6937,
-30695=>6938,
-30700=>6939,
-38601=>6940,
-31189=>6941,
-31213=>6942,
-31203=>6943,
-31211=>6944,
-31238=>6945,
-23879=>6946,
-31235=>6947,
-31234=>6948,
-31262=>6949,
-31252=>6950,
-31289=>6951,
-31287=>6952,
-31313=>6953,
-40655=>6954,
-39333=>6955,
-31344=>6956,
-30344=>6957,
-30350=>6958,
-30355=>6959,
-30361=>6960,
-30372=>6961,
-29918=>6962,
-29920=>6963,
-29996=>6964,
-40480=>6965,
-40482=>6966,
-40488=>6967,
-40489=>6968,
-40490=>6969,
-40491=>6970,
-40492=>6971,
-40498=>6972,
-40497=>6973,
-40502=>6974,
-40504=>6975,
-40503=>6976,
-40505=>6977,
-40506=>6978,
-40510=>6979,
-40513=>6980,
-40514=>6981,
-40516=>6982,
-40518=>6983,
-40519=>6984,
-40520=>6985,
-40521=>6986,
-40523=>6987,
-40524=>6988,
-40526=>6989,
-40529=>6990,
-40533=>6991,
-40535=>6992,
-40538=>6993,
-40539=>6994,
-40540=>6995,
-40542=>6996,
-40547=>6997,
-40550=>6998,
-40551=>6999,
-40552=>7000,
-40553=>7001,
-40554=>7002,
-40555=>7003,
-40556=>7004,
-40561=>7005,
-40557=>7006,
-40563=>7007,
-12135=>7008,
-30098=>7008,
-30100=>7009,
-30102=>7010,
-30112=>7011,
-30109=>7012,
-30124=>7013,
-30115=>7014,
-30131=>7015,
-30132=>7016,
-30136=>7017,
-30148=>7018,
-30129=>7019,
-30128=>7020,
-30147=>7021,
-30146=>7022,
-30166=>7023,
-30157=>7024,
-30179=>7025,
-30184=>7026,
-30182=>7027,
-30180=>7028,
-30187=>7029,
-30183=>7030,
-30211=>7031,
-30193=>7032,
-30204=>7033,
-30207=>7034,
-30224=>7035,
-30208=>7036,
-30213=>7037,
-30220=>7038,
-30231=>7039,
-30218=>7040,
-30245=>7041,
-30232=>7042,
-30229=>7043,
-30233=>7044,
-30235=>7045,
-30268=>7046,
-30242=>7047,
-30240=>7048,
-30272=>7049,
-30253=>7050,
-30256=>7051,
-30271=>7052,
-30261=>7053,
-30275=>7054,
-30270=>7055,
-30259=>7056,
-30285=>7057,
-30302=>7058,
-30292=>7059,
-30300=>7060,
-30294=>7061,
-30315=>7062,
-30319=>7063,
-32714=>7064,
-31462=>7065,
-31352=>7066,
-31353=>7067,
-31360=>7068,
-31366=>7069,
-31368=>7070,
-31381=>7071,
-31398=>7072,
-31392=>7073,
-31404=>7074,
-31400=>7075,
-31405=>7076,
-31411=>7077,
-34916=>7078,
-34921=>7079,
-34930=>7080,
-34941=>7081,
-34943=>7082,
-34946=>7083,
-34978=>7084,
-35014=>7085,
-34999=>7086,
-35004=>7087,
-35017=>7088,
-35042=>7089,
-35022=>7090,
-35043=>7091,
-35045=>7092,
-35057=>7093,
-35098=>7094,
-35068=>7095,
-35048=>7096,
-35070=>7097,
-35056=>7098,
-35105=>7099,
-35097=>7100,
-35091=>7101,
-35099=>7102,
-35082=>7103,
-35124=>7104,
-35115=>7105,
-35126=>7106,
-35137=>7107,
-35174=>7108,
-35195=>7109,
-12134=>7110,
-30091=>7110,
-32997=>7111,
-30386=>7112,
-30388=>7113,
-30684=>7114,
-12158=>7115,
-32786=>7115,
-32788=>7116,
-32790=>7117,
-32796=>7118,
-32800=>7119,
-32802=>7120,
-32805=>7121,
-32806=>7122,
-32807=>7123,
-32809=>7124,
-32808=>7125,
-32817=>7126,
-32779=>7127,
-32821=>7128,
-32835=>7129,
-32838=>7130,
-32845=>7131,
-32850=>7132,
-32873=>7133,
-32881=>7134,
-35203=>7135,
-39032=>7136,
-39040=>7137,
-39043=>7138,
-39049=>7139,
-39052=>7140,
-39053=>7141,
-39055=>7142,
-39060=>7143,
-39066=>7144,
-39067=>7145,
-39070=>7146,
-39071=>7147,
-39073=>7148,
-39074=>7149,
-39077=>7150,
-39078=>7151,
-12172=>7152,
-34381=>7152,
-34388=>7153,
-34412=>7154,
-34414=>7155,
-34431=>7156,
-34426=>7157,
-34428=>7158,
-34427=>7159,
-34472=>7160,
-34445=>7161,
-34443=>7162,
-34476=>7163,
-34461=>7164,
-34471=>7165,
-34467=>7166,
-34474=>7167,
-34451=>7168,
-34473=>7169,
-34486=>7170,
-34500=>7171,
-34485=>7172,
-34510=>7173,
-34480=>7174,
-34490=>7175,
-34481=>7176,
-34479=>7177,
-34505=>7178,
-34511=>7179,
-34484=>7180,
-34537=>7181,
-34545=>7182,
-34546=>7183,
-34541=>7184,
-34547=>7185,
-34512=>7186,
-34579=>7187,
-34526=>7188,
-34548=>7189,
-34527=>7190,
-34520=>7191,
-34513=>7192,
-34563=>7193,
-34567=>7194,
-34552=>7195,
-34568=>7196,
-34570=>7197,
-34573=>7198,
-34569=>7199,
-34595=>7200,
-34619=>7201,
-34590=>7202,
-34597=>7203,
-34606=>7204,
-34586=>7205,
-34622=>7206,
-34632=>7207,
-34612=>7208,
-34609=>7209,
-34601=>7210,
-34615=>7211,
-34623=>7212,
-34690=>7213,
-34594=>7214,
-34685=>7215,
-34686=>7216,
-34683=>7217,
-34656=>7218,
-34672=>7219,
-34636=>7220,
-34670=>7221,
-34699=>7222,
-34643=>7223,
-34659=>7224,
-34684=>7225,
-34660=>7226,
-34649=>7227,
-34661=>7228,
-34707=>7229,
-34735=>7230,
-34728=>7231,
-34770=>7232,
-34758=>7233,
-34696=>7234,
-34693=>7235,
-34733=>7236,
-34711=>7237,
-34691=>7238,
-34731=>7239,
-34789=>7240,
-34732=>7241,
-34741=>7242,
-34739=>7243,
-34763=>7244,
-34771=>7245,
-34749=>7246,
-34769=>7247,
-34752=>7248,
-34762=>7249,
-34779=>7250,
-34794=>7251,
-34784=>7252,
-34798=>7253,
-34838=>7254,
-34835=>7255,
-34814=>7256,
-34826=>7257,
-34843=>7258,
-34849=>7259,
-34873=>7260,
-34876=>7261,
-12152=>7262,
-32566=>7262,
-32578=>7263,
-32580=>7264,
-32581=>7265,
-33296=>7266,
-31482=>7267,
-31485=>7268,
-31496=>7269,
-31491=>7270,
-31492=>7271,
-31509=>7272,
-31498=>7273,
-31531=>7274,
-31503=>7275,
-31559=>7276,
-31544=>7277,
-31530=>7278,
-31513=>7279,
-31534=>7280,
-31537=>7281,
-31520=>7282,
-31525=>7283,
-31524=>7284,
-31539=>7285,
-31550=>7286,
-31518=>7287,
-31576=>7288,
-31578=>7289,
-31557=>7290,
-31605=>7291,
-31564=>7292,
-31581=>7293,
-31584=>7294,
-31598=>7295,
-31611=>7296,
-31586=>7297,
-31602=>7298,
-31601=>7299,
-31632=>7300,
-31654=>7301,
-31655=>7302,
-31672=>7303,
-31660=>7304,
-31645=>7305,
-31656=>7306,
-31621=>7307,
-31658=>7308,
-31644=>7309,
-31650=>7310,
-31659=>7311,
-31668=>7312,
-31697=>7313,
-31681=>7314,
-31692=>7315,
-31709=>7316,
-31706=>7317,
-31717=>7318,
-31718=>7319,
-31722=>7320,
-31756=>7321,
-31742=>7322,
-31740=>7323,
-31759=>7324,
-31766=>7325,
-31755=>7326,
-31775=>7327,
-31786=>7328,
-31782=>7329,
-31800=>7330,
-31809=>7331,
-31808=>7332,
-33278=>7333,
-33281=>7334,
-33282=>7335,
-33284=>7336,
-33260=>7337,
-34884=>7338,
-33313=>7339,
-33314=>7340,
-33315=>7341,
-33325=>7342,
-33327=>7343,
-33320=>7344,
-33323=>7345,
-33336=>7346,
-33339=>7347,
-33331=>7348,
-33332=>7349,
-33342=>7350,
-33348=>7351,
-33353=>7352,
-33355=>7353,
-33359=>7354,
-33370=>7355,
-33375=>7356,
-33384=>7357,
-34942=>7358,
-34949=>7359,
-34952=>7360,
-35032=>7361,
-35039=>7362,
-35166=>7363,
-32669=>7364,
-32671=>7365,
-32679=>7366,
-32687=>7367,
-32688=>7368,
-32690=>7369,
-31868=>7370,
-25929=>7371,
-31889=>7372,
-31901=>7373,
-31900=>7374,
-31902=>7375,
-31906=>7376,
-31922=>7377,
-31932=>7378,
-31933=>7379,
-31937=>7380,
-31943=>7381,
-31948=>7382,
-31949=>7383,
-31944=>7384,
-31941=>7385,
-31959=>7386,
-31976=>7387,
-12169=>7388,
-33390=>7388,
-26280=>7389,
-32703=>7390,
-32718=>7391,
-32725=>7392,
-32741=>7393,
-32737=>7394,
-32742=>7395,
-32745=>7396,
-32750=>7397,
-32755=>7398,
-12151=>7399,
-31992=>7399,
-32119=>7400,
-32166=>7401,
-32174=>7402,
-32327=>7403,
-32411=>7404,
-40632=>7405,
-40628=>7406,
-36211=>7407,
-36228=>7408,
-36244=>7409,
-36241=>7410,
-36273=>7411,
-36199=>7412,
-36205=>7413,
-35911=>7414,
-35913=>7415,
-37194=>7416,
-37200=>7417,
-37198=>7418,
-37199=>7419,
-37220=>7420,
-37218=>7421,
-37217=>7422,
-37232=>7423,
-37225=>7424,
-37231=>7425,
-37245=>7426,
-37246=>7427,
-37234=>7428,
-37236=>7429,
-37241=>7430,
-37260=>7431,
-37253=>7432,
-37264=>7433,
-37261=>7434,
-37265=>7435,
-37282=>7436,
-37283=>7437,
-37290=>7438,
-37293=>7439,
-37294=>7440,
-37295=>7441,
-37301=>7442,
-37300=>7443,
-37306=>7444,
-12183=>7445,
-35925=>7445,
-40574=>7446,
-36280=>7447,
-36331=>7448,
-36357=>7449,
-36441=>7450,
-36457=>7451,
-36277=>7452,
-36287=>7453,
-36284=>7454,
-36282=>7455,
-36292=>7456,
-36310=>7457,
-36311=>7458,
-36314=>7459,
-36318=>7460,
-36302=>7461,
-36303=>7462,
-36315=>7463,
-36294=>7464,
-36332=>7465,
-36343=>7466,
-36344=>7467,
-36323=>7468,
-36345=>7469,
-36347=>7470,
-36324=>7471,
-36361=>7472,
-36349=>7473,
-36372=>7474,
-36381=>7475,
-36383=>7476,
-36396=>7477,
-36398=>7478,
-36387=>7479,
-36399=>7480,
-36410=>7481,
-36416=>7482,
-36409=>7483,
-36405=>7484,
-36413=>7485,
-36401=>7486,
-36425=>7487,
-36417=>7488,
-36418=>7489,
-36433=>7490,
-36434=>7491,
-36426=>7492,
-36464=>7493,
-36470=>7494,
-36476=>7495,
-36463=>7496,
-36468=>7497,
-36485=>7498,
-36495=>7499,
-36500=>7500,
-36496=>7501,
-36508=>7502,
-36510=>7503,
-12184=>7504,
-35960=>7504,
-35970=>7505,
-35978=>7506,
-35973=>7507,
-35992=>7508,
-35988=>7509,
-26011=>7510,
-35286=>7511,
-35294=>7512,
-35290=>7513,
-35292=>7514,
-35301=>7515,
-35307=>7516,
-35311=>7517,
-35390=>7518,
-35622=>7519,
-38739=>7520,
-38633=>7521,
-38643=>7522,
-38639=>7523,
-38662=>7524,
-38657=>7525,
-38664=>7526,
-38671=>7527,
-38670=>7528,
-38698=>7529,
-38701=>7530,
-38704=>7531,
-38718=>7532,
-40832=>7533,
-40835=>7534,
-40837=>7535,
-40838=>7536,
-40839=>7537,
-40840=>7538,
-40841=>7539,
-40842=>7540,
-40844=>7541,
-40702=>7542,
-40715=>7543,
-40717=>7544,
-12203=>7545,
-38585=>7545,
-38588=>7546,
-38589=>7547,
-38606=>7548,
-38610=>7549,
-30655=>7550,
-38624=>7551,
-37518=>7552,
-37550=>7553,
-37576=>7554,
-37694=>7555,
-37738=>7556,
-37834=>7557,
-37775=>7558,
-37950=>7559,
-37995=>7560,
-40063=>7561,
-40066=>7562,
-40069=>7563,
-40070=>7564,
-40071=>7565,
-40072=>7566,
-31267=>7567,
-40075=>7568,
-40078=>7569,
-40080=>7570,
-40081=>7571,
-40082=>7572,
-40084=>7573,
-40085=>7574,
-40090=>7575,
-40091=>7576,
-40094=>7577,
-40095=>7578,
-40096=>7579,
-40097=>7580,
-40098=>7581,
-40099=>7582,
-40101=>7583,
-40102=>7584,
-40103=>7585,
-40104=>7586,
-40105=>7587,
-40107=>7588,
-40109=>7589,
-40110=>7590,
-40112=>7591,
-40113=>7592,
-40114=>7593,
-40115=>7594,
-40116=>7595,
-40117=>7596,
-40118=>7597,
-40119=>7598,
-40122=>7599,
-40123=>7600,
-40124=>7601,
-40125=>7602,
-40132=>7603,
-40133=>7604,
-40134=>7605,
-40135=>7606,
-40138=>7607,
-40139=>7608,
-40140=>7609,
-40141=>7610,
-40142=>7611,
-40143=>7612,
-40144=>7613,
-40147=>7614,
-40148=>7615,
-40149=>7616,
-40151=>7617,
-40152=>7618,
-40153=>7619,
-40156=>7620,
-40157=>7621,
-40159=>7622,
-40162=>7623,
-38780=>7624,
-38789=>7625,
-38801=>7626,
-38802=>7627,
-38804=>7628,
-38831=>7629,
-38827=>7630,
-38819=>7631,
-38834=>7632,
-38836=>7633,
-39601=>7634,
-39600=>7635,
-39607=>7636,
-40536=>7637,
-39606=>7638,
-39610=>7639,
-39612=>7640,
-39617=>7641,
-39616=>7642,
-39621=>7643,
-39618=>7644,
-39627=>7645,
-39628=>7646,
-39633=>7647,
-39749=>7648,
-39747=>7649,
-39751=>7650,
-39753=>7651,
-39752=>7652,
-39757=>7653,
-39761=>7654,
-39144=>7655,
-39181=>7656,
-39214=>7657,
-39253=>7658,
-39252=>7659,
-12221=>7660,
-39647=>7660,
-39649=>7661,
-39654=>7662,
-39663=>7663,
-39659=>7664,
-39675=>7665,
-39661=>7666,
-39673=>7667,
-39688=>7668,
-39695=>7669,
-39699=>7670,
-39711=>7671,
-39715=>7672,
-40637=>7673,
-40638=>7674,
-32315=>7675,
-40578=>7676,
-40583=>7677,
-40584=>7678,
-40587=>7679,
-40594=>7680,
-37846=>7681,
-40605=>7682,
-40607=>7683,
-40667=>7684,
-40668=>7685,
-40669=>7686,
-40672=>7687,
-40671=>7688,
-40674=>7689,
-40681=>7690,
-40679=>7691,
-40677=>7692,
-40682=>7693,
-40687=>7694,
-40738=>7695,
-40748=>7696,
-40751=>7697,
-40761=>7698,
-40759=>7699,
-40765=>7700,
-40766=>7701,
-40772=>7702,
-12295=>7703,
-
-
-
-
-
-
-
-30362=>7717,
-34297=>7718,
-31001=>7719,
-24859=>7720,
-39599=>7721,
-35158=>7722,
-22761=>7723,
-32631=>7724,
-25850=>7725,
-25943=>7726,
-38930=>7727,
-36774=>7728,
-32070=>7729,
-24171=>7730,
-32129=>7731,
-37770=>7732,
-35607=>7733,
-39165=>7734,
-23542=>7735,
-22577=>7736,
-39825=>7737,
-36649=>7738,
-12185=>7739,
-35997=>7739,
-37575=>7740,
-29437=>7741,
-20633=>7742,
-24970=>7743,
-32179=>7744,
-31558=>7745,
-30050=>7746,
-25987=>7747,
-24163=>7748,
-38281=>7749,
-37002=>7750,
-32232=>7751,
-36022=>7752,
-35722=>7753,
-36783=>7754,
-36782=>7755,
-27161=>7756,
-40009=>7757,
-30303=>7758,
-28693=>7759,
-28657=>7760,
-36051=>7761,
-25839=>7762,
-39173=>7763,
-25765=>7764,
-37474=>7765,
-37457=>7766,
-39361=>7767,
-35036=>7768,
-36001=>7769,
-21443=>7770,
-34870=>7771,
-27544=>7772,
-24922=>7773,
-24920=>7774,
-29158=>7775,
-33980=>7776,
-33369=>7777,
-20489=>7778,
-28356=>7779,
-21408=>7780,
-20596=>7781,
-28204=>7782,
-23652=>7783,
-35435=>7784,
-25881=>7785,
-25723=>7786,
-34796=>7787,
-39262=>7788,
-35730=>7789,
-32399=>7790,
-37855=>7791,
-29987=>7792,
-38369=>7793,
-39019=>7794,
-22580=>7795,
-22039=>7796,
-12199=>7797,
-38263=>7797,
-20767=>7798,
-33144=>7799,
-24288=>7800,
-26274=>7801,
-37396=>7802,
-12190=>7803,
-36554=>7803,
-24505=>7804,
-22645=>7805,
-38515=>7806,
-35183=>7807,
-31281=>7808,
-25074=>7809,
-35488=>7810,
-39425=>7811,
-36978=>7812,
-39347=>7813,
-12242=>7814,
-40786=>7814,
-29118=>7815,
-34909=>7816,
-34802=>7817,
-23541=>7818,
-30087=>7819,
-36490=>7820,
-31820=>7821,
-32162=>7822,
-37276=>7823,
-37604=>7824,
-38619=>7825,
-30990=>7826,
-20786=>7827,
-35320=>7828,
-34389=>7829,
-20659=>7830,
-30241=>7831,
-38358=>7832,
-21109=>7833,
-37656=>7834,
-32020=>7835,
-32189=>7836,
-36781=>7837,
-35422=>7838,
-36060=>7839,
-32880=>7840,
-24478=>7841,
-21474=>7842,
-36517=>7843,
-31428=>7844,
-37679=>7845,
-36948=>7846,
-24118=>7847,
-36024=>7848,
-25812=>7849,
-21934=>7850,
-37170=>7851,
-25763=>7852,
-33213=>7853,
-24986=>7854,
-35477=>7855,
-24392=>7856,
-30070=>7857,
-25803=>7858,
-40680=>7859,
-34153=>7860,
-27284=>7861,
-25623=>7862,
-23798=>7863,
-31153=>7864,
-23566=>7865,
-29128=>7866,
-37159=>7867,
-25973=>7868,
-28364=>7869,
-36958=>7870,
-32224=>7871,
-39003=>7872,
-40670=>7873,
-22666=>7874,
-38651=>7875,
-28593=>7876,
-37347=>7877,
-35519=>7878,
-35548=>7879,
-37336=>7880,
-38914=>7881,
-37664=>7882,
-35330=>7883,
-26481=>7884,
-21205=>7885,
-26847=>7886,
-20941=>7887,
-12222=>7888,
-39717=>7888,
-29346=>7889,
-29544=>7890,
-35712=>7891,
-36077=>7892,
-37709=>7893,
-37723=>7894,
-26039=>7895,
-32222=>7896,
-38538=>7897,
-23565=>7898,
-22136=>7899,
-38931=>7900,
-37389=>7901,
-22890=>7902,
-22702=>7903,
-40285=>7904,
-38989=>7905,
-35355=>7906,
-24801=>7907,
-39187=>7908,
-20818=>7909,
-29246=>7910,
-39180=>7911,
-36019=>7912,
-30332=>7913,
-32624=>7914,
-38309=>7915,
-31020=>7916,
-37353=>7917,
-29033=>7918,
-31684=>7919,
-36009=>7920,
-39151=>7921,
-35370=>7922,
-32033=>7923,
-12214=>7924,
-39131=>7924,
-35513=>7925,
-24290=>7926,
-36027=>7927,
-32027=>7928,
-22707=>7929,
-22894=>7930,
-24996=>7931,
-31966=>7932,
-35920=>7933,
-26963=>7934,
-37586=>7935,
-12213=>7936,
-39080=>7936,
-30219=>7937,
-39342=>7938,
-32299=>7939,
-35575=>7940,
-40179=>7941,
-33178=>7942,
-36667=>7943,
-25771=>7944,
-36628=>7945,
-36070=>7946,
-24489=>7947,
-36000=>7948,
-35331=>7949,
-23142=>7950,
-32283=>7951,
-35442=>7952,
-37411=>7953,
-33995=>7954,
-24185=>7955,
-36245=>7956,
-36123=>7957,
-23713=>7958,
-21083=>7959,
-37628=>7960,
-32177=>7961,
-23831=>7962,
-37804=>7963,
-25841=>7964,
-40255=>7965,
-38307=>7966,
-37499=>7967,
-20491=>7968,
-32102=>7969,
-40852=>7970,
-38799=>7971,
-36002=>7972,
-37390=>7973,
-28317=>7974,
-27083=>7975,
-36092=>7976,
-34865=>7977,
-39015=>7978,
-21102=>7979,
-38364=>7980,
-35264=>7981,
-39208=>7982,
-24931=>7983,
-36011=>7984,
-24291=>7985,
-35215=>7986,
-27512=>7987,
-12244=>7988,
-40860=>7988,
-38312=>7989,
-36556=>7990,
-35437=>7991,
-27331=>7992,
-36020=>7993,
-21130=>7994,
-36645=>7995,
-37707=>7996,
-22283=>7997,
-36942=>7998,
-39405=>7999,
-38867=>8000,
-28450=>8001,
-34399=>8002,
-38305=>8003,
-40372=>8004,
-36032=>8005,
-36703=>8006,
-40251=>8007,
-32005=>8008,
-22778=>8009,
-35703=>8010,
-28396=>8011,
-22057=>8012,
-33775=>8013,
-30059=>8014,
-21123=>8015,
-35441=>8016,
-25079=>8017,
-22750=>8018,
-27489=>8019,
-29872=>8020,
-36996=>8021,
-32233=>8022,
-35594=>8023,
-25582=>8024,
-36637=>8025,
-36036=>8026,
-31330=>8027,
-26371=>8028,
-29172=>8029,
-21295=>8030,
-35569=>8031,
-35496=>8032,
-32362=>8033,
-33911=>8034,
-28222=>8035,
-29554=>8036,
-36008=>8037,
-31117=>8038,
-25802=>8039,
-27231=>8040,
-31309=>8041,
-39249=>8042,
-35663=>8043,
-40388=>8044,
-32318=>8045,
-32221=>8046,
-26997=>8047,
-36655=>8048,
-32026=>8049,
-25824=>8050,
-24190=>8051,
-34186=>8052,
-21137=>8053,
-28639=>8054,
-35336=>8055,
-35352=>8056,
-38555=>8057,
-32380=>8058,
-32000=>8059,
-22846=>8060,
-33698=>8061,
-38960=>8062,
-36040=>8063,
-37440=>8064,
-20729=>8065,
-39381=>8066,
-27570=>8067,
-30435=>8068,
-22533=>8069,
-31627=>8070,
-38291=>8071,
-33393=>8072,
-32216=>8073,
-32365=>8074,
-27298=>8075,
-40572=>8076,
-25536=>8077,
-25791=>8078,
-31777=>8079,
-20745=>8080,
-34214=>8081,
-27323=>8082,
-37970=>8083,
-36368=>8084,
-36068=>8085,
-12178=>8086,
-35211=>8086,
-37749=>8087,
-33382=>8088,
-21133=>8089,
-39198=>8090,
-28472=>8091,
-28666=>8092,
-28567=>8093,
-23559=>8094,
-28479=>8095,
-34083=>8096,
-27123=>8097,
-22892=>8098,
-35611=>8099,
-37292=>8100,
-33184=>8101,
-28550=>8102,
-39509=>8103,
-23308=>8104,
-25898=>8105,
-37496=>8106,
-30703=>8107,
-20709=>8108,
-39171=>8109,
-32371=>8110,
-32094=>8111,
-36686=>8112,
-36611=>8113,
-38542=>8114,
-31680=>8115,
-28500=>8116,
-32080=>8117,
-35489=>8118,
-32202=>8119,
-37670=>8120,
-20677=>8121,
-35641=>8122,
-36914=>8123,
-29180=>8124,
-30433=>8125,
-21185=>8126,
-33686=>8127,
-39912=>8128,
-39514=>8129,
-32147=>8130,
-38968=>8131,
-37857=>8132,
-24465=>8133,
-30169=>8134,
-31478=>8135,
-31998=>8136,
-33290=>8137,
-39378=>8138,
-33289=>8139,
-25818=>8140,
-37624=>8141,
-25084=>8142,
-21127=>8143,
-40273=>8144,
-32121=>8145,
-35258=>8146,
-35363=>8147,
-32118=>8148,
-37406=>8149,
-36557=>8150,
-39423=>8151,
-38283=>8152,
-20977=>8153,
-38982=>8154,
-27579=>8155,
-35506=>8156,
-22718=>8157,
-25031=>8158,
-25715=>8159,
-24235=>8160,
-35122=>8161,
-35463=>8162,
-22602=>8163,
-20744=>8164,
-23532=>8165,
-31014=>8166,
-26336=>8167,
-34407=>8168,
-24011=>8169,
-31418=>8170,
-39243=>8171,
-28528=>8172,
-25844=>8173,
-38346=>8174,
-34847=>8175,
-33240=>8176,
-33802=>8177,
-20358=>8178,
-36084=>8179,
-34253=>8180,
-27396=>8181,
-25876=>8182,
-31811=>8183,
-38348=>8184,
-34349=>8185,
-28734=>8186,
-35733=>8187,
-25900=>8188,
-35261=>8189,
-25078=>8190,
-32412=>8191,
-29211=>8192,
-28651=>8193,
-25736=>8194,
-21214=>8195,
-28551=>8196,
-27138=>8197,
-37939=>8198,
-22744=>8199,
-39006=>8200,
-31852=>8201,
-38626=>8202,
-28757=>8203,
-35023=>8204,
-63975=>8204,
-39881=>8205,
-31150=>8206,
-40599=>8207,
-21426=>8208,
-21237=>8209,
-31019=>8210,
-27511=>8211,
-28701=>8212,
-38584=>8213,
-20486=>8214,
-32879=>8215,
-34030=>8216,
-36899=>8217,
-37934=>8218,
-24976=>8219,
-28451=>8220,
-31806=>8221,
-25986=>8222,
-33225=>8223,
-37832=>8224,
-25088=>8225,
-29001=>8226,
-32244=>8227,
-31975=>8228,
-20841=>8229,
-36635=>8230,
-35538=>8231,
-30274=>8232,
-36988=>8233,
-37904=>8234,
-29557=>8235,
-33256=>8236,
-37168=>8237,
-40023=>8238,
-36035=>8239,
-40801=>8240,
-37428=>8241,
-38728=>8242,
-23994=>8243,
-38936=>8244,
-39230=>8245,
-21129=>8246,
-12243=>8247,
-40845=>8247,
-32894=>8248,
-22184=>8249,
-31840=>8250,
-22751=>8251,
-25871=>8252,
-38580=>8253,
-27155=>8254,
-23105=>8255,
-25695=>8256,
-31757=>8257,
-34310=>8258,
-30439=>8259,
-39025=>8260,
-24300=>8261,
-29200=>8262,
-25796=>8263,
-28407=>8264,
-34396=>8265,
-39791=>8266,
-36034=>8267,
-37682=>8268,
-38520=>8269,
-39522=>8270,
-37569=>8271,
-23650=>8272,
-32311=>8273,
-24942=>8274,
-28670=>8275,
-32209=>8276,
-24018=>8277,
-25891=>8278,
-23423=>8279,
-28772=>8280,
-20098=>8281,
-25476=>8282,
-36650=>8283,
-20523=>8284,
-20374=>8285,
-28138=>8286,
-32184=>8287,
-35542=>8288,
-34367=>8289,
-32645=>8290,
-37007=>8291,
-38012=>8292,
-31854=>8293,
-39486=>8294,
-39409=>8295,
-32097=>8296,
-23229=>8297,
-29802=>8298,
-30908=>8299,
-34718=>8300,
-12218=>8301,
-39340=>8301,
-39393=>8302,
-21966=>8303,
-36023=>8304,
-12230=>8305,
-40613=>8305,
-36067=>8306,
-36993=>8307,
-30622=>8308,
-39237=>8309,
-34875=>8310,
-28415=>8311,
-35646=>8312,
-37672=>8313,
-37466=>8314,
-36031=>8315,
-37762=>8316,
-12200=>8317,
-38272=>8317,
-24758=>8318,
-20497=>8319,
-37683=>8320,
-22818=>8321,
-35598=>8322,
-24396=>8323,
-35219=>8324,
-32191=>8325,
-32236=>8326,
-24287=>8327,
-28357=>8328,
-25003=>8329,
-38313=>8330,
-40180=>8331,
-37528=>8332,
-35628=>8333,
-35584=>8334,
-30045=>8335,
-37385=>8336,
-32013=>8337,
-38627=>8338,
-25747=>8339,
-33126=>8340,
-24817=>8341,
-39719=>8342,
-39186=>8343,
-25836=>8344,
-33193=>8345,
-25862=>8346,
-37312=>8347,
-12227=>8348,
-40165=>8348,
-32886=>8349,
-22169=>8350,
-38007=>8351,
-37811=>8352,
-27320=>8353,
-29552=>8354,
-23527=>8355,
-25840=>8356,
-28632=>8357,
-37397=>8358,
-32016=>8359,
-33215=>8360,
-28611=>8361,
-36786=>8362,
-30247=>8363,
-35582=>8364,
-27472=>8365,
-40407=>8366,
-27590=>8367,
-22036=>8368,
-28442=>8369,
-30436=>8370,
-40848=>8371,
-36064=>8372,
-22132=>8373,
-40300=>8374,
-39449=>8375,
-39108=>8376,
-38971=>8377,
-36007=>8378,
-34315=>8379,
-24977=>8380,
-35413=>8381,
-28497=>8382,
-38935=>8383,
-25778=>8384,
-37610=>8385,
-20693=>8386,
-27192=>8387,
-35676=>8388,
-33229=>8389,
-12241=>8390,
-40778=>8390,
-39438=>8391,
-35912=>8392,
-21843=>8393,
-27683=>8394,
-35350=>8395,
-29309=>8396,
-37370=>8397,
-37467=>8398,
-36983=>8399,
-31805=>8400,
-35609=>8401,
-37666=>8402,
-37463=>8403,
-28154=>8404,
-35700=>8405,
-22649=>8406,
-27085=>8407,
-21958=>8408,
-22715=>8409,
-34196=>8410,
-25654=>8411,
-37740=>8412,
-27211=>8413,
-21932=>8414,
-20689=>8415,
-32761=>8416,
-31429=>8417,
-31434=>8418,
-27453=>8419,
-35242=>8420,
-23522=>8421,
-36629=>8422,
-27691=>8423,
-20670=>8424,
-38915=>8425,
-35531=>8426,
-24950=>8427,
-29898=>8428,
-31406=>8429,
-36264=>8430,
-21312=>8431,
-36544=>8432,
-39493=>8433,
-40818=>8434,
-39028=>8435,
-27402=>8436,
-21240=>8437,
-40306=>8438,
-30906=>8439,
-35731=>8440,
-39250=>8441,
-25854=>8442,
-32350=>8443,
-29105=>8444,
-38860=>8445,
-35469=>8446,
-32009=>8447,
-27054=>8448,
-32104=>8449,
-36575=>8450,
-37613=>8451,
-38287=>8452,
-28516=>8453,
-28753=>8454,
-34217=>8455,
-39955=>8456,
-36093=>8457,
-20632=>8458,
-21930=>8459,
-39479=>8460,
-25475=>8461,
-28544=>8462,
-27578=>8463,
-32023=>8464,
-31721=>8465,
-26348=>8466,
-38275=>8467,
-38493=>8468,
-36109=>8469,
-32341=>8470,
-20663=>8471,
-36062=>8472,
-29138=>8473,
-32057=>8474,
-36050=>8475,
-25448=>8476,
-25885=>8477,
-25086=>8478,
-35373=>8479,
-32051=>8480,
-23529=>8481,
-23352=>8482,
-33102=>8483,
-28402=>8484,
-32882=>8485,
-32361=>8486,
-21213=>8487,
-32854=>8488,
-24107=>8489,
-29509=>8490,
-28629=>8491,
-35433=>8492,
-26178=>8493,
-34645=>8494,
-23526=>8495,
-35672=>8496,
-39387=>8497,
-21218=>8498,
-36969=>8499,
-37323=>8500,
-39166=>8501,
-35222=>8502,
-35430=>8503,
-22781=>8504,
-29560=>8505,
-27166=>8506,
-36664=>8507,
-26360=>8508,
-36118=>8509,
-23660=>8510,
-34899=>8511,
-27193=>8512,
-31466=>8513,
-25976=>8514,
-24101=>8515,
-38617=>8516,
-35504=>8517,
-38918=>8518,
-35500=>8519,
-30889=>8520,
-29197=>8521,
-32114=>8522,
-39164=>8523,
-39686=>8524,
-32883=>8525,
-24939=>8526,
-38924=>8527,
-35359=>8528,
-35494=>8529,
-25851=>8530,
-34311=>8531,
-35380=>8532,
-32901=>8533,
-38614=>8534,
-38568=>8535,
-32143=>8536,
-27506=>8537,
-23403=>8538,
-25613=>8539,
-32302=>8540,
-29795=>8541,
-37782=>8542,
-29562=>8543,
-25787=>8544,
-33274=>8545,
-24907=>8546,
-25892=>8547,
-36010=>8548,
-30321=>8549,
-28760=>8550,
-22727=>8551,
-35674=>8552,
-35527=>8553,
-22022=>8554,
-28271=>8555,
-29145=>8556,
-28644=>8557,
-32295=>8558,
-35342=>8559,
-39472=>8560,
-35588=>8561,
-37563=>8562,
-38988=>8563,
-39636=>8564,
-26781=>8565,
-36028=>8566,
-37941=>8567,
-24307=>8568,
-32893=>8569,
-28916=>8570,
-37509=>8571,
-32113=>8572,
-38957=>8573,
-22294=>8574,
-22615=>8575,
-22296=>8576,
-38973=>8577,
-40213=>8578,
-39345=>8579,
-39389=>8580,
-27234=>8581,
-31402=>8582,
-35178=>8583,
-24398=>8584,
-28771=>8585,
-38929=>8586,
-33836=>8587,
-32178=>8588,
-12209=>8589,
-38859=>8589,
-36949=>8590,
-22285=>8591,
-29234=>8592,
-28656=>8593,
-32173=>8594,
-33894=>8595,
-20553=>8596,
-20702=>8597,
-32239=>8598,
-35586=>8599,
-34907=>8600,
-32862=>8601,
-32011=>8602,
-31337=>8603,
-21839=>8604,
-25790=>8605,
-34680=>8606,
-28198=>8607,
-31401=>8608,
-21978=>8609,
-37794=>8610,
-28879=>8611,
-35491=>8612,
-28961=>8613,
-34154=>8614,
-22626=>8615,
-38695=>8616,
-21209=>8617,
-35492=>8618,
-37675=>8619,
-29351=>8620,
-35186=>8621,
-32722=>8622,
-37521=>8623,
-25138=>8624,
-32048=>8625,
-34662=>8626,
-36676=>8627,
-23805=>8628,
-20448=>8629,
-29433=>8630,
-22151=>8631,
-37697=>8632,
-39854=>8633,
-32406=>8634,
-36066=>8635,
-37532=>8636,
-38289=>8637,
-39023=>8638,
-38570=>8639,
-29694=>8640,
-29563=>8641,
-32291=>8642,
-39201=>8643,
-25010=>8644,
-32171=>8645,
-38002=>8646,
-37129=>8647,
-35443=>8648,
-38911=>8649,
-38917=>8650,
-34157=>8651,
-22210=>8652,
-37559=>8653,
-26313=>8654,
-22063=>8655,
-21332=>8656,
-25406=>8657,
-33029=>8658,
-35559=>8659,
-23531=>8660,
-28681=>8661,
-35613=>8662,
-37573=>8663,
-37313=>8664,
-33288=>8665,
-37561=>8666,
-32137=>8667,
-38920=>8668,
-35377=>8669,
-32210=>8670,
-32396=>8671,
-36562=>8672,
-25080=>8673,
-36984=>8674,
-30316=>8675,
-32098=>8676,
-23416=>8677,
-21211=>8678,
-35426=>8679,
-23563=>8680,
-39348=>8681,
-35347=>8682,
-35338=>8683,
-36956=>8684,
-22739=>8685,
-40201=>8686,
-40232=>8687,
-21854=>8688,
-20126=>8689,
-35357=>8690,
-38329=>8691,
-40573=>8692,
-22196=>8693,
-38996=>8694,
-38331=>8695,
-33399=>8696,
-21421=>8697,
-30831=>8698,
-35578=>8699,
-39511=>8700,
-40230=>8701,
-26954=>8702,
-25562=>8703,
-30221=>8704,
-38525=>8705,
-30306=>8706,
-39178=>8707,
-27171=>8708,
-22575=>8709,
-35617=>8710,
-34277=>8711,
-29242=>8712,
-12212=>8713,
-38913=>8713,
-26989=>8714,
-33865=>8715,
-37291=>8716,
-37541=>8717,
-38948=>8718,
-36986=>8719,
-20736=>8720,
-34811=>8721,
-34269=>8722,
-20740=>8723,
-25014=>8724,
-32681=>8725,
-35427=>8726,
-35696=>8727,
-35516=>8728,
-35695=>8729,
-32377=>8730,
-34093=>8731,
-38512=>8732,
-37504=>8733,
-39154=>8734,
-38577=>8735,
-27387=>8736,
-23344=>8737,
-40441=>8738,
-25033=>8739,
-32403=>8740,
-29801=>8741,
-34722=>8742,
-29151=>8743,
-29074=>8744,
-34821=>8745,
-36111=>8746,
-31310=>8747,
-21938=>8748,
-25793=>8749,
-20653=>8750,
-30320=>8751,
-36404=>8752,
-20778=>8753,
-24962=>8754,
-37109=>8755,
-37438=>8756,
-29494=>8757,
-35480=>8758,
-36671=>8759,
-39192=>8760,
-12226=>8761,
-39770=>8761,
-28417=>8762,
-33287=>8763,
-23996=>8764,
-35486=>8765,
-39729=>8766,
-29508=>8767,
-35709=>8768,
-38928=>8769,
-39341=>8770,
-40219=>8771,
-28149=>8772,
-36677=>8773,
-22290=>8774,
-21729=>8775,
-22291=>8776,
-32227=>8777,
-36960=>8778,
-39000=>8779,
-32004=>8780,
-36493=>8781,
-38000=>8782,
-38322=>8783,
-38642=>8784,
-37142=>8785,
-38549=>8786,
-36939=>8787,
-34292=>8788,
-37270=>8789,
-26248=>8790,
-38620=>8791,
-36617=>8792,
-25890=>8793,
-26283=>8794,
-36106=>8795,
-36124=>8796,
-33247=>8797,
-38015=>8798,
-26839=>8799,
-31432=>8800,
-36012=>8801,
-25799=>8802,
-21063=>8803,
-28580=>8804,
-36042=>8805,
-36104=>8806,
-36555=>8807,
-37720=>8808,
-38296=>8809,
-35408=>8810,
-40779=>8811,
-20661=>8812,
-27656=>8813,
-30430=>8814,
-26028=>8815,
-36670=>8816,
-23940=>8817,
-26855=>8818,
-25136=>8819,
-32187=>8820,
-24373=>8821,
-28466=>8822,
-24115=>8823,
-36076=>8824,
-33081=>8825,
-36249=>8826,
-34756=>8827,
-36685=>8828,
-37754=>8829,
-36889=>8830,
-35998=>8831,
-37341=>8832,
-20597=>8833,
-35386=>8834,
-37806=>8835,
-38499=>8836,
-24128=>8837,
-30309=>8838,
-37165=>8839,
-35657=>8840,
-32340=>8841,
-32887=>8842,
-22519=>8843,
-34937=>8844,
-32025=>8845,
-25711=>8846,
-25842=>8847,
-24159=>8848,
-36074=>8849,
-28399=>8850,
-37912=>8851,
-32066=>8852,
-31278=>8853,
-33131=>8854,
-34886=>8855,
-35589=>8856,
-36600=>8857,
-30394=>8858,
-26205=>8859,
-39519=>8860,
-35576=>8861,
-35461=>8862,
-29165=>8863,
-30682=>8864,
-22225=>8865,
-36015=>8866,
-37956=>8867,
-31689=>8868,
-39376=>8869,
-23560=>8870,
-30938=>8871,
-36681=>8872,
-36090=>8873,
-27137=>8874,
-33674=>8875,
-35037=>8876,
-22941=>8877,
-22767=>8878,
-29376=>8879,
-37648=>8880,
-36101=>8881,
-22684=>8882,
-32180=>8883,
-35524=>8884,
-28310=>8885,
-28609=>8886,
-36039=>8887,
-28460=>8888,
-32156=>8889,
-32317=>8890,
-32305=>8891,
-37138=>8892,
-35419=>8893,
-32068=>8894,
-38013=>8895,
-21959=>8896,
-21401=>8897,
-21428=>8898,
-38760=>8899,
-36107=>8900,
-21293=>8901,
-21297=>8902,
-36094=>8903,
-21060=>8904,
-21132=>8905,
-21108=>8906,
-20660=>8907,
-20480=>8908,
-20630=>8909,
-20757=>8910,
-20738=>8911,
-20756=>8912,
-20796=>8913,
-20791=>8914,
-20712=>8915,
-20674=>8916,
-20795=>8917,
-20752=>8918,
-20794=>8919,
-20681=>8920,
-31988=>8921,
-40652=>8922,
-22213=>8923,
-40172=>8924,
-35131=>8925,
-33248=>8926,
-35329=>8927,
-35344=>8928,
-35340=>8929,
-35349=>8930,
-35635=>8931,
-35406=>8932,
-35365=>8933,
-35393=>8934,
-35382=>8935,
-35398=>8936,
-35412=>8937,
-35416=>8938,
-35410=>8939,
-35462=>8940,
-35460=>8941,
-35455=>8942,
-35440=>8943,
-35452=>8944,
-35445=>8945,
-35436=>8946,
-35438=>8947,
-35533=>8948,
-35554=>8949,
-35425=>8950,
-35482=>8951,
-35493=>8952,
-35473=>8953,
-35474=>8954,
-35535=>8955,
-35537=>8956,
-35529=>8957,
-35547=>8958,
-35543=>8959,
-35522=>8960,
-35510=>8961,
-35574=>8962,
-35563=>8963,
-35604=>8964,
-35585=>8965,
-35556=>8966,
-35565=>8967,
-35580=>8968,
-35571=>8969,
-35558=>8970,
-35566=>8971,
-35550=>8972,
-35624=>8973,
-35740=>8974,
-35606=>8975,
-35610=>8976,
-35600=>8977,
-35627=>8978,
-35629=>8979,
-35670=>8980,
-35673=>8981,
-35662=>8982,
-35742=>8983,
-35691=>8984,
-35734=>8985,
-38488=>8986,
-37178=>8987,
-37140=>8988,
-37172=>8989,
-37087=>8990,
-37174=>8991,
-37126=>8992,
-37192=>8993,
-33467=>8994,
-21233=>8995,
-24048=>8996,
-22538=>8997,
-22745=>8998,
-22754=>8999,
-22752=>9000,
-22746=>9001,
-22497=>9002,
-22607=>9003,
-22550=>9004,
-22610=>9005,
-22557=>9006,
-22628=>9007,
-34188=>9008,
-34131=>9009,
-34294=>9010,
-33703=>9011,
-33799=>9012,
-34031=>9013,
-33511=>9014,
-34338=>9015,
-34086=>9016,
-22603=>9017,
-29026=>9018,
-34136=>9019,
-34045=>9020,
-34126=>9021,
-34184=>9022,
-34234=>9023,
-29334=>9024,
-28366=>9025,
-34113=>9026,
-34254=>9027,
-34130=>9028,
-33984=>9029,
-33874=>9030,
-33892=>9031,
-33940=>9032,
-33845=>9033,
-34207=>9034,
-34133=>9035,
-40367=>9036,
-33939=>9037,
-32264=>9038,
-34118=>9039,
-34146=>9040,
-34078=>9041,
-39488=>9042,
-34362=>9043,
-37795=>9044,
-34167=>9045,
-34334=>9046,
-34298=>9047,
-34308=>9048,
-34282=>9049,
-34330=>9050,
-22889=>9051,
-23607=>9052,
-25451=>9053,
-25718=>9054,
-25759=>9055,
-25681=>9056,
-25692=>9057,
-25779=>9058,
-25860=>9059,
-25878=>9060,
-25847=>9061,
-25852=>9062,
-25883=>9063,
-22064=>9064,
-22072=>9065,
-22216=>9066,
-22182=>9067,
-21764=>9068,
-21692=>9069,
-22144=>9070,
-22109=>9071,
-22112=>9072,
-22069=>9073,
-22006=>9074,
-22118=>9075,
-22130=>9076,
-22156=>9077,
-22117=>9078,
-22044=>9079,
-22062=>9080,
-21993=>9081,
-22038=>9082,
-22208=>9083,
-22029=>9084,
-22195=>9085,
-22209=>9086,
-22127=>9087,
-36705=>9088,
-22198=>9089,
-22165=>9090,
-22279=>9091,
-24131=>9092,
-24172=>9093,
-24152=>9094,
-24151=>9095,
-23943=>9096,
-23796=>9097,
-23888=>9098,
-23852=>9099,
-23975=>9100,
-23968=>9101,
-23959=>9102,
-23821=>9103,
-23992=>9104,
-23937=>9105,
-24020=>9106,
-24480=>9107,
-29559=>9108,
-29505=>9109,
-29546=>9110,
-29499=>9111,
-29547=>9112,
-29568=>9113,
-29564=>9114,
-39136=>9115,
-39219=>9116,
-39145=>9117,
-39228=>9118,
-39146=>9119,
-39147=>9120,
-39149=>9121,
-39156=>9122,
-39177=>9123,
-39185=>9124,
-39195=>9125,
-39223=>9126,
-39231=>9127,
-39235=>9128,
-39240=>9129,
-39241=>9130,
-39242=>9131,
-39244=>9132,
-39266=>9133,
-24289=>9134,
-36065=>9135,
-25082=>9136,
-25006=>9137,
-24938=>9138,
-24894=>9139,
-24757=>9140,
-24884=>9141,
-25036=>9142,
-24927=>9143,
-25064=>9144,
-24827=>9145,
-24887=>9146,
-24818=>9147,
-24947=>9148,
-24860=>9149,
-24978=>9150,
-38274=>9151,
-38278=>9152,
-38344=>9153,
-38286=>9154,
-38292=>9155,
-38284=>9156,
-38373=>9157,
-38317=>9158,
-38315=>9159,
-39726=>9160,
-38316=>9161,
-38334=>9162,
-38326=>9163,
-39721=>9164,
-38335=>9165,
-38333=>9166,
-38332=>9167,
-38339=>9168,
-38347=>9169,
-38356=>9170,
-38352=>9171,
-38357=>9172,
-38366=>9173,
-28739=>9174,
-28505=>9175,
-28711=>9176,
-28696=>9177,
-28668=>9178,
-28039=>9179,
-28025=>9180,
-28254=>9181,
-28590=>9182,
-28687=>9183,
-28408=>9184,
-28527=>9185,
-28150=>9186,
-28543=>9187,
-28678=>9188,
-28576=>9189,
-28683=>9190,
-28775=>9191,
-28740=>9192,
-28677=>9193,
-28535=>9194,
-28704=>9195,
-28703=>9196,
-28722=>9197,
-28712=>9198,
-28765=>9199,
-39467=>9200,
-36999=>9201,
-36885=>9202,
-37008=>9203,
-23656=>9204,
-24371=>9205,
-23285=>9206,
-23255=>9207,
-23296=>9208,
-23149=>9209,
-23304=>9210,
-23372=>9211,
-23207=>9212,
-23291=>9213,
-23307=>9214,
-23329=>9215,
-23338=>9216,
-23321=>9217,
-39380=>9218,
-39391=>9219,
-39385=>9220,
-39478=>9221,
-39515=>9222,
-39377=>9223,
-39384=>9224,
-39501=>9225,
-39498=>9226,
-39394=>9227,
-39530=>9228,
-39439=>9229,
-39437=>9230,
-39429=>9231,
-39490=>9232,
-39469=>9233,
-39446=>9234,
-39489=>9235,
-39470=>9236,
-39480=>9237,
-39491=>9238,
-39492=>9239,
-39503=>9240,
-39525=>9241,
-39524=>9242,
-31993=>9243,
-32006=>9244,
-32002=>9245,
-32007=>9246,
-32008=>9247,
-32394=>9248,
-32028=>9249,
-32021=>9250,
-32019=>9251,
-32058=>9252,
-32050=>9253,
-32049=>9254,
-32272=>9255,
-32060=>9256,
-32064=>9257,
-32063=>9258,
-32093=>9259,
-32078=>9260,
-32115=>9261,
-32134=>9262,
-32131=>9263,
-32136=>9264,
-32190=>9265,
-32186=>9266,
-32203=>9267,
-32212=>9268,
-32196=>9269,
-32158=>9270,
-32172=>9271,
-32185=>9272,
-32163=>9273,
-32176=>9274,
-32199=>9275,
-32217=>9276,
-32215=>9277,
-32249=>9278,
-32242=>9279,
-32354=>9280,
-32230=>9281,
-32246=>9282,
-32241=>9283,
-32267=>9284,
-32225=>9285,
-32265=>9286,
-32285=>9287,
-32287=>9288,
-32286=>9289,
-32301=>9290,
-32266=>9291,
-32273=>9292,
-32381=>9293,
-32313=>9294,
-32309=>9295,
-32306=>9296,
-32326=>9297,
-32325=>9298,
-32392=>9299,
-32346=>9300,
-32338=>9301,
-32366=>9302,
-32382=>9303,
-32368=>9304,
-32367=>9305,
-32408=>9306,
-29859=>9307,
-29771=>9308,
-29903=>9309,
-38922=>9310,
-29885=>9311,
-29759=>9312,
-29833=>9313,
-29862=>9314,
-29908=>9315,
-29914=>9316,
-38873=>9317,
-38878=>9318,
-38876=>9319,
-27050=>9320,
-27370=>9321,
-26776=>9322,
-26838=>9323,
-27141=>9324,
-26783=>9325,
-27355=>9326,
-27379=>9327,
-27368=>9328,
-27359=>9329,
-27273=>9330,
-26895=>9331,
-27208=>9332,
-26984=>9333,
-27071=>9334,
-27194=>9335,
-27292=>9336,
-27410=>9337,
-27422=>9338,
-27357=>9339,
-27111=>9340,
-27407=>9341,
-27414=>9342,
-27372=>9343,
-27354=>9344,
-27384=>9345,
-27315=>9346,
-27367=>9347,
-27299=>9348,
-27347=>9349,
-27358=>9350,
-27556=>9351,
-27550=>9352,
-27566=>9353,
-27563=>9354,
-27567=>9355,
-36564=>9356,
-36571=>9357,
-36594=>9358,
-36603=>9359,
-36708=>9360,
-36601=>9361,
-36604=>9362,
-36587=>9363,
-36580=>9364,
-36706=>9365,
-36602=>9366,
-36606=>9367,
-36618=>9368,
-36615=>9369,
-36613=>9370,
-36626=>9371,
-36646=>9372,
-36638=>9373,
-36639=>9374,
-36636=>9375,
-36659=>9376,
-36678=>9377,
-36692=>9378,
-25108=>9379,
-25127=>9380,
-29964=>9381,
-26311=>9382,
-26308=>9383,
-26249=>9384,
-26326=>9385,
-36033=>9386,
-36016=>9387,
-36026=>9388,
-36029=>9389,
-36100=>9390,
-36018=>9391,
-36037=>9392,
-36112=>9393,
-36049=>9394,
-36058=>9395,
-36053=>9396,
-36075=>9397,
-36071=>9398,
-36091=>9399,
-35224=>9400,
-35244=>9401,
-35233=>9402,
-35263=>9403,
-35238=>9404,
-35247=>9405,
-35250=>9406,
-35255=>9407,
-27647=>9408,
-27660=>9409,
-27692=>9410,
-29272=>9411,
-26407=>9412,
-33110=>9413,
-33242=>9414,
-33051=>9415,
-33214=>9416,
-33121=>9417,
-33231=>9418,
-27487=>9419,
-39086=>9420,
-39087=>9421,
-39094=>9422,
-39100=>9423,
-39110=>9424,
-39112=>9425,
-36674=>9426,
-40783=>9427,
-26005=>9428,
-29036=>9429,
-29010=>9430,
-29079=>9431,
-29121=>9432,
-29148=>9433,
-29182=>9434,
-31152=>9435,
-31118=>9436,
-31146=>9437,
-25055=>9438,
-24932=>9439,
-25059=>9440,
-25095=>9441,
-28585=>9442,
-30959=>9443,
-30893=>9444,
-30824=>9445,
-30904=>9446,
-31018=>9447,
-31025=>9448,
-30820=>9449,
-30973=>9450,
-30951=>9451,
-30947=>9452,
-40853=>9453,
-30616=>9454,
-30558=>9455,
-30652=>9456,
-32646=>9457,
-32648=>9458,
-37330=>9459,
-37331=>9460,
-37332=>9461,
-37337=>9462,
-37335=>9463,
-37333=>9464,
-37367=>9465,
-37351=>9466,
-37348=>9467,
-37702=>9468,
-37365=>9469,
-37369=>9470,
-37384=>9471,
-37414=>9472,
-37445=>9473,
-37393=>9474,
-37392=>9475,
-37377=>9476,
-37415=>9477,
-37380=>9478,
-37413=>9479,
-37376=>9480,
-37434=>9481,
-37478=>9482,
-37431=>9483,
-37427=>9484,
-37461=>9485,
-37437=>9486,
-37432=>9487,
-37470=>9488,
-37484=>9489,
-37485=>9490,
-37439=>9491,
-37984=>9492,
-37424=>9493,
-37449=>9494,
-37448=>9495,
-37453=>9496,
-37422=>9497,
-37433=>9498,
-37944=>9499,
-37548=>9500,
-37536=>9501,
-37498=>9502,
-37546=>9503,
-37614=>9504,
-37583=>9505,
-37891=>9506,
-37603=>9507,
-37946=>9508,
-37553=>9509,
-37542=>9510,
-37799=>9511,
-37526=>9512,
-37580=>9513,
-37545=>9514,
-37877=>9515,
-37523=>9516,
-37503=>9517,
-37801=>9518,
-37530=>9519,
-37658=>9520,
-37547=>9521,
-37507=>9522,
-37899=>9523,
-37544=>9524,
-37539=>9525,
-37906=>9526,
-37688=>9527,
-37617=>9528,
-37847=>9529,
-37605=>9530,
-37616=>9531,
-37615=>9532,
-37608=>9533,
-37564=>9534,
-37597=>9535,
-37622=>9536,
-37926=>9537,
-37927=>9538,
-37571=>9539,
-37599=>9540,
-37606=>9541,
-37650=>9542,
-37638=>9543,
-37737=>9544,
-37659=>9545,
-37696=>9546,
-37633=>9547,
-37653=>9548,
-37678=>9549,
-37699=>9550,
-37639=>9551,
-37640=>9552,
-37663=>9553,
-37657=>9554,
-37733=>9555,
-37703=>9556,
-37750=>9557,
-37716=>9558,
-37732=>9559,
-37802=>9560,
-37744=>9561,
-37764=>9562,
-37860=>9563,
-37848=>9564,
-37928=>9565,
-37767=>9566,
-37836=>9567,
-37784=>9568,
-37816=>9569,
-37823=>9570,
-37798=>9571,
-37808=>9572,
-37813=>9573,
-37964=>9574,
-37858=>9575,
-37852=>9576,
-37853=>9577,
-37837=>9578,
-37854=>9579,
-37827=>9580,
-37831=>9581,
-37841=>9582,
-37908=>9583,
-37917=>9584,
-37879=>9585,
-37989=>9586,
-37907=>9587,
-37997=>9588,
-37920=>9589,
-38009=>9590,
-37881=>9591,
-37913=>9592,
-37962=>9593,
-37938=>9594,
-37951=>9595,
-37972=>9596,
-37987=>9597,
-37758=>9598,
-31329=>9599,
-40169=>9600,
-40182=>9601,
-40199=>9602,
-40198=>9603,
-40227=>9604,
-40327=>9605,
-40469=>9606,
-40221=>9607,
-40223=>9608,
-40421=>9609,
-40239=>9610,
-40409=>9611,
-40240=>9612,
-40258=>9613,
-40478=>9614,
-40275=>9615,
-40477=>9616,
-40288=>9617,
-40274=>9618,
-40435=>9619,
-40284=>9620,
-40289=>9621,
-40339=>9622,
-40298=>9623,
-40303=>9624,
-40329=>9625,
-40344=>9626,
-40346=>9627,
-40384=>9628,
-40357=>9629,
-40361=>9630,
-40386=>9631,
-40380=>9632,
-40474=>9633,
-40403=>9634,
-40410=>9635,
-40431=>9636,
-40422=>9637,
-40434=>9638,
-40440=>9639,
-40460=>9640,
-40442=>9641,
-40475=>9642,
-30308=>9643,
-30296=>9644,
-30311=>9645,
-30210=>9646,
-30278=>9647,
-30279=>9648,
-30281=>9649,
-30238=>9650,
-30267=>9651,
-30317=>9652,
-30318=>9653,
-30313=>9654,
-30322=>9655,
-31431=>9656,
-31414=>9657,
-35168=>9658,
-35123=>9659,
-35165=>9660,
-35143=>9661,
-35128=>9662,
-35172=>9663,
-30392=>9664,
-32814=>9665,
-32812=>9666,
-32889=>9667,
-32885=>9668,
-38919=>9669,
-38926=>9670,
-38927=>9671,
-38945=>9672,
-38940=>9673,
-28481=>9674,
-38950=>9675,
-38967=>9676,
-38990=>9677,
-38995=>9678,
-39027=>9679,
-39010=>9680,
-39001=>9681,
-39013=>9682,
-39020=>9683,
-39024=>9684,
-34787=>9685,
-34822=>9686,
-34566=>9687,
-34851=>9688,
-34806=>9689,
-34554=>9690,
-34799=>9691,
-34692=>9692,
-34832=>9693,
-34760=>9694,
-34833=>9695,
-34747=>9696,
-34766=>9697,
-32588=>9698,
-31716=>9699,
-31591=>9700,
-31849=>9701,
-31731=>9702,
-31744=>9703,
-31691=>9704,
-31836=>9705,
-31774=>9706,
-31787=>9707,
-31779=>9708,
-31850=>9709,
-31839=>9710,
-33380=>9711,
-33387=>9712,
-35018=>9713,
-32677=>9714,
-31986=>9715,
-31990=>9716,
-31965=>9717,
-32310=>9718,
-40617=>9719,
-36274=>9720,
-37317=>9721,
-37315=>9722,
-40570=>9723,
-36489=>9724,
-36428=>9725,
-36498=>9726,
-36474=>9727,
-36437=>9728,
-36506=>9729,
-36491=>9730,
-36499=>9731,
-36497=>9732,
-36513=>9733,
-36451=>9734,
-36522=>9735,
-36518=>9736,
-35316=>9737,
-35318=>9738,
-38746=>9739,
-38722=>9740,
-38717=>9741,
-38724=>9742,
-40788=>9743,
-40799=>9744,
-40793=>9745,
-40800=>9746,
-40796=>9747,
-40806=>9748,
-40812=>9749,
-40810=>9750,
-40823=>9751,
-12236=>9752,
-40701=>9752,
-40703=>9753,
-40713=>9754,
-35726=>9755,
-38014=>9756,
-37864=>9757,
-39799=>9758,
-39796=>9759,
-39809=>9760,
-39811=>9761,
-39822=>9762,
-40056=>9763,
-31308=>9764,
-39826=>9765,
-40031=>9766,
-39824=>9767,
-39853=>9768,
-39834=>9769,
-39850=>9770,
-39838=>9771,
-40045=>9772,
-39851=>9773,
-39837=>9774,
-40024=>9775,
-39873=>9776,
-40058=>9777,
-39985=>9778,
-39993=>9779,
-39971=>9780,
-39991=>9781,
-39872=>9782,
-39882=>9783,
-39879=>9784,
-39933=>9785,
-39894=>9786,
-39914=>9787,
-39915=>9788,
-39905=>9789,
-39908=>9790,
-39911=>9791,
-39901=>9792,
-39906=>9793,
-39920=>9794,
-39899=>9795,
-39924=>9796,
-39892=>9797,
-40029=>9798,
-39944=>9799,
-39952=>9800,
-39949=>9801,
-39954=>9802,
-39945=>9803,
-39935=>9804,
-39968=>9805,
-39986=>9806,
-39981=>9807,
-39976=>9808,
-39973=>9809,
-39977=>9810,
-39987=>9811,
-39998=>9812,
-40008=>9813,
-39995=>9814,
-39989=>9815,
-40005=>9816,
-40022=>9817,
-40020=>9818,
-40018=>9819,
-40039=>9820,
-38851=>9821,
-38845=>9822,
-38857=>9823,
-40379=>9824,
-39631=>9825,
-39638=>9826,
-39637=>9827,
-39768=>9828,
-39758=>9829,
-39255=>9830,
-39260=>9831,
-39714=>9832,
-40695=>9833,
-40690=>9834,
-35180=>9835,
-38342=>9836,
-37686=>9837,
-24390=>9838,
-34068=>9839,
-32404=>9840,
-40803=>9841,
-22137=>9842,
-40725=>9843,
-22081=>9844,
-39662=>9845,
-35079=>9846,
-31296=>9847,
-39091=>9848,
-38308=>9849,
-39693=>9850,
-36852=>9851,
-24409=>9852,
-31339=>9853,
-39138=>9854,
-20642=>9855,
-34193=>9856,
-20760=>9857,
-25458=>9858,
-21067=>9859,
-30543=>9860,
-32397=>9861,
-26310=>9862,
-30637=>9863,
-12228=>9864,
-40565=>9864,
-22217=>9865,
-40692=>9866,
-28635=>9867,
-25054=>9868,
-30663=>9869,
-28720=>9870,
-40629=>9871,
-34890=>9872,
-38370=>9873,
-38854=>9874,
-31844=>9875,
-32308=>9876,
-38822=>9877,
-40623=>9878,
-22220=>9879,
-39089=>9880,
-27311=>9881,
-32590=>9882,
-31984=>9883,
-20418=>9884,
-32363=>9885,
-40569=>9886,
-22190=>9887,
-39706=>9888,
-33903=>9889,
-31142=>9890,
-31858=>9891,
-39634=>9892,
-38587=>9893,
-32251=>9894,
-35069=>9895,
-30787=>9896,
-8560=>9897,
-8561=>9898,
-8562=>9899,
-8563=>9900,
-8564=>9901,
-8565=>9902,
-8566=>9903,
-8567=>9904,
-8568=>9905,
-8569=>9906,
-714=>9907,
-715=>9908,
-729=>9909,
-8211=>9910,
-8213=>9911,
-8229=>9912,
-8245=>9913,
-8453=>9914,
-8457=>9915,
-8598=>9916,
-8599=>9917,
-8600=>9918,
-8601=>9919,
-8725=>9920,
-8735=>9921,
-8739=>9922,
-8786=>9923,
-8806=>9924,
-8807=>9925,
-8895=>9926,
-9552=>9927,
-9553=>9928,
-9554=>9929,
-9555=>9930,
-9556=>9931,
-9557=>9932,
-9558=>9933,
-9559=>9934,
-9560=>9935,
-9561=>9936,
-9562=>9937,
-9563=>9938,
-9564=>9939,
-9565=>9940,
-9566=>9941,
-9567=>9942,
-9568=>9943,
-9569=>9944,
-9570=>9945,
-9571=>9946,
-9572=>9947,
-9573=>9948,
-9574=>9949,
-9575=>9950,
-9576=>9951,
-9577=>9952,
-9578=>9953,
-9579=>9954,
-9580=>9955,
-9581=>9956,
-9582=>9957,
-9583=>9958,
-9584=>9959,
-9585=>9960,
-9586=>9961,
-9587=>9962,
-9601=>9963,
-9602=>9964,
-9603=>9965,
-9604=>9966,
-9605=>9967,
-9606=>9968,
-9607=>9969,
-9608=>9970,
-9609=>9971,
-9610=>9972,
-9611=>9973,
-9612=>9974,
-9613=>9975,
-9614=>9976,
-9615=>9977,
-9619=>9978,
-9620=>9979,
-9621=>9980,
-9660=>9981,
-9661=>9982,
-9698=>9983,
-9699=>9984,
-9700=>9985,
-9701=>9986,
-9737=>9987,
-8853=>9988,
-12306=>9989,
-12317=>9990,
-12318=>9991,
-12321=>9992,
-12322=>9993,
-12323=>9994,
-12324=>9995,
-12325=>9996,
-12326=>9997,
-12327=>9998,
-12328=>9999,
-12329=>10000,
-12963=>10001,
-13198=>10002,
-13199=>10003,
-13212=>10004,
-13213=>10005,
-13214=>10006,
-13217=>10007,
-13252=>10008,
-13262=>10009,
-13265=>10010,
-13266=>10011,
-13269=>10012,
-65072=>10013,
-65506=>10014,
-65508=>10015,
-8481=>10016,
-12849=>10017,
-8208=>10018,
-12540=>10019,
-12443=>10020,
-12444=>10021,
-12541=>10022,
-12542=>10023,
-12294=>10024,
-12445=>10025,
-12446=>10026,
-65097=>10027,
-65098=>10028,
-65099=>10029,
-65100=>10030,
-65101=>10031,
-65102=>10032,
-65103=>10033,
-65104=>10034,
-65105=>10035,
-65106=>10036,
-65108=>10037,
-65109=>10038,
-65110=>10039,
-65111=>10040,
-65113=>10041,
-65114=>10042,
-65115=>10043,
-65116=>10044,
-65117=>10045,
-65118=>10046,
-65119=>10047,
-65120=>10048,
-65121=>10049,
-65122=>10050,
-65123=>10051,
-65124=>10052,
-65125=>10053,
-65126=>10054,
-65128=>10055,
-65129=>10056,
-65130=>10057,
-65131=>10058,
-12350=>10059,
-59367=>10059,
-12272=>10060,
-59368=>10060,
-12273=>10061,
-59369=>10061,
-12274=>10062,
-59370=>10062,
-12275=>10063,
-59371=>10063,
-12276=>10064,
-59372=>10064,
-12277=>10065,
-59373=>10065,
-12278=>10066,
-59374=>10066,
-12279=>10067,
-59375=>10067,
-12280=>10068,
-59376=>10068,
-12281=>10069,
-59377=>10069,
-12282=>10070,
-59378=>10070,
-12283=>10071,
-59379=>10071,
-19970=>10072,
-19972=>10073,
-19973=>10074,
-19974=>10075,
-19983=>10076,
-19986=>10077,
-19991=>10078,
-19999=>10079,
-20000=>10080,
-20001=>10081,
-20003=>10082,
-20006=>10083,
-20009=>10084,
-20014=>10085,
-20015=>10086,
-20017=>10087,
-20019=>10088,
-20021=>10089,
-20023=>10090,
-20028=>10091,
-20032=>10092,
-20033=>10093,
-20034=>10094,
-20036=>10095,
-20038=>10096,
-20042=>10097,
-20049=>10098,
-20053=>10099,
-20055=>10100,
-20058=>10101,
-20059=>10102,
-20066=>10103,
-20067=>10104,
-20068=>10105,
-20069=>10106,
-20071=>10107,
-20072=>10108,
-20074=>10109,
-20075=>10110,
-20076=>10111,
-20077=>10112,
-20078=>10113,
-20079=>10114,
-20082=>10115,
-20084=>10116,
-20085=>10117,
-20086=>10118,
-20087=>10119,
-20088=>10120,
-20089=>10121,
-20090=>10122,
-20091=>10123,
-20092=>10124,
-20093=>10125,
-20095=>10126,
-20096=>10127,
-20097=>10128,
-20099=>10129,
-20100=>10130,
-12037=>10131,
-20101=>10131,
-20103=>10132,
-20106=>10133,
-20112=>10134,
-20118=>10135,
-20119=>10136,
-20121=>10137,
-20124=>10138,
-20125=>10139,
-20131=>10140,
-20138=>10141,
-20143=>10142,
-20144=>10143,
-20145=>10144,
-20148=>10145,
-20150=>10146,
-20151=>10147,
-20152=>10148,
-20153=>10149,
-20156=>10150,
-20157=>10151,
-20158=>10152,
-20168=>10153,
-20172=>10154,
-20175=>10155,
-20176=>10156,
-20178=>10157,
-20186=>10158,
-20187=>10159,
-20188=>10160,
-20192=>10161,
-20194=>10162,
-20198=>10163,
-20199=>10164,
-20201=>10165,
-20205=>10166,
-20206=>10167,
-20207=>10168,
-20209=>10169,
-20212=>10170,
-20216=>10171,
-20217=>10172,
-20218=>10173,
-20220=>10174,
-20222=>10175,
-20224=>10176,
-20226=>10177,
-20227=>10178,
-20228=>10179,
-20229=>10180,
-20230=>10181,
-20231=>10182,
-20232=>10183,
-20235=>10184,
-20236=>10185,
-20242=>10186,
-20243=>10187,
-20244=>10188,
-20245=>10189,
-20246=>10190,
-20252=>10191,
-20253=>10192,
-20257=>10193,
-20259=>10194,
-20264=>10195,
-20265=>10196,
-20268=>10197,
-20269=>10198,
-20270=>10199,
-20273=>10200,
-20275=>10201,
-20277=>10202,
-20279=>10203,
-20281=>10204,
-20283=>10205,
-20286=>10206,
-20287=>10207,
-20288=>10208,
-20289=>10209,
-20290=>10210,
-20292=>10211,
-20293=>10212,
-20295=>10213,
-20296=>10214,
-20297=>10215,
-20298=>10216,
-20299=>10217,
-20300=>10218,
-20306=>10219,
-20308=>10220,
-20310=>10221,
-20321=>10222,
-20322=>10223,
-20326=>10224,
-20328=>10225,
-20330=>10226,
-20331=>10227,
-20333=>10228,
-20334=>10229,
-20337=>10230,
-20338=>10231,
-20341=>10232,
-20343=>10233,
-20344=>10234,
-20345=>10235,
-20346=>10236,
-20349=>10237,
-20352=>10238,
-20353=>10239,
-20354=>10240,
-20357=>10241,
-20359=>10242,
-20362=>10243,
-20364=>10244,
-20366=>10245,
-20368=>10246,
-20370=>10247,
-20371=>10248,
-20373=>10249,
-20376=>10250,
-20377=>10251,
-20378=>10252,
-20380=>10253,
-20382=>10254,
-20383=>10255,
-20385=>10256,
-20386=>10257,
-20388=>10258,
-20395=>10259,
-20397=>10260,
-20400=>10261,
-20401=>10262,
-20402=>10263,
-20403=>10264,
-20404=>10265,
-20406=>10266,
-20407=>10267,
-20408=>10268,
-20409=>10269,
-20410=>10270,
-20411=>10271,
-20412=>10272,
-20413=>10273,
-20414=>10274,
-20416=>10275,
-20417=>10276,
-20422=>10277,
-20423=>10278,
-20424=>10279,
-20425=>10280,
-20427=>10281,
-20428=>10282,
-20429=>10283,
-20434=>10284,
-20435=>10285,
-20436=>10286,
-20437=>10287,
-20438=>10288,
-20441=>10289,
-20443=>10290,
-20450=>10291,
-20452=>10292,
-20453=>10293,
-20455=>10294,
-20459=>10295,
-20460=>10296,
-20464=>10297,
-20466=>10298,
-20468=>10299,
-20469=>10300,
-20470=>10301,
-20471=>10302,
-20473=>10303,
-20475=>10304,
-20476=>10305,
-20477=>10306,
-20479=>10307,
-20481=>10308,
-20482=>10309,
-20483=>10310,
-20484=>10311,
-20485=>10312,
-20487=>10313,
-20488=>10314,
-20490=>10315,
-20494=>10316,
-20496=>10317,
-20499=>10318,
-20501=>10319,
-20502=>10320,
-20503=>10321,
-20507=>10322,
-20509=>10323,
-20510=>10324,
-20512=>10325,
-20514=>10326,
-20515=>10327,
-20516=>10328,
-20519=>10329,
-20527=>10330,
-20528=>10331,
-20529=>10332,
-20530=>10333,
-20531=>10334,
-20532=>10335,
-20533=>10336,
-20534=>10337,
-20535=>10338,
-20536=>10339,
-20537=>10340,
-20539=>10341,
-20541=>10342,
-20543=>10343,
-20544=>10344,
-20545=>10345,
-20546=>10346,
-20548=>10347,
-20549=>10348,
-20550=>10349,
-20554=>10350,
-20555=>10351,
-20557=>10352,
-20560=>10353,
-20561=>10354,
-20562=>10355,
-20563=>10356,
-20564=>10357,
-20566=>10358,
-20567=>10359,
-20568=>10360,
-20569=>10361,
-20571=>10362,
-20573=>10363,
-20574=>10364,
-20575=>10365,
-20576=>10366,
-20577=>10367,
-20578=>10368,
-20579=>10369,
-20580=>10370,
-20582=>10371,
-20583=>10372,
-20584=>10373,
-20585=>10374,
-20586=>10375,
-20587=>10376,
-20589=>10377,
-20590=>10378,
-20591=>10379,
-20592=>10380,
-20593=>10381,
-20594=>10382,
-20595=>10383,
-20600=>10384,
-20601=>10385,
-20602=>10386,
-20604=>10387,
-20605=>10388,
-20609=>10389,
-20610=>10390,
-20611=>10391,
-20612=>10392,
-20614=>10393,
-20615=>10394,
-20617=>10395,
-20618=>10396,
-20619=>10397,
-20620=>10398,
-20622=>10399,
-20623=>10400,
-20624=>10401,
-20625=>10402,
-20626=>10403,
-20627=>10404,
-20628=>10405,
-20629=>10406,
-20631=>10407,
-20634=>10408,
-20635=>10409,
-20636=>10410,
-20637=>10411,
-20638=>10412,
-20639=>10413,
-20640=>10414,
-20641=>10415,
-20644=>10416,
-20646=>10417,
-20650=>10418,
-20651=>10419,
-20654=>10420,
-20655=>10421,
-20656=>10422,
-20657=>10423,
-20662=>10424,
-20664=>10425,
-20665=>10426,
-20668=>10427,
-20669=>10428,
-20671=>10429,
-20672=>10430,
-20673=>10431,
-20675=>10432,
-20676=>10433,
-20678=>10434,
-20679=>10435,
-20680=>10436,
-20682=>10437,
-20683=>10438,
-20684=>10439,
-20685=>10440,
-20686=>10441,
-20688=>10442,
-20690=>10443,
-20691=>10444,
-20692=>10445,
-20695=>10446,
-20696=>10447,
-20697=>10448,
-20699=>10449,
-20700=>10450,
-20701=>10451,
-20703=>10452,
-20704=>10453,
-20705=>10454,
-20706=>10455,
-20707=>10456,
-20708=>10457,
-20713=>10458,
-20714=>10459,
-20715=>10460,
-20719=>10461,
-20720=>10462,
-20721=>10463,
-20722=>10464,
-20724=>10465,
-20726=>10466,
-20727=>10467,
-20728=>10468,
-20730=>10469,
-20732=>10470,
-20733=>10471,
-20734=>10472,
-20735=>10473,
-20737=>10474,
-20739=>10475,
-20741=>10476,
-20746=>10477,
-20748=>10478,
-20749=>10479,
-20750=>10480,
-20751=>10481,
-20753=>10482,
-20755=>10483,
-20758=>10484,
-20759=>10485,
-20761=>10486,
-20762=>10487,
-20763=>10488,
-20764=>10489,
-20765=>10490,
-20766=>10491,
-20768=>10492,
-20770=>10493,
-20771=>10494,
-20772=>10495,
-20773=>10496,
-20774=>10497,
-20775=>10498,
-20776=>10499,
-20777=>10500,
-20779=>10501,
-20780=>10502,
-20781=>10503,
-20782=>10504,
-20783=>10505,
-20784=>10506,
-20785=>10507,
-20787=>10508,
-20788=>10509,
-20789=>10510,
-20790=>10511,
-20792=>10512,
-20793=>10513,
-20797=>10514,
-20798=>10515,
-20802=>10516,
-20807=>10517,
-20810=>10518,
-20812=>10519,
-20814=>10520,
-20815=>10521,
-20816=>10522,
-20819=>10523,
-20823=>10524,
-20824=>10525,
-20825=>10526,
-20827=>10527,
-20829=>10528,
-20830=>10529,
-20831=>10530,
-20832=>10531,
-20833=>10532,
-20835=>10533,
-20836=>10534,
-20838=>10535,
-20839=>10536,
-20842=>10537,
-20847=>10538,
-20850=>10539,
-20858=>10540,
-20862=>10541,
-20863=>10542,
-20867=>10543,
-20868=>10544,
-20870=>10545,
-20871=>10546,
-20874=>10547,
-20875=>10548,
-20878=>10549,
-20879=>10550,
-20880=>10551,
-20881=>10552,
-20883=>10553,
-20884=>10554,
-20888=>10555,
-20890=>10556,
-20893=>10557,
-20894=>10558,
-20895=>10559,
-20897=>10560,
-20899=>10561,
-20902=>10562,
-20903=>10563,
-20904=>10564,
-20905=>10565,
-20906=>10566,
-20909=>10567,
-20910=>10568,
-20916=>10569,
-20920=>10570,
-20921=>10571,
-20922=>10572,
-20926=>10573,
-20927=>10574,
-20929=>10575,
-20930=>10576,
-20931=>10577,
-20933=>10578,
-20936=>10579,
-20938=>10580,
-20942=>10581,
-20944=>10582,
-20946=>10583,
-20947=>10584,
-20948=>10585,
-20949=>10586,
-20950=>10587,
-20951=>10588,
-20952=>10589,
-20953=>10590,
-20954=>10591,
-20956=>10592,
-20958=>10593,
-20959=>10594,
-20962=>10595,
-20963=>10596,
-20965=>10597,
-20966=>10598,
-20967=>10599,
-20968=>10600,
-20969=>10601,
-20970=>10602,
-20972=>10603,
-20974=>10604,
-20978=>10605,
-20980=>10606,
-20983=>10607,
-20990=>10608,
-20996=>10609,
-20997=>10610,
-21001=>10611,
-21003=>10612,
-21004=>10613,
-21007=>10614,
-21008=>10615,
-21011=>10616,
-21012=>10617,
-21013=>10618,
-21020=>10619,
-21022=>10620,
-21023=>10621,
-21025=>10622,
-21026=>10623,
-21027=>10624,
-21029=>10625,
-21030=>10626,
-21031=>10627,
-21034=>10628,
-21036=>10629,
-21039=>10630,
-21041=>10631,
-21042=>10632,
-21044=>10633,
-21045=>10634,
-21052=>10635,
-21054=>10636,
-21061=>10637,
-21062=>10638,
-21064=>10639,
-21065=>10640,
-21070=>10641,
-21071=>10642,
-21074=>10643,
-21075=>10644,
-21077=>10645,
-21079=>10646,
-21080=>10647,
-21081=>10648,
-21082=>10649,
-21085=>10650,
-21087=>10651,
-21088=>10652,
-21090=>10653,
-21091=>10654,
-21092=>10655,
-21094=>10656,
-21096=>10657,
-21099=>10658,
-21100=>10659,
-21101=>10660,
-21104=>10661,
-21105=>10662,
-21107=>10663,
-21110=>10664,
-21111=>10665,
-21112=>10666,
-21113=>10667,
-21114=>10668,
-21115=>10669,
-21116=>10670,
-21118=>10671,
-21120=>10672,
-21124=>10673,
-21125=>10674,
-21126=>10675,
-21131=>10676,
-21134=>10677,
-21135=>10678,
-21138=>10679,
-21140=>10680,
-21141=>10681,
-21142=>10682,
-21143=>10683,
-21144=>10684,
-21145=>10685,
-21146=>10686,
-21148=>10687,
-21156=>10688,
-21157=>10689,
-21158=>10690,
-21159=>10691,
-21166=>10692,
-21167=>10693,
-21168=>10694,
-21172=>10695,
-21173=>10696,
-21174=>10697,
-21175=>10698,
-21176=>10699,
-21177=>10700,
-21178=>10701,
-21179=>10702,
-21180=>10703,
-21181=>10704,
-21184=>10705,
-21186=>10706,
-21188=>10707,
-21189=>10708,
-21190=>10709,
-21192=>10710,
-21194=>10711,
-21196=>10712,
-21197=>10713,
-21198=>10714,
-21199=>10715,
-21201=>10716,
-21203=>10717,
-21204=>10718,
-21207=>10719,
-21210=>10720,
-21212=>10721,
-21216=>10722,
-21217=>10723,
-21219=>10724,
-21221=>10725,
-21222=>10726,
-21223=>10727,
-21224=>10728,
-21225=>10729,
-21226=>10730,
-21227=>10731,
-21228=>10732,
-21229=>10733,
-21230=>10734,
-21231=>10735,
-21234=>10736,
-21235=>10737,
-21236=>10738,
-21238=>10739,
-21239=>10740,
-21243=>10741,
-21244=>10742,
-21245=>10743,
-21249=>10744,
-21250=>10745,
-21251=>10746,
-21252=>10747,
-21255=>10748,
-21257=>10749,
-21258=>10750,
-21259=>10751,
-21260=>10752,
-21262=>10753,
-21265=>10754,
-21266=>10755,
-21267=>10756,
-21268=>10757,
-21272=>10758,
-21275=>10759,
-21276=>10760,
-21278=>10761,
-21279=>10762,
-21282=>10763,
-21284=>10764,
-21285=>10765,
-21287=>10766,
-21288=>10767,
-21289=>10768,
-21291=>10769,
-21292=>10770,
-21296=>10771,
-21298=>10772,
-21299=>10773,
-21300=>10774,
-21301=>10775,
-21302=>10776,
-21303=>10777,
-12054=>10778,
-21304=>10778,
-21308=>10779,
-21309=>10780,
-21314=>10781,
-21316=>10782,
-21318=>10783,
-21323=>10784,
-21324=>10785,
-21325=>10786,
-21328=>10787,
-21336=>10788,
-21337=>10789,
-21339=>10790,
-21341=>10791,
-21349=>10792,
-21352=>10793,
-21354=>10794,
-21356=>10795,
-21357=>10796,
-21362=>10797,
-21366=>10798,
-21369=>10799,
-21371=>10800,
-21372=>10801,
-21373=>10802,
-21374=>10803,
-21376=>10804,
-21377=>10805,
-21379=>10806,
-21383=>10807,
-21384=>10808,
-21386=>10809,
-21390=>10810,
-21391=>10811,
-21392=>10812,
-21393=>10813,
-21394=>10814,
-21395=>10815,
-21396=>10816,
-21398=>10817,
-21399=>10818,
-21403=>10819,
-21404=>10820,
-21406=>10821,
-21409=>10822,
-21412=>10823,
-21415=>10824,
-21418=>10825,
-21419=>10826,
-21420=>10827,
-21423=>10828,
-21424=>10829,
-21425=>10830,
-21427=>10831,
-21429=>10832,
-21431=>10833,
-21432=>10834,
-21433=>10835,
-21434=>10836,
-21436=>10837,
-21437=>10838,
-21438=>10839,
-21440=>10840,
-21444=>10841,
-21445=>10842,
-21446=>10843,
-21447=>10844,
-21454=>10845,
-21455=>10846,
-21456=>10847,
-21458=>10848,
-21459=>10849,
-21461=>10850,
-21466=>10851,
-21468=>10852,
-21469=>10853,
-21470=>10854,
-21473=>10855,
-21479=>10856,
-21492=>10857,
-21498=>10858,
-21502=>10859,
-21503=>10860,
-21504=>10861,
-21506=>10862,
-21509=>10863,
-21511=>10864,
-21515=>10865,
-21524=>10866,
-21528=>10867,
-21529=>10868,
-21530=>10869,
-21532=>10870,
-21538=>10871,
-21540=>10872,
-21541=>10873,
-21546=>10874,
-21552=>10875,
-21555=>10876,
-21558=>10877,
-21559=>10878,
-21562=>10879,
-21565=>10880,
-21567=>10881,
-21569=>10882,
-21570=>10883,
-21572=>10884,
-21573=>10885,
-21575=>10886,
-21577=>10887,
-21580=>10888,
-21581=>10889,
-21582=>10890,
-21583=>10891,
-21585=>10892,
-21594=>10893,
-21597=>10894,
-21598=>10895,
-21599=>10896,
-21600=>10897,
-21601=>10898,
-21603=>10899,
-21605=>10900,
-21607=>10901,
-21609=>10902,
-21610=>10903,
-21611=>10904,
-21612=>10905,
-21613=>10906,
-21614=>10907,
-21615=>10908,
-21616=>10909,
-21620=>10910,
-21625=>10911,
-21626=>10912,
-21630=>10913,
-21631=>10914,
-21633=>10915,
-21635=>10916,
-21637=>10917,
-21639=>10918,
-21640=>10919,
-21641=>10920,
-21642=>10921,
-21645=>10922,
-21649=>10923,
-21651=>10924,
-21655=>10925,
-21656=>10926,
-21660=>10927,
-21662=>10928,
-21663=>10929,
-21664=>10930,
-21665=>10931,
-21666=>10932,
-21669=>10933,
-21678=>10934,
-21680=>10935,
-21682=>10936,
-21685=>10937,
-21686=>10938,
-21687=>10939,
-21689=>10940,
-21690=>10941,
-21694=>10942,
-21699=>10943,
-21701=>10944,
-21706=>10945,
-21707=>10946,
-21718=>10947,
-21720=>10948,
-21723=>10949,
-21728=>10950,
-21730=>10951,
-21731=>10952,
-21732=>10953,
-21739=>10954,
-21740=>10955,
-21743=>10956,
-21744=>10957,
-21745=>10958,
-21748=>10959,
-21749=>10960,
-21750=>10961,
-21751=>10962,
-21752=>10963,
-21753=>10964,
-21755=>10965,
-21758=>10966,
-21760=>10967,
-21762=>10968,
-21763=>10969,
-21765=>10970,
-21768=>10971,
-21770=>10972,
-21771=>10973,
-21772=>10974,
-21773=>10975,
-21774=>10976,
-21778=>10977,
-21779=>10978,
-21781=>10979,
-21782=>10980,
-21783=>10981,
-21784=>10982,
-21785=>10983,
-21786=>10984,
-21788=>10985,
-21789=>10986,
-21790=>10987,
-21791=>10988,
-21793=>10989,
-21797=>10990,
-21798=>10991,
-21800=>10992,
-21801=>10993,
-21803=>10994,
-21805=>10995,
-21810=>10996,
-21812=>10997,
-21813=>10998,
-21814=>10999,
-21816=>11000,
-21817=>11001,
-21818=>11002,
-21819=>11003,
-21821=>11004,
-21824=>11005,
-21826=>11006,
-21829=>11007,
-21831=>11008,
-21832=>11009,
-21835=>11010,
-21836=>11011,
-21837=>11012,
-21838=>11013,
-21841=>11014,
-21842=>11015,
-21844=>11016,
-21847=>11017,
-21848=>11018,
-21849=>11019,
-21850=>11020,
-21851=>11021,
-21853=>11022,
-21855=>11023,
-21856=>11024,
-21858=>11025,
-21859=>11026,
-21864=>11027,
-21865=>11028,
-21867=>11029,
-21871=>11030,
-21872=>11031,
-21873=>11032,
-21874=>11033,
-21875=>11034,
-21876=>11035,
-21881=>11036,
-21882=>11037,
-21885=>11038,
-21887=>11039,
-21893=>11040,
-21894=>11041,
-21900=>11042,
-21901=>11043,
-21902=>11044,
-21904=>11045,
-21906=>11046,
-21907=>11047,
-21909=>11048,
-21910=>11049,
-21911=>11050,
-21914=>11051,
-21915=>11052,
-21918=>11053,
-21920=>11054,
-21921=>11055,
-21922=>11056,
-21923=>11057,
-21924=>11058,
-21925=>11059,
-21926=>11060,
-21928=>11061,
-21929=>11062,
-21931=>11063,
-21933=>11064,
-21935=>11065,
-21936=>11066,
-21940=>11067,
-21942=>11068,
-21944=>11069,
-21946=>11070,
-21948=>11071,
-21951=>11072,
-21952=>11073,
-21953=>11074,
-21954=>11075,
-21955=>11076,
-21960=>11077,
-21962=>11078,
-21963=>11079,
-21967=>11080,
-21968=>11081,
-21973=>11082,
-21975=>11083,
-21976=>11084,
-21977=>11085,
-21979=>11086,
-21982=>11087,
-21984=>11088,
-21986=>11089,
-21991=>11090,
-21997=>11091,
-21998=>11092,
-22000=>11093,
-22001=>11094,
-22004=>11095,
-22008=>11096,
-22009=>11097,
-22010=>11098,
-22011=>11099,
-22012=>11100,
-22015=>11101,
-22018=>11102,
-22019=>11103,
-22020=>11104,
-22021=>11105,
-22023=>11106,
-22026=>11107,
-22027=>11108,
-22032=>11109,
-22033=>11110,
-22034=>11111,
-22035=>11112,
-22037=>11113,
-22041=>11114,
-22042=>11115,
-22045=>11116,
-22048=>11117,
-22049=>11118,
-22050=>11119,
-22053=>11120,
-22054=>11121,
-22056=>11122,
-22058=>11123,
-22059=>11124,
-22067=>11125,
-22071=>11126,
-22074=>11127,
-22076=>11128,
-22077=>11129,
-22078=>11130,
-22080=>11131,
-22082=>11132,
-22083=>11133,
-22084=>11134,
-22085=>11135,
-22086=>11136,
-22087=>11137,
-22088=>11138,
-22089=>11139,
-22090=>11140,
-22091=>11141,
-22095=>11142,
-22096=>11143,
-22097=>11144,
-22098=>11145,
-22099=>11146,
-22101=>11147,
-22102=>11148,
-22106=>11149,
-22107=>11150,
-22110=>11151,
-22111=>11152,
-22113=>11153,
-22115=>11154,
-22119=>11155,
-22125=>11156,
-22126=>11157,
-22128=>11158,
-22131=>11159,
-22133=>11160,
-22135=>11161,
-22138=>11162,
-22141=>11163,
-22142=>11164,
-22143=>11165,
-22145=>11166,
-22146=>11167,
-22147=>11168,
-22148=>11169,
-22152=>11170,
-22153=>11171,
-22154=>11172,
-22155=>11173,
-22157=>11174,
-22160=>11175,
-22161=>11176,
-22162=>11177,
-22164=>11178,
-22166=>11179,
-22167=>11180,
-22168=>11181,
-22170=>11182,
-22171=>11183,
-22172=>11184,
-22173=>11185,
-22174=>11186,
-22175=>11187,
-22176=>11188,
-22177=>11189,
-22178=>11190,
-22180=>11191,
-22181=>11192,
-22183=>11193,
-22185=>11194,
-22186=>11195,
-22187=>11196,
-22188=>11197,
-22189=>11198,
-22192=>11199,
-22193=>11200,
-22194=>11201,
-22197=>11202,
-22200=>11203,
-22201=>11204,
-22202=>11205,
-22203=>11206,
-22205=>11207,
-22206=>11208,
-22207=>11209,
-22211=>11210,
-22212=>11211,
-22214=>11212,
-22215=>11213,
-22219=>11214,
-22221=>11215,
-22222=>11216,
-22223=>11217,
-22224=>11218,
-22226=>11219,
-22227=>11220,
-22229=>11221,
-22230=>11222,
-22232=>11223,
-22233=>11224,
-22236=>11225,
-22243=>11226,
-22245=>11227,
-22246=>11228,
-22247=>11229,
-22248=>11230,
-22249=>11231,
-22250=>11232,
-22252=>11233,
-22254=>11234,
-22255=>11235,
-22258=>11236,
-22259=>11237,
-22262=>11238,
-22263=>11239,
-22264=>11240,
-22267=>11241,
-22268=>11242,
-22272=>11243,
-22273=>11244,
-22274=>11245,
-22277=>11246,
-22284=>11247,
-22286=>11248,
-22287=>11249,
-22288=>11250,
-22289=>11251,
-22292=>11252,
-22293=>11253,
-22295=>11254,
-22297=>11255,
-22298=>11256,
-22299=>11257,
-22301=>11258,
-22302=>11259,
-22304=>11260,
-22305=>11261,
-22306=>11262,
-22308=>11263,
-22309=>11264,
-22310=>11265,
-22311=>11266,
-22315=>11267,
-22321=>11268,
-22322=>11269,
-22324=>11270,
-22325=>11271,
-22326=>11272,
-22327=>11273,
-22328=>11274,
-22332=>11275,
-22333=>11276,
-22335=>11277,
-22337=>11278,
-22339=>11279,
-22340=>11280,
-22341=>11281,
-22342=>11282,
-22344=>11283,
-22345=>11284,
-22347=>11285,
-22354=>11286,
-22355=>11287,
-22356=>11288,
-22357=>11289,
-22358=>11290,
-22360=>11291,
-22361=>11292,
-22370=>11293,
-22371=>11294,
-22373=>11295,
-22375=>11296,
-22380=>11297,
-22382=>11298,
-22384=>11299,
-22385=>11300,
-22386=>11301,
-22388=>11302,
-22389=>11303,
-22392=>11304,
-22393=>11305,
-22394=>11306,
-22397=>11307,
-22398=>11308,
-22399=>11309,
-22400=>11310,
-22401=>11311,
-22407=>11312,
-22408=>11313,
-22409=>11314,
-22410=>11315,
-22413=>11316,
-22414=>11317,
-22415=>11318,
-22416=>11319,
-22417=>11320,
-22420=>11321,
-22421=>11322,
-22422=>11323,
-22423=>11324,
-22424=>11325,
-22425=>11326,
-22426=>11327,
-22428=>11328,
-22429=>11329,
-22430=>11330,
-22431=>11331,
-22437=>11332,
-22440=>11333,
-22442=>11334,
-22444=>11335,
-22447=>11336,
-22448=>11337,
-22449=>11338,
-22451=>11339,
-22453=>11340,
-22454=>11341,
-22455=>11342,
-22457=>11343,
-22458=>11344,
-22459=>11345,
-22460=>11346,
-22461=>11347,
-22462=>11348,
-22463=>11349,
-22464=>11350,
-22465=>11351,
-22468=>11352,
-22469=>11353,
-22470=>11354,
-22471=>11355,
-22472=>11356,
-22473=>11357,
-22474=>11358,
-22476=>11359,
-22477=>11360,
-22480=>11361,
-22481=>11362,
-22483=>11363,
-22486=>11364,
-22487=>11365,
-22491=>11366,
-22492=>11367,
-22494=>11368,
-22498=>11369,
-22499=>11370,
-22501=>11371,
-22502=>11372,
-22503=>11373,
-22504=>11374,
-22505=>11375,
-22506=>11376,
-22507=>11377,
-22508=>11378,
-22510=>11379,
-22512=>11380,
-22513=>11381,
-22514=>11382,
-22515=>11383,
-22517=>11384,
-22518=>11385,
-22523=>11386,
-22524=>11387,
-22526=>11388,
-22527=>11389,
-22529=>11390,
-22531=>11391,
-22532=>11392,
-22536=>11393,
-22537=>11394,
-22540=>11395,
-22542=>11396,
-22543=>11397,
-22544=>11398,
-22546=>11399,
-22547=>11400,
-22548=>11401,
-22551=>11402,
-22552=>11403,
-22554=>11404,
-22555=>11405,
-22556=>11406,
-22559=>11407,
-22562=>11408,
-22563=>11409,
-22565=>11410,
-22566=>11411,
-22567=>11412,
-22568=>11413,
-22569=>11414,
-22571=>11415,
-22572=>11416,
-22573=>11417,
-22574=>11418,
-22578=>11419,
-22579=>11420,
-22582=>11421,
-22583=>11422,
-22584=>11423,
-22585=>11424,
-22586=>11425,
-22587=>11426,
-22588=>11427,
-22589=>11428,
-22590=>11429,
-22591=>11430,
-22592=>11431,
-22593=>11432,
-22594=>11433,
-22595=>11434,
-22597=>11435,
-22598=>11436,
-22599=>11437,
-22600=>11438,
-22601=>11439,
-22606=>11440,
-22608=>11441,
-22611=>11442,
-22613=>11443,
-22614=>11444,
-22617=>11445,
-22618=>11446,
-22619=>11447,
-22620=>11448,
-22621=>11449,
-22623=>11450,
-22624=>11451,
-22625=>11452,
-22627=>11453,
-22630=>11454,
-22631=>11455,
-22632=>11456,
-22633=>11457,
-22634=>11458,
-22637=>11459,
-22638=>11460,
-22639=>11461,
-22640=>11462,
-22641=>11463,
-22642=>11464,
-22643=>11465,
-22644=>11466,
-22646=>11467,
-22647=>11468,
-22648=>11469,
-22650=>11470,
-22651=>11471,
-22652=>11472,
-22653=>11473,
-22655=>11474,
-22658=>11475,
-22660=>11476,
-22662=>11477,
-22663=>11478,
-22664=>11479,
-22667=>11480,
-22668=>11481,
-22669=>11482,
-22670=>11483,
-22671=>11484,
-22672=>11485,
-22673=>11486,
-22676=>11487,
-22677=>11488,
-22678=>11489,
-22679=>11490,
-22680=>11491,
-22683=>11492,
-22685=>11493,
-22688=>11494,
-22689=>11495,
-22690=>11496,
-22691=>11497,
-22692=>11498,
-22693=>11499,
-22694=>11500,
-22695=>11501,
-22698=>11502,
-22699=>11503,
-22700=>11504,
-22701=>11505,
-22703=>11506,
-22704=>11507,
-22705=>11508,
-22706=>11509,
-22708=>11510,
-22709=>11511,
-22710=>11512,
-22711=>11513,
-22712=>11514,
-22713=>11515,
-22714=>11516,
-22717=>11517,
-22719=>11518,
-22720=>11519,
-22722=>11520,
-22723=>11521,
-22724=>11522,
-22726=>11523,
-22728=>11524,
-22729=>11525,
-22730=>11526,
-22731=>11527,
-22732=>11528,
-22733=>11529,
-22734=>11530,
-22735=>11531,
-22736=>11532,
-22738=>11533,
-22740=>11534,
-22742=>11535,
-22743=>11536,
-22747=>11537,
-22748=>11538,
-22749=>11539,
-22753=>11540,
-22755=>11541,
-22757=>11542,
-22758=>11543,
-22759=>11544,
-22760=>11545,
-22762=>11546,
-22765=>11547,
-22769=>11548,
-22770=>11549,
-22772=>11550,
-22773=>11551,
-22775=>11552,
-22776=>11553,
-22779=>11554,
-22780=>11555,
-22782=>11556,
-22783=>11557,
-22784=>11558,
-22785=>11559,
-22787=>11560,
-22789=>11561,
-22790=>11562,
-22792=>11563,
-22793=>11564,
-12066=>11565,
-22794=>11565,
-22795=>11566,
-22796=>11567,
-22798=>11568,
-22800=>11569,
-22801=>11570,
-22802=>11571,
-22803=>11572,
-22807=>11573,
-22808=>11574,
-22811=>11575,
-22813=>11576,
-22814=>11577,
-22816=>11578,
-22817=>11579,
-22819=>11580,
-22822=>11581,
-22824=>11582,
-22828=>11583,
-22832=>11584,
-22834=>11585,
-22835=>11586,
-22837=>11587,
-22838=>11588,
-22843=>11589,
-22845=>11590,
-22847=>11591,
-22848=>11592,
-22851=>11593,
-22853=>11594,
-22854=>11595,
-22858=>11596,
-22860=>11597,
-22861=>11598,
-22864=>11599,
-22866=>11600,
-22867=>11601,
-22873=>11602,
-22875=>11603,
-22876=>11604,
-22877=>11605,
-22878=>11606,
-22879=>11607,
-22881=>11608,
-22883=>11609,
-22884=>11610,
-22886=>11611,
-22887=>11612,
-22888=>11613,
-22891=>11614,
-22893=>11615,
-22895=>11616,
-22896=>11617,
-22897=>11618,
-22898=>11619,
-22901=>11620,
-22903=>11621,
-22906=>11622,
-22907=>11623,
-22908=>11624,
-22910=>11625,
-22911=>11626,
-22912=>11627,
-22917=>11628,
-22921=>11629,
-22923=>11630,
-22924=>11631,
-22926=>11632,
-22927=>11633,
-22928=>11634,
-22929=>11635,
-22932=>11636,
-22933=>11637,
-22936=>11638,
-22938=>11639,
-22939=>11640,
-22940=>11641,
-22943=>11642,
-22944=>11643,
-22945=>11644,
-22946=>11645,
-22950=>11646,
-22951=>11647,
-22956=>11648,
-22957=>11649,
-22960=>11650,
-22961=>11651,
-22963=>11652,
-22964=>11653,
-22965=>11654,
-22966=>11655,
-22967=>11656,
-22968=>11657,
-22970=>11658,
-22972=>11659,
-22973=>11660,
-22975=>11661,
-22976=>11662,
-22977=>11663,
-22978=>11664,
-22979=>11665,
-22980=>11666,
-22981=>11667,
-22983=>11668,
-22984=>11669,
-22985=>11670,
-22988=>11671,
-22989=>11672,
-22990=>11673,
-22991=>11674,
-22997=>11675,
-22998=>11676,
-23001=>11677,
-23003=>11678,
-23006=>11679,
-23007=>11680,
-23008=>11681,
-23009=>11682,
-23010=>11683,
-23012=>11684,
-23014=>11685,
-23015=>11686,
-23017=>11687,
-23018=>11688,
-23019=>11689,
-23021=>11690,
-23022=>11691,
-23023=>11692,
-23024=>11693,
-23025=>11694,
-23026=>11695,
-23027=>11696,
-23028=>11697,
-23029=>11698,
-23030=>11699,
-23031=>11700,
-23032=>11701,
-23034=>11702,
-23036=>11703,
-23037=>11704,
-23038=>11705,
-23040=>11706,
-23042=>11707,
-23050=>11708,
-23051=>11709,
-23053=>11710,
-23054=>11711,
-23055=>11712,
-23056=>11713,
-23058=>11714,
-23060=>11715,
-23061=>11716,
-23062=>11717,
-23063=>11718,
-23065=>11719,
-23066=>11720,
-23067=>11721,
-23069=>11722,
-23070=>11723,
-23073=>11724,
-23074=>11725,
-23076=>11726,
-23078=>11727,
-23079=>11728,
-23080=>11729,
-23082=>11730,
-23083=>11731,
-23084=>11732,
-23085=>11733,
-23086=>11734,
-23087=>11735,
-23088=>11736,
-23091=>11737,
-23093=>11738,
-23095=>11739,
-23096=>11740,
-23097=>11741,
-23098=>11742,
-23099=>11743,
-23101=>11744,
-23102=>11745,
-23103=>11746,
-23106=>11747,
-23107=>11748,
-23108=>11749,
-23109=>11750,
-23111=>11751,
-23112=>11752,
-23115=>11753,
-23116=>11754,
-23117=>11755,
-23118=>11756,
-23119=>11757,
-23120=>11758,
-23121=>11759,
-23122=>11760,
-23123=>11761,
-23124=>11762,
-23126=>11763,
-23127=>11764,
-23128=>11765,
-23129=>11766,
-23131=>11767,
-23132=>11768,
-23133=>11769,
-23134=>11770,
-23135=>11771,
-23136=>11772,
-23137=>11773,
-23139=>11774,
-23140=>11775,
-23141=>11776,
-23144=>11777,
-23145=>11778,
-23147=>11779,
-23148=>11780,
-23150=>11781,
-23151=>11782,
-23152=>11783,
-23153=>11784,
-23154=>11785,
-23155=>11786,
-23160=>11787,
-23161=>11788,
-23163=>11789,
-23164=>11790,
-23165=>11791,
-23166=>11792,
-23168=>11793,
-23169=>11794,
-23170=>11795,
-23171=>11796,
-23172=>11797,
-23173=>11798,
-23174=>11799,
-23175=>11800,
-23176=>11801,
-23177=>11802,
-23178=>11803,
-23179=>11804,
-23180=>11805,
-23181=>11806,
-23182=>11807,
-23183=>11808,
-23184=>11809,
-23185=>11810,
-23187=>11811,
-23188=>11812,
-23189=>11813,
-23190=>11814,
-23191=>11815,
-23192=>11816,
-23193=>11817,
-23196=>11818,
-23197=>11819,
-23198=>11820,
-23199=>11821,
-23200=>11822,
-23201=>11823,
-23202=>11824,
-23203=>11825,
-23204=>11826,
-23205=>11827,
-23206=>11828,
-23208=>11829,
-23209=>11830,
-23211=>11831,
-23212=>11832,
-23213=>11833,
-23214=>11834,
-23215=>11835,
-23216=>11836,
-23217=>11837,
-23220=>11838,
-23222=>11839,
-23223=>11840,
-23225=>11841,
-23226=>11842,
-23227=>11843,
-23228=>11844,
-23231=>11845,
-23232=>11846,
-23235=>11847,
-23236=>11848,
-23237=>11849,
-23238=>11850,
-23239=>11851,
-23240=>11852,
-23242=>11853,
-23243=>11854,
-23245=>11855,
-23246=>11856,
-23247=>11857,
-23248=>11858,
-23249=>11859,
-23251=>11860,
-23253=>11861,
-23257=>11862,
-23258=>11863,
-23259=>11864,
-23261=>11865,
-23262=>11866,
-23263=>11867,
-23266=>11868,
-23268=>11869,
-23269=>11870,
-23271=>11871,
-23272=>11872,
-23274=>11873,
-23276=>11874,
-23277=>11875,
-23278=>11876,
-23279=>11877,
-23280=>11878,
-23282=>11879,
-23283=>11880,
-23284=>11881,
-23286=>11882,
-23287=>11883,
-23288=>11884,
-23289=>11885,
-23290=>11886,
-23292=>11887,
-23293=>11888,
-23294=>11889,
-23295=>11890,
-23297=>11891,
-23298=>11892,
-23299=>11893,
-23300=>11894,
-23301=>11895,
-23302=>11896,
-23303=>11897,
-23306=>11898,
-23309=>11899,
-23310=>11900,
-23311=>11901,
-23312=>11902,
-23313=>11903,
-23314=>11904,
-23315=>11905,
-23316=>11906,
-23317=>11907,
-23320=>11908,
-23322=>11909,
-23323=>11910,
-23324=>11911,
-23325=>11912,
-23326=>11913,
-23327=>11914,
-23328=>11915,
-23330=>11916,
-23331=>11917,
-23332=>11918,
-23333=>11919,
-23334=>11920,
-23335=>11921,
-23336=>11922,
-23337=>11923,
-23339=>11924,
-23340=>11925,
-23341=>11926,
-23342=>11927,
-23343=>11928,
-23345=>11929,
-23347=>11930,
-23349=>11931,
-23350=>11932,
-23353=>11933,
-23354=>11934,
-23355=>11935,
-23356=>11936,
-23357=>11937,
-23358=>11938,
-23359=>11939,
-23361=>11940,
-23362=>11941,
-23363=>11942,
-23364=>11943,
-23365=>11944,
-23366=>11945,
-23367=>11946,
-23368=>11947,
-23369=>11948,
-23370=>11949,
-23371=>11950,
-23373=>11951,
-23374=>11952,
-23375=>11953,
-23378=>11954,
-23382=>11955,
-23390=>11956,
-23392=>11957,
-23393=>11958,
-23399=>11959,
-23400=>11960,
-23405=>11961,
-23406=>11962,
-23407=>11963,
-23410=>11964,
-23412=>11965,
-23414=>11966,
-23415=>11967,
-23417=>11968,
-23419=>11969,
-23420=>11970,
-23422=>11971,
-23426=>11972,
-23430=>11973,
-23434=>11974,
-23437=>11975,
-23438=>11976,
-23440=>11977,
-23441=>11978,
-23442=>11979,
-23444=>11980,
-23446=>11981,
-23455=>11982,
-23463=>11983,
-23464=>11984,
-23465=>11985,
-23468=>11986,
-23469=>11987,
-23470=>11988,
-23471=>11989,
-23473=>11990,
-23474=>11991,
-23479=>11992,
-23482=>11993,
-23483=>11994,
-23484=>11995,
-23488=>11996,
-23489=>11997,
-23491=>11998,
-23496=>11999,
-23497=>12000,
-23498=>12001,
-23499=>12002,
-23501=>12003,
-23502=>12004,
-23503=>12005,
-23505=>12006,
-23508=>12007,
-23509=>12008,
-23510=>12009,
-23511=>12010,
-23512=>12011,
-23513=>12012,
-23514=>12013,
-23515=>12014,
-23516=>12015,
-23520=>12016,
-23523=>12017,
-23530=>12018,
-23533=>12019,
-23535=>12020,
-23537=>12021,
-23538=>12022,
-23539=>12023,
-23540=>12024,
-23543=>12025,
-23549=>12026,
-23550=>12027,
-23552=>12028,
-23554=>12029,
-23555=>12030,
-23557=>12031,
-23564=>12032,
-23568=>12033,
-23570=>12034,
-23571=>12035,
-23575=>12036,
-23577=>12037,
-23579=>12038,
-23582=>12039,
-23583=>12040,
-23584=>12041,
-23585=>12042,
-23587=>12043,
-23590=>12044,
-23592=>12045,
-23593=>12046,
-23594=>12047,
-23595=>12048,
-23597=>12049,
-23598=>12050,
-23599=>12051,
-23600=>12052,
-23602=>12053,
-23603=>12054,
-23605=>12055,
-23606=>12056,
-23619=>12057,
-23620=>12058,
-23622=>12059,
-23623=>12060,
-23628=>12061,
-23629=>12062,
-23634=>12063,
-23635=>12064,
-23636=>12065,
-23638=>12066,
-23639=>12067,
-23640=>12068,
-23642=>12069,
-23643=>12070,
-23644=>12071,
-23645=>12072,
-23647=>12073,
-23655=>12074,
-23657=>12075,
-23658=>12076,
-23659=>12077,
-23661=>12078,
-23664=>12079,
-23666=>12080,
-23667=>12081,
-23668=>12082,
-23669=>12083,
-23670=>12084,
-23671=>12085,
-23672=>12086,
-23675=>12087,
-23676=>12088,
-23677=>12089,
-23678=>12090,
-23680=>12091,
-23683=>12092,
-23684=>12093,
-23685=>12094,
-23686=>12095,
-23687=>12096,
-23689=>12097,
-23690=>12098,
-23691=>12099,
-23694=>12100,
-23695=>12101,
-23698=>12102,
-23699=>12103,
-23701=>12104,
-23709=>12105,
-23710=>12106,
-23711=>12107,
-23712=>12108,
-23716=>12109,
-23717=>12110,
-23718=>12111,
-23719=>12112,
-23720=>12113,
-23722=>12114,
-23726=>12115,
-23727=>12116,
-23728=>12117,
-23730=>12118,
-23732=>12119,
-23734=>12120,
-23737=>12121,
-23738=>12122,
-23739=>12123,
-23740=>12124,
-23742=>12125,
-23744=>12126,
-23746=>12127,
-23747=>12128,
-23749=>12129,
-23750=>12130,
-23751=>12131,
-23752=>12132,
-23753=>12133,
-23754=>12134,
-23756=>12135,
-23757=>12136,
-23758=>12137,
-23759=>12138,
-23760=>12139,
-23761=>12140,
-23763=>12141,
-23764=>12142,
-23765=>12143,
-23766=>12144,
-23767=>12145,
-23768=>12146,
-23770=>12147,
-23771=>12148,
-23772=>12149,
-23773=>12150,
-23774=>12151,
-23775=>12152,
-23776=>12153,
-23778=>12154,
-23779=>12155,
-23783=>12156,
-23785=>12157,
-23787=>12158,
-23788=>12159,
-23790=>12160,
-23791=>12161,
-23793=>12162,
-23794=>12163,
-23795=>12164,
-23797=>12165,
-23799=>12166,
-23800=>12167,
-23801=>12168,
-23802=>12169,
-23804=>12170,
-23806=>12171,
-23807=>12172,
-23808=>12173,
-23809=>12174,
-23812=>12175,
-23813=>12176,
-23816=>12177,
-23817=>12178,
-23818=>12179,
-23819=>12180,
-23820=>12181,
-23823=>12182,
-23824=>12183,
-23825=>12184,
-23826=>12185,
-23827=>12186,
-23829=>12187,
-23832=>12188,
-23833=>12189,
-23834=>12190,
-23836=>12191,
-23837=>12192,
-23839=>12193,
-23840=>12194,
-23841=>12195,
-23842=>12196,
-23843=>12197,
-23845=>12198,
-23848=>12199,
-23850=>12200,
-23851=>12201,
-23855=>12202,
-23856=>12203,
-23857=>12204,
-23858=>12205,
-23859=>12206,
-23861=>12207,
-23862=>12208,
-23863=>12209,
-23864=>12210,
-23865=>12211,
-23866=>12212,
-23867=>12213,
-23868=>12214,
-23871=>12215,
-23872=>12216,
-23873=>12217,
-23874=>12218,
-23875=>12219,
-23876=>12220,
-23877=>12221,
-23878=>12222,
-23880=>12223,
-23881=>12224,
-23885=>12225,
-23886=>12226,
-23887=>12227,
-23889=>12228,
-23890=>12229,
-23891=>12230,
-23892=>12231,
-23893=>12232,
-23894=>12233,
-23895=>12234,
-23897=>12235,
-23898=>12236,
-23900=>12237,
-23902=>12238,
-23903=>12239,
-23904=>12240,
-23905=>12241,
-23906=>12242,
-23907=>12243,
-23908=>12244,
-23909=>12245,
-23910=>12246,
-23911=>12247,
-23912=>12248,
-23914=>12249,
-23917=>12250,
-23918=>12251,
-23920=>12252,
-23921=>12253,
-23922=>12254,
-23923=>12255,
-23925=>12256,
-23926=>12257,
-23927=>12258,
-23928=>12259,
-23929=>12260,
-23930=>12261,
-23931=>12262,
-23932=>12263,
-23933=>12264,
-23934=>12265,
-23935=>12266,
-23936=>12267,
-23939=>12268,
-23941=>12269,
-23942=>12270,
-23944=>12271,
-23945=>12272,
-23946=>12273,
-23947=>12274,
-23948=>12275,
-23949=>12276,
-23950=>12277,
-23951=>12278,
-23952=>12279,
-23953=>12280,
-23954=>12281,
-23955=>12282,
-23956=>12283,
-23957=>12284,
-23958=>12285,
-23960=>12286,
-23962=>12287,
-23963=>12288,
-23964=>12289,
-23966=>12290,
-23967=>12291,
-23969=>12292,
-23970=>12293,
-23971=>12294,
-23972=>12295,
-23973=>12296,
-23974=>12297,
-23976=>12298,
-23977=>12299,
-23978=>12300,
-23979=>12301,
-23980=>12302,
-23981=>12303,
-23982=>12304,
-23983=>12305,
-23984=>12306,
-23985=>12307,
-23986=>12308,
-23987=>12309,
-23988=>12310,
-23989=>12311,
-23990=>12312,
-23993=>12313,
-23995=>12314,
-23997=>12315,
-23998=>12316,
-23999=>12317,
-24000=>12318,
-24001=>12319,
-24002=>12320,
-24003=>12321,
-24004=>12322,
-24006=>12323,
-24007=>12324,
-24008=>12325,
-24009=>12326,
-24010=>12327,
-24012=>12328,
-24014=>12329,
-24015=>12330,
-24016=>12331,
-24017=>12332,
-24019=>12333,
-24021=>12334,
-24022=>12335,
-24023=>12336,
-24024=>12337,
-24025=>12338,
-24026=>12339,
-24028=>12340,
-24031=>12341,
-24032=>12342,
-24035=>12343,
-24036=>12344,
-24042=>12345,
-24044=>12346,
-24045=>12347,
-24053=>12348,
-24054=>12349,
-24056=>12350,
-24057=>12351,
-24058=>12352,
-24059=>12353,
-24060=>12354,
-24063=>12355,
-24064=>12356,
-24068=>12357,
-24071=>12358,
-24073=>12359,
-24074=>12360,
-24075=>12361,
-24077=>12362,
-24078=>12363,
-24082=>12364,
-24083=>12365,
-24087=>12366,
-24094=>12367,
-24095=>12368,
-24096=>12369,
-24097=>12370,
-24098=>12371,
-24099=>12372,
-24100=>12373,
-24104=>12374,
-24105=>12375,
-24106=>12376,
-24108=>12377,
-24111=>12378,
-24112=>12379,
-24114=>12380,
-24116=>12381,
-24117=>12382,
-24121=>12383,
-24122=>12384,
-24126=>12385,
-24127=>12386,
-24129=>12387,
-24134=>12388,
-24135=>12389,
-24136=>12390,
-24137=>12391,
-24138=>12392,
-24139=>12393,
-24141=>12394,
-24142=>12395,
-24143=>12396,
-24144=>12397,
-24145=>12398,
-24146=>12399,
-24147=>12400,
-24150=>12401,
-24153=>12402,
-24154=>12403,
-24156=>12404,
-24157=>12405,
-24160=>12406,
-24164=>12407,
-24165=>12408,
-24166=>12409,
-24167=>12410,
-24168=>12411,
-24169=>12412,
-24170=>12413,
-24173=>12414,
-24174=>12415,
-24175=>12416,
-24176=>12417,
-24177=>12418,
-24181=>12419,
-24183=>12420,
-24193=>12421,
-24194=>12422,
-24195=>12423,
-24197=>12424,
-24200=>12425,
-24201=>12426,
-24204=>12427,
-24205=>12428,
-24206=>12429,
-24210=>12430,
-24216=>12431,
-24219=>12432,
-24221=>12433,
-24225=>12434,
-24226=>12435,
-24227=>12436,
-24228=>12437,
-24232=>12438,
-24233=>12439,
-24234=>12440,
-24236=>12441,
-24238=>12442,
-24239=>12443,
-24240=>12444,
-24241=>12445,
-24242=>12446,
-24244=>12447,
-24250=>12448,
-24251=>12449,
-24252=>12450,
-24253=>12451,
-24255=>12452,
-24256=>12453,
-24257=>12454,
-24258=>12455,
-24259=>12456,
-24260=>12457,
-24261=>12458,
-24262=>12459,
-24263=>12460,
-24264=>12461,
-24267=>12462,
-24268=>12463,
-24269=>12464,
-24270=>12465,
-24271=>12466,
-24272=>12467,
-24276=>12468,
-24277=>12469,
-24279=>12470,
-24280=>12471,
-24281=>12472,
-24282=>12473,
-24284=>12474,
-24285=>12475,
-24286=>12476,
-24292=>12477,
-24293=>12478,
-24294=>12479,
-24295=>12480,
-24297=>12481,
-24299=>12482,
-24301=>12483,
-24302=>12484,
-24303=>12485,
-24304=>12486,
-24305=>12487,
-24306=>12488,
-24309=>12489,
-24312=>12490,
-24313=>12491,
-24315=>12492,
-24316=>12493,
-24317=>12494,
-24325=>12495,
-24326=>12496,
-24327=>12497,
-24329=>12498,
-24332=>12499,
-24333=>12500,
-24334=>12501,
-24336=>12502,
-24338=>12503,
-24340=>12504,
-24342=>12505,
-24345=>12506,
-24346=>12507,
-24348=>12508,
-24349=>12509,
-24350=>12510,
-24353=>12511,
-24354=>12512,
-24355=>12513,
-24356=>12514,
-24360=>12515,
-24363=>12516,
-24364=>12517,
-24366=>12518,
-24368=>12519,
-24370=>12520,
-24372=>12521,
-24374=>12522,
-24375=>12523,
-24376=>12524,
-24379=>12525,
-24381=>12526,
-24382=>12527,
-24383=>12528,
-24385=>12529,
-24386=>12530,
-24387=>12531,
-24388=>12532,
-24389=>12533,
-24391=>12534,
-24393=>12535,
-24394=>12536,
-24395=>12537,
-24397=>12538,
-24399=>12539,
-24401=>12540,
-24404=>12541,
-24410=>12542,
-24411=>12543,
-24412=>12544,
-24414=>12545,
-24415=>12546,
-24416=>12547,
-24419=>12548,
-24421=>12549,
-24423=>12550,
-24424=>12551,
-24427=>12552,
-24430=>12553,
-24431=>12554,
-24434=>12555,
-24436=>12556,
-24437=>12557,
-24438=>12558,
-24440=>12559,
-24442=>12560,
-24445=>12561,
-24446=>12562,
-24447=>12563,
-24451=>12564,
-24454=>12565,
-24461=>12566,
-24462=>12567,
-24463=>12568,
-24467=>12569,
-24468=>12570,
-24470=>12571,
-24474=>12572,
-24475=>12573,
-24477=>12574,
-24479=>12575,
-24482=>12576,
-24483=>12577,
-24484=>12578,
-24485=>12579,
-24486=>12580,
-24487=>12581,
-24491=>12582,
-24492=>12583,
-24495=>12584,
-24496=>12585,
-24497=>12586,
-24498=>12587,
-24499=>12588,
-24500=>12589,
-24502=>12590,
-24504=>12591,
-24506=>12592,
-24507=>12593,
-24510=>12594,
-24511=>12595,
-24512=>12596,
-24513=>12597,
-24514=>12598,
-24519=>12599,
-24520=>12600,
-24522=>12601,
-24523=>12602,
-24526=>12603,
-24531=>12604,
-24532=>12605,
-24533=>12606,
-24538=>12607,
-24539=>12608,
-24540=>12609,
-24542=>12610,
-24543=>12611,
-24546=>12612,
-24547=>12613,
-24549=>12614,
-24550=>12615,
-24552=>12616,
-24553=>12617,
-24556=>12618,
-24559=>12619,
-24560=>12620,
-24562=>12621,
-24563=>12622,
-24564=>12623,
-24566=>12624,
-24567=>12625,
-24569=>12626,
-24570=>12627,
-24572=>12628,
-24583=>12629,
-24584=>12630,
-24585=>12631,
-24587=>12632,
-24588=>12633,
-24592=>12634,
-24593=>12635,
-24595=>12636,
-24599=>12637,
-24600=>12638,
-24602=>12639,
-24606=>12640,
-24607=>12641,
-24610=>12642,
-24611=>12643,
-24612=>12644,
-24620=>12645,
-24621=>12646,
-24622=>12647,
-24624=>12648,
-24625=>12649,
-24626=>12650,
-24627=>12651,
-24628=>12652,
-24630=>12653,
-24631=>12654,
-24632=>12655,
-24633=>12656,
-24634=>12657,
-24637=>12658,
-24638=>12659,
-24640=>12660,
-24644=>12661,
-24645=>12662,
-24646=>12663,
-24647=>12664,
-24648=>12665,
-24649=>12666,
-24650=>12667,
-24652=>12668,
-24654=>12669,
-24655=>12670,
-24657=>12671,
-24659=>12672,
-24660=>12673,
-24662=>12674,
-24663=>12675,
-24664=>12676,
-24667=>12677,
-24668=>12678,
-24670=>12679,
-24671=>12680,
-24672=>12681,
-24673=>12682,
-24677=>12683,
-24678=>12684,
-24686=>12685,
-24689=>12686,
-24690=>12687,
-24692=>12688,
-24693=>12689,
-24695=>12690,
-24702=>12691,
-24704=>12692,
-24705=>12693,
-24706=>12694,
-24709=>12695,
-24710=>12696,
-24711=>12697,
-24712=>12698,
-24714=>12699,
-24715=>12700,
-24718=>12701,
-24719=>12702,
-24720=>12703,
-24721=>12704,
-24723=>12705,
-24725=>12706,
-24727=>12707,
-24728=>12708,
-24729=>12709,
-24732=>12710,
-24734=>12711,
-24737=>12712,
-24738=>12713,
-24740=>12714,
-24741=>12715,
-24743=>12716,
-24745=>12717,
-24746=>12718,
-24750=>12719,
-24752=>12720,
-24755=>12721,
-24759=>12722,
-24761=>12723,
-24762=>12724,
-24765=>12725,
-24766=>12726,
-24767=>12727,
-24768=>12728,
-24769=>12729,
-24770=>12730,
-24771=>12731,
-24772=>12732,
-24775=>12733,
-24776=>12734,
-24777=>12735,
-24780=>12736,
-24781=>12737,
-24782=>12738,
-24783=>12739,
-24784=>12740,
-24786=>12741,
-24787=>12742,
-24788=>12743,
-24790=>12744,
-24791=>12745,
-24793=>12746,
-24795=>12747,
-24798=>12748,
-24802=>12749,
-24803=>12750,
-24804=>12751,
-24805=>12752,
-24810=>12753,
-24821=>12754,
-24823=>12755,
-24824=>12756,
-24828=>12757,
-24829=>12758,
-24830=>12759,
-24831=>12760,
-24834=>12761,
-24835=>12762,
-24836=>12763,
-24837=>12764,
-24839=>12765,
-24842=>12766,
-24843=>12767,
-24844=>12768,
-24848=>12769,
-24849=>12770,
-24850=>12771,
-24851=>12772,
-24852=>12773,
-24854=>12774,
-24855=>12775,
-24856=>12776,
-24857=>12777,
-24861=>12778,
-24862=>12779,
-24865=>12780,
-24866=>12781,
-24869=>12782,
-24872=>12783,
-24873=>12784,
-24874=>12785,
-24876=>12786,
-24877=>12787,
-24878=>12788,
-24879=>12789,
-24880=>12790,
-24881=>12791,
-24882=>12792,
-24883=>12793,
-24885=>12794,
-24886=>12795,
-24888=>12796,
-24889=>12797,
-24890=>12798,
-24891=>12799,
-24892=>12800,
-24893=>12801,
-24896=>12802,
-24897=>12803,
-24898=>12804,
-24899=>12805,
-24900=>12806,
-24901=>12807,
-24902=>12808,
-24903=>12809,
-24905=>12810,
-24909=>12811,
-24911=>12812,
-24912=>12813,
-24914=>12814,
-24915=>12815,
-24916=>12816,
-24918=>12817,
-24919=>12818,
-24921=>12819,
-24923=>12820,
-24924=>12821,
-24926=>12822,
-24928=>12823,
-24929=>12824,
-24933=>12825,
-24934=>12826,
-24937=>12827,
-24940=>12828,
-24941=>12829,
-24943=>12830,
-24945=>12831,
-24946=>12832,
-24948=>12833,
-24952=>12834,
-24953=>12835,
-24954=>12836,
-24955=>12837,
-24956=>12838,
-24957=>12839,
-24958=>12840,
-24959=>12841,
-24960=>12842,
-24961=>12843,
-24963=>12844,
-24964=>12845,
-24965=>12846,
-24966=>12847,
-24967=>12848,
-24968=>12849,
-24969=>12850,
-24972=>12851,
-24973=>12852,
-24975=>12853,
-24979=>12854,
-24981=>12855,
-24982=>12856,
-24983=>12857,
-24984=>12858,
-24985=>12859,
-24987=>12860,
-24988=>12861,
-24990=>12862,
-24991=>12863,
-24992=>12864,
-24993=>12865,
-24994=>12866,
-24995=>12867,
-24997=>12868,
-24998=>12869,
-25002=>12870,
-25005=>12871,
-25007=>12872,
-25008=>12873,
-25009=>12874,
-25011=>12875,
-25012=>12876,
-25013=>12877,
-25016=>12878,
-25017=>12879,
-25018=>12880,
-25019=>12881,
-25020=>12882,
-25021=>12883,
-25023=>12884,
-25024=>12885,
-25025=>12886,
-25027=>12887,
-25028=>12888,
-25029=>12889,
-25030=>12890,
-25037=>12891,
-25038=>12892,
-25039=>12893,
-25040=>12894,
-25043=>12895,
-25045=>12896,
-25046=>12897,
-25047=>12898,
-25048=>12899,
-25049=>12900,
-25050=>12901,
-25051=>12902,
-25052=>12903,
-25053=>12904,
-25056=>12905,
-25057=>12906,
-25058=>12907,
-25060=>12908,
-25061=>12909,
-25063=>12910,
-25065=>12911,
-25066=>12912,
-25067=>12913,
-25068=>12914,
-25069=>12915,
-25070=>12916,
-25071=>12917,
-25072=>12918,
-25073=>12919,
-25075=>12920,
-25076=>12921,
-25081=>12922,
-25083=>12923,
-25085=>12924,
-25089=>12925,
-25090=>12926,
-25091=>12927,
-25092=>12928,
-25093=>12929,
-25097=>12930,
-25107=>12931,
-25113=>12932,
-25116=>12933,
-25117=>12934,
-25118=>12935,
-25120=>12936,
-25123=>12937,
-25126=>12938,
-25128=>12939,
-25129=>12940,
-25131=>12941,
-25133=>12942,
-25135=>12943,
-25137=>12944,
-25141=>12945,
-12094=>12946,
-25142=>12946,
-25144=>12947,
-25145=>12948,
-25146=>12949,
-25147=>12950,
-25148=>12951,
-25154=>12952,
-25156=>12953,
-25157=>12954,
-25158=>12955,
-25162=>12956,
-25167=>12957,
-25168=>12958,
-25173=>12959,
-25174=>12960,
-25175=>12961,
-25177=>12962,
-25178=>12963,
-25180=>12964,
-25181=>12965,
-25182=>12966,
-25183=>12967,
-25184=>12968,
-25185=>12969,
-25186=>12970,
-25188=>12971,
-25189=>12972,
-25192=>12973,
-25201=>12974,
-25202=>12975,
-25204=>12976,
-25205=>12977,
-25207=>12978,
-25208=>12979,
-25210=>12980,
-25211=>12981,
-25213=>12982,
-25217=>12983,
-25218=>12984,
-25219=>12985,
-25221=>12986,
-25222=>12987,
-25223=>12988,
-25224=>12989,
-25227=>12990,
-25228=>12991,
-25229=>12992,
-25230=>12993,
-25231=>12994,
-25232=>12995,
-25236=>12996,
-25241=>12997,
-25244=>12998,
-25245=>12999,
-25246=>13000,
-25251=>13001,
-25254=>13002,
-25255=>13003,
-25257=>13004,
-25258=>13005,
-25261=>13006,
-25262=>13007,
-25263=>13008,
-25264=>13009,
-25266=>13010,
-25267=>13011,
-25268=>13012,
-25270=>13013,
-25271=>13014,
-25272=>13015,
-25274=>13016,
-25278=>13017,
-25280=>13018,
-25281=>13019,
-25283=>13020,
-25291=>13021,
-25295=>13022,
-25297=>13023,
-25301=>13024,
-25309=>13025,
-25310=>13026,
-25312=>13027,
-25313=>13028,
-25316=>13029,
-25322=>13030,
-25323=>13031,
-25328=>13032,
-25330=>13033,
-25333=>13034,
-25336=>13035,
-25337=>13036,
-25338=>13037,
-25339=>13038,
-25344=>13039,
-25347=>13040,
-25348=>13041,
-25349=>13042,
-25350=>13043,
-25354=>13044,
-25355=>13045,
-25356=>13046,
-25357=>13047,
-25359=>13048,
-25360=>13049,
-25362=>13050,
-25363=>13051,
-25364=>13052,
-25365=>13053,
-25367=>13054,
-25368=>13055,
-25369=>13056,
-25372=>13057,
-25382=>13058,
-25383=>13059,
-25385=>13060,
-25388=>13061,
-25389=>13062,
-25390=>13063,
-25392=>13064,
-25393=>13065,
-25395=>13066,
-25396=>13067,
-25397=>13068,
-25398=>13069,
-25399=>13070,
-25400=>13071,
-25403=>13072,
-25404=>13073,
-25407=>13074,
-25408=>13075,
-25409=>13076,
-25412=>13077,
-25415=>13078,
-25416=>13079,
-25418=>13080,
-25425=>13081,
-25426=>13082,
-25427=>13083,
-25428=>13084,
-25430=>13085,
-25431=>13086,
-25432=>13087,
-25433=>13088,
-25434=>13089,
-25435=>13090,
-25436=>13091,
-25437=>13092,
-25440=>13093,
-25444=>13094,
-25445=>13095,
-25446=>13096,
-25450=>13097,
-25452=>13098,
-25455=>13099,
-25456=>13100,
-25459=>13101,
-25460=>13102,
-25461=>13103,
-25464=>13104,
-25465=>13105,
-25468=>13106,
-25469=>13107,
-25470=>13108,
-25471=>13109,
-25473=>13110,
-25477=>13111,
-25478=>13112,
-25483=>13113,
-25485=>13114,
-25489=>13115,
-25491=>13116,
-25492=>13117,
-25493=>13118,
-25495=>13119,
-25497=>13120,
-25498=>13121,
-25499=>13122,
-25500=>13123,
-25501=>13124,
-25502=>13125,
-25503=>13126,
-25505=>13127,
-25508=>13128,
-25510=>13129,
-25515=>13130,
-25519=>13131,
-25521=>13132,
-25522=>13133,
-25525=>13134,
-25526=>13135,
-25529=>13136,
-25531=>13137,
-25533=>13138,
-25535=>13139,
-25537=>13140,
-25538=>13141,
-25539=>13142,
-25541=>13143,
-25543=>13144,
-25544=>13145,
-25546=>13146,
-25547=>13147,
-25548=>13148,
-25553=>13149,
-25555=>13150,
-25556=>13151,
-25557=>13152,
-25559=>13153,
-25560=>13154,
-25561=>13155,
-25563=>13156,
-25564=>13157,
-25565=>13158,
-25567=>13159,
-25570=>13160,
-25572=>13161,
-25573=>13162,
-25574=>13163,
-25575=>13164,
-25576=>13165,
-25579=>13166,
-25580=>13167,
-25583=>13168,
-25584=>13169,
-25585=>13170,
-25587=>13171,
-25589=>13172,
-25591=>13173,
-25593=>13174,
-25594=>13175,
-25595=>13176,
-25596=>13177,
-25598=>13178,
-25603=>13179,
-25604=>13180,
-25606=>13181,
-25607=>13182,
-25608=>13183,
-25609=>13184,
-25610=>13185,
-25614=>13186,
-25617=>13187,
-25618=>13188,
-25621=>13189,
-25622=>13190,
-25624=>13191,
-25625=>13192,
-25626=>13193,
-25629=>13194,
-25631=>13195,
-25634=>13196,
-25635=>13197,
-25636=>13198,
-25637=>13199,
-25639=>13200,
-25640=>13201,
-25641=>13202,
-25643=>13203,
-25646=>13204,
-25647=>13205,
-25648=>13206,
-25649=>13207,
-25650=>13208,
-25651=>13209,
-25653=>13210,
-25655=>13211,
-25656=>13212,
-25657=>13213,
-25659=>13214,
-25660=>13215,
-25662=>13216,
-25664=>13217,
-25666=>13218,
-25667=>13219,
-25673=>13220,
-25675=>13221,
-25676=>13222,
-25677=>13223,
-25678=>13224,
-25679=>13225,
-25680=>13226,
-25683=>13227,
-25685=>13228,
-25686=>13229,
-25687=>13230,
-25689=>13231,
-25690=>13232,
-25691=>13233,
-25693=>13234,
-25696=>13235,
-25697=>13236,
-25698=>13237,
-25699=>13238,
-25700=>13239,
-25701=>13240,
-25702=>13241,
-25704=>13242,
-25706=>13243,
-25707=>13244,
-25708=>13245,
-25710=>13246,
-25712=>13247,
-25713=>13248,
-25714=>13249,
-25716=>13250,
-25717=>13251,
-25719=>13252,
-25724=>13253,
-25725=>13254,
-25726=>13255,
-25727=>13256,
-25728=>13257,
-25729=>13258,
-25731=>13259,
-25734=>13260,
-25737=>13261,
-25738=>13262,
-25739=>13263,
-25740=>13264,
-25741=>13265,
-25742=>13266,
-25743=>13267,
-25744=>13268,
-25748=>13269,
-25751=>13270,
-25752=>13271,
-25754=>13272,
-25755=>13273,
-25756=>13274,
-25757=>13275,
-25760=>13276,
-25761=>13277,
-25762=>13278,
-25766=>13279,
-25767=>13280,
-25768=>13281,
-25770=>13282,
-25775=>13283,
-25777=>13284,
-25780=>13285,
-25782=>13286,
-25785=>13287,
-25789=>13288,
-25795=>13289,
-25798=>13290,
-25800=>13291,
-25801=>13292,
-25804=>13293,
-25807=>13294,
-25809=>13295,
-25811=>13296,
-25813=>13297,
-25814=>13298,
-25817=>13299,
-25819=>13300,
-25820=>13301,
-25821=>13302,
-25823=>13303,
-25825=>13304,
-25827=>13305,
-25829=>13306,
-25831=>13307,
-25832=>13308,
-25833=>13309,
-25834=>13310,
-25835=>13311,
-25837=>13312,
-25838=>13313,
-25843=>13314,
-25845=>13315,
-25846=>13316,
-25848=>13317,
-25849=>13318,
-25853=>13319,
-25855=>13320,
-25857=>13321,
-25858=>13322,
-25859=>13323,
-25861=>13324,
-25863=>13325,
-25864=>13326,
-25866=>13327,
-25867=>13328,
-25868=>13329,
-25869=>13330,
-25870=>13331,
-25872=>13332,
-25873=>13333,
-25875=>13334,
-25877=>13335,
-25879=>13336,
-25882=>13337,
-25884=>13338,
-25886=>13339,
-25887=>13340,
-25888=>13341,
-25889=>13342,
-25894=>13343,
-25895=>13344,
-25896=>13345,
-25897=>13346,
-25901=>13347,
-25904=>13348,
-25905=>13349,
-25906=>13350,
-25907=>13351,
-25911=>13352,
-25914=>13353,
-25916=>13354,
-25917=>13355,
-25920=>13356,
-25921=>13357,
-25922=>13358,
-25923=>13359,
-25924=>13360,
-25926=>13361,
-25927=>13362,
-25930=>13363,
-25931=>13364,
-25933=>13365,
-25934=>13366,
-25936=>13367,
-25938=>13368,
-25939=>13369,
-25940=>13370,
-25944=>13371,
-25946=>13372,
-25948=>13373,
-25951=>13374,
-25952=>13375,
-25953=>13376,
-25956=>13377,
-25957=>13378,
-25959=>13379,
-25960=>13380,
-25961=>13381,
-25962=>13382,
-25965=>13383,
-25966=>13384,
-25967=>13385,
-25969=>13386,
-25971=>13387,
-25974=>13388,
-25977=>13389,
-25978=>13390,
-25979=>13391,
-25980=>13392,
-25981=>13393,
-25982=>13394,
-25983=>13395,
-25984=>13396,
-25985=>13397,
-25988=>13398,
-25989=>13399,
-25990=>13400,
-25992=>13401,
-25993=>13402,
-25994=>13403,
-25997=>13404,
-25998=>13405,
-25999=>13406,
-26002=>13407,
-26004=>13408,
-26006=>13409,
-26008=>13410,
-26010=>13411,
-26013=>13412,
-26014=>13413,
-26016=>13414,
-26018=>13415,
-26019=>13416,
-26022=>13417,
-26024=>13418,
-26026=>13419,
-26030=>13420,
-26033=>13421,
-26034=>13422,
-26035=>13423,
-26036=>13424,
-26037=>13425,
-26038=>13426,
-26040=>13427,
-26042=>13428,
-26043=>13429,
-26046=>13430,
-26047=>13431,
-26048=>13432,
-26050=>13433,
-26055=>13434,
-26056=>13435,
-26057=>13436,
-26058=>13437,
-26061=>13438,
-26064=>13439,
-26065=>13440,
-26067=>13441,
-26068=>13442,
-26069=>13443,
-26072=>13444,
-26073=>13445,
-26074=>13446,
-26075=>13447,
-26076=>13448,
-26077=>13449,
-26078=>13450,
-26079=>13451,
-26081=>13452,
-26083=>13453,
-26084=>13454,
-26090=>13455,
-26091=>13456,
-26098=>13457,
-26099=>13458,
-26100=>13459,
-26101=>13460,
-26104=>13461,
-26105=>13462,
-26107=>13463,
-26108=>13464,
-26109=>13465,
-26110=>13466,
-26111=>13467,
-26113=>13468,
-26116=>13469,
-26117=>13470,
-26119=>13471,
-26120=>13472,
-26121=>13473,
-26123=>13474,
-26125=>13475,
-26128=>13476,
-26129=>13477,
-26130=>13478,
-26134=>13479,
-26135=>13480,
-26136=>13481,
-26138=>13482,
-26139=>13483,
-26140=>13484,
-26142=>13485,
-26145=>13486,
-26146=>13487,
-26147=>13488,
-26148=>13489,
-26150=>13490,
-26153=>13491,
-26154=>13492,
-26155=>13493,
-26156=>13494,
-26158=>13495,
-26160=>13496,
-26162=>13497,
-26163=>13498,
-26167=>13499,
-26168=>13500,
-26169=>13501,
-26170=>13502,
-26171=>13503,
-26173=>13504,
-26175=>13505,
-26176=>13506,
-26180=>13507,
-26181=>13508,
-26182=>13509,
-26183=>13510,
-26184=>13511,
-26185=>13512,
-26186=>13513,
-26189=>13514,
-26190=>13515,
-26192=>13516,
-26193=>13517,
-26200=>13518,
-26201=>13519,
-26203=>13520,
-26204=>13521,
-26206=>13522,
-26208=>13523,
-26210=>13524,
-26211=>13525,
-26213=>13526,
-26215=>13527,
-26217=>13528,
-26218=>13529,
-26219=>13530,
-26220=>13531,
-26221=>13532,
-26225=>13533,
-26226=>13534,
-26227=>13535,
-26229=>13536,
-26232=>13537,
-26233=>13538,
-26235=>13539,
-26236=>13540,
-26237=>13541,
-26239=>13542,
-26240=>13543,
-26241=>13544,
-26243=>13545,
-26245=>13546,
-26246=>13547,
-26250=>13548,
-26251=>13549,
-26253=>13550,
-26254=>13551,
-26255=>13552,
-26256=>13553,
-26258=>13554,
-26259=>13555,
-26260=>13556,
-26261=>13557,
-26264=>13558,
-26265=>13559,
-26266=>13560,
-26267=>13561,
-26268=>13562,
-26270=>13563,
-26271=>13564,
-26272=>13565,
-26273=>13566,
-26275=>13567,
-26276=>13568,
-26277=>13569,
-26278=>13570,
-26281=>13571,
-26282=>13572,
-26284=>13573,
-26285=>13574,
-26287=>13575,
-26288=>13576,
-26289=>13577,
-26290=>13578,
-26291=>13579,
-26293=>13580,
-26294=>13581,
-26295=>13582,
-26296=>13583,
-26298=>13584,
-26299=>13585,
-26300=>13586,
-26301=>13587,
-26303=>13588,
-26304=>13589,
-26305=>13590,
-26306=>13591,
-26307=>13592,
-26309=>13593,
-26312=>13594,
-26314=>13595,
-26315=>13596,
-26316=>13597,
-26317=>13598,
-26318=>13599,
-26319=>13600,
-26320=>13601,
-26321=>13602,
-26322=>13603,
-26323=>13604,
-26324=>13605,
-26325=>13606,
-26327=>13607,
-26328=>13608,
-26330=>13609,
-26334=>13610,
-26335=>13611,
-26337=>13612,
-26338=>13613,
-26339=>13614,
-26340=>13615,
-26341=>13616,
-26343=>13617,
-26344=>13618,
-26346=>13619,
-26347=>13620,
-26349=>13621,
-26350=>13622,
-26351=>13623,
-26353=>13624,
-26357=>13625,
-26358=>13626,
-26362=>13627,
-26363=>13628,
-26365=>13629,
-26369=>13630,
-26370=>13631,
-26372=>13632,
-26373=>13633,
-26374=>13634,
-26375=>13635,
-26380=>13636,
-26382=>13637,
-26383=>13638,
-26385=>13639,
-26386=>13640,
-26387=>13641,
-26390=>13642,
-26392=>13643,
-26393=>13644,
-26394=>13645,
-26396=>13646,
-26398=>13647,
-26400=>13648,
-26401=>13649,
-26402=>13650,
-26403=>13651,
-26404=>13652,
-26405=>13653,
-26409=>13654,
-26414=>13655,
-26416=>13656,
-26418=>13657,
-26419=>13658,
-26422=>13659,
-26423=>13660,
-26424=>13661,
-26425=>13662,
-26427=>13663,
-26428=>13664,
-26430=>13665,
-26431=>13666,
-26433=>13667,
-26436=>13668,
-26437=>13669,
-26439=>13670,
-26442=>13671,
-26443=>13672,
-26445=>13673,
-26450=>13674,
-26452=>13675,
-26453=>13676,
-26455=>13677,
-26456=>13678,
-26457=>13679,
-26458=>13680,
-26459=>13681,
-26461=>13682,
-26466=>13683,
-26467=>13684,
-26468=>13685,
-26470=>13686,
-26471=>13687,
-26475=>13688,
-26476=>13689,
-26478=>13690,
-26484=>13691,
-26486=>13692,
-26488=>13693,
-26489=>13694,
-26490=>13695,
-26491=>13696,
-26493=>13697,
-26496=>13698,
-26498=>13699,
-26499=>13700,
-26501=>13701,
-26502=>13702,
-26504=>13703,
-26506=>13704,
-26508=>13705,
-26509=>13706,
-26510=>13707,
-26511=>13708,
-26513=>13709,
-26514=>13710,
-26515=>13711,
-26516=>13712,
-26518=>13713,
-26521=>13714,
-26523=>13715,
-26527=>13716,
-26528=>13717,
-26529=>13718,
-26532=>13719,
-26534=>13720,
-26537=>13721,
-26540=>13722,
-26542=>13723,
-26545=>13724,
-26546=>13725,
-26548=>13726,
-26553=>13727,
-26554=>13728,
-26555=>13729,
-26556=>13730,
-26557=>13731,
-26558=>13732,
-26559=>13733,
-26560=>13734,
-26562=>13735,
-26565=>13736,
-26566=>13737,
-26567=>13738,
-26568=>13739,
-26569=>13740,
-26570=>13741,
-26571=>13742,
-26572=>13743,
-26573=>13744,
-26574=>13745,
-26581=>13746,
-26582=>13747,
-26583=>13748,
-26587=>13749,
-26591=>13750,
-26593=>13751,
-26595=>13752,
-26596=>13753,
-26598=>13754,
-26599=>13755,
-26600=>13756,
-26602=>13757,
-26603=>13758,
-26605=>13759,
-26606=>13760,
-26610=>13761,
-26613=>13762,
-26614=>13763,
-26615=>13764,
-26616=>13765,
-26617=>13766,
-26618=>13767,
-26619=>13768,
-26620=>13769,
-26622=>13770,
-26625=>13771,
-26626=>13772,
-26627=>13773,
-26628=>13774,
-26630=>13775,
-26637=>13776,
-26640=>13777,
-26642=>13778,
-26644=>13779,
-26645=>13780,
-26648=>13781,
-26649=>13782,
-26650=>13783,
-26651=>13784,
-26652=>13785,
-26654=>13786,
-26655=>13787,
-26656=>13788,
-26658=>13789,
-26659=>13790,
-26660=>13791,
-26661=>13792,
-26662=>13793,
-26663=>13794,
-26664=>13795,
-26667=>13796,
-26668=>13797,
-26669=>13798,
-26670=>13799,
-26671=>13800,
-26672=>13801,
-26673=>13802,
-26676=>13803,
-26677=>13804,
-26678=>13805,
-26682=>13806,
-26683=>13807,
-26687=>13808,
-26695=>13809,
-26699=>13810,
-26701=>13811,
-26703=>13812,
-26706=>13813,
-26710=>13814,
-26711=>13815,
-26712=>13816,
-26713=>13817,
-26714=>13818,
-26715=>13819,
-26716=>13820,
-26717=>13821,
-26718=>13822,
-26719=>13823,
-26730=>13824,
-26732=>13825,
-26733=>13826,
-26734=>13827,
-26735=>13828,
-26736=>13829,
-26737=>13830,
-26738=>13831,
-26739=>13832,
-26741=>13833,
-26744=>13834,
-26745=>13835,
-26746=>13836,
-26747=>13837,
-26748=>13838,
-26749=>13839,
-26750=>13840,
-26751=>13841,
-26752=>13842,
-26754=>13843,
-26756=>13844,
-26759=>13845,
-26760=>13846,
-26761=>13847,
-26762=>13848,
-26763=>13849,
-26764=>13850,
-26765=>13851,
-26766=>13852,
-26768=>13853,
-26769=>13854,
-26770=>13855,
-26772=>13856,
-26773=>13857,
-26774=>13858,
-26777=>13859,
-26778=>13860,
-26779=>13861,
-26780=>13862,
-26782=>13863,
-26784=>13864,
-26785=>13865,
-26787=>13866,
-26788=>13867,
-26789=>13868,
-26793=>13869,
-26794=>13870,
-26795=>13871,
-26796=>13872,
-26798=>13873,
-26801=>13874,
-26802=>13875,
-26804=>13876,
-26806=>13877,
-26807=>13878,
-26808=>13879,
-26809=>13880,
-26810=>13881,
-26811=>13882,
-26812=>13883,
-26813=>13884,
-26814=>13885,
-26815=>13886,
-26817=>13887,
-26819=>13888,
-26820=>13889,
-26821=>13890,
-26822=>13891,
-26823=>13892,
-26824=>13893,
-26826=>13894,
-26828=>13895,
-26830=>13896,
-26831=>13897,
-26832=>13898,
-26833=>13899,
-26835=>13900,
-26836=>13901,
-26841=>13902,
-26843=>13903,
-26844=>13904,
-26845=>13905,
-26846=>13906,
-26849=>13907,
-26850=>13908,
-26852=>13909,
-26853=>13910,
-26854=>13911,
-26856=>13912,
-26857=>13913,
-26858=>13914,
-26859=>13915,
-26860=>13916,
-26861=>13917,
-26863=>13918,
-26866=>13919,
-26867=>13920,
-26868=>13921,
-26870=>13922,
-26871=>13923,
-26872=>13924,
-26875=>13925,
-26877=>13926,
-26878=>13927,
-26879=>13928,
-26880=>13929,
-26882=>13930,
-26883=>13931,
-26884=>13932,
-26886=>13933,
-26887=>13934,
-26888=>13935,
-26889=>13936,
-26890=>13937,
-26892=>13938,
-26897=>13939,
-26899=>13940,
-26900=>13941,
-26901=>13942,
-26902=>13943,
-26903=>13944,
-26904=>13945,
-26905=>13946,
-26906=>13947,
-26907=>13948,
-26908=>13949,
-26909=>13950,
-26910=>13951,
-26913=>13952,
-26914=>13953,
-26915=>13954,
-26917=>13955,
-26918=>13956,
-26919=>13957,
-26920=>13958,
-26921=>13959,
-26922=>13960,
-26923=>13961,
-26924=>13962,
-26926=>13963,
-26927=>13964,
-26929=>13965,
-26930=>13966,
-26931=>13967,
-26933=>13968,
-26934=>13969,
-26935=>13970,
-26936=>13971,
-26938=>13972,
-26939=>13973,
-26940=>13974,
-26942=>13975,
-26944=>13976,
-26945=>13977,
-26947=>13978,
-26948=>13979,
-26949=>13980,
-26950=>13981,
-26951=>13982,
-26952=>13983,
-26953=>13984,
-26955=>13985,
-26956=>13986,
-26957=>13987,
-26958=>13988,
-26959=>13989,
-26960=>13990,
-26961=>13991,
-26962=>13992,
-26965=>13993,
-26966=>13994,
-26968=>13995,
-26969=>13996,
-26971=>13997,
-26972=>13998,
-26975=>13999,
-26977=>14000,
-26978=>14001,
-26980=>14002,
-26981=>14003,
-26983=>14004,
-26985=>14005,
-26986=>14006,
-26988=>14007,
-26991=>14008,
-26992=>14009,
-26994=>14010,
-26995=>14011,
-26996=>14012,
-26998=>14013,
-27002=>14014,
-27003=>14015,
-27005=>14016,
-27006=>14017,
-27007=>14018,
-27009=>14019,
-27011=>14020,
-27013=>14021,
-27018=>14022,
-27019=>14023,
-27020=>14024,
-27022=>14025,
-27023=>14026,
-27024=>14027,
-27025=>14028,
-27026=>14029,
-27027=>14030,
-27030=>14031,
-27031=>14032,
-27033=>14033,
-27034=>14034,
-27037=>14035,
-27038=>14036,
-27039=>14037,
-27040=>14038,
-27041=>14039,
-27042=>14040,
-27043=>14041,
-27044=>14042,
-27045=>14043,
-27046=>14044,
-27049=>14045,
-27052=>14046,
-27055=>14047,
-27056=>14048,
-27058=>14049,
-27059=>14050,
-27061=>14051,
-27062=>14052,
-27064=>14053,
-27065=>14054,
-27066=>14055,
-27068=>14056,
-27069=>14057,
-27070=>14058,
-27072=>14059,
-27074=>14060,
-27075=>14061,
-27076=>14062,
-27077=>14063,
-27078=>14064,
-27079=>14065,
-27080=>14066,
-27081=>14067,
-27087=>14068,
-27089=>14069,
-27090=>14070,
-27091=>14071,
-27093=>14072,
-27094=>14073,
-27095=>14074,
-27096=>14075,
-27097=>14076,
-27098=>14077,
-27100=>14078,
-27101=>14079,
-27102=>14080,
-27105=>14081,
-27106=>14082,
-27107=>14083,
-27108=>14084,
-27109=>14085,
-27110=>14086,
-27112=>14087,
-27113=>14088,
-27114=>14089,
-27115=>14090,
-27116=>14091,
-27118=>14092,
-27119=>14093,
-27120=>14094,
-27121=>14095,
-27124=>14096,
-27125=>14097,
-27126=>14098,
-27127=>14099,
-27128=>14100,
-27129=>14101,
-27130=>14102,
-27131=>14103,
-27132=>14104,
-27134=>14105,
-27136=>14106,
-27139=>14107,
-27140=>14108,
-27142=>14109,
-27143=>14110,
-27144=>14111,
-27145=>14112,
-27147=>14113,
-27148=>14114,
-27149=>14115,
-27150=>14116,
-27151=>14117,
-27152=>14118,
-27153=>14119,
-27154=>14120,
-27156=>14121,
-27157=>14122,
-27158=>14123,
-27162=>14124,
-27163=>14125,
-27164=>14126,
-27165=>14127,
-27168=>14128,
-27170=>14129,
-27172=>14130,
-27173=>14131,
-27174=>14132,
-27175=>14133,
-27177=>14134,
-27179=>14135,
-27180=>14136,
-27181=>14137,
-27182=>14138,
-27184=>14139,
-27186=>14140,
-27187=>14141,
-27188=>14142,
-27190=>14143,
-27191=>14144,
-27195=>14145,
-27196=>14146,
-27199=>14147,
-27200=>14148,
-27201=>14149,
-27202=>14150,
-27203=>14151,
-27205=>14152,
-27206=>14153,
-27209=>14154,
-27210=>14155,
-27212=>14156,
-27213=>14157,
-27214=>14158,
-27215=>14159,
-27217=>14160,
-27218=>14161,
-27219=>14162,
-27220=>14163,
-27221=>14164,
-27222=>14165,
-27223=>14166,
-27226=>14167,
-27228=>14168,
-27229=>14169,
-27230=>14170,
-27232=>14171,
-27235=>14172,
-27236=>14173,
-27238=>14174,
-27239=>14175,
-27240=>14176,
-27241=>14177,
-27242=>14178,
-27243=>14179,
-27244=>14180,
-27245=>14181,
-27246=>14182,
-27247=>14183,
-27248=>14184,
-27250=>14185,
-27251=>14186,
-27252=>14187,
-27253=>14188,
-27254=>14189,
-27255=>14190,
-27256=>14191,
-27258=>14192,
-27259=>14193,
-27261=>14194,
-27262=>14195,
-27263=>14196,
-27265=>14197,
-27266=>14198,
-27267=>14199,
-27269=>14200,
-27270=>14201,
-27271=>14202,
-27272=>14203,
-27274=>14204,
-27275=>14205,
-27276=>14206,
-27277=>14207,
-27279=>14208,
-27282=>14209,
-27283=>14210,
-27285=>14211,
-27286=>14212,
-27288=>14213,
-27289=>14214,
-27290=>14215,
-27291=>14216,
-27293=>14217,
-27294=>14218,
-27295=>14219,
-27297=>14220,
-27300=>14221,
-27301=>14222,
-27302=>14223,
-27303=>14224,
-27304=>14225,
-27306=>14226,
-27309=>14227,
-27310=>14228,
-27312=>14229,
-27313=>14230,
-27314=>14231,
-27316=>14232,
-27317=>14233,
-27318=>14234,
-27319=>14235,
-27321=>14236,
-27322=>14237,
-27324=>14238,
-27325=>14239,
-27326=>14240,
-27327=>14241,
-27328=>14242,
-27329=>14243,
-27330=>14244,
-27332=>14245,
-27333=>14246,
-27334=>14247,
-27335=>14248,
-27336=>14249,
-27337=>14250,
-27338=>14251,
-27339=>14252,
-27340=>14253,
-27341=>14254,
-27342=>14255,
-27343=>14256,
-27344=>14257,
-27345=>14258,
-27346=>14259,
-27348=>14260,
-27349=>14261,
-27350=>14262,
-27351=>14263,
-27352=>14264,
-27353=>14265,
-27356=>14266,
-27360=>14267,
-27361=>14268,
-27362=>14269,
-27363=>14270,
-27364=>14271,
-27365=>14272,
-27366=>14273,
-27369=>14274,
-27371=>14275,
-27373=>14276,
-27374=>14277,
-27375=>14278,
-27376=>14279,
-27377=>14280,
-27378=>14281,
-27380=>14282,
-27381=>14283,
-27382=>14284,
-27383=>14285,
-27385=>14286,
-27386=>14287,
-27388=>14288,
-27389=>14289,
-27390=>14290,
-27391=>14291,
-27392=>14292,
-27393=>14293,
-27394=>14294,
-27395=>14295,
-27397=>14296,
-27398=>14297,
-27399=>14298,
-27400=>14299,
-27401=>14300,
-27403=>14301,
-27404=>14302,
-27405=>14303,
-27406=>14304,
-27408=>14305,
-27409=>14306,
-27411=>14307,
-27412=>14308,
-27413=>14309,
-27415=>14310,
-27416=>14311,
-27417=>14312,
-27418=>14313,
-27419=>14314,
-27420=>14315,
-27421=>14316,
-27423=>14317,
-27429=>14318,
-27430=>14319,
-27432=>14320,
-27433=>14321,
-27434=>14322,
-27435=>14323,
-27436=>14324,
-27437=>14325,
-27438=>14326,
-27439=>14327,
-27440=>14328,
-27441=>14329,
-27443=>14330,
-27444=>14331,
-27445=>14332,
-27446=>14333,
-27448=>14334,
-27451=>14335,
-27452=>14336,
-27455=>14337,
-27456=>14338,
-27457=>14339,
-27458=>14340,
-27460=>14341,
-27461=>14342,
-27464=>14343,
-27466=>14344,
-27467=>14345,
-27469=>14346,
-27470=>14347,
-27471=>14348,
-27473=>14349,
-27474=>14350,
-27475=>14351,
-27476=>14352,
-27477=>14353,
-27478=>14354,
-27479=>14355,
-27480=>14356,
-27482=>14357,
-27483=>14358,
-27484=>14359,
-27485=>14360,
-27486=>14361,
-27488=>14362,
-27496=>14363,
-27497=>14364,
-27499=>14365,
-27500=>14366,
-27501=>14367,
-27502=>14368,
-27503=>14369,
-27504=>14370,
-27505=>14371,
-27507=>14372,
-27508=>14373,
-27509=>14374,
-27510=>14375,
-27514=>14376,
-27517=>14377,
-27518=>14378,
-27519=>14379,
-27520=>14380,
-27525=>14381,
-27528=>14382,
-27532=>14383,
-27534=>14384,
-27535=>14385,
-27536=>14386,
-27537=>14387,
-27540=>14388,
-27541=>14389,
-27543=>14390,
-27545=>14391,
-27548=>14392,
-27549=>14393,
-27551=>14394,
-27552=>14395,
-27554=>14396,
-27555=>14397,
-27557=>14398,
-27558=>14399,
-27559=>14400,
-27560=>14401,
-27561=>14402,
-27564=>14403,
-27565=>14404,
-27568=>14405,
-27569=>14406,
-27574=>14407,
-27576=>14408,
-27577=>14409,
-27580=>14410,
-27581=>14411,
-27582=>14412,
-27584=>14413,
-27587=>14414,
-27588=>14415,
-27591=>14416,
-27592=>14417,
-27593=>14418,
-27594=>14419,
-27596=>14420,
-27598=>14421,
-27600=>14422,
-27601=>14423,
-27608=>14424,
-27610=>14425,
-27612=>14426,
-27613=>14427,
-27614=>14428,
-27615=>14429,
-27616=>14430,
-27618=>14431,
-27619=>14432,
-27620=>14433,
-27621=>14434,
-27622=>14435,
-27623=>14436,
-27624=>14437,
-27625=>14438,
-27628=>14439,
-27629=>14440,
-27630=>14441,
-27632=>14442,
-27633=>14443,
-27634=>14444,
-27636=>14445,
-27638=>14446,
-27639=>14447,
-27640=>14448,
-27642=>14449,
-27643=>14450,
-27644=>14451,
-27646=>14452,
-27648=>14453,
-27649=>14454,
-27650=>14455,
-27651=>14456,
-27652=>14457,
-27657=>14458,
-27658=>14459,
-27659=>14460,
-27662=>14461,
-27666=>14462,
-27671=>14463,
-27676=>14464,
-27677=>14465,
-27678=>14466,
-27680=>14467,
-27685=>14468,
-27693=>14469,
-27697=>14470,
-27699=>14471,
-27702=>14472,
-27703=>14473,
-27705=>14474,
-27706=>14475,
-27707=>14476,
-27708=>14477,
-27710=>14478,
-27711=>14479,
-27715=>14480,
-27716=>14481,
-27717=>14482,
-27720=>14483,
-27723=>14484,
-27724=>14485,
-27725=>14486,
-27726=>14487,
-27727=>14488,
-27729=>14489,
-27730=>14490,
-27731=>14491,
-27734=>14492,
-27736=>14493,
-27737=>14494,
-27738=>14495,
-27746=>14496,
-27747=>14497,
-27749=>14498,
-27750=>14499,
-27751=>14500,
-27755=>14501,
-27756=>14502,
-27757=>14503,
-27758=>14504,
-27759=>14505,
-27761=>14506,
-27763=>14507,
-27765=>14508,
-27767=>14509,
-27768=>14510,
-27770=>14511,
-27771=>14512,
-27772=>14513,
-27775=>14514,
-27776=>14515,
-27780=>14516,
-27783=>14517,
-27786=>14518,
-27787=>14519,
-27789=>14520,
-27790=>14521,
-27793=>14522,
-27794=>14523,
-27797=>14524,
-27798=>14525,
-27799=>14526,
-27800=>14527,
-27802=>14528,
-27804=>14529,
-27805=>14530,
-27806=>14531,
-27808=>14532,
-27810=>14533,
-27816=>14534,
-27820=>14535,
-27823=>14536,
-27824=>14537,
-27828=>14538,
-27829=>14539,
-27830=>14540,
-27831=>14541,
-27834=>14542,
-27840=>14543,
-27841=>14544,
-27842=>14545,
-27843=>14546,
-27846=>14547,
-27847=>14548,
-27848=>14549,
-27851=>14550,
-27853=>14551,
-27854=>14552,
-27855=>14553,
-27857=>14554,
-27858=>14555,
-27864=>14556,
-27865=>14557,
-27866=>14558,
-27868=>14559,
-27869=>14560,
-27871=>14561,
-27876=>14562,
-27878=>14563,
-27879=>14564,
-27881=>14565,
-27884=>14566,
-27885=>14567,
-27890=>14568,
-27892=>14569,
-27897=>14570,
-27903=>14571,
-27904=>14572,
-27906=>14573,
-27907=>14574,
-27909=>14575,
-27910=>14576,
-27912=>14577,
-27913=>14578,
-27914=>14579,
-27917=>14580,
-27919=>14581,
-27920=>14582,
-27921=>14583,
-27923=>14584,
-27924=>14585,
-27925=>14586,
-27926=>14587,
-27928=>14588,
-27932=>14589,
-27933=>14590,
-27935=>14591,
-27936=>14592,
-27937=>14593,
-27938=>14594,
-27939=>14595,
-27940=>14596,
-27942=>14597,
-27944=>14598,
-27945=>14599,
-27948=>14600,
-27949=>14601,
-27951=>14602,
-27952=>14603,
-27956=>14604,
-27958=>14605,
-27959=>14606,
-27960=>14607,
-27962=>14608,
-27967=>14609,
-27968=>14610,
-27970=>14611,
-27972=>14612,
-27977=>14613,
-27980=>14614,
-27984=>14615,
-27989=>14616,
-27990=>14617,
-27991=>14618,
-27992=>14619,
-27995=>14620,
-27997=>14621,
-27999=>14622,
-28001=>14623,
-28002=>14624,
-28004=>14625,
-28005=>14626,
-28007=>14627,
-28008=>14628,
-28011=>14629,
-28012=>14630,
-28013=>14631,
-28016=>14632,
-28017=>14633,
-28018=>14634,
-28019=>14635,
-28021=>14636,
-28022=>14637,
-28026=>14638,
-28027=>14639,
-28029=>14640,
-28030=>14641,
-28031=>14642,
-28032=>14643,
-28033=>14644,
-28035=>14645,
-28036=>14646,
-28038=>14647,
-28042=>14648,
-28043=>14649,
-28045=>14650,
-28047=>14651,
-28048=>14652,
-28050=>14653,
-28054=>14654,
-28055=>14655,
-28056=>14656,
-28057=>14657,
-28058=>14658,
-28060=>14659,
-28066=>14660,
-28069=>14661,
-28076=>14662,
-28077=>14663,
-28080=>14664,
-28081=>14665,
-28083=>14666,
-28084=>14667,
-28086=>14668,
-28087=>14669,
-28089=>14670,
-28090=>14671,
-28091=>14672,
-28092=>14673,
-28093=>14674,
-28094=>14675,
-28097=>14676,
-28098=>14677,
-28099=>14678,
-28104=>14679,
-28105=>14680,
-28106=>14681,
-28109=>14682,
-28110=>14683,
-28111=>14684,
-28112=>14685,
-28114=>14686,
-28115=>14687,
-28116=>14688,
-28117=>14689,
-28119=>14690,
-28122=>14691,
-28123=>14692,
-28124=>14693,
-28127=>14694,
-28130=>14695,
-28131=>14696,
-28133=>14697,
-28135=>14698,
-28136=>14699,
-28137=>14700,
-28141=>14701,
-28143=>14702,
-28144=>14703,
-28146=>14704,
-28148=>14705,
-28152=>14706,
-28157=>14707,
-28158=>14708,
-28159=>14709,
-28160=>14710,
-28161=>14711,
-28162=>14712,
-28163=>14713,
-28164=>14714,
-28166=>14715,
-28167=>14716,
-28168=>14717,
-28169=>14718,
-28171=>14719,
-28175=>14720,
-28178=>14721,
-28179=>14722,
-28181=>14723,
-28184=>14724,
-28185=>14725,
-28187=>14726,
-28188=>14727,
-28190=>14728,
-28191=>14729,
-28194=>14730,
-28199=>14731,
-28200=>14732,
-28202=>14733,
-28206=>14734,
-28208=>14735,
-28209=>14736,
-28211=>14737,
-28213=>14738,
-28214=>14739,
-28215=>14740,
-28217=>14741,
-28219=>14742,
-28220=>14743,
-28221=>14744,
-28223=>14745,
-28224=>14746,
-28225=>14747,
-28226=>14748,
-28229=>14749,
-28230=>14750,
-28231=>14751,
-28232=>14752,
-28233=>14753,
-28234=>14754,
-28235=>14755,
-28236=>14756,
-28239=>14757,
-28240=>14758,
-28241=>14759,
-28242=>14760,
-28245=>14761,
-28247=>14762,
-28249=>14763,
-28250=>14764,
-28252=>14765,
-28253=>14766,
-28256=>14767,
-28257=>14768,
-28258=>14769,
-28259=>14770,
-28260=>14771,
-28261=>14772,
-28262=>14773,
-28263=>14774,
-28264=>14775,
-28265=>14776,
-28266=>14777,
-28268=>14778,
-28269=>14779,
-28272=>14780,
-28273=>14781,
-28274=>14782,
-28275=>14783,
-28276=>14784,
-28277=>14785,
-28278=>14786,
-28279=>14787,
-28280=>14788,
-28281=>14789,
-28282=>14790,
-28283=>14791,
-28284=>14792,
-28285=>14793,
-28288=>14794,
-28289=>14795,
-28290=>14796,
-28292=>14797,
-28295=>14798,
-28296=>14799,
-28298=>14800,
-28299=>14801,
-28300=>14802,
-28301=>14803,
-28302=>14804,
-28305=>14805,
-28306=>14806,
-28307=>14807,
-28308=>14808,
-28309=>14809,
-28311=>14810,
-28313=>14811,
-28314=>14812,
-28315=>14813,
-28318=>14814,
-28320=>14815,
-28321=>14816,
-28323=>14817,
-28324=>14818,
-28326=>14819,
-28328=>14820,
-28329=>14821,
-28331=>14822,
-28332=>14823,
-28333=>14824,
-28334=>14825,
-28336=>14826,
-28339=>14827,
-28341=>14828,
-28344=>14829,
-28345=>14830,
-28348=>14831,
-28350=>14832,
-28351=>14833,
-28352=>14834,
-28355=>14835,
-28358=>14836,
-28360=>14837,
-28361=>14838,
-28362=>14839,
-28365=>14840,
-28368=>14841,
-28370=>14842,
-28374=>14843,
-28376=>14844,
-28377=>14845,
-28379=>14846,
-28380=>14847,
-28381=>14848,
-28387=>14849,
-28391=>14850,
-28394=>14851,
-28395=>14852,
-28397=>14853,
-28398=>14854,
-28400=>14855,
-28401=>14856,
-28403=>14857,
-28405=>14858,
-28406=>14859,
-28410=>14860,
-28411=>14861,
-28412=>14862,
-28413=>14863,
-28414=>14864,
-28416=>14865,
-28419=>14866,
-28420=>14867,
-28421=>14868,
-28423=>14869,
-28424=>14870,
-28426=>14871,
-28427=>14872,
-28428=>14873,
-28429=>14874,
-28430=>14875,
-28432=>14876,
-28433=>14877,
-28434=>14878,
-28438=>14879,
-28439=>14880,
-28440=>14881,
-28441=>14882,
-28443=>14883,
-28444=>14884,
-28445=>14885,
-28446=>14886,
-28447=>14887,
-28449=>14888,
-28453=>14889,
-28454=>14890,
-28455=>14891,
-28456=>14892,
-28462=>14893,
-28464=>14894,
-28468=>14895,
-28469=>14896,
-28471=>14897,
-28473=>14898,
-28474=>14899,
-28475=>14900,
-28476=>14901,
-28477=>14902,
-28480=>14903,
-28482=>14904,
-28483=>14905,
-28484=>14906,
-28485=>14907,
-28488=>14908,
-28489=>14909,
-28490=>14910,
-28492=>14911,
-28494=>14912,
-28495=>14913,
-28496=>14914,
-28498=>14915,
-28499=>14916,
-28501=>14917,
-28502=>14918,
-28503=>14919,
-28506=>14920,
-28507=>14921,
-28509=>14922,
-28511=>14923,
-28512=>14924,
-28513=>14925,
-28515=>14926,
-28517=>14927,
-28519=>14928,
-28520=>14929,
-28521=>14930,
-28522=>14931,
-28523=>14932,
-28524=>14933,
-28529=>14934,
-28531=>14935,
-28533=>14936,
-28534=>14937,
-28537=>14938,
-28539=>14939,
-28541=>14940,
-28542=>14941,
-28545=>14942,
-28546=>14943,
-28547=>14944,
-28549=>14945,
-28554=>14946,
-28555=>14947,
-28559=>14948,
-28560=>14949,
-28561=>14950,
-28562=>14951,
-28563=>14952,
-28564=>14953,
-28565=>14954,
-28566=>14955,
-28568=>14956,
-28569=>14957,
-28570=>14958,
-28571=>14959,
-28573=>14960,
-28574=>14961,
-28575=>14962,
-28578=>14963,
-28579=>14964,
-28581=>14965,
-28582=>14966,
-28584=>14967,
-28586=>14968,
-28587=>14969,
-28588=>14970,
-28589=>14971,
-28591=>14972,
-28592=>14973,
-28594=>14974,
-28596=>14975,
-28597=>14976,
-28599=>14977,
-28600=>14978,
-28602=>14979,
-28603=>14980,
-28604=>14981,
-28605=>14982,
-28606=>14983,
-28607=>14984,
-28612=>14985,
-28613=>14986,
-28614=>14987,
-28615=>14988,
-28616=>14989,
-28618=>14990,
-28619=>14991,
-28620=>14992,
-28621=>14993,
-28622=>14994,
-28623=>14995,
-28624=>14996,
-28627=>14997,
-28628=>14998,
-28630=>14999,
-28631=>15000,
-28633=>15001,
-28634=>15002,
-28636=>15003,
-28637=>15004,
-28642=>15005,
-28643=>15006,
-28645=>15007,
-28646=>15008,
-28647=>15009,
-28648=>15010,
-28649=>15011,
-28650=>15012,
-28652=>15013,
-28653=>15014,
-28658=>15015,
-28659=>15016,
-28660=>15017,
-28661=>15018,
-28662=>15019,
-28663=>15020,
-28664=>15021,
-28665=>15022,
-28667=>15023,
-28669=>15024,
-28671=>15025,
-28672=>15026,
-28673=>15027,
-28674=>15028,
-28675=>15029,
-28676=>15030,
-28679=>15031,
-28680=>15032,
-28682=>15033,
-28684=>15034,
-28685=>15035,
-28686=>15036,
-28688=>15037,
-28690=>15038,
-28691=>15039,
-28692=>15040,
-28694=>15041,
-28695=>15042,
-28697=>15043,
-28700=>15044,
-28702=>15045,
-28705=>15046,
-28706=>15047,
-28708=>15048,
-28709=>15049,
-28710=>15050,
-28713=>15051,
-28714=>15052,
-28715=>15053,
-28716=>15054,
-28717=>15055,
-28718=>15056,
-28719=>15057,
-28721=>15058,
-28723=>15059,
-28724=>15060,
-28726=>15061,
-28727=>15062,
-28728=>15063,
-28730=>15064,
-28731=>15065,
-28732=>15066,
-28733=>15067,
-28735=>15068,
-28736=>15069,
-28737=>15070,
-28738=>15071,
-28741=>15072,
-28742=>15073,
-28743=>15074,
-28744=>15075,
-28745=>15076,
-28746=>15077,
-28747=>15078,
-28749=>15079,
-28750=>15080,
-28752=>15081,
-28754=>15082,
-28755=>15083,
-28756=>15084,
-28758=>15085,
-28759=>15086,
-28761=>15087,
-28762=>15088,
-28763=>15089,
-28764=>15090,
-28767=>15091,
-28768=>15092,
-28769=>15093,
-28770=>15094,
-28773=>15095,
-28774=>15096,
-28776=>15097,
-28777=>15098,
-28778=>15099,
-28782=>15100,
-28785=>15101,
-28786=>15102,
-28787=>15103,
-28788=>15104,
-28791=>15105,
-28793=>15106,
-28794=>15107,
-28795=>15108,
-28797=>15109,
-28801=>15110,
-28802=>15111,
-28803=>15112,
-28804=>15113,
-28806=>15114,
-28807=>15115,
-28808=>15116,
-28811=>15117,
-28812=>15118,
-28813=>15119,
-28815=>15120,
-28816=>15121,
-28817=>15122,
-28819=>15123,
-28823=>15124,
-28824=>15125,
-28826=>15126,
-28827=>15127,
-28830=>15128,
-28831=>15129,
-28832=>15130,
-28833=>15131,
-28834=>15132,
-28835=>15133,
-28836=>15134,
-28837=>15135,
-28838=>15136,
-28839=>15137,
-28840=>15138,
-28841=>15139,
-28842=>15140,
-28848=>15141,
-28850=>15142,
-28852=>15143,
-28853=>15144,
-28854=>15145,
-28858=>15146,
-28862=>15147,
-28863=>15148,
-28868=>15149,
-28869=>15150,
-28870=>15151,
-28871=>15152,
-28873=>15153,
-28875=>15154,
-28876=>15155,
-28877=>15156,
-28878=>15157,
-28880=>15158,
-28881=>15159,
-28882=>15160,
-28883=>15161,
-28884=>15162,
-28885=>15163,
-28886=>15164,
-28887=>15165,
-28890=>15166,
-28892=>15167,
-28893=>15168,
-28894=>15169,
-28896=>15170,
-28897=>15171,
-28898=>15172,
-28899=>15173,
-28901=>15174,
-28906=>15175,
-28910=>15176,
-28912=>15177,
-28913=>15178,
-28914=>15179,
-28915=>15180,
-28917=>15181,
-28918=>15182,
-28920=>15183,
-28922=>15184,
-28923=>15185,
-28924=>15186,
-28926=>15187,
-28927=>15188,
-28928=>15189,
-28929=>15190,
-28930=>15191,
-28931=>15192,
-28932=>15193,
-28933=>15194,
-28934=>15195,
-28935=>15196,
-28936=>15197,
-28939=>15198,
-28940=>15199,
-28941=>15200,
-28942=>15201,
-28943=>15202,
-28945=>15203,
-28946=>15204,
-28948=>15205,
-28951=>15206,
-28955=>15207,
-28956=>15208,
-28957=>15209,
-28958=>15210,
-28959=>15211,
-28960=>15212,
-28962=>15213,
-28963=>15214,
-28964=>15215,
-28965=>15216,
-28967=>15217,
-28968=>15218,
-28969=>15219,
-28970=>15220,
-28971=>15221,
-28972=>15222,
-28973=>15223,
-28974=>15224,
-28978=>15225,
-28979=>15226,
-28980=>15227,
-28981=>15228,
-28983=>15229,
-28984=>15230,
-28985=>15231,
-28986=>15232,
-28987=>15233,
-28988=>15234,
-28989=>15235,
-28990=>15236,
-28991=>15237,
-28992=>15238,
-28993=>15239,
-28994=>15240,
-28995=>15241,
-28996=>15242,
-28998=>15243,
-28999=>15244,
-29000=>15245,
-29003=>15246,
-29005=>15247,
-29007=>15248,
-29008=>15249,
-29009=>15250,
-29011=>15251,
-29012=>15252,
-29013=>15253,
-29014=>15254,
-29015=>15255,
-29016=>15256,
-29017=>15257,
-29018=>15258,
-29019=>15259,
-29021=>15260,
-29023=>15261,
-29024=>15262,
-29025=>15263,
-29027=>15264,
-29029=>15265,
-29034=>15266,
-29035=>15267,
-29037=>15268,
-29039=>15269,
-29040=>15270,
-29041=>15271,
-29044=>15272,
-29045=>15273,
-29046=>15274,
-29047=>15275,
-29049=>15276,
-29051=>15277,
-29052=>15278,
-29054=>15279,
-29055=>15280,
-29056=>15281,
-29057=>15282,
-29058=>15283,
-29059=>15284,
-29061=>15285,
-29062=>15286,
-29063=>15287,
-29064=>15288,
-29065=>15289,
-29067=>15290,
-29068=>15291,
-29069=>15292,
-29070=>15293,
-29072=>15294,
-29073=>15295,
-29075=>15296,
-29077=>15297,
-29078=>15298,
-29082=>15299,
-29083=>15300,
-29084=>15301,
-29085=>15302,
-29086=>15303,
-29089=>15304,
-29090=>15305,
-29091=>15306,
-29092=>15307,
-29093=>15308,
-29094=>15309,
-29095=>15310,
-29097=>15311,
-29098=>15312,
-29099=>15313,
-29101=>15314,
-29102=>15315,
-29103=>15316,
-29104=>15317,
-29106=>15318,
-29108=>15319,
-29110=>15320,
-29111=>15321,
-29112=>15322,
-29114=>15323,
-29115=>15324,
-29116=>15325,
-29117=>15326,
-29119=>15327,
-29120=>15328,
-29122=>15329,
-29124=>15330,
-29125=>15331,
-29126=>15332,
-29127=>15333,
-29129=>15334,
-29130=>15335,
-29131=>15336,
-29132=>15337,
-29133=>15338,
-29135=>15339,
-29136=>15340,
-29137=>15341,
-29139=>15342,
-29142=>15343,
-29143=>15344,
-29144=>15345,
-29146=>15346,
-29147=>15347,
-29149=>15348,
-29150=>15349,
-29153=>15350,
-29154=>15351,
-29155=>15352,
-29156=>15353,
-29160=>15354,
-29161=>15355,
-29162=>15356,
-29163=>15357,
-29164=>15358,
-29167=>15359,
-29168=>15360,
-29169=>15361,
-29170=>15362,
-29171=>15363,
-29173=>15364,
-29174=>15365,
-29175=>15366,
-29176=>15367,
-29178=>15368,
-29179=>15369,
-29181=>15370,
-29183=>15371,
-29184=>15372,
-29185=>15373,
-29186=>15374,
-29187=>15375,
-29188=>15376,
-29189=>15377,
-29191=>15378,
-29192=>15379,
-29193=>15380,
-29194=>15381,
-29195=>15382,
-29196=>15383,
-29198=>15384,
-29199=>15385,
-29201=>15386,
-29202=>15387,
-29203=>15388,
-29204=>15389,
-29205=>15390,
-29206=>15391,
-29207=>15392,
-29208=>15393,
-29209=>15394,
-29210=>15395,
-29212=>15396,
-29214=>15397,
-29215=>15398,
-29216=>15399,
-29217=>15400,
-29218=>15401,
-29219=>15402,
-29220=>15403,
-29221=>15404,
-29222=>15405,
-29223=>15406,
-29225=>15407,
-29227=>15408,
-29229=>15409,
-29230=>15410,
-29231=>15411,
-29235=>15412,
-29236=>15413,
-29244=>15414,
-29248=>15415,
-29249=>15416,
-29250=>15417,
-29251=>15418,
-29252=>15419,
-29253=>15420,
-29254=>15421,
-29257=>15422,
-29258=>15423,
-29259=>15424,
-29262=>15425,
-29263=>15426,
-29264=>15427,
-29265=>15428,
-29267=>15429,
-29268=>15430,
-29269=>15431,
-29271=>15432,
-29274=>15433,
-29276=>15434,
-29278=>15435,
-29280=>15436,
-29283=>15437,
-29284=>15438,
-29285=>15439,
-29288=>15440,
-29290=>15441,
-29291=>15442,
-29292=>15443,
-29293=>15444,
-29296=>15445,
-29297=>15446,
-29299=>15447,
-29300=>15448,
-29302=>15449,
-29303=>15450,
-29304=>15451,
-29307=>15452,
-29308=>15453,
-29314=>15454,
-29315=>15455,
-29317=>15456,
-29318=>15457,
-29319=>15458,
-29320=>15459,
-29321=>15460,
-29324=>15461,
-29326=>15462,
-29328=>15463,
-29329=>15464,
-29331=>15465,
-29332=>15466,
-29333=>15467,
-29335=>15468,
-29336=>15469,
-29337=>15470,
-29338=>15471,
-29339=>15472,
-29340=>15473,
-29341=>15474,
-29342=>15475,
-29344=>15476,
-29345=>15477,
-29347=>15478,
-29348=>15479,
-29349=>15480,
-29350=>15481,
-29352=>15482,
-29353=>15483,
-29354=>15484,
-29355=>15485,
-29358=>15486,
-29361=>15487,
-29362=>15488,
-29363=>15489,
-29365=>15490,
-29370=>15491,
-29371=>15492,
-29372=>15493,
-29373=>15494,
-29374=>15495,
-29375=>15496,
-29381=>15497,
-29382=>15498,
-29383=>15499,
-29385=>15500,
-29386=>15501,
-29387=>15502,
-29388=>15503,
-29391=>15504,
-29393=>15505,
-29395=>15506,
-29396=>15507,
-29397=>15508,
-29398=>15509,
-29400=>15510,
-29402=>15511,
-29403=>15512,
-29404=>15513,
-29405=>15514,
-29407=>15515,
-29410=>15516,
-29411=>15517,
-29412=>15518,
-29413=>15519,
-29414=>15520,
-29415=>15521,
-29418=>15522,
-29419=>15523,
-29429=>15524,
-29430=>15525,
-29438=>15526,
-29439=>15527,
-29440=>15528,
-29442=>15529,
-29444=>15530,
-29445=>15531,
-29446=>15532,
-29447=>15533,
-29448=>15534,
-29449=>15535,
-29451=>15536,
-29452=>15537,
-29453=>15538,
-29455=>15539,
-29456=>15540,
-29457=>15541,
-29458=>15542,
-29460=>15543,
-29464=>15544,
-29465=>15545,
-29466=>15546,
-29471=>15547,
-29472=>15548,
-29475=>15549,
-29476=>15550,
-29478=>15551,
-29479=>15552,
-29480=>15553,
-29485=>15554,
-29487=>15555,
-29488=>15556,
-29490=>15557,
-29491=>15558,
-29493=>15559,
-29498=>15560,
-29500=>15561,
-29501=>15562,
-29504=>15563,
-29506=>15564,
-29507=>15565,
-29510=>15566,
-29511=>15567,
-29512=>15568,
-29513=>15569,
-29514=>15570,
-29515=>15571,
-29516=>15572,
-29518=>15573,
-29519=>15574,
-29521=>15575,
-29523=>15576,
-29524=>15577,
-29525=>15578,
-29526=>15579,
-29528=>15580,
-29529=>15581,
-29530=>15582,
-29531=>15583,
-29532=>15584,
-29533=>15585,
-29534=>15586,
-29535=>15587,
-29537=>15588,
-29538=>15589,
-29539=>15590,
-29540=>15591,
-29541=>15592,
-29542=>15593,
-29543=>15594,
-29545=>15595,
-29550=>15596,
-29553=>15597,
-29555=>15598,
-29556=>15599,
-29558=>15600,
-29561=>15601,
-29565=>15602,
-29567=>15603,
-29569=>15604,
-29570=>15605,
-29571=>15606,
-29573=>15607,
-29574=>15608,
-29576=>15609,
-29578=>15610,
-29580=>15611,
-29581=>15612,
-29583=>15613,
-29584=>15614,
-29586=>15615,
-29587=>15616,
-29588=>15617,
-29589=>15618,
-29591=>15619,
-29592=>15620,
-29593=>15621,
-29594=>15622,
-29596=>15623,
-29597=>15624,
-29598=>15625,
-29600=>15626,
-29601=>15627,
-29603=>15628,
-29604=>15629,
-29605=>15630,
-29606=>15631,
-29607=>15632,
-29608=>15633,
-29610=>15634,
-29612=>15635,
-29613=>15636,
-29617=>15637,
-29620=>15638,
-29621=>15639,
-29622=>15640,
-29624=>15641,
-29625=>15642,
-29628=>15643,
-29629=>15644,
-29630=>15645,
-29631=>15646,
-29633=>15647,
-29635=>15648,
-29636=>15649,
-29637=>15650,
-29638=>15651,
-29639=>15652,
-29643=>15653,
-29644=>15654,
-29646=>15655,
-29650=>15656,
-29651=>15657,
-29652=>15658,
-29653=>15659,
-29654=>15660,
-29655=>15661,
-29656=>15662,
-29658=>15663,
-29659=>15664,
-29660=>15665,
-29661=>15666,
-29663=>15667,
-29665=>15668,
-29666=>15669,
-29667=>15670,
-29668=>15671,
-29670=>15672,
-29672=>15673,
-29674=>15674,
-29675=>15675,
-29676=>15676,
-29678=>15677,
-29679=>15678,
-29680=>15679,
-29681=>15680,
-29683=>15681,
-29684=>15682,
-29685=>15683,
-29686=>15684,
-29687=>15685,
-29688=>15686,
-29689=>15687,
-29690=>15688,
-29691=>15689,
-29692=>15690,
-29693=>15691,
-29695=>15692,
-29696=>15693,
-29697=>15694,
-29698=>15695,
-29700=>15696,
-29703=>15697,
-29704=>15698,
-29707=>15699,
-29708=>15700,
-29709=>15701,
-29710=>15702,
-29713=>15703,
-29714=>15704,
-29715=>15705,
-29716=>15706,
-29717=>15707,
-29718=>15708,
-29719=>15709,
-29720=>15710,
-29721=>15711,
-29724=>15712,
-29725=>15713,
-29726=>15714,
-29727=>15715,
-29728=>15716,
-29729=>15717,
-29731=>15718,
-29732=>15719,
-29735=>15720,
-29737=>15721,
-29739=>15722,
-29741=>15723,
-29743=>15724,
-29745=>15725,
-29746=>15726,
-29751=>15727,
-29752=>15728,
-29753=>15729,
-29754=>15730,
-29755=>15731,
-29757=>15732,
-29758=>15733,
-29760=>15734,
-29762=>15735,
-29763=>15736,
-29764=>15737,
-29765=>15738,
-29766=>15739,
-29767=>15740,
-29768=>15741,
-29769=>15742,
-29770=>15743,
-29772=>15744,
-29773=>15745,
-29774=>15746,
-29775=>15747,
-29776=>15748,
-29777=>15749,
-29778=>15750,
-29779=>15751,
-29780=>15752,
-29782=>15753,
-29784=>15754,
-29789=>15755,
-29792=>15756,
-29793=>15757,
-29794=>15758,
-29796=>15759,
-29797=>15760,
-29798=>15761,
-29799=>15762,
-29800=>15763,
-29803=>15764,
-29804=>15765,
-29806=>15766,
-29807=>15767,
-29809=>15768,
-29810=>15769,
-29811=>15770,
-29812=>15771,
-29813=>15772,
-29816=>15773,
-29817=>15774,
-29818=>15775,
-29819=>15776,
-29820=>15777,
-29821=>15778,
-29823=>15779,
-29826=>15780,
-29828=>15781,
-29829=>15782,
-29830=>15783,
-29832=>15784,
-29834=>15785,
-29836=>15786,
-29837=>15787,
-29839=>15788,
-29841=>15789,
-29842=>15790,
-29843=>15791,
-29844=>15792,
-29845=>15793,
-29846=>15794,
-29847=>15795,
-29848=>15796,
-29849=>15797,
-29850=>15798,
-29851=>15799,
-29853=>15800,
-29855=>15801,
-29856=>15802,
-29857=>15803,
-29858=>15804,
-29860=>15805,
-29861=>15806,
-29866=>15807,
-29867=>15808,
-29868=>15809,
-29869=>15810,
-29870=>15811,
-29871=>15812,
-29873=>15813,
-29874=>15814,
-29875=>15815,
-29876=>15816,
-29877=>15817,
-29878=>15818,
-29879=>15819,
-29880=>15820,
-29881=>15821,
-29883=>15822,
-29884=>15823,
-29886=>15824,
-29887=>15825,
-29888=>15826,
-29889=>15827,
-29890=>15828,
-29891=>15829,
-29892=>15830,
-29893=>15831,
-29894=>15832,
-29895=>15833,
-29896=>15834,
-29897=>15835,
-29899=>15836,
-29900=>15837,
-29901=>15838,
-29902=>15839,
-29904=>15840,
-29905=>15841,
-29907=>15842,
-29909=>15843,
-29910=>15844,
-29911=>15845,
-29912=>15846,
-29913=>15847,
-29915=>15848,
-29917=>15849,
-29919=>15850,
-29921=>15851,
-29925=>15852,
-29927=>15853,
-29928=>15854,
-29929=>15855,
-29930=>15856,
-29931=>15857,
-29932=>15858,
-29933=>15859,
-29936=>15860,
-29937=>15861,
-29938=>15862,
-29939=>15863,
-29941=>15864,
-29944=>15865,
-29945=>15866,
-29946=>15867,
-29947=>15868,
-29948=>15869,
-29949=>15870,
-29950=>15871,
-29952=>15872,
-29953=>15873,
-29954=>15874,
-29955=>15875,
-29957=>15876,
-29958=>15877,
-29959=>15878,
-29960=>15879,
-29961=>15880,
-29962=>15881,
-29963=>15882,
-29966=>15883,
-29968=>15884,
-29970=>15885,
-29972=>15886,
-29973=>15887,
-29974=>15888,
-29975=>15889,
-29979=>15890,
-29981=>15891,
-29982=>15892,
-29984=>15893,
-29985=>15894,
-29986=>15895,
-29988=>15896,
-29990=>15897,
-29991=>15898,
-29994=>15899,
-29998=>15900,
-30004=>15901,
-30006=>15902,
-30009=>15903,
-30012=>15904,
-30013=>15905,
-30015=>15906,
-30017=>15907,
-30018=>15908,
-30019=>15909,
-30020=>15910,
-30022=>15911,
-30023=>15912,
-30025=>15913,
-30026=>15914,
-30029=>15915,
-30032=>15916,
-30033=>15917,
-30034=>15918,
-30035=>15919,
-30037=>15920,
-30038=>15921,
-30039=>15922,
-30040=>15923,
-30046=>15924,
-30047=>15925,
-30048=>15926,
-30049=>15927,
-30051=>15928,
-30052=>15929,
-30055=>15930,
-30056=>15931,
-30057=>15932,
-30060=>15933,
-30061=>15934,
-30062=>15935,
-30063=>15936,
-30064=>15937,
-30065=>15938,
-30067=>15939,
-30069=>15940,
-30071=>15941,
-30074=>15942,
-30075=>15943,
-30076=>15944,
-30077=>15945,
-30078=>15946,
-30080=>15947,
-30081=>15948,
-30082=>15949,
-30084=>15950,
-30085=>15951,
-30088=>15952,
-30089=>15953,
-30090=>15954,
-30092=>15955,
-30093=>15956,
-30094=>15957,
-30096=>15958,
-30099=>15959,
-30101=>15960,
-30104=>15961,
-30107=>15962,
-30108=>15963,
-30110=>15964,
-30114=>15965,
-30118=>15966,
-30119=>15967,
-30120=>15968,
-30121=>15969,
-30122=>15970,
-30125=>15971,
-30134=>15972,
-30135=>15973,
-30138=>15974,
-30139=>15975,
-30143=>15976,
-30144=>15977,
-30145=>15978,
-30150=>15979,
-30155=>15980,
-30156=>15981,
-30158=>15982,
-30159=>15983,
-30160=>15984,
-30161=>15985,
-30163=>15986,
-30167=>15987,
-30170=>15988,
-30172=>15989,
-30173=>15990,
-30175=>15991,
-30176=>15992,
-30177=>15993,
-30181=>15994,
-30185=>15995,
-30188=>15996,
-30189=>15997,
-30190=>15998,
-30191=>15999,
-30194=>16000,
-30195=>16001,
-30197=>16002,
-30198=>16003,
-30199=>16004,
-30200=>16005,
-30202=>16006,
-30203=>16007,
-30205=>16008,
-30206=>16009,
-30212=>16010,
-30214=>16011,
-30215=>16012,
-30216=>16013,
-30217=>16014,
-30222=>16015,
-30223=>16016,
-30225=>16017,
-30226=>16018,
-30227=>16019,
-30228=>16020,
-30230=>16021,
-30234=>16022,
-30236=>16023,
-30237=>16024,
-30243=>16025,
-30248=>16026,
-30252=>16027,
-30254=>16028,
-30255=>16029,
-30257=>16030,
-30258=>16031,
-30262=>16032,
-30263=>16033,
-30265=>16034,
-30266=>16035,
-30269=>16036,
-30273=>16037,
-30276=>16038,
-30277=>16039,
-30280=>16040,
-30282=>16041,
-30283=>16042,
-30286=>16043,
-30287=>16044,
-30288=>16045,
-30289=>16046,
-30290=>16047,
-30291=>16048,
-30293=>16049,
-30295=>16050,
-30297=>16051,
-30298=>16052,
-30299=>16053,
-30301=>16054,
-30304=>16055,
-30305=>16056,
-30310=>16057,
-30312=>16058,
-30314=>16059,
-30323=>16060,
-30324=>16061,
-30325=>16062,
-12136=>16063,
-30326=>16063,
-30327=>16064,
-30329=>16065,
-30330=>16066,
-30335=>16067,
-30336=>16068,
-30337=>16069,
-30339=>16070,
-30341=>16071,
-30345=>16072,
-30346=>16073,
-30348=>16074,
-30349=>16075,
-30351=>16076,
-30352=>16077,
-30354=>16078,
-30356=>16079,
-30357=>16080,
-30359=>16081,
-30360=>16082,
-30363=>16083,
-30364=>16084,
-30365=>16085,
-30366=>16086,
-30367=>16087,
-30368=>16088,
-30369=>16089,
-30370=>16090,
-30371=>16091,
-30373=>16092,
-30374=>16093,
-30375=>16094,
-30376=>16095,
-30377=>16096,
-30378=>16097,
-30379=>16098,
-30380=>16099,
-30381=>16100,
-30383=>16101,
-30384=>16102,
-30387=>16103,
-30389=>16104,
-30390=>16105,
-30391=>16106,
-30393=>16107,
-30395=>16108,
-30396=>16109,
-30397=>16110,
-30398=>16111,
-30400=>16112,
-30401=>16113,
-30403=>16114,
-30404=>16115,
-30407=>16116,
-30409=>16117,
-30411=>16118,
-30412=>16119,
-30419=>16120,
-30421=>16121,
-30425=>16122,
-30426=>16123,
-30428=>16124,
-30429=>16125,
-30432=>16126,
-30434=>16127,
-30438=>16128,
-30440=>16129,
-30441=>16130,
-30442=>16131,
-30443=>16132,
-30444=>16133,
-30445=>16134,
-30448=>16135,
-30451=>16136,
-30453=>16137,
-30454=>16138,
-30455=>16139,
-30458=>16140,
-30459=>16141,
-30461=>16142,
-30463=>16143,
-30464=>16144,
-30466=>16145,
-30467=>16146,
-30469=>16147,
-30470=>16148,
-30474=>16149,
-30476=>16150,
-30478=>16151,
-30479=>16152,
-30480=>16153,
-30481=>16154,
-30482=>16155,
-30483=>16156,
-30484=>16157,
-30485=>16158,
-30486=>16159,
-30487=>16160,
-30488=>16161,
-30491=>16162,
-30492=>16163,
-30493=>16164,
-30494=>16165,
-30497=>16166,
-30499=>16167,
-30500=>16168,
-30501=>16169,
-30503=>16170,
-30506=>16171,
-30507=>16172,
-30508=>16173,
-30510=>16174,
-30512=>16175,
-30513=>16176,
-30514=>16177,
-30515=>16178,
-30516=>16179,
-30521=>16180,
-30523=>16181,
-30525=>16182,
-30526=>16183,
-30527=>16184,
-30530=>16185,
-30532=>16186,
-30533=>16187,
-30534=>16188,
-30536=>16189,
-30537=>16190,
-30538=>16191,
-30539=>16192,
-30540=>16193,
-30541=>16194,
-30542=>16195,
-30546=>16196,
-30547=>16197,
-30548=>16198,
-30549=>16199,
-30550=>16200,
-30551=>16201,
-30552=>16202,
-30553=>16203,
-30556=>16204,
-30557=>16205,
-30559=>16206,
-30560=>16207,
-30564=>16208,
-30567=>16209,
-30569=>16210,
-30570=>16211,
-30573=>16212,
-30574=>16213,
-30575=>16214,
-30576=>16215,
-30577=>16216,
-30578=>16217,
-30579=>16218,
-30580=>16219,
-30581=>16220,
-30582=>16221,
-30583=>16222,
-30584=>16223,
-30586=>16224,
-30587=>16225,
-30588=>16226,
-30593=>16227,
-30594=>16228,
-30595=>16229,
-30598=>16230,
-30599=>16231,
-30600=>16232,
-30601=>16233,
-30602=>16234,
-30603=>16235,
-30607=>16236,
-30608=>16237,
-30611=>16238,
-30612=>16239,
-30613=>16240,
-30614=>16241,
-30615=>16242,
-30617=>16243,
-30618=>16244,
-30619=>16245,
-30620=>16246,
-30621=>16247,
-30625=>16248,
-30627=>16249,
-30628=>16250,
-30630=>16251,
-30632=>16252,
-30635=>16253,
-30638=>16254,
-30639=>16255,
-30641=>16256,
-30642=>16257,
-30644=>16258,
-30646=>16259,
-30647=>16260,
-30648=>16261,
-30649=>16262,
-30650=>16263,
-30654=>16264,
-30656=>16265,
-30657=>16266,
-30658=>16267,
-30659=>16268,
-30660=>16269,
-30661=>16270,
-30662=>16271,
-30664=>16272,
-30665=>16273,
-30666=>16274,
-30667=>16275,
-30668=>16276,
-30670=>16277,
-30671=>16278,
-30672=>16279,
-30673=>16280,
-30674=>16281,
-30675=>16282,
-30676=>16283,
-30677=>16284,
-30678=>16285,
-30680=>16286,
-30681=>16287,
-30685=>16288,
-30686=>16289,
-30687=>16290,
-30688=>16291,
-30689=>16292,
-30692=>16293,
-30694=>16294,
-30696=>16295,
-30698=>16296,
-30704=>16297,
-30705=>16298,
-30706=>16299,
-30708=>16300,
-30709=>16301,
-30711=>16302,
-30713=>16303,
-30714=>16304,
-30715=>16305,
-30716=>16306,
-30723=>16307,
-30724=>16308,
-30725=>16309,
-30726=>16310,
-30727=>16311,
-30728=>16312,
-30730=>16313,
-30731=>16314,
-30734=>16315,
-30735=>16316,
-30736=>16317,
-30739=>16318,
-30741=>16319,
-30745=>16320,
-30747=>16321,
-30750=>16322,
-30752=>16323,
-30753=>16324,
-30754=>16325,
-30756=>16326,
-30760=>16327,
-30762=>16328,
-30763=>16329,
-30766=>16330,
-30767=>16331,
-30769=>16332,
-30770=>16333,
-30771=>16334,
-30773=>16335,
-30774=>16336,
-30781=>16337,
-30783=>16338,
-30785=>16339,
-30786=>16340,
-30788=>16341,
-30790=>16342,
-30792=>16343,
-30793=>16344,
-30794=>16345,
-30795=>16346,
-30797=>16347,
-30799=>16348,
-30801=>16349,
-30803=>16350,
-30804=>16351,
-30808=>16352,
-30809=>16353,
-30810=>16354,
-30811=>16355,
-30812=>16356,
-30814=>16357,
-30815=>16358,
-30816=>16359,
-30817=>16360,
-30818=>16361,
-30819=>16362,
-30821=>16363,
-30822=>16364,
-30823=>16365,
-30825=>16366,
-30832=>16367,
-30833=>16368,
-30834=>16369,
-30835=>16370,
-30836=>16371,
-30837=>16372,
-30838=>16373,
-30840=>16374,
-30841=>16375,
-30842=>16376,
-30843=>16377,
-30845=>16378,
-30846=>16379,
-30847=>16380,
-30848=>16381,
-30849=>16382,
-30850=>16383,
-30851=>16384,
-30852=>16385,
-30853=>16386,
-30854=>16387,
-30856=>16388,
-30858=>16389,
-30859=>16390,
-30863=>16391,
-30864=>16392,
-30866=>16393,
-30868=>16394,
-30869=>16395,
-30870=>16396,
-30873=>16397,
-30877=>16398,
-30878=>16399,
-30880=>16400,
-30882=>16401,
-30884=>16402,
-30886=>16403,
-30888=>16404,
-30890=>16405,
-30891=>16406,
-30892=>16407,
-30894=>16408,
-30895=>16409,
-30901=>16410,
-30902=>16411,
-30903=>16412,
-30907=>16413,
-30909=>16414,
-30911=>16415,
-30912=>16416,
-30914=>16417,
-30915=>16418,
-30916=>16419,
-30918=>16420,
-30919=>16421,
-30920=>16422,
-30924=>16423,
-30925=>16424,
-30926=>16425,
-30927=>16426,
-30929=>16427,
-30930=>16428,
-30931=>16429,
-30934=>16430,
-30935=>16431,
-30936=>16432,
-30939=>16433,
-30940=>16434,
-30941=>16435,
-30942=>16436,
-30943=>16437,
-30944=>16438,
-30945=>16439,
-30946=>16440,
-30948=>16441,
-30949=>16442,
-30950=>16443,
-30953=>16444,
-30954=>16445,
-30955=>16446,
-30957=>16447,
-30958=>16448,
-30960=>16449,
-30961=>16450,
-30963=>16451,
-30965=>16452,
-30966=>16453,
-30968=>16454,
-30969=>16455,
-30971=>16456,
-30972=>16457,
-30974=>16458,
-30975=>16459,
-30976=>16460,
-30978=>16461,
-30979=>16462,
-30980=>16463,
-30982=>16464,
-30983=>16465,
-30984=>16466,
-30985=>16467,
-30986=>16468,
-30987=>16469,
-30988=>16470,
-30989=>16471,
-30991=>16472,
-30992=>16473,
-30993=>16474,
-30994=>16475,
-30996=>16476,
-30997=>16477,
-30998=>16478,
-30999=>16479,
-31000=>16480,
-31002=>16481,
-31003=>16482,
-31004=>16483,
-31005=>16484,
-31007=>16485,
-31008=>16486,
-31009=>16487,
-31010=>16488,
-31011=>16489,
-31013=>16490,
-31015=>16491,
-31016=>16492,
-31017=>16493,
-31021=>16494,
-31022=>16495,
-31023=>16496,
-31024=>16497,
-31026=>16498,
-31027=>16499,
-31029=>16500,
-31030=>16501,
-31031=>16502,
-31032=>16503,
-31033=>16504,
-31037=>16505,
-31039=>16506,
-31042=>16507,
-31043=>16508,
-31044=>16509,
-31045=>16510,
-31047=>16511,
-31050=>16512,
-31051=>16513,
-31052=>16514,
-31053=>16515,
-31054=>16516,
-31055=>16517,
-31056=>16518,
-31057=>16519,
-31058=>16520,
-31060=>16521,
-31061=>16522,
-31064=>16523,
-31065=>16524,
-31073=>16525,
-31075=>16526,
-31076=>16527,
-31078=>16528,
-31081=>16529,
-31082=>16530,
-31083=>16531,
-31084=>16532,
-31086=>16533,
-31088=>16534,
-31089=>16535,
-31090=>16536,
-31091=>16537,
-31092=>16538,
-31093=>16539,
-31094=>16540,
-31097=>16541,
-31099=>16542,
-31100=>16543,
-31101=>16544,
-31102=>16545,
-31103=>16546,
-31106=>16547,
-31107=>16548,
-31110=>16549,
-31111=>16550,
-31112=>16551,
-31113=>16552,
-31115=>16553,
-31116=>16554,
-31120=>16555,
-31121=>16556,
-31122=>16557,
-31123=>16558,
-31124=>16559,
-31125=>16560,
-31126=>16561,
-31127=>16562,
-31128=>16563,
-31129=>16564,
-31131=>16565,
-31132=>16566,
-31133=>16567,
-31134=>16568,
-31135=>16569,
-31136=>16570,
-31137=>16571,
-31138=>16572,
-31139=>16573,
-31140=>16574,
-31141=>16575,
-31144=>16576,
-31145=>16577,
-31147=>16578,
-31148=>16579,
-31149=>16580,
-31151=>16581,
-31154=>16582,
-31156=>16583,
-31157=>16584,
-31158=>16585,
-31159=>16586,
-12145=>16587,
-31160=>16587,
-31164=>16588,
-31167=>16589,
-31170=>16590,
-31172=>16591,
-31173=>16592,
-31175=>16593,
-31176=>16594,
-31178=>16595,
-63893=>16595,
-31180=>16596,
-31182=>16597,
-31183=>16598,
-31184=>16599,
-31187=>16600,
-31188=>16601,
-31190=>16602,
-31191=>16603,
-31193=>16604,
-31194=>16605,
-31195=>16606,
-31196=>16607,
-31197=>16608,
-31198=>16609,
-31200=>16610,
-31201=>16611,
-31202=>16612,
-31205=>16613,
-31208=>16614,
-31210=>16615,
-31212=>16616,
-31214=>16617,
-31217=>16618,
-31218=>16619,
-31219=>16620,
-31220=>16621,
-31221=>16622,
-31222=>16623,
-31223=>16624,
-31225=>16625,
-31226=>16626,
-31228=>16627,
-31230=>16628,
-31231=>16629,
-31233=>16630,
-31236=>16631,
-31237=>16632,
-31239=>16633,
-31240=>16634,
-31241=>16635,
-31242=>16636,
-31244=>16637,
-31247=>16638,
-31248=>16639,
-31249=>16640,
-31250=>16641,
-31251=>16642,
-31253=>16643,
-31254=>16644,
-31256=>16645,
-31257=>16646,
-31259=>16647,
-31260=>16648,
-31261=>16649,
-31263=>16650,
-31265=>16651,
-31266=>16652,
-31268=>16653,
-31269=>16654,
-31270=>16655,
-31271=>16656,
-31272=>16657,
-31273=>16658,
-31274=>16659,
-31275=>16660,
-31276=>16661,
-31277=>16662,
-31279=>16663,
-31280=>16664,
-31282=>16665,
-31284=>16666,
-31285=>16667,
-31286=>16668,
-31288=>16669,
-31290=>16670,
-31294=>16671,
-31297=>16672,
-31298=>16673,
-31299=>16674,
-31300=>16675,
-31301=>16676,
-31303=>16677,
-31304=>16678,
-31305=>16679,
-31306=>16680,
-31307=>16681,
-31311=>16682,
-31312=>16683,
-31314=>16684,
-31315=>16685,
-31316=>16686,
-31317=>16687,
-31318=>16688,
-31320=>16689,
-31321=>16690,
-31322=>16691,
-31323=>16692,
-31324=>16693,
-31325=>16694,
-31326=>16695,
-31327=>16696,
-31328=>16697,
-31331=>16698,
-31332=>16699,
-31333=>16700,
-31334=>16701,
-31335=>16702,
-31336=>16703,
-31338=>16704,
-31340=>16705,
-31341=>16706,
-31342=>16707,
-31343=>16708,
-31345=>16709,
-31346=>16710,
-31347=>16711,
-31349=>16712,
-31355=>16713,
-31356=>16714,
-31357=>16715,
-31358=>16716,
-31362=>16717,
-31365=>16718,
-31367=>16719,
-31369=>16720,
-31370=>16721,
-31371=>16722,
-31372=>16723,
-31374=>16724,
-31375=>16725,
-31376=>16726,
-31379=>16727,
-31380=>16728,
-31385=>16729,
-31386=>16730,
-31387=>16731,
-31390=>16732,
-31393=>16733,
-31394=>16734,
-31395=>16735,
-31396=>16736,
-31399=>16737,
-31403=>16738,
-31407=>16739,
-31408=>16740,
-31409=>16741,
-31410=>16742,
-31412=>16743,
-31413=>16744,
-31415=>16745,
-31416=>16746,
-31417=>16747,
-31419=>16748,
-31420=>16749,
-31421=>16750,
-31422=>16751,
-31424=>16752,
-31425=>16753,
-31426=>16754,
-31427=>16755,
-31430=>16756,
-31433=>16757,
-31436=>16758,
-31437=>16759,
-31438=>16760,
-31439=>16761,
-31440=>16762,
-31441=>16763,
-31442=>16764,
-31443=>16765,
-31444=>16766,
-31445=>16767,
-31447=>16768,
-31448=>16769,
-31450=>16770,
-31451=>16771,
-31452=>16772,
-31453=>16773,
-31457=>16774,
-31458=>16775,
-31460=>16776,
-31463=>16777,
-31464=>16778,
-31465=>16779,
-31467=>16780,
-31468=>16781,
-31470=>16782,
-31472=>16783,
-31473=>16784,
-31474=>16785,
-31475=>16786,
-31476=>16787,
-31477=>16788,
-31479=>16789,
-31480=>16790,
-31483=>16791,
-31484=>16792,
-31486=>16793,
-31488=>16794,
-31489=>16795,
-31490=>16796,
-31493=>16797,
-31495=>16798,
-31497=>16799,
-31500=>16800,
-31501=>16801,
-31502=>16802,
-31504=>16803,
-31506=>16804,
-31507=>16805,
-31510=>16806,
-31511=>16807,
-31512=>16808,
-31514=>16809,
-31516=>16810,
-31517=>16811,
-31519=>16812,
-31521=>16813,
-31522=>16814,
-31523=>16815,
-31527=>16816,
-31529=>16817,
-31533=>16818,
-31535=>16819,
-31536=>16820,
-31538=>16821,
-31540=>16822,
-31541=>16823,
-31542=>16824,
-31543=>16825,
-31545=>16826,
-31547=>16827,
-31549=>16828,
-31551=>16829,
-31552=>16830,
-31553=>16831,
-31554=>16832,
-31555=>16833,
-31556=>16834,
-31560=>16835,
-31562=>16836,
-31565=>16837,
-31566=>16838,
-31571=>16839,
-31573=>16840,
-31575=>16841,
-31577=>16842,
-31580=>16843,
-31582=>16844,
-31583=>16845,
-31585=>16846,
-31587=>16847,
-31588=>16848,
-31589=>16849,
-31590=>16850,
-31592=>16851,
-31593=>16852,
-31594=>16853,
-31595=>16854,
-31596=>16855,
-31597=>16856,
-31599=>16857,
-31600=>16858,
-31603=>16859,
-31604=>16860,
-31606=>16861,
-31608=>16862,
-31610=>16863,
-31612=>16864,
-31613=>16865,
-31615=>16866,
-31617=>16867,
-31618=>16868,
-31619=>16869,
-31620=>16870,
-31622=>16871,
-31623=>16872,
-31624=>16873,
-31625=>16874,
-31626=>16875,
-31628=>16876,
-31630=>16877,
-31631=>16878,
-31633=>16879,
-31634=>16880,
-31635=>16881,
-31638=>16882,
-31640=>16883,
-31641=>16884,
-31642=>16885,
-31643=>16886,
-31646=>16887,
-31647=>16888,
-31648=>16889,
-31651=>16890,
-31652=>16891,
-31653=>16892,
-31662=>16893,
-31663=>16894,
-31664=>16895,
-31666=>16896,
-31667=>16897,
-31669=>16898,
-31670=>16899,
-31671=>16900,
-31673=>16901,
-31674=>16902,
-31675=>16903,
-31676=>16904,
-31677=>16905,
-31678=>16906,
-31679=>16907,
-31682=>16908,
-31683=>16909,
-31685=>16910,
-31688=>16911,
-31690=>16912,
-31693=>16913,
-31694=>16914,
-31695=>16915,
-31696=>16916,
-31698=>16917,
-31700=>16918,
-31701=>16919,
-31702=>16920,
-31703=>16921,
-31704=>16922,
-31707=>16923,
-31708=>16924,
-31710=>16925,
-31711=>16926,
-31712=>16927,
-31714=>16928,
-31715=>16929,
-31719=>16930,
-31720=>16931,
-31723=>16932,
-31724=>16933,
-31725=>16934,
-31727=>16935,
-31728=>16936,
-31730=>16937,
-31732=>16938,
-31733=>16939,
-31734=>16940,
-31736=>16941,
-31737=>16942,
-31738=>16943,
-31739=>16944,
-31741=>16945,
-31743=>16946,
-31745=>16947,
-31746=>16948,
-31747=>16949,
-31748=>16950,
-31749=>16951,
-31750=>16952,
-31752=>16953,
-31753=>16954,
-31754=>16955,
-31758=>16956,
-31760=>16957,
-31761=>16958,
-31762=>16959,
-31763=>16960,
-31764=>16961,
-31765=>16962,
-31767=>16963,
-31768=>16964,
-31769=>16965,
-31770=>16966,
-31771=>16967,
-31772=>16968,
-31773=>16969,
-31776=>16970,
-31778=>16971,
-31780=>16972,
-31781=>16973,
-31784=>16974,
-31785=>16975,
-31788=>16976,
-31789=>16977,
-31790=>16978,
-31791=>16979,
-31792=>16980,
-31793=>16981,
-31794=>16982,
-31795=>16983,
-31796=>16984,
-31797=>16985,
-31798=>16986,
-31799=>16987,
-31801=>16988,
-31802=>16989,
-31803=>16990,
-31804=>16991,
-31810=>16992,
-31812=>16993,
-31813=>16994,
-31814=>16995,
-31815=>16996,
-31816=>16997,
-31817=>16998,
-31818=>16999,
-31819=>17000,
-31822=>17001,
-31823=>17002,
-31824=>17003,
-31825=>17004,
-31826=>17005,
-31827=>17006,
-31828=>17007,
-31829=>17008,
-31830=>17009,
-31831=>17010,
-31832=>17011,
-31833=>17012,
-31834=>17013,
-31835=>17014,
-31837=>17015,
-31838=>17016,
-31841=>17017,
-31842=>17018,
-31843=>17019,
-31845=>17020,
-31846=>17021,
-31847=>17022,
-31848=>17023,
-31851=>17024,
-31853=>17025,
-31855=>17026,
-31856=>17027,
-31857=>17028,
-31861=>17029,
-31862=>17030,
-31863=>17031,
-31864=>17032,
-31865=>17033,
-31866=>17034,
-31870=>17035,
-31871=>17036,
-31872=>17037,
-31873=>17038,
-31874=>17039,
-31875=>17040,
-31876=>17041,
-31877=>17042,
-31878=>17043,
-31879=>17044,
-31880=>17045,
-31882=>17046,
-31883=>17047,
-31884=>17048,
-31885=>17049,
-31886=>17050,
-31887=>17051,
-31888=>17052,
-31891=>17053,
-31892=>17054,
-31894=>17055,
-31897=>17056,
-31898=>17057,
-31899=>17058,
-31904=>17059,
-31905=>17060,
-31907=>17061,
-31910=>17062,
-31911=>17063,
-31912=>17064,
-31913=>17065,
-31915=>17066,
-31916=>17067,
-31917=>17068,
-31919=>17069,
-31920=>17070,
-31924=>17071,
-31925=>17072,
-31926=>17073,
-31927=>17074,
-31928=>17075,
-31930=>17076,
-31931=>17077,
-31935=>17078,
-31936=>17079,
-31938=>17080,
-31939=>17081,
-31940=>17082,
-31942=>17083,
-31945=>17084,
-31947=>17085,
-31950=>17086,
-31951=>17087,
-31952=>17088,
-31953=>17089,
-31954=>17090,
-31955=>17091,
-31956=>17092,
-31960=>17093,
-31962=>17094,
-31963=>17095,
-31969=>17096,
-31970=>17097,
-31971=>17098,
-31972=>17099,
-31973=>17100,
-31974=>17101,
-31977=>17102,
-31978=>17103,
-31979=>17104,
-31980=>17105,
-31981=>17106,
-31982=>17107,
-31985=>17108,
-31987=>17109,
-31989=>17110,
-31991=>17111,
-31994=>17112,
-31996=>17113,
-31997=>17114,
-31999=>17115,
-32001=>17116,
-32003=>17117,
-32012=>17118,
-32014=>17119,
-32015=>17120,
-32017=>17121,
-32018=>17122,
-32022=>17123,
-32024=>17124,
-32029=>17125,
-32030=>17126,
-32031=>17127,
-32035=>17128,
-32036=>17129,
-32037=>17130,
-32038=>17131,
-32040=>17132,
-32041=>17133,
-32042=>17134,
-32044=>17135,
-32045=>17136,
-32046=>17137,
-32052=>17138,
-32053=>17139,
-32054=>17140,
-32055=>17141,
-32056=>17142,
-32059=>17143,
-32061=>17144,
-32062=>17145,
-32065=>17146,
-32067=>17147,
-32069=>17148,
-32071=>17149,
-32072=>17150,
-32073=>17151,
-32074=>17152,
-32075=>17153,
-32076=>17154,
-32077=>17155,
-32079=>17156,
-32081=>17157,
-32082=>17158,
-32083=>17159,
-32084=>17160,
-32085=>17161,
-32086=>17162,
-32087=>17163,
-32088=>17164,
-32089=>17165,
-32090=>17166,
-32091=>17167,
-32092=>17168,
-32095=>17169,
-32096=>17170,
-32099=>17171,
-32100=>17172,
-32101=>17173,
-32103=>17174,
-32105=>17175,
-32106=>17176,
-32107=>17177,
-32108=>17178,
-32109=>17179,
-32111=>17180,
-32112=>17181,
-32116=>17182,
-32117=>17183,
-32120=>17184,
-32122=>17185,
-32123=>17186,
-32124=>17187,
-32125=>17188,
-32126=>17189,
-32127=>17190,
-32128=>17191,
-32130=>17192,
-32132=>17193,
-32133=>17194,
-32135=>17195,
-32138=>17196,
-32139=>17197,
-32140=>17198,
-32141=>17199,
-32142=>17200,
-32144=>17201,
-32145=>17202,
-32146=>17203,
-32148=>17204,
-32149=>17205,
-32150=>17206,
-32151=>17207,
-32152=>17208,
-32153=>17209,
-32154=>17210,
-32155=>17211,
-32157=>17212,
-32159=>17213,
-32160=>17214,
-32161=>17215,
-32164=>17216,
-32165=>17217,
-32167=>17218,
-32168=>17219,
-32169=>17220,
-32170=>17221,
-32175=>17222,
-32181=>17223,
-32182=>17224,
-32183=>17225,
-32188=>17226,
-32192=>17227,
-32193=>17228,
-32194=>17229,
-32195=>17230,
-32197=>17231,
-32198=>17232,
-32200=>17233,
-32201=>17234,
-32204=>17235,
-32205=>17236,
-32206=>17237,
-32207=>17238,
-32208=>17239,
-32211=>17240,
-32213=>17241,
-32214=>17242,
-32218=>17243,
-32219=>17244,
-32220=>17245,
-32223=>17246,
-32226=>17247,
-32228=>17248,
-32229=>17249,
-32231=>17250,
-32234=>17251,
-32235=>17252,
-32237=>17253,
-32238=>17254,
-32240=>17255,
-32243=>17256,
-32245=>17257,
-32247=>17258,
-32248=>17259,
-32250=>17260,
-32252=>17261,
-32253=>17262,
-32254=>17263,
-32255=>17264,
-32256=>17265,
-32257=>17266,
-32258=>17267,
-32259=>17268,
-32260=>17269,
-32261=>17270,
-32262=>17271,
-32263=>17272,
-32268=>17273,
-32269=>17274,
-32270=>17275,
-32271=>17276,
-32274=>17277,
-32275=>17278,
-32276=>17279,
-32277=>17280,
-32278=>17281,
-32279=>17282,
-32280=>17283,
-32281=>17284,
-32282=>17285,
-32284=>17286,
-32288=>17287,
-32289=>17288,
-32290=>17289,
-32292=>17290,
-32293=>17291,
-32294=>17292,
-32296=>17293,
-32297=>17294,
-32298=>17295,
-32300=>17296,
-32303=>17297,
-32304=>17298,
-32307=>17299,
-32312=>17300,
-32314=>17301,
-32316=>17302,
-32319=>17303,
-32320=>17304,
-32322=>17305,
-32323=>17306,
-32324=>17307,
-32328=>17308,
-32329=>17309,
-32330=>17310,
-32331=>17311,
-32332=>17312,
-32333=>17313,
-32334=>17314,
-32335=>17315,
-32336=>17316,
-32337=>17317,
-32339=>17318,
-32342=>17319,
-32343=>17320,
-32344=>17321,
-32345=>17322,
-32347=>17323,
-32348=>17324,
-32349=>17325,
-32351=>17326,
-32352=>17327,
-32353=>17328,
-32355=>17329,
-32356=>17330,
-32357=>17331,
-32358=>17332,
-32359=>17333,
-32360=>17334,
-32364=>17335,
-32369=>17336,
-32370=>17337,
-32372=>17338,
-32373=>17339,
-32374=>17340,
-32375=>17341,
-32376=>17342,
-32378=>17343,
-32379=>17344,
-32383=>17345,
-32384=>17346,
-32385=>17347,
-32387=>17348,
-32388=>17349,
-32389=>17350,
-32390=>17351,
-32391=>17352,
-32393=>17353,
-32395=>17354,
-32398=>17355,
-32400=>17356,
-32401=>17357,
-32402=>17358,
-32405=>17359,
-32407=>17360,
-32409=>17361,
-32410=>17362,
-32413=>17363,
-32414=>17364,
-32430=>17365,
-32436=>17366,
-32443=>17367,
-32444=>17368,
-32470=>17369,
-32484=>17370,
-32492=>17371,
-32505=>17372,
-32522=>17373,
-32528=>17374,
-32542=>17375,
-32567=>17376,
-32569=>17377,
-32571=>17378,
-32572=>17379,
-32573=>17380,
-32574=>17381,
-32575=>17382,
-32576=>17383,
-32577=>17384,
-32579=>17385,
-32582=>17386,
-32583=>17387,
-32584=>17388,
-32585=>17389,
-32586=>17390,
-32587=>17391,
-32589=>17392,
-32591=>17393,
-32594=>17394,
-32595=>17395,
-32598=>17396,
-32601=>17397,
-32603=>17398,
-32604=>17399,
-32605=>17400,
-32606=>17401,
-32608=>17402,
-32611=>17403,
-32612=>17404,
-32613=>17405,
-32614=>17406,
-32615=>17407,
-32619=>17408,
-32620=>17409,
-32621=>17410,
-32623=>17411,
-32627=>17412,
-32629=>17413,
-32630=>17414,
-32632=>17415,
-32634=>17416,
-32635=>17417,
-32636=>17418,
-32637=>17419,
-32639=>17420,
-32640=>17421,
-32642=>17422,
-32643=>17423,
-32644=>17424,
-32647=>17425,
-32649=>17426,
-32651=>17427,
-32653=>17428,
-32655=>17429,
-32656=>17430,
-32657=>17431,
-32658=>17432,
-32659=>17433,
-32661=>17434,
-32662=>17435,
-32663=>17436,
-32664=>17437,
-32665=>17438,
-32667=>17439,
-32668=>17440,
-32672=>17441,
-32674=>17442,
-32675=>17443,
-32678=>17444,
-32680=>17445,
-32682=>17446,
-32683=>17447,
-32684=>17448,
-32685=>17449,
-32686=>17450,
-32689=>17451,
-32691=>17452,
-32692=>17453,
-32693=>17454,
-32694=>17455,
-32695=>17456,
-32698=>17457,
-32699=>17458,
-32702=>17459,
-32704=>17460,
-32706=>17461,
-32707=>17462,
-32708=>17463,
-32710=>17464,
-32711=>17465,
-32712=>17466,
-32713=>17467,
-32715=>17468,
-32717=>17469,
-32719=>17470,
-32720=>17471,
-32721=>17472,
-32723=>17473,
-32726=>17474,
-32727=>17475,
-32729=>17476,
-32730=>17477,
-32731=>17478,
-32732=>17479,
-32733=>17480,
-32734=>17481,
-32738=>17482,
-32739=>17483,
-32740=>17484,
-32743=>17485,
-32744=>17486,
-32746=>17487,
-32747=>17488,
-32748=>17489,
-32749=>17490,
-32751=>17491,
-32754=>17492,
-32756=>17493,
-32757=>17494,
-32758=>17495,
-32759=>17496,
-32760=>17497,
-32762=>17498,
-32765=>17499,
-32766=>17500,
-32767=>17501,
-32770=>17502,
-32775=>17503,
-32776=>17504,
-32777=>17505,
-32778=>17506,
-32782=>17507,
-32783=>17508,
-32785=>17509,
-32787=>17510,
-32794=>17511,
-32795=>17512,
-32797=>17513,
-32798=>17514,
-32799=>17515,
-32801=>17516,
-32803=>17517,
-32804=>17518,
-32811=>17519,
-32813=>17520,
-32815=>17521,
-32816=>17522,
-32818=>17523,
-32820=>17524,
-32825=>17525,
-32826=>17526,
-32828=>17527,
-32830=>17528,
-32832=>17529,
-32833=>17530,
-32836=>17531,
-32837=>17532,
-32839=>17533,
-32840=>17534,
-32841=>17535,
-32846=>17536,
-32847=>17537,
-32848=>17538,
-32849=>17539,
-32851=>17540,
-32853=>17541,
-32855=>17542,
-32857=>17543,
-32859=>17544,
-32860=>17545,
-32861=>17546,
-32863=>17547,
-32864=>17548,
-32865=>17549,
-32866=>17550,
-32867=>17551,
-32868=>17552,
-32869=>17553,
-32870=>17554,
-32871=>17555,
-32872=>17556,
-32875=>17557,
-32876=>17558,
-32877=>17559,
-32878=>17560,
-32884=>17561,
-32888=>17562,
-32890=>17563,
-32891=>17564,
-32892=>17565,
-32897=>17566,
-32898=>17567,
-32904=>17568,
-32906=>17569,
-32909=>17570,
-32910=>17571,
-32911=>17572,
-32912=>17573,
-32913=>17574,
-32914=>17575,
-32916=>17576,
-32917=>17577,
-32919=>17578,
-32921=>17579,
-32926=>17580,
-32931=>17581,
-32934=>17582,
-32935=>17583,
-32936=>17584,
-32940=>17585,
-32944=>17586,
-32947=>17587,
-32949=>17588,
-32950=>17589,
-32952=>17590,
-32953=>17591,
-32955=>17592,
-32965=>17593,
-32967=>17594,
-32968=>17595,
-32969=>17596,
-32970=>17597,
-32971=>17598,
-32975=>17599,
-32976=>17600,
-32977=>17601,
-32978=>17602,
-32979=>17603,
-32980=>17604,
-32981=>17605,
-32984=>17606,
-32991=>17607,
-32992=>17608,
-32994=>17609,
-32995=>17610,
-32998=>17611,
-33006=>17612,
-33013=>17613,
-33015=>17614,
-33017=>17615,
-33019=>17616,
-33022=>17617,
-33023=>17618,
-33024=>17619,
-33025=>17620,
-33027=>17621,
-33028=>17622,
-33031=>17623,
-33032=>17624,
-33035=>17625,
-33036=>17626,
-33045=>17627,
-33047=>17628,
-33049=>17629,
-33052=>17630,
-33053=>17631,
-33055=>17632,
-33056=>17633,
-33057=>17634,
-33058=>17635,
-33059=>17636,
-33060=>17637,
-33061=>17638,
-33062=>17639,
-33063=>17640,
-33064=>17641,
-33065=>17642,
-33066=>17643,
-33067=>17644,
-33069=>17645,
-33070=>17646,
-33072=>17647,
-33075=>17648,
-33076=>17649,
-33077=>17650,
-33079=>17651,
-33082=>17652,
-33083=>17653,
-33084=>17654,
-33085=>17655,
-33087=>17656,
-33088=>17657,
-33089=>17658,
-33090=>17659,
-33091=>17660,
-33092=>17661,
-33093=>17662,
-33095=>17663,
-33097=>17664,
-33101=>17665,
-33103=>17666,
-33106=>17667,
-33111=>17668,
-33112=>17669,
-33115=>17670,
-33116=>17671,
-33117=>17672,
-33118=>17673,
-33119=>17674,
-33122=>17675,
-33123=>17676,
-33124=>17677,
-33128=>17678,
-33130=>17679,
-33132=>17680,
-33135=>17681,
-33138=>17682,
-33139=>17683,
-33141=>17684,
-33142=>17685,
-33143=>17686,
-33153=>17687,
-33155=>17688,
-33156=>17689,
-33157=>17690,
-33158=>17691,
-33159=>17692,
-33161=>17693,
-33163=>17694,
-33164=>17695,
-33165=>17696,
-33166=>17697,
-33168=>17698,
-33170=>17699,
-33171=>17700,
-33172=>17701,
-33173=>17702,
-33174=>17703,
-33175=>17704,
-33177=>17705,
-33182=>17706,
-33183=>17707,
-33185=>17708,
-33186=>17709,
-33188=>17710,
-33189=>17711,
-33191=>17712,
-33195=>17713,
-33196=>17714,
-33197=>17715,
-33198=>17716,
-33199=>17717,
-33200=>17718,
-33201=>17719,
-33202=>17720,
-33204=>17721,
-33205=>17722,
-33206=>17723,
-33207=>17724,
-33208=>17725,
-33209=>17726,
-33212=>17727,
-33220=>17728,
-33221=>17729,
-33223=>17730,
-33224=>17731,
-33227=>17732,
-33230=>17733,
-33232=>17734,
-33233=>17735,
-33234=>17736,
-33235=>17737,
-33236=>17738,
-33237=>17739,
-33238=>17740,
-33239=>17741,
-33241=>17742,
-33243=>17743,
-33244=>17744,
-33245=>17745,
-33246=>17746,
-33249=>17747,
-33250=>17748,
-33252=>17749,
-33253=>17750,
-33254=>17751,
-33257=>17752,
-33259=>17753,
-33262=>17754,
-33263=>17755,
-33264=>17756,
-33265=>17757,
-33266=>17758,
-33269=>17759,
-33270=>17760,
-33271=>17761,
-33272=>17762,
-33273=>17763,
-33277=>17764,
-33279=>17765,
-33283=>17766,
-33291=>17767,
-33294=>17768,
-33295=>17769,
-33297=>17770,
-33299=>17771,
-33301=>17772,
-33302=>17773,
-33303=>17774,
-33304=>17775,
-33305=>17776,
-33306=>17777,
-33309=>17778,
-33312=>17779,
-33316=>17780,
-33317=>17781,
-33318=>17782,
-33319=>17783,
-33321=>17784,
-33326=>17785,
-33330=>17786,
-33338=>17787,
-33340=>17788,
-33341=>17789,
-33343=>17790,
-33344=>17791,
-33345=>17792,
-33346=>17793,
-33347=>17794,
-33349=>17795,
-33350=>17796,
-33352=>17797,
-33354=>17798,
-33356=>17799,
-33357=>17800,
-33358=>17801,
-33360=>17802,
-33361=>17803,
-33362=>17804,
-33363=>17805,
-33364=>17806,
-33365=>17807,
-33366=>17808,
-33367=>17809,
-33371=>17810,
-33372=>17811,
-33373=>17812,
-33374=>17813,
-33376=>17814,
-33377=>17815,
-33378=>17816,
-33379=>17817,
-33381=>17818,
-33383=>17819,
-33385=>17820,
-33386=>17821,
-33388=>17822,
-33389=>17823,
-33397=>17824,
-33398=>17825,
-12171=>17826,
-33400=>17826,
-33403=>17827,
-33404=>17828,
-33408=>17829,
-33409=>17830,
-33411=>17831,
-33413=>17832,
-33414=>17833,
-33415=>17834,
-33417=>17835,
-33420=>17836,
-33424=>17837,
-33427=>17838,
-33428=>17839,
-33429=>17840,
-33430=>17841,
-33434=>17842,
-33435=>17843,
-33438=>17844,
-33440=>17845,
-33442=>17846,
-33443=>17847,
-33447=>17848,
-33458=>17849,
-33461=>17850,
-33462=>17851,
-33466=>17852,
-33468=>17853,
-33471=>17854,
-33472=>17855,
-33474=>17856,
-33475=>17857,
-33477=>17858,
-33478=>17859,
-33481=>17860,
-33488=>17861,
-33494=>17862,
-33497=>17863,
-33498=>17864,
-33501=>17865,
-33506=>17866,
-33512=>17867,
-33513=>17868,
-33514=>17869,
-33516=>17870,
-33517=>17871,
-33518=>17872,
-33520=>17873,
-33522=>17874,
-33523=>17875,
-33525=>17876,
-33526=>17877,
-33528=>17878,
-33530=>17879,
-33532=>17880,
-33533=>17881,
-33534=>17882,
-33535=>17883,
-33536=>17884,
-33546=>17885,
-33547=>17886,
-33549=>17887,
-33552=>17888,
-33554=>17889,
-33555=>17890,
-33558=>17891,
-33560=>17892,
-33561=>17893,
-33565=>17894,
-33566=>17895,
-33567=>17896,
-33568=>17897,
-33569=>17898,
-33570=>17899,
-33571=>17900,
-33572=>17901,
-33573=>17902,
-33574=>17903,
-33577=>17904,
-33578=>17905,
-33582=>17906,
-33584=>17907,
-33586=>17908,
-33591=>17909,
-33595=>17910,
-33597=>17911,
-33598=>17912,
-33599=>17913,
-33601=>17914,
-33602=>17915,
-33604=>17916,
-33605=>17917,
-33608=>17918,
-33610=>17919,
-33611=>17920,
-33612=>17921,
-33613=>17922,
-33614=>17923,
-33619=>17924,
-33621=>17925,
-33622=>17926,
-33623=>17927,
-33624=>17928,
-33625=>17929,
-33629=>17930,
-33634=>17931,
-33648=>17932,
-33649=>17933,
-33650=>17934,
-33651=>17935,
-33652=>17936,
-33653=>17937,
-33654=>17938,
-33657=>17939,
-33658=>17940,
-33662=>17941,
-33663=>17942,
-33664=>17943,
-33665=>17944,
-33666=>17945,
-33667=>17946,
-33668=>17947,
-33671=>17948,
-33672=>17949,
-33675=>17950,
-33676=>17951,
-33677=>17952,
-33679=>17953,
-33680=>17954,
-33681=>17955,
-33684=>17956,
-33685=>17957,
-33687=>17958,
-33689=>17959,
-33690=>17960,
-33693=>17961,
-33695=>17962,
-33697=>17963,
-33699=>17964,
-33700=>17965,
-33701=>17966,
-33702=>17967,
-33708=>17968,
-33709=>17969,
-33710=>17970,
-33711=>17971,
-33717=>17972,
-33723=>17973,
-33726=>17974,
-33727=>17975,
-33730=>17976,
-33731=>17977,
-33732=>17978,
-33734=>17979,
-33736=>17980,
-33737=>17981,
-33739=>17982,
-33741=>17983,
-33742=>17984,
-33744=>17985,
-33745=>17986,
-33746=>17987,
-33747=>17988,
-33749=>17989,
-33751=>17990,
-33753=>17991,
-33754=>17992,
-33755=>17993,
-33758=>17994,
-33762=>17995,
-33763=>17996,
-33764=>17997,
-33766=>17998,
-33767=>17999,
-33768=>18000,
-33771=>18001,
-33772=>18002,
-33773=>18003,
-33774=>18004,
-33779=>18005,
-33780=>18006,
-33781=>18007,
-33782=>18008,
-33783=>18009,
-33786=>18010,
-33787=>18011,
-33788=>18012,
-33790=>18013,
-33791=>18014,
-33792=>18015,
-33794=>18016,
-33797=>18017,
-33800=>18018,
-33801=>18019,
-33808=>18020,
-33810=>18021,
-33811=>18022,
-33812=>18023,
-33813=>18024,
-33814=>18025,
-33815=>18026,
-33817=>18027,
-33818=>18028,
-33819=>18029,
-33822=>18030,
-33823=>18031,
-33824=>18032,
-33825=>18033,
-33826=>18034,
-33827=>18035,
-33833=>18036,
-33834=>18037,
-33835=>18038,
-33837=>18039,
-33838=>18040,
-33839=>18041,
-33840=>18042,
-33842=>18043,
-33843=>18044,
-33844=>18045,
-33846=>18046,
-33847=>18047,
-33849=>18048,
-33850=>18049,
-33851=>18050,
-33854=>18051,
-33855=>18052,
-33856=>18053,
-33857=>18054,
-33858=>18055,
-33859=>18056,
-33860=>18057,
-33861=>18058,
-33863=>18059,
-33864=>18060,
-33866=>18061,
-33867=>18062,
-33868=>18063,
-33869=>18064,
-33870=>18065,
-33871=>18066,
-33872=>18067,
-33875=>18068,
-33876=>18069,
-33877=>18070,
-33878=>18071,
-33880=>18072,
-33885=>18073,
-33886=>18074,
-33887=>18075,
-33888=>18076,
-33890=>18077,
-33893=>18078,
-33895=>18079,
-33896=>18080,
-33898=>18081,
-33902=>18082,
-33904=>18083,
-33906=>18084,
-33908=>18085,
-33913=>18086,
-33915=>18087,
-33916=>18088,
-33917=>18089,
-33918=>18090,
-33919=>18091,
-33920=>18092,
-33921=>18093,
-33923=>18094,
-33924=>18095,
-33925=>18096,
-33926=>18097,
-33930=>18098,
-33933=>18099,
-33935=>18100,
-33936=>18101,
-33937=>18102,
-33938=>18103,
-33941=>18104,
-33942=>18105,
-33944=>18106,
-33946=>18107,
-33947=>18108,
-33949=>18109,
-33950=>18110,
-33951=>18111,
-33952=>18112,
-33954=>18113,
-33955=>18114,
-33956=>18115,
-33957=>18116,
-33958=>18117,
-33959=>18118,
-33960=>18119,
-33961=>18120,
-33962=>18121,
-33963=>18122,
-33964=>18123,
-33965=>18124,
-33966=>18125,
-33968=>18126,
-33969=>18127,
-33971=>18128,
-33973=>18129,
-33974=>18130,
-33975=>18131,
-33979=>18132,
-33982=>18133,
-33986=>18134,
-33987=>18135,
-33989=>18136,
-33990=>18137,
-33991=>18138,
-33992=>18139,
-33996=>18140,
-33998=>18141,
-33999=>18142,
-34002=>18143,
-34004=>18144,
-34005=>18145,
-34007=>18146,
-34008=>18147,
-34009=>18148,
-34010=>18149,
-34011=>18150,
-34012=>18151,
-34014=>18152,
-34017=>18153,
-34018=>18154,
-34020=>18155,
-34023=>18156,
-34024=>18157,
-34025=>18158,
-34026=>18159,
-34027=>18160,
-34029=>18161,
-34033=>18162,
-34034=>18163,
-34035=>18164,
-34036=>18165,
-34037=>18166,
-34038=>18167,
-34039=>18168,
-34040=>18169,
-34041=>18170,
-34042=>18171,
-34043=>18172,
-34046=>18173,
-34048=>18174,
-34049=>18175,
-34050=>18176,
-34051=>18177,
-34052=>18178,
-34053=>18179,
-34054=>18180,
-34055=>18181,
-34056=>18182,
-34057=>18183,
-34058=>18184,
-34059=>18185,
-34061=>18186,
-34062=>18187,
-34063=>18188,
-34064=>18189,
-34066=>18190,
-34069=>18191,
-34070=>18192,
-34072=>18193,
-34073=>18194,
-34075=>18195,
-34076=>18196,
-34077=>18197,
-34080=>18198,
-34082=>18199,
-34084=>18200,
-34085=>18201,
-34087=>18202,
-34088=>18203,
-34089=>18204,
-34090=>18205,
-34094=>18206,
-34095=>18207,
-34096=>18208,
-34097=>18209,
-34098=>18210,
-34099=>18211,
-34100=>18212,
-34101=>18213,
-34102=>18214,
-34110=>18215,
-34111=>18216,
-34112=>18217,
-34114=>18218,
-34116=>18219,
-34117=>18220,
-34119=>18221,
-34123=>18222,
-34124=>18223,
-34125=>18224,
-34127=>18225,
-34128=>18226,
-34129=>18227,
-34132=>18228,
-34135=>18229,
-34138=>18230,
-34139=>18231,
-34140=>18232,
-34141=>18233,
-34143=>18234,
-34144=>18235,
-34145=>18236,
-34147=>18237,
-34149=>18238,
-34150=>18239,
-34151=>18240,
-34155=>18241,
-34156=>18242,
-34158=>18243,
-34159=>18244,
-34160=>18245,
-34161=>18246,
-34163=>18247,
-34165=>18248,
-34166=>18249,
-34168=>18250,
-34172=>18251,
-34173=>18252,
-34175=>18253,
-34176=>18254,
-34177=>18255,
-34178=>18256,
-34179=>18257,
-34182=>18258,
-34185=>18259,
-34187=>18260,
-34189=>18261,
-34190=>18262,
-34192=>18263,
-34194=>18264,
-34195=>18265,
-34197=>18266,
-34198=>18267,
-34199=>18268,
-34200=>18269,
-34201=>18270,
-34202=>18271,
-34205=>18272,
-34206=>18273,
-34208=>18274,
-34209=>18275,
-34210=>18276,
-34211=>18277,
-34213=>18278,
-34215=>18279,
-34219=>18280,
-34220=>18281,
-34221=>18282,
-34225=>18283,
-34226=>18284,
-34227=>18285,
-34228=>18286,
-34229=>18287,
-34230=>18288,
-34232=>18289,
-34235=>18290,
-34236=>18291,
-34237=>18292,
-34238=>18293,
-34239=>18294,
-34240=>18295,
-34242=>18296,
-34243=>18297,
-34244=>18298,
-34245=>18299,
-34246=>18300,
-34247=>18301,
-34248=>18302,
-34250=>18303,
-34251=>18304,
-34252=>18305,
-34257=>18306,
-34258=>18307,
-34260=>18308,
-34262=>18309,
-34263=>18310,
-34264=>18311,
-34265=>18312,
-34266=>18313,
-34267=>18314,
-34270=>18315,
-34271=>18316,
-34272=>18317,
-34273=>18318,
-34274=>18319,
-34275=>18320,
-34278=>18321,
-34279=>18322,
-34280=>18323,
-34283=>18324,
-34284=>18325,
-34285=>18326,
-34286=>18327,
-34287=>18328,
-34288=>18329,
-34289=>18330,
-34290=>18331,
-34291=>18332,
-34293=>18333,
-34295=>18334,
-34296=>18335,
-34300=>18336,
-34301=>18337,
-34302=>18338,
-34304=>18339,
-34305=>18340,
-34306=>18341,
-34307=>18342,
-34312=>18343,
-34313=>18344,
-34314=>18345,
-34316=>18346,
-34317=>18347,
-34318=>18348,
-34319=>18349,
-34320=>18350,
-34322=>18351,
-34323=>18352,
-34324=>18353,
-34325=>18354,
-34327=>18355,
-34328=>18356,
-34329=>18357,
-34331=>18358,
-34332=>18359,
-34333=>18360,
-34335=>18361,
-34336=>18362,
-34337=>18363,
-34339=>18364,
-34340=>18365,
-34341=>18366,
-34342=>18367,
-34344=>18368,
-34346=>18369,
-34347=>18370,
-34348=>18371,
-34350=>18372,
-34351=>18373,
-34352=>18374,
-34353=>18375,
-34354=>18376,
-34355=>18377,
-34356=>18378,
-34357=>18379,
-34358=>18380,
-34359=>18381,
-34361=>18382,
-34363=>18383,
-34365=>18384,
-34366=>18385,
-34368=>18386,
-34369=>18387,
-34370=>18388,
-34371=>18389,
-34372=>18390,
-34373=>18391,
-34374=>18392,
-34375=>18393,
-34376=>18394,
-34377=>18395,
-34378=>18396,
-34379=>18397,
-34380=>18398,
-34386=>18399,
-34387=>18400,
-34390=>18401,
-34391=>18402,
-34392=>18403,
-34393=>18404,
-34395=>18405,
-34397=>18406,
-34400=>18407,
-34401=>18408,
-34403=>18409,
-34404=>18410,
-34405=>18411,
-34406=>18412,
-34408=>18413,
-34409=>18414,
-34410=>18415,
-34413=>18416,
-34415=>18417,
-34416=>18418,
-34418=>18419,
-34419=>18420,
-34420=>18421,
-34421=>18422,
-34422=>18423,
-34423=>18424,
-34424=>18425,
-34435=>18426,
-34436=>18427,
-34437=>18428,
-34438=>18429,
-34439=>18430,
-34440=>18431,
-34441=>18432,
-34446=>18433,
-34447=>18434,
-34448=>18435,
-34449=>18436,
-34450=>18437,
-34452=>18438,
-34454=>18439,
-34455=>18440,
-34456=>18441,
-34457=>18442,
-34458=>18443,
-34459=>18444,
-34462=>18445,
-34463=>18446,
-34464=>18447,
-34465=>18448,
-34466=>18449,
-34469=>18450,
-34470=>18451,
-34475=>18452,
-34477=>18453,
-34478=>18454,
-34482=>18455,
-34483=>18456,
-34487=>18457,
-34488=>18458,
-34489=>18459,
-34491=>18460,
-34492=>18461,
-34493=>18462,
-34494=>18463,
-34495=>18464,
-34497=>18465,
-34498=>18466,
-34499=>18467,
-34501=>18468,
-34504=>18469,
-34508=>18470,
-34509=>18471,
-34514=>18472,
-34515=>18473,
-34517=>18474,
-34518=>18475,
-34519=>18476,
-34522=>18477,
-34524=>18478,
-34525=>18479,
-34528=>18480,
-34529=>18481,
-34530=>18482,
-34531=>18483,
-34533=>18484,
-34534=>18485,
-34535=>18486,
-34536=>18487,
-34538=>18488,
-34539=>18489,
-34540=>18490,
-34543=>18491,
-34549=>18492,
-34550=>18493,
-34551=>18494,
-34555=>18495,
-34556=>18496,
-34557=>18497,
-34559=>18498,
-34561=>18499,
-34564=>18500,
-34565=>18501,
-34571=>18502,
-34572=>18503,
-34574=>18504,
-34575=>18505,
-34576=>18506,
-34577=>18507,
-34580=>18508,
-34582=>18509,
-34585=>18510,
-34587=>18511,
-34589=>18512,
-34591=>18513,
-34592=>18514,
-34596=>18515,
-34598=>18516,
-34599=>18517,
-34600=>18518,
-34602=>18519,
-34603=>18520,
-34604=>18521,
-34605=>18522,
-34607=>18523,
-34608=>18524,
-34610=>18525,
-34611=>18526,
-34613=>18527,
-34614=>18528,
-34616=>18529,
-34617=>18530,
-34618=>18531,
-34620=>18532,
-34621=>18533,
-34624=>18534,
-34625=>18535,
-34626=>18536,
-34627=>18537,
-34628=>18538,
-34629=>18539,
-34630=>18540,
-34634=>18541,
-34635=>18542,
-34637=>18543,
-34639=>18544,
-34640=>18545,
-34641=>18546,
-34642=>18547,
-34644=>18548,
-34646=>18549,
-34648=>18550,
-34650=>18551,
-34651=>18552,
-34652=>18553,
-34653=>18554,
-34654=>18555,
-34655=>18556,
-34657=>18557,
-34658=>18558,
-34663=>18559,
-34664=>18560,
-34665=>18561,
-34666=>18562,
-34667=>18563,
-34668=>18564,
-34669=>18565,
-34671=>18566,
-34673=>18567,
-34674=>18568,
-34675=>18569,
-34677=>18570,
-34679=>18571,
-34681=>18572,
-34682=>18573,
-34687=>18574,
-34688=>18575,
-34689=>18576,
-34694=>18577,
-34695=>18578,
-34697=>18579,
-34698=>18580,
-34700=>18581,
-34702=>18582,
-34703=>18583,
-34704=>18584,
-34705=>18585,
-34706=>18586,
-34708=>18587,
-34709=>18588,
-34710=>18589,
-34712=>18590,
-34713=>18591,
-34714=>18592,
-34715=>18593,
-34716=>18594,
-34717=>18595,
-34720=>18596,
-34721=>18597,
-34723=>18598,
-34724=>18599,
-34725=>18600,
-34726=>18601,
-34727=>18602,
-34729=>18603,
-34730=>18604,
-34734=>18605,
-34736=>18606,
-34737=>18607,
-34738=>18608,
-34740=>18609,
-34742=>18610,
-34743=>18611,
-34744=>18612,
-34745=>18613,
-34748=>18614,
-34750=>18615,
-34751=>18616,
-34753=>18617,
-34754=>18618,
-34755=>18619,
-34757=>18620,
-34759=>18621,
-34761=>18622,
-34764=>18623,
-34765=>18624,
-34767=>18625,
-34768=>18626,
-34772=>18627,
-34773=>18628,
-34774=>18629,
-34775=>18630,
-34776=>18631,
-34777=>18632,
-34778=>18633,
-34780=>18634,
-34781=>18635,
-34782=>18636,
-34783=>18637,
-34785=>18638,
-34786=>18639,
-34788=>18640,
-34790=>18641,
-34791=>18642,
-34792=>18643,
-34793=>18644,
-34795=>18645,
-34797=>18646,
-34800=>18647,
-34801=>18648,
-34803=>18649,
-34804=>18650,
-34805=>18651,
-34807=>18652,
-34808=>18653,
-34810=>18654,
-34812=>18655,
-34813=>18656,
-34815=>18657,
-34816=>18658,
-34817=>18659,
-34818=>18660,
-34820=>18661,
-34823=>18662,
-34824=>18663,
-34825=>18664,
-34827=>18665,
-34828=>18666,
-34829=>18667,
-34830=>18668,
-34831=>18669,
-34834=>18670,
-34836=>18671,
-34839=>18672,
-34840=>18673,
-34841=>18674,
-34842=>18675,
-34844=>18676,
-34845=>18677,
-34846=>18678,
-34848=>18679,
-34852=>18680,
-34853=>18681,
-34854=>18682,
-34855=>18683,
-34856=>18684,
-34857=>18685,
-34858=>18686,
-34859=>18687,
-34860=>18688,
-34861=>18689,
-34862=>18690,
-34863=>18691,
-34864=>18692,
-34867=>18693,
-34868=>18694,
-34869=>18695,
-34871=>18696,
-34872=>18697,
-34874=>18698,
-34877=>18699,
-34878=>18700,
-34879=>18701,
-34881=>18702,
-34882=>18703,
-34883=>18704,
-34887=>18705,
-34888=>18706,
-34889=>18707,
-34891=>18708,
-34894=>18709,
-34895=>18710,
-34896=>18711,
-34897=>18712,
-34898=>18713,
-34901=>18714,
-34902=>18715,
-34904=>18716,
-34906=>18717,
-34908=>18718,
-34910=>18719,
-34911=>18720,
-34912=>18721,
-34918=>18722,
-34919=>18723,
-34922=>18724,
-34925=>18725,
-34927=>18726,
-34929=>18727,
-34931=>18728,
-34932=>18729,
-34933=>18730,
-34934=>18731,
-34936=>18732,
-34938=>18733,
-34939=>18734,
-34940=>18735,
-34944=>18736,
-34947=>18737,
-34950=>18738,
-34951=>18739,
-34953=>18740,
-34954=>18741,
-34956=>18742,
-34958=>18743,
-34959=>18744,
-34960=>18745,
-34961=>18746,
-34963=>18747,
-34964=>18748,
-34965=>18749,
-34967=>18750,
-34968=>18751,
-34969=>18752,
-34970=>18753,
-34971=>18754,
-34973=>18755,
-34974=>18756,
-34975=>18757,
-34976=>18758,
-34977=>18759,
-34979=>18760,
-34981=>18761,
-34982=>18762,
-34983=>18763,
-34984=>18764,
-34985=>18765,
-34986=>18766,
-34988=>18767,
-34990=>18768,
-34991=>18769,
-34992=>18770,
-34994=>18771,
-34995=>18772,
-34996=>18773,
-34997=>18774,
-34998=>18775,
-35000=>18776,
-35001=>18777,
-35002=>18778,
-35003=>18779,
-35005=>18780,
-35006=>18781,
-35007=>18782,
-35008=>18783,
-35011=>18784,
-35012=>18785,
-35015=>18786,
-35016=>18787,
-35019=>18788,
-35020=>18789,
-35021=>18790,
-35024=>18791,
-35025=>18792,
-35027=>18793,
-35030=>18794,
-35031=>18795,
-35034=>18796,
-35035=>18797,
-35038=>18798,
-35040=>18799,
-35041=>18800,
-35046=>18801,
-35047=>18802,
-35049=>18803,
-35050=>18804,
-35051=>18805,
-35052=>18806,
-35053=>18807,
-35054=>18808,
-35055=>18809,
-35058=>18810,
-35061=>18811,
-35062=>18812,
-35063=>18813,
-35066=>18814,
-35067=>18815,
-35071=>18816,
-35072=>18817,
-35073=>18818,
-35075=>18819,
-35076=>18820,
-35077=>18821,
-35078=>18822,
-35080=>18823,
-35081=>18824,
-35083=>18825,
-35084=>18826,
-35085=>18827,
-35086=>18828,
-35087=>18829,
-35089=>18830,
-35092=>18831,
-35093=>18832,
-35094=>18833,
-35095=>18834,
-35096=>18835,
-35100=>18836,
-35101=>18837,
-35102=>18838,
-35103=>18839,
-35104=>18840,
-35106=>18841,
-35107=>18842,
-35108=>18843,
-35110=>18844,
-35111=>18845,
-35112=>18846,
-35113=>18847,
-35116=>18848,
-35117=>18849,
-35118=>18850,
-35119=>18851,
-35121=>18852,
-35125=>18853,
-35127=>18854,
-35129=>18855,
-35130=>18856,
-35132=>18857,
-35133=>18858,
-35134=>18859,
-35135=>18860,
-35136=>18861,
-35138=>18862,
-35139=>18863,
-35141=>18864,
-35142=>18865,
-35144=>18866,
-35145=>18867,
-35146=>18868,
-35147=>18869,
-35148=>18870,
-35149=>18871,
-35150=>18872,
-35151=>18873,
-35152=>18874,
-35153=>18875,
-35154=>18876,
-35155=>18877,
-35156=>18878,
-35157=>18879,
-35159=>18880,
-35160=>18881,
-35161=>18882,
-35162=>18883,
-35163=>18884,
-35164=>18885,
-35169=>18886,
-35170=>18887,
-35171=>18888,
-35173=>18889,
-35175=>18890,
-35176=>18891,
-35177=>18892,
-35179=>18893,
-35181=>18894,
-35182=>18895,
-35184=>18896,
-35185=>18897,
-35187=>18898,
-35188=>18899,
-35189=>18900,
-35190=>18901,
-35191=>18902,
-35192=>18903,
-35193=>18904,
-35194=>18905,
-35196=>18906,
-35197=>18907,
-12177=>18908,
-35198=>18908,
-35200=>18909,
-35202=>18910,
-35204=>18911,
-35205=>18912,
-35207=>18913,
-35208=>18914,
-35209=>18915,
-35210=>18916,
-35212=>18917,
-35213=>18918,
-35214=>18919,
-35216=>18920,
-35217=>18921,
-35218=>18922,
-35220=>18923,
-35221=>18924,
-35223=>18925,
-35225=>18926,
-35226=>18927,
-35227=>18928,
-35228=>18929,
-35229=>18930,
-35230=>18931,
-35231=>18932,
-35232=>18933,
-35234=>18934,
-35235=>18935,
-35236=>18936,
-35237=>18937,
-35239=>18938,
-35240=>18939,
-35241=>18940,
-35243=>18941,
-35245=>18942,
-35246=>18943,
-35248=>18944,
-35249=>18945,
-35251=>18946,
-35252=>18947,
-35253=>18948,
-35254=>18949,
-35256=>18950,
-35257=>18951,
-35259=>18952,
-35260=>18953,
-35262=>18954,
-35267=>18955,
-35277=>18956,
-35283=>18957,
-35284=>18958,
-35285=>18959,
-35287=>18960,
-35288=>18961,
-35289=>18962,
-35291=>18963,
-35293=>18964,
-35295=>18965,
-35296=>18966,
-35297=>18967,
-35298=>18968,
-35300=>18969,
-35303=>18970,
-35304=>18971,
-35305=>18972,
-35306=>18973,
-35308=>18974,
-35309=>18975,
-35310=>18976,
-35312=>18977,
-35313=>18978,
-35314=>18979,
-35317=>18980,
-35319=>18981,
-35321=>18982,
-35322=>18983,
-35323=>18984,
-35324=>18985,
-35325=>18986,
-35326=>18987,
-35327=>18988,
-35332=>18989,
-35333=>18990,
-35334=>18991,
-35337=>18992,
-35339=>18993,
-35341=>18994,
-35343=>18995,
-35345=>18996,
-35346=>18997,
-35348=>18998,
-35351=>18999,
-35353=>19000,
-35354=>19001,
-35356=>19002,
-35358=>19003,
-35360=>19004,
-35361=>19005,
-35362=>19006,
-35364=>19007,
-35366=>19008,
-35367=>19009,
-35368=>19010,
-35369=>19011,
-35371=>19012,
-35372=>19013,
-35374=>19014,
-35375=>19015,
-35376=>19016,
-35378=>19017,
-35379=>19018,
-35381=>19019,
-35383=>19020,
-35384=>19021,
-35385=>19022,
-35387=>19023,
-35388=>19024,
-35389=>19025,
-35391=>19026,
-35392=>19027,
-35394=>19028,
-35395=>19029,
-35396=>19030,
-35397=>19031,
-35399=>19032,
-35401=>19033,
-35402=>19034,
-35403=>19035,
-35404=>19036,
-35405=>19037,
-35407=>19038,
-35409=>19039,
-35411=>19040,
-35414=>19041,
-35415=>19042,
-35417=>19043,
-35418=>19044,
-35420=>19045,
-35421=>19046,
-35423=>19047,
-35424=>19048,
-35428=>19049,
-35429=>19050,
-35431=>19051,
-35432=>19052,
-35434=>19053,
-35439=>19054,
-35444=>19055,
-35446=>19056,
-35447=>19057,
-35448=>19058,
-35450=>19059,
-35451=>19060,
-35453=>19061,
-35454=>19062,
-35456=>19063,
-35457=>19064,
-35458=>19065,
-35459=>19066,
-35464=>19067,
-35467=>19068,
-35468=>19069,
-35470=>19070,
-35471=>19071,
-35472=>19072,
-35476=>19073,
-35478=>19074,
-35479=>19075,
-35481=>19076,
-35483=>19077,
-35484=>19078,
-35485=>19079,
-35487=>19080,
-35490=>19081,
-35495=>19082,
-35497=>19083,
-35498=>19084,
-35499=>19085,
-35501=>19086,
-35502=>19087,
-35503=>19088,
-35505=>19089,
-35507=>19090,
-35508=>19091,
-35509=>19092,
-35511=>19093,
-35512=>19094,
-35514=>19095,
-35515=>19096,
-35517=>19097,
-35518=>19098,
-35520=>19099,
-35521=>19100,
-35523=>19101,
-35525=>19102,
-35526=>19103,
-35528=>19104,
-35530=>19105,
-35532=>19106,
-35534=>19107,
-35536=>19108,
-35539=>19109,
-35540=>19110,
-35541=>19111,
-35544=>19112,
-35545=>19113,
-35546=>19114,
-35549=>19115,
-35551=>19116,
-35552=>19117,
-35553=>19118,
-35555=>19119,
-35557=>19120,
-35560=>19121,
-35561=>19122,
-35562=>19123,
-35564=>19124,
-35567=>19125,
-35568=>19126,
-35570=>19127,
-35572=>19128,
-35573=>19129,
-35577=>19130,
-35579=>19131,
-35581=>19132,
-35583=>19133,
-35587=>19134,
-35590=>19135,
-35592=>19136,
-35593=>19137,
-35595=>19138,
-35596=>19139,
-35597=>19140,
-35599=>19141,
-35601=>19142,
-35602=>19143,
-35603=>19144,
-35605=>19145,
-35608=>19146,
-35612=>19147,
-35614=>19148,
-35615=>19149,
-35616=>19150,
-35618=>19151,
-35619=>19152,
-35620=>19153,
-35621=>19154,
-35623=>19155,
-35625=>19156,
-35626=>19157,
-35630=>19158,
-35631=>19159,
-35632=>19160,
-35633=>19161,
-35634=>19162,
-35636=>19163,
-35637=>19164,
-35638=>19165,
-35639=>19166,
-35640=>19167,
-35642=>19168,
-35643=>19169,
-35644=>19170,
-35645=>19171,
-35647=>19172,
-35648=>19173,
-35649=>19174,
-35650=>19175,
-35651=>19176,
-35652=>19177,
-35653=>19178,
-35654=>19179,
-35655=>19180,
-35656=>19181,
-35658=>19182,
-35659=>19183,
-35660=>19184,
-35661=>19185,
-35664=>19186,
-35665=>19187,
-35666=>19188,
-35667=>19189,
-35668=>19190,
-35669=>19191,
-35671=>19192,
-35675=>19193,
-35677=>19194,
-35678=>19195,
-35679=>19196,
-35680=>19197,
-35681=>19198,
-35682=>19199,
-35683=>19200,
-35684=>19201,
-35685=>19202,
-35687=>19203,
-35688=>19204,
-35689=>19205,
-35690=>19206,
-35693=>19207,
-35694=>19208,
-35697=>19209,
-35698=>19210,
-35699=>19211,
-35701=>19212,
-35702=>19213,
-35704=>19214,
-35705=>19215,
-35706=>19216,
-35707=>19217,
-35708=>19218,
-35710=>19219,
-35711=>19220,
-35713=>19221,
-35714=>19222,
-35715=>19223,
-35716=>19224,
-35717=>19225,
-35718=>19226,
-35719=>19227,
-35720=>19228,
-35721=>19229,
-35723=>19230,
-35724=>19231,
-35725=>19232,
-35727=>19233,
-35728=>19234,
-35729=>19235,
-35732=>19236,
-35735=>19237,
-35736=>19238,
-35737=>19239,
-35738=>19240,
-35739=>19241,
-35741=>19242,
-35743=>19243,
-35756=>19244,
-35761=>19245,
-35771=>19246,
-35783=>19247,
-35792=>19248,
-35818=>19249,
-35849=>19250,
-35870=>19251,
-35896=>19252,
-35897=>19253,
-35898=>19254,
-35899=>19255,
-35900=>19256,
-35901=>19257,
-35902=>19258,
-35903=>19259,
-35904=>19260,
-35906=>19261,
-35907=>19262,
-35908=>19263,
-35909=>19264,
-35914=>19265,
-35915=>19266,
-35917=>19267,
-35918=>19268,
-35919=>19269,
-35921=>19270,
-35922=>19271,
-35923=>19272,
-35924=>19273,
-35926=>19274,
-35927=>19275,
-35928=>19276,
-35929=>19277,
-35931=>19278,
-35932=>19279,
-35933=>19280,
-35934=>19281,
-35935=>19282,
-35936=>19283,
-35939=>19284,
-35940=>19285,
-35941=>19286,
-35942=>19287,
-35943=>19288,
-35944=>19289,
-35945=>19290,
-35948=>19291,
-35949=>19292,
-35950=>19293,
-35951=>19294,
-35952=>19295,
-35953=>19296,
-35954=>19297,
-35956=>19298,
-35957=>19299,
-35958=>19300,
-35959=>19301,
-35963=>19302,
-35964=>19303,
-35965=>19304,
-35966=>19305,
-35967=>19306,
-35968=>19307,
-35969=>19308,
-35971=>19309,
-35972=>19310,
-35974=>19311,
-35975=>19312,
-35976=>19313,
-35979=>19314,
-35981=>19315,
-35982=>19316,
-35983=>19317,
-35984=>19318,
-35985=>19319,
-35986=>19320,
-35987=>19321,
-35989=>19322,
-35990=>19323,
-35991=>19324,
-35993=>19325,
-35994=>19326,
-35995=>19327,
-35996=>19328,
-35999=>19329,
-36003=>19330,
-36004=>19331,
-36005=>19332,
-36006=>19333,
-36013=>19334,
-36014=>19335,
-36017=>19336,
-36021=>19337,
-36025=>19338,
-36030=>19339,
-36038=>19340,
-36041=>19341,
-36043=>19342,
-36044=>19343,
-36045=>19344,
-36046=>19345,
-36047=>19346,
-36048=>19347,
-36052=>19348,
-36054=>19349,
-36055=>19350,
-36056=>19351,
-36057=>19352,
-36059=>19353,
-36061=>19354,
-36063=>19355,
-36069=>19356,
-36072=>19357,
-36073=>19358,
-36078=>19359,
-36079=>19360,
-36080=>19361,
-36081=>19362,
-36082=>19363,
-36083=>19364,
-36085=>19365,
-36086=>19366,
-36087=>19367,
-36088=>19368,
-36089=>19369,
-36095=>19370,
-36096=>19371,
-36097=>19372,
-36098=>19373,
-36099=>19374,
-36102=>19375,
-36103=>19376,
-36105=>19377,
-36108=>19378,
-36110=>19379,
-36113=>19380,
-36114=>19381,
-36115=>19382,
-36116=>19383,
-36117=>19384,
-36119=>19385,
-36120=>19386,
-36121=>19387,
-36122=>19388,
-36128=>19389,
-36177=>19390,
-36178=>19391,
-36183=>19392,
-36191=>19393,
-36197=>19394,
-36200=>19395,
-36201=>19396,
-36202=>19397,
-36204=>19398,
-36206=>19399,
-36207=>19400,
-36209=>19401,
-36210=>19402,
-36216=>19403,
-36217=>19404,
-36218=>19405,
-36219=>19406,
-36220=>19407,
-36221=>19408,
-36222=>19409,
-36223=>19410,
-36224=>19411,
-36226=>19412,
-36227=>19413,
-36230=>19414,
-36231=>19415,
-36232=>19416,
-36233=>19417,
-36236=>19418,
-36237=>19419,
-36238=>19420,
-36239=>19421,
-36240=>19422,
-36242=>19423,
-36243=>19424,
-36246=>19425,
-36247=>19426,
-36248=>19427,
-36250=>19428,
-36251=>19429,
-36252=>19430,
-36253=>19431,
-36254=>19432,
-36256=>19433,
-36257=>19434,
-36258=>19435,
-36260=>19436,
-36261=>19437,
-36262=>19438,
-36263=>19439,
-36265=>19440,
-36266=>19441,
-36267=>19442,
-36268=>19443,
-36269=>19444,
-36270=>19445,
-36271=>19446,
-36272=>19447,
-36278=>19448,
-36279=>19449,
-36281=>19450,
-36283=>19451,
-36285=>19452,
-36288=>19453,
-36289=>19454,
-36290=>19455,
-36293=>19456,
-36295=>19457,
-36296=>19458,
-36297=>19459,
-36298=>19460,
-36301=>19461,
-36304=>19462,
-36306=>19463,
-36307=>19464,
-36308=>19465,
-36309=>19466,
-36312=>19467,
-36313=>19468,
-36316=>19469,
-36320=>19470,
-36321=>19471,
-36322=>19472,
-36325=>19473,
-36326=>19474,
-36327=>19475,
-36329=>19476,
-36333=>19477,
-36334=>19478,
-36336=>19479,
-36337=>19480,
-36338=>19481,
-36340=>19482,
-36342=>19483,
-36348=>19484,
-36350=>19485,
-36351=>19486,
-36352=>19487,
-36353=>19488,
-36354=>19489,
-36355=>19490,
-36356=>19491,
-36358=>19492,
-36359=>19493,
-36360=>19494,
-36363=>19495,
-36365=>19496,
-36366=>19497,
-36369=>19498,
-36370=>19499,
-36371=>19500,
-36373=>19501,
-36374=>19502,
-36375=>19503,
-36376=>19504,
-36377=>19505,
-36378=>19506,
-36379=>19507,
-36380=>19508,
-36384=>19509,
-36385=>19510,
-36388=>19511,
-36389=>19512,
-36390=>19513,
-36391=>19514,
-36392=>19515,
-36395=>19516,
-36397=>19517,
-36400=>19518,
-36402=>19519,
-36403=>19520,
-36406=>19521,
-36407=>19522,
-36408=>19523,
-36411=>19524,
-36412=>19525,
-36414=>19526,
-36415=>19527,
-36419=>19528,
-36421=>19529,
-36422=>19530,
-36429=>19531,
-36430=>19532,
-36431=>19533,
-36432=>19534,
-36435=>19535,
-36436=>19536,
-36438=>19537,
-36439=>19538,
-36440=>19539,
-36442=>19540,
-36443=>19541,
-36444=>19542,
-36445=>19543,
-36446=>19544,
-36447=>19545,
-36448=>19546,
-36449=>19547,
-36450=>19548,
-36452=>19549,
-36453=>19550,
-36455=>19551,
-36456=>19552,
-36458=>19553,
-36459=>19554,
-36462=>19555,
-36465=>19556,
-36467=>19557,
-36469=>19558,
-36471=>19559,
-36472=>19560,
-36473=>19561,
-36475=>19562,
-36477=>19563,
-36478=>19564,
-36480=>19565,
-36482=>19566,
-36483=>19567,
-36484=>19568,
-36486=>19569,
-36488=>19570,
-36492=>19571,
-36494=>19572,
-36501=>19573,
-36502=>19574,
-36503=>19575,
-36504=>19576,
-36505=>19577,
-36507=>19578,
-36509=>19579,
-36511=>19580,
-36512=>19581,
-36514=>19582,
-36515=>19583,
-36516=>19584,
-36519=>19585,
-36520=>19586,
-36521=>19587,
-36525=>19588,
-36526=>19589,
-36528=>19590,
-36529=>19591,
-36531=>19592,
-36532=>19593,
-36533=>19594,
-36534=>19595,
-36535=>19596,
-36536=>19597,
-36537=>19598,
-36539=>19599,
-36540=>19600,
-36541=>19601,
-36542=>19602,
-36543=>19603,
-36545=>19604,
-36546=>19605,
-36547=>19606,
-36548=>19607,
-36549=>19608,
-36550=>19609,
-36551=>19610,
-36552=>19611,
-36553=>19612,
-36559=>19613,
-36560=>19614,
-36561=>19615,
-36563=>19616,
-36565=>19617,
-36566=>19618,
-36567=>19619,
-36568=>19620,
-36569=>19621,
-36570=>19622,
-36572=>19623,
-36573=>19624,
-36574=>19625,
-36576=>19626,
-36577=>19627,
-36578=>19628,
-36579=>19629,
-36581=>19630,
-36582=>19631,
-36583=>19632,
-36584=>19633,
-36585=>19634,
-36586=>19635,
-36588=>19636,
-36589=>19637,
-36590=>19638,
-36591=>19639,
-36592=>19640,
-36593=>19641,
-36595=>19642,
-36596=>19643,
-36597=>19644,
-36598=>19645,
-36599=>19646,
-36605=>19647,
-36607=>19648,
-36608=>19649,
-36609=>19650,
-36610=>19651,
-36612=>19652,
-36614=>19653,
-36616=>19654,
-36619=>19655,
-36620=>19656,
-36621=>19657,
-36622=>19658,
-36623=>19659,
-36624=>19660,
-36625=>19661,
-36627=>19662,
-36630=>19663,
-36631=>19664,
-36632=>19665,
-36633=>19666,
-36634=>19667,
-36640=>19668,
-36641=>19669,
-36642=>19670,
-36643=>19671,
-36644=>19672,
-36647=>19673,
-36648=>19674,
-36651=>19675,
-36652=>19676,
-36653=>19677,
-36654=>19678,
-36656=>19679,
-36657=>19680,
-36658=>19681,
-36660=>19682,
-36661=>19683,
-36662=>19684,
-36663=>19685,
-36665=>19686,
-36666=>19687,
-36668=>19688,
-36669=>19689,
-36672=>19690,
-36673=>19691,
-36675=>19692,
-36679=>19693,
-36680=>19694,
-36682=>19695,
-36683=>19696,
-36684=>19697,
-36687=>19698,
-36688=>19699,
-36689=>19700,
-36690=>19701,
-36691=>19702,
-36693=>19703,
-36694=>19704,
-36695=>19705,
-36696=>19706,
-36697=>19707,
-36698=>19708,
-36699=>19709,
-36700=>19710,
-36701=>19711,
-36702=>19712,
-36704=>19713,
-36707=>19714,
-36709=>19715,
-36714=>19716,
-36736=>19717,
-36748=>19718,
-36754=>19719,
-36765=>19720,
-36768=>19721,
-36769=>19722,
-36770=>19723,
-36772=>19724,
-36773=>19725,
-36775=>19726,
-36778=>19727,
-36780=>19728,
-36787=>19729,
-36788=>19730,
-12193=>19731,
-36789=>19731,
-36791=>19732,
-36792=>19733,
-36794=>19734,
-36795=>19735,
-36796=>19736,
-36799=>19737,
-36800=>19738,
-36803=>19739,
-36806=>19740,
-36809=>19741,
-36810=>19742,
-36811=>19743,
-36812=>19744,
-36813=>19745,
-36815=>19746,
-36818=>19747,
-36822=>19748,
-36823=>19749,
-36826=>19750,
-36832=>19751,
-36833=>19752,
-36835=>19753,
-36839=>19754,
-36844=>19755,
-36847=>19756,
-36849=>19757,
-36850=>19758,
-36853=>19759,
-36854=>19760,
-36858=>19761,
-36859=>19762,
-36860=>19763,
-36862=>19764,
-36863=>19765,
-36871=>19766,
-36872=>19767,
-36876=>19768,
-36878=>19769,
-36883=>19770,
-36888=>19771,
-36892=>19772,
-36900=>19773,
-36901=>19774,
-36903=>19775,
-36904=>19776,
-36905=>19777,
-36906=>19778,
-36907=>19779,
-36908=>19780,
-36912=>19781,
-36913=>19782,
-36915=>19783,
-36916=>19784,
-36919=>19785,
-36921=>19786,
-36922=>19787,
-36925=>19788,
-36927=>19789,
-36928=>19790,
-36931=>19791,
-36933=>19792,
-36934=>19793,
-36936=>19794,
-36937=>19795,
-36938=>19796,
-36940=>19797,
-36950=>19798,
-36953=>19799,
-36954=>19800,
-36957=>19801,
-36959=>19802,
-36961=>19803,
-36964=>19804,
-36966=>19805,
-36967=>19806,
-36970=>19807,
-36971=>19808,
-36972=>19809,
-36975=>19810,
-36976=>19811,
-36977=>19812,
-36979=>19813,
-36982=>19814,
-36985=>19815,
-36987=>19816,
-36990=>19817,
-36997=>19818,
-36998=>19819,
-37001=>19820,
-37004=>19821,
-37005=>19822,
-37006=>19823,
-37010=>19824,
-37012=>19825,
-37014=>19826,
-37016=>19827,
-37018=>19828,
-37020=>19829,
-37022=>19830,
-37023=>19831,
-37024=>19832,
-37028=>19833,
-37029=>19834,
-37031=>19835,
-37032=>19836,
-37033=>19837,
-37035=>19838,
-37037=>19839,
-37042=>19840,
-37047=>19841,
-37052=>19842,
-37053=>19843,
-37055=>19844,
-37056=>19845,
-37058=>19846,
-37059=>19847,
-37062=>19848,
-37064=>19849,
-37065=>19850,
-37067=>19851,
-37068=>19852,
-37069=>19853,
-37074=>19854,
-37076=>19855,
-37077=>19856,
-37078=>19857,
-37080=>19858,
-37081=>19859,
-37082=>19860,
-37086=>19861,
-37088=>19862,
-37091=>19863,
-37092=>19864,
-37093=>19865,
-37097=>19866,
-37098=>19867,
-37100=>19868,
-37102=>19869,
-37104=>19870,
-37105=>19871,
-37106=>19872,
-37107=>19873,
-37110=>19874,
-37111=>19875,
-37113=>19876,
-37114=>19877,
-37115=>19878,
-37116=>19879,
-37119=>19880,
-37120=>19881,
-37121=>19882,
-37123=>19883,
-37125=>19884,
-37127=>19885,
-37128=>19886,
-37130=>19887,
-37131=>19888,
-37132=>19889,
-37133=>19890,
-37134=>19891,
-37135=>19892,
-37136=>19893,
-37137=>19894,
-37139=>19895,
-37141=>19896,
-37143=>19897,
-37144=>19898,
-37146=>19899,
-37147=>19900,
-37148=>19901,
-37149=>19902,
-37151=>19903,
-37152=>19904,
-37153=>19905,
-37156=>19906,
-37157=>19907,
-37158=>19908,
-37160=>19909,
-37161=>19910,
-37162=>19911,
-37163=>19912,
-37164=>19913,
-37166=>19914,
-37171=>19915,
-37173=>19916,
-37175=>19917,
-37176=>19918,
-37179=>19919,
-37180=>19920,
-37181=>19921,
-37182=>19922,
-37183=>19923,
-37184=>19924,
-37185=>19925,
-37186=>19926,
-37188=>19927,
-37189=>19928,
-37191=>19929,
-37201=>19930,
-37203=>19931,
-37204=>19932,
-37205=>19933,
-37206=>19934,
-37208=>19935,
-37209=>19936,
-37211=>19937,
-37212=>19938,
-37215=>19939,
-37216=>19940,
-37222=>19941,
-37223=>19942,
-37224=>19943,
-37227=>19944,
-37229=>19945,
-37235=>19946,
-37242=>19947,
-37243=>19948,
-37244=>19949,
-37248=>19950,
-37249=>19951,
-37250=>19952,
-37251=>19953,
-37252=>19954,
-37254=>19955,
-37256=>19956,
-37258=>19957,
-37262=>19958,
-37263=>19959,
-37267=>19960,
-37268=>19961,
-37269=>19962,
-37271=>19963,
-37272=>19964,
-37273=>19965,
-37277=>19966,
-37278=>19967,
-37279=>19968,
-37280=>19969,
-37281=>19970,
-37284=>19971,
-37285=>19972,
-37286=>19973,
-37287=>19974,
-37288=>19975,
-37289=>19976,
-37296=>19977,
-37297=>19978,
-37298=>19979,
-37299=>19980,
-37302=>19981,
-37303=>19982,
-37304=>19983,
-37305=>19984,
-37307=>19985,
-37308=>19986,
-37309=>19987,
-37310=>19988,
-37311=>19989,
-37314=>19990,
-37316=>19991,
-12196=>19992,
-37318=>19992,
-37320=>19993,
-37328=>19994,
-37334=>19995,
-37338=>19996,
-37339=>19997,
-37342=>19998,
-37343=>19999,
-37344=>20000,
-37345=>20001,
-37346=>20002,
-37349=>20003,
-37350=>20004,
-37352=>20005,
-37354=>20006,
-37355=>20007,
-37356=>20008,
-37357=>20009,
-37358=>20010,
-37359=>20011,
-37360=>20012,
-37361=>20013,
-37362=>20014,
-37363=>20015,
-37364=>20016,
-37366=>20017,
-37368=>20018,
-37371=>20019,
-37372=>20020,
-37373=>20021,
-37374=>20022,
-37375=>20023,
-37378=>20024,
-37379=>20025,
-37381=>20026,
-37382=>20027,
-37383=>20028,
-37386=>20029,
-37387=>20030,
-37388=>20031,
-37391=>20032,
-37394=>20033,
-37395=>20034,
-37398=>20035,
-37399=>20036,
-37400=>20037,
-37401=>20038,
-37402=>20039,
-37403=>20040,
-37404=>20041,
-37405=>20042,
-37407=>20043,
-37408=>20044,
-37409=>20045,
-37410=>20046,
-37412=>20047,
-37416=>20048,
-37417=>20049,
-37418=>20050,
-37419=>20051,
-37420=>20052,
-37421=>20053,
-37423=>20054,
-37425=>20055,
-37426=>20056,
-37429=>20057,
-37430=>20058,
-37435=>20059,
-37436=>20060,
-37441=>20061,
-37442=>20062,
-37443=>20063,
-37444=>20064,
-37446=>20065,
-37447=>20066,
-37450=>20067,
-37451=>20068,
-37452=>20069,
-37454=>20070,
-37455=>20071,
-37456=>20072,
-37458=>20073,
-37459=>20074,
-37460=>20075,
-37462=>20076,
-37464=>20077,
-37465=>20078,
-37468=>20079,
-37469=>20080,
-37471=>20081,
-37472=>20082,
-37473=>20083,
-37475=>20084,
-37476=>20085,
-37477=>20086,
-37479=>20087,
-37480=>20088,
-37481=>20089,
-37482=>20090,
-37483=>20091,
-37486=>20092,
-37487=>20093,
-37488=>20094,
-37489=>20095,
-37490=>20096,
-37491=>20097,
-37493=>20098,
-37494=>20099,
-37495=>20100,
-37497=>20101,
-37500=>20102,
-37501=>20103,
-37502=>20104,
-37505=>20105,
-37506=>20106,
-37508=>20107,
-37510=>20108,
-37511=>20109,
-37512=>20110,
-37513=>20111,
-37514=>20112,
-37515=>20113,
-37516=>20114,
-37517=>20115,
-37519=>20116,
-37520=>20117,
-37522=>20118,
-37524=>20119,
-37525=>20120,
-37527=>20121,
-37529=>20122,
-37531=>20123,
-37533=>20124,
-37534=>20125,
-37535=>20126,
-37537=>20127,
-37538=>20128,
-37540=>20129,
-37543=>20130,
-37549=>20131,
-37551=>20132,
-37552=>20133,
-37554=>20134,
-37555=>20135,
-37556=>20136,
-37557=>20137,
-37558=>20138,
-37560=>20139,
-37562=>20140,
-37565=>20141,
-37566=>20142,
-37567=>20143,
-37568=>20144,
-37570=>20145,
-37572=>20146,
-37574=>20147,
-37577=>20148,
-37578=>20149,
-37579=>20150,
-37581=>20151,
-37582=>20152,
-37584=>20153,
-37585=>20154,
-37587=>20155,
-37588=>20156,
-37589=>20157,
-37590=>20158,
-37591=>20159,
-37592=>20160,
-37593=>20161,
-37594=>20162,
-37595=>20163,
-37596=>20164,
-37598=>20165,
-37600=>20166,
-37601=>20167,
-37602=>20168,
-37607=>20169,
-37609=>20170,
-37611=>20171,
-37612=>20172,
-37618=>20173,
-37619=>20174,
-37620=>20175,
-37621=>20176,
-37623=>20177,
-37625=>20178,
-37626=>20179,
-37627=>20180,
-37629=>20181,
-37630=>20182,
-37631=>20183,
-37632=>20184,
-37634=>20185,
-37635=>20186,
-37636=>20187,
-37637=>20188,
-37641=>20189,
-37642=>20190,
-37643=>20191,
-37644=>20192,
-37645=>20193,
-37646=>20194,
-37647=>20195,
-37649=>20196,
-37651=>20197,
-37652=>20198,
-37654=>20199,
-37655=>20200,
-37660=>20201,
-37661=>20202,
-37662=>20203,
-37665=>20204,
-37667=>20205,
-37668=>20206,
-37669=>20207,
-37671=>20208,
-37673=>20209,
-37674=>20210,
-37676=>20211,
-37677=>20212,
-37680=>20213,
-37681=>20214,
-37684=>20215,
-37685=>20216,
-37687=>20217,
-37689=>20218,
-37690=>20219,
-37691=>20220,
-37692=>20221,
-37693=>20222,
-37695=>20223,
-37698=>20224,
-37700=>20225,
-37701=>20226,
-37704=>20227,
-37705=>20228,
-37706=>20229,
-37708=>20230,
-37710=>20231,
-37711=>20232,
-37712=>20233,
-37713=>20234,
-37714=>20235,
-37715=>20236,
-37717=>20237,
-37718=>20238,
-37719=>20239,
-37721=>20240,
-37722=>20241,
-37724=>20242,
-37725=>20243,
-37726=>20244,
-37727=>20245,
-37728=>20246,
-37729=>20247,
-37730=>20248,
-37731=>20249,
-37734=>20250,
-37735=>20251,
-37736=>20252,
-37739=>20253,
-37741=>20254,
-37742=>20255,
-37743=>20256,
-37745=>20257,
-37746=>20258,
-37747=>20259,
-37748=>20260,
-37751=>20261,
-37752=>20262,
-37753=>20263,
-37755=>20264,
-37756=>20265,
-37757=>20266,
-37759=>20267,
-37760=>20268,
-37761=>20269,
-37763=>20270,
-37765=>20271,
-37766=>20272,
-37768=>20273,
-37769=>20274,
-37771=>20275,
-37772=>20276,
-37773=>20277,
-37774=>20278,
-37776=>20279,
-37777=>20280,
-37778=>20281,
-37779=>20282,
-37780=>20283,
-37781=>20284,
-37783=>20285,
-37785=>20286,
-37786=>20287,
-37787=>20288,
-37788=>20289,
-37789=>20290,
-37790=>20291,
-37791=>20292,
-37792=>20293,
-37793=>20294,
-37796=>20295,
-37797=>20296,
-37800=>20297,
-37803=>20298,
-37805=>20299,
-37807=>20300,
-37809=>20301,
-37810=>20302,
-37812=>20303,
-37814=>20304,
-37815=>20305,
-37817=>20306,
-37818=>20307,
-37819=>20308,
-37820=>20309,
-37821=>20310,
-37822=>20311,
-37824=>20312,
-37825=>20313,
-37826=>20314,
-37828=>20315,
-37829=>20316,
-37830=>20317,
-37833=>20318,
-37835=>20319,
-37838=>20320,
-37839=>20321,
-37840=>20322,
-37842=>20323,
-37843=>20324,
-37844=>20325,
-37845=>20326,
-37849=>20327,
-37850=>20328,
-37851=>20329,
-37856=>20330,
-37859=>20331,
-37861=>20332,
-37862=>20333,
-37863=>20334,
-37865=>20335,
-37866=>20336,
-37867=>20337,
-37868=>20338,
-37869=>20339,
-37870=>20340,
-37871=>20341,
-37872=>20342,
-37873=>20343,
-37874=>20344,
-37875=>20345,
-37876=>20346,
-37878=>20347,
-37880=>20348,
-37882=>20349,
-37883=>20350,
-37884=>20351,
-37885=>20352,
-37886=>20353,
-37887=>20354,
-37888=>20355,
-37889=>20356,
-37890=>20357,
-37892=>20358,
-37893=>20359,
-37894=>20360,
-37895=>20361,
-37896=>20362,
-37897=>20363,
-37898=>20364,
-37900=>20365,
-37901=>20366,
-37902=>20367,
-37903=>20368,
-37905=>20369,
-37909=>20370,
-37910=>20371,
-37911=>20372,
-37914=>20373,
-37915=>20374,
-37916=>20375,
-37918=>20376,
-37919=>20377,
-37921=>20378,
-37922=>20379,
-37923=>20380,
-37924=>20381,
-37925=>20382,
-37929=>20383,
-37930=>20384,
-37931=>20385,
-37932=>20386,
-37933=>20387,
-37935=>20388,
-37936=>20389,
-37937=>20390,
-37940=>20391,
-37942=>20392,
-37943=>20393,
-37945=>20394,
-37947=>20395,
-37948=>20396,
-37949=>20397,
-37952=>20398,
-37953=>20399,
-37954=>20400,
-37955=>20401,
-37957=>20402,
-37958=>20403,
-37959=>20404,
-37960=>20405,
-37961=>20406,
-37963=>20407,
-37965=>20408,
-37966=>20409,
-37967=>20410,
-37968=>20411,
-37969=>20412,
-37971=>20413,
-37973=>20414,
-37974=>20415,
-37975=>20416,
-37976=>20417,
-37977=>20418,
-37978=>20419,
-37979=>20420,
-37980=>20421,
-37981=>20422,
-37982=>20423,
-37983=>20424,
-37985=>20425,
-37986=>20426,
-37988=>20427,
-37990=>20428,
-37991=>20429,
-37992=>20430,
-37993=>20431,
-37994=>20432,
-37996=>20433,
-37998=>20434,
-37999=>20435,
-38001=>20436,
-38003=>20437,
-38004=>20438,
-38005=>20439,
-38006=>20440,
-38008=>20441,
-38010=>20442,
-38011=>20443,
-38016=>20444,
-38017=>20445,
-38018=>20446,
-38019=>20447,
-38020=>20448,
-38033=>20449,
-38038=>20450,
-38040=>20451,
-38087=>20452,
-38095=>20453,
-38099=>20454,
-38100=>20455,
-38106=>20456,
-38118=>20457,
-38139=>20458,
-38172=>20459,
-38176=>20460,
-38183=>20461,
-38195=>20462,
-38205=>20463,
-38211=>20464,
-38216=>20465,
-38219=>20466,
-38229=>20467,
-38234=>20468,
-38240=>20469,
-38254=>20470,
-38260=>20471,
-38261=>20472,
-38264=>20473,
-38265=>20474,
-38266=>20475,
-38267=>20476,
-38268=>20477,
-38269=>20478,
-38270=>20479,
-38273=>20480,
-38276=>20481,
-38277=>20482,
-38279=>20483,
-38280=>20484,
-38282=>20485,
-38285=>20486,
-38288=>20487,
-38290=>20488,
-38293=>20489,
-38294=>20490,
-38295=>20491,
-38297=>20492,
-38298=>20493,
-38299=>20494,
-38300=>20495,
-38301=>20496,
-38302=>20497,
-38303=>20498,
-38304=>20499,
-38306=>20500,
-38310=>20501,
-38311=>20502,
-38314=>20503,
-38318=>20504,
-38319=>20505,
-38320=>20506,
-38321=>20507,
-38323=>20508,
-38324=>20509,
-38325=>20510,
-38327=>20511,
-38328=>20512,
-38330=>20513,
-38336=>20514,
-38337=>20515,
-38338=>20516,
-38340=>20517,
-38341=>20518,
-38343=>20519,
-38345=>20520,
-38349=>20521,
-38350=>20522,
-38351=>20523,
-38353=>20524,
-38354=>20525,
-38355=>20526,
-38359=>20527,
-38360=>20528,
-38361=>20529,
-38362=>20530,
-38363=>20531,
-38365=>20532,
-38367=>20533,
-38368=>20534,
-38371=>20535,
-38372=>20536,
-38374=>20537,
-38375=>20538,
-38380=>20539,
-38399=>20540,
-38407=>20541,
-38419=>20542,
-38424=>20543,
-38427=>20544,
-38430=>20545,
-38432=>20546,
-38435=>20547,
-38436=>20548,
-38437=>20549,
-38438=>20550,
-38439=>20551,
-38440=>20552,
-38441=>20553,
-38443=>20554,
-38444=>20555,
-38445=>20556,
-38447=>20557,
-38448=>20558,
-38455=>20559,
-38456=>20560,
-38457=>20561,
-38458=>20562,
-38462=>20563,
-38465=>20564,
-38467=>20565,
-38474=>20566,
-38478=>20567,
-38479=>20568,
-38481=>20569,
-38482=>20570,
-38483=>20571,
-38486=>20572,
-38487=>20573,
-38489=>20574,
-38490=>20575,
-38492=>20576,
-38494=>20577,
-38496=>20578,
-38501=>20579,
-38502=>20580,
-38507=>20581,
-38509=>20582,
-38510=>20583,
-38511=>20584,
-38513=>20585,
-38521=>20586,
-38522=>20587,
-38523=>20588,
-38524=>20589,
-38526=>20590,
-38527=>20591,
-38528=>20592,
-38529=>20593,
-38530=>20594,
-38531=>20595,
-38532=>20596,
-38535=>20597,
-38537=>20598,
-38540=>20599,
-38545=>20600,
-38546=>20601,
-38547=>20602,
-38550=>20603,
-38554=>20604,
-38557=>20605,
-38558=>20606,
-38559=>20607,
-38560=>20608,
-38561=>20609,
-38562=>20610,
-63985=>20611,
-38563=>20611,
-38564=>20612,
-38565=>20613,
-38566=>20614,
-38569=>20615,
-38571=>20616,
-38572=>20617,
-38573=>20618,
-38574=>20619,
-38575=>20620,
-38578=>20621,
-38581=>20622,
-38583=>20623,
-38586=>20624,
-38591=>20625,
-38594=>20626,
-38595=>20627,
-38600=>20628,
-38602=>20629,
-38603=>20630,
-38608=>20631,
-38609=>20632,
-38611=>20633,
-38612=>20634,
-38615=>20635,
-38616=>20636,
-38618=>20637,
-38621=>20638,
-38622=>20639,
-38623=>20640,
-38625=>20641,
-38628=>20642,
-38629=>20643,
-38630=>20644,
-38631=>20645,
-38635=>20646,
-38636=>20647,
-38637=>20648,
-38638=>20649,
-38640=>20650,
-38641=>20651,
-38644=>20652,
-38645=>20653,
-38648=>20654,
-38650=>20655,
-38652=>20656,
-38653=>20657,
-38655=>20658,
-38658=>20659,
-38659=>20660,
-38661=>20661,
-38666=>20662,
-38667=>20663,
-38668=>20664,
-38672=>20665,
-38673=>20666,
-38674=>20667,
-38676=>20668,
-38677=>20669,
-38679=>20670,
-38680=>20671,
-38681=>20672,
-38682=>20673,
-38683=>20674,
-38685=>20675,
-38687=>20676,
-38688=>20677,
-38689=>20678,
-38690=>20679,
-38691=>20680,
-38692=>20681,
-38693=>20682,
-38694=>20683,
-38696=>20684,
-38697=>20685,
-38699=>20686,
-38700=>20687,
-38702=>20688,
-38703=>20689,
-38705=>20690,
-38707=>20691,
-38708=>20692,
-38709=>20693,
-38710=>20694,
-38711=>20695,
-38714=>20696,
-38715=>20697,
-38716=>20698,
-38719=>20699,
-38720=>20700,
-38721=>20701,
-38723=>20702,
-38725=>20703,
-38726=>20704,
-38727=>20705,
-38729=>20706,
-38730=>20707,
-38731=>20708,
-38732=>20709,
-38733=>20710,
-38734=>20711,
-38735=>20712,
-38736=>20713,
-12205=>20714,
-38737=>20714,
-38740=>20715,
-38741=>20716,
-38743=>20717,
-38744=>20718,
-38748=>20719,
-38749=>20720,
-38751=>20721,
-38755=>20722,
-38756=>20723,
-38758=>20724,
-38759=>20725,
-38762=>20726,
-38763=>20727,
-38764=>20728,
-38765=>20729,
-38766=>20730,
-38767=>20731,
-38768=>20732,
-38769=>20733,
-38770=>20734,
-38773=>20735,
-38775=>20736,
-38776=>20737,
-38777=>20738,
-38778=>20739,
-38779=>20740,
-38781=>20741,
-38782=>20742,
-38783=>20743,
-38784=>20744,
-38785=>20745,
-38786=>20746,
-38787=>20747,
-38788=>20748,
-38790=>20749,
-38791=>20750,
-38792=>20751,
-38793=>20752,
-38794=>20753,
-38796=>20754,
-38798=>20755,
-38800=>20756,
-38803=>20757,
-38805=>20758,
-38806=>20759,
-38807=>20760,
-38809=>20761,
-38810=>20762,
-38811=>20763,
-38812=>20764,
-38813=>20765,
-38814=>20766,
-38815=>20767,
-38817=>20768,
-38818=>20769,
-38820=>20770,
-38821=>20771,
-38823=>20772,
-38824=>20773,
-38825=>20774,
-38826=>20775,
-38828=>20776,
-38830=>20777,
-38832=>20778,
-38833=>20779,
-38835=>20780,
-38837=>20781,
-38838=>20782,
-38839=>20783,
-38840=>20784,
-38841=>20785,
-38842=>20786,
-38843=>20787,
-38844=>20788,
-38846=>20789,
-38847=>20790,
-38848=>20791,
-38849=>20792,
-38850=>20793,
-38852=>20794,
-38853=>20795,
-38855=>20796,
-38856=>20797,
-38858=>20798,
-38861=>20799,
-38862=>20800,
-38863=>20801,
-38864=>20802,
-38865=>20803,
-38866=>20804,
-38868=>20805,
-38869=>20806,
-38870=>20807,
-38871=>20808,
-38872=>20809,
-38874=>20810,
-38875=>20811,
-38877=>20812,
-38879=>20813,
-38880=>20814,
-38881=>20815,
-38882=>20816,
-38883=>20817,
-38884=>20818,
-38885=>20819,
-38888=>20820,
-38894=>20821,
-38895=>20822,
-38896=>20823,
-38897=>20824,
-38898=>20825,
-38900=>20826,
-38903=>20827,
-38904=>20828,
-38905=>20829,
-38906=>20830,
-38907=>20831,
-38908=>20832,
-38909=>20833,
-38910=>20834,
-38912=>20835,
-38916=>20836,
-38921=>20837,
-38923=>20838,
-38925=>20839,
-38932=>20840,
-38933=>20841,
-38934=>20842,
-38937=>20843,
-38938=>20844,
-38939=>20845,
-38941=>20846,
-38942=>20847,
-38943=>20848,
-38944=>20849,
-38946=>20850,
-38947=>20851,
-38949=>20852,
-38951=>20853,
-38952=>20854,
-38953=>20855,
-38954=>20856,
-38955=>20857,
-38956=>20858,
-38958=>20859,
-38959=>20860,
-38961=>20861,
-38962=>20862,
-38963=>20863,
-38964=>20864,
-38965=>20865,
-38966=>20866,
-38969=>20867,
-38970=>20868,
-38972=>20869,
-38974=>20870,
-38975=>20871,
-38976=>20872,
-38977=>20873,
-38978=>20874,
-38979=>20875,
-38980=>20876,
-38981=>20877,
-38983=>20878,
-38984=>20879,
-38985=>20880,
-38986=>20881,
-38987=>20882,
-38991=>20883,
-38992=>20884,
-38993=>20885,
-38994=>20886,
-38997=>20887,
-38998=>20888,
-38999=>20889,
-39002=>20890,
-39004=>20891,
-39005=>20892,
-39007=>20893,
-39008=>20894,
-39009=>20895,
-39011=>20896,
-39012=>20897,
-39014=>20898,
-39016=>20899,
-39017=>20900,
-39018=>20901,
-39021=>20902,
-39022=>20903,
-39026=>20904,
-39051=>20905,
-39054=>20906,
-39058=>20907,
-39061=>20908,
-39065=>20909,
-39075=>20910,
-39081=>20911,
-39082=>20912,
-39083=>20913,
-39084=>20914,
-39085=>20915,
-39088=>20916,
-39090=>20917,
-39092=>20918,
-39093=>20919,
-39095=>20920,
-39096=>20921,
-39097=>20922,
-39098=>20923,
-39099=>20924,
-39101=>20925,
-39102=>20926,
-39103=>20927,
-39104=>20928,
-39105=>20929,
-39106=>20930,
-39107=>20931,
-39109=>20932,
-39111=>20933,
-39113=>20934,
-39114=>20935,
-39115=>20936,
-39116=>20937,
-39117=>20938,
-39119=>20939,
-39120=>20940,
-39124=>20941,
-39126=>20942,
-39127=>20943,
-39132=>20944,
-39133=>20945,
-39137=>20946,
-39139=>20947,
-39140=>20948,
-39141=>20949,
-39142=>20950,
-39148=>20951,
-39150=>20952,
-39152=>20953,
-39153=>20954,
-39155=>20955,
-39157=>20956,
-39158=>20957,
-39159=>20958,
-39160=>20959,
-39161=>20960,
-39162=>20961,
-39163=>20962,
-39167=>20963,
-39168=>20964,
-39169=>20965,
-39170=>20966,
-39172=>20967,
-39174=>20968,
-39175=>20969,
-39176=>20970,
-39179=>20971,
-39182=>20972,
-39183=>20973,
-39188=>20974,
-39189=>20975,
-39190=>20976,
-39191=>20977,
-39193=>20978,
-39194=>20979,
-39196=>20980,
-39197=>20981,
-39199=>20982,
-39200=>20983,
-39202=>20984,
-39203=>20985,
-39204=>20986,
-39205=>20987,
-39206=>20988,
-39207=>20989,
-39209=>20990,
-39210=>20991,
-39211=>20992,
-39212=>20993,
-39213=>20994,
-39215=>20995,
-39216=>20996,
-39217=>20997,
-39218=>20998,
-39220=>20999,
-39221=>21000,
-39222=>21001,
-39224=>21002,
-39225=>21003,
-39226=>21004,
-39227=>21005,
-39229=>21006,
-39232=>21007,
-39233=>21008,
-39234=>21009,
-39236=>21010,
-39238=>21011,
-39239=>21012,
-39245=>21013,
-39246=>21014,
-39247=>21015,
-39248=>21016,
-39251=>21017,
-39254=>21018,
-39256=>21019,
-39257=>21020,
-39258=>21021,
-39259=>21022,
-39261=>21023,
-39263=>21024,
-39264=>21025,
-39265=>21026,
-39268=>21027,
-39270=>21028,
-39283=>21029,
-39288=>21030,
-39289=>21031,
-39291=>21032,
-39294=>21033,
-39298=>21034,
-39299=>21035,
-39305=>21036,
-39308=>21037,
-39310=>21038,
-39322=>21039,
-39323=>21040,
-39324=>21041,
-39325=>21042,
-39326=>21043,
-39327=>21044,
-39328=>21045,
-39329=>21046,
-39330=>21047,
-39331=>21048,
-39332=>21049,
-39334=>21050,
-39335=>21051,
-39337=>21052,
-39338=>21053,
-39339=>21054,
-39343=>21055,
-39344=>21056,
-39346=>21057,
-39349=>21058,
-39350=>21059,
-39351=>21060,
-39352=>21061,
-39353=>21062,
-39354=>21063,
-39355=>21064,
-39356=>21065,
-39357=>21066,
-39358=>21067,
-39359=>21068,
-39360=>21069,
-39362=>21070,
-39363=>21071,
-39364=>21072,
-39365=>21073,
-39366=>21074,
-39367=>21075,
-39368=>21076,
-39369=>21077,
-39370=>21078,
-39371=>21079,
-39372=>21080,
-39373=>21081,
-39374=>21082,
-39375=>21083,
-39379=>21084,
-39382=>21085,
-39383=>21086,
-39386=>21087,
-39388=>21088,
-39390=>21089,
-39392=>21090,
-39395=>21091,
-39396=>21092,
-39397=>21093,
-39398=>21094,
-39399=>21095,
-39400=>21096,
-39401=>21097,
-39402=>21098,
-39403=>21099,
-39404=>21100,
-39406=>21101,
-39407=>21102,
-39408=>21103,
-39410=>21104,
-39411=>21105,
-39412=>21106,
-39413=>21107,
-39414=>21108,
-39415=>21109,
-39416=>21110,
-39417=>21111,
-39418=>21112,
-39419=>21113,
-39420=>21114,
-39421=>21115,
-39422=>21116,
-39424=>21117,
-39426=>21118,
-39427=>21119,
-39428=>21120,
-39430=>21121,
-39431=>21122,
-39432=>21123,
-39433=>21124,
-39434=>21125,
-39435=>21126,
-39436=>21127,
-39440=>21128,
-39441=>21129,
-39442=>21130,
-39443=>21131,
-39444=>21132,
-39445=>21133,
-39447=>21134,
-39448=>21135,
-39450=>21136,
-39451=>21137,
-39452=>21138,
-39453=>21139,
-39454=>21140,
-39455=>21141,
-39456=>21142,
-39457=>21143,
-39458=>21144,
-39459=>21145,
-39460=>21146,
-39461=>21147,
-39462=>21148,
-39463=>21149,
-39464=>21150,
-39465=>21151,
-39466=>21152,
-39468=>21153,
-39471=>21154,
-39473=>21155,
-39474=>21156,
-39475=>21157,
-39476=>21158,
-39477=>21159,
-39481=>21160,
-39482=>21161,
-39483=>21162,
-39484=>21163,
-39485=>21164,
-39487=>21165,
-39494=>21166,
-39495=>21167,
-39496=>21168,
-39497=>21169,
-39499=>21170,
-39500=>21171,
-39502=>21172,
-39504=>21173,
-39505=>21174,
-39506=>21175,
-39507=>21176,
-39508=>21177,
-39510=>21178,
-39512=>21179,
-39513=>21180,
-39516=>21181,
-39517=>21182,
-39518=>21183,
-39520=>21184,
-39521=>21185,
-39523=>21186,
-39526=>21187,
-39527=>21188,
-39528=>21189,
-39529=>21190,
-39531=>21191,
-39538=>21192,
-39555=>21193,
-39561=>21194,
-39565=>21195,
-39566=>21196,
-39572=>21197,
-39573=>21198,
-39577=>21199,
-39590=>21200,
-39593=>21201,
-39594=>21202,
-39595=>21203,
-39596=>21204,
-39597=>21205,
-39598=>21206,
-39602=>21207,
-39603=>21208,
-39604=>21209,
-39605=>21210,
-39609=>21211,
-39611=>21212,
-39613=>21213,
-39614=>21214,
-39615=>21215,
-39619=>21216,
-39620=>21217,
-39622=>21218,
-39623=>21219,
-39624=>21220,
-39625=>21221,
-39626=>21222,
-39629=>21223,
-39630=>21224,
-39632=>21225,
-39639=>21226,
-39641=>21227,
-39642=>21228,
-39643=>21229,
-39644=>21230,
-39645=>21231,
-39646=>21232,
-39648=>21233,
-39650=>21234,
-39651=>21235,
-39652=>21236,
-39653=>21237,
-39655=>21238,
-39656=>21239,
-39657=>21240,
-39658=>21241,
-39660=>21242,
-39664=>21243,
-39665=>21244,
-39666=>21245,
-39667=>21246,
-39668=>21247,
-39669=>21248,
-39670=>21249,
-39671=>21250,
-39672=>21251,
-39674=>21252,
-39676=>21253,
-39677=>21254,
-39678=>21255,
-39679=>21256,
-39680=>21257,
-39681=>21258,
-39682=>21259,
-39684=>21260,
-39685=>21261,
-39687=>21262,
-39689=>21263,
-39690=>21264,
-39691=>21265,
-39692=>21266,
-39694=>21267,
-39696=>21268,
-39697=>21269,
-39698=>21270,
-39700=>21271,
-39701=>21272,
-39702=>21273,
-39703=>21274,
-39704=>21275,
-39705=>21276,
-39707=>21277,
-39708=>21278,
-39709=>21279,
-39710=>21280,
-39712=>21281,
-39713=>21282,
-39716=>21283,
-39718=>21284,
-39720=>21285,
-39722=>21286,
-39723=>21287,
-39724=>21288,
-39725=>21289,
-39728=>21290,
-39731=>21291,
-39732=>21292,
-39733=>21293,
-39734=>21294,
-39735=>21295,
-39736=>21296,
-39737=>21297,
-39738=>21298,
-39741=>21299,
-39742=>21300,
-39743=>21301,
-39744=>21302,
-39750=>21303,
-39754=>21304,
-39755=>21305,
-39756=>21306,
-39760=>21307,
-39762=>21308,
-39763=>21309,
-39765=>21310,
-39766=>21311,
-39767=>21312,
-39769=>21313,
-39771=>21314,
-39772=>21315,
-39773=>21316,
-39774=>21317,
-39775=>21318,
-39776=>21319,
-39777=>21320,
-39778=>21321,
-39779=>21322,
-39780=>21323,
-39781=>21324,
-39782=>21325,
-39783=>21326,
-39784=>21327,
-39785=>21328,
-39786=>21329,
-39787=>21330,
-39788=>21331,
-39789=>21332,
-39790=>21333,
-39792=>21334,
-39793=>21335,
-39794=>21336,
-39795=>21337,
-39797=>21338,
-39798=>21339,
-39800=>21340,
-39801=>21341,
-39802=>21342,
-39803=>21343,
-39804=>21344,
-39805=>21345,
-39806=>21346,
-39807=>21347,
-39808=>21348,
-39810=>21349,
-39812=>21350,
-39813=>21351,
-39814=>21352,
-39815=>21353,
-39816=>21354,
-39817=>21355,
-39818=>21356,
-39819=>21357,
-39820=>21358,
-39821=>21359,
-39823=>21360,
-39827=>21361,
-39828=>21362,
-39829=>21363,
-39830=>21364,
-39831=>21365,
-39832=>21366,
-39833=>21367,
-39835=>21368,
-39836=>21369,
-39839=>21370,
-39840=>21371,
-39841=>21372,
-39842=>21373,
-39843=>21374,
-39844=>21375,
-39845=>21376,
-39846=>21377,
-39847=>21378,
-39848=>21379,
-39849=>21380,
-39852=>21381,
-39855=>21382,
-39856=>21383,
-39857=>21384,
-39858=>21385,
-39859=>21386,
-39860=>21387,
-39861=>21388,
-39862=>21389,
-39863=>21390,
-39864=>21391,
-39865=>21392,
-39866=>21393,
-39867=>21394,
-39868=>21395,
-39869=>21396,
-39870=>21397,
-39871=>21398,
-39874=>21399,
-39875=>21400,
-39876=>21401,
-39877=>21402,
-39878=>21403,
-39880=>21404,
-39883=>21405,
-39884=>21406,
-39885=>21407,
-39886=>21408,
-39887=>21409,
-39888=>21410,
-39889=>21411,
-39890=>21412,
-39891=>21413,
-39893=>21414,
-39895=>21415,
-39896=>21416,
-39897=>21417,
-39898=>21418,
-39900=>21419,
-39902=>21420,
-39903=>21421,
-39904=>21422,
-39907=>21423,
-39909=>21424,
-39910=>21425,
-39913=>21426,
-39916=>21427,
-39917=>21428,
-39918=>21429,
-39919=>21430,
-39921=>21431,
-39922=>21432,
-39923=>21433,
-39925=>21434,
-39926=>21435,
-39927=>21436,
-39928=>21437,
-39929=>21438,
-39930=>21439,
-39931=>21440,
-39932=>21441,
-39934=>21442,
-39936=>21443,
-39937=>21444,
-39938=>21445,
-39939=>21446,
-39940=>21447,
-39941=>21448,
-39942=>21449,
-39943=>21450,
-39946=>21451,
-39947=>21452,
-39948=>21453,
-39950=>21454,
-39951=>21455,
-39953=>21456,
-39956=>21457,
-39957=>21458,
-39958=>21459,
-39959=>21460,
-39960=>21461,
-39961=>21462,
-39962=>21463,
-39963=>21464,
-39964=>21465,
-39965=>21466,
-39966=>21467,
-39967=>21468,
-39969=>21469,
-39970=>21470,
-39972=>21471,
-39974=>21472,
-39975=>21473,
-39978=>21474,
-39979=>21475,
-39980=>21476,
-39982=>21477,
-39983=>21478,
-39984=>21479,
-39988=>21480,
-39990=>21481,
-39992=>21482,
-39994=>21483,
-39996=>21484,
-39997=>21485,
-39999=>21486,
-40000=>21487,
-40001=>21488,
-40002=>21489,
-40003=>21490,
-40004=>21491,
-40006=>21492,
-40007=>21493,
-40010=>21494,
-40011=>21495,
-40012=>21496,
-40013=>21497,
-40014=>21498,
-40015=>21499,
-40016=>21500,
-40017=>21501,
-40019=>21502,
-40021=>21503,
-40025=>21504,
-40026=>21505,
-40027=>21506,
-40028=>21507,
-40030=>21508,
-40032=>21509,
-40033=>21510,
-40034=>21511,
-40035=>21512,
-40036=>21513,
-40037=>21514,
-40038=>21515,
-40040=>21516,
-40041=>21517,
-40042=>21518,
-40043=>21519,
-40044=>21520,
-40046=>21521,
-40047=>21522,
-40048=>21523,
-40049=>21524,
-40050=>21525,
-40051=>21526,
-40052=>21527,
-40053=>21528,
-40054=>21529,
-40055=>21530,
-40057=>21531,
-40059=>21532,
-40061=>21533,
-40062=>21534,
-40064=>21535,
-40067=>21536,
-40068=>21537,
-40073=>21538,
-40074=>21539,
-40076=>21540,
-40079=>21541,
-40083=>21542,
-40086=>21543,
-40087=>21544,
-40088=>21545,
-40089=>21546,
-40093=>21547,
-40106=>21548,
-40108=>21549,
-40111=>21550,
-40121=>21551,
-40126=>21552,
-40127=>21553,
-40128=>21554,
-40129=>21555,
-40130=>21556,
-40136=>21557,
-40137=>21558,
-40145=>21559,
-40146=>21560,
-40154=>21561,
-40155=>21562,
-40160=>21563,
-40161=>21564,
-40163=>21565,
-40164=>21566,
-40166=>21567,
-40167=>21568,
-40168=>21569,
-40170=>21570,
-40171=>21571,
-40173=>21572,
-40174=>21573,
-40175=>21574,
-40176=>21575,
-40177=>21576,
-40178=>21577,
-40181=>21578,
-40183=>21579,
-40184=>21580,
-40185=>21581,
-40186=>21582,
-40187=>21583,
-40188=>21584,
-40189=>21585,
-40190=>21586,
-40191=>21587,
-40192=>21588,
-40193=>21589,
-40194=>21590,
-40195=>21591,
-40196=>21592,
-40197=>21593,
-40200=>21594,
-40202=>21595,
-40203=>21596,
-40204=>21597,
-40205=>21598,
-40206=>21599,
-40207=>21600,
-40208=>21601,
-40209=>21602,
-40210=>21603,
-40211=>21604,
-40212=>21605,
-40214=>21606,
-40215=>21607,
-40216=>21608,
-40217=>21609,
-40218=>21610,
-40220=>21611,
-40222=>21612,
-40224=>21613,
-40225=>21614,
-40226=>21615,
-40228=>21616,
-40229=>21617,
-40231=>21618,
-40233=>21619,
-40234=>21620,
-40235=>21621,
-40236=>21622,
-40237=>21623,
-40238=>21624,
-40241=>21625,
-40242=>21626,
-40243=>21627,
-40244=>21628,
-40245=>21629,
-40246=>21630,
-40247=>21631,
-40248=>21632,
-40249=>21633,
-40250=>21634,
-40252=>21635,
-40253=>21636,
-40254=>21637,
-40256=>21638,
-40257=>21639,
-40259=>21640,
-40260=>21641,
-40261=>21642,
-40262=>21643,
-40263=>21644,
-40264=>21645,
-40265=>21646,
-40266=>21647,
-40267=>21648,
-40268=>21649,
-40269=>21650,
-40270=>21651,
-40271=>21652,
-40272=>21653,
-40276=>21654,
-40277=>21655,
-40278=>21656,
-40279=>21657,
-40280=>21658,
-40281=>21659,
-40282=>21660,
-40283=>21661,
-40286=>21662,
-40287=>21663,
-40290=>21664,
-40291=>21665,
-40292=>21666,
-40293=>21667,
-40294=>21668,
-40295=>21669,
-40296=>21670,
-40297=>21671,
-40299=>21672,
-40301=>21673,
-40302=>21674,
-40304=>21675,
-40305=>21676,
-40307=>21677,
-40308=>21678,
-40309=>21679,
-40310=>21680,
-40311=>21681,
-40312=>21682,
-40313=>21683,
-40314=>21684,
-40315=>21685,
-40316=>21686,
-40317=>21687,
-40318=>21688,
-40319=>21689,
-40320=>21690,
-40321=>21691,
-40322=>21692,
-40323=>21693,
-40324=>21694,
-40325=>21695,
-40326=>21696,
-40328=>21697,
-40330=>21698,
-40331=>21699,
-40332=>21700,
-40333=>21701,
-40334=>21702,
-40335=>21703,
-40336=>21704,
-40337=>21705,
-40338=>21706,
-40340=>21707,
-40341=>21708,
-40342=>21709,
-40343=>21710,
-40345=>21711,
-40347=>21712,
-40348=>21713,
-40349=>21714,
-40350=>21715,
-40351=>21716,
-40352=>21717,
-40353=>21718,
-40354=>21719,
-40355=>21720,
-40356=>21721,
-40358=>21722,
-40359=>21723,
-40360=>21724,
-40362=>21725,
-40363=>21726,
-40364=>21727,
-40365=>21728,
-40366=>21729,
-40368=>21730,
-40369=>21731,
-40370=>21732,
-40371=>21733,
-40373=>21734,
-40374=>21735,
-40375=>21736,
-40376=>21737,
-40377=>21738,
-40378=>21739,
-40381=>21740,
-40382=>21741,
-40383=>21742,
-40385=>21743,
-40387=>21744,
-40389=>21745,
-40390=>21746,
-40391=>21747,
-40392=>21748,
-40393=>21749,
-40394=>21750,
-40395=>21751,
-40396=>21752,
-40397=>21753,
-40398=>21754,
-40399=>21755,
-40400=>21756,
-40401=>21757,
-40402=>21758,
-40404=>21759,
-40405=>21760,
-40406=>21761,
-40408=>21762,
-40411=>21763,
-40412=>21764,
-40413=>21765,
-40414=>21766,
-40415=>21767,
-40416=>21768,
-40417=>21769,
-40418=>21770,
-40419=>21771,
-40420=>21772,
-40423=>21773,
-40424=>21774,
-40425=>21775,
-40426=>21776,
-40427=>21777,
-40428=>21778,
-40429=>21779,
-40430=>21780,
-40432=>21781,
-40433=>21782,
-40436=>21783,
-40437=>21784,
-40438=>21785,
-40439=>21786,
-40443=>21787,
-40444=>21788,
-40445=>21789,
-40446=>21790,
-40447=>21791,
-40448=>21792,
-40449=>21793,
-40450=>21794,
-40451=>21795,
-40452=>21796,
-40453=>21797,
-40454=>21798,
-40455=>21799,
-40456=>21800,
-40457=>21801,
-40458=>21802,
-40459=>21803,
-40461=>21804,
-40462=>21805,
-40463=>21806,
-40464=>21807,
-40465=>21808,
-40466=>21809,
-40467=>21810,
-40468=>21811,
-40470=>21812,
-40471=>21813,
-40472=>21814,
-40473=>21815,
-40476=>21816,
-40484=>21817,
-40487=>21818,
-40494=>21819,
-40496=>21820,
-40500=>21821,
-40507=>21822,
-40508=>21823,
-40512=>21824,
-40525=>21825,
-40528=>21826,
-40530=>21827,
-40531=>21828,
-40532=>21829,
-40534=>21830,
-40537=>21831,
-40541=>21832,
-40543=>21833,
-40544=>21834,
-40545=>21835,
-40546=>21836,
-40549=>21837,
-40558=>21838,
-40559=>21839,
-40562=>21840,
-40564=>21841,
-40566=>21842,
-40567=>21843,
-40568=>21844,
-40571=>21845,
-40576=>21846,
-40577=>21847,
-40579=>21848,
-40580=>21849,
-40581=>21850,
-40582=>21851,
-40585=>21852,
-40586=>21853,
-40588=>21854,
-40589=>21855,
-40590=>21856,
-40591=>21857,
-40592=>21858,
-40593=>21859,
-40596=>21860,
-40597=>21861,
-40598=>21862,
-40600=>21863,
-40601=>21864,
-40602=>21865,
-40603=>21866,
-40604=>21867,
-40606=>21868,
-40608=>21869,
-40609=>21870,
-40610=>21871,
-40611=>21872,
-40612=>21873,
-40615=>21874,
-40616=>21875,
-40618=>21876,
-40619=>21877,
-40620=>21878,
-40621=>21879,
-40622=>21880,
-40624=>21881,
-40625=>21882,
-40626=>21883,
-40627=>21884,
-40630=>21885,
-40631=>21886,
-40633=>21887,
-40634=>21888,
-40636=>21889,
-40639=>21890,
-40640=>21891,
-40641=>21892,
-40642=>21893,
-12232=>21894,
-40643=>21894,
-40645=>21895,
-40646=>21896,
-40647=>21897,
-40648=>21898,
-40650=>21899,
-40651=>21900,
-40656=>21901,
-40658=>21902,
-40659=>21903,
-40661=>21904,
-40662=>21905,
-40663=>21906,
-40665=>21907,
-40666=>21908,
-40673=>21909,
-40675=>21910,
-40676=>21911,
-40678=>21912,
-40683=>21913,
-40684=>21914,
-40685=>21915,
-40686=>21916,
-40688=>21917,
-40689=>21918,
-40691=>21919,
-40693=>21920,
-40694=>21921,
-40696=>21922,
-40698=>21923,
-40704=>21924,
-40705=>21925,
-40706=>21926,
-40707=>21927,
-40708=>21928,
-40709=>21929,
-40710=>21930,
-40711=>21931,
-40712=>21932,
-40714=>21933,
-40716=>21934,
-40719=>21935,
-40721=>21936,
-40722=>21937,
-40724=>21938,
-40726=>21939,
-40728=>21940,
-40730=>21941,
-40731=>21942,
-40732=>21943,
-40733=>21944,
-40734=>21945,
-40735=>21946,
-40737=>21947,
-40739=>21948,
-40740=>21949,
-40741=>21950,
-40742=>21951,
-40743=>21952,
-40744=>21953,
-40745=>21954,
-40746=>21955,
-40747=>21956,
-40749=>21957,
-40750=>21958,
-40752=>21959,
-40753=>21960,
-40754=>21961,
-40755=>21962,
-40756=>21963,
-40757=>21964,
-40758=>21965,
-40760=>21966,
-40762=>21967,
-40764=>21968,
-40767=>21969,
-40768=>21970,
-40769=>21971,
-40770=>21972,
-40771=>21973,
-40773=>21974,
-40774=>21975,
-40775=>21976,
-40776=>21977,
-40777=>21978,
-40780=>21979,
-40781=>21980,
-40782=>21981,
-40787=>21982,
-40789=>21983,
-40790=>21984,
-40791=>21985,
-40792=>21986,
-40794=>21987,
-40795=>21988,
-40797=>21989,
-40798=>21990,
-40802=>21991,
-40804=>21992,
-40805=>21993,
-40807=>21994,
-40808=>21995,
-40809=>21996,
-40811=>21997,
-40813=>21998,
-40814=>21999,
-40815=>22000,
-40816=>22001,
-40817=>22002,
-40819=>22003,
-40820=>22004,
-40821=>22005,
-40822=>22006,
-40824=>22007,
-40825=>22008,
-40826=>22009,
-40827=>22010,
-40828=>22011,
-40829=>22012,
-40830=>22013,
-40833=>22014,
-40834=>22015,
-40846=>22016,
-40847=>22017,
-40849=>22018,
-40850=>22019,
-40851=>22020,
-40854=>22021,
-40855=>22022,
-40856=>22023,
-40861=>22024,
-40862=>22025,
-40865=>22026,
-40866=>22027,
-40867=>22028,
-40868=>22029,
-40869=>22030,
-63788=>22031,
-64013=>22032,
-64014=>22033,
-64015=>22034,
-64017=>22035,
-64019=>22036,
-64020=>22037,
-64024=>22038,
-64031=>22039,
-64032=>22040,
-64033=>22041,
-64035=>22042,
-64036=>22043,
-64039=>22044,
-64040=>22045,
-64041=>22046,
-11905=>22047,
-59413=>22047,
-131207=>22048,
-59414=>22048,
-131209=>22049,
-59415=>22049,
-131276=>22050,
-59416=>22050,
-11908=>22051,
-59417=>22051,
-13427=>22052,
-59418=>22052,
-13383=>22053,
-59419=>22053,
-11912=>22054,
-59420=>22054,
-11915=>22055,
-59421=>22055,
-40884=>22056,
-59422=>22056,
-13726=>22057,
-59423=>22057,
-13850=>22058,
-59424=>22058,
-13838=>22059,
-59425=>22059,
-11916=>22060,
-59426=>22060,
-11927=>22061,
-59427=>22061,
-14702=>22062,
-59428=>22062,
-14616=>22063,
-59429=>22063,
-40885=>22064,
-59430=>22064,
-14799=>22065,
-59431=>22065,
-14815=>22066,
-59432=>22066,
-14963=>22067,
-59433=>22067,
-14800=>22068,
-59434=>22068,
-40886=>22069,
-59435=>22069,
-40887=>22070,
-59436=>22070,
-15182=>22071,
-59437=>22071,
-15470=>22072,
-59438=>22072,
-15584=>22073,
-59439=>22073,
-11943=>22074,
-59440=>22074,
-136663=>22075,
-59441=>22075,
-40888=>22076,
-59442=>22076,
-11946=>22077,
-59443=>22077,
-16470=>22078,
-59444=>22078,
-16735=>22079,
-59445=>22079,
-11950=>22080,
-59446=>22080,
-17207=>22081,
-59447=>22081,
-11955=>22082,
-59448=>22082,
-11958=>22083,
-59449=>22083,
-11959=>22084,
-59450=>22084,
-141711=>22085,
-59451=>22085,
-17329=>22086,
-59452=>22086,
-17324=>22087,
-59453=>22087,
-11963=>22088,
-59454=>22088,
-17373=>22089,
-59455=>22089,
-17622=>22090,
-59456=>22090,
-18017=>22091,
-59457=>22091,
-17996=>22092,
-59458=>22092,
-40889=>22093,
-132361=>22093,
-59459=>22093,
-18211=>22094,
-59460=>22094,
-18217=>22095,
-59461=>22095,
-18300=>22096,
-59462=>22096,
-18317=>22097,
-59463=>22097,
-11978=>22098,
-59464=>22098,
-18759=>22099,
-59465=>22099,
-18810=>22100,
-59466=>22100,
-18813=>22101,
-59467=>22101,
-18818=>22102,
-59468=>22102,
-18819=>22103,
-59469=>22103,
-18821=>22104,
-59470=>22104,
-18822=>22105,
-59471=>22105,
-18847=>22106,
-59472=>22106,
-18843=>22107,
-59473=>22107,
-18871=>22108,
-59474=>22108,
-18870=>22109,
-59475=>22109,
-40890=>22110,
-133533=>22110,
-59476=>22110,
-147966=>22111,
-59477=>22111,
-19619=>22112,
-59478=>22112,
-19615=>22113,
-59479=>22113,
-19616=>22114,
-59480=>22114,
-19617=>22115,
-59481=>22115,
-19575=>22116,
-59482=>22116,
-19618=>22117,
-59483=>22117,
-19731=>22118,
-59484=>22118,
-19732=>22119,
-59485=>22119,
-19733=>22120,
-59486=>22120,
-19734=>22121,
-59487=>22121,
-19735=>22122,
-59488=>22122,
-19736=>22123,
-59489=>22123,
-19737=>22124,
-59490=>22124,
-19886=>22125,
-59491=>22125,
-40891=>22126,
-59492=>22126,
-8364=>22353,
-59244=>22353,
-165=>22354,
-12351=>22357,
-12436=>22375,
-12535=>22390,
-12537=>22391,
-12536=>22392,
-12538=>22393,
-12339=>22395,
-12340=>22396,
-12341=>22397,
-12344=>22398,
-12345=>22399,
-12346=>22400,
-12586=>22401,
-12587=>22402,
-12588=>22403,
-12704=>22404,
-12705=>22405,
-12706=>22406,
-12707=>22407,
-12708=>22408,
-12709=>22409,
-12710=>22410,
-12711=>22411,
-12712=>22412,
-12713=>22413,
-12714=>22414,
-12715=>22415,
-12716=>22416,
-12717=>22417,
-12718=>22418,
-12719=>22419,
-12720=>22420,
-12721=>22421,
-12722=>22422,
-12723=>22423,
-12724=>22424,
-12725=>22425,
-12726=>22426,
-12727=>22427,
-11904=>22428,
-11906=>22429,
-11907=>22430,
-11909=>22431,
-11910=>22432,
-11911=>22433,
-11913=>22434,
-11914=>22435,
-11917=>22436,
-11918=>22437,
-11919=>22438,
-11920=>22439,
-11921=>22440,
-11922=>22441,
-11923=>22442,
-11924=>22443,
-11925=>22444,
-11926=>22445,
-11928=>22446,
-11929=>22447,
-11931=>22448,
-11932=>22449,
-11933=>22450,
-11934=>22451,
-11935=>22452,
-11936=>22453,
-11937=>22454,
-11938=>22455,
-11939=>22456,
-11940=>22457,
-11941=>22458,
-11942=>22459,
-11944=>22460,
-11945=>22461,
-11947=>22462,
-11948=>22463,
-11949=>22464,
-11951=>22465,
-11952=>22466,
-11953=>22467,
-11954=>22468,
-11956=>22469,
-11957=>22470,
-11960=>22471,
-11961=>22472,
-11962=>22473,
-11964=>22474,
-11965=>22475,
-11966=>22476,
-11967=>22477,
-11968=>22478,
-11969=>22479,
-11970=>22480,
-11971=>22481,
-11972=>22482,
-11973=>22483,
-11974=>22484,
-11975=>22485,
-11976=>22486,
-11977=>22487,
-11979=>22488,
-11980=>22489,
-11981=>22490,
-11982=>22491,
-11983=>22492,
-11984=>22493,
-11985=>22494,
-11986=>22495,
-11987=>22496,
-11988=>22497,
-11989=>22498,
-11990=>22499,
-11991=>22500,
-11992=>22501,
-11993=>22502,
-11994=>22503,
-11995=>22504,
-11996=>22505,
-11997=>22506,
-11998=>22507,
-11999=>22508,
-12000=>22509,
-12001=>22510,
-12002=>22511,
-12003=>22512,
-12004=>22513,
-12005=>22514,
-12006=>22515,
-12007=>22516,
-12008=>22517,
-12009=>22518,
-12010=>22519,
-12011=>22520,
-12012=>22521,
-12013=>22522,
-12014=>22523,
-12015=>22524,
-12016=>22525,
-12017=>22526,
-12018=>22527,
-12019=>22528,
-13312=>22529,
-13313=>22530,
-13314=>22531,
-13315=>22532,
-13316=>22533,
-13317=>22534,
-13318=>22535,
-13319=>22536,
-13320=>22537,
-13321=>22538,
-13322=>22539,
-13323=>22540,
-13324=>22541,
-13325=>22542,
-13326=>22543,
-13327=>22544,
-13328=>22545,
-13329=>22546,
-13330=>22547,
-13331=>22548,
-13332=>22549,
-13333=>22550,
-13334=>22551,
-13335=>22552,
-13336=>22553,
-13337=>22554,
-13338=>22555,
-13339=>22556,
-13340=>22557,
-13341=>22558,
-13342=>22559,
-13343=>22560,
-13344=>22561,
-13345=>22562,
-13346=>22563,
-13347=>22564,
-13348=>22565,
-13349=>22566,
-13350=>22567,
-13351=>22568,
-13352=>22569,
-13353=>22570,
-13354=>22571,
-13355=>22572,
-13356=>22573,
-13357=>22574,
-13358=>22575,
-13359=>22576,
-13360=>22577,
-13361=>22578,
-13362=>22579,
-13363=>22580,
-13364=>22581,
-13365=>22582,
-13366=>22583,
-13367=>22584,
-13368=>22585,
-13369=>22586,
-13370=>22587,
-13371=>22588,
-13372=>22589,
-13373=>22590,
-13374=>22591,
-13375=>22592,
-13376=>22593,
-13377=>22594,
-13378=>22595,
-13379=>22596,
-13380=>22597,
-13381=>22598,
-13382=>22599,
-13384=>22600,
-13385=>22601,
-13386=>22602,
-13387=>22603,
-13388=>22604,
-13389=>22605,
-13390=>22606,
-13391=>22607,
-13392=>22608,
-13393=>22609,
-13394=>22610,
-13395=>22611,
-13396=>22612,
-13397=>22613,
-13398=>22614,
-13399=>22615,
-13400=>22616,
-13401=>22617,
-13402=>22618,
-13403=>22619,
-13404=>22620,
-13405=>22621,
-13406=>22622,
-13407=>22623,
-13408=>22624,
-13409=>22625,
-13410=>22626,
-13411=>22627,
-13412=>22628,
-13413=>22629,
-13414=>22630,
-13415=>22631,
-13416=>22632,
-13417=>22633,
-13418=>22634,
-13419=>22635,
-13420=>22636,
-13421=>22637,
-13422=>22638,
-13423=>22639,
-13424=>22640,
-13425=>22641,
-13426=>22642,
-13428=>22643,
-13429=>22644,
-13430=>22645,
-13431=>22646,
-13432=>22647,
-13433=>22648,
-13434=>22649,
-13435=>22650,
-13436=>22651,
-13437=>22652,
-13438=>22653,
-13439=>22654,
-13440=>22655,
-13441=>22656,
-13442=>22657,
-13443=>22658,
-13444=>22659,
-13445=>22660,
-13446=>22661,
-13447=>22662,
-13448=>22663,
-13449=>22664,
-13450=>22665,
-13451=>22666,
-13452=>22667,
-13453=>22668,
-13454=>22669,
-13455=>22670,
-13456=>22671,
-13457=>22672,
-13458=>22673,
-13459=>22674,
-13460=>22675,
-13461=>22676,
-13462=>22677,
-13463=>22678,
-13464=>22679,
-13465=>22680,
-13466=>22681,
-13467=>22682,
-13468=>22683,
-13469=>22684,
-13470=>22685,
-13471=>22686,
-13472=>22687,
-13473=>22688,
-13474=>22689,
-13475=>22690,
-13476=>22691,
-13477=>22692,
-13478=>22693,
-13479=>22694,
-13480=>22695,
-13481=>22696,
-13482=>22697,
-13483=>22698,
-13484=>22699,
-13485=>22700,
-13486=>22701,
-13487=>22702,
-13488=>22703,
-13489=>22704,
-13490=>22705,
-13491=>22706,
-13492=>22707,
-13493=>22708,
-13494=>22709,
-13495=>22710,
-13496=>22711,
-13497=>22712,
-13498=>22713,
-13499=>22714,
-13500=>22715,
-13501=>22716,
-13502=>22717,
-13503=>22718,
-13504=>22719,
-13505=>22720,
-13506=>22721,
-13507=>22722,
-13508=>22723,
-13509=>22724,
-13510=>22725,
-13511=>22726,
-13512=>22727,
-13513=>22728,
-13514=>22729,
-13515=>22730,
-13516=>22731,
-13517=>22732,
-13518=>22733,
-13519=>22734,
-13520=>22735,
-13521=>22736,
-13522=>22737,
-13523=>22738,
-13524=>22739,
-13525=>22740,
-13526=>22741,
-13527=>22742,
-13528=>22743,
-13529=>22744,
-13530=>22745,
-13531=>22746,
-13532=>22747,
-13533=>22748,
-13534=>22749,
-13535=>22750,
-13536=>22751,
-13537=>22752,
-13538=>22753,
-13539=>22754,
-13540=>22755,
-13541=>22756,
-13542=>22757,
-13543=>22758,
-13544=>22759,
-13545=>22760,
-13546=>22761,
-13547=>22762,
-13548=>22763,
-13549=>22764,
-13550=>22765,
-13551=>22766,
-13552=>22767,
-13553=>22768,
-13554=>22769,
-13555=>22770,
-13556=>22771,
-13557=>22772,
-13558=>22773,
-13559=>22774,
-13560=>22775,
-13561=>22776,
-13562=>22777,
-13563=>22778,
-13564=>22779,
-13565=>22780,
-13566=>22781,
-13567=>22782,
-13568=>22783,
-13569=>22784,
-13570=>22785,
-13571=>22786,
-13572=>22787,
-13573=>22788,
-13574=>22789,
-13575=>22790,
-13576=>22791,
-13577=>22792,
-13578=>22793,
-13579=>22794,
-13580=>22795,
-13581=>22796,
-13582=>22797,
-13583=>22798,
-13584=>22799,
-13585=>22800,
-13586=>22801,
-13587=>22802,
-13588=>22803,
-13589=>22804,
-13590=>22805,
-13591=>22806,
-13592=>22807,
-13593=>22808,
-13594=>22809,
-13595=>22810,
-13596=>22811,
-13597=>22812,
-13598=>22813,
-13599=>22814,
-13600=>22815,
-13601=>22816,
-13602=>22817,
-13603=>22818,
-13604=>22819,
-13605=>22820,
-13606=>22821,
-13607=>22822,
-13608=>22823,
-13609=>22824,
-13610=>22825,
-13611=>22826,
-13612=>22827,
-13613=>22828,
-13614=>22829,
-13615=>22830,
-13616=>22831,
-13617=>22832,
-13618=>22833,
-13619=>22834,
-13620=>22835,
-13621=>22836,
-13622=>22837,
-13623=>22838,
-13624=>22839,
-13625=>22840,
-13626=>22841,
-13627=>22842,
-13628=>22843,
-13629=>22844,
-13630=>22845,
-13631=>22846,
-13632=>22847,
-13633=>22848,
-13634=>22849,
-13635=>22850,
-13636=>22851,
-13637=>22852,
-13638=>22853,
-13639=>22854,
-13640=>22855,
-13641=>22856,
-13642=>22857,
-13643=>22858,
-13644=>22859,
-13645=>22860,
-13646=>22861,
-13647=>22862,
-13648=>22863,
-13649=>22864,
-13650=>22865,
-13651=>22866,
-13652=>22867,
-13653=>22868,
-13654=>22869,
-13655=>22870,
-13656=>22871,
-13657=>22872,
-13658=>22873,
-13659=>22874,
-13660=>22875,
-13661=>22876,
-13662=>22877,
-13663=>22878,
-13664=>22879,
-13665=>22880,
-13666=>22881,
-13667=>22882,
-13668=>22883,
-13669=>22884,
-13670=>22885,
-13671=>22886,
-13672=>22887,
-13673=>22888,
-13674=>22889,
-13675=>22890,
-13676=>22891,
-13677=>22892,
-13678=>22893,
-13679=>22894,
-13680=>22895,
-13681=>22896,
-13682=>22897,
-13683=>22898,
-13684=>22899,
-13685=>22900,
-13686=>22901,
-13687=>22902,
-13688=>22903,
-13689=>22904,
-13690=>22905,
-13691=>22906,
-13692=>22907,
-13693=>22908,
-13694=>22909,
-13695=>22910,
-13696=>22911,
-13697=>22912,
-13698=>22913,
-13699=>22914,
-13700=>22915,
-13701=>22916,
-13702=>22917,
-13703=>22918,
-13704=>22919,
-13705=>22920,
-13706=>22921,
-13707=>22922,
-13708=>22923,
-13709=>22924,
-13710=>22925,
-13711=>22926,
-13712=>22927,
-13713=>22928,
-13714=>22929,
-13715=>22930,
-13716=>22931,
-13717=>22932,
-13718=>22933,
-13719=>22934,
-13720=>22935,
-13721=>22936,
-13722=>22937,
-13723=>22938,
-13724=>22939,
-13725=>22940,
-13727=>22941,
-13728=>22942,
-13729=>22943,
-13730=>22944,
-13731=>22945,
-13732=>22946,
-13733=>22947,
-13734=>22948,
-13735=>22949,
-13736=>22950,
-13737=>22951,
-13738=>22952,
-13739=>22953,
-13740=>22954,
-13741=>22955,
-13742=>22956,
-13743=>22957,
-13744=>22958,
-13745=>22959,
-13746=>22960,
-13747=>22961,
-13748=>22962,
-13749=>22963,
-13750=>22964,
-13751=>22965,
-13752=>22966,
-13753=>22967,
-13754=>22968,
-13755=>22969,
-13756=>22970,
-13757=>22971,
-13758=>22972,
-13759=>22973,
-13760=>22974,
-13761=>22975,
-13762=>22976,
-13763=>22977,
-13764=>22978,
-13765=>22979,
-13766=>22980,
-13767=>22981,
-13768=>22982,
-13769=>22983,
-13770=>22984,
-13771=>22985,
-13772=>22986,
-13773=>22987,
-13774=>22988,
-13775=>22989,
-13776=>22990,
-13777=>22991,
-13778=>22992,
-13779=>22993,
-13780=>22994,
-13781=>22995,
-13782=>22996,
-13783=>22997,
-13784=>22998,
-13785=>22999,
-13786=>23000,
-13787=>23001,
-13788=>23002,
-13789=>23003,
-13790=>23004,
-13791=>23005,
-13792=>23006,
-13793=>23007,
-13794=>23008,
-13795=>23009,
-13796=>23010,
-13797=>23011,
-13798=>23012,
-13799=>23013,
-13800=>23014,
-13801=>23015,
-13802=>23016,
-13803=>23017,
-13804=>23018,
-13805=>23019,
-13806=>23020,
-13807=>23021,
-13808=>23022,
-13809=>23023,
-13810=>23024,
-13811=>23025,
-13812=>23026,
-13813=>23027,
-13814=>23028,
-13815=>23029,
-13816=>23030,
-13817=>23031,
-13818=>23032,
-13819=>23033,
-13820=>23034,
-13821=>23035,
-13822=>23036,
-13823=>23037,
-13824=>23038,
-13825=>23039,
-13826=>23040,
-13827=>23041,
-13828=>23042,
-13829=>23043,
-13830=>23044,
-13831=>23045,
-13832=>23046,
-13833=>23047,
-13834=>23048,
-13835=>23049,
-13836=>23050,
-13837=>23051,
-13839=>23052,
-13840=>23053,
-13841=>23054,
-13842=>23055,
-13843=>23056,
-13844=>23057,
-13845=>23058,
-13846=>23059,
-13847=>23060,
-13848=>23061,
-13849=>23062,
-13851=>23063,
-13852=>23064,
-13853=>23065,
-13854=>23066,
-13855=>23067,
-13856=>23068,
-13857=>23069,
-13858=>23070,
-13859=>23071,
-13860=>23072,
-13861=>23073,
-13862=>23074,
-13863=>23075,
-13864=>23076,
-13865=>23077,
-13866=>23078,
-13867=>23079,
-13868=>23080,
-13869=>23081,
-13870=>23082,
-13871=>23083,
-13872=>23084,
-13873=>23085,
-13874=>23086,
-13875=>23087,
-13876=>23088,
-13877=>23089,
-13878=>23090,
-13879=>23091,
-13880=>23092,
-13881=>23093,
-13882=>23094,
-13883=>23095,
-13884=>23096,
-13885=>23097,
-13886=>23098,
-13887=>23099,
-13888=>23100,
-13889=>23101,
-13890=>23102,
-13891=>23103,
-13892=>23104,
-13893=>23105,
-13894=>23106,
-13895=>23107,
-13896=>23108,
-13897=>23109,
-13898=>23110,
-13899=>23111,
-13900=>23112,
-13901=>23113,
-13902=>23114,
-13903=>23115,
-13904=>23116,
-13905=>23117,
-13906=>23118,
-13907=>23119,
-13908=>23120,
-13909=>23121,
-13910=>23122,
-13911=>23123,
-13912=>23124,
-13913=>23125,
-13914=>23126,
-13915=>23127,
-13916=>23128,
-13917=>23129,
-13918=>23130,
-13919=>23131,
-13920=>23132,
-13921=>23133,
-13922=>23134,
-13923=>23135,
-13924=>23136,
-13925=>23137,
-13926=>23138,
-13927=>23139,
-13928=>23140,
-13929=>23141,
-13930=>23142,
-13931=>23143,
-13932=>23144,
-13933=>23145,
-13934=>23146,
-13935=>23147,
-13936=>23148,
-13937=>23149,
-13938=>23150,
-13939=>23151,
-13940=>23152,
-13941=>23153,
-13942=>23154,
-13943=>23155,
-13944=>23156,
-13945=>23157,
-13946=>23158,
-13947=>23159,
-13948=>23160,
-13949=>23161,
-13950=>23162,
-13951=>23163,
-13952=>23164,
-13953=>23165,
-13954=>23166,
-13955=>23167,
-13956=>23168,
-13957=>23169,
-13958=>23170,
-13959=>23171,
-13960=>23172,
-13961=>23173,
-13962=>23174,
-13963=>23175,
-13964=>23176,
-13965=>23177,
-13966=>23178,
-13967=>23179,
-13968=>23180,
-13969=>23181,
-13970=>23182,
-13971=>23183,
-13972=>23184,
-13973=>23185,
-13974=>23186,
-13975=>23187,
-13976=>23188,
-13977=>23189,
-13978=>23190,
-13979=>23191,
-13980=>23192,
-13981=>23193,
-13982=>23194,
-13983=>23195,
-13984=>23196,
-13985=>23197,
-13986=>23198,
-13987=>23199,
-13988=>23200,
-13989=>23201,
-13990=>23202,
-13991=>23203,
-13992=>23204,
-13993=>23205,
-13994=>23206,
-13995=>23207,
-13996=>23208,
-13997=>23209,
-13998=>23210,
-13999=>23211,
-14000=>23212,
-14001=>23213,
-14002=>23214,
-14003=>23215,
-14004=>23216,
-14005=>23217,
-14006=>23218,
-14007=>23219,
-14008=>23220,
-14009=>23221,
-14010=>23222,
-14011=>23223,
-14012=>23224,
-14013=>23225,
-14014=>23226,
-14015=>23227,
-14016=>23228,
-14017=>23229,
-14018=>23230,
-14019=>23231,
-14020=>23232,
-14021=>23233,
-14022=>23234,
-14023=>23235,
-14024=>23236,
-14025=>23237,
-14026=>23238,
-14027=>23239,
-14028=>23240,
-14029=>23241,
-14030=>23242,
-14031=>23243,
-14032=>23244,
-14033=>23245,
-14034=>23246,
-14035=>23247,
-14036=>23248,
-14037=>23249,
-14038=>23250,
-14039=>23251,
-14040=>23252,
-14041=>23253,
-14042=>23254,
-14043=>23255,
-14044=>23256,
-14045=>23257,
-14046=>23258,
-14047=>23259,
-14048=>23260,
-14049=>23261,
-14050=>23262,
-14051=>23263,
-14052=>23264,
-14053=>23265,
-14054=>23266,
-14055=>23267,
-14056=>23268,
-14057=>23269,
-14058=>23270,
-14059=>23271,
-14060=>23272,
-14061=>23273,
-14062=>23274,
-14063=>23275,
-14064=>23276,
-14065=>23277,
-14066=>23278,
-14067=>23279,
-14068=>23280,
-14069=>23281,
-14070=>23282,
-14071=>23283,
-14072=>23284,
-14073=>23285,
-14074=>23286,
-14075=>23287,
-14076=>23288,
-14077=>23289,
-14078=>23290,
-14079=>23291,
-14080=>23292,
-14081=>23293,
-14082=>23294,
-14083=>23295,
-14084=>23296,
-14085=>23297,
-14086=>23298,
-14087=>23299,
-14088=>23300,
-14089=>23301,
-14090=>23302,
-14091=>23303,
-14092=>23304,
-14093=>23305,
-14094=>23306,
-14095=>23307,
-14096=>23308,
-14097=>23309,
-14098=>23310,
-14099=>23311,
-14100=>23312,
-14101=>23313,
-14102=>23314,
-14103=>23315,
-14104=>23316,
-14105=>23317,
-14106=>23318,
-14107=>23319,
-14108=>23320,
-14109=>23321,
-14110=>23322,
-14111=>23323,
-14112=>23324,
-14113=>23325,
-14114=>23326,
-14115=>23327,
-14116=>23328,
-14117=>23329,
-14118=>23330,
-14119=>23331,
-14120=>23332,
-14121=>23333,
-14122=>23334,
-14123=>23335,
-14124=>23336,
-14125=>23337,
-14126=>23338,
-14127=>23339,
-14128=>23340,
-14129=>23341,
-14130=>23342,
-14131=>23343,
-14132=>23344,
-14133=>23345,
-14134=>23346,
-14135=>23347,
-14136=>23348,
-14137=>23349,
-14138=>23350,
-14139=>23351,
-14140=>23352,
-14141=>23353,
-14142=>23354,
-14143=>23355,
-14144=>23356,
-14145=>23357,
-14146=>23358,
-14147=>23359,
-14148=>23360,
-14149=>23361,
-14150=>23362,
-14151=>23363,
-14152=>23364,
-14153=>23365,
-14154=>23366,
-14155=>23367,
-14156=>23368,
-14157=>23369,
-14158=>23370,
-14159=>23371,
-14160=>23372,
-14161=>23373,
-14162=>23374,
-14163=>23375,
-14164=>23376,
-14165=>23377,
-14166=>23378,
-14167=>23379,
-14168=>23380,
-14169=>23381,
-14170=>23382,
-14171=>23383,
-14172=>23384,
-14173=>23385,
-14174=>23386,
-14175=>23387,
-14176=>23388,
-14177=>23389,
-14178=>23390,
-14179=>23391,
-14180=>23392,
-14181=>23393,
-14182=>23394,
-14183=>23395,
-14184=>23396,
-14185=>23397,
-14186=>23398,
-14187=>23399,
-14188=>23400,
-14189=>23401,
-14190=>23402,
-14191=>23403,
-14192=>23404,
-14193=>23405,
-14194=>23406,
-14195=>23407,
-14196=>23408,
-14197=>23409,
-14198=>23410,
-14199=>23411,
-14200=>23412,
-14201=>23413,
-14202=>23414,
-14203=>23415,
-14204=>23416,
-14205=>23417,
-14206=>23418,
-14207=>23419,
-14208=>23420,
-14209=>23421,
-14210=>23422,
-14211=>23423,
-14212=>23424,
-14213=>23425,
-14214=>23426,
-14215=>23427,
-14216=>23428,
-14217=>23429,
-14218=>23430,
-14219=>23431,
-14220=>23432,
-14221=>23433,
-14222=>23434,
-14223=>23435,
-14224=>23436,
-14225=>23437,
-14226=>23438,
-14227=>23439,
-14228=>23440,
-14229=>23441,
-14230=>23442,
-14231=>23443,
-14232=>23444,
-14233=>23445,
-14234=>23446,
-14235=>23447,
-14236=>23448,
-14237=>23449,
-14238=>23450,
-14239=>23451,
-14240=>23452,
-14241=>23453,
-14242=>23454,
-14243=>23455,
-14244=>23456,
-14245=>23457,
-14246=>23458,
-14247=>23459,
-14248=>23460,
-14249=>23461,
-14250=>23462,
-14251=>23463,
-14252=>23464,
-14253=>23465,
-14254=>23466,
-14255=>23467,
-14256=>23468,
-14257=>23469,
-14258=>23470,
-14259=>23471,
-14260=>23472,
-14261=>23473,
-14262=>23474,
-14263=>23475,
-14264=>23476,
-14265=>23477,
-14266=>23478,
-14267=>23479,
-14268=>23480,
-14269=>23481,
-14270=>23482,
-14271=>23483,
-14272=>23484,
-14273=>23485,
-14274=>23486,
-14275=>23487,
-14276=>23488,
-14277=>23489,
-14278=>23490,
-14279=>23491,
-14280=>23492,
-14281=>23493,
-14282=>23494,
-14283=>23495,
-14284=>23496,
-14285=>23497,
-14286=>23498,
-14287=>23499,
-14288=>23500,
-14289=>23501,
-14290=>23502,
-14291=>23503,
-14292=>23504,
-14293=>23505,
-14294=>23506,
-14295=>23507,
-14296=>23508,
-14297=>23509,
-14298=>23510,
-14299=>23511,
-14300=>23512,
-14301=>23513,
-14302=>23514,
-14303=>23515,
-14304=>23516,
-14305=>23517,
-14306=>23518,
-14307=>23519,
-14308=>23520,
-14309=>23521,
-14310=>23522,
-14311=>23523,
-14312=>23524,
-14313=>23525,
-14314=>23526,
-14315=>23527,
-14316=>23528,
-14317=>23529,
-14318=>23530,
-14319=>23531,
-14320=>23532,
-14321=>23533,
-14322=>23534,
-14323=>23535,
-14324=>23536,
-14325=>23537,
-14326=>23538,
-14327=>23539,
-14328=>23540,
-14329=>23541,
-14330=>23542,
-14331=>23543,
-14332=>23544,
-14333=>23545,
-14334=>23546,
-14335=>23547,
-14336=>23548,
-14337=>23549,
-14338=>23550,
-14339=>23551,
-14340=>23552,
-14341=>23553,
-14342=>23554,
-14343=>23555,
-14344=>23556,
-14345=>23557,
-14346=>23558,
-14347=>23559,
-14348=>23560,
-14349=>23561,
-14350=>23562,
-14351=>23563,
-14352=>23564,
-14353=>23565,
-14354=>23566,
-14355=>23567,
-14356=>23568,
-14357=>23569,
-14358=>23570,
-14359=>23571,
-14360=>23572,
-14361=>23573,
-14362=>23574,
-14363=>23575,
-14364=>23576,
-14365=>23577,
-14366=>23578,
-14367=>23579,
-14368=>23580,
-14369=>23581,
-14370=>23582,
-14371=>23583,
-14372=>23584,
-14373=>23585,
-14374=>23586,
-14375=>23587,
-14376=>23588,
-14377=>23589,
-14378=>23590,
-14379=>23591,
-14380=>23592,
-14381=>23593,
-14382=>23594,
-14383=>23595,
-14384=>23596,
-14385=>23597,
-14386=>23598,
-14387=>23599,
-14388=>23600,
-14389=>23601,
-14390=>23602,
-14391=>23603,
-14392=>23604,
-14393=>23605,
-14394=>23606,
-14395=>23607,
-14396=>23608,
-14397=>23609,
-14398=>23610,
-14399=>23611,
-14400=>23612,
-14401=>23613,
-14402=>23614,
-14403=>23615,
-14404=>23616,
-14405=>23617,
-14406=>23618,
-14407=>23619,
-14408=>23620,
-14409=>23621,
-14410=>23622,
-14411=>23623,
-14412=>23624,
-14413=>23625,
-14414=>23626,
-14415=>23627,
-14416=>23628,
-14417=>23629,
-14418=>23630,
-14419=>23631,
-14420=>23632,
-14421=>23633,
-14422=>23634,
-14423=>23635,
-14424=>23636,
-14425=>23637,
-14426=>23638,
-14427=>23639,
-14428=>23640,
-14429=>23641,
-14430=>23642,
-14431=>23643,
-14432=>23644,
-14433=>23645,
-14434=>23646,
-14435=>23647,
-14436=>23648,
-14437=>23649,
-14438=>23650,
-14439=>23651,
-14440=>23652,
-14441=>23653,
-14442=>23654,
-14443=>23655,
-14444=>23656,
-14445=>23657,
-14446=>23658,
-14447=>23659,
-14448=>23660,
-14449=>23661,
-14450=>23662,
-14451=>23663,
-14452=>23664,
-14453=>23665,
-14454=>23666,
-14455=>23667,
-14456=>23668,
-14457=>23669,
-14458=>23670,
-14459=>23671,
-14460=>23672,
-14461=>23673,
-14462=>23674,
-14463=>23675,
-14464=>23676,
-14465=>23677,
-14466=>23678,
-14467=>23679,
-14468=>23680,
-14469=>23681,
-14470=>23682,
-14471=>23683,
-14472=>23684,
-14473=>23685,
-14474=>23686,
-14475=>23687,
-14476=>23688,
-14477=>23689,
-14478=>23690,
-14479=>23691,
-14480=>23692,
-14481=>23693,
-14482=>23694,
-14483=>23695,
-14484=>23696,
-14485=>23697,
-14486=>23698,
-14487=>23699,
-14488=>23700,
-14489=>23701,
-14490=>23702,
-14491=>23703,
-14492=>23704,
-14493=>23705,
-14494=>23706,
-14495=>23707,
-14496=>23708,
-14497=>23709,
-14498=>23710,
-14499=>23711,
-14500=>23712,
-14501=>23713,
-14502=>23714,
-14503=>23715,
-14504=>23716,
-14505=>23717,
-14506=>23718,
-14507=>23719,
-14508=>23720,
-14509=>23721,
-14510=>23722,
-14511=>23723,
-14512=>23724,
-14513=>23725,
-14514=>23726,
-14515=>23727,
-14516=>23728,
-14517=>23729,
-14518=>23730,
-14519=>23731,
-14520=>23732,
-14521=>23733,
-14522=>23734,
-14523=>23735,
-14524=>23736,
-14525=>23737,
-14526=>23738,
-14527=>23739,
-14528=>23740,
-14529=>23741,
-14530=>23742,
-14531=>23743,
-14532=>23744,
-14533=>23745,
-14534=>23746,
-14535=>23747,
-14536=>23748,
-14537=>23749,
-14538=>23750,
-14539=>23751,
-14540=>23752,
-14541=>23753,
-14542=>23754,
-14543=>23755,
-14544=>23756,
-14545=>23757,
-14546=>23758,
-14547=>23759,
-14548=>23760,
-14549=>23761,
-14550=>23762,
-14551=>23763,
-14552=>23764,
-14553=>23765,
-14554=>23766,
-14555=>23767,
-14556=>23768,
-14557=>23769,
-14558=>23770,
-14559=>23771,
-14560=>23772,
-14561=>23773,
-14562=>23774,
-14563=>23775,
-14564=>23776,
-14565=>23777,
-14566=>23778,
-14567=>23779,
-14568=>23780,
-14569=>23781,
-14570=>23782,
-14571=>23783,
-14572=>23784,
-14573=>23785,
-14574=>23786,
-14575=>23787,
-14576=>23788,
-14577=>23789,
-14578=>23790,
-14579=>23791,
-14580=>23792,
-14581=>23793,
-14582=>23794,
-14583=>23795,
-14584=>23796,
-14585=>23797,
-14586=>23798,
-14587=>23799,
-14588=>23800,
-14589=>23801,
-14590=>23802,
-14591=>23803,
-14592=>23804,
-14593=>23805,
-14594=>23806,
-14595=>23807,
-14596=>23808,
-14597=>23809,
-14598=>23810,
-14599=>23811,
-14600=>23812,
-14601=>23813,
-14602=>23814,
-14603=>23815,
-14604=>23816,
-14605=>23817,
-14606=>23818,
-14607=>23819,
-14608=>23820,
-14609=>23821,
-14610=>23822,
-14611=>23823,
-14612=>23824,
-14613=>23825,
-14614=>23826,
-14615=>23827,
-14617=>23828,
-14618=>23829,
-14619=>23830,
-14620=>23831,
-14621=>23832,
-14622=>23833,
-14623=>23834,
-14624=>23835,
-14625=>23836,
-14626=>23837,
-14627=>23838,
-14628=>23839,
-14629=>23840,
-14630=>23841,
-14631=>23842,
-14632=>23843,
-14633=>23844,
-14634=>23845,
-14635=>23846,
-14636=>23847,
-14637=>23848,
-14638=>23849,
-14639=>23850,
-14640=>23851,
-14641=>23852,
-14642=>23853,
-14643=>23854,
-14644=>23855,
-14645=>23856,
-14646=>23857,
-14647=>23858,
-14648=>23859,
-14649=>23860,
-14650=>23861,
-14651=>23862,
-14652=>23863,
-14653=>23864,
-14654=>23865,
-14655=>23866,
-14656=>23867,
-14657=>23868,
-14658=>23869,
-14659=>23870,
-14660=>23871,
-14661=>23872,
-14662=>23873,
-14663=>23874,
-14664=>23875,
-14665=>23876,
-14666=>23877,
-14667=>23878,
-14668=>23879,
-14669=>23880,
-14670=>23881,
-14671=>23882,
-14672=>23883,
-14673=>23884,
-14674=>23885,
-14675=>23886,
-14676=>23887,
-14677=>23888,
-14678=>23889,
-14679=>23890,
-14680=>23891,
-14681=>23892,
-14682=>23893,
-14683=>23894,
-14684=>23895,
-14685=>23896,
-14686=>23897,
-14687=>23898,
-14688=>23899,
-14689=>23900,
-14690=>23901,
-14691=>23902,
-14692=>23903,
-14693=>23904,
-14694=>23905,
-14695=>23906,
-14696=>23907,
-14697=>23908,
-14698=>23909,
-14699=>23910,
-14700=>23911,
-14701=>23912,
-14703=>23913,
-14704=>23914,
-14705=>23915,
-14706=>23916,
-14707=>23917,
-14708=>23918,
-14709=>23919,
-14710=>23920,
-14711=>23921,
-14712=>23922,
-14713=>23923,
-14714=>23924,
-14715=>23925,
-14716=>23926,
-14717=>23927,
-14718=>23928,
-14719=>23929,
-14720=>23930,
-14721=>23931,
-14722=>23932,
-14723=>23933,
-14724=>23934,
-14725=>23935,
-14726=>23936,
-14727=>23937,
-14728=>23938,
-14729=>23939,
-14730=>23940,
-14731=>23941,
-14732=>23942,
-14733=>23943,
-14734=>23944,
-14735=>23945,
-14736=>23946,
-14737=>23947,
-14738=>23948,
-14739=>23949,
-14740=>23950,
-14741=>23951,
-14742=>23952,
-14743=>23953,
-14744=>23954,
-14745=>23955,
-14746=>23956,
-14747=>23957,
-14748=>23958,
-14749=>23959,
-14750=>23960,
-14751=>23961,
-14752=>23962,
-14753=>23963,
-14754=>23964,
-14755=>23965,
-14756=>23966,
-14757=>23967,
-14758=>23968,
-14759=>23969,
-14760=>23970,
-14761=>23971,
-14762=>23972,
-14763=>23973,
-14764=>23974,
-14765=>23975,
-14766=>23976,
-14767=>23977,
-14768=>23978,
-14769=>23979,
-14770=>23980,
-14771=>23981,
-14772=>23982,
-14773=>23983,
-14774=>23984,
-14775=>23985,
-14776=>23986,
-14777=>23987,
-14778=>23988,
-14779=>23989,
-14780=>23990,
-14781=>23991,
-14782=>23992,
-14783=>23993,
-14784=>23994,
-14785=>23995,
-14786=>23996,
-14787=>23997,
-14788=>23998,
-14789=>23999,
-14790=>24000,
-14791=>24001,
-14792=>24002,
-14793=>24003,
-14794=>24004,
-14795=>24005,
-14796=>24006,
-14797=>24007,
-14798=>24008,
-14801=>24009,
-14802=>24010,
-14803=>24011,
-14804=>24012,
-14805=>24013,
-14806=>24014,
-14807=>24015,
-14808=>24016,
-14809=>24017,
-14810=>24018,
-14811=>24019,
-14812=>24020,
-14813=>24021,
-14814=>24022,
-14816=>24023,
-14817=>24024,
-14818=>24025,
-14819=>24026,
-14820=>24027,
-14821=>24028,
-14822=>24029,
-14823=>24030,
-14824=>24031,
-14825=>24032,
-14826=>24033,
-14827=>24034,
-14828=>24035,
-14829=>24036,
-14830=>24037,
-14831=>24038,
-14832=>24039,
-14833=>24040,
-14834=>24041,
-14835=>24042,
-14836=>24043,
-14837=>24044,
-14838=>24045,
-14839=>24046,
-14840=>24047,
-14841=>24048,
-14842=>24049,
-14843=>24050,
-14844=>24051,
-14845=>24052,
-14846=>24053,
-14847=>24054,
-14848=>24055,
-14849=>24056,
-14850=>24057,
-14851=>24058,
-14852=>24059,
-14853=>24060,
-14854=>24061,
-14855=>24062,
-14856=>24063,
-14857=>24064,
-14858=>24065,
-14859=>24066,
-14860=>24067,
-14861=>24068,
-14862=>24069,
-14863=>24070,
-14864=>24071,
-14865=>24072,
-14866=>24073,
-14867=>24074,
-14868=>24075,
-14869=>24076,
-14870=>24077,
-14871=>24078,
-14872=>24079,
-14873=>24080,
-14874=>24081,
-14875=>24082,
-14876=>24083,
-14877=>24084,
-14878=>24085,
-14879=>24086,
-14880=>24087,
-14881=>24088,
-14882=>24089,
-14883=>24090,
-14884=>24091,
-14885=>24092,
-14886=>24093,
-14887=>24094,
-14888=>24095,
-14889=>24096,
-14890=>24097,
-14891=>24098,
-14892=>24099,
-14893=>24100,
-14894=>24101,
-14895=>24102,
-14896=>24103,
-14897=>24104,
-14898=>24105,
-14899=>24106,
-14900=>24107,
-14901=>24108,
-14902=>24109,
-14903=>24110,
-14904=>24111,
-14905=>24112,
-14906=>24113,
-14907=>24114,
-14908=>24115,
-14909=>24116,
-14910=>24117,
-14911=>24118,
-14912=>24119,
-14913=>24120,
-14914=>24121,
-14915=>24122,
-14916=>24123,
-14917=>24124,
-14918=>24125,
-14919=>24126,
-14920=>24127,
-14921=>24128,
-14922=>24129,
-14923=>24130,
-14924=>24131,
-14925=>24132,
-14926=>24133,
-14927=>24134,
-14928=>24135,
-14929=>24136,
-14930=>24137,
-14931=>24138,
-14932=>24139,
-14933=>24140,
-14934=>24141,
-14935=>24142,
-14936=>24143,
-14937=>24144,
-14938=>24145,
-14939=>24146,
-14940=>24147,
-14941=>24148,
-14942=>24149,
-14943=>24150,
-14944=>24151,
-14945=>24152,
-14946=>24153,
-14947=>24154,
-14948=>24155,
-14949=>24156,
-14950=>24157,
-14951=>24158,
-14952=>24159,
-14953=>24160,
-14954=>24161,
-14955=>24162,
-14956=>24163,
-14957=>24164,
-14958=>24165,
-14959=>24166,
-14960=>24167,
-14961=>24168,
-14962=>24169,
-14964=>24170,
-14965=>24171,
-14966=>24172,
-14967=>24173,
-14968=>24174,
-14969=>24175,
-14970=>24176,
-14971=>24177,
-14972=>24178,
-14973=>24179,
-14974=>24180,
-14975=>24181,
-14976=>24182,
-14977=>24183,
-14978=>24184,
-14979=>24185,
-14980=>24186,
-14981=>24187,
-14982=>24188,
-14983=>24189,
-14984=>24190,
-14985=>24191,
-14986=>24192,
-14987=>24193,
-14988=>24194,
-14989=>24195,
-14990=>24196,
-14991=>24197,
-14992=>24198,
-14993=>24199,
-14994=>24200,
-14995=>24201,
-14996=>24202,
-14997=>24203,
-14998=>24204,
-14999=>24205,
-15000=>24206,
-15001=>24207,
-15002=>24208,
-15003=>24209,
-15004=>24210,
-15005=>24211,
-15006=>24212,
-15007=>24213,
-15008=>24214,
-15009=>24215,
-15010=>24216,
-15011=>24217,
-15012=>24218,
-15013=>24219,
-15014=>24220,
-15015=>24221,
-15016=>24222,
-15017=>24223,
-15018=>24224,
-15019=>24225,
-15020=>24226,
-15021=>24227,
-15022=>24228,
-15023=>24229,
-15024=>24230,
-15025=>24231,
-15026=>24232,
-15027=>24233,
-15028=>24234,
-15029=>24235,
-15030=>24236,
-15031=>24237,
-15032=>24238,
-15033=>24239,
-15034=>24240,
-15035=>24241,
-15036=>24242,
-15037=>24243,
-15038=>24244,
-15039=>24245,
-15040=>24246,
-15041=>24247,
-15042=>24248,
-15043=>24249,
-15044=>24250,
-15045=>24251,
-15046=>24252,
-15047=>24253,
-15048=>24254,
-15049=>24255,
-15050=>24256,
-15051=>24257,
-15052=>24258,
-15053=>24259,
-15054=>24260,
-15055=>24261,
-15056=>24262,
-15057=>24263,
-15058=>24264,
-15059=>24265,
-15060=>24266,
-15061=>24267,
-15062=>24268,
-15063=>24269,
-15064=>24270,
-15065=>24271,
-15066=>24272,
-15067=>24273,
-15068=>24274,
-15069=>24275,
-15070=>24276,
-15071=>24277,
-15072=>24278,
-15073=>24279,
-15074=>24280,
-15075=>24281,
-15076=>24282,
-15077=>24283,
-15078=>24284,
-15079=>24285,
-15080=>24286,
-15081=>24287,
-15082=>24288,
-15083=>24289,
-15084=>24290,
-15085=>24291,
-15086=>24292,
-15087=>24293,
-15088=>24294,
-15089=>24295,
-15090=>24296,
-15091=>24297,
-15092=>24298,
-15093=>24299,
-15094=>24300,
-15095=>24301,
-15096=>24302,
-15097=>24303,
-15098=>24304,
-15099=>24305,
-15100=>24306,
-15101=>24307,
-15102=>24308,
-15103=>24309,
-15104=>24310,
-15105=>24311,
-15106=>24312,
-15107=>24313,
-15108=>24314,
-15109=>24315,
-15110=>24316,
-15111=>24317,
-15112=>24318,
-15113=>24319,
-15114=>24320,
-15115=>24321,
-15116=>24322,
-15117=>24323,
-15118=>24324,
-15119=>24325,
-15120=>24326,
-15121=>24327,
-15122=>24328,
-15123=>24329,
-15124=>24330,
-15125=>24331,
-15126=>24332,
-15127=>24333,
-15128=>24334,
-15129=>24335,
-15130=>24336,
-15131=>24337,
-15132=>24338,
-15133=>24339,
-15134=>24340,
-15135=>24341,
-15136=>24342,
-15137=>24343,
-15138=>24344,
-15139=>24345,
-15140=>24346,
-15141=>24347,
-15142=>24348,
-15143=>24349,
-15144=>24350,
-15145=>24351,
-15146=>24352,
-15147=>24353,
-15148=>24354,
-15149=>24355,
-15150=>24356,
-15151=>24357,
-15152=>24358,
-15153=>24359,
-15154=>24360,
-15155=>24361,
-15156=>24362,
-15157=>24363,
-15158=>24364,
-15159=>24365,
-15160=>24366,
-15161=>24367,
-15162=>24368,
-15163=>24369,
-15164=>24370,
-15165=>24371,
-15166=>24372,
-15167=>24373,
-15168=>24374,
-15169=>24375,
-15170=>24376,
-15171=>24377,
-15172=>24378,
-15173=>24379,
-15174=>24380,
-15175=>24381,
-15176=>24382,
-15177=>24383,
-15178=>24384,
-15179=>24385,
-15180=>24386,
-15181=>24387,
-15183=>24388,
-15184=>24389,
-15185=>24390,
-15186=>24391,
-15187=>24392,
-15188=>24393,
-15189=>24394,
-15190=>24395,
-15191=>24396,
-15192=>24397,
-15193=>24398,
-15194=>24399,
-15195=>24400,
-15196=>24401,
-15197=>24402,
-15198=>24403,
-15199=>24404,
-15200=>24405,
-15201=>24406,
-15202=>24407,
-15203=>24408,
-15204=>24409,
-15205=>24410,
-15206=>24411,
-15207=>24412,
-15208=>24413,
-15209=>24414,
-15210=>24415,
-15211=>24416,
-15212=>24417,
-15213=>24418,
-15214=>24419,
-15215=>24420,
-15216=>24421,
-15217=>24422,
-15218=>24423,
-15219=>24424,
-15220=>24425,
-15221=>24426,
-15222=>24427,
-15223=>24428,
-15224=>24429,
-15225=>24430,
-15226=>24431,
-15227=>24432,
-15228=>24433,
-15229=>24434,
-15230=>24435,
-15231=>24436,
-15232=>24437,
-15233=>24438,
-15234=>24439,
-15235=>24440,
-15236=>24441,
-15237=>24442,
-15238=>24443,
-15239=>24444,
-15240=>24445,
-15241=>24446,
-15242=>24447,
-15243=>24448,
-15244=>24449,
-15245=>24450,
-15246=>24451,
-15247=>24452,
-15248=>24453,
-15249=>24454,
-15250=>24455,
-15251=>24456,
-15252=>24457,
-15253=>24458,
-15254=>24459,
-15255=>24460,
-15256=>24461,
-15257=>24462,
-15258=>24463,
-15259=>24464,
-15260=>24465,
-15261=>24466,
-15262=>24467,
-15263=>24468,
-15264=>24469,
-15265=>24470,
-15266=>24471,
-15267=>24472,
-15268=>24473,
-15269=>24474,
-15270=>24475,
-15271=>24476,
-15272=>24477,
-15273=>24478,
-15274=>24479,
-15275=>24480,
-15276=>24481,
-15277=>24482,
-15278=>24483,
-15279=>24484,
-15280=>24485,
-15281=>24486,
-15282=>24487,
-15283=>24488,
-15284=>24489,
-15285=>24490,
-15286=>24491,
-15287=>24492,
-15288=>24493,
-15289=>24494,
-15290=>24495,
-15291=>24496,
-15292=>24497,
-15293=>24498,
-15294=>24499,
-15295=>24500,
-15296=>24501,
-15297=>24502,
-15298=>24503,
-15299=>24504,
-15300=>24505,
-15301=>24506,
-15302=>24507,
-15303=>24508,
-15304=>24509,
-15305=>24510,
-15306=>24511,
-15307=>24512,
-15308=>24513,
-15309=>24514,
-15310=>24515,
-15311=>24516,
-15312=>24517,
-15313=>24518,
-15314=>24519,
-15315=>24520,
-15316=>24521,
-15317=>24522,
-15318=>24523,
-15319=>24524,
-15320=>24525,
-15321=>24526,
-15322=>24527,
-15323=>24528,
-15324=>24529,
-15325=>24530,
-15326=>24531,
-15327=>24532,
-15328=>24533,
-15329=>24534,
-15330=>24535,
-15331=>24536,
-15332=>24537,
-15333=>24538,
-15334=>24539,
-15335=>24540,
-15336=>24541,
-15337=>24542,
-15338=>24543,
-15339=>24544,
-15340=>24545,
-15341=>24546,
-15342=>24547,
-15343=>24548,
-15344=>24549,
-15345=>24550,
-15346=>24551,
-15347=>24552,
-15348=>24553,
-15349=>24554,
-15350=>24555,
-15351=>24556,
-15352=>24557,
-15353=>24558,
-15354=>24559,
-15355=>24560,
-15356=>24561,
-15357=>24562,
-15358=>24563,
-15359=>24564,
-15360=>24565,
-15361=>24566,
-15362=>24567,
-15363=>24568,
-15364=>24569,
-15365=>24570,
-15366=>24571,
-15367=>24572,
-15368=>24573,
-15369=>24574,
-15370=>24575,
-15371=>24576,
-15372=>24577,
-15373=>24578,
-15374=>24579,
-15375=>24580,
-15376=>24581,
-15377=>24582,
-15378=>24583,
-15379=>24584,
-15380=>24585,
-15381=>24586,
-15382=>24587,
-15383=>24588,
-15384=>24589,
-15385=>24590,
-15386=>24591,
-15387=>24592,
-15388=>24593,
-15389=>24594,
-15390=>24595,
-15391=>24596,
-15392=>24597,
-15393=>24598,
-15394=>24599,
-15395=>24600,
-15396=>24601,
-15397=>24602,
-15398=>24603,
-15399=>24604,
-15400=>24605,
-15401=>24606,
-15402=>24607,
-15403=>24608,
-15404=>24609,
-15405=>24610,
-15406=>24611,
-15407=>24612,
-15408=>24613,
-15409=>24614,
-15410=>24615,
-15411=>24616,
-15412=>24617,
-15413=>24618,
-15414=>24619,
-15415=>24620,
-15416=>24621,
-15417=>24622,
-15418=>24623,
-15419=>24624,
-15420=>24625,
-15421=>24626,
-15422=>24627,
-15423=>24628,
-15424=>24629,
-15425=>24630,
-15426=>24631,
-15427=>24632,
-15428=>24633,
-15429=>24634,
-15430=>24635,
-15431=>24636,
-15432=>24637,
-15433=>24638,
-15434=>24639,
-15435=>24640,
-15436=>24641,
-15437=>24642,
-15438=>24643,
-15439=>24644,
-15440=>24645,
-15441=>24646,
-15442=>24647,
-15443=>24648,
-15444=>24649,
-15445=>24650,
-15446=>24651,
-15447=>24652,
-15448=>24653,
-15449=>24654,
-15450=>24655,
-15451=>24656,
-15452=>24657,
-15453=>24658,
-15454=>24659,
-15455=>24660,
-15456=>24661,
-15457=>24662,
-15458=>24663,
-15459=>24664,
-15460=>24665,
-15461=>24666,
-15462=>24667,
-15463=>24668,
-15464=>24669,
-15465=>24670,
-15466=>24671,
-15467=>24672,
-15468=>24673,
-15469=>24674,
-15471=>24675,
-15472=>24676,
-15473=>24677,
-15474=>24678,
-15475=>24679,
-15476=>24680,
-15477=>24681,
-15478=>24682,
-15479=>24683,
-15480=>24684,
-15481=>24685,
-15482=>24686,
-15483=>24687,
-15484=>24688,
-15485=>24689,
-15486=>24690,
-15487=>24691,
-15488=>24692,
-15489=>24693,
-15490=>24694,
-15491=>24695,
-15492=>24696,
-15493=>24697,
-15494=>24698,
-15495=>24699,
-15496=>24700,
-15497=>24701,
-15498=>24702,
-15499=>24703,
-15500=>24704,
-15501=>24705,
-15502=>24706,
-15503=>24707,
-15504=>24708,
-15505=>24709,
-15506=>24710,
-15507=>24711,
-15508=>24712,
-15509=>24713,
-15510=>24714,
-15511=>24715,
-15512=>24716,
-15513=>24717,
-15514=>24718,
-15515=>24719,
-15516=>24720,
-15517=>24721,
-15518=>24722,
-15519=>24723,
-15520=>24724,
-15521=>24725,
-15522=>24726,
-15523=>24727,
-15524=>24728,
-15525=>24729,
-15526=>24730,
-15527=>24731,
-15528=>24732,
-15529=>24733,
-15530=>24734,
-15531=>24735,
-15532=>24736,
-15533=>24737,
-15534=>24738,
-15535=>24739,
-15536=>24740,
-15537=>24741,
-15538=>24742,
-15539=>24743,
-15540=>24744,
-15541=>24745,
-15542=>24746,
-15543=>24747,
-15544=>24748,
-15545=>24749,
-15546=>24750,
-15547=>24751,
-15548=>24752,
-15549=>24753,
-15550=>24754,
-15551=>24755,
-15552=>24756,
-15553=>24757,
-15554=>24758,
-15555=>24759,
-15556=>24760,
-15557=>24761,
-15558=>24762,
-15559=>24763,
-15560=>24764,
-15561=>24765,
-15562=>24766,
-15563=>24767,
-15564=>24768,
-15565=>24769,
-15566=>24770,
-15567=>24771,
-15568=>24772,
-15569=>24773,
-15570=>24774,
-15571=>24775,
-15572=>24776,
-15573=>24777,
-15574=>24778,
-15575=>24779,
-15576=>24780,
-15577=>24781,
-15578=>24782,
-15579=>24783,
-15580=>24784,
-15581=>24785,
-15582=>24786,
-15583=>24787,
-15585=>24788,
-15586=>24789,
-15587=>24790,
-15588=>24791,
-15589=>24792,
-15590=>24793,
-15591=>24794,
-15592=>24795,
-15593=>24796,
-15594=>24797,
-15595=>24798,
-15596=>24799,
-15597=>24800,
-15598=>24801,
-15599=>24802,
-15600=>24803,
-15601=>24804,
-15602=>24805,
-15603=>24806,
-15604=>24807,
-15605=>24808,
-15606=>24809,
-15607=>24810,
-15608=>24811,
-15609=>24812,
-15610=>24813,
-15611=>24814,
-15612=>24815,
-15613=>24816,
-15614=>24817,
-15615=>24818,
-15616=>24819,
-15617=>24820,
-15618=>24821,
-15619=>24822,
-15620=>24823,
-15621=>24824,
-15622=>24825,
-15623=>24826,
-15624=>24827,
-15625=>24828,
-15626=>24829,
-15627=>24830,
-15628=>24831,
-15629=>24832,
-15630=>24833,
-15631=>24834,
-15632=>24835,
-15633=>24836,
-15634=>24837,
-15635=>24838,
-15636=>24839,
-15637=>24840,
-15638=>24841,
-15639=>24842,
-15640=>24843,
-15641=>24844,
-15642=>24845,
-15643=>24846,
-15644=>24847,
-15645=>24848,
-15646=>24849,
-15647=>24850,
-15648=>24851,
-15649=>24852,
-15650=>24853,
-15651=>24854,
-15652=>24855,
-15653=>24856,
-15654=>24857,
-15655=>24858,
-15656=>24859,
-15657=>24860,
-15658=>24861,
-15659=>24862,
-15660=>24863,
-15661=>24864,
-15662=>24865,
-15663=>24866,
-15664=>24867,
-15665=>24868,
-15666=>24869,
-15667=>24870,
-15668=>24871,
-15669=>24872,
-15670=>24873,
-15671=>24874,
-15672=>24875,
-15673=>24876,
-15674=>24877,
-15675=>24878,
-15676=>24879,
-15677=>24880,
-15678=>24881,
-15679=>24882,
-15680=>24883,
-15681=>24884,
-15682=>24885,
-15683=>24886,
-15684=>24887,
-15685=>24888,
-15686=>24889,
-15687=>24890,
-15688=>24891,
-15689=>24892,
-15690=>24893,
-15691=>24894,
-15692=>24895,
-15693=>24896,
-15694=>24897,
-15695=>24898,
-15696=>24899,
-15697=>24900,
-15698=>24901,
-15699=>24902,
-15700=>24903,
-15701=>24904,
-15702=>24905,
-15703=>24906,
-15704=>24907,
-15705=>24908,
-15706=>24909,
-15707=>24910,
-15708=>24911,
-15709=>24912,
-15710=>24913,
-15711=>24914,
-15712=>24915,
-15713=>24916,
-15714=>24917,
-15715=>24918,
-15716=>24919,
-15717=>24920,
-15718=>24921,
-15719=>24922,
-15720=>24923,
-15721=>24924,
-15722=>24925,
-15723=>24926,
-15724=>24927,
-15725=>24928,
-15726=>24929,
-15727=>24930,
-15728=>24931,
-15729=>24932,
-15730=>24933,
-15731=>24934,
-15732=>24935,
-15733=>24936,
-15734=>24937,
-15735=>24938,
-15736=>24939,
-15737=>24940,
-15738=>24941,
-15739=>24942,
-15740=>24943,
-15741=>24944,
-15742=>24945,
-15743=>24946,
-15744=>24947,
-15745=>24948,
-15746=>24949,
-15747=>24950,
-15748=>24951,
-15749=>24952,
-15750=>24953,
-15751=>24954,
-15752=>24955,
-15753=>24956,
-15754=>24957,
-15755=>24958,
-15756=>24959,
-15757=>24960,
-15758=>24961,
-15759=>24962,
-15760=>24963,
-15761=>24964,
-15762=>24965,
-15763=>24966,
-15764=>24967,
-15765=>24968,
-15766=>24969,
-15767=>24970,
-15768=>24971,
-15769=>24972,
-15770=>24973,
-15771=>24974,
-15772=>24975,
-15773=>24976,
-15774=>24977,
-15775=>24978,
-15776=>24979,
-15777=>24980,
-15778=>24981,
-15779=>24982,
-15780=>24983,
-15781=>24984,
-15782=>24985,
-15783=>24986,
-15784=>24987,
-15785=>24988,
-15786=>24989,
-15787=>24990,
-15788=>24991,
-15789=>24992,
-15790=>24993,
-15791=>24994,
-15792=>24995,
-15793=>24996,
-15794=>24997,
-15795=>24998,
-15796=>24999,
-15797=>25000,
-15798=>25001,
-15799=>25002,
-15800=>25003,
-15801=>25004,
-15802=>25005,
-15803=>25006,
-15804=>25007,
-15805=>25008,
-15806=>25009,
-15807=>25010,
-15808=>25011,
-15809=>25012,
-15810=>25013,
-15811=>25014,
-15812=>25015,
-15813=>25016,
-15814=>25017,
-15815=>25018,
-15816=>25019,
-15817=>25020,
-15818=>25021,
-15819=>25022,
-15820=>25023,
-15821=>25024,
-15822=>25025,
-15823=>25026,
-15824=>25027,
-15825=>25028,
-15826=>25029,
-15827=>25030,
-15828=>25031,
-15829=>25032,
-15830=>25033,
-15831=>25034,
-15832=>25035,
-15833=>25036,
-15834=>25037,
-15835=>25038,
-15836=>25039,
-15837=>25040,
-15838=>25041,
-15839=>25042,
-15840=>25043,
-15841=>25044,
-15842=>25045,
-15843=>25046,
-15844=>25047,
-15845=>25048,
-15846=>25049,
-15847=>25050,
-15848=>25051,
-15849=>25052,
-15850=>25053,
-15851=>25054,
-15852=>25055,
-15853=>25056,
-15854=>25057,
-15855=>25058,
-15856=>25059,
-15857=>25060,
-15858=>25061,
-15859=>25062,
-15860=>25063,
-15861=>25064,
-15862=>25065,
-15863=>25066,
-15864=>25067,
-15865=>25068,
-15866=>25069,
-15867=>25070,
-15868=>25071,
-15869=>25072,
-15870=>25073,
-15871=>25074,
-15872=>25075,
-15873=>25076,
-15874=>25077,
-15875=>25078,
-15876=>25079,
-15877=>25080,
-15878=>25081,
-15879=>25082,
-15880=>25083,
-15881=>25084,
-15882=>25085,
-15883=>25086,
-15884=>25087,
-15885=>25088,
-15886=>25089,
-15887=>25090,
-15888=>25091,
-15889=>25092,
-15890=>25093,
-15891=>25094,
-15892=>25095,
-15893=>25096,
-15894=>25097,
-15895=>25098,
-15896=>25099,
-15897=>25100,
-15898=>25101,
-15899=>25102,
-15900=>25103,
-15901=>25104,
-15902=>25105,
-15903=>25106,
-15904=>25107,
-15905=>25108,
-15906=>25109,
-15907=>25110,
-15908=>25111,
-15909=>25112,
-15910=>25113,
-15911=>25114,
-15912=>25115,
-15913=>25116,
-15914=>25117,
-15915=>25118,
-15916=>25119,
-15917=>25120,
-15918=>25121,
-15919=>25122,
-15920=>25123,
-15921=>25124,
-15922=>25125,
-15923=>25126,
-15924=>25127,
-15925=>25128,
-15926=>25129,
-15927=>25130,
-15928=>25131,
-15929=>25132,
-15930=>25133,
-15931=>25134,
-15932=>25135,
-15933=>25136,
-15934=>25137,
-15935=>25138,
-15936=>25139,
-15937=>25140,
-15938=>25141,
-15939=>25142,
-15940=>25143,
-15941=>25144,
-15942=>25145,
-15943=>25146,
-15944=>25147,
-15945=>25148,
-15946=>25149,
-15947=>25150,
-15948=>25151,
-15949=>25152,
-15950=>25153,
-15951=>25154,
-15952=>25155,
-15953=>25156,
-15954=>25157,
-15955=>25158,
-15956=>25159,
-15957=>25160,
-15958=>25161,
-15959=>25162,
-15960=>25163,
-15961=>25164,
-15962=>25165,
-15963=>25166,
-15964=>25167,
-15965=>25168,
-15966=>25169,
-15967=>25170,
-15968=>25171,
-15969=>25172,
-15970=>25173,
-15971=>25174,
-15972=>25175,
-15973=>25176,
-15974=>25177,
-15975=>25178,
-15976=>25179,
-15977=>25180,
-15978=>25181,
-15979=>25182,
-15980=>25183,
-15981=>25184,
-15982=>25185,
-15983=>25186,
-15984=>25187,
-15985=>25188,
-15986=>25189,
-15987=>25190,
-15988=>25191,
-15989=>25192,
-15990=>25193,
-15991=>25194,
-15992=>25195,
-15993=>25196,
-15994=>25197,
-15995=>25198,
-15996=>25199,
-15997=>25200,
-15998=>25201,
-15999=>25202,
-16000=>25203,
-16001=>25204,
-16002=>25205,
-16003=>25206,
-16004=>25207,
-16005=>25208,
-16006=>25209,
-16007=>25210,
-16008=>25211,
-16009=>25212,
-16010=>25213,
-16011=>25214,
-16012=>25215,
-16013=>25216,
-16014=>25217,
-16015=>25218,
-16016=>25219,
-16017=>25220,
-16018=>25221,
-16019=>25222,
-16020=>25223,
-16021=>25224,
-16022=>25225,
-16023=>25226,
-16024=>25227,
-16025=>25228,
-16026=>25229,
-16027=>25230,
-16028=>25231,
-16029=>25232,
-16030=>25233,
-16031=>25234,
-16032=>25235,
-16033=>25236,
-16034=>25237,
-16035=>25238,
-16036=>25239,
-16037=>25240,
-16038=>25241,
-16039=>25242,
-16040=>25243,
-16041=>25244,
-16042=>25245,
-16043=>25246,
-16044=>25247,
-16045=>25248,
-16046=>25249,
-16047=>25250,
-16048=>25251,
-16049=>25252,
-16050=>25253,
-16051=>25254,
-16052=>25255,
-16053=>25256,
-16054=>25257,
-16055=>25258,
-16056=>25259,
-16057=>25260,
-16058=>25261,
-16059=>25262,
-16060=>25263,
-16061=>25264,
-16062=>25265,
-16063=>25266,
-16064=>25267,
-16065=>25268,
-16066=>25269,
-16067=>25270,
-16068=>25271,
-16069=>25272,
-16070=>25273,
-16071=>25274,
-16072=>25275,
-16073=>25276,
-16074=>25277,
-16075=>25278,
-16076=>25279,
-16077=>25280,
-16078=>25281,
-16079=>25282,
-16080=>25283,
-16081=>25284,
-16082=>25285,
-16083=>25286,
-16084=>25287,
-16085=>25288,
-16086=>25289,
-16087=>25290,
-16088=>25291,
-16089=>25292,
-16090=>25293,
-16091=>25294,
-16092=>25295,
-16093=>25296,
-16094=>25297,
-16095=>25298,
-16096=>25299,
-16097=>25300,
-16098=>25301,
-16099=>25302,
-16100=>25303,
-16101=>25304,
-16102=>25305,
-16103=>25306,
-16104=>25307,
-16105=>25308,
-16106=>25309,
-16107=>25310,
-16108=>25311,
-16109=>25312,
-16110=>25313,
-16111=>25314,
-16112=>25315,
-16113=>25316,
-16114=>25317,
-16115=>25318,
-16116=>25319,
-16117=>25320,
-16118=>25321,
-16119=>25322,
-16120=>25323,
-16121=>25324,
-16122=>25325,
-16123=>25326,
-16124=>25327,
-16125=>25328,
-16126=>25329,
-16127=>25330,
-16128=>25331,
-16129=>25332,
-16130=>25333,
-16131=>25334,
-16132=>25335,
-16133=>25336,
-16134=>25337,
-16135=>25338,
-16136=>25339,
-16137=>25340,
-16138=>25341,
-16139=>25342,
-16140=>25343,
-16141=>25344,
-16142=>25345,
-16143=>25346,
-16144=>25347,
-16145=>25348,
-16146=>25349,
-16147=>25350,
-16148=>25351,
-16149=>25352,
-16150=>25353,
-16151=>25354,
-16152=>25355,
-16153=>25356,
-16154=>25357,
-16155=>25358,
-16156=>25359,
-16157=>25360,
-16158=>25361,
-16159=>25362,
-16160=>25363,
-16161=>25364,
-16162=>25365,
-16163=>25366,
-16164=>25367,
-16165=>25368,
-16166=>25369,
-16167=>25370,
-16168=>25371,
-16169=>25372,
-16170=>25373,
-16171=>25374,
-16172=>25375,
-16173=>25376,
-16174=>25377,
-16175=>25378,
-16176=>25379,
-16177=>25380,
-16178=>25381,
-16179=>25382,
-16180=>25383,
-16181=>25384,
-16182=>25385,
-16183=>25386,
-16184=>25387,
-16185=>25388,
-16186=>25389,
-16187=>25390,
-16188=>25391,
-16189=>25392,
-16190=>25393,
-16191=>25394,
-16192=>25395,
-16193=>25396,
-16194=>25397,
-16195=>25398,
-16196=>25399,
-16197=>25400,
-16198=>25401,
-16199=>25402,
-16200=>25403,
-16201=>25404,
-16202=>25405,
-16203=>25406,
-16204=>25407,
-16205=>25408,
-16206=>25409,
-16207=>25410,
-16208=>25411,
-16209=>25412,
-16210=>25413,
-16211=>25414,
-16212=>25415,
-16213=>25416,
-16214=>25417,
-16215=>25418,
-16216=>25419,
-16217=>25420,
-16218=>25421,
-16219=>25422,
-16220=>25423,
-16221=>25424,
-16222=>25425,
-16223=>25426,
-16224=>25427,
-16225=>25428,
-16226=>25429,
-16227=>25430,
-16228=>25431,
-16229=>25432,
-16230=>25433,
-16231=>25434,
-16232=>25435,
-16233=>25436,
-16234=>25437,
-16235=>25438,
-16236=>25439,
-16237=>25440,
-16238=>25441,
-16239=>25442,
-16240=>25443,
-16241=>25444,
-16242=>25445,
-16243=>25446,
-16244=>25447,
-16245=>25448,
-16246=>25449,
-16247=>25450,
-16248=>25451,
-16249=>25452,
-16250=>25453,
-16251=>25454,
-16252=>25455,
-16253=>25456,
-16254=>25457,
-16255=>25458,
-16256=>25459,
-16257=>25460,
-16258=>25461,
-16259=>25462,
-16260=>25463,
-16261=>25464,
-16262=>25465,
-16263=>25466,
-16264=>25467,
-16265=>25468,
-16266=>25469,
-16267=>25470,
-16268=>25471,
-16269=>25472,
-16270=>25473,
-16271=>25474,
-16272=>25475,
-16273=>25476,
-16274=>25477,
-16275=>25478,
-16276=>25479,
-16277=>25480,
-16278=>25481,
-16279=>25482,
-16280=>25483,
-16281=>25484,
-16282=>25485,
-16283=>25486,
-16284=>25487,
-16285=>25488,
-16286=>25489,
-16287=>25490,
-16288=>25491,
-16289=>25492,
-16290=>25493,
-16291=>25494,
-16292=>25495,
-16293=>25496,
-16294=>25497,
-16295=>25498,
-16296=>25499,
-16297=>25500,
-16298=>25501,
-16299=>25502,
-16300=>25503,
-16301=>25504,
-16302=>25505,
-16303=>25506,
-16304=>25507,
-16305=>25508,
-16306=>25509,
-16307=>25510,
-16308=>25511,
-16309=>25512,
-16310=>25513,
-16311=>25514,
-16312=>25515,
-16313=>25516,
-16314=>25517,
-16315=>25518,
-16316=>25519,
-16317=>25520,
-16318=>25521,
-16319=>25522,
-16320=>25523,
-16321=>25524,
-16322=>25525,
-16323=>25526,
-16324=>25527,
-16325=>25528,
-16326=>25529,
-16327=>25530,
-16328=>25531,
-16329=>25532,
-16330=>25533,
-16331=>25534,
-16332=>25535,
-16333=>25536,
-16334=>25537,
-16335=>25538,
-16336=>25539,
-16337=>25540,
-16338=>25541,
-16339=>25542,
-16340=>25543,
-16341=>25544,
-16342=>25545,
-16343=>25546,
-16344=>25547,
-16345=>25548,
-16346=>25549,
-16347=>25550,
-16348=>25551,
-16349=>25552,
-16350=>25553,
-16351=>25554,
-16352=>25555,
-16353=>25556,
-16354=>25557,
-16355=>25558,
-16356=>25559,
-16357=>25560,
-16358=>25561,
-16359=>25562,
-16360=>25563,
-16361=>25564,
-16362=>25565,
-16363=>25566,
-16364=>25567,
-16365=>25568,
-16366=>25569,
-16367=>25570,
-16368=>25571,
-16369=>25572,
-16370=>25573,
-16371=>25574,
-16372=>25575,
-16373=>25576,
-16374=>25577,
-16375=>25578,
-16376=>25579,
-16377=>25580,
-16378=>25581,
-16379=>25582,
-16380=>25583,
-16381=>25584,
-16382=>25585,
-16383=>25586,
-16384=>25587,
-16385=>25588,
-16386=>25589,
-16387=>25590,
-16388=>25591,
-16389=>25592,
-16390=>25593,
-16391=>25594,
-16392=>25595,
-16393=>25596,
-16394=>25597,
-16395=>25598,
-16396=>25599,
-16397=>25600,
-16398=>25601,
-16399=>25602,
-16400=>25603,
-16401=>25604,
-16402=>25605,
-16403=>25606,
-16404=>25607,
-16405=>25608,
-16406=>25609,
-16407=>25610,
-16408=>25611,
-16409=>25612,
-16410=>25613,
-16411=>25614,
-16412=>25615,
-16413=>25616,
-16414=>25617,
-16415=>25618,
-16416=>25619,
-16417=>25620,
-16418=>25621,
-16419=>25622,
-16420=>25623,
-16421=>25624,
-16422=>25625,
-16423=>25626,
-16424=>25627,
-16425=>25628,
-16426=>25629,
-16427=>25630,
-16428=>25631,
-16429=>25632,
-16430=>25633,
-16431=>25634,
-16432=>25635,
-16433=>25636,
-16434=>25637,
-16435=>25638,
-16436=>25639,
-16437=>25640,
-16438=>25641,
-16439=>25642,
-16440=>25643,
-16441=>25644,
-16442=>25645,
-16443=>25646,
-16444=>25647,
-16445=>25648,
-16446=>25649,
-16447=>25650,
-16448=>25651,
-16449=>25652,
-16450=>25653,
-16451=>25654,
-16452=>25655,
-16453=>25656,
-16454=>25657,
-16455=>25658,
-16456=>25659,
-16457=>25660,
-16458=>25661,
-16459=>25662,
-16460=>25663,
-16461=>25664,
-16462=>25665,
-16463=>25666,
-16464=>25667,
-16465=>25668,
-16466=>25669,
-16467=>25670,
-16468=>25671,
-16469=>25672,
-16471=>25673,
-16472=>25674,
-16473=>25675,
-16474=>25676,
-16475=>25677,
-16476=>25678,
-16477=>25679,
-16478=>25680,
-16479=>25681,
-16480=>25682,
-16481=>25683,
-16482=>25684,
-16483=>25685,
-16484=>25686,
-16485=>25687,
-16486=>25688,
-16487=>25689,
-16488=>25690,
-16489=>25691,
-16490=>25692,
-16491=>25693,
-16492=>25694,
-16493=>25695,
-16494=>25696,
-16495=>25697,
-16496=>25698,
-16497=>25699,
-16498=>25700,
-16499=>25701,
-16500=>25702,
-16501=>25703,
-16502=>25704,
-16503=>25705,
-16504=>25706,
-16505=>25707,
-16506=>25708,
-16507=>25709,
-16508=>25710,
-16509=>25711,
-16510=>25712,
-16511=>25713,
-16512=>25714,
-16513=>25715,
-16514=>25716,
-16515=>25717,
-16516=>25718,
-16517=>25719,
-16518=>25720,
-16519=>25721,
-16520=>25722,
-16521=>25723,
-16522=>25724,
-16523=>25725,
-16524=>25726,
-16525=>25727,
-16526=>25728,
-16527=>25729,
-16528=>25730,
-16529=>25731,
-16530=>25732,
-16531=>25733,
-16532=>25734,
-16533=>25735,
-16534=>25736,
-16535=>25737,
-16536=>25738,
-16537=>25739,
-16538=>25740,
-16539=>25741,
-16540=>25742,
-16541=>25743,
-16542=>25744,
-16543=>25745,
-16544=>25746,
-16545=>25747,
-16546=>25748,
-16547=>25749,
-16548=>25750,
-16549=>25751,
-16550=>25752,
-16551=>25753,
-16552=>25754,
-16553=>25755,
-16554=>25756,
-16555=>25757,
-16556=>25758,
-16557=>25759,
-16558=>25760,
-16559=>25761,
-16560=>25762,
-16561=>25763,
-16562=>25764,
-16563=>25765,
-16564=>25766,
-16565=>25767,
-16566=>25768,
-16567=>25769,
-16568=>25770,
-16569=>25771,
-16570=>25772,
-16571=>25773,
-16572=>25774,
-16573=>25775,
-16574=>25776,
-16575=>25777,
-16576=>25778,
-16577=>25779,
-16578=>25780,
-16579=>25781,
-16580=>25782,
-16581=>25783,
-16582=>25784,
-16583=>25785,
-16584=>25786,
-16585=>25787,
-16586=>25788,
-16587=>25789,
-16588=>25790,
-16589=>25791,
-16590=>25792,
-16591=>25793,
-16592=>25794,
-16593=>25795,
-16594=>25796,
-16595=>25797,
-16596=>25798,
-16597=>25799,
-16598=>25800,
-16599=>25801,
-16600=>25802,
-16601=>25803,
-16602=>25804,
-16603=>25805,
-16604=>25806,
-16605=>25807,
-16606=>25808,
-16607=>25809,
-16608=>25810,
-16609=>25811,
-16610=>25812,
-16611=>25813,
-16612=>25814,
-16613=>25815,
-16614=>25816,
-16615=>25817,
-16616=>25818,
-16617=>25819,
-16618=>25820,
-16619=>25821,
-16620=>25822,
-16621=>25823,
-16622=>25824,
-16623=>25825,
-16624=>25826,
-16625=>25827,
-16626=>25828,
-16627=>25829,
-16628=>25830,
-16629=>25831,
-16630=>25832,
-16631=>25833,
-16632=>25834,
-16633=>25835,
-16634=>25836,
-16635=>25837,
-16636=>25838,
-16637=>25839,
-16638=>25840,
-16639=>25841,
-16640=>25842,
-16641=>25843,
-16642=>25844,
-16643=>25845,
-16644=>25846,
-16645=>25847,
-16646=>25848,
-16647=>25849,
-16648=>25850,
-16649=>25851,
-16650=>25852,
-16651=>25853,
-16652=>25854,
-16653=>25855,
-16654=>25856,
-16655=>25857,
-16656=>25858,
-16657=>25859,
-16658=>25860,
-16659=>25861,
-16660=>25862,
-16661=>25863,
-16662=>25864,
-16663=>25865,
-16664=>25866,
-16665=>25867,
-16666=>25868,
-16667=>25869,
-16668=>25870,
-16669=>25871,
-16670=>25872,
-16671=>25873,
-16672=>25874,
-16673=>25875,
-16674=>25876,
-16675=>25877,
-16676=>25878,
-16677=>25879,
-16678=>25880,
-16679=>25881,
-16680=>25882,
-16681=>25883,
-16682=>25884,
-16683=>25885,
-16684=>25886,
-16685=>25887,
-16686=>25888,
-16687=>25889,
-16688=>25890,
-16689=>25891,
-16690=>25892,
-16691=>25893,
-16692=>25894,
-16693=>25895,
-16694=>25896,
-16695=>25897,
-16696=>25898,
-16697=>25899,
-16698=>25900,
-16699=>25901,
-16700=>25902,
-16701=>25903,
-16702=>25904,
-16703=>25905,
-16704=>25906,
-16705=>25907,
-16706=>25908,
-16707=>25909,
-16708=>25910,
-16709=>25911,
-16710=>25912,
-16711=>25913,
-16712=>25914,
-16713=>25915,
-16714=>25916,
-16715=>25917,
-16716=>25918,
-16717=>25919,
-16718=>25920,
-16719=>25921,
-16720=>25922,
-16721=>25923,
-16722=>25924,
-16723=>25925,
-16724=>25926,
-16725=>25927,
-16726=>25928,
-16727=>25929,
-16728=>25930,
-16729=>25931,
-16730=>25932,
-16731=>25933,
-16732=>25934,
-16733=>25935,
-16734=>25936,
-16736=>25937,
-16737=>25938,
-16738=>25939,
-16739=>25940,
-16740=>25941,
-16741=>25942,
-16742=>25943,
-16743=>25944,
-16744=>25945,
-16745=>25946,
-16746=>25947,
-16747=>25948,
-16748=>25949,
-16749=>25950,
-16750=>25951,
-16751=>25952,
-16752=>25953,
-16753=>25954,
-16754=>25955,
-16755=>25956,
-16756=>25957,
-16757=>25958,
-16758=>25959,
-16759=>25960,
-16760=>25961,
-16761=>25962,
-16762=>25963,
-16763=>25964,
-16764=>25965,
-16765=>25966,
-16766=>25967,
-16767=>25968,
-16768=>25969,
-16769=>25970,
-16770=>25971,
-16771=>25972,
-16772=>25973,
-16773=>25974,
-16774=>25975,
-16775=>25976,
-16776=>25977,
-16777=>25978,
-16778=>25979,
-16779=>25980,
-16780=>25981,
-16781=>25982,
-16782=>25983,
-16783=>25984,
-16784=>25985,
-16785=>25986,
-16786=>25987,
-16787=>25988,
-16788=>25989,
-16789=>25990,
-16790=>25991,
-16791=>25992,
-16792=>25993,
-16793=>25994,
-16794=>25995,
-16795=>25996,
-16796=>25997,
-16797=>25998,
-16798=>25999,
-16799=>26000,
-16800=>26001,
-16801=>26002,
-16802=>26003,
-16803=>26004,
-16804=>26005,
-16805=>26006,
-16806=>26007,
-16807=>26008,
-16808=>26009,
-16809=>26010,
-16810=>26011,
-16811=>26012,
-16812=>26013,
-16813=>26014,
-16814=>26015,
-16815=>26016,
-16816=>26017,
-16817=>26018,
-16818=>26019,
-16819=>26020,
-16820=>26021,
-16821=>26022,
-16822=>26023,
-16823=>26024,
-16824=>26025,
-16825=>26026,
-16826=>26027,
-16827=>26028,
-16828=>26029,
-16829=>26030,
-16830=>26031,
-16831=>26032,
-16832=>26033,
-16833=>26034,
-16834=>26035,
-16835=>26036,
-16836=>26037,
-16837=>26038,
-16838=>26039,
-16839=>26040,
-16840=>26041,
-16841=>26042,
-16842=>26043,
-16843=>26044,
-16844=>26045,
-16845=>26046,
-16846=>26047,
-16847=>26048,
-16848=>26049,
-16849=>26050,
-16850=>26051,
-16851=>26052,
-16852=>26053,
-16853=>26054,
-16854=>26055,
-16855=>26056,
-16856=>26057,
-16857=>26058,
-16858=>26059,
-16859=>26060,
-16860=>26061,
-16861=>26062,
-16862=>26063,
-16863=>26064,
-16864=>26065,
-16865=>26066,
-16866=>26067,
-16867=>26068,
-16868=>26069,
-16869=>26070,
-16870=>26071,
-16871=>26072,
-16872=>26073,
-16873=>26074,
-16874=>26075,
-16875=>26076,
-16876=>26077,
-16877=>26078,
-16878=>26079,
-16879=>26080,
-16880=>26081,
-16881=>26082,
-16882=>26083,
-16883=>26084,
-16884=>26085,
-16885=>26086,
-16886=>26087,
-16887=>26088,
-16888=>26089,
-16889=>26090,
-16890=>26091,
-16891=>26092,
-16892=>26093,
-16893=>26094,
-16894=>26095,
-16895=>26096,
-16896=>26097,
-16897=>26098,
-16898=>26099,
-16899=>26100,
-16900=>26101,
-16901=>26102,
-16902=>26103,
-16903=>26104,
-16904=>26105,
-16905=>26106,
-16906=>26107,
-16907=>26108,
-16908=>26109,
-16909=>26110,
-16910=>26111,
-16911=>26112,
-16912=>26113,
-16913=>26114,
-16914=>26115,
-16915=>26116,
-16916=>26117,
-16917=>26118,
-16918=>26119,
-16919=>26120,
-16920=>26121,
-16921=>26122,
-16922=>26123,
-16923=>26124,
-16924=>26125,
-16925=>26126,
-16926=>26127,
-16927=>26128,
-16928=>26129,
-16929=>26130,
-16930=>26131,
-16931=>26132,
-16932=>26133,
-16933=>26134,
-16934=>26135,
-16935=>26136,
-16936=>26137,
-16937=>26138,
-16938=>26139,
-16939=>26140,
-16940=>26141,
-16941=>26142,
-16942=>26143,
-16943=>26144,
-16944=>26145,
-16945=>26146,
-16946=>26147,
-16947=>26148,
-16948=>26149,
-16949=>26150,
-16950=>26151,
-16951=>26152,
-16952=>26153,
-16953=>26154,
-16954=>26155,
-16955=>26156,
-16956=>26157,
-16957=>26158,
-16958=>26159,
-16959=>26160,
-16960=>26161,
-16961=>26162,
-16962=>26163,
-16963=>26164,
-16964=>26165,
-16965=>26166,
-16966=>26167,
-16967=>26168,
-16968=>26169,
-16969=>26170,
-16970=>26171,
-16971=>26172,
-16972=>26173,
-16973=>26174,
-16974=>26175,
-16975=>26176,
-16976=>26177,
-16977=>26178,
-16978=>26179,
-16979=>26180,
-16980=>26181,
-16981=>26182,
-16982=>26183,
-16983=>26184,
-16984=>26185,
-16985=>26186,
-16986=>26187,
-16987=>26188,
-16988=>26189,
-16989=>26190,
-16990=>26191,
-16991=>26192,
-16992=>26193,
-16993=>26194,
-16994=>26195,
-16995=>26196,
-16996=>26197,
-16997=>26198,
-16998=>26199,
-16999=>26200,
-17000=>26201,
-17001=>26202,
-17002=>26203,
-17003=>26204,
-17004=>26205,
-17005=>26206,
-17006=>26207,
-17007=>26208,
-17008=>26209,
-17009=>26210,
-17010=>26211,
-17011=>26212,
-17012=>26213,
-17013=>26214,
-17014=>26215,
-17015=>26216,
-17016=>26217,
-17017=>26218,
-17018=>26219,
-17019=>26220,
-17020=>26221,
-17021=>26222,
-17022=>26223,
-17023=>26224,
-17024=>26225,
-17025=>26226,
-17026=>26227,
-17027=>26228,
-17028=>26229,
-17029=>26230,
-17030=>26231,
-17031=>26232,
-17032=>26233,
-17033=>26234,
-17034=>26235,
-17035=>26236,
-17036=>26237,
-17037=>26238,
-17038=>26239,
-17039=>26240,
-17040=>26241,
-17041=>26242,
-17042=>26243,
-17043=>26244,
-17044=>26245,
-17045=>26246,
-17046=>26247,
-17047=>26248,
-17048=>26249,
-17049=>26250,
-17050=>26251,
-17051=>26252,
-17052=>26253,
-17053=>26254,
-17054=>26255,
-17055=>26256,
-17056=>26257,
-17057=>26258,
-17058=>26259,
-17059=>26260,
-17060=>26261,
-17061=>26262,
-17062=>26263,
-17063=>26264,
-17064=>26265,
-17065=>26266,
-17066=>26267,
-17067=>26268,
-17068=>26269,
-17069=>26270,
-17070=>26271,
-17071=>26272,
-17072=>26273,
-17073=>26274,
-17074=>26275,
-17075=>26276,
-17076=>26277,
-17077=>26278,
-17078=>26279,
-17079=>26280,
-17080=>26281,
-17081=>26282,
-17082=>26283,
-17083=>26284,
-17084=>26285,
-17085=>26286,
-17086=>26287,
-17087=>26288,
-17088=>26289,
-17089=>26290,
-17090=>26291,
-17091=>26292,
-17092=>26293,
-17093=>26294,
-17094=>26295,
-17095=>26296,
-17096=>26297,
-17097=>26298,
-17098=>26299,
-17099=>26300,
-17100=>26301,
-17101=>26302,
-17102=>26303,
-17103=>26304,
-17104=>26305,
-17105=>26306,
-17106=>26307,
-17107=>26308,
-17108=>26309,
-17109=>26310,
-17110=>26311,
-17111=>26312,
-17112=>26313,
-17113=>26314,
-17114=>26315,
-17115=>26316,
-17116=>26317,
-17117=>26318,
-17118=>26319,
-17119=>26320,
-17120=>26321,
-17121=>26322,
-17122=>26323,
-17123=>26324,
-17124=>26325,
-17125=>26326,
-17126=>26327,
-17127=>26328,
-17128=>26329,
-17129=>26330,
-17130=>26331,
-17131=>26332,
-17132=>26333,
-17133=>26334,
-17134=>26335,
-17135=>26336,
-17136=>26337,
-17137=>26338,
-17138=>26339,
-17139=>26340,
-17140=>26341,
-17141=>26342,
-17142=>26343,
-17143=>26344,
-17144=>26345,
-17145=>26346,
-17146=>26347,
-17147=>26348,
-17148=>26349,
-17149=>26350,
-17150=>26351,
-17151=>26352,
-17152=>26353,
-17153=>26354,
-17154=>26355,
-17155=>26356,
-17156=>26357,
-17157=>26358,
-17158=>26359,
-17159=>26360,
-17160=>26361,
-17161=>26362,
-17162=>26363,
-17163=>26364,
-17164=>26365,
-17165=>26366,
-17166=>26367,
-17167=>26368,
-17168=>26369,
-17169=>26370,
-17170=>26371,
-17171=>26372,
-17172=>26373,
-17173=>26374,
-17174=>26375,
-17175=>26376,
-17176=>26377,
-17177=>26378,
-17178=>26379,
-17179=>26380,
-17180=>26381,
-17181=>26382,
-17182=>26383,
-17183=>26384,
-17184=>26385,
-17185=>26386,
-17186=>26387,
-17187=>26388,
-17188=>26389,
-17189=>26390,
-17190=>26391,
-17191=>26392,
-17192=>26393,
-17193=>26394,
-17194=>26395,
-17195=>26396,
-17196=>26397,
-17197=>26398,
-17198=>26399,
-17199=>26400,
-17200=>26401,
-17201=>26402,
-17202=>26403,
-17203=>26404,
-17204=>26405,
-17205=>26406,
-17206=>26407,
-17208=>26408,
-17209=>26409,
-17210=>26410,
-17211=>26411,
-17212=>26412,
-17213=>26413,
-17214=>26414,
-17215=>26415,
-17216=>26416,
-17217=>26417,
-17218=>26418,
-17219=>26419,
-17220=>26420,
-17221=>26421,
-17222=>26422,
-17223=>26423,
-17224=>26424,
-17225=>26425,
-17226=>26426,
-17227=>26427,
-17228=>26428,
-17229=>26429,
-17230=>26430,
-17231=>26431,
-17232=>26432,
-17233=>26433,
-17234=>26434,
-17235=>26435,
-17236=>26436,
-17237=>26437,
-17238=>26438,
-17239=>26439,
-17240=>26440,
-17241=>26441,
-17242=>26442,
-17243=>26443,
-17244=>26444,
-17245=>26445,
-17246=>26446,
-17247=>26447,
-17248=>26448,
-17249=>26449,
-17250=>26450,
-17251=>26451,
-17252=>26452,
-17253=>26453,
-17254=>26454,
-17255=>26455,
-17256=>26456,
-17257=>26457,
-17258=>26458,
-17259=>26459,
-17260=>26460,
-17261=>26461,
-17262=>26462,
-17263=>26463,
-17264=>26464,
-17265=>26465,
-17266=>26466,
-17267=>26467,
-17268=>26468,
-17269=>26469,
-17270=>26470,
-17271=>26471,
-17272=>26472,
-17273=>26473,
-17274=>26474,
-17275=>26475,
-17276=>26476,
-17277=>26477,
-17278=>26478,
-17279=>26479,
-17280=>26480,
-17281=>26481,
-17282=>26482,
-17283=>26483,
-17284=>26484,
-17285=>26485,
-17286=>26486,
-17287=>26487,
-17288=>26488,
-17289=>26489,
-17290=>26490,
-17291=>26491,
-17292=>26492,
-17293=>26493,
-17294=>26494,
-17295=>26495,
-17296=>26496,
-17297=>26497,
-17298=>26498,
-17299=>26499,
-17300=>26500,
-17301=>26501,
-17302=>26502,
-17303=>26503,
-17304=>26504,
-17305=>26505,
-17306=>26506,
-17307=>26507,
-17308=>26508,
-17309=>26509,
-17310=>26510,
-17311=>26511,
-17312=>26512,
-17313=>26513,
-17314=>26514,
-17315=>26515,
-17316=>26516,
-17317=>26517,
-17318=>26518,
-17319=>26519,
-17320=>26520,
-17321=>26521,
-17322=>26522,
-17323=>26523,
-17325=>26524,
-17326=>26525,
-17327=>26526,
-17328=>26527,
-17330=>26528,
-17331=>26529,
-17332=>26530,
-17333=>26531,
-17334=>26532,
-17335=>26533,
-17336=>26534,
-17337=>26535,
-17338=>26536,
-17339=>26537,
-17340=>26538,
-17341=>26539,
-17342=>26540,
-17343=>26541,
-17344=>26542,
-17345=>26543,
-17346=>26544,
-17347=>26545,
-17348=>26546,
-17349=>26547,
-17350=>26548,
-17351=>26549,
-17352=>26550,
-17353=>26551,
-17354=>26552,
-17355=>26553,
-17356=>26554,
-17357=>26555,
-17358=>26556,
-17359=>26557,
-17360=>26558,
-17361=>26559,
-17362=>26560,
-17363=>26561,
-17364=>26562,
-17365=>26563,
-17366=>26564,
-17367=>26565,
-17368=>26566,
-17369=>26567,
-17370=>26568,
-17371=>26569,
-17372=>26570,
-17374=>26571,
-17375=>26572,
-17376=>26573,
-17377=>26574,
-17378=>26575,
-17379=>26576,
-17380=>26577,
-17381=>26578,
-17382=>26579,
-17383=>26580,
-17384=>26581,
-17385=>26582,
-17386=>26583,
-17387=>26584,
-17388=>26585,
-17389=>26586,
-17390=>26587,
-17391=>26588,
-17392=>26589,
-17393=>26590,
-17394=>26591,
-17395=>26592,
-17396=>26593,
-17397=>26594,
-17398=>26595,
-17399=>26596,
-17400=>26597,
-17401=>26598,
-17402=>26599,
-17403=>26600,
-17404=>26601,
-17405=>26602,
-17406=>26603,
-17407=>26604,
-17408=>26605,
-17409=>26606,
-17410=>26607,
-17411=>26608,
-17412=>26609,
-17413=>26610,
-17414=>26611,
-17415=>26612,
-17416=>26613,
-17417=>26614,
-17418=>26615,
-17419=>26616,
-17420=>26617,
-17421=>26618,
-17422=>26619,
-17423=>26620,
-17424=>26621,
-17425=>26622,
-17426=>26623,
-17427=>26624,
-17428=>26625,
-17429=>26626,
-17430=>26627,
-17431=>26628,
-17432=>26629,
-17433=>26630,
-17434=>26631,
-17435=>26632,
-17436=>26633,
-17437=>26634,
-17438=>26635,
-17439=>26636,
-17440=>26637,
-17441=>26638,
-17442=>26639,
-17443=>26640,
-17444=>26641,
-17445=>26642,
-17446=>26643,
-17447=>26644,
-17448=>26645,
-17449=>26646,
-17450=>26647,
-17451=>26648,
-17452=>26649,
-17453=>26650,
-17454=>26651,
-17455=>26652,
-17456=>26653,
-17457=>26654,
-17458=>26655,
-17459=>26656,
-17460=>26657,
-17461=>26658,
-17462=>26659,
-17463=>26660,
-17464=>26661,
-17465=>26662,
-17466=>26663,
-17467=>26664,
-17468=>26665,
-17469=>26666,
-17470=>26667,
-17471=>26668,
-17472=>26669,
-17473=>26670,
-17474=>26671,
-17475=>26672,
-17476=>26673,
-17477=>26674,
-17478=>26675,
-17479=>26676,
-17480=>26677,
-17481=>26678,
-17482=>26679,
-17483=>26680,
-17484=>26681,
-17485=>26682,
-17486=>26683,
-17487=>26684,
-17488=>26685,
-17489=>26686,
-17490=>26687,
-17491=>26688,
-17492=>26689,
-17493=>26690,
-17494=>26691,
-17495=>26692,
-17496=>26693,
-17497=>26694,
-17498=>26695,
-17499=>26696,
-17500=>26697,
-17501=>26698,
-17502=>26699,
-17503=>26700,
-17504=>26701,
-17505=>26702,
-17506=>26703,
-17507=>26704,
-17508=>26705,
-17509=>26706,
-17510=>26707,
-17511=>26708,
-17512=>26709,
-17513=>26710,
-17514=>26711,
-17515=>26712,
-17516=>26713,
-17517=>26714,
-17518=>26715,
-17519=>26716,
-17520=>26717,
-17521=>26718,
-17522=>26719,
-17523=>26720,
-17524=>26721,
-17525=>26722,
-17526=>26723,
-17527=>26724,
-17528=>26725,
-17529=>26726,
-17530=>26727,
-17531=>26728,
-17532=>26729,
-17533=>26730,
-17534=>26731,
-17535=>26732,
-17536=>26733,
-17537=>26734,
-17538=>26735,
-17539=>26736,
-17540=>26737,
-17541=>26738,
-17542=>26739,
-17543=>26740,
-17544=>26741,
-17545=>26742,
-17546=>26743,
-17547=>26744,
-17548=>26745,
-17549=>26746,
-17550=>26747,
-17551=>26748,
-17552=>26749,
-17553=>26750,
-17554=>26751,
-17555=>26752,
-17556=>26753,
-17557=>26754,
-17558=>26755,
-17559=>26756,
-17560=>26757,
-17561=>26758,
-17562=>26759,
-17563=>26760,
-17564=>26761,
-17565=>26762,
-17566=>26763,
-17567=>26764,
-17568=>26765,
-17569=>26766,
-17570=>26767,
-17571=>26768,
-17572=>26769,
-17573=>26770,
-17574=>26771,
-17575=>26772,
-17576=>26773,
-17577=>26774,
-17578=>26775,
-17579=>26776,
-17580=>26777,
-17581=>26778,
-17582=>26779,
-17583=>26780,
-17584=>26781,
-17585=>26782,
-17586=>26783,
-17587=>26784,
-17588=>26785,
-17589=>26786,
-17590=>26787,
-17591=>26788,
-17592=>26789,
-17593=>26790,
-17594=>26791,
-17595=>26792,
-17596=>26793,
-17597=>26794,
-17598=>26795,
-17599=>26796,
-17600=>26797,
-17601=>26798,
-17602=>26799,
-17603=>26800,
-17604=>26801,
-17605=>26802,
-17606=>26803,
-17607=>26804,
-17608=>26805,
-17609=>26806,
-17610=>26807,
-17611=>26808,
-17612=>26809,
-17613=>26810,
-17614=>26811,
-17615=>26812,
-17616=>26813,
-17617=>26814,
-17618=>26815,
-17619=>26816,
-17620=>26817,
-17621=>26818,
-17623=>26819,
-17624=>26820,
-17625=>26821,
-17626=>26822,
-17627=>26823,
-17628=>26824,
-17629=>26825,
-17630=>26826,
-17631=>26827,
-17632=>26828,
-17633=>26829,
-17634=>26830,
-17635=>26831,
-17636=>26832,
-17637=>26833,
-17638=>26834,
-17639=>26835,
-17640=>26836,
-17641=>26837,
-17642=>26838,
-17643=>26839,
-17644=>26840,
-17645=>26841,
-17646=>26842,
-17647=>26843,
-17648=>26844,
-17649=>26845,
-17650=>26846,
-17651=>26847,
-17652=>26848,
-17653=>26849,
-17654=>26850,
-17655=>26851,
-17656=>26852,
-17657=>26853,
-17658=>26854,
-17659=>26855,
-17660=>26856,
-17661=>26857,
-17662=>26858,
-17663=>26859,
-17664=>26860,
-17665=>26861,
-17666=>26862,
-17667=>26863,
-17668=>26864,
-17669=>26865,
-17670=>26866,
-17671=>26867,
-17672=>26868,
-17673=>26869,
-17674=>26870,
-17675=>26871,
-17676=>26872,
-17677=>26873,
-17678=>26874,
-17679=>26875,
-17680=>26876,
-17681=>26877,
-17682=>26878,
-17683=>26879,
-17684=>26880,
-17685=>26881,
-17686=>26882,
-17687=>26883,
-17688=>26884,
-17689=>26885,
-17690=>26886,
-17691=>26887,
-17692=>26888,
-17693=>26889,
-17694=>26890,
-17695=>26891,
-17696=>26892,
-17697=>26893,
-17698=>26894,
-17699=>26895,
-17700=>26896,
-17701=>26897,
-17702=>26898,
-17703=>26899,
-17704=>26900,
-17705=>26901,
-17706=>26902,
-17707=>26903,
-17708=>26904,
-17709=>26905,
-17710=>26906,
-17711=>26907,
-17712=>26908,
-17713=>26909,
-17714=>26910,
-17715=>26911,
-17716=>26912,
-17717=>26913,
-17718=>26914,
-17719=>26915,
-17720=>26916,
-17721=>26917,
-17722=>26918,
-17723=>26919,
-17724=>26920,
-17725=>26921,
-17726=>26922,
-17727=>26923,
-17728=>26924,
-17729=>26925,
-17730=>26926,
-17731=>26927,
-17732=>26928,
-17733=>26929,
-17734=>26930,
-17735=>26931,
-17736=>26932,
-17737=>26933,
-17738=>26934,
-17739=>26935,
-17740=>26936,
-17741=>26937,
-17742=>26938,
-17743=>26939,
-17744=>26940,
-17745=>26941,
-17746=>26942,
-17747=>26943,
-17748=>26944,
-17749=>26945,
-17750=>26946,
-17751=>26947,
-17752=>26948,
-17753=>26949,
-17754=>26950,
-17755=>26951,
-17756=>26952,
-17757=>26953,
-17758=>26954,
-17759=>26955,
-17760=>26956,
-17761=>26957,
-17762=>26958,
-17763=>26959,
-17764=>26960,
-17765=>26961,
-17766=>26962,
-17767=>26963,
-17768=>26964,
-17769=>26965,
-17770=>26966,
-17771=>26967,
-17772=>26968,
-17773=>26969,
-17774=>26970,
-17775=>26971,
-17776=>26972,
-17777=>26973,
-17778=>26974,
-17779=>26975,
-17780=>26976,
-17781=>26977,
-17782=>26978,
-17783=>26979,
-17784=>26980,
-17785=>26981,
-17786=>26982,
-17787=>26983,
-17788=>26984,
-17789=>26985,
-17790=>26986,
-17791=>26987,
-17792=>26988,
-17793=>26989,
-17794=>26990,
-17795=>26991,
-17796=>26992,
-17797=>26993,
-17798=>26994,
-17799=>26995,
-17800=>26996,
-17801=>26997,
-17802=>26998,
-17803=>26999,
-17804=>27000,
-17805=>27001,
-17806=>27002,
-17807=>27003,
-17808=>27004,
-17809=>27005,
-17810=>27006,
-17811=>27007,
-17812=>27008,
-17813=>27009,
-17814=>27010,
-17815=>27011,
-17816=>27012,
-17817=>27013,
-17818=>27014,
-17819=>27015,
-17820=>27016,
-17821=>27017,
-17822=>27018,
-17823=>27019,
-17824=>27020,
-17825=>27021,
-17826=>27022,
-17827=>27023,
-17828=>27024,
-17829=>27025,
-17830=>27026,
-17831=>27027,
-17832=>27028,
-17833=>27029,
-17834=>27030,
-17835=>27031,
-17836=>27032,
-17837=>27033,
-17838=>27034,
-17839=>27035,
-17840=>27036,
-17841=>27037,
-17842=>27038,
-17843=>27039,
-17844=>27040,
-17845=>27041,
-17846=>27042,
-17847=>27043,
-17848=>27044,
-17849=>27045,
-17850=>27046,
-17851=>27047,
-17852=>27048,
-17853=>27049,
-17854=>27050,
-17855=>27051,
-17856=>27052,
-17857=>27053,
-17858=>27054,
-17859=>27055,
-17860=>27056,
-17861=>27057,
-17862=>27058,
-17863=>27059,
-17864=>27060,
-17865=>27061,
-17866=>27062,
-17867=>27063,
-17868=>27064,
-17869=>27065,
-17870=>27066,
-17871=>27067,
-17872=>27068,
-17873=>27069,
-17874=>27070,
-17875=>27071,
-17876=>27072,
-17877=>27073,
-17878=>27074,
-17879=>27075,
-17880=>27076,
-17881=>27077,
-17882=>27078,
-17883=>27079,
-17884=>27080,
-17885=>27081,
-17886=>27082,
-17887=>27083,
-17888=>27084,
-17889=>27085,
-17890=>27086,
-17891=>27087,
-17892=>27088,
-17893=>27089,
-17894=>27090,
-17895=>27091,
-17896=>27092,
-17897=>27093,
-17898=>27094,
-17899=>27095,
-17900=>27096,
-17901=>27097,
-17902=>27098,
-17903=>27099,
-17904=>27100,
-17905=>27101,
-17906=>27102,
-17907=>27103,
-17908=>27104,
-17909=>27105,
-17910=>27106,
-17911=>27107,
-17912=>27108,
-17913=>27109,
-17914=>27110,
-17915=>27111,
-17916=>27112,
-17917=>27113,
-17918=>27114,
-17919=>27115,
-17920=>27116,
-17921=>27117,
-17922=>27118,
-17923=>27119,
-17924=>27120,
-17925=>27121,
-17926=>27122,
-17927=>27123,
-17928=>27124,
-17929=>27125,
-17930=>27126,
-17931=>27127,
-17932=>27128,
-17933=>27129,
-17934=>27130,
-17935=>27131,
-17936=>27132,
-17937=>27133,
-17938=>27134,
-17939=>27135,
-17940=>27136,
-17941=>27137,
-17942=>27138,
-17943=>27139,
-17944=>27140,
-17945=>27141,
-17946=>27142,
-17947=>27143,
-17948=>27144,
-17949=>27145,
-17950=>27146,
-17951=>27147,
-17952=>27148,
-17953=>27149,
-17954=>27150,
-17955=>27151,
-17956=>27152,
-17957=>27153,
-17958=>27154,
-17959=>27155,
-17960=>27156,
-17961=>27157,
-17962=>27158,
-17963=>27159,
-17964=>27160,
-17965=>27161,
-17966=>27162,
-17967=>27163,
-17968=>27164,
-17969=>27165,
-17970=>27166,
-17971=>27167,
-17972=>27168,
-17973=>27169,
-17974=>27170,
-17975=>27171,
-17976=>27172,
-17977=>27173,
-17978=>27174,
-17979=>27175,
-17980=>27176,
-17981=>27177,
-17982=>27178,
-17983=>27179,
-17984=>27180,
-17985=>27181,
-17986=>27182,
-17987=>27183,
-17988=>27184,
-17989=>27185,
-17990=>27186,
-17991=>27187,
-17992=>27188,
-17993=>27189,
-17994=>27190,
-17995=>27191,
-17997=>27192,
-17998=>27193,
-17999=>27194,
-18000=>27195,
-18001=>27196,
-18002=>27197,
-18003=>27198,
-18004=>27199,
-18005=>27200,
-18006=>27201,
-18007=>27202,
-18008=>27203,
-18009=>27204,
-18010=>27205,
-18011=>27206,
-18012=>27207,
-18013=>27208,
-18014=>27209,
-18015=>27210,
-18016=>27211,
-18018=>27212,
-18019=>27213,
-18020=>27214,
-18021=>27215,
-18022=>27216,
-18023=>27217,
-18024=>27218,
-18025=>27219,
-18026=>27220,
-18027=>27221,
-18028=>27222,
-18029=>27223,
-18030=>27224,
-18031=>27225,
-18032=>27226,
-18033=>27227,
-18034=>27228,
-18035=>27229,
-18036=>27230,
-18037=>27231,
-18038=>27232,
-18039=>27233,
-18040=>27234,
-18041=>27235,
-18042=>27236,
-18043=>27237,
-18044=>27238,
-18045=>27239,
-18046=>27240,
-18047=>27241,
-18048=>27242,
-18049=>27243,
-18050=>27244,
-18051=>27245,
-18052=>27246,
-18053=>27247,
-18054=>27248,
-18055=>27249,
-18056=>27250,
-18057=>27251,
-18058=>27252,
-18059=>27253,
-18060=>27254,
-18061=>27255,
-18062=>27256,
-18063=>27257,
-18064=>27258,
-18065=>27259,
-18066=>27260,
-18067=>27261,
-18068=>27262,
-18069=>27263,
-18070=>27264,
-18071=>27265,
-18072=>27266,
-18073=>27267,
-18074=>27268,
-18075=>27269,
-18076=>27270,
-18077=>27271,
-18078=>27272,
-18079=>27273,
-18080=>27274,
-18081=>27275,
-18082=>27276,
-18083=>27277,
-18084=>27278,
-18085=>27279,
-18086=>27280,
-18087=>27281,
-18088=>27282,
-18089=>27283,
-18090=>27284,
-18091=>27285,
-18092=>27286,
-18093=>27287,
-18094=>27288,
-18095=>27289,
-18096=>27290,
-18097=>27291,
-18098=>27292,
-18099=>27293,
-18100=>27294,
-18101=>27295,
-18102=>27296,
-18103=>27297,
-18104=>27298,
-18105=>27299,
-18106=>27300,
-18107=>27301,
-18108=>27302,
-18109=>27303,
-18110=>27304,
-18111=>27305,
-18112=>27306,
-18113=>27307,
-18114=>27308,
-18115=>27309,
-18116=>27310,
-18117=>27311,
-18118=>27312,
-18119=>27313,
-18120=>27314,
-18121=>27315,
-18122=>27316,
-18123=>27317,
-18124=>27318,
-18125=>27319,
-18126=>27320,
-18127=>27321,
-18128=>27322,
-18129=>27323,
-18130=>27324,
-18131=>27325,
-18132=>27326,
-18133=>27327,
-18134=>27328,
-18135=>27329,
-18136=>27330,
-18137=>27331,
-18138=>27332,
-18139=>27333,
-18140=>27334,
-18141=>27335,
-18142=>27336,
-18143=>27337,
-18144=>27338,
-18145=>27339,
-18146=>27340,
-18147=>27341,
-18148=>27342,
-18149=>27343,
-18150=>27344,
-18151=>27345,
-18152=>27346,
-18153=>27347,
-18154=>27348,
-18155=>27349,
-18156=>27350,
-18157=>27351,
-18158=>27352,
-18159=>27353,
-18160=>27354,
-18161=>27355,
-18162=>27356,
-18163=>27357,
-18164=>27358,
-18165=>27359,
-18166=>27360,
-18167=>27361,
-18168=>27362,
-18169=>27363,
-18170=>27364,
-18171=>27365,
-18172=>27366,
-18173=>27367,
-18174=>27368,
-18175=>27369,
-18176=>27370,
-18177=>27371,
-18178=>27372,
-18179=>27373,
-18180=>27374,
-18181=>27375,
-18182=>27376,
-18183=>27377,
-18184=>27378,
-18185=>27379,
-18186=>27380,
-18187=>27381,
-18188=>27382,
-18189=>27383,
-18190=>27384,
-18191=>27385,
-18192=>27386,
-18193=>27387,
-18194=>27388,
-18195=>27389,
-18196=>27390,
-18197=>27391,
-18198=>27392,
-18199=>27393,
-18200=>27394,
-18201=>27395,
-18202=>27396,
-18203=>27397,
-18204=>27398,
-18205=>27399,
-18206=>27400,
-18207=>27401,
-18208=>27402,
-18209=>27403,
-18210=>27404,
-18212=>27405,
-18213=>27406,
-18214=>27407,
-18215=>27408,
-18216=>27409,
-18218=>27410,
-18219=>27411,
-18220=>27412,
-18221=>27413,
-18222=>27414,
-18223=>27415,
-18224=>27416,
-18225=>27417,
-18226=>27418,
-18227=>27419,
-18228=>27420,
-18229=>27421,
-18230=>27422,
-18231=>27423,
-18232=>27424,
-18233=>27425,
-18234=>27426,
-18235=>27427,
-18236=>27428,
-18237=>27429,
-18238=>27430,
-18239=>27431,
-18240=>27432,
-18241=>27433,
-18242=>27434,
-18243=>27435,
-18244=>27436,
-18245=>27437,
-18246=>27438,
-18247=>27439,
-18248=>27440,
-18249=>27441,
-18250=>27442,
-18251=>27443,
-18252=>27444,
-18253=>27445,
-18254=>27446,
-18255=>27447,
-18256=>27448,
-18257=>27449,
-18258=>27450,
-18259=>27451,
-18260=>27452,
-18261=>27453,
-18262=>27454,
-18263=>27455,
-18264=>27456,
-18265=>27457,
-18266=>27458,
-18267=>27459,
-18268=>27460,
-18269=>27461,
-18270=>27462,
-18271=>27463,
-18272=>27464,
-18273=>27465,
-18274=>27466,
-18275=>27467,
-18276=>27468,
-18277=>27469,
-18278=>27470,
-18279=>27471,
-18280=>27472,
-18281=>27473,
-18282=>27474,
-18283=>27475,
-18284=>27476,
-18285=>27477,
-18286=>27478,
-18287=>27479,
-18288=>27480,
-18289=>27481,
-18290=>27482,
-18291=>27483,
-18292=>27484,
-18293=>27485,
-18294=>27486,
-18295=>27487,
-18296=>27488,
-18297=>27489,
-18298=>27490,
-18299=>27491,
-18301=>27492,
-18302=>27493,
-18303=>27494,
-18304=>27495,
-18305=>27496,
-18306=>27497,
-18307=>27498,
-18308=>27499,
-18309=>27500,
-18310=>27501,
-18311=>27502,
-18312=>27503,
-18313=>27504,
-18314=>27505,
-18315=>27506,
-18316=>27507,
-18318=>27508,
-18319=>27509,
-18320=>27510,
-18321=>27511,
-18322=>27512,
-18323=>27513,
-18324=>27514,
-18325=>27515,
-18326=>27516,
-18327=>27517,
-18328=>27518,
-18329=>27519,
-18330=>27520,
-18331=>27521,
-18332=>27522,
-18333=>27523,
-18334=>27524,
-18335=>27525,
-18336=>27526,
-18337=>27527,
-18338=>27528,
-18339=>27529,
-18340=>27530,
-18341=>27531,
-18342=>27532,
-18343=>27533,
-18344=>27534,
-18345=>27535,
-18346=>27536,
-18347=>27537,
-18348=>27538,
-18349=>27539,
-18350=>27540,
-18351=>27541,
-18352=>27542,
-18353=>27543,
-18354=>27544,
-18355=>27545,
-18356=>27546,
-18357=>27547,
-18358=>27548,
-18359=>27549,
-18360=>27550,
-18361=>27551,
-18362=>27552,
-18363=>27553,
-18364=>27554,
-18365=>27555,
-18366=>27556,
-18367=>27557,
-18368=>27558,
-18369=>27559,
-18370=>27560,
-18371=>27561,
-18372=>27562,
-18373=>27563,
-18374=>27564,
-18375=>27565,
-18376=>27566,
-18377=>27567,
-18378=>27568,
-18379=>27569,
-18380=>27570,
-18381=>27571,
-18382=>27572,
-18383=>27573,
-18384=>27574,
-18385=>27575,
-18386=>27576,
-18387=>27577,
-18388=>27578,
-18389=>27579,
-18390=>27580,
-18391=>27581,
-18392=>27582,
-18393=>27583,
-18394=>27584,
-18395=>27585,
-18396=>27586,
-18397=>27587,
-18398=>27588,
-18399=>27589,
-18400=>27590,
-18401=>27591,
-18402=>27592,
-18403=>27593,
-18404=>27594,
-18405=>27595,
-18406=>27596,
-18407=>27597,
-18408=>27598,
-18409=>27599,
-18410=>27600,
-18411=>27601,
-18412=>27602,
-18413=>27603,
-18414=>27604,
-18415=>27605,
-18416=>27606,
-18417=>27607,
-18418=>27608,
-18419=>27609,
-18420=>27610,
-18421=>27611,
-18422=>27612,
-18423=>27613,
-18424=>27614,
-18425=>27615,
-18426=>27616,
-18427=>27617,
-18428=>27618,
-18429=>27619,
-18430=>27620,
-18431=>27621,
-18432=>27622,
-18433=>27623,
-18434=>27624,
-18435=>27625,
-18436=>27626,
-18437=>27627,
-18438=>27628,
-18439=>27629,
-18440=>27630,
-18441=>27631,
-18442=>27632,
-18443=>27633,
-18444=>27634,
-18445=>27635,
-18446=>27636,
-18447=>27637,
-18448=>27638,
-18449=>27639,
-18450=>27640,
-18451=>27641,
-18452=>27642,
-18453=>27643,
-18454=>27644,
-18455=>27645,
-18456=>27646,
-18457=>27647,
-18458=>27648,
-18459=>27649,
-18460=>27650,
-18461=>27651,
-18462=>27652,
-18463=>27653,
-18464=>27654,
-18465=>27655,
-18466=>27656,
-18467=>27657,
-18468=>27658,
-18469=>27659,
-18470=>27660,
-18471=>27661,
-18472=>27662,
-18473=>27663,
-18474=>27664,
-18475=>27665,
-18476=>27666,
-18477=>27667,
-18478=>27668,
-18479=>27669,
-18480=>27670,
-18481=>27671,
-18482=>27672,
-18483=>27673,
-18484=>27674,
-18485=>27675,
-18486=>27676,
-18487=>27677,
-18488=>27678,
-18489=>27679,
-18490=>27680,
-18491=>27681,
-18492=>27682,
-18493=>27683,
-18494=>27684,
-18495=>27685,
-18496=>27686,
-18497=>27687,
-18498=>27688,
-18499=>27689,
-18500=>27690,
-18501=>27691,
-18502=>27692,
-18503=>27693,
-18504=>27694,
-18505=>27695,
-18506=>27696,
-18507=>27697,
-18508=>27698,
-18509=>27699,
-18510=>27700,
-18511=>27701,
-18512=>27702,
-18513=>27703,
-18514=>27704,
-18515=>27705,
-18516=>27706,
-18517=>27707,
-18518=>27708,
-18519=>27709,
-18520=>27710,
-18521=>27711,
-18522=>27712,
-18523=>27713,
-18524=>27714,
-18525=>27715,
-18526=>27716,
-18527=>27717,
-18528=>27718,
-18529=>27719,
-18530=>27720,
-18531=>27721,
-18532=>27722,
-18533=>27723,
-18534=>27724,
-18535=>27725,
-18536=>27726,
-18537=>27727,
-18538=>27728,
-18539=>27729,
-18540=>27730,
-18541=>27731,
-18542=>27732,
-18543=>27733,
-18544=>27734,
-18545=>27735,
-18546=>27736,
-18547=>27737,
-18548=>27738,
-18549=>27739,
-18550=>27740,
-18551=>27741,
-18552=>27742,
-18553=>27743,
-18554=>27744,
-18555=>27745,
-18556=>27746,
-18557=>27747,
-18558=>27748,
-18559=>27749,
-18560=>27750,
-18561=>27751,
-18562=>27752,
-18563=>27753,
-18564=>27754,
-18565=>27755,
-18566=>27756,
-18567=>27757,
-18568=>27758,
-18569=>27759,
-18570=>27760,
-18571=>27761,
-18572=>27762,
-18573=>27763,
-18574=>27764,
-18575=>27765,
-18576=>27766,
-18577=>27767,
-18578=>27768,
-18579=>27769,
-18580=>27770,
-18581=>27771,
-18582=>27772,
-18583=>27773,
-18584=>27774,
-18585=>27775,
-18586=>27776,
-18587=>27777,
-18588=>27778,
-18589=>27779,
-18590=>27780,
-18591=>27781,
-18592=>27782,
-18593=>27783,
-18594=>27784,
-18595=>27785,
-18596=>27786,
-18597=>27787,
-18598=>27788,
-18599=>27789,
-18600=>27790,
-18601=>27791,
-18602=>27792,
-18603=>27793,
-18604=>27794,
-18605=>27795,
-18606=>27796,
-18607=>27797,
-18608=>27798,
-18609=>27799,
-18610=>27800,
-18611=>27801,
-18612=>27802,
-18613=>27803,
-18614=>27804,
-18615=>27805,
-18616=>27806,
-18617=>27807,
-18618=>27808,
-18619=>27809,
-18620=>27810,
-18621=>27811,
-18622=>27812,
-18623=>27813,
-18624=>27814,
-18625=>27815,
-18626=>27816,
-18627=>27817,
-18628=>27818,
-18629=>27819,
-18630=>27820,
-18631=>27821,
-18632=>27822,
-18633=>27823,
-18634=>27824,
-18635=>27825,
-18636=>27826,
-18637=>27827,
-18638=>27828,
-18639=>27829,
-18640=>27830,
-18641=>27831,
-18642=>27832,
-18643=>27833,
-18644=>27834,
-18645=>27835,
-18646=>27836,
-18647=>27837,
-18648=>27838,
-18649=>27839,
-18650=>27840,
-18651=>27841,
-18652=>27842,
-18653=>27843,
-18654=>27844,
-18655=>27845,
-18656=>27846,
-18657=>27847,
-18658=>27848,
-18659=>27849,
-18660=>27850,
-18661=>27851,
-18662=>27852,
-18663=>27853,
-18664=>27854,
-18665=>27855,
-18666=>27856,
-18667=>27857,
-18668=>27858,
-18669=>27859,
-18670=>27860,
-18671=>27861,
-18672=>27862,
-18673=>27863,
-18674=>27864,
-18675=>27865,
-18676=>27866,
-18677=>27867,
-18678=>27868,
-18679=>27869,
-18680=>27870,
-18681=>27871,
-18682=>27872,
-18683=>27873,
-18684=>27874,
-18685=>27875,
-18686=>27876,
-18687=>27877,
-18688=>27878,
-18689=>27879,
-18690=>27880,
-18691=>27881,
-18692=>27882,
-18693=>27883,
-18694=>27884,
-18695=>27885,
-18696=>27886,
-18697=>27887,
-18698=>27888,
-18699=>27889,
-18700=>27890,
-18701=>27891,
-18702=>27892,
-18703=>27893,
-18704=>27894,
-18705=>27895,
-18706=>27896,
-18707=>27897,
-18708=>27898,
-18709=>27899,
-18710=>27900,
-18711=>27901,
-18712=>27902,
-18713=>27903,
-18714=>27904,
-18715=>27905,
-18716=>27906,
-18717=>27907,
-18718=>27908,
-18719=>27909,
-18720=>27910,
-18721=>27911,
-18722=>27912,
-18723=>27913,
-18724=>27914,
-18725=>27915,
-18726=>27916,
-18727=>27917,
-18728=>27918,
-18729=>27919,
-18730=>27920,
-18731=>27921,
-18732=>27922,
-18733=>27923,
-18734=>27924,
-18735=>27925,
-18736=>27926,
-18737=>27927,
-18738=>27928,
-18739=>27929,
-18740=>27930,
-18741=>27931,
-18742=>27932,
-18743=>27933,
-18744=>27934,
-18745=>27935,
-18746=>27936,
-18747=>27937,
-18748=>27938,
-18749=>27939,
-18750=>27940,
-18751=>27941,
-18752=>27942,
-18753=>27943,
-18754=>27944,
-18755=>27945,
-18756=>27946,
-18757=>27947,
-18758=>27948,
-18760=>27949,
-18761=>27950,
-18762=>27951,
-18763=>27952,
-18764=>27953,
-18765=>27954,
-18766=>27955,
-18767=>27956,
-18768=>27957,
-18769=>27958,
-18770=>27959,
-18771=>27960,
-18772=>27961,
-18773=>27962,
-18774=>27963,
-18775=>27964,
-18776=>27965,
-18777=>27966,
-18778=>27967,
-18779=>27968,
-18780=>27969,
-18781=>27970,
-18782=>27971,
-18783=>27972,
-18784=>27973,
-18785=>27974,
-18786=>27975,
-18787=>27976,
-18788=>27977,
-18789=>27978,
-18790=>27979,
-18791=>27980,
-18792=>27981,
-18793=>27982,
-18794=>27983,
-18795=>27984,
-18796=>27985,
-18797=>27986,
-18798=>27987,
-18799=>27988,
-18800=>27989,
-18801=>27990,
-18802=>27991,
-18803=>27992,
-18804=>27993,
-18805=>27994,
-18806=>27995,
-18807=>27996,
-18808=>27997,
-18809=>27998,
-18811=>27999,
-18812=>28000,
-18814=>28001,
-18815=>28002,
-18816=>28003,
-18817=>28004,
-18820=>28005,
-18823=>28006,
-18824=>28007,
-18825=>28008,
-18826=>28009,
-18827=>28010,
-18828=>28011,
-18829=>28012,
-18830=>28013,
-18831=>28014,
-18832=>28015,
-18833=>28016,
-18834=>28017,
-18835=>28018,
-18836=>28019,
-18837=>28020,
-18838=>28021,
-18839=>28022,
-18840=>28023,
-18841=>28024,
-18842=>28025,
-18844=>28026,
-18845=>28027,
-18846=>28028,
-18848=>28029,
-18849=>28030,
-18850=>28031,
-18851=>28032,
-18852=>28033,
-18853=>28034,
-18854=>28035,
-18855=>28036,
-18856=>28037,
-18857=>28038,
-18858=>28039,
-18859=>28040,
-18860=>28041,
-18861=>28042,
-18862=>28043,
-18863=>28044,
-18864=>28045,
-18865=>28046,
-18866=>28047,
-18867=>28048,
-18868=>28049,
-18869=>28050,
-18872=>28051,
-18873=>28052,
-18874=>28053,
-18875=>28054,
-18876=>28055,
-18877=>28056,
-18878=>28057,
-18879=>28058,
-18880=>28059,
-18881=>28060,
-18882=>28061,
-18883=>28062,
-18884=>28063,
-18885=>28064,
-18886=>28065,
-18887=>28066,
-18888=>28067,
-18889=>28068,
-18890=>28069,
-18891=>28070,
-18892=>28071,
-18893=>28072,
-18894=>28073,
-18895=>28074,
-18896=>28075,
-18897=>28076,
-18898=>28077,
-18899=>28078,
-18900=>28079,
-18901=>28080,
-18902=>28081,
-18903=>28082,
-18904=>28083,
-18905=>28084,
-18906=>28085,
-18907=>28086,
-18908=>28087,
-18909=>28088,
-18910=>28089,
-18911=>28090,
-18912=>28091,
-18913=>28092,
-18914=>28093,
-18915=>28094,
-18916=>28095,
-18917=>28096,
-18918=>28097,
-18919=>28098,
-18920=>28099,
-18921=>28100,
-18922=>28101,
-18923=>28102,
-18924=>28103,
-18925=>28104,
-18926=>28105,
-18927=>28106,
-18928=>28107,
-18929=>28108,
-18930=>28109,
-18931=>28110,
-18932=>28111,
-18933=>28112,
-18934=>28113,
-18935=>28114,
-18936=>28115,
-18937=>28116,
-18938=>28117,
-18939=>28118,
-18940=>28119,
-18941=>28120,
-18942=>28121,
-18943=>28122,
-18944=>28123,
-18945=>28124,
-18946=>28125,
-18947=>28126,
-18948=>28127,
-18949=>28128,
-18950=>28129,
-18951=>28130,
-18952=>28131,
-18953=>28132,
-18954=>28133,
-18955=>28134,
-18956=>28135,
-18957=>28136,
-18958=>28137,
-18959=>28138,
-18960=>28139,
-18961=>28140,
-18962=>28141,
-18963=>28142,
-18964=>28143,
-18965=>28144,
-18966=>28145,
-18967=>28146,
-18968=>28147,
-18969=>28148,
-18970=>28149,
-18971=>28150,
-18972=>28151,
-18973=>28152,
-18974=>28153,
-18975=>28154,
-18976=>28155,
-18977=>28156,
-18978=>28157,
-18979=>28158,
-18980=>28159,
-18981=>28160,
-18982=>28161,
-18983=>28162,
-18984=>28163,
-18985=>28164,
-18986=>28165,
-18987=>28166,
-18988=>28167,
-18989=>28168,
-18990=>28169,
-18991=>28170,
-18992=>28171,
-18993=>28172,
-18994=>28173,
-18995=>28174,
-18996=>28175,
-18997=>28176,
-18998=>28177,
-18999=>28178,
-19000=>28179,
-19001=>28180,
-19002=>28181,
-19003=>28182,
-19004=>28183,
-19005=>28184,
-19006=>28185,
-19007=>28186,
-19008=>28187,
-19009=>28188,
-19010=>28189,
-19011=>28190,
-19012=>28191,
-19013=>28192,
-19014=>28193,
-19015=>28194,
-19016=>28195,
-19017=>28196,
-19018=>28197,
-19019=>28198,
-19020=>28199,
-19021=>28200,
-19022=>28201,
-19023=>28202,
-19024=>28203,
-19025=>28204,
-19026=>28205,
-19027=>28206,
-19028=>28207,
-19029=>28208,
-19030=>28209,
-19031=>28210,
-19032=>28211,
-19033=>28212,
-19034=>28213,
-19035=>28214,
-19036=>28215,
-19037=>28216,
-19038=>28217,
-19039=>28218,
-19040=>28219,
-19041=>28220,
-19042=>28221,
-19043=>28222,
-19044=>28223,
-19045=>28224,
-19046=>28225,
-19047=>28226,
-19048=>28227,
-19049=>28228,
-19050=>28229,
-19051=>28230,
-19052=>28231,
-19053=>28232,
-19054=>28233,
-19055=>28234,
-19056=>28235,
-19057=>28236,
-19058=>28237,
-19059=>28238,
-19060=>28239,
-19061=>28240,
-19062=>28241,
-19063=>28242,
-19064=>28243,
-19065=>28244,
-19066=>28245,
-19067=>28246,
-19068=>28247,
-19069=>28248,
-19070=>28249,
-19071=>28250,
-19072=>28251,
-19073=>28252,
-19074=>28253,
-19075=>28254,
-19076=>28255,
-19077=>28256,
-19078=>28257,
-19079=>28258,
-19080=>28259,
-19081=>28260,
-19082=>28261,
-19083=>28262,
-19084=>28263,
-19085=>28264,
-19086=>28265,
-19087=>28266,
-19088=>28267,
-19089=>28268,
-19090=>28269,
-19091=>28270,
-19092=>28271,
-19093=>28272,
-19094=>28273,
-19095=>28274,
-19096=>28275,
-19097=>28276,
-19098=>28277,
-19099=>28278,
-19100=>28279,
-19101=>28280,
-19102=>28281,
-19103=>28282,
-19104=>28283,
-19105=>28284,
-19106=>28285,
-19107=>28286,
-19108=>28287,
-19109=>28288,
-19110=>28289,
-19111=>28290,
-19112=>28291,
-19113=>28292,
-19114=>28293,
-19115=>28294,
-19116=>28295,
-19117=>28296,
-19118=>28297,
-19119=>28298,
-19120=>28299,
-19121=>28300,
-19122=>28301,
-19123=>28302,
-19124=>28303,
-19125=>28304,
-19126=>28305,
-19127=>28306,
-19128=>28307,
-19129=>28308,
-19130=>28309,
-19131=>28310,
-19132=>28311,
-19133=>28312,
-19134=>28313,
-19135=>28314,
-19136=>28315,
-19137=>28316,
-19138=>28317,
-19139=>28318,
-19140=>28319,
-19141=>28320,
-19142=>28321,
-19143=>28322,
-19144=>28323,
-19145=>28324,
-19146=>28325,
-19147=>28326,
-19148=>28327,
-19149=>28328,
-19150=>28329,
-19151=>28330,
-19152=>28331,
-19153=>28332,
-19154=>28333,
-19155=>28334,
-19156=>28335,
-19157=>28336,
-19158=>28337,
-19159=>28338,
-19160=>28339,
-19161=>28340,
-19162=>28341,
-19163=>28342,
-19164=>28343,
-19165=>28344,
-19166=>28345,
-19167=>28346,
-19168=>28347,
-19169=>28348,
-19170=>28349,
-19171=>28350,
-19172=>28351,
-19173=>28352,
-19174=>28353,
-19175=>28354,
-19176=>28355,
-19177=>28356,
-19178=>28357,
-19179=>28358,
-19180=>28359,
-19181=>28360,
-19182=>28361,
-19183=>28362,
-19184=>28363,
-19185=>28364,
-19186=>28365,
-19187=>28366,
-19188=>28367,
-19189=>28368,
-19190=>28369,
-19191=>28370,
-19192=>28371,
-19193=>28372,
-19194=>28373,
-19195=>28374,
-19196=>28375,
-19197=>28376,
-19198=>28377,
-19199=>28378,
-19200=>28379,
-19201=>28380,
-19202=>28381,
-19203=>28382,
-19204=>28383,
-19205=>28384,
-19206=>28385,
-19207=>28386,
-19208=>28387,
-19209=>28388,
-19210=>28389,
-19211=>28390,
-19212=>28391,
-19213=>28392,
-19214=>28393,
-19215=>28394,
-19216=>28395,
-19217=>28396,
-19218=>28397,
-19219=>28398,
-19220=>28399,
-19221=>28400,
-19222=>28401,
-19223=>28402,
-19224=>28403,
-19225=>28404,
-19226=>28405,
-19227=>28406,
-19228=>28407,
-19229=>28408,
-19230=>28409,
-19231=>28410,
-19232=>28411,
-19233=>28412,
-19234=>28413,
-19235=>28414,
-19236=>28415,
-19237=>28416,
-19238=>28417,
-19239=>28418,
-19240=>28419,
-19241=>28420,
-19242=>28421,
-19243=>28422,
-19244=>28423,
-19245=>28424,
-19246=>28425,
-19247=>28426,
-19248=>28427,
-19249=>28428,
-19250=>28429,
-19251=>28430,
-19252=>28431,
-19253=>28432,
-19254=>28433,
-19255=>28434,
-19256=>28435,
-19257=>28436,
-19258=>28437,
-19259=>28438,
-19260=>28439,
-19261=>28440,
-19262=>28441,
-19263=>28442,
-19264=>28443,
-19265=>28444,
-19266=>28445,
-19267=>28446,
-19268=>28447,
-19269=>28448,
-19270=>28449,
-19271=>28450,
-19272=>28451,
-19273=>28452,
-19274=>28453,
-19275=>28454,
-19276=>28455,
-19277=>28456,
-19278=>28457,
-19279=>28458,
-19280=>28459,
-19281=>28460,
-19282=>28461,
-19283=>28462,
-19284=>28463,
-19285=>28464,
-19286=>28465,
-19287=>28466,
-19288=>28467,
-19289=>28468,
-19290=>28469,
-19291=>28470,
-19292=>28471,
-19293=>28472,
-19294=>28473,
-19295=>28474,
-19296=>28475,
-19297=>28476,
-19298=>28477,
-19299=>28478,
-19300=>28479,
-19301=>28480,
-19302=>28481,
-19303=>28482,
-19304=>28483,
-19305=>28484,
-19306=>28485,
-19307=>28486,
-19308=>28487,
-19309=>28488,
-19310=>28489,
-19311=>28490,
-19312=>28491,
-19313=>28492,
-19314=>28493,
-19315=>28494,
-19316=>28495,
-19317=>28496,
-19318=>28497,
-19319=>28498,
-19320=>28499,
-19321=>28500,
-19322=>28501,
-19323=>28502,
-19324=>28503,
-19325=>28504,
-19326=>28505,
-19327=>28506,
-19328=>28507,
-19329=>28508,
-19330=>28509,
-19331=>28510,
-19332=>28511,
-19333=>28512,
-19334=>28513,
-19335=>28514,
-19336=>28515,
-19337=>28516,
-19338=>28517,
-19339=>28518,
-19340=>28519,
-19341=>28520,
-19342=>28521,
-19343=>28522,
-19344=>28523,
-19345=>28524,
-19346=>28525,
-19347=>28526,
-19348=>28527,
-19349=>28528,
-19350=>28529,
-19351=>28530,
-19352=>28531,
-19353=>28532,
-19354=>28533,
-19355=>28534,
-19356=>28535,
-19357=>28536,
-19358=>28537,
-19359=>28538,
-19360=>28539,
-19361=>28540,
-19362=>28541,
-19363=>28542,
-19364=>28543,
-19365=>28544,
-19366=>28545,
-19367=>28546,
-19368=>28547,
-19369=>28548,
-19370=>28549,
-19371=>28550,
-19372=>28551,
-19373=>28552,
-19374=>28553,
-19375=>28554,
-19376=>28555,
-19377=>28556,
-19378=>28557,
-19379=>28558,
-19380=>28559,
-19381=>28560,
-19382=>28561,
-19383=>28562,
-19384=>28563,
-19385=>28564,
-19386=>28565,
-19387=>28566,
-19388=>28567,
-19389=>28568,
-19390=>28569,
-19391=>28570,
-19392=>28571,
-19393=>28572,
-19394=>28573,
-19395=>28574,
-19396=>28575,
-19397=>28576,
-19398=>28577,
-19399=>28578,
-19400=>28579,
-19401=>28580,
-19402=>28581,
-19403=>28582,
-19404=>28583,
-19405=>28584,
-19406=>28585,
-19407=>28586,
-19408=>28587,
-19409=>28588,
-19410=>28589,
-19411=>28590,
-19412=>28591,
-19413=>28592,
-19414=>28593,
-19415=>28594,
-19416=>28595,
-19417=>28596,
-19418=>28597,
-19419=>28598,
-19420=>28599,
-19421=>28600,
-19422=>28601,
-19423=>28602,
-19424=>28603,
-19425=>28604,
-19426=>28605,
-19427=>28606,
-19428=>28607,
-19429=>28608,
-19430=>28609,
-19431=>28610,
-19432=>28611,
-19433=>28612,
-19434=>28613,
-19435=>28614,
-19436=>28615,
-19437=>28616,
-19438=>28617,
-19439=>28618,
-19440=>28619,
-19441=>28620,
-19442=>28621,
-19443=>28622,
-19444=>28623,
-19445=>28624,
-19446=>28625,
-19447=>28626,
-19448=>28627,
-19449=>28628,
-19450=>28629,
-19451=>28630,
-19452=>28631,
-19453=>28632,
-19454=>28633,
-19455=>28634,
-19456=>28635,
-19457=>28636,
-19458=>28637,
-19459=>28638,
-19460=>28639,
-19461=>28640,
-19462=>28641,
-19463=>28642,
-19464=>28643,
-19465=>28644,
-19466=>28645,
-19467=>28646,
-19468=>28647,
-19469=>28648,
-19470=>28649,
-19471=>28650,
-19472=>28651,
-19473=>28652,
-19474=>28653,
-19475=>28654,
-19476=>28655,
-19477=>28656,
-19478=>28657,
-19479=>28658,
-19480=>28659,
-19481=>28660,
-19482=>28661,
-19483=>28662,
-19484=>28663,
-19485=>28664,
-19486=>28665,
-19487=>28666,
-19488=>28667,
-19489=>28668,
-19490=>28669,
-19491=>28670,
-19492=>28671,
-19493=>28672,
-19494=>28673,
-19495=>28674,
-19496=>28675,
-19497=>28676,
-19498=>28677,
-19499=>28678,
-19500=>28679,
-19501=>28680,
-19502=>28681,
-19503=>28682,
-19504=>28683,
-19505=>28684,
-19506=>28685,
-19507=>28686,
-19508=>28687,
-19509=>28688,
-19510=>28689,
-19511=>28690,
-19512=>28691,
-19513=>28692,
-19514=>28693,
-19515=>28694,
-19516=>28695,
-19517=>28696,
-19518=>28697,
-19519=>28698,
-19520=>28699,
-19521=>28700,
-19522=>28701,
-19523=>28702,
-19524=>28703,
-19525=>28704,
-19526=>28705,
-19527=>28706,
-19528=>28707,
-19529=>28708,
-19530=>28709,
-19531=>28710,
-19532=>28711,
-19533=>28712,
-19534=>28713,
-19535=>28714,
-19536=>28715,
-19537=>28716,
-19538=>28717,
-19539=>28718,
-19540=>28719,
-19541=>28720,
-19542=>28721,
-19543=>28722,
-19544=>28723,
-19545=>28724,
-19546=>28725,
-19547=>28726,
-19548=>28727,
-19549=>28728,
-19550=>28729,
-19551=>28730,
-19552=>28731,
-19553=>28732,
-19554=>28733,
-19555=>28734,
-19556=>28735,
-19557=>28736,
-19558=>28737,
-19559=>28738,
-19560=>28739,
-19561=>28740,
-19562=>28741,
-19563=>28742,
-19564=>28743,
-19565=>28744,
-19566=>28745,
-19567=>28746,
-19568=>28747,
-19569=>28748,
-19570=>28749,
-19571=>28750,
-19572=>28751,
-19573=>28752,
-19574=>28753,
-19576=>28754,
-19577=>28755,
-19578=>28756,
-19579=>28757,
-19580=>28758,
-19581=>28759,
-19582=>28760,
-19583=>28761,
-19584=>28762,
-19585=>28763,
-19586=>28764,
-19587=>28765,
-19588=>28766,
-19589=>28767,
-19590=>28768,
-19591=>28769,
-19592=>28770,
-19593=>28771,
-19594=>28772,
-19595=>28773,
-19596=>28774,
-19597=>28775,
-19598=>28776,
-19599=>28777,
-19600=>28778,
-19601=>28779,
-19602=>28780,
-19603=>28781,
-19604=>28782,
-19605=>28783,
-19606=>28784,
-19607=>28785,
-19608=>28786,
-19609=>28787,
-19610=>28788,
-19611=>28789,
-19612=>28790,
-19613=>28791,
-19614=>28792,
-19620=>28793,
-19621=>28794,
-19622=>28795,
-19623=>28796,
-19624=>28797,
-19625=>28798,
-19626=>28799,
-19627=>28800,
-19628=>28801,
-19629=>28802,
-19630=>28803,
-19631=>28804,
-19632=>28805,
-19633=>28806,
-19634=>28807,
-19635=>28808,
-19636=>28809,
-19637=>28810,
-19638=>28811,
-19639=>28812,
-19640=>28813,
-19641=>28814,
-19642=>28815,
-19643=>28816,
-19644=>28817,
-19645=>28818,
-19646=>28819,
-19647=>28820,
-19648=>28821,
-19649=>28822,
-19650=>28823,
-19651=>28824,
-19652=>28825,
-19653=>28826,
-19654=>28827,
-19655=>28828,
-19656=>28829,
-19657=>28830,
-19658=>28831,
-19659=>28832,
-19660=>28833,
-19661=>28834,
-19662=>28835,
-19663=>28836,
-19664=>28837,
-19665=>28838,
-19666=>28839,
-19667=>28840,
-19668=>28841,
-19669=>28842,
-19670=>28843,
-19671=>28844,
-19672=>28845,
-19673=>28846,
-19674=>28847,
-19675=>28848,
-19676=>28849,
-19677=>28850,
-19678=>28851,
-19679=>28852,
-19680=>28853,
-19681=>28854,
-19682=>28855,
-19683=>28856,
-19684=>28857,
-19685=>28858,
-19686=>28859,
-19687=>28860,
-19688=>28861,
-19689=>28862,
-19690=>28863,
-19691=>28864,
-19692=>28865,
-19693=>28866,
-19694=>28867,
-19695=>28868,
-19696=>28869,
-19697=>28870,
-19698=>28871,
-19699=>28872,
-19700=>28873,
-19701=>28874,
-19702=>28875,
-19703=>28876,
-19704=>28877,
-19705=>28878,
-19706=>28879,
-19707=>28880,
-19708=>28881,
-19709=>28882,
-19710=>28883,
-19711=>28884,
-19712=>28885,
-19713=>28886,
-19714=>28887,
-19715=>28888,
-19716=>28889,
-19717=>28890,
-19718=>28891,
-19719=>28892,
-19720=>28893,
-19721=>28894,
-19722=>28895,
-19723=>28896,
-19724=>28897,
-19725=>28898,
-19726=>28899,
-19727=>28900,
-19728=>28901,
-19729=>28902,
-19730=>28903,
-19738=>28904,
-19739=>28905,
-19740=>28906,
-19741=>28907,
-19742=>28908,
-19743=>28909,
-19744=>28910,
-19745=>28911,
-19746=>28912,
-19747=>28913,
-19748=>28914,
-19749=>28915,
-19750=>28916,
-19751=>28917,
-19752=>28918,
-19753=>28919,
-19754=>28920,
-19755=>28921,
-19756=>28922,
-19757=>28923,
-19758=>28924,
-19759=>28925,
-19760=>28926,
-19761=>28927,
-19762=>28928,
-19763=>28929,
-19764=>28930,
-19765=>28931,
-19766=>28932,
-19767=>28933,
-19768=>28934,
-19769=>28935,
-19770=>28936,
-19771=>28937,
-19772=>28938,
-19773=>28939,
-19774=>28940,
-19775=>28941,
-19776=>28942,
-19777=>28943,
-19778=>28944,
-19779=>28945,
-19780=>28946,
-19781=>28947,
-19782=>28948,
-19783=>28949,
-19784=>28950,
-19785=>28951,
-19786=>28952,
-19787=>28953,
-19788=>28954,
-19789=>28955,
-19790=>28956,
-19791=>28957,
-19792=>28958,
-19793=>28959,
-19794=>28960,
-19795=>28961,
-19796=>28962,
-19797=>28963,
-19798=>28964,
-19799=>28965,
-19800=>28966,
-19801=>28967,
-19802=>28968,
-19803=>28969,
-19804=>28970,
-19805=>28971,
-19806=>28972,
-19807=>28973,
-19808=>28974,
-19809=>28975,
-19810=>28976,
-19811=>28977,
-19812=>28978,
-19813=>28979,
-19814=>28980,
-19815=>28981,
-19816=>28982,
-19817=>28983,
-19818=>28984,
-19819=>28985,
-19820=>28986,
-19821=>28987,
-19822=>28988,
-19823=>28989,
-19824=>28990,
-19825=>28991,
-19826=>28992,
-19827=>28993,
-19828=>28994,
-19829=>28995,
-19830=>28996,
-19831=>28997,
-19832=>28998,
-19833=>28999,
-19834=>29000,
-19835=>29001,
-19836=>29002,
-19837=>29003,
-19838=>29004,
-19839=>29005,
-19840=>29006,
-19841=>29007,
-19842=>29008,
-19843=>29009,
-19844=>29010,
-19845=>29011,
-19846=>29012,
-19847=>29013,
-19848=>29014,
-19849=>29015,
-19850=>29016,
-19851=>29017,
-19852=>29018,
-19853=>29019,
-19854=>29020,
-19855=>29021,
-19856=>29022,
-19857=>29023,
-19858=>29024,
-19859=>29025,
-19860=>29026,
-19861=>29027,
-19862=>29028,
-19863=>29029,
-19864=>29030,
-19865=>29031,
-19866=>29032,
-19867=>29033,
-19868=>29034,
-19869=>29035,
-19870=>29036,
-19871=>29037,
-19872=>29038,
-19873=>29039,
-19874=>29040,
-19875=>29041,
-19876=>29042,
-19877=>29043,
-19878=>29044,
-19879=>29045,
-19880=>29046,
-19881=>29047,
-19882=>29048,
-19883=>29049,
-19884=>29050,
-19885=>29051,
-19887=>29052,
-19888=>29053,
-19889=>29054,
-19890=>29055,
-19891=>29056,
-19892=>29057,
-19893=>29058,
-40960=>29064,
-40961=>29065,
-40962=>29066,
-40963=>29067,
-40964=>29068,
-40965=>29069,
-40966=>29070,
-40967=>29071,
-40968=>29072,
-40969=>29073,
-40970=>29074,
-40971=>29075,
-40972=>29076,
-40973=>29077,
-40974=>29078,
-40975=>29079,
-40976=>29080,
-40977=>29081,
-40978=>29082,
-40979=>29083,
-40980=>29084,
-40981=>29085,
-40982=>29086,
-40983=>29087,
-40984=>29088,
-40985=>29089,
-40986=>29090,
-40987=>29091,
-40988=>29092,
-40989=>29093,
-40990=>29094,
-40991=>29095,
-40992=>29096,
-40993=>29097,
-40994=>29098,
-40995=>29099,
-40996=>29100,
-40997=>29101,
-40998=>29102,
-40999=>29103,
-41000=>29104,
-41001=>29105,
-41002=>29106,
-41003=>29107,
-41004=>29108,
-41005=>29109,
-41006=>29110,
-41007=>29111,
-41008=>29112,
-41009=>29113,
-41010=>29114,
-41011=>29115,
-41012=>29116,
-41013=>29117,
-41014=>29118,
-41015=>29119,
-41016=>29120,
-41017=>29121,
-41018=>29122,
-41019=>29123,
-41020=>29124,
-41021=>29125,
-41022=>29126,
-41023=>29127,
-41024=>29128,
-41025=>29129,
-41026=>29130,
-41027=>29131,
-41028=>29132,
-41029=>29133,
-41030=>29134,
-41031=>29135,
-41032=>29136,
-41033=>29137,
-41034=>29138,
-41035=>29139,
-41036=>29140,
-41037=>29141,
-41038=>29142,
-41039=>29143,
-41040=>29144,
-41041=>29145,
-41042=>29146,
-41043=>29147,
-41044=>29148,
-41045=>29149,
-41046=>29150,
-41047=>29151,
-41048=>29152,
-41049=>29153,
-41050=>29154,
-41051=>29155,
-41052=>29156,
-41053=>29157,
-41054=>29158,
-41055=>29159,
-41056=>29160,
-41057=>29161,
-41058=>29162,
-41059=>29163,
-41060=>29164,
-41061=>29165,
-41062=>29166,
-41063=>29167,
-41064=>29168,
-41065=>29169,
-41066=>29170,
-41067=>29171,
-41068=>29172,
-41069=>29173,
-41070=>29174,
-41071=>29175,
-41072=>29176,
-41073=>29177,
-41074=>29178,
-41075=>29179,
-41076=>29180,
-41077=>29181,
-41078=>29182,
-41079=>29183,
-41080=>29184,
-41081=>29185,
-41082=>29186,
-41083=>29187,
-41084=>29188,
-41085=>29189,
-41086=>29190,
-41087=>29191,
-41088=>29192,
-41089=>29193,
-41090=>29194,
-41091=>29195,
-41092=>29196,
-41093=>29197,
-41094=>29198,
-41095=>29199,
-41096=>29200,
-41097=>29201,
-41098=>29202,
-41099=>29203,
-41100=>29204,
-41101=>29205,
-41102=>29206,
-41103=>29207,
-41104=>29208,
-41105=>29209,
-41106=>29210,
-41107=>29211,
-41108=>29212,
-41109=>29213,
-41110=>29214,
-41111=>29215,
-41112=>29216,
-41113=>29217,
-41114=>29218,
-41115=>29219,
-41116=>29220,
-41117=>29221,
-41118=>29222,
-41119=>29223,
-41120=>29224,
-41121=>29225,
-41122=>29226,
-41123=>29227,
-41124=>29228,
-41125=>29229,
-41126=>29230,
-41127=>29231,
-41128=>29232,
-41129=>29233,
-41130=>29234,
-41131=>29235,
-41132=>29236,
-41133=>29237,
-41134=>29238,
-41135=>29239,
-41136=>29240,
-41137=>29241,
-41138=>29242,
-41139=>29243,
-41140=>29244,
-41141=>29245,
-41142=>29246,
-41143=>29247,
-41144=>29248,
-41145=>29249,
-41146=>29250,
-41147=>29251,
-41148=>29252,
-41149=>29253,
-41150=>29254,
-41151=>29255,
-41152=>29256,
-41153=>29257,
-41154=>29258,
-41155=>29259,
-41156=>29260,
-41157=>29261,
-41158=>29262,
-41159=>29263,
-41160=>29264,
-41161=>29265,
-41162=>29266,
-41163=>29267,
-41164=>29268,
-41165=>29269,
-41166=>29270,
-41167=>29271,
-41168=>29272,
-41169=>29273,
-41170=>29274,
-41171=>29275,
-41172=>29276,
-41173=>29277,
-41174=>29278,
-41175=>29279,
-41176=>29280,
-41177=>29281,
-41178=>29282,
-41179=>29283,
-41180=>29284,
-41181=>29285,
-41182=>29286,
-41183=>29287,
-41184=>29288,
-41185=>29289,
-41186=>29290,
-41187=>29291,
-41188=>29292,
-41189=>29293,
-41190=>29294,
-41191=>29295,
-41192=>29296,
-41193=>29297,
-41194=>29298,
-41195=>29299,
-41196=>29300,
-41197=>29301,
-41198=>29302,
-41199=>29303,
-41200=>29304,
-41201=>29305,
-41202=>29306,
-41203=>29307,
-41204=>29308,
-41205=>29309,
-41206=>29310,
-41207=>29311,
-41208=>29312,
-41209=>29313,
-41210=>29314,
-41211=>29315,
-41212=>29316,
-41213=>29317,
-41214=>29318,
-41215=>29319,
-41216=>29320,
-41217=>29321,
-41218=>29322,
-41219=>29323,
-41220=>29324,
-41221=>29325,
-41222=>29326,
-41223=>29327,
-41224=>29328,
-41225=>29329,
-41226=>29330,
-41227=>29331,
-41228=>29332,
-41229=>29333,
-41230=>29334,
-41231=>29335,
-41232=>29336,
-41233=>29337,
-41234=>29338,
-41235=>29339,
-41236=>29340,
-41237=>29341,
-41238=>29342,
-41239=>29343,
-41240=>29344,
-41241=>29345,
-41242=>29346,
-41243=>29347,
-41244=>29348,
-41245=>29349,
-41246=>29350,
-41247=>29351,
-41248=>29352,
-41249=>29353,
-41250=>29354,
-41251=>29355,
-41252=>29356,
-41253=>29357,
-41254=>29358,
-41255=>29359,
-41256=>29360,
-41257=>29361,
-41258=>29362,
-41259=>29363,
-41260=>29364,
-41261=>29365,
-41262=>29366,
-41263=>29367,
-41264=>29368,
-41265=>29369,
-41266=>29370,
-41267=>29371,
-41268=>29372,
-41269=>29373,
-41270=>29374,
-41271=>29375,
-41272=>29376,
-41273=>29377,
-41274=>29378,
-41275=>29379,
-41276=>29380,
-41277=>29381,
-41278=>29382,
-41279=>29383,
-41280=>29384,
-41281=>29385,
-41282=>29386,
-41283=>29387,
-41284=>29388,
-41285=>29389,
-41286=>29390,
-41287=>29391,
-41288=>29392,
-41289=>29393,
-41290=>29394,
-41291=>29395,
-41292=>29396,
-41293=>29397,
-41294=>29398,
-41295=>29399,
-41296=>29400,
-41297=>29401,
-41298=>29402,
-41299=>29403,
-41300=>29404,
-41301=>29405,
-41302=>29406,
-41303=>29407,
-41304=>29408,
-41305=>29409,
-41306=>29410,
-41307=>29411,
-41308=>29412,
-41309=>29413,
-41310=>29414,
-41311=>29415,
-41312=>29416,
-41313=>29417,
-41314=>29418,
-41315=>29419,
-41316=>29420,
-41317=>29421,
-41318=>29422,
-41319=>29423,
-41320=>29424,
-41321=>29425,
-41322=>29426,
-41323=>29427,
-41324=>29428,
-41325=>29429,
-41326=>29430,
-41327=>29431,
-41328=>29432,
-41329=>29433,
-41330=>29434,
-41331=>29435,
-41332=>29436,
-41333=>29437,
-41334=>29438,
-41335=>29439,
-41336=>29440,
-41337=>29441,
-41338=>29442,
-41339=>29443,
-41340=>29444,
-41341=>29445,
-41342=>29446,
-41343=>29447,
-41344=>29448,
-41345=>29449,
-41346=>29450,
-41347=>29451,
-41348=>29452,
-41349=>29453,
-41350=>29454,
-41351=>29455,
-41352=>29456,
-41353=>29457,
-41354=>29458,
-41355=>29459,
-41356=>29460,
-41357=>29461,
-41358=>29462,
-41359=>29463,
-41360=>29464,
-41361=>29465,
-41362=>29466,
-41363=>29467,
-41364=>29468,
-41365=>29469,
-41366=>29470,
-41367=>29471,
-41368=>29472,
-41369=>29473,
-41370=>29474,
-41371=>29475,
-41372=>29476,
-41373=>29477,
-41374=>29478,
-41375=>29479,
-41376=>29480,
-41377=>29481,
-41378=>29482,
-41379=>29483,
-41380=>29484,
-41381=>29485,
-41382=>29486,
-41383=>29487,
-41384=>29488,
-41385=>29489,
-41386=>29490,
-41387=>29491,
-41388=>29492,
-41389=>29493,
-41390=>29494,
-41391=>29495,
-41392=>29496,
-41393=>29497,
-41394=>29498,
-41395=>29499,
-41396=>29500,
-41397=>29501,
-41398=>29502,
-41399=>29503,
-41400=>29504,
-41401=>29505,
-41402=>29506,
-41403=>29507,
-41404=>29508,
-41405=>29509,
-41406=>29510,
-41407=>29511,
-41408=>29512,
-41409=>29513,
-41410=>29514,
-41411=>29515,
-41412=>29516,
-41413=>29517,
-41414=>29518,
-41415=>29519,
-41416=>29520,
-41417=>29521,
-41418=>29522,
-41419=>29523,
-41420=>29524,
-41421=>29525,
-41422=>29526,
-41423=>29527,
-41424=>29528,
-41425=>29529,
-41426=>29530,
-41427=>29531,
-41428=>29532,
-41429=>29533,
-41430=>29534,
-41431=>29535,
-41432=>29536,
-41433=>29537,
-41434=>29538,
-41435=>29539,
-41436=>29540,
-41437=>29541,
-41438=>29542,
-41439=>29543,
-41440=>29544,
-41441=>29545,
-41442=>29546,
-41443=>29547,
-41444=>29548,
-41445=>29549,
-41446=>29550,
-41447=>29551,
-41448=>29552,
-41449=>29553,
-41450=>29554,
-41451=>29555,
-41452=>29556,
-41453=>29557,
-41454=>29558,
-41455=>29559,
-41456=>29560,
-41457=>29561,
-41458=>29562,
-41459=>29563,
-41460=>29564,
-41461=>29565,
-41462=>29566,
-41463=>29567,
-41464=>29568,
-41465=>29569,
-41466=>29570,
-41467=>29571,
-41468=>29572,
-41469=>29573,
-41470=>29574,
-41471=>29575,
-41472=>29576,
-41473=>29577,
-41474=>29578,
-41475=>29579,
-41476=>29580,
-41477=>29581,
-41478=>29582,
-41479=>29583,
-41480=>29584,
-41481=>29585,
-41482=>29586,
-41483=>29587,
-41484=>29588,
-41485=>29589,
-41486=>29590,
-41487=>29591,
-41488=>29592,
-41489=>29593,
-41490=>29594,
-41491=>29595,
-41492=>29596,
-41493=>29597,
-41494=>29598,
-41495=>29599,
-41496=>29600,
-41497=>29601,
-41498=>29602,
-41499=>29603,
-41500=>29604,
-41501=>29605,
-41502=>29606,
-41503=>29607,
-41504=>29608,
-41505=>29609,
-41506=>29610,
-41507=>29611,
-41508=>29612,
-41509=>29613,
-41510=>29614,
-41511=>29615,
-41512=>29616,
-41513=>29617,
-41514=>29618,
-41515=>29619,
-41516=>29620,
-41517=>29621,
-41518=>29622,
-41519=>29623,
-41520=>29624,
-41521=>29625,
-41522=>29626,
-41523=>29627,
-41524=>29628,
-41525=>29629,
-41526=>29630,
-41527=>29631,
-41528=>29632,
-41529=>29633,
-41530=>29634,
-41531=>29635,
-41532=>29636,
-41533=>29637,
-41534=>29638,
-41535=>29639,
-41536=>29640,
-41537=>29641,
-41538=>29642,
-41539=>29643,
-41540=>29644,
-41541=>29645,
-41542=>29646,
-41543=>29647,
-41544=>29648,
-41545=>29649,
-41546=>29650,
-41547=>29651,
-41548=>29652,
-41549=>29653,
-41550=>29654,
-41551=>29655,
-41552=>29656,
-41553=>29657,
-41554=>29658,
-41555=>29659,
-41556=>29660,
-41557=>29661,
-41558=>29662,
-41559=>29663,
-41560=>29664,
-41561=>29665,
-41562=>29666,
-41563=>29667,
-41564=>29668,
-41565=>29669,
-41566=>29670,
-41567=>29671,
-41568=>29672,
-41569=>29673,
-41570=>29674,
-41571=>29675,
-41572=>29676,
-41573=>29677,
-41574=>29678,
-41575=>29679,
-41576=>29680,
-41577=>29681,
-41578=>29682,
-41579=>29683,
-41580=>29684,
-41581=>29685,
-41582=>29686,
-41583=>29687,
-41584=>29688,
-41585=>29689,
-41586=>29690,
-41587=>29691,
-41588=>29692,
-41589=>29693,
-41590=>29694,
-41591=>29695,
-41592=>29696,
-41593=>29697,
-41594=>29698,
-41595=>29699,
-41596=>29700,
-41597=>29701,
-41598=>29702,
-41599=>29703,
-41600=>29704,
-41601=>29705,
-41602=>29706,
-41603=>29707,
-41604=>29708,
-41605=>29709,
-41606=>29710,
-41607=>29711,
-41608=>29712,
-41609=>29713,
-41610=>29714,
-41611=>29715,
-41612=>29716,
-41613=>29717,
-41614=>29718,
-41615=>29719,
-41616=>29720,
-41617=>29721,
-41618=>29722,
-41619=>29723,
-41620=>29724,
-41621=>29725,
-41622=>29726,
-41623=>29727,
-41624=>29728,
-41625=>29729,
-41626=>29730,
-41627=>29731,
-41628=>29732,
-41629=>29733,
-41630=>29734,
-41631=>29735,
-41632=>29736,
-41633=>29737,
-41634=>29738,
-41635=>29739,
-41636=>29740,
-41637=>29741,
-41638=>29742,
-41639=>29743,
-41640=>29744,
-41641=>29745,
-41642=>29746,
-41643=>29747,
-41644=>29748,
-41645=>29749,
-41646=>29750,
-41647=>29751,
-41648=>29752,
-41649=>29753,
-41650=>29754,
-41651=>29755,
-41652=>29756,
-41653=>29757,
-41654=>29758,
-41655=>29759,
-41656=>29760,
-41657=>29761,
-41658=>29762,
-41659=>29763,
-41660=>29764,
-41661=>29765,
-41662=>29766,
-41663=>29767,
-41664=>29768,
-41665=>29769,
-41666=>29770,
-41667=>29771,
-41668=>29772,
-41669=>29773,
-41670=>29774,
-41671=>29775,
-41672=>29776,
-41673=>29777,
-41674=>29778,
-41675=>29779,
-41676=>29780,
-41677=>29781,
-41678=>29782,
-41679=>29783,
-41680=>29784,
-41681=>29785,
-41682=>29786,
-41683=>29787,
-41684=>29788,
-41685=>29789,
-41686=>29790,
-41687=>29791,
-41688=>29792,
-41689=>29793,
-41690=>29794,
-41691=>29795,
-41692=>29796,
-41693=>29797,
-41694=>29798,
-41695=>29799,
-41696=>29800,
-41697=>29801,
-41698=>29802,
-41699=>29803,
-41700=>29804,
-41701=>29805,
-41702=>29806,
-41703=>29807,
-41704=>29808,
-41705=>29809,
-41706=>29810,
-41707=>29811,
-41708=>29812,
-41709=>29813,
-41710=>29814,
-41711=>29815,
-41712=>29816,
-41713=>29817,
-41714=>29818,
-41715=>29819,
-41716=>29820,
-41717=>29821,
-41718=>29822,
-41719=>29823,
-41720=>29824,
-41721=>29825,
-41722=>29826,
-41723=>29827,
-41724=>29828,
-41725=>29829,
-41726=>29830,
-41727=>29831,
-41728=>29832,
-41729=>29833,
-41730=>29834,
-41731=>29835,
-41732=>29836,
-41733=>29837,
-41734=>29838,
-41735=>29839,
-41736=>29840,
-41737=>29841,
-41738=>29842,
-41739=>29843,
-41740=>29844,
-41741=>29845,
-41742=>29846,
-41743=>29847,
-41744=>29848,
-41745=>29849,
-41746=>29850,
-41747=>29851,
-41748=>29852,
-41749=>29853,
-41750=>29854,
-41751=>29855,
-41752=>29856,
-41753=>29857,
-41754=>29858,
-41755=>29859,
-41756=>29860,
-41757=>29861,
-41758=>29862,
-41759=>29863,
-41760=>29864,
-41761=>29865,
-41762=>29866,
-41763=>29867,
-41764=>29868,
-41765=>29869,
-41766=>29870,
-41767=>29871,
-41768=>29872,
-41769=>29873,
-41770=>29874,
-41771=>29875,
-41772=>29876,
-41773=>29877,
-41774=>29878,
-41775=>29879,
-41776=>29880,
-41777=>29881,
-41778=>29882,
-41779=>29883,
-41780=>29884,
-41781=>29885,
-41782=>29886,
-41783=>29887,
-41784=>29888,
-41785=>29889,
-41786=>29890,
-41787=>29891,
-41788=>29892,
-41789=>29893,
-41790=>29894,
-41791=>29895,
-41792=>29896,
-41793=>29897,
-41794=>29898,
-41795=>29899,
-41796=>29900,
-41797=>29901,
-41798=>29902,
-41799=>29903,
-41800=>29904,
-41801=>29905,
-41802=>29906,
-41803=>29907,
-41804=>29908,
-41805=>29909,
-41806=>29910,
-41807=>29911,
-41808=>29912,
-41809=>29913,
-41810=>29914,
-41811=>29915,
-41812=>29916,
-41813=>29917,
-41814=>29918,
-41815=>29919,
-41816=>29920,
-41817=>29921,
-41818=>29922,
-41819=>29923,
-41820=>29924,
-41821=>29925,
-41822=>29926,
-41823=>29927,
-41824=>29928,
-41825=>29929,
-41826=>29930,
-41827=>29931,
-41828=>29932,
-41829=>29933,
-41830=>29934,
-41831=>29935,
-41832=>29936,
-41833=>29937,
-41834=>29938,
-41835=>29939,
-41836=>29940,
-41837=>29941,
-41838=>29942,
-41839=>29943,
-41840=>29944,
-41841=>29945,
-41842=>29946,
-41843=>29947,
-41844=>29948,
-41845=>29949,
-41846=>29950,
-41847=>29951,
-41848=>29952,
-41849=>29953,
-41850=>29954,
-41851=>29955,
-41852=>29956,
-41853=>29957,
-41854=>29958,
-41855=>29959,
-41856=>29960,
-41857=>29961,
-41858=>29962,
-41859=>29963,
-41860=>29964,
-41861=>29965,
-41862=>29966,
-41863=>29967,
-41864=>29968,
-41865=>29969,
-41866=>29970,
-41867=>29971,
-41868=>29972,
-41869=>29973,
-41870=>29974,
-41871=>29975,
-41872=>29976,
-41873=>29977,
-41874=>29978,
-41875=>29979,
-41876=>29980,
-41877=>29981,
-41878=>29982,
-41879=>29983,
-41880=>29984,
-41881=>29985,
-41882=>29986,
-41883=>29987,
-41884=>29988,
-41885=>29989,
-41886=>29990,
-41887=>29991,
-41888=>29992,
-41889=>29993,
-41890=>29994,
-41891=>29995,
-41892=>29996,
-41893=>29997,
-41894=>29998,
-41895=>29999,
-41896=>30000,
-41897=>30001,
-41898=>30002,
-41899=>30003,
-41900=>30004,
-41901=>30005,
-41902=>30006,
-41903=>30007,
-41904=>30008,
-41905=>30009,
-41906=>30010,
-41907=>30011,
-41908=>30012,
-41909=>30013,
-41910=>30014,
-41911=>30015,
-41912=>30016,
-41913=>30017,
-41914=>30018,
-41915=>30019,
-41916=>30020,
-41917=>30021,
-41918=>30022,
-41919=>30023,
-41920=>30024,
-41921=>30025,
-41922=>30026,
-41923=>30027,
-41924=>30028,
-41925=>30029,
-41926=>30030,
-41927=>30031,
-41928=>30032,
-41929=>30033,
-41930=>30034,
-41931=>30035,
-41932=>30036,
-41933=>30037,
-41934=>30038,
-41935=>30039,
-41936=>30040,
-41937=>30041,
-41938=>30042,
-41939=>30043,
-41940=>30044,
-41941=>30045,
-41942=>30046,
-41943=>30047,
-41944=>30048,
-41945=>30049,
-41946=>30050,
-41947=>30051,
-41948=>30052,
-41949=>30053,
-41950=>30054,
-41951=>30055,
-41952=>30056,
-41953=>30057,
-41954=>30058,
-41955=>30059,
-41956=>30060,
-41957=>30061,
-41958=>30062,
-41959=>30063,
-41960=>30064,
-41961=>30065,
-41962=>30066,
-41963=>30067,
-41964=>30068,
-41965=>30069,
-41966=>30070,
-41967=>30071,
-41968=>30072,
-41969=>30073,
-41970=>30074,
-41971=>30075,
-41972=>30076,
-41973=>30077,
-41974=>30078,
-41975=>30079,
-41976=>30080,
-41977=>30081,
-41978=>30082,
-41979=>30083,
-41980=>30084,
-41981=>30085,
-41982=>30086,
-41983=>30087,
-41984=>30088,
-41985=>30089,
-41986=>30090,
-41987=>30091,
-41988=>30092,
-41989=>30093,
-41990=>30094,
-41991=>30095,
-41992=>30096,
-41993=>30097,
-41994=>30098,
-41995=>30099,
-41996=>30100,
-41997=>30101,
-41998=>30102,
-41999=>30103,
-42000=>30104,
-42001=>30105,
-42002=>30106,
-42003=>30107,
-42004=>30108,
-42005=>30109,
-42006=>30110,
-42007=>30111,
-42008=>30112,
-42009=>30113,
-42010=>30114,
-42011=>30115,
-42012=>30116,
-42013=>30117,
-42014=>30118,
-42015=>30119,
-42016=>30120,
-42017=>30121,
-42018=>30122,
-42019=>30123,
-42020=>30124,
-42021=>30125,
-42022=>30126,
-42023=>30127,
-42024=>30128,
-42025=>30129,
-42026=>30130,
-42027=>30131,
-42028=>30132,
-42029=>30133,
-42030=>30134,
-42031=>30135,
-42032=>30136,
-42033=>30137,
-42034=>30138,
-42035=>30139,
-42036=>30140,
-42037=>30141,
-42038=>30142,
-42039=>30143,
-42040=>30144,
-42041=>30145,
-42042=>30146,
-42043=>30147,
-42044=>30148,
-42045=>30149,
-42046=>30150,
-42047=>30151,
-42048=>30152,
-42049=>30153,
-42050=>30154,
-42051=>30155,
-42052=>30156,
-42053=>30157,
-42054=>30158,
-42055=>30159,
-42056=>30160,
-42057=>30161,
-42058=>30162,
-42059=>30163,
-42060=>30164,
-42061=>30165,
-42062=>30166,
-42063=>30167,
-42064=>30168,
-42065=>30169,
-42066=>30170,
-42067=>30171,
-42068=>30172,
-42069=>30173,
-42070=>30174,
-42071=>30175,
-42072=>30176,
-42073=>30177,
-42074=>30178,
-42075=>30179,
-42076=>30180,
-42077=>30181,
-42078=>30182,
-42079=>30183,
-42080=>30184,
-42081=>30185,
-42082=>30186,
-42083=>30187,
-42084=>30188,
-42085=>30189,
-42086=>30190,
-42087=>30191,
-42088=>30192,
-42089=>30193,
-42090=>30194,
-42091=>30195,
-42092=>30196,
-42093=>30197,
-42094=>30198,
-42095=>30199,
-42096=>30200,
-42097=>30201,
-42098=>30202,
-42099=>30203,
-42100=>30204,
-42101=>30205,
-42102=>30206,
-42103=>30207,
-42104=>30208,
-42105=>30209,
-42106=>30210,
-42107=>30211,
-42108=>30212,
-42109=>30213,
-42110=>30214,
-42111=>30215,
-42112=>30216,
-42113=>30217,
-42114=>30218,
-42115=>30219,
-42116=>30220,
-42117=>30221,
-42118=>30222,
-42119=>30223,
-42120=>30224,
-42121=>30225,
-42122=>30226,
-42123=>30227,
-42124=>30228,
-42128=>30229,
-42129=>30230,
-42130=>30231,
-42131=>30232,
-42132=>30233,
-42133=>30234,
-42134=>30235,
-42135=>30236,
-42136=>30237,
-42137=>30238,
-42138=>30239,
-42139=>30240,
-42140=>30241,
-42141=>30242,
-42142=>30243,
-42143=>30244,
-42144=>30245,
-42145=>30246,
-42146=>30247,
-42147=>30248,
-42148=>30249,
-42149=>30250,
-42150=>30251,
-42151=>30252,
-42152=>30253,
-42153=>30254,
-42154=>30255,
-42155=>30256,
-42156=>30257,
-42157=>30258,
-42158=>30259,
-42159=>30260,
-42160=>30261,
-42161=>30262,
-42162=>30263,
-42163=>30264,
-42164=>30265,
-42165=>30266,
-42166=>30267,
-42167=>30268,
-42168=>30269,
-42169=>30270,
-42170=>30271,
-42171=>30272,
-42172=>30273,
-42173=>30274,
-42174=>30275,
-42175=>30276,
-42176=>30277,
-42177=>30278,
-42178=>30279,
-42179=>30280,
-42180=>30281,
-42181=>30282,
-42182=>30283,
-);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_aj16.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_aj16.php
deleted file mode 100644
index a1e4dc74da0..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_aj16.php
+++ /dev/null
@@ -1,15705 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in aj16.tar.Z
-$cidinfo['uni2cid'] = array(
-160=>1,
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-8209=>14,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-165=>61,
-93=>62,
-94=>63,
-818=>64,
-95=>64,
-768=>65,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-166=>93,
-125=>94,
-732=>95,
-771=>95,
-700=>96,
-8217=>96,
-92=>97,
-699=>98,
-8216=>98,
-124=>99,
-126=>100,
-8764=>100,
-161=>101,
-162=>102,
-163=>103,
-8260=>104,
-402=>105,
-164=>107,
-8220=>108,
-171=>109,
-8249=>110,
-8250=>111,
-64257=>112,
-64258=>113,
-8210=>114,
-8211=>114,
-183=>117,
-8729=>117,
-8226=>119,
-8218=>120,
-8222=>121,
-8221=>122,
-187=>123,
-191=>126,
-769=>127,
-710=>128,
-770=>128,
-175=>129,
-772=>129,
-774=>130,
-775=>131,
-776=>132,
-730=>133,
-778=>133,
-184=>134,
-807=>134,
-779=>135,
-808=>136,
-780=>137,
-822=>138,
-8212=>138,
-198=>139,
-170=>140,
-321=>141,
-216=>142,
-338=>143,
-186=>144,
-230=>145,
-305=>146,
-322=>147,
-248=>148,
-339=>149,
-223=>150,
-173=>151,
-169=>152,
-172=>153,
-174=>154,
-178=>157,
-179=>158,
-181=>159,
-185=>160,
-188=>161,
-189=>162,
-190=>163,
-192=>164,
-193=>165,
-194=>166,
-195=>167,
-196=>168,
-197=>169,
-199=>170,
-200=>171,
-201=>172,
-202=>173,
-203=>174,
-204=>175,
-205=>176,
-206=>177,
-207=>178,
-208=>179,
-209=>180,
-210=>181,
-211=>182,
-212=>183,
-213=>184,
-214=>185,
-217=>187,
-218=>188,
-219=>189,
-220=>190,
-221=>191,
-222=>192,
-224=>193,
-225=>194,
-226=>195,
-227=>196,
-228=>197,
-229=>198,
-231=>199,
-232=>200,
-233=>201,
-234=>202,
-235=>203,
-236=>204,
-237=>205,
-238=>206,
-239=>207,
-240=>208,
-241=>209,
-242=>210,
-243=>211,
-244=>212,
-245=>213,
-246=>214,
-249=>216,
-250=>217,
-251=>218,
-252=>219,
-253=>220,
-254=>221,
-255=>222,
-352=>223,
-376=>224,
-381=>225,
-773=>226,
-8254=>226,
-353=>227,
-8482=>228,
-382=>229,
-8194=>231,
-65512=>323,
-65377=>327,
-65378=>328,
-65379=>329,
-65380=>330,
-65381=>331,
-65382=>332,
-65383=>333,
-65384=>334,
-65385=>335,
-65386=>336,
-65387=>337,
-65388=>338,
-65389=>339,
-65390=>340,
-65391=>341,
-65392=>342,
-65393=>343,
-65394=>344,
-65395=>345,
-65396=>346,
-65397=>347,
-65398=>348,
-65399=>349,
-65400=>350,
-65401=>351,
-65402=>352,
-65403=>353,
-65404=>354,
-65405=>355,
-65406=>356,
-65407=>357,
-65408=>358,
-65409=>359,
-65410=>360,
-65411=>361,
-65412=>362,
-65413=>363,
-65414=>364,
-65415=>365,
-65416=>366,
-65417=>367,
-65418=>368,
-65419=>369,
-65420=>370,
-65421=>371,
-65422=>372,
-65423=>373,
-65424=>374,
-65425=>375,
-65426=>376,
-65427=>377,
-65428=>378,
-65429=>379,
-65430=>380,
-65431=>381,
-65432=>382,
-65433=>383,
-65434=>384,
-65435=>385,
-65436=>386,
-65437=>387,
-65438=>388,
-65439=>389,
-8195=>633,
-12288=>633,
-12289=>634,
-12290=>635,
-65292=>636,
-65294=>637,
-12539=>638,
-65306=>639,
-65307=>640,
-65311=>641,
-65281=>642,
-12443=>643,
-12444=>644,
-180=>645,
-65344=>646,
-168=>647,
-65342=>648,
-65507=>649,
-65343=>650,
-12541=>651,
-12542=>652,
-12445=>653,
-12446=>654,
-12291=>655,
-20189=>656,
-12293=>657,
-12294=>658,
-12295=>659,
-12540=>660,
-8213=>661,
-8208=>662,
-65295=>663,
-65340=>664,
-12316=>665,
-65374=>665,
-8214=>666,
-65372=>667,
-8230=>668,
-8229=>669,
-65288=>674,
-65289=>675,
-12308=>676,
-12309=>677,
-65339=>678,
-65341=>679,
-65371=>680,
-65373=>681,
-12296=>682,
-12297=>683,
-12298=>684,
-12299=>685,
-12300=>686,
-12301=>687,
-12302=>688,
-12303=>689,
-12304=>690,
-12305=>691,
-65291=>692,
-8722=>693,
-65293=>693,
-177=>694,
-215=>695,
-247=>696,
-65309=>697,
-8800=>698,
-65308=>699,
-65310=>700,
-8806=>701,
-8807=>702,
-8734=>703,
-8756=>704,
-9794=>705,
-9792=>706,
-176=>707,
-8242=>708,
-8243=>709,
-8451=>710,
-65509=>711,
-65284=>712,
-65504=>713,
-65505=>714,
-65285=>715,
-65283=>716,
-65286=>717,
-65290=>718,
-65312=>719,
-167=>720,
-9734=>721,
-9733=>722,
-9675=>723,
-9679=>724,
-9678=>725,
-9671=>726,
-9670=>727,
-9633=>728,
-9632=>729,
-9651=>730,
-9650=>731,
-9661=>732,
-9660=>733,
-8251=>734,
-12306=>735,
-8594=>736,
-8592=>737,
-8593=>738,
-8595=>739,
-12307=>740,
-8712=>741,
-8715=>742,
-8838=>743,
-8839=>744,
-8834=>745,
-8835=>746,
-8746=>747,
-8745=>748,
-8743=>749,
-8744=>750,
-65506=>751,
-8658=>752,
-8660=>753,
-8704=>754,
-8707=>755,
-8736=>756,
-8869=>757,
-8978=>758,
-8706=>759,
-8711=>760,
-8801=>761,
-8786=>762,
-8810=>763,
-8811=>764,
-8730=>765,
-8765=>766,
-8733=>767,
-8757=>768,
-8747=>769,
-8748=>770,
-8491=>771,
-8240=>772,
-9839=>773,
-9837=>774,
-9834=>775,
-8224=>776,
-8225=>777,
-182=>778,
-9711=>779,
-65296=>780,
-65297=>781,
-65298=>782,
-65299=>783,
-65300=>784,
-65301=>785,
-65302=>786,
-65303=>787,
-65304=>788,
-65305=>789,
-65313=>790,
-65314=>791,
-65315=>792,
-65316=>793,
-65317=>794,
-65318=>795,
-65319=>796,
-65320=>797,
-65321=>798,
-65322=>799,
-65323=>800,
-65324=>801,
-65325=>802,
-65326=>803,
-65327=>804,
-65328=>805,
-65329=>806,
-65330=>807,
-65331=>808,
-65332=>809,
-65333=>810,
-65334=>811,
-65335=>812,
-65336=>813,
-65337=>814,
-65338=>815,
-65345=>816,
-65346=>817,
-65347=>818,
-65348=>819,
-65349=>820,
-65350=>821,
-65351=>822,
-65352=>823,
-65353=>824,
-65354=>825,
-65355=>826,
-65356=>827,
-65357=>828,
-65358=>829,
-65359=>830,
-65360=>831,
-65361=>832,
-65362=>833,
-65363=>834,
-65364=>835,
-65365=>836,
-65366=>837,
-65367=>838,
-65368=>839,
-65369=>840,
-65370=>841,
-12353=>842,
-12354=>843,
-12355=>844,
-12356=>845,
-12357=>846,
-12358=>847,
-12359=>848,
-12360=>849,
-12361=>850,
-12362=>851,
-12363=>852,
-12364=>853,
-12365=>854,
-12366=>855,
-12367=>856,
-12368=>857,
-12369=>858,
-12370=>859,
-12371=>860,
-12372=>861,
-12373=>862,
-12374=>863,
-12375=>864,
-12376=>865,
-12377=>866,
-12378=>867,
-12379=>868,
-12380=>869,
-12381=>870,
-12382=>871,
-12383=>872,
-12384=>873,
-12385=>874,
-12386=>875,
-12387=>876,
-12388=>877,
-12389=>878,
-12390=>879,
-12391=>880,
-12392=>881,
-12393=>882,
-12394=>883,
-12395=>884,
-12396=>885,
-12397=>886,
-12398=>887,
-12399=>888,
-12400=>889,
-12401=>890,
-12402=>891,
-12403=>892,
-12404=>893,
-12405=>894,
-12406=>895,
-12407=>896,
-12408=>897,
-12409=>898,
-12410=>899,
-12411=>900,
-12412=>901,
-12413=>902,
-12414=>903,
-12415=>904,
-12416=>905,
-12417=>906,
-12418=>907,
-12419=>908,
-12420=>909,
-12421=>910,
-12422=>911,
-12423=>912,
-12424=>913,
-12425=>914,
-12426=>915,
-12427=>916,
-12428=>917,
-12429=>918,
-12430=>919,
-12431=>920,
-12432=>921,
-12433=>922,
-12434=>923,
-12435=>924,
-12449=>925,
-12450=>926,
-12451=>927,
-12452=>928,
-12453=>929,
-12454=>930,
-12455=>931,
-12456=>932,
-12457=>933,
-12458=>934,
-12459=>935,
-12460=>936,
-12461=>937,
-12462=>938,
-12463=>939,
-12464=>940,
-12465=>941,
-12466=>942,
-12467=>943,
-12468=>944,
-12469=>945,
-12470=>946,
-12471=>947,
-12472=>948,
-12473=>949,
-12474=>950,
-12475=>951,
-12476=>952,
-12477=>953,
-12478=>954,
-12479=>955,
-12480=>956,
-12481=>957,
-12482=>958,
-12483=>959,
-12484=>960,
-12485=>961,
-12486=>962,
-12487=>963,
-12488=>964,
-12489=>965,
-12490=>966,
-12491=>967,
-12492=>968,
-12493=>969,
-12494=>970,
-12495=>971,
-12496=>972,
-12497=>973,
-12498=>974,
-12499=>975,
-12500=>976,
-12501=>977,
-12502=>978,
-12503=>979,
-12504=>980,
-12505=>981,
-12506=>982,
-12507=>983,
-12508=>984,
-12509=>985,
-12510=>986,
-12511=>987,
-12512=>988,
-12513=>989,
-12514=>990,
-12515=>991,
-12516=>992,
-12517=>993,
-12518=>994,
-12519=>995,
-12520=>996,
-12521=>997,
-12522=>998,
-12523=>999,
-12524=>1000,
-12525=>1001,
-12526=>1002,
-12527=>1003,
-12528=>1004,
-12529=>1005,
-12530=>1006,
-12531=>1007,
-12532=>1008,
-12533=>1009,
-12534=>1010,
-913=>1011,
-914=>1012,
-915=>1013,
-916=>1014,
-917=>1015,
-918=>1016,
-919=>1017,
-920=>1018,
-921=>1019,
-922=>1020,
-923=>1021,
-924=>1022,
-925=>1023,
-926=>1024,
-927=>1025,
-928=>1026,
-929=>1027,
-931=>1028,
-932=>1029,
-933=>1030,
-934=>1031,
-935=>1032,
-936=>1033,
-937=>1034,
-945=>1035,
-946=>1036,
-947=>1037,
-948=>1038,
-949=>1039,
-950=>1040,
-951=>1041,
-952=>1042,
-953=>1043,
-954=>1044,
-955=>1045,
-956=>1046,
-957=>1047,
-958=>1048,
-959=>1049,
-960=>1050,
-961=>1051,
-963=>1052,
-964=>1053,
-965=>1054,
-966=>1055,
-967=>1056,
-968=>1057,
-969=>1058,
-1040=>1059,
-1041=>1060,
-1042=>1061,
-1043=>1062,
-1044=>1063,
-1045=>1064,
-1025=>1065,
-1046=>1066,
-1047=>1067,
-1048=>1068,
-1049=>1069,
-1050=>1070,
-1051=>1071,
-1052=>1072,
-1053=>1073,
-1054=>1074,
-1055=>1075,
-1056=>1076,
-1057=>1077,
-1058=>1078,
-1059=>1079,
-1060=>1080,
-1061=>1081,
-1062=>1082,
-1063=>1083,
-1064=>1084,
-1065=>1085,
-1066=>1086,
-1067=>1087,
-1068=>1088,
-1069=>1089,
-1070=>1090,
-1071=>1091,
-1072=>1092,
-1073=>1093,
-1074=>1094,
-1075=>1095,
-1076=>1096,
-1077=>1097,
-1105=>1098,
-1078=>1099,
-1079=>1100,
-1080=>1101,
-1081=>1102,
-1082=>1103,
-1083=>1104,
-1084=>1105,
-1085=>1106,
-1086=>1107,
-1087=>1108,
-1088=>1109,
-1089=>1110,
-1090=>1111,
-1091=>1112,
-1092=>1113,
-1093=>1114,
-1094=>1115,
-1095=>1116,
-1096=>1117,
-1097=>1118,
-1098=>1119,
-1099=>1120,
-1100=>1121,
-1101=>1122,
-1102=>1123,
-1103=>1124,
-20124=>1125,
-21782=>1126,
-23043=>1127,
-38463=>1128,
-21696=>1129,
-24859=>1130,
-25384=>1131,
-23030=>1132,
-36898=>1133,
-33909=>1134,
-33564=>1135,
-31312=>1136,
-24746=>1137,
-25569=>1138,
-28197=>1139,
-26093=>1140,
-33894=>1141,
-33446=>1142,
-39925=>1143,
-26771=>1144,
-22311=>1145,
-26017=>1146,
-25201=>1147,
-23451=>1148,
-22992=>1149,
-34427=>1150,
-39156=>1151,
-32098=>1152,
-32190=>1153,
-39822=>1154,
-25110=>1155,
-31903=>1156,
-34999=>1157,
-23433=>1158,
-24245=>1159,
-25353=>1160,
-26263=>1161,
-26696=>1162,
-38343=>1163,
-38797=>1164,
-26447=>1165,
-20197=>1166,
-20234=>1167,
-20301=>1168,
-20381=>1169,
-20553=>1170,
-22258=>1171,
-22839=>1172,
-22996=>1173,
-23041=>1174,
-23561=>1175,
-24799=>1176,
-24847=>1177,
-24944=>1178,
-26131=>1179,
-26885=>1180,
-28858=>1181,
-30031=>1182,
-30064=>1183,
-31227=>1184,
-32173=>1185,
-32239=>1186,
-32963=>1187,
-33806=>1188,
-12176=>1189,
-34915=>1189,
-35586=>1190,
-36949=>1191,
-36986=>1192,
-21307=>1193,
-20117=>1194,
-20133=>1195,
-22495=>1196,
-32946=>1197,
-37057=>1198,
-30959=>1199,
-12032=>1200,
-19968=>1200,
-22769=>1201,
-28322=>1202,
-36920=>1203,
-31282=>1204,
-33576=>1205,
-33419=>1206,
-39983=>1207,
-20801=>1208,
-21360=>1209,
-21693=>1210,
-21729=>1211,
-22240=>1212,
-23035=>1213,
-24341=>1214,
-39154=>1215,
-28139=>1216,
-32996=>1217,
-34093=>1218,
-38498=>1219,
-38512=>1220,
-38560=>1221,
-38907=>1222,
-21515=>1223,
-21491=>1224,
-23431=>1225,
-28879=>1226,
-12155=>1227,
-32701=>1227,
-36802=>1228,
-12204=>1229,
-38632=>1229,
-21359=>1230,
-40284=>1231,
-31418=>1232,
-19985=>1233,
-30867=>1234,
-12165=>1235,
-33276=>1235,
-28198=>1236,
-22040=>1237,
-21764=>1238,
-27421=>1239,
-34074=>1240,
-39995=>1241,
-23013=>1242,
-21417=>1243,
-28006=>1244,
-12128=>1245,
-29916=>1245,
-38287=>1246,
-22082=>1247,
-20113=>1248,
-36939=>1249,
-38642=>1250,
-33615=>1251,
-39180=>1252,
-21473=>1253,
-21942=>1254,
-23344=>1255,
-24433=>1256,
-26144=>1257,
-26355=>1258,
-26628=>1259,
-27704=>1260,
-27891=>1261,
-27945=>1262,
-29787=>1263,
-30408=>1264,
-31310=>1265,
-38964=>1266,
-33521=>1267,
-34907=>1268,
-35424=>1269,
-37613=>1270,
-28082=>1271,
-30123=>1272,
-30410=>1273,
-39365=>1274,
-24742=>1275,
-35585=>1276,
-36234=>1277,
-38322=>1278,
-27022=>1279,
-21421=>1280,
-20870=>1281,
-22290=>1282,
-22576=>1283,
-22852=>1284,
-23476=>1285,
-24310=>1286,
-24616=>1287,
-25513=>1288,
-25588=>1289,
-27839=>1290,
-28436=>1291,
-28814=>1292,
-28948=>1293,
-29017=>1294,
-29141=>1295,
-29503=>1296,
-32257=>1297,
-33398=>1298,
-33489=>1299,
-34199=>1300,
-36960=>1301,
-37467=>1302,
-40219=>1303,
-22633=>1304,
-26044=>1305,
-27738=>1306,
-29989=>1307,
-20985=>1308,
-22830=>1309,
-22885=>1310,
-24448=>1311,
-24540=>1312,
-25276=>1313,
-26106=>1314,
-27178=>1315,
-27431=>1316,
-27572=>1317,
-29579=>1318,
-32705=>1319,
-35158=>1320,
-40236=>1321,
-40206=>1322,
-12009=>1323,
-40644=>1323,
-23713=>1324,
-27798=>1325,
-33659=>1326,
-20740=>1327,
-23627=>1328,
-25014=>1329,
-33222=>1330,
-26742=>1331,
-29281=>1332,
-12036=>1333,
-20057=>1333,
-20474=>1334,
-21368=>1335,
-24681=>1336,
-28201=>1337,
-31311=>1338,
-12211=>1339,
-38899=>1339,
-19979=>1340,
-21270=>1341,
-20206=>1342,
-20309=>1343,
-20285=>1344,
-20385=>1345,
-20339=>1346,
-21152=>1347,
-21487=>1348,
-22025=>1349,
-22799=>1350,
-23233=>1351,
-23478=>1352,
-23521=>1353,
-31185=>1354,
-26247=>1355,
-26524=>1356,
-26550=>1357,
-27468=>1358,
-27827=>1359,
-12117=>1360,
-28779=>1360,
-29634=>1361,
-31117=>1362,
-12146=>1363,
-31166=>1363,
-31292=>1364,
-31623=>1365,
-33457=>1366,
-33499=>1367,
-33540=>1368,
-33655=>1369,
-33775=>1370,
-33747=>1371,
-34662=>1372,
-35506=>1373,
-22057=>1374,
-36008=>1375,
-36838=>1376,
-36942=>1377,
-38686=>1378,
-34442=>1379,
-20420=>1380,
-23784=>1381,
-25105=>1382,
-12123=>1383,
-29273=>1383,
-30011=>1384,
-33253=>1385,
-33469=>1386,
-34558=>1387,
-36032=>1388,
-38597=>1389,
-39187=>1390,
-39381=>1391,
-20171=>1392,
-20250=>1393,
-35299=>1394,
-22238=>1395,
-22602=>1396,
-22730=>1397,
-24315=>1398,
-24555=>1399,
-24618=>1400,
-24724=>1401,
-24674=>1402,
-25040=>1403,
-25106=>1404,
-25296=>1405,
-25913=>1406,
-39745=>1407,
-26214=>1408,
-26800=>1409,
-28023=>1410,
-28784=>1411,
-30028=>1412,
-30342=>1413,
-32117=>1414,
-33445=>1415,
-34809=>1416,
-38283=>1417,
-38542=>1418,
-12185=>1419,
-35997=>1419,
-20977=>1420,
-21182=>1421,
-22806=>1422,
-21683=>1423,
-23475=>1424,
-23830=>1425,
-24936=>1426,
-27010=>1427,
-28079=>1428,
-30861=>1429,
-33995=>1430,
-34903=>1431,
-35442=>1432,
-37799=>1433,
-39608=>1434,
-28012=>1435,
-39336=>1436,
-34521=>1437,
-22435=>1438,
-26623=>1439,
-34510=>1440,
-37390=>1441,
-21123=>1442,
-22151=>1443,
-21508=>1444,
-24275=>1445,
-25313=>1446,
-25785=>1447,
-26684=>1448,
-26680=>1449,
-27579=>1450,
-29554=>1451,
-30906=>1452,
-31339=>1453,
-35226=>1454,
-12179=>1455,
-35282=>1455,
-36203=>1456,
-36611=>1457,
-37101=>1458,
-38307=>1459,
-38548=>1460,
-12208=>1461,
-38761=>1461,
-23398=>1462,
-23731=>1463,
-27005=>1464,
-38989=>1465,
-38990=>1466,
-25499=>1467,
-31520=>1468,
-27179=>1469,
-27263=>1470,
-26806=>1471,
-39949=>1472,
-28511=>1473,
-21106=>1474,
-21917=>1475,
-24688=>1476,
-25324=>1477,
-27963=>1478,
-28167=>1479,
-28369=>1480,
-33883=>1481,
-35088=>1482,
-36676=>1483,
-19988=>1484,
-39993=>1485,
-21494=>1486,
-26907=>1487,
-27194=>1488,
-38788=>1489,
-26666=>1490,
-20828=>1491,
-31427=>1492,
-33970=>1493,
-37340=>1494,
-37772=>1495,
-22107=>1496,
-40232=>1497,
-26658=>1498,
-33541=>1499,
-33841=>1500,
-31909=>1501,
-21000=>1502,
-33477=>1503,
-12129=>1504,
-29926=>1504,
-20094=>1505,
-20355=>1506,
-20896=>1507,
-23506=>1508,
-21002=>1509,
-21208=>1510,
-21223=>1511,
-24059=>1512,
-21914=>1513,
-22570=>1514,
-23014=>1515,
-23436=>1516,
-23448=>1517,
-23515=>1518,
-12082=>1519,
-24178=>1519,
-24185=>1520,
-24739=>1521,
-24863=>1522,
-24931=>1523,
-25022=>1524,
-25563=>1525,
-25954=>1526,
-26577=>1527,
-26707=>1528,
-26874=>1529,
-27454=>1530,
-27475=>1531,
-27735=>1532,
-28450=>1533,
-28567=>1534,
-28485=>1535,
-29872=>1536,
-12130=>1537,
-29976=>1537,
-30435=>1538,
-30475=>1539,
-31487=>1540,
-31649=>1541,
-31777=>1542,
-32233=>1543,
-12152=>1544,
-32566=>1544,
-32752=>1545,
-32925=>1546,
-33382=>1547,
-33694=>1548,
-35251=>1549,
-35532=>1550,
-36011=>1551,
-36996=>1552,
-37969=>1553,
-38291=>1554,
-38289=>1555,
-38306=>1556,
-38501=>1557,
-38867=>1558,
-39208=>1559,
-33304=>1560,
-20024=>1561,
-21547=>1562,
-23736=>1563,
-24012=>1564,
-29609=>1565,
-30284=>1566,
-30524=>1567,
-23721=>1568,
-32747=>1569,
-36107=>1570,
-38593=>1571,
-38929=>1572,
-38996=>1573,
-39000=>1574,
-20225=>1575,
-20238=>1576,
-21361=>1577,
-21916=>1578,
-22120=>1579,
-22522=>1580,
-22855=>1581,
-23305=>1582,
-23492=>1583,
-23696=>1584,
-24076=>1585,
-24190=>1586,
-24524=>1587,
-25582=>1588,
-26426=>1589,
-26071=>1590,
-26082=>1591,
-26399=>1592,
-26827=>1593,
-26820=>1594,
-27231=>1595,
-24112=>1596,
-27589=>1597,
-27671=>1598,
-27773=>1599,
-30079=>1600,
-31048=>1601,
-23395=>1602,
-31232=>1603,
-32000=>1604,
-24509=>1605,
-35215=>1606,
-35352=>1607,
-36020=>1608,
-36215=>1609,
-36556=>1610,
-36637=>1611,
-39138=>1612,
-39438=>1613,
-12004=>1614,
-12225=>1614,
-39740=>1614,
-12018=>1615,
-20096=>1615,
-20605=>1616,
-20736=>1617,
-22931=>1618,
-23452=>1619,
-25135=>1620,
-25216=>1621,
-25836=>1622,
-27450=>1623,
-29344=>1624,
-30097=>1625,
-31047=>1626,
-32681=>1627,
-34811=>1628,
-35516=>1629,
-35696=>1630,
-25516=>1631,
-33738=>1632,
-38816=>1633,
-21513=>1634,
-21507=>1635,
-21931=>1636,
-26708=>1637,
-27224=>1638,
-35440=>1639,
-30759=>1640,
-26485=>1641,
-12233=>1642,
-40653=>1642,
-21364=>1643,
-23458=>1644,
-33050=>1645,
-34384=>1646,
-36870=>1647,
-19992=>1648,
-20037=>1649,
-20167=>1650,
-20241=>1651,
-21450=>1652,
-21560=>1653,
-23470=>1654,
-12088=>1655,
-24339=>1655,
-24613=>1656,
-25937=>1657,
-26429=>1658,
-27714=>1659,
-27762=>1660,
-27875=>1661,
-28792=>1662,
-29699=>1663,
-31350=>1664,
-31406=>1665,
-31496=>1666,
-32026=>1667,
-31998=>1668,
-32102=>1669,
-26087=>1670,
-12124=>1671,
-29275=>1671,
-21435=>1672,
-23621=>1673,
-24040=>1674,
-25298=>1675,
-25312=>1676,
-25369=>1677,
-28192=>1678,
-34394=>1679,
-35377=>1680,
-36317=>1681,
-37624=>1682,
-28417=>1683,
-31142=>1684,
-12226=>1685,
-39770=>1685,
-20136=>1686,
-20139=>1687,
-20140=>1688,
-20379=>1689,
-20384=>1690,
-20689=>1691,
-20807=>1692,
-31478=>1693,
-20849=>1694,
-20982=>1695,
-21332=>1696,
-21281=>1697,
-21375=>1698,
-21483=>1699,
-21932=>1700,
-22659=>1701,
-23777=>1702,
-24375=>1703,
-24394=>1704,
-24623=>1705,
-24656=>1706,
-24685=>1707,
-25375=>1708,
-25945=>1709,
-27211=>1710,
-27841=>1711,
-29378=>1712,
-29421=>1713,
-30703=>1714,
-33016=>1715,
-33029=>1716,
-33288=>1717,
-34126=>1718,
-37111=>1719,
-37857=>1720,
-38911=>1721,
-39255=>1722,
-39514=>1723,
-20208=>1724,
-20957=>1725,
-23597=>1726,
-26241=>1727,
-26989=>1728,
-23616=>1729,
-26354=>1730,
-26997=>1731,
-12127=>1732,
-29577=>1732,
-26704=>1733,
-31873=>1734,
-20677=>1735,
-21220=>1736,
-22343=>1737,
-12081=>1738,
-24062=>1738,
-37670=>1739,
-12100=>1740,
-26020=>1740,
-27427=>1741,
-27453=>1742,
-29748=>1743,
-31105=>1744,
-31165=>1745,
-31563=>1746,
-32202=>1747,
-33465=>1748,
-33740=>1749,
-34943=>1750,
-35167=>1751,
-35641=>1752,
-36817=>1753,
-12198=>1754,
-37329=>1754,
-21535=>1755,
-37504=>1756,
-20061=>1757,
-20534=>1758,
-21477=>1759,
-21306=>1760,
-29399=>1761,
-29590=>1762,
-30697=>1763,
-33510=>1764,
-36527=>1765,
-39366=>1766,
-39368=>1767,
-39378=>1768,
-20855=>1769,
-24858=>1770,
-34398=>1771,
-21936=>1772,
-31354=>1773,
-20598=>1774,
-23507=>1775,
-36935=>1776,
-38533=>1777,
-20018=>1778,
-27355=>1779,
-37351=>1780,
-23633=>1781,
-23624=>1782,
-25496=>1783,
-31391=>1784,
-27795=>1785,
-38772=>1786,
-36705=>1787,
-31402=>1788,
-29066=>1789,
-38536=>1790,
-31874=>1791,
-26647=>1792,
-32368=>1793,
-26705=>1794,
-37740=>1795,
-21234=>1796,
-21531=>1797,
-34219=>1798,
-35347=>1799,
-32676=>1800,
-36557=>1801,
-37089=>1802,
-21350=>1803,
-34952=>1804,
-31041=>1805,
-20418=>1806,
-20670=>1807,
-21009=>1808,
-20804=>1809,
-21843=>1810,
-22317=>1811,
-29674=>1812,
-22411=>1813,
-22865=>1814,
-24418=>1815,
-24452=>1816,
-24693=>1817,
-24950=>1818,
-24935=>1819,
-25001=>1820,
-25522=>1821,
-25658=>1822,
-25964=>1823,
-26223=>1824,
-26690=>1825,
-28179=>1826,
-30054=>1827,
-31293=>1828,
-31995=>1829,
-32076=>1830,
-32153=>1831,
-32331=>1832,
-32619=>1833,
-33550=>1834,
-33610=>1835,
-34509=>1836,
-35336=>1837,
-35427=>1838,
-35686=>1839,
-36605=>1840,
-38938=>1841,
-40335=>1842,
-33464=>1843,
-36814=>1844,
-39912=>1845,
-21127=>1846,
-25119=>1847,
-25731=>1848,
-28608=>1849,
-38553=>1850,
-26689=>1851,
-20625=>1852,
-12107=>1853,
-27424=>1853,
-27770=>1854,
-28500=>1855,
-12147=>1856,
-31348=>1856,
-32080=>1857,
-12174=>1858,
-34880=>1858,
-35363=>1859,
-12105=>1860,
-26376=>1860,
-20214=>1861,
-20537=>1862,
-20518=>1863,
-20581=>1864,
-20860=>1865,
-21048=>1866,
-21091=>1867,
-21927=>1868,
-22287=>1869,
-22533=>1870,
-23244=>1871,
-24314=>1872,
-25010=>1873,
-25080=>1874,
-25331=>1875,
-25458=>1876,
-26908=>1877,
-27177=>1878,
-29309=>1879,
-12125=>1880,
-29356=>1880,
-29486=>1881,
-30740=>1882,
-30831=>1883,
-32121=>1884,
-30476=>1885,
-32937=>1886,
-12178=>1887,
-35211=>1887,
-35609=>1888,
-36066=>1889,
-36562=>1890,
-36963=>1891,
-37749=>1892,
-38522=>1893,
-38997=>1894,
-39443=>1895,
-40568=>1896,
-20803=>1897,
-21407=>1898,
-21427=>1899,
-24187=>1900,
-24358=>1901,
-28187=>1902,
-28304=>1903,
-12126=>1904,
-29572=>1904,
-29694=>1905,
-32067=>1906,
-33335=>1907,
-12180=>1908,
-35328=>1908,
-35578=>1909,
-38480=>1910,
-20046=>1911,
-20491=>1912,
-21476=>1913,
-21628=>1914,
-22266=>1915,
-22993=>1916,
-23396=>1917,
-12080=>1918,
-24049=>1918,
-24235=>1919,
-24359=>1920,
-12094=>1921,
-25144=>1921,
-25925=>1922,
-26543=>1923,
-28246=>1924,
-29392=>1925,
-31946=>1926,
-34996=>1927,
-32929=>1928,
-32993=>1929,
-33776=>1930,
-11969=>1931,
-34382=>1931,
-35463=>1932,
-36328=>1933,
-37431=>1934,
-38599=>1935,
-39015=>1936,
-12238=>1937,
-40723=>1937,
-20116=>1938,
-20114=>1939,
-20237=>1940,
-21320=>1941,
-21577=>1942,
-21566=>1943,
-23087=>1944,
-24460=>1945,
-24481=>1946,
-24735=>1947,
-26791=>1948,
-27278=>1949,
-29786=>1950,
-30849=>1951,
-35486=>1952,
-35492=>1953,
-35703=>1954,
-37264=>1955,
-20062=>1956,
-39881=>1957,
-20132=>1958,
-20348=>1959,
-20399=>1960,
-20505=>1961,
-20502=>1962,
-20809=>1963,
-20844=>1964,
-21151=>1965,
-21177=>1966,
-21246=>1967,
-21402=>1968,
-12061=>1969,
-21475=>1969,
-21521=>1970,
-21518=>1971,
-21897=>1972,
-22353=>1973,
-22434=>1974,
-22909=>1975,
-23380=>1976,
-23389=>1977,
-23439=>1978,
-12079=>1979,
-24037=>1979,
-24039=>1980,
-24055=>1981,
-24184=>1982,
-24195=>1983,
-24218=>1984,
-24247=>1985,
-24344=>1986,
-24658=>1987,
-24908=>1988,
-25239=>1989,
-25304=>1990,
-25511=>1991,
-25915=>1992,
-26114=>1993,
-26179=>1994,
-26356=>1995,
-26477=>1996,
-26657=>1997,
-26775=>1998,
-27083=>1999,
-27743=>2000,
-27946=>2001,
-28009=>2002,
-28207=>2003,
-28317=>2004,
-30002=>2005,
-30343=>2006,
-30828=>2007,
-31295=>2008,
-31968=>2009,
-32005=>2010,
-32024=>2011,
-32094=>2012,
-32177=>2013,
-32789=>2014,
-32771=>2015,
-32943=>2016,
-32945=>2017,
-33108=>2018,
-33167=>2019,
-33322=>2020,
-33618=>2021,
-12175=>2022,
-34892=>2022,
-34913=>2023,
-35611=>2024,
-36002=>2025,
-36092=>2026,
-37066=>2027,
-37237=>2028,
-37489=>2029,
-30783=>2030,
-37628=>2031,
-38308=>2032,
-38477=>2033,
-38917=>2034,
-12217=>2035,
-39321=>2035,
-12220=>2036,
-39640=>2036,
-40251=>2037,
-21083=>2038,
-21163=>2039,
-21495=>2040,
-21512=>2041,
-22741=>2042,
-25335=>2043,
-28640=>2044,
-35946=>2045,
-36703=>2046,
-40633=>2047,
-20811=>2048,
-21051=>2049,
-21578=>2050,
-22269=>2051,
-31296=>2052,
-37239=>2053,
-40288=>2054,
-12234=>2055,
-40658=>2055,
-29508=>2056,
-28425=>2057,
-33136=>2058,
-29969=>2059,
-24573=>2060,
-24794=>2061,
-12219=>2062,
-39592=>2062,
-29403=>2063,
-36796=>2064,
-27492=>2065,
-38915=>2066,
-20170=>2067,
-22256=>2068,
-22372=>2069,
-22718=>2070,
-23130=>2071,
-24680=>2072,
-25031=>2073,
-26127=>2074,
-26118=>2075,
-26681=>2076,
-26801=>2077,
-28151=>2078,
-30165=>2079,
-32058=>2080,
-12169=>2081,
-33390=>2081,
-39746=>2082,
-20123=>2083,
-20304=>2084,
-21449=>2085,
-21766=>2086,
-23919=>2087,
-24038=>2088,
-24046=>2089,
-26619=>2090,
-27801=>2091,
-29811=>2092,
-30722=>2093,
-35408=>2094,
-37782=>2095,
-35039=>2096,
-22352=>2097,
-24231=>2098,
-25387=>2099,
-20661=>2100,
-20652=>2101,
-20877=>2102,
-26368=>2103,
-21705=>2104,
-22622=>2105,
-22971=>2106,
-23472=>2107,
-24425=>2108,
-25165=>2109,
-25505=>2110,
-26685=>2111,
-27507=>2112,
-28168=>2113,
-28797=>2114,
-37319=>2115,
-29312=>2116,
-30741=>2117,
-30758=>2118,
-31085=>2119,
-25998=>2120,
-32048=>2121,
-33756=>2122,
-35009=>2123,
-36617=>2124,
-38555=>2125,
-21092=>2126,
-22312=>2127,
-26448=>2128,
-32618=>2129,
-36001=>2130,
-20916=>2131,
-22338=>2132,
-38442=>2133,
-22586=>2134,
-27018=>2135,
-32948=>2136,
-21682=>2137,
-23822=>2138,
-22524=>2139,
-30869=>2140,
-40442=>2141,
-20316=>2142,
-21066=>2143,
-21643=>2144,
-25662=>2145,
-26152=>2146,
-26388=>2147,
-26613=>2148,
-31364=>2149,
-31574=>2150,
-32034=>2151,
-37679=>2152,
-26716=>2153,
-39853=>2154,
-31545=>2155,
-21273=>2156,
-20874=>2157,
-21047=>2158,
-23519=>2159,
-25334=>2160,
-25774=>2161,
-25830=>2162,
-26413=>2163,
-27578=>2164,
-34217=>2165,
-38609=>2166,
-30352=>2167,
-39894=>2168,
-25420=>2169,
-37638=>2170,
-39851=>2171,
-12139=>2172,
-30399=>2172,
-26194=>2173,
-19977=>2174,
-20632=>2175,
-21442=>2176,
-12077=>2177,
-23665=>2177,
-24808=>2178,
-25746=>2179,
-25955=>2180,
-26719=>2181,
-29158=>2182,
-29642=>2183,
-29987=>2184,
-31639=>2185,
-32386=>2186,
-34453=>2187,
-35715=>2188,
-36059=>2189,
-37240=>2190,
-39184=>2191,
-26028=>2192,
-26283=>2193,
-27531=>2194,
-20181=>2195,
-20180=>2196,
-20282=>2197,
-20351=>2198,
-21050=>2199,
-21496=>2200,
-21490=>2201,
-21987=>2202,
-22235=>2203,
-12064=>2204,
-22763=>2204,
-22987=>2205,
-22985=>2206,
-23039=>2207,
-12070=>2208,
-23376=>2208,
-23629=>2209,
-24066=>2210,
-24107=>2211,
-24535=>2212,
-24605=>2213,
-25351=>2214,
-12096=>2215,
-25903=>2215,
-23388=>2216,
-26031=>2217,
-26045=>2218,
-26088=>2219,
-26525=>2220,
-12108=>2221,
-27490=>2221,
-27515=>2222,
-12114=>2223,
-27663=>2223,
-29509=>2224,
-31049=>2225,
-31169=>2226,
-12151=>2227,
-31992=>2227,
-32025=>2228,
-32043=>2229,
-32930=>2230,
-33026=>2231,
-12164=>2232,
-33267=>2232,
-35222=>2233,
-35422=>2234,
-35433=>2235,
-35430=>2236,
-35468=>2237,
-35566=>2238,
-36039=>2239,
-36060=>2240,
-38604=>2241,
-39164=>2242,
-12013=>2243,
-27503=>2243,
-20107=>2244,
-20284=>2245,
-20365=>2246,
-20816=>2247,
-23383=>2248,
-23546=>2249,
-24904=>2250,
-25345=>2251,
-26178=>2252,
-27425=>2253,
-28363=>2254,
-27835=>2255,
-29246=>2256,
-29885=>2257,
-30164=>2258,
-30913=>2259,
-12144=>2260,
-31034=>2260,
-12157=>2261,
-32780=>2261,
-12159=>2262,
-32819=>2262,
-12163=>2263,
-33258=>2263,
-33940=>2264,
-36766=>2265,
-27728=>2266,
-12229=>2267,
-40575=>2267,
-24335=>2268,
-35672=>2269,
-40235=>2270,
-31482=>2271,
-36600=>2272,
-23437=>2273,
-38635=>2274,
-19971=>2275,
-21489=>2276,
-22519=>2277,
-22833=>2278,
-23241=>2279,
-23460=>2280,
-24713=>2281,
-28287=>2282,
-28422=>2283,
-30142=>2284,
-36074=>2285,
-23455=>2286,
-34048=>2287,
-31712=>2288,
-20594=>2289,
-26612=>2290,
-33437=>2291,
-23649=>2292,
-34122=>2293,
-32286=>2294,
-33294=>2295,
-20889=>2296,
-23556=>2297,
-25448=>2298,
-36198=>2299,
-26012=>2300,
-29038=>2301,
-31038=>2302,
-32023=>2303,
-32773=>2304,
-35613=>2305,
-12190=>2306,
-36554=>2306,
-36974=>2307,
-34503=>2308,
-37034=>2309,
-20511=>2310,
-21242=>2311,
-23610=>2312,
-26451=>2313,
-28796=>2314,
-29237=>2315,
-37196=>2316,
-37320=>2317,
-37675=>2318,
-33509=>2319,
-23490=>2320,
-24369=>2321,
-24825=>2322,
-20027=>2323,
-21462=>2324,
-23432=>2325,
-12095=>2326,
-25163=>2326,
-26417=>2327,
-27530=>2328,
-29417=>2329,
-29664=>2330,
-31278=>2331,
-33131=>2332,
-36259=>2333,
-37202=>2334,
-12216=>2335,
-39318=>2335,
-20754=>2336,
-21463=>2337,
-21610=>2338,
-23551=>2339,
-25480=>2340,
-27193=>2341,
-32172=>2342,
-38656=>2343,
-22234=>2344,
-21454=>2345,
-21608=>2346,
-23447=>2347,
-23601=>2348,
-24030=>2349,
-20462=>2350,
-24833=>2351,
-25342=>2352,
-27954=>2353,
-31168=>2354,
-31179=>2355,
-32066=>2356,
-32333=>2357,
-32722=>2358,
-33261=>2359,
-12168=>2360,
-33311=>2360,
-33936=>2361,
-34886=>2362,
-35186=>2363,
-35728=>2364,
-36468=>2365,
-36655=>2366,
-36913=>2367,
-37195=>2368,
-37228=>2369,
-38598=>2370,
-37276=>2371,
-20160=>2372,
-20303=>2373,
-20805=>2374,
-12055=>2375,
-21313=>2375,
-24467=>2376,
-25102=>2377,
-26580=>2378,
-27713=>2379,
-28171=>2380,
-29539=>2381,
-32294=>2382,
-37325=>2383,
-37507=>2384,
-21460=>2385,
-22809=>2386,
-23487=>2387,
-28113=>2388,
-31069=>2389,
-32302=>2390,
-31899=>2391,
-22654=>2392,
-29087=>2393,
-20986=>2394,
-34899=>2395,
-36848=>2396,
-20426=>2397,
-23803=>2398,
-26149=>2399,
-30636=>2400,
-31459=>2401,
-33308=>2402,
-39423=>2403,
-20934=>2404,
-24490=>2405,
-26092=>2406,
-26991=>2407,
-27529=>2408,
-28147=>2409,
-28310=>2410,
-28516=>2411,
-30462=>2412,
-32020=>2413,
-24033=>2414,
-36981=>2415,
-37255=>2416,
-38918=>2417,
-20966=>2418,
-21021=>2419,
-25152=>2420,
-26257=>2421,
-26329=>2422,
-28186=>2423,
-24246=>2424,
-32210=>2425,
-32626=>2426,
-26360=>2427,
-34223=>2428,
-34295=>2429,
-35576=>2430,
-21161=>2431,
-21465=>2432,
-12069=>2433,
-22899=>2433,
-24207=>2434,
-24464=>2435,
-24661=>2436,
-37604=>2437,
-38500=>2438,
-20663=>2439,
-20767=>2440,
-21213=>2441,
-21280=>2442,
-21319=>2443,
-21484=>2444,
-21736=>2445,
-21830=>2446,
-21809=>2447,
-22039=>2448,
-22888=>2449,
-22974=>2450,
-23100=>2451,
-23477=>2452,
-23558=>2453,
-12073=>2454,
-23567=>2454,
-23569=>2455,
-23578=>2456,
-24196=>2457,
-24202=>2458,
-24288=>2459,
-24432=>2460,
-25215=>2461,
-25220=>2462,
-25307=>2463,
-25484=>2464,
-25463=>2465,
-26119=>2466,
-26124=>2467,
-26157=>2468,
-26230=>2469,
-26494=>2470,
-26786=>2471,
-27167=>2472,
-27189=>2473,
-27836=>2474,
-28040=>2475,
-28169=>2476,
-28248=>2477,
-28988=>2478,
-28966=>2479,
-29031=>2480,
-30151=>2481,
-30465=>2482,
-30813=>2483,
-30977=>2484,
-31077=>2485,
-31216=>2486,
-31456=>2487,
-31505=>2488,
-31911=>2489,
-32057=>2490,
-32918=>2491,
-33750=>2492,
-33931=>2493,
-34121=>2494,
-34909=>2495,
-35059=>2496,
-35359=>2497,
-35388=>2498,
-35412=>2499,
-35443=>2500,
-35937=>2501,
-36062=>2502,
-37284=>2503,
-37478=>2504,
-37758=>2505,
-37912=>2506,
-38556=>2507,
-38808=>2508,
-19978=>2509,
-19976=>2510,
-19998=>2511,
-20055=>2512,
-20887=>2513,
-21104=>2514,
-22478=>2515,
-22580=>2516,
-22732=>2517,
-23330=>2518,
-24120=>2519,
-24773=>2520,
-25854=>2521,
-26465=>2522,
-26454=>2523,
-27972=>2524,
-29366=>2525,
-30067=>2526,
-31331=>2527,
-33976=>2528,
-35698=>2529,
-37304=>2530,
-37664=>2531,
-22065=>2532,
-22516=>2533,
-39166=>2534,
-25325=>2535,
-26893=>2536,
-27542=>2537,
-29165=>2538,
-32340=>2539,
-32887=>2540,
-12170=>2541,
-33394=>2541,
-35302=>2542,
-12215=>2543,
-39135=>2543,
-34645=>2544,
-36785=>2545,
-23611=>2546,
-20280=>2547,
-20449=>2548,
-20405=>2549,
-21767=>2550,
-23072=>2551,
-23517=>2552,
-23529=>2553,
-12092=>2554,
-24515=>2554,
-24910=>2555,
-25391=>2556,
-26032=>2557,
-26187=>2558,
-26862=>2559,
-27035=>2560,
-28024=>2561,
-28145=>2562,
-30003=>2563,
-30137=>2564,
-30495=>2565,
-31070=>2566,
-31206=>2567,
-32051=>2568,
-12162=>2569,
-33251=>2569,
-33455=>2570,
-34218=>2571,
-35242=>2572,
-35386=>2573,
-12189=>2574,
-36523=>2574,
-12191=>2575,
-36763=>2575,
-36914=>2576,
-37341=>2577,
-38663=>2578,
-12040=>2579,
-20154=>2579,
-20161=>2580,
-20995=>2581,
-22645=>2582,
-22764=>2583,
-23563=>2584,
-29978=>2585,
-23613=>2586,
-33102=>2587,
-35338=>2588,
-36805=>2589,
-38499=>2590,
-38765=>2591,
-31525=>2592,
-35535=>2593,
-38920=>2594,
-37218=>2595,
-22259=>2596,
-21416=>2597,
-36887=>2598,
-21561=>2599,
-22402=>2600,
-24101=>2601,
-25512=>2602,
-12116=>2603,
-27700=>2603,
-28810=>2604,
-30561=>2605,
-31883=>2606,
-32736=>2607,
-34928=>2608,
-36930=>2609,
-37204=>2610,
-37648=>2611,
-37656=>2612,
-38543=>2613,
-29790=>2614,
-39620=>2615,
-23815=>2616,
-23913=>2617,
-25968=>2618,
-26530=>2619,
-36264=>2620,
-38619=>2621,
-25454=>2622,
-26441=>2623,
-26905=>2624,
-33733=>2625,
-38935=>2626,
-38592=>2627,
-35070=>2628,
-28548=>2629,
-25722=>2630,
-12072=>2631,
-23544=>2631,
-19990=>2632,
-28716=>2633,
-30045=>2634,
-26159=>2635,
-20932=>2636,
-21046=>2637,
-21218=>2638,
-22995=>2639,
-24449=>2640,
-24615=>2641,
-25104=>2642,
-25919=>2643,
-25972=>2644,
-26143=>2645,
-26228=>2646,
-26866=>2647,
-26646=>2648,
-27491=>2649,
-28165=>2650,
-29298=>2651,
-12131=>2652,
-29983=>2652,
-30427=>2653,
-31934=>2654,
-32854=>2655,
-22768=>2656,
-35069=>2657,
-11972=>2658,
-35199=>2658,
-35488=>2659,
-35475=>2660,
-35531=>2661,
-36893=>2662,
-37266=>2663,
-11992=>2664,
-38738=>2664,
-38745=>2665,
-12011=>2666,
-25993=>2666,
-31246=>2667,
-33030=>2668,
-38587=>2669,
-24109=>2670,
-24796=>2671,
-25114=>2672,
-26021=>2673,
-26132=>2674,
-26512=>2675,
-12143=>2676,
-30707=>2676,
-31309=>2677,
-31821=>2678,
-32318=>2679,
-33034=>2680,
-36012=>2681,
-12186=>2682,
-36196=>2682,
-36321=>2683,
-36447=>2684,
-30889=>2685,
-20999=>2686,
-25305=>2687,
-25509=>2688,
-25666=>2689,
-25240=>2690,
-35373=>2691,
-31363=>2692,
-31680=>2693,
-35500=>2694,
-38634=>2695,
-32118=>2696,
-12166=>2697,
-33292=>2697,
-34633=>2698,
-20185=>2699,
-20808=>2700,
-21315=>2701,
-21344=>2702,
-23459=>2703,
-23554=>2704,
-23574=>2705,
-24029=>2706,
-25126=>2707,
-25159=>2708,
-25776=>2709,
-26643=>2710,
-26676=>2711,
-27849=>2712,
-27973=>2713,
-27927=>2714,
-26579=>2715,
-28508=>2716,
-29006=>2717,
-29053=>2718,
-26059=>2719,
-31359=>2720,
-31661=>2721,
-32218=>2722,
-32330=>2723,
-32680=>2724,
-33146=>2725,
-12167=>2726,
-33307=>2726,
-33337=>2727,
-34214=>2728,
-35438=>2729,
-36046=>2730,
-36341=>2731,
-36984=>2732,
-36983=>2733,
-37549=>2734,
-37521=>2735,
-38275=>2736,
-39854=>2737,
-21069=>2738,
-21892=>2739,
-28472=>2740,
-28982=>2741,
-20840=>2742,
-31109=>2743,
-32341=>2744,
-33203=>2745,
-31950=>2746,
-22092=>2747,
-22609=>2748,
-23720=>2749,
-25514=>2750,
-26366=>2751,
-26365=>2752,
-26970=>2753,
-29401=>2754,
-30095=>2755,
-30094=>2756,
-30990=>2757,
-31062=>2758,
-31199=>2759,
-31895=>2760,
-32032=>2761,
-32068=>2762,
-34311=>2763,
-35380=>2764,
-38459=>2765,
-36961=>2766,
-12239=>2767,
-40736=>2767,
-20711=>2768,
-21109=>2769,
-21452=>2770,
-21474=>2771,
-20489=>2772,
-21930=>2773,
-22766=>2774,
-22863=>2775,
-29245=>2776,
-23435=>2777,
-23652=>2778,
-21277=>2779,
-24803=>2780,
-24819=>2781,
-25436=>2782,
-25475=>2783,
-25407=>2784,
-25531=>2785,
-25805=>2786,
-26089=>2787,
-26361=>2788,
-24035=>2789,
-27085=>2790,
-27133=>2791,
-28437=>2792,
-29157=>2793,
-20105=>2794,
-30185=>2795,
-30456=>2796,
-31379=>2797,
-31967=>2798,
-32207=>2799,
-32156=>2800,
-32865=>2801,
-33609=>2802,
-33624=>2803,
-33900=>2804,
-33980=>2805,
-34299=>2806,
-35013=>2807,
-12187=>2808,
-36208=>2808,
-36865=>2809,
-36973=>2810,
-37783=>2811,
-38684=>2812,
-39442=>2813,
-20687=>2814,
-22679=>2815,
-24974=>2816,
-33235=>2817,
-34101=>2818,
-36104=>2819,
-36896=>2820,
-20419=>2821,
-20596=>2822,
-21063=>2823,
-21363=>2824,
-24687=>2825,
-25417=>2826,
-26463=>2827,
-28204=>2828,
-12188=>2829,
-36275=>2829,
-36895=>2830,
-20439=>2831,
-23646=>2832,
-36042=>2833,
-26063=>2834,
-32154=>2835,
-21330=>2836,
-34966=>2837,
-20854=>2838,
-25539=>2839,
-23384=>2840,
-23403=>2841,
-23562=>2842,
-25613=>2843,
-26449=>2844,
-36956=>2845,
-20182=>2846,
-22810=>2847,
-22826=>2848,
-27760=>2849,
-35409=>2850,
-21822=>2851,
-22549=>2852,
-22949=>2853,
-24816=>2854,
-25171=>2855,
-26561=>2856,
-33333=>2857,
-26965=>2858,
-38464=>2859,
-39364=>2860,
-39464=>2861,
-20307=>2862,
-22534=>2863,
-23550=>2864,
-32784=>2865,
-23729=>2866,
-24111=>2867,
-24453=>2868,
-24608=>2869,
-24907=>2870,
-25140=>2871,
-26367=>2872,
-27888=>2873,
-28382=>2874,
-32974=>2875,
-33151=>2876,
-33492=>2877,
-34955=>2878,
-36024=>2879,
-36864=>2880,
-36910=>2881,
-38538=>2882,
-40667=>2883,
-39899=>2884,
-20195=>2885,
-21488=>2886,
-12068=>2887,
-22823=>2887,
-31532=>2888,
-37261=>2889,
-38988=>2890,
-40441=>2891,
-28381=>2892,
-28711=>2893,
-21331=>2894,
-21828=>2895,
-23429=>2896,
-25176=>2897,
-25246=>2898,
-25299=>2899,
-27810=>2900,
-28655=>2901,
-29730=>2902,
-35351=>2903,
-37944=>2904,
-28609=>2905,
-35582=>2906,
-33592=>2907,
-20967=>2908,
-34552=>2909,
-21482=>2910,
-21481=>2911,
-20294=>2912,
-36948=>2913,
-12192=>2914,
-36784=>2914,
-22890=>2915,
-33073=>2916,
-24061=>2917,
-31466=>2918,
-36799=>2919,
-26842=>2920,
-12181=>2921,
-35895=>2921,
-29432=>2922,
-40008=>2923,
-27197=>2924,
-35504=>2925,
-20025=>2926,
-21336=>2927,
-22022=>2928,
-22374=>2929,
-25285=>2930,
-25506=>2931,
-26086=>2932,
-27470=>2933,
-28129=>2934,
-28251=>2935,
-28845=>2936,
-30701=>2937,
-31471=>2938,
-31658=>2939,
-32187=>2940,
-32829=>2941,
-32966=>2942,
-34507=>2943,
-35477=>2944,
-37723=>2945,
-22243=>2946,
-22727=>2947,
-24382=>2948,
-26029=>2949,
-26262=>2950,
-27264=>2951,
-27573=>2952,
-30007=>2953,
-35527=>2954,
-20516=>2955,
-30693=>2956,
-22320=>2957,
-24347=>2958,
-24677=>2959,
-26234=>2960,
-27744=>2961,
-30196=>2962,
-31258=>2963,
-32622=>2964,
-33268=>2965,
-34584=>2966,
-36933=>2967,
-39347=>2968,
-31689=>2969,
-30044=>2970,
-12149=>2971,
-31481=>2971,
-31569=>2972,
-33988=>2973,
-36880=>2974,
-31209=>2975,
-31378=>2976,
-33590=>2977,
-23265=>2978,
-30528=>2979,
-20013=>2980,
-20210=>2981,
-23449=>2982,
-24544=>2983,
-25277=>2984,
-26172=>2985,
-26609=>2986,
-27880=>2987,
-12173=>2988,
-34411=>2988,
-34935=>2989,
-35387=>2990,
-37198=>2991,
-37619=>2992,
-39376=>2993,
-27159=>2994,
-28710=>2995,
-29482=>2996,
-33511=>2997,
-33879=>2998,
-36015=>2999,
-19969=>3000,
-20806=>3001,
-20939=>3002,
-21899=>3003,
-23541=>3004,
-24086=>3005,
-24115=>3006,
-24193=>3007,
-24340=>3008,
-24373=>3009,
-24427=>3010,
-24500=>3011,
-25074=>3012,
-25361=>3013,
-26274=>3014,
-26397=>3015,
-28526=>3016,
-29266=>3017,
-30010=>3018,
-30522=>3019,
-32884=>3020,
-33081=>3021,
-33144=>3022,
-34678=>3023,
-35519=>3024,
-35548=>3025,
-36229=>3026,
-36339=>3027,
-37530=>3028,
-11985=>3029,
-12199=>3029,
-38263=>3029,
-38914=>3030,
-12227=>3031,
-40165=>3031,
-21189=>3032,
-25431=>3033,
-30452=>3034,
-26389=>3035,
-27784=>3036,
-29645=>3037,
-36035=>3038,
-37806=>3039,
-38515=>3040,
-27941=>3041,
-22684=>3042,
-26894=>3043,
-27084=>3044,
-36861=>3045,
-37786=>3046,
-30171=>3047,
-36890=>3048,
-22618=>3049,
-26626=>3050,
-25524=>3051,
-27131=>3052,
-20291=>3053,
-28460=>3054,
-26584=>3055,
-36795=>3056,
-34086=>3057,
-32180=>3058,
-37716=>3059,
-26943=>3060,
-28528=>3061,
-22378=>3062,
-22775=>3063,
-23340=>3064,
-32044=>3065,
-12118=>3066,
-29226=>3066,
-21514=>3067,
-37347=>3068,
-40372=>3069,
-20141=>3070,
-20302=>3071,
-20572=>3072,
-20597=>3073,
-21059=>3074,
-35998=>3075,
-21576=>3076,
-22564=>3077,
-23450=>3078,
-24093=>3079,
-24213=>3080,
-24237=>3081,
-24311=>3082,
-24351=>3083,
-24716=>3084,
-25269=>3085,
-25402=>3086,
-25552=>3087,
-26799=>3088,
-27712=>3089,
-30855=>3090,
-31118=>3091,
-31243=>3092,
-32224=>3093,
-33351=>3094,
-35330=>3095,
-35558=>3096,
-36420=>3097,
-36883=>3098,
-37048=>3099,
-37165=>3100,
-37336=>3101,
-12237=>3102,
-40718=>3102,
-27877=>3103,
-25688=>3104,
-25826=>3105,
-25973=>3106,
-28404=>3107,
-30340=>3108,
-31515=>3109,
-36969=>3110,
-37841=>3111,
-28346=>3112,
-21746=>3113,
-24505=>3114,
-25764=>3115,
-36685=>3116,
-36845=>3117,
-37444=>3118,
-20856=>3119,
-22635=>3120,
-22825=>3121,
-23637=>3122,
-24215=>3123,
-28155=>3124,
-32399=>3125,
-29980=>3126,
-36028=>3127,
-36578=>3128,
-39003=>3129,
-28857=>3130,
-20253=>3131,
-27583=>3132,
-28593=>3133,
-12133=>3134,
-30000=>3134,
-38651=>3135,
-20814=>3136,
-21520=>3137,
-22581=>3138,
-22615=>3139,
-22956=>3140,
-23648=>3141,
-24466=>3142,
-12099=>3143,
-26007=>3143,
-26460=>3144,
-28193=>3145,
-30331=>3146,
-33759=>3147,
-36077=>3148,
-36884=>3149,
-37117=>3150,
-37709=>3151,
-30757=>3152,
-30778=>3153,
-21162=>3154,
-24230=>3155,
-12063=>3156,
-22303=>3156,
-22900=>3157,
-24594=>3158,
-20498=>3159,
-20826=>3160,
-20908=>3161,
-20941=>3162,
-12049=>3163,
-20992=>3163,
-21776=>3164,
-22612=>3165,
-22616=>3166,
-22871=>3167,
-23445=>3168,
-23798=>3169,
-23947=>3170,
-24764=>3171,
-25237=>3172,
-25645=>3173,
-26481=>3174,
-26691=>3175,
-26812=>3176,
-26847=>3177,
-30423=>3178,
-28120=>3179,
-28271=>3180,
-28059=>3181,
-28783=>3182,
-29128=>3183,
-24403=>3184,
-30168=>3185,
-31095=>3186,
-31561=>3187,
-31572=>3188,
-31570=>3189,
-31958=>3190,
-32113=>3191,
-21040=>3192,
-33891=>3193,
-34153=>3194,
-34276=>3195,
-35342=>3196,
-35588=>3197,
-12182=>3198,
-35910=>3198,
-36367=>3199,
-36867=>3200,
-36879=>3201,
-37913=>3202,
-38518=>3203,
-38957=>3204,
-39472=>3205,
-38360=>3206,
-20685=>3207,
-21205=>3208,
-21516=>3209,
-22530=>3210,
-23566=>3211,
-24999=>3212,
-25758=>3213,
-27934=>3214,
-30643=>3215,
-31461=>3216,
-33012=>3217,
-33796=>3218,
-36947=>3219,
-37509=>3220,
-23776=>3221,
-40199=>3222,
-21311=>3223,
-24471=>3224,
-24499=>3225,
-28060=>3226,
-29305=>3227,
-30563=>3228,
-31167=>3229,
-31716=>3230,
-27602=>3231,
-29420=>3232,
-35501=>3233,
-26627=>3234,
-27233=>3235,
-20984=>3236,
-31361=>3237,
-26932=>3238,
-23626=>3239,
-40182=>3240,
-33515=>3241,
-23493=>3242,
-12195=>3243,
-37193=>3243,
-28702=>3244,
-22136=>3245,
-23663=>3246,
-24775=>3247,
-25958=>3248,
-27788=>3249,
-35930=>3250,
-36929=>3251,
-38931=>3252,
-21585=>3253,
-26311=>3254,
-37389=>3255,
-22856=>3256,
-37027=>3257,
-20869=>3258,
-20045=>3259,
-20970=>3260,
-34201=>3261,
-35598=>3262,
-28760=>3263,
-25466=>3264,
-37707=>3265,
-26978=>3266,
-39348=>3267,
-32260=>3268,
-30071=>3269,
-21335=>3270,
-26976=>3271,
-36575=>3272,
-38627=>3273,
-27741=>3274,
-12038=>3275,
-20108=>3275,
-23612=>3276,
-24336=>3277,
-36841=>3278,
-21250=>3279,
-36049=>3280,
-12161=>3281,
-32905=>3281,
-34425=>3282,
-24319=>3283,
-12103=>3284,
-26085=>3284,
-20083=>3285,
-12042=>3286,
-20837=>3286,
-22914=>3287,
-23615=>3288,
-38894=>3289,
-20219=>3290,
-22922=>3291,
-24525=>3292,
-35469=>3293,
-28641=>3294,
-31152=>3295,
-31074=>3296,
-23527=>3297,
-33905=>3298,
-29483=>3299,
-29105=>3300,
-24180=>3301,
-24565=>3302,
-25467=>3303,
-25754=>3304,
-29123=>3305,
-31896=>3306,
-20035=>3307,
-24316=>3308,
-20043=>3309,
-22492=>3310,
-22178=>3311,
-24745=>3312,
-28611=>3313,
-32013=>3314,
-33021=>3315,
-33075=>3316,
-33215=>3317,
-36786=>3318,
-35223=>3319,
-34468=>3320,
-24052=>3321,
-25226=>3322,
-25773=>3323,
-35207=>3324,
-26487=>3325,
-27874=>3326,
-27966=>3327,
-29750=>3328,
-30772=>3329,
-23110=>3330,
-32629=>3331,
-33453=>3332,
-12218=>3333,
-39340=>3333,
-20467=>3334,
-24259=>3335,
-25309=>3336,
-25490=>3337,
-25943=>3338,
-26479=>3339,
-30403=>3340,
-29260=>3341,
-32972=>3342,
-32954=>3343,
-36649=>3344,
-37197=>3345,
-20493=>3346,
-22521=>3347,
-23186=>3348,
-26757=>3349,
-26995=>3350,
-29028=>3351,
-29437=>3352,
-36023=>3353,
-22770=>3354,
-36064=>3355,
-38506=>3356,
-36889=>3357,
-34687=>3358,
-31204=>3359,
-30695=>3360,
-33833=>3361,
-20271=>3362,
-21093=>3363,
-21338=>3364,
-25293=>3365,
-26575=>3366,
-27850=>3367,
-12137=>3368,
-30333=>3368,
-31636=>3369,
-31893=>3370,
-33334=>3371,
-34180=>3372,
-36843=>3373,
-26333=>3374,
-28448=>3375,
-29190=>3376,
-32283=>3377,
-33707=>3378,
-39361=>3379,
-12008=>3380,
-40614=>3380,
-20989=>3381,
-31665=>3382,
-30834=>3383,
-31672=>3384,
-32903=>3385,
-31560=>3386,
-27368=>3387,
-24161=>3388,
-32908=>3389,
-30033=>3390,
-30048=>3391,
-12043=>3392,
-20843=>3392,
-37474=>3393,
-28300=>3394,
-30330=>3395,
-37271=>3396,
-39658=>3397,
-20240=>3398,
-32624=>3399,
-25244=>3400,
-31567=>3401,
-38309=>3402,
-40169=>3403,
-22138=>3404,
-22617=>3405,
-34532=>3406,
-38588=>3407,
-20276=>3408,
-21028=>3409,
-21322=>3410,
-21453=>3411,
-21467=>3412,
-24070=>3413,
-25644=>3414,
-26001=>3415,
-26495=>3416,
-27710=>3417,
-27726=>3418,
-29256=>3419,
-29359=>3420,
-29677=>3421,
-30036=>3422,
-32321=>3423,
-33324=>3424,
-34281=>3425,
-36009=>3426,
-31684=>3427,
-12196=>3428,
-37318=>3428,
-29033=>3429,
-38930=>3430,
-39151=>3431,
-25405=>3432,
-26217=>3433,
-30058=>3434,
-30436=>3435,
-30928=>3436,
-34115=>3437,
-34542=>3438,
-21290=>3439,
-21329=>3440,
-21542=>3441,
-22915=>3442,
-24199=>3443,
-24444=>3444,
-24754=>3445,
-25161=>3446,
-25209=>3447,
-25259=>3448,
-26000=>3449,
-12112=>3450,
-27604=>3450,
-27852=>3451,
-30130=>3452,
-12138=>3453,
-30382=>3453,
-30865=>3454,
-31192=>3455,
-32203=>3456,
-32631=>3457,
-32933=>3458,
-34987=>3459,
-35513=>3460,
-36027=>3461,
-36991=>3462,
-12206=>3463,
-38750=>3463,
-12214=>3464,
-39131=>3464,
-27147=>3465,
-31800=>3466,
-20633=>3467,
-23614=>3468,
-24494=>3469,
-26503=>3470,
-27608=>3471,
-29749=>3472,
-30473=>3473,
-32654=>3474,
-12240=>3475,
-40763=>3475,
-26570=>3476,
-31255=>3477,
-21305=>3478,
-12134=>3479,
-30091=>3479,
-39661=>3480,
-24422=>3481,
-33181=>3482,
-33777=>3483,
-32920=>3484,
-24380=>3485,
-24517=>3486,
-30050=>3487,
-31558=>3488,
-36924=>3489,
-26727=>3490,
-23019=>3491,
-23195=>3492,
-32016=>3493,
-30334=>3494,
-35628=>3495,
-20469=>3496,
-24426=>3497,
-27161=>3498,
-27703=>3499,
-28418=>3500,
-29922=>3501,
-31080=>3502,
-34920=>3503,
-35413=>3504,
-35961=>3505,
-24287=>3506,
-25551=>3507,
-30149=>3508,
-31186=>3509,
-33495=>3510,
-37672=>3511,
-37618=>3512,
-33948=>3513,
-34541=>3514,
-39981=>3515,
-21697=>3516,
-24428=>3517,
-25996=>3518,
-27996=>3519,
-28693=>3520,
-36007=>3521,
-36051=>3522,
-38971=>3523,
-25935=>3524,
-29942=>3525,
-19981=>3526,
-20184=>3527,
-22496=>3528,
-22827=>3529,
-23142=>3530,
-23500=>3531,
-20904=>3532,
-24067=>3533,
-24220=>3534,
-24598=>3535,
-25206=>3536,
-25975=>3537,
-26023=>3538,
-26222=>3539,
-28014=>3540,
-12119=>3541,
-29238=>3541,
-31526=>3542,
-33104=>3543,
-33178=>3544,
-33433=>3545,
-35676=>3546,
-36000=>3547,
-36070=>3548,
-36212=>3549,
-12201=>3550,
-38428=>3550,
-38468=>3551,
-20398=>3552,
-25771=>3553,
-27494=>3554,
-33310=>3555,
-33889=>3556,
-34154=>3557,
-37096=>3558,
-23553=>3559,
-26963=>3560,
-12213=>3561,
-39080=>3561,
-33914=>3562,
-34135=>3563,
-20239=>3564,
-21103=>3565,
-24489=>3566,
-24133=>3567,
-26381=>3568,
-31119=>3569,
-33145=>3570,
-35079=>3571,
-35206=>3572,
-28149=>3573,
-24343=>3574,
-25173=>3575,
-27832=>3576,
-20175=>3577,
-29289=>3578,
-39826=>3579,
-20998=>3580,
-21563=>3581,
-22132=>3582,
-22707=>3583,
-24996=>3584,
-25198=>3585,
-28954=>3586,
-22894=>3587,
-31881=>3588,
-31966=>3589,
-32027=>3590,
-38640=>3591,
-12098=>3592,
-25991=>3592,
-32862=>3593,
-19993=>3594,
-20341=>3595,
-20853=>3596,
-22592=>3597,
-24163=>3598,
-24179=>3599,
-24330=>3600,
-26564=>3601,
-20006=>3602,
-34109=>3603,
-38281=>3604,
-38491=>3605,
-12150=>3606,
-31859=>3606,
-12212=>3607,
-38913=>3607,
-20731=>3608,
-22721=>3609,
-30294=>3610,
-30887=>3611,
-21029=>3612,
-30629=>3613,
-34065=>3614,
-31622=>3615,
-20559=>3616,
-22793=>3617,
-12122=>3618,
-29255=>3618,
-31687=>3619,
-32232=>3620,
-36794=>3621,
-36820=>3622,
-36941=>3623,
-20415=>3624,
-21193=>3625,
-23081=>3626,
-24321=>3627,
-38829=>3628,
-20445=>3629,
-33303=>3630,
-37610=>3631,
-22275=>3632,
-25429=>3633,
-27497=>3634,
-29995=>3635,
-35036=>3636,
-36628=>3637,
-31298=>3638,
-21215=>3639,
-22675=>3640,
-24917=>3641,
-25098=>3642,
-26286=>3643,
-11935=>3644,
-27597=>3644,
-31807=>3645,
-33769=>3646,
-20515=>3647,
-20472=>3648,
-21253=>3649,
-21574=>3650,
-22577=>3651,
-22857=>3652,
-23453=>3653,
-23792=>3654,
-23791=>3655,
-23849=>3656,
-24214=>3657,
-25265=>3658,
-25447=>3659,
-25918=>3660,
-12101=>3661,
-26041=>3661,
-26379=>3662,
-27861=>3663,
-27873=>3664,
-28921=>3665,
-30770=>3666,
-32299=>3667,
-32990=>3668,
-33459=>3669,
-33804=>3670,
-34028=>3671,
-34562=>3672,
-35090=>3673,
-35370=>3674,
-35914=>3675,
-37030=>3676,
-37586=>3677,
-39165=>3678,
-40179=>3679,
-40300=>3680,
-20047=>3681,
-20129=>3682,
-20621=>3683,
-21078=>3684,
-22346=>3685,
-22952=>3686,
-24125=>3687,
-24536=>3688,
-24537=>3689,
-25151=>3690,
-26292=>3691,
-26395=>3692,
-26576=>3693,
-26834=>3694,
-20882=>3695,
-32033=>3696,
-32938=>3697,
-33192=>3698,
-35584=>3699,
-35980=>3700,
-36031=>3701,
-37502=>3702,
-38450=>3703,
-21536=>3704,
-38956=>3705,
-21271=>3706,
-20693=>3707,
-12056=>3708,
-21340=>3708,
-22696=>3709,
-25778=>3710,
-26420=>3711,
-29287=>3712,
-30566=>3713,
-31302=>3714,
-37350=>3715,
-21187=>3716,
-27809=>3717,
-27526=>3718,
-22528=>3719,
-24140=>3720,
-22868=>3721,
-26412=>3722,
-32763=>3723,
-20961=>3724,
-30406=>3725,
-25705=>3726,
-30952=>3727,
-39764=>3728,
-12231=>3729,
-40635=>3729,
-22475=>3730,
-22969=>3731,
-26151=>3732,
-26522=>3733,
-27598=>3734,
-21737=>3735,
-27097=>3736,
-24149=>3737,
-33180=>3738,
-26517=>3739,
-39850=>3740,
-26622=>3741,
-40018=>3742,
-26717=>3743,
-20134=>3744,
-20451=>3745,
-12060=>3746,
-21448=>3746,
-25273=>3747,
-26411=>3748,
-27819=>3749,
-36804=>3750,
-20397=>3751,
-32365=>3752,
-40639=>3753,
-19975=>3754,
-24930=>3755,
-28288=>3756,
-28459=>3757,
-34067=>3758,
-21619=>3759,
-26410=>3760,
-39749=>3761,
-11922=>3762,
-24051=>3762,
-31637=>3763,
-23724=>3764,
-23494=>3765,
-34588=>3766,
-28234=>3767,
-34001=>3768,
-31252=>3769,
-33032=>3770,
-22937=>3771,
-31885=>3772,
-11936=>3773,
-27665=>3773,
-30496=>3774,
-21209=>3775,
-22818=>3776,
-28961=>3777,
-29279=>3778,
-12141=>3779,
-30683=>3779,
-38695=>3780,
-40289=>3781,
-26891=>3782,
-23167=>3783,
-23064=>3784,
-20901=>3785,
-21517=>3786,
-21629=>3787,
-26126=>3788,
-30431=>3789,
-36855=>3790,
-37528=>3791,
-40180=>3792,
-23018=>3793,
-29277=>3794,
-28357=>3795,
-20813=>3796,
-26825=>3797,
-32191=>3798,
-32236=>3799,
-12207=>3800,
-38754=>3800,
-40634=>3801,
-25720=>3802,
-27169=>3803,
-33538=>3804,
-22916=>3805,
-23391=>3806,
-12113=>3807,
-27611=>3807,
-29467=>3808,
-30450=>3809,
-32178=>3810,
-32791=>3811,
-33945=>3812,
-20786=>3813,
-12106=>3814,
-26408=>3814,
-40665=>3815,
-12140=>3816,
-30446=>3816,
-26466=>3817,
-21247=>3818,
-39173=>3819,
-23588=>3820,
-25147=>3821,
-31870=>3822,
-36016=>3823,
-21839=>3824,
-24758=>3825,
-32011=>3826,
-12200=>3827,
-38272=>3827,
-21249=>3828,
-20063=>3829,
-20918=>3830,
-22812=>3831,
-29242=>3832,
-32822=>3833,
-37326=>3834,
-24357=>3835,
-12142=>3836,
-30690=>3836,
-21380=>3837,
-24441=>3838,
-32004=>3839,
-34220=>3840,
-35379=>3841,
-36493=>3842,
-38742=>3843,
-26611=>3844,
-34222=>3845,
-37971=>3846,
-24841=>3847,
-24840=>3848,
-27833=>3849,
-30290=>3850,
-35565=>3851,
-36664=>3852,
-21807=>3853,
-20305=>3854,
-20778=>3855,
-21191=>3856,
-21451=>3857,
-23461=>3858,
-24189=>3859,
-24736=>3860,
-24962=>3861,
-25558=>3862,
-26377=>3863,
-26586=>3864,
-28263=>3865,
-28044=>3866,
-29494=>3867,
-29495=>3868,
-30001=>3869,
-31056=>3870,
-35029=>3871,
-35480=>3872,
-36938=>3873,
-12194=>3874,
-37009=>3874,
-37109=>3875,
-38596=>3876,
-34701=>3877,
-12067=>3878,
-22805=>3878,
-20104=>3879,
-20313=>3880,
-19982=>3881,
-35465=>3882,
-36671=>3883,
-38928=>3884,
-20653=>3885,
-24188=>3886,
-22934=>3887,
-23481=>3888,
-24248=>3889,
-25562=>3890,
-25594=>3891,
-25793=>3892,
-26332=>3893,
-26954=>3894,
-27096=>3895,
-27915=>3896,
-28342=>3897,
-29076=>3898,
-12132=>3899,
-29992=>3899,
-31407=>3900,
-12154=>3901,
-32650=>3901,
-32768=>3902,
-33865=>3903,
-33993=>3904,
-35201=>3905,
-35617=>3906,
-36362=>3907,
-36965=>3908,
-38525=>3909,
-39178=>3910,
-24958=>3911,
-25233=>3912,
-27442=>3913,
-27779=>3914,
-28020=>3915,
-32716=>3916,
-32764=>3917,
-28096=>3918,
-32645=>3919,
-34746=>3920,
-35064=>3921,
-26469=>3922,
-33713=>3923,
-38972=>3924,
-38647=>3925,
-27931=>3926,
-32097=>3927,
-33853=>3928,
-37226=>3929,
-20081=>3930,
-21365=>3931,
-23888=>3932,
-27396=>3933,
-28651=>3934,
-34253=>3935,
-34349=>3936,
-35239=>3937,
-21033=>3938,
-21519=>3939,
-23653=>3940,
-26446=>3941,
-26792=>3942,
-29702=>3943,
-29827=>3944,
-30178=>3945,
-35023=>3946,
-35041=>3947,
-12197=>3948,
-37324=>3948,
-38626=>3949,
-38520=>3950,
-24459=>3951,
-29575=>3952,
-12148=>3953,
-31435=>3953,
-33870=>3954,
-25504=>3955,
-30053=>3956,
-21129=>3957,
-27969=>3958,
-28316=>3959,
-29705=>3960,
-30041=>3961,
-30827=>3962,
-31890=>3963,
-38534=>3964,
-12015=>3965,
-31452=>3965,
-12243=>3966,
-40845=>3966,
-20406=>3967,
-24942=>3968,
-26053=>3969,
-34396=>3970,
-20102=>3971,
-20142=>3972,
-20698=>3973,
-20001=>3974,
-20940=>3975,
-23534=>3976,
-26009=>3977,
-26753=>3978,
-28092=>3979,
-29471=>3980,
-30274=>3981,
-30637=>3982,
-31260=>3983,
-31975=>3984,
-33391=>3985,
-35538=>3986,
-36988=>3987,
-37327=>3988,
-38517=>3989,
-38936=>3990,
-12050=>3991,
-21147=>3991,
-32209=>3992,
-20523=>3993,
-21400=>3994,
-26519=>3995,
-28107=>3996,
-29136=>3997,
-29747=>3998,
-33256=>3999,
-36650=>4000,
-38563=>4001,
-40023=>4002,
-40607=>4003,
-29792=>4004,
-22593=>4005,
-28057=>4006,
-32047=>4007,
-39006=>4008,
-20196=>4009,
-20278=>4010,
-20363=>4011,
-20919=>4012,
-21169=>4013,
-23994=>4014,
-24604=>4015,
-29618=>4016,
-31036=>4017,
-33491=>4018,
-37428=>4019,
-38583=>4020,
-38646=>4021,
-38666=>4022,
-40599=>4023,
-40802=>4024,
-26278=>4025,
-27508=>4026,
-21015=>4027,
-21155=>4028,
-28872=>4029,
-35010=>4030,
-24265=>4031,
-24651=>4032,
-24976=>4033,
-28451=>4034,
-29001=>4035,
-31806=>4036,
-32244=>4037,
-32879=>4038,
-34030=>4039,
-36899=>4040,
-37676=>4041,
-21570=>4042,
-39791=>4043,
-27347=>4044,
-28809=>4045,
-36034=>4046,
-36335=>4047,
-38706=>4048,
-21172=>4049,
-23105=>4050,
-24266=>4051,
-24324=>4052,
-26391=>4053,
-27004=>4054,
-27028=>4055,
-28010=>4056,
-28431=>4057,
-29282=>4058,
-29436=>4059,
-31725=>4060,
-12156=>4061,
-32769=>4061,
-32894=>4062,
-34635=>4063,
-37070=>4064,
-20845=>4065,
-40595=>4066,
-31108=>4067,
-32907=>4068,
-37682=>4069,
-35542=>4070,
-20525=>4071,
-21644=>4072,
-35441=>4073,
-27498=>4074,
-36036=>4075,
-33031=>4076,
-24785=>4077,
-26528=>4078,
-40434=>4079,
-20121=>4080,
-20120=>4081,
-39952=>4082,
-35435=>4083,
-34241=>4084,
-34152=>4085,
-26880=>4086,
-28286=>4087,
-30871=>4088,
-33109=>4089,
-24332=>4090,
-19984=>4091,
-19989=>4092,
-20010=>4093,
-20017=>4094,
-12034=>4095,
-20022=>4095,
-20028=>4096,
-12035=>4097,
-20031=>4097,
-20034=>4098,
-20054=>4099,
-20056=>4100,
-20098=>4101,
-12037=>4102,
-20101=>4102,
-35947=>4103,
-20106=>4104,
-33298=>4105,
-24333=>4106,
-20110=>4107,
-20126=>4108,
-20127=>4109,
-12039=>4110,
-20128=>4110,
-20130=>4111,
-20144=>4112,
-20147=>4113,
-20150=>4114,
-20174=>4115,
-20173=>4116,
-20164=>4117,
-20166=>4118,
-20162=>4119,
-20183=>4120,
-20190=>4121,
-20205=>4122,
-20191=>4123,
-20215=>4124,
-20233=>4125,
-20314=>4126,
-20272=>4127,
-20315=>4128,
-20317=>4129,
-20311=>4130,
-20295=>4131,
-20342=>4132,
-20360=>4133,
-20367=>4134,
-20376=>4135,
-20347=>4136,
-20329=>4137,
-20336=>4138,
-20369=>4139,
-20335=>4140,
-20358=>4141,
-20374=>4142,
-20760=>4143,
-20436=>4144,
-20447=>4145,
-20430=>4146,
-20440=>4147,
-20443=>4148,
-20433=>4149,
-20442=>4150,
-20432=>4151,
-20452=>4152,
-20453=>4153,
-20506=>4154,
-20520=>4155,
-20500=>4156,
-20522=>4157,
-20517=>4158,
-20485=>4159,
-20252=>4160,
-20470=>4161,
-20513=>4162,
-20521=>4163,
-20524=>4164,
-20478=>4165,
-20463=>4166,
-20497=>4167,
-20486=>4168,
-20547=>4169,
-20551=>4170,
-26371=>4171,
-20565=>4172,
-20560=>4173,
-20552=>4174,
-20570=>4175,
-20566=>4176,
-20588=>4177,
-20600=>4178,
-20608=>4179,
-20634=>4180,
-20613=>4181,
-20660=>4182,
-20658=>4183,
-20681=>4184,
-20682=>4185,
-20659=>4186,
-20674=>4187,
-20694=>4188,
-20702=>4189,
-20709=>4190,
-20717=>4191,
-20707=>4192,
-20718=>4193,
-20729=>4194,
-20725=>4195,
-20745=>4196,
-20737=>4197,
-20738=>4198,
-20758=>4199,
-20757=>4200,
-20756=>4201,
-20762=>4202,
-20769=>4203,
-20794=>4204,
-20791=>4205,
-20796=>4206,
-20795=>4207,
-12041=>4208,
-20799=>4208,
-11918=>4209,
-20800=>4209,
-20818=>4210,
-20812=>4211,
-20820=>4212,
-20834=>4213,
-31480=>4214,
-20841=>4215,
-20842=>4216,
-20846=>4217,
-20864=>4218,
-12044=>4219,
-20866=>4219,
-22232=>4220,
-20876=>4221,
-20873=>4222,
-20879=>4223,
-20881=>4224,
-20883=>4225,
-20885=>4226,
-12045=>4227,
-20886=>4227,
-20900=>4228,
-20902=>4229,
-20898=>4230,
-20905=>4231,
-20906=>4232,
-12046=>4233,
-20907=>4233,
-20915=>4234,
-20913=>4235,
-20914=>4236,
-20912=>4237,
-20917=>4238,
-20925=>4239,
-20933=>4240,
-20937=>4241,
-20955=>4242,
-12047=>4243,
-20960=>4243,
-34389=>4244,
-20969=>4245,
-20973=>4246,
-20976=>4247,
-12048=>4248,
-20981=>4248,
-20990=>4249,
-20996=>4250,
-21003=>4251,
-21012=>4252,
-21006=>4253,
-21031=>4254,
-21034=>4255,
-21038=>4256,
-21043=>4257,
-21049=>4258,
-21071=>4259,
-21060=>4260,
-21067=>4261,
-21068=>4262,
-21086=>4263,
-21076=>4264,
-21098=>4265,
-21108=>4266,
-21097=>4267,
-21107=>4268,
-21119=>4269,
-21117=>4270,
-21133=>4271,
-21140=>4272,
-21138=>4273,
-21105=>4274,
-21128=>4275,
-21137=>4276,
-36776=>4277,
-36775=>4278,
-21164=>4279,
-21165=>4280,
-21180=>4281,
-21173=>4282,
-21185=>4283,
-21197=>4284,
-21207=>4285,
-21214=>4286,
-21219=>4287,
-21222=>4288,
-39149=>4289,
-21216=>4290,
-21235=>4291,
-21237=>4292,
-21240=>4293,
-12051=>4294,
-21241=>4294,
-21254=>4295,
-21256=>4296,
-30008=>4297,
-21261=>4298,
-21264=>4299,
-21263=>4300,
-21269=>4301,
-12052=>4301,
-21274=>4302,
-12053=>4302,
-21283=>4303,
-21295=>4304,
-21297=>4305,
-21299=>4306,
-12054=>4307,
-21304=>4307,
-21312=>4308,
-21318=>4309,
-21317=>4310,
-19991=>4311,
-21321=>4312,
-21325=>4313,
-20950=>4314,
-21342=>4315,
-12057=>4316,
-21353=>4316,
-21358=>4317,
-22808=>4318,
-21371=>4319,
-21367=>4320,
-12058=>4321,
-21378=>4321,
-21398=>4322,
-21408=>4323,
-21414=>4324,
-21413=>4325,
-21422=>4326,
-21424=>4327,
-12059=>4328,
-21430=>4328,
-21443=>4329,
-31762=>4330,
-38617=>4331,
-21471=>4332,
-26364=>4333,
-29166=>4334,
-21486=>4335,
-21480=>4336,
-21485=>4337,
-21498=>4338,
-21505=>4339,
-21565=>4340,
-21568=>4341,
-21548=>4342,
-21549=>4343,
-21564=>4344,
-21550=>4345,
-21558=>4346,
-21545=>4347,
-21533=>4348,
-21582=>4349,
-21647=>4350,
-21621=>4351,
-21646=>4352,
-21599=>4353,
-21617=>4354,
-21623=>4355,
-21616=>4356,
-21650=>4357,
-21627=>4358,
-21632=>4359,
-21622=>4360,
-21636=>4361,
-21648=>4362,
-21638=>4363,
-21703=>4364,
-21666=>4365,
-21688=>4366,
-21669=>4367,
-21676=>4368,
-21700=>4369,
-21704=>4370,
-21672=>4371,
-21675=>4372,
-21698=>4373,
-21668=>4374,
-21694=>4375,
-21692=>4376,
-21720=>4377,
-21733=>4378,
-21734=>4379,
-21775=>4380,
-21780=>4381,
-21757=>4382,
-21742=>4383,
-21741=>4384,
-21754=>4385,
-21730=>4386,
-21817=>4387,
-21824=>4388,
-21859=>4389,
-21836=>4390,
-21806=>4391,
-21852=>4392,
-21829=>4393,
-21846=>4394,
-21847=>4395,
-21816=>4396,
-21811=>4397,
-21853=>4398,
-21913=>4399,
-21888=>4400,
-21679=>4401,
-21898=>4402,
-21919=>4403,
-21883=>4404,
-21886=>4405,
-21912=>4406,
-21918=>4407,
-21934=>4408,
-21884=>4409,
-21891=>4410,
-21929=>4411,
-21895=>4412,
-21928=>4413,
-21978=>4414,
-21957=>4415,
-21983=>4416,
-21956=>4417,
-21980=>4418,
-21988=>4419,
-21972=>4420,
-22036=>4421,
-22007=>4422,
-22038=>4423,
-22014=>4424,
-22013=>4425,
-22043=>4426,
-22009=>4427,
-22094=>4428,
-22096=>4429,
-29151=>4430,
-22068=>4431,
-22070=>4432,
-22066=>4433,
-22072=>4434,
-22123=>4435,
-22116=>4436,
-22063=>4437,
-22124=>4438,
-22122=>4439,
-22150=>4440,
-22144=>4441,
-22154=>4442,
-22176=>4443,
-22164=>4444,
-22159=>4445,
-22181=>4446,
-22190=>4447,
-22198=>4448,
-22196=>4449,
-22210=>4450,
-22204=>4451,
-22209=>4452,
-22211=>4453,
-22208=>4454,
-22216=>4455,
-22222=>4456,
-22225=>4457,
-22227=>4458,
-12062=>4459,
-22231=>4459,
-22254=>4460,
-22265=>4461,
-22272=>4462,
-22271=>4463,
-22276=>4464,
-22281=>4465,
-22280=>4466,
-22283=>4467,
-22285=>4468,
-22291=>4469,
-22296=>4470,
-22294=>4471,
-21959=>4472,
-22300=>4473,
-22310=>4474,
-22327=>4475,
-22328=>4476,
-22350=>4477,
-22331=>4478,
-22336=>4479,
-22351=>4480,
-22377=>4481,
-22464=>4482,
-22408=>4483,
-22369=>4484,
-22399=>4485,
-22409=>4486,
-22419=>4487,
-22432=>4488,
-22451=>4489,
-22436=>4490,
-22442=>4491,
-22448=>4492,
-22467=>4493,
-22470=>4494,
-22484=>4495,
-22482=>4496,
-22483=>4497,
-22538=>4498,
-22486=>4499,
-22499=>4500,
-22539=>4501,
-22553=>4502,
-22557=>4503,
-22642=>4504,
-22561=>4505,
-22626=>4506,
-22603=>4507,
-22640=>4508,
-27584=>4509,
-22610=>4510,
-22589=>4511,
-22649=>4512,
-22661=>4513,
-22713=>4514,
-22687=>4515,
-22699=>4516,
-22714=>4517,
-22750=>4518,
-22715=>4519,
-22712=>4520,
-22702=>4521,
-22725=>4522,
-22739=>4523,
-22737=>4524,
-22743=>4525,
-22745=>4526,
-22744=>4527,
-22757=>4528,
-22748=>4529,
-22756=>4530,
-22751=>4531,
-22767=>4532,
-22778=>4533,
-22777=>4534,
-22779=>4535,
-22780=>4536,
-22781=>4537,
-22786=>4538,
-12065=>4538,
-22794=>4539,
-12066=>4539,
-22800=>4540,
-22811=>4541,
-26790=>4542,
-22821=>4543,
-22828=>4544,
-22829=>4545,
-22834=>4546,
-22840=>4547,
-22846=>4548,
-31442=>4549,
-22869=>4550,
-22864=>4551,
-22862=>4552,
-22874=>4553,
-22872=>4554,
-22882=>4555,
-22880=>4556,
-22887=>4557,
-22892=>4558,
-22889=>4559,
-22904=>4560,
-22913=>4561,
-22941=>4562,
-20318=>4563,
-20395=>4564,
-22947=>4565,
-22962=>4566,
-22982=>4567,
-23016=>4568,
-23004=>4569,
-22925=>4570,
-23001=>4571,
-23002=>4572,
-23077=>4573,
-23071=>4574,
-23057=>4575,
-23068=>4576,
-23049=>4577,
-23066=>4578,
-23104=>4579,
-23148=>4580,
-23113=>4581,
-23093=>4582,
-23094=>4583,
-23138=>4584,
-23146=>4585,
-23194=>4586,
-23228=>4587,
-23230=>4588,
-23243=>4589,
-23234=>4590,
-23229=>4591,
-23267=>4592,
-23255=>4593,
-23270=>4594,
-23273=>4595,
-23254=>4596,
-23290=>4597,
-23291=>4598,
-23308=>4599,
-23307=>4600,
-23318=>4601,
-23346=>4602,
-23248=>4603,
-23338=>4604,
-23350=>4605,
-23358=>4606,
-23363=>4607,
-23365=>4608,
-23360=>4609,
-23377=>4610,
-23381=>4611,
-23386=>4612,
-23387=>4613,
-23397=>4614,
-23401=>4615,
-23408=>4616,
-23411=>4617,
-23413=>4618,
-23416=>4619,
-25992=>4620,
-23418=>4621,
-12071=>4622,
-23424=>4622,
-23427=>4623,
-23462=>4624,
-23480=>4625,
-23491=>4626,
-23495=>4627,
-23497=>4628,
-23508=>4629,
-23504=>4630,
-23524=>4631,
-23526=>4632,
-23522=>4633,
-23518=>4634,
-23525=>4635,
-23531=>4636,
-23536=>4637,
-23542=>4638,
-23539=>4639,
-23557=>4640,
-23559=>4641,
-23560=>4642,
-23565=>4643,
-23571=>4644,
-23584=>4645,
-11920=>4646,
-12074=>4646,
-23586=>4646,
-23592=>4647,
-12075=>4648,
-23608=>4648,
-23609=>4649,
-23617=>4650,
-23622=>4651,
-23630=>4652,
-23635=>4653,
-23632=>4654,
-23631=>4655,
-23409=>4656,
-23660=>4657,
-12076=>4658,
-23662=>4658,
-20066=>4659,
-23670=>4660,
-23673=>4661,
-23692=>4662,
-23697=>4663,
-23700=>4664,
-22939=>4665,
-23723=>4666,
-23739=>4667,
-23734=>4668,
-23740=>4669,
-23735=>4670,
-23749=>4671,
-23742=>4672,
-23751=>4673,
-23769=>4674,
-23785=>4675,
-23805=>4676,
-23802=>4677,
-23789=>4678,
-23948=>4679,
-23786=>4680,
-23819=>4681,
-23829=>4682,
-23831=>4683,
-23900=>4684,
-23839=>4685,
-23835=>4686,
-23825=>4687,
-23828=>4688,
-23842=>4689,
-23834=>4690,
-23833=>4691,
-23832=>4692,
-23884=>4693,
-23890=>4694,
-23886=>4695,
-23883=>4696,
-23916=>4697,
-23923=>4698,
-23926=>4699,
-23943=>4700,
-23940=>4701,
-23938=>4702,
-23970=>4703,
-23965=>4704,
-23980=>4705,
-23982=>4706,
-23997=>4707,
-23952=>4708,
-23991=>4709,
-23996=>4710,
-24009=>4711,
-24013=>4712,
-24019=>4713,
-24018=>4714,
-24022=>4715,
-12078=>4716,
-24027=>4716,
-24043=>4717,
-24050=>4718,
-24053=>4719,
-24075=>4720,
-24090=>4721,
-24089=>4722,
-24081=>4723,
-24091=>4724,
-24118=>4725,
-24119=>4726,
-24132=>4727,
-24131=>4728,
-24128=>4729,
-24142=>4730,
-24151=>4731,
-24148=>4732,
-24159=>4733,
-24162=>4734,
-24164=>4735,
-24135=>4736,
-24181=>4737,
-24182=>4738,
-11923=>4739,
-12083=>4739,
-24186=>4739,
-40636=>4740,
-12084=>4741,
-24191=>4741,
-24224=>4742,
-24257=>4743,
-24258=>4744,
-24264=>4745,
-24272=>4746,
-24271=>4747,
-24278=>4748,
-24291=>4749,
-24285=>4750,
-24282=>4751,
-24283=>4752,
-24290=>4753,
-24289=>4754,
-24296=>4755,
-24297=>4756,
-24300=>4757,
-24305=>4758,
-24307=>4759,
-24304=>4760,
-12085=>4761,
-24308=>4761,
-24312=>4762,
-12086=>4763,
-24318=>4763,
-24323=>4764,
-24329=>4765,
-24413=>4766,
-24412=>4767,
-12087=>4768,
-24331=>4768,
-24337=>4769,
-24342=>4770,
-24361=>4771,
-24365=>4772,
-24376=>4773,
-24385=>4774,
-24392=>4775,
-24396=>4776,
-24398=>4777,
-24367=>4778,
-11924=>4779,
-24401=>4779,
-24406=>4780,
-24407=>4781,
-24409=>4782,
-12090=>4783,
-24417=>4783,
-24429=>4784,
-12091=>4785,
-24435=>4785,
-24439=>4786,
-24451=>4787,
-24450=>4788,
-24447=>4789,
-24458=>4790,
-24456=>4791,
-24465=>4792,
-24455=>4793,
-24478=>4794,
-24473=>4795,
-24472=>4796,
-24480=>4797,
-24488=>4798,
-24493=>4799,
-24508=>4800,
-24534=>4801,
-24571=>4802,
-24548=>4803,
-24568=>4804,
-24561=>4805,
-24541=>4806,
-24755=>4807,
-24575=>4808,
-24609=>4809,
-24672=>4810,
-24601=>4811,
-24592=>4812,
-24617=>4813,
-24590=>4814,
-24625=>4815,
-24603=>4816,
-24597=>4817,
-24619=>4818,
-24614=>4819,
-24591=>4820,
-24634=>4821,
-24666=>4822,
-24641=>4823,
-24682=>4824,
-24695=>4825,
-24671=>4826,
-24650=>4827,
-24646=>4828,
-24653=>4829,
-24675=>4830,
-24643=>4831,
-24676=>4832,
-24642=>4833,
-24684=>4834,
-24683=>4835,
-24665=>4836,
-24705=>4837,
-24717=>4838,
-24807=>4839,
-24707=>4840,
-24730=>4841,
-24708=>4842,
-24731=>4843,
-24726=>4844,
-24727=>4845,
-24722=>4846,
-24743=>4847,
-24715=>4848,
-24801=>4849,
-24760=>4850,
-24800=>4851,
-24787=>4852,
-24756=>4853,
-24560=>4854,
-24765=>4855,
-24774=>4856,
-24757=>4857,
-24792=>4858,
-24909=>4859,
-24853=>4860,
-24838=>4861,
-24822=>4862,
-24823=>4863,
-24832=>4864,
-24820=>4865,
-24826=>4866,
-24835=>4867,
-24865=>4868,
-24827=>4869,
-24817=>4870,
-24845=>4871,
-24846=>4872,
-24903=>4873,
-24894=>4874,
-24872=>4875,
-24871=>4876,
-24906=>4877,
-24895=>4878,
-24892=>4879,
-24876=>4880,
-24884=>4881,
-24893=>4882,
-24898=>4883,
-24900=>4884,
-24947=>4885,
-24951=>4886,
-24920=>4887,
-24921=>4888,
-24922=>4889,
-24939=>4890,
-24948=>4891,
-24943=>4892,
-24933=>4893,
-24945=>4894,
-24927=>4895,
-24925=>4896,
-24915=>4897,
-24949=>4898,
-24985=>4899,
-24982=>4900,
-24967=>4901,
-25004=>4902,
-24980=>4903,
-24986=>4904,
-24970=>4905,
-24977=>4906,
-25003=>4907,
-25006=>4908,
-25036=>4909,
-25034=>4910,
-25033=>4911,
-25079=>4912,
-25032=>4913,
-25027=>4914,
-25030=>4915,
-25018=>4916,
-25035=>4917,
-32633=>4918,
-25037=>4919,
-25062=>4920,
-25059=>4921,
-25078=>4922,
-25082=>4923,
-25076=>4924,
-25087=>4925,
-25085=>4926,
-25084=>4927,
-25086=>4928,
-25088=>4929,
-12093=>4930,
-25096=>4930,
-25097=>4931,
-25101=>4932,
-25100=>4933,
-25108=>4934,
-25115=>4935,
-25118=>4936,
-25121=>4937,
-25130=>4938,
-25134=>4939,
-25136=>4940,
-25138=>4941,
-25139=>4942,
-25153=>4943,
-25166=>4944,
-25182=>4945,
-25187=>4946,
-25179=>4947,
-25184=>4948,
-25192=>4949,
-25212=>4950,
-25218=>4951,
-25225=>4952,
-25214=>4953,
-25234=>4954,
-25235=>4955,
-25238=>4956,
-25300=>4957,
-25219=>4958,
-25236=>4959,
-25303=>4960,
-25297=>4961,
-25275=>4962,
-25295=>4963,
-25343=>4964,
-25286=>4965,
-25812=>4966,
-25288=>4967,
-25308=>4968,
-25292=>4969,
-25290=>4970,
-25282=>4971,
-25287=>4972,
-25243=>4973,
-25289=>4974,
-25356=>4975,
-25326=>4976,
-25329=>4977,
-25383=>4978,
-25346=>4979,
-25352=>4980,
-25327=>4981,
-25333=>4982,
-25424=>4983,
-25406=>4984,
-25421=>4985,
-25628=>4986,
-25423=>4987,
-25494=>4988,
-25486=>4989,
-25472=>4990,
-25515=>4991,
-25462=>4992,
-25507=>4993,
-25487=>4994,
-25481=>4995,
-25503=>4996,
-25525=>4997,
-25451=>4998,
-25449=>4999,
-25534=>5000,
-25577=>5001,
-25536=>5002,
-25542=>5003,
-25571=>5004,
-25545=>5005,
-25554=>5006,
-25590=>5007,
-25540=>5008,
-25622=>5009,
-25652=>5010,
-25606=>5011,
-25619=>5012,
-25638=>5013,
-25654=>5014,
-25885=>5015,
-25623=>5016,
-25640=>5017,
-25615=>5018,
-25703=>5019,
-25711=>5020,
-25718=>5021,
-25678=>5022,
-25898=>5023,
-25749=>5024,
-25747=>5025,
-25765=>5026,
-25769=>5027,
-25736=>5028,
-25788=>5029,
-25818=>5030,
-25810=>5031,
-25797=>5032,
-25799=>5033,
-25787=>5034,
-25816=>5035,
-25794=>5036,
-25841=>5037,
-25831=>5038,
-33289=>5039,
-25824=>5040,
-25825=>5041,
-25260=>5042,
-25827=>5043,
-25839=>5044,
-25900=>5045,
-25846=>5046,
-25844=>5047,
-25842=>5048,
-25850=>5049,
-25856=>5050,
-25853=>5051,
-25880=>5052,
-25884=>5053,
-25861=>5054,
-25892=>5055,
-25891=>5056,
-25899=>5057,
-12097=>5058,
-25908=>5058,
-11929=>5059,
-25909=>5059,
-25911=>5060,
-25910=>5061,
-25912=>5062,
-30027=>5063,
-25928=>5064,
-25942=>5065,
-25941=>5066,
-25933=>5067,
-25944=>5068,
-25950=>5069,
-25949=>5070,
-25970=>5071,
-25976=>5072,
-25986=>5073,
-25987=>5074,
-35722=>5075,
-26011=>5076,
-26015=>5077,
-26027=>5078,
-26039=>5079,
-26051=>5080,
-26054=>5081,
-26049=>5082,
-26052=>5083,
-26060=>5084,
-26066=>5085,
-26075=>5086,
-26073=>5087,
-12102=>5088,
-26080=>5088,
-11931=>5089,
-26081=>5089,
-26097=>5090,
-26482=>5091,
-26122=>5092,
-26115=>5093,
-26107=>5094,
-26483=>5095,
-26165=>5096,
-26166=>5097,
-26164=>5098,
-26140=>5099,
-26191=>5100,
-26180=>5101,
-26185=>5102,
-26177=>5103,
-26206=>5104,
-26205=>5105,
-26212=>5106,
-26215=>5107,
-26216=>5108,
-26207=>5109,
-26210=>5110,
-26224=>5111,
-26243=>5112,
-26248=>5113,
-26254=>5114,
-26249=>5115,
-26244=>5116,
-26264=>5117,
-26269=>5118,
-26305=>5119,
-26297=>5120,
-26313=>5121,
-26302=>5122,
-26300=>5123,
-26308=>5124,
-26296=>5125,
-26326=>5126,
-26330=>5127,
-26336=>5128,
-26175=>5129,
-26342=>5130,
-26345=>5131,
-12104=>5132,
-26352=>5132,
-26357=>5133,
-26359=>5134,
-26383=>5135,
-26390=>5136,
-26398=>5137,
-26406=>5138,
-26407=>5139,
-38712=>5140,
-26414=>5141,
-26431=>5142,
-26422=>5143,
-26433=>5144,
-26424=>5145,
-26423=>5146,
-26438=>5147,
-26462=>5148,
-26464=>5149,
-26457=>5150,
-26467=>5151,
-26468=>5152,
-26505=>5153,
-26480=>5154,
-26537=>5155,
-26492=>5156,
-26474=>5157,
-26508=>5158,
-26507=>5159,
-26534=>5160,
-26529=>5161,
-26501=>5162,
-26551=>5163,
-26607=>5164,
-26548=>5165,
-26604=>5166,
-26547=>5167,
-26601=>5168,
-26552=>5169,
-26596=>5170,
-26590=>5171,
-26589=>5172,
-26594=>5173,
-26606=>5174,
-26553=>5175,
-26574=>5176,
-26566=>5177,
-26599=>5178,
-27292=>5179,
-26654=>5180,
-26694=>5181,
-26665=>5182,
-26688=>5183,
-26701=>5184,
-26674=>5185,
-26702=>5186,
-26803=>5187,
-26667=>5188,
-26713=>5189,
-26723=>5190,
-26743=>5191,
-26751=>5192,
-26783=>5193,
-26767=>5194,
-26797=>5195,
-26772=>5196,
-26781=>5197,
-26779=>5198,
-26755=>5199,
-27310=>5200,
-26809=>5201,
-26740=>5202,
-26805=>5203,
-26784=>5204,
-26810=>5205,
-26895=>5206,
-26765=>5207,
-26750=>5208,
-26881=>5209,
-26826=>5210,
-26888=>5211,
-26840=>5212,
-26914=>5213,
-26918=>5214,
-26849=>5215,
-26892=>5216,
-26829=>5217,
-26836=>5218,
-26855=>5219,
-26837=>5220,
-26934=>5221,
-26898=>5222,
-26884=>5223,
-26839=>5224,
-26851=>5225,
-26917=>5226,
-26873=>5227,
-26848=>5228,
-26863=>5229,
-26920=>5230,
-26922=>5231,
-26906=>5232,
-26915=>5233,
-26913=>5234,
-26822=>5235,
-27001=>5236,
-26999=>5237,
-26972=>5238,
-27000=>5239,
-26987=>5240,
-26964=>5241,
-27006=>5242,
-26990=>5243,
-26937=>5244,
-26996=>5245,
-26941=>5246,
-26969=>5247,
-26928=>5248,
-26977=>5249,
-26974=>5250,
-26973=>5251,
-27009=>5252,
-26986=>5253,
-27058=>5254,
-27054=>5255,
-27088=>5256,
-27071=>5257,
-27073=>5258,
-27091=>5259,
-27070=>5260,
-27086=>5261,
-23528=>5262,
-27082=>5263,
-27101=>5264,
-27067=>5265,
-27075=>5266,
-27047=>5267,
-27182=>5268,
-27025=>5269,
-27040=>5270,
-27036=>5271,
-27029=>5272,
-27060=>5273,
-27102=>5274,
-27112=>5275,
-27138=>5276,
-27163=>5277,
-27135=>5278,
-27402=>5279,
-27129=>5280,
-27122=>5281,
-27111=>5282,
-27141=>5283,
-27057=>5284,
-27166=>5285,
-27117=>5286,
-27156=>5287,
-27115=>5288,
-27146=>5289,
-27154=>5290,
-27329=>5291,
-27171=>5292,
-27155=>5293,
-27204=>5294,
-27148=>5295,
-27250=>5296,
-27190=>5297,
-27256=>5298,
-27207=>5299,
-27234=>5300,
-27225=>5301,
-27238=>5302,
-27208=>5303,
-27192=>5304,
-27170=>5305,
-27280=>5306,
-27277=>5307,
-27296=>5308,
-27268=>5309,
-27298=>5310,
-27299=>5311,
-27287=>5312,
-34327=>5313,
-27323=>5314,
-27331=>5315,
-27330=>5316,
-27320=>5317,
-27315=>5318,
-27308=>5319,
-27358=>5320,
-27345=>5321,
-27359=>5322,
-27306=>5323,
-27354=>5324,
-27370=>5325,
-27387=>5326,
-27397=>5327,
-34326=>5328,
-27386=>5329,
-27410=>5330,
-27414=>5331,
-39729=>5332,
-27423=>5333,
-27448=>5334,
-27447=>5335,
-30428=>5336,
-27449=>5337,
-39150=>5338,
-27463=>5339,
-27459=>5340,
-27465=>5341,
-27472=>5342,
-27481=>5343,
-27476=>5344,
-27483=>5345,
-27487=>5346,
-27489=>5347,
-27512=>5348,
-12109=>5349,
-27513=>5349,
-27519=>5350,
-27520=>5351,
-27524=>5352,
-27523=>5353,
-27533=>5354,
-27544=>5355,
-27541=>5356,
-27550=>5357,
-27556=>5358,
-27562=>5359,
-27563=>5360,
-27567=>5361,
-27570=>5362,
-27569=>5363,
-12110=>5364,
-27571=>5364,
-27575=>5365,
-27580=>5366,
-27590=>5367,
-12111=>5368,
-27595=>5368,
-27603=>5369,
-27615=>5370,
-27628=>5371,
-27627=>5372,
-27635=>5373,
-27631=>5374,
-40638=>5375,
-27656=>5376,
-27667=>5377,
-12115=>5378,
-27668=>5378,
-27675=>5379,
-27684=>5380,
-27683=>5381,
-27742=>5382,
-27733=>5383,
-27746=>5384,
-27754=>5385,
-27778=>5386,
-27789=>5387,
-27802=>5388,
-27777=>5389,
-27803=>5390,
-27774=>5391,
-27752=>5392,
-27763=>5393,
-27794=>5394,
-27792=>5395,
-27844=>5396,
-27889=>5397,
-27859=>5398,
-27837=>5399,
-27863=>5400,
-27845=>5401,
-27869=>5402,
-27822=>5403,
-27825=>5404,
-27838=>5405,
-27834=>5406,
-27867=>5407,
-27887=>5408,
-27865=>5409,
-27882=>5410,
-27935=>5411,
-34893=>5412,
-27958=>5413,
-27947=>5414,
-27965=>5415,
-27960=>5416,
-27929=>5417,
-27957=>5418,
-27955=>5419,
-27922=>5420,
-27916=>5421,
-28003=>5422,
-28051=>5423,
-28004=>5424,
-27994=>5425,
-28025=>5426,
-27993=>5427,
-28046=>5428,
-28053=>5429,
-28644=>5430,
-28037=>5431,
-28153=>5432,
-28181=>5433,
-28170=>5434,
-28085=>5435,
-28103=>5436,
-28134=>5437,
-28088=>5438,
-28102=>5439,
-28140=>5440,
-28126=>5441,
-28108=>5442,
-28136=>5443,
-28114=>5444,
-28101=>5445,
-28154=>5446,
-28121=>5447,
-28132=>5448,
-28117=>5449,
-28138=>5450,
-28142=>5451,
-28205=>5452,
-28270=>5453,
-28206=>5454,
-28185=>5455,
-28274=>5456,
-28255=>5457,
-28222=>5458,
-28195=>5459,
-28267=>5460,
-28203=>5461,
-28278=>5462,
-28237=>5463,
-28191=>5464,
-28227=>5465,
-28218=>5466,
-28238=>5467,
-28196=>5468,
-28415=>5469,
-28189=>5470,
-28216=>5471,
-28290=>5472,
-28330=>5473,
-28312=>5474,
-28361=>5475,
-28343=>5476,
-28371=>5477,
-28349=>5478,
-28335=>5479,
-28356=>5480,
-28338=>5481,
-28372=>5482,
-28373=>5483,
-28303=>5484,
-28325=>5485,
-28354=>5486,
-28319=>5487,
-28481=>5488,
-28433=>5489,
-28748=>5490,
-28396=>5491,
-28408=>5492,
-28414=>5493,
-28479=>5494,
-28402=>5495,
-28465=>5496,
-28399=>5497,
-28466=>5498,
-28364=>5499,
-28478=>5500,
-28435=>5501,
-28407=>5502,
-28550=>5503,
-28538=>5504,
-28536=>5505,
-28545=>5506,
-28544=>5507,
-28527=>5508,
-28507=>5509,
-28659=>5510,
-28525=>5511,
-28546=>5512,
-28540=>5513,
-28504=>5514,
-28558=>5515,
-28561=>5516,
-28610=>5517,
-28518=>5518,
-28595=>5519,
-28579=>5520,
-28577=>5521,
-28580=>5522,
-28601=>5523,
-28614=>5524,
-28586=>5525,
-28639=>5526,
-28629=>5527,
-28652=>5528,
-28628=>5529,
-28632=>5530,
-28657=>5531,
-28654=>5532,
-28635=>5533,
-28681=>5534,
-28683=>5535,
-28666=>5536,
-28689=>5537,
-28673=>5538,
-28687=>5539,
-28670=>5540,
-28699=>5541,
-28698=>5542,
-28532=>5543,
-28701=>5544,
-28696=>5545,
-28703=>5546,
-28720=>5547,
-28734=>5548,
-28722=>5549,
-28753=>5550,
-28771=>5551,
-28825=>5552,
-28818=>5553,
-28847=>5554,
-28913=>5555,
-28844=>5556,
-28856=>5557,
-28851=>5558,
-28846=>5559,
-28895=>5560,
-28875=>5561,
-28893=>5562,
-28889=>5563,
-28937=>5564,
-28925=>5565,
-28956=>5566,
-28953=>5567,
-29029=>5568,
-29013=>5569,
-29064=>5570,
-29030=>5571,
-29026=>5572,
-29004=>5573,
-29014=>5574,
-29036=>5575,
-29071=>5576,
-29179=>5577,
-29060=>5578,
-29077=>5579,
-29096=>5580,
-29100=>5581,
-29143=>5582,
-29113=>5583,
-29118=>5584,
-29138=>5585,
-29129=>5586,
-29140=>5587,
-29134=>5588,
-29152=>5589,
-29164=>5590,
-29159=>5591,
-29173=>5592,
-29180=>5593,
-29177=>5594,
-29183=>5595,
-29197=>5596,
-29200=>5597,
-29211=>5598,
-29224=>5599,
-29229=>5600,
-29228=>5601,
-29232=>5602,
-29234=>5603,
-12120=>5604,
-29243=>5604,
-29244=>5605,
-12121=>5606,
-29247=>5606,
-29248=>5607,
-29254=>5608,
-29259=>5609,
-29272=>5610,
-29300=>5611,
-29310=>5612,
-29314=>5613,
-29313=>5614,
-29319=>5615,
-29330=>5616,
-29334=>5617,
-29346=>5618,
-29351=>5619,
-29369=>5620,
-29362=>5621,
-29379=>5622,
-29382=>5623,
-29380=>5624,
-29390=>5625,
-29394=>5626,
-29410=>5627,
-29408=>5628,
-29409=>5629,
-29433=>5630,
-29431=>5631,
-20495=>5632,
-29463=>5633,
-29450=>5634,
-29468=>5635,
-29462=>5636,
-29469=>5637,
-29492=>5638,
-29487=>5639,
-29481=>5640,
-29477=>5641,
-29502=>5642,
-29518=>5643,
-29519=>5644,
-40664=>5645,
-29527=>5646,
-29546=>5647,
-29544=>5648,
-29552=>5649,
-29560=>5650,
-29557=>5651,
-29563=>5652,
-29562=>5653,
-29640=>5654,
-29619=>5655,
-29646=>5656,
-29627=>5657,
-29632=>5658,
-29669=>5659,
-29678=>5660,
-29662=>5661,
-29858=>5662,
-29701=>5663,
-29807=>5664,
-29733=>5665,
-29688=>5666,
-29746=>5667,
-29754=>5668,
-29781=>5669,
-29759=>5670,
-29791=>5671,
-29785=>5672,
-29761=>5673,
-29788=>5674,
-29801=>5675,
-29808=>5676,
-29795=>5677,
-29802=>5678,
-29814=>5679,
-29822=>5680,
-29835=>5681,
-29854=>5682,
-29863=>5683,
-29898=>5684,
-29903=>5685,
-29908=>5686,
-29681=>5687,
-29920=>5688,
-29923=>5689,
-29927=>5690,
-29929=>5691,
-29934=>5692,
-29938=>5693,
-29936=>5694,
-29937=>5695,
-29944=>5696,
-29943=>5697,
-29956=>5698,
-29955=>5699,
-29957=>5700,
-29964=>5701,
-29966=>5702,
-29965=>5703,
-29973=>5704,
-29971=>5705,
-29982=>5706,
-29990=>5707,
-29996=>5708,
-30012=>5709,
-30020=>5710,
-30029=>5711,
-30026=>5712,
-30025=>5713,
-30043=>5714,
-30022=>5715,
-30042=>5716,
-30057=>5717,
-30052=>5718,
-30055=>5719,
-30059=>5720,
-30061=>5721,
-30072=>5722,
-30070=>5723,
-30086=>5724,
-30087=>5725,
-30068=>5726,
-30090=>5727,
-30089=>5728,
-30082=>5729,
-30100=>5730,
-30106=>5731,
-30109=>5732,
-30117=>5733,
-30115=>5734,
-30146=>5735,
-30131=>5736,
-30147=>5737,
-30133=>5738,
-30141=>5739,
-30136=>5740,
-30140=>5741,
-30129=>5742,
-30157=>5743,
-30154=>5744,
-30162=>5745,
-30169=>5746,
-30179=>5747,
-30174=>5748,
-30206=>5749,
-30207=>5750,
-30204=>5751,
-30209=>5752,
-30192=>5753,
-30202=>5754,
-30194=>5755,
-30195=>5756,
-30219=>5757,
-30221=>5758,
-30217=>5759,
-30239=>5760,
-30247=>5761,
-30240=>5762,
-30241=>5763,
-30242=>5764,
-30244=>5765,
-30260=>5766,
-30256=>5767,
-30267=>5768,
-30279=>5769,
-30280=>5770,
-30278=>5771,
-30300=>5772,
-30296=>5773,
-30305=>5774,
-30306=>5775,
-30312=>5776,
-30313=>5777,
-30314=>5778,
-30311=>5779,
-30316=>5780,
-30320=>5781,
-30322=>5782,
-12136=>5783,
-30326=>5783,
-30328=>5784,
-30332=>5785,
-30336=>5786,
-30339=>5787,
-30344=>5788,
-30347=>5789,
-30350=>5790,
-30358=>5791,
-30355=>5792,
-30361=>5793,
-30362=>5794,
-30384=>5795,
-30388=>5796,
-30392=>5797,
-30393=>5798,
-30394=>5799,
-30402=>5800,
-30413=>5801,
-30422=>5802,
-30418=>5803,
-30430=>5804,
-30433=>5805,
-30437=>5806,
-30439=>5807,
-30442=>5808,
-34351=>5809,
-30459=>5810,
-30472=>5811,
-30471=>5812,
-30468=>5813,
-30505=>5814,
-30500=>5815,
-30494=>5816,
-30501=>5817,
-30502=>5818,
-30491=>5819,
-30519=>5820,
-30520=>5821,
-30535=>5822,
-30554=>5823,
-30568=>5824,
-30571=>5825,
-30555=>5826,
-30565=>5827,
-30591=>5828,
-30590=>5829,
-30585=>5830,
-30606=>5831,
-30603=>5832,
-30609=>5833,
-30624=>5834,
-30622=>5835,
-30640=>5836,
-30646=>5837,
-30649=>5838,
-30655=>5839,
-30652=>5840,
-30653=>5841,
-30651=>5842,
-30663=>5843,
-30669=>5844,
-30679=>5845,
-30682=>5846,
-30684=>5847,
-30691=>5848,
-30702=>5849,
-30716=>5850,
-30732=>5851,
-30738=>5852,
-31014=>5853,
-30752=>5854,
-31018=>5855,
-30789=>5856,
-30862=>5857,
-30836=>5858,
-30854=>5859,
-30844=>5860,
-30874=>5861,
-30860=>5862,
-30883=>5863,
-30901=>5864,
-30890=>5865,
-30895=>5866,
-30929=>5867,
-30918=>5868,
-30923=>5869,
-30932=>5870,
-30910=>5871,
-30908=>5872,
-30917=>5873,
-30922=>5874,
-30956=>5875,
-30951=>5876,
-30938=>5877,
-30973=>5878,
-30964=>5879,
-30983=>5880,
-30994=>5881,
-30993=>5882,
-31001=>5883,
-31020=>5884,
-31019=>5885,
-31040=>5886,
-31072=>5887,
-31063=>5888,
-31071=>5889,
-31066=>5890,
-31061=>5891,
-31059=>5892,
-31098=>5893,
-31103=>5894,
-31114=>5895,
-31133=>5896,
-31143=>5897,
-40779=>5898,
-31146=>5899,
-31150=>5900,
-31155=>5901,
-31161=>5902,
-31162=>5903,
-31177=>5904,
-31189=>5905,
-31207=>5906,
-31212=>5907,
-31201=>5908,
-31203=>5909,
-31240=>5910,
-31245=>5911,
-31256=>5912,
-31257=>5913,
-31264=>5914,
-31263=>5915,
-31104=>5916,
-31281=>5917,
-31291=>5918,
-31294=>5919,
-31287=>5920,
-31299=>5921,
-31319=>5922,
-31305=>5923,
-31329=>5924,
-31330=>5925,
-31337=>5926,
-40861=>5927,
-31344=>5928,
-31353=>5929,
-31357=>5930,
-31368=>5931,
-31383=>5932,
-31381=>5933,
-31384=>5934,
-31382=>5935,
-31401=>5936,
-31432=>5937,
-31408=>5938,
-31414=>5939,
-31429=>5940,
-31428=>5941,
-31423=>5942,
-36995=>5943,
-31431=>5944,
-31434=>5945,
-31437=>5946,
-31439=>5947,
-31445=>5948,
-31443=>5949,
-31449=>5950,
-31450=>5951,
-31453=>5952,
-31457=>5953,
-31458=>5954,
-31462=>5955,
-31469=>5956,
-31472=>5957,
-31490=>5958,
-31503=>5959,
-31498=>5960,
-31494=>5961,
-31539=>5962,
-31512=>5963,
-31513=>5964,
-31518=>5965,
-31541=>5966,
-31528=>5967,
-31542=>5968,
-31568=>5969,
-31610=>5970,
-31492=>5971,
-31565=>5972,
-31499=>5973,
-31564=>5974,
-31557=>5975,
-31605=>5976,
-31589=>5977,
-31604=>5978,
-31591=>5979,
-31600=>5980,
-31601=>5981,
-31596=>5982,
-31598=>5983,
-31645=>5984,
-31640=>5985,
-31647=>5986,
-31629=>5987,
-31644=>5988,
-31642=>5989,
-31627=>5990,
-31634=>5991,
-31631=>5992,
-31581=>5993,
-31641=>5994,
-31691=>5995,
-31681=>5996,
-31692=>5997,
-31695=>5998,
-31668=>5999,
-31686=>6000,
-31709=>6001,
-31721=>6002,
-31761=>6003,
-31764=>6004,
-31718=>6005,
-31717=>6006,
-31840=>6007,
-31744=>6008,
-31751=>6009,
-31763=>6010,
-31731=>6011,
-31735=>6012,
-31767=>6013,
-31757=>6014,
-31734=>6015,
-31779=>6016,
-31783=>6017,
-31786=>6018,
-31775=>6019,
-31799=>6020,
-31787=>6021,
-31805=>6022,
-31820=>6023,
-31811=>6024,
-31828=>6025,
-31823=>6026,
-31808=>6027,
-31824=>6028,
-31832=>6029,
-31839=>6030,
-31844=>6031,
-31830=>6032,
-31845=>6033,
-31852=>6034,
-31861=>6035,
-31875=>6036,
-31888=>6037,
-31908=>6038,
-31917=>6039,
-31906=>6040,
-31915=>6041,
-31905=>6042,
-31912=>6043,
-31923=>6044,
-31922=>6045,
-31921=>6046,
-31918=>6047,
-31929=>6048,
-31933=>6049,
-31936=>6050,
-31941=>6051,
-31938=>6052,
-31960=>6053,
-31954=>6054,
-31964=>6055,
-31970=>6056,
-39739=>6057,
-31983=>6058,
-31986=>6059,
-31988=>6060,
-31990=>6061,
-31994=>6062,
-32006=>6063,
-32002=>6064,
-32028=>6065,
-32021=>6066,
-32010=>6067,
-32069=>6068,
-32075=>6069,
-32046=>6070,
-32050=>6071,
-32063=>6072,
-32053=>6073,
-32070=>6074,
-32115=>6075,
-32086=>6076,
-32078=>6077,
-32114=>6078,
-32104=>6079,
-32110=>6080,
-32079=>6081,
-32099=>6082,
-32147=>6083,
-32137=>6084,
-32091=>6085,
-32143=>6086,
-32125=>6087,
-32155=>6088,
-32186=>6089,
-32174=>6090,
-32163=>6091,
-32181=>6092,
-32199=>6093,
-32189=>6094,
-32171=>6095,
-32317=>6096,
-32162=>6097,
-32175=>6098,
-32220=>6099,
-32184=>6100,
-32159=>6101,
-32176=>6102,
-32216=>6103,
-32221=>6104,
-32228=>6105,
-32222=>6106,
-32251=>6107,
-32242=>6108,
-32225=>6109,
-32261=>6110,
-32266=>6111,
-32291=>6112,
-32289=>6113,
-32274=>6114,
-32305=>6115,
-32287=>6116,
-32265=>6117,
-32267=>6118,
-32290=>6119,
-32326=>6120,
-32358=>6121,
-32315=>6122,
-32309=>6123,
-32313=>6124,
-32323=>6125,
-32311=>6126,
-32306=>6127,
-32314=>6128,
-32359=>6129,
-32349=>6130,
-32342=>6131,
-32350=>6132,
-32345=>6133,
-32346=>6134,
-32377=>6135,
-32362=>6136,
-32361=>6137,
-32380=>6138,
-32379=>6139,
-32387=>6140,
-32213=>6141,
-32381=>6142,
-36782=>6143,
-32383=>6144,
-32392=>6145,
-32393=>6146,
-32396=>6147,
-32402=>6148,
-32400=>6149,
-32403=>6150,
-32404=>6151,
-32406=>6152,
-32398=>6153,
-32411=>6154,
-32412=>6155,
-32568=>6156,
-32570=>6157,
-32581=>6158,
-32588=>6159,
-32589=>6160,
-32590=>6161,
-32592=>6162,
-12153=>6163,
-32593=>6163,
-32597=>6164,
-32596=>6165,
-32600=>6166,
-32607=>6167,
-32608=>6168,
-32616=>6169,
-32617=>6170,
-32615=>6171,
-32632=>6172,
-32642=>6173,
-32646=>6174,
-32643=>6175,
-32648=>6176,
-32647=>6177,
-32652=>6178,
-32660=>6179,
-32670=>6180,
-32669=>6181,
-32666=>6182,
-32675=>6183,
-32687=>6184,
-32690=>6185,
-32697=>6186,
-32686=>6187,
-32694=>6188,
-32696=>6189,
-35697=>6190,
-32709=>6191,
-32710=>6192,
-32714=>6193,
-32725=>6194,
-32724=>6195,
-32737=>6196,
-32742=>6197,
-32745=>6198,
-32755=>6199,
-32761=>6200,
-39132=>6201,
-32774=>6202,
-32772=>6203,
-32779=>6204,
-12158=>6205,
-32786=>6205,
-32792=>6206,
-32793=>6207,
-32796=>6208,
-32801=>6209,
-32808=>6210,
-32831=>6211,
-32827=>6212,
-32842=>6213,
-32838=>6214,
-32850=>6215,
-32856=>6216,
-32858=>6217,
-32863=>6218,
-32866=>6219,
-32872=>6220,
-32883=>6221,
-32882=>6222,
-32880=>6223,
-32886=>6224,
-32889=>6225,
-32893=>6226,
-12160=>6227,
-32895=>6227,
-32900=>6228,
-32902=>6229,
-32901=>6230,
-32923=>6231,
-32915=>6232,
-32922=>6233,
-32941=>6234,
-20880=>6235,
-32940=>6236,
-32987=>6237,
-32997=>6238,
-32985=>6239,
-32989=>6240,
-32964=>6241,
-32986=>6242,
-32982=>6243,
-33033=>6244,
-33007=>6245,
-33009=>6246,
-33051=>6247,
-33065=>6248,
-33059=>6249,
-33071=>6250,
-33099=>6251,
-38539=>6252,
-33094=>6253,
-33086=>6254,
-33107=>6255,
-33105=>6256,
-33020=>6257,
-33137=>6258,
-33134=>6259,
-33125=>6260,
-33126=>6261,
-33140=>6262,
-33155=>6263,
-33160=>6264,
-33162=>6265,
-33152=>6266,
-33154=>6267,
-33184=>6268,
-33173=>6269,
-33188=>6270,
-33187=>6271,
-33119=>6272,
-33171=>6273,
-33193=>6274,
-33200=>6275,
-33205=>6276,
-33214=>6277,
-33208=>6278,
-33213=>6279,
-33216=>6280,
-33218=>6281,
-33210=>6282,
-33225=>6283,
-33229=>6284,
-33233=>6285,
-33241=>6286,
-33240=>6287,
-33224=>6288,
-33242=>6289,
-33247=>6290,
-33248=>6291,
-33255=>6292,
-33274=>6293,
-33275=>6294,
-33278=>6295,
-33281=>6296,
-33282=>6297,
-33285=>6298,
-33287=>6299,
-33290=>6300,
-33293=>6301,
-33296=>6302,
-33302=>6303,
-33321=>6304,
-33323=>6305,
-33336=>6306,
-33331=>6307,
-33344=>6308,
-33369=>6309,
-33368=>6310,
-33373=>6311,
-33370=>6312,
-33375=>6313,
-33380=>6314,
-33378=>6315,
-33384=>6316,
-33386=>6317,
-33387=>6318,
-33326=>6319,
-33393=>6320,
-33399=>6321,
-12171=>6322,
-33400=>6322,
-33406=>6323,
-33421=>6324,
-33426=>6325,
-33451=>6326,
-33439=>6327,
-33467=>6328,
-33452=>6329,
-33505=>6330,
-33507=>6331,
-33503=>6332,
-33490=>6333,
-33524=>6334,
-33523=>6335,
-33530=>6336,
-33683=>6337,
-33539=>6338,
-33531=>6339,
-33529=>6340,
-33502=>6341,
-33542=>6342,
-33500=>6343,
-33545=>6344,
-33497=>6345,
-33589=>6346,
-33588=>6347,
-33558=>6348,
-33586=>6349,
-33585=>6350,
-33600=>6351,
-33593=>6352,
-33616=>6353,
-33605=>6354,
-33583=>6355,
-33579=>6356,
-33559=>6357,
-33560=>6358,
-33669=>6359,
-33690=>6360,
-33706=>6361,
-33695=>6362,
-33698=>6363,
-33686=>6364,
-33571=>6365,
-33678=>6366,
-33671=>6367,
-33674=>6368,
-33660=>6369,
-33717=>6370,
-33651=>6371,
-33653=>6372,
-33696=>6373,
-33673=>6374,
-33704=>6375,
-33780=>6376,
-33811=>6377,
-33771=>6378,
-33742=>6379,
-33789=>6380,
-33795=>6381,
-33752=>6382,
-33803=>6383,
-33729=>6384,
-33783=>6385,
-33799=>6386,
-33760=>6387,
-33778=>6388,
-33805=>6389,
-33826=>6390,
-33824=>6391,
-33725=>6392,
-33848=>6393,
-34054=>6394,
-33787=>6395,
-33901=>6396,
-33834=>6397,
-33852=>6398,
-34138=>6399,
-33924=>6400,
-33911=>6401,
-33899=>6402,
-33965=>6403,
-33902=>6404,
-33922=>6405,
-33897=>6406,
-33862=>6407,
-33836=>6408,
-33903=>6409,
-33913=>6410,
-33845=>6411,
-33994=>6412,
-33890=>6413,
-33977=>6414,
-33983=>6415,
-33951=>6416,
-34009=>6417,
-33997=>6418,
-33979=>6419,
-34010=>6420,
-34000=>6421,
-33985=>6422,
-33990=>6423,
-34006=>6424,
-33953=>6425,
-34081=>6426,
-34047=>6427,
-34036=>6428,
-34071=>6429,
-34072=>6430,
-34092=>6431,
-34079=>6432,
-34069=>6433,
-34068=>6434,
-34044=>6435,
-34112=>6436,
-34147=>6437,
-34136=>6438,
-34120=>6439,
-34113=>6440,
-34306=>6441,
-34123=>6442,
-34133=>6443,
-34176=>6444,
-34212=>6445,
-34184=>6446,
-34193=>6447,
-34186=>6448,
-34216=>6449,
-34157=>6450,
-34196=>6451,
-34203=>6452,
-34282=>6453,
-34183=>6454,
-34204=>6455,
-34167=>6456,
-34174=>6457,
-34192=>6458,
-34249=>6459,
-34234=>6460,
-34255=>6461,
-34233=>6462,
-34256=>6463,
-34261=>6464,
-34269=>6465,
-34277=>6466,
-34268=>6467,
-34297=>6468,
-34314=>6469,
-34323=>6470,
-34315=>6471,
-34302=>6472,
-34298=>6473,
-34310=>6474,
-34338=>6475,
-34330=>6476,
-34352=>6477,
-34367=>6478,
-12172=>6479,
-34381=>6479,
-20053=>6480,
-34388=>6481,
-34399=>6482,
-34407=>6483,
-34417=>6484,
-34451=>6485,
-34467=>6486,
-34473=>6487,
-34474=>6488,
-34443=>6489,
-34444=>6490,
-34486=>6491,
-34479=>6492,
-34500=>6493,
-34502=>6494,
-34480=>6495,
-34505=>6496,
-34851=>6497,
-34475=>6498,
-34516=>6499,
-34526=>6500,
-34537=>6501,
-34540=>6502,
-34527=>6503,
-34523=>6504,
-34543=>6505,
-34578=>6506,
-34566=>6507,
-34568=>6508,
-34560=>6509,
-34563=>6510,
-34555=>6511,
-34577=>6512,
-34569=>6513,
-34573=>6514,
-34553=>6515,
-34570=>6516,
-34612=>6517,
-34623=>6518,
-34615=>6519,
-34619=>6520,
-34597=>6521,
-34601=>6522,
-34586=>6523,
-34656=>6524,
-34655=>6525,
-34680=>6526,
-34636=>6527,
-34638=>6528,
-34676=>6529,
-34647=>6530,
-34664=>6531,
-34670=>6532,
-34649=>6533,
-34643=>6534,
-34659=>6535,
-34666=>6536,
-34821=>6537,
-34722=>6538,
-34719=>6539,
-34690=>6540,
-34735=>6541,
-34763=>6542,
-34749=>6543,
-34752=>6544,
-34768=>6545,
-38614=>6546,
-34731=>6547,
-34756=>6548,
-34739=>6549,
-34759=>6550,
-34758=>6551,
-34747=>6552,
-34799=>6553,
-34802=>6554,
-34784=>6555,
-34831=>6556,
-34829=>6557,
-34814=>6558,
-34806=>6559,
-34807=>6560,
-34830=>6561,
-34770=>6562,
-34833=>6563,
-34838=>6564,
-34837=>6565,
-34850=>6566,
-34849=>6567,
-34865=>6568,
-34870=>6569,
-34873=>6570,
-34855=>6571,
-34875=>6572,
-34884=>6573,
-34882=>6574,
-34898=>6575,
-34905=>6576,
-34910=>6577,
-34914=>6578,
-34923=>6579,
-34945=>6580,
-34942=>6581,
-34974=>6582,
-34933=>6583,
-34941=>6584,
-34997=>6585,
-34930=>6586,
-34946=>6587,
-34967=>6588,
-34962=>6589,
-34990=>6590,
-34969=>6591,
-34978=>6592,
-34957=>6593,
-34980=>6594,
-34992=>6595,
-35007=>6596,
-34993=>6597,
-35011=>6598,
-35012=>6599,
-35028=>6600,
-35032=>6601,
-35033=>6602,
-35037=>6603,
-35065=>6604,
-35074=>6605,
-35068=>6606,
-35060=>6607,
-35048=>6608,
-35058=>6609,
-35076=>6610,
-35084=>6611,
-35082=>6612,
-35091=>6613,
-35139=>6614,
-35102=>6615,
-35109=>6616,
-35114=>6617,
-35115=>6618,
-35137=>6619,
-35140=>6620,
-35131=>6621,
-35126=>6622,
-35128=>6623,
-35148=>6624,
-35101=>6625,
-35168=>6626,
-35166=>6627,
-35174=>6628,
-35172=>6629,
-35181=>6630,
-35178=>6631,
-35183=>6632,
-35188=>6633,
-35191=>6634,
-12177=>6635,
-35198=>6635,
-35203=>6636,
-35208=>6637,
-35210=>6638,
-35219=>6639,
-35224=>6640,
-35233=>6641,
-35241=>6642,
-35238=>6643,
-35244=>6644,
-35247=>6645,
-35250=>6646,
-35258=>6647,
-35261=>6648,
-35263=>6649,
-35264=>6650,
-35290=>6651,
-35292=>6652,
-35293=>6653,
-35303=>6654,
-35316=>6655,
-35320=>6656,
-35331=>6657,
-35350=>6658,
-35344=>6659,
-35340=>6660,
-35355=>6661,
-35357=>6662,
-35365=>6663,
-35382=>6664,
-35393=>6665,
-35419=>6666,
-35410=>6667,
-35398=>6668,
-35400=>6669,
-35452=>6670,
-35437=>6671,
-35436=>6672,
-35426=>6673,
-35461=>6674,
-35458=>6675,
-35460=>6676,
-35496=>6677,
-35489=>6678,
-35473=>6679,
-35493=>6680,
-35494=>6681,
-35482=>6682,
-35491=>6683,
-35524=>6684,
-35533=>6685,
-35522=>6686,
-35546=>6687,
-35563=>6688,
-35571=>6689,
-35559=>6690,
-35556=>6691,
-35569=>6692,
-35604=>6693,
-35552=>6694,
-35554=>6695,
-35575=>6696,
-35550=>6697,
-35547=>6698,
-35596=>6699,
-35591=>6700,
-35610=>6701,
-35553=>6702,
-35606=>6703,
-35600=>6704,
-35607=>6705,
-35616=>6706,
-35635=>6707,
-38827=>6708,
-35622=>6709,
-35627=>6710,
-35646=>6711,
-35624=>6712,
-35649=>6713,
-35660=>6714,
-35663=>6715,
-35662=>6716,
-35657=>6717,
-35670=>6718,
-35675=>6719,
-35674=>6720,
-35691=>6721,
-35679=>6722,
-35692=>6723,
-35695=>6724,
-35700=>6725,
-35709=>6726,
-35712=>6727,
-35724=>6728,
-35726=>6729,
-35730=>6730,
-35731=>6731,
-35734=>6732,
-35737=>6733,
-35738=>6734,
-35898=>6735,
-35905=>6736,
-35903=>6737,
-35912=>6738,
-35916=>6739,
-35918=>6740,
-35920=>6741,
-12183=>6742,
-35925=>6742,
-35938=>6743,
-35948=>6744,
-12184=>6745,
-35960=>6745,
-35962=>6746,
-35970=>6747,
-35977=>6748,
-35973=>6749,
-35978=>6750,
-35981=>6751,
-35982=>6752,
-35988=>6753,
-35964=>6754,
-35992=>6755,
-25117=>6756,
-36013=>6757,
-36010=>6758,
-36029=>6759,
-36018=>6760,
-36019=>6761,
-36014=>6762,
-36022=>6763,
-36040=>6764,
-36033=>6765,
-36068=>6766,
-36067=>6767,
-36058=>6768,
-36093=>6769,
-36090=>6770,
-36091=>6771,
-36100=>6772,
-36101=>6773,
-36106=>6774,
-36103=>6775,
-36111=>6776,
-36109=>6777,
-36112=>6778,
-40782=>6779,
-36115=>6780,
-36045=>6781,
-36116=>6782,
-36118=>6783,
-36199=>6784,
-36205=>6785,
-36209=>6786,
-36211=>6787,
-36225=>6788,
-36249=>6789,
-36290=>6790,
-36286=>6791,
-36282=>6792,
-36303=>6793,
-36314=>6794,
-36310=>6795,
-36300=>6796,
-36315=>6797,
-36299=>6798,
-36330=>6799,
-36331=>6800,
-36319=>6801,
-36323=>6802,
-36348=>6803,
-36360=>6804,
-36361=>6805,
-36351=>6806,
-36381=>6807,
-36382=>6808,
-36368=>6809,
-36383=>6810,
-36418=>6811,
-36405=>6812,
-36400=>6813,
-36404=>6814,
-36426=>6815,
-36423=>6816,
-36425=>6817,
-36428=>6818,
-36432=>6819,
-36424=>6820,
-36441=>6821,
-36452=>6822,
-36448=>6823,
-36394=>6824,
-36451=>6825,
-36437=>6826,
-36470=>6827,
-36466=>6828,
-36476=>6829,
-36481=>6830,
-36487=>6831,
-36485=>6832,
-36484=>6833,
-36491=>6834,
-36490=>6835,
-36499=>6836,
-36497=>6837,
-36500=>6838,
-36505=>6839,
-36522=>6840,
-36513=>6841,
-36524=>6842,
-36528=>6843,
-36550=>6844,
-36529=>6845,
-36542=>6846,
-36549=>6847,
-36552=>6848,
-36555=>6849,
-36571=>6850,
-36579=>6851,
-36604=>6852,
-36603=>6853,
-36587=>6854,
-36606=>6855,
-36618=>6856,
-36613=>6857,
-36629=>6858,
-36626=>6859,
-36633=>6860,
-36627=>6861,
-36636=>6862,
-36639=>6863,
-36635=>6864,
-36620=>6865,
-36646=>6866,
-36659=>6867,
-36667=>6868,
-36665=>6869,
-36677=>6870,
-36674=>6871,
-36670=>6872,
-36684=>6873,
-36681=>6874,
-36678=>6875,
-36686=>6876,
-36695=>6877,
-36700=>6878,
-36706=>6879,
-36707=>6880,
-36708=>6881,
-36764=>6882,
-36767=>6883,
-36771=>6884,
-36781=>6885,
-36783=>6886,
-36791=>6887,
-36826=>6888,
-36837=>6889,
-36834=>6890,
-36842=>6891,
-36847=>6892,
-36999=>6893,
-36852=>6894,
-36869=>6895,
-36857=>6896,
-36858=>6897,
-36881=>6898,
-36885=>6899,
-36897=>6900,
-36877=>6901,
-36894=>6902,
-36886=>6903,
-36875=>6904,
-36903=>6905,
-36918=>6906,
-36917=>6907,
-36921=>6908,
-36856=>6909,
-36943=>6910,
-36944=>6911,
-36945=>6912,
-36946=>6913,
-36878=>6914,
-36937=>6915,
-36926=>6916,
-36950=>6917,
-36952=>6918,
-36958=>6919,
-36968=>6920,
-36975=>6921,
-36982=>6922,
-38568=>6923,
-36978=>6924,
-36994=>6925,
-36989=>6926,
-36993=>6927,
-36992=>6928,
-37002=>6929,
-37001=>6930,
-37007=>6931,
-37032=>6932,
-37039=>6933,
-37041=>6934,
-37045=>6935,
-37090=>6936,
-37092=>6937,
-25160=>6938,
-37083=>6939,
-37122=>6940,
-37138=>6941,
-37145=>6942,
-37170=>6943,
-37168=>6944,
-37194=>6945,
-37206=>6946,
-37208=>6947,
-37219=>6948,
-37221=>6949,
-37225=>6950,
-37235=>6951,
-37234=>6952,
-37259=>6953,
-37257=>6954,
-37250=>6955,
-37282=>6956,
-37291=>6957,
-37295=>6958,
-37290=>6959,
-37301=>6960,
-37300=>6961,
-37306=>6962,
-37312=>6963,
-37313=>6964,
-37321=>6965,
-37323=>6966,
-37328=>6967,
-37334=>6968,
-37343=>6969,
-37345=>6970,
-37339=>6971,
-37372=>6972,
-37365=>6973,
-37366=>6974,
-37406=>6975,
-37375=>6976,
-37396=>6977,
-37420=>6978,
-37397=>6979,
-37393=>6980,
-37470=>6981,
-37463=>6982,
-37445=>6983,
-37449=>6984,
-37476=>6985,
-37448=>6986,
-37525=>6987,
-37439=>6988,
-37451=>6989,
-37456=>6990,
-37532=>6991,
-37526=>6992,
-37523=>6993,
-37531=>6994,
-37466=>6995,
-37583=>6996,
-37561=>6997,
-37559=>6998,
-37609=>6999,
-37647=>7000,
-37626=>7001,
-37700=>7002,
-37678=>7003,
-37657=>7004,
-37666=>7005,
-37658=>7006,
-37667=>7007,
-37690=>7008,
-37685=>7009,
-37691=>7010,
-37724=>7011,
-37728=>7012,
-37756=>7013,
-37742=>7014,
-37718=>7015,
-37808=>7016,
-37804=>7017,
-37805=>7018,
-37780=>7019,
-37817=>7020,
-37846=>7021,
-37847=>7022,
-37864=>7023,
-37861=>7024,
-37848=>7025,
-37827=>7026,
-37853=>7027,
-37840=>7028,
-37832=>7029,
-37860=>7030,
-37914=>7031,
-37908=>7032,
-37907=>7033,
-37891=>7034,
-37895=>7035,
-37904=>7036,
-37942=>7037,
-37931=>7038,
-37941=>7039,
-37921=>7040,
-37946=>7041,
-37953=>7042,
-37970=>7043,
-37956=>7044,
-37979=>7045,
-37984=>7046,
-37986=>7047,
-37982=>7048,
-37994=>7049,
-37417=>7050,
-38000=>7051,
-38005=>7052,
-38007=>7053,
-38013=>7054,
-37978=>7055,
-38012=>7056,
-38014=>7057,
-38017=>7058,
-38015=>7059,
-38274=>7060,
-38279=>7061,
-38282=>7062,
-38292=>7063,
-38294=>7064,
-38296=>7065,
-38297=>7066,
-38304=>7067,
-38312=>7068,
-38311=>7069,
-38317=>7070,
-38332=>7071,
-38331=>7072,
-38329=>7073,
-38334=>7074,
-38346=>7075,
-28662=>7076,
-38339=>7077,
-38349=>7078,
-38348=>7079,
-38357=>7080,
-38356=>7081,
-38358=>7082,
-38364=>7083,
-38369=>7084,
-38373=>7085,
-38370=>7086,
-38433=>7087,
-38440=>7088,
-38446=>7089,
-38447=>7090,
-38466=>7091,
-38476=>7092,
-38479=>7093,
-38475=>7094,
-38519=>7095,
-38492=>7096,
-38494=>7097,
-38493=>7098,
-38495=>7099,
-38502=>7100,
-38514=>7101,
-38508=>7102,
-38541=>7103,
-38552=>7104,
-38549=>7105,
-38551=>7106,
-38570=>7107,
-38567=>7108,
-38577=>7109,
-38578=>7110,
-38576=>7111,
-38580=>7112,
-12202=>7113,
-38582=>7113,
-38584=>7114,
-12203=>7115,
-38585=>7115,
-38606=>7116,
-38603=>7117,
-38601=>7118,
-38605=>7119,
-35149=>7120,
-38620=>7121,
-38669=>7122,
-38613=>7123,
-38649=>7124,
-38660=>7125,
-38662=>7126,
-38664=>7127,
-38675=>7128,
-38670=>7129,
-38673=>7130,
-38671=>7131,
-38678=>7132,
-38681=>7133,
-38692=>7134,
-38698=>7135,
-38704=>7136,
-38713=>7137,
-38717=>7138,
-38718=>7139,
-38724=>7140,
-38726=>7141,
-38728=>7142,
-38722=>7143,
-38729=>7144,
-38748=>7145,
-38752=>7146,
-38756=>7147,
-38758=>7148,
-38760=>7149,
-21202=>7150,
-38763=>7151,
-38769=>7152,
-38777=>7153,
-38789=>7154,
-38780=>7155,
-38785=>7156,
-38778=>7157,
-38790=>7158,
-38795=>7159,
-38799=>7160,
-38800=>7161,
-38812=>7162,
-38824=>7163,
-38822=>7164,
-38819=>7165,
-38835=>7166,
-38836=>7167,
-38851=>7168,
-38854=>7169,
-38856=>7170,
-12209=>7171,
-38859=>7171,
-38876=>7172,
-12210=>7173,
-38893=>7173,
-40783=>7174,
-38898=>7175,
-31455=>7176,
-38902=>7177,
-38901=>7178,
-38927=>7179,
-38924=>7180,
-38968=>7181,
-38948=>7182,
-38945=>7183,
-38967=>7184,
-38973=>7185,
-38982=>7186,
-38991=>7187,
-38987=>7188,
-39019=>7189,
-39023=>7190,
-39024=>7191,
-39025=>7192,
-39028=>7193,
-39027=>7194,
-39082=>7195,
-39087=>7196,
-39089=>7197,
-39094=>7198,
-39108=>7199,
-39107=>7200,
-39110=>7201,
-39145=>7202,
-39147=>7203,
-39171=>7204,
-39177=>7205,
-39186=>7206,
-39188=>7207,
-39192=>7208,
-39201=>7209,
-39197=>7210,
-39198=>7211,
-39204=>7212,
-39200=>7213,
-39212=>7214,
-39214=>7215,
-39229=>7216,
-39230=>7217,
-39234=>7218,
-39241=>7219,
-39237=>7220,
-39248=>7221,
-39243=>7222,
-39249=>7223,
-39250=>7224,
-39244=>7225,
-39253=>7226,
-39319=>7227,
-39320=>7228,
-39333=>7229,
-39341=>7230,
-39342=>7231,
-39356=>7232,
-39391=>7233,
-39387=>7234,
-39389=>7235,
-39384=>7236,
-39377=>7237,
-39405=>7238,
-39406=>7239,
-39409=>7240,
-39410=>7241,
-39419=>7242,
-39416=>7243,
-39425=>7244,
-39439=>7245,
-39429=>7246,
-39394=>7247,
-39449=>7248,
-39467=>7249,
-39479=>7250,
-39493=>7251,
-39490=>7252,
-39488=>7253,
-39491=>7254,
-39486=>7255,
-39509=>7256,
-39501=>7257,
-39515=>7258,
-39511=>7259,
-39519=>7260,
-39522=>7261,
-39525=>7262,
-39524=>7263,
-39529=>7264,
-39531=>7265,
-39530=>7266,
-39597=>7267,
-39600=>7268,
-39612=>7269,
-39616=>7270,
-39631=>7271,
-39633=>7272,
-39635=>7273,
-39636=>7274,
-39646=>7275,
-12221=>7276,
-39647=>7276,
-39650=>7277,
-39651=>7278,
-39654=>7279,
-39663=>7280,
-39659=>7281,
-39662=>7282,
-39668=>7283,
-39665=>7284,
-39671=>7285,
-39675=>7286,
-39686=>7287,
-39704=>7288,
-39706=>7289,
-39711=>7290,
-39714=>7291,
-39715=>7292,
-12222=>7293,
-39717=>7293,
-39719=>7294,
-39720=>7295,
-39721=>7296,
-39722=>7297,
-39726=>7298,
-12223=>7299,
-39727=>7299,
-39730=>7300,
-12224=>7300,
-39748=>7301,
-39747=>7302,
-39759=>7303,
-39757=>7304,
-39758=>7305,
-39761=>7306,
-39768=>7307,
-39796=>7308,
-39827=>7309,
-39811=>7310,
-39825=>7311,
-39830=>7312,
-39831=>7313,
-39839=>7314,
-39840=>7315,
-39848=>7316,
-39860=>7317,
-39872=>7318,
-39882=>7319,
-39865=>7320,
-39878=>7321,
-39887=>7322,
-39889=>7323,
-39890=>7324,
-39907=>7325,
-39906=>7326,
-39908=>7327,
-39892=>7328,
-39905=>7329,
-39994=>7330,
-39922=>7331,
-39921=>7332,
-39920=>7333,
-39957=>7334,
-39956=>7335,
-39945=>7336,
-39955=>7337,
-39948=>7338,
-39942=>7339,
-39944=>7340,
-39954=>7341,
-39946=>7342,
-39940=>7343,
-39982=>7344,
-39963=>7345,
-39973=>7346,
-39972=>7347,
-39969=>7348,
-39984=>7349,
-40007=>7350,
-39986=>7351,
-40006=>7352,
-39998=>7353,
-40026=>7354,
-40032=>7355,
-40039=>7356,
-40054=>7357,
-40056=>7358,
-40167=>7359,
-40172=>7360,
-40176=>7361,
-40201=>7362,
-40200=>7363,
-40171=>7364,
-40195=>7365,
-40198=>7366,
-40234=>7367,
-40230=>7368,
-40367=>7369,
-40227=>7370,
-40223=>7371,
-40260=>7372,
-40213=>7373,
-40210=>7374,
-40257=>7375,
-40255=>7376,
-40254=>7377,
-40262=>7378,
-40264=>7379,
-40285=>7380,
-40286=>7381,
-40292=>7382,
-40273=>7383,
-40272=>7384,
-40281=>7385,
-40306=>7386,
-40329=>7387,
-40327=>7388,
-40363=>7389,
-40303=>7390,
-40314=>7391,
-40346=>7392,
-40356=>7393,
-40361=>7394,
-40370=>7395,
-40388=>7396,
-40385=>7397,
-40379=>7398,
-40376=>7399,
-40378=>7400,
-40390=>7401,
-40399=>7402,
-40386=>7403,
-40409=>7404,
-40403=>7405,
-40440=>7406,
-40422=>7407,
-40429=>7408,
-40431=>7409,
-40445=>7410,
-40474=>7411,
-40475=>7412,
-40478=>7413,
-12228=>7414,
-40565=>7414,
-40569=>7415,
-40573=>7416,
-40577=>7417,
-40584=>7418,
-40587=>7419,
-40588=>7420,
-40594=>7421,
-40597=>7422,
-40593=>7423,
-40605=>7424,
-12230=>7425,
-40613=>7425,
-40617=>7426,
-40632=>7427,
-40618=>7428,
-40621=>7429,
-38753=>7430,
-40652=>7431,
-40654=>7432,
-40655=>7433,
-40656=>7434,
-40660=>7435,
-40668=>7436,
-40670=>7437,
-40669=>7438,
-40672=>7439,
-40677=>7440,
-40680=>7441,
-40687=>7442,
-40692=>7443,
-40694=>7444,
-40695=>7445,
-12235=>7446,
-40697=>7446,
-40699=>7447,
-40700=>7448,
-12236=>7449,
-40701=>7449,
-40711=>7450,
-40712=>7451,
-30391=>7452,
-40725=>7453,
-40737=>7454,
-40748=>7455,
-40766=>7456,
-40778=>7457,
-12241=>7457,
-40786=>7458,
-12242=>7458,
-40788=>7459,
-40803=>7460,
-40799=>7461,
-40800=>7462,
-40801=>7463,
-40806=>7464,
-40807=>7465,
-40812=>7466,
-40810=>7467,
-40823=>7468,
-40818=>7469,
-40822=>7470,
-40853=>7471,
-40860=>7472,
-12244=>7472,
-40864=>7473,
-12245=>7473,
-22575=>7474,
-27079=>7475,
-36953=>7476,
-29796=>7477,
-9472=>7479,
-9473=>7480,
-9474=>7481,
-9475=>7482,
-9476=>7483,
-9477=>7484,
-9478=>7485,
-9479=>7486,
-9480=>7487,
-9481=>7488,
-9482=>7489,
-9483=>7490,
-9484=>7491,
-9485=>7492,
-9486=>7493,
-9487=>7494,
-9488=>7495,
-9489=>7496,
-9490=>7497,
-9491=>7498,
-9492=>7499,
-9493=>7500,
-9494=>7501,
-9495=>7502,
-9496=>7503,
-9497=>7504,
-9498=>7505,
-9499=>7506,
-9500=>7507,
-9501=>7508,
-9502=>7509,
-9503=>7510,
-9504=>7511,
-9505=>7512,
-9506=>7513,
-9507=>7514,
-9508=>7515,
-9509=>7516,
-9510=>7517,
-9511=>7518,
-9512=>7519,
-9513=>7520,
-9514=>7521,
-9515=>7522,
-9516=>7523,
-9517=>7524,
-9518=>7525,
-9519=>7526,
-9520=>7527,
-9521=>7528,
-9522=>7529,
-9523=>7530,
-9524=>7531,
-9525=>7532,
-9526=>7533,
-9527=>7534,
-9528=>7535,
-9529=>7536,
-9530=>7537,
-9531=>7538,
-9532=>7539,
-9533=>7540,
-9534=>7541,
-9535=>7542,
-9536=>7543,
-9537=>7544,
-9538=>7545,
-9539=>7546,
-9540=>7547,
-9541=>7548,
-9542=>7549,
-9543=>7550,
-9544=>7551,
-9545=>7552,
-9546=>7553,
-9547=>7554,
-9312=>7555,
-9313=>7556,
-9314=>7557,
-9315=>7558,
-9316=>7559,
-9317=>7560,
-9318=>7561,
-9319=>7562,
-9320=>7563,
-9321=>7564,
-9322=>7565,
-9323=>7566,
-9324=>7567,
-9325=>7568,
-9326=>7569,
-9327=>7570,
-9328=>7571,
-9329=>7572,
-9330=>7573,
-9331=>7574,
-8544=>7575,
-8545=>7576,
-8546=>7577,
-8547=>7578,
-8548=>7579,
-8549=>7580,
-8550=>7581,
-8551=>7582,
-8552=>7583,
-8553=>7584,
-13129=>7585,
-13076=>7586,
-13133=>7588,
-13095=>7590,
-13110=>7592,
-13137=>7593,
-13069=>7595,
-13094=>7596,
-13099=>7598,
-13130=>7599,
-13212=>7601,
-13213=>7602,
-13214=>7603,
-13198=>7604,
-13199=>7605,
-13252=>7606,
-13217=>7607,
-12317=>7608,
-12319=>7609,
-8470=>7610,
-13261=>7611,
-12964=>7613,
-12965=>7614,
-12966=>7615,
-12967=>7616,
-12968=>7617,
-12849=>7618,
-12850=>7619,
-12857=>7620,
-13182=>7621,
-13181=>7622,
-13180=>7623,
-8750=>7624,
-8721=>7625,
-8735=>7629,
-8895=>7630,
-21854=>7633,
-167133=>7641,
-28976=>7644,
-40407=>7646,
-64054=>7651,
-22169=>7654,
-15694=>7655,
-20448=>7660,
-36544=>7663,
-194797=>7665,
-153716=>7670,
-32363=>7671,
-33606=>7672,
-167670=>7673,
-40572=>7677,
-26171=>7680,
-40628=>7682,
-26629=>7687,
-23650=>7693,
-194780=>7695,
-32353=>7697,
-64070=>7700,
-34083=>7706,
-37292=>7707,
-34796=>7715,
-25620=>7724,
-39506=>7727,
-64074=>7732,
-194692=>7734,
-31774=>7739,
-64016=>7746,
-25681=>7747,
-63980=>7750,
-22625=>7751,
-39002=>7752,
-194679=>7754,
-31153=>7758,
-28678=>7760,
-22218=>7770,
-21085=>7774,
-28497=>7776,
-37297=>7777,
-64106=>7788,
-38960=>7795,
-40629=>7797,
-33802=>7807,
-63939=>7808,
-63890=>7809,
-63891=>7810,
-63897=>7811,
-34847=>7813,
-194575=>7814,
-194771=>7816,
-194584=>7817,
-137754=>7825,
-23643=>7826,
-25890=>7831,
-26618=>7834,
-26766=>7836,
-148432=>7838,
-194848=>7839,
-34110=>7861,
-30562=>7877,
-65041=>7887,
-65042=>7888,
-65075=>7890,
-65073=>7892,
-65074=>7893,
-8285=>7897,
-65049=>7897,
-8282=>7898,
-65072=>7898,
-65077=>7899,
-65078=>7900,
-65081=>7901,
-65082=>7902,
-65095=>7903,
-65096=>7904,
-65079=>7905,
-65080=>7906,
-65087=>7907,
-65088=>7908,
-65085=>7909,
-65086=>7910,
-65089=>7911,
-65090=>7912,
-65091=>7913,
-65092=>7914,
-65083=>7915,
-65084=>7916,
-12436=>7958,
-12437=>7959,
-12438=>7960,
-22099=>7963,
-65508=>8005,
-65287=>8006,
-65282=>8007,
-9665=>8009,
-9655=>8010,
-8681=>8011,
-8679=>8012,
-8678=>8013,
-8680=>8014,
-9634=>8015,
-9831=>8016,
-9825=>8017,
-9828=>8018,
-9826=>8019,
-13216=>8020,
-13218=>8021,
-13220=>8022,
-13221=>8023,
-13207=>8024,
-8467=>8025,
-13208=>8026,
-13235=>8027,
-13234=>8028,
-13233=>8029,
-13232=>8030,
-13189=>8031,
-13190=>8032,
-13191=>8033,
-13259=>8034,
-13200=>8035,
-13268=>8036,
-13206=>8037,
-13090=>8038,
-13078=>8039,
-13080=>8040,
-13077=>8041,
-13059=>8042,
-13091=>8043,
-13143=>8044,
-13122=>8045,
-13113=>8046,
-13115=>8047,
-13056=>8048,
-13105=>8049,
-13127=>8050,
-13086=>8051,
-13098=>8052,
-13183=>8054,
-8481=>8055,
-9742=>8056,
-12342=>8057,
-12320=>8058,
-9352=>8062,
-9353=>8063,
-9354=>8064,
-9355=>8065,
-9356=>8066,
-9357=>8067,
-9358=>8068,
-9359=>8069,
-9360=>8070,
-9332=>8071,
-9333=>8072,
-9334=>8073,
-9335=>8074,
-9336=>8075,
-9337=>8076,
-9338=>8077,
-9339=>8078,
-9340=>8079,
-9341=>8080,
-9342=>8081,
-9343=>8082,
-9344=>8083,
-9345=>8084,
-9346=>8085,
-9347=>8086,
-9348=>8087,
-9349=>8088,
-9350=>8089,
-9351=>8090,
-12881=>8091,
-8560=>8092,
-8561=>8093,
-8562=>8094,
-8563=>8095,
-8564=>8096,
-8565=>8097,
-8566=>8098,
-8567=>8099,
-8568=>8100,
-8569=>8101,
-12882=>8102,
-12883=>8103,
-12884=>8104,
-12885=>8105,
-12886=>8106,
-12887=>8107,
-12888=>8108,
-12889=>8109,
-12890=>8110,
-12891=>8111,
-9372=>8112,
-9373=>8113,
-9374=>8114,
-9375=>8115,
-9376=>8116,
-9377=>8117,
-9378=>8118,
-9379=>8119,
-9380=>8120,
-9381=>8121,
-9382=>8122,
-9383=>8123,
-9384=>8124,
-9385=>8125,
-9386=>8126,
-9387=>8127,
-9388=>8128,
-9389=>8129,
-9390=>8130,
-9391=>8131,
-9392=>8132,
-9393=>8133,
-9394=>8134,
-9395=>8135,
-9396=>8136,
-9397=>8137,
-12867=>8138,
-12861=>8139,
-12863=>8140,
-12852=>8141,
-12856=>8142,
-12851=>8143,
-12860=>8144,
-12866=>8145,
-12862=>8146,
-12854=>8147,
-12853=>8148,
-12859=>8149,
-12864=>8150,
-12858=>8151,
-12976=>8152,
-12973=>8153,
-12969=>8154,
-12975=>8155,
-12948=>8156,
-12970=>8157,
-12952=>8158,
-12971=>8159,
-12946=>8160,
-12945=>8161,
-12947=>8162,
-12972=>8163,
-12974=>8164,
-12950=>8165,
-9131=>8174,
-9132=>8175,
-9133=>8176,
-9127=>8178,
-9128=>8179,
-9129=>8180,
-13260=>8182,
-13061=>8183,
-13215=>8186,
-13219=>8187,
-13222=>8188,
-12958=>8191,
-13192=>8192,
-13193=>8193,
-13256=>8194,
-8749=>8195,
-12848=>8197,
-12842=>8198,
-12843=>8199,
-12844=>8200,
-12845=>8201,
-12846=>8202,
-12847=>8203,
-12855=>8204,
-12865=>8205,
-10145=>8206,
-11013=>8207,
-11014=>8208,
-11015=>8209,
-9673=>8210,
-9824=>8211,
-9829=>8212,
-9827=>8213,
-9830=>8214,
-9728=>8215,
-9729=>8216,
-9730=>8217,
-9731=>8218,
-9758=>8219,
-9756=>8220,
-9757=>8221,
-9759=>8222,
-12953=>8223,
-9450=>8224,
-8554=>8225,
-8555=>8226,
-9601=>8230,
-9602=>8231,
-9603=>8232,
-9604=>8233,
-9605=>8234,
-9606=>8235,
-9607=>8236,
-9608=>8237,
-9615=>8238,
-9614=>8239,
-9613=>8240,
-9612=>8241,
-9611=>8242,
-9610=>8243,
-9609=>8244,
-9620=>8245,
-9621=>8246,
-9581=>8247,
-9582=>8248,
-9584=>8249,
-9583=>8250,
-9552=>8251,
-9566=>8252,
-9578=>8253,
-9569=>8254,
-9698=>8255,
-9699=>8256,
-9701=>8257,
-9700=>8258,
-9585=>8261,
-9586=>8262,
-9587=>8263,
-65040=>8268,
-20956=>8284,
-29081=>8285,
-10102=>8286,
-10103=>8287,
-10104=>8288,
-10105=>8289,
-10106=>8290,
-10107=>8291,
-10108=>8292,
-10109=>8293,
-10110=>8294,
-8570=>8298,
-8571=>8299,
-8575=>8303,
-8458=>8304,
-8457=>8305,
-8507=>8307,
-12292=>8308,
-8646=>8309,
-8644=>8310,
-8645=>8311,
-12535=>8313,
-12536=>8314,
-12537=>8315,
-12538=>8316,
-12957=>8319,
-13179=>8323,
-13107=>8327,
-13134=>8328,
-32394=>8359,
-35100=>8360,
-37704=>8361,
-37512=>8362,
-34012=>8363,
-20425=>8364,
-28859=>8365,
-26161=>8366,
-26824=>8367,
-37625=>8368,
-26363=>8369,
-24389=>8370,
-12033=>8371,
-20008=>8371,
-20193=>8372,
-20220=>8373,
-20224=>8374,
-20227=>8375,
-20281=>8376,
-20310=>8377,
-20370=>8378,
-20362=>8379,
-20378=>8380,
-20372=>8381,
-20429=>8382,
-20544=>8383,
-20514=>8384,
-20479=>8385,
-20510=>8386,
-20550=>8387,
-20592=>8388,
-20546=>8389,
-20628=>8390,
-20724=>8391,
-20696=>8392,
-20810=>8393,
-20836=>8394,
-20893=>8395,
-20926=>8396,
-20972=>8397,
-21013=>8398,
-21148=>8399,
-21158=>8400,
-21184=>8401,
-21211=>8402,
-21248=>8403,
-21284=>8405,
-21362=>8406,
-21395=>8407,
-21426=>8408,
-21469=>8409,
-64014=>8410,
-21660=>8411,
-21642=>8412,
-21673=>8413,
-21759=>8414,
-21894=>8415,
-22361=>8416,
-22373=>8417,
-22444=>8418,
-22472=>8419,
-22471=>8420,
-64015=>8421,
-22686=>8423,
-22706=>8424,
-22795=>8425,
-22867=>8426,
-22875=>8427,
-22877=>8428,
-22883=>8429,
-22948=>8430,
-22970=>8431,
-23382=>8432,
-23488=>8433,
-29999=>8434,
-23512=>8435,
-23582=>8437,
-23718=>8438,
-23738=>8439,
-23797=>8440,
-23847=>8441,
-23891=>8442,
-23874=>8444,
-23917=>8445,
-23992=>8446,
-23993=>8447,
-24016=>8448,
-24353=>8449,
-24372=>8450,
-24423=>8451,
-24503=>8452,
-24542=>8453,
-24669=>8454,
-24709=>8455,
-24714=>8456,
-24798=>8457,
-24789=>8458,
-24864=>8459,
-24818=>8460,
-24849=>8461,
-24887=>8462,
-24880=>8463,
-24984=>8464,
-25107=>8465,
-25254=>8466,
-25589=>8467,
-25696=>8468,
-25757=>8469,
-25806=>8470,
-25934=>8471,
-26112=>8472,
-26133=>8473,
-26121=>8474,
-26158=>8475,
-26148=>8477,
-26213=>8478,
-26199=>8479,
-26201=>8480,
-64018=>8481,
-26227=>8482,
-26265=>8483,
-26272=>8484,
-26290=>8485,
-26303=>8486,
-26362=>8487,
-26382=>8488,
-26470=>8490,
-26555=>8491,
-26706=>8492,
-26560=>8493,
-26692=>8495,
-26831=>8496,
-64019=>8497,
-26984=>8498,
-64020=>8499,
-27032=>8500,
-27106=>8501,
-27184=>8502,
-27243=>8503,
-27206=>8504,
-27251=>8505,
-27262=>8506,
-27362=>8507,
-27364=>8508,
-27606=>8509,
-27711=>8510,
-27740=>8511,
-27782=>8512,
-27759=>8513,
-27866=>8514,
-27908=>8515,
-28039=>8516,
-28015=>8517,
-28054=>8518,
-28076=>8519,
-28111=>8520,
-28152=>8521,
-28146=>8522,
-28156=>8523,
-28217=>8524,
-28252=>8525,
-28199=>8526,
-28220=>8527,
-28351=>8528,
-28552=>8529,
-28597=>8530,
-28661=>8531,
-28677=>8532,
-28679=>8533,
-28712=>8534,
-28805=>8535,
-28843=>8536,
-28943=>8537,
-28932=>8538,
-29020=>8539,
-28998=>8540,
-28999=>8541,
-29121=>8543,
-29182=>8544,
-29361=>8545,
-29374=>8546,
-29476=>8547,
-64022=>8548,
-29559=>8549,
-29629=>8550,
-29641=>8551,
-29654=>8552,
-29667=>8553,
-29650=>8554,
-29703=>8555,
-29685=>8556,
-29734=>8557,
-29738=>8558,
-29737=>8559,
-29742=>8560,
-29833=>8562,
-29855=>8563,
-29953=>8564,
-30063=>8565,
-30338=>8566,
-30364=>8567,
-30366=>8568,
-30363=>8569,
-30374=>8570,
-64023=>8571,
-30534=>8572,
-21167=>8573,
-30753=>8574,
-30798=>8575,
-30820=>8576,
-30842=>8577,
-31024=>8578,
-64024=>8579,
-64025=>8580,
-64026=>8581,
-31124=>8582,
-64027=>8583,
-31131=>8584,
-31441=>8585,
-31463=>8586,
-64028=>8587,
-31467=>8588,
-31646=>8589,
-64029=>8590,
-32072=>8591,
-32183=>8593,
-32160=>8594,
-32214=>8595,
-32338=>8596,
-32583=>8597,
-32673=>8598,
-64030=>8599,
-33537=>8600,
-33634=>8601,
-33663=>8602,
-33735=>8603,
-33782=>8604,
-33864=>8605,
-33972=>8606,
-34131=>8607,
-34137=>8608,
-34155=>8609,
-64031=>8610,
-34224=>8611,
-64032=>8612,
-64033=>8613,
-34823=>8614,
-35061=>8615,
-35346=>8616,
-35383=>8617,
-35449=>8618,
-35495=>8619,
-35518=>8620,
-35551=>8621,
-64034=>8622,
-35574=>8623,
-35667=>8624,
-35711=>8625,
-36080=>8626,
-36084=>8627,
-36114=>8628,
-36214=>8629,
-64035=>8630,
-36559=>8631,
-64037=>8633,
-36967=>8634,
-37086=>8635,
-64038=>8636,
-37141=>8637,
-37159=>8638,
-37338=>8639,
-37335=>8640,
-37342=>8641,
-37357=>8642,
-37358=>8643,
-37348=>8644,
-37349=>8645,
-37382=>8646,
-37392=>8647,
-37386=>8648,
-37434=>8649,
-37440=>8650,
-37436=>8651,
-37454=>8652,
-37465=>8653,
-37457=>8654,
-37433=>8655,
-37479=>8656,
-37543=>8657,
-37495=>8658,
-37496=>8659,
-37607=>8660,
-37591=>8661,
-37593=>8662,
-37584=>8663,
-64039=>8664,
-37589=>8665,
-37600=>8666,
-37587=>8667,
-37669=>8668,
-37665=>8669,
-37627=>8670,
-64040=>8671,
-37662=>8672,
-37631=>8673,
-37661=>8674,
-37634=>8675,
-37744=>8676,
-37719=>8677,
-37796=>8678,
-37830=>8679,
-37854=>8680,
-37880=>8681,
-37937=>8682,
-37957=>8683,
-37960=>8684,
-38290=>8685,
-64041=>8687,
-38557=>8688,
-38575=>8689,
-38707=>8690,
-38715=>8691,
-38723=>8692,
-38733=>8693,
-38735=>8694,
-12205=>8695,
-38737=>8695,
-38999=>8697,
-39013=>8698,
-64042=>8699,
-64043=>8700,
-39207=>8701,
-64044=>8702,
-39326=>8703,
-39502=>8704,
-39641=>8705,
-39644=>8706,
-39797=>8707,
-39794=>8708,
-39823=>8709,
-39857=>8710,
-39867=>8711,
-39936=>8712,
-40304=>8713,
-40299=>8714,
-64045=>8715,
-40473=>8716,
-40657=>8717,
-8364=>9354,
-8486=>9355,
-64256=>9358,
-64259=>9359,
-64260=>9360,
-257=>9361,
-299=>9362,
-363=>9363,
-275=>9364,
-333=>9365,
-256=>9366,
-298=>9367,
-362=>9368,
-274=>9369,
-332=>9370,
-8539=>9371,
-8540=>9372,
-8541=>9373,
-8542=>9374,
-8531=>9375,
-8532=>9376,
-8304=>9377,
-8308=>9378,
-8309=>9379,
-8310=>9380,
-8311=>9381,
-8312=>9382,
-8313=>9383,
-8320=>9384,
-8321=>9385,
-8322=>9386,
-8323=>9387,
-8324=>9388,
-8325=>9389,
-8326=>9390,
-8327=>9391,
-8328=>9392,
-8329=>9393,
-461=>9394,
-282=>9395,
-7868=>9397,
-463=>9398,
-296=>9400,
-465=>9401,
-467=>9403,
-366=>9404,
-360=>9405,
-462=>9406,
-283=>9407,
-7869=>9409,
-464=>9410,
-297=>9412,
-466=>9413,
-468=>9415,
-367=>9416,
-361=>9417,
-593=>9418,
-8049=>9419,
-8048=>9420,
-509=>9421,
-596=>9423,
-601=>9426,
-602=>9429,
-603=>9432,
-8051=>9433,
-8050=>9434,
-567=>9435,
-331=>9436,
-629=>9437,
-652=>9438,
-658=>9441,
-643=>9442,
-720=>9443,
-8534=>9785,
-8535=>9786,
-8536=>9787,
-8537=>9788,
-8538=>9789,
-12832=>10126,
-12833=>10127,
-12834=>10128,
-12835=>10129,
-12836=>10130,
-12837=>10131,
-12838=>10132,
-12839=>10133,
-12840=>10134,
-12841=>10135,
-12892=>10244,
-12893=>10245,
-12894=>10246,
-12895=>10247,
-12977=>10248,
-12978=>10249,
-12979=>10250,
-12980=>10251,
-12981=>10252,
-12982=>10253,
-12983=>10254,
-12984=>10255,
-12985=>10256,
-12986=>10257,
-12987=>10258,
-12988=>10259,
-12989=>10260,
-12990=>10261,
-12991=>10262,
-9424=>10313,
-9425=>10314,
-9426=>10315,
-9427=>10316,
-9428=>10317,
-9429=>10318,
-9430=>10319,
-9431=>10320,
-9432=>10321,
-9433=>10322,
-9434=>10323,
-9435=>10324,
-9436=>10325,
-9437=>10326,
-9438=>10327,
-9439=>10328,
-9440=>10329,
-9441=>10330,
-9442=>10331,
-9443=>10332,
-9444=>10333,
-9445=>10334,
-9446=>10335,
-9447=>10336,
-9448=>10337,
-9449=>10338,
-9398=>10339,
-9399=>10340,
-9400=>10341,
-9401=>10342,
-9402=>10343,
-9403=>10344,
-9404=>10345,
-9405=>10346,
-9406=>10347,
-9407=>10348,
-9408=>10349,
-9409=>10350,
-9410=>10351,
-9411=>10352,
-9412=>10353,
-9413=>10354,
-9414=>10355,
-9415=>10356,
-9416=>10357,
-9417=>10358,
-9418=>10359,
-9419=>10360,
-9420=>10361,
-9421=>10362,
-9422=>10363,
-9423=>10364,
-13008=>10413,
-13009=>10414,
-13010=>10415,
-13011=>10416,
-13012=>10417,
-13013=>10418,
-13014=>10419,
-13015=>10420,
-13016=>10421,
-13017=>10422,
-13018=>10423,
-13019=>10424,
-13020=>10425,
-13021=>10426,
-13022=>10427,
-13023=>10428,
-13024=>10429,
-13025=>10430,
-13026=>10431,
-13027=>10432,
-13028=>10433,
-13029=>10434,
-13030=>10435,
-13031=>10436,
-13032=>10437,
-13033=>10438,
-13034=>10439,
-13035=>10440,
-13036=>10441,
-13037=>10442,
-13038=>10443,
-13039=>10444,
-13040=>10445,
-13041=>10446,
-13042=>10447,
-13043=>10448,
-13044=>10449,
-13045=>10450,
-13046=>10451,
-13047=>10452,
-13048=>10453,
-13049=>10454,
-13050=>10455,
-13051=>10456,
-13052=>10457,
-13053=>10458,
-13054=>10459,
-12928=>10461,
-12929=>10462,
-12930=>10463,
-12931=>10464,
-12932=>10465,
-12933=>10466,
-12934=>10467,
-12935=>10468,
-12936=>10469,
-12937=>10470,
-12944=>10471,
-12938=>10472,
-12939=>10473,
-12940=>10474,
-12941=>10475,
-12942=>10476,
-12943=>10477,
-12959=>10479,
-12960=>10486,
-12961=>10487,
-12955=>10488,
-12954=>10489,
-12963=>10490,
-12962=>10491,
-12951=>10492,
-12956=>10494,
-12949=>10495,
-9676=>10502,
-9471=>10503,
-10111=>10514,
-9451=>10515,
-9452=>10516,
-9453=>10517,
-9454=>10518,
-9455=>10519,
-9456=>10520,
-9457=>10521,
-9458=>10522,
-9459=>10523,
-9460=>10524,
-8414=>11035,
-13274=>11851,
-8448=>11855,
-13250=>11856,
-8453=>11859,
-13169=>11861,
-13197=>11864,
-13211=>11865,
-13271=>11869,
-13272=>11870,
-13057=>11874,
-13058=>11875,
-13060=>11876,
-13062=>11877,
-13064=>11879,
-13063=>11881,
-13066=>11882,
-13065=>11884,
-13067=>11886,
-13068=>11888,
-13070=>11889,
-13071=>11890,
-13072=>11891,
-13073=>11892,
-13074=>11893,
-13075=>11894,
-13079=>11896,
-13081=>11898,
-13082=>11900,
-13083=>11901,
-13084=>11902,
-13085=>11903,
-13087=>11904,
-13088=>11905,
-13089=>11906,
-13092=>11907,
-13093=>11909,
-13096=>11912,
-13097=>11913,
-13101=>11915,
-13102=>11918,
-13103=>11919,
-13104=>11920,
-13106=>11921,
-13108=>11924,
-13109=>11925,
-13116=>11926,
-13111=>11930,
-13112=>11932,
-13114=>11933,
-13117=>11934,
-13121=>11935,
-13118=>11936,
-13119=>11937,
-13120=>11938,
-13123=>11939,
-13124=>11940,
-13125=>11941,
-13126=>11942,
-13128=>11943,
-13131=>11944,
-13132=>11945,
-13135=>11946,
-13136=>11947,
-13138=>11950,
-13140=>11951,
-13139=>11954,
-13141=>11955,
-13142=>11956,
-8501=>12089,
-976=>12090,
-8714=>12091,
-8463=>12092,
-981=>12094,
-987=>12095,
-977=>12096,
-9832=>12098,
-9833=>12099,
-9836=>12100,
-12347=>12106,
-12339=>12108,
-12340=>12109,
-12341=>12110,
-8252=>12111,
-8265=>12112,
-8723=>12118,
-8771=>12120,
-8818=>12121,
-8819=>12122,
-12312=>12129,
-12313=>12130,
-65375=>12131,
-65376=>12132,
-9115=>12143,
-9117=>12144,
-9118=>12145,
-9120=>12146,
-9121=>12151,
-9123=>12152,
-9124=>12153,
-9126=>12154,
-9116=>12167,
-9119=>12167,
-9122=>12167,
-9125=>12167,
-9130=>12167,
-9986=>12176,
-12349=>12179,
-12447=>12181,
-8709=>12184,
-8864=>12185,
-8854=>12186,
-8856=>12187,
-8853=>12188,
-8855=>12189,
-9888=>12192,
-9664=>12194,
-9654=>12195,
-8656=>12200,
-8596=>12201,
-8600=>12202,
-8601=>12203,
-8598=>12204,
-8599=>12205,
-8652=>12206,
-8651=>12207,
-12336=>12218,
-8967=>12219,
-10048=>12228,
-10047=>12229,
-9643=>12237,
-9642=>12239,
-10010=>12241,
-9702=>12254,
-10070=>12259,
-65093=>12639,
-65094=>12640,
-64103=>13320,
-64098=>13321,
-32227=>13322,
-12232=>13323,
-40643=>13323,
-28331=>13324,
-64082=>13325,
-64061=>13326,
-64069=>13327,
-64062=>13328,
-27114=>13329,
-28212=>13330,
-64096=>13331,
-64071=>13332,
-64056=>13333,
-64066=>13334,
-64078=>13335,
-34395=>13336,
-64105=>13337,
-64052=>13338,
-64099=>13339,
-25581=>13340,
-25802=>13341,
-30799=>13342,
-64084=>13343,
-63856=>13344,
-64077=>13345,
-64097=>13346,
-64072=>13347,
-64076=>13348,
-64091=>13349,
-64092=>13350,
-64081=>13351,
-64067=>13352,
-64090=>13353,
-28041=>13354,
-29376=>13355,
-194885=>13357,
-64086=>13358,
-64080=>13359,
-64049=>13360,
-64059=>13361,
-24034=>13362,
-64063=>13363,
-64101=>13364,
-21373=>13365,
-64055=>13366,
-64095=>13367,
-24501=>13368,
-64064=>13369,
-64083=>13371,
-64085=>13373,
-64104=>13374,
-64068=>13375,
-64089=>13376,
-26202=>13377,
-64053=>13378,
-64075=>13379,
-64100=>13380,
-64065=>13381,
-64048=>13382,
-64057=>13384,
-64051=>13385,
-27493=>13386,
-64058=>13387,
-27599=>13388,
-64050=>13389,
-25150=>13390,
-64079=>13391,
-63773=>13392,
-63964=>13393,
-63798=>13394,
-28122=>13395,
-63952=>13396,
-26310=>13397,
-27511=>13398,
-64087=>13399,
-37706=>13400,
-37636=>13402,
-133390=>13523,
-35999=>13644,
-11991=>13645,
-11965=>13646,
-158033=>13646,
-37555=>13652,
-38321=>13653,
-194812=>13656,
-194965=>13670,
-194794=>13679,
-26478=>13681,
-11974=>13682,
-194594=>13684,
-156194=>13691,
-13314=>13698,
-26083=>13701,
-134071=>13706,
-171339=>13717,
-194611=>13719,
-24378=>13720,
-11945=>13729,
-20465=>13731,
-63753=>13739,
-11964=>13747,
-194732=>13750,
-26435=>13751,
-133732=>13755,
-35329=>13756,
-25142=>13757,
-21555=>13760,
-23067=>13761,
-25221=>13765,
-194819=>13768,
-21567=>13775,
-27506=>13785,
-29986=>13790,
-19256=>13791,
-24063=>13794,
-194827=>13801,
-29626=>13802,
-134047=>13803,
-194600=>13807,
-194849=>13809,
-194623=>13815,
-194675=>13832,
-11916=>13833,
-11917=>13834,
-23577=>13835,
-131083=>13839,
-23426=>13840,
-194642=>13841,
-11997=>13847,
-11999=>13848,
-39136=>13848,
-11998=>13849,
-169599=>13849,
-14221=>13850,
-11927=>13852,
-14586=>13852,
-194887=>13854,
-11909=>13856,
-20155=>13856,
-131490=>13857,
-13599=>13865,
-194738=>13867,
-11971=>13870,
-35200=>13870,
-31237=>13875,
-35498=>13880,
-32085=>13882,
-28568=>13884,
-25591=>13892,
-30246=>13893,
-11978=>13898,
-163767=>13898,
-146686=>13904,
-13351=>13910,
-33067=>13913,
-194842=>13916,
-11950=>13922,
-154327=>13922,
-194714=>13928,
-194831=>13932,
-22305=>13952,
-135741=>13953,
-194586=>13954,
-64003=>13956,
-21534=>13964,
-15240=>13965,
-20839=>13966,
-63839=>13971,
-20023=>13981,
-11946=>13995,
-150804=>13995,
-24421=>13996,
-23020=>13997,
-194658=>13998,
-24217=>14000,
-13416=>14047,
-40884=>14048,
-21200=>14056,
-38376=>14061,
-26625=>14066,
-195024=>14068,
-195039=>14069,
-153215=>14075,
-11959=>14078,
-36534=>14083,
-63775=>14084,
-63875=>14088,
-31867=>14094,
-63906=>14095,
-63898=>14097,
-11961=>14099,
-32770=>14099,
-157360=>14100,
-11911=>14105,
-132648=>14105,
-131210=>14108,
-133508=>14109,
-194604=>14109,
-11915=>14110,
-13630=>14110,
-21589=>14115,
-22841=>14117,
-23414=>14120,
-194669=>14121,
-23572=>14122,
-14306=>14123,
-23782=>14124,
-20040=>14126,
-194742=>14129,
-158105=>14134,
-25371=>14135,
-26211=>14138,
-194779=>14140,
-27126=>14143,
-27014=>14144,
-27596=>14148,
-28183=>14150,
-27818=>14153,
-11942=>14157,
-20012=>14157,
-29935=>14160,
-30069=>14161,
-30188=>14162,
-30286=>14163,
-16305=>14164,
-30570=>14165,
-30633=>14166,
-31571=>14173,
-16996=>14176,
-194924=>14180,
-32328=>14183,
-132415=>14188,
-11955=>14189,
-156266=>14189,
-33089=>14194,
-17491=>14195,
-33401=>14197,
-11966=>14197,
-64094=>14198,
-11967=>14198,
-64093=>14199,
-11968=>14199,
-20857=>14201,
-33626=>14202,
-17701=>14206,
-34292=>14208,
-131248=>14209,
-34429=>14214,
-13358=>14216,
-35014=>14217,
-18406=>14224,
-36808=>14233,
-166279=>14253,
-167447=>14256,
-38969=>14259,
-39432=>14266,
-39903=>14271,
-148206=>14282,
-21385=>14288,
-64017=>14290,
-194785=>14291,
-146622=>14293,
-132625=>14294,
-19972=>14296,
-19973=>14297,
-19999=>14298,
-20011=>14299,
-20015=>14300,
-20016=>14301,
-20032=>14302,
-20033=>14303,
-20036=>14304,
-11907=>14305,
-20058=>14305,
-20095=>14306,
-20109=>14307,
-20118=>14308,
-20153=>14309,
-20176=>14310,
-20192=>14311,
-20221=>14312,
-20223=>14313,
-20235=>14314,
-20245=>14315,
-20320=>14316,
-20283=>14317,
-20297=>14318,
-20308=>14319,
-20346=>14320,
-20349=>14321,
-20350=>14322,
-20375=>14323,
-20414=>14324,
-20431=>14325,
-20477=>14326,
-20480=>14327,
-20481=>14328,
-20496=>14329,
-20507=>14330,
-20519=>14331,
-20526=>14332,
-20567=>14333,
-20582=>14334,
-20586=>14335,
-20539=>14336,
-20623=>14337,
-20630=>14338,
-20636=>14339,
-20684=>14340,
-20710=>14341,
-20713=>14342,
-20719=>14343,
-20744=>14344,
-20747=>14345,
-20752=>14346,
-20763=>14347,
-20766=>14348,
-20831=>14349,
-20897=>14350,
-20924=>14351,
-20974=>14353,
-20980=>14354,
-20993=>14355,
-11913=>14356,
-20994=>14356,
-21011=>14357,
-21065=>14358,
-21089=>14359,
-21094=>14360,
-21139=>14361,
-21192=>14362,
-21232=>14363,
-21258=>14364,
-21259=>14365,
-21310=>14366,
-21324=>14367,
-21323=>14368,
-21345=>14369,
-21356=>14370,
-21419=>14371,
-21466=>14372,
-21478=>14373,
-21493=>14374,
-21543=>14375,
-21581=>14376,
-21606=>14377,
-21611=>14378,
-21620=>14379,
-21645=>14380,
-21654=>14381,
-21665=>14382,
-21677=>14383,
-21689=>14384,
-21695=>14385,
-21702=>14386,
-21709=>14387,
-21774=>14388,
-21803=>14389,
-21813=>14390,
-21834=>14391,
-21856=>14392,
-21896=>14394,
-21902=>14395,
-22024=>14396,
-22030=>14397,
-22031=>14398,
-22071=>14399,
-22079=>14400,
-22089=>14401,
-22091=>14402,
-22095=>14403,
-22118=>14404,
-22121=>14405,
-22127=>14406,
-22129=>14407,
-22130=>14408,
-22165=>14409,
-22170=>14410,
-22188=>14411,
-22189=>14412,
-22193=>14413,
-22217=>14414,
-22237=>14415,
-22244=>14416,
-22282=>14417,
-22293=>14418,
-22307=>14419,
-22319=>14420,
-22323=>14421,
-22324=>14422,
-22348=>14423,
-22384=>14424,
-22412=>14425,
-22428=>14426,
-22456=>14427,
-22502=>14428,
-22509=>14429,
-22517=>14430,
-22518=>14431,
-22527=>14432,
-22537=>14433,
-22560=>14434,
-22578=>14435,
-22652=>14436,
-22656=>14437,
-22697=>14438,
-22734=>14439,
-22736=>14440,
-22740=>14441,
-22746=>14442,
-22761=>14443,
-22796=>14444,
-22820=>14445,
-22831=>14446,
-22881=>14447,
-22893=>14448,
-22986=>14449,
-22994=>14450,
-23005=>14451,
-23011=>14452,
-23012=>14453,
-23044=>14454,
-23052=>14455,
-23075=>14456,
-23111=>14457,
-23125=>14458,
-23139=>14459,
-23149=>14460,
-23166=>14461,
-23198=>14462,
-23207=>14463,
-23212=>14464,
-23219=>14465,
-23264=>14466,
-23296=>14467,
-23321=>14468,
-23333=>14469,
-23341=>14470,
-23361=>14471,
-23420=>14472,
-23422=>14473,
-23423=>14474,
-23434=>14475,
-11919=>14476,
-23587=>14476,
-23595=>14477,
-23600=>14478,
-23651=>14479,
-23657=>14480,
-23676=>14481,
-23755=>14482,
-23762=>14483,
-23796=>14484,
-23844=>14485,
-23846=>14486,
-23875=>14487,
-23878=>14488,
-23882=>14489,
-23954=>14490,
-23956=>14491,
-23961=>14492,
-23968=>14493,
-24024=>14494,
-24032=>14495,
-24056=>14496,
-24064=>14497,
-24082=>14498,
-24084=>14499,
-24085=>14500,
-24088=>14501,
-24110=>14502,
-24152=>14503,
-24171=>14504,
-24172=>14505,
-24232=>14506,
-24234=>14507,
-24254=>14508,
-24255=>14509,
-24274=>14511,
-24327=>14512,
-24334=>14513,
-24348=>14514,
-24349=>14515,
-24354=>14516,
-24360=>14517,
-24374=>14518,
-24379=>14519,
-24384=>14520,
-12089=>14521,
-24400=>14521,
-24408=>14522,
-24420=>14523,
-24457=>14524,
-24476=>14525,
-24487=>14526,
-24484=>14527,
-24495=>14528,
-24504=>14529,
-11926=>14530,
-24516=>14530,
-24521=>14531,
-24545=>14532,
-24553=>14533,
-24557=>14534,
-24572=>14535,
-24599=>14536,
-24602=>14537,
-24627=>14538,
-24673=>14539,
-24703=>14540,
-24734=>14541,
-24740=>14542,
-24752=>14543,
-24779=>14544,
-24795=>14545,
-24824=>14546,
-24850=>14547,
-24851=>14548,
-24852=>14549,
-24860=>14550,
-24956=>14551,
-24973=>14552,
-24991=>14553,
-25000=>14554,
-25026=>14555,
-25055=>14556,
-25109=>14557,
-25129=>14558,
-25155=>14559,
-25158=>14560,
-11928=>14561,
-25164=>14561,
-25169=>14562,
-25174=>14563,
-25284=>14564,
-25340=>14565,
-25354=>14566,
-25357=>14567,
-25368=>14568,
-25401=>14569,
-25410=>14570,
-25411=>14571,
-25445=>14572,
-25460=>14573,
-25469=>14574,
-25476=>14575,
-25479=>14576,
-25488=>14577,
-25502=>14578,
-25553=>14579,
-25564=>14580,
-25609=>14581,
-25616=>14582,
-25634=>14583,
-25684=>14584,
-25691=>14585,
-25709=>14586,
-25723=>14587,
-25790=>14588,
-25791=>14589,
-25829=>14590,
-25847=>14591,
-25851=>14592,
-25860=>14593,
-25878=>14594,
-25881=>14595,
-25927=>14596,
-25959=>14597,
-25985=>14598,
-25989=>14599,
-26050=>14600,
-26096=>14601,
-26098=>14602,
-26156=>14603,
-26188=>14604,
-26203=>14605,
-26204=>14606,
-26209=>14607,
-26219=>14608,
-26276=>14610,
-26312=>14611,
-26348=>14612,
-26373=>14613,
-26387=>14614,
-26419=>14615,
-26440=>14616,
-26444=>14617,
-26486=>14618,
-26491=>14619,
-26544=>14620,
-26546=>14621,
-26617=>14622,
-26583=>14623,
-26585=>14624,
-26608=>14625,
-26668=>14626,
-26672=>14627,
-26673=>14628,
-26715=>14629,
-26738=>14630,
-26741=>14631,
-26746=>14632,
-26756=>14633,
-26789=>14634,
-26802=>14635,
-26832=>14636,
-26838=>14637,
-26856=>14638,
-26861=>14639,
-26864=>14640,
-26865=>14641,
-26876=>14642,
-26897=>14643,
-26899=>14644,
-26933=>14645,
-26939=>14646,
-26967=>14647,
-26979=>14648,
-26994=>14649,
-27007=>14650,
-27008=>14651,
-27046=>14652,
-27053=>14653,
-27063=>14654,
-27094=>14655,
-27095=>14656,
-27137=>14657,
-27151=>14658,
-27157=>14659,
-27176=>14660,
-27188=>14661,
-27198=>14662,
-27205=>14663,
-27216=>14664,
-27217=>14665,
-27222=>14666,
-27227=>14667,
-27267=>14668,
-27273=>14669,
-27281=>14670,
-27293=>14671,
-27294=>14672,
-27295=>14673,
-27356=>14674,
-27367=>14675,
-27372=>14676,
-27422=>14677,
-27428=>14678,
-27445=>14679,
-27462=>14680,
-27478=>14681,
-27488=>14682,
-27522=>14683,
-27582=>14684,
-27617=>14685,
-27633=>14686,
-27664=>14687,
-27699=>14688,
-27701=>14689,
-11937=>14689,
-11938=>14690,
-27737=>14691,
-27766=>14692,
-27771=>14693,
-27781=>14694,
-27797=>14695,
-27804=>14696,
-27856=>14697,
-27860=>14698,
-27862=>14699,
-27872=>14700,
-27883=>14701,
-27884=>14702,
-27886=>14703,
-27914=>14704,
-27918=>14705,
-27921=>14706,
-27950=>14707,
-27991=>14708,
-27998=>14709,
-28005=>14710,
-28034=>14711,
-28095=>14712,
-28100=>14713,
-28106=>14714,
-28118=>14715,
-28137=>14716,
-28194=>14717,
-28241=>14718,
-28359=>14719,
-28362=>14720,
-28366=>14721,
-28413=>14722,
-28442=>14723,
-28458=>14724,
-28463=>14725,
-28467=>14726,
-28506=>14727,
-28510=>14728,
-28514=>14729,
-28541=>14730,
-28555=>14731,
-28557=>14732,
-28562=>14733,
-28564=>14734,
-28570=>14735,
-28583=>14736,
-28584=>14737,
-28598=>14738,
-28634=>14739,
-28638=>14740,
-28729=>14742,
-28732=>14743,
-28756=>14745,
-28765=>14746,
-28766=>14747,
-28772=>14748,
-11939=>14749,
-28780=>14749,
-28798=>14750,
-28801=>14751,
-28821=>14752,
-28855=>14753,
-28883=>14754,
-28884=>14755,
-28888=>14756,
-28892=>14757,
-28935=>14758,
-28960=>14759,
-28977=>14760,
-29002=>14761,
-29010=>14762,
-29024=>14763,
-29049=>14764,
-29074=>14765,
-29131=>14767,
-29139=>14768,
-29142=>14769,
-29184=>14770,
-29213=>14771,
-29227=>14772,
-29240=>14773,
-29249=>14774,
-29267=>14775,
-29269=>14776,
-29270=>14777,
-29276=>14778,
-29325=>14779,
-11944=>14780,
-29357=>14780,
-29364=>14781,
-29383=>14782,
-29435=>14783,
-29444=>14784,
-29445=>14785,
-29480=>14786,
-29489=>14787,
-29507=>14788,
-29548=>14789,
-29564=>14790,
-29571=>14791,
-29573=>14792,
-29574=>14793,
-29589=>14794,
-29598=>14795,
-29599=>14796,
-29600=>14797,
-29606=>14798,
-29611=>14799,
-29621=>14800,
-29623=>14801,
-29628=>14802,
-29647=>14803,
-29657=>14804,
-29673=>14805,
-29684=>14806,
-29693=>14807,
-29700=>14808,
-29706=>14809,
-29722=>14810,
-29723=>14811,
-29732=>14812,
-29736=>14813,
-29740=>14814,
-29743=>14815,
-29744=>14816,
-29745=>14817,
-29753=>14818,
-29764=>14819,
-29767=>14820,
-29771=>14821,
-29773=>14822,
-29777=>14823,
-29783=>14824,
-29798=>14825,
-29803=>14826,
-29809=>14827,
-29824=>14828,
-29829=>14829,
-29830=>14830,
-29831=>14831,
-29840=>14832,
-29848=>14833,
-29852=>14834,
-29856=>14835,
-29859=>14836,
-29864=>14837,
-29867=>14838,
-29877=>14839,
-29887=>14840,
-29896=>14841,
-29914=>14842,
-29918=>14843,
-30030=>14844,
-30073=>14845,
-30081=>14846,
-30096=>14847,
-12135=>14848,
-30098=>14848,
-30099=>14849,
-30132=>14850,
-30180=>14851,
-30201=>14852,
-30208=>14853,
-30218=>14854,
-30229=>14855,
-30230=>14856,
-30233=>14857,
-30238=>14858,
-30253=>14859,
-30261=>14860,
-30275=>14861,
-30283=>14862,
-30309=>14863,
-30317=>14864,
-30319=>14865,
-30321=>14866,
-30324=>14867,
-30372=>14868,
-30373=>14869,
-30405=>14870,
-30412=>14871,
-30444=>14872,
-30460=>14873,
-30516=>14874,
-30518=>14875,
-30556=>14876,
-30559=>14877,
-30560=>14878,
-30578=>14879,
-30589=>14880,
-30613=>14881,
-30634=>14882,
-30694=>14883,
-30704=>14884,
-30708=>14885,
-30726=>14886,
-30754=>14887,
-30765=>14888,
-30766=>14889,
-30768=>14890,
-30773=>14891,
-30824=>14892,
-30878=>14893,
-30920=>14894,
-30924=>14895,
-30926=>14896,
-30948=>14897,
-30944=>14898,
-30945=>14899,
-30962=>14900,
-30967=>14901,
-30971=>14902,
-31025=>14903,
-11949=>14905,
-31035=>14905,
-31037=>14906,
-31045=>14907,
-31067=>14908,
-31068=>14909,
-31115=>14910,
-31126=>14911,
-31128=>14912,
-12145=>14913,
-31160=>14913,
-31163=>14914,
-31178=>14915,
-31194=>14916,
-31235=>14917,
-31241=>14918,
-31249=>14919,
-31262=>14920,
-31277=>14921,
-31289=>14922,
-31301=>14923,
-31308=>14924,
-31325=>14925,
-31341=>14927,
-31352=>14928,
-31392=>14929,
-31395=>14930,
-31411=>14931,
-31419=>14932,
-31420=>14933,
-31430=>14934,
-31495=>14935,
-31508=>14936,
-31527=>14937,
-31537=>14938,
-31559=>14939,
-31566=>14940,
-31584=>14941,
-31593=>14942,
-31597=>14943,
-31602=>14944,
-31633=>14945,
-31663=>14946,
-31703=>14947,
-31705=>14948,
-31755=>14949,
-31759=>14950,
-31776=>14951,
-31782=>14952,
-31793=>14953,
-31798=>14954,
-31825=>14955,
-31833=>14956,
-31847=>14957,
-31854=>14958,
-31856=>14959,
-31932=>14960,
-31935=>14961,
-31944=>14962,
-31945=>14963,
-31959=>14964,
-31961=>14965,
-31965=>14966,
-31979=>14967,
-32007=>14968,
-32008=>14969,
-32009=>14970,
-32019=>14971,
-32029=>14972,
-32035=>14973,
-32065=>14974,
-32083=>14975,
-32089=>14976,
-32093=>14977,
-32122=>14978,
-32134=>14979,
-32139=>14980,
-32140=>14981,
-32204=>14982,
-32235=>14983,
-32241=>14984,
-32249=>14985,
-32264=>14986,
-32273=>14987,
-32277=>14988,
-32288=>14989,
-32327=>14990,
-32354=>14991,
-32366=>14992,
-32371=>14993,
-32397=>14994,
-32401=>14995,
-32408=>14996,
-32580=>14997,
-32591=>14998,
-11947=>14999,
-11954=>14999,
-32594=>14999,
-11953=>15000,
-32595=>15000,
-32609=>15001,
-32657=>15002,
-32703=>15003,
-32718=>15004,
-32735=>15005,
-32741=>15006,
-32748=>15007,
-32750=>15008,
-32751=>15009,
-32762=>15010,
-32782=>15011,
-32785=>15012,
-32788=>15013,
-32804=>15014,
-32806=>15015,
-32826=>15016,
-32828=>15017,
-32864=>15018,
-32881=>15019,
-32885=>15020,
-32926=>15021,
-32934=>15022,
-32939=>15023,
-32983=>15024,
-32984=>15025,
-33046=>15026,
-33048=>15027,
-33082=>15028,
-33098=>15029,
-33100=>15030,
-33153=>15031,
-33156=>15032,
-33204=>15033,
-33231=>15034,
-33273=>15035,
-33283=>15036,
-33313=>15037,
-33330=>15038,
-33332=>15039,
-33350=>15040,
-33355=>15041,
-33359=>15042,
-33422=>15043,
-33454=>15044,
-33463=>15045,
-33470=>15046,
-33478=>15047,
-33534=>15048,
-33603=>15049,
-33617=>15050,
-33621=>15051,
-33670=>15052,
-33677=>15053,
-33682=>15054,
-33688=>15055,
-33705=>15056,
-33727=>15057,
-33728=>15058,
-33770=>15059,
-33807=>15060,
-33809=>15061,
-33866=>15062,
-33910=>15063,
-33960=>15064,
-33967=>15065,
-33984=>15066,
-33986=>15067,
-34032=>15068,
-34045=>15069,
-34060=>15070,
-34100=>15071,
-34142=>15072,
-34191=>15073,
-34231=>15074,
-34254=>15075,
-34221=>15076,
-34322=>15077,
-34345=>15078,
-34386=>15079,
-34403=>15080,
-34412=>15081,
-34415=>15082,
-34426=>15083,
-34445=>15084,
-34449=>15085,
-34456=>15086,
-34471=>15087,
-34472=>15088,
-34554=>15089,
-34557=>15090,
-34571=>15091,
-34579=>15092,
-34585=>15093,
-34590=>15094,
-34600=>15095,
-34622=>15096,
-34673=>15097,
-34696=>15098,
-34713=>15099,
-34732=>15100,
-34733=>15101,
-34741=>15102,
-34774=>15103,
-34795=>15104,
-34797=>15105,
-34817=>15106,
-34822=>15108,
-34827=>15109,
-34836=>15110,
-34844=>15111,
-34902=>15112,
-34911=>15113,
-11970=>15114,
-34916=>15114,
-34968=>15115,
-34986=>15116,
-35005=>15117,
-35006=>15118,
-35018=>15119,
-35026=>15120,
-35035=>15121,
-35056=>15122,
-35057=>15123,
-35078=>15124,
-35096=>15125,
-35097=>15126,
-35098=>15127,
-35111=>15128,
-35120=>15129,
-35134=>15130,
-35195=>15131,
-35284=>15132,
-35286=>15133,
-35301=>15134,
-35313=>15135,
-35335=>15136,
-35343=>15137,
-35349=>15138,
-35362=>15139,
-35406=>15140,
-35455=>15141,
-35572=>15142,
-35615=>15143,
-35639=>15144,
-35651=>15145,
-35652=>15146,
-35668=>15147,
-35740=>15148,
-35742=>15149,
-35911=>15150,
-35924=>15151,
-35955=>15152,
-36004=>15153,
-36057=>15154,
-36065=>15155,
-36088=>15156,
-36094=>15157,
-36123=>15158,
-36201=>15159,
-36204=>15160,
-36228=>15161,
-36237=>15162,
-36245=>15163,
-36262=>15164,
-36294=>15165,
-36302=>15166,
-36324=>15167,
-36332=>15168,
-36384=>15169,
-36427=>15170,
-36460=>15171,
-36464=>15172,
-36474=>15173,
-36498=>15174,
-36526=>15175,
-36531=>15176,
-36561=>15177,
-36564=>15178,
-36601=>15179,
-36631=>15180,
-36662=>15181,
-36774=>15182,
-12193=>15183,
-36789=>15183,
-11981=>15184,
-36790=>15184,
-36832=>15186,
-36836=>15187,
-36854=>15188,
-36866=>15189,
-36908=>15190,
-36932=>15191,
-37000=>15192,
-37013=>15193,
-37017=>15194,
-37019=>15195,
-37026=>15196,
-37044=>15197,
-37079=>15198,
-37085=>15199,
-37108=>15200,
-37143=>15201,
-37148=>15202,
-37169=>15203,
-37178=>15204,
-37181=>15205,
-37192=>15206,
-37211=>15207,
-37217=>15208,
-37220=>15209,
-37262=>15210,
-37278=>15211,
-37288=>15212,
-37293=>15213,
-37294=>15214,
-37298=>15215,
-37308=>15216,
-37360=>15217,
-37367=>15218,
-37371=>15219,
-37383=>15220,
-37416=>15221,
-37427=>15222,
-37432=>15223,
-37443=>15224,
-37447=>15225,
-37455=>15226,
-37472=>15227,
-37570=>15228,
-37579=>15229,
-37580=>15230,
-37599=>15231,
-37645=>15232,
-37653=>15233,
-37663=>15234,
-37671=>15235,
-37703=>15236,
-37714=>15237,
-37738=>15239,
-37741=>15240,
-37787=>15241,
-37818=>15242,
-37801=>15243,
-37825=>15244,
-37834=>15245,
-37858=>15246,
-37882=>15247,
-37885=>15248,
-37903=>15249,
-37940=>15250,
-37951=>15251,
-37973=>15252,
-37995=>15253,
-38002=>15254,
-11986=>15255,
-38264=>15255,
-38310=>15256,
-38313=>15257,
-38324=>15259,
-38333=>15260,
-38362=>15261,
-11983=>15262,
-11990=>15262,
-38429=>15262,
-38465=>15263,
-38488=>15264,
-38532=>15265,
-38564=>15266,
-38569=>15267,
-38610=>15268,
-195060=>15269,
-38622=>15270,
-38633=>15271,
-38641=>15272,
-38658=>15273,
-38665=>15274,
-38746=>15275,
-38755=>15276,
-38766=>15277,
-38771=>15278,
-38810=>15279,
-38818=>15280,
-38837=>15281,
-38838=>15282,
-38873=>15283,
-38878=>15284,
-38900=>15285,
-38922=>15286,
-38926=>15287,
-38942=>15288,
-38947=>15289,
-38955=>15290,
-38974=>15291,
-38994=>15292,
-38995=>15293,
-39001=>15294,
-39020=>15295,
-39096=>15296,
-39098=>15297,
-39103=>15298,
-39112=>15299,
-39141=>15300,
-39218=>15301,
-39219=>15302,
-39232=>15303,
-39245=>15304,
-39260=>15305,
-39263=>15306,
-39345=>15307,
-39353=>15308,
-39354=>15309,
-39369=>15310,
-39426=>15311,
-39446=>15312,
-39460=>15313,
-39463=>15314,
-39469=>15315,
-39470=>15316,
-39478=>15317,
-39480=>15318,
-39498=>15319,
-39510=>15320,
-39605=>15321,
-39606=>15322,
-39673=>15323,
-39683=>15324,
-39712=>15325,
-39731=>15326,
-39732=>15327,
-39795=>15328,
-39801=>15329,
-39847=>15330,
-39873=>15331,
-39879=>15332,
-39895=>15333,
-39911=>15334,
-39915=>15335,
-39927=>15336,
-39930=>15337,
-39933=>15338,
-39947=>15339,
-39975=>15340,
-39978=>15341,
-39990=>15342,
-40001=>15343,
-40019=>15344,
-40035=>15345,
-40048=>15346,
-40055=>15347,
-40194=>15348,
-40258=>15349,
-40263=>15350,
-40291=>15351,
-40297=>15352,
-40316=>15353,
-40318=>15354,
-40333=>15355,
-40369=>15356,
-40387=>15357,
-40391=>15358,
-40406=>15359,
-40415=>15360,
-40427=>15361,
-40436=>15362,
-40469=>15363,
-40477=>15364,
-40612=>15365,
-40616=>15366,
-40620=>15367,
-40679=>15368,
-40686=>15369,
-40720=>15370,
-40722=>15371,
-40727=>15372,
-40729=>15373,
-40751=>15374,
-40759=>15375,
-40761=>15376,
-40769=>15377,
-40773=>15378,
-40791=>15379,
-40808=>15380,
-40817=>15381,
-40821=>15382,
-40848=>15383,
-40852=>15384,
-40866=>15385,
-13317=>15387,
-194564=>15388,
-22048=>15389,
-24267=>15390,
-11925=>15391,
-144954=>15393,
-28665=>15395,
-28390=>15396,
-29107=>15397,
-11940=>15398,
-64073=>15398,
-11980=>15403,
-64102=>15403,
-23986=>15405,
-20435=>15407,
-20697=>15408,
-20720=>15409,
-20931=>15410,
-22134=>15411,
-27220=>15412,
-27905=>15413,
-28112=>15414,
-28226=>15415,
-28377=>15416,
-29668=>15417,
-29729=>15418,
-30060=>15419,
-30801=>15420,
-34805=>15421,
-144382=>15422,
-29608=>15423,
-15091=>15424,
-13531=>15425,
-17420=>15426,
-16010=>15427,
-40893=>15429,
-19432=>15430,
-40892=>15431,
-16090=>15432,
-15138=>15433,
-40894=>15434,
-17786=>15435,
-16531=>15436,
-18021=>15438,
-16643=>15439,
-17043=>15440,
-18094=>15441,
-13448=>15442,
-140809=>15443,
-63584=>15444,
-63585=>15445,
-63586=>15446,
-63610=>15447,
-63615=>15448,
-8836=>15472,
-8837=>15473,
-8842=>15474,
-8843=>15475,
-8713=>15476,
-8965=>15478,
-8966=>15479,
-8741=>15489,
-8742=>15490,
-8802=>15505,
-8773=>15507,
-8776=>15508,
-8822=>15509,
-8823=>15510,
-8487=>15515,
-8922=>15725,
-8923=>15726,
-8533=>15727,
-8984=>15728,
-7742=>15729,
-7743=>15730,
-504=>15731,
-505=>15732,
-470=>15733,
-472=>15734,
-474=>15735,
-476=>15736,
-260=>15737,
-728=>15738,
-317=>15739,
-346=>15740,
-350=>15741,
-356=>15742,
-377=>15743,
-379=>15744,
-261=>15745,
-731=>15746,
-318=>15747,
-347=>15748,
-711=>15749,
-351=>15750,
-357=>15751,
-378=>15752,
-733=>15753,
-380=>15754,
-340=>15755,
-258=>15756,
-313=>15757,
-262=>15758,
-268=>15759,
-280=>15760,
-270=>15761,
-323=>15762,
-327=>15763,
-336=>15764,
-344=>15765,
-368=>15766,
-354=>15767,
-341=>15768,
-259=>15769,
-314=>15770,
-263=>15771,
-269=>15772,
-281=>15773,
-271=>15774,
-273=>15775,
-324=>15776,
-328=>15777,
-337=>15778,
-345=>15779,
-369=>15780,
-355=>15781,
-729=>15782,
-264=>15783,
-284=>15784,
-292=>15785,
-308=>15786,
-348=>15787,
-364=>15788,
-265=>15789,
-285=>15790,
-293=>15791,
-309=>15792,
-349=>15793,
-365=>15794,
-625=>15795,
-651=>15796,
-638=>15797,
-620=>15798,
-622=>15799,
-633=>15800,
-648=>15801,
-598=>15802,
-627=>15803,
-637=>15804,
-642=>15805,
-656=>15806,
-635=>15807,
-621=>15808,
-607=>15809,
-626=>15810,
-669=>15811,
-654=>15812,
-609=>15813,
-624=>15814,
-641=>15815,
-295=>15816,
-661=>15817,
-660=>15818,
-614=>15819,
-664=>15820,
-450=>15821,
-595=>15822,
-599=>15823,
-644=>15824,
-608=>15825,
-403=>15826,
-616=>15827,
-649=>15828,
-600=>15829,
-604=>15830,
-606=>15831,
-592=>15832,
-623=>15833,
-650=>15834,
-612=>15835,
-594=>15836,
-653=>15837,
-613=>15838,
-674=>15839,
-673=>15840,
-597=>15841,
-657=>15842,
-634=>15843,
-615=>15844,
-865=>15845,
-712=>15846,
-716=>15847,
-721=>15848,
-8255=>15849,
-783=>15850,
-741=>15851,
-742=>15852,
-743=>15853,
-744=>15854,
-745=>15855,
-805=>15858,
-812=>15859,
-825=>15860,
-796=>15861,
-799=>15862,
-800=>15863,
-829=>15864,
-809=>15865,
-815=>15866,
-734=>15867,
-804=>15868,
-816=>15869,
-828=>15870,
-820=>15871,
-797=>15872,
-798=>15873,
-792=>15874,
-793=>15875,
-810=>15876,
-826=>15877,
-827=>15878,
-794=>15879,
-610=>15883,
-611=>15884,
-618=>15885,
-628=>15886,
-630=>15887,
-632=>15888,
-640=>15889,
-655=>15890,
-665=>15891,
-668=>15892,
-671=>15893,
-688=>15894,
-690=>15895,
-695=>15896,
-705=>15897,
-736=>15898,
-737=>15899,
-8862=>15906,
-12348=>16194,
-12543=>16195,
-12310=>16197,
-12311=>16198,
-9838=>16199,
-9835=>16200,
-10548=>16201,
-10549=>16202,
-10687=>16203,
-12448=>16205,
-10746=>16207,
-10747=>16208,
-962=>16222,
-9461=>16223,
-9462=>16224,
-9463=>16225,
-9464=>16226,
-9465=>16227,
-9466=>16228,
-9467=>16229,
-9468=>16230,
-9469=>16231,
-9470=>16232,
-9750=>16233,
-9751=>16234,
-9649=>16235,
-12784=>16236,
-12785=>16237,
-12786=>16238,
-12787=>16239,
-12788=>16240,
-12789=>16241,
-12790=>16242,
-12791=>16243,
-12792=>16244,
-12793=>16245,
-12794=>16247,
-12795=>16248,
-12796=>16249,
-12797=>16250,
-12798=>16251,
-12799=>16252,
-9150=>16253,
-9151=>16254,
-9152=>16255,
-9153=>16256,
-9154=>16257,
-9155=>16258,
-9156=>16259,
-9157=>16260,
-9158=>16261,
-9159=>16262,
-9160=>16263,
-9161=>16264,
-9162=>16265,
-9163=>16266,
-9164=>16267,
-10003=>16270,
-9251=>16272,
-9166=>16273,
-9680=>16274,
-9681=>16275,
-9682=>16276,
-9683=>16277,
-8263=>16278,
-8264=>16279,
-8273=>16281,
-8258=>16282,
-12688=>16283,
-12689=>16284,
-12690=>16285,
-12691=>16286,
-12692=>16287,
-12693=>16288,
-12694=>16289,
-12695=>16290,
-12696=>16291,
-12697=>16292,
-12698=>16293,
-12699=>16294,
-12700=>16295,
-12701=>16296,
-12702=>16297,
-12703=>16298,
-9136=>16312,
-9137=>16313,
-9842=>16314,
-9843=>16315,
-9844=>16316,
-9845=>16317,
-9846=>16318,
-9847=>16319,
-9848=>16320,
-9849=>16321,
-9850=>16322,
-9851=>16323,
-9852=>16324,
-9853=>16325,
-12441=>16326,
-12442=>16327,
-8413=>16328,
-20296=>16779,
-20319=>16780,
-20330=>16781,
-20332=>16782,
-20494=>16783,
-20504=>16784,
-20545=>16785,
-20722=>16786,
-20688=>16787,
-20742=>16788,
-20739=>16789,
-20789=>16790,
-20821=>16791,
-20823=>16792,
-13493=>16793,
-20938=>16794,
-20962=>16795,
-21079=>16796,
-21196=>16797,
-21206=>16798,
-21243=>16799,
-21276=>16800,
-21347=>16801,
-21405=>16802,
-21522=>16803,
-21631=>16804,
-21640=>16805,
-21840=>16806,
-21889=>16807,
-21933=>16808,
-21966=>16809,
-22075=>16810,
-22174=>16811,
-22185=>16812,
-22195=>16813,
-22391=>16814,
-22396=>16815,
-135963=>16816,
-22479=>16817,
-22500=>16818,
-22628=>16819,
-22665=>16820,
-136302=>16821,
-22738=>16822,
-22752=>16823,
-34369=>16824,
-22923=>16825,
-22930=>16826,
-22979=>16827,
-23059=>16828,
-23143=>16829,
-23159=>16830,
-23172=>16831,
-23236=>16832,
-137405=>16833,
-23421=>16834,
-23443=>16835,
-23570=>16836,
-64060=>16837,
-136884=>16838,
-23674=>16839,
-23695=>16840,
-23711=>16841,
-23715=>16842,
-23722=>16843,
-23760=>16844,
-138804=>16845,
-23821=>16846,
-23879=>16847,
-23937=>16848,
-23972=>16849,
-23975=>16850,
-24011=>16851,
-24158=>16852,
-24313=>16853,
-24320=>16854,
-24322=>16855,
-24355=>16856,
-24381=>16857,
-24404=>16858,
-24445=>16859,
-24589=>16860,
-24596=>16861,
-24600=>16862,
-24629=>16863,
-24647=>16864,
-24733=>16865,
-24788=>16866,
-24797=>16867,
-24875=>16868,
-25020=>16869,
-25017=>16870,
-25122=>16871,
-25178=>16872,
-25199=>16873,
-25302=>16874,
-25468=>16875,
-25573=>16876,
-25721=>16877,
-25796=>16878,
-25808=>16879,
-25897=>16880,
-26013=>16881,
-26170=>16882,
-26146=>16883,
-26155=>16884,
-26160=>16885,
-26163=>16886,
-26184=>16887,
-143812=>16888,
-26231=>16889,
-26232=>16890,
-26253=>16891,
-26299=>16892,
-26331=>16893,
-26344=>16894,
-26439=>16895,
-26497=>16896,
-26515=>16897,
-26520=>16898,
-26523=>16899,
-26620=>16900,
-26653=>16901,
-26787=>16902,
-26890=>16903,
-26953=>16904,
-144836=>16905,
-26946=>16906,
-26980=>16907,
-27045=>16908,
-27087=>16909,
-15286=>16910,
-15299=>16911,
-27113=>16912,
-27125=>16913,
-145215=>16914,
-27195=>16915,
-145251=>16916,
-27284=>16917,
-27301=>16918,
-15375=>16919,
-27419=>16920,
-27436=>16921,
-27495=>16922,
-27561=>16923,
-27565=>16924,
-27607=>16925,
-27647=>16926,
-27653=>16927,
-27764=>16928,
-27800=>16929,
-27899=>16930,
-27846=>16931,
-27953=>16932,
-27961=>16933,
-27967=>16934,
-27992=>16935,
-28052=>16936,
-28074=>16937,
-28123=>16938,
-28125=>16939,
-28228=>16940,
-28254=>16941,
-28337=>16942,
-28353=>16943,
-28432=>16944,
-28505=>16945,
-28513=>16946,
-28542=>16947,
-28556=>16948,
-28576=>16949,
-28604=>16950,
-28615=>16951,
-28618=>16952,
-28656=>16953,
-28750=>16954,
-28789=>16955,
-28836=>16956,
-28900=>16957,
-28971=>16958,
-28958=>16959,
-28974=>16960,
-29009=>16961,
-29032=>16962,
-29061=>16963,
-29063=>16964,
-29114=>16965,
-29124=>16966,
-29205=>16967,
-15935=>16968,
-29339=>16969,
-149489=>16970,
-29479=>16971,
-29520=>16972,
-29542=>16973,
-29602=>16974,
-29739=>16975,
-29766=>16976,
-29794=>16977,
-29805=>16978,
-29862=>16979,
-29865=>16980,
-29897=>16981,
-29951=>16982,
-29975=>16983,
-16242=>16984,
-30158=>16985,
-30210=>16986,
-30216=>16987,
-30308=>16988,
-30337=>16989,
-30365=>16990,
-30378=>16991,
-30390=>16992,
-30414=>16993,
-30420=>16994,
-30438=>16995,
-30449=>16996,
-30474=>16997,
-30489=>16998,
-30541=>16999,
-30542=>17000,
-30586=>17001,
-30592=>17002,
-30612=>17003,
-30688=>17004,
-152718=>17005,
-30787=>17006,
-30830=>17007,
-30896=>17008,
-152846=>17009,
-30893=>17010,
-30976=>17011,
-31004=>17012,
-31022=>17013,
-31028=>17014,
-31046=>17015,
-31097=>17016,
-31176=>17017,
-153457=>17018,
-31188=>17019,
-31198=>17020,
-31211=>17021,
-31213=>17022,
-31365=>17023,
-154052=>17024,
-31438=>17025,
-31485=>17026,
-31506=>17027,
-31533=>17028,
-31547=>17029,
-31599=>17030,
-31745=>17031,
-31795=>17032,
-155041=>17033,
-31853=>17034,
-31865=>17035,
-31887=>17036,
-31892=>17037,
-31904=>17038,
-31957=>17039,
-32049=>17040,
-32092=>17041,
-32131=>17042,
-32166=>17043,
-32194=>17044,
-32296=>17045,
-32663=>17046,
-32731=>17047,
-32821=>17048,
-32823=>17049,
-32970=>17050,
-32992=>17051,
-33011=>17052,
-33120=>17053,
-33127=>17054,
-33128=>17055,
-33133=>17056,
-33211=>17057,
-33226=>17058,
-33239=>17059,
-17499=>17060,
-33376=>17061,
-33396=>17062,
-158463=>17063,
-33441=>17064,
-33443=>17065,
-33444=>17066,
-33449=>17067,
-33471=>17068,
-33493=>17069,
-33533=>17070,
-33536=>17071,
-33570=>17072,
-33581=>17073,
-33594=>17074,
-33607=>17075,
-33661=>17076,
-33703=>17077,
-33743=>17078,
-33745=>17079,
-33761=>17080,
-33793=>17081,
-33798=>17082,
-33887=>17083,
-33904=>17084,
-33907=>17085,
-33925=>17086,
-33950=>17087,
-33978=>17088,
-159296=>17089,
-34098=>17090,
-34078=>17091,
-34095=>17092,
-34148=>17093,
-34170=>17094,
-34188=>17095,
-34210=>17096,
-34251=>17097,
-34285=>17098,
-34303=>17099,
-34308=>17100,
-34309=>17101,
-34320=>17102,
-159988=>17103,
-34328=>17104,
-34360=>17105,
-34391=>17106,
-34402=>17107,
-17821=>17108,
-34421=>17109,
-34488=>17110,
-34556=>17111,
-34695=>17112,
-17898=>17113,
-34826=>17114,
-34832=>17115,
-35022=>17116,
-161412=>17117,
-35122=>17118,
-35129=>17119,
-35136=>17120,
-35220=>17121,
-35318=>17122,
-35399=>17123,
-35421=>17124,
-35425=>17125,
-35445=>17126,
-35536=>17127,
-35654=>17128,
-35673=>17129,
-35689=>17130,
-35741=>17131,
-35913=>17132,
-35944=>17133,
-36271=>17134,
-36305=>17135,
-36311=>17136,
-36387=>17137,
-36413=>17138,
-36475=>17139,
-164471=>17140,
-18500=>17141,
-36602=>17142,
-36638=>17143,
-36653=>17144,
-36692=>17145,
-164813=>17146,
-36840=>17147,
-36846=>17148,
-36872=>17149,
-36909=>17150,
-37015=>17151,
-37043=>17152,
-37054=>17153,
-37060=>17154,
-37061=>17155,
-37063=>17156,
-37103=>17157,
-37140=>17158,
-37142=>17159,
-37154=>17160,
-37155=>17161,
-37167=>17162,
-37172=>17163,
-37251=>17164,
-37361=>17165,
-37705=>17166,
-37732=>17167,
-37733=>17168,
-37795=>17169,
-37855=>17170,
-37892=>17171,
-37939=>17172,
-37962=>17173,
-37987=>17174,
-38001=>17175,
-38286=>17176,
-38303=>17177,
-38316=>17178,
-38326=>17179,
-38347=>17180,
-38352=>17181,
-38355=>17182,
-18864=>17183,
-38366=>17184,
-38565=>17185,
-38639=>17186,
-38734=>17187,
-38805=>17188,
-38830=>17189,
-38842=>17190,
-38849=>17191,
-38857=>17192,
-38875=>17193,
-38998=>17194,
-39143=>17195,
-39256=>17196,
-39427=>17197,
-39617=>17198,
-39619=>17199,
-39630=>17200,
-39638=>17201,
-39682=>17202,
-39688=>17203,
-19479=>17204,
-39725=>17205,
-39774=>17206,
-39782=>17207,
-39812=>17208,
-39818=>17209,
-39838=>17210,
-39886=>17211,
-39909=>17212,
-39928=>17213,
-39971=>17214,
-40015=>17215,
-40016=>17216,
-40037=>17217,
-40221=>17218,
-40222=>17219,
-40259=>17220,
-40274=>17221,
-40330=>17222,
-40342=>17223,
-40384=>17224,
-40364=>17225,
-40380=>17226,
-172432=>17227,
-40423=>17228,
-40455=>17229,
-40606=>17230,
-40623=>17231,
-40855=>17232,
-131209=>17233,
-19970=>17234,
-19983=>17235,
-19986=>17236,
-20009=>17237,
-20014=>17238,
-20039=>17239,
-131234=>17240,
-20049=>17241,
-13318=>17242,
-131236=>17243,
-20073=>17244,
-20125=>17245,
-13356=>17246,
-20156=>17247,
-20163=>17248,
-20168=>17249,
-20203=>17250,
-20186=>17251,
-20209=>17252,
-20213=>17253,
-20246=>17254,
-20324=>17255,
-20279=>17256,
-20286=>17257,
-20312=>17258,
-131603=>17259,
-20343=>17260,
-20344=>17261,
-20354=>17262,
-20357=>17263,
-20454=>17264,
-20402=>17265,
-20421=>17266,
-20427=>17267,
-20434=>17268,
-13418=>17269,
-20466=>17270,
-20499=>17271,
-20508=>17272,
-20558=>17273,
-20563=>17274,
-20579=>17275,
-20643=>17276,
-20616=>17277,
-20626=>17278,
-20627=>17279,
-20629=>17280,
-20650=>17281,
-131883=>17282,
-20657=>17283,
-20666=>17284,
-20667=>17285,
-20676=>17286,
-20679=>17287,
-20723=>17288,
-131969=>17289,
-20686=>17290,
-131953=>17291,
-20692=>17292,
-20705=>17293,
-13458=>17294,
-132089=>17295,
-20759=>17296,
-132170=>17297,
-20832=>17298,
-132361=>17299,
-20851=>17300,
-20867=>17301,
-20875=>17302,
-13500=>17303,
-20888=>17304,
-20899=>17305,
-20909=>17306,
-13511=>17307,
-132566=>17308,
-20979=>17309,
-21010=>17310,
-21014=>17311,
-132943=>17312,
-21077=>17313,
-21084=>17314,
-21100=>17315,
-21111=>17316,
-21124=>17317,
-21122=>17318,
-133127=>17319,
-21144=>17320,
-133178=>17321,
-21156=>17322,
-21178=>17323,
-21179=>17324,
-21194=>17325,
-21201=>17326,
-133305=>17327,
-21239=>17328,
-21301=>17329,
-21314=>17330,
-133500=>17331,
-133533=>17332,
-21351=>17333,
-21370=>17334,
-21412=>17335,
-21428=>17336,
-133843=>17337,
-21431=>17338,
-21440=>17339,
-133917=>17340,
-13661=>17341,
-13662=>17342,
-21461=>17343,
-13667=>17344,
-21492=>17345,
-21540=>17346,
-21544=>17347,
-13678=>17348,
-21571=>17349,
-21602=>17350,
-21612=>17351,
-21653=>17352,
-21664=>17353,
-21670=>17354,
-21678=>17355,
-21687=>17356,
-21690=>17357,
-21699=>17358,
-134469=>17359,
-21740=>17360,
-21743=>17361,
-21745=>17362,
-21747=>17363,
-21760=>17364,
-21761=>17365,
-21769=>17366,
-21820=>17367,
-21825=>17368,
-13734=>17369,
-21831=>17370,
-13736=>17371,
-21860=>17372,
-134625=>17373,
-21885=>17374,
-21890=>17375,
-21905=>17376,
-13765=>17377,
-21970=>17378,
-134805=>17379,
-134765=>17380,
-21951=>17381,
-21961=>17382,
-21964=>17383,
-21969=>17384,
-21981=>17385,
-13786=>17386,
-21986=>17387,
-134756=>17388,
-21993=>17389,
-22056=>17390,
-135007=>17391,
-22023=>17392,
-22032=>17393,
-22064=>17394,
-13812=>17395,
-22077=>17396,
-22080=>17397,
-22087=>17398,
-22110=>17399,
-22112=>17400,
-22125=>17401,
-13829=>17402,
-22152=>17403,
-22156=>17404,
-22173=>17405,
-22184=>17406,
-22194=>17407,
-22213=>17408,
-22221=>17409,
-22239=>17410,
-22248=>17411,
-22262=>17412,
-22263=>17413,
-135681=>17414,
-135765=>17415,
-22313=>17416,
-135803=>17417,
-22341=>17418,
-22342=>17419,
-22349=>17420,
-135796=>17421,
-22376=>17422,
-22383=>17423,
-22387=>17424,
-22388=>17425,
-22389=>17426,
-22395=>17427,
-135908=>17428,
-135895=>17429,
-22426=>17430,
-22429=>17431,
-22430=>17432,
-22440=>17433,
-22487=>17434,
-135933=>17435,
-22476=>17436,
-135990=>17437,
-136004=>17438,
-22494=>17439,
-22512=>17440,
-13898=>17441,
-22520=>17442,
-22523=>17443,
-22525=>17444,
-22532=>17445,
-22558=>17446,
-22567=>17447,
-22585=>17448,
-136132=>17449,
-22601=>17450,
-22604=>17451,
-22631=>17452,
-22666=>17453,
-22667=>17454,
-22669=>17455,
-22671=>17456,
-22672=>17457,
-22676=>17458,
-22685=>17459,
-22698=>17460,
-22705=>17461,
-136301=>17462,
-22723=>17463,
-22733=>17464,
-22754=>17465,
-22771=>17466,
-22772=>17467,
-22789=>17468,
-22790=>17469,
-22797=>17470,
-22804=>17471,
-136663=>17472,
-13969=>17473,
-22845=>17474,
-13977=>17475,
-22854=>17476,
-13974=>17477,
-158761=>17478,
-22879=>17479,
-136775=>17480,
-22901=>17481,
-22902=>17482,
-22908=>17483,
-22943=>17484,
-22958=>17485,
-22972=>17486,
-22984=>17487,
-22989=>17488,
-23006=>17489,
-23015=>17490,
-23022=>17491,
-136966=>17492,
-137026=>17493,
-14031=>17494,
-23053=>17495,
-23063=>17496,
-23079=>17497,
-23085=>17498,
-23141=>17499,
-23162=>17500,
-23179=>17501,
-23196=>17502,
-23199=>17503,
-23200=>17504,
-23202=>17505,
-23217=>17506,
-23221=>17507,
-23226=>17508,
-23231=>17509,
-23258=>17510,
-23260=>17511,
-23269=>17512,
-23280=>17513,
-23278=>17514,
-23285=>17515,
-23304=>17516,
-23319=>17517,
-23348=>17518,
-23372=>17519,
-23378=>17520,
-23400=>17521,
-23407=>17522,
-23425=>17523,
-23428=>17524,
-137667=>17525,
-23446=>17526,
-23468=>17527,
-14177=>17528,
-14178=>17529,
-23502=>17530,
-23510=>17531,
-14188=>17532,
-14187=>17533,
-23537=>17534,
-23549=>17535,
-14197=>17536,
-23555=>17537,
-23593=>17538,
-138326=>17539,
-23647=>17540,
-23655=>17541,
-23656=>17542,
-23664=>17543,
-138541=>17544,
-138565=>17545,
-138616=>17546,
-138594=>17547,
-23688=>17548,
-23690=>17549,
-14273=>17550,
-138657=>17551,
-138652=>17552,
-23712=>17553,
-23714=>17554,
-23719=>17555,
-138642=>17556,
-23725=>17557,
-23733=>17558,
-138679=>17559,
-23753=>17560,
-138720=>17561,
-138803=>17562,
-23814=>17563,
-23824=>17564,
-23851=>17565,
-23837=>17566,
-23840=>17567,
-23857=>17568,
-23865=>17569,
-14312=>17570,
-23905=>17571,
-23914=>17572,
-14324=>17573,
-23920=>17574,
-139038=>17575,
-14333=>17576,
-23944=>17577,
-14336=>17578,
-23959=>17579,
-23984=>17580,
-23988=>17581,
-139126=>17582,
-24017=>17583,
-24023=>17584,
-139258=>17585,
-24036=>17586,
-24041=>17587,
-14383=>17588,
-14390=>17589,
-14400=>17590,
-24095=>17591,
-24126=>17592,
-24137=>17593,
-14428=>17594,
-24150=>17595,
-14433=>17596,
-24173=>17597,
-24174=>17598,
-139643=>17599,
-24229=>17600,
-24236=>17601,
-24249=>17602,
-24262=>17603,
-24281=>17604,
-140062=>17605,
-24317=>17606,
-24328=>17607,
-140205=>17608,
-24350=>17609,
-24391=>17610,
-24419=>17611,
-24434=>17612,
-24446=>17613,
-24463=>17614,
-24482=>17615,
-24519=>17616,
-24523=>17617,
-24530=>17618,
-24531=>17619,
-24532=>17620,
-24546=>17621,
-24558=>17622,
-24559=>17623,
-24563=>17624,
-14615=>17625,
-24610=>17626,
-24612=>17627,
-14618=>17628,
-24652=>17629,
-24725=>17630,
-24744=>17631,
-141043=>17632,
-24753=>17633,
-24766=>17634,
-24776=>17635,
-24793=>17636,
-24814=>17637,
-24821=>17638,
-24848=>17639,
-24857=>17640,
-24862=>17641,
-24890=>17642,
-14703=>17643,
-24897=>17644,
-24902=>17645,
-24928=>17646,
-141403=>17647,
-24978=>17648,
-24979=>17649,
-24983=>17650,
-24997=>17651,
-25005=>17652,
-141483=>17653,
-25045=>17654,
-25053=>17655,
-25077=>17656,
-141711=>17657,
-25123=>17658,
-25170=>17659,
-25185=>17660,
-25188=>17661,
-25211=>17662,
-25197=>17663,
-25203=>17664,
-25241=>17665,
-25301=>17666,
-142008=>17667,
-25341=>17668,
-25347=>17669,
-25360=>17670,
-142159=>17671,
-142160=>17672,
-25394=>17673,
-25397=>17674,
-25403=>17675,
-25404=>17676,
-25409=>17677,
-25412=>17678,
-25422=>17679,
-142150=>17680,
-25433=>17681,
-142365=>17682,
-142246=>17683,
-25452=>17684,
-25497=>17685,
-142372=>17686,
-25492=>17687,
-25533=>17688,
-25556=>17689,
-25557=>17690,
-25568=>17691,
-25579=>17692,
-25580=>17693,
-25586=>17694,
-25630=>17695,
-25637=>17696,
-25641=>17697,
-25647=>17698,
-25690=>17699,
-25693=>17700,
-25715=>17701,
-25725=>17702,
-25735=>17703,
-25745=>17704,
-25759=>17705,
-25803=>17706,
-25804=>17707,
-25813=>17708,
-25815=>17709,
-142817=>17710,
-25828=>17711,
-25855=>17712,
-14958=>17713,
-25871=>17714,
-25876=>17715,
-14963=>17716,
-25886=>17717,
-25906=>17718,
-25924=>17719,
-25940=>17720,
-25963=>17721,
-25978=>17722,
-25988=>17723,
-25994=>17724,
-26034=>17725,
-26037=>17726,
-26040=>17727,
-26047=>17728,
-26057=>17729,
-26068=>17730,
-15062=>17731,
-26105=>17732,
-26108=>17733,
-26116=>17734,
-26120=>17735,
-26145=>17736,
-26154=>17737,
-26181=>17738,
-26193=>17739,
-26190=>17740,
-15082=>17741,
-143811=>17742,
-143861=>17743,
-143798=>17744,
-26218=>17745,
-26220=>17746,
-26221=>17747,
-26235=>17748,
-26240=>17749,
-26256=>17750,
-26258=>17751,
-15118=>17752,
-26285=>17753,
-26289=>17754,
-26293=>17755,
-15130=>17756,
-15132=>17757,
-15063=>17758,
-26369=>17759,
-26386=>17760,
-144242=>17761,
-26393=>17762,
-144339=>17763,
-144338=>17764,
-26445=>17765,
-26452=>17766,
-26461=>17767,
-144336=>17768,
-144356=>17769,
-144341=>17770,
-26484=>17771,
-144346=>17772,
-26514=>17773,
-144351=>17774,
-33635=>17775,
-26640=>17776,
-26563=>17777,
-26568=>17778,
-26578=>17779,
-26587=>17780,
-26615=>17781,
-144458=>17782,
-144465=>17783,
-144459=>17784,
-26648=>17785,
-26655=>17786,
-26669=>17787,
-144485=>17788,
-26675=>17789,
-26683=>17790,
-26686=>17791,
-26693=>17792,
-26697=>17793,
-26700=>17794,
-26709=>17795,
-26711=>17796,
-15223=>17797,
-26731=>17798,
-26734=>17799,
-26748=>17800,
-26754=>17801,
-26768=>17802,
-26774=>17803,
-15213=>17804,
-26776=>17805,
-26777=>17806,
-26778=>17807,
-26780=>17808,
-26794=>17809,
-26795=>17810,
-26804=>17811,
-26811=>17812,
-26875=>17813,
-144612=>17814,
-144730=>17815,
-26819=>17816,
-26821=>17817,
-26828=>17818,
-26841=>17819,
-26852=>17820,
-26853=>17821,
-26860=>17822,
-26871=>17823,
-26883=>17824,
-26887=>17825,
-15239=>17826,
-144788=>17827,
-15245=>17828,
-26950=>17829,
-26985=>17830,
-26988=>17831,
-27002=>17832,
-27026=>17833,
-15268=>17834,
-27030=>17835,
-27056=>17836,
-27066=>17837,
-27068=>17838,
-27072=>17839,
-27089=>17840,
-144953=>17841,
-144967=>17842,
-144952=>17843,
-27107=>17844,
-27118=>17845,
-27119=>17846,
-27123=>17847,
-15309=>17848,
-27124=>17849,
-27134=>17850,
-27153=>17851,
-27162=>17852,
-27165=>17853,
-145180=>17854,
-27186=>17855,
-27187=>17856,
-27199=>17857,
-27209=>17858,
-27258=>17859,
-27214=>17860,
-27218=>17861,
-27236=>17862,
-145164=>17863,
-27275=>17864,
-15344=>17865,
-27297=>17866,
-145252=>17867,
-27307=>17868,
-27325=>17869,
-27334=>17870,
-27348=>17871,
-27344=>17872,
-27357=>17873,
-145407=>17874,
-145383=>17875,
-27377=>17876,
-27378=>17877,
-27379=>17878,
-27389=>17879,
-145444=>17880,
-27403=>17881,
-27407=>17882,
-27408=>17883,
-27409=>17884,
-145469=>17885,
-27415=>17886,
-15398=>17887,
-27439=>17888,
-27466=>17889,
-27480=>17890,
-27500=>17891,
-27509=>17892,
-11934=>17893,
-27514=>17893,
-27521=>17894,
-27547=>17895,
-27566=>17896,
-146072=>17897,
-27581=>17898,
-27591=>17899,
-27592=>17900,
-27593=>17901,
-27610=>17902,
-27622=>17903,
-27623=>17904,
-27630=>17905,
-27650=>17906,
-27658=>17907,
-27662=>17908,
-27702=>17909,
-146559=>17910,
-27725=>17911,
-27739=>17912,
-27757=>17913,
-27780=>17914,
-27785=>17915,
-15555=>17916,
-27796=>17917,
-27799=>17918,
-27821=>17919,
-27842=>17920,
-15570=>17921,
-27868=>17922,
-27881=>17923,
-27885=>17924,
-146688=>17925,
-27904=>17926,
-27940=>17927,
-27942=>17928,
-27943=>17929,
-27751=>17930,
-27951=>17931,
-27964=>17932,
-27995=>17933,
-28000=>17934,
-28016=>17935,
-28032=>17936,
-28033=>17937,
-28042=>17938,
-28045=>17939,
-28049=>17940,
-28056=>17941,
-146752=>17942,
-146938=>17943,
-146937=>17944,
-146899=>17945,
-28075=>17946,
-28078=>17947,
-28084=>17948,
-28098=>17949,
-27956=>17950,
-28104=>17951,
-28110=>17952,
-28127=>17953,
-28150=>17954,
-28214=>17955,
-28190=>17956,
-15633=>17957,
-28210=>17958,
-28232=>17959,
-28233=>17960,
-28235=>17961,
-28236=>17962,
-28239=>17963,
-28243=>17964,
-28244=>17965,
-28247=>17966,
-28259=>17967,
-15646=>17968,
-28307=>17969,
-28327=>17970,
-28340=>17971,
-28355=>17972,
-28469=>17973,
-28395=>17974,
-28409=>17975,
-28411=>17976,
-28426=>17977,
-28428=>17978,
-28440=>17979,
-28453=>17980,
-28470=>17981,
-28476=>17982,
-147326=>17983,
-28498=>17984,
-28503=>17985,
-28512=>17986,
-28520=>17987,
-28560=>17988,
-28566=>17989,
-28606=>17990,
-28575=>17991,
-28581=>17992,
-28591=>17993,
-15716=>17994,
-28616=>17995,
-28617=>17996,
-28649=>17997,
-147606=>17998,
-28668=>17999,
-28672=>18000,
-28682=>18001,
-28707=>18002,
-147715=>18003,
-28730=>18004,
-28739=>18005,
-28743=>18006,
-28747=>18007,
-15770=>18008,
-28773=>18009,
-28777=>18010,
-28782=>18011,
-28790=>18012,
-28806=>18013,
-28823=>18014,
-147910=>18015,
-28831=>18016,
-28849=>18017,
-147966=>18018,
-28908=>18019,
-28874=>18020,
-28881=>18021,
-28931=>18022,
-28934=>18023,
-28936=>18024,
-28940=>18025,
-15808=>18026,
-28975=>18027,
-29008=>18028,
-29011=>18029,
-29022=>18030,
-15828=>18031,
-29078=>18032,
-29056=>18033,
-29083=>18034,
-29088=>18035,
-29090=>18036,
-29102=>18037,
-29103=>18038,
-148412=>18039,
-29145=>18040,
-29148=>18041,
-29191=>18042,
-15877=>18043,
-29236=>18044,
-29241=>18045,
-29250=>18046,
-29271=>18047,
-29283=>18048,
-149033=>18049,
-29294=>18050,
-29295=>18051,
-29304=>18052,
-29311=>18053,
-29326=>18054,
-149157=>18055,
-29358=>18056,
-29360=>18057,
-29377=>18058,
-15968=>18059,
-29388=>18060,
-15974=>18061,
-15976=>18062,
-29427=>18063,
-29434=>18064,
-29447=>18065,
-29458=>18066,
-29464=>18067,
-29465=>18068,
-16003=>18069,
-29497=>18070,
-29484=>18071,
-29491=>18072,
-29501=>18073,
-29522=>18074,
-16020=>18075,
-29547=>18076,
-149654=>18077,
-29550=>18078,
-29551=>18079,
-29553=>18080,
-29569=>18081,
-29578=>18082,
-29588=>18083,
-29592=>18084,
-29596=>18085,
-29605=>18086,
-29625=>18087,
-29631=>18088,
-29637=>18089,
-29643=>18090,
-29665=>18091,
-29671=>18092,
-29689=>18093,
-29715=>18094,
-29690=>18095,
-29697=>18096,
-29779=>18097,
-29760=>18098,
-29763=>18099,
-29778=>18100,
-29789=>18101,
-29825=>18102,
-29832=>18103,
-150093=>18104,
-29842=>18105,
-29847=>18106,
-29849=>18107,
-29857=>18108,
-29861=>18109,
-29866=>18110,
-29881=>18111,
-29883=>18112,
-29882=>18113,
-29910=>18114,
-29912=>18115,
-29931=>18116,
-150358=>18117,
-29946=>18118,
-150383=>18119,
-29984=>18120,
-29988=>18121,
-29994=>18122,
-16215=>18123,
-150550=>18124,
-30013=>18125,
-30014=>18126,
-30016=>18127,
-30024=>18128,
-30032=>18129,
-30034=>18130,
-30066=>18131,
-30065=>18132,
-30074=>18133,
-30077=>18134,
-30078=>18135,
-30092=>18136,
-16245=>18137,
-30114=>18138,
-16247=>18139,
-30128=>18140,
-30135=>18141,
-30143=>18142,
-30144=>18143,
-30150=>18144,
-30159=>18145,
-30163=>18146,
-30173=>18147,
-30175=>18148,
-30176=>18149,
-30183=>18150,
-30190=>18151,
-30193=>18152,
-30211=>18153,
-30232=>18154,
-30215=>18155,
-30223=>18156,
-16302=>18157,
-151054=>18158,
-30227=>18159,
-30235=>18160,
-30236=>18161,
-151095=>18162,
-30245=>18163,
-30248=>18164,
-30268=>18165,
-30259=>18166,
-151146=>18167,
-16329=>18168,
-30273=>18169,
-151179=>18170,
-30281=>18171,
-30293=>18172,
-16343=>18173,
-30318=>18174,
-30357=>18175,
-30369=>18176,
-30368=>18177,
-30375=>18178,
-30376=>18179,
-30383=>18180,
-151626=>18181,
-30409=>18182,
-151637=>18183,
-30440=>18184,
-151842=>18185,
-30487=>18186,
-30490=>18187,
-30509=>18188,
-30517=>18189,
-151977=>18190,
-16441=>18191,
-152037=>18192,
-152013=>18193,
-30552=>18194,
-152094=>18195,
-30588=>18196,
-152140=>18197,
-16472=>18198,
-30618=>18199,
-30623=>18200,
-30626=>18201,
-30628=>18202,
-30686=>18203,
-30687=>18204,
-30692=>18205,
-30698=>18206,
-30700=>18207,
-30715=>18208,
-152622=>18209,
-30725=>18210,
-30729=>18211,
-30733=>18212,
-30745=>18213,
-30764=>18214,
-30791=>18215,
-30826=>18216,
-152793=>18217,
-30858=>18218,
-30868=>18219,
-30884=>18220,
-30877=>18221,
-30879=>18222,
-30907=>18223,
-30933=>18224,
-30950=>18225,
-30969=>18226,
-30970=>18227,
-30974=>18228,
-152999=>18229,
-30992=>18230,
-31003=>18231,
-31013=>18232,
-31050=>18233,
-31064=>18234,
-16645=>18235,
-31079=>18236,
-31090=>18237,
-31125=>18238,
-31137=>18239,
-31145=>18240,
-31156=>18241,
-31170=>18242,
-31175=>18243,
-31180=>18244,
-31181=>18245,
-31190=>18246,
-16712=>18247,
-153513=>18248,
-153524=>18249,
-16719=>18250,
-31242=>18251,
-31253=>18252,
-31259=>18253,
-16739=>18254,
-31288=>18255,
-31303=>18256,
-31318=>18257,
-31321=>18258,
-31324=>18259,
-31327=>18260,
-31335=>18261,
-31338=>18262,
-31349=>18263,
-31362=>18264,
-31370=>18265,
-31376=>18266,
-31404=>18267,
-154068=>18268,
-16820=>18269,
-31417=>18270,
-31422=>18271,
-16831=>18272,
-31436=>18273,
-31464=>18274,
-31476=>18275,
-154340=>18276,
-154339=>18277,
-154353=>18278,
-31549=>18279,
-31530=>18280,
-31534=>18281,
-31535=>18282,
-16870=>18283,
-16883=>18284,
-31615=>18285,
-31553=>18286,
-16878=>18287,
-31573=>18288,
-31609=>18289,
-31588=>18290,
-31590=>18291,
-31603=>18292,
-154546=>18293,
-16903=>18294,
-31632=>18295,
-31643=>18296,
-16910=>18297,
-31669=>18298,
-31676=>18299,
-31685=>18300,
-31690=>18301,
-154699=>18302,
-154724=>18303,
-31700=>18304,
-31702=>18305,
-31706=>18306,
-31722=>18307,
-31728=>18308,
-31747=>18309,
-31758=>18310,
-31813=>18311,
-31818=>18312,
-31831=>18313,
-31838=>18314,
-31841=>18315,
-31849=>18316,
-31855=>18317,
-155182=>18318,
-155222=>18319,
-155237=>18320,
-31910=>18321,
-155234=>18322,
-31926=>18323,
-31927=>18324,
-155352=>18325,
-31940=>18326,
-155330=>18327,
-31949=>18328,
-155368=>18329,
-155427=>18330,
-31974=>18331,
-155484=>18332,
-31989=>18333,
-32003=>18334,
-17094=>18335,
-32018=>18336,
-32030=>18337,
-155616=>18338,
-155604=>18339,
-32061=>18340,
-32062=>18341,
-32064=>18342,
-32071=>18343,
-155660=>18344,
-155643=>18345,
-17110=>18346,
-32090=>18347,
-32106=>18348,
-32112=>18349,
-17117=>18350,
-32127=>18351,
-155671=>18352,
-32136=>18353,
-32151=>18354,
-155744=>18355,
-32157=>18356,
-32167=>18357,
-32170=>18358,
-32182=>18359,
-32192=>18360,
-32215=>18361,
-32217=>18362,
-32230=>18363,
-17154=>18364,
-155885=>18365,
-64088=>18366,
-32272=>18367,
-32279=>18368,
-32285=>18369,
-32295=>18370,
-32300=>18371,
-32325=>18372,
-32373=>18373,
-32382=>18374,
-32390=>18375,
-32391=>18376,
-17195=>18377,
-32410=>18378,
-17219=>18379,
-32572=>18380,
-32571=>18381,
-32574=>18382,
-32579=>18383,
-13505=>18384,
-156272=>18385,
-156294=>18386,
-32611=>18387,
-32612=>18388,
-32621=>18389,
-32637=>18390,
-32638=>18391,
-32656=>18392,
-20859=>18393,
-146702=>18394,
-32662=>18395,
-32668=>18396,
-32685=>18397,
-156674=>18398,
-32707=>18399,
-32719=>18400,
-32739=>18401,
-32754=>18402,
-32778=>18403,
-32776=>18404,
-32790=>18405,
-32812=>18406,
-32816=>18407,
-32835=>18408,
-32870=>18409,
-32891=>18410,
-32921=>18411,
-32924=>18412,
-32932=>18413,
-32935=>18414,
-32952=>18415,
-157310=>18416,
-32965=>18417,
-32981=>18418,
-32998=>18419,
-33037=>18420,
-33013=>18421,
-33019=>18422,
-17390=>18423,
-33077=>18424,
-33054=>18425,
-17392=>18426,
-33060=>18427,
-33063=>18428,
-33068=>18429,
-157469=>18430,
-33085=>18431,
-17416=>18432,
-33129=>18433,
-17431=>18434,
-17436=>18435,
-33157=>18436,
-17442=>18437,
-33176=>18438,
-33202=>18439,
-33217=>18440,
-33219=>18441,
-33238=>18442,
-33243=>18443,
-157917=>18444,
-33252=>18445,
-157930=>18446,
-33260=>18447,
-33277=>18448,
-33279=>18449,
-158063=>18450,
-33284=>18451,
-158173=>18452,
-33305=>18453,
-33314=>18454,
-158238=>18455,
-33340=>18456,
-33353=>18457,
-33349=>18458,
-158296=>18459,
-17526=>18460,
-17530=>18461,
-33367=>18462,
-158348=>18463,
-33372=>18464,
-33379=>18465,
-158391=>18466,
-17553=>18467,
-33405=>18468,
-33407=>18469,
-33411=>18470,
-33418=>18471,
-33427=>18472,
-33447=>18473,
-33448=>18474,
-33458=>18475,
-33460=>18476,
-33466=>18477,
-33468=>18478,
-33506=>18479,
-33512=>18480,
-33527=>18481,
-33543=>18482,
-33544=>18483,
-33548=>18484,
-33620=>18485,
-33563=>18486,
-33565=>18487,
-33584=>18488,
-33596=>18489,
-33604=>18490,
-33623=>18491,
-17598=>18492,
-17620=>18493,
-17587=>18494,
-33684=>18495,
-33685=>18496,
-33691=>18497,
-33693=>18498,
-33737=>18499,
-33744=>18500,
-33748=>18501,
-33757=>18502,
-33765=>18503,
-33785=>18504,
-33813=>18505,
-158835=>18506,
-33815=>18507,
-33849=>18508,
-33871=>18509,
-33873=>18510,
-33874=>18511,
-33881=>18512,
-33882=>18513,
-33884=>18514,
-158941=>18515,
-33893=>18516,
-33912=>18517,
-33916=>18518,
-33921=>18519,
-17677=>18520,
-33943=>18521,
-33958=>18522,
-33982=>18523,
-17672=>18524,
-33998=>18525,
-33999=>18526,
-34003=>18527,
-159333=>18528,
-34023=>18529,
-34026=>18530,
-34031=>18531,
-34033=>18532,
-34042=>18533,
-34075=>18534,
-34084=>18535,
-34085=>18536,
-34091=>18537,
-34127=>18538,
-34159=>18539,
-17731=>18540,
-34129=>18541,
-34145=>18542,
-34146=>18543,
-159636=>18544,
-34171=>18545,
-34173=>18546,
-34175=>18547,
-34177=>18548,
-34182=>18549,
-34195=>18550,
-34205=>18551,
-34207=>18552,
-159736=>18553,
-159734=>18554,
-159735=>18555,
-34236=>18556,
-34247=>18557,
-34250=>18558,
-34264=>18559,
-34265=>18560,
-34271=>18561,
-34273=>18562,
-34278=>18563,
-34294=>18564,
-34304=>18565,
-34321=>18566,
-34334=>18567,
-34337=>18568,
-34340=>18569,
-34343=>18570,
-160013=>18571,
-34361=>18572,
-34364=>18573,
-160057=>18574,
-34368=>18575,
-34387=>18576,
-34390=>18577,
-34423=>18578,
-34439=>18579,
-34441=>18580,
-34460=>18581,
-34461=>18582,
-34481=>18583,
-34483=>18584,
-34497=>18585,
-34499=>18586,
-34513=>18587,
-34517=>18588,
-34519=>18589,
-34531=>18590,
-34534=>18591,
-17848=>18592,
-34565=>18593,
-34567=>18594,
-34574=>18595,
-34576=>18596,
-34591=>18597,
-34593=>18598,
-34595=>18599,
-34609=>18600,
-34618=>18601,
-34624=>18602,
-34627=>18603,
-34641=>18604,
-34648=>18605,
-34660=>18606,
-34661=>18607,
-34674=>18608,
-34684=>18609,
-160731=>18610,
-160730=>18611,
-34727=>18612,
-34697=>18613,
-34699=>18614,
-34707=>18615,
-34720=>18616,
-160766=>18617,
-17893=>18618,
-34750=>18619,
-160784=>18620,
-34753=>18621,
-34766=>18622,
-34783=>18623,
-160841=>18624,
-34787=>18625,
-34789=>18626,
-34790=>18627,
-34794=>18628,
-34835=>18629,
-34856=>18630,
-34862=>18631,
-34866=>18632,
-34876=>18633,
-17935=>18634,
-34890=>18635,
-34904=>18636,
-161301=>18637,
-161300=>18638,
-34921=>18639,
-161329=>18640,
-34927=>18641,
-34976=>18642,
-35004=>18643,
-35008=>18644,
-161427=>18645,
-35025=>18646,
-35027=>18647,
-17985=>18648,
-35073=>18649,
-161550=>18650,
-35127=>18651,
-161571=>18652,
-35138=>18653,
-35141=>18654,
-35145=>18655,
-161618=>18656,
-35170=>18657,
-35209=>18658,
-35216=>18659,
-35231=>18660,
-35248=>18661,
-35255=>18662,
-35288=>18663,
-35307=>18664,
-18081=>18665,
-35315=>18666,
-35325=>18667,
-35327=>18668,
-18095=>18669,
-35345=>18670,
-35348=>18671,
-162181=>18672,
-35361=>18673,
-35381=>18674,
-35390=>18675,
-35397=>18676,
-35405=>18677,
-35416=>18678,
-35502=>18679,
-35472=>18680,
-35511=>18681,
-35543=>18682,
-35580=>18683,
-162436=>18684,
-35594=>18685,
-35589=>18686,
-35597=>18687,
-35612=>18688,
-35629=>18689,
-18188=>18690,
-35665=>18691,
-35678=>18692,
-35702=>18693,
-35713=>18694,
-35723=>18695,
-35732=>18696,
-35733=>18697,
-35897=>18698,
-162739=>18699,
-35901=>18700,
-162750=>18701,
-162759=>18702,
-35909=>18703,
-35919=>18704,
-35927=>18705,
-35945=>18706,
-35949=>18707,
-163000=>18708,
-35987=>18709,
-35986=>18710,
-35993=>18711,
-18276=>18712,
-35995=>18713,
-36054=>18714,
-36053=>18715,
-163232=>18716,
-36081=>18717,
-163344=>18718,
-36105=>18719,
-36110=>18720,
-36296=>18721,
-36313=>18722,
-36364=>18723,
-18429=>18724,
-36349=>18725,
-36358=>18726,
-163978=>18727,
-36372=>18728,
-36374=>18729,
-36385=>18730,
-36386=>18731,
-36391=>18732,
-164027=>18733,
-18454=>18734,
-36406=>18735,
-36409=>18736,
-36436=>18737,
-36450=>18738,
-36461=>18739,
-36463=>18740,
-36504=>18741,
-36510=>18742,
-36533=>18743,
-36539=>18744,
-164482=>18745,
-18510=>18746,
-164595=>18747,
-36608=>18748,
-36616=>18749,
-36651=>18750,
-36672=>18751,
-36682=>18752,
-36696=>18753,
-164876=>18754,
-36772=>18755,
-36788=>18756,
-164949=>18757,
-36801=>18758,
-36806=>18759,
-64036=>18760,
-36810=>18761,
-36813=>18762,
-36819=>18763,
-36821=>18764,
-36849=>18765,
-36853=>18766,
-36859=>18767,
-36876=>18768,
-36919=>18769,
-165227=>18770,
-36931=>18771,
-36957=>18772,
-165320=>18773,
-165321=>18774,
-36997=>18775,
-37004=>18776,
-37008=>18777,
-37025=>18778,
-18613=>18779,
-37040=>18780,
-37046=>18781,
-37059=>18782,
-37064=>18783,
-165591=>18784,
-37084=>18785,
-37087=>18786,
-165626=>18787,
-37110=>18788,
-37106=>18789,
-37120=>18790,
-37099=>18791,
-37118=>18792,
-37119=>18793,
-37124=>18794,
-37126=>18795,
-37144=>18796,
-37150=>18797,
-37175=>18798,
-37177=>18799,
-37190=>18800,
-37191=>18801,
-37207=>18802,
-37209=>18803,
-37236=>18804,
-37241=>18805,
-37253=>18806,
-37299=>18807,
-37302=>18808,
-37315=>18809,
-37316=>18810,
-166217=>18811,
-166214=>18812,
-37356=>18813,
-37377=>18814,
-37398=>18815,
-37399=>18816,
-166251=>18817,
-37442=>18818,
-37450=>18819,
-37462=>18820,
-37473=>18821,
-37477=>18822,
-37480=>18823,
-166280=>18824,
-37500=>18825,
-37501=>18826,
-37503=>18827,
-37513=>18828,
-37517=>18829,
-37527=>18830,
-37529=>18831,
-37535=>18832,
-37547=>18833,
-166330=>18834,
-166331=>18835,
-37554=>18836,
-37567=>18837,
-37568=>18838,
-37574=>18839,
-37582=>18840,
-37605=>18841,
-37649=>18842,
-166430=>18843,
-166441=>18844,
-37623=>18845,
-37673=>18846,
-166513=>18847,
-166467=>18848,
-37713=>18849,
-37722=>18850,
-37739=>18851,
-37745=>18852,
-37747=>18853,
-37793=>18854,
-166553=>18855,
-166605=>18856,
-37768=>18857,
-37771=>18858,
-37775=>18859,
-37790=>18860,
-37877=>18861,
-166628=>18862,
-166621=>18863,
-37873=>18864,
-37831=>18865,
-37852=>18866,
-37863=>18867,
-37897=>18868,
-37910=>18869,
-37911=>18870,
-37883=>18871,
-37938=>18872,
-37947=>18873,
-166849=>18874,
-166895=>18875,
-37997=>18876,
-37999=>18877,
-38265=>18878,
-38278=>18879,
-38284=>18880,
-38285=>18881,
-167184=>18882,
-167281=>18883,
-38344=>18884,
-167419=>18885,
-167455=>18886,
-38444=>18887,
-38451=>18888,
-38452=>18889,
-167478=>18890,
-38460=>18891,
-38497=>18892,
-167561=>18893,
-38530=>18894,
-167659=>18895,
-38554=>18896,
-167730=>18897,
-18919=>18898,
-38579=>18899,
-38586=>18900,
-38589=>18901,
-18938=>18902,
-167928=>18903,
-38616=>18904,
-38618=>18905,
-38621=>18906,
-18948=>18907,
-38676=>18908,
-38691=>18909,
-18985=>18910,
-38710=>18911,
-38721=>18912,
-38727=>18913,
-38743=>18914,
-38747=>18915,
-38762=>18916,
-168608=>18917,
-168625=>18918,
-38806=>18919,
-38814=>18920,
-38833=>18921,
-38834=>18922,
-38846=>18923,
-38860=>18924,
-38865=>18925,
-38868=>18926,
-38872=>18927,
-38881=>18928,
-38897=>18929,
-38916=>18930,
-38925=>18931,
-38932=>18932,
-38934=>18933,
-19132=>18934,
-169104=>18935,
-38962=>18936,
-38963=>18937,
-38949=>18938,
-38983=>18939,
-39014=>18940,
-39083=>18941,
-39085=>18942,
-39088=>18943,
-169423=>18944,
-39095=>18945,
-39099=>18946,
-39100=>18947,
-39106=>18948,
-39111=>18949,
-39115=>18950,
-39137=>18951,
-39139=>18952,
-39146=>18953,
-39152=>18954,
-39153=>18955,
-39155=>18956,
-39176=>18957,
-19259=>18958,
-169712=>18959,
-39190=>18960,
-39191=>18961,
-169753=>18962,
-39194=>18963,
-39195=>18964,
-39196=>18965,
-169808=>18966,
-39217=>18967,
-39226=>18968,
-39227=>18969,
-39228=>18970,
-39233=>18971,
-39238=>18972,
-39246=>18973,
-39264=>18974,
-39331=>18975,
-39334=>18976,
-39357=>18977,
-39359=>18978,
-39363=>18979,
-39380=>18980,
-39385=>18981,
-39390=>18982,
-170182=>18983,
-39408=>18984,
-39417=>18985,
-39420=>18986,
-39434=>18987,
-39441=>18988,
-39450=>18989,
-39456=>18990,
-39473=>18991,
-39492=>18992,
-39500=>18993,
-39512=>18994,
-19394=>18995,
-39599=>18996,
-19402=>18997,
-39607=>18998,
-19410=>18999,
-39609=>19000,
-170610=>19001,
-39622=>19002,
-39632=>19003,
-39634=>19004,
-39637=>19005,
-39648=>19006,
-39653=>19007,
-39657=>19008,
-39692=>19009,
-39696=>19010,
-39698=>19011,
-39702=>19012,
-39708=>19013,
-39723=>19014,
-39741=>19015,
-19488=>19016,
-39755=>19017,
-39779=>19018,
-39781=>19019,
-39787=>19020,
-39788=>19021,
-39798=>19022,
-39799=>19023,
-39846=>19024,
-39852=>19025,
-171483=>19026,
-39858=>19027,
-39864=>19028,
-39870=>19029,
-39923=>19030,
-39896=>19031,
-39901=>19032,
-39914=>19033,
-39919=>19034,
-39918=>19035,
-171541=>19036,
-171658=>19037,
-171593=>19038,
-39958=>19039,
-39960=>19040,
-39961=>19041,
-39962=>19042,
-39965=>19043,
-39970=>19044,
-39977=>19045,
-171716=>19046,
-39985=>19047,
-39991=>19048,
-40005=>19049,
-40028=>19050,
-171753=>19051,
-40009=>19052,
-40010=>19053,
-171739=>19054,
-40020=>19055,
-40024=>19056,
-40027=>19057,
-40029=>19058,
-40031=>19059,
-40041=>19060,
-40042=>19061,
-40043=>19062,
-40045=>19063,
-40046=>19064,
-40050=>19065,
-40053=>19066,
-40058=>19067,
-40166=>19068,
-40178=>19069,
-40203=>19070,
-171982=>19071,
-171991=>19071,
-40209=>19072,
-40215=>19073,
-40216=>19074,
-172079=>19075,
-19652=>19076,
-172058=>19077,
-40242=>19078,
-19665=>19079,
-40266=>19080,
-40287=>19081,
-40290=>19082,
-172281=>19083,
-172162=>19084,
-40307=>19085,
-40310=>19086,
-40311=>19087,
-40324=>19088,
-40345=>19089,
-40353=>19090,
-40383=>19091,
-40373=>19092,
-40377=>19093,
-40381=>19094,
-40393=>19095,
-40410=>19096,
-40416=>19097,
-40419=>19098,
-19719=>19099,
-40458=>19100,
-40450=>19101,
-40461=>19102,
-40476=>19103,
-40571=>19104,
-139800=>19105,
-40576=>19106,
-40581=>19107,
-40603=>19108,
-172940=>19109,
-40637=>19110,
-173111=>19111,
-40671=>19112,
-40703=>19113,
-40706=>19114,
-19831=>19115,
-40707=>19116,
-40762=>19117,
-40765=>19118,
-40774=>19119,
-40787=>19120,
-40789=>19121,
-40792=>19122,
-173553=>19123,
-40797=>19124,
-173570=>19125,
-40809=>19126,
-40813=>19127,
-40816=>19128,
-173746=>19129,
-11948=>19130,
-13844=>19131,
-14509=>19132,
-15820=>19133,
-16348=>19134,
-17854=>19135,
-17936=>19136,
-19326=>19137,
-19512=>19138,
-19681=>19139,
-19980=>19140,
-20003=>19141,
-20004=>19142,
-20089=>19143,
-20211=>19144,
-20236=>19145,
-20249=>19146,
-20267=>19147,
-20270=>19148,
-20273=>19149,
-20356=>19150,
-20382=>19151,
-20407=>19152,
-20484=>19153,
-20492=>19154,
-20556=>19155,
-20575=>19156,
-20578=>19157,
-20599=>19158,
-20622=>19159,
-20638=>19160,
-20642=>19161,
-20675=>19162,
-20712=>19163,
-20721=>19164,
-20734=>19165,
-20743=>19166,
-20748=>19167,
-20749=>19168,
-20750=>19169,
-20787=>19170,
-20792=>19171,
-20852=>19172,
-20868=>19173,
-20920=>19174,
-20922=>19175,
-20936=>19176,
-20943=>19177,
-20945=>19178,
-20947=>19179,
-20948=>19180,
-20952=>19181,
-20959=>19182,
-20997=>19183,
-21030=>19184,
-21032=>19185,
-21035=>19186,
-21041=>19187,
-21042=>19188,
-21045=>19189,
-21052=>19190,
-21082=>19191,
-21088=>19192,
-21102=>19193,
-21112=>19194,
-21113=>19195,
-21130=>19196,
-21132=>19197,
-21217=>19198,
-21225=>19199,
-21233=>19200,
-21251=>19201,
-21265=>19202,
-21279=>19203,
-21293=>19204,
-21298=>19205,
-21309=>19206,
-21349=>19207,
-21357=>19208,
-21369=>19209,
-21374=>19210,
-21396=>19211,
-21401=>19212,
-21418=>19213,
-21423=>19214,
-21434=>19215,
-21441=>19216,
-21444=>19217,
-21445=>19218,
-21472=>19219,
-21523=>19220,
-21546=>19221,
-21553=>19222,
-21556=>19223,
-21557=>19224,
-21580=>19225,
-21671=>19226,
-21674=>19227,
-21681=>19228,
-21691=>19229,
-21710=>19230,
-21738=>19231,
-21756=>19232,
-21765=>19233,
-21768=>19234,
-21781=>19235,
-21799=>19236,
-21802=>19237,
-21814=>19238,
-21841=>19239,
-21862=>19240,
-21903=>19241,
-21906=>19242,
-21908=>19243,
-21924=>19244,
-21938=>19245,
-21955=>19246,
-21958=>19247,
-21971=>19248,
-21979=>19249,
-21996=>19250,
-21998=>19251,
-22001=>19252,
-22006=>19253,
-22008=>19254,
-22021=>19255,
-22029=>19256,
-22033=>19257,
-22034=>19258,
-22060=>19259,
-22069=>19260,
-22073=>19261,
-22093=>19262,
-22100=>19263,
-22149=>19264,
-22175=>19265,
-22182=>19266,
-22199=>19267,
-22220=>19268,
-22223=>19269,
-22233=>19270,
-22241=>19271,
-22251=>19272,
-22253=>19273,
-22257=>19274,
-22279=>19275,
-22284=>19276,
-22298=>19277,
-22299=>19278,
-22301=>19279,
-22316=>19280,
-22318=>19281,
-22333=>19282,
-22334=>19283,
-22367=>19284,
-22379=>19285,
-22381=>19286,
-22394=>19287,
-22403=>19288,
-22423=>19289,
-22446=>19290,
-22485=>19291,
-22503=>19292,
-22541=>19293,
-22566=>19294,
-22605=>19295,
-22607=>19296,
-22623=>19297,
-22637=>19298,
-22655=>19299,
-22657=>19300,
-22680=>19301,
-22716=>19302,
-22815=>19303,
-22819=>19304,
-22873=>19305,
-22905=>19306,
-22935=>19307,
-22959=>19308,
-22963=>19309,
-23007=>19310,
-23025=>19311,
-23032=>19312,
-23218=>19313,
-23224=>19314,
-23274=>19315,
-23286=>19316,
-23323=>19317,
-23325=>19318,
-23329=>19319,
-23352=>19320,
-23479=>19321,
-23511=>19322,
-23520=>19323,
-23583=>19324,
-23594=>19325,
-23596=>19326,
-23606=>19327,
-23641=>19328,
-23644=>19329,
-23661=>19330,
-23773=>19331,
-23809=>19332,
-23860=>19333,
-23869=>19334,
-23897=>19335,
-23934=>19336,
-23939=>19337,
-24007=>19338,
-24057=>19339,
-24104=>19340,
-24114=>19341,
-24117=>19342,
-24155=>19343,
-24168=>19344,
-24170=>19345,
-24183=>19346,
-24192=>19347,
-24203=>19348,
-24243=>19349,
-24253=>19350,
-24273=>19351,
-24276=>19352,
-24277=>19353,
-24397=>19354,
-24492=>19355,
-24554=>19356,
-24583=>19357,
-24649=>19358,
-24660=>19359,
-24679=>19360,
-24763=>19361,
-24772=>19362,
-24829=>19363,
-24842=>19364,
-24854=>19365,
-24874=>19366,
-24886=>19367,
-24926=>19368,
-24932=>19369,
-24955=>19370,
-24957=>19371,
-24959=>19372,
-24989=>19373,
-25016=>19374,
-25052=>19375,
-25058=>19376,
-25061=>19377,
-25064=>19378,
-25092=>19379,
-25095=>19380,
-25137=>19381,
-25145=>19382,
-25149=>19383,
-25210=>19384,
-25232=>19385,
-25256=>19386,
-25306=>19387,
-25332=>19388,
-25366=>19389,
-25386=>19390,
-25398=>19391,
-25414=>19392,
-25419=>19393,
-25427=>19394,
-25457=>19395,
-25461=>19396,
-25471=>19397,
-25474=>19398,
-25482=>19399,
-25518=>19400,
-25519=>19401,
-25578=>19402,
-25592=>19403,
-25593=>19404,
-25618=>19405,
-25624=>19406,
-25632=>19407,
-25636=>19408,
-25642=>19409,
-25653=>19410,
-25661=>19411,
-25663=>19412,
-25682=>19413,
-25695=>19414,
-25716=>19415,
-25744=>19416,
-25752=>19417,
-25753=>19418,
-25772=>19419,
-25779=>19420,
-25837=>19421,
-25840=>19422,
-25883=>19423,
-25887=>19424,
-25902=>19425,
-25929=>19426,
-25952=>19427,
-26002=>19428,
-26005=>19429,
-26036=>19430,
-26046=>19431,
-26056=>19432,
-26062=>19433,
-26064=>19434,
-26079=>19435,
-26238=>19436,
-26251=>19437,
-26252=>19438,
-26291=>19439,
-26304=>19440,
-26319=>19441,
-26405=>19442,
-26421=>19443,
-26453=>19444,
-26496=>19445,
-26511=>19446,
-26513=>19447,
-26532=>19448,
-26545=>19449,
-26549=>19450,
-26558=>19451,
-26664=>19452,
-26758=>19453,
-26859=>19454,
-26869=>19455,
-26903=>19456,
-26931=>19457,
-26936=>19458,
-26971=>19459,
-26981=>19460,
-27048=>19461,
-27051=>19462,
-27055=>19463,
-27109=>19464,
-27121=>19465,
-27210=>19466,
-27221=>19467,
-27239=>19468,
-27249=>19469,
-27311=>19470,
-27336=>19471,
-27337=>19472,
-27395=>19473,
-27451=>19474,
-27455=>19475,
-27517=>19476,
-27518=>19477,
-27568=>19478,
-27639=>19479,
-27641=>19480,
-27652=>19481,
-27657=>19482,
-27661=>19483,
-27692=>19484,
-27722=>19485,
-27730=>19486,
-27732=>19487,
-27769=>19488,
-27820=>19489,
-27828=>19490,
-27858=>19491,
-28001=>19492,
-28028=>19493,
-28089=>19494,
-28144=>19495,
-28229=>19496,
-28275=>19497,
-28283=>19498,
-28285=>19499,
-28297=>19500,
-28348=>19501,
-28378=>19502,
-28379=>19503,
-28454=>19504,
-28457=>19505,
-28464=>19506,
-28551=>19507,
-28573=>19508,
-28590=>19509,
-28599=>19510,
-28685=>19511,
-28704=>19512,
-28745=>19513,
-28824=>19514,
-28848=>19515,
-28885=>19516,
-28886=>19517,
-28997=>19518,
-29106=>19519,
-29172=>19520,
-29207=>19521,
-29215=>19522,
-29251=>19523,
-29263=>19524,
-29264=>19525,
-29274=>19526,
-29280=>19527,
-29288=>19528,
-29303=>19529,
-29316=>19530,
-29385=>19531,
-29413=>19532,
-29428=>19533,
-29442=>19534,
-29451=>19535,
-29470=>19536,
-29474=>19537,
-29498=>19538,
-29499=>19539,
-29517=>19540,
-29528=>19541,
-29543=>19542,
-29810=>19543,
-29871=>19544,
-29919=>19545,
-29924=>19546,
-29940=>19547,
-29947=>19548,
-29974=>19549,
-29985=>19550,
-30015=>19551,
-30046=>19552,
-30105=>19553,
-30116=>19554,
-30145=>19555,
-30148=>19556,
-30156=>19557,
-30167=>19558,
-30172=>19559,
-30177=>19560,
-30191=>19561,
-30212=>19562,
-30220=>19563,
-30237=>19564,
-30258=>19565,
-30264=>19566,
-30277=>19567,
-30282=>19568,
-30303=>19569,
-30381=>19570,
-30397=>19571,
-30425=>19572,
-30443=>19573,
-30448=>19574,
-30457=>19575,
-30464=>19576,
-30478=>19577,
-30498=>19578,
-30504=>19579,
-30511=>19580,
-30521=>19581,
-30526=>19582,
-30533=>19583,
-30538=>19584,
-30543=>19585,
-30558=>19586,
-30564=>19587,
-30567=>19588,
-30572=>19589,
-30596=>19590,
-30604=>19591,
-30605=>19592,
-30614=>19593,
-30631=>19594,
-30639=>19595,
-30647=>19596,
-30654=>19597,
-30665=>19598,
-30673=>19599,
-30681=>19600,
-30705=>19601,
-30775=>19602,
-30812=>19603,
-30846=>19604,
-30872=>19605,
-30881=>19606,
-30897=>19607,
-30899=>19608,
-30921=>19609,
-30931=>19610,
-30988=>19611,
-31007=>19612,
-31015=>19613,
-31016=>19614,
-31039=>19615,
-31042=>19616,
-31060=>19617,
-31083=>19618,
-31100=>19619,
-31147=>19620,
-31172=>19621,
-31210=>19622,
-31234=>19623,
-31244=>19624,
-31280=>19625,
-31290=>19626,
-31300=>19627,
-31360=>19628,
-31366=>19629,
-31380=>19630,
-31413=>19631,
-31421=>19632,
-31486=>19633,
-31531=>19634,
-31607=>19635,
-31648=>19636,
-31660=>19637,
-31664=>19638,
-31720=>19639,
-31730=>19640,
-31736=>19641,
-31740=>19642,
-31742=>19643,
-31753=>19644,
-31784=>19645,
-31791=>19646,
-31810=>19647,
-31826=>19648,
-31827=>19649,
-31835=>19650,
-31836=>19651,
-31837=>19652,
-31858=>19653,
-31869=>19654,
-31879=>19655,
-31902=>19656,
-31930=>19657,
-31943=>19658,
-31955=>19659,
-31962=>19660,
-32060=>19661,
-32077=>19662,
-32130=>19663,
-32133=>19664,
-32141=>19665,
-32145=>19666,
-32158=>19667,
-32179=>19668,
-32185=>19669,
-32208=>19670,
-32229=>19671,
-32245=>19672,
-32246=>19673,
-32303=>19674,
-32310=>19675,
-32324=>19676,
-32367=>19677,
-32376=>19678,
-32385=>19679,
-32573=>19680,
-32603=>19681,
-32605=>19682,
-32613=>19683,
-32625=>19684,
-32639=>19685,
-32640=>19686,
-32651=>19687,
-32674=>19688,
-32765=>19689,
-32766=>19690,
-32767=>19691,
-32775=>19692,
-32781=>19693,
-32798=>19694,
-32825=>19695,
-32904=>19696,
-32910=>19697,
-32975=>19698,
-32980=>19699,
-33005=>19700,
-33008=>19701,
-33015=>19702,
-33018=>19703,
-33022=>19704,
-33027=>19705,
-33047=>19706,
-33072=>19707,
-33111=>19708,
-33135=>19709,
-33139=>19710,
-33163=>19711,
-33168=>19712,
-33179=>19713,
-33182=>19714,
-33227=>19715,
-33237=>19716,
-33245=>19717,
-33246=>19718,
-33249=>19719,
-33263=>19720,
-33270=>19721,
-33280=>19722,
-33291=>19723,
-33299=>19724,
-33300=>19725,
-33306=>19726,
-33338=>19727,
-33348=>19728,
-33389=>19729,
-33412=>19730,
-33417=>19731,
-33425=>19732,
-33450=>19733,
-33456=>19734,
-33488=>19735,
-33514=>19736,
-33519=>19737,
-33526=>19738,
-33622=>19739,
-33656=>19740,
-33784=>19741,
-33788=>19742,
-33880=>19743,
-33939=>19744,
-33969=>19745,
-33981=>19746,
-34043=>19747,
-34118=>19748,
-34134=>19749,
-34141=>19750,
-34181=>19751,
-34200=>19752,
-34370=>19753,
-34374=>19754,
-34496=>19755,
-34580=>19756,
-34594=>19757,
-34606=>19758,
-34617=>19759,
-34653=>19760,
-34683=>19761,
-34700=>19762,
-34702=>19763,
-34711=>19764,
-34712=>19765,
-34718=>19766,
-34723=>19767,
-34734=>19768,
-34751=>19769,
-34761=>19770,
-34778=>19771,
-34840=>19772,
-34843=>19773,
-34861=>19774,
-34874=>19775,
-34885=>19776,
-34891=>19777,
-34894=>19778,
-34901=>19779,
-34906=>19780,
-34926=>19781,
-34970=>19782,
-34971=>19783,
-34972=>19784,
-35021=>19785,
-35040=>19786,
-35055=>19787,
-35086=>19788,
-35087=>19789,
-35110=>19790,
-35125=>19791,
-35162=>19792,
-35164=>19793,
-35179=>19794,
-35184=>19795,
-35196=>19796,
-35237=>19797,
-35253=>19798,
-35260=>19799,
-35285=>19800,
-35401=>19801,
-35415=>19802,
-35431=>19803,
-35454=>19804,
-35462=>19805,
-35478=>19806,
-35510=>19807,
-35529=>19808,
-35537=>19809,
-35549=>19810,
-35564=>19811,
-35573=>19812,
-35590=>19813,
-35599=>19814,
-35601=>19815,
-35653=>19816,
-35666=>19817,
-35693=>19818,
-35704=>19819,
-35708=>19820,
-35710=>19821,
-35717=>19822,
-35743=>19823,
-35915=>19824,
-35923=>19825,
-35963=>19826,
-36026=>19827,
-36037=>19828,
-36041=>19829,
-36050=>19830,
-36076=>19831,
-36085=>19832,
-36087=>19833,
-36097=>19834,
-36099=>19835,
-36119=>19836,
-36124=>19837,
-36206=>19838,
-36241=>19839,
-36255=>19840,
-36267=>19841,
-36274=>19842,
-36309=>19843,
-36327=>19844,
-36337=>19845,
-36338=>19846,
-36340=>19847,
-36353=>19848,
-36363=>19849,
-36390=>19850,
-36401=>19851,
-36416=>19852,
-36417=>19853,
-36429=>19854,
-36431=>19855,
-36444=>19856,
-36449=>19857,
-36457=>19858,
-36465=>19859,
-36469=>19860,
-36471=>19861,
-36489=>19862,
-36496=>19863,
-36501=>19864,
-36506=>19865,
-36519=>19866,
-36521=>19867,
-36525=>19868,
-36584=>19869,
-36592=>19870,
-36615=>19871,
-36632=>19872,
-36645=>19873,
-36647=>19874,
-36652=>19875,
-36661=>19876,
-36666=>19877,
-36675=>19878,
-36679=>19879,
-36689=>19880,
-36693=>19881,
-36768=>19882,
-36769=>19883,
-36770=>19884,
-36773=>19885,
-36868=>19886,
-36891=>19887,
-36911=>19888,
-36940=>19889,
-36955=>19890,
-36976=>19891,
-36980=>19892,
-36985=>19893,
-37003=>19894,
-37016=>19895,
-37024=>19896,
-37042=>19897,
-37053=>19898,
-37065=>19899,
-37104=>19900,
-37125=>19901,
-37157=>19902,
-37210=>19903,
-37223=>19904,
-37242=>19905,
-37258=>19906,
-37265=>19907,
-37269=>19908,
-37296=>19909,
-37307=>19910,
-37309=>19911,
-37314=>19912,
-37317=>19913,
-37376=>19914,
-37385=>19915,
-37411=>19916,
-37494=>19917,
-37518=>19918,
-37551=>19919,
-37563=>19920,
-37564=>19921,
-37569=>19922,
-37571=>19923,
-37573=>19924,
-37576=>19925,
-37652=>19926,
-37683=>19927,
-37686=>19928,
-37720=>19929,
-37759=>19930,
-37762=>19931,
-37770=>19932,
-37819=>19933,
-37836=>19934,
-37862=>19935,
-37881=>19936,
-37890=>19937,
-37901=>19938,
-37902=>19939,
-37934=>19940,
-37964=>19941,
-38280=>19942,
-38305=>19943,
-38335=>19944,
-38342=>19945,
-38345=>19946,
-38353=>19947,
-38354=>19948,
-38368=>19949,
-38372=>19950,
-38374=>19951,
-38436=>19952,
-38449=>19953,
-38456=>19954,
-38461=>19955,
-38484=>19956,
-38516=>19957,
-38523=>19958,
-38527=>19959,
-38529=>19960,
-38531=>19961,
-38537=>19962,
-38550=>19963,
-38574=>19964,
-38659=>19965,
-38683=>19966,
-38689=>19967,
-38690=>19968,
-38696=>19969,
-38705=>19970,
-38759=>19971,
-38774=>19972,
-38781=>19973,
-38783=>19974,
-38809=>19975,
-38815=>19976,
-38828=>19977,
-38841=>19978,
-38861=>19979,
-38880=>19980,
-38895=>19981,
-38919=>19982,
-38950=>19983,
-38958=>19984,
-39010=>19985,
-39011=>19986,
-39092=>19987,
-39109=>19988,
-39170=>19989,
-39185=>19990,
-39189=>19991,
-39221=>19992,
-39240=>19993,
-39252=>19994,
-39262=>19995,
-39393=>19996,
-39436=>19997,
-39440=>19998,
-39459=>19999,
-39489=>20000,
-39505=>20001,
-39613=>20002,
-39614=>20003,
-39681=>20004,
-39689=>20005,
-39691=>20006,
-39693=>20007,
-39694=>20008,
-39705=>20009,
-39733=>20010,
-39752=>20011,
-39765=>20012,
-39784=>20013,
-39808=>20014,
-39814=>20015,
-39824=>20016,
-39837=>20017,
-39856=>20018,
-39871=>20019,
-39880=>20020,
-39935=>20021,
-39938=>20022,
-39964=>20023,
-39989=>20024,
-40004=>20025,
-40022=>20026,
-40033=>20027,
-40040=>20028,
-40240=>20029,
-40253=>20030,
-40298=>20031,
-40315=>20032,
-40421=>20033,
-40425=>20034,
-40435=>20035,
-40570=>20036,
-40578=>20037,
-40579=>20038,
-40580=>20039,
-40624=>20040,
-40676=>20041,
-40688=>20042,
-40690=>20043,
-40713=>20044,
-40719=>20045,
-40724=>20046,
-40731=>20047,
-40738=>20048,
-40742=>20049,
-40746=>20050,
-40747=>20051,
-40756=>20052,
-40794=>20053,
-40815=>20054,
-40862=>20055,
-40869=>20056,
-131317=>20057,
-151044=>20058,
-151538=>20059,
-163187=>20060,
-194581=>20061,
-194630=>20062,
-194713=>20063,
-194726=>20064,
-194789=>20065,
-195038=>20066,
-13790=>20067,
-40895=>20068,
-40896=>20069,
-40897=>20070,
-40898=>20071,
-172722=>20072,
-131416=>20075,
-132529=>20080,
-132844=>20083,
-134488=>20090,
-154060=>20112,
-14756=>20122,
-14776=>20123,
-142914=>20124,
-14940=>20127,
-133064=>20128,
-143339=>20130,
-162228=>20133,
-15044=>20135,
-15051=>20136,
-14981=>20142,
-15347=>20151,
-27384=>20152,
-15665=>20158,
-147531=>20168,
-15936=>20170,
-14497=>20171,
-158878=>20206,
-18207=>20219,
-162876=>20220,
-18462=>20225,
-39709=>20297,
-39724=>20298,
-20482=>20299,
-20958=>20300,
-21255=>20301,
-23532=>20302,
-63784=>20303,
-26142=>20304,
-63785=>20305,
-28746=>20306,
-64021=>20307,
-21857=>20308,
-27706=>20309,
-31328=>20310,
-156492=>20311,
-34819=>20312,
-38315=>20313,
-38741=>20314,
-171581=>20315,
-173594=>20316,
-900=>20317,
-901=>20318,
-272=>20322,
-294=>20323,
-306=>20324,
-319=>20325,
-330=>20326,
-358=>20327,
-307=>20328,
-312=>20329,
-320=>20330,
-329=>20331,
-359=>20332,
-266=>20333,
-278=>20334,
-286=>20335,
-290=>20336,
-288=>20337,
-304=>20338,
-302=>20339,
-310=>20340,
-315=>20342,
-325=>20343,
-342=>20344,
-370=>20345,
-471=>20346,
-475=>20347,
-473=>20348,
-469=>20349,
-372=>20350,
-374=>20351,
-267=>20352,
-279=>20353,
-501=>20354,
-287=>20355,
-289=>20356,
-303=>20357,
-311=>20358,
-316=>20360,
-326=>20361,
-343=>20362,
-371=>20363,
-373=>20364,
-375=>20365,
-8494=>20366,
-8710=>20367,
-8719=>20368,
-8804=>20369,
-8805=>20370,
-9674=>20371,
-902=>20427,
-904=>20428,
-905=>20429,
-906=>20430,
-938=>20431,
-908=>20432,
-910=>20433,
-939=>20434,
-911=>20435,
-940=>20436,
-941=>20437,
-942=>20438,
-943=>20439,
-970=>20440,
-912=>20441,
-972=>20442,
-973=>20443,
-971=>20444,
-944=>20445,
-974=>20446,
-1026=>20447,
-1027=>20448,
-1028=>20449,
-1029=>20450,
-1030=>20451,
-1031=>20452,
-1032=>20453,
-1033=>20454,
-1034=>20455,
-1035=>20456,
-1036=>20457,
-1038=>20458,
-1039=>20459,
-1106=>20460,
-1107=>20461,
-1108=>20462,
-1109=>20463,
-1110=>20464,
-1111=>20465,
-1112=>20466,
-1113=>20467,
-1114=>20468,
-1115=>20469,
-1116=>20470,
-1118=>20471,
-1119=>20472,
-9361=>20587,
-9362=>20588,
-20021=>21075,
-20060=>21076,
-20067=>21077,
-20072=>21078,
-20084=>21079,
-20085=>21080,
-20119=>21081,
-20143=>21082,
-20187=>21083,
-20194=>21084,
-20200=>21085,
-20207=>21086,
-20222=>21087,
-20226=>21088,
-20232=>21089,
-20242=>21090,
-20247=>21091,
-20275=>21092,
-20277=>21093,
-20288=>21094,
-20290=>21095,
-20299=>21096,
-20300=>21097,
-20306=>21098,
-20323=>21099,
-20334=>21100,
-20337=>21101,
-20345=>21102,
-20353=>21103,
-20361=>21104,
-20364=>21105,
-20366=>21106,
-20368=>21107,
-20371=>21108,
-20377=>21109,
-20383=>21110,
-20409=>21111,
-20411=>21112,
-20412=>21113,
-20413=>21114,
-20416=>21115,
-20417=>21116,
-20422=>21117,
-20424=>21118,
-20428=>21119,
-20444=>21120,
-20450=>21121,
-20464=>21122,
-20476=>21123,
-20487=>21124,
-20490=>21125,
-20503=>21126,
-20509=>21127,
-20528=>21128,
-20530=>21129,
-20531=>21130,
-20533=>21131,
-20549=>21132,
-20554=>21133,
-20561=>21134,
-20562=>21135,
-20569=>21136,
-20576=>21137,
-20583=>21138,
-20589=>21139,
-20593=>21140,
-20609=>21141,
-20611=>21142,
-20612=>21143,
-20614=>21144,
-20618=>21145,
-20624=>21146,
-20635=>21147,
-20639=>21148,
-20640=>21149,
-20641=>21150,
-20655=>21151,
-20656=>21152,
-20665=>21153,
-20669=>21154,
-20672=>21155,
-20691=>21156,
-20700=>21157,
-20701=>21158,
-20703=>21159,
-20706=>21160,
-20708=>21161,
-20726=>21162,
-20730=>21163,
-20761=>21165,
-20764=>21166,
-20765=>21167,
-20771=>21168,
-20775=>21169,
-20776=>21170,
-20780=>21171,
-20781=>21172,
-20783=>21173,
-20785=>21174,
-20788=>21175,
-20793=>21176,
-20802=>21177,
-20815=>21178,
-20819=>21179,
-20824=>21180,
-20838=>21181,
-20862=>21182,
-20878=>21183,
-20927=>21184,
-20930=>21185,
-20946=>21186,
-20949=>21187,
-20965=>21188,
-20978=>21189,
-20983=>21190,
-21016=>21191,
-21026=>21192,
-21061=>21193,
-21080=>21194,
-21087=>21195,
-21120=>21196,
-21125=>21197,
-21141=>21198,
-21142=>21199,
-21143=>21200,
-21146=>21201,
-21157=>21202,
-21159=>21203,
-21168=>21204,
-21174=>21205,
-21175=>21206,
-21176=>21207,
-21181=>21208,
-21188=>21209,
-21190=>21210,
-21199=>21211,
-21204=>21212,
-21212=>21213,
-21221=>21214,
-21224=>21215,
-21226=>21216,
-21228=>21217,
-21236=>21218,
-21238=>21219,
-21260=>21220,
-21267=>21221,
-21272=>21222,
-21275=>21223,
-21278=>21224,
-21285=>21225,
-21287=>21226,
-21288=>21227,
-21289=>21228,
-21291=>21229,
-21292=>21230,
-21296=>21231,
-21308=>21232,
-21337=>21233,
-21339=>21234,
-21379=>21236,
-21383=>21237,
-21384=>21238,
-21390=>21239,
-21409=>21240,
-21429=>21241,
-21432=>21242,
-21437=>21243,
-21455=>21244,
-21458=>21245,
-21459=>21246,
-21470=>21247,
-21479=>21249,
-21506=>21250,
-21530=>21251,
-21537=>21252,
-21551=>21253,
-21572=>21254,
-21575=>21255,
-21583=>21256,
-21598=>21257,
-21604=>21258,
-21607=>21259,
-21609=>21260,
-21613=>21261,
-21614=>21262,
-21633=>21263,
-21635=>21264,
-21637=>21265,
-21641=>21266,
-21649=>21267,
-21663=>21268,
-21706=>21269,
-21728=>21270,
-21750=>21271,
-21758=>21272,
-21772=>21273,
-21773=>21274,
-21810=>21275,
-21819=>21276,
-21821=>21277,
-21833=>21278,
-21837=>21279,
-21848=>21280,
-21850=>21281,
-21851=>21282,
-21887=>21283,
-21907=>21284,
-21911=>21285,
-21923=>21286,
-21953=>21287,
-21963=>21288,
-21975=>21289,
-21976=>21290,
-21982=>21291,
-22015=>21292,
-22026=>21294,
-22041=>21295,
-22067=>21296,
-22076=>21297,
-22081=>21298,
-22083=>21299,
-22084=>21300,
-22086=>21301,
-22113=>21302,
-22114=>21303,
-22115=>21304,
-22133=>21305,
-22148=>21306,
-22155=>21307,
-22183=>21308,
-22187=>21309,
-22206=>21310,
-22219=>21311,
-22224=>21312,
-22236=>21313,
-22245=>21314,
-22246=>21315,
-22247=>21316,
-22273=>21317,
-22274=>21318,
-22289=>21319,
-22304=>21320,
-22306=>21321,
-22308=>21322,
-22309=>21323,
-22314=>21324,
-22335=>21325,
-22354=>21326,
-22370=>21327,
-22375=>21328,
-22382=>21329,
-22385=>21330,
-22393=>21331,
-22398=>21332,
-22401=>21333,
-22420=>21334,
-22425=>21335,
-22431=>21336,
-22433=>21337,
-22421=>21338,
-22439=>21339,
-22441=>21340,
-22461=>21341,
-22493=>21342,
-22505=>21343,
-22526=>21344,
-22531=>21345,
-22536=>21346,
-22497=>21347,
-22540=>21348,
-22555=>21349,
-22559=>21350,
-22573=>21351,
-22591=>21352,
-22608=>21353,
-22613=>21354,
-22632=>21355,
-22648=>21356,
-22663=>21357,
-22664=>21358,
-22668=>21359,
-22678=>21360,
-22688=>21361,
-22689=>21362,
-22690=>21363,
-22694=>21364,
-22724=>21365,
-22722=>21366,
-22728=>21367,
-22742=>21368,
-22749=>21369,
-22753=>21370,
-22802=>21372,
-22803=>21373,
-22813=>21374,
-22817=>21375,
-22824=>21376,
-22832=>21377,
-22835=>21378,
-22837=>21379,
-22838=>21380,
-22847=>21381,
-22851=>21382,
-22866=>21383,
-22878=>21384,
-22891=>21385,
-22895=>21386,
-22898=>21387,
-22907=>21388,
-22924=>21389,
-22926=>21390,
-22933=>21391,
-22951=>21392,
-22957=>21393,
-22960=>21394,
-22967=>21395,
-22977=>21396,
-22980=>21397,
-23023=>21398,
-23026=>21399,
-23028=>21400,
-23031=>21401,
-23040=>21402,
-23054=>21403,
-23058=>21404,
-23070=>21405,
-23076=>21406,
-23080=>21407,
-23082=>21408,
-23088=>21409,
-23108=>21410,
-23109=>21411,
-23112=>21412,
-23116=>21413,
-23120=>21414,
-23134=>21415,
-23163=>21416,
-23184=>21417,
-23187=>21418,
-23190=>21419,
-23193=>21420,
-23227=>21421,
-23238=>21422,
-23240=>21423,
-23247=>21424,
-23293=>21425,
-23297=>21426,
-23371=>21427,
-23390=>21428,
-23406=>21429,
-23430=>21430,
-23438=>21431,
-23440=>21432,
-23441=>21433,
-23444=>21434,
-23464=>21435,
-23465=>21436,
-23469=>21437,
-23471=>21438,
-23473=>21439,
-23474=>21440,
-23482=>21441,
-23484=>21442,
-23489=>21443,
-23501=>21444,
-23503=>21445,
-23513=>21446,
-23514=>21447,
-23535=>21448,
-23540=>21449,
-23564=>21450,
-23575=>21451,
-23590=>21452,
-23598=>21453,
-23602=>21454,
-23605=>21455,
-23642=>21456,
-23668=>21457,
-23669=>21458,
-23675=>21459,
-23677=>21460,
-23687=>21461,
-23698=>21462,
-23709=>21463,
-23730=>21464,
-23732=>21465,
-23767=>21466,
-23790=>21467,
-23793=>21468,
-23794=>21469,
-23826=>21470,
-23843=>21471,
-23871=>21472,
-23880=>21473,
-23893=>21474,
-23889=>21475,
-23903=>21476,
-23904=>21477,
-23906=>21478,
-23908=>21479,
-23929=>21480,
-23930=>21481,
-23935=>21482,
-23946=>21483,
-23955=>21484,
-23957=>21485,
-23963=>21486,
-23967=>21487,
-23979=>21488,
-24003=>21489,
-24014=>21490,
-24025=>21491,
-24071=>21492,
-24077=>21493,
-24096=>21494,
-24139=>21495,
-24144=>21496,
-24145=>21497,
-24156=>21498,
-24176=>21499,
-24206=>21500,
-24226=>21501,
-24228=>21502,
-24241=>21503,
-24268=>21504,
-24270=>21505,
-24284=>21506,
-24286=>21507,
-24293=>21508,
-24299=>21509,
-24326=>21510,
-24345=>21511,
-24356=>21512,
-24363=>21513,
-24364=>21514,
-24366=>21515,
-24368=>21516,
-24383=>21517,
-24388=>21518,
-24411=>21519,
-24416=>21520,
-24431=>21521,
-24436=>21522,
-24437=>21523,
-24440=>21524,
-24442=>21525,
-24461=>21526,
-24470=>21527,
-24477=>21528,
-24491=>21529,
-24496=>21530,
-24497=>21531,
-24520=>21532,
-24528=>21533,
-24529=>21534,
-24552=>21535,
-24556=>21536,
-24562=>21537,
-24566=>21538,
-24570=>21539,
-24586=>21540,
-24595=>21541,
-24607=>21542,
-24621=>21543,
-24640=>21544,
-24648=>21545,
-24657=>21546,
-24662=>21547,
-24663=>21548,
-24689=>21549,
-24702=>21550,
-24706=>21551,
-24710=>21552,
-24712=>21553,
-24718=>21554,
-24721=>21555,
-24723=>21556,
-24728=>21557,
-24738=>21559,
-24741=>21560,
-24759=>21561,
-24770=>21562,
-24777=>21563,
-24778=>21564,
-24782=>21565,
-24783=>21566,
-24802=>21567,
-24805=>21568,
-24828=>21569,
-24834=>21570,
-24839=>21571,
-24844=>21572,
-24855=>21573,
-24866=>21574,
-24881=>21575,
-24885=>21576,
-24889=>21577,
-24901=>21578,
-24905=>21579,
-24940=>21580,
-24946=>21581,
-24952=>21582,
-24960=>21583,
-24961=>21584,
-24963=>21585,
-24964=>21586,
-24971=>21587,
-24988=>21588,
-24992=>21589,
-25002=>21590,
-25024=>21591,
-25025=>21592,
-25038=>21593,
-25039=>21594,
-25054=>21595,
-25057=>21596,
-25063=>21597,
-25065=>21598,
-25068=>21599,
-25069=>21600,
-25071=>21601,
-25089=>21602,
-25091=>21603,
-25116=>21604,
-25120=>21605,
-25127=>21606,
-25131=>21607,
-25154=>21608,
-25156=>21609,
-25168=>21610,
-25172=>21611,
-25180=>21612,
-25213=>21613,
-25229=>21614,
-25230=>21615,
-25231=>21616,
-25267=>21617,
-25270=>21618,
-25271=>21619,
-25274=>21620,
-25278=>21621,
-25279=>21622,
-25294=>21623,
-25322=>21624,
-25330=>21625,
-25348=>21626,
-25355=>21627,
-25363=>21628,
-25385=>21629,
-25389=>21630,
-25418=>21631,
-25426=>21632,
-25428=>21633,
-25432=>21634,
-25435=>21635,
-25446=>21636,
-25453=>21637,
-25464=>21638,
-25493=>21639,
-25498=>21640,
-25508=>21641,
-25510=>21642,
-25517=>21643,
-25537=>21644,
-25541=>21645,
-25544=>21646,
-25550=>21647,
-25555=>21648,
-25587=>21649,
-25610=>21650,
-25648=>21651,
-25675=>21652,
-25679=>21653,
-25683=>21654,
-25692=>21655,
-25697=>21656,
-25699=>21657,
-25733=>21658,
-25743=>21659,
-25755=>21660,
-25761=>21661,
-25763=>21662,
-25766=>21663,
-25768=>21664,
-25789=>21665,
-25801=>21666,
-25809=>21667,
-25833=>21668,
-25834=>21669,
-25845=>21670,
-25857=>21671,
-25864=>21672,
-25865=>21673,
-25866=>21674,
-25875=>21675,
-25894=>21676,
-25905=>21677,
-25914=>21678,
-25916=>21679,
-25917=>21680,
-25923=>21681,
-25936=>21682,
-25938=>21683,
-25951=>21684,
-25981=>21685,
-26008=>21686,
-26016=>21687,
-26019=>21688,
-26022=>21689,
-26030=>21690,
-26035=>21691,
-26070=>21692,
-26072=>21693,
-26100=>21695,
-26101=>21696,
-26110=>21697,
-26111=>21698,
-26125=>21699,
-26129=>21700,
-26130=>21701,
-26134=>21702,
-26141=>21703,
-26147=>21704,
-26150=>21705,
-26153=>21706,
-26169=>21707,
-26167=>21708,
-26176=>21709,
-26182=>21710,
-26186=>21711,
-26200=>21712,
-26208=>21713,
-26229=>21714,
-26239=>21715,
-26233=>21716,
-26236=>21717,
-26266=>21718,
-26267=>21719,
-26268=>21720,
-26271=>21721,
-26306=>21723,
-26307=>21724,
-26316=>21725,
-26318=>21726,
-26324=>21727,
-26335=>21728,
-26347=>21729,
-26350=>21730,
-26375=>21731,
-26396=>21732,
-26400=>21733,
-26402=>21734,
-26430=>21735,
-26437=>21736,
-26476=>21737,
-26500=>21738,
-26510=>21739,
-26518=>21740,
-26521=>21741,
-26556=>21742,
-26557=>21743,
-26562=>21744,
-26565=>21745,
-26569=>21746,
-26588=>21747,
-26593=>21748,
-26598=>21749,
-26610=>21750,
-26614=>21751,
-26644=>21752,
-26649=>21753,
-26663=>21754,
-26671=>21755,
-26687=>21756,
-26698=>21757,
-26712=>21758,
-26735=>21759,
-26736=>21760,
-26737=>21761,
-26745=>21762,
-26747=>21763,
-26760=>21764,
-26785=>21765,
-26793=>21766,
-26798=>21767,
-26833=>21768,
-26835=>21769,
-26844=>21770,
-26845=>21771,
-26858=>21772,
-26870=>21773,
-26877=>21774,
-26886=>21775,
-26889=>21776,
-26896=>21777,
-26902=>21778,
-26929=>21779,
-26949=>21780,
-26958=>21781,
-26982=>21782,
-26992=>21783,
-26993=>21784,
-27003=>21785,
-27021=>21786,
-27041=>21787,
-27064=>21788,
-27077=>21789,
-27080=>21790,
-27136=>21792,
-27139=>21793,
-27168=>21794,
-27172=>21795,
-27191=>21796,
-27242=>21798,
-27265=>21799,
-27270=>21800,
-27271=>21801,
-27291=>21802,
-27312=>21803,
-27313=>21804,
-27316=>21805,
-27326=>21806,
-27327=>21807,
-27340=>21808,
-27349=>21809,
-27350=>21810,
-27376=>21811,
-27388=>21812,
-27394=>21813,
-27398=>21814,
-27399=>21815,
-27401=>21816,
-27432=>21817,
-27435=>21818,
-27446=>21819,
-27469=>21820,
-27474=>21821,
-27485=>21822,
-27499=>21823,
-27502=>21824,
-27504=>21825,
-27525=>21826,
-27543=>21827,
-27551=>21828,
-27552=>21829,
-27554=>21830,
-27555=>21831,
-27560=>21832,
-27564=>21833,
-27576=>21834,
-27577=>21835,
-27587=>21836,
-27588=>21837,
-27619=>21838,
-27666=>21839,
-27673=>21840,
-27679=>21841,
-27686=>21842,
-27687=>21843,
-27688=>21844,
-27694=>21845,
-27707=>21846,
-27723=>21847,
-27727=>21848,
-27755=>21849,
-27768=>21850,
-27783=>21851,
-27807=>21852,
-27824=>21853,
-27826=>21854,
-27853=>21855,
-27855=>21856,
-27857=>21857,
-27879=>21858,
-27890=>21859,
-27892=>21860,
-27911=>21861,
-27919=>21862,
-27923=>21863,
-27930=>21864,
-27944=>21865,
-27999=>21866,
-28007=>21867,
-28050=>21868,
-28055=>21869,
-28087=>21870,
-28093=>21871,
-28128=>21872,
-28130=>21873,
-28133=>21874,
-28143=>21875,
-28148=>21876,
-28160=>21877,
-28164=>21878,
-28219=>21879,
-28242=>21880,
-28253=>21881,
-28258=>21882,
-28264=>21883,
-28301=>21884,
-28313=>21885,
-28320=>21886,
-28333=>21887,
-28334=>21888,
-28339=>21889,
-28347=>21890,
-28352=>21891,
-28360=>21892,
-28365=>21893,
-28367=>21894,
-28397=>21895,
-28398=>21896,
-28420=>21897,
-28424=>21898,
-28429=>21899,
-28438=>21900,
-28443=>21901,
-28475=>21902,
-28461=>21903,
-28495=>21904,
-28499=>21905,
-28509=>21906,
-28524=>21907,
-28547=>21908,
-28563=>21909,
-28582=>21910,
-28592=>21911,
-28613=>21912,
-28648=>21913,
-28669=>21914,
-28695=>21915,
-28719=>21916,
-28724=>21917,
-28727=>21918,
-28740=>21919,
-28744=>21920,
-28757=>21921,
-28820=>21922,
-28822=>21923,
-28827=>21924,
-28852=>21925,
-28922=>21926,
-28933=>21927,
-28939=>21928,
-28973=>21929,
-28984=>21930,
-28993=>21931,
-29003=>21932,
-29015=>21934,
-29018=>21935,
-29068=>21936,
-29082=>21937,
-29104=>21938,
-29119=>21939,
-29120=>21940,
-29132=>21941,
-29146=>21942,
-29176=>21943,
-29192=>21944,
-29193=>21945,
-29203=>21946,
-29210=>21947,
-29220=>21948,
-29231=>21949,
-29253=>21950,
-29262=>21951,
-29278=>21952,
-29291=>21953,
-29297=>21954,
-29307=>21955,
-29308=>21956,
-29321=>21957,
-29331=>21958,
-29352=>21959,
-29397=>21960,
-29398=>21961,
-29400=>21962,
-29407=>21963,
-29438=>21964,
-29453=>21965,
-29459=>21966,
-29490=>21967,
-29493=>21968,
-29526=>21969,
-29533=>21970,
-29534=>21971,
-29535=>21972,
-29536=>21973,
-29545=>21974,
-29561=>21975,
-29568=>21976,
-29582=>21977,
-29584=>21978,
-29587=>21979,
-29591=>21980,
-29610=>21981,
-29613=>21982,
-29638=>21983,
-29644=>21984,
-29651=>21985,
-29661=>21986,
-29670=>21987,
-29687=>21988,
-29691=>21989,
-29695=>21990,
-29696=>21991,
-29713=>21992,
-29741=>21993,
-29799=>21994,
-29800=>21995,
-29806=>21996,
-29839=>21997,
-29841=>21998,
-29850=>21999,
-29870=>22000,
-29873=>22001,
-29874=>22002,
-29900=>22003,
-29904=>22004,
-29907=>22005,
-29915=>22007,
-29928=>22008,
-29930=>22009,
-29948=>22011,
-29958=>22012,
-29970=>22013,
-29991=>22014,
-29993=>22015,
-30006=>22016,
-30009=>22017,
-30019=>22018,
-30023=>22019,
-30039=>22020,
-30047=>22021,
-30049=>22022,
-30075=>22023,
-30076=>22024,
-30085=>22025,
-30101=>22026,
-30108=>22027,
-30138=>22028,
-30226=>22029,
-30243=>22030,
-30249=>22031,
-30265=>22032,
-30266=>22033,
-30272=>22034,
-30276=>22035,
-30297=>22036,
-30341=>22037,
-30348=>22038,
-30349=>22039,
-30367=>22040,
-30370=>22041,
-30371=>22042,
-30401=>22043,
-30411=>22044,
-30432=>22046,
-30454=>22047,
-30470=>22048,
-30482=>22049,
-30484=>22050,
-30485=>22051,
-30492=>22052,
-30510=>22053,
-30525=>22054,
-30530=>22055,
-30546=>22056,
-30550=>22057,
-30551=>22058,
-30576=>22059,
-30579=>22060,
-30580=>22061,
-30638=>22064,
-30641=>22065,
-30645=>22066,
-30659=>22067,
-30674=>22068,
-30677=>22069,
-30712=>22070,
-30734=>22071,
-30737=>22072,
-30749=>22073,
-30755=>22074,
-30788=>22075,
-30792=>22076,
-30796=>22077,
-30802=>22078,
-30814=>22079,
-30816=>22080,
-30817=>22081,
-30819=>22082,
-30863=>22083,
-30888=>22084,
-30892=>22085,
-30898=>22086,
-30909=>22087,
-30911=>22088,
-30919=>22089,
-30930=>22090,
-30934=>22091,
-30939=>22092,
-30943=>22093,
-30954=>22094,
-30963=>22095,
-30966=>22096,
-30975=>22097,
-30982=>22098,
-31002=>22099,
-31006=>22100,
-31008=>22101,
-31017=>22102,
-31021=>22103,
-31029=>22104,
-31044=>22105,
-31051=>22106,
-31055=>22107,
-31057=>22108,
-31081=>22109,
-31099=>22110,
-31102=>22111,
-31116=>22112,
-31121=>22113,
-31123=>22114,
-31132=>22115,
-31144=>22116,
-31151=>22117,
-31183=>22118,
-31197=>22119,
-31200=>22120,
-31202=>22121,
-31205=>22122,
-31217=>22123,
-31224=>22124,
-31228=>22125,
-31239=>22126,
-31265=>22127,
-31271=>22128,
-31275=>22129,
-31279=>22130,
-31284=>22131,
-31285=>22132,
-31304=>22133,
-31317=>22134,
-31333=>22135,
-31358=>22136,
-31371=>22137,
-31377=>22138,
-31390=>22139,
-31433=>22140,
-31451=>22141,
-31465=>22142,
-31468=>22143,
-31473=>22144,
-31483=>22145,
-31519=>22146,
-31523=>22147,
-31529=>22148,
-31536=>22149,
-31540=>22150,
-31551=>22151,
-31552=>22152,
-31594=>22153,
-31620=>22154,
-31625=>22155,
-31630=>22156,
-31638=>22157,
-31653=>22158,
-31666=>22159,
-31670=>22160,
-31674=>22161,
-31675=>22162,
-31677=>22163,
-31682=>22164,
-31688=>22165,
-31707=>22166,
-31732=>22167,
-31733=>22168,
-31737=>22169,
-31738=>22170,
-31746=>22171,
-31748=>22172,
-31750=>22173,
-31756=>22174,
-31769=>22175,
-31771=>22176,
-31781=>22177,
-31788=>22178,
-31796=>22179,
-31801=>22180,
-31802=>22181,
-31814=>22182,
-31829=>22183,
-31834=>22184,
-31843=>22185,
-31868=>22187,
-31878=>22188,
-31920=>22189,
-31931=>22190,
-31951=>22191,
-31956=>22192,
-31977=>22193,
-32015=>22194,
-32017=>22195,
-32022=>22196,
-32038=>22197,
-32042=>22198,
-32045=>22199,
-32081=>22200,
-32087=>22201,
-32101=>22202,
-32103=>22203,
-32120=>22204,
-32123=>22205,
-32129=>22206,
-32150=>22207,
-32195=>22208,
-32196=>22209,
-32197=>22210,
-32198=>22211,
-32205=>22212,
-32206=>22213,
-32256=>22214,
-32226=>22215,
-32234=>22216,
-32237=>22217,
-32250=>22218,
-32284=>22219,
-32301=>22220,
-32307=>22221,
-32319=>22222,
-32334=>22223,
-32336=>22224,
-32344=>22225,
-32351=>22226,
-32357=>22227,
-32405=>22228,
-32413=>22229,
-32414=>22230,
-32575=>22231,
-32604=>22232,
-32614=>22233,
-32653=>22235,
-32655=>22236,
-32678=>22237,
-32682=>22238,
-32692=>22239,
-32700=>22240,
-32704=>22241,
-32712=>22242,
-32744=>22243,
-32783=>22244,
-32787=>22245,
-32797=>22246,
-32799=>22247,
-32800=>22248,
-32814=>22249,
-32820=>22250,
-32830=>22251,
-32832=>22252,
-32836=>22253,
-32868=>22254,
-32877=>22255,
-32897=>22256,
-32953=>22257,
-32968=>22258,
-32973=>22259,
-32978=>22260,
-33006=>22261,
-33010=>22262,
-33014=>22263,
-33017=>22264,
-33035=>22265,
-33052=>22266,
-33056=>22267,
-33084=>22268,
-33093=>22269,
-33095=>22270,
-33106=>22271,
-33121=>22272,
-33143=>22273,
-33158=>22274,
-33166=>22275,
-33174=>22276,
-33186=>22277,
-33198=>22278,
-33221=>22279,
-33230=>22280,
-33259=>22281,
-33264=>22282,
-33265=>22283,
-33266=>22284,
-33269=>22285,
-33272=>22286,
-33295=>22288,
-33309=>22289,
-33320=>22290,
-33347=>22291,
-33358=>22292,
-33361=>22293,
-33366=>22294,
-33383=>22295,
-33403=>22296,
-33408=>22297,
-33409=>22298,
-33415=>22299,
-33428=>22300,
-33430=>22301,
-33432=>22302,
-33434=>22303,
-33435=>22304,
-33440=>22305,
-33498=>22306,
-33504=>22307,
-33508=>22308,
-33517=>22309,
-33546=>22310,
-33547=>22311,
-33566=>22312,
-33567=>22313,
-33569=>22314,
-33580=>22315,
-33582=>22316,
-33587=>22317,
-33591=>22318,
-33597=>22319,
-33602=>22320,
-33613=>22321,
-33614=>22322,
-33648=>22323,
-33664=>22324,
-33666=>22325,
-33668=>22326,
-33689=>22327,
-33692=>22328,
-33702=>22329,
-33708=>22330,
-33726=>22331,
-33619=>22332,
-33768=>22333,
-33817=>22334,
-33709=>22335,
-33839=>22336,
-33861=>22337,
-33863=>22338,
-33869=>22339,
-33878=>22340,
-33888=>22342,
-33892=>22343,
-33895=>22344,
-33898=>22345,
-33908=>22346,
-33917=>22347,
-33938=>22348,
-33941=>22349,
-33961=>22350,
-33962=>22351,
-33991=>22352,
-33992=>22353,
-33996=>22354,
-34034=>22355,
-34039=>22356,
-34050=>22357,
-34051=>22358,
-34055=>22359,
-34062=>22360,
-34064=>22361,
-34076=>22362,
-34082=>22363,
-34087=>22364,
-34090=>22365,
-34099=>22366,
-34102=>22367,
-34111=>22368,
-34128=>22369,
-34130=>22370,
-34140=>22371,
-34143=>22373,
-34144=>22374,
-34169=>22375,
-34185=>22376,
-34187=>22377,
-34208=>22378,
-34213=>22379,
-34215=>22380,
-34228=>22381,
-34230=>22382,
-34232=>22383,
-34237=>22384,
-34238=>22385,
-34239=>22386,
-34242=>22387,
-34266=>22388,
-34272=>22389,
-34280=>22390,
-34291=>22391,
-34300=>22392,
-34317=>22393,
-34318=>22394,
-34329=>22395,
-34331=>22396,
-34358=>22397,
-34362=>22398,
-34365=>22399,
-34392=>22400,
-34393=>22401,
-34397=>22402,
-34400=>22403,
-34401=>22404,
-34404=>22405,
-34409=>22406,
-34422=>22407,
-34454=>22408,
-34458=>22409,
-34465=>22410,
-34470=>22411,
-34477=>22412,
-34484=>22413,
-34485=>22414,
-34487=>22415,
-34489=>22416,
-34495=>22417,
-34501=>22418,
-34514=>22419,
-34522=>22420,
-34524=>22421,
-34528=>22422,
-34533=>22423,
-34535=>22424,
-34440=>22425,
-34564=>22426,
-34575=>22427,
-34607=>22428,
-34610=>22429,
-34620=>22430,
-34621=>22431,
-34629=>22432,
-34637=>22433,
-34657=>22434,
-34671=>22435,
-34691=>22436,
-34692=>22437,
-34693=>22438,
-34694=>22439,
-34704=>22440,
-34709=>22441,
-34737=>22443,
-34760=>22444,
-34762=>22445,
-34773=>22446,
-34777=>22447,
-34780=>22448,
-34786=>22449,
-34788=>22450,
-34801=>22451,
-34803=>22452,
-34808=>22453,
-34810=>22454,
-34815=>22455,
-34825=>22456,
-34841=>22457,
-34834=>22458,
-34842=>22459,
-34846=>22460,
-34864=>22461,
-34869=>22462,
-34881=>22463,
-34883=>22464,
-34888=>22465,
-34889=>22466,
-34897=>22468,
-34908=>22469,
-34912=>22470,
-34929=>22471,
-34937=>22472,
-34939=>22473,
-34944=>22474,
-34975=>22475,
-34984=>22476,
-35002=>22477,
-35019=>22478,
-35020=>22479,
-35038=>22480,
-35047=>22481,
-35063=>22482,
-35085=>22483,
-35093=>22484,
-35094=>22485,
-35104=>22486,
-35112=>22487,
-35121=>22488,
-35130=>22489,
-35142=>22490,
-35151=>22491,
-35154=>22492,
-35159=>22493,
-35163=>22494,
-35169=>22495,
-35171=>22496,
-35182=>22497,
-35187=>22498,
-35189=>22499,
-35194=>22500,
-35197=>22501,
-35213=>22502,
-35221=>22503,
-35227=>22504,
-35228=>22505,
-35232=>22506,
-35252=>22507,
-35254=>22508,
-35287=>22509,
-35305=>22510,
-35309=>22511,
-35321=>22512,
-35332=>22513,
-35333=>22514,
-35358=>22515,
-35360=>22516,
-35364=>22517,
-35366=>22518,
-35371=>22519,
-35372=>22520,
-35375=>22521,
-35389=>22522,
-35392=>22523,
-35395=>22524,
-35411=>22525,
-35414=>22526,
-35420=>22527,
-35429=>22528,
-35446=>22529,
-35447=>22530,
-35450=>22531,
-35451=>22532,
-35456=>22533,
-35459=>22534,
-35467=>22535,
-35471=>22536,
-35474=>22537,
-35479=>22538,
-35481=>22539,
-35487=>22540,
-35497=>22541,
-35503=>22542,
-35507=>22543,
-35515=>22544,
-35523=>22545,
-35526=>22546,
-35528=>22547,
-35530=>22548,
-35539=>22549,
-35540=>22550,
-35541=>22551,
-35568=>22552,
-35583=>22553,
-35595=>22554,
-35614=>22555,
-35632=>22556,
-35644=>22557,
-35650=>22558,
-35656=>22559,
-35661=>22560,
-35683=>22561,
-35705=>22562,
-35716=>22563,
-35725=>22564,
-35727=>22565,
-35896=>22566,
-35902=>22567,
-35921=>22568,
-35928=>22569,
-35931=>22570,
-35933=>22571,
-35929=>22572,
-35939=>22573,
-35940=>22574,
-35942=>22575,
-35957=>22576,
-35958=>22577,
-35966=>22578,
-35974=>22579,
-35975=>22580,
-35979=>22581,
-35984=>22582,
-35996=>22584,
-36025=>22585,
-36038=>22586,
-36043=>22587,
-36047=>22588,
-36061=>22589,
-36072=>22590,
-36079=>22591,
-36082=>22592,
-36095=>22593,
-36197=>22594,
-36223=>22595,
-36226=>22596,
-36232=>22597,
-36240=>22598,
-36254=>22599,
-36256=>22600,
-36268=>22601,
-36277=>22602,
-36279=>22603,
-36281=>22604,
-36283=>22605,
-36288=>22606,
-36293=>22607,
-36295=>22608,
-36298=>22609,
-36308=>22610,
-36325=>22611,
-36336=>22612,
-36284=>22613,
-36356=>22614,
-36357=>22615,
-36369=>22616,
-36403=>22617,
-36407=>22618,
-36408=>22619,
-36430=>22620,
-36443=>22621,
-36445=>22622,
-36446=>22623,
-36473=>22624,
-36482=>22625,
-36483=>22626,
-36507=>22627,
-36509=>22628,
-36514=>22629,
-36538=>22630,
-36545=>22631,
-36547=>22632,
-36548=>22633,
-36551=>22634,
-36572=>22635,
-36590=>22636,
-36593=>22637,
-36599=>22638,
-36589=>22639,
-36610=>22640,
-36623=>22641,
-36624=>22642,
-36630=>22643,
-36640=>22644,
-36641=>22645,
-36643=>22646,
-36648=>22647,
-36654=>22648,
-36660=>22649,
-36663=>22650,
-36673=>22651,
-36687=>22652,
-36690=>22653,
-36691=>22654,
-36701=>22655,
-36702=>22656,
-36709=>22657,
-36765=>22658,
-36792=>22659,
-36798=>22660,
-36800=>22661,
-36811=>22662,
-36816=>22663,
-36818=>22664,
-36835=>22665,
-36862=>22666,
-36888=>22667,
-36904=>22668,
-36905=>22669,
-36906=>22670,
-36915=>22671,
-36916=>22672,
-36927=>22673,
-36962=>22674,
-36966=>22675,
-36972=>22676,
-37006=>22677,
-37029=>22678,
-37068=>22679,
-37077=>22680,
-37080=>22681,
-37081=>22682,
-37093=>22683,
-37074=>22684,
-37128=>22685,
-37133=>22686,
-37136=>22687,
-37146=>22688,
-37152=>22689,
-37161=>22690,
-37166=>22691,
-37174=>22692,
-37180=>22693,
-37187=>22694,
-37199=>22695,
-37203=>22696,
-37229=>22697,
-37243=>22698,
-37249=>22699,
-37254=>22700,
-37267=>22701,
-37268=>22702,
-37272=>22703,
-37281=>22704,
-37286=>22705,
-37311=>22706,
-37331=>22707,
-37332=>22708,
-37337=>22709,
-37353=>22710,
-37354=>22711,
-37359=>22712,
-37369=>22713,
-37373=>22714,
-37380=>22715,
-37381=>22716,
-37388=>22717,
-37394=>22718,
-37395=>22719,
-37400=>22720,
-37404=>22721,
-37405=>22722,
-37412=>22723,
-37413=>22724,
-37414=>22725,
-37422=>22726,
-37423=>22727,
-37424=>22728,
-37429=>22729,
-37430=>22730,
-37438=>22731,
-37446=>22732,
-37453=>22733,
-37464=>22734,
-37468=>22735,
-37469=>22736,
-37481=>22737,
-37486=>22738,
-37487=>22739,
-37488=>22740,
-37493=>22741,
-37497=>22742,
-37499=>22743,
-37514=>22744,
-37522=>22745,
-37536=>22746,
-37540=>22747,
-37541=>22748,
-37544=>22749,
-37558=>22750,
-37560=>22751,
-37562=>22752,
-37565=>22753,
-37575=>22754,
-37581=>22755,
-37592=>22756,
-37596=>22757,
-37597=>22758,
-37601=>22759,
-37603=>22760,
-37608=>22761,
-37612=>22762,
-37614=>22763,
-37616=>22764,
-37632=>22765,
-37640=>22766,
-37660=>22767,
-37668=>22768,
-37674=>22769,
-37684=>22770,
-37687=>22771,
-37712=>22772,
-37717=>22773,
-37726=>22774,
-37735=>22775,
-37737=>22776,
-37743=>22777,
-37748=>22778,
-37750=>22779,
-37754=>22780,
-37757=>22781,
-37760=>22782,
-37761=>22783,
-37773=>22784,
-37778=>22785,
-37781=>22786,
-37784=>22787,
-37798=>22789,
-37800=>22790,
-37803=>22791,
-37812=>22792,
-37813=>22793,
-37814=>22794,
-37828=>22795,
-37829=>22796,
-37833=>22797,
-37835=>22798,
-37837=>22799,
-37843=>22800,
-37849=>22801,
-37879=>22802,
-37889=>22803,
-37896=>22804,
-37909=>22805,
-37919=>22806,
-37935=>22807,
-37949=>22808,
-37955=>22809,
-37977=>22810,
-37980=>22811,
-37983=>22812,
-37985=>22813,
-37992=>22814,
-37998=>22815,
-38020=>22816,
-38019=>22817,
-38270=>22818,
-38276=>22819,
-38301=>22820,
-38302=>22821,
-38330=>22822,
-38361=>22823,
-38365=>22824,
-38367=>22825,
-38430=>22826,
-38434=>22827,
-38437=>22828,
-38438=>22829,
-38455=>22830,
-38457=>22831,
-38458=>22832,
-38482=>22833,
-38486=>22834,
-38487=>22835,
-38510=>22836,
-38524=>22837,
-38526=>22838,
-38545=>22839,
-38559=>22840,
-38566=>22841,
-38602=>22842,
-38623=>22844,
-38650=>22845,
-38661=>22846,
-38682=>22847,
-38685=>22848,
-38730=>22850,
-38744=>22851,
-38775=>22852,
-38776=>22853,
-38779=>22854,
-38784=>22855,
-38793=>22856,
-38807=>22857,
-38840=>22858,
-38844=>22859,
-38847=>22860,
-38852=>22861,
-38853=>22862,
-38855=>22863,
-38858=>22864,
-38862=>22865,
-38864=>22866,
-38871=>22867,
-38877=>22868,
-38884=>22869,
-38903=>22870,
-38904=>22871,
-38906=>22872,
-38937=>22873,
-38940=>22874,
-38944=>22875,
-38959=>22876,
-38965=>22877,
-38980=>22878,
-38986=>22879,
-38993=>22880,
-39018=>22881,
-39086=>22882,
-39116=>22883,
-39142=>22884,
-39158=>22885,
-39175=>22886,
-39199=>22887,
-39202=>22888,
-39206=>22889,
-39211=>22890,
-39220=>22891,
-39225=>22892,
-39239=>22893,
-39257=>22894,
-39259=>22895,
-39323=>22896,
-39325=>22897,
-39327=>22898,
-39344=>22899,
-39346=>22900,
-39349=>22901,
-39379=>22902,
-39386=>22903,
-39388=>22904,
-39399=>22905,
-39402=>22906,
-39403=>22907,
-39404=>22908,
-39412=>22909,
-39413=>22910,
-39421=>22911,
-39422=>22912,
-39428=>22913,
-39435=>22914,
-39454=>22915,
-39458=>22916,
-39475=>22917,
-39477=>22918,
-39495=>22919,
-39499=>22921,
-39508=>22922,
-39517=>22923,
-39594=>22924,
-39596=>22925,
-39598=>22926,
-39602=>22927,
-39604=>22928,
-39611=>22929,
-39615=>22930,
-39624=>22931,
-39639=>22932,
-39643=>22933,
-39652=>22934,
-39655=>22935,
-39660=>22936,
-39666=>22937,
-39667=>22938,
-39669=>22939,
-39674=>22940,
-39677=>22941,
-39679=>22942,
-39680=>22943,
-39684=>22944,
-39685=>22945,
-39707=>22946,
-39718=>22947,
-39735=>22949,
-39737=>22950,
-39738=>22951,
-39756=>22952,
-39766=>22953,
-39767=>22954,
-39771=>22955,
-39777=>22956,
-39786=>22957,
-39789=>22958,
-39790=>22959,
-39800=>22960,
-39807=>22961,
-39813=>22962,
-39815=>22963,
-39817=>22964,
-39819=>22965,
-39821=>22966,
-39828=>22967,
-39834=>22968,
-39849=>22969,
-39863=>22970,
-39868=>22971,
-39888=>22972,
-39929=>22973,
-39951=>22974,
-39953=>22975,
-39966=>22976,
-39974=>22977,
-39976=>22978,
-39997=>22979,
-40003=>22980,
-40014=>22981,
-40030=>22982,
-40059=>22983,
-40183=>22984,
-40185=>22985,
-40220=>22986,
-40239=>22987,
-40243=>22988,
-40244=>22989,
-40250=>22990,
-40252=>22991,
-40261=>22992,
-40275=>22993,
-40276=>22994,
-40293=>22995,
-40323=>22996,
-40326=>22997,
-40334=>22998,
-40338=>22999,
-40339=>23000,
-40341=>23001,
-40343=>23002,
-40344=>23003,
-40362=>23004,
-40366=>23005,
-40394=>23007,
-40404=>23008,
-40405=>23009,
-40414=>23010,
-40430=>23011,
-40432=>23012,
-40446=>23013,
-40462=>23014,
-40464=>23015,
-40465=>23016,
-40466=>23017,
-40470=>23018,
-40583=>23019,
-40590=>23020,
-40591=>23021,
-40598=>23022,
-40600=>23023,
-40622=>23024,
-40627=>23025,
-40646=>23026,
-40648=>23027,
-40651=>23028,
-40661=>23029,
-40684=>23030,
-40685=>23031,
-40689=>23032,
-40693=>23033,
-40696=>23034,
-40721=>23035,
-40726=>23036,
-40730=>23037,
-40735=>23038,
-40753=>23039,
-40754=>23040,
-40764=>23041,
-40767=>23042,
-40771=>23043,
-40772=>23044,
-40775=>23045,
-40790=>23046,
-40798=>23047,
-40814=>23048,
-40819=>23049,
-40826=>23050,
-40829=>23051,
-40847=>23052,
-40849=>23053,
-40850=>23054,
-40854=>23055,
-40865=>23056,
-40867=>23057,
-);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ak12.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ak12.php
deleted file mode 100644
index 6d20827f8b6..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/uni2cid_ak12.php
+++ /dev/null
@@ -1,17530 +0,0 @@
-<?php
-// unicode to cid conversion table is from
-// ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/
-// cid2code.txt in ak12.tar.Z
-$cidinfo['uni2cid'] = array(
-32=>1,
-33=>2,
-34=>3,
-35=>4,
-36=>5,
-37=>6,
-38=>7,
-39=>8,
-40=>9,
-41=>10,
-42=>11,
-43=>12,
-44=>13,
-45=>14,
-46=>15,
-47=>16,
-48=>17,
-49=>18,
-50=>19,
-51=>20,
-52=>21,
-53=>22,
-54=>23,
-55=>24,
-56=>25,
-57=>26,
-58=>27,
-59=>28,
-60=>29,
-61=>30,
-62=>31,
-63=>32,
-64=>33,
-65=>34,
-66=>35,
-67=>36,
-68=>37,
-69=>38,
-70=>39,
-71=>40,
-72=>41,
-73=>42,
-74=>43,
-75=>44,
-76=>45,
-77=>46,
-78=>47,
-79=>48,
-80=>49,
-81=>50,
-82=>51,
-83=>52,
-84=>53,
-85=>54,
-86=>55,
-87=>56,
-88=>57,
-89=>58,
-90=>59,
-91=>60,
-92=>61,
-93=>62,
-94=>63,
-95=>64,
-96=>65,
-97=>66,
-98=>67,
-99=>68,
-100=>69,
-101=>70,
-102=>71,
-103=>72,
-104=>73,
-105=>74,
-106=>75,
-107=>76,
-108=>77,
-109=>78,
-110=>79,
-111=>80,
-112=>81,
-113=>82,
-114=>83,
-115=>84,
-116=>85,
-117=>86,
-118=>87,
-119=>88,
-120=>89,
-121=>90,
-122=>91,
-123=>92,
-124=>93,
-125=>94,
-126=>95,
-8361=>96,
-8208=>97,
-169=>98,
-12644=>101,
-12288=>101,
-12289=>102,
-12290=>103,
-183=>104,
-12539=>104,
-8229=>105,
-8943=>106,
-8230=>106,
-168=>107,
-12291=>108,
-8211=>109,
-8212=>110,
-8214=>111,
-65340=>112,
-65374=>113,
-8216=>114,
-8217=>115,
-8220=>116,
-8221=>117,
-12308=>118,
-12309=>119,
-12296=>120,
-12297=>121,
-12298=>122,
-12299=>123,
-12300=>124,
-12301=>125,
-12302=>126,
-12303=>127,
-12304=>128,
-12305=>129,
-177=>130,
-215=>131,
-247=>132,
-8800=>133,
-8804=>134,
-8805=>135,
-8734=>136,
-8756=>137,
-176=>138,
-8242=>139,
-8243=>140,
-8451=>141,
-8491=>142,
-65504=>143,
-65505=>144,
-65509=>145,
-9794=>146,
-9792=>147,
-8736=>148,
-8869=>149,
-8978=>150,
-8706=>151,
-8711=>152,
-8801=>153,
-8786=>154,
-167=>155,
-8251=>156,
-9734=>157,
-9733=>158,
-9675=>159,
-9679=>160,
-9678=>161,
-9671=>162,
-9670=>163,
-9633=>164,
-9632=>165,
-9651=>166,
-9650=>167,
-9661=>168,
-9660=>169,
-8594=>170,
-8592=>171,
-8593=>172,
-8595=>173,
-8596=>174,
-12307=>175,
-171=>176,
-187=>177,
-8730=>178,
-8765=>179,
-8733=>180,
-8757=>181,
-8747=>182,
-8748=>183,
-8712=>184,
-8715=>185,
-8838=>186,
-8839=>187,
-8834=>188,
-8835=>189,
-8746=>190,
-8745=>191,
-8743=>192,
-8744=>193,
-65506=>194,
-8658=>195,
-8660=>196,
-8704=>197,
-8707=>198,
-180=>199,
-732=>200,
-711=>201,
-728=>202,
-733=>203,
-730=>204,
-729=>205,
-184=>206,
-731=>207,
-161=>208,
-191=>209,
-8758=>210,
-8750=>211,
-8721=>212,
-8719=>213,
-164=>214,
-8457=>215,
-8240=>216,
-9665=>217,
-9664=>218,
-9655=>219,
-9654=>220,
-9828=>221,
-9824=>222,
-9825=>223,
-9829=>224,
-9831=>225,
-9827=>226,
-9673=>227,
-9672=>228,
-9635=>229,
-9680=>230,
-9681=>231,
-9618=>232,
-9636=>233,
-9637=>234,
-9640=>235,
-9639=>236,
-9638=>237,
-9641=>238,
-9832=>239,
-9743=>240,
-9742=>241,
-9756=>242,
-9758=>243,
-182=>244,
-8224=>245,
-8225=>246,
-8597=>247,
-8599=>248,
-8601=>249,
-8598=>250,
-8600=>251,
-9837=>252,
-9833=>253,
-9834=>254,
-9836=>255,
-12927=>256,
-12828=>257,
-8470=>258,
-13255=>259,
-8482=>260,
-13250=>261,
-13272=>262,
-8481=>263,
-65281=>264,
-65282=>265,
-65283=>266,
-65284=>267,
-65285=>268,
-65286=>269,
-65287=>270,
-65288=>271,
-65289=>272,
-65290=>273,
-65291=>274,
-65292=>275,
-65293=>276,
-65294=>277,
-65295=>278,
-65296=>279,
-65297=>280,
-65298=>281,
-65299=>282,
-65300=>283,
-65301=>284,
-65302=>285,
-65303=>286,
-65304=>287,
-65305=>288,
-65306=>289,
-65307=>290,
-65308=>291,
-65309=>292,
-65310=>293,
-65311=>294,
-65312=>295,
-65313=>296,
-65314=>297,
-65315=>298,
-65316=>299,
-65317=>300,
-65318=>301,
-65319=>302,
-65320=>303,
-65321=>304,
-65322=>305,
-65323=>306,
-65324=>307,
-65325=>308,
-65326=>309,
-65327=>310,
-65328=>311,
-65329=>312,
-65330=>313,
-65331=>314,
-65332=>315,
-65333=>316,
-65334=>317,
-65335=>318,
-65336=>319,
-65337=>320,
-65338=>321,
-65339=>322,
-65510=>323,
-65341=>324,
-65342=>325,
-65343=>326,
-65344=>327,
-65345=>328,
-65346=>329,
-65347=>330,
-65348=>331,
-65349=>332,
-65350=>333,
-65351=>334,
-65352=>335,
-65353=>336,
-65354=>337,
-65355=>338,
-65356=>339,
-65357=>340,
-65358=>341,
-65359=>342,
-65360=>343,
-65361=>344,
-65362=>345,
-65363=>346,
-65364=>347,
-65365=>348,
-65366=>349,
-65367=>350,
-65368=>351,
-65369=>352,
-65370=>353,
-65371=>354,
-65372=>355,
-65373=>356,
-65507=>357,
-12593=>358,
-12594=>359,
-12595=>360,
-12596=>361,
-12597=>362,
-12598=>363,
-12599=>364,
-12600=>365,
-12601=>366,
-12602=>367,
-12603=>368,
-12604=>369,
-12605=>370,
-12606=>371,
-12607=>372,
-12608=>373,
-12609=>374,
-12610=>375,
-12611=>376,
-12612=>377,
-12613=>378,
-12614=>379,
-12615=>380,
-12616=>381,
-12617=>382,
-12618=>383,
-12619=>384,
-12620=>385,
-12621=>386,
-12622=>387,
-12623=>388,
-12624=>389,
-12625=>390,
-12626=>391,
-12627=>392,
-12628=>393,
-12629=>394,
-12630=>395,
-12631=>396,
-12632=>397,
-12633=>398,
-12634=>399,
-12635=>400,
-12636=>401,
-12637=>402,
-12638=>403,
-12639=>404,
-12640=>405,
-12641=>406,
-12642=>407,
-12643=>408,
-12645=>409,
-12646=>410,
-12647=>411,
-12648=>412,
-12649=>413,
-12650=>414,
-12651=>415,
-12652=>416,
-12653=>417,
-12654=>418,
-12655=>419,
-12656=>420,
-12657=>421,
-12658=>422,
-12659=>423,
-12660=>424,
-12661=>425,
-12662=>426,
-12663=>427,
-12664=>428,
-12665=>429,
-12666=>430,
-12667=>431,
-12668=>432,
-12669=>433,
-12670=>434,
-12671=>435,
-12672=>436,
-12673=>437,
-12674=>438,
-12675=>439,
-12676=>440,
-12677=>441,
-12678=>442,
-12679=>443,
-12680=>444,
-12681=>445,
-12682=>446,
-12683=>447,
-12684=>448,
-12685=>449,
-12686=>450,
-8560=>451,
-8561=>452,
-8562=>453,
-8563=>454,
-8564=>455,
-8565=>456,
-8566=>457,
-8567=>458,
-8568=>459,
-8569=>460,
-8544=>461,
-8545=>462,
-8546=>463,
-8547=>464,
-8548=>465,
-8549=>466,
-8550=>467,
-8551=>468,
-8552=>469,
-8553=>470,
-913=>471,
-914=>472,
-915=>473,
-916=>474,
-917=>475,
-918=>476,
-919=>477,
-920=>478,
-921=>479,
-922=>480,
-923=>481,
-924=>482,
-925=>483,
-926=>484,
-927=>485,
-928=>486,
-929=>487,
-931=>488,
-932=>489,
-933=>490,
-934=>491,
-935=>492,
-936=>493,
-937=>494,
-945=>495,
-946=>496,
-947=>497,
-948=>498,
-949=>499,
-950=>500,
-951=>501,
-952=>502,
-953=>503,
-954=>504,
-955=>505,
-956=>506,
-957=>507,
-958=>508,
-959=>509,
-960=>510,
-961=>511,
-963=>512,
-964=>513,
-965=>514,
-966=>515,
-967=>516,
-968=>517,
-969=>518,
-9472=>519,
-9474=>520,
-9484=>521,
-9488=>522,
-9496=>523,
-9492=>524,
-9500=>525,
-9516=>526,
-9508=>527,
-9524=>528,
-9532=>529,
-9473=>530,
-9475=>531,
-9487=>532,
-9491=>533,
-9499=>534,
-9495=>535,
-9507=>536,
-9523=>537,
-9515=>538,
-9531=>539,
-9547=>540,
-9504=>541,
-9519=>542,
-9512=>543,
-9527=>544,
-9535=>545,
-9501=>546,
-9520=>547,
-9509=>548,
-9528=>549,
-9538=>550,
-9490=>551,
-9489=>552,
-9498=>553,
-9497=>554,
-9494=>555,
-9493=>556,
-9486=>557,
-9485=>558,
-9502=>559,
-9503=>560,
-9505=>561,
-9506=>562,
-9510=>563,
-9511=>564,
-9513=>565,
-9514=>566,
-9517=>567,
-9518=>568,
-9521=>569,
-9522=>570,
-9525=>571,
-9526=>572,
-9529=>573,
-9530=>574,
-9533=>575,
-9534=>576,
-9536=>577,
-9537=>578,
-9539=>579,
-9540=>580,
-9541=>581,
-9542=>582,
-9543=>583,
-9544=>584,
-9545=>585,
-9546=>586,
-13205=>587,
-13206=>588,
-13207=>589,
-8467=>590,
-13208=>591,
-13252=>592,
-13219=>593,
-13220=>594,
-13221=>595,
-13222=>596,
-13209=>597,
-13210=>598,
-13211=>599,
-13212=>600,
-13213=>601,
-13214=>602,
-13215=>603,
-13216=>604,
-13217=>605,
-13218=>606,
-13258=>607,
-13197=>608,
-13198=>609,
-13199=>610,
-13263=>611,
-13192=>612,
-13193=>613,
-13256=>614,
-13223=>615,
-13224=>616,
-13232=>617,
-13233=>618,
-13234=>619,
-13235=>620,
-13236=>621,
-13237=>622,
-13238=>623,
-13239=>624,
-13240=>625,
-13241=>626,
-13184=>627,
-13185=>628,
-13186=>629,
-13187=>630,
-13188=>631,
-13242=>632,
-13243=>633,
-13244=>634,
-13245=>635,
-13246=>636,
-13247=>637,
-13200=>638,
-13201=>639,
-13202=>640,
-13203=>641,
-13204=>642,
-8486=>643,
-13248=>644,
-13249=>645,
-13194=>646,
-13195=>647,
-13196=>648,
-13270=>649,
-13253=>650,
-13229=>651,
-13230=>652,
-13231=>653,
-13275=>654,
-13225=>655,
-13226=>656,
-13227=>657,
-13228=>658,
-13277=>659,
-13264=>660,
-13267=>661,
-13251=>662,
-13257=>663,
-13276=>664,
-13254=>665,
-198=>666,
-208=>667,
-170=>668,
-294=>669,
-306=>670,
-319=>671,
-321=>672,
-216=>673,
-338=>674,
-186=>675,
-222=>676,
-358=>677,
-330=>678,
-12896=>679,
-12897=>680,
-12898=>681,
-12899=>682,
-12900=>683,
-12901=>684,
-12902=>685,
-12903=>686,
-12904=>687,
-12905=>688,
-12906=>689,
-12907=>690,
-12908=>691,
-12909=>692,
-12910=>693,
-12911=>694,
-12912=>695,
-12913=>696,
-12914=>697,
-12915=>698,
-12916=>699,
-12917=>700,
-12918=>701,
-12919=>702,
-12920=>703,
-12921=>704,
-12922=>705,
-12923=>706,
-9424=>707,
-9425=>708,
-9426=>709,
-9427=>710,
-9428=>711,
-9429=>712,
-9430=>713,
-9431=>714,
-9432=>715,
-9433=>716,
-9434=>717,
-9435=>718,
-9436=>719,
-9437=>720,
-9438=>721,
-9439=>722,
-9440=>723,
-9441=>724,
-9442=>725,
-9443=>726,
-9444=>727,
-9445=>728,
-9446=>729,
-9447=>730,
-9448=>731,
-9449=>732,
-9312=>733,
-9313=>734,
-9314=>735,
-9315=>736,
-9316=>737,
-9317=>738,
-9318=>739,
-9319=>740,
-9320=>741,
-9321=>742,
-9322=>743,
-9323=>744,
-9324=>745,
-9325=>746,
-9326=>747,
-189=>748,
-8531=>749,
-8532=>750,
-188=>751,
-190=>752,
-8539=>753,
-8540=>754,
-8541=>755,
-8542=>756,
-230=>757,
-273=>758,
-240=>759,
-295=>760,
-305=>761,
-307=>762,
-312=>763,
-320=>764,
-322=>765,
-248=>766,
-339=>767,
-223=>768,
-254=>769,
-359=>770,
-331=>771,
-329=>772,
-12800=>773,
-12801=>774,
-12802=>775,
-12803=>776,
-12804=>777,
-12805=>778,
-12806=>779,
-12807=>780,
-12808=>781,
-12809=>782,
-12810=>783,
-12811=>784,
-12812=>785,
-12813=>786,
-12814=>787,
-12815=>788,
-12816=>789,
-12817=>790,
-12818=>791,
-12819=>792,
-12820=>793,
-12821=>794,
-12822=>795,
-12823=>796,
-12824=>797,
-12825=>798,
-12826=>799,
-12827=>800,
-9372=>801,
-9373=>802,
-9374=>803,
-9375=>804,
-9376=>805,
-9377=>806,
-9378=>807,
-9379=>808,
-9380=>809,
-9381=>810,
-9382=>811,
-9383=>812,
-9384=>813,
-9385=>814,
-9386=>815,
-9387=>816,
-9388=>817,
-9389=>818,
-9390=>819,
-9391=>820,
-9392=>821,
-9393=>822,
-9394=>823,
-9395=>824,
-9396=>825,
-9397=>826,
-9332=>827,
-9333=>828,
-9334=>829,
-9335=>830,
-9336=>831,
-9337=>832,
-9338=>833,
-9339=>834,
-9340=>835,
-9341=>836,
-9342=>837,
-9343=>838,
-9344=>839,
-9345=>840,
-9346=>841,
-185=>842,
-178=>843,
-179=>844,
-8308=>845,
-8319=>846,
-8321=>847,
-8322=>848,
-8323=>849,
-8324=>850,
-12353=>851,
-12354=>852,
-12355=>853,
-12356=>854,
-12357=>855,
-12358=>856,
-12359=>857,
-12360=>858,
-12361=>859,
-12362=>860,
-12363=>861,
-12364=>862,
-12365=>863,
-12366=>864,
-12367=>865,
-12368=>866,
-12369=>867,
-12370=>868,
-12371=>869,
-12372=>870,
-12373=>871,
-12374=>872,
-12375=>873,
-12376=>874,
-12377=>875,
-12378=>876,
-12379=>877,
-12380=>878,
-12381=>879,
-12382=>880,
-12383=>881,
-12384=>882,
-12385=>883,
-12386=>884,
-12387=>885,
-12388=>886,
-12389=>887,
-12390=>888,
-12391=>889,
-12392=>890,
-12393=>891,
-12394=>892,
-12395=>893,
-12396=>894,
-12397=>895,
-12398=>896,
-12399=>897,
-12400=>898,
-12401=>899,
-12402=>900,
-12403=>901,
-12404=>902,
-12405=>903,
-12406=>904,
-12407=>905,
-12408=>906,
-12409=>907,
-12410=>908,
-12411=>909,
-12412=>910,
-12413=>911,
-12414=>912,
-12415=>913,
-12416=>914,
-12417=>915,
-12418=>916,
-12419=>917,
-12420=>918,
-12421=>919,
-12422=>920,
-12423=>921,
-12424=>922,
-12425=>923,
-12426=>924,
-12427=>925,
-12428=>926,
-12429=>927,
-12430=>928,
-12431=>929,
-12432=>930,
-12433=>931,
-12434=>932,
-12435=>933,
-12449=>934,
-12450=>935,
-12451=>936,
-12452=>937,
-12453=>938,
-12454=>939,
-12455=>940,
-12456=>941,
-12457=>942,
-12458=>943,
-12459=>944,
-12460=>945,
-12461=>946,
-12462=>947,
-12463=>948,
-12464=>949,
-12465=>950,
-12466=>951,
-12467=>952,
-12468=>953,
-12469=>954,
-12470=>955,
-12471=>956,
-12472=>957,
-12473=>958,
-12474=>959,
-12475=>960,
-12476=>961,
-12477=>962,
-12478=>963,
-12479=>964,
-12480=>965,
-12481=>966,
-12482=>967,
-12483=>968,
-12484=>969,
-12485=>970,
-12486=>971,
-12487=>972,
-12488=>973,
-12489=>974,
-12490=>975,
-12491=>976,
-12492=>977,
-12493=>978,
-12494=>979,
-12495=>980,
-12496=>981,
-12497=>982,
-12498=>983,
-12499=>984,
-12500=>985,
-12501=>986,
-12502=>987,
-12503=>988,
-12504=>989,
-12505=>990,
-12506=>991,
-12507=>992,
-12508=>993,
-12509=>994,
-12510=>995,
-12511=>996,
-12512=>997,
-12513=>998,
-12514=>999,
-12515=>1000,
-12516=>1001,
-12517=>1002,
-12518=>1003,
-12519=>1004,
-12520=>1005,
-12521=>1006,
-12522=>1007,
-12523=>1008,
-12524=>1009,
-12525=>1010,
-12526=>1011,
-12527=>1012,
-12528=>1013,
-12529=>1014,
-12530=>1015,
-12531=>1016,
-12532=>1017,
-12533=>1018,
-12534=>1019,
-1040=>1020,
-1041=>1021,
-1042=>1022,
-1043=>1023,
-1044=>1024,
-1045=>1025,
-1025=>1026,
-1046=>1027,
-1047=>1028,
-1048=>1029,
-1049=>1030,
-1050=>1031,
-1051=>1032,
-1052=>1033,
-1053=>1034,
-1054=>1035,
-1055=>1036,
-1056=>1037,
-1057=>1038,
-1058=>1039,
-1059=>1040,
-1060=>1041,
-1061=>1042,
-1062=>1043,
-1063=>1044,
-1064=>1045,
-1065=>1046,
-1066=>1047,
-1067=>1048,
-1068=>1049,
-1069=>1050,
-1070=>1051,
-1071=>1052,
-1072=>1053,
-1073=>1054,
-1074=>1055,
-1075=>1056,
-1076=>1057,
-1077=>1058,
-1105=>1059,
-1078=>1060,
-1079=>1061,
-1080=>1062,
-1081=>1063,
-1082=>1064,
-1083=>1065,
-1084=>1066,
-1085=>1067,
-1086=>1068,
-1087=>1069,
-1088=>1070,
-1089=>1071,
-1090=>1072,
-1091=>1073,
-1092=>1074,
-1093=>1075,
-1094=>1076,
-1095=>1077,
-1096=>1078,
-1097=>1079,
-1098=>1080,
-1099=>1081,
-1100=>1082,
-1101=>1083,
-1102=>1084,
-1103=>1085,
-44032=>1086,
-44033=>1087,
-44036=>1088,
-44039=>1089,
-44040=>1090,
-44041=>1091,
-44042=>1092,
-44048=>1093,
-44049=>1094,
-44050=>1095,
-44051=>1096,
-44052=>1097,
-44053=>1098,
-44054=>1099,
-44055=>1100,
-44057=>1101,
-44058=>1102,
-44059=>1103,
-44060=>1104,
-44061=>1105,
-44064=>1106,
-44068=>1107,
-44076=>1108,
-44077=>1109,
-44079=>1110,
-44080=>1111,
-44081=>1112,
-44088=>1113,
-44089=>1114,
-44092=>1115,
-44096=>1116,
-44107=>1117,
-44109=>1118,
-44116=>1119,
-44120=>1120,
-44124=>1121,
-44144=>1122,
-44145=>1123,
-44148=>1124,
-44151=>1125,
-44152=>1126,
-44154=>1127,
-44160=>1128,
-44161=>1129,
-44163=>1130,
-44164=>1131,
-44165=>1132,
-44166=>1133,
-44169=>1134,
-44170=>1135,
-44171=>1136,
-44172=>1137,
-44176=>1138,
-44180=>1139,
-44188=>1140,
-44189=>1141,
-44191=>1142,
-44192=>1143,
-44193=>1144,
-44200=>1145,
-44201=>1146,
-44202=>1147,
-44204=>1148,
-44207=>1149,
-44208=>1150,
-44216=>1151,
-44217=>1152,
-44219=>1153,
-44220=>1154,
-44221=>1155,
-44225=>1156,
-44228=>1157,
-44232=>1158,
-44236=>1159,
-44245=>1160,
-44247=>1161,
-44256=>1162,
-44257=>1163,
-44260=>1164,
-44263=>1165,
-44264=>1166,
-44266=>1167,
-44268=>1168,
-44271=>1169,
-44272=>1170,
-44273=>1171,
-44275=>1172,
-44277=>1173,
-44278=>1174,
-44284=>1175,
-44285=>1176,
-44288=>1177,
-44292=>1178,
-44294=>1179,
-44300=>1180,
-44301=>1181,
-44303=>1182,
-44305=>1183,
-44312=>1184,
-44316=>1185,
-44320=>1186,
-44329=>1187,
-44332=>1188,
-44333=>1189,
-44340=>1190,
-44341=>1191,
-44344=>1192,
-44348=>1193,
-44356=>1194,
-44357=>1195,
-44359=>1196,
-44361=>1197,
-44368=>1198,
-44372=>1199,
-44376=>1200,
-44385=>1201,
-44387=>1202,
-44396=>1203,
-44397=>1204,
-44400=>1205,
-44403=>1206,
-44404=>1207,
-44405=>1208,
-44406=>1209,
-44411=>1210,
-44412=>1211,
-44413=>1212,
-44415=>1213,
-44417=>1214,
-44418=>1215,
-44424=>1216,
-44425=>1217,
-44428=>1218,
-44432=>1219,
-44444=>1220,
-44445=>1221,
-44452=>1222,
-44471=>1223,
-44480=>1224,
-44481=>1225,
-44484=>1226,
-44488=>1227,
-44496=>1228,
-44497=>1229,
-44499=>1230,
-44508=>1231,
-44512=>1232,
-44516=>1233,
-44536=>1234,
-44537=>1235,
-44540=>1236,
-44543=>1237,
-44544=>1238,
-44545=>1239,
-44552=>1240,
-44553=>1241,
-44555=>1242,
-44557=>1243,
-44564=>1244,
-44592=>1245,
-44593=>1246,
-44596=>1247,
-44599=>1248,
-44600=>1249,
-44602=>1250,
-44608=>1251,
-44609=>1252,
-44611=>1253,
-44613=>1254,
-44614=>1255,
-44618=>1256,
-44620=>1257,
-44621=>1258,
-44622=>1259,
-44624=>1260,
-44628=>1261,
-44630=>1262,
-44636=>1263,
-44637=>1264,
-44639=>1265,
-44640=>1266,
-44641=>1267,
-44645=>1268,
-44648=>1269,
-44649=>1270,
-44652=>1271,
-44656=>1272,
-44664=>1273,
-44665=>1274,
-44667=>1275,
-44668=>1276,
-44669=>1277,
-44676=>1278,
-44677=>1279,
-44684=>1280,
-44732=>1281,
-44733=>1282,
-44734=>1283,
-44736=>1284,
-44740=>1285,
-44748=>1286,
-44749=>1287,
-44751=>1288,
-44752=>1289,
-44753=>1290,
-44760=>1291,
-44761=>1292,
-44764=>1293,
-44776=>1294,
-44779=>1295,
-44781=>1296,
-44788=>1297,
-44792=>1298,
-44796=>1299,
-44807=>1300,
-44808=>1301,
-44813=>1302,
-44816=>1303,
-44844=>1304,
-44845=>1305,
-44848=>1306,
-44850=>1307,
-44852=>1308,
-44860=>1309,
-44861=>1310,
-44863=>1311,
-44865=>1312,
-44866=>1313,
-44867=>1314,
-44872=>1315,
-44873=>1316,
-44880=>1317,
-44892=>1318,
-44893=>1319,
-44900=>1320,
-44901=>1321,
-44921=>1322,
-44928=>1323,
-44932=>1324,
-44936=>1325,
-44944=>1326,
-44945=>1327,
-44949=>1328,
-44956=>1329,
-44984=>1330,
-44985=>1331,
-44988=>1332,
-44992=>1333,
-44999=>1334,
-45000=>1335,
-45001=>1336,
-45003=>1337,
-45005=>1338,
-45006=>1339,
-45012=>1340,
-45020=>1341,
-45032=>1342,
-45033=>1343,
-45040=>1344,
-45041=>1345,
-45044=>1346,
-45048=>1347,
-45056=>1348,
-45057=>1349,
-45060=>1350,
-45068=>1351,
-45072=>1352,
-45076=>1353,
-45084=>1354,
-45085=>1355,
-45096=>1356,
-45124=>1357,
-45125=>1358,
-45128=>1359,
-45130=>1360,
-45132=>1361,
-45134=>1362,
-45139=>1363,
-45140=>1364,
-45141=>1365,
-45143=>1366,
-45145=>1367,
-45149=>1368,
-45180=>1369,
-45181=>1370,
-45184=>1371,
-45188=>1372,
-45196=>1373,
-45197=>1374,
-45199=>1375,
-45201=>1376,
-45208=>1377,
-45209=>1378,
-45210=>1379,
-45212=>1380,
-45215=>1381,
-45216=>1382,
-45217=>1383,
-45218=>1384,
-45224=>1385,
-45225=>1386,
-45227=>1387,
-45228=>1388,
-45229=>1389,
-45230=>1390,
-45231=>1391,
-45233=>1392,
-45235=>1393,
-45236=>1394,
-45237=>1395,
-45240=>1396,
-45244=>1397,
-45252=>1398,
-45253=>1399,
-45255=>1400,
-45256=>1401,
-45257=>1402,
-45264=>1403,
-45265=>1404,
-45268=>1405,
-45272=>1406,
-45280=>1407,
-45285=>1408,
-45320=>1409,
-45321=>1410,
-45323=>1411,
-45324=>1412,
-45328=>1413,
-45330=>1414,
-45331=>1415,
-45336=>1416,
-45337=>1417,
-45339=>1418,
-45340=>1419,
-45341=>1420,
-45347=>1421,
-45348=>1422,
-45349=>1423,
-45352=>1424,
-45356=>1425,
-45364=>1426,
-45365=>1427,
-45367=>1428,
-45368=>1429,
-45369=>1430,
-45376=>1431,
-45377=>1432,
-45380=>1433,
-45384=>1434,
-45392=>1435,
-45393=>1436,
-45396=>1437,
-45397=>1438,
-45400=>1439,
-45404=>1440,
-45408=>1441,
-45432=>1442,
-45433=>1443,
-45436=>1444,
-45440=>1445,
-45442=>1446,
-45448=>1447,
-45449=>1448,
-45451=>1449,
-45453=>1450,
-45458=>1451,
-45459=>1452,
-45460=>1453,
-45464=>1454,
-45468=>1455,
-45480=>1456,
-45516=>1457,
-45520=>1458,
-45524=>1459,
-45532=>1460,
-45533=>1461,
-45535=>1462,
-45544=>1463,
-45545=>1464,
-45548=>1465,
-45552=>1466,
-45561=>1467,
-45563=>1468,
-45565=>1469,
-45572=>1470,
-45573=>1471,
-45576=>1472,
-45579=>1473,
-45580=>1474,
-45588=>1475,
-45589=>1476,
-45591=>1477,
-45593=>1478,
-45600=>1479,
-45620=>1480,
-45628=>1481,
-45656=>1482,
-45660=>1483,
-45664=>1484,
-45672=>1485,
-45673=>1486,
-45684=>1487,
-45685=>1488,
-45692=>1489,
-45700=>1490,
-45701=>1491,
-45705=>1492,
-45712=>1493,
-45713=>1494,
-45716=>1495,
-45720=>1496,
-45721=>1497,
-45722=>1498,
-45728=>1499,
-45729=>1500,
-45731=>1501,
-45733=>1502,
-45734=>1503,
-45738=>1504,
-45740=>1505,
-45744=>1506,
-45748=>1507,
-45768=>1508,
-45769=>1509,
-45772=>1510,
-45776=>1511,
-45778=>1512,
-45784=>1513,
-45785=>1514,
-45787=>1515,
-45789=>1516,
-45794=>1517,
-45796=>1518,
-45797=>1519,
-45798=>1520,
-45800=>1521,
-45803=>1522,
-45804=>1523,
-45805=>1524,
-45806=>1525,
-45807=>1526,
-45811=>1527,
-45812=>1528,
-45813=>1529,
-45815=>1530,
-45816=>1531,
-45817=>1532,
-45818=>1533,
-45819=>1534,
-45823=>1535,
-45824=>1536,
-45825=>1537,
-45828=>1538,
-45832=>1539,
-45840=>1540,
-45841=>1541,
-45843=>1542,
-45844=>1543,
-45845=>1544,
-45852=>1545,
-45908=>1546,
-45909=>1547,
-45910=>1548,
-45912=>1549,
-45915=>1550,
-45916=>1551,
-45918=>1552,
-45919=>1553,
-45924=>1554,
-45925=>1555,
-45927=>1556,
-45929=>1557,
-45931=>1558,
-45934=>1559,
-45936=>1560,
-45937=>1561,
-45940=>1562,
-45944=>1563,
-45952=>1564,
-45953=>1565,
-45955=>1566,
-45956=>1567,
-45957=>1568,
-45964=>1569,
-45968=>1570,
-45972=>1571,
-45984=>1572,
-45985=>1573,
-45992=>1574,
-45996=>1575,
-46020=>1576,
-46021=>1577,
-46024=>1578,
-46027=>1579,
-46028=>1580,
-46030=>1581,
-46032=>1582,
-46036=>1583,
-46037=>1584,
-46039=>1585,
-46041=>1586,
-46043=>1587,
-46045=>1588,
-46048=>1589,
-46052=>1590,
-46056=>1591,
-46076=>1592,
-46096=>1593,
-46104=>1594,
-46108=>1595,
-46112=>1596,
-46120=>1597,
-46121=>1598,
-46123=>1599,
-46132=>1600,
-46160=>1601,
-46161=>1602,
-46164=>1603,
-46168=>1604,
-46176=>1605,
-46177=>1606,
-46179=>1607,
-46181=>1608,
-46188=>1609,
-46208=>1610,
-46216=>1611,
-46237=>1612,
-46244=>1613,
-46248=>1614,
-46252=>1615,
-46261=>1616,
-46263=>1617,
-46265=>1618,
-46272=>1619,
-46276=>1620,
-46280=>1621,
-46288=>1622,
-46293=>1623,
-46300=>1624,
-46301=>1625,
-46304=>1626,
-46307=>1627,
-46308=>1628,
-46310=>1629,
-46316=>1630,
-46317=>1631,
-46319=>1632,
-46321=>1633,
-46328=>1634,
-46356=>1635,
-46357=>1636,
-46360=>1637,
-46363=>1638,
-46364=>1639,
-46372=>1640,
-46373=>1641,
-46375=>1642,
-46376=>1643,
-46377=>1644,
-46378=>1645,
-46384=>1646,
-46385=>1647,
-46388=>1648,
-46392=>1649,
-46400=>1650,
-46401=>1651,
-46403=>1652,
-46404=>1653,
-46405=>1654,
-46411=>1655,
-46412=>1656,
-46413=>1657,
-46416=>1658,
-46420=>1659,
-46428=>1660,
-46429=>1661,
-46431=>1662,
-46432=>1663,
-46433=>1664,
-46496=>1665,
-46497=>1666,
-46500=>1667,
-46504=>1668,
-46506=>1669,
-46507=>1670,
-46512=>1671,
-46513=>1672,
-46515=>1673,
-46516=>1674,
-46517=>1675,
-46523=>1676,
-46524=>1677,
-46525=>1678,
-46528=>1679,
-46532=>1680,
-46540=>1681,
-46541=>1682,
-46543=>1683,
-46544=>1684,
-46545=>1685,
-46552=>1686,
-46572=>1687,
-46608=>1688,
-46609=>1689,
-46612=>1690,
-46616=>1691,
-46629=>1692,
-46636=>1693,
-46644=>1694,
-46664=>1695,
-46692=>1696,
-46696=>1697,
-46748=>1698,
-46749=>1699,
-46752=>1700,
-46756=>1701,
-46763=>1702,
-46764=>1703,
-46769=>1704,
-46804=>1705,
-46832=>1706,
-46836=>1707,
-46840=>1708,
-46848=>1709,
-46849=>1710,
-46853=>1711,
-46888=>1712,
-46889=>1713,
-46892=>1714,
-46895=>1715,
-46896=>1716,
-46904=>1717,
-46905=>1718,
-46907=>1719,
-46916=>1720,
-46920=>1721,
-46924=>1722,
-46932=>1723,
-46933=>1724,
-46944=>1725,
-46948=>1726,
-46952=>1727,
-46960=>1728,
-46961=>1729,
-46963=>1730,
-46965=>1731,
-46972=>1732,
-46973=>1733,
-46976=>1734,
-46980=>1735,
-46988=>1736,
-46989=>1737,
-46991=>1738,
-46992=>1739,
-46993=>1740,
-46994=>1741,
-46998=>1742,
-46999=>1743,
-47000=>1744,
-47001=>1745,
-47004=>1746,
-47008=>1747,
-47016=>1748,
-47017=>1749,
-47019=>1750,
-47020=>1751,
-47021=>1752,
-47028=>1753,
-47029=>1754,
-47032=>1755,
-47047=>1756,
-47049=>1757,
-47084=>1758,
-47085=>1759,
-47088=>1760,
-47092=>1761,
-47100=>1762,
-47101=>1763,
-47103=>1764,
-47104=>1765,
-47105=>1766,
-47111=>1767,
-47112=>1768,
-47113=>1769,
-47116=>1770,
-47120=>1771,
-47128=>1772,
-47129=>1773,
-47131=>1774,
-47133=>1775,
-47140=>1776,
-47141=>1777,
-47144=>1778,
-47148=>1779,
-47156=>1780,
-47157=>1781,
-47159=>1782,
-47160=>1783,
-47161=>1784,
-47168=>1785,
-47172=>1786,
-47185=>1787,
-47187=>1788,
-47196=>1789,
-47197=>1790,
-47200=>1791,
-47204=>1792,
-47212=>1793,
-47213=>1794,
-47215=>1795,
-47217=>1796,
-47224=>1797,
-47228=>1798,
-47245=>1799,
-47272=>1800,
-47280=>1801,
-47284=>1802,
-47288=>1803,
-47296=>1804,
-47297=>1805,
-47299=>1806,
-47301=>1807,
-47308=>1808,
-47312=>1809,
-47316=>1810,
-47325=>1811,
-47327=>1812,
-47329=>1813,
-47336=>1814,
-47337=>1815,
-47340=>1816,
-47344=>1817,
-47352=>1818,
-47353=>1819,
-47355=>1820,
-47357=>1821,
-47364=>1822,
-47384=>1823,
-47392=>1824,
-47420=>1825,
-47421=>1826,
-47424=>1827,
-47428=>1828,
-47436=>1829,
-47439=>1830,
-47441=>1831,
-47448=>1832,
-47449=>1833,
-47452=>1834,
-47456=>1835,
-47464=>1836,
-47465=>1837,
-47467=>1838,
-47469=>1839,
-47476=>1840,
-47477=>1841,
-47480=>1842,
-47484=>1843,
-47492=>1844,
-47493=>1845,
-47495=>1846,
-47497=>1847,
-47498=>1848,
-47501=>1849,
-47502=>1850,
-47532=>1851,
-47533=>1852,
-47536=>1853,
-47540=>1854,
-47548=>1855,
-47549=>1856,
-47551=>1857,
-47553=>1858,
-47560=>1859,
-47561=>1860,
-47564=>1861,
-47566=>1862,
-47567=>1863,
-47568=>1864,
-47569=>1865,
-47570=>1866,
-47576=>1867,
-47577=>1868,
-47579=>1869,
-47581=>1870,
-47582=>1871,
-47585=>1872,
-47587=>1873,
-47588=>1874,
-47589=>1875,
-47592=>1876,
-47596=>1877,
-47604=>1878,
-47605=>1879,
-47607=>1880,
-47608=>1881,
-47609=>1882,
-47610=>1883,
-47616=>1884,
-47617=>1885,
-47624=>1886,
-47637=>1887,
-47672=>1888,
-47673=>1889,
-47676=>1890,
-47680=>1891,
-47682=>1892,
-47688=>1893,
-47689=>1894,
-47691=>1895,
-47693=>1896,
-47694=>1897,
-47699=>1898,
-47700=>1899,
-47701=>1900,
-47704=>1901,
-47708=>1902,
-47716=>1903,
-47717=>1904,
-47719=>1905,
-47720=>1906,
-47721=>1907,
-47728=>1908,
-47729=>1909,
-47732=>1910,
-47736=>1911,
-47747=>1912,
-47748=>1913,
-47749=>1914,
-47751=>1915,
-47756=>1916,
-47784=>1917,
-47785=>1918,
-47787=>1919,
-47788=>1920,
-47792=>1921,
-47794=>1922,
-47800=>1923,
-47801=>1924,
-47803=>1925,
-47805=>1926,
-47812=>1927,
-47816=>1928,
-47832=>1929,
-47833=>1930,
-47868=>1931,
-47872=>1932,
-47876=>1933,
-47885=>1934,
-47887=>1935,
-47889=>1936,
-47896=>1937,
-47900=>1938,
-47904=>1939,
-47913=>1940,
-47915=>1941,
-47924=>1942,
-47925=>1943,
-47926=>1944,
-47928=>1945,
-47931=>1946,
-47932=>1947,
-47933=>1948,
-47934=>1949,
-47940=>1950,
-47941=>1951,
-47943=>1952,
-47945=>1953,
-47949=>1954,
-47951=>1955,
-47952=>1956,
-47956=>1957,
-47960=>1958,
-47969=>1959,
-47971=>1960,
-47980=>1961,
-48008=>1962,
-48012=>1963,
-48016=>1964,
-48036=>1965,
-48040=>1966,
-48044=>1967,
-48052=>1968,
-48055=>1969,
-48064=>1970,
-48068=>1971,
-48072=>1972,
-48080=>1973,
-48083=>1974,
-48120=>1975,
-48121=>1976,
-48124=>1977,
-48127=>1978,
-48128=>1979,
-48130=>1980,
-48136=>1981,
-48137=>1982,
-48139=>1983,
-48140=>1984,
-48141=>1985,
-48143=>1986,
-48145=>1987,
-48148=>1988,
-48149=>1989,
-48150=>1990,
-48151=>1991,
-48152=>1992,
-48155=>1993,
-48156=>1994,
-48157=>1995,
-48158=>1996,
-48159=>1997,
-48164=>1998,
-48165=>1999,
-48167=>2000,
-48169=>2001,
-48173=>2002,
-48176=>2003,
-48177=>2004,
-48180=>2005,
-48184=>2006,
-48192=>2007,
-48193=>2008,
-48195=>2009,
-48196=>2010,
-48197=>2011,
-48201=>2012,
-48204=>2013,
-48205=>2014,
-48208=>2015,
-48221=>2016,
-48260=>2017,
-48261=>2018,
-48264=>2019,
-48267=>2020,
-48268=>2021,
-48270=>2022,
-48276=>2023,
-48277=>2024,
-48279=>2025,
-48281=>2026,
-48282=>2027,
-48288=>2028,
-48289=>2029,
-48292=>2030,
-48295=>2031,
-48296=>2032,
-48304=>2033,
-48305=>2034,
-48307=>2035,
-48308=>2036,
-48309=>2037,
-48316=>2038,
-48317=>2039,
-48320=>2040,
-48324=>2041,
-48333=>2042,
-48335=>2043,
-48336=>2044,
-48337=>2045,
-48341=>2046,
-48344=>2047,
-48348=>2048,
-48372=>2049,
-48373=>2050,
-48374=>2051,
-48376=>2052,
-48380=>2053,
-48388=>2054,
-48389=>2055,
-48391=>2056,
-48393=>2057,
-48400=>2058,
-48404=>2059,
-48420=>2060,
-48428=>2061,
-48448=>2062,
-48456=>2063,
-48457=>2064,
-48460=>2065,
-48464=>2066,
-48472=>2067,
-48473=>2068,
-48484=>2069,
-48488=>2070,
-48512=>2071,
-48513=>2072,
-48516=>2073,
-48519=>2074,
-48520=>2075,
-48521=>2076,
-48522=>2077,
-48528=>2078,
-48529=>2079,
-48531=>2080,
-48533=>2081,
-48537=>2082,
-48538=>2083,
-48540=>2084,
-48548=>2085,
-48560=>2086,
-48568=>2087,
-48596=>2088,
-48597=>2089,
-48600=>2090,
-48604=>2091,
-48617=>2092,
-48624=>2093,
-48628=>2094,
-48632=>2095,
-48640=>2096,
-48643=>2097,
-48645=>2098,
-48652=>2099,
-48653=>2100,
-48656=>2101,
-48660=>2102,
-48668=>2103,
-48669=>2104,
-48671=>2105,
-48708=>2106,
-48709=>2107,
-48712=>2108,
-48716=>2109,
-48718=>2110,
-48724=>2111,
-48725=>2112,
-48727=>2113,
-48729=>2114,
-48730=>2115,
-48731=>2116,
-48736=>2117,
-48737=>2118,
-48740=>2119,
-48744=>2120,
-48746=>2121,
-48752=>2122,
-48753=>2123,
-48755=>2124,
-48756=>2125,
-48757=>2126,
-48763=>2127,
-48764=>2128,
-48765=>2129,
-48768=>2130,
-48772=>2131,
-48780=>2132,
-48781=>2133,
-48783=>2134,
-48784=>2135,
-48785=>2136,
-48792=>2137,
-48793=>2138,
-48808=>2139,
-48848=>2140,
-48849=>2141,
-48852=>2142,
-48855=>2143,
-48856=>2144,
-48864=>2145,
-48867=>2146,
-48868=>2147,
-48869=>2148,
-48876=>2149,
-48897=>2150,
-48904=>2151,
-48905=>2152,
-48920=>2153,
-48921=>2154,
-48923=>2155,
-48924=>2156,
-48925=>2157,
-48960=>2158,
-48961=>2159,
-48964=>2160,
-48968=>2161,
-48976=>2162,
-48977=>2163,
-48981=>2164,
-49044=>2165,
-49072=>2166,
-49093=>2167,
-49100=>2168,
-49101=>2169,
-49104=>2170,
-49108=>2171,
-49116=>2172,
-49119=>2173,
-49121=>2174,
-49212=>2175,
-49233=>2176,
-49240=>2177,
-49244=>2178,
-49248=>2179,
-49256=>2180,
-49257=>2181,
-49296=>2182,
-49297=>2183,
-49300=>2184,
-49304=>2185,
-49312=>2186,
-49313=>2187,
-49315=>2188,
-49317=>2189,
-49324=>2190,
-49325=>2191,
-49327=>2192,
-49328=>2193,
-49331=>2194,
-49332=>2195,
-49333=>2196,
-49334=>2197,
-49340=>2198,
-49341=>2199,
-49343=>2200,
-49344=>2201,
-49345=>2202,
-49349=>2203,
-49352=>2204,
-49353=>2205,
-49356=>2206,
-49360=>2207,
-49368=>2208,
-49369=>2209,
-49371=>2210,
-49372=>2211,
-49373=>2212,
-49380=>2213,
-49381=>2214,
-49384=>2215,
-49388=>2216,
-49396=>2217,
-49397=>2218,
-49399=>2219,
-49401=>2220,
-49408=>2221,
-49412=>2222,
-49416=>2223,
-49424=>2224,
-49429=>2225,
-49436=>2226,
-49437=>2227,
-49438=>2228,
-49439=>2229,
-49440=>2230,
-49443=>2231,
-49444=>2232,
-49446=>2233,
-49447=>2234,
-49452=>2235,
-49453=>2236,
-49455=>2237,
-49456=>2238,
-49457=>2239,
-49462=>2240,
-49464=>2241,
-49465=>2242,
-49468=>2243,
-49472=>2244,
-49480=>2245,
-49481=>2246,
-49483=>2247,
-49484=>2248,
-49485=>2249,
-49492=>2250,
-49493=>2251,
-49496=>2252,
-49500=>2253,
-49508=>2254,
-49509=>2255,
-49511=>2256,
-49512=>2257,
-49513=>2258,
-49520=>2259,
-49524=>2260,
-49528=>2261,
-49541=>2262,
-49548=>2263,
-49549=>2264,
-49550=>2265,
-49552=>2266,
-49556=>2267,
-49558=>2268,
-49564=>2269,
-49565=>2270,
-49567=>2271,
-49569=>2272,
-49573=>2273,
-49576=>2274,
-49577=>2275,
-49580=>2276,
-49584=>2277,
-49597=>2278,
-49604=>2279,
-49608=>2280,
-49612=>2281,
-49620=>2282,
-49623=>2283,
-49624=>2284,
-49632=>2285,
-49636=>2286,
-49640=>2287,
-49648=>2288,
-49649=>2289,
-49651=>2290,
-49660=>2291,
-49661=>2292,
-49664=>2293,
-49668=>2294,
-49676=>2295,
-49677=>2296,
-49679=>2297,
-49681=>2298,
-49688=>2299,
-49689=>2300,
-49692=>2301,
-49695=>2302,
-49696=>2303,
-49704=>2304,
-49705=>2305,
-49707=>2306,
-49709=>2307,
-49711=>2308,
-49713=>2309,
-49714=>2310,
-49716=>2311,
-49736=>2312,
-49744=>2313,
-49745=>2314,
-49748=>2315,
-49752=>2316,
-49760=>2317,
-49765=>2318,
-49772=>2319,
-49773=>2320,
-49776=>2321,
-49780=>2322,
-49788=>2323,
-49789=>2324,
-49791=>2325,
-49793=>2326,
-49800=>2327,
-49801=>2328,
-49808=>2329,
-49816=>2330,
-49819=>2331,
-49821=>2332,
-49828=>2333,
-49829=>2334,
-49832=>2335,
-49836=>2336,
-49837=>2337,
-49844=>2338,
-49845=>2339,
-49847=>2340,
-49849=>2341,
-49884=>2342,
-49885=>2343,
-49888=>2344,
-49891=>2345,
-49892=>2346,
-49899=>2347,
-49900=>2348,
-49901=>2349,
-49903=>2350,
-49905=>2351,
-49910=>2352,
-49912=>2353,
-49913=>2354,
-49915=>2355,
-49916=>2356,
-49920=>2357,
-49928=>2358,
-49929=>2359,
-49932=>2360,
-49933=>2361,
-49939=>2362,
-49940=>2363,
-49941=>2364,
-49944=>2365,
-49948=>2366,
-49956=>2367,
-49957=>2368,
-49960=>2369,
-49961=>2370,
-49989=>2371,
-50024=>2372,
-50025=>2373,
-50028=>2374,
-50032=>2375,
-50034=>2376,
-50040=>2377,
-50041=>2378,
-50044=>2379,
-50045=>2380,
-50052=>2381,
-50056=>2382,
-50060=>2383,
-50112=>2384,
-50136=>2385,
-50137=>2386,
-50140=>2387,
-50143=>2388,
-50144=>2389,
-50146=>2390,
-50152=>2391,
-50153=>2392,
-50157=>2393,
-50164=>2394,
-50165=>2395,
-50168=>2396,
-50184=>2397,
-50192=>2398,
-50212=>2399,
-50220=>2400,
-50224=>2401,
-50228=>2402,
-50236=>2403,
-50237=>2404,
-50248=>2405,
-50276=>2406,
-50277=>2407,
-50280=>2408,
-50284=>2409,
-50292=>2410,
-50293=>2411,
-50297=>2412,
-50304=>2413,
-50324=>2414,
-50332=>2415,
-50360=>2416,
-50364=>2417,
-50409=>2418,
-50416=>2419,
-50417=>2420,
-50420=>2421,
-50424=>2422,
-50426=>2423,
-50431=>2424,
-50432=>2425,
-50433=>2426,
-50444=>2427,
-50448=>2428,
-50452=>2429,
-50460=>2430,
-50472=>2431,
-50473=>2432,
-50476=>2433,
-50480=>2434,
-50488=>2435,
-50489=>2436,
-50491=>2437,
-50493=>2438,
-50500=>2439,
-50501=>2440,
-50504=>2441,
-50505=>2442,
-50506=>2443,
-50508=>2444,
-50509=>2445,
-50510=>2446,
-50515=>2447,
-50516=>2448,
-50517=>2449,
-50519=>2450,
-50520=>2451,
-50521=>2452,
-50525=>2453,
-50526=>2454,
-50528=>2455,
-50529=>2456,
-50532=>2457,
-50536=>2458,
-50544=>2459,
-50545=>2460,
-50547=>2461,
-50548=>2462,
-50549=>2463,
-50556=>2464,
-50557=>2465,
-50560=>2466,
-50564=>2467,
-50567=>2468,
-50572=>2469,
-50573=>2470,
-50575=>2471,
-50577=>2472,
-50581=>2473,
-50583=>2474,
-50584=>2475,
-50588=>2476,
-50592=>2477,
-50601=>2478,
-50612=>2479,
-50613=>2480,
-50616=>2481,
-50617=>2482,
-50619=>2483,
-50620=>2484,
-50621=>2485,
-50622=>2486,
-50628=>2487,
-50629=>2488,
-50630=>2489,
-50631=>2490,
-50632=>2491,
-50633=>2492,
-50634=>2493,
-50636=>2494,
-50638=>2495,
-50640=>2496,
-50641=>2497,
-50644=>2498,
-50648=>2499,
-50656=>2500,
-50657=>2501,
-50659=>2502,
-50661=>2503,
-50668=>2504,
-50669=>2505,
-50670=>2506,
-50672=>2507,
-50676=>2508,
-50678=>2509,
-50679=>2510,
-50684=>2511,
-50685=>2512,
-50686=>2513,
-50687=>2514,
-50688=>2515,
-50689=>2516,
-50693=>2517,
-50694=>2518,
-50695=>2519,
-50696=>2520,
-50700=>2521,
-50704=>2522,
-50712=>2523,
-50713=>2524,
-50715=>2525,
-50716=>2526,
-50724=>2527,
-50725=>2528,
-50728=>2529,
-50732=>2530,
-50733=>2531,
-50734=>2532,
-50736=>2533,
-50739=>2534,
-50740=>2535,
-50741=>2536,
-50743=>2537,
-50745=>2538,
-50747=>2539,
-50752=>2540,
-50753=>2541,
-50756=>2542,
-50760=>2543,
-50768=>2544,
-50769=>2545,
-50771=>2546,
-50772=>2547,
-50773=>2548,
-50780=>2549,
-50781=>2550,
-50784=>2551,
-50796=>2552,
-50799=>2553,
-50801=>2554,
-50808=>2555,
-50809=>2556,
-50812=>2557,
-50816=>2558,
-50824=>2559,
-50825=>2560,
-50827=>2561,
-50829=>2562,
-50836=>2563,
-50837=>2564,
-50840=>2565,
-50844=>2566,
-50852=>2567,
-50853=>2568,
-50855=>2569,
-50857=>2570,
-50864=>2571,
-50865=>2572,
-50868=>2573,
-50872=>2574,
-50873=>2575,
-50874=>2576,
-50880=>2577,
-50881=>2578,
-50883=>2579,
-50885=>2580,
-50892=>2581,
-50893=>2582,
-50896=>2583,
-50900=>2584,
-50908=>2585,
-50909=>2586,
-50912=>2587,
-50913=>2588,
-50920=>2589,
-50921=>2590,
-50924=>2591,
-50928=>2592,
-50936=>2593,
-50937=>2594,
-50941=>2595,
-50948=>2596,
-50949=>2597,
-50952=>2598,
-50956=>2599,
-50964=>2600,
-50965=>2601,
-50967=>2602,
-50969=>2603,
-50976=>2604,
-50977=>2605,
-50980=>2606,
-50984=>2607,
-50992=>2608,
-50993=>2609,
-50995=>2610,
-50997=>2611,
-50999=>2612,
-51004=>2613,
-51005=>2614,
-51008=>2615,
-51012=>2616,
-51018=>2617,
-51020=>2618,
-51021=>2619,
-51023=>2620,
-51025=>2621,
-51026=>2622,
-51027=>2623,
-51028=>2624,
-51029=>2625,
-51030=>2626,
-51031=>2627,
-51032=>2628,
-51036=>2629,
-51040=>2630,
-51048=>2631,
-51051=>2632,
-51060=>2633,
-51061=>2634,
-51064=>2635,
-51068=>2636,
-51069=>2637,
-51070=>2638,
-51075=>2639,
-51076=>2640,
-51077=>2641,
-51079=>2642,
-51080=>2643,
-51081=>2644,
-51082=>2645,
-51086=>2646,
-51088=>2647,
-51089=>2648,
-51092=>2649,
-51094=>2650,
-51095=>2651,
-51096=>2652,
-51098=>2653,
-51104=>2654,
-51105=>2655,
-51107=>2656,
-51108=>2657,
-51109=>2658,
-51110=>2659,
-51116=>2660,
-51117=>2661,
-51120=>2662,
-51124=>2663,
-51132=>2664,
-51133=>2665,
-51135=>2666,
-51136=>2667,
-51137=>2668,
-51144=>2669,
-51145=>2670,
-51148=>2671,
-51150=>2672,
-51152=>2673,
-51160=>2674,
-51165=>2675,
-51172=>2676,
-51176=>2677,
-51180=>2678,
-51200=>2679,
-51201=>2680,
-51204=>2681,
-51208=>2682,
-51210=>2683,
-51216=>2684,
-51217=>2685,
-51219=>2686,
-51221=>2687,
-51222=>2688,
-51228=>2689,
-51229=>2690,
-51232=>2691,
-51236=>2692,
-51244=>2693,
-51245=>2694,
-51247=>2695,
-51249=>2696,
-51256=>2697,
-51260=>2698,
-51264=>2699,
-51272=>2700,
-51273=>2701,
-51276=>2702,
-51277=>2703,
-51284=>2704,
-51312=>2705,
-51313=>2706,
-51316=>2707,
-51320=>2708,
-51322=>2709,
-51328=>2710,
-51329=>2711,
-51331=>2712,
-51333=>2713,
-51334=>2714,
-51335=>2715,
-51339=>2716,
-51340=>2717,
-51341=>2718,
-51348=>2719,
-51357=>2720,
-51359=>2721,
-51361=>2722,
-51368=>2723,
-51388=>2724,
-51389=>2725,
-51396=>2726,
-51400=>2727,
-51404=>2728,
-51412=>2729,
-51413=>2730,
-51415=>2731,
-51417=>2732,
-51424=>2733,
-51425=>2734,
-51428=>2735,
-51445=>2736,
-51452=>2737,
-51453=>2738,
-51456=>2739,
-51460=>2740,
-51461=>2741,
-51462=>2742,
-51468=>2743,
-51469=>2744,
-51471=>2745,
-51473=>2746,
-51480=>2747,
-51500=>2748,
-51508=>2749,
-51536=>2750,
-51537=>2751,
-51540=>2752,
-51544=>2753,
-51552=>2754,
-51553=>2755,
-51555=>2756,
-51564=>2757,
-51568=>2758,
-51572=>2759,
-51580=>2760,
-51592=>2761,
-51593=>2762,
-51596=>2763,
-51600=>2764,
-51608=>2765,
-51609=>2766,
-51611=>2767,
-51613=>2768,
-51648=>2769,
-51649=>2770,
-51652=>2771,
-51655=>2772,
-51656=>2773,
-51658=>2774,
-51664=>2775,
-51665=>2776,
-51667=>2777,
-51669=>2778,
-51670=>2779,
-51673=>2780,
-51674=>2781,
-51676=>2782,
-51677=>2783,
-51680=>2784,
-51682=>2785,
-51684=>2786,
-51687=>2787,
-51692=>2788,
-51693=>2789,
-51695=>2790,
-51696=>2791,
-51697=>2792,
-51704=>2793,
-51705=>2794,
-51708=>2795,
-51712=>2796,
-51720=>2797,
-51721=>2798,
-51723=>2799,
-51724=>2800,
-51725=>2801,
-51732=>2802,
-51736=>2803,
-51753=>2804,
-51788=>2805,
-51789=>2806,
-51792=>2807,
-51796=>2808,
-51804=>2809,
-51805=>2810,
-51807=>2811,
-51808=>2812,
-51809=>2813,
-51816=>2814,
-51837=>2815,
-51844=>2816,
-51864=>2817,
-51900=>2818,
-51901=>2819,
-51904=>2820,
-51908=>2821,
-51916=>2822,
-51917=>2823,
-51919=>2824,
-51921=>2825,
-51923=>2826,
-51928=>2827,
-51929=>2828,
-51936=>2829,
-51948=>2830,
-51956=>2831,
-51976=>2832,
-51984=>2833,
-51988=>2834,
-51992=>2835,
-52000=>2836,
-52001=>2837,
-52033=>2838,
-52040=>2839,
-52041=>2840,
-52044=>2841,
-52048=>2842,
-52056=>2843,
-52057=>2844,
-52061=>2845,
-52068=>2846,
-52088=>2847,
-52089=>2848,
-52124=>2849,
-52152=>2850,
-52180=>2851,
-52196=>2852,
-52199=>2853,
-52201=>2854,
-52236=>2855,
-52237=>2856,
-52240=>2857,
-52244=>2858,
-52252=>2859,
-52253=>2860,
-52257=>2861,
-52258=>2862,
-52263=>2863,
-52264=>2864,
-52265=>2865,
-52268=>2866,
-52270=>2867,
-52272=>2868,
-52280=>2869,
-52281=>2870,
-52283=>2871,
-52284=>2872,
-52285=>2873,
-52286=>2874,
-52292=>2875,
-52293=>2876,
-52296=>2877,
-52300=>2878,
-52308=>2879,
-52309=>2880,
-52311=>2881,
-52312=>2882,
-52313=>2883,
-52320=>2884,
-52324=>2885,
-52326=>2886,
-52328=>2887,
-52336=>2888,
-52341=>2889,
-52376=>2890,
-52377=>2891,
-52380=>2892,
-52384=>2893,
-52392=>2894,
-52393=>2895,
-52395=>2896,
-52396=>2897,
-52397=>2898,
-52404=>2899,
-52405=>2900,
-52408=>2901,
-52412=>2902,
-52420=>2903,
-52421=>2904,
-52423=>2905,
-52425=>2906,
-52432=>2907,
-52436=>2908,
-52452=>2909,
-52460=>2910,
-52464=>2911,
-52481=>2912,
-52488=>2913,
-52489=>2914,
-52492=>2915,
-52496=>2916,
-52504=>2917,
-52505=>2918,
-52507=>2919,
-52509=>2920,
-52516=>2921,
-52520=>2922,
-52524=>2923,
-52537=>2924,
-52572=>2925,
-52576=>2926,
-52580=>2927,
-52588=>2928,
-52589=>2929,
-52591=>2930,
-52593=>2931,
-52600=>2932,
-52616=>2933,
-52628=>2934,
-52629=>2935,
-52632=>2936,
-52636=>2937,
-52644=>2938,
-52645=>2939,
-52647=>2940,
-52649=>2941,
-52656=>2942,
-52676=>2943,
-52684=>2944,
-52688=>2945,
-52712=>2946,
-52716=>2947,
-52720=>2948,
-52728=>2949,
-52729=>2950,
-52731=>2951,
-52733=>2952,
-52740=>2953,
-52744=>2954,
-52748=>2955,
-52756=>2956,
-52761=>2957,
-52768=>2958,
-52769=>2959,
-52772=>2960,
-52776=>2961,
-52784=>2962,
-52785=>2963,
-52787=>2964,
-52789=>2965,
-52824=>2966,
-52825=>2967,
-52828=>2968,
-52831=>2969,
-52832=>2970,
-52833=>2971,
-52840=>2972,
-52841=>2973,
-52843=>2974,
-52845=>2975,
-52852=>2976,
-52853=>2977,
-52856=>2978,
-52860=>2979,
-52868=>2980,
-52869=>2981,
-52871=>2982,
-52873=>2983,
-52880=>2984,
-52881=>2985,
-52884=>2986,
-52888=>2987,
-52896=>2988,
-52897=>2989,
-52899=>2990,
-52900=>2991,
-52901=>2992,
-52908=>2993,
-52909=>2994,
-52929=>2995,
-52964=>2996,
-52965=>2997,
-52968=>2998,
-52971=>2999,
-52972=>3000,
-52980=>3001,
-52981=>3002,
-52983=>3003,
-52984=>3004,
-52985=>3005,
-52992=>3006,
-52993=>3007,
-52996=>3008,
-53000=>3009,
-53008=>3010,
-53009=>3011,
-53011=>3012,
-53013=>3013,
-53020=>3014,
-53024=>3015,
-53028=>3016,
-53036=>3017,
-53037=>3018,
-53039=>3019,
-53040=>3020,
-53041=>3021,
-53048=>3022,
-53076=>3023,
-53077=>3024,
-53080=>3025,
-53084=>3026,
-53092=>3027,
-53093=>3028,
-53095=>3029,
-53097=>3030,
-53104=>3031,
-53105=>3032,
-53108=>3033,
-53112=>3034,
-53120=>3035,
-53125=>3036,
-53132=>3037,
-53153=>3038,
-53160=>3039,
-53168=>3040,
-53188=>3041,
-53216=>3042,
-53217=>3043,
-53220=>3044,
-53224=>3045,
-53232=>3046,
-53233=>3047,
-53235=>3048,
-53237=>3049,
-53244=>3050,
-53248=>3051,
-53252=>3052,
-53265=>3053,
-53272=>3054,
-53293=>3055,
-53300=>3056,
-53301=>3057,
-53304=>3058,
-53308=>3059,
-53316=>3060,
-53317=>3061,
-53319=>3062,
-53321=>3063,
-53328=>3064,
-53332=>3065,
-53336=>3066,
-53344=>3067,
-53356=>3068,
-53357=>3069,
-53360=>3070,
-53364=>3071,
-53372=>3072,
-53373=>3073,
-53377=>3074,
-53412=>3075,
-53413=>3076,
-53416=>3077,
-53420=>3078,
-53428=>3079,
-53429=>3080,
-53431=>3081,
-53433=>3082,
-53440=>3083,
-53441=>3084,
-53444=>3085,
-53448=>3086,
-53449=>3087,
-53456=>3088,
-53457=>3089,
-53459=>3090,
-53460=>3091,
-53461=>3092,
-53468=>3093,
-53469=>3094,
-53472=>3095,
-53476=>3096,
-53484=>3097,
-53485=>3098,
-53487=>3099,
-53488=>3100,
-53489=>3101,
-53496=>3102,
-53517=>3103,
-53552=>3104,
-53553=>3105,
-53556=>3106,
-53560=>3107,
-53562=>3108,
-53568=>3109,
-53569=>3110,
-53571=>3111,
-53572=>3112,
-53573=>3113,
-53580=>3114,
-53581=>3115,
-53584=>3116,
-53588=>3117,
-53596=>3118,
-53597=>3119,
-53599=>3120,
-53601=>3121,
-53608=>3122,
-53612=>3123,
-53628=>3124,
-53636=>3125,
-53640=>3126,
-53664=>3127,
-53665=>3128,
-53668=>3129,
-53672=>3130,
-53680=>3131,
-53681=>3132,
-53683=>3133,
-53685=>3134,
-53690=>3135,
-53692=>3136,
-53696=>3137,
-53720=>3138,
-53748=>3139,
-53752=>3140,
-53767=>3141,
-53769=>3142,
-53776=>3143,
-53804=>3144,
-53805=>3145,
-53808=>3146,
-53812=>3147,
-53820=>3148,
-53821=>3149,
-53823=>3150,
-53825=>3151,
-53832=>3152,
-53852=>3153,
-53860=>3154,
-53888=>3155,
-53889=>3156,
-53892=>3157,
-53896=>3158,
-53904=>3159,
-53905=>3160,
-53909=>3161,
-53916=>3162,
-53920=>3163,
-53924=>3164,
-53932=>3165,
-53937=>3166,
-53944=>3167,
-53945=>3168,
-53948=>3169,
-53951=>3170,
-53952=>3171,
-53954=>3172,
-53960=>3173,
-53961=>3174,
-53963=>3175,
-53972=>3176,
-53976=>3177,
-53980=>3178,
-53988=>3179,
-53989=>3180,
-54000=>3181,
-54001=>3182,
-54004=>3183,
-54008=>3184,
-54016=>3185,
-54017=>3186,
-54019=>3187,
-54021=>3188,
-54028=>3189,
-54029=>3190,
-54030=>3191,
-54032=>3192,
-54036=>3193,
-54038=>3194,
-54044=>3195,
-54045=>3196,
-54047=>3197,
-54048=>3198,
-54049=>3199,
-54053=>3200,
-54056=>3201,
-54057=>3202,
-54060=>3203,
-54064=>3204,
-54072=>3205,
-54073=>3206,
-54075=>3207,
-54076=>3208,
-54077=>3209,
-54084=>3210,
-54085=>3211,
-54140=>3212,
-54141=>3213,
-54144=>3214,
-54148=>3215,
-54156=>3216,
-54157=>3217,
-54159=>3218,
-54160=>3219,
-54161=>3220,
-54168=>3221,
-54169=>3222,
-54172=>3223,
-54176=>3224,
-54184=>3225,
-54185=>3226,
-54187=>3227,
-54189=>3228,
-54196=>3229,
-54200=>3230,
-54204=>3231,
-54212=>3232,
-54213=>3233,
-54216=>3234,
-54217=>3235,
-54224=>3236,
-54232=>3237,
-54241=>3238,
-54243=>3239,
-54252=>3240,
-54253=>3241,
-54256=>3242,
-54260=>3243,
-54268=>3244,
-54269=>3245,
-54271=>3246,
-54273=>3247,
-54280=>3248,
-54301=>3249,
-54336=>3250,
-54340=>3251,
-54364=>3252,
-54368=>3253,
-54372=>3254,
-54381=>3255,
-54383=>3256,
-54392=>3257,
-54393=>3258,
-54396=>3259,
-54399=>3260,
-54400=>3261,
-54402=>3262,
-54408=>3263,
-54409=>3264,
-54411=>3265,
-54413=>3266,
-54420=>3267,
-54441=>3268,
-54476=>3269,
-54480=>3270,
-54484=>3271,
-54492=>3272,
-54495=>3273,
-54504=>3274,
-54508=>3275,
-54512=>3276,
-54520=>3277,
-54523=>3278,
-54525=>3279,
-54532=>3280,
-54536=>3281,
-54540=>3282,
-54548=>3283,
-54549=>3284,
-54551=>3285,
-54588=>3286,
-54589=>3287,
-54592=>3288,
-54596=>3289,
-54604=>3290,
-54605=>3291,
-54607=>3292,
-54609=>3293,
-54616=>3294,
-54617=>3295,
-54620=>3296,
-54624=>3297,
-54629=>3298,
-54632=>3299,
-54633=>3300,
-54635=>3301,
-54637=>3302,
-54644=>3303,
-54645=>3304,
-54648=>3305,
-54652=>3306,
-54660=>3307,
-54661=>3308,
-54663=>3309,
-54664=>3310,
-54665=>3311,
-54672=>3312,
-54693=>3313,
-54728=>3314,
-54729=>3315,
-54732=>3316,
-54736=>3317,
-54738=>3318,
-54744=>3319,
-54745=>3320,
-54747=>3321,
-54749=>3322,
-54756=>3323,
-54757=>3324,
-54760=>3325,
-54764=>3326,
-54772=>3327,
-54773=>3328,
-54775=>3329,
-54777=>3330,
-54784=>3331,
-54785=>3332,
-54788=>3333,
-54792=>3334,
-54800=>3335,
-54801=>3336,
-54803=>3337,
-54804=>3338,
-54805=>3339,
-54812=>3340,
-54816=>3341,
-54820=>3342,
-54829=>3343,
-54840=>3344,
-54841=>3345,
-54844=>3346,
-54848=>3347,
-54853=>3348,
-54856=>3349,
-54857=>3350,
-54859=>3351,
-54861=>3352,
-54865=>3353,
-54868=>3354,
-54869=>3355,
-54872=>3356,
-54876=>3357,
-54887=>3358,
-54889=>3359,
-54896=>3360,
-54897=>3361,
-54900=>3362,
-54915=>3363,
-54917=>3364,
-54924=>3365,
-54925=>3366,
-54928=>3367,
-54932=>3368,
-54941=>3369,
-54943=>3370,
-54945=>3371,
-54952=>3372,
-54956=>3373,
-54960=>3374,
-54969=>3375,
-54971=>3376,
-54980=>3377,
-54981=>3378,
-54984=>3379,
-54988=>3380,
-54993=>3381,
-54996=>3382,
-54999=>3383,
-55001=>3384,
-55008=>3385,
-55012=>3386,
-55016=>3387,
-55024=>3388,
-55029=>3389,
-55036=>3390,
-55037=>3391,
-55040=>3392,
-55044=>3393,
-55057=>3394,
-55064=>3395,
-55065=>3396,
-55068=>3397,
-55072=>3398,
-55080=>3399,
-55081=>3400,
-55083=>3401,
-55085=>3402,
-55092=>3403,
-55093=>3404,
-55096=>3405,
-55100=>3406,
-55108=>3407,
-55111=>3408,
-55113=>3409,
-55120=>3410,
-55121=>3411,
-55124=>3412,
-55126=>3413,
-55127=>3414,
-55128=>3415,
-55129=>3416,
-55136=>3417,
-55137=>3418,
-55139=>3419,
-55141=>3420,
-55145=>3421,
-55148=>3422,
-55152=>3423,
-55156=>3424,
-55164=>3425,
-55165=>3426,
-55169=>3427,
-55176=>3428,
-55177=>3429,
-55180=>3430,
-55184=>3431,
-55192=>3432,
-55193=>3433,
-55195=>3434,
-55197=>3435,
-20285=>3436,
-20339=>3437,
-20551=>3438,
-20729=>3439,
-21152=>3440,
-21487=>3441,
-21621=>3442,
-21733=>3443,
-22025=>3444,
-23233=>3445,
-23478=>3446,
-26247=>3447,
-26550=>3448,
-26551=>3449,
-26607=>3450,
-27468=>3451,
-29634=>3452,
-30146=>3453,
-31292=>3454,
-33499=>3455,
-33540=>3456,
-34903=>3457,
-34952=>3458,
-35382=>3459,
-36040=>3460,
-63747=>3460,
-36303=>3461,
-36603=>3462,
-36838=>3463,
-39381=>3464,
-21051=>3465,
-21364=>3466,
-21508=>3467,
-24682=>3468,
-24932=>3469,
-27580=>3470,
-29647=>3471,
-33050=>3472,
-35258=>3473,
-12179=>3474,
-35282=>3474,
-38307=>3475,
-20355=>3476,
-21002=>3477,
-22718=>3478,
-22904=>3479,
-23014=>3480,
-12082=>3481,
-24178=>3481,
-24185=>3482,
-25031=>3483,
-25536=>3484,
-26438=>3485,
-26604=>3486,
-26751=>3487,
-28567=>3488,
-30286=>3489,
-30475=>3490,
-30965=>3491,
-31240=>3492,
-31487=>3493,
-31777=>3494,
-32925=>3495,
-12169=>3496,
-33390=>3496,
-33393=>3497,
-35563=>3498,
-38291=>3499,
-20075=>3500,
-21917=>3501,
-26359=>3502,
-28212=>3503,
-30883=>3504,
-31469=>3505,
-33883=>3506,
-35088=>3507,
-34638=>3508,
-38824=>3509,
-21208=>3510,
-22350=>3511,
-22570=>3512,
-23884=>3513,
-24863=>3514,
-25022=>3515,
-25121=>3516,
-25954=>3517,
-26577=>3518,
-27204=>3519,
-28187=>3520,
-12130=>3521,
-29976=>3521,
-30131=>3522,
-30435=>3523,
-30640=>3524,
-32058=>3525,
-37039=>3526,
-37969=>3527,
-37970=>3528,
-40853=>3529,
-21283=>3530,
-23724=>3531,
-30002=>3532,
-32987=>3533,
-37440=>3534,
-38296=>3535,
-21083=>3536,
-22536=>3537,
-23004=>3538,
-23713=>3539,
-23831=>3540,
-24247=>3541,
-24378=>3542,
-24394=>3543,
-24951=>3544,
-27743=>3545,
-30074=>3546,
-30086=>3547,
-31968=>3548,
-32115=>3549,
-32177=>3550,
-32652=>3551,
-33108=>3552,
-33313=>3553,
-34193=>3554,
-35137=>3555,
-35611=>3556,
-37628=>3557,
-38477=>3558,
-64009=>3558,
-40007=>3559,
-20171=>3560,
-20215=>3561,
-20491=>3562,
-20977=>3563,
-22607=>3564,
-24887=>3565,
-24894=>3566,
-24936=>3567,
-25913=>3568,
-27114=>3569,
-28433=>3570,
-30117=>3571,
-30342=>3572,
-30422=>3573,
-31623=>3574,
-33445=>3575,
-33995=>3576,
-37799=>3577,
-38283=>3578,
-21888=>3579,
-23458=>3580,
-22353=>3581,
-31923=>3582,
-32697=>3583,
-37301=>3584,
-20520=>3585,
-21435=>3586,
-23621=>3587,
-24040=>3588,
-25298=>3589,
-25454=>3590,
-25818=>3591,
-25831=>3592,
-28192=>3593,
-28844=>3594,
-31067=>3595,
-36317=>3596,
-36382=>3597,
-36989=>3598,
-37445=>3599,
-37624=>3600,
-20094=>3601,
-20214=>3602,
-20581=>3603,
-12081=>3604,
-24062=>3604,
-24314=>3605,
-24838=>3606,
-26967=>3607,
-33137=>3608,
-34388=>3609,
-36423=>3610,
-37749=>3611,
-39467=>3612,
-20062=>3613,
-20625=>3614,
-26480=>3615,
-26688=>3616,
-20745=>3617,
-21133=>3618,
-21138=>3619,
-27298=>3620,
-30652=>3621,
-37392=>3622,
-40660=>3623,
-21163=>3624,
-24623=>3625,
-36850=>3626,
-20552=>3627,
-25001=>3628,
-25581=>3629,
-25802=>3630,
-26684=>3631,
-27268=>3632,
-28608=>3633,
-33160=>3634,
-35233=>3635,
-38548=>3636,
-22533=>3637,
-29309=>3638,
-12125=>3639,
-29356=>3639,
-29956=>3640,
-32121=>3641,
-32365=>3642,
-32937=>3643,
-12178=>3644,
-35211=>3644,
-64010=>3644,
-35700=>3645,
-36963=>3646,
-40273=>3647,
-25225=>3648,
-27770=>3649,
-28500=>3650,
-32080=>3651,
-32570=>3652,
-35363=>3653,
-20860=>3654,
-24906=>3655,
-31645=>3656,
-35609=>3657,
-37463=>3658,
-37772=>3659,
-20140=>3660,
-20435=>3661,
-20510=>3662,
-20670=>3663,
-20742=>3664,
-21185=>3665,
-21197=>3666,
-21375=>3667,
-22384=>3668,
-22659=>3669,
-24218=>3670,
-24465=>3671,
-24950=>3672,
-25004=>3673,
-25806=>3674,
-25964=>3675,
-26223=>3676,
-26299=>3677,
-26356=>3678,
-63745=>3678,
-26775=>3679,
-28039=>3680,
-28805=>3681,
-28913=>3682,
-29855=>3683,
-29861=>3684,
-29898=>3685,
-30169=>3686,
-30828=>3687,
-30956=>3688,
-31455=>3689,
-31478=>3690,
-32069=>3691,
-32147=>3692,
-32789=>3693,
-32831=>3694,
-33051=>3695,
-33686=>3696,
-35686=>3697,
-36629=>3698,
-36885=>3699,
-37857=>3700,
-38915=>3701,
-38968=>3702,
-39514=>3703,
-39912=>3704,
-20418=>3705,
-21843=>3706,
-22586=>3707,
-22865=>3708,
-63753=>3708,
-23395=>3709,
-23622=>3710,
-24760=>3711,
-25106=>3712,
-26690=>3713,
-26800=>3714,
-26856=>3715,
-28330=>3716,
-30028=>3717,
-30328=>3718,
-30926=>3719,
-31293=>3720,
-31995=>3721,
-32363=>3722,
-32380=>3723,
-35336=>3724,
-35489=>3725,
-35903=>3726,
-38542=>3727,
-40388=>3728,
-21476=>3729,
-21481=>3730,
-21578=>3731,
-21617=>3732,
-22266=>3733,
-22993=>3734,
-23396=>3735,
-23611=>3736,
-24235=>3737,
-25335=>3738,
-25911=>3739,
-25925=>3740,
-25970=>3741,
-26272=>3742,
-26543=>3743,
-27073=>3744,
-27837=>3745,
-30204=>3746,
-30352=>3747,
-30590=>3748,
-31295=>3749,
-32660=>3750,
-32771=>3751,
-32929=>3752,
-33167=>3753,
-33510=>3754,
-33533=>3755,
-33776=>3756,
-34241=>3757,
-34865=>3758,
-34996=>3759,
-35493=>3760,
-36764=>3761,
-37678=>3762,
-38599=>3763,
-39015=>3764,
-12220=>3765,
-39640=>3765,
-12238=>3766,
-40723=>3766,
-21741=>3767,
-26011=>3768,
-26354=>3769,
-26767=>3770,
-31296=>3771,
-12181=>3772,
-35895=>3772,
-40288=>3773,
-22256=>3774,
-22372=>3775,
-23825=>3776,
-26118=>3777,
-26801=>3778,
-26829=>3779,
-28414=>3780,
-29736=>3781,
-34974=>3782,
-39908=>3783,
-27752=>3784,
-12219=>3785,
-39592=>3785,
-20379=>3786,
-20844=>3787,
-20849=>3788,
-21151=>3789,
-23380=>3790,
-12079=>3791,
-24037=>3791,
-24656=>3792,
-24685=>3793,
-25329=>3794,
-25511=>3795,
-25915=>3796,
-29657=>3797,
-31354=>3798,
-34467=>3799,
-36002=>3800,
-38799=>3801,
-20018=>3802,
-63749=>3802,
-23521=>3803,
-12093=>3804,
-25096=>3804,
-26524=>3805,
-12128=>3806,
-29916=>3806,
-31185=>3807,
-33747=>3808,
-35463=>3809,
-35506=>3810,
-36328=>3811,
-36942=>3812,
-37707=>3813,
-38982=>3814,
-24275=>3815,
-64011=>3815,
-27112=>3816,
-34303=>3817,
-37101=>3818,
-20896=>3819,
-23448=>3820,
-23532=>3821,
-24931=>3822,
-26874=>3823,
-27454=>3824,
-28748=>3825,
-29743=>3826,
-29912=>3827,
-31649=>3828,
-32592=>3829,
-33733=>3830,
-35264=>3831,
-36011=>3832,
-38364=>3833,
-39208=>3834,
-21038=>3835,
-24669=>3836,
-25324=>3837,
-36866=>3838,
-20362=>3839,
-20809=>3840,
-21281=>3841,
-22745=>3842,
-24291=>3843,
-26336=>3844,
-27960=>3845,
-28826=>3846,
-29378=>3847,
-29654=>3848,
-31568=>3849,
-33009=>3850,
-37979=>3851,
-21350=>3852,
-25499=>3853,
-32619=>3854,
-20054=>3855,
-20608=>3856,
-22602=>3857,
-22750=>3858,
-24618=>3859,
-24871=>3860,
-25296=>3861,
-27088=>3862,
-39745=>3863,
-23439=>3864,
-32024=>3865,
-32945=>3866,
-36703=>3867,
-20132=>3868,
-20689=>3869,
-21676=>3870,
-21932=>3871,
-23308=>3872,
-23968=>3873,
-24039=>3874,
-25898=>3875,
-25934=>3876,
-26657=>3877,
-27211=>3878,
-29409=>3879,
-30350=>3880,
-30703=>3881,
-32094=>3882,
-32761=>3883,
-33184=>3884,
-34126=>3885,
-34527=>3886,
-36611=>3887,
-36686=>3888,
-37066=>3889,
-39171=>3890,
-39509=>3891,
-39851=>3892,
-19992=>3893,
-20037=>3894,
-20061=>3895,
-20167=>3896,
-20465=>3897,
-20855=>3898,
-21246=>3899,
-21312=>3900,
-12061=>3901,
-21475=>3901,
-21477=>3902,
-63750=>3902,
-21646=>3903,
-22036=>3904,
-22389=>3905,
-22434=>3906,
-23495=>3907,
-23943=>3908,
-24272=>3909,
-25084=>3910,
-25304=>3911,
-25937=>3912,
-26552=>3913,
-26601=>3914,
-27083=>3915,
-27472=>3916,
-27590=>3917,
-27628=>3918,
-27714=>3919,
-28317=>3920,
-28792=>3921,
-29399=>3922,
-29590=>3923,
-29699=>3924,
-30655=>3925,
-30697=>3926,
-31350=>3927,
-32127=>3928,
-32777=>3929,
-12165=>3930,
-33276=>3930,
-33285=>3931,
-33290=>3932,
-33503=>3933,
-34914=>3934,
-35635=>3935,
-36092=>3936,
-36544=>3937,
-36881=>3938,
-37041=>3939,
-37476=>3940,
-37558=>3941,
-39378=>3942,
-39493=>3943,
-40169=>3944,
-40407=>3945,
-12244=>3946,
-40860=>3946,
-63751=>3946,
-63752=>3946,
-22283=>3947,
-23616=>3948,
-33738=>3949,
-38816=>3950,
-38827=>3951,
-40628=>3952,
-21531=>3953,
-31384=>3954,
-32676=>3955,
-35033=>3956,
-36557=>3957,
-37089=>3958,
-22528=>3959,
-23624=>3960,
-25496=>3961,
-31391=>3962,
-23470=>3963,
-12088=>3964,
-24339=>3964,
-31353=>3965,
-31406=>3966,
-33422=>3967,
-36524=>3968,
-20518=>3969,
-21048=>3970,
-21240=>3971,
-21367=>3972,
-22280=>3973,
-25331=>3974,
-25458=>3975,
-27402=>3976,
-28099=>3977,
-30519=>3978,
-21413=>3979,
-29527=>3980,
-34152=>3981,
-36470=>3982,
-38357=>3983,
-26426=>3984,
-27331=>3985,
-28528=>3986,
-35437=>3987,
-36556=>3988,
-39243=>3989,
-26231=>3990,
-27512=>3991,
-36020=>3992,
-12225=>3993,
-39740=>3993,
-21483=>3994,
-22317=>3995,
-22862=>3996,
-25542=>3997,
-27131=>3998,
-29674=>3999,
-30789=>4000,
-31418=>4001,
-31429=>4002,
-31998=>4003,
-33909=>4004,
-35215=>4005,
-36211=>4006,
-36917=>4007,
-38312=>4008,
-21243=>4009,
-22343=>4010,
-30023=>4011,
-31584=>4012,
-33740=>4013,
-37406=>4014,
-27224=>4015,
-20811=>4016,
-21067=>4017,
-21127=>4018,
-25119=>4019,
-26840=>4020,
-26997=>4021,
-38553=>4022,
-20677=>4023,
-21156=>4024,
-21220=>4025,
-25027=>4026,
-12100=>4027,
-26020=>4027,
-26681=>4028,
-27135=>4029,
-29822=>4030,
-31563=>4031,
-33465=>4032,
-33771=>4033,
-35250=>4034,
-35641=>4035,
-36817=>4036,
-39241=>4037,
-20170=>4038,
-22935=>4039,
-25810=>4040,
-26129=>4041,
-27278=>4042,
-29748=>4043,
-31105=>4044,
-31165=>4045,
-33449=>4046,
-34942=>4047,
-34943=>4048,
-35167=>4049,
-37670=>4050,
-20235=>4051,
-21450=>4052,
-24613=>4053,
-25201=>4054,
-27762=>4055,
-32026=>4056,
-32102=>4057,
-20120=>4058,
-20834=>4059,
-30684=>4060,
-32943=>4061,
-20225=>4062,
-20238=>4063,
-20854=>4064,
-20864=>4065,
-21980=>4066,
-22120=>4067,
-22331=>4068,
-22522=>4069,
-22524=>4070,
-22804=>4071,
-22855=>4072,
-22931=>4073,
-23492=>4074,
-23696=>4075,
-23822=>4076,
-12080=>4077,
-24049=>4077,
-24190=>4078,
-24524=>4079,
-25216=>4080,
-26071=>4081,
-26083=>4082,
-26398=>4083,
-26399=>4084,
-26462=>4085,
-26827=>4086,
-26820=>4087,
-27231=>4088,
-27450=>4089,
-27683=>4090,
-27773=>4091,
-27778=>4092,
-28103=>4093,
-29592=>4094,
-29734=>4095,
-29738=>4096,
-29826=>4097,
-29859=>4098,
-30072=>4099,
-30079=>4100,
-30849=>4101,
-30959=>4102,
-31041=>4103,
-31047=>4104,
-31048=>4105,
-31098=>4106,
-31637=>4107,
-32000=>4108,
-32186=>4109,
-32648=>4110,
-32774=>4111,
-32813=>4112,
-32908=>4113,
-35352=>4114,
-35663=>4115,
-35912=>4116,
-63744=>4116,
-36215=>4117,
-37665=>4118,
-37668=>4119,
-39138=>4120,
-39249=>4121,
-39438=>4122,
-39439=>4123,
-39525=>4124,
-40594=>4125,
-32202=>4126,
-20342=>4127,
-21513=>4128,
-25326=>4129,
-26708=>4130,
-12198=>4131,
-37329=>4131,
-63754=>4131,
-21931=>4132,
-20794=>4133,
-23068=>4134,
-25062=>4135,
-25295=>4136,
-63835=>4136,
-25343=>4137,
-37027=>4138,
-35582=>4139,
-63837=>4139,
-26262=>4140,
-29014=>4141,
-38627=>4142,
-25423=>4143,
-25466=>4144,
-21335=>4145,
-26511=>4146,
-26976=>4147,
-28275=>4148,
-30007=>4149,
-32013=>4150,
-34930=>4151,
-22218=>4152,
-23064=>4153,
-20035=>4154,
-20839=>4155,
-22856=>4156,
-63756=>4156,
-26608=>4157,
-32784=>4158,
-12069=>4159,
-22899=>4159,
-63873=>4159,
-24180=>4160,
-63886=>4160,
-25754=>4161,
-63889=>4161,
-31178=>4162,
-63893=>4162,
-24565=>4163,
-63907=>4163,
-24684=>4164,
-25288=>4165,
-25467=>4166,
-63908=>4166,
-23527=>4167,
-63839=>4167,
-63914=>4167,
-23511=>4168,
-21162=>4169,
-22900=>4170,
-24361=>4171,
-24594=>4172,
-63840=>4172,
-29785=>4173,
-39377=>4174,
-28611=>4175,
-33215=>4176,
-36786=>4177,
-24817=>4178,
-33126=>4179,
-23615=>4180,
-63933=>4180,
-23273=>4181,
-35365=>4182,
-26491=>4183,
-63944=>4183,
-32016=>4184,
-63951=>4184,
-33021=>4185,
-23612=>4186,
-27877=>4187,
-63971=>4187,
-21311=>4188,
-63979=>4188,
-28346=>4189,
-63980=>4189,
-22810=>4190,
-33590=>4191,
-63998=>4191,
-20025=>4192,
-63838=>4192,
-20150=>4193,
-20294=>4194,
-21934=>4195,
-22296=>4196,
-22727=>4197,
-24406=>4198,
-26039=>4199,
-26086=>4200,
-27264=>4201,
-27573=>4202,
-28237=>4203,
-30701=>4204,
-31471=>4205,
-31774=>4206,
-32222=>4207,
-34507=>4208,
-34962=>4209,
-37170=>4210,
-37723=>4211,
-25787=>4212,
-28606=>4213,
-29562=>4214,
-30136=>4215,
-36948=>4216,
-21846=>4217,
-22349=>4218,
-25018=>4219,
-25812=>4220,
-26311=>4221,
-28129=>4222,
-28251=>4223,
-28525=>4224,
-28601=>4225,
-30192=>4226,
-32835=>4227,
-33213=>4228,
-34113=>4229,
-35203=>4230,
-35527=>4231,
-35674=>4232,
-37663=>4233,
-27795=>4234,
-30035=>4235,
-31572=>4236,
-36367=>4237,
-36957=>4238,
-21776=>4239,
-22530=>4240,
-22616=>4241,
-24162=>4242,
-25095=>4243,
-25758=>4244,
-26848=>4245,
-30070=>4246,
-31958=>4247,
-64003=>4247,
-34739=>4248,
-40680=>4249,
-20195=>4250,
-22408=>4251,
-22382=>4252,
-12068=>4253,
-22823=>4253,
-23565=>4254,
-23729=>4255,
-24118=>4256,
-24453=>4257,
-25140=>4258,
-25825=>4259,
-29619=>4260,
-33274=>4261,
-34955=>4262,
-36024=>4263,
-38538=>4264,
-40667=>4265,
-23429=>4266,
-64004=>4266,
-24503=>4267,
-24755=>4268,
-20498=>4269,
-12049=>4270,
-20992=>4270,
-21040=>4271,
-22294=>4272,
-22581=>4273,
-22615=>4274,
-23566=>4275,
-23648=>4276,
-23798=>4277,
-23947=>4278,
-24230=>4279,
-64001=>4279,
-24466=>4280,
-24764=>4281,
-25361=>4282,
-25481=>4283,
-25623=>4284,
-26691=>4285,
-26873=>4286,
-27330=>4287,
-28120=>4288,
-28193=>4289,
-28372=>4290,
-28644=>4291,
-29182=>4292,
-30428=>4293,
-30585=>4294,
-31153=>4295,
-31291=>4296,
-33796=>4297,
-35241=>4298,
-36077=>4299,
-36339=>4300,
-36424=>4301,
-36867=>4302,
-36884=>4303,
-36947=>4304,
-37117=>4305,
-37709=>4306,
-38518=>4307,
-38876=>4308,
-27602=>4309,
-28678=>4310,
-29272=>4311,
-29346=>4312,
-29544=>4313,
-30563=>4314,
-31167=>4315,
-31716=>4316,
-32411=>4317,
-35712=>4318,
-63834=>4318,
-22697=>4319,
-24775=>4320,
-25958=>4321,
-26109=>4322,
-26302=>4323,
-27788=>4324,
-28958=>4325,
-29129=>4326,
-35930=>4327,
-38931=>4328,
-20077=>4329,
-31361=>4330,
-20189=>4331,
-20908=>4332,
-20941=>4333,
-21205=>4334,
-21516=>4335,
-24999=>4336,
-26481=>4337,
-26704=>4338,
-26847=>4339,
-27934=>4340,
-64005=>4340,
-28540=>4341,
-30140=>4342,
-30643=>4343,
-31461=>4344,
-33012=>4345,
-33891=>4346,
-37509=>4347,
-20828=>4348,
-12099=>4349,
-26007=>4349,
-26460=>4350,
-26515=>4351,
-30168=>4352,
-31431=>4353,
-33651=>4354,
-12182=>4355,
-35910=>4355,
-36887=>4356,
-38957=>4357,
-23663=>4358,
-33216=>4359,
-33434=>4360,
-36929=>4361,
-36975=>4362,
-37389=>4363,
-24471=>4364,
-23965=>4365,
-27225=>4366,
-29128=>4367,
-30331=>4368,
-31561=>4369,
-34276=>4370,
-35588=>4371,
-37159=>4372,
-39472=>4373,
-21895=>4374,
-63755=>4374,
-25078=>4375,
-63757=>4375,
-30313=>4376,
-63758=>4376,
-32645=>4377,
-63759=>4377,
-34367=>4378,
-63760=>4378,
-34746=>4379,
-63761=>4379,
-35064=>4380,
-63762=>4380,
-37007=>4381,
-63763=>4381,
-27931=>4382,
-63765=>4382,
-28889=>4383,
-63766=>4383,
-29662=>4384,
-63767=>4384,
-32097=>4385,
-33853=>4386,
-63768=>4386,
-37226=>4387,
-63769=>4387,
-39409=>4388,
-63770=>4388,
-20098=>4389,
-63771=>4389,
-21365=>4390,
-63772=>4390,
-27396=>4391,
-63773=>4391,
-27410=>4392,
-28734=>4393,
-29211=>4394,
-63774=>4394,
-34349=>4395,
-63775=>4395,
-40478=>4396,
-63776=>4396,
-21068=>4397,
-36771=>4398,
-23888=>4399,
-63777=>4399,
-25829=>4400,
-25900=>4401,
-27414=>4402,
-28651=>4403,
-63778=>4403,
-31811=>4404,
-32412=>4405,
-34253=>4406,
-63779=>4406,
-35172=>4407,
-63780=>4407,
-35261=>4408,
-25289=>4409,
-63781=>4409,
-33240=>4410,
-63782=>4410,
-34847=>4411,
-63783=>4411,
-24266=>4412,
-63784=>4412,
-26391=>4413,
-63785=>4413,
-28010=>4414,
-63786=>4414,
-29436=>4415,
-63787=>4415,
-29701=>4416,
-29807=>4417,
-34690=>4418,
-37086=>4419,
-63788=>4419,
-20358=>4420,
-63789=>4420,
-23821=>4421,
-24480=>4422,
-33802=>4423,
-20919=>4424,
-63790=>4424,
-25504=>4425,
-63861=>4425,
-30053=>4426,
-63862=>4426,
-20142=>4427,
-63863=>4427,
-20486=>4428,
-20841=>4429,
-63864=>4429,
-20937=>4430,
-63865=>4430,
-26753=>4431,
-63866=>4431,
-27153=>4432,
-31918=>4433,
-31921=>4434,
-31975=>4435,
-63867=>4435,
-33391=>4436,
-63868=>4436,
-35538=>4437,
-63869=>4437,
-36635=>4438,
-37327=>4439,
-63870=>4439,
-20406=>4440,
-20791=>4441,
-21237=>4442,
-63871=>4442,
-21570=>4443,
-63872=>4443,
-24300=>4444,
-63874=>4444,
-24942=>4445,
-25150=>4446,
-26053=>4447,
-63875=>4447,
-27354=>4448,
-28670=>4449,
-63876=>4449,
-31018=>4450,
-63877=>4450,
-34268=>4451,
-34851=>4452,
-38317=>4453,
-63878=>4453,
-39522=>4454,
-39530=>4455,
-63879=>4455,
-40599=>4456,
-63880=>4456,
-40654=>4457,
-63881=>4457,
-12050=>4458,
-21147=>4458,
-63882=>4458,
-26310=>4459,
-63883=>4459,
-27511=>4460,
-63884=>4460,
-28701=>4461,
-31019=>4462,
-36706=>4463,
-63885=>4463,
-38722=>4464,
-24976=>4465,
-63887=>4465,
-25088=>4466,
-63888=>4466,
-25891=>4467,
-28451=>4468,
-63890=>4468,
-29001=>4469,
-63891=>4469,
-29833=>4470,
-63892=>4470,
-32244=>4471,
-63894=>4471,
-32879=>4472,
-63895=>4472,
-34030=>4473,
-63897=>4473,
-36646=>4474,
-63896=>4474,
-36899=>4475,
-63898=>4475,
-37706=>4476,
-63899=>4476,
-20925=>4477,
-21015=>4478,
-63900=>4478,
-21155=>4479,
-63901=>4479,
-27916=>4480,
-28872=>4481,
-63903=>4481,
-35010=>4482,
-63904=>4482,
-24265=>4483,
-63906=>4483,
-25986=>4484,
-27566=>4485,
-63909=>4485,
-28610=>4486,
-31806=>4487,
-63910=>4487,
-29557=>4488,
-63911=>4488,
-20196=>4489,
-63912=>4489,
-20278=>4490,
-22265=>4491,
-63913=>4491,
-23738=>4492,
-23994=>4493,
-63915=>4493,
-24604=>4494,
-63916=>4494,
-29618=>4495,
-63917=>4495,
-31533=>4496,
-32666=>4497,
-63919=>4497,
-32718=>4498,
-32838=>4499,
-63920=>4499,
-36894=>4500,
-37428=>4501,
-63921=>4501,
-38646=>4502,
-63922=>4502,
-38728=>4503,
-63923=>4503,
-38936=>4504,
-63924=>4504,
-40801=>4505,
-20363=>4506,
-63925=>4506,
-28583=>4507,
-31150=>4508,
-63926=>4508,
-37300=>4509,
-63927=>4509,
-38583=>4510,
-63928=>4510,
-21214=>4511,
-63791=>4511,
-25736=>4512,
-25796=>4513,
-63792=>4513,
-27347=>4514,
-63793=>4514,
-28510=>4515,
-28696=>4516,
-29200=>4517,
-63794=>4517,
-30439=>4518,
-63795=>4518,
-12156=>4519,
-32769=>4519,
-63796=>4519,
-34310=>4520,
-63797=>4520,
-34396=>4521,
-63798=>4521,
-36335=>4522,
-63799=>4522,
-36613=>4523,
-38706=>4524,
-63800=>4524,
-39791=>4525,
-63801=>4525,
-40442=>4526,
-63802=>4526,
-12228=>4527,
-40565=>4527,
-30860=>4528,
-63803=>4528,
-31103=>4529,
-63804=>4529,
-32160=>4530,
-63805=>4530,
-33737=>4531,
-63806=>4531,
-37636=>4532,
-63807=>4532,
-12229=>4533,
-40575=>4533,
-63808=>4533,
-40595=>4534,
-35542=>4535,
-63809=>4535,
-22751=>4536,
-63810=>4536,
-24324=>4537,
-63811=>4537,
-26407=>4538,
-28711=>4539,
-29903=>4540,
-31840=>4541,
-63812=>4541,
-32894=>4542,
-63813=>4542,
-20769=>4543,
-28712=>4544,
-29282=>4545,
-63814=>4545,
-30922=>4546,
-63815=>4546,
-36034=>4547,
-63816=>4547,
-36058=>4548,
-36084=>4549,
-38647=>4550,
-63817=>4550,
-20102=>4551,
-63930=>4551,
-20698=>4552,
-63931=>4552,
-23534=>4553,
-63932=>4553,
-24278=>4554,
-26009=>4555,
-63934=>4555,
-29134=>4556,
-63936=>4556,
-30274=>4557,
-63937=>4557,
-30637=>4558,
-32842=>4559,
-34044=>4560,
-63938=>4560,
-36988=>4561,
-63939=>4561,
-39719=>4562,
-12243=>4563,
-40845=>4563,
-63940=>4563,
-22744=>4564,
-63818=>4564,
-23105=>4565,
-23650=>4566,
-63819=>4566,
-27155=>4567,
-63820=>4567,
-28122=>4568,
-63821=>4568,
-28431=>4569,
-63822=>4569,
-30267=>4570,
-32047=>4571,
-63823=>4571,
-32311=>4572,
-63824=>4572,
-34078=>4573,
-35128=>4574,
-37860=>4575,
-38475=>4576,
-63825=>4576,
-21129=>4577,
-63943=>4577,
-26066=>4578,
-26611=>4579,
-63945=>4579,
-27060=>4580,
-27969=>4581,
-63946=>4581,
-28316=>4582,
-63947=>4582,
-28687=>4583,
-29705=>4584,
-63948=>4584,
-29792=>4585,
-30041=>4586,
-63949=>4586,
-30244=>4587,
-30827=>4588,
-63950=>4588,
-35628=>4589,
-39006=>4590,
-63952=>4590,
-20845=>4591,
-63953=>4591,
-25134=>4592,
-63954=>4592,
-38520=>4593,
-63955=>4593,
-20374=>4594,
-20523=>4595,
-63956=>4595,
-23833=>4596,
-63957=>4596,
-28138=>4597,
-63958=>4597,
-32184=>4598,
-36650=>4599,
-63959=>4599,
-24459=>4600,
-63960=>4600,
-24900=>4601,
-63961=>4601,
-26647=>4602,
-63962=>4602,
-38534=>4603,
-63964=>4603,
-21202=>4604,
-63826=>4604,
-32907=>4605,
-63827=>4605,
-20956=>4606,
-63828=>4606,
-20940=>4607,
-63829=>4607,
-26974=>4608,
-31260=>4609,
-63830=>4609,
-32190=>4610,
-63831=>4610,
-33777=>4611,
-63832=>4611,
-38517=>4612,
-63833=>4612,
-20442=>4613,
-21033=>4614,
-63965=>4614,
-21400=>4615,
-21519=>4616,
-63966=>4616,
-21774=>4617,
-23653=>4618,
-63967=>4618,
-24743=>4619,
-26446=>4620,
-63969=>4620,
-26792=>4621,
-63970=>4621,
-28012=>4622,
-29313=>4623,
-29432=>4624,
-29702=>4625,
-63972=>4625,
-29827=>4626,
-30178=>4627,
-63973=>4627,
-31852=>4628,
-32633=>4629,
-63974=>4629,
-32696=>4630,
-33673=>4631,
-35023=>4632,
-63975=>4632,
-35041=>4633,
-63976=>4633,
-12197=>4634,
-37324=>4634,
-63977=>4634,
-37328=>4635,
-38626=>4636,
-63978=>4636,
-39881=>4637,
-21533=>4638,
-63981=>4638,
-28542=>4639,
-29136=>4640,
-63982=>4640,
-29848=>4641,
-63983=>4641,
-34298=>4642,
-63984=>4642,
-36522=>4643,
-38563=>4644,
-63985=>4644,
-40023=>4645,
-63986=>4645,
-40607=>4646,
-63987=>4646,
-26519=>4647,
-63988=>4647,
-28107=>4648,
-63989=>4648,
-29747=>4649,
-33256=>4650,
-63990=>4650,
-38678=>4651,
-30764=>4652,
-12148=>4653,
-31435=>4653,
-63991=>4653,
-31520=>4654,
-63992=>4654,
-31890=>4655,
-63993=>4655,
-25705=>4656,
-29802=>4657,
-30194=>4658,
-30908=>4659,
-30952=>4660,
-12218=>4661,
-39340=>4661,
-39764=>4662,
-12231=>4663,
-40635=>4663,
-23518=>4664,
-24149=>4665,
-28448=>4666,
-33180=>4667,
-33707=>4668,
-37000=>4669,
-19975=>4670,
-21325=>4671,
-23081=>4672,
-24018=>4673,
-24398=>4674,
-24930=>4675,
-25405=>4676,
-26217=>4677,
-26364=>4678,
-28415=>4679,
-28459=>4680,
-28771=>4681,
-30622=>4682,
-33836=>4683,
-34067=>4684,
-34875=>4685,
-36627=>4686,
-39237=>4687,
-39995=>4688,
-21788=>4689,
-25273=>4690,
-26411=>4691,
-27819=>4692,
-33545=>4693,
-35178=>4694,
-38778=>4695,
-20129=>4696,
-22916=>4697,
-24536=>4698,
-24537=>4699,
-26395=>4700,
-32178=>4701,
-32596=>4702,
-33426=>4703,
-33579=>4704,
-33725=>4705,
-36638=>4706,
-37017=>4707,
-22475=>4708,
-22969=>4709,
-23186=>4710,
-23504=>4711,
-26151=>4712,
-26522=>4713,
-26757=>4714,
-27599=>4715,
-29028=>4716,
-32629=>4717,
-36023=>4718,
-36067=>4719,
-36993=>4720,
-39749=>4721,
-33032=>4722,
-35978=>4723,
-38476=>4724,
-39488=>4725,
-12230=>4726,
-40613=>4726,
-23391=>4727,
-27667=>4728,
-29467=>4729,
-30450=>4730,
-30431=>4731,
-33804=>4732,
-20906=>4733,
-35219=>4734,
-20813=>4735,
-20885=>4736,
-21193=>4737,
-26825=>4738,
-27796=>4739,
-30468=>4740,
-30496=>4741,
-32191=>4742,
-32236=>4743,
-12207=>4744,
-38754=>4744,
-40629=>4745,
-28357=>4746,
-34065=>4747,
-20901=>4748,
-21517=>4749,
-21629=>4750,
-26126=>4751,
-26269=>4752,
-26919=>4753,
-28319=>4754,
-12139=>4755,
-30399=>4755,
-30609=>4756,
-33559=>4757,
-33986=>4758,
-34719=>4759,
-37225=>4760,
-37528=>4761,
-40180=>4762,
-34946=>4763,
-20398=>4764,
-20882=>4765,
-21215=>4766,
-22982=>4767,
-24125=>4768,
-24917=>4769,
-25720=>4770,
-25721=>4771,
-26286=>4772,
-26576=>4773,
-27169=>4774,
-27597=>4775,
-12113=>4776,
-27611=>4776,
-29279=>4777,
-29281=>4778,
-29761=>4779,
-30520=>4780,
-12141=>4781,
-30683=>4781,
-32791=>4782,
-33468=>4783,
-33541=>4784,
-35584=>4785,
-35624=>4786,
-35980=>4787,
-12106=>4788,
-26408=>4788,
-27792=>4789,
-29287=>4790,
-12140=>4791,
-30446=>4791,
-30566=>4792,
-31302=>4793,
-40361=>4794,
-27519=>4795,
-27794=>4796,
-22818=>4797,
-26406=>4798,
-33945=>4799,
-21359=>4800,
-22675=>4801,
-22937=>4802,
-24287=>4803,
-25551=>4804,
-26164=>4805,
-26483=>4806,
-28218=>4807,
-29483=>4808,
-31447=>4809,
-33495=>4810,
-37672=>4811,
-21209=>4812,
-24043=>4813,
-25006=>4814,
-25035=>4815,
-25098=>4816,
-25287=>4817,
-25771=>4818,
-12102=>4819,
-26080=>4819,
-26969=>4820,
-27494=>4821,
-12111=>4822,
-27595=>4822,
-28961=>4823,
-29687=>4824,
-30045=>4825,
-32326=>4826,
-33310=>4827,
-33538=>4828,
-34154=>4829,
-35491=>4830,
-36031=>4831,
-38695=>4832,
-40289=>4833,
-22696=>4834,
-40664=>4835,
-20497=>4836,
-21006=>4837,
-21563=>4838,
-21839=>4839,
-12098=>4840,
-25991=>4840,
-27766=>4841,
-32010=>4842,
-32011=>4843,
-32862=>4844,
-34442=>4845,
-12200=>4846,
-38272=>4846,
-38639=>4847,
-21247=>4848,
-27797=>4849,
-29289=>4850,
-21619=>4851,
-23194=>4852,
-23614=>4853,
-23883=>4854,
-24396=>4855,
-24494=>4856,
-26410=>4857,
-26806=>4858,
-26979=>4859,
-28220=>4860,
-28228=>4861,
-30473=>4862,
-12150=>4863,
-31859=>4863,
-32654=>4864,
-34183=>4865,
-35598=>4866,
-36855=>4867,
-38753=>4868,
-40692=>4869,
-23735=>4870,
-24758=>4871,
-24845=>4872,
-25003=>4873,
-25935=>4874,
-26107=>4875,
-26108=>4876,
-27665=>4877,
-27887=>4878,
-29599=>4879,
-29641=>4880,
-32225=>4881,
-38292=>4882,
-23494=>4883,
-34588=>4884,
-35600=>4885,
-21085=>4886,
-21338=>4887,
-25293=>4888,
-25615=>4889,
-25778=>4890,
-26420=>4891,
-27192=>4892,
-27850=>4893,
-29632=>4894,
-29854=>4895,
-31636=>4896,
-31893=>4897,
-32283=>4898,
-33162=>4899,
-33334=>4900,
-34180=>4901,
-36843=>4902,
-38649=>4903,
-39361=>4904,
-20276=>4905,
-21322=>4906,
-21453=>4907,
-21467=>4908,
-25292=>4909,
-25644=>4910,
-25856=>4911,
-26001=>4912,
-27075=>4913,
-27886=>4914,
-28504=>4915,
-29677=>4916,
-30036=>4917,
-30242=>4918,
-30436=>4919,
-30460=>4920,
-30928=>4921,
-30971=>4922,
-63844=>4922,
-31020=>4923,
-32070=>4924,
-33324=>4925,
-34784=>4926,
-36820=>4927,
-38930=>4928,
-39151=>4929,
-21187=>4930,
-25300=>4931,
-25765=>4932,
-28196=>4933,
-28497=>4934,
-30332=>4935,
-36299=>4936,
-37297=>4937,
-37474=>4938,
-39662=>4939,
-39747=>4940,
-20515=>4941,
-20621=>4942,
-22346=>4943,
-22952=>4944,
-23592=>4945,
-24135=>4946,
-24439=>4947,
-25151=>4948,
-25918=>4949,
-12101=>4950,
-26041=>4950,
-26049=>4951,
-26121=>4952,
-26507=>4953,
-27036=>4954,
-28354=>4955,
-30917=>4956,
-32033=>4957,
-32938=>4958,
-33152=>4959,
-33323=>4960,
-33459=>4961,
-33953=>4962,
-34444=>4963,
-35370=>4964,
-35607=>4965,
-37030=>4966,
-38450=>4967,
-40848=>4968,
-20493=>4969,
-20467=>4970,
-22521=>4971,
-24472=>4972,
-25308=>4973,
-25490=>4974,
-26479=>4975,
-28227=>4976,
-28953=>4977,
-30403=>4978,
-32972=>4979,
-32986=>4980,
-35060=>4981,
-35061=>4982,
-35097=>4983,
-36064=>4984,
-36649=>4985,
-37197=>4986,
-38506=>4987,
-20271=>4988,
-20336=>4989,
-24091=>4990,
-26575=>4991,
-26658=>4992,
-12137=>4993,
-30333=>4993,
-30334=>4994,
-39748=>4995,
-24161=>4996,
-27146=>4997,
-29033=>4998,
-29140=>4999,
-30058=>5000,
-32321=>5001,
-34115=>5002,
-34281=>5003,
-39132=>5004,
-20240=>5005,
-31567=>5006,
-32624=>5007,
-38309=>5008,
-20961=>5009,
-24070=>5010,
-26805=>5011,
-27710=>5012,
-27726=>5013,
-27867=>5014,
-29359=>5015,
-31684=>5016,
-33539=>5017,
-27861=>5018,
-29754=>5019,
-20731=>5020,
-21128=>5021,
-22721=>5022,
-25816=>5023,
-27287=>5024,
-29863=>5025,
-30294=>5026,
-30887=>5027,
-34327=>5028,
-38370=>5029,
-38713=>5030,
-21342=>5031,
-24321=>5032,
-35722=>5033,
-36776=>5034,
-36783=>5035,
-37002=>5036,
-21029=>5037,
-30629=>5038,
-40009=>5039,
-40712=>5040,
-19993=>5041,
-20482=>5042,
-20853=>5043,
-23643=>5044,
-24183=>5045,
-26142=>5046,
-26170=>5047,
-26564=>5048,
-26821=>5049,
-28851=>5050,
-29953=>5051,
-30149=>5052,
-31177=>5053,
-31453=>5054,
-36647=>5055,
-39200=>5056,
-39432=>5057,
-20445=>5058,
-22561=>5059,
-22577=>5060,
-23542=>5061,
-26222=>5062,
-27493=>5063,
-27921=>5064,
-28282=>5065,
-28541=>5066,
-29668=>5067,
-29995=>5068,
-33769=>5069,
-35036=>5070,
-35091=>5071,
-35676=>5072,
-36628=>5073,
-20239=>5074,
-20693=>5075,
-21264=>5076,
-12056=>5077,
-21340=>5077,
-23443=>5078,
-24489=>5079,
-63846=>5079,
-26381=>5080,
-31119=>5081,
-33145=>5082,
-33583=>5083,
-34068=>5084,
-35079=>5085,
-35206=>5086,
-36665=>5087,
-36667=>5088,
-64007=>5088,
-39333=>5089,
-39954=>5090,
-26412=>5091,
-20086=>5092,
-20472=>5093,
-22857=>5094,
-23553=>5095,
-23791=>5096,
-23792=>5097,
-25447=>5098,
-26834=>5099,
-28925=>5100,
-29090=>5101,
-29739=>5102,
-32299=>5103,
-34028=>5104,
-34562=>5105,
-36898=>5106,
-37586=>5107,
-40179=>5108,
-19981=>5109,
-63847=>5109,
-20184=>5110,
-20463=>5111,
-20613=>5112,
-21078=>5113,
-21103=>5114,
-21542=>5115,
-21648=>5116,
-22496=>5117,
-22827=>5118,
-23142=>5119,
-23386=>5120,
-23413=>5121,
-23500=>5122,
-24220=>5123,
-25206=>5124,
-25975=>5125,
-26023=>5126,
-28014=>5127,
-28325=>5128,
-12119=>5129,
-29238=>5129,
-31526=>5130,
-31807=>5131,
-12152=>5132,
-32566=>5132,
-33104=>5133,
-33105=>5134,
-33178=>5135,
-33344=>5136,
-33433=>5137,
-33705=>5138,
-35331=>5139,
-36000=>5140,
-36070=>5141,
-36091=>5142,
-36212=>5143,
-36282=>5144,
-37096=>5145,
-37340=>5146,
-12201=>5147,
-38428=>5147,
-38468=>5148,
-39385=>5149,
-40167=>5150,
-21271=>5151,
-63843=>5151,
-20998=>5152,
-21545=>5153,
-22132=>5154,
-22707=>5155,
-22868=>5156,
-22894=>5157,
-24575=>5158,
-24996=>5159,
-25198=>5160,
-26128=>5161,
-27774=>5162,
-28954=>5163,
-30406=>5164,
-31881=>5165,
-31966=>5166,
-32027=>5167,
-33452=>5168,
-36033=>5169,
-38640=>5170,
-20315=>5171,
-24343=>5172,
-24447=>5173,
-25282=>5174,
-23849=>5175,
-26379=>5176,
-26842=>5177,
-30844=>5178,
-32323=>5179,
-40300=>5180,
-19989=>5181,
-20633=>5182,
-12052=>5183,
-21269=>5183,
-21290=>5184,
-21329=>5185,
-22915=>5186,
-23138=>5187,
-24199=>5188,
-24754=>5189,
-24970=>5190,
-25161=>5191,
-25209=>5192,
-26000=>5193,
-26503=>5194,
-27047=>5195,
-12112=>5196,
-27604=>5196,
-27606=>5197,
-27607=>5198,
-27608=>5199,
-27832=>5200,
-29749=>5201,
-30202=>5202,
-30738=>5203,
-30865=>5204,
-31189=>5205,
-31192=>5206,
-31875=>5207,
-32203=>5208,
-32737=>5209,
-32933=>5210,
-33086=>5211,
-33218=>5212,
-33778=>5213,
-34586=>5214,
-35048=>5215,
-35513=>5216,
-35692=>5217,
-36027=>5218,
-37145=>5219,
-12206=>5220,
-38750=>5220,
-12214=>5221,
-39131=>5221,
-12240=>5222,
-40763=>5222,
-22188=>5223,
-23338=>5224,
-24428=>5225,
-25996=>5226,
-27315=>5227,
-27567=>5228,
-27996=>5229,
-28657=>5230,
-28693=>5231,
-29277=>5232,
-29613=>5233,
-36007=>5234,
-36051=>5235,
-38971=>5236,
-24977=>5237,
-27703=>5238,
-32856=>5239,
-39425=>5240,
-20045=>5241,
-20107=>5242,
-20123=>5243,
-20181=>5244,
-20282=>5245,
-20284=>5246,
-20351=>5247,
-20447=>5248,
-20735=>5249,
-21490=>5250,
-21496=>5251,
-21766=>5252,
-21987=>5253,
-22235=>5254,
-12064=>5255,
-22763=>5255,
-22882=>5256,
-23057=>5257,
-23531=>5258,
-23546=>5259,
-23556=>5260,
-24051=>5261,
-24107=>5262,
-24473=>5263,
-24605=>5264,
-25448=>5265,
-26012=>5266,
-26031=>5267,
-26614=>5268,
-26619=>5269,
-26797=>5270,
-27515=>5271,
-27801=>5272,
-27863=>5273,
-28195=>5274,
-28681=>5275,
-29509=>5276,
-30722=>5277,
-31038=>5278,
-31040=>5279,
-31072=>5280,
-31169=>5281,
-31721=>5282,
-32023=>5283,
-32114=>5284,
-32902=>5285,
-33293=>5286,
-33678=>5287,
-34001=>5288,
-34503=>5289,
-35039=>5290,
-35408=>5291,
-35422=>5292,
-35613=>5293,
-36060=>5294,
-36198=>5295,
-36781=>5296,
-37034=>5297,
-39164=>5298,
-39391=>5299,
-40605=>5300,
-21066=>5301,
-26388=>5302,
-20632=>5303,
-21034=>5304,
-12077=>5305,
-23665=>5305,
-25955=>5306,
-27733=>5307,
-29642=>5308,
-29987=>5309,
-30109=>5310,
-31639=>5311,
-33948=>5312,
-37240=>5313,
-38704=>5314,
-20087=>5315,
-25746=>5316,
-27578=>5317,
-63856=>5317,
-29022=>5318,
-34217=>5319,
-19977=>5320,
-26441=>5321,
-26862=>5322,
-28183=>5323,
-33439=>5324,
-34072=>5325,
-34923=>5326,
-25591=>5327,
-28545=>5328,
-37394=>5329,
-39087=>5330,
-19978=>5331,
-20663=>5332,
-20687=>5333,
-20767=>5334,
-21830=>5335,
-21930=>5336,
-22039=>5337,
-23360=>5338,
-23577=>5339,
-23776=>5340,
-24120=>5341,
-24202=>5342,
-24224=>5343,
-24258=>5344,
-24819=>5345,
-26705=>5346,
-27233=>5347,
-28248=>5348,
-29245=>5349,
-29248=>5350,
-29376=>5351,
-63994=>5351,
-30456=>5352,
-31077=>5353,
-31665=>5354,
-32724=>5355,
-35059=>5356,
-35316=>5357,
-35443=>5358,
-35937=>5359,
-36062=>5360,
-38684=>5361,
-22622=>5362,
-63852=>5362,
-29885=>5363,
-36093=>5364,
-21959=>5365,
-31329=>5366,
-32034=>5367,
-63850=>5367,
-12170=>5368,
-33394=>5368,
-29298=>5369,
-12131=>5370,
-29983=>5370,
-29989=>5371,
-31513=>5372,
-22661=>5373,
-22779=>5374,
-23996=>5375,
-24207=>5376,
-24246=>5377,
-24464=>5378,
-24661=>5379,
-25234=>5380,
-25471=>5381,
-25933=>5382,
-26257=>5383,
-26329=>5384,
-26360=>5385,
-26646=>5386,
-26866=>5387,
-29312=>5388,
-29790=>5389,
-31598=>5390,
-32110=>5391,
-32214=>5392,
-32626=>5393,
-32997=>5394,
-33298=>5395,
-34223=>5396,
-35199=>5397,
-35475=>5398,
-36893=>5399,
-37604=>5400,
-12233=>5401,
-40653=>5401,
-12239=>5402,
-40736=>5402,
-12067=>5403,
-22805=>5403,
-22893=>5404,
-24109=>5405,
-24796=>5406,
-26132=>5407,
-26227=>5408,
-26512=>5409,
-27728=>5410,
-28101=>5411,
-28511=>5412,
-12143=>5413,
-30707=>5413,
-30889=>5414,
-33990=>5415,
-37323=>5416,
-37675=>5417,
-20185=>5418,
-20682=>5419,
-20808=>5420,
-21892=>5421,
-23307=>5422,
-23459=>5423,
-25159=>5424,
-25982=>5425,
-26059=>5426,
-28210=>5427,
-29053=>5428,
-29697=>5429,
-29764=>5430,
-29831=>5431,
-29887=>5432,
-30316=>5433,
-31146=>5434,
-32218=>5435,
-32341=>5436,
-32680=>5437,
-33146=>5438,
-33203=>5439,
-33337=>5440,
-34330=>5441,
-34796=>5442,
-35445=>5443,
-36323=>5444,
-36984=>5445,
-37521=>5446,
-37925=>5447,
-39245=>5448,
-39854=>5449,
-21352=>5450,
-23633=>5451,
-26964=>5452,
-27844=>5453,
-27945=>5454,
-28203=>5455,
-12166=>5456,
-33292=>5456,
-34203=>5457,
-35131=>5458,
-35373=>5459,
-35498=>5460,
-63855=>5460,
-63905=>5460,
-38634=>5461,
-40807=>5462,
-21089=>5463,
-26297=>5464,
-27570=>5465,
-32406=>5466,
-34814=>5467,
-36109=>5468,
-38275=>5469,
-38493=>5470,
-25885=>5471,
-28041=>5472,
-29166=>5473,
-22478=>5474,
-22995=>5475,
-23468=>5476,
-24615=>5477,
-24826=>5478,
-25104=>5479,
-26143=>5480,
-26207=>5481,
-29481=>5482,
-29689=>5483,
-30427=>5484,
-30465=>5485,
-63853=>5485,
-31596=>5486,
-32854=>5487,
-32882=>5488,
-33125=>5489,
-35488=>5490,
-37266=>5491,
-19990=>5492,
-21218=>5493,
-27506=>5494,
-27927=>5495,
-31237=>5496,
-31545=>5497,
-32048=>5498,
-36016=>5499,
-21484=>5500,
-22063=>5501,
-22609=>5502,
-23477=>5503,
-12073=>5504,
-23567=>5504,
-23569=>5505,
-24034=>5506,
-25152=>5507,
-25475=>5508,
-25620=>5509,
-26157=>5510,
-26803=>5511,
-27836=>5512,
-28040=>5513,
-28335=>5514,
-28703=>5515,
-28836=>5516,
-29138=>5517,
-29990=>5518,
-30095=>5519,
-30094=>5520,
-30233=>5521,
-31505=>5522,
-31712=>5523,
-31787=>5524,
-32032=>5525,
-32057=>5526,
-34092=>5527,
-34157=>5528,
-34311=>5529,
-35380=>5530,
-36877=>5531,
-36961=>5532,
-37045=>5533,
-37559=>5534,
-38902=>5535,
-39479=>5536,
-20439=>5537,
-23660=>5538,
-26463=>5539,
-28049=>5540,
-31903=>5541,
-32396=>5542,
-35606=>5543,
-36118=>5544,
-36895=>5545,
-23403=>5546,
-24061=>5547,
-25613=>5548,
-33984=>5549,
-36956=>5550,
-39137=>5551,
-29575=>5552,
-63841=>5552,
-63963=>5552,
-23435=>5553,
-24730=>5554,
-26494=>5555,
-28126=>5556,
-35359=>5557,
-35494=>5558,
-36865=>5559,
-38924=>5560,
-21047=>5561,
-28753=>5562,
-30862=>5563,
-37782=>5564,
-34928=>5565,
-37335=>5566,
-20462=>5567,
-21463=>5568,
-22013=>5569,
-22234=>5570,
-22402=>5571,
-22781=>5572,
-23234=>5573,
-23432=>5574,
-23723=>5575,
-23744=>5576,
-24101=>5577,
-24833=>5578,
-25101=>5579,
-12095=>5580,
-25163=>5580,
-25480=>5581,
-25628=>5582,
-25910=>5583,
-25976=>5584,
-63849=>5584,
-27193=>5585,
-27530=>5586,
-12116=>5587,
-27700=>5587,
-27929=>5588,
-28465=>5589,
-29159=>5590,
-29417=>5591,
-29560=>5592,
-29703=>5593,
-29874=>5594,
-30246=>5595,
-30561=>5596,
-31168=>5597,
-31319=>5598,
-31466=>5599,
-31929=>5600,
-32143=>5601,
-32172=>5602,
-32353=>5603,
-32670=>5604,
-33065=>5605,
-33585=>5606,
-33936=>5607,
-34010=>5608,
-34282=>5609,
-34966=>5610,
-35504=>5611,
-35728=>5612,
-36664=>5613,
-36930=>5614,
-36995=>5615,
-37228=>5616,
-37526=>5617,
-37561=>5618,
-38539=>5619,
-38567=>5620,
-38568=>5621,
-38614=>5622,
-38656=>5623,
-38920=>5624,
-12216=>5625,
-39318=>5625,
-39635=>5626,
-39706=>5627,
-21460=>5628,
-22654=>5629,
-22809=>5630,
-23408=>5631,
-23487=>5632,
-28113=>5633,
-28506=>5634,
-29087=>5635,
-29729=>5636,
-29881=>5637,
-32901=>5638,
-33789=>5639,
-24033=>5640,
-24455=>5641,
-24490=>5642,
-24642=>5643,
-26092=>5644,
-26642=>5645,
-26991=>5646,
-27219=>5647,
-27529=>5648,
-27957=>5649,
-28147=>5650,
-29667=>5651,
-30462=>5652,
-30636=>5653,
-31565=>5654,
-32020=>5655,
-33059=>5656,
-33308=>5657,
-33600=>5658,
-34036=>5659,
-34147=>5660,
-35426=>5661,
-35524=>5662,
-37255=>5663,
-37662=>5664,
-38918=>5665,
-39348=>5666,
-25100=>5667,
-34899=>5668,
-36848=>5669,
-37477=>5670,
-23815=>5671,
-23847=>5672,
-23913=>5673,
-29791=>5674,
-33181=>5675,
-34664=>5676,
-28629=>5677,
-25342=>5678,
-63859=>5678,
-32722=>5679,
-35126=>5680,
-35186=>5681,
-19998=>5682,
-20056=>5683,
-20711=>5684,
-21213=>5685,
-21319=>5686,
-25215=>5687,
-26119=>5688,
-32361=>5689,
-34821=>5690,
-38494=>5691,
-20365=>5692,
-21273=>5693,
-22070=>5694,
-22987=>5695,
-23204=>5696,
-12075=>5697,
-23608=>5697,
-23630=>5698,
-23629=>5699,
-24066=>5700,
-24337=>5701,
-24643=>5702,
-26045=>5703,
-26159=>5704,
-26178=>5705,
-26558=>5706,
-26612=>5707,
-29468=>5708,
-12142=>5709,
-30690=>5709,
-12144=>5710,
-31034=>5710,
-32709=>5711,
-33940=>5712,
-33997=>5713,
-35222=>5714,
-35430=>5715,
-35433=>5716,
-35553=>5717,
-12183=>5718,
-35925=>5718,
-35962=>5719,
-22516=>5720,
-23508=>5721,
-24335=>5722,
-24687=>5723,
-25325=>5724,
-26893=>5725,
-27542=>5726,
-28252=>5727,
-29060=>5728,
-31698=>5729,
-34645=>5730,
-35672=>5731,
-63996=>5731,
-36606=>5732,
-12215=>5733,
-39135=>5733,
-39166=>5734,
-20280=>5735,
-20353=>5736,
-20449=>5737,
-21627=>5738,
-23072=>5739,
-23480=>5740,
-24892=>5741,
-26032=>5742,
-26216=>5743,
-29180=>5744,
-30003=>5745,
-31070=>5746,
-32051=>5747,
-33102=>5748,
-12162=>5749,
-33251=>5749,
-33688=>5750,
-34218=>5751,
-34254=>5752,
-34563=>5753,
-35338=>5754,
-12189=>5755,
-36523=>5755,
-12191=>5756,
-36763=>5756,
-36805=>5757,
-22833=>5758,
-23460=>5759,
-23526=>5760,
-24713=>5761,
-23529=>5762,
-23563=>5763,
-12092=>5764,
-24515=>5764,
-27777=>5765,
-28145=>5766,
-28683=>5767,
-29978=>5768,
-33455=>5769,
-35574=>5770,
-20160=>5771,
-63997=>5771,
-12055=>5772,
-21313=>5772,
-38617=>5773,
-12114=>5774,
-27663=>5774,
-20126=>5775,
-20420=>5776,
-20818=>5777,
-21854=>5778,
-23077=>5779,
-23784=>5780,
-25105=>5781,
-12123=>5782,
-29273=>5782,
-33469=>5783,
-33706=>5784,
-34558=>5785,
-34905=>5786,
-35357=>5787,
-38463=>5788,
-38597=>5789,
-39187=>5790,
-40201=>5791,
-40285=>5792,
-22538=>5793,
-23731=>5794,
-23997=>5795,
-24132=>5796,
-24801=>5797,
-63929=>5797,
-24853=>5798,
-25569=>5799,
-27138=>5800,
-63764=>5800,
-63836=>5800,
-63935=>5800,
-28197=>5801,
-37122=>5802,
-37716=>5803,
-38990=>5804,
-39952=>5805,
-40823=>5806,
-23433=>5807,
-23736=>5808,
-25353=>5809,
-26191=>5810,
-26696=>5811,
-30524=>5812,
-38593=>5813,
-38797=>5814,
-38996=>5815,
-39839=>5816,
-26017=>5817,
-35585=>5818,
-36555=>5819,
-38332=>5820,
-21813=>5821,
-23721=>5822,
-24022=>5823,
-24245=>5824,
-26263=>5825,
-30284=>5826,
-33780=>5827,
-38343=>5828,
-22739=>5829,
-25276=>5830,
-29390=>5831,
-40232=>5832,
-20208=>5833,
-22830=>5834,
-24591=>5835,
-26171=>5836,
-27523=>5837,
-31207=>5838,
-40230=>5839,
-21395=>5840,
-21696=>5841,
-22467=>5842,
-23830=>5843,
-24859=>5844,
-26326=>5845,
-28079=>5846,
-30861=>5847,
-33406=>5848,
-38552=>5849,
-38724=>5850,
-21380=>5851,
-25212=>5852,
-25494=>5853,
-28082=>5854,
-32266=>5855,
-33099=>5856,
-38989=>5857,
-27387=>5858,
-32588=>5859,
-40367=>5860,
-40474=>5861,
-20063=>5862,
-20539=>5863,
-20918=>5864,
-22812=>5865,
-24825=>5866,
-25590=>5867,
-26928=>5868,
-29242=>5869,
-32822=>5870,
-37326=>5871,
-24369=>5872,
-32004=>5873,
-33509=>5874,
-63860=>5874,
-33903=>5875,
-33979=>5876,
-34277=>5877,
-36493=>5878,
-20335=>5879,
-22756=>5880,
-23363=>5881,
-24665=>5882,
-25562=>5883,
-25880=>5884,
-25965=>5885,
-26264=>5886,
-26954=>5887,
-27171=>5888,
-27915=>5889,
-28673=>5890,
-29036=>5891,
-30162=>5892,
-30221=>5893,
-31155=>5894,
-31344=>5895,
-12154=>5896,
-32650=>5896,
-35140=>5897,
-35731=>5898,
-37312=>5899,
-38525=>5900,
-39178=>5901,
-22276=>5902,
-24481=>5903,
-26044=>5904,
-28417=>5905,
-30208=>5906,
-31142=>5907,
-35486=>5908,
-39341=>5909,
-12226=>5910,
-39770=>5910,
-40812=>5911,
-20740=>5912,
-25014=>5913,
-25233=>5914,
-27277=>5915,
-33222=>5916,
-20547=>5917,
-22576=>5918,
-24422=>5919,
-28937=>5920,
-12180=>5921,
-35328=>5921,
-35578=>5922,
-23420=>5923,
-34326=>5924,
-20474=>5925,
-20796=>5926,
-22196=>5927,
-22852=>5928,
-25513=>5929,
-28153=>5930,
-23978=>5931,
-26989=>5932,
-20870=>5933,
-20104=>5934,
-20313=>5935,
-22914=>5936,
-27487=>5937,
-27741=>5938,
-29877=>5939,
-30998=>5940,
-33287=>5941,
-33349=>5942,
-33593=>5943,
-36671=>5944,
-36701=>5945,
-39192=>5946,
-20134=>5947,
-22495=>5948,
-24441=>5949,
-26131=>5950,
-63968=>5950,
-30123=>5951,
-32377=>5952,
-35695=>5953,
-36870=>5954,
-39515=>5955,
-22181=>5956,
-22567=>5957,
-23032=>5958,
-23071=>5959,
-23476=>5960,
-24310=>5961,
-25424=>5962,
-25403=>5963,
-26941=>5964,
-27783=>5965,
-27839=>5966,
-28046=>5967,
-28051=>5968,
-28149=>5969,
-28436=>5970,
-28895=>5971,
-28982=>5972,
-29017=>5973,
-29123=>5974,
-29141=>5975,
-30799=>5976,
-30831=>5977,
-31605=>5978,
-32227=>5979,
-32303=>5980,
-34893=>5981,
-36575=>5982,
-37467=>5983,
-40182=>5984,
-24709=>5985,
-28037=>5986,
-29105=>5987,
-38321=>5988,
-21421=>5989,
-26579=>5990,
-28814=>5991,
-28976=>5992,
-29744=>5993,
-33398=>5994,
-33490=>5995,
-38331=>5996,
-39653=>5997,
-40573=>5998,
-26308=>5999,
-29121=>6000,
-33865=>6001,
-63854=>6001,
-22603=>6002,
-23992=>6003,
-24433=>6004,
-26144=>6005,
-26254=>6006,
-27001=>6007,
-27054=>6008,
-27704=>6009,
-27891=>6010,
-28214=>6011,
-28481=>6012,
-28634=>6013,
-28699=>6014,
-28719=>6015,
-29008=>6016,
-29151=>6017,
-29552=>6018,
-29787=>6019,
-29908=>6020,
-30408=>6021,
-31310=>6022,
-32403=>6023,
-33521=>6024,
-35424=>6025,
-36814=>6026,
-37704=>6027,
-38681=>6028,
-20034=>6029,
-20522=>6030,
-21000=>6031,
-21473=>6032,
-26355=>6033,
-27757=>6034,
-28618=>6035,
-29450=>6036,
-30591=>6037,
-31330=>6038,
-33454=>6039,
-34269=>6040,
-34306=>6041,
-35028=>6042,
-35427=>6043,
-35709=>6044,
-35947=>6045,
-37555=>6046,
-38675=>6047,
-38928=>6048,
-20116=>6049,
-20237=>6050,
-20425=>6051,
-20658=>6052,
-21320=>6053,
-21566=>6054,
-21555=>6055,
-21978=>6056,
-22626=>6057,
-22714=>6058,
-22887=>6059,
-23067=>6060,
-23524=>6061,
-24735=>6062,
-25034=>6063,
-25942=>6064,
-26111=>6065,
-26212=>6066,
-26791=>6067,
-27738=>6068,
-28595=>6069,
-28879=>6070,
-29100=>6071,
-29522=>6072,
-31613=>6073,
-34568=>6074,
-35492=>6075,
-39986=>6076,
-40711=>6077,
-23627=>6078,
-27779=>6079,
-29508=>6080,
-12127=>6081,
-29577=>6081,
-37434=>6082,
-28331=>6083,
-29797=>6084,
-30239=>6085,
-31337=>6086,
-32277=>6087,
-34314=>6088,
-20800=>6089,
-22725=>6090,
-25793=>6091,
-29934=>6092,
-29973=>6093,
-30320=>6094,
-32705=>6095,
-37013=>6096,
-38605=>6097,
-39252=>6098,
-28198=>6099,
-12129=>6100,
-29926=>6100,
-31401=>6101,
-31402=>6102,
-33253=>6103,
-34521=>6104,
-34680=>6105,
-35355=>6106,
-23113=>6107,
-23436=>6108,
-23451=>6109,
-26785=>6110,
-26880=>6111,
-28003=>6112,
-29609=>6113,
-29715=>6114,
-29740=>6115,
-30871=>6116,
-32233=>6117,
-32747=>6118,
-33048=>6119,
-33109=>6120,
-33694=>6121,
-35916=>6122,
-38446=>6123,
-63942=>6123,
-38929=>6124,
-12104=>6125,
-26352=>6125,
-24448=>6126,
-26106=>6127,
-26505=>6128,
-27754=>6129,
-29579=>6130,
-20525=>6131,
-23043=>6132,
-27498=>6133,
-30702=>6134,
-22806=>6135,
-23916=>6136,
-24013=>6137,
-29477=>6138,
-30031=>6139,
-20709=>6140,
-20985=>6141,
-22575=>6142,
-22829=>6143,
-22934=>6144,
-23002=>6145,
-23525=>6146,
-23970=>6147,
-25303=>6148,
-25622=>6149,
-25747=>6150,
-25854=>6151,
-26332=>6152,
-27208=>6153,
-29183=>6154,
-29796=>6155,
-31368=>6156,
-31407=>6157,
-32327=>6158,
-32350=>6159,
-32768=>6160,
-33136=>6161,
-34799=>6162,
-35201=>6163,
-35616=>6164,
-36953=>6165,
-36992=>6166,
-39250=>6167,
-24958=>6168,
-27442=>6169,
-28020=>6170,
-32287=>6171,
-35109=>6172,
-36785=>6173,
-20433=>6174,
-20653=>6175,
-20887=>6176,
-21191=>6177,
-22471=>6178,
-22665=>6179,
-23481=>6180,
-24248=>6181,
-24898=>6182,
-27029=>6183,
-28044=>6184,
-28263=>6185,
-28342=>6186,
-29076=>6187,
-29794=>6188,
-12132=>6189,
-29992=>6189,
-29996=>6190,
-32883=>6191,
-33592=>6192,
-33993=>6193,
-36362=>6194,
-37780=>6195,
-37854=>6196,
-20110=>6197,
-20305=>6198,
-20598=>6199,
-20778=>6200,
-12060=>6201,
-21448=>6201,
-21451=>6202,
-21491=>6203,
-23431=>6204,
-23507=>6205,
-23588=>6206,
-24858=>6207,
-24962=>6208,
-26100=>6209,
-12124=>6210,
-29275=>6210,
-29591=>6211,
-29760=>6212,
-30402=>6213,
-31056=>6214,
-31121=>6215,
-31161=>6216,
-32006=>6217,
-12155=>6218,
-32701=>6218,
-33419=>6219,
-34261=>6220,
-34398=>6221,
-36802=>6222,
-36935=>6223,
-37109=>6224,
-37354=>6225,
-38533=>6226,
-12204=>6227,
-38632=>6227,
-38633=>6228,
-21206=>6229,
-24423=>6230,
-26093=>6231,
-26161=>6232,
-26671=>6233,
-29020=>6234,
-31286=>6235,
-37057=>6236,
-38922=>6237,
-20113=>6238,
-27218=>6239,
-27550=>6240,
-28560=>6241,
-29065=>6242,
-32792=>6243,
-33464=>6244,
-34131=>6245,
-36939=>6246,
-38549=>6247,
-38642=>6248,
-38907=>6249,
-34074=>6250,
-39729=>6251,
-20112=>6252,
-29066=>6253,
-38596=>6254,
-20803=>6255,
-21407=>6256,
-21729=>6257,
-22291=>6258,
-22290=>6259,
-22435=>6260,
-23195=>6261,
-23236=>6262,
-23491=>6263,
-24616=>6264,
-24895=>6265,
-25588=>6266,
-27781=>6267,
-27961=>6268,
-28274=>6269,
-28304=>6270,
-29232=>6271,
-29503=>6272,
-29783=>6273,
-33489=>6274,
-34945=>6275,
-36677=>6276,
-36960=>6277,
-38498=>6278,
-39000=>6279,
-40219=>6280,
-12105=>6281,
-26376=>6281,
-36234=>6282,
-37470=>6283,
-20301=>6284,
-20553=>6285,
-20702=>6286,
-21361=>6287,
-22285=>6288,
-22996=>6289,
-23041=>6290,
-23561=>6291,
-24944=>6292,
-26256=>6293,
-28205=>6294,
-29234=>6295,
-29771=>6296,
-32239=>6297,
-32963=>6298,
-33806=>6299,
-33894=>6300,
-34111=>6301,
-34655=>6302,
-34907=>6303,
-35096=>6304,
-35586=>6305,
-36949=>6306,
-12209=>6307,
-38859=>6307,
-39759=>6308,
-20083=>6309,
-20369=>6310,
-20754=>6311,
-20842=>6312,
-21807=>6313,
-21929=>6314,
-23418=>6315,
-23461=>6316,
-24188=>6317,
-24189=>6318,
-24254=>6319,
-24736=>6320,
-24799=>6321,
-24840=>6322,
-24841=>6323,
-25540=>6324,
-25912=>6325,
-26377=>6326,
-26580=>6327,
-26586=>6328,
-26977=>6329,
-26978=>6330,
-27833=>6331,
-27943=>6332,
-28216=>6333,
-28641=>6334,
-29494=>6335,
-29495=>6336,
-29788=>6337,
-30001=>6338,
-30290=>6339,
-32173=>6340,
-33278=>6341,
-33848=>6342,
-35029=>6343,
-35480=>6344,
-35547=>6345,
-35565=>6346,
-36400=>6347,
-36418=>6348,
-36938=>6349,
-36926=>6350,
-36986=>6351,
-12195=>6352,
-37193=>6352,
-37321=>6353,
-37742=>6354,
-22537=>6355,
-27603=>6356,
-12161=>6357,
-32905=>6357,
-32946=>6358,
-20801=>6359,
-22891=>6360,
-23609=>6361,
-28516=>6362,
-29607=>6363,
-32996=>6364,
-36103=>6365,
-37399=>6366,
-38287=>6367,
-12160=>6368,
-32895=>6368,
-25102=>6369,
-28700=>6370,
-32104=>6371,
-34701=>6372,
-22432=>6373,
-24681=>6374,
-24903=>6375,
-27575=>6376,
-35518=>6377,
-37504=>6378,
-38577=>6379,
-12036=>6380,
-20057=>6380,
-21535=>6381,
-28139=>6382,
-34093=>6383,
-38512=>6384,
-12211=>6385,
-38899=>6385,
-39150=>6386,
-25558=>6387,
-27875=>6388,
-12194=>6389,
-37009=>6389,
-20957=>6390,
-25033=>6391,
-33210=>6392,
-40441=>6393,
-20381=>6394,
-20506=>6395,
-20736=>6396,
-23452=>6397,
-24847=>6398,
-25087=>6399,
-25836=>6400,
-26885=>6401,
-27589=>6402,
-30097=>6403,
-30691=>6404,
-32681=>6405,
-33380=>6406,
-34191=>6407,
-34811=>6408,
-12176=>6409,
-34915=>6409,
-35516=>6410,
-35696=>6411,
-37291=>6412,
-12038=>6413,
-20108=>6413,
-20197=>6414,
-20234=>6415,
-22839=>6416,
-23016=>6417,
-24050=>6418,
-24347=>6419,
-24411=>6420,
-24609=>6421,
-29246=>6422,
-29669=>6423,
-30064=>6424,
-63842=>6424,
-30157=>6425,
-31227=>6426,
-12157=>6427,
-32780=>6427,
-12159=>6428,
-32819=>6428,
-32900=>6429,
-33505=>6430,
-33617=>6431,
-36029=>6432,
-36019=>6433,
-36999=>6434,
-39156=>6435,
-39180=>6436,
-28727=>6437,
-30410=>6438,
-32714=>6439,
-32716=>6440,
-32764=>6441,
-35610=>6442,
-12040=>6443,
-20154=>6443,
-20161=>6444,
-20995=>6445,
-21360=>6446,
-21693=>6447,
-63902=>6447,
-22240=>6448,
-23035=>6449,
-23493=>6450,
-24341=>6451,
-24525=>6452,
-28270=>6453,
-32106=>6454,
-33589=>6455,
-34451=>6456,
-35469=>6457,
-38765=>6458,
-38775=>6459,
-12032=>6460,
-19968=>6460,
-20314=>6461,
-20350=>6462,
-22777=>6463,
-12103=>6464,
-26085=>6464,
-28322=>6465,
-36920=>6466,
-37808=>6467,
-39353=>6468,
-20219=>6469,
-22764=>6470,
-22922=>6471,
-23001=>6472,
-24641=>6473,
-31252=>6474,
-33615=>6475,
-36035=>6476,
-12042=>6477,
-20837=>6477,
-21316=>6478,
-20173=>6479,
-21097=>6480,
-23381=>6481,
-33471=>6482,
-20180=>6483,
-21050=>6484,
-63999=>6484,
-21672=>6485,
-22985=>6486,
-23039=>6487,
-12070=>6488,
-23376=>6488,
-23383=>6489,
-23388=>6490,
-24675=>6491,
-24904=>6492,
-28363=>6493,
-28825=>6494,
-63995=>6494,
-29038=>6495,
-29574=>6496,
-29943=>6497,
-30133=>6498,
-30913=>6499,
-32043=>6500,
-32773=>6501,
-12163=>6502,
-33258=>6502,
-33576=>6503,
-34071=>6504,
-34249=>6505,
-35566=>6506,
-36039=>6507,
-38604=>6508,
-20316=>6509,
-21242=>6510,
-22204=>6511,
-26027=>6512,
-26152=>6513,
-28796=>6514,
-28856=>6515,
-29237=>6516,
-32189=>6517,
-33421=>6518,
-37196=>6519,
-38592=>6520,
-40306=>6521,
-23409=>6522,
-26855=>6523,
-27544=>6524,
-28538=>6525,
-30430=>6526,
-23697=>6527,
-26283=>6528,
-28507=>6529,
-31668=>6530,
-31786=>6531,
-34870=>6532,
-38620=>6533,
-19976=>6534,
-20183=>6535,
-21280=>6536,
-22580=>6537,
-22715=>6538,
-22767=>6539,
-22892=>6540,
-23559=>6541,
-24115=>6542,
-24196=>6543,
-24373=>6544,
-25484=>6545,
-26290=>6546,
-26454=>6547,
-27167=>6548,
-27299=>6549,
-27404=>6550,
-28479=>6551,
-29254=>6552,
-29520=>6553,
-29835=>6554,
-31456=>6555,
-31911=>6556,
-33144=>6557,
-33247=>6558,
-33255=>6559,
-33674=>6560,
-33900=>6561,
-34083=>6562,
-34196=>6563,
-34255=>6564,
-35037=>6565,
-36115=>6566,
-37292=>6567,
-12199=>6568,
-38263=>6568,
-38556=>6569,
-20877=>6570,
-21705=>6571,
-22312=>6572,
-23472=>6573,
-25165=>6574,
-26448=>6575,
-26685=>6576,
-26771=>6577,
-28221=>6578,
-28371=>6579,
-28797=>6580,
-32289=>6581,
-35009=>6582,
-36001=>6583,
-36617=>6584,
-40779=>6585,
-40782=>6586,
-29229=>6587,
-31631=>6588,
-35533=>6589,
-37658=>6590,
-20295=>6591,
-20302=>6592,
-20786=>6593,
-21632=>6594,
-22992=>6595,
-24213=>6596,
-25269=>6597,
-26485=>6598,
-26990=>6599,
-27159=>6600,
-27822=>6601,
-28186=>6602,
-29401=>6603,
-29482=>6604,
-30141=>6605,
-31672=>6606,
-32053=>6607,
-33511=>6608,
-33785=>6609,
-33879=>6610,
-34295=>6611,
-35419=>6612,
-36015=>6613,
-36487=>6614,
-36889=>6615,
-37048=>6616,
-38606=>6617,
-40799=>6618,
-21219=>6619,
-21514=>6620,
-23265=>6621,
-23490=>6622,
-25688=>6623,
-25973=>6624,
-28404=>6625,
-29380=>6626,
-30340=>6627,
-31309=>6628,
-31515=>6629,
-31821=>6630,
-32318=>6631,
-32735=>6632,
-33659=>6633,
-35627=>6634,
-36042=>6635,
-12186=>6636,
-36196=>6636,
-36321=>6637,
-36447=>6638,
-36842=>6639,
-36857=>6640,
-36969=>6641,
-37841=>6642,
-20291=>6643,
-20346=>6644,
-20659=>6645,
-20840=>6646,
-20856=>6647,
-21069=>6648,
-21098=>6649,
-22625=>6650,
-22652=>6651,
-22880=>6652,
-23560=>6653,
-23637=>6654,
-24283=>6655,
-24731=>6656,
-25136=>6657,
-26643=>6658,
-27583=>6659,
-27656=>6660,
-28593=>6661,
-29006=>6662,
-29728=>6663,
-12133=>6664,
-30000=>6664,
-30008=>6665,
-30033=>6666,
-30322=>6667,
-31564=>6668,
-31627=>6669,
-31661=>6670,
-31686=>6671,
-32399=>6672,
-35438=>6673,
-36670=>6674,
-36681=>6675,
-37439=>6676,
-37523=>6677,
-37666=>6678,
-37931=>6679,
-38651=>6680,
-39002=>6681,
-39019=>6682,
-39198=>6683,
-20999=>6684,
-64000=>6684,
-25130=>6685,
-25240=>6686,
-27993=>6687,
-30308=>6688,
-31434=>6689,
-31680=>6690,
-32118=>6691,
-21344=>6692,
-23742=>6693,
-24215=>6694,
-28472=>6695,
-28857=>6696,
-31896=>6697,
-38673=>6698,
-39822=>6699,
-40670=>6700,
-25509=>6701,
-25722=>6702,
-34678=>6703,
-19969=>6704,
-20117=>6705,
-20141=>6706,
-20572=>6707,
-20597=>6708,
-21576=>6709,
-22979=>6710,
-23450=>6711,
-24128=>6712,
-24237=>6713,
-24311=>6714,
-24449=>6715,
-24773=>6716,
-25402=>6717,
-25919=>6718,
-25972=>6719,
-26060=>6720,
-26230=>6721,
-26232=>6722,
-26622=>6723,
-26984=>6724,
-27273=>6725,
-27491=>6726,
-27712=>6727,
-28096=>6728,
-28136=>6729,
-28191=>6730,
-28254=>6731,
-28702=>6732,
-28833=>6733,
-29582=>6734,
-29693=>6735,
-30010=>6736,
-30555=>6737,
-30855=>6738,
-31118=>6739,
-31243=>6740,
-31357=>6741,
-31934=>6742,
-32142=>6743,
-33351=>6744,
-35330=>6745,
-35562=>6746,
-35998=>6747,
-37165=>6748,
-37194=>6749,
-37336=>6750,
-37478=>6751,
-37580=>6752,
-37664=>6753,
-38662=>6754,
-38742=>6755,
-38748=>6756,
-38914=>6757,
-12237=>6758,
-40718=>6758,
-21046=>6759,
-21137=>6760,
-21884=>6761,
-22564=>6762,
-24093=>6763,
-24351=>6764,
-24716=>6765,
-25552=>6766,
-26799=>6767,
-28639=>6768,
-31085=>6769,
-31532=>6770,
-33229=>6771,
-34234=>6772,
-35069=>6773,
-35576=>6774,
-36420=>6775,
-37261=>6776,
-38500=>6777,
-38555=>6778,
-38717=>6779,
-38988=>6780,
-12241=>6781,
-40778=>6781,
-20430=>6782,
-20806=>6783,
-20939=>6784,
-21161=>6785,
-22066=>6786,
-24340=>6787,
-24427=>6788,
-25514=>6789,
-25805=>6790,
-26089=>6791,
-26177=>6792,
-26362=>6793,
-26361=>6794,
-26397=>6795,
-26781=>6796,
-26839=>6797,
-27133=>6798,
-28437=>6799,
-28526=>6800,
-29031=>6801,
-29157=>6802,
-12118=>6803,
-29226=>6803,
-29866=>6804,
-30522=>6805,
-31062=>6806,
-31066=>6807,
-31199=>6808,
-31264=>6809,
-31381=>6810,
-31895=>6811,
-31967=>6812,
-32068=>6813,
-32368=>6814,
-32903=>6815,
-34299=>6816,
-34468=>6817,
-35412=>6818,
-35519=>6819,
-36249=>6820,
-36481=>6821,
-36896=>6822,
-36973=>6823,
-37347=>6824,
-38459=>6825,
-38613=>6826,
-12227=>6827,
-40165=>6827,
-26063=>6828,
-31751=>6829,
-12188=>6830,
-36275=>6830,
-37827=>6831,
-23384=>6832,
-23562=>6833,
-21330=>6834,
-25305=>6835,
-29469=>6836,
-20519=>6837,
-23447=>6838,
-24478=>6839,
-24752=>6840,
-24939=>6841,
-26837=>6842,
-28121=>6843,
-29742=>6844,
-31278=>6845,
-32066=>6846,
-32156=>6847,
-32305=>6848,
-33131=>6849,
-36394=>6850,
-36405=>6851,
-37758=>6852,
-37912=>6853,
-20304=>6854,
-22352=>6855,
-24038=>6856,
-24231=>6857,
-25387=>6858,
-32618=>6859,
-20027=>6860,
-20303=>6861,
-20367=>6862,
-20570=>6863,
-23005=>6864,
-32964=>6865,
-21610=>6866,
-21608=>6867,
-22014=>6868,
-22863=>6869,
-23449=>6870,
-24030=>6871,
-24282=>6872,
-26205=>6873,
-26417=>6874,
-26609=>6875,
-26666=>6876,
-27880=>6877,
-27954=>6878,
-28234=>6879,
-28557=>6880,
-28855=>6881,
-29664=>6882,
-30087=>6883,
-31820=>6884,
-32002=>6885,
-32044=>6886,
-32162=>6887,
-12168=>6888,
-33311=>6888,
-34523=>6889,
-35387=>6890,
-35461=>6891,
-12187=>6892,
-36208=>6892,
-36490=>6893,
-36659=>6894,
-36913=>6895,
-37198=>6896,
-37202=>6897,
-37956=>6898,
-39376=>6899,
-12149=>6900,
-31481=>6900,
-31909=>6901,
-20426=>6902,
-20737=>6903,
-20934=>6904,
-22472=>6905,
-23535=>6906,
-23803=>6907,
-26201=>6908,
-27197=>6909,
-27994=>6910,
-28310=>6911,
-28652=>6912,
-28940=>6913,
-30063=>6914,
-31459=>6915,
-34850=>6916,
-36897=>6917,
-36981=>6918,
-38603=>6919,
-39423=>6920,
-33537=>6921,
-20013=>6922,
-20210=>6923,
-34886=>6924,
-37325=>6925,
-21373=>6926,
-27355=>6927,
-26987=>6928,
-27713=>6929,
-33914=>6930,
-22686=>6931,
-24974=>6932,
-26366=>6933,
-25327=>6934,
-28893=>6935,
-29969=>6936,
-30151=>6937,
-32338=>6938,
-33976=>6939,
-35657=>6940,
-36104=>6941,
-20043=>6942,
-21482=>6943,
-21675=>6944,
-22320=>6945,
-22336=>6946,
-24535=>6947,
-25345=>6948,
-25351=>6949,
-25711=>6950,
-12096=>6951,
-25903=>6951,
-26088=>6952,
-26234=>6953,
-26525=>6954,
-26547=>6955,
-12108=>6956,
-27490=>6956,
-27744=>6957,
-27802=>6958,
-28460=>6959,
-30693=>6960,
-30757=>6961,
-31049=>6962,
-31063=>6963,
-32025=>6964,
-32930=>6965,
-33026=>6966,
-12164=>6967,
-33267=>6967,
-33437=>6968,
-33463=>6969,
-34584=>6970,
-35468=>6971,
-36100=>6972,
-36286=>6973,
-36978=>6974,
-30452=>6975,
-31257=>6976,
-31287=>6977,
-32340=>6978,
-32887=>6979,
-21767=>6980,
-21972=>6981,
-22645=>6982,
-25391=>6983,
-25634=>6984,
-26185=>6985,
-26187=>6986,
-26733=>6987,
-27035=>6988,
-27524=>6989,
-27941=>6990,
-28337=>6991,
-29645=>6992,
-29800=>6993,
-29857=>6994,
-30043=>6995,
-30137=>6996,
-30433=>6997,
-30494=>6998,
-30603=>6999,
-31206=>7000,
-32265=>7001,
-32285=>7002,
-33275=>7003,
-34095=>7004,
-34967=>7005,
-35386=>7006,
-36049=>7007,
-36587=>7008,
-12192=>7009,
-36784=>7009,
-63857=>7009,
-36914=>7010,
-37805=>7011,
-38499=>7012,
-38515=>7013,
-38663=>7014,
-20356=>7015,
-21489=>7016,
-23018=>7017,
-23241=>7018,
-24089=>7019,
-26702=>7020,
-29894=>7021,
-30142=>7022,
-31209=>7023,
-31378=>7024,
-33187=>7025,
-34541=>7026,
-36074=>7027,
-36300=>7028,
-36845=>7029,
-26015=>7030,
-26389=>7031,
-22519=>7032,
-28503=>7033,
-32221=>7034,
-36655=>7035,
-37878=>7036,
-38598=>7037,
-24501=>7038,
-25074=>7039,
-28548=>7040,
-19988=>7041,
-20376=>7042,
-20511=>7043,
-21449=>7044,
-21983=>7045,
-23919=>7046,
-24046=>7047,
-27425=>7048,
-27492=>7049,
-30923=>7050,
-31642=>7051,
-36425=>7052,
-12190=>7053,
-36554=>7053,
-63746=>7053,
-36974=>7054,
-25417=>7055,
-25662=>7056,
-30528=>7057,
-31364=>7058,
-37679=>7059,
-38015=>7060,
-40810=>7061,
-25776=>7062,
-28591=>7063,
-29158=>7064,
-29864=>7065,
-29914=>7066,
-31428=>7067,
-31762=>7068,
-32386=>7069,
-31922=>7070,
-32408=>7071,
-35738=>7072,
-36106=>7073,
-38013=>7074,
-39184=>7075,
-39244=>7076,
-21049=>7077,
-23519=>7078,
-25830=>7079,
-26413=>7080,
-32046=>7081,
-20717=>7082,
-21443=>7083,
-63851=>7083,
-22649=>7084,
-24920=>7085,
-24921=>7086,
-25082=>7087,
-26028=>7088,
-31449=>7089,
-35730=>7090,
-35734=>7091,
-20489=>7092,
-20513=>7093,
-21109=>7094,
-21809=>7095,
-23100=>7096,
-24288=>7097,
-24432=>7098,
-24884=>7099,
-25950=>7100,
-26124=>7101,
-26166=>7102,
-26274=>7103,
-27085=>7104,
-28356=>7105,
-28466=>7106,
-29462=>7107,
-30241=>7108,
-31379=>7109,
-33081=>7110,
-33369=>7111,
-33750=>7112,
-33980=>7113,
-20661=>7114,
-22512=>7115,
-23488=>7116,
-23528=>7117,
-24425=>7118,
-25505=>7119,
-30758=>7120,
-32181=>7121,
-33756=>7122,
-34081=>7123,
-37319=>7124,
-37365=>7125,
-20874=>7126,
-26613=>7127,
-31574=>7128,
-36012=>7129,
-20932=>7130,
-22971=>7131,
-24765=>7132,
-34389=>7133,
-20508=>7134,
-21076=>7135,
-23610=>7136,
-24957=>7137,
-25114=>7138,
-25299=>7139,
-64002=>7139,
-25842=>7140,
-26021=>7141,
-28364=>7142,
-30240=>7143,
-33034=>7144,
-36448=>7145,
-38495=>7146,
-38587=>7147,
-20191=>7148,
-21315=>7149,
-21912=>7150,
-22825=>7151,
-24029=>7152,
-25797=>7153,
-27849=>7154,
-28154=>7155,
-29588=>7156,
-31359=>7157,
-12167=>7158,
-33307=>7158,
-34214=>7159,
-36068=>7160,
-36368=>7161,
-36983=>7162,
-37351=>7163,
-38369=>7164,
-38433=>7165,
-38854=>7166,
-20984=>7167,
-21746=>7168,
-21894=>7169,
-24505=>7170,
-25764=>7171,
-28552=>7172,
-32180=>7173,
-36639=>7174,
-36685=>7175,
-37941=>7176,
-20681=>7177,
-23574=>7178,
-27838=>7179,
-28155=>7180,
-29979=>7181,
-30651=>7182,
-31805=>7183,
-31844=>7184,
-35449=>7185,
-35522=>7186,
-22558=>7187,
-22974=>7188,
-24086=>7189,
-25463=>7190,
-29266=>7191,
-30090=>7192,
-30571=>7193,
-35548=>7194,
-36028=>7195,
-36626=>7196,
-24307=>7197,
-26228=>7198,
-28152=>7199,
-32893=>7200,
-33729=>7201,
-35531=>7202,
-12205=>7203,
-38737=>7203,
-39894=>7204,
-21059=>7205,
-26367=>7206,
-28053=>7207,
-28399=>7208,
-32224=>7209,
-35558=>7210,
-36910=>7211,
-36958=>7212,
-39636=>7213,
-21021=>7214,
-21119=>7215,
-21736=>7216,
-24980=>7217,
-25220=>7218,
-25307=>7219,
-26786=>7220,
-26898=>7221,
-26970=>7222,
-27189=>7223,
-28818=>7224,
-28966=>7225,
-30813=>7226,
-30977=>7227,
-30990=>7228,
-31186=>7229,
-31245=>7230,
-32918=>7231,
-12171=>7232,
-33400=>7232,
-33493=>7233,
-33609=>7234,
-34121=>7235,
-35970=>7236,
-36229=>7237,
-37218=>7238,
-37259=>7239,
-37294=>7240,
-20419=>7241,
-22225=>7242,
-29165=>7243,
-30679=>7244,
-34560=>7245,
-35320=>7246,
-12072=>7247,
-23544=>7247,
-24534=>7248,
-26449=>7249,
-37032=>7250,
-21474=>7251,
-22618=>7252,
-23541=>7253,
-24740=>7254,
-24961=>7255,
-25696=>7256,
-32317=>7257,
-32880=>7258,
-34085=>7259,
-37507=>7260,
-25774=>7261,
-20652=>7262,
-23828=>7263,
-26368=>7264,
-22684=>7265,
-25277=>7266,
-25512=>7267,
-26894=>7268,
-27000=>7269,
-27166=>7270,
-28267=>7271,
-30394=>7272,
-31179=>7273,
-33467=>7274,
-33833=>7275,
-35535=>7276,
-36264=>7277,
-36861=>7278,
-37138=>7279,
-37195=>7280,
-37276=>7281,
-37648=>7282,
-37656=>7283,
-37786=>7284,
-38619=>7285,
-39478=>7286,
-39949=>7287,
-19985=>7288,
-30044=>7289,
-31069=>7290,
-31482=>7291,
-31569=>7292,
-31689=>7293,
-32302=>7294,
-33988=>7295,
-36441=>7296,
-36468=>7297,
-36600=>7298,
-36880=>7299,
-26149=>7300,
-26943=>7301,
-29763=>7302,
-20986=>7303,
-26414=>7304,
-40668=>7305,
-20805=>7306,
-24544=>7307,
-27798=>7308,
-34802=>7309,
-34909=>7310,
-34935=>7311,
-24756=>7312,
-33205=>7313,
-33795=>7314,
-36101=>7315,
-21462=>7316,
-21561=>7317,
-22068=>7318,
-23094=>7319,
-23601=>7320,
-28810=>7321,
-32736=>7322,
-32858=>7323,
-33030=>7324,
-33261=>7325,
-36259=>7326,
-37257=>7327,
-39519=>7328,
-40434=>7329,
-20596=>7330,
-20164=>7331,
-21408=>7332,
-24827=>7333,
-28204=>7334,
-23652=>7335,
-20360=>7336,
-20516=>7337,
-21988=>7338,
-23769=>7339,
-24159=>7340,
-24677=>7341,
-26772=>7342,
-27835=>7343,
-28100=>7344,
-29118=>7345,
-30164=>7346,
-30196=>7347,
-30305=>7348,
-31258=>7349,
-31305=>7350,
-32199=>7351,
-32251=>7352,
-32622=>7353,
-33268=>7354,
-34473=>7355,
-36636=>7356,
-38601=>7357,
-39347=>7358,
-12242=>7359,
-40786=>7359,
-21063=>7360,
-21189=>7361,
-39149=>7362,
-35242=>7363,
-19971=>7364,
-26578=>7365,
-28422=>7366,
-20405=>7367,
-23522=>7368,
-26517=>7369,
-27784=>7370,
-63858=>7370,
-28024=>7371,
-29723=>7372,
-30759=>7373,
-37341=>7374,
-37756=>7375,
-34756=>7376,
-31204=>7377,
-31281=>7378,
-24555=>7379,
-20182=>7380,
-21668=>7381,
-21822=>7382,
-22702=>7383,
-22949=>7384,
-24816=>7385,
-25171=>7386,
-25302=>7387,
-26422=>7388,
-26965=>7389,
-33333=>7390,
-38464=>7391,
-39345=>7392,
-39389=>7393,
-20524=>7394,
-21331=>7395,
-21828=>7396,
-22396=>7397,
-25176=>7398,
-25826=>7399,
-26219=>7400,
-26589=>7401,
-28609=>7402,
-28655=>7403,
-29730=>7404,
-29752=>7405,
-35351=>7406,
-37944=>7407,
-21585=>7408,
-22022=>7409,
-22374=>7410,
-24392=>7411,
-24986=>7412,
-27470=>7413,
-28760=>7414,
-28845=>7415,
-32187=>7416,
-35477=>7417,
-22890=>7418,
-33067=>7419,
-25506=>7420,
-30472=>7421,
-32829=>7422,
-36010=>7423,
-22612=>7424,
-25645=>7425,
-27067=>7426,
-23445=>7427,
-24081=>7428,
-28271=>7429,
-34153=>7430,
-20812=>7431,
-21488=>7432,
-22826=>7433,
-24608=>7434,
-24907=>7435,
-27526=>7436,
-27760=>7437,
-27888=>7438,
-31518=>7439,
-32974=>7440,
-33492=>7441,
-36294=>7442,
-37040=>7443,
-39089=>7444,
-25799=>7445,
-28580=>7446,
-25745=>7447,
-25860=>7448,
-20814=>7449,
-21520=>7450,
-12063=>7451,
-22303=>7451,
-35342=>7452,
-24927=>7453,
-26742=>7454,
-30171=>7455,
-31570=>7456,
-32113=>7457,
-36890=>7458,
-22534=>7459,
-27084=>7460,
-33151=>7461,
-35114=>7462,
-36864=>7463,
-38969=>7464,
-20600=>7465,
-22871=>7466,
-22956=>7467,
-25237=>7468,
-36879=>7469,
-39722=>7470,
-24925=>7471,
-29305=>7472,
-38358=>7473,
-22369=>7474,
-23110=>7475,
-24052=>7476,
-25226=>7477,
-25773=>7478,
-25850=>7479,
-26487=>7480,
-27874=>7481,
-27966=>7482,
-29228=>7483,
-29750=>7484,
-30772=>7485,
-32631=>7486,
-33453=>7487,
-36315=>7488,
-38935=>7489,
-21028=>7490,
-22338=>7491,
-26495=>7492,
-29256=>7493,
-29923=>7494,
-36009=>7495,
-36774=>7496,
-37393=>7497,
-38442=>7498,
-12043=>7499,
-20843=>7499,
-21485=>7500,
-25420=>7501,
-20329=>7502,
-21764=>7503,
-24726=>7504,
-25943=>7505,
-27803=>7506,
-28031=>7507,
-29260=>7508,
-29437=>7509,
-31255=>7510,
-35207=>7511,
-12185=>7512,
-35997=>7512,
-24429=>7513,
-28558=>7514,
-28921=>7515,
-33192=>7516,
-24846=>7517,
-20415=>7518,
-63845=>7518,
-20559=>7519,
-25153=>7520,
-12122=>7521,
-29255=>7521,
-31687=>7522,
-32232=>7523,
-32745=>7524,
-36941=>7525,
-38829=>7526,
-39449=>7527,
-36022=>7528,
-22378=>7529,
-24179=>7530,
-26544=>7531,
-33805=>7532,
-35413=>7533,
-21536=>7534,
-23318=>7535,
-24163=>7536,
-24290=>7537,
-24330=>7538,
-25987=>7539,
-32954=>7540,
-34109=>7541,
-38281=>7542,
-38491=>7543,
-20296=>7544,
-21253=>7545,
-21261=>7546,
-21263=>7547,
-21638=>7548,
-21754=>7549,
-22275=>7550,
-24067=>7551,
-24598=>7552,
-25243=>7553,
-25265=>7554,
-25429=>7555,
-27873=>7556,
-28006=>7557,
-30129=>7558,
-30770=>7559,
-32990=>7560,
-33071=>7561,
-33502=>7562,
-33889=>7563,
-33970=>7564,
-34957=>7565,
-35090=>7566,
-36875=>7567,
-37610=>7568,
-39165=>7569,
-39825=>7570,
-24133=>7571,
-26292=>7572,
-64006=>7572,
-26333=>7573,
-28689=>7574,
-29190=>7575,
-20469=>7576,
-21117=>7577,
-24426=>7578,
-24915=>7579,
-26451=>7580,
-27161=>7581,
-28418=>7582,
-29922=>7583,
-31080=>7584,
-34920=>7585,
-35961=>7586,
-39111=>7587,
-39108=>7588,
-39491=>7589,
-21697=>7590,
-31263=>7591,
-26963=>7592,
-35575=>7593,
-35914=>7594,
-12213=>7595,
-39080=>7595,
-39342=>7596,
-24444=>7597,
-25259=>7598,
-30130=>7599,
-12138=>7600,
-30382=>7600,
-34987=>7601,
-36991=>7602,
-38466=>7603,
-21305=>7604,
-24380=>7605,
-24517=>7606,
-27852=>7607,
-63848=>7607,
-29644=>7608,
-30050=>7609,
-12134=>7610,
-30091=>7610,
-31558=>7611,
-33534=>7612,
-39325=>7613,
-20047=>7614,
-36924=>7615,
-19979=>7616,
-20309=>7617,
-21414=>7618,
-22799=>7619,
-24264=>7620,
-26160=>7621,
-27827=>7622,
-29781=>7623,
-33655=>7624,
-34662=>7625,
-36032=>7626,
-36944=>7627,
-38686=>7628,
-39957=>7629,
-22737=>7630,
-23416=>7631,
-34384=>7632,
-35604=>7633,
-40372=>7634,
-23506=>7635,
-24680=>7636,
-24717=>7637,
-26097=>7638,
-27735=>7639,
-28450=>7640,
-28579=>7641,
-28698=>7642,
-32597=>7643,
-32752=>7644,
-38289=>7645,
-38290=>7646,
-38480=>7647,
-38867=>7648,
-21106=>7649,
-36676=>7650,
-20989=>7651,
-21547=>7652,
-21688=>7653,
-21859=>7654,
-21898=>7655,
-27323=>7656,
-28085=>7657,
-32216=>7658,
-33382=>7659,
-37532=>7660,
-38519=>7661,
-40569=>7662,
-21512=>7663,
-21704=>7664,
-30418=>7665,
-34532=>7666,
-38308=>7667,
-38356=>7668,
-38492=>7669,
-20130=>7670,
-20233=>7671,
-23022=>7672,
-23270=>7673,
-24055=>7674,
-24658=>7675,
-25239=>7676,
-26477=>7677,
-26689=>7678,
-27782=>7679,
-28207=>7680,
-32568=>7681,
-32923=>7682,
-33322=>7683,
-38917=>7684,
-20133=>7685,
-20565=>7686,
-21683=>7687,
-22419=>7688,
-22874=>7689,
-23401=>7690,
-23475=>7691,
-25032=>7692,
-26999=>7693,
-28023=>7694,
-28707=>7695,
-34809=>7696,
-35299=>7697,
-35442=>7698,
-35559=>7699,
-36994=>7700,
-39405=>7701,
-39608=>7702,
-21182=>7703,
-26680=>7704,
-20502=>7705,
-24184=>7706,
-26447=>7707,
-33607=>7708,
-12175=>7709,
-34892=>7709,
-64008=>7709,
-20139=>7710,
-21521=>7711,
-22190=>7712,
-29670=>7713,
-37141=>7714,
-38911=>7715,
-39177=>7716,
-39255=>7717,
-12217=>7718,
-39321=>7718,
-22099=>7719,
-22687=>7720,
-34395=>7721,
-35377=>7722,
-25010=>7723,
-27382=>7724,
-29563=>7725,
-36562=>7726,
-27463=>7727,
-38570=>7728,
-39511=>7729,
-22869=>7730,
-29184=>7731,
-36203=>7732,
-12208=>7733,
-38761=>7733,
-20436=>7734,
-23796=>7735,
-24358=>7736,
-25080=>7737,
-26203=>7738,
-27883=>7739,
-28843=>7740,
-12126=>7741,
-29572=>7741,
-29625=>7742,
-29694=>7743,
-30505=>7744,
-30541=>7745,
-32067=>7746,
-32098=>7747,
-32291=>7748,
-33335=>7749,
-34898=>7750,
-36066=>7751,
-37449=>7752,
-39023=>7753,
-23377=>7754,
-12147=>7755,
-31348=>7755,
-12174=>7756,
-34880=>7756,
-12212=>7757,
-38913=>7757,
-23244=>7758,
-20448=>7759,
-21332=>7760,
-22846=>7761,
-23805=>7762,
-25406=>7763,
-28025=>7764,
-29433=>7765,
-33029=>7766,
-33031=>7767,
-33698=>7768,
-37583=>7769,
-38960=>7770,
-20136=>7771,
-20804=>7772,
-21009=>7773,
-22411=>7774,
-24418=>7775,
-27842=>7776,
-28366=>7777,
-28677=>7778,
-28752=>7779,
-28847=>7780,
-29074=>7781,
-29673=>7782,
-29801=>7783,
-63918=>7783,
-33610=>7784,
-34722=>7785,
-34913=>7786,
-36872=>7787,
-37026=>7788,
-37795=>7789,
-39336=>7790,
-20846=>7791,
-24407=>7792,
-24800=>7793,
-24935=>7794,
-26291=>7795,
-34137=>7796,
-36426=>7797,
-37295=>7798,
-38795=>7799,
-20046=>7800,
-20114=>7801,
-21628=>7802,
-22741=>7803,
-22778=>7804,
-22909=>7805,
-23733=>7806,
-24359=>7807,
-12094=>7808,
-25142=>7808,
-25160=>7809,
-26122=>7810,
-26215=>7811,
-27627=>7812,
-28009=>7813,
-28111=>7814,
-28246=>7815,
-28408=>7816,
-28564=>7817,
-28640=>7818,
-28649=>7819,
-28765=>7820,
-29392=>7821,
-29733=>7822,
-29786=>7823,
-29920=>7824,
-30355=>7825,
-31068=>7826,
-31946=>7827,
-32286=>7828,
-32993=>7829,
-33446=>7830,
-33899=>7831,
-33983=>7832,
-34382=>7833,
-34399=>7834,
-34676=>7835,
-35703=>7836,
-35946=>7837,
-37804=>7838,
-38912=>7839,
-39013=>7840,
-24785=>7841,
-25110=>7842,
-37239=>7843,
-23130=>7844,
-26127=>7845,
-28151=>7846,
-28222=>7847,
-29759=>7848,
-39746=>7849,
-24573=>7850,
-24794=>7851,
-31503=>7852,
-21700=>7853,
-24344=>7854,
-27742=>7855,
-27859=>7856,
-27946=>7857,
-28888=>7858,
-32005=>7859,
-34425=>7860,
-35340=>7861,
-40251=>7862,
-21270=>7863,
-21644=>7864,
-23301=>7865,
-27194=>7866,
-12117=>7867,
-28779=>7867,
-30069=>7868,
-31117=>7869,
-12146=>7870,
-31166=>7870,
-33457=>7871,
-33775=>7872,
-35441=>7873,
-35649=>7874,
-36008=>7875,
-38772=>7876,
-25844=>7877,
-25899=>7878,
-30906=>7879,
-30907=>7880,
-31339=>7881,
-20024=>7882,
-21914=>7883,
-22864=>7884,
-23462=>7885,
-24187=>7886,
-24739=>7887,
-25563=>7888,
-27489=>7889,
-26213=>7890,
-26707=>7891,
-28185=>7892,
-29029=>7893,
-29872=>7894,
-32008=>7895,
-36996=>7896,
-39529=>7897,
-39973=>7898,
-27963=>7899,
-28369=>7900,
-63748=>7900,
-29502=>7901,
-35905=>7902,
-38346=>7903,
-20976=>7904,
-24140=>7905,
-24488=>7906,
-24653=>7907,
-24822=>7908,
-24880=>7909,
-24908=>7910,
-26179=>7911,
-26180=>7912,
-27045=>7913,
-27841=>7914,
-28255=>7915,
-28361=>7916,
-28514=>7917,
-29004=>7918,
-29852=>7919,
-30343=>7920,
-31681=>7921,
-31783=>7922,
-33618=>7923,
-34647=>7924,
-36945=>7925,
-38541=>7926,
-12232=>7927,
-40643=>7927,
-21295=>7928,
-22238=>7929,
-24315=>7930,
-24458=>7931,
-24674=>7932,
-24724=>7933,
-25079=>7934,
-26214=>7935,
-26371=>7936,
-27292=>7937,
-28142=>7938,
-28590=>7939,
-28784=>7940,
-29546=>7941,
-32362=>7942,
-33214=>7943,
-33588=>7944,
-34516=>7945,
-35496=>7946,
-36036=>7947,
-21123=>7948,
-29554=>7949,
-23446=>7950,
-27243=>7951,
-37892=>7952,
-21742=>7953,
-22150=>7954,
-23389=>7955,
-25928=>7956,
-25989=>7957,
-26313=>7958,
-26783=>7959,
-28045=>7960,
-28102=>7961,
-12120=>7962,
-29243=>7962,
-32948=>7963,
-37237=>7964,
-39501=>7965,
-20399=>7966,
-20505=>7967,
-21402=>7968,
-21518=>7969,
-21564=>7970,
-21897=>7971,
-21957=>7972,
-24127=>7973,
-24460=>7974,
-26429=>7975,
-29030=>7976,
-29661=>7977,
-36869=>7978,
-21211=>7979,
-21235=>7980,
-22628=>7981,
-22734=>7982,
-28932=>7983,
-29071=>7984,
-29179=>7985,
-34224=>7986,
-35347=>7987,
-26248=>7988,
-63941=>7988,
-34216=>7989,
-21927=>7990,
-26244=>7991,
-29002=>7992,
-33841=>7993,
-21321=>7994,
-21913=>7995,
-27585=>7996,
-24409=>7997,
-24509=>7998,
-25582=>7999,
-26249=>8000,
-28999=>8001,
-35569=>8002,
-36637=>8003,
-40638=>8004,
-20241=>8005,
-25658=>8006,
-28875=>8007,
-30054=>8008,
-34407=>8009,
-24676=>8010,
-35662=>8011,
-40440=>8012,
-20807=>8013,
-20982=>8014,
-21256=>8015,
-27958=>8016,
-33016=>8017,
-12234=>8018,
-40657=>8018,
-26133=>8019,
-27427=>8020,
-28824=>8021,
-30165=>8022,
-21507=>8023,
-23673=>8024,
-32007=>8025,
-35350=>8026,
-12107=>8027,
-27424=>8027,
-27453=>8028,
-27462=>8029,
-21560=>8030,
-24688=>8031,
-27965=>8032,
-32725=>8033,
-33288=>8034,
-20694=>8035,
-20958=>8036,
-21916=>8037,
-22123=>8038,
-22221=>8039,
-23020=>8040,
-23305=>8041,
-24076=>8042,
-24985=>8043,
-24984=>8044,
-25137=>8045,
-26206=>8046,
-26342=>8047,
-29081=>8048,
-29113=>8049,
-29114=>8050,
-29351=>8051,
-31143=>8052,
-31232=>8053,
-32690=>8054,
-35440=>8055,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12310=>8219,
-12311=>8220,
-12312=>8221,
-12313=>8222,
-8223=>8237,
-8219=>8238,
-8314=>8239,
-8315=>8240,
-8316=>8248,
-8317=>8250,
-8318=>8251,
-700=>8275,
-8942=>8320,
-8759=>8321,
-10122=>8342,
-10123=>8343,
-10124=>8344,
-10125=>8345,
-10126=>8346,
-10127=>8347,
-10128=>8348,
-10129=>8349,
-10130=>8350,
-10131=>8351,
-9398=>8388,
-9399=>8389,
-9400=>8390,
-9401=>8391,
-9402=>8392,
-9403=>8393,
-9404=>8394,
-9405=>8395,
-9406=>8396,
-9407=>8397,
-9408=>8398,
-9409=>8399,
-9410=>8400,
-9411=>8401,
-9412=>8402,
-9413=>8403,
-9414=>8404,
-9415=>8405,
-9416=>8406,
-9417=>8407,
-9418=>8408,
-9419=>8409,
-9420=>8410,
-9421=>8411,
-9422=>8412,
-9423=>8413,
-8826=>8475,
-8827=>8476,
-8910=>8477,
-8911=>8478,
-8832=>8479,
-8833=>8480,
-8816=>8481,
-8817=>8482,
-8818=>8483,
-8819=>8484,
-8842=>8486,
-8843=>8488,
-8822=>8489,
-8823=>8490,
-8825=>8491,
-8922=>8492,
-8923=>8493,
-8773=>8499,
-8771=>8500,
-8776=>8501,
-8868=>8503,
-8244=>8582,
-9839=>8594,
-8258=>8599,
-10045=>8604,
-8226=>8607,
-8249=>8612,
-8250=>8613,
-10010=>8630,
-10006=>8631,
-9711=>8633,
-10070=>8637,
-9676=>8639,
-9775=>8664,
-12320=>8671,
-10102=>8673,
-10103=>8674,
-10104=>8675,
-10105=>8676,
-10106=>8677,
-10107=>8678,
-10108=>8679,
-10109=>8680,
-10110=>8681,
-10111=>8682,
-12306=>8700,
-12342=>8701,
-8710=>8715,
-8735=>8717,
-8741=>8719,
-8742=>8720,
-8787=>8722,
-8785=>8723,
-8806=>8724,
-8807=>8725,
-8723=>8726,
-8853=>8727,
-8854=>8728,
-8855=>8729,
-8980=>8731,
-8802=>8734,
-9649=>8736,
-8738=>8738,
-8784=>8739,
-8867=>8742,
-8814=>8745,
-8815=>8746,
-8837=>8747,
-8836=>8748,
-8713=>8749,
-8716=>8750,
-8891=>8751,
-8892=>8752,
-8794=>8753,
-8966=>8754,
-12958=>8761,
-8252=>8763,
-9702=>8775,
-9663=>8779,
-9653=>8780,
-9657=>8781,
-9667=>8782,
-9674=>8787,
-12849=>8788,
-12857=>8789,
-13259=>8790,
-9327=>8791,
-9328=>8792,
-9329=>8793,
-9330=>8794,
-9331=>8795,
-8656=>8814,
-8655=>8815,
-8653=>8816,
-8657=>8854,
-8659=>8855,
-8626=>8864,
-8625=>8865,
-8628=>8867,
-8624=>8868,
-8627=>8869,
-8636=>8884,
-8640=>8885,
-8644=>8896,
-8645=>8897,
-9347=>9042,
-9348=>9043,
-9349=>9044,
-9350=>9045,
-9351=>9046,
-12948=>9080,
-12965=>9096,
-8672=>9190,
-8674=>9191,
-8673=>9192,
-8675=>9193,
-8678=>9198,
-8680=>9199,
-8679=>9200,
-8681=>9201,
-9757=>9222,
-9759=>9223,
-12944=>9300,
-12938=>9301,
-12939=>9302,
-12940=>9303,
-12941=>9304,
-12942=>9305,
-12943=>9306,
-12318=>9322,
-12319=>9323,
-8246=>9324,
-8245=>9326,
-12540=>9330,
-44034=>9333,
-44035=>9334,
-44037=>9335,
-44038=>9336,
-44043=>9337,
-44044=>9338,
-44045=>9339,
-44046=>9340,
-44047=>9341,
-44056=>9342,
-44062=>9343,
-44063=>9344,
-44065=>9345,
-44066=>9346,
-44067=>9347,
-44069=>9348,
-44070=>9349,
-44071=>9350,
-44072=>9351,
-44073=>9352,
-44074=>9353,
-44075=>9354,
-44078=>9355,
-44082=>9356,
-44083=>9357,
-44084=>9358,
-44085=>9359,
-44086=>9360,
-44087=>9361,
-44090=>9362,
-44091=>9363,
-44093=>9364,
-44094=>9365,
-44095=>9366,
-44097=>9367,
-44098=>9368,
-44099=>9369,
-44100=>9370,
-44101=>9371,
-44102=>9372,
-44103=>9373,
-44104=>9374,
-44105=>9375,
-44106=>9376,
-44108=>9377,
-44110=>9378,
-44111=>9379,
-44112=>9380,
-44113=>9381,
-44114=>9382,
-44115=>9383,
-44117=>9384,
-44118=>9385,
-44119=>9386,
-44121=>9387,
-44122=>9388,
-44123=>9389,
-44125=>9390,
-44126=>9391,
-44127=>9392,
-44128=>9393,
-44129=>9394,
-44130=>9395,
-44131=>9396,
-44132=>9397,
-44133=>9398,
-44134=>9399,
-44135=>9400,
-44136=>9401,
-44137=>9402,
-44138=>9403,
-44139=>9404,
-44140=>9405,
-44141=>9406,
-44142=>9407,
-44143=>9408,
-44146=>9409,
-44147=>9410,
-44149=>9411,
-44150=>9412,
-44153=>9413,
-44155=>9414,
-44156=>9415,
-44157=>9416,
-44158=>9417,
-44159=>9418,
-44162=>9419,
-44167=>9420,
-44168=>9421,
-44173=>9422,
-44174=>9423,
-44175=>9424,
-44177=>9425,
-44178=>9426,
-44179=>9427,
-44181=>9428,
-44182=>9429,
-44183=>9430,
-44184=>9431,
-44185=>9432,
-44186=>9433,
-44187=>9434,
-44190=>9435,
-44194=>9436,
-44195=>9437,
-44196=>9438,
-44197=>9439,
-44198=>9440,
-44199=>9441,
-44203=>9442,
-44205=>9443,
-44206=>9444,
-44209=>9445,
-44210=>9446,
-44211=>9447,
-44212=>9448,
-44213=>9449,
-44214=>9450,
-44215=>9451,
-44218=>9452,
-44222=>9453,
-44223=>9454,
-44224=>9455,
-44226=>9456,
-44227=>9457,
-44229=>9458,
-44230=>9459,
-44231=>9460,
-44233=>9461,
-44234=>9462,
-44235=>9463,
-44237=>9464,
-44238=>9465,
-44239=>9466,
-44240=>9467,
-44241=>9468,
-44242=>9469,
-44243=>9470,
-44244=>9471,
-44246=>9472,
-44248=>9473,
-44249=>9474,
-44250=>9475,
-44251=>9476,
-44252=>9477,
-44253=>9478,
-44254=>9479,
-44255=>9480,
-44258=>9481,
-44259=>9482,
-44261=>9483,
-44262=>9484,
-44265=>9485,
-44267=>9486,
-44269=>9487,
-44270=>9488,
-44274=>9489,
-44276=>9490,
-44279=>9491,
-44280=>9492,
-44281=>9493,
-44282=>9494,
-44283=>9495,
-44286=>9496,
-44287=>9497,
-44289=>9498,
-44290=>9499,
-44291=>9500,
-44293=>9501,
-44295=>9502,
-44296=>9503,
-44297=>9504,
-44298=>9505,
-44299=>9506,
-44302=>9507,
-44304=>9508,
-44306=>9509,
-44307=>9510,
-44308=>9511,
-44309=>9512,
-44310=>9513,
-44311=>9514,
-44313=>9515,
-44314=>9516,
-44315=>9517,
-44317=>9518,
-44318=>9519,
-44319=>9520,
-44321=>9521,
-44322=>9522,
-44323=>9523,
-44324=>9524,
-44325=>9525,
-44326=>9526,
-44327=>9527,
-44328=>9528,
-44330=>9529,
-44331=>9530,
-44334=>9531,
-44335=>9532,
-44336=>9533,
-44337=>9534,
-44338=>9535,
-44339=>9536,
-44342=>9537,
-44343=>9538,
-44345=>9539,
-44346=>9540,
-44347=>9541,
-44349=>9542,
-44350=>9543,
-44351=>9544,
-44352=>9545,
-44353=>9546,
-44354=>9547,
-44355=>9548,
-44358=>9549,
-44360=>9550,
-44362=>9551,
-44363=>9552,
-44364=>9553,
-44365=>9554,
-44366=>9555,
-44367=>9556,
-44369=>9557,
-44370=>9558,
-44371=>9559,
-44373=>9560,
-44374=>9561,
-44375=>9562,
-44377=>9563,
-44378=>9564,
-44379=>9565,
-44380=>9566,
-44381=>9567,
-44382=>9568,
-44383=>9569,
-44384=>9570,
-44386=>9571,
-44388=>9572,
-44389=>9573,
-44390=>9574,
-44391=>9575,
-44392=>9576,
-44393=>9577,
-44394=>9578,
-44395=>9579,
-44398=>9580,
-44399=>9581,
-44401=>9582,
-44402=>9583,
-44407=>9584,
-44408=>9585,
-44409=>9586,
-44410=>9587,
-44414=>9588,
-44416=>9589,
-44419=>9590,
-44420=>9591,
-44421=>9592,
-44422=>9593,
-44423=>9594,
-44426=>9595,
-44427=>9596,
-44429=>9597,
-44430=>9598,
-44431=>9599,
-44433=>9600,
-44434=>9601,
-44435=>9602,
-44436=>9603,
-44437=>9604,
-44438=>9605,
-44439=>9606,
-44440=>9607,
-44441=>9608,
-44442=>9609,
-44443=>9610,
-44446=>9611,
-44447=>9612,
-44448=>9613,
-44449=>9614,
-44450=>9615,
-44451=>9616,
-44453=>9617,
-44454=>9618,
-44455=>9619,
-44456=>9620,
-44457=>9621,
-44458=>9622,
-44459=>9623,
-44460=>9624,
-44461=>9625,
-44462=>9626,
-44463=>9627,
-44464=>9628,
-44465=>9629,
-44466=>9630,
-44467=>9631,
-44468=>9632,
-44469=>9633,
-44470=>9634,
-44472=>9635,
-44473=>9636,
-44474=>9637,
-44475=>9638,
-44476=>9639,
-44477=>9640,
-44478=>9641,
-44479=>9642,
-44482=>9643,
-44483=>9644,
-44485=>9645,
-44486=>9646,
-44487=>9647,
-44489=>9648,
-44490=>9649,
-44491=>9650,
-44492=>9651,
-44493=>9652,
-44494=>9653,
-44495=>9654,
-44498=>9655,
-44500=>9656,
-44501=>9657,
-44502=>9658,
-44503=>9659,
-44504=>9660,
-44505=>9661,
-44506=>9662,
-44507=>9663,
-44509=>9664,
-44510=>9665,
-44511=>9666,
-44513=>9667,
-44514=>9668,
-44515=>9669,
-44517=>9670,
-44518=>9671,
-44519=>9672,
-44520=>9673,
-44521=>9674,
-44522=>9675,
-44523=>9676,
-44524=>9677,
-44525=>9678,
-44526=>9679,
-44527=>9680,
-44528=>9681,
-44529=>9682,
-44530=>9683,
-44531=>9684,
-44532=>9685,
-44533=>9686,
-44534=>9687,
-44535=>9688,
-44538=>9689,
-44539=>9690,
-44541=>9691,
-44542=>9692,
-44546=>9693,
-44547=>9694,
-44548=>9695,
-44549=>9696,
-44550=>9697,
-44551=>9698,
-44554=>9699,
-44556=>9700,
-44558=>9701,
-44559=>9702,
-44560=>9703,
-44561=>9704,
-44562=>9705,
-44563=>9706,
-44565=>9707,
-44566=>9708,
-44567=>9709,
-44568=>9710,
-44569=>9711,
-44570=>9712,
-44571=>9713,
-44572=>9714,
-44573=>9715,
-44574=>9716,
-44575=>9717,
-44576=>9718,
-44577=>9719,
-44578=>9720,
-44579=>9721,
-44580=>9722,
-44581=>9723,
-44582=>9724,
-44583=>9725,
-44584=>9726,
-44585=>9727,
-44586=>9728,
-44587=>9729,
-44588=>9730,
-44589=>9731,
-44590=>9732,
-44591=>9733,
-44594=>9734,
-44595=>9735,
-44597=>9736,
-44598=>9737,
-44601=>9738,
-44603=>9739,
-44604=>9740,
-44605=>9741,
-44606=>9742,
-44607=>9743,
-44610=>9744,
-44612=>9745,
-44615=>9746,
-44616=>9747,
-44617=>9748,
-44619=>9749,
-44623=>9750,
-44625=>9751,
-44626=>9752,
-44627=>9753,
-44629=>9754,
-44631=>9755,
-44632=>9756,
-44633=>9757,
-44634=>9758,
-44635=>9759,
-44638=>9760,
-44642=>9761,
-44643=>9762,
-44644=>9763,
-44646=>9764,
-44647=>9765,
-44650=>9766,
-44651=>9767,
-44653=>9768,
-44654=>9769,
-44655=>9770,
-44657=>9771,
-44658=>9772,
-44659=>9773,
-44660=>9774,
-44661=>9775,
-44662=>9776,
-44663=>9777,
-44666=>9778,
-44670=>9779,
-44671=>9780,
-44672=>9781,
-44673=>9782,
-44674=>9783,
-44675=>9784,
-44678=>9785,
-44679=>9786,
-44680=>9787,
-44681=>9788,
-44682=>9789,
-44683=>9790,
-44685=>9791,
-44686=>9792,
-44687=>9793,
-44688=>9794,
-44689=>9795,
-44690=>9796,
-44691=>9797,
-44692=>9798,
-44693=>9799,
-44694=>9800,
-44695=>9801,
-44696=>9802,
-44697=>9803,
-44698=>9804,
-44699=>9805,
-44700=>9806,
-44701=>9807,
-44702=>9808,
-44703=>9809,
-44704=>9810,
-44705=>9811,
-44706=>9812,
-44707=>9813,
-44708=>9814,
-44709=>9815,
-44710=>9816,
-44711=>9817,
-44712=>9818,
-44713=>9819,
-44714=>9820,
-44715=>9821,
-44716=>9822,
-44717=>9823,
-44718=>9824,
-44719=>9825,
-44720=>9826,
-44721=>9827,
-44722=>9828,
-44723=>9829,
-44724=>9830,
-44725=>9831,
-44726=>9832,
-44727=>9833,
-44728=>9834,
-44729=>9835,
-44730=>9836,
-44731=>9837,
-44735=>9838,
-44737=>9839,
-44738=>9840,
-44739=>9841,
-44741=>9842,
-44742=>9843,
-44743=>9844,
-44744=>9845,
-44745=>9846,
-44746=>9847,
-44747=>9848,
-44750=>9849,
-44754=>9850,
-44755=>9851,
-44756=>9852,
-44757=>9853,
-44758=>9854,
-44759=>9855,
-44762=>9856,
-44763=>9857,
-44765=>9858,
-44766=>9859,
-44767=>9860,
-44768=>9861,
-44769=>9862,
-44770=>9863,
-44771=>9864,
-44772=>9865,
-44773=>9866,
-44774=>9867,
-44775=>9868,
-44777=>9869,
-44778=>9870,
-44780=>9871,
-44782=>9872,
-44783=>9873,
-44784=>9874,
-44785=>9875,
-44786=>9876,
-44787=>9877,
-44789=>9878,
-44790=>9879,
-44791=>9880,
-44793=>9881,
-44794=>9882,
-44795=>9883,
-44797=>9884,
-44798=>9885,
-44799=>9886,
-44800=>9887,
-44801=>9888,
-44802=>9889,
-44803=>9890,
-44804=>9891,
-44805=>9892,
-44806=>9893,
-44809=>9894,
-44810=>9895,
-44811=>9896,
-44812=>9897,
-44814=>9898,
-44815=>9899,
-44817=>9900,
-44818=>9901,
-44819=>9902,
-44820=>9903,
-44821=>9904,
-44822=>9905,
-44823=>9906,
-44824=>9907,
-44825=>9908,
-44826=>9909,
-44827=>9910,
-44828=>9911,
-44829=>9912,
-44830=>9913,
-44831=>9914,
-44832=>9915,
-44833=>9916,
-44834=>9917,
-44835=>9918,
-44836=>9919,
-44837=>9920,
-44838=>9921,
-44839=>9922,
-44840=>9923,
-44841=>9924,
-44842=>9925,
-44843=>9926,
-44846=>9927,
-44847=>9928,
-44849=>9929,
-44851=>9930,
-44853=>9931,
-44854=>9932,
-44855=>9933,
-44856=>9934,
-44857=>9935,
-44858=>9936,
-44859=>9937,
-44862=>9938,
-44864=>9939,
-44868=>9940,
-44869=>9941,
-44870=>9942,
-44871=>9943,
-44874=>9944,
-44875=>9945,
-44876=>9946,
-44877=>9947,
-44878=>9948,
-44879=>9949,
-44881=>9950,
-44882=>9951,
-44883=>9952,
-44884=>9953,
-44885=>9954,
-44886=>9955,
-44887=>9956,
-44888=>9957,
-44889=>9958,
-44890=>9959,
-44891=>9960,
-44894=>9961,
-44895=>9962,
-44896=>9963,
-44897=>9964,
-44898=>9965,
-44899=>9966,
-44902=>9967,
-44903=>9968,
-44904=>9969,
-44905=>9970,
-44906=>9971,
-44907=>9972,
-44908=>9973,
-44909=>9974,
-44910=>9975,
-44911=>9976,
-44912=>9977,
-44913=>9978,
-44914=>9979,
-44915=>9980,
-44916=>9981,
-44917=>9982,
-44918=>9983,
-44919=>9984,
-44920=>9985,
-44922=>9986,
-44923=>9987,
-44924=>9988,
-44925=>9989,
-44926=>9990,
-44927=>9991,
-44929=>9992,
-44930=>9993,
-44931=>9994,
-44933=>9995,
-44934=>9996,
-44935=>9997,
-44937=>9998,
-44938=>9999,
-44939=>10000,
-44940=>10001,
-44941=>10002,
-44942=>10003,
-44943=>10004,
-44946=>10005,
-44947=>10006,
-44948=>10007,
-44950=>10008,
-44951=>10009,
-44952=>10010,
-44953=>10011,
-44954=>10012,
-44955=>10013,
-44957=>10014,
-44958=>10015,
-44959=>10016,
-44960=>10017,
-44961=>10018,
-44962=>10019,
-44963=>10020,
-44964=>10021,
-44965=>10022,
-44966=>10023,
-44967=>10024,
-44968=>10025,
-44969=>10026,
-44970=>10027,
-44971=>10028,
-44972=>10029,
-44973=>10030,
-44974=>10031,
-44975=>10032,
-44976=>10033,
-44977=>10034,
-44978=>10035,
-44979=>10036,
-44980=>10037,
-44981=>10038,
-44982=>10039,
-44983=>10040,
-44986=>10041,
-44987=>10042,
-44989=>10043,
-44990=>10044,
-44991=>10045,
-44993=>10046,
-44994=>10047,
-44995=>10048,
-44996=>10049,
-44997=>10050,
-44998=>10051,
-45002=>10052,
-45004=>10053,
-45007=>10054,
-45008=>10055,
-45009=>10056,
-45010=>10057,
-45011=>10058,
-45013=>10059,
-45014=>10060,
-45015=>10061,
-45016=>10062,
-45017=>10063,
-45018=>10064,
-45019=>10065,
-45021=>10066,
-45022=>10067,
-45023=>10068,
-45024=>10069,
-45025=>10070,
-45026=>10071,
-45027=>10072,
-45028=>10073,
-45029=>10074,
-45030=>10075,
-45031=>10076,
-45034=>10077,
-45035=>10078,
-45036=>10079,
-45037=>10080,
-45038=>10081,
-45039=>10082,
-45042=>10083,
-45043=>10084,
-45045=>10085,
-45046=>10086,
-45047=>10087,
-45049=>10088,
-45050=>10089,
-45051=>10090,
-45052=>10091,
-45053=>10092,
-45054=>10093,
-45055=>10094,
-45058=>10095,
-45059=>10096,
-45061=>10097,
-45062=>10098,
-45063=>10099,
-45064=>10100,
-45065=>10101,
-45066=>10102,
-45067=>10103,
-45069=>10104,
-45070=>10105,
-45071=>10106,
-45073=>10107,
-45074=>10108,
-45075=>10109,
-45077=>10110,
-45078=>10111,
-45079=>10112,
-45080=>10113,
-45081=>10114,
-45082=>10115,
-45083=>10116,
-45086=>10117,
-45087=>10118,
-45088=>10119,
-45089=>10120,
-45090=>10121,
-45091=>10122,
-45092=>10123,
-45093=>10124,
-45094=>10125,
-45095=>10126,
-45097=>10127,
-45098=>10128,
-45099=>10129,
-45100=>10130,
-45101=>10131,
-45102=>10132,
-45103=>10133,
-45104=>10134,
-45105=>10135,
-45106=>10136,
-45107=>10137,
-45108=>10138,
-45109=>10139,
-45110=>10140,
-45111=>10141,
-45112=>10142,
-45113=>10143,
-45114=>10144,
-45115=>10145,
-45116=>10146,
-45117=>10147,
-45118=>10148,
-45119=>10149,
-45120=>10150,
-45121=>10151,
-45122=>10152,
-45123=>10153,
-45126=>10154,
-45127=>10155,
-45129=>10156,
-45131=>10157,
-45133=>10158,
-45135=>10159,
-45136=>10160,
-45137=>10161,
-45138=>10162,
-45142=>10163,
-45144=>10164,
-45146=>10165,
-45147=>10166,
-45148=>10167,
-45150=>10168,
-45151=>10169,
-45152=>10170,
-45153=>10171,
-45154=>10172,
-45155=>10173,
-45156=>10174,
-45157=>10175,
-45158=>10176,
-45159=>10177,
-45160=>10178,
-45161=>10179,
-45162=>10180,
-45163=>10181,
-45164=>10182,
-45165=>10183,
-45166=>10184,
-45167=>10185,
-45168=>10186,
-45169=>10187,
-45170=>10188,
-45171=>10189,
-45172=>10190,
-45173=>10191,
-45174=>10192,
-45175=>10193,
-45176=>10194,
-45177=>10195,
-45178=>10196,
-45179=>10197,
-45182=>10198,
-45183=>10199,
-45185=>10200,
-45186=>10201,
-45187=>10202,
-45189=>10203,
-45190=>10204,
-45191=>10205,
-45192=>10206,
-45193=>10207,
-45194=>10208,
-45195=>10209,
-45198=>10210,
-45200=>10211,
-45202=>10212,
-45203=>10213,
-45204=>10214,
-45205=>10215,
-45206=>10216,
-45207=>10217,
-45211=>10218,
-45213=>10219,
-45214=>10220,
-45219=>10221,
-45220=>10222,
-45221=>10223,
-45222=>10224,
-45223=>10225,
-45226=>10226,
-45232=>10227,
-45234=>10228,
-45238=>10229,
-45239=>10230,
-45241=>10231,
-45242=>10232,
-45243=>10233,
-45245=>10234,
-45246=>10235,
-45247=>10236,
-45248=>10237,
-45249=>10238,
-45250=>10239,
-45251=>10240,
-45254=>10241,
-45258=>10242,
-45259=>10243,
-45260=>10244,
-45261=>10245,
-45262=>10246,
-45263=>10247,
-45266=>10248,
-45267=>10249,
-45269=>10250,
-45270=>10251,
-45271=>10252,
-45273=>10253,
-45274=>10254,
-45275=>10255,
-45276=>10256,
-45277=>10257,
-45278=>10258,
-45279=>10259,
-45281=>10260,
-45282=>10261,
-45283=>10262,
-45284=>10263,
-45286=>10264,
-45287=>10265,
-45288=>10266,
-45289=>10267,
-45290=>10268,
-45291=>10269,
-45292=>10270,
-45293=>10271,
-45294=>10272,
-45295=>10273,
-45296=>10274,
-45297=>10275,
-45298=>10276,
-45299=>10277,
-45300=>10278,
-45301=>10279,
-45302=>10280,
-45303=>10281,
-45304=>10282,
-45305=>10283,
-45306=>10284,
-45307=>10285,
-45308=>10286,
-45309=>10287,
-45310=>10288,
-45311=>10289,
-45312=>10290,
-45313=>10291,
-45314=>10292,
-45315=>10293,
-45316=>10294,
-45317=>10295,
-45318=>10296,
-45319=>10297,
-45322=>10298,
-45325=>10299,
-45326=>10300,
-45327=>10301,
-45329=>10302,
-45332=>10303,
-45333=>10304,
-45334=>10305,
-45335=>10306,
-45338=>10307,
-45342=>10308,
-45343=>10309,
-45344=>10310,
-45345=>10311,
-45346=>10312,
-45350=>10313,
-45351=>10314,
-45353=>10315,
-45354=>10316,
-45355=>10317,
-45357=>10318,
-45358=>10319,
-45359=>10320,
-45360=>10321,
-45361=>10322,
-45362=>10323,
-45363=>10324,
-45366=>10325,
-45370=>10326,
-45371=>10327,
-45372=>10328,
-45373=>10329,
-45374=>10330,
-45375=>10331,
-45378=>10332,
-45379=>10333,
-45381=>10334,
-45382=>10335,
-45383=>10336,
-45385=>10337,
-45386=>10338,
-45387=>10339,
-45388=>10340,
-45389=>10341,
-45390=>10342,
-45391=>10343,
-45394=>10344,
-45395=>10345,
-45398=>10346,
-45399=>10347,
-45401=>10348,
-45402=>10349,
-45403=>10350,
-45405=>10351,
-45406=>10352,
-45407=>10353,
-45409=>10354,
-45410=>10355,
-45411=>10356,
-45412=>10357,
-45413=>10358,
-45414=>10359,
-45415=>10360,
-45416=>10361,
-45417=>10362,
-45418=>10363,
-45419=>10364,
-45420=>10365,
-45421=>10366,
-45422=>10367,
-45423=>10368,
-45424=>10369,
-45425=>10370,
-45426=>10371,
-45427=>10372,
-45428=>10373,
-45429=>10374,
-45430=>10375,
-45431=>10376,
-45434=>10377,
-45435=>10378,
-45437=>10379,
-45438=>10380,
-45439=>10381,
-45441=>10382,
-45443=>10383,
-45444=>10384,
-45445=>10385,
-45446=>10386,
-45447=>10387,
-45450=>10388,
-45452=>10389,
-45454=>10390,
-45455=>10391,
-45456=>10392,
-45457=>10393,
-45461=>10394,
-45462=>10395,
-45463=>10396,
-45465=>10397,
-45466=>10398,
-45467=>10399,
-45469=>10400,
-45470=>10401,
-45471=>10402,
-45472=>10403,
-45473=>10404,
-45474=>10405,
-45475=>10406,
-45476=>10407,
-45477=>10408,
-45478=>10409,
-45479=>10410,
-45481=>10411,
-45482=>10412,
-45483=>10413,
-45484=>10414,
-45485=>10415,
-45486=>10416,
-45487=>10417,
-45488=>10418,
-45489=>10419,
-45490=>10420,
-45491=>10421,
-45492=>10422,
-45493=>10423,
-45494=>10424,
-45495=>10425,
-45496=>10426,
-45497=>10427,
-45498=>10428,
-45499=>10429,
-45500=>10430,
-45501=>10431,
-45502=>10432,
-45503=>10433,
-45504=>10434,
-45505=>10435,
-45506=>10436,
-45507=>10437,
-45508=>10438,
-45509=>10439,
-45510=>10440,
-45511=>10441,
-45512=>10442,
-45513=>10443,
-45514=>10444,
-45515=>10445,
-45517=>10446,
-45518=>10447,
-45519=>10448,
-45521=>10449,
-45522=>10450,
-45523=>10451,
-45525=>10452,
-45526=>10453,
-45527=>10454,
-45528=>10455,
-45529=>10456,
-45530=>10457,
-45531=>10458,
-45534=>10459,
-45536=>10460,
-45537=>10461,
-45538=>10462,
-45539=>10463,
-45540=>10464,
-45541=>10465,
-45542=>10466,
-45543=>10467,
-45546=>10468,
-45547=>10469,
-45549=>10470,
-45550=>10471,
-45551=>10472,
-45553=>10473,
-45554=>10474,
-45555=>10475,
-45556=>10476,
-45557=>10477,
-45558=>10478,
-45559=>10479,
-45560=>10480,
-45562=>10481,
-45564=>10482,
-45566=>10483,
-45567=>10484,
-45568=>10485,
-45569=>10486,
-45570=>10487,
-45571=>10488,
-45574=>10489,
-45575=>10490,
-45577=>10491,
-45578=>10492,
-45581=>10493,
-45582=>10494,
-45583=>10495,
-45584=>10496,
-45585=>10497,
-45586=>10498,
-45587=>10499,
-45590=>10500,
-45592=>10501,
-45594=>10502,
-45595=>10503,
-45596=>10504,
-45597=>10505,
-45598=>10506,
-45599=>10507,
-45601=>10508,
-45602=>10509,
-45603=>10510,
-45604=>10511,
-45605=>10512,
-45606=>10513,
-45607=>10514,
-45608=>10515,
-45609=>10516,
-45610=>10517,
-45611=>10518,
-45612=>10519,
-45613=>10520,
-45614=>10521,
-45615=>10522,
-45616=>10523,
-45617=>10524,
-45618=>10525,
-45619=>10526,
-45621=>10527,
-45622=>10528,
-45623=>10529,
-45624=>10530,
-45625=>10531,
-45626=>10532,
-45627=>10533,
-45629=>10534,
-45630=>10535,
-45631=>10536,
-45632=>10537,
-45633=>10538,
-45634=>10539,
-45635=>10540,
-45636=>10541,
-45637=>10542,
-45638=>10543,
-45639=>10544,
-45640=>10545,
-45641=>10546,
-45642=>10547,
-45643=>10548,
-45644=>10549,
-45645=>10550,
-45646=>10551,
-45647=>10552,
-45648=>10553,
-45649=>10554,
-45650=>10555,
-45651=>10556,
-45652=>10557,
-45653=>10558,
-45654=>10559,
-45655=>10560,
-45657=>10561,
-45658=>10562,
-45659=>10563,
-45661=>10564,
-45662=>10565,
-45663=>10566,
-45665=>10567,
-45666=>10568,
-45667=>10569,
-45668=>10570,
-45669=>10571,
-45670=>10572,
-45671=>10573,
-45674=>10574,
-45675=>10575,
-45676=>10576,
-45677=>10577,
-45678=>10578,
-45679=>10579,
-45680=>10580,
-45681=>10581,
-45682=>10582,
-45683=>10583,
-45686=>10584,
-45687=>10585,
-45688=>10586,
-45689=>10587,
-45690=>10588,
-45691=>10589,
-45693=>10590,
-45694=>10591,
-45695=>10592,
-45696=>10593,
-45697=>10594,
-45698=>10595,
-45699=>10596,
-45702=>10597,
-45703=>10598,
-45704=>10599,
-45706=>10600,
-45707=>10601,
-45708=>10602,
-45709=>10603,
-45710=>10604,
-45711=>10605,
-45714=>10606,
-45715=>10607,
-45717=>10608,
-45718=>10609,
-45719=>10610,
-45723=>10611,
-45724=>10612,
-45725=>10613,
-45726=>10614,
-45727=>10615,
-45730=>10616,
-45732=>10617,
-45735=>10618,
-45736=>10619,
-45737=>10620,
-45739=>10621,
-45741=>10622,
-45742=>10623,
-45743=>10624,
-45745=>10625,
-45746=>10626,
-45747=>10627,
-45749=>10628,
-45750=>10629,
-45751=>10630,
-45752=>10631,
-45753=>10632,
-45754=>10633,
-45755=>10634,
-45756=>10635,
-45757=>10636,
-45758=>10637,
-45759=>10638,
-45760=>10639,
-45761=>10640,
-45762=>10641,
-45763=>10642,
-45764=>10643,
-45765=>10644,
-45766=>10645,
-45767=>10646,
-45770=>10647,
-45771=>10648,
-45773=>10649,
-45774=>10650,
-45775=>10651,
-45777=>10652,
-45779=>10653,
-45780=>10654,
-45781=>10655,
-45782=>10656,
-45783=>10657,
-45786=>10658,
-45788=>10659,
-45790=>10660,
-45791=>10661,
-45792=>10662,
-45793=>10663,
-45795=>10664,
-45799=>10665,
-45801=>10666,
-45802=>10667,
-45808=>10668,
-45809=>10669,
-45810=>10670,
-45814=>10671,
-45820=>10672,
-45821=>10673,
-45822=>10674,
-45826=>10675,
-45827=>10676,
-45829=>10677,
-45830=>10678,
-45831=>10679,
-45833=>10680,
-45834=>10681,
-45835=>10682,
-45836=>10683,
-45837=>10684,
-45838=>10685,
-45839=>10686,
-45842=>10687,
-45846=>10688,
-45847=>10689,
-45848=>10690,
-45849=>10691,
-45850=>10692,
-45851=>10693,
-45853=>10694,
-45854=>10695,
-45855=>10696,
-45856=>10697,
-45857=>10698,
-45858=>10699,
-45859=>10700,
-45860=>10701,
-45861=>10702,
-45862=>10703,
-45863=>10704,
-45864=>10705,
-45865=>10706,
-45866=>10707,
-45867=>10708,
-45868=>10709,
-45869=>10710,
-45870=>10711,
-45871=>10712,
-45872=>10713,
-45873=>10714,
-45874=>10715,
-45875=>10716,
-45876=>10717,
-45877=>10718,
-45878=>10719,
-45879=>10720,
-45880=>10721,
-45881=>10722,
-45882=>10723,
-45883=>10724,
-45884=>10725,
-45885=>10726,
-45886=>10727,
-45887=>10728,
-45888=>10729,
-45889=>10730,
-45890=>10731,
-45891=>10732,
-45892=>10733,
-45893=>10734,
-45894=>10735,
-45895=>10736,
-45896=>10737,
-45897=>10738,
-45898=>10739,
-45899=>10740,
-45900=>10741,
-45901=>10742,
-45902=>10743,
-45903=>10744,
-45904=>10745,
-45905=>10746,
-45906=>10747,
-45907=>10748,
-45911=>10749,
-45913=>10750,
-45914=>10751,
-45917=>10752,
-45920=>10753,
-45921=>10754,
-45922=>10755,
-45923=>10756,
-45926=>10757,
-45928=>10758,
-45930=>10759,
-45932=>10760,
-45933=>10761,
-45935=>10762,
-45938=>10763,
-45939=>10764,
-45941=>10765,
-45942=>10766,
-45943=>10767,
-45945=>10768,
-45946=>10769,
-45947=>10770,
-45948=>10771,
-45949=>10772,
-45950=>10773,
-45951=>10774,
-45954=>10775,
-45958=>10776,
-45959=>10777,
-45960=>10778,
-45961=>10779,
-45962=>10780,
-45963=>10781,
-45965=>10782,
-45966=>10783,
-45967=>10784,
-45969=>10785,
-45970=>10786,
-45971=>10787,
-45973=>10788,
-45974=>10789,
-45975=>10790,
-45976=>10791,
-45977=>10792,
-45978=>10793,
-45979=>10794,
-45980=>10795,
-45981=>10796,
-45982=>10797,
-45983=>10798,
-45986=>10799,
-45987=>10800,
-45988=>10801,
-45989=>10802,
-45990=>10803,
-45991=>10804,
-45993=>10805,
-45994=>10806,
-45995=>10807,
-45997=>10808,
-45998=>10809,
-45999=>10810,
-46000=>10811,
-46001=>10812,
-46002=>10813,
-46003=>10814,
-46004=>10815,
-46005=>10816,
-46006=>10817,
-46007=>10818,
-46008=>10819,
-46009=>10820,
-46010=>10821,
-46011=>10822,
-46012=>10823,
-46013=>10824,
-46014=>10825,
-46015=>10826,
-46016=>10827,
-46017=>10828,
-46018=>10829,
-46019=>10830,
-46022=>10831,
-46023=>10832,
-46025=>10833,
-46026=>10834,
-46029=>10835,
-46031=>10836,
-46033=>10837,
-46034=>10838,
-46035=>10839,
-46038=>10840,
-46040=>10841,
-46042=>10842,
-46044=>10843,
-46046=>10844,
-46047=>10845,
-46049=>10846,
-46050=>10847,
-46051=>10848,
-46053=>10849,
-46054=>10850,
-46055=>10851,
-46057=>10852,
-46058=>10853,
-46059=>10854,
-46060=>10855,
-46061=>10856,
-46062=>10857,
-46063=>10858,
-46064=>10859,
-46065=>10860,
-46066=>10861,
-46067=>10862,
-46068=>10863,
-46069=>10864,
-46070=>10865,
-46071=>10866,
-46072=>10867,
-46073=>10868,
-46074=>10869,
-46075=>10870,
-46077=>10871,
-46078=>10872,
-46079=>10873,
-46080=>10874,
-46081=>10875,
-46082=>10876,
-46083=>10877,
-46084=>10878,
-46085=>10879,
-46086=>10880,
-46087=>10881,
-46088=>10882,
-46089=>10883,
-46090=>10884,
-46091=>10885,
-46092=>10886,
-46093=>10887,
-46094=>10888,
-46095=>10889,
-46097=>10890,
-46098=>10891,
-46099=>10892,
-46100=>10893,
-46101=>10894,
-46102=>10895,
-46103=>10896,
-46105=>10897,
-46106=>10898,
-46107=>10899,
-46109=>10900,
-46110=>10901,
-46111=>10902,
-46113=>10903,
-46114=>10904,
-46115=>10905,
-46116=>10906,
-46117=>10907,
-46118=>10908,
-46119=>10909,
-46122=>10910,
-46124=>10911,
-46125=>10912,
-46126=>10913,
-46127=>10914,
-46128=>10915,
-46129=>10916,
-46130=>10917,
-46131=>10918,
-46133=>10919,
-46134=>10920,
-46135=>10921,
-46136=>10922,
-46137=>10923,
-46138=>10924,
-46139=>10925,
-46140=>10926,
-46141=>10927,
-46142=>10928,
-46143=>10929,
-46144=>10930,
-46145=>10931,
-46146=>10932,
-46147=>10933,
-46148=>10934,
-46149=>10935,
-46150=>10936,
-46151=>10937,
-46152=>10938,
-46153=>10939,
-46154=>10940,
-46155=>10941,
-46156=>10942,
-46157=>10943,
-46158=>10944,
-46159=>10945,
-46162=>10946,
-46163=>10947,
-46165=>10948,
-46166=>10949,
-46167=>10950,
-46169=>10951,
-46170=>10952,
-46171=>10953,
-46172=>10954,
-46173=>10955,
-46174=>10956,
-46175=>10957,
-46178=>10958,
-46180=>10959,
-46182=>10960,
-46183=>10961,
-46184=>10962,
-46185=>10963,
-46186=>10964,
-46187=>10965,
-46189=>10966,
-46190=>10967,
-46191=>10968,
-46192=>10969,
-46193=>10970,
-46194=>10971,
-46195=>10972,
-46196=>10973,
-46197=>10974,
-46198=>10975,
-46199=>10976,
-46200=>10977,
-46201=>10978,
-46202=>10979,
-46203=>10980,
-46204=>10981,
-46205=>10982,
-46206=>10983,
-46207=>10984,
-46209=>10985,
-46210=>10986,
-46211=>10987,
-46212=>10988,
-46213=>10989,
-46214=>10990,
-46215=>10991,
-46217=>10992,
-46218=>10993,
-46219=>10994,
-46220=>10995,
-46221=>10996,
-46222=>10997,
-46223=>10998,
-46224=>10999,
-46225=>11000,
-46226=>11001,
-46227=>11002,
-46228=>11003,
-46229=>11004,
-46230=>11005,
-46231=>11006,
-46232=>11007,
-46233=>11008,
-46234=>11009,
-46235=>11010,
-46236=>11011,
-46238=>11012,
-46239=>11013,
-46240=>11014,
-46241=>11015,
-46242=>11016,
-46243=>11017,
-46245=>11018,
-46246=>11019,
-46247=>11020,
-46249=>11021,
-46250=>11022,
-46251=>11023,
-46253=>11024,
-46254=>11025,
-46255=>11026,
-46256=>11027,
-46257=>11028,
-46258=>11029,
-46259=>11030,
-46260=>11031,
-46262=>11032,
-46264=>11033,
-46266=>11034,
-46267=>11035,
-46268=>11036,
-46269=>11037,
-46270=>11038,
-46271=>11039,
-46273=>11040,
-46274=>11041,
-46275=>11042,
-46277=>11043,
-46278=>11044,
-46279=>11045,
-46281=>11046,
-46282=>11047,
-46283=>11048,
-46284=>11049,
-46285=>11050,
-46286=>11051,
-46287=>11052,
-46289=>11053,
-46290=>11054,
-46291=>11055,
-46292=>11056,
-46294=>11057,
-46295=>11058,
-46296=>11059,
-46297=>11060,
-46298=>11061,
-46299=>11062,
-46302=>11063,
-46303=>11064,
-46305=>11065,
-46306=>11066,
-46309=>11067,
-46311=>11068,
-46312=>11069,
-46313=>11070,
-46314=>11071,
-46315=>11072,
-46318=>11073,
-46320=>11074,
-46322=>11075,
-46323=>11076,
-46324=>11077,
-46325=>11078,
-46326=>11079,
-46327=>11080,
-46329=>11081,
-46330=>11082,
-46331=>11083,
-46332=>11084,
-46333=>11085,
-46334=>11086,
-46335=>11087,
-46336=>11088,
-46337=>11089,
-46338=>11090,
-46339=>11091,
-46340=>11092,
-46341=>11093,
-46342=>11094,
-46343=>11095,
-46344=>11096,
-46345=>11097,
-46346=>11098,
-46347=>11099,
-46348=>11100,
-46349=>11101,
-46350=>11102,
-46351=>11103,
-46352=>11104,
-46353=>11105,
-46354=>11106,
-46355=>11107,
-46358=>11108,
-46359=>11109,
-46361=>11110,
-46362=>11111,
-46365=>11112,
-46366=>11113,
-46367=>11114,
-46368=>11115,
-46369=>11116,
-46370=>11117,
-46371=>11118,
-46374=>11119,
-46379=>11120,
-46380=>11121,
-46381=>11122,
-46382=>11123,
-46383=>11124,
-46386=>11125,
-46387=>11126,
-46389=>11127,
-46390=>11128,
-46391=>11129,
-46393=>11130,
-46394=>11131,
-46395=>11132,
-46396=>11133,
-46397=>11134,
-46398=>11135,
-46399=>11136,
-46402=>11137,
-46406=>11138,
-46407=>11139,
-46408=>11140,
-46409=>11141,
-46410=>11142,
-46414=>11143,
-46415=>11144,
-46417=>11145,
-46418=>11146,
-46419=>11147,
-46421=>11148,
-46422=>11149,
-46423=>11150,
-46424=>11151,
-46425=>11152,
-46426=>11153,
-46427=>11154,
-46430=>11155,
-46434=>11156,
-46435=>11157,
-46436=>11158,
-46437=>11159,
-46438=>11160,
-46439=>11161,
-46440=>11162,
-46441=>11163,
-46442=>11164,
-46443=>11165,
-46444=>11166,
-46445=>11167,
-46446=>11168,
-46447=>11169,
-46448=>11170,
-46449=>11171,
-46450=>11172,
-46451=>11173,
-46452=>11174,
-46453=>11175,
-46454=>11176,
-46455=>11177,
-46456=>11178,
-46457=>11179,
-46458=>11180,
-46459=>11181,
-46460=>11182,
-46461=>11183,
-46462=>11184,
-46463=>11185,
-46464=>11186,
-46465=>11187,
-46466=>11188,
-46467=>11189,
-46468=>11190,
-46469=>11191,
-46470=>11192,
-46471=>11193,
-46472=>11194,
-46473=>11195,
-46474=>11196,
-46475=>11197,
-46476=>11198,
-46477=>11199,
-46478=>11200,
-46479=>11201,
-46480=>11202,
-46481=>11203,
-46482=>11204,
-46483=>11205,
-46484=>11206,
-46485=>11207,
-46486=>11208,
-46487=>11209,
-46488=>11210,
-46489=>11211,
-46490=>11212,
-46491=>11213,
-46492=>11214,
-46493=>11215,
-46494=>11216,
-46495=>11217,
-46498=>11218,
-46499=>11219,
-46501=>11220,
-46502=>11221,
-46503=>11222,
-46505=>11223,
-46508=>11224,
-46509=>11225,
-46510=>11226,
-46511=>11227,
-46514=>11228,
-46518=>11229,
-46519=>11230,
-46520=>11231,
-46521=>11232,
-46522=>11233,
-46526=>11234,
-46527=>11235,
-46529=>11236,
-46530=>11237,
-46531=>11238,
-46533=>11239,
-46534=>11240,
-46535=>11241,
-46536=>11242,
-46537=>11243,
-46538=>11244,
-46539=>11245,
-46542=>11246,
-46546=>11247,
-46547=>11248,
-46548=>11249,
-46549=>11250,
-46550=>11251,
-46551=>11252,
-46553=>11253,
-46554=>11254,
-46555=>11255,
-46556=>11256,
-46557=>11257,
-46558=>11258,
-46559=>11259,
-46560=>11260,
-46561=>11261,
-46562=>11262,
-46563=>11263,
-46564=>11264,
-46565=>11265,
-46566=>11266,
-46567=>11267,
-46568=>11268,
-46569=>11269,
-46570=>11270,
-46571=>11271,
-46573=>11272,
-46574=>11273,
-46575=>11274,
-46576=>11275,
-46577=>11276,
-46578=>11277,
-46579=>11278,
-46580=>11279,
-46581=>11280,
-46582=>11281,
-46583=>11282,
-46584=>11283,
-46585=>11284,
-46586=>11285,
-46587=>11286,
-46588=>11287,
-46589=>11288,
-46590=>11289,
-46591=>11290,
-46592=>11291,
-46593=>11292,
-46594=>11293,
-46595=>11294,
-46596=>11295,
-46597=>11296,
-46598=>11297,
-46599=>11298,
-46600=>11299,
-46601=>11300,
-46602=>11301,
-46603=>11302,
-46604=>11303,
-46605=>11304,
-46606=>11305,
-46607=>11306,
-46610=>11307,
-46611=>11308,
-46613=>11309,
-46614=>11310,
-46615=>11311,
-46617=>11312,
-46618=>11313,
-46619=>11314,
-46620=>11315,
-46621=>11316,
-46622=>11317,
-46623=>11318,
-46624=>11319,
-46625=>11320,
-46626=>11321,
-46627=>11322,
-46628=>11323,
-46630=>11324,
-46631=>11325,
-46632=>11326,
-46633=>11327,
-46634=>11328,
-46635=>11329,
-46637=>11330,
-46638=>11331,
-46639=>11332,
-46640=>11333,
-46641=>11334,
-46642=>11335,
-46643=>11336,
-46645=>11337,
-46646=>11338,
-46647=>11339,
-46648=>11340,
-46649=>11341,
-46650=>11342,
-46651=>11343,
-46652=>11344,
-46653=>11345,
-46654=>11346,
-46655=>11347,
-46656=>11348,
-46657=>11349,
-46658=>11350,
-46659=>11351,
-46660=>11352,
-46661=>11353,
-46662=>11354,
-46663=>11355,
-46665=>11356,
-46666=>11357,
-46667=>11358,
-46668=>11359,
-46669=>11360,
-46670=>11361,
-46671=>11362,
-46672=>11363,
-46673=>11364,
-46674=>11365,
-46675=>11366,
-46676=>11367,
-46677=>11368,
-46678=>11369,
-46679=>11370,
-46680=>11371,
-46681=>11372,
-46682=>11373,
-46683=>11374,
-46684=>11375,
-46685=>11376,
-46686=>11377,
-46687=>11378,
-46688=>11379,
-46689=>11380,
-46690=>11381,
-46691=>11382,
-46693=>11383,
-46694=>11384,
-46695=>11385,
-46697=>11386,
-46698=>11387,
-46699=>11388,
-46700=>11389,
-46701=>11390,
-46702=>11391,
-46703=>11392,
-46704=>11393,
-46705=>11394,
-46706=>11395,
-46707=>11396,
-46708=>11397,
-46709=>11398,
-46710=>11399,
-46711=>11400,
-46712=>11401,
-46713=>11402,
-46714=>11403,
-46715=>11404,
-46716=>11405,
-46717=>11406,
-46718=>11407,
-46719=>11408,
-46720=>11409,
-46721=>11410,
-46722=>11411,
-46723=>11412,
-46724=>11413,
-46725=>11414,
-46726=>11415,
-46727=>11416,
-46728=>11417,
-46729=>11418,
-46730=>11419,
-46731=>11420,
-46732=>11421,
-46733=>11422,
-46734=>11423,
-46735=>11424,
-46736=>11425,
-46737=>11426,
-46738=>11427,
-46739=>11428,
-46740=>11429,
-46741=>11430,
-46742=>11431,
-46743=>11432,
-46744=>11433,
-46745=>11434,
-46746=>11435,
-46747=>11436,
-46750=>11437,
-46751=>11438,
-46753=>11439,
-46754=>11440,
-46755=>11441,
-46757=>11442,
-46758=>11443,
-46759=>11444,
-46760=>11445,
-46761=>11446,
-46762=>11447,
-46765=>11448,
-46766=>11449,
-46767=>11450,
-46768=>11451,
-46770=>11452,
-46771=>11453,
-46772=>11454,
-46773=>11455,
-46774=>11456,
-46775=>11457,
-46776=>11458,
-46777=>11459,
-46778=>11460,
-46779=>11461,
-46780=>11462,
-46781=>11463,
-46782=>11464,
-46783=>11465,
-46784=>11466,
-46785=>11467,
-46786=>11468,
-46787=>11469,
-46788=>11470,
-46789=>11471,
-46790=>11472,
-46791=>11473,
-46792=>11474,
-46793=>11475,
-46794=>11476,
-46795=>11477,
-46796=>11478,
-46797=>11479,
-46798=>11480,
-46799=>11481,
-46800=>11482,
-46801=>11483,
-46802=>11484,
-46803=>11485,
-46805=>11486,
-46806=>11487,
-46807=>11488,
-46808=>11489,
-46809=>11490,
-46810=>11491,
-46811=>11492,
-46812=>11493,
-46813=>11494,
-46814=>11495,
-46815=>11496,
-46816=>11497,
-46817=>11498,
-46818=>11499,
-46819=>11500,
-46820=>11501,
-46821=>11502,
-46822=>11503,
-46823=>11504,
-46824=>11505,
-46825=>11506,
-46826=>11507,
-46827=>11508,
-46828=>11509,
-46829=>11510,
-46830=>11511,
-46831=>11512,
-46833=>11513,
-46834=>11514,
-46835=>11515,
-46837=>11516,
-46838=>11517,
-46839=>11518,
-46841=>11519,
-46842=>11520,
-46843=>11521,
-46844=>11522,
-46845=>11523,
-46846=>11524,
-46847=>11525,
-46850=>11526,
-46851=>11527,
-46852=>11528,
-46854=>11529,
-46855=>11530,
-46856=>11531,
-46857=>11532,
-46858=>11533,
-46859=>11534,
-46860=>11535,
-46861=>11536,
-46862=>11537,
-46863=>11538,
-46864=>11539,
-46865=>11540,
-46866=>11541,
-46867=>11542,
-46868=>11543,
-46869=>11544,
-46870=>11545,
-46871=>11546,
-46872=>11547,
-46873=>11548,
-46874=>11549,
-46875=>11550,
-46876=>11551,
-46877=>11552,
-46878=>11553,
-46879=>11554,
-46880=>11555,
-46881=>11556,
-46882=>11557,
-46883=>11558,
-46884=>11559,
-46885=>11560,
-46886=>11561,
-46887=>11562,
-46890=>11563,
-46891=>11564,
-46893=>11565,
-46894=>11566,
-46897=>11567,
-46898=>11568,
-46899=>11569,
-46900=>11570,
-46901=>11571,
-46902=>11572,
-46903=>11573,
-46906=>11574,
-46908=>11575,
-46909=>11576,
-46910=>11577,
-46911=>11578,
-46912=>11579,
-46913=>11580,
-46914=>11581,
-46915=>11582,
-46917=>11583,
-46918=>11584,
-46919=>11585,
-46921=>11586,
-46922=>11587,
-46923=>11588,
-46925=>11589,
-46926=>11590,
-46927=>11591,
-46928=>11592,
-46929=>11593,
-46930=>11594,
-46931=>11595,
-46934=>11596,
-46935=>11597,
-46936=>11598,
-46937=>11599,
-46938=>11600,
-46939=>11601,
-46940=>11602,
-46941=>11603,
-46942=>11604,
-46943=>11605,
-46945=>11606,
-46946=>11607,
-46947=>11608,
-46949=>11609,
-46950=>11610,
-46951=>11611,
-46953=>11612,
-46954=>11613,
-46955=>11614,
-46956=>11615,
-46957=>11616,
-46958=>11617,
-46959=>11618,
-46962=>11619,
-46964=>11620,
-46966=>11621,
-46967=>11622,
-46968=>11623,
-46969=>11624,
-46970=>11625,
-46971=>11626,
-46974=>11627,
-46975=>11628,
-46977=>11629,
-46978=>11630,
-46979=>11631,
-46981=>11632,
-46982=>11633,
-46983=>11634,
-46984=>11635,
-46985=>11636,
-46986=>11637,
-46987=>11638,
-46990=>11639,
-46995=>11640,
-46996=>11641,
-46997=>11642,
-47002=>11643,
-47003=>11644,
-47005=>11645,
-47006=>11646,
-47007=>11647,
-47009=>11648,
-47010=>11649,
-47011=>11650,
-47012=>11651,
-47013=>11652,
-47014=>11653,
-47015=>11654,
-47018=>11655,
-47022=>11656,
-47023=>11657,
-47024=>11658,
-47025=>11659,
-47026=>11660,
-47027=>11661,
-47030=>11662,
-47031=>11663,
-47033=>11664,
-47034=>11665,
-47035=>11666,
-47036=>11667,
-47037=>11668,
-47038=>11669,
-47039=>11670,
-47040=>11671,
-47041=>11672,
-47042=>11673,
-47043=>11674,
-47044=>11675,
-47045=>11676,
-47046=>11677,
-47048=>11678,
-47050=>11679,
-47051=>11680,
-47052=>11681,
-47053=>11682,
-47054=>11683,
-47055=>11684,
-47056=>11685,
-47057=>11686,
-47058=>11687,
-47059=>11688,
-47060=>11689,
-47061=>11690,
-47062=>11691,
-47063=>11692,
-47064=>11693,
-47065=>11694,
-47066=>11695,
-47067=>11696,
-47068=>11697,
-47069=>11698,
-47070=>11699,
-47071=>11700,
-47072=>11701,
-47073=>11702,
-47074=>11703,
-47075=>11704,
-47076=>11705,
-47077=>11706,
-47078=>11707,
-47079=>11708,
-47080=>11709,
-47081=>11710,
-47082=>11711,
-47083=>11712,
-47086=>11713,
-47087=>11714,
-47089=>11715,
-47090=>11716,
-47091=>11717,
-47093=>11718,
-47094=>11719,
-47095=>11720,
-47096=>11721,
-47097=>11722,
-47098=>11723,
-47099=>11724,
-47102=>11725,
-47106=>11726,
-47107=>11727,
-47108=>11728,
-47109=>11729,
-47110=>11730,
-47114=>11731,
-47115=>11732,
-47117=>11733,
-47118=>11734,
-47119=>11735,
-47121=>11736,
-47122=>11737,
-47123=>11738,
-47124=>11739,
-47125=>11740,
-47126=>11741,
-47127=>11742,
-47130=>11743,
-47132=>11744,
-47134=>11745,
-47135=>11746,
-47136=>11747,
-47137=>11748,
-47138=>11749,
-47139=>11750,
-47142=>11751,
-47143=>11752,
-47145=>11753,
-47146=>11754,
-47147=>11755,
-47149=>11756,
-47150=>11757,
-47151=>11758,
-47152=>11759,
-47153=>11760,
-47154=>11761,
-47155=>11762,
-47158=>11763,
-47162=>11764,
-47163=>11765,
-47164=>11766,
-47165=>11767,
-47166=>11768,
-47167=>11769,
-47169=>11770,
-47170=>11771,
-47171=>11772,
-47173=>11773,
-47174=>11774,
-47175=>11775,
-47176=>11776,
-47177=>11777,
-47178=>11778,
-47179=>11779,
-47180=>11780,
-47181=>11781,
-47182=>11782,
-47183=>11783,
-47184=>11784,
-47186=>11785,
-47188=>11786,
-47189=>11787,
-47190=>11788,
-47191=>11789,
-47192=>11790,
-47193=>11791,
-47194=>11792,
-47195=>11793,
-47198=>11794,
-47199=>11795,
-47201=>11796,
-47202=>11797,
-47203=>11798,
-47205=>11799,
-47206=>11800,
-47207=>11801,
-47208=>11802,
-47209=>11803,
-47210=>11804,
-47211=>11805,
-47214=>11806,
-47216=>11807,
-47218=>11808,
-47219=>11809,
-47220=>11810,
-47221=>11811,
-47222=>11812,
-47223=>11813,
-47225=>11814,
-47226=>11815,
-47227=>11816,
-47229=>11817,
-47230=>11818,
-47231=>11819,
-47232=>11820,
-47233=>11821,
-47234=>11822,
-47235=>11823,
-47236=>11824,
-47237=>11825,
-47238=>11826,
-47239=>11827,
-47240=>11828,
-47241=>11829,
-47242=>11830,
-47243=>11831,
-47244=>11832,
-47246=>11833,
-47247=>11834,
-47248=>11835,
-47249=>11836,
-47250=>11837,
-47251=>11838,
-47252=>11839,
-47253=>11840,
-47254=>11841,
-47255=>11842,
-47256=>11843,
-47257=>11844,
-47258=>11845,
-47259=>11846,
-47260=>11847,
-47261=>11848,
-47262=>11849,
-47263=>11850,
-47264=>11851,
-47265=>11852,
-47266=>11853,
-47267=>11854,
-47268=>11855,
-47269=>11856,
-47270=>11857,
-47271=>11858,
-47273=>11859,
-47274=>11860,
-47275=>11861,
-47276=>11862,
-47277=>11863,
-47278=>11864,
-47279=>11865,
-47281=>11866,
-47282=>11867,
-47283=>11868,
-47285=>11869,
-47286=>11870,
-47287=>11871,
-47289=>11872,
-47290=>11873,
-47291=>11874,
-47292=>11875,
-47293=>11876,
-47294=>11877,
-47295=>11878,
-47298=>11879,
-47300=>11880,
-47302=>11881,
-47303=>11882,
-47304=>11883,
-47305=>11884,
-47306=>11885,
-47307=>11886,
-47309=>11887,
-47310=>11888,
-47311=>11889,
-47313=>11890,
-47314=>11891,
-47315=>11892,
-47317=>11893,
-47318=>11894,
-47319=>11895,
-47320=>11896,
-47321=>11897,
-47322=>11898,
-47323=>11899,
-47324=>11900,
-47326=>11901,
-47328=>11902,
-47330=>11903,
-47331=>11904,
-47332=>11905,
-47333=>11906,
-47334=>11907,
-47335=>11908,
-47338=>11909,
-47339=>11910,
-47341=>11911,
-47342=>11912,
-47343=>11913,
-47345=>11914,
-47346=>11915,
-47347=>11916,
-47348=>11917,
-47349=>11918,
-47350=>11919,
-47351=>11920,
-47354=>11921,
-47356=>11922,
-47358=>11923,
-47359=>11924,
-47360=>11925,
-47361=>11926,
-47362=>11927,
-47363=>11928,
-47365=>11929,
-47366=>11930,
-47367=>11931,
-47368=>11932,
-47369=>11933,
-47370=>11934,
-47371=>11935,
-47372=>11936,
-47373=>11937,
-47374=>11938,
-47375=>11939,
-47376=>11940,
-47377=>11941,
-47378=>11942,
-47379=>11943,
-47380=>11944,
-47381=>11945,
-47382=>11946,
-47383=>11947,
-47385=>11948,
-47386=>11949,
-47387=>11950,
-47388=>11951,
-47389=>11952,
-47390=>11953,
-47391=>11954,
-47393=>11955,
-47394=>11956,
-47395=>11957,
-47396=>11958,
-47397=>11959,
-47398=>11960,
-47399=>11961,
-47400=>11962,
-47401=>11963,
-47402=>11964,
-47403=>11965,
-47404=>11966,
-47405=>11967,
-47406=>11968,
-47407=>11969,
-47408=>11970,
-47409=>11971,
-47410=>11972,
-47411=>11973,
-47412=>11974,
-47413=>11975,
-47414=>11976,
-47415=>11977,
-47416=>11978,
-47417=>11979,
-47418=>11980,
-47419=>11981,
-47422=>11982,
-47423=>11983,
-47425=>11984,
-47426=>11985,
-47427=>11986,
-47429=>11987,
-47430=>11988,
-47431=>11989,
-47432=>11990,
-47433=>11991,
-47434=>11992,
-47435=>11993,
-47437=>11994,
-47438=>11995,
-47440=>11996,
-47442=>11997,
-47443=>11998,
-47444=>11999,
-47445=>12000,
-47446=>12001,
-47447=>12002,
-47450=>12003,
-47451=>12004,
-47453=>12005,
-47454=>12006,
-47455=>12007,
-47457=>12008,
-47458=>12009,
-47459=>12010,
-47460=>12011,
-47461=>12012,
-47462=>12013,
-47463=>12014,
-47466=>12015,
-47468=>12016,
-47470=>12017,
-47471=>12018,
-47472=>12019,
-47473=>12020,
-47474=>12021,
-47475=>12022,
-47478=>12023,
-47479=>12024,
-47481=>12025,
-47482=>12026,
-47483=>12027,
-47485=>12028,
-47486=>12029,
-47487=>12030,
-47488=>12031,
-47489=>12032,
-47490=>12033,
-47491=>12034,
-47494=>12035,
-47496=>12036,
-47499=>12037,
-47500=>12038,
-47503=>12039,
-47504=>12040,
-47505=>12041,
-47506=>12042,
-47507=>12043,
-47508=>12044,
-47509=>12045,
-47510=>12046,
-47511=>12047,
-47512=>12048,
-47513=>12049,
-47514=>12050,
-47515=>12051,
-47516=>12052,
-47517=>12053,
-47518=>12054,
-47519=>12055,
-47520=>12056,
-47521=>12057,
-47522=>12058,
-47523=>12059,
-47524=>12060,
-47525=>12061,
-47526=>12062,
-47527=>12063,
-47528=>12064,
-47529=>12065,
-47530=>12066,
-47531=>12067,
-47534=>12068,
-47535=>12069,
-47537=>12070,
-47538=>12071,
-47539=>12072,
-47541=>12073,
-47542=>12074,
-47543=>12075,
-47544=>12076,
-47545=>12077,
-47546=>12078,
-47547=>12079,
-47550=>12080,
-47552=>12081,
-47554=>12082,
-47555=>12083,
-47556=>12084,
-47557=>12085,
-47558=>12086,
-47559=>12087,
-47562=>12088,
-47563=>12089,
-47565=>12090,
-47571=>12091,
-47572=>12092,
-47573=>12093,
-47574=>12094,
-47575=>12095,
-47578=>12096,
-47580=>12097,
-47583=>12098,
-47584=>12099,
-47586=>12100,
-47590=>12101,
-47591=>12102,
-47593=>12103,
-47594=>12104,
-47595=>12105,
-47597=>12106,
-47598=>12107,
-47599=>12108,
-47600=>12109,
-47601=>12110,
-47602=>12111,
-47603=>12112,
-47606=>12113,
-47611=>12114,
-47612=>12115,
-47613=>12116,
-47614=>12117,
-47615=>12118,
-47618=>12119,
-47619=>12120,
-47620=>12121,
-47621=>12122,
-47622=>12123,
-47623=>12124,
-47625=>12125,
-47626=>12126,
-47627=>12127,
-47628=>12128,
-47629=>12129,
-47630=>12130,
-47631=>12131,
-47632=>12132,
-47633=>12133,
-47634=>12134,
-47635=>12135,
-47636=>12136,
-47638=>12137,
-47639=>12138,
-47640=>12139,
-47641=>12140,
-47642=>12141,
-47643=>12142,
-47644=>12143,
-47645=>12144,
-47646=>12145,
-47647=>12146,
-47648=>12147,
-47649=>12148,
-47650=>12149,
-47651=>12150,
-47652=>12151,
-47653=>12152,
-47654=>12153,
-47655=>12154,
-47656=>12155,
-47657=>12156,
-47658=>12157,
-47659=>12158,
-47660=>12159,
-47661=>12160,
-47662=>12161,
-47663=>12162,
-47664=>12163,
-47665=>12164,
-47666=>12165,
-47667=>12166,
-47668=>12167,
-47669=>12168,
-47670=>12169,
-47671=>12170,
-47674=>12171,
-47675=>12172,
-47677=>12173,
-47678=>12174,
-47679=>12175,
-47681=>12176,
-47683=>12177,
-47684=>12178,
-47685=>12179,
-47686=>12180,
-47687=>12181,
-47690=>12182,
-47692=>12183,
-47695=>12184,
-47696=>12185,
-47697=>12186,
-47698=>12187,
-47702=>12188,
-47703=>12189,
-47705=>12190,
-47706=>12191,
-47707=>12192,
-47709=>12193,
-47710=>12194,
-47711=>12195,
-47712=>12196,
-47713=>12197,
-47714=>12198,
-47715=>12199,
-47718=>12200,
-47722=>12201,
-47723=>12202,
-47724=>12203,
-47725=>12204,
-47726=>12205,
-47727=>12206,
-47730=>12207,
-47731=>12208,
-47733=>12209,
-47734=>12210,
-47735=>12211,
-47737=>12212,
-47738=>12213,
-47739=>12214,
-47740=>12215,
-47741=>12216,
-47742=>12217,
-47743=>12218,
-47744=>12219,
-47745=>12220,
-47746=>12221,
-47750=>12222,
-47752=>12223,
-47753=>12224,
-47754=>12225,
-47755=>12226,
-47757=>12227,
-47758=>12228,
-47759=>12229,
-47760=>12230,
-47761=>12231,
-47762=>12232,
-47763=>12233,
-47764=>12234,
-47765=>12235,
-47766=>12236,
-47767=>12237,
-47768=>12238,
-47769=>12239,
-47770=>12240,
-47771=>12241,
-47772=>12242,
-47773=>12243,
-47774=>12244,
-47775=>12245,
-47776=>12246,
-47777=>12247,
-47778=>12248,
-47779=>12249,
-47780=>12250,
-47781=>12251,
-47782=>12252,
-47783=>12253,
-47786=>12254,
-47789=>12255,
-47790=>12256,
-47791=>12257,
-47793=>12258,
-47795=>12259,
-47796=>12260,
-47797=>12261,
-47798=>12262,
-47799=>12263,
-47802=>12264,
-47804=>12265,
-47806=>12266,
-47807=>12267,
-47808=>12268,
-47809=>12269,
-47810=>12270,
-47811=>12271,
-47813=>12272,
-47814=>12273,
-47815=>12274,
-47817=>12275,
-47818=>12276,
-47819=>12277,
-47820=>12278,
-47821=>12279,
-47822=>12280,
-47823=>12281,
-47824=>12282,
-47825=>12283,
-47826=>12284,
-47827=>12285,
-47828=>12286,
-47829=>12287,
-47830=>12288,
-47831=>12289,
-47834=>12290,
-47835=>12291,
-47836=>12292,
-47837=>12293,
-47838=>12294,
-47839=>12295,
-47840=>12296,
-47841=>12297,
-47842=>12298,
-47843=>12299,
-47844=>12300,
-47845=>12301,
-47846=>12302,
-47847=>12303,
-47848=>12304,
-47849=>12305,
-47850=>12306,
-47851=>12307,
-47852=>12308,
-47853=>12309,
-47854=>12310,
-47855=>12311,
-47856=>12312,
-47857=>12313,
-47858=>12314,
-47859=>12315,
-47860=>12316,
-47861=>12317,
-47862=>12318,
-47863=>12319,
-47864=>12320,
-47865=>12321,
-47866=>12322,
-47867=>12323,
-47869=>12324,
-47870=>12325,
-47871=>12326,
-47873=>12327,
-47874=>12328,
-47875=>12329,
-47877=>12330,
-47878=>12331,
-47879=>12332,
-47880=>12333,
-47881=>12334,
-47882=>12335,
-47883=>12336,
-47884=>12337,
-47886=>12338,
-47888=>12339,
-47890=>12340,
-47891=>12341,
-47892=>12342,
-47893=>12343,
-47894=>12344,
-47895=>12345,
-47897=>12346,
-47898=>12347,
-47899=>12348,
-47901=>12349,
-47902=>12350,
-47903=>12351,
-47905=>12352,
-47906=>12353,
-47907=>12354,
-47908=>12355,
-47909=>12356,
-47910=>12357,
-47911=>12358,
-47912=>12359,
-47914=>12360,
-47916=>12361,
-47917=>12362,
-47918=>12363,
-47919=>12364,
-47920=>12365,
-47921=>12366,
-47922=>12367,
-47923=>12368,
-47927=>12369,
-47929=>12370,
-47930=>12371,
-47935=>12372,
-47936=>12373,
-47937=>12374,
-47938=>12375,
-47939=>12376,
-47942=>12377,
-47944=>12378,
-47946=>12379,
-47947=>12380,
-47948=>12381,
-47950=>12382,
-47953=>12383,
-47954=>12384,
-47955=>12385,
-47957=>12386,
-47958=>12387,
-47959=>12388,
-47961=>12389,
-47962=>12390,
-47963=>12391,
-47964=>12392,
-47965=>12393,
-47966=>12394,
-47967=>12395,
-47968=>12396,
-47970=>12397,
-47972=>12398,
-47973=>12399,
-47974=>12400,
-47975=>12401,
-47976=>12402,
-47977=>12403,
-47978=>12404,
-47979=>12405,
-47981=>12406,
-47982=>12407,
-47983=>12408,
-47984=>12409,
-47985=>12410,
-47986=>12411,
-47987=>12412,
-47988=>12413,
-47989=>12414,
-47990=>12415,
-47991=>12416,
-47992=>12417,
-47993=>12418,
-47994=>12419,
-47995=>12420,
-47996=>12421,
-47997=>12422,
-47998=>12423,
-47999=>12424,
-48000=>12425,
-48001=>12426,
-48002=>12427,
-48003=>12428,
-48004=>12429,
-48005=>12430,
-48006=>12431,
-48007=>12432,
-48009=>12433,
-48010=>12434,
-48011=>12435,
-48013=>12436,
-48014=>12437,
-48015=>12438,
-48017=>12439,
-48018=>12440,
-48019=>12441,
-48020=>12442,
-48021=>12443,
-48022=>12444,
-48023=>12445,
-48024=>12446,
-48025=>12447,
-48026=>12448,
-48027=>12449,
-48028=>12450,
-48029=>12451,
-48030=>12452,
-48031=>12453,
-48032=>12454,
-48033=>12455,
-48034=>12456,
-48035=>12457,
-48037=>12458,
-48038=>12459,
-48039=>12460,
-48041=>12461,
-48042=>12462,
-48043=>12463,
-48045=>12464,
-48046=>12465,
-48047=>12466,
-48048=>12467,
-48049=>12468,
-48050=>12469,
-48051=>12470,
-48053=>12471,
-48054=>12472,
-48056=>12473,
-48057=>12474,
-48058=>12475,
-48059=>12476,
-48060=>12477,
-48061=>12478,
-48062=>12479,
-48063=>12480,
-48065=>12481,
-48066=>12482,
-48067=>12483,
-48069=>12484,
-48070=>12485,
-48071=>12486,
-48073=>12487,
-48074=>12488,
-48075=>12489,
-48076=>12490,
-48077=>12491,
-48078=>12492,
-48079=>12493,
-48081=>12494,
-48082=>12495,
-48084=>12496,
-48085=>12497,
-48086=>12498,
-48087=>12499,
-48088=>12500,
-48089=>12501,
-48090=>12502,
-48091=>12503,
-48092=>12504,
-48093=>12505,
-48094=>12506,
-48095=>12507,
-48096=>12508,
-48097=>12509,
-48098=>12510,
-48099=>12511,
-48100=>12512,
-48101=>12513,
-48102=>12514,
-48103=>12515,
-48104=>12516,
-48105=>12517,
-48106=>12518,
-48107=>12519,
-48108=>12520,
-48109=>12521,
-48110=>12522,
-48111=>12523,
-48112=>12524,
-48113=>12525,
-48114=>12526,
-48115=>12527,
-48116=>12528,
-48117=>12529,
-48118=>12530,
-48119=>12531,
-48122=>12532,
-48123=>12533,
-48125=>12534,
-48126=>12535,
-48129=>12536,
-48131=>12537,
-48132=>12538,
-48133=>12539,
-48134=>12540,
-48135=>12541,
-48138=>12542,
-48142=>12543,
-48144=>12544,
-48146=>12545,
-48147=>12546,
-48153=>12547,
-48154=>12548,
-48160=>12549,
-48161=>12550,
-48162=>12551,
-48163=>12552,
-48166=>12553,
-48168=>12554,
-48170=>12555,
-48171=>12556,
-48172=>12557,
-48174=>12558,
-48175=>12559,
-48178=>12560,
-48179=>12561,
-48181=>12562,
-48182=>12563,
-48183=>12564,
-48185=>12565,
-48186=>12566,
-48187=>12567,
-48188=>12568,
-48189=>12569,
-48190=>12570,
-48191=>12571,
-48194=>12572,
-48198=>12573,
-48199=>12574,
-48200=>12575,
-48202=>12576,
-48203=>12577,
-48206=>12578,
-48207=>12579,
-48209=>12580,
-48210=>12581,
-48211=>12582,
-48212=>12583,
-48213=>12584,
-48214=>12585,
-48215=>12586,
-48216=>12587,
-48217=>12588,
-48218=>12589,
-48219=>12590,
-48220=>12591,
-48222=>12592,
-48223=>12593,
-48224=>12594,
-48225=>12595,
-48226=>12596,
-48227=>12597,
-48228=>12598,
-48229=>12599,
-48230=>12600,
-48231=>12601,
-48232=>12602,
-48233=>12603,
-48234=>12604,
-48235=>12605,
-48236=>12606,
-48237=>12607,
-48238=>12608,
-48239=>12609,
-48240=>12610,
-48241=>12611,
-48242=>12612,
-48243=>12613,
-48244=>12614,
-48245=>12615,
-48246=>12616,
-48247=>12617,
-48248=>12618,
-48249=>12619,
-48250=>12620,
-48251=>12621,
-48252=>12622,
-48253=>12623,
-48254=>12624,
-48255=>12625,
-48256=>12626,
-48257=>12627,
-48258=>12628,
-48259=>12629,
-48262=>12630,
-48263=>12631,
-48265=>12632,
-48266=>12633,
-48269=>12634,
-48271=>12635,
-48272=>12636,
-48273=>12637,
-48274=>12638,
-48275=>12639,
-48278=>12640,
-48280=>12641,
-48283=>12642,
-48284=>12643,
-48285=>12644,
-48286=>12645,
-48287=>12646,
-48290=>12647,
-48291=>12648,
-48293=>12649,
-48294=>12650,
-48297=>12651,
-48298=>12652,
-48299=>12653,
-48300=>12654,
-48301=>12655,
-48302=>12656,
-48303=>12657,
-48306=>12658,
-48310=>12659,
-48311=>12660,
-48312=>12661,
-48313=>12662,
-48314=>12663,
-48315=>12664,
-48318=>12665,
-48319=>12666,
-48321=>12667,
-48322=>12668,
-48323=>12669,
-48325=>12670,
-48326=>12671,
-48327=>12672,
-48328=>12673,
-48329=>12674,
-48330=>12675,
-48331=>12676,
-48332=>12677,
-48334=>12678,
-48338=>12679,
-48339=>12680,
-48340=>12681,
-48342=>12682,
-48343=>12683,
-48345=>12684,
-48346=>12685,
-48347=>12686,
-48349=>12687,
-48350=>12688,
-48351=>12689,
-48352=>12690,
-48353=>12691,
-48354=>12692,
-48355=>12693,
-48356=>12694,
-48357=>12695,
-48358=>12696,
-48359=>12697,
-48360=>12698,
-48361=>12699,
-48362=>12700,
-48363=>12701,
-48364=>12702,
-48365=>12703,
-48366=>12704,
-48367=>12705,
-48368=>12706,
-48369=>12707,
-48370=>12708,
-48371=>12709,
-48375=>12710,
-48377=>12711,
-48378=>12712,
-48379=>12713,
-48381=>12714,
-48382=>12715,
-48383=>12716,
-48384=>12717,
-48385=>12718,
-48386=>12719,
-48387=>12720,
-48390=>12721,
-48392=>12722,
-48394=>12723,
-48395=>12724,
-48396=>12725,
-48397=>12726,
-48398=>12727,
-48399=>12728,
-48401=>12729,
-48402=>12730,
-48403=>12731,
-48405=>12732,
-48406=>12733,
-48407=>12734,
-48408=>12735,
-48409=>12736,
-48410=>12737,
-48411=>12738,
-48412=>12739,
-48413=>12740,
-48414=>12741,
-48415=>12742,
-48416=>12743,
-48417=>12744,
-48418=>12745,
-48419=>12746,
-48421=>12747,
-48422=>12748,
-48423=>12749,
-48424=>12750,
-48425=>12751,
-48426=>12752,
-48427=>12753,
-48429=>12754,
-48430=>12755,
-48431=>12756,
-48432=>12757,
-48433=>12758,
-48434=>12759,
-48435=>12760,
-48436=>12761,
-48437=>12762,
-48438=>12763,
-48439=>12764,
-48440=>12765,
-48441=>12766,
-48442=>12767,
-48443=>12768,
-48444=>12769,
-48445=>12770,
-48446=>12771,
-48447=>12772,
-48449=>12773,
-48450=>12774,
-48451=>12775,
-48452=>12776,
-48453=>12777,
-48454=>12778,
-48455=>12779,
-48458=>12780,
-48459=>12781,
-48461=>12782,
-48462=>12783,
-48463=>12784,
-48465=>12785,
-48466=>12786,
-48467=>12787,
-48468=>12788,
-48469=>12789,
-48470=>12790,
-48471=>12791,
-48474=>12792,
-48475=>12793,
-48476=>12794,
-48477=>12795,
-48478=>12796,
-48479=>12797,
-48480=>12798,
-48481=>12799,
-48482=>12800,
-48483=>12801,
-48485=>12802,
-48486=>12803,
-48487=>12804,
-48489=>12805,
-48490=>12806,
-48491=>12807,
-48492=>12808,
-48493=>12809,
-48494=>12810,
-48495=>12811,
-48496=>12812,
-48497=>12813,
-48498=>12814,
-48499=>12815,
-48500=>12816,
-48501=>12817,
-48502=>12818,
-48503=>12819,
-48504=>12820,
-48505=>12821,
-48506=>12822,
-48507=>12823,
-48508=>12824,
-48509=>12825,
-48510=>12826,
-48511=>12827,
-48514=>12828,
-48515=>12829,
-48517=>12830,
-48518=>12831,
-48523=>12832,
-48524=>12833,
-48525=>12834,
-48526=>12835,
-48527=>12836,
-48530=>12837,
-48532=>12838,
-48534=>12839,
-48535=>12840,
-48536=>12841,
-48539=>12842,
-48541=>12843,
-48542=>12844,
-48543=>12845,
-48544=>12846,
-48545=>12847,
-48546=>12848,
-48547=>12849,
-48549=>12850,
-48550=>12851,
-48551=>12852,
-48552=>12853,
-48553=>12854,
-48554=>12855,
-48555=>12856,
-48556=>12857,
-48557=>12858,
-48558=>12859,
-48559=>12860,
-48561=>12861,
-48562=>12862,
-48563=>12863,
-48564=>12864,
-48565=>12865,
-48566=>12866,
-48567=>12867,
-48569=>12868,
-48570=>12869,
-48571=>12870,
-48572=>12871,
-48573=>12872,
-48574=>12873,
-48575=>12874,
-48576=>12875,
-48577=>12876,
-48578=>12877,
-48579=>12878,
-48580=>12879,
-48581=>12880,
-48582=>12881,
-48583=>12882,
-48584=>12883,
-48585=>12884,
-48586=>12885,
-48587=>12886,
-48588=>12887,
-48589=>12888,
-48590=>12889,
-48591=>12890,
-48592=>12891,
-48593=>12892,
-48594=>12893,
-48595=>12894,
-48598=>12895,
-48599=>12896,
-48601=>12897,
-48602=>12898,
-48603=>12899,
-48605=>12900,
-48606=>12901,
-48607=>12902,
-48608=>12903,
-48609=>12904,
-48610=>12905,
-48611=>12906,
-48612=>12907,
-48613=>12908,
-48614=>12909,
-48615=>12910,
-48616=>12911,
-48618=>12912,
-48619=>12913,
-48620=>12914,
-48621=>12915,
-48622=>12916,
-48623=>12917,
-48625=>12918,
-48626=>12919,
-48627=>12920,
-48629=>12921,
-48630=>12922,
-48631=>12923,
-48633=>12924,
-48634=>12925,
-48635=>12926,
-48636=>12927,
-48637=>12928,
-48638=>12929,
-48639=>12930,
-48641=>12931,
-48642=>12932,
-48644=>12933,
-48646=>12934,
-48647=>12935,
-48648=>12936,
-48649=>12937,
-48650=>12938,
-48651=>12939,
-48654=>12940,
-48655=>12941,
-48657=>12942,
-48658=>12943,
-48659=>12944,
-48661=>12945,
-48662=>12946,
-48663=>12947,
-48664=>12948,
-48665=>12949,
-48666=>12950,
-48667=>12951,
-48670=>12952,
-48672=>12953,
-48673=>12954,
-48674=>12955,
-48675=>12956,
-48676=>12957,
-48677=>12958,
-48678=>12959,
-48679=>12960,
-48680=>12961,
-48681=>12962,
-48682=>12963,
-48683=>12964,
-48684=>12965,
-48685=>12966,
-48686=>12967,
-48687=>12968,
-48688=>12969,
-48689=>12970,
-48690=>12971,
-48691=>12972,
-48692=>12973,
-48693=>12974,
-48694=>12975,
-48695=>12976,
-48696=>12977,
-48697=>12978,
-48698=>12979,
-48699=>12980,
-48700=>12981,
-48701=>12982,
-48702=>12983,
-48703=>12984,
-48704=>12985,
-48705=>12986,
-48706=>12987,
-48707=>12988,
-48710=>12989,
-48711=>12990,
-48713=>12991,
-48714=>12992,
-48715=>12993,
-48717=>12994,
-48719=>12995,
-48720=>12996,
-48721=>12997,
-48722=>12998,
-48723=>12999,
-48726=>13000,
-48728=>13001,
-48732=>13002,
-48733=>13003,
-48734=>13004,
-48735=>13005,
-48738=>13006,
-48739=>13007,
-48741=>13008,
-48742=>13009,
-48743=>13010,
-48745=>13011,
-48747=>13012,
-48748=>13013,
-48749=>13014,
-48750=>13015,
-48751=>13016,
-48754=>13017,
-48758=>13018,
-48759=>13019,
-48760=>13020,
-48761=>13021,
-48762=>13022,
-48766=>13023,
-48767=>13024,
-48769=>13025,
-48770=>13026,
-48771=>13027,
-48773=>13028,
-48774=>13029,
-48775=>13030,
-48776=>13031,
-48777=>13032,
-48778=>13033,
-48779=>13034,
-48782=>13035,
-48786=>13036,
-48787=>13037,
-48788=>13038,
-48789=>13039,
-48790=>13040,
-48791=>13041,
-48794=>13042,
-48795=>13043,
-48796=>13044,
-48797=>13045,
-48798=>13046,
-48799=>13047,
-48800=>13048,
-48801=>13049,
-48802=>13050,
-48803=>13051,
-48804=>13052,
-48805=>13053,
-48806=>13054,
-48807=>13055,
-48809=>13056,
-48810=>13057,
-48811=>13058,
-48812=>13059,
-48813=>13060,
-48814=>13061,
-48815=>13062,
-48816=>13063,
-48817=>13064,
-48818=>13065,
-48819=>13066,
-48820=>13067,
-48821=>13068,
-48822=>13069,
-48823=>13070,
-48824=>13071,
-48825=>13072,
-48826=>13073,
-48827=>13074,
-48828=>13075,
-48829=>13076,
-48830=>13077,
-48831=>13078,
-48832=>13079,
-48833=>13080,
-48834=>13081,
-48835=>13082,
-48836=>13083,
-48837=>13084,
-48838=>13085,
-48839=>13086,
-48840=>13087,
-48841=>13088,
-48842=>13089,
-48843=>13090,
-48844=>13091,
-48845=>13092,
-48846=>13093,
-48847=>13094,
-48850=>13095,
-48851=>13096,
-48853=>13097,
-48854=>13098,
-48857=>13099,
-48858=>13100,
-48859=>13101,
-48860=>13102,
-48861=>13103,
-48862=>13104,
-48863=>13105,
-48865=>13106,
-48866=>13107,
-48870=>13108,
-48871=>13109,
-48872=>13110,
-48873=>13111,
-48874=>13112,
-48875=>13113,
-48877=>13114,
-48878=>13115,
-48879=>13116,
-48880=>13117,
-48881=>13118,
-48882=>13119,
-48883=>13120,
-48884=>13121,
-48885=>13122,
-48886=>13123,
-48887=>13124,
-48888=>13125,
-48889=>13126,
-48890=>13127,
-48891=>13128,
-48892=>13129,
-48893=>13130,
-48894=>13131,
-48895=>13132,
-48896=>13133,
-48898=>13134,
-48899=>13135,
-48900=>13136,
-48901=>13137,
-48902=>13138,
-48903=>13139,
-48906=>13140,
-48907=>13141,
-48908=>13142,
-48909=>13143,
-48910=>13144,
-48911=>13145,
-48912=>13146,
-48913=>13147,
-48914=>13148,
-48915=>13149,
-48916=>13150,
-48917=>13151,
-48918=>13152,
-48919=>13153,
-48922=>13154,
-48926=>13155,
-48927=>13156,
-48928=>13157,
-48929=>13158,
-48930=>13159,
-48931=>13160,
-48932=>13161,
-48933=>13162,
-48934=>13163,
-48935=>13164,
-48936=>13165,
-48937=>13166,
-48938=>13167,
-48939=>13168,
-48940=>13169,
-48941=>13170,
-48942=>13171,
-48943=>13172,
-48944=>13173,
-48945=>13174,
-48946=>13175,
-48947=>13176,
-48948=>13177,
-48949=>13178,
-48950=>13179,
-48951=>13180,
-48952=>13181,
-48953=>13182,
-48954=>13183,
-48955=>13184,
-48956=>13185,
-48957=>13186,
-48958=>13187,
-48959=>13188,
-48962=>13189,
-48963=>13190,
-48965=>13191,
-48966=>13192,
-48967=>13193,
-48969=>13194,
-48970=>13195,
-48971=>13196,
-48972=>13197,
-48973=>13198,
-48974=>13199,
-48975=>13200,
-48978=>13201,
-48979=>13202,
-48980=>13203,
-48982=>13204,
-48983=>13205,
-48984=>13206,
-48985=>13207,
-48986=>13208,
-48987=>13209,
-48988=>13210,
-48989=>13211,
-48990=>13212,
-48991=>13213,
-48992=>13214,
-48993=>13215,
-48994=>13216,
-48995=>13217,
-48996=>13218,
-48997=>13219,
-48998=>13220,
-48999=>13221,
-49000=>13222,
-49001=>13223,
-49002=>13224,
-49003=>13225,
-49004=>13226,
-49005=>13227,
-49006=>13228,
-49007=>13229,
-49008=>13230,
-49009=>13231,
-49010=>13232,
-49011=>13233,
-49012=>13234,
-49013=>13235,
-49014=>13236,
-49015=>13237,
-49016=>13238,
-49017=>13239,
-49018=>13240,
-49019=>13241,
-49020=>13242,
-49021=>13243,
-49022=>13244,
-49023=>13245,
-49024=>13246,
-49025=>13247,
-49026=>13248,
-49027=>13249,
-49028=>13250,
-49029=>13251,
-49030=>13252,
-49031=>13253,
-49032=>13254,
-49033=>13255,
-49034=>13256,
-49035=>13257,
-49036=>13258,
-49037=>13259,
-49038=>13260,
-49039=>13261,
-49040=>13262,
-49041=>13263,
-49042=>13264,
-49043=>13265,
-49045=>13266,
-49046=>13267,
-49047=>13268,
-49048=>13269,
-49049=>13270,
-49050=>13271,
-49051=>13272,
-49052=>13273,
-49053=>13274,
-49054=>13275,
-49055=>13276,
-49056=>13277,
-49057=>13278,
-49058=>13279,
-49059=>13280,
-49060=>13281,
-49061=>13282,
-49062=>13283,
-49063=>13284,
-49064=>13285,
-49065=>13286,
-49066=>13287,
-49067=>13288,
-49068=>13289,
-49069=>13290,
-49070=>13291,
-49071=>13292,
-49073=>13293,
-49074=>13294,
-49075=>13295,
-49076=>13296,
-49077=>13297,
-49078=>13298,
-49079=>13299,
-49080=>13300,
-49081=>13301,
-49082=>13302,
-49083=>13303,
-49084=>13304,
-49085=>13305,
-49086=>13306,
-49087=>13307,
-49088=>13308,
-49089=>13309,
-49090=>13310,
-49091=>13311,
-49092=>13312,
-49094=>13313,
-49095=>13314,
-49096=>13315,
-49097=>13316,
-49098=>13317,
-49099=>13318,
-49102=>13319,
-49103=>13320,
-49105=>13321,
-49106=>13322,
-49107=>13323,
-49109=>13324,
-49110=>13325,
-49111=>13326,
-49112=>13327,
-49113=>13328,
-49114=>13329,
-49115=>13330,
-49117=>13331,
-49118=>13332,
-49120=>13333,
-49122=>13334,
-49123=>13335,
-49124=>13336,
-49125=>13337,
-49126=>13338,
-49127=>13339,
-49128=>13340,
-49129=>13341,
-49130=>13342,
-49131=>13343,
-49132=>13344,
-49133=>13345,
-49134=>13346,
-49135=>13347,
-49136=>13348,
-49137=>13349,
-49138=>13350,
-49139=>13351,
-49140=>13352,
-49141=>13353,
-49142=>13354,
-49143=>13355,
-49144=>13356,
-49145=>13357,
-49146=>13358,
-49147=>13359,
-49148=>13360,
-49149=>13361,
-49150=>13362,
-49151=>13363,
-49152=>13364,
-49153=>13365,
-49154=>13366,
-49155=>13367,
-49156=>13368,
-49157=>13369,
-49158=>13370,
-49159=>13371,
-49160=>13372,
-49161=>13373,
-49162=>13374,
-49163=>13375,
-49164=>13376,
-49165=>13377,
-49166=>13378,
-49167=>13379,
-49168=>13380,
-49169=>13381,
-49170=>13382,
-49171=>13383,
-49172=>13384,
-49173=>13385,
-49174=>13386,
-49175=>13387,
-49176=>13388,
-49177=>13389,
-49178=>13390,
-49179=>13391,
-49180=>13392,
-49181=>13393,
-49182=>13394,
-49183=>13395,
-49184=>13396,
-49185=>13397,
-49186=>13398,
-49187=>13399,
-49188=>13400,
-49189=>13401,
-49190=>13402,
-49191=>13403,
-49192=>13404,
-49193=>13405,
-49194=>13406,
-49195=>13407,
-49196=>13408,
-49197=>13409,
-49198=>13410,
-49199=>13411,
-49200=>13412,
-49201=>13413,
-49202=>13414,
-49203=>13415,
-49204=>13416,
-49205=>13417,
-49206=>13418,
-49207=>13419,
-49208=>13420,
-49209=>13421,
-49210=>13422,
-49211=>13423,
-49213=>13424,
-49214=>13425,
-49215=>13426,
-49216=>13427,
-49217=>13428,
-49218=>13429,
-49219=>13430,
-49220=>13431,
-49221=>13432,
-49222=>13433,
-49223=>13434,
-49224=>13435,
-49225=>13436,
-49226=>13437,
-49227=>13438,
-49228=>13439,
-49229=>13440,
-49230=>13441,
-49231=>13442,
-49232=>13443,
-49234=>13444,
-49235=>13445,
-49236=>13446,
-49237=>13447,
-49238=>13448,
-49239=>13449,
-49241=>13450,
-49242=>13451,
-49243=>13452,
-49245=>13453,
-49246=>13454,
-49247=>13455,
-49249=>13456,
-49250=>13457,
-49251=>13458,
-49252=>13459,
-49253=>13460,
-49254=>13461,
-49255=>13462,
-49258=>13463,
-49259=>13464,
-49260=>13465,
-49261=>13466,
-49262=>13467,
-49263=>13468,
-49264=>13469,
-49265=>13470,
-49266=>13471,
-49267=>13472,
-49268=>13473,
-49269=>13474,
-49270=>13475,
-49271=>13476,
-49272=>13477,
-49273=>13478,
-49274=>13479,
-49275=>13480,
-49276=>13481,
-49277=>13482,
-49278=>13483,
-49279=>13484,
-49280=>13485,
-49281=>13486,
-49282=>13487,
-49283=>13488,
-49284=>13489,
-49285=>13490,
-49286=>13491,
-49287=>13492,
-49288=>13493,
-49289=>13494,
-49290=>13495,
-49291=>13496,
-49292=>13497,
-49293=>13498,
-49294=>13499,
-49295=>13500,
-49298=>13501,
-49299=>13502,
-49301=>13503,
-49302=>13504,
-49303=>13505,
-49305=>13506,
-49306=>13507,
-49307=>13508,
-49308=>13509,
-49309=>13510,
-49310=>13511,
-49311=>13512,
-49314=>13513,
-49316=>13514,
-49318=>13515,
-49319=>13516,
-49320=>13517,
-49321=>13518,
-49322=>13519,
-49323=>13520,
-49326=>13521,
-49329=>13522,
-49330=>13523,
-49335=>13524,
-49336=>13525,
-49337=>13526,
-49338=>13527,
-49339=>13528,
-49342=>13529,
-49346=>13530,
-49347=>13531,
-49348=>13532,
-49350=>13533,
-49351=>13534,
-49354=>13535,
-49355=>13536,
-49357=>13537,
-49358=>13538,
-49359=>13539,
-49361=>13540,
-49362=>13541,
-49363=>13542,
-49364=>13543,
-49365=>13544,
-49366=>13545,
-49367=>13546,
-49370=>13547,
-49374=>13548,
-49375=>13549,
-49376=>13550,
-49377=>13551,
-49378=>13552,
-49379=>13553,
-49382=>13554,
-49383=>13555,
-49385=>13556,
-49386=>13557,
-49387=>13558,
-49389=>13559,
-49390=>13560,
-49391=>13561,
-49392=>13562,
-49393=>13563,
-49394=>13564,
-49395=>13565,
-49398=>13566,
-49400=>13567,
-49402=>13568,
-49403=>13569,
-49404=>13570,
-49405=>13571,
-49406=>13572,
-49407=>13573,
-49409=>13574,
-49410=>13575,
-49411=>13576,
-49413=>13577,
-49414=>13578,
-49415=>13579,
-49417=>13580,
-49418=>13581,
-49419=>13582,
-49420=>13583,
-49421=>13584,
-49422=>13585,
-49423=>13586,
-49425=>13587,
-49426=>13588,
-49427=>13589,
-49428=>13590,
-49430=>13591,
-49431=>13592,
-49432=>13593,
-49433=>13594,
-49434=>13595,
-49435=>13596,
-49441=>13597,
-49442=>13598,
-49445=>13599,
-49448=>13600,
-49449=>13601,
-49450=>13602,
-49451=>13603,
-49454=>13604,
-49458=>13605,
-49459=>13606,
-49460=>13607,
-49461=>13608,
-49463=>13609,
-49466=>13610,
-49467=>13611,
-49469=>13612,
-49470=>13613,
-49471=>13614,
-49473=>13615,
-49474=>13616,
-49475=>13617,
-49476=>13618,
-49477=>13619,
-49478=>13620,
-49479=>13621,
-49482=>13622,
-49486=>13623,
-49487=>13624,
-49488=>13625,
-49489=>13626,
-49490=>13627,
-49491=>13628,
-49494=>13629,
-49495=>13630,
-49497=>13631,
-49498=>13632,
-49499=>13633,
-49501=>13634,
-49502=>13635,
-49503=>13636,
-49504=>13637,
-49505=>13638,
-49506=>13639,
-49507=>13640,
-49510=>13641,
-49514=>13642,
-49515=>13643,
-49516=>13644,
-49517=>13645,
-49518=>13646,
-49519=>13647,
-49521=>13648,
-49522=>13649,
-49523=>13650,
-49525=>13651,
-49526=>13652,
-49527=>13653,
-49529=>13654,
-49530=>13655,
-49531=>13656,
-49532=>13657,
-49533=>13658,
-49534=>13659,
-49535=>13660,
-49536=>13661,
-49537=>13662,
-49538=>13663,
-49539=>13664,
-49540=>13665,
-49542=>13666,
-49543=>13667,
-49544=>13668,
-49545=>13669,
-49546=>13670,
-49547=>13671,
-49551=>13672,
-49553=>13673,
-49554=>13674,
-49555=>13675,
-49557=>13676,
-49559=>13677,
-49560=>13678,
-49561=>13679,
-49562=>13680,
-49563=>13681,
-49566=>13682,
-49568=>13683,
-49570=>13684,
-49571=>13685,
-49572=>13686,
-49574=>13687,
-49575=>13688,
-49578=>13689,
-49579=>13690,
-49581=>13691,
-49582=>13692,
-49583=>13693,
-49585=>13694,
-49586=>13695,
-49587=>13696,
-49588=>13697,
-49589=>13698,
-49590=>13699,
-49591=>13700,
-49592=>13701,
-49593=>13702,
-49594=>13703,
-49595=>13704,
-49596=>13705,
-49598=>13706,
-49599=>13707,
-49600=>13708,
-49601=>13709,
-49602=>13710,
-49603=>13711,
-49605=>13712,
-49606=>13713,
-49607=>13714,
-49609=>13715,
-49610=>13716,
-49611=>13717,
-49613=>13718,
-49614=>13719,
-49615=>13720,
-49616=>13721,
-49617=>13722,
-49618=>13723,
-49619=>13724,
-49621=>13725,
-49622=>13726,
-49625=>13727,
-49626=>13728,
-49627=>13729,
-49628=>13730,
-49629=>13731,
-49630=>13732,
-49631=>13733,
-49633=>13734,
-49634=>13735,
-49635=>13736,
-49637=>13737,
-49638=>13738,
-49639=>13739,
-49641=>13740,
-49642=>13741,
-49643=>13742,
-49644=>13743,
-49645=>13744,
-49646=>13745,
-49647=>13746,
-49650=>13747,
-49652=>13748,
-49653=>13749,
-49654=>13750,
-49655=>13751,
-49656=>13752,
-49657=>13753,
-49658=>13754,
-49659=>13755,
-49662=>13756,
-49663=>13757,
-49665=>13758,
-49666=>13759,
-49667=>13760,
-49669=>13761,
-49670=>13762,
-49671=>13763,
-49672=>13764,
-49673=>13765,
-49674=>13766,
-49675=>13767,
-49678=>13768,
-49680=>13769,
-49682=>13770,
-49683=>13771,
-49684=>13772,
-49685=>13773,
-49686=>13774,
-49687=>13775,
-49690=>13776,
-49691=>13777,
-49693=>13778,
-49694=>13779,
-49697=>13780,
-49698=>13781,
-49699=>13782,
-49700=>13783,
-49701=>13784,
-49702=>13785,
-49703=>13786,
-49706=>13787,
-49708=>13788,
-49710=>13789,
-49712=>13790,
-49715=>13791,
-49717=>13792,
-49718=>13793,
-49719=>13794,
-49720=>13795,
-49721=>13796,
-49722=>13797,
-49723=>13798,
-49724=>13799,
-49725=>13800,
-49726=>13801,
-49727=>13802,
-49728=>13803,
-49729=>13804,
-49730=>13805,
-49731=>13806,
-49732=>13807,
-49733=>13808,
-49734=>13809,
-49735=>13810,
-49737=>13811,
-49738=>13812,
-49739=>13813,
-49740=>13814,
-49741=>13815,
-49742=>13816,
-49743=>13817,
-49746=>13818,
-49747=>13819,
-49749=>13820,
-49750=>13821,
-49751=>13822,
-49753=>13823,
-49754=>13824,
-49755=>13825,
-49756=>13826,
-49757=>13827,
-49758=>13828,
-49759=>13829,
-49761=>13830,
-49762=>13831,
-49763=>13832,
-49764=>13833,
-49766=>13834,
-49767=>13835,
-49768=>13836,
-49769=>13837,
-49770=>13838,
-49771=>13839,
-49774=>13840,
-49775=>13841,
-49777=>13842,
-49778=>13843,
-49779=>13844,
-49781=>13845,
-49782=>13846,
-49783=>13847,
-49784=>13848,
-49785=>13849,
-49786=>13850,
-49787=>13851,
-49790=>13852,
-49792=>13853,
-49794=>13854,
-49795=>13855,
-49796=>13856,
-49797=>13857,
-49798=>13858,
-49799=>13859,
-49802=>13860,
-49803=>13861,
-49804=>13862,
-49805=>13863,
-49806=>13864,
-49807=>13865,
-49809=>13866,
-49810=>13867,
-49811=>13868,
-49812=>13869,
-49813=>13870,
-49814=>13871,
-49815=>13872,
-49817=>13873,
-49818=>13874,
-49820=>13875,
-49822=>13876,
-49823=>13877,
-49824=>13878,
-49825=>13879,
-49826=>13880,
-49827=>13881,
-49830=>13882,
-49831=>13883,
-49833=>13884,
-49834=>13885,
-49835=>13886,
-49838=>13887,
-49839=>13888,
-49840=>13889,
-49841=>13890,
-49842=>13891,
-49843=>13892,
-49846=>13893,
-49848=>13894,
-49850=>13895,
-49851=>13896,
-49852=>13897,
-49853=>13898,
-49854=>13899,
-49855=>13900,
-49856=>13901,
-49857=>13902,
-49858=>13903,
-49859=>13904,
-49860=>13905,
-49861=>13906,
-49862=>13907,
-49863=>13908,
-49864=>13909,
-49865=>13910,
-49866=>13911,
-49867=>13912,
-49868=>13913,
-49869=>13914,
-49870=>13915,
-49871=>13916,
-49872=>13917,
-49873=>13918,
-49874=>13919,
-49875=>13920,
-49876=>13921,
-49877=>13922,
-49878=>13923,
-49879=>13924,
-49880=>13925,
-49881=>13926,
-49882=>13927,
-49883=>13928,
-49886=>13929,
-49887=>13930,
-49889=>13931,
-49890=>13932,
-49893=>13933,
-49894=>13934,
-49895=>13935,
-49896=>13936,
-49897=>13937,
-49898=>13938,
-49902=>13939,
-49904=>13940,
-49906=>13941,
-49907=>13942,
-49908=>13943,
-49909=>13944,
-49911=>13945,
-49914=>13946,
-49917=>13947,
-49918=>13948,
-49919=>13949,
-49921=>13950,
-49922=>13951,
-49923=>13952,
-49924=>13953,
-49925=>13954,
-49926=>13955,
-49927=>13956,
-49930=>13957,
-49931=>13958,
-49934=>13959,
-49935=>13960,
-49936=>13961,
-49937=>13962,
-49938=>13963,
-49942=>13964,
-49943=>13965,
-49945=>13966,
-49946=>13967,
-49947=>13968,
-49949=>13969,
-49950=>13970,
-49951=>13971,
-49952=>13972,
-49953=>13973,
-49954=>13974,
-49955=>13975,
-49958=>13976,
-49959=>13977,
-49962=>13978,
-49963=>13979,
-49964=>13980,
-49965=>13981,
-49966=>13982,
-49967=>13983,
-49968=>13984,
-49969=>13985,
-49970=>13986,
-49971=>13987,
-49972=>13988,
-49973=>13989,
-49974=>13990,
-49975=>13991,
-49976=>13992,
-49977=>13993,
-49978=>13994,
-49979=>13995,
-49980=>13996,
-49981=>13997,
-49982=>13998,
-49983=>13999,
-49984=>14000,
-49985=>14001,
-49986=>14002,
-49987=>14003,
-49988=>14004,
-49990=>14005,
-49991=>14006,
-49992=>14007,
-49993=>14008,
-49994=>14009,
-49995=>14010,
-49996=>14011,
-49997=>14012,
-49998=>14013,
-49999=>14014,
-50000=>14015,
-50001=>14016,
-50002=>14017,
-50003=>14018,
-50004=>14019,
-50005=>14020,
-50006=>14021,
-50007=>14022,
-50008=>14023,
-50009=>14024,
-50010=>14025,
-50011=>14026,
-50012=>14027,
-50013=>14028,
-50014=>14029,
-50015=>14030,
-50016=>14031,
-50017=>14032,
-50018=>14033,
-50019=>14034,
-50020=>14035,
-50021=>14036,
-50022=>14037,
-50023=>14038,
-50026=>14039,
-50027=>14040,
-50029=>14041,
-50030=>14042,
-50031=>14043,
-50033=>14044,
-50035=>14045,
-50036=>14046,
-50037=>14047,
-50038=>14048,
-50039=>14049,
-50042=>14050,
-50043=>14051,
-50046=>14052,
-50047=>14053,
-50048=>14054,
-50049=>14055,
-50050=>14056,
-50051=>14057,
-50053=>14058,
-50054=>14059,
-50055=>14060,
-50057=>14061,
-50058=>14062,
-50059=>14063,
-50061=>14064,
-50062=>14065,
-50063=>14066,
-50064=>14067,
-50065=>14068,
-50066=>14069,
-50067=>14070,
-50068=>14071,
-50069=>14072,
-50070=>14073,
-50071=>14074,
-50072=>14075,
-50073=>14076,
-50074=>14077,
-50075=>14078,
-50076=>14079,
-50077=>14080,
-50078=>14081,
-50079=>14082,
-50080=>14083,
-50081=>14084,
-50082=>14085,
-50083=>14086,
-50084=>14087,
-50085=>14088,
-50086=>14089,
-50087=>14090,
-50088=>14091,
-50089=>14092,
-50090=>14093,
-50091=>14094,
-50092=>14095,
-50093=>14096,
-50094=>14097,
-50095=>14098,
-50096=>14099,
-50097=>14100,
-50098=>14101,
-50099=>14102,
-50100=>14103,
-50101=>14104,
-50102=>14105,
-50103=>14106,
-50104=>14107,
-50105=>14108,
-50106=>14109,
-50107=>14110,
-50108=>14111,
-50109=>14112,
-50110=>14113,
-50111=>14114,
-50113=>14115,
-50114=>14116,
-50115=>14117,
-50116=>14118,
-50117=>14119,
-50118=>14120,
-50119=>14121,
-50120=>14122,
-50121=>14123,
-50122=>14124,
-50123=>14125,
-50124=>14126,
-50125=>14127,
-50126=>14128,
-50127=>14129,
-50128=>14130,
-50129=>14131,
-50130=>14132,
-50131=>14133,
-50132=>14134,
-50133=>14135,
-50134=>14136,
-50135=>14137,
-50138=>14138,
-50139=>14139,
-50141=>14140,
-50142=>14141,
-50145=>14142,
-50147=>14143,
-50148=>14144,
-50149=>14145,
-50150=>14146,
-50151=>14147,
-50154=>14148,
-50155=>14149,
-50156=>14150,
-50158=>14151,
-50159=>14152,
-50160=>14153,
-50161=>14154,
-50162=>14155,
-50163=>14156,
-50166=>14157,
-50167=>14158,
-50169=>14159,
-50170=>14160,
-50171=>14161,
-50172=>14162,
-50173=>14163,
-50174=>14164,
-50175=>14165,
-50176=>14166,
-50177=>14167,
-50178=>14168,
-50179=>14169,
-50180=>14170,
-50181=>14171,
-50182=>14172,
-50183=>14173,
-50185=>14174,
-50186=>14175,
-50187=>14176,
-50188=>14177,
-50189=>14178,
-50190=>14179,
-50191=>14180,
-50193=>14181,
-50194=>14182,
-50195=>14183,
-50196=>14184,
-50197=>14185,
-50198=>14186,
-50199=>14187,
-50200=>14188,
-50201=>14189,
-50202=>14190,
-50203=>14191,
-50204=>14192,
-50205=>14193,
-50206=>14194,
-50207=>14195,
-50208=>14196,
-50209=>14197,
-50210=>14198,
-50211=>14199,
-50213=>14200,
-50214=>14201,
-50215=>14202,
-50216=>14203,
-50217=>14204,
-50218=>14205,
-50219=>14206,
-50221=>14207,
-50222=>14208,
-50223=>14209,
-50225=>14210,
-50226=>14211,
-50227=>14212,
-50229=>14213,
-50230=>14214,
-50231=>14215,
-50232=>14216,
-50233=>14217,
-50234=>14218,
-50235=>14219,
-50238=>14220,
-50239=>14221,
-50240=>14222,
-50241=>14223,
-50242=>14224,
-50243=>14225,
-50244=>14226,
-50245=>14227,
-50246=>14228,
-50247=>14229,
-50249=>14230,
-50250=>14231,
-50251=>14232,
-50252=>14233,
-50253=>14234,
-50254=>14235,
-50255=>14236,
-50256=>14237,
-50257=>14238,
-50258=>14239,
-50259=>14240,
-50260=>14241,
-50261=>14242,
-50262=>14243,
-50263=>14244,
-50264=>14245,
-50265=>14246,
-50266=>14247,
-50267=>14248,
-50268=>14249,
-50269=>14250,
-50270=>14251,
-50271=>14252,
-50272=>14253,
-50273=>14254,
-50274=>14255,
-50275=>14256,
-50278=>14257,
-50279=>14258,
-50281=>14259,
-50282=>14260,
-50283=>14261,
-50285=>14262,
-50286=>14263,
-50287=>14264,
-50288=>14265,
-50289=>14266,
-50290=>14267,
-50291=>14268,
-50294=>14269,
-50295=>14270,
-50296=>14271,
-50298=>14272,
-50299=>14273,
-50300=>14274,
-50301=>14275,
-50302=>14276,
-50303=>14277,
-50305=>14278,
-50306=>14279,
-50307=>14280,
-50308=>14281,
-50309=>14282,
-50310=>14283,
-50311=>14284,
-50312=>14285,
-50313=>14286,
-50314=>14287,
-50315=>14288,
-50316=>14289,
-50317=>14290,
-50318=>14291,
-50319=>14292,
-50320=>14293,
-50321=>14294,
-50322=>14295,
-50323=>14296,
-50325=>14297,
-50326=>14298,
-50327=>14299,
-50328=>14300,
-50329=>14301,
-50330=>14302,
-50331=>14303,
-50333=>14304,
-50334=>14305,
-50335=>14306,
-50336=>14307,
-50337=>14308,
-50338=>14309,
-50339=>14310,
-50340=>14311,
-50341=>14312,
-50342=>14313,
-50343=>14314,
-50344=>14315,
-50345=>14316,
-50346=>14317,
-50347=>14318,
-50348=>14319,
-50349=>14320,
-50350=>14321,
-50351=>14322,
-50352=>14323,
-50353=>14324,
-50354=>14325,
-50355=>14326,
-50356=>14327,
-50357=>14328,
-50358=>14329,
-50359=>14330,
-50361=>14331,
-50362=>14332,
-50363=>14333,
-50365=>14334,
-50366=>14335,
-50367=>14336,
-50368=>14337,
-50369=>14338,
-50370=>14339,
-50371=>14340,
-50372=>14341,
-50373=>14342,
-50374=>14343,
-50375=>14344,
-50376=>14345,
-50377=>14346,
-50378=>14347,
-50379=>14348,
-50380=>14349,
-50381=>14350,
-50382=>14351,
-50383=>14352,
-50384=>14353,
-50385=>14354,
-50386=>14355,
-50387=>14356,
-50388=>14357,
-50389=>14358,
-50390=>14359,
-50391=>14360,
-50392=>14361,
-50393=>14362,
-50394=>14363,
-50395=>14364,
-50396=>14365,
-50397=>14366,
-50398=>14367,
-50399=>14368,
-50400=>14369,
-50401=>14370,
-50402=>14371,
-50403=>14372,
-50404=>14373,
-50405=>14374,
-50406=>14375,
-50407=>14376,
-50408=>14377,
-50410=>14378,
-50411=>14379,
-50412=>14380,
-50413=>14381,
-50414=>14382,
-50415=>14383,
-50418=>14384,
-50419=>14385,
-50421=>14386,
-50422=>14387,
-50423=>14388,
-50425=>14389,
-50427=>14390,
-50428=>14391,
-50429=>14392,
-50430=>14393,
-50434=>14394,
-50435=>14395,
-50436=>14396,
-50437=>14397,
-50438=>14398,
-50439=>14399,
-50440=>14400,
-50441=>14401,
-50442=>14402,
-50443=>14403,
-50445=>14404,
-50446=>14405,
-50447=>14406,
-50449=>14407,
-50450=>14408,
-50451=>14409,
-50453=>14410,
-50454=>14411,
-50455=>14412,
-50456=>14413,
-50457=>14414,
-50458=>14415,
-50459=>14416,
-50461=>14417,
-50462=>14418,
-50463=>14419,
-50464=>14420,
-50465=>14421,
-50466=>14422,
-50467=>14423,
-50468=>14424,
-50469=>14425,
-50470=>14426,
-50471=>14427,
-50474=>14428,
-50475=>14429,
-50477=>14430,
-50478=>14431,
-50479=>14432,
-50481=>14433,
-50482=>14434,
-50483=>14435,
-50484=>14436,
-50485=>14437,
-50486=>14438,
-50487=>14439,
-50490=>14440,
-50492=>14441,
-50494=>14442,
-50495=>14443,
-50496=>14444,
-50497=>14445,
-50498=>14446,
-50499=>14447,
-50502=>14448,
-50503=>14449,
-50507=>14450,
-50511=>14451,
-50512=>14452,
-50513=>14453,
-50514=>14454,
-50518=>14455,
-50522=>14456,
-50523=>14457,
-50524=>14458,
-50527=>14459,
-50530=>14460,
-50531=>14461,
-50533=>14462,
-50534=>14463,
-50535=>14464,
-50537=>14465,
-50538=>14466,
-50539=>14467,
-50540=>14468,
-50541=>14469,
-50542=>14470,
-50543=>14471,
-50546=>14472,
-50550=>14473,
-50551=>14474,
-50552=>14475,
-50553=>14476,
-50554=>14477,
-50555=>14478,
-50558=>14479,
-50559=>14480,
-50561=>14481,
-50562=>14482,
-50563=>14483,
-50565=>14484,
-50566=>14485,
-50568=>14486,
-50569=>14487,
-50570=>14488,
-50571=>14489,
-50574=>14490,
-50576=>14491,
-50578=>14492,
-50579=>14493,
-50580=>14494,
-50582=>14495,
-50585=>14496,
-50586=>14497,
-50587=>14498,
-50589=>14499,
-50590=>14500,
-50591=>14501,
-50593=>14502,
-50594=>14503,
-50595=>14504,
-50596=>14505,
-50597=>14506,
-50598=>14507,
-50599=>14508,
-50600=>14509,
-50602=>14510,
-50603=>14511,
-50604=>14512,
-50605=>14513,
-50606=>14514,
-50607=>14515,
-50608=>14516,
-50609=>14517,
-50610=>14518,
-50611=>14519,
-50614=>14520,
-50615=>14521,
-50618=>14522,
-50623=>14523,
-50624=>14524,
-50625=>14525,
-50626=>14526,
-50627=>14527,
-50635=>14528,
-50637=>14529,
-50639=>14530,
-50642=>14531,
-50643=>14532,
-50645=>14533,
-50646=>14534,
-50647=>14535,
-50649=>14536,
-50650=>14537,
-50651=>14538,
-50652=>14539,
-50653=>14540,
-50654=>14541,
-50655=>14542,
-50658=>14543,
-50660=>14544,
-50662=>14545,
-50663=>14546,
-50664=>14547,
-50665=>14548,
-50666=>14549,
-50667=>14550,
-50671=>14551,
-50673=>14552,
-50674=>14553,
-50675=>14554,
-50677=>14555,
-50680=>14556,
-50681=>14557,
-50682=>14558,
-50683=>14559,
-50690=>14560,
-50691=>14561,
-50692=>14562,
-50697=>14563,
-50698=>14564,
-50699=>14565,
-50701=>14566,
-50702=>14567,
-50703=>14568,
-50705=>14569,
-50706=>14570,
-50707=>14571,
-50708=>14572,
-50709=>14573,
-50710=>14574,
-50711=>14575,
-50714=>14576,
-50717=>14577,
-50718=>14578,
-50719=>14579,
-50720=>14580,
-50721=>14581,
-50722=>14582,
-50723=>14583,
-50726=>14584,
-50727=>14585,
-50729=>14586,
-50730=>14587,
-50731=>14588,
-50735=>14589,
-50737=>14590,
-50738=>14591,
-50742=>14592,
-50744=>14593,
-50746=>14594,
-50748=>14595,
-50749=>14596,
-50750=>14597,
-50751=>14598,
-50754=>14599,
-50755=>14600,
-50757=>14601,
-50758=>14602,
-50759=>14603,
-50761=>14604,
-50762=>14605,
-50763=>14606,
-50764=>14607,
-50765=>14608,
-50766=>14609,
-50767=>14610,
-50770=>14611,
-50774=>14612,
-50775=>14613,
-50776=>14614,
-50777=>14615,
-50778=>14616,
-50779=>14617,
-50782=>14618,
-50783=>14619,
-50785=>14620,
-50786=>14621,
-50787=>14622,
-50788=>14623,
-50789=>14624,
-50790=>14625,
-50791=>14626,
-50792=>14627,
-50793=>14628,
-50794=>14629,
-50795=>14630,
-50797=>14631,
-50798=>14632,
-50800=>14633,
-50802=>14634,
-50803=>14635,
-50804=>14636,
-50805=>14637,
-50806=>14638,
-50807=>14639,
-50810=>14640,
-50811=>14641,
-50813=>14642,
-50814=>14643,
-50815=>14644,
-50817=>14645,
-50818=>14646,
-50819=>14647,
-50820=>14648,
-50821=>14649,
-50822=>14650,
-50823=>14651,
-50826=>14652,
-50828=>14653,
-50830=>14654,
-50831=>14655,
-50832=>14656,
-50833=>14657,
-50834=>14658,
-50835=>14659,
-50838=>14660,
-50839=>14661,
-50841=>14662,
-50842=>14663,
-50843=>14664,
-50845=>14665,
-50846=>14666,
-50847=>14667,
-50848=>14668,
-50849=>14669,
-50850=>14670,
-50851=>14671,
-50854=>14672,
-50856=>14673,
-50858=>14674,
-50859=>14675,
-50860=>14676,
-50861=>14677,
-50862=>14678,
-50863=>14679,
-50866=>14680,
-50867=>14681,
-50869=>14682,
-50870=>14683,
-50871=>14684,
-50875=>14685,
-50876=>14686,
-50877=>14687,
-50878=>14688,
-50879=>14689,
-50882=>14690,
-50884=>14691,
-50886=>14692,
-50887=>14693,
-50888=>14694,
-50889=>14695,
-50890=>14696,
-50891=>14697,
-50894=>14698,
-50895=>14699,
-50897=>14700,
-50898=>14701,
-50899=>14702,
-50901=>14703,
-50902=>14704,
-50903=>14705,
-50904=>14706,
-50905=>14707,
-50906=>14708,
-50907=>14709,
-50910=>14710,
-50911=>14711,
-50914=>14712,
-50915=>14713,
-50916=>14714,
-50917=>14715,
-50918=>14716,
-50919=>14717,
-50922=>14718,
-50923=>14719,
-50925=>14720,
-50926=>14721,
-50927=>14722,
-50929=>14723,
-50930=>14724,
-50931=>14725,
-50932=>14726,
-50933=>14727,
-50934=>14728,
-50935=>14729,
-50938=>14730,
-50939=>14731,
-50940=>14732,
-50942=>14733,
-50943=>14734,
-50944=>14735,
-50945=>14736,
-50946=>14737,
-50947=>14738,
-50950=>14739,
-50951=>14740,
-50953=>14741,
-50954=>14742,
-50955=>14743,
-50957=>14744,
-50958=>14745,
-50959=>14746,
-50960=>14747,
-50961=>14748,
-50962=>14749,
-50963=>14750,
-50966=>14751,
-50968=>14752,
-50970=>14753,
-50971=>14754,
-50972=>14755,
-50973=>14756,
-50974=>14757,
-50975=>14758,
-50978=>14759,
-50979=>14760,
-50981=>14761,
-50982=>14762,
-50983=>14763,
-50985=>14764,
-50986=>14765,
-50987=>14766,
-50988=>14767,
-50989=>14768,
-50990=>14769,
-50991=>14770,
-50994=>14771,
-50996=>14772,
-50998=>14773,
-51000=>14774,
-51001=>14775,
-51002=>14776,
-51003=>14777,
-51006=>14778,
-51007=>14779,
-51009=>14780,
-51010=>14781,
-51011=>14782,
-51013=>14783,
-51014=>14784,
-51015=>14785,
-51016=>14786,
-51017=>14787,
-51019=>14788,
-51022=>14789,
-51024=>14790,
-51033=>14791,
-51034=>14792,
-51035=>14793,
-51037=>14794,
-51038=>14795,
-51039=>14796,
-51041=>14797,
-51042=>14798,
-51043=>14799,
-51044=>14800,
-51045=>14801,
-51046=>14802,
-51047=>14803,
-51049=>14804,
-51050=>14805,
-51052=>14806,
-51053=>14807,
-51054=>14808,
-51055=>14809,
-51056=>14810,
-51057=>14811,
-51058=>14812,
-51059=>14813,
-51062=>14814,
-51063=>14815,
-51065=>14816,
-51066=>14817,
-51067=>14818,
-51071=>14819,
-51072=>14820,
-51073=>14821,
-51074=>14822,
-51078=>14823,
-51083=>14824,
-51084=>14825,
-51085=>14826,
-51087=>14827,
-51090=>14828,
-51091=>14829,
-51093=>14830,
-51097=>14831,
-51099=>14832,
-51100=>14833,
-51101=>14834,
-51102=>14835,
-51103=>14836,
-51106=>14837,
-51111=>14838,
-51112=>14839,
-51113=>14840,
-51114=>14841,
-51115=>14842,
-51118=>14843,
-51119=>14844,
-51121=>14845,
-51122=>14846,
-51123=>14847,
-51125=>14848,
-51126=>14849,
-51127=>14850,
-51128=>14851,
-51129=>14852,
-51130=>14853,
-51131=>14854,
-51134=>14855,
-51138=>14856,
-51139=>14857,
-51140=>14858,
-51141=>14859,
-51142=>14860,
-51143=>14861,
-51146=>14862,
-51147=>14863,
-51149=>14864,
-51151=>14865,
-51153=>14866,
-51154=>14867,
-51155=>14868,
-51156=>14869,
-51157=>14870,
-51158=>14871,
-51159=>14872,
-51161=>14873,
-51162=>14874,
-51163=>14875,
-51164=>14876,
-51166=>14877,
-51167=>14878,
-51168=>14879,
-51169=>14880,
-51170=>14881,
-51171=>14882,
-51173=>14883,
-51174=>14884,
-51175=>14885,
-51177=>14886,
-51178=>14887,
-51179=>14888,
-51181=>14889,
-51182=>14890,
-51183=>14891,
-51184=>14892,
-51185=>14893,
-51186=>14894,
-51187=>14895,
-51188=>14896,
-51189=>14897,
-51190=>14898,
-51191=>14899,
-51192=>14900,
-51193=>14901,
-51194=>14902,
-51195=>14903,
-51196=>14904,
-51197=>14905,
-51198=>14906,
-51199=>14907,
-51202=>14908,
-51203=>14909,
-51205=>14910,
-51206=>14911,
-51207=>14912,
-51209=>14913,
-51211=>14914,
-51212=>14915,
-51213=>14916,
-51214=>14917,
-51215=>14918,
-51218=>14919,
-51220=>14920,
-51223=>14921,
-51224=>14922,
-51225=>14923,
-51226=>14924,
-51227=>14925,
-51230=>14926,
-51231=>14927,
-51233=>14928,
-51234=>14929,
-51235=>14930,
-51237=>14931,
-51238=>14932,
-51239=>14933,
-51240=>14934,
-51241=>14935,
-51242=>14936,
-51243=>14937,
-51246=>14938,
-51248=>14939,
-51250=>14940,
-51251=>14941,
-51252=>14942,
-51253=>14943,
-51254=>14944,
-51255=>14945,
-51257=>14946,
-51258=>14947,
-51259=>14948,
-51261=>14949,
-51262=>14950,
-51263=>14951,
-51265=>14952,
-51266=>14953,
-51267=>14954,
-51268=>14955,
-51269=>14956,
-51270=>14957,
-51271=>14958,
-51274=>14959,
-51275=>14960,
-51278=>14961,
-51279=>14962,
-51280=>14963,
-51281=>14964,
-51282=>14965,
-51283=>14966,
-51285=>14967,
-51286=>14968,
-51287=>14969,
-51288=>14970,
-51289=>14971,
-51290=>14972,
-51291=>14973,
-51292=>14974,
-51293=>14975,
-51294=>14976,
-51295=>14977,
-51296=>14978,
-51297=>14979,
-51298=>14980,
-51299=>14981,
-51300=>14982,
-51301=>14983,
-51302=>14984,
-51303=>14985,
-51304=>14986,
-51305=>14987,
-51306=>14988,
-51307=>14989,
-51308=>14990,
-51309=>14991,
-51310=>14992,
-51311=>14993,
-51314=>14994,
-51315=>14995,
-51317=>14996,
-51318=>14997,
-51319=>14998,
-51321=>14999,
-51323=>15000,
-51324=>15001,
-51325=>15002,
-51326=>15003,
-51327=>15004,
-51330=>15005,
-51332=>15006,
-51336=>15007,
-51337=>15008,
-51338=>15009,
-51342=>15010,
-51343=>15011,
-51344=>15012,
-51345=>15013,
-51346=>15014,
-51347=>15015,
-51349=>15016,
-51350=>15017,
-51351=>15018,
-51352=>15019,
-51353=>15020,
-51354=>15021,
-51355=>15022,
-51356=>15023,
-51358=>15024,
-51360=>15025,
-51362=>15026,
-51363=>15027,
-51364=>15028,
-51365=>15029,
-51366=>15030,
-51367=>15031,
-51369=>15032,
-51370=>15033,
-51371=>15034,
-51372=>15035,
-51373=>15036,
-51374=>15037,
-51375=>15038,
-51376=>15039,
-51377=>15040,
-51378=>15041,
-51379=>15042,
-51380=>15043,
-51381=>15044,
-51382=>15045,
-51383=>15046,
-51384=>15047,
-51385=>15048,
-51386=>15049,
-51387=>15050,
-51390=>15051,
-51391=>15052,
-51392=>15053,
-51393=>15054,
-51394=>15055,
-51395=>15056,
-51397=>15057,
-51398=>15058,
-51399=>15059,
-51401=>15060,
-51402=>15061,
-51403=>15062,
-51405=>15063,
-51406=>15064,
-51407=>15065,
-51408=>15066,
-51409=>15067,
-51410=>15068,
-51411=>15069,
-51414=>15070,
-51416=>15071,
-51418=>15072,
-51419=>15073,
-51420=>15074,
-51421=>15075,
-51422=>15076,
-51423=>15077,
-51426=>15078,
-51427=>15079,
-51429=>15080,
-51430=>15081,
-51431=>15082,
-51432=>15083,
-51433=>15084,
-51434=>15085,
-51435=>15086,
-51436=>15087,
-51437=>15088,
-51438=>15089,
-51439=>15090,
-51440=>15091,
-51441=>15092,
-51442=>15093,
-51443=>15094,
-51444=>15095,
-51446=>15096,
-51447=>15097,
-51448=>15098,
-51449=>15099,
-51450=>15100,
-51451=>15101,
-51454=>15102,
-51455=>15103,
-51457=>15104,
-51458=>15105,
-51459=>15106,
-51463=>15107,
-51464=>15108,
-51465=>15109,
-51466=>15110,
-51467=>15111,
-51470=>15112,
-51472=>15113,
-51474=>15114,
-51475=>15115,
-51476=>15116,
-51477=>15117,
-51478=>15118,
-51479=>15119,
-51481=>15120,
-51482=>15121,
-51483=>15122,
-51484=>15123,
-51485=>15124,
-51486=>15125,
-51487=>15126,
-51488=>15127,
-51489=>15128,
-51490=>15129,
-51491=>15130,
-51492=>15131,
-51493=>15132,
-51494=>15133,
-51495=>15134,
-51496=>15135,
-51497=>15136,
-51498=>15137,
-51499=>15138,
-51501=>15139,
-51502=>15140,
-51503=>15141,
-51504=>15142,
-51505=>15143,
-51506=>15144,
-51507=>15145,
-51509=>15146,
-51510=>15147,
-51511=>15148,
-51512=>15149,
-51513=>15150,
-51514=>15151,
-51515=>15152,
-51516=>15153,
-51517=>15154,
-51518=>15155,
-51519=>15156,
-51520=>15157,
-51521=>15158,
-51522=>15159,
-51523=>15160,
-51524=>15161,
-51525=>15162,
-51526=>15163,
-51527=>15164,
-51528=>15165,
-51529=>15166,
-51530=>15167,
-51531=>15168,
-51532=>15169,
-51533=>15170,
-51534=>15171,
-51535=>15172,
-51538=>15173,
-51539=>15174,
-51541=>15175,
-51542=>15176,
-51543=>15177,
-51545=>15178,
-51546=>15179,
-51547=>15180,
-51548=>15181,
-51549=>15182,
-51550=>15183,
-51551=>15184,
-51554=>15185,
-51556=>15186,
-51557=>15187,
-51558=>15188,
-51559=>15189,
-51560=>15190,
-51561=>15191,
-51562=>15192,
-51563=>15193,
-51565=>15194,
-51566=>15195,
-51567=>15196,
-51569=>15197,
-51570=>15198,
-51571=>15199,
-51573=>15200,
-51574=>15201,
-51575=>15202,
-51576=>15203,
-51577=>15204,
-51578=>15205,
-51579=>15206,
-51581=>15207,
-51582=>15208,
-51583=>15209,
-51584=>15210,
-51585=>15211,
-51586=>15212,
-51587=>15213,
-51588=>15214,
-51589=>15215,
-51590=>15216,
-51591=>15217,
-51594=>15218,
-51595=>15219,
-51597=>15220,
-51598=>15221,
-51599=>15222,
-51601=>15223,
-51602=>15224,
-51603=>15225,
-51604=>15226,
-51605=>15227,
-51606=>15228,
-51607=>15229,
-51610=>15230,
-51612=>15231,
-51614=>15232,
-51615=>15233,
-51616=>15234,
-51617=>15235,
-51618=>15236,
-51619=>15237,
-51620=>15238,
-51621=>15239,
-51622=>15240,
-51623=>15241,
-51624=>15242,
-51625=>15243,
-51626=>15244,
-51627=>15245,
-51628=>15246,
-51629=>15247,
-51630=>15248,
-51631=>15249,
-51632=>15250,
-51633=>15251,
-51634=>15252,
-51635=>15253,
-51636=>15254,
-51637=>15255,
-51638=>15256,
-51639=>15257,
-51640=>15258,
-51641=>15259,
-51642=>15260,
-51643=>15261,
-51644=>15262,
-51645=>15263,
-51646=>15264,
-51647=>15265,
-51650=>15266,
-51651=>15267,
-51653=>15268,
-51654=>15269,
-51657=>15270,
-51659=>15271,
-51660=>15272,
-51661=>15273,
-51662=>15274,
-51663=>15275,
-51666=>15276,
-51668=>15277,
-51671=>15278,
-51672=>15279,
-51675=>15280,
-51678=>15281,
-51679=>15282,
-51681=>15283,
-51683=>15284,
-51685=>15285,
-51686=>15286,
-51688=>15287,
-51689=>15288,
-51690=>15289,
-51691=>15290,
-51694=>15291,
-51698=>15292,
-51699=>15293,
-51700=>15294,
-51701=>15295,
-51702=>15296,
-51703=>15297,
-51706=>15298,
-51707=>15299,
-51709=>15300,
-51710=>15301,
-51711=>15302,
-51713=>15303,
-51714=>15304,
-51715=>15305,
-51716=>15306,
-51717=>15307,
-51718=>15308,
-51719=>15309,
-51722=>15310,
-51726=>15311,
-51727=>15312,
-51728=>15313,
-51729=>15314,
-51730=>15315,
-51731=>15316,
-51733=>15317,
-51734=>15318,
-51735=>15319,
-51737=>15320,
-51738=>15321,
-51739=>15322,
-51740=>15323,
-51741=>15324,
-51742=>15325,
-51743=>15326,
-51744=>15327,
-51745=>15328,
-51746=>15329,
-51747=>15330,
-51748=>15331,
-51749=>15332,
-51750=>15333,
-51751=>15334,
-51752=>15335,
-51754=>15336,
-51755=>15337,
-51756=>15338,
-51757=>15339,
-51758=>15340,
-51759=>15341,
-51760=>15342,
-51761=>15343,
-51762=>15344,
-51763=>15345,
-51764=>15346,
-51765=>15347,
-51766=>15348,
-51767=>15349,
-51768=>15350,
-51769=>15351,
-51770=>15352,
-51771=>15353,
-51772=>15354,
-51773=>15355,
-51774=>15356,
-51775=>15357,
-51776=>15358,
-51777=>15359,
-51778=>15360,
-51779=>15361,
-51780=>15362,
-51781=>15363,
-51782=>15364,
-51783=>15365,
-51784=>15366,
-51785=>15367,
-51786=>15368,
-51787=>15369,
-51790=>15370,
-51791=>15371,
-51793=>15372,
-51794=>15373,
-51795=>15374,
-51797=>15375,
-51798=>15376,
-51799=>15377,
-51800=>15378,
-51801=>15379,
-51802=>15380,
-51803=>15381,
-51806=>15382,
-51810=>15383,
-51811=>15384,
-51812=>15385,
-51813=>15386,
-51814=>15387,
-51815=>15388,
-51817=>15389,
-51818=>15390,
-51819=>15391,
-51820=>15392,
-51821=>15393,
-51822=>15394,
-51823=>15395,
-51824=>15396,
-51825=>15397,
-51826=>15398,
-51827=>15399,
-51828=>15400,
-51829=>15401,
-51830=>15402,
-51831=>15403,
-51832=>15404,
-51833=>15405,
-51834=>15406,
-51835=>15407,
-51836=>15408,
-51838=>15409,
-51839=>15410,
-51840=>15411,
-51841=>15412,
-51842=>15413,
-51843=>15414,
-51845=>15415,
-51846=>15416,
-51847=>15417,
-51848=>15418,
-51849=>15419,
-51850=>15420,
-51851=>15421,
-51852=>15422,
-51853=>15423,
-51854=>15424,
-51855=>15425,
-51856=>15426,
-51857=>15427,
-51858=>15428,
-51859=>15429,
-51860=>15430,
-51861=>15431,
-51862=>15432,
-51863=>15433,
-51865=>15434,
-51866=>15435,
-51867=>15436,
-51868=>15437,
-51869=>15438,
-51870=>15439,
-51871=>15440,
-51872=>15441,
-51873=>15442,
-51874=>15443,
-51875=>15444,
-51876=>15445,
-51877=>15446,
-51878=>15447,
-51879=>15448,
-51880=>15449,
-51881=>15450,
-51882=>15451,
-51883=>15452,
-51884=>15453,
-51885=>15454,
-51886=>15455,
-51887=>15456,
-51888=>15457,
-51889=>15458,
-51890=>15459,
-51891=>15460,
-51892=>15461,
-51893=>15462,
-51894=>15463,
-51895=>15464,
-51896=>15465,
-51897=>15466,
-51898=>15467,
-51899=>15468,
-51902=>15469,
-51903=>15470,
-51905=>15471,
-51906=>15472,
-51907=>15473,
-51909=>15474,
-51910=>15475,
-51911=>15476,
-51912=>15477,
-51913=>15478,
-51914=>15479,
-51915=>15480,
-51918=>15481,
-51920=>15482,
-51922=>15483,
-51924=>15484,
-51925=>15485,
-51926=>15486,
-51927=>15487,
-51930=>15488,
-51931=>15489,
-51932=>15490,
-51933=>15491,
-51934=>15492,
-51935=>15493,
-51937=>15494,
-51938=>15495,
-51939=>15496,
-51940=>15497,
-51941=>15498,
-51942=>15499,
-51943=>15500,
-51944=>15501,
-51945=>15502,
-51946=>15503,
-51947=>15504,
-51949=>15505,
-51950=>15506,
-51951=>15507,
-51952=>15508,
-51953=>15509,
-51954=>15510,
-51955=>15511,
-51957=>15512,
-51958=>15513,
-51959=>15514,
-51960=>15515,
-51961=>15516,
-51962=>15517,
-51963=>15518,
-51964=>15519,
-51965=>15520,
-51966=>15521,
-51967=>15522,
-51968=>15523,
-51969=>15524,
-51970=>15525,
-51971=>15526,
-51972=>15527,
-51973=>15528,
-51974=>15529,
-51975=>15530,
-51977=>15531,
-51978=>15532,
-51979=>15533,
-51980=>15534,
-51981=>15535,
-51982=>15536,
-51983=>15537,
-51985=>15538,
-51986=>15539,
-51987=>15540,
-51989=>15541,
-51990=>15542,
-51991=>15543,
-51993=>15544,
-51994=>15545,
-51995=>15546,
-51996=>15547,
-51997=>15548,
-51998=>15549,
-51999=>15550,
-52002=>15551,
-52003=>15552,
-52004=>15553,
-52005=>15554,
-52006=>15555,
-52007=>15556,
-52008=>15557,
-52009=>15558,
-52010=>15559,
-52011=>15560,
-52012=>15561,
-52013=>15562,
-52014=>15563,
-52015=>15564,
-52016=>15565,
-52017=>15566,
-52018=>15567,
-52019=>15568,
-52020=>15569,
-52021=>15570,
-52022=>15571,
-52023=>15572,
-52024=>15573,
-52025=>15574,
-52026=>15575,
-52027=>15576,
-52028=>15577,
-52029=>15578,
-52030=>15579,
-52031=>15580,
-52032=>15581,
-52034=>15582,
-52035=>15583,
-52036=>15584,
-52037=>15585,
-52038=>15586,
-52039=>15587,
-52042=>15588,
-52043=>15589,
-52045=>15590,
-52046=>15591,
-52047=>15592,
-52049=>15593,
-52050=>15594,
-52051=>15595,
-52052=>15596,
-52053=>15597,
-52054=>15598,
-52055=>15599,
-52058=>15600,
-52059=>15601,
-52060=>15602,
-52062=>15603,
-52063=>15604,
-52064=>15605,
-52065=>15606,
-52066=>15607,
-52067=>15608,
-52069=>15609,
-52070=>15610,
-52071=>15611,
-52072=>15612,
-52073=>15613,
-52074=>15614,
-52075=>15615,
-52076=>15616,
-52077=>15617,
-52078=>15618,
-52079=>15619,
-52080=>15620,
-52081=>15621,
-52082=>15622,
-52083=>15623,
-52084=>15624,
-52085=>15625,
-52086=>15626,
-52087=>15627,
-52090=>15628,
-52091=>15629,
-52092=>15630,
-52093=>15631,
-52094=>15632,
-52095=>15633,
-52096=>15634,
-52097=>15635,
-52098=>15636,
-52099=>15637,
-52100=>15638,
-52101=>15639,
-52102=>15640,
-52103=>15641,
-52104=>15642,
-52105=>15643,
-52106=>15644,
-52107=>15645,
-52108=>15646,
-52109=>15647,
-52110=>15648,
-52111=>15649,
-52112=>15650,
-52113=>15651,
-52114=>15652,
-52115=>15653,
-52116=>15654,
-52117=>15655,
-52118=>15656,
-52119=>15657,
-52120=>15658,
-52121=>15659,
-52122=>15660,
-52123=>15661,
-52125=>15662,
-52126=>15663,
-52127=>15664,
-52128=>15665,
-52129=>15666,
-52130=>15667,
-52131=>15668,
-52132=>15669,
-52133=>15670,
-52134=>15671,
-52135=>15672,
-52136=>15673,
-52137=>15674,
-52138=>15675,
-52139=>15676,
-52140=>15677,
-52141=>15678,
-52142=>15679,
-52143=>15680,
-52144=>15681,
-52145=>15682,
-52146=>15683,
-52147=>15684,
-52148=>15685,
-52149=>15686,
-52150=>15687,
-52151=>15688,
-52153=>15689,
-52154=>15690,
-52155=>15691,
-52156=>15692,
-52157=>15693,
-52158=>15694,
-52159=>15695,
-52160=>15696,
-52161=>15697,
-52162=>15698,
-52163=>15699,
-52164=>15700,
-52165=>15701,
-52166=>15702,
-52167=>15703,
-52168=>15704,
-52169=>15705,
-52170=>15706,
-52171=>15707,
-52172=>15708,
-52173=>15709,
-52174=>15710,
-52175=>15711,
-52176=>15712,
-52177=>15713,
-52178=>15714,
-52179=>15715,
-52181=>15716,
-52182=>15717,
-52183=>15718,
-52184=>15719,
-52185=>15720,
-52186=>15721,
-52187=>15722,
-52188=>15723,
-52189=>15724,
-52190=>15725,
-52191=>15726,
-52192=>15727,
-52193=>15728,
-52194=>15729,
-52195=>15730,
-52197=>15731,
-52198=>15732,
-52200=>15733,
-52202=>15734,
-52203=>15735,
-52204=>15736,
-52205=>15737,
-52206=>15738,
-52207=>15739,
-52208=>15740,
-52209=>15741,
-52210=>15742,
-52211=>15743,
-52212=>15744,
-52213=>15745,
-52214=>15746,
-52215=>15747,
-52216=>15748,
-52217=>15749,
-52218=>15750,
-52219=>15751,
-52220=>15752,
-52221=>15753,
-52222=>15754,
-52223=>15755,
-52224=>15756,
-52225=>15757,
-52226=>15758,
-52227=>15759,
-52228=>15760,
-52229=>15761,
-52230=>15762,
-52231=>15763,
-52232=>15764,
-52233=>15765,
-52234=>15766,
-52235=>15767,
-52238=>15768,
-52239=>15769,
-52241=>15770,
-52242=>15771,
-52243=>15772,
-52245=>15773,
-52246=>15774,
-52247=>15775,
-52248=>15776,
-52249=>15777,
-52250=>15778,
-52251=>15779,
-52254=>15780,
-52255=>15781,
-52256=>15782,
-52259=>15783,
-52260=>15784,
-52261=>15785,
-52262=>15786,
-52266=>15787,
-52267=>15788,
-52269=>15789,
-52271=>15790,
-52273=>15791,
-52274=>15792,
-52275=>15793,
-52276=>15794,
-52277=>15795,
-52278=>15796,
-52279=>15797,
-52282=>15798,
-52287=>15799,
-52288=>15800,
-52289=>15801,
-52290=>15802,
-52291=>15803,
-52294=>15804,
-52295=>15805,
-52297=>15806,
-52298=>15807,
-52299=>15808,
-52301=>15809,
-52302=>15810,
-52303=>15811,
-52304=>15812,
-52305=>15813,
-52306=>15814,
-52307=>15815,
-52310=>15816,
-52314=>15817,
-52315=>15818,
-52316=>15819,
-52317=>15820,
-52318=>15821,
-52319=>15822,
-52321=>15823,
-52322=>15824,
-52323=>15825,
-52325=>15826,
-52327=>15827,
-52329=>15828,
-52330=>15829,
-52331=>15830,
-52332=>15831,
-52333=>15832,
-52334=>15833,
-52335=>15834,
-52337=>15835,
-52338=>15836,
-52339=>15837,
-52340=>15838,
-52342=>15839,
-52343=>15840,
-52344=>15841,
-52345=>15842,
-52346=>15843,
-52347=>15844,
-52348=>15845,
-52349=>15846,
-52350=>15847,
-52351=>15848,
-52352=>15849,
-52353=>15850,
-52354=>15851,
-52355=>15852,
-52356=>15853,
-52357=>15854,
-52358=>15855,
-52359=>15856,
-52360=>15857,
-52361=>15858,
-52362=>15859,
-52363=>15860,
-52364=>15861,
-52365=>15862,
-52366=>15863,
-52367=>15864,
-52368=>15865,
-52369=>15866,
-52370=>15867,
-52371=>15868,
-52372=>15869,
-52373=>15870,
-52374=>15871,
-52375=>15872,
-52378=>15873,
-52379=>15874,
-52381=>15875,
-52382=>15876,
-52383=>15877,
-52385=>15878,
-52386=>15879,
-52387=>15880,
-52388=>15881,
-52389=>15882,
-52390=>15883,
-52391=>15884,
-52394=>15885,
-52398=>15886,
-52399=>15887,
-52400=>15888,
-52401=>15889,
-52402=>15890,
-52403=>15891,
-52406=>15892,
-52407=>15893,
-52409=>15894,
-52410=>15895,
-52411=>15896,
-52413=>15897,
-52414=>15898,
-52415=>15899,
-52416=>15900,
-52417=>15901,
-52418=>15902,
-52419=>15903,
-52422=>15904,
-52424=>15905,
-52426=>15906,
-52427=>15907,
-52428=>15908,
-52429=>15909,
-52430=>15910,
-52431=>15911,
-52433=>15912,
-52434=>15913,
-52435=>15914,
-52437=>15915,
-52438=>15916,
-52439=>15917,
-52440=>15918,
-52441=>15919,
-52442=>15920,
-52443=>15921,
-52444=>15922,
-52445=>15923,
-52446=>15924,
-52447=>15925,
-52448=>15926,
-52449=>15927,
-52450=>15928,
-52451=>15929,
-52453=>15930,
-52454=>15931,
-52455=>15932,
-52456=>15933,
-52457=>15934,
-52458=>15935,
-52459=>15936,
-52461=>15937,
-52462=>15938,
-52463=>15939,
-52465=>15940,
-52466=>15941,
-52467=>15942,
-52468=>15943,
-52469=>15944,
-52470=>15945,
-52471=>15946,
-52472=>15947,
-52473=>15948,
-52474=>15949,
-52475=>15950,
-52476=>15951,
-52477=>15952,
-52478=>15953,
-52479=>15954,
-52480=>15955,
-52482=>15956,
-52483=>15957,
-52484=>15958,
-52485=>15959,
-52486=>15960,
-52487=>15961,
-52490=>15962,
-52491=>15963,
-52493=>15964,
-52494=>15965,
-52495=>15966,
-52497=>15967,
-52498=>15968,
-52499=>15969,
-52500=>15970,
-52501=>15971,
-52502=>15972,
-52503=>15973,
-52506=>15974,
-52508=>15975,
-52510=>15976,
-52511=>15977,
-52512=>15978,
-52513=>15979,
-52514=>15980,
-52515=>15981,
-52517=>15982,
-52518=>15983,
-52519=>15984,
-52521=>15985,
-52522=>15986,
-52523=>15987,
-52525=>15988,
-52526=>15989,
-52527=>15990,
-52528=>15991,
-52529=>15992,
-52530=>15993,
-52531=>15994,
-52532=>15995,
-52533=>15996,
-52534=>15997,
-52535=>15998,
-52536=>15999,
-52538=>16000,
-52539=>16001,
-52540=>16002,
-52541=>16003,
-52542=>16004,
-52543=>16005,
-52544=>16006,
-52545=>16007,
-52546=>16008,
-52547=>16009,
-52548=>16010,
-52549=>16011,
-52550=>16012,
-52551=>16013,
-52552=>16014,
-52553=>16015,
-52554=>16016,
-52555=>16017,
-52556=>16018,
-52557=>16019,
-52558=>16020,
-52559=>16021,
-52560=>16022,
-52561=>16023,
-52562=>16024,
-52563=>16025,
-52564=>16026,
-52565=>16027,
-52566=>16028,
-52567=>16029,
-52568=>16030,
-52569=>16031,
-52570=>16032,
-52571=>16033,
-52573=>16034,
-52574=>16035,
-52575=>16036,
-52577=>16037,
-52578=>16038,
-52579=>16039,
-52581=>16040,
-52582=>16041,
-52583=>16042,
-52584=>16043,
-52585=>16044,
-52586=>16045,
-52587=>16046,
-52590=>16047,
-52592=>16048,
-52594=>16049,
-52595=>16050,
-52596=>16051,
-52597=>16052,
-52598=>16053,
-52599=>16054,
-52601=>16055,
-52602=>16056,
-52603=>16057,
-52604=>16058,
-52605=>16059,
-52606=>16060,
-52607=>16061,
-52608=>16062,
-52609=>16063,
-52610=>16064,
-52611=>16065,
-52612=>16066,
-52613=>16067,
-52614=>16068,
-52615=>16069,
-52617=>16070,
-52618=>16071,
-52619=>16072,
-52620=>16073,
-52621=>16074,
-52622=>16075,
-52623=>16076,
-52624=>16077,
-52625=>16078,
-52626=>16079,
-52627=>16080,
-52630=>16081,
-52631=>16082,
-52633=>16083,
-52634=>16084,
-52635=>16085,
-52637=>16086,
-52638=>16087,
-52639=>16088,
-52640=>16089,
-52641=>16090,
-52642=>16091,
-52643=>16092,
-52646=>16093,
-52648=>16094,
-52650=>16095,
-52651=>16096,
-52652=>16097,
-52653=>16098,
-52654=>16099,
-52655=>16100,
-52657=>16101,
-52658=>16102,
-52659=>16103,
-52660=>16104,
-52661=>16105,
-52662=>16106,
-52663=>16107,
-52664=>16108,
-52665=>16109,
-52666=>16110,
-52667=>16111,
-52668=>16112,
-52669=>16113,
-52670=>16114,
-52671=>16115,
-52672=>16116,
-52673=>16117,
-52674=>16118,
-52675=>16119,
-52677=>16120,
-52678=>16121,
-52679=>16122,
-52680=>16123,
-52681=>16124,
-52682=>16125,
-52683=>16126,
-52685=>16127,
-52686=>16128,
-52687=>16129,
-52689=>16130,
-52690=>16131,
-52691=>16132,
-52692=>16133,
-52693=>16134,
-52694=>16135,
-52695=>16136,
-52696=>16137,
-52697=>16138,
-52698=>16139,
-52699=>16140,
-52700=>16141,
-52701=>16142,
-52702=>16143,
-52703=>16144,
-52704=>16145,
-52705=>16146,
-52706=>16147,
-52707=>16148,
-52708=>16149,
-52709=>16150,
-52710=>16151,
-52711=>16152,
-52713=>16153,
-52714=>16154,
-52715=>16155,
-52717=>16156,
-52718=>16157,
-52719=>16158,
-52721=>16159,
-52722=>16160,
-52723=>16161,
-52724=>16162,
-52725=>16163,
-52726=>16164,
-52727=>16165,
-52730=>16166,
-52732=>16167,
-52734=>16168,
-52735=>16169,
-52736=>16170,
-52737=>16171,
-52738=>16172,
-52739=>16173,
-52741=>16174,
-52742=>16175,
-52743=>16176,
-52745=>16177,
-52746=>16178,
-52747=>16179,
-52749=>16180,
-52750=>16181,
-52751=>16182,
-52752=>16183,
-52753=>16184,
-52754=>16185,
-52755=>16186,
-52757=>16187,
-52758=>16188,
-52759=>16189,
-52760=>16190,
-52762=>16191,
-52763=>16192,
-52764=>16193,
-52765=>16194,
-52766=>16195,
-52767=>16196,
-52770=>16197,
-52771=>16198,
-52773=>16199,
-52774=>16200,
-52775=>16201,
-52777=>16202,
-52778=>16203,
-52779=>16204,
-52780=>16205,
-52781=>16206,
-52782=>16207,
-52783=>16208,
-52786=>16209,
-52788=>16210,
-52790=>16211,
-52791=>16212,
-52792=>16213,
-52793=>16214,
-52794=>16215,
-52795=>16216,
-52796=>16217,
-52797=>16218,
-52798=>16219,
-52799=>16220,
-52800=>16221,
-52801=>16222,
-52802=>16223,
-52803=>16224,
-52804=>16225,
-52805=>16226,
-52806=>16227,
-52807=>16228,
-52808=>16229,
-52809=>16230,
-52810=>16231,
-52811=>16232,
-52812=>16233,
-52813=>16234,
-52814=>16235,
-52815=>16236,
-52816=>16237,
-52817=>16238,
-52818=>16239,
-52819=>16240,
-52820=>16241,
-52821=>16242,
-52822=>16243,
-52823=>16244,
-52826=>16245,
-52827=>16246,
-52829=>16247,
-52830=>16248,
-52834=>16249,
-52835=>16250,
-52836=>16251,
-52837=>16252,
-52838=>16253,
-52839=>16254,
-52842=>16255,
-52844=>16256,
-52846=>16257,
-52847=>16258,
-52848=>16259,
-52849=>16260,
-52850=>16261,
-52851=>16262,
-52854=>16263,
-52855=>16264,
-52857=>16265,
-52858=>16266,
-52859=>16267,
-52861=>16268,
-52862=>16269,
-52863=>16270,
-52864=>16271,
-52865=>16272,
-52866=>16273,
-52867=>16274,
-52870=>16275,
-52872=>16276,
-52874=>16277,
-52875=>16278,
-52876=>16279,
-52877=>16280,
-52878=>16281,
-52879=>16282,
-52882=>16283,
-52883=>16284,
-52885=>16285,
-52886=>16286,
-52887=>16287,
-52889=>16288,
-52890=>16289,
-52891=>16290,
-52892=>16291,
-52893=>16292,
-52894=>16293,
-52895=>16294,
-52898=>16295,
-52902=>16296,
-52903=>16297,
-52904=>16298,
-52905=>16299,
-52906=>16300,
-52907=>16301,
-52910=>16302,
-52911=>16303,
-52912=>16304,
-52913=>16305,
-52914=>16306,
-52915=>16307,
-52916=>16308,
-52917=>16309,
-52918=>16310,
-52919=>16311,
-52920=>16312,
-52921=>16313,
-52922=>16314,
-52923=>16315,
-52924=>16316,
-52925=>16317,
-52926=>16318,
-52927=>16319,
-52928=>16320,
-52930=>16321,
-52931=>16322,
-52932=>16323,
-52933=>16324,
-52934=>16325,
-52935=>16326,
-52936=>16327,
-52937=>16328,
-52938=>16329,
-52939=>16330,
-52940=>16331,
-52941=>16332,
-52942=>16333,
-52943=>16334,
-52944=>16335,
-52945=>16336,
-52946=>16337,
-52947=>16338,
-52948=>16339,
-52949=>16340,
-52950=>16341,
-52951=>16342,
-52952=>16343,
-52953=>16344,
-52954=>16345,
-52955=>16346,
-52956=>16347,
-52957=>16348,
-52958=>16349,
-52959=>16350,
-52960=>16351,
-52961=>16352,
-52962=>16353,
-52963=>16354,
-52966=>16355,
-52967=>16356,
-52969=>16357,
-52970=>16358,
-52973=>16359,
-52974=>16360,
-52975=>16361,
-52976=>16362,
-52977=>16363,
-52978=>16364,
-52979=>16365,
-52982=>16366,
-52986=>16367,
-52987=>16368,
-52988=>16369,
-52989=>16370,
-52990=>16371,
-52991=>16372,
-52994=>16373,
-52995=>16374,
-52997=>16375,
-52998=>16376,
-52999=>16377,
-53001=>16378,
-53002=>16379,
-53003=>16380,
-53004=>16381,
-53005=>16382,
-53006=>16383,
-53007=>16384,
-53010=>16385,
-53012=>16386,
-53014=>16387,
-53015=>16388,
-53016=>16389,
-53017=>16390,
-53018=>16391,
-53019=>16392,
-53021=>16393,
-53022=>16394,
-53023=>16395,
-53025=>16396,
-53026=>16397,
-53027=>16398,
-53029=>16399,
-53030=>16400,
-53031=>16401,
-53032=>16402,
-53033=>16403,
-53034=>16404,
-53035=>16405,
-53038=>16406,
-53042=>16407,
-53043=>16408,
-53044=>16409,
-53045=>16410,
-53046=>16411,
-53047=>16412,
-53049=>16413,
-53050=>16414,
-53051=>16415,
-53052=>16416,
-53053=>16417,
-53054=>16418,
-53055=>16419,
-53056=>16420,
-53057=>16421,
-53058=>16422,
-53059=>16423,
-53060=>16424,
-53061=>16425,
-53062=>16426,
-53063=>16427,
-53064=>16428,
-53065=>16429,
-53066=>16430,
-53067=>16431,
-53068=>16432,
-53069=>16433,
-53070=>16434,
-53071=>16435,
-53072=>16436,
-53073=>16437,
-53074=>16438,
-53075=>16439,
-53078=>16440,
-53079=>16441,
-53081=>16442,
-53082=>16443,
-53083=>16444,
-53085=>16445,
-53086=>16446,
-53087=>16447,
-53088=>16448,
-53089=>16449,
-53090=>16450,
-53091=>16451,
-53094=>16452,
-53096=>16453,
-53098=>16454,
-53099=>16455,
-53100=>16456,
-53101=>16457,
-53102=>16458,
-53103=>16459,
-53106=>16460,
-53107=>16461,
-53109=>16462,
-53110=>16463,
-53111=>16464,
-53113=>16465,
-53114=>16466,
-53115=>16467,
-53116=>16468,
-53117=>16469,
-53118=>16470,
-53119=>16471,
-53121=>16472,
-53122=>16473,
-53123=>16474,
-53124=>16475,
-53126=>16476,
-53127=>16477,
-53128=>16478,
-53129=>16479,
-53130=>16480,
-53131=>16481,
-53133=>16482,
-53134=>16483,
-53135=>16484,
-53136=>16485,
-53137=>16486,
-53138=>16487,
-53139=>16488,
-53140=>16489,
-53141=>16490,
-53142=>16491,
-53143=>16492,
-53144=>16493,
-53145=>16494,
-53146=>16495,
-53147=>16496,
-53148=>16497,
-53149=>16498,
-53150=>16499,
-53151=>16500,
-53152=>16501,
-53154=>16502,
-53155=>16503,
-53156=>16504,
-53157=>16505,
-53158=>16506,
-53159=>16507,
-53161=>16508,
-53162=>16509,
-53163=>16510,
-53164=>16511,
-53165=>16512,
-53166=>16513,
-53167=>16514,
-53169=>16515,
-53170=>16516,
-53171=>16517,
-53172=>16518,
-53173=>16519,
-53174=>16520,
-53175=>16521,
-53176=>16522,
-53177=>16523,
-53178=>16524,
-53179=>16525,
-53180=>16526,
-53181=>16527,
-53182=>16528,
-53183=>16529,
-53184=>16530,
-53185=>16531,
-53186=>16532,
-53187=>16533,
-53189=>16534,
-53190=>16535,
-53191=>16536,
-53192=>16537,
-53193=>16538,
-53194=>16539,
-53195=>16540,
-53196=>16541,
-53197=>16542,
-53198=>16543,
-53199=>16544,
-53200=>16545,
-53201=>16546,
-53202=>16547,
-53203=>16548,
-53204=>16549,
-53205=>16550,
-53206=>16551,
-53207=>16552,
-53208=>16553,
-53209=>16554,
-53210=>16555,
-53211=>16556,
-53212=>16557,
-53213=>16558,
-53214=>16559,
-53215=>16560,
-53218=>16561,
-53219=>16562,
-53221=>16563,
-53222=>16564,
-53223=>16565,
-53225=>16566,
-53226=>16567,
-53227=>16568,
-53228=>16569,
-53229=>16570,
-53230=>16571,
-53231=>16572,
-53234=>16573,
-53236=>16574,
-53238=>16575,
-53239=>16576,
-53240=>16577,
-53241=>16578,
-53242=>16579,
-53243=>16580,
-53245=>16581,
-53246=>16582,
-53247=>16583,
-53249=>16584,
-53250=>16585,
-53251=>16586,
-53253=>16587,
-53254=>16588,
-53255=>16589,
-53256=>16590,
-53257=>16591,
-53258=>16592,
-53259=>16593,
-53260=>16594,
-53261=>16595,
-53262=>16596,
-53263=>16597,
-53264=>16598,
-53266=>16599,
-53267=>16600,
-53268=>16601,
-53269=>16602,
-53270=>16603,
-53271=>16604,
-53273=>16605,
-53274=>16606,
-53275=>16607,
-53276=>16608,
-53277=>16609,
-53278=>16610,
-53279=>16611,
-53280=>16612,
-53281=>16613,
-53282=>16614,
-53283=>16615,
-53284=>16616,
-53285=>16617,
-53286=>16618,
-53287=>16619,
-53288=>16620,
-53289=>16621,
-53290=>16622,
-53291=>16623,
-53292=>16624,
-53294=>16625,
-53295=>16626,
-53296=>16627,
-53297=>16628,
-53298=>16629,
-53299=>16630,
-53302=>16631,
-53303=>16632,
-53305=>16633,
-53306=>16634,
-53307=>16635,
-53309=>16636,
-53310=>16637,
-53311=>16638,
-53312=>16639,
-53313=>16640,
-53314=>16641,
-53315=>16642,
-53318=>16643,
-53320=>16644,
-53322=>16645,
-53323=>16646,
-53324=>16647,
-53325=>16648,
-53326=>16649,
-53327=>16650,
-53329=>16651,
-53330=>16652,
-53331=>16653,
-53333=>16654,
-53334=>16655,
-53335=>16656,
-53337=>16657,
-53338=>16658,
-53339=>16659,
-53340=>16660,
-53341=>16661,
-53342=>16662,
-53343=>16663,
-53345=>16664,
-53346=>16665,
-53347=>16666,
-53348=>16667,
-53349=>16668,
-53350=>16669,
-53351=>16670,
-53352=>16671,
-53353=>16672,
-53354=>16673,
-53355=>16674,
-53358=>16675,
-53359=>16676,
-53361=>16677,
-53362=>16678,
-53363=>16679,
-53365=>16680,
-53366=>16681,
-53367=>16682,
-53368=>16683,
-53369=>16684,
-53370=>16685,
-53371=>16686,
-53374=>16687,
-53375=>16688,
-53376=>16689,
-53378=>16690,
-53379=>16691,
-53380=>16692,
-53381=>16693,
-53382=>16694,
-53383=>16695,
-53384=>16696,
-53385=>16697,
-53386=>16698,
-53387=>16699,
-53388=>16700,
-53389=>16701,
-53390=>16702,
-53391=>16703,
-53392=>16704,
-53393=>16705,
-53394=>16706,
-53395=>16707,
-53396=>16708,
-53397=>16709,
-53398=>16710,
-53399=>16711,
-53400=>16712,
-53401=>16713,
-53402=>16714,
-53403=>16715,
-53404=>16716,
-53405=>16717,
-53406=>16718,
-53407=>16719,
-53408=>16720,
-53409=>16721,
-53410=>16722,
-53411=>16723,
-53414=>16724,
-53415=>16725,
-53417=>16726,
-53418=>16727,
-53419=>16728,
-53421=>16729,
-53422=>16730,
-53423=>16731,
-53424=>16732,
-53425=>16733,
-53426=>16734,
-53427=>16735,
-53430=>16736,
-53432=>16737,
-53434=>16738,
-53435=>16739,
-53436=>16740,
-53437=>16741,
-53438=>16742,
-53439=>16743,
-53442=>16744,
-53443=>16745,
-53445=>16746,
-53446=>16747,
-53447=>16748,
-53450=>16749,
-53451=>16750,
-53452=>16751,
-53453=>16752,
-53454=>16753,
-53455=>16754,
-53458=>16755,
-53462=>16756,
-53463=>16757,
-53464=>16758,
-53465=>16759,
-53466=>16760,
-53467=>16761,
-53470=>16762,
-53471=>16763,
-53473=>16764,
-53474=>16765,
-53475=>16766,
-53477=>16767,
-53478=>16768,
-53479=>16769,
-53480=>16770,
-53481=>16771,
-53482=>16772,
-53483=>16773,
-53486=>16774,
-53490=>16775,
-53491=>16776,
-53492=>16777,
-53493=>16778,
-53494=>16779,
-53495=>16780,
-53497=>16781,
-53498=>16782,
-53499=>16783,
-53500=>16784,
-53501=>16785,
-53502=>16786,
-53503=>16787,
-53504=>16788,
-53505=>16789,
-53506=>16790,
-53507=>16791,
-53508=>16792,
-53509=>16793,
-53510=>16794,
-53511=>16795,
-53512=>16796,
-53513=>16797,
-53514=>16798,
-53515=>16799,
-53516=>16800,
-53518=>16801,
-53519=>16802,
-53520=>16803,
-53521=>16804,
-53522=>16805,
-53523=>16806,
-53524=>16807,
-53525=>16808,
-53526=>16809,
-53527=>16810,
-53528=>16811,
-53529=>16812,
-53530=>16813,
-53531=>16814,
-53532=>16815,
-53533=>16816,
-53534=>16817,
-53535=>16818,
-53536=>16819,
-53537=>16820,
-53538=>16821,
-53539=>16822,
-53540=>16823,
-53541=>16824,
-53542=>16825,
-53543=>16826,
-53544=>16827,
-53545=>16828,
-53546=>16829,
-53547=>16830,
-53548=>16831,
-53549=>16832,
-53550=>16833,
-53551=>16834,
-53554=>16835,
-53555=>16836,
-53557=>16837,
-53558=>16838,
-53559=>16839,
-53561=>16840,
-53563=>16841,
-53564=>16842,
-53565=>16843,
-53566=>16844,
-53567=>16845,
-53570=>16846,
-53574=>16847,
-53575=>16848,
-53576=>16849,
-53577=>16850,
-53578=>16851,
-53579=>16852,
-53582=>16853,
-53583=>16854,
-53585=>16855,
-53586=>16856,
-53587=>16857,
-53589=>16858,
-53590=>16859,
-53591=>16860,
-53592=>16861,
-53593=>16862,
-53594=>16863,
-53595=>16864,
-53598=>16865,
-53600=>16866,
-53602=>16867,
-53603=>16868,
-53604=>16869,
-53605=>16870,
-53606=>16871,
-53607=>16872,
-53609=>16873,
-53610=>16874,
-53611=>16875,
-53613=>16876,
-53614=>16877,
-53615=>16878,
-53616=>16879,
-53617=>16880,
-53618=>16881,
-53619=>16882,
-53620=>16883,
-53621=>16884,
-53622=>16885,
-53623=>16886,
-53624=>16887,
-53625=>16888,
-53626=>16889,
-53627=>16890,
-53629=>16891,
-53630=>16892,
-53631=>16893,
-53632=>16894,
-53633=>16895,
-53634=>16896,
-53635=>16897,
-53637=>16898,
-53638=>16899,
-53639=>16900,
-53641=>16901,
-53642=>16902,
-53643=>16903,
-53644=>16904,
-53645=>16905,
-53646=>16906,
-53647=>16907,
-53648=>16908,
-53649=>16909,
-53650=>16910,
-53651=>16911,
-53652=>16912,
-53653=>16913,
-53654=>16914,
-53655=>16915,
-53656=>16916,
-53657=>16917,
-53658=>16918,
-53659=>16919,
-53660=>16920,
-53661=>16921,
-53662=>16922,
-53663=>16923,
-53666=>16924,
-53667=>16925,
-53669=>16926,
-53670=>16927,
-53671=>16928,
-53673=>16929,
-53674=>16930,
-53675=>16931,
-53676=>16932,
-53677=>16933,
-53678=>16934,
-53679=>16935,
-53682=>16936,
-53684=>16937,
-53686=>16938,
-53687=>16939,
-53688=>16940,
-53689=>16941,
-53691=>16942,
-53693=>16943,
-53694=>16944,
-53695=>16945,
-53697=>16946,
-53698=>16947,
-53699=>16948,
-53700=>16949,
-53701=>16950,
-53702=>16951,
-53703=>16952,
-53704=>16953,
-53705=>16954,
-53706=>16955,
-53707=>16956,
-53708=>16957,
-53709=>16958,
-53710=>16959,
-53711=>16960,
-53712=>16961,
-53713=>16962,
-53714=>16963,
-53715=>16964,
-53716=>16965,
-53717=>16966,
-53718=>16967,
-53719=>16968,
-53721=>16969,
-53722=>16970,
-53723=>16971,
-53724=>16972,
-53725=>16973,
-53726=>16974,
-53727=>16975,
-53728=>16976,
-53729=>16977,
-53730=>16978,
-53731=>16979,
-53732=>16980,
-53733=>16981,
-53734=>16982,
-53735=>16983,
-53736=>16984,
-53737=>16985,
-53738=>16986,
-53739=>16987,
-53740=>16988,
-53741=>16989,
-53742=>16990,
-53743=>16991,
-53744=>16992,
-53745=>16993,
-53746=>16994,
-53747=>16995,
-53749=>16996,
-53750=>16997,
-53751=>16998,
-53753=>16999,
-53754=>17000,
-53755=>17001,
-53756=>17002,
-53757=>17003,
-53758=>17004,
-53759=>17005,
-53760=>17006,
-53761=>17007,
-53762=>17008,
-53763=>17009,
-53764=>17010,
-53765=>17011,
-53766=>17012,
-53768=>17013,
-53770=>17014,
-53771=>17015,
-53772=>17016,
-53773=>17017,
-53774=>17018,
-53775=>17019,
-53777=>17020,
-53778=>17021,
-53779=>17022,
-53780=>17023,
-53781=>17024,
-53782=>17025,
-53783=>17026,
-53784=>17027,
-53785=>17028,
-53786=>17029,
-53787=>17030,
-53788=>17031,
-53789=>17032,
-53790=>17033,
-53791=>17034,
-53792=>17035,
-53793=>17036,
-53794=>17037,
-53795=>17038,
-53796=>17039,
-53797=>17040,
-53798=>17041,
-53799=>17042,
-53800=>17043,
-53801=>17044,
-53802=>17045,
-53803=>17046,
-53806=>17047,
-53807=>17048,
-53809=>17049,
-53810=>17050,
-53811=>17051,
-53813=>17052,
-53814=>17053,
-53815=>17054,
-53816=>17055,
-53817=>17056,
-53818=>17057,
-53819=>17058,
-53822=>17059,
-53824=>17060,
-53826=>17061,
-53827=>17062,
-53828=>17063,
-53829=>17064,
-53830=>17065,
-53831=>17066,
-53833=>17067,
-53834=>17068,
-53835=>17069,
-53836=>17070,
-53837=>17071,
-53838=>17072,
-53839=>17073,
-53840=>17074,
-53841=>17075,
-53842=>17076,
-53843=>17077,
-53844=>17078,
-53845=>17079,
-53846=>17080,
-53847=>17081,
-53848=>17082,
-53849=>17083,
-53850=>17084,
-53851=>17085,
-53853=>17086,
-53854=>17087,
-53855=>17088,
-53856=>17089,
-53857=>17090,
-53858=>17091,
-53859=>17092,
-53861=>17093,
-53862=>17094,
-53863=>17095,
-53864=>17096,
-53865=>17097,
-53866=>17098,
-53867=>17099,
-53868=>17100,
-53869=>17101,
-53870=>17102,
-53871=>17103,
-53872=>17104,
-53873=>17105,
-53874=>17106,
-53875=>17107,
-53876=>17108,
-53877=>17109,
-53878=>17110,
-53879=>17111,
-53880=>17112,
-53881=>17113,
-53882=>17114,
-53883=>17115,
-53884=>17116,
-53885=>17117,
-53886=>17118,
-53887=>17119,
-53890=>17120,
-53891=>17121,
-53893=>17122,
-53894=>17123,
-53895=>17124,
-53897=>17125,
-53898=>17126,
-53899=>17127,
-53900=>17128,
-53901=>17129,
-53902=>17130,
-53903=>17131,
-53906=>17132,
-53907=>17133,
-53908=>17134,
-53910=>17135,
-53911=>17136,
-53912=>17137,
-53913=>17138,
-53914=>17139,
-53915=>17140,
-53917=>17141,
-53918=>17142,
-53919=>17143,
-53921=>17144,
-53922=>17145,
-53923=>17146,
-53925=>17147,
-53926=>17148,
-53927=>17149,
-53928=>17150,
-53929=>17151,
-53930=>17152,
-53931=>17153,
-53933=>17154,
-53934=>17155,
-53935=>17156,
-53936=>17157,
-53938=>17158,
-53939=>17159,
-53940=>17160,
-53941=>17161,
-53942=>17162,
-53943=>17163,
-53946=>17164,
-53947=>17165,
-53949=>17166,
-53950=>17167,
-53953=>17168,
-53955=>17169,
-53956=>17170,
-53957=>17171,
-53958=>17172,
-53959=>17173,
-53962=>17174,
-53964=>17175,
-53965=>17176,
-53966=>17177,
-53967=>17178,
-53968=>17179,
-53969=>17180,
-53970=>17181,
-53971=>17182,
-53973=>17183,
-53974=>17184,
-53975=>17185,
-53977=>17186,
-53978=>17187,
-53979=>17188,
-53981=>17189,
-53982=>17190,
-53983=>17191,
-53984=>17192,
-53985=>17193,
-53986=>17194,
-53987=>17195,
-53990=>17196,
-53991=>17197,
-53992=>17198,
-53993=>17199,
-53994=>17200,
-53995=>17201,
-53996=>17202,
-53997=>17203,
-53998=>17204,
-53999=>17205,
-54002=>17206,
-54003=>17207,
-54005=>17208,
-54006=>17209,
-54007=>17210,
-54009=>17211,
-54010=>17212,
-54011=>17213,
-54012=>17214,
-54013=>17215,
-54014=>17216,
-54015=>17217,
-54018=>17218,
-54020=>17219,
-54022=>17220,
-54023=>17221,
-54024=>17222,
-54025=>17223,
-54026=>17224,
-54027=>17225,
-54031=>17226,
-54033=>17227,
-54034=>17228,
-54035=>17229,
-54037=>17230,
-54039=>17231,
-54040=>17232,
-54041=>17233,
-54042=>17234,
-54043=>17235,
-54046=>17236,
-54050=>17237,
-54051=>17238,
-54052=>17239,
-54054=>17240,
-54055=>17241,
-54058=>17242,
-54059=>17243,
-54061=>17244,
-54062=>17245,
-54063=>17246,
-54065=>17247,
-54066=>17248,
-54067=>17249,
-54068=>17250,
-54069=>17251,
-54070=>17252,
-54071=>17253,
-54074=>17254,
-54078=>17255,
-54079=>17256,
-54080=>17257,
-54081=>17258,
-54082=>17259,
-54083=>17260,
-54086=>17261,
-54087=>17262,
-54088=>17263,
-54089=>17264,
-54090=>17265,
-54091=>17266,
-54092=>17267,
-54093=>17268,
-54094=>17269,
-54095=>17270,
-54096=>17271,
-54097=>17272,
-54098=>17273,
-54099=>17274,
-54100=>17275,
-54101=>17276,
-54102=>17277,
-54103=>17278,
-54104=>17279,
-54105=>17280,
-54106=>17281,
-54107=>17282,
-54108=>17283,
-54109=>17284,
-54110=>17285,
-54111=>17286,
-54112=>17287,
-54113=>17288,
-54114=>17289,
-54115=>17290,
-54116=>17291,
-54117=>17292,
-54118=>17293,
-54119=>17294,
-54120=>17295,
-54121=>17296,
-54122=>17297,
-54123=>17298,
-54124=>17299,
-54125=>17300,
-54126=>17301,
-54127=>17302,
-54128=>17303,
-54129=>17304,
-54130=>17305,
-54131=>17306,
-54132=>17307,
-54133=>17308,
-54134=>17309,
-54135=>17310,
-54136=>17311,
-54137=>17312,
-54138=>17313,
-54139=>17314,
-54142=>17315,
-54143=>17316,
-54145=>17317,
-54146=>17318,
-54147=>17319,
-54149=>17320,
-54150=>17321,
-54151=>17322,
-54152=>17323,
-54153=>17324,
-54154=>17325,
-54155=>17326,
-54158=>17327,
-54162=>17328,
-54163=>17329,
-54164=>17330,
-54165=>17331,
-54166=>17332,
-54167=>17333,
-54170=>17334,
-54171=>17335,
-54173=>17336,
-54174=>17337,
-54175=>17338,
-54177=>17339,
-54178=>17340,
-54179=>17341,
-54180=>17342,
-54181=>17343,
-54182=>17344,
-54183=>17345,
-54186=>17346,
-54188=>17347,
-54190=>17348,
-54191=>17349,
-54192=>17350,
-54193=>17351,
-54194=>17352,
-54195=>17353,
-54197=>17354,
-54198=>17355,
-54199=>17356,
-54201=>17357,
-54202=>17358,
-54203=>17359,
-54205=>17360,
-54206=>17361,
-54207=>17362,
-54208=>17363,
-54209=>17364,
-54210=>17365,
-54211=>17366,
-54214=>17367,
-54215=>17368,
-54218=>17369,
-54219=>17370,
-54220=>17371,
-54221=>17372,
-54222=>17373,
-54223=>17374,
-54225=>17375,
-54226=>17376,
-54227=>17377,
-54228=>17378,
-54229=>17379,
-54230=>17380,
-54231=>17381,
-54233=>17382,
-54234=>17383,
-54235=>17384,
-54236=>17385,
-54237=>17386,
-54238=>17387,
-54239=>17388,
-54240=>17389,
-54242=>17390,
-54244=>17391,
-54245=>17392,
-54246=>17393,
-54247=>17394,
-54248=>17395,
-54249=>17396,
-54250=>17397,
-54251=>17398,
-54254=>17399,
-54255=>17400,
-54257=>17401,
-54258=>17402,
-54259=>17403,
-54261=>17404,
-54262=>17405,
-54263=>17406,
-54264=>17407,
-54265=>17408,
-54266=>17409,
-54267=>17410,
-54270=>17411,
-54272=>17412,
-54274=>17413,
-54275=>17414,
-54276=>17415,
-54277=>17416,
-54278=>17417,
-54279=>17418,
-54281=>17419,
-54282=>17420,
-54283=>17421,
-54284=>17422,
-54285=>17423,
-54286=>17424,
-54287=>17425,
-54288=>17426,
-54289=>17427,
-54290=>17428,
-54291=>17429,
-54292=>17430,
-54293=>17431,
-54294=>17432,
-54295=>17433,
-54296=>17434,
-54297=>17435,
-54298=>17436,
-54299=>17437,
-54300=>17438,
-54302=>17439,
-54303=>17440,
-54304=>17441,
-54305=>17442,
-54306=>17443,
-54307=>17444,
-54308=>17445,
-54309=>17446,
-54310=>17447,
-54311=>17448,
-54312=>17449,
-54313=>17450,
-54314=>17451,
-54315=>17452,
-54316=>17453,
-54317=>17454,
-54318=>17455,
-54319=>17456,
-54320=>17457,
-54321=>17458,
-54322=>17459,
-54323=>17460,
-54324=>17461,
-54325=>17462,
-54326=>17463,
-54327=>17464,
-54328=>17465,
-54329=>17466,
-54330=>17467,
-54331=>17468,
-54332=>17469,
-54333=>17470,
-54334=>17471,
-54335=>17472,
-54337=>17473,
-54338=>17474,
-54339=>17475,
-54341=>17476,
-54342=>17477,
-54343=>17478,
-54344=>17479,
-54345=>17480,
-54346=>17481,
-54347=>17482,
-54348=>17483,
-54349=>17484,
-54350=>17485,
-54351=>17486,
-54352=>17487,
-54353=>17488,
-54354=>17489,
-54355=>17490,
-54356=>17491,
-54357=>17492,
-54358=>17493,
-54359=>17494,
-54360=>17495,
-54361=>17496,
-54362=>17497,
-54363=>17498,
-54365=>17499,
-54366=>17500,
-54367=>17501,
-54369=>17502,
-54370=>17503,
-54371=>17504,
-54373=>17505,
-54374=>17506,
-54375=>17507,
-54376=>17508,
-54377=>17509,
-54378=>17510,
-54379=>17511,
-54380=>17512,
-54382=>17513,
-54384=>17514,
-54385=>17515,
-54386=>17516,
-54387=>17517,
-54388=>17518,
-54389=>17519,
-54390=>17520,
-54391=>17521,
-54394=>17522,
-54395=>17523,
-54397=>17524,
-54398=>17525,
-54401=>17526,
-54403=>17527,
-54404=>17528,
-54405=>17529,
-54406=>17530,
-54407=>17531,
-54410=>17532,
-54412=>17533,
-54414=>17534,
-54415=>17535,
-54416=>17536,
-54417=>17537,
-54418=>17538,
-54419=>17539,
-54421=>17540,
-54422=>17541,
-54423=>17542,
-54424=>17543,
-54425=>17544,
-54426=>17545,
-54427=>17546,
-54428=>17547,
-54429=>17548,
-54430=>17549,
-54431=>17550,
-54432=>17551,
-54433=>17552,
-54434=>17553,
-54435=>17554,
-54436=>17555,
-54437=>17556,
-54438=>17557,
-54439=>17558,
-54440=>17559,
-54442=>17560,
-54443=>17561,
-54444=>17562,
-54445=>17563,
-54446=>17564,
-54447=>17565,
-54448=>17566,
-54449=>17567,
-54450=>17568,
-54451=>17569,
-54452=>17570,
-54453=>17571,
-54454=>17572,
-54455=>17573,
-54456=>17574,
-54457=>17575,
-54458=>17576,
-54459=>17577,
-54460=>17578,
-54461=>17579,
-54462=>17580,
-54463=>17581,
-54464=>17582,
-54465=>17583,
-54466=>17584,
-54467=>17585,
-54468=>17586,
-54469=>17587,
-54470=>17588,
-54471=>17589,
-54472=>17590,
-54473=>17591,
-54474=>17592,
-54475=>17593,
-54477=>17594,
-54478=>17595,
-54479=>17596,
-54481=>17597,
-54482=>17598,
-54483=>17599,
-54485=>17600,
-54486=>17601,
-54487=>17602,
-54488=>17603,
-54489=>17604,
-54490=>17605,
-54491=>17606,
-54493=>17607,
-54494=>17608,
-54496=>17609,
-54497=>17610,
-54498=>17611,
-54499=>17612,
-54500=>17613,
-54501=>17614,
-54502=>17615,
-54503=>17616,
-54505=>17617,
-54506=>17618,
-54507=>17619,
-54509=>17620,
-54510=>17621,
-54511=>17622,
-54513=>17623,
-54514=>17624,
-54515=>17625,
-54516=>17626,
-54517=>17627,
-54518=>17628,
-54519=>17629,
-54521=>17630,
-54522=>17631,
-54524=>17632,
-54526=>17633,
-54527=>17634,
-54528=>17635,
-54529=>17636,
-54530=>17637,
-54531=>17638,
-54533=>17639,
-54534=>17640,
-54535=>17641,
-54537=>17642,
-54538=>17643,
-54539=>17644,
-54541=>17645,
-54542=>17646,
-54543=>17647,
-54544=>17648,
-54545=>17649,
-54546=>17650,
-54547=>17651,
-54550=>17652,
-54552=>17653,
-54553=>17654,
-54554=>17655,
-54555=>17656,
-54556=>17657,
-54557=>17658,
-54558=>17659,
-54559=>17660,
-54560=>17661,
-54561=>17662,
-54562=>17663,
-54563=>17664,
-54564=>17665,
-54565=>17666,
-54566=>17667,
-54567=>17668,
-54568=>17669,
-54569=>17670,
-54570=>17671,
-54571=>17672,
-54572=>17673,
-54573=>17674,
-54574=>17675,
-54575=>17676,
-54576=>17677,
-54577=>17678,
-54578=>17679,
-54579=>17680,
-54580=>17681,
-54581=>17682,
-54582=>17683,
-54583=>17684,
-54584=>17685,
-54585=>17686,
-54586=>17687,
-54587=>17688,
-54590=>17689,
-54591=>17690,
-54593=>17691,
-54594=>17692,
-54595=>17693,
-54597=>17694,
-54598=>17695,
-54599=>17696,
-54600=>17697,
-54601=>17698,
-54602=>17699,
-54603=>17700,
-54606=>17701,
-54608=>17702,
-54610=>17703,
-54611=>17704,
-54612=>17705,
-54613=>17706,
-54614=>17707,
-54615=>17708,
-54618=>17709,
-54619=>17710,
-54621=>17711,
-54622=>17712,
-54623=>17713,
-54625=>17714,
-54626=>17715,
-54627=>17716,
-54628=>17717,
-54630=>17718,
-54631=>17719,
-54634=>17720,
-54636=>17721,
-54638=>17722,
-54639=>17723,
-54640=>17724,
-54641=>17725,
-54642=>17726,
-54643=>17727,
-54646=>17728,
-54647=>17729,
-54649=>17730,
-54650=>17731,
-54651=>17732,
-54653=>17733,
-54654=>17734,
-54655=>17735,
-54656=>17736,
-54657=>17737,
-54658=>17738,
-54659=>17739,
-54662=>17740,
-54666=>17741,
-54667=>17742,
-54668=>17743,
-54669=>17744,
-54670=>17745,
-54671=>17746,
-54673=>17747,
-54674=>17748,
-54675=>17749,
-54676=>17750,
-54677=>17751,
-54678=>17752,
-54679=>17753,
-54680=>17754,
-54681=>17755,
-54682=>17756,
-54683=>17757,
-54684=>17758,
-54685=>17759,
-54686=>17760,
-54687=>17761,
-54688=>17762,
-54689=>17763,
-54690=>17764,
-54691=>17765,
-54692=>17766,
-54694=>17767,
-54695=>17768,
-54696=>17769,
-54697=>17770,
-54698=>17771,
-54699=>17772,
-54700=>17773,
-54701=>17774,
-54702=>17775,
-54703=>17776,
-54704=>17777,
-54705=>17778,
-54706=>17779,
-54707=>17780,
-54708=>17781,
-54709=>17782,
-54710=>17783,
-54711=>17784,
-54712=>17785,
-54713=>17786,
-54714=>17787,
-54715=>17788,
-54716=>17789,
-54717=>17790,
-54718=>17791,
-54719=>17792,
-54720=>17793,
-54721=>17794,
-54722=>17795,
-54723=>17796,
-54724=>17797,
-54725=>17798,
-54726=>17799,
-54727=>17800,
-54730=>17801,
-54731=>17802,
-54733=>17803,
-54734=>17804,
-54735=>17805,
-54737=>17806,
-54739=>17807,
-54740=>17808,
-54741=>17809,
-54742=>17810,
-54743=>17811,
-54746=>17812,
-54748=>17813,
-54750=>17814,
-54751=>17815,
-54752=>17816,
-54753=>17817,
-54754=>17818,
-54755=>17819,
-54758=>17820,
-54759=>17821,
-54761=>17822,
-54762=>17823,
-54763=>17824,
-54765=>17825,
-54766=>17826,
-54767=>17827,
-54768=>17828,
-54769=>17829,
-54770=>17830,
-54771=>17831,
-54774=>17832,
-54776=>17833,
-54778=>17834,
-54779=>17835,
-54780=>17836,
-54781=>17837,
-54782=>17838,
-54783=>17839,
-54786=>17840,
-54787=>17841,
-54789=>17842,
-54790=>17843,
-54791=>17844,
-54793=>17845,
-54794=>17846,
-54795=>17847,
-54796=>17848,
-54797=>17849,
-54798=>17850,
-54799=>17851,
-54802=>17852,
-54806=>17853,
-54807=>17854,
-54808=>17855,
-54809=>17856,
-54810=>17857,
-54811=>17858,
-54813=>17859,
-54814=>17860,
-54815=>17861,
-54817=>17862,
-54818=>17863,
-54819=>17864,
-54821=>17865,
-54822=>17866,
-54823=>17867,
-54824=>17868,
-54825=>17869,
-54826=>17870,
-54827=>17871,
-54828=>17872,
-54830=>17873,
-54831=>17874,
-54832=>17875,
-54833=>17876,
-54834=>17877,
-54835=>17878,
-54836=>17879,
-54837=>17880,
-54838=>17881,
-54839=>17882,
-54842=>17883,
-54843=>17884,
-54845=>17885,
-54846=>17886,
-54847=>17887,
-54849=>17888,
-54850=>17889,
-54851=>17890,
-54852=>17891,
-54854=>17892,
-54855=>17893,
-54858=>17894,
-54860=>17895,
-54862=>17896,
-54863=>17897,
-54864=>17898,
-54866=>17899,
-54867=>17900,
-54870=>17901,
-54871=>17902,
-54873=>17903,
-54874=>17904,
-54875=>17905,
-54877=>17906,
-54878=>17907,
-54879=>17908,
-54880=>17909,
-54881=>17910,
-54882=>17911,
-54883=>17912,
-54884=>17913,
-54885=>17914,
-54886=>17915,
-54888=>17916,
-54890=>17917,
-54891=>17918,
-54892=>17919,
-54893=>17920,
-54894=>17921,
-54895=>17922,
-54898=>17923,
-54899=>17924,
-54901=>17925,
-54902=>17926,
-54903=>17927,
-54904=>17928,
-54905=>17929,
-54906=>17930,
-54907=>17931,
-54908=>17932,
-54909=>17933,
-54910=>17934,
-54911=>17935,
-54912=>17936,
-54913=>17937,
-54914=>17938,
-54916=>17939,
-54918=>17940,
-54919=>17941,
-54920=>17942,
-54921=>17943,
-54922=>17944,
-54923=>17945,
-54926=>17946,
-54927=>17947,
-54929=>17948,
-54930=>17949,
-54931=>17950,
-54933=>17951,
-54934=>17952,
-54935=>17953,
-54936=>17954,
-54937=>17955,
-54938=>17956,
-54939=>17957,
-54940=>17958,
-54942=>17959,
-54944=>17960,
-54946=>17961,
-54947=>17962,
-54948=>17963,
-54949=>17964,
-54950=>17965,
-54951=>17966,
-54953=>17967,
-54954=>17968,
-54955=>17969,
-54957=>17970,
-54958=>17971,
-54959=>17972,
-54961=>17973,
-54962=>17974,
-54963=>17975,
-54964=>17976,
-54965=>17977,
-54966=>17978,
-54967=>17979,
-54968=>17980,
-54970=>17981,
-54972=>17982,
-54973=>17983,
-54974=>17984,
-54975=>17985,
-54976=>17986,
-54977=>17987,
-54978=>17988,
-54979=>17989,
-54982=>17990,
-54983=>17991,
-54985=>17992,
-54986=>17993,
-54987=>17994,
-54989=>17995,
-54990=>17996,
-54991=>17997,
-54992=>17998,
-54994=>17999,
-54995=>18000,
-54997=>18001,
-54998=>18002,
-55000=>18003,
-55002=>18004,
-55003=>18005,
-55004=>18006,
-55005=>18007,
-55006=>18008,
-55007=>18009,
-55009=>18010,
-55010=>18011,
-55011=>18012,
-55013=>18013,
-55014=>18014,
-55015=>18015,
-55017=>18016,
-55018=>18017,
-55019=>18018,
-55020=>18019,
-55021=>18020,
-55022=>18021,
-55023=>18022,
-55025=>18023,
-55026=>18024,
-55027=>18025,
-55028=>18026,
-55030=>18027,
-55031=>18028,
-55032=>18029,
-55033=>18030,
-55034=>18031,
-55035=>18032,
-55038=>18033,
-55039=>18034,
-55041=>18035,
-55042=>18036,
-55043=>18037,
-55045=>18038,
-55046=>18039,
-55047=>18040,
-55048=>18041,
-55049=>18042,
-55050=>18043,
-55051=>18044,
-55052=>18045,
-55053=>18046,
-55054=>18047,
-55055=>18048,
-55056=>18049,
-55058=>18050,
-55059=>18051,
-55060=>18052,
-55061=>18053,
-55062=>18054,
-55063=>18055,
-55066=>18056,
-55067=>18057,
-55069=>18058,
-55070=>18059,
-55071=>18060,
-55073=>18061,
-55074=>18062,
-55075=>18063,
-55076=>18064,
-55077=>18065,
-55078=>18066,
-55079=>18067,
-55082=>18068,
-55084=>18069,
-55086=>18070,
-55087=>18071,
-55088=>18072,
-55089=>18073,
-55090=>18074,
-55091=>18075,
-55094=>18076,
-55095=>18077,
-55097=>18078,
-55098=>18079,
-55099=>18080,
-55101=>18081,
-55102=>18082,
-55103=>18083,
-55104=>18084,
-55105=>18085,
-55106=>18086,
-55107=>18087,
-55109=>18088,
-55110=>18089,
-55112=>18090,
-55114=>18091,
-55115=>18092,
-55116=>18093,
-55117=>18094,
-55118=>18095,
-55119=>18096,
-55122=>18097,
-55123=>18098,
-55125=>18099,
-55130=>18100,
-55131=>18101,
-55132=>18102,
-55133=>18103,
-55134=>18104,
-55135=>18105,
-55138=>18106,
-55140=>18107,
-55142=>18108,
-55143=>18109,
-55144=>18110,
-55146=>18111,
-55147=>18112,
-55149=>18113,
-55150=>18114,
-55151=>18115,
-55153=>18116,
-55154=>18117,
-55155=>18118,
-55157=>18119,
-55158=>18120,
-55159=>18121,
-55160=>18122,
-55161=>18123,
-55162=>18124,
-55163=>18125,
-55166=>18126,
-55167=>18127,
-55168=>18128,
-55170=>18129,
-55171=>18130,
-55172=>18131,
-55173=>18132,
-55174=>18133,
-55175=>18134,
-55178=>18135,
-55179=>18136,
-55181=>18137,
-55182=>18138,
-55183=>18139,
-55185=>18140,
-55186=>18141,
-55187=>18142,
-55188=>18143,
-55189=>18144,
-55190=>18145,
-55191=>18146,
-55194=>18147,
-55196=>18148,
-55198=>18149,
-55199=>18150,
-55200=>18151,
-55201=>18152,
-55202=>18153,
-55203=>18154,
-);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/README.TXT b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/README.TXT
deleted file mode 100644
index 96d39fb8929..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/README.TXT
+++ /dev/null
@@ -1,135 +0,0 @@
-TCPDF Fonts
-
-TCPDF supports TrueTypeUnicode (UTF-8 Unicode), OpenTypeUnicode, TrueType, OpenType, Type1, CID-0 and Core (standard) fonts.
-
-There are two ways to use a new font: embedding it in the PDF (with or without subsetting) or not. When a font is not embedded, it is searched in the system. The advantage is that the PDF file is lighter; on the other hand, if it is not available, a substitution font is used. So it is preferable to ensure that the needed font is installed on the client systems. If the file is to be viewed by a large audience, it is recommended to embed.
-
-TCPDF support font subsetting to reduce the size of documents using large unicode font files.
-If you embed the whole font in the PDF, the person on the other end can make changes to it even if he didn't have your font.
-If you subset the font, file size of the PDF will be smaller but the person who receives your PDF would need to have your same font in order to make changes to your PDF.
-The option for enabling/disabling the font subsetting are explained on the source code documentation for methods SetFont() and AddFont(). 
-
-The fonts that could be not embedded are only the standard core fonts and CID-0 fonts.
-
-The PDF Core (standard) fonts are:
-
-    * courier : Courier
-    * courierb : Courier Bold
-    * courierbi : Courier Bold Italic
-    * courieri : Courier Italic
-    * helvetica : Helvetica
-    * helveticab : Helvetica Bold
-    * helveticabi : Helvetica Bold Italic
-    * helveticai : Helvetica Italic
-    * symbol : Symbol
-    * times : Times New Roman
-    * timesb : Times New Roman Bold
-    * timesbi : Times New Roman Bold Italic
-    * timesi : Times New Roman Italic
-    * zapfdingbats : Zapf Dingbats
-
-Setting up a font for usage with TCPDF requires the following steps:
-
-   1. Convert all font filenames to lowercase and rename using the following schema:
-          * [basic-font-name-in-lowercase].ttf for regular font
-          * [basic-font-name-in-lowercase]b.ttf for bold variation
-          * [basic-font-name-in-lowercase]i.ttf for oblique variation
-          * [basic-font-name-in-lowercase]bi.ttf for bold oblique variation
-
-   2. Generate the font's metrics file.
-          * For Type1 font files this first step is not necessary because the AFM file is usually shipped with the font. In case you have only a metric file in PFM format, use the pfm2afm utility (fonts/utils/pfm2afm) to get the AFM file. If you own a Type1 font in ASCII format (.pfa), you can convert it to binary format with Type 1 utilities.
-          * For TrueTypeUnicode or TrueType font files, use the the provided ttf2ufm utility (fonts/utils/ttf2ufm):
-
-            $ ttf2ufm -a -F myfont.ttf
-
-          * For OpenTypeUnicode or OpenType font files, use the the provided ttf2ufm utility (fonts/utils/ttf2ufm):
-
-            $ ttf2ufm -a -F myfont.otf
-
-   3. Run makefont.php script.
-          * For TrueTypeUnicode:
-
-            $ php -q makefont.php myfont.ttf myfont.ufm
-
-          * For OpenTypeUnicode:
-
-            $ php -q makefont.php myfont.otf myfont.ufm
-
-          * For TrueType:
-
-            $ php -q makefont.php myfont.ttf myfont.afm
-
-          * For OpenType:
-
-            $ php -q makefont.php myfont.otf myfont.afm
-
-          * For Type1:
-
-            $ php -q makefont.php myfont.pfb myfont.afm
-
-      You may also specify additional parameters:
-
-      MakeFont(string $fontfile, string $fmfile [, boolean $embedded [, $enc="cp1252" [, $patch=array()]]])
-
-          * $fontfile : Path to the .ttf or .pfb file.
-          * $fmfile : Path to the .afm file for Type1 and TrueType or .ufm for TrueTypeUnicode.
-          * $embedded : Set to false to not embed the font, true otherwise (default).
-          * $enc : Name of the encoding table to use. Default value: cp1252. Omit this parameter for TrueType Unicode, OpenType Unicode and symbolic fonts like Symbol or ZapfDingBats. The encoding defines the association between a code (from 0 to 255) and a character. The first 128 are fixed and correspond to ASCII. The encodings are stored in .map files. Those available are:
-                o cp1250 (Central Europe)
-                o cp1251 (Cyrillic)
-                o cp1252 (Western Europe)
-                o cp1253 (Greek)
-                o cp1254 (Turkish)
-                o cp1255 (Hebrew)
-                o cp1257 (Baltic)
-                o cp1258 (Vietnamese)
-                o cp874 (Thai)
-                o iso-8859-1 (Western Europe)
-                o iso-8859-2 (Central Europe)
-                o iso-8859-4 (Baltic)
-                o iso-8859-5 (Cyrillic)
-                o iso-8859-7 (Greek)
-                o iso-8859-9 (Turkish)
-                o iso-8859-11 (Thai)
-                o iso-8859-15 (Western Europe)
-                o iso-8859-16 (Central Europe)
-                o koi8-r (Russian)
-                o koi8-u (Ukrainian)
-            Of course, the font must contain the characters corresponding to the chosen encoding. The encodings which begin with cp are those used by Windows; Linux systems usually use ISO.
-          * $patch : Optional modification of the encoding. Empty by default. This parameter gives the possibility to alter the encoding. Sometimes you may want to add some characters. For instance, ISO-8859-1 does not contain the euro symbol. To add it at position 164, pass array(164=>'Euro').
-
-   4. Edit and copy resulting files by case:
-          * For embedded fonts: copy the resulting .php, .z and .ctg.z (if available) files to the TCPDF fonts directory.
-          * For not-embedding the font, edit the .php file and comment the $file entry.
-          * For CID-0 fonts (not embeddeed) you have to edit the .php file:
-                o change the font type to: $type='cidfont0';
-                o set the default font width by adding the line: $dw=1000;
-                o remove the $enc, $file and $ctg variables definitions
-                o add one of the following blocks of text at the end of the file (depends by the language you are using - see the arialunicid0.php file for a working example):
-                      + // Chinese Simplified
-                        $enc='UniCNS-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'CNS1','Supplement'=>0);
-                        include(dirname(__FILE__).'/uni2cid_ac15.php');
-
-                      + // Chinese Traditional
-                        $enc='UniGB-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'GB1','Supplement'=>2);
-                        include(dirname(__FILE__).'/uni2cid_ag15.php');
-
-                      + // Korean
-                        $enc='UniKS-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'Korea1','Supplement'=>0);
-                        include(dirname(__FILE__).'/uni2cid_ak12.php');
-
-                      + // Japanese
-                        $enc='UniJIS-UTF16-H';
-                        $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'Japan1','Supplement'=>5);
-                        include(dirname(__FILE__).'/uni2cid_aj16.php');
-
-                o copy the .php file to the TCPDF fonts directory.
-   5. Rename php font files variations using the following schema:
-          * [basic-font-name-in-lowercase].php for regular font
-          * [basic-font-name-in-lowercase]b.php for bold variation
-          * [basic-font-name-in-lowercase]i.php for oblique variation
-          * [basic-font-name-in-lowercase]bi.php for bold oblique variation
-
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1250.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1250.map
deleted file mode 100644
index ec110af0610..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1250.map
+++ /dev/null
@@ -1,251 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!89 U+2030 perthousand
-!8A U+0160 Scaron
-!8B U+2039 guilsinglleft
-!8C U+015A Sacute
-!8D U+0164 Tcaron
-!8E U+017D Zcaron
-!8F U+0179 Zacute
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9A U+0161 scaron
-!9B U+203A guilsinglright
-!9C U+015B sacute
-!9D U+0165 tcaron
-!9E U+017E zcaron
-!9F U+017A zacute
-!A0 U+00A0 space
-!A1 U+02C7 caron
-!A2 U+02D8 breve
-!A3 U+0141 Lslash
-!A4 U+00A4 currency
-!A5 U+0104 Aogonek
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+015E Scedilla
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+017B Zdotaccent
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+02DB ogonek
-!B3 U+0142 lslash
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+0105 aogonek
-!BA U+015F scedilla
-!BB U+00BB guillemotright
-!BC U+013D Lcaron
-!BD U+02DD hungarumlaut
-!BE U+013E lcaron
-!BF U+017C zdotaccent
-!C0 U+0154 Racute
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+0139 Lacute
-!C6 U+0106 Cacute
-!C7 U+00C7 Ccedilla
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0118 Eogonek
-!CB U+00CB Edieresis
-!CC U+011A Ecaron
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+010E Dcaron
-!D0 U+0110 Dcroat
-!D1 U+0143 Nacute
-!D2 U+0147 Ncaron
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+0150 Ohungarumlaut
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+0158 Rcaron
-!D9 U+016E Uring
-!DA U+00DA Uacute
-!DB U+0170 Uhungarumlaut
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+0162 Tcommaaccent
-!DF U+00DF germandbls
-!E0 U+0155 racute
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+013A lacute
-!E6 U+0107 cacute
-!E7 U+00E7 ccedilla
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+0119 eogonek
-!EB U+00EB edieresis
-!EC U+011B ecaron
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+010F dcaron
-!F0 U+0111 dcroat
-!F1 U+0144 nacute
-!F2 U+0148 ncaron
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+0151 ohungarumlaut
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+0159 rcaron
-!F9 U+016F uring
-!FA U+00FA uacute
-!FB U+0171 uhungarumlaut
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+0163 tcommaaccent
-!FF U+02D9 dotaccent
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1251.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1251.map
deleted file mode 100644
index de6a198d99d..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1251.map
+++ /dev/null
@@ -1,255 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0402 afii10051
-!81 U+0403 afii10052
-!82 U+201A quotesinglbase
-!83 U+0453 afii10100
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+20AC Euro
-!89 U+2030 perthousand
-!8A U+0409 afii10058
-!8B U+2039 guilsinglleft
-!8C U+040A afii10059
-!8D U+040C afii10061
-!8E U+040B afii10060
-!8F U+040F afii10145
-!90 U+0452 afii10099
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9A U+0459 afii10106
-!9B U+203A guilsinglright
-!9C U+045A afii10107
-!9D U+045C afii10109
-!9E U+045B afii10108
-!9F U+045F afii10193
-!A0 U+00A0 space
-!A1 U+040E afii10062
-!A2 U+045E afii10110
-!A3 U+0408 afii10057
-!A4 U+00A4 currency
-!A5 U+0490 afii10050
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+0401 afii10023
-!A9 U+00A9 copyright
-!AA U+0404 afii10053
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+0407 afii10056
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+0406 afii10055
-!B3 U+0456 afii10103
-!B4 U+0491 afii10098
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+0451 afii10071
-!B9 U+2116 afii61352
-!BA U+0454 afii10101
-!BB U+00BB guillemotright
-!BC U+0458 afii10105
-!BD U+0405 afii10054
-!BE U+0455 afii10102
-!BF U+0457 afii10104
-!C0 U+0410 afii10017
-!C1 U+0411 afii10018
-!C2 U+0412 afii10019
-!C3 U+0413 afii10020
-!C4 U+0414 afii10021
-!C5 U+0415 afii10022
-!C6 U+0416 afii10024
-!C7 U+0417 afii10025
-!C8 U+0418 afii10026
-!C9 U+0419 afii10027
-!CA U+041A afii10028
-!CB U+041B afii10029
-!CC U+041C afii10030
-!CD U+041D afii10031
-!CE U+041E afii10032
-!CF U+041F afii10033
-!D0 U+0420 afii10034
-!D1 U+0421 afii10035
-!D2 U+0422 afii10036
-!D3 U+0423 afii10037
-!D4 U+0424 afii10038
-!D5 U+0425 afii10039
-!D6 U+0426 afii10040
-!D7 U+0427 afii10041
-!D8 U+0428 afii10042
-!D9 U+0429 afii10043
-!DA U+042A afii10044
-!DB U+042B afii10045
-!DC U+042C afii10046
-!DD U+042D afii10047
-!DE U+042E afii10048
-!DF U+042F afii10049
-!E0 U+0430 afii10065
-!E1 U+0431 afii10066
-!E2 U+0432 afii10067
-!E3 U+0433 afii10068
-!E4 U+0434 afii10069
-!E5 U+0435 afii10070
-!E6 U+0436 afii10072
-!E7 U+0437 afii10073
-!E8 U+0438 afii10074
-!E9 U+0439 afii10075
-!EA U+043A afii10076
-!EB U+043B afii10077
-!EC U+043C afii10078
-!ED U+043D afii10079
-!EE U+043E afii10080
-!EF U+043F afii10081
-!F0 U+0440 afii10082
-!F1 U+0441 afii10083
-!F2 U+0442 afii10084
-!F3 U+0443 afii10085
-!F4 U+0444 afii10086
-!F5 U+0445 afii10087
-!F6 U+0446 afii10088
-!F7 U+0447 afii10089
-!F8 U+0448 afii10090
-!F9 U+0449 afii10091
-!FA U+044A afii10092
-!FB U+044B afii10093
-!FC U+044C afii10094
-!FD U+044D afii10095
-!FE U+044E afii10096
-!FF U+044F afii10097
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1252.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1252.map
deleted file mode 100644
index dd490e59614..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1252.map
+++ /dev/null
@@ -1,251 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8A U+0160 Scaron
-!8B U+2039 guilsinglleft
-!8C U+0152 OE
-!8E U+017D Zcaron
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9A U+0161 scaron
-!9B U+203A guilsinglright
-!9C U+0153 oe
-!9E U+017E zcaron
-!9F U+0178 Ydieresis
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+00D0 Eth
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+00DE Thorn
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+00F0 eth
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+00FE thorn
-!FF U+00FF ydieresis
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1253.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1253.map
deleted file mode 100644
index 4bd826fb265..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1253.map
+++ /dev/null
@@ -1,239 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!A0 U+00A0 space
-!A1 U+0385 dieresistonos
-!A2 U+0386 Alphatonos
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+2015 afii00208
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+0384 tonos
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+0388 Epsilontonos
-!B9 U+0389 Etatonos
-!BA U+038A Iotatonos
-!BB U+00BB guillemotright
-!BC U+038C Omicrontonos
-!BD U+00BD onehalf
-!BE U+038E Upsilontonos
-!BF U+038F Omegatonos
-!C0 U+0390 iotadieresistonos
-!C1 U+0391 Alpha
-!C2 U+0392 Beta
-!C3 U+0393 Gamma
-!C4 U+0394 Delta
-!C5 U+0395 Epsilon
-!C6 U+0396 Zeta
-!C7 U+0397 Eta
-!C8 U+0398 Theta
-!C9 U+0399 Iota
-!CA U+039A Kappa
-!CB U+039B Lambda
-!CC U+039C Mu
-!CD U+039D Nu
-!CE U+039E Xi
-!CF U+039F Omicron
-!D0 U+03A0 Pi
-!D1 U+03A1 Rho
-!D3 U+03A3 Sigma
-!D4 U+03A4 Tau
-!D5 U+03A5 Upsilon
-!D6 U+03A6 Phi
-!D7 U+03A7 Chi
-!D8 U+03A8 Psi
-!D9 U+03A9 Omega
-!DA U+03AA Iotadieresis
-!DB U+03AB Upsilondieresis
-!DC U+03AC alphatonos
-!DD U+03AD epsilontonos
-!DE U+03AE etatonos
-!DF U+03AF iotatonos
-!E0 U+03B0 upsilondieresistonos
-!E1 U+03B1 alpha
-!E2 U+03B2 beta
-!E3 U+03B3 gamma
-!E4 U+03B4 delta
-!E5 U+03B5 epsilon
-!E6 U+03B6 zeta
-!E7 U+03B7 eta
-!E8 U+03B8 theta
-!E9 U+03B9 iota
-!EA U+03BA kappa
-!EB U+03BB lambda
-!EC U+03BC mu
-!ED U+03BD nu
-!EE U+03BE xi
-!EF U+03BF omicron
-!F0 U+03C0 pi
-!F1 U+03C1 rho
-!F2 U+03C2 sigma1
-!F3 U+03C3 sigma
-!F4 U+03C4 tau
-!F5 U+03C5 upsilon
-!F6 U+03C6 phi
-!F7 U+03C7 chi
-!F8 U+03C8 psi
-!F9 U+03C9 omega
-!FA U+03CA iotadieresis
-!FB U+03CB upsilondieresis
-!FC U+03CC omicrontonos
-!FD U+03CD upsilontonos
-!FE U+03CE omegatonos
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1254.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1254.map
deleted file mode 100644
index 829473b28c5..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1254.map
+++ /dev/null
@@ -1,249 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8A U+0160 Scaron
-!8B U+2039 guilsinglleft
-!8C U+0152 OE
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9A U+0161 scaron
-!9B U+203A guilsinglright
-!9C U+0153 oe
-!9F U+0178 Ydieresis
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+011E Gbreve
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0130 Idotaccent
-!DE U+015E Scedilla
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+011F gbreve
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0131 dotlessi
-!FE U+015F scedilla
-!FF U+00FF ydieresis
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1255.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1255.map
deleted file mode 100644
index 079e10c61cd..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1255.map
+++ /dev/null
@@ -1,233 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+20AA afii57636
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00D7 multiply
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD sfthyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 middot
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00F7 divide
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+05B0 afii57799
-!C1 U+05B1 afii57801
-!C2 U+05B2 afii57800
-!C3 U+05B3 afii57802
-!C4 U+05B4 afii57793
-!C5 U+05B5 afii57794
-!C6 U+05B6 afii57795
-!C7 U+05B7 afii57798
-!C8 U+05B8 afii57797
-!C9 U+05B9 afii57806
-!CB U+05BB afii57796
-!CC U+05BC afii57807
-!CD U+05BD afii57839
-!CE U+05BE afii57645
-!CF U+05BF afii57841
-!D0 U+05C0 afii57842
-!D1 U+05C1 afii57804
-!D2 U+05C2 afii57803
-!D3 U+05C3 afii57658
-!D4 U+05F0 afii57716
-!D5 U+05F1 afii57717
-!D6 U+05F2 afii57718
-!D7 U+05F3 gereshhebrew
-!D8 U+05F4 gershayimhebrew
-!E0 U+05D0 afii57664
-!E1 U+05D1 afii57665
-!E2 U+05D2 afii57666
-!E3 U+05D3 afii57667
-!E4 U+05D4 afii57668
-!E5 U+05D5 afii57669
-!E6 U+05D6 afii57670
-!E7 U+05D7 afii57671
-!E8 U+05D8 afii57672
-!E9 U+05D9 afii57673
-!EA U+05DA afii57674
-!EB U+05DB afii57675
-!EC U+05DC afii57676
-!ED U+05DD afii57677
-!EE U+05DE afii57678
-!EF U+05DF afii57679
-!F0 U+05E0 afii57680
-!F1 U+05E1 afii57681
-!F2 U+05E2 afii57682
-!F3 U+05E3 afii57683
-!F4 U+05E4 afii57684
-!F5 U+05E5 afii57685
-!F6 U+05E6 afii57686
-!F7 U+05E7 afii57687
-!F8 U+05E8 afii57688
-!F9 U+05E9 afii57689
-!FA U+05EA afii57690
-!FD U+200E afii299
-!FE U+200F afii300
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1257.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1257.map
deleted file mode 100644
index 2f2ecfa21da..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1257.map
+++ /dev/null
@@ -1,244 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!8D U+00A8 dieresis
-!8E U+02C7 caron
-!8F U+00B8 cedilla
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!9D U+00AF macron
-!9E U+02DB ogonek
-!A0 U+00A0 space
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00D8 Oslash
-!A9 U+00A9 copyright
-!AA U+0156 Rcommaaccent
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00C6 AE
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00F8 oslash
-!B9 U+00B9 onesuperior
-!BA U+0157 rcommaaccent
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00E6 ae
-!C0 U+0104 Aogonek
-!C1 U+012E Iogonek
-!C2 U+0100 Amacron
-!C3 U+0106 Cacute
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+0118 Eogonek
-!C7 U+0112 Emacron
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0179 Zacute
-!CB U+0116 Edotaccent
-!CC U+0122 Gcommaaccent
-!CD U+0136 Kcommaaccent
-!CE U+012A Imacron
-!CF U+013B Lcommaaccent
-!D0 U+0160 Scaron
-!D1 U+0143 Nacute
-!D2 U+0145 Ncommaaccent
-!D3 U+00D3 Oacute
-!D4 U+014C Omacron
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+0172 Uogonek
-!D9 U+0141 Lslash
-!DA U+015A Sacute
-!DB U+016A Umacron
-!DC U+00DC Udieresis
-!DD U+017B Zdotaccent
-!DE U+017D Zcaron
-!DF U+00DF germandbls
-!E0 U+0105 aogonek
-!E1 U+012F iogonek
-!E2 U+0101 amacron
-!E3 U+0107 cacute
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+0119 eogonek
-!E7 U+0113 emacron
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+017A zacute
-!EB U+0117 edotaccent
-!EC U+0123 gcommaaccent
-!ED U+0137 kcommaaccent
-!EE U+012B imacron
-!EF U+013C lcommaaccent
-!F0 U+0161 scaron
-!F1 U+0144 nacute
-!F2 U+0146 ncommaaccent
-!F3 U+00F3 oacute
-!F4 U+014D omacron
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+0173 uogonek
-!F9 U+0142 lslash
-!FA U+015B sacute
-!FB U+016B umacron
-!FC U+00FC udieresis
-!FD U+017C zdotaccent
-!FE U+017E zcaron
-!FF U+02D9 dotaccent
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1258.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1258.map
deleted file mode 100644
index fed915f7152..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp1258.map
+++ /dev/null
@@ -1,247 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!82 U+201A quotesinglbase
-!83 U+0192 florin
-!84 U+201E quotedblbase
-!85 U+2026 ellipsis
-!86 U+2020 dagger
-!87 U+2021 daggerdbl
-!88 U+02C6 circumflex
-!89 U+2030 perthousand
-!8B U+2039 guilsinglleft
-!8C U+0152 OE
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!98 U+02DC tilde
-!99 U+2122 trademark
-!9B U+203A guilsinglright
-!9C U+0153 oe
-!9F U+0178 Ydieresis
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+0300 gravecomb
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+0110 Dcroat
-!D1 U+00D1 Ntilde
-!D2 U+0309 hookabovecomb
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+01A0 Ohorn
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+01AF Uhorn
-!DE U+0303 tildecomb
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+0301 acutecomb
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+0111 dcroat
-!F1 U+00F1 ntilde
-!F2 U+0323 dotbelowcomb
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+01A1 ohorn
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+01B0 uhorn
-!FE U+20AB dong
-!FF U+00FF ydieresis
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp874.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp874.map
deleted file mode 100644
index 1006e6b17f2..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/cp874.map
+++ /dev/null
@@ -1,225 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+20AC Euro
-!85 U+2026 ellipsis
-!91 U+2018 quoteleft
-!92 U+2019 quoteright
-!93 U+201C quotedblleft
-!94 U+201D quotedblright
-!95 U+2022 bullet
-!96 U+2013 endash
-!97 U+2014 emdash
-!A0 U+00A0 space
-!A1 U+0E01 kokaithai
-!A2 U+0E02 khokhaithai
-!A3 U+0E03 khokhuatthai
-!A4 U+0E04 khokhwaithai
-!A5 U+0E05 khokhonthai
-!A6 U+0E06 khorakhangthai
-!A7 U+0E07 ngonguthai
-!A8 U+0E08 chochanthai
-!A9 U+0E09 chochingthai
-!AA U+0E0A chochangthai
-!AB U+0E0B sosothai
-!AC U+0E0C chochoethai
-!AD U+0E0D yoyingthai
-!AE U+0E0E dochadathai
-!AF U+0E0F topatakthai
-!B0 U+0E10 thothanthai
-!B1 U+0E11 thonangmonthothai
-!B2 U+0E12 thophuthaothai
-!B3 U+0E13 nonenthai
-!B4 U+0E14 dodekthai
-!B5 U+0E15 totaothai
-!B6 U+0E16 thothungthai
-!B7 U+0E17 thothahanthai
-!B8 U+0E18 thothongthai
-!B9 U+0E19 nonuthai
-!BA U+0E1A bobaimaithai
-!BB U+0E1B poplathai
-!BC U+0E1C phophungthai
-!BD U+0E1D fofathai
-!BE U+0E1E phophanthai
-!BF U+0E1F fofanthai
-!C0 U+0E20 phosamphaothai
-!C1 U+0E21 momathai
-!C2 U+0E22 yoyakthai
-!C3 U+0E23 roruathai
-!C4 U+0E24 ruthai
-!C5 U+0E25 lolingthai
-!C6 U+0E26 luthai
-!C7 U+0E27 wowaenthai
-!C8 U+0E28 sosalathai
-!C9 U+0E29 sorusithai
-!CA U+0E2A sosuathai
-!CB U+0E2B hohipthai
-!CC U+0E2C lochulathai
-!CD U+0E2D oangthai
-!CE U+0E2E honokhukthai
-!CF U+0E2F paiyannoithai
-!D0 U+0E30 saraathai
-!D1 U+0E31 maihanakatthai
-!D2 U+0E32 saraaathai
-!D3 U+0E33 saraamthai
-!D4 U+0E34 saraithai
-!D5 U+0E35 saraiithai
-!D6 U+0E36 sarauethai
-!D7 U+0E37 saraueethai
-!D8 U+0E38 sarauthai
-!D9 U+0E39 sarauuthai
-!DA U+0E3A phinthuthai
-!DF U+0E3F bahtthai
-!E0 U+0E40 saraethai
-!E1 U+0E41 saraaethai
-!E2 U+0E42 saraothai
-!E3 U+0E43 saraaimaimuanthai
-!E4 U+0E44 saraaimaimalaithai
-!E5 U+0E45 lakkhangyaothai
-!E6 U+0E46 maiyamokthai
-!E7 U+0E47 maitaikhuthai
-!E8 U+0E48 maiekthai
-!E9 U+0E49 maithothai
-!EA U+0E4A maitrithai
-!EB U+0E4B maichattawathai
-!EC U+0E4C thanthakhatthai
-!ED U+0E4D nikhahitthai
-!EE U+0E4E yamakkanthai
-!EF U+0E4F fongmanthai
-!F0 U+0E50 zerothai
-!F1 U+0E51 onethai
-!F2 U+0E52 twothai
-!F3 U+0E53 threethai
-!F4 U+0E54 fourthai
-!F5 U+0E55 fivethai
-!F6 U+0E56 sixthai
-!F7 U+0E57 seventhai
-!F8 U+0E58 eightthai
-!F9 U+0E59 ninethai
-!FA U+0E5A angkhankhuthai
-!FB U+0E5B khomutthai
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-1.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-1.map
deleted file mode 100644
index 61740a38fa3..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-1.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+00D0 Eth
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+00DE Thorn
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+00F0 eth
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+00FE thorn
-!FF U+00FF ydieresis
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-11.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-11.map
deleted file mode 100644
index 91688120667..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-11.map
+++ /dev/null
@@ -1,248 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0E01 kokaithai
-!A2 U+0E02 khokhaithai
-!A3 U+0E03 khokhuatthai
-!A4 U+0E04 khokhwaithai
-!A5 U+0E05 khokhonthai
-!A6 U+0E06 khorakhangthai
-!A7 U+0E07 ngonguthai
-!A8 U+0E08 chochanthai
-!A9 U+0E09 chochingthai
-!AA U+0E0A chochangthai
-!AB U+0E0B sosothai
-!AC U+0E0C chochoethai
-!AD U+0E0D yoyingthai
-!AE U+0E0E dochadathai
-!AF U+0E0F topatakthai
-!B0 U+0E10 thothanthai
-!B1 U+0E11 thonangmonthothai
-!B2 U+0E12 thophuthaothai
-!B3 U+0E13 nonenthai
-!B4 U+0E14 dodekthai
-!B5 U+0E15 totaothai
-!B6 U+0E16 thothungthai
-!B7 U+0E17 thothahanthai
-!B8 U+0E18 thothongthai
-!B9 U+0E19 nonuthai
-!BA U+0E1A bobaimaithai
-!BB U+0E1B poplathai
-!BC U+0E1C phophungthai
-!BD U+0E1D fofathai
-!BE U+0E1E phophanthai
-!BF U+0E1F fofanthai
-!C0 U+0E20 phosamphaothai
-!C1 U+0E21 momathai
-!C2 U+0E22 yoyakthai
-!C3 U+0E23 roruathai
-!C4 U+0E24 ruthai
-!C5 U+0E25 lolingthai
-!C6 U+0E26 luthai
-!C7 U+0E27 wowaenthai
-!C8 U+0E28 sosalathai
-!C9 U+0E29 sorusithai
-!CA U+0E2A sosuathai
-!CB U+0E2B hohipthai
-!CC U+0E2C lochulathai
-!CD U+0E2D oangthai
-!CE U+0E2E honokhukthai
-!CF U+0E2F paiyannoithai
-!D0 U+0E30 saraathai
-!D1 U+0E31 maihanakatthai
-!D2 U+0E32 saraaathai
-!D3 U+0E33 saraamthai
-!D4 U+0E34 saraithai
-!D5 U+0E35 saraiithai
-!D6 U+0E36 sarauethai
-!D7 U+0E37 saraueethai
-!D8 U+0E38 sarauthai
-!D9 U+0E39 sarauuthai
-!DA U+0E3A phinthuthai
-!DF U+0E3F bahtthai
-!E0 U+0E40 saraethai
-!E1 U+0E41 saraaethai
-!E2 U+0E42 saraothai
-!E3 U+0E43 saraaimaimuanthai
-!E4 U+0E44 saraaimaimalaithai
-!E5 U+0E45 lakkhangyaothai
-!E6 U+0E46 maiyamokthai
-!E7 U+0E47 maitaikhuthai
-!E8 U+0E48 maiekthai
-!E9 U+0E49 maithothai
-!EA U+0E4A maitrithai
-!EB U+0E4B maichattawathai
-!EC U+0E4C thanthakhatthai
-!ED U+0E4D nikhahitthai
-!EE U+0E4E yamakkanthai
-!EF U+0E4F fongmanthai
-!F0 U+0E50 zerothai
-!F1 U+0E51 onethai
-!F2 U+0E52 twothai
-!F3 U+0E53 threethai
-!F4 U+0E54 fourthai
-!F5 U+0E55 fivethai
-!F6 U+0E56 sixthai
-!F7 U+0E57 seventhai
-!F8 U+0E58 eightthai
-!F9 U+0E59 ninethai
-!FA U+0E5A angkhankhuthai
-!FB U+0E5B khomutthai
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-15.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-15.map
deleted file mode 100644
index 6c2b5712793..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-15.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+20AC Euro
-!A5 U+00A5 yen
-!A6 U+0160 Scaron
-!A7 U+00A7 section
-!A8 U+0161 scaron
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+017D Zcaron
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+017E zcaron
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+0152 OE
-!BD U+0153 oe
-!BE U+0178 Ydieresis
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+00D0 Eth
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+00DE Thorn
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+00F0 eth
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+00FE thorn
-!FF U+00FF ydieresis
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-16.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-16.map
deleted file mode 100644
index 202c8fe5941..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-16.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0104 Aogonek
-!A2 U+0105 aogonek
-!A3 U+0141 Lslash
-!A4 U+20AC Euro
-!A5 U+201E quotedblbase
-!A6 U+0160 Scaron
-!A7 U+00A7 section
-!A8 U+0161 scaron
-!A9 U+00A9 copyright
-!AA U+0218 Scommaaccent
-!AB U+00AB guillemotleft
-!AC U+0179 Zacute
-!AD U+00AD hyphen
-!AE U+017A zacute
-!AF U+017B Zdotaccent
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+010C Ccaron
-!B3 U+0142 lslash
-!B4 U+017D Zcaron
-!B5 U+201D quotedblright
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+017E zcaron
-!B9 U+010D ccaron
-!BA U+0219 scommaaccent
-!BB U+00BB guillemotright
-!BC U+0152 OE
-!BD U+0153 oe
-!BE U+0178 Ydieresis
-!BF U+017C zdotaccent
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+0106 Cacute
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+0110 Dcroat
-!D1 U+0143 Nacute
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+0150 Ohungarumlaut
-!D6 U+00D6 Odieresis
-!D7 U+015A Sacute
-!D8 U+0170 Uhungarumlaut
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0118 Eogonek
-!DE U+021A Tcommaaccent
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+0107 cacute
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+0111 dcroat
-!F1 U+0144 nacute
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+0151 ohungarumlaut
-!F6 U+00F6 odieresis
-!F7 U+015B sacute
-!F8 U+0171 uhungarumlaut
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0119 eogonek
-!FE U+021B tcommaaccent
-!FF U+00FF ydieresis
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-2.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-2.map
deleted file mode 100644
index 65ae09f9581..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-2.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0104 Aogonek
-!A2 U+02D8 breve
-!A3 U+0141 Lslash
-!A4 U+00A4 currency
-!A5 U+013D Lcaron
-!A6 U+015A Sacute
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+0160 Scaron
-!AA U+015E Scedilla
-!AB U+0164 Tcaron
-!AC U+0179 Zacute
-!AD U+00AD hyphen
-!AE U+017D Zcaron
-!AF U+017B Zdotaccent
-!B0 U+00B0 degree
-!B1 U+0105 aogonek
-!B2 U+02DB ogonek
-!B3 U+0142 lslash
-!B4 U+00B4 acute
-!B5 U+013E lcaron
-!B6 U+015B sacute
-!B7 U+02C7 caron
-!B8 U+00B8 cedilla
-!B9 U+0161 scaron
-!BA U+015F scedilla
-!BB U+0165 tcaron
-!BC U+017A zacute
-!BD U+02DD hungarumlaut
-!BE U+017E zcaron
-!BF U+017C zdotaccent
-!C0 U+0154 Racute
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+0102 Abreve
-!C4 U+00C4 Adieresis
-!C5 U+0139 Lacute
-!C6 U+0106 Cacute
-!C7 U+00C7 Ccedilla
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0118 Eogonek
-!CB U+00CB Edieresis
-!CC U+011A Ecaron
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+010E Dcaron
-!D0 U+0110 Dcroat
-!D1 U+0143 Nacute
-!D2 U+0147 Ncaron
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+0150 Ohungarumlaut
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+0158 Rcaron
-!D9 U+016E Uring
-!DA U+00DA Uacute
-!DB U+0170 Uhungarumlaut
-!DC U+00DC Udieresis
-!DD U+00DD Yacute
-!DE U+0162 Tcommaaccent
-!DF U+00DF germandbls
-!E0 U+0155 racute
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+0103 abreve
-!E4 U+00E4 adieresis
-!E5 U+013A lacute
-!E6 U+0107 cacute
-!E7 U+00E7 ccedilla
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+0119 eogonek
-!EB U+00EB edieresis
-!EC U+011B ecaron
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+010F dcaron
-!F0 U+0111 dcroat
-!F1 U+0144 nacute
-!F2 U+0148 ncaron
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+0151 ohungarumlaut
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+0159 rcaron
-!F9 U+016F uring
-!FA U+00FA uacute
-!FB U+0171 uhungarumlaut
-!FC U+00FC udieresis
-!FD U+00FD yacute
-!FE U+0163 tcommaaccent
-!FF U+02D9 dotaccent
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-4.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-4.map
deleted file mode 100644
index a7d87bf3ef2..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-4.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0104 Aogonek
-!A2 U+0138 kgreenlandic
-!A3 U+0156 Rcommaaccent
-!A4 U+00A4 currency
-!A5 U+0128 Itilde
-!A6 U+013B Lcommaaccent
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+0160 Scaron
-!AA U+0112 Emacron
-!AB U+0122 Gcommaaccent
-!AC U+0166 Tbar
-!AD U+00AD hyphen
-!AE U+017D Zcaron
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+0105 aogonek
-!B2 U+02DB ogonek
-!B3 U+0157 rcommaaccent
-!B4 U+00B4 acute
-!B5 U+0129 itilde
-!B6 U+013C lcommaaccent
-!B7 U+02C7 caron
-!B8 U+00B8 cedilla
-!B9 U+0161 scaron
-!BA U+0113 emacron
-!BB U+0123 gcommaaccent
-!BC U+0167 tbar
-!BD U+014A Eng
-!BE U+017E zcaron
-!BF U+014B eng
-!C0 U+0100 Amacron
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+012E Iogonek
-!C8 U+010C Ccaron
-!C9 U+00C9 Eacute
-!CA U+0118 Eogonek
-!CB U+00CB Edieresis
-!CC U+0116 Edotaccent
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+012A Imacron
-!D0 U+0110 Dcroat
-!D1 U+0145 Ncommaaccent
-!D2 U+014C Omacron
-!D3 U+0136 Kcommaaccent
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+0172 Uogonek
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0168 Utilde
-!DE U+016A Umacron
-!DF U+00DF germandbls
-!E0 U+0101 amacron
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+012F iogonek
-!E8 U+010D ccaron
-!E9 U+00E9 eacute
-!EA U+0119 eogonek
-!EB U+00EB edieresis
-!EC U+0117 edotaccent
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+012B imacron
-!F0 U+0111 dcroat
-!F1 U+0146 ncommaaccent
-!F2 U+014D omacron
-!F3 U+0137 kcommaaccent
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+0173 uogonek
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0169 utilde
-!FE U+016B umacron
-!FF U+02D9 dotaccent
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-5.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-5.map
deleted file mode 100644
index f9cd4edcf85..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-5.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+0401 afii10023
-!A2 U+0402 afii10051
-!A3 U+0403 afii10052
-!A4 U+0404 afii10053
-!A5 U+0405 afii10054
-!A6 U+0406 afii10055
-!A7 U+0407 afii10056
-!A8 U+0408 afii10057
-!A9 U+0409 afii10058
-!AA U+040A afii10059
-!AB U+040B afii10060
-!AC U+040C afii10061
-!AD U+00AD hyphen
-!AE U+040E afii10062
-!AF U+040F afii10145
-!B0 U+0410 afii10017
-!B1 U+0411 afii10018
-!B2 U+0412 afii10019
-!B3 U+0413 afii10020
-!B4 U+0414 afii10021
-!B5 U+0415 afii10022
-!B6 U+0416 afii10024
-!B7 U+0417 afii10025
-!B8 U+0418 afii10026
-!B9 U+0419 afii10027
-!BA U+041A afii10028
-!BB U+041B afii10029
-!BC U+041C afii10030
-!BD U+041D afii10031
-!BE U+041E afii10032
-!BF U+041F afii10033
-!C0 U+0420 afii10034
-!C1 U+0421 afii10035
-!C2 U+0422 afii10036
-!C3 U+0423 afii10037
-!C4 U+0424 afii10038
-!C5 U+0425 afii10039
-!C6 U+0426 afii10040
-!C7 U+0427 afii10041
-!C8 U+0428 afii10042
-!C9 U+0429 afii10043
-!CA U+042A afii10044
-!CB U+042B afii10045
-!CC U+042C afii10046
-!CD U+042D afii10047
-!CE U+042E afii10048
-!CF U+042F afii10049
-!D0 U+0430 afii10065
-!D1 U+0431 afii10066
-!D2 U+0432 afii10067
-!D3 U+0433 afii10068
-!D4 U+0434 afii10069
-!D5 U+0435 afii10070
-!D6 U+0436 afii10072
-!D7 U+0437 afii10073
-!D8 U+0438 afii10074
-!D9 U+0439 afii10075
-!DA U+043A afii10076
-!DB U+043B afii10077
-!DC U+043C afii10078
-!DD U+043D afii10079
-!DE U+043E afii10080
-!DF U+043F afii10081
-!E0 U+0440 afii10082
-!E1 U+0441 afii10083
-!E2 U+0442 afii10084
-!E3 U+0443 afii10085
-!E4 U+0444 afii10086
-!E5 U+0445 afii10087
-!E6 U+0446 afii10088
-!E7 U+0447 afii10089
-!E8 U+0448 afii10090
-!E9 U+0449 afii10091
-!EA U+044A afii10092
-!EB U+044B afii10093
-!EC U+044C afii10094
-!ED U+044D afii10095
-!EE U+044E afii10096
-!EF U+044F afii10097
-!F0 U+2116 afii61352
-!F1 U+0451 afii10071
-!F2 U+0452 afii10099
-!F3 U+0453 afii10100
-!F4 U+0454 afii10101
-!F5 U+0455 afii10102
-!F6 U+0456 afii10103
-!F7 U+0457 afii10104
-!F8 U+0458 afii10105
-!F9 U+0459 afii10106
-!FA U+045A afii10107
-!FB U+045B afii10108
-!FC U+045C afii10109
-!FD U+00A7 section
-!FE U+045E afii10110
-!FF U+045F afii10193
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-7.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-7.map
deleted file mode 100644
index e163796b1ca..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-7.map
+++ /dev/null
@@ -1,250 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+2018 quoteleft
-!A2 U+2019 quoteright
-!A3 U+00A3 sterling
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AF U+2015 afii00208
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+0384 tonos
-!B5 U+0385 dieresistonos
-!B6 U+0386 Alphatonos
-!B7 U+00B7 periodcentered
-!B8 U+0388 Epsilontonos
-!B9 U+0389 Etatonos
-!BA U+038A Iotatonos
-!BB U+00BB guillemotright
-!BC U+038C Omicrontonos
-!BD U+00BD onehalf
-!BE U+038E Upsilontonos
-!BF U+038F Omegatonos
-!C0 U+0390 iotadieresistonos
-!C1 U+0391 Alpha
-!C2 U+0392 Beta
-!C3 U+0393 Gamma
-!C4 U+0394 Delta
-!C5 U+0395 Epsilon
-!C6 U+0396 Zeta
-!C7 U+0397 Eta
-!C8 U+0398 Theta
-!C9 U+0399 Iota
-!CA U+039A Kappa
-!CB U+039B Lambda
-!CC U+039C Mu
-!CD U+039D Nu
-!CE U+039E Xi
-!CF U+039F Omicron
-!D0 U+03A0 Pi
-!D1 U+03A1 Rho
-!D3 U+03A3 Sigma
-!D4 U+03A4 Tau
-!D5 U+03A5 Upsilon
-!D6 U+03A6 Phi
-!D7 U+03A7 Chi
-!D8 U+03A8 Psi
-!D9 U+03A9 Omega
-!DA U+03AA Iotadieresis
-!DB U+03AB Upsilondieresis
-!DC U+03AC alphatonos
-!DD U+03AD epsilontonos
-!DE U+03AE etatonos
-!DF U+03AF iotatonos
-!E0 U+03B0 upsilondieresistonos
-!E1 U+03B1 alpha
-!E2 U+03B2 beta
-!E3 U+03B3 gamma
-!E4 U+03B4 delta
-!E5 U+03B5 epsilon
-!E6 U+03B6 zeta
-!E7 U+03B7 eta
-!E8 U+03B8 theta
-!E9 U+03B9 iota
-!EA U+03BA kappa
-!EB U+03BB lambda
-!EC U+03BC mu
-!ED U+03BD nu
-!EE U+03BE xi
-!EF U+03BF omicron
-!F0 U+03C0 pi
-!F1 U+03C1 rho
-!F2 U+03C2 sigma1
-!F3 U+03C3 sigma
-!F4 U+03C4 tau
-!F5 U+03C5 upsilon
-!F6 U+03C6 phi
-!F7 U+03C7 chi
-!F8 U+03C8 psi
-!F9 U+03C9 omega
-!FA U+03CA iotadieresis
-!FB U+03CB upsilondieresis
-!FC U+03CC omicrontonos
-!FD U+03CD upsilontonos
-!FE U+03CE omegatonos
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-9.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-9.map
deleted file mode 100644
index 48c123ae6f6..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/iso-8859-9.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+0080 .notdef
-!81 U+0081 .notdef
-!82 U+0082 .notdef
-!83 U+0083 .notdef
-!84 U+0084 .notdef
-!85 U+0085 .notdef
-!86 U+0086 .notdef
-!87 U+0087 .notdef
-!88 U+0088 .notdef
-!89 U+0089 .notdef
-!8A U+008A .notdef
-!8B U+008B .notdef
-!8C U+008C .notdef
-!8D U+008D .notdef
-!8E U+008E .notdef
-!8F U+008F .notdef
-!90 U+0090 .notdef
-!91 U+0091 .notdef
-!92 U+0092 .notdef
-!93 U+0093 .notdef
-!94 U+0094 .notdef
-!95 U+0095 .notdef
-!96 U+0096 .notdef
-!97 U+0097 .notdef
-!98 U+0098 .notdef
-!99 U+0099 .notdef
-!9A U+009A .notdef
-!9B U+009B .notdef
-!9C U+009C .notdef
-!9D U+009D .notdef
-!9E U+009E .notdef
-!9F U+009F .notdef
-!A0 U+00A0 space
-!A1 U+00A1 exclamdown
-!A2 U+00A2 cent
-!A3 U+00A3 sterling
-!A4 U+00A4 currency
-!A5 U+00A5 yen
-!A6 U+00A6 brokenbar
-!A7 U+00A7 section
-!A8 U+00A8 dieresis
-!A9 U+00A9 copyright
-!AA U+00AA ordfeminine
-!AB U+00AB guillemotleft
-!AC U+00AC logicalnot
-!AD U+00AD hyphen
-!AE U+00AE registered
-!AF U+00AF macron
-!B0 U+00B0 degree
-!B1 U+00B1 plusminus
-!B2 U+00B2 twosuperior
-!B3 U+00B3 threesuperior
-!B4 U+00B4 acute
-!B5 U+00B5 mu
-!B6 U+00B6 paragraph
-!B7 U+00B7 periodcentered
-!B8 U+00B8 cedilla
-!B9 U+00B9 onesuperior
-!BA U+00BA ordmasculine
-!BB U+00BB guillemotright
-!BC U+00BC onequarter
-!BD U+00BD onehalf
-!BE U+00BE threequarters
-!BF U+00BF questiondown
-!C0 U+00C0 Agrave
-!C1 U+00C1 Aacute
-!C2 U+00C2 Acircumflex
-!C3 U+00C3 Atilde
-!C4 U+00C4 Adieresis
-!C5 U+00C5 Aring
-!C6 U+00C6 AE
-!C7 U+00C7 Ccedilla
-!C8 U+00C8 Egrave
-!C9 U+00C9 Eacute
-!CA U+00CA Ecircumflex
-!CB U+00CB Edieresis
-!CC U+00CC Igrave
-!CD U+00CD Iacute
-!CE U+00CE Icircumflex
-!CF U+00CF Idieresis
-!D0 U+011E Gbreve
-!D1 U+00D1 Ntilde
-!D2 U+00D2 Ograve
-!D3 U+00D3 Oacute
-!D4 U+00D4 Ocircumflex
-!D5 U+00D5 Otilde
-!D6 U+00D6 Odieresis
-!D7 U+00D7 multiply
-!D8 U+00D8 Oslash
-!D9 U+00D9 Ugrave
-!DA U+00DA Uacute
-!DB U+00DB Ucircumflex
-!DC U+00DC Udieresis
-!DD U+0130 Idotaccent
-!DE U+015E Scedilla
-!DF U+00DF germandbls
-!E0 U+00E0 agrave
-!E1 U+00E1 aacute
-!E2 U+00E2 acircumflex
-!E3 U+00E3 atilde
-!E4 U+00E4 adieresis
-!E5 U+00E5 aring
-!E6 U+00E6 ae
-!E7 U+00E7 ccedilla
-!E8 U+00E8 egrave
-!E9 U+00E9 eacute
-!EA U+00EA ecircumflex
-!EB U+00EB edieresis
-!EC U+00EC igrave
-!ED U+00ED iacute
-!EE U+00EE icircumflex
-!EF U+00EF idieresis
-!F0 U+011F gbreve
-!F1 U+00F1 ntilde
-!F2 U+00F2 ograve
-!F3 U+00F3 oacute
-!F4 U+00F4 ocircumflex
-!F5 U+00F5 otilde
-!F6 U+00F6 odieresis
-!F7 U+00F7 divide
-!F8 U+00F8 oslash
-!F9 U+00F9 ugrave
-!FA U+00FA uacute
-!FB U+00FB ucircumflex
-!FC U+00FC udieresis
-!FD U+0131 dotlessi
-!FE U+015F scedilla
-!FF U+00FF ydieresis
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/koi8-r.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/koi8-r.map
deleted file mode 100644
index 6ad5d05d0da..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/koi8-r.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+2500 SF100000
-!81 U+2502 SF110000
-!82 U+250C SF010000
-!83 U+2510 SF030000
-!84 U+2514 SF020000
-!85 U+2518 SF040000
-!86 U+251C SF080000
-!87 U+2524 SF090000
-!88 U+252C SF060000
-!89 U+2534 SF070000
-!8A U+253C SF050000
-!8B U+2580 upblock
-!8C U+2584 dnblock
-!8D U+2588 block
-!8E U+258C lfblock
-!8F U+2590 rtblock
-!90 U+2591 ltshade
-!91 U+2592 shade
-!92 U+2593 dkshade
-!93 U+2320 integraltp
-!94 U+25A0 filledbox
-!95 U+2219 periodcentered
-!96 U+221A radical
-!97 U+2248 approxequal
-!98 U+2264 lessequal
-!99 U+2265 greaterequal
-!9A U+00A0 space
-!9B U+2321 integralbt
-!9C U+00B0 degree
-!9D U+00B2 twosuperior
-!9E U+00B7 periodcentered
-!9F U+00F7 divide
-!A0 U+2550 SF430000
-!A1 U+2551 SF240000
-!A2 U+2552 SF510000
-!A3 U+0451 afii10071
-!A4 U+2553 SF520000
-!A5 U+2554 SF390000
-!A6 U+2555 SF220000
-!A7 U+2556 SF210000
-!A8 U+2557 SF250000
-!A9 U+2558 SF500000
-!AA U+2559 SF490000
-!AB U+255A SF380000
-!AC U+255B SF280000
-!AD U+255C SF270000
-!AE U+255D SF260000
-!AF U+255E SF360000
-!B0 U+255F SF370000
-!B1 U+2560 SF420000
-!B2 U+2561 SF190000
-!B3 U+0401 afii10023
-!B4 U+2562 SF200000
-!B5 U+2563 SF230000
-!B6 U+2564 SF470000
-!B7 U+2565 SF480000
-!B8 U+2566 SF410000
-!B9 U+2567 SF450000
-!BA U+2568 SF460000
-!BB U+2569 SF400000
-!BC U+256A SF540000
-!BD U+256B SF530000
-!BE U+256C SF440000
-!BF U+00A9 copyright
-!C0 U+044E afii10096
-!C1 U+0430 afii10065
-!C2 U+0431 afii10066
-!C3 U+0446 afii10088
-!C4 U+0434 afii10069
-!C5 U+0435 afii10070
-!C6 U+0444 afii10086
-!C7 U+0433 afii10068
-!C8 U+0445 afii10087
-!C9 U+0438 afii10074
-!CA U+0439 afii10075
-!CB U+043A afii10076
-!CC U+043B afii10077
-!CD U+043C afii10078
-!CE U+043D afii10079
-!CF U+043E afii10080
-!D0 U+043F afii10081
-!D1 U+044F afii10097
-!D2 U+0440 afii10082
-!D3 U+0441 afii10083
-!D4 U+0442 afii10084
-!D5 U+0443 afii10085
-!D6 U+0436 afii10072
-!D7 U+0432 afii10067
-!D8 U+044C afii10094
-!D9 U+044B afii10093
-!DA U+0437 afii10073
-!DB U+0448 afii10090
-!DC U+044D afii10095
-!DD U+0449 afii10091
-!DE U+0447 afii10089
-!DF U+044A afii10092
-!E0 U+042E afii10048
-!E1 U+0410 afii10017
-!E2 U+0411 afii10018
-!E3 U+0426 afii10040
-!E4 U+0414 afii10021
-!E5 U+0415 afii10022
-!E6 U+0424 afii10038
-!E7 U+0413 afii10020
-!E8 U+0425 afii10039
-!E9 U+0418 afii10026
-!EA U+0419 afii10027
-!EB U+041A afii10028
-!EC U+041B afii10029
-!ED U+041C afii10030
-!EE U+041D afii10031
-!EF U+041E afii10032
-!F0 U+041F afii10033
-!F1 U+042F afii10049
-!F2 U+0420 afii10034
-!F3 U+0421 afii10035
-!F4 U+0422 afii10036
-!F5 U+0423 afii10037
-!F6 U+0416 afii10024
-!F7 U+0412 afii10019
-!F8 U+042C afii10046
-!F9 U+042B afii10045
-!FA U+0417 afii10025
-!FB U+0428 afii10042
-!FC U+042D afii10047
-!FD U+0429 afii10043
-!FE U+0427 afii10041
-!FF U+042A afii10044
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/koi8-u.map b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/koi8-u.map
deleted file mode 100644
index 40a7e4fd7e5..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/enc/koi8-u.map
+++ /dev/null
@@ -1,256 +0,0 @@
-!00 U+0000 .notdef
-!01 U+0001 .notdef
-!02 U+0002 .notdef
-!03 U+0003 .notdef
-!04 U+0004 .notdef
-!05 U+0005 .notdef
-!06 U+0006 .notdef
-!07 U+0007 .notdef
-!08 U+0008 .notdef
-!09 U+0009 .notdef
-!0A U+000A .notdef
-!0B U+000B .notdef
-!0C U+000C .notdef
-!0D U+000D .notdef
-!0E U+000E .notdef
-!0F U+000F .notdef
-!10 U+0010 .notdef
-!11 U+0011 .notdef
-!12 U+0012 .notdef
-!13 U+0013 .notdef
-!14 U+0014 .notdef
-!15 U+0015 .notdef
-!16 U+0016 .notdef
-!17 U+0017 .notdef
-!18 U+0018 .notdef
-!19 U+0019 .notdef
-!1A U+001A .notdef
-!1B U+001B .notdef
-!1C U+001C .notdef
-!1D U+001D .notdef
-!1E U+001E .notdef
-!1F U+001F .notdef
-!20 U+0020 space
-!21 U+0021 exclam
-!22 U+0022 quotedbl
-!23 U+0023 numbersign
-!24 U+0024 dollar
-!25 U+0025 percent
-!26 U+0026 ampersand
-!27 U+0027 quotesingle
-!28 U+0028 parenleft
-!29 U+0029 parenright
-!2A U+002A asterisk
-!2B U+002B plus
-!2C U+002C comma
-!2D U+002D hyphen
-!2E U+002E period
-!2F U+002F slash
-!30 U+0030 zero
-!31 U+0031 one
-!32 U+0032 two
-!33 U+0033 three
-!34 U+0034 four
-!35 U+0035 five
-!36 U+0036 six
-!37 U+0037 seven
-!38 U+0038 eight
-!39 U+0039 nine
-!3A U+003A colon
-!3B U+003B semicolon
-!3C U+003C less
-!3D U+003D equal
-!3E U+003E greater
-!3F U+003F question
-!40 U+0040 at
-!41 U+0041 A
-!42 U+0042 B
-!43 U+0043 C
-!44 U+0044 D
-!45 U+0045 E
-!46 U+0046 F
-!47 U+0047 G
-!48 U+0048 H
-!49 U+0049 I
-!4A U+004A J
-!4B U+004B K
-!4C U+004C L
-!4D U+004D M
-!4E U+004E N
-!4F U+004F O
-!50 U+0050 P
-!51 U+0051 Q
-!52 U+0052 R
-!53 U+0053 S
-!54 U+0054 T
-!55 U+0055 U
-!56 U+0056 V
-!57 U+0057 W
-!58 U+0058 X
-!59 U+0059 Y
-!5A U+005A Z
-!5B U+005B bracketleft
-!5C U+005C backslash
-!5D U+005D bracketright
-!5E U+005E asciicircum
-!5F U+005F underscore
-!60 U+0060 grave
-!61 U+0061 a
-!62 U+0062 b
-!63 U+0063 c
-!64 U+0064 d
-!65 U+0065 e
-!66 U+0066 f
-!67 U+0067 g
-!68 U+0068 h
-!69 U+0069 i
-!6A U+006A j
-!6B U+006B k
-!6C U+006C l
-!6D U+006D m
-!6E U+006E n
-!6F U+006F o
-!70 U+0070 p
-!71 U+0071 q
-!72 U+0072 r
-!73 U+0073 s
-!74 U+0074 t
-!75 U+0075 u
-!76 U+0076 v
-!77 U+0077 w
-!78 U+0078 x
-!79 U+0079 y
-!7A U+007A z
-!7B U+007B braceleft
-!7C U+007C bar
-!7D U+007D braceright
-!7E U+007E asciitilde
-!7F U+007F .notdef
-!80 U+2500 SF100000
-!81 U+2502 SF110000
-!82 U+250C SF010000
-!83 U+2510 SF030000
-!84 U+2514 SF020000
-!85 U+2518 SF040000
-!86 U+251C SF080000
-!87 U+2524 SF090000
-!88 U+252C SF060000
-!89 U+2534 SF070000
-!8A U+253C SF050000
-!8B U+2580 upblock
-!8C U+2584 dnblock
-!8D U+2588 block
-!8E U+258C lfblock
-!8F U+2590 rtblock
-!90 U+2591 ltshade
-!91 U+2592 shade
-!92 U+2593 dkshade
-!93 U+2320 integraltp
-!94 U+25A0 filledbox
-!95 U+2022 bullet
-!96 U+221A radical
-!97 U+2248 approxequal
-!98 U+2264 lessequal
-!99 U+2265 greaterequal
-!9A U+00A0 space
-!9B U+2321 integralbt
-!9C U+00B0 degree
-!9D U+00B2 twosuperior
-!9E U+00B7 periodcentered
-!9F U+00F7 divide
-!A0 U+2550 SF430000
-!A1 U+2551 SF240000
-!A2 U+2552 SF510000
-!A3 U+0451 afii10071
-!A4 U+0454 afii10101
-!A5 U+2554 SF390000
-!A6 U+0456 afii10103
-!A7 U+0457 afii10104
-!A8 U+2557 SF250000
-!A9 U+2558 SF500000
-!AA U+2559 SF490000
-!AB U+255A SF380000
-!AC U+255B SF280000
-!AD U+0491 afii10098
-!AE U+255D SF260000
-!AF U+255E SF360000
-!B0 U+255F SF370000
-!B1 U+2560 SF420000
-!B2 U+2561 SF190000
-!B3 U+0401 afii10023
-!B4 U+0404 afii10053
-!B5 U+2563 SF230000
-!B6 U+0406 afii10055
-!B7 U+0407 afii10056
-!B8 U+2566 SF410000
-!B9 U+2567 SF450000
-!BA U+2568 SF460000
-!BB U+2569 SF400000
-!BC U+256A SF540000
-!BD U+0490 afii10050
-!BE U+256C SF440000
-!BF U+00A9 copyright
-!C0 U+044E afii10096
-!C1 U+0430 afii10065
-!C2 U+0431 afii10066
-!C3 U+0446 afii10088
-!C4 U+0434 afii10069
-!C5 U+0435 afii10070
-!C6 U+0444 afii10086
-!C7 U+0433 afii10068
-!C8 U+0445 afii10087
-!C9 U+0438 afii10074
-!CA U+0439 afii10075
-!CB U+043A afii10076
-!CC U+043B afii10077
-!CD U+043C afii10078
-!CE U+043D afii10079
-!CF U+043E afii10080
-!D0 U+043F afii10081
-!D1 U+044F afii10097
-!D2 U+0440 afii10082
-!D3 U+0441 afii10083
-!D4 U+0442 afii10084
-!D5 U+0443 afii10085
-!D6 U+0436 afii10072
-!D7 U+0432 afii10067
-!D8 U+044C afii10094
-!D9 U+044B afii10093
-!DA U+0437 afii10073
-!DB U+0448 afii10090
-!DC U+044D afii10095
-!DD U+0449 afii10091
-!DE U+0447 afii10089
-!DF U+044A afii10092
-!E0 U+042E afii10048
-!E1 U+0410 afii10017
-!E2 U+0411 afii10018
-!E3 U+0426 afii10040
-!E4 U+0414 afii10021
-!E5 U+0415 afii10022
-!E6 U+0424 afii10038
-!E7 U+0413 afii10020
-!E8 U+0425 afii10039
-!E9 U+0418 afii10026
-!EA U+0419 afii10027
-!EB U+041A afii10028
-!EC U+041B afii10029
-!ED U+041C afii10030
-!EE U+041D afii10031
-!EF U+041E afii10032
-!F0 U+041F afii10033
-!F1 U+042F afii10049
-!F2 U+0420 afii10034
-!F3 U+0421 afii10035
-!F4 U+0422 afii10036
-!F5 U+0423 afii10037
-!F6 U+0416 afii10024
-!F7 U+0412 afii10019
-!F8 U+042C afii10046
-!F9 U+042B afii10045
-!FA U+0417 afii10025
-!FB U+0428 afii10042
-!FC U+042D afii10047
-!FD U+0429 afii10043
-!FE U+0427 afii10041
-!FF U+042A afii10044
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll
deleted file mode 100644
index 53878a03123..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/makeallttffonts.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/makeallttffonts.php
deleted file mode 100644
index 4b10f52635f..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/makeallttffonts.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-//============================================================+
-// File name   : makeallttffonts.php
-// Begin       : 2008-12-07
-// Last Update : 2010-08-08
-//
-// Description : Process all TTF files on current directory to 
-//               build TCPDF compatible font files.
-//
-// Author: Nicola Asuni
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//
-// License: 
-//    Copyright (C) 2004-2010  Nicola Asuni - Tecnick.com S.r.l.
-//    
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-//============================================================+
-
-/**
- * Process all TTF files on current directory to build TCPDF compatible font files.
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @copyright Copyright &copy; 2004-2009, Nicola Asuni - Tecnick.com S.r.l. - ITALY - www.tecnick.com - info@tecnick.com
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @link www.tecnick.com
- * @since 2008-12-07
- */
-
-/**
- */
-
-// read directory for files (only graphics files).
-$handle = opendir('.');
-while($file = readdir($handle)) {
-	$path_parts = pathinfo($file);
-	$file_ext = strtolower($path_parts['extension']);
-	if ($file_ext == 'ttf') {
-		exec('./ttf2ufm -a -F '.$path_parts['basename'].'');
-		exec('php -q makefont.php '.$path_parts['basename'].' '.$path_parts['filename'].'.ufm');
-	}
-}
-closedir($handle);
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/makefont.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/makefont.php
deleted file mode 100644
index 608ec04073d..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/makefont.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-//============================================================+
-// File name   : makefont.php
-// Begin       : 2004-12-31
-// Last Update : 2010-08-08
-// Version     : 1.2.006
-// License     : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
-// 	----------------------------------------------------------------------------
-// 	Copyright (C) 2008-2010  Nicola Asuni - Tecnick.com S.r.l.
-// 	
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-//  ----------------------------------------------------------------------------
-//
-// Description : Utility to generate font definition files fot TCPDF
-//
-// Authors: Nicola Asuni, Olivier Plathey, Steven Wittens
-//
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com S.r.l.
-//               Via della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
-//============================================================+
-
-/**
- * Utility to generate font definition files fot TCPDF.
- * @author Nicola Asuni, Olivier Plathey, Steven Wittens
- * @copyright 2004-2008 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
-*/
-
-/**
- * 
- * @param string $fontfile path to font file (TTF, OTF or PFB).
- * @param string $fmfile font metrics file (UFM or AFM).
- * @param boolean $embedded Set to false to not embed the font, true otherwise (default).
- * @param string $enc Name of the encoding table to use. Omit this parameter for TrueType Unicode, OpenType Unicode and symbolic fonts like Symbol or ZapfDingBats.
- * @param array $patch Optional modification of the encoding
- */
-function MakeFont($fontfile, $fmfile, $embedded=true, $enc='cp1252', $patch=array()) {
-	//Generate a font definition file
-	set_magic_quotes_runtime(0);
-	ini_set('auto_detect_line_endings', '1');
-	if (!file_exists($fontfile)) {
-		die('Error: file not found: '.$fontfile);
-	}
-	if (!file_exists($fmfile)) {
-		die('Error: file not found: '.$fmfile);
-	}
-	$cidtogidmap = '';
-	$map = array();
-	$diff = '';
-	$dw = 0; // default width
-	$ffext = strtolower(substr($fontfile, -3));
-	$fmext = strtolower(substr($fmfile, -3));
-	if ($fmext == 'afm') {
-		if (($ffext == 'ttf') OR ($ffext == 'otf')) {
-			$type = 'TrueType';
-		} elseif ($ffext == 'pfb') {
-			$type = 'Type1';
-		} else {
-			die('Error: unrecognized font file extension: '.$ffext);
-		}
-		if ($enc) {
-			$map = ReadMap($enc);
-			foreach ($patch as $cc => $gn) {
-				$map[$cc] = $gn;
-			}
-		}
-		$fm = ReadAFM($fmfile, $map);
-		if (isset($widths['.notdef'])) {
-			$dw = $widths['.notdef'];
-		}
-		if ($enc) {
-			$diff = MakeFontEncoding($map);
-		}
-		$fd = MakeFontDescriptor($fm, empty($map));
-	} elseif ($fmext == 'ufm') {
-		$enc = '';
-		if (($ffext == 'ttf') OR ($ffext == 'otf')) {
-			$type = 'TrueTypeUnicode';
-		} else {
-			die('Error: not a TrueType font: '.$ffext);
-		}
-		$fm = ReadUFM($fmfile, $cidtogidmap);
-		$dw = $fm['MissingWidth'];
-		$fd = MakeFontDescriptor($fm, false);
-	}
-	//Start generation
-	$s = '<?php'."\n";
-	$s .= '$type=\''.$type."';\n";
-	$s .= '$name=\''.$fm['FontName']."';\n";
-	$s .= '$desc='.$fd.";\n";
-	if (!isset($fm['UnderlinePosition'])) {
-		$fm['UnderlinePosition'] = -100;
-	}
-	if (!isset($fm['UnderlineThickness'])) {
-		$fm['UnderlineThickness'] = 50;
-	}
-	$s .= '$up='.$fm['UnderlinePosition'].";\n";
-	$s .= '$ut='.$fm['UnderlineThickness'].";\n";
-	if ($dw <= 0) {
-		if (isset($fm['Widths'][32]) AND ($fm['Widths'][32] > 0)) {
-			// assign default space width
-			$dw = $fm['Widths'][32];
-		} else {
-			$dw = 600;
-		}
-	}
-	$s .= '$dw='.$dw.";\n";
-	$w = MakeWidthArray($fm);
-	$s .= '$cw='.$w.";\n";
-	$s .= '$enc=\''.$enc."';\n";
-	$s .= '$diff=\''.$diff."';\n";
-	$basename = substr(basename($fmfile), 0, -4);
-	if ($embedded) {
-		//Embedded font
-		if (($type == 'TrueType') OR ($type == 'TrueTypeUnicode')) {
-			CheckTTF($fontfile);
-		}
-		$f = fopen($fontfile,'rb');
-		if (!$f) {
-			die('Error: Unable to open '.$fontfile);
-		}
-		$file = fread($f, filesize($fontfile));
-		fclose($f);
-		if ($type == 'Type1') {
-			//Find first two sections and discard third one
-			$header = (ord($file{0}) == 128);
-			if ($header) {
-				//Strip first binary header
-				$file = substr($file, 6);
-			}
-			$pos = strpos($file, 'eexec');
-			if (!$pos) {
-				die('Error: font file does not seem to be valid Type1');
-			}
-			$size1 = $pos + 6;
-			if ($header AND (ord($file{$size1}) == 128)) {
-				//Strip second binary header
-				$file = substr($file, 0, $size1).substr($file, $size1+6);
-			}
-			$pos = strpos($file, '00000000');
-			if (!$pos) {
-				die('Error: font file does not seem to be valid Type1');
-			}
-			$size2 = $pos - $size1;
-			$file = substr($file, 0, ($size1 + $size2));
-		}
-		$basename = strtolower($basename);
-		if (function_exists('gzcompress')) {
-			$cmp = $basename.'.z';
-			SaveToFile($cmp, gzcompress($file, 9), 'b');
-			$s .= '$file=\''.$cmp."';\n";
-			print "Font file compressed (".$cmp.")\n";
-			if (!empty($cidtogidmap)) {
-				$cmp = $basename.'.ctg.z';
-				SaveToFile($cmp, gzcompress($cidtogidmap, 9), 'b');
-				print "CIDToGIDMap created and compressed (".$cmp.")\n";
-				$s .= '$ctg=\''.$cmp."';\n";
-			}
-		} else {
-			$s .= '$file=\''.basename($fontfile)."';\n";
-			print "Notice: font file could not be compressed (zlib extension not available)\n";
-			if (!empty($cidtogidmap)) {
-				$cmp = $basename.'.ctg';
-				$f = fopen($cmp, 'wb');
-				fwrite($f, $cidtogidmap);
-				fclose($f);
-				print "CIDToGIDMap created (".$cmp.")\n";
-				$s .= '$ctg=\''.$cmp."';\n";
-			}
-		}
-		if($type == 'Type1') {
-			$s .= '$size1='.$size1.";\n";
-			$s .= '$size2='.$size2.";\n";
-		} else {
-			$s.='$originalsize='.filesize($fontfile).";\n";
-		}
-	} else {
-		//Not embedded font
-		$s .= '$file='."'';\n";
-	}
-	$s .= '// --- EOF ---';
-	SaveToFile($basename.'.php',$s);
-	print "Font definition file generated (".$basename.".php)\n";
-}
-
-/**
- * Read the specified encoding map.
- * @param string $enc map name (see /enc/ folder for valid names).
- */
-function ReadMap($enc) {
-	//Read a map file
-	$file = dirname(__FILE__).'/enc/'.strtolower($enc).'.map';
-	$a = file($file);
-	if (empty($a)) {
-		die('Error: encoding not found: '.$enc);
-	}
-	$cc2gn = array();
-	foreach ($a as $l) {
-		if ($l{0} == '!') {
-			$e = preg_split('/[ \\t]+/',rtrim($l));
-			$cc = hexdec(substr($e[0],1));
-			$gn = $e[2];
-			$cc2gn[$cc] = $gn;
-		}
-	}
-	for($i = 0; $i <= 255; $i++) {
-		if(!isset($cc2gn[$i])) {
-			$cc2gn[$i] = '.notdef';
-		}
-	}
-	return $cc2gn;
-}
-
-/**
- * Read UFM file
- */
-function ReadUFM($file, &$cidtogidmap) {
-	//Prepare empty CIDToGIDMap
-	$cidtogidmap = str_pad('', (256 * 256 * 2), "\x00");
-	//Read a font metric file
-	$a = file($file);
-	if (empty($a)) {
-		die('File not found');
-	}
-	$widths = array();
-	$fm = array();
-	foreach($a as $l) {
-		$e = explode(' ',chop($l));
-		if(count($e) < 2) {
-			continue;
-		}
-		$code = $e[0];
-		$param = $e[1];
-		if($code == 'U') {
-			// U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-			//Character metrics
-			$cc = (int)$e[1];
-			if ($cc != -1) {
-			$gn = $e[7];
-			$w = $e[4];
-			$glyph = $e[10];
-			$widths[$cc] = $w;
-			if($cc == ord('X')) {
-				$fm['CapXHeight'] = $e[13];
-			}
-			// Set GID
-			if (($cc >= 0) AND ($cc < 0xFFFF) AND $glyph) {
-				$cidtogidmap{($cc * 2)} = chr($glyph >> 8);
-				$cidtogidmap{(($cc * 2) + 1)} = chr($glyph & 0xFF);
-			}
-		}
-		if((isset($gn) AND ($gn == '.notdef')) AND (!isset($fm['MissingWidth']))) {
-			$fm['MissingWidth'] = $w;
-		}
-		} elseif($code == 'FontName') {
-			$fm['FontName'] = $param;
-		} elseif($code == 'Weight') {
-			$fm['Weight'] = $param;
-		} elseif($code == 'ItalicAngle') {
-			$fm['ItalicAngle'] = (double)$param;
-		} elseif($code == 'Ascender') {
-			$fm['Ascender'] = (int)$param;
-		} elseif($code == 'Descender') {
-			$fm['Descender'] = (int)$param;
-		} elseif($code == 'UnderlineThickness') {
-			$fm['UnderlineThickness'] = (int)$param;
-		} elseif($code == 'UnderlinePosition') {
-			$fm['UnderlinePosition'] = (int)$param;
-		} elseif($code == 'IsFixedPitch') {
-			$fm['IsFixedPitch'] = ($param == 'true');
-		} elseif($code == 'FontBBox') {
-			$fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
-		} elseif($code == 'CapHeight') {
-			$fm['CapHeight'] = (int)$param;
-		} elseif($code == 'StdVW') {
-			$fm['StdVW'] = (int)$param;
-		}
-	}
-	if(!isset($fm['MissingWidth'])) {
-		$fm['MissingWidth'] = 600;
-	}
-	if(!isset($fm['FontName'])) {
-		die('FontName not found');
-	}
-	$fm['Widths'] = $widths;
-	return $fm;
-}
-
-/**
- * Read AFM file
- */
-function ReadAFM($file,&$map) {
-	//Read a font metric file
-	$a = file($file);
-	if(empty($a)) {
-		die('File not found');
-	}
-	$widths = array();
-	$fm = array();
-	$fix = array(
-		'Edot'=>'Edotaccent',
-		'edot'=>'edotaccent',
-		'Idot'=>'Idotaccent',
-		'Zdot'=>'Zdotaccent',
-		'zdot'=>'zdotaccent',
-		'Odblacute' => 'Ohungarumlaut',
-		'odblacute' => 'ohungarumlaut',
-		'Udblacute'=>'Uhungarumlaut',
-		'udblacute'=>'uhungarumlaut',
-		'Gcedilla'=>'Gcommaaccent'
-		,'gcedilla'=>'gcommaaccent',
-		'Kcedilla'=>'Kcommaaccent',
-		'kcedilla'=>'kcommaaccent',
-		'Lcedilla'=>'Lcommaaccent',
-		'lcedilla'=>'lcommaaccent',
-		'Ncedilla'=>'Ncommaaccent',
-		'ncedilla'=>'ncommaaccent',
-		'Rcedilla'=>'Rcommaaccent',
-		'rcedilla'=>'rcommaaccent',
-		'Scedilla'=>'Scommaaccent',
-		'scedilla'=>'scommaaccent',
-		'Tcedilla'=>'Tcommaaccent',
-		'tcedilla'=>'tcommaaccent',
-		'Dslash'=>'Dcroat',
-		'dslash'=>'dcroat',
-		'Dmacron'=>'Dcroat',
-		'dmacron'=>'dcroat',
-		'combininggraveaccent'=>'gravecomb',
-		'combininghookabove'=>'hookabovecomb',
-		'combiningtildeaccent'=>'tildecomb',
-		'combiningacuteaccent'=>'acutecomb',
-		'combiningdotbelow'=>'dotbelowcomb',
-		'dongsign'=>'dong'
-		);
-	foreach($a as $l) {
-		$e = explode(' ', rtrim($l));
-		if (count($e) < 2) {
-			continue;
-		}
-		$code = $e[0];
-		$param = $e[1];
-		if ($code == 'C') {
-			//Character metrics
-			$cc = (int)$e[1];
-			$w = $e[4];
-			$gn = $e[7];
-			if (substr($gn, -4) == '20AC') {
-				$gn = 'Euro';
-			}
-			if (isset($fix[$gn])) {
-				//Fix incorrect glyph name
-				foreach ($map as $c => $n) {
-					if ($n == $fix[$gn]) {
-						$map[$c] = $gn;
-					}
-				}
-			}
-			if (empty($map)) {
-				//Symbolic font: use built-in encoding
-				$widths[$cc] = $w;
-			} else {
-				$widths[$gn] = $w;
-				if($gn == 'X') {
-					$fm['CapXHeight'] = $e[13];
-				}
-			}
-			if($gn == '.notdef') {
-				$fm['MissingWidth'] = $w;
-			}
-		} elseif($code == 'FontName') {
-			$fm['FontName'] = $param;
-		} elseif($code == 'Weight') {
-			$fm['Weight'] = $param;
-		} elseif($code == 'ItalicAngle') {
-			$fm['ItalicAngle'] = (double)$param;
-		} elseif($code == 'Ascender') {
-			$fm['Ascender'] = (int)$param;
-		} elseif($code == 'Descender') {
-			$fm['Descender'] = (int)$param;
-		} elseif($code == 'UnderlineThickness') {
-			$fm['UnderlineThickness'] = (int)$param;
-		} elseif($code == 'UnderlinePosition') {
-			$fm['UnderlinePosition'] = (int)$param;
-		} elseif($code == 'IsFixedPitch') {
-			$fm['IsFixedPitch'] = ($param == 'true');
-		} elseif($code == 'FontBBox') {
-			$fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
-		} elseif($code == 'CapHeight') {
-			$fm['CapHeight'] = (int)$param;
-		} elseif($code == 'StdVW') {
-			$fm['StdVW'] = (int)$param;
-		}
-	}
-	if (!isset($fm['FontName'])) {
-		die('FontName not found');
-	}
-	if (!empty($map)) {
-		if (!isset($widths['.notdef'])) {
-			$widths['.notdef'] = 600;
-		}
-		if (!isset($widths['Delta']) AND isset($widths['increment'])) {
-			$widths['Delta'] = $widths['increment'];
-		}
-		//Order widths according to map
-		for ($i = 0; $i <= 255; $i++) {
-			if (!isset($widths[$map[$i]])) {
-				print "Warning: character ".$map[$i]." is missing\n";
-				$widths[$i] = $widths['.notdef'];
-			} else {
-				$widths[$i] = $widths[$map[$i]];
-			}
-		}
-	}
-	$fm['Widths'] = $widths;
-	return $fm;
-}
-
-function MakeFontDescriptor($fm, $symbolic=false) {
-	//Ascent
-	$asc = (isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
-	$fd = "array('Ascent'=>".$asc;
-	//Descent
-	$desc = (isset($fm['Descender']) ? $fm['Descender'] : -200);
-	$fd .= ",'Descent'=>".$desc;
-	//CapHeight
-	if (isset($fm['CapHeight'])) {
-		$ch = $fm['CapHeight'];
-	} elseif (isset($fm['CapXHeight'])) {
-		$ch = $fm['CapXHeight'];
-	} else {
-		$ch = $asc;
-	}
-	$fd .= ",'CapHeight'=>".$ch;
-	//Flags
-	$flags = 0;
-	if (isset($fm['IsFixedPitch']) AND $fm['IsFixedPitch']) {
-		$flags += 1<<0;
-	}
-	if ($symbolic) {
-		$flags += 1<<2;
-	} else {
-		$flags += 1<<5;
-	}
-	if (isset($fm['ItalicAngle']) AND ($fm['ItalicAngle'] != 0)) {
-		$flags += 1<<6;
-	}
-	$fd .= ",'Flags'=>".$flags;
-	//FontBBox
-	if (isset($fm['FontBBox'])) {
-		$fbb = $fm['FontBBox'];
-	} else {
-		$fbb = array(0, ($desc - 100), 1000, ($asc + 100));
-	}
-	$fd .= ",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
-	//ItalicAngle
-	$ia = (isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
-	$fd .= ",'ItalicAngle'=>".$ia;
-	//StemV
-	if (isset($fm['StdVW'])) {
-		$stemv = $fm['StdVW'];
-	} elseif (isset($fm['Weight']) AND preg_match('/(bold|black)/i', $fm['Weight'])) {
-		$stemv = 120;
-	} else {
-		$stemv = 70;
-	}
-	$fd .= ",'StemV'=>".$stemv;
-	//MissingWidth
-	if(isset($fm['MissingWidth'])) {
-		$fd .= ",'MissingWidth'=>".$fm['MissingWidth'];
-	}
-	$fd .= ')';
-	return $fd;
-}
-
-function MakeWidthArray($fm) {
-	//Make character width array
-	$s = 'array(';
-	$cw = $fm['Widths'];
-	$els = array();
-	$c = 0;
-	foreach ($cw as $i => $w) {
-		if (is_numeric($i)) {
-			$els[] = (((($c++)%10) == 0) ? "\n" : '').$i.'=>'.$w;
-		}
-	}
-	$s .= implode(',', $els);
-	$s .= ')';
-	return $s;
-}
-
-function MakeFontEncoding($map) {
-	//Build differences from reference encoding
-	$ref = ReadMap('cp1252');
-	$s = '';
-	$last = 0;
-	for ($i = 32; $i <= 255; $i++) {
-		if ($map[$i] != $ref[$i]) {
-			if ($i != $last+1) {
-				$s .= $i.' ';
-			}
-			$last = $i;
-			$s .= '/'.$map[$i].' ';
-		}
-	}
-	return rtrim($s);
-}
-
-function SaveToFile($file, $s, $mode='t') {
-	$f = fopen($file, 'w'.$mode);
-	if(!$f) {
-		die('Can\'t write to file '.$file);
-	}
-	fwrite($f, $s, strlen($s));
-	fclose($f);
-}
-
-function ReadShort($f) {
-	$a = unpack('n1n', fread($f, 2));
-	return $a['n'];
-}
-
-function ReadLong($f) {
-	$a = unpack('N1N', fread($f, 4));
-	return $a['N'];
-}
-
-function CheckTTF($file) {
-	//Check if font license allows embedding
-	$f = fopen($file, 'rb');
-	if (!$f) {
-		die('Error: unable to open '.$file);
-	}
-	//Extract number of tables
-	fseek($f, 4, SEEK_CUR);
-	$nb = ReadShort($f);
-	fseek($f, 6, SEEK_CUR);
-	//Seek OS/2 table
-	$found = false;
-	for ($i = 0; $i < $nb; $i++) {
-		if (fread($f, 4) == 'OS/2') {
-			$found = true;
-			break;
-		}
-		fseek($f, 12, SEEK_CUR);
-	}
-	if (!$found) {
-		fclose($f);
-		return;
-	}
-	fseek($f, 4, SEEK_CUR);
-	$offset = ReadLong($f);
-	fseek($f, $offset, SEEK_SET);
-	//Extract fsType flags
-	fseek($f, 8, SEEK_CUR);
-	$fsType = ReadShort($f);
-	$rl = ($fsType & 0x02) != 0;
-	$pp = ($fsType & 0x04) != 0;
-	$e = ($fsType & 0x08) != 0;
-	fclose($f);
-	if($rl AND (!$pp) AND (!$e)) {
-		print "Warning: font license does not allow embedding\n";
-	}
-}
-
-$arg = $GLOBALS['argv'];
-if (count($arg) >= 3) {
-	ob_start();
-	array_shift($arg);
-	if (sizeof($arg) == 3) {
-		$arg[3] = $arg[2];
-		$arg[2] = true;
-	} else {
-		if (!isset($arg[2])) {
-			$arg[2] = true;
-		}
-		if (!isset($arg[3])) {
-			$arg[3] = 'cp1252';
-		}
-	}
-	if (!isset($arg[4])) {
-		$arg[4] = array();
-	}
-	MakeFont($arg[0], $arg[1], $arg[2], $arg[3], $arg[4]);
-	$t = ob_get_clean();
-	print preg_replace('!<BR( /)?>!i', "\n", $t);
-} else {
-	print "Usage: makefont.php <ttf/otf/pfb file> <afm/ufm file> <encoding> <patch>\n";
-}
-
-//============================================================+
-// END OF FILE                                                 
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm
deleted file mode 100644
index c75b565c2f7..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm.exe b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm.exe
deleted file mode 100644
index 25c21fa1af1..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm.exe and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/pfm2afm-src.tar.gz b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/pfm2afm-src.tar.gz
deleted file mode 100644
index 72abae50f99..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/pfm2afm-src.tar.gz and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/readme.txt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/readme.txt
deleted file mode 100644
index f351cd9a485..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-To embed TrueType and OpenType font files, you need to extract the
-font metrics from the font files and build the required tables using
-the utility TTF2UFM.
-
-TTF2UFM is a modified version of Mark Heath's TTF 2 PT1 converter 
-(http://ttf2pt1.sourceforge.net/) by Steven Wittens <steven@acko.net> 
-(http://www.acko.net/blog/ufpdf). That version has been further
-modified by Ulrich Telle for use with the wxWidgets component
-wxPdfDocument.
-
-Following changes where made:
-
-1) Generated AFM files contain the glyph number for each character.
-2) Generated UFM files contain the bounding box for each character.
-3) OpenType support has been activated for the Windows binary,
-   and the generated AFM/UFM files contain the associated
-   original Unicode codes for each character.
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/ttf2ufm-src.tar.gz b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/ttf2ufm-src.tar.gz
deleted file mode 100644
index 2aeca608219..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/src/ttf2ufm-src.tar.gz and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm
deleted file mode 100644
index f81604fa0cf..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm.exe b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm.exe
deleted file mode 100644
index 07751055162..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm.exe and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll
deleted file mode 100644
index 31996cd3e2e..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/zapfdingbats.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/zapfdingbats.php
deleted file mode 100644
index 99eda4d6ba5..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/zapfdingbats.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
- // core font definition file for TCPDF (www.tcpdf.org)
-$type='core';
-$dw=788;
-$cw=array(0=>0,1=>0,2=>0,3=>0,4=>0,5=>0,6=>0,7=>0,8=>0,9=>0,10=>0,11=>0,12=>0,
-13=>0,14=>0,15=>0,16=>0,17=>0,18=>0,19=>0,20=>0,21=>0,22=>0,23=>0,24=>0,25=>0,
-26=>0,27=>0,28=>0,29=>0,30=>0,31=>0,32=>278,33=>974,34=>961,35=>974,36=>980,
-37=>719,38=>789,39=>790,40=>791,41=>690,42=>960,43=>939,44=>549,45=>855,46=>911,
-47=>933,48=>911,49=>945,50=>974,51=>755,52=>846,53=>762,54=>761,55=>571,56=>677,
-57=>763,58=>760,59=>759,60=>754,61=>494,62=>552,63=>537,64=>577,65=>692,66=>786,
-67=>788,68=>788,69=>790,70=>793,71=>794,72=>816,73=>823,74=>789,75=>841,76=>823,
-77=>833,78=>816,79=>831,80=>923,81=>744,82=>723,83=>749,84=>790,85=>792,86=>695,
-87=>776,88=>768,89=>792,90=>759,91=>707,92=>708,93=>682,94=>701,95=>826,96=>815,
-97=>789,98=>789,99=>707,100=>687,101=>696,102=>689,103=>786,104=>787,105=>713,
-106=>791,107=>785,108=>791,109=>873,110=>761,111=>762,112=>762,113=>759,114=>759,
-115=>892,116=>892,117=>788,118=>784,119=>438,120=>138,121=>277,122=>415,123=>392,
-124=>392,125=>668,126=>668,127=>0,128=>390,129=>390,130=>317,131=>317,132=>276,
-133=>276,134=>509,135=>509,136=>410,137=>410,138=>234,139=>234,140=>334,141=>334,
-142=>0,143=>0,144=>0,145=>0,146=>0,147=>0,148=>0,149=>0,150=>0,151=>0,152=>0,
-153=>0,154=>0,155=>0,156=>0,157=>0,158=>0,159=>0,160=>0,161=>732,162=>544,163=>544,
-164=>910,165=>667,166=>760,167=>760,168=>776,169=>595,170=>694,171=>626,172=>788,
-173=>788,174=>788,175=>788,176=>788,177=>788,178=>788,179=>788,180=>788,181=>788,
-182=>788,183=>788,184=>788,185=>788,186=>788,187=>788,188=>788,189=>788,190=>788,
-191=>788,192=>788,193=>788,194=>788,195=>788,196=>788,197=>788,198=>788,199=>788,
-200=>788,201=>788,202=>788,203=>788,204=>788,205=>788,206=>788,207=>788,208=>788,
-209=>788,210=>788,211=>788,212=>894,213=>838,214=>1016,215=>458,216=>748,217=>924,
-218=>748,219=>918,220=>927,221=>928,222=>928,223=>834,224=>873,225=>828,226=>924,
-227=>924,228=>917,229=>930,230=>931,231=>463,232=>883,233=>836,234=>836,235=>867,
-236=>867,237=>696,238=>696,239=>874,240=>0,241=>874,242=>760,243=>946,244=>771,
-245=>865,246=>771,247=>888,248=>967,249=>888,250=>831,251=>873,252=>927,253=>970,
-254=>918,255=>0);
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/zarbold.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/zarbold.php
deleted file mode 100644
index 4f1201452df..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/zarbold.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* 		Mohammad Ali Golkar
-		m.a.golkar@gmail.com
-		http://www.30minonline.com
-		LICENSE : GPLv2	*/
-$type='TrueTypeUnicode';
-$name='ZarBold';
-$desc=array('Ascent'=>733,'Descent'=>-317,'CapHeight'=>733,'Flags'=>32,'FontBBox'=>'[-126 -535 1164 1046]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
-$up=-356;
-$ut=49;
-$dw=600;
-$cw=array(
-	0=>0,32=>227,33=>235,34=>282,35=>667,36=>458,37=>493,38=>635,39=>156,40=>303,41=>303,42=>489,43=>489,44=>237,45=>489,46=>231,47=>277,
-	48=>552,49=>552,50=>552,51=>552,52=>552,53=>552,54=>552,55=>552,56=>552,57=>552,58=>231,59=>237,60=>667,61=>489,62=>667,63=>448,
-	64=>917,65=>604,66=>542,67=>615,68=>708,69=>479,70=>427,71=>667,72=>688,73=>302,74=>292,75=>583,76=>469,77=>885,78=>677,79=>729,
-	80=>479,81=>729,82=>542,83=>448,84=>521,85=>677,86=>615,87=>969,88=>604,89=>583,90=>594,91=>208,92=>510,93=>208,94=>469,95=>500,
-	96=>333,97=>469,98=>510,99=>448,100=>521,101=>438,102=>313,103=>500,104=>552,105=>271,106=>260,107=>500,108=>271,109=>802,110=>552,111=>490,
-	112=>531,113=>521,114=>396,115=>365,116=>292,117=>552,118=>479,119=>750,120=>521,121=>469,122=>448,123=>479,124=>510,125=>479,126=>667,8218=>240,
-	402=>531,8222=>458,8230=>1000,8224=>438,8225=>438,710=>333,8240=>1010,352=>448,8249=>250,338=>865,8216=>240,8217=>240,8220=>317,8221=>317,8226=>281,8211=>500,
-	8212=>1000,8482=>906,353=>365,8250=>250,339=>823,376=>583,160=>244,161=>317,162=>448,163=>583,164=>500,165=>583,166=>200,167=>417,168=>333,169=>765,
-	170=>313,171=>417,172=>667,173=>564,174=>765,175=>333,176=>375,177=>462,178=>354,179=>354,180=>333,181=>510,182=>438,183=>198,184=>333,185=>354,
-	186=>323,187=>417,188=>854,189=>854,190=>854,191=>448,192=>604,711=>333,215=>462,224=>469,226=>469,231=>448,232=>438,233=>438,234=>438,235=>438,
-	238=>271,239=>271,244=>490,305=>271,247=>483,249=>552,251=>552,252=>552,255=>469,9249=>781,1548=>237,1563=>237,1567=>340,1569=>426,1570=>416,1571=>238,
-	1572=>429,1573=>260,1574=>817,1575=>238,1576=>853,1577=>439,1578=>853,1579=>853,1580=>720,1581=>720,1582=>720,1583=>485,1584=>485,1585=>423,1586=>423,1587=>1016,
-	1588=>1016,1589=>1128,1590=>1128,1591=>794,1592=>794,1593=>685,1594=>685,1600=>371,1601=>840,1602=>696,1603=>1148,1604=>744,1605=>514,1606=>686,1607=>439,1608=>429,
-	1609=>817,1610=>817,1611=>0,1612=>0,1613=>0,1614=>0,1615=>0,1616=>0,1617=>0,1618=>0,1632=>479,1633=>479,1634=>479,1635=>479,1636=>479,1637=>479,
-	1638=>479,1639=>479,1640=>479,1641=>483,1642=>493,1645=>563,1648=>227,1649=>363,1652=>227,1662=>853,1670=>720,1688=>423,1700=>840,1705=>1148,1711=>1149,1740=>817,
-	1749=>439,1764=>227,1776=>479,1777=>479,1778=>479,1779=>479,1780=>479,1781=>479,1782=>479,1783=>479,1784=>479,1785=>483,8204=>22,8205=>22,8206=>22,8207=>22,
-	59424=>227,59425=>227,59426=>227,59427=>227,59428=>227,59429=>227,59430=>227,59431=>227,59432=>227,59433=>227,59434=>227,59435=>227,59436=>227,59416=>227,59437=>227,59442=>227,
-	59443=>227,59444=>227,59445=>227,59446=>227,64336=>363,64337=>263,64342=>853,64343=>967,64344=>267,64345=>271,64362=>840,64363=>959,64364=>305,64365=>341,64378=>720,64379=>725,
-	64380=>630,64381=>652,64394=>423,64395=>450,64398=>1148,64399=>1089,64400=>522,64401=>461,64402=>1149,64403=>1084,64404=>525,64405=>462,64508=>817,64509=>784,64606=>227,64607=>227,
-	64608=>227,64609=>227,64610=>227,64754=>371,64755=>371,64756=>371,64828=>331,64829=>276,64830=>303,64831=>303,65010=>866,65136=>227,65137=>371,65138=>227,65140=>227,65142=>227,
-	65143=>371,65144=>227,65145=>371,65146=>227,65147=>371,65148=>227,65149=>371,65150=>227,65151=>371,65152=>426,65153=>416,65154=>354,65155=>238,65156=>282,65157=>429,65158=>507,
-	65159=>260,65160=>286,65161=>817,65162=>784,65163=>190,65164=>276,65165=>238,65166=>263,65167=>853,65168=>967,65169=>186,65170=>271,65171=>439,65172=>452,65173=>853,65174=>967,
-	65175=>256,65176=>271,65177=>853,65178=>967,65179=>267,65180=>271,65181=>720,65182=>725,65183=>630,65184=>652,65185=>720,65186=>725,65187=>630,65188=>652,65189=>720,65190=>725,
-	65191=>630,65192=>652,65193=>485,65194=>608,65195=>485,65196=>608,65197=>423,65198=>450,65199=>423,65200=>450,65201=>1016,65202=>1041,65203=>498,65204=>475,65205=>1016,65206=>1041,
-	65207=>498,65208=>475,65209=>1128,65210=>1150,65211=>633,65212=>655,65213=>1128,65214=>1150,65215=>633,65216=>655,65217=>794,65218=>814,65219=>566,65220=>588,65221=>794,65222=>814,
-	65223=>566,65224=>588,65225=>685,65226=>655,65227=>414,65228=>330,65229=>685,65230=>655,65231=>414,65232=>330,65233=>840,65234=>959,65235=>305,65236=>341,65237=>696,65238=>780,
-	65239=>305,65240=>341,65241=>1148,65242=>1089,65243=>522,65244=>461,65245=>744,65246=>741,65247=>202,65248=>259,65249=>514,65250=>585,65251=>345,65252=>477,65253=>686,65254=>764,
-	65255=>186,65256=>271,65257=>439,65258=>452,65259=>501,65260=>381,65261=>429,65262=>507,65263=>817,65264=>784,65265=>817,65266=>784,64510=>265,64511=>271,65269=>610,65270=>652,
-	65271=>539,65272=>611,65273=>539,65274=>611,65275=>539,65276=>611,65279=>0,64486=>408,64487=>408);
-$enc='';
-$diff='';
-$file='zarbold.z';
-$ctg='zarbold.ctg.z';
-$originalsize=73296;
-// --- EOF ---
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/htmlcolors.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/htmlcolors.php
deleted file mode 100644
index e07be272fdf..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/htmlcolors.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-//============================================================+
-// File name   : htmlcolors.php
-// Version     : 1.0.007
-// Begin       : 2002-04-09
-// Last Update : 2010-10-18
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2002-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Array of WEB safe colors
-//
-//============================================================+
-
-/**
- * Array of WEB safe colors.
- * @author Nicola Asuni
- * @copyright 2002-2009 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2.9.000 (2008-03-26)
-*/
-
-/**
- * Array of WEB safe colors
- */
-$webcolor = array (
-'aliceblue' => 'f0f8ff',
-'antiquewhite' => 'faebd7',
-'aqua' => '00ffff',
-'aquamarine' => '7fffd4',
-'azure' => 'f0ffff',
-'beige' => 'f5f5dc',
-'bisque' => 'ffe4c4',
-'black' => '000000',
-'blanchedalmond' => 'ffebcd',
-'blue' => '0000ff',
-'blueviolet' => '8a2be2',
-'brown' => 'a52a2a',
-'burlywood' => 'deb887',
-'cadetblue' => '5f9ea0',
-'chartreuse' => '7fff00',
-'chocolate' => 'd2691e',
-'coral' => 'ff7f50',
-'cornflowerblue' => '6495ed',
-'cornsilk' => 'fff8dc',
-'crimson' => 'dc143c',
-'cyan' => '00ffff',
-'darkblue' => '00008b',
-'darkcyan' => '008b8b',
-'darkgoldenrod' => 'b8860b',
-'dkgray' => 'a9a9a9',
-'darkgray' => 'a9a9a9',
-'darkgrey' => 'a9a9a9',
-'darkgreen' => '006400',
-'darkkhaki' => 'bdb76b',
-'darkmagenta' => '8b008b',
-'darkolivegreen' => '556b2f',
-'darkorange' => 'ff8c00',
-'darkorchid' => '9932cc',
-'darkred' => '8b0000',
-'darksalmon' => 'e9967a',
-'darkseagreen' => '8fbc8f',
-'darkslateblue' => '483d8b',
-'darkslategray' => '2f4f4f',
-'darkslategrey' => '2f4f4f',
-'darkturquoise' => '00ced1',
-'darkviolet' => '9400d3',
-'deeppink' => 'ff1493',
-'deepskyblue' => '00bfff',
-'dimgray' => '696969',
-'dimgrey' => '696969',
-'dodgerblue' => '1e90ff',
-'firebrick' => 'b22222',
-'floralwhite' => 'fffaf0',
-'forestgreen' => '228b22',
-'fuchsia' => 'ff00ff',
-'gainsboro' => 'dcdcdc',
-'ghostwhite' => 'f8f8ff',
-'gold' => 'ffd700',
-'goldenrod' => 'daa520',
-'gray' => '808080',
-'grey' => '808080',
-'green' => '008000',
-'greenyellow' => 'adff2f',
-'honeydew' => 'f0fff0',
-'hotpink' => 'ff69b4',
-'indianred' => 'cd5c5c',
-'indigo' => '4b0082',
-'ivory' => 'fffff0',
-'khaki' => 'f0e68c',
-'lavender' => 'e6e6fa',
-'lavenderblush' => 'fff0f5',
-'lawngreen' => '7cfc00',
-'lemonchiffon' => 'fffacd',
-'lightblue' => 'add8e6',
-'lightcoral' => 'f08080',
-'lightcyan' => 'e0ffff',
-'lightgoldenrodyellow' => 'fafad2',
-'ltgray' => 'd3d3d3',
-'lightgray' => 'd3d3d3',
-'lightgrey' => 'd3d3d3',
-'lightgreen' => '90ee90',
-'lightpink' => 'ffb6c1',
-'lightsalmon' => 'ffa07a',
-'lightseagreen' => '20b2aa',
-'lightskyblue' => '87cefa',
-'lightslategray' => '778899',
-'lightslategrey' => '778899',
-'lightsteelblue' => 'b0c4de',
-'lightyellow' => 'ffffe0',
-'lime' => '00ff00',
-'limegreen' => '32cd32',
-'linen' => 'faf0e6',
-'magenta' => 'ff00ff',
-'maroon' => '800000',
-'mediumaquamarine' => '66cdaa',
-'mediumblue' => '0000cd',
-'mediumorchid' => 'ba55d3',
-'mediumpurple' => '9370d8',
-'mediumseagreen' => '3cb371',
-'mediumslateblue' => '7b68ee',
-'mediumspringgreen' => '00fa9a',
-'mediumturquoise' => '48d1cc',
-'mediumvioletred' => 'c71585',
-'midnightblue' => '191970',
-'mintcream' => 'f5fffa',
-'mistyrose' => 'ffe4e1',
-'moccasin' => 'ffe4b5',
-'navajowhite' => 'ffdead',
-'navy' => '000080',
-'oldlace' => 'fdf5e6',
-'olive' => '808000',
-'olivedrab' => '6b8e23',
-'orange' => 'ffa500',
-'orangered' => 'ff4500',
-'orchid' => 'da70d6',
-'palegoldenrod' => 'eee8aa',
-'palegreen' => '98fb98',
-'paleturquoise' => 'afeeee',
-'palevioletred' => 'd87093',
-'papayawhip' => 'ffefd5',
-'peachpuff' => 'ffdab9',
-'peru' => 'cd853f',
-'pink' => 'ffc0cb',
-'plum' => 'dda0dd',
-'powderblue' => 'b0e0e6',
-'purple' => '800080',
-'red' => 'ff0000',
-'rosybrown' => 'bc8f8f',
-'royalblue' => '4169e1',
-'saddlebrown' => '8b4513',
-'salmon' => 'fa8072',
-'sandybrown' => 'f4a460',
-'seagreen' => '2e8b57',
-'seashell' => 'fff5ee',
-'sienna' => 'a0522d',
-'silver' => 'c0c0c0',
-'skyblue' => '87ceeb',
-'slateblue' => '6a5acd',
-'slategray' => '708090',
-'slategrey' => '708090',
-'snow' => 'fffafa',
-'springgreen' => '00ff7f',
-'steelblue' => '4682b4',
-'tan' => 'd2b48c',
-'teal' => '008080',
-'thistle' => 'd8bfd8',
-'tomato' => 'ff6347',
-'turquoise' => '40e0d0',
-'violet' => 'ee82ee',
-'wheat' => 'f5deb3',
-'white' => 'ffffff',
-'whitesmoke' => 'f5f5f5',
-'yellow' => 'ffff00',
-'yellowgreen' => '9acd32'
-);
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/_blank.png b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/_blank.png
deleted file mode 100644
index 38f7b2fa56a..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/_blank.png and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/alpha.png b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/alpha.png
deleted file mode 100644
index 08daf2d44cd..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/alpha.png and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/bug.eps b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/bug.eps
deleted file mode 100644
index 999829274f7..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/bug.eps
+++ /dev/null
@@ -1,1809 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: Adobe Illustrator(TM) 3.2
-%%AI8_CreatorVersion: 12.0.0
-%%For: (fluxus) (x)
-%%Title: (bug.eps)
-%%CreationDate: 4/15/2006 11:11 PM
-%%BoundingBox: -2 747 53 843
-% -2 747 53 843
-%%DocumentProcessColors: Cyan Magenta Yellow Black
-%%DocumentSuppliedResources: procset Adobe_packedarray 2.0 0
-%%+ procset Adobe_cmykcolor 1.1 0
-%%+ procset Adobe_cshow 1.1 0
-%%+ procset Adobe_customcolor 1.0 0
-%%+ procset Adobe_pattern_AI3 1.0 0
-%%+ procset Adobe_Illustrator_AI3 1.0 1
-%AI3_ColorUsage: Color
-%AI3_IncludePlacedImages
-%%CMYKCustomColor: 1 1 1 1 ([Registration])
-%AI3_TemplateBox: 298.5 420.3896 298.5 420.3896
-%AI3_TileBox: 0.157715 0.044861 595.1177 841.9648
-%AI3_DocumentPreview: Header
-%%PageOrigin:-32 11.8896
-%AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9
-%AI9_Flatten: 1
-%AI12_CMSettings: 00.MS
-%%EndComments
-%%BeginProlog
-%%BeginResource: procset Adobe_packedarray 2.0 0
-%%Title: (Packed Array Operators)
-%%Version: 2.0 0
-%%CreationDate: (8/2/90) ()
-%%Copyright: ((C) 1987-1996 Adobe Systems Incorporated All Rights Reserved)
-userdict /Adobe_packedarray 5 dict dup begin put
-/initialize
-{
-/packedarray where
-	{
-	pop
-	}
-	{
-	Adobe_packedarray begin
-	Adobe_packedarray
-		{
-		dup xcheck
-			{
-			bind
-			} if
-		userdict 3 1 roll put
-		} forall
- end
-	} ifelse
-} def
-/terminate
-{
-} def
-/packedarray
-{
-array astore readonly
-} def
-/setpacking
-{
-pop
-} def
-/currentpacking
-{
-false
-} def
-currentdict readonly pop end
-%%EndResource
-Adobe_packedarray /initialize get exec
-%%BeginResource: procset Adobe_cmykcolor 1.1 0
-%%Title: (CMYK Color Operators)
-%%Version: 1.1 0
-%%CreationDate: (1/23/89) ()
-%%Copyright: ((C) 1987-1996 Adobe Systems Incorporated All Rights Reserved)
-currentpacking true setpacking
-userdict /Adobe_cmykcolor 4 dict dup begin put
-/initialize
-{
-/setcmykcolor where
-	{
-	pop
-	}
-	{
-	userdict /Adobe_cmykcolor_vars 2 dict dup begin put
-	/_setrgbcolor
-		/setrgbcolor load def
-	/_currentrgbcolor
-		/currentrgbcolor load def
-	Adobe_cmykcolor begin
-	Adobe_cmykcolor
-		{
-		dup xcheck
-			{
-			bind
-			} if
-		pop pop
-		} forall
- end
- end
-	Adobe_cmykcolor begin
-	} ifelse
-} def
-/terminate
-{
-currentdict Adobe_cmykcolor eq
-	{
- end
-	} if
-} def
-/setcmykcolor
-{
-1 sub 4 1 roll
-3
-	{
-	3 index add neg dup 0 lt
-		{
-		pop 0
-		} if
-	3 1 roll
-	} repeat
-Adobe_cmykcolor_vars /_setrgbcolor get exec
-pop
-} def 
-/currentcmykcolor
-{
-Adobe_cmykcolor_vars /_currentrgbcolor get exec
-3
-	{
-	1 sub neg 3 1 roll
-	} repeat
-0
-} def
-currentdict readonly pop end
-setpacking
-%%EndResource
-%%BeginResource: procset Adobe_cshow 1.1 0
-%%Title: (cshow Operator)
-%%Version: 1.1 0
-%%CreationDate: (1/23/89) ()
-%%Copyright: ((C) 1987-1996 Adobe Systems Incorporated All Rights Reserved)
-currentpacking true setpacking
-userdict /Adobe_cshow 3 dict dup begin put
-/initialize
-{
-/cshow where
-	{
-	pop
-	}
-	{
-	userdict /Adobe_cshow_vars 1 dict dup begin put
-	/_cshow
-		{} def
-	Adobe_cshow begin
-	Adobe_cshow
-		{
-		dup xcheck
-			{
-			bind
-			} if
-		userdict 3 1 roll put
-		} forall
- end
- end
-	} ifelse
-} def
-/terminate
-{
-} def
-/cshow
-{
-exch
-Adobe_cshow_vars
-	exch /_cshow
-	exch put
-	{
-	0 0 Adobe_cshow_vars /_cshow get exec
-	} forall
-} def
-currentdict readonly pop end
-setpacking
-%%EndResource
-%%BeginResource: procset Adobe_customcolor 1.0 0
-%%Title: (Custom Color Operators)
-%%Version: 1.0 0
-%%CreationDate: (5/9/88) ()
-%%Copyright: ((C) 1987-1996 Adobe Systems Incorporated All Rights Reserved)
-currentpacking true setpacking
-userdict /Adobe_customcolor 5 dict dup begin put
-/initialize
-{
-/setcustomcolor where
-	{
-	pop
-	}
-	{
-	Adobe_customcolor begin
-	Adobe_customcolor
-		{
-		dup xcheck
-			{
-			bind
-			} if
-		pop pop
-		} forall
- end
-	Adobe_customcolor begin
-	} ifelse
-} def
-/terminate
-{
-currentdict Adobe_customcolor eq
-	{
- end
-	} if
-} def
-/findcmykcustomcolor
-{
-5 packedarray
-}  def
-/setcustomcolor
-{
-exch
-aload pop pop
-4
-	{
-	4 index mul 4 1 roll
-	} repeat
-5 -1 roll pop
-setcmykcolor
-} def
-/setoverprint
-{
-pop
-} def
-currentdict readonly pop end
-setpacking
-%%EndResource
-%%BeginResource: procset Adobe_pattern_AI3 1.1 0
-%%Title: (Adobe Illustrator (R) Version 3.0 Pattern Operators)
-%%Version: 1.1 0
-%%CreationDate: (7/21/89) ()
-%%Copyright: ((C) 1987-1996 Adobe Systems Incorporated All Rights Reserved)
-currentpacking true setpacking
-userdict /Adobe_pattern_AI3 16 dict dup begin put
-/initialize
-{
-/definepattern where
-	{
-	pop
-	}
-	{
-	Adobe_pattern_AI3 begin
-	Adobe_pattern_AI3
-		{
-		dup xcheck
-			{
-			bind
-			} if
-		pop pop
-		} forall
-	mark
-	cachestatus 7 1 roll pop pop pop pop exch pop exch
-		{
-		{
-		10000 add
-		dup 2 index gt
-			{
-			exit
-			} if
-		dup setcachelimit
-		} loop
-		} stopped
-	cleartomark
-	} ifelse
-} def
-/terminate
-{
-currentdict Adobe_pattern_AI3 eq
-	{
- end
-	} if
-} def
-errordict
-/nocurrentpoint
-{
-pop
-stop
-} put
-errordict
-/invalidaccess
-{
-pop
-stop
-} put
-/patternencoding
-256 array def
-0 1 255
-{
-patternencoding exch ( ) 2 copy exch 0 exch put cvn put
-} for
-/definepattern
-{
-17 dict begin
-/uniform exch def
-/cache exch def
-/key exch def
-/procarray exch def
-/mtx exch matrix invertmatrix def
-/height exch def
-/width exch def
-/ctm matrix currentmatrix def
-/ptm matrix def
-/str 32 string def
-/slice 9 dict def
-slice /s 1 put
-slice /q 256 procarray length div sqrt floor cvi put
-slice /b 0 put
-/FontBBox [0 0 0 0] def
-/FontMatrix mtx matrix copy def
-/Encoding patternencoding def
-/FontType 3 def
-/BuildChar
-	{
-	exch
- begin
-	/setstrokeadjust where {pop true setstrokeadjust} if
-	slice begin
-	dup q dup mul mod s idiv /i exch def
-	dup q dup mul mod s mod /j exch def
-	q dup mul idiv procarray exch get
-	/xl j width s div mul def
-	/xg j 1 add width s div mul def
-	/yl i height s div mul def
-	/yg i 1 add height s div mul def
-	uniform
-		{
-		1 1
-		}
-		{
-		width 0 dtransform
-		dup mul exch dup mul add sqrt dup 1 add exch div
-		0 height dtransform
-		dup mul exch dup mul add sqrt dup 1 add exch div
-		} ifelse
-	width 0 cache
-		{
-		xl 4 index mul yl 4 index mul xg 6 index mul yg 6 index mul
-		setcachedevice
-		}
-		{
-		setcharwidth
-		} ifelse
-	gsave
-	scale
-	newpath
-	xl yl moveto
-	xg yl lineto
-	xg yg lineto
-	xl yg lineto
-	closepath
-	clip
-	newpath
- end
- end
-	exec
-	grestore
-	} def
-key currentdict definefont
-end
-} def
-/patterncachesize
-{
-gsave
-newpath
-0 0 moveto
-width 0 lineto
-width height lineto
-0 height lineto
-closepath
-patternmatrix setmatrix
-pathbbox
-exch ceiling 4 -1 roll floor sub 3 1 roll
-ceiling exch floor sub
-mul 1 add
-grestore
-} def
-/patterncachelimit
-{
-cachestatus 7 1 roll 6 npop 8 mul
-} def
-/patternpath
-{
-exch dup begin setfont
-ctm setmatrix
-concat
-slice exch /b exch slice /q get dup mul mul put
-FontMatrix concat
-uniform
-	{
-	width 0 dtransform round width div exch round width div exch
-	0 height dtransform round height div exch height div exch
-	0 0 transform round exch round exch
-	ptm astore setmatrix
-	}
-	{
-	ptm currentmatrix pop
-	} ifelse
-{currentpoint} stopped not
-	{
-	2 npop
-	pathbbox
-	true
-	4 index 3 index eq
-	4 index 3 index eq
-	and
-		{
-		pop false
-			{
-			{2 npop}
-			{3 npop true}
-			{7 npop true}
-			{pop true}
-			pathforall
-			} stopped
-			{
-			5 npop true
-			} if
-		} if
-		{
-		height div ceiling height mul 4 1 roll
-		width div ceiling width mul 4 1 roll
-		height div floor height mul 4 1 roll
-		width div floor width mul 4 1 roll
-		2 index sub height div ceiling cvi exch
-		3 index sub width div ceiling cvi exch
-		4 2 roll moveto
-		FontMatrix mtx invertmatrix
-		dup dup 4 get exch 5 get rmoveto
-		ptm ptm concatmatrix pop
-		slice /s
-		patterncachesize patterncachelimit div ceiling sqrt ceiling cvi
-		dup slice /q get gt
-			{
-			pop slice /q get
-			} if
-		put
-		0 1 slice /s get dup mul 1 sub
-			{
-			slice /b get add
-			gsave
-			0 1 str length 1 sub
-				{
-				str exch 2 index put
-				} for
-			pop
-			dup
-				{
-				gsave
-				ptm setmatrix
-				1 index str length idiv {str show} repeat
-				1 index str length mod str exch 0 exch getinterval show
-				grestore
-				0 height rmoveto
-				} repeat
-			grestore
-			} for
-		2 npop
-		}
-		{
-		4 npop
-		} ifelse
-	} if
-end
-} def
-/patternclip
-{
-clip
-} def
-/patternstrokepath
-{
-strokepath
-} def
-/patternmatrix
-matrix def
-/patternfill
-{
-dup type /dicttype eq
-	{
-	Adobe_pattern_AI3 /patternmatrix get
-	} if
-gsave
-patternclip
-Adobe_pattern_AI3 /patternpath get exec
-grestore
-newpath
-} def
-/patternstroke
-{
-dup type /dicttype eq
-	{
-	Adobe_pattern_AI3 /patternmatrix get
-	} if
-gsave
-patternstrokepath
-true
-	{
-		{
-			{
-			newpath 
-			moveto
-			}
-			{
-			lineto
-			}
-			{
-			curveto
-			}
-			{
-			closepath
-			3 copy
-			Adobe_pattern_AI3 /patternfill get exec
-			} pathforall
-		3 npop
-		} stopped
-			{
-			5 npop
-			patternclip
-			Adobe_pattern_AI3 /patternfill get exec
-			} if
-	}
-	{
-	patternclip
-	Adobe_pattern_AI3 /patternfill get exec
-	} ifelse
-grestore
-newpath
-} def
-/patternashow
-{
-3 index type /dicttype eq
-	{
-	Adobe_pattern_AI3 /patternmatrix get 4 1 roll
-	} if
-	{
-	2 npop (0) exch
-	2 copy 0 exch put pop
-	gsave
-	false charpath currentpoint
-	6 index 6 index 6 index
-	Adobe_pattern_AI3 /patternfill get exec
-	grestore
-	newpath moveto
-	2 copy rmoveto
-	} exch cshow
-5 npop
-} def
-/patternawidthshow
-{
-6 index type /dicttype eq
-	{
-	Adobe_pattern_AI3 /patternmatrix get 7 1 roll
-	} if
-	{
-	2 npop (0) exch
-	2 copy 0 exch put 
-	gsave
-	_sp eq {5 index 5 index rmoveto} if
-	false charpath currentpoint
-	9 index 9 index 9 index
-	Adobe_pattern_AI3 /patternfill get exec
-	grestore
-	newpath moveto
-	2 copy rmoveto
-	} exch cshow
-8 npop
-} def
-/patternashowstroke
-{
-4 index type /dicttype eq
-	{
-	patternmatrix /patternmatrix get 5 1 roll
-	} if
-4 1 roll
-	{
-	2 npop (0) exch
-	2 copy 0 exch put pop
-	gsave
-	false charpath
-	currentpoint
-	4 index setmatrix
-	7 index 7 index 7 index
-	Adobe_pattern_AI3 /patternstroke get exec
-	grestore
-	newpath moveto
-	2 copy rmoveto
-	} exch cshow
-6 npop
-} def
-/patternawidthshowstroke
-{
-7 index type /dicttype eq
-	{
-	patternmatrix /patternmatrix get 8 1 roll
-	} if
-7 1 roll
-	{
-	2 npop (0) exch
-	2 copy 0 exch put
-	gsave
-	_sp eq {5 index 5 index rmoveto} if
-	false charpath currentpoint
-	7 index setmatrix
-	10 index 10 index 10 index
-	Adobe_pattern_AI3 /patternstroke get exec
-	grestore
-	newpath moveto
-	2 copy rmoveto
-	} exch cshow
-9 npop
-} def
-currentdict readonly pop end
-setpacking
-%%EndResource
-%%BeginResource: procset Adobe_Illustrator_AI3 1.1 0
-%%Title: (Adobe Illustrator (R) Version 3.0 Full Prolog)
-%%Version: 1.1 0
-%%CreationDate: (3/7/1994) ()
-%%Copyright: ((C) 1987-1996 Adobe Systems Incorporated All Rights Reserved)
-currentpacking true setpacking
-userdict /Adobe_Illustrator_AI3 71 dict dup begin put
-/initialize
-{
-userdict /Adobe_Illustrator_AI3_vars 67 dict dup begin put
-/_lp /none def
-/_pf {} def
-/_ps {} def
-/_psf {} def
-/_pss {} def
-/_pjsf {} def
-/_pjss {} def
-/_pola 0 def
-/_doClip 0 def
-/cf	currentflat def
-/_tm matrix def
-/_renderStart [/e0 /r0 /a0 /o0 /e1 /r1 /a1 /i0] def 
-/_renderEnd [null null null null /i1 /i1 /i1 /i1] def
-/_render -1 def
-/_rise 0 def
-/_ax 0 def
-/_ay 0 def
-/_cx 0 def
-/_cy 0 def
-/_leading [0 0] def
-/_ctm matrix def
-/_mtx matrix def
-/_sp 16#020 def
-/_hyphen (-) def
-/_fScl 0 def
-/_cnt 0 def
-/_hs 1 def
-/_nativeEncoding 0 def
-/_useNativeEncoding 0 def
-/_tempEncode 0 def
-/_pntr 0 def
-/_tDict 2 dict def
-/_wv 0 def
-/Tx {} def
-/Tj {} def
-/CRender {} def
-/_AI3_savepage {} def
-/_gf null def
-/_cf 4 array def
-/_if null def
-/_of false def
-/_fc {} def
-/_gs null def
-/_cs 4 array def
-/_is null def
-/_os false def
-/_sc {} def
-/_pd 1 dict def
-/_ed 15 dict def
-/_pm matrix def
-/_fm null def
-/_fd null def
-/_fdd null def
-/_sm null def
-/_sd null def
-/_sdd null def
-/_i null def
-Adobe_Illustrator_AI3 begin
-Adobe_Illustrator_AI3 dup /nc get begin
-	{
-	dup xcheck
-		{
-		bind
-		} if
-	pop pop
-	} forall
-end
-end
-end
-Adobe_Illustrator_AI3 begin
-Adobe_Illustrator_AI3_vars begin
-newpath
-} def
-/terminate
-{
-end
-end
-} def
-/_
-null def
-/ddef
-{
-Adobe_Illustrator_AI3_vars 3 1 roll put
-} def
-/xput
-{
-dup load dup length exch maxlength eq
-	{
-	dup dup load dup
-	length 2 mul dict copy def
-	} if
-load begin def end
-} def
-/npop
-{
-	{
-	pop
-	} repeat
-} def
-/sw
-{
-dup length exch stringwidth
-exch 5 -1 roll 3 index mul add
-4 1 roll 3 1 roll mul add
-} def
-/swj
-{
-dup 4 1 roll
-dup length exch stringwidth 
-exch 5 -1 roll 3 index mul add
-4 1 roll 3 1 roll mul add 
-6 2 roll /_cnt 0 ddef
-{1 index eq {/_cnt _cnt 1 add ddef} if} forall pop
-exch _cnt mul exch _cnt mul 2 index add 4 1 roll 2 index add 4 1 roll pop pop
-} def
-/ss
-{
-4 1 roll
-	{
-	2 npop 
-	(0) exch 2 copy 0 exch put pop
-	gsave
-	false charpath currentpoint
-	4 index setmatrix
-	stroke
-	grestore
-	moveto
-	2 copy rmoveto
-	} exch cshow
-3 npop
-} def
-/jss
-{
-4 1 roll
-	{
-	2 npop 
-	(0) exch 2 copy 0 exch put 
-	gsave
-	_sp eq 
-		{
-		exch 6 index 6 index 6 index 5 -1 roll widthshow  
-		currentpoint
-		}
-		{
-		false charpath currentpoint
-		4 index setmatrix stroke
-		}ifelse
-	grestore
-	moveto
-	2 copy rmoveto
-	} exch cshow
-6 npop
-} def
-/sp
-{
-	{
-	2 npop (0) exch
-	2 copy 0 exch put pop
-	false charpath
-	2 copy rmoveto
-	} exch cshow
-2 npop
-} def
-/jsp
-{
-	{
-	2 npop 
-	(0) exch 2 copy 0 exch put 
-	_sp eq 
-		{
-		exch 5 index 5 index 5 index 5 -1 roll widthshow  
-		}
-		{
-		false charpath
-		}ifelse
-	2 copy rmoveto
-	} exch cshow
-5 npop
-} def
-/pl
-{
-transform
-0.25 sub round 0.25 add exch
-0.25 sub round 0.25 add exch
-itransform
-} def
-/setstrokeadjust where
-	{
-	pop true setstrokeadjust
-	/c
-	{
-	curveto
-	} def
-	/C
-	/c load def
-	/v
-	{
-	currentpoint 6 2 roll curveto
-	} def
-	/V
-	/v load def
-	/y
-	{
-	2 copy curveto
-	} def
-	/Y
-	/y load def
-	/l
-	{
-	lineto
-	} def
-	/L
-	/l load def
-	/m
-	{
-	moveto
-	} def
-	}
-	{
-	/c
-	{
-	pl curveto
-	} def
-	/C
-	/c load def
-	/v
-	{
-	currentpoint 6 2 roll pl curveto
-	} def
-	/V
-	/v load def
-	/y
-	{
-	pl 2 copy curveto
-	} def
-	/Y
-	/y load def
-	/l
-	{
-	pl lineto
-	} def
-	/L
-	/l load def
-	/m
-	{
-	pl moveto
-	} def
-	} ifelse
-/d
-{
-setdash
-} def
-/cf	{} def
-/i
-{
-dup 0 eq
-	{
-	pop cf
-	} if
-setflat
-} def
-/j
-{
-setlinejoin
-} def
-/J
-{
-setlinecap
-} def
-/M
-{
-setmiterlimit
-} def
-/w
-{
-setlinewidth
-} def
-/H
-{} def
-/h
-{
-closepath
-} def
-/N
-{
-_pola 0 eq 
-	{
-	_doClip 1 eq {clip /_doClip 0 ddef} if 
-	newpath
-	} 
-	{
-	/CRender {N} ddef
-	}ifelse
-} def
-/n
-{N} def
-/F
-{
-_pola 0 eq 
-	{
-	_doClip 1 eq 
-		{
-		gsave _pf grestore clip newpath /_lp /none ddef _fc 
-		/_doClip 0 ddef
-		}
-		{
-		_pf
-		}ifelse
-	} 
-	{
-	/CRender {F} ddef
-	}ifelse
-} def
-/f
-{
-closepath
-F
-} def
-/S
-{
-_pola 0 eq 
-	{
-	_doClip 1 eq 
-		{
-		gsave _ps grestore clip newpath /_lp /none ddef _sc 
-		/_doClip 0 ddef
-		}
-		{
-		_ps
-		}ifelse
-	} 
-	{
-	/CRender {S} ddef
-	}ifelse
-} def
-/s
-{
-closepath
-S
-} def
-/B
-{
-_pola 0 eq 
-	{
-	_doClip 1 eq
-	gsave F grestore 
-		{
-		gsave S grestore clip newpath /_lp /none ddef _sc
-		/_doClip 0 ddef
-		} 
-		{
-		S
-		}ifelse
-	}
-	{
-	/CRender {B} ddef
-	}ifelse
-} def
-/b
-{
-closepath
-B
-} def
-/W
-{
-/_doClip 1 ddef
-} def
-/*
-{
-count 0 ne 
-	{
-	dup type (stringtype) eq {pop} if
-	} if 
-_pola 0 eq {newpath} if
-} def
-/u
-{} def
-/U
-{} def
-/q
-{
-_pola 0 eq {gsave} if
-} def
-/Q
-{
-_pola 0 eq {grestore} if
-} def
-/*u
-{
-_pola 1 add /_pola exch ddef
-} def
-/*U
-{
-_pola 1 sub /_pola exch ddef 
-_pola 0 eq {CRender} if
-} def
-/D
-{pop} def
-/*w
-{} def
-/*W
-{} def
-/`
-{
-/_i save ddef
-6 1 roll 4 npop
-concat pop
-userdict begin
-/showpage {} def
-0 setgray
-0 setlinecap
-1 setlinewidth
-0 setlinejoin
-10 setmiterlimit
-[] 0 setdash
-/setstrokeadjust where {pop false setstrokeadjust} if
-newpath
-0 setgray
-false setoverprint
-} def
-/~
-{
-end
-_i restore
-} def
-/@
-{} def
-/&
-{} def
-/O
-{
-0 ne
-/_of exch ddef
-/_lp /none ddef
-} def
-/R
-{
-0 ne
-/_os exch ddef
-/_lp /none ddef
-} def
-/g
-{
-/_gf exch ddef
-/_fc
-{
-_lp /fill ne
-	{
-	_of setoverprint
-	_gf setgray
-	/_lp /fill ddef
-	} if
-} ddef
-/_pf
-{
-_fc
-fill
-} ddef
-/_psf
-{
-_fc
-ashow
-} ddef
-/_pjsf
-{
-_fc
-awidthshow
-} ddef
-/_lp /none ddef
-} def
-/G
-{
-/_gs exch ddef
-/_sc
-{
-_lp /stroke ne
-	{
-	_os setoverprint
-	_gs setgray
-	/_lp /stroke ddef
-	} if
-} ddef
-/_ps
-{
-_sc
-stroke
-} ddef
-/_pss
-{
-_sc
-ss
-} ddef
-/_pjss
-{
-_sc
-jss
-} ddef
-/_lp /none ddef
-} def
-/k
-{
-_cf astore pop
-/_fc
-{
-_lp /fill ne
-	{
-	_of setoverprint
-	_cf aload pop setcmykcolor
-	/_lp /fill ddef
-	} if
-} ddef
-/_pf
-{
-_fc
-fill
-} ddef
-/_psf
-{
-_fc
-ashow
-} ddef
-/_pjsf
-{
-_fc
-awidthshow
-} ddef
-/_lp /none ddef
-} def
-/K
-{
-_cs astore pop
-/_sc
-{
-_lp /stroke ne
-	{
-	_os setoverprint
-	_cs aload pop setcmykcolor
-	/_lp /stroke ddef
-	} if
-} ddef
-/_ps
-{
-_sc
-stroke
-} ddef
-/_pss
-{
-_sc
-ss
-} ddef
-/_pjss
-{
-_sc
-jss
-} ddef
-/_lp /none ddef
-} def
-/x
-{
-/_gf exch ddef
-findcmykcustomcolor
-/_if exch ddef
-/_fc
-{
-_lp /fill ne
-	{
-	_of setoverprint
-	_if _gf 1 exch sub setcustomcolor
-	/_lp /fill ddef
-	} if
-} ddef
-/_pf
-{
-_fc
-fill
-} ddef
-/_psf
-{
-_fc
-ashow
-} ddef
-/_pjsf
-{
-_fc
-awidthshow
-} ddef
-/_lp /none ddef
-} def
-/X
-{
-/_gs exch ddef
-findcmykcustomcolor
-/_is exch ddef
-/_sc
-{
-_lp /stroke ne
-	{
-	_os setoverprint
-	_is _gs 1 exch sub setcustomcolor
-	/_lp /stroke ddef
-	} if
-} ddef
-/_ps
-{
-_sc
-stroke
-} ddef
-/_pss
-{
-_sc
-ss
-} ddef
-/_pjss
-{
-_sc
-jss
-} ddef
-/_lp /none ddef
-} def
-/dp
-{
-dup null eq
-{
-pop
-_dp 0 ne
-	{
-	0 1 _dp 1 sub _dl mod
-		{
-		_da exch get 3 get
-		} for
-	_dp 1 sub _dl mod 1 add packedarray
-	_da 0 get aload pop 8 -1 roll 5 -1 roll pop 4 1 roll
-	definepattern pop
-	} if
-}
-{
-_dp 0 ne _dp _dl mod 0 eq and
-	{
-	null dp
-	} if
-7 packedarray _da exch _dp _dl mod exch put
-_dp _dl mod _da 0 get 4 get 2 packedarray
-/_dp _dp 1 add def
-} ifelse
-} def
-/E
-{
-_ed begin
-dup 0 get type /arraytype ne
-	{
-	0
-		{
-		dup 1 add index type /arraytype eq
-			{
-			1 add
-			}
-			{
-			exit
-			} ifelse
-		} loop
-	array astore
-	} if
-/_dd exch def
-/_ury exch def
-/_urx exch def
-/_lly exch def
-/_llx exch def
-/_n exch def
-/_y 0 def
-/_dl 4 def
-/_dp 0 def
-/_da _dl array def
-0 1 _dd length 1 sub
-	{
-	/_d exch _dd exch get def
-	0 2 _d length 2 sub
-		{
-		/_x exch def
-		/_c _d _x get _ ne def
-		/_r _d _x 1 add get cvlit def
-		_r _ ne
-			{
-			_urx _llx sub _ury _lly sub [1 0 0 1 0 0] 
-				[
-				/save cvx
-				_llx neg _lly neg /translate cvx
-				_c
-					{
-					nc /begin cvx
-					} if
-				_r dup type /stringtype eq
-					{
-					cvx
-					}
-					{
-					{exec} /forall cvx
-					} ifelse
-				_c
-					{
-					/end cvx
-					} if
-				/restore cvx
-				] cvx
-			/_fn 12 _n length add string def
-			_y _fn cvs pop
-			/_y _y 1 add def
-			_fn 12 _n putinterval
-			_fn _c false dp
-			_d exch _x 1 add exch put
-			} if
-		} for
-	} for
-null dp
-_n _dd /_pd
-end xput
-} def
-/fc
-{
-_fm dup concatmatrix pop
-} def
-/p
-{
-/_fm exch ddef
-9 -2 roll _pm translate fc
-7 -2 roll _pm scale fc
-5 -1 roll _pm rotate fc
-4 -2 roll exch 0 ne
-	{
-	dup _pm rotate fc
-	1 -1 _pm scale fc
-	neg _pm rotate fc
-	}
-	{
-	pop
-	} ifelse
-dup _pm rotate fc
-exch dup sin exch cos div 1 0 0 1 0 6 2 roll
-_pm astore fc
-neg _pm rotate fc
-_pd exch get /_fdd exch ddef
-/_pf
-{
-save
-/_doClip 0 ddef
-0 1 _fdd length 1 sub
-	{
-	/_fd exch _fdd exch get ddef
-	_fd
-	0 2 _fd length 2 sub
-		{
-		gsave
-		2 copy get dup _ ne
-			{
-			cvx exec _fc
-			}
-			{
-			pop
-			} ifelse
-		2 copy 1 add get dup _ ne
-			{
-			aload pop findfont _fm
-			patternfill
-			}
-			{
-			pop
-			fill
-			} ifelse
-		grestore
-		pop
-		} for
-	pop
-	} for
-restore
-newpath
-} ddef
-/_psf
-{
-save
-/_doClip 0 ddef
-0 1 _fdd length 1 sub
-	{
-	/_fd exch _fdd exch get ddef
-	_fd
-	0 2 _fd length 2 sub
-		{
-		gsave
-		2 copy get dup _ ne
-			{
-			cvx exec _fc
-			}
-			{
-			pop
-			} ifelse
-		2 copy 1 add get dup _ ne
-			{
-			aload pop findfont _fm
-			9 copy 6 npop patternashow
-			}
-			{
-			pop
-			6 copy 3 npop ashow
-			} ifelse
-		grestore
-		pop
-		} for
-	pop
-	} for
-restore
-%3 npop newpath
-sw rmoveto
-} ddef
-/_pjsf
-{
-save
-/_doClip 0 ddef
-0 1 _fdd length 1 sub
-	{
-	/_fd exch _fdd exch get ddef
-	_fd
-	0 2 _fd length 2 sub
-		{
-		gsave
-		2 copy get dup _ ne
-			{
-			cvx exec _fc
-			}
-			{
-			pop
-			} ifelse
-		2 copy 1 add get dup _ ne
-			{
-			aload pop findfont _fm
-			12 copy 6 npop patternawidthshow
-			}
-			{
-			pop 9 copy 3 npop awidthshow
-			} ifelse
-		grestore
-		pop
-		} for
-	pop
-	} for
-restore
-swj rmoveto
-} ddef
-/_lp /none ddef
-} def
-/sc
-{
-_sm dup concatmatrix pop
-} def
-/P
-{
-/_sm exch ddef
-9 -2 roll _pm translate sc
-7 -2 roll _pm scale sc
-5 -1 roll _pm rotate sc
-4 -2 roll exch 0 ne
-	{
-	dup _pm rotate sc
-	1 -1 _pm scale sc
-	neg _pm rotate sc
-	}
-	{
-	pop
-	} ifelse
-dup _pm rotate sc
-exch dup sin exch cos div 1 0 0 1 0 6 2 roll
-_pm astore sc
-neg _pm rotate sc
-_pd exch get /_sdd exch ddef
-/_ps
-{
-save
-/_doClip 0 ddef
-0 1 _sdd length 1 sub
-	{
-	/_sd exch _sdd exch get ddef
-	_sd
-	0 2 _sd length 2 sub
-		{
-		gsave
-		2 copy get dup _ ne
-			{
-			cvx exec _sc
-			}
-			{
-			pop
-			} ifelse
-		2 copy 1 add get dup _ ne
-			{
-			aload pop findfont _sm
-			patternstroke
-			}
-			{
-			pop stroke
-			} ifelse
-		grestore
-		pop
-		} for
-	pop
-	} for
-restore
-newpath
-} ddef
-/_pss
-{
-save
-/_doClip 0 ddef
-0 1 _sdd length 1 sub
-	{
-	/_sd exch _sdd exch get ddef
-	_sd
-	0 2 _sd length 2 sub
-		{
-		gsave
-		2 copy get dup _ ne
-			{
-			cvx exec _sc
-			}
-			{
-			pop
-			} ifelse
-		2 copy 1 add get dup _ ne
-			{
-			aload pop findfont _sm
-			10 copy 6 npop patternashowstroke
-			}
-			{
-			pop 7 copy 3 npop ss
-			} ifelse
-		grestore
-		pop
-		} for
-	pop
-	} for
-restore
-pop sw rmoveto
-} ddef
-/_pjss
-{
-save
-/_doClip 0 ddef
-0 1 _sdd length 1 sub
-	{
-	/_sd exch _sdd exch get ddef
-	_sd
-	0 2 _sd length 2 sub
-		{
-		gsave
-		2 copy get dup _ ne
-			{
-			cvx exec _sc
-			}
-			{
-			pop
-			} ifelse
-		2 copy 1 add get dup _ ne
-			{
-			aload pop findfont _sm
-			13 copy 6 npop patternawidthshowstroke
-			}
-			{
-			pop 10 copy 3 npop jss
-			} ifelse
-		grestore
-		pop
-		} for
-	pop
-	} for
-restore
-pop swj rmoveto
-} ddef
-/_lp /none ddef
-} def
-/A
-{
-pop
-} def
-/nc 3 dict def
-nc begin
-/setgray
-{
-pop
-} bind def
-/setcmykcolor
-{
-4 npop
-} bind def
-/setcustomcolor
-{
-2 npop
-} bind def
-currentdict readonly pop end
-currentdict readonly pop end
-setpacking
-/annotatepage
-{
-} def
-%%EndResource
-%%EndProlog
-%%BeginSetup
-Adobe_cmykcolor /initialize get exec
-Adobe_cshow /initialize get exec
-Adobe_customcolor /initialize get exec
-Adobe_pattern_AI3 /initialize get exec
-Adobe_Illustrator_AI3 /initialize get exec
-%%EndSetup
-0 A
-0 O
-0.25 1 1 0.25 k
-0 R
-0 0 0 1 K
-0 J 0 j 0.2 w 4 M []0 d
-9.19971 841.8735 m
-10.3311 842.1226 8.4126 839.4165 8 839.2729 c
-9.57471 839.1421 9.3999 839.0728 v
-9 838.9233 8.8623 838.561 8.6001 838.2729 c
-7.39355 836.9985 6.49365 836.7915 7.3999 834.8735 C
-8.03125 834.9233 8.1626 835.1919 8.6001 834.8735 c
-9.32471 834.3423 7.78125 832.979 10 832.0728 c
-11.356 831.5229 14.1997 832.1792 15.7998 832.2729 C
-15.1997 831.8481 12.5186 830.4546 12.3999 829.6733 c
-12.1812 828.2612 12.9434 828.686 13.5996 828.4731 C
-13.2998 827.2544 13.106 827.5854 14.1997 827.0737 C
-13.9058 825.7485 14.3687 824.8296 15.3999 824.0737 C
-15.1309 824.0229 15.0996 823.2983 15.1997 823.4731 C
-16.7246 820.23 19.1123 818.5229 21.9995 816.6733 C
-21.6309 816.3979 20.6558 815.2925 20.5996 815.2739 C
-21.5811 815.061 22.6807 814.1675 23.1997 814.0737 c
-25.1621 813.7358 24.1309 815.5171 25.7998 814.2739 C
-26.6689 815.0239 26.7061 815.8735 25.9995 816.2729 C
-28.0439 816.4048 32.4873 820.0112 33.7998 821.6733 c
-34.6494 822.7612 35.0557 823.9985 34.999 825.4731 C
-36.499 826.3667 36.6807 826.5669 35.999 828.0737 C
-38.5498 828.7544 34.6494 830.9604 33.5996 831.6733 C
-35.2559 831.6235 37.4619 830.6421 39.3994 831.0728 c
-40.8428 831.4048 40.2432 832.3169 40.5996 833.2729 c
-41.0186 834.4165 42.5557 833.5415 42.999 834.4731 c
-43.1182 834.7417 42.999 836.0728 Y
-42.3311 836.8979 41.6055 837.5981 40.7998 838.2729 c
-40.0811 838.8794 42.4736 838.6919 41.999 838.8735 c
-41.293 839.1479 40.9424 840.7671 40.5996 841.4731 C
-42.5557 840.1978 45.3623 837.6665 44.5986 833.8735 c
-44.124 831.5298 41.2871 829.8423 40.1992 827.8735 c
-37.6934 823.3608 36.5117 817.7612 33.3994 813.8735 c
-33.2178 813.6548 33.1182 813.3608 32.7998 813.2739 c
-32.3496 813.1606 33.4121 812.8677 33.5996 812.8735 c
-38.4121 813.0864 39.874 811.2544 40.7998 816.0737 C
-40.8428 815.8169 40.4053 818.0737 42.1992 818.6733 C
-42.5557 815.4302 40.749 813.4673 39.3994 811.2739 C
-37.5996 811.7231 36.3115 812.2739 33.7998 812.2739 C
-33.7998 810.0112 33.793 805.686 33.1992 804.4731 c
-33.168 804.4233 32.6182 803.5981 32.7998 803.4731 c
-33.9248 802.7231 34.6367 801.4048 34.1992 800.0737 c
-33.9365 799.3052 32.999 797.7427 33.7998 797.2739 c
-35.624 796.2114 37.168 797.3052 38.7998 796.8735 C
-40.0742 800.6548 40.874 803.8608 42.1992 807.8735 C
-42.624 807.6987 42.6924 807.5425 42.999 807.2739 C
-44.7861 810.73 46.999 812.7485 47.999 817.0737 C
-48.3994 815.8735 L
-49.7373 815.98 49.999 816.0737 V
-48.4678 814.7856 47.0674 812.6235 46.999 812.4731 c
-44.9561 809.3237 44.4111 808.8481 43.999 807.2739 C
-44.9932 807.2427 44.6494 807.5552 45.5986 806.6733 C
-44.6436 805.8989 45.2686 805.9048 44.7998 805.0737 c
-44.7617 805.0171 44.0742 805.0737 43.999 805.0737 C
-43.624 803.2427 42.4307 802.436 41.999 801.0737 c
-41.3994 799.2046 41.5557 798.2983 40.3994 796.4741 c
-38.4561 793.4302 38.249 794.9546 34.5996 793.8745 c
-33.7686 792.7495 33.5996 792.6733 v
-32.6748 792.2983 31.1309 792.1987 30.1992 792.0737 C
-30.9619 790.1802 31.7998 790.4741 34.3994 790.4741 C
-35.0371 788.0308 35.1934 789.2681 37.1992 788.2739 c
-38.0742 787.8433 38.793 786.0991 39.3994 785.2739 c
-39.999 784.4614 41.499 783.8433 41.999 783.0737 c
-42.1807 782.7866 41.668 782.5308 41.5996 782.4741 C
-44.5049 779.7056 47.499 773.8804 51.1992 772.0737 c
-51.3242 772.0181 51.7803 771.8862 51.7998 771.8745 c
-52.1436 771.6929 52.2178 771.3745 52.3994 771.2749 C
-50.8682 771.6245 51.3057 771.1558 50.999 771.2749 C
-51.2178 769.8745 50.5986 769.8745 V
-49.4561 774.1743 45.3369 775.1304 43.5986 778.8745 C
-43.3555 778.4624 42.8369 778.3179 42.7998 778.2749 C
-40.999 780.8931 38.7305 783.2056 37.3994 786.0737 C
-36.4248 785.9429 35.9678 785.9429 34.999 786.0737 C
-35.1553 784.6245 35.5244 783.0181 35.3994 781.2749 c
-35.2432 779.2612 34.8623 776.6558 34.5996 774.6743 C
-35.3623 774.3237 36.1309 773.9556 36.7998 773.4741 c
-37.2559 773.1499 38.1992 772.437 38.3994 771.8745 c
-39.1621 769.6929 38.1992 765.2183 38.5996 762.0747 c
-38.6748 761.437 39.2871 760.2368 39.1992 759.4741 c
-39.1494 759.0991 38.4619 758.9116 38.5996 758.0747 c
-38.7686 757.0122 39.7549 755.5435 40.1992 754.6753 c
-41.0811 752.9253 41.6924 751.1128 41.999 748.8745 C
-40.3496 749.8628 41.7373 748.5815 40.1992 748.0747 c
-39.7061 747.9185 40.1992 748.8745 Y
-40.3115 751.7866 39.9424 753.1685 38.999 755.2749 c
-38.9492 755.3804 38.0498 756.2866 37.999 756.4741 c
-37.2178 759.269 36.6367 763.4556 36.999 767.4741 c
-37.1992 769.7495 37.5303 770.1245 35.999 770.8745 c
-35.3311 771.2056 34.8994 771.2437 33.999 771.4741 C
-33.3057 768.7056 32.5557 766.3491 30.999 764.4741 c
-27.2686 759.9995 20.481 761.3491 17.9995 766.0737 c
-17.1621 767.6675 16.3745 769.3179 15.7998 771.2749 C
-14.7061 770.8745 14.106 770.73 13 770.2749 C
-13.5308 766.6675 12.6812 763.0366 12.7998 760.0747 C
-12.5308 760.4312 12.0562 760.731 11.7998 761.0747 C
-10.4248 756.4253 6.0376 755.6304 5 750.2749 C
-4.7998 752.7437 4 751.8745 Y
-3.20605 751.9312 3.625 752.4683 3.6001 752.4741 C
-5.65625 753.9116 9.43115 757.1304 10.3999 759.4741 c
-11.6875 762.606 10.7437 769.3433 12 771.8745 c
-12.4497 772.7993 14.3062 773.5366 15.1997 774.0737 C
-14.7124 777.6558 14.1436 781.7925 14.5996 785.8745 C
-13.8184 785.8745 12.9746 785.8745 12.1997 785.8745 C
-11.6997 783.9868 10.1812 779.5679 9.19971 778.0737 c
-9.125 777.9683 8.5376 778.2368 8.3999 778.2749 C
-8.10596 777.1675 8.2876 776.6616 7.7998 775.6743 c
-7.79346 775.6675 7.2251 775.6743 7.19971 775.6743 C
-6.08105 773.3062 2.625 770.9116 4.19971 767.8745 C
-3.88721 768.0425 3.49365 768.4312 3.3999 768.4741 C
-3.33105 768.4741 3.26855 768.4741 3.19971 768.4741 C
-3 768.6675 3.08105 769.1304 3 769.4741 C
-0.90625 769.6245 1.65625 769.6187 2.6001 770.4741 c
-3.94971 771.7124 5.19385 773.7368 6.19971 775.2749 c
-4.34375 772.1187 8.3125 778.4487 7 778.4741 C
-7.51855 779.5181 8.44336 780.4995 9 781.4741 C
-8.78125 781.5181 9.19971 782.2749 Y
-8.9751 782.2241 8.8999 782.1812 8.6001 782.0737 C
-10.2813 783.4116 10.3062 786.6304 12 787.8745 c
-14.1748 789.48 14.7935 787.48 15.5996 790.6733 C
-18.1558 790.6733 19.1245 790.0806 19.7998 792.0737 C
-19.8496 792.0864 18.7998 792.0737 Y
-18.0435 792.2983 16.062 792.2495 15.1997 792.6733 c
-14.9434 792.8052 14.6685 793.7808 14.3999 793.8745 c
-10.856 795.1489 10.5747 792.9116 8.6001 796.6733 c
-6.70605 800.2739 6.4126 803.3481 4.19971 806.0737 C
-4.76855 806.9175 4.86865 806.7544 5.3999 807.0737 C
-3.6626 809.73 2.69385 813.2114 0 814.2739 C
-0 814.3481 0.037598 815.0552 0 815.0737 C
-1.2251 815.4106 1.44385 815.311 2.3999 815.8735 C
-1.44385 813.9487 5.23096 809.1489 6.3999 806.6733 C
-7.1748 807.186 7.13721 807.6177 7.7998 806.2739 C
-7.70605 806.2173 7.5874 805.2612 7.6001 805.0737 c
-7.75 802.3608 9.5625 799.7358 10.1997 796.6733 C
-12.1748 797.1802 13.3999 796.6304 15.5996 797.2739 C
-15.2061 799.3921 14.6309 800.1548 14.1997 802.2739 C
-15.4873 802.5171 15.231 802.6548 16.1997 803.4731 c
-16.437 803.6802 15.8184 804.23 15.7998 804.2739 c
-15.2749 805.3735 15.1875 810.2046 15.3999 812.0737 C
-13.7124 811.73 12.3311 810.6606 11.1997 810.4731 c
-10.7749 810.4106 10.4248 810.4731 10 810.4731 C
-9.2749 812.2671 6.80615 814.355 6.6001 815.4731 c
-6.4375 816.3481 6.875 816.7856 7 817.2729 C
-7.1499 817.1733 7.94336 817.0854 8 817.0737 C
-8.44336 814.0796 9.2373 813.8921 10.5996 811.4731 C
-12.6558 811.8794 14.0186 812.7231 16.3999 813.0737 C
-13.4497 817.5854 12.0747 823.5542 9.3999 828.4731 c
-8.1875 830.6978 5.5249 832.2856 5.19971 835.2729 c
-5.16846 835.5103 5.38086 836.1919 5.3999 836.0728 C
-5.79346 838.0298 6.21875 838.8296 7.19971 840.0728 c
-7.50586 840.4731 7.81836 840.9673 8.19971 841.2729 c
-8.3999 841.4419 8.9624 841.8228 9.19971 841.8735 c
-b
-%%PageTrailer
-gsave annotatepage grestore showpage
-%%Trailer
-Adobe_Illustrator_AI3 /terminate get exec
-Adobe_pattern_AI3 /terminate get exec
-Adobe_customcolor /terminate get exec
-Adobe_cshow /terminate get exec
-Adobe_cmykcolor /terminate get exec
-Adobe_packedarray /terminate get exec
-%%EOF
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/image_demo.jpg b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/image_demo.jpg
deleted file mode 100644
index 262bce272c8..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/image_demo.jpg and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/image_with_alpha.png b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/image_with_alpha.png
deleted file mode 100644
index 27df6afcb23..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/image_with_alpha.png and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/img.png b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/img.png
deleted file mode 100644
index 1816e3f0a61..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/img.png and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.gif b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.gif
deleted file mode 100644
index 010b487d938..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.gif and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.jpg b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.jpg
deleted file mode 100644
index 6d9b8fd8076..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.jpg and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.png b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.png
deleted file mode 100644
index 13799452be3..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/logo_example.png and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/pelican.ai b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/pelican.ai
deleted file mode 100644
index 4cd501a43ff..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/pelican.ai
+++ /dev/null
@@ -1,147 +0,0 @@
-%!PS-Adobe-3.0 
-%%Creator: Adobe Illustrator(TM) 3.2
-%%AI8_CreatorVersion: 12.0.0
-%%For: (fluxus) (x)
-%%Title: (pelican.ai)
-%%CreationDate: 4/15/2006 11:28 PM
-%%BoundingBox: 38 221 564 654
-%%DocumentProcessColors: Black
-%%DocumentNeededResources: procset Adobe_packedarray 2.0 0
-%%+ procset Adobe_cshow 1.1 0
-%%+ procset Adobe_customcolor 1.0 0
-%%+ procset Adobe_pattern_AI3 1.0 0
-%%+ procset Adobe_Illustrator_AI3 1.0 1
-%AI3_ColorUsage: Color
-%%CMYKCustomColor: 1 1 1 1 ([Registration])
-%AI3_TemplateBox: 298.5 420.3896 298.5 420.3896
-%AI3_TileBox: 0.157715 0.044861 595.1177 841.9648
-%AI3_DocumentPreview: None
-%%PageOrigin:-32 11.8896
-%AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9
-%AI9_Flatten: 1
-%AI12_CMSettings: 00.MS
-%%EndComments
-%%BeginProlog
-%%IncludeResource: procset Adobe_packedarray 2.0 0
-Adobe_packedarray /initialize get exec
-%%IncludeResource: procset Adobe_cshow 1.1 0
-%%IncludeResource: procset Adobe_customcolor 1.0 0
-%%IncludeResource: procset Adobe_pattern_AI3 1.0 0
-%%IncludeResource: procset Adobe_Illustrator_AI3 1.0 1
-%%EndProlog
-%%BeginSetup
-Adobe_cshow /initialize get exec
-Adobe_customcolor /initialize get exec
-Adobe_pattern_AI3 /initialize get exec
-Adobe_Illustrator_AI3 /initialize get exec
-%%EndSetup
-0 A
-0 O
-0.823529 g
-0 J 0 j 1 w 4 M []0 d
-406.3574 653.9336 m
-464.8369 654.4839 476.1016 604.7227 506.8555 577.2656 c
-518.2334 567.1074 538.876 556.4058 541.0449 537.8945 C
-525.793 545.1372 515.3398 557.5967 502.1924 566.9033 c
-492.1299 574.0298 478.9131 577.0991 467.4844 582.9634 c
-454.5439 589.603 441.3213 599.4785 424.4873 589.1792 c
-413.7012 582.5776 412.9746 565.8579 406.3574 554.9893 c
-401.2715 546.6338 390.2637 539.4668 382.0098 534.269 c
-370.5801 527.0684 326.3232 509.3872 322.4365 499.042 C
-331.416 493.8628 340.3955 488.6816 349.375 483.5005 C
-370.4541 474.8203 420.0293 453.8994 428.1152 435.3247 C
-427.9424 435.3247 427.7695 435.3247 427.5967 435.3247 C
-422.0781 438.2988 418.0566 441.834 411.0205 443.6128 C
-411.0205 442.9214 411.0205 442.2324 411.0205 441.541 C
-415.6807 438.0884 420.3457 434.6333 425.0059 431.1807 C
-426.5615 431.6968 428.1152 432.2153 429.6689 432.7339 C
-436.3252 429.1694 440.0146 421.5771 446.2451 417.1924 c
-468.749 401.3643 540.2861 360.04 557.624 408.9043 C
-559.6963 408.7314 561.7676 408.5586 563.8398 408.3857 C
-564.2002 369.6592 525.0967 377.3896 496.4951 382.4844 c
-485.8457 384.3838 476.0742 379.3203 465.4141 380.9307 c
-458.0371 382.0459 454.999 385.5068 447.8008 386.1123 C
-444.6514 384.4326 443.9072 382.2314 441.583 379.8955 C
-441.7559 379.5498 441.9287 379.2041 442.1016 378.8584 C
-453.1211 376.5439 474.8496 358.7158 485.6162 352.4404 c
-499.0371 344.6182 513.7188 346.8398 528.6133 341.043 C
-531.0205 346.2412 546.2559 365.248 551.9258 365.9072 C
-552.0986 365.3896 552.2715 364.8721 552.4424 364.3545 C
-553.4883 360.7607 550.0078 356.1338 548.2988 353.4756 c
-539.4346 339.6855 527.2559 336.8584 503.748 337.415 C
-507.8379 329.7158 516.5977 331.1191 522.3965 325.501 C
-510.8311 324.9131 495.6875 323.7822 486.6533 327.5732 C
-483.0273 329.6455 479.4004 331.7178 475.7744 333.79 C
-468.749 335.082 467.1133 328.6885 461.7891 327.5732 c
-451.8096 325.4854 442.6299 328.9424 433.8125 329.6455 C
-427.6152 314.2881 411.4697 330.1348 399.1045 326.5381 C
-395.1328 323.6025 391.1621 320.666 387.1904 317.7314 C
-380.2559 315.4561 375.2725 320.9756 368.0234 319.2861 C
-363.707 316.8682 359.3877 314.4502 355.0732 312.0322 C
-346.0449 325.4189 337.3516 308.3584 325.0264 313.0693 c
-319.249 315.2764 317.3877 322.9951 312.0762 324.9834 c
-302.3477 328.626 290.0044 321.8848 280.4756 325.501 c
-275.7075 327.3125 274.5767 334.043 270.1157 335.8623 C
-266.6616 335.6885 263.208 335.5166 259.7544 335.3428 C
-254.7881 336.4834 253.1904 341.9092 248.8755 343.6338 C
-245.7686 343.8066 242.6592 343.9775 239.5513 344.1494 C
-236.9614 347.4326 234.3711 350.7119 231.7803 353.9941 C
-227.1187 356.2158 222.1738 353.7666 218.312 356.0654 C
-217.707 358.9385 216.9556 361.4961 214.6855 362.8008 C
-210.5415 362.9736 206.396 363.1465 202.2529 363.3174 C
-200.6987 365.3896 199.145 367.4639 197.5903 369.5332 C
-193.9648 370.2246 190.3384 370.916 186.7119 371.6074 C
-183.0776 383.6631 179.9097 377.1084 172.7246 383.0029 C
-172.0347 384.5557 171.3433 386.1123 170.6528 387.665 C
-167.4033 390.2705 160.396 389.1025 157.1846 391.291 C
-150.2778 399.2334 143.3691 407.1787 136.4629 415.1201 C
-135.7725 415.1201 135.0811 415.1201 134.3906 415.1201 C
-129.8872 408.9912 123.022 405.2783 118.332 399.5791 c
-109.856 389.2803 103.8877 376.3271 98.6465 362.8008 c
-91.7344 344.96 87.7056 323.8467 83.6235 304.2627 c
-81.5273 294.2061 81.9316 284.2168 78.4434 275.7705 c
-74.5234 266.2822 66.5 259.7139 60.8296 251.9404 c
-54.7129 243.5557 51.2388 224.7588 40.627 221.3779 C
-40.7998 221.7217 40.9727 222.0674 41.144 222.4131 C
-39.79 227.2139 42.2383 230.333 43.2163 234.3291 C
-41.1147 235.4502 39.3652 235.8232 38.5547 238.4736 C
-40.1084 244.3438 41.6626 250.2139 43.2163 256.085 C
-42.6357 258.7764 38.5103 262.4824 40.1084 267.4814 c
-41.354 271.3818 44.9365 271.5908 45.2896 277.3262 C
-43.8086 279.5244 41.9907 280.7529 40.1084 282.5049 C
-40.1084 282.6777 40.1084 282.8506 40.1084 283.0234 C
-52.8052 283.6553 57.1475 290.5166 61.3481 299.6006 C
-53.7988 301.8721 41.7808 303.3838 38.5547 309.96 C
-46.126 307.9092 59.4692 305.3623 67.0459 307.3721 C
-69.4639 315.3115 71.8813 323.2568 74.2993 331.1992 C
-77.9248 347.085 81.5513 362.9736 85.1777 378.8584 C
-87.957 392.2158 84.7827 409.2002 90.3579 419.7832 C
-92.7749 421.6826 95.1934 423.5815 97.6104 425.481 C
-99.3364 431.1782 101.064 436.8784 102.7905 442.5757 C
-107.7554 450.8428 114.814 456.6777 119.3677 465.8892 C
-115.0508 468.8232 110.7329 471.7593 106.417 474.6938 C
-106.7617 476.2495 107.1074 477.8027 107.4531 479.3564 C
-93.3389 475.1343 85.5649 470.4336 75.8525 462.7798 C
-65.6665 462.7798 55.4756 462.7798 45.2896 462.7798 C
-45.4609 463.1255 45.6338 463.4712 45.8066 463.8169 C
-74.2612 470.5581 82.3726 479.2275 102.7905 491.7886 C
-114.7041 497.832 126.6211 503.8774 138.5347 509.9204 C
-142.1606 513.2007 145.7881 516.4824 149.4136 519.7622 C
-168.4629 531.9883 188.5562 540.2256 210.5415 549.8081 c
-217.877 553.0059 224.0391 558.6489 232.2988 561.2056 c
-245.8008 565.3853 266.6577 569.8081 284.1025 566.3867 C
-292.7354 563.4507 301.3701 560.5142 310.0039 557.5801 C
-324.5254 553.9165 346.2764 558.8447 355.0732 564.3149 c
-369.0625 573.0098 372.4688 593.5171 375.793 613.0088 C
-376.6572 620.606 377.5195 628.2046 378.3838 635.8013 C
-383.2783 647.8481 394.3535 648.647 406.3574 653.9336 C
-f
-%%PageTrailer
-gsave annotatepage grestore showpage
-%%Trailer
-Adobe_Illustrator_AI3 /terminate get exec
-Adobe_pattern_AI3 /terminate get exec
-Adobe_customcolor /terminate get exec
-Adobe_cshow /terminate get exec
-Adobe_packedarray /terminate get exec
-%%EOF
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_cell.png b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_cell.png
deleted file mode 100644
index 98a1553a82e..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_cell.png and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_logo.jpg b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_logo.jpg
deleted file mode 100644
index 257f8fb6d93..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_logo.jpg and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_signature.png b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_signature.png
deleted file mode 100644
index a4f06372511..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tcpdf_signature.png and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/testsvg.svg b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/testsvg.svg
deleted file mode 100644
index fd8314e3484..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/testsvg.svg
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="12cm"
-   height="6cm"
-   id="svg2">
-  <desc
-     id="desc4">TCPDF SVG EXAMPLE</desc>
-  <defs
-     id="defs42">
-    <radialGradient
-       cx="85"
-       cy="15"
-       r="5.25"
-       fx="85"
-       fy="15"
-       id="radialGradient2865"
-       xlink:href="#MyRGradient"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="60"
-       cy="25"
-       r="10.5"
-       fx="60"
-       fy="25"
-       id="radialGradient2867"
-       xlink:href="#MyRGradient"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="17.82198"
-       cy="28.055244"
-       r="10.871407"
-       fx="17.82198"
-       fy="28.055244"
-       id="radialGradient2869"
-       xlink:href="#MyRGradient"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.6200333,0,0,1.8396889,173.9517,-9.005912)" />
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient5087"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <linearGradient
-       id="linearGradient5075">
-      <stop
-         id="stop5077"
-         style="stop-color:#ffff00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5079"
-         style="stop-color:#ff0000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient2846"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <linearGradient
-       id="linearGradient2848">
-      <stop
-         id="stop2850"
-         style="stop-color:#ffff00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2852"
-         style="stop-color:#ff0000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient2854"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <linearGradient
-       id="linearGradient2856">
-      <stop
-         id="stop2858"
-         style="stop-color:#ffff00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2860"
-         style="stop-color:#ff0000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient2862"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <linearGradient
-       id="linearGradient2864">
-      <stop
-         id="stop2866"
-         style="stop-color:#ffff00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2868"
-         style="stop-color:#ff0000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient2885"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <radialGradient
-       cx="60"
-       cy="25"
-       r="10.5"
-       fx="60"
-       fy="25"
-       id="radialGradient5215"
-       xlink:href="#MyRGradient"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient5223"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient5245"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient5261"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2520801,0,0,1.0907419,-234.6921,-1.613686)" />
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient5264"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53063427,0,0,0.17133835,-41.5959,-53.579631)" />
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient5267"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53063427,0,0,0.17133835,-41.5959,-53.579631)" />
-    <radialGradient
-       cx="184.10963"
-       cy="476.55164"
-       r="74.151497"
-       fx="184.10963"
-       fy="476.55164"
-       id="radialGradient5270"
-       xlink:href="#linearGradient5075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53063427,0,0,0.17133835,-41.5959,-53.579631)" />
-    <radialGradient
-       cx="85"
-       cy="15"
-       r="5.25"
-       fx="85"
-       fy="15"
-       id="radialGradient5295"
-       xlink:href="#MyRGradient"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <linearGradient
-     x1="2.4930596"
-     y1="8.1225491"
-     x2="58.448399"
-     y2="8.1225491"
-     id="MyLGradient"
-     gradientUnits="userSpaceOnUse"
-     gradientTransform="matrix(2.1674701,3.2244804e-8,-1.0401032e-8,0.46846403,253.27742,-193.75856)">
-    <stop
-       id="stop7"
-       style="stop-color:#ff6600;stop-opacity:1"
-       offset="0.05" />
-    <stop
-       id="stop9"
-       style="stop-color:#ffff66;stop-opacity:1"
-       offset="0.94999999" />
-  </linearGradient>
-  <radialGradient
-     id="MyRGradient">
-    <stop
-       id="stop12"
-       style="stop-color:#0033ff;stop-opacity:1"
-       offset="0.05" />
-    <stop
-       id="stop14"
-       style="stop-color:#ffff66;stop-opacity:1"
-       offset="0.94999999" />
-  </radialGradient>
-  <rect
-     width="120.08073"
-     height="25.367481"
-     rx="3.602421"
-     ry="2.5367482"
-     x="259.28146"
-     y="-189.53065"
-     transform="matrix(0.71626866,0.69782463,-0.72008162,0.69388937,0,0)"
-     id="rect16"
-     style="fill:url(#MyLGradient);stroke:#0000ff;stroke-width:1.00766146" />
-  <ellipse
-     cx="90"
-     cy="30"
-     rx="20"
-     ry="10"
-     transform="matrix(1.4285714,0,0,1.4285714,178.03709,88.814199)"
-     id="ellipse20"
-     style="fill:#00ff00;stroke:#008000;stroke-width:1" />
-  <path
-     d="m 199.75816,42.607008 c 0,-25.80645 38.7097,-25.80645 38.7097,0 0,25.80645 38.70969,25.80645 38.70969,0 z"
-     id="path30"
-     style="fill:url(#radialGradient2869);stroke:#0000ff;stroke-width:1.29032314" />
-  <path
-     d="m 56.981711,101.40999 q 38.411107,-48.013879 76.822209,0 38.41109,48.01387 76.8222,0"
-     id="path32"
-     style="fill:none;stroke:#008000;stroke-width:0.96027768" />
-  <path
-     d="m 56.981711,101.40999 38.411107,-48.013879 38.411102,48.013879 38.41109,48.01387 38.41111,-48.01387"
-     id="path34"
-     style="fill:none;stroke:#888888;stroke-width:0.38411102" />
-  <line
-     x1="158.17"
-     y1="196.27382"
-     x2="403.61057"
-     y2="196.27382"
-     id="line22"
-     style="fill:#ff0000;stroke:#ff0000;stroke-width:2.72711658;stroke-opacity:1" />
-  <text
-     x="158.15259"
-     y="182.61755"
-     id="text38"
-     style="font-size:35.67964172px;font-weight:bold;fill:#0000ff;font-family:Helvetica">www.tcpdf.org</text>
-  <polygon
-     points="80,10 90,10 90,20 80,20 80,10 "
-     transform="matrix(4.7619048,0,0,4.7619048,-28.55484,-29.862646)"
-     id="polygon26"
-     style="fill:url(#radialGradient5295);stroke:#ff0000;stroke-width:0.5" />
-  <path
-     d="M 172.22678,86.983374 H 140.4086 A 31.818187,31.818187 0 1 0 172.22678,55.16517 z"
-     id="path10"
-     style="fill:#ff0000;stroke:#0000ff;stroke-width:1.06060624" />
-  <path
-     d="M 166.92376,81.680334 V 49.86215 a 31.818187,31.818187 0 0 0 -31.81821,31.818184 z"
-     id="path12"
-     style="fill:#ffff00;stroke:#0000ff;stroke-width:1.06060624" />
-  <path
-     d="m 191.9699,155.18875 13.78038,-6.89018 a 7.7034622,7.7034622 0 1 1 13.78037,-6.89018 l 13.78033,-6.89018 a 15.386158,7.6930793 60 0 1 13.78034,-6.89016 l 13.78034,-6.89017 a 23.073485,7.6911617 60 0 1 13.78037,-6.89019 l 13.78037,-6.89017 a 30.761945,7.6904861 60 1 1 13.78036,-6.89019 l 13.78034,-6.890167"
-     id="path14"
-     style="fill:none;stroke:#ff0000;stroke-width:1.37803578" />
-  <circle
-     cx="60"
-     cy="25"
-     r="10"
-     transform="matrix(2.3809524,0,0,2.3809524,-86.105483,113.11357)"
-     id="circle18"
-     style="fill:url(#radialGradient5215);stroke:#ff0000;stroke-width:1" />
-  <path
-     d="m 32.361418,52.28906 48.780487,0 -24.39025,48.78049 z"
-     id="path28"
-     style="fill:#ffff00;stroke:#0000ff;stroke-width:1.21951222" />
-  <image
-     xlink:href="tcpdf_logo.jpg"
-     id="image36"
-     height="26.666664"
-     width="80"
-     y="111.32501"
-     x="16.751661" />
-  <text
-     x="13.399332"
-     y="41.580627"
-     id="text5343"
-     xml:space="preserve"
-     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#008000;font-family:helvetica;font-size:30pt">SVG</text>
-</svg>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tiger.ai b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tiger.ai
deleted file mode 100644
index e4944fb1158..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tiger.ai
+++ /dev/null
@@ -1,3599 +0,0 @@
-%!PS-Adobe-3.0 
-%%Creator: Adobe Illustrator(TM) 3.2
-%%AI8_CreatorVersion: 12.0.0
-%%For: (fluxus) (x)
-%%Title: (tiger.ai)
-%%CreationDate: 4/14/2006 11:35 PM
-%%BoundingBox: 22 167 567 730
-%%DocumentProcessColors: Cyan Magenta Yellow Black
-%%DocumentNeededResources: procset Adobe_packedarray 2.0 0
-%%+ procset Adobe_cmykcolor 1.1 0
-%%+ procset Adobe_cshow 1.1 0
-%%+ procset Adobe_customcolor 1.0 0
-%%+ procset Adobe_pattern_AI3 1.0 0
-%%+ procset Adobe_Illustrator_AI3 1.0 1
-%AI3_ColorUsage: Color
-%%CMYKCustomColor: 0.74902 0.678431 0.670588 0.901961 ([Registration])
-%AI3_TemplateBox: 306.5 396.5 306.5 396.5
-%AI3_TileBox: 0 1 612 793
-%AI3_DocumentPreview: None
-%%PageOrigin:0 0
-%AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9
-%AI9_Flatten: 1
-%AI12_CMSettings: 00.MS
-%%EndComments
-%%BeginProlog
-%%IncludeResource: procset Adobe_packedarray 2.0 0
-Adobe_packedarray /initialize get exec
-%%IncludeResource: procset Adobe_cmykcolor 1.1 0
-%%IncludeResource: procset Adobe_cshow 1.1 0
-%%IncludeResource: procset Adobe_customcolor 1.0 0
-%%IncludeResource: procset Adobe_pattern_AI3 1.0 0
-%%IncludeResource: procset Adobe_Illustrator_AI3 1.0 1
-%%EndProlog
-0 A
-u
-0 O
-1 g
-0 J 0 j 1 w 4 M []0 d
-90.5 477.5 m
-90.5767 475.4434 89.7798 475.5801 v
-88.7646 475.4863 70.6641 528.3682 48.02 525.9795 c
-67.6445 533.9883 90.5 477.5 v
-F
-0 R
-0 G
-0.1892 w 10 M
-90.5 477.5 m
-90.5767 475.4434 89.7798 475.5801 v
-88.7646 475.4863 70.6641 528.3682 48.02 525.9795 c
-67.6445 533.9883 90.5 477.5 v
-90.5 477.5 l
-s
-0 O
-1 g
-1 w 4 M
-94.3398 480.8594 m
-93.7446 478.8555 92.8999 479.1797 v
-92.0552 479.5107 93.0249 535.3975 71.0601 540.8594 c
-92.0981 541.709 94.3398 480.8594 v
-F
-0 R
-0 G
-0.1892 w 10 M
-94.3398 480.8594 m
-93.7446 478.8555 92.8999 479.1797 v
-92.0552 479.5107 93.0249 535.3975 71.0601 540.8594 c
-92.0981 541.709 94.3398 480.8594 v
-94.3398 480.8594 l
-s
-0 O
-1 g
-1 w 4 M
-124.5801 434.2998 m
-126.3872 433.2363 125.7798 432.3799 v
-125.3525 431.7461 71.2617 445.8291 60.98 425.6602 c
-64.9063 446.4102 124.5801 434.2998 v
-F
-0 R
-0 G
-0.1892 w 10 M
-124.5801 434.2998 m
-126.3872 433.2363 125.7798 432.3799 v
-125.3525 431.7461 71.2617 445.8291 60.98 425.6602 c
-64.9063 446.4102 124.5801 434.2998 v
-124.5801 434.2998 l
-s
-0 O
-1 g
-1 w 4 M
-121.46 423.0195 m
-123.5381 422.624 123.3799 421.8193 v
-123.0249 420.8838 67.2534 417.207 63.8599 394.7002 c
-61.04 415.7598 121.46 423.0195 v
-F
-0 R
-0 G
-0.1892 w 10 M
-121.46 423.0195 m
-123.5381 422.624 123.3799 421.8193 v
-123.0249 420.8838 67.2534 417.207 63.8599 394.7002 c
-61.04 415.7598 121.46 423.0195 v
-121.46 423.0195 l
-s
-0 O
-1 g
-1 w 4 M
-116.8999 429.0195 m
-118.8223 428.4082 118.3398 427.5801 v
-118.0615 426.7617 62.3481 431.2617 55.7002 409.5801 c
-55.9902 430.7334 116.8999 429.0195 v
-F
-0 R
-0 G
-0.1892 w 10 M
-116.8999 429.0195 m
-118.8223 428.4082 118.3398 427.5801 v
-118.0615 426.7617 62.3481 431.2617 55.7002 409.5801 c
-55.9902 430.7334 116.8999 429.0195 v
-116.8999 429.0195 l
-s
-0 O
-1 g
-1 w 4 M
-105.1401 449.1797 m
-106.5298 447.6514 105.8599 447.0195 v
-105.123 446.5039 57.0054 474.9434 41.54 458.2998 c
-51.0586 477.2549 105.1401 449.1797 v
-F
-0 R
-0 G
-0.1892 w 10 M
-105.1401 449.1797 m
-106.5298 447.6514 105.8599 447.0195 v
-105.123 446.5039 57.0054 474.9434 41.54 458.2998 c
-51.0586 477.2549 105.1401 449.1797 v
-105.1401 449.1797 l
-s
-0 O
-1 g
-1 w 4 M
-96.7402 444.6201 m
-98.3936 443.2139 97.7002 442.46 v
-97.1265 441.9131 46.0977 464.7266 32.4199 446.54 c
-39.9297 466.3496 96.7402 444.6201 v
-F
-0 R
-0 G
-0.1892 w 10 M
-96.7402 444.6201 m
-98.3936 443.2139 97.7002 442.46 v
-97.1265 441.9131 46.0977 464.7266 32.4199 446.54 c
-39.9297 466.3496 96.7402 444.6201 v
-96.7402 444.6201 l
-s
-0 O
-1 g
-1 w 4 M
-93.8599 440.0596 m
-95.6982 438.9629 95.0601 438.1396 v
-94.6206 437.5059 40.9614 453.1494 30.02 433.3398 c
-34.6279 453.917 93.8599 440.0596 v
-F
-0 R
-0 G
-0.1892 w 10 M
-93.8599 440.0596 m
-95.6982 438.9629 95.0601 438.1396 v
-94.6206 437.5059 40.9614 453.1494 30.02 433.3398 c
-34.6279 453.917 93.8599 440.0596 v
-93.8599 440.0596 l
-s
-0 O
-1 g
-1 w 4 M
-105.6201 439.3398 m
-106.9736 437.7129 106.1001 437.1797 v
-105.4302 436.7549 61.3545 471.1279 43.7002 456.6201 c
-55.7529 474.1826 105.6201 439.3398 v
-F
-0 R
-0 G
-0.1892 w 10 M
-105.6201 439.3398 m
-106.9736 437.7129 106.1001 437.1797 v
-105.4302 436.7549 61.3545 471.1279 43.7002 456.6201 c
-55.7529 474.1826 105.6201 439.3398 v
-105.6201 439.3398 l
-s
-0 O
-1 g
-1 w 4 M
-84.02 471.2598 m
-84.6416 469.2607 83.7798 469.0996 v
-82.8799 468.8213 51.4209 515.0215 30.2598 506.7803 c
-47.0215 519.6416 84.02 471.2598 v
-F
-0 R
-0 G
-0.1892 w 10 M
-84.02 471.2598 m
-84.6416 469.2607 83.7798 469.0996 v
-82.8799 468.8213 51.4209 515.0215 30.2598 506.7803 c
-47.0215 519.6416 84.02 471.2598 v
-84.02 471.2598 l
-s
-0 O
-1 g
-1 w 4 M
-84.7402 463.5801 m
-85.8174 461.7725 84.98 461.4199 v
-84.1929 460.9639 43.5078 499.292 24.7402 486.6201 c
-38.2158 502.8535 84.7402 463.5801 v
-F
-0 R
-0 G
-0.1892 w 10 M
-84.7402 463.5801 m
-85.8174 461.7725 84.98 461.4199 v
-84.1929 460.9639 43.5078 499.292 24.7402 486.6201 c
-38.2158 502.8535 84.7402 463.5801 v
-84.7402 463.5801 l
-s
-0 O
-1 g
-1 w 4 M
-84.5 458.7803 m
-85.8535 457.0732 84.98 456.6201 v
-84.3105 456.1182 40.2344 490.4883 22.5801 476.0596 c
-34.6328 493.541 84.5 458.7803 v
-F
-0 R
-0 G
-0.1892 w 10 M
-84.5 458.7803 m
-85.8535 457.0732 84.98 456.6201 v
-84.3105 456.1182 40.2344 490.4883 22.5801 476.0596 c
-34.6328 493.541 84.5 458.7803 v
-84.5 458.7803 l
-s
-0 O
-1 g
-1 w 4 M
-82.1001 456.8594 m
-82.7407 450.2168 83.8281 442.9902 85.7002 439.5801 c
-81.7808 425.9189 91.46 411.5 v
-91.0205 403.4795 92.8999 399.9795 v
-97.1816 390.7207 102.5 389.8994 v
-106.7334 389.1299 116.3286 385.7529 127.2197 384.1396 c
-146.0215 368.7197 142.5801 354.6201 v
-142.0615 336.6006 138.02 334.9395 v
-150.8599 347.1582 140.4199 328.7002 v
-135.3799 308.0596 l
-163.6206 331.7598 146.4199 311.4199 v
-135.3799 282.8594 l
-157.0205 303.1592 149.0601 293.8994 v
-145.7002 284.2998 l
-193.1001 314.1582 159.1401 281.6602 v
-168.02 285.5596 172.8198 282.3799 v
-180.3418 283.8008 179.54 282.1396 v
-156.5815 270.6006 152.6602 250.46 v
-161.8613 261.3584 158.4199 249.5 v
-158.8999 236.7803 l
-163.1816 260.4795 162.7402 219.0195 v
-183.8599 238.9209 171.1401 216.1396 v
-171.1401 197.6602 l
-187.8198 215.5996 180.7402 201.5 v
-191.7798 211.2002 187.46 194.54 v
-186.5 183.0391 191.2998 195.2598 v
-208.9399 229.0205 202.3398 200.2998 v
-201.4614 179.0791 206.6602 195.2598 v
-207.1807 183.9199 217.2197 176.0596 v
-215.9814 231.8789 230.1802 192.3799 v
-234.5 174.1396 l
-237.541 184.3594 237.1401 189.9795 v
-253.3809 208.1191 246.02 181.3398 v
-262.6206 206.3594 259.2197 191.8994 v
-250.7407 174.2402 252.5 168.8594 v
-270.98 207.2402 272.4199 208.9395 v
-270.1016 162.3584 282.02 201.9795 v
-288.1401 188.7607 285.1401 183.9795 v
-293.8613 192.7207 293.0601 196.2197 v
-298.04 205.2607 301.2197 190.2197 v
-303.1016 179.96 304.8198 183.5 v
-309.2598 157.0781 310.5801 182.0596 v
-312.3418 197.1201 304.3398 209.8994 v
-305.2998 213.3994 302.1802 217.8193 v
-317.1797 194.04 309.3799 225.7393 v
-321.582 216.9199 322.8203 216.8594 v
-307.9395 242.4385 317.54 237.2598 v
-311.9004 248.5996 331.7002 235.3398 v
-314.1006 252.999 333.3799 242.54 v
-342.2617 235.3994 333.8594 246.3799 v
-318.0605 264.001 342.2598 244.2197 v
-355.0205 226.1602 355.9395 223.0996 v
-344.9023 255.2002 340.0996 258.3799 v
-349.3018 298.3203 394.5801 281.1797 v
-402.1016 262.2393 407.0605 282.3799 v
-421.0215 289.5195 433.46 259.0996 v
-437.7422 274.1191 436.8203 277.0996 v
-444.3418 275.8779 443.54 277.0996 v
-457.9805 272.3594 459.3799 273.2598 v
-466.7813 265.7598 467.2998 269.6602 v
-477.3418 266.6406 475.2197 270.6201 v
-484.8223 253.4404 485.2998 249.5 v
-487.9395 264.8594 l
-490.0996 261.7393 l
-491.8613 270.1592 491.0605 271.5801 v
-490.1025 272.7988 512.9814 264.001 518.1797 241.0996 c
-520.5801 231.9795 l
-527.0625 248.1602 525.3799 252.6201 v
-531.0225 251.6787 531.3799 246.8594 v
-535.8613 272.3594 530.6602 279.0195 v
-535.4219 279.8408 536.6602 275.8994 v
-536.6602 283.8193 l
-544.6621 282.9199 544.5801 285.5 v
-549.502 289.959 551.7793 284.7803 v
-538.0615 323.4004 558.2598 302.2998 v
-566.2207 290.4004 562.3398 311.1797 v
-558.3008 331.7598 553.9014 333.5186 559.2207 333.9795 c
-560.0625 337.9209 557.7793 339.7393 v
-555.6602 341.4385 559.2207 339.7393 y
-564.4609 335.2803 558.7402 359.4199 v
-565.7813 357.7207 552.5 389.8994 v
-555.6602 392.4795 551.2998 401.6602 v
-560.0625 396.8789 563.0605 398.54 v
-562.7021 400.3994 559.2207 404.7803 v
-535.4219 465.0801 557.7793 440.7803 v
-570.8965 425.9746 563.7793 451.0996 v
-553.834 477.4658 554.6602 482.2998 v
-82.1001 456.8594 l
-F
-0 R
-0 G
-1.1 w 10 M
-82.1001 456.8594 m
-82.7407 450.2168 83.8281 442.9902 85.7002 439.5801 c
-81.7808 425.9189 91.46 411.5 v
-91.0205 403.4795 92.8999 399.9795 v
-97.1816 390.7207 102.5 389.8994 v
-106.7334 389.1299 116.3286 385.7529 127.2197 384.1396 c
-146.0215 368.7197 142.5801 354.6201 v
-142.0615 336.6006 138.02 334.9395 v
-150.8599 347.1582 140.4199 328.7002 v
-135.3799 308.0596 l
-163.6206 331.7598 146.4199 311.4199 v
-135.3799 282.8594 l
-157.0205 303.1592 149.0601 293.8994 v
-145.7002 284.2998 l
-193.1001 314.1582 159.1401 281.6602 v
-168.02 285.5596 172.8198 282.3799 v
-180.3418 283.8008 179.54 282.1396 v
-156.5815 270.6006 152.6602 250.46 v
-161.8613 261.3584 158.4199 249.5 v
-158.8999 236.7803 l
-163.1816 260.4795 162.7402 219.0195 v
-183.8599 238.9209 171.1401 216.1396 v
-171.1401 197.6602 l
-187.8198 215.5996 180.7402 201.5 v
-191.7798 211.2002 187.46 194.54 v
-186.5 183.0391 191.2998 195.2598 v
-208.9399 229.0205 202.3398 200.2998 v
-201.4614 179.0791 206.6602 195.2598 v
-207.1807 183.9199 217.2197 176.0596 v
-215.9814 231.8789 230.1802 192.3799 v
-234.5 174.1396 l
-237.541 184.3594 237.1401 189.9795 v
-253.3809 208.1191 246.02 181.3398 v
-262.6206 206.3594 259.2197 191.8994 v
-250.7407 174.2402 252.5 168.8594 v
-270.98 207.2402 272.4199 208.9395 v
-270.1016 162.3584 282.02 201.9795 v
-288.1401 188.7607 285.1401 183.9795 v
-293.8613 192.7207 293.0601 196.2197 v
-298.04 205.2607 301.2197 190.2197 v
-303.1016 179.96 304.8198 183.5 v
-309.2598 157.0781 310.5801 182.0596 v
-312.3418 197.1201 304.3398 209.8994 v
-305.2998 213.3994 302.1802 217.8193 v
-317.1797 194.04 309.3799 225.7393 v
-321.582 216.9199 322.8203 216.8594 v
-307.9395 242.4385 317.54 237.2598 v
-311.9004 248.5996 331.7002 235.3398 v
-314.1006 252.999 333.3799 242.54 v
-342.2617 235.3994 333.8594 246.3799 v
-318.0605 264.001 342.2598 244.2197 v
-355.0205 226.1602 355.9395 223.0996 v
-344.9023 255.2002 340.0996 258.3799 v
-349.3018 298.3203 394.5801 281.1797 v
-402.1016 262.2393 407.0605 282.3799 v
-421.0215 289.5195 433.46 259.0996 v
-437.7422 274.1191 436.8203 277.0996 v
-444.3418 275.8779 443.54 277.0996 v
-457.9805 272.3594 459.3799 273.2598 v
-466.7813 265.7598 467.2998 269.6602 v
-477.3418 266.6406 475.2197 270.6201 v
-484.8223 253.4404 485.2998 249.5 v
-487.9395 264.8594 l
-490.0996 261.7393 l
-491.8613 270.1592 491.0605 271.5801 v
-490.1025 272.7988 512.9814 264.001 518.1797 241.0996 c
-520.5801 231.9795 l
-527.0625 248.1602 525.3799 252.6201 v
-531.0225 251.6787 531.3799 246.8594 v
-535.8613 272.3594 530.6602 279.0195 v
-535.4219 279.8408 536.6602 275.8994 v
-536.6602 283.8193 l
-544.6621 282.9199 544.5801 285.5 v
-549.502 289.959 551.7793 284.7803 v
-538.0615 323.4004 558.2598 302.2998 v
-566.2207 290.4004 562.3398 311.1797 v
-558.3008 331.7598 553.9014 333.5186 559.2207 333.9795 c
-560.0625 337.9209 557.7793 339.7393 v
-555.6602 341.4385 559.2207 339.7393 y
-564.4609 335.2803 558.7402 359.4199 v
-565.7813 357.7207 552.5 389.8994 v
-555.6602 392.4795 551.2998 401.6602 v
-560.0625 396.8789 563.0605 398.54 v
-562.7021 400.3994 559.2207 404.7803 v
-535.4219 465.0801 557.7793 440.7803 v
-570.8965 425.9746 563.7793 451.0996 v
-553.834 477.4658 554.6602 482.2998 v
-82.1001 456.8594 l
-82.1001 456.8594 l
-s
-0 O
-0.164706 0.627451 1 0.031373 k
-1 w 4 M
-554.6602 482.0596 m
-555.3799 481.7715 557.8066 480.5361 559.2197 478.7002 c
-566.6621 466.8418 560.9004 487.0996 v
-550.8223 518.7607 560.4199 506.54 v
-567.1016 498.5215 563.54 513.5 v
-559.3301 531.5498 556.5801 538.46 y
-569.3027 533.2803 539.7793 576.8594 v
-549.6201 572.7793 l
-527.9414 616.4404 504.2598 622.2197 v
-495.3799 628.7002 l
-537.623 670.5605 523.46 711.0195 v
-516.0605 716.7607 505.46 706.7002 v
-498.4609 701.3594 491.7793 703.0996 v
-457.9805 701.8018 455.7793 701.8994 v
-453.582 701.8018 415.3018 742.7217 343.2197 723.2598 c
-337.4219 721.1602 332.6602 722.54 v
-312.3418 740.0811 258.7397 715.0996 v
-247.6616 712.8008 246.02 712.7002 v
-244.1406 712.8008 241.0615 712.8008 232.3398 705.7393 c
-223.46 698.7197 223.0205 697.8418 220.8198 696.1396 c
-202.7817 683.7607 197.54 682.9395 v
-184.7407 675.8408 180.02 664.9395 v
-175.9399 663.5 l
-174.1807 655.6016 173.7798 654.3799 v
-168.4614 650.3213 167.54 644.0596 v
-157.9014 637.5605 158.4199 632.7793 v
-156.5815 627.001 155.7798 621.7393 v
-147.7808 616.4404 148.5801 613.3398 v
-140.2998 597.9609 141.6201 590.54 v
-134.5806 590.9209 131.54 588.3799 v
-130.6206 583.001 128.8999 582.6201 v
-125.7798 581.2393 128.4199 576.8594 v
-126.6606 573.7617 126.2598 572.0596 v
-127.1001 568.9209 122.1797 562.7002 v
-115.2197 542.0811 117.3799 536.2998 v
-117.8599 531.0801 114.7397 529.3398 v
-110.8208 529.7598 120.02 516.6201 v
-120.9414 515.2393 117.3799 512.54 v
-98.5015 508.6396 95.7798 490.7002 v
-80.8999 474.3193 80.8999 468.6201 v
-80.8999 466.0664 81.1973 462.6025 81.8599 457.5801 c
-81.3418 448.3594 111.6201 447.5 v
-142.0615 446.5996 554.6602 482.0596 y
-F
-0 R
-0 G
-1.1 w 10 M
-554.6602 482.0596 m
-555.3799 481.7715 557.8066 480.5361 559.2197 478.7002 c
-566.6621 466.8418 560.9004 487.0996 v
-550.8223 518.7607 560.4199 506.54 v
-567.1016 498.5215 563.54 513.5 v
-559.3301 531.5498 556.5801 538.46 y
-569.3027 533.2803 539.7793 576.8594 v
-549.6201 572.7793 l
-527.9414 616.4404 504.2598 622.2197 v
-495.3799 628.7002 l
-537.623 670.5605 523.46 711.0195 v
-516.0605 716.7607 505.46 706.7002 v
-498.4609 701.3594 491.7793 703.0996 v
-457.9805 701.8018 455.7793 701.8994 v
-453.582 701.8018 415.3018 742.7217 343.2197 723.2598 c
-337.4219 721.1602 332.6602 722.54 v
-312.3418 740.0811 258.7397 715.0996 v
-247.6616 712.8008 246.02 712.7002 v
-244.1406 712.8008 241.0615 712.8008 232.3398 705.7393 c
-223.46 698.7197 223.0205 697.8418 220.8198 696.1396 c
-202.7817 683.7607 197.54 682.9395 v
-184.7407 675.8408 180.02 664.9395 v
-175.9399 663.5 l
-174.1807 655.6016 173.7798 654.3799 v
-168.4614 650.3213 167.54 644.0596 v
-157.9014 637.5605 158.4199 632.7793 v
-156.5815 627.001 155.7798 621.7393 v
-147.7808 616.4404 148.5801 613.3398 v
-140.2998 597.9609 141.6201 590.54 v
-134.5806 590.9209 131.54 588.3799 v
-130.6206 583.001 128.8999 582.6201 v
-125.7798 581.2393 128.4199 576.8594 v
-126.6606 573.7617 126.2598 572.0596 v
-127.1001 568.9209 122.1797 562.7002 v
-115.2197 542.0811 117.3799 536.2998 v
-117.8599 531.0801 114.7397 529.3398 v
-110.8208 529.7598 120.02 516.6201 v
-120.9414 515.2393 117.3799 512.54 v
-98.5015 508.6396 95.7798 490.7002 v
-80.8999 474.3193 80.8999 468.6201 v
-80.8999 466.0664 81.1973 462.6025 81.8599 457.5801 c
-81.3418 448.3594 111.6201 447.5 v
-142.0615 446.5996 554.6602 482.0596 y
-554.6602 482.0596 l
-s
-0 O
-0.164706 0.627451 1 0.031373 k
-1 w 4 M
-97.9399 457.3398 m
-70.3398 500.7197 86.1802 438.6201 y
-95.8613 400.8389 238.3398 442.2197 y
-424.1025 475.6396 436.3398 480.1396 v
-448.7402 484.4404 553.46 477.5 y
-547.2207 495.9795 l
-476.0215 546.9199 454.9014 521.4004 439.9395 525.7402 c
-424.9805 530.2012 427.6211 519.6416 424.0996 518.7803 c
-420.582 517.8799 377.4609 545.1602 370.3398 544.2197 c
-363.3828 543.4014 335.5059 569.5273 351.8594 534.6201 c
-369.541 497.2012 287.7007 491.4795 269.2998 503.8994 c
-250.7407 516.1201 277.2197 483.5 y
-297.3799 461.5615 259.46 480.1396 y
-221.7007 494.1201 195.3008 465.9609 191.7798 465.0195 c
-188.2617 464.2012 182.9814 460.6807 182.1802 467.6602 c
-181.2197 474.7617 172.959 493.1309 138.02 464.2998 c
-116.1006 445.9395 100.8198 470.0596 y
-97.9399 457.3398 l
-F
-0.054902 0.607843 0.878431 0 k
-371.7793 542.2998 m
-364.8203 541.4814 336.918 567.5938 353.2998 532.7002 c
-371.6406 493.9609 289.1406 489.5596 270.7402 501.9795 c
-252.1807 514.2002 278.6602 481.5801 y
-298.8198 459.6416 260.8999 478.2197 y
-223.1406 492.2002 196.7407 464.04 193.2197 463.0996 c
-189.7017 462.2813 184.4214 458.7607 183.6201 465.7393 c
-182.6602 472.8418 174.543 491.0283 139.46 462.3799 c
-116.1802 443.1992 101.2998 466.7002 y
-97.9399 455.6602 l
-70.3208 499.46 86.8999 435.2598 y
-96.5815 397.4785 239.7798 440.2998 y
-425.54 473.7197 437.7793 478.2197 v
-450.1807 482.5205 553.9395 475.5801 y
-547.9395 494.54 l
-476.5801 545.6406 456.3418 519.4805 441.3799 523.8193 c
-426.4209 528.2813 429.0605 517.7217 425.54 516.8594 c
-422.0215 515.96 378.9004 543.2402 371.7793 542.2998 c
-F
-0.047059 0.537255 0.772549 0 k
-373.2197 540.3799 m
-366.2598 539.5615 339.0537 565.9922 354.7402 530.7793 c
-372.6416 490.9395 290.5806 487.6396 272.1802 500.0596 c
-253.6206 512.2783 280.1001 479.6602 y
-300.2598 457.7188 262.3398 476.2998 y
-224.5806 490.2793 198.1807 462.1182 194.6602 461.1797 c
-191.1392 460.3594 185.8594 456.8379 185.0601 463.8193 c
-184.1001 470.9189 176.127 488.9238 140.8999 460.46 c
-116.2593 440.458 101.7798 463.3398 y
-97.7002 453.9795 l
-71.6216 496.8799 87.6201 431.8994 y
-97.3018 394.1191 241.2197 438.3799 y
-426.9805 471.7998 439.2197 476.2998 v
-451.6211 480.5977 554.4199 473.6602 y
-548.4199 493.3398 l
-477.1406 544.3594 457.7813 517.5605 442.8203 521.8994 c
-427.8613 526.3613 430.501 515.8018 426.9805 514.9395 c
-423.4609 514.04 380.3408 541.3203 373.2197 540.3799 c
-F
-0.039216 0.462745 0.67451 0 k
-374.6602 538.46 m
-367.7002 537.6416 340.498 564.0752 356.1797 528.8594 c
-374.7422 487.5293 291.4326 486.1113 273.6201 498.1396 c
-255.0605 510.3604 281.54 477.7393 y
-301.7002 455.8018 263.7798 474.3799 y
-226.0205 488.3594 199.6206 460.2002 196.1001 459.2598 c
-192.5815 458.4414 187.3018 454.9209 186.5 461.8994 c
-185.54 469.001 177.7134 486.8164 142.3398 458.54 c
-116.3408 437.7197 102.2598 460.2197 y
-97.7002 452.2998 l
-73.7983 492.7617 88.3398 428.54 y
-98.0215 390.7588 242.6602 436.46 y
-428.4199 469.8799 440.6602 474.3799 v
-453.0625 478.6807 554.9004 471.9795 y
-548.9004 492.1396 l
-477.7012 543.0801 459.2217 515.6406 444.2598 519.9795 c
-429.3008 524.4414 431.9414 513.8818 428.4199 513.0195 c
-424.9014 512.1201 381.7813 539.4004 374.6602 538.46 c
-F
-0.035294 0.396078 0.572549 0 k
-376.0996 536.54 m
-369.1406 535.7188 342.4951 562.3994 357.6201 526.9395 c
-376.1816 483.7998 293.4609 483.7998 275.0601 496.2197 c
-256.501 508.4385 282.98 475.8193 y
-303.1401 453.8789 265.2197 472.46 y
-227.4609 486.4395 201.0605 458.2783 197.54 457.3398 c
-194.0215 456.5186 188.7417 452.998 187.9399 459.9795 c
-186.98 467.0791 179.2974 484.7139 143.7798 456.6201 c
-116.4199 434.9785 102.5 456.8594 y
-97.7002 450.6201 l
-75.98 488.8613 89.0601 425.1797 y
-98.7393 387.3994 244.1001 434.54 y
-429.8623 467.96 442.0996 472.46 v
-454.5039 476.7578 555.3799 470.0596 y
-549.6201 490.7002 l
-478.2637 541.8008 460.6621 513.7178 445.7002 518.0596 c
-430.7432 522.5186 433.3828 511.959 429.8594 511.0996 c
-426.3418 510.2002 383.2227 537.4785 376.0996 536.54 c
-F
-0.031373 0.333333 0.470588 0 k
-377.54 534.6201 m
-370.582 533.8018 342.0225 559.5967 359.0605 525.0195 c
-380.2617 482.3213 294.9009 481.8799 276.5 494.2998 c
-257.9409 506.5205 284.4199 473.8994 y
-304.5801 451.959 266.6602 470.54 y
-228.9009 484.5195 202.501 456.3604 198.98 455.4199 c
-195.4614 454.6016 190.1816 451.0801 189.3799 458.0596 c
-188.4199 465.1592 180.8818 482.6094 145.2197 454.7002 c
-116.5015 432.2383 102.98 453.5 y
-97.7002 448.9395 l
-77.9409 485.4004 89.7798 421.8193 y
-99.4614 384.0391 245.54 432.6201 y
-431.3027 466.04 443.54 470.54 v
-455.9434 474.8408 555.8594 468.1396 y
-550.0996 489.5 l
-478.8223 540.5186 462.1016 511.8008 447.1406 516.1396 c
-432.1836 520.6016 434.8232 510.0391 431.2998 509.1797 c
-427.7813 508.2793 384.6631 535.5605 377.54 534.6201 c
-F
-0.027451 0.278431 0.372549 0 k
-378.9805 532.7002 m
-372.0195 531.8818 343.0449 557.4678 360.5 523.0996 c
-383.0215 479.0791 296.3408 479.96 277.9399 492.3799 c
-259.3809 504.5977 285.8599 471.9795 y
-306.02 450.0391 268.1001 468.6201 y
-230.3408 482.5996 203.9409 454.4385 200.4199 453.5 c
-196.9014 452.6787 191.6216 449.1582 190.8198 456.1396 c
-189.8599 463.2393 182.4658 480.5049 146.6602 452.7793 c
-116.5806 429.5 103.46 450.1396 y
-97.7002 447.2598 l
-80.1201 480.3994 90.5 418.46 y
-100.1792 380.6787 246.98 430.7002 y
-432.7422 464.1201 444.9805 468.6201 v
-457.3828 472.918 556.3398 466.46 y
-550.5801 488.2998 l
-479.3818 539.2393 463.541 509.8779 448.5801 514.2197 c
-433.623 518.6816 436.2637 508.1191 432.7402 507.2598 c
-429.2217 506.3594 386.1035 533.6406 378.9805 532.7002 c
-F
-0.019608 0.215686 0.286275 0 k
-380.4199 530.7793 m
-373.4629 529.959 343.2754 554.9023 361.9395 521.1797 c
-386.2227 477.6006 297.7808 478.04 279.3799 490.46 c
-260.8208 502.6807 287.2998 470.0596 y
-307.46 448.1191 269.54 466.7002 y
-231.7808 480.6797 205.3809 452.5205 201.8599 451.5801 c
-198.3418 450.7588 193.0615 447.2402 192.2598 454.2197 c
-191.2998 461.3193 184.0498 478.3994 148.1001 450.8594 c
-116.6602 426.7588 103.9399 446.7793 y
-97.7002 445.5801 l
-81.8599 476.7197 91.2197 415.0996 y
-100.9014 377.3193 248.4199 428.7793 y
-434.1826 462.2002 446.4199 466.7002 v
-458.8232 471.001 556.8203 464.54 y
-551.2998 486.8594 l
-479.9434 537.9609 464.9814 507.9609 450.0195 512.2998 c
-435.0625 516.7588 437.7031 506.1992 434.1797 505.3398 c
-430.6621 504.4395 387.543 531.7207 380.4199 530.7793 c
-F
-0.015686 0.156863 0.203922 0 k
-381.8594 528.8594 m
-374.9023 528.0391 344.7148 552.9824 363.3799 519.2598 c
-387.6631 475.6777 299.2231 476.1201 280.8198 488.54 c
-262.2607 500.7578 288.7402 468.1396 y
-308.9023 446.1992 270.98 464.7793 y
-233.2207 478.7598 206.8208 450.5977 203.2998 449.6602 c
-199.7817 448.8389 194.5015 445.3184 193.7002 452.2998 c
-192.7402 459.3994 185.6357 476.2949 149.54 448.9395 c
-116.7417 424.0186 104.1802 443.4199 y
-97.7002 443.6602 l
-82.7192 472.8193 91.9399 411.7393 y
-101.6216 373.959 249.8599 426.8594 y
-435.623 460.2793 447.8594 464.7793 v
-460.2637 469.0781 557.2998 462.6201 y
-551.7793 485.6602 l
-480.502 536.6787 466.4219 506.0381 451.46 510.3799 c
-436.501 514.8389 439.1426 504.2793 435.6201 503.4199 c
-432.1016 502.5195 388.9834 529.7979 381.8594 528.8594 c
-F
-0.011765 0.098039 0.12549 0 k
-383.2998 526.9395 m
-376.3418 526.1191 346.582 551.2949 364.8203 517.3398 c
-389.1006 472.4404 300.6606 474.2002 282.2598 486.6201 c
-263.7007 498.8408 290.1802 466.2197 y
-310.3418 444.2793 272.4199 462.8594 y
-234.6606 476.8398 208.2607 448.6807 204.7402 447.7393 c
-201.2217 446.9189 195.9414 443.4004 195.1401 450.3799 c
-194.1802 457.4785 187.2197 474.1904 150.98 447.0195 c
-116.8208 421.2793 104.6602 440.0596 y
-97.7002 441.9795 l
-83.3599 468.4805 92.6602 408.3799 y
-102.3418 370.5986 251.2998 424.9395 y
-437.0625 458.3594 449.2998 462.8594 v
-461.7012 467.1602 557.7793 460.9395 y
-552.2598 484.46 l
-481.0615 535.3994 467.8613 504.1201 452.9004 508.46 c
-437.9414 512.9189 440.5801 502.3594 437.0605 501.5 c
-433.541 500.5996 390.4209 527.8809 383.2998 526.9395 c
-F
-0 0.039216 0.05098 0 k
-384.7402 525.0195 m
-377.7822 524.2012 349.208 549.9893 366.2598 515.4199 c
-389.6621 468.3193 302.1006 472.2793 283.7002 484.7002 c
-265.1406 496.918 291.6201 464.2998 y
-311.7822 442.3594 273.8599 460.9395 y
-236.1006 474.9199 209.7007 446.7578 206.1802 445.8193 c
-202.6616 444.999 197.3818 441.4785 196.5801 448.46 c
-195.6226 455.5586 188.8042 472.085 152.4199 445.0996 c
-116.8999 418.5391 105.1401 436.7002 y
-97.7002 440.2998 l
-83.5591 465.8984 93.3799 405.0195 y
-103.0615 367.2393 252.7402 423.0195 y
-438.502 456.4395 450.7402 460.9395 v
-463.1426 465.2383 558.2598 459.0195 y
-552.9805 483.0195 l
-481.6211 534.1201 469.3018 502.1982 454.3398 506.54 c
-439.3828 511.001 442.0234 500.4385 438.5 499.5801 c
-434.9814 498.6797 391.8613 525.9609 384.7402 525.0195 c
-F
-1 g
-97.7002 438.6201 m
-83.54 462.8818 94.1001 401.6602 y
-103.7817 363.8789 254.1802 421.0996 y
-439.9424 454.5195 452.1797 459.0195 v
-464.5801 463.3203 558.7402 457.0996 y
-553.46 481.8193 l
-482.1826 532.8418 470.7422 500.2803 455.7793 504.6201 c
-440.8203 509.0811 443.4609 498.5215 439.9395 497.6602 c
-436.4219 496.7598 393.3008 524.041 386.1797 523.0996 c
-379.2227 522.2813 351.4785 548.4678 367.7002 513.5 c
-392.2305 461.002 300.9463 472.0898 285.1401 482.7803 c
-266.5806 495.001 293.0601 462.3799 y
-313.2197 440.4395 275.2998 459.0195 y
-237.541 473 211.1406 444.8408 207.6201 443.8994 c
-204.1016 443.0791 198.8218 439.5586 198.02 446.54 c
-197.0601 453.6416 190.3877 469.9834 153.8599 443.1797 c
-116.9814 415.8008 105.6201 433.3398 y
-97.7002 438.6201 l
-F
-0 g
-143.2998 405.7402 m
-135.4614 392.9189 158.4199 378.3799 v
-159.8818 376.8584 140.1802 381.5 v
-133.2607 383.6787 131.54 395.1797 v
-126.2217 399.958 120.98 406.2197 v
-115.6616 412.2803 143.2998 405.7402 y
-F
-0.8 g
-297.3799 458.0596 m
-316.8486 428.5371 316.0996 423.2598 v
-314.7607 411.8408 314.54 401.2803 318.0195 396.8594 c
-321.582 392.4795 331.2197 356.0596 y
-330.8223 354.6387 344.4199 396.3799 v
-357.2217 414.0391 335.2998 434.2998 v
-296.5015 465.9609 297.3799 458.0596 v
-F
-0 g
-165.3799 376.2197 m
-177.7017 368.2803 161.7798 333.9795 v
-168.98 336.6201 l
-168.02 324.2793 164.4199 321.7393 v
-172.3398 325.0996 l
-177.7017 316.3594 173.2998 311.1797 v
-191.7798 302.2803 190.8198 295.3398 v
-197.9409 304.04 193.46 311.1797 v
-189.1401 318.1201 181.2197 313.7188 182.1802 333.9795 c
-172.3398 330.3799 l
-178.5801 340.1191 178.5801 347.1797 v
-169.7002 344.54 l
-186.7949 373.7549 174.98 375.2598 v
-168.4614 376.2002 165.3799 376.2197 y
-F
-0.8 g
-201.1401 357.7393 m
-204.1016 362.5586 201.1401 361.5801 v
-197.9409 360.7998 163.6206 344.5205 156.98 333.9795 c
-194.8613 360.7998 201.1401 357.7393 v
-F
-212.4199 348.8594 m
-215.54 353.7578 212.4199 352.9395 v
-209.3818 351.999 175.0615 335.7197 168.5 325.0996 c
-206.2998 351.999 212.4199 348.8594 v
-F
-227.0601 365.6602 m
-230.0601 370.4795 227.0601 369.5 v
-223.9014 368.7197 189.5815 352.4404 182.8999 341.8994 c
-220.8198 368.7197 227.0601 365.6602 v
-F
-201.3799 317.6602 m
-201.4614 324.2793 198.5 323.4199 v
-195.3008 322.5195 155.7007 303.1592 149.0601 292.7002 c
-195.3008 320.7578 201.3799 317.6602 v
-F
-202.8198 329.6602 m
-204.1016 334.8389 201.1401 333.9795 v
-198.8218 333.958 169.7817 321.2002 163.2197 310.7002 c
-195.7402 334.3994 202.8198 329.6602 v
-F
-186.98 277.0996 m
-175.9399 268.9395 l
-187.3809 277.2002 191.2998 275.8994 v
-183.8599 263.5586 182.8999 257.8994 v
-194.4199 271.9209 200.6602 271.5801 v
-208.9399 271.04 209.0601 259.0996 v
-215.1006 270.6006 218.6602 270.1396 v
-219.9414 263.1201 218.6602 255.7393 v
-223.0205 264.001 227.54 262.2197 v
-234.4614 264.4395 233.54 251.6602 v
-233.5806 240.2402 232.8198 237.2598 v
-238.8608 266.1992 241.46 266.54 v
-250.3018 267.958 255.6201 258.3799 v
-251.1802 266.6406 256.5801 264.3799 v
-268.3398 262.6777 271.9399 255.2598 v
-264.3799 268.3994 270.5 264.8594 v
-278.0215 264.8789 279.3799 257.8994 v
-288.5815 234.5186 290.8999 232.7002 v
-282.4209 256.5195 284.1802 256.46 v
-281.9814 269.7197 287.7798 253.3398 v
-284.1802 268.8389 290.4199 267.9795 v
-296.5015 267.0801 301.3398 256.0781 310.5801 258.6201 c
-321.1426 252.5596 323.2998 328.7002 v
-186.98 277.0996 l
-F
-0 g
-192.2598 379.3398 m
-208.501 385.8799 252.5 379.3398 v
-260.4199 378.8408 267.8599 388.46 v
-275.3818 398.1992 304.8608 406.1191 312.0195 403.8193 c
-322.5801 396.8594 l
-323.2998 395.6602 l
-336.9824 384.1201 337.46 375.7393 v
-337.8613 367.3994 321.582 314.5996 311.0605 297.0195 c
-300.4614 279.3994 289.9014 265.7598 268.8198 268.46 c
-245.8999 272.7988 217.7002 268.46 v
-185.6216 270.1592 182.6602 279.0195 v
-179.4609 287.7578 194.8999 304.46 y
-199.7002 313.7188 198.5 329.6602 v
-197.0601 345.3994 197.5015 376.2002 192.2598 379.3398 c
-F
-0.047059 0.745098 0.211765 0 k
-216.5 377.1797 m
-225.6606 356.8398 193.2197 285.0195 y
-190.9014 283.3594 207.0273 276.7109 218.1802 279.5 c
-230.2207 282.3008 274.5801 277.5801 y
-300.4614 294.7998 314.6602 343.5801 y
-325.9805 370.04 306.7402 373.5801 v
-287.2617 377.0791 216.5 377.1797 y
-F
-0.247059 0.933333 0.509804 0.070588 k
-214.1001 343.0996 m
-217.8438 357.1641 219.5864 370.1426 216.5 377.1797 c
-285.0605 370.04 297.3799 393.0195 v
-302.0454 401.583 318.2813 367.8389 317.7793 357.2598 c
-248.54 341.4385 232.3398 353.6602 v
-214.1001 343.0996 l
-F
-0.266667 0.972549 0.580392 0.137255 k
-219.1401 325.0996 m
-221.2617 317.2393 218.6602 312.8594 v
-216.8599 311.96 215.54 311.4199 v
-216.8599 307.5586 223.46 305.8994 v
-225.6606 300.958 228.2598 300.6201 v
-230.9409 300.0801 236.2207 293.9189 240.7402 295.3398 c
-245.0215 296.5586 257.2998 300.8594 y
-263.5015 304.4795 273.1401 300.6201 v
-275.792 301.4023 276.2598 305.8994 v
-276.8096 310.9707 280.2197 315.0391 282.5 317.1797 c
-284.6216 319.4404 295.1816 333.5186 293.7798 333.9795 c
-292.5415 334.3994 219.1401 325.0996 y
-F
-0 0.698039 0.356863 0 k
-214.3398 378.3799 m
-211.1406 353.7578 214.5801 344.54 v
-218.1802 335.2803 217.3018 333.0801 216.5 328.7002 c
-215.54 324.2793 220.3809 313.2803 226.5801 306.6201 c
-239.7798 304.9395 l
-256.46 308.8809 266.6602 305.8994 v
-276.4736 304.3232 280.3398 320.7803 v
-285.5 327.7998 293.54 330.8594 v
-301.3398 333.958 309.2598 379.7188 304.8198 388.46 c
-300.4614 397.3203 284.6216 402.1592 267.1401 385.0996 c
-249.4209 367.8389 247.2197 386.3193 214.3398 378.3799 c
-F
-0 R
-0 G
-1.1 w 10 M
-214.3398 378.3799 m
-211.1406 353.7578 214.5801 344.54 v
-218.1802 335.2803 217.3018 333.0801 216.5 328.7002 c
-215.54 324.2793 220.3809 313.2803 226.5801 306.6201 c
-239.7798 304.9395 l
-256.46 308.8809 266.6602 305.8994 v
-276.4736 304.3232 280.3398 320.7803 v
-285.5 327.7998 293.54 330.8594 v
-301.3398 333.958 309.2598 379.7188 304.8198 388.46 c
-300.4614 397.3203 284.6216 402.1592 267.1401 385.0996 c
-249.4209 367.8389 247.2197 386.3193 214.3398 378.3799 c
-214.3398 378.3799 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-216.02 296.0596 m
-215.1006 298.3203 210.2598 298.7002 v
-185.6216 302.7197 176.4199 316.46 v
-168.9009 322.5195 173.7798 309.7393 v
-185.1802 287.3193 192.7402 284.2998 v
-210.7017 279.8408 216.02 296.0596 v
-F
-0 R
-0 G
-0.550001 w 10 M
-216.02 296.0596 m
-215.1006 298.3203 210.2598 298.7002 v
-185.6216 302.7197 176.4199 316.46 v
-168.9009 322.5195 173.7798 309.7393 v
-185.1802 287.3193 192.7402 284.2998 v
-210.7017 279.8408 216.02 296.0596 v
-216.02 296.0596 l
-s
-0 O
-0.145098 0.898039 0.682353 0.027451 k
-1 w 4 M
-303.8599 366.3799 m
-304.6426 375.1855 306.7905 384.6602 304.8198 388.46 c
-297.771 402.7041 279.0991 396.7754 267.1401 385.0996 c
-249.4209 367.8389 247.2197 386.3193 214.3398 378.3799 c
-212.2998 363.041 213.1401 351.9795 v
-254.2617 364.7598 255.1401 358.7002 v
-256.9014 362.1201 267.1401 362.0596 v
-277.1406 362.1201 302.1558 363.4082 303.8599 366.3799 c
-F
-0 R
-0.231373 1 0.941176 0.172549 K
-2.2 w 10 M
-256.5801 377.4199 m
-261.7402 372.2402 257.7798 361.5801 v
-241.9399 344.0791 244.1001 328.7002 v
-S
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-203.7798 284.2998 m
-198.8218 298.3203 208.5801 290.7803 v
-213.7808 288.6387 212.4199 286.9395 v
-211.1406 285.1201 204.98 280.7188 203.7798 284.2998 c
-F
-0 R
-0 G
-0.550001 w 10 M
-203.7798 284.2998 m
-198.8218 298.3203 208.5801 290.7803 v
-213.7808 288.6387 212.4199 286.9395 v
-211.1406 285.1201 204.98 280.7188 203.7798 284.2998 c
-203.7798 284.2998 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-209.2998 282.8594 m
-205.333 294.1826 213.1401 288.1396 v
-217.9399 285.5068 216.2598 285.0195 v
-211.2295 283.623 216.2432 280.8076 209.2998 282.8594 c
-F
-0 R
-0 G
-0.550001 w 10 M
-209.2998 282.8594 m
-205.333 294.1826 213.1401 288.1396 v
-217.9399 285.5068 216.2598 285.0195 v
-211.2295 283.623 216.2432 280.8076 209.2998 282.8594 c
-209.2998 282.8594 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-214.5801 282.8594 m
-210.6128 294.1826 218.4199 288.1396 v
-223.1694 285.6582 221.54 285.0195 v
-217.8296 283.623 221.5229 280.8076 214.5801 282.8594 c
-F
-0 R
-0 G
-0.550001 w 10 M
-214.5801 282.8594 m
-210.6128 294.1826 218.4199 288.1396 v
-223.1694 285.6582 221.54 285.0195 v
-217.8296 283.623 221.5229 280.8076 214.5801 282.8594 c
-214.5801 282.8594 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-221.7798 282.6201 m
-217.8726 293.9648 225.6201 287.8994 v
-230.4365 285.4131 228.7402 284.7803 v
-225.5288 283.623 228.7856 280.5869 221.7798 282.6201 c
-F
-0 R
-0 G
-0.550001 w 10 M
-221.7798 282.6201 m
-217.8726 293.9648 225.6201 287.8994 v
-230.4365 285.4131 228.7402 284.7803 v
-225.5288 283.623 228.7856 280.5869 221.7798 282.6201 c
-221.7798 282.6201 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-228.98 282.8594 m
-225.001 294.0508 232.8198 288.1396 v
-236.9697 286.3086 235.9399 284.7803 v
-234.8574 283.4912 235.9136 280.6758 228.98 282.8594 c
-F
-0 R
-0 G
-0.550001 w 10 M
-228.98 282.8594 m
-225.001 294.0508 232.8198 288.1396 v
-236.9697 286.3086 235.9399 284.7803 v
-234.8574 283.4912 235.9136 280.6758 228.98 282.8594 c
-228.98 282.8594 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-236.1802 282.1396 m
-230.9409 295.6807 240.98 288.6201 v
-246.3418 286.4404 245.0601 284.7803 v
-243.7017 282.9199 245.0215 279.3994 236.1802 282.1396 c
-F
-0 R
-0 G
-0.550001 w 10 M
-236.1802 282.1396 m
-230.9409 295.6807 240.98 288.6201 v
-246.3418 286.4404 245.0601 284.7803 v
-243.7017 282.9199 245.0215 279.3994 236.1802 282.1396 c
-236.1802 282.1396 l
-s
-*u
-0.266667 0.972549 0.580392 0.137255 K
-2.2 w
-204.98 300.8594 m
-219.5 304.04 226.1001 300.6201 v
-232.7002 299.1992 234.02 299.6602 v
-235.3398 300.0801 238.8198 300.6201 y
-S
-1 D
-242.4199 291.2598 m
-255.5815 306.2402 268.8198 301.3398 v
-276.4976 298.5703 275.3818 302.2803 276.2598 305.4199 c
-277.1406 308.4385 277.3613 313.0586 282.98 316.46 c
-S
-*U
-0 D
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-261.3799 308.7803 m
-256.9014 320.7578 253.9399 306.6201 v
-250.7407 292.5986 247.2197 288.6387 245.54 285.5 c
-245.4609 279.8408 254.6602 280.2197 v
-266.5806 280.7188 267.1401 283.8193 v
-267.4614 286.8799 265.7002 299.6406 261.3799 308.7803 c
-F
-0 R
-0 G
-0.550001 w 10 M
-261.3799 308.7803 m
-256.9014 320.7578 253.9399 306.6201 v
-250.7407 292.5986 247.2197 288.6387 245.54 285.5 c
-245.4609 279.8408 254.6602 280.2197 v
-266.5806 280.7188 267.1401 283.8193 v
-267.4614 286.8799 265.7002 299.6406 261.3799 308.7803 c
-261.3799 308.7803 l
-s
-*u
-0.266667 0.972549 0.580392 0.137255 K
-2.2 w
-276.7402 300.8594 m
-280.6616 303.6006 283.2197 302.2998 v
-S
-283.9399 319.0996 m
-287.041 324.3896 292.3398 325.3398 v
-S
-*U
-0 O
-0.701961 g
-1 w 4 M
-196.5801 278.54 m
-216.4209 275 221.2998 276.8594 v
-230.9409 276.7588 221.7798 274.46 v
-207.6201 274.5586 198.7402 275.8994 v
-186.0605 282.0391 196.5801 278.54 v
-F
-0.011765 0 0.239216 0 k
-211.9399 381.0195 m
-231.3799 381.0391 233.54 380.0596 v
-241.501 346.2803 237.6201 337.8193 v
-236.2207 334.8389 233.0601 340.9395 v
-212.8999 377.0791 209.2998 379.3398 v
-205.8608 381.4805 210.7017 381.0391 211.9399 381.0195 c
-F
-0 R
-0 G
-0.550001 w 10 M
-211.9399 381.0195 m
-231.3799 381.0391 233.54 380.0596 v
-241.501 346.2803 237.6201 337.8193 v
-236.2207 334.8389 233.0601 340.9395 v
-212.8999 377.0791 209.2998 379.3398 v
-205.8608 381.4805 210.7017 381.0391 211.9399 381.0195 c
-211.9399 381.0195 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-127.2197 383.8994 m
-137 382.1406 150.98 379.3398 v
-156.1401 354.6387 159.6201 349.3398 v
-163.1816 344.0791 159.2217 344.0791 155.2998 347.1797 c
-151.3018 350.2393 135.02 365.6406 132.7402 370.46 c
-130.6206 375.3193 127.2197 383.8994 y
-F
-0 R
-0 G
-0.550001 w 10 M
-127.2197 383.8994 m
-137 382.1406 150.98 379.3398 v
-156.1401 354.6387 159.6201 349.3398 v
-163.1816 344.0791 159.2217 344.0791 155.2998 347.1797 c
-151.3018 350.2393 135.02 365.6406 132.7402 370.46 c
-130.6206 375.3193 127.2197 383.8994 y
-127.2197 383.8994 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-151.2197 379.0996 m
-157.6377 377.3379 158.6602 375.0195 v
-159.855 372.4658 157.46 368.7803 y
-156.3247 365.2041 155.0601 367.5801 v
-153.6802 369.9629 150.5215 378.3867 151.2197 379.0996 c
-F
-0 R
-0 G
-0.550001 w 10 M
-151.2197 379.0996 m
-157.6377 377.3379 158.6602 375.0195 v
-159.855 372.4658 157.46 368.7803 y
-156.3247 365.2041 155.0601 367.5801 v
-153.6802 369.9629 150.5215 378.3867 151.2197 379.0996 c
-151.2197 379.0996 l
-s
-0 O
-0 g
-1 w 4 M
-151.2197 379.3398 m
-155.2617 373.5586 159.1401 373.5801 v
-163.1816 373.5586 163.6016 374.0146 166.8198 373.3398 c
-171.7617 372.2402 171.3198 374.4385 178.5801 373.0996 c
-181.4839 372.5908 184.3018 373.5586 187.46 372.1396 c
-190.46 370.9209 193.981 371.7988 195.3799 374.0596 c
-196.6206 376.2002 201.8599 380.7803 y
-187.8198 378.8408 184.8198 377.8994 v
-160.1001 376.6396 151.2197 379.3398 v
-F
-0.011765 0 0.239216 0 k
-200.4199 379.0996 m
-193.2656 375.209 192.7402 372.6201 v
-192.3848 369.9297 198.5 365.8994 y
-201.625 360.7998 202.3398 363.5 v
-202.9448 366.0801 201.2407 378.6201 200.4199 379.0996 c
-F
-0 R
-0 G
-0.550001 w 10 M
-200.4199 379.0996 m
-193.2656 375.209 192.7402 372.6201 v
-192.3848 369.9297 198.5 365.8994 y
-201.625 360.7998 202.3398 363.5 v
-202.9448 366.0801 201.2407 378.6201 200.4199 379.0996 c
-200.4199 379.0996 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-159.1401 373.0996 m
-166.8345 360.7422 167.0601 373.0996 v
-167.6865 374.458 165.8599 374.54 v
-159.0679 374.5664 160.7407 379.0781 159.1401 373.0996 c
-F
-0 R
-0 G
-0.550001 w 10 M
-159.1401 373.0996 m
-166.8345 360.7422 167.0601 373.0996 v
-167.6865 374.458 165.8599 374.54 v
-159.0679 374.5664 160.7407 379.0781 159.1401 373.0996 c
-159.1401 373.0996 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-167.0601 372.8594 m
-175.7358 360.4707 174.98 372.8594 v
-175.0449 373.2441 173.0601 373.3398 v
-167.8926 373.8682 168.272 378.8359 167.0601 372.8594 c
-F
-0 R
-0 G
-0.550001 w 10 M
-167.0601 372.8594 m
-175.7358 360.4707 174.98 372.8594 v
-175.0449 373.2441 173.0601 373.3398 v
-167.8926 373.8682 168.272 378.8359 167.0601 372.8594 c
-167.0601 372.8594 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-174.98 372.8594 m
-183.7134 361.0762 182.8999 371.6602 v
-183.1089 373.0664 181.2197 373.3398 v
-177.0078 374.1729 176.7754 377.7461 174.98 372.8594 c
-F
-0 R
-0 G
-0.550001 w 10 M
-174.98 372.8594 m
-183.7134 361.0762 182.8999 371.6602 v
-183.1089 373.0664 181.2197 373.3398 v
-177.0078 374.1729 176.7754 377.7461 174.98 372.8594 c
-174.98 372.8594 l
-s
-0 O
-0.011765 0 0.239216 0 k
-1 w 4 M
-182.4199 372.6201 m
-191.2109 359.9619 191.54 370.7002 v
-193.4023 372.2354 191.54 372.3799 v
-185.0815 373.2939 185.96 378.1953 182.4199 372.6201 c
-F
-0 R
-0 G
-0.550001 w 10 M
-182.4199 372.6201 m
-191.2109 359.9619 191.54 370.7002 v
-193.4023 372.2354 191.54 372.3799 v
-185.0815 373.2939 185.96 378.1953 182.4199 372.6201 c
-182.4199 372.6201 l
-s
-0 O
-0.105882 0.031373 0.356863 0 k
-1 w 4 M
-142.8198 368.7803 m
-134.4199 370.46 l
-131.4463 375.9795 129.1401 382.7002 y
-136.1216 381.6465 149.7798 378.6201 v
-150.8335 374.9141 152.4199 368.54 v
-142.8198 368.7803 l
-F
-214.3398 373.8193 m
-212.4702 376.6807 211.0229 378.6152 210.2598 379.0996 c
-206.9937 381.1328 211.5513 380.7178 212.8999 380.7803 c
-231.02 380.7178 233.0601 379.8193 v
-233.6694 377.4219 234.5 373.5801 v
-223.3232 375.9033 214.3398 373.8193 v
-F
-0.164706 0.627451 1 0.031373 k
-273.3799 525.9795 m
-303.7617 521.5303 331.832 560.7363 333.8594 571.3398 c
-335.7051 582.0322 324.5 595.0996 y
-326.0264 598.4883 320.7012 613.9756 314.9004 624.1396 c
-309.085 634.3057 291.5938 633.2334 272.4199 634.2197 c
-254.876 635.2734 234.5479 609.6201 233.0601 607.5801 c
-231.644 605.749 238.4214 563.6406 239.7798 557.4199 c
-241.3232 551.0547 238.3398 521.8994 y
-276.085 532.0254 242.7754 530.2441 273.3799 525.9795 c
-F
-0.047059 0.517647 0.756863 0 k
-233.7798 606.8594 m
-232.4722 605.0713 239.125 563.7266 240.5 557.6602 c
-241.9761 551.3721 239.0601 522.8594 y
-275.0649 532.6279 243.4014 530.9385 273.3799 526.7002 c
-303.2769 522.3848 330.8379 560.876 332.6602 571.3398 c
-334.6406 581.7871 323.7793 594.6201 y
-325.1357 597.9434 319.9082 613.1504 314.1797 623.1797 c
-308.5039 633.1084 291.332 632.0547 272.4199 633.0195 c
-255.2817 634.0586 235.3232 608.873 233.7798 606.8594 c
-F
-0.035294 0.372549 0.533333 0 k
-234.7402 606.1396 m
-233.2998 604.3926 239.8281 563.8154 241.2197 557.6602 c
-242.6265 551.6885 239.7798 523.8193 y
-274.3735 533.7822 244.0254 531.6338 273.3799 527.4199 c
-302.792 523.2393 329.8447 561.0176 331.7002 571.3398 c
-333.5762 581.54 322.8203 594.1396 y
-324.248 597.3965 319.1172 612.3223 313.46 622.2197 c
-307.9238 631.9111 291.0703 630.8789 272.4199 631.8193 c
-255.6846 632.8447 236.0981 608.124 234.7402 606.1396 c
-F
-0.023529 0.239216 0.32549 0 k
-235.46 605.6602 m
-234.1255 603.7158 240.5313 563.9043 241.9399 557.8994 c
-243.2769 552.0049 240.5 524.54 y
-272.9121 534.4951 244.6494 532.3301 273.3799 528.1396 c
-302.3096 524.0938 328.8516 561.1563 330.7402 571.3398 c
-332.5117 581.293 322.0996 593.6602 y
-323.3594 596.8516 318.3242 611.4941 312.7402 621.0195 c
-307.3418 630.7129 290.8066 629.7002 272.6602 630.6201 c
-256.0903 631.6299 236.8711 607.376 235.46 605.6602 c
-F
-0.011765 0.109804 0.137255 0 k
-236.1802 604.9395 m
-234.9536 603.0391 241.2368 563.9912 242.6602 558.1396 c
-243.9297 552.3223 241.2197 525.5 y
-271.8921 535.208 245.2759 533.0234 273.6201 529.0996 c
-301.8247 524.9453 327.8555 561.2979 329.54 571.0996 c
-331.4453 581.0479 321.1406 593.1797 y
-322.4697 596.3066 317.5332 610.6689 312.2598 620.0596 c
-306.7617 629.5186 290.5449 628.5244 272.6602 629.4199 c
-256.4961 630.416 237.6465 606.6289 236.1802 604.9395 c
-F
-1 g
-273.6201 529.8193 m
-301.3398 525.7998 326.8613 561.4395 328.5801 571.0996 c
-330.3828 580.8008 320.1797 592.7002 y
-321.582 595.7598 316.7402 609.8408 311.54 619.0996 c
-306.1807 628.3203 290.2808 627.3457 272.6602 628.2197 c
-256.9014 629.2012 238.4214 605.8809 237.1401 604.2197 c
-235.7817 602.3594 241.9399 564.0801 243.3799 558.3799 c
-244.5801 552.6416 241.9399 526.2197 y
-269.9912 535.7002 245.8999 533.7197 273.6201 529.8193 c
-F
-0.8 g
-324.7402 567.2598 m
-294.0801 558.7998 281.2998 560.54 v
-263.9409 567.8213 254.1802 543.7393 v
-250.3018 535.9209 248.1802 533.6602 v
-245.8999 531.5215 324.7402 567.2598 y
-F
-0 g
-328.8203 569.6602 m
-296.9409 556.1602 285.8599 556.7002 v
-267.9009 561.6602 258.7402 545.6602 v
-249.4209 535.4814 246.02 533.6602 v
-245.4609 531.9609 252.5 536.2998 v
-264.02 530.54 l
-280.2197 520.0801 290.8999 537.7393 v
-295.1816 550.001 295.2197 552.1396 v
-295.1816 554.4004 318.5 560.5615 320.1797 561.0195 c
-322.0205 561.4395 329.2813 566.0596 328.8203 569.6602 c
-F
-0.45098 0 1 0 k
-276.7402 530.0596 m
-269.1416 530.0762 259.9302 534.3271 259.9399 541.0996 c
-259.9302 548.0742 269.1416 554.9648 276.7402 555.0195 c
-284.2617 554.9648 290.3911 549.3945 290.4199 542.54 c
-290.3911 535.6465 284.2617 530.0762 276.7402 530.0596 c
-F
-0.658824 0.2 1 0.039216 k
-272.6602 548.54 m
-267.3848 547.6328 261.7881 545.9814 261.8599 546.1396 c
-263.5591 551.2998 270.5576 554.9648 276.7402 555.0195 c
-281.4248 554.9648 285.5938 552.79 288.02 549.5 c
-282.2046 549.8408 272.6602 548.54 v
-F
-1 g
-285.8599 548.7793 m
-281.1006 552.2002 281.0601 549.7393 v
-285.0605 544.9395 285.8599 548.7793 v
-F
-0 g
-275.0601 539.6602 m
-272.1919 539.7412 269.9624 541.9707 270.02 544.7002 c
-269.9624 547.4697 272.1919 549.6992 275.0601 549.7393 c
-277.6904 549.6992 279.9199 547.4697 279.8599 544.7002 c
-279.9199 541.9707 277.6904 539.7412 275.0601 539.6602 c
-F
-0.164706 0.627451 1 0.031373 k
-160.5801 554.2998 m
-157.0205 577.7217 159.6201 582.6201 v
-171.541 593.5615 171.1401 597.5 v
-170.6602 617.3213 169.46 618.1396 v
-168.02 619.0801 159.6606 625.6807 153.1401 618.6201 c
-141.6201 598.8418 142.5801 591.7393 v
-142.5801 589.5801 l
-134.1416 590.04 132.5 587.8994 v
-131.0601 582.1201 129.8599 581.6602 v
-126.6606 579.041 128.8999 575.8994 v
-126.6606 573.3193 127.2197 568.9395 v
-135.3799 564.6201 l
-137.6602 548.6816 149.54 543.0195 v
-154.8608 540.3994 158.3408 547.8008 160.5801 554.2998 c
-F
-1 g
-159.3799 556.46 m
-156.272 577.4121 158.6602 581.6602 v
-169.3398 591.668 168.98 595.3398 v
-168.5479 613.0518 167.2998 613.8193 v
-166.1719 614.6357 158.6479 620.5752 152.6602 614.2998 c
-142.4121 596.4199 143.2998 590.0596 v
-143.2998 588.1396 l
-135.6802 588.5 134.1802 586.46 v
-132.9082 581.3721 131.7798 580.9395 v
-128.9478 578.5996 130.8198 575.8994 v
-128.9478 573.4521 129.3799 569.4199 v
-136.8198 565.5801 l
-138.8481 551.2754 149.54 546.1396 v
-154.3281 543.8232 157.46 550.4863 159.3799 556.46 c
-F
-0.043137 0.478431 0.701961 0 k
-168.7402 617.1797 m
-167.6455 618.0576 159.4063 624.4063 152.8999 617.6602 c
-141.8193 598.2363 142.5801 591.2598 v
-142.5801 589.3398 l
-134.5254 589.6563 132.7402 587.4199 v
-131.5229 581.9336 130.3398 581.4199 v
-127.2319 578.9307 129.3799 575.8994 v
-127.2319 573.3535 127.7002 569.1797 v
-135.8599 564.8594 l
-137.9575 549.3291 149.54 543.7393 v
-154.7266 541.2559 158.1201 548.4697 160.3398 555.0195 c
-156.8335 577.6445 159.3799 582.3799 v
-170.9912 593.0889 170.6602 597.0195 v
-170.1318 616.2529 168.7402 617.1797 v
-F
-0.027451 0.305882 0.423529 0 k
-168.2598 615.9795 m
-167.271 617.0332 159.1543 623.1289 152.8999 616.46 c
-142.0161 597.6318 142.8198 591.0195 v
-142.8198 588.8594 l
-134.9097 589.2705 133.2197 587.1797 v
-131.9839 581.7461 130.8198 581.4199 v
-127.8032 578.8203 129.8599 575.8994 v
-127.8032 573.3867 128.1802 569.1797 v
-136.1001 565.0996 l
-138.2554 549.9795 149.54 544.46 v
-154.5942 542.1104 157.9014 549.1426 160.1001 555.5 c
-156.6465 577.5674 159.1401 582.1396 v
-170.4414 592.6133 169.9399 596.2998 v
-169.604 615.1875 168.2598 615.9795 v
-F
-0.015686 0.141176 0.184314 0 k
-167.7798 615.0195 m
-166.8994 616.0107 158.8999 621.8525 152.8999 615.2598 c
-142.2153 597.0244 143.0601 590.54 v
-143.0601 588.3799 l
-135.2959 588.8857 133.7002 586.9395 v
-132.4473 581.5586 131.2998 581.1797 v
-128.377 578.71 130.3398 575.8994 v
-128.377 573.4209 128.8999 569.4199 v
-136.5801 565.3398 l
-138.5503 550.6279 149.54 545.4199 v
-154.46 542.9668 157.6807 549.8145 159.6201 555.9795 c
-156.459 577.4912 158.8999 581.8994 v
-169.8896 592.1426 169.46 595.8193 v
-169.0762 614.1201 167.7798 615.0195 v
-F
-1 g
-159.3799 556.46 m
-156.272 577.4121 158.6602 581.6602 v
-169.3398 591.668 168.98 595.3398 v
-168.5479 613.0518 167.2998 613.8193 v
-166.5249 614.9883 158.6479 620.5752 152.6602 614.2998 c
-142.4121 596.4199 143.2998 590.0596 v
-143.2998 588.1396 l
-135.6802 588.5 134.1802 586.46 v
-132.9082 581.3721 131.7798 580.9395 v
-128.9478 578.5996 130.8198 575.8994 v
-128.9478 573.4521 129.3799 569.4199 v
-136.8198 565.5801 l
-138.8481 551.2754 149.54 546.1396 v
-154.3281 543.8232 157.46 550.5938 159.3799 556.46 c
-F
-0.8 g
-156.02 563.4199 m
-132.2695 574.6396 131.2998 575.4199 v
-141.291 566.501 142.1001 566.54 v
-143.0503 566.501 156.02 563.4199 y
-F
-0 g
-137.2998 570.1396 m
-157.46 566.2803 157.46 561.5 v
-157.46 558.2383 157.1934 543.4756 151.2197 545.1797 c
-142.0615 547.8008 146.0215 563.6406 137.2998 570.1396 c
-F
-0.45098 0 1 0 k
-146.4199 566.0596 m
-156.3369 564.4395 157.46 561.5 v
-158.1201 559.6807 158.8496 550.541 152.8999 549.2598 c
-147.8335 548.3379 145.3809 559.582 146.4199 566.0596 c
-F
-0 g
-240.98 519.2598 m
-240.5098 521.1729 241.9497 521.0283 243.8599 521.6602 c
-246.1206 522.2813 259.5415 526.46 260.4199 529.3398 c
-261.3008 532.1816 275.7798 527.4199 y
-277.8008 526.46 282.7402 523.5801 y
-287.9214 522.2813 295.2197 521.8994 y
-297.8218 520.7402 301.46 517.5801 y
-317.6211 506.4414 331.2197 514.46 y
-353.2617 521.6211 346.5801 540.6201 y
-343.3613 550.4404 346.8203 554.2998 y
-347.1006 558.3604 354.9805 551.4199 y
-357.8818 546.7012 358.8203 541.0996 y
-367.5605 528.8818 363.8594 548.54 y
-364.043 549.5596 360.9609 553.5195 360.9805 554.7793 c
-360.9609 556.1602 359.0605 559.8193 y
-355.6807 563.6406 358.3398 571.3398 y
-360.3008 586.5195 357.8594 584.54 y
-356.5615 586.5195 346.3398 575.4199 y
-344.0215 571.7813 337.46 570.1396 y
-334.3418 568.04 330.5 569.6602 y
-327.7422 570.0195 321.6201 562.2197 y
-324.6602 562.541 327.3008 557.7002 330.0195 557.4199 c
-332.5801 557.2617 334.5605 560.1201 336.2598 560.7793 c
-338.082 561.4395 341.0605 555.0195 y
-341.6025 552.2002 335.54 546.8594 y
-335.002 541.8604 333.1406 543.7393 y
-329.9414 544.2793 328.6211 540.1016 327.6201 535.0996 c
-326.4219 529.9805 321.8594 529.5801 y
-320.041 521.4004 318.7402 524.7793 y
-318.5 530.8613 312.0195 524.54 y
-310.5801 522.2813 305.54 524.7793 y
-298.04 526.9014 300.7402 529.0996 y
-302.6602 531.5215 314.9004 529.0996 y
-317.4004 530.8613 308.6602 535.3398 y
-307.9395 537.2402 309.1406 542.0596 y
-310.3613 545.5996 317.7793 551.6602 y
-328.1816 553.0801 325.2197 554.7793 y
-318.2813 560.5615 312.0195 552.1396 y
-309.4805 545.3818 290.4199 528.8594 y
-285.0605 525.1396 287.9214 532.6201 283.46 528.8594 c
-279.1206 525.1396 256.5801 535.0996 y
-243.7422 536.3525 240.7373 519.0361 236.8999 522.3799 c
-242.8135 513.0967 240.98 519.2598 v
-F
-455.2998 702.1396 m
-427.1816 693.4395 424.0996 672.8594 v
-421.4629 647.6816 444.0195 628.2197 v
-444.3418 621.2813 446.6602 617.6602 v
-444.7813 612.4805 465.3799 620.7793 v
-495.3799 630.1396 l
-502.4219 632.7197 508.0996 642.3799 v
-513.8623 652.0801 530.5801 672.7617 526.5801 700.46 c
-527.9414 712.8008 521.2998 713.1797 v
-512.1006 715.001 504.2598 706.7002 v
-496.7021 703.1211 494.1797 703.5801 v
-455.2998 702.1396 l
-F
-515.54 703.3398 m
-517.7334 713.1533 512.4199 707.8994 v
-504.668 701.5371 496.3398 701.4199 v
-480.4668 699.1162 475.6992 684.6201 v
-471.2695 655.0732 480.0195 648.8594 v
-485.3047 640.5537 492.9805 647.8994 v
-500.7949 655.0732 517.8438 688.3252 515.54 703.3398 c
-F
-0.2 g
-515.0605 702.8594 m
-517.3105 712.5537 512.1797 707.4199 v
-504.4805 701.1514 496.3398 701.1797 v
-480.7207 698.7725 475.9395 684.6201 v
-471.6914 655.5293 480.2598 649.3398 v
-485.4727 641.2734 492.9805 648.3799 v
-500.6797 655.5293 517.3877 688.2051 515.0605 702.8594 c
-F
-0.4 g
-514.5801 702.6201 m
-516.8906 711.9561 511.6992 706.9395 v
-504.2959 700.7617 496.3398 700.7002 v
-480.9746 698.4297 476.4199 684.3799 v
-472.1143 655.9873 480.5 649.8193 v
-485.6387 641.9961 493.2197 649.0996 v
-500.5664 655.9873 516.9346 688.083 514.5801 702.6201 c
-F
-0.6 g
-514.0996 702.1396 m
-516.4668 711.3584 511.46 706.2197 v
-504.1113 700.376 496.3398 700.46 v
-481.2324 698.0859 476.6602 684.3799 v
-472.5371 656.4463 480.7402 650.54 v
-485.8066 642.7178 493.2197 649.5801 v
-500.4512 656.4463 516.4785 687.9629 514.0996 702.1396 c
-F
-0.8 g
-513.8594 701.6602 m
-516.0469 710.7578 511.2197 705.7393 v
-503.9258 699.9893 496.3398 699.9795 v
-481.4863 697.7432 476.9004 684.3799 v
-472.959 656.9043 480.9805 651.0195 v
-485.9746 643.4385 493.2197 650.0596 v
-500.3359 656.9043 516.0225 687.8428 513.8594 701.6602 c
-F
-1 g
-513.3799 701.4199 m
-515.6211 710.1602 510.7402 705.2598 v
-503.7422 699.6006 496.3398 699.5 v
-481.7402 697.3994 477.3799 684.1396 v
-473.3809 657.3604 481.2197 651.7393 v
-486.1426 644.1602 493.2197 650.7793 v
-500.2207 657.3604 515.5664 687.7207 513.3799 701.4199 c
-F
-0.254902 0.941176 1 0.243137 k
-280.5801 477.7402 m
-258.2217 498.9609 249.3799 499.8193 v
-211.5801 504.2402 195.3799 484.46 v
-214.6616 506.8809 245.0601 500.7803 v
-221.2617 505.5605 207.6201 501.9795 v
-189.1401 502.04 178.5801 486.6201 v
-175.46 481.3398 l
-179.8999 497.6406 200.1802 504.1396 v
-225.2217 509.5205 237.1401 504.1396 v
-213.3418 511.7217 202.3398 509.4199 v
-168.9009 512.1602 154.8198 483.0195 v
-159.2217 498.9609 175.46 506.7803 v
-190.46 516.5596 212.8999 513.5 v
-228.7402 509.96 234.5 507.2598 v
-240.1807 504.6797 238.8608 507.7617 229.7002 513.0195 c
-223.46 524.041 208.1001 523.5801 v
-160.981 519.6416 149.54 506.54 v
-164.5015 518.7607 175.9399 521.8994 v
-200.5806 530.6406 209.7798 529.8193 v
-237.1016 528.6602 245.54 533.1797 v
-233.1416 527.5615 236.6602 524.0596 v
-240.1807 520.5195 247.6616 512.1602 247.7002 510.8594 c
-247.6616 509.5205 274.2798 485.2109 278.1802 480.3799 c
-280.5801 477.7402 l
-F
-0.8 g
-432.9805 264.3799 m
-415.8516 304.5918 402.0195 315.0195 v
-430.7002 297.4395 434.6602 277.5801 v
-434.5498 266.6406 432.9805 264.3799 v
-F
-484.5801 256.2197 m
-455.4512 316.6904 435.1406 343.0996 v
-482.9502 301.8418 488.4199 272.7803 v
-488.9004 266.54 l
-485.7793 269.4199 l
-485.1514 259.4912 484.5801 256.2197 v
-F
-546.7402 309.5 m
-478.002 374.9912 476.4199 377.6602 v
-542.9004 305.1416 546.2598 296.7803 v
-544.002 306.79 546.7402 309.5 v
-F
-339.3799 261.7393 m
-360.8506 318.8906 381.8594 294.1396 v
-398.25 283.1406 397.7002 279.7393 v
-393.3008 286.9902 373.46 286.46 v
-352.6016 289.7402 339.3799 261.7393 v
-F
-548.9004 401.8994 m
-499.4502 433.292 491.2998 435.0195 v
-478.2129 437.5371 545.6504 403.04 551.0605 391.5801 c
-553.3496 394.2412 548.9004 401.8994 v
-F
-0 g
-383.2998 284.7803 m
-405.623 286.8799 413.0605 294.3799 v
-417.8594 290.2998 l
-437.2998 332.54 l
-441.3799 327.0195 l
-457.1025 343.2002 456.2598 351.9795 v
-455.3408 360.7998 470.4199 345.5 y
-469.4219 358.1602 477.3799 350.7803 v
-474.7012 367.8389 483.8594 358.9395 v
-472.3496 392.2139 497.0605 363.9795 v
-503.3027 356.8398 498.5 364.2197 y
-469.8613 417.1201 493.7002 401.1797 v
-495.8213 426.3584 494.4199 431.1797 v
-493.1816 436.04 490.9805 460.6807 485.7793 466.46 c
-480.4209 472.1211 486.1426 473.8809 492.2598 468.1396 c
-479.9814 494.5615 494.4199 481.3398 v
-490.541 498.0801 485.7793 501.2598 v
-479.543 520.0811 496.3398 508.2197 v
-491.4219 521.8398 487.9395 525.2598 v
-475.1406 555.7207 483.1406 550.46 v
-487.9395 546.3799 l
-480.4209 561.8818 487.46 556.9395 v
-494.502 552.2002 494.4199 552.6201 y
-471.1807 589.1602 493.7002 569.8994 v
-484.6465 585.1113 480.9805 592.7002 v
-460.1816 615.1201 475.9395 608.0596 v
-481.2197 606.3799 l
-471.623 617.3213 462.7402 619.0996 v
-454.0205 620.8398 465.4609 627.8818 472.5801 625.5801 c
-479.543 623.4795 496.8203 615.0195 y
-510.7813 594.4395 515.2998 593.8994 v
-493.1816 602.3594 499.7002 593.6602 v
-515.6211 578.1602 507.6201 578.54 v
-501.1016 570.6797 506.4199 561.0195 v
-486.0752 581.2305 502.3398 553.0996 v
-510.0195 535.0996 l
-483.0605 562.3203 495.3799 538.2197 v
-514.3018 512.1602 516.5 511.8193 v
-518.7012 511.2803 523.46 501.5 y
-518.6602 503.8994 l
-524.4199 494.0596 l
-512.1006 507.3193 518.6602 492.8594 v
-524.9004 477.0195 l
-502.4219 501.1611 517.46 468.6201 v
-499.3418 474.3193 509.0605 455.4199 v
-507.2617 437.7988 507.6201 432.1396 v
-508.1406 426.3584 509.4609 395.1201 504.7402 386.2998 c
-499.7813 377.5205 511.2227 356.4004 513.3799 351.9795 c
-515.6211 347.5996 519.582 335.7197 510.0195 345.7393 c
-500.2207 355.959 505.0615 349.8008 507.3799 340.2197 c
-509.4609 330.4395 516.0605 313.2803 515.2998 307.0996 c
-513.8623 305.7988 510.2598 309.7393 v
-494.0625 334.8389 495.8594 319.0996 v
-494.502 310.2002 491.0605 300.6201 v
-487.4629 288.6387 487.46 298.2197 v
-483.9414 316.8008 480.9805 308.54 v
-477.7813 300.0801 473.8203 293.4795 470.6602 290.7803 c
-467.6621 288.2002 461.9414 313.2803 460.5801 301.8193 c
-447.4209 315.4805 442.0996 297.5 v
-429.3799 279.5 l
-428.9414 293.04 427.7002 286.46 v
-394.6211 279.8408 383.2998 284.7803 v
-F
-345.3799 677.1797 m
-332.5801 685.9609 328.0996 685.5801 v
-323.7822 685.0801 358.541 695.2012 403.9395 664.9395 c
-409.1406 661.7598 413.0605 662.2998 v
-416.6211 659.5615 413.54 655.5801 v
-403.8613 645.041 416.1797 632.7793 v
-436.4219 625.2412 430.3398 634.9395 v
-442.1406 630.5215 444.7402 626.0596 v
-447.4209 621.7207 446.1797 626.0596 y
-439.0615 634.04 432.5 639.7393 v
-426.7422 641.96 423.6201 651.2598 v
-420.582 660.4395 417.9414 671.4414 422.9004 675.0195 c
-418.3809 670.1211 419.2998 674.54 v
-420.1426 678.9199 424.1025 682.8799 425.7793 683.4199 c
-427.6211 683.7607 445.6621 701.1416 453.1406 701.6602 c
-443.0215 700.04 439.7002 701.1797 v
-436.4219 702.2402 407.1602 714.7803 400.5801 716.0596 c
-382.0801 723.3604 395.2998 721.0996 v
-434.6621 716.9814 454.5801 702.3799 v
-446.7607 711.7012 426.5 719.4199 v
-402.1016 733.2607 363.3799 727.8193 v
-343.8008 724.2412 335.2998 722.2998 v
-332.3623 722.9209 331.7002 723.2598 v
-331.043 723.7998 318.0605 733.7002 287.7798 725.8994 c
-269 720.9414 259.46 715.5801 v
-242.8208 714.3408 238.8198 710.7793 v
-218.4009 694.7598 216.2598 693.9795 v
-214.0015 693.001 201.4614 684.6416 200.6602 684.1396 c
-227.6406 691.46 230.1802 694.2197 v
-232.9209 696.7393 252.0605 699.6006 254.6602 698.0596 c
-257.3408 696.5215 266.5806 697.1816 256.1001 696.6201 c
-339.1807 680.2393 340.0996 678.1396 v
-340.9424 675.8408 345.3799 677.1797 y
-F
-0.164706 0.627451 1 0.031373 k
-423.8594 687.2598 m
-412.6621 695.4199 410.4199 695.4199 v
-408.2617 695.4199 394.6211 706.6396 390.0195 706.2197 c
-385.3809 705.7617 371.9629 716.7607 341.7793 707.6602 c
-341.1602 709.9395 345.1406 710.7793 v
-352.1621 713.2393 352.5801 713.8994 v
-374.8203 718.5195 382.8203 714.6201 v
-392.8613 711.7012 399.6201 704.7793 v
-412.002 701.3594 415.46 702.3799 v
-425.2012 700.04 425.54 698.0596 v
-432.0225 694.7598 430.0996 691.8193 v
-430.4814 690.1396 423.8594 687.2598 v
-F
-410.1797 689.6602 m
-411.0508 688.9063 412.1719 688.7979 412.8203 687.9795 c
-413.0938 687.5625 412.7773 687.2041 412.3398 687.0195 c
-411.2842 686.749 410.123 687.375 408.9805 686.7793 c
-408.4238 686.501 407.7178 686.7002 407.0605 686.7793 c
-405.3125 687.3506 403.3018 687.377 401.54 686.54 c
-399.2578 687.8623 396.6631 687.2217 394.3398 688.2197 c
-394.3086 688.3516 394.0645 687.9697 394.0996 687.9795 c
-390.6318 689.2588 386.5156 688.9492 383.7793 691.5801 c
-381.1709 691.9131 378.5762 692.4219 375.8594 693.2598 c
-373.9063 693.7305 372.3584 694.8174 370.5801 695.6602 c
-369.0605 696.5117 367.457 697.085 365.7793 697.5801 c
-363.7207 697.9922 361.707 697.8701 359.54 698.54 c
-359.5234 698.4678 359.3125 698.0908 359.2998 698.0596 c
-358.8652 698.2393 358.5469 698.8809 358.3398 698.7793 c
-356.5088 698.2471 354.8721 699.3174 353.0605 699.0195 c
-351.7441 700.2871 349.8438 700.0186 348.2598 700.46 c
-344.8828 701.4365 341.415 700.04 338.1797 701.1797 c
-342.6055 703.167 347.7607 701.8105 352.3398 704.0596 c
-354.791 705.3916 357.7188 704.1797 360.5 705.0195 c
-361.0801 705.1729 361.8418 705.3965 362.1797 704.7793 c
-362.4297 704.8086 362.6289 705.0723 362.6602 705.0195 c
-365.3887 703.7695 367.9355 702.3682 370.5801 701.1797 c
-371.0391 701.0332 371.627 701.29 372.0195 701.1797 c
-373.5752 699.7305 375.7109 699.8428 377.2998 698.54 c
-379.1094 699.0537 381.082 698.6338 383.0605 699.2598 c
-383.0693 699.3506 383.3262 698.9766 383.2998 699.0195 c
-384.6055 699.8232 385.875 699.5264 386.9004 699.2598 c
-387.2285 699.0625 387.959 698.792 388.3398 698.7793 c
-389.5303 698.4072 390.4736 697.8799 391.7002 697.5801 c
-391.8965 697.6592 392.0986 698.0332 392.1797 698.0596 c
-393.4141 697.5195 394.5586 697.5801 395.2998 696.3799 c
-395.4297 696.4492 395.6113 696.7109 395.7793 696.6201 c
-396.8311 696.3105 397.5469 695.4795 398.6602 695.1797 c
-399.291 695.0977 399.9629 694.4092 400.5801 694.2197 c
-403.2266 693.4111 405.2559 691.7285 407.7793 690.8594 c
-408.5049 690.4033 409.4668 690.1465 410.1797 689.6602 c
-F
-325.9395 705.2598 m
-323.0957 707.1514 320.4922 708.3682 317.7793 710.2998 c
-317.6055 710.4795 317.2109 710.29 317.0605 710.54 c
-315.8789 711.0967 314.9043 711.7354 313.9395 712.46 c
-313.2295 712.9209 312.3271 712.9082 311.7793 713.1797 c
-308.9697 714.6123 306.0776 715.2266 303.3799 716.54 c
-304.0713 717.2432 305.3047 716.9736 306.02 717.9795 c
-306.1733 717.5527 306.4351 717.2402 306.7402 717.5 c
-308.6699 718.4453 310.7051 718.6133 312.5 718.46 c
-314.4248 718.4121 316.3164 718.0781 318.2598 717.7393 c
-318.6055 717.7275 318.8242 717.1514 319.2197 717.0195 c
-321.6318 716.3145 324.2598 716.8926 326.6602 716.0596 c
-328.3398 715.2793 330.0684 714.375 331.46 712.9395 c
-331.707 712.6855 331.3496 712.3545 330.9805 712.2197 c
-331.4697 712.2607 331.7695 712.0352 331.9395 711.7393 c
-331.9834 711.4277 331.9834 711.0938 331.9395 710.7793 c
-331.7676 710.4893 331.46 710.377 330.9805 710.2998 c
-329.502 710.1123 331.4502 711.6289 330.7402 711.0195 c
-329.2813 710.2422 330.1016 708.6963 329.2998 707.4199 c
-328.9736 707.5137 328.7217 707.7529 328.8203 708.1396 c
-329.0977 707.6064 328.4355 707.2881 328.3398 706.9395 c
-327.8281 706.1426 326.8398 704.585 325.9395 705.2598 c
-F
-290.1802 697.0996 m
-286.6494 698.043 283.2944 697.918 279.8599 699.2598 c
-279.9033 699.3535 279.6582 698.9697 279.6201 699.0195 c
-278.084 699.6533 277.0737 700.7168 275.7798 701.8994 c
-274.8872 702.8428 273.063 702.418 271.7002 702.8594 c
-271.3042 703.0898 271.0806 703.6514 270.7402 703.5801 c
-269.4102 703.8682 268.3906 704.9121 267.1401 705.5 c
-269.811 706.4141 272.4629 706.3809 275.0601 706.7002 c
-275.2949 706.8242 275.4536 706.4697 275.54 706.46 c
-275.751 706.4697 275.8926 706.7119 276.02 706.9395 c
-276.2554 706.5537 276.5864 706.1934 276.98 706.46 c
-277.4722 707.0674 278.084 706.8584 278.6602 706.7002 c
-278.835 706.8027 278.9746 706.4697 279.1401 706.46 c
-279.2695 706.4697 279.4136 706.8125 279.6201 706.7002 c
-279.7109 706.8105 279.855 706.4697 280.1001 706.46 c
-280.1504 706.4697 280.292 706.7119 280.3398 706.9395 c
-281.2017 706.001 282.1733 706.6113 282.98 706.46 c
-284.2207 706.165 284.5137 704.8994 285.6201 704.54 c
-290.8833 703.1377 295.4336 700.7793 300.2598 698.54 c
-300.5693 698.3213 300.7998 698.0479 300.7402 697.5801 c
-300.9751 697.6201 301.3184 697.7168 301.46 697.5801 c
-302.6914 696.7666 303.8359 696.1641 304.5801 694.9395 c
-304.8418 694.585 304.479 694.1357 304.3398 694.2197 c
-299.3506 695.2881 294.9438 695.9551 290.1802 697.0996 c
-F
-274.8198 648.6201 m
-273.1206 649.8799 272.4775 652.1113 271.2197 654.1396 c
-271.0015 654.4561 271.3042 654.8047 271.7002 654.8594 c
-272.2686 655.0752 272.8662 654.5498 273.3799 654.3799 c
-275.2354 653.3789 276.9248 652.0137 279.1401 651.9795 c
-281.3096 649.4043 285.9941 648.9795 286.1001 645.2598 c
-286.0039 644.3164 284.4321 645.3242 283.9399 644.2998 c
-281.2642 645.4834 278.6357 645.3701 276.02 646.9395 c
-275.3384 647.4033 275.7031 647.9023 274.8198 648.6201 c
-F
-244.5801 706.46 m
-244.729 706.3711 252.4614 706.1143 252.5 705.9795 c
-252.3945 705.6514 243.8911 704.4971 243.3799 704.7793 c
-243.3105 704.7676 235.0474 702.0938 234.98 702.1396 c
-235.1934 702.3896 244.2871 706.373 244.5801 706.46 c
-F
-0 g
-261.6201 695.6602 m
-245.2402 693.6602 240.5 692.2998 v
-235.5605 691.0205 215.1006 682.6611 211.7002 680.54 c
-197.0601 674.5205 178.3398 652.46 v
-186.7207 656.2617 189.1401 659.4199 v
-204.1016 673.2002 203.7798 670.46 v
-217.3018 679.8008 216.7402 677.4199 v
-243.481 689.7002 241.2197 686.2998 v
-265.04 691.2412 264.02 688.9395 v
-284.6216 684.2002 281.54 683.8994 v
-275.1606 682.6611 282.2598 678.6201 v
-278.4609 673.8604 272.4199 678.3799 v
-266.5806 682.6611 269.8809 680.2393 264.5 679.0996 c
-261.5215 678.2598 256.5801 682.7002 v
-250.3018 687.7207 240.7402 683.6602 v
-206.96 669.9004 204.7402 669.2598 v
-200.8018 666.1611 198.2598 662.2998 v
-191.7798 657.3604 188.4199 655.8193 v
-174.4014 643.0615 173.0601 641.4199 v
-169.3398 635.8018 168.5 635.4199 v
-175.501 639.54 177.6201 641.6602 v
-193.1001 652.7402 198.98 653.6602 v
-203.8809 656.9209 204.7402 658.46 v
-220.6016 668.5801 225.1401 668.54 v
-235.3398 662.8613 238.1001 670.46 v
-244.3613 672.54 250.5801 671.1797 v
-254.041 674.0811 253.2197 676.46 v
-254.9214 678.4805 256.1001 674.2998 v
-259.7598 670.3398 264.98 672.6201 v
-269.4414 672.7617 267.1401 670.2197 v
-262.3999 665.9404 249.3799 665.6602 v
-235.7817 665.0596 217.7002 656.7793 v
-184.9614 645.2598 174.7402 633.7393 v
-167.8018 624.1396 161.7798 622.9395 v
-155.48 621.9414 148.8198 613.8193 v
-159.6606 620.1797 169.46 620.2998 v
-173.96 622.8193 169.7002 618.8594 v
-165.8218 610.501 167.54 604.46 v
-166.9209 598.8418 166.1001 597.0195 v
-157.46 583.001 157.46 580.46 v
-157.46 577.7217 158.7798 566.9404 159.1401 566.2998 c
-159.6606 565.6201 158.1201 568.04 162.2598 565.3398 c
-166.4814 562.7598 169.5605 561.001 170.4199 557.8994 c
-171.3198 554.8398 168.2407 563.8613 168.02 565.8193 c
-167.8018 567.8213 163.1816 575.7412 164.1802 578.2998 c
-165.1616 577.2793 166.1001 575.6602 v
-165.3799 576.4014 166.1001 580.46 v
-166.9209 586.0801 168.5 589.5801 v
-170 593.1201 172.2007 597.3008 172.5801 598.2197 c
-173.0815 599.0596 173.0815 605.4414 174.7402 602.54 c
-178.3398 599.6602 l
-175.2798 602.5801 177.6201 604.9395 v
-176.6001 611.1602 178.5801 614.0596 v
-186.2817 623.2617 187.9399 624.3799 v
-189.7998 625.46 188.1802 625.0996 y
-194.8613 629.6406 188.4199 627.9795 v
-184.0806 626.1201 180.7402 626.0596 v
-172.4214 623.9209 176.8999 628.46 v
-181.2197 633.1611 192.2217 639.1016 196.3398 638.7793 c
-197.2998 637.0996 l
-209.54 639.7393 l
-208.3398 638.7793 l
-208.0615 639.1016 212.6602 639.5 v
-217.3018 639.9795 223.6807 638.4414 225.1401 640.46 c
-226.7598 642.4014 230.5015 643.501 230.1802 641.8994 c
-229.6206 640.4209 229.46 638.2998 y
-234.9009 644.5996 234.2598 642.1396 v
-233.5806 639.7617 224.5615 634.04 222.98 627.2598 c
-234.5 636.1396 l
-238.3398 639.5 l
-242.3818 637.1211 242.6602 638.7793 v
-242.8208 640.6396 247.8799 647.0215 249.1401 646.7002 c
-250.52 646.5801 252.7207 649.6611 252.5 646.7002 c
-252.2817 643.9395 260.6602 638.0596 y
-264.1616 639.9795 265.7002 638.54 v
-267.2407 636.9004 271.9399 660.1396 y
-299.2998 671.8994 l
-347.2998 675.7393 l
-328.5801 683.1797 l
-261.6201 695.6602 l
-F
-*u
-1 D
-0 R
-0.435294 0.886275 0.8 0.670588 K
-1 J 2.2 w 10 M
-281.54 476.7803 m
-265.04 495.2217 255.8599 498.1396 v
-241.0615 505.5605 214.1001 496.9395 v
-S
-252.2598 499.5801 m
-224.5615 508.4209 207.6201 503.8994 v
-187.3809 501.6006 178.1001 486.3799 v
-S
-248.4199 501.0195 m
-229.6206 508.8604 213.3799 511.3398 v
-195.0801 514.1406 176.8999 506.2998 v
-163.3999 499.6201 157.46 488.2998 v
-S
-249.3799 500.54 m
-232.4814 512.5996 231.3799 514.2197 v
-223.6807 526.2412 209.2998 526.7002 v
-185.8398 525.7998 166.8198 517.0996 v
-S
-*U
-0 D
-0 O
-0 g
-0 J 1 w 4 M
-247.9399 510.3799 m
-249.6802 508.7842 279.3799 477.0195 y
-318.0605 436.7002 287.2998 474.3799 y
-278.8999 479.5996 268.8198 500.2998 y
-267.4614 503.3594 284.1802 492.3799 y
-288.5815 491.4795 303.6201 470.2998 y
-296.0601 473 301.46 465.0195 y
-304.4214 462.8818 326.9004 445.8193 y
-330.8223 441.3193 335.2998 439.5801 y
-350.6211 445.2793 343.7002 430.7002 y
-346.2227 423.2793 352.3398 435.9795 y
-364.7021 454.5195 346.5801 451.8193 y
-313.6621 448.8008 306.2598 466.46 y
-303.541 469.04 313.2197 466.46 y
-322.4629 464.2012 305.2998 480.1396 y
-307.9395 480.041 318.0195 472.46 y
-329.502 462.4395 331.7002 464.54 y
-351.502 474.3193 362.9004 465.9795 y
-365.1416 464.2012 358.9805 456.7207 360.7402 451.0996 c
-362.502 445.2793 367.7002 431.6602 y
-365.1416 429.8789 365.54 417.9795 y
-384.0605 392.4795 373.46 394.7002 y
-356.3408 395.1201 372.7402 386.7793 y
-376.1406 384.5596 385.9395 376.7002 y
-382.7402 377.96 380.9004 372.1396 y
-386.2617 367.8389 383.2998 362.54 y
-376.582 361.2393 375.3799 356.7793 y
-382.7402 348.0391 371.7793 347.6602 y
-375.7012 342.7588 370.3398 329.6602 y
-365.1416 329.5586 358.0996 323.4199 y
-360.7422 318.1201 349.2197 311.8994 y
-340.0615 310.2002 343.2197 302.7793 y
-334.3418 296.1201 331.7002 278.54 y
-330.8223 267.0801 328.1816 263.5586 333.8594 265.8193 c
-339.623 267.958 338.6602 281.6602 y
-333.4609 298.7598 380.6602 316.46 y
-384.9414 318.1201 385.9395 323.8994 y
-388.0215 323.4004 397.7002 315.0195 y
-406.0615 302.7197 406.5801 312.8594 y
-407.8203 316.8008 406.0996 323.4199 y
-412.6621 347.1582 397.2197 354.1396 y
-386.2617 391.1602 401.7793 381.9795 y
-404.7422 375.7588 416.6602 369.9795 y
-420.5 372.6201 l
-418.8223 377.96 428.1797 384.6201 y
-431.1416 377.5205 437.7793 386.2998 y
-441.7012 413.1582 455.2998 397.3398 y
-459.7422 396.001 461.0605 403.5801 y
-465.0225 414.9199 461.0605 429.9795 y
-465.0225 430.3203 475.7002 423.7393 y
-478.6621 427.6807 468.541 446.1582 473.0605 443.4199 c
-477.3418 440.8809 482.1797 439.0996 y
-483.0605 441.3193 472.0996 454.9395 y
-467.2207 458.04 461.54 480.3799 y
-469.4219 476.5205 458.4199 493.3398 y
-458.4219 496.7598 465.1406 509.1797 y
-464.1416 516.5596 465.1406 516.1396 y
-468.1016 514.8008 476.9023 513.041 469.46 519.9795 c
-461.9414 527.1201 470.4199 532.46 y
-475.1406 535.4814 460.0996 535.0996 y
-454.4629 539.8809 454.8203 544.2197 y
-463.7021 542.0811 447.8623 557.9209 445.2197 561.9795 c
-442.582 565.8418 453.1406 571.5801 y
-467.6621 575.5205 454.8203 579.0195 y
-433.3418 578.5996 445.2197 590.54 y
-451.8223 590.04 450.0195 592.7002 y
-444.3418 594.001 433.7002 601.0996 y
-429.3828 605 433.46 604.2197 y
-451.8223 602.8018 420.2598 615.0195 y
-428.9414 615.1201 409.2197 626.54 y
-406.9424 628.3203 403.46 636.6201 y
-396.8223 642.4014 391.46 649.8193 y
-391.1025 654.7207 385.9395 659.8994 y
-373.0615 674.96 366.9805 674.54 y
-350.6211 678.4805 344.9004 677.6602 y
-286.8198 672.8594 l
-257.7798 658.6807 266.4199 635.6602 y
-273.4014 626.3408 283.46 630.6201 y
-288.5815 637.3398 301.46 634.9395 y
-323.7822 631.3994 320.9004 635.4199 y
-318.2813 640.4209 300.4614 647.2393 300.2598 647.8994 c
-300.02 648.5596 290.4199 652.2197 y
-287.041 653.6211 282.2598 663.7393 y
-278.6816 667.4814 296.1802 661.0996 y
-294.7402 660.001 302.8999 655.5801 y
-322.0205 656.7002 333.6201 644.7793 y
-345.5625 626.5615 345.8594 635.6602 y
-348.8623 645.9199 335.7793 669.2598 y
-336.3223 671.4414 345.3799 664.2197 y
-346.8828 666.3799 347.7793 659.8994 y
-347.9814 657.3604 352.0996 648.6201 y
-355.2422 634.2607 359.2998 642.3799 y
-364.3398 632.0596 l
-365.8018 629.2012 359.2998 620.7793 y
-358.9805 617.7607 359.8613 617.9814 353.7793 609.7393 c
-347.543 601.2607 351.3799 596.54 y
-349.7402 589.1602 359.54 589.5801 y
-362.2813 587.1797 366.0195 587.1797 y
-368.002 584.9814 370.5801 585.7393 y
-372.4014 589.8193 379.2197 587.6602 y
-380.7607 590.2617 389.7793 590.7793 y
-390.8809 593.5615 391.3203 595.3203 395.0605 596.0596 c
-398.8018 596.6406 371.7793 644.0596 y
-378.7813 644.8203 369.8594 658.46 y
-367.3418 665.7197 379.8828 649.6611 382.3398 648.1396 c
-384.7207 646.5801 385.8223 644.1602 384.0195 644.2998 c
-382.3018 644.5996 380.3223 642.1807 381.8594 641.8994 c
-383.4004 641.7412 397.7021 625.2412 401.54 614.0596 c
-405.1807 602.8018 411.7813 598.3994 418.5801 591.7393 c
-425.4219 585.2002 424.5801 558.6201 y
-424.1025 548.8994 430.8203 537.2598 y
-432.9004 533.0596 428.1797 513.0195 y
-426.082 510.6201 427.7002 509.6602 y
-428.7227 508.4209 436.0996 493.8193 y
-434.2207 494.1201 438.2598 490.2197 y
-443.9023 483.5596 436.8203 486.8594 y
-430.2607 488.6211 438.0195 477.7393 y
-439.2822 475.8604 429.3799 480.8594 y
-419.2617 481.5801 432.0195 473.6602 y
-441.4805 465.7393 428.9004 470.54 y
-423.8809 472.5605 427.46 465.0195 y
-430.9209 463.3203 449.7793 455.6602 y
-450.2813 451.4404 446.9004 445.8193 y
-447.4209 441.54 444.9805 437.8994 y
-443.6816 428.7793 443.0605 427.8193 y
-438.4014 427.6807 430.3398 412.46 y
-428.2813 409.6396 417.1406 396.3799 y
-414.8623 388.7402 395.0605 396.6201 y
-387.8027 392.9189 390.0195 396.6201 y
-389.5615 399.0801 394.8203 405.7393 y
-402.541 408.54 399.6201 420.3799 y
-404.082 421.959 391.7617 425.04 391.9395 426.3799 c
-392.2012 427.6807 398.6602 429.2598 y
-407.3809 431.4199 402.5 434.0596 y
-401.8809 438.459 405.1406 444.6201 y
-417.9414 445.501 405.1406 463.3398 y
-393.3008 471.6797 392.1797 477.9795 y
-406.0615 487.0801 397.043 500.7197 397.2197 504.6201 c
-397.4814 508.6396 398.9004 532.46 y
-396.6006 539.2207 393.3799 554.2998 y
-395.7227 559.9014 403.9395 573.7393 y
-406.9424 578.3818 416.6211 583.6611 414.2598 586.9395 c
-411.7813 590.2617 403.2197 588.3799 y
-394.6211 589.8193 395.2998 584.0596 y
-393.5215 583.001 392.6602 577.5801 y
-391.8486 568.7744 382.0996 561.9795 y
-369.7617 555.0605 379.9395 550.7002 y
-386.4824 543.4014 375.6201 543.2598 y
-363.6006 545.1602 372.7402 533.8994 y
-384.502 519.8594 381.1406 516.8594 y
-369.9824 515.6816 383.7793 505.5801 y
-382.9609 507.7617 383.2998 505.8193 v
-383.4004 503.8018 386.7012 499.1816 387.6201 496.9395 c
-388.4629 494.7793 384.0195 494.54 y
-384.7207 484.001 367.7002 488.54 y
-367.7813 488.6211 366.0195 488.2998 v
-364.2607 488.1797 351.9414 489.0605 345.6201 491.4199 c
-339.1807 493.9014 331.7002 493.8193 y
-327.3008 491.9209 318.9805 492.1396 v
-310.5801 492.3604 301.7002 489.2598 y
-296.9409 489.7207 306.4014 494.5615 306.7402 494.2998 c
-306.8408 494.1201 313.002 500.2803 304.1001 499.5801 c
-280.2246 497.8232 268.3398 509.1797 y
-266.1416 510.6201 263.2998 513.7393 y
-252.2817 515.8994 264.7402 500.0596 y
-266.1416 498.5215 264.5 497.4199 y
-263.7197 499.1816 255.1401 505.0996 y
-252.0488 506.1914 250.5488 507.6582 247.9399 510.3799 c
-F
-0.435294 0.886275 0.8 0.670588 k
-221.7798 523.0996 m
-234.4614 517.001 237.3799 513.9795 v
-240.1807 510.8408 255.6201 498.3799 y
-249.6416 500.501 246.7402 502.46 v
-243.9199 504.4609 232.1001 513.5 y
-227.8613 520.0801 221.7798 523.0996 v
-F
-0.45098 0 1 0 k
-157.9399 557.4199 m
-158.2617 557.6406 157.6855 560.624 157.46 561.2598 c
-156.3369 564.2188 146.4199 565.8193 y
-146.2109 564.3389 146.1514 562.585 146.1802 560.7793 c
-151.6206 554.71 157.9399 557.4199 v
-F
-0.658824 0.2 1 0.039216 k
-157.9399 557.6602 m
-157.395 557.5225 157.875 560.7051 157.7002 561.2598 c
-156.5552 564.2188 146.4199 566.0596 y
-146.2109 564.4492 146.1514 562.6924 146.1802 560.7793 c
-150.9609 555.2598 157.9399 557.6602 v
-F
-0 g
-153.1401 557.6602 m
-152.3721 557.54 151.8154 558.7949 151.7002 560.2998 c
-151.8154 561.8857 152.3721 563.1416 153.1401 563.1797 c
-153.7471 563.1416 154.3066 561.8857 154.3398 560.2998 c
-154.3066 558.7949 153.7471 557.54 153.1401 557.6602 c
-F
-102.98 449.6602 m
-96.7402 438.6797 124.1001 445.3398 v
-139.4214 446.5996 142.1001 449.1797 v
-143.3818 448.3594 152.583 445.1338 155.7798 444.3799 c
-163.1816 442.6396 172.3398 453.7402 y
-177.481 465.1904 180.5 465.2598 v
-183.6416 465.1904 180.02 463.3398 y
-172.8608 452.3193 173.2998 450.6201 v
-167.5806 428.5586 150.02 427.5801 v
-132.2144 426.6338 133.7002 420.1396 v
-143.3818 422.8398 145.9399 420.1396 v
-157.9014 420.6387 149.0601 413.6602 v
-141.6201 400.9395 l
-141.7734 396.5313 130.5801 400.46 v
-119.8398 404.1387 108.5 418.2197 y
-90.9658 434.333 102.98 449.6602 v
-F
-0.066667 0.470588 0.290196 0 k
-101.54 445.3398 m
-99.3799 434.7197 139.9399 446.0596 v
-144.7017 446.1582 147.3799 445.3398 v
-149.9814 444.3994 163.1816 441.3193 165.3799 442.7002 c
-157.46 427.6807 144.7402 429.5 v
-130.1816 427.6807 130.5801 422.2998 v
-135.02 414.4805 140.4199 411.7402 v
-143.3818 409.2002 143.0601 405.7402 v
-142.501 402.1592 139.4214 400.3994 137.2998 399.5 c
-135.02 398.6406 131.5015 402.1592 129.8599 402.1396 c
-127.981 402.1592 118.7407 409.2002 114.02 414.3799 c
-109.0615 419.7578 99.8218 432.958 100.3398 435.9795 c
-100.7002 439.1191 101.54 445.3398 y
-F
-0.262745 0.682353 0.52549 0.062745 k
-105.1401 426.1396 m
-107.96 421.7402 111.481 417.1201 114.02 414.3799 c
-118.7407 409.2002 127.981 402.1592 129.8599 402.1396 c
-131.5015 402.1592 135.02 398.6406 137.2998 399.5 c
-139.4214 400.3994 142.501 402.1592 143.0601 405.7402 c
-143.3818 409.2002 140.4199 411.7402 y
-136.9277 413.5254 133.9136 417.3682 132.2598 419.8994 c
-132.3799 417.1201 126.7402 417.9795 v
-120.9414 418.8799 115.2197 421.959 113.54 425.4199 c
-111.7017 429.001 109.0615 431.6406 110.8999 427.5801 c
-112.5801 423.7207 115.2197 419.7578 116.8999 419.4199 c
-118.7407 418.8799 118.3018 417.5596 115.7002 417.9795 c
-113.0215 418.4404 109.9399 418.8799 105.1401 424.7002 c
-F
-0.254902 0.941176 1 0.243137 k
-102.2598 449.1797 m
-104.2207 464.2012 105.6201 468.6201 v
-104.6602 476.0811 107.2998 480.6201 v
-109.9399 485.3213 112.1406 492.1396 115.46 498.1396 c
-118.7407 504.0195 118.9614 508.4209 123.3799 510.1396 c
-127.7598 511.9395 134.3599 521.4004 137.54 522.6201 c
-140.5205 523.6016 140.4199 522.6201 y
-147.7808 539 162.7402 534.6201 v
-144.9199 537.6797 162.2598 548.0596 v
-157.0205 546.8115 160.5801 554.54 v
-163.0713 559.6445 162.5215 552.2002 150.5 539.1797 c
-144.9199 529.7598 139.2197 526.46 v
-133.4814 523.1602 120.2817 515.4609 119.0601 511.3398 c
-117.6416 507.1016 114.1206 500.7197 111.8599 498.8594 c
-109.7217 497.2012 106.6401 492.5811 106.1001 488.7803 c
-104.8809 484.4404 103.46 483.0195 v
-101.8018 481.8008 101.5806 478.2803 101.54 476.0596 c
-101.5806 473.8809 99.3799 470.8018 99.6201 468.1396 c
-100.4814 447.2598 100.1001 445.0996 v
-102.2598 449.1797 l
-F
-1 g
-92.8999 444.1396 m
-90.5815 445.7188 85.7002 439.0996 v
-93.771 402.8193 93.8599 401.1797 v
-94.981 403.5898 93.6201 411.5 v
-92.1201 419.4297 91.2197 433.3398 y
-92.8999 444.1396 l
-F
-0.254902 0.941176 1 0.243137 k
-116.6602 510.8594 m
-97.1816 507.3193 97.7002 475.0996 v
-96.7402 447.9795 l
-95.4199 476.0811 94.1001 477.7393 v
-92.7798 479.5996 97.1816 491.9209 93.6201 485.4199 c
-78.2598 469.9209 87.1401 446.54 v
-88.7095 442.9707 85.46 447.9795 v
-80.3506 461.8896 81.6201 468.8594 v
-81.7808 471.3506 83.7798 474.3799 v
-93.3296 487.3018 96.2598 489.7393 v
-98.2808 505.6709 115.2197 511.3398 v
-121.4912 513.9199 116.6602 510.8594 v
-F
-0 g
-269.7798 583.5801 m
-270.6055 584.0498 270.5957 585.1182 271.2197 585.2598 c
-272.499 585.6846 272.6792 586.8584 273.1401 587.6602 c
-274.208 589.1719 274.4214 590.8594 275.0601 592.46 c
-275.3599 593.2686 275.3911 594.3193 275.0601 595.0996 c
-273.7544 597.7734 272.9814 600.4688 271.46 603.0195 c
-271.1001 603.6318 270.812 604.5049 270.5 605.1797 c
-270.0825 606.6865 268.7002 607.7764 267.8599 609.2598 c
-267.4375 609.7129 268.0137 610.7305 267.1401 610.9395 c
-266.2402 610.9395 264.6465 611.5752 264.5 610.46 c
-263.7441 607.6016 264.855 604.8271 265.9399 602.0596 c
-265.0591 601.3779 265.4263 600.3682 265.7002 599.4199 c
-266.377 595.5557 265.0566 591.8691 264.2598 588.1396 c
-264.1953 587.9336 264.5718 587.7148 264.5 587.6602 c
-263.1968 584.6934 261.5981 582.0029 259.7002 579.5 c
-258.7642 578.293 257.8066 577.2842 257.2998 576.1396 c
-256.8535 575.249 256.4048 574.1885 256.5801 573.0195 c
-252.9033 570.0439 250.4263 565.8125 247.46 561.5 c
-247.0474 560.835 247.3662 559.5049 247.9399 559.0996 c
-248.8662 558.7705 249.9199 559.8965 250.3398 560.7793 c
-250.8633 561.5957 251.252 562.3105 251.7798 562.9395 c
-251.9385 563.2109 251.7417 563.6719 251.7798 563.8994 c
-254.7871 566.3857 256.623 569.6162 259.2197 572.2998 c
-261.4663 572.583 263.1558 573.6797 264.98 574.7002 c
-265.417 574.9902 265.9951 574.7168 266.4199 574.9395 c
-268.2417 576.2266 268.2393 578.4678 268.3398 580.46 c
-268.4097 581.54 268.6255 582.9893 269.7798 583.5801 c
-F
-260.1802 588.6201 m
-260.2905 588.6582 260.1201 589.124 260.1802 589.3398 c
-260.4199 589.7168 260.8613 589.9229 261.1401 590.2998 c
-261.1616 590.5186 260.9814 590.9355 261.1401 591.0195 c
-263.6982 593.7842 263.979 597.1113 262.8198 600.3799 c
-263.9673 601.0635 264.0342 602.4512 263.54 603.5 c
-262.6279 605.252 262.417 607.3711 261.3799 609.0195 c
-260.4609 610.4648 258.7256 611.833 257.2998 610.46 c
-256.7554 609.958 256.3999 609.0938 256.8198 608.2998 c
-256.7769 608.1318 257.0913 607.9707 257.0601 607.8193 c
-256.9424 607.5244 256.3423 607.2773 256.3398 606.8594 c
-256.3042 605.333 255.2529 603.6699 255.8599 602.2998 c
-256.7959 600.418 257.6958 598.373 258.5 596.54 c
-257.0815 594.0918 258.2192 591.3994 256.3398 589.3398 c
-256.1406 589.1738 256.1504 588.749 256.3398 588.6201 c
-256.6064 587.9932 257.0527 587.5469 257.54 587.1797 c
-257.811 587.0908 258.1929 587.0908 258.5 587.1797 c
-259.0498 587.624 259.4863 588.1592 260.1802 588.6201 c
-F
-329.2998 599.8994 m
-330.7754 597.9434 331.0957 594.8691 328.8203 593.4199 c
-329.4463 589.7002 333.1328 591.877 335.54 592.46 c
-335.3223 592.8867 335.5713 593.2666 335.7793 593.1797 c
-337.0449 593.2881 337.793 594.4229 338.9004 594.1396 c
-339.4395 595.9326 341.2402 596.7051 342.0195 598.2197 c
-343.8457 602.2881 343.1982 606.9893 340.3398 610.46 c
-340.1338 610.8389 340.3711 611.4072 340.3398 611.8994 c
-339.4043 614.2373 337.1289 614.583 335.0605 615.2598 c
-333.707 619.6035 332.9785 624.0361 330.9805 628.2197 c
-329.2666 628.376 328.498 630.2881 327.1406 631.0996 c
-325.5605 631.8701 324.9365 630.1348 324.9805 628.9395 c
-324.9902 628.7598 325.4863 628.5127 325.2197 628.2197 c
-325.2148 627.9297 324.9297 627.8096 324.9805 627.7393 c
-324.9316 627.5117 325.1738 627.3682 325.2197 627.2598 c
-324.3105 626.3193 322.7461 625.793 322.3398 624.6201 c
-321.373 620.4531 324.2021 617.0166 325.9395 613.5801 c
-326.6865 612.248 325.877 610.8486 324.9805 609.5 c
-324.5605 608.7559 324.6797 607.5146 324.9805 606.6201 c
-325.8105 604.0107 327.5605 602.0957 329.2998 599.8994 c
-F
-288.2598 579.7393 m
-286.7358 577.6543 282.9849 574.8291 286.1001 572.7793 c
-286.4048 572.5664 286.8125 572.5615 287.0601 572.7793 c
-289.2246 574.4307 291.4302 575.4248 294.02 576.1396 c
-294.2456 576.0967 294.5479 575.583 294.98 575.6602 c
-296.7271 576.5332 298.9375 576.4688 300.2598 578.0596 c
-304.3833 577.6953 308.3047 578.9209 312.0195 580.46 c
-313.3135 580.8535 314.7109 581.4678 316.0996 582.1396 c
-317.5449 582.6533 318.8691 583.6758 320.1797 585.0195 c
-320.2373 585.0801 320.6289 584.9814 320.9004 585.0195 c
-320.8789 585.9297 321.9365 586.0713 322.0996 586.7002 c
-322.3086 587.0098 322.1426 587.4463 322.3398 587.6602 c
-324.6416 589.3496 325.6543 591.5693 324.2598 594.1396 c
-324.0537 594.8213 323.7793 595.501 323.0605 596.0596 c
-321.9629 597.0244 320.751 596.0859 319.7002 596.54 c
-319.4258 595.7305 318.625 595.918 318.2598 595.8193 c
-317.2539 595.2197 315.7881 595.8633 314.9004 595.3398 c
-313.3447 594.6152 311.9785 594.4297 310.3398 593.8994 c
-310.0713 593.9258 309.2168 594.0293 309.1406 593.4199 c
-308.8926 593.4893 308.7295 593.7461 308.6602 593.6602 c
-306.5146 593.2852 305.1294 593.0498 303.6201 591.2598 c
-303.584 591.0439 303.0967 591.2402 302.8999 591.0195 c
-301.8701 590.2012 301.4263 588.8457 300.2598 588.1396 c
-299.9937 587.9697 299.605 588.1563 299.2998 587.8994 c
-298.6807 587.54 298.2773 586.834 297.6201 586.46 c
-297.2095 586.0898 296.7705 586.4473 296.8999 586.7002 c
-297.0752 588.8721 297.793 590.8369 297.1401 592.9395 c
-299.4463 595.6729 302.2134 597.8164 304.1001 600.8594 c
-304.2178 603.2041 304.9785 605.5635 304.8198 607.8193 c
-304.8418 608.0596 304.5249 608.8662 304.3398 609.2598 c
-304.0449 610.1885 305.041 611.3594 304.1001 612.1396 c
-302.5688 613.4814 301.1479 612.5166 300.2598 610.9395 c
-298.2178 610.5098 295.9448 609.749 294.2598 611.1797 c
-293.103 611.9717 292.4673 612.9697 291.6201 614.0596 c
-290.5039 615.5625 290.8735 617.1416 290.8999 618.8594 c
-290.9551 619.0039 290.6094 619.1523 290.6602 619.3398 c
-290.6118 619.4502 290.8521 619.5938 290.8999 619.8193 c
-290.2231 620.4297 289.9209 621.5938 288.7402 621.9795 c
-289.1357 623.1416 288.3921 624.1133 287.54 624.3799 c
-285.2383 625.208 283.395 623.1025 281.2998 622.9395 c
-280.748 623.002 280.2344 624.1445 279.6201 624.6201 c
-279.0464 624.7393 278.271 624.7754 277.9399 624.3799 c
-277.1167 623.9287 276.4688 623.8037 275.54 623.6602 c
-273.855 623.0977 272.4512 621.8936 270.7402 621.0195 c
-269.1895 620.0117 268.1382 618.4297 266.8999 616.9395 c
-265.9136 615.7109 265.7646 613.0566 267.3799 612.6201 c
-269.355 611.792 270.7881 614.7656 272.8999 614.2998 c
-273.2935 614.3506 273.5215 614.0068 273.3799 613.5801 c
-273.8286 613.46 274.0688 613.7119 274.3398 614.0596 c
-275.2231 612.9004 276.5049 612.5283 277.46 611.6602 c
-278.605 610.5752 280.5249 611.0332 281.54 609.9795 c
-283.3232 608.2852 282.7065 605.3359 284.8999 603.9795 c
-284.1968 602.4561 283.5298 601.0518 283.2197 599.4199 c
-282.8506 598.1553 283.9424 596.8398 285.3799 597.0195 c
-286.6592 597.041 286.9473 597.877 287.54 599.1797 c
-287.7754 598.7666 288.291 598.4404 288.2598 598.2197 c
-287.7417 595.5771 286.6133 593.3857 286.1001 590.7793 c
-286.0449 590.3623 285.709 590.1387 285.3799 590.2998 c
-284.7656 585.6963 280.3086 583.0635 277.46 579.5 c
-277.0664 579.0293 277.0615 577.6563 277.46 577.0996 c
-279.0537 575.6865 281.2109 577.3877 282.98 578.0596 c
-283.3135 579.2666 284.2593 580.3037 285.6201 580.2197 c
-286.0063 580.2314 286.2656 580.8271 286.5801 580.9395 c
-287.0049 581.1221 287.5566 580.875 287.7798 581.1797 c
-289.772 582.4082 291.3223 583.625 293.2998 585.0195 c
-293.4438 585.0752 293.8232 584.9023 294.02 585.0195 c
-294.4185 585.2002 294.625 585.624 294.98 585.7393 c
-295.3613 586.0469 295.6279 585.7275 295.9399 585.5 c
-295.1313 585.0361 295.1265 583.9834 294.5 583.8193 c
-293.6338 583.4668 293.0166 582.9033 292.3398 582.3799 c
-291.9536 582.2002 291.229 582.4707 291.1401 582.3799 c
-290.4561 581.1436 289.1528 580.6611 288.2598 579.7393 c
-F
-227.54 633.9795 m
-217.2583 637.2002 204.98 609.0195 v
-202.3398 603.2402 199.7002 601.0996 v
-197.0601 598.8418 184.7407 594.8818 182.6602 590.54 c
-171.1401 572.7793 l
-187.3809 590.4795 190.8198 593.1797 v
-199.7002 602.3594 196.1001 594.8594 v
-180.7808 583.001 182.1802 572.7793 v
-175.9399 557.04 174.98 554.7793 v
-192.6606 590.04 195.3799 591.2598 v
-197.9409 592.6807 199.2607 592.6807 198.02 588.6201 c
-196.6206 584.7607 196.1816 566.7197 193.2197 564.6201 c
-201.9009 586.9609 201.1401 590.54 v
-204.541 594.4395 207.1401 588.6201 v
-205.9399 571.0996 l
-210.7402 557.8994 l
-208.0615 570.2402 209.7798 587.4199 v
-207.6201 598.8418 211.9399 592.7002 v
-216.4209 586.5195 226.981 579.9199 227.0601 574.7002 c
-221.2617 594.001 211.2197 599.1797 v
-206.6602 592.7002 l
-205.46 594.8594 l
-201.4614 595.7598 206.4199 603.2598 v
-211.1406 610.7217 210.7402 611.6602 y
-217.7407 603.6797 219.6201 603.7393 v
-234.02 612.041 235.46 585.2598 v
-242.8208 601.04 232.8198 608.54 v
-216.4209 610.7217 217.7002 616.46 v
-225.6201 630.1396 l
-229.6206 635.8018 227.7798 632.7793 y
-F
-205.46 615.9795 m
-191.3408 616.001 187.9399 610.2197 v
-180.02 599.6602 l
-198.8218 610.7217 203.2998 612.1396 v
-207.6201 613.3613 205.46 615.9795 y
-F
-161.54 609.0195 m
-159.2217 607.6396 158.8999 604.46 v
-158.3408 601.4814 155.7007 601.04 156.5 597.9795 c
-157.46 594.8818 159.6606 592.2412 159.6201 596.54 c
-159.6606 601.04 161.4199 603.2402 162.2598 604.46 c
-163.1816 605.8809 164.9409 610.7217 161.54 609.0195 c
-F
-151.7002 541.5801 m
-142.501 546.041 138.98 549.9795 v
-135.4614 553.9609 135.9585 548.2783 130.5801 548.7793 c
-124.189 549.166 125.2998 566.7793 y
-120.98 558.3799 l
-119.6216 542.5205 128.4199 545.1797 v
-132.7183 546.4492 134.1416 544.7217 132.5 543.7393 c
-130.6206 542.96 138.541 542.5205 135.3799 540.8594 c
-132.3799 539 148.2197 544.7217 145.7002 533.1797 c
-151.7002 541.5801 l
-F
-137.7798 525.7393 m
-120.9414 520.9609 116.8999 531.5 v
-111.7017 528.8818 114.02 525.5 v
-116.54 522.2813 117.8599 521.8994 y
-123.7998 520.5195 123.1401 519.7393 v
-122.48 518.7607 119.7798 514.9395 y
-131.0601 521.6211 137.7798 525.7393 v
-F
-1 g
-389.0605 439.8193 m
-388.6523 437.4316 386.8135 436.5508 384.7402 435.7402 c
-382.6133 436.8721 379.7559 440.29 377.7793 437.8994 c
-377.1602 438.5479 376.3037 438.6123 375.8594 439.3398 c
-375.4141 440.3311 375.7129 441.4805 375.3799 442.46 c
-374.7363 443.7578 373.957 445.2607 374.1797 446.7803 c
-376.1484 447.6025 376.8027 449.6982 376.3398 451.5801 c
-376.2051 451.9209 375.7324 452.1387 375.8594 452.54 c
-376.1582 452.8779 376.5078 453.1279 376.8203 453.5 c
-376.6523 453.2715 376.4941 453.0146 376.3398 453.0195 c
-375.7012 453.1543 375.8359 453.8545 375.8594 454.2197 c
-376.623 456.2021 378.8379 456.4922 380.4199 455.1797 c
-380.6025 455.8018 381.1621 455.5879 381.6201 455.6602 c
-381.5859 456.2578 382.0352 456.8379 382.3398 457.3398 c
-382.8223 458.5059 384.6152 457.2891 385.46 458.0596 c
-386.6738 458.8711 387.8438 459.6416 389.0605 459.0195 c
-391.0215 457.8633 392.9004 456.5313 394.0996 454.7002 c
-394.8516 453.6963 395.1152 452.2881 395.0605 451.3398 c
-395.0098 450.5215 393.4902 450.9102 393.1406 449.8994 c
-392.4033 447.9658 394.417 447.3945 395.2998 445.8193 c
-395.4678 445.5391 395.1777 445.2031 394.8203 445.0996 c
-394.3789 444.9561 393.5166 445.165 393.6201 444.6201 c
-394.7363 441.1514 391.7051 440.4082 389.0605 439.8193 c
-F
-378.5 418.2197 m
-378.5527 420.1299 376.791 422.0645 378.0195 423.9795 c
-378.2695 423.793 378.4141 423.5498 378.5 423.5 c
-378.7109 423.5498 378.8555 423.793 378.9805 423.9795 c
-380.6455 421.5029 384.6631 420.4805 384.5 417.2598 c
-384.4834 416.8594 383.2881 415.8486 384.2598 415.0996 c
-382.2871 413.6572 382.2266 411.0508 381.1406 408.8594 c
-379.8398 409.2939 378.5078 409.6924 377.2998 410.2998 c
-377.6289 411.9346 377.499 413.7871 378.5 415.3398 c
-378.8789 416.0068 378.5645 417.1924 378.5 418.2197 c
-F
-0.8 g
-195.8599 428.0596 m
-177.1953 416.9697 192.7402 433.8193 v
-202.3398 444.3994 213.3799 450.6201 y
-224.7798 455.4004 228.7402 456.6201 v
-232.7002 458.041 249.4209 463.7598 252.98 464.2998 c
-256.46 464.6406 267.02 469.04 274.5801 464.54 c
-281.9814 460.2412 290.8999 455.4199 y
-272.7417 464.6406 268.8198 461.8994 v
-264.8218 459.3604 256.9014 459.7998 250.3398 456.3799 c
-234.02 451.4404 230.4199 449.1797 v
-226.981 447.0391 215.54 434.2803 213.8599 435.2598 c
-212.0215 436.04 214.2197 436.4795 215.54 439.5801 c
-216.8599 442.6396 214.6616 444.3994 205.9399 437.4199 c
-197.0601 430.3203 195.8599 428.0596 y
-F
-0 g
-203.7798 434.7803 m
-205.436 449.0264 214.8198 447.2598 v
-223.8105 451.7842 226.8198 453.9795 v
-235.7578 455.8203 237.1401 456.3799 v
-257.5254 466.0684 273.7183 461.0986 274.3398 462.3799 c
-274.9185 463.5605 296.5063 455.7314 300.5 451.3398 c
-300.9082 450.749 289.2222 457.3945 278.6602 459.5 c
-269.4536 461.249 245.6934 459.2021 233.7798 453.0195 c
-230.4248 451.4521 220.585 445.0898 217.7002 445.0996 c
-215.0166 445.335 203.7798 434.7803 y
-F
-0.8 g
-199.7002 406.46 m
-182.9814 409.2002 201.3799 411.0195 v
-221.2617 413.1582 225.6201 418.9395 v
-240.6201 429.001 243.6201 429.5 v
-246.7808 429.8789 279.7808 437.7988 280.3398 440.54 c
-280.6616 443.0791 286.8198 443.0791 288.5 442.2197 c
-290.3408 441.3193 289.46 440 286.3398 439.0996 c
-283.3018 438.2402 248.9814 420.2002 241.9399 418.9395 c
-234.9009 417.5596 222.1401 409.2002 216.98 407.8994 c
-211.5801 406.5586 199.7002 406.46 y
-F
-0 g
-221.0601 414.6201 m
-211.731 415.6113 221.2998 416.54 v
-230.8906 420.2764 233.0601 423.2598 v
-240.8047 428.3887 242.4199 428.54 v
-243.9585 428.8369 259.3135 432.8936 259.46 434.2998 c
-259.7646 435.5957 297.2383 449.4365 302.1802 445.8193 c
-305.3022 443.6162 294.4111 445.46 283.7002 440.54 c
-282.3223 439.9277 245.084 423.8818 241.46 423.2598 c
-237.8745 422.5303 231.3418 418.251 228.7402 417.5 c
-225.9346 416.8975 221.0601 414.6201 y
-F
-212.4199 412.2197 m
-218.1802 412.7188 216.98 411.0195 v
-215.54 409.2002 212.8999 410.0596 y
-212.4199 412.2197 l
-F
-204.5 410.54 m
-210.2598 410.96 209.0601 409.0996 v
-207.6201 407.4395 204.98 408.3799 y
-204.5 410.54 l
-F
-193.2197 408.8594 m
-198.8218 409.2002 197.54 407.4199 v
-196.1816 405.6797 193.46 406.46 y
-193.2197 408.8594 l
-F
-184.8198 407.8994 m
-190.46 408.3193 189.1401 406.46 v
-187.8198 404.7988 185.2998 405.7402 y
-184.8198 407.8994 l
-F
-227.0601 451.3398 m
-231.8218 451.4404 230.4199 449.6602 v
-229.1816 447.9199 225.6201 448.46 y
-227.0601 451.3398 l
-F
-216.02 445.3398 m
-223.1357 447.6338 220.3398 443.8994 v
-219.0605 442.2002 216.5 443.1797 y
-216.02 445.3398 l
-F
-203.7798 440.0596 m
-209.3818 440.4395 208.1001 438.6201 v
-206.7417 436.9209 204.02 437.8994 y
-203.7798 440.0596 l
-F
-195.3799 433.3398 m
-201.02 433.8389 199.7002 432.1396 v
-198.3799 430.3203 195.8599 431.1797 y
-195.3799 433.3398 l
-F
-187.9399 428.0596 m
-193.5415 428.5586 192.2598 426.8594 v
-190.9014 425.041 188.1802 425.8994 y
-187.9399 428.0596 l
-F
-230.8999 421.0996 m
-238.4238 421.6689 236.6602 419.4199 v
-234.9102 416.9834 231.3799 418.2197 y
-230.8999 421.0996 l
-F
-242.1802 426.3799 m
-249.8647 426.9482 248.1802 424.7002 v
-246.3511 422.2637 242.8999 423.5 y
-242.1802 426.3799 l
-F
-254.1802 431.1797 m
-261.7446 431.7891 259.9399 429.5 v
-258.231 427.1045 254.6602 428.2998 y
-254.1802 431.1797 l
-F
-265.46 436.46 m
-273.1831 437.0693 271.46 434.7803 v
-269.6694 432.3848 266.1802 433.5801 y
-265.46 436.46 l
-F
-235.2197 456.3799 m
-242.8232 456.8691 240.98 454.46 v
-239.3096 452.1846 234.98 452.54 y
-235.2197 456.3799 l
-F
-246.2598 459.7402 m
-253.8247 460.3877 252.02 458.0596 v
-250.311 455.7031 245.54 455.8994 y
-246.2598 459.7402 l
-F
-221.2998 415.8193 m
-226.981 416.2402 225.6201 414.3799 v
-224.3408 412.7188 221.7798 413.6602 y
-221.2998 415.8193 l
-F
-0.254902 0.941176 1 0.243137 k
-140.6602 525.0195 m
-135.9009 515.2393 135.3799 511.8193 v
-136.3398 521.4004 137.7798 523.5801 v
-138.98 525.7998 140.6602 525.0195 y
-F
-120.5 509.4199 m
-116.9814 493.6807 117.3799 490.7002 v
-116.1006 503.3594 116.6602 504.6201 v
-116.9814 506 120.5 509.4199 y
-F
-0.8 g
-143.2998 591.5 m
-143.0601 588.1396 l
-140.6602 587.8994 l
-156.3608 573.9795 156.98 565.5801 v
-157.9014 574.6396 143.2998 591.5 v
-F
-0 g
-147.8599 590.2998 m
-147.2891 590.6475 147.5288 591.4658 147.1401 591.7393 c
-146.1919 592.3203 148.5078 592.3828 148.3398 593.1797 c
-147.8359 594.4971 148.0425 594.5215 147.8599 595.8193 c
-147.8457 596.5801 148.4912 598.2744 148.8198 598.7002 c
-150.5073 600.5762 149.0503 603.8018 150.7402 605.4199 c
-151.189 605.8252 151.6016 606.4326 151.9399 606.8594 c
-152.6406 607.9521 153.9414 608.4893 155.0601 609.5 c
-155.3384 609.7041 155.1152 610.6133 155.7798 610.46 c
-156.5264 610.3857 157.8921 610.5293 157.9399 609.5 c
-157.7192 607.2705 156.2578 605.3789 154.8198 603.5 c
-155.3457 602.7705 154.8418 602.0713 154.5801 601.3398 c
-153.0605 598.5771 153.2695 595.4502 153.1401 592.2197 c
-153.0703 592.2344 152.7344 592.1475 152.6602 591.9795 c
-153.1304 589.5225 153.7734 587.1025 154.8198 584.54 c
-155.1416 583.6279 155.6602 582.6436 155.7798 581.6602 c
-155.9478 580.8682 156.0605 579.9531 155.54 579.2598 c
-157.8511 575.998 156.4111 573.082 157.7002 569.1797 c
-157.9233 568.5098 159.7856 566.4053 159.3799 566.54 c
-156.5117 567.54 156.3896 567.9775 156.2598 568.7002 c
-156.0342 569.4922 155.6694 571.0059 155.2998 571.5801 c
-155.3384 571.8486 155.1514 573.9219 155.0601 573.9795 c
-153.4014 576.6748 154.8945 576.4834 153.3799 579.0195 c
-151.8174 579.8232 150.7544 581.0381 149.54 582.3799 c
-149.3022 582.54 150.5601 583.3369 150.2598 583.5801 c
-149.1582 584.9912 147.8911 585.833 148.3398 587.4199 c
-148.4312 588.2334 148.5801 589.3975 147.8599 590.2998 c
-F
-143.7798 588.3799 m
-144.2598 580.8008 146.8999 579.0195 v
-149.54 577.2793 148.2197 578.1602 144.7402 579.5 c
-141.1807 580.8008 142.5801 581.6602 y
-139.4214 581.2393 142.1001 579.0195 v
-144.7017 576.8408 148.6616 574.2002 146.8999 574.2197 c
-145.1406 574.2002 136.7817 578.5996 136.8198 581.6602 c
-136.7817 584.7607 135.6201 589.3398 y
-136.8896 590.1514 142.1001 590.0596 v
-143.7104 589.2705 143.7798 588.3799 v
-F
-1 g
-143.0601 567.7393 m
-133.5679 570.8906 113.2998 567.2598 v
-123.1733 569.4463 143.7798 567.0195 v
-155.1514 565.5654 143.0601 567.7393 y
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-143.0601 567.7393 m
-133.5679 570.8906 113.2998 567.2598 v
-123.1733 569.4463 143.7798 567.0195 v
-155.1514 565.5654 143.0601 567.7393 y
-143.0601 567.7393 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-145.2197 567.9795 m
-136.1768 571.7695 115.7002 569.8994 v
-125.6982 571.2266 145.9399 567.0195 v
-157.2178 564.5957 145.2197 567.9795 y
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-145.2197 567.9795 m
-136.1768 571.7695 115.7002 569.8994 v
-125.6982 571.2266 145.9399 567.0195 v
-157.2178 564.5957 145.2197 567.9795 y
-145.2197 567.9795 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-147.1401 567.7393 m
-138.457 572.3311 117.8599 571.8193 v
-127.9663 572.5713 147.8599 566.7793 v
-158.9048 563.6113 147.1401 567.7393 y
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-147.1401 567.7393 m
-138.457 572.3311 117.8599 571.8193 v
-127.9663 572.5713 147.8599 566.7793 v
-158.9048 563.6113 147.1401 567.7393 y
-147.1401 567.7393 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-148.5801 567.5 m
-141.1064 572.2881 122.6602 573.5 v
-131.7178 573.3105 149.2998 566.54 v
-158.7729 562.9014 148.5801 567.5 y
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-148.5801 567.5 m
-141.1064 572.2881 122.6602 573.5 v
-131.7178 573.3105 149.2998 566.54 v
-158.7729 562.9014 148.5801 567.5 y
-148.5801 567.5 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-275.54 555.9795 m
-274.3999 555.2764 274.5801 556.46 v
-274.8726 557.873 305.9023 572.3594 309.8594 572.0596 c
-276.6055 557.5586 275.54 555.9795 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-275.54 555.9795 m
-274.3999 555.2764 274.5801 556.46 v
-274.8726 557.873 305.9023 572.3594 309.8594 572.0596 c
-276.6055 557.5586 275.54 555.9795 v
-275.54 555.9795 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-271.7002 555.2598 m
-270.728 554.4941 270.98 555.7393 v
-270.9922 557.1201 300.7881 574.001 304.8198 573.9795 c
-272.7441 556.9424 271.7002 555.2598 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-271.7002 555.2598 m
-270.728 554.4941 270.98 555.7393 v
-270.9922 557.1201 300.7881 574.001 304.8198 573.9795 c
-272.7441 556.9424 271.7002 555.2598 v
-271.7002 555.2598 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-268.1001 553.8193 m
-267.1665 552.9199 267.1401 554.2998 v
-267.2578 555.5576 289.0566 572.6045 299.7798 574.7002 c
-280.0161 565.7266 268.1001 553.8193 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-268.1001 553.8193 m
-267.1665 552.9199 267.1401 554.2998 v
-267.2578 555.5576 289.0566 572.6045 299.7798 574.7002 c
-280.0161 565.7266 268.1001 553.8193 v
-268.1001 553.8193 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-264.98 551.6602 m
-264.0918 550.9561 264.02 552.1396 v
-264.1758 553.3301 283.7935 568.6709 293.54 570.6201 c
-275.6602 562.4814 264.98 551.6602 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-264.98 551.6602 m
-264.0918 550.9561 264.02 552.1396 v
-264.1758 553.3301 283.7935 568.6709 293.54 570.6201 c
-275.6602 562.4814 264.98 551.6602 v
-264.98 551.6602 l
-s
-0 O
-0.8 g
-0 J 1 w 4 M
-230.1802 388.9395 m
-213.3418 391.5986 231.8599 393.2598 v
-251.6216 395.5586 256.1001 401.1797 v
-270.98 411.3994 274.1001 411.7402 v
-277.1406 412.2803 295.1816 416.2402 295.7002 418.9395 c
-296.0601 421.5195 302.6602 424.1602 304.3398 423.2598 c
-306.1807 422.4004 306.1807 412.2803 303.1401 411.5 c
-300.02 410.5205 279.3418 402.6006 272.4199 401.1797 c
-265.2607 399.958 252.5 391.5986 247.2197 390.3799 c
-241.9399 388.959 230.1802 388.9395 y
-F
-0 g
-310.3398 429.9795 m
-307.0615 428.3408 305.7798 425.4199 v
-298.7002 413.8203 282.98 410.2998 v
-257.7798 400.3994 249.1401 398.2998 v
-234.4614 392.7002 226.3398 393.5 v
-218.6216 393.3584 225.3799 391.5801 v
-247.6616 393.7998 251.2998 395.6602 v
-268.5605 401.499 271.9399 404.2998 v
-275.1606 407.2207 295.1816 412.7188 297.6201 414.8594 c
-300.02 417.1201 310.8008 426.3584 310.3398 429.9795 c
-F
-245.7798 395.4199 m
-251.5229 395.6865 250.3398 393.9795 v
-248.9863 392.2783 246.2598 393.2598 y
-245.7798 395.4199 l
-F
-237.8599 393.9795 m
-243.5981 394.2002 242.4199 392.54 v
-241.064 390.79 238.3398 391.8193 y
-237.8599 393.9795 l
-F
-226.3398 392.54 m
-232.1289 392.8281 230.8999 391.0996 v
-229.5918 389.4199 226.8198 390.3799 y
-226.3398 392.54 l
-F
-217.9399 392.0596 m
-223.731 392.2275 222.5 390.6201 v
-221.1943 388.8193 218.4199 389.8994 y
-217.9399 392.0596 l
-F
-264.02 403.5801 m
-271.6133 403.9082 270.02 401.6602 v
-268.2368 399.3701 264.7402 400.7002 y
-264.02 403.5801 l
-F
-275.2998 408.3799 m
-281.8569 412.0762 281.2998 406.46 v
-280.9736 403.6953 276.02 405.5 y
-275.2998 408.3799 l
-F
-285.3799 411.5 m
-293.2231 415.6113 291.3799 409.5801 v
-290.4609 406.9063 286.1001 408.6201 y
-285.3799 411.5 l
-F
-295.7002 416.7803 m
-300.6079 422.2373 301.7002 414.8594 v
-302.228 412.1162 296.4199 413.8994 y
-295.7002 416.7803 l
-F
-254.4199 398.54 m
-260.2686 398.8945 258.98 397.0996 v
-257.7319 395.4844 255.1401 396.3799 y
-254.4199 398.54 l
-F
-1 g
-293.7798 532.2197 m
-292.8799 531.4473 292.8198 532.7002 v
-292.8774 533.8018 312.1113 548.3906 321.8594 549.9795 c
-304.1289 542.5107 293.7798 532.2197 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-293.7798 532.2197 m
-292.8799 531.4473 292.8198 532.7002 v
-292.8774 533.8018 312.1113 548.3906 321.8594 549.9795 c
-304.1289 542.5107 293.7798 532.2197 v
-293.7798 532.2197 l
-s
-0 O
-0 g
-0 J 1 w 4 M
-296.8999 461.8994 m
-321.1426 437.3594 331.2197 433.3398 v
-341.3818 421.0811 336.9805 392.54 v
-333.4609 384.1201 330.0195 406.9395 v
-333.4609 434.7197 321.1406 417.0195 v
-311.9004 428.0098 318.9805 427.5801 v
-322.4629 425.4795 322.8203 427.3398 v
-323.3408 429.001 314.54 443.96 295.7002 459.7402 c
-276.7017 475.6396 296.8999 461.8994 y
-F
-1 g
-232.8198 419.4199 m
-232.4814 421.2988 234.5 420.3799 v
-236.4414 419.54 340.0615 412.7188 374.9004 386.2998 c
-325.1025 411.8408 232.8198 419.4199 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-232.8198 419.4199 m
-232.4814 421.2988 234.5 420.3799 v
-236.4414 419.54 340.0615 412.7188 374.9004 386.2998 c
-325.1025 411.8408 232.8198 419.4199 v
-232.8198 419.4199 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-244.1001 424.2197 m
-243.9199 426.1396 246.02 425.1797 v
-247.8799 424.3809 398.1416 425.4795 424.0996 389.8994 c
-399.9004 417.5596 244.1001 424.2197 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-244.1001 424.2197 m
-243.9199 426.1396 246.02 425.1797 v
-247.8799 424.3809 398.1416 425.4795 424.0996 389.8994 c
-399.9004 417.5596 244.1001 424.2197 v
-244.1001 424.2197 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-256.8198 428.54 m
-256.6807 430.5391 258.7402 429.7402 v
-260.6406 428.7803 451.3809 443.0791 477.3799 407.4199 c
-466.7813 435.6006 256.8198 428.54 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-256.8198 428.54 m
-256.6807 430.5391 258.7402 429.7402 v
-260.6406 428.7803 451.3809 443.0791 477.3799 407.4199 c
-466.7813 435.6006 256.8198 428.54 v
-256.8198 428.54 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-267.8599 433.8193 m
-267.6802 435.8193 269.7798 435.0195 v
-271.6401 434.0596 406.0615 476.5205 432.0195 440.7803 c
-417.2813 467.9404 267.8599 433.8193 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-267.8599 433.8193 m
-267.6802 435.8193 269.7798 435.0195 v
-271.6401 434.0596 406.0615 476.5205 432.0195 440.7803 c
-417.2813 467.9404 267.8599 433.8193 v
-267.8599 433.8193 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-204.02 408.8594 m
-203.8809 410.7393 205.9399 409.8193 v
-207.8408 408.9795 227.4199 406.5586 229.7002 363.9795 c
-221.7007 410.0791 204.02 408.8594 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-204.02 408.8594 m
-203.8809 410.7393 205.9399 409.8193 v
-207.8408 408.9795 227.4199 406.5586 229.7002 363.9795 c
-221.7007 410.0791 204.02 408.8594 v
-204.02 408.8594 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-194.4199 406.9395 m
-194.2017 408.9795 196.1001 408.1396 v
-198.1616 407.2207 213.7808 412.2803 210.7402 369.5 c
-212.0215 408.3193 194.4199 406.9395 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-194.4199 406.9395 m
-194.2017 408.9795 196.1001 408.1396 v
-198.1616 407.2207 213.7808 412.2803 210.7402 369.5 c
-212.0215 408.3193 194.4199 406.9395 v
-194.4199 406.9395 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-185.54 406.46 m
-185.4009 408.541 187.46 407.6602 v
-189.3608 406.7793 206.2998 406.1191 192.7402 381.5 c
-203.2207 407.8809 185.54 406.46 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-185.54 406.46 m
-185.4009 408.541 187.46 407.6602 v
-189.3608 406.7793 206.2998 406.1191 192.7402 381.5 c
-203.2207 407.8809 185.54 406.46 v
-185.54 406.46 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-237.6201 455.4199 m
-237.1904 453.1299 238.8198 454.46 v
-256.5703 468.3555 292.2559 533.1484 353.54 539.4199 c
-311.3691 552.668 237.6201 455.4199 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-237.6201 455.4199 m
-237.1904 453.1299 238.8198 454.46 v
-256.5703 468.3555 292.2559 533.1484 353.54 539.4199 c
-311.3691 552.668 237.6201 455.4199 v
-237.6201 455.4199 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-250.1001 457.3398 m
-248.499 458.6211 250.5801 459.2598 v
-252.6104 459.9971 376.2949 539.749 419.54 531.0195 c
-389.6914 539.2471 250.1001 457.3398 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-250.1001 457.3398 m
-248.499 458.6211 250.5801 459.2598 v
-252.6104 459.9971 376.2949 539.749 419.54 531.0195 c
-389.6914 539.2471 250.1001 457.3398 v
-250.1001 457.3398 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-227.0601 450.6201 m
-226.5151 448.8389 228.5 449.8994 v
-238.2681 455.5449 242.2446 518.4746 290.1802 519.7402 c
-254.5278 536.043 227.0601 450.6201 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-227.0601 450.6201 m
-226.5151 448.8389 228.5 449.8994 v
-238.2681 455.5449 242.2446 518.4746 290.1802 519.7402 c
-254.5278 536.043 227.0601 450.6201 v
-227.0601 450.6201 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-205.2197 438.3799 m
-203.9746 437.0547 206.1802 437.4199 v
-217.3926 438.7998 240.9365 484.1953 289.9399 478.7002 c
-254.6577 494.3906 205.2197 438.3799 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-205.2197 438.3799 m
-203.9746 437.0547 206.1802 437.4199 v
-217.3926 438.7998 240.9365 484.1953 289.9399 478.7002 c
-254.6577 494.3906 205.2197 438.3799 v
-205.2197 438.3799 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-217.46 445.0996 m
-216.6294 443.5898 218.6602 444.3799 v
-229.4624 447.8818 243.855 496.9521 292.8198 500.7803 c
-255.3633 509.5928 217.46 445.0996 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-217.46 445.0996 m
-216.6294 443.5898 218.6602 444.3799 v
-229.4624 447.8818 243.855 496.9521 292.8198 500.7803 c
-255.3633 509.5928 217.46 445.0996 v
-217.46 445.0996 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-197.2998 432.8594 m
-196.4551 431.6914 198.2598 431.8994 v
-207.3247 433.1045 226.395 469.877 265.9399 465.2598 c
-237.5098 478.1338 197.2998 432.8594 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-197.2998 432.8594 m
-196.4551 431.6914 198.2598 431.8994 v
-207.3247 433.1045 226.395 469.877 265.9399 465.2598 c
-237.5098 478.1338 197.2998 432.8594 v
-197.2998 432.8594 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-189.1401 426.3799 m
-187.9497 425.1895 189.6201 425.4199 v
-194.2856 425.6572 227.9863 462.0459 248.4199 445.0996 c
-235.0854 465.5889 189.1401 426.3799 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-189.1401 426.3799 m
-187.9497 425.1895 189.6201 425.4199 v
-194.2856 425.6572 227.9863 462.0459 248.4199 445.0996 c
-235.0854 465.5889 189.1401 426.3799 v
-189.1401 426.3799 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-265.46 461.4199 m
-264.2192 462.9434 266.4199 463.3398 v
-268.4697 463.791 401.2441 527.2734 443.0605 513.0195 c
-414.4668 525.082 265.46 461.4199 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-265.46 461.4199 m
-264.2192 462.9434 266.4199 463.3398 v
-268.4697 463.791 401.2441 527.2734 443.0605 513.0195 c
-414.4668 525.082 265.46 461.4199 v
-265.46 461.4199 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-228.7402 390.6201 m
-228.5215 392.7002 230.4199 391.8193 v
-232.4814 390.9395 249.4209 390.2793 235.7002 365.6602 c
-246.3418 392.041 228.7402 390.6201 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-228.7402 390.6201 m
-228.5215 392.7002 230.4199 391.8193 v
-232.4814 390.9395 249.4209 390.2793 235.7002 365.6602 c
-246.3418 392.041 228.7402 390.6201 v
-228.7402 390.6201 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-240.2598 392.54 m
-239.96 394.46 241.9399 393.5 v
-243.9199 392.7002 263.5015 390.2793 265.7002 347.6602 c
-257.7798 393.7998 240.2598 392.54 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-240.2598 392.54 m
-239.96 394.46 241.9399 393.5 v
-243.9199 392.7002 263.5015 390.2793 265.7002 347.6602 c
-257.7798 393.7998 240.2598 392.54 v
-240.2598 392.54 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-247.7002 394.2197 m
-247.4409 396.2188 249.3799 395.4199 v
-251.4009 394.46 278.4609 390.7207 304.3398 355.0996 c
-265.2607 395.5586 247.7002 394.2197 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-247.7002 394.2197 m
-247.4409 396.2188 249.3799 395.4199 v
-251.4009 394.46 278.4609 390.7207 304.3398 355.0996 c
-265.2607 395.5586 247.7002 394.2197 v
-247.7002 394.2197 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-256.1001 396.3799 m
-255.5674 398.4053 257.54 397.8193 v
-259.7266 397.1865 282.2021 399.2764 324.0195 361.5801 c
-273.3174 400.1191 256.1001 396.3799 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-256.1001 396.3799 m
-255.5674 398.4053 257.54 397.8193 v
-259.7266 397.1865 282.2021 399.2764 324.0195 361.5801 c
-273.3174 400.1191 256.1001 396.3799 v
-256.1001 396.3799 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-267.3799 401.4199 m
-267.0078 403.2461 269.0601 402.6201 v
-271.165 402.0273 309.4834 397.0762 366.2598 358.7002 c
-284.7559 404.96 267.3799 401.4199 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-267.3799 401.4199 m
-267.0078 403.2461 269.0601 402.6201 v
-271.165 402.0273 309.4834 397.0762 366.2598 358.7002 c
-284.7559 404.96 267.3799 401.4199 v
-267.3799 401.4199 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-222.98 414.1396 m
-222.7998 416.0186 224.8999 415.0996 v
-226.7598 414.2598 285.5 411.3994 318.9805 381.9795 c
-280.5488 409.1719 222.98 414.1396 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-222.98 414.1396 m
-222.7998 416.0186 224.8999 415.0996 v
-226.7598 414.2598 285.5 411.3994 318.9805 381.9795 c
-280.5488 409.1719 222.98 414.1396 v
-222.98 414.1396 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-211.9399 409.5801 m
-211.8008 411.6201 213.8599 410.7803 v
-215.7607 409.8584 242.8208 406.1191 268.8198 370.46 c
-229.6206 410.96 211.9399 409.5801 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-211.9399 409.5801 m
-211.8008 411.6201 213.8599 410.7803 v
-215.7607 409.8584 242.8208 406.1191 268.8198 370.46 c
-229.6206 410.96 211.9399 409.5801 v
-211.9399 409.5801 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-279.3799 406.46 m
-278.833 408.2764 281.0601 407.8994 v
-283.0688 407.3672 321.6465 405.2354 381.1406 370.9395 c
-295.748 408.8672 279.3799 406.46 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-279.3799 406.46 m
-278.833 408.2764 281.0601 407.8994 v
-283.0688 407.3672 321.6465 405.2354 381.1406 370.9395 c
-295.748 408.8672 279.3799 406.46 v
-279.3799 406.46 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-288.7402 409.0996 m
-288.0728 410.917 290.1802 410.54 v
-292.3086 410.0068 330.8867 407.876 390.5 373.5801 c
-305.6479 411.9463 288.7402 409.0996 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-288.7402 409.0996 m
-288.0728 410.917 290.1802 410.54 v
-292.3086 410.0068 330.8867 407.876 390.5 373.5801 c
-305.6479 411.9463 288.7402 409.0996 v
-288.7402 409.0996 l
-s
-0 O
-1 g
-0 J 1 w 4 M
-299.2998 414.6201 m
-298.6328 416.415 300.7402 416.0596 v
-302.8687 415.5049 350.2471 410.7363 449.0605 373.0996 c
-316.208 417.4473 299.2998 414.6201 v
-F
-0 R
-0 G
-1 J 0.11 w 10 M
-299.2998 414.6201 m
-298.6328 416.415 300.7402 416.0596 v
-302.8687 415.5049 350.2471 410.7363 449.0605 373.0996 c
-316.208 417.4473 299.2998 414.6201 v
-299.2998 414.6201 l
-s
-0 O
-0 g
-0 J 1 w 4 M
-176.8999 406.9395 m
-182.54 407.4395 181.2197 405.7402 v
-179.8999 403.9209 177.3799 404.7803 y
-176.8999 406.9395 l
-F
-210.7402 391.5801 m
-216.4209 392.041 215.0601 390.3799 v
-213.7808 388.5195 211.2197 389.4199 y
-210.7402 391.5801 l
-F
-201.1401 392.0596 m
-206.7417 392.4795 205.46 390.6201 v
-204.1016 388.959 201.3799 389.8994 y
-201.1401 392.0596 l
-F
-96.02 405.0195 m
-101.665 403.585 99.8599 402.3799 v
-98.0166 401.1221 95.7798 402.8594 y
-96.02 405.0195 l
-F
-98.4199 415.5801 m
-103.8633 414.1445 102.02 412.9395 v
-100.2178 411.6826 97.9399 413.4199 y
-98.4199 415.5801 l
-F
-90.5 420.3799 m
-95.9434 418.9854 94.1001 417.7402 v
-92.2974 416.5225 90.02 418.2197 y
-90.5 420.3799 l
-F
-0.8 g
-178.1001 337.8193 m
-176.3818 337.9209 172.1001 335.6602 v
-169.7817 335.7197 157.46 331.7598 151.2197 320.7803 c
-164.9409 331.3203 178.1001 337.8193 v
-F
-274.5801 236.0596 m
-274.7842 235.7266 274.8438 235.2627 275.0601 235.3398 c
-275.8877 235.2002 277.2441 234.8691 277.2197 235.5801 c
-276.1733 240.3057 275.2134 245.7363 270.7402 247.8193 c
-269.9648 248.0313 268.3784 247.5771 268.3398 246.6201 c
-268.1553 244.9277 268.0278 243.4443 268.3398 241.8193 c
-268.6978 240.2695 271.0713 240.2578 272.1802 241.8193 c
-273.1113 239.9404 273.5864 237.9121 274.5801 236.0596 c
-F
-262.3398 230.7803 m
-263.2666 229.2461 263.125 227.2012 264.7402 226.7002 c
-265.4961 226.2607 267.5313 227.333 267.1401 228.6201 c
-266.1895 230.7803 265.7622 233.2441 264.2598 235.3398 c
-264.0151 235.5244 264.2769 236.1104 264.02 236.54 c
-263.4487 237.8115 262.189 238.623 260.6602 238.2197 c
-259.4146 235.8369 260.6768 233.4941 262.3398 231.5 c
-262.501 231.4473 262.3184 231.0342 262.3398 230.7803 c
-F
-218.8999 236.54 m
-218.7607 236.9258 218.7197 237.4346 218.8999 237.7393 c
-219.4854 238.9229 220.3569 240.1592 220.1001 241.3398 c
-219.603 242.4434 218.377 242.2441 217.7002 241.5801 c
-216.4136 240.5234 216.3584 238.5146 215.54 237.0195 c
-215.3838 236.5947 215.4395 235.9658 215.0601 235.5801 c
-214.4336 235.0732 213.9487 233.3955 214.1001 232.7002 c
-214.1118 232.4238 213.9102 221.5254 214.1001 221.8994 c
-214.8369 222.6201 218.1919 233.3291 218.1802 234.3799 c
-218.3311 235.1143 219.1353 235.625 218.8999 236.54 c
-F
-190.5801 243.9795 m
-193.5752 246.7305 196.6445 249.9893 196.1001 254.0596 c
-196.0303 255.1445 194.0767 254.5664 193.9399 253.5801 c
-192.9897 249.6465 190.748 246.7207 187.9399 243.9795 c
-185.5063 241.8369 183.459 234.8594 183.1401 234.3799 c
-187.2681 240.082 189.7495 243.1016 190.5801 243.9795 c
-F
-175.7002 250.46 m
-176.3218 250.9492 175.9902 251.4893 176.1802 251.8994 c
-177.2769 253.457 178.707 254.8281 178.8198 256.7002 c
-178.731 257.0449 178.3159 257.3857 177.8599 257.1797 c
-177.6416 256.9375 177.2646 256.793 177.1401 256.7002 c
-174.915 253.957 173.3745 251.0186 171.8599 247.8193 c
-171.5864 247.5322 170.3262 242.5928 170.6602 242.54 c
-170.9336 242.377 172.8271 246.9746 173.0601 247.0996 c
-174.4473 247.8555 174.459 249.6318 175.7002 250.46 c
-F
-194.1802 229.0996 m
-194.6406 230 196.3735 231.3223 196.3398 232.2197 c
-196.1216 233.3213 196.6353 234.9082 195.6201 234.1396 c
-194.2495 233.1074 190.4551 231.625 190.1001 225.2598 c
-190.1313 224.6064 193.4023 227.5713 194.1802 229.0996 c
-F
-210.02 247.8193 m
-210.481 248.6738 211.2583 248.1533 211.7002 248.54 c
-212.4775 248.8516 213.1494 249.4658 213.3799 250.2197 c
-214.5366 252.543 216.4834 254.5469 216.7402 257.1797 c
-215 258.7256 214.2534 256.4814 213.6201 255.5 c
-212.1055 257.2305 211.0063 255.1709 209.54 254.54 c
-209.499 254.5684 209.2642 254.9502 209.2998 255.0195 c
-207.8862 254.4365 207.1401 253.2461 205.9399 252.3799 c
-205.8535 252.2402 205.4097 252.4395 205.2197 252.3799 c
-204.5288 251.626 203.4585 251.2686 203.0601 250.46 c
-201.9297 247.541 198.4761 245.2354 196.3398 237.0195 c
-196.8198 235.9395 201.3633 244.2461 201.8599 244.9395 c
-202.8198 246.3291 202.9497 243.1875 204.2598 243.9795 c
-204.4087 243.9482 204.6128 243.6865 204.7402 243.5 c
-204.9727 243.8477 205.2129 244.0996 205.7002 243.9795 c
-205.6401 244.4189 205.4937 245.0313 205.7002 245.1797 c
-207.0752 246.2813 206.9814 247.4551 207.8599 248.7803 c
-208.3447 247.9521 209.5112 248.7412 210.02 247.8193 c
-F
-275.7798 188.0596 m
-283.9614 210.54 279.1401 222.8594 v
-291.6606 199.0996 286.5801 186.8594 v
-286.1602 198.2188 281.7798 203.6602 v
-277.3613 189.6387 275.7798 188.0596 v
-F
-259.46 190.9395 m
-265.4814 200.6406 256.5801 220.9395 v
-255.7998 198.4395 248.4199 186.3799 v
-263.9409 208.5605 259.46 190.9395 v
-F
-248.6602 193.0996 m
-248.3218 215.1602 248.6602 218.54 v
-244.5801 200.1992 233.2998 189.7393 v
-249.2002 202.8389 248.6602 193.0996 v
-F
-238.1001 228.3799 m
-244.5801 213.3994 233.54 193.0996 v
-240.6201 206.5781 235.46 214.2197 v
-238.2007 218.0186 238.1001 228.3799 v
-F
-216.98 193.5801 m
-215.7607 210.7588 217.7002 213.2598 v
-217.9614 220.2197 217.46 221.4199 v
-221.9214 228.1396 222.2598 219.9795 v
-223.6807 211.4189 226.8198 206.2998 v
-230.7197 200.4199 230.4199 193.3398 v
-219.5 226.5986 216.98 193.5801 v
-F
-212.8999 224.0596 m
-205.6401 212.0791 203.7798 191.1797 v
-202.1216 198.001 206.4199 213.7393 v
-210.9199 230.7803 212.8999 224.0596 v
-F
-188.8999 202.2197 m
-194.4199 208.1191 195.8599 213.5 v
-199.9209 231.001 192.98 221.4199 v
-193.1001 212.7393 184.1001 204.6201 v
-189.3608 207.2402 188.8999 202.2197 v
-F
-182.6602 207.7393 m
-186.2817 226.8193 187.2197 227.6602 v
-189.1401 231.4395 186.02 227.8994 v
-176.3818 206.7988 172.1001 199.5801 v
-180.7808 209.6602 182.6602 207.7393 v
-F
-176.1802 225.9795 m
-188.9214 250.5801 164.8999 222.1396 v
-177.0415 232.9785 176.1802 225.9795 v
-F
-159.1401 242.0596 m
-164.5015 262.6777 167.2998 262.46 v
-176.3818 272.3594 169.2197 260.7803 v
-162.5215 250.1406 163.2197 239.4199 v
-162.5215 249.9199 159.1401 242.0596 v
-F
-522.5 254.54 m
-509.3496 265.541 506.6602 269.4199 v
-521.4512 249.041 521.54 241.3398 v
-524.2012 249.5908 522.5 254.54 v
-F
-528.5 278.7803 m
-505.501 295.2412 501.6201 303.5 v
-530.8018 271.04 530.9004 266.0596 v
-531.3516 275.9912 528.5 278.7803 v
-F
-547.2197 448.2197 m
-534.1016 456.9414 532.3398 454.7002 v
-544.002 447.5908 546.7402 438.1396 v
-545.1006 448.1406 547.2197 448.2197 v
-F
-556.5801 359.6602 m
-537.3799 372.8594 l
-558.3008 354.0918 558.7402 349.5801 v
-556.5801 359.6602 l
-F
-*u
-0 R
-0 G
-1 J 1.1 w 10 M
-126.7402 384.3799 m
-150.98 379.0996 l
-S
-1 D
-182.1802 206.0596 m
-181.5513 209.9912 171.6201 198.3799 v
-S
-188.1802 200.54 m
-190.3496 207.79 183.1401 202.9395 v
-S
-247.46 191.1797 m
-249.2002 203.3906 236.6602 189.0195 v
-S
-*U
-U
-%%PageTrailer
-gsave annotatepage grestore showpage
-%%Trailer
-Adobe_Illustrator_AI3 /terminate get exec
-Adobe_pattern_AI3 /terminate get exec
-Adobe_customcolor /terminate get exec
-Adobe_cshow /terminate get exec
-Adobe_cmykcolor /terminate get exec
-Adobe_packedarray /terminate get exec
-%%EOF
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tux.svg b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tux.svg
deleted file mode 100644
index de8c8696886..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/images/tux.svg
+++ /dev/null
@@ -1,1487 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="500pt"
-   height="600pt"
-   id="svg5620"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="mh_inksc_100511_NewTux.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/media/disk/※T h i n g S/UB SOFTWARE/Openclipart/mh_inksc_100511_NewTux.png"
-   inkscape:export-xdpi="150.03999"
-   inkscape:export-ydpi="150.03999">
-  <metadata
-     id="metadata5712">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="728"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="0.65866667"
-     inkscape:cx="837.03841"
-     inkscape:cy="362.33556"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:current-layer="svg5620"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <defs
-     id="defs5622">
-    <linearGradient
-       id="linearGradient6810">
-      <stop
-         id="stop6812"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.04385965;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.35964912;"
-         offset="0.46429399"
-         id="stop6816" />
-      <stop
-         id="stop6814"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 375 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="625 : 375 : 1"
-       inkscape:persp3d-origin="312.5 : 250 : 1"
-       id="perspective5714" />
-    <linearGradient
-       id="linearGradient172">
-      <stop
-         style="stop-color:#3f2600;stop-opacity:0.6;"
-         offset="0"
-         id="stop173" />
-      <stop
-         style="stop-color:#3f2600;stop-opacity:0;"
-         offset="1"
-         id="stop174" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient167">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65;"
-         offset="0"
-         id="stop168" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop169" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient162">
-      <stop
-         style="stop-color:#ffa63f;stop-opacity:1;"
-         offset="0"
-         id="stop163" />
-      <stop
-         style="stop-color:#ffff00;stop-opacity:1;"
-         offset="1"
-         id="stop164" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient153">
-      <stop
-         style="stop-color:#ffeed7;stop-opacity:1;"
-         offset="0"
-         id="stop154" />
-      <stop
-         style="stop-color:#bdbfc2;stop-opacity:1;"
-         offset="1"
-         id="stop155" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient138">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.8;"
-         offset="0"
-         id="stop139" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop140" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient138"
-       id="linearGradient141"
-       x1="0.47424799"
-       y1="0.020191999"
-       x2="0.417539"
-       y2="0.90125799"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient142"
-       x1="0.55880702"
-       y1="0.031192999"
-       x2="0.553922"
-       y2="0.94531101"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient143"
-       x1="0.46557701"
-       y1="0.028819799"
-       x2="0.41365999"
-       y2="0.93366498"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient144"
-       x1="0.70346397"
-       y1="0.059404202"
-       x2="0.64553201"
-       y2="0.94063401"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient145"
-       x1="0.46741399"
-       y1="-0.036155298"
-       x2="0.86741799"
-       y2="0.75857902"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient146"
-       x1="0.57152498"
-       y1="0.023441499"
-       x2="0.57143003"
-       y2="0.71875"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient147"
-       x1="0.5"
-       y1="0.0234362"
-       x2="0.5"
-       y2="0.8125"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient148"
-       x1="0.50799799"
-       y1="0.37435901"
-       x2="0.51599997"
-       y2="0.92820501"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient138"
-       id="linearGradient149"
-       x1="0.5"
-       y1="0.131707"
-       x2="0.50400001"
-       y2="0.94634098"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient150"
-       x1="-0.30509499"
-       y1="0.099496603"
-       x2="0.156323"
-       y2="0.94191301"
-       gradientUnits="objectBoundingBox"
-       gradientTransform="matrix(-0.928523,0.283938,0.435332,0.943857,-1.91327e-7,5.49908e-8)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient151"
-       x1="0.433979"
-       y1="0.022184599"
-       x2="0.487055"
-       y2="1.02569"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient152"
-       x1="0.5"
-       y1="0.89842999"
-       x2="0.5"
-       y2="0.40625"
-       gradientUnits="objectBoundingBox"
-       spreadMethod="reflect" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient156"
-       x1="0.43568701"
-       y1="0.98882002"
-       x2="0.453989"
-       y2="0.23093501"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient157"
-       x1="0.49180499"
-       y1="1.15284"
-       x2="0.49482101"
-       y2="0.41252401"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient158"
-       x1="0.51730198"
-       y1="0.85418499"
-       x2="0.49843901"
-       y2="0.136172"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient159"
-       x1="0.46201"
-       y1="0.87917101"
-       x2="0.49215299"
-       y2="0.096282303"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient162"
-       id="linearGradient161"
-       x1="0.50086302"
-       y1="0.34872901"
-       x2="0.41209599"
-       y2="0.98558098"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient162"
-       id="linearGradient165"
-       x1="0.60399801"
-       y1="0.51020199"
-       x2="0.46399999"
-       y2="0.98367399"
-       gradientUnits="objectBoundingBox" />
-    <linearGradient
-       xlink:href="#linearGradient162"
-       id="linearGradient166"
-       x1="0.50000501"
-       y1="0.191616"
-       x2="0.50800002"
-       y2="0.97005898"
-       gradientUnits="objectBoundingBox" />
-    <radialGradient
-       xlink:href="#linearGradient172"
-       id="radialGradient171"
-       cx="0.5"
-       cy="0.5"
-       fx="0.5"
-       fy="0.5"
-       r="0.5"
-       gradientUnits="objectBoundingBox" />
-    <radialGradient
-       xlink:href="#linearGradient172"
-       id="radialGradient176" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient178"
-       x1="0.94027299"
-       y1="1.2934099"
-       x2="0.19452"
-       y2="-0.675295"
-       gradientUnits="objectBoundingBox" />
-    <radialGradient
-       xlink:href="#linearGradient172"
-       id="radialGradient1399"
-       gradientTransform="scale(1.045233,0.956725)"
-       cx="446.77762"
-       cy="1219.4125"
-       fx="446.77762"
-       fy="1219.4125"
-       r="195.07191"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient1401"
-       gradientUnits="userSpaceOnUse"
-       x1="400.57785"
-       y1="369.53015"
-       x2="400.84448"
-       y2="304.07886"
-       gradientTransform="scale(0.575262,1.738339)" />
-    <linearGradient
-       xlink:href="#linearGradient138"
-       id="linearGradient1403"
-       gradientUnits="userSpaceOnUse"
-       x1="303.01761"
-       y1="237.93179"
-       x2="297.0856"
-       y2="330.09561"
-       gradientTransform="scale(1.116071,0.896001)" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient1405"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.816497,1.224744)"
-       x1="378.93771"
-       y1="278.60202"
-       x2="380.27319"
-       y2="243.91606" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient1407"
-       gradientUnits="userSpaceOnUse"
-       x1="381.38742"
-       y1="277.495"
-       x2="380.5517"
-       y2="245.68338"
-       gradientTransform="scale(0.816497,1.224744)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1409"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.816497,1.224744)"
-       x1="379.09573"
-       y1="240.92712"
-       x2="376.79556"
-       y2="281.01636" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1411"
-       gradientUnits="userSpaceOnUse"
-       x1="389.63535"
-       y1="242.28218"
-       x2="387.06866"
-       y2="281.32513"
-       gradientTransform="scale(0.816497,1.224744)" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient1413"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       x1="437.57941"
-       y1="528.87177"
-       x2="437.57941"
-       y2="394.10361"
-       gradientTransform="scale(0.812855,1.230232)" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient1415"
-       gradientUnits="userSpaceOnUse"
-       x1="375.17325"
-       y1="419.78485"
-       x2="377.48541"
-       y2="324.03815"
-       gradientTransform="scale(0.649784,1.538974)" />
-    <linearGradient
-       xlink:href="#linearGradient138"
-       id="linearGradient1417"
-       gradientUnits="userSpaceOnUse"
-       x1="320.75104"
-       y1="498.17776"
-       x2="321.32224"
-       y2="614.50439"
-       gradientTransform="scale(1.074798,0.930408)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1419"
-       gradientUnits="userSpaceOnUse"
-       x1="322.48257"
-       y1="435.26761"
-       x2="323.2514"
-       y2="488.48251"
-       gradientTransform="scale(1.077001,0.928504)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1421"
-       gradientUnits="userSpaceOnUse"
-       x1="411.2215"
-       y1="242.94365"
-       x2="411.2215"
-       y2="331.44858"
-       gradientTransform="scale(0.571707,1.749147)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1423"
-       gradientUnits="userSpaceOnUse"
-       x1="867.34546"
-       y1="234.73897"
-       x2="867.33453"
-       y2="314.83911"
-       gradientTransform="scale(0.572667,1.746214)" />
-    <linearGradient
-       xlink:href="#linearGradient162"
-       id="linearGradient1425"
-       gradientUnits="userSpaceOnUse"
-       x1="236.25362"
-       y1="657.11133"
-       x2="212.5099"
-       y2="737.41229"
-       gradientTransform="scale(1.011514,0.988617)" />
-    <linearGradient
-       xlink:href="#linearGradient153"
-       id="linearGradient1427"
-       gradientUnits="userSpaceOnUse"
-       x1="381.56607"
-       y1="655.73102"
-       x2="279.64313"
-       y2="386.66583"
-       gradientTransform="scale(1.065499,0.938527)" />
-    <linearGradient
-       xlink:href="#linearGradient162"
-       id="linearGradient1429"
-       gradientUnits="userSpaceOnUse"
-       x1="218.11714"
-       y1="630.30475"
-       x2="203.12654"
-       y2="737.8537"
-       gradientTransform="scale(1.009851,0.990245)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1431"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.007724,0.992335)"
-       x1="117.88966"
-       y1="587.23602"
-       x2="182.24524"
-       y2="704.73077" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1433"
-       gradientUnits="userSpaceOnUse"
-       x1="223.10072"
-       y1="570.41809"
-       x2="230.53499"
-       y2="710.97723"
-       gradientTransform="scale(0.999504,1.000496)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1435"
-       gradientUnits="userSpaceOnUse"
-       x1="316.93988"
-       y1="474.01779"
-       x2="371.60889"
-       y2="582.63507"
-       gradientTransform="scale(1.065499,0.938527)" />
-    <linearGradient
-       xlink:href="#linearGradient162"
-       id="linearGradient1437"
-       gradientUnits="userSpaceOnUse"
-       x1="284.68652"
-       y1="410.46326"
-       x2="285.45923"
-       y2="485.69934"
-       gradientTransform="scale(1.218684,0.820557)" />
-    <linearGradient
-       xlink:href="#linearGradient167"
-       id="linearGradient1439"
-       gradientUnits="userSpaceOnUse"
-       x1="288.82358"
-       y1="398.85422"
-       x2="288.37628"
-       y2="482.55939"
-       gradientTransform="scale(1.221941,0.81837)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient172"
-       id="radialGradient5844"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.045233,0.956725)"
-       cx="446.77762"
-       cy="1219.4125"
-       fx="446.77762"
-       fy="1219.4125"
-       r="195.07191" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.575262,1.738339)"
-       x1="400.57785"
-       y1="369.53015"
-       x2="400.84448"
-       y2="304.07886" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient5848"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.116071,0.896001)"
-       x1="303.01761"
-       y1="237.93179"
-       x2="297.0856"
-       y2="330.09561" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.816497,1.224744)"
-       x1="378.93771"
-       y1="278.60202"
-       x2="380.27319"
-       y2="243.91606" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5852"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.816497,1.224744)"
-       x1="381.38742"
-       y1="277.495"
-       x2="380.5517"
-       y2="245.68338" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5854"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.816497,1.224744)"
-       x1="379.09573"
-       y1="240.92712"
-       x2="376.79556"
-       y2="281.01636" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5856"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.816497,1.224744)"
-       x1="389.63535"
-       y1="242.28218"
-       x2="387.06866"
-       y2="281.32513" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5858"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.812855,1.230232)"
-       spreadMethod="reflect"
-       x1="437.57941"
-       y1="528.87177"
-       x2="437.57941"
-       y2="394.10361" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5860"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.649784,1.538974)"
-       x1="375.17325"
-       y1="419.78485"
-       x2="377.48541"
-       y2="324.03815" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient5862"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.074798,0.930408)"
-       x1="320.75104"
-       y1="498.17776"
-       x2="321.32224"
-       y2="614.50439" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5864"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.077001,0.928504)"
-       x1="322.48257"
-       y1="435.26761"
-       x2="323.2514"
-       y2="488.48251" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5866"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.571707,1.749147)"
-       x1="411.2215"
-       y1="242.94365"
-       x2="411.2215"
-       y2="331.44858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5868"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.572667,1.746214)"
-       x1="867.34546"
-       y1="234.73897"
-       x2="867.33453"
-       y2="314.83911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient5870"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.011514,0.988617)"
-       x1="236.25362"
-       y1="657.11133"
-       x2="212.5099"
-       y2="737.41229" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5872"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.065499,0.938527)"
-       x1="381.56607"
-       y1="655.73102"
-       x2="279.64313"
-       y2="386.66583" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient5874"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.009851,0.990245)"
-       x1="218.11714"
-       y1="630.30475"
-       x2="203.12654"
-       y2="737.8537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5876"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.007724,0.992335)"
-       x1="117.88966"
-       y1="587.23602"
-       x2="182.24524"
-       y2="704.73077" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5878"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.999504,1.000496)"
-       x1="223.10072"
-       y1="570.41809"
-       x2="230.53499"
-       y2="710.97723" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5880"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.065499,0.938527)"
-       x1="316.93988"
-       y1="474.01779"
-       x2="371.60889"
-       y2="582.63507" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient5882"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.218684,0.820557)"
-       x1="284.68652"
-       y1="410.46326"
-       x2="285.45923"
-       y2="485.69934" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5884"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.221941,0.81837)"
-       x1="288.82358"
-       y1="398.85422"
-       x2="288.37628"
-       y2="482.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5936"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(6.8689234e-2,-0.4008691,0.3415516,4.336381e-2,-313.66484,483.36861)"
-       x1="316.93988"
-       y1="474.01779"
-       x2="371.60889"
-       y2="582.63507" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5949"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6373879,0.286176,-0.2248927,0.5792711,-190.14391,-154.55792)"
-       x1="381.56607"
-       y1="655.73102"
-       x2="279.64313"
-       y2="386.66583" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5992"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.9649387,-1.2915552e-2,-3.6719978e-2,2.5569228,169.00168,-594.11178)"
-       x1="400.57785"
-       y1="369.53015"
-       x2="400.84448"
-       y2="304.07886" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient6820"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1593287,2.2594958e-2,6.8898041e-2,-0.4858355,313.34561,293.76431)"
-       x1="867.34546"
-       y1="234.73897"
-       x2="867.33453"
-       y2="314.83911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient6824"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.184254,-0.3061768,0.2434767,-0.1724949,439.82488,377.41134)"
-       x1="294.40485"
-       y1="481.32233"
-       x2="371.60889"
-       y2="582.63507" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.6104436e-3,-0.1875898,0.5720113,2.3206217e-2,1167.6399,-164.81318)"
-       x1="892.69696"
-       y1="258.28925"
-       x2="564.89618"
-       y2="281.90463" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2517"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2316272,0.2342907,0.7144146,-0.7062927,960.97808,-166.19015)"
-       x1="867.34546"
-       y1="234.73897"
-       x2="867.33453"
-       y2="314.83911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7672384,0,0,0.4874752,936.37068,-466.38275)"
-       x1="288.82358"
-       y1="398.85422"
-       x2="288.37628"
-       y2="482.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient2524"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.523355,0,0,1.0256962,729.45868,-685.70504)"
-       x1="284.68652"
-       y1="410.46326"
-       x2="285.45923"
-       y2="485.69934" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0038119,-5.2260066e-2,-1.740863e-2,1.0462687,788.19568,-546.66535)"
-       x1="223.10072"
-       y1="570.41809"
-       x2="230.53499"
-       y2="710.97723" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2530"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.9523959,0.3464001,0.4208255,0.9487298,1258.3327,-582.54204)"
-       x1="117.88966"
-       y1="587.23602"
-       x2="182.24524"
-       y2="704.73077" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient2533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.1800109,0.4273134,0.4706466,1.1534176,1272.3477,-732.02104)"
-       x1="218.11714"
-       y1="630.30475"
-       x2="203.12654"
-       y2="737.8537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient2536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2643925,0,0,1.2357712,729.45868,-685.70504)"
-       x1="236.25362"
-       y1="657.11133"
-       x2="212.5099"
-       y2="737.41229" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6810"
-       id="linearGradient2539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.599201,7.9485483e-2,-0.2318863,1.9097465,860.80461,-630.61189)"
-       x1="855.06372"
-       y1="238.8383"
-       x2="871.15576"
-       y2="315.45914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2545"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2781848,0,0,0.990788,754.62768,-618.27804)"
-       x1="322.48257"
-       y1="435.26761"
-       x2="323.2514"
-       y2="488.48251" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient2548"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3994837,0,0,1.1399824,714.04668,-671.75704)"
-       x1="320.75104"
-       y1="498.17776"
-       x2="321.32224"
-       y2="614.50439" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient2555"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0160687,0,0,1.53779,729.45868,-686.43004)"
-       spreadMethod="reflect"
-       x1="437.57941"
-       y1="528.87177"
-       x2="437.57941"
-       y2="394.10361" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2558"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2914159,-3.3330306e-2,5.0610341e-2,0.4881144,1003.9662,-404.72726)"
-       x1="389.63535"
-       y1="242.28218"
-       x2="387.06866"
-       y2="281.32513" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient2561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.3921823,-2.9764582e-2,-5.7310058e-2,0.5824956,1376.4784,-428.91032)"
-       x1="379.09573"
-       y1="240.92712"
-       x2="376.79556"
-       y2="281.01636" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient2566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4785291,4.0425338e-2,3.8864067e-2,1.9024316,1751.4647,-802.97704)"
-       x1="381.38742"
-       y1="277.495"
-       x2="380.5517"
-       y2="245.68338" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient2569"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0650795,-6.1672141e-2,9.4458503e-2,1.6443046,688.76168,-695.81704)"
-       x1="378.93771"
-       y1="278.60202"
-       x2="380.27319"
-       y2="243.91606" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient2572"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4132361,-7.9650304e-2,-4.1197678e-2,1.0713842,746.14768,-643.96104)"
-       x1="303.01761"
-       y1="237.93179"
-       x2="297.0856"
-       y2="330.09561" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient172"
-       id="radialGradient2577"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4818268,0,0,0.3967969,505.21028,-296.00604)"
-       cx="446.77762"
-       cy="1219.4125"
-       fx="446.77762"
-       fy="1219.4125"
-       r="195.07191" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-7.6104436e-3,-0.1875898,-0.5720113,2.3206217e-2,1186.0942,-162.08752)"
-       x1="892.69696"
-       y1="258.28925"
-       x2="564.89618"
-       y2="281.90463" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient172"
-       id="radialGradient3411"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4818268,0,0,0.3967969,-359.87341,176.94177)"
-       cx="446.77762"
-       cy="1219.4125"
-       fx="446.77762"
-       fy="1219.4125"
-       r="195.07191" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient3413"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4132361,-7.9650304e-2,-4.1197678e-2,1.0713842,-118.936,-171.0132)"
-       x1="303.01761"
-       y1="237.93179"
-       x2="297.0856"
-       y2="330.09561" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient3415"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0650795,-6.1672141e-2,9.4458503e-2,1.6443046,-176.32201,-222.8692)"
-       x1="378.93771"
-       y1="278.60202"
-       x2="380.27319"
-       y2="243.91606" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient3417"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4785291,4.0425338e-2,3.8864067e-2,1.9024316,886.38099,-330.0292)"
-       x1="381.38742"
-       y1="277.495"
-       x2="380.5517"
-       y2="245.68338" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3419"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.3921823,-2.9764582e-2,-5.7310058e-2,0.5824956,511.39472,44.037525)"
-       x1="379.09573"
-       y1="240.92712"
-       x2="376.79556"
-       y2="281.01636" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3421"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2914159,-3.3330306e-2,5.0610341e-2,0.4881144,138.88252,68.220525)"
-       x1="389.63535"
-       y1="242.28218"
-       x2="387.06866"
-       y2="281.32513" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient3423"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0160687,0,0,1.53779,-135.62501,-213.4822)"
-       spreadMethod="reflect"
-       x1="437.57941"
-       y1="528.87177"
-       x2="437.57941"
-       y2="394.10361" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient3425"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9027839,-7.2174108e-2,0.1573001,2.0039596,-212.66601,-211.1902)"
-       x1="375.17325"
-       y1="419.78485"
-       x2="377.48541"
-       y2="324.03815" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient3427"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3994837,0,0,1.1399824,-151.03701,-198.8092)"
-       x1="320.75104"
-       y1="498.17776"
-       x2="321.32224"
-       y2="614.50439" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3429"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2781848,0,0,0.990788,-110.456,-145.33018)"
-       x1="322.48257"
-       y1="435.26761"
-       x2="323.2514"
-       y2="488.48251" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3431"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7146338,0,0,2.1864338,-135.62501,-212.7572)"
-       x1="411.2215"
-       y1="242.94365"
-       x2="411.2215"
-       y2="331.44858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6810"
-       id="linearGradient3433"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.599201,7.9485483e-2,-0.2318863,1.9097465,10.90312,-180.4374)"
-       x1="855.06372"
-       y1="238.8383"
-       x2="871.15576"
-       y2="315.45914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient3435"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2643925,0,0,1.2357712,-135.62501,-212.7572)"
-       x1="236.25362"
-       y1="657.11133"
-       x2="212.5099"
-       y2="737.41229" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient3437"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.1800109,0.4273134,0.4706466,1.1534176,407.26399,-259.0732)"
-       x1="218.11714"
-       y1="630.30475"
-       x2="203.12654"
-       y2="737.8537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.9523959,0.3464001,0.4208255,0.9487298,393.24899,-109.59418)"
-       x1="117.88966"
-       y1="587.23602"
-       x2="182.24524"
-       y2="704.73077" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0038119,-5.2260066e-2,-1.740863e-2,1.0462687,-76.888003,-73.717475)"
-       x1="223.10072"
-       y1="570.41809"
-       x2="230.53499"
-       y2="710.97723" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient3443"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.523355,0,0,1.0256962,-135.62501,-212.7572)"
-       x1="284.68652"
-       y1="410.46326"
-       x2="285.45923"
-       y2="485.69934" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3445"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7672384,0,0,0.4874752,71.286992,6.5651249)"
-       x1="288.82358"
-       y1="398.85422"
-       x2="288.37628"
-       y2="482.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3447"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2316272,0.2342907,0.7144146,-0.7062927,95.894394,306.75766)"
-       x1="867.34546"
-       y1="234.73897"
-       x2="867.33453"
-       y2="314.83911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3449"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.6104436e-3,-0.1875898,0.5720113,2.3206217e-2,302.55621,308.13463)"
-       x1="892.69696"
-       y1="258.28925"
-       x2="564.89618"
-       y2="281.90463" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient3455"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.1449278,0.2958704,-0.9021871,-0.4419231,1401.2488,-283.33537)"
-       x1="867.34546"
-       y1="234.73897"
-       x2="867.33453"
-       y2="314.83911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6810"
-       id="linearGradient3459"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.6037841,2.836597e-2,6.9037787e-2,1.9225339,1538.2922,-593.33926)"
-       x1="855.06372"
-       y1="238.8383"
-       x2="871.15576"
-       y2="315.45914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5957"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(7.6104436e-3,-0.1875898,0.5720113,2.3206217e-2,313.36793,291.43423)"
-       x1="892.69696"
-       y1="258.28925"
-       x2="564.89618"
-       y2="281.90463" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2316272,0.2342907,0.7144146,-0.7062927,95.894394,306.75766)"
-       x1="867.34546"
-       y1="234.73897"
-       x2="867.33453"
-       y2="314.83911" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7672384,0,0,0.4874752,71.286992,6.5651249)"
-       x1="288.82358"
-       y1="398.85422"
-       x2="288.37628"
-       y2="482.55939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient5967"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.523355,0,0,1.0256962,-135.62501,-212.7572)"
-       x1="284.68652"
-       y1="410.46326"
-       x2="285.45923"
-       y2="485.69934" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5970"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0038119,-5.2260066e-2,-1.740863e-2,1.0462687,-76.888003,-73.717475)"
-       x1="223.10072"
-       y1="570.41809"
-       x2="230.53499"
-       y2="710.97723" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5973"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.9523959,0.3464001,0.4208255,0.9487298,393.24899,-109.59418)"
-       x1="117.88966"
-       y1="587.23602"
-       x2="182.24524"
-       y2="704.73077" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient5976"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.1800109,0.4273134,0.4706466,1.1534176,407.26399,-259.0732)"
-       x1="218.11714"
-       y1="630.30475"
-       x2="203.12654"
-       y2="737.8537" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient162"
-       id="linearGradient5979"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2643925,0,0,1.2357712,-135.62501,-212.7572)"
-       x1="236.25362"
-       y1="657.11133"
-       x2="212.5099"
-       y2="737.41229" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6810"
-       id="linearGradient5982"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.599201,7.9485483e-2,-0.2318863,1.9097465,10.90312,-180.4374)"
-       x1="855.06372"
-       y1="238.8383"
-       x2="871.15576"
-       y2="315.45914" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5985"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7146338,0,0,2.1864338,-135.62501,-212.7572)"
-       x1="411.2215"
-       y1="242.94365"
-       x2="411.2215"
-       y2="331.44858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient5988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2781848,0,0,0.990788,-110.456,-145.33018)"
-       x1="322.48257"
-       y1="435.26761"
-       x2="323.2514"
-       y2="488.48251" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient5991"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3994837,0,0,1.1399824,-151.03701,-198.8092)"
-       x1="320.75104"
-       y1="498.17776"
-       x2="321.32224"
-       y2="614.50439" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5995"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9027839,-7.2174108e-2,0.1573001,2.0039596,-212.66601,-211.1902)"
-       x1="375.17325"
-       y1="419.78485"
-       x2="377.48541"
-       y2="324.03815" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient5998"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0160687,0,0,1.53779,-135.62501,-213.4822)"
-       spreadMethod="reflect"
-       x1="437.57941"
-       y1="528.87177"
-       x2="437.57941"
-       y2="394.10361" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient6001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2914159,-3.3330306e-2,5.0610341e-2,0.4881144,138.88252,68.220525)"
-       x1="389.63535"
-       y1="242.28218"
-       x2="387.06866"
-       y2="281.32513" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient167"
-       id="linearGradient6004"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.3921823,-2.9764582e-2,-5.7310058e-2,0.5824956,511.39472,44.037525)"
-       x1="379.09573"
-       y1="240.92712"
-       x2="376.79556"
-       y2="281.01636" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient6009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4785291,4.0425338e-2,3.8864067e-2,1.9024316,886.38099,-330.0292)"
-       x1="381.38742"
-       y1="277.495"
-       x2="380.5517"
-       y2="245.68338" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient153"
-       id="linearGradient6012"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0650795,-6.1672141e-2,9.4458503e-2,1.6443046,-176.32201,-222.8692)"
-       x1="378.93771"
-       y1="278.60202"
-       x2="380.27319"
-       y2="243.91606" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient6015"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4132361,-7.9650304e-2,-4.1197678e-2,1.0713842,-118.936,-171.0132)"
-       x1="303.01761"
-       y1="237.93179"
-       x2="297.0856"
-       y2="330.09561" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient172"
-       id="radialGradient6020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4818268,0,0,0.3967969,-359.87341,176.94177)"
-       cx="446.77762"
-       cy="1219.4125"
-       fx="446.77762"
-       fy="1219.4125"
-       r="195.07191" />
-  </defs>
-  <g
-     id="g6022">
-    <path
-       d="M 591.23603,660.80083 C 591.23603,703.54984 461.81827,738.20477 302.17337,738.20477 C 142.52846,738.20477 13.110708,703.54984 13.110708,660.80083 C 13.110708,618.05182 142.52846,583.39691 302.17337,583.39691 C 461.81827,583.39691 591.23603,618.05182 591.23603,660.80083 z"
-       id="path3355"
-       style="fill:url(#radialGradient6020);stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path3357"
-       d="M 143.90874,577.54277 C 115.92374,537.26402 110.46624,406.31277 175.76749,325.75527 C 208.12499,287.10777 216.37999,260.17402 218.93124,224.01402 C 220.66749,182.79027 189.77499,59.711525 306.28499,50.334025 C 424.29249,40.919025 417.95499,157.40902 417.27624,219.05277 C 416.71249,271.10277 419.0565,276.31252 445.584,316.88002 C 494.68275,391.41752 526.96749,544.04652 472.77249,613.51152 C 404.12624,700.47152 345.33124,662.75902 306.28499,665.92402 C 233.16874,669.92652 230.75124,708.91277 143.90874,577.54277 z"
-       style="fill:#000000;stroke:none;stroke-width:1.25" />
-    <path
-       sodipodi:nodetypes="cssccc"
-       id="path3359"
-       d="M 437.66398,210.61794 C 450.11848,228.11403 483.19457,249.41586 502.10694,275.91451 C 521.01932,302.41316 477.73746,333.2079 443.1675,314.23928 C 417.44041,300.12277 444.25181,384.39183 467.34598,377.01641 C 614.65479,312.95238 492.4139,250.78608 485.61266,191.90909 C 540.40451,67.355773 400.47822,152.79209 437.66398,210.61794 z"
-       style="fill:#000000;stroke:#000000;stroke-width:1.5625006" />
-    <path
-       d="M 375.15201,109.16012 C 373.96198,140.10802 339.90409,167.06128 299.08159,169.36204 C 258.25909,171.66281 226.13061,148.43982 227.32064,117.49192 C 228.51067,86.544125 262.56856,59.590825 303.39106,57.290125 C 344.21356,54.989325 376.34204,78.212325 375.15201,109.16012 z"
-       id="path3361"
-       style="fill:url(#linearGradient6015);stroke:none;stroke-width:1.26498997" />
-    <path
-       d="M 277.39315,182.77455 C 278.54881,202.89182 268.92216,219.81175 255.89144,220.56628 C 242.86071,221.3208 231.36038,205.62421 230.20473,185.50694 C 229.04907,165.38967 238.67572,148.46972 251.70644,147.71522 C 264.73717,146.96072 276.2375,162.65728 277.39315,182.77455 z"
-       id="path3363"
-       style="fill:url(#linearGradient6012);stroke:none;stroke-width:1.17873001" />
-    <path
-       d="M 301.04358,184.3151 C 301.51907,207.59043 316.56861,226.05786 334.65769,225.56328 C 352.74677,225.06869 367.02541,205.79938 366.54992,182.52405 C 366.07444,159.24872 351.02489,140.78132 332.93581,141.27592 C 314.84674,141.77042 300.5681,161.03977 301.04358,184.3151 z"
-       id="path3365"
-       style="fill:url(#linearGradient6009);stroke:none;stroke-width:0.93138498" />
-    <path
-       d="M 331.21231,191.85453 C 330.93912,204.63094 337.38392,215.00253 345.60719,215.02013 C 353.83046,215.03772 360.7182,204.69466 360.99139,191.91824 C 361.26458,179.14182 354.81978,168.77023 346.59651,168.75264 C 338.37324,168.73505 331.4855,179.07811 331.21231,191.85453 z"
-       id="path3367"
-       style="fill:#000000;stroke:none;stroke-width:1.86495996" />
-    <path
-       d="M 273.01381,188.19365 C 274.04499,198.77003 270.0676,207.92934 264.13008,208.65153 C 258.19256,209.37373 252.54331,201.38533 251.51214,190.80895 C 250.48097,180.23257 254.45835,171.07326 260.39587,170.35107 C 266.33339,169.62887 271.98264,177.61727 273.01381,188.19365 z"
-       id="path3369"
-       style="fill:#000000;stroke:none;stroke-width:2.39814997" />
-    <path
-       d="M 338.4302,184.54815 C 337.72904,191.6747 341.05031,197.74711 345.84847,198.11127 C 350.64663,198.47542 355.10471,192.99342 355.80587,185.86687 C 356.50703,178.74032 353.18576,172.6679 348.3876,172.30374 C 343.58944,171.93959 339.13136,177.42159 338.4302,184.54815 z"
-       id="path3371"
-       style="fill:url(#linearGradient6004);stroke:none;stroke-width:3.1916101" />
-    <path
-       d="M 269.50703,182.58574 C 270.12623,188.55758 267.73791,193.72929 264.17258,194.13707 C 260.60725,194.54485 257.21502,190.03429 256.59583,184.06244 C 255.97663,178.0906 258.36495,172.91889 261.93028,172.51111 C 265.49561,172.10333 268.88784,176.6139 269.50703,182.58574 z"
-       id="path3373"
-       style="fill:url(#linearGradient6001);stroke:none;stroke-width:4.12025976" />
-    <path
-       id="path3375"
-       d="M 187.75249,405.79902 C 203.79749,369.42027 237.89499,305.51652 238.62124,256.10152 C 238.62124,216.79902 356.34499,207.41277 365.79249,246.65402 C 375.23999,285.89527 399.21874,344.75777 414.47999,373.09902 C 429.73999,401.43902 474.24124,491.46777 426.83499,570.03152 C 384.13874,639.58652 254.67874,694.61402 185.57249,560.58527 C 162.31874,514.07652 166.46624,456.44152 187.75249,405.79902 z"
-       style="fill:url(#linearGradient5998);stroke:none;stroke-width:1.25" />
-    <path
-       id="path3377"
-       d="M 173.24559,378.8028 C 159.53586,404.75152 131.00745,472.99595 200.53857,510.33418 C 275.38701,549.97538 275.02711,631.56055 185.18731,592.7418 C 103.05444,557.65452 139.36496,415.87304 162.33593,381.94969 C 177.39745,358.18988 199.98644,329.10722 173.24559,378.8028 z"
-       style="fill:url(#linearGradient5995);stroke:none;stroke-width:1.15804005" />
-    <path
-       id="path3379"
-       d="M 185.01624,349.39277 C 163.18499,385.02777 110.79499,469.15902 180.90624,512.79652 C 275.36749,570.74027 248.62249,628.68527 162.40749,576.51402 C 41.021247,503.68402 147.62624,356.99402 196.32124,301.09152 C 251.87624,238.34152 207.01374,312.45027 185.01624,349.39277 z"
-       style="fill:#000000;stroke:#000000;stroke-width:1.5625" />
-    <path
-       id="path3381"
-       d="M 397.76919,419.60753 C 397.76919,459.32033 359.65441,510.90826 294.21657,510.44511 C 226.73185,511.0026 197.92832,459.32033 197.92832,419.60753 C 197.92832,379.89472 242.69287,347.66452 297.8494,347.66452 C 353.00463,347.66452 397.76919,379.89472 397.76919,419.60753 z"
-       style="font-size:12px;fill:url(#linearGradient5991);stroke:none;stroke-width:1.23705006;stroke-dasharray:none" />
-    <path
-       id="path3383"
-       d="M 362.15979,294.61832 C 361.43347,335.77773 334.64977,345.48709 300.75476,345.48709 C 266.85857,345.48709 242.25502,339.41113 239.34854,294.61832 C 239.34854,266.53917 266.85857,250.28968 300.75476,250.28968 C 334.64977,250.28968 362.15979,266.53917 362.15979,294.61832 z"
-       style="font-size:12px;fill:url(#linearGradient5988);stroke:none;stroke-width:1.38846004;stroke-dasharray:none" />
-    <path
-       id="path3385"
-       d="M 157.23124,357.83652 C 179.37624,324.09152 225.99999,272.38152 165.95249,365.10277 C 117.26374,441.40652 147.94874,490.44402 163.77249,503.90152 C 209.43124,544.60402 207.47999,571.83777 171.76624,550.40902 C 94.734994,504.62652 110.72249,427.59902 157.23124,357.83652 z"
-       style="fill:url(#linearGradient5985);stroke:none;stroke-width:1.25" />
-    <path
-       id="path3387"
-       d="M 462.21568,398.96909 C 450.39659,362.17304 409.96999,267.68577 467.11982,378.94676 C 519.1881,479.53006 466.98563,537.85433 458.30537,543.16377 C 449.62629,548.47226 421.31707,557.63765 431.92723,536.4342 C 442.53632,515.23062 487.08834,478.21682 462.21568,398.96909 z"
-       style="fill:url(#linearGradient5982);fill-opacity:1;stroke:none;stroke-width:1.25" />
-    <path
-       id="path3389"
-       d="M 140.51874,683.39402 C 89.966244,656.62402 16.453747,688.54902 43.141247,615.81152 C 48.486247,599.26402 35.172497,574.55152 43.867497,558.40402 C 54.041247,538.78152 75.842494,543.14277 88.923744,530.06152 C 101.82124,516.44777 109.99749,493.00027 133.97874,496.63402 C 157.95874,500.26777 173.90999,529.71027 190.65874,565.67027 C 203.01249,591.46777 246.83499,627.75027 243.97124,656.61777 C 240.60124,700.99277 190.18749,709.35527 140.51874,683.39402 z"
-       style="fill:url(#linearGradient5979);stroke:#e68c3f;stroke-width:7.8125" />
-    <path
-       id="path3391"
-       d="M 491.31808,670.91489 C 528.39675,625.95042 610.70818,635.17384 555.19701,573.52225 C 543.452,560.30492 546.95774,531.65049 532.68995,519.54726 C 515.71854,504.70652 496.99731,516.87766 479.79512,509.11645 C 462.56223,500.79684 444.55058,484.62292 423.51456,496.12697 C 402.4797,507.6306 400.21642,537.55836 398.23263,576.73647 C 396.49323,604.95714 370.77728,652.14775 384.4305,678.07775 C 404.45332,718.28664 455.96509,712.96302 491.31808,670.91489 z"
-       style="fill:url(#linearGradient5976);stroke:#e68c3f;stroke-width:7.81249762" />
-    <path
-       id="path3393"
-       d="M 475.19239,610.80964 C 532.58685,526.08884 489.81056,526.70588 475.48217,520.29802 C 461.11206,513.43236 445.8707,500.12629 428.97182,509.5003 C 412.07389,518.87396 411.10688,543.40025 410.64335,575.50997 C 410.05505,598.63832 390.69247,637.08007 402.33826,658.54446 C 416.30733,683.56395 450.20934,647.22527 475.19239,610.80964 z"
-       style="fill:url(#linearGradient5973);stroke:none;stroke-width:1.52532005" />
-    <path
-       id="path3395"
-       d="M 128.7701,623.00924 C 42.866706,567.39983 83.051524,548.52024 96.092064,539.78558 C 111.73042,528.58358 111.85185,506.75151 131.06896,508.78839 C 150.28506,510.82534 161.47212,534.4833 174.42831,563.86686 C 183.9948,584.9323 216.82272,612.77142 214.47562,637.07862 C 211.37663,665.56569 165.98235,646.7897 128.7701,623.00924 z"
-       style="fill:url(#linearGradient5970);stroke:none;stroke-width:1.52532005" />
-    <path
-       id="path3397"
-       d="M 251.81749,210.65402 C 260.75124,202.19152 282.83124,176.82152 324.26874,203.46027 C 331.97124,208.47277 338.22124,208.93152 353.04499,215.27902 C 382.70249,227.46527 368.52249,256.85277 337.11499,266.66402 C 323.66749,271.02527 311.44499,287.35902 286.95374,285.96277 C 266.03624,284.74152 260.55499,271.12027 247.70624,263.58027 C 224.86999,250.69152 221.49999,233.26277 233.83124,224.01402 C 246.16374,214.76527 250.98749,211.44027 251.81749,210.65402 z"
-       style="fill:url(#linearGradient5967);stroke:#e68c3f;stroke-width:4.6875" />
-    <path
-       id="path3399"
-       d="M 353.43874,234.29902 C 341.08499,235.02527 314.19749,261.91277 285.85624,261.91277 C 257.51499,261.91277 240.80124,235.75152 236.44124,235.75152"
-       style="fill:none;stroke:#e68c3f;stroke-width:3.125" />
-    <path
-       id="path3401"
-       d="M 265.90246,208.33442 C 270.38995,204.30176 284.54499,193.23548 303.31687,204.56504 C 307.27192,206.80832 311.35631,209.24996 317.43047,212.58509 C 329.462,219.58298 323.50274,229.6676 309.08839,236.04837 C 302.54708,238.72589 291.76316,244.6349 283.55168,244.22151 C 274.42662,243.38281 268.52325,237.43151 262.47546,233.55551 C 251.38073,226.22703 252.05445,220.30969 257.20813,215.38293 C 261.10416,212.00015 265.48554,208.70909 265.90246,208.33442 z"
-       style="fill:url(#linearGradient5963);stroke:none" />
-    <path
-       sodipodi:nodetypes="ccscc"
-       id="path3403"
-       d="M 485.62558,318.40009 C 470.31375,326.6082 417.68681,322.14515 480.02902,326.05185 C 529.45102,323.13335 535.62952,273.72084 534.95116,268.27709 C 534.2728,262.83418 518.48464,252.49699 513.21723,263.8189 C 507.9494,275.14041 526.70967,304.0309 485.62558,318.40009 z"
-       style="fill:url(#linearGradient5960);stroke:none;stroke-width:1.25" />
-    <path
-       sodipodi:nodetypes="ccscc"
-       id="path3405"
-       d="M 473.26296,135.03602 C 463.66338,137.45706 448.44209,148.26182 466.22252,134.32762 C 494.98909,121.13922 505.82847,135.59547 486.85683,175.63681 C 482.71091,184.38715 460.74905,201.85561 454.18436,199.10941 C 500.29783,163.55611 496.08175,126.83432 473.26296,135.03602 z"
-       style="fill:url(#linearGradient5957);stroke:none;stroke-width:1.25" />
-  </g>
-</svg>
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/pdf417.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/pdf417.php
deleted file mode 100644
index d31163b9ed8..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/pdf417.php
+++ /dev/null
@@ -1,1003 +0,0 @@
-<?php
-//============================================================+
-// File name   : pdf417.php
-// Version     : 1.0.003
-// Begin       : 2010-06-03
-// Last Update : 2010-08-08
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2010-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// DESCRIPTION :
-//
-// Class to create PDF417 barcode arrays for TCPDF class.
-// PDF417 (ISO/IEC 15438:2006) is a 2-dimensional stacked bar code created by Symbol Technologies in 1991.
-// It is one of the most popular 2D codes because of its ability to be read with slightly modified handheld laser or linear CCD scanners.
-// TECHNICAL DATA / FEATURES OF PDF417:
-//		Encodable Character Set:     All 128 ASCII Characters (including extended)
-//		Code Type:                   Continuous, Multi-Row
-//		Symbol Height:               3 - 90 Rows
-//		Symbol Width:                90X - 583X
-//		Bidirectional Decoding:      Yes
-//		Error Correction Characters: 2 - 512
-//		Maximum Data Characters:     1850 text, 2710 digits, 1108 bytes
-//
-//============================================================+
-
-/**
- * Class to create PDF417 barcode arrays for TCPDF class.
- * PDF417 (ISO/IEC 15438:2006) is a 2-dimensional stacked bar code created by Symbol Technologies in 1991.
- * (requires PHP bcmath extension)
- * @package com.tecnick.tcpdf
- * @abstract Class to create PDF417 barcode arrays for TCPDF class.
- * @author Nicola Asuni
- * @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.003
- */
-
-// definitions
-if (!defined('PDF417DEFS')) {
-
-	/**
-	 * Indicate that definitions for this class are set
-	 */
-	define('PDF417DEFS', true);
-
-	// -----------------------------------------------------
-
-	/**
-	 * Row height respect X dimension of single module
-	 */
-	define('ROWHEIGHT', 4);
-
-	/**
-	 * Horizontal quiet zone in modules
-	 */
-	define('QUIETH', 2);
-
-	/**
-	 * Vertical quiet zone in modules
-	 */
-	define('QUIETV', 2);
-
-
-
-} // end of definitions
-
-// #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
-
-if (!class_exists('PDF417', false)) {
-
-	/**
-	 * Class to create PDF417 barcode arrays for TCPDF class.
-	 * PDF417 (ISO/IEC 15438:2006) is a 2-dimensional stacked bar code created by Symbol Technologies in 1991.
-	 * @name PDF417
-	 * @package com.tecnick.tcpdf
-	 * @abstract Class to create PDF417 barcode arrays for TCPDF class.
-	 * @author Nicola Asuni
-	 * @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-	 * @link http://www.tcpdf.org
-	 * @license http://www.gnu.org/copyleft/lesser.html LGPL
-	 * @version 1.0.003
-	 */
-	class PDF417 {
-
-		/**
-		 * @var barcode array to be returned which is readable by TCPDF
-		 * @access protected
-		 */
-		protected $barcode_array = array();
-
-		/**
-		 * @var start pattern
-		 * @access protected
-		 */
-		protected $start_pattern = '11111111010101000';
-
-		/**
-		 * @var start pattern
-		 * @access protected
-		 */
-		protected $stop_pattern = '111111101000101001';
-
-		/**
-		 * @var Text Compaction Sub-Modes (values 0xFB - 0xFF are used for submode changers)
-		 * @access protected
-		 */
-		protected $textsubmodes = array(
-			array(0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x20,0xFD,0xFE,0xFF), // Alpha
-			array(0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x20,0xFD,0xFE,0xFF), // Lower
-			array(0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x26,0x0d,0x09,0x2c,0x3a,0x23,0x2d,0x2e,0x24,0x2f,0x2b,0x25,0x2a,0x3d,0x5e,0xFB,0x20,0xFD,0xFE,0xFF), // Mixed
-			array(0x3b,0x3c,0x3e,0x40,0x5b,0x5c,0x5d,0x5f,0x60,0x7e,0x21,0x0d,0x09,0x2c,0x3a,0x0a,0x2d,0x2e,0x24,0x2f,0x22,0x7c,0x2a,0x28,0x29,0x3f,0x7b,0x7d,0x27,0xFF) // Puntuaction
-		);
-
-		/**
-		 * @var Switching codes for Text Compaction Sub-Modes
-		 * @access protected
-		 */
-		protected $textlatch = array(
-			'01' => array(27), '02' => array(28), '03' => array(28,25), //
-			'10' => array(28,28), '12' => array(28), '13' => array(28,25), //
-			'20' => array(28), '21' => array(27), '23' => array(25), //
-			'30' => array(29), '31' => array(29,27), '32' => array(29,28) //
-		);
-
-		/**
-		 * @var clusters of codewords (0, 3, 6)<br/>
-		 * Values are hex equivalents of binary representation of bars (1 = bar, 0 = space).<br/>
-		 * The codewords numbered from 900 to 928 have special meaning, some enable to switch between modes in order to optimise the code:<ul>
-		 * <li>900 : Switch to "Text" mode</li>
-		 * <li>901 : Switch to "Byte" mode</li>
-		 * <li>902 : Switch to "Numeric" mode</li>
-		 * <li>903 - 912 : Reserved</li>
-		 * <li>913 : Switch to "Octet" only for the next codeword</li>
-		 * <li>914 - 920 : Reserved</li>
-		 * <li>921 : Initialization</li>
-		 * <li>922 : Terminator codeword for Macro PDF control block</li>
-		 * <li>923 : Sequence tag to identify the beginning of optional fields in the Macro PDF control block</li>
-		 * <li>924 : Switch to "Byte" mode (If the total number of byte is multiple of 6)</li>
-		 * <li>925 : Identifier for a user defined Extended Channel Interpretation (ECI)</li>
-		 * <li>926 : Identifier for a general purpose ECI format</li>
-		 * <li>927 : Identifier for an ECI of a character set or code page</li>
-		 * <li>928 : Macro marker codeword to indicate the beginning of a Macro PDF Control Block</li>
-		 * </ul>
-		 * @access protected
-		 */
-		protected $clusters = array(
-			array( // cluster 0 -----------------------------------------------------------------------
-				0x1d5c0,0x1eaf0,0x1f57c,0x1d4e0,0x1ea78,0x1f53e,0x1a8c0,0x1d470,0x1a860,0x15040, //  10
-				0x1a830,0x15020,0x1adc0,0x1d6f0,0x1eb7c,0x1ace0,0x1d678,0x1eb3e,0x158c0,0x1ac70, //  20
-				0x15860,0x15dc0,0x1aef0,0x1d77c,0x15ce0,0x1ae78,0x1d73e,0x15c70,0x1ae3c,0x15ef0, //  30
-				0x1af7c,0x15e78,0x1af3e,0x15f7c,0x1f5fa,0x1d2e0,0x1e978,0x1f4be,0x1a4c0,0x1d270, //  40
-				0x1e93c,0x1a460,0x1d238,0x14840,0x1a430,0x1d21c,0x14820,0x1a418,0x14810,0x1a6e0, //  50
-				0x1d378,0x1e9be,0x14cc0,0x1a670,0x1d33c,0x14c60,0x1a638,0x1d31e,0x14c30,0x1a61c, //  60
-				0x14ee0,0x1a778,0x1d3be,0x14e70,0x1a73c,0x14e38,0x1a71e,0x14f78,0x1a7be,0x14f3c, //  70
-				0x14f1e,0x1a2c0,0x1d170,0x1e8bc,0x1a260,0x1d138,0x1e89e,0x14440,0x1a230,0x1d11c, //  80
-				0x14420,0x1a218,0x14410,0x14408,0x146c0,0x1a370,0x1d1bc,0x14660,0x1a338,0x1d19e, //  90
-				0x14630,0x1a31c,0x14618,0x1460c,0x14770,0x1a3bc,0x14738,0x1a39e,0x1471c,0x147bc, // 100
-				0x1a160,0x1d0b8,0x1e85e,0x14240,0x1a130,0x1d09c,0x14220,0x1a118,0x1d08e,0x14210, // 110
-				0x1a10c,0x14208,0x1a106,0x14360,0x1a1b8,0x1d0de,0x14330,0x1a19c,0x14318,0x1a18e, // 120
-				0x1430c,0x14306,0x1a1de,0x1438e,0x14140,0x1a0b0,0x1d05c,0x14120,0x1a098,0x1d04e, // 130
-				0x14110,0x1a08c,0x14108,0x1a086,0x14104,0x141b0,0x14198,0x1418c,0x140a0,0x1d02e, // 140
-				0x1a04c,0x1a046,0x14082,0x1cae0,0x1e578,0x1f2be,0x194c0,0x1ca70,0x1e53c,0x19460, // 150
-				0x1ca38,0x1e51e,0x12840,0x19430,0x12820,0x196e0,0x1cb78,0x1e5be,0x12cc0,0x19670, // 160
-				0x1cb3c,0x12c60,0x19638,0x12c30,0x12c18,0x12ee0,0x19778,0x1cbbe,0x12e70,0x1973c, // 170
-				0x12e38,0x12e1c,0x12f78,0x197be,0x12f3c,0x12fbe,0x1dac0,0x1ed70,0x1f6bc,0x1da60, // 180
-				0x1ed38,0x1f69e,0x1b440,0x1da30,0x1ed1c,0x1b420,0x1da18,0x1ed0e,0x1b410,0x1da0c, // 190
-				0x192c0,0x1c970,0x1e4bc,0x1b6c0,0x19260,0x1c938,0x1e49e,0x1b660,0x1db38,0x1ed9e, // 200
-				0x16c40,0x12420,0x19218,0x1c90e,0x16c20,0x1b618,0x16c10,0x126c0,0x19370,0x1c9bc, // 210
-				0x16ec0,0x12660,0x19338,0x1c99e,0x16e60,0x1b738,0x1db9e,0x16e30,0x12618,0x16e18, // 220
-				0x12770,0x193bc,0x16f70,0x12738,0x1939e,0x16f38,0x1b79e,0x16f1c,0x127bc,0x16fbc, // 230
-				0x1279e,0x16f9e,0x1d960,0x1ecb8,0x1f65e,0x1b240,0x1d930,0x1ec9c,0x1b220,0x1d918, // 240
-				0x1ec8e,0x1b210,0x1d90c,0x1b208,0x1b204,0x19160,0x1c8b8,0x1e45e,0x1b360,0x19130, // 250
-				0x1c89c,0x16640,0x12220,0x1d99c,0x1c88e,0x16620,0x12210,0x1910c,0x16610,0x1b30c, // 260
-				0x19106,0x12204,0x12360,0x191b8,0x1c8de,0x16760,0x12330,0x1919c,0x16730,0x1b39c, // 270
-				0x1918e,0x16718,0x1230c,0x12306,0x123b8,0x191de,0x167b8,0x1239c,0x1679c,0x1238e, // 280
-				0x1678e,0x167de,0x1b140,0x1d8b0,0x1ec5c,0x1b120,0x1d898,0x1ec4e,0x1b110,0x1d88c, // 290
-				0x1b108,0x1d886,0x1b104,0x1b102,0x12140,0x190b0,0x1c85c,0x16340,0x12120,0x19098, // 300
-				0x1c84e,0x16320,0x1b198,0x1d8ce,0x16310,0x12108,0x19086,0x16308,0x1b186,0x16304, // 310
-				0x121b0,0x190dc,0x163b0,0x12198,0x190ce,0x16398,0x1b1ce,0x1638c,0x12186,0x16386, // 320
-				0x163dc,0x163ce,0x1b0a0,0x1d858,0x1ec2e,0x1b090,0x1d84c,0x1b088,0x1d846,0x1b084, // 330
-				0x1b082,0x120a0,0x19058,0x1c82e,0x161a0,0x12090,0x1904c,0x16190,0x1b0cc,0x19046, // 340
-				0x16188,0x12084,0x16184,0x12082,0x120d8,0x161d8,0x161cc,0x161c6,0x1d82c,0x1d826, // 350
-				0x1b042,0x1902c,0x12048,0x160c8,0x160c4,0x160c2,0x18ac0,0x1c570,0x1e2bc,0x18a60, // 360
-				0x1c538,0x11440,0x18a30,0x1c51c,0x11420,0x18a18,0x11410,0x11408,0x116c0,0x18b70, // 370
-				0x1c5bc,0x11660,0x18b38,0x1c59e,0x11630,0x18b1c,0x11618,0x1160c,0x11770,0x18bbc, // 380
-				0x11738,0x18b9e,0x1171c,0x117bc,0x1179e,0x1cd60,0x1e6b8,0x1f35e,0x19a40,0x1cd30, // 390
-				0x1e69c,0x19a20,0x1cd18,0x1e68e,0x19a10,0x1cd0c,0x19a08,0x1cd06,0x18960,0x1c4b8, // 400
-				0x1e25e,0x19b60,0x18930,0x1c49c,0x13640,0x11220,0x1cd9c,0x1c48e,0x13620,0x19b18, // 410
-				0x1890c,0x13610,0x11208,0x13608,0x11360,0x189b8,0x1c4de,0x13760,0x11330,0x1cdde, // 420
-				0x13730,0x19b9c,0x1898e,0x13718,0x1130c,0x1370c,0x113b8,0x189de,0x137b8,0x1139c, // 430
-				0x1379c,0x1138e,0x113de,0x137de,0x1dd40,0x1eeb0,0x1f75c,0x1dd20,0x1ee98,0x1f74e, // 440
-				0x1dd10,0x1ee8c,0x1dd08,0x1ee86,0x1dd04,0x19940,0x1ccb0,0x1e65c,0x1bb40,0x19920, // 450
-				0x1eedc,0x1e64e,0x1bb20,0x1dd98,0x1eece,0x1bb10,0x19908,0x1cc86,0x1bb08,0x1dd86, // 460
-				0x19902,0x11140,0x188b0,0x1c45c,0x13340,0x11120,0x18898,0x1c44e,0x17740,0x13320, // 470
-				0x19998,0x1ccce,0x17720,0x1bb98,0x1ddce,0x18886,0x17710,0x13308,0x19986,0x17708, // 480
-				0x11102,0x111b0,0x188dc,0x133b0,0x11198,0x188ce,0x177b0,0x13398,0x199ce,0x17798, // 490
-				0x1bbce,0x11186,0x13386,0x111dc,0x133dc,0x111ce,0x177dc,0x133ce,0x1dca0,0x1ee58, // 500
-				0x1f72e,0x1dc90,0x1ee4c,0x1dc88,0x1ee46,0x1dc84,0x1dc82,0x198a0,0x1cc58,0x1e62e, // 510
-				0x1b9a0,0x19890,0x1ee6e,0x1b990,0x1dccc,0x1cc46,0x1b988,0x19884,0x1b984,0x19882, // 520
-				0x1b982,0x110a0,0x18858,0x1c42e,0x131a0,0x11090,0x1884c,0x173a0,0x13190,0x198cc, // 530
-				0x18846,0x17390,0x1b9cc,0x11084,0x17388,0x13184,0x11082,0x13182,0x110d8,0x1886e, // 540
-				0x131d8,0x110cc,0x173d8,0x131cc,0x110c6,0x173cc,0x131c6,0x110ee,0x173ee,0x1dc50, // 550
-				0x1ee2c,0x1dc48,0x1ee26,0x1dc44,0x1dc42,0x19850,0x1cc2c,0x1b8d0,0x19848,0x1cc26, // 560
-				0x1b8c8,0x1dc66,0x1b8c4,0x19842,0x1b8c2,0x11050,0x1882c,0x130d0,0x11048,0x18826, // 570
-				0x171d0,0x130c8,0x19866,0x171c8,0x1b8e6,0x11042,0x171c4,0x130c2,0x171c2,0x130ec, // 580
-				0x171ec,0x171e6,0x1ee16,0x1dc22,0x1cc16,0x19824,0x19822,0x11028,0x13068,0x170e8, // 590
-				0x11022,0x13062,0x18560,0x10a40,0x18530,0x10a20,0x18518,0x1c28e,0x10a10,0x1850c, // 600
-				0x10a08,0x18506,0x10b60,0x185b8,0x1c2de,0x10b30,0x1859c,0x10b18,0x1858e,0x10b0c, // 610
-				0x10b06,0x10bb8,0x185de,0x10b9c,0x10b8e,0x10bde,0x18d40,0x1c6b0,0x1e35c,0x18d20, // 620
-				0x1c698,0x18d10,0x1c68c,0x18d08,0x1c686,0x18d04,0x10940,0x184b0,0x1c25c,0x11b40, // 630
-				0x10920,0x1c6dc,0x1c24e,0x11b20,0x18d98,0x1c6ce,0x11b10,0x10908,0x18486,0x11b08, // 640
-				0x18d86,0x10902,0x109b0,0x184dc,0x11bb0,0x10998,0x184ce,0x11b98,0x18dce,0x11b8c, // 650
-				0x10986,0x109dc,0x11bdc,0x109ce,0x11bce,0x1cea0,0x1e758,0x1f3ae,0x1ce90,0x1e74c, // 660
-				0x1ce88,0x1e746,0x1ce84,0x1ce82,0x18ca0,0x1c658,0x19da0,0x18c90,0x1c64c,0x19d90, // 670
-				0x1cecc,0x1c646,0x19d88,0x18c84,0x19d84,0x18c82,0x19d82,0x108a0,0x18458,0x119a0, // 680
-				0x10890,0x1c66e,0x13ba0,0x11990,0x18ccc,0x18446,0x13b90,0x19dcc,0x10884,0x13b88, // 690
-				0x11984,0x10882,0x11982,0x108d8,0x1846e,0x119d8,0x108cc,0x13bd8,0x119cc,0x108c6, // 700
-				0x13bcc,0x119c6,0x108ee,0x119ee,0x13bee,0x1ef50,0x1f7ac,0x1ef48,0x1f7a6,0x1ef44, // 710
-				0x1ef42,0x1ce50,0x1e72c,0x1ded0,0x1ef6c,0x1e726,0x1dec8,0x1ef66,0x1dec4,0x1ce42, // 720
-				0x1dec2,0x18c50,0x1c62c,0x19cd0,0x18c48,0x1c626,0x1bdd0,0x19cc8,0x1ce66,0x1bdc8, // 730
-				0x1dee6,0x18c42,0x1bdc4,0x19cc2,0x1bdc2,0x10850,0x1842c,0x118d0,0x10848,0x18426, // 740
-				0x139d0,0x118c8,0x18c66,0x17bd0,0x139c8,0x19ce6,0x10842,0x17bc8,0x1bde6,0x118c2, // 750
-				0x17bc4,0x1086c,0x118ec,0x10866,0x139ec,0x118e6,0x17bec,0x139e6,0x17be6,0x1ef28, // 760
-				0x1f796,0x1ef24,0x1ef22,0x1ce28,0x1e716,0x1de68,0x1ef36,0x1de64,0x1ce22,0x1de62, // 770
-				0x18c28,0x1c616,0x19c68,0x18c24,0x1bce8,0x19c64,0x18c22,0x1bce4,0x19c62,0x1bce2, // 780
-				0x10828,0x18416,0x11868,0x18c36,0x138e8,0x11864,0x10822,0x179e8,0x138e4,0x11862, // 790
-				0x179e4,0x138e2,0x179e2,0x11876,0x179f6,0x1ef12,0x1de34,0x1de32,0x19c34,0x1bc74, // 800
-				0x1bc72,0x11834,0x13874,0x178f4,0x178f2,0x10540,0x10520,0x18298,0x10510,0x10508, // 810
-				0x10504,0x105b0,0x10598,0x1058c,0x10586,0x105dc,0x105ce,0x186a0,0x18690,0x1c34c, // 820
-				0x18688,0x1c346,0x18684,0x18682,0x104a0,0x18258,0x10da0,0x186d8,0x1824c,0x10d90, // 830
-				0x186cc,0x10d88,0x186c6,0x10d84,0x10482,0x10d82,0x104d8,0x1826e,0x10dd8,0x186ee, // 840
-				0x10dcc,0x104c6,0x10dc6,0x104ee,0x10dee,0x1c750,0x1c748,0x1c744,0x1c742,0x18650, // 850
-				0x18ed0,0x1c76c,0x1c326,0x18ec8,0x1c766,0x18ec4,0x18642,0x18ec2,0x10450,0x10cd0, // 860
-				0x10448,0x18226,0x11dd0,0x10cc8,0x10444,0x11dc8,0x10cc4,0x10442,0x11dc4,0x10cc2, // 870
-				0x1046c,0x10cec,0x10466,0x11dec,0x10ce6,0x11de6,0x1e7a8,0x1e7a4,0x1e7a2,0x1c728, // 880
-				0x1cf68,0x1e7b6,0x1cf64,0x1c722,0x1cf62,0x18628,0x1c316,0x18e68,0x1c736,0x19ee8, // 890
-				0x18e64,0x18622,0x19ee4,0x18e62,0x19ee2,0x10428,0x18216,0x10c68,0x18636,0x11ce8, // 900
-				0x10c64,0x10422,0x13de8,0x11ce4,0x10c62,0x13de4,0x11ce2,0x10436,0x10c76,0x11cf6, // 910
-				0x13df6,0x1f7d4,0x1f7d2,0x1e794,0x1efb4,0x1e792,0x1efb2,0x1c714,0x1cf34,0x1c712, // 920
-				0x1df74,0x1cf32,0x1df72,0x18614,0x18e34,0x18612,0x19e74,0x18e32,0x1bef4),        // 929
-			array( // cluster 3 -----------------------------------------------------------------------
-				0x1f560,0x1fab8,0x1ea40,0x1f530,0x1fa9c,0x1ea20,0x1f518,0x1fa8e,0x1ea10,0x1f50c, //  10
-				0x1ea08,0x1f506,0x1ea04,0x1eb60,0x1f5b8,0x1fade,0x1d640,0x1eb30,0x1f59c,0x1d620, //  20
-				0x1eb18,0x1f58e,0x1d610,0x1eb0c,0x1d608,0x1eb06,0x1d604,0x1d760,0x1ebb8,0x1f5de, //  30
-				0x1ae40,0x1d730,0x1eb9c,0x1ae20,0x1d718,0x1eb8e,0x1ae10,0x1d70c,0x1ae08,0x1d706, //  40
-				0x1ae04,0x1af60,0x1d7b8,0x1ebde,0x15e40,0x1af30,0x1d79c,0x15e20,0x1af18,0x1d78e, //  50
-				0x15e10,0x1af0c,0x15e08,0x1af06,0x15f60,0x1afb8,0x1d7de,0x15f30,0x1af9c,0x15f18, //  60
-				0x1af8e,0x15f0c,0x15fb8,0x1afde,0x15f9c,0x15f8e,0x1e940,0x1f4b0,0x1fa5c,0x1e920, //  70
-				0x1f498,0x1fa4e,0x1e910,0x1f48c,0x1e908,0x1f486,0x1e904,0x1e902,0x1d340,0x1e9b0, //  80
-				0x1f4dc,0x1d320,0x1e998,0x1f4ce,0x1d310,0x1e98c,0x1d308,0x1e986,0x1d304,0x1d302, //  90
-				0x1a740,0x1d3b0,0x1e9dc,0x1a720,0x1d398,0x1e9ce,0x1a710,0x1d38c,0x1a708,0x1d386, // 100
-				0x1a704,0x1a702,0x14f40,0x1a7b0,0x1d3dc,0x14f20,0x1a798,0x1d3ce,0x14f10,0x1a78c, // 110
-				0x14f08,0x1a786,0x14f04,0x14fb0,0x1a7dc,0x14f98,0x1a7ce,0x14f8c,0x14f86,0x14fdc, // 120
-				0x14fce,0x1e8a0,0x1f458,0x1fa2e,0x1e890,0x1f44c,0x1e888,0x1f446,0x1e884,0x1e882, // 130
-				0x1d1a0,0x1e8d8,0x1f46e,0x1d190,0x1e8cc,0x1d188,0x1e8c6,0x1d184,0x1d182,0x1a3a0, // 140
-				0x1d1d8,0x1e8ee,0x1a390,0x1d1cc,0x1a388,0x1d1c6,0x1a384,0x1a382,0x147a0,0x1a3d8, // 150
-				0x1d1ee,0x14790,0x1a3cc,0x14788,0x1a3c6,0x14784,0x14782,0x147d8,0x1a3ee,0x147cc, // 160
-				0x147c6,0x147ee,0x1e850,0x1f42c,0x1e848,0x1f426,0x1e844,0x1e842,0x1d0d0,0x1e86c, // 170
-				0x1d0c8,0x1e866,0x1d0c4,0x1d0c2,0x1a1d0,0x1d0ec,0x1a1c8,0x1d0e6,0x1a1c4,0x1a1c2, // 180
-				0x143d0,0x1a1ec,0x143c8,0x1a1e6,0x143c4,0x143c2,0x143ec,0x143e6,0x1e828,0x1f416, // 190
-				0x1e824,0x1e822,0x1d068,0x1e836,0x1d064,0x1d062,0x1a0e8,0x1d076,0x1a0e4,0x1a0e2, // 200
-				0x141e8,0x1a0f6,0x141e4,0x141e2,0x1e814,0x1e812,0x1d034,0x1d032,0x1a074,0x1a072, // 210
-				0x1e540,0x1f2b0,0x1f95c,0x1e520,0x1f298,0x1f94e,0x1e510,0x1f28c,0x1e508,0x1f286, // 220
-				0x1e504,0x1e502,0x1cb40,0x1e5b0,0x1f2dc,0x1cb20,0x1e598,0x1f2ce,0x1cb10,0x1e58c, // 230
-				0x1cb08,0x1e586,0x1cb04,0x1cb02,0x19740,0x1cbb0,0x1e5dc,0x19720,0x1cb98,0x1e5ce, // 240
-				0x19710,0x1cb8c,0x19708,0x1cb86,0x19704,0x19702,0x12f40,0x197b0,0x1cbdc,0x12f20, // 250
-				0x19798,0x1cbce,0x12f10,0x1978c,0x12f08,0x19786,0x12f04,0x12fb0,0x197dc,0x12f98, // 260
-				0x197ce,0x12f8c,0x12f86,0x12fdc,0x12fce,0x1f6a0,0x1fb58,0x16bf0,0x1f690,0x1fb4c, // 270
-				0x169f8,0x1f688,0x1fb46,0x168fc,0x1f684,0x1f682,0x1e4a0,0x1f258,0x1f92e,0x1eda0, // 280
-				0x1e490,0x1fb6e,0x1ed90,0x1f6cc,0x1f246,0x1ed88,0x1e484,0x1ed84,0x1e482,0x1ed82, // 290
-				0x1c9a0,0x1e4d8,0x1f26e,0x1dba0,0x1c990,0x1e4cc,0x1db90,0x1edcc,0x1e4c6,0x1db88, // 300
-				0x1c984,0x1db84,0x1c982,0x1db82,0x193a0,0x1c9d8,0x1e4ee,0x1b7a0,0x19390,0x1c9cc, // 310
-				0x1b790,0x1dbcc,0x1c9c6,0x1b788,0x19384,0x1b784,0x19382,0x1b782,0x127a0,0x193d8, // 320
-				0x1c9ee,0x16fa0,0x12790,0x193cc,0x16f90,0x1b7cc,0x193c6,0x16f88,0x12784,0x16f84, // 330
-				0x12782,0x127d8,0x193ee,0x16fd8,0x127cc,0x16fcc,0x127c6,0x16fc6,0x127ee,0x1f650, // 340
-				0x1fb2c,0x165f8,0x1f648,0x1fb26,0x164fc,0x1f644,0x1647e,0x1f642,0x1e450,0x1f22c, // 350
-				0x1ecd0,0x1e448,0x1f226,0x1ecc8,0x1f666,0x1ecc4,0x1e442,0x1ecc2,0x1c8d0,0x1e46c, // 360
-				0x1d9d0,0x1c8c8,0x1e466,0x1d9c8,0x1ece6,0x1d9c4,0x1c8c2,0x1d9c2,0x191d0,0x1c8ec, // 370
-				0x1b3d0,0x191c8,0x1c8e6,0x1b3c8,0x1d9e6,0x1b3c4,0x191c2,0x1b3c2,0x123d0,0x191ec, // 380
-				0x167d0,0x123c8,0x191e6,0x167c8,0x1b3e6,0x167c4,0x123c2,0x167c2,0x123ec,0x167ec, // 390
-				0x123e6,0x167e6,0x1f628,0x1fb16,0x162fc,0x1f624,0x1627e,0x1f622,0x1e428,0x1f216, // 400
-				0x1ec68,0x1f636,0x1ec64,0x1e422,0x1ec62,0x1c868,0x1e436,0x1d8e8,0x1c864,0x1d8e4, // 410
-				0x1c862,0x1d8e2,0x190e8,0x1c876,0x1b1e8,0x1d8f6,0x1b1e4,0x190e2,0x1b1e2,0x121e8, // 420
-				0x190f6,0x163e8,0x121e4,0x163e4,0x121e2,0x163e2,0x121f6,0x163f6,0x1f614,0x1617e, // 430
-				0x1f612,0x1e414,0x1ec34,0x1e412,0x1ec32,0x1c834,0x1d874,0x1c832,0x1d872,0x19074, // 440
-				0x1b0f4,0x19072,0x1b0f2,0x120f4,0x161f4,0x120f2,0x161f2,0x1f60a,0x1e40a,0x1ec1a, // 450
-				0x1c81a,0x1d83a,0x1903a,0x1b07a,0x1e2a0,0x1f158,0x1f8ae,0x1e290,0x1f14c,0x1e288, // 460
-				0x1f146,0x1e284,0x1e282,0x1c5a0,0x1e2d8,0x1f16e,0x1c590,0x1e2cc,0x1c588,0x1e2c6, // 470
-				0x1c584,0x1c582,0x18ba0,0x1c5d8,0x1e2ee,0x18b90,0x1c5cc,0x18b88,0x1c5c6,0x18b84, // 480
-				0x18b82,0x117a0,0x18bd8,0x1c5ee,0x11790,0x18bcc,0x11788,0x18bc6,0x11784,0x11782, // 490
-				0x117d8,0x18bee,0x117cc,0x117c6,0x117ee,0x1f350,0x1f9ac,0x135f8,0x1f348,0x1f9a6, // 500
-				0x134fc,0x1f344,0x1347e,0x1f342,0x1e250,0x1f12c,0x1e6d0,0x1e248,0x1f126,0x1e6c8, // 510
-				0x1f366,0x1e6c4,0x1e242,0x1e6c2,0x1c4d0,0x1e26c,0x1cdd0,0x1c4c8,0x1e266,0x1cdc8, // 520
-				0x1e6e6,0x1cdc4,0x1c4c2,0x1cdc2,0x189d0,0x1c4ec,0x19bd0,0x189c8,0x1c4e6,0x19bc8, // 530
-				0x1cde6,0x19bc4,0x189c2,0x19bc2,0x113d0,0x189ec,0x137d0,0x113c8,0x189e6,0x137c8, // 540
-				0x19be6,0x137c4,0x113c2,0x137c2,0x113ec,0x137ec,0x113e6,0x137e6,0x1fba8,0x175f0, // 550
-				0x1bafc,0x1fba4,0x174f8,0x1ba7e,0x1fba2,0x1747c,0x1743e,0x1f328,0x1f996,0x132fc, // 560
-				0x1f768,0x1fbb6,0x176fc,0x1327e,0x1f764,0x1f322,0x1767e,0x1f762,0x1e228,0x1f116, // 570
-				0x1e668,0x1e224,0x1eee8,0x1f776,0x1e222,0x1eee4,0x1e662,0x1eee2,0x1c468,0x1e236, // 580
-				0x1cce8,0x1c464,0x1dde8,0x1cce4,0x1c462,0x1dde4,0x1cce2,0x1dde2,0x188e8,0x1c476, // 590
-				0x199e8,0x188e4,0x1bbe8,0x199e4,0x188e2,0x1bbe4,0x199e2,0x1bbe2,0x111e8,0x188f6, // 600
-				0x133e8,0x111e4,0x177e8,0x133e4,0x111e2,0x177e4,0x133e2,0x177e2,0x111f6,0x133f6, // 610
-				0x1fb94,0x172f8,0x1b97e,0x1fb92,0x1727c,0x1723e,0x1f314,0x1317e,0x1f734,0x1f312, // 620
-				0x1737e,0x1f732,0x1e214,0x1e634,0x1e212,0x1ee74,0x1e632,0x1ee72,0x1c434,0x1cc74, // 630
-				0x1c432,0x1dcf4,0x1cc72,0x1dcf2,0x18874,0x198f4,0x18872,0x1b9f4,0x198f2,0x1b9f2, // 640
-				0x110f4,0x131f4,0x110f2,0x173f4,0x131f2,0x173f2,0x1fb8a,0x1717c,0x1713e,0x1f30a, // 650
-				0x1f71a,0x1e20a,0x1e61a,0x1ee3a,0x1c41a,0x1cc3a,0x1dc7a,0x1883a,0x1987a,0x1b8fa, // 660
-				0x1107a,0x130fa,0x171fa,0x170be,0x1e150,0x1f0ac,0x1e148,0x1f0a6,0x1e144,0x1e142, // 670
-				0x1c2d0,0x1e16c,0x1c2c8,0x1e166,0x1c2c4,0x1c2c2,0x185d0,0x1c2ec,0x185c8,0x1c2e6, // 680
-				0x185c4,0x185c2,0x10bd0,0x185ec,0x10bc8,0x185e6,0x10bc4,0x10bc2,0x10bec,0x10be6, // 690
-				0x1f1a8,0x1f8d6,0x11afc,0x1f1a4,0x11a7e,0x1f1a2,0x1e128,0x1f096,0x1e368,0x1e124, // 700
-				0x1e364,0x1e122,0x1e362,0x1c268,0x1e136,0x1c6e8,0x1c264,0x1c6e4,0x1c262,0x1c6e2, // 710
-				0x184e8,0x1c276,0x18de8,0x184e4,0x18de4,0x184e2,0x18de2,0x109e8,0x184f6,0x11be8, // 720
-				0x109e4,0x11be4,0x109e2,0x11be2,0x109f6,0x11bf6,0x1f9d4,0x13af8,0x19d7e,0x1f9d2, // 730
-				0x13a7c,0x13a3e,0x1f194,0x1197e,0x1f3b4,0x1f192,0x13b7e,0x1f3b2,0x1e114,0x1e334, // 740
-				0x1e112,0x1e774,0x1e332,0x1e772,0x1c234,0x1c674,0x1c232,0x1cef4,0x1c672,0x1cef2, // 750
-				0x18474,0x18cf4,0x18472,0x19df4,0x18cf2,0x19df2,0x108f4,0x119f4,0x108f2,0x13bf4, // 760
-				0x119f2,0x13bf2,0x17af0,0x1bd7c,0x17a78,0x1bd3e,0x17a3c,0x17a1e,0x1f9ca,0x1397c, // 770
-				0x1fbda,0x17b7c,0x1393e,0x17b3e,0x1f18a,0x1f39a,0x1f7ba,0x1e10a,0x1e31a,0x1e73a, // 780
-				0x1ef7a,0x1c21a,0x1c63a,0x1ce7a,0x1defa,0x1843a,0x18c7a,0x19cfa,0x1bdfa,0x1087a, // 790
-				0x118fa,0x139fa,0x17978,0x1bcbe,0x1793c,0x1791e,0x138be,0x179be,0x178bc,0x1789e, // 800
-				0x1785e,0x1e0a8,0x1e0a4,0x1e0a2,0x1c168,0x1e0b6,0x1c164,0x1c162,0x182e8,0x1c176, // 810
-				0x182e4,0x182e2,0x105e8,0x182f6,0x105e4,0x105e2,0x105f6,0x1f0d4,0x10d7e,0x1f0d2, // 820
-				0x1e094,0x1e1b4,0x1e092,0x1e1b2,0x1c134,0x1c374,0x1c132,0x1c372,0x18274,0x186f4, // 830
-				0x18272,0x186f2,0x104f4,0x10df4,0x104f2,0x10df2,0x1f8ea,0x11d7c,0x11d3e,0x1f0ca, // 840
-				0x1f1da,0x1e08a,0x1e19a,0x1e3ba,0x1c11a,0x1c33a,0x1c77a,0x1823a,0x1867a,0x18efa, // 850
-				0x1047a,0x10cfa,0x11dfa,0x13d78,0x19ebe,0x13d3c,0x13d1e,0x11cbe,0x13dbe,0x17d70, // 860
-				0x1bebc,0x17d38,0x1be9e,0x17d1c,0x17d0e,0x13cbc,0x17dbc,0x13c9e,0x17d9e,0x17cb8, // 870
-				0x1be5e,0x17c9c,0x17c8e,0x13c5e,0x17cde,0x17c5c,0x17c4e,0x17c2e,0x1c0b4,0x1c0b2, // 880
-				0x18174,0x18172,0x102f4,0x102f2,0x1e0da,0x1c09a,0x1c1ba,0x1813a,0x1837a,0x1027a, // 890
-				0x106fa,0x10ebe,0x11ebc,0x11e9e,0x13eb8,0x19f5e,0x13e9c,0x13e8e,0x11e5e,0x13ede, // 900
-				0x17eb0,0x1bf5c,0x17e98,0x1bf4e,0x17e8c,0x17e86,0x13e5c,0x17edc,0x13e4e,0x17ece, // 910
-				0x17e58,0x1bf2e,0x17e4c,0x17e46,0x13e2e,0x17e6e,0x17e2c,0x17e26,0x10f5e,0x11f5c, // 920
-				0x11f4e,0x13f58,0x19fae,0x13f4c,0x13f46,0x11f2e,0x13f6e,0x13f2c,0x13f26),        // 929
-			array( // cluster 6 -----------------------------------------------------------------------
-				0x1abe0,0x1d5f8,0x153c0,0x1a9f0,0x1d4fc,0x151e0,0x1a8f8,0x1d47e,0x150f0,0x1a87c, //  10
-				0x15078,0x1fad0,0x15be0,0x1adf8,0x1fac8,0x159f0,0x1acfc,0x1fac4,0x158f8,0x1ac7e, //  20
-				0x1fac2,0x1587c,0x1f5d0,0x1faec,0x15df8,0x1f5c8,0x1fae6,0x15cfc,0x1f5c4,0x15c7e, //  30
-				0x1f5c2,0x1ebd0,0x1f5ec,0x1ebc8,0x1f5e6,0x1ebc4,0x1ebc2,0x1d7d0,0x1ebec,0x1d7c8, //  40
-				0x1ebe6,0x1d7c4,0x1d7c2,0x1afd0,0x1d7ec,0x1afc8,0x1d7e6,0x1afc4,0x14bc0,0x1a5f0, //  50
-				0x1d2fc,0x149e0,0x1a4f8,0x1d27e,0x148f0,0x1a47c,0x14878,0x1a43e,0x1483c,0x1fa68, //  60
-				0x14df0,0x1a6fc,0x1fa64,0x14cf8,0x1a67e,0x1fa62,0x14c7c,0x14c3e,0x1f4e8,0x1fa76, //  70
-				0x14efc,0x1f4e4,0x14e7e,0x1f4e2,0x1e9e8,0x1f4f6,0x1e9e4,0x1e9e2,0x1d3e8,0x1e9f6, //  80
-				0x1d3e4,0x1d3e2,0x1a7e8,0x1d3f6,0x1a7e4,0x1a7e2,0x145e0,0x1a2f8,0x1d17e,0x144f0, //  90
-				0x1a27c,0x14478,0x1a23e,0x1443c,0x1441e,0x1fa34,0x146f8,0x1a37e,0x1fa32,0x1467c, // 100
-				0x1463e,0x1f474,0x1477e,0x1f472,0x1e8f4,0x1e8f2,0x1d1f4,0x1d1f2,0x1a3f4,0x1a3f2, // 110
-				0x142f0,0x1a17c,0x14278,0x1a13e,0x1423c,0x1421e,0x1fa1a,0x1437c,0x1433e,0x1f43a, // 120
-				0x1e87a,0x1d0fa,0x14178,0x1a0be,0x1413c,0x1411e,0x141be,0x140bc,0x1409e,0x12bc0, // 130
-				0x195f0,0x1cafc,0x129e0,0x194f8,0x1ca7e,0x128f0,0x1947c,0x12878,0x1943e,0x1283c, // 140
-				0x1f968,0x12df0,0x196fc,0x1f964,0x12cf8,0x1967e,0x1f962,0x12c7c,0x12c3e,0x1f2e8, // 150
-				0x1f976,0x12efc,0x1f2e4,0x12e7e,0x1f2e2,0x1e5e8,0x1f2f6,0x1e5e4,0x1e5e2,0x1cbe8, // 160
-				0x1e5f6,0x1cbe4,0x1cbe2,0x197e8,0x1cbf6,0x197e4,0x197e2,0x1b5e0,0x1daf8,0x1ed7e, // 170
-				0x169c0,0x1b4f0,0x1da7c,0x168e0,0x1b478,0x1da3e,0x16870,0x1b43c,0x16838,0x1b41e, // 180
-				0x1681c,0x125e0,0x192f8,0x1c97e,0x16de0,0x124f0,0x1927c,0x16cf0,0x1b67c,0x1923e, // 190
-				0x16c78,0x1243c,0x16c3c,0x1241e,0x16c1e,0x1f934,0x126f8,0x1937e,0x1fb74,0x1f932, // 200
-				0x16ef8,0x1267c,0x1fb72,0x16e7c,0x1263e,0x16e3e,0x1f274,0x1277e,0x1f6f4,0x1f272, // 210
-				0x16f7e,0x1f6f2,0x1e4f4,0x1edf4,0x1e4f2,0x1edf2,0x1c9f4,0x1dbf4,0x1c9f2,0x1dbf2, // 220
-				0x193f4,0x193f2,0x165c0,0x1b2f0,0x1d97c,0x164e0,0x1b278,0x1d93e,0x16470,0x1b23c, // 230
-				0x16438,0x1b21e,0x1641c,0x1640e,0x122f0,0x1917c,0x166f0,0x12278,0x1913e,0x16678, // 240
-				0x1b33e,0x1663c,0x1221e,0x1661e,0x1f91a,0x1237c,0x1fb3a,0x1677c,0x1233e,0x1673e, // 250
-				0x1f23a,0x1f67a,0x1e47a,0x1ecfa,0x1c8fa,0x1d9fa,0x191fa,0x162e0,0x1b178,0x1d8be, // 260
-				0x16270,0x1b13c,0x16238,0x1b11e,0x1621c,0x1620e,0x12178,0x190be,0x16378,0x1213c, // 270
-				0x1633c,0x1211e,0x1631e,0x121be,0x163be,0x16170,0x1b0bc,0x16138,0x1b09e,0x1611c, // 280
-				0x1610e,0x120bc,0x161bc,0x1209e,0x1619e,0x160b8,0x1b05e,0x1609c,0x1608e,0x1205e, // 290
-				0x160de,0x1605c,0x1604e,0x115e0,0x18af8,0x1c57e,0x114f0,0x18a7c,0x11478,0x18a3e, // 300
-				0x1143c,0x1141e,0x1f8b4,0x116f8,0x18b7e,0x1f8b2,0x1167c,0x1163e,0x1f174,0x1177e, // 310
-				0x1f172,0x1e2f4,0x1e2f2,0x1c5f4,0x1c5f2,0x18bf4,0x18bf2,0x135c0,0x19af0,0x1cd7c, // 320
-				0x134e0,0x19a78,0x1cd3e,0x13470,0x19a3c,0x13438,0x19a1e,0x1341c,0x1340e,0x112f0, // 330
-				0x1897c,0x136f0,0x11278,0x1893e,0x13678,0x19b3e,0x1363c,0x1121e,0x1361e,0x1f89a, // 340
-				0x1137c,0x1f9ba,0x1377c,0x1133e,0x1373e,0x1f13a,0x1f37a,0x1e27a,0x1e6fa,0x1c4fa, // 350
-				0x1cdfa,0x189fa,0x1bae0,0x1dd78,0x1eebe,0x174c0,0x1ba70,0x1dd3c,0x17460,0x1ba38, // 360
-				0x1dd1e,0x17430,0x1ba1c,0x17418,0x1ba0e,0x1740c,0x132e0,0x19978,0x1ccbe,0x176e0, // 370
-				0x13270,0x1993c,0x17670,0x1bb3c,0x1991e,0x17638,0x1321c,0x1761c,0x1320e,0x1760e, // 380
-				0x11178,0x188be,0x13378,0x1113c,0x17778,0x1333c,0x1111e,0x1773c,0x1331e,0x1771e, // 390
-				0x111be,0x133be,0x177be,0x172c0,0x1b970,0x1dcbc,0x17260,0x1b938,0x1dc9e,0x17230, // 400
-				0x1b91c,0x17218,0x1b90e,0x1720c,0x17206,0x13170,0x198bc,0x17370,0x13138,0x1989e, // 410
-				0x17338,0x1b99e,0x1731c,0x1310e,0x1730e,0x110bc,0x131bc,0x1109e,0x173bc,0x1319e, // 420
-				0x1739e,0x17160,0x1b8b8,0x1dc5e,0x17130,0x1b89c,0x17118,0x1b88e,0x1710c,0x17106, // 430
-				0x130b8,0x1985e,0x171b8,0x1309c,0x1719c,0x1308e,0x1718e,0x1105e,0x130de,0x171de, // 440
-				0x170b0,0x1b85c,0x17098,0x1b84e,0x1708c,0x17086,0x1305c,0x170dc,0x1304e,0x170ce, // 450
-				0x17058,0x1b82e,0x1704c,0x17046,0x1302e,0x1706e,0x1702c,0x17026,0x10af0,0x1857c, // 460
-				0x10a78,0x1853e,0x10a3c,0x10a1e,0x10b7c,0x10b3e,0x1f0ba,0x1e17a,0x1c2fa,0x185fa, // 470
-				0x11ae0,0x18d78,0x1c6be,0x11a70,0x18d3c,0x11a38,0x18d1e,0x11a1c,0x11a0e,0x10978, // 480
-				0x184be,0x11b78,0x1093c,0x11b3c,0x1091e,0x11b1e,0x109be,0x11bbe,0x13ac0,0x19d70, // 490
-				0x1cebc,0x13a60,0x19d38,0x1ce9e,0x13a30,0x19d1c,0x13a18,0x19d0e,0x13a0c,0x13a06, // 500
-				0x11970,0x18cbc,0x13b70,0x11938,0x18c9e,0x13b38,0x1191c,0x13b1c,0x1190e,0x13b0e, // 510
-				0x108bc,0x119bc,0x1089e,0x13bbc,0x1199e,0x13b9e,0x1bd60,0x1deb8,0x1ef5e,0x17a40, // 520
-				0x1bd30,0x1de9c,0x17a20,0x1bd18,0x1de8e,0x17a10,0x1bd0c,0x17a08,0x1bd06,0x17a04, // 530
-				0x13960,0x19cb8,0x1ce5e,0x17b60,0x13930,0x19c9c,0x17b30,0x1bd9c,0x19c8e,0x17b18, // 540
-				0x1390c,0x17b0c,0x13906,0x17b06,0x118b8,0x18c5e,0x139b8,0x1189c,0x17bb8,0x1399c, // 550
-				0x1188e,0x17b9c,0x1398e,0x17b8e,0x1085e,0x118de,0x139de,0x17bde,0x17940,0x1bcb0, // 560
-				0x1de5c,0x17920,0x1bc98,0x1de4e,0x17910,0x1bc8c,0x17908,0x1bc86,0x17904,0x17902, // 570
-				0x138b0,0x19c5c,0x179b0,0x13898,0x19c4e,0x17998,0x1bcce,0x1798c,0x13886,0x17986, // 580
-				0x1185c,0x138dc,0x1184e,0x179dc,0x138ce,0x179ce,0x178a0,0x1bc58,0x1de2e,0x17890, // 590
-				0x1bc4c,0x17888,0x1bc46,0x17884,0x17882,0x13858,0x19c2e,0x178d8,0x1384c,0x178cc, // 600
-				0x13846,0x178c6,0x1182e,0x1386e,0x178ee,0x17850,0x1bc2c,0x17848,0x1bc26,0x17844, // 610
-				0x17842,0x1382c,0x1786c,0x13826,0x17866,0x17828,0x1bc16,0x17824,0x17822,0x13816, // 620
-				0x17836,0x10578,0x182be,0x1053c,0x1051e,0x105be,0x10d70,0x186bc,0x10d38,0x1869e, // 630
-				0x10d1c,0x10d0e,0x104bc,0x10dbc,0x1049e,0x10d9e,0x11d60,0x18eb8,0x1c75e,0x11d30, // 640
-				0x18e9c,0x11d18,0x18e8e,0x11d0c,0x11d06,0x10cb8,0x1865e,0x11db8,0x10c9c,0x11d9c, // 650
-				0x10c8e,0x11d8e,0x1045e,0x10cde,0x11dde,0x13d40,0x19eb0,0x1cf5c,0x13d20,0x19e98, // 660
-				0x1cf4e,0x13d10,0x19e8c,0x13d08,0x19e86,0x13d04,0x13d02,0x11cb0,0x18e5c,0x13db0, // 670
-				0x11c98,0x18e4e,0x13d98,0x19ece,0x13d8c,0x11c86,0x13d86,0x10c5c,0x11cdc,0x10c4e, // 680
-				0x13ddc,0x11cce,0x13dce,0x1bea0,0x1df58,0x1efae,0x1be90,0x1df4c,0x1be88,0x1df46, // 690
-				0x1be84,0x1be82,0x13ca0,0x19e58,0x1cf2e,0x17da0,0x13c90,0x19e4c,0x17d90,0x1becc, // 700
-				0x19e46,0x17d88,0x13c84,0x17d84,0x13c82,0x17d82,0x11c58,0x18e2e,0x13cd8,0x11c4c, // 710
-				0x17dd8,0x13ccc,0x11c46,0x17dcc,0x13cc6,0x17dc6,0x10c2e,0x11c6e,0x13cee,0x17dee, // 720
-				0x1be50,0x1df2c,0x1be48,0x1df26,0x1be44,0x1be42,0x13c50,0x19e2c,0x17cd0,0x13c48, // 730
-				0x19e26,0x17cc8,0x1be66,0x17cc4,0x13c42,0x17cc2,0x11c2c,0x13c6c,0x11c26,0x17cec, // 740
-				0x13c66,0x17ce6,0x1be28,0x1df16,0x1be24,0x1be22,0x13c28,0x19e16,0x17c68,0x13c24, // 750
-				0x17c64,0x13c22,0x17c62,0x11c16,0x13c36,0x17c76,0x1be14,0x1be12,0x13c14,0x17c34, // 760
-				0x13c12,0x17c32,0x102bc,0x1029e,0x106b8,0x1835e,0x1069c,0x1068e,0x1025e,0x106de, // 770
-				0x10eb0,0x1875c,0x10e98,0x1874e,0x10e8c,0x10e86,0x1065c,0x10edc,0x1064e,0x10ece, // 780
-				0x11ea0,0x18f58,0x1c7ae,0x11e90,0x18f4c,0x11e88,0x18f46,0x11e84,0x11e82,0x10e58, // 790
-				0x1872e,0x11ed8,0x18f6e,0x11ecc,0x10e46,0x11ec6,0x1062e,0x10e6e,0x11eee,0x19f50, // 800
-				0x1cfac,0x19f48,0x1cfa6,0x19f44,0x19f42,0x11e50,0x18f2c,0x13ed0,0x19f6c,0x18f26, // 810
-				0x13ec8,0x11e44,0x13ec4,0x11e42,0x13ec2,0x10e2c,0x11e6c,0x10e26,0x13eec,0x11e66, // 820
-				0x13ee6,0x1dfa8,0x1efd6,0x1dfa4,0x1dfa2,0x19f28,0x1cf96,0x1bf68,0x19f24,0x1bf64, // 830
-				0x19f22,0x1bf62,0x11e28,0x18f16,0x13e68,0x11e24,0x17ee8,0x13e64,0x11e22,0x17ee4, // 840
-				0x13e62,0x17ee2,0x10e16,0x11e36,0x13e76,0x17ef6,0x1df94,0x1df92,0x19f14,0x1bf34, // 850
-				0x19f12,0x1bf32,0x11e14,0x13e34,0x11e12,0x17e74,0x13e32,0x17e72,0x1df8a,0x19f0a, // 860
-				0x1bf1a,0x11e0a,0x13e1a,0x17e3a,0x1035c,0x1034e,0x10758,0x183ae,0x1074c,0x10746, // 870
-				0x1032e,0x1076e,0x10f50,0x187ac,0x10f48,0x187a6,0x10f44,0x10f42,0x1072c,0x10f6c, // 880
-				0x10726,0x10f66,0x18fa8,0x1c7d6,0x18fa4,0x18fa2,0x10f28,0x18796,0x11f68,0x18fb6, // 890
-				0x11f64,0x10f22,0x11f62,0x10716,0x10f36,0x11f76,0x1cfd4,0x1cfd2,0x18f94,0x19fb4, // 900
-				0x18f92,0x19fb2,0x10f14,0x11f34,0x10f12,0x13f74,0x11f32,0x13f72,0x1cfca,0x18f8a, // 910
-				0x19f9a,0x10f0a,0x11f1a,0x13f3a,0x103ac,0x103a6,0x107a8,0x183d6,0x107a4,0x107a2, // 920
-				0x10396,0x107b6,0x187d4,0x187d2,0x10794,0x10fb4,0x10792,0x10fb2,0x1c7ea)         // 929
-		); // end of $clusters array
-
-		/**
-		 * @var Factors of the Reed-Solomon polynomial equations used for error correction; one sub array for each correction level (0-8)
-		 * @access protected
-		 */
-		protected $rsfactors = array(
-			array( // ECL 0 (2 factors) -------------------------------------------------------------------------------
-				0x01b,0x395),                                                                                    //   2
-			array( // ECL 1 (4 factors) -------------------------------------------------------------------------------
-				0x20a,0x238,0x2d3,0x329),                                                                        //   4
-			array( // ECL 2 (8 factors) -------------------------------------------------------------------------------
-				0x0ed,0x134,0x1b4,0x11c,0x286,0x28d,0x1ac,0x17b),                                                //   8
-			array( // ECL 3 (16 factors) ------------------------------------------------------------------------------
-				0x112,0x232,0x0e8,0x2f3,0x257,0x20c,0x321,0x084,0x127,0x074,0x1ba,0x1ac,0x127,0x02a,0x0b0,0x041),//  16
-			array( // ECL 4 (32 factors) ------------------------------------------------------------------------------
-				0x169,0x23f,0x39a,0x20d,0x0b0,0x24a,0x280,0x141,0x218,0x2e6,0x2a5,0x2e6,0x2af,0x11c,0x0c1,0x205, //  16
-				0x111,0x1ee,0x107,0x093,0x251,0x320,0x23b,0x140,0x323,0x085,0x0e7,0x186,0x2ad,0x14a,0x03f,0x19a),//  32
-			array( // ECL 5 (64 factors) ------------------------------------------------------------------------------
-				0x21b,0x1a6,0x006,0x05d,0x35e,0x303,0x1c5,0x06a,0x262,0x11f,0x06b,0x1f9,0x2dd,0x36d,0x17d,0x264, //  16
-				0x2d3,0x1dc,0x1ce,0x0ac,0x1ae,0x261,0x35a,0x336,0x21f,0x178,0x1ff,0x190,0x2a0,0x2fa,0x11b,0x0b8, //  32
-				0x1b8,0x023,0x207,0x01f,0x1cc,0x252,0x0e1,0x217,0x205,0x160,0x25d,0x09e,0x28b,0x0c9,0x1e8,0x1f6, //  48
-				0x288,0x2dd,0x2cd,0x053,0x194,0x061,0x118,0x303,0x348,0x275,0x004,0x17d,0x34b,0x26f,0x108,0x21f),//  64
-			array( // ECL 6 (128 factors) -----------------------------------------------------------------------------
-				0x209,0x136,0x360,0x223,0x35a,0x244,0x128,0x17b,0x035,0x30b,0x381,0x1bc,0x190,0x39d,0x2ed,0x19f, //  16
-				0x336,0x05d,0x0d9,0x0d0,0x3a0,0x0f4,0x247,0x26c,0x0f6,0x094,0x1bf,0x277,0x124,0x38c,0x1ea,0x2c0, //  32
-				0x204,0x102,0x1c9,0x38b,0x252,0x2d3,0x2a2,0x124,0x110,0x060,0x2ac,0x1b0,0x2ae,0x25e,0x35c,0x239, //  48
-				0x0c1,0x0db,0x081,0x0ba,0x0ec,0x11f,0x0c0,0x307,0x116,0x0ad,0x028,0x17b,0x2c8,0x1cf,0x286,0x308, //  64
-				0x0ab,0x1eb,0x129,0x2fb,0x09c,0x2dc,0x05f,0x10e,0x1bf,0x05a,0x1fb,0x030,0x0e4,0x335,0x328,0x382, //  80
-				0x310,0x297,0x273,0x17a,0x17e,0x106,0x17c,0x25a,0x2f2,0x150,0x059,0x266,0x057,0x1b0,0x29e,0x268, //  96
-				0x09d,0x176,0x0f2,0x2d6,0x258,0x10d,0x177,0x382,0x34d,0x1c6,0x162,0x082,0x32e,0x24b,0x324,0x022, // 112
-				0x0d3,0x14a,0x21b,0x129,0x33b,0x361,0x025,0x205,0x342,0x13b,0x226,0x056,0x321,0x004,0x06c,0x21b),// 128
-			array( // ECL 7 (256 factors) -----------------------------------------------------------------------------
-				0x20c,0x37e,0x04b,0x2fe,0x372,0x359,0x04a,0x0cc,0x052,0x24a,0x2c4,0x0fa,0x389,0x312,0x08a,0x2d0, //  16
-				0x35a,0x0c2,0x137,0x391,0x113,0x0be,0x177,0x352,0x1b6,0x2dd,0x0c2,0x118,0x0c9,0x118,0x33c,0x2f5, //  32
-				0x2c6,0x32e,0x397,0x059,0x044,0x239,0x00b,0x0cc,0x31c,0x25d,0x21c,0x391,0x321,0x2bc,0x31f,0x089, //  48
-				0x1b7,0x1a2,0x250,0x29c,0x161,0x35b,0x172,0x2b6,0x145,0x0f0,0x0d8,0x101,0x11c,0x225,0x0d1,0x374, //  64
-				0x13b,0x046,0x149,0x319,0x1ea,0x112,0x36d,0x0a2,0x2ed,0x32c,0x2ac,0x1cd,0x14e,0x178,0x351,0x209, //  80
-				0x133,0x123,0x323,0x2c8,0x013,0x166,0x18f,0x38c,0x067,0x1ff,0x033,0x008,0x205,0x0e1,0x121,0x1d6, //  96
-				0x27d,0x2db,0x042,0x0ff,0x395,0x10d,0x1cf,0x33e,0x2da,0x1b1,0x350,0x249,0x088,0x21a,0x38a,0x05a, // 112
-				0x002,0x122,0x2e7,0x0c7,0x28f,0x387,0x149,0x031,0x322,0x244,0x163,0x24c,0x0bc,0x1ce,0x00a,0x086, // 128
-				0x274,0x140,0x1df,0x082,0x2e3,0x047,0x107,0x13e,0x176,0x259,0x0c0,0x25d,0x08e,0x2a1,0x2af,0x0ea, // 144
-				0x2d2,0x180,0x0b1,0x2f0,0x25f,0x280,0x1c7,0x0c1,0x2b1,0x2c3,0x325,0x281,0x030,0x03c,0x2dc,0x26d, // 160
-				0x37f,0x220,0x105,0x354,0x28f,0x135,0x2b9,0x2f3,0x2f4,0x03c,0x0e7,0x305,0x1b2,0x1a5,0x2d6,0x210, // 176
-				0x1f7,0x076,0x031,0x31b,0x020,0x090,0x1f4,0x0ee,0x344,0x18a,0x118,0x236,0x13f,0x009,0x287,0x226, // 192
-				0x049,0x392,0x156,0x07e,0x020,0x2a9,0x14b,0x318,0x26c,0x03c,0x261,0x1b9,0x0b4,0x317,0x37d,0x2f2, // 208
-				0x25d,0x17f,0x0e4,0x2ed,0x2f8,0x0d5,0x036,0x129,0x086,0x036,0x342,0x12b,0x39a,0x0bf,0x38e,0x214, // 224
-				0x261,0x33d,0x0bd,0x014,0x0a7,0x01d,0x368,0x1c1,0x053,0x192,0x029,0x290,0x1f9,0x243,0x1e1,0x0ad, // 240
-				0x194,0x0fb,0x2b0,0x05f,0x1f1,0x22b,0x282,0x21f,0x133,0x09f,0x39c,0x22e,0x288,0x037,0x1f1,0x00a),// 256
-			array( // ECL 8 (512 factors) -----------------------------------------------------------------------------
-				0x160,0x04d,0x175,0x1f8,0x023,0x257,0x1ac,0x0cf,0x199,0x23e,0x076,0x1f2,0x11d,0x17c,0x15e,0x1ec, //  16
-				0x0c5,0x109,0x398,0x09b,0x392,0x12b,0x0e5,0x283,0x126,0x367,0x132,0x058,0x057,0x0c1,0x160,0x30d, //  32
-				0x34e,0x04b,0x147,0x208,0x1b3,0x21f,0x0cb,0x29a,0x0f9,0x15a,0x30d,0x26d,0x280,0x10c,0x31a,0x216, //  48
-				0x21b,0x30d,0x198,0x186,0x284,0x066,0x1dc,0x1f3,0x122,0x278,0x221,0x025,0x35a,0x394,0x228,0x029, //  64
-				0x21e,0x121,0x07a,0x110,0x17f,0x320,0x1e5,0x062,0x2f0,0x1d8,0x2f9,0x06b,0x310,0x35c,0x292,0x2e5, //  80
-				0x122,0x0cc,0x2a9,0x197,0x357,0x055,0x063,0x03e,0x1e2,0x0b4,0x014,0x129,0x1c3,0x251,0x391,0x08e, //  96
-				0x328,0x2ac,0x11f,0x218,0x231,0x04c,0x28d,0x383,0x2d9,0x237,0x2e8,0x186,0x201,0x0c0,0x204,0x102, // 112
-				0x0f0,0x206,0x31a,0x18b,0x300,0x350,0x033,0x262,0x180,0x0a8,0x0be,0x33a,0x148,0x254,0x312,0x12f, // 128
-				0x23a,0x17d,0x19f,0x281,0x09c,0x0ed,0x097,0x1ad,0x213,0x0cf,0x2a4,0x2c6,0x059,0x0a8,0x130,0x192, // 144
-				0x028,0x2c4,0x23f,0x0a2,0x360,0x0e5,0x041,0x35d,0x349,0x200,0x0a4,0x1dd,0x0dd,0x05c,0x166,0x311, // 160
-				0x120,0x165,0x352,0x344,0x33b,0x2e0,0x2c3,0x05e,0x008,0x1ee,0x072,0x209,0x002,0x1f3,0x353,0x21f, // 176
-				0x098,0x2d9,0x303,0x05f,0x0f8,0x169,0x242,0x143,0x358,0x31d,0x121,0x033,0x2ac,0x1d2,0x215,0x334, // 192
-				0x29d,0x02d,0x386,0x1c4,0x0a7,0x156,0x0f4,0x0ad,0x023,0x1cf,0x28b,0x033,0x2bb,0x24f,0x1c4,0x242, // 208
-				0x025,0x07c,0x12a,0x14c,0x228,0x02b,0x1ab,0x077,0x296,0x309,0x1db,0x352,0x2fc,0x16c,0x242,0x38f, // 224
-				0x11b,0x2c7,0x1d8,0x1a4,0x0f5,0x120,0x252,0x18a,0x1ff,0x147,0x24d,0x309,0x2bb,0x2b0,0x02b,0x198, // 240
-				0x34a,0x17f,0x2d1,0x209,0x230,0x284,0x2ca,0x22f,0x03e,0x091,0x369,0x297,0x2c9,0x09f,0x2a0,0x2d9, // 256
-				0x270,0x03b,0x0c1,0x1a1,0x09e,0x0d1,0x233,0x234,0x157,0x2b5,0x06d,0x260,0x233,0x16d,0x0b5,0x304, // 272
-				0x2a5,0x136,0x0f8,0x161,0x2c4,0x19a,0x243,0x366,0x269,0x349,0x278,0x35c,0x121,0x218,0x023,0x309, // 288
-				0x26a,0x24a,0x1a8,0x341,0x04d,0x255,0x15a,0x10d,0x2f5,0x278,0x2b7,0x2ef,0x14b,0x0f7,0x0b8,0x02d, // 304
-				0x313,0x2a8,0x012,0x042,0x197,0x171,0x036,0x1ec,0x0e4,0x265,0x33e,0x39a,0x1b5,0x207,0x284,0x389, // 320
-				0x315,0x1a4,0x131,0x1b9,0x0cf,0x12c,0x37c,0x33b,0x08d,0x219,0x17d,0x296,0x201,0x038,0x0fc,0x155, // 336
-				0x0f2,0x31d,0x346,0x345,0x2d0,0x0e0,0x133,0x277,0x03d,0x057,0x230,0x136,0x2f4,0x299,0x18d,0x328, // 352
-				0x353,0x135,0x1d9,0x31b,0x17a,0x01f,0x287,0x393,0x1cb,0x326,0x24e,0x2db,0x1a9,0x0d8,0x224,0x0f9, // 368
-				0x141,0x371,0x2bb,0x217,0x2a1,0x30e,0x0d2,0x32f,0x389,0x12f,0x34b,0x39a,0x119,0x049,0x1d5,0x317, // 384
-				0x294,0x0a2,0x1f2,0x134,0x09b,0x1a6,0x38b,0x331,0x0bb,0x03e,0x010,0x1a9,0x217,0x150,0x11e,0x1b5, // 400
-				0x177,0x111,0x262,0x128,0x0b7,0x39b,0x074,0x29b,0x2ef,0x161,0x03e,0x16e,0x2b3,0x17b,0x2af,0x34a, // 416
-				0x025,0x165,0x2d0,0x2e6,0x14a,0x005,0x027,0x39b,0x137,0x1a8,0x0f2,0x2ed,0x141,0x036,0x29d,0x13c, // 432
-				0x156,0x12b,0x216,0x069,0x29b,0x1e8,0x280,0x2a0,0x240,0x21c,0x13c,0x1e6,0x2d1,0x262,0x02e,0x290, // 448
-				0x1bf,0x0ab,0x268,0x1d0,0x0be,0x213,0x129,0x141,0x2fa,0x2f0,0x215,0x0af,0x086,0x00e,0x17d,0x1b1, // 464
-				0x2cd,0x02d,0x06f,0x014,0x254,0x11c,0x2e0,0x08a,0x286,0x19b,0x36d,0x29d,0x08d,0x397,0x02d,0x30c, // 480
-				0x197,0x0a4,0x14c,0x383,0x0a5,0x2d6,0x258,0x145,0x1f2,0x28f,0x165,0x2f0,0x300,0x0df,0x351,0x287, // 496
-				0x03f,0x136,0x35f,0x0fb,0x16e,0x130,0x11a,0x2e2,0x2a3,0x19a,0x185,0x0f4,0x01f,0x079,0x12f,0x107) // 512
-		);
-
-		/**
-		 * This is the class constructor.
-		 * Creates a PDF417 object
-		 * @param string $code code to represent using PDF417
-		 * @param int $ecl error correction level (0-8); default -1 = automatic correction level
-		 * @param float $aspectratio the width to height of the symbol (excluding quiet zones)
-		 * òparam array $macro information for macro block
-		 * @access public
-		 */
-		public function __construct($code, $ecl=-1, $aspectratio=2, $macro=array()) {
-			$barcode_array = array();
-			if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
-				return false;
-			}
-			// get the input sequence array
-			$sequence = $this->getInputSequences($code);
-			$codewords = array(); // array of code-words
-			foreach($sequence as $seq) {
-				$cw = $this->getCompaction($seq[0], $seq[1], true);
-				$codewords = array_merge($codewords, $cw);
-			}
-			if ($codewords[0] == 900) {
-				// Text Alpha is the default mode, so remove the first code
-				array_shift($codewords);
-			}
-			// count number of codewords
-			$numcw = count($codewords);
-			if ($numcw > 925) {
-				// reached maximum data codeword capacity
-				return false;
-			}
-			// build macro control block codewords
-			if (!empty($macro)) {
-				$macrocw = array();
-				// beginning of macro control block
-				$macrocw[] = 928;
-				// segment index
-				$cw = $this->getCompaction(902, sprintf('%05d', $macro['segment_index']), false);
-				$macrocw = array_merge($macrocw, $cw);
-				// file ID
-				$cw = $this->getCompaction(900, $macro['file_id'], false);
-				$macrocw = array_merge($macrocw, $cw);
-				// optional fields
-				$optmodes = array(900,902,902,900,900,902,902);
-				$optsize = array(-1,2,4,-1,-1,-1,2);
-				foreach ($optmodes as $k => $omode) {
-					if (isset($macro['option_'.$k])) {
-						$macrocw[] = 923;
-						$macrocw[] = $k;
-						if ($optsize[$k] == 2) {
-							$macro['option_'.$k] = sprintf('%05d', $macro['option_'.$k]);
-						} elseif ($optsize[$k] == 4) {
-							$macro['option_'.$k] = sprintf('%010d', $macro['option_'.$k]);
-						}
-						$cw = $this->getCompaction($omode, $macro['option_'.$k], false);
-						$macrocw = array_merge($macrocw, $cw);
-					}
-				}
-				if ($macro['segment_index'] == ($macro['segment_total'] - 1)) {
-					// end of control block
-					$macrocw[] = 922;
-				}
-				// update total codewords
-				$numcw += count($macrocw);
-			}
-			// set error correction level
-			$ecl = $this->getErrorCorrectionLevel($ecl, $numcw);
-			// number of codewords for error correction
-			$errsize = (2 << $ecl);
-			// calculate number of columns (number of codewords per row) and rows
-			$nce = ($numcw + $errsize + 1);
-			$cols = round((sqrt(4761 + (68 * $aspectratio * ROWHEIGHT * $nce)) - 69) / 34);
-			// adjust cols
-			if ($cols < 1) {
-				$cols = 1;
-			} elseif ($cols > 30) {
-				$cols = 30;
-			}
-			$rows = ceil($nce / $cols);
-			$size = ($cols * $rows);
-			// adjust rows
-			if (($rows < 3) OR ($rows > 90)) {
-				if ($rows < 3) {
-					$rows = 3;
-				} elseif ($rows > 90) {
-					$rows = 90;
-				}
-				$cols = ceil($size / $rows);
-				$size = ($cols * $rows);
-			}
-			if ($size > 928) {
-				// set dimensions to get maximum capacity
-				if (abs($aspectratio - (17 * 29 / 32)) < abs($aspectratio - (17 * 16 / 58))) {
-					$cols = 29;
-					$rows = 32;
-				} else {
-					$cols = 16;
-					$rows = 58;
-				}
-				$size = 928;
-			}
-			// calculate padding
-			$pad = ($size - $nce);
-			if ($pad > 0) {
-				if (($size - $rows) == $nce) {
-					--$rows;
-					$size -= $rows;
-				} else {
-					// add pading
-					$codewords = array_merge($codewords, array_fill(0, $pad, 900));
-				}
-			}
-			if (!empty($macro)) {
-				// add macro section
-				$codewords = array_merge($codewords, $macrocw);
-			}
-			// Symbol Lenght Descriptor (number of data codewords including Symbol Lenght Descriptor and pad codewords)
-			$sld = $size - $errsize;
-			// add symbol length description
-			array_unshift($codewords, $sld);
-			// calculate error correction
-			$ecw = $this->getErrorCorrection($codewords, $ecl);
-			// add error correction codewords
-			$codewords = array_merge($codewords, $ecw);
-			// add horizontal quiet zones to start and stop patterns
-			$pstart = str_repeat('0', QUIETH).$this->start_pattern;
-			$pstop = $this->stop_pattern.str_repeat('0', QUIETH);
-			$barcode_array['num_rows'] = ($rows * ROWHEIGHT) + (2 * QUIETV);
-			$barcode_array['num_cols'] = (($cols + 2) * 17) + 35 + (2 * QUIETH);
-			$barcode_array['bcode'] = array();
-			// build rows for vertical quiet zone
-			if (QUIETV > 0) {
-				$empty_row = array_fill(0, $barcode_array['num_cols'], 0);
-				for ($i = 0; $i < QUIETV; ++$i) {
-					// add vertical quiet rows
-					$barcode_array['bcode'][] = $empty_row;
-				}
-			}
-			$k = 0; // codeword index
-			$cid = 0; // initial cluster
-			// for each row
-			for ($r = 0; $r < $rows; ++$r) {
-				// row start code
-				$row = $pstart;
-				switch ($cid) {
-					case 0: {
-						$L = ((30 * intval($r / 3)) + intval(($rows - 1) / 3));
-						break;
-					}
-					case 1: {
-						$L = ((30 * intval($r / 3)) + ($ecl * 3) + (($rows - 1) % 3));
-						break;
-					}
-					case 2: {
-						$L = ((30 * intval($r / 3)) + ($cols - 1));
-						break;
-					}
-				}
-				// left row indicator
-				$row .= sprintf('%17b', $this->clusters[$cid][$L]);
-				// for each column
-				for ($c = 0; $c < $cols; ++$c) {
-					$row .= sprintf('%17b', $this->clusters[$cid][$codewords[$k]]);
-					++$k;
-				}
-				switch ($cid) {
-					case 0: {
-						$L = ((30 * intval($r / 3)) + ($cols - 1));
-						break;
-					}
-					case 1: {
-						$L = ((30 * intval($r / 3)) + intval(($rows - 1) / 3));
-						break;
-					}
-					case 2: {
-						$L = ((30 * intval($r / 3)) + ($ecl * 3) + (($rows - 1) % 3));
-						break;
-					}
-				}
-				// right row indicator
-				$row .= sprintf('%17b', $this->clusters[$cid][$L]);
-				// row stop code
-				$row .= $pstop;
-				// convert the string to array
-				$arow = preg_split('//', $row, -1, PREG_SPLIT_NO_EMPTY);
-				// duplicate row to get the desired height
-				for ($h = 0; $h < ROWHEIGHT; ++$h) {
-					$barcode_array['bcode'][] = $arow;
-				}
-				++$cid;
-				if ($cid > 2) {
-					$cid = 0;
-				}
-			}
-			if (QUIETV > 0) {
-				for ($i = 0; $i < QUIETV; ++$i) {
-					// add vertical quiet rows
-					$barcode_array['bcode'][] = $empty_row;
-				}
-			}
-			$this->barcode_array = $barcode_array;
-		}
-
-		/**
-		 * Returns a barcode array which is readable by TCPDF
-		 * @return array barcode array readable by TCPDF;
-		 * @access public
-		 */
-		public function getBarcodeArray() {
-			return $this->barcode_array;
-		}
-
-		/**
-		 * Returns the error correction level (0-8) to be used
-		 * @param int $ecl error correction level
-		 * @param int $numcw number of data codewords
-		 * @return int error correction level
-		 * @access protected
-		 */
-		protected function getErrorCorrectionLevel($ecl, $numcw) {
-			// get maximum correction level
-			$maxecl = 8; // starting error level
-			$maxerrsize = (928 - $numcw); // available codewords for error
-			while ($maxecl > 0) {
-				$errsize = (2 << $ecl);
-				if ($maxerrsize >= $errsize) {
-					break;
-				}
-				--$maxecl;
-			}
-			// check for automatic levels
-			if (($ecl < 0) OR ($ecl > 8)) {
-				if ($numcw < 41) {
-					$ecl = 2;
-				} elseif ($numcw < 161) {
-					$ecl = 3;
-				} elseif ($numcw < 321) {
-					$ecl = 4;
-				} elseif ($numcw < 864) {
-					$ecl = 5;
-				} else {
-					$ecl = $maxecl;
-				}
-			}
-			if ($ecl > $maxecl) {
-				$ecl = $maxecl;
-			}
-			return $ecl;
-		}
-
-		/**
-		 * Returns the error correction codewords
-		 * @param array $cw array of codewords including Symbol Lenght Descriptor and pad
-		 * @param int $ecl error correction level 0-8
-		 * @return array of error correction codewords
-		 * @access protected
-		 */
-		protected function getErrorCorrection($cw, $ecl) {
-			// get error correction coefficients
-			$ecc = $this->rsfactors[$ecl];
-			// number of error correction factors
-			$eclsize = (2 << $ecl);
-			// maximum index for $rsfactors[$ecl]
-			$eclmaxid = ($eclsize - 1);
-			// initialize array of error correction codewords
-			$ecw = array_fill(0, $eclsize, 0);
-			// for each data codeword
-			foreach($cw as $k => $d) {
-				$t1 = ($d + $ecw[$eclmaxid]) % 929;
-				for ($j = $eclmaxid; $j > 0; --$j) {
-					$t2 = ($t1 * $ecc[$j]) % 929;
-					$t3 = 929 - $t2;
-					$ecw[$j] = ($ecw[($j - 1)] + $t3) % 929;
-				}
-				$t2 = ($t1 * $ecc[0]) % 929;
-				$t3 = 929 - $t2;
-				$ecw[0] = $t3 % 929;
-			}
-			foreach($ecw as $j => $e) {
-				if ($e != 0) {
-					$ecw[$j] = 929 - $e;
-				}
-			}
-			$ecw = array_reverse($ecw);
-			return $ecw;
-		}
-
-		/**
-		 * Create array of sequences from input
-		 * @param string $code code
-		 * @return bidimensional array containing characters and classification
-		 * @access protected
-		 */
-		protected function getInputSequences($code) {
-			$sequence_array = array(); // array to be returned
-			$numseq = array();
-			// get numeric sequences
-			preg_match_all('/([0-9]{13,})/', $code, $numseq, PREG_OFFSET_CAPTURE);
-			$numseq[1][] = array('', strlen($code));
-			$offset = 0;
-			foreach($numseq[1] as $seq) {
-				$seqlen = strlen($seq[0]);
-				if ($seq[1] > 0) {
-					// extract text sequence before the number sequence
-					$prevseq = substr($code, $offset, ($seq[1] - $offset));
-					$textseq = array();
-					// get text sequences
-					preg_match_all('/([\x09\x0a\x0d\x20-\x7e]{5,})/', $prevseq, $textseq, PREG_OFFSET_CAPTURE);
-					$textseq[1][] = array('', strlen($prevseq));
-					$txtoffset = 0;
-					foreach($textseq[1] as $txtseq) {
-						$txtseqlen = strlen($txtseq[0]);
-						if ($txtseq[1] > 0) {
-							// extract byte sequence before the text sequence
-							$prevtxtseq = substr($prevseq, $txtoffset, ($txtseq[1] - $txtoffset));
-							if (strlen($prevtxtseq) > 0) {
-								// add BYTE sequence
-								if ((strlen($prevtxtseq) == 1) AND ((count($sequence_array) > 0) AND ($sequence_array[(count($sequence_array) - 1)][0] == 900))) {
-									$sequence_array[] = array(913, $prevtxtseq);
-								} elseif ((strlen($prevtxtseq) % 6) == 0) {
-									$sequence_array[] = array(924, $prevtxtseq);
-								} else {
-									$sequence_array[] = array(901, $prevtxtseq);
-								}
-							}
-						}
-						if ($txtseqlen > 0) {
-							// add numeric sequence
-							$sequence_array[] = array(900, $txtseq[0]);
-						}
-						$txtoffset = $txtseq[1] + $txtseqlen;
-					}
-				}
-				if ($seqlen > 0) {
-					// add numeric sequence
-					$sequence_array[] = array(902, $seq[0]);
-				}
-				$offset = $seq[1] + $seqlen;
-			}
-			return $sequence_array;
-		}
-
-		/**
-		 * Compact data by mode.
-		 * @param int $mode compaction mode number
-		 * @param string $code data to compact
-		 * @param boolean $addmode if true add the mode codeword at first position
-		 * @return array of codewords
-		 * @access protected
-		 */
-		protected function getCompaction($mode, $code, $addmode=true) {
-			$cw = array(); // array of codewords to return
-			switch($mode) {
-				case 900: { // Text Compaction mode latch
-					$submode = 0; // default Alpha sub-mode
-					$txtarr = array(); // array of characters and sub-mode switching characters
-					$codelen = strlen($code);
-					for ($i = 0; $i < $codelen; ++$i) {
-						$chval = ord($code{$i});
-						if (($k = array_search($chval, $this->textsubmodes[$submode])) !== false) {
-							// we are on the same sub-mode
-							$txtarr[] = $k;
-						} else {
-							// the sub-mode is changed
-							for ($s = 0; $s < 4; ++$s) {
-								// search new sub-mode
-								if (($s != $submode) AND (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) {
-									// $s is the new submode
-									if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code{($i + 1)}), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) {
-										// shift (temporary change only for this char)
-										if ($s == 3) {
-											// shift to puntuaction
-											$txtarr[] = 29;
-										} else {
-											// shift from lower to alpha
-											$txtarr[] = 27;
-										}
-									} else {
-										// latch
-										$txtarr	= array_merge($txtarr, $this->textlatch[''.$submode.$s]);
-										// set new submode
-										$submode = $s;
-									}
-									// add characted code to array
-									$txtarr[] = $k;
-									break;
-								}
-							}
-						}
-					}
-					$txtarrlen = count($txtarr);
-					if (($txtarrlen % 2) != 0) {
-						// add padding
-						$txtarr[] = 29;
-						++$txtarrlen;
-					}
-					// calculate codewords
-					for ($i = 0; $i < $txtarrlen; $i += 2) {
-						$cw[] = (30 * $txtarr[$i]) + $txtarr[($i + 1)];
-					}
-					break;
-				}
-				case 901:
-				case 924: { // Byte Compaction mode latch
-					while (($codelen = strlen($code)) > 0) {
-						if ($codelen > 6) {
-							$rest = substr($code, 6);
-							$code = substr($code, 0, 6);
-							$sublen = 6;
-						} else {
-							$rest = '';
-							$sublen = strlen($code);
-						}
-						if ($sublen == 6) {
-							$t = bcmul(''.ord($code{0}), '1099511627776');
-							$t = bcadd($t, bcmul(''.ord($code{1}), '4294967296'));
-							$t = bcadd($t, bcmul(''.ord($code{2}), '16777216'));
-							$t = bcadd($t, bcmul(''.ord($code{3}), '65536'));
-							$t = bcadd($t, bcmul(''.ord($code{4}), '256'));
-							$t = bcadd($t, ''.ord($code{5}));
-							do {
-								$d = bcmod($t, '900');
-								$t = bcdiv($t, '900');
-								array_unshift($cw, $d);
-							} while ($t != '0');
-						} else {
-							for ($i = 0; $i < $sublen; ++$i) {
-								$cw[] = ord($code{$i});
-							}
-						}
-						$code = $rest;
-					}
-					break;
-				}
-				case 902: { // Numeric Compaction mode latch
-					while (($codelen = strlen($code)) > 0) {
-						if ($codelen > 44) {
-							$rest = substr($code, 44);
-							$code = substr($code, 0, 44);
-						} else {
-							$rest = '';
-						}
-						$t = '1'.$code;
-						do {
-							$d = bcmod($t, '900');
-							$t = bcdiv($t, '900');
-							array_unshift($cw, $d);
-						} while ($t != '0');
-						$code = $rest;
-					}
-					break;
-				}
-				case 913: { // Byte Compaction mode shift
-					$cw[] = ord($code);
-					break;
-				}
-			}
-			if ($addmode) {
-				// add the compaction mode codeword at the beginning
-				array_unshift($cw, $mode);
-			}
-			return $cw;
-		}
-
-	} // end PDF417 class
-
-} // END OF "class_exists PDF417"
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/qrcode.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/qrcode.php
deleted file mode 100644
index 636b07e81d4..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/qrcode.php
+++ /dev/null
@@ -1,2879 +0,0 @@
-<?php
-//============================================================+
-// File name   : qrcode.php
-// Version     : 1.0.006
-// Begin       : 2010-03-22
-// Last Update : 2010-08-30
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2010-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// DESCRIPTION :
-//
-// Class to create QR-code arrays for TCPDF class.
-// QR Code symbol is a 2D barcode that can be scanned by
-// handy terminals such as a mobile phone with CCD.
-// The capacity of QR Code is up to 7000 digits or 4000
-// characters, and has high robustness.
-// This class supports QR Code model 2, described in
-// JIS (Japanese Industrial Standards) X0510:2004
-// or ISO/IEC 18004.
-// Currently the following features are not supported:
-// ECI and FNC1 mode, Micro QR Code, QR Code model 1,
-// Structured mode.
-//
-// This class is derived from the following projects:
-// ---------------------------------------------------------
-// "PHP QR Code encoder"
-// License: GNU-LGPLv3
-// Copyright (C) 2010 by Dominik Dzienia <deltalab at poczta dot fm>
-// http://phpqrcode.sourceforge.net/
-// https://sourceforge.net/projects/phpqrcode/
-//
-// The "PHP QR Code encoder" is based on
-// "C libqrencode library" (ver. 3.1.1)
-// License: GNU-LGPL 2.1
-// Copyright (C) 2006-2010 by Kentaro Fukuchi
-// http://megaui.net/fukuchi/works/qrencode/index.en.html
-//
-// Reed-Solomon code encoder is written by Phil Karn, KA9Q.
-// Copyright (C) 2002-2006 Phil Karn, KA9Q
-//
-// QR Code is registered trademark of DENSO WAVE INCORPORATED
-// http://www.denso-wave.com/qrcode/index-e.html
-// ---------------------------------------------------------
-//============================================================+
-
-/**
- * Class to create QR-code arrays for TCPDF class.
- * QR Code symbol is a 2D barcode that can be scanned by handy terminals such as a mobile phone with CCD.
- * The capacity of QR Code is up to 7000 digits or 4000 characters, and has high robustness.
- * This class supports QR Code model 2, described in JIS (Japanese Industrial Standards) X0510:2004 or ISO/IEC 18004.
- * Currently the following features are not supported: ECI and FNC1 mode, Micro QR Code, QR Code model 1, Structured mode.
- *
- * This class is derived from "PHP QR Code encoder" by Dominik Dzienia (http://phpqrcode.sourceforge.net/) based on "libqrencode C library 3.1.1." by Kentaro Fukuchi (http://megaui.net/fukuchi/works/qrencode/index.en.html), contains Reed-Solomon code written by Phil Karn, KA9Q. QR Code is registered trademark of DENSO WAVE INCORPORATED (http://www.denso-wave.com/qrcode/index-e.html).
- * Please read comments on this class source file for full copyright and license information.
- *
- * @package com.tecnick.tcpdf
- * @abstract Class for generating QR-code array for TCPDF.
- * @author Nicola Asuni
- * @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.006
- */
-
-// definitions
-if (!defined('QRCODEDEFS')) {
-
-	/**
-	 * Indicate that definitions for this class are set
-	 */
-	define('QRCODEDEFS', true);
-
-	// -----------------------------------------------------
-
-	// Encoding modes (characters which can be encoded in QRcode)
-
-	/**
-	 * Encoding mode
-	 */
-	define('QR_MODE_NL', -1);
-
-	/**
-	 * Encoding mode numeric (0-9). 3 characters are encoded to 10bit length. In theory, 7089 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_NM', 0);
-
-	/**
-	 * Encoding mode alphanumeric (0-9A-Z $%*+-./:) 45characters. 2 characters are encoded to 11bit length. In theory, 4296 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_AN', 1);
-
-	/**
-	 * Encoding mode 8bit byte data. In theory, 2953 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_8B', 2);
-
-	/**
-	 * Encoding mode KANJI. A KANJI character (multibyte character) is encoded to 13bit length. In theory, 1817 characters or less can be stored in a QRcode.
-	 */
-	define('QR_MODE_KJ', 3);
-
-	/**
-	 * Encoding mode STRUCTURED (currently unsupported)
-	 */
-	define('QR_MODE_ST', 4);
-
-	// -----------------------------------------------------
-
-	// Levels of error correction.
-	// QRcode has a function of an error correcting for miss reading that white is black.
-	// Error correcting is defined in 4 level as below.
-
-	/**
-	 * Error correction level L : About 7% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_L', 0);
-
-	/**
-	 * Error correction level M : About 15% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_M', 1);
-
-	/**
-	 * Error correction level Q : About 25% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_Q', 2);
-
-	/**
-	 * Error correction level H : About 30% or less errors can be corrected.
-	 */
-	define('QR_ECLEVEL_H', 3);
-
-	// -----------------------------------------------------
-
-	// Version. Size of QRcode is defined as version.
-	// Version is from 1 to 40.
-	// Version 1 is 21*21 matrix. And 4 modules increases whenever 1 version increases.
-	// So version 40 is 177*177 matrix.
-
-	/**
-	 * Maximum QR Code version.
-	 */
-	define('QRSPEC_VERSION_MAX', 40);
-
-	/**
-	 * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
-	 */
-    define('QRSPEC_WIDTH_MAX', 177);
-
-	// -----------------------------------------------------
-
-	/**
-	 * Matrix index to get width from $capacity array.
-	 */
-    define('QRCAP_WIDTH',    0);
-
-    /**
-	 * Matrix index to get number of words from $capacity array.
-	 */
-    define('QRCAP_WORDS',    1);
-
-    /**
-	 * Matrix index to get remainder from $capacity array.
-	 */
-    define('QRCAP_REMINDER', 2);
-
-    /**
-	 * Matrix index to get error correction level from $capacity array.
-	 */
-    define('QRCAP_EC',       3);
-
-	// -----------------------------------------------------
-
-	// Structure (currently usupported)
-
-	/**
-	 * Number of header bits for structured mode
-	 */
-    define('STRUCTURE_HEADER_BITS',  20);
-
-    /**
-	 * Max number of symbols for structured mode
-	 */
-    define('MAX_STRUCTURED_SYMBOLS', 16);
-
-	// -----------------------------------------------------
-
-    // Masks
-
-    /**
-	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
-	 */
-    define('N1',  3);
-
-    /**
-	 * Down point base value for case 2 mask pattern (module block of same color)
-	 */
-	define('N2',  3);
-
-    /**
-	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
-	 */
-	define('N3', 40);
-
-    /**
-	 * Down point base value for case 4 mask pattern (ration of dark modules in whole)
-	 */
-	define('N4', 10);
-
-	// -----------------------------------------------------
-
-	// Optimization settings
-
-	/**
-	 * if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
-	 */
-	define('QR_FIND_BEST_MASK', true);
-
-	/**
-	 * if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
-	 */
-	define('QR_FIND_FROM_RANDOM', 2);
-
-	/**
-	 * when QR_FIND_BEST_MASK === false
-	 */
-	define('QR_DEFAULT_MASK', 2);
-
-	// -----------------------------------------------------
-
-} // end of definitions
-
-// #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
-
-if (!class_exists('QRcode', false)) {
-
-	// for compatibility with PHP4
-	if (!function_exists('str_split')) {
-    	/**
-    	 * Convert a string to an array (needed for PHP4 compatibility)
-    	 * @param string $string The input string.
-    	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-    	 */
-		function str_split($string, $split_length=1) {
-			if ((strlen($string) > $split_length) OR (!$split_length)) {
-				do {
-					$c = strlen($string);
-					$parts[] = substr($string, 0, $split_length);
-					$string = substr($string, $split_length);
-				} while ($string !== false);
-			} else {
-				$parts = array($string);
-			}
-			return $parts;
-		}
-	}
-
-	// #####################################################
-
-	/**
-	 * Class to create QR-code arrays for TCPDF class.
-	 * QR Code symbol is a 2D barcode that can be scanned by handy terminals such as a mobile phone with CCD.
-	 * The capacity of QR Code is up to 7000 digits or 4000 characters, and has high robustness.
-	 * This class supports QR Code model 2, described in JIS (Japanese Industrial Standards) X0510:2004 or ISO/IEC 18004.
-	 * Currently the following features are not supported: ECI and FNC1 mode, Micro QR Code, QR Code model 1, Structured mode.
-	 *
-	 * This class is derived from "PHP QR Code encoder" by Dominik Dzienia (http://phpqrcode.sourceforge.net/) based on "libqrencode C library 3.1.1." by Kentaro Fukuchi (http://megaui.net/fukuchi/works/qrencode/index.en.html), contains Reed-Solomon code written by Phil Karn, KA9Q. QR Code is registered trademark of DENSO WAVE INCORPORATED (http://www.denso-wave.com/qrcode/index-e.html).
-	 * Please read comments on this class source file for full copyright and license information.
-	 *
-	 * @name QRcode
-	 * @package com.tecnick.tcpdf
-	 * @abstract Class for generating QR-code array for TCPDF.
-	 * @author Nicola Asuni
-	 * @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-	 * @link http://www.tcpdf.org
-	 * @license http://www.gnu.org/copyleft/lesser.html LGPL
-	 * @version 1.0.006
-	 */
-	class QRcode {
-
-		/**
-		 * @var barcode array to be returned which is readable by TCPDF
-		 * @access protected
-		 */
-		protected $barcode_array = array();
-
-		/**
-		 * @var QR code version. Size of QRcode is defined as version. Version is from 1 to 40. Version 1 is 21*21 matrix. And 4 modules increases whenever 1 version increases. So version 40 is 177*177 matrix.
-		 * @access protected
-		 */
-		protected $version = 0;
-
-		/**
-		 * @var Levels of error correction. See definitions for possible values.
-		 * @access protected
-		 */
-		protected $level = QR_ECLEVEL_L;
-
-		/**
-		 * @var Encoding mode
-		 * @access protected
-		 */
-		protected $hint = QR_MODE_8B;
-
-		/**
-		 * @var if true the input string will be converted to uppercase
-		 * @access protected
-		 */
-		protected $casesensitive = true;
-
-		/**
-		 * @var structured QR code (not supported yet)
-		 * @access protected
-		 */
-		protected $structured = 0;
-
-		/**
-		 * @var mask data
-		 * @access protected
-		 */
-		protected $data;
-
-		// FrameFiller
-
-		/**
-		 * @var width
-		 * @access protected
-		 */
-		protected $width;
-
-		/**
-		 * @var frame
-		 * @access protected
-		 */
-		protected $frame;
-
-		/**
-		 * @var X position of bit
-		 * @access protected
-		 */
-		protected $x;
-
-		/**
-		 * @var Y position of bit
-		 * @access protected
-		 */
-		protected $y;
-
-		/**
-		 * @var direction
-		 * @access protected
-		 */
-		protected $dir;
-
-		/**
-		 * @var single bit
-		 * @access protected
-		 */
-		protected $bit;
-
-		// ---- QRrawcode ----
-
-		/**
-		 * @var data code
-		 * @access protected
-		 */
-		protected $datacode = array();
-
-		/**
-		 * @var error correction code
-		 * @access protected
-		 */
-		protected $ecccode = array();
-
-		/**
-		 * @var blocks
-		 * @access protected
-		 */
-		protected $blocks;
-
-		/**
-		 * @var Reed-Solomon blocks
-		 * @access protected
-		 */
-		protected $rsblocks = array(); //of RSblock
-
-		/**
-		 * @var counter
-		 * @access protected
-		 */
-		protected $count;
-
-		/**
-		 * @var data length
-		 * @access protected
-		 */
-		protected $dataLength;
-
-		/**
-		 * @var error correction length
-		 * @access protected
-		 */
-		protected $eccLength;
-
-		/**
-		 * @var b1
-		 * @access protected
-		 */
-		protected $b1;
-
-		// ---- QRmask ----
-
-		/**
-		 * @var run length
-		 * @access protected
-		 */
-		protected $runLength = array();
-
-		// ---- QRsplit ----
-
-		/**
-		 * @var input data string
-		 * @access protected
-		 */
-		protected $dataStr = '';
-
-		/**
-		 * @var input items
-		 * @access protected
-		 */
-		protected $items;
-
-		// Reed-Solomon items
-
-		/**
-		 * @var Reed-Solomon items
-		 * @access protected
-		 */
-		protected $rsitems = array();
-
-		/**
-		 * @var array of frames
-		 * @access protected
-		 */
-		protected $frames = array();
-
-		/**
-		 * @var alphabet-numeric convesion table
-		 * @access protected
-		 */
-		protected $anTable = array(
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
-			36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, //
-			 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1, //
-			-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //
-			25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, //
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1  //
-			);
-
-		/**
-		 * @var array Table of the capacity of symbols
-		 * See Table 1 (pp.13) and Table 12-16 (pp.30-36), JIS X0510:2004.
-		 * @access protected
-		 */
-		protected $capacity = array(
-			array(  0,    0, 0, array(   0,    0,    0,    0)), //
-			array( 21,   26, 0, array(   7,   10,   13,   17)), //  1
-			array( 25,   44, 7, array(  10,   16,   22,   28)), //
-			array( 29,   70, 7, array(  15,   26,   36,   44)), //
-			array( 33,  100, 7, array(  20,   36,   52,   64)), //
-			array( 37,  134, 7, array(  26,   48,   72,   88)), //  5
-			array( 41,  172, 7, array(  36,   64,   96,  112)), //
-			array( 45,  196, 0, array(  40,   72,  108,  130)), //
-			array( 49,  242, 0, array(  48,   88,  132,  156)), //
-			array( 53,  292, 0, array(  60,  110,  160,  192)), //
-			array( 57,  346, 0, array(  72,  130,  192,  224)), // 10
-			array( 61,  404, 0, array(  80,  150,  224,  264)), //
-			array( 65,  466, 0, array(  96,  176,  260,  308)), //
-			array( 69,  532, 0, array( 104,  198,  288,  352)), //
-			array( 73,  581, 3, array( 120,  216,  320,  384)), //
-			array( 77,  655, 3, array( 132,  240,  360,  432)), // 15
-			array( 81,  733, 3, array( 144,  280,  408,  480)), //
-			array( 85,  815, 3, array( 168,  308,  448,  532)), //
-			array( 89,  901, 3, array( 180,  338,  504,  588)), //
-			array( 93,  991, 3, array( 196,  364,  546,  650)), //
-			array( 97, 1085, 3, array( 224,  416,  600,  700)), // 20
-			array(101, 1156, 4, array( 224,  442,  644,  750)), //
-			array(105, 1258, 4, array( 252,  476,  690,  816)), //
-			array(109, 1364, 4, array( 270,  504,  750,  900)), //
-			array(113, 1474, 4, array( 300,  560,  810,  960)), //
-			array(117, 1588, 4, array( 312,  588,  870, 1050)), // 25
-			array(121, 1706, 4, array( 336,  644,  952, 1110)), //
-			array(125, 1828, 4, array( 360,  700, 1020, 1200)), //
-			array(129, 1921, 3, array( 390,  728, 1050, 1260)), //
-			array(133, 2051, 3, array( 420,  784, 1140, 1350)), //
-			array(137, 2185, 3, array( 450,  812, 1200, 1440)), // 30
-			array(141, 2323, 3, array( 480,  868, 1290, 1530)), //
-			array(145, 2465, 3, array( 510,  924, 1350, 1620)), //
-			array(149, 2611, 3, array( 540,  980, 1440, 1710)), //
-			array(153, 2761, 3, array( 570, 1036, 1530, 1800)), //
-			array(157, 2876, 0, array( 570, 1064, 1590, 1890)), // 35
-			array(161, 3034, 0, array( 600, 1120, 1680, 1980)), //
-			array(165, 3196, 0, array( 630, 1204, 1770, 2100)), //
-			array(169, 3362, 0, array( 660, 1260, 1860, 2220)), //
-			array(173, 3532, 0, array( 720, 1316, 1950, 2310)), //
-			array(177, 3706, 0, array( 750, 1372, 2040, 2430))  // 40
-		);
-
-		/**
-		 * @var array Length indicator
-		 * @access protected
-		 */
-		protected $lengthTableBits = array(
-			array(10, 12, 14),
-			array( 9, 11, 13),
-			array( 8, 16, 16),
-			array( 8, 10, 12)
-		);
-
-		/**
-		 * @var array Table of the error correction code (Reed-Solomon block)
-		 * See Table 12-16 (pp.30-36), JIS X0510:2004.
-		 * @access protected
-		 */
-		protected $eccTable = array(
-			array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //  1
-			array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //
-			array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)), //
-			array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), //  5
-			array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)), //
-			array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)), //
-			array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)), //
-			array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)), //
-			array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), // 10
-			array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)), //
-			array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)), //
-			array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)), //
-			array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)), //
-			array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), // 15
-			array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)), //
-			array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)), //
-			array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)), //
-			array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)), //
-			array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), // 20
-			array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)), //
-			array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)), //
-			array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)), //
-			array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)), //
-			array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), // 25
-			array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)), //
-			array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)), //
-			array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), //
-			array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)), //
-			array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
-			array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)), //
-			array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)), //
-			array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)), //
-			array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)), //
-			array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), // 35
-			array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), //
-			array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)), //
-			array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), //
-			array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)), //
-			array(array(19,  6), array(18, 31), array(34, 34), array(20, 61))  // 40
-		);
-
-		/**
-		 * @var array Positions of alignment patterns.
-		 * This array includes only the second and the third position of the alignment patterns. Rest of them can be calculated from the distance between them.
-		 * See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
-		 * @access protected
-		 */
-		protected $alignmentPattern = array(
-			array( 0,  0),
-			array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), //  1- 5
-			array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
-			array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), // 11-15
-			array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), // 16-20
-			array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), // 21-25
-			array(30, 58), array(34, 62), array(26, 50), array(30, 54), array(26, 52), // 26-30
-			array(30, 56), array(34, 60), array(30, 58), array(34, 62), array(30, 54), // 31-35
-			array(24, 50), array(28, 54), array(32, 58), array(26, 54), array(30, 58)  // 35-40
-		);
-
-		/**
-		 * @var array Version information pattern (BCH coded).
-		 * See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
-		 * size: [QRSPEC_VERSION_MAX - 6]
-		 * @access protected
-		 */
-		protected $versionPattern = array(
-			0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d, //
-			0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6, 0x15683, 0x168c9, //
-			0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75, //
-			0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64, //
-			0x27541, 0x28c69
-		);
-
-		/**
-		 * @var array Format information
-		 * @access protected
-		 */
-		protected $formatInfo = array(
-			array(0x77c4, 0x72f3, 0x7daa, 0x789d, 0x662f, 0x6318, 0x6c41, 0x6976), //
-			array(0x5412, 0x5125, 0x5e7c, 0x5b4b, 0x45f9, 0x40ce, 0x4f97, 0x4aa0), //
-			array(0x355f, 0x3068, 0x3f31, 0x3a06, 0x24b4, 0x2183, 0x2eda, 0x2bed), //
-			array(0x1689, 0x13be, 0x1ce7, 0x19d0, 0x0762, 0x0255, 0x0d0c, 0x083b)  //
-		);
-
-
-		// -------------------------------------------------
-		// -------------------------------------------------
-
-
-		/**
-		 * This is the class constructor.
-		 * Creates a QRcode object
-		 * @param string $code code to represent using QRcode
-		 * @param string $eclevel error level: <ul><li>L : About 7% or less errors can be corrected.</li><li>M : About 15% or less errors can be corrected.</li><li>Q : About 25% or less errors can be corrected.</li><li>H : About 30% or less errors can be corrected.</li></ul>
-		 * @access public
-		 * @since 1.0.000
-		 */
-		public function __construct($code, $eclevel = 'L') {
-			$barcode_array = array();
-			if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
-				return false;
-			}
-			// set error correction level
-			$this->level = array_search($eclevel, array('L', 'M', 'Q', 'H'));
-			if ($this->level === false) {
-				$this->level = QR_ECLEVEL_L;
-			}
-			if (($this->hint != QR_MODE_8B) AND ($this->hint != QR_MODE_KJ)) {
-				return false;
-			}
-			if (($this->version < 0) OR ($this->version > QRSPEC_VERSION_MAX)) {
-				return false;
-			}
-			$this->items = array();
-			$this->encodeString($code);
-			if (is_null($this->data)) {
-				return false;
-			}
-			$qrTab = $this->binarize($this->data);
-			$size = count($qrTab);
-			$barcode_array['num_rows'] = $size;
-			$barcode_array['num_cols'] = $size;
-			$barcode_array['bcode'] = array();
-			foreach ($qrTab as $line) {
-				$arrAdd = array();
-				foreach (str_split($line) as $char) {
-					$arrAdd[] = ($char=='1')?1:0;
-				}
-				$barcode_array['bcode'][] = $arrAdd;
-			}
-			$this->barcode_array = $barcode_array;
-		}
-
-		/**
-		 * Returns a barcode array which is readable by TCPDF
-		 * @return array barcode array readable by TCPDF;
-		 * @access public
-		 */
-		public function getBarcodeArray() {
-			return $this->barcode_array;
-		}
-
-		/**
-		 * Convert the frame in binary form
-		 * @param array $frame array to binarize
-		 * @return array frame in binary form
-		 */
-		protected function binarize($frame) {
-			$len = count($frame);
-			// the frame is square (width = height)
-			foreach ($frame as &$frameLine) {
-				for ($i=0; $i<$len; $i++) {
-					$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
-				}
-			}
-			return $frame;
-		}
-
-		/**
-		 * Encode the input string to QR code
-		 * @param string $string input string to encode
-		 */
-		protected function encodeString($string) {
-			$this->dataStr = $string;
-			if (!$this->casesensitive) {
-				$this->toUpper();
-			}
-			$ret = $this->splitString();
-			if ($ret < 0) {
-				return NULL;
-			}
-			$this->encodeMask(-1);
-		}
-
-		/**
-		 * Encode mask
-		 * @param int $mask masking mode
-		 */
-		protected function encodeMask($mask) {
-			$spec = array(0, 0, 0, 0, 0);
-			$this->datacode = $this->getByteStream($this->items);
-			if (is_null($this->datacode)) {
-				return NULL;
-			}
-			$spec = $this->getEccSpec($this->version, $this->level, $spec);
-			$this->b1 = $this->rsBlockNum1($spec);
-			$this->dataLength = $this->rsDataLength($spec);
-			$this->eccLength = $this->rsEccLength($spec);
-			$this->ecccode = array_fill(0, $this->eccLength, 0);
-			$this->blocks = $this->rsBlockNum($spec);
-			$ret = $this->init($spec);
-			if ($ret < 0) {
-				return NULL;
-			}
-			$this->count = 0;
-			$this->width = $this->getWidth($this->version);
-			$this->frame = $this->newFrame($this->version);
-			$this->x = $this->width - 1;
-			$this->y = $this->width - 1;
-			$this->dir = -1;
-			$this->bit = -1;
-			// inteleaved data and ecc codes
-			for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
-				$code = $this->getCode();
-				$bit = 0x80;
-				for ($j=0; $j<8; $j++) {
-					$addr = $this->getNextPosition();
-					$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
-					$bit = $bit >> 1;
-				}
-			}
-			// remainder bits
-			$j = $this->getRemainder($this->version);
-			for ($i=0; $i<$j; $i++) {
-				$addr = $this->getNextPosition();
-				$this->setFrameAt($addr, 0x02);
-			}
-			// masking
-			$this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);
-			if ($mask < 0) {
-				if (QR_FIND_BEST_MASK) {
-					$masked = $this->mask($this->width, $this->frame, $this->level);
-				} else {
-					$masked = $this->makeMask($this->width, $this->frame, (intval(QR_DEFAULT_MASK) % 8), $this->level);
-				}
-			} else {
-				$masked = $this->makeMask($this->width, $this->frame, $mask, $this->level);
-			}
-			if ($masked == NULL) {
-				return NULL;
-			}
-			$this->data = $masked;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// FrameFiller
-
-		/**
-		 * Set frame value at specified position
-		 * @param array $at x,y position
-		 * @param int $val value of the character to set
-		 */
-		protected function setFrameAt($at, $val) {
-			$this->frame[$at['y']][$at['x']] = chr($val);
-		}
-
-		/**
-		 * Get frame value at specified position
-		 * @param array $at x,y position
-		 * @return value at specified position
-		 */
-		protected function getFrameAt($at) {
-			return ord($this->frame[$at['y']][$at['x']]);
-		}
-
-		/**
-		 * Return the next frame position
-		 * @return array of x,y coordinates
-		 */
-		protected function getNextPosition() {
-			do {
-				if ($this->bit == -1) {
-					$this->bit = 0;
-					return array('x'=>$this->x, 'y'=>$this->y);
-				}
-				$x = $this->x;
-				$y = $this->y;
-				$w = $this->width;
-				if ($this->bit == 0) {
-					$x--;
-					$this->bit++;
-				} else {
-					$x++;
-					$y += $this->dir;
-					$this->bit--;
-				}
-				if ($this->dir < 0) {
-					if ($y < 0) {
-						$y = 0;
-						$x -= 2;
-						$this->dir = 1;
-						if ($x == 6) {
-							$x--;
-							$y = 9;
-						}
-					}
-				} else {
-					if ($y == $w) {
-						$y = $w - 1;
-						$x -= 2;
-						$this->dir = -1;
-						if ($x == 6) {
-							$x--;
-							$y -= 8;
-						}
-					}
-				}
-				if (($x < 0) OR ($y < 0)) {
-					return NULL;
-				}
-				$this->x = $x;
-				$this->y = $y;
-			} while(ord($this->frame[$y][$x]) & 0x80);
-			return array('x'=>$x, 'y'=>$y);
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRrawcode
-
-		/**
-		 * Initialize code.
-		 * @param array $spec array of ECC specification
-		 * @return 0 in case of success, -1 in case of error
-		 */
-		protected function init($spec) {
-			$dl = $this->rsDataCodes1($spec);
-			$el = $this->rsEccCodes1($spec);
-			$rs = $this->init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-			$blockNo = 0;
-			$dataPos = 0;
-			$eccPos = 0;
-			$endfor = $this->rsBlockNum1($spec);
-			for ($i=0; $i < $endfor; ++$i) {
-				$ecc = array_slice($this->ecccode, $eccPos);
-				$this->rsblocks[$blockNo] = array();
-				$this->rsblocks[$blockNo]['dataLength'] = $dl;
-				$this->rsblocks[$blockNo]['data'] = array_slice($this->datacode, $dataPos);
-				$this->rsblocks[$blockNo]['eccLength'] = $el;
-				$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
-				$this->rsblocks[$blockNo]['ecc'] = $ecc;
-				$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
-				$dataPos += $dl;
-				$eccPos += $el;
-				$blockNo++;
-			}
-			if ($this->rsBlockNum2($spec) == 0) {
-				return 0;
-			}
-			$dl = $this->rsDataCodes2($spec);
-			$el = $this->rsEccCodes2($spec);
-			$rs = $this->init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
-			if ($rs == NULL) {
-				return -1;
-			}
-			$endfor = $this->rsBlockNum2($spec);
-			for ($i=0; $i < $endfor; ++$i) {
-				$ecc = array_slice($this->ecccode, $eccPos);
-				$this->rsblocks[$blockNo] = array();
-				$this->rsblocks[$blockNo]['dataLength'] = $dl;
-				$this->rsblocks[$blockNo]['data'] = array_slice($this->datacode, $dataPos);
-				$this->rsblocks[$blockNo]['eccLength'] = $el;
-				$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
-				$this->rsblocks[$blockNo]['ecc'] = $ecc;
-				$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
-				$dataPos += $dl;
-				$eccPos += $el;
-				$blockNo++;
-			}
-			return 0;
-		}
-
-		/**
-		 * Return Reed-Solomon block code.
-		 * @return array rsblocks
-		 */
-		protected function getCode() {
-			if ($this->count < $this->dataLength) {
-				$row = $this->count % $this->blocks;
-				$col = $this->count / $this->blocks;
-				if ($col >= $this->rsblocks[0]['dataLength']) {
-					$row += $this->b1;
-				}
-				$ret = $this->rsblocks[$row]['data'][$col];
-			} elseif ($this->count < $this->dataLength + $this->eccLength) {
-				$row = ($this->count - $this->dataLength) % $this->blocks;
-				$col = ($this->count - $this->dataLength) / $this->blocks;
-				$ret = $this->rsblocks[$row]['ecc'][$col];
-			} else {
-				return 0;
-			}
-			$this->count++;
-			return $ret;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRmask
-
-		/**
-		 * Write Format Information on frame and returns the number of black bits
-		 * @param int $width frame width
-		 * @param array $frame frame
-		 * @param array $mask masking mode
-		 * @param int $level error correction level
-		 * @return int blacks
-		 */
-		 protected function writeFormatInformation($width, &$frame, $mask, $level) {
-			$blacks = 0;
-			$format =  $this->getFormatInfo($mask, $level);
-			for ($i=0; $i<8; ++$i) {
-				if ($format & 1) {
-					$blacks += 2;
-					$v = 0x85;
-				} else {
-					$v = 0x84;
-				}
-				$frame[8][$width - 1 - $i] = chr($v);
-				if ($i < 6) {
-					$frame[$i][8] = chr($v);
-				} else {
-					$frame[$i + 1][8] = chr($v);
-				}
-				$format = $format >> 1;
-			}
-			for ($i=0; $i<7; ++$i) {
-			if ($format & 1) {
-				$blacks += 2;
-				$v = 0x85;
-			} else {
-				$v = 0x84;
-			}
-			$frame[$width - 7 + $i][8] = chr($v);
-			if ($i == 0) {
-				$frame[8][7] = chr($v);
-			} else {
-				$frame[8][6 - $i] = chr($v);
-			}
-			$format = $format >> 1;
-			}
-			return $blacks;
-		}
-
-		/**
-		 * mask0
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask0($x, $y) {
-			return ($x + $y) & 1;
-		}
-
-		/**
-		 * mask1
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask1($x, $y) {
-			return ($y & 1);
-		}
-
-		/**
-		 * mask2
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask2($x, $y) {
-			return ($x % 3);
-		}
-
-		/**
-		 * mask3
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask3($x, $y) {
-			return ($x + $y) % 3;
-		}
-
-		/**
-		 * mask4
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask4($x, $y) {
-			return (((int)($y / 2)) + ((int)($x / 3))) & 1;
-		}
-
-		/**
-		 * mask5
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask5($x, $y) {
-			return (($x * $y) & 1) + ($x * $y) % 3;
-		}
-
-		/**
-		 * mask6
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask6($x, $y) {
-			return ((($x * $y) & 1) + ($x * $y) % 3) & 1;
-		}
-
-		/**
-		 * mask7
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @return int mask
-		 */
-		 protected function mask7($x, $y) {
-			return ((($x * $y) % 3) + (($x + $y) & 1)) & 1;
-		}
-
-		/**
-		 * Return bitmask
-		 * @param int $maskNo mask number
-		 * @param int $width width
-		 * @param array $frame frame
-		 * @return array bitmask
-		 */
-		protected function generateMaskNo($maskNo, $width, $frame) {
-			$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
-					if (ord($frame[$y][$x]) & 0x80) {
-						$bitMask[$y][$x] = 0;
-					} else {
-						$maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
-						$bitMask[$y][$x] = ($maskFunc == 0)?1:0;
-					}
-				}
-			}
-			return $bitMask;
-		}
-
-		/**
-		 * makeMaskNo
-		 * @param int $maskNo
-		 * @param int $width
-		 * @param int $s
-		 * @param int $d
-		 * @param boolean $maskGenOnly
-		 * @return int b
-		 */
-		 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
-			$b = 0;
-			$bitMask = array();
-			$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
-			if ($maskGenOnly) {
-				return;
-			}
-			$d = $s;
-			for ($y=0; $y<$width; ++$y) {
-				for ($x=0; $x<$width; ++$x) {
-					if ($bitMask[$y][$x] == 1) {
-						$d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
-					}
-					$b += (int)(ord($d[$y][$x]) & 1);
-				}
-			}
-			return $b;
-		}
-
-		/**
-		 * makeMask
-		 * @param int $width
-		 * @param array $frame
-		 * @param int $maskNo
-		 * @param int $level
-		 * @return array mask
-		 */
-		 protected function makeMask($width, $frame, $maskNo, $level) {
-			$masked = array_fill(0, $width, str_repeat("\0", $width));
-			$this->makeMaskNo($maskNo, $width, $frame, $masked);
-			$this->writeFormatInformation($width, $masked, $maskNo, $level);
-			return $masked;
-		}
-
-		/**
-		 * calcN1N3
-		 * @param int $length
-		 * @return int demerit
-		 */
-		 protected function calcN1N3($length) {
-			$demerit = 0;
-			for ($i=0; $i<$length; ++$i) {
-				if ($this->runLength[$i] >= 5) {
-					$demerit += (N1 + ($this->runLength[$i] - 5));
-				}
-				if ($i & 1) {
-					if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
-						$fact = (int)($this->runLength[$i] / 3);
-						if (($this->runLength[$i-2] == $fact)
-							AND ($this->runLength[$i-1] == $fact)
-							AND ($this->runLength[$i+1] == $fact)
-							AND ($this->runLength[$i+2] == $fact)) {
-							if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
-								$demerit += N3;
-							} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
-								$demerit += N3;
-							}
-						}
-					}
-				}
-			}
-			return $demerit;
-		}
-
-		/**
-		 * evaluateSymbol
-		 * @param int $width
-		 * @param array $frame
-		 * @return int demerit
-		 */
-		 protected function evaluateSymbol($width, $frame) {
-			$head = 0;
-			$demerit = 0;
-			for ($y=0; $y<$width; ++$y) {
-				$head = 0;
-				$this->runLength[0] = 1;
-				$frameY = $frame[$y];
-				if ($y > 0) {
-					$frameYM = $frame[$y-1];
-				}
-				for ($x=0; $x<$width; ++$x) {
-					if (($x > 0) AND ($y > 0)) {
-						$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
-						$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
-						if (($b22 | ($w22 ^ 1)) & 1) {
-							$demerit += N2;
-						}
-					}
-					if (($x == 0) AND (ord($frameY[$x]) & 1)) {
-						$this->runLength[0] = -1;
-						$head = 1;
-						$this->runLength[$head] = 1;
-					} elseif ($x > 0) {
-						if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
-							$head++;
-							$this->runLength[$head] = 1;
-						} else {
-							$this->runLength[$head]++;
-						}
-					}
-				}
-				$demerit += $this->calcN1N3($head+1);
-			}
-			for ($x=0; $x<$width; ++$x) {
-				$head = 0;
-				$this->runLength[0] = 1;
-				for ($y=0; $y<$width; ++$y) {
-					if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
-						$this->runLength[0] = -1;
-						$head = 1;
-						$this->runLength[$head] = 1;
-					} elseif ($y > 0) {
-						if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
-							$head++;
-							$this->runLength[$head] = 1;
-						} else {
-							$this->runLength[$head]++;
-						}
-					}
-				}
-				$demerit += $this->calcN1N3($head+1);
-			}
-			return $demerit;
-		}
-
-		/**
-		 * mask
-		 * @param int $width
-		 * @param array $frame
-		 * @param int $level
-		 * @return array best mask
-		 */
-		 protected function mask($width, $frame, $level) {
-			$minDemerit = PHP_INT_MAX;
-			$bestMaskNum = 0;
-			$bestMask = array();
-			$checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
-			if (QR_FIND_FROM_RANDOM !== false) {
-				$howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
-				for ($i = 0; $i <  $howManuOut; ++$i) {
-					$remPos = rand (0, count($checked_masks)-1);
-					unset($checked_masks[$remPos]);
-					$checked_masks = array_values($checked_masks);
-				}
-			}
-			$bestMask = $frame;
-			foreach ($checked_masks as $i) {
-				$mask = array_fill(0, $width, str_repeat("\0", $width));
-				$demerit = 0;
-				$blacks = 0;
-				$blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
-				$blacks += $this->writeFormatInformation($width, $mask, $i, $level);
-				$blacks  = (int)(100 * $blacks / ($width * $width));
-				$demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
-				$demerit += $this->evaluateSymbol($width, $mask);
-				if ($demerit < $minDemerit) {
-					$minDemerit = $demerit;
-					$bestMask = $mask;
-					$bestMaskNum = $i;
-				}
-			}
-			return $bestMask;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRsplit
-
-		/**
-		 * Return true if the character at specified position is a number
-		 * @param string $str string
-		 * @param int $pos characted position
-		 * @return boolean true of false
-		 */
-		 protected function isdigitat($str, $pos) {
-			if ($pos >= strlen($str)) {
-				return false;
-			}
-			return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
-		}
-
-		/**
-		 * Return true if the character at specified position is an alphanumeric character
-		 * @param string $str string
-		 * @param int $pos characted position
-		 * @return boolean true of false
-		 */
-		 protected function isalnumat($str, $pos) {
-			if ($pos >= strlen($str)) {
-				return false;
-			}
-			return ($this->lookAnTable(ord($str[$pos])) >= 0);
-		}
-
-		/**
-		 * identifyMode
-		 * @param int $pos
-		 * @return int mode
-		 */
-		 protected function identifyMode($pos) {
-			if ($pos >= strlen($this->dataStr)) {
-				return QR_MODE_NL;
-			}
-			$c = $this->dataStr[$pos];
-			if ($this->isdigitat($this->dataStr, $pos)) {
-				return QR_MODE_NM;
-			} elseif ($this->isalnumat($this->dataStr, $pos)) {
-				return QR_MODE_AN;
-			} elseif ($this->hint == QR_MODE_KJ) {
-				if ($pos+1 < strlen($this->dataStr)) {
-					$d = $this->dataStr[$pos+1];
-					$word = (ord($c) << 8) | ord($d);
-					if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
-						return QR_MODE_KJ;
-					}
-				}
-			}
-			return QR_MODE_8B;
-		}
-
-		/**
-		 * eatNum
-		 * @return int run
-		 */
-		 protected function eatNum() {
-			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
-			$p = 0;
-			while($this->isdigitat($this->dataStr, $p)) {
-				$p++;
-			}
-			$run = $p;
-			$mode = $this->identifyMode($p);
-			if ($mode == QR_MODE_8B) {
-				$dif = $this->estimateBitsModeNum($run) + 4 + $ln
-				+ $this->estimateBitsMode8(1)         // + 4 + l8
-				- $this->estimateBitsMode8($run + 1); // - 4 - l8
-				if ($dif > 0) {
-					return $this->eat8();
-				}
-			}
-			if ($mode == QR_MODE_AN) {
-				$dif = $this->estimateBitsModeNum($run) + 4 + $ln
-				+ $this->estimateBitsModeAn(1)        // + 4 + la
-				- $this->estimateBitsModeAn($run + 1);// - 4 - la
-				if ($dif > 0) {
-					return $this->eatAn();
-				}
-			}
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_NM, $run, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * eatAn
-		 * @return int run
-		 */
-		 protected function eatAn() {
-			$la = $this->lengthIndicator(QR_MODE_AN,  $this->version);
-			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
-			$p = 0;
-			while($this->isalnumat($this->dataStr, $p)) {
-				if ($this->isdigitat($this->dataStr, $p)) {
-					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
-						$q++;
-					}
-					$dif = $this->estimateBitsModeAn($p) // + 4 + la
-					+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
-					- $this->estimateBitsModeAn($q); // - 4 - la
-					if ($dif < 0) {
-						break;
-					} else {
-						$p = $q;
-					}
-				} else {
-					$p++;
-				}
-			}
-			$run = $p;
-			if (!$this->isalnumat($this->dataStr, $p)) {
-				$dif = $this->estimateBitsModeAn($run) + 4 + $la
-				+ $this->estimateBitsMode8(1) // + 4 + l8
-				- $this->estimateBitsMode8($run + 1); // - 4 - l8
-				if ($dif > 0) {
-					return $this->eat8();
-				}
-			}
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_AN, $run, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * eatKanji
-		 * @return int run
-		 */
-		 protected function eatKanji() {
-			$p = 0;
-			while($this->identifyMode($p) == QR_MODE_KJ) {
-				$p += 2;
-			}
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * eat8
-		 * @return int run
-		 */
-		 protected function eat8() {
-			$la = $this->lengthIndicator(QR_MODE_AN, $this->version);
-			$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
-			$p = 1;
-			$dataStrLen = strlen($this->dataStr);
-			while($p < $dataStrLen) {
-				$mode = $this->identifyMode($p);
-				if ($mode == QR_MODE_KJ) {
-					break;
-				}
-				if ($mode == QR_MODE_NM) {
-					$q = $p;
-					while($this->isdigitat($this->dataStr, $q)) {
-						$q++;
-					}
-					$dif = $this->estimateBitsMode8($p) // + 4 + l8
-					+ $this->estimateBitsModeNum($q - $p) + 4 + $ln
-					- $this->estimateBitsMode8($q); // - 4 - l8
-					if ($dif < 0) {
-						break;
-					} else {
-						$p = $q;
-					}
-				} elseif ($mode == QR_MODE_AN) {
-					$q = $p;
-					while($this->isalnumat($this->dataStr, $q)) {
-						$q++;
-					}
-					$dif = $this->estimateBitsMode8($p)  // + 4 + l8
-					+ $this->estimateBitsModeAn($q - $p) + 4 + $la
-					- $this->estimateBitsMode8($q); // - 4 - l8
-					if ($dif < 0) {
-						break;
-					} else {
-						$p = $q;
-					}
-				} else {
-					$p++;
-				}
-			}
-			$run = $p;
-			$this->items = $this->appendNewInputItem($this->items, QR_MODE_8B, $run, str_split($this->dataStr));
-			return $run;
-		}
-
-		/**
-		 * splitString
-		 */
-		 protected function splitString() {
-			while (strlen($this->dataStr) > 0) {
-				if ($this->dataStr == '') {
-					return 0;
-				}
-				$mode = $this->identifyMode(0);
-				switch ($mode) {
-					case QR_MODE_NM: {
-						$length = $this->eatNum();
-						break;
-					}
-					case QR_MODE_AN: {
-						$length = $this->eatAn();
-						break;
-					}
-					case QR_MODE_KJ: {
-						if ($hint == QR_MODE_KJ) {
-							$length = $this->eatKanji();
-						} else {
-							$length = $this->eat8();
-						}
-						break;
-					}
-					default: {
-						$length = $this->eat8();
-						break;
-					}
-				}
-				if ($length == 0) {
-					return 0;
-				}
-				if ($length < 0) {
-					return -1;
-				}
-				$this->dataStr = substr($this->dataStr, $length);
-			}
-		}
-
-		/**
-		 * toUpper
-		 */
-		 protected function toUpper() {
-			$stringLen = strlen($this->dataStr);
-			$p = 0;
-			while ($p < $stringLen) {
-				$mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint);
-				if ($mode == QR_MODE_KJ) {
-					$p += 2;
-				} else {
-					if ((ord($this->dataStr[$p]) >= ord('a')) AND (ord($this->dataStr[$p]) <= ord('z'))) {
-						$this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
-					}
-					$p++;
-				}
-			}
-			return $this->dataStr;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRinputItem
-
-		/**
-		 * newInputItem
-		 * @param int $mode
-		 * @param int $size
-		 * @param array $data
-		 * @param array $bstream
-		 * @return array input item
-		 */
-		 protected function newInputItem($mode, $size, $data, $bstream=null) {
-			$setData = array_slice($data, 0, $size);
-			if (count($setData) < $size) {
-				$setData = array_merge($setData, array_fill(0, ($size - count($setData)), 0));
-			}
-			if (!$this->check($mode, $size, $setData)) {
-				return NULL;
-			}
-			$inputitem = array();
-			$inputitem['mode'] = $mode;
-			$inputitem['size'] = $size;
-			$inputitem['data'] = $setData;
-			$inputitem['bstream'] = $bstream;
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeNum
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeModeNum($inputitem, $version) {
-			$words = (int)($inputitem['size'] / 3);
-			$inputitem['bstream'] = array();
-			$val = 0x1;
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_NM, $version), $inputitem['size']);
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (ord($inputitem['data'][$i*3  ]) - ord('0')) * 100;
-				$val += (ord($inputitem['data'][$i*3+1]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$i*3+2]) - ord('0'));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 10, $val);
-			}
-			if ($inputitem['size'] - $words * 3 == 1) {
-				$val = ord($inputitem['data'][$words*3]) - ord('0');
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
-			} elseif (($inputitem['size'] - ($words * 3)) == 2) {
-				$val  = (ord($inputitem['data'][$words*3  ]) - ord('0')) * 10;
-				$val += (ord($inputitem['data'][$words*3+1]) - ord('0'));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 7, $val);
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeAn
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeModeAn($inputitem, $version) {
-			$words = (int)($inputitem['size'] / 2);
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']);
-			for ($i=0; $i < $words; ++$i) {
-				$val  = (int)$this->lookAnTable(ord($inputitem['data'][$i*2  ])) * 45;
-				$val += (int)$this->lookAnTable(ord($inputitem['data'][$i*2+1]));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
-			}
-			if ($inputitem['size'] & 1) {
-				$val = $this->lookAnTable(ord($inputitem['data'][($words * 2)]));
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 6, $val);
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeMode8
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeMode8($inputitem, $version) {
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x4);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_8B, $version), $inputitem['size']);
-			for ($i=0; $i < $inputitem['size']; ++$i) {
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][$i]));
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeKanji
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeModeKanji($inputitem, $version) {
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x8);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int)($inputitem['size'] / 2));
-			for ($i=0; $i<$inputitem['size']; $i+=2) {
-				$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i+1]);
-				if ($val <= 0x9ffc) {
-					$val -= 0x8140;
-				} else {
-					$val -= 0xc140;
-				}
-				$h = ($val >> 8) * 0xc0;
-				$val = ($val & 0xff) + $h;
-				$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 13, $val);
-			}
-			return $inputitem;
-		}
-
-		/**
-		 * encodeModeStructure
-		 * @param array $inputitem
-		 * @return array input item
-		 */
-		 protected function encodeModeStructure($inputitem) {
-			$inputitem['bstream'] = array();
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x03);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, ord($inputitem['data'][1]) - 1);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, ord($inputitem['data'][0]) - 1);
-			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][2]));
-			return $inputitem;
-		}
-
-		/**
-		 * encodeBitStream
-		 * @param array $inputitem
-		 * @param int $version
-		 * @return array input item
-		 */
-		 protected function encodeBitStream($inputitem, $version) {
-			$inputitem['bstream'] = array();
-			$words = $this->maximumWords($inputitem['mode'], $version);
-			if ($inputitem['size'] > $words) {
-				$st1 = $this->newInputItem($inputitem['mode'], $words, $inputitem['data']);
-				$st2 = $this->newInputItem($inputitem['mode'], $inputitem['size'] - $words, array_slice($inputitem['data'], $words));
-				$st1 = $this->encodeBitStream($st1, $version);
-				$st2 = $this->encodeBitStream($st2, $version);
-				$inputitem['bstream'] = array();
-				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']);
-				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
-			} else {
-				switch($inputitem['mode']) {
-					case QR_MODE_NM: {
-						$inputitem = $this->encodeModeNum($inputitem, $version);
-						break;
-					}
-					case QR_MODE_AN: {
-						$inputitem = $this->encodeModeAn($inputitem, $version);
-						break;
-					}
-					case QR_MODE_8B: {
-						$inputitem = $this->encodeMode8($inputitem, $version);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$inputitem = $this->encodeModeKanji($inputitem, $version);
-						break;
-					}
-					case QR_MODE_ST: {
-						$inputitem = $this->encodeModeStructure($inputitem);
-						break;
-					}
-					default: {
-						break;
-					}
-				}
-			}
-			return $inputitem;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRinput
-
-		/**
-		 * Append data to an input object.
-		 * The data is copied and appended to the input object.
-		 * @param array items input items
-		 * @param int $mode encoding mode.
-		 * @param int $size size of data (byte).
-		 * @param array $data array of input data.
-		 * @return items
-		 *
-		 */
-		protected function appendNewInputItem($items, $mode, $size, $data) {
-			$items[] = $this->newInputItem($mode, $size, $data);
-			return $items;
-		}
-
-		/**
-		 * insertStructuredAppendHeader
-		 * @param array $items
-		 * @param int $size
-		 * @param int $index
-		 * @param int $parity
-		 * @return array items
-		 */
-		 protected function insertStructuredAppendHeader($items, $size, $index, $parity) {
-			if ($size > MAX_STRUCTURED_SYMBOLS) {
-				return -1;
-			}
-			if (($index <= 0) OR ($index > MAX_STRUCTURED_SYMBOLS)) {
-				return -1;
-			}
-			$buf = array($size, $index, $parity);
-			$entry = $this->newInputItem(QR_MODE_ST, 3, buf);
-			array_unshift($items, $entry);
-			return $items;
-		}
-
-		/**
-		 * calcParity
-		 * @param array $items
-		 * @return int parity
-		 */
-		 protected function calcParity($items) {
-			$parity = 0;
-			foreach ($items as $item) {
-				if ($item['mode'] != QR_MODE_ST) {
-					for ($i=$item['size']-1; $i>=0; --$i) {
-						$parity ^= $item['data'][$i];
-					}
-				}
-			}
-			return $parity;
-		}
-
-		/**
-		 * checkModeNum
-		 * @param int $size
-		 * @param array $data
-		 * @return boolean true or false
-		 */
-		 protected function checkModeNum($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
-				if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * estimateBitsModeNum
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsModeNum($size) {
-			$w = (int)$size / 3;
-			$bits = $w * 10;
-			switch($size - $w * 3) {
-				case 1: {
-					$bits += 4;
-					break;
-				}
-				case 2: {
-					$bits += 7;
-					break;
-				}
-				default: {
-					break;
-				}
-			}
-			return $bits;
-		}
-
-		/**
-		 * Look up the alphabet-numeric convesion table (see JIS X0510:2004, pp.19).
-		 * @param int $c character value
-		 * @return value
-		 */
-		protected function lookAnTable($c) {
-			return (($c > 127)?-1:$this->anTable[$c]);
-		}
-
-		/**
-		 * checkModeAn
-		 * @param int $size
-		 * @param array $data
-		 * @return boolean true or false
-		 */
-		 protected function checkModeAn($size, $data) {
-			for ($i=0; $i<$size; ++$i) {
-				if ($this->lookAnTable(ord($data[$i])) == -1) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * estimateBitsModeAn
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsModeAn($size) {
-			$w = (int)($size / 2);
-			$bits = $w * 11;
-			if ($size & 1) {
-				$bits += 6;
-			}
-			return $bits;
-		}
-
-		/**
-		 * estimateBitsMode8
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsMode8($size) {
-			return $size * 8;
-		}
-
-		/**
-		 * estimateBitsModeKanji
-		 * @param int $size
-		 * @return int number of bits
-		 */
-		 protected function estimateBitsModeKanji($size) {
-			return (int)(($size / 2) * 13);
-		}
-
-		/**
-		 * checkModeKanji
-		 * @param int $size
-		 * @param array $data
-		 * @return boolean true or false
-		 */
-		 protected function checkModeKanji($size, $data) {
-			if ($size & 1) {
-				return false;
-			}
-			for ($i=0; $i<$size; $i+=2) {
-				$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
-				if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * Validate the input data.
-		 * @param int $mode encoding mode.
-		 * @param int $size size of data (byte).
-		 * @param array data data to validate
-		 * @return boolean true in case of valid data, false otherwise
-		 */
-		protected function check($mode, $size, $data) {
-			if ($size <= 0) {
-				return false;
-			}
-			switch($mode) {
-				case QR_MODE_NM: {
-					return $this->checkModeNum($size, $data);
-				}
-				case QR_MODE_AN: {
-					return $this->checkModeAn($size, $data);
-				}
-				case QR_MODE_KJ: {
-					return $this->checkModeKanji($size, $data);
-				}
-				case QR_MODE_8B: {
-					return true;
-				}
-				case QR_MODE_ST: {
-					return true;
-				}
-				default: {
-					break;
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * estimateBitStreamSize
-		 * @param array $items
-		 * @param int $version
-		 * @return int bits
-		 */
-		 protected function estimateBitStreamSize($items, $version) {
-			$bits = 0;
-			if ($version == 0) {
-				$version = 1;
-			}
-			foreach ($items as $item) {
-				switch($item['mode']) {
-					case QR_MODE_NM: {
-						$bits = $this->estimateBitsModeNum($item['size']);
-						break;
-					}
-					case QR_MODE_AN: {
-						$bits = $this->estimateBitsModeAn($item['size']);
-						break;
-					}
-					case QR_MODE_8B: {
-						$bits = $this->estimateBitsMode8($item['size']);
-						break;
-					}
-					case QR_MODE_KJ: {
-						$bits = $this->estimateBitsModeKanji($item['size']);
-						break;
-					}
-					case QR_MODE_ST: {
-						return STRUCTURE_HEADER_BITS;
-					}
-					default: {
-						return 0;
-					}
-				}
-				$l = $this->lengthIndicator($item['mode'], $version);
-				$m = 1 << $l;
-				$num = (int)(($item['size'] + $m - 1) / $m);
-				$bits += $num * (4 + $l);
-			}
-			return $bits;
-		}
-
-		/**
-		 * estimateVersion
-		 * @param array $items
-		 * @return int version
-		 */
-		 protected function estimateVersion($items) {
-			$version = 0;
-			$prev = 0;
-			do {
-				$prev = $version;
-				$bits = $this->estimateBitStreamSize($items, $prev);
-				$version = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
-				if ($version < 0) {
-					return -1;
-				}
-			} while ($version > $prev);
-			return $version;
-		}
-
-		/**
-		 * lengthOfCode
-		 * @param int $mode
-		 * @param int $version
-		 * @param int $bits
-		 * @return int size
-		 */
-		 protected function lengthOfCode($mode, $version, $bits) {
-			$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
-			switch($mode) {
-				case QR_MODE_NM: {
-					$chunks = (int)($payload / 10);
-					$remain = $payload - $chunks * 10;
-					$size = $chunks * 3;
-					if ($remain >= 7) {
-						$size += 2;
-					} elseif ($remain >= 4) {
-						$size += 1;
-					}
-					break;
-				}
-				case QR_MODE_AN: {
-					$chunks = (int)($payload / 11);
-					$remain = $payload - $chunks * 11;
-					$size = $chunks * 2;
-					if ($remain >= 6) {
-						++$size;
-					}
-					break;
-				}
-				case QR_MODE_8B: {
-					$size = (int)($payload / 8);
-					break;
-				}
-				case QR_MODE_KJ: {
-					$size = (int)(($payload / 13) * 2);
-					break;
-				}
-				case QR_MODE_ST: {
-					$size = (int)($payload / 8);
-					break;
-				}
-				default: {
-					$size = 0;
-					break;
-				}
-			}
-			$maxsize = $this->maximumWords($mode, $version);
-			if ($size < 0) {
-				$size = 0;
-			}
-			if ($size > $maxsize) {
-				$size = $maxsize;
-			}
-			return $size;
-		}
-
-		/**
-		 * createBitStream
-		 * @param array $items
-		 * @return array of items and total bits
-		 */
-		 protected function createBitStream($items) {
-			$total = 0;
-			foreach ($items as $key => $item) {
-				$items[$key] = $this->encodeBitStream($item, $this->version);
-				$bits = count($items[$key]['bstream']);
-				$total += $bits;
-			}
-			return array($items, $total);
-		}
-
-		/**
-		 * convertData
-		 * @param array $items
-		 * @return array items
-		 */
-		 protected function convertData($items) {
-			$ver = $this->estimateVersion($items);
-			if ($ver > $this->version) {
-				$this->version = $ver;
-			}
-			for (;;) {
-				$cbs = $this->createBitStream($items);
-				$items = $cbs[0];
-				$bits = $cbs[1];
-				if ($bits < 0) {
-					return -1;
-				}
-				$ver = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
-				if ($ver < 0) {
-					return -1;
-				} elseif ($ver > $this->version) {
-					$this->version = $ver;
-				} else {
-					break;
-				}
-			}
-			return $items;
-		}
-
-		/**
-		 * Append Padding Bit to bitstream
-		 * @param array $bstream
-		 * @return array bitstream
-		 */
-		 protected function appendPaddingBit($bstream) {
-		 	if (is_null($bstream)) {
-		 		return null;
-		 	}
-			$bits = count($bstream);
-			$maxwords = $this->getDataLength($this->version, $this->level);
-			$maxbits = $maxwords * 8;
-			if ($maxbits == $bits) {
-				return 0;
-			}
-			if ($maxbits - $bits < 5) {
-				return $this->appendNum($bstream, $maxbits - $bits, 0);
-			}
-			$bits += 4;
-			$words = (int)(($bits + 7) / 8);
-			$padding = array();
-			$padding = $this->appendNum($padding, $words * 8 - $bits + 4, 0);
-			$padlen = $maxwords - $words;
-			if ($padlen > 0) {
-				$padbuf = array();
-				for ($i=0; $i<$padlen; ++$i) {
-					$padbuf[$i] = ($i&1)?0x11:0xec;
-				}
-				$padding = $this->appendBytes($padding, $padlen, $padbuf);
-			}
-			return $this->appendBitstream($bstream, $padding);
-		}
-
-		/**
-		 * mergeBitStream
-		 * @param array $bstream
-		 * @return array bitstream
-		 */
-		 protected function mergeBitStream($items) {
-			$items = $this->convertData($items);
-			if (!is_array($items)) {
-				return null;
-			}
-			$bstream = array();
-			foreach ($items as $item) {
-				$bstream = $this->appendBitstream($bstream, $item['bstream']);
-			}
-			return $bstream;
-		}
-
-		/**
-		 * Returns a stream of bits.
-		 * @param int $items
-		 * @return array padded merged byte stream
-		 */
-		protected function getBitStream($items) {
-			$bstream = $this->mergeBitStream($items);
-			return $this->appendPaddingBit($bstream);
-		}
-
-		/**
-		 * Pack all bit streams padding bits into a byte array.
-		 * @param int $items
-		 * @return array padded merged byte stream
-		 */
-		protected function getByteStream($items) {
-			$bstream = $this->getBitStream($items);
-			return $this->bitstreamToByte($bstream);
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRbitstream
-
-		/**
-		 * Return an array with zeros
-		 * @param int $setLength array size
-		 * @return array
-		 */
-		 protected function allocate($setLength) {
-			return array_fill(0, $setLength, 0);
-		}
-
-		/**
-		 * Return new bitstream from number
-		 * @param int $bits number of bits
-		 * @param int $num number
-		 * @return array bitstream
-		 */
-		 protected function newFromNum($bits, $num) {
-			$bstream = $this->allocate($bits);
-			$mask = 1 << ($bits - 1);
-			for ($i=0; $i<$bits; ++$i) {
-				if ($num & $mask) {
-					$bstream[$i] = 1;
-				} else {
-					$bstream[$i] = 0;
-				}
-				$mask = $mask >> 1;
-			}
-			return $bstream;
-		}
-
-		/**
-		 * Return new bitstream from bytes
-		 * @param int $size size
-		 * @param array $data bytes
-		 * @return array bitstream
-		 */
-		 protected function newFromBytes($size, $data) {
-			$bstream = $this->allocate($size * 8);
-			$p=0;
-			for ($i=0; $i<$size; ++$i) {
-				$mask = 0x80;
-				for ($j=0; $j<8; ++$j) {
-					if ($data[$i] & $mask) {
-						$bstream[$p] = 1;
-					} else {
-						$bstream[$p] = 0;
-					}
-					$p++;
-					$mask = $mask >> 1;
-				}
-			}
-			return $bstream;
-		}
-
-		/**
-		 * Append one bitstream to another
-		 * @param array $bitstream original bitstream
-		 * @param array $append bitstream to append
-		 * @return array bitstream
-		 */
-		 protected function appendBitstream($bitstream, $append) {
-			if ((!is_array($append)) OR (count($append) == 0)) {
-				return $bitstream;
-			}
-			if (count($bitstream) == 0) {
-				return $append;
-			}
-			return array_values(array_merge($bitstream, $append));
-		}
-
-		/**
-		 * Append one bitstream created from number to another
-		 * @param array $bitstream original bitstream
-		 * @param int $bits number of bits
-		 * @param int $num number
-		 * @return array bitstream
-		 */
-		 protected function appendNum($bitstream, $bits, $num) {
-			if ($bits == 0) {
-				return 0;
-			}
-			$b = $this->newFromNum($bits, $num);
-			return $this->appendBitstream($bitstream, $b);
-		}
-
-		/**
-		 * Append one bitstream created from bytes to another
-		 * @param array $bitstream original bitstream
-		 * @param int $size size
-		 * @param array $data bytes
-		 * @return array bitstream
-		 */
-		 protected function appendBytes($bitstream, $size, $data) {
-			if ($size == 0) {
-				return 0;
-			}
-			$b = $this->newFromBytes($size, $data);
-			return $this->appendBitstream($bitstream, $b);
-		}
-
-		/**
-		 * Convert bitstream to bytes
-		 * @param array $bitstream original bitstream
-		 * @return array of bytes
-		 */
-		 protected function bitstreamToByte($bstream) {
-			if (is_null($bstream)) {
-		 		return null;
-		 	}
-			$size = count($bstream);
-			if ($size == 0) {
-				return array();
-			}
-			$data = array_fill(0, (int)(($size + 7) / 8), 0);
-			$bytes = (int)($size / 8);
-			$p = 0;
-			for ($i=0; $i<$bytes; $i++) {
-				$v = 0;
-				for ($j=0; $j<8; $j++) {
-					$v = $v << 1;
-					$v |= $bstream[$p];
-					$p++;
-				}
-				$data[$i] = $v;
-			}
-			if ($size & 7) {
-				$v = 0;
-				for ($j=0; $j<($size & 7); $j++) {
-					$v = $v << 1;
-					$v |= $bstream[$p];
-					$p++;
-				}
-				$data[$bytes] = $v;
-			}
-			return $data;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRspec
-
-		/**
-		 * Replace a value on the array at the specified position
-		 * @param array $srctab
-		 * @param int $x X position
-		 * @param int $y Y position
-		 * @param string $repl value to replace
-		 * @param int $replLen length of the repl string
-		 * @return array srctab
-		 */
-		 protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
-			return $srctab;
-		}
-
-		/**
-		 * Return maximum data code length (bytes) for the version.
-		 * @param int $version version
-		 * @param int $level error correction level
-		 * @return int maximum size (bytes)
-		 */
-		protected function getDataLength($version, $level) {
-			return $this->capacity[$version][QRCAP_WORDS] - $this->capacity[$version][QRCAP_EC][$level];
-		}
-
-		/**
-		 * Return maximum error correction code length (bytes) for the version.
-		 * @param int $version version
-		 * @param int $level error correction level
-		 * @return int ECC size (bytes)
-		 */
-		protected function getECCLength($version, $level){
-			return $this->capacity[$version][QRCAP_EC][$level];
-		}
-
-		/**
-		 * Return the width of the symbol for the version.
-		 * @param int $version version
-		 * @return int width
-		 */
-		protected function getWidth($version) {
-			return $this->capacity[$version][QRCAP_WIDTH];
-		}
-
-		/**
-		 * Return the numer of remainder bits.
-		 * @param int $version version
-		 * @return int number of remainder bits
-		 */
-		protected function getRemainder($version) {
-			return $this->capacity[$version][QRCAP_REMINDER];
-		}
-
-		/**
-		 * Return a version number that satisfies the input code length.
-		 * @param int $size input code length (byte)
-		 * @param int $level error correction level
-		 * @return int version number
-		 */
-		protected function getMinimumVersion($size, $level) {
-			for ($i=1; $i <= QRSPEC_VERSION_MAX; ++$i) {
-				$words  = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
-				if ($words >= $size) {
-					return $i;
-				}
-			}
-			return -1;
-		}
-
-		/**
-		 * Return the size of length indicator for the mode and version.
-		 * @param int $mode encoding mode
-		 * @param int $version version
-		 * @return int the size of the appropriate length indicator (bits).
-		 */
-		protected function lengthIndicator($mode, $version) {
-			if ($mode == QR_MODE_ST) {
-				return 0;
-			}
-			if ($version <= 9) {
-				$l = 0;
-			} elseif ($version <= 26) {
-				$l = 1;
-			} else {
-				$l = 2;
-			}
-			return $this->lengthTableBits[$mode][$l];
-		}
-
-		/**
-		 * Return the maximum length for the mode and version.
-		 * @param int $mode encoding mode
-		 * @param int $version version
-		 * @return int the maximum length (bytes)
-		 */
-		protected function maximumWords($mode, $version) {
-			if ($mode == QR_MODE_ST) {
-				return 3;
-			}
-			if ($version <= 9) {
-				$l = 0;
-			} else if ($version <= 26) {
-				$l = 1;
-			} else {
-				$l = 2;
-			}
-			$bits = $this->lengthTableBits[$mode][$l];
-			$words = (1 << $bits) - 1;
-			if ($mode == QR_MODE_KJ) {
-				$words *= 2; // the number of bytes is required
-			}
-			return $words;
-		}
-
-		/**
-		 * Return an array of ECC specification.
-		 * @param int $version version
-		 * @param int $level error correction level
-		 * @param array $spec an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
-		 * @return array spec
-		 */
-		protected function getEccSpec($version, $level, $spec) {
-			if (count($spec) < 5) {
-				$spec = array(0, 0, 0, 0, 0);
-			}
-			$b1 = $this->eccTable[$version][$level][0];
-			$b2 = $this->eccTable[$version][$level][1];
-			$data = $this->getDataLength($version, $level);
-			$ecc = $this->getECCLength($version, $level);
-			if ($b2 == 0) {
-				$spec[0] = $b1;
-				$spec[1] = (int)($data / $b1);
-				$spec[2] = (int)($ecc / $b1);
-				$spec[3] = 0;
-				$spec[4] = 0;
-			} else {
-				$spec[0] = $b1;
-				$spec[1] = (int)($data / ($b1 + $b2));
-				$spec[2] = (int)($ecc  / ($b1 + $b2));
-				$spec[3] = $b2;
-				$spec[4] = $spec[1] + 1;
-			}
-			return $spec;
-		}
-
-		/**
-		 * Put an alignment marker.
-		 * @param array $frame frame
-		 * @param int $width width
-		 * @param int $ox X center coordinate of the pattern
-		 * @param int $oy Y center coordinate of the pattern
-		 * @return array frame
-		 */
-		protected function putAlignmentMarker($frame, $ox, $oy) {
-			$finder = array(
-				"\xa1\xa1\xa1\xa1\xa1",
-				"\xa1\xa0\xa0\xa0\xa1",
-				"\xa1\xa0\xa1\xa0\xa1",
-				"\xa1\xa0\xa0\xa0\xa1",
-				"\xa1\xa1\xa1\xa1\xa1"
-				);
-			$yStart = $oy - 2;
-			$xStart = $ox - 2;
-			for ($y=0; $y < 5; $y++) {
-				$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
-			}
-			return $frame;
-		}
-
-		/**
-		 * Put an alignment pattern.
-		 * @param int $version version
-		 * @param array $fram frame
-		 * @param int $width width
-		 * @return array frame
-		 */
-		 protected function putAlignmentPattern($version, $frame, $width) {
-			if ($version < 2) {
-				return $frame;
-			}
-			$d = $this->alignmentPattern[$version][1] - $this->alignmentPattern[$version][0];
-			if ($d < 0) {
-				$w = 2;
-			} else {
-				$w = (int)(($width - $this->alignmentPattern[$version][0]) / $d + 2);
-			}
-			if ($w * $w - 3 == 1) {
-				$x = $this->alignmentPattern[$version][0];
-				$y = $this->alignmentPattern[$version][0];
-				$frame = $this->putAlignmentMarker($frame, $x, $y);
-				return $frame;
-			}
-			$cx = $this->alignmentPattern[$version][0];
-			$wo = $w - 1;
-			for ($x=1; $x < $wo; ++$x) {
-				$frame = $this->putAlignmentMarker($frame, 6, $cx);
-				$frame = $this->putAlignmentMarker($frame, $cx,  6);
-				$cx += $d;
-			}
-			$cy = $this->alignmentPattern[$version][0];
-			for ($y=0; $y < $wo; ++$y) {
-				$cx = $this->alignmentPattern[$version][0];
-				for ($x=0; $x < $wo; ++$x) {
-					$frame = $this->putAlignmentMarker($frame, $cx, $cy);
-					$cx += $d;
-				}
-				$cy += $d;
-			}
-			return $frame;
-		}
-
-		/**
-		 * Return BCH encoded version information pattern that is used for the symbol of version 7 or greater. Use lower 18 bits.
-		 * @param int $version version
-		 * @return BCH encoded version information pattern
-		 */
-		protected function getVersionPattern($version) {
-			if (($version < 7) OR ($version > QRSPEC_VERSION_MAX)) {
-				return 0;
-			}
-			return $this->versionPattern[($version - 7)];
-		}
-
-		/**
-		 * Return BCH encoded format information pattern.
-		 * @param array $mask
-		 * @param int $level error correction level
-		 * @return BCH encoded format information pattern
-		 */
-		protected function getFormatInfo($mask, $level) {
-			if (($mask < 0) OR ($mask > 7)) {
-				return 0;
-			}
-			if (($level < 0) OR ($level > 3)) {
-				return 0;
-			}
-			return $this->formatInfo[$level][$mask];
-		}
-
-		/**
-		 * Put a finder pattern.
-		 * @param array $frame frame
-		 * @param int $width width
-		 * @param int $ox X center coordinate of the pattern
-		 * @param int $oy Y center coordinate of the pattern
-		 * @return array frame
-		 */
-		protected function putFinderPattern($frame, $ox, $oy) {
-			$finder = array(
-			"\xc1\xc1\xc1\xc1\xc1\xc1\xc1",
-			"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
-			"\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-			"\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-			"\xc1\xc0\xc1\xc1\xc1\xc0\xc1",
-			"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
-			"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
-			);
-			for ($y=0; $y < 7; $y++) {
-				$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
-			}
-			return $frame;
-		}
-
-		/**
-		 * Return a copy of initialized frame.
-		 * @param int $version version
-		 * @return Array of unsigned char.
-		 */
-		protected function createFrame($version) {
-			$width = $this->capacity[$version][QRCAP_WIDTH];
-			$frameLine = str_repeat ("\0", $width);
-			$frame = array_fill(0, $width, $frameLine);
-			// Finder pattern
-			$frame = $this->putFinderPattern($frame, 0, 0);
-			$frame = $this->putFinderPattern($frame, $width - 7, 0);
-			$frame = $this->putFinderPattern($frame, 0, $width - 7);
-			// Separator
-			$yOffset = $width - 7;
-			for ($y=0; $y < 7; ++$y) {
-				$frame[$y][7] = "\xc0";
-				$frame[$y][$width - 8] = "\xc0";
-				$frame[$yOffset][7] = "\xc0";
-				++$yOffset;
-			}
-			$setPattern = str_repeat("\xc0", 8);
-			$frame = $this->qrstrset($frame, 0, 7, $setPattern);
-			$frame = $this->qrstrset($frame, $width-8, 7, $setPattern);
-			$frame = $this->qrstrset($frame, 0, $width - 8, $setPattern);
-			// Format info
-			$setPattern = str_repeat("\x84", 9);
-			$frame = $this->qrstrset($frame, 0, 8, $setPattern);
-			$frame = $this->qrstrset($frame, $width - 8, 8, $setPattern, 8);
-			$yOffset = $width - 8;
-			for ($y=0; $y < 8; ++$y,++$yOffset) {
-				$frame[$y][8] = "\x84";
-				$frame[$yOffset][8] = "\x84";
-			}
-			// Timing pattern
-			$wo = $width - 15;
-			for ($i=1; $i < $wo; ++$i) {
-				$frame[6][7+$i] = chr(0x90 | ($i & 1));
-				$frame[7+$i][6] = chr(0x90 | ($i & 1));
-			}
-			// Alignment pattern
-			$frame = $this->putAlignmentPattern($version, $frame, $width);
-			// Version information
-			if ($version >= 7) {
-				$vinf = $this->getVersionPattern($version);
-				$v = $vinf;
-				for ($x=0; $x<6; ++$x) {
-					for ($y=0; $y<3; ++$y) {
-						$frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
-						$v = $v >> 1;
-					}
-				}
-				$v = $vinf;
-				for ($y=0; $y<6; ++$y) {
-					for ($x=0; $x<3; ++$x) {
-						$frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
-						$v = $v >> 1;
-					}
-				}
-			}
-			// and a little bit...
-			$frame[$width - 8][8] = "\x81";
-			return $frame;
-		}
-
-		/**
-		 * Set new frame for the specified version.
-		 * @param int $version version
-		 * @return Array of unsigned char.
-		 */
-		protected function newFrame($version) {
-			if (($version < 1) OR ($version > QRSPEC_VERSION_MAX)) {
-				return NULL;
-			}
-			if (!isset($this->frames[$version])) {
-				$this->frames[$version] = $this->createFrame($version);
-			}
-			if (is_null($this->frames[$version])) {
-				return NULL;
-			}
-			return $this->frames[$version];
-		}
-
-		/**
-		 * Return block number 0
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsBlockNum($spec) {
-			return ($spec[0] + $spec[3]);
-		}
-
-		/**
-		* Return block number 1
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsBlockNum1($spec) {
-			return $spec[0];
-		}
-
-		/**
-		 * Return data codes 1
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsDataCodes1($spec) {
-			return $spec[1];
-		}
-
-		/**
-		 * Return ecc codes 1
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsEccCodes1($spec) {
-			return $spec[2];
-		}
-
-		/**
-		 * Return block number 2
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsBlockNum2($spec) {
-			return $spec[3];
-		}
-
-		/**
-		 * Return data codes 2
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsDataCodes2($spec) {
-			return $spec[4];
-		}
-
-		/**
-		 * Return ecc codes 2
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsEccCodes2($spec) {
-			return $spec[2];
-		}
-
-		/**
-		 * Return data length
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsDataLength($spec) {
-			return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);
-		}
-
-		/**
-		 * Return ecc length
-		 * @param array $spec
-		 * @return int value
-		 */
-		 protected function rsEccLength($spec) {
-			return ($spec[0] + $spec[3]) * $spec[2];
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRrs
-
-		/**
-		 * Initialize a Reed-Solomon codec and add it to existing rsitems
-		 * @param int $symsize symbol size, bits
-		 * @param int $gfpoly  Field generator polynomial coefficients
-		 * @param int $fcr  first root of RS code generator polynomial, index form
-		 * @param int $prim  primitive element to generate polynomial roots
-		 * @param int $nroots RS code generator polynomial degree (number of roots)
-		 * @param int $pad  padding bytes at front of shortened block
-		 * @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
-		 */
-		 protected function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
-			foreach ($this->rsitems as $rs) {
-				if (($rs['pad'] != $pad) OR ($rs['nroots'] != $nroots) OR ($rs['mm'] != $symsize)
-					OR ($rs['gfpoly'] != $gfpoly) OR ($rs['fcr'] != $fcr) OR ($rs['prim'] != $prim)) {
-					continue;
-				}
-				return $rs;
-			}
-			$rs = $this->init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad);
-			array_unshift($this->rsitems, $rs);
-			return $rs;
-		}
-
-		// - - - - - - - - - - - - - - - - - - - - - - - - -
-
-		// QRrsItem
-
-		/**
-		 * modnn
-		 * @param array RS values
-		 * @param int $x X position
-		 * @return int X osition
-		 */
-		 protected function modnn($rs, $x) {
-			while ($x >= $rs['nn']) {
-				$x -= $rs['nn'];
-				$x = ($x >> $rs['mm']) + ($x & $rs['nn']);
-			}
-			return $x;
-		}
-
-		/**
-		 * Initialize a Reed-Solomon codec and returns an array of values.
-		 * @param int $symsize symbol size, bits
-		 * @param int $gfpoly  Field generator polynomial coefficients
-		 * @param int $fcr  first root of RS code generator polynomial, index form
-		 * @param int $prim  primitive element to generate polynomial roots
-		 * @param int $nroots RS code generator polynomial degree (number of roots)
-		 * @param int $pad  padding bytes at front of shortened block
-		 * @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
-		 */
-		protected function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
-			// Based on Reed solomon encoder by Phil Karn, KA9Q (GNU-LGPLv2)
-			$rs = null;
-			// Check parameter ranges
-			if (($symsize < 0) OR ($symsize > 8)) {
-				return $rs;
-			}
-			if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
-				return $rs;
-			}
-			if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
-				return $rs;
-			}
-			if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
-				return $rs;
-			}
-			if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
-				return $rs;
-			}
-			$rs = array();
-			$rs['mm'] = $symsize;
-			$rs['nn'] = (1 << $symsize) - 1;
-			$rs['pad'] = $pad;
-			$rs['alpha_to'] = array_fill(0, ($rs['nn'] + 1), 0);
-			$rs['index_of'] = array_fill(0, ($rs['nn'] + 1), 0);
-			// PHP style macro replacement ;)
-			$NN =& $rs['nn'];
-			$A0 =& $NN;
-			// Generate Galois field lookup tables
-			$rs['index_of'][0] = $A0; // log(zero) = -inf
-			$rs['alpha_to'][$A0] = 0; // alpha**-inf = 0
-			$sr = 1;
-			for ($i=0; $i<$rs['nn']; ++$i) {
-				$rs['index_of'][$sr] = $i;
-				$rs['alpha_to'][$i] = $sr;
-				$sr <<= 1;
-				if ($sr & (1 << $symsize)) {
-					$sr ^= $gfpoly;
-				}
-				$sr &= $rs['nn'];
-			}
-			if ($sr != 1) {
-				// field generator polynomial is not primitive!
-				return NULL;
-			}
-			// Form RS code generator polynomial from its roots
-			$rs['genpoly'] = array_fill(0, ($nroots + 1), 0);
-			$rs['fcr'] = $fcr;
-			$rs['prim'] = $prim;
-			$rs['nroots'] = $nroots;
-			$rs['gfpoly'] = $gfpoly;
-			// Find prim-th root of 1, used in decoding
-			for ($iprim=1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
-				; // intentional empty-body loop!
-			}
-			$rs['iprim'] = (int)($iprim / $prim);
-			$rs['genpoly'][0] = 1;
-			for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
-				$rs['genpoly'][$i+1] = 1;
-				// Multiply rs->genpoly[] by  @**(root + x)
-				for ($j = $i; $j > 0; --$j) {
-					if ($rs['genpoly'][$j] != 0) {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
-					} else {
-						$rs['genpoly'][$j] = $rs['genpoly'][$j-1];
-					}
-				}
-				// rs->genpoly[0] can never be zero
-				$rs['genpoly'][0] = $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][0]] + $root)];
-			}
-			// convert rs->genpoly[] to index form for quicker encoding
-			for ($i = 0; $i <= $nroots; ++$i) {
-				$rs['genpoly'][$i] = $rs['index_of'][$rs['genpoly'][$i]];
-			}
-			return $rs;
-		}
-
-		/**
-		 * Encode a Reed-Solomon codec and returns the parity array
-		 * @param array $rs RS values
-		 * @param array $data data
-		 * @param array $parity parity
-		 * @return parity array
-		 */
-		 protected function encode_rs_char($rs, $data, $parity) {
-			$MM       =& $rs['mm']; // bits per symbol
-			$NN       =& $rs['nn']; // the total number of symbols in a RS block
-			$ALPHA_TO =& $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
-			$INDEX_OF =& $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
-			$GENPOLY  =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
-			$NROOTS   =& $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
-			$FCR      =& $rs['fcr']; // first consecutive root, index form
-			$PRIM     =& $rs['prim']; // primitive element, index form
-			$IPRIM    =& $rs['iprim']; // prim-th root of 1, index form
-			$PAD      =& $rs['pad']; // the number of pad symbols in a block
-			$A0       =& $NN;
-			$parity = array_fill(0, $NROOTS, 0);
-			for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
-				$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
-				if ($feedback != $A0) {
-					// feedback term is non-zero
-					// This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
-					// always be for the polynomials constructed by init_rs()
-					$feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback);
-					for ($j=1; $j < $NROOTS; ++$j) {
-					$parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])];
-					}
-				}
-				// Shift
-				array_shift($parity);
-				if ($feedback != $A0) {
-					array_push($parity, $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[0])]);
-				} else {
-					array_push($parity, 0);
-				}
-			}
-			return $parity;
-		}
-
-	} // end QRcode class
-
-} // END OF "class_exists QRcode"
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.crt b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.crt
deleted file mode 100644
index f0491391cf0..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.crt
+++ /dev/null
@@ -1,40 +0,0 @@
-Bag Attributes
-    localKeyID: 7B AB 1B 7A BE 4C 85 C0 1A A6 DC 59 3F 79 48 C3 93 38 68 9C 
-subject=/CN=TCPDF DEMO/O=TCPDF/OU=DEMO/emailAddress=you@example.com/C=IT
-issuer=/CN=TCPDF DEMO/O=TCPDF/OU=DEMO/emailAddress=you@example.com/C=IT
------BEGIN CERTIFICATE-----
-MIIC1TCCAj6gAwIBAgIKkehOL/XGkB5cjjANBgkqhkiG9w0BAQUFADBhMRMwEQYD
-VQQDEwpUQ1BERiBERU1PMQ4wDAYDVQQKEwVUQ1BERjENMAsGA1UECxMEREVNTzEe
-MBwGCSqGSIb3DQEJARYPeW91QGV4YW1wbGUuY29tMQswCQYDVQQGEwJJVDAeFw0w
-OTA4MjExMjU0NDhaFw0xNDA4MjExMjU0NDhaMGExEzARBgNVBAMTClRDUERGIERF
-TU8xDjAMBgNVBAoTBVRDUERGMQ0wCwYDVQQLEwRERU1PMR4wHAYJKoZIhvcNAQkB
-Fg95b3VAZXhhbXBsZS5jb20xCzAJBgNVBAYTAklUMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDAqIL0uGKmTR98Lxx2vEEE1OGKkMXFo0JViitALe7Onhxxqx0H
-XMUDKF5mvEVu1rcvh7/oAnAfrCuEpL/up3u1mQCgBE7WXBnFFE/AE3jCksh9OkS0
-Z0Xj9woN5bzxRDsGoPiOu/4xzk5qSEXt8jf2Ep90QuNkqLIRT4swAzpDbwIDAQAB
-o4GTMIGQMDcGA1UdEgQwMC6gEQYDVQQDDApUQ1BERiBERU1PoAwGA1UECgwFVENQ
-REagCwYDVQQLDARERU1PMDcGA1UdEQQwMC6gEQYDVQQDDApUQ1BERiBERU1PoAwG
-A1UECgwFVENQREagCwYDVQQLDARERU1PMA8GCSqGSIb3LwEBCgQCBQAwCwYDVR0P
-BAQDAgSQMA0GCSqGSIb3DQEBBQUAA4GBAEhTQfqX3ZNdHmpTLDbIj22RHXii2roE
-OavCbu9WsHoWpva0qSd+yIoD594VHvYAd29sfzDfiN+7W0aiZfDhq5jpaSQMVlN8
-RGYMupbHY/+a9Gz1wqxnR84mlTtIkZVRYAhsfPwy6M1BEjdMqfdh9h40JIdkdjtb
-8faTCfXPePWQ
------END CERTIFICATE-----
-Bag Attributes
-    localKeyID: 7B AB 1B 7A BE 4C 85 C0 1A A6 DC 59 3F 79 48 C3 93 38 68 9C 
-Key Attributes: <No Attributes>
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDAqIL0uGKmTR98Lxx2vEEE1OGKkMXFo0JViitALe7Onhxxqx0H
-XMUDKF5mvEVu1rcvh7/oAnAfrCuEpL/up3u1mQCgBE7WXBnFFE/AE3jCksh9OkS0
-Z0Xj9woN5bzxRDsGoPiOu/4xzk5qSEXt8jf2Ep90QuNkqLIRT4swAzpDbwIDAQAB
-AoGAXc+wNMmz/5Z+RlIKYia44klmqbplEx+0JULqXI4BQsrqvs67i+I4bJkznoL+
-rEIRYSuQ3sCRKFsFtckjTGpxadnxkB+uwGKc6pZChv99BFX6HFR4hgBlT/BBRAQA
-hMDlM2JIRr4S4SMVXR7MHwGMUf9mUeanGLR3ZWtU3aXJrIECQQD7OaYUVYNEEnM9
-uXyjm22CuHyqyEf5gb13sK0uQty67547yJTMUQZd/sQc9KGwhzBbhrob2LO2jAhh
-S+f+NSRnAkEAxFHm3fMI5RgXmswxlGm4QW07a/Ueo7ZJG6xjTkFXluJhd+XHswRD
-dQIO3zG9nGjNUoeMrPhXhPvKqFc2F9RDuQJAQBEGin74N77gxqfr4ik79y8nE8J5
-oGZ2s/RJZdfFRKLg3mwbjjNHhWb4Ck5UgZkoOt8TzRApXG8/n9hktE5HFwJBALur
-M5AueO1Pl5kB489lNJ9OxUQRYUXMxpxuscuoCQwSwmv0O2+0/qtG2WKhUQnI4aYo
-L+FV0YwtivBb1jj3T/kCQQDIWOxq8eRowdaMzvJpRUHFgMcf1AVZExKyrugwYOWd
-KNsDxC4KaQOsPt8iT/Ulo4g/MJC0HolCOhWibKmR9Ayl
------END RSA PRIVATE KEY-----
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.fdf b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.fdf
deleted file mode 100644
index a8f7c35d9af..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.fdf and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.p12 b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.p12
deleted file mode 100644
index 611f0dfb179..00000000000
Binary files a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.p12 and /dev/null differ
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.php
deleted file mode 100644
index 6a155c19396..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.php
+++ /dev/null
@@ -1,25629 +0,0 @@
-<?php
-//============================================================+
-// File name   : tcpdf.php
-// Version     : 5.9.009
-// Begin       : 2002-08-03
-// Last Update : 2010-10-21
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2002-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : This is a PHP class for generating PDF documents without
-//               requiring external extensions.
-//
-// NOTE:
-//   This class was originally derived in 2002 from the Public
-//   Domain FPDF class by Olivier Plathey (http://www.fpdf.org),
-//   but now is almost entirely rewritten and contains thousands of
-//   new lines of code and hundreds new features.
-//
-// Main features:
-//  * no external libraries are required for the basic functions;
-//  * all standard page formats, custom page formats, custom margins and units of measure;
-//  * UTF-8 Unicode and Right-To-Left languages;
-//  * TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;
-//  * font subsetting;
-//  * methods to publish some XHTML + CSS code, Javascript and Forms;
-//  * images, graphic (geometric figures) and transformation methods;
-//  * supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)
-//  * 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code, PDF417;
-//  * Grayscale, RGB, CMYK, Spot Colors and Transparencies;
-//  * automatic page header and footer management;
-//  * document encryption up to 256 bit and digital signature certifications;
-//  * transactions to UNDO commands;
-//  * PDF annotations, including links, text and file attachments;
-//  * text rendering modes (fill, stroke and clipping);
-//  * multiple columns mode;
-//  * no-write page regions;
-//  * bookmarks and table of content;
-//  * text hyphenation;
-//  * text stretching and spacing (tracking/kerning);
-//  * automatic page break, line break and text alignments including justification;
-//  * automatic page numbering and page groups;
-//  * move and delete pages;
-//  * page compression (requires php-zlib extension);
-//  * XOBject Templates;
-//
-// -----------------------------------------------------------
-// THANKS TO:
-//
-// Olivier Plathey (http://www.fpdf.org) for original FPDF.
-// Efthimios Mavrogeorgiadis (emavro@yahoo.com) for suggestions on RTL language support.
-// Klemen Vodopivec (http://www.fpdf.de/downloads/addons/37/) for Encryption algorithm.
-// Warren Sherliker (wsherliker@gmail.com) for better image handling.
-// dullus for text Justification.
-// Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute.
-// Patrick Benny for text stretch suggestion on Cell().
-// Johannes G�ntert for JavaScript support.
-// Denis Van Nuffelen for Dynamic Form.
-// Jacek Czekaj for multibyte justification
-// Anthony Ferrara for the reintroduction of legacy image methods.
-// Sourceforge user 1707880 (hucste) for line-trough mode.
-// Larry Stanbery for page groups.
-// Martin Hall-May for transparency.
-// Aaron C. Spike for Polycurve method.
-// Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support.
-// Moritz Wagner and Andreas Wurmser for graphic functions.
-// Andrew Whitehead for core fonts support.
-// Esteban Jo�l Mar�n for OpenType font conversion.
-// Teus Hagen for several suggestions and fixes.
-// Yukihiro Nakadaira for CID-0 CJK fonts fixes.
-// Kosmas Papachristos for some CSS improvements.
-// Marcel Partap for some fixes.
-// Won Kyu Park for several suggestions, fixes and patches.
-// Dominik Dzienia for QR-code support.
-// Laurent Minguet for some suggestions.
-// Christian Deligant for some suggestions and fixes.
-// Anyone that has reported a bug or sent a suggestion.
-//============================================================+
-
-/**
- * This is a PHP class for generating PDF documents without requiring external extensions.<br>
- * TCPDF project (http://www.tcpdf.org) was originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
- * <h3>TCPDF main features are:</h3>
- * <ul>
- * <li>no external libraries are required for the basic functions;</li>
- * <li>all standard page formats, custom page formats, custom margins and units of measure;</li>
- * <li>UTF-8 Unicode and Right-To-Left languages;</li>
- * <li>TrueTypeUnicode, OpenTypeUnicode, TrueType, OpenType, Type1 and CID-0 fonts;</li>
- * <li>font subsetting;</li>
- * <li>methods to publish some XHTML + CSS code, Javascript and Forms;</li>
- * <li>images, graphic (geometric figures) and transformation methods;
- * <li>supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/www/formats.html)</li>
- * <li>1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, QR-Code, PDF417;</li>
- * <li>Grayscale, RGB, CMYK, Spot Colors and Transparencies;</li>
- * <li>automatic page header and footer management;</li>
- * <li>document encryption up to 256 bit and digital signature certifications;</li>
- * <li>transactions to UNDO commands;</li>
- * <li>PDF annotations, including links, text and file attachments;</li>
- * <li>text rendering modes (fill, stroke and clipping);</li>
- * <li>multiple columns mode;</li>
- * <li>no-write page regions;</li>
- * <li>bookmarks and table of content;</li>
- * <li>text hyphenation;</li>
- * <li>text stretching and spacing (tracking/kerning);</li>
- * <li>automatic page break, line break and text alignments including justification;</li>
- * <li>automatic page numbering and page groups;</li>
- * <li>move and delete pages;</li>
- * <li>page compression (requires php-zlib extension);</li>
- * <li>XOBject Templates;</li>
- * </ul>
- * Tools to encode your unicode fonts are on fonts/utils directory.</p>
- * @package com.tecnick.tcpdf
- * @abstract Class for generating PDF files on-the-fly without requiring external extensions.
- * @author Nicola Asuni
- * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 5.9.009
- */
-
-/**
- * main configuration file
- * (define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file)
- */
-require_once(dirname(__FILE__).'/config/tcpdf_config.php');
-
-/**
- * define default PDF document producer
- */
-define('PDF_PRODUCER', 'TCPDF 5.9.009 (http://www.tcpdf.org)');
-
-/**
-* This is a PHP class for generating PDF documents without requiring external extensions.<br>
-* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
-* @name TCPDF
-* @package com.tecnick.tcpdf
-* @version 5.9.009
-* @author Nicola Asuni - info@tecnick.com
-* @link http://www.tcpdf.org
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-*/
-class TCPDF {
-
-	// Protected properties
-
-	/**
-	 * @var current page number
-	 * @access protected
-	 */
-	protected $page;
-
-	/**
-	 * @var current object number
-	 * @access protected
-	 */
-	protected $n;
-
-	/**
-	 * @var array of object offsets
-	 * @access protected
-	 */
-	protected $offsets;
-
-	/**
-	 * @var buffer holding in-memory PDF
-	 * @access protected
-	 */
-	protected $buffer;
-
-	/**
-	 * @var array containing pages
-	 * @access protected
-	 */
-	protected $pages = array();
-
-	/**
-	 * @var current document state
-	 * @access protected
-	 */
-	protected $state;
-
-	/**
-	 * @var compression flag
-	 * @access protected
-	 */
-	protected $compress;
-
-	/**
-	 * @var current page orientation (P = Portrait, L = Landscape)
-	 * @access protected
-	 */
-	protected $CurOrientation;
-
-	/**
-	 * @var Page dimensions
-	 * @access protected
-	 */
-	protected $pagedim = array();
-
-	/**
-	 * @var scale factor (number of points in user unit)
-	 * @access protected
-	 */
-	protected $k;
-
-	/**
-	 * @var width of page format in points
-	 * @access protected
-	 */
-	protected $fwPt;
-
-	/**
-	 * @var height of page format in points
-	 * @access protected
-	 */
-	protected $fhPt;
-
-	/**
-	 * @var current width of page in points
-	 * @access protected
-	 */
-	protected $wPt;
-
-	/**
-	 * @var current height of page in points
-	 * @access protected
-	 */
-	protected $hPt;
-
-	/**
-	 * @var current width of page in user unit
-	 * @access protected
-	 */
-	protected $w;
-
-	/**
-	 * @var current height of page in user unit
-	 * @access protected
-	 */
-	protected $h;
-
-	/**
-	 * @var left margin
-	 * @access protected
-	 */
-	protected $lMargin;
-
-	/**
-	 * @var top margin
-	 * @access protected
-	 */
-	protected $tMargin;
-
-	/**
-	 * @var right margin
-	 * @access protected
-	 */
-	protected $rMargin;
-
-	/**
-	 * @var page break margin
-	 * @access protected
-	 */
-	protected $bMargin;
-
-	/**
-	 * @var array of cell internal paddings ('T' => top, 'R' => right, 'B' => bottom, 'L' => left)
-	 * @since 5.9.000 (2010-10-03)
-	 * @access protected
-	 */
-	protected $cell_padding = array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0);
-
-	/**
-	 * @var array of cell margins ('T' => top, 'R' => right, 'B' => bottom, 'L' => left)
-	 * @since 5.9.000 (2010-10-04)
-	 * @access protected
-	 */
-	protected $cell_margin = array('T' => 0, 'R' => 0, 'B' => 0, 'L' => 0);
-
-	/**
-	 * @var current horizontal position in user unit for cell positioning
-	 * @access protected
-	 */
-	protected $x;
-
-	/**
-	 * @var current vertical position in user unit for cell positioning
-	 * @access protected
-	 */
-	protected $y;
-
-	/**
-	 * @var height of last cell printed
-	 * @access protected
-	 */
-	protected $lasth;
-
-	/**
-	 * @var line width in user unit
-	 * @access protected
-	 */
-	protected $LineWidth;
-
-	/**
-	 * @var array of standard font names
-	 * @access protected
-	 */
-	protected $CoreFonts;
-
-	/**
-	 * @var array of used fonts
-	 * @access protected
-	 */
-	protected $fonts = array();
-
-	/**
-	 * @var array of font files
-	 * @access protected
-	 */
-	protected $FontFiles = array();
-
-	/**
-	 * @var array of encoding differences
-	 * @access protected
-	 */
-	protected $diffs = array();
-
-	/**
-	 * @var array of used images
-	 * @access protected
-	 */
-	protected $images = array();
-
-	/**
-	 * @var array of Annotations in pages
-	 * @access protected
-	 */
-	protected $PageAnnots = array();
-
-	/**
-	 * @var array of internal links
-	 * @access protected
-	 */
-	protected $links = array();
-
-	/**
-	 * @var current font family
-	 * @access protected
-	 */
-	protected $FontFamily;
-
-	/**
-	 * @var current font style
-	 * @access protected
-	 */
-	protected $FontStyle;
-
-	/**
-	 * @var current font ascent (distance between font top and baseline)
-	 * @access protected
-	 * @since 2.8.000 (2007-03-29)
-	 */
-	protected $FontAscent;
-
-	/**
-	 * @var current font descent (distance between font bottom and baseline)
-	 * @access protected
-	 * @since 2.8.000 (2007-03-29)
-	 */
-	protected $FontDescent;
-
-	/**
-	 * @var underlining flag
-	 * @access protected
-	 */
-	protected $underline;
-
-	/**
-	 * @var overlining flag
-	 * @access protected
-	 */
-	protected $overline;
-
-	/**
-	 * @var current font info
-	 * @access protected
-	 */
-	protected $CurrentFont;
-
-	/**
-	 * @var current font size in points
-	 * @access protected
-	 */
-	protected $FontSizePt;
-
-	/**
-	 * @var current font size in user unit
-	 * @access protected
-	 */
-	protected $FontSize;
-
-	/**
-	 * @var commands for drawing color
-	 * @access protected
-	 */
-	protected $DrawColor;
-
-	/**
-	 * @var commands for filling color
-	 * @access protected
-	 */
-	protected $FillColor;
-
-	/**
-	 * @var commands for text color
-	 * @access protected
-	 */
-	protected $TextColor;
-
-	/**
-	 * @var indicates whether fill and text colors are different
-	 * @access protected
-	 */
-	protected $ColorFlag;
-
-	/**
-	 * @var automatic page breaking
-	 * @access protected
-	 */
-	protected $AutoPageBreak;
-
-	/**
-	 * @var threshold used to trigger page breaks
-	 * @access protected
-	 */
-	protected $PageBreakTrigger;
-
-	/**
-	 * @var flag set when processing footer
-	 * @access protected
-	 */
-	protected $InFooter = false;
-
-	/**
-	 * @var zoom display mode
-	 * @access protected
-	 */
-	protected $ZoomMode;
-
-	/**
-	 * @var layout display mode
-	 * @access protected
-	 */
-	protected $LayoutMode;
-
-	/**
-	 * @var title
-	 * @access protected
-	 */
-	protected $title = '';
-
-	/**
-	 * @var subject
-	 * @access protected
-	 */
-	protected $subject = '';
-
-	/**
-	 * @var author
-	 * @access protected
-	 */
-	protected $author = '';
-
-	/**
-	 * @var keywords
-	 * @access protected
-	 */
-	protected $keywords = '';
-
-	/**
-	 * @var creator
-	 * @access protected
-	 */
-	protected $creator = '';
-
-	/**
-	 * @var alias for total number of pages
-	 * @access protected
-	 */
-	protected $AliasNbPages = '{nb}';
-
-	/**
-	 * @var alias for page number
-	 * @access protected
-	 */
-	protected $AliasNumPage = '{pnb}';
-
-	/**
-	 * @var right-bottom corner X coordinate of inserted image
-	 * @since 2002-07-31
-	 * @author Nicola Asuni
-	 * @access protected
-	 */
-	protected $img_rb_x;
-
-	/**
-	 * @var right-bottom corner Y coordinate of inserted image
-	 * @since 2002-07-31
-	 * @author Nicola Asuni
-	 * @access protected
-	 */
-	protected $img_rb_y;
-
-	/**
-	 * @var adjusting factor to convert pixels to user units.
-	 * @since 2004-06-14
-	 * @author Nicola Asuni
-	 * @access protected
-	 */
-	protected $imgscale = 1;
-
-	/**
-	 * @var boolean set to true when the input text is unicode (require unicode fonts)
-	 * @since 2005-01-02
-	 * @author Nicola Asuni
-	 * @access protected
-	 */
-	protected $isunicode = false;
-
-	/**
-	 * @var object containing unicode data
-	 * @since 5.9.004 (2010-10-18)
-	 * @author Nicola Asuni
-	 * @access protected
-	 */
-	protected $unicode;
-
-	/**
-	 * @var PDF version
-	 * @since 1.5.3
-	 * @access protected
-	 */
-	protected $PDFVersion = '1.7';
-
-	/**
-	 * @var Minimum distance between header and top page margin.
-	 * @access protected
-	 */
-	protected $header_margin;
-
-	/**
-	 * @var Minimum distance between footer and bottom page margin.
-	 * @access protected
-	 */
-	protected $footer_margin;
-
-	/**
-	 * @var original left margin value
-	 * @access protected
-	 * @since 1.53.0.TC013
-	 */
-	protected $original_lMargin;
-
-	/**
-	 * @var original right margin value
-	 * @access protected
-	 * @since 1.53.0.TC013
-	 */
-	protected $original_rMargin;
-
-	/**
-	 * @var Header font.
-	 * @access protected
-	 */
-	protected $header_font;
-
-	/**
-	 * @var Footer font.
-	 * @access protected
-	 */
-	protected $footer_font;
-
-	/**
-	 * @var Language templates.
-	 * @access protected
-	 */
-	protected $l;
-
-	/**
-	 * @var Barcode to print on page footer (only if set).
-	 * @access protected
-	 */
-	protected $barcode = false;
-
-	/**
-	 * @var If true prints header
-	 * @access protected
-	 */
-	protected $print_header = true;
-
-	/**
-	 * @var If true prints footer.
-	 * @access protected
-	 */
-	protected $print_footer = true;
-
-	/**
-	 * @var Header image logo.
-	 * @access protected
-	 */
-	protected $header_logo = '';
-
-	/**
-	 * @var Header image logo width in mm.
-	 * @access protected
-	 */
-	protected $header_logo_width = 30;
-
-	/**
-	 * @var String to print as title on document header.
-	 * @access protected
-	 */
-	protected $header_title = '';
-
-	/**
-	 * @var String to print on document header.
-	 * @access protected
-	 */
-	protected $header_string = '';
-
-	/**
-	 * @var Default number of columns for html table.
-	 * @access protected
-	 */
-	protected $default_table_columns = 4;
-
-	// variables for html parser
-
-	/**
-	 * @var HTML PARSER: array to store current link and rendering styles.
-	 * @access protected
-	 */
-	protected $HREF = array();
-
-	/**
-	 * @var store a list of available fonts on filesystem.
-	 * @access protected
-	 */
-	protected $fontlist = array();
-
-	/**
-	 * @var current foreground color
-	 * @access protected
-	 */
-	protected $fgcolor;
-
-	/**
-	 * @var HTML PARSER: array of boolean values, true in case of ordered list (OL), false otherwise.
-	 * @access protected
-	 */
-	protected $listordered = array();
-
-	/**
-	 * @var HTML PARSER: array count list items on nested lists.
-	 * @access protected
-	 */
-	protected $listcount = array();
-
-	/**
-	 * @var HTML PARSER: current list nesting level.
-	 * @access protected
-	 */
-	protected $listnum = 0;
-
-	/**
-	 * @var HTML PARSER: indent amount for lists.
-	 * @access protected
-	 */
-	protected $listindent = 0;
-
-	/**
-	 * @var HTML PARSER: current list indententation level.
-	 * @access protected
-	 */
-	protected $listindentlevel = 0;
-
-	/**
-	 * @var current background color
-	 * @access protected
-	 */
-	protected $bgcolor;
-
-	/**
-	 * @var Store temporary font size in points.
-	 * @access protected
-	 */
-	protected $tempfontsize = 10;
-
-	/**
-	 * @var spacer for LI tags.
-	 * @access protected
-	 */
-	protected $lispacer = '';
-
-	/**
-	 * @var default encoding
-	 * @access protected
-	 * @since 1.53.0.TC010
-	 */
-	protected $encoding = 'UTF-8';
-
-	/**
-	 * @var PHP internal encoding
-	 * @access protected
-	 * @since 1.53.0.TC016
-	 */
-	protected $internal_encoding;
-
-	/**
-	 * @var indicates if the document language is Right-To-Left
-	 * @access protected
-	 * @since 2.0.000
-	 */
-	protected $rtl = false;
-
-	/**
-	 * @var used to force RTL or LTR string inversion
-	 * @access protected
-	 * @since 2.0.000
-	 */
-	protected $tmprtl = false;
-
-	// --- Variables used for document encryption:
-
-	/**
-	 * Indicates whether document is protected
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected $encrypted;
-
-	/**
-	 * Array containing encryption settings
-	 * @access protected
-	 * @since 5.0.005 (2010-05-11)
-	 */
-	protected $encryptdata = array();
-
-	/**
-	 * last RC4 key encrypted (cached for optimisation)
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected $last_enc_key;
-
-	/**
-	 * last RC4 computed key
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected $last_enc_key_c;
-
-	/**
-	 * Encryption padding
-	 * @access protected
-	 */
-	protected $enc_padding = "\x28\xBF\x4E\x5E\x4E\x75\x8A\x41\x64\x00\x4E\x56\xFF\xFA\x01\x08\x2E\x2E\x00\xB6\xD0\x68\x3E\x80\x2F\x0C\xA9\xFE\x64\x53\x69\x7A";
-
-	/**
-	 * File ID (used on trailer)
-	 * @access protected
-	 * @since 5.0.005 (2010-05-12)
-	 */
-	protected $file_id;
-
-	// --- bookmark ---
-
-	/**
-	 * Outlines for bookmark
-	 * @access protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $outlines = array();
-
-	/**
-	 * Outline root for bookmark
-	 * @access protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $OutlineRoot;
-
-	// --- javascript and form ---
-
-	/**
-	 * javascript code
-	 * @access protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $javascript = '';
-
-	/**
-	 * javascript counter
-	 * @access protected
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected $n_js;
-
-	/**
-	 * line trough state
-	 * @access protected
-	 * @since 2.8.000 (2008-03-19)
-	 */
-	protected $linethrough;
-
-	/**
-	 * Array with additional document-wide usage rights for the document.
-	 * @access protected
-	 * @since 5.8.014 (2010-08-23)
-	 */
-	protected $ur = array();
-
-	/**
-	 * Dot Per Inch Document Resolution (do not change)
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $dpi = 72;
-
-	/**
-	 * Array of page numbers were a new page group was started
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $newpagegroup = array();
-
-	/**
-	 * Contains the number of pages of the groups
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $pagegroups;
-
-	/**
-	 * Contains the alias of the current page group
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $currpagegroup;
-
-	/**
-	 * Restrict the rendering of some elements to screen or printout.
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $visibility = 'all';
-
-	/**
-	 * Print visibility.
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $n_ocg_print;
-
-	/**
-	 * View visibility.
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $n_ocg_view;
-
-	/**
-	 * Array of transparency objects and parameters.
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $extgstates;
-
-	/**
-	 * Set the default JPEG compression quality (1-100)
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected $jpeg_quality;
-
-	/**
-	 * Default cell height ratio.
-	 * @access protected
-	 * @since 3.0.014 (2008-05-23)
-	 */
-	protected $cell_height_ratio = K_CELL_HEIGHT_RATIO;
-
-	/**
-	 * PDF viewer preferences.
-	 * @access protected
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	protected $viewer_preferences;
-
-	/**
-	 * A name object specifying how the document should be displayed when opened.
-	 * @access protected
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	protected $PageMode;
-
-	/**
-	 * Array for storing gradient information.
-	 * @access protected
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	protected $gradients = array();
-
-	/**
-	 * Array used to store positions inside the pages buffer.
-	 * keys are the page numbers
-	 * @access protected
-	 * @since 3.2.000 (2008-06-26)
-	 */
-	protected $intmrk = array();
-
-	/**
-	 * Array used to store positions inside the pages buffer.
-	 * keys are the page numbers
-	 * @access protected
-	 * @since 5.7.000 (2010-08-03)
-	 */
-	protected $bordermrk = array();
-
-	/**
-	 * Array used to store page positions to track empty pages.
-	 * keys are the page numbers
-	 * @access protected
-	 * @since 5.8.007 (2010-08-18)
-	 */
-	protected $emptypagemrk = array();
-
-	/**
-	 * Array used to store content positions inside the pages buffer.
-	 * keys are the page numbers
-	 * @access protected
-	 * @since 4.6.021 (2009-07-20)
-	 */
-	protected $cntmrk = array();
-
-	/**
-	 * Array used to store footer positions of each page.
-	 * @access protected
-	 * @since 3.2.000 (2008-07-01)
-	 */
-	protected $footerpos = array();
-
-	/**
-	 * Array used to store footer length of each page.
-	 * @access protected
-	 * @since 4.0.014 (2008-07-29)
-	 */
-	protected $footerlen = array();
-
-	/**
-	 * True if a newline is created.
-	 * @access protected
-	 * @since 3.2.000 (2008-07-01)
-	 */
-	protected $newline = true;
-
-	/**
-	 * End position of the latest inserted line
-	 * @access protected
-	 * @since 3.2.000 (2008-07-01)
-	 */
-	protected $endlinex = 0;
-
-	/**
-	 * PDF string for last line width
-	 * @access protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleWidth = '';
-
-	/**
-	 * PDF string for last line width
-	 * @access protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleCap = '0 J';
-
-	/**
-	 * PDF string for last line width
-	 * @access protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleJoin = '0 j';
-
-	/**
-	 * PDF string for last line width
-	 * @access protected
-	 * @since 4.0.006 (2008-07-16)
-	 */
-	protected $linestyleDash = '[] 0 d';
-
-	/**
-	 * True if marked-content sequence is open
-	 * @access protected
-	 * @since 4.0.013 (2008-07-28)
-	 */
-	protected $openMarkedContent = false;
-
-	/**
-	 * Count the latest inserted vertical spaces on HTML
-	 * @access protected
-	 * @since 4.0.021 (2008-08-24)
-	 */
-	protected $formvspace = 0;
-
-	/**
-	 * Array of Spot colors
-	 * @access protected
-	 * @since 4.0.024 (2008-09-12)
-	 */
-	protected $spot_colors = array();
-
-	/**
-	 * Symbol used for HTML unordered list items
-	 * @access protected
-	 * @since 4.0.028 (2008-09-26)
-	 */
-	protected $lisymbol = '';
-
-	/**
-	 * String used to mark the beginning and end of EPS image blocks
-	 * @access protected
-	 * @since 4.1.000 (2008-10-18)
-	 */
-	protected $epsmarker = 'x#!#EPS#!#x';
-
-	/**
-	 * Array of transformation matrix
-	 * @access protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected $transfmatrix = array();
-
-	/**
-	 * Current key for transformation matrix
-	 * @access protected
-	 * @since 4.8.005 (2009-09-17)
-	 */
-	protected $transfmatrix_key = 0;
-
-	/**
-	 * Booklet mode for double-sided pages
-	 * @access protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected $booklet = false;
-
-	/**
-	 * Epsilon value used for float calculations
-	 * @access protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected $feps = 0.005;
-
-	/**
-	 * Array used for custom vertical spaces for HTML tags
-	 * @access protected
-	 * @since 4.2.001 (2008-10-30)
-	 */
-	protected $tagvspaces = array();
-
-	/**
-	 * @var HTML PARSER: custom indent amount for lists.
-	 * Negative value means disabled.
-	 * @access protected
-	 * @since 4.2.007 (2008-11-12)
-	 */
-	protected $customlistindent = -1;
-
-	/**
-	 * @var if true keeps the border open for the cell sides that cross the page.
-	 * @access protected
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	protected $opencell = true;
-
-	/**
-	 * @var array of files to embedd
-	 * @access protected
-	 * @since 4.4.000 (2008-12-07)
-	 */
-	protected $embeddedfiles = array();
-
-	/**
-	 * @var boolean true when inside html pre tag
-	 * @access protected
-	 * @since 4.4.001 (2008-12-08)
-	 */
-	protected $premode = false;
-
-	/**
-	 * Array used to store positions of graphics transformation blocks inside the page buffer.
-	 * keys are the page numbers
-	 * @access protected
-	 * @since 4.4.002 (2008-12-09)
-	 */
-	protected $transfmrk = array();
-
-	/**
-	 * Default color for html links
-	 * @access protected
-	 * @since 4.4.003 (2008-12-09)
-	 */
-	protected $formLinkColorArray = array(0, 0, 255);
-
-	/**
-	 * Default font style to add to html links
-	 * @access protected
-	 * @since 4.4.003 (2008-12-09)
-	 */
-	protected $formLinkFontStyle = 'U';
-
-	/**
-	 * Counts the number of pages.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $numpages = 0;
-
-	/**
-	 * Array containing page lengths in bytes.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $pagelen = array();
-
-	/**
-	 * Counts the number of pages.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $numimages = 0;
-
-	/**
-	 * Store the image keys.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $imagekeys = array();
-
-	/**
-	 * Length of the buffer in bytes.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $bufferlen = 0;
-
-	/**
-	 * If true enables disk caching.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected $diskcache = false;
-
-	/**
-	 * Counts the number of fonts.
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected $numfonts = 0;
-
-	/**
-	 * Store the font keys.
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected $fontkeys = array();
-
-	/**
-	 * Store the font object IDs.
-	 * @access protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $font_obj_ids = array();
-
-	/**
-	 * Store the fage status (true when opened, false when closed).
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected $pageopen = array();
-
-	/**
-	 * Default monospaced font
-	 * @access protected
-	 * @since 4.5.025 (2009-03-10)
-	 */
-	protected $default_monospaced_font = 'courier';
-
-	/**
-	 * Used to store a cloned copy of the current class object
-	 * @access protected
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	protected $objcopy;
-
-	/**
-	 * Array used to store the lengths of cache files
-	 * @access protected
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	protected $cache_file_length = array();
-
-	/**
-	 * Table header content to be repeated on each new page
-	 * @access protected
-	 * @since 4.5.030 (2009-03-20)
-	 */
-	protected $thead = '';
-
-	/**
-	 * Margins used for table header.
-	 * @access protected
-	 * @since 4.5.030 (2009-03-20)
-	 */
-	protected $theadMargins = array();
-
-	/**
-	 * Cache array for UTF8StringToArray() method.
-	 * @access protected
-	 * @since 4.5.037 (2009-04-07)
-	 */
-	protected $cache_UTF8StringToArray = array();
-
-	/**
-	 * Maximum size of cache array used for UTF8StringToArray() method.
-	 * @access protected
-	 * @since 4.5.037 (2009-04-07)
-	 */
-	protected $cache_maxsize_UTF8StringToArray = 8;
-
-	/**
-	 * Current size of cache array used for UTF8StringToArray() method.
-	 * @access protected
-	 * @since 4.5.037 (2009-04-07)
-	 */
-	protected $cache_size_UTF8StringToArray = 0;
-
-	/**
-	 * If true enables document signing
-	 * @access protected
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	protected $sign = false;
-
-	/**
-	 * Signature data
-	 * @access protected
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	protected $signature_data = array();
-
-	/**
-	 * Signature max length
-	 * @access protected
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	protected $signature_max_length = 11742;
-
-	/**
-	 * data for signature appearance
-	 * @access protected
-	 * @since 5.3.011 (2010-06-16)
-	 */
-	protected $signature_appearance = array('page' => 1, 'rect' => '0 0 0 0');
-
-	/**
-	 * Regular expression used to find blank characters used for word-wrapping.
-	 * @access protected
-	 * @since 4.6.006 (2009-04-28)
-	 */
-	protected $re_spaces = '/[^\S\xa0]/';
-
-	/**
-	 * Array of parts $re_spaces
-	 * @access protected
-	 * @since 5.5.011 (2010-07-09)
-	 */
-	protected $re_space = array('p' => '[^\S\xa0]', 'm' => '');
-
-	/**
-	 * Signature object ID
-	 * @access protected
-	 * @since 4.6.022 (2009-06-23)
-	 */
-	protected $sig_obj_id = 0;
-
-	/**
-	 * ByteRange placemark used during signature process.
-	 * @access protected
-	 * @since 4.6.028 (2009-08-25)
-	 */
-	protected $byterange_string = '/ByteRange[0 ********** ********** **********]';
-
-	/**
-	 * Placemark used during signature process.
-	 * @access protected
-	 * @since 4.6.028 (2009-08-25)
-	 */
-	protected $sig_annot_ref = '***SIGANNREF*** 0 R';
-
-	/**
-	 * ID of page objects
-	 * @access protected
-	 * @since 4.7.000 (2009-08-29)
-	 */
-	protected $page_obj_id = array();
-
-	/**
-	 * List of form annotations IDs
-	 * @access protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_obj_id = array();
-
-	/**
-	 * Deafult Javascript field properties. Possible values are described on official Javascript for Acrobat API reference. Annotation options can be directly specified using the 'aopt' entry.
-	 * @access protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
-
-	/**
-	 * Javascript objects array
-	 * @access protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $js_objects = array();
-
-	/**
-	 * Current form action (used during XHTML rendering)
-	 * @access protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_action = '';
-
-	/**
-	 * Current form encryption type (used during XHTML rendering)
-	 * @access protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_enctype = 'application/x-www-form-urlencoded';
-
-	/**
-	 * Current method to submit forms.
-	 * @access protected
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	protected $form_mode = 'post';
-
-	/**
-	 * List of fonts used on form fields (fontname => fontkey).
-	 * @access protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $annotation_fonts = array();
-
-	/**
-	 * List of radio buttons parent objects.
-	 * @access protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $radiobutton_groups = array();
-
-	/**
-	 * List of radio group objects IDs
-	 * @access protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected $radio_groups = array();
-
-	/**
-	 * Text indentation value (used for text-indent CSS attribute)
-	 * @access protected
-	 * @since 4.8.006 (2009-09-23)
-	 */
-	protected $textindent = 0;
-
-	/**
-	 * Store page number when startTransaction() is called.
-	 * @access protected
-	 * @since 4.8.006 (2009-09-23)
-	 */
-	protected $start_transaction_page = 0;
-
-	/**
-	 * Store Y position when startTransaction() is called.
-	 * @access protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $start_transaction_y = 0;
-
-	/**
-	 * True when we are printing the thead section on a new page
-	 * @access protected
-	 * @since 4.8.027 (2010-01-25)
-	 */
-	protected $inthead = false;
-
-	/**
-	 * Array of column measures (width, space, starting Y position)
-	 * @access protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $columns = array();
-
-	/**
-	 * Number of colums
-	 * @access protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $num_columns = 1;
-
-	/**
-	 * Current column number
-	 * @access protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $current_column = 0;
-
-	/**
-	 * Starting page for columns
-	 * @access protected
-	 * @since 4.9.001 (2010-03-28)
-	 */
-	protected $column_start_page = 0;
-
-	/**
-	 * Maximum page and column selected
-	 * @access protected
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	protected $maxselcol = array('page' => 0, 'column' => 0);
-
-	/**
-	 * Array of: X difference between table cell x start and starting page margin, cellspacing, cellpadding
-	 * @access protected
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	protected $colxshift = array('x' => 0, 's' => 0, 'p' => 0);
-
-	/**
-	 * Text rendering mode: 0 = Fill text; 1 = Stroke text; 2 = Fill, then stroke text; 3 = Neither fill nor stroke text (invisible); 4 = Fill text and add to path for clipping; 5 = Stroke text and add to path for clipping; 6 = Fill, then stroke text and add to path for clipping; 7 = Add text to path for clipping.
-	 * @access protected
-	 * @since 4.9.008 (2010-04-03)
-	 */
-	protected $textrendermode = 0;
-
-	/**
-	 * Text stroke width in doc units
-	 * @access protected
-	 * @since 4.9.008 (2010-04-03)
-	 */
-	protected $textstrokewidth = 0;
-
-	/**
-	 * @var current stroke color
-	 * @access protected
-	 * @since 4.9.008 (2010-04-03)
-	 */
-	protected $strokecolor;
-
-	/**
-	 * @var default unit of measure for document
-	 * @access protected
-	 * @since 5.0.000 (2010-04-22)
-	 */
-	protected $pdfunit = 'mm';
-
-	/**
-	 * @var true when we are on TOC (Table Of Content) page
-	 * @access protected
-	 */
-	protected $tocpage = false;
-
-	/**
-	 * @var If true convert vector images (SVG, EPS) to raster image using GD or ImageMagick library.
-	 * @access protected
-	 * @since 5.0.000 (2010-04-26)
-	 */
-	protected $rasterize_vector_images = false;
-
-	/**
-	 * @var If true enables font subsetting by default
-	 * @access protected
-	 * @since 5.3.002 (2010-06-07)
-	 */
-	protected $font_subsetting = true;
-
-	/**
-	 * @var Array of default graphic settings
-	 * @access protected
-	 * @since 5.5.008 (2010-07-02)
-	 */
-	protected $default_graphic_vars = array();
-
-	/**
-	 * @var Array of XObjects
-	 * @access protected
-	 * @since 5.8.014 (2010-08-23)
-	 */
-	protected $xobjects = array();
-
-	/**
-	 * @var boolean true when we are inside an XObject
-	 * @access protected
-	 * @since 5.8.017 (2010-08-24)
-	 */
-	protected $inxobj = false;
-
-	/**
-	 * @var current XObject ID
-	 * @access protected
-	 * @since 5.8.017 (2010-08-24)
-	 */
-	protected $xobjid = '';
-
-	/**
-	 * @var percentage of character stretching
-	 * @access protected
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	protected $font_stretching = 100;
-
-	/**
-	 * @var increases or decreases the space between characters in a text by the specified amount (tracking/kerning).
-	 * @access protected
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	protected $font_spacing = 0;
-
-	/**
-	 * @var array of no-write regions
-	 * ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right)
-	 * @access protected
-	 * @since 5.9.003 (2010-10-14)
-	 */
-	protected $page_regions = array();
-
-	/**
-	 * @var array containing HTML color names and values
-	 * @access protected
-	 * @since 5.9.004 (2010-10-18)
-	 */
-	protected $webcolor = array();
-
-	/**
-	 * @var directory used for the last SVG image
-	 * @access protected
-	 * @since 5.0.000 (2010-05-05)
-	 */
-	protected $svgdir = '';
-
-	/**
-	 * @var Deafult unit of measure for SVG
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgunit = 'px';
-
-	/**
-	 * @var array of SVG gradients
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svggradients = array();
-
-	/**
-	 * @var ID of last SVG gradient
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svggradientid = 0;
-
-	/**
-	 * @var true when in SVG defs group
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgdefsmode = false;
-
-	/**
-	 * @var array of SVG defs
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgdefs = array();
-
-	/**
-	 * @var true when in SVG clipPath tag
-	 * @access protected
-	 * @since 5.0.000 (2010-04-26)
-	 */
-	protected $svgclipmode = false;
-
-	/**
-	 * @var array of SVG clipPath commands
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgclippaths = array();
-
-	/**
-	 * @var array of SVG clipPath tranformation matrix
-	 * @access protected
-	 * @since 5.8.022 (2010-08-31)
-	 */
-	protected $svgcliptm = array();
-
-	/**
-	 * @var ID of last SVG clipPath
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgclipid = 0;
-
-	/**
-	 * @var svg text
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgtext = '';
-
-	/**
-	 * @var svg text properties
-	 * @access protected
-	 * @since 5.8.013 (2010-08-23)
-	 */
-	protected $svgtextmode = array();
-
-	/**
-	 * @var array of hinheritable SVG properties
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode');
-
-	/**
-	 * @var array of SVG properties
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected $svgstyles = array(array(
-		'alignment-baseline' => 'auto',
-		'baseline-shift' => 'baseline',
-		'clip' => 'auto',
-		'clip-path' => 'none',
-		'clip-rule' => 'nonzero',
-		'color' => 'black',
-		'color-interpolation' => 'sRGB',
-		'color-interpolation-filters' => 'linearRGB',
-		'color-profile' => 'auto',
-		'color-rendering' => 'auto',
-		'cursor' => 'auto',
-		'direction' => 'ltr',
-		'display' => 'inline',
-		'dominant-baseline' => 'auto',
-		'enable-background' => 'accumulate',
-		'fill' => 'black',
-		'fill-opacity' => 1,
-		'fill-rule' => 'nonzero',
-		'filter' => 'none',
-		'flood-color' => 'black',
-		'flood-opacity' => 1,
-		'font' => '',
-		'font-family' => 'helvetica',
-		'font-size' => 'medium',
-		'font-size-adjust' => 'none',
-		'font-stretch' => 'normal',
-		'font-style' => 'normal',
-		'font-variant' => 'normal',
-		'font-weight' => 'normal',
-		'glyph-orientation-horizontal' => '0deg',
-		'glyph-orientation-vertical' => 'auto',
-		'image-rendering' => 'auto',
-		'kerning' => 'auto',
-		'letter-spacing' => 'normal',
-		'lighting-color' => 'white',
-		'marker' => '',
-		'marker-end' => 'none',
-		'marker-mid' => 'none',
-		'marker-start' => 'none',
-		'mask' => 'none',
-		'opacity' => 1,
-		'overflow' => 'auto',
-		'pointer-events' => 'visiblePainted',
-		'shape-rendering' => 'auto',
-		'stop-color' => 'black',
-		'stop-opacity' => 1,
-		'stroke' => 'none',
-		'stroke-dasharray' => 'none',
-		'stroke-dashoffset' => 0,
-		'stroke-linecap' => 'butt',
-		'stroke-linejoin' => 'miter',
-		'stroke-miterlimit' => 4,
-		'stroke-opacity' => 1,
-		'stroke-width' => 1,
-		'text-anchor' => 'start',
-		'text-decoration' => 'none',
-		'text-rendering' => 'auto',
-		'unicode-bidi' => 'normal',
-		'visibility' => 'visible',
-		'word-spacing' => 'normal',
-		'writing-mode' => 'lr-tb',
-		'text-color' => 'black',
-		'transfmatrix' => array(1, 0, 0, 1, 0, 0)
-		));
-
-	//------------------------------------------------------------
-	// METHODS
-	//------------------------------------------------------------
-
-	/**
-	 * This is the class constructor.
-	 * It allows to set up the page format, the orientation and the measure unit used in all the methods (except for the font sizes).
-	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-	 * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param boolean $unicode TRUE means that the input text is unicode (default = true)
-	 * @param boolean $diskcache if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
-	 * @param String $encoding charset encoding; default is UTF-8
-	 * @access public
-	 * @see getPageSizeFromFormat(), setPageFormat()
-	 */
-	public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false) {
-		/* Set internal character encoding to ASCII */
-		if (function_exists('mb_internal_encoding') AND mb_internal_encoding()) {
-			$this->internal_encoding = mb_internal_encoding();
-			mb_internal_encoding('ASCII');
-		}
-		require(dirname(__FILE__).'/htmlcolors.php');
-		$this->webcolor = $webcolor;
-		require_once(dirname(__FILE__).'/unicode_data.php');
-		$this->unicode = new TCPDF_UNICODE_DATA();
-		$this->font_obj_ids = array();
-		$this->page_obj_id = array();
-		$this->form_obj_id = array();
-		// set disk caching
-		$this->diskcache = $diskcache ? true : false;
-		// set language direction
-		$this->rtl = false;
-		$this->tmprtl = false;
-		// some checks
-		$this->_dochecks();
-		// initialization of properties
-		$this->isunicode = $unicode;
-		$this->page = 0;
-		$this->transfmrk[0] = array();
-		$this->pagedim = array();
-		$this->n = 2;
-		$this->buffer = '';
-		$this->pages = array();
-		$this->state = 0;
-		$this->fonts = array();
-		$this->FontFiles = array();
-		$this->diffs = array();
-		$this->images = array();
-		$this->links = array();
-		$this->gradients = array();
-		$this->InFooter = false;
-		$this->lasth = 0;
-		$this->FontFamily = 'helvetica';
-		$this->FontStyle = '';
-		$this->FontSizePt = 12;
-		$this->underline = false;
-		$this->overline = false;
-		$this->linethrough = false;
-		$this->DrawColor = '0 G';
-		$this->FillColor = '0 g';
-		$this->TextColor = '0 g';
-		$this->ColorFlag = false;
-		// encryption values
-		$this->encrypted = false;
-		$this->last_enc_key = '';
-		// standard Unicode fonts
-		$this->CoreFonts = array(
-			'courier'=>'Courier',
-			'courierB'=>'Courier-Bold',
-			'courierI'=>'Courier-Oblique',
-			'courierBI'=>'Courier-BoldOblique',
-			'helvetica'=>'Helvetica',
-			'helveticaB'=>'Helvetica-Bold',
-			'helveticaI'=>'Helvetica-Oblique',
-			'helveticaBI'=>'Helvetica-BoldOblique',
-			'times'=>'Times-Roman',
-			'timesB'=>'Times-Bold',
-			'timesI'=>'Times-Italic',
-			'timesBI'=>'Times-BoldItalic',
-			'symbol'=>'Symbol',
-			'zapfdingbats'=>'ZapfDingbats'
-		);
-		// set scale factor
-		$this->setPageUnit($unit);
-		// set page format and orientation
-		$this->setPageFormat($format, $orientation);
-		// page margins (1 cm)
-		$margin = 28.35 / $this->k;
-		$this->SetMargins($margin, $margin);
-		// internal cell padding
-		$cpadding = $margin / 10;
-		$this->setCellPaddings($cpadding, 0, $cpadding, 0);
-		// cell margins
-		$this->setCellMargins(0, 0, 0, 0);
-		// line width (0.2 mm)
-		$this->LineWidth = 0.57 / $this->k;
-		$this->linestyleWidth = sprintf('%.2F w', ($this->LineWidth * $this->k));
-		$this->linestyleCap = '0 J';
-		$this->linestyleJoin = '0 j';
-		$this->linestyleDash = '[] 0 d';
-		// automatic page break
-		$this->SetAutoPageBreak(true, (2 * $margin));
-		// full width display mode
-		$this->SetDisplayMode('fullwidth');
-		// compression
-		$this->SetCompression(true);
-		// set default PDF version number
-		$this->PDFVersion = '1.7';
-		$this->encoding = $encoding;
-		$this->HREF = array();
-		$this->getFontsList();
-		$this->fgcolor = array('R' => 0, 'G' => 0, 'B' => 0);
-		$this->strokecolor = array('R' => 0, 'G' => 0, 'B' => 0);
-		$this->bgcolor = array('R' => 255, 'G' => 255, 'B' => 255);
-		$this->extgstates = array();
-		// user's rights
-		$this->sign = false;
-		$this->ur['enabled'] = false;
-		$this->ur['document'] = '/FullSave';
-		$this->ur['annots'] = '/Create/Delete/Modify/Copy/Import/Export';
-		$this->ur['form'] = '/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate';
-		$this->ur['signature'] = '/Modify';
-		$this->ur['ef'] = '/Create/Delete/Modify/Import';
-		$this->ur['formex'] = '';
-		$this->signature_appearance = array('page' => 1, 'rect' => '0 0 0 0');
-		// set default JPEG quality
-		$this->jpeg_quality = 75;
-		// initialize some settings
-		$this->utf8Bidi(array(''), '');
-		// set default font
-		$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
-		// check if PCRE Unicode support is enabled
-		if ($this->isunicode AND (@preg_match('/\pL/u', 'a') == 1)) {
-			// PCRE unicode support is turned ON
-			// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
-			// \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
-			// \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
-			//$this->setSpacesRE('/[^\S\P{Z}\P{Lo}\xa0]/u');
-			$this->setSpacesRE('/[^\S\P{Z}\xa0]/u');
-		} else {
-			// PCRE unicode support is turned OFF
-			$this->setSpacesRE('/[^\S\xa0]/');
-		}
-		$this->default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
-		// set file ID for trailer
-		$this->file_id = md5($this->getRandomSeed('TCPDF'.$orientation.$unit.$format.$encoding));
-		// get default graphic vars
-		$this->default_graphic_vars = $this->getGraphicVars();
-	}
-
-	/**
-	 * Default destructor.
-	 * @access public
-	 * @since 1.53.0.TC016
-	 */
-	public function __destruct() {
-		// restore internal encoding
-		if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
-			mb_internal_encoding($this->internal_encoding);
-		}
-		// unset all class variables
-		$this->_destroy(true);
-	}
-
-	/**
-	 * Set the units of measure for the document.
-	 * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-	 * @access public
-	 * @since 3.0.015 (2008-06-06)
-	 */
-	public function setPageUnit($unit) {
-		$unit = strtolower($unit);
-		//Set scale factor
-		switch ($unit) {
-			// points
-			case 'px':
-			case 'pt': {
-				$this->k = 1;
-				break;
-			}
-			// millimeters
-			case 'mm': {
-				$this->k = $this->dpi / 25.4;
-				break;
-			}
-			// centimeters
-			case 'cm': {
-				$this->k = $this->dpi / 2.54;
-				break;
-			}
-			// inches
-			case 'in': {
-				$this->k = $this->dpi;
-				break;
-			}
-			// unsupported unit
-			default : {
-				$this->Error('Incorrect unit: '.$unit);
-				break;
-			}
-		}
-		$this->pdfunit = $unit;
-		if (isset($this->CurOrientation)) {
-			$this->setPageOrientation($this->CurOrientation);
-		}
-	}
-
-	/**
-	 * Get page dimensions from format name.
-	 * @param mixed $format The format name. It can be: <ul>
-	 * <li><b>ISO 216 A Series + 2 SIS 014711 extensions</b></li>
-	 * <li>A0 (841x1189 mm ; 33.11x46.81 in)</li>
-	 * <li>A1 (594x841 mm ; 23.39x33.11 in)</li>
-	 * <li>A2 (420x594 mm ; 16.54x23.39 in)</li>
-	 * <li>A3 (297x420 mm ; 11.69x16.54 in)</li>
-	 * <li>A4 (210x297 mm ; 8.27x11.69 in)</li>
-	 * <li>A5 (148x210 mm ; 5.83x8.27 in)</li>
-	 * <li>A6 (105x148 mm ; 4.13x5.83 in)</li>
-	 * <li>A7 (74x105 mm ; 2.91x4.13 in)</li>
-	 * <li>A8 (52x74 mm ; 2.05x2.91 in)</li>
-	 * <li>A9 (37x52 mm ; 1.46x2.05 in)</li>
-	 * <li>A10 (26x37 mm ; 1.02x1.46 in)</li>
-	 * <li>A11 (18x26 mm ; 0.71x1.02 in)</li>
-	 * <li>A12 (13x18 mm ; 0.51x0.71 in)</li>
-	 * <li><b>ISO 216 B Series + 2 SIS 014711 extensions</b></li>
-	 * <li>B0 (1000x1414 mm ; 39.37x55.67 in)</li>
-	 * <li>B1 (707x1000 mm ; 27.83x39.37 in)</li>
-	 * <li>B2 (500x707 mm ; 19.69x27.83 in)</li>
-	 * <li>B3 (353x500 mm ; 13.90x19.69 in)</li>
-	 * <li>B4 (250x353 mm ; 9.84x13.90 in)</li>
-	 * <li>B5 (176x250 mm ; 6.93x9.84 in)</li>
-	 * <li>B6 (125x176 mm ; 4.92x6.93 in)</li>
-	 * <li>B7 (88x125 mm ; 3.46x4.92 in)</li>
-	 * <li>B8 (62x88 mm ; 2.44x3.46 in)</li>
-	 * <li>B9 (44x62 mm ; 1.73x2.44 in)</li>
-	 * <li>B10 (31x44 mm ; 1.22x1.73 in)</li>
-	 * <li>B11 (22x31 mm ; 0.87x1.22 in)</li>
-	 * <li>B12 (15x22 mm ; 0.59x0.87 in)</li>
-	 * <li><b>ISO 216 C Series + 2 SIS 014711 extensions + 2 EXTENSION</b></li>
-	 * <li>C0 (917x1297 mm ; 36.10x51.06 in)</li>
-	 * <li>C1 (648x917 mm ; 25.51x36.10 in)</li>
-	 * <li>C2 (458x648 mm ; 18.03x25.51 in)</li>
-	 * <li>C3 (324x458 mm ; 12.76x18.03 in)</li>
-	 * <li>C4 (229x324 mm ; 9.02x12.76 in)</li>
-	 * <li>C5 (162x229 mm ; 6.38x9.02 in)</li>
-	 * <li>C6 (114x162 mm ; 4.49x6.38 in)</li>
-	 * <li>C7 (81x114 mm ; 3.19x4.49 in)</li>
-	 * <li>C8 (57x81 mm ; 2.24x3.19 in)</li>
-	 * <li>C9 (40x57 mm ; 1.57x2.24 in)</li>
-	 * <li>C10 (28x40 mm ; 1.10x1.57 in)</li>
-	 * <li>C11 (20x28 mm ; 0.79x1.10 in)</li>
-	 * <li>C12 (14x20 mm ; 0.55x0.79 in)</li>
-	 * <li>C76 (81x162 mm ; 3.19x6.38 in)</li>
-	 * <li>DL (110x220 mm ; 4.33x8.66 in)</li>
-	 * <li><b>SIS 014711 E Series</b></li>
-	 * <li>E0 (879x1241 mm ; 34.61x48.86 in)</li>
-	 * <li>E1 (620x879 mm ; 24.41x34.61 in)</li>
-	 * <li>E2 (440x620 mm ; 17.32x24.41 in)</li>
-	 * <li>E3 (310x440 mm ; 12.20x17.32 in)</li>
-	 * <li>E4 (220x310 mm ; 8.66x12.20 in)</li>
-	 * <li>E5 (155x220 mm ; 6.10x8.66 in)</li>
-	 * <li>E6 (110x155 mm ; 4.33x6.10 in)</li>
-	 * <li>E7 (78x110 mm ; 3.07x4.33 in)</li>
-	 * <li>E8 (55x78 mm ; 2.17x3.07 in)</li>
-	 * <li>E9 (39x55 mm ; 1.54x2.17 in)</li>
-	 * <li>E10 (27x39 mm ; 1.06x1.54 in)</li>
-	 * <li>E11 (19x27 mm ; 0.75x1.06 in)</li>
-	 * <li>E12 (13x19 mm ; 0.51x0.75 in)</li>
-	 * <li><b>SIS 014711 G Series</b></li>
-	 * <li>G0 (958x1354 mm ; 37.72x53.31 in)</li>
-	 * <li>G1 (677x958 mm ; 26.65x37.72 in)</li>
-	 * <li>G2 (479x677 mm ; 18.86x26.65 in)</li>
-	 * <li>G3 (338x479 mm ; 13.31x18.86 in)</li>
-	 * <li>G4 (239x338 mm ; 9.41x13.31 in)</li>
-	 * <li>G5 (169x239 mm ; 6.65x9.41 in)</li>
-	 * <li>G6 (119x169 mm ; 4.69x6.65 in)</li>
-	 * <li>G7 (84x119 mm ; 3.31x4.69 in)</li>
-	 * <li>G8 (59x84 mm ; 2.32x3.31 in)</li>
-	 * <li>G9 (42x59 mm ; 1.65x2.32 in)</li>
-	 * <li>G10 (29x42 mm ; 1.14x1.65 in)</li>
-	 * <li>G11 (21x29 mm ; 0.83x1.14 in)</li>
-	 * <li>G12 (14x21 mm ; 0.55x0.83 in)</li>
-	 * <li><b>ISO Press</b></li>
-	 * <li>RA0 (860x1220 mm ; 33.86x48.03 in)</li>
-	 * <li>RA1 (610x860 mm ; 24.02x33.86 in)</li>
-	 * <li>RA2 (430x610 mm ; 16.93x24.02 in)</li>
-	 * <li>RA3 (305x430 mm ; 12.01x16.93 in)</li>
-	 * <li>RA4 (215x305 mm ; 8.46x12.01 in)</li>
-	 * <li>SRA0 (900x1280 mm ; 35.43x50.39 in)</li>
-	 * <li>SRA1 (640x900 mm ; 25.20x35.43 in)</li>
-	 * <li>SRA2 (450x640 mm ; 17.72x25.20 in)</li>
-	 * <li>SRA3 (320x450 mm ; 12.60x17.72 in)</li>
-	 * <li>SRA4 (225x320 mm ; 8.86x12.60 in)</li>
-	 * <li><b>German DIN 476</b></li>
-	 * <li>4A0 (1682x2378 mm ; 66.22x93.62 in)</li>
-	 * <li>2A0 (1189x1682 mm ; 46.81x66.22 in)</li>
-	 * <li><b>Variations on the ISO Standard</b></li>
-	 * <li>A2_EXTRA (445x619 mm ; 17.52x24.37 in)</li>
-	 * <li>A3+ (329x483 mm ; 12.95x19.02 in)</li>
-	 * <li>A3_EXTRA (322x445 mm ; 12.68x17.52 in)</li>
-	 * <li>A3_SUPER (305x508 mm ; 12.01x20.00 in)</li>
-	 * <li>SUPER_A3 (305x487 mm ; 12.01x19.17 in)</li>
-	 * <li>A4_EXTRA (235x322 mm ; 9.25x12.68 in)</li>
-	 * <li>A4_SUPER (229x322 mm ; 9.02x12.68 in)</li>
-	 * <li>SUPER_A4 (227x356 mm ; 8.94x14.02 in)</li>
-	 * <li>A4_LONG (210x348 mm ; 8.27x13.70 in)</li>
-	 * <li>F4 (210x330 mm ; 8.27x12.99 in)</li>
-	 * <li>SO_B5_EXTRA (202x276 mm ; 7.95x10.87 in)</li>
-	 * <li>A5_EXTRA (173x235 mm ; 6.81x9.25 in)</li>
-	 * <li><b>ANSI Series</b></li>
-	 * <li>ANSI_E (864x1118 mm ; 34.00x44.00 in)</li>
-	 * <li>ANSI_D (559x864 mm ; 22.00x34.00 in)</li>
-	 * <li>ANSI_C (432x559 mm ; 17.00x22.00 in)</li>
-	 * <li>ANSI_B (279x432 mm ; 11.00x17.00 in)</li>
-	 * <li>ANSI_A (216x279 mm ; 8.50x11.00 in)</li>
-	 * <li><b>Traditional 'Loose' North American Paper Sizes</b></li>
-	 * <li>LEDGER, USLEDGER (432x279 mm ; 17.00x11.00 in)</li>
-	 * <li>TABLOID, USTABLOID, BIBLE, ORGANIZERK (279x432 mm ; 11.00x17.00 in)</li>
-	 * <li>LETTER, USLETTER, ORGANIZERM (216x279 mm ; 8.50x11.00 in)</li>
-	 * <li>LEGAL, USLEGAL (216x356 mm ; 8.50x14.00 in)</li>
-	 * <li>GLETTER, GOVERNMENTLETTER (203x267 mm ; 8.00x10.50 in)</li>
-	 * <li>JLEGAL, JUNIORLEGAL (203x127 mm ; 8.00x5.00 in)</li>
-	 * <li><b>Other North American Paper Sizes</b></li>
-	 * <li>QUADDEMY (889x1143 mm ; 35.00x45.00 in)</li>
-	 * <li>SUPER_B (330x483 mm ; 13.00x19.00 in)</li>
-	 * <li>QUARTO (229x279 mm ; 9.00x11.00 in)</li>
-	 * <li>FOLIO, GOVERNMENTLEGAL (216x330 mm ; 8.50x13.00 in)</li>
-	 * <li>EXECUTIVE, MONARCH (184x267 mm ; 7.25x10.50 in)</li>
-	 * <li>MEMO, STATEMENT, ORGANIZERL (140x216 mm ; 5.50x8.50 in)</li>
-	 * <li>FOOLSCAP (210x330 mm ; 8.27x13.00 in)</li>
-	 * <li>COMPACT (108x171 mm ; 4.25x6.75 in)</li>
-	 * <li>ORGANIZERJ (70x127 mm ; 2.75x5.00 in)</li>
-	 * <li><b>Canadian standard CAN 2-9.60M</b></li>
-	 * <li>P1 (560x860 mm ; 22.05x33.86 in)</li>
-	 * <li>P2 (430x560 mm ; 16.93x22.05 in)</li>
-	 * <li>P3 (280x430 mm ; 11.02x16.93 in)</li>
-	 * <li>P4 (215x280 mm ; 8.46x11.02 in)</li>
-	 * <li>P5 (140x215 mm ; 5.51x8.46 in)</li>
-	 * <li>P6 (107x140 mm ; 4.21x5.51 in)</li>
-	 * <li><b>North American Architectural Sizes</b></li>
-	 * <li>ARCH_E (914x1219 mm ; 36.00x48.00 in)</li>
-	 * <li>ARCH_E1 (762x1067 mm ; 30.00x42.00 in)</li>
-	 * <li>ARCH_D (610x914 mm ; 24.00x36.00 in)</li>
-	 * <li>ARCH_C, BROADSHEET (457x610 mm ; 18.00x24.00 in)</li>
-	 * <li>ARCH_B (305x457 mm ; 12.00x18.00 in)</li>
-	 * <li>ARCH_A (229x305 mm ; 9.00x12.00 in)</li>
-	 * <li><b>Announcement Envelopes</b></li>
-	 * <li>ANNENV_A2 (111x146 mm ; 4.37x5.75 in)</li>
-	 * <li>ANNENV_A6 (121x165 mm ; 4.75x6.50 in)</li>
-	 * <li>ANNENV_A7 (133x184 mm ; 5.25x7.25 in)</li>
-	 * <li>ANNENV_A8 (140x206 mm ; 5.50x8.12 in)</li>
-	 * <li>ANNENV_A10 (159x244 mm ; 6.25x9.62 in)</li>
-	 * <li>ANNENV_SLIM (98x225 mm ; 3.87x8.87 in)</li>
-	 * <li><b>Commercial Envelopes</b></li>
-	 * <li>COMMENV_N6_1/4 (89x152 mm ; 3.50x6.00 in)</li>
-	 * <li>COMMENV_N6_3/4 (92x165 mm ; 3.62x6.50 in)</li>
-	 * <li>COMMENV_N8 (98x191 mm ; 3.87x7.50 in)</li>
-	 * <li>COMMENV_N9 (98x225 mm ; 3.87x8.87 in)</li>
-	 * <li>COMMENV_N10 (105x241 mm ; 4.12x9.50 in)</li>
-	 * <li>COMMENV_N11 (114x263 mm ; 4.50x10.37 in)</li>
-	 * <li>COMMENV_N12 (121x279 mm ; 4.75x11.00 in)</li>
-	 * <li>COMMENV_N14 (127x292 mm ; 5.00x11.50 in)</li>
-	 * <li><b>Catalogue Envelopes</b></li>
-	 * <li>CATENV_N1 (152x229 mm ; 6.00x9.00 in)</li>
-	 * <li>CATENV_N1_3/4 (165x241 mm ; 6.50x9.50 in)</li>
-	 * <li>CATENV_N2 (165x254 mm ; 6.50x10.00 in)</li>
-	 * <li>CATENV_N3 (178x254 mm ; 7.00x10.00 in)</li>
-	 * <li>CATENV_N6 (191x267 mm ; 7.50x10.50 in)</li>
-	 * <li>CATENV_N7 (203x279 mm ; 8.00x11.00 in)</li>
-	 * <li>CATENV_N8 (210x286 mm ; 8.25x11.25 in)</li>
-	 * <li>CATENV_N9_1/2 (216x267 mm ; 8.50x10.50 in)</li>
-	 * <li>CATENV_N9_3/4 (222x286 mm ; 8.75x11.25 in)</li>
-	 * <li>CATENV_N10_1/2 (229x305 mm ; 9.00x12.00 in)</li>
-	 * <li>CATENV_N12_1/2 (241x318 mm ; 9.50x12.50 in)</li>
-	 * <li>CATENV_N13_1/2 (254x330 mm ; 10.00x13.00 in)</li>
-	 * <li>CATENV_N14_1/4 (286x311 mm ; 11.25x12.25 in)</li>
-	 * <li>CATENV_N14_1/2 (292x368 mm ; 11.50x14.50 in)</li>
-	 * <li><b>Japanese (JIS P 0138-61) Standard B-Series</b></li>
-	 * <li>JIS_B0 (1030x1456 mm ; 40.55x57.32 in)</li>
-	 * <li>JIS_B1 (728x1030 mm ; 28.66x40.55 in)</li>
-	 * <li>JIS_B2 (515x728 mm ; 20.28x28.66 in)</li>
-	 * <li>JIS_B3 (364x515 mm ; 14.33x20.28 in)</li>
-	 * <li>JIS_B4 (257x364 mm ; 10.12x14.33 in)</li>
-	 * <li>JIS_B5 (182x257 mm ; 7.17x10.12 in)</li>
-	 * <li>JIS_B6 (128x182 mm ; 5.04x7.17 in)</li>
-	 * <li>JIS_B7 (91x128 mm ; 3.58x5.04 in)</li>
-	 * <li>JIS_B8 (64x91 mm ; 2.52x3.58 in)</li>
-	 * <li>JIS_B9 (45x64 mm ; 1.77x2.52 in)</li>
-	 * <li>JIS_B10 (32x45 mm ; 1.26x1.77 in)</li>
-	 * <li>JIS_B11 (22x32 mm ; 0.87x1.26 in)</li>
-	 * <li>JIS_B12 (16x22 mm ; 0.63x0.87 in)</li>
-	 * <li><b>PA Series</b></li>
-	 * <li>PA0 (840x1120 mm ; 33.07x44.09 in)</li>
-	 * <li>PA1 (560x840 mm ; 22.05x33.07 in)</li>
-	 * <li>PA2 (420x560 mm ; 16.54x22.05 in)</li>
-	 * <li>PA3 (280x420 mm ; 11.02x16.54 in)</li>
-	 * <li>PA4 (210x280 mm ; 8.27x11.02 in)</li>
-	 * <li>PA5 (140x210 mm ; 5.51x8.27 in)</li>
-	 * <li>PA6 (105x140 mm ; 4.13x5.51 in)</li>
-	 * <li>PA7 (70x105 mm ; 2.76x4.13 in)</li>
-	 * <li>PA8 (52x70 mm ; 2.05x2.76 in)</li>
-	 * <li>PA9 (35x52 mm ; 1.38x2.05 in)</li>
-	 * <li>PA10 (26x35 mm ; 1.02x1.38 in)</li>
-	 * <li><b>Standard Photographic Print Sizes</b></li>
-	 * <li>PASSPORT_PHOTO (35x45 mm ; 1.38x1.77 in)</li>
-	 * <li>E (82x120 mm ; 3.25x4.72 in)</li>
-	 * <li>3R, L (89x127 mm ; 3.50x5.00 in)</li>
-	 * <li>4R, KG (102x152 mm ; 4.02x5.98 in)</li>
-	 * <li>4D (120x152 mm ; 4.72x5.98 in)</li>
-	 * <li>5R, 2L (127x178 mm ; 5.00x7.01 in)</li>
-	 * <li>6R, 8P (152x203 mm ; 5.98x7.99 in)</li>
-	 * <li>8R, 6P (203x254 mm ; 7.99x10.00 in)</li>
-	 * <li>S8R, 6PW (203x305 mm ; 7.99x12.01 in)</li>
-	 * <li>10R, 4P (254x305 mm ; 10.00x12.01 in)</li>
-	 * <li>S10R, 4PW (254x381 mm ; 10.00x15.00 in)</li>
-	 * <li>11R (279x356 mm ; 10.98x14.02 in)</li>
-	 * <li>S11R (279x432 mm ; 10.98x17.01 in)</li>
-	 * <li>12R (305x381 mm ; 12.01x15.00 in)</li>
-	 * <li>S12R (305x456 mm ; 12.01x17.95 in)</li>
-	 * <li><b>Common Newspaper Sizes</b></li>
-	 * <li>NEWSPAPER_BROADSHEET (750x600 mm ; 29.53x23.62 in)</li>
-	 * <li>NEWSPAPER_BERLINER (470x315 mm ; 18.50x12.40 in)</li>
-	 * <li>NEWSPAPER_COMPACT, NEWSPAPER_TABLOID (430x280 mm ; 16.93x11.02 in)</li>
-	 * <li><b>Business Cards</b></li>
-	 * <li>CREDIT_CARD, BUSINESS_CARD, BUSINESS_CARD_ISO7810 (54x86 mm ; 2.13x3.37 in)</li>
-	 * <li>BUSINESS_CARD_ISO216 (52x74 mm ; 2.05x2.91 in)</li>
-	 * <li>BUSINESS_CARD_IT, BUSINESS_CARD_UK, BUSINESS_CARD_FR, BUSINESS_CARD_DE, BUSINESS_CARD_ES (55x85 mm ; 2.17x3.35 in)</li>
-	 * <li>BUSINESS_CARD_US, BUSINESS_CARD_CA (51x89 mm ; 2.01x3.50 in)</li>
-	 * <li>BUSINESS_CARD_JP (55x91 mm ; 2.17x3.58 in)</li>
-	 * <li>BUSINESS_CARD_HK (54x90 mm ; 2.13x3.54 in)</li>
-	 * <li>BUSINESS_CARD_AU, BUSINESS_CARD_DK, BUSINESS_CARD_SE (55x90 mm ; 2.17x3.54 in)</li>
-	 * <li>BUSINESS_CARD_RU, BUSINESS_CARD_CZ, BUSINESS_CARD_FI, BUSINESS_CARD_HU, BUSINESS_CARD_IL (50x90 mm ; 1.97x3.54 in)</li>
-	 * <li><b>Billboards</b></li>
-	 * <li>4SHEET (1016x1524 mm ; 40.00x60.00 in)</li>
-	 * <li>6SHEET (1200x1800 mm ; 47.24x70.87 in)</li>
-	 * <li>12SHEET (3048x1524 mm ; 120.00x60.00 in)</li>
-	 * <li>16SHEET (2032x3048 mm ; 80.00x120.00 in)</li>
-	 * <li>32SHEET (4064x3048 mm ; 160.00x120.00 in)</li>
-	 * <li>48SHEET (6096x3048 mm ; 240.00x120.00 in)</li>
-	 * <li>64SHEET (8128x3048 mm ; 320.00x120.00 in)</li>
-	 * <li>96SHEET (12192x3048 mm ; 480.00x120.00 in)</li>
-	 * <li><b>Old Imperial English (some are still used in USA)</b></li>
-	 * <li>EN_EMPEROR (1219x1829 mm ; 48.00x72.00 in)</li>
-	 * <li>EN_ANTIQUARIAN (787x1346 mm ; 31.00x53.00 in)</li>
-	 * <li>EN_GRAND_EAGLE (730x1067 mm ; 28.75x42.00 in)</li>
-	 * <li>EN_DOUBLE_ELEPHANT (679x1016 mm ; 26.75x40.00 in)</li>
-	 * <li>EN_ATLAS (660x864 mm ; 26.00x34.00 in)</li>
-	 * <li>EN_COLOMBIER (597x876 mm ; 23.50x34.50 in)</li>
-	 * <li>EN_ELEPHANT (584x711 mm ; 23.00x28.00 in)</li>
-	 * <li>EN_DOUBLE_DEMY (572x902 mm ; 22.50x35.50 in)</li>
-	 * <li>EN_IMPERIAL (559x762 mm ; 22.00x30.00 in)</li>
-	 * <li>EN_PRINCESS (546x711 mm ; 21.50x28.00 in)</li>
-	 * <li>EN_CARTRIDGE (533x660 mm ; 21.00x26.00 in)</li>
-	 * <li>EN_DOUBLE_LARGE_POST (533x838 mm ; 21.00x33.00 in)</li>
-	 * <li>EN_ROYAL (508x635 mm ; 20.00x25.00 in)</li>
-	 * <li>EN_SHEET, EN_HALF_POST (495x597 mm ; 19.50x23.50 in)</li>
-	 * <li>EN_SUPER_ROYAL (483x686 mm ; 19.00x27.00 in)</li>
-	 * <li>EN_DOUBLE_POST (483x775 mm ; 19.00x30.50 in)</li>
-	 * <li>EN_MEDIUM (445x584 mm ; 17.50x23.00 in)</li>
-	 * <li>EN_DEMY (445x572 mm ; 17.50x22.50 in)</li>
-	 * <li>EN_LARGE_POST (419x533 mm ; 16.50x21.00 in)</li>
-	 * <li>EN_COPY_DRAUGHT (406x508 mm ; 16.00x20.00 in)</li>
-	 * <li>EN_POST (394x489 mm ; 15.50x19.25 in)</li>
-	 * <li>EN_CROWN (381x508 mm ; 15.00x20.00 in)</li>
-	 * <li>EN_PINCHED_POST (375x470 mm ; 14.75x18.50 in)</li>
-	 * <li>EN_BRIEF (343x406 mm ; 13.50x16.00 in)</li>
-	 * <li>EN_FOOLSCAP (343x432 mm ; 13.50x17.00 in)</li>
-	 * <li>EN_SMALL_FOOLSCAP (337x419 mm ; 13.25x16.50 in)</li>
-	 * <li>EN_POTT (318x381 mm ; 12.50x15.00 in)</li>
-	 * <li><b>Old Imperial Belgian</b></li>
-	 * <li>BE_GRAND_AIGLE (700x1040 mm ; 27.56x40.94 in)</li>
-	 * <li>BE_COLOMBIER (620x850 mm ; 24.41x33.46 in)</li>
-	 * <li>BE_DOUBLE_CARRE (620x920 mm ; 24.41x36.22 in)</li>
-	 * <li>BE_ELEPHANT (616x770 mm ; 24.25x30.31 in)</li>
-	 * <li>BE_PETIT_AIGLE (600x840 mm ; 23.62x33.07 in)</li>
-	 * <li>BE_GRAND_JESUS (550x730 mm ; 21.65x28.74 in)</li>
-	 * <li>BE_JESUS (540x730 mm ; 21.26x28.74 in)</li>
-	 * <li>BE_RAISIN (500x650 mm ; 19.69x25.59 in)</li>
-	 * <li>BE_GRAND_MEDIAN (460x605 mm ; 18.11x23.82 in)</li>
-	 * <li>BE_DOUBLE_POSTE (435x565 mm ; 17.13x22.24 in)</li>
-	 * <li>BE_COQUILLE (430x560 mm ; 16.93x22.05 in)</li>
-	 * <li>BE_PETIT_MEDIAN (415x530 mm ; 16.34x20.87 in)</li>
-	 * <li>BE_RUCHE (360x460 mm ; 14.17x18.11 in)</li>
-	 * <li>BE_PROPATRIA (345x430 mm ; 13.58x16.93 in)</li>
-	 * <li>BE_LYS (317x397 mm ; 12.48x15.63 in)</li>
-	 * <li>BE_POT (307x384 mm ; 12.09x15.12 in)</li>
-	 * <li>BE_ROSETTE (270x347 mm ; 10.63x13.66 in)</li>
-	 * <li><b>Old Imperial French</b></li>
-	 * <li>FR_UNIVERS (1000x1300 mm ; 39.37x51.18 in)</li>
-	 * <li>FR_DOUBLE_COLOMBIER (900x1260 mm ; 35.43x49.61 in)</li>
-	 * <li>FR_GRANDE_MONDE (900x1260 mm ; 35.43x49.61 in)</li>
-	 * <li>FR_DOUBLE_SOLEIL (800x1200 mm ; 31.50x47.24 in)</li>
-	 * <li>FR_DOUBLE_JESUS (760x1120 mm ; 29.92x44.09 in)</li>
-	 * <li>FR_GRAND_AIGLE (750x1060 mm ; 29.53x41.73 in)</li>
-	 * <li>FR_PETIT_AIGLE (700x940 mm ; 27.56x37.01 in)</li>
-	 * <li>FR_DOUBLE_RAISIN (650x1000 mm ; 25.59x39.37 in)</li>
-	 * <li>FR_JOURNAL (650x940 mm ; 25.59x37.01 in)</li>
-	 * <li>FR_COLOMBIER_AFFICHE (630x900 mm ; 24.80x35.43 in)</li>
-	 * <li>FR_DOUBLE_CAVALIER (620x920 mm ; 24.41x36.22 in)</li>
-	 * <li>FR_CLOCHE (600x800 mm ; 23.62x31.50 in)</li>
-	 * <li>FR_SOLEIL (600x800 mm ; 23.62x31.50 in)</li>
-	 * <li>FR_DOUBLE_CARRE (560x900 mm ; 22.05x35.43 in)</li>
-	 * <li>FR_DOUBLE_COQUILLE (560x880 mm ; 22.05x34.65 in)</li>
-	 * <li>FR_JESUS (560x760 mm ; 22.05x29.92 in)</li>
-	 * <li>FR_RAISIN (500x650 mm ; 19.69x25.59 in)</li>
-	 * <li>FR_CAVALIER (460x620 mm ; 18.11x24.41 in)</li>
-	 * <li>FR_DOUBLE_COURONNE (460x720 mm ; 18.11x28.35 in)</li>
-	 * <li>FR_CARRE (450x560 mm ; 17.72x22.05 in)</li>
-	 * <li>FR_COQUILLE (440x560 mm ; 17.32x22.05 in)</li>
-	 * <li>FR_DOUBLE_TELLIERE (440x680 mm ; 17.32x26.77 in)</li>
-	 * <li>FR_DOUBLE_CLOCHE (400x600 mm ; 15.75x23.62 in)</li>
-	 * <li>FR_DOUBLE_POT (400x620 mm ; 15.75x24.41 in)</li>
-	 * <li>FR_ECU (400x520 mm ; 15.75x20.47 in)</li>
-	 * <li>FR_COURONNE (360x460 mm ; 14.17x18.11 in)</li>
-	 * <li>FR_TELLIERE (340x440 mm ; 13.39x17.32 in)</li>
-	 * <li>FR_POT (310x400 mm ; 12.20x15.75 in)</li>
-	 * </ul>
-	 * @return array containing page width and height in points
-	 * @access public
-	 * @since 5.0.010 (2010-05-17)
-	 */
-	public function getPageSizeFromFormat($format) {
-		// Paper cordinates are calculated in this way: (inches * 72) where (1 inch = 25.4 mm)
-		switch (strtoupper($format)) {
-			// ISO 216 A Series + 2 SIS 014711 extensions
-			case 'A0' : {$pf = array( 2383.937, 3370.394); break;}
-			case 'A1' : {$pf = array( 1683.780, 2383.937); break;}
-			case 'A2' : {$pf = array( 1190.551, 1683.780); break;}
-			case 'A3' : {$pf = array(  841.890, 1190.551); break;}
-			case 'A4' : {$pf = array(  595.276,  841.890); break;}
-			case 'A5' : {$pf = array(  419.528,  595.276); break;}
-			case 'A6' : {$pf = array(  297.638,  419.528); break;}
-			case 'A7' : {$pf = array(  209.764,  297.638); break;}
-			case 'A8' : {$pf = array(  147.402,  209.764); break;}
-			case 'A9' : {$pf = array(  104.882,  147.402); break;}
-			case 'A10': {$pf = array(   73.701,  104.882); break;}
-			case 'A11': {$pf = array(   51.024,   73.701); break;}
-			case 'A12': {$pf = array(   36.850,   51.024); break;}
-			// ISO 216 B Series + 2 SIS 014711 extensions
-			case 'B0' : {$pf = array( 2834.646, 4008.189); break;}
-			case 'B1' : {$pf = array( 2004.094, 2834.646); break;}
-			case 'B2' : {$pf = array( 1417.323, 2004.094); break;}
-			case 'B3' : {$pf = array( 1000.630, 1417.323); break;}
-			case 'B4' : {$pf = array(  708.661, 1000.630); break;}
-			case 'B5' : {$pf = array(  498.898,  708.661); break;}
-			case 'B6' : {$pf = array(  354.331,  498.898); break;}
-			case 'B7' : {$pf = array(  249.449,  354.331); break;}
-			case 'B8' : {$pf = array(  175.748,  249.449); break;}
-			case 'B9' : {$pf = array(  124.724,  175.748); break;}
-			case 'B10': {$pf = array(   87.874,  124.724); break;}
-			case 'B11': {$pf = array(   62.362,   87.874); break;}
-			case 'B12': {$pf = array(   42.520,   62.362); break;}
-			// ISO 216 C Series + 2 SIS 014711 extensions + 2 EXTENSION
-			case 'C0' : {$pf = array( 2599.370, 3676.535); break;}
-			case 'C1' : {$pf = array( 1836.850, 2599.370); break;}
-			case 'C2' : {$pf = array( 1298.268, 1836.850); break;}
-			case 'C3' : {$pf = array(  918.425, 1298.268); break;}
-			case 'C4' : {$pf = array(  649.134,  918.425); break;}
-			case 'C5' : {$pf = array(  459.213,  649.134); break;}
-			case 'C6' : {$pf = array(  323.150,  459.213); break;}
-			case 'C7' : {$pf = array(  229.606,  323.150); break;}
-			case 'C8' : {$pf = array(  161.575,  229.606); break;}
-			case 'C9' : {$pf = array(  113.386,  161.575); break;}
-			case 'C10': {$pf = array(   79.370,  113.386); break;}
-			case 'C11': {$pf = array(   56.693,   79.370); break;}
-			case 'C12': {$pf = array(   39.685,   56.693); break;}
-			case 'C76': {$pf = array(  229.606,  459.213); break;}
-			case 'DL' : {$pf = array(  311.811,  623.622); break;}
-			// SIS 014711 E Series
-			case 'E0' : {$pf = array( 2491.654, 3517.795); break;}
-			case 'E1' : {$pf = array( 1757.480, 2491.654); break;}
-			case 'E2' : {$pf = array( 1247.244, 1757.480); break;}
-			case 'E3' : {$pf = array(  878.740, 1247.244); break;}
-			case 'E4' : {$pf = array(  623.622,  878.740); break;}
-			case 'E5' : {$pf = array(  439.370,  623.622); break;}
-			case 'E6' : {$pf = array(  311.811,  439.370); break;}
-			case 'E7' : {$pf = array(  221.102,  311.811); break;}
-			case 'E8' : {$pf = array(  155.906,  221.102); break;}
-			case 'E9' : {$pf = array(  110.551,  155.906); break;}
-			case 'E10': {$pf = array(   76.535,  110.551); break;}
-			case 'E11': {$pf = array(   53.858,   76.535); break;}
-			case 'E12': {$pf = array(   36.850,   53.858); break;}
-			// SIS 014711 G Series
-			case 'G0' : {$pf = array( 2715.591, 3838.110); break;}
-			case 'G1' : {$pf = array( 1919.055, 2715.591); break;}
-			case 'G2' : {$pf = array( 1357.795, 1919.055); break;}
-			case 'G3' : {$pf = array(  958.110, 1357.795); break;}
-			case 'G4' : {$pf = array(  677.480,  958.110); break;}
-			case 'G5' : {$pf = array(  479.055,  677.480); break;}
-			case 'G6' : {$pf = array(  337.323,  479.055); break;}
-			case 'G7' : {$pf = array(  238.110,  337.323); break;}
-			case 'G8' : {$pf = array(  167.244,  238.110); break;}
-			case 'G9' : {$pf = array(  119.055,  167.244); break;}
-			case 'G10': {$pf = array(   82.205,  119.055); break;}
-			case 'G11': {$pf = array(   59.528,   82.205); break;}
-			case 'G12': {$pf = array(   39.685,   59.528); break;}
-			// ISO Press
-			case 'RA0': {$pf = array( 2437.795, 3458.268); break;}
-			case 'RA1': {$pf = array( 1729.134, 2437.795); break;}
-			case 'RA2': {$pf = array( 1218.898, 1729.134); break;}
-			case 'RA3': {$pf = array(  864.567, 1218.898); break;}
-			case 'RA4': {$pf = array(  609.449,  864.567); break;}
-			case 'SRA0': {$pf = array( 2551.181, 3628.346); break;}
-			case 'SRA1': {$pf = array( 1814.173, 2551.181); break;}
-			case 'SRA2': {$pf = array( 1275.591, 1814.173); break;}
-			case 'SRA3': {$pf = array(  907.087, 1275.591); break;}
-			case 'SRA4': {$pf = array(  637.795,  907.087); break;}
-			// German  DIN 476
-			case '4A0': {$pf = array( 4767.874, 6740.787); break;}
-			case '2A0': {$pf = array( 3370.394, 4767.874); break;}
-			// Variations on the ISO Standard
-			case 'A2_EXTRA'   : {$pf = array( 1261.417, 1754.646); break;}
-			case 'A3+'        : {$pf = array(  932.598, 1369.134); break;}
-			case 'A3_EXTRA'   : {$pf = array(  912.756, 1261.417); break;}
-			case 'A3_SUPER'   : {$pf = array(  864.567, 1440.000); break;}
-			case 'SUPER_A3'   : {$pf = array(  864.567, 1380.472); break;}
-			case 'A4_EXTRA'   : {$pf = array(  666.142,  912.756); break;}
-			case 'A4_SUPER'   : {$pf = array(  649.134,  912.756); break;}
-			case 'SUPER_A4'   : {$pf = array(  643.465, 1009.134); break;}
-			case 'A4_LONG'    : {$pf = array(  595.276,  986.457); break;}
-			case 'F4'         : {$pf = array(  595.276,  935.433); break;}
-			case 'SO_B5_EXTRA': {$pf = array(  572.598,  782.362); break;}
-			case 'A5_EXTRA'   : {$pf = array(  490.394,  666.142); break;}
-			// ANSI Series
-			case 'ANSI_E': {$pf = array( 2448.000, 3168.000); break;}
-			case 'ANSI_D': {$pf = array( 1584.000, 2448.000); break;}
-			case 'ANSI_C': {$pf = array( 1224.000, 1584.000); break;}
-			case 'ANSI_B': {$pf = array(  792.000, 1224.000); break;}
-			case 'ANSI_A': {$pf = array(  612.000,  792.000); break;}
-			// Traditional 'Loose' North American Paper Sizes
-			case 'USLEDGER':
-			case 'LEDGER' : {$pf = array( 1224.000,  792.000); break;}
-			case 'ORGANIZERK':
-			case 'BIBLE':
-			case 'USTABLOID':
-			case 'TABLOID': {$pf = array(  792.000, 1224.000); break;}
-			case 'ORGANIZERM':
-			case 'USLETTER':
-			case 'LETTER' : {$pf = array(  612.000,  792.000); break;}
-			case 'USLEGAL':
-			case 'LEGAL'  : {$pf = array(  612.000, 1008.000); break;}
-			case 'GOVERNMENTLETTER':
-			case 'GLETTER': {$pf = array(  576.000,  756.000); break;}
-			case 'JUNIORLEGAL':
-			case 'JLEGAL' : {$pf = array(  576.000,  360.000); break;}
-			// Other North American Paper Sizes
-			case 'QUADDEMY': {$pf = array( 2520.000, 3240.000); break;}
-			case 'SUPER_B': {$pf = array(  936.000, 1368.000); break;}
-			case 'QUARTO': {$pf = array(  648.000,  792.000); break;}
-			case 'GOVERNMENTLEGAL':
-			case 'FOLIO': {$pf = array(  612.000,  936.000); break;}
-			case 'MONARCH':
-			case 'EXECUTIVE': {$pf = array(  522.000,  756.000); break;}
-			case 'ORGANIZERL':
-			case 'STATEMENT':
-			case 'MEMO': {$pf = array(  396.000,  612.000); break;}
-			case 'FOOLSCAP': {$pf = array(  595.440,  936.000); break;}
-			case 'COMPACT': {$pf = array(  306.000,  486.000); break;}
-			case 'ORGANIZERJ': {$pf = array(  198.000,  360.000); break;}
-			// Canadian standard CAN 2-9.60M
-			case 'P1': {$pf = array( 1587.402, 2437.795); break;}
-			case 'P2': {$pf = array( 1218.898, 1587.402); break;}
-			case 'P3': {$pf = array(  793.701, 1218.898); break;}
-			case 'P4': {$pf = array(  609.449,  793.701); break;}
-			case 'P5': {$pf = array(  396.850,  609.449); break;}
-			case 'P6': {$pf = array(  303.307,  396.850); break;}
-			// North American Architectural Sizes
-			case 'ARCH_E' : {$pf = array( 2592.000, 3456.000); break;}
-			case 'ARCH_E1': {$pf = array( 2160.000, 3024.000); break;}
-			case 'ARCH_D' : {$pf = array( 1728.000, 2592.000); break;}
-			case 'BROADSHEET':
-			case 'ARCH_C' : {$pf = array( 1296.000, 1728.000); break;}
-			case 'ARCH_B' : {$pf = array(  864.000, 1296.000); break;}
-			case 'ARCH_A' : {$pf = array(  648.000,  864.000); break;}
-			// --- North American Envelope Sizes ---
-			//   - Announcement Envelopes
-			case 'ANNENV_A2'  : {$pf = array(  314.640,  414.000); break;}
-			case 'ANNENV_A6'  : {$pf = array(  342.000,  468.000); break;}
-			case 'ANNENV_A7'  : {$pf = array(  378.000,  522.000); break;}
-			case 'ANNENV_A8'  : {$pf = array(  396.000,  584.640); break;}
-			case 'ANNENV_A10' : {$pf = array(  450.000,  692.640); break;}
-			case 'ANNENV_SLIM': {$pf = array(  278.640,  638.640); break;}
-			//   - Commercial Envelopes
-			case 'COMMENV_N6_1/4': {$pf = array(  252.000,  432.000); break;}
-			case 'COMMENV_N6_3/4': {$pf = array(  260.640,  468.000); break;}
-			case 'COMMENV_N8'    : {$pf = array(  278.640,  540.000); break;}
-			case 'COMMENV_N9'    : {$pf = array(  278.640,  638.640); break;}
-			case 'COMMENV_N10'   : {$pf = array(  296.640,  684.000); break;}
-			case 'COMMENV_N11'   : {$pf = array(  324.000,  746.640); break;}
-			case 'COMMENV_N12'   : {$pf = array(  342.000,  792.000); break;}
-			case 'COMMENV_N14'   : {$pf = array(  360.000,  828.000); break;}
-			//   - Catalogue Envelopes
-			case 'CATENV_N1'     : {$pf = array(  432.000,  648.000); break;}
-			case 'CATENV_N1_3/4' : {$pf = array(  468.000,  684.000); break;}
-			case 'CATENV_N2'     : {$pf = array(  468.000,  720.000); break;}
-			case 'CATENV_N3'     : {$pf = array(  504.000,  720.000); break;}
-			case 'CATENV_N6'     : {$pf = array(  540.000,  756.000); break;}
-			case 'CATENV_N7'     : {$pf = array(  576.000,  792.000); break;}
-			case 'CATENV_N8'     : {$pf = array(  594.000,  810.000); break;}
-			case 'CATENV_N9_1/2' : {$pf = array(  612.000,  756.000); break;}
-			case 'CATENV_N9_3/4' : {$pf = array(  630.000,  810.000); break;}
-			case 'CATENV_N10_1/2': {$pf = array(  648.000,  864.000); break;}
-			case 'CATENV_N12_1/2': {$pf = array(  684.000,  900.000); break;}
-			case 'CATENV_N13_1/2': {$pf = array(  720.000,  936.000); break;}
-			case 'CATENV_N14_1/4': {$pf = array(  810.000,  882.000); break;}
-			case 'CATENV_N14_1/2': {$pf = array(  828.000, 1044.000); break;}
-			// Japanese (JIS P 0138-61) Standard B-Series
-			case 'JIS_B0' : {$pf = array( 2919.685, 4127.244); break;}
-			case 'JIS_B1' : {$pf = array( 2063.622, 2919.685); break;}
-			case 'JIS_B2' : {$pf = array( 1459.843, 2063.622); break;}
-			case 'JIS_B3' : {$pf = array( 1031.811, 1459.843); break;}
-			case 'JIS_B4' : {$pf = array(  728.504, 1031.811); break;}
-			case 'JIS_B5' : {$pf = array(  515.906,  728.504); break;}
-			case 'JIS_B6' : {$pf = array(  362.835,  515.906); break;}
-			case 'JIS_B7' : {$pf = array(  257.953,  362.835); break;}
-			case 'JIS_B8' : {$pf = array(  181.417,  257.953); break;}
-			case 'JIS_B9' : {$pf = array(  127.559,  181.417); break;}
-			case 'JIS_B10': {$pf = array(   90.709,  127.559); break;}
-			case 'JIS_B11': {$pf = array(   62.362,   90.709); break;}
-			case 'JIS_B12': {$pf = array(   45.354,   62.362); break;}
-			// PA Series
-			case 'PA0' : {$pf = array( 2381.102, 3174.803,); break;}
-			case 'PA1' : {$pf = array( 1587.402, 2381.102); break;}
-			case 'PA2' : {$pf = array( 1190.551, 1587.402); break;}
-			case 'PA3' : {$pf = array(  793.701, 1190.551); break;}
-			case 'PA4' : {$pf = array(  595.276,  793.701); break;}
-			case 'PA5' : {$pf = array(  396.850,  595.276); break;}
-			case 'PA6' : {$pf = array(  297.638,  396.850); break;}
-			case 'PA7' : {$pf = array(  198.425,  297.638); break;}
-			case 'PA8' : {$pf = array(  147.402,  198.425); break;}
-			case 'PA9' : {$pf = array(   99.213,  147.402); break;}
-			case 'PA10': {$pf = array(   73.701,   99.213); break;}
-			// Standard Photographic Print Sizes
-			case 'PASSPORT_PHOTO': {$pf = array(   99.213,  127.559); break;}
-			case 'E'   : {$pf = array(  233.858,  340.157); break;}
-			case 'L':
-			case '3R'  : {$pf = array(  252.283,  360.000); break;}
-			case 'KG':
-			case '4R'  : {$pf = array(  289.134,  430.866); break;}
-			case '4D'  : {$pf = array(  340.157,  430.866); break;}
-			case '2L':
-			case '5R'  : {$pf = array(  360.000,  504.567); break;}
-			case '8P':
-			case '6R'  : {$pf = array(  430.866,  575.433); break;}
-			case '6P':
-			case '8R'  : {$pf = array(  575.433,  720.000); break;}
-			case '6PW':
-			case 'S8R' : {$pf = array(  575.433,  864.567); break;}
-			case '4P':
-			case '10R' : {$pf = array(  720.000,  864.567); break;}
-			case '4PW':
-			case 'S10R': {$pf = array(  720.000, 1080.000); break;}
-			case '11R' : {$pf = array(  790.866, 1009.134); break;}
-			case 'S11R': {$pf = array(  790.866, 1224.567); break;}
-			case '12R' : {$pf = array(  864.567, 1080.000); break;}
-			case 'S12R': {$pf = array(  864.567, 1292.598); break;}
-			// Common Newspaper Sizes
-			case 'NEWSPAPER_BROADSHEET': {$pf = array( 2125.984, 1700.787); break;}
-			case 'NEWSPAPER_BERLINER'  : {$pf = array( 1332.283,  892.913); break;}
-			case 'NEWSPAPER_TABLOID':
-			case 'NEWSPAPER_COMPACT'   : {$pf = array( 1218.898,  793.701); break;}
-			// Business Cards
-			case 'CREDIT_CARD':
-			case 'BUSINESS_CARD':
-			case 'BUSINESS_CARD_ISO7810': {$pf = array(  153.014,  242.646); break;}
-			case 'BUSINESS_CARD_ISO216' : {$pf = array(  147.402,  209.764); break;}
-			case 'BUSINESS_CARD_IT':
-			case 'BUSINESS_CARD_UK':
-			case 'BUSINESS_CARD_FR':
-			case 'BUSINESS_CARD_DE':
-			case 'BUSINESS_CARD_ES'     : {$pf = array(  155.906,  240.945); break;}
-			case 'BUSINESS_CARD_CA':
-			case 'BUSINESS_CARD_US'     : {$pf = array(  144.567,  252.283); break;}
-			case 'BUSINESS_CARD_JP'     : {$pf = array(  155.906,  257.953); break;}
-			case 'BUSINESS_CARD_HK'     : {$pf = array(  153.071,  255.118); break;}
-			case 'BUSINESS_CARD_AU':
-			case 'BUSINESS_CARD_DK':
-			case 'BUSINESS_CARD_SE'     : {$pf = array(  155.906,  255.118); break;}
-			case 'BUSINESS_CARD_RU':
-			case 'BUSINESS_CARD_CZ':
-			case 'BUSINESS_CARD_FI':
-			case 'BUSINESS_CARD_HU':
-			case 'BUSINESS_CARD_IL'     : {$pf = array(  141.732,  255.118); break;}
-			// Billboards
-			case '4SHEET' : {$pf = array( 2880.000, 4320.000); break;}
-			case '6SHEET' : {$pf = array( 3401.575, 5102.362); break;}
-			case '12SHEET': {$pf = array( 8640.000, 4320.000); break;}
-			case '16SHEET': {$pf = array( 5760.000, 8640.000); break;}
-			case '32SHEET': {$pf = array(11520.000, 8640.000); break;}
-			case '48SHEET': {$pf = array(17280.000, 8640.000); break;}
-			case '64SHEET': {$pf = array(23040.000, 8640.000); break;}
-			case '96SHEET': {$pf = array(34560.000, 8640.000); break;}
-			// Old European Sizes
-			//   - Old Imperial English Sizes
-			case 'EN_EMPEROR'          : {$pf = array( 3456.000, 5184.000); break;}
-			case 'EN_ANTIQUARIAN'      : {$pf = array( 2232.000, 3816.000); break;}
-			case 'EN_GRAND_EAGLE'      : {$pf = array( 2070.000, 3024.000); break;}
-			case 'EN_DOUBLE_ELEPHANT'  : {$pf = array( 1926.000, 2880.000); break;}
-			case 'EN_ATLAS'            : {$pf = array( 1872.000, 2448.000); break;}
-			case 'EN_COLOMBIER'        : {$pf = array( 1692.000, 2484.000); break;}
-			case 'EN_ELEPHANT'         : {$pf = array( 1656.000, 2016.000); break;}
-			case 'EN_DOUBLE_DEMY'      : {$pf = array( 1620.000, 2556.000); break;}
-			case 'EN_IMPERIAL'         : {$pf = array( 1584.000, 2160.000); break;}
-			case 'EN_PRINCESS'         : {$pf = array( 1548.000, 2016.000); break;}
-			case 'EN_CARTRIDGE'        : {$pf = array( 1512.000, 1872.000); break;}
-			case 'EN_DOUBLE_LARGE_POST': {$pf = array( 1512.000, 2376.000); break;}
-			case 'EN_ROYAL'            : {$pf = array( 1440.000, 1800.000); break;}
-			case 'EN_SHEET':
-			case 'EN_HALF_POST'        : {$pf = array( 1404.000, 1692.000); break;}
-			case 'EN_SUPER_ROYAL'      : {$pf = array( 1368.000, 1944.000); break;}
-			case 'EN_DOUBLE_POST'      : {$pf = array( 1368.000, 2196.000); break;}
-			case 'EN_MEDIUM'           : {$pf = array( 1260.000, 1656.000); break;}
-			case 'EN_DEMY'             : {$pf = array( 1260.000, 1620.000); break;}
-			case 'EN_LARGE_POST'       : {$pf = array( 1188.000, 1512.000); break;}
-			case 'EN_COPY_DRAUGHT'     : {$pf = array( 1152.000, 1440.000); break;}
-			case 'EN_POST'             : {$pf = array( 1116.000, 1386.000); break;}
-			case 'EN_CROWN'            : {$pf = array( 1080.000, 1440.000); break;}
-			case 'EN_PINCHED_POST'     : {$pf = array( 1062.000, 1332.000); break;}
-			case 'EN_BRIEF'            : {$pf = array(  972.000, 1152.000); break;}
-			case 'EN_FOOLSCAP'         : {$pf = array(  972.000, 1224.000); break;}
-			case 'EN_SMALL_FOOLSCAP'   : {$pf = array(  954.000, 1188.000); break;}
-			case 'EN_POTT'             : {$pf = array(  900.000, 1080.000); break;}
-			//   - Old Imperial Belgian Sizes
-			case 'BE_GRAND_AIGLE' : {$pf = array( 1984.252, 2948.031); break;}
-			case 'BE_COLOMBIER'   : {$pf = array( 1757.480, 2409.449); break;}
-			case 'BE_DOUBLE_CARRE': {$pf = array( 1757.480, 2607.874); break;}
-			case 'BE_ELEPHANT'    : {$pf = array( 1746.142, 2182.677); break;}
-			case 'BE_PETIT_AIGLE' : {$pf = array( 1700.787, 2381.102); break;}
-			case 'BE_GRAND_JESUS' : {$pf = array( 1559.055, 2069.291); break;}
-			case 'BE_JESUS'       : {$pf = array( 1530.709, 2069.291); break;}
-			case 'BE_RAISIN'      : {$pf = array( 1417.323, 1842.520); break;}
-			case 'BE_GRAND_MEDIAN': {$pf = array( 1303.937, 1714.961); break;}
-			case 'BE_DOUBLE_POSTE': {$pf = array( 1233.071, 1601.575); break;}
-			case 'BE_COQUILLE'    : {$pf = array( 1218.898, 1587.402); break;}
-			case 'BE_PETIT_MEDIAN': {$pf = array( 1176.378, 1502.362); break;}
-			case 'BE_RUCHE'       : {$pf = array( 1020.472, 1303.937); break;}
-			case 'BE_PROPATRIA'   : {$pf = array(  977.953, 1218.898); break;}
-			case 'BE_LYS'         : {$pf = array(  898.583, 1125.354); break;}
-			case 'BE_POT'         : {$pf = array(  870.236, 1088.504); break;}
-			case 'BE_ROSETTE'     : {$pf = array(  765.354,  983.622); break;}
-			//   - Old Imperial French Sizes
-			case 'FR_UNIVERS'          : {$pf = array( 2834.646, 3685.039); break;}
-			case 'FR_DOUBLE_COLOMBIER' : {$pf = array( 2551.181, 3571.654); break;}
-			case 'FR_GRANDE_MONDE'     : {$pf = array( 2551.181, 3571.654); break;}
-			case 'FR_DOUBLE_SOLEIL'    : {$pf = array( 2267.717, 3401.575); break;}
-			case 'FR_DOUBLE_JESUS'     : {$pf = array( 2154.331, 3174.803); break;}
-			case 'FR_GRAND_AIGLE'      : {$pf = array( 2125.984, 3004.724); break;}
-			case 'FR_PETIT_AIGLE'      : {$pf = array( 1984.252, 2664.567); break;}
-			case 'FR_DOUBLE_RAISIN'    : {$pf = array( 1842.520, 2834.646); break;}
-			case 'FR_JOURNAL'          : {$pf = array( 1842.520, 2664.567); break;}
-			case 'FR_COLOMBIER_AFFICHE': {$pf = array( 1785.827, 2551.181); break;}
-			case 'FR_DOUBLE_CAVALIER'  : {$pf = array( 1757.480, 2607.874); break;}
-			case 'FR_CLOCHE'           : {$pf = array( 1700.787, 2267.717); break;}
-			case 'FR_SOLEIL'           : {$pf = array( 1700.787, 2267.717); break;}
-			case 'FR_DOUBLE_CARRE'     : {$pf = array( 1587.402, 2551.181); break;}
-			case 'FR_DOUBLE_COQUILLE'  : {$pf = array( 1587.402, 2494.488); break;}
-			case 'FR_JESUS'            : {$pf = array( 1587.402, 2154.331); break;}
-			case 'FR_RAISIN'           : {$pf = array( 1417.323, 1842.520); break;}
-			case 'FR_CAVALIER'         : {$pf = array( 1303.937, 1757.480); break;}
-			case 'FR_DOUBLE_COURONNE'  : {$pf = array( 1303.937, 2040.945); break;}
-			case 'FR_CARRE'            : {$pf = array( 1275.591, 1587.402); break;}
-			case 'FR_COQUILLE'         : {$pf = array( 1247.244, 1587.402); break;}
-			case 'FR_DOUBLE_TELLIERE'  : {$pf = array( 1247.244, 1927.559); break;}
-			case 'FR_DOUBLE_CLOCHE'    : {$pf = array( 1133.858, 1700.787); break;}
-			case 'FR_DOUBLE_POT'       : {$pf = array( 1133.858, 1757.480); break;}
-			case 'FR_ECU'              : {$pf = array( 1133.858, 1474.016); break;}
-			case 'FR_COURONNE'         : {$pf = array( 1020.472, 1303.937); break;}
-			case 'FR_TELLIERE'         : {$pf = array(  963.780, 1247.244); break;}
-			case 'FR_POT'              : {$pf = array(  878.740, 1133.858); break;}
-			// DEFAULT ISO A4
-			default: {$pf = array(  595.276,  841.890); break;}
-		}
-		return $pf;
-	}
-
-	/**
-	 * Change the format of the current page
-	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numners (width, height) or an array containing the following measures and options:<ul>
-	 * <li>['format'] = page format name (one of the above);</li>
-	 * <li>['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li>
-	 * <li>['PZ'] : The page's preferred zoom (magnification) factor.</li>
-	 * <li>['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed:</li>
-	 * <li>['MediaBox']['llx'] : lower-left x coordinate in points</li>
-	 * <li>['MediaBox']['lly'] : lower-left y coordinate in points</li>
-	 * <li>['MediaBox']['urx'] : upper-right x coordinate in points</li>
-	 * <li>['MediaBox']['ury'] : upper-right y coordinate in points</li>
-	 * <li>['CropBox'] : the visible region of default user space:</li>
-	 * <li>['CropBox']['llx'] : lower-left x coordinate in points</li>
-	 * <li>['CropBox']['lly'] : lower-left y coordinate in points</li>
-	 * <li>['CropBox']['urx'] : upper-right x coordinate in points</li>
-	 * <li>['CropBox']['ury'] : upper-right y coordinate in points</li>
-	 * <li>['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment:</li>
-	 * <li>['BleedBox']['llx'] : lower-left x coordinate in points</li>
-	 * <li>['BleedBox']['lly'] : lower-left y coordinate in points</li>
-	 * <li>['BleedBox']['urx'] : upper-right x coordinate in points</li>
-	 * <li>['BleedBox']['ury'] : upper-right y coordinate in points</li>
-	 * <li>['TrimBox'] : the intended dimensions of the finished page after trimming:</li>
-	 * <li>['TrimBox']['llx'] : lower-left x coordinate in points</li>
-	 * <li>['TrimBox']['lly'] : lower-left y coordinate in points</li>
-	 * <li>['TrimBox']['urx'] : upper-right x coordinate in points</li>
-	 * <li>['TrimBox']['ury'] : upper-right y coordinate in points</li>
-	 * <li>['ArtBox'] : the extent of the page's meaningful content:</li>
-	 * <li>['ArtBox']['llx'] : lower-left x coordinate in points</li>
-	 * <li>['ArtBox']['lly'] : lower-left y coordinate in points</li>
-	 * <li>['ArtBox']['urx'] : upper-right x coordinate in points</li>
-	 * <li>['ArtBox']['ury'] : upper-right y coordinate in points</li>
-	 * <li>['BoxColorInfo'] :specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for each of the possible page boundaries other than the MediaBox:</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['C'] : an array of three numbers in the range 0-255, representing the components in the DeviceRGB colour space.</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['W'] : the guideline width in default user units</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['S'] : the guideline style: S = Solid; D = Dashed</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['D'] : dash array defining a pattern of dashes and gaps to be used in drawing dashed guidelines</li>
-	 * <li>['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation</li>
-	 * <li>['trans']['Dur'] : The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.</li>
-	 * <li>['trans']['S'] : transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade</li>
-	 * <li>['trans']['D'] : The duration of the transition effect, in seconds.</li>
-	 * <li>['trans']['Dm'] : (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.</li>
-	 * <li>['trans']['M'] : (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.</li>
-	 * <li>['trans']['Di'] : (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.</li>
-	 * <li>['trans']['SS'] : (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.</li>
-	 * <li>['trans']['B'] : (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li>
-	 * </ul>
-	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul>
-	 * <li>P or Portrait (default)</li>
-	 * <li>L or Landscape</li>
-	 * <li>'' (empty string) for automatic orientation</li>
-	 * </ul>
-	 * @access protected
-	 * @since 3.0.015 (2008-06-06)
-	 * @see getPageSizeFromFormat()
-	 */
-	protected function setPageFormat($format, $orientation='P') {
-		if (!empty($format) AND isset($this->pagedim[$this->page])) {
-			// remove inherited values
-			unset($this->pagedim[$this->page]);
-		}
-		if (is_string($format)) {
-			// get page measures from format name
-			$pf = $this->getPageSizeFromFormat($format);
-			$this->fwPt = $pf[0];
-			$this->fhPt = $pf[1];
-		} else {
-			// the boundaries of the physical medium on which the page shall be displayed or printed
-			if (isset($format['MediaBox'])) {
-				$this->setPageBoxes($this->page, 'MediaBox', $format['MediaBox']['llx'], $format['MediaBox']['lly'], $format['MediaBox']['urx'], $format['MediaBox']['ury'], false);
-				$this->fwPt = (($format['MediaBox']['urx'] - $format['MediaBox']['llx']) * $this->k);
-				$this->fhPt = (($format['MediaBox']['ury'] - $format['MediaBox']['lly']) * $this->k);
-			} else {
-				if (isset($format[0]) AND is_numeric($format[0]) AND isset($format[1]) AND is_numeric($format[1])) {
-					$pf = array(($format[0] * $this->k), ($format[1] * $this->k));
-				} else {
-					if (!isset($format['format'])) {
-						// default value
-						$format['format'] = 'A4';
-					}
-					$pf = $this->getPageSizeFromFormat($format['format']);
-				}
-				$this->fwPt = $pf[0];
-				$this->fhPt = $pf[1];
-				$this->setPageBoxes($this->page, 'MediaBox', 0, 0, $this->fwPt, $this->fhPt, true);
-			}
-			// the visible region of default user space
-			if (isset($format['CropBox'])) {
-				$this->setPageBoxes($this->page, 'CropBox', $format['CropBox']['llx'], $format['CropBox']['lly'], $format['CropBox']['urx'], $format['CropBox']['ury'], false);
-			}
-			// the region to which the contents of the page shall be clipped when output in a production environment
-			if (isset($format['BleedBox'])) {
-				$this->setPageBoxes($this->page, 'BleedBox', $format['BleedBox']['llx'], $format['BleedBox']['lly'], $format['BleedBox']['urx'], $format['BleedBox']['ury'], false);
-			}
-			// the intended dimensions of the finished page after trimming
-			if (isset($format['TrimBox'])) {
-				$this->setPageBoxes($this->page, 'TrimBox', $format['TrimBox']['llx'], $format['TrimBox']['lly'], $format['TrimBox']['urx'], $format['TrimBox']['ury'], false);
-			}
-			// the page's meaningful content (including potential white space)
-			if (isset($format['ArtBox'])) {
-				$this->setPageBoxes($this->page, 'ArtBox', $format['ArtBox']['llx'], $format['ArtBox']['lly'], $format['ArtBox']['urx'], $format['ArtBox']['ury'], false);
-			}
-			// specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for the various page boundaries
-			if (isset($format['BoxColorInfo'])) {
-				$this->pagedim[$this->page]['BoxColorInfo'] = $format['BoxColorInfo'];
-			}
-			if (isset($format['Rotate']) AND (($format['Rotate'] % 90) == 0)) {
-				// The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
-				$this->pagedim[$this->page]['Rotate'] = intval($format['Rotate']);
-			}
-			if (isset($format['PZ'])) {
-				// The page's preferred zoom (magnification) factor
-				$this->pagedim[$this->page]['PZ'] = floatval($format['PZ']);
-			}
-			if (isset($format['trans'])) {
-				// The style and duration of the visual transition to use when moving from another page to the given page during a presentation
-				if (isset($format['trans']['Dur'])) {
-					// The page's display duration
-					$this->pagedim[$this->page]['trans']['Dur'] = floatval($format['trans']['Dur']);
-				}
-				$stansition_styles = array('Split', 'Blinds', 'Box', 'Wipe', 'Dissolve', 'Glitter', 'R', 'Fly', 'Push', 'Cover', 'Uncover', 'Fade');
-				if (isset($format['trans']['S']) AND in_array($format['trans']['S'], $stansition_styles)) {
-					// The transition style that shall be used when moving to this page from another during a presentation
-					$this->pagedim[$this->page]['trans']['S'] = $format['trans']['S'];
-					$valid_effect = array('Split', 'Blinds');
-					$valid_vals = array('H', 'V');
-					if (isset($format['trans']['Dm']) AND in_array($format['trans']['S'], $valid_effect) AND in_array($format['trans']['Dm'], $valid_vals)) {
-						$this->pagedim[$this->page]['trans']['Dm'] = $format['trans']['Dm'];
-					}
-					$valid_effect = array('Split', 'Box', 'Fly');
-					$valid_vals = array('I', 'O');
-					if (isset($format['trans']['M']) AND in_array($format['trans']['S'], $valid_effect) AND in_array($format['trans']['M'], $valid_vals)) {
-						$this->pagedim[$this->page]['trans']['M'] = $format['trans']['M'];
-					}
-					$valid_effect = array('Wipe', 'Glitter', 'Fly', 'Cover', 'Uncover', 'Push');
-					if (isset($format['trans']['Di']) AND in_array($format['trans']['S'], $valid_effect)) {
-						if (((($format['trans']['Di'] == 90) OR ($format['trans']['Di'] == 180)) AND ($format['trans']['S'] == 'Wipe'))
-							OR (($format['trans']['Di'] == 315) AND ($format['trans']['S'] == 'Glitter'))
-							OR (($format['trans']['Di'] == 0) OR ($format['trans']['Di'] == 270))) {
-							$this->pagedim[$this->page]['trans']['Di'] = intval($format['trans']['Di']);
-						}
-					}
-					if (isset($format['trans']['SS']) AND ($format['trans']['S'] == 'Fly')) {
-						$this->pagedim[$this->page]['trans']['SS'] = floatval($format['trans']['SS']);
-					}
-					if (isset($format['trans']['B']) AND ($format['trans']['B'] === true) AND ($format['trans']['S'] == 'Fly')) {
-						$this->pagedim[$this->page]['trans']['B'] = 'true';
-					}
-				} else {
-					$this->pagedim[$this->page]['trans']['S'] = 'R';
-				}
-				if (isset($format['trans']['D'])) {
-					// The duration of the transition effect, in seconds
-					$this->pagedim[$this->page]['trans']['D'] = floatval($format['trans']['D']);
-				} else {
-					$this->pagedim[$this->page]['trans']['D'] = 1;
-				}
-			}
-		}
-		$this->setPageOrientation($orientation);
-	}
-
-	/**
-	 * Set page boundaries.
-	 * @param int $page page number
-	 * @param string $type valid values are: <ul><li>'MediaBox' : the boundaries of the physical medium on which the page shall be displayed or printed;</li><li>'CropBox' : the visible region of default user space;</li><li>'BleedBox' : the region to which the contents of the page shall be clipped when output in a production environment;</li><li>'TrimBox' : the intended dimensions of the finished page after trimming;</li><li>'ArtBox' : the page's meaningful content (including potential white space).</li></ul>
-	 * @param float $llx lower-left x coordinate in user units
-	 * @param float $lly lower-left y coordinate in user units
-	 * @param float $urx upper-right x coordinate in user units
-	 * @param float $ury upper-right y coordinate in user units
-	 * @param boolean $points if true uses user units as unit of measure, otherwise uses PDF points
-	 * @access public
-	 * @since 5.0.010 (2010-05-17)
-	 */
-	public function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false) {
-		if (!isset($this->pagedim[$page])) {
-			// initialize array
-			$this->pagedim[$page] = array();
-		}
-		$pageboxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
-		if (!in_array($type, $pageboxes)) {
-			return;
-		}
-		if ($points) {
-			$k = 1;
-		} else {
-			$k = $this->k;
-		}
-		$this->pagedim[$page][$type]['llx'] = ($llx * $k);
-		$this->pagedim[$page][$type]['lly'] = ($lly * $k);
-		$this->pagedim[$page][$type]['urx'] = ($urx * $k);
-		$this->pagedim[$page][$type]['ury'] = ($ury * $k);
-	}
-
-	/**
-	 * Swap X and Y coordinates of page boxes (change page boxes orientation).
-	 * @param int $page page number
-	 * @access protected
-	 * @since 5.0.010 (2010-05-17)
-	 */
-	protected function swapPageBoxCoordinates($page) {
-		$pageboxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
-		foreach ($pageboxes as $type) {
-			// swap X and Y coordinates
-			if (isset($this->pagedim[$page][$type])) {
-				$tmp = $this->pagedim[$page][$type]['llx'];
-				$this->pagedim[$page][$type]['llx'] = $this->pagedim[$page][$type]['lly'];
-				$this->pagedim[$page][$type]['lly'] = $tmp;
-				$tmp = $this->pagedim[$page][$type]['urx'];
-				$this->pagedim[$page][$type]['urx'] = $this->pagedim[$page][$type]['ury'];
-				$this->pagedim[$page][$type]['ury'] = $tmp;
-			}
-		}
-	}
-
-	/**
-	 * Set page orientation.
-	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-	 * @param boolean $autopagebreak Boolean indicating if auto-page-break mode should be on or off.
-	 * @param float $bottommargin bottom margin of the page.
-	 * @access public
-	 * @since 3.0.015 (2008-06-06)
-	 */
-	public function setPageOrientation($orientation, $autopagebreak='', $bottommargin='') {
-		if (!isset($this->pagedim[$this->page]['MediaBox'])) {
-			// the boundaries of the physical medium on which the page shall be displayed or printed
-			$this->setPageBoxes($this->page, 'MediaBox', 0, 0, $this->fwPt, $this->fhPt, true);
-		}
-		if (!isset($this->pagedim[$this->page]['CropBox'])) {
-			// the visible region of default user space
-			$this->setPageBoxes($this->page, 'CropBox', $this->pagedim[$this->page]['MediaBox']['llx'], $this->pagedim[$this->page]['MediaBox']['lly'], $this->pagedim[$this->page]['MediaBox']['urx'], $this->pagedim[$this->page]['MediaBox']['ury'], true);
-		}
-		if (!isset($this->pagedim[$this->page]['BleedBox'])) {
-			// the region to which the contents of the page shall be clipped when output in a production environment
-			$this->setPageBoxes($this->page, 'BleedBox', $this->pagedim[$this->page]['CropBox']['llx'], $this->pagedim[$this->page]['CropBox']['lly'], $this->pagedim[$this->page]['CropBox']['urx'], $this->pagedim[$this->page]['CropBox']['ury'], true);
-		}
-		if (!isset($this->pagedim[$this->page]['TrimBox'])) {
-			// the intended dimensions of the finished page after trimming
-			$this->setPageBoxes($this->page, 'TrimBox', $this->pagedim[$this->page]['CropBox']['llx'], $this->pagedim[$this->page]['CropBox']['lly'], $this->pagedim[$this->page]['CropBox']['urx'], $this->pagedim[$this->page]['CropBox']['ury'], true);
-		}
-		if (!isset($this->pagedim[$this->page]['ArtBox'])) {
-			// the page's meaningful content (including potential white space)
-			$this->setPageBoxes($this->page, 'ArtBox', $this->pagedim[$this->page]['CropBox']['llx'], $this->pagedim[$this->page]['CropBox']['lly'], $this->pagedim[$this->page]['CropBox']['urx'], $this->pagedim[$this->page]['CropBox']['ury'], true);
-		}
-		if (!isset($this->pagedim[$this->page]['Rotate'])) {
-			// The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.
-			$this->pagedim[$this->page]['Rotate'] = 0;
-		}
-		if (!isset($this->pagedim[$this->page]['PZ'])) {
-			// The page's preferred zoom (magnification) factor
-			$this->pagedim[$this->page]['PZ'] = 1;
-		}
-		if ($this->fwPt > $this->fhPt) {
-			// landscape
-			$default_orientation = 'L';
-		} else {
-			// portrait
-			$default_orientation = 'P';
-		}
-		$valid_orientations = array('P', 'L');
-		if (empty($orientation)) {
-			$orientation = $default_orientation;
-		} else {
-			$orientation = strtoupper($orientation{0});
-		}
-		if (in_array($orientation, $valid_orientations) AND ($orientation != $default_orientation)) {
-			$this->CurOrientation = $orientation;
-			$this->wPt = $this->fhPt;
-			$this->hPt = $this->fwPt;
-		} else {
-			$this->CurOrientation = $default_orientation;
-			$this->wPt = $this->fwPt;
-			$this->hPt = $this->fhPt;
-		}
-		if ((abs($this->pagedim[$this->page]['MediaBox']['urx'] - $this->hPt) < $this->feps) AND (abs($this->pagedim[$this->page]['MediaBox']['ury'] - $this->wPt) < $this->feps)){
-			// swap X and Y coordinates (change page orientation)
-			$this->swapPageBoxCoordinates($this->page);
-		}
-		$this->w = $this->wPt / $this->k;
-		$this->h = $this->hPt / $this->k;
-		if ($this->empty_string($autopagebreak)) {
-			if (isset($this->AutoPageBreak)) {
-				$autopagebreak = $this->AutoPageBreak;
-			} else {
-				$autopagebreak = true;
-			}
-		}
-		if ($this->empty_string($bottommargin)) {
-			if (isset($this->bMargin)) {
-				$bottommargin = $this->bMargin;
-			} else {
-				// default value = 2 cm
-				$bottommargin = 2 * 28.35 / $this->k;
-			}
-		}
-		$this->SetAutoPageBreak($autopagebreak, $bottommargin);
-		// store page dimensions
-		$this->pagedim[$this->page]['w'] = $this->wPt;
-		$this->pagedim[$this->page]['h'] = $this->hPt;
-		$this->pagedim[$this->page]['wk'] = $this->w;
-		$this->pagedim[$this->page]['hk'] = $this->h;
-		$this->pagedim[$this->page]['tm'] = $this->tMargin;
-		$this->pagedim[$this->page]['bm'] = $bottommargin;
-		$this->pagedim[$this->page]['lm'] = $this->lMargin;
-		$this->pagedim[$this->page]['rm'] = $this->rMargin;
-		$this->pagedim[$this->page]['pb'] = $autopagebreak;
-		$this->pagedim[$this->page]['or'] = $this->CurOrientation;
-		$this->pagedim[$this->page]['olm'] = $this->original_lMargin;
-		$this->pagedim[$this->page]['orm'] = $this->original_rMargin;
-	}
-
-	/**
-	 * Set regular expression to detect withespaces or word separators.
-	 * The pattern delimiter must be the forward-slash character '/'.
-	 * Some example patterns are:
-	 * <pre>
-	 * Non-Unicode or missing PCRE unicode support: '/[^\S\xa0]/'
-	 * Unicode and PCRE unicode support: '/[^\S\P{Z}\xa0]/u'
-	 * Unicode and PCRE unicode support in Chinese mode: '/[^\S\P{Z}\P{Lo}\xa0]/u'
-	 * if PCRE unicode support is turned ON (\P is the negate class of \p):
-	 * 	\p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
-	 * 	\p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
-	 * 	\p{Lo} is needed for Chinese characters because are packed next to each other without spaces in between.
-	 * </pre>
-	 * @param string $re regular expression (leave empty for default).
-	 * @access public
-	 * @since 4.6.016 (2009-06-15)
-	 */
-	public function setSpacesRE($re='/[^\S\xa0]/') {
-		$this->re_spaces = $re;
-		$re_parts = explode('/', $re);
-		// get pattern parts
-		$this->re_space = array();
-		if (isset($re_parts[1]) AND !empty($re_parts[1])) {
-			$this->re_space['p'] = $re_parts[1];
-		} else {
-			$this->re_space['p'] = '[\s]';
-		}
-		// set pattern modifiers
-		if (isset($re_parts[2]) AND !empty($re_parts[2])) {
-			$this->re_space['m'] = $re_parts[2];
-		} else {
-			$this->re_space['m'] = '';
-		}
-	}
-
-	/**
-	 * Enable or disable Right-To-Left language mode
-	 * @param Boolean $enable if true enable Right-To-Left language mode.
-	 * @param Boolean $resetx if true reset the X position on direction change.
-	 * @access public
-	 * @since 2.0.000 (2008-01-03)
-	 */
-	public function setRTL($enable, $resetx=true) {
-		$enable = $enable ? true : false;
-		$resetx = ($resetx AND ($enable != $this->rtl));
-		$this->rtl = $enable;
-		$this->tmprtl = false;
-		if ($resetx) {
-			$this->Ln(0);
-		}
-	}
-
-	/**
-	 * Return the RTL status
-	 * @return boolean
-	 * @access public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getRTL() {
-		return $this->rtl;
-	}
-
-	/**
-	 * Force temporary RTL language direction
-	 * @param mixed $mode can be false, 'L' for LTR or 'R' for RTL
-	 * @access public
-	 * @since 2.1.000 (2008-01-09)
-	 */
-	public function setTempRTL($mode) {
-		$newmode = false;
-		switch (strtoupper($mode)) {
-			case 'LTR':
-			case 'L': {
-				if ($this->rtl) {
-					$newmode = 'L';
-				}
-				break;
-			}
-			case 'RTL':
-			case 'R': {
-				if (!$this->rtl) {
-					$newmode = 'R';
-				}
-				break;
-			}
-			case false:
-			default: {
-				$newmode = false;
-				break;
-			}
-		}
-		$this->tmprtl = $newmode;
-	}
-
-	/**
-	 * Return the current temporary RTL status
-	 * @return boolean
-	 * @access public
-	 * @since 4.8.014 (2009-11-04)
-	 */
-	public function isRTLTextDir() {
-		return ($this->rtl OR ($this->tmprtl == 'R'));
-	}
-
-	/**
-	 * Set the last cell height.
-	 * @param float $h cell height.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.53.0.TC034
-	 */
-	public function setLastH($h) {
-		$this->lasth = $h;
-	}
-
-	/**
-	 * Reset the last cell height.
-	 * @access public
-	 * @since 5.9.000 (2010-10-03)
-	 */
-	public function resetLastH() {
-		$this->lasth = ($this->FontSize * $this->cell_height_ratio) + $this->cell_padding['T'] + $this->cell_padding['B'];
-	}
-
-	/**
-	 * Get the last cell height.
-	 * @return last cell height
-	 * @access public
-	 * @since 4.0.017 (2008-08-05)
-	 */
-	public function getLastH() {
-		return $this->lasth;
-	}
-
-	/**
-	 * Set the adjusting factor to convert pixels to user units.
-	 * @param float $scale adjusting factor to convert pixels to user units.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.5.2
-	 */
-	public function setImageScale($scale) {
-		$this->imgscale = $scale;
-	}
-
-	/**
-	 * Returns the adjusting factor to convert pixels to user units.
-	 * @return float adjusting factor to convert pixels to user units.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.5.2
-	 */
-	public function getImageScale() {
-		return $this->imgscale;
-	}
-
-	/**
-	 * Returns an array of page dimensions:
-	 * <ul><li>$this->pagedim[$this->page]['w'] = page width in points</li><li>$this->pagedim[$this->page]['h'] = height in points</li><li>$this->pagedim[$this->page]['wk'] = page width in user units</li><li>$this->pagedim[$this->page]['hk'] = page height in user units</li><li>$this->pagedim[$this->page]['tm'] = top margin</li><li>$this->pagedim[$this->page]['bm'] = bottom margin</li><li>$this->pagedim[$this->page]['lm'] = left margin</li><li>$this->pagedim[$this->page]['rm'] = right margin</li><li>$this->pagedim[$this->page]['pb'] = auto page break</li><li>$this->pagedim[$this->page]['or'] = page orientation</li><li>$this->pagedim[$this->page]['olm'] = original left margin</li><li>$this->pagedim[$this->page]['orm'] = original right margin</li><li>$this->pagedim[$this->page]['Rotate'] = The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li><li>$this->pagedim[$this->page]['PZ'] = The page's preferred zoom (magnification) factor.</li><li>$this->pagedim[$this->page]['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation<ul><li>$this->pagedim[$this->page]['trans']['Dur'] = The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.</li><li>$this->pagedim[$this->page]['trans']['S'] = transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade</li><li>$this->pagedim[$this->page]['trans']['D'] = The duration of the transition effect, in seconds.</li><li>$this->pagedim[$this->page]['trans']['Dm'] = (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.</li><li>$this->pagedim[$this->page]['trans']['M'] = (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.</li><li>$this->pagedim[$this->page]['trans']['Di'] = (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.</li><li>$this->pagedim[$this->page]['trans']['SS'] = (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0. </li><li>$this->pagedim[$this->page]['trans']['B'] = (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li></ul></li><li>$this->pagedim[$this->page]['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed<ul><li>$this->pagedim[$this->page]['MediaBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['CropBox'] : the visible region of default user space<ul><li>$this->pagedim[$this->page]['CropBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment<ul><li>$this->pagedim[$this->page]['BleedBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['TrimBox'] : the intended dimensions of the finished page after trimming<ul><li>$this->pagedim[$this->page]['TrimBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['ArtBox'] : the extent of the page's meaningful content<ul><li>$this->pagedim[$this->page]['ArtBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['ury'] = upper-right y coordinate in points</li></ul></li></ul>
-	 * @param int $pagenum page number (empty = current page)
-	 * @return array of page dimensions.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 4.5.027 (2009-03-16)
-	 */
-	public function getPageDimensions($pagenum='') {
-		if (empty($pagenum)) {
-			$pagenum = $this->page;
-		}
-		return $this->pagedim[$pagenum];
-	}
-
-	/**
-	 * Returns the page width in units.
-	 * @param int $pagenum page number (empty = current page)
-	 * @return int page width.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.5.2
-	 * @see getPageDimensions()
-	 */
-	public function getPageWidth($pagenum='') {
-		if (empty($pagenum)) {
-			return $this->w;
-		}
-		return $this->pagedim[$pagenum]['w'];
-	}
-
-	/**
-	 * Returns the page height in units.
-	 * @param int $pagenum page number (empty = current page)
-	 * @return int page height.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.5.2
-	 * @see getPageDimensions()
-	 */
-	public function getPageHeight($pagenum='') {
-		if (empty($pagenum)) {
-			return $this->h;
-		}
-		return $this->pagedim[$pagenum]['h'];
-	}
-
-	/**
-	 * Returns the page break margin.
-	 * @param int $pagenum page number (empty = current page)
-	 * @return int page break margin.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.5.2
-	 * @see getPageDimensions()
-	 */
-	public function getBreakMargin($pagenum='') {
-		if (empty($pagenum)) {
-			return $this->bMargin;
-		}
-		return $this->pagedim[$pagenum]['bm'];
-	}
-
-	/**
-	 * Returns the scale factor (number of points in user unit).
-	 * @return int scale factor.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.5.2
-	 */
-	public function getScaleFactor() {
-		return $this->k;
-	}
-
-	/**
-	 * Defines the left, top and right margins.
-	 * @param float $left Left margin.
-	 * @param float $top Top margin.
-	 * @param float $right Right margin. Default value is the left one.
-	 * @param boolean $keepmargins if true overwrites the default page margins
-	 * @access public
-	 * @since 1.0
-	 * @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
-	 */
-	public function SetMargins($left, $top, $right=-1, $keepmargins=false) {
-		//Set left, top and right margins
-		$this->lMargin = $left;
-		$this->tMargin = $top;
-		if ($right == -1) {
-			$right = $left;
-		}
-		$this->rMargin = $right;
-		if ($keepmargins) {
-			// overwrite original values
-			$this->original_lMargin = $this->lMargin;
-			$this->original_rMargin = $this->rMargin;
-		}
-	}
-
-	/**
-	 * Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
-	 * @param float $margin The margin.
-	 * @access public
-	 * @since 1.4
-	 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-	 */
-	public function SetLeftMargin($margin) {
-		//Set left margin
-		$this->lMargin = $margin;
-		if (($this->page > 0) AND ($this->x < $margin)) {
-			$this->x = $margin;
-		}
-	}
-
-	/**
-	 * Defines the top margin. The method can be called before creating the first page.
-	 * @param float $margin The margin.
-	 * @access public
-	 * @since 1.5
-	 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
-	 */
-	public function SetTopMargin($margin) {
-		//Set top margin
-		$this->tMargin = $margin;
-		if (($this->page > 0) AND ($this->y < $margin)) {
-			$this->y = $margin;
-		}
-	}
-
-	/**
-	 * Defines the right margin. The method can be called before creating the first page.
-	 * @param float $margin The margin.
-	 * @access public
-	 * @since 1.5
-	 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
-	 */
-	public function SetRightMargin($margin) {
-		$this->rMargin = $margin;
-		if (($this->page > 0) AND ($this->x > ($this->w - $margin))) {
-			$this->x = $this->w - $margin;
-		}
-	}
-
-	/**
-	 * Set the same internal Cell padding for top, right, bottom, left-
-	 * @param float $pad internal padding.
-	 * @access public
-	 * @since 2.1.000 (2008-01-09)
-	 * @see getCellPaddings(), setCellPaddings()
-	 */
-	public function SetCellPadding($pad) {
-		if ($pad >= 0) {
-			$this->cell_padding['L'] = $pad;
-			$this->cell_padding['T'] = $pad;
-			$this->cell_padding['R'] = $pad;
-			$this->cell_padding['B'] = $pad;
-		}
-	}
-
-	/**
-	 * Set the internal Cell paddings.
-	 * @param float $left left padding
-	 * @param float $top top padding
-	 * @param float $right right padding
-	 * @param float $bottom bottom padding
-	 * @access public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see getCellPaddings(), SetCellPadding()
-	 */
-	public function setCellPaddings($left='', $top='', $right='', $bottom='') {
-		if (($left !== '') AND ($left >= 0)) {
-			$this->cell_padding['L'] = $left;
-		}
-		if (($top !== '') AND ($top >= 0)) {
-			$this->cell_padding['T'] = $top;
-		}
-		if (($right !== '') AND ($right >= 0)) {
-			$this->cell_padding['R'] = $right;
-		}
-		if (($bottom !== '') AND ($bottom >= 0)) {
-			$this->cell_padding['B'] = $bottom;
-		}
-	}
-
-	/**
-	 * Get the internal Cell padding array.
-	 * @return array of padding values
-	 * @access public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see setCellPaddings(), SetCellPadding()
-	 */
-	public function getCellPaddings() {
-		return $this->cell_padding;
-	}
-
-	/**
-	 * Set the internal Cell margins.
-	 * @param float $left left margin
-	 * @param float $top top margin
-	 * @param float $right right margin
-	 * @param float $bottom bottom margin
-	 * @access public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see getCellMargins()
-	 */
-	public function setCellMargins($left='', $top='', $right='', $bottom='') {
-		if (($left !== '') AND ($left >= 0)) {
-			$this->cell_margin['L'] = $left;
-		}
-		if (($top !== '') AND ($top >= 0)) {
-			$this->cell_margin['T'] = $top;
-		}
-		if (($right !== '') AND ($right >= 0)) {
-			$this->cell_margin['R'] = $right;
-		}
-		if (($bottom !== '') AND ($bottom >= 0)) {
-			$this->cell_margin['B'] = $bottom;
-		}
-	}
-
-	/**
-	 * Get the internal Cell margin array.
-	 * @return array of margin values
-	 * @access public
-	 * @since 5.9.000 (2010-10-03)
-	 * @see setCellMargins()
-	 */
-	public function getCellMargins() {
-		return $this->cell_margin;
-	}
-
-	/**
-	 * Adjust the internal Cell padding array to take account of the line width.
-	 * @param mixed $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return array of adjustments
-	 * @access public
-	 * @since 5.9.000 (2010-10-03)
-	 */
-	protected function adjustCellPadding($brd=0) {
-		if (empty($brd)) {
-			return;
-		}
-		if (is_string($brd)) {
-			// convert string to array
-			$slen = strlen($brd);
-			$newbrd = array();
-			for ($i = 0; $i < $slen; ++$i) {
-				$newbrd[$brd{$i}] = true;
-			}
-			$brd = $newbrd;
-		} elseif (($brd === 1) OR ($brd === true) OR (is_numeric($brd) AND (intval($brd) > 0))) {
-			$brd = array('LRTB' => true);
-		}
-		if (!is_array($brd)) {
-			return;
-		}
-		// store current cell padding
-		$cp = $this->cell_padding;
-		// select border mode
-		if (isset($brd['mode'])) {
-			$mode = $brd['mode'];
-			unset($brd['mode']);
-		} else {
-			$mode = 'normal';
-		}
-		// process borders
-		foreach ($brd as $border => $style) {
-			$line_width = $this->LineWidth;
-			if (is_array($style) AND isset($style['width'])) {
-				// get border width
-				$line_width = $style['width'];
-			}
-			$adj = 0; // line width inside the cell
-			switch ($mode) {
-				case 'ext': {
-					$adj = 0;
-					break;
-				}
-				case 'int': {
-					$adj = $line_width;
-					break;
-				}
-				case 'normal':
-				default: {
-					$adj = ($line_width / 2);
-					break;
-				}
-			}
-			// correct internal cell padding if required to avoid overlap between text and lines
-			if ((strpos($border,'T') !== false) AND ($this->cell_padding['T'] < $adj)) {
-				$this->cell_padding['T'] = $adj;
-			}
-			if ((strpos($border,'R') !== false) AND ($this->cell_padding['R'] < $adj)) {
-				$this->cell_padding['R'] = $adj;
-			}
-			if ((strpos($border,'B') !== false) AND ($this->cell_padding['B'] < $adj)) {
-				$this->cell_padding['B'] = $adj;
-			}
-			if ((strpos($border,'L') !== false) AND ($this->cell_padding['L'] < $adj)) {
-				$this->cell_padding['L'] = $adj;
-			}
-		}
-		return array('T' => ($this->cell_padding['T'] - $cp['T']), 'R' => ($this->cell_padding['R'] - $cp['R']), 'B' => ($this->cell_padding['B'] - $cp['B']), 'L' => ($this->cell_padding['L'] - $cp['L']));
-	}
-
-	/**
-	 * Enables or disables the automatic page breaking mode. When enabling, the second parameter is the distance from the bottom of the page that defines the triggering limit. By default, the mode is on and the margin is 2 cm.
-	 * @param boolean $auto Boolean indicating if mode should be on or off.
-	 * @param float $margin Distance from the bottom of the page.
-	 * @access public
-	 * @since 1.0
-	 * @see Cell(), MultiCell(), AcceptPageBreak()
-	 */
-	public function SetAutoPageBreak($auto, $margin=0) {
-		//Set auto page break mode and triggering margin
-		$this->AutoPageBreak = $auto;
-		$this->bMargin = $margin;
-		$this->PageBreakTrigger = $this->h - $margin;
-	}
-
-	/**
-	 * Defines the way the document is to be displayed by the viewer.
-	 * @param mixed $zoom The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
-	 * @param string $layout The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
-	 * @param string $mode A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
-	 * @access public
-	 * @since 1.2
-	 */
-	public function SetDisplayMode($zoom, $layout='SinglePage', $mode='UseNone') {
-		//Set display mode in viewer
-		if (($zoom == 'fullpage') OR ($zoom == 'fullwidth') OR ($zoom == 'real') OR ($zoom == 'default') OR (!is_string($zoom))) {
-			$this->ZoomMode = $zoom;
-		} else {
-			$this->Error('Incorrect zoom display mode: '.$zoom);
-		}
-		switch ($layout) {
-			case 'default':
-			case 'single':
-			case 'SinglePage': {
-				$this->LayoutMode = 'SinglePage';
-				break;
-			}
-			case 'continuous':
-			case 'OneColumn': {
-				$this->LayoutMode = 'OneColumn';
-				break;
-			}
-			case 'two':
-			case 'TwoColumnLeft': {
-				$this->LayoutMode = 'TwoColumnLeft';
-				break;
-			}
-			case 'TwoColumnRight': {
-				$this->LayoutMode = 'TwoColumnRight';
-				break;
-			}
-			case 'TwoPageLeft': {
-				$this->LayoutMode = 'TwoPageLeft';
-				break;
-			}
-			case 'TwoPageRight': {
-				$this->LayoutMode = 'TwoPageRight';
-				break;
-			}
-			default: {
-				$this->LayoutMode = 'SinglePage';
-			}
-		}
-		switch ($mode) {
-			case 'UseNone': {
-				$this->PageMode = 'UseNone';
-				break;
-			}
-			case 'UseOutlines': {
-				$this->PageMode = 'UseOutlines';
-				break;
-			}
-			case 'UseThumbs': {
-				$this->PageMode = 'UseThumbs';
-				break;
-			}
-			case 'FullScreen': {
-				$this->PageMode = 'FullScreen';
-				break;
-			}
-			case 'UseOC': {
-				$this->PageMode = 'UseOC';
-				break;
-			}
-			case '': {
-				$this->PageMode = 'UseAttachments';
-				break;
-			}
-			default: {
-				$this->PageMode = 'UseNone';
-			}
-		}
-	}
-
-	/**
-	 * Activates or deactivates page compression. When activated, the internal representation of each page is compressed, which leads to a compression ratio of about 2 for the resulting document. Compression is on by default.
-	 * Note: the Zlib extension is required for this feature. If not present, compression will be turned off.
-	 * @param boolean $compress Boolean indicating if compression must be enabled.
-	 * @access public
-	 * @since 1.4
-	 */
-	public function SetCompression($compress) {
-		//Set page compression
-		if (function_exists('gzcompress')) {
-			$this->compress = $compress ? true : false;
-		} else {
-			$this->compress = false;
-		}
-	}
-
-	/**
-	 * Defines the title of the document.
-	 * @param string $title The title.
-	 * @access public
-	 * @since 1.2
-	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
-	 */
-	public function SetTitle($title) {
-		//Title of document
-		$this->title = $title;
-	}
-
-	/**
-	 * Defines the subject of the document.
-	 * @param string $subject The subject.
-	 * @access public
-	 * @since 1.2
-	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
-	 */
-	public function SetSubject($subject) {
-		//Subject of document
-		$this->subject = $subject;
-	}
-
-	/**
-	 * Defines the author of the document.
-	 * @param string $author The name of the author.
-	 * @access public
-	 * @since 1.2
-	 * @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
-	 */
-	public function SetAuthor($author) {
-		//Author of document
-		$this->author = $author;
-	}
-
-	/**
-	 * Associates keywords with the document, generally in the form 'keyword1 keyword2 ...'.
-	 * @param string $keywords The list of keywords.
-	 * @access public
-	 * @since 1.2
-	 * @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
-	 */
-	public function SetKeywords($keywords) {
-		//Keywords of document
-		$this->keywords = $keywords;
-	}
-
-	/**
-	 * Defines the creator of the document. This is typically the name of the application that generates the PDF.
-	 * @param string $creator The name of the creator.
-	 * @access public
-	 * @since 1.2
-	 * @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
-	 */
-	public function SetCreator($creator) {
-		//Creator of document
-		$this->creator = $creator;
-	}
-
-	/**
-	 * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution. An inherited class may override it to customize the error handling but should always halt the script, or the resulting document would probably be invalid.
-	 * 2004-06-11 :: Nicola Asuni : changed bold tag with strong
-	 * @param string $msg The error message
-	 * @access public
-	 * @since 1.0
-	 */
-	public function Error($msg) {
-		// unset all class variables
-		$this->_destroy(true);
-		// exit program and print error
-		die('<strong>TCPDF ERROR: </strong>'.$msg);
-	}
-
-	/**
-	 * This method begins the generation of the PDF document.
-	 * It is not necessary to call it explicitly because AddPage() does it automatically.
-	 * Note: no page is created by this method
-	 * @access public
-	 * @since 1.0
-	 * @see AddPage(), Close()
-	 */
-	public function Open() {
-		//Begin document
-		$this->state = 1;
-	}
-
-	/**
-	 * Terminates the PDF document.
-	 * It is not necessary to call this method explicitly because Output() does it automatically.
-	 * If the document contains no page, AddPage() is called to prevent from getting an invalid document.
-	 * @access public
-	 * @since 1.0
-	 * @see Open(), Output()
-	 */
-	public function Close() {
-		if ($this->state == 3) {
-			return;
-		}
-		if ($this->page == 0) {
-			$this->AddPage();
-		}
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		$this->lastpage(true);
-		$this->SetAutoPageBreak(false);
-		$this->x = 0;
-		$this->y = $this->h - (1 / $this->k);
-		$this->lMargin = 0;
-		$this->_out('q');
-		$this->setVisibility('screen');
-		$this->SetFont('helvetica', '', 1);
-		$this->SetTextColor(255, 255, 255);
-		$msg = "\x50\x6f\x77\x65\x72\x65\x64\x20\x62\x79\x20\x54\x43\x50\x44\x46\x20\x28\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
-		$lnk = "\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67";
-		$this->Cell(0, 0, $msg, 0, 0, 'L', 0, $lnk, 0, false, 'D', 'B');
-		$this->setVisibility('all');
-		$this->_out('Q');
-		// restore graphic settings
-		$this->setGraphicVars($gvars);
-		// close page
-		$this->endPage();
-		// close document
-		$this->_enddoc();
-		// unset all class variables (except critical ones)
-		$this->_destroy(false);
-	}
-
-	/**
-	 * Move pointer at the specified document page and update page dimensions.
-	 * @param int $pnum page number (1 ... numpages)
-	 * @param boolean $resetmargins if true reset left, right, top margins and Y position.
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see getPage(), lastpage(), getNumPages()
-	 */
-	public function setPage($pnum, $resetmargins=false) {
-		if (($pnum == $this->page) AND ($this->state == 2)) {
-			return;
-		}
-		if (($pnum > 0) AND ($pnum <= $this->numpages)) {
-			$this->state = 2;
-			// save current graphic settings
-			//$gvars = $this->getGraphicVars();
-			$oldpage = $this->page;
-			$this->page = $pnum;
-			$this->wPt = $this->pagedim[$this->page]['w'];
-			$this->hPt = $this->pagedim[$this->page]['h'];
-			$this->w = $this->pagedim[$this->page]['wk'];
-			$this->h = $this->pagedim[$this->page]['hk'];
-			$this->tMargin = $this->pagedim[$this->page]['tm'];
-			$this->bMargin = $this->pagedim[$this->page]['bm'];
-			$this->original_lMargin = $this->pagedim[$this->page]['olm'];
-			$this->original_rMargin = $this->pagedim[$this->page]['orm'];
-			$this->AutoPageBreak = $this->pagedim[$this->page]['pb'];
-			$this->CurOrientation = $this->pagedim[$this->page]['or'];
-			$this->SetAutoPageBreak($this->AutoPageBreak, $this->bMargin);
-			// restore graphic settings
-			//$this->setGraphicVars($gvars);
-			if ($resetmargins) {
-				$this->lMargin = $this->pagedim[$this->page]['olm'];
-				$this->rMargin = $this->pagedim[$this->page]['orm'];
-				$this->SetY($this->tMargin);
-			} else {
-				// account for booklet mode
-				if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-					$deltam = $this->pagedim[$this->page]['olm'] - $this->pagedim[$this->page]['orm'];
-					$this->lMargin += $deltam;
-					$this->rMargin -= $deltam;
-				}
-			}
-		} else {
-			$this->Error('Wrong page number on setPage() function: '.$pnum);
-		}
-	}
-
-	/**
-	 * Reset pointer to the last document page.
-	 * @param boolean $resetmargins if true reset left, right, top margins and Y position.
-	 * @access public
-	 * @since 2.0.000 (2008-01-04)
-	 * @see setPage(), getPage(), getNumPages()
-	 */
-	public function lastPage($resetmargins=false) {
-		$this->setPage($this->getNumPages(), $resetmargins);
-	}
-
-	/**
-	 * Get current document page number.
-	 * @return int page number
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see setPage(), lastpage(), getNumPages()
-	 */
-	public function getPage() {
-		return $this->page;
-	}
-
-	/**
-	 * Get the total number of insered pages.
-	 * @return int number of pages
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see setPage(), getPage(), lastpage()
-	 */
-	public function getNumPages() {
-		return $this->numpages;
-	}
-
-	/**
-	 * Adds a new TOC (Table Of Content) page to the document.
-	 * @param string $orientation page orientation.
-	 * @param boolean $keepmargins if true overwrites the default page margins with the current margins
-	 * @access public
-	 * @since 5.0.001 (2010-05-06)
-	 * @see AddPage(), startPage(), endPage(), endTOCPage()
-	 */
-	public function addTOCPage($orientation='', $format='', $keepmargins=false) {
-		$this->AddPage($orientation, $format, $keepmargins, true);
-	}
-
-	/**
-	 * Terminate the current TOC (Table Of Content) page
-	 * @access public
-	 * @since 5.0.001 (2010-05-06)
-	 * @see AddPage(), startPage(), endPage(), addTOCPage()
-	 */
-	public function endTOCPage() {
-		$this->endPage(true);
-	}
-
-	/**
-	 * Adds a new page to the document. If a page is already present, the Footer() method is called first to output the footer (if enabled). Then the page is added, the current position set to the top-left corner according to the left and top margins (or top-right if in RTL mode), and Header() is called to display the header (if enabled).
-	 * The origin of the coordinate system is at the top-left corner (or top-right for RTL) and increasing ordinates go downwards.
-	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param boolean $keepmargins if true overwrites the default page margins with the current margins
-	 * @param boolean $tocpage if true set the tocpage state to true (the added page will be used to display Table Of Content).
-	 * @access public
-	 * @since 1.0
-	 * @see startPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
-	 */
-	public function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) {
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			return;
-		}
-		if (!isset($this->original_lMargin) OR $keepmargins) {
-			$this->original_lMargin = $this->lMargin;
-		}
-		if (!isset($this->original_rMargin) OR $keepmargins) {
-			$this->original_rMargin = $this->rMargin;
-		}
-		// terminate previous page
-		$this->endPage();
-		// start new page
-		$this->startPage($orientation, $format, $tocpage);
-	}
-
-	/**
-	 * Terminate the current page
-	 * @param boolean $tocpage if true set the tocpage state to false (end the page used to display Table Of Content).
-	 * @access public
-	 * @since 4.2.010 (2008-11-14)
-	 * @see AddPage(), startPage(), addTOCPage(), endTOCPage()
-	 */
-	public function endPage($tocpage=false) {
-		// check if page is already closed
-		if (($this->page == 0) OR ($this->numpages > $this->page) OR (!$this->pageopen[$this->page])) {
-			return;
-		}
-		$this->InFooter = true;
-		// print page footer
-		$this->setFooter();
-		// close page
-		$this->_endpage();
-		// mark page as closed
-		$this->pageopen[$this->page] = false;
-		$this->InFooter = false;
-		if ($tocpage) {
-			$this->tocpage = false;
-		}
-	}
-
-	/**
-	 * Starts a new page to the document. The page must be closed using the endPage() function.
-	 * The origin of the coordinate system is at the top-left corner and increasing ordinates go downwards.
-	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @access public
-	 * @since 4.2.010 (2008-11-14)
-	 * @see AddPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
-	 */
-	public function startPage($orientation='', $format='', $tocpage=false) {
-		if ($tocpage) {
-			$this->tocpage = true;
-		}
-		if ($this->numpages > $this->page) {
-			// this page has been already added
-			$this->setPage($this->page + 1);
-			$this->SetY($this->tMargin);
-			return;
-		}
-		// start a new page
-		if ($this->state == 0) {
-			$this->Open();
-		}
-		++$this->numpages;
-		$this->swapMargins($this->booklet);
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// start new page
-		$this->_beginpage($orientation, $format);
-		// mark page as open
-		$this->pageopen[$this->page] = true;
-		// restore graphic settings
-		$this->setGraphicVars($gvars);
-		// mark this point
-		$this->setPageMark();
-		// print page header
-		$this->setHeader();
-		// restore graphic settings
-		$this->setGraphicVars($gvars);
-		// mark this point
-		$this->setPageMark();
-		// print table header (if any)
-		$this->setTableHeader();
-		// set mark for empty page check
-		$this->emptypagemrk[$this->page]= $this->pagelen[$this->page];
-	}
-
-	/**
- 	 * Set start-writing mark on current page stream used to put borders and fills.
- 	 * Borders and fills are always created after content and inserted on the position marked by this method.
- 	 * This function must be called after calling Image() function for a background image.
- 	 * Background images must be always inserted before calling Multicell() or WriteHTMLCell() or WriteHTML() functions.
- 	 * @access public
- 	 * @since 4.0.016 (2008-07-30)
-	 */
-	public function setPageMark() {
-		$this->intmrk[$this->page] = $this->pagelen[$this->page];
-		$this->bordermrk[$this->page] = $this->intmrk[$this->page];
-		$this->setContentMark();
-	}
-
-	/**
- 	 * Set start-writing mark on selected page.
- 	 * Borders and fills are always created after content and inserted on the position marked by this method.
- 	 * @param int $page page number (default is the current page)
- 	 * @access protected
- 	 * @since 4.6.021 (2009-07-20)
-	 */
-	protected function setContentMark($page=0) {
-		if ($page <= 0) {
-			$page = $this->page;
-		}
-		if (isset($this->footerlen[$page])) {
-			$this->cntmrk[$page] = $this->pagelen[$page] - $this->footerlen[$page];
-		} else {
-			$this->cntmrk[$page] = $this->pagelen[$page];
-		}
-	}
-
-	/**
- 	 * Set header data.
-	 * @param string $ln header image logo
-	 * @param string $lw header image logo width in mm
-	 * @param string $ht string to print as title on document header
-	 * @param string $hs string to print on document header
-	 * @access public
-	 */
-	public function setHeaderData($ln='', $lw=0, $ht='', $hs='') {
-		$this->header_logo = $ln;
-		$this->header_logo_width = $lw;
-		$this->header_title = $ht;
-		$this->header_string = $hs;
-	}
-
-	/**
- 	 * Returns header data:
- 	 * <ul><li>$ret['logo'] = logo image</li><li>$ret['logo_width'] = width of the image logo in user units</li><li>$ret['title'] = header title</li><li>$ret['string'] = header description string</li></ul>
-	 * @return array()
-	 * @access public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getHeaderData() {
-		$ret = array();
-		$ret['logo'] = $this->header_logo;
-		$ret['logo_width'] = $this->header_logo_width;
-		$ret['title'] = $this->header_title;
-		$ret['string'] = $this->header_string;
-		return $ret;
-	}
-
-	/**
- 	 * Set header margin.
-	 * (minimum distance between header and top page margin)
-	 * @param int $hm distance in user units
-	 * @access public
-	 */
-	public function setHeaderMargin($hm=10) {
-		$this->header_margin = $hm;
-	}
-
-	/**
- 	 * Returns header margin in user units.
-	 * @return float
-	 * @since 4.0.012 (2008-07-24)
-	 * @access public
-	 */
-	public function getHeaderMargin() {
-		return $this->header_margin;
-	}
-
-	/**
- 	 * Set footer margin.
-	 * (minimum distance between footer and bottom page margin)
-	 * @param int $fm distance in user units
-	 * @access public
-	 */
-	public function setFooterMargin($fm=10) {
-		$this->footer_margin = $fm;
-	}
-
-	/**
- 	 * Returns footer margin in user units.
-	 * @return float
-	 * @since 4.0.012 (2008-07-24)
-	 * @access public
-	 */
-	public function getFooterMargin() {
-		return $this->footer_margin;
-	}
-	/**
- 	 * Set a flag to print page header.
-	 * @param boolean $val set to true to print the page header (default), false otherwise.
-	 * @access public
-	 */
-	public function setPrintHeader($val=true) {
-		$this->print_header = $val;
-	}
-
-	/**
- 	 * Set a flag to print page footer.
-	 * @param boolean $value set to true to print the page footer (default), false otherwise.
-	 * @access public
-	 */
-	public function setPrintFooter($val=true) {
-		$this->print_footer = $val;
-	}
-
-	/**
- 	 * Return the right-bottom (or left-bottom for RTL) corner X coordinate of last inserted image
-	 * @return float
-	 * @access public
-	 */
-	public function getImageRBX() {
-		return $this->img_rb_x;
-	}
-
-	/**
- 	 * Return the right-bottom (or left-bottom for RTL) corner Y coordinate of last inserted image
-	 * @return float
-	 * @access public
-	 */
-	public function getImageRBY() {
-		return $this->img_rb_y;
-	}
-
-	/**
- 	 * This method is used to render the page header.
- 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
-	 * @access public
-	 */
-	public function Header() {
-		$ormargins = $this->getOriginalMargins();
-		$headerfont = $this->getHeaderFont();
-		$headerdata = $this->getHeaderData();
-		if (($headerdata['logo']) AND ($headerdata['logo'] != K_BLANK_IMAGE)) {
-			$this->Image(K_PATH_IMAGES.$headerdata['logo'], '', '', $headerdata['logo_width']);
-			$imgy = $this->getImageRBY();
-		} else {
-			$imgy = $this->GetY();
-		}
-		$cell_height = round(($this->getCellHeightRatio() * $headerfont[2]) / $this->getScaleFactor(), 2);
-		// set starting margin for text data cell
-		if ($this->getRTL()) {
-			$header_x = $ormargins['right'] + ($headerdata['logo_width'] * 1.1);
-		} else {
-			$header_x = $ormargins['left'] + ($headerdata['logo_width'] * 1.1);
-		}
-		$this->SetTextColor(0, 0, 0);
-		// header title
-		$this->SetFont($headerfont[0], 'B', $headerfont[2] + 1);
-		$this->SetX($header_x);
-		$this->Cell(0, $cell_height, $headerdata['title'], 0, 1, '', 0, '', 0);
-		// header string
-		$this->SetFont($headerfont[0], $headerfont[1], $headerfont[2]);
-		$this->SetX($header_x);
-		$this->MultiCell(0, $cell_height, $headerdata['string'], 0, '', 0, 1, '', '', true, 0, false);
-		// print an ending header line
-		$this->SetLineStyle(array('width' => 0.85 / $this->getScaleFactor(), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)));
-		$this->SetY((2.835 / $this->getScaleFactor()) + max($imgy, $this->GetY()));
-		if ($this->getRTL()) {
-			$this->SetX($ormargins['right']);
-		} else {
-			$this->SetX($ormargins['left']);
-		}
-		$this->Cell(0, 0, '', 'T', 0, 'C');
-	}
-
-	/**
- 	 * This method is used to render the page footer.
- 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
-	 * @access public
-	 */
-	public function Footer() {
-		$cur_y = $this->GetY();
-		$ormargins = $this->getOriginalMargins();
-		$this->SetTextColor(0, 0, 0);
-		//set style for cell border
-		$line_width = 0.85 / $this->getScaleFactor();
-		$this->SetLineStyle(array('width' => $line_width, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)));
-		//print document barcode
-		$barcode = $this->getBarcode();
-		if (!empty($barcode)) {
-			$this->Ln($line_width);
-			$barcode_width = round(($this->getPageWidth() - $ormargins['left'] - $ormargins['right']) / 3);
-			$style = array(
-				'position' => $this->rtl?'R':'L',
-				'align' => $this->rtl?'R':'L',
-				'stretch' => false,
-				'fitwidth' => true,
-				'cellfitalign' => '',
-				'border' => false,
-				'padding' => 0,
-				'fgcolor' => array(0,0,0),
-				'bgcolor' => false,
-				'text' => false
-			);
-			$this->write1DBarcode($barcode, 'C128B', '', $cur_y + $line_width, '', (($this->getFooterMargin() / 3) - $line_width), 0.3, $style, '');
-		}
-		if (empty($this->pagegroups)) {
-			$pagenumtxt = $this->l['w_page'].' '.$this->getAliasNumPage().' / '.$this->getAliasNbPages();
-		} else {
-			$pagenumtxt = $this->l['w_page'].' '.$this->getPageNumGroupAlias().' / '.$this->getPageGroupAlias();
-		}
-		$this->SetY($cur_y);
-		//Print page number
-		if ($this->getRTL()) {
-			$this->SetX($ormargins['right']);
-			$this->Cell(0, 0, $pagenumtxt, 'T', 0, 'L');
-		} else {
-			$this->SetX($ormargins['left']);
-			$this->Cell(0, 0, $pagenumtxt, 'T', 0, 'R');
-		}
-	}
-
-	/**
- 	 * This method is used to render the page header.
- 	 * @access protected
- 	 * @since 4.0.012 (2008-07-24)
-	 */
-	protected function setHeader() {
-		if ($this->print_header) {
-			$this->setGraphicVars($this->default_graphic_vars);
-			$temp_thead = $this->thead;
-			$temp_theadMargins = $this->theadMargins;
-			$lasth = $this->lasth;
-			$this->_out('q');
-			$this->rMargin = $this->original_rMargin;
-			$this->lMargin = $this->original_lMargin;
-			$this->SetCellPadding(0);
-			//set current position
-			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $this->header_margin);
-			} else {
-				$this->SetXY($this->original_lMargin, $this->header_margin);
-			}
-			$this->SetFont($this->header_font[0], $this->header_font[1], $this->header_font[2]);
-			$this->Header();
-			//restore position
-			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $this->tMargin);
-			} else {
-				$this->SetXY($this->original_lMargin, $this->tMargin);
-			}
-			$this->_out('Q');
-			$this->lasth = $lasth;
-			$this->thead = $temp_thead;
-			$this->theadMargins = $temp_theadMargins;
-			$this->newline = false;
-		}
-	}
-
-	/**
- 	 * This method is used to render the page footer.
- 	 * @access protected
- 	 * @since 4.0.012 (2008-07-24)
-	 */
-	protected function setFooter() {
-		//Page footer
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// mark this point
-		$this->footerpos[$this->page] = $this->pagelen[$this->page];
-		$this->_out("\n");
-		if ($this->print_footer) {
-			$this->setGraphicVars($this->default_graphic_vars);
-			$this->current_column = 0;
-			$this->num_columns = 1;
-			$temp_thead = $this->thead;
-			$temp_theadMargins = $this->theadMargins;
-			$lasth = $this->lasth;
-			$this->_out('q');
-			$this->rMargin = $this->original_rMargin;
-			$this->lMargin = $this->original_lMargin;
-			$this->SetCellPadding(0);
-			//set current position
-			$footer_y = $this->h - $this->footer_margin;
-			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $footer_y);
-			} else {
-				$this->SetXY($this->original_lMargin, $footer_y);
-			}
-			$this->SetFont($this->footer_font[0], $this->footer_font[1], $this->footer_font[2]);
-			$this->Footer();
-			//restore position
-			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $this->tMargin);
-			} else {
-				$this->SetXY($this->original_lMargin, $this->tMargin);
-			}
-			$this->_out('Q');
-			$this->lasth = $lasth;
-			$this->thead = $temp_thead;
-			$this->theadMargins = $temp_theadMargins;
-		}
-		// restore graphic settings
-		$this->setGraphicVars($gvars);
-		$this->current_column = $gvars['current_column'];
-		$this->num_columns = $gvars['num_columns'];
-		// calculate footer length
-		$this->footerlen[$this->page] = $this->pagelen[$this->page] - $this->footerpos[$this->page] + 1;
-	}
-
-	/**
- 	 * This method is used to render the table header on new page (if any).
- 	 * @access protected
- 	 * @since 4.5.030 (2009-03-25)
-	 */
-	protected function setTableHeader() {
-		if ($this->num_columns > 1) {
-			// multi column mode
-			return;
-		}
-		if (isset($this->theadMargins['top'])) {
-			// restore the original top-margin
-			$this->tMargin = $this->theadMargins['top'];
-			$this->pagedim[$this->page]['tm'] = $this->tMargin;
-			$this->y = $this->tMargin;
-		}
-		if (!$this->empty_string($this->thead) AND (!$this->inthead)) {
-			// set margins
-			$prev_lMargin = $this->lMargin;
-			$prev_rMargin = $this->rMargin;
-			$prev_cell_padding = $this->cell_padding;
-			$this->lMargin = $this->theadMargins['lmargin'] + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$this->theadMargins['page']]['olm']);
-			$this->rMargin = $this->theadMargins['rmargin'] + ($this->pagedim[$this->page]['orm'] - $this->pagedim[$this->theadMargins['page']]['orm']);
-			$this->cell_padding = $this->theadMargins['cell_padding'];
-			if ($this->rtl) {
-				$this->x = $this->w - $this->rMargin;
-			} else {
-				$this->x = $this->lMargin;
-			}
-			// print table header
-			$this->writeHTML($this->thead, false, false, false, false, '');
-			// set new top margin to skip the table headers
-			if (!isset($this->theadMargins['top'])) {
-				$this->theadMargins['top'] = $this->tMargin;
-			}
-			$this->tMargin = $this->y;
-			$this->pagedim[$this->page]['tm'] = $this->tMargin;
-			$this->lasth = 0;
-			$this->lMargin = $prev_lMargin;
-			$this->rMargin = $prev_rMargin;
-			$this->cell_padding = $prev_cell_padding;
-		}
-	}
-
-	/**
-	 * Returns the current page number.
-	 * @return int page number
-	 * @access public
-	 * @since 1.0
-	 * @see AliasNbPages(), getAliasNbPages()
-	 */
-	public function PageNo() {
-		return $this->page;
-	}
-
-	/**
-	 * Defines a new spot color.
-	 * It can be expressed in RGB components or gray scale.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param int $c Cyan color for CMYK. Value between 0 and 255
-	 * @param int $m Magenta color for CMYK. Value between 0 and 255
-	 * @param int $y Yellow color for CMYK. Value between 0 and 255
-	 * @param int $k Key (Black) color for CMYK. Value between 0 and 255
-	 * @access public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see SetDrawSpotColor(), SetFillSpotColor(), SetTextSpotColor()
-	 */
-	public function AddSpotColor($name, $c, $m, $y, $k) {
-		if (!isset($this->spot_colors[$name])) {
-			$i = 1 + count($this->spot_colors);
-			$this->spot_colors[$name] = array('i' => $i, 'c' => $c, 'm' => $m, 'y' => $y, 'k' => $k);
-		}
-	}
-
-	/**
-	 * Defines the color used for all drawing operations (lines, rectangles and cell borders).
-	 * It can be expressed in RGB components or gray scale.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param array $color array of colors
-	 * @param boolean $ret if true do not send the command.
-	 * @return string the PDF command
-	 * @access public
-	 * @since 3.1.000 (2008-06-11)
-	 * @see SetDrawColor()
-	 */
-	public function SetDrawColorArray($color, $ret=false) {
-		if (is_array($color)) {
-			$color = array_values($color);
-			$r = isset($color[0]) ? $color[0] : -1;
-			$g = isset($color[1]) ? $color[1] : -1;
-			$b = isset($color[2]) ? $color[2] : -1;
-			$k = isset($color[3]) ? $color[3] : -1;
-			if ($r >= 0) {
-				return $this->SetDrawColor($r, $g, $b, $k, $ret);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * Defines the color used for all drawing operations (lines, rectangles and cell borders). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param int $col1 Gray level for single color, or Red color for RGB, or Cyan color for CMYK. Value between 0 and 255
-	 * @param int $col2 Green color for RGB, or Magenta color for CMYK. Value between 0 and 255
-	 * @param int $col3 Blue color for RGB, or Yellow color for CMYK. Value between 0 and 255
-	 * @param int $col4 Key (Black) color for CMYK. Value between 0 and 255
-	 * @param boolean $ret if true do not send the command.
-	 * @return string the PDF command
-	 * @access public
-	 * @since 1.3
-	 * @see SetDrawColorArray(), SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
-	 */
-	public function SetDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false) {
-		// set default values
-		if (!is_numeric($col1)) {
-			$col1 = 0;
-		}
-		if (!is_numeric($col2)) {
-			$col2 = -1;
-		}
-		if (!is_numeric($col3)) {
-			$col3 = -1;
-		}
-		if (!is_numeric($col4)) {
-			$col4 = -1;
-		}
-		//Set color for all stroking operations
-		if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
-			// Grey scale
-			$this->DrawColor = sprintf('%.3F G', $col1/255);
-			$this->strokecolor = array('G' => $col1);
-		} elseif ($col4 == -1) {
-			// RGB
-			$this->DrawColor = sprintf('%.3F %.3F %.3F RG', $col1/255, $col2/255, $col3/255);
-			$this->strokecolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
-		} else {
-			// CMYK
-			$this->DrawColor = sprintf('%.3F %.3F %.3F %.3F K', $col1/100, $col2/100, $col3/100, $col4/100);
-			$this->strokecolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
-		}
-		if ($this->page > 0) {
-			if (!$ret) {
-				$this->_out($this->DrawColor);
-			}
-			return $this->DrawColor;
-		}
-		return '';
-	}
-
-	/**
-	 * Defines the spot color used for all drawing operations (lines, rectangles and cell borders).
-	 * @param string $name name of the spot color
-	 * @param int $tint the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @access public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
-	 */
-	public function SetDrawSpotColor($name, $tint=100) {
-		if (!isset($this->spot_colors[$name])) {
-			$this->Error('Undefined spot color: '.$name);
-		}
-		$this->DrawColor = sprintf('/CS%d CS %.3F SCN', $this->spot_colors[$name]['i'], $tint/100);
-		if ($this->page > 0) {
-			$this->_out($this->DrawColor);
-		}
-	}
-
-	/**
-	 * Defines the color used for all filling operations (filled rectangles and cell backgrounds).
-	 * It can be expressed in RGB components or gray scale.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param array $color array of colors
-	 * @access public
-	 * @since 3.1.000 (2008-6-11)
-	 * @see SetFillColor()
-	 */
-	public function SetFillColorArray($color) {
-		if (is_array($color)) {
-			$color = array_values($color);
-			$r = isset($color[0]) ? $color[0] : -1;
-			$g = isset($color[1]) ? $color[1] : -1;
-			$b = isset($color[2]) ? $color[2] : -1;
-			$k = isset($color[3]) ? $color[3] : -1;
-			if ($r >= 0) {
-				$this->SetFillColor($r, $g, $b, $k);
-			}
-		}
-	}
-
-	/**
-	 * Defines the color used for all filling operations (filled rectangles and cell backgrounds). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param int $col1 Gray level for single color, or Red color for RGB, or Cyan color for CMYK. Value between 0 and 255
-	 * @param int $col2 Green color for RGB, or Magenta color for CMYK. Value between 0 and 255
-	 * @param int $col3 Blue color for RGB, or Yellow color for CMYK. Value between 0 and 255
-	 * @param int $col4 Key (Black) color for CMYK. Value between 0 and 255
-	 * @access public
-	 * @since 1.3
-	 * @see SetFillColorArray(), SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
-	 */
-	public function SetFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1) {
-		// set default values
-		if (!is_numeric($col1)) {
-			$col1 = 0;
-		}
-		if (!is_numeric($col2)) {
-			$col2 = -1;
-		}
-		if (!is_numeric($col3)) {
-			$col3 = -1;
-		}
-		if (!is_numeric($col4)) {
-			$col4 = -1;
-		}
-		//Set color for all filling operations
-		if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
-			// Grey scale
-			$this->FillColor = sprintf('%.3F g', $col1/255);
-			$this->bgcolor = array('G' => $col1);
-		} elseif ($col4 == -1) {
-			// RGB
-			$this->FillColor = sprintf('%.3F %.3F %.3F rg', $col1/255, $col2/255, $col3/255);
-			$this->bgcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
-		} else {
-			// CMYK
-			$this->FillColor = sprintf('%.3F %.3F %.3F %.3F k', $col1/100, $col2/100, $col3/100, $col4/100);
-			$this->bgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
-		}
-		$this->ColorFlag = ($this->FillColor != $this->TextColor);
-		if ($this->page > 0) {
-			$this->_out($this->FillColor);
-		}
-	}
-
-	/**
-	 * Defines the spot color used for all filling operations (filled rectangles and cell backgrounds).
-	 * @param string $name name of the spot color
-	 * @param int $tint the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @access public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
-	 */
-	public function SetFillSpotColor($name, $tint=100) {
-		if (!isset($this->spot_colors[$name])) {
-			$this->Error('Undefined spot color: '.$name);
-		}
-		$this->FillColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], $tint/100);
-		$this->ColorFlag = ($this->FillColor != $this->TextColor);
-		if ($this->page > 0) {
-			$this->_out($this->FillColor);
-		}
-	}
-
-	/**
-	 * Defines the color used for text. It can be expressed in RGB components or gray scale.
-	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param array $color array of colors
-	 * @access public
-	 * @since 3.1.000 (2008-6-11)
-	 * @see SetFillColor()
-	 */
-	public function SetTextColorArray($color) {
-		if (is_array($color)) {
-			$color = array_values($color);
-			$r = isset($color[0]) ? $color[0] : -1;
-			$g = isset($color[1]) ? $color[1] : -1;
-			$b = isset($color[2]) ? $color[2] : -1;
-			$k = isset($color[3]) ? $color[3] : -1;
-			if ($r >= 0) {
-				$this->SetTextColor($r, $g, $b, $k);
-			}
-		}
-	}
-
-	/**
-	 * Defines the color used for text. It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param int $col1 Gray level for single color, or Red color for RGB, or Cyan color for CMYK. Value between 0 and 255
-	 * @param int $col2 Green color for RGB, or Magenta color for CMYK. Value between 0 and 255
-	 * @param int $col3 Blue color for RGB, or Yellow color for CMYK. Value between 0 and 255
-	 * @param int $col4 Key (Black) color for CMYK. Value between 0 and 255
-	 * @access public
-	 * @since 1.3
-	 * @see SetTextColorArray(), SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
-	 */
-	public function SetTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1) {
-		// set default values
-		if (!is_numeric($col1)) {
-			$col1 = 0;
-		}
-		if (!is_numeric($col2)) {
-			$col2 = -1;
-		}
-		if (!is_numeric($col3)) {
-			$col3 = -1;
-		}
-		if (!is_numeric($col4)) {
-			$col4 = -1;
-		}
-		//Set color for text
-		if (($col2 == -1) AND ($col3 == -1) AND ($col4 == -1)) {
-			// Grey scale
-			$this->TextColor = sprintf('%.3F g', $col1/255);
-			$this->fgcolor = array('G' => $col1);
-		} elseif ($col4 == -1) {
-			// RGB
-			$this->TextColor = sprintf('%.3F %.3F %.3F rg', $col1/255, $col2/255, $col3/255);
-			$this->fgcolor = array('R' => $col1, 'G' => $col2, 'B' => $col3);
-		} else {
-			// CMYK
-			$this->TextColor = sprintf('%.3F %.3F %.3F %.3F k', $col1/100, $col2/100, $col3/100, $col4/100);
-			$this->fgcolor = array('C' => $col1, 'M' => $col2, 'Y' => $col3, 'K' => $col4);
-		}
-		$this->ColorFlag = ($this->FillColor != $this->TextColor);
-	}
-
-	/**
-	 * Defines the spot color used for text.
-	 * @param string $name name of the spot color
-	 * @param int $tint the intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @access public
-	 * @since 4.0.024 (2008-09-12)
-	 * @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
-	 */
-	public function SetTextSpotColor($name, $tint=100) {
-		if (!isset($this->spot_colors[$name])) {
-			$this->Error('Undefined spot color: '.$name);
-		}
-		$this->TextColor = sprintf('/CS%d cs %.3F scn', $this->spot_colors[$name]['i'], $tint/100);
-		$this->ColorFlag = ($this->FillColor != $this->TextColor);
-		if ($this->page > 0) {
-			$this->_out($this->TextColor);
-		}
-	}
-
-	/**
-	 * Returns the length of a string in user unit. A font must be selected.<br>
-	 * @param string $s The string whose length is to be computed
-	 * @param string $fontname Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-	 * @param string $fontstyle Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line-trough</li><li>O: overline</li></ul> or any combination. The default value is regular.
-	 * @param float $fontsize Font size in points. The default value is the current size.
-	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
-	 * @return mixed int total string length or array of characted widths
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.2
-	 */
-	public function GetStringWidth($s, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
-		return $this->GetArrStringWidth($this->utf8Bidi($this->UTF8StringToArray($s), $s, $this->tmprtl), $fontname, $fontstyle, $fontsize, $getarray);
-	}
-
-	/**
-	 * Returns the string length of an array of chars in user unit or an array of characters widths. A font must be selected.<br>
-	 * @param string $sa The array of chars whose total length is to be computed
-	 * @param string $fontname Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-	 * @param string $fontstyle Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line trough</li><li>O: overline</li></ul> or any combination. The default value is regular.
-	 * @param float $fontsize Font size in points. The default value is the current size.
-	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
-	 * @return mixed int total string length or array of characted widths
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 2.4.000 (2008-03-06)
-	 */
-	public function GetArrStringWidth($sa, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
-		// store current values
-		if (!$this->empty_string($fontname)) {
-			$prev_FontFamily = $this->FontFamily;
-			$prev_FontStyle = $this->FontStyle;
-			$prev_FontSizePt = $this->FontSizePt;
-			$this->SetFont($fontname, $fontstyle, $fontsize);
-		}
-		// convert UTF-8 array to Latin1 if required
-		$sa = $this->UTF8ArrToLatin1($sa);
-		$w = 0; // total width
-		$wa = array(); // array of characters widths
-		foreach ($sa as $ck => $char) {
-			// character width
-			$cw = $this->GetCharWidth($char, isset($sa[($ck + 1)]));
-			$wa[] = $cw;
-			$w += $cw;
-		}
-		// restore previous values
-		if (!$this->empty_string($fontname)) {
-			$this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt);
-		}
-		if ($getarray) {
-			return $wa;
-		}
-		return $w;
-	}
-
-	/**
-	 * Returns the length of the char in user unit for the current font considering current stretching and spacing (tracking/kerning).
-	 * @param int $char The char code whose length is to be returned
-	 * @param boolean $notlast set to false for the latest character on string, true otherwise (default)
-	 * @return float char width
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 2.4.000 (2008-03-06)
-	 */
-	public function GetCharWidth($char, $notlast=true) {
-		// get raw width
-		$chw = $this->getRawCharWidth($char);
-		if (($this->font_spacing != 0) AND $notlast) {
-			// increase/decrease font spacing
-			$chw += $this->font_spacing;
-		}
-		if ($this->font_stretching != 100) {
-			// fixed stretching mode
-			$chw *= ($this->font_stretching / 100);
-		}
-		return $chw;
-	}
-
-	/**
-	 * Returns the length of the char in user unit for the current font.
-	 * @param int $char The char code whose length is to be returned
-	 * @return float char width
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.000 (2010-09-28)
-	 */
-	public function getRawCharWidth($char) {
-		if ($char == 173) {
-			// SHY character will not be printed
-			return (0);
-		}
-		$cw = &$this->CurrentFont['cw'];
-		if (isset($cw[$char])) {
-			$w = $cw[$char];
-		} elseif (isset($this->CurrentFont['dw'])) {
-			// default width
-			$w = $this->CurrentFont['dw'];
-		} elseif (isset($cw[32])) {
-			// default width
-			$w = $cw[32];
-		} else {
-			$w = 600;
-		}
-		return ($w * $this->FontSize / 1000);
-	}
-
-	/**
-	 * Returns the numbero of characters in a string.
-	 * @param string $s The input string.
-	 * @return int number of characters
-	 * @access public
-	 * @since 2.0.0001 (2008-01-07)
-	 */
-	public function GetNumChars($s) {
-		if ($this->isUnicodeFont()) {
-			return count($this->UTF8StringToArray($s));
-		}
-		return strlen($s);
-	}
-
-	/**
-	 * Fill the list of available fonts ($this->fontlist).
-	 * @access protected
-	 * @since 4.0.013 (2008-07-28)
-	 */
-	protected function getFontsList() {
-		$fontsdir = opendir($this->_getfontpath());
-		while (($file = readdir($fontsdir)) !== false) {
-			if (substr($file, -4) == '.php') {
-				array_push($this->fontlist, strtolower(basename($file, '.php')));
-			}
-		}
-		closedir($fontsdir);
-	}
-
-	/**
-	 * Imports a TrueType, Type1, core, or CID0 font and makes it available.
-	 * It is necessary to generate a font definition file first (read /fonts/utils/README.TXT).
-	 * The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by K_PATH_FONTS if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated.
-	 * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-	 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-	 * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-	 * @return array containing the font data, or false in case of error.
-	 * @param mixed $subset if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
-	 * @access public
-	 * @since 1.5
-	 * @see SetFont(), setFontSubsetting()
-	 */
-	public function AddFont($family, $style='', $fontfile='', $subset='default') {
-		if ($subset === 'default') {
-			$subset = $this->font_subsetting;
-		}
-		if ($this->empty_string($family)) {
-			if (!$this->empty_string($this->FontFamily)) {
-				$family = $this->FontFamily;
-			} else {
-				$this->Error('Empty font family');
-			}
-		}
-		// move embedded styles on $style
-		if (substr($family, -1) == 'I') {
-			$style .= 'I';
-			$family = substr($family, 0, -1);
-		}
-		if (substr($family, -1) == 'B') {
-			$style .= 'B';
-			$family = substr($family, 0, -1);
-		}
-		// normalize family name
-		$family = strtolower($family);
-		if ((!$this->isunicode) AND ($family == 'arial')) {
-			$family = 'helvetica';
-		}
-		if (($family == 'symbol') OR ($family == 'zapfdingbats')) {
-			$style = '';
-		}
-		$tempstyle = strtoupper($style);
-		$style = '';
-		// underline
-		if (strpos($tempstyle, 'U') !== false) {
-			$this->underline = true;
-		} else {
-			$this->underline = false;
-		}
-		// line-through (deleted)
-		if (strpos($tempstyle, 'D') !== false) {
-			$this->linethrough = true;
-		} else {
-			$this->linethrough = false;
-		}
-		// overline
-		if (strpos($tempstyle, 'O') !== false) {
-			$this->overline = true;
-		} else {
-			$this->overline = false;
-		}
-		// bold
-		if (strpos($tempstyle, 'B') !== false) {
-			$style .= 'B';
-		}
-		// oblique
-		if (strpos($tempstyle, 'I') !== false) {
-			$style .= 'I';
-		}
-		$bistyle = $style;
-		$fontkey = $family.$style;
-		$font_style = $style.($this->underline ? 'U' : '').($this->linethrough ? 'D' : '').($this->overline ? 'O' : '');
-		$fontdata = array('fontkey' => $fontkey, 'family' => $family, 'style' => $font_style);
-		// check if the font has been already added
-		$fb = $this->getFontBuffer($fontkey);
-		if ($fb !== false) {
-			if ($this->inxobj) {
-				// we are inside an XObject template
-				$this->xobjects[$this->xobjid]['fonts'][$fontkey] = $fb['i'];
-			}
-			return $fontdata;
-		}
-		if (isset($type)) {
-			unset($type);
-		}
-		if (isset($cw)) {
-			unset($cw);
-		}
-		// get specified font directory (if any)
-		$fontdir = false;
-		if (!$this->empty_string($fontfile)) {
-			$fontdir = dirname($fontfile);
-			if ($this->empty_string($fontdir) OR ($fontdir == '.')) {
-				$fontdir = '';
-			} else {
-				$fontdir .= '/';
-			}
-		}
-		// search and include font file
-		if ($this->empty_string($fontfile) OR (!file_exists($fontfile))) {
-			// build a standard filenames for specified font
-			$fontfile1 = str_replace(' ', '', $family).strtolower($style).'.php';
-			$fontfile2 = str_replace(' ', '', $family).'.php';
-			// search files on various directories
-			if (($fontdir !== false) AND file_exists($fontdir.$fontfile1)) {
-				$fontfile = $fontdir.$fontfile1;
-			} elseif (file_exists($this->_getfontpath().$fontfile1)) {
-				$fontfile = $this->_getfontpath().$fontfile1;
-			} elseif (file_exists($fontfile1)) {
-				$fontfile = $fontfile1;
-			} elseif (($fontdir !== false) AND file_exists($fontdir.$fontfile2)) {
-				$fontfile = $fontdir.$fontfile2;
-			} elseif (file_exists($this->_getfontpath().$fontfile2)) {
-				$fontfile = $this->_getfontpath().$fontfile2;
-			} else {
-				$fontfile = $fontfile2;
-			}
-		}
-		// include font file
-		if (file_exists($fontfile)) {
-			include($fontfile);
-		} else {
-			$this->Error('Could not include font definition file: '.$family.'');
-		}
-		// check font parameters
-		if ((!isset($type)) OR (!isset($cw))) {
-			$this->Error('The font definition file has a bad format: '.$fontfile.'');
-		}
-		// SET default parameters
-		if (!isset($file) OR $this->empty_string($file)) {
-			$file = '';
-		}
-		if (!isset($enc) OR $this->empty_string($enc)) {
-			$enc = '';
-		}
-		if (!isset($cidinfo) OR $this->empty_string($cidinfo)) {
-			$cidinfo = array('Registry'=>'Adobe','Ordering'=>'Identity','Supplement'=>0);
-			$cidinfo['uni2cid'] = array();
-		}
-		if (!isset($ctg) OR $this->empty_string($ctg)) {
-			$ctg = '';
-		}
-		if (!isset($desc) OR $this->empty_string($desc)) {
-			$desc = array();
-		}
-		if (!isset($up) OR $this->empty_string($up)) {
-			$up = -100;
-		}
-		if (!isset($ut) OR $this->empty_string($ut)) {
-			$ut = 50;
-		}
-		if (!isset($cw) OR $this->empty_string($cw)) {
-			$cw = array();
-		}
-		if (!isset($dw) OR $this->empty_string($dw)) {
-			// set default width
-			if (isset($desc['MissingWidth']) AND ($desc['MissingWidth'] > 0)) {
-				$dw = $desc['MissingWidth'];
-			} elseif (isset($cw[32])) {
-				$dw = $cw[32];
-			} else {
-				$dw = 600;
-			}
-		}
-		++$this->numfonts;
-		if ($type == 'cidfont0') {
-			// register CID font (all styles at once)
-			$styles = array('' => '', 'B' => ',Bold', 'I' => ',Italic', 'BI' => ',BoldItalic');
-			$sname = $name.$styles[$bistyle];
-			// artificial bold
-			if (strpos($bistyle, 'B') !== false) {
-				if (isset($desc['StemV'])) {
-					$desc['StemV'] *= 2;
-				} else {
-					$desc['StemV'] = 120;
-				}
-			}
-			// artificial italic
-			if (strpos($bistyle, 'I') !== false) {
-				if (isset($desc['ItalicAngle'])) {
-					$desc['ItalicAngle'] -= 11;
-				} else {
-					$desc['ItalicAngle'] = -11;
-				}
-			}
-		} elseif ($type == 'core') {
-			$name = $this->CoreFonts[$fontkey];
-			$subset = false;
-		} elseif (($type == 'TrueType') OR ($type == 'Type1')) {
-			$subset = false;
-		} elseif ($type == 'TrueTypeUnicode') {
-			$enc = 'Identity-H';
-		} else {
-			$this->Error('Unknow font type: '.$type.'');
-		}
-		// initialize subsetchars to contain default ASCII values (0-255)
-		$subsetchars = array_fill(0, 256, true);
-		$this->setFontBuffer($fontkey, array('fontkey' => $fontkey, 'i' => $this->numfonts, 'type' => $type, 'name' => $name, 'desc' => $desc, 'up' => $up, 'ut' => $ut, 'cw' => $cw, 'dw' => $dw, 'enc' => $enc, 'cidinfo' => $cidinfo, 'file' => $file, 'ctg' => $ctg, 'subset' => $subset, 'subsetchars' => $subsetchars));
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['fonts'][$fontkey] = $this->numfonts;
-		}
-		if (isset($diff) AND (!empty($diff))) {
-			//Search existing encodings
-			$d = 0;
-			$nb = count($this->diffs);
-			for ($i=1; $i <= $nb; ++$i) {
-				if ($this->diffs[$i] == $diff) {
-					$d = $i;
-					break;
-				}
-			}
-			if ($d == 0) {
-				$d = $nb + 1;
-				$this->diffs[$d] = $diff;
-			}
-			$this->setFontSubBuffer($fontkey, 'diff', $d);
-		}
-		if (!$this->empty_string($file)) {
-			if (!isset($this->FontFiles[$file])) {
-				if ((strcasecmp($type,'TrueType') == 0) OR (strcasecmp($type, 'TrueTypeUnicode') == 0)) {
-					$this->FontFiles[$file] = array('length1' => $originalsize, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
-				} elseif ($type != 'core') {
-					$this->FontFiles[$file] = array('length1' => $size1, 'length2' => $size2, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
-				}
-			} else {
-				// update fontkeys that are sharing this font file
-				$this->FontFiles[$file]['subset'] = ($this->FontFiles[$file]['subset'] AND $subset);
-				if (!in_array($fontkey, $this->FontFiles[$file]['fontkeys'])) {
-					$this->FontFiles[$file]['fontkeys'][] = $fontkey;
-				}
-			}
-		}
-		return $fontdata;
-	}
-
-	/**
-	 * Sets the font used to print character strings.
-	 * The font can be either a standard one or a font added via the AddFont() method. Standard fonts use Windows encoding cp1252 (Western Europe).
-	 * The method can be called before the first page is created and the font is retained from page to page.
-	 * If you just wish to change the current font size, it is simpler to call SetFontSize().
-	 * Note: for the standard fonts, the font metric files must be accessible. There are three possibilities for this:<ul><li>They are in the current directory (the one where the running script lies)</li><li>They are in one of the directories defined by the include_path parameter</li><li>They are in the directory defined by the K_PATH_FONTS constant</li></ul><br />
-	 * @param string $family Family font. It can be either a name defined by AddFont() or one of the standard Type1 families (case insensitive):<ul><li>times (Times-Roman)</li><li>timesb (Times-Bold)</li><li>timesi (Times-Italic)</li><li>timesbi (Times-BoldItalic)</li><li>helvetica (Helvetica)</li><li>helveticab (Helvetica-Bold)</li><li>helveticai (Helvetica-Oblique)</li><li>helveticabi (Helvetica-BoldOblique)</li><li>courier (Courier)</li><li>courierb (Courier-Bold)</li><li>courieri (Courier-Oblique)</li><li>courierbi (Courier-BoldOblique)</li><li>symbol (Symbol)</li><li>zapfdingbats (ZapfDingbats)</li></ul> It is also possible to pass an empty string. In that case, the current family is retained.
-	 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line trough</li><li>O: overline</li></ul> or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats basic fonts or other fonts when not defined.
-	 * @param float $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
-	 * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-	 * @param mixed $subset if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 1.0
-	 * @see AddFont(), SetFontSize()
-	 */
-	public function SetFont($family, $style='', $size=0, $fontfile='', $subset='default') {
-		//Select a font; size given in points
-		if ($size == 0) {
-			$size = $this->FontSizePt;
-		}
-		// try to add font (if not already added)
-		$fontdata = $this->AddFont($family, $style, $fontfile, $subset);
-		$this->FontFamily = $fontdata['family'];
-		$this->FontStyle = $fontdata['style'];
-		$this->CurrentFont = $this->getFontBuffer($fontdata['fontkey']);
-		$this->SetFontSize($size);
-	}
-
-	/**
-	 * Defines the size of the current font.
-	 * @param float $size The size (in points)
-	 * @param boolean $out if true output the font size command, otherwise only set the font properties.
-	 * @access public
-	 * @since 1.0
-	 * @see SetFont()
-	 */
-	public function SetFontSize($size, $out=true) {
-		// font size in points
-		$this->FontSizePt = $size;
-		// font size in user units
-		$this->FontSize = $size / $this->k;
-		// calculate some font metrics
-		if (isset($this->CurrentFont['desc']['FontBBox'])) {
-			$bbox = explode(' ', substr($this->CurrentFont['desc']['FontBBox'], 1, -1));
-			$font_height = ((intval($bbox[3]) - intval($bbox[1])) * $size / 1000);
-		} else {
-			$font_height = $size * 1.219;
-		}
-		if (isset($this->CurrentFont['desc']['Ascent']) AND ($this->CurrentFont['desc']['Ascent'] > 0)) {
-			$font_ascent = ($this->CurrentFont['desc']['Ascent'] * $size / 1000);
-		}
-		if (isset($this->CurrentFont['desc']['Descent']) AND ($this->CurrentFont['desc']['Descent'] <= 0)) {
-			$font_descent = (- $this->CurrentFont['desc']['Descent'] * $size / 1000);
-		}
-		if (!isset($font_ascent) AND !isset($font_descent)) {
-			// core font
-			$font_ascent = 0.76 * $font_height;
-			$font_descent = $font_height - $font_ascent;
-		} elseif (!isset($font_descent)) {
-			$font_descent = $font_height - $font_ascent;
-		} elseif (!isset($font_ascent)) {
-			$font_ascent = $font_height - $font_descent;
-		}
-		$this->FontAscent = $font_ascent / $this->k;
-		$this->FontDescent = $font_descent / $this->k;
-		if ($out AND ($this->page > 0) AND (isset($this->CurrentFont['i']))) {
-			$this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
-		}
-	}
-
-	/**
-	 * Return the font descent value
-	 * @param string $font font name
-	 * @param string $style font style
-	 * @param float $size The size (in points)
-	 * @return int font descent
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.9.003 (2010-03-30)
-	 */
-	public function getFontDescent($font, $style='', $size=0) {
-		$fontdata = $this->AddFont($font, $style);
-		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
-		if (isset($fontinfo['desc']['Descent']) AND ($fontinfo['desc']['Descent'] <= 0)) {
-			$descent = (- $fontinfo['desc']['Descent'] * $size / 1000);
-		} else {
-			$descent = 1.219 * 0.24 * $size;
-		}
-		return ($descent / $this->k);
-	}
-
-	/**
-	 * Return the font ascent value
-	 * @param string $font font name
-	 * @param string $style font style
-	 * @param float $size The size (in points)
-	 * @return int font ascent
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.9.003 (2010-03-30)
-	 */
-	public function getFontAscent($font, $style='', $size=0) {
-		$fontdata = $this->AddFont($font, $style);
-		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
-		if (isset($fontinfo['desc']['Ascent']) AND ($fontinfo['desc']['Ascent'] > 0)) {
-			$ascent = ($fontinfo['desc']['Ascent'] * $size / 1000);
-		} else {
-			$ascent = 1.219 * 0.76 * $size;
-		}
-		return ($ascent / $this->k);
-	}
-
-	/**
-	 * Defines the default monospaced font.
-	 * @param string $font Font name.
-	 * @access public
-	 * @since 4.5.025
-	 */
-	public function SetDefaultMonospacedFont($font) {
-		$this->default_monospaced_font = $font;
-	}
-
-	/**
-	 * Creates a new internal link and returns its identifier. An internal link is a clickable area which directs to another place within the document.<br />
-	 * The identifier can then be passed to Cell(), Write(), Image() or Link(). The destination is defined with SetLink().
-	 * @access public
-	 * @since 1.5
-	 * @see Cell(), Write(), Image(), Link(), SetLink()
-	 */
-	public function AddLink() {
-		//Create a new internal link
-		$n = count($this->links) + 1;
-		$this->links[$n] = array(0, 0);
-		return $n;
-	}
-
-	/**
-	 * Defines the page and position a link points to.
-	 * @param int $link The link identifier returned by AddLink()
-	 * @param float $y Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
-	 * @param int $page Number of target page; -1 indicates the current page. This is the default value
-	 * @access public
-	 * @since 1.5
-	 * @see AddLink()
-	 */
-	public function SetLink($link, $y=0, $page=-1) {
-		if ($y == -1) {
-			$y = $this->y;
-		}
-		if ($page == -1) {
-			$page = $this->page;
-		}
-		$this->links[$link] = array($page, $y);
-	}
-
-	/**
-	 * Puts a link on a rectangular area of the page.
-	 * Text or image links are generally put via Cell(), Write() or Image(), but this method can be useful for instance to define a clickable area inside an image.
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param float $w Width of the rectangle
-	 * @param float $h Height of the rectangle
-	 * @param mixed $link URL or identifier returned by AddLink()
-	 * @param int $spaces number of spaces on the text to link
-	 * @access public
-	 * @since 1.5
-	 * @see AddLink(), Annotation(), Cell(), Write(), Image()
-	 */
-	public function Link($x, $y, $w, $h, $link, $spaces=0) {
-		$this->Annotation($x, $y, $w, $h, $link, array('Subtype'=>'Link'), $spaces);
-	}
-
-	/**
-	 * Puts a markup annotation on a rectangular area of the page.
-	 * !!!!THE ANNOTATION SUPPORT IS NOT YET FULLY IMPLEMENTED !!!!
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param float $w Width of the rectangle
-	 * @param float $h Height of the rectangle
-	 * @param string $text annotation text or alternate content
-	 * @param array $opt array of options (see section 8.4 of PDF reference 1.7).
-	 * @param int $spaces number of spaces on the text to link
-	 * @access public
-	 * @since 4.0.018 (2008-08-06)
-	 */
-	public function Annotation($x, $y, $w, $h, $text, $opt=array('Subtype'=>'Text'), $spaces=0) {
-		if ($this->inxobj) {
-			// store parameters for later use on template
-			$this->xobjects[$this->xobjid]['annotations'][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'text' => $text, 'opt' => $opt, 'spaces' => $spaces);
-			return;
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		// recalculate coordinates to account for graphic transformations
-		if (isset($this->transfmatrix) AND !empty($this->transfmatrix)) {
-			for ($i=$this->transfmatrix_key; $i > 0; --$i) {
-				$maxid = count($this->transfmatrix[$i]) - 1;
-				for ($j=$maxid; $j >= 0; --$j) {
-					$ctm = $this->transfmatrix[$i][$j];
-					if (isset($ctm['a'])) {
-						$x = $x * $this->k;
-						$y = ($this->h - $y) * $this->k;
-						$w = $w * $this->k;
-						$h = $h * $this->k;
-						// top left
-						$xt = $x;
-						$yt = $y;
-						$x1 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y1 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// top right
-						$xt = $x + $w;
-						$yt = $y;
-						$x2 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y2 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// bottom left
-						$xt = $x;
-						$yt = $y - $h;
-						$x3 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y3 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// bottom right
-						$xt = $x + $w;
-						$yt = $y - $h;
-						$x4 = ($ctm['a'] * $xt) + ($ctm['c'] * $yt) + $ctm['e'];
-						$y4 = ($ctm['b'] * $xt) + ($ctm['d'] * $yt) + $ctm['f'];
-						// new coordinates (rectangle area)
-						$x = min($x1, $x2, $x3, $x4);
-						$y = max($y1, $y2, $y3, $y4);
-						$w = (max($x1, $x2, $x3, $x4) - $x) / $this->k;
-						$h = ($y - min($y1, $y2, $y3, $y4)) / $this->k;
-						$x = $x / $this->k;
-						$y = $this->h - ($y / $this->k);
-					}
-				}
-			}
-		}
-		if ($this->page <= 0) {
-			$page = 1;
-		} else {
-			$page = $this->page;
-		}
-		if (!isset($this->PageAnnots[$page])) {
-			$this->PageAnnots[$page] = array();
-		}
-		++$this->n;
-		$this->PageAnnots[$page][] = array('n' => $this->n, 'x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
-		if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!$this->empty_string($opt['FS'])) AND file_exists($opt['FS']) AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
-			++$this->n;
-			$this->embeddedfiles[basename($opt['FS'])] = array('n' => $this->n, 'file' => $opt['FS']);
-		}
-		// Add widgets annotation's icons
-		if (isset($opt['mk']['i']) AND file_exists($opt['mk']['i'])) {
-			$this->Image($opt['mk']['i'], '', '', 10, 10, '', '', '', false, 300, '', false, false, 0, false, true);
-		}
-		if (isset($opt['mk']['ri']) AND file_exists($opt['mk']['ri'])) {
-			$this->Image($opt['mk']['ri'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
-		}
-		if (isset($opt['mk']['ix']) AND file_exists($opt['mk']['ix'])) {
-			$this->Image($opt['mk']['ix'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
-		}
-	}
-
-	/**
-	 * Embedd the attached files.
-	 * @since 4.4.000 (2008-12-07)
-	 * @access protected
-	 * @see Annotation()
-	 */
-	protected function _putEmbeddedFiles() {
-		reset($this->embeddedfiles);
-		foreach ($this->embeddedfiles as $filename => $filedata) {
-			$data = file_get_contents($filedata['file']);
-			$filter = '';
-			if ($this->compress) {
-				$data = gzcompress($data);
-				$filter = ' /Filter /FlateDecode';
-			}
-			$stream = $this->_getrawstream($data, $filedata['n']);
-			$out = $this->_getobj($filedata['n'])."\n";
-			$out .= '<< /Type /EmbeddedFile'.$filter.' /Length '.strlen($stream).' >>';
-			$out .= ' stream'."\n".$stream."\n".'endstream';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-	}
-
-	/**
-	 * Prints a text cell at the specified position.
-	 * The origin is on the left of the first charcter, on the baseline.
-	 * This method allows to place a string precisely on the page.
-	 * @param float $x Abscissa of the cell origin
-	 * @param float $y Ordinate of the cell origin
-	 * @param string $txt String to print
-	 * @param int $fstroke outline size in user units (false = disable)
-	 * @param boolean $fclip if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation).
-	 * @param boolean $ffill if true fills the text
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param mixed $link URL or identifier returned by AddLink().
-	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
-	 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li><li>B : cell bottom</li></ul>
-	 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-	 * @param boolean $rtloff if true uses the page top-left corner as origin of axis for $x and $y initial position.
-	 * @access public
-	 * @since 1.0
-	 * @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell()
-	 */
-	public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
-		$textrendermode = $this->textrendermode;
-		$textstrokewidth = $this->textstrokewidth;
-		$this->setTextRenderingMode($fstroke, $ffill, $fclip);
-		$this->SetXY($x, $y, $rtloff);
-		$this->Cell(0, 0, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height, $calign, $valign);
-		// restore previous rendering mode
-		$this->textrendermode = $textrendermode;
-		$this->textstrokewidth = $textstrokewidth;
-	}
-
-	/**
-	 * Whenever a page break condition is met, the method is called, and the break is issued or not depending on the returned value.
-	 * The default implementation returns a value according to the mode selected by SetAutoPageBreak().<br />
-	 * This method is called automatically and should not be called directly by the application.
-	 * @return boolean
-	 * @access public
-	 * @since 1.4
-	 * @see SetAutoPageBreak()
-	 */
-	public function AcceptPageBreak() {
-		if ($this->num_columns > 1) {
-			// multi column mode
-			if($this->current_column < ($this->num_columns - 1)) {
-				// go to next column
-				$this->selectColumn($this->current_column + 1);
-			} else {
-				// add a new page
-				$this->AddPage();
-				// set first column
-				$this->selectColumn(0);
-			}
-			// avoid page breaking from checkPageBreak()
-			return false;
-		}
-		return $this->AutoPageBreak;
-	}
-
-	/**
-	 * Add page if needed.
-	 * @param float $h Cell height. Default value: 0.
-	 * @param mixed $y starting y position, leave empty for current position.
-	 * @param boolean $addpage if true add a page, otherwise only return the true/false state
-	 * @return boolean true in case of page break, false otherwise.
-	 * @since 3.2.000 (2008-07-01)
-	 * @access protected
-	 */
-	protected function checkPageBreak($h=0, $y='', $addpage=true) {
-		if ($this->empty_string($y)) {
-			$y = $this->y;
-		}
-		$current_page = $this->page;
-		if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) {
-			if ($addpage) {
-				//Automatic page break
-				$x = $this->x;
-				$this->AddPage($this->CurOrientation);
-				$this->y = $this->tMargin;
-				$oldpage = $this->page - 1;
-				if ($this->rtl) {
-					if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) {
-						$this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']);
-					} else {
-						$this->x = $x;
-					}
-				} else {
-					if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-						$this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']);
-					} else {
-						$this->x = $x;
-					}
-				}
-			}
-			$this->newline = true;
-			return true;
-		}
-		if ($current_page != $this->page) {
-			// account for columns mode
-			$this->newline = true;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Removes SHY characters from text.
-	 * Unicode Data:<ul>
-	 * <li>Name : SOFT HYPHEN, commonly abbreviated as SHY</li>
-	 * <li>HTML Entity (decimal): &amp;#173;</li>
-	 * <li>HTML Entity (hex): &amp;#xad;</li>
-	 * <li>HTML Entity (named): &amp;shy;</li>
-	 * <li>How to type in Microsoft Windows: [Alt +00AD] or [Alt 0173]</li>
-	 * <li>UTF-8 (hex): 0xC2 0xAD (c2ad)</li>
-	 * <li>UTF-8 character: chr(194).chr(173)</li>
-	 * </ul>
-	 * @param string $txt input string
-	 * @return string without SHY characters.
-	 * @access public
-	 * @since (4.5.019) 2009-02-28
-	 */
-	public function removeSHY($txt='') {
-		$txt = preg_replace('/([\\xc2]{1}[\\xad]{1})/', '', $txt);
-		if (!$this->isunicode) {
-			$txt = preg_replace('/([\\xad]{1})/', '', $txt);
-		}
-		return $txt;
-	}
-
-	/**
-	 * Prints a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
-	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * @param float $w Cell width. If 0, the cell extends up to the right margin.
-	 * @param float $h Cell height. Default value: 0.
-	 * @param string $txt String to print. Default value: empty string.
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param mixed $link URL or identifier returned by AddLink().
-	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
-	 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-	 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-	 * @access public
-	 * @since 1.0
-	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
-	 */
-	public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		$this->adjustCellPadding($border);
-		if (!$ignore_min_height) {
-			$min_cell_height = ($this->FontSize * $this->cell_height_ratio) + $this->cell_padding['T'] + $this->cell_padding['B'];
-			if ($h < $min_cell_height) {
-				$h = $min_cell_height;
-			}
-		}
-		$this->checkPageBreak($h + $this->cell_margin['T'] + $this->cell_margin['B']);
-		$this->_out($this->getCellCode($w, $h, $txt, $border, $ln, $align, $fill, $link, $stretch, true, $calign, $valign));
-		$this->cell_padding = $prev_cell_padding;
-		$this->cell_margin = $prev_cell_margin;
-	}
-
-	/**
-	 * Returns the PDF string code to print a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
-	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * @param float $w Cell width. If 0, the cell extends up to the right margin.
-	 * @param float $h Cell height. Default value: 0.
-	 * @param string $txt String to print. Default value: empty string.
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param mixed $link URL or identifier returned by AddLink().
-	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
-	 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-	 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>M : middle</li><li>B : bottom</li></ul>
-	 * @return string containing cell code
-	 * @access protected
-	 * @since 1.0
-	 * @see Cell()
-	 */
-	protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		$txt = $this->removeSHY($txt);
-		$rs = ''; //string to be returned
-		$this->adjustCellPadding($border);
-		if (!$ignore_min_height) {
-			$min_cell_height = ($this->FontSize * $this->cell_height_ratio) + $this->cell_padding['T'] + $this->cell_padding['B'];
-			if ($h < $min_cell_height) {
-				$h = $min_cell_height;
-			}
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h);
-		$k = $this->k;
-		if ($this->rtl) {
-			$x = $this->x - $this->cell_margin['R'];
-		} else {
-			$x = $this->x + $this->cell_margin['L'];
-		}
-		$y = $this->y + $this->cell_margin['T'];
-		$prev_font_stretching = $this->font_stretching;
-		$prev_font_spacing = $this->font_spacing;
-		// cell vertical alignment
-		switch ($calign) {
-			case 'A': {
-				// font top
-				switch ($valign) {
-					case 'T': {
-						// top
-						$y -= $this->cell_padding['T'];
-						break;
-					}
-					case 'B': {
-						// bottom
-						$y -= ($h - $this->cell_padding['B'] - $this->FontAscent - $this->FontDescent);
-						break;
-					}
-					default:
-					case 'C':
-					case 'M': {
-						// center
-						$y -= (($h - $this->FontAscent - $this->FontDescent) / 2);
-						break;
-					}
-				}
-				break;
-			}
-			case 'L': {
-				// font baseline
-				switch ($valign) {
-					case 'T': {
-						// top
-						$y -= ($this->cell_padding['T'] + $this->FontAscent);
-						break;
-					}
-					case 'B': {
-						// bottom
-						$y -= ($h - $this->cell_padding['B'] - $this->FontDescent);
-						break;
-					}
-					default:
-					case 'C':
-					case 'M': {
-						// center
-						$y -= (($h + $this->FontAscent - $this->FontDescent) / 2);
-						break;
-					}
-				}
-				break;
-			}
-			case 'D': {
-				// font bottom
-				switch ($valign) {
-					case 'T': {
-						// top
-						$y -= ($this->cell_padding['T'] + $this->FontAscent + $this->FontDescent);
-						break;
-					}
-					case 'B': {
-						// bottom
-						$y -= ($h - $this->cell_padding['B']);
-						break;
-					}
-					default:
-					case 'C':
-					case 'M': {
-						// center
-						$y -= (($h + $this->FontAscent + $this->FontDescent) / 2);
-						break;
-					}
-				}
-				break;
-			}
-			case 'B': {
-				// cell bottom
-				$y -= $h;
-				break;
-			}
-			case 'C':
-			case 'M': {
-				// cell center
-				$y -= ($h / 2);
-				break;
-			}
-			default:
-			case 'T': {
-				// cell top
-				break;
-			}
-		}
-		// text vertical alignment
-		switch ($valign) {
-			case 'T': {
-				// top
-				$yt = $y + $this->cell_padding['T'];
-				break;
-			}
-			case 'B': {
-				// bottom
-				$yt = $y + $h - $this->cell_padding['B'] - $this->FontAscent - $this->FontDescent;
-				break;
-			}
-			default:
-			case 'C':
-			case 'M': {
-				// center
-				$yt = $y + (($h - $this->FontAscent - $this->FontDescent) / 2);
-				break;
-			}
-		}
-		$basefonty = $yt + $this->FontAscent;
-		if ($this->empty_string($w) OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = $x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $x;
-			}
-		}
-		$s = '';
-		// fill and borders
-		if (is_string($border) AND (strlen($border) == 4)) {
-			// full border
-			$border = 1;
-		}
-		if ($fill OR ($border == 1)) {
-			if ($fill) {
-				$op = ($border == 1) ? 'B' : 'f';
-			} else {
-				$op = 'S';
-			}
-			if ($this->rtl) {
-				$xk = (($x - $w) * $k);
-			} else {
-				$xk = ($x * $k);
-			}
-			$s .= sprintf('%.2F %.2F %.2F %.2F re %s ', $xk, (($this->h - $y) * $k), ($w * $k), (-$h * $k), $op);
-		}
-		// draw borders
-		$s .= $this->getCellBorder($x, $y, $w, $h, $border);
-		if ($txt != '') {
-			$txt2 = $txt;
-			if ($this->isunicode) {
-				if (($this->CurrentFont['type'] == 'core') OR ($this->CurrentFont['type'] == 'TrueType') OR ($this->CurrentFont['type'] == 'Type1')) {
-					$txt2 = $this->UTF8ToLatin1($txt2);
-				} else {
-					$unicode = $this->UTF8StringToArray($txt); // array of UTF-8 unicode values
-					$unicode = $this->utf8Bidi($unicode, '', $this->tmprtl);
-					if (defined('K_THAI_TOPCHARS') AND (K_THAI_TOPCHARS == true)) {
-						// ---- Fix for bug #2977340 "Incorrect Thai characters position arrangement" ----
-						// NOTE: this doesn't work with HTML justification
-						// Symbols that could overlap on the font top (only works in LTR)
-						$topchar = array(3611, 3613, 3615, 3650, 3651, 3652); // chars that extends on top
-						$topsym = array(3633, 3636, 3637, 3638, 3639, 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662); // symbols with top position
-						$numchars = count($unicode); // number of chars
-						$unik = 0;
-						$uniblock = array();
-						$uniblock[$unik] = array();
-						$uniblock[$unik][] = $unicode[0];
-						// resolve overlapping conflicts by splitting the string in several parts
-						for ($i = 1; $i < $numchars; ++$i) {
-							// check if symbols overlaps at top
-							if (in_array($unicode[$i], $topsym) AND (in_array($unicode[($i - 1)], $topsym) OR in_array($unicode[($i - 1)], $topchar))) {
-								// move symbols to another array
-								++$unik;
-								$uniblock[$unik] = array();
-								$uniblock[$unik][] = $unicode[$i];
-								++$unik;
-								$uniblock[$unik] = array();
-								$unicode[$i] = 0x200b; // Unicode Character 'ZERO WIDTH SPACE' (DEC:8203, U+200B)
-							} else {
-								$uniblock[$unik][] = $unicode[$i];
-							}
-						}
-						// ---- END OF Fix for bug #2977340
-					}
-					$txt2 = $this->arrUTF8ToUTF16BE($unicode, false);
-				}
-			}
-			$txt2 = $this->_escape($txt2);
-			// get current text width (considering general font stretching and spacing)
-			$txwidth = $this->GetStringWidth($txt);
-			$width = $txwidth;
-			// check for stretch mode
-			if ($stretch > 0) {
-				// calculate ratio between cell width and text width
-				if ($width <= 0) {
-					$ratio = 1;
-				} else {
-					$ratio = (($w - $this->cell_padding['L'] - $this->cell_padding['R']) / $width);
-				}
-				// check if stretching is required
-				if (($ratio < 1) OR (($ratio > 1) AND (($stretch % 2) == 0))) {
-					// the text will be stretched to fit cell width
-					if ($stretch > 2) {
-						// set new character spacing
-						$this->font_spacing += ($w - $this->cell_padding['L'] - $this->cell_padding['R'] - $width) / (max(($this->GetNumChars($txt) - 1), 1) * ($this->font_stretching / 100));
-					} else {
-						// set new horizontal stretching
-						$this->font_stretching *= $ratio;
-					}
-					// recalculate text width (the text fills the entire cell)
-					$width = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-					// reset alignment
-					$align = '';
-				}
-			}
-			if ($this->font_stretching != 100) {
-				// apply font stretching
-				$rs .= sprintf('BT %.2F Tz ET ', $this->font_stretching);
-			}
-			if ($this->font_spacing != 0) {
-				// increase/decrease font spacing
-				$rs .= sprintf('BT %.2F Tc ET ', ($this->font_spacing * $this->k));
-			}
-			if ($this->ColorFlag) {
-				$s .= 'q '.$this->TextColor.' ';
-			}
-			// rendering mode
-			$s .= sprintf('BT %d Tr %.2F w ET ', $this->textrendermode, $this->textstrokewidth);
-			// count number of spaces
-			$ns = substr_count($txt, chr(32));
-			// Justification
-			$spacewidth = 0;
-			if (($align == 'J') AND ($ns > 0)) {
-				if ($this->isUnicodeFont()) {
-					// get string width without spaces
-					$width = $this->GetStringWidth(str_replace(' ', '', $txt));
-					// calculate average space width
-					$spacewidth = -1000 * ($w - $width - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1) / $this->FontSize;
-					if ($this->font_stretching != 100) {
-						// word spacing is affected by stretching
-						$spacewidth /= ($this->font_stretching / 100);
-					}
-					// set word position to be used with TJ operator
-					$txt2 = str_replace(chr(0).chr(32), ') '.sprintf('%.3F', $spacewidth).' (', $txt2);
-					$unicode_justification = true;
-				} else {
-					// get string width
-					$width = $txwidth;
-					// new space width
-					$spacewidth = (($w - $width - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1)) * $this->k;
-					if ($this->font_stretching != 100) {
-						// word spacing (Tw) is affected by stretching
-						$spacewidth /= ($this->font_stretching / 100);
-					}
-					// set word spacing
-					$rs .= sprintf('BT %.3F Tw ET ', $spacewidth);
-				}
-				$width = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-			}
-			// replace carriage return characters
-			$txt2 = str_replace("\r", ' ', $txt2);
-			switch ($align) {
-				case 'C': {
-					$dx = ($w - $width) / 2;
-					break;
-				}
-				case 'R': {
-					if ($this->rtl) {
-						$dx = $this->cell_padding['R'];
-					} else {
-						$dx = $w - $width - $this->cell_padding['R'];
-					}
-					break;
-				}
-				case 'L': {
-					if ($this->rtl) {
-						$dx = $w - $width - $this->cell_padding['L'];
-					} else {
-						$dx = $this->cell_padding['L'];
-					}
-					break;
-				}
-				case 'J':
-				default: {
-					if ($this->rtl) {
-						$dx = $this->cell_padding['R'];
-					} else {
-						$dx = $this->cell_padding['L'];
-					}
-					break;
-				}
-			}
-			if ($this->rtl) {
-				$xdx = $x - $dx - $width;
-			} else {
-				$xdx = $x + $dx;
-			}
-			$xdk = $xdx * $k;
-			// print text
-			$s .= sprintf('BT %.2F %.2F Td [(%s)] TJ ET', $xdk, (($this->h - $basefonty) * $k), $txt2);
-			if (isset($uniblock)) {
-				// print overlapping characters as separate string
-				$xshift = 0; // horizontal shift
-				$ty = (($this->h - $basefonty + (0.2 * $this->FontSize)) * $k);
-				$spw = (($w - $txwidth - $this->cell_padding['L'] - $this->cell_padding['R']) / ($ns?$ns:1));
-				foreach ($uniblock as $uk => $uniarr) {
-					if (($uk % 2) == 0) {
-						// x space to skip
-						if ($spacewidth != 0) {
-							// justification shift
-							$xshift += (count(array_keys($uniarr, 32)) * $spw);
-						}
-						$xshift += $this->GetArrStringWidth($uniarr); // + shift justification
-					} else {
-						// character to print
-						$topchr = $this->arrUTF8ToUTF16BE($uniarr, false);
-						$topchr = $this->_escape($topchr);
-						$s .= sprintf(' BT %.2F %.2F Td [(%s)] TJ ET', ($xdk + ($xshift * $k)), $ty, $topchr);
-					}
-				}
-			}
-			if ($this->underline) {
-				$s .= ' '.$this->_dounderlinew($xdx, $basefonty, $width);
-			}
-			if ($this->linethrough) {
-				$s .= ' '.$this->_dolinethroughw($xdx, $basefonty, $width);
-			}
-			if ($this->overline) {
-				$s .= ' '.$this->_dooverlinew($xdx, $basefonty, $width);
-			}
-			if ($this->ColorFlag) {
-				$s .= ' Q';
-			}
-			if ($link) {
-				$this->Link($xdx, $yt, $width, ($this->FontAscent + $this->FontDescent), $link, $ns);
-			}
-		}
-		// output cell
-		if ($s) {
-			// output cell
-			$rs .= $s;
-			if ($this->font_spacing != 0) {
-				// reset font spacing mode
-				$rs .= ' BT 0 Tc ET';
-			}
-			if ($this->font_stretching != 100) {
-				// reset font stretching mode
-				$rs .= ' BT 100 Tz ET';
-			}
-		}
-		// reset word spacing
-		if (!$this->isUnicodeFont() AND ($align == 'J')) {
-			$rs .= ' BT 0 Tw ET';
-		}
-		// reset stretching and spacing
-		$this->font_stretching = $prev_font_stretching;
-		$this->font_spacing = $prev_font_spacing;
-		$this->lasth = $h;
-		if ($ln > 0) {
-			//Go to the beginning of the next line
-			$this->y = $y + $h + $this->cell_margin['B'];
-			if ($ln == 1) {
-				if ($this->rtl) {
-					$this->x = $this->w - $this->rMargin;
-				} else {
-					$this->x = $this->lMargin;
-				}
-			}
-		} else {
-			// go left or right by case
-			if ($this->rtl) {
-				$this->x = $x - $w - $this->cell_margin['L'];
-			} else {
-				$this->x = $x + $w + $this->cell_margin['R'];
-			}
-		}
-		$gstyles = ''.$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' '.$this->FillColor."\n";
-		$rs = $gstyles.$rs;
-		$this->cell_padding = $prev_cell_padding;
-		$this->cell_margin = $prev_cell_margin;
-		return $rs;
-	}
-
-	/**
-	 * Returns the code to draw the cell border
-	 * @param float $x X coordinate.
-	 * @param float $y Y coordinate.
-	 * @param float $w Cell width.
-	 * @param float $h Cell height.
-	 * @param mixed $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param string $mode border position respect the square edge: normal: centered; ext: external; int: internal;
-	 * @return string containing cell border code
-	 * @access protected
-	 * @see SetLineStyle()
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCellBorder($x, $y, $w, $h, $brd) {
-		$s = ''; // string to be returned
-		if (empty($brd)) {
-			return $s;
-		}
-		if ($brd == 1) {
-			$brd = array('LRTB' => true);
-		}
-		// calculate coordinates for border
-		$k = $this->k;
-		if ($this->rtl) {
-			$xeL = ($x - $w) * $k;
-			$xeR = $x * $k;
-		} else {
-			$xeL = $x * $k;
-			$xeR = ($x + $w) * $k;
-		}
-		$yeL = (($this->h - ($y + $h)) * $k);
-		$yeT = (($this->h - $y) * $k);
-		$xeT = $xeL;
-		$xeB = $xeR;
-		$yeR = $yeT;
-		$yeB = $yeL;
-		if (is_string($brd)) {
-			// convert string to array
-			$slen = strlen($brd);
-			$newbrd = array();
-			for ($i = 0; $i < $slen; ++$i) {
-				$newbrd[$brd{$i}] = array('cap' => 'square', 'join' => 'miter');
-			}
-			$brd = $newbrd;
-		}
-		if (isset($brd['mode'])) {
-			$mode = $brd['mode'];
-			unset($brd['mode']);
-		} else {
-			$mode = 'normal';
-		}
-		foreach ($brd as $border => $style) {
-			if (is_array($style) AND !empty($style)) {
-				// apply border style
-				$prev_style = $this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' ';
-				$s .= $this->SetLineStyle($style, true)."\n";
-			}
-			switch ($mode) {
-				case 'ext': {
-					$off = (($this->LineWidth / 2) * $k);
-					$xL = $xeL - $off;
-					$xR = $xeR + $off;
-					$yT = $yeT + $off;
-					$yL = $yeL - $off;
-					$xT = $xL;
-					$xB = $xR;
-					$yR = $yT;
-					$yB = $yL;
-					$w += $this->LineWidth;
-					$h += $this->LineWidth;
-					break;
-				}
-				case 'int': {
-					$off = ($this->LineWidth / 2) * $k;
-					$xL = $xeL + $off;
-					$xR = $xeR - $off;
-					$yT = $yeT - $off;
-					$yL = $yeL + $off;
-					$xT = $xL;
-					$xB = $xR;
-					$yR = $yT;
-					$yB = $yL;
-					$w -= $this->LineWidth;
-					$h -= $this->LineWidth;
-					break;
-				}
-				case 'normal':
-				default: {
-					$xL = $xeL;
-					$xT = $xeT;
-					$xB = $xeB;
-					$xR = $xeR;
-					$yL = $yeL;
-					$yT = $yeT;
-					$yB = $yeB;
-					$yR = $yeR;
-					break;
-				}
-			}
-			// draw borders by case
-			if (strlen($border) == 4) {
-				$s .= sprintf('%.2F %.2F %.2F %.2F re S ', $xT, $yT, ($w * $k), (-$h * $k));
-			} elseif (strlen($border) == 3) {
-				if (strpos($border,'B') === false) { // LTR
-					$s .= sprintf('%.2F %.2F m ', $xL, $yL);
-					$s .= sprintf('%.2F %.2F l ', $xT, $yT);
-					$s .= sprintf('%.2F %.2F l ', $xR, $yR);
-					$s .= sprintf('%.2F %.2F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif (strpos($border,'L') === false) { // TRB
-					$s .= sprintf('%.2F %.2F m ', $xT, $yT);
-					$s .= sprintf('%.2F %.2F l ', $xR, $yR);
-					$s .= sprintf('%.2F %.2F l ', $xB, $yB);
-					$s .= sprintf('%.2F %.2F l ', $xL, $yL);
-					$s .= 'S ';
-				} elseif (strpos($border,'T') === false) { // RBL
-					$s .= sprintf('%.2F %.2F m ', $xR, $yR);
-					$s .= sprintf('%.2F %.2F l ', $xB, $yB);
-					$s .= sprintf('%.2F %.2F l ', $xL, $yL);
-					$s .= sprintf('%.2F %.2F l ', $xT, $yT);
-					$s .= 'S ';
-				} elseif (strpos($border,'R') === false) { // BLT
-					$s .= sprintf('%.2F %.2F m ', $xB, $yB);
-					$s .= sprintf('%.2F %.2F l ', $xL, $yL);
-					$s .= sprintf('%.2F %.2F l ', $xT, $yT);
-					$s .= sprintf('%.2F %.2F l ', $xR, $yR);
-					$s .= 'S ';
-				}
-			} elseif (strlen($border) == 2) {
-				if ((strpos($border,'L') !== false) AND (strpos($border,'T') !== false)) { // LT
-					$s .= sprintf('%.2F %.2F m ', $xL, $yL);
-					$s .= sprintf('%.2F %.2F l ', $xT, $yT);
-					$s .= sprintf('%.2F %.2F l ', $xR, $yR);
-					$s .= 'S ';
-				} elseif ((strpos($border,'T') !== false) AND (strpos($border,'R') !== false)) { // TR
-					$s .= sprintf('%.2F %.2F m ', $xT, $yT);
-					$s .= sprintf('%.2F %.2F l ', $xR, $yR);
-					$s .= sprintf('%.2F %.2F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif ((strpos($border,'R') !== false) AND (strpos($border,'B') !== false)) { // RB
-					$s .= sprintf('%.2F %.2F m ', $xR, $yR);
-					$s .= sprintf('%.2F %.2F l ', $xB, $yB);
-					$s .= sprintf('%.2F %.2F l ', $xL, $yL);
-					$s .= 'S ';
-				} elseif ((strpos($border,'B') !== false) AND (strpos($border,'L') !== false)) { // BL
-					$s .= sprintf('%.2F %.2F m ', $xB, $yB);
-					$s .= sprintf('%.2F %.2F l ', $xL, $yL);
-					$s .= sprintf('%.2F %.2F l ', $xT, $yT);
-					$s .= 'S ';
-				} elseif ((strpos($border,'L') !== false) AND (strpos($border,'R') !== false)) { // LR
-					$s .= sprintf('%.2F %.2F m ', $xL, $yL);
-					$s .= sprintf('%.2F %.2F l ', $xT, $yT);
-					$s .= 'S ';
-					$s .= sprintf('%.2F %.2F m ', $xR, $yR);
-					$s .= sprintf('%.2F %.2F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif ((strpos($border,'T') !== false) AND (strpos($border,'B') !== false)) { // TB
-					$s .= sprintf('%.2F %.2F m ', $xT, $yT);
-					$s .= sprintf('%.2F %.2F l ', $xR, $yR);
-					$s .= 'S ';
-					$s .= sprintf('%.2F %.2F m ', $xB, $yB);
-					$s .= sprintf('%.2F %.2F l ', $xL, $yL);
-					$s .= 'S ';
-				}
-			} else { // strlen($border) == 1
-				if (strpos($border,'L') !== false) { // L
-					$s .= sprintf('%.2F %.2F m ', $xL, $yL);
-					$s .= sprintf('%.2F %.2F l ', $xT, $yT);
-					$s .= 'S ';
-				} elseif (strpos($border,'T') !== false) { // T
-					$s .= sprintf('%.2F %.2F m ', $xT, $yT);
-					$s .= sprintf('%.2F %.2F l ', $xR, $yR);
-					$s .= 'S ';
-				} elseif (strpos($border,'R') !== false) { // R
-					$s .= sprintf('%.2F %.2F m ', $xR, $yR);
-					$s .= sprintf('%.2F %.2F l ', $xB, $yB);
-					$s .= 'S ';
-				} elseif (strpos($border,'B') !== false) { // B
-					$s .= sprintf('%.2F %.2F m ', $xB, $yB);
-					$s .= sprintf('%.2F %.2F l ', $xL, $yL);
-					$s .= 'S ';
-				}
-			}
-			if (is_array($style) AND !empty($style)) {
-				// reset border style to previous value
-				$s .= "\n".$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor."\n";
-			}
-		}
-		return $s;
-	}
-
-	/**
-	 * This method allows printing text with line breaks.
-	 * They can be automatic (as soon as the text reaches the right border of the cell) or explicit (via the \n character). As many cells as necessary are output, one below the other.<br />
-	 * Text can be aligned, centered or justified. The cell block can be framed and the background painted.
-	 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param float $h Cell minimum height. The cell extends automatically if needed.
-	 * @param string $txt String to print
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value when $ishtml=false)</li></ul>
-	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
-	 * @param float $x x position in user units
-	 * @param float $y y position in user units
-	 * @param boolean $reseth if true reset the last cell height (default true).
-	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param boolean $ishtml set to true if $txt is HTML content (default = false).
-	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width.
-	 * @param float $maxh maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature. This feature works only when $ishtml=false.
-	 * @param string $valign Vertical alignment of text (requires $maxh = $h > 0). Possible values are:<ul><li>T: TOP</li><li>M: middle</li><li>B: bottom</li></ul>. This feature works only when $ishtml=false.
-	 * @param boolean $fitcell if true attempt to fit all the text within the cell by reducing the font size.
-	 * @return int Return the number of cells or 1 for html mode.
-	 * @access public
-	 * @since 1.3
-	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
-	 */
-	public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		// adjust internal padding
-		$this->adjustCellPadding($border);
-		$mc_padding = $this->cell_padding;
-		$mc_margin = $this->cell_margin;
-		$this->cell_padding['T'] = 0;
-		$this->cell_padding['B'] = 0;
-		$this->setCellMargins(0, 0, 0, 0);
-		if ($this->empty_string($this->lasth) OR $reseth) {
-			// reset row height
-			$this->resetLastH();
-		}
-		if (!$this->empty_string($y)) {
-			$this->SetY($y);
-		} else {
-			$y = $this->GetY();
-		}
-		$resth = 0;
-		if ((!$this->InFooter) AND (($y + $h + $mc_margin['T'] + $mc_margin['B']) > $this->PageBreakTrigger)) {
-			// spit cell in more pages/columns
-			$newh = $this->PageBreakTrigger - $y;
-			$resth = $h - $newh; // cell to be printed on the next page/column
-			$h = $newh;
-		}
-		// get current page number
-		$startpage = $this->page;
-		// get current column
-		$startcolumn = $this->current_column;
-		if (!$this->empty_string($x)) {
-			$this->SetX($x);
-		} else {
-			$x = $this->GetX();
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions(0, $x, $y);
-		// apply margins
-		$oy = $y + $mc_margin['T'];
-		if ($this->rtl) {
-			$ox = $this->w - $x - $mc_margin['R'];
-		} else {
-			$ox = $x + $mc_margin['L'];
-		}
-		$this->x = $ox;
-		$this->y = $oy;
-		// set width
-		if ($this->empty_string($w) OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = $this->x - $this->lMargin - $mc_margin['L'];
-			} else {
-				$w = $this->w - $this->x - $this->rMargin - $mc_margin['R'];
-			}
-		}
-		// store original margin values
-		$lMargin = $this->lMargin;
-		$rMargin = $this->rMargin;
-		if ($this->rtl) {
-			$this->rMargin = $this->w - $this->x;
-			$this->lMargin = $this->x - $w;
-		} else {
-			$this->lMargin = $this->x;
-			$this->rMargin = $this->w - $this->x - $w;
-		}
-		if ($autopadding) {
-			// add top padding
-			$this->y += $mc_padding['T'];
-		}
-		if ($ishtml) { // ******* Write HTML text
-			$this->writeHTML($txt, true, 0, $reseth, true, $align);
-			$nl = 1;
-		} else { // ******* Write simple text
-			// vertical alignment
-			if ($maxh > 0) {
-				// get text height
-				$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
-				if ($fitcell) {
-					$prev_FontSizePt = $this->FontSizePt;
-					// try to reduce font size to fit text on cell (use a quick search algorithm)
-					$fmin = 1;
-					$fmax = $this->FontSizePt;
-					$prev_text_height = $text_height;
-					$maxit = 100; // max number of iterations
-					while ($maxit > 0) {
-						$fmid = (($fmax + $fmin) / 2);
-						$this->SetFontSize($fmid, false);
-						$this->resetLastH();
-						$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
-						if (($text_height == $maxh) OR (($text_height < $maxh) AND ($fmin >= ($fmax - 0.01)))) {
-							break;
-						} elseif ($text_height < $maxh) {
-							$fmin = $fmid;
-						} else {
-							$fmax = $fmid;
-						}
-						--$maxit;
-					}
-					$this->SetFontSize($this->FontSizePt);
-				}
-				if ($text_height < $maxh) {
-					if ($valign == 'M') {
-						// text vertically centered
-						$this->y += (($maxh - $text_height) / 2);
-					} elseif ($valign == 'B') {
-						// text vertically aligned on bottom
-						$this->y += ($maxh - $text_height);
-					}
-				}
-			}
-			$nl = $this->Write($this->lasth, $txt, '', 0, $align, true, $stretch, false, true, $maxh, 0, $mc_margin);
-			if ($fitcell) {
-				// restore font size
-				$this->SetFontSize($prev_FontSizePt);
-			}
-		}
-		if ($autopadding) {
-			// add bottom padding
-			$this->y += $mc_padding['B'];
-		}
-		// Get end-of-text Y position
-		$currentY = $this->y;
-		// get latest page number
-		$endpage = $this->page;
-		if ($resth > 0) {
-			$skip = ($endpage - $startpage);
-			$tmpresth = $resth;
-			while ($tmpresth > 0) {
-				if ($skip <= 0) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-				if ($this->num_columns > 1) {
-					$tmpresth -= ($this->h - $this->y - $this->bMargin);
-				} else {
-					$tmpresth -= ($this->h - $this->tMargin - $this->bMargin);
-				}
-				--$skip;
-			}
-			$currentY = $this->y;
-			$endpage = $this->page;
-		}
-		// get latest column
-		$endcolumn = $this->current_column;
-		if ($this->num_columns == 0) {
-			$this->num_columns = 1;
-		}
-		// get border modes
-		$border_start = $this->getBorderMode($border, $position='start');
-		$border_end = $this->getBorderMode($border, $position='end');
-		$border_middle = $this->getBorderMode($border, $position='middle');
-		// design borders around HTML cells.
-		for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
-			$ccode = '';
-			$this->setPage($page);
-			if ($this->num_columns < 2) {
-				// single-column mode
-				$this->SetX($x);
-				$this->y = $this->tMargin;
-			}
-			// account for margin changes
-			if ($page > $startpage) {
-				if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-					$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-				} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-					$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-				}
-			}
-			if ($startpage == $endpage) {
-				// single page
-				for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					if ($startcolumn == $endcolumn) { // single column
-						$cborder = $border;
-						$h = max($h, ($currentY - $oy));
-						$this->y = $oy;
-					} elseif ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $oy;
-						$h = $this->h - $this->y - $this->bMargin;
-					} elseif ($column == $endcolumn) { // end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-						if ($resth > $h) {
-							$h = $resth;
-						}
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-						$resth -= $h;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $startpage) { // first page
-				for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					if ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $oy;
-						$h = $this->h - $this->y - $this->bMargin;
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-						$resth -= $h;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $endpage) { // last page
-				for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					if ($column == $endcolumn) {
-						// end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-						if ($resth > $h) {
-							$h = $resth;
-						}
-					} else {
-						// middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-						$resth -= $h;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} else { // middle page
-				for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($this->rtl) {
-						$this->x -= $mc_margin['R'];
-					} else {
-						$this->x += $mc_margin['L'];
-					}
-					$cborder = $border_middle;
-					$h = $this->h - $this->y - $this->bMargin;
-					$resth -= $h;
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			}
-			if ($cborder OR $fill) {
-				// draw border and fill
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-						$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
-						$pagemark = &$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
-					} else {
-						$pagemark = &$this->xobjects[$this->xobjid]['intmrk'];
-					}
-					$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
-					$pagemark += strlen($ccode);
-				} else {
-					if (end($this->transfmrk[$this->page]) !== false) {
-						$pagemarkkey = key($this->transfmrk[$this->page]);
-						$pagemark = &$this->transfmrk[$this->page][$pagemarkkey];
-					} elseif ($this->InFooter) {
-						$pagemark = &$this->footerpos[$this->page];
-					} else {
-						$pagemark = &$this->intmrk[$this->page];
-					}
-					$pagebuff = $this->getPageBuffer($this->page);
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
-					$pagemark += strlen($ccode);
-				}
-			}
-		} // end for each page
-		// Get end-of-cell Y position
-		$currentY = $this->GetY();
-		// restore original margin values
-		$this->SetLeftMargin($lMargin);
-		$this->SetRightMargin($rMargin);
-		if ($ln > 0) {
-			//Go to the beginning of the next line
-			$this->SetY($currentY + $mc_margin['B']);
-			if ($ln == 2) {
-				$this->SetX($x + $w + $mc_margin['L'] + $mc_margin['R']);
-			}
-		} else {
-			// go left or right by case
-			$this->setPage($startpage);
-			$this->y = $y;
-			$this->SetX($x + $w + $mc_margin['L'] + $mc_margin['R']);
-		}
-		$this->setContentMark();
-		$this->cell_padding = $prev_cell_padding;
-		$this->cell_margin = $prev_cell_margin;
-		return $nl;
-	}
-
-	/**
-	 * Get the border mode accounting for multicell position (opens bottom side of multicell crossing pages)
-	 * @param mixed $brd Indicates if borders must be drawn around the cell block. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param string multicell position: 'start', 'middle', 'end'
-	 * @return border mode array
-	 * @access protected
-	 * @since 4.4.002 (2008-12-09)
-	 */
-	protected function getBorderMode($brd, $position='start') {
-		if ((!$this->opencell) OR empty($brd)) {
-			return $brd;
-		}
-		if ($brd == 1) {
-			$brd = 'LTRB';
-		}
-		if (is_string($brd)) {
-			// convert string to array
-			$slen = strlen($brd);
-			$newbrd = array();
-			for ($i = 0; $i < $slen; ++$i) {
-				$newbrd[$brd{$i}] = array('cap' => 'square', 'join' => 'miter');
-			}
-			$brd = $newbrd;
-		}
-		foreach ($brd as $border => $style) {
-			switch ($position) {
-				case 'start': {
-					if (strpos($border, 'B') !== false) {
-						// remove bottom line
-						$newkey = str_replace('B', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-					}
-					break;
-				}
-				case 'middle': {
-					if (strpos($border, 'B') !== false) {
-						// remove bottom line
-						$newkey = str_replace('B', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-						$border = $newkey;
-					}
-					if (strpos($border, 'T') !== false) {
-						// remove bottom line
-						$newkey = str_replace('T', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-					}
-					break;
-				}
-				case 'end': {
-					if (strpos($border, 'T') !== false) {
-						// remove bottom line
-						$newkey = str_replace('T', '', $border);
-						if (strlen($newkey) > 0) {
-							$brd[$newkey] = $style;
-						}
-						unset($brd[$border]);
-					}
-					break;
-				}
-			}
-		}
-		return $brd;
-	}
-
-	/**
-	 * This method return the estimated number of lines for print a simple text string using Multicell() method.
-	 * @param string $txt String for calculating his height
-	 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param boolean $reseth if true reset the last cell height (default false).
-	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width (default true).
-	 * @param float $cellpadding Internal cell padding, if empty uses default cell padding.
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
-	 * @author Alexander Escalona Fern�ndez, Nicola Asuni
-	 * @access public
-	 * @since 4.5.011
-	 */
-	public function getNumLines($txt, $w=0, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
-		if ($txt === '') {
-			// empty string
-			return 1;
-		}
-		// adjust internal padding
-		$prev_cell_padding = $this->cell_padding;
-		$prev_lasth = $this->lasth;
-		if (is_array($cellpadding)) {
-			$this->cell_padding = $cellpadding;
-		}
-		$this->adjustCellPadding($border);
-		if ($this->empty_string($w) OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = $this->x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $this->x;
-			}
-		}
-		$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-		if ($reseth) {
-			// reset row height
-			$this->resetLastH();
-		}
-		$lines = 1;
-		$sum = 0;
-		$chars = $this->utf8Bidi($this->UTF8StringToArray($txt), $txt, $this->tmprtl);
-		$charsWidth = $this->GetArrStringWidth($chars, '', '', 0, true);
-		$length = count($chars);
-		$lastSeparator = -1;
-		for ($i = 0; $i < $length; ++$i) {
-			$charWidth = $charsWidth[$i];
-			if (preg_match($this->re_spaces, $this->unichr($chars[$i]))) {
-				$lastSeparator = $i;
-			}
-			if ((($sum + $charWidth) > $wmax) OR ($chars[$i] == 10)) {
-				++$lines;
-				if ($lastSeparator != -1) {
-					$i = $lastSeparator;
-					$lastSeparator = -1;
-					$sum = 0;
-				} else {
-					$sum = $charWidth;
-				}
-			} else {
-				$sum += $charWidth;
-			}
-		}
-		if ($chars[($length - 1)] == 10) {
-			--$lines;
-		}
-		$this->cell_padding = $prev_cell_padding;
-		$this->lasth = $prev_lasth;
-		return $lines;
-	}
-
-	/**
-	 * This method return the estimated needed height for print a simple text string in Multicell() method.
-	 * Generally, if you want to know the exact height for a block of content you can use the following alternative technique:
-	 * <pre>
-	 *  // store current object
-	 *  $pdf->startTransaction();
-	 *  // store starting values
-	 *  $start_y = $pdf->GetY();
-	 *  $start_page = $pdf->getPage();
-	 *  // call your printing functions with your parameters
-	 *  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	 *  $pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
-	 *  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	 *  // get the new Y
-	 *  $end_y = $pdf->GetY();
-	 *  $end_page = $pdf->getPage();
-	 *  // calculate height
-	 *  $height = 0;
-	 *  if ($end_page == $start_page) {
-	 *  	$height = $end_y - $start_y;
-	 *  } else {
-	 *  	for ($page=$start_page; $page <= $end_page; ++$page) {
-	 *  		$this->setPage($page);
-	 *  		if ($page == $start_page) {
-	 *  			// first page
-	 *  			$height = $this->h - $start_y - $this->bMargin;
-	 *  		} elseif ($page == $end_page) {
-	 *  			// last page
-	 *  			$height = $end_y - $this->tMargin;
-	 *  		} else {
-	 *  			$height = $this->h - $this->tMargin - $this->bMargin;
-	 *  		}
-	 *  	}
-	 *  }
-	 *  // restore previous object
-	 *  $pdf = $pdf->rollbackTransaction();
-	 * </pre>
-	 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param string $txt String for calculating his height
-	 * @param boolean $reseth if true reset the last cell height (default false).
-	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width (default true).
-	 * @param float $cellpadding Internal cell padding, if empty uses default cell padding.
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
-	 * @author Nicola Asuni, Alexander Escalona Fern�ndez
-	 * @access public
-	 */
-	public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
-		// adjust internal padding
-		$prev_cell_padding = $this->cell_padding;
-		$prev_lasth = $this->lasth;
-		if (is_array($cellpadding)) {
-			$this->cell_padding = $cellpadding;
-		}
-		$this->adjustCellPadding($border);
-		$lines = $this->getNumLines($txt, $w, $reseth, $autopadding, $cellpadding, $border);
-		$height = $lines * ($this->FontSize * $this->cell_height_ratio);
-		if ($autopadding) {
-			// add top and bottom padding
-			$height += ($this->cell_padding['T'] + $this->cell_padding['B']);
-		}
-		$this->cell_padding = $prev_cell_padding;
-		$this->lasth = $prev_lasth;
-		return $height;
-	}
-
-	/**
-	 * This method prints text from the current position.<br />
-	 * @param float $h Line height
-	 * @param string $txt String to print
-	 * @param mixed $link URL or identifier returned by AddLink()
-	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param boolean $ln if true set cursor at the bottom of the line, otherwise set cursor at the top of the line.
-	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param boolean $firstline if true prints only the first line and return the remaining string.
-	 * @param boolean $firstblock if true the string is the starting of a line.
-	 * @param float $maxh maximum height. The remaining unprinted text will be returned. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature.
-	 * @param float $wadj first line width will be reduced by this amount (used in HTML mode).
-	 * @param array $margin margin array of the parent container
-	 * @return mixed Return the number of cells or the remaining string if $firstline = true.
-	 * @access public
-	 * @since 1.5
-	 */
-	public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0, $wadj=0, $margin='') {
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h);
-		if (strlen($txt) == 0) {
-			// fix empty text
-			$txt = ' ';
-		}
-		if ($margin === '') {
-			// set default margins
-			$margin = $this->cell_margin;
-		}
-		// remove carriage returns
-		$s = str_replace("\r", '', $txt);
-		// check if string contains arabic text
-		if (preg_match($this->unicode->uni_RE_PATTERN_ARABIC, $s)) {
-			$arabic = true;
-		} else {
-			$arabic = false;
-		}
-		// check if string contains RTL text
-		if ($arabic OR ($this->tmprtl == 'R') OR preg_match($this->unicode->uni_RE_PATTERN_RTL, $s)) {
-			$rtlmode = true;
-		} else {
-			$rtlmode = false;
-		}
-		// get a char width
-		$chrwidth = $this->GetCharWidth('.');
-		// get array of unicode values
-		$chars = $this->UTF8StringToArray($s);
-		// get array of chars
-		$uchars = $this->UTF8ArrayToUniArray($chars);
-		// get the number of characters
-		$nb = count($chars);
-		// replacement for SHY character (minus symbol)
-		$shy_replacement = 45;
-		$shy_replacement_char = $this->unichr($shy_replacement);
-		// widht for SHY replacement
-		$shy_replacement_width = $this->GetCharWidth($shy_replacement);
-		// max Y
-		$maxy = $this->y + $maxh - $h - $this->cell_padding['T'] - $this->cell_padding['B'];
-		// calculate remaining line width ($w)
-		if ($this->rtl) {
-			$w = $this->x - $this->lMargin;
-		} else {
-			$w = $this->w - $this->rMargin - $this->x;
-		}
-		// max column width
-		$wmax = $w - $wadj;
-		if (!$firstline) {
-			$wmax -= ($this->cell_padding['L'] + $this->cell_padding['R']);
-		}
-		if ((!$firstline) AND (($chrwidth > $wmax) OR ($this->GetCharWidth($chars[0]) > $wmax))) {
-			// a single character do not fit on column
-			return '';
-		}
-		// minimum row height
-		$row_height = max($h, $this->FontSize * $this->cell_height_ratio);
-		$start_page = $this->page;
-		$i = 0; // character position
-		$j = 0; // current starting position
-		$sep = -1; // position of the last blank space
-		$shy = false; // true if the last blank is a soft hypen (SHY)
-		$l = 0; // current string length
-		$nl = 0; //number of lines
-		$linebreak = false;
-		$pc = 0; // previous character
-		// for each character
-		while ($i < $nb) {
-			if (($maxh > 0) AND ($this->y >= $maxy) ) {
-				break;
-			}
-			//Get the current character
-			$c = $chars[$i];
-			if ($c == 10) { // 10 = "\n" = new line
-				//Explicit line break
-				if ($align == 'J') {
-					if ($this->rtl) {
-						$talign = 'R';
-					} else {
-						$talign = 'L';
-					}
-				} else {
-					$talign = $align;
-				}
-				$tmpstr = $this->UniArrSubString($uchars, $j, $i);
-				if ($firstline) {
-					$startx = $this->x;
-					$tmparr = array_slice($chars, $j, ($i - $j));
-					if ($rtlmode) {
-						$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-					}
-					$linew = $this->GetArrStringWidth($tmparr);
-					unset($tmparr);
-					if ($this->rtl) {
-						$this->endlinex = $startx - $linew;
-					} else {
-						$this->endlinex = $startx + $linew;
-					}
-					$w = $linew;
-					$tmpcellpadding = $this->cell_padding;
-					if ($maxh == 0) {
-						$this->SetCellPadding(0);
-					}
-				}
-				if ($firstblock AND $this->isRTLTextDir()) {
-					$tmpstr = $this->stringRightTrim($tmpstr);
-				}
-				// Skip newlines at the begining of a page or column
-				if (!empty($tmpstr) OR ($this->y < ($this->PageBreakTrigger - $row_height))) {
-					$this->Cell($w, $h, $tmpstr, 0, 1, $talign, $fill, $link, $stretch);
-				}
-				unset($tmpstr);
-				if ($firstline) {
-					$this->cell_padding = $tmpcellpadding;
-					return ($this->UniArrSubString($uchars, $i));
-				}
-				++$nl;
-				$j = $i + 1;
-				$l = 0;
-				$sep = -1;
-				$shy = false;
-				// account for margin changes
-				if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND (!$this->InFooter)) {
-					$this->AcceptPageBreak();
-					if ($this->rtl) {
-						$this->x -= $margin['R'];
-					} else {
-						$this->x += $margin['L'];
-					}
-					$this->lMargin += $margin['L'];
-					$this->rMargin += $margin['R'];
-				}
-				$w = $this->getRemainingWidth();
-				$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-			} else {
-				// 160 is the non-breaking space.
-				// 173 is SHY (Soft Hypen).
-				// \p{Z} or \p{Separator}: any kind of Unicode whitespace or invisible separator.
-				// \p{Lo} or \p{Other_Letter}: a Unicode letter or ideograph that does not have lowercase and uppercase variants.
-				// \p{Lo} is needed because Chinese characters are packed next to each other without spaces in between.
-				if (($c != 160) AND (($c == 173) OR preg_match($this->re_spaces, $this->unichr($c)))) {
-					// update last blank space position
-					$sep = $i;
-					// check if is a SHY
-					if ($c == 173) {
-						$shy = true;
-						if ($pc == 45) {
-							$tmp_shy_replacement_width = 0;
-							$tmp_shy_replacement_char = '';
-						} else {
-							$tmp_shy_replacement_width = $shy_replacement_width;
-							$tmp_shy_replacement_char = $shy_replacement_char;
-						}
-					} else {
-						$shy = false;
-					}
-				}
-				// update string length
-				if ($this->isUnicodeFont() AND ($arabic)) {
-					// with bidirectional algorithm some chars may be changed affecting the line length
-					// *** very slow ***
-					$l = $this->GetArrStringWidth($this->utf8Bidi(array_slice($chars, $j, ($i - $j)), '', $this->tmprtl));
-				} else {
-					$l += $this->GetCharWidth($c);
-				}
-				if (($l > $wmax) OR (($c == 173) AND (($l + $tmp_shy_replacement_width) > $wmax)) ) {
-					// we have reached the end of column
-					if ($sep == -1) {
-						// check if the line was already started
-						if (($this->rtl AND ($this->x <= ($this->w - $this->rMargin - $chrwidth)))
-							OR ((!$this->rtl) AND ($this->x >= ($this->lMargin + $chrwidth)))) {
-							// print a void cell and go to next line
-							$this->Cell($w, $h, '', 0, 1);
-							$linebreak = true;
-							if ($firstline) {
-								return ($this->UniArrSubString($uchars, $j));
-							}
-						} else {
-							// truncate the word because do not fit on column
-							$tmpstr = $this->UniArrSubString($uchars, $j, $i);
-							if ($firstline) {
-								$startx = $this->x;
-								$tmparr = array_slice($chars, $j, ($i - $j));
-								if ($rtlmode) {
-									$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-								}
-								$linew = $this->GetArrStringWidth($tmparr);
-								unset($tmparr);
-								if ($this->rtl) {
-									$this->endlinex = $startx - $linew;
-								} else {
-									$this->endlinex = $startx + $linew;
-								}
-								$w = $linew;
-								$tmpcellpadding = $this->cell_padding;
-								if ($maxh == 0) {
-									$this->SetCellPadding(0);
-								}
-							}
-							if ($firstblock AND $this->isRTLTextDir()) {
-								$tmpstr = $this->stringRightTrim($tmpstr);
-							}
-							$this->Cell($w, $h, $tmpstr, 0, 1, $align, $fill, $link, $stretch);
-							unset($tmpstr);
-							if ($firstline) {
-								$this->cell_padding = $tmpcellpadding;
-								return ($this->UniArrSubString($uchars, $i));
-							}
-							$j = $i;
-							--$i;
-						}
-					} else {
-						// word wrapping
-						if ($this->rtl AND (!$firstblock) AND ($sep < $i)) {
-							$endspace = 1;
-						} else {
-							$endspace = 0;
-						}
-						if ($shy) {
-							// add hypen (minus symbol) at the end of the line
-							$shy_width = $tmp_shy_replacement_width;
-							if ($this->rtl) {
-								$shy_char_left = $tmp_shy_replacement_char;
-								$shy_char_right = '';
-							} else {
-								$shy_char_left = '';
-								$shy_char_right = $tmp_shy_replacement_char;
-							}
-						} else {
-							$shy_width = 0;
-							$shy_char_left = '';
-							$shy_char_right = '';
-						}
-						$tmpstr = $this->UniArrSubString($uchars, $j, ($sep + $endspace));
-						if ($firstline) {
-							$startx = $this->x;
-							$tmparr = array_slice($chars, $j, (($sep + $endspace) - $j));
-							if ($rtlmode) {
-								$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-							}
-							$linew = $this->GetArrStringWidth($tmparr);
-							unset($tmparr);
-							if ($this->rtl) {
-								$this->endlinex = $startx - $linew - $shy_width;
-							} else {
-								$this->endlinex = $startx + $linew + $shy_width;
-							}
-							$w = $linew;
-							$tmpcellpadding = $this->cell_padding;
-							if ($maxh == 0) {
-								$this->SetCellPadding(0);
-							}
-						}
-						// print the line
-						if ($firstblock AND $this->isRTLTextDir()) {
-							$tmpstr = $this->stringRightTrim($tmpstr);
-						}
-						$this->Cell($w, $h, $shy_char_left.$tmpstr.$shy_char_right, 0, 1, $align, $fill, $link, $stretch);
-						unset($tmpstr);
-						if ($firstline) {
-							// return the remaining text
-							$this->cell_padding = $tmpcellpadding;
-							return ($this->UniArrSubString($uchars, ($sep + $endspace)));
-						}
-						$i = $sep;
-						$sep = -1;
-						$shy = false;
-						$j = ($i+1);
-					}
-					// account for margin changes
-					if ((($this->y + $this->lasth) > $this->PageBreakTrigger) AND (!$this->InFooter)) {
-						$this->AcceptPageBreak();
-						if ($this->rtl) {
-							$this->x -= $margin['R'];
-						} else {
-							$this->x += $margin['L'];
-						}
-						$this->lMargin += $margin['L'];
-						$this->rMargin += $margin['R'];
-					}
-					$w = $this->getRemainingWidth();
-					$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R'];
-					if ($linebreak) {
-						$linebreak = false;
-					} else {
-						++$nl;
-						$l = 0;
-					}
-				}
-			}
-			// save last character
-			$pc = $c;
-			++$i;
-		} // end while i < nb
-		// print last substring (if any)
-		if ($l > 0) {
-			switch ($align) {
-				case 'J':
-				case 'C': {
-					$w = $w;
-					break;
-				}
-				case 'L': {
-					if ($this->rtl) {
-						$w = $w;
-					} else {
-						$w = $l;
-					}
-					break;
-				}
-				case 'R': {
-					if ($this->rtl) {
-						$w = $l;
-					} else {
-						$w = $w;
-					}
-					break;
-				}
-				default: {
-					$w = $l;
-					break;
-				}
-			}
-			$tmpstr = $this->UniArrSubString($uchars, $j, $nb);
-			if ($firstline) {
-				$startx = $this->x;
-				$tmparr = array_slice($chars, $j, ($nb - $j));
-				if ($rtlmode) {
-					$tmparr = $this->utf8Bidi($tmparr, $tmpstr, $this->tmprtl);
-				}
-				$linew = $this->GetArrStringWidth($tmparr);
-				unset($tmparr);
-				if ($this->rtl) {
-					$this->endlinex = $startx - $linew;
-				} else {
-					$this->endlinex = $startx + $linew;
-				}
-				$w = $linew;
-				$tmpcellpadding = $this->cell_padding;
-				if ($maxh == 0) {
-					$this->SetCellPadding(0);
-				}
-			}
-			if ($firstblock AND $this->isRTLTextDir()) {
-				$tmpstr = $this->stringRightTrim($tmpstr);
-			}
-			$this->Cell($w, $h, $tmpstr, 0, $ln, $align, $fill, $link, $stretch);
-			unset($tmpstr);
-			if ($firstline) {
-				$this->cell_padding = $tmpcellpadding;
-				return ($this->UniArrSubString($uchars, $nb));
-			}
-			++$nl;
-		}
-		if ($firstline) {
-			return '';
-		}
-		return $nl;
-	}
-
-	/**
-	 * Returns the remaining width between the current position and margins.
-	 * @return int Return the remaining width
-	 * @access protected
-	 */
-	protected function getRemainingWidth() {
-		$this->checkPageRegions();
-		if ($this->rtl) {
-			return ($this->x - $this->lMargin);
-		} else {
-			return ($this->w - $this->rMargin - $this->x);
-		}
-	}
-
- 	/**
-	 * Extract a slice of the $strarr array and return it as string.
-	 * @param string $strarr The input array of characters.
-	 * @param int $start the starting element of $strarr.
-	 * @param int $end first element that will not be returned.
-	 * @return Return part of a string
-	 * @access public
-	 */
-	public function UTF8ArrSubString($strarr, $start='', $end='') {
-		if (strlen($start) == 0) {
-			$start = 0;
-		}
-		if (strlen($end) == 0) {
-			$end = count($strarr);
-		}
-		$string = '';
-		for ($i=$start; $i < $end; ++$i) {
-			$string .= $this->unichr($strarr[$i]);
-		}
-		return $string;
-	}
-
- 	/**
-	 * Extract a slice of the $uniarr array and return it as string.
-	 * @param string $uniarr The input array of characters.
-	 * @param int $start the starting element of $strarr.
-	 * @param int $end first element that will not be returned.
-	 * @return Return part of a string
-	 * @access public
-	 * @since 4.5.037 (2009-04-07)
-	 */
-	public function UniArrSubString($uniarr, $start='', $end='') {
-		if (strlen($start) == 0) {
-			$start = 0;
-		}
-		if (strlen($end) == 0) {
-			$end = count($uniarr);
-		}
-		$string = '';
-		for ($i=$start; $i < $end; ++$i) {
-			$string .= $uniarr[$i];
-		}
-		return $string;
-	}
-
- 	/**
-	 * Convert an array of UTF8 values to array of unicode characters
-	 * @param string $ta The input array of UTF8 values.
-	 * @return Return array of unicode characters
-	 * @access public
-	 * @since 4.5.037 (2009-04-07)
-	 */
-	public function UTF8ArrayToUniArray($ta) {
-		return array_map(array($this, 'unichr'), $ta);
-	}
-
-	/**
-	 * Returns the unicode caracter specified by UTF-8 value
-	 * @param int $c UTF-8 value
-	 * @return Returns the specified character.
-	 * @author Miguel Perez, Nicola Asuni
-	 * @access public
-	 * @since 2.3.000 (2008-03-05)
-	 */
-	public function unichr($c) {
-		if (!$this->isunicode) {
-			return chr($c);
-		} elseif ($c <= 0x7F) {
-			// one byte
-			return chr($c);
-		} elseif ($c <= 0x7FF) {
-			// two bytes
-			return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
-		} elseif ($c <= 0xFFFF) {
-			// three bytes
-			return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-		} elseif ($c <= 0x10FFFF) {
-			// four bytes
-			return chr(0xF0 | $c >> 18).chr(0x80 | $c >> 12 & 0x3F).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Return the image type given the file name or array returned by getimagesize() function.
-	 * @param string $imgfile image file name
-	 * @param array $iminfo array of image information returned by getimagesize() function.
-	 * @return string image type
-	 * @since 4.8.017 (2009-11-27)
-	 */
-	public function getImageFileType($imgfile, $iminfo=array()) {
-		$type = '';
-		if (isset($iminfo['mime']) AND !empty($iminfo['mime'])) {
-			$mime = explode('/', $iminfo['mime']);
-			if ((count($mime) > 1) AND ($mime[0] == 'image') AND (!empty($mime[1]))) {
-				$type = strtolower(trim($mime[1]));
-			}
-		}
-		if (empty($type)) {
-			$fileinfo = pathinfo($imgfile);
-			if (isset($fileinfo['extension']) AND (!$this->empty_string($fileinfo['extension']))) {
-				$type = strtolower(trim($fileinfo['extension']));
-			}
-		}
-		if ($type == 'jpg') {
-			$type = 'jpeg';
-		}
-		return $type;
-	}
-
-	/**
-	 * Set the block dimensions accounting for page breaks and page/column fitting
-	 * @param float $w width
-	 * @param float $h height
-	 * @param float $x X coordinate
-	 * @param float $y Y coodiante
-	 * @param boolean $fitonpage if true the block is resized to not exceed page dimensions.
-	 * @access protected
-	 * @since 5.5.009 (2010-07-05)
-	 */
-	protected function fitBlock(&$w, &$h, &$x, &$y, $fitonpage=false) {
-		// resize the block to be vertically contained on a single page or single column
-		if ($fitonpage OR $this->AutoPageBreak) {
-			$ratio_wh = ($w / $h);
-			if ($h > ($this->PageBreakTrigger - $this->tMargin)) {
-				$h = $this->PageBreakTrigger - $this->tMargin;
-				$w = ($h * $ratio_wh);
-			}
-			// resize the block to be horizontally contained on a single page or single column
-			if ($fitonpage) {
-				$maxw = ($this->w - $this->lMargin - $this->rMargin);
-				if ($w > $maxw) {
-					$w = $maxw;
-					$h = ($w / $ratio_wh);
-				}
-			}
-		}
-		// Check whether we need a new page or new column first as this does not fit
-		$prev_x = $this->x;
-		$prev_y = $this->y;
-		if ($this->checkPageBreak($h, $y) OR ($this->y < $prev_y)) {
-			$y = $this->y;
-			if ($this->rtl) {
-				$x += ($prev_x - $this->x);
-			} else {
-				$x += ($this->x - $prev_x);
-			}
-		}
-		// resize the block to be contained on the remaining available page or column space
-		if ($fitonpage) {
-			$ratio_wh = ($w / $h);
-			if (($y + $h) > $this->PageBreakTrigger) {
-				$h = $this->PageBreakTrigger - $y;
-				$w = ($h * $ratio_wh);
-			}
-			if ((!$this->rtl) AND (($x + $w) > ($this->w - $this->rMargin))) {
-				$w = $this->w - $this->rMargin - $x;
-				$h = ($w / $ratio_wh);
-			} elseif (($this->rtl) AND (($x - $w) < ($this->lMargin))) {
-				$w = $x - $this->lMargin;
-				$h = ($w / $ratio_wh);
-			}
-		}
-	}
-
-	/**
-	 * Puts an image in the page.
-	 * The upper-left corner must be given.
-	 * The dimensions can be specified in different ways:<ul>
-	 * <li>explicit width and height (expressed in user unit)</li>
-	 * <li>one explicit dimension, the other being calculated automatically in order to keep the original proportions</li>
-	 * <li>no explicit dimension, in which case the image is put at 72 dpi</li></ul>
-	 * Supported formats are JPEG and PNG images whitout GD library and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;
-	 * The format can be specified explicitly or inferred from the file extension.<br />
-	 * It is possible to put a link on the image.<br />
-	 * Remark: if an image is used several times, only one copy will be embedded in the file.<br />
-	 * @param string $file Name of the file containing the image.
-	 * @param float $x Abscissa of the upper-left corner (LTR) or upper-right corner (RTL).
-	 * @param float $y Ordinate of the upper-left corner (LTR) or upper-right corner (RTL).
-	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-	 * @param mixed $link URL or identifier returned by AddLink().
-	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param mixed $resize If true resize (reduce) the image to fit $w and $h (requires GD or ImageMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
-	 * @param int $dpi dot-per-inch resolution used on resize
-	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param boolean $ismask true if this image is a mask, false otherwise
-	 * @param mixed $imgmask image object returned by this function or false
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param boolean $fitbox If true scale image dimensions proportionally to fit within the ($w, $h) box.
-	 * @param boolean $hidden if true do not display the image.
-	 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
-	 * @return image information
-	 * @access public
-	 * @since 1.1
-	 */
-	public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		$cached_file = false; // true when the file is cached
-		// get image dimensions
-		$imsize = @getimagesize($file);
-		if ($imsize === FALSE) {
-			// try to encode spaces on filename
-			$file = str_replace(' ', '%20', $file);
-			$imsize = @getimagesize($file);
-			if ($imsize === FALSE) {
-				if (function_exists('curl_init')) {
-					// try to get remote file data using cURL
-					$cs = curl_init(); // curl session
-					curl_setopt($cs, CURLOPT_URL, $file);
-					curl_setopt($cs, CURLOPT_BINARYTRANSFER, true);
-					curl_setopt($cs, CURLOPT_FAILONERROR, true);
-					curl_setopt($cs, CURLOPT_RETURNTRANSFER, true);
-					curl_setopt($cs, CURLOPT_CONNECTTIMEOUT, 5);
-					curl_setopt($cs, CURLOPT_TIMEOUT, 30);
-					$imgdata = curl_exec($cs);
-					curl_close($cs);
-					if($imgdata !== FALSE) {
-						// copy image to cache
-						$file = tempnam(K_PATH_CACHE, 'img_');
-						$fp = fopen($file, 'w');
-						fwrite($fp, $imgdata);
-						fclose($fp);
-						unset($imgdata);
-						$cached_file = true;
-						$imsize = @getimagesize($file);
-						if ($imsize === FALSE) {
-							unlink($file);
-							$cached_file = false;
-						}
-					}
-				} elseif (($w > 0) AND ($h > 0)) {
-					// get measures from specified data
-					$pw = $this->getHTMLUnitToUnits($w, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
-					$ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
-					$imsize = array($pw, $ph);
-				}
-			}
-		}
-		if ($imsize === FALSE) {
-			$this->Error('[Image] Unable to get image: '.$file);
-		}
-		// get original image width and height in pixels
-		list($pixw, $pixh) = $imsize;
-		// calculate image width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			// convert image size to document unit
-			$w = $this->pixelsToUnits($pixw);
-			$h = $this->pixelsToUnits($pixh);
-		} elseif ($w <= 0) {
-			$w = $h * $pixw / $pixh;
-		} elseif ($h <= 0) {
-			$h = $w * $pixh / $pixw;
-		} elseif ($fitbox AND ($w > 0) AND ($h > 0)) {
-			// scale image dimensions proportionally to fit within the ($w, $h) box
-			if ((($w * $pixh) / ($h * $pixw)) < 1) {
-				$h = $w * $pixh / $pixw;
-			} else {
-				$w = $h * $pixw / $pixh;
-			}
-		}
-		// fit the image on available space
-		$this->fitBlock($w, $h, $x, $y, $fitonpage);
-		// calculate new minimum dimensions in pixels
-		$neww = round($w * $this->k * $dpi / $this->dpi);
-		$newh = round($h * $this->k * $dpi / $this->dpi);
-		// check if resize is necessary (resize is used only to reduce the image)
-		$newsize = ($neww * $newh);
-		$pixsize = ($pixw * $pixh);
-		if (intval($resize) == 2) {
-			$resize = true;
-		} elseif ($newsize >= $pixsize) {
-			$resize = false;
-		}
-		// check if image has been already added on document
-		$newimage = true;
-		if (in_array($file, $this->imagekeys)) {
-			$newimage = false;
-			// get existing image data
-			$info = $this->getImageBuffer($file);
-			// check if the newer image is larger
-			$oldsize = ($info['w'] * $info['h']);
-			if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {
-				$newimage = true;
-			}
-		}
-		if ($newimage) {
-			//First use of image, get info
-			$type = strtolower($type);
-			if ($type == '') {
-				$type = $this->getImageFileType($file, $imsize);
-			} elseif ($type == 'jpg') {
-				$type = 'jpeg';
-			}
-			$mqr = $this->get_mqr();
-			$this->set_mqr(false);
-			// Specific image handlers
-			$mtd = '_parse'.$type;
-			// GD image handler function
-			$gdfunction = 'imagecreatefrom'.$type;
-			$info = false;
-			if ((method_exists($this, $mtd)) AND (!($resize AND function_exists($gdfunction)))) {
-				// TCPDF image functions
-				$info = $this->$mtd($file);
-				if ($info == 'pngalpha') {
-					return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign);
-				}
-			}
-			if (!$info) {
-				if (function_exists($gdfunction)) {
-					// GD library
-					$img = $gdfunction($file);
-					if ($resize) {
-						$imgr = imagecreatetruecolor($neww, $newh);
-						if (($type == 'gif') OR ($type == 'png')) {
-							$imgr = $this->_setGDImageTransparency($imgr, $img);
-						}
-						imagecopyresampled($imgr, $img, 0, 0, 0, 0, $neww, $newh, $pixw, $pixh);
-						if (($type == 'gif') OR ($type == 'png')) {
-							$info = $this->_toPNG($imgr);
-						} else {
-							$info = $this->_toJPEG($imgr);
-						}
-					} else {
-						if (($type == 'gif') OR ($type == 'png')) {
-							$info = $this->_toPNG($img);
-						} else {
-							$info = $this->_toJPEG($img);
-						}
-					}
-				} elseif (extension_loaded('imagick')) {
-					// ImageMagick library
-					$img = new Imagick();
-					if ($type == 'SVG') {
-						// get SVG file content
-						$svgimg = file_get_contents($file);
-						// get width and height
-						$regs = array();
-						if (preg_match('/<svg([^\>]*)>/si', $svgimg, $regs)) {
-							$svgtag = $regs[1];
-							$tmp = array();
-							if (preg_match('/[\s]+width[\s]*=[\s]*"([^"]*)"/si', $svgtag, $tmp)) {
-								$ow = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-								$owu = sprintf('%.3F', ($ow * $dpi / 72)).$this->pdfunit;
-								$svgtag = preg_replace('/[\s]+width[\s]*=[\s]*"[^"]*"/si', ' width="'.$owu.'"', $svgtag, 1);
-							} else {
-								$ow = $w;
-							}
-							$tmp = array();
-							if (preg_match('/[\s]+height[\s]*=[\s]*"([^"]*)"/si', $svgtag, $tmp)) {
-								$oh = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-								$ohu = sprintf('%.3F', ($oh * $dpi / 72)).$this->pdfunit;
-								$svgtag = preg_replace('/[\s]+height[\s]*=[\s]*"[^"]*"/si', ' height="'.$ohu.'"', $svgtag, 1);
-							} else {
-								$oh = $h;
-							}
-							$tmp = array();
-							if (!preg_match('/[\s]+viewBox[\s]*=[\s]*"[\s]*([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]*"/si', $svgtag, $tmp)) {
-								$vbw = ($ow * $this->imgscale * $this->k);
-								$vbh = ($oh * $this->imgscale * $this->k);
-								$vbox = sprintf(' viewBox="0 0 %.3F %.3F" ', $vbw, $vbh);
-								$svgtag = $vbox.$svgtag;
-							}
-							$svgimg = preg_replace('/<svg([^\>]*)>/si', '<svg'.$svgtag.'>', $svgimg, 1);
-						}
-						$img->readImageBlob($svgimg);
-					} else {
-						$img->readImage($file);
-					}
-					if ($resize) {
-						$img->resizeImage($neww, $newh, 10, 1, false);
-					}
-					$img->setCompressionQuality($this->jpeg_quality);
-					$img->setImageFormat('jpeg');
-					$tempname = tempnam(K_PATH_CACHE, 'jpg_');
-					$img->writeImage($tempname);
-					$info = $this->_parsejpeg($tempname);
-					unlink($tempname);
-					$img->destroy();
-				} else {
-					return;
-				}
-			}
-			if ($info === false) {
-				//If false, we cannot process image
-				return;
-			}
-			$this->set_mqr($mqr);
-			if ($ismask) {
-				// force grayscale
-				$info['cs'] = 'DeviceGray';
-			}
-			$info['i'] = $this->numimages;
-			if (!in_array($file, $this->imagekeys)) {
-				++$info['i'];
-			}
-			if ($imgmask !== false) {
-				$info['masked'] = $imgmask;
-			}
-			// add image to document
-			$this->setImageBuffer($file, $info);
-		}
-		if ($cached_file) {
-			// remove cached file
-			unlink($file);
-		}
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x - $w;
-			}
-			$this->img_rb_x = $ximg;
-		} else {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x;
-			}
-			$this->img_rb_x = $ximg + $w;
-		}
-		if ($ismask OR $hidden) {
-			// image is not displayed
-			return $info['i'];
-		}
-		$xkimg = $ximg * $this->k;
-		$this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%u Do Q', ($w * $this->k), ($h * $this->k), $xkimg, (($this->h - ($y + $h)) * $this->k), $info['i']));
-		if (!empty($border)) {
-			$bx = $this->x;
-			$by = $this->y;
-			$this->x = $ximg;
-			if ($this->rtl) {
-				$this->x += $w;
-			}
-			$this->y = $y;
-			$this->Cell($w, $h, '', $border, 0, '', 0, '', 0, true);
-			$this->x = $bx;
-			$this->y = $by;
-		}
-		if ($link) {
-			$this->Link($ximg, $y, $w, $h, $link, 0);
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T': {
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M': {
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B': {
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N': {
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['images'][] = $info['i'];
-		}
-		return $info['i'];
-	}
-
-	/**
-	 * Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)
-	 * @param boolean $mqr FALSE for off, TRUE for on.
-	 * @since 4.6.025 (2009-08-17)
-	 */
-	public function set_mqr($mqr) {
-		if(!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version{0} * 10000) + ($version{2} * 100) + $version{4}));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			@set_magic_quotes_runtime($mqr);
-		}
-	}
-
-	/**
-	 * Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)
-	 * @return Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
-	 * @since 4.6.025 (2009-08-17)
-	 */
-	public function get_mqr() {
-		if(!defined('PHP_VERSION_ID')) {
-			$version = PHP_VERSION;
-			define('PHP_VERSION_ID', (($version{0} * 10000) + ($version{2} * 100) + $version{4}));
-		}
-		if (PHP_VERSION_ID < 50300) {
-			return @get_magic_quotes_runtime();
-		}
-		return 0;
-	}
-
-	/**
-	 * Convert the loaded image to a JPEG and then return a structure for the PDF creator.
-	 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-	 * @param string $file Image file name.
-	 * @param image $image Image object.
-	 * return image JPEG image object.
-	 * @access protected
-	 */
-	protected function _toJPEG($image) {
-		$tempname = tempnam(K_PATH_CACHE, 'jpg_');
-		imagejpeg($image, $tempname, $this->jpeg_quality);
-		imagedestroy($image);
-		$retvars = $this->_parsejpeg($tempname);
-		// tidy up by removing temporary image
-		unlink($tempname);
-		return $retvars;
-	}
-
-	/**
-	 * Convert the loaded image to a PNG and then return a structure for the PDF creator.
-	 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-	 * @param string $file Image file name.
-	 * @param image $image Image object.
-	 * return image PNG image object.
-	 * @access protected
-	 * @since 4.9.016 (2010-04-20)
-	 */
-	protected function _toPNG($image) {
-		$tempname = tempnam(K_PATH_CACHE, 'jpg_');
-		imagepng($image, $tempname);
-		imagedestroy($image);
-		$retvars = $this->_parsepng($tempname);
-		// tidy up by removing temporary image
-		unlink($tempname);
-		return $retvars;
-	}
-
-	/**
-	 * Set the transparency for the given GD image.
-	 * @param image $new_image GD image object
-	 * @param image $image GD image object.
-	 * return GD image object.
-	 * @access protected
-	 * @since 4.9.016 (2010-04-20)
-	 */
-	protected function _setGDImageTransparency($new_image, $image) {
-		// transparency index
-		$tid = imagecolortransparent($image);
-		// default transparency color
-		$tcol = array('red' => 255, 'green' => 255, 'blue' => 255);
-		if ($tid >= 0) {
-			// get the colors for the transparency index
-			$tcol = imagecolorsforindex($image, $tid);
-		}
-		$tid = imagecolorallocate($new_image, $tcol['red'], $tcol['green'], $tcol['blue']);
-		imagefill($new_image, 0, 0, $tid);
-		imagecolortransparent($new_image, $tid);
-		return $new_image;
-	}
-
-	/**
-	 * Extract info from a JPEG file without using the GD library.
-	 * @param string $file image file to parse
-	 * @return array structure containing the image data
-	 * @access protected
-	 */
-	protected function _parsejpeg($file) {
-		$a = getimagesize($file);
-		if (empty($a)) {
-			$this->Error('Missing or incorrect image file: '.$file);
-		}
-		if ($a[2] != 2) {
-			$this->Error('Not a JPEG file: '.$file);
-		}
-		if ((!isset($a['channels'])) OR ($a['channels'] == 3)) {
-			$colspace = 'DeviceRGB';
-		} elseif ($a['channels'] == 4) {
-			$colspace = 'DeviceCMYK';
-		} else {
-			$colspace = 'DeviceGray';
-		}
-		$bpc = isset($a['bits']) ? $a['bits'] : 8;
-		$data = file_get_contents($file);
-		return array('w' => $a[0], 'h' => $a[1], 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'DCTDecode', 'data' => $data);
-	}
-
-	/**
-	 * Extract info from a PNG file without using the GD library.
-	 * @param string $file image file to parse
-	 * @return array structure containing the image data
-	 * @access protected
-	 */
-	protected function _parsepng($file) {
-		$f = fopen($file, 'rb');
-		if ($f === false) {
-			$this->Error('Can\'t open image file: '.$file);
-		}
-		//Check signature
-		if (fread($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
-			$this->Error('Not a PNG file: '.$file);
-		}
-		//Read header chunk
-		fread($f, 4);
-		if (fread($f, 4) != 'IHDR') {
-			$this->Error('Incorrect PNG file: '.$file);
-		}
-		$w = $this->_freadint($f);
-		$h = $this->_freadint($f);
-		$bpc = ord(fread($f, 1));
-		if ($bpc > 8) {
-			//$this->Error('16-bit depth not supported: '.$file);
-			fclose($f);
-			return false;
-		}
-		$ct = ord(fread($f, 1));
-		if ($ct == 0) {
-			$colspace = 'DeviceGray';
-		} elseif ($ct == 2) {
-			$colspace = 'DeviceRGB';
-		} elseif ($ct == 3) {
-			$colspace = 'Indexed';
-		} else {
-			// alpha channel
-			fclose($f);
-			return 'pngalpha';
-		}
-		if (ord(fread($f, 1)) != 0) {
-			//$this->Error('Unknown compression method: '.$file);
-			fclose($f);
-			return false;
-		}
-		if (ord(fread($f, 1)) != 0) {
-			//$this->Error('Unknown filter method: '.$file);
-			fclose($f);
-			return false;
-		}
-		if (ord(fread($f, 1)) != 0) {
-			//$this->Error('Interlacing not supported: '.$file);
-			fclose($f);
-			return false;
-		}
-		fread($f, 4);
-		$parms = '/DecodeParms << /Predictor 15 /Colors '.($ct == 2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.' >>';
-		//Scan chunks looking for palette, transparency and image data
-		$pal = '';
-		$trns = '';
-		$data = '';
-		do {
-			$n = $this->_freadint($f);
-			$type = fread($f, 4);
-			if ($type == 'PLTE') {
-				//Read palette
-				$pal = $this->rfread($f, $n);
-				fread($f, 4);
-			} elseif ($type == 'tRNS') {
-				//Read transparency info
-				$t = $this->rfread($f, $n);
-				if ($ct == 0) {
-					$trns = array(ord(substr($t, 1, 1)));
-				} elseif ($ct == 2) {
-					$trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
-				} else {
-					$pos = strpos($t, chr(0));
-					if ($pos !== false) {
-						$trns = array($pos);
-					}
-				}
-				fread($f, 4);
-			} elseif ($type == 'IDAT') {
-				//Read image data block
-				$data .= $this->rfread($f, $n);
-				fread($f, 4);
-			} elseif ($type == 'IEND') {
-				break;
-			} else {
-				$this->rfread($f, $n + 4);
-			}
-		} while ($n);
-		if (($colspace == 'Indexed') AND (empty($pal))) {
-			//$this->Error('Missing palette in '.$file);
-			fclose($f);
-			return false;
-		}
-		fclose($f);
-		return array('w' => $w, 'h' => $h, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'FlateDecode', 'parms' => $parms, 'pal' => $pal, 'trns' => $trns, 'data' => $data);
-	}
-
-	/**
-	 * Binary-safe and URL-safe file read.
-	 * Reads up to length bytes from the file pointer referenced by handle. Reading stops as soon as one of the following conditions is met: length bytes have been read; EOF (end of file) is reached.
-	 * @param resource $handle
-	 * @param int $length
-	 * @return Returns the read string or FALSE in case of error.
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 4.5.027 (2009-03-16)
-	 */
-	protected function rfread($handle, $length) {
-		$data = fread($handle, $length);
-		if ($data === false) {
-			return false;
-		}
-		$rest = $length - strlen($data);
-		if ($rest > 0) {
-			$data .= $this->rfread($handle, $rest);
-		}
-		return $data;
-	}
-
-	/**
-	 * Extract info from a PNG image with alpha channel using the GD library.
-	 * @param string $file Name of the file containing the image.
-	 * @param float $x Abscissa of the upper-left corner.
-	 * @param float $y Ordinate of the upper-left corner.
-	 * @param float $wpx Original width of the image in pixels.
-	 * @param float $hpx original height of the image in pixels.
-	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-	 * @param mixed $link URL or identifier returned by AddLink().
-	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param boolean $resize If true resize (reduce) the image to fit $w and $h (requires GD library).
-	 * @param int $dpi dot-per-inch resolution used on resize
-	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 4.3.007 (2008-12-04)
-	 * @see Image()
-	 */
-	protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign) {
-		// create temp image file (without alpha channel)
-		$tempfile_plain = tempnam(K_PATH_CACHE, 'mskp_');
-		// create temp alpha file
-		$tempfile_alpha = tempnam(K_PATH_CACHE, 'mska_');
-		if (extension_loaded('imagick')) { // ImageMagick
-			// ImageMagick library
-			$img = new Imagick();
-			$img->readImage($file);
-			// clone image object
-			$imga = $img->clone();
-			// extract alpha channel
-			$img->separateImageChannel(imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE);
-			$img->negateImage(true);
-			$img->setImageFormat('png');
-			$img->writeImage($tempfile_alpha);
-			// remove alpha channel
-			$imga->separateImageChannel(imagick::CHANNEL_ALL & ~(imagick::CHANNEL_ALPHA | imagick::CHANNEL_OPACITY | imagick::CHANNEL_MATTE));
-			$imga->setImageFormat('png');
-			$imga->writeImage($tempfile_plain);
-		} else { // GD library
-			// generate images
-			$img = imagecreatefrompng($file);
-			$imgalpha = imagecreate($wpx, $hpx);
-			// generate gray scale palette (0 -> 255)
-			for ($c = 0; $c < 256; ++$c) {
-				ImageColorAllocate($imgalpha, $c, $c, $c);
-			}
-			// extract alpha channel
-			for ($xpx = 0; $xpx < $wpx; ++$xpx) {
-				for ($ypx = 0; $ypx < $hpx; ++$ypx) {
-					$color = imagecolorat($img, $xpx, $ypx);
-					$alpha = ($color >> 24); // shifts off the first 24 bits (where 8x3 are used for each color), and returns the remaining 7 allocated bits (commonly used for alpha)
-					$alpha = (((127 - $alpha) / 127) * 255); // GD alpha is only 7 bit (0 -> 127)
-					$alpha = $this->getGDgamma($alpha); // correct gamma
-					imagesetpixel($imgalpha, $xpx, $ypx, $alpha);
-				}
-			}
-			imagepng($imgalpha, $tempfile_alpha);
-			imagedestroy($imgalpha);
-			// extract image without alpha channel
-			$imgplain = imagecreatetruecolor($wpx, $hpx);
-			imagecopy($imgplain, $img, 0, 0, 0, 0, $wpx, $hpx);
-			imagepng($imgplain, $tempfile_plain);
-			imagedestroy($imgplain);
-		}
-		// embed mask image
-		$imgmask = $this->Image($tempfile_alpha, $x, $y, $w, $h, 'PNG', '', '', $resize, $dpi, '', true, false);
-		// embed image, masked with previously embedded mask
-		$this->Image($tempfile_plain, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi, $palign, false, $imgmask);
-		// remove temp files
-		unlink($tempfile_alpha);
-		unlink($tempfile_plain);
-	}
-
-	/**
-	 * Correct the gamma value to be used with GD library
-	 * @param float $v the gamma value to be corrected
-	 * @access protected
-	 * @since 4.3.007 (2008-12-04)
-	 */
-	protected function getGDgamma($v) {
-		return (pow(($v / 255), 2.2) * 255);
-	}
-
-	/**
-	 * Performs a line break.
-	 * The current abscissa goes back to the left margin and the ordinate increases by the amount passed in parameter.
-	 * @param float $h The height of the break. By default, the value equals the height of the last printed cell.
-	 * @param boolean $cell if true add the current left (or right o for RTL) padding to the X coordinate
-	 * @access public
-	 * @since 1.0
-	 * @see Cell()
-	 */
-	public function Ln($h='', $cell=false) {
-		if (($this->num_columns > 1) AND ($this->y == $this->columns[$this->current_column]['y']) AND isset($this->columns[$this->current_column]['x']) AND ($this->x == $this->columns[$this->current_column]['x'])) {
-			// revove vertical space from the top of the column
-			return;
-		}
-		if ($cell) {
-			if ($this->rtl) {
-				$cellpadding = $this->cell_padding['R'];
-			} else {
-				$cellpadding = $this->cell_padding['L'];
-			}
-		} else {
-			$cellpadding = 0;
-		}
-		if ($this->rtl) {
-			$this->x = $this->w - $this->rMargin - $cellpadding;
-		} else {
-			$this->x = $this->lMargin + $cellpadding;
-		}
-		if (is_string($h)) {
-			$this->y += $this->lasth;
-		} else {
-			$this->y += $h;
-		}
-		$this->newline = true;
-	}
-
-	/**
-	 * Returns the relative X value of current position.
-	 * The value is relative to the left border for LTR languages and to the right border for RTL languages.
-	 * @return float
-	 * @access public
-	 * @since 1.2
-	 * @see SetX(), GetY(), SetY()
-	 */
-	public function GetX() {
-		//Get x position
-		if ($this->rtl) {
-			return ($this->w - $this->x);
-		} else {
-			return $this->x;
-		}
-	}
-
-	/**
-	 * Returns the absolute X value of current position.
-	 * @return float
-	 * @access public
-	 * @since 1.2
-	 * @see SetX(), GetY(), SetY()
-	 */
-	public function GetAbsX() {
-		return $this->x;
-	}
-
-	/**
-	 * Returns the ordinate of the current position.
-	 * @return float
-	 * @access public
-	 * @since 1.0
-	 * @see SetY(), GetX(), SetX()
-	 */
-	public function GetY() {
-		return $this->y;
-	}
-
-	/**
-	 * Defines the abscissa of the current position.
-	 * If the passed value is negative, it is relative to the right of the page (or left if language is RTL).
-	 * @param float $x The value of the abscissa.
-	 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
-	 * @access public
-	 * @since 1.2
-	 * @see GetX(), GetY(), SetY(), SetXY()
-	 */
-	public function SetX($x, $rtloff=false) {
-		if (!$rtloff AND $this->rtl) {
-			if ($x >= 0) {
-				$this->x = $this->w - $x;
-			} else {
-				$this->x = abs($x);
-			}
-		} else {
-			if ($x >= 0) {
-				$this->x = $x;
-			} else {
-				$this->x = $this->w + $x;
-			}
-		}
-		if ($this->x < 0) {
-			$this->x = 0;
-		}
-		if ($this->x > $this->w) {
-			$this->x = $this->w;
-		}
-	}
-
-	/**
-	 * Moves the current abscissa back to the left margin and sets the ordinate.
-	 * If the passed value is negative, it is relative to the bottom of the page.
-	 * @param float $y The value of the ordinate.
-	 * @param bool $resetx if true (default) reset the X position.
-	 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
-	 * @access public
-	 * @since 1.0
-	 * @see GetX(), GetY(), SetY(), SetXY()
-	 */
-	public function SetY($y, $resetx=true, $rtloff=false) {
-		if ($resetx) {
-			//reset x
-			if (!$rtloff AND $this->rtl) {
-				$this->x = $this->w - $this->rMargin;
-			} else {
-				$this->x = $this->lMargin;
-			}
-		}
-		if ($y >= 0) {
-			$this->y = $y;
-		} else {
-			$this->y = $this->h + $y;
-		}
-		if ($this->y < 0) {
-			$this->y = 0;
-		}
-		if ($this->y > $this->h) {
-			$this->y = $this->h;
-		}
-	}
-
-	/**
-	 * Defines the abscissa and ordinate of the current position.
-	 * If the passed values are negative, they are relative respectively to the right and bottom of the page.
-	 * @param float $x The value of the abscissa.
-	 * @param float $y The value of the ordinate.
-	 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
-	 * @access public
-	 * @since 1.2
-	 * @see SetX(), SetY()
-	 */
-	public function SetXY($x, $y, $rtloff=false) {
-		$this->SetY($y, false, $rtloff);
-		$this->SetX($x, $rtloff);
-	}
-
-	/**
-	 * Send the document to a given destination: string, local file or browser.
-	 * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
-	 * The method first calls Close() if necessary to terminate the document.
-	 * @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
-	 * @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string. name is ignored.</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li></ul>
-	 * @access public
-	 * @since 1.0
-	 * @see Close()
-	 */
-	public function Output($name='doc.pdf', $dest='I') {
-		//Output PDF to some destination
-		//Finish document if necessary
-		if ($this->state < 3) {
-			$this->Close();
-		}
-		//Normalize parameters
-		if (is_bool($dest)) {
-			$dest = $dest ? 'D' : 'F';
-		}
-		$dest = strtoupper($dest);
-		if ($dest{0} != 'F') {
-			$name = preg_replace('/[\s]+/', '_', $name);
-			$name = preg_replace('/[^a-zA-Z0-9_\.-]/', '', $name);
-		}
-		if ($this->sign) {
-			// *** apply digital signature to the document ***
-			// get the document content
-			$pdfdoc = $this->getBuffer();
-			// remove last newline
-			$pdfdoc = substr($pdfdoc, 0, -1);
-			// Remove the original buffer
-			if (isset($this->diskcache) AND $this->diskcache) {
-				// remove buffer file from cache
-				unlink($this->buffer);
-			}
-			unset($this->buffer);
-			// remove filler space
-			$byterange_string_len = strlen($this->byterange_string);
-			// define the ByteRange
-			$byte_range = array();
-			$byte_range[0] = 0;
-			$byte_range[1] = strpos($pdfdoc, $this->byterange_string) + $byterange_string_len + 10;
-			$byte_range[2] = $byte_range[1] + $this->signature_max_length + 2;
-			$byte_range[3] = strlen($pdfdoc) - $byte_range[2];
-			$pdfdoc = substr($pdfdoc, 0, $byte_range[1]).substr($pdfdoc, $byte_range[2]);
-			// replace the ByteRange
-			$byterange = sprintf('/ByteRange[0 %u %u %u]', $byte_range[1], $byte_range[2], $byte_range[3]);
-			$byterange .= str_repeat(' ', ($byterange_string_len - strlen($byterange)));
-			$pdfdoc = str_replace($this->byterange_string, $byterange, $pdfdoc);
-			// write the document to a temporary folder
-			$tempdoc = tempnam(K_PATH_CACHE, 'tmppdf_');
-			$f = fopen($tempdoc, 'wb');
-			if (!$f) {
-				$this->Error('Unable to create temporary file: '.$tempdoc);
-			}
-			$pdfdoc_length = strlen($pdfdoc);
-			fwrite($f, $pdfdoc, $pdfdoc_length);
-			fclose($f);
-			// get digital signature via openssl library
-			$tempsign = tempnam(K_PATH_CACHE, 'tmpsig_');
-			if (empty($this->signature_data['extracerts'])) {
-				openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED);
-			} else {
-				openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED, $this->signature_data['extracerts']);
-			}
-			unlink($tempdoc);
-			// read signature
-			$signature = file_get_contents($tempsign);
-			unlink($tempsign);
-			// extract signature
-			$signature = substr($signature, $pdfdoc_length);
-			$signature = substr($signature, (strpos($signature, "%%EOF\n\n------") + 13));
-			$tmparr = explode("\n\n", $signature);
-			$signature = $tmparr[1];
-			unset($tmparr);
-			// decode signature
-			$signature = base64_decode(trim($signature));
-			// convert signature to hex
-			$signature = current(unpack('H*', $signature));
-			$signature = str_pad($signature, $this->signature_max_length, '0');
-			// Add signature to the document
-			$pdfdoc = substr($pdfdoc, 0, $byte_range[1]).'<'.$signature.'>'.substr($pdfdoc, $byte_range[1]);
-			$this->diskcache = false;
-			$this->buffer = &$pdfdoc;
-			$this->bufferlen = strlen($pdfdoc);
-		}
-		switch($dest) {
-			case 'I': {
-				// Send PDF to the standard output
-				if (ob_get_contents()) {
-					$this->Error('Some data has already been output, can\'t send PDF file');
-				}
-				if (php_sapi_name() != 'cli') {
-					//We send to a browser
-					header('Content-Type: application/pdf');
-					if (headers_sent()) {
-						$this->Error('Some data has already been output to browser, can\'t send PDF file');
-					}
-					header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-					header('Pragma: public');
-					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					header('Content-Length: '.$this->bufferlen);
-					header('Content-Disposition: inline; filename="'.basename($name).'";');
-				}
-				echo $this->getBuffer();
-				break;
-			}
-			case 'D': {
-				// Download PDF as file
-				if (ob_get_contents()) {
-					$this->Error('Some data has already been output, can\'t send PDF file');
-				}
-				header('Content-Description: File Transfer');
-				if (headers_sent()) {
-					$this->Error('Some data has already been output to browser, can\'t send PDF file');
-				}
-				header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-				header('Pragma: public');
-				header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-				header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-				// force download dialog
-				header('Content-Type: application/force-download');
-				header('Content-Type: application/octet-stream', false);
-				header('Content-Type: application/download', false);
-				header('Content-Type: application/pdf', false);
-				// use the Content-Disposition header to supply a recommended filename
-				header('Content-Disposition: attachment; filename="'.basename($name).'";');
-				header('Content-Transfer-Encoding: binary');
-				header('Content-Length: '.$this->bufferlen);
-				echo $this->getBuffer();
-				break;
-			}
-			case 'F':
-			case 'FI':
-			case 'FD': {
-				// Save PDF to a local file
-				if ($this->diskcache) {
-					copy($this->buffer, $name);
-				} else {
-					$f = fopen($name, 'wb');
-					if (!$f) {
-						$this->Error('Unable to create output file: '.$name);
-					}
-					fwrite($f, $this->getBuffer(), $this->bufferlen);
-					fclose($f);
-				}
-				if ($dest == 'FI') {
-					// send headers to browser
-					header('Content-Type: application/pdf');
-					header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-					header('Pragma: public');
-					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					header('Content-Length: '.filesize($name));
-					header('Content-Disposition: inline; filename="'.basename($name).'";');
-					// send document to the browser
-					echo file_get_contents($name);
-				} elseif ($dest == 'FD') {
-					// send headers to browser
-					if (ob_get_contents()) {
-						$this->Error('Some data has already been output, can\'t send PDF file');
-					}
-					header('Content-Description: File Transfer');
-					if (headers_sent()) {
-						$this->Error('Some data has already been output to browser, can\'t send PDF file');
-					}
-					header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-					header('Pragma: public');
-					header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-					header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-					// force download dialog
-					header('Content-Type: application/force-download');
-					header('Content-Type: application/octet-stream', false);
-					header('Content-Type: application/download', false);
-					header('Content-Type: application/pdf', false);
-					// use the Content-Disposition header to supply a recommended filename
-					header('Content-Disposition: attachment; filename="'.basename($name).'";');
-					header('Content-Transfer-Encoding: binary');
-					header('Content-Length: '.filesize($name));
-					// send document to the browser
-					echo file_get_contents($name);
-				}
-				break;
-			}
-			case 'S': {
-				// Returns PDF as a string
-				return $this->getBuffer();
-			}
-			default: {
-				$this->Error('Incorrect output destination: '.$dest);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * Unset all class variables except the following critical variables: internal_encoding, state, bufferlen, buffer and diskcache.
-	 * @param boolean $destroyall if true destroys all class variables, otherwise preserves critical variables.
-	 * @param boolean $preserve_objcopy if true preserves the objcopy variable
-	 * @access public
-	 * @since 4.5.016 (2009-02-24)
-	 */
-	public function _destroy($destroyall=false, $preserve_objcopy=false) {
-		if ($destroyall AND isset($this->diskcache) AND $this->diskcache AND (!$preserve_objcopy) AND (!$this->empty_string($this->buffer))) {
-			// remove buffer file from cache
-			unlink($this->buffer);
-		}
-		foreach (array_keys(get_object_vars($this)) as $val) {
-			if ($destroyall OR (
-				($val != 'internal_encoding')
-				AND ($val != 'state')
-				AND ($val != 'bufferlen')
-				AND ($val != 'buffer')
-				AND ($val != 'diskcache')
-				AND ($val != 'sign')
-				AND ($val != 'signature_data')
-				AND ($val != 'signature_max_length')
-				AND ($val != 'byterange_string')
-				)) {
-				if ((!$preserve_objcopy OR ($val != 'objcopy')) AND isset($this->$val)) {
-					unset($this->$val);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check for locale-related bug
-	 * @access protected
-	 */
-	protected function _dochecks() {
-		//Check for locale-related bug
-		if (1.1 == 1) {
-			$this->Error('Don\'t alter the locale before including class file');
-		}
-		//Check for decimal separator
-		if (sprintf('%.1F', 1.0) != '1.0') {
-			setlocale(LC_NUMERIC, 'C');
-		}
-	}
-
-	/**
-	 * Return fonts path
-	 * @return string
-	 * @access protected
-	 */
-	protected function _getfontpath() {
-		if (!defined('K_PATH_FONTS') AND is_dir(dirname(__FILE__).'/fonts')) {
-			define('K_PATH_FONTS', dirname(__FILE__).'/fonts/');
-		}
-		return defined('K_PATH_FONTS') ? K_PATH_FONTS : '';
-	}
-
-	/**
-	 * Output pages.
-	 * @access protected
-	 */
-	protected function _putpages() {
-		$nb = $this->numpages;
-		if (!empty($this->AliasNbPages)) {
-			$nbs = $this->formatPageNumber($nb);
-			$nbu = $this->UTF8ToUTF16BE($nbs, false); // replacement for unicode font
-			$alias_a = $this->_escape($this->AliasNbPages);
-			$alias_au = $this->_escape('{'.$this->AliasNbPages.'}');
-			if ($this->isunicode) {
-				$alias_b = $this->_escape($this->UTF8ToLatin1($this->AliasNbPages));
-				$alias_bu = $this->_escape($this->UTF8ToLatin1('{'.$this->AliasNbPages.'}'));
-				$alias_c = $this->_escape($this->utf8StrRev($this->AliasNbPages, false, $this->tmprtl));
-				$alias_cu = $this->_escape($this->utf8StrRev('{'.$this->AliasNbPages.'}', false, $this->tmprtl));
-			}
-		}
-		if (!empty($this->AliasNumPage)) {
-			$alias_pa = $this->_escape($this->AliasNumPage);
-			$alias_pau = $this->_escape('{'.$this->AliasNumPage.'}');
-			if ($this->isunicode) {
-				$alias_pb = $this->_escape($this->UTF8ToLatin1($this->AliasNumPage));
-				$alias_pbu = $this->_escape($this->UTF8ToLatin1('{'.$this->AliasNumPage.'}'));
-				$alias_pc = $this->_escape($this->utf8StrRev($this->AliasNumPage, false, $this->tmprtl));
-				$alias_pcu = $this->_escape($this->utf8StrRev('{'.$this->AliasNumPage.'}', false, $this->tmprtl));
-			}
-		}
-		$pagegroupnum = 0;
-		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-		for ($n=1; $n <= $nb; ++$n) {
-			$temppage = $this->getPageBuffer($n);
-			if (!empty($this->pagegroups)) {
-				if(isset($this->newpagegroup[$n])) {
-					$pagegroupnum = 0;
-				}
-				++$pagegroupnum;
-				foreach ($this->pagegroups as $k => $v) {
-					// replace total pages group numbers
-					$vs = $this->formatPageNumber($v);
-					$vu = $this->UTF8ToUTF16BE($vs, false);
-					$alias_ga = $this->_escape($k);
-					$alias_gau = $this->_escape('{'.$k.'}');
-					if ($this->isunicode) {
-						$alias_gb = $this->_escape($this->UTF8ToLatin1($k));
-						$alias_gbu = $this->_escape($this->UTF8ToLatin1('{'.$k.'}'));
-						$alias_gc = $this->_escape($this->utf8StrRev($k, false, $this->tmprtl));
-						$alias_gcu = $this->_escape($this->utf8StrRev('{'.$k.'}', false, $this->tmprtl));
-					}
-					$temppage = str_replace($alias_gau, $vu, $temppage);
-					if ($this->isunicode) {
-						$temppage = str_replace($alias_gbu, $vu, $temppage);
-						$temppage = str_replace($alias_gcu, $vu, $temppage);
-						$temppage = str_replace($alias_gb, $vs, $temppage);
-						$temppage = str_replace($alias_gc, $vs, $temppage);
-					}
-					$temppage = str_replace($alias_ga, $vs, $temppage);
-					// replace page group numbers
-					$pvs = $this->formatPageNumber($pagegroupnum);
-					$pvu = $this->UTF8ToUTF16BE($pvs, false);
-					$pk = str_replace('{nb', '{pnb', $k);
-					$alias_pga = $this->_escape($pk);
-					$alias_pgau = $this->_escape('{'.$pk.'}');
-					if ($this->isunicode) {
-						$alias_pgb = $this->_escape($this->UTF8ToLatin1($pk));
-						$alias_pgbu = $this->_escape($this->UTF8ToLatin1('{'.$pk.'}'));
-						$alias_pgc = $this->_escape($this->utf8StrRev($pk, false, $this->tmprtl));
-						$alias_pgcu = $this->_escape($this->utf8StrRev('{'.$pk.'}', false, $this->tmprtl));
-					}
-					$temppage = str_replace($alias_pgau, $pvu, $temppage);
-					if ($this->isunicode) {
-						$temppage = str_replace($alias_pgbu, $pvu, $temppage);
-						$temppage = str_replace($alias_pgcu, $pvu, $temppage);
-						$temppage = str_replace($alias_pgb, $pvs, $temppage);
-						$temppage = str_replace($alias_pgc, $pvs, $temppage);
-					}
-					$temppage = str_replace($alias_pga, $pvs, $temppage);
-				}
-			}
-			if (!empty($this->AliasNbPages)) {
-				// replace total pages number
-				$temppage = str_replace($alias_au, $nbu, $temppage);
-				if ($this->isunicode) {
-					$temppage = str_replace($alias_bu, $nbu, $temppage);
-					$temppage = str_replace($alias_cu, $nbu, $temppage);
-					$temppage = str_replace($alias_b, $nbs, $temppage);
-					$temppage = str_replace($alias_c, $nbs, $temppage);
-				}
-				$temppage = str_replace($alias_a, $nbs, $temppage);
-			}
-			if (!empty($this->AliasNumPage)) {
-				// replace page number
-				$pnbs = $this->formatPageNumber($n);
-				$pnbu = $this->UTF8ToUTF16BE($pnbs, false); // replacement for unicode font
-				$temppage = str_replace($alias_pau, $pnbu, $temppage);
-				if ($this->isunicode) {
-					$temppage = str_replace($alias_pbu, $pnbu, $temppage);
-					$temppage = str_replace($alias_pcu, $pnbu, $temppage);
-					$temppage = str_replace($alias_pb, $pnbs, $temppage);
-					$temppage = str_replace($alias_pc, $pnbs, $temppage);
-				}
-				$temppage = str_replace($alias_pa, $pnbs, $temppage);
-			}
-			$temppage = str_replace($this->epsmarker, '', $temppage);
-			//Page
-			$this->page_obj_id[$n] = $this->_newobj();
-			$out = '<<';
-			$out .= ' /Type /Page';
-			$out .= ' /Parent 1 0 R';
-			$out .= ' /LastModified '.$this->_datestring();
-			$out .= ' /Resources 2 0 R';
-			$boxes = array('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox');
-			foreach ($boxes as $box) {
-				$out .= ' /'.$box;
-				$out .= sprintf(' [%.2F %.2F %.2F %.2F]', $this->pagedim[$n][$box]['llx'], $this->pagedim[$n][$box]['lly'], $this->pagedim[$n][$box]['urx'], $this->pagedim[$n][$box]['ury']);
-			}
-			if (isset($this->pagedim[$n]['BoxColorInfo']) AND !empty($this->pagedim[$n]['BoxColorInfo'])) {
-				$out .= ' /BoxColorInfo <<';
-				foreach ($boxes as $box) {
-					if (isset($this->pagedim[$n]['BoxColorInfo'][$box])) {
-						$out .= ' /'.$box.' <<';
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['C'])) {
-							$color = $this->pagedim[$n]['BoxColorInfo'][$box]['C'];
-							$out .= ' /C [';
-							$out .= sprintf(' %.3F %.3F %.3F', $color[0]/255, $color[1]/255, $color[2]/255);
-							$out .= ' ]';
-						}
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['W'])) {
-							$out .= ' /W '.($this->pagedim[$n]['BoxColorInfo'][$box]['W'] * $this->k);
-						}
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['S'])) {
-							$out .= ' /S /'.$this->pagedim[$n]['BoxColorInfo'][$box]['S'];
-						}
-						if (isset($this->pagedim[$n]['BoxColorInfo'][$box]['D'])) {
-							$dashes = $this->pagedim[$n]['BoxColorInfo'][$box]['D'];
-							$out .= ' /D [';
-							foreach ($dashes as $dash) {
-								$out .= sprintf(' %.3F', ($dash * $this->k));
-							}
-							$out .= ' ]';
-						}
-						$out .= ' >>';
-					}
-				}
-				$out .= ' >>';
-			}
-			$out .= ' /Contents '.($this->n + 1).' 0 R';
-			$out .= ' /Rotate '.$this->pagedim[$n]['Rotate'];
-			$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>';
-			if (isset($this->pagedim[$n]['trans']) AND !empty($this->pagedim[$n]['trans'])) {
-				// page transitions
-				if (isset($this->pagedim[$n]['trans']['Dur'])) {
-					$out .= ' /Dur '.$this->pagedim[$n]['trans']['Dur'];
-				}
-				$out .= ' /Trans <<';
-				$out .= ' /Type /Trans';
-				if (isset($this->pagedim[$n]['trans']['S'])) {
-					$out .= ' /S /'.$this->pagedim[$n]['trans']['S'];
-				}
-				if (isset($this->pagedim[$n]['trans']['D'])) {
-					$out .= ' /D '.$this->pagedim[$n]['trans']['D'];
-				}
-				if (isset($this->pagedim[$n]['trans']['Dm'])) {
-					$out .= ' /Dm /'.$this->pagedim[$n]['trans']['Dm'];
-				}
-				if (isset($this->pagedim[$n]['trans']['M'])) {
-					$out .= ' /M /'.$this->pagedim[$n]['trans']['M'];
-				}
-				if (isset($this->pagedim[$n]['trans']['Di'])) {
-					$out .= ' /Di '.$this->pagedim[$n]['trans']['Di'];
-				}
-				if (isset($this->pagedim[$n]['trans']['SS'])) {
-					$out .= ' /SS '.$this->pagedim[$n]['trans']['SS'];
-				}
-				if (isset($this->pagedim[$n]['trans']['B'])) {
-					$out .= ' /B '.$this->pagedim[$n]['trans']['B'];
-				}
-				$out .= ' >>';
-			}
-			$out .= $this->_getannotsrefs($n);
-			$out .= ' /PZ '.$this->pagedim[$n]['PZ'];
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			//Page content
-			$p = ($this->compress) ? gzcompress($temppage) : $temppage;
-			$this->_newobj();
-			$p = $this->_getrawstream($p);
-			$this->_out('<<'.$filter.'/Length '.strlen($p).'>> stream'."\n".$p."\n".'endstream'."\n".'endobj');
-			if ($this->diskcache) {
-				// remove temporary files
-				unlink($this->pages[$n]);
-			}
-		}
-		//Pages root
-		$out = $this->_getobj(1)."\n";
-		$out .= '<< /Type /Pages /Kids [';
-		foreach($this->page_obj_id as $page_obj) {
-			$out .= ' '.$page_obj.' 0 R';
-		}
-		$out .= ' ] /Count '.$nb.' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Output references to page annotations
-	 * @param int $n page number
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 4.7.000 (2008-08-29)
-	 * @deprecated
-	 */
-	protected function _putannotsrefs($n) {
-		$this->_out($this->_getannotsrefs($n));
-	}
-
-	/**
-	 * Get references to page annotations.
-	 * @param int $n page number
-	 * @return string
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 5.0.010 (2010-05-17)
-	 */
-	protected function _getannotsrefs($n) {
-		if (!(isset($this->PageAnnots[$n]) OR ($this->sign AND isset($this->signature_data['cert_type'])))) {
-			return '';
-		}
-		$out = ' /Annots [';
-		if (isset($this->PageAnnots[$n])) {
-			foreach ($this->PageAnnots[$n] as $key => $val) {
-				if (!in_array($val['n'], $this->radio_groups)) {
-					$out .= ' '.$val['n'].' 0 R';
-				}
-			}
-			// add radiobutton groups
-			if (isset($this->radiobutton_groups[$n])) {
-				foreach ($this->radiobutton_groups[$n] as $key => $data) {
-					if (isset($data['n'])) {
-						$out .= ' '.$data['n'].' 0 R';
-					}
-				}
-			}
-		}
-		if ($this->sign AND ($n == $this->signature_appearance['page']) AND isset($this->signature_data['cert_type'])) {
-			// set reference for signature object
-			$out .= ' '.$this->sig_obj_id.' 0 R';
-		}
-		$out .= ' ]';
-		return $out;
-	}
-
-	/**
-	 * Output annotations objects for all pages.
-	 * !!! THIS METHOD IS NOT YET COMPLETED !!!
-	 * See section 12.5 of PDF 32000_2008 reference.
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 4.0.018 (2008-08-06)
-	 */
-	protected function _putannotsobjs() {
-		// reset object counter
-		for ($n=1; $n <= $this->numpages; ++$n) {
-			if (isset($this->PageAnnots[$n])) {
-				// set page annotations
-				foreach ($this->PageAnnots[$n] as $key => $pl) {
-					$annot_obj_id = $this->PageAnnots[$n][$key]['n'];
-					// create annotation object for grouping radiobuttons
-					if (isset($this->radiobutton_groups[$n][$pl['txt']]) AND is_array($this->radiobutton_groups[$n][$pl['txt']])) {
-						$radio_button_obj_id = $this->radiobutton_groups[$n][$pl['txt']]['n'];
-						$annots = '<<';
-						$annots .= ' /Type /Annot';
-						$annots .= ' /Subtype /Widget';
-						$annots .= ' /Rect [0 0 0 0]';
-						$annots .= ' /T '.$this->_datastring($pl['txt'], $radio_button_obj_id);
-						$annots .= ' /FT /Btn';
-						$annots .= ' /Ff 49152';
-						$annots .= ' /Kids [';
-						foreach ($this->radiobutton_groups[$n][$pl['txt']] as $key => $data) {
-							if ($key !== 'n') {
-								$annots .= ' '.$data['kid'].' 0 R';
-								if ($data['def'] !== 'Off') {
-									$defval = $data['def'];
-								}
-							}
-						}
-						$annots .= ' ]';
-						if (isset($defval)) {
-							$annots .= ' /V /'.$defval;
-						}
-						$annots .= ' >>';
-						$this->_out($this->_getobj($radio_button_obj_id)."\n".$annots."\n".'endobj');
-						$this->form_obj_id[] = $radio_button_obj_id;
-						// store object id to be used on Parent entry of Kids
-						$this->radiobutton_groups[$n][$pl['txt']] = $radio_button_obj_id;
-					}
-					$formfield = false;
-					$pl['opt'] = array_change_key_case($pl['opt'], CASE_LOWER);
-					$a = $pl['x'] * $this->k;
-					$b = $this->pagedim[$n]['h'] - (($pl['y'] + $pl['h']) * $this->k);
-					$c = $pl['w'] * $this->k;
-					$d = $pl['h'] * $this->k;
-					$rect = sprintf('%.2F %.2F %.2F %.2F', $a, $b, $a+$c, $b+$d);
-					// create new annotation object
-					$annots = '<</Type /Annot';
-					$annots .= ' /Subtype /'.$pl['opt']['subtype'];
-					$annots .= ' /Rect ['.$rect.']';
-					$ft = array('Btn', 'Tx', 'Ch', 'Sig');
-					if (isset($pl['opt']['ft']) AND in_array($pl['opt']['ft'], $ft)) {
-						$annots .= ' /FT /'.$pl['opt']['ft'];
-						$formfield = true;
-					}
-					$annots .= ' /Contents '.$this->_textstring($pl['txt'], $annot_obj_id);
-					$annots .= ' /P '.$this->page_obj_id[$n].' 0 R';
-					$annots .= ' /NM '.$this->_datastring(sprintf('%04u-%04u', $n, $key), $annot_obj_id);
-					$annots .= ' /M '.$this->_datestring($annot_obj_id);
-					if (isset($pl['opt']['f'])) {
-						$val = 0;
-						if (is_array($pl['opt']['f'])) {
-							foreach ($pl['opt']['f'] as $f) {
-								switch (strtolower($f)) {
-									case 'invisible': {
-										$val += 1 << 0;
-										break;
-									}
-									case 'hidden': {
-										$val += 1 << 1;
-										break;
-									}
-									case 'print': {
-										$val += 1 << 2;
-										break;
-									}
-									case 'nozoom': {
-										$val += 1 << 3;
-										break;
-									}
-									case 'norotate': {
-										$val += 1 << 4;
-										break;
-									}
-									case 'noview': {
-										$val += 1 << 5;
-										break;
-									}
-									case 'readonly': {
-										$val += 1 << 6;
-										break;
-									}
-									case 'locked': {
-										$val += 1 << 8;
-										break;
-									}
-									case 'togglenoview': {
-										$val += 1 << 9;
-										break;
-									}
-									case 'lockedcontents': {
-										$val += 1 << 10;
-										break;
-									}
-									default: {
-										break;
-									}
-								}
-							}
-						} else {
-							$val = intval($pl['opt']['f']);
-						}
-						$annots .= ' /F '.intval($val);
-					}
-					if (isset($pl['opt']['as']) AND is_string($pl['opt']['as'])) {
-						$annots .= ' /AS /'.$pl['opt']['as'];
-					}
-					if (isset($pl['opt']['ap'])) {
-						// appearance stream
-						$annots .= ' /AP <<';
-						if (is_array($pl['opt']['ap'])) {
-							foreach ($pl['opt']['ap'] as $apmode => $apdef) {
-								// $apmode can be: n = normal; r = rollover; d = down;
-								$annots .= ' /'.strtoupper($apmode);
-								if (is_array($apdef)) {
-									$annots .= ' <<';
-									foreach ($apdef as $apstate => $stream) {
-										// reference to XObject that define the appearance for this mode-state
-										$apsobjid = $this->_putAPXObject($c, $d, $stream);
-										$annots .= ' /'.$apstate.' '.$apsobjid.' 0 R';
-									}
-									$annots .= ' >>';
-								} else {
-									// reference to XObject that define the appearance for this mode
-									$apsobjid = $this->_putAPXObject($c, $d, $apdef);
-									$annots .= ' '.$apsobjid.' 0 R';
-								}
-							}
-						} else {
-							$annots .= $pl['opt']['ap'];
-						}
-						$annots .= ' >>';
-					}
-					if (isset($pl['opt']['bs']) AND (is_array($pl['opt']['bs']))) {
-						$annots .= ' /BS <<';
-						$annots .= ' /Type /Border';
-						if (isset($pl['opt']['bs']['w'])) {
-							$annots .= ' /W '.intval($pl['opt']['bs']['w']);
-						}
-						$bstyles = array('S', 'D', 'B', 'I', 'U');
-						if (isset($pl['opt']['bs']['s']) AND in_array($pl['opt']['bs']['s'], $bstyles)) {
-							$annots .= ' /S /'.$pl['opt']['bs']['s'];
-						}
-						if (isset($pl['opt']['bs']['d']) AND (is_array($pl['opt']['bs']['d']))) {
-							$annots .= ' /D [';
-							foreach ($pl['opt']['bs']['d'] as $cord) {
-								$annots .= ' '.intval($cord);
-							}
-							$annots .= ']';
-						}
-						$annots .= ' >>';
-					} else {
-						$annots .= ' /Border [';
-						if (isset($pl['opt']['border']) AND (count($pl['opt']['border']) >= 3)) {
-							$annots .= intval($pl['opt']['border'][0]).' ';
-							$annots .= intval($pl['opt']['border'][1]).' ';
-							$annots .= intval($pl['opt']['border'][2]);
-							if (isset($pl['opt']['border'][3]) AND is_array($pl['opt']['border'][3])) {
-								$annots .= ' [';
-								foreach ($pl['opt']['border'][3] as $dash) {
-									$annots .= intval($dash).' ';
-								}
-								$annots .= ']';
-							}
-						} else {
-							$annots .= '0 0 0';
-						}
-						$annots .= ']';
-					}
-					if (isset($pl['opt']['be']) AND (is_array($pl['opt']['be']))) {
-						$annots .= ' /BE <<';
-						$bstyles = array('S', 'C');
-						if (isset($pl['opt']['be']['s']) AND in_array($pl['opt']['be']['s'], $markups)) {
-							$annots .= ' /S /'.$pl['opt']['bs']['s'];
-						} else {
-							$annots .= ' /S /S';
-						}
-						if (isset($pl['opt']['be']['i']) AND ($pl['opt']['be']['i'] >= 0) AND ($pl['opt']['be']['i'] <= 2)) {
-							$annots .= ' /I '.sprintf(' %.4F', $pl['opt']['be']['i']);
-						}
-						$annots .= '>>';
-					}
-					if (isset($pl['opt']['c']) AND (is_array($pl['opt']['c'])) AND !empty($pl['opt']['c'])) {
-						$annots .= ' /C [';
-						foreach ($pl['opt']['c'] as $col) {
-							$col = intval($col);
-							$color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
-							$annots .= sprintf(' %.4F', $color);
-						}
-						$annots .= ']';
-					}
-					//$annots .= ' /StructParent ';
-					//$annots .= ' /OC ';
-					$markups = array('text', 'freetext', 'line', 'square', 'circle', 'polygon', 'polyline', 'highlight', 'underline', 'squiggly', 'strikeout', 'stamp', 'caret', 'ink', 'fileattachment', 'sound');
-					if (in_array(strtolower($pl['opt']['subtype']), $markups)) {
-						// this is a markup type
-						if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
-							$annots .= ' /T '.$this->_textstring($pl['opt']['t'], $annot_obj_id);
-						}
-						//$annots .= ' /Popup ';
-						if (isset($pl['opt']['ca'])) {
-							$annots .= ' /CA '.sprintf('%.4F', floatval($pl['opt']['ca']));
-						}
-						if (isset($pl['opt']['rc'])) {
-							$annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id);
-						}
-						$annots .= ' /CreationDate '.$this->_datestring($annot_obj_id);
-						//$annots .= ' /IRT ';
-						if (isset($pl['opt']['subj'])) {
-							$annots .= ' /Subj '.$this->_textstring($pl['opt']['subj'], $annot_obj_id);
-						}
-						//$annots .= ' /RT ';
-						//$annots .= ' /IT ';
-						//$annots .= ' /ExData ';
-					}
-					$lineendings = array('Square', 'Circle', 'Diamond', 'OpenArrow', 'ClosedArrow', 'None', 'Butt', 'ROpenArrow', 'RClosedArrow', 'Slash');
-					// Annotation types
-					switch (strtolower($pl['opt']['subtype'])) {
-						case 'text': {
-							if (isset($pl['opt']['open'])) {
-								$annots .= ' /Open '. (strtolower($pl['opt']['open']) == 'true' ? 'true' : 'false');
-							}
-							$iconsapp = array('Comment', 'Help', 'Insert', 'Key', 'NewParagraph', 'Note', 'Paragraph');
-							if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-								$annots .= ' /Name /'.$pl['opt']['name'];
-							} else {
-								$annots .= ' /Name /Note';
-							}
-							$statemodels = array('Marked', 'Review');
-							if (isset($pl['opt']['statemodel']) AND in_array($pl['opt']['statemodel'], $statemodels)) {
-								$annots .= ' /StateModel /'.$pl['opt']['statemodel'];
-							} else {
-								$pl['opt']['statemodel'] = 'Marked';
-								$annots .= ' /StateModel /'.$pl['opt']['statemodel'];
-							}
-							if ($pl['opt']['statemodel'] == 'Marked') {
-								$states = array('Accepted', 'Unmarked');
-							} else {
-								$states = array('Accepted', 'Rejected', 'Cancelled', 'Completed', 'None');
-							}
-							if (isset($pl['opt']['state']) AND in_array($pl['opt']['state'], $states)) {
-								$annots .= ' /State /'.$pl['opt']['state'];
-							} else {
-								if ($pl['opt']['statemodel'] == 'Marked') {
-									$annots .= ' /State /Unmarked';
-								} else {
-									$annots .= ' /State /None';
-								}
-							}
-							break;
-						}
-						case 'link': {
-							if(is_string($pl['txt'])) {
-								// external URI link
-								$annots .= ' /A <</S /URI /URI '.$this->_datastring($this->unhtmlentities($pl['txt']), $annot_obj_id).'>>';
-							} else {
-								// internal link
-								$l = $this->links[$pl['txt']];
-								$annots .= sprintf(' /Dest [%u 0 R /XYZ 0 %.2F null]', $this->page_obj_id[($l[0])], ($this->pagedim[$l[0]]['h'] - ($l[1] * $this->k)));
-							}
-							$hmodes = array('N', 'I', 'O', 'P');
-							if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmodes)) {
-								$annots .= ' /H /'.$pl['opt']['h'];
-							} else {
-								$annots .= ' /H /I';
-							}
-							//$annots .= ' /PA ';
-							//$annots .= ' /Quadpoints ';
-							break;
-						}
-						case 'freetext': {
-							if (isset($pl['opt']['da']) AND !empty($pl['opt']['da'])) {
-								$annots .= ' /DA ('.$pl['opt']['da'].')';
-							}
-							if (isset($pl['opt']['q']) AND ($pl['opt']['q'] >= 0) AND ($pl['opt']['q'] <= 2)) {
-								$annots .= ' /Q '.intval($pl['opt']['q']);
-							}
-							if (isset($pl['opt']['rc'])) {
-								$annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['ds'])) {
-								$annots .= ' /DS '.$this->_textstring($pl['opt']['ds'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['cl']) AND is_array($pl['opt']['cl'])) {
-								$annots .= ' /CL [';
-								foreach ($pl['opt']['cl'] as $cl) {
-									$annots .= sprintf('%.4F ', $cl * $this->k);
-								}
-								$annots .= ']';
-							}
-							$tfit = array('FreeText', 'FreeTextCallout', 'FreeTextTypeWriter');
-							if (isset($pl['opt']['it']) AND in_array($pl['opt']['it'], $tfit)) {
-								$annots .= ' /IT /'.$pl['opt']['it'];
-							}
-							if (isset($pl['opt']['rd']) AND is_array($pl['opt']['rd'])) {
-								$l = $pl['opt']['rd'][0] * $this->k;
-								$r = $pl['opt']['rd'][1] * $this->k;
-								$t = $pl['opt']['rd'][2] * $this->k;
-								$b = $pl['opt']['rd'][3] * $this->k;
-								$annots .= ' /RD ['.sprintf('%.2F %.2F %.2F %.2F', $l, $r, $t, $b).']';
-							}
-							if (isset($pl['opt']['le']) AND in_array($pl['opt']['le'], $lineendings)) {
-								$annots .= ' /LE /'.$pl['opt']['le'];
-							}
-							break;
-						}
-						case 'line': {
-							break;
-						}
-						case 'square': {
-							break;
-						}
-						case 'circle': {
-							break;
-						}
-						case 'polygon': {
-							break;
-						}
-						case 'polyline': {
-							break;
-						}
-						case 'highlight': {
-							break;
-						}
-						case 'underline': {
-							break;
-						}
-						case 'squiggly': {
-							break;
-						}
-						case 'strikeout': {
-							break;
-						}
-						case 'stamp': {
-							break;
-						}
-						case 'caret': {
-							break;
-						}
-						case 'ink': {
-							break;
-						}
-						case 'popup': {
-							break;
-						}
-						case 'fileattachment': {
-							if (!isset($pl['opt']['fs'])) {
-								break;
-							}
-							$filename = basename($pl['opt']['fs']);
-							if (isset($this->embeddedfiles[$filename]['n'])) {
-								$annots .= ' /FS <</Type /Filespec /F '.$this->_datastring($filename, $annot_obj_id).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
-								$iconsapp = array('Graph', 'Paperclip', 'PushPin', 'Tag');
-								if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-									$annots .= ' /Name /'.$pl['opt']['name'];
-								} else {
-									$annots .= ' /Name /PushPin';
-								}
-							}
-							break;
-						}
-						case 'sound': {
-							if (!isset($pl['opt']['fs'])) {
-								break;
-							}
-							$filename = basename($pl['opt']['fs']);
-							if (isset($this->embeddedfiles[$filename]['n'])) {
-								// ... TO BE COMPLETED ...
-								// /R /C /B /E /CO /CP
-								$annots .= ' /Sound <</Type /Filespec /F '.$this->_datastring($filename, $annot_obj_id).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
-								$iconsapp = array('Speaker', 'Mic');
-								if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
-									$annots .= ' /Name /'.$pl['opt']['name'];
-								} else {
-									$annots .= ' /Name /Speaker';
-								}
-							}
-							break;
-						}
-						case 'movie': {
-							break;
-						}
-						case 'widget': {
-							$hmode = array('N', 'I', 'O', 'P', 'T');
-							if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmode)) {
-								$annots .= ' /H /'.$pl['opt']['h'];
-							}
-						 	if (isset($pl['opt']['mk']) AND (is_array($pl['opt']['mk'])) AND !empty($pl['opt']['mk'])) {
-						 		$annots .= ' /MK <<';
-						 		if (isset($pl['opt']['mk']['r'])) {
-						 			$annots .= ' /R '.$pl['opt']['mk']['r'];
-						 		}
-						 		if (isset($pl['opt']['mk']['bc']) AND (is_array($pl['opt']['mk']['bc']))) {
-						 			$annots .= ' /BC [';
-						 			foreach($pl['opt']['mk']['bc'] AS $col) {
-						 				$col = intval($col);
-										$color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
-						 				$annots .= sprintf(' %.2F', $color);
-						 			}
-						 			$annots .= ']';
-						 		}
-						 		if (isset($pl['opt']['mk']['bg']) AND (is_array($pl['opt']['mk']['bg']))) {
-						 			$annots .= ' /BG [';
-						 			foreach($pl['opt']['mk']['bg'] AS $col) {
-						 				$col = intval($col);
-										$color = $col <= 0 ? 0 : ($col >= 255 ? 1 : $col / 255);
-						 				$annots .= sprintf(' %.2F', $color);
-						 			}
-						 			$annots .= ']';
-						 		}
-						 		if (isset($pl['opt']['mk']['ca'])) {
-						 			$annots .= ' /CA '.$pl['opt']['mk']['ca'];
-						 		}
-						 		if (isset($pl['opt']['mk']['rc'])) {
-						 			$annots .= ' /RC '.$pl['opt']['mk']['rc'];
-						 		}
-						 		if (isset($pl['opt']['mk']['ac'])) {
-						 			$annots .= ' /AC '.$pl['opt']['mk']['ac'];
-						 		}
-						 		if (isset($pl['opt']['mk']['i'])) {
-						 			$info = $this->getImageBuffer($pl['opt']['mk']['i']);
-						 			if ($info !== false) {
-						 				$annots .= ' /I '.$info['n'].' 0 R';
-						 			}
-						 		}
-						 		if (isset($pl['opt']['mk']['ri'])) {
-						 			$info = $this->getImageBuffer($pl['opt']['mk']['ri']);
-						 			if ($info !== false) {
-						 				$annots .= ' /RI '.$info['n'].' 0 R';
-						 			}
-						 		}
-						 		if (isset($pl['opt']['mk']['ix'])) {
-						 			$info = $this->getImageBuffer($pl['opt']['mk']['ix']);
-						 			if ($info !== false) {
-						 				$annots .= ' /IX '.$info['n'].' 0 R';
-						 			}
-						 		}
-						 		if (isset($pl['opt']['mk']['if']) AND (is_array($pl['opt']['mk']['if'])) AND !empty($pl['opt']['mk']['if'])) {
-						 			$annots .= ' /IF <<';
-						 			$if_sw = array('A', 'B', 'S', 'N');
-									if (isset($pl['opt']['mk']['if']['sw']) AND in_array($pl['opt']['mk']['if']['sw'], $if_sw)) {
-										$annots .= ' /SW /'.$pl['opt']['mk']['if']['sw'];
-									}
-						 			$if_s = array('A', 'P');
-									if (isset($pl['opt']['mk']['if']['s']) AND in_array($pl['opt']['mk']['if']['s'], $if_s)) {
-										$annots .= ' /S /'.$pl['opt']['mk']['if']['s'];
-									}
-									if (isset($pl['opt']['mk']['if']['a']) AND (is_array($pl['opt']['mk']['if']['a'])) AND !empty($pl['opt']['mk']['if']['a'])) {
-										$annots .= sprintf(' /A [%.2F %.2F]', $pl['opt']['mk']['if']['a'][0], $pl['opt']['mk']['if']['a'][1]);
-									}
-									if (isset($pl['opt']['mk']['if']['fb']) AND ($pl['opt']['mk']['if']['fb'])) {
-										$annots .= ' /FB true';
-									}
-						 			$annots .= '>>';
-						 		}
-						 		if (isset($pl['opt']['mk']['tp']) AND ($pl['opt']['mk']['tp'] >= 0) AND ($pl['opt']['mk']['tp'] <= 6)) {
-						 			$annots .= ' /TP '.intval($pl['opt']['mk']['tp']);
-						 		} else {
-						 			$annots .= ' /TP 0';
-						 		}
-						 		$annots .= '>>';
-						 	} // end MK
-						 	// --- Entries for field dictionaries ---
-						 	if (isset($this->radiobutton_groups[$n][$pl['txt']])) {
-						 		// set parent
-						 		$annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R';
-						 	}
-						 	if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
-								$annots .= ' /T '.$this->_datastring($pl['opt']['t'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) {
-								$annots .= ' /TU '.$this->_datastring($pl['opt']['tu'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['tm']) AND is_string($pl['opt']['tm'])) {
-								$annots .= ' /TM '.$this->_datastring($pl['opt']['tm'], $annot_obj_id);
-							}
-							if (isset($pl['opt']['ff'])) {
-								if (is_array($pl['opt']['ff'])) {
-									// array of bit settings
-									$flag = 0;
-									foreach($pl['opt']['ff'] as $val) {
-										$flag += 1 << ($val - 1);
-									}
-								} else {
-									$flag = intval($pl['opt']['ff']);
-								}
-								$annots .= ' /Ff '.$flag;
-							}
-							if (isset($pl['opt']['maxlen'])) {
-								$annots .= ' /MaxLen '.intval($pl['opt']['maxlen']);
-							}
-							if (isset($pl['opt']['v'])) {
-								$annots .= ' /V';
-								if (is_array($pl['opt']['v'])) {
-									foreach ($pl['opt']['v'] AS $optval) {
-										if (is_float($optval)) {
-											$optval = sprintf('%.2F', $optval);
-										}
-										$annots .= ' '.$optval;
-									}
-								} else {
-									$annots .= ' '.$this->_textstring($pl['opt']['v'], $annot_obj_id);
-								}
-							}
-							if (isset($pl['opt']['dv'])) {
-								$annots .= ' /DV';
-								if (is_array($pl['opt']['dv'])) {
-									foreach ($pl['opt']['dv'] AS $optval) {
-										if (is_float($optval)) {
-											$optval = sprintf('%.2F', $optval);
-										}
-										$annots .= ' '.$optval;
-									}
-								} else {
-									$annots .= ' '.$this->_textstring($pl['opt']['dv'], $annot_obj_id);
-								}
-							}
-							if (isset($pl['opt']['rv'])) {
-								$annots .= ' /RV';
-								if (is_array($pl['opt']['rv'])) {
-									foreach ($pl['opt']['rv'] AS $optval) {
-										if (is_float($optval)) {
-											$optval = sprintf('%.2F', $optval);
-										}
-										$annots .= ' '.$optval;
-									}
-								} else {
-									$annots .= ' '.$this->_textstring($pl['opt']['rv'], $annot_obj_id);
-								}
-							}
-							if (isset($pl['opt']['a']) AND !empty($pl['opt']['a'])) {
-								$annots .= ' /A << '.$pl['opt']['a'].' >>';
-							}
-							if (isset($pl['opt']['aa']) AND !empty($pl['opt']['aa'])) {
-								$annots .= ' /AA << '.$pl['opt']['aa'].' >>';
-							}
-							if (isset($pl['opt']['da']) AND !empty($pl['opt']['da'])) {
-								$annots .= ' /DA ('.$pl['opt']['da'].')';
-							}
-							if (isset($pl['opt']['q']) AND ($pl['opt']['q'] >= 0) AND ($pl['opt']['q'] <= 2)) {
-								$annots .= ' /Q '.intval($pl['opt']['q']);
-							}
-							if (isset($pl['opt']['opt']) AND (is_array($pl['opt']['opt'])) AND !empty($pl['opt']['opt'])) {
-					 			$annots .= ' /Opt [';
-					 			foreach($pl['opt']['opt'] AS $copt) {
-					 				if (is_array($copt)) {
-					 					$annots .= ' ['.$this->_textstring($copt[0], $annot_obj_id).' '.$this->_textstring($copt[1], $annot_obj_id).']';
-					 				} else {
-					 					$annots .= ' '.$this->_textstring($copt, $annot_obj_id);
-					 				}
-					 			}
-					 			$annots .= ']';
-					 		}
-					 		if (isset($pl['opt']['ti'])) {
-					 			$annots .= ' /TI '.intval($pl['opt']['ti']);
-					 		}
-					 		if (isset($pl['opt']['i']) AND (is_array($pl['opt']['i'])) AND !empty($pl['opt']['i'])) {
-					 			$annots .= ' /I [';
-					 			foreach($pl['opt']['i'] AS $copt) {
-					 				$annots .= intval($copt).' ';
-					 			}
-					 			$annots .= ']';
-					 		}
-							break;
-						}
-						case 'screen': {
-							break;
-						}
-						case 'printermark': {
-							break;
-						}
-						case 'trapnet': {
-							break;
-						}
-						case 'watermark': {
-							break;
-						}
-						case '3d': {
-							break;
-						}
-						default: {
-							break;
-						}
-					}
-					$annots .= '>>';
-					// create new annotation object
-					$this->_out($this->_getobj($annot_obj_id)."\n".$annots."\n".'endobj');
-					if ($formfield AND !isset($this->radiobutton_groups[$n][$pl['txt']])) {
-						// store reference of form object
-						$this->form_obj_id[] = $annot_obj_id;
-					}
-				}
-			}
-		} // end for each page
-	}
-
-	/**
-	 * Put appearance streams XObject used to define annotation's appearance states
-	 * @param int $w annotation width
-	 * @param int $h annotation height
-	 * @param string $stream appearance stream
-	 * @return int object ID
-	 * @access protected
-	 * @since 4.8.001 (2009-09-09)
-	 */
-	protected function _putAPXObject($w=0, $h=0, $stream='') {
-		$stream = trim($stream);
-		$out = $this->_getobj()."\n";
-		$this->xobjects['AX'.$this->n] = array('n' => $this->n);
-		$out .= '<<';
-		$out .= ' /Type /XObject';
-		$out .= ' /Subtype /Form';
-		$out .= ' /FormType 1';
-		if ($this->compress) {
-			$stream = gzcompress($stream);
-			$out .= ' /Filter /FlateDecode';
-		}
-		$rect = sprintf('%.2F %.2F', $w, $h);
-		$out .= ' /BBox [0 0 '.$rect.']';
-		$out .= ' /Matrix [1 0 0 1 0 0]';
-		$out .= ' /Resources <<';
-		$out .= ' /ProcSet [/PDF /Text]';
-		$out .= ' /Font <<';
-		foreach ($this->annotation_fonts as $fontkey => $fontid) {
-			$out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R';
-		}
-		$out .= ' >>';
-		$out .= ' >>';
-		$stream = $this->_getrawstream($stream);
-		$out .= ' /Length '.strlen($stream);
-		$out .= ' >>';
-		$out .= ' stream'."\n".$stream."\n".'endstream';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		return $this->n;
-	}
-
-	/**
-	 * Get ULONG from string (Big Endian 32-bit unsigned integer).
-	 * @param string $str string from where to extract value
-	 * @param int $offset point from where to read the data
-	 * @return int 32 bit value
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.2.000 (2010-06-02)
-	 */
-	protected function _getULONG(&$str, &$offset) {
-		$v = unpack('Ni', substr($str, $offset, 4));
-		$offset += 4;
-		return $v['i'];
-	}
-
-	/**
-	 * Get USHORT from string (Big Endian 16-bit unsigned integer).
-	 * @param string $str string from where to extract value
-	 * @param int $offset point from where to read the data
-	 * @return int 16 bit value
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.2.000 (2010-06-02)
-	 */
-	protected function _getUSHORT(&$str, &$offset) {
-		$v = unpack('ni', substr($str, $offset, 2));
-		$offset += 2;
-		return $v['i'];
-	}
-
-	/**
-	 * Get SHORT from string (Big Endian 16-bit signed integer).
-	 * @param string $str string from where to extract value
-	 * @param int $offset point from where to read the data
-	 * @return int 16 bit value
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.2.000 (2010-06-02)
-	 */
-	protected function _getSHORT(&$str, &$offset) {
-		$v = unpack('si', substr($str, $offset, 2));
-		$offset += 2;
-		return $v['i'];
-	}
-
-	/**
-	 * Get BYTE from string (8-bit unsigned integer).
-	 * @param string $str string from where to extract value
-	 * @param int $offset point from where to read the data
-	 * @return int 8 bit value
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.2.000 (2010-06-02)
-	 */
-	protected function _getBYTE(&$str, &$offset) {
-		$v = unpack('Ci', substr($str, $offset, 1));
-		++$offset;
-		return $v['i'];
-	}
-
-	/**
-	 * Returns a subset of the TrueType font data without the unused glyphs.
-	 * @param string $font TrueType font data
-	 * @param array $subsetchars array of used characters (the glyphs to keep)
-	 * @return string a subset of TrueType font data without the unused glyphs
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.2.000 (2010-06-02)
-	 */
-	protected function _getTrueTypeFontSubset($font, $subsetchars) {
-		ksort($subsetchars);
-		$offset = 0; // offset position of the font data
-		if ($this->_getULONG($font, $offset) != 0x10000) {
-			// sfnt version must be 0x00010000 for TrueType version 1.0.
-			return $font;
-		}
-		// get number of tables
-		$numTables = $this->_getUSHORT($font, $offset);
-		// skip searchRange, entrySelector and rangeShift
-		$offset += 6;
-		// tables array
-		$table = array();
-		// for each table
-		for ($i = 0; $i < $numTables; ++$i) {
-			// get table info
-			$tag = substr($font, $offset, 4);
-			$offset += 4;
-			$table[$tag] = array();
-			$table[$tag]['checkSum'] = $this->_getULONG($font, $offset);
-			$table[$tag]['offset'] = $this->_getULONG($font, $offset);
-			$table[$tag]['length'] = $this->_getULONG($font, $offset);
-		}
-		// check magicNumber
-		$offset = $table['head']['offset'] + 12;
-		if ($this->_getULONG($font, $offset) != 0x5F0F3CF5) {
-			// magicNumber must be 0x5F0F3CF5
-			return $font;
-		}
-		// get offset mode (indexToLocFormat : 0 = short, 1 = long)
-		$offset = $table['head']['offset'] + 50;
-		$short_offset = ($this->_getSHORT($font, $offset) == 0);
-		// get the offsets to the locations of the glyphs in the font, relative to the beginning of the glyphData table
-		$indexToLoc = array();
-		$offset = $table['loca']['offset'];
-		if ($short_offset) {
-			// short version
-			$n = $table['loca']['length'] / 2; // numGlyphs + 1
-			for ($i = 0; $i < $n; ++$i) {
-				$indexToLoc[$i] = $this->_getUSHORT($font, $offset) * 2;
-			}
-		} else {
-			// long version
-			$n = $table['loca']['length'] / 4; // numGlyphs + 1
-			for ($i = 0; $i < $n; ++$i) {
-				$indexToLoc[$i] = $this->_getULONG($font, $offset);
-			}
-		}
-		// get glyphs indexes of chars from cmap table
-		$subsetglyphs = array(); // glyph IDs on key
-		$subsetglyphs[0] = true; // character codes that do not correspond to any glyph in the font should be mapped to glyph index 0
-		$offset = $table['cmap']['offset'] + 2;
-		$numEncodingTables = $this->_getUSHORT($font, $offset);
-		$encodingTables = array();
-		for ($i = 0; $i < $numEncodingTables; ++$i) {
-			$encodingTables[$i]['platformID'] = $this->_getUSHORT($font, $offset);
-			$encodingTables[$i]['encodingID'] = $this->_getUSHORT($font, $offset);
-			$encodingTables[$i]['offset'] = $this->_getULONG($font, $offset);
-		}
-		foreach ($encodingTables as $enctable) {
-			if (($enctable['platformID'] == 3) AND ($enctable['encodingID'] == 0)) {
-				$modesymbol = true;
-			} else {
-				$modesymbol = false;
-			}
-			$offset = $table['cmap']['offset'] + $enctable['offset'];
-			$format = $this->_getUSHORT($font, $offset);
-			switch ($format) {
-				case 0: { // Format 0: Byte encoding table
-					$offset += 4; // skip length and version/language
-					for ($k = 0; $k < 256; ++$k) {
-						if (isset($subsetchars[$k])) {
-							$g = $this->_getBYTE($font, $offset);
-							$subsetglyphs[$g] = $k;
-						} else {
-							++$offset;
-						}
-					}
-					break;
-				}
-				case 2: { // Format 2: High-byte mapping through table
-					$offset += 4; // skip length and version
-					// to be implemented ...
-					break;
-				}
-				case 4: { // Format 4: Segment mapping to delta values
-					$length = $this->_getUSHORT($font, $offset);
-					$offset += 2; // skip version/language
-					$segCount = ($this->_getUSHORT($font, $offset) / 2);
-					$offset += 6; // skip searchRange, entrySelector, rangeShift
-					$endCount = array(); // array of end character codes for each segment
-					for ($k = 0; $k < $segCount; ++$k) {
-						$endCount[$k] = $this->_getUSHORT($font, $offset);
-					}
-					$offset += 2; // skip reservedPad
-					$startCount = array(); // array of start character codes for each segment
-					for ($k = 0; $k < $segCount; ++$k) {
-						$startCount[$k] = $this->_getUSHORT($font, $offset);
-					}
-					$idDelta = array(); // delta for all character codes in segment
-					for ($k = 0; $k < $segCount; ++$k) {
-						$idDelta[$k] = $this->_getUSHORT($font, $offset);
-					}
-					$idRangeOffset = array(); // Offsets into glyphIdArray or 0
-					for ($k = 0; $k < $segCount; ++$k) {
-						$idRangeOffset[$k] = $this->_getUSHORT($font, $offset);
-					}
-					$gidlen = ($length / 2) - 8 - (4 * $segCount);
-					$glyphIdArray = array(); // glyph index array
-					for ($k = 0; $k < $gidlen; ++$k) {
-						$glyphIdArray[$k] = $this->_getUSHORT($font, $offset);
-					}
-					for ($k = 0; $k < $segCount; ++$k) {
-						for ($c = $startCount[$k]; $c <= $endCount[$k]; ++$c) {
-							if (isset($subsetchars[$c])) {
-								if ($idRangeOffset[$k] == 0) {
-									$g = $c;
-								} else {
-									$gid = (($idRangeOffset[$k] / 2) + ($c - $startCount[$k]) - ($segCount - $k));
-									$g = $glyphIdArray[$gid];
-								}
-								$g += ($idDelta[$k] - 65536);
-								if ($g < 0) {
-									$g = 0;
-								}
-								$subsetglyphs[$g] = $c;
-							}
-						}
-					}
-					break;
-				}
-				case 6: { // Format 6: Trimmed table mapping
-					$offset += 4; // skip length and version/language
-					$firstCode = $this->_getUSHORT($font, $offset);
-					$entryCount = $this->_getUSHORT($font, $offset);
-					for ($k = 0; $k < $entryCount; ++$k) {
-						$c = ($k + $firstCode);
-						if (isset($subsetchars[$c])) {
-							$g = $this->_getUSHORT($font, $offset);
-							$subsetglyphs[$g] = $c;
-						} else {
-							$offset += 2;
-						}
-					}
-					break;
-				}
-				case 8: { // Format 8: Mixed 16-bit and 32-bit coverage
-					$offset += 10; // skip length and version
-					// to be implemented ...
-					break;
-				}
-				case 10: { // Format 10: Trimmed array
-					$offset += 10; // skip length and version/language
-					$startCharCode = $this->_getULONG($font, $offset);
-					$numChars = $this->_getULONG($font, $offset);
-					for ($k = 0; $k < $numChars; ++$k) {
-						$c = ($k + $startCharCode);
-						if (isset($subsetchars[$c])) {
-							$g = $this->_getUSHORT($font, $offset);
-							$subsetglyphs[$g] = $c;
-						} else {
-							$offset += 2;
-						}
-					}
-					break;
-				}
-				case 12: { // Format 12: Segmented coverage
-					$offset += 10; // skip length and version/language
-					$nGroups = $this->_getULONG($font, $offset);
-					for ($k = 0; $k < $nGroups; ++$k) {
-						$startCharCode = $this->_getULONG($font, $offset);
-						$endCharCode = $this->_getULONG($font, $offset);
-						$startGlyphCode = $this->_getULONG($font, $offset);
-						for ($c = $startCharCode; $c <= $endCharCode; ++$c) {
-							if (isset($subsetchars[$c])) {
-								$subsetglyphs[$startGlyphCode] = $c;
-							}
-							++$startGlyphCode;
-						}
-					}
-					break;
-				}
-			}
-		}
-		// sort glyphs by key
-		ksort($subsetglyphs);
-		// add composite glyps to $subsetglyphs and remove missing glyphs
-		foreach ($subsetglyphs as $key => $val) {
-			if (isset($indexToLoc[$key])) {
-				$offset = $table['glyf']['offset'] + $indexToLoc[$key];
-				$numberOfContours = $this->_getSHORT($font, $offset);
-				if ($numberOfContours < 0) { // composite glyph
-					$offset += 8; // skip xMin, yMin, xMax, yMax
-					do {
-						$flags = $this->_getUSHORT($font, $offset);
-						$glyphIndex = $this->_getUSHORT($font, $offset);
-						if (!isset($subsetglyphs[$glyphIndex]) AND isset($indexToLoc[$glyphIndex])) {
-							// add missing glyphs
-							$subsetglyphs[$glyphIndex] = true;
-						}
-						// skip some bytes by case
-						if ($flags & 1) {
-							$offset += 4;
-						} else {
-							$offset += 2;
-						}
-						if ($flags & 8) {
-							$offset += 2;
-						} elseif ($flags & 64) {
-							$offset += 4;
-						} elseif ($flags & 128) {
-							$offset += 8;
-						}
-					} while ($flags & 32);
-				}
-			} else {
-				unset($subsetglyphs[$key]);
-			}
-		}
-		// build new glyf table with only used glyphs
-		$glyf = '';
-		$glyfSize = 0;
-		// create new empty indexToLoc table
-		$newIndexToLoc = array_fill(0, count($indexToLoc), 0);
-		$goffset = 0;
-		foreach ($subsetglyphs as $glyphID => $char) {
-			if (isset($indexToLoc[$glyphID]) AND isset($indexToLoc[($glyphID + 1)])) {
-				$start = $indexToLoc[$glyphID];
-				$length = ($indexToLoc[($glyphID + 1)] - $start);
-				$glyf .= substr($font, ($table['glyf']['offset'] + $start), $length);
-				$newIndexToLoc[$glyphID] = $goffset;
-				$goffset += $length;
-			}
-		}
-		// build new loca table
-		$loca = '';
-		if ($short_offset) {
-			foreach ($newIndexToLoc as $glyphID => $offset) {
-				$loca .= pack('n', ($offset / 2));
-			}
-		} else {
-			foreach ($newIndexToLoc as $glyphID => $offset) {
-				$loca .= pack('N', $offset);
-			}
-		}
-		// array of table names to preserve (loca and glyf tables will be added later)
-		//$table_names = array ('cmap', 'head', 'hhea', 'hmtx', 'maxp', 'name', 'OS/2', 'post', 'cvt ', 'fpgm', 'prep');
-		// the cmap table is not needed and shall not be present, since the mapping from character codes to glyph descriptions is provided separately
-		$table_names = array ('head', 'hhea', 'hmtx', 'maxp', 'cvt ', 'fpgm', 'prep'); // minimum required table names
-		// get the tables to preserve
-		$offset = 12;
-		foreach ($table as $tag => $val) {
-			if (in_array($tag, $table_names)) {
-				$table[$tag]['data'] = substr($font, $table[$tag]['offset'], $table[$tag]['length']);
-				if ($tag == 'head') {
-					// set the checkSumAdjustment to 0
-					$table[$tag]['data'] = substr($table[$tag]['data'], 0, 8)."\x0\x0\x0\x0".substr($table[$tag]['data'], 12);
-				}
-				$pad = 4 - ($table[$tag]['length'] % 4);
-				if ($pad != 4) {
-					// the length of a table must be a multiple of four bytes
-					$table[$tag]['length'] += $pad;
-					$table[$tag]['data'] .= str_repeat("\x0", $pad);
-				}
-				$table[$tag]['offset'] = $offset;
-				$offset += $table[$tag]['length'];
-				// check sum is not changed (so keep the following line commented)
-				//$table[$tag]['checkSum'] = $this->_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length']);
-			} else {
-				unset($table[$tag]);
-			}
-		}
-		// add loca
-		$table['loca']['data'] = $loca;
-		$table['loca']['length'] = strlen($loca);
-		$pad = 4 - ($table['loca']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['loca']['length'] += $pad;
-			$table['loca']['data'] .= str_repeat("\x0", $pad);
-		}
-		$table['loca']['offset'] = $offset;
-		$table['loca']['checkSum'] = $this->_getTTFtableChecksum($table['loca']['data'], $table['loca']['length']);
-		$offset += $table['loca']['length'];
-		// add glyf
-		$table['glyf']['data'] = $glyf;
-		$table['glyf']['length'] = strlen($glyf);
-		$pad = 4 - ($table['glyf']['length'] % 4);
-		if ($pad != 4) {
-			// the length of a table must be a multiple of four bytes
-			$table['glyf']['length'] += $pad;
-			$table['glyf']['data'] .= str_repeat("\x0", $pad);
-		}
-		$table['glyf']['offset'] = $offset;
-		$table['glyf']['checkSum'] = $this->_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length']);
-		// rebuild font
-		$font = '';
-		$font .= pack('N', 0x10000); // sfnt version
-		$numTables = count($table);
-		$font .= pack('n', $numTables); // numTables
-		$entrySelector = floor(log($numTables, 2));
-		$searchRange = pow(2, $entrySelector) * 16;
-		$rangeShift = ($numTables * 16) - $searchRange;
-		$font .= pack('n', $searchRange); // searchRange
-		$font .= pack('n', $entrySelector); // entrySelector
-		$font .= pack('n', $rangeShift); // rangeShift
-		$offset = ($numTables * 16);
-		foreach ($table as $tag => $data) {
-			$font .= $tag; // tag
-			$font .= pack('N', $data['checkSum']); // checkSum
-			$font .= pack('N', ($data['offset'] + $offset)); // offset
-			$font .= pack('N', $data['length']); // length
-		}
-		foreach ($table as $data) {
-			$font .= $data['data'];
-		}
-		// set checkSumAdjustment on head table
-		$checkSumAdjustment = 0xB1B0AFBA - $this->_getTTFtableChecksum($font, strlen($font));
-		$font = substr($font, 0, $table['head']['offset'] + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + 12);
-		return $font;
-	}
-
-	/**
-	 * Returs the checksum of a TTF table.
-	 * @param string $table table to check
-	 * @param int $length lenght of table in bytes
-	 * @return int checksum
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.2.000 (2010-06-02)
-	 */
-	protected function _getTTFtableChecksum($table, $length) {
-		$sum = 0;
-		$tlen = ($length / 4);
-		$offset = 0;
-		for ($i = 0; $i < $tlen; ++$i) {
-			$v = unpack('Ni', substr($table, $offset, 4));
-			$sum += $v['i'];
-			$offset += 4;
-		}
-		$sum = unpack('Ni', pack('N', $sum));
-		return $sum['i'];
-	}
-
-	/**
-	 * Outputs font widths
-	 * @param array $font font data
-	 * @param int $cidoffset offset for CID values
-	 * @return PDF command string for font widths
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 4.4.000 (2008-12-07)
-	 */
-	protected function _putfontwidths($font, $cidoffset=0) {
-		ksort($font['cw']);
-		$rangeid = 0;
-		$range = array();
-		$prevcid = -2;
-		$prevwidth = -1;
-		$interval = false;
-		// for each character
-		foreach ($font['cw'] as $cid => $width) {
-			$cid -= $cidoffset;
-			if ($font['subset'] AND ($cid > 255) AND (!isset($font['subsetchars'][$cid]))) {
-				// ignore the unused characters (font subsetting)
-				continue;
-			}
-			if ($width != $font['dw']) {
-				if ($cid == ($prevcid + 1)) {
-					// consecutive CID
-					if ($width == $prevwidth) {
-						if ($width == $range[$rangeid][0]) {
-							$range[$rangeid][] = $width;
-						} else {
-							array_pop($range[$rangeid]);
-							// new range
-							$rangeid = $prevcid;
-							$range[$rangeid] = array();
-							$range[$rangeid][] = $prevwidth;
-							$range[$rangeid][] = $width;
-						}
-						$interval = true;
-						$range[$rangeid]['interval'] = true;
-					} else {
-						if ($interval) {
-							// new range
-							$rangeid = $cid;
-							$range[$rangeid] = array();
-							$range[$rangeid][] = $width;
-						} else {
-							$range[$rangeid][] = $width;
-						}
-						$interval = false;
-					}
-				} else {
-					// new range
-					$rangeid = $cid;
-					$range[$rangeid] = array();
-					$range[$rangeid][] = $width;
-					$interval = false;
-				}
-				$prevcid = $cid;
-				$prevwidth = $width;
-			}
-		}
-		// optimize ranges
-		$prevk = -1;
-		$nextk = -1;
-		$prevint = false;
-		foreach ($range as $k => $ws) {
-			$cws = count($ws);
-			if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
-				if (isset($range[$k]['interval'])) {
-					unset($range[$k]['interval']);
-				}
-				$range[$prevk] = array_merge($range[$prevk], $range[$k]);
-				unset($range[$k]);
-			} else {
-				$prevk = $k;
-			}
-			$nextk = $k + $cws;
-			if (isset($ws['interval'])) {
-				if ($cws > 3) {
-					$prevint = true;
-				} else {
-					$prevint = false;
-				}
-				unset($range[$k]['interval']);
-				--$nextk;
-			} else {
-				$prevint = false;
-			}
-		}
-		// output data
-		$w = '';
-		foreach ($range as $k => $ws) {
-			if (count(array_count_values($ws)) == 1) {
-				// interval mode is more compact
-				$w .= ' '.$k.' '.($k + count($ws) - 1).' '.$ws[0];
-			} else {
-				// range mode
-				$w .= ' '.$k.' [ '.implode(' ', $ws).' ]';
-			}
-		}
-		return '/W ['.$w.' ]';
-	}
-
-	/**
-	 * Output fonts.
-	 * @author Nicola Asuni
-	 * @access protected
-	 */
-	protected function _putfonts() {
-		$nf = $this->n;
-		foreach ($this->diffs as $diff) {
-			//Encodings
-			$this->_newobj();
-			$this->_out('<< /Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.'] >>'."\n".'endobj');
-		}
-		$mqr = $this->get_mqr();
-		$this->set_mqr(false);
-		foreach ($this->FontFiles as $file => $info) {
-			// search and get font file to embedd
-			$fontdir = $info['fontdir'];
-			$file = strtolower($file);
-			$fontfile = '';
-			// search files on various directories
-			if (($fontdir !== false) AND file_exists($fontdir.$file)) {
-				$fontfile = $fontdir.$file;
-			} elseif (file_exists($this->_getfontpath().$file)) {
-				$fontfile = $this->_getfontpath().$file;
-			} elseif (file_exists($file)) {
-				$fontfile = $file;
-			}
-			if (!$this->empty_string($fontfile)) {
-				$font = file_get_contents($fontfile);
-				$compressed = (substr($file, -2) == '.z');
-				if ((!$compressed) AND (isset($info['length2']))) {
-					$header = (ord($font{0}) == 128);
-					if ($header) {
-						//Strip first binary header
-						$font = substr($font, 6);
-					}
-					if ($header AND (ord($font{$info['length1']}) == 128)) {
-						//Strip second binary header
-						$font = substr($font, 0, $info['length1']).substr($font, ($info['length1'] + 6));
-					}
-				} elseif ($info['subset'] AND ((!$compressed) OR ($compressed AND function_exists('gzcompress')))) {
-					if ($compressed) {
-						// uncompress font
-						$font = gzuncompress($font);
-					}
-					// merge subset characters
-					$subsetchars = array(); // used chars
-					foreach ($info['fontkeys'] as $fontkey) {
-						$fontinfo = $this->getFontBuffer($fontkey);
-						$subsetchars += $fontinfo['subsetchars'];
-					}
-					$font = $this->_getTrueTypeFontSubset($font, $subsetchars);
-					if ($compressed) {
-						// recompress font
-						$font = gzcompress($font);
-					}
-				}
-				$this->_newobj();
-				$this->FontFiles[$file]['n'] = $this->n;
-				$stream = $this->_getrawstream($font);
-				$out = '<< /Length '.strlen($stream);
-				if ($compressed) {
-					$out .= ' /Filter /FlateDecode';
-				}
-				$out .= ' /Length1 '.$info['length1'];
-				if (isset($info['length2'])) {
-					$out .= ' /Length2 '.$info['length2'].' /Length3 0';
-				}
-				$out .= ' >>';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			}
-		}
-		$this->set_mqr($mqr);
-		foreach ($this->fontkeys as $k) {
-			//Font objects
-			$font = $this->getFontBuffer($k);
-			$type = $font['type'];
-			$name = $font['name'];
-			if ($type == 'core') {
-				// standard core font
-				$out = $this->_getobj($this->font_obj_ids[$k])."\n";
-				$out .= '<</Type /Font';
-				$out .= ' /Subtype /Type1';
-				$out .= ' /BaseFont /'.$name;
-				$out .= ' /Name /F'.$font['i'];
-				if ((strtolower($name) != 'symbol') AND (strtolower($name) != 'zapfdingbats')) {
-					$out .= ' /Encoding /WinAnsiEncoding';
-				}
-				if ($k == 'helvetica') {
-					// add default font for annotations
-					$this->annotation_fonts[$k] = $font['i'];
-				}
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			} elseif (($type == 'Type1') OR ($type == 'TrueType')) {
-				// additional Type1 or TrueType font
-				$out = $this->_getobj($this->font_obj_ids[$k])."\n";
-				$out .= '<</Type /Font';
-				$out .= ' /Subtype /'.$type;
-				$out .= ' /BaseFont /'.$name;
-				$out .= ' /Name /F'.$font['i'];
-				$out .= ' /FirstChar 32 /LastChar 255';
-				$out .= ' /Widths '.($this->n + 1).' 0 R';
-				$out .= ' /FontDescriptor '.($this->n + 2).' 0 R';
-				if ($font['enc']) {
-					if (isset($font['diff'])) {
-						$out .= ' /Encoding '.($nf + $font['diff']).' 0 R';
-					} else {
-						$out .= ' /Encoding /WinAnsiEncoding';
-					}
-				}
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				// Widths
-				$this->_newobj();
-				$cw = &$font['cw'];
-				$s = '[';
-				for ($i = 32; $i < 256; ++$i) {
-					$s .= $cw[$i].' ';
-				}
-				$s .= ']';
-				$s .= "\n".'endobj';
-				$this->_out($s);
-				//Descriptor
-				$this->_newobj();
-				$s = '<</Type /FontDescriptor /FontName /'.$name;
-				foreach ($font['desc'] as $fdk => $fdv) {
-					if(is_float($fdv)) {
-						$fdv = sprintf('%.3F', $fdv);
-					}
-					$s .= ' /'.$fdk.' '.$fdv.'';
-				}
-				if (!$this->empty_string($font['file'])) {
-					$s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$font['file']]['n'].' 0 R';
-				}
-				$s .= '>>';
-				$s .= "\n".'endobj';
-				$this->_out($s);
-			} else {
-				// additional types
-				$mtd = '_put'.strtolower($type);
-				if (!method_exists($this, $mtd)) {
-					$this->Error('Unsupported font type: '.$type);
-				}
-				$this->$mtd($font);
-			}
-		}
-	}
-
-	/**
-	 * Adds unicode fonts.<br>
-	 * Based on PDF Reference 1.3 (section 5)
-	 * @param array $font font data
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 1.52.0.TC005 (2005-01-05)
-	 */
-	protected function _puttruetypeunicode($font) {
-		$fontname = '';
-		if ($font['subset']) {
-			// change name for font subsetting
-			$subtag = sprintf('%06u', $font['i']);
-			$subtag = strtr($subtag, '0123456789', 'ABCDEFGHIJ');
-			$fontname .= $subtag.'+';
-		}
-		$fontname .= $font['name'];
-		// Type0 Font
-		// A composite font composed of other fonts, organized hierarchically
-		$out = $this->_getobj($this->font_obj_ids[$font['fontkey']])."\n";
-		$out .= '<< /Type /Font';
-		$out .= ' /Subtype /Type0';
-		$out .= ' /BaseFont /'.$fontname;
-		$out .= ' /Name /F'.$font['i'];
-		$out .= ' /Encoding /'.$font['enc'];
-		$out .= ' /ToUnicode '.($this->n + 1).' 0 R';
-		$out .= ' /DescendantFonts ['.($this->n + 2).' 0 R]';
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		// ToUnicode map for Identity-H
-		$stream = "/CIDInit /ProcSet findresource begin\n";
-		$stream .= "12 dict begin\n";
-		$stream .= "begincmap\n";
-		$stream .= "/CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def\n";
-		$stream .= "/CMapName /Adobe-Identity-UCS def\n";
-		$stream .= "/CMapType 2 def\n";
-		$stream .= "/WMode 0 def\n";
-		$stream .= "1 begincodespacerange\n";
-		$stream .= "<0000> <FFFF>\n";
-		$stream .= "endcodespacerange\n";
-		$stream .= "100 beginbfrange\n";
-		$stream .= "<0000> <00ff> <0000>\n";
-		$stream .= "<0100> <01ff> <0100>\n";
-		$stream .= "<0200> <02ff> <0200>\n";
-		$stream .= "<0300> <03ff> <0300>\n";
-		$stream .= "<0400> <04ff> <0400>\n";
-		$stream .= "<0500> <05ff> <0500>\n";
-		$stream .= "<0600> <06ff> <0600>\n";
-		$stream .= "<0700> <07ff> <0700>\n";
-		$stream .= "<0800> <08ff> <0800>\n";
-		$stream .= "<0900> <09ff> <0900>\n";
-		$stream .= "<0a00> <0aff> <0a00>\n";
-		$stream .= "<0b00> <0bff> <0b00>\n";
-		$stream .= "<0c00> <0cff> <0c00>\n";
-		$stream .= "<0d00> <0dff> <0d00>\n";
-		$stream .= "<0e00> <0eff> <0e00>\n";
-		$stream .= "<0f00> <0fff> <0f00>\n";
-		$stream .= "<1000> <10ff> <1000>\n";
-		$stream .= "<1100> <11ff> <1100>\n";
-		$stream .= "<1200> <12ff> <1200>\n";
-		$stream .= "<1300> <13ff> <1300>\n";
-		$stream .= "<1400> <14ff> <1400>\n";
-		$stream .= "<1500> <15ff> <1500>\n";
-		$stream .= "<1600> <16ff> <1600>\n";
-		$stream .= "<1700> <17ff> <1700>\n";
-		$stream .= "<1800> <18ff> <1800>\n";
-		$stream .= "<1900> <19ff> <1900>\n";
-		$stream .= "<1a00> <1aff> <1a00>\n";
-		$stream .= "<1b00> <1bff> <1b00>\n";
-		$stream .= "<1c00> <1cff> <1c00>\n";
-		$stream .= "<1d00> <1dff> <1d00>\n";
-		$stream .= "<1e00> <1eff> <1e00>\n";
-		$stream .= "<1f00> <1fff> <1f00>\n";
-		$stream .= "<2000> <20ff> <2000>\n";
-		$stream .= "<2100> <21ff> <2100>\n";
-		$stream .= "<2200> <22ff> <2200>\n";
-		$stream .= "<2300> <23ff> <2300>\n";
-		$stream .= "<2400> <24ff> <2400>\n";
-		$stream .= "<2500> <25ff> <2500>\n";
-		$stream .= "<2600> <26ff> <2600>\n";
-		$stream .= "<2700> <27ff> <2700>\n";
-		$stream .= "<2800> <28ff> <2800>\n";
-		$stream .= "<2900> <29ff> <2900>\n";
-		$stream .= "<2a00> <2aff> <2a00>\n";
-		$stream .= "<2b00> <2bff> <2b00>\n";
-		$stream .= "<2c00> <2cff> <2c00>\n";
-		$stream .= "<2d00> <2dff> <2d00>\n";
-		$stream .= "<2e00> <2eff> <2e00>\n";
-		$stream .= "<2f00> <2fff> <2f00>\n";
-		$stream .= "<3000> <30ff> <3000>\n";
-		$stream .= "<3100> <31ff> <3100>\n";
-		$stream .= "<3200> <32ff> <3200>\n";
-		$stream .= "<3300> <33ff> <3300>\n";
-		$stream .= "<3400> <34ff> <3400>\n";
-		$stream .= "<3500> <35ff> <3500>\n";
-		$stream .= "<3600> <36ff> <3600>\n";
-		$stream .= "<3700> <37ff> <3700>\n";
-		$stream .= "<3800> <38ff> <3800>\n";
-		$stream .= "<3900> <39ff> <3900>\n";
-		$stream .= "<3a00> <3aff> <3a00>\n";
-		$stream .= "<3b00> <3bff> <3b00>\n";
-		$stream .= "<3c00> <3cff> <3c00>\n";
-		$stream .= "<3d00> <3dff> <3d00>\n";
-		$stream .= "<3e00> <3eff> <3e00>\n";
-		$stream .= "<3f00> <3fff> <3f00>\n";
-		$stream .= "<4000> <40ff> <4000>\n";
-		$stream .= "<4100> <41ff> <4100>\n";
-		$stream .= "<4200> <42ff> <4200>\n";
-		$stream .= "<4300> <43ff> <4300>\n";
-		$stream .= "<4400> <44ff> <4400>\n";
-		$stream .= "<4500> <45ff> <4500>\n";
-		$stream .= "<4600> <46ff> <4600>\n";
-		$stream .= "<4700> <47ff> <4700>\n";
-		$stream .= "<4800> <48ff> <4800>\n";
-		$stream .= "<4900> <49ff> <4900>\n";
-		$stream .= "<4a00> <4aff> <4a00>\n";
-		$stream .= "<4b00> <4bff> <4b00>\n";
-		$stream .= "<4c00> <4cff> <4c00>\n";
-		$stream .= "<4d00> <4dff> <4d00>\n";
-		$stream .= "<4e00> <4eff> <4e00>\n";
-		$stream .= "<4f00> <4fff> <4f00>\n";
-		$stream .= "<5000> <50ff> <5000>\n";
-		$stream .= "<5100> <51ff> <5100>\n";
-		$stream .= "<5200> <52ff> <5200>\n";
-		$stream .= "<5300> <53ff> <5300>\n";
-		$stream .= "<5400> <54ff> <5400>\n";
-		$stream .= "<5500> <55ff> <5500>\n";
-		$stream .= "<5600> <56ff> <5600>\n";
-		$stream .= "<5700> <57ff> <5700>\n";
-		$stream .= "<5800> <58ff> <5800>\n";
-		$stream .= "<5900> <59ff> <5900>\n";
-		$stream .= "<5a00> <5aff> <5a00>\n";
-		$stream .= "<5b00> <5bff> <5b00>\n";
-		$stream .= "<5c00> <5cff> <5c00>\n";
-		$stream .= "<5d00> <5dff> <5d00>\n";
-		$stream .= "<5e00> <5eff> <5e00>\n";
-		$stream .= "<5f00> <5fff> <5f00>\n";
-		$stream .= "<6000> <60ff> <6000>\n";
-		$stream .= "<6100> <61ff> <6100>\n";
-		$stream .= "<6200> <62ff> <6200>\n";
-		$stream .= "<6300> <63ff> <6300>\n";
-		$stream .= "endbfrange\n";
-		$stream .= "100 beginbfrange\n";
-		$stream .= "<6400> <64ff> <6400>\n";
-		$stream .= "<6500> <65ff> <6500>\n";
-		$stream .= "<6600> <66ff> <6600>\n";
-		$stream .= "<6700> <67ff> <6700>\n";
-		$stream .= "<6800> <68ff> <6800>\n";
-		$stream .= "<6900> <69ff> <6900>\n";
-		$stream .= "<6a00> <6aff> <6a00>\n";
-		$stream .= "<6b00> <6bff> <6b00>\n";
-		$stream .= "<6c00> <6cff> <6c00>\n";
-		$stream .= "<6d00> <6dff> <6d00>\n";
-		$stream .= "<6e00> <6eff> <6e00>\n";
-		$stream .= "<6f00> <6fff> <6f00>\n";
-		$stream .= "<7000> <70ff> <7000>\n";
-		$stream .= "<7100> <71ff> <7100>\n";
-		$stream .= "<7200> <72ff> <7200>\n";
-		$stream .= "<7300> <73ff> <7300>\n";
-		$stream .= "<7400> <74ff> <7400>\n";
-		$stream .= "<7500> <75ff> <7500>\n";
-		$stream .= "<7600> <76ff> <7600>\n";
-		$stream .= "<7700> <77ff> <7700>\n";
-		$stream .= "<7800> <78ff> <7800>\n";
-		$stream .= "<7900> <79ff> <7900>\n";
-		$stream .= "<7a00> <7aff> <7a00>\n";
-		$stream .= "<7b00> <7bff> <7b00>\n";
-		$stream .= "<7c00> <7cff> <7c00>\n";
-		$stream .= "<7d00> <7dff> <7d00>\n";
-		$stream .= "<7e00> <7eff> <7e00>\n";
-		$stream .= "<7f00> <7fff> <7f00>\n";
-		$stream .= "<8000> <80ff> <8000>\n";
-		$stream .= "<8100> <81ff> <8100>\n";
-		$stream .= "<8200> <82ff> <8200>\n";
-		$stream .= "<8300> <83ff> <8300>\n";
-		$stream .= "<8400> <84ff> <8400>\n";
-		$stream .= "<8500> <85ff> <8500>\n";
-		$stream .= "<8600> <86ff> <8600>\n";
-		$stream .= "<8700> <87ff> <8700>\n";
-		$stream .= "<8800> <88ff> <8800>\n";
-		$stream .= "<8900> <89ff> <8900>\n";
-		$stream .= "<8a00> <8aff> <8a00>\n";
-		$stream .= "<8b00> <8bff> <8b00>\n";
-		$stream .= "<8c00> <8cff> <8c00>\n";
-		$stream .= "<8d00> <8dff> <8d00>\n";
-		$stream .= "<8e00> <8eff> <8e00>\n";
-		$stream .= "<8f00> <8fff> <8f00>\n";
-		$stream .= "<9000> <90ff> <9000>\n";
-		$stream .= "<9100> <91ff> <9100>\n";
-		$stream .= "<9200> <92ff> <9200>\n";
-		$stream .= "<9300> <93ff> <9300>\n";
-		$stream .= "<9400> <94ff> <9400>\n";
-		$stream .= "<9500> <95ff> <9500>\n";
-		$stream .= "<9600> <96ff> <9600>\n";
-		$stream .= "<9700> <97ff> <9700>\n";
-		$stream .= "<9800> <98ff> <9800>\n";
-		$stream .= "<9900> <99ff> <9900>\n";
-		$stream .= "<9a00> <9aff> <9a00>\n";
-		$stream .= "<9b00> <9bff> <9b00>\n";
-		$stream .= "<9c00> <9cff> <9c00>\n";
-		$stream .= "<9d00> <9dff> <9d00>\n";
-		$stream .= "<9e00> <9eff> <9e00>\n";
-		$stream .= "<9f00> <9fff> <9f00>\n";
-		$stream .= "<a000> <a0ff> <a000>\n";
-		$stream .= "<a100> <a1ff> <a100>\n";
-		$stream .= "<a200> <a2ff> <a200>\n";
-		$stream .= "<a300> <a3ff> <a300>\n";
-		$stream .= "<a400> <a4ff> <a400>\n";
-		$stream .= "<a500> <a5ff> <a500>\n";
-		$stream .= "<a600> <a6ff> <a600>\n";
-		$stream .= "<a700> <a7ff> <a700>\n";
-		$stream .= "<a800> <a8ff> <a800>\n";
-		$stream .= "<a900> <a9ff> <a900>\n";
-		$stream .= "<aa00> <aaff> <aa00>\n";
-		$stream .= "<ab00> <abff> <ab00>\n";
-		$stream .= "<ac00> <acff> <ac00>\n";
-		$stream .= "<ad00> <adff> <ad00>\n";
-		$stream .= "<ae00> <aeff> <ae00>\n";
-		$stream .= "<af00> <afff> <af00>\n";
-		$stream .= "<b000> <b0ff> <b000>\n";
-		$stream .= "<b100> <b1ff> <b100>\n";
-		$stream .= "<b200> <b2ff> <b200>\n";
-		$stream .= "<b300> <b3ff> <b300>\n";
-		$stream .= "<b400> <b4ff> <b400>\n";
-		$stream .= "<b500> <b5ff> <b500>\n";
-		$stream .= "<b600> <b6ff> <b600>\n";
-		$stream .= "<b700> <b7ff> <b700>\n";
-		$stream .= "<b800> <b8ff> <b800>\n";
-		$stream .= "<b900> <b9ff> <b900>\n";
-		$stream .= "<ba00> <baff> <ba00>\n";
-		$stream .= "<bb00> <bbff> <bb00>\n";
-		$stream .= "<bc00> <bcff> <bc00>\n";
-		$stream .= "<bd00> <bdff> <bd00>\n";
-		$stream .= "<be00> <beff> <be00>\n";
-		$stream .= "<bf00> <bfff> <bf00>\n";
-		$stream .= "<c000> <c0ff> <c000>\n";
-		$stream .= "<c100> <c1ff> <c100>\n";
-		$stream .= "<c200> <c2ff> <c200>\n";
-		$stream .= "<c300> <c3ff> <c300>\n";
-		$stream .= "<c400> <c4ff> <c400>\n";
-		$stream .= "<c500> <c5ff> <c500>\n";
-		$stream .= "<c600> <c6ff> <c600>\n";
-		$stream .= "<c700> <c7ff> <c700>\n";
-		$stream .= "endbfrange\n";
-		$stream .= "56 beginbfrange\n";
-		$stream .= "<c800> <c8ff> <c800>\n";
-		$stream .= "<c900> <c9ff> <c900>\n";
-		$stream .= "<ca00> <caff> <ca00>\n";
-		$stream .= "<cb00> <cbff> <cb00>\n";
-		$stream .= "<cc00> <ccff> <cc00>\n";
-		$stream .= "<cd00> <cdff> <cd00>\n";
-		$stream .= "<ce00> <ceff> <ce00>\n";
-		$stream .= "<cf00> <cfff> <cf00>\n";
-		$stream .= "<d000> <d0ff> <d000>\n";
-		$stream .= "<d100> <d1ff> <d100>\n";
-		$stream .= "<d200> <d2ff> <d200>\n";
-		$stream .= "<d300> <d3ff> <d300>\n";
-		$stream .= "<d400> <d4ff> <d400>\n";
-		$stream .= "<d500> <d5ff> <d500>\n";
-		$stream .= "<d600> <d6ff> <d600>\n";
-		$stream .= "<d700> <d7ff> <d700>\n";
-		$stream .= "<d800> <d8ff> <d800>\n";
-		$stream .= "<d900> <d9ff> <d900>\n";
-		$stream .= "<da00> <daff> <da00>\n";
-		$stream .= "<db00> <dbff> <db00>\n";
-		$stream .= "<dc00> <dcff> <dc00>\n";
-		$stream .= "<dd00> <ddff> <dd00>\n";
-		$stream .= "<de00> <deff> <de00>\n";
-		$stream .= "<df00> <dfff> <df00>\n";
-		$stream .= "<e000> <e0ff> <e000>\n";
-		$stream .= "<e100> <e1ff> <e100>\n";
-		$stream .= "<e200> <e2ff> <e200>\n";
-		$stream .= "<e300> <e3ff> <e300>\n";
-		$stream .= "<e400> <e4ff> <e400>\n";
-		$stream .= "<e500> <e5ff> <e500>\n";
-		$stream .= "<e600> <e6ff> <e600>\n";
-		$stream .= "<e700> <e7ff> <e700>\n";
-		$stream .= "<e800> <e8ff> <e800>\n";
-		$stream .= "<e900> <e9ff> <e900>\n";
-		$stream .= "<ea00> <eaff> <ea00>\n";
-		$stream .= "<eb00> <ebff> <eb00>\n";
-		$stream .= "<ec00> <ecff> <ec00>\n";
-		$stream .= "<ed00> <edff> <ed00>\n";
-		$stream .= "<ee00> <eeff> <ee00>\n";
-		$stream .= "<ef00> <efff> <ef00>\n";
-		$stream .= "<f000> <f0ff> <f000>\n";
-		$stream .= "<f100> <f1ff> <f100>\n";
-		$stream .= "<f200> <f2ff> <f200>\n";
-		$stream .= "<f300> <f3ff> <f300>\n";
-		$stream .= "<f400> <f4ff> <f400>\n";
-		$stream .= "<f500> <f5ff> <f500>\n";
-		$stream .= "<f600> <f6ff> <f600>\n";
-		$stream .= "<f700> <f7ff> <f700>\n";
-		$stream .= "<f800> <f8ff> <f800>\n";
-		$stream .= "<f900> <f9ff> <f900>\n";
-		$stream .= "<fa00> <faff> <fa00>\n";
-		$stream .= "<fb00> <fbff> <fb00>\n";
-		$stream .= "<fc00> <fcff> <fc00>\n";
-		$stream .= "<fd00> <fdff> <fd00>\n";
-		$stream .= "<fe00> <feff> <fe00>\n";
-		$stream .= "<ff00> <ffff> <ff00>\n";
-		$stream .= "endbfrange\n";
-		$stream .= "endcmap\n";
-		$stream .= "CMapName currentdict /CMap defineresource pop\n";
-		$stream .= "end\n";
-		$stream .= "end";
-		// ToUnicode Object
-		$this->_newobj();
-		$stream = ($this->compress) ? gzcompress($stream) : $stream;
-		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-		$stream = $this->_getrawstream($stream);
-		$this->_out('<<'.$filter.'/Length '.strlen($stream).'>> stream'."\n".$stream."\n".'endstream'."\n".'endobj');
-		// CIDFontType2
-		// A CIDFont whose glyph descriptions are based on TrueType font technology
-		$oid = $this->_newobj();
-		$out = '<< /Type /Font';
-		$out .= ' /Subtype /CIDFontType2';
-		$out .= ' /BaseFont /'.$fontname;
-		// A dictionary containing entries that define the character collection of the CIDFont.
-		$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry'], $oid);
-		$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering'], $oid);
-		$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];
-		$out .= ' /CIDSystemInfo << '.$cidinfo.' >>';
-		$out .= ' /FontDescriptor '.($this->n + 1).' 0 R';
-		$out .= ' /DW '.$font['dw']; // default width
-		$out .= "\n".$this->_putfontwidths($font, 0);
-		if (isset($font['ctg']) AND (!$this->empty_string($font['ctg']))) {
-			$out .= "\n".'/CIDToGIDMap '.($this->n + 2).' 0 R';
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		// Font descriptor
-		// A font descriptor describing the CIDFont default metrics other than its glyph widths
-		$this->_newobj();
-		$out = '<< /Type /FontDescriptor';
-		$out .= ' /FontName /'.$fontname;
-		foreach ($font['desc'] as $key => $value) {
-			if(is_float($value)) {
-				$value = sprintf('%.3F', $value);
-			}
-			$out .= ' /'.$key.' '.$value;
-		}
-		$fontdir = false;
-		if (!$this->empty_string($font['file'])) {
-			// A stream containing a TrueType font
-			$out .= ' /FontFile2 '.$this->FontFiles[$font['file']]['n'].' 0 R';
-			$fontdir = $this->FontFiles[$font['file']]['fontdir'];
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		if (isset($font['ctg']) AND (!$this->empty_string($font['ctg']))) {
-			$this->_newobj();
-			// Embed CIDToGIDMap
-			// A specification of the mapping from CIDs to glyph indices
-			// search and get CTG font file to embedd
-			$ctgfile = strtolower($font['ctg']);
-			// search and get ctg font file to embedd
-			$fontfile = '';
-			// search files on various directories
-			if (($fontdir !== false) AND file_exists($fontdir.$ctgfile)) {
-				$fontfile = $fontdir.$ctgfile;
-			} elseif (file_exists($this->_getfontpath().$ctgfile)) {
-				$fontfile = $this->_getfontpath().$ctgfile;
-			} elseif (file_exists($ctgfile)) {
-				$fontfile = $ctgfile;
-			}
-			if ($this->empty_string($fontfile)) {
-				$this->Error('Font file not found: '.$ctgfile);
-			}
-			$stream = $this->_getrawstream(file_get_contents($fontfile));
-			$out = '<< /Length '.strlen($stream).'';
-			if (substr($fontfile, -2) == '.z') { // check file extension
-				// Decompresses data encoded using the public-domain
-				// zlib/deflate compression method, reproducing the
-				// original text or binary data
-				$out .= ' /Filter /FlateDecode';
-			}
-			$out .= ' >>';
-			$out .= ' stream'."\n".$stream."\n".'endstream';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-	}
-
-	/**
-	 * Output CID-0 fonts.
-	 * A Type 0 CIDFont contains glyph descriptions based on the Adobe Type 1 font format
-	 * @param array $font font data
-	 * @access protected
-	 * @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	protected function _putcidfont0($font) {
-		$cidoffset = 0;
-		if (!isset($font['cw'][1])) {
-			$cidoffset = 31;
-		}
-		if (isset($font['cidinfo']['uni2cid'])) {
-			// convert unicode to cid.
-			$uni2cid = $font['cidinfo']['uni2cid'];
-			$cw = array();
-			foreach ($font['cw'] as $uni => $width) {
-				if (isset($uni2cid[$uni])) {
-					$cw[($uni2cid[$uni] + $cidoffset)] = $width;
-				} elseif ($uni < 256) {
-					$cw[$uni] = $width;
-				} // else unknown character
-			}
-			$font = array_merge($font, array('cw' => $cw));
-		}
-		$name = $font['name'];
-		$enc = $font['enc'];
-		if ($enc) {
-			$longname = $name.'-'.$enc;
-		} else {
-			$longname = $name;
-		}
-		$out = $this->_getobj($this->font_obj_ids[$font['fontkey']])."\n";
-		$out .= '<</Type /Font';
-		$out .= ' /Subtype /Type0';
-		$out .= ' /BaseFont /'.$longname;
-		$out .= ' /Name /F'.$font['i'];
-		if ($enc) {
-			$out .= ' /Encoding /'.$enc;
-		}
-		$out .= ' /DescendantFonts ['.($this->n + 1).' 0 R]';
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		$oid = $this->_newobj();
-		$out = '<</Type /Font';
-		$out .= ' /Subtype /CIDFontType0';
-		$out .= ' /BaseFont /'.$name;
-		$cidinfo = '/Registry '.$this->_datastring($font['cidinfo']['Registry'], $oid);
-		$cidinfo .= ' /Ordering '.$this->_datastring($font['cidinfo']['Ordering'], $oid);
-		$cidinfo .= ' /Supplement '.$font['cidinfo']['Supplement'];
-		$out .= ' /CIDSystemInfo <<'.$cidinfo.'>>';
-		$out .= ' /FontDescriptor '.($this->n + 1).' 0 R';
-		$out .= ' /DW '.$font['dw'];
-		$out .= "\n".$this->_putfontwidths($font, $cidoffset);
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		$this->_newobj();
-		$s = '<</Type /FontDescriptor /FontName /'.$name;
-		foreach ($font['desc'] as $k => $v) {
-			if ($k != 'Style') {
-				if(is_float($v)) {
-					$v = sprintf('%.3F', $v);
-				}
-				$s .= ' /'.$k.' '.$v.'';
-			}
-		}
-		$s .= '>>';
-		$s .= "\n".'endobj';
-		$this->_out($s);
-	}
-
-	/**
-	 * Output images.
-	 * @access protected
-	 */
-	protected function _putimages() {
-		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
-		foreach ($this->imagekeys as $file) {
-			$info = $this->getImageBuffer($file);
-			$oid = $this->_newobj();
-			$this->xobjects['I'.$info['i']] = array('n' => $oid);
-			$this->setImageSubBuffer($file, 'n', $this->n);
-			$out = '<</Type /XObject';
-			$out .= ' /Subtype /Image';
-			$out .= ' /Width '.$info['w'];
-			$out .= ' /Height '.$info['h'];
-			if (array_key_exists('masked', $info)) {
-				$out .= ' /SMask '.($this->n - 1).' 0 R';
-			}
-			if ($info['cs'] == 'Indexed') {
-				$out .= ' /ColorSpace [/Indexed /DeviceRGB '.((strlen($info['pal']) / 3) - 1).' '.($this->n + 1).' 0 R]';
-			} else {
-				$out .= ' /ColorSpace /'.$info['cs'];
-				if ($info['cs'] == 'DeviceCMYK') {
-					$out .= ' /Decode [1 0 1 0 1 0 1 0]';
-				}
-			}
-			$out .= ' /BitsPerComponent '.$info['bpc'];
-			if (isset($info['f'])) {
-				$out .= ' /Filter /'.$info['f'];
-			}
-			if (isset($info['parms'])) {
-				$out .= ' '.$info['parms'];
-			}
-			if (isset($info['trns']) AND is_array($info['trns'])) {
-				$trns='';
-				$count_info = count($info['trns']);
-				for ($i=0; $i < $count_info; ++$i) {
-					$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
-				}
-				$out .= ' /Mask ['.$trns.']';
-			}
-			$stream = $this->_getrawstream($info['data']);
-			$out .= ' /Length '.strlen($stream).' >>';
-			$out .= ' stream'."\n".$stream."\n".'endstream';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			//Palette
-			if ($info['cs'] == 'Indexed') {
-				$this->_newobj();
-				$pal = ($this->compress) ? gzcompress($info['pal']) : $info['pal'];
-				$pal = $this->_getrawstream($pal);
-				$this->_out('<<'.$filter.'/Length '.strlen($pal).'>> stream'."\n".$pal."\n".'endstream'."\n".'endobj');
-			}
-		}
-	}
-
-	/**
-	 * Output Form XObjects Templates.
-	 * @author Nicola Asuni
-	 * @since 5.8.017 (2010-08-24)
-	 * @access protected
-	 * @see startTemplate(), endTemplate(), printTemplate()
-	 */
-	protected function _putxobjects() {
-		foreach ($this->xobjects as $key => $data) {
-			if (isset($data['outdata'])) {
-				$stream = trim($data['outdata']);
-				$out = $this->_getobj($data['n'])."\n";
-				$out .= '<<';
-				$out .= ' /Type /XObject';
-				$out .= ' /Subtype /Form';
-				$out .= ' /FormType 1';
-				if ($this->compress) {
-					$stream = gzcompress($stream);
-					$out .= ' /Filter /FlateDecode';
-				}
-				$out .= sprintf(' /BBox [%.2F %.2F %.2F %.2F]', ($data['x'] * $this->k), (-$data['y'] * $this->k), (($data['w'] + $data['x']) * $this->k), (($data['h'] - $data['y']) * $this->k));
-				$out .= ' /Matrix [1 0 0 1 0 0]';
-				$out .= ' /Resources <<';
-				$out .= ' /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
-				// fonts
-				if (!empty($data['fonts'])) {
-					$out .= ' /Font <<';
-					foreach ($data['fonts'] as $fontkey => $fontid) {
-						$out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R';
-					}
-					$out .= ' >>';
-				}
-				// images or nested xobjects
-				if (!empty($data['images']) OR !empty($data['xobjects'])) {
-					$out .= ' /XObject <<';
-					foreach ($data['images'] as $imgid) {
-						$out .= ' /I'.$imgid.' '.$this->xobjects['I'.$imgid]['n'].' 0 R';
-					}
-					foreach ($data['xobjects'] as $sub_id => $sub_objid) {
-						$out .= ' /'.$sub_id.' '.$sub_objid['n'].' 0 R';
-					}
-					$out .= ' >>';
-				}
-				$out .= ' >>';
-				$stream = $this->_getrawstream($stream);
-				$out .= ' /Length '.strlen($stream);
-				$out .= ' >>';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			}
-		}
-	}
-
-	/**
-	 * Output Spot Colors Resources.
-	 * @access protected
-	 * @since 4.0.024 (2008-09-12)
-	 */
-	protected function _putspotcolors() {
-		foreach ($this->spot_colors as $name => $color) {
-			$this->_newobj();
-			$this->spot_colors[$name]['n'] = $this->n;
-			$out = '[/Separation /'.str_replace(' ', '#20', $name);
-			$out .= ' /DeviceCMYK <<';
-			$out .= ' /Range [0 1 0 1 0 1 0 1] /C0 [0 0 0 0]';
-			$out .= ' '.sprintf('/C1 [%.4F %.4F %.4F %.4F] ', $color['c']/100, $color['m']/100, $color['y']/100, $color['k']/100);
-			$out .= ' /FunctionType 2 /Domain [0 1] /N 1>>]';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-	}
-
-	/**
-	 * Return XObjects Dictionary.
-	 * @return string XObjects dictionary
-	 * @access protected
-	 * @since 5.8.014 (2010-08-23)
-	 */
-	protected function _getxobjectdict() {
-		$out = '';
-		foreach ($this->xobjects as $id => $objid) {
-			$out .= ' /'.$id.' '.$objid['n'].' 0 R';
-		}
-		return $out;
-	}
-
-	/**
-	 * Output Resources Dictionary.
-	 * @access protected
-	 */
-	protected function _putresourcedict() {
-		$out = $this->_getobj(2)."\n";
-		$out .= '<< /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
-		$out .= ' /Font <<';
-		foreach ($this->fontkeys as $fontkey) {
-			$font = $this->getFontBuffer($fontkey);
-			$out .= ' /F'.$font['i'].' '.$font['n'].' 0 R';
-		}
-		$out .= ' >>';
-		$out .= ' /XObject <<';
-		$out .= $this->_getxobjectdict();
-		$out .= ' >>';
-		// visibility
-		$out .= ' /Properties <</OC1 '.$this->n_ocg_print.' 0 R /OC2 '.$this->n_ocg_view.' 0 R>>';
-		// transparency
-		$out .= ' /ExtGState <<';
-		foreach ($this->extgstates as $k => $extgstate) {
-			if (isset($extgstate['name'])) {
-				$out .= ' /'.$extgstate['name'];
-			} else {
-				$out .= ' /GS'.$k;
-			}
-			$out .= ' '.$extgstate['n'].' 0 R';
-		}
-		$out .= ' >>';
-		// gradient patterns
-		if (isset($this->gradients) AND (count($this->gradients) > 0)) {
-			$out .= ' /Pattern <<';
-			foreach ($this->gradients as $id => $grad) {
-				$out .= ' /p'.$id.' '.$grad['pattern'].' 0 R';
-			}
-			$out .= ' >>';
-		}
-		// gradient shadings
-		if (isset($this->gradients) AND (count($this->gradients) > 0)) {
-			$out .= ' /Shading <<';
-			foreach ($this->gradients as $id => $grad) {
-				$out .= ' /Sh'.$id.' '.$grad['id'].' 0 R';
-			}
-			$out .= ' >>';
-		}
-		// spot colors
-		if (isset($this->spot_colors) AND (count($this->spot_colors) > 0)) {
-			$out .= ' /ColorSpace <<';
-			foreach ($this->spot_colors as $color) {
-				$out .= ' /CS'.$color['i'].' '.$color['n'].' 0 R';
-			}
-			$out .= ' >>';
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Output Resources.
-	 * @access protected
-	 */
-	protected function _putresources() {
-		$this->_putextgstates();
-		$this->_putocg();
-		$this->_putfonts();
-		$this->_putimages();
-		$this->_putxobjects();
-		$this->_putspotcolors();
-		$this->_putshaders();
-		$this->_putresourcedict();
-		$this->_putbookmarks();
-		$this->_putEmbeddedFiles();
-		$this->_putannotsobjs();
-		$this->_putjavascript();
-		$this->_putencryption();
-	}
-
-	/**
-	 * Adds some Metadata information (Document Information Dictionary)
-	 * (see Chapter 14.3.3 Document Information Dictionary of PDF32000_2008.pdf Reference)
-	 * @return int object id
-	 * @access protected
-	 */
-	protected function _putinfo() {
-		$oid = $this->_newobj();
-		$out = '<<';
-		if (!$this->empty_string($this->title)) {
-			// The document's title.
-			$out .= ' /Title '.$this->_textstring($this->title, $oid);
-		}
-		if (!$this->empty_string($this->author)) {
-			// The name of the person who created the document.
-			$out .= ' /Author '.$this->_textstring($this->author, $oid);
-		}
-		if (!$this->empty_string($this->subject)) {
-			// The subject of the document.
-			$out .= ' /Subject '.$this->_textstring($this->subject, $oid);
-		}
-		if (!$this->empty_string($this->keywords)) {
-			// Keywords associated with the document.
-			$out .= ' /Keywords '.$this->_textstring($this->keywords.' TCP'.'DF', $oid);
-		}
-		if (!$this->empty_string($this->creator)) {
-			// If the document was converted to PDF from another format, the name of the conforming product that created the original document from which it was converted.
-			$out .= ' /Creator '.$this->_textstring($this->creator, $oid);
-		}
-		if (defined('PDF_PRODUCER')) {
-			// If the document was converted to PDF from another format, the name of the conforming product that converted it to PDF.
-			$out .= ' /Producer '.$this->_textstring(PDF_PRODUCER.' (TCP'.'DF)', $oid);
-		} else {
-			// default producer
-			$out .= ' /Producer '.$this->_textstring('TCP'.'DF', $oid);
-		}
-		// The date and time the document was created, in human-readable form
-		$out .= ' /CreationDate '.$this->_datestring();
-		// The date and time the document was most recently modified, in human-readable form
-		$out .= ' /ModDate '.$this->_datestring();
-		// A name object indicating whether the document has been modified to include trapping information
-		$out .= ' /Trapped /False';
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		return $oid;
-	}
-
-	/**
-	 * Output Catalog.
-	 * @return int object id
-	 * @access protected
-	 */
-	protected function _putcatalog() {
-		$oid = $this->_newobj();
-		$out = '<< /Type /Catalog';
-		$out .= ' /Pages 1 0 R';
-		if ($this->ZoomMode == 'fullpage') {
-			$out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /Fit]';
-		} elseif ($this->ZoomMode == 'fullwidth') {
-			$out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /FitH null]';
-		} elseif ($this->ZoomMode == 'real') {
-			$out .= ' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null 1]';
-		} elseif (!is_string($this->ZoomMode)) {
-			$out .= sprintf(' /OpenAction ['.$this->page_obj_id[1].' 0 R /XYZ null null %.2F]',($this->ZoomMode / 100));
-		}
-		if (isset($this->LayoutMode) AND (!$this->empty_string($this->LayoutMode))) {
-			$out .= ' /PageLayout /'.$this->LayoutMode;
-		}
-		if (isset($this->PageMode) AND (!$this->empty_string($this->PageMode))) {
-			$out .= ' /PageMode /'.$this->PageMode;
-		}
-		if (isset($this->l['a_meta_language'])) {
-			$out .= ' /Lang '.$this->_textstring($this->l['a_meta_language'], $oid);
-		}
-		$out .= ' /Names <<';
-		if ((!empty($this->javascript)) OR (!empty($this->js_objects))) {
-			$out .= ' /JavaScript '.($this->n_js).' 0 R';
-		}
-		$out .= ' >>';
-		if (count($this->outlines) > 0) {
-			$out .= ' /Outlines '.$this->OutlineRoot.' 0 R';
-			$out .= ' /PageMode /UseOutlines';
-		}
-		$out .= ' '.$this->_putviewerpreferences();
-		$p = $this->n_ocg_print.' 0 R';
-		$v = $this->n_ocg_view.' 0 R';
-		$as = '<< /Event /Print /OCGs ['.$p.' '.$v.'] /Category [/Print] >> << /Event /View /OCGs ['.$p.' '.$v.'] /Category [/View] >>';
-		$out .= ' /OCProperties << /OCGs ['.$p.' '.$v.'] /D << /ON ['.$p.'] /OFF ['.$v.'] /AS ['.$as.'] >> >>';
-		// AcroForm
-		if (!empty($this->form_obj_id) OR ($this->sign AND isset($this->signature_data['cert_type']))) {
-			$out .= ' /AcroForm <<';
-			$objrefs = '';
-			if ($this->sign AND isset($this->signature_data['cert_type'])) {
-				$objrefs .= $this->sig_obj_id.' 0 R';
-			}
-			if (!empty($this->form_obj_id)) {
-				foreach($this->form_obj_id as $objid) {
-					$objrefs .= ' '.$objid.' 0 R';
-				}
-			}
-			$out .= ' /Fields ['.$objrefs.']';
-			if (!empty($this->form_obj_id) AND !$this->sign) {
-				// It's better to turn off this value and set the appearance stream for each annotation (/AP) to avoid conflicts with signature fields.
-				$out .= ' /NeedAppearances true';
-			}
-			if ($this->sign AND isset($this->signature_data['cert_type'])) {
-				if ($this->signature_data['cert_type'] > 0) {
-					$out .= ' /SigFlags 3';
-				} else {
-					$out .= ' /SigFlags 1';
-				}
-			}
-			//$out .= ' /CO ';
-			if (isset($this->annotation_fonts) AND !empty($this->annotation_fonts)) {
-				$out .= ' /DR <<';
-				$out .= ' /Font <<';
-				foreach ($this->annotation_fonts as $fontkey => $fontid) {
-					$out .= ' /F'.$fontid.' '.$this->font_obj_ids[$fontkey].' 0 R';
-				}
-				$out .= ' >> >>';
-			}
-			$font = $this->getFontBuffer('helvetica');
-			$out .= ' /DA (/F'.$font['i'].' 0 Tf 0 g)';
-			$out .= ' /Q '.(($this->rtl)?'2':'0');
-			//$out .= ' /XFA ';
-			$out .= ' >>';
-			// signatures
-			if ($this->sign AND isset($this->signature_data['cert_type'])) {
-				if ($this->signature_data['cert_type'] > 0) {
-					$out .= ' /Perms << /DocMDP '.($this->sig_obj_id + 1).' 0 R >>';
-				} else {
-					$out .= ' /Perms << /UR3 '.($this->sig_obj_id + 1).' 0 R >>';
-				}
-			}
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		return $oid;
-	}
-
-	/**
-	 * Output viewer preferences.
-	 * @return string for viewer preferences
-	 * @author Nicola asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access protected
-	 */
-	protected function _putviewerpreferences() {
-		$out = '/ViewerPreferences <<';
-		if ($this->rtl) {
-			$out .= ' /Direction /R2L';
-		} else {
-			$out .= ' /Direction /L2R';
-		}
-		if (isset($this->viewer_preferences['HideToolbar']) AND ($this->viewer_preferences['HideToolbar'])) {
-			$out .= ' /HideToolbar true';
-		}
-		if (isset($this->viewer_preferences['HideMenubar']) AND ($this->viewer_preferences['HideMenubar'])) {
-			$out .= ' /HideMenubar true';
-		}
-		if (isset($this->viewer_preferences['HideWindowUI']) AND ($this->viewer_preferences['HideWindowUI'])) {
-			$out .= ' /HideWindowUI true';
-		}
-		if (isset($this->viewer_preferences['FitWindow']) AND ($this->viewer_preferences['FitWindow'])) {
-			$out .= ' /FitWindow true';
-		}
-		if (isset($this->viewer_preferences['CenterWindow']) AND ($this->viewer_preferences['CenterWindow'])) {
-			$out .= ' /CenterWindow true';
-		}
-		if (isset($this->viewer_preferences['DisplayDocTitle']) AND ($this->viewer_preferences['DisplayDocTitle'])) {
-			$out .= ' /DisplayDocTitle true';
-		}
-		if (isset($this->viewer_preferences['NonFullScreenPageMode'])) {
-			$out .= ' /NonFullScreenPageMode /'.$this->viewer_preferences['NonFullScreenPageMode'];
-		}
-		if (isset($this->viewer_preferences['ViewArea'])) {
-			$out .= ' /ViewArea /'.$this->viewer_preferences['ViewArea'];
-		}
-		if (isset($this->viewer_preferences['ViewClip'])) {
-			$out .= ' /ViewClip /'.$this->viewer_preferences['ViewClip'];
-		}
-		if (isset($this->viewer_preferences['PrintArea'])) {
-			$out .= ' /PrintArea /'.$this->viewer_preferences['PrintArea'];
-		}
-		if (isset($this->viewer_preferences['PrintClip'])) {
-			$out .= ' /PrintClip /'.$this->viewer_preferences['PrintClip'];
-		}
-		if (isset($this->viewer_preferences['PrintScaling'])) {
-			$out .= ' /PrintScaling /'.$this->viewer_preferences['PrintScaling'];
-		}
-		if (isset($this->viewer_preferences['Duplex']) AND (!$this->empty_string($this->viewer_preferences['Duplex']))) {
-			$out .= ' /Duplex /'.$this->viewer_preferences['Duplex'];
-		}
-		if (isset($this->viewer_preferences['PickTrayByPDFSize'])) {
-			if ($this->viewer_preferences['PickTrayByPDFSize']) {
-				$out .= ' /PickTrayByPDFSize true';
-			} else {
-				$out .= ' /PickTrayByPDFSize false';
-			}
-		}
-		if (isset($this->viewer_preferences['PrintPageRange'])) {
-			$PrintPageRangeNum = '';
-			foreach ($this->viewer_preferences['PrintPageRange'] as $k => $v) {
-				$PrintPageRangeNum .= ' '.($v - 1).'';
-			}
-			$out .= ' /PrintPageRange ['.substr($PrintPageRangeNum,1).']';
-		}
-		if (isset($this->viewer_preferences['NumCopies'])) {
-			$out .= ' /NumCopies '.intval($this->viewer_preferences['NumCopies']);
-		}
-		$out .= ' >>';
-		return $out;
-	}
-
-	/**
-	 * Output PDF header.
-	 * @access protected
-	 */
-	protected function _putheader() {
-		$this->_out('%PDF-'.$this->PDFVersion);
-	}
-
-	/**
-	 * Output end of document (EOF).
-	 * @access protected
-	 */
-	protected function _enddoc() {
-		$this->state = 1;
-		$this->_putheader();
-		$this->_putpages();
-		$this->_putresources();
-		// Signature
-		if ($this->sign AND isset($this->signature_data['cert_type'])) {
-			// widget annotation for signature
-			$out = $this->_getobj($this->sig_obj_id)."\n";
-			$out .= '<< /Type /Annot';
-			$out .= ' /Subtype /Widget';
-			$out .= ' /Rect ['.$this->signature_appearance['rect'].']';
-			$out .= ' /P '.$this->page_obj_id[($this->signature_appearance['page'])].' 0 R'; // link to signature appearance page
-			$out .= ' /F 4';
-			$out .= ' /FT /Sig';
-			$out .= ' /T '.$this->_textstring('Signature', $this->sig_obj_id);
-			$out .= ' /Ff 0';
-			$out .= ' /V '.($this->sig_obj_id + 1).' 0 R';
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			// signature
-			$this->_putsignature();
-		}
-		// Info
-		$objid_info = $this->_putinfo();
-		// Catalog
-		$objid_catalog = $this->_putcatalog();
-		// Cross-ref
-		$o = $this->bufferlen;
-		// XREF section
-		$this->_out('xref');
-		$this->_out('0 '.($this->n + 1));
-		$this->_out('0000000000 65535 f ');
-		for ($i=1; $i <= $this->n; ++$i) {
-			$this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
-		}
-		// TRAILER
-		$out = 'trailer <<';
-		$out .= ' /Size '.($this->n + 1);
-		$out .= ' /Root '.$objid_catalog.' 0 R';
-		$out .= ' /Info '.$objid_info.' 0 R';
-		if ($this->encrypted) {
-			$out .= ' /Encrypt '.$this->encryptdata['objid'].' 0 R';
-		}
-		$out .= ' /ID [ <'.$this->file_id.'> <'.$this->file_id.'> ]';
-		$out .= ' >>';
-		$this->_out($out);
-		$this->_out('startxref');
-		$this->_out($o);
-		$this->_out('%%EOF');
-		$this->state = 3; // end-of-doc
-		if ($this->diskcache) {
-			// remove temporary files used for images
-			foreach ($this->imagekeys as $key) {
-				// remove temporary files
-				unlink($this->images[$key]);
-			}
-			foreach ($this->fontkeys as $key) {
-				// remove temporary files
-				unlink($this->fonts[$key]);
-			}
-		}
-	}
-
-	/**
-	 * Initialize a new page.
-	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @access protected
-	 * @see getPageSizeFromFormat(), setPageFormat()
-	 */
-	protected function _beginpage($orientation='', $format='') {
-		++$this->page;
-		$this->setPageBuffer($this->page, '');
-		// initialize array for graphics tranformation positions inside a page buffer
-		$this->transfmrk[$this->page] = array();
-		$this->state = 2;
-		if ($this->empty_string($orientation)) {
-			if (isset($this->CurOrientation)) {
-				$orientation = $this->CurOrientation;
-			} elseif ($this->fwPt > $this->fhPt) {
-				// landscape
-				$orientation = 'L';
-			} else {
-				// portrait
-				$orientation = 'P';
-			}
-		}
-		if ($this->empty_string($format)) {
-			$this->pagedim[$this->page] = $this->pagedim[($this->page - 1)];
-			$this->setPageOrientation($orientation);
-		} else {
-			$this->setPageFormat($format, $orientation);
-		}
-		if ($this->rtl) {
-			$this->x = $this->w - $this->rMargin;
-		} else {
-			$this->x = $this->lMargin;
-		}
-		$this->y = $this->tMargin;
-		if (isset($this->newpagegroup[$this->page])) {
-			// start a new group
-			$n = sizeof($this->pagegroups) + 1;
-			$alias = '{nb'.$n.'}';
-			$this->pagegroups[$alias] = 1;
-			$this->currpagegroup = $alias;
-		} elseif ($this->currpagegroup) {
-			++$this->pagegroups[$this->currpagegroup];
-		}
-	}
-
-	/**
-	 * Mark end of page.
-	 * @access protected
-	 */
-	protected function _endpage() {
-		$this->setVisibility('all');
-		$this->state = 1;
-	}
-
-	/**
-	 * Begin a new object and return the object number.
-	 * @return int object number
-	 * @access protected
-	 */
-	protected function _newobj() {
-		$this->_out($this->_getobj());
-		return $this->n;
-	}
-
-	/**
-	 * Return the starting object string for the selected object ID.
-	 * @param int $objid Object ID (leave empty to get a new ID).
-	 * @return string the starting object string
-	 * @access protected
-	 * @since 5.8.009 (2010-08-20)
-	 */
-	protected function _getobj($objid='') {
-		if ($objid === '') {
-			++$this->n;
-			$objid = $this->n;
-		}
-		$this->offsets[$objid] = $this->bufferlen;
-		return $objid.' 0 obj';
-	}
-
-	/**
-	 * Underline text.
-	 * @param int $x X coordinate
-	 * @param int $y Y coordinate
-	 * @param string $txt text to underline
-	 * @access protected
-	 */
-	protected function _dounderline($x, $y, $txt) {
-		$w = $this->GetStringWidth($txt);
-		return $this->_dounderlinew($x, $y, $w);
-	}
-
-	/**
-	 * Underline for rectangular text area.
-	 * @param int $x X coordinate
-	 * @param int $y Y coordinate
-	 * @param int $w width to underline
-	 * @access protected
-	 * @since 4.8.008 (2009-09-29)
-	 */
-	protected function _dounderlinew($x, $y, $w) {
-		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-		return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew), $w * $this->k, $linew);
-	}
-
-	/**
-	 * Line through text.
-	 * @param int $x X coordinate
-	 * @param int $y Y coordinate
-	 * @param string $txt text to linethrough
-	 * @access protected
-	 */
-	protected function _dolinethrough($x, $y, $txt) {
-		$w = $this->GetStringWidth($txt);
-		return $this->_dolinethroughw($x, $y, $w);
-	}
-
-	/**
-	 * Line through for rectangular text area.
-	 * @param int $x X coordinate
-	 * @param int $y Y coordinate
-	 * @param string $txt text to linethrough
-	 * @access protected
-	 * @since 4.9.008 (2009-09-29)
-	 */
-	protected function _dolinethroughw($x, $y, $w) {
-		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-		return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew + ($this->FontSizePt / 3)), $w * $this->k, $linew);
-	}
-
-	/**
-	 * Overline text.
-	 * @param int $x X coordinate
-	 * @param int $y Y coordinate
-	 * @param string $txt text to overline
-	 * @access protected
-	 * @since 4.9.015 (2010-04-19)
-	 */
-	protected function _dooverline($x, $y, $txt) {
-		$w = $this->GetStringWidth($txt);
-		return $this->_dooverlinew($x, $y, $w);
-	}
-
-	/**
-	 * Overline for rectangular text area.
-	 * @param int $x X coordinate
-	 * @param int $y Y coordinate
-	 * @param int $w width to overline
-	 * @access protected
-	 * @since 4.9.015 (2010-04-19)
-	 */
-	protected function _dooverlinew($x, $y, $w) {
-		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
-		return sprintf('%.2F %.2F %.2F %.2F re f', $x * $this->k, (($this->h - $y + $this->FontAscent) * $this->k) - $linew, $w * $this->k, $linew);
-
-	}
-
-	/**
-	 * Read a 4-byte (32 bit) integer from file.
-	 * @param string $f file name.
-	 * @return 4-byte integer
-	 * @access protected
-	 */
-	protected function _freadint($f) {
-		$a = unpack('Ni', fread($f, 4));
-		return $a['i'];
-	}
-
-	/**
-	 * Add "\" before "\", "(" and ")"
-	 * @param string $s string to escape.
-	 * @return string escaped string.
-	 * @access protected
-	 */
-	protected function _escape($s) {
-		// the chr(13) substitution fixes the Bugs item #1421290.
-		return strtr($s, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
-	}
-
-	/**
-	 * Format a data string for meta information
-	 * @param string $s data string to escape.
-	 * @param int $n object ID
-	 * @return string escaped string.
-	 * @access protected
-	 */
-	protected function _datastring($s, $n=0) {
-		if ($n == 0) {
-			$n = $this->n;
-		}
-		$s = $this->_encrypt_data($n, $s);
-		return '('. $this->_escape($s).')';
-	}
-
-	/**
-	 * Returns a formatted date for meta information
-	 * @param int $n object ID
-	 * @return string escaped date string.
-	 * @access protected
-	 * @since 4.6.028 (2009-08-25)
-	 */
-	protected function _datestring($n=0) {
-		$current_time = substr_replace(date('YmdHisO'), '\'', (0 - 2), 0).'\'';
-		return $this->_datastring('D:'.$current_time, $n);
-	}
-
-	/**
-	 * Format a text string for meta information
-	 * @param string $s string to escape.
-	 * @param int $n object ID
-	 * @return string escaped string.
-	 * @access protected
-	 */
-	protected function _textstring($s, $n=0) {
-		if ($this->isunicode) {
-			//Convert string to UTF-16BE
-			$s = $this->UTF8ToUTF16BE($s, true);
-		}
-		return $this->_datastring($s, $n);
-	}
-
-	/**
-	 * THIS METHOD IS DEPRECATED
-	 * Format a text string
-	 * @param string $s string to escape.
-	 * @return string escaped string.
-	 * @access protected
-	 * @deprecated
-	 */
-	protected function _escapetext($s) {
-		if ($this->isunicode) {
-			if (($this->CurrentFont['type'] == 'core') OR ($this->CurrentFont['type'] == 'TrueType') OR ($this->CurrentFont['type'] == 'Type1')) {
-				$s = $this->UTF8ToLatin1($s);
-			} else {
-				//Convert string to UTF-16BE and reverse RTL language
-				$s = $this->utf8StrRev($s, false, $this->tmprtl);
-			}
-		}
-		return $this->_escape($s);
-	}
-
-	/**
-	 * get raw output stream.
-	 * @param string $s string to output.
-	 * @param int $n object reference for encryption mode
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 5.5.000 (2010-06-22)
-	 */
-	protected function _getrawstream($s, $n=0) {
-		if ($n <= 0) {
-			// default to current object
-			$n = $this->n;
-		}
-		return $this->_encrypt_data($n, $s);
-	}
-
-	/**
-	 * Format output stream (DEPRECATED).
-	 * @param string $s string to output.
-	 * @param int $n object reference for encryption mode
-	 * @access protected
-	 * @deprecated
-	 */
-	protected function _getstream($s, $n=0) {
-		return 'stream'."\n".$this->_getrawstream($s, $n)."\n".'endstream';
-	}
-
-	/**
-	 * Output a stream (DEPRECATED).
-	 * @param string $s string to output.
-	 * @param int $n object reference for encryption mode
-	 * @access protected
-	 * @deprecated
-	 */
-	protected function _putstream($s, $n=0) {
-		$this->_out($this->_getstream($s, $n));
-	}
-
-	/**
-	 * Output a string to the document.
-	 * @param string $s string to output.
-	 * @access protected
-	 */
-	protected function _out($s) {
-		if ($this->state == 2) {
-			if ($this->inxobj) {
-				// we are inside an XObject template
-				$this->xobjects[$this->xobjid]['outdata'] .= $s."\n";
-			} elseif ((!$this->InFooter) AND isset($this->footerlen[$this->page]) AND ($this->footerlen[$this->page] > 0)) {
-				// puts data before page footer
-				$pagebuff = $this->getPageBuffer($this->page);
-				$page = substr($pagebuff, 0, -$this->footerlen[$this->page]);
-				$footer = substr($pagebuff, -$this->footerlen[$this->page]);
-				$this->setPageBuffer($this->page, $page.$s."\n".$footer);
-				// update footer position
-				$this->footerpos[$this->page] += strlen($s."\n");
-			} else {
-				$this->setPageBuffer($this->page, $s."\n", true);
-			}
-		} else {
-			$this->setBuffer($s."\n");
-		}
-	}
-
-	/**
-	 * Converts UTF-8 strings to codepoints array.<br>
-	 * Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
-	 * Based on: http://www.faqs.org/rfcs/rfc3629.html
-	 * <pre>
-	 *    Char. number range  |        UTF-8 octet sequence
-	 *       (hexadecimal)    |              (binary)
-	 *    --------------------+-----------------------------------------------
-	 *    0000 0000-0000 007F | 0xxxxxxx
-	 *    0000 0080-0000 07FF | 110xxxxx 10xxxxxx
-	 *    0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-	 *    0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-	 *    ---------------------------------------------------------------------
-	 *
-	 *   ABFN notation:
-	 *   ---------------------------------------------------------------------
-	 *   UTF8-octets = *( UTF8-char )
-	 *   UTF8-char   = UTF8-1 / UTF8-2 / UTF8-3 / UTF8-4
-	 *   UTF8-1      = %x00-7F
-	 *   UTF8-2      = %xC2-DF UTF8-tail
-	 *
-	 *   UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
-	 *                 %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
-	 *   UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
-	 *                 %xF4 %x80-8F 2( UTF8-tail )
-	 *   UTF8-tail   = %x80-BF
-	 *   ---------------------------------------------------------------------
-	 * </pre>
-	 * @param string $str string to process.
-	 * @return array containing codepoints (UTF-8 characters values)
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 1.53.0.TC005 (2005-01-05)
-	 */
-	protected function UTF8StringToArray($str) {
-		// build a unique string key
-		$strkey = md5($str);
-		if (isset($this->cache_UTF8StringToArray[$strkey])) {
-			// return cached value
-			$chrarray = $this->cache_UTF8StringToArray[$strkey]['s'];
-			if (!isset($this->cache_UTF8StringToArray[$strkey]['f'][$this->CurrentFont['fontkey']])) {
-				if ($this->isunicode) {
-					foreach ($chrarray as $chr) {
-						// store this char for font subsetting
-						$this->CurrentFont['subsetchars'][$chr] = true;
-					}
-					// update font subsetchars
-					$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
-				}
-				$this->cache_UTF8StringToArray[$strkey]['f'][$this->CurrentFont['fontkey']] = true;
-			}
-			return $chrarray;
-		}
-		// check cache size
-		if ($this->cache_size_UTF8StringToArray >= $this->cache_maxsize_UTF8StringToArray) {
-			// remove first element
-			array_shift($this->cache_UTF8StringToArray);
-		}
-		// new cache array for selected string
-		$this->cache_UTF8StringToArray[$strkey] = array('s' => array(), 'f' => array());
-		++$this->cache_size_UTF8StringToArray;
-		if (!$this->isunicode) {
-			// split string into array of equivalent codes
-			$strarr = array();
-			$strlen = strlen($str);
-			for ($i=0; $i < $strlen; ++$i) {
-				$strarr[] = ord($str{$i});
-			}
-			// insert new value on cache
-			$this->cache_UTF8StringToArray[$strkey]['s'] = $strarr;
-			$this->cache_UTF8StringToArray[$strkey]['f'][$this->CurrentFont['fontkey']] = true;
-			return $strarr;
-		}
-		$unichar = -1; // last unicode char
-		$unicode = array(); // array containing unicode values
-		$bytes  = array(); // array containing single character byte sequences
-		$numbytes = 1; // number of octetc needed to represent the UTF-8 character
-		$str .= ''; // force $str to be a string
-		$length = strlen($str);
-		for ($i = 0; $i < $length; ++$i) {
-			$char = ord($str{$i}); // get one string character at time
-			if (count($bytes) == 0) { // get starting octect
-				if ($char <= 0x7F) {
-					$unichar = $char; // use the character "as is" because is ASCII
-					$numbytes = 1;
-				} elseif (($char >> 0x05) == 0x06) { // 2 bytes character (0x06 = 110 BIN)
-					$bytes[] = ($char - 0xC0) << 0x06;
-					$numbytes = 2;
-				} elseif (($char >> 0x04) == 0x0E) { // 3 bytes character (0x0E = 1110 BIN)
-					$bytes[] = ($char - 0xE0) << 0x0C;
-					$numbytes = 3;
-				} elseif (($char >> 0x03) == 0x1E) { // 4 bytes character (0x1E = 11110 BIN)
-					$bytes[] = ($char - 0xF0) << 0x12;
-					$numbytes = 4;
-				} else {
-					// use replacement character for other invalid sequences
-					$unichar = 0xFFFD;
-					$bytes = array();
-					$numbytes = 1;
-				}
-			} elseif (($char >> 0x06) == 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN
-				$bytes[] = $char - 0x80;
-				if (count($bytes) == $numbytes) {
-					// compose UTF-8 bytes to a single unicode value
-					$char = $bytes[0];
-					for ($j = 1; $j < $numbytes; ++$j) {
-						$char += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
-					}
-					if ((($char >= 0xD800) AND ($char <= 0xDFFF)) OR ($char >= 0x10FFFF)) {
-						/* The definition of UTF-8 prohibits encoding character numbers between
-						U+D800 and U+DFFF, which are reserved for use with the UTF-16
-						encoding form (as surrogate pairs) and do not directly represent
-						characters. */
-						$unichar = 0xFFFD; // use replacement character
-					} else {
-						$unichar = $char; // add char to array
-					}
-					// reset data for next char
-					$bytes = array();
-					$numbytes = 1;
-				}
-			} else {
-				// use replacement character for other invalid sequences
-				$unichar = 0xFFFD;
-				$bytes = array();
-				$numbytes = 1;
-			}
-			if ($unichar >= 0) {
-				// insert unicode value into array
-				$unicode[] = $unichar;
-				// store this char for font subsetting
-				$this->CurrentFont['subsetchars'][$unichar] = true;
-				$unichar = -1;
-			}
-		}
-		// update font subsetchars
-		$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
-		// insert new value on cache
-		$this->cache_UTF8StringToArray[$strkey]['s'] = $unicode;
-		$this->cache_UTF8StringToArray[$strkey]['f'][$this->CurrentFont['fontkey']] = true;
-		return $unicode;
-	}
-
-	/**
-	 * Converts UTF-8 strings to UTF16-BE.<br>
-	 * @param string $str string to process.
-	 * @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @return string
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 1.53.0.TC005 (2005-01-05)
-	 * @uses UTF8StringToArray(), arrUTF8ToUTF16BE()
-	 */
-	protected function UTF8ToUTF16BE($str, $setbom=true) {
-		if (!$this->isunicode) {
-			return $str; // string is not in unicode
-		}
-		$unicode = $this->UTF8StringToArray($str); // array containing UTF-8 unicode values
-		return $this->arrUTF8ToUTF16BE($unicode, $setbom);
-	}
-
-	/**
-	 * Converts UTF-8 strings to Latin1 when using the standard 14 core fonts.<br>
-	 * @param string $str string to process.
-	 * @return string
-	 * @author Andrew Whitehead, Nicola Asuni
-	 * @access protected
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	protected function UTF8ToLatin1($str) {
-		if (!$this->isunicode) {
-			return $str; // string is not in unicode
-		}
-		$outstr = ''; // string to be returned
-		$unicode = $this->UTF8StringToArray($str); // array containing UTF-8 unicode values
-		foreach ($unicode as $char) {
-			if ($char < 256) {
-				$outstr .= chr($char);
-			} elseif (array_key_exists($char, $this->unicode->uni_utf8tolatin)) {
-				// map from UTF-8
-				$outstr .= chr($this->unicode->uni_utf8tolatin[$char]);
-			} elseif ($char == 0xFFFD) {
-				// skip
-			} else {
-				$outstr .= '?';
-			}
-		}
-		return $outstr;
-	}
-
-	/**
-	 * Converts UTF-8 characters array to array of Latin1 characters<br>
-	 * @param array $unicode array containing UTF-8 unicode values
-	 * @return array
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 4.8.023 (2010-01-15)
-	 */
-	protected function UTF8ArrToLatin1($unicode) {
-		if ((!$this->isunicode) OR $this->isUnicodeFont()) {
-			return $unicode;
-		}
-		$outarr = array(); // array to be returned
-		foreach ($unicode as $char) {
-			if ($char < 256) {
-				$outarr[] = $char;
-			} elseif (array_key_exists($char, $this->unicode->uni_utf8tolatin)) {
-				// map from UTF-8
-				$outarr[] = $this->unicode->uni_utf8tolatin[$char];
-			} elseif ($char == 0xFFFD) {
-				// skip
-			} else {
-				$outarr[] = 63; // '?' character
-			}
-		}
-		return $outarr;
-	}
-
-	/**
-	 * Converts array of UTF-8 characters to UTF16-BE string.<br>
-	 * Based on: http://www.faqs.org/rfcs/rfc2781.html
- 	 * <pre>
-	 *   Encoding UTF-16:
-	 *
-	 *   Encoding of a single character from an ISO 10646 character value to
-	 *    UTF-16 proceeds as follows. Let U be the character number, no greater
-	 *    than 0x10FFFF.
-	 *
-	 *    1) If U < 0x10000, encode U as a 16-bit unsigned integer and
-	 *       terminate.
-	 *
-	 *    2) Let U' = U - 0x10000. Because U is less than or equal to 0x10FFFF,
-	 *       U' must be less than or equal to 0xFFFFF. That is, U' can be
-	 *       represented in 20 bits.
-	 *
-	 *    3) Initialize two 16-bit unsigned integers, W1 and W2, to 0xD800 and
-	 *       0xDC00, respectively. These integers each have 10 bits free to
-	 *       encode the character value, for a total of 20 bits.
-	 *
-	 *    4) Assign the 10 high-order bits of the 20-bit U' to the 10 low-order
-	 *       bits of W1 and the 10 low-order bits of U' to the 10 low-order
-	 *       bits of W2. Terminate.
-	 *
-	 *    Graphically, steps 2 through 4 look like:
-	 *    U' = yyyyyyyyyyxxxxxxxxxx
-	 *    W1 = 110110yyyyyyyyyy
-	 *    W2 = 110111xxxxxxxxxx
-	 * </pre>
-	 * @param array $unicode array containing UTF-8 unicode values
-	 * @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @return string
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 2.1.000 (2008-01-08)
-	 * @see UTF8ToUTF16BE()
-	 */
-	protected function arrUTF8ToUTF16BE($unicode, $setbom=true) {
-		$outstr = ''; // string to be returned
-		if ($setbom) {
-			$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
-		}
-		foreach ($unicode as $char) {
-			if ($char == 0x200b) {
-				// skip Unicode Character 'ZERO WIDTH SPACE' (DEC:8203, U+200B)
-			} elseif ($char == 0xFFFD) {
-				$outstr .= "\xFF\xFD"; // replacement character
-			} elseif ($char < 0x10000) {
-				$outstr .= chr($char >> 0x08);
-				$outstr .= chr($char & 0xFF);
-			} else {
-				$char -= 0x10000;
-				$w1 = 0xD800 | ($char >> 0x10);
-				$w2 = 0xDC00 | ($char & 0x3FF);
-				$outstr .= chr($w1 >> 0x08);
-				$outstr .= chr($w1 & 0xFF);
-				$outstr .= chr($w2 >> 0x08);
-				$outstr .= chr($w2 & 0xFF);
-			}
-		}
-		return $outstr;
-	}
-	// ====================================================
-
-	/**
- 	 * Set header font.
-	 * @param array $font font
-	 * @access public
-	 * @since 1.1
-	 */
-	public function setHeaderFont($font) {
-		$this->header_font = $font;
-	}
-
-	/**
- 	 * Get header font.
- 	 * @return array()
-	 * @access public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getHeaderFont() {
-		return $this->header_font;
-	}
-
-	/**
- 	 * Set footer font.
-	 * @param array $font font
-	 * @access public
-	 * @since 1.1
-	 */
-	public function setFooterFont($font) {
-		$this->footer_font = $font;
-	}
-
-	/**
- 	 * Get Footer font.
- 	 * @return array()
-	 * @access public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getFooterFont() {
-		return $this->footer_font;
-	}
-
-	/**
- 	 * Set language array.
-	 * @param array $language
-	 * @access public
-	 * @since 1.1
-	 */
-	public function setLanguageArray($language) {
-		$this->l = $language;
-		if (isset($this->l['a_meta_dir'])) {
-			$this->rtl = $this->l['a_meta_dir']=='rtl' ? true : false;
-		} else {
-			$this->rtl = false;
-		}
-	}
-
-	/**
-	 * Returns the PDF data.
-	 * @access public
-	 */
-	public function getPDFData() {
-		if ($this->state < 3) {
-			$this->Close();
-		}
-		return $this->buffer;
-	}
-
-	/**
-	 * Output anchor link.
-	 * @param string $url link URL or internal link (i.e.: &lt;a href="#23,4.5"&gt;link to page 23 at 4.5 Y position&lt;/a&gt;)
-	 * @param string $name link name
-	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param boolean $firstline if true prints only the first line and return the remaining string.
-	 * @param array $color array of RGB text color
-	 * @param string $style font style (U, D, B, I)
-	 * @param boolean $firstblock if true the string is the starting of a line.
-	 * @return the number of cells used or the remaining text if $firstline = true;
-	 * @access public
-	 */
-	public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
-		if (!$this->empty_string($url) AND ($url{0} == '#')) {
-			// convert url to internal link
-			$lnkdata = explode(',', $url);
-			if (isset($lnkdata[0])) {
-				$page = intval(substr($lnkdata[0], 1));
-				if (empty($page) OR ($page <= 0)) {
-					$page = $this->page;
-				}
-				if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
-					$lnky = floatval($lnkdata[1]);
-				} else {
-					$lnky = 0;
-				}
-				$url = $this->AddLink();
-				$this->SetLink($url, $lnky, $page);
-			}
-		}
-		// store current settings
-		$prevcolor = $this->fgcolor;
-		$prevstyle = $this->FontStyle;
-		if (empty($color)) {
-			$this->SetTextColorArray($this->htmlLinkColorArray);
-		} else {
-			$this->SetTextColorArray($color);
-		}
-		if ($style == -1) {
-			$this->SetFont('', $this->FontStyle.$this->htmlLinkFontStyle);
-		} else {
-			$this->SetFont('', $this->FontStyle.$style);
-		}
-		$ret = $this->Write($this->lasth, $name, $url, $fill, '', false, 0, $firstline, $firstblock, 0);
-		// restore settings
-		$this->SetFont('', $prevstyle);
-		$this->SetTextColorArray($prevcolor);
-		return $ret;
-	}
-
-	/**
-	 * Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).
-	 * @param string $color html color
-	 * @return array RGB color or false in case of error.
-	 * @access public
-	 */
-	public function convertHTMLColorToDec($color='#FFFFFF') {
-		$returncolor = false;
-		$color = preg_replace('/[\s]*/', '', $color); // remove extra spaces
-		$color = strtolower($color);
-		if (($dotpos = strpos($color, '.')) !== false) {
-			// remove class parent (i.e.: color.red)
-			$color = substr($color, ($dotpos + 1));
-		}
-		if (strlen($color) == 0) {
-			return false;
-		}
-		// RGB ARRAY
-		if (substr($color, 0, 3) == 'rgb') {
-			$codes = substr($color, 4);
-			$codes = str_replace(')', '', $codes);
-			$returncolor = explode(',', $codes);
-			return $returncolor;
-		}
-		// CMYK ARRAY
-		if (substr($color, 0, 4) == 'cmyk') {
-			$codes = substr($color, 5);
-			$codes = str_replace(')', '', $codes);
-			$returncolor = explode(',', $codes);
-			return $returncolor;
-		}
-		// COLOR NAME
-		if (substr($color, 0, 1) != '#') {
-			// decode color name
-			if (isset($this->webcolor[$color])) {
-				$color_code = $this->webcolor[$color];
-			} else {
-				return false;
-			}
-		} else {
-			$color_code = substr($color, 1);
-		}
-		// RGB VALUE
-		switch (strlen($color_code)) {
-			case 3: {
-				// three-digit hexadecimal representation
-				$r = substr($color_code, 0, 1);
-				$g = substr($color_code, 1, 1);
-				$b = substr($color_code, 2, 1);
-				$returncolor['R'] = hexdec($r.$r);
-				$returncolor['G'] = hexdec($g.$g);
-				$returncolor['B'] = hexdec($b.$b);
-				break;
-			}
-			case 6: {
-				// six-digit hexadecimal representation
-				$returncolor['R'] = hexdec(substr($color_code, 0, 2));
-				$returncolor['G'] = hexdec(substr($color_code, 2, 2));
-				$returncolor['B'] = hexdec(substr($color_code, 4, 2));
-				break;
-			}
-		}
-		return $returncolor;
-	}
-
-	/**
-	 * Converts pixels to User's Units.
-	 * @param int $px pixels
-	 * @return float value in user's unit
-	 * @access public
-	 * @see setImageScale(), getImageScale()
-	 */
-	public function pixelsToUnits($px) {
-		return ($px / ($this->imgscale * $this->k));
-	}
-
-	/**
-	 * Reverse function for htmlentities.
-	 * Convert entities in UTF-8.
-	 * @param string $text_to_convert Text to convert.
-	 * @return string converted text string
-	 * @access public
-	 */
-	public function unhtmlentities($text_to_convert) {
-		return html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
-	}
-
-	// ENCRYPTION METHODS ----------------------------------
-
-	/**
-	 * Returns a string containing random data to be used as a seed for encryption methods.
-	 * @param string $seed starting seed value
-	 * @return string containing random data
-	 * @author Nicola Asuni
-	 * @since 5.9.006 (2010-10-19)
-	 * @access protected
-	 */
-	protected function getRandomSeed($seed='') {
-		$seed .= microtime();
-		if (function_exists('openssl_random_pseudo_bytes')) {
-			$seed .= openssl_random_pseudo_bytes(512);
-		}
-		$seed .= uniqid('', true);
-		$seed .= rand();
-		$seed .= getmypid();
-		$seed .= __FILE__;
-		$seed .= $this->bufferlen;
-		if (isset($_SERVER['REMOTE_ADDR'])) {
-			$seed .= $_SERVER['REMOTE_ADDR'];
-		}
-		if (isset($_SERVER['HTTP_USER_AGENT'])) {
-			$seed .= $_SERVER['HTTP_USER_AGENT'];
-		}
-		if (isset($_SERVER['HTTP_ACCEPT'])) {
-			$seed .= $_SERVER['HTTP_ACCEPT'];
-		}
-		if (isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
-			$seed .= $_SERVER['HTTP_ACCEPT_ENCODING'];
-		}
-		if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-			$seed .= $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-		}
-		if (isset($_SERVER['HTTP_ACCEPT_CHARSET'])) {
-			$seed .= $_SERVER['HTTP_ACCEPT_CHARSET'];
-		}
-		$seed .= rand();
-		$seed .= uniqid('', true);
-		$seed .= microtime();
-		return $seed;
-	}
-
-	/**
-	 * Compute encryption key depending on object number where the encrypted data is stored.
-	 * This is used for all strings and streams without crypt filter specifier.
-	 * @param int $n object number
-	 * @return int object key
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected function _objectkey($n) {
-		$objkey = $this->encryptdata['key'].pack('VXxx', $n);
-		if ($this->encryptdata['mode'] == 2) { // AES-128
-			// AES padding
-			$objkey .= "\x73\x41\x6C\x54"; // sAlT
-		}
-		$objkey = substr($this->_md5_16($objkey), 0, (($this->encryptdata['Length'] / 8) + 5));
-		$objkey = substr($objkey, 0, 16);
-		return $objkey;
-	}
-
-	/**
-	 * Encrypt the input string.
-	 * @param int $n object number
-	 * @param string $s data string to encrypt
-	 * @return encrypted string
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 5.0.005 (2010-05-11)
-	 */
-	protected function _encrypt_data($n, $s) {
-		if (!$this->encrypted) {
-			return $s;
-		}
-		switch ($this->encryptdata['mode']) {
-			case 0:   // RC4-40
-			case 1: { // RC4-128
-				$s = $this->_RC4($this->_objectkey($n), $s);
-				break;
-			}
-			case 2: { // AES-128
-				$s = $this->_AES($this->_objectkey($n), $s);
-				break;
-			}
-			case 3: { // AES-256
-				$s = $this->_AES($this->encryptdata['key'], $s);
-				break;
-			}
-		}
-		return $s;
-	}
-
-	/**
-	 * Put encryption on PDF document.
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 2.0.000 (2008-01-02)
-	 */
-	protected function _putencryption() {
-		if (!$this->encrypted) {
-			return;
-		}
-		$this->encryptdata['objid'] = $this->_newobj();
-		$out = '<<';
-		if (!isset($this->encryptdata['Filter']) OR empty($this->encryptdata['Filter'])) {
-			$this->encryptdata['Filter'] = 'Standard';
-		}
-		$out .= ' /Filter /'.$this->encryptdata['Filter'];
-		if (isset($this->encryptdata['SubFilter']) AND !empty($this->encryptdata['SubFilter'])) {
-			$out .= ' /SubFilter /'.$this->encryptdata['SubFilter'];
-		}
-		if (!isset($this->encryptdata['V']) OR empty($this->encryptdata['V'])) {
-			$this->encryptdata['V'] = 1;
-		}
-		// V is a code specifying the algorithm to be used in encrypting and decrypting the document
-		$out .= ' /V '.$this->encryptdata['V'];
-		if (isset($this->encryptdata['Length']) AND !empty($this->encryptdata['Length'])) {
-			// The length of the encryption key, in bits. The value shall be a multiple of 8, in the range 40 to 256
-			$out .= ' /Length '.$this->encryptdata['Length'];
-		} else {
-			$out .= ' /Length 40';
-		}
-		if ($this->encryptdata['V'] >= 4) {
-			if (!isset($this->encryptdata['StmF']) OR empty($this->encryptdata['StmF'])) {
-				$this->encryptdata['StmF'] = 'Identity';
-			}
-			if (!isset($this->encryptdata['StrF']) OR empty($this->encryptdata['StrF'])) {
-				// The name of the crypt filter that shall be used when decrypting all strings in the document.
-				$this->encryptdata['StrF'] = 'Identity';
-			}
-			// A dictionary whose keys shall be crypt filter names and whose values shall be the corresponding crypt filter dictionaries.
-			if (isset($this->encryptdata['CF']) AND !empty($this->encryptdata['CF'])) {
-				$out .= ' /CF <<';
-				$out .= ' /'.$this->encryptdata['StmF'].' <<';
-				$out .= ' /Type /CryptFilter';
-				if (isset($this->encryptdata['CF']['CFM']) AND !empty($this->encryptdata['CF']['CFM'])) {
-					// The method used
-					$out .= ' /CFM /'.$this->encryptdata['CF']['CFM'];
-					if ($this->encryptdata['pubkey']) {
-						$out .= ' /Recipients [';
-						foreach ($this->encryptdata['Recipients'] as $rec) {
-							$out .= ' <'.$rec.'>';
-						}
-						$out .= ' ]';
-						if (isset($this->encryptdata['CF']['EncryptMetadata']) AND (!$this->encryptdata['CF']['EncryptMetadata'])) {
-							$out .= ' /EncryptMetadata false';
-						} else {
-							$out .= ' /EncryptMetadata true';
-						}
-					}
-				} else {
-					$out .= ' /CFM /None';
-				}
-				if (isset($this->encryptdata['CF']['AuthEvent']) AND !empty($this->encryptdata['CF']['AuthEvent'])) {
-					// The event to be used to trigger the authorization that is required to access encryption keys used by this filter.
-					$out .= ' /AuthEvent /'.$this->encryptdata['CF']['AuthEvent'];
-				} else {
-					$out .= ' /AuthEvent /DocOpen';
-				}
-				if (isset($this->encryptdata['CF']['Length']) AND !empty($this->encryptdata['CF']['Length'])) {
-					// The bit length of the encryption key.
-					$out .= ' /Length '.$this->encryptdata['CF']['Length'];
-				}
-				$out .= ' >> >>';
-			}
-			// The name of the crypt filter that shall be used by default when decrypting streams.
-			$out .= ' /StmF /'.$this->encryptdata['StmF'];
-			// The name of the crypt filter that shall be used when decrypting all strings in the document.
-			$out .= ' /StrF /'.$this->encryptdata['StrF'];
-			if (isset($this->encryptdata['EFF']) AND !empty($this->encryptdata['EFF'])) {
-				// The name of the crypt filter that shall be used when encrypting embedded file streams that do not have their own crypt filter specifier.
-				$out .= ' /EFF /'.$this->encryptdata[''];
-			}
-		}
-		// Additional encryption dictionary entries for the standard security handler
-		if ($this->encryptdata['pubkey']) {
-			if (($this->encryptdata['V'] < 4) AND isset($this->encryptdata['Recipients']) AND !empty($this->encryptdata['Recipients'])) {
-				$out .= ' /Recipients [';
-				foreach ($this->encryptdata['Recipients'] as $rec) {
-					$out .= ' <'.$rec.'>';
-				}
-				$out .= ' ]';
-			}
-		} else {
-			$out .= ' /R';
-			if ($this->encryptdata['V'] == 5) { // AES-256
-				$out .= ' 5';
-				$out .= ' /OE ('.$this->_escape($this->encryptdata['OE']).')';
-				$out .= ' /UE ('.$this->_escape($this->encryptdata['UE']).')';
-				$out .= ' /Perms ('.$this->_escape($this->encryptdata['perms']).')';
-			} elseif ($this->encryptdata['V'] == 4) { // AES-128
-				$out .= ' 4';
-			} elseif ($this->encryptdata['V'] < 2) { // RC-40
-				$out .= ' 2';
-			} else { // RC-128
-				$out .= ' 3';
-			}
-			$out .= ' /O ('.$this->_escape($this->encryptdata['O']).')';
-			$out .= ' /U ('.$this->_escape($this->encryptdata['U']).')';
-			$out .= ' /P '.$this->encryptdata['P'];
-			if (isset($this->encryptdata['EncryptMetadata']) AND (!$this->encryptdata['EncryptMetadata'])) {
-				$out .= ' /EncryptMetadata false';
-			} else {
-				$out .= ' /EncryptMetadata true';
-			}
-		}
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Returns the input text encrypted using RC4 algorithm and the specified key.
-	 * RC4 is the standard encryption algorithm used in PDF format
-	 * @param string $key encryption key
-	 * @param String $text input text to be encrypted
-	 * @return String encrypted text
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Klemen Vodopivec, Nicola Asuni
-	 */
-	protected function _RC4($key, $text) {
-		if (function_exists('mcrypt_decrypt') AND ($out = @mcrypt_decrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
-			// try to use mcrypt function if exist
-			return $out;
-		}
-		if ($this->last_enc_key != $key) {
-			$k = str_repeat($key, ((256 / strlen($key)) + 1));
-			$rc4 = range(0, 255);
-			$j = 0;
-			for ($i = 0; $i < 256; ++$i) {
-				$t = $rc4[$i];
-				$j = ($j + $t + ord($k{$i})) % 256;
-				$rc4[$i] = $rc4[$j];
-				$rc4[$j] = $t;
-			}
-			$this->last_enc_key = $key;
-			$this->last_enc_key_c = $rc4;
-		} else {
-			$rc4 = $this->last_enc_key_c;
-		}
-		$len = strlen($text);
-		$a = 0;
-		$b = 0;
-		$out = '';
-		for ($i = 0; $i < $len; ++$i) {
-			$a = ($a + 1) % 256;
-			$t = $rc4[$a];
-			$b = ($b + $t) % 256;
-			$rc4[$a] = $rc4[$b];
-			$rc4[$b] = $t;
-			$k = $rc4[($rc4[$a] + $rc4[$b]) % 256];
-			$out .= chr(ord($text{$i}) ^ $k);
-		}
-		return $out;
-	}
-
-	/**
-	 * Returns the input text exrypted using AES algorithm and the specified key.
-	 * This method requires mcrypt.
-	 * @param string $key encryption key
-	 * @param String $text input text to be encrypted
-	 * @return String encrypted text
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 5.0.005 (2010-05-11)
-	 */
-	protected function _AES($key, $text) {
-		// padding (RFC 2898, PKCS #5: Password-Based Cryptography Specification Version 2.0)
-		$padding = 16 - (strlen($text) % 16);
-		$text .= str_repeat(chr($padding), $padding);
-		$iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC), MCRYPT_RAND);
-		$text = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $text, MCRYPT_MODE_CBC, $iv);
-		$text = $iv.$text;
-		return $text;
-	}
-
-	/**
-	 * Encrypts a string using MD5 and returns it's value as a binary string.
-	 * @param string $str input string
-	 * @return String MD5 encrypted binary string
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Klemen Vodopivec
-	 */
-	protected function _md5_16($str) {
-		return pack('H*', md5($str));
-	}
-
-	/**
-	 * Compute U value (used for encryption)
-	 * @return string U value
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	protected function _Uvalue() {
-		if ($this->encryptdata['mode'] == 0) { // RC4-40
-			return $this->_RC4($this->encryptdata['key'], $this->enc_padding);
-		} elseif ($this->encryptdata['mode'] < 3) { // RC4-128, AES-128
-			$tmp = $this->_md5_16($this->enc_padding.$this->encryptdata['fileid']);
-			$enc = $this->_RC4($this->encryptdata['key'], $tmp);
-			$len = strlen($tmp);
-			for ($i = 1; $i <= 19; ++$i) {
-				$ek = '';
-				for ($j = 0; $j < $len; ++$j) {
-					$ek .= chr(ord($this->encryptdata['key']{$j}) ^ $i);
-				}
-				$enc = $this->_RC4($ek, $enc);
-			}
-			$enc .= str_repeat("\x00", 16);
-			return substr($enc, 0, 32);
-		} elseif ($this->encryptdata['mode'] == 3) { // AES-256
-			$seed = $this->_md5_16($this->getRandomSeed());
-			// User Validation Salt
-			$this->encryptdata['UVS'] = substr($seed, 0, 8);
-			// User Key Salt
-			$this->encryptdata['UKS'] = substr($seed, 8, 16);
-			return hash('sha256', $this->encryptdata['user_password'].$this->encryptdata['UVS'], true).$this->encryptdata['UVS'].$this->encryptdata['UKS'];
-		}
-	}
-
-	/**
-	 * Compute UE value (used for encryption)
-	 * @return string UE value
-	 * @access protected
-	 * @since 5.9.006 (2010-10-19)
-	 * @author Nicola Asuni
-	 */
-	protected function _UEvalue() {
-		$hashkey = hash('sha256', $this->encryptdata['user_password'].$this->encryptdata['UKS'], true);
-		$iv = str_repeat("\x00", mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
-		return mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $hashkey, $this->encryptdata['key'], MCRYPT_MODE_CBC, $iv);
-	}
-
-	/**
-	 * Compute O value (used for encryption)
-	 * @return string O value
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	protected function _Ovalue() {
-		if ($this->encryptdata['mode'] < 3) { // RC4-40, RC4-128, AES-128
-			$tmp = $this->_md5_16($this->encryptdata['owner_password']);
-			if ($this->encryptdata['mode'] > 0) {
-				for ($i = 0; $i < 50; ++$i) {
-					$tmp = $this->_md5_16($tmp);
-				}
-			}
-			$owner_key = substr($tmp, 0, ($this->encryptdata['Length'] / 8));
-			$enc = $this->_RC4($owner_key, $this->encryptdata['user_password']);
-			if ($this->encryptdata['mode'] > 0) {
-				$len = strlen($owner_key);
-				for ($i = 1; $i <= 19; ++$i) {
-					$ek = '';
-					for ($j = 0; $j < $len; ++$j) {
-						$ek .= chr(ord($owner_key{$j}) ^ $i);
-					}
-					$enc = $this->_RC4($ek, $enc);
-				}
-			}
-			return $enc;
-		} elseif ($this->encryptdata['mode'] == 3) { // AES-256
-			$seed = $this->_md5_16($this->getRandomSeed());
-			// Owner Validation Salt
-			$this->encryptdata['OVS'] = substr($seed, 0, 8);
-			// Owner Key Salt
-			$this->encryptdata['OKS'] = substr($seed, 8, 16);
-			return hash('sha256', $this->encryptdata['owner_password'].$this->encryptdata['OVS'].$this->encryptdata['U'], true).$this->encryptdata['OVS'].$this->encryptdata['OKS'];
-		}
-	}
-
-	/**
-	 * Compute OE value (used for encryption)
-	 * @return string OE value
-	 * @access protected
-	 * @since 5.9.006 (2010-10-19)
-	 * @author Nicola Asuni
-	 */
-	protected function _OEvalue() {
-		$hashkey = hash('sha256', $this->encryptdata['owner_password'].$this->encryptdata['OKS'].$this->encryptdata['U'], true);
-		$iv = str_repeat("\x00", mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
-		return mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $hashkey, $this->encryptdata['key'], MCRYPT_MODE_CBC, $iv);
-	}
-
-	/**
-	 * Convert password for AES-256 encryption mode
-	 * @return string password
-	 * @access protected
-	 * @since 5.9.006 (2010-10-19)
-	 * @author Nicola Asuni
-	 */
-	protected function _fixAES256Password($password) {
-		$psw = ''; // password to be returned
-		$psw_array = $this->utf8Bidi($this->UTF8StringToArray($password), $password, $this->rtl);
-		foreach ($psw_array as $c) {
-			$psw .= $this->unichr($c);
-		}
-		return substr($psw, 0, 127);
-	}
-
-	/**
-	 * Compute encryption key
-	 * @access protected
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	protected function _generateencryptionkey() {
-		$keybytelen = ($this->encryptdata['Length'] / 8);
-		if (!$this->encryptdata['pubkey']) { // standard mode
-			if ($this->encryptdata['mode'] == 3) { // AES-256
-				// generate 256 bit random key
-				$this->encryptdata['key'] = substr(hash('sha256', $this->getRandomSeed(), true), 0, $keybytelen);
-				// truncate passwords
-				$this->encryptdata['user_password'] = $this->_fixAES256Password($this->encryptdata['user_password']);
-				$this->encryptdata['owner_password'] = $this->_fixAES256Password($this->encryptdata['owner_password']);
-				// Compute U value
-				$this->encryptdata['U'] = $this->_Uvalue();
-				// Compute UE value
-				$this->encryptdata['UE'] = $this->_UEvalue();
-				// Compute O value
-				$this->encryptdata['O'] = $this->_Ovalue();
-				// Compute OE value
-				$this->encryptdata['OE'] = $this->_OEvalue();
-				// Compute P value
-				$this->encryptdata['P'] = $this->encryptdata['protection'];
-				// Computing the encryption dictionary's Perms (permissions) value
-				$perms = $this->getEncPermissionsString($this->encryptdata['protection']); // bytes 0-3
-				$perms .= chr(255).chr(255).chr(255).chr(255); // bytes 4-7
-				if (isset($this->encryptdata['CF']['EncryptMetadata']) AND (!$this->encryptdata['CF']['EncryptMetadata'])) { // byte 8
-					$perms .= 'F';
-				} else {
-					$perms .= 'T';
-				}
-				$perms .= 'adb'; // bytes 9-11
-				$perms .= 'nick'; // bytes 12-15
-				$iv = str_repeat("\x00", mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB));
-				$this->encryptdata['perms'] = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $this->encryptdata['key'], $perms, MCRYPT_MODE_ECB, $iv);
-			} else { // RC4-40, RC4-128, AES-128
-				// Pad passwords
-				$this->encryptdata['user_password'] = substr($this->encryptdata['user_password'].$this->enc_padding, 0, 32);
-				$this->encryptdata['owner_password'] = substr($this->encryptdata['owner_password'].$this->enc_padding, 0, 32);
-				// Compute O value
-				$this->encryptdata['O'] = $this->_Ovalue();
-				// get default permissions (reverse byte order)
-				$permissions = $this->getEncPermissionsString($this->encryptdata['protection']);
-				// Compute encryption key
-				$tmp = $this->_md5_16($this->encryptdata['user_password'].$this->encryptdata['O'].$permissions.$this->encryptdata['fileid']);
-				if ($this->encryptdata['mode'] > 0) {
-					for ($i = 0; $i < 50; ++$i) {
-						$tmp = $this->_md5_16(substr($tmp, 0, $keybytelen));
-					}
-				}
-				$this->encryptdata['key'] = substr($tmp, 0, $keybytelen);
-				// Compute U value
-				$this->encryptdata['U'] = $this->_Uvalue();
-				// Compute P value
-				$this->encryptdata['P'] = $this->encryptdata['protection'];
-			}
-		} else { // Public-Key mode
-			// random 20-byte seed
-			$seed = sha1($this->getRandomSeed(), true);
-			$recipient_bytes = '';
-			foreach ($this->encryptdata['pubkeys'] as $pubkey) {
-				// for each public certificate
-				if (isset($pubkey['p'])) {
-					$pkprotection = $this->getUserPermissionCode($pubkey['p'], $this->encryptdata['mode']);
-				} else {
-					$pkprotection = $this->encryptdata['protection'];
-				}
-				// get default permissions (reverse byte order)
-				$pkpermissions = $this->getEncPermissionsString($pkprotection);
-				// envelope data
-				$envelope = $seed.$pkpermissions;
-				// write the envelope data to a temporary file
-				$tempkeyfile = tempnam(K_PATH_CACHE, 'tmpkey_');
-				$f = fopen($tempkeyfile, 'wb');
-				if (!$f) {
-					$this->Error('Unable to create temporary key file: '.$tempkeyfile);
-				}
-				$envelope_lenght = strlen($envelope);
-				fwrite($f, $envelope, $envelope_lenght);
-				fclose($f);
-				$tempencfile = tempnam(K_PATH_CACHE, 'tmpenc_');
-				if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_DETACHED | PKCS7_BINARY)) {
-					$this->Error('Unable to encrypt the file: '.$tempkeyfile);
-				}
-				unlink($tempkeyfile);
-				// read encryption signature
-				$signature = file_get_contents($tempencfile, false, null, $envelope_lenght);
-				unlink($tempencfile);
-				// extract signature
-				$signature = substr($signature, strpos($signature, 'Content-Disposition'));
-				$tmparr = explode("\n\n", $signature);
-				$signature = trim($tmparr[1]);
-				unset($tmparr);
-				// decode signature
-				$signature = base64_decode($signature);
-				// convert signature to hex
-				$hexsignature = current(unpack('H*', $signature));
-				// store signature on recipients array
-				$this->encryptdata['Recipients'][] = $hexsignature;
-				// The bytes of each item in the Recipients array of PKCS#7 objects in the order in which they appear in the array
-				$recipient_bytes .= $signature;
-			}
-			// calculate encryption key
-			if ($this->encryptdata['mode'] == 3) { // AES-256
-				$this->encryptdata['key'] = substr(hash('sha256', $seed.$recipient_bytes, true), 0, $keybytelen);
-			} else { // RC4-40, RC4-128, AES-128
-				$this->encryptdata['key'] = substr(sha1($seed.$recipient_bytes, true), 0, $keybytelen);
-			}
-		}
-	}
-
-	/**
-	 * Return the premission code used on encryption (P value).
-	 * @param Array $permissions the set of permissions (specify the ones you want to block).
-	 * @param int $mode encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
-	 * @access protected
-	 * @since 5.0.005 (2010-05-12)
-	 * @author Nicola Asuni
-	 */
-	protected function getUserPermissionCode($permissions, $mode=0) {
-		$options = array(
-			'owner' => 2, // bit 2 -- inverted logic: cleared by default
-			'print' => 4, // bit 3
-			'modify' => 8, // bit 4
-			'copy' => 16, // bit 5
-			'annot-forms' => 32, // bit 6
-			'fill-forms' => 256, // bit 9
-			'extract' => 512, // bit 10
-			'assemble' => 1024,// bit 11
-			'print-high' => 2048 // bit 12
-			);
-		$protection = 2147422012; // 32 bit: (01111111 11111111 00001111 00111100)
-		foreach ($permissions as $permission) {
-			if (!isset($options[$permission])) {
-				$this->Error('Incorrect permission: '.$permission);
-			}
-			if (($mode > 0) OR ($options[$permission] <= 32)) {
-				// set only valid permissions
-				if ($options[$permission] == 2) {
-					// the logic for bit 2 is inverted (cleared by default)
-					$protection += $options[$permission];
-				} else {
-					$protection -= $options[$permission];
-				}
-			}
-		}
-		return $protection;
-	}
-
-	/**
-	 * Set document protection
-	 * Remark: the protection against modification is for people who have the full Acrobat product.
-	 * If you don't set any password, the document will open as usual. If you set a user password, the PDF viewer will ask for it before displaying the document. The master password, if different from the user one, can be used to get full access.
-	 * Note: protecting a document requires to encrypt it, which increases the processing time a lot. This can cause a PHP time-out in some cases, especially if the document contains images or fonts.
-	 * @param Array $permissions the set of permissions (specify the ones you want to block):<ul><li>print : Print the document;</li><li>modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';</li><li>copy : Copy or otherwise extract text and graphics from the document;</li><li>annot-forms : Add or modify text annotations, fill in interactive form fields, and, if 'modify' is also set, create or modify interactive form fields (including signature fields);</li><li>fill-forms : Fill in existing interactive form fields (including signature fields), even if 'annot-forms' is not specified;</li><li>extract : Extract text and graphics (in support of accessibility to users with disabilities or for other purposes);</li><li>assemble : Assemble the document (insert, rotate, or delete pages and create bookmarks or thumbnail images), even if 'modify' is not set;</li><li>print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.</li><li>owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.</li></ul>
-	 * @param String $user_pass user password. Empty by default.
-	 * @param String $owner_pass owner password. If not specified, a random value is used.
-	 * @param int $mode encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
-	 * @param String $pubkeys array of recipients containing public-key certificates ('c') and permissions ('p'). For example: array(array('c' => 'file://../tcpdf.crt', 'p' => array('print')))
-	 * @access public
-	 * @since 2.0.000 (2008-01-02)
-	 * @author Nicola Asuni
-	 */
-	public function SetProtection($permissions=array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass='', $owner_pass=null, $mode=0, $pubkeys=null) {
-		$this->encryptdata['protection'] = $this->getUserPermissionCode($permissions, $mode);
-		if (($pubkeys !== null) AND (is_array($pubkeys))) {
-			// public-key mode
-			$this->encryptdata['pubkeys'] = $pubkeys;
-			if ($mode == 0) {
-				// public-Key Security requires at least 128 bit
-				$mode = 1;
-			}
-			if (!function_exists('openssl_pkcs7_encrypt')) {
-				$this->Error('Public-Key Security requires openssl library.');
-			}
-			// Set Public-Key filter (availabe are: Entrust.PPKEF, Adobe.PPKLite, Adobe.PubSec)
-			$this->encryptdata['pubkey'] = true;
-			$this->encryptdata['Filter'] = 'Adobe.PubSec';
-			$this->encryptdata['StmF'] = 'DefaultCryptFilter';
-			$this->encryptdata['StrF'] = 'DefaultCryptFilter';
-		} else {
-			// standard mode (password mode)
-			$this->encryptdata['pubkey'] = false;
-			$this->encryptdata['Filter'] = 'Standard';
-			$this->encryptdata['StmF'] = 'StdCF';
-			$this->encryptdata['StrF'] = 'StdCF';
-		}
-		if ($mode > 1) { // AES
-			if (!extension_loaded('mcrypt')) {
-				$this->Error('AES encryption requires mcrypt library (http://www.php.net/manual/en/mcrypt.requirements.php).');
-			}
-			if (mcrypt_get_cipher_name(MCRYPT_RIJNDAEL_128) === false) {
-				$this->Error('AES encryption requires MCRYPT_RIJNDAEL_128 cypher.');
-			}
-			if (($mode == 3) AND !function_exists('hash')) {
-				// the Hash extension requires no external libraries and is enabled by default as of PHP 5.1.2.
-				$this->Error('AES 256 encryption requires HASH Message Digest Framework (http://www.php.net/manual/en/book.hash.php).');
-			}
-		}
-		if ($owner_pass === null) {
-			$owner_pass = md5($this->getRandomSeed());
-		}
-		$this->encryptdata['user_password'] = $user_pass;
-		$this->encryptdata['owner_password'] = $owner_pass;
-		$this->encryptdata['mode'] = $mode;
-		switch ($mode) {
-			case 0: { // RC4 40 bit
-				$this->encryptdata['V'] = 1;
-				$this->encryptdata['Length'] = 40;
-				$this->encryptdata['CF']['CFM'] = 'V2';
-				break;
-			}
-			case 1: { // RC4 128 bit
-				$this->encryptdata['V'] = 2;
-				$this->encryptdata['Length'] = 128;
-				$this->encryptdata['CF']['CFM'] = 'V2';
-				if ($this->encryptdata['pubkey']) {
-					$this->encryptdata['SubFilter'] = 'adbe.pkcs7.s4';
-					$this->encryptdata['Recipients'] = array();
-				}
-				break;
-			}
-			case 2: { // AES 128 bit
-				$this->encryptdata['V'] = 4;
-				$this->encryptdata['Length'] = 128;
-				$this->encryptdata['CF']['CFM'] = 'AESV2';
-				$this->encryptdata['CF']['Length'] = 128;
-				if ($this->encryptdata['pubkey']) {
-					$this->encryptdata['SubFilter'] = 'adbe.pkcs7.s5';
-					$this->encryptdata['Recipients'] = array();
-				}
-				break;
-			}
-			case 3: { // AES 256 bit
-				$this->encryptdata['V'] = 5;
-				$this->encryptdata['Length'] = 256;
-				$this->encryptdata['CF']['CFM'] = 'AESV3';
-				$this->encryptdata['CF']['Length'] = 256;
-				if ($this->encryptdata['pubkey']) {
-					$this->encryptdata['SubFilter'] = 'adbe.pkcs7.s5';
-					$this->encryptdata['Recipients'] = array();
-				}
-				break;
-			}
-		}
-		$this->encrypted = true;
-		$this->encryptdata['fileid'] = $this->convertHexStringToString($this->file_id);
-		$this->_generateencryptionkey();
-	}
-
-	/**
-	 * Convert hexadecimal string to string
-	 * @param string $bs byte-string to convert
-	 * @return String
-	 * @access protected
-	 * @since 5.0.005 (2010-05-12)
-	 * @author Nicola Asuni
-	 */
-	protected function convertHexStringToString($bs) {
-		$string = ''; // string to be returned
-		$bslenght = strlen($bs);
-		if (($bslenght % 2) != 0) {
-			// padding
-			$bs .= '0';
-			++$bslenght;
-		}
-		for ($i = 0; $i < $bslenght; $i += 2) {
-			$string .= chr(hexdec($bs{$i}.$bs{($i + 1)}));
-		}
-		return $string;
-	}
-
-	/**
-	 * Convert string to hexadecimal string (byte string)
-	 * @param string $s string to convert
-	 * @return byte string
-	 * @access protected
-	 * @since 5.0.010 (2010-05-17)
-	 * @author Nicola Asuni
-	 */
-	protected function convertStringToHexString($s) {
-		$bs = '';
-		$chars = preg_split('//', $s, -1, PREG_SPLIT_NO_EMPTY);
-		foreach ($chars as $c) {
-			$bs .= sprintf('%02s', dechex(ord($c)));
-		}
-		return $bs;
-	}
-
-	/**
-	 * Convert encryption P value to a string of bytes, low-order byte first.
-	 * @param string $protection 32bit encryption permission value (P value)
-	 * @return String
-	 * @access protected
-	 * @since 5.0.005 (2010-05-12)
-	 * @author Nicola Asuni
-	 */
-	protected function getEncPermissionsString($protection) {
-		$binprot = sprintf('%032b', $protection);
-		$str = chr(bindec(substr($binprot, 24, 8)));
-		$str .= chr(bindec(substr($binprot, 16, 8)));
-		$str .= chr(bindec(substr($binprot, 8, 8)));
-		$str .= chr(bindec(substr($binprot, 0, 8)));
-		return $str;
-	}
-
-	// END OF ENCRYPTION FUNCTIONS -------------------------
-
-	// START TRANSFORMATIONS SECTION -----------------------
-
-	/**
-	 * Starts a 2D tranformation saving current graphic state.
-	 * This function must be called before scaling, mirroring, translation, rotation and skewing.
-	 * Use StartTransform() before, and StopTransform() after the transformations to restore the normal behavior.
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function StartTransform() {
-		$this->_out('q');
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$this->xobjects[$this->xobjid]['transfmrk'][] = strlen($this->xobjects[$this->xobjid]['outdata']);
-		} else {
-			$this->transfmrk[$this->page][] = $this->pagelen[$this->page];
-		}
-		++$this->transfmatrix_key;
-		$this->transfmatrix[$this->transfmatrix_key] = array();
-	}
-
-	/**
-	 * Stops a 2D tranformation restoring previous graphic state.
-	 * This function must be called after scaling, mirroring, translation, rotation and skewing.
-	 * Use StartTransform() before, and StopTransform() after the transformations to restore the normal behavior.
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function StopTransform() {
-		$this->_out('Q');
-		if (isset($this->transfmatrix[$this->transfmatrix_key])) {
-			array_pop($this->transfmatrix[$this->transfmatrix_key]);
-			--$this->transfmatrix_key;
-		}
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			array_pop($this->xobjects[$this->xobjid]['transfmrk']);
-		} else {
-			array_pop($this->transfmrk[$this->page]);
-		}
-	}
-	/**
-	 * Horizontal Scaling.
-	 * @param float $s_x scaling factor for width as percent. 0 is not allowed.
-	 * @param int $x abscissa of the scaling center. Default is current x position
-	 * @param int $y ordinate of the scaling center. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function ScaleX($s_x, $x='', $y='') {
-		$this->Scale($s_x, 100, $x, $y);
-	}
-
-	/**
-	 * Vertical Scaling.
-	 * @param float $s_y scaling factor for height as percent. 0 is not allowed.
-	 * @param int $x abscissa of the scaling center. Default is current x position
-	 * @param int $y ordinate of the scaling center. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function ScaleY($s_y, $x='', $y='') {
-		$this->Scale(100, $s_y, $x, $y);
-	}
-
-	/**
-	 * Vertical and horizontal proportional Scaling.
-	 * @param float $s scaling factor for width and height as percent. 0 is not allowed.
-	 * @param int $x abscissa of the scaling center. Default is current x position
-	 * @param int $y ordinate of the scaling center. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function ScaleXY($s, $x='', $y='') {
-		$this->Scale($s, $s, $x, $y);
-	}
-
-	/**
-	 * Vertical and horizontal non-proportional Scaling.
-	 * @param float $s_x scaling factor for width as percent. 0 is not allowed.
-	 * @param float $s_y scaling factor for height as percent. 0 is not allowed.
-	 * @param int $x abscissa of the scaling center. Default is current x position
-	 * @param int $y ordinate of the scaling center. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Scale($s_x, $s_y, $x='', $y='') {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		if (($s_x == 0) OR ($s_y == 0)) {
-			$this->Error('Please do not use values equal to zero for scaling');
-		}
-		$y = ($this->h - $y) * $this->k;
-		$x *= $this->k;
-		//calculate elements of transformation matrix
-		$s_x /= 100;
-		$s_y /= 100;
-		$tm = array();
-		$tm[0] = $s_x;
-		$tm[1] = 0;
-		$tm[2] = 0;
-		$tm[3] = $s_y;
-		$tm[4] = $x * (1 - $s_x);
-		$tm[5] = $y * (1 - $s_y);
-		//scale the coordinate system
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Horizontal Mirroring.
-	 * @param int $x abscissa of the point. Default is current x position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorH($x='') {
-		$this->Scale(-100, 100, $x);
-	}
-
-	/**
-	 * Verical Mirroring.
-	 * @param int $y ordinate of the point. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorV($y='') {
-		$this->Scale(100, -100, '', $y);
-	}
-
-	/**
-	 * Point reflection mirroring.
-	 * @param int $x abscissa of the point. Default is current x position
-	 * @param int $y ordinate of the point. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorP($x='',$y='') {
-		$this->Scale(-100, -100, $x, $y);
-	}
-
-	/**
-	 * Reflection against a straight line through point (x, y) with the gradient angle (angle).
-	 * @param float $angle gradient angle of the straight line. Default is 0 (horizontal line).
-	 * @param int $x abscissa of the point. Default is current x position
-	 * @param int $y ordinate of the point. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function MirrorL($angle=0, $x='',$y='') {
-		$this->Scale(-100, 100, $x, $y);
-		$this->Rotate(-2*($angle-90), $x, $y);
-	}
-
-	/**
-	 * Translate graphic object horizontally.
-	 * @param int $t_x movement to the right (or left for RTL)
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function TranslateX($t_x) {
-		$this->Translate($t_x, 0);
-	}
-
-	/**
-	 * Translate graphic object vertically.
-	 * @param int $t_y movement to the bottom
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function TranslateY($t_y) {
-		$this->Translate(0, $t_y);
-	}
-
-	/**
-	 * Translate graphic object horizontally and vertically.
-	 * @param int $t_x movement to the right
-	 * @param int $t_y movement to the bottom
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Translate($t_x, $t_y) {
-		//calculate elements of transformation matrix
-		$tm = array();
-		$tm[0] = 1;
-		$tm[1] = 0;
-		$tm[2] = 0;
-		$tm[3] = 1;
-		$tm[4] = $t_x * $this->k;
-		$tm[5] = -$t_y * $this->k;
-		//translate the coordinate system
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Rotate object.
-	 * @param float $angle angle in degrees for counter-clockwise rotation
-	 * @param int $x abscissa of the rotation center. Default is current x position
-	 * @param int $y ordinate of the rotation center. Default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Rotate($angle, $x='', $y='') {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		$y = ($this->h - $y) * $this->k;
-		$x *= $this->k;
-		//calculate elements of transformation matrix
-		$tm = array();
-		$tm[0] = cos(deg2rad($angle));
-		$tm[1] = sin(deg2rad($angle));
-		$tm[2] = -$tm[1];
-		$tm[3] = $tm[0];
-		$tm[4] = $x + ($tm[1] * $y) - ($tm[0] * $x);
-		$tm[5] = $y - ($tm[0] * $y) - ($tm[1] * $x);
-		//rotate the coordinate system around ($x,$y)
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Skew horizontally.
-	 * @param float $angle_x angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-	 * @param int $x abscissa of the skewing center. default is current x position
-	 * @param int $y ordinate of the skewing center. default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function SkewX($angle_x, $x='', $y='') {
-		$this->Skew($angle_x, 0, $x, $y);
-	}
-
-	/**
-	 * Skew vertically.
-	 * @param float $angle_y angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-	 * @param int $x abscissa of the skewing center. default is current x position
-	 * @param int $y ordinate of the skewing center. default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function SkewY($angle_y, $x='', $y='') {
-		$this->Skew(0, $angle_y, $x, $y);
-	}
-
-	/**
-	 * Skew.
-	 * @param float $angle_x angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-	 * @param float $angle_y angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-	 * @param int $x abscissa of the skewing center. default is current x position
-	 * @param int $y ordinate of the skewing center. default is current y position
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	public function Skew($angle_x, $angle_y, $x='', $y='') {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		if (($angle_x <= -90) OR ($angle_x >= 90) OR ($angle_y <= -90) OR ($angle_y >= 90)) {
-			$this->Error('Please use values between -90 and +90 degrees for Skewing.');
-		}
-		$x *= $this->k;
-		$y = ($this->h - $y) * $this->k;
-		//calculate elements of transformation matrix
-		$tm = array();
-		$tm[0] = 1;
-		$tm[1] = tan(deg2rad($angle_y));
-		$tm[2] = tan(deg2rad($angle_x));
-		$tm[3] = 1;
-		$tm[4] = -$tm[2] * $y;
-		$tm[5] = -$tm[1] * $x;
-		//skew the coordinate system
-		$this->Transform($tm);
-	}
-
-	/**
-	 * Apply graphic transformations.
-	 * @param array $tm transformation matrix
-	 * @access protected
-	 * @since 2.1.000 (2008-01-07)
-	 * @see StartTransform(), StopTransform()
-	 */
-	protected function Transform($tm) {
-		$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-		// add tranformation matrix
-		$this->transfmatrix[$this->transfmatrix_key][] = array('a' => $tm[0], 'b' => $tm[1], 'c' => $tm[2], 'd' => $tm[3], 'e' => $tm[4], 'f' => $tm[5]);
-		// update transformation mark
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-				$key = key($this->xobjects[$this->xobjid]['transfmrk']);
-				$this->xobjects[$this->xobjid]['transfmrk'][$key] = strlen($this->xobjects[$this->xobjid]['outdata']);
-			}
-		} elseif (end($this->transfmrk[$this->page]) !== false) {
-			$key = key($this->transfmrk[$this->page]);
-			$this->transfmrk[$this->page][$key] = $this->pagelen[$this->page];
-		}
-	}
-
-	// END TRANSFORMATIONS SECTION -------------------------
-
-	// START GRAPHIC FUNCTIONS SECTION ---------------------
-	// The following section is based on the code provided by David Hernandez Sanz
-
-	/**
-	 * Defines the line width. By default, the value equals 0.2 mm. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param float $width The width.
-	 * @access public
-	 * @since 1.0
-	 * @see Line(), Rect(), Cell(), MultiCell()
-	 */
-	public function SetLineWidth($width) {
-		//Set line width
-		$this->LineWidth = $width;
-		$this->linestyleWidth = sprintf('%.2F w', ($width * $this->k));
-		if ($this->page > 0) {
-			$this->_out($this->linestyleWidth);
-		}
-	}
-
-	/**
-	 * Returns the current the line width.
-	 * @return int Line width
-	 * @access public
-	 * @since 2.1.000 (2008-01-07)
-	 * @see Line(), SetLineWidth()
-	 */
-	public function GetLineWidth() {
-		return $this->LineWidth;
-	}
-
-	/**
-	 * Set line style.
-	 * @param array $style Line style. Array with keys among the following:
-	 * <ul>
-	 *	 <li>width (float): Width of the line in user units.</li>
-	 *	 <li>cap (string): Type of cap to put on the line. Possible values are:
-	 * butt, round, square. The difference between "square" and "butt" is that
-	 * "square" projects a flat end past the end of the line.</li>
-	 *	 <li>join (string): Type of join. Possible values are: miter, round,
-	 * bevel.</li>
-	 *	 <li>dash (mixed): Dash pattern. Is 0 (without dash) or string with
-	 * series of length values, which are the lengths of the on and off dashes.
-	 * For example: "2" represents 2 on, 2 off, 2 on, 2 off, ...; "2,1" is 2 on,
-	 * 1 off, 2 on, 1 off, ...</li>
-	 *	 <li>phase (integer): Modifier on the dash pattern which is used to shift
-	 * the point at which the pattern starts.</li>
-	 *	 <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K).</li>
-	 * </ul>
-	 * @param boolean $ret if true do not send the command.
-	 * @return string the PDF command
-	 * @access public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function SetLineStyle($style, $ret=false) {
-		$s = ''; // string to be returned
-		if (!is_array($style)) {
-			return;
-		}
-		extract($style);
-		if (isset($width)) {
-			$this->LineWidth = $width;
-			$this->linestyleWidth = sprintf('%.2F w', ($width * $this->k));
-			$s .= $this->linestyleWidth.' ';
-		}
-		if (isset($cap)) {
-			$ca = array('butt' => 0, 'round'=> 1, 'square' => 2);
-			if (isset($ca[$cap])) {
-				$this->linestyleCap = $ca[$cap].' J';
-				$s .= $this->linestyleCap.' ';
-			}
-		}
-		if (isset($join)) {
-			$ja = array('miter' => 0, 'round' => 1, 'bevel' => 2);
-			if (isset($ja[$join])) {
-				$this->linestyleJoin = $ja[$join].' j';
-				$s .= $this->linestyleJoin.' ';
-			}
-		}
-		if (isset($dash)) {
-			$dash_string = '';
-			if ($dash) {
-				if (preg_match('/^.+,/', $dash) > 0) {
-					$tab = explode(',', $dash);
-				} else {
-					$tab = array($dash);
-				}
-				$dash_string = '';
-				foreach ($tab as $i => $v) {
-					if ($i) {
-						$dash_string .= ' ';
-					}
-					$dash_string .= sprintf('%.2F', $v);
-				}
-			}
-			if (!isset($phase) OR !$dash) {
-				$phase = 0;
-			}
-			$this->linestyleDash = sprintf('[%s] %.2F d', $dash_string, $phase);
-			$s .= $this->linestyleDash.' ';
-		}
-		if (isset($color)) {
-			$s .= $this->SetDrawColorArray($color, true).' ';
-		}
-		if (!$ret) {
-			$this->_out($s);
-		}
-		return $s;
-	}
-
-	/**
-	 * Begin a new subpath by moving the current point to coordinates (x, y), omitting any connecting line segment.
-	 * @param float $x Abscissa of point.
-	 * @param float $y Ordinate of point.
-	 * @access protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outPoint($x, $y) {
-		$this->_out(sprintf('%.2F %.2F m', $x * $this->k, ($this->h - $y) * $this->k));
-	}
-
-	/**
-	 * Append a straight line segment from the current point to the point (x, y).
-	 * The new current point shall be (x, y).
-	 * @param float $x Abscissa of end point.
-	 * @param float $y Ordinate of end point.
-	 * @access protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outLine($x, $y) {
-		$this->_out(sprintf('%.2F %.2F l', $x * $this->k, ($this->h - $y) * $this->k));
-	}
-
-	/**
-	 * Append a rectangle to the current path as a complete subpath, with lower-left corner (x, y) and dimensions widthand height in user space.
-	 * @param float $x Abscissa of upper-left corner (or upper-right corner for RTL language).
-	 * @param float $y Ordinate of upper-left corner (or upper-right corner for RTL language).
-	 * @param float $w Width.
-	 * @param float $h Height.
-	 * @param string $op options
-	 * @access protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outRect($x, $y, $w, $h, $op) {
-		$this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
-	}
-
-	/**
-	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
-	 * The new current point shall be (x3, y3).
-	 * @param float $x1 Abscissa of control point 1.
-	 * @param float $y1 Ordinate of control point 1.
-	 * @param float $x2 Abscissa of control point 2.
-	 * @param float $y2 Ordinate of control point 2.
-	 * @param float $x3 Abscissa of end point.
-	 * @param float $y3 Ordinate of end point.
-	 * @access protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) {
-		$this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
-	}
-
-	/**
-	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
-	 * The new current point shall be (x3, y3).
-	 * @param float $x2 Abscissa of control point 2.
-	 * @param float $y2 Ordinate of control point 2.
-	 * @param float $x3 Abscissa of end point.
-	 * @param float $y3 Ordinate of end point.
-	 * @access protected
-	 * @since 4.9.019 (2010-04-26)
-	 */
-	protected function _outCurveV($x2, $y2, $x3, $y3) {
-		$this->_out(sprintf('%.2F %.2F %.2F %.2F v', $x2 * $this->k, ($this->h - $y2) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
-	}
-
-	/**
-	 * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
-	 * The new current point shall be (x3, y3).
-	 * @param float $x1 Abscissa of control point 1.
-	 * @param float $y1 Ordinate of control point 1.
-	 * @param float $x2 Abscissa of control point 2.
-	 * @param float $y2 Ordinate of control point 2.
-	 * @param float $x3 Abscissa of end point.
-	 * @param float $y3 Ordinate of end point.
-	 * @access protected
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function _outCurveY($x1, $y1, $x3, $y3) {
-		$this->_out(sprintf('%.2F %.2F %.2F %.2F y', $x1 * $this->k, ($this->h - $y1) * $this->k, $x3 * $this->k, ($this->h - $y3) * $this->k));
-	}
-
-	/**
-	 * Draws a line between two points.
-	 * @param float $x1 Abscissa of first point.
-	 * @param float $y1 Ordinate of first point.
-	 * @param float $x2 Abscissa of second point.
-	 * @param float $y2 Ordinate of second point.
-	 * @param array $style Line style. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @access public
-	 * @since 1.0
-	 * @see SetLineWidth(), SetDrawColor(), SetLineStyle()
-	 */
-	public function Line($x1, $y1, $x2, $y2, $style=array()) {
-		if (is_array($style)) {
-			$this->SetLineStyle($style);
-		}
-		$this->_outPoint($x1, $y1);
-		$this->_outLine($x2, $y2);
-		$this->_out('S');
-	}
-
-	/**
-	 * Draws a rectangle.
-	 * @param float $x Abscissa of upper-left corner (or upper-right corner for RTL language).
-	 * @param float $y Ordinate of upper-left corner (or upper-right corner for RTL language).
-	 * @param float $w Width.
-	 * @param float $h Height.
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $border_style Border style of rectangle. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all borders. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 *	 <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the border. Default value: default line style (empty array).
-	 * @param array $border_style Border style of rectangle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @access public
-	 * @since 1.0
-	 * @see SetLineStyle()
-	 */
-	public function Rect($x, $y, $w, $h, $style='', $border_style=array(), $fill_color=array()) {
-		if (!(false === strpos($style, 'F')) AND !empty($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = $this->getPathPaintOperator($style);
-		if ((!$border_style) OR (isset($border_style['all']))) {
-			if (isset($border_style['all']) AND $border_style['all']) {
-				$this->SetLineStyle($border_style['all']);
-				$border_style = array();
-			}
-		}
-		$this->_outRect($x, $y, $w, $h, $op);
-		if ($border_style) {
-			$border_style2 = array();
-			foreach ($border_style as $line => $value) {
-				$length = strlen($line);
-				for ($i = 0; $i < $length; ++$i) {
-					$border_style2[$line[$i]] = $value;
-				}
-			}
-			$border_style = $border_style2;
-			if (isset($border_style['L']) AND $border_style['L']) {
-				$this->Line($x, $y, $x, $y + $h, $border_style['L']);
-			}
-			if (isset($border_style['T']) AND $border_style['T']) {
-				$this->Line($x, $y, $x + $w, $y, $border_style['T']);
-			}
-			if (isset($border_style['R']) AND $border_style['R']) {
-				$this->Line($x + $w, $y, $x + $w, $y + $h, $border_style['R']);
-			}
-			if (isset($border_style['B']) AND $border_style['B']) {
-				$this->Line($x, $y + $h, $x + $w, $y + $h, $border_style['B']);
-			}
-		}
-	}
-
-	/**
-	 * Draws a Bezier curve.
-	 * The Bezier curve is a tangent to the line between the control points at
-	 * either end of the curve.
-	 * @param float $x0 Abscissa of start point.
-	 * @param float $y0 Ordinate of start point.
-	 * @param float $x1 Abscissa of control point 1.
-	 * @param float $y1 Ordinate of control point 1.
-	 * @param float $x2 Abscissa of control point 2.
-	 * @param float $y2 Ordinate of control point 2.
-	 * @param float $x3 Abscissa of end point.
-	 * @param float $y3 Ordinate of end point.
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of curve. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @access public
-	 * @see SetLineStyle()
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style='', $line_style=array(), $fill_color=array()) {
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = $this->getPathPaintOperator($style);
-		if ($line_style) {
-			$this->SetLineStyle($line_style);
-		}
-		$this->_outPoint($x0, $y0);
-		$this->_outCurve($x1, $y1, $x2, $y2, $x3, $y3);
-		$this->_out($op);
-	}
-
-	/**
-	 * Draws a poly-Bezier curve.
-	 * Each Bezier curve segment is a tangent to the line between the control points at
-	 * either end of the curve.
-	 * @param float $x0 Abscissa of start point.
-	 * @param float $y0 Ordinate of start point.
-	 * @param float $segments An array of bezier descriptions. Format: array(x1, y1, x2, y2, x3, y3).
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of curve. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @access public
-	 * @see SetLineStyle()
-	 * @since 3.0008 (2008-05-12)
-	 */
-	public function Polycurve($x0, $y0, $segments, $style='', $line_style=array(), $fill_color=array()) {
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = $this->getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		if ($line_style) {
-			$this->SetLineStyle($line_style);
-		}
-		$this->_outPoint($x0, $y0);
-		foreach ($segments as $segment) {
-			list($x1, $y1, $x2, $y2, $x3, $y3) = $segment;
-			$this->_outCurve($x1, $y1, $x2, $y2, $x3, $y3);
-		}
-		$this->_out($op);
-	}
-
-	/**
-	 * Draws an ellipse.
-	 * An ellipse is formed from n Bezier curves.
-	 * @param float $x0 Abscissa of center point.
-	 * @param float $y0 Ordinate of center point.
-	 * @param float $rx Horizontal radius.
-	 * @param float $ry Vertical radius (if ry = 0 then is a circle, see {@link Circle Circle}). Default value: 0.
-	 * @param float $angle: Angle oriented (anti-clockwise). Default value: 0.
-	 * @param float $astart: Angle start of draw line. Default value: 0.
-	 * @param float $afinish: Angle finish of draw line. Default value: 360.
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of ellipse. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @param integer $nc Number of curves used to draw a 90 degrees portion of ellipse.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Ellipse($x0, $y0, $rx, $ry='', $angle=0, $astart=0, $afinish=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
-		if ($this->empty_string($ry) OR ($ry == 0)) {
-			$ry = $rx;
-		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = $this->getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		if ($line_style) {
-			$this->SetLineStyle($line_style);
-		}
-		$this->_outellipticalarc($x0, $y0, $rx, $ry, $angle, $astart, $afinish, false, $nc);
-		$this->_out($op);
-	}
-
-	/**
-	 * Append an elliptical arc to the current path.
-	 * An ellipse is formed from n Bezier curves.
-	 * @param float $xc Abscissa of center point.
-	 * @param float $yc Ordinate of center point.
-	 * @param float $rx Horizontal radius.
-	 * @param float $ry Vertical radius (if ry = 0 then is a circle, see {@link Circle Circle}). Default value: 0.
-	 * @param float $xang: Angle between the X-axis and the major axis of the ellipse. Default value: 0.
-	 * @param float $angs: Angle start of draw line. Default value: 0.
-	 * @param float $angf: Angle finish of draw line. Default value: 360.
-	 * @param boolean $pie if true do not mark the border point (used to draw pie sectors).
-	 * @param integer $nc Number of curves used to draw a 90 degrees portion of ellipse.
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 4.9.019 (2010-04-26)
-	 */
-	protected function _outellipticalarc($xc, $yc, $rx, $ry, $xang=0, $angs=0, $angf=360, $pie=false, $nc=2) {
-		$k = $this->k;
-		if ($nc < 2) {
-			$nc = 2;
-		}
-		if ($pie) {
-			// center of the arc
-			$this->_outPoint($xc, $yc);
-		}
-		$xang = deg2rad((float) $xang);
-		$angs = deg2rad((float) $angs);
-		$angf = deg2rad((float) $angf);
-		$as = atan2((sin($angs) / $ry), (cos($angs) / $rx));
-		$af = atan2((sin($angf) / $ry), (cos($angf) / $rx));
-		if ($as < 0) {
-			$as += (2 * M_PI);
-		}
-		if ($af < 0) {
-			$af += (2 * M_PI);
-		}
-		if ($as > $af) {
-			// reverse rotation go clockwise
-			$as -= (2 * M_PI);
-		}
-		$total_angle = ($af - $as);
-		if ($nc < 2) {
-			$nc = 2;
-		}
-		// total arcs to draw
-		$nc *= (2 * abs($total_angle) / M_PI);
-		$nc = round($nc) + 1;
-		// angle of each arc
-		$arcang = $total_angle / $nc;
-		// center point in PDF coordiantes
-		$x0 = $xc;
-		$y0 = ($this->h - $yc);
-		// starting angle
-		$ang = $as;
-		$alpha = sin($arcang) * ((sqrt(4 + (3 * pow(tan(($arcang) / 2), 2))) - 1) / 3);
-		$cos_xang = cos($xang);
-		$sin_xang = sin($xang);
-		$cos_ang = cos($ang);
-		$sin_ang = sin($ang);
-		// first arc point
-		$px1 = $x0 + ($rx * $cos_xang * $cos_ang) - ($ry * $sin_xang * $sin_ang);
-		$py1 = $y0 + ($rx * $sin_xang * $cos_ang) + ($ry * $cos_xang * $sin_ang);
-		// first Bezier control point
-		$qx1 = ($alpha * ((-$rx * $cos_xang * $sin_ang) - ($ry * $sin_xang * $cos_ang)));
-		$qy1 = ($alpha * ((-$rx * $sin_xang * $sin_ang) + ($ry * $cos_xang * $cos_ang)));
-		if ($pie) {
-			$this->_outLine($px1, $this->h - $py1);
-		} else {
-			$this->_outPoint($px1, $this->h - $py1);
-		}
-		// draw arcs
-		for ($i = 1; $i <= $nc; ++$i) {
-			// starting angle
-			$ang = $as + ($i * $arcang);
-			$cos_xang = cos($xang);
-			$sin_xang = sin($xang);
-			$cos_ang = cos($ang);
-			$sin_ang = sin($ang);
-			// second arc point
-			$px2 = $x0 + ($rx * $cos_xang * $cos_ang) - ($ry * $sin_xang * $sin_ang);
-			$py2 = $y0 + ($rx * $sin_xang * $cos_ang) + ($ry * $cos_xang * $sin_ang);
-			// second Bezier control point
-			$qx2 = ($alpha * ((-$rx * $cos_xang * $sin_ang) - ($ry * $sin_xang * $cos_ang)));
-			$qy2 = ($alpha * ((-$rx * $sin_xang * $sin_ang) + ($ry * $cos_xang * $cos_ang)));
-			// draw arc
-			$this->_outCurve(($px1 + $qx1), ($this->h - ($py1 + $qy1)), ($px2 - $qx2), ($this->h - ($py2 - $qy2)), $px2, ($this->h - $py2));
-			// move to next point
-			$px1 = $px2;
-			$py1 = $py2;
-			$qx1 = $qx2;
-			$qy1 = $qy2;
-		}
-		if ($pie) {
-			$this->_outLine($xc, $yc);
-		}
-	}
-
-	/**
-	 * Draws a circle.
-	 * A circle is formed from n Bezier curves.
-	 * @param float $x0 Abscissa of center point.
-	 * @param float $y0 Ordinate of center point.
-	 * @param float $r Radius.
-	 * @param float $angstr: Angle start of draw line. Default value: 0.
-	 * @param float $angend: Angle finish of draw line. Default value: 360.
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of circle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param integer $nc Number of curves used to draw a 90 degrees portion of circle.
-	 * @access public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Circle($x0, $y0, $r, $angstr=0, $angend=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
-		$this->Ellipse($x0, $y0, $r, $r, 0, $angstr, $angend, $style, $line_style, $fill_color, $nc);
-	}
-
-	/**
-	 * Draws a polygonal line
-	 * @param array $p Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of polygon. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all lines. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 *	 <li>0 to ($np - 1): Line style of each line. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @param boolean $closed if true the polygon is closes, otherwise will remain open
-	 * @access public
-	 * @since 4.8.003 (2009-09-15)
-	 */
-	public function PolyLine($p, $style='', $line_style=array(), $fill_color=array()) {
-		$this->Polygon($p, $style, $line_style, $fill_color, false);
-	}
-
-	/**
-	 * Draws a polygon.
-	 * @param array $p Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of polygon. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all lines. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 *	 <li>0 to ($np - 1): Line style of each line. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @param boolean $closed if true the polygon is closes, otherwise will remain open
-	 * @access public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function Polygon($p, $style='', $line_style=array(), $fill_color=array(), $closed=true) {
-		$nc = count($p); // number of coordinates
-		$np = $nc / 2; // number of points
-		if ($closed) {
-			// close polygon by adding the first 2 points at the end (one line)
-			for ($i = 0; $i < 4; ++$i) {
-				$p[$nc + $i] = $p[$i];
-			}
-			// copy style for the last added line
-			if (isset($line_style[0])) {
-				$line_style[$np] = $line_style[0];
-			}
-			$nc += 4;
-		}
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = $this->getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		$draw = true;
-		if ($line_style) {
-			if (isset($line_style['all'])) {
-				$this->SetLineStyle($line_style['all']);
-			} else {
-				$draw = false;
-				if ($op == 'B') {
-					// draw fill
-					$op = 'f';
-					$this->_outPoint($p[0], $p[1]);
-					for ($i = 2; $i < $nc; $i = $i + 2) {
-						$this->_outLine($p[$i], $p[$i + 1]);
-					}
-					$this->_out($op);
-				}
-				// draw outline
-				$this->_outPoint($p[0], $p[1]);
-				for ($i = 2; $i < $nc; $i = $i + 2) {
-					$line_num = ($i / 2) - 1;
-					if (isset($line_style[$line_num])) {
-						if ($line_style[$line_num] != 0) {
-							if (is_array($line_style[$line_num])) {
-								$this->_out('S');
-								$this->SetLineStyle($line_style[$line_num]);
-								$this->_outPoint($p[$i - 2], $p[$i - 1]);
-								$this->_outLine($p[$i], $p[$i + 1]);
-								$this->_out('S');
-								$this->_outPoint($p[$i], $p[$i + 1]);
-							} else {
-								$this->_outLine($p[$i], $p[$i + 1]);
-							}
-						}
-					} else {
-						$this->_outLine($p[$i], $p[$i + 1]);
-					}
-				}
-				$this->_out($op);
-			}
-		}
-		if ($draw) {
-			$this->_outPoint($p[0], $p[1]);
-			for ($i = 2; $i < $nc; $i = $i + 2) {
-				$this->_outLine($p[$i], $p[$i + 1]);
-			}
-			$this->_out($op);
-		}
-	}
-
-	/**
-	 * Draws a regular polygon.
-	 * @param float $x0 Abscissa of center point.
-	 * @param float $y0 Ordinate of center point.
-	 * @param float $r: Radius of inscribed circle.
-	 * @param integer $ns Number of sides.
-	 * @param float $angle Angle oriented (anti-clockwise). Default value: 0.
-	 * @param boolean $draw_circle Draw inscribed circle or not. Default value: false.
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of polygon sides. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all sides. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 *	 <li>0 to ($ns - 1): Line style of each side. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param string $circle_style Style of rendering of inscribed circle (if draws). Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
-	 * @param array $circle_outLine_style Line style of inscribed circle (if draws). Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $circle_fill_color Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
-	 * @access public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function RegularPolygon($x0, $y0, $r, $ns, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
-		if (3 > $ns) {
-			$ns = 3;
-		}
-		if ($draw_circle) {
-			$this->Circle($x0, $y0, $r, 0, 360, $circle_style, $circle_outLine_style, $circle_fill_color);
-		}
-		$p = array();
-		for ($i = 0; $i < $ns; ++$i) {
-			$a = $angle + ($i * 360 / $ns);
-			$a_rad = deg2rad((float) $a);
-			$p[] = $x0 + ($r * sin($a_rad));
-			$p[] = $y0 + ($r * cos($a_rad));
-		}
-		$this->Polygon($p, $style, $line_style, $fill_color);
-	}
-
-	/**
-	 * Draws a star polygon
-	 * @param float $x0 Abscissa of center point.
-	 * @param float $y0 Ordinate of center point.
-	 * @param float $r Radius of inscribed circle.
-	 * @param integer $nv Number of vertices.
-	 * @param integer $ng Number of gap (if ($ng % $nv = 1) then is a regular polygon).
-	 * @param float $angle: Angle oriented (anti-clockwise). Default value: 0.
-	 * @param boolean $draw_circle: Draw inscribed circle or not. Default value is false.
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $line_style Line style of polygon sides. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all sides. Array like for
-	 * {@link SetLineStyle SetLineStyle}.</li>
-	 *	 <li>0 to (n - 1): Line style of each side. Array like for {@link SetLineStyle SetLineStyle}.</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param string $circle_style Style of rendering of inscribed circle (if draws). Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
-	 * @param array $circle_outLine_style Line style of inscribed circle (if draws). Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $circle_fill_color Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
-	 * @access public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function StarPolygon($x0, $y0, $r, $nv, $ng, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
-		if ($nv < 2) {
-			$nv = 2;
-		}
-		if ($draw_circle) {
-			$this->Circle($x0, $y0, $r, 0, 360, $circle_style, $circle_outLine_style, $circle_fill_color);
-		}
-		$p2 = array();
-		$visited = array();
-		for ($i = 0; $i < $nv; ++$i) {
-			$a = $angle + ($i * 360 / $nv);
-			$a_rad = deg2rad((float) $a);
-			$p2[] = $x0 + ($r * sin($a_rad));
-			$p2[] = $y0 + ($r * cos($a_rad));
-			$visited[] = false;
-		}
-		$p = array();
-		$i = 0;
-		do {
-			$p[] = $p2[$i * 2];
-			$p[] = $p2[($i * 2) + 1];
-			$visited[$i] = true;
-			$i += $ng;
-			$i %= $nv;
-		} while (!$visited[$i]);
-		$this->Polygon($p, $style, $line_style, $fill_color);
-	}
-
-	/**
-	 * Draws a rounded rectangle.
-	 * @param float $x Abscissa of upper-left corner.
-	 * @param float $y Ordinate of upper-left corner.
-	 * @param float $w Width.
-	 * @param float $h Height.
-	 * @param float $r the radius of the circle used to round off the corners of the rectangle.
-	 * @param string $round_corner Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top left, top right, bottom right and bottom left. Default value: all rounded corner ("1111").
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $border_style Border style of rectangle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @access public
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	public function RoundedRect($x, $y, $w, $h, $r, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
-		$this->RoundedRectXY($x, $y, $w, $h, $r, $r, $round_corner, $style, $border_style, $fill_color);
-	}
-
-	/**
-	 * Draws a rounded rectangle.
-	 * @param float $x Abscissa of upper-left corner.
-	 * @param float $y Ordinate of upper-left corner.
-	 * @param float $w Width.
-	 * @param float $h Height.
-	 * @param float $rx the x-axis radius of the ellipse used to round off the corners of the rectangle.
-	 * @param float $ry the y-axis radius of the ellipse used to round off the corners of the rectangle.
-	 * @param string $round_corner Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top left, top right, bottom right and bottom left. Default value: all rounded corner ("1111").
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param array $border_style Border style of rectangle. Array like for {@link SetLineStyle SetLineStyle}. Default value: default line style (empty array).
-	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K). Default value: default color (empty array).
-	 * @access public
-	 * @since 4.9.019 (2010-04-22)
-	 */
-	public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
-		if (($round_corner == '0000') OR (($rx == $ry) AND ($rx == 0))) {
-			// Not rounded
-			$this->Rect($x, $y, $w, $h, $style, $border_style, $fill_color);
-			return;
-		}
-		// Rounded
-		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
-		}
-		$op = $this->getPathPaintOperator($style);
-		if ($op == 'f') {
-			$border_style = array();
-		}
-		if ($border_style) {
-			$this->SetLineStyle($border_style);
-		}
-		$MyArc = 4 / 3 * (sqrt(2) - 1);
-		$this->_outPoint($x + $rx, $y);
-		$xc = $x + $w - $rx;
-		$yc = $y + $ry;
-		$this->_outLine($xc, $y);
-		if ($round_corner[0]) {
-			$this->_outCurve($xc + ($rx * $MyArc), $yc - $ry, $xc + $rx, $yc - ($ry * $MyArc), $xc + $rx, $yc);
-		} else {
-			$this->_outLine($x + $w, $y);
-		}
-		$xc = $x + $w - $rx;
-		$yc = $y + $h - $ry;
-		$this->_outLine($x + $w, $yc);
-		if ($round_corner[1]) {
-			$this->_outCurve($xc + $rx, $yc + ($ry * $MyArc), $xc + ($rx * $MyArc), $yc + $ry, $xc, $yc + $ry);
-		} else {
-			$this->_outLine($x + $w, $y + $h);
-		}
-		$xc = $x + $rx;
-		$yc = $y + $h - $ry;
-		$this->_outLine($xc, $y + $h);
-		if ($round_corner[2]) {
-			$this->_outCurve($xc - ($rx * $MyArc), $yc + $ry, $xc - $rx, $yc + ($ry * $MyArc), $xc - $rx, $yc);
-		} else {
-			$this->_outLine($x, $y + $h);
-		}
-		$xc = $x + $rx;
-		$yc = $y + $ry;
-		$this->_outLine($x, $yc);
-		if ($round_corner[3]) {
-			$this->_outCurve($xc - $rx, $yc - ($ry * $MyArc), $xc - ($rx * $MyArc), $yc - $ry, $xc, $yc - $ry);
-		} else {
-			$this->_outLine($x, $y);
-			$this->_outLine($x + $rx, $y);
-		}
-		$this->_out($op);
-	}
-
-	/**
-	 * Draws a grahic arrow.
-	 * @param float $x0 Abscissa of first point.
-	 * @param float $y0 Ordinate of first point.
-	 * @param float $x0 Abscissa of second point.
-	 * @param float $y1 Ordinate of second point.
-	 * @param int $head_style (0 = draw only arrowhead arms, 1 = draw closed arrowhead, but no fill, 2 = closed and filled arrowhead, 3 = filled arrowhead)
-	 * @param float $arm_size length of arrowhead arms
-	 * @param int $arm_angle angle between an arm and the shaft
-	 * @author Piotr Galecki, Nicola Asuni, Andy Meier
-	 * @since 4.6.018 (2009-07-10)
-	 */
-	public function Arrow($x0, $y0, $x1, $y1, $head_style=0, $arm_size=5, $arm_angle=15) {
-		// getting arrow direction angle
-		// 0 deg angle is when both arms go along X axis. angle grows clockwise.
-		$dir_angle = atan2(($y0 - $y1), ($x0 - $x1));
-		if ($dir_angle < 0) {
-			$dir_angle += (2 * M_PI);
-		}
-		$arm_angle = deg2rad($arm_angle);
-		$sx1 = $x1;
-		$sy1 = $y1;
-		if ($head_style > 0) {
-			// calculate the stopping point for the arrow shaft
-			$sx1 = $x1 + (($arm_size - $this->LineWidth) * cos($dir_angle));
-			$sy1 = $y1 + (($arm_size - $this->LineWidth) * sin($dir_angle));
-		}
-		// main arrow line / shaft
-		$this->Line($x0, $y0, $sx1, $sy1);
-		// left arrowhead arm tip
-		$x2L = $x1 + ($arm_size * cos($dir_angle + $arm_angle));
-		$y2L = $y1 + ($arm_size * sin($dir_angle + $arm_angle));
-		// right arrowhead arm tip
-		$x2R = $x1 + ($arm_size * cos($dir_angle - $arm_angle));
-		$y2R = $y1 + ($arm_size * sin($dir_angle - $arm_angle));
-		$mode = 'D';
-		$style = array();
-		switch ($head_style) {
-			case 0: {
-				// draw only arrowhead arms
-				$mode = 'D';
-				$style = array(1, 1, 0);
-				break;
-			}
-			case 1: {
-				// draw closed arrowhead, but no fill
-				$mode = 'D';
-				break;
-			}
-			case 2: {
-				// closed and filled arrowhead
-				$mode = 'DF';
-				break;
-			}
-			case 3: {
-				// filled arrowhead
-				$mode = 'F';
-				break;
-			}
-		}
-		$this->Polygon(array($x2L, $y2L, $x1, $y1, $x2R, $y2R), $mode, $style, array());
-	}
-
-	// END GRAPHIC FUNCTIONS SECTION -----------------------
-
-	// BIDIRECTIONAL TEXT SECTION --------------------------
-
-	/**
-	 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param string $str string to manipulate.
-	 * @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param bool $forcertl if true forces RTL text direction
-	 * @return string
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 2.1.000 (2008-01-08)
-	 */
-	protected function utf8StrRev($str, $setbom=false, $forcertl=false) {
-		return $this->utf8StrArrRev($this->UTF8StringToArray($str), $str, $setbom, $forcertl);
-	}
-
-	/**
-	 * Reverse the RLT substrings array using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param array $arr array of unicode values.
-	 * @param string $str string to manipulate (or empty value).
-	 * @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param bool $forcertl if true forces RTL text direction
-	 * @return string
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-27)
-	 */
-	protected function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=false) {
-		return $this->arrUTF8ToUTF16BE($this->utf8Bidi($arr, $str, $forcertl), $setbom);
-	}
-
-	/**
-	 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param array $ta array of characters composing the string.
-	 * @param string $str string to process
-	 * @param bool $forcertl if 'R' forces RTL, if 'L' forces LTR
-	 * @return array of unicode chars
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 2.4.000 (2008-03-06)
-	 */
-	protected function utf8Bidi($ta, $str='', $forcertl=false) {
-		// paragraph embedding level
-		$pel = 0;
-		// max level
-		$maxlevel = 0;
-		if ($this->empty_string($str)) {
-			// create string from array
-			$str = $this->UTF8ArrSubString($ta);
-		}
-		// check if string contains arabic text
-		if (preg_match($this->unicode->uni_RE_PATTERN_ARABIC, $str)) {
-			$arabic = true;
-		} else {
-			$arabic = false;
-		}
-		// check if string contains RTL text
-		if (!($forcertl OR $arabic OR preg_match($this->unicode->uni_RE_PATTERN_RTL, $str))) {
-			return $ta;
-		}
-
-		// get number of chars
-		$numchars = count($ta);
-
-		if ($forcertl == 'R') {
-			$pel = 1;
-		} elseif ($forcertl == 'L') {
-			$pel = 0;
-		} else {
-			// P2. In each paragraph, find the first character of type L, AL, or R.
-			// P3. If a character is found in P2 and it is of type AL or R, then set the paragraph embedding level to one; otherwise, set it to zero.
-			for ($i=0; $i < $numchars; ++$i) {
-				$type = $this->unicode->uni_type[$ta[$i]];
-				if ($type == 'L') {
-					$pel = 0;
-					break;
-				} elseif (($type == 'AL') OR ($type == 'R')) {
-					$pel = 1;
-					break;
-				}
-			}
-		}
-
-		// Current Embedding Level
-		$cel = $pel;
-		// directional override status
-		$dos = 'N';
-		$remember = array();
-		// start-of-level-run
-		$sor = $pel % 2 ? 'R' : 'L';
-		$eor = $sor;
-
-		// Array of characters data
-		$chardata = Array();
-
-		// X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
-		// 	In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($ta[$i] == $this->unicode->uni_RLE) {
-				// X2. With each RLE, compute the least greater odd embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + ($cel % 2) + 1;
-				if ($next_level < 62) {
-					$remember[] = array('num' => $this->unicode->uni_RLE, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'N';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == $this->unicode->uni_LRE) {
-				// X3. With each LRE, compute the least greater even embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + 2 - ($cel % 2);
-				if ( $next_level < 62 ) {
-					$remember[] = array('num' => $this->unicode->uni_LRE, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'N';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == $this->unicode->uni_RLO) {
-				// X4. With each RLO, compute the least greater odd embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to right-to-left.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + ($cel % 2) + 1;
-				if ($next_level < 62) {
-					$remember[] = array('num' => $this->unicode->uni_RLO, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'R';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == $this->unicode->uni_LRO) {
-				// X5. With each LRO, compute the least greater even embedding level.
-				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to left-to-right.
-				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
-				$next_level = $cel + 2 - ($cel % 2);
-				if ( $next_level < 62 ) {
-					$remember[] = array('num' => $this->unicode->uni_LRO, 'cel' => $cel, 'dos' => $dos);
-					$cel = $next_level;
-					$dos = 'L';
-					$sor = $eor;
-					$eor = $cel % 2 ? 'R' : 'L';
-				}
-			} elseif ($ta[$i] == $this->unicode->uni_PDF) {
-				// X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override.
-				if (count($remember)) {
-					$last = count($remember ) - 1;
-					if (($remember[$last]['num'] == $this->unicode->uni_RLE) OR
-						($remember[$last]['num'] == $this->unicode->uni_LRE) OR
-						($remember[$last]['num'] == $this->unicode->uni_RLO) OR
-						($remember[$last]['num'] == $this->unicode->uni_LRO)) {
-						$match = array_pop($remember);
-						$cel = $match['cel'];
-						$dos = $match['dos'];
-						$sor = $eor;
-						$eor = ($cel > $match['cel'] ? $cel : $match['cel']) % 2 ? 'R' : 'L';
-					}
-				}
-			} elseif (($ta[$i] != $this->unicode->uni_RLE) AND
-							 ($ta[$i] != $this->unicode->uni_LRE) AND
-							 ($ta[$i] != $this->unicode->uni_RLO) AND
-							 ($ta[$i] != $this->unicode->uni_LRO) AND
-							 ($ta[$i] != $this->unicode->uni_PDF)) {
-				// X6. For all types besides RLE, LRE, RLO, LRO, and PDF:
-				//	a. Set the level of the current character to the current embedding level.
-				//	b. Whenever the directional override status is not neutral, reset the current character type to the directional override status.
-				if ($dos != 'N') {
-					$chardir = $dos;
-				} else {
-					if (isset($this->unicode->uni_type[$ta[$i]])) {
-						$chardir = $this->unicode->uni_type[$ta[$i]];
-					} else {
-						$chardir = 'L';
-					}
-				}
-				// stores string characters and other information
-				$chardata[] = array('char' => $ta[$i], 'level' => $cel, 'type' => $chardir, 'sor' => $sor, 'eor' => $eor);
-			}
-		} // end for each char
-
-		// X8. All explicit directional embeddings and overrides are completely terminated at the end of each paragraph. Paragraph separators are not included in the embedding.
-		// X9. Remove all RLE, LRE, RLO, LRO, PDF, and BN codes.
-		// X10. The remaining rules are applied to each run of characters at the same level. For each run, determine the start-of-level-run (sor) and end-of-level-run (eor) type, either L or R. This depends on the higher of the two levels on either side of the boundary (at the start or end of the paragraph, the level of the 'other' run is the base embedding level). If the higher level is odd, the type is R; otherwise, it is L.
-
-		// 3.3.3 Resolving Weak Types
-		// Weak types are now resolved one level run at a time. At level run boundaries where the type of the character on the other side of the boundary is required, the type assigned to sor or eor is used.
-		// Nonspacing marks are now resolved based on the previous characters.
-		$numchars = count($chardata);
-
-		// W1. Examine each nonspacing mark (NSM) in the level run, and change the type of the NSM to the type of the previous character. If the NSM is at the start of the level run, it will get the type of sor.
-		$prevlevel = -1; // track level changes
-		$levcount = 0; // counts consecutive chars at the same level
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['type'] == 'NSM') {
-				if ($levcount) {
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				} elseif ($i > 0) {
-					$chardata[$i]['type'] = $chardata[($i-1)]['type'];
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W2. Search backward from each instance of a European number until the first strong type (R, L, AL, or sor) is found. If an AL is found, change the type of the European number to Arabic number.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['char'] == 'EN') {
-				for ($j=$levcount; $j >= 0; $j--) {
-					if ($chardata[$j]['type'] == 'AL') {
-						$chardata[$i]['type'] = 'AN';
-					} elseif (($chardata[$j]['type'] == 'L') OR ($chardata[$j]['type'] == 'R')) {
-						break;
-					}
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W3. Change all ALs to R.
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['type'] == 'AL') {
-				$chardata[$i]['type'] = 'R';
-			}
-		}
-
-		// W4. A single European separator between two European numbers changes to a European number. A single common separator between two numbers of the same type changes to that type.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
-					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
-					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'AN') AND ($chardata[($i+1)]['type'] == 'AN')) {
-					$chardata[$i]['type'] = 'AN';
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W5. A sequence of European terminators adjacent to European numbers changes to all European numbers.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['type'] == 'ET') {
-				if (($levcount > 0) AND ($chardata[($i-1)]['type'] == 'EN')) {
-					$chardata[$i]['type'] = 'EN';
-				} else {
-					$j = $i+1;
-					while (($j < $numchars) AND ($chardata[$j]['level'] == $prevlevel)) {
-						if ($chardata[$j]['type'] == 'EN') {
-							$chardata[$i]['type'] = 'EN';
-							break;
-						} elseif ($chardata[$j]['type'] != 'ET') {
-							break;
-						}
-						++$j;
-					}
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// W6. Otherwise, separators and terminators change to Other Neutral.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($chardata[$i]['type'] == 'ET') OR ($chardata[$i]['type'] == 'ES') OR ($chardata[$i]['type'] == 'CS')) {
-				$chardata[$i]['type'] = 'ON';
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		//W7. Search backward from each instance of a European number until the first strong type (R, L, or sor) is found. If an L is found, then change the type of the European number to L.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if ($chardata[$i]['char'] == 'EN') {
-				for ($j=$levcount; $j >= 0; $j--) {
-					if ($chardata[$j]['type'] == 'L') {
-						$chardata[$i]['type'] = 'L';
-					} elseif ($chardata[$j]['type'] == 'R') {
-						break;
-					}
-				}
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// N1. A sequence of neutrals takes the direction of the surrounding strong text if the text on both sides has the same direction. European and Arabic numbers act as if they were R in terms of their influence on neutrals. Start-of-level-run (sor) and end-of-level-run (eor) are used at level run boundaries.
-		$prevlevel = -1;
-		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
-					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
-					$chardata[$i]['type'] = 'R';
-				} elseif ($chardata[$i]['type'] == 'N') {
-					// N2. Any remaining neutrals take the embedding direction
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				}
-			} elseif (($levcount == 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				// first char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
-					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[$i]['sor'] == 'R') OR ($chardata[$i]['sor'] == 'EN') OR ($chardata[$i]['sor'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
-					$chardata[$i]['type'] = 'R';
-				} elseif ($chardata[$i]['type'] == 'N') {
-					// N2. Any remaining neutrals take the embedding direction
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				}
-			} elseif (($levcount > 0) AND ((($i+1) == $numchars) OR (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] != $prevlevel))) {
-				//last char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
-					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-				 (($chardata[$i]['eor'] == 'R') OR ($chardata[$i]['eor'] == 'EN') OR ($chardata[$i]['eor'] == 'AN'))) {
-					$chardata[$i]['type'] = 'R';
-				} elseif ($chardata[$i]['type'] == 'N') {
-					// N2. Any remaining neutrals take the embedding direction
-					$chardata[$i]['type'] = $chardata[$i]['sor'];
-				}
-			} elseif ($chardata[$i]['type'] == 'N') {
-				// N2. Any remaining neutrals take the embedding direction
-				$chardata[$i]['type'] = $chardata[$i]['sor'];
-			}
-			if ($chardata[$i]['level'] != $prevlevel) {
-				$levcount = 0;
-			} else {
-				++$levcount;
-			}
-			$prevlevel = $chardata[$i]['level'];
-		}
-
-		// I1. For all characters with an even (left-to-right) embedding direction, those of type R go up one level and those of type AN or EN go up two levels.
-		// I2. For all characters with an odd (right-to-left) embedding direction, those of type L, EN or AN go up one level.
-		for ($i=0; $i < $numchars; ++$i) {
-			$odd = $chardata[$i]['level'] % 2;
-			if ($odd) {
-				if (($chardata[$i]['type'] == 'L') OR ($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
-					$chardata[$i]['level'] += 1;
-				}
-			} else {
-				if ($chardata[$i]['type'] == 'R') {
-					$chardata[$i]['level'] += 1;
-				} elseif (($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
-					$chardata[$i]['level'] += 2;
-				}
-			}
-			$maxlevel = max($chardata[$i]['level'],$maxlevel);
-		}
-
-		// L1. On each line, reset the embedding level of the following characters to the paragraph embedding level:
-		//	1. Segment separators,
-		//	2. Paragraph separators,
-		//	3. Any sequence of whitespace characters preceding a segment separator or paragraph separator, and
-		//	4. Any sequence of white space characters at the end of the line.
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($chardata[$i]['type'] == 'B') OR ($chardata[$i]['type'] == 'S')) {
-				$chardata[$i]['level'] = $pel;
-			} elseif ($chardata[$i]['type'] == 'WS') {
-				$j = $i+1;
-				while ($j < $numchars) {
-					if ((($chardata[$j]['type'] == 'B') OR ($chardata[$j]['type'] == 'S')) OR
-						(($j == ($numchars-1)) AND ($chardata[$j]['type'] == 'WS'))) {
-						$chardata[$i]['level'] = $pel;
-						break;
-					} elseif ($chardata[$j]['type'] != 'WS') {
-						break;
-					}
-					++$j;
-				}
-			}
-		}
-
-		// Arabic Shaping
-		// Cursively connected scripts, such as Arabic or Syriac, require the selection of positional character shapes that depend on adjacent characters. Shaping is logically applied after the Bidirectional Algorithm is used and is limited to characters within the same directional run.
-		if ($arabic) {
-			$endedletter = array(1569,1570,1571,1572,1573,1575,1577,1583,1584,1585,1586,1608,1688);
-			$alfletter = array(1570,1571,1573,1575);
-			$chardata2 = $chardata;
-			$laaletter = false;
-			$charAL = array();
-			$x = 0;
-			for ($i=0; $i < $numchars; ++$i) {
-				if (($this->unicode->uni_type[$chardata[$i]['char']] == 'AL') OR ($chardata[$i]['char'] == 32) OR ($chardata[$i]['char'] == 8204)) {
-					$charAL[$x] = $chardata[$i];
-					$charAL[$x]['i'] = $i;
-					$chardata[$i]['x'] = $x;
-					++$x;
-				}
-			}
-			$numAL = $x;
-			for ($i=0; $i < $numchars; ++$i) {
-				$thischar = $chardata[$i];
-				if ($i > 0) {
-					$prevchar = $chardata[($i-1)];
-				} else {
-					$prevchar = false;
-				}
-				if (($i+1) < $numchars) {
-					$nextchar = $chardata[($i+1)];
-				} else {
-					$nextchar = false;
-				}
-				if ($this->unicode->uni_type[$thischar['char']] == 'AL') {
-					$x = $thischar['x'];
-					if ($x > 0) {
-						$prevchar = $charAL[($x-1)];
-					} else {
-						$prevchar = false;
-					}
-					if (($x+1) < $numAL) {
-						$nextchar = $charAL[($x+1)];
-					} else {
-						$nextchar = false;
-					}
-					// if laa letter
-					if (($prevchar !== false) AND ($prevchar['char'] == 1604) AND (in_array($thischar['char'], $alfletter))) {
-						$arabicarr = $this->unicode->uni_laa_array;
-						$laaletter = true;
-						if ($x > 1) {
-							$prevchar = $charAL[($x-2)];
-						} else {
-							$prevchar = false;
-						}
-					} else {
-						$arabicarr = $this->unicode->uni_arabicsubst;
-						$laaletter = false;
-					}
-					if (($prevchar !== false) AND ($nextchar !== false) AND
-						(($this->unicode->uni_type[$prevchar['char']] == 'AL') OR ($this->unicode->uni_type[$prevchar['char']] == 'NSM')) AND
-						(($this->unicode->uni_type[$nextchar['char']] == 'AL') OR ($this->unicode->uni_type[$nextchar['char']] == 'NSM')) AND
-						($prevchar['type'] == $thischar['type']) AND
-						($nextchar['type'] == $thischar['type']) AND
-						($nextchar['char'] != 1567)) {
-						if (in_array($prevchar['char'], $endedletter)) {
-							if (isset($arabicarr[$thischar['char']][2])) {
-								// initial
-								$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
-							}
-						} else {
-							if (isset($arabicarr[$thischar['char']][3])) {
-								// medial
-								$chardata2[$i]['char'] = $arabicarr[$thischar['char']][3];
-							}
-						}
-					} elseif (($nextchar !== false) AND
-						(($this->unicode->uni_type[$nextchar['char']] == 'AL') OR ($this->unicode->uni_type[$nextchar['char']] == 'NSM')) AND
-						($nextchar['type'] == $thischar['type']) AND
-						($nextchar['char'] != 1567)) {
-						if (isset($arabicarr[$chardata[$i]['char']][2])) {
-							// initial
-							$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
-						}
-					} elseif ((($prevchar !== false) AND
-						(($this->unicode->uni_type[$prevchar['char']] == 'AL') OR ($this->unicode->uni_type[$prevchar['char']] == 'NSM')) AND
-						($prevchar['type'] == $thischar['type'])) OR
-						(($nextchar !== false) AND ($nextchar['char'] == 1567))) {
-						// final
-						if (($i > 1) AND ($thischar['char'] == 1607) AND
-							($chardata[$i-1]['char'] == 1604) AND
-							($chardata[$i-2]['char'] == 1604)) {
-							//Allah Word
-							// mark characters to delete with false
-							$chardata2[$i-2]['char'] = false;
-							$chardata2[$i-1]['char'] = false;
-							$chardata2[$i]['char'] = 65010;
-						} else {
-							if (($prevchar !== false) AND in_array($prevchar['char'], $endedletter)) {
-								if (isset($arabicarr[$thischar['char']][0])) {
-									// isolated
-									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
-								}
-							} else {
-								if (isset($arabicarr[$thischar['char']][1])) {
-									// final
-									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][1];
-								}
-							}
-						}
-					} elseif (isset($arabicarr[$thischar['char']][0])) {
-						// isolated
-						$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
-					}
-					// if laa letter
-					if ($laaletter) {
-						// mark characters to delete with false
-						$chardata2[($charAL[($x-1)]['i'])]['char'] = false;
-					}
-				} // end if AL (Arabic Letter)
-			} // end for each char
-			/*
-			 * Combining characters that can occur with Arabic Shadda (0651 HEX, 1617 DEC) are replaced.
-			 * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
-			 */
-			$cw = &$this->CurrentFont['cw'];
-			for ($i = 0; $i < ($numchars-1); ++$i) {
-				if (($chardata2[$i]['char'] == 1617) AND (isset($this->unicode->uni_diacritics[($chardata2[$i+1]['char'])]))) {
-					// check if the subtitution font is defined on current font
-					if (isset($cw[($this->unicode->uni_diacritics[($chardata2[$i+1]['char'])])])) {
-						$chardata2[$i]['char'] = false;
-						$chardata2[$i+1]['char'] = $this->unicode->uni_diacritics[($chardata2[$i+1]['char'])];
-					}
-				}
-			}
-			// remove marked characters
-			foreach ($chardata2 as $key => $value) {
-				if ($value['char'] === false) {
-					unset($chardata2[$key]);
-				}
-			}
-			$chardata = array_values($chardata2);
-			$numchars = count($chardata);
-			unset($chardata2);
-			unset($arabicarr);
-			unset($laaletter);
-			unset($charAL);
-		}
-
-		// L2. From the highest level found in the text to the lowest odd level on each line, including intermediate levels not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
-		for ($j=$maxlevel; $j > 0; $j--) {
-			$ordarray = Array();
-			$revarr = Array();
-			$onlevel = false;
-			for ($i=0; $i < $numchars; ++$i) {
-				if ($chardata[$i]['level'] >= $j) {
-					$onlevel = true;
-					if (isset($this->unicode->uni_mirror[$chardata[$i]['char']])) {
-						// L4. A character is depicted by a mirrored glyph if and only if (a) the resolved directionality of that character is R, and (b) the Bidi_Mirrored property value of that character is true.
-						$chardata[$i]['char'] = $this->unicode->uni_mirror[$chardata[$i]['char']];
-					}
-					$revarr[] = $chardata[$i];
-				} else {
-					if ($onlevel) {
-						$revarr = array_reverse($revarr);
-						$ordarray = array_merge($ordarray, $revarr);
-						$revarr = Array();
-						$onlevel = false;
-					}
-					$ordarray[] = $chardata[$i];
-				}
-			}
-			if ($onlevel) {
-				$revarr = array_reverse($revarr);
-				$ordarray = array_merge($ordarray, $revarr);
-			}
-			$chardata = $ordarray;
-		}
-
-		$ordarray = array();
-		for ($i=0; $i < $numchars; ++$i) {
-			$ordarray[] = $chardata[$i]['char'];
-			// store char values for subsetting
-			$this->CurrentFont['subsetchars'][$chardata[$i]['char']] = true;
-		}
-		// update font subsetchars
-		$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
-		return $ordarray;
-	}
-
-	// END OF BIDIRECTIONAL TEXT SECTION -------------------
-
-	/**
-	 * Adds a bookmark.
-	 * @param string $txt bookmark description.
-	 * @param int $level bookmark level (minimum value is 0).
-	 * @param float $y Y position in user units of the bookmark on the selected page (default = -1 = current position; 0 = page start;).
-	 * @param int $page target page number (leave empty for current page).
-	 * @access public
-	 * @author Olivier Plathey, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	public function Bookmark($txt, $level=0, $y=-1, $page='') {
-		if ($level < 0) {
-			$level = 0;
-		}
-		if (isset($this->outlines[0])) {
-			$lastoutline = end($this->outlines);
-			$maxlevel = $lastoutline['l'] + 1;
-		} else {
-			$maxlevel = 0;
-		}
-		if ($level > $maxlevel) {
-			$level = $maxlevel;
-		}
-		if ($y == -1) {
-			$y = $this->GetY();
-		}
-		if (empty($page)) {
-			$page = $this->PageNo();
-			if (empty($page)) {
-				return;
-			}
-		}
-		$this->outlines[] = array('t' => $txt, 'l' => $level, 'y' => $y, 'p' => $page);
-	}
-
-	/**
-	 * Create a bookmark PDF string.
-	 * @access protected
-	 * @author Olivier Plathey, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected function _putbookmarks() {
-		$nb = count($this->outlines);
-		if ($nb == 0) {
-			return;
-		}
-		// get sorting columns
-		$outline_p = array();
-		$outline_y = array();
-		foreach ($this->outlines as $key => $row) {
-			$outline_p[$key] = $row['p'];
-			$outline_k[$key] = $key;
-		}
-		// sort outlines by page and original position
-		array_multisort($outline_p, SORT_NUMERIC, SORT_ASC, $outline_k, SORT_NUMERIC, SORT_ASC, $this->outlines);
-		$lru = array();
-		$level = 0;
-		foreach ($this->outlines as $i => $o) {
-			if ($o['l'] > 0) {
-				$parent = $lru[($o['l'] - 1)];
-				//Set parent and last pointers
-				$this->outlines[$i]['parent'] = $parent;
-				$this->outlines[$parent]['last'] = $i;
-				if ($o['l'] > $level) {
-					//Level increasing: set first pointer
-					$this->outlines[$parent]['first'] = $i;
-				}
-			} else {
-				$this->outlines[$i]['parent'] = $nb;
-			}
-			if (($o['l'] <= $level) AND ($i > 0)) {
-				//Set prev and next pointers
-				$prev = $lru[$o['l']];
-				$this->outlines[$prev]['next'] = $i;
-				$this->outlines[$i]['prev'] = $prev;
-			}
-			$lru[$o['l']] = $i;
-			$level = $o['l'];
-		}
-		//Outline items
-		$n = $this->n + 1;
-		$nltags = '/<br[\s]?\/>|<\/(blockquote|dd|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|p|pre|ul|tcpdf|table|tr|td)>/si';
-		foreach ($this->outlines as $i => $o) {
-			if (isset($this->page_obj_id[($o['p'])])) {
-				$oid = $this->_newobj();
-				// covert HTML title to string
-				$title = preg_replace($nltags, "\n", $o['t']);
-				$title = preg_replace("/[\r]+/si", '', $title);
-				$title = preg_replace("/[\n]+/si", "\n", $title);
-				$title = strip_tags($title);
-				$title = $this->stringTrim($title);
-				$out = '<</Title '.$this->_textstring($title, $oid);
-				$out .= ' /Parent '.($n + $o['parent']).' 0 R';
-				if (isset($o['prev'])) {
-					$out .= ' /Prev '.($n + $o['prev']).' 0 R';
-				}
-				if (isset($o['next'])) {
-					$out .= ' /Next '.($n + $o['next']).' 0 R';
-				}
-				if (isset($o['first'])) {
-					$out .= ' /First '.($n + $o['first']).' 0 R';
-				}
-				if (isset($o['last'])) {
-					$out .= ' /Last '.($n + $o['last']).' 0 R';
-				}
-				$out .= ' '.sprintf('/Dest [%u 0 R /XYZ 0 %.2F null]', $this->page_obj_id[($o['p'])], ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
-				$out .= ' /Count 0 >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-			}
-		}
-		//Outline root
-		$this->OutlineRoot = $this->_newobj();
-		$this->_out('<< /Type /Outlines /First '.$n.' 0 R /Last '.($n + $lru[0]).' 0 R >>'."\n".'endobj');
-	}
-
-	// --- JAVASCRIPT ------------------------------------------------------
-
-	/**
-	 * Adds a javascript
-	 * @param string $script Javascript code
-	 * @access public
-	 * @author Johannes G�ntert, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	public function IncludeJS($script) {
-		$this->javascript .= $script;
-	}
-
-	/**
-	 * Adds a javascript object and return object ID
-	 * @param string $script Javascript code
-	 * @param boolean $onload if true executes this object when opening the document
-	 * @return int internal object ID
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function addJavascriptObject($script, $onload=false) {
-		++$this->n;
-		$this->js_objects[$this->n] = array('n' => $this->n, 'js' => $script, 'onload' => $onload);
-		return $this->n;
-	}
-
-	/**
-	 * Create a javascript PDF string.
-	 * @access protected
-	 * @author Johannes G�ntert, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected function _putjavascript() {
-		if (empty($this->javascript) AND empty($this->js_objects)) {
-			return;
-		}
-		if (strpos($this->javascript, 'this.addField') > 0) {
-			if (!$this->ur['enabled']) {
-				//$this->setUserRights();
-			}
-			// the following two lines are used to avoid form fields duplication after saving
-			// The addField method only works when releasing user rights (UR3)
-			$jsa = sprintf("ftcpdfdocsaved=this.addField('%s','%s',%d,[%.2F,%.2F,%.2F,%.2F]);", 'tcpdfdocsaved', 'text', 0, 0, 1, 0, 1);
-			$jsb = "getField('tcpdfdocsaved').value='saved';";
-			$this->javascript = $jsa."\n".$this->javascript."\n".$jsb;
-		}
-		$this->n_js = $this->_newobj();
-		$out = ' << /Names [';
-		if (!empty($this->javascript)) {
-			$out .= ' (EmbeddedJS) '.($this->n + 1).' 0 R';
-		}
-		if (!empty($this->js_objects)) {
-			foreach ($this->js_objects as $key => $val) {
-				if ($val['onload']) {
-					$out .= ' (JS'.$key.') '.$key.' 0 R';
-				}
-			}
-		}
-		$out .= ' ] >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-		// default Javascript object
-		if (!empty($this->javascript)) {
-			$obj_id = $this->_newobj();
-			$out = '<< /S /JavaScript';
-			$out .= ' /JS '.$this->_textstring($this->javascript, $obj_id);
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-		// additional Javascript objects
-		if (!empty($this->js_objects)) {
-			foreach ($this->js_objects as $key => $val) {
-				$out = $this->_getobj($key)."\n".' << /S /JavaScript /JS '.$this->_textstring($val['js'], $key).' >>'."\n".'endobj';
-				$this->_out($out);
-			}
-		}
-	}
-
-	/**
-	 * Convert color to javascript color.
-	 * @param string $color color name or #RRGGBB
-	 * @access protected
-	 * @author Denis Van Nuffelen, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected function _JScolor($color) {
-		static $aColors = array('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
-		if (substr($color,0,1) == '#') {
-			return sprintf("['RGB',%.3F,%.3F,%.3F]", hexdec(substr($color,1,2))/255, hexdec(substr($color,3,2))/255, hexdec(substr($color,5,2))/255);
-		}
-		if (!in_array($color,$aColors)) {
-			$this->Error('Invalid color: '.$color);
-		}
-		return 'color.'.$color;
-	}
-
-	/**
-	 * Adds a javascript form field.
-	 * @param string $type field type
-	 * @param string $name field name
-	 * @param int $x horizontal position
-	 * @param int $y vertical position
-	 * @param int $w width
-	 * @param int $h height
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @access protected
-	 * @author Denis Van Nuffelen, Nicola Asuni
-	 * @since 2.1.002 (2008-02-12)
-	 */
-	protected function _addfield($type, $name, $x, $y, $w, $h, $prop) {
-		if ($this->rtl) {
-			$x = $x - $w;
-		}
-		// the followind avoid fields duplication after saving the document
-		$this->javascript .= "if(getField('tcpdfdocsaved').value != 'saved') {";
-		$k = $this->k;
-		$this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%u,[%.2F,%.2F,%.2F,%.2F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
-		$this->javascript .= 'f'.$name.'.textSize='.$this->FontSizePt.";\n";
-		while (list($key, $val) = each($prop)) {
-			if (strcmp(substr($key, -5), 'Color') == 0) {
-				$val = $this->_JScolor($val);
-			} else {
-				$val = "'".$val."'";
-			}
-			$this->javascript .= 'f'.$name.'.'.$key.'='.$val.";\n";
-		}
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-		$this->javascript .= '}';
-	}
-
-	// --- FORM FIELDS -----------------------------------------------------
-
-	/**
-	 * Convert JavaScript form fields properties array to Annotation Properties array.
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @return array of annotation properties
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-06)
-	 */
-	protected function getAnnotOptFromJSProp($prop) {
-		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
-			// the annotation options area lready defined
-			return $prop['aopt'];
-		}
-		$opt = array(); // value to be returned
-		// alignment: Controls how the text is laid out within the text field.
-		if (isset($prop['alignment'])) {
-			switch ($prop['alignment']) {
-				case 'left': {
-					$opt['q'] = 0;
-					break;
-				}
-				case 'center': {
-					$opt['q'] = 1;
-					break;
-				}
-				case 'right': {
-					$opt['q'] = 2;
-					break;
-				}
-				default: {
-					$opt['q'] = ($this->rtl)?2:0;
-					break;
-				}
-			}
-		}
-		// lineWidth: Specifies the thickness of the border when stroking the perimeter of a field's rectangle.
-		if (isset($prop['lineWidth'])) {
-			$linewidth = intval($prop['lineWidth']);
-		} else {
-			$linewidth = 1;
-		}
-		// borderStyle: The border style for a field.
-		if (isset($prop['borderStyle'])) {
-			switch ($prop['borderStyle']) {
-				case 'border.d':
-				case 'dashed': {
-					$opt['border'] = array(0, 0, $linewidth, array(3, 2));
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'D', 'd'=>array(3, 2));
-					break;
-				}
-				case 'border.b':
-				case 'beveled': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'B');
-					break;
-				}
-				case 'border.i':
-				case 'inset': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'I');
-					break;
-				}
-				case 'border.u':
-				case 'underline': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'U');
-					break;
-				}
-				default:
-				case 'border.s':
-				case 'solid': {
-					$opt['border'] = array(0, 0, $linewidth);
-					$opt['bs'] = array('w'=>$linewidth, 's'=>'S');
-					break;
-				}
-			}
-		}
-		if (isset($prop['border']) AND is_array($prop['border'])) {
-			$opt['border'] = $prop['border'];
-		}
-		if (!isset($opt['mk'])) {
-			$opt['mk'] = array();
-		}
-		if (!isset($opt['mk']['if'])) {
-			$opt['mk']['if'] = array();
-		}
-		$opt['mk']['if']['a'] = array(0.5, 0.5);
-		// buttonAlignX: Controls how space is distributed from the left of the button face with respect to the icon.
-		if (isset($prop['buttonAlignX'])) {
-			$opt['mk']['if']['a'][0] = $prop['buttonAlignX'];
-		}
-		// buttonAlignY: Controls how unused space is distributed from the bottom of the button face with respect to the icon.
-		if (isset($prop['buttonAlignY'])) {
-			$opt['mk']['if']['a'][1] = $prop['buttonAlignY'];
-		}
-		// buttonFitBounds: If true, the extent to which the icon may be scaled is set to the bounds of the button field.
-		if (isset($prop['buttonFitBounds']) AND ($prop['buttonFitBounds'] == 'true')) {
-			$opt['mk']['if']['fb'] = true;
-		}
-		// buttonScaleHow: Controls how the icon is scaled (if necessary) to fit inside the button face.
-		if (isset($prop['buttonScaleHow'])) {
-			switch ($prop['buttonScaleHow']) {
-				case 'scaleHow.proportional': {
-					$opt['mk']['if']['s'] = 'P';
-					break;
-				}
-				case 'scaleHow.anamorphic': {
-					$opt['mk']['if']['s'] = 'A';
-					break;
-				}
-			}
-		}
-		// buttonScaleWhen: Controls when an icon is scaled to fit inside the button face.
-		if (isset($prop['buttonScaleWhen'])) {
-			switch ($prop['buttonScaleWhen']) {
-				case 'scaleWhen.always': {
-					$opt['mk']['if']['sw'] = 'A';
-					break;
-				}
-				case 'scaleWhen.never': {
-					$opt['mk']['if']['sw'] = 'N';
-					break;
-				}
-				case 'scaleWhen.tooBig': {
-					$opt['mk']['if']['sw'] = 'B';
-					break;
-				}
-				case 'scaleWhen.tooSmall': {
-					$opt['mk']['if']['sw'] = 'S';
-					break;
-				}
-			}
-		}
-		// buttonPosition: Controls how the text and the icon of the button are positioned with respect to each other within the button face.
-		if (isset($prop['buttonPosition'])) {
-			switch ($prop['buttonPosition']) {
-				case 0:
-				case 'position.textOnly': {
-					$opt['mk']['tp'] = 0;
-					break;
-				}
-				case 1:
-				case 'position.iconOnly': {
-					$opt['mk']['tp'] = 1;
-					break;
-				}
-				case 2:
-				case 'position.iconTextV': {
-					$opt['mk']['tp'] = 2;
-					break;
-				}
-				case 3:
-				case 'position.textIconV': {
-					$opt['mk']['tp'] = 3;
-					break;
-				}
-				case 4:
-				case 'position.iconTextH': {
-					$opt['mk']['tp'] = 4;
-					break;
-				}
-				case 5:
-				case 'position.textIconH': {
-					$opt['mk']['tp'] = 5;
-					break;
-				}
-				case 6:
-				case 'position.overlay': {
-					$opt['mk']['tp'] = 6;
-					break;
-				}
-			}
-		}
-		// fillColor: Specifies the background color for a field.
-		if (isset($prop['fillColor'])) {
-			if (is_array($prop['fillColor'])) {
-				$opt['mk']['bg'] = $prop['fillColor'];
-			} else {
-				$opt['mk']['bg'] = $this->convertHTMLColorToDec($prop['fillColor']);
-			}
-		}
-		// strokeColor: Specifies the stroke color for a field that is used to stroke the rectangle of the field with a line as large as the line width.
-		if (isset($prop['strokeColor'])) {
-			if (is_array($prop['strokeColor'])) {
-				$opt['mk']['bc'] = $prop['strokeColor'];
-			} else {
-				$opt['mk']['bc'] = $this->convertHTMLColorToDec($prop['strokeColor']);
-			}
-		}
-		// rotation: The rotation of a widget in counterclockwise increments.
-		if (isset($prop['rotation'])) {
-			$opt['mk']['r'] = $prop['rotation'];
-		}
-		// charLimit: Limits the number of characters that a user can type into a text field.
-		if (isset($prop['charLimit'])) {
-			$opt['maxlen'] = intval($prop['charLimit']);
-		}
-		if (!isset($ff)) {
-			$ff = 0;
-		}
-		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
-			$ff += 1 << 0;
-		}
-		// required: Specifies whether a field requires a value.
-		if (isset($prop['required']) AND ($prop['required'] == 'true')) {
-			$ff += 1 << 1;
-		}
-		// multiline: Controls how text is wrapped within the field.
-		if (isset($prop['multiline']) AND ($prop['multiline'] == 'true')) {
-			$ff += 1 << 12;
-		}
-		// password: Specifies whether the field should display asterisks when data is entered in the field.
-		if (isset($prop['password']) AND ($prop['password'] == 'true')) {
-			$ff += 1 << 13;
-		}
-		// NoToggleToOff: If set, exactly one radio button shall be selected at all times; selecting the currently selected button has no effect.
-		if (isset($prop['NoToggleToOff']) AND ($prop['NoToggleToOff'] == 'true')) {
-			$ff += 1 << 14;
-		}
-		// Radio: If set, the field is a set of radio buttons.
-		if (isset($prop['Radio']) AND ($prop['Radio'] == 'true')) {
-			$ff += 1 << 15;
-		}
-		// Pushbutton: If set, the field is a pushbutton that does not retain a permanent value.
-		if (isset($prop['Pushbutton']) AND ($prop['Pushbutton'] == 'true')) {
-			$ff += 1 << 16;
-		}
-		// Combo: If set, the field is a combo box; if clear, the field is a list box.
-		if (isset($prop['Combo']) AND ($prop['Combo'] == 'true')) {
-			$ff += 1 << 17;
-		}
-		// editable: Controls whether a combo box is editable.
-		if (isset($prop['editable']) AND ($prop['editable'] == 'true')) {
-			$ff += 1 << 18;
-		}
-		// Sort: If set, the field's option items shall be sorted alphabetically.
-		if (isset($prop['Sort']) AND ($prop['Sort'] == 'true')) {
-			$ff += 1 << 19;
-		}
-		// fileSelect: If true, sets the file-select flag in the Options tab of the text field (Field is Used for File Selection).
-		if (isset($prop['fileSelect']) AND ($prop['fileSelect'] == 'true')) {
-			$ff += 1 << 20;
-		}
-		// multipleSelection: If true, indicates that a list box allows a multiple selection of items.
-		if (isset($prop['multipleSelection']) AND ($prop['multipleSelection'] == 'true')) {
-			$ff += 1 << 21;
-		}
-		// doNotSpellCheck: If true, spell checking is not performed on this editable text field.
-		if (isset($prop['doNotSpellCheck']) AND ($prop['doNotSpellCheck'] == 'true')) {
-			$ff += 1 << 22;
-		}
-		// doNotScroll: If true, the text field does not scroll and the user, therefore, is limited by the rectangular region designed for the field.
-		if (isset($prop['doNotScroll']) AND ($prop['doNotScroll'] == 'true')) {
-			$ff += 1 << 23;
-		}
-		// comb: If set to true, the field background is drawn as series of boxes (one for each character in the value of the field) and each character of the content is drawn within those boxes. The number of boxes drawn is determined from the charLimit property. It applies only to text fields. The setter will also raise if any of the following field properties are also set multiline, password, and fileSelect. A side-effect of setting this property is that the doNotScroll property is also set.
-		if (isset($prop['comb']) AND ($prop['comb'] == 'true')) {
-			$ff += 1 << 24;
-		}
-		// radiosInUnison: If false, even if a group of radio buttons have the same name and export value, they behave in a mutually exclusive fashion, like HTML radio buttons.
-		if (isset($prop['radiosInUnison']) AND ($prop['radiosInUnison'] == 'true')) {
-			$ff += 1 << 25;
-		}
-		// richText: If true, the field allows rich text formatting.
-		if (isset($prop['richText']) AND ($prop['richText'] == 'true')) {
-			$ff += 1 << 25;
-		}
-		// commitOnSelChange: Controls whether a field value is committed after a selection change.
-		if (isset($prop['commitOnSelChange']) AND ($prop['commitOnSelChange'] == 'true')) {
-			$ff += 1 << 26;
-		}
-		$opt['ff'] = $ff;
-		// defaultValue: The default value of a field - that is, the value that the field is set to when the form is reset.
-		if (isset($prop['defaultValue'])) {
-			$opt['dv'] = $prop['defaultValue'];
-		}
-		$f = 4; // default value for annotation flags
-		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
-			$f += 1 << 6;
-		}
-		// display: Controls whether the field is hidden or visible on screen and in print.
-		if (isset($prop['display'])) {
-			if ($prop['display'] == 'display.visible') {
-				//
-			} elseif ($prop['display'] == 'display.hidden') {
-				$f += 1 << 1;
-			} elseif ($prop['display'] == 'display.noPrint') {
-				$f -= 1 << 2;
-			} elseif ($prop['display'] == 'display.noView') {
-				$f += 1 << 5;
-			}
-		}
-		$opt['f'] = $f;
-		// currentValueIndices: Reads and writes single or multiple values of a list box or combo box.
-		if (isset($prop['currentValueIndices']) AND is_array($prop['currentValueIndices'])) {
-			$opt['i'] = $prop['currentValueIndices'];
-		}
-		// value: The value of the field data that the user has entered.
-		if (isset($prop['value'])) {
-			if (is_array($prop['value'])) {
-				$opt['opt'] = array();
-				foreach ($prop['value'] AS $key => $optval) {
-					// exportValues: An array of strings representing the export values for the field.
-					if (isset($prop['exportValues'][$key])) {
-						$opt['opt'][$key] = array($prop['exportValues'][$key], $prop['value'][$key]);
-					} else {
-						$opt['opt'][$key] = $prop['value'][$key];
-					}
-				}
-			} else {
-				$opt['v'] = $prop['value'];
-			}
-		}
-		// richValue: This property specifies the text contents and formatting of a rich text field.
-		if (isset($prop['richValue'])) {
-			$opt['rv'] = $prop['richValue'];
-		}
-		// submitName: If nonempty, used during form submission instead of name. Only applicable if submitting in HTML format (that is, URL-encoded).
-		if (isset($prop['submitName'])) {
-			$opt['tm'] = $prop['submitName'];
-		}
-		// name: Fully qualified field name.
-		if (isset($prop['name'])) {
-			$opt['t'] = $prop['name'];
-		}
-		// userName: The user name (short description string) of the field.
-		if (isset($prop['userName'])) {
-			$opt['tu'] = $prop['userName'];
-		}
-		// highlight: Defines how a button reacts when a user clicks it.
-		if (isset($prop['highlight'])) {
-			switch ($prop['highlight']) {
-				case 'none':
-				case 'highlight.n': {
-					$opt['h'] = 'N';
-					break;
-				}
-				case 'invert':
-				case 'highlight.i': {
-					$opt['h'] = 'i';
-					break;
-				}
-				case 'push':
-				case 'highlight.p': {
-					$opt['h'] = 'P';
-					break;
-				}
-				case 'outline':
-				case 'highlight.o': {
-					$opt['h'] = 'O';
-					break;
-				}
-			}
-		}
-		// Unsupported options:
-		// - calcOrderIndex: Changes the calculation order of fields in the document.
-		// - delay: Delays the redrawing of a field's appearance.
-		// - defaultStyle: This property defines the default style attributes for the form field.
-		// - style: Allows the user to set the glyph style of a check box or radio button.
-		// - textColor, textFont, textSize
-		return $opt;
-	}
-
-	/**
-	 * Set default properties for form fields.
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-06)
-	 */
-	public function setFormDefaultProp($prop=array()) {
-		$this->default_form_prop = $prop;
-	}
-
-	/**
-	 * Return the default properties for form fields.
-	 * @return array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-06)
-	 */
-	public function getFormDefaultProp() {
-		return $this->default_form_prop;
-	}
-
-	/**
-	 * Creates a text field
-	 * @param string $name field name
-	 * @param float $w Width of the rectangle
-	 * @param float $h Height of the rectangle
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function TextField($name, $w, $h, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('text', $name, $x, $y, $w, $h, $prop);
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		// get annotation data
-		$popt = $this->getAnnotOptFromJSProp($prop);
-		// set default appearance stream
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		$popt['ap'] = array();
-		$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// remove some conflicting options
-		unset($opt['bs']);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Tx';
-		$opt['t'] = $name;
-		/*
-		Additional annotation's parameters (check _putannotsobj() method):
-		//$opt['f']
-		//$opt['ap']
-		//$opt['as']
-		//$opt['bs']
-		//$opt['be']
-		//$opt['c']
-		//$opt['border']
-		//$opt['h']
-		//$opt['mk']
-		//$opt['mk']['r']
-		//$opt['mk']['bc']
-		//$opt['mk']['bg']
-		//$opt['mk']['ca']
-		//$opt['mk']['rc']
-		//$opt['mk']['ac']
-		//$opt['mk']['i']
-		//$opt['mk']['ri']
-		//$opt['mk']['ix']
-		//$opt['mk']['if']
-		//$opt['mk']['if']['sw']
-		//$opt['mk']['if']['s']
-		//$opt['mk']['if']['a']
-		//$opt['mk']['if']['fb']
-		//$opt['mk']['tp']
-		//$opt['tu']
-		//$opt['tm']
-		//$opt['ff']
-		//$opt['v']
-		//$opt['dv']
-		//$opt['a']
-		//$opt['aa']
-		//$opt['q']
-		*/
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a RadioButton field
-	 * @param string $name field name
-	 * @param int $w width
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param string $onvalue value to be returned if selected.
-	 * @param boolean $checked define the initial state.
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function RadioButton($name, $w, $prop=array(), $opt=array(), $onvalue='On', $checked=false, $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($w, $x, $y);
-		if ($js) {
-			$this->_addfield('radiobutton', $name, $x, $y, $w, $w, $prop);
-			return;
-		}
-		if ($this->empty_string($onvalue)) {
-			$onvalue = 'On';
-		}
-		if ($checked) {
-			$defval = $onvalue;
-		} else {
-			$defval = 'Off';
-		}
-		// set data for parent group
-		if (!isset($this->radiobutton_groups[$this->page])) {
-			$this->radiobutton_groups[$this->page] = array();
-		}
-		if (!isset($this->radiobutton_groups[$this->page][$name])) {
-			$this->radiobutton_groups[$this->page][$name] = array();
-			++$this->n;
-			$this->radiobutton_groups[$this->page][$name]['n'] = $this->n;
-			$this->radio_groups[] = $this->n;
-			$kid = ($this->n + 2);
-		} else {
-			$kid = ($this->n + 1);
-		}
-		// save object ID to be added on Kids entry on parent object
-		$this->radiobutton_groups[$this->page][$name][] = array('kid' => $kid, 'def' => $defval);
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['NoToggleToOff'] = 'true';
-		$prop['Radio'] = 'true';
-		$prop['borderStyle'] = 'inset';
-		// get annotation data
-		$popt = $this->getAnnotOptFromJSProp($prop);
-		// set additional default values
-		$font = 'zapfdingbats';
-		$this->AddFont($font);
-		$tmpfont = $this->getFontBuffer($font);
-		$this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i'];
-		$fontstyle = sprintf('/F%d %.2F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		$popt['ap'] = array();
-		$popt['ap']['n'] = array();
-		$popt['ap']['n'][$onvalue] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-		$popt['ap']['n']['Off'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-		if (!isset($popt['mk'])) {
-			$popt['mk'] = array();
-		}
-		$popt['mk']['ca'] = '(l)';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Btn';
-		if ($checked) {
-			$opt['v'] = array('/'.$onvalue);
-			$opt['as'] = $onvalue;
-		} else {
-			$opt['as'] = 'Off';
-		}
-		$this->Annotation($x, $y, $w, $w, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a List-box field
-	 * @param string $name field name
-	 * @param int $w width
-	 * @param int $h height
-	 * @param array $values array containing the list of values.
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function ListBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('listbox', $name, $x, $y, $w, $h, $prop);
-			$s = '';
-			foreach ($values as $value) {
-				$s .= "'".addslashes($value)."',";
-			}
-			$this->javascript .= 'f'.$name.'.setItems(['.substr($s, 0, -1)."]);\n";
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		// get annotation data
-		$popt = $this->getAnnotOptFromJSProp($prop);
-		// set additional default values
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		$popt['ap'] = array();
-		$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Ch';
-		$opt['t'] = $name;
-		$opt['opt'] = $values;
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a Combo-box field
-	 * @param string $name field name
-	 * @param int $w width
-	 * @param int $h height
-	 * @param array $values array containing the list of values.
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function ComboBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('combobox', $name, $x, $y, $w, $h, $prop);
-			$s = '';
-			foreach ($values as $value) {
-				$s .= "'".addslashes($value)."',";
-			}
-			$this->javascript .= 'f'.$name.'.setItems(['.substr($s, 0, -1)."]);\n";
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['Combo'] = true;
-		// get annotation data
-		$popt = $this->getAnnotOptFromJSProp($prop);
-		// set additional default options
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		$popt['ap'] = array();
-		$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Ch';
-		$opt['t'] = $name;
-		$opt['opt'] = $values;
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a CheckBox field
-	 * @param string $name field name
-	 * @param int $w width
-	 * @param boolean $checked define the initial state.
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param string $onvalue value to be returned if selected.
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function CheckBox($name, $w, $checked=false, $prop=array(), $opt=array(), $onvalue='Yes', $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($w, $x, $y);
-		if ($js) {
-			$this->_addfield('checkbox', $name, $x, $y, $w, $w, $prop);
-			return;
-		}
-		if (!isset($prop['value'])) {
-			$prop['value'] = array('Yes');
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['borderStyle'] = 'inset';
-		// get annotation data
-		$popt = $this->getAnnotOptFromJSProp($prop);
-		// set additional default options
-		$font = 'zapfdingbats';
-		$this->AddFont($font);
-		$tmpfont = $this->getFontBuffer($font);
-		$this->annotation_fonts[$tmpfont['fontkey']] = $tmpfont['i'];
-		$fontstyle = sprintf('/F%d %.2F Tf %s', $tmpfont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		$popt['ap'] = array();
-		$popt['ap']['n'] = array();
-		$popt['ap']['n']['Yes'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-		$popt['ap']['n']['Off'] = 'q BT '.$fontstyle.' 0 0 Td (8) Tj ET Q';
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Btn';
-		$opt['t'] = $name;
-		$opt['opt'] = array($onvalue);
-		if ($checked) {
-			$opt['v'] = array('/0');
-			$opt['as'] = 'Yes';
-		} else {
-			$opt['v'] = array('/Off');
-			$opt['as'] = 'Off';
-		}
-		$this->Annotation($x, $y, $w, $w, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	/**
-	 * Creates a button field
-	 * @param string $name field name
-	 * @param int $w width
-	 * @param int $h height
-	 * @param string $caption caption.
-	 * @param mixed $action action triggered by pressing the button. Use a string to specify a javascript action. Use an array to specify a form action options as on section 12.7.5 of PDF32000_2008.
-	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param float $x Abscissa of the upper-left corner of the rectangle
-	 * @param float $y Ordinate of the upper-left corner of the rectangle
-	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.8.000 (2009-09-07)
-	 */
-	public function Button($name, $w, $h, $caption, $action, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		if ($js) {
-			$this->_addfield('button', $name, $this->x, $this->y, $w, $h, $prop);
-			$this->javascript .= 'f'.$name.".buttonSetCaption('".addslashes($caption)."');\n";
-			$this->javascript .= 'f'.$name.".setAction('MouseUp','".addslashes($action)."');\n";
-			$this->javascript .= 'f'.$name.".highlight='push';\n";
-			$this->javascript .= 'f'.$name.".print=false;\n";
-			return;
-		}
-		// get default style
-		$prop = array_merge($this->getFormDefaultProp(), $prop);
-		$prop['Pushbutton'] = 'true';
-		$prop['highlight'] = 'push';
-		$prop['display'] = 'display.noPrint';
-		// get annotation data
-		$popt = $this->getAnnotOptFromJSProp($prop);
-		$this->annotation_fonts[$this->CurrentFont['fontkey']] = $this->CurrentFont['i'];
-		$fontstyle = sprintf('/F%d %.2F Tf %s', $this->CurrentFont['i'], $this->FontSizePt, $this->TextColor);
-		$popt['da'] = $fontstyle;
-		$popt['ap'] = array();
-		$popt['ap']['n'] = 'q BT '.$fontstyle.' ET Q';
-		// set additional default options
-		if (!isset($popt['mk'])) {
-			$popt['mk'] = array();
-		}
-		$ann_obj_id = ($this->n + 1);
-		if (!empty($action) AND !is_array($action)) {
-			$ann_obj_id = ($this->n + 2);
-		}
-		$popt['mk']['ca'] = $this->_textstring($caption, $ann_obj_id);
-		$popt['mk']['rc'] = $this->_textstring($caption, $ann_obj_id);
-		$popt['mk']['ac'] = $this->_textstring($caption, $ann_obj_id);
-		// merge options
-		$opt = array_merge($popt, $opt);
-		// set remaining annotation data
-		$opt['Subtype'] = 'Widget';
-		$opt['ft'] = 'Btn';
-		$opt['t'] = $caption;
-		$opt['v'] = $name;
-		if (!empty($action)) {
-			if (is_array($action)) {
-				// form action options as on section 12.7.5 of PDF32000_2008.
-				$opt['aa'] = '/D <<';
-				$bmode = array('SubmitForm', 'ResetForm', 'ImportData');
-				foreach ($action AS $key => $val) {
-					if (($key == 'S') AND in_array($val, $bmode)) {
-						$opt['aa'] .= ' /S /'.$val;
-					} elseif (($key == 'F') AND (!empty($val))) {
-						$opt['aa'] .= ' /F '.$this->_datastring($val, $ann_obj_id);
-					} elseif (($key == 'Fields') AND is_array($val) AND !empty($val)) {
-						$opt['aa'] .= ' /Fields [';
-						foreach ($val AS $field) {
-							$opt['aa'] .= ' '.$this->_textstring($field, $ann_obj_id);
-						}
-						$opt['aa'] .= ']';
-					} elseif (($key == 'Flags')) {
-						$ff = 0;
-						if (is_array($val)) {
-							foreach ($val AS $flag) {
-								switch ($flag) {
-									case 'Include/Exclude': {
-										$ff += 1 << 0;
-										break;
-									}
-									case 'IncludeNoValueFields': {
-										$ff += 1 << 1;
-										break;
-									}
-									case 'ExportFormat': {
-										$ff += 1 << 2;
-										break;
-									}
-									case 'GetMethod': {
-										$ff += 1 << 3;
-										break;
-									}
-									case 'SubmitCoordinates': {
-										$ff += 1 << 4;
-										break;
-									}
-									case 'XFDF': {
-										$ff += 1 << 5;
-										break;
-									}
-									case 'IncludeAppendSaves': {
-										$ff += 1 << 6;
-										break;
-									}
-									case 'IncludeAnnotations': {
-										$ff += 1 << 7;
-										break;
-									}
-									case 'SubmitPDF': {
-										$ff += 1 << 8;
-										break;
-									}
-									case 'CanonicalFormat': {
-										$ff += 1 << 9;
-										break;
-									}
-									case 'ExclNonUserAnnots': {
-										$ff += 1 << 10;
-										break;
-									}
-									case 'ExclFKey': {
-										$ff += 1 << 11;
-										break;
-									}
-									case 'EmbedForm': {
-										$ff += 1 << 13;
-										break;
-									}
-								}
-							}
-						} else {
-							$ff = intval($val);
-						}
-						$opt['aa'] .= ' /Flags '.$ff;
-					}
-				}
-				$opt['aa'] .= ' >>';
-			} else {
-				// Javascript action or raw action command
-				$js_obj_id = $this->addJavascriptObject($action);
-				$opt['aa'] = '/D '.$js_obj_id.' 0 R';
-			}
-		}
-		$this->Annotation($x, $y, $w, $h, $name, $opt, 0);
-		if ($this->rtl) {
-			$this->x -= $w;
-		} else {
-			$this->x += $w;
-		}
-	}
-
-	// --- END FORMS FIELDS ------------------------------------------------
-
-	/**
-	 * Add certification signature (DocMDP or UR3)
-	 * You can set only one signature type
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 4.6.008 (2009-05-07)
-	 */
-	protected function _putsignature() {
-		if ((!$this->sign) OR (!isset($this->signature_data['cert_type']))) {
-			return;
-		}
-		$out = $this->_getobj($this->sig_obj_id + 1)."\n";
-		$out .= '<< /Type /Sig';
-		$out .= ' /Filter /Adobe.PPKLite';
-		$out .= ' /SubFilter /adbe.pkcs7.detached';
-		$out .= ' '.$this->byterange_string;
-		$out .= ' /Contents<'.str_repeat('0', $this->signature_max_length).'>';
-		$out .= ' /Reference ['; // array of signature reference dictionaries
-		$out .= ' << /Type /SigRef';
-		if ($this->signature_data['cert_type'] > 0) {
-			$out .= ' /TransformMethod /DocMDP';
-			$out .= ' /TransformParams <<';
-			$out .= ' /Type /TransformParams';
-			$out .= ' /V /1.2';
-			$out .= ' /P '.$this->signature_data['cert_type'];
-		} else {
-			$out .= ' /TransformMethod /UR3';
-			$out .= ' /TransformParams <<';
-			$out .= ' /Type /TransformParams';
-			$out .= ' /V /2.2';
-			if (!$this->empty_string($this->ur['document'])) {
-				$out .= ' /Document['.$this->ur['document'].']';
-			}
-			if (!$this->empty_string($this->ur['form'])) {
-				$out .= ' /Form['.$this->ur['form'].']';
-			}
-			if (!$this->empty_string($this->ur['signature'])) {
-				$out .= ' /Signature['.$this->ur['signature'].']';
-			}
-			if (!$this->empty_string($this->ur['annots'])) {
-				$out .= ' /Annots['.$this->ur['annots'].']';
-			}
-			if (!$this->empty_string($this->ur['ef'])) {
-				$out .= ' /EF['.$this->ur['ef'].']';
-			}
-			if (!$this->empty_string($this->ur['formex'])) {
-				$out .= ' /FormEX['.$this->ur['formex'].']';
-			}
-		}
-		$out .= ' >>'; // close TransformParams
-		// optional digest data (values must be calculated and replaced later)
-		//$out .= ' /Data ********** 0 R';
-		//$out .= ' /DigestMethod/MD5';
-		//$out .= ' /DigestLocation[********** 34]';
-		//$out .= ' /DigestValue<********************************>';
-		$out .= ' >>';
-		$out .= ' ]'; // end of reference
-		if (isset($this->signature_data['info']['Name']) AND !$this->empty_string($this->signature_data['info']['Name'])) {
-			$out .= ' /Name '.$this->_textstring($this->signature_data['info']['Name']);
-		}
-		if (isset($this->signature_data['info']['Location']) AND !$this->empty_string($this->signature_data['info']['Location'])) {
-			$out .= ' /Location '.$this->_textstring($this->signature_data['info']['Location']);
-		}
-		if (isset($this->signature_data['info']['Reason']) AND !$this->empty_string($this->signature_data['info']['Reason'])) {
-			$out .= ' /Reason '.$this->_textstring($this->signature_data['info']['Reason']);
-		}
-		if (isset($this->signature_data['info']['ContactInfo']) AND !$this->empty_string($this->signature_data['info']['ContactInfo'])) {
-			$out .= ' /ContactInfo '.$this->_textstring($this->signature_data['info']['ContactInfo']);
-		}
-		$out .= ' /M '.$this->_datestring();
-		$out .= ' >>';
-		$out .= "\n".'endobj';
-		$this->_out($out);
-	}
-
-	/**
-	 * Set User's Rights for PDF Reader
-	 * WARNING: This is experimental and currently do not work.
-	 * Check the PDF Reference 8.7.1 Transform Methods,
-	 * Table 8.105 Entries in the UR transform parameters dictionary
-	 * @param boolean $enable if true enable user's rights on PDF reader
-	 * @param string $document Names specifying additional document-wide usage rights for the document. The only defined value is "/FullSave", which permits a user to save the document along with modified form and/or annotation data.
-	 * @param string $annots Names specifying additional annotation-related usage rights for the document. Valid names in PDF 1.5 and later are /Create/Delete/Modify/Copy/Import/Export, which permit the user to perform the named operation on annotations.
-	 * @param string $form Names specifying additional form-field-related usage rights for the document. Valid names are: /Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate
-	 * @param string $signature Names specifying additional signature-related usage rights for the document. The only defined value is /Modify, which permits a user to apply a digital signature to an existing signature form field or clear a signed signature form field.
-	 * @param string $ef Names specifying additional usage rights for named embedded files in the document. Valid names are /Create/Delete/Modify/Import, which permit the user to perform the named operation on named embedded files
-	 Names specifying additional embedded-files-related usage rights for the document.
-	 * @param string $formex Names specifying additional form-field-related usage rights. The only valid name is BarcodePlaintext, which permits text form field data to be encoded as a plaintext two-dimensional barcode.
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 2.9.000 (2008-03-26)
-	 */
-	public function setUserRights(
-			$enable=true,
-			$document='/FullSave',
-			$annots='/Create/Delete/Modify/Copy/Import/Export',
-			$form='/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate',
-			$signature='/Modify',
-			$ef='/Create/Delete/Modify/Import',
-			$formex='') {
-		$this->ur['enabled'] = $enable;
-		$this->ur['document'] = $document;
-		$this->ur['annots'] = $annots;
-		$this->ur['form'] = $form;
-		$this->ur['signature'] = $signature;
-		$this->ur['ef'] = $ef;
-		$this->ur['formex'] = $formex;
-		if (!$this->sign) {
-			$this->setSignature('', '', '', '', 0, array());
-		}
-	}
-
-	/**
-	 * Enable document signature (requires the OpenSSL Library).
-	 * The digital signature improve document authenticity and integrity and allows o enable extra features on Acrobat Reader.
-	 * To create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
-	 * To export crt to p12: openssl pkcs12 -export -in tcpdf.crt -out tcpdf.p12
-	 * To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
-	 * @param mixed $signing_cert signing certificate (string or filename prefixed with 'file://')
-	 * @param mixed $private_key private key (string or filename prefixed with 'file://')
-	 * @param string $private_key_password password
-	 * @param string $extracerts specifies the name of a file containing a bunch of extra certificates to include in the signature which can for example be used to help the recipient to verify the certificate that you used.
-	 * @param int $cert_type The access permissions granted for this document. Valid values shall be: 1 = No changes to the document shall be permitted; any change to the document shall invalidate the signature; 2 = Permitted changes shall be filling in forms, instantiating page templates, and signing; other changes shall invalidate the signature; 3 = Permitted changes shall be the same as for 2, as well as annotation creation, deletion, and modification; other changes shall invalidate the signature.
-	 * @param array $info array of option information: Name, Location, Reason, ContactInfo.
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.6.005 (2009-04-24)
-	 */
-	public function setSignature($signing_cert='', $private_key='', $private_key_password='', $extracerts='', $cert_type=2, $info=array()) {
-		// to create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
-		// to export crt to p12: openssl pkcs12 -export -in tcpdf.crt -out tcpdf.p12
-		// to convert pfx certificate to pem: openssl
-		//     OpenSSL> pkcs12 -in <cert.pfx> -out <cert.crt> -nodes
-		$this->sign = true;
-		++$this->n;
-		$this->sig_obj_id = $this->n; // signature widget
-		++$this->n; // signature object ($this->sig_obj_id + 1)
-		$this->signature_data = array();
-		if (strlen($signing_cert) == 0) {
-			$signing_cert = 'file://'.dirname(__FILE__).'/tcpdf.crt';
-			$private_key_password = 'tcpdfdemo';
-		}
-		if (strlen($private_key) == 0) {
-			$private_key = $signing_cert;
-		}
-		$this->signature_data['signcert'] = $signing_cert;
-		$this->signature_data['privkey'] = $private_key;
-		$this->signature_data['password'] = $private_key_password;
-		$this->signature_data['extracerts'] = $extracerts;
-		$this->signature_data['cert_type'] = $cert_type;
-		$this->signature_data['info'] = $info;
-	}
-
-	/**
-	 * Set the digital signature appearance (a cliccable rectangle area to get signature properties)
-	 * @param float $x Abscissa of the upper-left corner.
-	 * @param float $y Ordinate of the upper-left corner.
-	 * @param float $w Width of the signature area.
-	 * @param float $h Height of the signature area.
-	 * @param int $page option page number (if < 0 the current page is used).
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 5.3.011 (2010-06-17)
-	 */
-	public function setSignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1) {
-		if (($page < 1) OR ($page > $this->numpages)) {
-			$this->signature_appearance['page'] = $this->page;
-		} else {
-			$this->signature_appearance['page'] = intval($page);
-		}
-		$a = $x * $this->k;
-		$b = $this->pagedim[($this->signature_appearance['page'])]['h'] - (($y + $h) * $this->k);
-		$c = $w * $this->k;
-		$d = $h * $this->k;
-		$this->signature_appearance['rect'] = sprintf('%.2F %.2F %.2F %.2F', $a, $b, $a+$c, $b+$d);
-	}
-
-	/**
-	 * Create a new page group.
-	 * NOTE: call this function before calling AddPage()
-	 * @param int $page starting group page (leave empty for next page).
-	 * @access public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function startPageGroup($page='') {
-		if (empty($page)) {
-			$page = $this->page + 1;
-		}
-		$this->newpagegroup[$page] = true;
-	}
-
-	/**
-	 * Defines an alias for the total number of pages.
-	 * It will be substituted as the document is closed.
-	 * @param string $alias The alias.
-	 * @access public
-	 * @since 1.4
-	 * @see getAliasNbPages(), PageNo(), Footer()
-	 */
-	public function AliasNbPages($alias='{nb}') {
-		$this->AliasNbPages = $alias;
-	}
-
-	/**
-	 * Returns the string alias used for the total number of pages.
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * @return string
-	 * @access public
-	 * @since 4.0.018 (2008-08-08)
-	 * @see AliasNbPages(), PageNo(), Footer()
-	 */
-	public function getAliasNbPages() {
-		if ($this->isUnicodeFont()) {
-			return '{'.$this->AliasNbPages.'}';
-		}
-		return $this->AliasNbPages;
-	}
-
-	/**
-	 * Defines an alias for the page number.
-	 * It will be substituted as the document is closed.
-	 * @param string $alias The alias.
-	 * @access public
-	 * @since 4.5.000 (2009-01-02)
-	 * @see getAliasNbPages(), PageNo(), Footer()
-	 */
-	public function AliasNumPage($alias='{pnb}') {
-		//Define an alias for total number of pages
-		$this->AliasNumPage = $alias;
-	}
-
-	/**
-	 * Returns the string alias used for the page number.
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * @return string
-	 * @access public
-	 * @since 4.5.000 (2009-01-02)
-	 * @see AliasNbPages(), PageNo(), Footer()
-	 */
-	public function getAliasNumPage() {
-		if ($this->isUnicodeFont()) {
-			return '{'.$this->AliasNumPage.'}';
-		}
-		return $this->AliasNumPage;
-	}
-
-	/**
-	 * Return the current page in the group.
-	 * @return current page in the group
-	 * @access public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function getGroupPageNo() {
-		return $this->pagegroups[$this->currpagegroup];
-	}
-
-	/**
-	 * Returns the current group page number formatted as a string.
-	 * @access public
-	 * @since 4.3.003 (2008-11-18)
-	 * @see PaneNo(), formatPageNumber()
-	 */
-	public function getGroupPageNoFormatted() {
-		return $this->formatPageNumber($this->getGroupPageNo());
-	}
-
-	/**
-	 * Return the alias of the current page group
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * (will be replaced by the total number of pages in this group).
-	 * @return alias of the current page group
-	 * @access public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function getPageGroupAlias() {
-		if ($this->isUnicodeFont()) {
-			return '{'.$this->currpagegroup.'}';
-		}
-		return $this->currpagegroup;
-	}
-
-	/**
-	 * Return the alias for the page number on the current page group
-	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
-	 * (will be replaced by the total number of pages in this group).
-	 * @return alias of the current page group
-	 * @access public
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	public function getPageNumGroupAlias() {
-		if ($this->isUnicodeFont()) {
-			return '{'.str_replace('{nb', '{pnb', $this->currpagegroup).'}';
-		}
-		return str_replace('{nb', '{pnb', $this->currpagegroup);
-	}
-
-	/**
-	 * Format the page numbers.
-	 * This method can be overriden for custom formats.
-	 * @param int $num page number
-	 * @access protected
-	 * @since 4.2.005 (2008-11-06)
-	 */
-	protected function formatPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
-	}
-
-	/**
-	 * Format the page numbers on the Table Of Content.
-	 * This method can be overriden for custom formats.
-	 * @param int $num page number
-	 * @access protected
-	 * @since 4.5.001 (2009-01-04)
-	 * @see addTOC(), addHTMLTOC()
-	 */
-	protected function formatTOCPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
-	}
-
-	/**
-	 * Returns the current page number formatted as a string.
-	 * @access public
-	 * @since 4.2.005 (2008-11-06)
-	 * @see PaneNo(), formatPageNumber()
-	 */
-	public function PageNoFormatted() {
-		return $this->formatPageNumber($this->PageNo());
-	}
-
-	/**
-	 * Put visibility settings.
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function _putocg() {
-		$this->n_ocg_print = $this->_newobj();
-		$this->_out('<< /Type /OCG /Name '.$this->_textstring('print', $this->n_ocg_print).' /Usage << /Print <</PrintState /ON>> /View <</ViewState /OFF>> >> >>'."\n".'endobj');
-		$this->n_ocg_view = $this->_newobj();
-		$this->_out('<< /Type /OCG /Name '.$this->_textstring('view', $this->n_ocg_view).' /Usage << /Print <</PrintState /OFF>> /View <</ViewState /ON>> >> >>'."\n".'endobj');
-	}
-
-	/**
-	 * Set the visibility of the successive elements.
-	 * This can be useful, for instance, to put a background
-	 * image or color that will show on screen but won't print.
-	 * @param string $v visibility mode. Legal values are: all, print, screen.
-	 * @access public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function setVisibility($v) {
-		if ($this->openMarkedContent) {
-			// close existing open marked-content
-			$this->_out('EMC');
-			$this->openMarkedContent = false;
-		}
-		switch($v) {
-			case 'print': {
-				$this->_out('/OC /OC1 BDC');
-				$this->openMarkedContent = true;
-				break;
-			}
-			case 'screen': {
-				$this->_out('/OC /OC2 BDC');
-				$this->openMarkedContent = true;
-				break;
-			}
-			case 'all': {
-				$this->_out('');
-				break;
-			}
-			default: {
-				$this->Error('Incorrect visibility: '.$v);
-				break;
-			}
-		}
-		$this->visibility = $v;
-	}
-
-	/**
-	 * Add transparency parameters to the current extgstate
-	 * @param array $params parameters
-	 * @return the number of extgstates
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function addExtGState($parms) {
-		$n = count($this->extgstates) + 1;
-		// check if this ExtGState already exist
-		for ($i = 1; $i < $n; ++$i) {
-			if ($this->extgstates[$i]['parms'] == $parms) {
-				// return reference to existing ExtGState
-				return $i;
-			}
-		}
-		$this->extgstates[$n]['parms'] = $parms;
-		return $n;
-	}
-
-	/**
-	 * Add an extgstate
-	 * @param array $gs extgstate
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function setExtGState($gs) {
-		$this->_out(sprintf('/GS%d gs', $gs));
-	}
-
-	/**
-	 * Put extgstates for object transparency
-	 * @param array $gs extgstate
-	 * @access protected
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	protected function _putextgstates() {
-		$ne = count($this->extgstates);
-		for ($i = 1; $i <= $ne; ++$i) {
-			$this->extgstates[$i]['n'] = $this->_newobj();
-			$out = '<< /Type /ExtGState';
-			foreach ($this->extgstates[$i]['parms'] as $k => $v) {
-				if (is_float($v)) {
-					$v = sprintf('%.2F', $v);
-				}
-				$out .= ' /'.$k.' '.$v;
-			}
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-		}
-	}
-
-	/**
-	 * Set alpha for stroking (CA) and non-stroking (ca) operations.
-	 * @param float $alpha real value from 0 (transparent) to 1 (opaque)
-	 * @param string $bm blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity
-	 * @access public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function setAlpha($alpha, $bm='Normal') {
-		$gs = $this->addExtGState(array('ca' => $alpha, 'CA' => $alpha, 'BM' => '/'.$bm, 'AIS' => 'false'));
-		$this->setExtGState($gs);
-	}
-
-	/**
-	 * Set the default JPEG compression quality (1-100)
-	 * @param int $quality JPEG quality, integer between 1 and 100
-	 * @access public
-	 * @since 3.0.000 (2008-03-27)
-	 */
-	public function setJPEGQuality($quality) {
-		if (($quality < 1) OR ($quality > 100)) {
-			$quality = 75;
-		}
-		$this->jpeg_quality = intval($quality);
-	}
-
-	/**
-	 * Set the default number of columns in a row for HTML tables.
-	 * @param int $cols number of columns
-	 * @access public
-	 * @since 3.0.014 (2008-06-04)
-	 */
-	public function setDefaultTableColumns($cols=4) {
-		$this->default_table_columns = intval($cols);
-	}
-
-	/**
-	 * Set the height of the cell (line height) respect the font height.
-	 * @param int $h cell proportion respect font height (typical value = 1.25).
-	 * @access public
-	 * @since 3.0.014 (2008-06-04)
-	 */
-	public function setCellHeightRatio($h) {
-		$this->cell_height_ratio = $h;
-	}
-
-	/**
-	 * return the height of cell repect font height.
-	 * @access public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getCellHeightRatio() {
-		return $this->cell_height_ratio;
-	}
-
-	/**
-	 * Set the PDF version (check PDF reference for valid values).
-	 * Default value is 1.t
-	 * @access public
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	public function setPDFVersion($version='1.7') {
-		$this->PDFVersion = $version;
-	}
-
-	/**
-	 * Set the viewer preferences dictionary controlling the way the document is to be presented on the screen or in print.
-	 * (see Section 8.1 of PDF reference, "Viewer Preferences").
-	 * <ul><li>HideToolbar boolean (Optional) A flag specifying whether to hide the viewer application's tool bars when the document is active. Default value: false.</li><li>HideMenubar boolean (Optional) A flag specifying whether to hide the viewer application's menu bar when the document is active. Default value: false.</li><li>HideWindowUI boolean (Optional) A flag specifying whether to hide user interface elements in the document's window (such as scroll bars and navigation controls), leaving only the document's contents displayed. Default value: false.</li><li>FitWindow boolean (Optional) A flag specifying whether to resize the document's window to fit the size of the first displayed page. Default value: false.</li><li>CenterWindow boolean (Optional) A flag specifying whether to position the document's window in the center of the screen. Default value: false.</li><li>DisplayDocTitle boolean (Optional; PDF 1.4) A flag specifying whether the window's title bar should display the document title taken from the Title entry of the document information dictionary (see Section 10.2.1, "Document Information Dictionary"). If false, the title bar should instead display the name of the PDF file containing the document. Default value: false.</li><li>NonFullScreenPageMode name (Optional) The document's page mode, specifying how to display the document on exiting full-screen mode:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>UseOC Optional content group panel visible</li></ul>This entry is meaningful only if the value of the PageMode entry in the catalog dictionary (see Section 3.6.1, "Document Catalog") is FullScreen; it is ignored otherwise. Default value: UseNone.</li><li>ViewArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be displayed when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>ViewClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be rendered when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintScaling name (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document. Valid values are: <ul><li>None, which indicates that the print dialog should reflect no page scaling</li><li>AppDefault (default), which indicates that applications should use the current print scaling</li></ul></li><li>Duplex name (Optional; PDF 1.7) The paper handling option to use when printing the file from the print dialog. The following values are valid:<ul><li>Simplex - Print single-sided</li><li>DuplexFlipShortEdge - Duplex and flip on the short edge of the sheet</li><li>DuplexFlipLongEdge - Duplex and flip on the long edge of the sheet</li></ul>Default value: none</li><li>PickTrayByPDFSize boolean (Optional; PDF 1.7) A flag specifying whether the PDF page size is used to select the input paper tray. This setting influences only the preset values used to populate the print dialog presented by a PDF viewer application. If PickTrayByPDFSize is true, the check box in the print dialog associated with input paper tray is checked. Note: This setting has no effect on Mac OS systems, which do not provide the ability to pick the input tray by size.</li><li>PrintPageRange array (Optional; PDF 1.7) The page numbers used to initialize the print dialog box when the file is printed. The first page of the PDF file is denoted by 1. Each pair consists of the first and last pages in the sub-range. An odd number of integers causes this entry to be ignored. Negative numbers cause the entire array to be ignored. Default value: as defined by PDF viewer application</li><li>NumCopies integer (Optional; PDF 1.7) The number of copies to be printed when the print dialog is opened for this file. Supported values are the integers 2 through 5. Values outside this range are ignored. Default value: as defined by PDF viewer application, but typically 1</li></ul>
-	 * @param array $preferences array of options.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 3.1.000 (2008-06-09)
-	 */
-	public function setViewerPreferences($preferences) {
-		$this->viewer_preferences = $preferences;
-	}
-
-	/**
-	 * Paints color transition registration bars
-	 * @param float $x abscissa of the top left corner of the rectangle.
-	 * @param float $y ordinate of the top left corner of the rectangle.
-	 * @param float $w width of the rectangle.
-	 * @param float $h height of the rectangle.
-	 * @param boolean $transition if true prints tcolor transitions to white.
-	 * @param boolean $vertical if true prints bar vertically.
-	 * @param string $colors colors to print, one letter per color separated by comma (for example 'A,W,R,G,B,C,M,Y,K'): A=black, W=white, R=red, G=green, B=blue, C=cyan, M=magenta, Y=yellow, K=black.
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-26)
-	 * @access public
-	 */
-	public function colorRegistrationBar($x, $y, $w, $h, $transition=true, $vertical=false, $colors='A,R,G,B,C,M,Y,K') {
-		$bars = explode(',', $colors);
-		$numbars = count($bars); // number of bars to print
-		// set bar measures
-		if ($vertical) {
-			$coords = array(0, 0, 0, 1);
-			$wb = $w / $numbars; // bar width
-			$hb = $h; // bar height
-			$xd = $wb; // delta x
-			$yd = 0; // delta y
-		} else {
-			$coords = array(1, 0, 0, 0);
-			$wb = $w; // bar width
-			$hb = $h / $numbars; // bar height
-			$xd = 0; // delta x
-			$yd = $hb; // delta y
-		}
-		$xb = $x;
-		$yb = $y;
-		foreach ($bars as $col) {
-			switch ($col) {
-				// set transition colors
-				case 'A': { // BLACK
-					$col_a = array(255);
-					$col_b = array(0);
-					break;
-				}
-				case 'W': { // WHITE
-					$col_a = array(0);
-					$col_b = array(255);
-					break;
-				}
-				case 'R': { // R
-					$col_a = array(255,255,255);
-					$col_b = array(255,0,0);
-					break;
-				}
-				case 'G': { // G
-					$col_a = array(255,255,255);
-					$col_b = array(0,255,0);
-					break;
-				}
-				case 'B': { // B
-					$col_a = array(255,255,255);
-					$col_b = array(0,0,255);
-					break;
-				}
-				case 'C': { // C
-					$col_a = array(0,0,0,0);
-					$col_b = array(100,0,0,0);
-					break;
-				}
-				case 'M': { // M
-					$col_a = array(0,0,0,0);
-					$col_b = array(0,100,0,0);
-					break;
-				}
-				case 'Y': { // Y
-					$col_a = array(0,0,0,0);
-					$col_b = array(0,0,100,0);
-					break;
-				}
-				case 'K': { // K
-					$col_a = array(0,0,0,0);
-					$col_b = array(0,0,0,100);
-					break;
-				}
-				default: { // GRAY
-					$col_a = array(255);
-					$col_b = array(0);
-					break;
-				}
-			}
-			if ($transition) {
-				// color gradient
-				$this->LinearGradient($xb, $yb, $wb, $hb, $col_a, $col_b, $coords);
-			} else {
-				// color rectangle
-				$this->SetFillColorArray($col_b);
-				$this->Rect($xb, $yb, $wb, $hb, 'F', array());
-			}
-			$xb += $xd;
-			$yb += $yd;
-		}
-	}
-
-	/**
-	 * Paints crop mark
-	 * @param float $x abscissa of the crop mark center.
-	 * @param float $y ordinate of the crop mark center.
-	 * @param float $w width of the crop mark.
-	 * @param float $h height of the crop mark.
-	 * @param string $type type of crop mark, one sybol per type separated by comma: A = top left, B = top right, C = bottom left, D = bottom right.
-	 * @param array $color crop mark color (default black).
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-26)
-	 * @access public
-	 */
-	public function cropMark($x, $y, $w, $h, $type='A,B,C,D', $color=array(0,0,0)) {
-		$this->SetLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
-		$crops = explode(',', $type);
-		$numcrops = count($crops); // number of crop marks to print
-		$dw = $w / 4; // horizontal space to leave before the intersection point
-		$dh = $h / 4; // vertical space to leave before the intersection point
-		foreach ($crops as $crop) {
-			switch ($crop) {
-				case 'A': {
-					$x1 = $x;
-					$y1 = $y - $h;
-					$x2 = $x;
-					$y2 = $y - $dh;
-					$x3 = $x - $w;
-					$y3 = $y;
-					$x4 = $x - $dw;
-					$y4 = $y;
-					break;
-				}
-				case 'B': {
-					$x1 = $x;
-					$y1 = $y - $h;
-					$x2 = $x;
-					$y2 = $y - $dh;
-					$x3 = $x + $dw;
-					$y3 = $y;
-					$x4 = $x + $w;
-					$y4 = $y;
-					break;
-				}
-				case 'C': {
-					$x1 = $x - $w;
-					$y1 = $y;
-					$x2 = $x - $dw;
-					$y2 = $y;
-					$x3 = $x;
-					$y3 = $y + $dh;
-					$x4 = $x;
-					$y4 = $y + $h;
-					break;
-				}
-				case 'D': {
-					$x1 = $x + $dw;
-					$y1 = $y;
-					$x2 = $x + $w;
-					$y2 = $y;
-					$x3 = $x;
-					$y3 = $y + $dh;
-					$x4 = $x;
-					$y4 = $y + $h;
-					break;
-				}
-			}
-			$this->Line($x1, $y1, $x2, $y2);
-			$this->Line($x3, $y3, $x4, $y4);
-		}
-	}
-
-	/**
-	 * Paints a registration mark
-	 * @param float $x abscissa of the registration mark center.
-	 * @param float $y ordinate of the registration mark center.
-	 * @param float $r radius of the crop mark.
-	 * @param boolean $double if true print two concentric crop marks.
-	 * @param array $cola crop mark color (default black).
-	 * @param array $colb second crop mark color.
-	 * @author Nicola Asuni
-	 * @since 4.9.000 (2010-03-26)
-	 * @access public
-	 */
-	public function registrationMark($x, $y, $r, $double=false, $cola=array(0,0,0), $colb=array(255,255,255)) {
-		$line_style = array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
-		$this->SetFillColorArray($cola);
-		$this->PieSector($x, $y, $r, 90, 180, 'F');
-		$this->PieSector($x, $y, $r, 270, 360, 'F');
-		$this->Circle($x, $y, $r, 0, 360, 'C', $line_style, array(), 8);
-		if ($double) {
-			$r2 = $r * 0.5;
-			$this->SetFillColorArray($colb);
-			$this->PieSector($x, $y, $r2, 90, 180, 'F');
-			$this->PieSector($x, $y, $r2, 270, 360, 'F');
-			$this->SetFillColorArray($cola);
-			$this->PieSector($x, $y, $r2, 0, 90, 'F');
-			$this->PieSector($x, $y, $r2, 180, 270, 'F');
-			$this->Circle($x, $y, $r2, 0, 360, 'C', $line_style, array(), 8);
-		}
-	}
-
-	/**
-	 * Paints a linear colour gradient.
-	 * @param float $x abscissa of the top left corner of the rectangle.
-	 * @param float $y ordinate of the top left corner of the rectangle.
-	 * @param float $w width of the rectangle.
-	 * @param float $h height of the rectangle.
-	 * @param array $col1 first color (Grayscale, RGB or CMYK components).
-	 * @param array $col2 second color (Grayscale, RGB or CMYK components).
-	 * @param array $coords array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
-	 * @author Andreas W�rmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function LinearGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0,0,1,0)) {
-		$this->Clip($x, $y, $w, $h);
-		$this->Gradient(2, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
-	}
-
-	/**
-	 * Paints a radial colour gradient.
-	 * @param float $x abscissa of the top left corner of the rectangle.
-	 * @param float $y ordinate of the top left corner of the rectangle.
-	 * @param float $w width of the rectangle.
-	 * @param float $h height of the rectangle.
-	 * @param array $col1 first color (Grayscale, RGB or CMYK components).
-	 * @param array $col2 second color (Grayscale, RGB or CMYK components).
-	 * @param array $coords array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
-	 * @author Andreas W�rmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function RadialGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0.5,0.5,0.5,0.5,1)) {
-		$this->Clip($x, $y, $w, $h);
-		$this->Gradient(3, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
-	}
-
-	/**
-	 * Paints a coons patch mesh.
-	 * @param float $x abscissa of the top left corner of the rectangle.
-	 * @param float $y ordinate of the top left corner of the rectangle.
-	 * @param float $w width of the rectangle.
-	 * @param float $h height of the rectangle.
-	 * @param array $col1 first color (lower left corner) (RGB components).
-	 * @param array $col2 second color (lower right corner) (RGB components).
-	 * @param array $col3 third color (upper right corner) (RGB components).
-	 * @param array $col4 fourth color (upper left corner) (RGB components).
-	 * @param array $coords <ul><li>for one patch mesh: array(float x1, float y1, .... float x12, float y12): 12 pairs of coordinates (normally from 0 to 1) which specify the Bezier control points that define the patch. First pair is the lower left edge point, next is its right control point (control point 2). Then the other points are defined in the order: control point 1, edge point, control point 2 going counter-clockwise around the patch. Last (x12, y12) is the first edge point's left control point (control point 1).</li><li>for two or more patch meshes: array[number of patches]: arrays with the following keys for each patch: f: where to put that patch (0 = first patch, 1, 2, 3 = right, top and left of precedent patch - I didn't figure this out completely - just try and error ;-) points: 12 pairs of coordinates of the Bezier control points as above for the first patch, 8 pairs of coordinates for the following patches, ignoring the coordinates already defined by the precedent patch (I also didn't figure out the order of these - also: try and see what's happening) colors: must be 4 colors for the first patch, 2 colors for the following patches</li></ul>
-	 * @param array $coords_min minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
-	 * @param array $coords_max maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
-	 * @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
-	 * @author Andreas W�rmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function CoonsPatchMesh($x, $y, $w, $h, $col1=array(), $col2=array(), $col3=array(), $col4=array(), $coords=array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min=0, $coords_max=1, $antialias=false) {
-		$this->Clip($x, $y, $w, $h);
-		$n = count($this->gradients) + 1;
-		$this->gradients[$n] = array();
-		$this->gradients[$n]['type'] = 6; //coons patch mesh
-		$this->gradients[$n]['coords'] = array();
-		$this->gradients[$n]['antialias'] = $antialias;
-		$this->gradients[$n]['colors'] = array();
-		$this->gradients[$n]['transparency'] = false;
-		//check the coords array if it is the simple array or the multi patch array
-		if (!isset($coords[0]['f'])) {
-			//simple array -> convert to multi patch array
-			if (!isset($col1[1])) {
-				$col1[1] = $col1[2] = $col1[0];
-			}
-			if (!isset($col2[1])) {
-				$col2[1] = $col2[2] = $col2[0];
-			}
-			if (!isset($col3[1])) {
-				$col3[1] = $col3[2] = $col3[0];
-			}
-			if (!isset($col4[1])) {
-				$col4[1] = $col4[2] = $col4[0];
-			}
-			$patch_array[0]['f'] = 0;
-			$patch_array[0]['points'] = $coords;
-			$patch_array[0]['colors'][0]['r'] = $col1[0];
-			$patch_array[0]['colors'][0]['g'] = $col1[1];
-			$patch_array[0]['colors'][0]['b'] = $col1[2];
-			$patch_array[0]['colors'][1]['r'] = $col2[0];
-			$patch_array[0]['colors'][1]['g'] = $col2[1];
-			$patch_array[0]['colors'][1]['b'] = $col2[2];
-			$patch_array[0]['colors'][2]['r'] = $col3[0];
-			$patch_array[0]['colors'][2]['g'] = $col3[1];
-			$patch_array[0]['colors'][2]['b'] = $col3[2];
-			$patch_array[0]['colors'][3]['r'] = $col4[0];
-			$patch_array[0]['colors'][3]['g'] = $col4[1];
-			$patch_array[0]['colors'][3]['b'] = $col4[2];
-		} else {
-			//multi patch array
-			$patch_array = $coords;
-		}
-		$bpcd = 65535; //16 bits per coordinate
-		//build the data stream
-		$this->gradients[$n]['stream'] = '';
-		$count_patch = count($patch_array);
-		for ($i=0; $i < $count_patch; ++$i) {
-			$this->gradients[$n]['stream'] .= chr($patch_array[$i]['f']); //start with the edge flag as 8 bit
-			$count_points = count($patch_array[$i]['points']);
-			for ($j=0; $j < $count_points; ++$j) {
-				//each point as 16 bit
-				$patch_array[$i]['points'][$j] = (($patch_array[$i]['points'][$j] - $coords_min) / ($coords_max - $coords_min)) * $bpcd;
-				if ($patch_array[$i]['points'][$j] < 0) {
-					$patch_array[$i]['points'][$j] = 0;
-				}
-				if ($patch_array[$i]['points'][$j] > $bpcd) {
-					$patch_array[$i]['points'][$j] = $bpcd;
-				}
-				$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] / 256));
-				$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] % 256));
-			}
-			$count_cols = count($patch_array[$i]['colors']);
-			for ($j=0; $j < $count_cols; ++$j) {
-				//each color component as 8 bit
-				$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['r']);
-				$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['g']);
-				$this->gradients[$n]['stream'] .= chr($patch_array[$i]['colors'][$j]['b']);
-			}
-		}
-		//paint the gradient
-		$this->_out('/Sh'.$n.' sh');
-		//restore previous Graphic State
-		$this->_out('Q');
-	}
-
-	/**
-	 * Set a rectangular clipping area.
-	 * @param float $x abscissa of the top left corner of the rectangle (or top right corner for RTL mode).
-	 * @param float $y ordinate of the top left corner of the rectangle.
-	 * @param float $w width of the rectangle.
-	 * @param float $h height of the rectangle.
-	 * @author Andreas W�rmser, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access protected
-	 */
-	protected function Clip($x, $y, $w, $h) {
-		if ($this->rtl) {
-			$x = $this->w - $x - $w;
-		}
-		//save current Graphic State
-		$s = 'q';
-		//set clipping area
-		$s .= sprintf(' %.2F %.2F %.2F %.2F re W n', $x*$this->k, ($this->h-$y)*$this->k, $w*$this->k, -$h*$this->k);
-		//set up transformation matrix for gradient
-		$s .= sprintf(' %.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k);
-		$this->_out($s);
-	}
-
-	/**
-	 * Output gradient.
-	 * @param int $type type of gradient (1 Function-based shading; 2 Axial shading; 3 Radial shading; 4 Free-form Gouraud-shaded triangle mesh; 5 Lattice-form Gouraud-shaded triangle mesh; 6 Coons patch mesh; 7 Tensor-product patch mesh). (Not all types are currently supported)
-	 * @param array $coords array of coordinates.
-	 * @param array $stops array gradient color components: color = array of GRAY, RGB or CMYK color components; offset = (0 to 1) represents a location along the gradient vector; exponent = exponent of the exponential interpolation function (default = 1).
-	 * @param array $background An array of colour components appropriate to the colour space, specifying a single background colour value.
-	 * @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
-	 * @author Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function Gradient($type, $coords, $stops, $background=array(), $antialias=false) {
-		$n = count($this->gradients) + 1;
-		$this->gradients[$n] = array();
-		$this->gradients[$n]['type'] = $type;
-		$this->gradients[$n]['coords'] = $coords;
-		$this->gradients[$n]['antialias'] = $antialias;
-		$this->gradients[$n]['colors'] = array();
-		$this->gradients[$n]['transparency'] = false;
-		// color space
-		$numcolspace = count($stops[0]['color']);
-		$bcolor = array_values($background);
-		switch($numcolspace) {
-			case 4: { // CMYK
-				$this->gradients[$n]['colspace'] = 'DeviceCMYK';
-				if (!empty($background)) {
-					$this->gradients[$n]['background'] = sprintf('%.3F %.3F %.3F %.3F', $bcolor[0]/100, $bcolor[1]/100, $bcolor[2]/100, $bcolor[3]/100);
-				}
-				break;
-			}
-			case 3: { // RGB
-				$this->gradients[$n]['colspace'] = 'DeviceRGB';
-				if (!empty($background)) {
-					$this->gradients[$n]['background'] = sprintf('%.3F %.3F %.3F', $bcolor[0]/255, $bcolor[1]/255, $bcolor[2]/255);
-				}
-				break;
-			}
-			case 1: { // Gray scale
-				$this->gradients[$n]['colspace'] = 'DeviceGray';
-				if (!empty($background)) {
-					$this->gradients[$n]['background'] = sprintf('%.3F', $bcolor[0]/255);
-				}
-				break;
-			}
-		}
-		$num_stops = count($stops);
-		$last_stop_id = $num_stops - 1;
-		foreach ($stops as $key => $stop) {
-			$this->gradients[$n]['colors'][$key] = array();
-			// offset represents a location along the gradient vector
-			if (isset($stop['offset'])) {
-				$this->gradients[$n]['colors'][$key]['offset'] = $stop['offset'];
-			} else {
-				if ($key == 0) {
-					$this->gradients[$n]['colors'][$key]['offset'] = 0;
-				} elseif ($key == $last_stop_id) {
-					$this->gradients[$n]['colors'][$key]['offset'] = 1;
-				} else {
-					$offsetstep = (1 - $this->gradients[$n]['colors'][($key - 1)]['offset']) / ($num_stops - $key);
-					$this->gradients[$n]['colors'][$key]['offset'] = $this->gradients[$n]['colors'][($key - 1)]['offset'] + $offsetstep;
-				}
-			}
-			if (isset($stop['opacity'])) {
-				$this->gradients[$n]['colors'][$key]['opacity'] = $stop['opacity'];
-				if ($stop['opacity'] < 1) {
-					$this->gradients[$n]['transparency'] = true;
-				}
-			} else {
-				$this->gradients[$n]['colors'][$key]['opacity'] = 1;
-			}
-			// exponent for the exponential interpolation function
-			if (isset($stop['exponent'])) {
-				$this->gradients[$n]['colors'][$key]['exponent'] = $stop['exponent'];
-			} else {
-				$this->gradients[$n]['colors'][$key]['exponent'] = 1;
-			}
-			// set colors
-			$color = array_values($stop['color']);
-			switch($numcolspace) {
-				case 4: { // CMYK
-					$this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F %.3F %.3F %.3F', $color[0]/100, $color[1]/100, $color[2]/100, $color[3]/100);
-					break;
-				}
-				case 3: { // RGB
-					$this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F %.3F %.3F', $color[0]/255, $color[1]/255, $color[2]/255);
-					break;
-				}
-				case 1: { // Gray scale
-					$this->gradients[$n]['colors'][$key]['color'] = sprintf('%.3F', $color[0]/255);
-					break;
-				}
-			}
-		}
-		if ($this->gradients[$n]['transparency']) {
-			// paint luminosity gradient
-			$this->_out('/TGS'.$n.' gs');
-		}
-		//paint the gradient
-		$this->_out('/Sh'.$n.' sh');
-		//restore previous Graphic State
-		$this->_out('Q');
-	}
-
-	/**
-	 * Output gradient shaders.
-	 * @author Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access protected
-	 */
-	function _putshaders() {
-		$idt = count($this->gradients); //index for transparency gradients
-		foreach ($this->gradients as $id => $grad) {
-			if (($grad['type'] == 2) OR ($grad['type'] == 3)) {
-				$fc = $this->_newobj();
-				$out = '<<';
-				$out .= ' /FunctionType 3';
-				$out .= ' /Domain [0 1]';
-				$functions = '';
-				$bounds = '';
-				$encode = '';
-				$i = 1;
-				$num_cols = count($grad['colors']);
-				$lastcols = $num_cols - 1;
-				for ($i = 1; $i < $num_cols; ++$i) {
-					$functions .= ($fc + $i).' 0 R ';
-					if ($i < $lastcols) {
-						$bounds .= sprintf('%.3F ', $grad['colors'][$i]['offset']);
-					}
-					$encode .= '0 1 ';
-				}
-				$out .= ' /Functions ['.trim($functions).']';
-				$out .= ' /Bounds ['.trim($bounds).']';
-				$out .= ' /Encode ['.trim($encode).']';
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				for ($i = 1; $i < $num_cols; ++$i) {
-					$this->_newobj();
-					$out = '<<';
-					$out .= ' /FunctionType 2';
-					$out .= ' /Domain [0 1]';
-					$out .= ' /C0 ['.$grad['colors'][($i - 1)]['color'].']';
-					$out .= ' /C1 ['.$grad['colors'][$i]['color'].']';
-					$out .= ' /N '.$grad['colors'][$i]['exponent'];
-					$out .= ' >>';
-					$out .= "\n".'endobj';
-					$this->_out($out);
-				}
-				// set transparency fuctions
-				if ($grad['transparency']) {
-					$ft = $this->_newobj();
-					$out = '<<';
-					$out .= ' /FunctionType 3';
-					$out .= ' /Domain [0 1]';
-					$functions = '';
-					$i = 1;
-					$num_cols = count($grad['colors']);
-					for ($i = 1; $i < $num_cols; ++$i) {
-						$functions .= ($ft + $i).' 0 R ';
-					}
-					$out .= ' /Functions ['.trim($functions).']';
-					$out .= ' /Bounds ['.trim($bounds).']';
-					$out .= ' /Encode ['.trim($encode).']';
-					$out .= ' >>';
-					$out .= "\n".'endobj';
-					$this->_out($out);
-					for ($i = 1; $i < $num_cols; ++$i) {
-						$this->_newobj();
-						$out = '<<';
-						$out .= ' /FunctionType 2';
-						$out .= ' /Domain [0 1]';
-						$out .= ' /C0 ['.$grad['colors'][($i - 1)]['opacity'].']';
-						$out .= ' /C1 ['.$grad['colors'][$i]['opacity'].']';
-						$out .= ' /N '.$grad['colors'][$i]['exponent'];
-						$out .= ' >>';
-						$out .= "\n".'endobj';
-						$this->_out($out);
-					}
-				}
-			}
-			// set shading object
-			$this->_newobj();
-			$out = '<< /ShadingType '.$grad['type'];
-			if (isset($grad['colspace'])) {
-				$out .= ' /ColorSpace /'.$grad['colspace'];
-			} else {
-				$out .= ' /ColorSpace /DeviceRGB';
-			}
-			if (isset($grad['background']) AND !empty($grad['background'])) {
-				$out .= ' /Background ['.$grad['background'].']';
-			}
-			if (isset($grad['antialias']) AND ($grad['antialias'] === true)) {
-				$out .= ' /AntiAlias true';
-			}
-			if ($grad['type'] == 2) {
-				$out .= ' '.sprintf('/Coords [%.3F %.3F %.3F %.3F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3]);
-				$out .= ' /Domain [0 1]';
-				$out .= ' /Function '.$fc.' 0 R';
-				$out .= ' /Extend [true true]';
-				$out .= ' >>';
-			} elseif ($grad['type'] == 3) {
-				//x0, y0, r0, x1, y1, r1
-				//at this this time radius of inner circle is 0
-				$out .= ' '.sprintf('/Coords [%.3F %.3F 0 %.3F %.3F %.3F]', $grad['coords'][0], $grad['coords'][1], $grad['coords'][2], $grad['coords'][3], $grad['coords'][4]);
-				$out .= ' /Domain [0 1]';
-				$out .= ' /Function '.$fc.' 0 R';
-				$out .= ' /Extend [true true]';
-				$out .= ' >>';
-			} elseif ($grad['type'] == 6) {
-				$out .= ' /BitsPerCoordinate 16';
-				$out .= ' /BitsPerComponent 8';
-				$out .= ' /Decode[0 1 0 1 0 1 0 1 0 1]';
-				$out .= ' /BitsPerFlag 8';
-				$stream = $this->_getrawstream($grad['stream']);
-				$out .= ' /Length '.strlen($stream);
-				$out .= ' >>';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-			}
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			if ($grad['transparency']) {
-				$shading_transparency = preg_replace('/\/ColorSpace \/[^\s]+/si', '/ColorSpace /DeviceGray', $out);
-				$shading_transparency = preg_replace('/\/Function [0-9]+ /si', '/Function '.$ft.' ', $shading_transparency);
-			}
-			$this->gradients[$id]['id'] = $this->n;
-			// set pattern object
-			$this->_newobj();
-			$out = '<< /Type /Pattern /PatternType 2';
-			$out .= ' /Shading '.$this->gradients[$id]['id'].' 0 R';
-			$out .= ' >>';
-			$out .= "\n".'endobj';
-			$this->_out($out);
-			$this->gradients[$id]['pattern'] = $this->n;
-			// set shading and pattern for transparency mask
-			if ($grad['transparency']) {
-				// luminosity pattern
-				$idgs = $id + $idt;
-				$this->_newobj();
-				$this->_out($shading_transparency);
-				$this->gradients[$idgs]['id'] = $this->n;
-				$this->_newobj();
-				$out = '<< /Type /Pattern /PatternType 2';
-				$out .= ' /Shading '.$this->gradients[$idgs]['id'].' 0 R';
-				$out .= ' >>';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				$this->gradients[$idgs]['pattern'] = $this->n;
-				// luminosity XObject
-				$oid = $this->_newobj();
-				$this->xobjects['LX'.$oid] = array('n' => $oid);
-				$filter = '';
-				$stream = 'q /a0 gs /Pattern cs /p'.$idgs.' scn 0 0 '.$this->wPt.' '.$this->hPt.' re f Q';
-				if ($this->compress) {
-					$filter = ' /Filter /FlateDecode';
-					$stream = gzcompress($stream);
-				}
-				$stream = $this->_getrawstream($stream);
-				$out = '<< /Type /XObject /Subtype /Form /FormType 1'.$filter;
-				$out .= ' /Length '.strlen($stream);
-				$rect = sprintf('%.2F %.2F', $this->wPt, $this->hPt);
-				$out .= ' /BBox [0 0 '.$rect.']';
-				$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceGray >>';
-				$out .= ' /Resources <<';
-				$out .= ' /ExtGState << /a0 << /ca 1 /CA 1 >> >>';
-				$out .= ' /Pattern << /p'.$idgs.' '.$this->gradients[$idgs]['pattern'].' 0 R >>';
-				$out .= ' >>';
-				$out .= ' >> ';
-				$out .= ' stream'."\n".$stream."\n".'endstream';
-				$out .= "\n".'endobj';
-				$this->_out($out);
-				// SMask
-				$this->_newobj();
-				$out = '<< /Type /Mask /S /Luminosity /G '.($this->n - 1).' 0 R >>'."\n".'endobj';
-				$this->_out($out);
-				// ExtGState
-				$this->_newobj();
-				$out = '<< /Type /ExtGState /SMask '.($this->n - 1).' 0 R /AIS false >>'."\n".'endobj';
-				$this->_out($out);
-				$this->extgstates[] = array('n' => $this->n, 'name' => 'TGS'.$id);
-			}
-		}
-	}
-
-	/**
-	 * Draw the sector of a circle.
-	 * It can be used for instance to render pie charts.
-	 * @param float $xc abscissa of the center.
-	 * @param float $yc ordinate of the center.
-	 * @param float $r radius.
-	 * @param float $a start angle (in degrees).
-	 * @param float $b end angle (in degrees).
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param float $cw: indicates whether to go clockwise (default: true).
-	 * @param float $o: origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock). Default: 90.
-	 * @author Maxime Delorme, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function PieSector($xc, $yc, $r, $a, $b, $style='FD', $cw=true, $o=90) {
-		$this->PieSectorXY($xc, $yc, $r, $r, $a, $b, $style, $cw, $o);
-	}
-
-	/**
-	 * Draw the sector of an ellipse.
-	 * It can be used for instance to render pie charts.
-	 * @param float $xc abscissa of the center.
-	 * @param float $yc ordinate of the center.
-	 * @param float $rx the x-axis radius.
-	 * @param float $ry the y-axis radius.
-	 * @param float $a start angle (in degrees).
-	 * @param float $b end angle (in degrees).
-	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param float $cw: indicates whether to go clockwise.
-	 * @param float $o: origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock).
-	 * @param integer $nc Number of curves used to draw a 90 degrees portion of arc.
-	 * @author Maxime Delorme, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function PieSectorXY($xc, $yc, $rx, $ry, $a, $b, $style='FD', $cw=false, $o=0, $nc=2) {
-		if ($this->rtl) {
-			$xc = $this->w - $xc;
-		}
-		$op = $this->getPathPaintOperator($style);
-		if ($op == 'f') {
-			$line_style = array();
-		}
-		if ($cw) {
-			$d = $b;
-			$b = 360 - $a + $o;
-			$a = 360 - $d + $o;
-		} else {
-			$b += $o;
-			$a += $o;
-		}
-		$this->_outellipticalarc($xc, $yc, $rx, $ry, 0, $a, $b, true, $nc);
-		$this->_out($op);
-	}
-
-	/**
-	 * Embed vector-based Adobe Illustrator (AI) or AI-compatible EPS files.
-	 * NOTE: EPS is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
-	 * Only vector drawing is supported, not text or bitmap.
-	 * Although the script was successfully tested with various AI format versions, best results are probably achieved with files that were exported in the AI3 format (tested with Illustrator CS2, Freehand MX and Photoshop CS2).
-	 * @param string $file Name of the file containing the image.
-	 * @param float $x Abscissa of the upper-left corner.
-	 * @param float $y Ordinate of the upper-left corner.
-	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param mixed $link URL or identifier returned by AddLink().
-	 * @param boolean useBoundingBox specifies whether to position the bounding box (true) or the complete canvas (false) at location (x,y). Default value is true.
-	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
-	 * @author Valentin Schmidt, Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false) {
-		if ($this->rasterize_vector_images AND ($w > 0) AND ($h > 0)) {
-			// convert EPS to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		$k = $this->k;
-		$data = file_get_contents($file);
-		if ($data === false) {
-			$this->Error('EPS file not found: '.$file);
-		}
-		$regs = array();
-		// EPS/AI compatibility check (only checks files created by Adobe Illustrator!)
-		preg_match("/%%Creator:([^\r\n]+)/", $data, $regs); # find Creator
-		if (count($regs) > 1) {
-			$version_str = trim($regs[1]); # e.g. "Adobe Illustrator(R) 8.0"
-			if (strpos($version_str, 'Adobe Illustrator') !== false) {
-				$versexp = explode(' ', $version_str);
-				$version = (float)array_pop($versexp);
-				if ($version >= 9) {
-					$this->Error('This version of Adobe Illustrator file is not supported: '.$file);
-				}
-			}
-		}
-		// strip binary bytes in front of PS-header
-		$start = strpos($data, '%!PS-Adobe');
-		if ($start > 0) {
-			$data = substr($data, $start);
-		}
-		// find BoundingBox params
-		preg_match("/%%BoundingBox:([^\r\n]+)/", $data, $regs);
-		if (count($regs) > 1) {
-			list($x1, $y1, $x2, $y2) = explode(' ', trim($regs[1]));
-		} else {
-			$this->Error('No BoundingBox found in EPS file: '.$file);
-		}
-		$start = strpos($data, '%%EndSetup');
-		if ($start === false) {
-			$start = strpos($data, '%%EndProlog');
-		}
-		if ($start === false) {
-			$start = strpos($data, '%%BoundingBox');
-		}
-		$data = substr($data, $start);
-		$end = strpos($data, '%%PageTrailer');
-		if ($end===false) {
-			$end = strpos($data, 'showpage');
-		}
-		if ($end) {
-			$data = substr($data, 0, $end);
-		}
-		// calculate image width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			$w = ($x2 - $x1) / $k;
-			$h = ($y2 - $y1) / $k;
-		} elseif ($w <= 0) {
-			$w = ($x2-$x1) / $k * ($h / (($y2 - $y1) / $k));
-		} elseif ($h <= 0) {
-			$h = ($y2 - $y1) / $k * ($w / (($x2 - $x1) / $k));
-		}
-		// fit the image on available space
-		$this->fitBlock($w, $h, $x, $y, $fitonpage);
-		if ($this->rasterize_vector_images) {
-			// convert EPS to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
-		}
-		// set scaling factors
-		$scale_x = $w / (($x2 - $x1) / $k);
-		$scale_y = $h / (($y2 - $y1) / $k);
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x - $w;
-			}
-			$this->img_rb_x = $ximg;
-		} else {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x;
-			}
-			$this->img_rb_x = $ximg + $w;
-		}
-		if ($useBoundingBox) {
-			$dx = $ximg * $k - $x1;
-			$dy = $y * $k - $y1;
-		} else {
-			$dx = $ximg * $k;
-			$dy = $y * $k;
-		}
-		// save the current graphic state
-		$this->_out('q'.$this->epsmarker);
-		// translate
-		$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', 1, 0, 0, 1, $dx, $dy + ($this->hPt - (2 * $y * $k) - ($y2 - $y1))));
-		// scale
-		if (isset($scale_x)) {
-			$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $scale_x, 0, 0, $scale_y, $x1 * (1 - $scale_x), $y2 * (1 - $scale_y)));
-		}
-		// handle pc/unix/mac line endings
-		preg_match('/[\r\n]+/s', $data, $regs);
-		$lines = explode($regs[0], $data);
-		$u=0;
-		$cnt = count($lines);
-		for ($i=0; $i < $cnt; ++$i) {
-			$line = $lines[$i];
-			if (($line == '') OR ($line{0} == '%')) {
-				continue;
-			}
-			$len = strlen($line);
-			$chunks = explode(' ', $line);
-			$cmd = array_pop($chunks);
-			// RGB
-			if (($cmd == 'Xa') OR ($cmd == 'XA')) {
-				$b = array_pop($chunks);
-				$g = array_pop($chunks);
-				$r = array_pop($chunks);
-				$this->_out(''.$r.' '.$g.' '.$b.' '.($cmd=='Xa'?'rg':'RG')); //substr($line, 0, -2).'rg' -> in EPS (AI8): c m y k r g b rg!
-				continue;
-			}
-			switch ($cmd) {
-				case 'm':
-				case 'l':
-				case 'v':
-				case 'y':
-				case 'c':
-				case 'k':
-				case 'K':
-				case 'g':
-				case 'G':
-				case 's':
-				case 'S':
-				case 'J':
-				case 'j':
-				case 'w':
-				case 'M':
-				case 'd':
-				case 'n': {
-					$this->_out($line);
-					break;
-				}
-				case 'x': {// custom fill color
-					list($c,$m,$y,$k) = $chunks;
-					$this->_out(''.$c.' '.$m.' '.$y.' '.$k.' k');
-					break;
-				}
-				case 'X': { // custom stroke color
-					list($c,$m,$y,$k) = $chunks;
-					$this->_out(''.$c.' '.$m.' '.$y.' '.$k.' K');
-					break;
-				}
-				case 'Y':
-				case 'N':
-				case 'V':
-				case 'L':
-				case 'C': {
-					$line{$len-1} = strtolower($cmd);
-					$this->_out($line);
-					break;
-				}
-				case 'b':
-				case 'B': {
-					$this->_out($cmd . '*');
-					break;
-				}
-				case 'f':
-				case 'F': {
-					if ($u > 0) {
-						$isU = false;
-						$max = min($i+5, $cnt);
-						for ($j=$i+1; $j < $max; ++$j) {
-							$isU = ($isU OR (($lines[$j] == 'U') OR ($lines[$j] == '*U')));
-						}
-						if ($isU) {
-							$this->_out('f*');
-						}
-					} else {
-						$this->_out('f*');
-					}
-					break;
-				}
-				case '*u': {
-					++$u;
-					break;
-				}
-				case '*U': {
-					--$u;
-					break;
-				}
-			}
-		}
-		// restore previous graphic state
-		$this->_out($this->epsmarker.'Q');
-		if (!empty($border)) {
-			$bx = $this->x;
-			$by = $this->y;
-			$this->x = $ximg;
-			if ($this->rtl) {
-				$this->x += $w;
-			}
-			$this->y = $y;
-			$this->Cell($w, $h, '', $border, 0, '', 0, '', 0, true);
-			$this->x = $bx;
-			$this->y = $by;
-		}
-		if ($link) {
-			$this->Link($ximg, $y, $w, $h, $link, 0);
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-	}
-
-	/**
- 	 * Set document barcode.
-	 * @param string $bc barcode
-	 * @access public
-	 */
-	public function setBarcode($bc='') {
-		$this->barcode = $bc;
-	}
-
-	/**
- 	 * Get current barcode.
-	 * @return string
-	 * @access public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getBarcode() {
-		return $this->barcode;
-	}
-
-	/**
- 	 * Print a Linear Barcode.
- 	 * @param string $code code to print
- 	 * @param string $type type of barcode (see barcodes.php for supported formats).
-	 * @param int $x x position in user units (empty string = current x position)
-	 * @param int $y y position in user units (empty string = current y position)
-	 * @param int $w width in user units (empty string = remaining page width)
-	 * @param int $h height in user units (empty string = remaining page height)
-	 * @param float $xres width of the smallest bar in user units (empty string = default value = 0.4mm)
-	 * @param array $style array of options:<ul>
-	 * <li>boolean $style['border'] if true prints a border</li>
-	 * <li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['hpadding'] horizontal padding in user units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['vpadding'] vertical padding in user units (set to 'auto' for automatic padding)</li>
-	 * <li>array $style['fgcolor'] color array for bars and text</li>
-	 * <li>mixed $style['bgcolor'] color array for background (set to false for transparent)</li>
-	 * <li>boolean $style['text'] if true prints text below the barcode</li>
-	 * <li>string $style['label'] override default label</li>
-	 * <li>string $style['font'] font name for text</li><li>int $style['fontsize'] font size for text</li>
-	 * <li>int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing.</li>
-	 * <li>string $style['position'] horizontal position of the containing barcode cell on the page: L = left margin; C = center; R = right margin.</li>
-	 * <li>string $style['align'] horizontal position of the barcode on the containing rectangle: L = left; C = center; R = right.</li>
-	 * <li>string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.</li>
-	 * <li>string $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.</li>
-	 * <li>string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.</li></ul>
-	 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @author Nicola Asuni
-	 * @since 3.1.000 (2008-06-09)
-	 * @access public
-	 */
-	public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style='', $align='') {
-		if ($this->empty_string(trim($code))) {
-			return;
-		}
-		require_once(dirname(__FILE__).'/barcodes.php');
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// create new barcode object
-		$barcodeobj = new TCPDFBarcode($code, $type);
-		$arrcode = $barcodeobj->getBarcodeArray();
-		if ($arrcode === false) {
-			$this->Error('Error in 1D barcode string');
-		}
-		// set default values
-		if (!isset($style['position'])) {
-			$style['position'] = '';
-		} elseif ($style['position'] == 'S') {
-			// keep this for backward compatibility
-			$style['position'] = '';
-			$style['stretch'] = true;
-		}
-		if (!isset($style['fitwidth'])) {
-			if (!isset($style['stretch'])) {
-				$style['fitwidth'] = true;
-			} else {
-				$style['fitwidth'] = false;
-			}
-		}
-		if ($style['fitwidth']) {
-			// disable stretch
-			$style['stretch'] = false;
-		}
-		if (!isset($style['stretch'])) {
-			if (($w === '') OR ($w <= 0)) {
-				$style['stretch'] = false;
-			} else {
-				$style['stretch'] = true;
-			}
-		}
-		if (!isset($style['fgcolor'])) {
-			$style['fgcolor'] = array(0,0,0); // default black
-		}
-		if (!isset($style['bgcolor'])) {
-			$style['bgcolor'] = false; // default transparent
-		}
-		if (!isset($style['border'])) {
-			$style['border'] = false;
-		}
-		$fontsize = 0;
-		if (!isset($style['text'])) {
-			$style['text'] = false;
-		}
-		if ($style['text'] AND isset($style['font'])) {
-			if (isset($style['fontsize'])) {
-				$fontsize = $style['fontsize'];
-			}
-			$this->SetFont($style['font'], '', $fontsize);
-		}
-		if (!isset($style['stretchtext'])) {
-			$style['stretchtext'] = 4;
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		if (($w === '') OR ($w <= 0)) {
-			if ($this->rtl) {
-				$w = $x - $this->lMargin;
-			} else {
-				$w = $this->w - $this->rMargin - $x;
-			}
-		}
-		// padding
-		if (!isset($style['padding'])) {
-			$padding = 0;
-		} elseif ($style['padding'] === 'auto') {
-			$padding = 10 * ($w / ($arrcode['maxw'] + 20));
-		} else {
-			$padding = floatval($style['padding']);
-		}
-		// horizontal padding
-		if (!isset($style['hpadding'])) {
-			$hpadding = $padding;
-		} elseif ($style['hpadding'] === 'auto') {
-			$hpadding = 10 * ($w / ($arrcode['maxw'] + 20));
-		} else {
-			$hpadding = floatval($style['hpadding']);
-		}
-		// vertical padding
-		if (!isset($style['vpadding'])) {
-			$vpadding = $padding;
-		} elseif ($style['vpadding'] === 'auto') {
-			$vpadding = ($hpadding / 2);
-		} else {
-			$vpadding = floatval($style['vpadding']);
-		}
-		// calculate xres (single bar width)
-		$max_xres = ($w - (2 * $hpadding)) / $arrcode['maxw'];
-		if ($style['stretch']) {
-			$xres = $max_xres;
-		} else {
-			if ($this->empty_string($xres)) {
-				$xres = (0.141 * $this->k); // default bar width = 0.4 mm
-			}
-			if ($xres > $max_xres) {
-				// correct xres to fit on $w
-				$xres = $max_xres;
-			}
-			if ((isset($style['padding']) AND ($style['padding'] === 'auto'))
-				OR (isset($style['hpadding']) AND ($style['hpadding'] === 'auto'))) {
-				$hpadding = 10 * $xres;
-				if (isset($style['vpadding']) AND ($style['vpadding'] === 'auto')) {
-					$vpadding = ($hpadding / 2);
-				}
-			}
-		}
-		if ($style['fitwidth']) {
-			$wold = $w;
-			$w = (($arrcode['maxw'] * $xres) + (2 * $hpadding));
-			if (isset($style['cellfitalign'])) {
-				switch ($style['cellfitalign']) {
-					case 'L': {
-						if ($this->rtl) {
-							$x -= ($wold - $w);
-						}
-						break;
-					}
-					case 'R': {
-						if (!$this->rtl) {
-							$x += ($wold - $w);
-						}
-						break;
-					}
-					case 'C': {
-						if ($this->rtl) {
-							$x -= (($wold - $w) / 2);
-						} else {
-							$x += (($wold - $w) / 2);
-						}
-						break;
-					}
-					default : {
-						break;
-					}
-				}
-			}
-		}
-		$text_height = ($this->cell_height_ratio * $fontsize / $this->k);
-		// height
-		if (($h === '') OR ($h <= 0)) {
-			// set default height
-			$h = (($arrcode['maxw'] * $xres) / 3) + (2 * $vpadding) + $text_height;
-		}
-		$barh = $h - $text_height - (2 * $vpadding);
-		if ($barh <=0) {
-			// try to reduce font or padding to fit barcode on available height
-			if ($text_height > $h) {
-				$fontsize = (($h * $this->k) / (4 * $this->cell_height_ratio));
-				$text_height = ($this->cell_height_ratio * $fontsize / $this->k);
-				$this->SetFont($style['font'], '', $fontsize);
-			}
-			if ($vpadding > 0) {
-				$vpadding = (($h - $text_height) / 4);
-			}
-			$barh = $h - $text_height - (2 * $vpadding);
-		}
-		// fit the barcode on available space
-		$this->fitBlock($w, $h, $x, $y, false);
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x - $w;
-			}
-			$this->img_rb_x = $xpos;
-		} else {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x;
-			}
-			$this->img_rb_x = $xpos + $w;
-		}
-		$xpos_rect = $xpos;
-		if (!isset($style['align'])) {
-			$style['align'] = 'C';
-		}
-		switch ($style['align']) {
-			case 'L': {
-				$xpos = $xpos_rect + $hpadding;
-				break;
-			}
-			case 'R': {
-				$xpos = $xpos_rect + ($w - ($arrcode['maxw'] * $xres)) - $hpadding;
-				break;
-			}
-			case 'C':
-			default : {
-				$xpos = $xpos_rect + (($w - ($arrcode['maxw'] * $xres)) / 2);
-				break;
-			}
-		}
-		$xpos_text = $xpos;
-		// barcode is always printed in LTR direction
-		$tempRTL = $this->rtl;
-		$this->rtl = false;
-		// print background color
-		if ($style['bgcolor']) {
-			$this->Rect($xpos_rect, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
-		} elseif ($style['border']) {
-			$this->Rect($xpos_rect, $y, $w, $h, 'D');
-		}
-		// set foreground color
-		$this->SetDrawColorArray($style['fgcolor']);
-		$this->SetTextColorArray($style['fgcolor']);
-		// print bars
-		foreach ($arrcode['bcode'] as $k => $v) {
-			$bw = ($v['w'] * $xres);
-			if ($v['t']) {
-				// draw a vertical bar
-				$ypos = $y + $vpadding + ($v['p'] * $barh / $arrcode['maxh']);
-				$this->Rect($xpos, $ypos, $bw, ($v['h'] * $barh / $arrcode['maxh']), 'F', array(), $style['fgcolor']);
-			}
-			$xpos += $bw;
-		}
-		// print text
-		if ($style['text']) {
-			if (isset($style['label']) AND !$this->empty_string($style['label'])) {
-				$label = $style['label'];
-			} else {
-				$label = $code;
-			}
-			$txtwidth = ($arrcode['maxw'] * $xres);
-			if ($this->GetStringWidth($label) > $txtwidth) {
-				$style['stretchtext'] = 2;
-			}
-			// print text
-			$this->x = $xpos_text;
-			$this->y = $y + $vpadding + $barh;
-			$cellpadding = $this->cell_padding;
-			$this->SetCellPadding(0);
-			$this->Cell($txtwidth, '', $label, 0, 0, 'C', 0, '', $style['stretchtext'], false, 'T', 'T');
-			$this->cell_padding = $cellpadding;
-		}
-		// restore original direction
-		$this->rtl = $tempRTL;
-		// restore previous settings
-		$this->setGraphicVars($gvars);
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h / 2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-	}
-
-	/**
- 	 * This function is DEPRECATED, please use the new write1DBarcode() function.
-	 * @param int $x x position in user units
-	 * @param int $y y position in user units
-	 * @param int $w width in user units
-	 * @param int $h height position in user units
-	 * @param string $type type of barcode
-	 * @param string $style barcode style
-	 * @param string $font font for text
-	 * @param int $xres x resolution
-	 * @param string $code code to print
-	 * @deprecated deprecated since version 3.1.000 (2008-06-10)
-	 * @access public
-	 * @see write1DBarcode()
-	 */
-	public function writeBarcode($x, $y, $w, $h, $type, $style, $font, $xres, $code) {
-		// convert old settings for the new write1DBarcode() function.
-		$xres = 1 / $xres;
-		$newstyle = array(
-			'position' => '',
-			'align' => '',
-			'stretch' => false,
-			'fitwidth' => false,
-			'cellfitalign' => '',
-			'border' => false,
-			'padding' => 0,
-			'fgcolor' => array(0,0,0),
-			'bgcolor' => false,
-			'text' => true,
-			'font' => $font,
-			'fontsize' => 8,
-			'stretchtext' => 4
-		);
-		if ($style & 1) {
-			$newstyle['border'] = true;
-		}
-		if ($style & 2) {
-			$newstyle['bgcolor'] = false;
-		}
-		if ($style & 4) {
-			$newstyle['position'] = 'C';
-		} elseif ($style & 8) {
-			$newstyle['position'] = 'L';
-		} elseif ($style & 16) {
-			$newstyle['position'] = 'R';
-		}
-		if ($style & 128) {
-			$newstyle['text'] = true;
-		}
-		if ($style & 256) {
-			$newstyle['stretchtext'] = 4;
-		}
-		$this->write1DBarcode($code, $type, $x, $y, $w, $h, $xres, $newstyle, '');
-	}
-
-	/**
- 	 * Print 2D Barcode.
- 	 * @param string $code code to print
- 	 * @param string $type type of barcode (see 2dbarcodes.php for supported formats).
-	 * @param int $x x position in user units
-	 * @param int $y y position in user units
-	 * @param int $w width in user units
-	 * @param int $h height in user units
-	 * @param array $style array of options:<ul>
-	 * <li>boolean $style['border'] if true prints a border around the barcode</li>
-	 * <li>int $style['padding'] padding to leave around the barcode in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['hpadding'] horizontal padding in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['vpadding'] vertical padding in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['module_width'] width of a single module in points</li>
-	 * <li>int $style['module_height'] height of a single module in points</li>
-	 * <li>array $style['fgcolor'] color array for bars and text</li>
-	 * <li>mixed $style['bgcolor'] color array for background or false for transparent</li>
-	 * <li>string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch</li><li>$style['module_width'] width of a single module in points</li>
-	 * <li>$style['module_height'] height of a single module in points</li></ul>
-	 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param boolean $distort if true distort the barcode to fit width and height, otherwise preserve aspect ratio
-	 * @author Nicola Asuni
-	 * @since 4.5.037 (2009-04-07)
-	 * @access public
-	 */
-	public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style='', $align='', $distort=false) {
-		if ($this->empty_string(trim($code))) {
-			return;
-		}
-		require_once(dirname(__FILE__).'/2dbarcodes.php');
-		// save current graphic settings
-		$gvars = $this->getGraphicVars();
-		// create new barcode object
-		$barcodeobj = new TCPDF2DBarcode($code, $type);
-		$arrcode = $barcodeobj->getBarcodeArray();
-		if (($arrcode === false) OR empty($arrcode)) {
-			$this->Error('Error in 2D barcode string');
-		}
-		// set default values
-		if (!isset($style['position'])) {
-			$style['position'] = '';
-		}
-		if (!isset($style['fgcolor'])) {
-			$style['fgcolor'] = array(0,0,0); // default black
-		}
-		if (!isset($style['bgcolor'])) {
-			$style['bgcolor'] = false; // default transparent
-		}
-		if (!isset($style['border'])) {
-			$style['border'] = false;
-		}
-		// padding
-		if (!isset($style['padding'])) {
-			$style['padding'] = 0;
-		} elseif ($style['padding'] === 'auto') {
-			$style['padding'] = 4;
-		}
-		if (!isset($style['hpadding'])) {
-			$style['hpadding'] = $style['padding'];
-		} elseif ($style['hpadding'] === 'auto') {
-			$style['hpadding'] = 4;
-		}
-		if (!isset($style['vpadding'])) {
-			$style['vpadding'] = $style['padding'];
-		} elseif ($style['vpadding'] === 'auto') {
-			$style['vpadding'] = 4;
-		}
-		// cell (module) dimension
-		if (!isset($style['module_width'])) {
-			$style['module_width'] = 1; // width of a single module in points
-		}
-		if (!isset($style['module_height'])) {
-			$style['module_height'] = 1; // height of a single module in points
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		// number of barcode columns and rows
-		$rows = $arrcode['num_rows'];
-		$cols = $arrcode['num_cols'];
-		// module width and height
-		$mw = $style['module_width'];
-		$mh = $style['module_height'];
-		// get max dimensions
-		if ($this->rtl) {
-			$maxw = $x - $this->lMargin;
-		} else {
-			$maxw = $this->w - $this->rMargin - $x;
-		}
-		$maxh = ($this->h - $this->tMargin - $this->bMargin);
-		$ratioHW = ($rows * $mh) / ($cols * $mw);
-		$ratioWH = ($cols * $mw) / ($rows * $mh);
-		if (!$distort) {
-			if (($maxw * $ratioHW) > $maxh) {
-				$maxw = $maxh * $ratioWH;
-			}
-			if (($maxh * $ratioWH) > $maxw) {
-				$maxh = $maxw * $ratioHW;
-			}
-		}
-		// set maximum dimesions
-		if ($w > $maxw) {
-			$w = $maxw;
-		}
-		if ($h > $maxh) {
-			$h = $maxh;
-		}
-		$hpad = (2 * $style['hpadding']);
-		$vpad = (2 * $style['vpadding']);
-		// set dimensions
-		if ((($w === '') OR ($w <= 0)) AND (($h === '') OR ($h <= 0))) {
-			$w = ($cols + $hpad) * ($mw / $this->k);
-			$h = ($rows + $vpad) * ($mh / $this->k);
-		} elseif (($w === '') OR ($w <= 0)) {
-			$w = $h * $ratioWH;
-		} elseif (($h === '') OR ($h <= 0)) {
-			$h = $w * $ratioHW;
-		}
-		// barcode size (excluding padding)
-		$bw = ($w * $cols) / ($cols + $hpad);
-		$bh = ($h * $rows) / ($rows + $vpad);
-		// dimension of single barcode cell unit
-		$cw = $bw / $cols;
-		$ch = $bh / $rows;
-		if (!$distort) {
-			if (($cw / $ch) > ($mw / $mh)) {
-				// correct horizontal distortion
-				$cw = $ch * $mw / $mh;
-				$bw = $cw * $cols;
-				$style['hpadding'] = ($w - $bw) / (2 * $cw);
-			} else {
-				// correct vertical distortion
-				$ch = $cw * $mh / $mw;
-				$bh = $ch * $rows;
-				$style['vpadding'] = ($h - $bh) / (2 * $ch);
-			}
-		}
-		// fit the barcode on available space
-		$this->fitBlock($w, $h, $x, $y, false);
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x - $w;
-			}
-			$this->img_rb_x = $xpos;
-		} else {
-			if ($style['position'] == 'L') {
-				$xpos = $this->lMargin;
-			} elseif ($style['position'] == 'C') {
-				$xpos = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($style['position'] == 'R') {
-				$xpos = $this->w - $this->rMargin - $w;
-			} else {
-				$xpos = $x;
-			}
-			$this->img_rb_x = $xpos + $w;
-		}
-		$xstart = $xpos + ($style['hpadding'] * $cw);
-		$ystart = $y + ($style['vpadding'] * $ch);
-		// barcode is always printed in LTR direction
-		$tempRTL = $this->rtl;
-		$this->rtl = false;
-		// print background color
-		if ($style['bgcolor']) {
-			$this->Rect($xpos, $y, $w, $h, $style['border'] ? 'DF' : 'F', '', $style['bgcolor']);
-		} elseif ($style['border']) {
-			$this->Rect($xpos, $y, $w, $h, 'D');
-		}
-		// set foreground color
-		$this->SetDrawColorArray($style['fgcolor']);
-		// print barcode cells
-		// for each row
-		for ($r = 0; $r < $rows; ++$r) {
-			$xr = $xstart;
-			// for each column
-			for ($c = 0; $c < $cols; ++$c) {
-				if ($arrcode['bcode'][$r][$c] == 1) {
-					// draw a single barcode cell
-					$this->Rect($xr, $ystart, $cw, $ch, 'F', array(), $style['fgcolor']);
-				}
-				$xr += $cw;
-			}
-			$ystart += $ch;
-		}
-		// restore original direction
-		$this->rtl = $tempRTL;
-		// restore previous settings
-		$this->setGraphicVars($gvars);
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-	}
-
-	/**
-	 * Returns an array containing current margins:
-	 * <ul>
-			<li>$ret['left'] = left margin</li>
-			<li>$ret['right'] = right margin</li>
-			<li>$ret['top'] = top margin</li>
-			<li>$ret['bottom'] = bottom margin</li>
-			<li>$ret['header'] = header margin</li>
-			<li>$ret['footer'] = footer margin</li>
-			<li>$ret['cell'] = cell padding array</li>
-			<li>$ret['padding_left'] = cell left padding</li>
-			<li>$ret['padding_top'] = cell top padding</li>
-			<li>$ret['padding_right'] = cell right padding</li>
-			<li>$ret['padding_bottom'] = cell bottom padding</li>
-	 * </ul>
-	 * @return array containing all margins measures
-	 * @access public
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	public function getMargins() {
-		$ret = array(
-			'left' => $this->lMargin,
-			'right' => $this->rMargin,
-			'top' => $this->tMargin,
-			'bottom' => $this->bMargin,
-			'header' => $this->header_margin,
-			'footer' => $this->footer_margin,
-			'cell' => $this->cell_padding,
-			'padding_left' => $this->cell_padding['L'],
-			'padding_top' => $this->cell_padding['T'],
-			'padding_right' => $this->cell_padding['R'],
-			'padding_bottom' => $this->cell_padding['B']
-		);
-		return $ret;
-	}
-
-	/**
-	 * Returns an array containing original margins:
-	 * <ul>
-			<li>$ret['left'] = left margin</li>
-			<li>$ret['right'] = right margin</li>
-	 * </ul>
-	 * @return array containing all margins measures
-	 * @access public
-	 * @since 4.0.012 (2008-07-24)
-	 */
-	public function getOriginalMargins() {
-		$ret = array(
-			'left' => $this->original_lMargin,
-			'right' => $this->original_rMargin
-		);
-		return $ret;
-	}
-
-	/**
-	 * Returns the current font size.
-	 * @return current font size
-	 * @access public
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	public function getFontSize() {
-		return $this->FontSize;
-	}
-
-	/**
-	 * Returns the current font size in points unit.
-	 * @return current font size in points unit
-	 * @access public
-	 * @since 3.2.000 (2008-06-23)
-	 */
-	public function getFontSizePt() {
-		return $this->FontSizePt;
-	}
-
-	/**
-	 * Returns the current font family name.
-	 * @return string current font family name
-	 * @access public
-	 * @since 4.3.008 (2008-12-05)
-	 */
-	public function getFontFamily() {
-		return $this->FontFamily;
-	}
-
-	/**
-	 * Returns the current font style.
-	 * @return string current font style
-	 * @access public
-	 * @since 4.3.008 (2008-12-05)
-	 */
-	public function getFontStyle() {
-		return $this->FontStyle;
-	}
-
-	/**
-	 * Extracts the CSS properties from a CSS string.
-	 * @param string $cssdata string containing CSS definitions.
-	 * @return An array where the keys are the CSS selectors and the values are the CSS properties.
-	 * @author Nicola Asuni
-	 * @since 5.1.000 (2010-05-25)
-	 * @access protected
-	 */
-	protected function extractCSSproperties($cssdata) {
-		if (empty($cssdata)) {
-			return array();
-		}
-		// remove comments
-		$cssdata = preg_replace('/\/\*[^\*]*\*\//', '', $cssdata);
-		// remove newlines and multiple spaces
-		$cssdata = preg_replace('/[\s]+/', ' ', $cssdata);
-		// remove some spaces
-		$cssdata = preg_replace('/[\s]*([;:\{\}]{1})[\s]*/', '\\1', $cssdata);
-		// remove empty blocks
-		$cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata);
-		// replace media type parenthesis
-		$cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
-		$cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
-		// trim string
-		$cssdata = trim($cssdata);
-		// find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
-		$cssblocks = array();
-		$matches = array();
-		if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
-			foreach ($matches[1] as $key => $type) {
-				$cssblocks[$type] = $matches[2][$key];
-			}
-			// remove media blocks
-			$cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
-		}
-		// keep 'all' and 'print' media, other media types are discarded
-		if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
-			$cssdata .= $cssblocks['all'];
-		}
-		if (isset($cssblocks['print']) AND !empty($cssblocks['print'])) {
-			$cssdata .= $cssblocks['print'];
-		}
-		// reset css blocks array
-		$cssblocks = array();
-		$matches = array();
-		// explode css data string into array
-		if (substr($cssdata, -1) == '}') {
-			// remove last parethesis
-			$cssdata = substr($cssdata, 0, -1);
-		}
-		$matches = explode('}', $cssdata);
-		foreach ($matches as $key => $block) {
-			// index 0 contains the CSS selector, index 1 contains CSS properties
-			$cssblocks[$key] = explode('{', $block);
-			if (!isset($cssblocks[$key][1])) {
-				// remove empty definitions
-				unset($cssblocks[$key]);
-			}
-		}
-		// split groups of selectors (comma-separated list of selectors)
-		foreach ($cssblocks as $key => $block) {
-			if (strpos($block[0], ',') > 0) {
-				$selectors = explode(',', $block[0]);
-				foreach ($selectors as $sel) {
-					$cssblocks[] = array(0 => trim($sel), 1 => $block[1]);
-				}
-				unset($cssblocks[$key]);
-			}
-		}
-		// covert array to selector => properties
-		$cssdata = array();
-		foreach ($cssblocks as $block) {
-			$selector = $block[0];
-			// calculate selector's specificity
-			$matches = array();
-			$a = 0; // the declaration is not from is a 'style' attribute
-			$b = intval(preg_match_all('/[\#]/', $selector, $matches)); // number of ID attributes
-			$c = intval(preg_match_all('/[\[\.]/', $selector, $matches)); // number of other attributes
-			$c += intval(preg_match_all('/[\:]link|visited|hover|active|focus|target|lang|enabled|disabled|checked|indeterminate|root|nth|first|last|only|empty|contains|not/i', $selector, $matches)); // number of pseudo-classes
-			$d = intval(preg_match_all('/[\>\+\~\s]{1}[a-zA-Z0-9\*]+/', ' '.$selector, $matches)); // number of element names
-			$d += intval(preg_match_all('/[\:][\:]/', $selector, $matches)); // number of pseudo-elements
-			$specificity = $a.$b.$c.$d;
-			// add specificity to the beginning of the selector
-			$cssdata[$specificity.' '.$selector] = $block[1];
-		}
-		// sort selectors alphabetically to account for specificity
-		ksort($cssdata, SORT_STRING);
-		// return array
-		return $cssdata;
-	}
-
-	/**
- 	 * Returns true if the CSS selector is valid for the selected HTML tag
-	 * @param array $dom array of HTML tags and properties
-	 * @param int $key key of the current HTML tag
-	 * @param string $selector CSS selector string
-	 * @return true if the selector is valid, false otherwise
-	 * @access protected
-	 * @since 5.1.000 (2010-05-25)
-	 */
-	protected function isValidCSSSelectorForTag($dom, $key, $selector) {
-		$valid = false; // value to be returned
-		$tag = $dom[$key]['value'];
-		$class = array();
-		if (isset($dom[$key]['attribute']['class']) AND !empty($dom[$key]['attribute']['class'])) {
-			$class = explode(' ', strtolower($dom[$key]['attribute']['class']));
-		}
-		$id = '';
-		if (isset($dom[$key]['attribute']['id']) AND !empty($dom[$key]['attribute']['id'])) {
-			$id = strtolower($dom[$key]['attribute']['id']);
-		}
-		$selector = preg_replace('/([\>\+\~\s]{1})([\.]{1})([^\>\+\~\s]*)/si', '\\1*.\\3', $selector);
-		$matches = array();
-		if (preg_match_all('/([\>\+\~\s]{1})([a-zA-Z0-9\*]+)([^\>\+\~\s]*)/si', $selector, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE) > 0) {
-			$parentop = array_pop($matches[1]);
-			$operator = $parentop[0];
-			$offset = $parentop[1];
-			$lasttag = array_pop($matches[2]);
-			$lasttag = strtolower(trim($lasttag[0]));
-			if (($lasttag == '*') OR ($lasttag == $tag)) {
-				// the last element on selector is our tag or 'any tag'
-				$attrib = array_pop($matches[3]);
-				$attrib = strtolower(trim($attrib[0]));
-				if (!empty($attrib)) {
-					// check if matches class, id, attribute, pseudo-class or pseudo-element
-					switch ($attrib{0}) {
-						case '.': { // class
-							if (in_array(substr($attrib, 1), $class)) {
-								$valid = true;
-							}
-							break;
-						}
-						case '#': { // ID
-							if (substr($attrib, 1) == $id) {
-								$valid = true;
-							}
-							break;
-						}
-						case '[': { // attribute
-							$attrmatch = array();
-							if (preg_match('/\[([a-zA-Z0-9]*)[\s]*([\~\^\$\*\|\=]*)[\s]*["]?([^"\]]*)["]?\]/i', $attrib, $attrmatch) > 0) {
-								$att = strtolower($attrmatch[1]);
-								$val = $attrmatch[3];
-								if (isset($dom[$key]['attribute'][$att])) {
-									switch ($attrmatch[2]) {
-										case '=': {
-											if ($dom[$key]['attribute'][$att] == $val) {
-												$valid = true;
-											}
-											break;
-										}
-										case '~=': {
-											if (in_array($val, explode(' ', $dom[$key]['attribute'][$att]))) {
-												$valid = true;
-											}
-											break;
-										}
-										case '^=': {
-											if ($val == substr($dom[$key]['attribute'][$att], 0, strlen($val))) {
-												$valid = true;
-											}
-											break;
-										}
-										case '$=': {
-											if ($val == substr($dom[$key]['attribute'][$att], -strlen($val))) {
-												$valid = true;
-											}
-											break;
-										}
-										case '*=': {
-											if (strpos($dom[$key]['attribute'][$att], $val) !== false) {
-												$valid = true;
-											}
-											break;
-										}
-										case '|=': {
-											if ($dom[$key]['attribute'][$att] == $val) {
-												$valid = true;
-											} elseif (preg_match('/'.$val.'[\-]{1}/i', $dom[$key]['attribute'][$att]) > 0) {
-												$valid = true;
-											}
-											break;
-										}
-										default: {
-											$valid = true;
-										}
-									}
-								}
-							}
-							break;
-						}
-						case ':': { // pseudo-class or pseudo-element
-							if ($attrib{1} == ':') { // pseudo-element
-								// pseudo-elements are not supported!
-								// (::first-line, ::first-letter, ::before, ::after)
-							} else { // pseudo-class
-								// pseudo-classes are not supported!
-								// (:root, :nth-child(n), :nth-last-child(n), :nth-of-type(n), :nth-last-of-type(n), :first-child, :last-child, :first-of-type, :last-of-type, :only-child, :only-of-type, :empty, :link, :visited, :active, :hover, :focus, :target, :lang(fr), :enabled, :disabled, :checked)
-							}
-							break;
-						}
-					} // end of switch
-				} else {
-					$valid = true;
-				}
-				if ($valid AND ($offset > 0)) {
-					$valid = false;
-					// check remaining selector part
-					$selector = substr($selector, 0, $offset);
-					switch ($operator) {
-						case ' ': { // descendant of an element
-							while ($dom[$key]['parent'] > 0) {
-								if ($this->isValidCSSSelectorForTag($dom, $dom[$key]['parent'], $selector)) {
-									$valid = true;
-									break;
-								} else {
-									$key = $dom[$key]['parent'];
-								}
-							}
-							break;
-						}
-						case '>': { // child of an element
-							$valid = $this->isValidCSSSelectorForTag($dom, $dom[$key]['parent'], $selector);
-							break;
-						}
-						case '+': { // immediately preceded by an element
-							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
-									$valid = $this->isValidCSSSelectorForTag($dom, $i, $selector);
-									break;
-								}
-							}
-							break;
-						}
-						case '~': { // preceded by an element
-							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
-									if ($this->isValidCSSSelectorForTag($dom, $i, $selector)) {
-										break;
-									}
-								}
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-		return $valid;
-	}
-
-	/**
- 	 * Returns the styles that apply for the selected HTML tag.
-	 * @param array $dom array of HTML tags and properties
-	 * @param int $key key of the current HTML tag
-	 * @param array $css array of CSS properties
-	 * @return string containing CSS properties
-	 * @access protected
-	 * @since 5.1.000 (2010-05-25)
-	 */
-	protected function getTagStyleFromCSS($dom, $key, $css) {
-		$tagstyle = ''; // style to be returned
-		// get all styles that apply
-		foreach($css as $selector => $style) {
-			// remove specificity
-			$selector = substr($selector, strpos($selector, ' '));
-			// check if this selector apply to current tag
-			if ($this->isValidCSSSelectorForTag($dom, $key, $selector)) {
-				// apply style
-				$tagstyle .= ';'.$style;
-			}
-		}
-		if (isset($dom[$key]['attribute']['style'])) {
-			// attach inline style (latest properties have high priority)
-			$tagstyle .= ';'.$dom[$key]['attribute']['style'];
-		}
-		// remove multiple semicolons
-		$tagstyle = preg_replace('/[;]+/', ';', $tagstyle);
-		return $tagstyle;
-	}
-
-	/**
- 	 * Returns the border width from CSS property
-	 * @param string $width border width
-	 * @return int with in user units
-	 * @access protected
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCSSBorderWidth($width) {
-		if ($width == 'thin') {
-			$width = (2 / $this->k);
-		} elseif ($width == 'medium') {
-			$width = (4 / $this->k);
-		} elseif ($width == 'thick') {
-			$width = (6 / $this->k);
-		} else {
-			$width = $this->getHTMLUnitToUnits($width, 1, 'px', false);
-		}
-		return $width;
-	}
-
-	/**
- 	 * Returns the border dash style from CSS property
-	 * @param string $style border style to convert
-	 * @return int sash style (return -1 in case of none or hidden border)
-	 * @access protected
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCSSBorderDashStyle($style) {
-		switch (strtolower($style)) {
-			case 'none':
-			case 'hidden': {
-				$dash = -1;
-				break;
-			}
-			case 'dotted': {
-				$dash = 1;
-				break;
-			}
-			case 'dashed': {
-				$dash = 3;
-				break;
-			}
-			case 'double':
-			case 'groove':
-			case 'ridge':
-			case 'inset':
-			case 'outset':
-			case 'solid':
-			default: {
-				$dash = 0;
-				break;
-			}
-		}
-		return $dash;
-	}
-
-	/**
- 	 * Returns the border style array from CSS border properties
-	 * @param string $cssborder border properties
-	 * @return array containing border properties
-	 * @access protected
-	 * @since 5.7.000 (2010-08-02)
-	 */
-	protected function getCSSBorderStyle($cssborder) {
-		$bprop = preg_split('/[\s]+/', trim($cssborder));
-		$border = array(); // value to be returned
-		switch (count($bprop)) {
-			case 3: {
-				$width = $bprop[0];
-				$style = $bprop[1];
-				$color = $bprop[2];
-				break;
-			}
-			case 2: {
-				$width = 'medium';
-				$style = $bprop[0];
-				$color = $bprop[1];
-				break;
-			}
-			case 1: {
-				$width = 'medium';
-				$style = $bprop[0];
-				$color = 'black';
-				break;
-			}
-			default: {
-				$width = 'medium';
-				$style = 'solid';
-				$color = 'black';
-				break;
-			}
-		}
-		if ($style == 'none') {
-			return array();
-		}
-		$border['cap'] = 'square';
-		$border['join'] = 'miter';
-		$border['dash'] = $this->getCSSBorderDashStyle($style);
-		if ($border['dash'] < 0) {
-			return array();
-		}
-		$border['width'] = $this->getCSSBorderWidth($width);
-		$border['color'] = $this->convertHTMLColorToDec($color);
-		return $border;
-	}
-
-	/**
-	 * Get the internal Cell padding from CSS attribute.
-	 * @param string $csspadding padding properties
-	 * @param float $width width of the containing element
-	 * @access public
-	 * @since 5.9.000 (2010-10-04)
-	 */
-	public function getCSSPadding($csspadding, $width=0) {
-		$padding = preg_split('/[\s]+/', trim($csspadding));
-		$cell_padding = array(); // value to be returned
-		switch (count($padding)) {
-			case 4: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[1];
-				$cell_padding['B'] = $padding[2];
-				$cell_padding['L'] = $padding[3];
-				break;
-			}
-			case 3: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[1];
-				$cell_padding['B'] = $padding[2];
-				$cell_padding['L'] = $padding[1];
-				break;
-			}
-			case 2: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[1];
-				$cell_padding['B'] = $padding[0];
-				$cell_padding['L'] = $padding[1];
-				break;
-			}
-			case 1: {
-				$cell_padding['T'] = $padding[0];
-				$cell_padding['R'] = $padding[0];
-				$cell_padding['B'] = $padding[0];
-				$cell_padding['L'] = $padding[0];
-				break;
-			}
-			default: {
-				return $this->cell_padding;
-			}
-		}
-		if ($width == 0) {
-			$width = $this->w - $this->lMargin - $this->rMargin;
-		}
-		$cell_padding['T'] = $this->getHTMLUnitToUnits($cell_padding['T'], $width, 'px', false);
-		$cell_padding['R'] = $this->getHTMLUnitToUnits($cell_padding['R'], $width, 'px', false);
-		$cell_padding['B'] = $this->getHTMLUnitToUnits($cell_padding['B'], $width, 'px', false);
-		$cell_padding['L'] = $this->getHTMLUnitToUnits($cell_padding['L'], $width, 'px', false);
-		return $cell_padding;
-	}
-
-	/**
-	 * Get the internal Cell margin from CSS attribute.
-	 * @param string $cssmargin margin properties
-	 * @param float $width width of the containing element
-	 * @access public
-	 * @since 5.9.000 (2010-10-04)
-	 */
-	public function getCSSMargin($cssmargin, $width=0) {
-		$margin = preg_split('/[\s]+/', trim($cssmargin));
-		$cell_margin = array(); // value to be returned
-		switch (count($margin)) {
-			case 4: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[1];
-				$cell_margin['B'] = $margin[2];
-				$cell_margin['L'] = $margin[3];
-				break;
-			}
-			case 3: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[1];
-				$cell_margin['B'] = $margin[2];
-				$cell_margin['L'] = $margin[1];
-				break;
-			}
-			case 2: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[1];
-				$cell_margin['B'] = $margin[0];
-				$cell_margin['L'] = $margin[1];
-				break;
-			}
-			case 1: {
-				$cell_margin['T'] = $margin[0];
-				$cell_margin['R'] = $margin[0];
-				$cell_margin['B'] = $margin[0];
-				$cell_margin['L'] = $margin[0];
-				break;
-			}
-			default: {
-				return $this->cell_margin;
-			}
-		}
-		if ($width == 0) {
-			$width = $this->w - $this->lMargin - $this->rMargin;
-		}
-		$cell_margin['T'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['T']), $width, 'px', false);
-		$cell_margin['R'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['R']), $width, 'px', false);
-		$cell_margin['B'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['B']), $width, 'px', false);
-		$cell_margin['L'] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $cell_margin['L']), $width, 'px', false);
-		return $cell_margin;
-	}
-
-	/**
- 	 * Returns the letter-spacing value from CSS value
-	 * @param string $spacing letter-spacing value
-	 * @param float $parent font spacing (tracking/kerning) value of the parent element
-	 * @return float quantity to increases or decreases the space between characters in a text.
-	 * @access protected
-	 * @since 5.9.000 (2010-10-02)
-	 */
-	protected function getCSSFontSpacing($spacing, $parent=0) {
-		$val = 0; // value to be returned
-		$spacing = trim($spacing);
-		switch ($spacing) {
-			case 'normal': {
-				$val = 0;
-				break;
-			}
-			case 'inherit': {
-				if ($parent == 'normal') {
-					$val = 0;
-				} else {
-					$val = $parent;
-				}
-				break;
-			}
-			default: {
-				$val = $this->getHTMLUnitToUnits($spacing, 0, 'px', false);
-			}
-		}
-		return $val;
-	}
-
-	/**
- 	 * Returns the percentage of font stretching from CSS value
-	 * @param string $stretch stretch mode
-	 * @param float $parent stretch value of the parent element
-	 * @return float font stretching percentage
-	 * @access protected
-	 * @since 5.9.000 (2010-10-02)
-	 */
-	protected function getCSSFontStretching($stretch, $parent=100) {
-		$val = 100; // value to be returned
-		$stretch = trim($stretch);
-		switch ($stretch) {
-			case 'ultra-condensed': {
-				$val = 40;
-				break;
-			}
-			case 'extra-condensed': {
-				$val = 55;
-				break;
-			}
-			case 'condensed': {
-				$val = 70;
-				break;
-			}
-			case 'semi-condensed': {
-				$val = 85;
-				break;
-			}
-			case 'normal': {
-				$val = 100;
-				break;
-			}
-			case 'semi-expanded': {
-				$val = 115;
-				break;
-			}
-			case 'expanded': {
-				$val = 130;
-				break;
-			}
-			case 'extra-expanded': {
-				$val = 145;
-				break;
-			}
-			case 'ultra-expanded': {
-				$val = 160;
-				break;
-			}
-			case 'wider': {
-				$val = $parent + 10;
-				break;
-			}
-			case 'narrower': {
-				$val = $parent - 10;
-				break;
-			}
-			case 'inherit': {
-				if ($parent == 'normal') {
-					$val = 100;
-				} else {
-					$val = $parent;
-				}
-				break;
-			}
-			default: {
-				$val = $this->getHTMLUnitToUnits($stretch, 100, '%', false);
-			}
-		}
-		return $val;
-	}
-
-	/**
- 	 * Returns the HTML DOM array.
-	 * @param string $form html code
-	 * @return array
-	 * @access protected
-	 * @since 3.2.000 (2008-06-20)
-	 */
-	protected function getHtmlDomArray($form) {
-		// array of CSS styles ( selector => properties).
-		$css = array();
-		// get CSS array defined at previous call
-		$matches = array();
-		if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $form, $matches) > 0) {
-			if (isset($matches[1][0])) {
-				$css = array_merge($css, unserialize($this->unhtmlentities($matches[1][0])));
-			}
-			$form = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $form);
-		}
-		// extract external CSS files
-		$matches = array();
-		if (preg_match_all('/<link([^\>]*)>/isU', $form, $matches) > 0) {
-			foreach ($matches[1] as $key => $link) {
-				$type = array();
-				if (preg_match('/type[\s]*=[\s]*"text\/css"/', $link, $type)) {
-					$type = array();
-					preg_match('/media[\s]*=[\s]*"([^"]*)"/', $link, $type);
-					// get 'all' and 'print' media, other media types are discarded
-					// (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
-					if (empty($type) OR (isset($type[1]) AND (($type[1] == 'all') OR ($type[1] == 'print')))) {
-						$type = array();
-						if (preg_match('/href[\s]*=[\s]*"([^"]*)"/', $link, $type) > 0) {
-							// read CSS data file
-							$cssdata = file_get_contents(trim($type[1]));
-							$css = array_merge($css, $this->extractCSSproperties($cssdata));
-						}
-					}
-				}
-			}
-		}
-		// extract style tags
-		$matches = array();
-		if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $form, $matches) > 0) {
-			foreach ($matches[1] as $key => $media) {
-				$type = array();
-				preg_match('/media[\s]*=[\s]*"([^"]*)"/', $media, $type);
-				// get 'all' and 'print' media, other media types are discarded
-				// (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
-				if (empty($type) OR (isset($type[1]) AND (($type[1] == 'all') OR ($type[1] == 'print')))) {
-					$cssdata = $matches[2][$key];
-					$css = array_merge($css, $this->extractCSSproperties($cssdata));
-				}
-			}
-		}
-		// create a special tag to contain the CSS array (used for table content)
-		$csstagarray = '<cssarray>'.htmlentities(serialize($css)).'</cssarray>';
-		// remove head and style blocks
-		$form = preg_replace('/<head([^\>]*)>(.*?)<\/head>/siU', '', $form);
-		$form = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $form);
-		// define block tags
-		$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
-		// define self-closing tags
-		$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
-		// remove all unsupported tags (the line below lists all supported tags)
-		$form = strip_tags($form, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
-		//replace some blank characters
-		$form = preg_replace('/<pre/', '<xre', $form); // preserve pre tag
-		$form = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $form);
-		$form = preg_replace('@(\r\n|\r)@', "\n", $form);
-		$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
-		$form = strtr($form, $repTable);
-		$offset = 0;
-		while (($offset < strlen($form)) AND ($pos = strpos($form, '</pre>', $offset)) !== false) {
-			$form_a = substr($form, 0, $offset);
-			$form_b = substr($form, $offset, ($pos - $offset + 6));
-			while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $form_b)) {
-				// preserve newlines on <pre> tag
-				$form_b = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $form_b);
-			}
-			while (preg_match("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], $form_b)) {
-				// preserve spaces on <pre> tag
-				$form_b = preg_replace("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], "<xre\\1>\\2&nbsp;\\3</pre>", $form_b);
-			}
-			$form = $form_a.$form_b.substr($form, $pos + 6);
-			$offset = strlen($form_a.$form_b);
-		}
-		$offset = 0;
-		while (($offset < strlen($form)) AND ($pos = strpos($form, '</textarea>', $offset)) !== false) {
-			$form_a = substr($form, 0, $offset);
-			$form_b = substr($form, $offset, ($pos - $offset + 11));
-			while (preg_match("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", $form_b)) {
-				// preserve newlines on <textarea> tag
-				$form_b = preg_replace("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", "<textarea\\1>\\2<TBR>\\3</textarea>", $form_b);
-				$form_b = preg_replace("'<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>'si", "<textarea\\1>\\2''\\3</textarea>", $form_b);
-			}
-			$form = $form_a.$form_b.substr($form, $pos + 11);
-			$offset = strlen($form_a.$form_b);
-		}
-		$form = preg_replace('/([\s]*)<option/si', '<option', $form);
-		$form = preg_replace('/<\/option>([\s]*)/si', '</option>', $form);
-		$offset = 0;
-		while (($offset < strlen($form)) AND ($pos = strpos($form, '</option>', $offset)) !== false) {
-			$form_a = substr($form, 0, $offset);
-			$form_b = substr($form, $offset, ($pos - $offset + 9));
-			while (preg_match("'<option([^\>]*)>(.*?)</option>'si", $form_b)) {
-				$form_b = preg_replace("'<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>'si", "\\2#!TaB!#\\4#!NwL!#", $form_b);
-				$form_b = preg_replace("'<option([^\>]*)>(.*?)</option>'si", "\\2#!NwL!#", $form_b);
-			}
-			$form = $form_a.$form_b.substr($form, $pos + 9);
-			$offset = strlen($form_a.$form_b);
-		}
-		if (preg_match("'</select'si", $form)) {
-			$form = preg_replace("'<select([^\>]*)>'si", "<select\\1 opt=\"", $form);
-			$form = preg_replace("'#!NwL!#</select>'si", "\" />", $form);
-		}
-		$form = str_replace("\n", ' ', $form);
-		// restore textarea newlines
-		$form = str_replace('<TBR>', "\n", $form);
-		// remove extra spaces from code
-		$form = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '</\\1>', $form);
-		$form = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '</\\1>', $form);
-		$form = preg_replace('/[\s]+<(tr|td|th|li|dt|dd)/', '<\\1', $form);
-		$form = preg_replace('/'.$this->re_space['p'].'+<(ul|ol|dl|br)/'.$this->re_space['m'], '<\\1', $form);
-		$form = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $form);
-		$form = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $form);
-		$form = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $form);
-		$form = preg_replace('/'.$this->re_space['p'].'+<img/'.$this->re_space['m'], chr(32).'<img', $form);
-		$form = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $form);
-		$form = preg_replace('/<xre/', '<pre', $form); // restore pre tag
-		$form = preg_replace('/<textarea([^\>]*)>([^\<]*)<\/textarea>/xi', '<textarea\\1 value="\\2" />', $form);
-		$form = preg_replace('/<li([^\>]*)><\/li>/', '<li\\1>&nbsp;</li>', $form);
-		$form = preg_replace('/<li([^\>]*)>'.$this->re_space['p'].'*<img/'.$this->re_space['m'], '<li\\1><font size="1">&nbsp;</font><img', $form);
-		$form = preg_replace('/<([^\>\/]*)>[\s]/', '<\\1>&nbsp;', $form); // preserve some spaces
-		$form = preg_replace('/[\s]<\/([^\>]*)>/', '&nbsp;</\\1>', $form); // preserve some spaces
-		$form = preg_replace('/'.$this->re_space['p'].'+/'.$this->re_space['m'], chr(32), $form); // replace multiple spaces with a single space
-		// trim string
-		$form = $this->stringTrim($form);
-		// pattern for generic tag
-		$tagpattern = '/(<[^>]+>)/';
-		// explodes the string
-		$a = preg_split($tagpattern, $form, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-		// count elements
-		$maxel = count($a);
-		$elkey = 0;
-		$key = 0;
-		// create an array of elements
-		$dom = array();
-		$dom[$key] = array();
-		// set inheritable properties fot the first void element
-		// possible inheritable properties are: azimuth, border-collapse, border-spacing, caption-side, color, cursor, direction, empty-cells, font, font-family, font-stretch, font-size, font-size-adjust, font-style, font-variant, font-weight, letter-spacing, line-height, list-style, list-style-image, list-style-position, list-style-type, orphans, page, page-break-inside, quotes, speak, speak-header, text-align, text-indent, text-transform, volume, white-space, widows, word-spacing
-		$dom[$key]['tag'] = false;
-		$dom[$key]['block'] = false;
-		$dom[$key]['value'] = '';
-		$dom[$key]['parent'] = 0;
-		$dom[$key]['fontname'] = $this->FontFamily;
-		$dom[$key]['fontstyle'] = $this->FontStyle;
-		$dom[$key]['fontsize'] = $this->FontSizePt;
-		$dom[$key]['font-stretch'] = 100;
-		$dom[$key]['letter-spacing'] = 0;
-		$dom[$key]['stroke'] = $this->textstrokewidth;
-		$dom[$key]['fill'] = (($this->textrendermode % 2) == 0);
-		$dom[$key]['clip'] = ($this->textrendermode > 3);
-		$dom[$key]['line-height'] = $this->cell_height_ratio;
-		$dom[$key]['bgcolor'] = false;
-		$dom[$key]['fgcolor'] = $this->fgcolor; // color
-		$dom[$key]['strokecolor'] = $this->strokecolor;
-		$dom[$key]['align'] = '';
-		$dom[$key]['listtype'] = '';
-		$dom[$key]['text-indent'] = 0;
-		$dom[$key]['border'] = array();
-		$dom[$key]['dir'] = $this->rtl?'rtl':'ltr';
-		$thead = false; // true when we are inside the THEAD tag
-		++$key;
-		$level = array();
-		array_push($level, 0); // root
-		while ($elkey < $maxel) {
-			$dom[$key] = array();
-			$element = $a[$elkey];
-			$dom[$key]['elkey'] = $elkey;
-			if (preg_match($tagpattern, $element)) {
-				// html tag
-				$element = substr($element, 1, -1);
-				// get tag name
-				preg_match('/[\/]?([a-zA-Z0-9]*)/', $element, $tag);
-				$tagname = strtolower($tag[1]);
-				// check if we are inside a table header
-				if ($tagname == 'thead') {
-					if ($element{0} == '/') {
-						$thead = false;
-					} else {
-						$thead = true;
-					}
-					++$elkey;
-					continue;
-				}
-				$dom[$key]['tag'] = true;
-				$dom[$key]['value'] = $tagname;
-				if (in_array($dom[$key]['value'], $blocktags)) {
-					$dom[$key]['block'] = true;
-				} else {
-					$dom[$key]['block'] = false;
-				}
-				if ($element{0} == '/') {
-					// *** closing html tag
-					$dom[$key]['opening'] = false;
-					$dom[$key]['parent'] = end($level);
-					array_pop($level);
-					$dom[$key]['fontname'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontname'];
-					$dom[$key]['fontstyle'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontstyle'];
-					$dom[$key]['fontsize'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fontsize'];
-					$dom[$key]['font-stretch'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['font-stretch'];
-					$dom[$key]['letter-spacing'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['letter-spacing'];
-					$dom[$key]['stroke'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['stroke'];
-					$dom[$key]['fill'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fill'];
-					$dom[$key]['clip'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['clip'];
-					$dom[$key]['line-height'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['line-height'];
-					$dom[$key]['bgcolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['bgcolor'];
-					$dom[$key]['fgcolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['fgcolor'];
-					$dom[$key]['strokecolor'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['strokecolor'];
-					$dom[$key]['align'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['align'];
-					$dom[$key]['dir'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['dir'];
-					if (isset($dom[($dom[($dom[$key]['parent'])]['parent'])]['listtype'])) {
-						$dom[$key]['listtype'] = $dom[($dom[($dom[$key]['parent'])]['parent'])]['listtype'];
-					}
-					// set the number of columns in table tag
-					if (($dom[$key]['value'] == 'tr') AND (!isset($dom[($dom[($dom[$key]['parent'])]['parent'])]['cols']))) {
-						$dom[($dom[($dom[$key]['parent'])]['parent'])]['cols'] = $dom[($dom[$key]['parent'])]['cols'];
-					}
-					if (($dom[$key]['value'] == 'td') OR ($dom[$key]['value'] == 'th')) {
-						$dom[($dom[$key]['parent'])]['content'] = $csstagarray;
-						for ($i = ($dom[$key]['parent'] + 1); $i < $key; ++$i) {
-							$dom[($dom[$key]['parent'])]['content'] .= $a[$dom[$i]['elkey']];
-						}
-						$key = $i;
-						$parent_table = $dom[$dom[$dom[($dom[$key]['parent'])]['parent']]['parent']];
-						$parent_padding = 0;
-						$parent_spacing = 0;
-						if (isset($parent_table['attribute']['cellpadding'])) {
-							$parent_padding = $this->getHTMLUnitToUnits($parent_table['attribute']['cellpadding'], 1, 'px');
-						}
-						if (isset($parent_table['attribute']['cellspacing'])) {
-							$parent_spacing = $this->getHTMLUnitToUnits($parent_table['attribute']['cellspacing'], 1, 'px');
-						}
-						// mark nested tables
-						$dom[($dom[$key]['parent'])]['content'] = str_replace('<table', '<table nested="true" pcellpadding="'.$parent_padding.'" pcellspacing="'.$parent_spacing.'"', $dom[($dom[$key]['parent'])]['content']);
-						// remove thead sections from nested tables
-						$dom[($dom[$key]['parent'])]['content'] = str_replace('<thead>', '', $dom[($dom[$key]['parent'])]['content']);
-						$dom[($dom[$key]['parent'])]['content'] = str_replace('</thead>', '', $dom[($dom[$key]['parent'])]['content']);
-					}
-					// store header rows on a new table
-					if (($dom[$key]['value'] == 'tr') AND ($dom[($dom[$key]['parent'])]['thead'] === true)) {
-						if ($this->empty_string($dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'])) {
-							$dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'] = $a[$dom[($dom[($dom[$key]['parent'])]['parent'])]['elkey']];
-						}
-						for ($i = $dom[$key]['parent']; $i <= $key; ++$i) {
-							$dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'] .= $a[$dom[$i]['elkey']];
-						}
-						if (!isset($dom[($dom[$key]['parent'])]['attribute'])) {
-							$dom[($dom[$key]['parent'])]['attribute'] = array();
-						}
-						// header elements must be always contained in a single page
-						$dom[($dom[$key]['parent'])]['attribute']['nobr'] = 'true';
-					}
-					if (($dom[$key]['value'] == 'table') AND (!$this->empty_string($dom[($dom[$key]['parent'])]['thead']))) {
-						// remove the nobr attributes from the table header
-						$dom[($dom[$key]['parent'])]['thead'] = str_replace(' nobr="true"', '', $dom[($dom[$key]['parent'])]['thead']);
-						$dom[($dom[$key]['parent'])]['thead'] .= '</tablehead>';
-					}
-				} else {
-					// *** opening or self-closing html tag
-					$dom[$key]['opening'] = true;
-					$dom[$key]['parent'] = end($level);
-					if ((substr($element, -1, 1) == '/') OR (in_array($dom[$key]['value'], $selfclosingtags))) {
-						// self-closing tag
-						$dom[$key]['self'] = true;
-					} else {
-						// opening tag
-						array_push($level, $key);
-						$dom[$key]['self'] = false;
-					}
-					// copy some values from parent
-					$parentkey = 0;
-					if ($key > 0) {
-						$parentkey = $dom[$key]['parent'];
-						$dom[$key]['fontname'] = $dom[$parentkey]['fontname'];
-						$dom[$key]['fontstyle'] = $dom[$parentkey]['fontstyle'];
-						$dom[$key]['fontsize'] = $dom[$parentkey]['fontsize'];
-						$dom[$key]['font-stretch'] = $dom[$parentkey]['font-stretch'];
-						$dom[$key]['letter-spacing'] = $dom[$parentkey]['letter-spacing'];
-						$dom[$key]['stroke'] = $dom[$parentkey]['stroke'];
-						$dom[$key]['fill'] = $dom[$parentkey]['fill'];
-						$dom[$key]['clip'] = $dom[$parentkey]['clip'];
-						$dom[$key]['line-height'] = $dom[$parentkey]['line-height'];
-						$dom[$key]['bgcolor'] = $dom[$parentkey]['bgcolor'];
-						$dom[$key]['fgcolor'] = $dom[$parentkey]['fgcolor'];
-						$dom[$key]['strokecolor'] = $dom[$parentkey]['strokecolor'];
-						$dom[$key]['align'] = $dom[$parentkey]['align'];
-						$dom[$key]['listtype'] = $dom[$parentkey]['listtype'];
-						$dom[$key]['text-indent'] = $dom[$parentkey]['text-indent'];
-						$dom[$key]['border'] = array();
-						$dom[$key]['dir'] = $dom[$parentkey]['dir'];
-					}
-					// get attributes
-					preg_match_all('/([^=\s]*)[\s]*=[\s]*"([^"]*)"/', $element, $attr_array, PREG_PATTERN_ORDER);
-					$dom[$key]['attribute'] = array(); // reset attribute array
-					while (list($id, $name) = each($attr_array[1])) {
-						$dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
-					}
-					if (!empty($css)) {
-						// merge eternal CSS style to current style
-						$dom[$key]['attribute']['style'] = $this->getTagStyleFromCSS($dom, $key, $css);
-					}
-					// split style attributes
-					if (isset($dom[$key]['attribute']['style']) AND !empty($dom[$key]['attribute']['style'])) {
-						// get style attributes
-						preg_match_all('/([^;:\s]*):([^;]*)/', $dom[$key]['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
-						$dom[$key]['style'] = array(); // reset style attribute array
-						while (list($id, $name) = each($style_array[1])) {
-							// in case of duplicate attribute the last replace the previous
-							$dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
-						}
-						// --- get some style attributes ---
-						// text direction
-						if (isset($dom[$key]['style']['direction'])) {
-							$dom[$key]['dir'] = $dom[$key]['style']['direction'];
-						}
-						// font family
-						if (isset($dom[$key]['style']['font-family'])) {
-							$dom[$key]['fontname'] = $this->getFontFamilyName($dom[$key]['style']['font-family']);
-						}
-						// list-style-type
-						if (isset($dom[$key]['style']['list-style-type'])) {
-							$dom[$key]['listtype'] = trim(strtolower($dom[$key]['style']['list-style-type']));
-							if ($dom[$key]['listtype'] == 'inherit') {
-								$dom[$key]['listtype'] = $dom[$parentkey]['listtype'];
-							}
-						}
-						// text-indent
-						if (isset($dom[$key]['style']['text-indent'])) {
-							$dom[$key]['text-indent'] = $this->getHTMLUnitToUnits($dom[$key]['style']['text-indent']);
-							if ($dom[$key]['text-indent'] == 'inherit') {
-								$dom[$key]['text-indent'] = $dom[$parentkey]['text-indent'];
-							}
-						}
-						// font size
-						if (isset($dom[$key]['style']['font-size'])) {
-							$fsize = trim($dom[$key]['style']['font-size']);
-							switch ($fsize) {
-								// absolute-size
-								case 'xx-small': {
-									$dom[$key]['fontsize'] = $dom[0]['fontsize'] - 4;
-									break;
-								}
-								case 'x-small': {
-									$dom[$key]['fontsize'] = $dom[0]['fontsize'] - 3;
-									break;
-								}
-								case 'small': {
-									$dom[$key]['fontsize'] = $dom[0]['fontsize'] - 2;
-									break;
-								}
-								case 'medium': {
-									$dom[$key]['fontsize'] = $dom[0]['fontsize'];
-									break;
-								}
-								case 'large': {
-									$dom[$key]['fontsize'] = $dom[0]['fontsize'] + 2;
-									break;
-								}
-								case 'x-large': {
-									$dom[$key]['fontsize'] = $dom[0]['fontsize'] + 4;
-									break;
-								}
-								case 'xx-large': {
-									$dom[$key]['fontsize'] = $dom[0]['fontsize'] + 6;
-									break;
-								}
-								// relative-size
-								case 'smaller': {
-									$dom[$key]['fontsize'] = $dom[$parentkey]['fontsize'] - 3;
-									break;
-								}
-								case 'larger': {
-									$dom[$key]['fontsize'] = $dom[$parentkey]['fontsize'] + 3;
-									break;
-								}
-								default: {
-									$dom[$key]['fontsize'] = $this->getHTMLUnitToUnits($fsize, $dom[$parentkey]['fontsize'], 'pt', true);
-								}
-							}
-						}
-						// font-stretch
-						if (isset($dom[$key]['style']['font-stretch'])) {
-							$dom[$key]['font-stretch'] = $this->getCSSFontStretching($dom[$key]['style']['font-stretch'], $dom[$parentkey]['font-stretch']);
-						}
-						// letter-spacing
-						if (isset($dom[$key]['style']['letter-spacing'])) {
-							$dom[$key]['letter-spacing'] = $this->getCSSFontSpacing($dom[$key]['style']['letter-spacing'], $dom[$parentkey]['letter-spacing']);
-						}
-						// line-height
-						if (isset($dom[$key]['style']['line-height'])) {
-							$lineheight = trim($dom[$key]['style']['line-height']);
-							switch ($lineheight) {
-								// A normal line height. This is default
-								case 'normal': {
-									$dom[$key]['line-height'] = $dom[0]['line-height'];
-									break;
-								}
-								default: {
-									if (is_numeric($lineheight)) {
-										$lineheight = $lineheight * 100;
-									}
-									$dom[$key]['line-height'] = $this->getHTMLUnitToUnits($lineheight, 1, '%', true);
-								}
-							}
-						}
-						// font style
-						if (isset($dom[$key]['style']['font-weight']) AND (strtolower($dom[$key]['style']['font-weight']{0}) == 'b')) {
-							$dom[$key]['fontstyle'] .= 'B';
-						}
-						if (isset($dom[$key]['style']['font-style']) AND (strtolower($dom[$key]['style']['font-style']{0}) == 'i')) {
-							$dom[$key]['fontstyle'] .= 'I';
-						}
-						// font color
-						if (isset($dom[$key]['style']['color']) AND (!$this->empty_string($dom[$key]['style']['color']))) {
-							$dom[$key]['fgcolor'] = $this->convertHTMLColorToDec($dom[$key]['style']['color']);
-						} elseif ($dom[$key]['value'] == 'a') {
-							$dom[$key]['fgcolor'] = $this->htmlLinkColorArray;
-						}
-						// background color
-						if (isset($dom[$key]['style']['background-color']) AND (!$this->empty_string($dom[$key]['style']['background-color']))) {
-							$dom[$key]['bgcolor'] = $this->convertHTMLColorToDec($dom[$key]['style']['background-color']);
-						}
-						// text-decoration
-						if (isset($dom[$key]['style']['text-decoration'])) {
-							$decors = explode(' ', strtolower($dom[$key]['style']['text-decoration']));
-							foreach ($decors as $dec) {
-								$dec = trim($dec);
-								if (!$this->empty_string($dec)) {
-									if ($dec{0} == 'u') {
-										// underline
-										$dom[$key]['fontstyle'] .= 'U';
-									} elseif ($dec{0} == 'l') {
-										// line-trough
-										$dom[$key]['fontstyle'] .= 'D';
-									} elseif ($dec{0} == 'o') {
-										// overline
-										$dom[$key]['fontstyle'] .= 'O';
-									}
-								}
-							}
-						} elseif ($dom[$key]['value'] == 'a') {
-							$dom[$key]['fontstyle'] = $this->htmlLinkFontStyle;
-						}
-						// check for width attribute
-						if (isset($dom[$key]['style']['width'])) {
-							$dom[$key]['width'] = $dom[$key]['style']['width'];
-						}
-						// check for height attribute
-						if (isset($dom[$key]['style']['height'])) {
-							$dom[$key]['height'] = $dom[$key]['style']['height'];
-						}
-						// check for text alignment
-						if (isset($dom[$key]['style']['text-align'])) {
-							$dom[$key]['align'] = strtoupper($dom[$key]['style']['text-align']{0});
-						}
-						// check for CSS border properties
-						if (isset($dom[$key]['style']['border'])) {
-							$borderstyle = $this->getCSSBorderStyle($dom[$key]['style']['border']);
-							if (!empty($borderstyle)) {
-								$dom[$key]['border']['LTRB'] = $borderstyle;
-							}
-						}
-						if (isset($dom[$key]['style']['border-color'])) {
-							$brd_colors = preg_split('/[\s]+/', trim($dom[$key]['style']['border-color']));
-							if (isset($brd_colors[3])) {
-								$dom[$key]['border']['L']['color'] = $this->convertHTMLColorToDec($brd_colors[3]);
-							}
-							if (isset($brd_colors[1])) {
-								$dom[$key]['border']['R']['color'] = $this->convertHTMLColorToDec($brd_colors[1]);
-							}
-							if (isset($brd_colors[0])) {
-								$dom[$key]['border']['T']['color'] = $this->convertHTMLColorToDec($brd_colors[0]);
-							}
-							if (isset($brd_colors[2])) {
-								$dom[$key]['border']['B']['color'] = $this->convertHTMLColorToDec($brd_colors[2]);
-							}
-						}
-						if (isset($dom[$key]['style']['border-width'])) {
-							$brd_widths = preg_split('/[\s]+/', trim($dom[$key]['style']['border-width']));
-							if (isset($brd_widths[3])) {
-								$dom[$key]['border']['L']['width'] = $this->getCSSBorderWidth($brd_widths[3]);
-							}
-							if (isset($brd_widths[1])) {
-								$dom[$key]['border']['R']['width'] = $this->getCSSBorderWidth($brd_widths[1]);
-							}
-							if (isset($brd_widths[0])) {
-								$dom[$key]['border']['T']['width'] = $this->getCSSBorderWidth($brd_widths[0]);
-							}
-							if (isset($brd_widths[2])) {
-								$dom[$key]['border']['B']['width'] = $this->getCSSBorderWidth($brd_widths[2]);
-							}
-						}
-						if (isset($dom[$key]['style']['border-style'])) {
-							$brd_styles = preg_split('/[\s]+/', trim($dom[$key]['style']['border-style']));
-							if (isset($brd_styles[3])) {
-								$dom[$key]['border']['L']['cap'] = 'square';
-								$dom[$key]['border']['L']['join'] = 'miter';
-								$dom[$key]['border']['L']['dash'] = $this->getCSSBorderDashStyle($brd_styles[3]);
-								if ($dom[$key]['border']['L']['dash'] < 0) {
-									$dom[$key]['border']['L'] = array();
-								}
-							}
-							if (isset($brd_styles[1])) {
-								$dom[$key]['border']['R']['cap'] = 'square';
-								$dom[$key]['border']['R']['join'] = 'miter';
-								$dom[$key]['border']['R']['dash'] = $this->getCSSBorderDashStyle($brd_styles[1]);
-								if ($dom[$key]['border']['R']['dash'] < 0) {
-									$dom[$key]['border']['R'] = array();
-								}
-							}
-							if (isset($brd_styles[0])) {
-								$dom[$key]['border']['T']['cap'] = 'square';
-								$dom[$key]['border']['T']['join'] = 'miter';
-								$dom[$key]['border']['T']['dash'] = $this->getCSSBorderDashStyle($brd_styles[0]);
-								if ($dom[$key]['border']['T']['dash'] < 0) {
-									$dom[$key]['border']['T'] = array();
-								}
-							}
-							if (isset($brd_styles[2])) {
-								$dom[$key]['border']['B']['cap'] = 'square';
-								$dom[$key]['border']['B']['join'] = 'miter';
-								$dom[$key]['border']['B']['dash'] = $this->getCSSBorderDashStyle($brd_styles[2]);
-								if ($dom[$key]['border']['B']['dash'] < 0) {
-									$dom[$key]['border']['B'] = array();
-								}
-							}
-						}
-						$cellside = array('L' => 'left', 'R' => 'right', 'T' => 'top', 'B' => 'bottom');
-						foreach ($cellside as $bsk => $bsv) {
-							if (isset($dom[$key]['style']['border-'.$bsv])) {
-								$borderstyle = $this->getCSSBorderStyle($dom[$key]['style']['border-'.$bsv]);
-								if (!empty($borderstyle)) {
-									$dom[$key]['border'][$bsk] = $borderstyle;
-								}
-							}
-							if (isset($dom[$key]['style']['border-'.$bsv.'-color'])) {
-								$dom[$key]['border'][$bsk]['color'] = $this->convertHTMLColorToDec($dom[$key]['style']['border-'.$bsv.'-color']);
-							}
-							if (isset($dom[$key]['style']['border-'.$bsv.'-width'])) {
-								$dom[$key]['border'][$bsk]['width'] = $this->getCSSBorderWidth($dom[$key]['style']['border-'.$bsv.'-width']);
-							}
-							if (isset($dom[$key]['style']['border-'.$bsv.'-style'])) {
-								$dom[$key]['border'][$bsk]['dash'] = $this->getCSSBorderDashStyle($dom[$key]['style']['border-'.$bsv.'-style']);
-								if ($dom[$key]['border'][$bsk]['dash'] < 0) {
-									$dom[$key]['border'][$bsk] = array();
-								}
-							}
-						}
-						// check for CSS padding properties
-						if (isset($dom[$key]['style']['padding'])) {
-							$dom[$key]['padding'] = $this->getCSSPadding($dom[$key]['style']['padding']);
-						} else {
-							$dom[$key]['padding'] = $this->cell_padding;
-						}
-						foreach ($cellside as $psk => $psv) {
-							if (isset($dom[$key]['style']['padding-'.$psv])) {
-								$dom[$key]['padding'][$psk] = $this->getHTMLUnitToUnits($dom[$key]['style']['padding-'.$psv], 0, 'px', false);
-							}
-						}
-						// check for CSS margin properties
-						if (isset($dom[$key]['style']['margin'])) {
-							$dom[$key]['margin'] = $this->getCSSMargin($dom[$key]['style']['margin']);
-						} else {
-							$dom[$key]['margin'] = $this->cell_margin;
-						}
-						foreach ($cellside as $psk => $psv) {
-							if (isset($dom[$key]['style']['margin-'.$psv])) {
-								$dom[$key]['margin'][$psk] = $this->getHTMLUnitToUnits(str_replace('auto', '0', $dom[$key]['style']['margin-'.$psv]), 0, 'px', false);
-							}
-						}
-						// page-break-inside
-						if (isset($dom[$key]['style']['page-break-inside']) AND ($dom[$key]['style']['page-break-inside'] == 'avoid')) {
-							$dom[$key]['attribute']['nobr'] = 'true';
-						}
-						// page-break-before
-						if (isset($dom[$key]['style']['page-break-before'])) {
-							if ($dom[$key]['style']['page-break-before'] == 'always') {
-								$dom[$key]['attribute']['pagebreak'] = 'true';
-							} elseif ($dom[$key]['style']['page-break-before'] == 'left') {
-								$dom[$key]['attribute']['pagebreak'] = 'left';
-							} elseif ($dom[$key]['style']['page-break-before'] == 'right') {
-								$dom[$key]['attribute']['pagebreak'] = 'right';
-							}
-						}
-						// page-break-after
-						if (isset($dom[$key]['style']['page-break-after'])) {
-							if ($dom[$key]['style']['page-break-after'] == 'always') {
-								$dom[$key]['attribute']['pagebreakafter'] = 'true';
-							} elseif ($dom[$key]['style']['page-break-after'] == 'left') {
-								$dom[$key]['attribute']['pagebreakafter'] = 'left';
-							} elseif ($dom[$key]['style']['page-break-after'] == 'right') {
-								$dom[$key]['attribute']['pagebreakafter'] = 'right';
-							}
-						}
-					}
-					if (isset($dom[$key]['attribute']['border']) AND ($dom[$key]['attribute']['border'] != 0)) {
-						$borderstyle = $this->getCSSBorderStyle($dom[$key]['attribute']['border'].' solid black');
-						if (!empty($borderstyle)) {
-							$dom[$key]['border']['LTRB'] = $borderstyle;
-						}
-					}
-					// check for font tag
-					if ($dom[$key]['value'] == 'font') {
-						// font family
-						if (isset($dom[$key]['attribute']['face'])) {
-							$dom[$key]['fontname'] = $this->getFontFamilyName($dom[$key]['attribute']['face']);
-						}
-						// font size
-						if (isset($dom[$key]['attribute']['size'])) {
-							if ($key > 0) {
-								if ($dom[$key]['attribute']['size']{0} == '+') {
-									$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] + intval(substr($dom[$key]['attribute']['size'], 1));
-								} elseif ($dom[$key]['attribute']['size']{0} == '-') {
-									$dom[$key]['fontsize'] = $dom[($dom[$key]['parent'])]['fontsize'] - intval(substr($dom[$key]['attribute']['size'], 1));
-								} else {
-									$dom[$key]['fontsize'] = intval($dom[$key]['attribute']['size']);
-								}
-							} else {
-								$dom[$key]['fontsize'] = intval($dom[$key]['attribute']['size']);
-							}
-						}
-					}
-					// force natural alignment for lists
-					if ((($dom[$key]['value'] == 'ul') OR ($dom[$key]['value'] == 'ol') OR ($dom[$key]['value'] == 'dl'))
-						AND (!isset($dom[$key]['align']) OR $this->empty_string($dom[$key]['align']) OR ($dom[$key]['align'] != 'J'))) {
-						if ($this->rtl) {
-							$dom[$key]['align'] = 'R';
-						} else {
-							$dom[$key]['align'] = 'L';
-						}
-					}
-					if (($dom[$key]['value'] == 'small') OR ($dom[$key]['value'] == 'sup') OR ($dom[$key]['value'] == 'sub')) {
-						if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) {
-							$dom[$key]['fontsize'] = $dom[$key]['fontsize'] * K_SMALL_RATIO;
-						}
-					}
-					if (($dom[$key]['value'] == 'strong') OR ($dom[$key]['value'] == 'b')) {
-						$dom[$key]['fontstyle'] .= 'B';
-					}
-					if (($dom[$key]['value'] == 'em') OR ($dom[$key]['value'] == 'i')) {
-						$dom[$key]['fontstyle'] .= 'I';
-					}
-					if ($dom[$key]['value'] == 'u') {
-						$dom[$key]['fontstyle'] .= 'U';
-					}
-					if (($dom[$key]['value'] == 'del') OR ($dom[$key]['value'] == 's') OR ($dom[$key]['value'] == 'strike')) {
-						$dom[$key]['fontstyle'] .= 'D';
-					}
-					if (!isset($dom[$key]['style']['text-decoration']) AND ($dom[$key]['value'] == 'a')) {
-						$dom[$key]['fontstyle'] = $this->htmlLinkFontStyle;
-					}
-					if (($dom[$key]['value'] == 'pre') OR ($dom[$key]['value'] == 'tt')) {
-						$dom[$key]['fontname'] = $this->default_monospaced_font;
-					}
-					if (($dom[$key]['value']{0} == 'h') AND (intval($dom[$key]['value']{1}) > 0) AND (intval($dom[$key]['value']{1}) < 7)) {
-						// headings h1, h2, h3, h4, h5, h6
-						if (!isset($dom[$key]['attribute']['size']) AND !isset($dom[$key]['style']['font-size'])) {
-							$headsize = (4 - intval($dom[$key]['value']{1})) * 2;
-							$dom[$key]['fontsize'] = $dom[0]['fontsize'] + $headsize;
-						}
-						if (!isset($dom[$key]['style']['font-weight'])) {
-							$dom[$key]['fontstyle'] .= 'B';
-						}
-					}
-					if (($dom[$key]['value'] == 'table')) {
-						$dom[$key]['rows'] = 0; // number of rows
-						$dom[$key]['trids'] = array(); // IDs of TR elements
-						$dom[$key]['thead'] = ''; // table header rows
-					}
-					if (($dom[$key]['value'] == 'tr')) {
-						$dom[$key]['cols'] = 0;
-						if ($thead) {
-							$dom[$key]['thead'] = true;
-							// rows on thead block are printed as a separate table
-						} else {
-							$dom[$key]['thead'] = false;
-							// store the number of rows on table element
-							++$dom[($dom[$key]['parent'])]['rows'];
-							// store the TR elements IDs on table element
-							array_push($dom[($dom[$key]['parent'])]['trids'], $key);
-						}
-					}
-					if (($dom[$key]['value'] == 'th') OR ($dom[$key]['value'] == 'td')) {
-						if (isset($dom[$key]['attribute']['colspan'])) {
-							$colspan = intval($dom[$key]['attribute']['colspan']);
-						} else {
-							$colspan = 1;
-						}
-						$dom[$key]['attribute']['colspan'] = $colspan;
-						$dom[($dom[$key]['parent'])]['cols'] += $colspan;
-					}
-					// text direction
-					if (isset($dom[$key]['attribute']['dir'])) {
-						$dom[$key]['dir'] = $dom[$key]['attribute']['dir'];
-					}
-					// set foreground color attribute
-					if (isset($dom[$key]['attribute']['color']) AND (!$this->empty_string($dom[$key]['attribute']['color']))) {
-						$dom[$key]['fgcolor'] = $this->convertHTMLColorToDec($dom[$key]['attribute']['color']);
-					} elseif (!isset($dom[$key]['style']['color']) AND ($dom[$key]['value'] == 'a')) {
-						$dom[$key]['fgcolor'] = $this->htmlLinkColorArray;
-					}
-					// set background color attribute
-					if (isset($dom[$key]['attribute']['bgcolor']) AND (!$this->empty_string($dom[$key]['attribute']['bgcolor']))) {
-						$dom[$key]['bgcolor'] = $this->convertHTMLColorToDec($dom[$key]['attribute']['bgcolor']);
-					}
-					// set stroke color attribute
-					if (isset($dom[$key]['attribute']['strokecolor']) AND (!$this->empty_string($dom[$key]['attribute']['strokecolor']))) {
-						$dom[$key]['strokecolor'] = $this->convertHTMLColorToDec($dom[$key]['attribute']['strokecolor']);
-					}
-					// check for width attribute
-					if (isset($dom[$key]['attribute']['width'])) {
-						$dom[$key]['width'] = $dom[$key]['attribute']['width'];
-					}
-					// check for height attribute
-					if (isset($dom[$key]['attribute']['height'])) {
-						$dom[$key]['height'] = $dom[$key]['attribute']['height'];
-					}
-					// check for text alignment
-					if (isset($dom[$key]['attribute']['align']) AND (!$this->empty_string($dom[$key]['attribute']['align'])) AND ($dom[$key]['value'] !== 'img')) {
-						$dom[$key]['align'] = strtoupper($dom[$key]['attribute']['align']{0});
-					}
-					// check for text rendering mode (the following attributes do not exist in HTML)
-					if (isset($dom[$key]['attribute']['stroke'])) {
-						// font stroke width
-						$dom[$key]['stroke'] = $this->getHTMLUnitToUnits($dom[$key]['attribute']['stroke'], $dom[$key]['fontsize'], 'pt', true);
-					}
-					if (isset($dom[$key]['attribute']['fill'])) {
-						// font fill
-						if ($dom[$key]['attribute']['fill'] == 'true') {
-							$dom[$key]['fill'] = true;
-						} else {
-							$dom[$key]['fill'] = false;
-						}
-					}
-					if (isset($dom[$key]['attribute']['clip'])) {
-						// clipping mode
-						if ($dom[$key]['attribute']['clip'] == 'true') {
-							$dom[$key]['clip'] = true;
-						} else {
-							$dom[$key]['clip'] = false;
-						}
-					}
-				} // end opening tag
-			} else {
-				// text
-				$dom[$key]['tag'] = false;
-				$dom[$key]['block'] = false;
-				$element = str_replace('$nbsp;', $this->unichr(160), $element);
-				$dom[$key]['value'] = stripslashes($this->unhtmlentities($element));
-				$dom[$key]['parent'] = end($level);
-			}
-			++$elkey;
-			++$key;
-		}
-		return $dom;
-	}
-
-	/**
-	 * Returns the string used to find spaces
-	 * @return string
-	 * @access protected
-	 * @author Nicola Asuni
-	 * @since 4.8.024 (2010-01-15)
-	 */
-	protected function getSpaceString() {
-		$spacestr = chr(32);
-		if ($this->isUnicodeFont()) {
-			$spacestr = chr(0).chr(32);
-		}
-		return $spacestr;
-	}
-
-	/**
-	 * Prints a cell (rectangular area) with optional borders, background color and html text string.
-	 * The upper-left corner of the cell corresponds to the current position. After the call, the current position moves to the right or to the next line.<br />
-	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * @param float $w Cell width. If 0, the cell extends up to the right margin.
-	 * @param float $h Cell minimum height. The cell extends automatically if needed.
-	 * @param float $x upper-left corner X coordinate
-	 * @param float $y upper-left corner Y coordinate
-	 * @param string $form html text to print. Default value: empty string.
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
-Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param boolean $reseth if true reset the last cell height (default true).
-	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width.
-	 * @access public
-	 * @uses MultiCell()
-	 * @see Multicell(), writeHTML()
-	 */
-	public function writeHTMLCell($w, $h, $x, $y, $form='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
-		return $this->MultiCell($w, $h, $form, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0);
-	}
-
-	/**
-	 * Allows to preserve some HTML formatting (limited support).<br />
-	 * IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
-	 * Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
-	 * @param string $form text to display
-	 * @param boolean $ln if true add a new line after text (default = true)
-	 * @param boolean $fill Indicates if the background must be painted (true) or transparent (false).
-	 * @param boolean $reseth if true reset the last cell height (default false).
-	 * @param boolean $cell if true add the current left (or right for RTL) padding to each Write (default false).
-	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @access public
-	 */
-	public function writeHTML($form, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
-		$gvars = $this->getGraphicVars();
-		// store current values
-		$prev_cell_margin = $this->cell_margin;
-		$prev_cell_padding = $this->cell_padding;
-		$prevPage = $this->page;
-		$prevlMargin = $this->lMargin;
-		$prevrMargin = $this->rMargin;
-		$curfontname = $this->FontFamily;
-		$curfontstyle = $this->FontStyle;
-		$curfontsize = $this->FontSizePt;
-		$curfontascent = $this->getFontAscent($curfontname, $curfontstyle, $curfontsize);
-		$curfontdescent = $this->getFontDescent($curfontname, $curfontstyle, $curfontsize);
-		$curfontstretcing = $this->font_stretching;
-		$curfontkerning = $this->font_spacing;
-		$this->newline = true;
-		$newline = true;
-		$startlinepage = $this->page;
-		$minstartliney = $this->y;
-		$maxbottomliney = 0;
-		$startlinex = $this->x;
-		$startliney = $this->y;
-		$yshift = 0;
-		$loop = 0;
-		$curpos = 0;
-		$this_method_vars = array();
-		$undo = false;
-		$fontaligned = false;
-		$reverse_dir = false; // true when the text direction is reversed
-		$this->premode = false;
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$pask = count($this->xobjects[$this->xobjid]['annotations']);
-		} elseif (isset($this->PageAnnots[$this->page])) {
-			$pask = count($this->PageAnnots[$this->page]);
-		} else {
-			$pask = 0;
-		}
-		if ($this->inxobj) {
-			// we are inside an XObject template
-			$startlinepos = strlen($this->xobjects[$this->xobjid]['outdata']);
-		} elseif (!$this->InFooter) {
-			if (isset($this->footerlen[$this->page])) {
-				$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-			} else {
-				$this->footerpos[$this->page] = $this->pagelen[$this->page];
-			}
-			$startlinepos = $this->footerpos[$this->page];
-		} else {
-			// we are inside the footer
-			$startlinepos = $this->pagelen[$this->page];
-		}
-		$lalign = $align;
-		$plalign = $align;
-		if ($this->rtl) {
-			$w = $this->x - $this->lMargin;
-		} else {
-			$w = $this->w - $this->rMargin - $this->x;
-		}
-		$w -= ($this->cell_padding['L'] + $this->cell_padding['R']);
-		if ($cell) {
-			if ($this->rtl) {
-				$this->x -= $this->cell_padding['R'];
-				$this->lMargin += $this->cell_padding['R'];
-			} else {
-				$this->x += $this->cell_padding['L'];
-				$this->rMargin += $this->cell_padding['L'];
-			}
-		}
-		if ($this->customlistindent >= 0) {
-			$this->listindent = $this->customlistindent;
-		} else {
-			$this->listindent = $this->GetStringWidth('0000');
-		}
-		$this->listindentlevel = 0;
-		// save previous states
-		$prev_cell_height_ratio = $this->cell_height_ratio;
-		$prev_listnum = $this->listnum;
-		$prev_listordered = $this->listordered;
-		$prev_listcount = $this->listcount;
-		$prev_lispacer = $this->lispacer;
-		$this->listnum = 0;
-		$this->listordered = array();
-		$this->listcount = array();
-		$this->lispacer = '';
-		if (($this->empty_string($this->lasth)) OR ($reseth)) {
-			// reset row height
-			$this->resetLastH();
-		}
-		$dom = $this->getHtmlDomArray($form);
-		$maxel = count($dom);
-		$key = 0;
-		while ($key < $maxel) {
-			if ($dom[$key]['tag'] AND isset($dom[$key]['attribute']['pagebreak'])) {
-				// check for pagebreak
-				if (($dom[$key]['attribute']['pagebreak'] == 'true') OR ($dom[$key]['attribute']['pagebreak'] == 'left') OR ($dom[$key]['attribute']['pagebreak'] == 'right')) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-				if ((($dom[$key]['attribute']['pagebreak'] == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-					OR (($dom[$key]['attribute']['pagebreak'] == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-			}
-			if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND isset($dom[$key]['attribute']['nobr']) AND ($dom[$key]['attribute']['nobr'] == 'true')) {
-				if (isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) {
-					$dom[$key]['attribute']['nobr'] = false;
-				} else {
-					// store current object
-					$this->startTransaction();
-					// save this method vars
-					$this_method_vars['html'] = $form;
-					$this_method_vars['ln'] = $ln;
-					$this_method_vars['fill'] = $fill;
-					$this_method_vars['reseth'] = $reseth;
-					$this_method_vars['cell'] = $cell;
-					$this_method_vars['align'] = $align;
-					$this_method_vars['gvars'] = $gvars;
-					$this_method_vars['prevPage'] = $prevPage;
-					$this_method_vars['prev_cell_margin'] = $prev_cell_margin;
-					$this_method_vars['prev_cell_padding'] = $prev_cell_padding;
-					$this_method_vars['prevlMargin'] = $prevlMargin;
-					$this_method_vars['prevrMargin'] = $prevrMargin;
-					$this_method_vars['curfontname'] = $curfontname;
-					$this_method_vars['curfontstyle'] = $curfontstyle;
-					$this_method_vars['curfontsize'] = $curfontsize;
-					$this_method_vars['curfontascent'] = $curfontascent;
-					$this_method_vars['curfontdescent'] = $curfontdescent;
-					$this_method_vars['curfontstretcing'] = $curfontstretcing;
-					$this_method_vars['curfontkerning'] = $curfontkerning;
-					$this_method_vars['minstartliney'] = $minstartliney;
-					$this_method_vars['maxbottomliney'] = $maxbottomliney;
-					$this_method_vars['yshift'] = $yshift;
-					$this_method_vars['startlinepage'] = $startlinepage;
-					$this_method_vars['startlinepos'] = $startlinepos;
-					$this_method_vars['startlinex'] = $startlinex;
-					$this_method_vars['startliney'] = $startliney;
-					$this_method_vars['newline'] = $newline;
-					$this_method_vars['loop'] = $loop;
-					$this_method_vars['curpos'] = $curpos;
-					$this_method_vars['pask'] = $pask;
-					$this_method_vars['lalign'] = $lalign;
-					$this_method_vars['plalign'] = $plalign;
-					$this_method_vars['w'] = $w;
-					$this_method_vars['prev_cell_height_ratio'] = $prev_cell_height_ratio;
-					$this_method_vars['prev_listnum'] = $prev_listnum;
-					$this_method_vars['prev_listordered'] = $prev_listordered;
-					$this_method_vars['prev_listcount'] = $prev_listcount;
-					$this_method_vars['prev_lispacer'] = $prev_lispacer;
-					$this_method_vars['fontaligned'] = $fontaligned;
-					$this_method_vars['key'] = $key;
-					$this_method_vars['dom'] = $dom;
-				}
-			}
-			// print THEAD block
-			if (($dom[$key]['value'] == 'tr') AND isset($dom[$key]['thead']) AND $dom[$key]['thead']) {
-				if (isset($dom[$key]['parent']) AND isset($dom[$dom[$key]['parent']]['thead']) AND !$this->empty_string($dom[$dom[$key]['parent']]['thead'])) {
-					$this->inthead = true;
-					// print table header (thead)
-					$this->writeHTML($this->thead, false, false, false, false, '');
-					// check if we are on a new page or on a new column
-					if (($this->y < $this->start_transaction_y) OR ($this->checkPageBreak($this->lasth, '', false))) {
-						// we are on a new page or on a new column and the total object height is less than the available vertical space.
-						// restore previous object
-						$this->rollbackTransaction(true);
-						// restore previous values
-						foreach ($this_method_vars as $vkey => $vval) {
-							$$vkey = $vval;
-						}
-						// disable table header
-						$tmp_thead = $this->thead;
-						$this->thead = '';
-						// add a page (or trig AcceptPageBreak() for multicolumn mode)
-						$pre_y = $this->y;
-						if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) {
-							// fix for multicolumn mode
-							$startliney = $this->y;
-						}
-						$this->start_transaction_page = $this->page;
-						$this->start_transaction_y = $this->y;
-						// restore table header
-						$this->thead = $tmp_thead;
-						// fix table border properties
-						if (isset($dom[$dom[$key]['parent']]['attribute']['cellspacing'])) {
-							$tmp_cellspacing = $this->getHTMLUnitToUnits($dom[$dom[$key]['parent']]['attribute']['cellspacing'], 1, 'px');
-						} else {
-							$tmp_cellspacing = 0;
-						}
-						$dom[$dom[$key]['parent']]['borderposition']['page'] = $this->page;
-						$dom[$dom[$key]['parent']]['borderposition']['column'] = $this->current_column;
-						$dom[$dom[$key]['parent']]['borderposition']['y'] = $this->y + $tmp_cellspacing;
-						$xoffset = ($this->x - $dom[$dom[$key]['parent']]['borderposition']['x']);
-						$dom[$dom[$key]['parent']]['borderposition']['x'] += $xoffset;
-						$dom[$dom[$key]['parent']]['borderposition']['xmax'] += $xoffset;
-						// print table header (thead)
-						$this->writeHTML($this->thead, false, false, false, false, '');
-					}
-				}
-				// move $key index forward to skip THEAD block
-				while ( ($key < $maxel) AND (!(
-					($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'tr') AND (!isset($dom[$key]['thead']) OR !$dom[$key]['thead']))
-					OR ($dom[$key]['tag'] AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == 'table'))) )) {
-					++$key;
-				}
-			}
-			if ($dom[$key]['tag'] OR ($key == 0)) {
-				if ((($dom[$key]['value'] == 'table') OR ($dom[$key]['value'] == 'tr')) AND (isset($dom[$key]['align']))) {
-					$dom[$key]['align'] = ($this->rtl) ? 'R' : 'L';
-				}
-				// vertically align image in line
-				if ((!$this->newline) AND ($dom[$key]['value'] == 'img') AND (isset($dom[$key]['height'])) AND ($dom[$key]['height'] > 0)) {
-					// get image height
-					$imgh = $this->getHTMLUnitToUnits($dom[$key]['height'], $this->lasth, 'px');
-					// check for automatic line break
-					$autolinebreak = false;
-					if (isset($dom[$key]['width']) AND ($dom[$key]['width'] > 0)) {
-						$imgw = $this->getHTMLUnitToUnits($dom[$key]['width'], 1, 'px', false);
-						if (($this->rtl AND (($this->x - $imgw) < ($this->lMargin + $this->cell_padding['L'])))
-							OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin - $this->cell_padding['R'])))) {
-							// add automatic line break
-							$autolinebreak = true;
-							$this->Ln('', $cell);
-							// go back to evaluate this line break
-							--$key;
-						}
-					}
-					if (!$autolinebreak) {
-						if (!$this->InFooter) {
-							$pre_y = $this->y;
-							// check for page break
-							if ((!$this->checkPageBreak($imgh)) AND ($this->y < $pre_y)) {
-								// fix for multicolumn mode
-								$startliney = $this->y;
-							}
-						}
-						if ($this->page > $startlinepage) {
-							// fix line splitted over two pages
-							if (isset($this->footerlen[$startlinepage])) {
-								$curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							}
-							// line to be moved one page forward
-							$pagebuff = $this->getPageBuffer($startlinepage);
-							$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos));
-							$tstart = substr($pagebuff, 0, $startlinepos);
-							$tend = substr($this->getPageBuffer($startlinepage), $curpos);
-							// remove line from previous page
-							$this->setPageBuffer($startlinepage, $tstart.''.$tend);
-							$pagebuff = $this->getPageBuffer($this->page);
-							$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
-							$tend = substr($pagebuff, $this->cntmrk[$this->page]);
-							// add line start to current page
-							$yshift = $minstartliney - $this->y;
-							if ($fontaligned) {
-								$yshift += ($curfontsize / $this->k);
-							}
-							$try = sprintf('1 0 0 1 0 %.3F cm', ($yshift * $this->k));
-							$this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
-							// shift the annotations and links
-							if (isset($this->PageAnnots[$this->page])) {
-								$next_pask = count($this->PageAnnots[$this->page]);
-							} else {
-								$next_pask = 0;
-							}
-							if (isset($this->PageAnnots[$startlinepage])) {
-								foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
-									if ($pak >= $pask) {
-										$this->PageAnnots[$this->page][] = $pac;
-										unset($this->PageAnnots[$startlinepage][$pak]);
-										$npak = count($this->PageAnnots[$this->page]) - 1;
-										$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
-									}
-								}
-							}
-							$pask = $next_pask;
-							$startlinepos = $this->cntmrk[$this->page];
-							$startlinepage = $this->page;
-							$startliney = $this->y;
-							$this->newline = false;
-						}
-						$this->y += ((($curfontsize * $this->cell_height_ratio / $this->k) + $curfontascent - $curfontdescent) / 2) - $imgh;
-						$minstartliney = min($this->y, $minstartliney);
-						$maxbottomliney = ($startliney + ($this->FontSize * $this->cell_height_ratio));
-					}
-				} elseif (isset($dom[$key]['fontname']) OR isset($dom[$key]['fontstyle']) OR isset($dom[$key]['fontsize']) OR isset($dom[$key]['line-height'])) {
-					// account for different font size
-					$pfontname = $curfontname;
-					$pfontstyle = $curfontstyle;
-					$pfontsize = $curfontsize;
-					$fontname = isset($dom[$key]['fontname']) ? $dom[$key]['fontname'] : $curfontname;
-					$fontstyle = isset($dom[$key]['fontstyle']) ? $dom[$key]['fontstyle'] : $curfontstyle;
-					$fontsize = isset($dom[$key]['fontsize']) ? $dom[$key]['fontsize'] : $curfontsize;
-					$fontascent = $this->getFontAscent($fontname, $fontstyle, $fontsize);
-					$fontdescent = $this->getFontDescent($fontname, $fontstyle, $fontsize);
-					if (($fontname != $curfontname) OR ($fontstyle != $curfontstyle) OR ($fontsize != $curfontsize) OR ($this->cell_height_ratio != $dom[$key]['line-height'])) {
-						if ((!$this->newline) AND ($key < ($maxel - 1))
-							AND ((is_numeric($fontsize) AND ($fontsize >= 0) AND is_numeric($curfontsize) AND ($curfontsize >= 0) AND ($fontsize != $curfontsize))
-								OR ($this->cell_height_ratio != $dom[$key]['line-height']))) {
-							if ($this->page > $startlinepage) {
-								// fix lines splitted over two pages
-								if (isset($this->footerlen[$startlinepage])) {
-									$curpos = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-								}
-								// line to be moved one page forward
-								$pagebuff = $this->getPageBuffer($startlinepage);
-								$linebeg = substr($pagebuff, $startlinepos, ($curpos - $startlinepos));
-								$tstart = substr($pagebuff, 0, $startlinepos);
-								$tend = substr($this->getPageBuffer($startlinepage), $curpos);
-								// remove line start from previous page
-								$this->setPageBuffer($startlinepage, $tstart.''.$tend);
-								$pagebuff = $this->getPageBuffer($this->page);
-								$tstart = substr($pagebuff, 0, $this->cntmrk[$this->page]);
-								$tend = substr($pagebuff, $this->cntmrk[$this->page]);
-								// add line start to current page
-								$yshift = $minstartliney - $this->y;
-								$try = sprintf('1 0 0 1 0 %.3F cm', ($yshift * $this->k));
-								$this->setPageBuffer($this->page, $tstart."\nq\n".$try."\n".$linebeg."\nQ\n".$tend);
-								// shift the annotations and links
-								if (isset($this->PageAnnots[$this->page])) {
-									$next_pask = count($this->PageAnnots[$this->page]);
-								} else {
-									$next_pask = 0;
-								}
-								if (isset($this->PageAnnots[$startlinepage])) {
-									foreach ($this->PageAnnots[$startlinepage] as $pak => $pac) {
-										if ($pak >= $pask) {
-											$this->PageAnnots[$this->page][] = $pac;
-											unset($this->PageAnnots[$startlinepage][$pak]);
-											$npak = count($this->PageAnnots[$this->page]) - 1;
-											$this->PageAnnots[$this->page][$npak]['y'] -= $yshift;
-										}
-									}
-								}
-								$pask = $next_pask;
-								$startlinepos = $this->cntmrk[$this->page];
-								$startlinepage = $this->page;
-								$startliney = $this->y;
-							}
-							if (!isset($dom[$key]['line-height'])) {
-								$dom[$key]['line-height'] = $this->cell_height_ratio;
-							}
-							if (!$dom[$key]['block']) {
-								$this->y += (((($curfontsize * $this->cell_height_ratio ) - ($fontsize * $dom[$key]['line-height'])) / $this->k) + $curfontascent - $fontascent - $curfontdescent + $fontdescent) / 2;
-								if (($dom[$key]['value'] != 'sup') AND ($dom[$key]['value'] != 'sub')) {
-									$minstartliney = min($this->y, $minstartliney);
-									$maxbottomliney = max(($this->y + (($fontsize * $this->cell_height_ratio) / $this->k)), $maxbottomliney);
-								}
-							}
-							$this->cell_height_ratio = $dom[$key]['line-height'];
-							$fontaligned = true;
-						}
-						$this->SetFont($fontname, $fontstyle, $fontsize);
-						// reset row height
-						$this->resetLastH();
-						$curfontname = $fontname;
-						$curfontstyle = $fontstyle;
-						$curfontsize = $fontsize;
-						$curfontascent = $fontascent;
-						$curfontdescent = $fontdescent;
-					}
-				}
-				// set text rendering mode
-				$textstroke = isset($dom[$key]['stroke']) ? $dom[$key]['stroke'] : $this->textstrokewidth;
-				$textfill = isset($dom[$key]['fill']) ? $dom[$key]['fill'] : (($this->textrendermode % 2) == 0);
-				$textclip = isset($dom[$key]['clip']) ? $dom[$key]['clip'] : ($this->textrendermode > 3);
-				$this->setTextRenderingMode($textstroke, $textfill, $textclip);
-				if (isset($dom[$key]['font-stretch']) AND ($dom[$key]['font-stretch'] !== false)) {
-					$this->setFontStretching($dom[$key]['font-stretch']);
-				}
-				if (isset($dom[$key]['letter-spacing']) AND ($dom[$key]['letter-spacing'] !== false)) {
-					$this->setFontSpacing($dom[$key]['letter-spacing']);
-				}
-				if (($plalign == 'J') AND $dom[$key]['block']) {
-					$plalign = '';
-				}
-				// get current position on page buffer
-				$curpos = $this->pagelen[$startlinepage];
-				if (isset($dom[$key]['bgcolor']) AND ($dom[$key]['bgcolor'] !== false)) {
-					$this->SetFillColorArray($dom[$key]['bgcolor']);
-					$wfill = true;
-				} else {
-					$wfill = $fill | false;
-				}
-				if (isset($dom[$key]['fgcolor']) AND ($dom[$key]['fgcolor'] !== false)) {
-					$this->SetTextColorArray($dom[$key]['fgcolor']);
-				}
-				if (isset($dom[$key]['strokecolor']) AND ($dom[$key]['strokecolor'] !== false)) {
-					$this->SetDrawColorArray($dom[$key]['strokecolor']);
-				}
-				if (isset($dom[$key]['align'])) {
-					$lalign = $dom[$key]['align'];
-				}
-				if ($this->empty_string($lalign)) {
-					$lalign = $align;
-				}
-			}
-			// align lines
-			if ($this->newline AND (strlen($dom[$key]['value']) > 0) AND ($dom[$key]['value'] != 'td') AND ($dom[$key]['value'] != 'th')) {
-				$newline = true;
-				$fontaligned = false;
-				// we are at the beginning of a new line
-				if (isset($startlinex)) {
-					$yshift = $minstartliney - $startliney;
-					if (($yshift > 0) OR ($this->page > $startlinepage)) {
-						$yshift = 0;
-					}
-					$t_x = 0;
-					// the last line must be shifted to be aligned as requested
-					$linew = abs($this->endlinex - $startlinex);
-					if ($this->inxobj) {
-						// we are inside an XObject template
-						$pstart = substr($this->xobjects[$this->xobjid]['outdata'], 0, $startlinepos);
-						if (isset($opentagpos)) {
-							$midpos = $opentagpos;
-						} else {
-							$midpos = 0;
-						}
-						if ($midpos > 0) {
-							$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos, ($midpos - $startlinepos));
-							$pend = substr($this->xobjects[$this->xobjid]['outdata'], $midpos);
-						} else {
-							$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos);
-							$pend = '';
-						}
-					} else {
-						$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
-						if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-							$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							$midpos = min($opentagpos, $this->footerpos[$startlinepage]);
-						} elseif (isset($opentagpos)) {
-							$midpos = $opentagpos;
-						} elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-							$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-							$midpos = $this->footerpos[$startlinepage];
-						} else {
-							$midpos = 0;
-						}
-						if ($midpos > 0) {
-							$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos));
-							$pend = substr($this->getPageBuffer($startlinepage), $midpos);
-						} else {
-							$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos);
-							$pend = '';
-						}
-					}
-					if ((isset($plalign) AND ((($plalign == 'C') OR ($plalign == 'J') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
-						// calculate shifting amount
-						$tw = $w;
-						if (($plalign == 'J') AND $this->isRTLTextDir() AND ($this->num_columns > 1)) {
-							$tw += $this->cell_padding['R'];
-						}
-						if ($this->lMargin != $prevlMargin) {
-							$tw += ($prevlMargin - $this->lMargin);
-						}
-						if ($this->rMargin != $prevrMargin) {
-							$tw += ($prevrMargin - $this->rMargin);
-						}
-						$one_space_width = $this->GetStringWidth(chr(32));
-						$no = 0; // number of spaces on a line contained on a single block
-						if ($this->isRTLTextDir()) { // RTL
-							// remove left space if exist
-							$pos1 = $this->revstrpos($pmid, '[(');
-							if ($pos1 > 0) {
-								$pos1 = intval($pos1);
-								if ($this->isUnicodeFont()) {
-									$pos2 = intval($this->revstrpos($pmid, '[('.chr(0).chr(32)));
-									$spacelen = 2;
-								} else {
-									$pos2 = intval($this->revstrpos($pmid, '[('.chr(32)));
-									$spacelen = 1;
-								}
-								if ($pos1 == $pos2) {
-									$pmid = substr($pmid, 0, ($pos1 + 2)).substr($pmid, ($pos1 + 2 + $spacelen));
-									if (substr($pmid, $pos1, 4) == '[()]') {
-										$linew -= $one_space_width;
-									} elseif ($pos1 == strpos($pmid, '[(')) {
-										$no = 1;
-									}
-								}
-							}
-						} else { // LTR
-							// remove right space if exist
-							$pos1 = $this->revstrpos($pmid, ')]');
-							if ($pos1 > 0) {
-								$pos1 = intval($pos1);
-								if ($this->isUnicodeFont()) {
-									$pos2 = intval($this->revstrpos($pmid, chr(0).chr(32).')]')) + 2;
-									$spacelen = 2;
-								} else {
-									$pos2 = intval($this->revstrpos($pmid, chr(32).')]')) + 1;
-									$spacelen = 1;
-								}
-								if ($pos1 == $pos2) {
-									$pmid = substr($pmid, 0, ($pos1 - $spacelen)).substr($pmid, $pos1);
-									$linew -= $one_space_width;
-								}
-							}
-						}
-						$mdiff = ($tw - $linew);
-						if ($plalign == 'C') {
-							if ($this->rtl) {
-								$t_x = -($mdiff / 2);
-							} else {
-								$t_x = ($mdiff / 2);
-							}
-						} elseif ($plalign == 'R') {
-							// right alignment on LTR document
-							$t_x = $mdiff;
-						} elseif ($plalign == 'L') {
-							// left alignment on RTL document
-							$t_x = -$mdiff;
-						} elseif (($plalign == 'J') AND ($plalign == $lalign)) {
-							// Justification
-							if ($this->isRTLTextDir()) {
-								// align text on the left
-								$t_x = -$mdiff;
-							}
-							$ns = 0; // number of spaces
-							$pmidtemp = $pmid;
-							// escape special characters
-							$pmidtemp = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmidtemp);
-							$pmidtemp = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmidtemp);
-							// search spaces
-							if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmidtemp, $lnstring, PREG_PATTERN_ORDER)) {
-								$spacestr = $this->getSpaceString();
-								$maxkk = count($lnstring[1]) - 1;
-								for ($kk=0; $kk <= $maxkk; ++$kk) {
-									// restore special characters
-									$lnstring[1][$kk] = str_replace('#!#OP#!#', '(', $lnstring[1][$kk]);
-									$lnstring[1][$kk] = str_replace('#!#CP#!#', ')', $lnstring[1][$kk]);
-									// store number of spaces on the strings
-									$lnstring[2][$kk] = substr_count($lnstring[1][$kk], $spacestr);
-									// count total spaces on line
-									$ns += $lnstring[2][$kk];
-									$lnstring[3][$kk] = $ns;
-								}
-								if ($ns == 0) {
-									$ns = 1;
-								}
-								// calculate additional space to add to each existing space
-								$spacewidth = ($mdiff / ($ns - $no)) * $this->k;
-								$spacewidthu = -1000 * ($mdiff + (($ns + $no) * $one_space_width)) / $ns / $this->FontSize;
-								if ($this->font_spacing != 0) {
-									// fixed spacing mode
-									$osw = -1000 * $this->font_spacing / $this->FontSize;
-									$spacewidthu += $osw;
-								}
-								$nsmax = $ns;
-								$ns = 0;
-								reset($lnstring);
-								$offset = 0;
-								$strcount = 0;
-								$prev_epsposbeg = 0;
-								$textpos = 0;
-								if ($this->isRTLTextDir()) {
-									$textpos = $this->wPt;
-								}
-								global $spacew;
-								while (preg_match('/([0-9\.\+\-]*)[\s](Td|cm|m|l|c|re)[\s]/x', $pmid, $strpiece, PREG_OFFSET_CAPTURE, $offset) == 1) {
-									// check if we are inside a string section '[( ... )]'
-									$stroffset = strpos($pmid, '[(', $offset);
-									if (($stroffset !== false) AND ($stroffset <= $strpiece[2][1])) {
-										// set offset to the end of string section
-										$offset = strpos($pmid, ')]', $stroffset);
-										while (($offset !== false) AND ($pmid{($offset - 1)} == '\\')) {
-											$offset = strpos($pmid, ')]', ($offset + 1));
-										}
-										if ($offset === false) {
-											$this->Error('HTML Justification: malformed PDF code.');
-										}
-										continue;
-									}
-									if ($this->isRTLTextDir()) {
-										$spacew = ($spacewidth * ($nsmax - $ns));
-									} else {
-										$spacew = ($spacewidth * $ns);
-									}
-									$offset = $strpiece[2][1] + strlen($strpiece[2][0]);
-									$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, $offset);
-									$epsposend = strpos($pmid, $this->epsmarker.'Q', $offset) + strlen($this->epsmarker.'Q');
-									if ((($epsposbeg > 0) AND ($epsposend > 0) AND ($offset > $epsposbeg) AND ($offset < $epsposend))
-										OR (($epsposbeg === false) AND ($epsposend > 0) AND ($offset < $epsposend))) {
-										// shift EPS images
-										$trx = sprintf('1 0 0 1 %.3F 0 cm', $spacew);
-										$epsposbeg = strpos($pmid, 'q'.$this->epsmarker, ($prev_epsposbeg - 6));
-										$pmid_b = substr($pmid, 0, $epsposbeg);
-										$pmid_m = substr($pmid, $epsposbeg, ($epsposend - $epsposbeg));
-										$pmid_e = substr($pmid, $epsposend);
-										$pmid = $pmid_b."\nq\n".$trx."\n".$pmid_m."\nQ\n".$pmid_e;
-										$offset = $epsposend;
-										continue;
-
-									}
-									$prev_epsposbeg = $epsposbeg;
-									$currentxpos = 0;
-									// shift blocks of code
-									switch ($strpiece[2][0]) {
-										case 'Td':
-										case 'cm':
-										case 'm':
-										case 'l': {
-											// get current X position
-											preg_match('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x', $pmid, $xmatches);
-											$currentxpos = $xmatches[1];
-											$textpos = $currentxpos;
-											if (($strcount <= $maxkk) AND ($strpiece[2][0] == 'Td')) {
-												$ns = $lnstring[3][$strcount];
-												if ($this->isRTLTextDir()) {
-													$spacew = ($spacewidth * ($nsmax - $ns));
-												}
-												++$strcount;
-											}
-											// justify block
-											$pmid = preg_replace_callback('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x',
-												create_function('$matches', 'global $spacew;
-												$newx = sprintf("%.2F",(floatval($matches[1]) + $spacew));
-												return "".$newx." ".$matches[2]." x*#!#*x".$matches[3].$matches[4];'), $pmid, 1);
-											break;
-										}
-										case 're': {
-											// justify block
-											if (!$this->empty_string($this->lispacer)) {
-												$this->lispacer = '';
-												continue;
-											}
-											preg_match('/([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x', $pmid, $xmatches);
-											$currentxpos = $xmatches[1];
-											global $x_diff, $w_diff;
-											$x_diff = 0;
-											$w_diff = 0;
-											if ($this->isRTLTextDir()) { // RTL
-												if ($currentxpos < $textpos) {
-													$x_diff = ($spacewidth * ($nsmax - $lnstring[3][$strcount]));
-													$w_diff = ($spacewidth * $lnstring[2][$strcount]);
-												} else {
-													if ($strcount > 0) {
-														$x_diff = ($spacewidth * ($nsmax - $lnstring[3][($strcount - 1)]));
-														$w_diff = ($spacewidth * $lnstring[2][($strcount - 1)]);
-													}
-												}
-											} else { // LTR
-												if ($currentxpos > $textpos) {
-													if ($strcount > 0) {
-														$x_diff = ($spacewidth * $lnstring[3][($strcount - 1)]);
-													}
-													$w_diff = ($spacewidth * $lnstring[2][$strcount]);
-												} else {
-													if ($strcount > 1) {
-														$x_diff = ($spacewidth * $lnstring[3][($strcount - 2)]);
-													}
-													if ($strcount > 0) {
-														$w_diff = ($spacewidth * $lnstring[2][($strcount - 1)]);
-													}
-												}
-											}
-											$pmid = preg_replace_callback('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x',
-												create_function('$matches', 'global $x_diff, $w_diff;
-												$newx = sprintf("%.2F",(floatval($matches[1]) + $x_diff));
-												$neww = sprintf("%.2F",(floatval($matches[3]) + $w_diff));
-												return "".$newx." ".$matches[2]." ".$neww." ".$matches[4]." x*#!#*x".$matches[5].$matches[6];'), $pmid, 1);
-											break;
-										}
-										case 'c': {
-											// get current X position
-											preg_match('/([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x', $pmid, $xmatches);
-											$currentxpos = $xmatches[1];
-											// justify block
-											$pmid = preg_replace_callback('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$xmatches[4].')[\s]('.$xmatches[5].')[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x',
-												create_function('$matches', 'global $spacew;
-												$newx1 = sprintf("%.3F",(floatval($matches[1]) + $spacew));
-												$newx2 = sprintf("%.3F",(floatval($matches[3]) + $spacew));
-												$newx3 = sprintf("%.3F",(floatval($matches[5]) + $spacew));
-												return "".$newx1." ".$matches[2]." ".$newx2." ".$matches[4]." ".$newx3." ".$matches[6]." x*#!#*x".$matches[7].$matches[8];'), $pmid, 1);
-											break;
-										}
-									}
-									// shift the annotations and links
-									$cxpos = ($currentxpos / $this->k);
-									$lmpos = ($this->lMargin + $this->cell_padding['L'] + $this->feps);
-									if ($this->inxobj) {
-										// we are inside an XObject template
-										foreach ($this->xobjects[$this->xobjid]['annotations'] as $pak => $pac) {
-											if (($pac['y'] >= $minstartliney) AND (($pac['x'] * $this->k) >= ($currentxpos - $this->feps)) AND (($pac['x'] * $this->k) <= ($currentxpos + $this->feps))) {
-												if ($cxpos > $lmpos) {
-													$this->xobjects[$this->xobjid]['annotations'][$pak]['x'] += ($spacew / $this->k);
-													$this->xobjects[$this->xobjid]['annotations'][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												} else {
-													$this->xobjects[$this->xobjid]['annotations'][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												}
-												break;
-											}
-										}
-									} elseif (isset($this->PageAnnots[$this->page])) {
-										foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-											if (($pac['y'] >= $minstartliney) AND (($pac['x'] * $this->k) >= ($currentxpos - $this->feps)) AND (($pac['x'] * $this->k) <= ($currentxpos + $this->feps))) {
-												if ($cxpos > $lmpos) {
-													$this->PageAnnots[$this->page][$pak]['x'] += ($spacew / $this->k);
-													$this->PageAnnots[$this->page][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												} else {
-													$this->PageAnnots[$this->page][$pak]['w'] += (($spacewidth * $pac['numspaces']) / $this->k);
-												}
-												break;
-											}
-										}
-									}
-								} // end of while
-								// remove markers
-								$pmid = str_replace('x*#!#*x', '', $pmid);
-								if ($this->isUnicodeFont()) {
-									// multibyte characters
-									$spacew = $spacewidthu;
-									if ($this->font_stretching != 100) {
-										// word spacing is affected by stretching
-										$spacew /= ($this->font_stretching / 100);
-									}
-									$pmidtemp = $pmid;
-									// escape special characters
-									$pmidtemp = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmidtemp);
-									$pmidtemp = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmidtemp);
-									$pmid = preg_replace_callback("/\[\(([^\)]*)\)\]/x",
-												create_function('$matches', 'global $spacew;
-												$matches[1] = str_replace("#!#OP#!#", "(", $matches[1]);
-												$matches[1] = str_replace("#!#CP#!#", ")", $matches[1]);
-												return "[(".str_replace(chr(0).chr(32), ") ".sprintf("%.3F", $spacew)." (", $matches[1]).")]";'), $pmidtemp);
-									if ($this->inxobj) {
-										// we are inside an XObject template
-										$this->xobjects[$this->xobjid]['outdata'] = $pstart."\n".$pmid."\n".$pend;
-									} else {
-										$this->setPageBuffer($startlinepage, $pstart."\n".$pmid."\n".$pend);
-									}
-									$endlinepos = strlen($pstart."\n".$pmid."\n");
-								} else {
-									// non-unicode (single-byte characters)
-									if ($this->font_stretching != 100) {
-										// word spacing (Tw) is affected by stretching
-										$spacewidth /= ($this->font_stretching / 100);
-									}
-									$rs = sprintf('%.3F Tw', $spacewidth);
-									$pmid = preg_replace("/\[\(/x", $rs.' [(', $pmid);
-									if ($this->inxobj) {
-										// we are inside an XObject template
-										$this->xobjects[$this->xobjid]['outdata'] = $pstart."\n".$pmid."\nBT 0 Tw ET\n".$pend;
-									} else {
-										$this->setPageBuffer($startlinepage, $pstart."\n".$pmid."\nBT 0 Tw ET\n".$pend);
-									}
-									$endlinepos = strlen($pstart."\n".$pmid."\nBT 0 Tw ET\n");
-								}
-							}
-						} // end of J
-					} // end if $startlinex
-					if (($t_x != 0) OR ($yshift < 0)) {
-						// shift the line
-						$trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k));
-						$pstart .= "\nq\n".$trx."\n".$pmid."\nQ\n";
-						$endlinepos = strlen($pstart);
-						if ($this->inxobj) {
-							// we are inside an XObject template
-							$this->xobjects[$this->xobjid]['outdata'] = $pstart.$pend;
-							foreach ($this->xobjects[$this->xobjid]['annotations'] as $pak => $pac) {
-								if ($pak >= $pask) {
-									$this->xobjects[$this->xobjid]['annotations'][$pak]['x'] += $t_x;
-									$this->xobjects[$this->xobjid]['annotations'][$pak]['y'] -= $yshift;
-								}
-							}
-						} else {
-							$this->setPageBuffer($startlinepage, $pstart.$pend);
-							// shift the annotations and links
-							if (isset($this->PageAnnots[$this->page])) {
-								foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-									if ($pak >= $pask) {
-										$this->PageAnnots[$this->page][$pak]['x'] += $t_x;
-										$this->PageAnnots[$this->page][$pak]['y'] -= $yshift;
-									}
-								}
-							}
-						}
-						$this->y -= $yshift;
-					}
-				}
-				$pbrk = $this->checkPageBreak($this->lasth);
-				$this->newline = false;
-				$startlinex = $this->x;
-				$startliney = $this->y;
-				if ($dom[$dom[$key]['parent']]['value'] == 'sup') {
-					$startliney -= ((0.3 * $this->FontSizePt) / $this->k);
-				} elseif ($dom[$dom[$key]['parent']]['value'] == 'sub') {
-					$startliney -= (($this->FontSizePt / 0.7) / $this->k);
-				} else {
-					$minstartliney = $startliney;
-					$maxbottomliney = ($this->y + (($fontsize * $this->cell_height_ratio) / $this->k));
-				}
-				$startlinepage = $this->page;
-				if (isset($endlinepos) AND (!$pbrk)) {
-					$startlinepos = $endlinepos;
-				} else {
-					if ($this->inxobj) {
-						// we are inside an XObject template
-						$startlinepos = strlen($this->xobjects[$this->xobjid]['outdata']);
-					} elseif (!$this->InFooter) {
-						if (isset($this->footerlen[$this->page])) {
-							$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-						} else {
-							$this->footerpos[$this->page] = $this->pagelen[$this->page];
-						}
-						$startlinepos = $this->footerpos[$this->page];
-					} else {
-						$startlinepos = $this->pagelen[$this->page];
-					}
-				}
-				unset($endlinepos);
-				$plalign = $lalign;
-				if (isset($this->PageAnnots[$this->page])) {
-					$pask = count($this->PageAnnots[$this->page]);
-				} else {
-					$pask = 0;
-				}
-				if (!($dom[$key]['tag'] AND !$dom[$key]['opening'] AND ($dom[$key]['value'] == 'table') AND ($this->emptypagemrk[$this->page] == $this->pagelen[$this->page]))) {
-					$this->SetFont($fontname, $fontstyle, $fontsize);
-					if ($wfill) {
-						$this->SetFillColorArray($this->bgcolor);
-					}
-				}
-			} // end newline
-			if (isset($opentagpos)) {
-				unset($opentagpos);
-			}
-			if ($dom[$key]['tag']) {
-				if ($dom[$key]['opening']) {
-					// get text indentation (if any)
-					if (isset($dom[$key]['text-indent']) AND $dom[$key]['block']) {
-						$this->textindent = $dom[$key]['text-indent'];
-						$this->newline = true;
-					}
-					// table
-					if ($dom[$key]['value'] == 'table') {
-						// available page width
-						if ($this->rtl) {
-							$wtmp = $this->x - $this->lMargin;
-						} else {
-							$wtmp = $this->w - $this->rMargin - $this->x;
-						}
-						if (isset($dom[$key]['attribute']['cellspacing'])) {
-							$cellspacing = $this->getHTMLUnitToUnits($dom[$key]['attribute']['cellspacing'], 1, 'px');
-						} else {
-							$cellspacing = 0;
-						}
-						// table width
-						if (isset($dom[$key]['width'])) {
-							$table_width = $this->getHTMLUnitToUnits($dom[$key]['width'], $wtmp, 'px');
-						} else {
-							$table_width = $wtmp;
-						}
-						$table_width -= (2 * $cellspacing);
-						if (!$this->inthead) {
-							$this->y += $cellspacing;
-						}
-						if ($this->rtl) {
-							$cellspacingx = -$cellspacing;
-						} else {
-							$cellspacingx = $cellspacing;
-						}
-						// total table width without cellspaces
-						$table_columns_width = ($table_width - ($cellspacing * ($dom[$key]['cols'] - 1)));
-						// minimum column width
-						$table_min_column_width = ($table_columns_width / $dom[$key]['cols']);
-						// array of custom column widths
-						$table_colwidths = array_fill(0, $dom[$key]['cols'], $table_min_column_width);
-					}
-					// table row
-					if ($dom[$key]['value'] == 'tr') {
-						// reset column counter
-						$colid = 0;
-					}
-					// table cell
-					if (($dom[$key]['value'] == 'td') OR ($dom[$key]['value'] == 'th')) {
-						$trid = $dom[$key]['parent'];
-						$table_el = $dom[$trid]['parent'];
-						if (!isset($dom[$table_el]['cols'])) {
-							$dom[$table_el]['cols'] = $dom[$trid]['cols'];
-						}
-						// store border info
-						$tdborder = 0;
-						if (isset($dom[$key]['border']) AND !empty($dom[$key]['border'])) {
-							$tdborder = $dom[$key]['border'];
-						}
-						$colspan = $dom[$key]['attribute']['colspan'];
-						$old_cell_padding = $this->cell_padding;
-						if (isset($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'])) {
-							$current_cell_padding = $this->getHTMLUnitToUnits($dom[($dom[$trid]['parent'])]['attribute']['cellpadding'], 1, 'px');
-						} else {
-							$current_cell_padding = 0;
-						}
-						$this->SetCellPadding($current_cell_padding);
-						if (isset($dom[$key]['height'])) {
-							// minimum cell height
-							$cellh = $this->getHTMLUnitToUnits($dom[$key]['height'], 0, 'px');
-						} else {
-							$cellh = 0;
-						}
-						if (isset($dom[$key]['content'])) {
-							$cell_content = $dom[$key]['content'];
-						} else {
-							$cell_content = '&nbsp;';
-						}
-						$tagtype = $dom[$key]['value'];
-						$parentid = $key;
-						while (($key < $maxel) AND (!(($dom[$key]['tag']) AND (!$dom[$key]['opening']) AND ($dom[$key]['value'] == $tagtype) AND ($dom[$key]['parent'] == $parentid)))) {
-							// move $key index forward
-							++$key;
-						}
-						if (!isset($dom[$trid]['startpage'])) {
-							$dom[$trid]['startpage'] = $this->page;
-						} else {
-							$this->setPage($dom[$trid]['startpage']);
-						}
-						if (!isset($dom[$trid]['startcolumn'])) {
-							$dom[$trid]['startcolumn'] = $this->current_column;
-						} elseif ($this->current_column != $dom[$trid]['startcolumn']) {
-							$tmpx = $this->x;
-							$this->selectColumn($dom[$trid]['startcolumn']);
-							$this->x = $tmpx;
-						}
-						if (!isset($dom[$trid]['starty'])) {
-							$dom[$trid]['starty'] = $this->y;
-						} else {
-							$this->y = $dom[$trid]['starty'];
-						}
-						if (!isset($dom[$trid]['startx'])) {
-							$dom[$trid]['startx'] = $this->x;
-							$this->x += $cellspacingx;
-						} else {
-							$this->x += ($cellspacingx / 2);
-						}
-						if (isset($dom[$parentid]['attribute']['rowspan'])) {
-							$rowspan = intval($dom[$parentid]['attribute']['rowspan']);
-						} else {
-							$rowspan = 1;
-						}
-						// skip row-spanned cells started on the previous rows
-						if (isset($dom[$table_el]['rowspans'])) {
-							$rsk = 0;
-							$rskmax = count($dom[$table_el]['rowspans']);
-							while ($rsk < $rskmax) {
-								$trwsp = $dom[$table_el]['rowspans'][$rsk];
-								$rsstartx = $trwsp['startx'];
-								$rsendx = $trwsp['endx'];
-								// account for margin changes
-								if ($trwsp['startpage'] < $this->page) {
-									if (($this->rtl) AND ($this->pagedim[$this->page]['orm'] != $this->pagedim[$trwsp['startpage']]['orm'])) {
-										$dl = ($this->pagedim[$this->page]['orm'] - $this->pagedim[$trwsp['startpage']]['orm']);
-										$rsstartx -= $dl;
-										$rsendx -= $dl;
-									} elseif ((!$this->rtl) AND ($this->pagedim[$this->page]['olm'] != $this->pagedim[$trwsp['startpage']]['olm'])) {
-										$dl = ($this->pagedim[$this->page]['olm'] - $this->pagedim[$trwsp['startpage']]['olm']);
-										$rsstartx += $dl;
-										$rsendx += $dl;
-									}
-								}
-								if (($trwsp['rowspan'] > 0)
-									AND ($rsstartx > ($this->x - $cellspacing - $current_cell_padding - $this->feps))
-									AND ($rsstartx < ($this->x + $cellspacing + $current_cell_padding + $this->feps))
-									AND (($trwsp['starty'] < ($this->y - $this->feps)) OR ($trwsp['startpage'] < $this->page) OR ($trwsp['startcolumn'] < $this->current_column))) {
-									// set the starting X position of the current cell
-									$this->x = $rsendx + $cellspacingx;
-									// increment column indicator
-									$colid += $trwsp['colspan'];
-									if (($trwsp['rowspan'] == 1)
-										AND (isset($dom[$trid]['endy']))
-										AND (isset($dom[$trid]['endpage']))
-										AND (isset($dom[$trid]['endcolumn']))
-										AND ($trwsp['endpage'] == $dom[$trid]['endpage'])
-										AND ($trwsp['endcolumn'] == $dom[$trid]['endcolumn'])) {
-										// set ending Y position for row
-										$dom[$table_el]['rowspans'][$rsk]['endy'] = max($dom[$trid]['endy'], $trwsp['endy']);
-										$dom[$trid]['endy'] = $dom[$table_el]['rowspans'][$rsk]['endy'];
-									}
-									$rsk = 0;
-								} else {
-									++$rsk;
-								}
-							}
-						}
-						if (isset($dom[$parentid]['width'])) {
-							// user specified width
-							$cellw = $this->getHTMLUnitToUnits($dom[$parentid]['width'], $table_columns_width, 'px');
-							$tmpcw = ($cellw / $colspan);
-							for ($i = 0; $i < $colspan; ++$i) {
-								$table_colwidths[($colid + $i)] = $tmpcw;
-							}
-						} else {
-							// inherit column width
-							$cellw = 0;
-							for ($i = 0; $i < $colspan; ++$i) {
-								$cellw += $table_colwidths[($colid + $i)];
-							}
-						}
-						$cellw += (($colspan - 1) * $cellspacing);
-						// increment column indicator
-						$colid += $colspan;
-						// add rowspan information to table element
-						if ($rowspan > 1) {
-							$trsid = array_push($dom[$table_el]['rowspans'], array('trid' => $trid, 'rowspan' => $rowspan, 'mrowspan' => $rowspan, 'colspan' => $colspan, 'startpage' => $this->page, 'startcolumn' => $this->current_column, 'startx' => $this->x, 'starty' => $this->y));
-						}
-						$cellid = array_push($dom[$trid]['cellpos'], array('startx' => $this->x));
-						if ($rowspan > 1) {
-							$dom[$trid]['cellpos'][($cellid - 1)]['rowspanid'] = ($trsid - 1);
-						}
-						// push background colors
-						if (isset($dom[$parentid]['bgcolor']) AND ($dom[$parentid]['bgcolor'] !== false)) {
-							$dom[$trid]['cellpos'][($cellid - 1)]['bgcolor'] = $dom[$parentid]['bgcolor'];
-						}
-						// store border info
-						if (isset($tdborder) AND !empty($tdborder)) {
-							$dom[$trid]['cellpos'][($cellid - 1)]['border'] = $tdborder;
-						}
-						$prevLastH = $this->lasth;
-						// store some info for multicolumn mode
-						if ($this->rtl) {
-							$this->colxshift['x'] = $this->w - $this->x - $this->rMargin;
-						} else {
-							$this->colxshift['x'] = $this->x - $this->lMargin;
-						}
-						$this->colxshift['s'] = $cellspacing;
-						$this->colxshift['p'] = $current_cell_padding;
-						// ****** write the cell content ******
-						$this->MultiCell($cellw, $cellh, $cell_content, false, $lalign, false, 2, '', '', true, 0, true);
-						// restore some values
-						$this->colxshift = array('x' => 0, 's' => 0, 'p' => 0);
-						$this->lasth = $prevLastH;
-						$this->cell_padding = $old_cell_padding;
-						$dom[$trid]['cellpos'][($cellid - 1)]['endx'] = $this->x;
-						// update the end of row position
-						if ($rowspan <= 1) {
-							if (isset($dom[$trid]['endy'])) {
-								if (($this->page == $dom[$trid]['endpage']) AND ($this->current_column == $dom[$trid]['endcolumn'])) {
-									$dom[$trid]['endy'] = max($this->y, $dom[$trid]['endy']);
-								} elseif (($this->page > $dom[$trid]['endpage']) OR ($this->current_column > $dom[$trid]['endcolumn'])) {
-									$dom[$trid]['endy'] = $this->y;
-								}
-							} else {
-								$dom[$trid]['endy'] = $this->y;
-							}
-							if (isset($dom[$trid]['endpage'])) {
-								$dom[$trid]['endpage'] = max($this->page, $dom[$trid]['endpage']);
-							} else {
-								$dom[$trid]['endpage'] = $this->page;
-							}
-							if (isset($dom[$trid]['endcolumn'])) {
-								$dom[$trid]['endcolumn'] = max($this->current_column, $dom[$trid]['endcolumn']);
-							} else {
-								$dom[$trid]['endcolumn'] = $this->current_column;
-							}
-						} else {
-							// account for row-spanned cells
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endx'] = $this->x;
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endy'] = $this->y;
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endpage'] = $this->page;
-							$dom[$table_el]['rowspans'][($trsid - 1)]['endcolumn'] = $this->current_column;
-						}
-						if (isset($dom[$table_el]['rowspans'])) {
-							// update endy and endpage on rowspanned cells
-							foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-								if ($trwsp['rowspan'] > 0) {
-									if (isset($dom[$trid]['endpage'])) {
-										if (($trwsp['endpage'] == $dom[$trid]['endpage']) AND ($trwsp['endcolumn'] == $dom[$trid]['endcolumn'])) {
-											$dom[$table_el]['rowspans'][$k]['endy'] = max($dom[$trid]['endy'], $trwsp['endy']);
-										} elseif (($trwsp['endpage'] < $dom[$trid]['endpage']) OR ($trwsp['endcolumn'] < $dom[$trid]['endcolumn'])) {
-											$dom[$table_el]['rowspans'][$k]['endy'] = $dom[$trid]['endy'];
-											$dom[$table_el]['rowspans'][$k]['endpage'] = $dom[$trid]['endpage'];
-											$dom[$table_el]['rowspans'][$k]['endcolumn'] = $dom[$trid]['endcolumn'];
-										} else {
-											$dom[$trid]['endy'] = $this->pagedim[$dom[$trid]['endpage']]['hk'] - $this->pagedim[$dom[$trid]['endpage']]['bm'];
-										}
-									}
-								}
-							}
-						}
-						$this->x += ($cellspacingx / 2);
-					} else {
-						// opening tag (or self-closing tag)
-						if (!isset($opentagpos)) {
-							if ($this->inxobj) {
-								// we are inside an XObject template
-								$opentagpos = strlen($this->xobjects[$this->xobjid]['outdata']);
-							} elseif (!$this->InFooter) {
-								if (isset($this->footerlen[$this->page])) {
-									$this->footerpos[$this->page] = $this->pagelen[$this->page] - $this->footerlen[$this->page];
-								} else {
-									$this->footerpos[$this->page] = $this->pagelen[$this->page];
-								}
-								$opentagpos = $this->footerpos[$this->page];
-							}
-						}
-						$this->openHTMLTagHandler($dom, $key, $cell);
-					}
-				} else { // closing tag
-					$prev_numpages = $this->numpages;
-					$old_bordermrk = $this->bordermrk[$this->page];
-					$this->closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney);
-					if ($this->bordermrk[$this->page] > $old_bordermrk) {
-						$startlinepos += ($this->bordermrk[$this->page] - $old_bordermrk);
-					}
-					if ($prev_numpages > $this->numpages) {
-						$startlinepage = $this->page;
-					}
-				}
-			} elseif (strlen($dom[$key]['value']) > 0) {
-				// print list-item
-				if (!$this->empty_string($this->lispacer) AND ($this->lispacer != '^')) {
-					$this->SetFont($pfontname, $pfontstyle, $pfontsize);
-					$this->resetLastH();
-					$minstartliney = $this->y;
-					$maxbottomliney = ($startliney + ($this->FontSize * $this->cell_height_ratio));
-					$this->putHtmlListBullet($this->listnum, $this->lispacer, $pfontsize);
-					$this->SetFont($curfontname, $curfontstyle, $curfontsize);
-					$this->resetLastH();
-					if (is_numeric($pfontsize) AND ($pfontsize > 0) AND is_numeric($curfontsize) AND ($curfontsize > 0) AND ($pfontsize != $curfontsize)) {
-						$pfontascent = $this->getFontAscent($pfontname, $pfontstyle, $pfontsize);
-						$pfontdescent = $this->getFontDescent($pfontname, $pfontstyle, $pfontsize);
-						$this->y += ((($pfontsize - $curfontsize) * $this->cell_height_ratio / $this->k) + $pfontascent - $curfontascent - $pfontdescent + $curfontdescent) / 2;
-						$minstartliney = min($this->y, $minstartliney);
-						$maxbottomliney = max(($this->y + (($pfontsize * $this->cell_height_ratio) / $this->k)), $maxbottomliney);
-					}
-				}
-				// text
-				$this->htmlvspace = 0;
-				if ((!$this->premode) AND $this->isRTLTextDir()) {
-					// reverse spaces order
-					$lsp = ''; // left spaces
-					$rsp = ''; // right spaces
-					if (preg_match('/^('.$this->re_space['p'].'+)/'.$this->re_space['m'], $dom[$key]['value'], $matches)) {
-						$lsp = $matches[1];
-					}
-					if (preg_match('/('.$this->re_space['p'].'+)$/'.$this->re_space['m'], $dom[$key]['value'], $matches)) {
-						$rsp = $matches[1];
-					}
-					$dom[$key]['value'] = $rsp.$this->stringTrim($dom[$key]['value']).$lsp;
-				}
-				if ($newline) {
-					if (!$this->premode) {
-						$prelen = strlen($dom[$key]['value']);
-						if ($this->isRTLTextDir()) {
-							// right trim except non-breaking space
-							$dom[$key]['value'] = $this->stringRightTrim($dom[$key]['value']);
-						} else {
-							// left trim except non-breaking space
-							$dom[$key]['value'] = $this->stringLeftTrim($dom[$key]['value']);
-						}
-						$postlen = strlen($dom[$key]['value']);
-						if (($postlen == 0) AND ($prelen > 0)) {
-							$dom[$key]['trimmed_space'] = true;
-						}
-					}
-					$newline = false;
-					$firstblock = true;
-				} else {
-					$firstblock = false;
-					// replace empty multiple spaces string with a single space
-					$dom[$key]['value'] = preg_replace('/^'.$this->re_space['p'].'+$/'.$this->re_space['m'], chr(32), $dom[$key]['value']);
-				}
-				$strrest = '';
-				if ($this->rtl) {
-					$this->x -= $this->textindent;
-				} else {
-					$this->x += $this->textindent;
-				}
-				if (!isset($dom[$key]['trimmed_space']) OR !$dom[$key]['trimmed_space']) {
-					if (!empty($this->HREF) AND (isset($this->HREF['url']))) {
-						// HTML <a> Link
-						$hrefcolor = '';
-						if (isset($dom[($dom[$key]['parent'])]['fgcolor']) AND ($dom[($dom[$key]['parent'])]['fgcolor'] !== false)) {
-							$hrefcolor = $dom[($dom[$key]['parent'])]['fgcolor'];
-						}
-						$hrefstyle = -1;
-						if (isset($dom[($dom[$key]['parent'])]['fontstyle']) AND ($dom[($dom[$key]['parent'])]['fontstyle'] !== false)) {
-							$hrefstyle = $dom[($dom[$key]['parent'])]['fontstyle'];
-						}
-						$strrest = $this->addHtmlLink($this->HREF['url'], $dom[$key]['value'], $wfill, true, $hrefcolor, $hrefstyle, true);
-					} else {
-						$wadj = 0; // space to leave for block continuity
-						$adjblks = 0; // number of blocks
-						// check the next text blocks for continuity
-						$nkey = ($key + 1);
-						$write_block = true;
-						$tmp_fontname = $this->FontFamily;
-						$tmp_fontstyle = $this->FontStyle;
-						$tmp_fontsize = $this->FontSizePt;
-						while ($write_block AND isset($dom[$nkey])) {
-							if ($dom[$nkey]['tag']) {
-								if ($dom[$nkey]['block']) {
-									// end of block
-									$write_block = false;
-								}
-								$tmp_fontname = isset($dom[$nkey]['fontname']) ? $dom[$nkey]['fontname'] : $this->FontFamily;
-								$tmp_fontstyle = isset($dom[$nkey]['fontstyle']) ? $dom[$nkey]['fontstyle'] : $this->FontStyle;
-								$tmp_fontsize = isset($dom[$nkey]['fontsize']) ? $dom[$nkey]['fontsize'] : $this->FontSizePt;
-							} else {
-								$nextstr = preg_split('/'.$this->re_space['p'].'+/'.$this->re_space['m'], $dom[$nkey]['value']);
-								if (isset($nextstr[0])) {
-									$wadj += $this->GetStringWidth($nextstr[0], $tmp_fontname, $tmp_fontstyle, $tmp_fontsize);
-									++$adjblks;
-								}
-								if (isset($nextstr[1])) {
-									$write_block = false;
-								}
-							}
-							++$nkey;
-						}
-						// check for reversed text direction
-						if (($wadj > 0) AND (($this->rtl AND ($this->tmprtl == 'L')) OR (!$this->rtl AND ($this->tmprtl == 'R')))) {
-							// LTR text on RTL direction or RTL text on LTR direction
-							$reverse_dir = true;
-							$this->rtl = !$this->rtl;
-							$revshift = ($this->GetStringWidth($dom[$key]['value']) + $wadj) + 0.000001; // add little quantity for rounding problems
-							if ($this->rtl) {
-								$this->x += $revshift;
-							} else {
-								$this->x -= $revshift;
-							}
-							$xws = $this->x;
-						}
-						// ****** write only until the end of the line and get the rest ******
-						$strrest = $this->Write($this->lasth, $dom[$key]['value'], '', $wfill, '', false, 0, true, $firstblock, 0, $wadj);
-						// restore default direction
-						if ($reverse_dir AND ($wadj == 0)) {
-							$this->x = $xws;
-							$this->rtl = !$this->rtl;
-							$reverse_dir = false;
-						}
-					}
-				}
-				$this->textindent = 0;
-				if (strlen($strrest) > 0) {
-					// store the remaining string on the previous $key position
-					$this->newline = true;
-					if ($strrest == $dom[$key]['value']) {
-						// used to avoid infinite loop
-						++$loop;
-					} else {
-						$loop = 0;
-					}
-					$dom[$key]['value'] = $strrest;
-					if ($cell) {
-						if ($this->rtl) {
-							$this->x -= $this->cell_padding['R'];
-						} else {
-							$this->x += $this->cell_padding['L'];
-						}
-					}
-					if ($loop < 3) {
-						--$key;
-					}
-				} else {
-					$loop = 0;
-				}
-			}
-			++$key;
-			if (isset($dom[$key]['tag']) AND $dom[$key]['tag'] AND (!isset($dom[$key]['opening']) OR !$dom[$key]['opening']) AND isset($dom[($dom[$key]['parent'])]['attribute']['nobr']) AND ($dom[($dom[$key]['parent'])]['attribute']['nobr'] == 'true')) {
-				// check if we are on a new page or on a new column
-				if ((!$undo) AND ($this->y < $this->start_transaction_y)) {
-					// we are on a new page or on a new column and the total object height is less than the available vertical space.
-					// restore previous object
-					$this->rollbackTransaction(true);
-					// restore previous values
-					foreach ($this_method_vars as $vkey => $vval) {
-						$$vkey = $vval;
-					}
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$pre_y = $this->y;
-					if ((!$this->checkPageBreak($this->PageBreakTrigger + 1)) AND ($this->y < $pre_y)) {
-						$startliney = $this->y;
-					}
-					$undo = true; // avoid infinite loop
-				} else {
-					$undo = false;
-				}
-			}
-		} // end for each $key
-		// align the last line
-		if (isset($startlinex)) {
-			$yshift = $minstartliney - $startliney;
-			if (($yshift > 0) OR ($this->page > $startlinepage)) {
-				$yshift = 0;
-			}
-			$t_x = 0;
-			// the last line must be shifted to be aligned as requested
-			$linew = abs($this->endlinex - $startlinex);
-			if ($this->inxobj) {
-				// we are inside an XObject template
-				$pstart = substr($this->xobjects[$this->xobjid]['outdata'], 0, $startlinepos);
-				if (isset($opentagpos)) {
-					$midpos = $opentagpos;
-				} else {
-					$midpos = 0;
-				}
-				if ($midpos > 0) {
-					$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos, ($midpos - $startlinepos));
-					$pend = substr($this->xobjects[$this->xobjid]['outdata'], $midpos);
-				} else {
-					$pmid = substr($this->xobjects[$this->xobjid]['outdata'], $startlinepos);
-					$pend = '';
-				}
-			} else {
-				$pstart = substr($this->getPageBuffer($startlinepage), 0, $startlinepos);
-				if (isset($opentagpos) AND isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-					$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-					$midpos = min($opentagpos, $this->footerpos[$startlinepage]);
-				} elseif (isset($opentagpos)) {
-					$midpos = $opentagpos;
-				} elseif (isset($this->footerlen[$startlinepage]) AND (!$this->InFooter)) {
-					$this->footerpos[$startlinepage] = $this->pagelen[$startlinepage] - $this->footerlen[$startlinepage];
-					$midpos = $this->footerpos[$startlinepage];
-				} else {
-					$midpos = 0;
-				}
-				if ($midpos > 0) {
-					$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos, ($midpos - $startlinepos));
-					$pend = substr($this->getPageBuffer($startlinepage), $midpos);
-				} else {
-					$pmid = substr($this->getPageBuffer($startlinepage), $startlinepos);
-					$pend = '';
-				}
-			}
-			if ((isset($plalign) AND ((($plalign == 'C') OR (($plalign == 'R') AND (!$this->rtl)) OR (($plalign == 'L') AND ($this->rtl)))))) {
-				// calculate shifting amount
-				$tw = $w;
-				if ($this->lMargin != $prevlMargin) {
-					$tw += ($prevlMargin - $this->lMargin);
-				}
-				if ($this->rMargin != $prevrMargin) {
-					$tw += ($prevrMargin - $this->rMargin);
-				}
-				$one_space_width = $this->GetStringWidth(chr(32));
-				$no = 0; // number of spaces on a line contained on a single block
-				if ($this->isRTLTextDir()) { // RTL
-					// remove left space if exist
-					$pos1 = $this->revstrpos($pmid, '[(');
-					if ($pos1 > 0) {
-						$pos1 = intval($pos1);
-						if ($this->isUnicodeFont()) {
-							$pos2 = intval($this->revstrpos($pmid, '[('.chr(0).chr(32)));
-							$spacelen = 2;
-						} else {
-							$pos2 = intval($this->revstrpos($pmid, '[('.chr(32)));
-							$spacelen = 1;
-						}
-						if ($pos1 == $pos2) {
-							$pmid = substr($pmid, 0, ($pos1 + 2)).substr($pmid, ($pos1 + 2 + $spacelen));
-							if (substr($pmid, $pos1, 4) == '[()]') {
-								$linew -= $one_space_width;
-							} elseif ($pos1 == strpos($pmid, '[(')) {
-								$no = 1;
-							}
-						}
-					}
-				} else { // LTR
-					// remove right space if exist
-					$pos1 = $this->revstrpos($pmid, ')]');
-					if ($pos1 > 0) {
-						$pos1 = intval($pos1);
-						if ($this->isUnicodeFont()) {
-							$pos2 = intval($this->revstrpos($pmid, chr(0).chr(32).')]')) + 2;
-							$spacelen = 2;
-						} else {
-							$pos2 = intval($this->revstrpos($pmid, chr(32).')]')) + 1;
-							$spacelen = 1;
-						}
-						if ($pos1 == $pos2) {
-							$pmid = substr($pmid, 0, ($pos1 - $spacelen)).substr($pmid, $pos1);
-							$linew -= $one_space_width;
-						}
-					}
-				}
-				$mdiff = ($tw - $linew);
-				if ($plalign == 'C') {
-					if ($this->rtl) {
-						$t_x = -($mdiff / 2);
-					} else {
-						$t_x = ($mdiff / 2);
-					}
-				} elseif ($plalign == 'R') {
-					// right alignment on LTR document
-					$t_x = $mdiff;
-				} elseif ($plalign == 'L') {
-					// left alignment on RTL document
-					$t_x = -$mdiff;
-				}
-			} // end if startlinex
-			if (($t_x != 0) OR ($yshift < 0)) {
-				// shift the line
-				$trx = sprintf('1 0 0 1 %.3F %.3F cm', ($t_x * $this->k), ($yshift * $this->k));
-				$pstart .= "\nq\n".$trx."\n".$pmid."\nQ\n";
-				$endlinepos = strlen($pstart);
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					$this->xobjects[$this->xobjid]['outdata'] = $pstart.$pend;
-					foreach ($this->xobjects[$this->xobjid]['annotations'] as $pak => $pac) {
-						if ($pak >= $pask) {
-							$this->xobjects[$this->xobjid]['annotations'][$pak]['x'] += $t_x;
-							$this->xobjects[$this->xobjid]['annotations'][$pak]['y'] -= $yshift;
-						}
-					}
-				} else {
-					$this->setPageBuffer($startlinepage, $pstart.$pend);
-					// shift the annotations and links
-					if (isset($this->PageAnnots[$this->page])) {
-						foreach ($this->PageAnnots[$this->page] as $pak => $pac) {
-							if ($pak >= $pask) {
-								$this->PageAnnots[$this->page][$pak]['x'] += $t_x;
-								$this->PageAnnots[$this->page][$pak]['y'] -= $yshift;
-							}
-						}
-					}
-				}
-				$this->y -= $yshift;
-			}
-		}
-		// restore previous values
-		$this->setGraphicVars($gvars);
-		if ($this->num_columns > 1) {
-			$this->selectColumn();
-		} elseif ($this->page > $prevPage) {
-			$this->lMargin = $this->pagedim[$this->page]['olm'];
-			$this->rMargin = $this->pagedim[$this->page]['orm'];
-		}
-		// restore previous list state
-		$this->cell_height_ratio = $prev_cell_height_ratio;
-		$this->listnum = $prev_listnum;
-		$this->listordered = $prev_listordered;
-		$this->listcount = $prev_listcount;
-		$this->lispacer = $prev_lispacer;
-		if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
-			$this->Ln($this->lasth);
-			if ($this->y < $maxbottomliney) {
-				$this->y = $maxbottomliney;
-			}
-		}
-		unset($dom);
-	}
-
-	/**
-	 * Process opening tags.
-	 * @param array $dom html dom array
-	 * @param int $key current element id
-	 * @param boolean $cell if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @access protected
-	 */
-	protected function openHTMLTagHandler(&$dom, $key, $cell) {
-		$tag = $dom[$key];
-		$parent = $dom[($dom[$key]['parent'])];
-		$firsttag = ($key == 1);
-		// check for text direction attribute
-		if (isset($tag['dir'])) {
-			$this->setTempRTL($tag['dir']);
-		} else {
-			$this->tmprtl = false;
-		}
-		if ($tag['block']) {
-			$hbz = 0; // distance from y to line bottom
-			$hb = 0; // vertical space between block tags
-			// calculate vertical space for block tags
-			if (isset($this->tagvspaces[$tag['value']][0]['h']) AND ($this->tagvspaces[$tag['value']][0]['h'] >= 0)) {
-				$cur_h = $this->tagvspaces[$tag['value']][0]['h'];
-			} elseif (isset($tag['fontsize'])) {
-				$cur_h = ($tag['fontsize'] / $this->k) * $this->cell_height_ratio;
-			} else {
-				$cur_h = $this->FontSize * $this->cell_height_ratio;
-			}
-			if (isset($this->tagvspaces[$tag['value']][0]['n'])) {
-				$n = $this->tagvspaces[$tag['value']][0]['n'];
-			} elseif (preg_match('/[h][0-9]/', $tag['value']) > 0) {
-				$n = 0.6;
-			} else {
-				$n = 1;
-			}
-			$hb = ($n * $cur_h);
-			if (($this->htmlvspace <= 0) AND ($n > 0)) {
-				if (isset($parent['fontsize'])) {
-					$hbz = (($parent['fontsize'] / $this->k) * $this->cell_height_ratio);
-				} else {
-					$hbz = $this->FontSize * $this->cell_height_ratio;
-				}
-			}
-		}
-		// Opening tag
-		switch($tag['value']) {
-			case 'table': {
-				$cp = 0;
-				$cs = 0;
-				$dom[$key]['rowspans'] = array();
-				if (!isset($dom[$key]['attribute']['nested']) OR ($dom[$key]['attribute']['nested'] != 'true')) {
-					// set table header
-					if (!$this->empty_string($dom[$key]['thead'])) {
-						// set table header
-						$this->thead = $dom[$key]['thead'];
-						if (!isset($this->theadMargins) OR (empty($this->theadMargins))) {
-							$this->theadMargins = array();
-							$this->theadMargins['cell_padding'] = $this->cell_padding;
-							$this->theadMargins['lmargin'] = $this->lMargin;
-							$this->theadMargins['rmargin'] = $this->rMargin;
-							$this->theadMargins['page'] = $this->page;
-						}
-					}
-				}
-				// store current margins and page
-				$dom[$key]['old_cell_padding'] = $this->cell_padding;
-				if (isset($tag['attribute']['cellpadding'])) {
-					$pad = $this->getHTMLUnitToUnits($tag['attribute']['cellpadding'], 1, 'px');
-					$this->SetCellPadding($pad);
-				}
-				if (isset($tag['attribute']['cellspacing'])) {
-					$cs = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px');
-				}
-				$prev_y = $this->y;
-				if ($this->checkPageBreak(((2 * $cp) + (2 * $cs) + $this->lasth), '', false) OR ($this->y < $prev_y)) {
-					$this->inthead = true;
-					// add a page (or trig AcceptPageBreak() for multicolumn mode)
-					$this->checkPageBreak($this->PageBreakTrigger + 1);
-				}
-				break;
-			}
-			case 'tr': {
-				// array of columns positions
-				$dom[$key]['cellpos'] = array();
-				break;
-			}
-			case 'hr': {
-				if ((isset($tag['height'])) AND ($tag['height'] != '')) {
-					$hrHeight = $this->getHTMLUnitToUnits($tag['height'], 1, 'px');
-				} else {
-					$hrHeight = $this->GetLineWidth();
-				}
-				$this->addHTMLVertSpace($hbz, ($hrHeight / 2), $cell, $firsttag);
-				$x = $this->GetX();
-				$y = $this->GetY();
-				$wtmp = $this->w - $this->lMargin - $this->rMargin;
-				if ($cell) {
-					$wtmp -= ($this->cell_padding['L'] + $this->cell_padding['R']);
-				}
-				if ((isset($tag['width'])) AND ($tag['width'] != '')) {
-					$hrWidth = $this->getHTMLUnitToUnits($tag['width'], $wtmp, 'px');
-				} else {
-					$hrWidth = $wtmp;
-				}
-				$prevlinewidth = $this->GetLineWidth();
-				$this->SetLineWidth($hrHeight);
-				$this->Line($x, $y, $x + $hrWidth, $y);
-				$this->SetLineWidth($prevlinewidth);
-				$this->addHTMLVertSpace(($hrHeight / 2), 0, $cell, !isset($dom[($key + 1)]));
-				break;
-			}
-			case 'a': {
-				if (array_key_exists('href', $tag['attribute'])) {
-					$this->HREF['url'] = $tag['attribute']['href'];
-				}
-				break;
-			}
-			case 'img': {
-				if (isset($tag['attribute']['src'])) {
-					// replace relative path with real server path
-					if (($tag['attribute']['src'][0] == '/') AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-						$findroot = strpos($tag['attribute']['src'], $_SERVER['DOCUMENT_ROOT']);
-						if (($findroot === false) OR ($findroot > 1)) {
-							$tag['attribute']['src'] = $_SERVER['DOCUMENT_ROOT'].$tag['attribute']['src'];
-						}
-					}
-					$tag['attribute']['src'] = urldecode($tag['attribute']['src']);
-					$type = $this->getImageFileType($tag['attribute']['src']);
-					$testscrtype = @parse_url($tag['attribute']['src']);
-					if (!isset($testscrtype['query']) OR empty($testscrtype['query'])) {
-						// convert URL to server path
-						$tag['attribute']['src'] = str_replace(K_PATH_URL, K_PATH_MAIN, $tag['attribute']['src']);
-					}
-					if (!isset($tag['width'])) {
-						$tag['width'] = 0;
-					}
-					if (!isset($tag['height'])) {
-						$tag['height'] = 0;
-					}
-					//if (!isset($tag['attribute']['align'])) {
-						// the only alignment supported is "bottom"
-						// further development is required for other modes.
-						$tag['attribute']['align'] = 'bottom';
-					//}
-					switch($tag['attribute']['align']) {
-						case 'top': {
-							$align = 'T';
-							break;
-						}
-						case 'middle': {
-							$align = 'M';
-							break;
-						}
-						case 'bottom': {
-							$align = 'B';
-							break;
-						}
-						default: {
-							$align = 'B';
-							break;
-						}
-					}
-					$prevy = $this->y;
-					$xpos = $this->x;
-					// eliminate marker spaces
-					if (isset($dom[($key - 1)])) {
-						if (($dom[($key - 1)]['value'] == ' ') OR (isset($dom[($key - 1)]['trimmed_space']))) {
-							$xpos -= $this->GetStringWidth(chr(32));
-						} elseif ($this->rtl AND $dom[($key - 1)]['value'] == '  ') {
-							$xpos += (2 * $this->GetStringWidth(chr(32)));
-						}
-					}
-					$imglink = '';
-					if (isset($this->HREF['url']) AND !$this->empty_string($this->HREF['url'])) {
-						$imglink = $this->HREF['url'];
-						if ($imglink{0} == '#') {
-							// convert url to internal link
-							$lnkdata = explode(',', $imglink);
-							if (isset($lnkdata[0])) {
-								$page = intval(substr($lnkdata[0], 1));
-								if (empty($page) OR ($page <= 0)) {
-									$page = $this->page;
-								}
-								if (isset($lnkdata[1]) AND (strlen($lnkdata[1]) > 0)) {
-									$lnky = floatval($lnkdata[1]);
-								} else {
-									$lnky = 0;
-								}
-								$imglink = $this->AddLink();
-								$this->SetLink($imglink, $lnky, $page);
-							}
-						}
-					}
-					$border = 0;
-					if (isset($tag['border']) AND !empty($tag['border'])) {
-						// currently only support 1 (frame) or a combination of 'LTRB'
-						$border = $tag['border'];
-					}
-					$iw = '';
-					if (isset($tag['width'])) {
-						$iw = $this->getHTMLUnitToUnits($tag['width'], 1, 'px', false);
-					}
-					$ih = '';
-					if (isset($tag['height'])) {
-						$ih = $this->getHTMLUnitToUnits($tag['height'], 1, 'px', false);
-					}
-					if (($type == 'eps') OR ($type == 'ai')) {
-						$this->ImageEps($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
-					} elseif ($type == 'svg') {
-						$this->ImageSVG($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
-					} else {
-						$this->Image($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
-					}
-					switch($align) {
-						case 'T': {
-							$this->y = $prevy;
-							break;
-						}
-						case 'M': {
-							$this->y = (($this->img_rb_y + $prevy - ($tag['fontsize'] / $this->k)) / 2) ;
-							break;
-						}
-						case 'B': {
-							$this->y = $this->img_rb_y - ($tag['fontsize'] / $this->k);
-							break;
-						}
-					}
-				}
-				break;
-			}
-			case 'dl': {
-				++$this->listnum;
-				if ($this->listnum == 1) {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, $firsttag);
-				}
-				break;
-			}
-			case 'dt': {
-				$this->addHTMLVertSpace($hbz, 0, $cell, $firsttag);
-				break;
-			}
-			case 'dd': {
-				if ($this->rtl) {
-					$this->rMargin += $this->listindent;
-				} else {
-					$this->lMargin += $this->listindent;
-				}
-				++$this->listindentlevel;
-				$this->addHTMLVertSpace($hbz, 0, $cell, $firsttag);
-				break;
-			}
-			case 'ul':
-			case 'ol': {
-				++$this->listnum;
-				if ($tag['value'] == 'ol') {
-					$this->listordered[$this->listnum] = true;
-				} else {
-					$this->listordered[$this->listnum] = false;
-				}
-				if (isset($tag['attribute']['start'])) {
-					$this->listcount[$this->listnum] = intval($tag['attribute']['start']) - 1;
-				} else {
-					$this->listcount[$this->listnum] = 0;
-				}
-				if ($this->rtl) {
-					$this->rMargin += $this->listindent;
-					$this->x -= $this->listindent;
-				} else {
-					$this->lMargin += $this->listindent;
-					$this->x += $this->listindent;
-				}
-				++$this->listindentlevel;
-				if ($this->listnum == 1) {
-					$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, $firsttag);
-				}
-				break;
-			}
-			case 'li': {
-				$this->addHTMLVertSpace($hbz, 0, $cell, $firsttag);
-				if ($this->listordered[$this->listnum]) {
-					// ordered item
-					if (isset($parent['attribute']['type']) AND !$this->empty_string($parent['attribute']['type'])) {
-						$this->lispacer = $parent['attribute']['type'];
-					} elseif (isset($parent['listtype']) AND !$this->empty_string($parent['listtype'])) {
-						$this->lispacer = $parent['listtype'];
-					} elseif (isset($this->lisymbol) AND !$this->empty_string($this->lisymbol)) {
-						$this->lispacer = $this->lisymbol;
-					} else {
-						$this->lispacer = '#';
-					}
-					++$this->listcount[$this->listnum];
-					if (isset($tag['attribute']['value'])) {
-						$this->listcount[$this->listnum] = intval($tag['attribute']['value']);
-					}
-				} else {
-					// unordered item
-					if (isset($parent['attribute']['type']) AND !$this->empty_string($parent['attribute']['type'])) {
-						$this->lispacer = $parent['attribute']['type'];
-					} elseif (isset($parent['listtype']) AND !$this->empty_string($parent['listtype'])) {
-						$this->lispacer = $parent['listtype'];
-					} elseif (isset($this->lisymbol) AND !$this->empty_string($this->lisymbol)) {
-						$this->lispacer = $this->lisymbol;
-					} else {
-						$this->lispacer = '!';
-					}
-				}
-				break;
-			}
-			case 'blockquote': {
-				if ($this->rtl) {
-					$this->rMargin += $this->listindent;
-				} else {
-					$this->lMargin += $this->listindent;
-				}
-				++$this->listindentlevel;
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'br': {
-				$this->addHTMLVertSpace($hbz, 0, $cell, $firsttag);
-				break;
-			}
-			case 'div': {
-				$this->addHTMLVertSpace($hbz, 0, $cell, $firsttag);
-				break;
-			}
-			case 'p': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			case 'pre': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				$this->premode = true;
-				break;
-			}
-			case 'sup': {
-				$this->SetXY($this->GetX(), $this->GetY() - ((0.7 * $this->FontSizePt) / $this->k));
-				break;
-			}
-			case 'sub': {
-				$this->SetXY($this->GetX(), $this->GetY() + ((0.3 * $this->FontSizePt) / $this->k));
-				break;
-			}
-			case 'h1':
-			case 'h2':
-			case 'h3':
-			case 'h4':
-			case 'h5':
-			case 'h6': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, $firsttag);
-				break;
-			}
-			// Form fields (since 4.8.000 - 2009-09-07)
-			case 'form': {
-				if (isset($tag['attribute']['action'])) {
-					$this->form_action = $tag['attribute']['action'];
-				} else {
-					$this->form_action = K_PATH_URL.$_SERVER['SCRIPT_NAME'];
-				}
-				if (isset($tag['attribute']['enctype'])) {
-					$this->form_enctype = $tag['attribute']['enctype'];
-				} else {
-					$this->form_enctype = 'application/x-www-form-urlencoded';
-				}
-				if (isset($tag['attribute']['method'])) {
-					$this->form_mode = $tag['attribute']['method'];
-				} else {
-					$this->form_mode = 'post';
-				}
-				break;
-			}
-			case 'input': {
-				if (isset($tag['attribute']['name']) AND !$this->empty_string($tag['attribute']['name'])) {
-					$name = $tag['attribute']['name'];
-				} else {
-					break;
-				}
-				$prop = array();
-				$opt = array();
-				if (isset($tag['attribute']['readonly']) AND !$this->empty_string($tag['attribute']['readonly'])) {
-					$prop['readonly'] = true;
-				}
-				if (isset($tag['attribute']['value']) AND !$this->empty_string($tag['attribute']['value'])) {
-					$value = $tag['attribute']['value'];
-				}
-				if (isset($tag['attribute']['maxlength']) AND !$this->empty_string($tag['attribute']['maxlength'])) {
-					$opt['maxlen'] = intval($tag['attribute']['value']);
-				}
-				$h = $this->FontSize * $this->cell_height_ratio;
-				if (isset($tag['attribute']['size']) AND !$this->empty_string($tag['attribute']['size'])) {
-					$w = intval($tag['attribute']['size']) * $this->GetStringWidth(chr(32)) * 2;
-				} else {
-					$w = $h;
-				}
-				if (isset($tag['attribute']['checked']) AND (($tag['attribute']['checked'] == 'checked') OR ($tag['attribute']['checked'] == 'true'))) {
-					$checked = true;
-				} else {
-					$checked = false;
-				}
-				switch ($tag['attribute']['type']) {
-					case 'text': {
-						if (isset($value)) {
-							$opt['v'] = $value;
-						}
-						$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'password': {
-						if (isset($value)) {
-							$opt['v'] = $value;
-						}
-						$prop['password'] = 'true';
-						$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'checkbox': {
-						$this->CheckBox($name, $w, $checked, $prop, $opt, $value, '', '', false);
-						break;
-					}
-					case 'radio': {
-						$this->RadioButton($name, $w, $prop, $opt, $value, $checked, '', '', false);
-						break;
-					}
-					case 'submit': {
-						$w = $this->GetStringWidth($value) * 1.5;
-						$h *= 1.6;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						$action = array();
-						$action['S'] = 'SubmitForm';
-						$action['F'] = $this->form_action;
-						if ($this->form_enctype != 'FDF') {
-							$action['Flags'] = array('ExportFormat');
-						}
-						if ($this->form_mode == 'get') {
-							$action['Flags'] = array('GetMethod');
-						}
-						$this->Button($name, $w, $h, $value, $action, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'reset': {
-						$w = $this->GetStringWidth($value) * 1.5;
-						$h *= 1.6;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						$this->Button($name, $w, $h, $value, array('S'=>'ResetForm'), $prop, $opt, '', '', false);
-						break;
-					}
-					case 'file': {
-						$prop['fileSelect'] = 'true';
-						$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-						if (!isset($value)) {
-							$value = '*';
-						}
-						$w = $this->GetStringWidth($value) * 2;
-						$h *= 1.2;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						$jsaction = 'var f=this.getField(\''.$name.'\'); f.browseForFileToSubmit();';
-						$this->Button('FB_'.$name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'hidden': {
-						if (isset($value)) {
-							$opt['v'] = $value;
-						}
-						$opt['f'] = array('invisible', 'hidden');
-						$this->TextField($name, 0, 0, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'image': {
-						// THIS TYPE MUST BE FIXED
-						if (isset($tag['attribute']['src']) AND !$this->empty_string($tag['attribute']['src'])) {
-							$img = $tag['attribute']['src'];
-						} else {
-							break;
-						}
-						$value = 'img';
-						//$opt['mk'] = array('i'=>$img, 'tp'=>1, 'if'=>array('sw'=>'A', 's'=>'A', 'fb'=>false));
-						if (isset($tag['attribute']['onclick']) AND !empty($tag['attribute']['onclick'])) {
-							$jsaction = $tag['attribute']['onclick'];
-						} else {
-							$jsaction = '';
-						}
-						$this->Button($name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-						break;
-					}
-					case 'button': {
-						$w = $this->GetStringWidth($value) * 1.5;
-						$h *= 1.6;
-						$prop = array('lineWidth'=>1, 'borderStyle'=>'beveled', 'fillColor'=>array(196, 196, 196), 'strokeColor'=>array(255, 255, 255));
-						if (isset($tag['attribute']['onclick']) AND !empty($tag['attribute']['onclick'])) {
-							$jsaction = $tag['attribute']['onclick'];
-						} else {
-							$jsaction = '';
-						}
-						$this->Button($name, $w, $h, $value, $jsaction, $prop, $opt, '', '', false);
-						break;
-					}
-				}
-				break;
-			}
-			case 'textarea': {
-				$prop = array();
-				$opt = array();
-				if (isset($tag['attribute']['readonly']) AND !$this->empty_string($tag['attribute']['readonly'])) {
-					$prop['readonly'] = true;
-				}
-				if (isset($tag['attribute']['name']) AND !$this->empty_string($tag['attribute']['name'])) {
-					$name = $tag['attribute']['name'];
-				} else {
-					break;
-				}
-				if (isset($tag['attribute']['value']) AND !$this->empty_string($tag['attribute']['value'])) {
-					$opt['v'] = $tag['attribute']['value'];
-				}
-				if (isset($tag['attribute']['cols']) AND !$this->empty_string($tag['attribute']['cols'])) {
-					$w = intval($tag['attribute']['cols']) * $this->GetStringWidth(chr(32)) * 2;
-				} else {
-					$w = 40;
-				}
-				if (isset($tag['attribute']['rows']) AND !$this->empty_string($tag['attribute']['rows'])) {
-					$h = intval($tag['attribute']['rows']) * $this->FontSize * $this->cell_height_ratio;
-				} else {
-					$h = 10;
-				}
-				$prop['multiline'] = 'true';
-				$this->TextField($name, $w, $h, $prop, $opt, '', '', false);
-				break;
-			}
-			case 'select': {
-				$h = $this->FontSize * $this->cell_height_ratio;
-				if (isset($tag['attribute']['size']) AND !$this->empty_string($tag['attribute']['size'])) {
-					$h *= ($tag['attribute']['size'] + 1);
-				}
-				$prop = array();
-				$opt = array();
-				if (isset($tag['attribute']['name']) AND !$this->empty_string($tag['attribute']['name'])) {
-					$name = $tag['attribute']['name'];
-				} else {
-					break;
-				}
-				$w = 0;
-				if (isset($tag['attribute']['opt']) AND !$this->empty_string($tag['attribute']['opt'])) {
-					$options = explode('#!NwL!#', $tag['attribute']['opt']);
-					$values = array();
-					foreach ($options as $val) {
-						if (strpos($val, '#!TaB!#') !== false) {
-							$opts = explode('#!TaB!#', $val);
-							$values[] = $opts;
-							$w = max($w, $this->GetStringWidth($opts[1]));
-						} else {
-							$values[] = $val;
-							$w = max($w, $this->GetStringWidth($val));
-						}
-					}
-				} else {
-					break;
-				}
-				$w *= 2;
-				if (isset($tag['attribute']['multiple']) AND ($tag['attribute']['multiple']='multiple')) {
-					$prop['multipleSelection'] = 'true';
-					$this->ListBox($name, $w, $h, $values, $prop, $opt, '', '', false);
-				} else {
-					$this->ComboBox($name, $w, $h, $values, $prop, $opt, '', '', false);
-				}
-				break;
-			}
-			case 'tcpdf': {
-				if (defined('K_TCPDF_CALLS_IN_HTML') AND (K_TCPDF_CALLS_IN_HTML === true)) {
-					// Special tag used to call TCPDF methods
-					if (isset($tag['attribute']['method'])) {
-						$tcpdf_method = $tag['attribute']['method'];
-						if (method_exists($this, $tcpdf_method)) {
-							if (isset($tag['attribute']['params']) AND (!empty($tag['attribute']['params']))) {
-								$params = unserialize(urldecode($tag['attribute']['params']));
-								call_user_func_array(array($this, $tcpdf_method), $params);
-							} else {
-								$this->$tcpdf_method();
-							}
-							$this->newline = true;
-						}
-					}
-				}
-				break;
-			}
-			default: {
-				break;
-			}
-		}
-		// define tags that support borders and background colors
-		$bordertags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table');
-		if (in_array($tag['value'], $bordertags)) {
-			// set border
-			$dom[$key]['borderposition'] = $this->getBorderStartPosition();
-		}
-		if ($dom[$key]['self'] AND isset($dom[$key]['attribute']['pagebreakafter'])) {
-			$pba = $dom[$key]['attribute']['pagebreakafter'];
-			// check for pagebreak
-			if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-			if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-				OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-		}
-	}
-
-	/**
-	 * Process closing tags.
-	 * @param array $dom html dom array
-	 * @param int $key current element id
-	 * @param boolean $cell if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @param int $maxbottomliney maximum y value of current line
-	 * @access protected
-	 */
-	protected function closeHTMLTagHandler(&$dom, $key, $cell, $maxbottomliney=0) {
-		$tag = $dom[$key];
-		$parent = $dom[($dom[$key]['parent'])];
-		$lasttag = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker')));
-		$in_table_head = false;
-		// maximum x position (used to draw borders)
-		if ($this->rtl) {
-			$xmax = $this->w;
-		} else {
-			$xmax = 0;
-		}
-		if ($tag['block']) {
-			$hbz = 0; // distance from y to line bottom
-			$hb = 0; // vertical space between block tags
-			// calculate vertical space for block tags
-			if (isset($this->tagvspaces[$tag['value']][1]['h']) AND ($this->tagvspaces[$tag['value']][1]['h'] >= 0)) {
-				$pre_h = $this->tagvspaces[$tag['value']][1]['h'];
-			} elseif (isset($parent['fontsize'])) {
-				$pre_h = (($parent['fontsize'] / $this->k) * $this->cell_height_ratio);
-			} else {
-				$pre_h = $this->FontSize * $this->cell_height_ratio;
-			}
-			if (isset($this->tagvspaces[$tag['value']][1]['n'])) {
-				$n = $this->tagvspaces[$tag['value']][1]['n'];
-			} elseif (preg_match('/[h][0-9]/', $tag['value']) > 0) {
-				$n = 0.6;
-			} else {
-				$n = 1;
-			}
-			$hb = ($n * $pre_h);
-			if ($this->y < $maxbottomliney) {
-				$hbz = ($maxbottomliney - $this->y);
-			}
-		}
-		// Closing tag
-		switch($tag['value']) {
-			case 'tr': {
-				$table_el = $dom[($dom[$key]['parent'])]['parent'];
-				if (!isset($parent['endy'])) {
-					$dom[($dom[$key]['parent'])]['endy'] = $this->y;
-					$parent['endy'] = $this->y;
-				}
-				if (!isset($parent['endpage'])) {
-					$dom[($dom[$key]['parent'])]['endpage'] = $this->page;
-					$parent['endpage'] = $this->page;
-				}
-				if (!isset($parent['endcolumn'])) {
-					$dom[($dom[$key]['parent'])]['endcolumn'] = $this->current_column;
-					$parent['endcolumn'] = $this->current_column;
-				}
-				// update row-spanned cells
-				if (isset($dom[$table_el]['rowspans'])) {
-					foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-						$dom[$table_el]['rowspans'][$k]['rowspan'] -= 1;
-						if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-							if (($dom[$table_el]['rowspans'][$k]['endpage'] == $parent['endpage']) AND ($dom[$table_el]['rowspans'][$k]['endcolumn'] == $parent['endcolumn'])) {
-								$dom[($dom[$key]['parent'])]['endy'] = max($dom[$table_el]['rowspans'][$k]['endy'], $parent['endy']);
-							} elseif (($dom[$table_el]['rowspans'][$k]['endpage'] > $parent['endpage']) OR ($dom[$table_el]['rowspans'][$k]['endcolumn'] > $parent['endcolumn'])) {
-								$dom[($dom[$key]['parent'])]['endy'] = $dom[$table_el]['rowspans'][$k]['endy'];
-								$dom[($dom[$key]['parent'])]['endpage'] = $dom[$table_el]['rowspans'][$k]['endpage'];
-								$dom[($dom[$key]['parent'])]['endcolumn'] = $dom[$table_el]['rowspans'][$k]['endcolumn'];
-							}
-						}
-					}
-					// report new endy and endpage to the rowspanned cells
-					foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-						if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-							$dom[$table_el]['rowspans'][$k]['endpage'] = max($dom[$table_el]['rowspans'][$k]['endpage'], $dom[($dom[$key]['parent'])]['endpage']);
-							$dom[($dom[$key]['parent'])]['endpage'] = $dom[$table_el]['rowspans'][$k]['endpage'];
-							$dom[$table_el]['rowspans'][$k]['endcolumn'] = max($dom[$table_el]['rowspans'][$k]['endcolumn'], $dom[($dom[$key]['parent'])]['endcolumn']);
-							$dom[($dom[$key]['parent'])]['endcolumn'] = $dom[$table_el]['rowspans'][$k]['endcolumn'];
-							$dom[$table_el]['rowspans'][$k]['endy'] = max($dom[$table_el]['rowspans'][$k]['endy'], $dom[($dom[$key]['parent'])]['endy']);
-							$dom[($dom[$key]['parent'])]['endy'] = $dom[$table_el]['rowspans'][$k]['endy'];
-						}
-					}
-					// update remaining rowspanned cells
-					foreach ($dom[$table_el]['rowspans'] as $k => $trwsp) {
-						if ($dom[$table_el]['rowspans'][$k]['rowspan'] == 0) {
-							$dom[$table_el]['rowspans'][$k]['endpage'] = $dom[($dom[$key]['parent'])]['endpage'];
-							$dom[$table_el]['rowspans'][$k]['endcolumn'] = $dom[($dom[$key]['parent'])]['endcolumn'];
-							$dom[$table_el]['rowspans'][$k]['endy'] = $dom[($dom[$key]['parent'])]['endy'];
-						}
-					}
-				}
-				$this->setPage($dom[($dom[$key]['parent'])]['endpage']);
-				if ($this->num_columns > 1) {
-					$this->selectColumn($dom[($dom[$key]['parent'])]['endcolumn']);
-				}
-				$this->y = $dom[($dom[$key]['parent'])]['endy'];
-				if (isset($dom[$table_el]['attribute']['cellspacing'])) {
-					$cellspacing = $this->getHTMLUnitToUnits($dom[$table_el]['attribute']['cellspacing'], 1, 'px');
-					$this->y += $cellspacing;
-				}
-				$this->Ln(0, $cell);
-				if ($this->current_column == $parent['startcolumn']) {
-					$this->x = $parent['startx'];
-				}
-				// account for booklet mode
-				if ($this->page > $parent['startpage']) {
-					if (($this->rtl) AND ($this->pagedim[$this->page]['orm'] != $this->pagedim[$parent['startpage']]['orm'])) {
-						$this->x -= ($this->pagedim[$this->page]['orm'] - $this->pagedim[$parent['startpage']]['orm']);
-					} elseif ((!$this->rtl) AND ($this->pagedim[$this->page]['olm'] != $this->pagedim[$parent['startpage']]['olm'])) {
-						$this->x += ($this->pagedim[$this->page]['olm'] - $this->pagedim[$parent['startpage']]['olm']);
-					}
-				}
-				break;
-			}
-			case 'tablehead':
-				// closing tag used for the thead part
-				$in_table_head = true;
-				$this->inthead = false;
-			case 'table': {
-				$table_el = $parent;
-				// set default border
-				if (isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0)) {
-					// set default border
-					$border = array('LTRB' => array('width' => $this->getCSSBorderWidth($table_el['attribute']['border']), 'cap'=>'square', 'join'=>'miter', 'dash'=> 0, 'color'=>array(0,0,0)));
-				} else {
-					$border = 0;
-				}
-				$default_border = $border;
-				if (isset($table_el['attribute']['cellspacing'])) {
-					$cellspacing = $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
-				} else {
-					$cellspacing = 0;
-				}
-				// fix bottom line alignment of last line before page break
-				foreach ($dom[($dom[$key]['parent'])]['trids'] as $j => $trkey) {
-					// update row-spanned cells
-					if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
-						foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-							if ($trwsp['trid'] == $trkey) {
-								$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] -= 1;
-							}
-							if (isset($prevtrkey) AND ($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0)) {
-								$dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] = $trkey;
-							}
-						}
-					}
-					if (isset($prevtrkey) AND ($dom[$trkey]['startpage'] > $dom[$prevtrkey]['endpage'])) {
-						$pgendy = $this->pagedim[$dom[$prevtrkey]['endpage']]['hk'] - $this->pagedim[$dom[$prevtrkey]['endpage']]['bm'];
-						$dom[$prevtrkey]['endy'] = $pgendy;
-						// update row-spanned cells
-						if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
-							foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-								if (($trwsp['trid'] == $trkey) AND ($trwsp['mrowspan'] > 1) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
-								}
-							}
-						}
-					}
-					$prevtrkey = $trkey;
-					$table_el = $dom[($dom[$key]['parent'])];
-				}
-				// for each row
-				unset($xmax);
-				foreach ($table_el['trids'] as $j => $trkey) {
-					$parent = $dom[$trkey];
-					if (!isset($xmax)) {
-						$xmax = $parent['cellpos'][(count($parent['cellpos']) - 1)]['endx'];
-					}
-					// for each cell on the row
-					foreach ($parent['cellpos'] as $k => $cellpos) {
-						if (isset($cellpos['rowspanid']) AND ($cellpos['rowspanid'] >= 0)) {
-							$cellpos['startx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['startx'];
-							$cellpos['endx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['endx'];
-							$endy = $table_el['rowspans'][($cellpos['rowspanid'])]['endy'];
-							$startpage = $table_el['rowspans'][($cellpos['rowspanid'])]['startpage'];
-							$endpage = $table_el['rowspans'][($cellpos['rowspanid'])]['endpage'];
-							$startcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['startcolumn'];
-							$endcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['endcolumn'];
-						} else {
-							$endy = $parent['endy'];
-							$startpage = $parent['startpage'];
-							$endpage = $parent['endpage'];
-							$startcolumn = $parent['startcolumn'];
-							$endcolumn = $parent['endcolumn'];
-						}
-						if ($this->num_columns == 0) {
-							$this->num_columns = 1;
-						}
-						if (isset($cellpos['border'])) {
-							$border = $cellpos['border'];
-						}
-						if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
-							$this->SetFillColorArray($cellpos['bgcolor']);
-							$fill = true;
-						} else {
-							$fill = false;
-						}
-						$x = $cellpos['startx'];
-						$y = $parent['starty'];
-						$starty = $y;
-						$w = abs($cellpos['endx'] - $cellpos['startx']);
-						// get border modes
-						$border_start = $this->getBorderMode($border, $position='start');
-						$border_end = $this->getBorderMode($border, $position='end');
-						$border_middle = $this->getBorderMode($border, $position='middle');
-						// design borders around HTML cells.
-						for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
-							$ccode = '';
-							$this->setPage($page);
-							if ($this->num_columns < 2) {
-								// single-column mode
-								$this->x = $x;
-								$this->y = $this->tMargin;
-							}
-							// account for margin changes
-							if ($page > $startpage) {
-								if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-									$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-								} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-									$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-								}
-							}
-							if ($startpage == $endpage) { // single page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($startcolumn == $endcolumn) { // single column
-										$cborder = $border;
-										$h = $endy - $parent['starty'];
-										$this->y = $y;
-										$this->x = $x;
-									} elseif ($column == $startcolumn) { // first column
-										$cborder = $border_start;
-										$this->y = $starty;
-										$this->x = $x;
-										$h = $this->h - $this->y - $this->bMargin;
-										if ($this->rtl) {
-											$deltacol = $this->x + $this->rMargin - $this->w;
-										} else {
-											$deltacol = $this->x - $this->lMargin;
-										}
-									} elseif ($column == $endcolumn) { // end column
-										$cborder = $border_end;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $endy - $this->y;
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} elseif ($page == $startpage) { // first page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($column == $startcolumn) { // first column
-										$cborder = $border_start;
-										$this->y = $starty;
-										$this->x = $x;
-										$h = $this->h - $this->y - $this->bMargin;
-										if ($this->rtl) {
-											$deltacol = $this->x + $this->rMargin - $this->w;
-										} else {
-											$deltacol = $this->x - $this->lMargin;
-										}
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} elseif ($page == $endpage) { // last page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($column == $endcolumn) { // end column
-										$cborder = $border_end;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $endy - $this->y;
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} else { // middle page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
-									$this->selectColumn($column);
-									$cborder = $border_middle;
-									if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-										$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-									}
-									$this->x += $deltacol;
-									$h = $this->h - $this->y - $this->bMargin;
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							}
-							if ($cborder OR $fill) {
-								// draw border and fill
-								if ($this->inxobj) {
-									// we are inside an XObject template
-									if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-										$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
-										$pagemark = &$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
-									} else {
-										$pagemark = &$this->xobjects[$this->xobjid]['intmrk'];
-									}
-									$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
-									$pstart = substr($pagebuff, 0, $pagemark);
-									$pend = substr($pagebuff, $pagemark);
-									$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
-									$pagemark += strlen($ccode);
-								} else {
-									// draw border and fill
-									if (end($this->transfmrk[$this->page]) !== false) {
-										$pagemarkkey = key($this->transfmrk[$this->page]);
-										$pagemark = &$this->transfmrk[$this->page][$pagemarkkey];
-									} elseif ($this->InFooter) {
-										$pagemark = &$this->footerpos[$this->page];
-									} else {
-										$pagemark = &$this->intmrk[$this->page];
-									}
-									$pagebuff = $this->getPageBuffer($this->page);
-									$pstart = substr($pagebuff, 0, $pagemark);
-									$pend = substr($pagebuff, $pagemark);
-									$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
-									$pagemark += strlen($ccode);
-								}
-							}
-						} // end for each page
-						// restore default border
-						$border = $default_border;
-					} // end for each cell on the row
-					if (isset($table_el['attribute']['cellspacing'])) {
-						$cellspacing = $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
-						$this->y += $cellspacing;
-					}
-					$this->Ln(0, $cell);
-					$this->x = $parent['startx'];
-					if ($endpage > $startpage) {
-						if (($this->rtl) AND ($this->pagedim[$endpage]['orm'] != $this->pagedim[$startpage]['orm'])) {
-							$this->x += ($this->pagedim[$endpage]['orm'] - $this->pagedim[$startpage]['orm']);
-						} elseif ((!$this->rtl) AND ($this->pagedim[$endpage]['olm'] != $this->pagedim[$startpage]['olm'])) {
-							$this->x += ($this->pagedim[$endpage]['olm'] - $this->pagedim[$startpage]['olm']);
-						}
-					}
-				}
-				if (!$in_table_head) { // we are not inside a thead section
-					$this->cell_padding = $table_el['old_cell_padding'];
-					// reset row height
-					$this->resetLastH();
-					if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages]) AND ($this->emptypagemrk[$this->numpages] == $this->pagelen[$this->numpages])) {
-						// remove last blank page
-						$this->deletePage($this->numpages);
-					}
-					if (isset($this->theadMargins['top'])) {
-						// restore top margin
-						$this->tMargin = $this->theadMargins['top'];
-						$this->pagedim[$this->page]['tm'] = $this->tMargin;
-					}
-					if (!isset($table_el['attribute']['nested']) OR ($table_el['attribute']['nested'] != 'true')) {
-						// reset main table header
-						$this->thead = '';
-						$this->theadMargins = array();
-					}
-				}
-				$parent = $table_el;
-				break;
-			}
-			case 'a': {
-				$this->HREF = '';
-				break;
-			}
-			case 'sup': {
-				$this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
-				break;
-			}
-			case 'sub': {
-				$this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize'])/$this->k));
-				break;
-			}
-			case 'div': {
-				$this->addHTMLVertSpace($hbz, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'blockquote': {
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'p': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'pre': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				$this->premode = false;
-				break;
-			}
-			case 'dl': {
-				--$this->listnum;
-				if ($this->listnum <= 0) {
-					$this->listnum = 0;
-					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				}
-				$this->resetLastH();
-				break;
-			}
-			case 'dt': {
-				$this->lispacer = '';
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'dd': {
-				$this->lispacer = '';
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'ul':
-			case 'ol': {
-				--$this->listnum;
-				$this->lispacer = '';
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				if ($this->listnum <= 0) {
-					$this->listnum = 0;
-					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				}
-				$this->resetLastH();
-				break;
-			}
-			case 'li': {
-				$this->lispacer = '';
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'h1':
-			case 'h2':
-			case 'h3':
-			case 'h4':
-			case 'h5':
-			case 'h6': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			// Form fields (since 4.8.000 - 2009-09-07)
-			case 'form': {
-				$this->form_action = '';
-				$this->form_enctype = 'application/x-www-form-urlencoded';
-				break;
-			}
-			default : {
-				break;
-			}
-		}
-		// draw border and background (if any)
-		$this->drawHTMLTagBorder($parent, $xmax);
-		if (isset($dom[($dom[$key]['parent'])]['attribute']['pagebreakafter'])) {
-			$pba = $dom[($dom[$key]['parent'])]['attribute']['pagebreakafter'];
-			// check for pagebreak
-			if (($pba == 'true') OR ($pba == 'left') OR ($pba == 'right')) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-			if ((($pba == 'left') AND (((!$this->rtl) AND (($this->page % 2) == 0)) OR (($this->rtl) AND (($this->page % 2) != 0))))
-				OR (($pba == 'right') AND (((!$this->rtl) AND (($this->page % 2) != 0)) OR (($this->rtl) AND (($this->page % 2) == 0))))) {
-				// add a page (or trig AcceptPageBreak() for multicolumn mode)
-				$this->checkPageBreak($this->PageBreakTrigger + 1);
-			}
-		}
-		$this->tmprtl = false;
-	}
-
-	/**
-	 * Add vertical spaces if needed.
-	 * @param string $hbz Distance between current y and line bottom.
-	 * @param string $hb The height of the break.
-	 * @param boolean $cell if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @param boolean $firsttag set to true when the tag is the first.
-	 * @param boolean $lasttag set to true when the tag is the last.
-	 * @access protected
-	 */
-	protected function addHTMLVertSpace($hbz=0, $hb=0, $cell=false, $firsttag=false, $lasttag=false) {
-		if ($firsttag) {
-			$this->Ln(0, $cell);
-			$this->htmlvspace = 0;
-			return;
-		}
-		if ($lasttag) {
-			$this->Ln($hbz, $cell);
-			$this->htmlvspace = 0;
-			return;
-		}
-		if ($hb < $this->htmlvspace) {
-			$hd = 0;
-		} else {
-			$hd = $hb - $this->htmlvspace;
-			$this->htmlvspace = $hb;
-		}
-		$this->Ln(($hbz + $hd), $cell);
-	}
-
-	/**
-	 * Return the starting coordinates to draw an html border
-	 * @return array containing top-left border coordinates
-	 * @access protected
-	 * @since 5.7.000 (2010-08-03)
-	 */
-	protected function getBorderStartPosition() {
-		if ($this->rtl) {
-			$xmax = $this->lMargin;
-		} else {
-			$xmax = $this->w - $this->rMargin;
-		}
-		return array('page' => $this->page, 'column' => $this->current_column, 'x' => $this->x, 'y' => $this->y, 'xmax' => $xmax);
-	}
-
-	/**
-	 * Draw an HTML block border and fill
-	 * @param array $tag array of tag properties.
-	 * @param int $xmax end X coordinate for border.
-	 * @access protected
-	 * @since 5.7.000 (2010-08-03)
-	 */
-	protected function drawHTMLTagBorder($tag, $xmax) {
-		if (!isset($tag['borderposition'])) {
-			// nothing to draw
-			return;
-		}
-		$prev_x = $this->x;
-		$prev_y = $this->y;
-		$prev_lasth = $this->lasth;
-		$border = 0;
-		$fill = false;
-		$this->lasth = 0;
-		if (isset($tag['border']) AND !empty($tag['border'])) {
-			// get border style
-			$border = $tag['border'];
-			if (!$this->empty_string($this->thead) AND (!$this->inthead)) {
-				// border for table header
-				$border = $this->getBorderMode($border, $position='middle');
-			}
-		}
-		if (isset($tag['bgcolor']) AND ($tag['bgcolor'] !== false)) {
-			// get background color
-			$old_bgcolor = $this->bgcolor;
-			$this->SetFillColorArray($tag['bgcolor']);
-			$fill = true;
-		}
-		if (!$border AND !$fill) {
-			// nothing to draw
-			return;
-		}
-		if (isset($tag['attribute']['cellspacing'])) {
-			$cellspacing = $this->getHTMLUnitToUnits($tag['attribute']['cellspacing'], 1, 'px');
-		} else {
-			$cellspacing = 0;
-		}
-		if (($tag['value'] != 'table') AND (is_array($border)) AND (!empty($border))) {
-			// draw the border externally respect the sqare edge.
-			$border['mode'] = 'ext';
-		}
-		if ($this->rtl) {
-			if ($xmax >= $tag['borderposition']['x']) {
-				$xmax = $tag['borderposition']['xmax'];
-			}
-			$w = ($tag['borderposition']['x'] - $xmax);
-		} else {
-			if ($xmax <= $tag['borderposition']['x']) {
-				$xmax = $tag['borderposition']['xmax'];
-			}
-			$w = ($xmax - $tag['borderposition']['x']);
-		}
-		if ($w <= 0) {
-			return;
-		}
-		$w += $cellspacing;
-		$startpage = $tag['borderposition']['page'];
-		$startcolumn = $tag['borderposition']['column'];
-		$x = $tag['borderposition']['x'];
-		$y = $tag['borderposition']['y'];
-		$endpage = $this->page;
-		$starty = $tag['borderposition']['y'] - $cellspacing;
-		$currentY = $this->y;
-		$this->x = $x;
-		// get latest column
-		$endcolumn = $this->current_column;
-		if ($this->num_columns == 0) {
-			$this->num_columns = 1;
-		}
-		// get border modes
-		$border_start = $this->getBorderMode($border, $position='start');
-		$border_end = $this->getBorderMode($border, $position='end');
-		$border_middle = $this->getBorderMode($border, $position='middle');
-		// design borders around HTML cells.
-		for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
-			$ccode = '';
-			$this->setPage($page);
-			if ($this->num_columns < 2) {
-				// single-column mode
-				$this->x = $x;
-				$this->y = $this->tMargin;
-			}
-			// account for margin changes
-			if ($page > $startpage) {
-				if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-					$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-				} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-					$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
-				}
-			}
-			if ($startpage == $endpage) {
-				// single page
-				for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($startcolumn == $endcolumn) { // single column
-						$cborder = $border;
-						$h = ($currentY - $y) + $cellspacing;
-						$this->y = $starty;
-					} elseif ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $starty;
-						$h = $this->h - $this->y - $this->bMargin;
-					} elseif ($column == $endcolumn) { // end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $startpage) { // first page
-				for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($column == $startcolumn) { // first column
-						$cborder = $border_start;
-						$this->y = $starty;
-						$h = $this->h - $this->y - $this->bMargin;
-					} else { // middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} elseif ($page == $endpage) { // last page
-				for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
-					$this->selectColumn($column);
-					if ($column == $endcolumn) {
-						// end column
-						$cborder = $border_end;
-						$h = $currentY - $this->y;
-					} else {
-						// middle column
-						$cborder = $border_middle;
-						$h = $this->h - $this->y - $this->bMargin;
-					}
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			} else { // middle page
-				for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
-					$this->selectColumn($column);
-					$cborder = $border_middle;
-					$h = $this->h - $this->y - $this->bMargin;
-					$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-				} // end for each column
-			}
-			if ($cborder OR $fill) {
-				// draw border and fill
-				if ($this->inxobj) {
-					// we are inside an XObject template
-					if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-						$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
-						$pagemark = &$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
-					} else {
-						$pagemark = &$this->xobjects[$this->xobjid]['intmrk'];
-					}
-					$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
-					$pstart = substr($pagebuff, 0, $pagemark);
-					$pend = substr($pagebuff, $pagemark);
-					$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
-					$pagemark += strlen($ccode);
-				} else {
-					if (end($this->transfmrk[$this->page]) !== false) {
-						$pagemarkkey = key($this->transfmrk[$this->page]);
-						$pagemark = &$this->transfmrk[$this->page][$pagemarkkey];
-					} elseif ($this->InFooter) {
-						$pagemark = &$this->footerpos[$this->page];
-					} else {
-						$pagemark = &$this->intmrk[$this->page];
-					}
-					$pagebuff = $this->getPageBuffer($this->page);
-					$pstart = substr($pagebuff, 0, $this->bordermrk[$this->page]);
-					$pend = substr($pagebuff, $this->bordermrk[$this->page]);
-					$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
-					$offsetlen = strlen($ccode);
-					$this->bordermrk[$this->page] += $offsetlen;
-					$this->cntmrk[$this->page] += $offsetlen;
-					$pagemark += $offsetlen;
-				}
-			}
-		} // end for each page
-		if (isset($old_bgcolor)) {
-			// restore background color
-			$this->SetFillColorArray($old_bgcolor);
-		}
-		// restore pointer position
-		$this->x = $prev_x;
-		$this->y = $prev_y;
-		$this->lasth = $prev_lasth;
-	}
-
-	/**
-	 * Set the default bullet to be used as LI bullet symbol
-	 * @param string $symbol character or string to be used (legal values are: '' = automatic, '!' = auto bullet, '#' = auto numbering, 'disc', 'disc', 'circle', 'square', '1', 'decimal', 'decimal-leading-zero', 'i', 'lower-roman', 'I', 'upper-roman', 'a', 'lower-alpha', 'lower-latin', 'A', 'upper-alpha', 'upper-latin', 'lower-greek')
-	 * @access public
-	 * @since 4.0.028 (2008-09-26)
-	 */
-	public function setLIsymbol($symbol='!') {
-		$symbol = strtolower($symbol);
-		switch ($symbol) {
-			case '!' :
-			case '#' :
-			case 'disc' :
-			case 'circle' :
-			case 'square' :
-			case '1':
-			case 'decimal':
-			case 'decimal-leading-zero':
-			case 'i':
-			case 'lower-roman':
-			case 'I':
-			case 'upper-roman':
-			case 'a':
-			case 'lower-alpha':
-			case 'lower-latin':
-			case 'A':
-			case 'upper-alpha':
-			case 'upper-latin':
-			case 'lower-greek': {
-				$this->lisymbol = $symbol;
-				break;
-			}
-			default : {
-				$this->lisymbol = '';
-			}
-		}
-	}
-
-	/**
-	 * Set the booklet mode for double-sided pages.
-	 * @param boolean $booklet true set the booklet mode on, false otherwise.
-	 * @param float $inner Inner page margin.
-	 * @param float $outer Outer page margin.
-	 * @access public
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	public function SetBooklet($booklet=true, $inner=-1, $outer=-1) {
-		$this->booklet = $booklet;
-		if ($inner >= 0) {
-			$this->lMargin = $inner;
-		}
-		if ($outer >= 0) {
-			$this->rMargin = $outer;
-		}
-	}
-
-	/**
-	 * Swap the left and right margins.
-	 * @param boolean $reverse if true swap left and right margins.
-	 * @access protected
-	 * @since 4.2.000 (2008-10-29)
-	 */
-	protected function swapMargins($reverse=true) {
-		if ($reverse) {
-			// swap left and right margins
-			$mtemp = $this->original_lMargin;
-			$this->original_lMargin = $this->original_rMargin;
-			$this->original_rMargin = $mtemp;
-			$deltam = $this->original_lMargin - $this->original_rMargin;
-			$this->lMargin += $deltam;
-			$this->rMargin -= $deltam;
-		}
-	}
-
-	/**
-	 * Set the vertical spaces for HTML tags.
-	 * The array must have the following structure (example):
-	 * $tagvs = array('h1' => array(0 => array('h' => '', 'n' => 2), 1 => array('h' => 1.3, 'n' => 1)));
-	 * The first array level contains the tag names,
-	 * the second level contains 0 for opening tags or 1 for closing tags,
-	 * the third level contains the vertical space unit (h) and the number spaces to add (n).
-	 * If the h parameter is not specified, default values are used.
-	 * @param array $tagvs array of tags and relative vertical spaces.
-	 * @access public
-	 * @since 4.2.001 (2008-10-30)
-	 */
-	public function setHtmlVSpace($tagvs) {
-		$this->tagvspaces = $tagvs;
-	}
-
-	/**
-	 * Set custom width for list indentation.
-	 * @param float $width width of the indentation. Use negative value to disable it.
-	 * @access public
-	 * @since 4.2.007 (2008-11-12)
-	 */
-	public function setListIndentWidth($width) {
-		return $this->customlistindent = floatval($width);
-	}
-
-	/**
-	 * Set the top/bottom cell sides to be open or closed when the cell cross the page.
-	 * @param boolean $isopen if true keeps the top/bottom border open for the cell sides that cross the page.
-	 * @access public
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	public function setOpenCell($isopen) {
-		$this->opencell = $isopen;
-	}
-
-	/**
-	 * Set the color and font style for HTML links.
-	 * @param array $color RGB array of colors
-	 * @param string $fontstyle additional font styles to add
-	 * @access public
-	 * @since 4.4.003 (2008-12-09)
-	 */
-	public function setHtmlLinksStyle($color=array(0,0,255), $fontstyle='U') {
-		$this->htmlLinkColorArray = $color;
-		$this->htmlLinkFontStyle = $fontstyle;
-	}
-
-	/**
-	 * Convert HTML string containing value and unit of measure to user's units or points.
-	 * @param string $formval string containing values and unit
-	 * @param string $refsize reference value in points
-	 * @param string $defaultunit default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
-	 * @param boolean $point if true returns points, otherwise returns value in user's units
-	 * @return float value in user's unit or point if $points=true
-	 * @access public
-	 * @since 4.4.004 (2008-12-10)
-	 */
-	public function getHTMLUnitToUnits($formval, $refsize=1, $defaultunit='px', $points=false) {
-		$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
-		$retval = 0;
-		$value = 0;
-		$unit = 'px';
-		$k = $this->k;
-		if ($points) {
-			$k = 1;
-		}
-		if (in_array($defaultunit, $supportedunits)) {
-			$unit = $defaultunit;
-		}
-		if (is_numeric($formval)) {
-			$value = floatval($formval);
-		} elseif (preg_match('/([0-9\.\-\+]+)/', $formval, $mnum)) {
-			$value = floatval($mnum[1]);
-			if (preg_match('/([a-z%]+)/', $formval, $munit)) {
-				if (in_array($munit[1], $supportedunits)) {
-					$unit = $munit[1];
-				}
-			}
-		}
-		switch ($unit) {
-			// percentage
-			case '%': {
-				$retval = (($value * $refsize) / 100);
-				break;
-			}
-			// relative-size
-			case 'em': {
-				$retval = ($value * $refsize);
-				break;
-			}
-			// height of lower case 'x' (about half the font-size)
-			case 'ex': {
-				$retval = $value * ($refsize / 2);
-				break;
-			}
-			// absolute-size
-			case 'in': {
-				$retval = ($value * $this->dpi) / $k;
-				break;
-			}
-			// centimeters
-			case 'cm': {
-				$retval = ($value / 2.54 * $this->dpi) / $k;
-				break;
-			}
-			// millimeters
-			case 'mm': {
-				$retval = ($value / 25.4 * $this->dpi) / $k;
-				break;
-			}
-			// one pica is 12 points
-			case 'pc': {
-				$retval = ($value * 12) / $k;
-				break;
-			}
-			// points
-			case 'pt': {
-				$retval = $value / $k;
-				break;
-			}
-			// pixels
-			case 'px': {
-				$retval = $this->pixelsToUnits($value);
-				break;
-			}
-		}
-		return $retval;
-	}
-
-	/**
-	 * Returns the Roman representation of an integer number
-	 * @param int number to convert
-	 * @return string roman representation of the specified number
-	 * @access public
-	 * @since 4.4.004 (2008-12-10)
-	 */
-	public function intToRoman($number) {
-		$roman = '';
-		while ($number >= 1000) {
-			$roman .= 'M';
-			$number -= 1000;
-		}
-		while ($number >= 900) {
-			$roman .= 'CM';
-			$number -= 900;
-		}
-		while ($number >= 500) {
-			$roman .= 'D';
-			$number -= 500;
-		}
-		while ($number >= 400) {
-			$roman .= 'CD';
-			$number -= 400;
-		}
-		while ($number >= 100) {
-			$roman .= 'C';
-			$number -= 100;
-		}
-		while ($number >= 90) {
-			$roman .= 'XC';
-			$number -= 90;
-		}
-		while ($number >= 50) {
-			$roman .= 'L';
-			$number -= 50;
-		}
-		while ($number >= 40) {
-			$roman .= 'XL';
-			$number -= 40;
-		}
-		while ($number >= 10) {
-			$roman .= 'X';
-			$number -= 10;
-		}
-		while ($number >= 9) {
-			$roman .= 'IX';
-			$number -= 9;
-		}
-		while ($number >= 5) {
-			$roman .= 'V';
-			$number -= 5;
-		}
-		while ($number >= 4) {
-			$roman .= 'IV';
-			$number -= 4;
-		}
-		while ($number >= 1) {
-			$roman .= 'I';
-			--$number;
-		}
-		return $roman;
-	}
-
-	/**
-	 * Output an HTML list bullet or ordered item symbol
-	 * @param int $listdepth list nesting level
-	 * @param string $listtype type of list
-	 * @param float $size current font size
-	 * @access protected
-	 * @since 4.4.004 (2008-12-10)
-	 */
-	protected function putHtmlListBullet($listdepth, $listtype='', $size=10) {
-		$size /= $this->k;
-		$fill = '';
-		$color = $this->fgcolor;
-		$width = 0;
-		$textitem = '';
-		$tmpx = $this->x;
-		$lspace = $this->GetStringWidth('  ');
-		if ($listtype == '^') {
-			// special symbol used for avoid justification of rect bullet
-			$this->lispacer = '';
-			return;
-		} elseif ($listtype == '!') {
-			// set default list type for unordered list
-			$deftypes = array('disc', 'circle', 'square');
-			$listtype = $deftypes[($listdepth - 1) % 3];
-		} elseif ($listtype == '#') {
-			// set default list type for ordered list
-			$listtype = 'decimal';
-		}
-		switch ($listtype) {
-			// unordered types
-			case 'none': {
-				break;
-			}
-			case 'disc': {
-				$fill = 'F';
-			}
-			case 'circle': {
-				$fill .= 'D';
-				$r = $size / 6;
-				$lspace += (2 * $r);
-				if ($this->rtl) {
-					$this->x += $lspace;
-				} else {
-					$this->x -= $lspace;
-				}
-				$this->Circle(($this->x + $r), ($this->y + ($this->lasth / 2)), $r, 0, 360, $fill, array('color'=>$color), $color, 8);
-				break;
-			}
-			case 'square': {
-				$l = $size / 3;
-				$lspace += $l;
-				if ($this->rtl) {;
-					$this->x += $lspace;
-				} else {
-					$this->x -= $lspace;
-				}
-				$this->Rect($this->x, ($this->y + (($this->lasth - $l)/ 2)), $l, $l, 'F', array(), $color);
-				break;
-			}
-			// ordered types
-			// $this->listcount[$this->listnum];
-			// $textitem
-			case '1':
-			case 'decimal': {
-				$textitem = $this->listcount[$this->listnum];
-				break;
-			}
-			case 'decimal-leading-zero': {
-				$textitem = sprintf('%02d', $this->listcount[$this->listnum]);
-				break;
-			}
-			case 'i':
-			case 'lower-roman': {
-				$textitem = strtolower($this->intToRoman($this->listcount[$this->listnum]));
-				break;
-			}
-			case 'I':
-			case 'upper-roman': {
-				$textitem = $this->intToRoman($this->listcount[$this->listnum]);
-				break;
-			}
-			case 'a':
-			case 'lower-alpha':
-			case 'lower-latin': {
-				$textitem = chr(97 + $this->listcount[$this->listnum] - 1);
-				break;
-			}
-			case 'A':
-			case 'upper-alpha':
-			case 'upper-latin': {
-				$textitem = chr(65 + $this->listcount[$this->listnum] - 1);
-				break;
-			}
-			case 'lower-greek': {
-				$textitem = $this->unichr(945 + $this->listcount[$this->listnum] - 1);
-				break;
-			}
-			/*
-			// Types to be implemented (special handling)
-			case 'hebrew': {
-				break;
-			}
-			case 'armenian': {
-				break;
-			}
-			case 'georgian': {
-				break;
-			}
-			case 'cjk-ideographic': {
-				break;
-			}
-			case 'hiragana': {
-				break;
-			}
-			case 'katakana': {
-				break;
-			}
-			case 'hiragana-iroha': {
-				break;
-			}
-			case 'katakana-iroha': {
-				break;
-			}
-			*/
-			default: {
-				$textitem = $this->listcount[$this->listnum];
-			}
-		}
-		if (!$this->empty_string($textitem)) {
-			// print ordered item
-			if ($this->rtl) {
-				$textitem = '.'.$textitem;
-			} else {
-				$textitem = $textitem.'.';
-			}
-			$lspace += $this->GetStringWidth($textitem);
-			if ($this->rtl) {
-				$this->x += $lspace;
-			} else {
-				$this->x -= $lspace;
-			}
-			$this->Write($this->lasth, $textitem, '', false, '', false, 0, false);
-		}
-		$this->x = $tmpx;
-		$this->lispacer = '^';
-	}
-
-	/**
-	 * Returns current graphic variables as array.
-	 * @return array of graphic variables
-	 * @access protected
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	protected function getGraphicVars() {
-		$grapvars = array(
-			'FontFamily' => $this->FontFamily,
-			'FontStyle' => $this->FontStyle,
-			'FontSizePt' => $this->FontSizePt,
-			'rMargin' => $this->rMargin,
-			'lMargin' => $this->lMargin,
-			'cell_padding' => $this->cell_padding,
-			'cell_margin' => $this->cell_margin,
-			'LineWidth' => $this->LineWidth,
-			'linestyleWidth' => $this->linestyleWidth,
-			'linestyleCap' => $this->linestyleCap,
-			'linestyleJoin' => $this->linestyleJoin,
-			'linestyleDash' => $this->linestyleDash,
-			'textrendermode' => $this->textrendermode,
-			'textstrokewidth' => $this->textstrokewidth,
-			'DrawColor' => $this->DrawColor,
-			'FillColor' => $this->FillColor,
-			'TextColor' => $this->TextColor,
-			'ColorFlag' => $this->ColorFlag,
-			'bgcolor' => $this->bgcolor,
-			'fgcolor' => $this->fgcolor,
-			'htmlvspace' => $this->htmlvspace,
-			'listindent' => $this->listindent,
-			'listindentlevel' => $this->listindentlevel,
-			'listnum' => $this->listnum,
-			'listordered' => $this->listordered,
-			'listcount' => $this->listcount,
-			'lispacer' => $this->lispacer,
-			'cell_height_ratio' => $this->cell_height_ratio,
-			'font_stretching' => $this->font_stretching,
-			'font_spacing' => $this->font_spacing,
-			// extended
-			'lasth' => $this->lasth,
-			'tMargin' => $this->tMargin,
-			'bMargin' => $this->bMargin,
-			'AutoPageBreak' => $this->AutoPageBreak,
-			'PageBreakTrigger' => $this->PageBreakTrigger,
-			'x' => $this->x,
-			'y' => $this->y,
-			'w' => $this->w,
-			'h' => $this->h,
-			'wPt' => $this->wPt,
-			'hPt' => $this->hPt,
-			'fwPt' => $this->fwPt,
-			'fhPt' => $this->fhPt,
-			'page' => $this->page,
-			'current_column' => $this->current_column,
-			'num_columns' => $this->num_columns
-			);
-		return $grapvars;
-	}
-
-	/**
-	 * Set graphic variables.
-	 * @param array $gvars array of graphic variablesto restore
-	 * @param boolean $extended if true restore extended graphic variables
-	 * @access protected
-	 * @since 4.2.010 (2008-11-14)
-	 */
-	protected function setGraphicVars($gvars, $extended=false) {
-		$this->FontFamily = $gvars['FontFamily'];
-		$this->FontStyle = $gvars['FontStyle'];
-		$this->FontSizePt = $gvars['FontSizePt'];
-		$this->rMargin = $gvars['rMargin'];
-		$this->lMargin = $gvars['lMargin'];
-		$this->cell_padding = $gvars['cell_padding'];
-		$this->cell_margin = $gvars['cell_margin'];
-		$this->LineWidth = $gvars['LineWidth'];
-		$this->linestyleWidth = $gvars['linestyleWidth'];
-		$this->linestyleCap = $gvars['linestyleCap'];
-		$this->linestyleJoin = $gvars['linestyleJoin'];
-		$this->linestyleDash = $gvars['linestyleDash'];
-		$this->textrendermode = $gvars['textrendermode'];
-		$this->textstrokewidth = $gvars['textstrokewidth'];
-		$this->DrawColor = $gvars['DrawColor'];
-		$this->FillColor = $gvars['FillColor'];
-		$this->TextColor = $gvars['TextColor'];
-		$this->ColorFlag = $gvars['ColorFlag'];
-		$this->bgcolor = $gvars['bgcolor'];
-		$this->fgcolor = $gvars['fgcolor'];
-		$this->htmlvspace = $gvars['htmlvspace'];
-		$this->listindent = $gvars['listindent'];
-		$this->listindentlevel = $gvars['listindentlevel'];
-		$this->listnum = $gvars['listnum'];
-		$this->listordered = $gvars['listordered'];
-		$this->listcount = $gvars['listcount'];
-		$this->lispacer = $gvars['lispacer'];
-		$this->cell_height_ratio = $gvars['cell_height_ratio'];
-		$this->font_stretching = $gvars['font_stretching'];
-		$this->font_spacing = $gvars['font_spacing'];
-		if ($extended) {
-			// restore extended values
-			$this->lasth = $gvars['lasth'];
-			$this->tMargin = $gvars['tMargin'];
-			$this->bMargin = $gvars['bMargin'];
-			$this->AutoPageBreak = $gvars['AutoPageBreak'];
-			$this->PageBreakTrigger = $gvars['PageBreakTrigger'];
-			$this->x = $gvars['x'];
-			$this->y = $gvars['y'];
-			$this->w = $gvars['w'];
-			$this->h = $gvars['h'];
-			$this->wPt = $gvars['wPt'];
-			$this->hPt = $gvars['hPt'];
-			$this->fwPt = $gvars['fwPt'];
-			$this->fhPt = $gvars['fhPt'];
-			$this->page = $gvars['page'];
-			$this->current_column = $gvars['current_column'];
-			$this->num_columns = $gvars['num_columns'];
-		}
-		$this->_out(''.$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' '.$this->FillColor.'');
-		if (!$this->empty_string($this->FontFamily)) {
-			$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
-		}
-	}
-
-	/**
-	 * Returns a temporary filename for caching object on filesystem.
-	 * @param string $prefix prefix to add to filename
-	 * return string filename.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function getObjFilename($name) {
-		return tempnam(K_PATH_CACHE, $name.'_');
-	}
-
-	/**
-	 * Writes data to a temporary file on filesystem.
-	 * @param string $file file name
-	 * @param mixed $data data to write on file
-	 * @param boolean $append if true append data, false replace.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function writeDiskCache($filename, $data, $append=false) {
-		if ($append) {
-			$fmode = 'ab+';
-		} else {
-			$fmode = 'wb+';
-		}
-		$f = @fopen($filename, $fmode);
-		if (!$f) {
-			$this->Error('Unable to write cache file: '.$filename);
-		} else {
-			fwrite($f, $data);
-			fclose($f);
-		}
-		// update file length (needed for transactions)
-		if (!isset($this->cache_file_length['_'.$filename])) {
-			$this->cache_file_length['_'.$filename] = strlen($data);
-		} else {
-			$this->cache_file_length['_'.$filename] += strlen($data);
-		}
-	}
-
-	/**
-	 * Read data from a temporary file on filesystem.
-	 * @param string $file file name
-	 * @return mixed retrieved data
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function readDiskCache($filename) {
-		return file_get_contents($filename);
-	}
-
-	/**
-	 * Set buffer content (always append data).
-	 * @param string $data data
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function setBuffer($data) {
-		$this->bufferlen += strlen($data);
-		if ($this->diskcache) {
-			if (!isset($this->buffer) OR $this->empty_string($this->buffer)) {
-				$this->buffer = $this->getObjFilename('buffer');
-			}
-			$this->writeDiskCache($this->buffer, $data, true);
-		} else {
-			$this->buffer .= $data;
-		}
-	}
-
-	/**
-	 * Replace the buffer content
-	 * @param string $data data
-	 * @access protected
-	 * @since 5.5.000 (2010-06-22)
-	 */
-	protected function replaceBuffer($data) {
-		$this->bufferlen = strlen($data);
-		if ($this->diskcache) {
-			if (!isset($this->buffer) OR $this->empty_string($this->buffer)) {
-				$this->buffer = $this->getObjFilename('buffer');
-			}
-			$this->writeDiskCache($this->buffer, $data, false);
-		} else {
-			$this->buffer = $data;
-		}
-	}
-
-	/**
-	 * Get buffer content.
-	 * @return string buffer content
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function getBuffer() {
-		if ($this->diskcache) {
-			return $this->readDiskCache($this->buffer);
-		} else {
-			return $this->buffer;
-		}
-	}
-
-	/**
-	 * Set page buffer content.
-	 * @param int $page page number
-	 * @param string $data page data
-	 * @param boolean $append if true append data, false replace.
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function setPageBuffer($page, $data, $append=false) {
-		if ($this->diskcache) {
-			if (!isset($this->pages[$page])) {
-				$this->pages[$page] = $this->getObjFilename('page'.$page);
-			}
-			$this->writeDiskCache($this->pages[$page], $data, $append);
-		} else {
-			if ($append) {
-				$this->pages[$page] .= $data;
-			} else {
-				$this->pages[$page] = $data;
-			}
-		}
-		if ($append AND isset($this->pagelen[$page])) {
-			$this->pagelen[$page] += strlen($data);
-		} else {
-			$this->pagelen[$page] = strlen($data);
-		}
-	}
-
-	/**
-	 * Get page buffer content.
-	 * @param int $page page number
-	 * @return string page buffer content or false in case of error
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function getPageBuffer($page) {
-		if ($this->diskcache) {
-			return $this->readDiskCache($this->pages[$page]);
-		} elseif (isset($this->pages[$page])) {
-			return $this->pages[$page];
-		}
-		return false;
-	}
-
-	/**
-	 * Set image buffer content.
-	 * @param string $image image key
-	 * @param array $data image data
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function setImageBuffer($image, $data) {
-		if ($this->diskcache) {
-			if (!isset($this->images[$image])) {
-				$this->images[$image] = $this->getObjFilename('image'.$image);
-			}
-			$this->writeDiskCache($this->images[$image], serialize($data));
-		} else {
-			$this->images[$image] = $data;
-		}
-		if (!in_array($image, $this->imagekeys)) {
-			$this->imagekeys[] = $image;
-			++$this->numimages;
-		}
-	}
-
-	/**
-	 * Set image buffer content for a specified sub-key.
-	 * @param string $image image key
-	 * @param string $key image sub-key
-	 * @param array $data image data
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function setImageSubBuffer($image, $key, $data) {
-		if (!isset($this->images[$image])) {
-			$this->setImageBuffer($image, array());
-		}
-		if ($this->diskcache) {
-			$tmpimg = $this->getImageBuffer($image);
-			$tmpimg[$key] = $data;
-			$this->writeDiskCache($this->images[$image], serialize($tmpimg));
-		} else {
-			$this->images[$image][$key] = $data;
-		}
-	}
-
-	/**
-	 * Get image buffer content.
-	 * @param string $image image key
-	 * @return string image buffer content or false in case of error
-	 * @access protected
-	 * @since 4.5.000 (2008-12-31)
-	 */
-	protected function getImageBuffer($image) {
-		if ($this->diskcache AND isset($this->images[$image])) {
-			return unserialize($this->readDiskCache($this->images[$image]));
-		} elseif (isset($this->images[$image])) {
-			return $this->images[$image];
-		}
-		return false;
-	}
-
-	/**
-	 * Set font buffer content.
-	 * @param string $font font key
-	 * @param array $data font data
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function setFontBuffer($font, $data) {
-		if ($this->diskcache) {
-			if (!isset($this->fonts[$font])) {
-				$this->fonts[$font] = $this->getObjFilename('font');
-			}
-			$this->writeDiskCache($this->fonts[$font], serialize($data));
-		} else {
-			$this->fonts[$font] = $data;
-		}
-		if (!in_array($font, $this->fontkeys)) {
-			$this->fontkeys[] = $font;
-			// store object ID for current font
-			++$this->n;
-			$this->font_obj_ids[$font] = $this->n;
-			$this->setFontSubBuffer($font, 'n', $this->n);
-		}
-	}
-
-	/**
-	 * Set font buffer content.
-	 * @param string $font font key
-	 * @param string $key font sub-key
-	 * @param array $data font data
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function setFontSubBuffer($font, $key, $data) {
-		if (!isset($this->fonts[$font])) {
-			$this->setFontBuffer($font, array());
-		}
-		if ($this->diskcache) {
-			$tmpfont = $this->getFontBuffer($font);
-			$tmpfont[$key] = $data;
-			$this->writeDiskCache($this->fonts[$font], serialize($tmpfont));
-		} else {
-			$this->fonts[$font][$key] = $data;
-		}
-	}
-
-	/**
-	 * Get font buffer content.
-	 * @param string $font font key
-	 * @return string font buffer content or false in case of error
-	 * @access protected
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	protected function getFontBuffer($font) {
-		if ($this->diskcache AND isset($this->fonts[$font])) {
-			return unserialize($this->readDiskCache($this->fonts[$font]));
-		} elseif (isset($this->fonts[$font])) {
-			return $this->fonts[$font];
-		}
-		return false;
-	}
-
-	/**
-	 * Move a page to a previous position.
-	 * @param int $frompage number of the source page
-	 * @param int $topage number of the destination page (must be less than $frompage)
-	 * @return true in case of success, false in case of error.
-	 * @access public
-	 * @since 4.5.000 (2009-01-02)
-	 */
-	public function movePage($frompage, $topage) {
-		if (($frompage > $this->numpages) OR ($frompage <= $topage)) {
-			return false;
-		}
-		if ($frompage == $this->page) {
-			// close the page before moving it
-			$this->endPage();
-		}
-		// move all page-related states
-		$tmppage = $this->pages[$frompage];
-		$tmppagedim = $this->pagedim[$frompage];
-		$tmppagelen = $this->pagelen[$frompage];
-		$tmpintmrk = $this->intmrk[$frompage];
-		$tmpbordermrk = $this->bordermrk[$frompage];
-		$tmpcntmrk = $this->cntmrk[$frompage];
-		if (isset($this->footerpos[$frompage])) {
-			$tmpfooterpos = $this->footerpos[$frompage];
-		}
-		if (isset($this->footerlen[$frompage])) {
-			$tmpfooterlen = $this->footerlen[$frompage];
-		}
-		if (isset($this->transfmrk[$frompage])) {
-			$tmptransfmrk = $this->transfmrk[$frompage];
-		}
-		if (isset($this->PageAnnots[$frompage])) {
-			$tmpannots = $this->PageAnnots[$frompage];
-		}
-		if (isset($this->newpagegroup[$frompage])) {
-			$tmpnewpagegroup = $this->newpagegroup[$frompage];
-		}
-		for ($i = $frompage; $i > $topage; --$i) {
-			$j = $i - 1;
-			// shift pages down
-			$this->pages[$i] = $this->pages[$j];
-			$this->pagedim[$i] = $this->pagedim[$j];
-			$this->pagelen[$i] = $this->pagelen[$j];
-			$this->intmrk[$i] = $this->intmrk[$j];
-			$this->bordermrk[$i] = $this->bordermrk[$j];
-			$this->cntmrk[$i] = $this->cntmrk[$j];
-			if (isset($this->footerpos[$j])) {
-				$this->footerpos[$i] = $this->footerpos[$j];
-			} elseif (isset($this->footerpos[$i])) {
-				unset($this->footerpos[$i]);
-			}
-			if (isset($this->footerlen[$j])) {
-				$this->footerlen[$i] = $this->footerlen[$j];
-			} elseif (isset($this->footerlen[$i])) {
-				unset($this->footerlen[$i]);
-			}
-			if (isset($this->transfmrk[$j])) {
-				$this->transfmrk[$i] = $this->transfmrk[$j];
-			} elseif (isset($this->transfmrk[$i])) {
-				unset($this->transfmrk[$i]);
-			}
-			if (isset($this->PageAnnots[$j])) {
-				$this->PageAnnots[$i] = $this->PageAnnots[$j];
-			} elseif (isset($this->PageAnnots[$i])) {
-				unset($this->PageAnnots[$i]);
-			}
-			if (isset($this->newpagegroup[$j])) {
-				$this->newpagegroup[$i] = $this->newpagegroup[$j];
-			} elseif (isset($this->newpagegroup[$i])) {
-				unset($this->newpagegroup[$i]);
-			}
-		}
-		$this->pages[$topage] = $tmppage;
-		$this->pagedim[$topage] = $tmppagedim;
-		$this->pagelen[$topage] = $tmppagelen;
-		$this->intmrk[$topage] = $tmpintmrk;
-		$this->bordermrk[$topage] = $tmpbordermrk;
-		$this->cntmrk[$topage] = $tmpcntmrk;
-		if (isset($tmpfooterpos)) {
-			$this->footerpos[$topage] = $tmpfooterpos;
-		} elseif (isset($this->footerpos[$topage])) {
-			unset($this->footerpos[$topage]);
-		}
-		if (isset($tmpfooterlen)) {
-			$this->footerlen[$topage] = $tmpfooterlen;
-		} elseif (isset($this->footerlen[$topage])) {
-			unset($this->footerlen[$topage]);
-		}
-		if (isset($tmptransfmrk)) {
-			$this->transfmrk[$topage] = $tmptransfmrk;
-		} elseif (isset($this->transfmrk[$topage])) {
-			unset($this->transfmrk[$topage]);
-		}
-		if (isset($tmpannots)) {
-			$this->PageAnnots[$topage] = $tmpannots;
-		} elseif (isset($this->PageAnnots[$topage])) {
-			unset($this->PageAnnots[$topage]);
-		}
-		if (isset($tmpnewpagegroup)) {
-			$this->newpagegroup[$topage] = $tmpnewpagegroup;
-		} elseif (isset($this->newpagegroup[$topage])) {
-			unset($this->newpagegroup[$topage]);
-		}
-		// adjust outlines
-		$tmpoutlines = $this->outlines;
-		foreach ($tmpoutlines as $key => $outline) {
-			if (($outline['p'] >= $topage) AND ($outline['p'] < $frompage)) {
-				$this->outlines[$key]['p'] = $outline['p'] + 1;
-			} elseif ($outline['p'] == $frompage) {
-				$this->outlines[$key]['p'] = $topage;
-			}
-		}
-		// adjust links
-		$tmplinks = $this->links;
-		foreach ($tmplinks as $key => $link) {
-			if (($link[0] >= $topage) AND ($link[0] < $frompage)) {
-				$this->links[$key][0] = $link[0] + 1;
-			} elseif ($link[0] == $frompage) {
-				$this->links[$key][0] = $topage;
-			}
-		}
-		// adjust javascript
-		$tmpjavascript = $this->javascript;
-		global $jfrompage, $jtopage;
-		$jfrompage = $frompage;
-		$jtopage = $topage;
-		$this->javascript = preg_replace_callback('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/',
-			create_function('$matches', 'global $jfrompage, $jtopage;
-			$pagenum = intval($matches[3]) + 1;
-			if (($pagenum >= $jtopage) AND ($pagenum < $jfrompage)) {
-				$newpage = ($pagenum + 1);
-			} elseif ($pagenum == $jfrompage) {
-				$newpage = $jtopage;
-			} else {
-				$newpage = $pagenum;
-			}
-			--$newpage;
-			return "this.addField(\'".$matches[1]."\',\'".$matches[2]."\',".$newpage."";'), $tmpjavascript);
-		// return to last page
-		$this->lastPage(true);
-		return true;
-	}
-
-	/**
-	 * Remove the specified page.
-	 * @param int $page page to remove
-	 * @return true in case of success, false in case of error.
-	 * @access public
-	 * @since 4.6.004 (2009-04-23)
-	 */
-	public function deletePage($page) {
-		if (($page < 1) OR ($page > $this->numpages)) {
-			return false;
-		}
-		// delete current page
-		unset($this->pages[$page]);
-		unset($this->pagedim[$page]);
-		unset($this->pagelen[$page]);
-		unset($this->intmrk[$page]);
-		unset($this->bordermrk[$page]);
-		unset($this->cntmrk[$page]);
-		if (isset($this->footerpos[$page])) {
-			unset($this->footerpos[$page]);
-		}
-		if (isset($this->footerlen[$page])) {
-			unset($this->footerlen[$page]);
-		}
-		if (isset($this->transfmrk[$page])) {
-			unset($this->transfmrk[$page]);
-		}
-		if (isset($this->PageAnnots[$page])) {
-			unset($this->PageAnnots[$page]);
-		}
-		if (isset($this->newpagegroup[$page])) {
-			unset($this->newpagegroup[$page]);
-		}
-		if (isset($this->pageopen[$page])) {
-			unset($this->pageopen[$page]);
-		}
-		// update remaining pages
-		for ($i = $page; $i < $this->numpages; ++$i) {
-			$j = $i + 1;
-			// shift pages
-			$this->pages[$i] = $this->pages[$j];
-			$this->pagedim[$i] = $this->pagedim[$j];
-			$this->pagelen[$i] = $this->pagelen[$j];
-			$this->intmrk[$i] = $this->intmrk[$j];
-			$this->bordermrk[$i] = $this->bordermrk[$j];
-			$this->cntmrk[$i] = $this->cntmrk[$j];
-			if (isset($this->footerpos[$j])) {
-				$this->footerpos[$i] = $this->footerpos[$j];
-			} elseif (isset($this->footerpos[$i])) {
-				unset($this->footerpos[$i]);
-			}
-			if (isset($this->footerlen[$j])) {
-				$this->footerlen[$i] = $this->footerlen[$j];
-			} elseif (isset($this->footerlen[$i])) {
-				unset($this->footerlen[$i]);
-			}
-			if (isset($this->transfmrk[$j])) {
-				$this->transfmrk[$i] = $this->transfmrk[$j];
-			} elseif (isset($this->transfmrk[$i])) {
-				unset($this->transfmrk[$i]);
-			}
-			if (isset($this->PageAnnots[$j])) {
-				$this->PageAnnots[$i] = $this->PageAnnots[$j];
-			} elseif (isset($this->PageAnnots[$i])) {
-				unset($this->PageAnnots[$i]);
-			}
-			if (isset($this->newpagegroup[$j])) {
-				$this->newpagegroup[$i] = $this->newpagegroup[$j];
-			} elseif (isset($this->newpagegroup[$i])) {
-				unset($this->newpagegroup[$i]);
-			}
-			if (isset($this->pageopen[$j])) {
-				$this->pageopen[$i] = $this->pageopen[$j];
-			} elseif (isset($this->pageopen[$i])) {
-				unset($this->pageopen[$i]);
-			}
-		}
-		// remove last page
-		unset($this->pages[$this->numpages]);
-		unset($this->pagedim[$this->numpages]);
-		unset($this->pagelen[$this->numpages]);
-		unset($this->intmrk[$this->numpages]);
-		unset($this->bordermrk[$this->numpages]);
-		unset($this->cntmrk[$this->numpages]);
-		if (isset($this->footerpos[$this->numpages])) {
-			unset($this->footerpos[$this->numpages]);
-		}
-		if (isset($this->footerlen[$this->numpages])) {
-			unset($this->footerlen[$this->numpages]);
-		}
-		if (isset($this->transfmrk[$this->numpages])) {
-			unset($this->transfmrk[$this->numpages]);
-		}
-		if (isset($this->PageAnnots[$this->numpages])) {
-			unset($this->PageAnnots[$this->numpages]);
-		}
-		if (isset($this->newpagegroup[$this->numpages])) {
-			unset($this->newpagegroup[$this->numpages]);
-		}
-		if (isset($this->pageopen[$this->numpages])) {
-			unset($this->pageopen[$this->numpages]);
-		}
-		--$this->numpages;
-		$this->page = $this->numpages;
-		// adjust outlines
-		$tmpoutlines = $this->outlines;
-		foreach ($tmpoutlines as $key => $outline) {
-			if ($outline['p'] > $page) {
-				$this->outlines[$key]['p'] = $outline['p'] - 1;
-			} elseif ($outline['p'] == $page) {
-				unset($this->outlines[$key]);
-			}
-		}
-		// adjust links
-		$tmplinks = $this->links;
-		foreach ($tmplinks as $key => $link) {
-			if ($link[0] > $page) {
-				$this->links[$key][0] = $link[0] - 1;
-			} elseif ($link[0] == $page) {
-				unset($this->links[$key]);
-			}
-		}
-		// adjust javascript
-		$tmpjavascript = $this->javascript;
-		global $jpage;
-		$jpage = $page;
-		$this->javascript = preg_replace_callback('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/',
-			create_function('$matches', 'global $jpage;
-			$pagenum = intval($matches[3]) + 1;
-			if ($pagenum >= $jpage) {
-				$newpage = ($pagenum - 1);
-			} elseif ($pagenum == $jpage) {
-				$newpage = 1;
-			} else {
-				$newpage = $pagenum;
-			}
-			--$newpage;
-			return "this.addField(\'".$matches[1]."\',\'".$matches[2]."\',".$newpage."";'), $tmpjavascript);
-		// return to last page
-		$this->lastPage(true);
-		return true;
-	}
-
-	/**
-	 * Clone the specified page to a new page.
-	 * @param int $page number of page to copy (0 = current page)
-	 * @return true in case of success, false in case of error.
-	 * @access public
-	 * @since 4.9.015 (2010-04-20)
-	 */
-	public function copyPage($page=0) {
-		if ($page == 0) {
-			// default value
-			$page = $this->page;
-		}
-		if (($page < 1) OR ($page > $this->numpages)) {
-			return false;
-		}
-		if ($page == $this->page) {
-			// close the page before cloning it
-			$this->endPage();
-		}
-		// copy all page-related states
-		++$this->numpages;
-		$this->page = $this->numpages;
-		$this->pages[$this->page] = $this->pages[$page];
-		$this->pagedim[$this->page] = $this->pagedim[$page];
-		$this->pagelen[$this->page] = $this->pagelen[$page];
-		$this->intmrk[$this->page] = $this->intmrk[$page];
-		$this->bordermrk[$this->page] = $this->bordermrk[$page];
-		$this->cntmrk[$this->page] = $this->cntmrk[$page];
-		$this->pageopen[$this->page] = false;
-		if (isset($this->footerpos[$page])) {
-			$this->footerpos[$this->page] = $this->footerpos[$page];
-		}
-		if (isset($this->footerlen[$page])) {
-			$this->footerlen[$this->page] = $this->footerlen[$page];
-		}
-		if (isset($this->transfmrk[$page])) {
-			$this->transfmrk[$this->page] = $this->transfmrk[$page];
-		}
-		if (isset($this->PageAnnots[$page])) {
-			$this->PageAnnots[$this->page] = $this->PageAnnots[$page];
-		}
-		if (isset($this->newpagegroup[$page])) {
-			$this->newpagegroup[$this->page] = $this->newpagegroup[$page];
-		}
-		// copy outlines
-		$tmpoutlines = $this->outlines;
-		foreach ($tmpoutlines as $key => $outline) {
-			if ($outline['p'] == $page) {
-				$this->outlines[] = array('t' => $outline['t'], 'l' => $outline['l'], 'y' => $outline['y'], 'p' => $this->page);
-			}
-		}
-		// copy links
-		$tmplinks = $this->links;
-		foreach ($tmplinks as $key => $link) {
-			if ($link[0] == $page) {
-				$this->links[] = array($this->page, $link[1]);
-			}
-		}
-		// return to last page
-		$this->lastPage(true);
-		return true;
-	}
-
-	/**
-	 * Output a Table of Content Index (TOC).
-	 * Before calling this method you have to open the page using the addTOCPage() method.
-	 * After calling this method you have to call endTOCPage() to close the TOC page.
-	 * You can override this method to achieve different styles.
-	 * @param int $page page number where this TOC should be inserted (leave empty for current page).
-	 * @param string $numbersfont set the font for page numbers (please use monospaced font for better alignment).
-	 * @param string $filler string used to fill the space between text and page number.
-	 * @param string $toc_name name to use for TOC bookmark.
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 4.5.000 (2009-01-02)
-	 * @see addTOCPage(), endTOCPage(), addHTMLTOC()
-	 */
-	public function addTOC($page='', $numbersfont='', $filler='.', $toc_name='TOC') {
-		$fontsize = $this->FontSizePt;
-		$fontfamily = $this->FontFamily;
-		$fontstyle = $this->FontStyle;
-		$w = $this->w - $this->lMargin - $this->rMargin;
-		$spacer = $this->GetStringWidth(chr(32)) * 4;
-		$page_first = $this->getPage();
-		$lmargin = $this->lMargin;
-		$rmargin = $this->rMargin;
-		$x_start = $this->GetX();
-		$current_page = $this->page;
-		$current_column = $this->current_column;
-		if ($this->empty_string($numbersfont)) {
-			$numbersfont = $this->default_monospaced_font;
-		}
-		if ($this->empty_string($filler)) {
-			$filler = ' ';
-		}
-		if ($this->empty_string($page)) {
-			$gap = ' ';
-		} else {
-			$gap = '';
-			if ($page < 1) {
-				$page = 1;
-			}
-		}
-		foreach ($this->outlines as $key => $outline) {
-			if ($this->rtl) {
-				$aligntext = 'R';
-				$alignnum = 'L';
-			} else {
-				$aligntext = 'L';
-				$alignnum = 'R';
-			}
-			if ($outline['l'] == 0) {
-				$this->SetFont($fontfamily, $fontstyle.'B', $fontsize);
-			} else {
-				$this->SetFont($fontfamily, $fontstyle, $fontsize - $outline['l']);
-			}
-			// check for page break
-			$this->checkPageBreak(($this->FontSize * $this->cell_height_ratio));
-			// set margins and X position
-			if (($this->page == $current_page) AND ($this->current_column == $current_column)) {
-				$this->lMargin = $lmargin;
-				$this->rMargin = $rmargin;
-			} else {
-				if ($this->current_column != $current_column) {
-					if ($this->rtl) {
-						$x_start = $this->w - $this->columns[$this->current_column]['x'];
-					} else {
-						$x_start = $this->columns[$this->current_column]['x'];
-					}
-				}
-				$lmargin = $this->lMargin;
-				$rmargin = $this->rMargin;
-				$current_page = $this->page;
-				$current_column = $this->current_column;
-			}
-			$this->SetX($x_start);
-			$indent = ($spacer * $outline['l']);
-			if ($this->rtl) {
-				$this->rMargin += $indent;
-				$this->x -= $indent;
-			} else {
-				$this->lMargin += $indent;
-				$this->x += $indent;
-			}
-			$link = $this->AddLink();
-			$this->SetLink($link, $outline['y'], $outline['p']);
-			// write the text
-			$this->Write(0, $outline['t'], $link, 0, $aligntext, false, 0, false, false, 0);
-			$this->SetFont($numbersfont, $fontstyle, $fontsize);
-			if ($this->empty_string($page)) {
-				$pagenum = $outline['p'];
-			} else {
-				// placemark to be replaced with the correct number
-				$pagenum = '{#'.($outline['p']).'}';
-				if ($this->isUnicodeFont()) {
-					$pagenum = '{'.$pagenum.'}';
-				}
-			}
-			$numwidth = $this->GetStringWidth($pagenum);
-			if ($this->rtl) {
-				$tw = $this->x - $this->lMargin;
-			} else {
-				$tw = $this->w - $this->rMargin - $this->x;
-			}
-			$fw = $tw - $numwidth - $this->GetStringWidth(chr(32));
-			$numfills = floor($fw / $this->GetStringWidth($filler));
-			if ($numfills > 0) {
-				$rowfill = str_repeat($filler, $numfills);
-			} else {
-				$rowfill = '';
-			}
-			if ($this->rtl) {
-				$pagenum = $pagenum.$gap.$rowfill.' ';
-			} else {
-				$pagenum = ' '.$rowfill.$gap.$pagenum;
-			}
-			// write the number
-			$this->Cell($tw, 0, $pagenum, 0, 1, $alignnum, 0, $link, 0);
-		}
-		$page_last = $this->getPage();
-		$numpages = $page_last - $page_first + 1;
-		if (!$this->empty_string($page)) {
-			for ($p = $page_first; $p <= $page_last; ++$p) {
-				// get page data
-				$temppage = $this->getPageBuffer($p);
-				for ($n = 1; $n <= $this->numpages; ++$n) {
-					// update page numbers
-					$k = '{#'.$n.'}';
-					$ku = '{'.$k.'}';
-					$alias_a = $this->_escape($k);
-					$alias_au = $this->_escape($ku);
-					if ($this->isunicode) {
-						$alias_b = $this->_escape($this->UTF8ToLatin1($k));
-						$alias_bu = $this->_escape($this->UTF8ToLatin1($ku));
-						$alias_c = $this->_escape($this->utf8StrRev($k, false, $this->tmprtl));
-						$alias_cu = $this->_escape($this->utf8StrRev($ku, false, $this->tmprtl));
-					}
-					if ($n >= $page) {
-						$np = $n + $numpages;
-					} else {
-						$np = $n;
-					}
-					$ns = $this->formatTOCPageNumber($np);
-					$nu = $ns;
-					$sdiff = strlen($k) - strlen($ns) - 1;
-					$sdiffu = strlen($ku) - strlen($ns) - 1;
-					$sfill = str_repeat($filler, $sdiff);
-					$sfillu = str_repeat($filler, $sdiffu);
-					if ($this->rtl) {
-						$ns = $ns.' '.$sfill;
-						$nu = $nu.' '.$sfillu;
-					} else {
-						$ns = $sfill.' '.$ns;
-						$nu = $sfillu.' '.$nu;
-					}
-					$nu = $this->UTF8ToUTF16BE($nu, false);
-					$temppage = str_replace($alias_au, $nu, $temppage);
-					if ($this->isunicode) {
-						$temppage = str_replace($alias_bu, $nu, $temppage);
-						$temppage = str_replace($alias_cu, $nu, $temppage);
-						$temppage = str_replace($alias_b, $ns, $temppage);
-						$temppage = str_replace($alias_c, $ns, $temppage);
-					}
-					$temppage = str_replace($alias_a, $ns, $temppage);
-				}
-				// save changes
-				$this->setPageBuffer($p, $temppage);
-			}
-			// move pages
-			$this->Bookmark($toc_name, 0, 0, $page_first);
-			for ($i = 0; $i < $numpages; ++$i) {
-				$this->movePage($page_last, $page);
-			}
-		}
-	}
-
-	/**
-	 * Output a Table Of Content Index (TOC) using HTML templates.
-	 * Before calling this method you have to open the page using the addTOCPage() method.
-	 * After calling this method you have to call endTOCPage() to close the TOC page.
-	 * @param int $page page number where this TOC should be inserted (leave empty for current page).
-	 * @param string $toc_name name to use for TOC bookmark.
-	 * @param array $templates array of html templates. Use: #TOC_DESCRIPTION# for bookmark title, #TOC_PAGE_NUMBER# for page number.
-	 * @param boolean $correct_align if true correct the number alignment (numbers must be in monospaced font like courier and right aligned on LTR, or left aligned on RTL)
-	 * @access public
-	 * @author Nicola Asuni
-	 * @since 5.0.001 (2010-05-06)
-	 * @see addTOCPage(), endTOCPage(), addTOC()
-	 */
-	public function addHTMLTOC($page='', $toc_name='TOC', $templates=array(), $correct_align=true) {
-		$prev_htmlLinkColorArray = $this->htmlLinkColorArray;
-		$prev_htmlLinkFontStyle = $this->htmlLinkFontStyle;
-		// set new style for link
-		$this->htmlLinkColorArray = array();
-		$this->htmlLinkFontStyle = '';
-		$page_first = $this->getPage();
-		// get the font type used for numbers in each template
-		$current_font = $this->FontFamily;
-		foreach ($templates as $level => $form) {
-			$dom = $this->getHtmlDomArray($form);
-			foreach ($dom as $key => $value) {
-				if ($value['value'] == '#TOC_PAGE_NUMBER#') {
-					$this->SetFont($dom[($key - 1)]['fontname']);
-					$templates['F'.$level] = $this->isUnicodeFont();
-				}
-			}
-		}
-		$this->SetFont($current_font);
-		foreach ($this->outlines as $key => $outline) {
-			// get HTML template
-			$row = $templates[$outline['l']];
-			if ($this->empty_string($page)) {
-				$pagenum = $outline['p'];
-			} else {
-				// placemark to be replaced with the correct number
-				$pagenum = '{#'.($outline['p']).'}';
-				if ($templates['F'.$outline['l']]) {
-					$pagenum = '{'.$pagenum.'}';
-				}
-			}
-			// replace templates with current values
-			$row = str_replace('#TOC_DESCRIPTION#', $outline['t'], $row);
-			$row = str_replace('#TOC_PAGE_NUMBER#', $pagenum, $row);
-			// add link to page
-			$row = '<a href="#'.$outline['p'].','.$outline['y'].'">'.$row.'</a>';
-			// write bookmark entry
-			$this->writeHTML($row, false, false, true, false, '');
-		}
-		// restore link styles
-		$this->htmlLinkColorArray = $prev_htmlLinkColorArray;
-		$this->htmlLinkFontStyle = $prev_htmlLinkFontStyle;
-		// move TOC page and replace numbers
-		$page_last = $this->getPage();
-		$numpages = $page_last - $page_first + 1;
-		if (!$this->empty_string($page)) {
-			for ($p = $page_first; $p <= $page_last; ++$p) {
-				// get page data
-				$temppage = $this->getPageBuffer($p);
-				for ($n = 1; $n <= $this->numpages; ++$n) {
-					// update page numbers
-					$k = '{#'.$n.'}';
-					$ku = '{'.$k.'}';
-					$alias_a = $this->_escape($k);
-					$alias_au = $this->_escape('{'.$k.'}');
-					if ($this->isunicode) {
-						$alias_b = $this->_escape($this->UTF8ToLatin1($k));
-						$alias_bu = $this->_escape($this->UTF8ToLatin1($ku));
-						$alias_c = $this->_escape($this->utf8StrRev($k, false, $this->tmprtl));
-						$alias_cu = $this->_escape($this->utf8StrRev($ku, false, $this->tmprtl));
-					}
-					if ($n >= $page) {
-						$np = $n + $numpages;
-					} else {
-						$np = $n;
-					}
-					$ns = $this->formatTOCPageNumber($np);
-					$nu = $ns;
-					if ($correct_align) {
-						$sdiff = strlen($k) - strlen($ns);
-						$sdiffu = strlen($ku) - strlen($ns);
-						$sfill = str_repeat(' ', $sdiff);
-						$sfillu = str_repeat(' ', $sdiffu);
-						if ($this->rtl) {
-							$ns = $ns.$sfill;
-							$nu = $nu.$sfillu;
-						} else {
-							$ns = $sfill.$ns;
-							$nu = $sfillu.$nu;
-						}
-					}
-					$nu = $this->UTF8ToUTF16BE($nu, false);
-					$temppage = str_replace($alias_au, $nu, $temppage);
-					if ($this->isunicode) {
-						$temppage = str_replace($alias_bu, $nu, $temppage);
-						$temppage = str_replace($alias_cu, $nu, $temppage);
-						$temppage = str_replace($alias_b, $ns, $temppage);
-						$temppage = str_replace($alias_c, $ns, $temppage);
-					}
-					$temppage = str_replace($alias_a, $ns, $temppage);
-				}
-				// save changes
-				$this->setPageBuffer($p, $temppage);
-			}
-			// move pages
-			$this->Bookmark($toc_name, 0, 0, $page_first);
-			for ($i = 0; $i < $numpages; ++$i) {
-				$this->movePage($page_last, $page);
-			}
-		}
-	}
-
-	/**
-	 * Stores a copy of the current TCPDF object used for undo operation.
-	 * @access public
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	public function startTransaction() {
-		if (isset($this->objcopy)) {
-			// remove previous copy
-			$this->commitTransaction();
-		}
-		// record current page number and Y position
-		$this->start_transaction_page = $this->page;
-		$this->start_transaction_y = $this->y;
-		// clone current object
-		$this->objcopy = $this->objclone($this);
-	}
-
-	/**
-	 * Delete the copy of the current TCPDF object used for undo operation.
-	 * @access public
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	public function commitTransaction() {
-		if (isset($this->objcopy)) {
-			$this->objcopy->_destroy(true, true);
-			unset($this->objcopy);
-		}
-	}
-
-	/**
-	 * This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().
-	 * @param boolean $self if true restores current class object to previous state without the need of reassignment via the returned value.
-	 * @return TCPDF object.
-	 * @access public
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	public function rollbackTransaction($self=false) {
-		if (isset($this->objcopy)) {
-			if (isset($this->objcopy->diskcache) AND $this->objcopy->diskcache) {
-				// truncate files to previous values
-				foreach ($this->objcopy->cache_file_length as $file => $length) {
-					$file = substr($file, 1);
-					$handle = fopen($file, 'r+');
-					ftruncate($handle, $length);
-				}
-			}
-			$this->_destroy(true, true);
-			if ($self) {
-				$objvars = get_object_vars($this->objcopy);
-				foreach ($objvars as $key => $value) {
-					$this->$key = $value;
-				}
-			}
-			return $this->objcopy;
-		}
-		return $this;
-	}
-
-	/**
-	 * Creates a copy of a class object
-	 * @param object $object class object to be cloned
-	 * @return cloned object
-	 * @access public
-	 * @since 4.5.029 (2009-03-19)
-	 */
-	public function objclone($object) {
-		return @clone($object);
-	}
-
-	/**
-	 * Determine whether a string is empty.
-	 * @param string $str string to be checked
-	 * @return boolean true if string is empty
-	 * @access public
-	 * @since 4.5.044 (2009-04-16)
-	 */
-	public function empty_string($str) {
-		return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
-	}
-
-	/**
-	 * Find position of last occurrence of a substring in a string
-	 * @param string $haystack The string to search in.
-	 * @param string $needle substring to search.
-	 * @param int $offset May be specified to begin searching an arbitrary number of characters into the string.
-	 * @return Returns the position where the needle exists. Returns FALSE if the needle was not found.
-	 * @access public
-	 * @since 4.8.038 (2010-03-13)
-	 */
-	public function revstrpos($haystack, $needle, $offset = 0) {
-		$length = strlen($haystack);
-		$offset = ($offset > 0)?($length - $offset):abs($offset);
-		$pos = strpos(strrev($haystack), strrev($needle), $offset);
-		return ($pos === false)?false:($length - $pos - strlen($needle));
-	}
-
-	// --- MULTI COLUMNS METHODS -----------------------
-
-	/**
-	 * Set multiple columns of the same size
-	 * @param int $numcols number of columns (set to zero to disable columns mode)
-	 * @param int $width column width
-	 * @param int $y column starting Y position (leave empty for current Y position)
-	 * @access public
- 	 * @since 4.9.001 (2010-03-28)
-	 */
-	public function setEqualColumns($numcols=0, $width=0, $y='') {
-		$this->columns = array();
-		if ($numcols < 2) {
-			$numcols = 0;
-			$this->columns = array();
-		} else {
-			// maximum column width
-			$maxwidth = ($this->w - $this->original_lMargin - $this->original_rMargin) / $numcols;
-			if (($width == 0) OR ($width > $maxwidth)) {
-				$width = $maxwidth;
-			}
-			if ($this->empty_string($y)) {
-				$y = $this->y;
-			}
-			// space between columns
-			$space = (($this->w - $this->original_lMargin - $this->original_rMargin - ($numcols * $width)) / ($numcols - 1));
-			// fill the columns array (with, space, starting Y position)
-			for ($i = 0; $i < $numcols; ++$i) {
-				$this->columns[$i] = array('w' => $width, 's' => $space, 'y' => $y);
-			}
-		}
-		$this->num_columns = $numcols;
-		$this->current_column = 0;
-		$this->column_start_page = $this->page;
-	}
-
-	/**
-	 * Set columns array.
-	 * Each column is represented by and array with the following keys: (w = width, s = space between columns, y = column top position).
-	 * @param array $columns
-	 * @access public
- 	 * @since 4.9.001 (2010-03-28)
-	 */
-	public function setColumnsArray($columns) {
-		$this->columns = $columns;
-		$this->num_columns = count($columns);
-		$this->current_column = 0;
-		$this->column_start_page = $this->page;
-	}
-
-	/**
-	 * Set position at a given column
-	 * @param int $col column number (from 0 to getNumberOfColumns()-1); empty string = current column.
-	 * @access public
- 	 * @since 4.9.001 (2010-03-28)
-	 */
-	public function selectColumn($col='') {
-		if (is_string($col)) {
-			$col = $this->current_column;
-		} elseif($col >= $this->num_columns) {
-			$col = 0;
-		}
-		$xshift = 0;
-		$enable_thead = false;
-		if ($this->num_columns > 1) {
-			if ($col != $this->current_column) {
-				// move Y pointer at the top of the column
-				if ($this->column_start_page == $this->page) {
-					$this->y = $this->columns[$col]['y'];
-				} else {
-					$this->y = $this->tMargin;
-				}
-				// Avoid to write table headers more than once
-				if (($this->page > $this->maxselcol['page']) OR (($this->page == $this->maxselcol['page']) AND ($col > $this->maxselcol['column']))) {
-					$enable_thead = true;
-					$this->maxselcol['page'] = $this->page;
-					$this->maxselcol['column'] = $col;
-				}
-			}
-			$xshift = $this->colxshift;
-			// set X position of the current column by case
-			$listindent = ($this->listindentlevel * $this->listindent);
-			$colpos = ($col * ($this->columns[$col]['w'] + $this->columns[$col]['s']));
-			if ($this->rtl) {
-				$x = $this->w - $this->original_rMargin - $colpos;
-				$this->rMargin = ($this->w - $x + $listindent);
-				$this->lMargin = ($x - $this->columns[$col]['w']);
-				$this->x = $x - $listindent;
-			} else {
-				$x = $this->original_lMargin + $colpos;
-				$this->lMargin = ($x + $listindent);
-				$this->rMargin = ($this->w - $x - $this->columns[$col]['w']);
-				$this->x = $x + $listindent;
-			}
-			$this->columns[$col]['x'] = $x;
-		}
-		$this->current_column = $col;
-		// fix for HTML mode
-		$this->newline = true;
-		// print HTML table header (if any)
-		if ((!$this->empty_string($this->thead)) AND (!$this->inthead)) {
-			if ($enable_thead) {
-				// print table header
-				$this->writeHTML($this->thead, false, false, false, false, '');
-				$this->y += $xshift['s'];
-				// store end of header position
-				if (!isset($this->columns[$col]['th'])) {
-					$this->columns[$col]['th'] = array();
-				}
-				$this->columns[$col]['th']['\''.$this->page.'\''] = $this->y;
-				$this->lasth = 0;
-			} elseif (isset($this->columns[$col]['th']['\''.$this->page.'\''])) {
-				$this->y = $this->columns[$col]['th']['\''.$this->page.'\''];
-			}
-		}
-		// account for an html table cell over multiple columns
-		if ($this->rtl) {
-			$this->rMargin += $xshift['x'];
-			$this->x -= ($xshift['x'] + $xshift['p']);
-		} else {
-			$this->lMargin += $xshift['x'];
-			$this->x += $xshift['x'] + $xshift['p'];
-		}
-	}
-
-	/**
-	 * Return the current column number
-	 * @return int current column number
-	 * @access public
- 	 * @since 5.5.011 (2010-07-08)
-	 */
-	public function getColumn() {
-		return $this->current_column;
-	}
-
-	/**
-	 * Return the current number of columns.
-	 * @return int number of columns
-	 * @access public
- 	 * @since 5.8.018 (2010-08-25)
-	 */
-	public function getNumberOfColumns() {
-		return $this->num_columns;
-	}
-
-	/**
-	 * Serialize an array of parameters to be used with TCPDF tag in HTML code.
-	 * @param array $pararray parameters array
-	 * @return sting containing serialized data
-	 * @access public
- 	 * @since 4.9.006 (2010-04-02)
-	 */
-	public function serializeTCPDFtagParameters($pararray) {
-		return urlencode(serialize($pararray));
-	}
-
-	/**
-	 * Set Text rendering mode.
-	 * @param int $stroke outline size in user units (0 = disable).
-	 * @param boolean $fill if true fills the text (default).
-	 * @param boolean $clip if true activate clipping mode
-	 * @access public
-	 * @since 4.9.008 (2009-04-02)
-	 */
-	public function setTextRenderingMode($stroke=0, $fill=true, $clip=false) {
-		// Ref.: PDF 32000-1:2008 - 9.3.6 Text Rendering Mode
-		// convert text rendering parameters
-		if ($stroke < 0) {
-			$stroke = 0;
-		}
-		if ($fill === true) {
-			if ($stroke > 0) {
-				if ($clip === true) {
-					// Fill, then stroke text and add to path for clipping
-					$textrendermode = 6;
-				} else {
-					// Fill, then stroke text
-					$textrendermode = 2;
-				}
-				$textstrokewidth = $stroke;
-			} else {
-				if ($clip === true) {
-					// Fill text and add to path for clipping
-					$textrendermode = 4;
-				} else {
-					// Fill text
-					$textrendermode = 0;
-				}
-			}
-		} else {
-			if ($stroke > 0) {
-				if ($clip === true) {
-					// Stroke text and add to path for clipping
-					$textrendermode = 5;
-				} else {
-					// Stroke text
-					$textrendermode = 1;
-				}
-				$textstrokewidth = $stroke;
-			} else {
-				if ($clip === true) {
-					// Add text to path for clipping
-					$textrendermode = 7;
-				} else {
-					// Neither fill nor stroke text (invisible)
-					$textrendermode = 3;
-				}
-			}
-		}
-		$this->textrendermode = $textrendermode;
-		$this->textstrokewidth = $stroke * $this->k;
-	}
-
-	/**
-	 * Returns an array of chars containing soft hyphens.
-	 * @param array $word array of chars
-	 * @param array $patterns Array of hypenation patterns.
-	 * @param array $dictionary Array of words to be returned without applying the hyphenation algoritm.
-	 * @param int $leftmin Minimum number of character to leave on the left of the word without applying the hyphens.
-	 * @param int $rightmin Minimum number of character to leave on the right of the word without applying the hyphens.
-	 * @param int $charmin Minimum word lenght to apply the hyphenation algoritm.
-	 * @param int $charmax Maximum lenght of broken piece of word.
-	 * @return array text with soft hyphens
-	 * @author Nicola Asuni
-	 * @since 4.9.012 (2010-04-12)
-	 * @access protected
-	 */
-	protected function hyphenateWord($word, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
-		$hyphenword = array(); // hyphens positions
-		$numchars = count($word);
-		if ($numchars <= $charmin) {
-			return $word;
-		}
-		$word_string = $this->UTF8ArrSubString($word);
-		// some words will be returned as-is
-		$pattern = '/^([a-zA-Z0-9_\.\-]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/';
-		if (preg_match($pattern, $word_string) > 0) {
-			// email
-			return $word;
-		}
-		$pattern = '/(([a-zA-Z0-9\-]+\.)?)((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/';
-		if (preg_match($pattern, $word_string) > 0) {
-			// URL
-			return $word;
-		}
-		if (isset($dictionary[$word_string])) {
-			return $this->UTF8StringToArray($dictionary[$word_string]);
-		}
-		// suround word with '_' characters
-		$tmpword = array_merge(array(95), $word, array(95));
-		$tmpnumchars = $numchars + 2;
-		$maxpos = $tmpnumchars - $charmin;
-		for ($pos = 0; $pos < $maxpos; ++$pos) {
-			$imax = min(($tmpnumchars - $pos), $charmax);
-			for ($i = $charmin; $i <= $imax; ++$i) {
-				$subword = strtolower($this->UTF8ArrSubString($tmpword, $pos, $pos + $i));
-				if (isset($patterns[$subword])) {
-					$pattern = $this->UTF8StringToArray($patterns[$subword]);
-					$pattern_length = count($pattern);
-					$digits = 1;
-					for ($j = 0; $j < $pattern_length; ++$j) {
-						// check if $pattern[$j] is a number
-						if (($pattern[$j] >= 48) AND ($pattern[$j] <= 57)) {
-							if ($j == 0) {
-								$zero = $pos - 1;
-							} else {
-								$zero = $pos + $j - $digits;
-							}
-							if (!isset($hyphenword[$zero]) OR ($hyphenword[$zero] != $pattern[$j])) {
-								$hyphenword[$zero] = $this->unichr($pattern[$j]);
-							}
-							++$digits;
-						}
-					}
-				}
-			}
-		}
-		$inserted = 0;
-		$maxpos = $numchars - $rightmin;
-		for($i = $leftmin; $i <= $maxpos; ++$i) {
-			if(isset($hyphenword[$i]) AND (($hyphenword[$i] % 2) != 0)) {
-				// 173 = soft hyphen character
-				array_splice($word, $i + $inserted, 0, 173);
-				++$inserted;
-			}
-		}
-		return $word;
-	}
-
-	/**
-	 * Returns an array of hyphenation patterns.
-	 * @param string $file TEX file containing hypenation patterns. TEX pattrns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-	 * @return array of hyphenation patterns
-	 * @author Nicola Asuni
-	 * @since 4.9.012 (2010-04-12)
-	 * @access public
-	 */
-	public function getHyphenPatternsFromTEX($file) {
-		// TEX patterns are available at:
-		// http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-		$data = file_get_contents($file);
-		$patterns = array();
-		// remove comments
-		$data = preg_replace('/\%[^\n]*/', '', $data);
-		// extract the patterns part
-		preg_match('/\\\\patterns\{([^\}]*)\}/i', $data, $matches);
-		$data = trim(substr($matches[0], 10, -1));
-		// extract each pattern
-		$patterns_array = preg_split('/[\s]+/', $data);
-		// create new language array of patterns
-		$patterns = array();
-		foreach($patterns_array as $val) {
-			if (!$this->empty_string($val)) {
-				$val = trim($val);
-				$val = str_replace('\'', '\\\'', $val);
-				$key = preg_replace('/[0-9]+/', '', $val);
-				$patterns[$key] = $val;
-			}
-		}
-		return $patterns;
-	}
-
-	/**
-	 * Returns text with soft hyphens.
-	 * @param string $text text to process
-	 * @param mixed $patterns Array of hypenation patterns or a TEX file containing hypenation patterns. TEX patterns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-	 * @param array $dictionary Array of words to be returned without applying the hyphenation algoritm.
-	 * @param int $leftmin Minimum number of character to leave on the left of the word without applying the hyphens.
-	 * @param int $rightmin Minimum number of character to leave on the right of the word without applying the hyphens.
-	 * @param int $charmin Minimum word lenght to apply the hyphenation algoritm.
-	 * @param int $charmax Maximum lenght of broken piece of word.
-	 * @return array text with soft hyphens
-	 * @author Nicola Asuni
-	 * @since 4.9.012 (2010-04-12)
-	 * @access public
-	 */
-	public function hyphenateText($text, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
-		$text = $this->unhtmlentities($text);
-		$word = array(); // last word
-		$txtarr = array(); // text to be returned
-		$intag = false; // true if we are inside an HTML tag
-		if (!is_array($patterns)) {
-			$patterns = $this->getHyphenPatternsFromTEX($patterns);
-		}
-		// get array of characters
-		$unichars = $this->UTF8StringToArray($text);
-		// for each char
-		foreach ($unichars as $char) {
-			if ((!$intag) AND $this->unicode->uni_type[$char] == 'L') {
-				// letter character
-				$word[] = $char;
-			} else {
-				// other type of character
-				if (!$this->empty_string($word)) {
-					// hypenate the word
-					$txtarr = array_merge($txtarr, $this->hyphenateWord($word, $patterns, $dictionary, $leftmin, $rightmin, $charmin, $charmax));
-					$word = array();
-				}
-				$txtarr[] = $char;
-				if (chr($char) == '<') {
-					// we are inside an HTML tag
-					$intag = true;
-				} elseif ($intag AND (chr($char) == '>')) {
-					// end of HTML tag
-					$intag = false;
-				}
-			}
-		}
-		if (!$this->empty_string($word)) {
-			// hypenate the word
-			$txtarr = array_merge($txtarr, $this->hyphenateWord($word, $patterns, $dictionary, $leftmin, $rightmin, $charmin, $charmax));
-		}
-		// convert char array to string and return
-		return $this->UTF8ArrSubString($txtarr);
-	}
-
-	/**
-	 * Enable/disable rasterization of vector images using ImageMagick library.
-	 * @param boolean $mode if true enable rasterization, false otherwise.
-	 * @access public
-	 * @since 5.0.000 (2010-04-27)
-	 */
-	public function setRasterizeVectorImages($mode) {
-		$this->rasterize_vector_images = $mode;
-	}
-
-	/**
-	 * Get the Path-Painting Operators.
-	 * @param string $style Style of rendering. Possible values are:
-	 * <ul>
-	 *   <li>S or D: Stroke the path.</li>
-	 *   <li>s or d: Close and stroke the path.</li>
-	 *   <li>f or F: Fill the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>f* or F*: Fill the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>B or FD or DF: Fill and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>B* or F*D or DF*: Fill and then stroke the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>b or fd or df: Close, fill, and then stroke the path, using the nonzero winding number rule to determine the region to fill.</li>
-	 *   <li>b or f*d or df*: Close, fill, and then stroke the path, using the even-odd rule to determine the region to fill.</li>
-	 *   <li>CNZ: Clipping mode using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *   <li>CEO: Clipping mode using the nonzero winding number rule to determine which regions lie inside the clipping path</li>
-	 *   <li>n: End the path object without filling or stroking it.</li>
-	 * </ul>
-	 * @param string $default default style
-	 * @param boolean $mode if true enable rasterization, false otherwise.
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.0.000 (2010-04-30)
-	 */
-	protected function getPathPaintOperator($style, $default='S') {
-		$op = '';
-		switch($style) {
-			case 'S':
-			case 'D': {
-				$op = 'S';
-				break;
-			}
-			case 's':
-			case 'd': {
-				$op = 's';
-				break;
-			}
-			case 'f':
-			case 'F': {
-				$op = 'f';
-				break;
-			}
-			case 'f*':
-			case 'F*': {
-				$op = 'f*';
-				break;
-			}
-			case 'B':
-			case 'FD':
-			case 'DF': {
-				$op = 'B';
-				break;
-			}
-			case 'B*':
-			case 'F*D':
-			case 'DF*': {
-				$op = 'B*';
-				break;
-			}
-			case 'b':
-			case 'fd':
-			case 'df': {
-				$op = 'b';
-				break;
-			}
-			case 'b*':
-			case 'f*d':
-			case 'df*': {
-				$op = 'b*';
-				break;
-			}
-			case 'CNZ': {
-				$op = 'W n';
-				break;
-			}
-			case 'CEO': {
-				$op = 'W* n';
-				break;
-			}
-			case 'n': {
-				$op = 'n';
-				break;
-			}
-			default: {
-				if (!empty($default)) {
-					$op = $this->getPathPaintOperator($default, '');
-				} else {
-					$op = '';
-				}
-			}
-		}
-		return $op;
-	}
-
-	/**
-	 * Enable or disable default option for font subsetting.
-	 * @param boolean $enable if true enable font subsetting by default.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.3.002 (2010-06-07)
-	 */
-	public function setFontSubsetting($enable=true) {
-		$this->font_subsetting = $enable ? true : false;
-	}
-
-	/**
-	 * Return the default option for font subsetting.
-	 * @return boolean default font subsetting state.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.3.002 (2010-06-07)
-	 */
-	public function getFontSubsetting() {
-		return $this->font_subsetting;
-	}
-
-	/**
-	 * Left trim the input string
-	 * @param string $str string to trim
-	 * @param string $replace string that replace spaces.
-	 * @return left trimmed string
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	public function stringLeftTrim($str, $replace='') {
-		return preg_replace('/^'.$this->re_space['p'].'+/'.$this->re_space['m'], $replace, $str);
-	}
-
-	/**
-	 * Right trim the input string
-	 * @param string $str string to trim
-	 * @param string $replace string that replace spaces.
-	 * @return right trimmed string
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	public function stringRightTrim($str, $replace='') {
-		return preg_replace('/'.$this->re_space['p'].'+$/'.$this->re_space['m'], $replace, $str);
-	}
-
-	/**
-	 * Trim the input string
-	 * @param string $str string to trim
-	 * @param string $replace string that replace spaces.
-	 * @return trimmed string
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.000 (2010-08-11)
-	 */
-	public function stringTrim($str, $replace='') {
-		$str = $this->stringLeftTrim($str, $replace);
-		$str = $this->stringRightTrim($str, $replace);
-		return $str;
-	}
-
-	/**
-	 * Return true if the current font is unicode type.
-	 * @return true for unicode font, false otherwise.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.002 (2010-08-14)
-	 */
-	public function isUnicodeFont() {
-		return (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0'));
-	}
-
-	/**
-	 * Return normalized font name
-	 * @param string $fontfamily property string containing font family names
-	 * @return string normalized font name
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.004 (2010-08-17)
-	 */
-	public function getFontFamilyName($fontfamily) {
-		// remove spaces and symbols
-		$fontfamily = preg_replace('/[^a-z0-9\,]/', '', strtolower($fontfamily));
-		// extract all font names
-		$fontslist = preg_split('/[,]/', $fontfamily);
-		// find first valid font name
-		foreach ($fontslist as $font) {
-			// replace font variations
-			$font = preg_replace('/italic$/', 'I', $font);
-			$font = preg_replace('/oblique$/', 'I', $font);
-			$font = preg_replace('/bold([I]?)$/', 'B\\1', $font);
-			// replace common family names and core fonts
-			$pattern = array();
-			$replacement = array();
-			$pattern[] = '/^serif|^cursive|^fantasy|^timesnewroman/';
-			$replacement[] = 'times';
-			$pattern[] = '/^sansserif/';
-			$replacement[] = 'helvetica';
-			$pattern[] = '/^monospace/';
-			$replacement[] = 'courier';
-			$font = preg_replace($pattern, $replacement, $font);
-			if (in_array(strtolower($font), $this->fontlist) OR in_array($font, $this->fontkeys)) {
-				return $font;
-			}
-		}
-		// return current font as default
-		return $this->CurrentFont['fontkey'];
-	}
-
-	/**
-	 * Start a new XObject Template.
-	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
-	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * Note: X,Y coordinates will be reset to 0,0.
-	 * @param int $w Template width in user units (empty string or zero = page width less margins)
-	 * @param int $h Template height in user units (empty string or zero = page height less margins)
-	 * @return int the XObject Template ID in case of success or false in case of error.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.017 (2010-08-24)
-	 * @see endTemplate(), printTemplate()
-	 */
-	public function startTemplate($w=0, $h=0) {
-		if ($this->inxobj) {
-			// we are already inside an XObject template
-			return false;
-		}
-		$this->inxobj = true;
-		++$this->n;
-		// XObject ID
-		$this->xobjid = 'XT'.$this->n;
-		// object ID
-		$this->xobjects[$this->xobjid] = array('n' => $this->n);
-		// store current graphic state
-		$this->xobjects[$this->xobjid]['gvars'] = $this->getGraphicVars();
-		// initialize data
-		$this->xobjects[$this->xobjid]['intmrk'] = 0;
-		$this->xobjects[$this->xobjid]['transfmrk'] = array();
-		$this->xobjects[$this->xobjid]['outdata'] = '';
-		$this->xobjects[$this->xobjid]['xobjects'] = array();
-		$this->xobjects[$this->xobjid]['images'] = array();
-		$this->xobjects[$this->xobjid]['fonts'] = array();
-		$this->xobjects[$this->xobjid]['annotations'] = array();
-		// set new environment
-		$this->num_columns = 1;
-		$this->current_column = 0;
-		$this->SetAutoPageBreak(false);
-		if (($w === '') OR ($w <= 0)) {
-			$w = $this->w - $this->lMargin - $this->rMargin;
-		}
-		if (($h === '') OR ($h <= 0)) {
-			$h = $this->h - $this->tMargin - $this->bMargin;
-		}
-		$this->xobjects[$this->xobjid]['x'] = 0;
-		$this->xobjects[$this->xobjid]['y'] = 0;
-		$this->xobjects[$this->xobjid]['w'] = $w;
-		$this->xobjects[$this->xobjid]['h'] = $h;
-		$this->w = $w;
-		$this->h = $h;
-		$this->wPt = $this->w * $this->k;
-		$this->hPt = $this->h * $this->k;
-		$this->fwPt = $this->wPt;
-		$this->fhPt = $this->hPt;
-		$this->x = 0;
-		$this->y = 0;
-		$this->lMargin = 0;
-		$this->rMargin = 0;
-		$this->tMargin = 0;
-		$this->bMargin = 0;
-		return $this->xobjid;
-	}
-
-	/**
-	 * End the current XObject Template started with startTemplate() and restore the previous graphic state.
-	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
-	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * @return int the XObject Template ID in case of success or false in case of error.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.017 (2010-08-24)
-	 * @see startTemplate(), printTemplate()
-	 */
-	public function endTemplate() {
-		if (!$this->inxobj) {
-			// we are not inside a template
-			return false;
-		}
-		$this->inxobj = false;
-		// restore previous graphic state
-		$this->setGraphicVars($this->xobjects[$this->xobjid]['gvars'], true);
-		return $this->xobjid;
-	}
-
-	/**
-	 * Print an XObject Template.
-	 * You can print an XObject Template inside the currently opened Template.
-	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
-	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * @param string $id The ID of XObject Template to print.
-	 * @param int $x X position in user units (empty string = current x position)
-	 * @param int $y Y position in user units (empty string = current y position)
-	 * @param int $w Width in user units (zero = remaining page width)
-	 * @param int $h Height in user units (zero = remaining page height)
-	 * @param string $align Indicates the alignment of the pointer next to template insertion relative to template height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param string $palign Allows to center or align the template on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param boolean $fitonpage if true the template is resized to not exceed page dimensions.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.8.017 (2010-08-24)
-	 * @see startTemplate(), endTemplate()
-	 */
-	public function printTemplate($id, $x='', $y='', $w=0, $h=0, $align='', $palign='', $fitonpage=false) {
-		if (!isset($this->xobjects[$id])) {
-			$this->Error('The XObject Template \''.$id.'\' doesn\'t exist!');
-		}
-		if ($this->inxobj) {
-			if ($id == $this->xobjid) {
-				// close current template
-				$this->endTemplate();
-			} else {
-				// use the template as resource for the template currently opened
-				$this->xobjects[$this->xobjid]['xobjects'][$id] = $this->xobjects[$id];
-			}
-		}
-		// set default values
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($h, $x, $y);
-		$ow = $this->xobjects[$id]['w'];
-		$oh = $this->xobjects[$id]['h'];
-		// calculate template width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			$w = $ow;
-			$h = $oh;
-		} elseif ($w <= 0) {
-			$w = $h * $ow / $oh;
-		} elseif ($h <= 0) {
-			$h = $w * $oh / $ow;
-		}
-		// fit the template on available space
-		$this->fitBlock($w, $h, $x, $y, $fitonpage);
-		// set page alignment
-		$rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$xt = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$xt = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$xt = $this->w - $this->rMargin - $w;
-			} else {
-				$xt = $x - $w;
-			}
-			$rb_x = $xt;
-		} else {
-			if ($palign == 'L') {
-				$xt = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$xt = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$xt = $this->w - $this->rMargin - $w;
-			} else {
-				$xt = $x;
-			}
-			$rb_x = $xt + $w;
-		}
-		// print XObject Template + Transformation matrix
-		$this->StartTransform();
-		// translate and scale
-		$sx = ($w / $this->xobjects[$id]['w']);
-		$sy = ($h / $this->xobjects[$id]['h']);
-		$tm = array();
-		$tm[0] = $sx;
-		$tm[1] = 0;
-		$tm[2] = 0;
-		$tm[3] = $sy;
-		$tm[4] = $xt * $this->k;
-		$tm[5] = ($this->h - $h - $y) * $this->k;
-		$this->Transform($tm);
-		// set object
-		$this->_out('/'.$id.' Do');
-		$this->StopTransform();
-		// add annotations
-		if (!empty($this->xobjects[$id]['annotations'])) {
-			foreach ($this->xobjects[$id]['annotations'] as $annot) {
-				// transform original coordinates
-				$coordlt = $this->getTransformationMatrixProduct($tm, array(1, 0, 0, 1, ($annot['x'] * $this->k), (-$annot['y'] * $this->k)));
-				$ax = ($coordlt[4] / $this->k);
-				$ay = ($this->h - $h - ($coordlt[5] / $this->k));
-				$coordrb = $this->getTransformationMatrixProduct($tm, array(1, 0, 0, 1, (($annot['x'] + $annot['w']) * $this->k), ((-$annot['y'] - $annot['h']) * $this->k)));
-				$aw = ($coordrb[4] / $this->k) - $ax;
-				$ah = ($this->h - $h - ($coordrb[5] / $this->k)) - $ay;
-				$this->Annotation($ax, $ay, $aw, $ah, $annot['text'], $annot['opt'], $annot['spaces']);
-			}
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T': {
-				$this->y = $y;
-				$this->x = $rb_x;
-				break;
-			}
-			case 'M': {
-				$this->y = $y + round($h/2);
-				$this->x = $rb_x;
-				break;
-			}
-			case 'B': {
-				$this->y = $rb_y;
-				$this->x = $rb_x;
-				break;
-			}
-			case 'N': {
-				$this->SetY($rb_y);
-				break;
-			}
-			default:{
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Set the percentage of character stretching.
-	 * @param int $perc percentage of stretching (100 = no stretching)
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function setFontStretching($perc=100) {
-		$this->font_stretching = $perc;
-	}
-
-	/**
-	 * Get the percentage of character stretching.
-	 * @return float stretching value
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function getFontStretching() {
-		return $this->font_stretching;
-	}
-
-	/**
-	 * Set the amount to increase or decrease the space between characters in a text.
-	 * @param float $spacing amount to increase or decrease the space between characters in a text (0 = default spacing)
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function setFontSpacing($spacing=0) {
-		$this->font_spacing = $spacing;
-	}
-
-	/**
-	 * Get the amount to increase or decrease the space between characters in a text.
-	 * @return int font spacing (tracking/kerning) value
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.000 (2010-09-29)
-	 */
-	public function getFontSpacing() {
-		return $this->font_spacing;
-	}
-
-	/**
-	 * Return an array of no-write page regions
-	 * @return array of no-write page regions
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see setPageRegions(), addPageRegion()
-	 */
-	public function getPageRegions() {
-		return $this->page_regions;
-	}
-
-	/**
-	 * Set no-write regions on page.
-	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
-	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
-	 * You can set multiple regions for the same page.
-	 * @param array $regions array of no-write regions. For each region you can define an array as follow: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right). Omit this parameter to remove all regions.
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see addPageRegion(), getPageRegions()
-	 */
-	public function setPageRegions($regions=array()) {
-		// empty current regions array
-		$this->page_regions = array();
-		// add regions
-		foreach ($regions as $data) {
-			$this->addPageRegion($data);
-		}
-	}
-
-	/**
-	 * Add a single no-write region on selected page.
-	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
-	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
-	 * You can set multiple regions for the same page.
-	 * @param array $region array of a single no-write region array: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right).
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see setPageRegions(), getPageRegions()
-	 */
-	public function addPageRegion($region) {
-		if (!isset($region['page']) OR empty($region['page'])) {
-			$region['page'] = $this->page;
-		}
-		if (isset($region['xt']) AND isset($region['xb']) AND ($region['xt'] > 0) AND ($region['xb'] > 0)
-			AND isset($region['yt'])  AND isset($region['yb']) AND ($region['yt'] >= 0) AND ($region['yt'] < $region['yb'])
-			AND isset($region['side']) AND (($region['side'] == 'L') OR ($region['side'] == 'R'))) {
-			$this->page_regions[] = $region;
-		}
-	}
-
-	/**
-	 * Remove a single no-write region.
-	 * @param int $key region key
-	 * @author Nicola Asuni
-	 * @access public
-	 * @since 5.9.003 (2010-10-13)
-	 * @see setPageRegions(), getPageRegions()
-	 */
-	public function removePageRegion($key) {
-		if (isset($this->page_regions[$key])) {
-			unset($this->page_regions[$key]);
-		}
-	}
-
-	/**
-	 * Check page for no-write regions and adapt current coordinates and page margins if necessary.
-	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
-	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
-	 * @param float $h height of the text/image/object to print in user units
-	 * @param float $x current X coordinate in user units
-	 * @param float $y current Y coordinate in user units
-	 * @author Nicola Asuni
-	 * @access protected
-	 * @since 5.9.003 (2010-10-13)
-	 */
-	protected function checkPageRegions($h=0, &$x='', &$y='') {
-		// set default values
-		if ($x === '') {
-			$x = &$this->x;
-		}
-		if ($y === '') {
-			$y = &$this->y;
-		}
-		if (empty($this->page_regions)) {
-			// no page regions defined
-			return;
-		}
-		if (empty($h)) {
-			$h = ($this->FontSize * $this->cell_height_ratio) + $this->cell_padding['T'] + $this->cell_padding['B'];
-		}
-		if ($this->rtl) {
-			$this->lMargin = $this->original_lMargin;
-		} else {
-			$this->rMargin = $this->original_rMargin;
-		}
-		if ($this->AutoPageBreak AND !$this->InFooter AND (($y + $h) > $this->PageBreakTrigger)) {
-			// the content will be printed on a new page
-			return;
-		}
-		// adjust coordinates and page margins
-		foreach ($this->page_regions as $regid => $regdata) {
-			if ($regdata['page'] == $this->page) {
-				// check region boundaries
-				if (($y > ($regdata['yt'] - $h)) AND ($y <= $regdata['yb'])) {
-					// Y is inside the region
-					$minv = ($regdata['xb'] - $regdata['xt']) / ($regdata['yb'] - $regdata['yt']); // inverse of angular coefficient
-					$yt = max($y, $regdata['yt']);
-					$yb = min(($yt + $h), $regdata['yb']);
-					$xt = (($yt - $regdata['yt']) * $minv) + $regdata['xt'];
-					$xb = (($yb - $regdata['yt']) * $minv) + $regdata['xt'];
-					if ($regdata['side'] == 'L') { // left side
-						$new_margin = max($xt, $xb);
-						if ($this->lMargin < $new_margin) {
-							if ($this->rtl) {
-								// adjust left page margin
-								$this->lMargin = $new_margin;
-							}
-							if ($x < $new_margin) {
-								// adjust x position
-								$x = $new_margin;
-							}
-						}
-					} elseif ($regdata['side'] == 'R') { // right side
-						$new_margin = min($xt, $xb);
-						if (($this->w - $this->rMargin) > $new_margin) {
-							if (!$this->rtl) {
-								// adjust right page margin
-								$this->rMargin = ($this->w - $new_margin);
-							}
-							if ($x > $new_margin) {
-								// adjust x position
-								$x = $new_margin;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-	// SVG METHODS
-	// -.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-
-
-	/**
-	 * Embedd a Scalable Vector Graphics (SVG) image.
-	 * NOTE: SVG standard is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
-	 * @param string $file Name of the SVG file.
-	 * @param float $x Abscissa of the upper-left corner.
-	 * @param float $y Ordinate of the upper-left corner.
-	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param mixed $link URL or identifier returned by AddLink().
-	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul> If the alignment is an empty string, then the pointer will be restored on the starting SVG position.
-	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access public
-	 */
-	public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $palign='', $border=0, $fitonpage=false) {
-		if ($this->rasterize_vector_images AND ($w > 0) AND ($h > 0)) {
-			// convert SVG to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false);
-		}
-		$this->svgdir = dirname($file);
-		$svgdata = file_get_contents($file);
-		if ($svgdata === false) {
-			$this->Error('SVG file not found: '.$file);
-		}
-		if ($x === '') {
-			$x = $this->x;
-		}
-		if ($y === '') {
-			$y = $this->y;
-		}
-		// check page for no-write regions and adapt page margins if necessary
-		$this->checkPageRegions($x, $y);
-		$k = $this->k;
-		$ox = 0;
-		$oy = 0;
-		$ow = $w;
-		$oh = $h;
-		$aspect_ratio_align = 'xMidYMid';
-		$aspect_ratio_ms = 'meet';
-		$regs = array();
-		// get original image width and height
-		preg_match('/<svg([^\>]*)>/si', $svgdata, $regs);
-		if (isset($regs[1]) AND !empty($regs[1])) {
-			$tmp = array();
-			if (preg_match('/[\s]+x[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$ox = $this->getHTMLUnitToUnits($tmp[1], 0, $this->svgunit, false);
-			}
-			$tmp = array();
-			if (preg_match('/[\s]+y[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$oy = $this->getHTMLUnitToUnits($tmp[1], 0, $this->svgunit, false);
-			}
-			$tmp = array();
-			if (preg_match('/[\s]+width[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$ow = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-			}
-			$tmp = array();
-			if (preg_match('/[\s]+height[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-				$oh = $this->getHTMLUnitToUnits($tmp[1], 1, $this->svgunit, false);
-			}
-			$tmp = array();
-			$view_box = array();
-			if (preg_match('/[\s]+viewBox[\s]*=[\s]*"[\s]*([0-9\.\-]+)[\s]+([0-9\.\-]+)[\s]+([0-9\.]+)[\s]+([0-9\.]+)[\s]*"/si', $regs[1], $tmp)) {
-				if (count($tmp) == 5) {
-					array_shift($tmp);
-					foreach ($tmp as $key => $val) {
-						$view_box[$key] = $this->getHTMLUnitToUnits($val, 0, $this->svgunit, false);
-					}
-					$ox = $view_box[0];
-					$oy = $view_box[1];
-				}
-				// get aspect ratio
-				$tmp = array();
-				if (preg_match('/[\s]+preserveAspectRatio[\s]*=[\s]*"([^"]*)"/si', $regs[1], $tmp)) {
-					$aspect_ratio = preg_split('/[\s]+/si', $tmp[1]);
-					switch (count($aspect_ratio)) {
-						case 3: {
-							$aspect_ratio_align = $aspect_ratio[1];
-							$aspect_ratio_ms = $aspect_ratio[2];
-							break;
-						}
-						case 2: {
-							$aspect_ratio_align = $aspect_ratio[0];
-							$aspect_ratio_ms = $aspect_ratio[1];
-							break;
-						}
-						case 1: {
-							$aspect_ratio_align = $aspect_ratio[0];
-							$aspect_ratio_ms = 'meet';
-							break;
-						}
-					}
-				}
-			}
-		}
-		// calculate image width and height on document
-		if (($w <= 0) AND ($h <= 0)) {
-			// convert image size to document unit
-			$w = $ow;
-			$h = $oh;
-		} elseif ($w <= 0) {
-			$w = $h * $ow / $oh;
-		} elseif ($h <= 0) {
-			$h = $w * $oh / $ow;
-		}
-		// fit the image on available space
-		$this->fitBlock($w, $h, $x, $y, $fitonpage);
-		if ($this->rasterize_vector_images) {
-			// convert SVG to raster image using GD or ImageMagick libraries
-			return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false);
-		}
-		// set alignment
-		$this->img_rb_y = $y + $h;
-		// set alignment
-		if ($this->rtl) {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x - $w;
-			}
-			$this->img_rb_x = $ximg;
-		} else {
-			if ($palign == 'L') {
-				$ximg = $this->lMargin;
-			} elseif ($palign == 'C') {
-				$ximg = ($this->w + $this->lMargin - $this->rMargin - $w) / 2;
-			} elseif ($palign == 'R') {
-				$ximg = $this->w - $this->rMargin - $w;
-			} else {
-				$ximg = $x;
-			}
-			$this->img_rb_x = $ximg + $w;
-		}
-		// store current graphic vars
-		$gvars = $this->getGraphicVars();
-		// store SVG position and scale factors
-		$svgoffset_x = ($ximg - $ox) * $this->k;
-		$svgoffset_y = -($y - $oy) * $this->k;
-		if (isset($view_box[2]) AND ($view_box[2] > 0) AND ($view_box[3] > 0)) {
-			$ow = $view_box[2];
-			$oh = $view_box[3];
-		}
-		$svgscale_x = $w / $ow;
-		$svgscale_y = $h / $oh;
-		// scaling and alignment
-		if ($aspect_ratio_align != 'none') {
-			// store current scaling values
-			$svgscale_old_x = $svgscale_x;
-			$svgscale_old_y = $svgscale_y;
-			// force uniform scaling
-			if ($aspect_ratio_ms == 'slice') {
-				// the entire viewport is covered by the viewBox
-				if ($svgscale_x > $svgscale_y) {
-					$svgscale_y = $svgscale_x;
-				} elseif ($svgscale_x < $svgscale_y) {
-					$svgscale_x = $svgscale_y;
-				}
-			} else { // meet
-				// the entire viewBox is visible within the viewport
-				if ($svgscale_x < $svgscale_y) {
-					$svgscale_y = $svgscale_x;
-				} elseif ($svgscale_x > $svgscale_y) {
-					$svgscale_x = $svgscale_y;
-				}
-			}
-			// correct X alignment
-			switch (substr($aspect_ratio_align, 1, 3)) {
-				case 'Min': {
-					// do nothing
-					break;
-				}
-				case 'Max': {
-					$svgoffset_x += (($w * $this->k) - ($ow * $this->k * $svgscale_x));
-					break;
-				}
-				default:
-				case 'Mid': {
-					$svgoffset_x += ((($w * $this->k) - ($ow * $this->k * $svgscale_x)) / 2);
-					break;
-				}
-			}
-			// correct Y alignment
-			switch (substr($aspect_ratio_align, 5)) {
-				case 'Min': {
-					// do nothing
-					break;
-				}
-				case 'Max': {
-					$svgoffset_y -= (($h * $this->k) - ($oh * $this->k * $svgscale_y));
-					break;
-				}
-				default:
-				case 'Mid': {
-					$svgoffset_y -= ((($h * $this->k) - ($oh * $this->k * $svgscale_y)) / 2);
-					break;
-				}
-			}
-		}
-		// store current page break mode
-		$page_break_mode = $this->AutoPageBreak;
-		$page_break_margin = $this->getBreakMargin();
-		$cell_padding = $this->cell_padding;
-		$this->SetCellPadding(0);
-		$this->SetAutoPageBreak(false);
-		// save the current graphic state
-		$this->_out('q'.$this->epsmarker);
-		// set initial clipping mask
-		$this->Rect($x, $y, $w, $h, 'CNZ', array(), array());
-		// scale and translate
-		$e = $ox * $this->k * (1 - $svgscale_x);
-		$f = ($this->h - $oy) * $this->k * (1 - $svgscale_y);
-		$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $svgscale_x, 0, 0, $svgscale_y, $e + $svgoffset_x, $f + $svgoffset_y));
-		// creates a new XML parser to be used by the other XML functions
-		$this->parser = xml_parser_create('UTF-8');
-		// the following function allows to use parser inside object
-		xml_set_object($this->parser, $this);
-		// disable case-folding for this XML parser
-		xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-		// sets the element handler functions for the XML parser
-		xml_set_element_handler($this->parser, 'startSVGElementHandler', 'endSVGElementHandler');
-		// sets the character data handler function for the XML parser
-		xml_set_character_data_handler($this->parser, 'segSVGContentHandler');
-		// start parsing an XML document
-		if(!xml_parse($this->parser, $svgdata)) {
-			$error_message = sprintf("SVG Error: %s at line %d", xml_error_string(xml_get_error_code($this->parser)), xml_get_current_line_number($this->parser));
-			$this->Error($error_message);
-		}
-		// free this XML parser
-		xml_parser_free($this->parser);
-		// restore previous graphic state
-		$this->_out($this->epsmarker.'Q');
-		// restore graphic vars
-		$this->setGraphicVars($gvars);
-		$this->lasth = $gvars['lasth'];
-		if (!empty($border)) {
-			$bx = $this->x;
-			$by = $this->y;
-			$this->x = $ximg;
-			if ($this->rtl) {
-				$this->x += $w;
-			}
-			$this->y = $y;
-			$this->Cell($w, $h, '', $border, 0, '', 0, '', 0, true);
-			$this->x = $bx;
-			$this->y = $by;
-		}
-		if ($link) {
-			$this->Link($ximg, $y, $w, $h, $link, 0);
-		}
-		// set pointer to align the next text/objects
-		switch($align) {
-			case 'T':{
-				$this->y = $y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'M':{
-				$this->y = $y + round($h/2);
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'B':{
-				$this->y = $this->img_rb_y;
-				$this->x = $this->img_rb_x;
-				break;
-			}
-			case 'N':{
-				$this->SetY($this->img_rb_y);
-				break;
-			}
-			default:{
-				// restore pointer to starting position
-				$this->x = $gvars['x'];
-				$this->y = $gvars['y'];
-				$this->page = $gvars['page'];
-				$this->current_column = $gvars['current_column'];
-				$this->tMargin = $gvars['tMargin'];
-				$this->bMargin = $gvars['bMargin'];
-				$this->w = $gvars['w'];
-				$this->h = $gvars['h'];
-				$this->wPt = $gvars['wPt'];
-				$this->hPt = $gvars['hPt'];
-				$this->fwPt = $gvars['fwPt'];
-				$this->fhPt = $gvars['fhPt'];
-				break;
-			}
-		}
-		$this->endlinex = $this->img_rb_x;
-		// restore page break
-		$this->SetAutoPageBreak($page_break_mode, $page_break_margin);
-		$this->cell_padding = $cell_padding;
-	}
-
-	/**
-	 * Get the tranformation matrix from SVG transform attribute
-	 * @param string transformation
-	 * @return array of transformations
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access protected
-	 */
-	protected function getSVGTransformMatrix($attribute) {
-		// identity matrix
-		$tm = array(1, 0, 0, 1, 0, 0);
-		$transform = array();
-		if (preg_match_all('/(matrix|translate|scale|rotate|skewX|skewY)[\s]*\(([^\)]+)\)/si', $attribute, $transform, PREG_SET_ORDER) > 0) {
-			foreach ($transform as $key => $data) {
-				if (!empty($data[2])) {
-					$a = 1;
-					$b = 0;
-					$c = 0;
-					$d = 1;
-					$e = 0;
-					$f = 0;
-					$regs = array();
-					switch ($data[1]) {
-						case 'matrix': {
-							if (preg_match('/([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$a = $regs[1];
-								$b = $regs[2];
-								$c = $regs[3];
-								$d = $regs[4];
-								$e = $regs[5];
-								$f = $regs[6];
-							}
-							break;
-						}
-						case 'translate': {
-							if (preg_match('/([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$e = $regs[1];
-								$f = $regs[2];
-							} elseif (preg_match('/([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$e = $regs[1];
-							}
-							break;
-						}
-						case 'scale': {
-							if (preg_match('/([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$a = $regs[1];
-								$d = $regs[2];
-							} elseif (preg_match('/([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$a = $regs[1];
-								$d = $a;
-							}
-							break;
-						}
-						case 'rotate': {
-							if (preg_match('/([0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)[\,\s]+([a-z0-9\-\.]+)/si', $data[2], $regs)) {
-								$ang = deg2rad($regs[1]);
-								$x = $regs[2];
-								$y = $regs[3];
-								$a = cos($ang);
-								$b = sin($ang);
-								$c = -$b;
-								$d = $a;
-								$e = ($x * (1 - $a)) - ($y * $c);
-								$f = ($y * (1 - $d)) - ($x * $b);
-							} elseif (preg_match('/([0-9\-\.]+)/si', $data[2], $regs)) {
-								$ang = deg2rad($regs[1]);
-								$a = cos($ang);
-								$b = sin($ang);
-								$c = -$b;
-								$d = $a;
-								$e = 0;
-								$f = 0;
-							}
-							break;
-						}
-						case 'skewX': {
-							if (preg_match('/([0-9\-\.]+)/si', $data[2], $regs)) {
-								$c = tan(deg2rad($regs[1]));
-							}
-							break;
-						}
-						case 'skewY': {
-							if (preg_match('/([0-9\-\.]+)/si', $data[2], $regs)) {
-								$b = tan(deg2rad($regs[1]));
-							}
-							break;
-						}
-					}
-					$tm = $this->getTransformationMatrixProduct($tm, array($a, $b, $c, $d, $e, $f));
-				}
-			}
-		}
-		return $tm;
-	}
-
-	/**
-	 * Get the product of two SVG tranformation matrices
-	 * @param array $ta first SVG tranformation matrix
-	 * @param array $tb second SVG tranformation matrix
-	 * @return transformation array
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access protected
-	 */
-	protected function getTransformationMatrixProduct($ta, $tb) {
-		$tm = array();
-		$tm[0] = ($ta[0] * $tb[0]) + ($ta[2] * $tb[1]);
-		$tm[1] = ($ta[1] * $tb[0]) + ($ta[3] * $tb[1]);
-		$tm[2] = ($ta[0] * $tb[2]) + ($ta[2] * $tb[3]);
-		$tm[3] = ($ta[1] * $tb[2]) + ($ta[3] * $tb[3]);
-		$tm[4] = ($ta[0] * $tb[4]) + ($ta[2] * $tb[5]) + $ta[4];
-		$tm[5] = ($ta[1] * $tb[4]) + ($ta[3] * $tb[5]) + $ta[5];
-		return $tm;
-	}
-
-	/**
-	 * Convert SVG transformation matrix to PDF.
-	 * @param array $tm original SVG transformation matrix
-	 * @return array transformation matrix
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected function convertSVGtMatrix($tm) {
-		$a = $tm[0];
-		$b = -$tm[1];
-		$c = -$tm[2];
-		$d = $tm[3];
-		$e = $this->getHTMLUnitToUnits($tm[4], 1, $this->svgunit, false) * $this->k;
-		$f = -$this->getHTMLUnitToUnits($tm[5], 1, $this->svgunit, false) * $this->k;
-		$x = 0;
-		$y = $this->h * $this->k;
-		$e = ($x * (1 - $a)) - ($y * $c) + $e;
-		$f = ($y * (1 - $d)) - ($x * $b) + $f;
-		return array($a, $b, $c, $d, $e, $f);
-	}
-
-	/**
-	 * Apply SVG graphic transformation matrix.
-	 * @param array $tm original SVG transformation matrix
-	 * @access protected
-	 * @since 5.0.000 (2010-05-02)
-	 */
-	protected function SVGTransform($tm) {
-		$this->Transform($this->convertSVGtMatrix($tm));
-	}
-
-	/**
-	 * Apply the requested SVG styles (*** TO BE COMPLETED ***)
-	 * @param array $svgstyle array of SVG styles to apply
-	 * @param array $prevsvgstyle array of previous SVG style
-	 * @param int $x X origin of the bounding box
-	 * @param int $y Y origin of the bounding box
-	 * @param int $w width of the bounding box
-	 * @param int $h height of the bounding box
-	 * @param string $clip_function clip function
-	 * @param array $clip_params array of parameters for clipping function
-	 * @return object style
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access protected
-	 */
-	protected function setSVGStyles($svgstyle, $prevsvgstyle, $x=0, $y=0, $w=1, $h=1, $clip_function='', $clip_params=array()) {
-		$objstyle = '';
-		if(!isset($svgstyle['opacity'])) {
-			return $objstyle;
-		}
-		// clip-path
-		$regs = array();
-		if (preg_match('/url\([\s]*\#([^\)]*)\)/si', $svgstyle['clip-path'], $regs)) {
-			$clip_path = $this->svgclippaths[$regs[1]];
-			foreach ($clip_path as $cp) {
-				$this->startSVGElementHandler('clip-path', $cp['name'], $cp['attribs'], $cp['tm']);
-			}
-		}
-		// opacity
-		if ($svgstyle['opacity'] != 1) {
-			$this->SetAlpha($svgstyle['opacity']);
-		}
-		// color
-		$fill_color = $this->convertHTMLColorToDec($svgstyle['color']);
-		$this->SetFillColorArray($fill_color);
-		// text color
-		$text_color = $this->convertHTMLColorToDec($svgstyle['text-color']);
-		$this->SetTextColorArray($text_color);
-		// clip
-		if (preg_match('/rect\(([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)\)/si', $svgstyle['clip'], $regs)) {
-			$top = (isset($regs[1])?$this->getHTMLUnitToUnits($regs[1], 0, $this->svgunit, false):0);
-			$right = (isset($regs[2])?$this->getHTMLUnitToUnits($regs[2], 0, $this->svgunit, false):0);
-			$bottom = (isset($regs[3])?$this->getHTMLUnitToUnits($regs[3], 0, $this->svgunit, false):0);
-			$left = (isset($regs[4])?$this->getHTMLUnitToUnits($regs[4], 0, $this->svgunit, false):0);
-			$cx = $x + $left;
-			$cy = $y + $top;
-			$cw = $w - $left - $right;
-			$ch = $h - $top - $bottom;
-			if ($svgstyle['clip-rule'] == 'evenodd') {
-				$clip_rule = 'CNZ';
-			} else {
-				$clip_rule = 'CEO';
-			}
-			$this->Rect($cx, $cy, $cw, $ch, $clip_rule, array(), array());
-		}
-		// fill
-		$regs = array();
-		if (preg_match('/url\([\s]*\#([^\)]*)\)/si', $svgstyle['fill'], $regs)) {
-			// gradient
-			$gradient = $this->svggradients[$regs[1]];
-			if (isset($gradient['xref'])) {
-				// reference to another gradient definition
-				$newgradient = $this->svggradients[$gradient['xref']];
-				$newgradient['coords'] = $gradient['coords'];
-				$newgradient['mode'] = $gradient['mode'];
-				$newgradient['gradientUnits'] = $gradient['gradientUnits'];
-				if (isset($gradient['gradientTransform'])) {
-					$newgradient['gradientTransform'] = $gradient['gradientTransform'];
-				}
-				$gradient = $newgradient;
-			}
-			//save current Graphic State
-			$this->_out('q');
-			//set clipping area
-			if (!empty($clip_function) AND method_exists($this, $clip_function)) {
-				$bbox = call_user_func_array(array($this, $clip_function), $clip_params);
-				if (is_array($bbox) AND (count($bbox) == 4)) {
-					list($x, $y, $w, $h) = $bbox;
-				}
-			}
-			if ($gradient['mode'] == 'measure') {
-				if (isset($gradient['gradientTransform']) AND !empty($gradient['gradientTransform'])) {
-					$gtm = $gradient['gradientTransform'];
-					// apply transformation matrix
-					$xa = ($gtm[0] * $gradient['coords'][0]) + ($gtm[2] * $gradient['coords'][1]) + $gtm[4];
-					$ya = ($gtm[1] * $gradient['coords'][0]) + ($gtm[3] * $gradient['coords'][1]) + $gtm[5];
-					$xb = ($gtm[0] * $gradient['coords'][2]) + ($gtm[2] * $gradient['coords'][3]) + $gtm[4];
-					$yb = ($gtm[1] * $gradient['coords'][2]) + ($gtm[3] * $gradient['coords'][3]) + $gtm[5];
-					if (isset($gradient['coords'][4])) {
-						$gradient['coords'][4] = sqrt(pow(($gtm[0] * $gradient['coords'][4]), 2) + pow(($gtm[1] * $gradient['coords'][4]), 2));
-					}
-					$gradient['coords'][0] = $xa;
-					$gradient['coords'][1] = $ya;
-					$gradient['coords'][2] = $xb;
-					$gradient['coords'][3] = $yb;
-
-				}
-				// convert SVG coordinates to user units
-				$gradient['coords'][0] = $this->getHTMLUnitToUnits($gradient['coords'][0], 0, $this->svgunit, false);
-				$gradient['coords'][1] = $this->getHTMLUnitToUnits($gradient['coords'][1], 0, $this->svgunit, false);
-				$gradient['coords'][2] = $this->getHTMLUnitToUnits($gradient['coords'][2], 0, $this->svgunit, false);
-				$gradient['coords'][3] = $this->getHTMLUnitToUnits($gradient['coords'][3], 0, $this->svgunit, false);
-				if (isset($gradient['coords'][4])) {
-					$gradient['coords'][4] = $this->getHTMLUnitToUnits($gradient['coords'][4], 0, $this->svgunit, false);
-				}
-				// shift units
-				if ($gradient['gradientUnits'] == 'objectBoundingBox') {
-					// convert to SVG coordinate system
-					$gradient['coords'][0] += $x;
-					$gradient['coords'][1] += $y;
-					$gradient['coords'][2] += $x;
-					$gradient['coords'][3] += $y;
-				}
-				// calculate percentages
-				$gradient['coords'][0] = ($gradient['coords'][0] - $x) / $w;
-				$gradient['coords'][1] = ($gradient['coords'][1] - $y) / $h;
-				$gradient['coords'][2] = ($gradient['coords'][2] - $x) / $w;
-				$gradient['coords'][3] = ($gradient['coords'][3] - $y) / $h;
-				if (isset($gradient['coords'][4])) {
-					$gradient['coords'][4] /= $w;
-				}
-				// fix values
-				foreach($gradient['coords'] as $key => $val) {
-					if ($val < 0) {
-						$gradient['coords'][$key] = 0;
-					} elseif ($val > 1) {
-						$gradient['coords'][$key] = 1;
-					}
-				}
-				if (($gradient['type'] == 2) AND ($gradient['coords'][0] == $gradient['coords'][2]) AND ($gradient['coords'][1] == $gradient['coords'][3])) {
-					// single color (no shading)
-					$gradient['coords'][0] = 1;
-					$gradient['coords'][1] = 0;
-					$gradient['coords'][2] = 0.999;
-					$gradient['coords'][3] = 0;
-				}
-			}
-			// swap Y coordinates
-			$tmp = $gradient['coords'][1];
-			$gradient['coords'][1] = $gradient['coords'][3];
-			$gradient['coords'][3] = $tmp;
-			// set transformation map for gradient
-			if (($gradient['type'] == 3) AND ($gradient['mode'] == 'measure')) {
-				// gradient is always circular
-				$cy = $this->h - $y - ($gradient['coords'][1] * ($w + $h));
-				$this->_out(sprintf('%.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $w*$this->k, $x*$this->k, $cy*$this->k));
-			} else {
-				$this->_out(sprintf('%.3F 0 0 %.3F %.3F %.3F cm', $w*$this->k, $h*$this->k, $x*$this->k, ($this->h-($y+$h))*$this->k));
-			}
-			if (count($gradient['stops']) > 1) {
-				$this->Gradient($gradient['type'], $gradient['coords'], $gradient['stops'], array(), false);
-			}
-		} elseif ($svgstyle['fill'] != 'none') {
-			$fill_color = $this->convertHTMLColorToDec($svgstyle['fill']);
-			if ($svgstyle['fill-opacity'] != 1) {
-				$this->SetAlpha($svgstyle['fill-opacity']);
-			}
-			$this->SetFillColorArray($fill_color);
-			if ($svgstyle['fill-rule'] == 'evenodd') {
-				$objstyle .= 'F*';
-			} else {
-				$objstyle .= 'F';
-			}
-		}
-		// stroke
-		if ($svgstyle['stroke'] != 'none') {
-			$stroke_style = array(
-				'color' => $this->convertHTMLColorToDec($svgstyle['stroke']),
-				'width' => $this->getHTMLUnitToUnits($svgstyle['stroke-width'], 0, $this->svgunit, false),
-				'cap' => $svgstyle['stroke-linecap'],
-				'join' => $svgstyle['stroke-linejoin']
-				);
-			if (isset($svgstyle['stroke-dasharray']) AND !empty($svgstyle['stroke-dasharray']) AND ($svgstyle['stroke-dasharray'] != 'none')) {
-				$stroke_style['dash'] = $svgstyle['stroke-dasharray'];
-			}
-			$this->SetLineStyle($stroke_style);
-			$objstyle .= 'D';
-		}
-		// font
-		$regs = array();
-		if (!empty($svgstyle['font'])) {
-			if (preg_match('/font-family[\s]*:[\s]*([^\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_family = $this->getFontFamilyName($regs[1]);
-			} else {
-				$font_family = $svgstyle['font-family'];
-			}
-			if (preg_match('/font-size[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_size = trim($regs[1]);
-			} else {
-				$font_size = $svgstyle['font-size'];
-			}
-			if (preg_match('/font-style[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_style = trim($regs[1]);
-			} else {
-				$font_style = $svgstyle['font-style'];
-			}
-			if (preg_match('/font-weight[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_weight = trim($regs[1]);
-			} else {
-				$font_weight = $svgstyle['font-weight'];
-			}
-			if (preg_match('/font-stretch[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_stretch = trim($regs[1]);
-			} else {
-				$font_stretch = $svgstyle['font-stretch'];
-			}
-			if (preg_match('/letter-spacing[\s]*:[\s]*([^\s\;\"]*)/si', $svgstyle['font'], $regs)) {
-				$font_spacing = trim($regs[1]);
-			} else {
-				$font_spacing = $svgstyle['letter-spacing'];
-			}
-		} else {
-			$font_family = $this->getFontFamilyName($svgstyle['font-family']);
-			$font_size = $svgstyle['font-size'];
-			$font_style = $svgstyle['font-style'];
-			$font_weight = $svgstyle['font-weight'];
-			$font_stretch = $svgstyle['font-stretch'];
-			$font_spacing = $svgstyle['letter-spacing'];
-		}
-		$font_size = $this->getHTMLUnitToUnits($font_size, $prevsvgstyle['font-size'], $this->svgunit, false) * $this->k;
-		$font_stretch = $this->getCSSFontStretching($font_stretch, $svgstyle['font-stretch']);
-		$font_spacing = $this->getCSSFontSpacing($font_spacing, $svgstyle['letter-spacing']);
-		switch ($font_style) {
-			case 'italic': {
-				$font_style = 'I';
-				break;
-			}
-			case 'oblique': {
-				$font_style = 'I';
-				break;
-			}
-			default:
-			case 'normal': {
-				$font_style = '';
-				break;
-			}
-		}
-		switch ($font_weight) {
-			case 'bold':
-			case 'bolder': {
-				$font_style .= 'B';
-				break;
-			}
-		}
-		switch ($svgstyle['text-decoration']) {
-			case 'underline': {
-				$font_style .= 'U';
-				break;
-			}
-			case 'overline': {
-				$font_style .= 'O';
-				break;
-			}
-			case 'line-through': {
-				$font_style .= 'D';
-				break;
-			}
-			default:
-			case 'none': {
-				break;
-			}
-		}
-		$this->SetFont($font_family, $font_style, $font_size);
-		$this->setFontStretching($font_stretch);
-		$this->setFontSpacing($font_spacing);
-		return $objstyle;
-	}
-
-	/**
-	 * Draws an SVG path
-	 * @param string $d attribute d of the path SVG element
-	 * @param string $style Style of rendering. Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>F*: Fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>DF* or FD*: Draw and fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
-	 * @return array of container box measures (x, y, w, h)
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access protected
-	 */
-	protected function SVGPath($d, $style='') {
-		// set fill/stroke style
-		$op = $this->getPathPaintOperator($style, '');
-		if (empty($op)) {
-			return;
-		}
-		$paths = array();
-		$d = str_replace('-', ' -', $d);
-		$d = str_replace('+', ' +', $d);
-		preg_match_all('/([a-zA-Z])[\s]*([^a-zA-Z\"]*)/si', $d, $paths, PREG_SET_ORDER);
-		$x = 0;
-		$y = 0;
-		$x1 = 0;
-		$y1 = 0;
-		$x2 = 0;
-		$y2 = 0;
-		$xmin = 2147483647;
-		$xmax = 0;
-		$ymin = 2147483647;
-		$ymax = 0;
-		$relcoord = false;
-		// draw curve pieces
-		foreach ($paths as $key => $val) {
-			// get curve type
-			$cmd = trim($val[1]);
-			if (strtolower($cmd) == $cmd) {
-				// use relative coordinated instead of absolute
-				$relcoord = true;
-				$xoffset = $x;
-				$yoffset = $y;
-			} else {
-				$relcoord = false;
-				$xoffset = 0;
-				$yoffset = 0;
-			}
-			$params = array();
-			if (isset($val[2])) {
-				// get curve parameters
-				$rawparams = preg_split('/([\,\s]+)/si', trim($val[2]));
-				$params = array();
-				foreach ($rawparams as $ck => $cp) {
-					$params[$ck] = $this->getHTMLUnitToUnits($cp, 0, $this->svgunit, false);
-				}
-			}
-			switch (strtoupper($cmd)) {
-				case 'M': { // moveto
-					foreach ($params as $ck => $cp) {
-						if (($ck % 2) == 0) {
-							$x = $cp + $xoffset;
-						} else {
-							$y = $cp + $yoffset;
-							if ($ck == 1) {
-								$this->_outPoint($x, $y);
-							} else {
-								$this->_outLine($x, $y);
-							}
-							$xmin = min($xmin, $x);
-							$ymin = min($ymin, $y);
-							$xmax = max($xmax, $x);
-							$ymax = max($ymax, $y);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'L': { // lineto
-					foreach ($params as $ck => $cp) {
-						if (($ck % 2) == 0) {
-							$x = $cp + $xoffset;
-						} else {
-							$y = $cp + $yoffset;
-							$this->_outLine($x, $y);
-							$xmin = min($xmin, $x);
-							$ymin = min($ymin, $y);
-							$xmax = max($xmax, $x);
-							$ymax = max($ymax, $y);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'H': { // horizontal lineto
-					foreach ($params as $ck => $cp) {
-						$x = $cp + $xoffset;
-						$this->_outLine($x, $y);
-						$xmin = min($xmin, $x);
-						$xmax = max($xmax, $x);
-						if ($relcoord) {
-							$xoffset = $x;
-						}
-					}
-					break;
-				}
-				case 'V': { // vertical lineto
-					foreach ($params as $ck => $cp) {
-						$y = $cp + $yoffset;
-						$this->_outLine($x, $y);
-						$ymin = min($ymin, $y);
-						$ymax = max($ymax, $y);
-						if ($relcoord) {
-							$yoffset = $y;
-						}
-					}
-					break;
-				}
-				case 'C': { // curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 6) == 0) {
-							$x1 = $params[($ck - 5)] + $xoffset;
-							$y1 = $params[($ck - 4)] + $yoffset;
-							$x2 = $params[($ck - 3)] + $xoffset;
-							$y2 = $params[($ck - 2)] + $yoffset;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$this->_outCurve($x1, $y1, $x2, $y2, $x, $y);
-							$xmin = min($xmin, $x, $x1, $x2);
-							$ymin = min($ymin, $y, $y1, $y2);
-							$xmax = max($xmax, $x, $x1, $x2);
-							$ymax = max($ymax, $y, $y1, $y2);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'S': { // shorthand/smooth curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 4) == 0) {
-							if (($key > 0) AND ((strtoupper($paths[($key - 1)][1]) == 'C') OR (strtoupper($paths[($key - 1)][1]) == 'S'))) {
-								$x1 = (2 * $x) - $x2;
-								$y1 = (2 * $y) - $y2;
-							} else {
-								$x1 = $x;
-								$y1 = $y;
-							}
-							$x2 = $params[($ck - 3)] + $xoffset;
-							$y2 = $params[($ck - 2)] + $yoffset;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$this->_outCurve($x1, $y1, $x2, $y2, $x, $y);
-							$xmin = min($xmin, $x, $x1, $x2);
-							$ymin = min($ymin, $y, $y1, $y2);
-							$xmax = max($xmax, $x, $x1, $x2);
-							$ymax = max($ymax, $y, $y1, $y2);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'Q': { // quadratic B�zier curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 4) == 0) {
-							// convert quadratic points to cubic points
-							$x1 = $params[($ck - 3)] + $xoffset;
-							$y1 = $params[($ck - 2)] + $yoffset;
-							$xa = ($x + (2 * $x1)) / 3;
-							$ya = ($y + (2 * $y1)) / 3;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$xb = ($x + (2 * $x1)) / 3;
-							$yb = ($y + (2 * $y1)) / 3;
-							$this->_outCurve($xa, $ya, $xb, $yb, $x, $y);
-							$xmin = min($xmin, $x, $xa, $xb);
-							$ymin = min($ymin, $y, $ya, $yb);
-							$xmax = max($xmax, $x, $xa, $xb);
-							$ymax = max($ymax, $y, $ya, $yb);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'T': { // shorthand/smooth quadratic B�zier curveto
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if (($ck % 2) != 0) {
-							if (($key > 0) AND ((strtoupper($paths[($key - 1)][1]) == 'Q') OR (strtoupper($paths[($key - 1)][1]) == 'T'))) {
-								$x1 = (2 * $x) - $x1;
-								$y1 = (2 * $y) - $y1;
-							} else {
-								$x1 = $x;
-								$y1 = $y;
-							}
-							// convert quadratic points to cubic points
-							$xa = ($x + (2 * $x1)) / 3;
-							$ya = ($y + (2 * $y1)) / 3;
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[($ck)] + $yoffset;
-							$xb = ($x + (2 * $x1)) / 3;
-							$yb = ($y + (2 * $y1)) / 3;
-							$this->_outCurve($xa, $ya, $xb, $yb, $x, $y);
-							$xmin = min($xmin, $x, $x1, $x2);
-							$ymin = min($ymin, $y, $y1, $y2);
-							$xmax = max($xmax, $x, $x1, $x2);
-							$ymax = max($ymax, $y, $y1, $y2);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'A': { // elliptical arc
-					foreach ($params as $ck => $cp) {
-						$params[$ck] = $cp;
-						if ((($ck + 1) % 7) == 0) {
-							$x0 = $x;
-							$y0 = $y;
-							$rx = abs($params[($ck - 6)]);
-							$ry = abs($params[($ck - 5)]);
-							$ang = -$rawparams[($ck - 4)];
-							$angle = deg2rad($ang);
-							$fa = $rawparams[($ck - 3)]; // large-arc-flag
-							$fs = $rawparams[($ck - 2)]; // sweep-flag
-							$x = $params[($ck - 1)] + $xoffset;
-							$y = $params[$ck] + $yoffset;
-							$cos_ang = cos($angle);
-							$sin_ang = sin($angle);
-							$a = ($x0 - $x) / 2;
-							$b = ($y0 - $y) / 2;
-							$xa = ($a * $cos_ang) - ($b * $sin_ang);
-							$ya = ($a * $sin_ang) + ($b * $cos_ang);
-							$rx2 = $rx * $rx;
-							$ry2 = $ry * $ry;
-							$xa2 = $xa * $xa;
-							$ya2 = $ya * $ya;
-							$delta = ($xa2 / $rx2) + ($ya2 / $ry2);
-							if ($delta > 1) {
-								$rx *= sqrt($delta);
-								$ry *= sqrt($delta);
-								$rx2 = $rx * $rx;
-								$ry2 = $ry * $ry;
-							}
-							$numerator = (($rx2 * $ry2) - ($rx2 * $ya2) - ($ry2 * $xa2));
-							if ($numerator < 0) {
-								$root = 0;
-							} else {
-								$root = sqrt($numerator / (($rx2 * $ya2) + ($ry2 * $xa2)));
-							}
-							if ($fa == $fs) {
-								$root *= -1;
-							}
-							$cax = $root * (($rx * $ya) / $ry);
-							$cay = -$root * (($ry * $xa) / $rx);
-							// coordinates of ellipse center
-							$cx = ($cax * $cos_ang) - ($cay * $sin_ang) + (($x0 + $x) / 2);
-							$cy = ($cax * $sin_ang) + ($cay * $cos_ang) + (($y0 + $y) / 2);
-							// get angles
-							$angs = $this->getVectorsAngle(1, 0, (($xa - $cax) / $rx), (($cay - $ya) / $ry));
-							$dang = $this->getVectorsAngle((($xa - $cax) / $rx), (($ya - $cay) / $ry), ((-$xa - $cax) / $rx), ((-$ya - $cay) / $ry));
-							if (($fs == 0) AND ($dang > 0)) {
-								$dang -= (2 * M_PI);
-							} elseif (($fs == 1) AND ($dang < 0)) {
-								$dang += (2 * M_PI);
-							}
-							$angf = $angs - $dang;
-							if (($fs == 1) AND ($angs > $angf)) {
-								$tmp = $angs;
-								$angs = $angf;
-								$angf = $tmp;
-							}
-							$angs = rad2deg($angs);
-							$angf = rad2deg($angf);
-							$pie = false;
-							if ((isset($paths[($key + 1)][1])) AND (trim($paths[($key + 1)][1]) == 'z')) {
-								$pie = true;
-							}
-							$this->_outellipticalarc($cx, $cy, $rx, $ry, $ang, $angs, $angf, $pie, 2);
-							$this->_outPoint($x, $y);
-							$xmin = min($xmin, $x);
-							$ymin = min($ymin, $y);
-							$xmax = max($xmax, $x);
-							$ymax = max($ymax, $y);
-							if ($relcoord) {
-								$xoffset = $x;
-								$yoffset = $y;
-							}
-						}
-					}
-					break;
-				}
-				case 'Z': {
-					$this->_out('h');
-					break;
-				}
-			}
-		} // end foreach
-		if (!empty($op)) {
-			$this->_out($op);
-		}
-		return array($xmin, $ymin, ($xmax - $xmin), ($ymax - $ymin));
-	}
-
-	/**
-	 * Returns the angle in radiants between two vectors
-	 * @param int $x1 X coordiante of first vector point
-	 * @param int $y1 Y coordiante of first vector point
-	 * @param int $x2 X coordiante of second vector point
-	 * @param int $y2 Y coordiante of second vector point
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-04)
-	 * @access protected
-	 */
-	protected function getVectorsAngle($x1, $y1, $x2, $y2) {
-		$dprod = ($x1 * $x2) + ($y1 * $y2);
-		$dist1 = sqrt(($x1 * $x1) + ($y1 * $y1));
-		$dist2 = sqrt(($x2 * $x2) + ($y2 * $y2));
-		$angle = acos($dprod / ($dist1 * $dist2));
-		if (is_nan($angle)) {
-			$angle = M_PI;
-		}
-		if ((($x1 * $y2) - ($x2 * $y1)) < 0) {
-			$angle *= -1;
-		}
-		return $angle;
-	}
-
-	/**
-	 * Sets the opening SVG element handler function for the XML parser. (*** TO BE COMPLETED ***)
-	 * @param resource $parser The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param string $name The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
-	 * @param array $attribs The third parameter, attribs, contains an associative array with the element's attributes (if any). The keys of this array are the attribute names, the values are the attribute values. Attribute names are case-folded on the same criteria as element names. Attribute values are not case-folded. The original order of the attributes can be retrieved by walking through attribs the normal way, using each(). The first key in the array was the first attribute, and so on.
-	 * @param array $ctm tranformation matrix for clipping mode (starting transformation matrix).
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access protected
-	 */
-	protected function startSVGElementHandler($parser, $name, $attribs, $ctm=array()) {
-		// check if we are in clip mode
-		if ($this->svgclipmode) {
-			$this->svgclippaths[$this->svgclipid][] = array('name' => $name, 'attribs' => $attribs, 'tm' => $this->svgcliptm[$this->svgclipid]);
-			return;
-		}
-		if ($this->svgdefsmode AND !in_array($name, array('clipPath', 'linearGradient', 'radialGradient', 'stop'))) {
-			if (!isset($attribs['id'])) {
-				$attribs['id'] = 'DF_'.(count($this->svgdefs) + 1);
-			}
-			$this->svgdefs[$attribs['id']] = array('name' => $name, 'attribs' => $attribs);
-			return;
-		}
-		$clipping = false;
-		if ($parser == 'clip-path') {
-			// set clipping mode
-			$clipping = true;
-		}
-		// get styling properties
-		$prev_svgstyle = $this->svgstyles[(count($this->svgstyles) - 1)]; // previous style
-		$svgstyle = $this->svgstyles[0]; // set default style
-		if (isset($attribs['style']) AND !$this->empty_string($attribs['style'])) {
-			// fix style for regular expression
-			$attribs['style'] = ';'.$attribs['style'];
-		}
-		foreach ($prev_svgstyle as $key => $val) {
-			if (in_array($key, $this->svginheritprop)) {
-				// inherit previous value
-				$svgstyle[$key] = $val;
-			}
-			if (isset($attribs[$key]) AND !$this->empty_string($attribs[$key])) {
-				// specific attribute settings
-				if ($attribs[$key] == 'inherit') {
-					$svgstyle[$key] = $val;
-				} else {
-					$svgstyle[$key] = $attribs[$key];
-				}
-			} elseif (isset($attribs['style']) AND !$this->empty_string($attribs['style'])) {
-				// CSS style syntax
-				$attrval = array();
-				if (preg_match('/[;\"\s]{1}'.$key.'[\s]*:[\s]*([^;\"]*)/si', $attribs['style'], $attrval) AND isset($attrval[1])) {
-					if ($attrval[1] == 'inherit') {
-						$svgstyle[$key] = $val;
-					} else {
-						$svgstyle[$key] = $attrval[1];
-					}
-				}
-			}
-		}
-		// transformation matrix
-		if (!empty($ctm)) {
-			$tm = $ctm;
-		} else {
-			$tm = $this->svgstyles[(count($this->svgstyles) - 1)]['transfmatrix'];
-		}
-		if (isset($attribs['transform']) AND !empty($attribs['transform'])) {
-			$tm = $this->getTransformationMatrixProduct($tm, $this->getSVGTransformMatrix($attribs['transform']));
-		}
-		$svgstyle['transfmatrix'] = $tm;
-		$invisible = false;
-		if (($svgstyle['visibility'] == 'hidden') OR ($svgstyle['visibility'] == 'collapse') OR ($svgstyle['display'] == 'none')) {
-			// the current graphics element is invisible (nothing is painted)
-			$invisible = true;
-		}
-		// process tag
-		switch($name) {
-			case 'defs': {
-				$this->svgdefsmode = true;
-				break;
-			}
-			// clipPath
-			case 'clipPath': {
-				if ($invisible) {
-					break;
-				}
-				$this->svgclipmode = true;
-				if (!isset($attribs['id'])) {
-					$attribs['id'] = 'CP_'.(count($this->svgcliptm) + 1);
-				}
-				$this->svgclipid = $attribs['id'];
-				$this->svgclippaths[$this->svgclipid] = array();
-				$this->svgcliptm[$this->svgclipid] = $tm;
-				break;
-			}
-			case 'svg': {
-				// start of SVG object
-				break;
-			}
-			case 'g': {
-				// group together related graphics elements
-				array_push($this->svgstyles, $svgstyle);
-				$this->StartTransform();
-				$this->setSVGStyles($svgstyle, $prev_svgstyle);
-				break;
-			}
-			case 'linearGradient': {
-				if (!isset($attribs['id'])) {
-					$attribs['id'] = 'GR_'.(count($this->svggradients) + 1);
-				}
-				$this->svggradientid = $attribs['id'];
-				$this->svggradients[$this->svggradientid] = array();
-				$this->svggradients[$this->svggradientid]['type'] = 2;
-				$this->svggradients[$this->svggradientid]['stops'] = array();
-				if (isset($attribs['gradientUnits'])) {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = $attribs['gradientUnits'];
-				} else {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = 'objectBoundingBox';
-				}
-				//$attribs['spreadMethod']
-				$x1 = (isset($attribs['x1'])?$attribs['x1']:0);
-				$y1 = (isset($attribs['y1'])?$attribs['y1']:0);
-				$x2 = (isset($attribs['x2'])?$attribs['x2']:1);
-				$y2 = (isset($attribs['y2'])?$attribs['y2']:0);
-				if (isset($attribs['x1']) AND (substr($attribs['x1'], -1) != '%')) {
-					$this->svggradients[$this->svggradientid]['mode'] = 'measure';
-				} else {
-					$this->svggradients[$this->svggradientid]['mode'] = 'percentage';
-				}
-				if (isset($attribs['gradientTransform'])) {
-					$this->svggradients[$this->svggradientid]['gradientTransform'] = $this->getSVGTransformMatrix($attribs['gradientTransform']);
-				}
-				$this->svggradients[$this->svggradientid]['coords'] = array($x1, $y1, $x2, $y2);
-				if (isset($attribs['xlink:href']) AND !empty($attribs['xlink:href'])) {
-					// gradient is defined on another place
-					$this->svggradients[$this->svggradientid]['xref'] = substr($attribs['xlink:href'], 1);
-				}
-				break;
-			}
-			case 'radialGradient': {
-				if (!isset($attribs['id'])) {
-					$attribs['id'] = 'GR_'.(count($this->svggradients) + 1);
-				}
-				$this->svggradientid = $attribs['id'];
-				$this->svggradients[$this->svggradientid] = array();
-				$this->svggradients[$this->svggradientid]['type'] = 3;
-				$this->svggradients[$this->svggradientid]['stops'] = array();
-				if (isset($attribs['gradientUnits'])) {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = $attribs['gradientUnits'];
-				} else {
-					$this->svggradients[$this->svggradientid]['gradientUnits'] = 'objectBoundingBox';
-				}
-				//$attribs['spreadMethod']
-				$cx = (isset($attribs['cx'])?$attribs['cx']:0.5);
-				$cy = (isset($attribs['cy'])?$attribs['cy']:0.5);
-				$fx = (isset($attribs['fx'])?$attribs['fx']:$cx);
-				$fy = (isset($attribs['fy'])?$attribs['fy']:$cy);
-				$r = (isset($attribs['r'])?$attribs['r']:0.5);
-				if (isset($attribs['cx']) AND (substr($attribs['cx'], -1) != '%')) {
-					$this->svggradients[$this->svggradientid]['mode'] = 'measure';
-				} else {
-					$this->svggradients[$this->svggradientid]['mode'] = 'percentage';
-				}
-				if (isset($attribs['gradientTransform'])) {
-					$this->svggradients[$this->svggradientid]['gradientTransform'] = $this->getSVGTransformMatrix($attribs['gradientTransform']);
-				}
-				$this->svggradients[$this->svggradientid]['coords'] = array($cx, $cy, $fx, $fy, $r);
-				if (isset($attribs['xlink:href']) AND !empty($attribs['xlink:href'])) {
-					// gradient is defined on another place
-					$this->svggradients[$this->svggradientid]['xref'] = substr($attribs['xlink:href'], 1);
-				}
-				break;
-			}
-			case 'stop': {
-				// gradient stops
-				if (substr($attribs['offset'], -1) == '%') {
-					$offset = floatval(substr($attribs['offset'], -1)) / 100;
-				} else {
-					$offset = floatval($attribs['offset']);
-					if ($offset > 1) {
-						$offset /= 100;
-					}
-				}
-				$stop_color = isset($svgstyle['stop-color'])?$this->convertHTMLColorToDec($svgstyle['stop-color']):'black';
-				$opacity = isset($svgstyle['stop-opacity'])?$svgstyle['stop-opacity']:1;
-				$this->svggradients[$this->svggradientid]['stops'][] = array('offset' => $offset, 'color' => $stop_color, 'opacity' => $opacity);
-				break;
-			}
-			// paths
-			case 'path': {
-				if ($invisible) {
-					break;
-				}
-				$d = trim($attribs['d']);
-				if ($clipping) {
-					$this->SVGTransform($tm);
-					$this->SVGPath($d, 'CNZ');
-				} else {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, 0, 0, 1, 1, 'SVGPath', array($d, 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->SVGPath($d, $obstyle);
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			// shapes
-			case 'rect': {
-				if ($invisible) {
-					break;
-				}
-				$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):0);
-				$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):0);
-				$w = (isset($attribs['width'])?$this->getHTMLUnitToUnits($attribs['width'], 0, $this->svgunit, false):0);
-				$h = (isset($attribs['height'])?$this->getHTMLUnitToUnits($attribs['height'], 0, $this->svgunit, false):0);
-				$rx = (isset($attribs['rx'])?$this->getHTMLUnitToUnits($attribs['rx'], 0, $this->svgunit, false):0);
-				$ry = (isset($attribs['ry'])?$this->getHTMLUnitToUnits($attribs['ry'], 0, $this->svgunit, false):$rx);
-				if ($clipping) {
-					$this->SVGTransform($tm);
-					$this->RoundedRectXY($x, $y, $w, $h, $rx, $ry, '1111', 'CNZ', array(), array());
-				} else {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'RoundedRectXY', array($x, $y, $w, $h, $rx, $ry, '1111', 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->RoundedRectXY($x, $y, $w, $h, $rx, $ry, '1111', $obstyle, array(), array());
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'circle': {
-				if ($invisible) {
-					break;
-				}
-				$cx = (isset($attribs['cx'])?$this->getHTMLUnitToUnits($attribs['cx'], 0, $this->svgunit, false):0);
-				$cy = (isset($attribs['cy'])?$this->getHTMLUnitToUnits($attribs['cy'], 0, $this->svgunit, false):0);
-				$r = (isset($attribs['r'])?$this->getHTMLUnitToUnits($attribs['r'], 0, $this->svgunit, false):0);
-				$x = $cx - $r;
-				$y = $cy - $r;
-				$w = 2 * $r;
-				$h = $w;
-				if ($clipping) {
-					$this->SVGTransform($tm);
-					$this->Circle($cx, $cy, $r, 0, 360, 'CNZ', array(), array(), 8);
-				} else {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Circle', array($cx, $cy, $r, 0, 360, 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->Circle($cx, $cy, $r, 0, 360, $obstyle, array(), array(), 8);
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'ellipse': {
-				if ($invisible) {
-					break;
-				}
-				$cx = (isset($attribs['cx'])?$this->getHTMLUnitToUnits($attribs['cx'], 0, $this->svgunit, false):0);
-				$cy = (isset($attribs['cy'])?$this->getHTMLUnitToUnits($attribs['cy'], 0, $this->svgunit, false):0);
-				$rx = (isset($attribs['rx'])?$this->getHTMLUnitToUnits($attribs['rx'], 0, $this->svgunit, false):0);
-				$ry = (isset($attribs['ry'])?$this->getHTMLUnitToUnits($attribs['ry'], 0, $this->svgunit, false):0);
-				$x = $cx - $rx;
-				$y = $cy - $ry;
-				$w = 2 * $rx;
-				$h = 2 * $ry;
-				if ($clipping) {
-					$this->SVGTransform($tm);
-					$this->Ellipse($cx, $cy, $rx, $ry, 0, 0, 360, 'CNZ', array(), array(), 8);
-				} else {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Ellipse', array($cx, $cy, $rx, $ry, 0, 0, 360, 'CNZ'));
-					if (!empty($obstyle)) {
-						$this->Ellipse($cx, $cy, $rx, $ry, 0, 0, 360, $obstyle, array(), array(), 8);
-					}
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'line': {
-				if ($invisible) {
-					break;
-				}
-				$x1 = (isset($attribs['x1'])?$this->getHTMLUnitToUnits($attribs['x1'], 0, $this->svgunit, false):0);
-				$y1 = (isset($attribs['y1'])?$this->getHTMLUnitToUnits($attribs['y1'], 0, $this->svgunit, false):0);
-				$x2 = (isset($attribs['x2'])?$this->getHTMLUnitToUnits($attribs['x2'], 0, $this->svgunit, false):0);
-				$y2 = (isset($attribs['y2'])?$this->getHTMLUnitToUnits($attribs['y2'], 0, $this->svgunit, false):0);
-				$x = $x1;
-				$y = $y1;
-				$w = abs($x2 - $x1);
-				$h = abs($y2 - $y1);
-				if (!$clipping) {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Line', array($x1, $y1, $x2, $y2));
-					$this->Line($x1, $y1, $x2, $y2);
-					$this->StopTransform();
-				}
-				break;
-			}
-			case 'polyline':
-			case 'polygon': {
-				if ($invisible) {
-					break;
-				}
-				$points = (isset($attribs['points'])?$attribs['points']:'0 0');
-				$points = trim($points);
-				// note that point may use a complex syntax not covered here
-				$points = preg_split('/[\,\s]+/si', $points);
-				if (count($points) < 4) {
-					break;
-				}
-				$p = array();
-				$xmin = 2147483647;
-				$xmax = 0;
-				$ymin = 2147483647;
-				$ymax = 0;
-				foreach ($points as $key => $val) {
-					$p[$key] = $this->getHTMLUnitToUnits($val, 0, $this->svgunit, false);
-					if (($key % 2) == 0) {
-						// X coordinate
-						$xmin = min($xmin, $p[$key]);
-						$xmax = max($xmax, $p[$key]);
-					} else {
-						// Y coordinate
-						$ymin = min($ymin, $p[$key]);
-						$ymax = max($ymax, $p[$key]);
-					}
-				}
-				$x = $xmin;
-				$y = $ymin;
-				$w = ($xmax - $xmin);
-				$h = ($ymax - $ymin);
-				if ($name == 'polyline') {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'PolyLine', array($p, 'CNZ'));
-					$this->PolyLine($p, 'D', array(), array());
-					$this->StopTransform();
-				} else { // polygon
-					if ($clipping) {
-						$this->SVGTransform($tm);
-						$this->Polygon($p, 'CNZ', array(), array(), true);
-					} else {
-						$this->StartTransform();
-						$this->SVGTransform($tm);
-						$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'Polygon', array($p, 'CNZ'));
-						if (!empty($obstyle)) {
-							$this->Polygon($p, $obstyle, array(), array(), true);
-						}
-						$this->StopTransform();
-					}
-				}
-				break;
-			}
-			// image
-			case 'image': {
-				if ($invisible) {
-					break;
-				}
-				if (!isset($attribs['xlink:href']) OR empty($attribs['xlink:href'])) {
-					break;
-				}
-				$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):0);
-				$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):0);
-				$w = (isset($attribs['width'])?$this->getHTMLUnitToUnits($attribs['width'], 0, $this->svgunit, false):0);
-				$h = (isset($attribs['height'])?$this->getHTMLUnitToUnits($attribs['height'], 0, $this->svgunit, false):0);
-				$img = $attribs['xlink:href'];
-				if (!$clipping) {
-					$this->StartTransform();
-					$this->SVGTransform($tm);
-					$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h);
-					// fix image path
-					if (!$this->empty_string($this->svgdir) AND (($img{0} == '.') OR (basename($img) == $img))) {
-						// replace relative path with full server path
-						$img = $this->svgdir.'/'.$img;
-					}
-					if (($img{0} == '/') AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-						$findroot = strpos($img, $_SERVER['DOCUMENT_ROOT']);
-						if (($findroot === false) OR ($findroot > 1)) {
-							// replace relative path with full server path
-							$img = $_SERVER['DOCUMENT_ROOT'].$img;
-						}
-					}
-					$img = urldecode($img);
-					$testscrtype = @parse_url($img);
-					if (!isset($testscrtype['query']) OR empty($testscrtype['query'])) {
-						// convert URL to server path
-						$img = str_replace(K_PATH_URL, K_PATH_MAIN, $img);
-					}
-					$this->Image($img, $x, $y, $w, $h);
-					$this->StopTransform();
-				}
-				break;
-			}
-			// text
-			case 'text':
-			case 'tspan': {
-				$this->svgtextmode['invisible'] = $invisible;
-				if ($invisible) {
-					break;
-				}
-				array_push($this->svgstyles, $svgstyle);
-				// only basic support - advanced features must be implemented
-				$x = (isset($attribs['x'])?$this->getHTMLUnitToUnits($attribs['x'], 0, $this->svgunit, false):$this->x);
-				$y = (isset($attribs['y'])?$this->getHTMLUnitToUnits($attribs['y'], 0, $this->svgunit, false):$this->y);
-				$svgstyle['text-color'] = $svgstyle['fill'];
-				$this->svgtext = '';
-				if (isset($svgstyle['text-anchor'])) {
-					$this->svgtextmode['text-anchor'] = $svgstyle['text-anchor'];
-				} else {
-					$this->svgtextmode['text-anchor'] = 'start';
-				}
-				if (isset($svgstyle['direction'])) {
-					if ($svgstyle['direction'] == 'rtl') {
-						$this->svgtextmode['rtl'] = true;
-					} else {
-						$this->svgtextmode['rtl'] = false;
-					}
-				} else {
-					$this->svgtextmode['rtl'] = false;
-				}
-				if (isset($svgstyle['stroke']) AND ($svgstyle['stroke'] != 'none') AND isset($svgstyle['stroke-width']) AND ($svgstyle['stroke-width'] > 0)) {
-					$this->svgtextmode['stroke'] = $this->getHTMLUnitToUnits($svgstyle['stroke-width'], 0, $this->svgunit, false);
-				} else {
-					$this->svgtextmode['stroke'] = false;
-				}
-				$this->StartTransform();
-				$this->SVGTransform($tm);
-				$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, 1, 1);
-				$this->x = $x;
-				$this->y = $y;
-				break;
-			}
-			// use
-			case 'use': {
-				if (isset($attribs['xlink:href'])) {
-					$use = $this->svgdefs[substr($attribs['xlink:href'], 1)];
-					if (isset($attribs['xlink:href'])) {
-						unset($attribs['xlink:href']);
-					}
-					if (isset($attribs['id'])) {
-						unset($attribs['id']);
-					}
-					$attribs = array_merge($use['attribs'], $attribs);
-					$this->startSVGElementHandler($parser, $use['name'], $use['attribs']);
-				}
-				break;
-			}
-			default: {
-				break;
-			}
-		} // end of switch
-	}
-
-	/**
-	 * Sets the closing SVG element handler function for the XML parser.
-	 * @param resource $parser The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param string $name The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access protected
-	 */
-	protected function endSVGElementHandler($parser, $name) {
-		switch($name) {
-			case 'defs': {
-				$this->svgdefsmode = false;
-				break;
-			}
-			// clipPath
-			case 'clipPath': {
-				$this->svgclipmode = false;
-				break;
-			}
-			case 'g': {
-				// ungroup: remove last style from array
-				array_pop($this->svgstyles);
-				$this->StopTransform();
-				break;
-			}
-			case 'text':
-			case 'tspan': {
-				if ($this->svgtextmode['invisible']) {
-					// This implementation must be fixed to following the rule:
-					// If the 'visibility' property is set to hidden on a 'tspan', 'tref' or 'altGlyph' element, then the text is invisible but still takes up space in text layout calculations.
-					break;
-				}
-				// print text
-				$text = $this->stringTrim($this->svgtext);
-				if ($this->svgtextmode['text-anchor'] != 'start') {
-					$textlen = $this->GetStringWidth($text);
-					// check if string is RTL text
-					if ($this->svgtextmode['text-anchor'] == 'end') {
-						if ($this->svgtextmode['rtl']) {
-							$this->x += $textlen;
-						} else {
-							$this->x -= $textlen;
-						}
-					} elseif ($this->svgtextmode['text-anchor'] == 'middle') {
-						if ($this->svgtextmode['rtl']) {
-							$this->x += ($textlen / 2);
-						} else {
-							$this->x -= ($textlen / 2);
-						}
-					}
-				}
-				$textrendermode = $this->textrendermode;
-				$textstrokewidth = $this->textstrokewidth;
-				$this->setTextRenderingMode($this->svgtextmode['stroke'], true, false);
-				$this->Cell(0, 0, $text, 0, 0, '', false, '', 0, false, 'L', 'T');
-				// restore previous rendering mode
-				$this->textrendermode = $textrendermode;
-				$this->textstrokewidth = $textstrokewidth;
-				$this->svgtext = '';
-				$this->StopTransform();
-				array_pop($this->svgstyles);
-				break;
-			}
-			default: {
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Sets the character data handler function for the XML parser.
-	 * @param resource $parser The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param string $data The second parameter, data, contains the character data as a string.
-	 * @author Nicola Asuni
-	 * @since 5.0.000 (2010-05-02)
-	 * @access protected
-	 */
-	protected function segSVGContentHandler($parser, $data) {
-		$this->svgtext .= $data;
-	}
-
-	// --- END SVG METHODS -----------------------------
-
-} // END OF TCPDF CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/unicode_data.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/unicode_data.php
deleted file mode 100644
index 190dbc5465b..00000000000
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/unicode_data.php
+++ /dev/null
@@ -1,18378 +0,0 @@
-<?php
-//============================================================+
-// File name   : unicode_data.php
-// Version     : 1.0.006
-// Begin       : 2008-01-01
-// Last Update : 2010-10-18
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2008-2010  Nicola Asuni - Tecnick.com S.r.l.
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF.  If not, see <http://www.gnu.org/licenses/>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Unicode data for TCPDF library.
-//
-//============================================================+
-// THANKS TO
-// Efthimios Mavrogeorgiadis
-// Saleh AlMatrafe
-
-/**
- * Unicode data class for TCPDF library.
- * @author Nicola Asuni
- * @copyright 2008-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
- * @package com.tecnick.tcpdf
- * @link http://www.tcpdf.org
- * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @since 2.1.000 (2008-01-08)
-*/
-
-/**
-* This is a PHP class containing Unicde data for TCPDF library
-* @name TCPDF_UNICODE_DATA
-* @package com.tecnick.tcpdf
-* @version 1.0.006
-* @author Nicola Asuni - info@tecnick.com
-* @link http://www.tcpdf.org
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-*/
-class TCPDF_UNICODE_DATA {
-
-/**
- * @var Unicode code for Left-to-Right Mark
- * @access public
- */
-public $uni_LRM = 8206;
-
-/**
- * @var Unicode code for Right-to-Left Mark
- * @access public
- */
-public $uni_RLM = 8207;
-
-/**
- * @var Unicode code for Left-to-Right Embedding
- * @access public
- */
-public $uni_LRE = 8234;
-
-/**
- * @var Unicode code for Right-to-Left Embedding
- * @access public
- */
-public $uni_RLE = 8235;
-
-/**
- * @var Unicode code for Pop Directional Format
- * @access public
- */
-public $uni_PDF = 8236;
-
-/**
- * @var Unicode code for Left-to-Right Override
- * @access public
- */
-public $uni_LRO = 8237;
-
-/**
- * @var Unicode code for Right-to-Left Override
- * @access public
- */
-public $uni_RLO = 8238;
-
-/*
- * @var Pattern to test RTL (Righ-To-Left) strings using regular expressions.
- * @access public
- */
-public $uni_RE_PATTERN_RTL = "/(
-	  \xD6\xBE                                             # R
-	| \xD7[\x80\x83\x86\x90-\xAA\xB0-\xB4]                 # R
-	| \xDF[\x80-\xAA\xB4\xB5\xBA]                          # R
-	| \xE2\x80\x8F                                         # R
-	| \xEF\xAC[\x9D\x9F\xA0-\xA8\xAA-\xB6\xB8-\xBC\xBE]    # R
-	| \xEF\xAD[\x80\x81\x83\x84\x86-\x8F]                  # R
-	| \xF0\x90\xA0[\x80-\x85\x88\x8A-\xB5\xB7\xB8\xBC\xBF] # R
-	| \xF0\x90\xA4[\x80-\x99]                              # R
-	| \xF0\x90\xA8[\x80\x90-\x93\x95-\x97\x99-\xB3]        # R
-	| \xF0\x90\xA9[\x80-\x87\x90-\x98]                     # R
-	| \xE2\x80[\xAB\xAE]                                   # RLE & RLO
-	)/x";
-
-/*
- * @var Pattern to test Arabic strings using regular expressions.
- * Source: http://www.w3.org/International/questions/qa-forms-utf-8
- * @access public
- */
-public $uni_RE_PATTERN_ARABIC = "/(
-		  \xD8[\x80-\x83\x8B\x8D\x9B\x9E\x9F\xA1-\xBA]  # AL
-		| \xD9[\x80-\x8A\xAD-\xAF\xB1-\xBF]             # AL
-		| \xDA[\x80-\xBF]                               # AL
-		| \xDB[\x80-\x95\x9D\xA5\xA6\xAE\xAF\xBA-\xBF]  # AL
-		| \xDC[\x80-\x8D\x90\x92-\xAF]                  # AL
-		| \xDD[\x8D-\xAD]                               # AL
-		| \xDE[\x80-\xA5\xB1]                           # AL
-		| \xEF\xAD[\x90-\xBF]                           # AL
-		| \xEF\xAE[\x80-\xB1]                           # AL
-		| \xEF\xAF[\x93-\xBF]                           # AL
-		| \xEF[\xB0-\xB3][\x80-\xBF]                    # AL
-		| \xEF\xB4[\x80-\xBD]                           # AL
-		| \xEF\xB5[\x90-\xBF]                           # AL
-		| \xEF\xB6[\x80-\x8F\x92-\xBF]                  # AL
-		| \xEF\xB7[\x80-\x87\xB0-\xBC]                  # AL
-		| \xEF\xB9[\xB0-\xB4\xB6-\xBF]                  # AL
-		| \xEF\xBA[\x80-\xBF]                           # AL
-		| \xEF\xBB[\x80-\xBC]                           # AL
-		| \xD9[\xA0-\xA9\xAB\xAC]                       # AN
-		)/x";
-
-/**
- * @var Array of Unicode types
- * @access public
- */
-public $uni_type = array(
-0=>'BN',
-1=>'BN',
-2=>'BN',
-3=>'BN',
-4=>'BN',
-5=>'BN',
-6=>'BN',
-7=>'BN',
-8=>'BN',
-9=>'S',
-10=>'B',
-11=>'S',
-12=>'WS',
-13=>'B',
-14=>'BN',
-15=>'BN',
-16=>'BN',
-17=>'BN',
-18=>'BN',
-19=>'BN',
-20=>'BN',
-21=>'BN',
-22=>'BN',
-23=>'BN',
-24=>'BN',
-25=>'BN',
-26=>'BN',
-27=>'BN',
-28=>'B',
-29=>'B',
-30=>'B',
-31=>'S',
-32=>'WS',
-33=>'ON',
-34=>'ON',
-35=>'ET',
-36=>'ET',
-37=>'ET',
-38=>'ON',
-39=>'ON',
-40=>'ON',
-41=>'ON',
-42=>'ON',
-43=>'ES',
-44=>'CS',
-45=>'ES',
-46=>'CS',
-47=>'CS',
-48=>'EN',
-49=>'EN',
-50=>'EN',
-51=>'EN',
-52=>'EN',
-53=>'EN',
-54=>'EN',
-55=>'EN',
-56=>'EN',
-57=>'EN',
-58=>'CS',
-59=>'ON',
-60=>'ON',
-61=>'ON',
-62=>'ON',
-63=>'ON',
-64=>'ON',
-65=>'L',
-66=>'L',
-67=>'L',
-68=>'L',
-69=>'L',
-70=>'L',
-71=>'L',
-72=>'L',
-73=>'L',
-74=>'L',
-75=>'L',
-76=>'L',
-77=>'L',
-78=>'L',
-79=>'L',
-80=>'L',
-81=>'L',
-82=>'L',
-83=>'L',
-84=>'L',
-85=>'L',
-86=>'L',
-87=>'L',
-88=>'L',
-89=>'L',
-90=>'L',
-91=>'ON',
-92=>'ON',
-93=>'ON',
-94=>'ON',
-95=>'ON',
-96=>'ON',
-97=>'L',
-98=>'L',
-99=>'L',
-100=>'L',
-101=>'L',
-102=>'L',
-103=>'L',
-104=>'L',
-105=>'L',
-106=>'L',
-107=>'L',
-108=>'L',
-109=>'L',
-110=>'L',
-111=>'L',
-112=>'L',
-113=>'L',
-114=>'L',
-115=>'L',
-116=>'L',
-117=>'L',
-118=>'L',
-119=>'L',
-120=>'L',
-121=>'L',
-122=>'L',
-123=>'ON',
-124=>'ON',
-125=>'ON',
-126=>'ON',
-127=>'BN',
-128=>'BN',
-129=>'BN',
-130=>'BN',
-131=>'BN',
-132=>'BN',
-133=>'B',
-134=>'BN',
-135=>'BN',
-136=>'BN',
-137=>'BN',
-138=>'BN',
-139=>'BN',
-140=>'BN',
-141=>'BN',
-142=>'BN',
-143=>'BN',
-144=>'BN',
-145=>'BN',
-146=>'BN',
-147=>'BN',
-148=>'BN',
-149=>'BN',
-150=>'BN',
-151=>'BN',
-152=>'BN',
-153=>'BN',
-154=>'BN',
-155=>'BN',
-156=>'BN',
-157=>'BN',
-158=>'BN',
-159=>'BN',
-160=>'CS',
-161=>'ON',
-162=>'ET',
-163=>'ET',
-164=>'ET',
-165=>'ET',
-166=>'ON',
-167=>'ON',
-168=>'ON',
-169=>'ON',
-170=>'L',
-171=>'ON',
-172=>'ON',
-173=>'BN',
-174=>'ON',
-175=>'ON',
-176=>'ET',
-177=>'ET',
-178=>'EN',
-179=>'EN',
-180=>'ON',
-181=>'L',
-182=>'ON',
-183=>'ON',
-184=>'ON',
-185=>'EN',
-186=>'L',
-187=>'ON',
-188=>'ON',
-189=>'ON',
-190=>'ON',
-191=>'ON',
-192=>'L',
-193=>'L',
-194=>'L',
-195=>'L',
-196=>'L',
-197=>'L',
-198=>'L',
-199=>'L',
-200=>'L',
-201=>'L',
-202=>'L',
-203=>'L',
-204=>'L',
-205=>'L',
-206=>'L',
-207=>'L',
-208=>'L',
-209=>'L',
-210=>'L',
-211=>'L',
-212=>'L',
-213=>'L',
-214=>'L',
-215=>'ON',
-216=>'L',
-217=>'L',
-218=>'L',
-219=>'L',
-220=>'L',
-221=>'L',
-222=>'L',
-223=>'L',
-224=>'L',
-225=>'L',
-226=>'L',
-227=>'L',
-228=>'L',
-229=>'L',
-230=>'L',
-231=>'L',
-232=>'L',
-233=>'L',
-234=>'L',
-235=>'L',
-236=>'L',
-237=>'L',
-238=>'L',
-239=>'L',
-240=>'L',
-241=>'L',
-242=>'L',
-243=>'L',
-244=>'L',
-245=>'L',
-246=>'L',
-247=>'ON',
-248=>'L',
-249=>'L',
-250=>'L',
-251=>'L',
-252=>'L',
-253=>'L',
-254=>'L',
-255=>'L',
-256=>'L',
-257=>'L',
-258=>'L',
-259=>'L',
-260=>'L',
-261=>'L',
-262=>'L',
-263=>'L',
-264=>'L',
-265=>'L',
-266=>'L',
-267=>'L',
-268=>'L',
-269=>'L',
-270=>'L',
-271=>'L',
-272=>'L',
-273=>'L',
-274=>'L',
-275=>'L',
-276=>'L',
-277=>'L',
-278=>'L',
-279=>'L',
-280=>'L',
-281=>'L',
-282=>'L',
-283=>'L',
-284=>'L',
-285=>'L',
-286=>'L',
-287=>'L',
-288=>'L',
-289=>'L',
-290=>'L',
-291=>'L',
-292=>'L',
-293=>'L',
-294=>'L',
-295=>'L',
-296=>'L',
-297=>'L',
-298=>'L',
-299=>'L',
-300=>'L',
-301=>'L',
-302=>'L',
-303=>'L',
-304=>'L',
-305=>'L',
-306=>'L',
-307=>'L',
-308=>'L',
-309=>'L',
-310=>'L',
-311=>'L',
-312=>'L',
-313=>'L',
-314=>'L',
-315=>'L',
-316=>'L',
-317=>'L',
-318=>'L',
-319=>'L',
-320=>'L',
-321=>'L',
-322=>'L',
-323=>'L',
-324=>'L',
-325=>'L',
-326=>'L',
-327=>'L',
-328=>'L',
-329=>'L',
-330=>'L',
-331=>'L',
-332=>'L',
-333=>'L',
-334=>'L',
-335=>'L',
-336=>'L',
-337=>'L',
-338=>'L',
-339=>'L',
-340=>'L',
-341=>'L',
-342=>'L',
-343=>'L',
-344=>'L',
-345=>'L',
-346=>'L',
-347=>'L',
-348=>'L',
-349=>'L',
-350=>'L',
-351=>'L',
-352=>'L',
-353=>'L',
-354=>'L',
-355=>'L',
-356=>'L',
-357=>'L',
-358=>'L',
-359=>'L',
-360=>'L',
-361=>'L',
-362=>'L',
-363=>'L',
-364=>'L',
-365=>'L',
-366=>'L',
-367=>'L',
-368=>'L',
-369=>'L',
-370=>'L',
-371=>'L',
-372=>'L',
-373=>'L',
-374=>'L',
-375=>'L',
-376=>'L',
-377=>'L',
-378=>'L',
-379=>'L',
-380=>'L',
-381=>'L',
-382=>'L',
-383=>'L',
-384=>'L',
-385=>'L',
-386=>'L',
-387=>'L',
-388=>'L',
-389=>'L',
-390=>'L',
-391=>'L',
-392=>'L',
-393=>'L',
-394=>'L',
-395=>'L',
-396=>'L',
-397=>'L',
-398=>'L',
-399=>'L',
-400=>'L',
-401=>'L',
-402=>'L',
-403=>'L',
-404=>'L',
-405=>'L',
-406=>'L',
-407=>'L',
-408=>'L',
-409=>'L',
-410=>'L',
-411=>'L',
-412=>'L',
-413=>'L',
-414=>'L',
-415=>'L',
-416=>'L',
-417=>'L',
-418=>'L',
-419=>'L',
-420=>'L',
-421=>'L',
-422=>'L',
-423=>'L',
-424=>'L',
-425=>'L',
-426=>'L',
-427=>'L',
-428=>'L',
-429=>'L',
-430=>'L',
-431=>'L',
-432=>'L',
-433=>'L',
-434=>'L',
-435=>'L',
-436=>'L',
-437=>'L',
-438=>'L',
-439=>'L',
-440=>'L',
-441=>'L',
-442=>'L',
-443=>'L',
-444=>'L',
-445=>'L',
-446=>'L',
-447=>'L',
-448=>'L',
-449=>'L',
-450=>'L',
-451=>'L',
-452=>'L',
-453=>'L',
-454=>'L',
-455=>'L',
-456=>'L',
-457=>'L',
-458=>'L',
-459=>'L',
-460=>'L',
-461=>'L',
-462=>'L',
-463=>'L',
-464=>'L',
-465=>'L',
-466=>'L',
-467=>'L',
-468=>'L',
-469=>'L',
-470=>'L',
-471=>'L',
-472=>'L',
-473=>'L',
-474=>'L',
-475=>'L',
-476=>'L',
-477=>'L',
-478=>'L',
-479=>'L',
-480=>'L',
-481=>'L',
-482=>'L',
-483=>'L',
-484=>'L',
-485=>'L',
-486=>'L',
-487=>'L',
-488=>'L',
-489=>'L',
-490=>'L',
-491=>'L',
-492=>'L',
-493=>'L',
-494=>'L',
-495=>'L',
-496=>'L',
-497=>'L',
-498=>'L',
-499=>'L',
-500=>'L',
-501=>'L',
-502=>'L',
-503=>'L',
-504=>'L',
-505=>'L',
-506=>'L',
-507=>'L',
-508=>'L',
-509=>'L',
-510=>'L',
-511=>'L',
-512=>'L',
-513=>'L',
-514=>'L',
-515=>'L',
-516=>'L',
-517=>'L',
-518=>'L',
-519=>'L',
-520=>'L',
-521=>'L',
-522=>'L',
-523=>'L',
-524=>'L',
-525=>'L',
-526=>'L',
-527=>'L',
-528=>'L',
-529=>'L',
-530=>'L',
-531=>'L',
-532=>'L',
-533=>'L',
-534=>'L',
-535=>'L',
-536=>'L',
-537=>'L',
-538=>'L',
-539=>'L',
-540=>'L',
-541=>'L',
-542=>'L',
-543=>'L',
-544=>'L',
-545=>'L',
-546=>'L',
-547=>'L',
-548=>'L',
-549=>'L',
-550=>'L',
-551=>'L',
-552=>'L',
-553=>'L',
-554=>'L',
-555=>'L',
-556=>'L',
-557=>'L',
-558=>'L',
-559=>'L',
-560=>'L',
-561=>'L',
-562=>'L',
-563=>'L',
-564=>'L',
-565=>'L',
-566=>'L',
-567=>'L',
-568=>'L',
-569=>'L',
-570=>'L',
-571=>'L',
-572=>'L',
-573=>'L',
-574=>'L',
-575=>'L',
-576=>'L',
-577=>'L',
-578=>'L',
-579=>'L',
-580=>'L',
-581=>'L',
-582=>'L',
-583=>'L',
-584=>'L',
-585=>'L',
-586=>'L',
-587=>'L',
-588=>'L',
-589=>'L',
-590=>'L',
-591=>'L',
-592=>'L',
-593=>'L',
-594=>'L',
-595=>'L',
-596=>'L',
-597=>'L',
-598=>'L',
-599=>'L',
-600=>'L',
-601=>'L',
-602=>'L',
-603=>'L',
-604=>'L',
-605=>'L',
-606=>'L',
-607=>'L',
-608=>'L',
-609=>'L',
-610=>'L',
-611=>'L',
-612=>'L',
-613=>'L',
-614=>'L',
-615=>'L',
-616=>'L',
-617=>'L',
-618=>'L',
-619=>'L',
-620=>'L',
-621=>'L',
-622=>'L',
-623=>'L',
-624=>'L',
-625=>'L',
-626=>'L',
-627=>'L',
-628=>'L',
-629=>'L',
-630=>'L',
-631=>'L',
-632=>'L',
-633=>'L',
-634=>'L',
-635=>'L',
-636=>'L',
-637=>'L',
-638=>'L',
-639=>'L',
-640=>'L',
-641=>'L',
-642=>'L',
-643=>'L',
-644=>'L',
-645=>'L',
-646=>'L',
-647=>'L',
-648=>'L',
-649=>'L',
-650=>'L',
-651=>'L',
-652=>'L',
-653=>'L',
-654=>'L',
-655=>'L',
-656=>'L',
-657=>'L',
-658=>'L',
-659=>'L',
-660=>'L',
-661=>'L',
-662=>'L',
-663=>'L',
-664=>'L',
-665=>'L',
-666=>'L',
-667=>'L',
-668=>'L',
-669=>'L',
-670=>'L',
-671=>'L',
-672=>'L',
-673=>'L',
-674=>'L',
-675=>'L',
-676=>'L',
-677=>'L',
-678=>'L',
-679=>'L',
-680=>'L',
-681=>'L',
-682=>'L',
-683=>'L',
-684=>'L',
-685=>'L',
-686=>'L',
-687=>'L',
-688=>'L',
-689=>'L',
-690=>'L',
-691=>'L',
-692=>'L',
-693=>'L',
-694=>'L',
-695=>'L',
-696=>'L',
-697=>'ON',
-698=>'ON',
-699=>'L',
-700=>'L',
-701=>'L',
-702=>'L',
-703=>'L',
-704=>'L',
-705=>'L',
-706=>'ON',
-707=>'ON',
-708=>'ON',
-709=>'ON',
-710=>'ON',
-711=>'ON',
-712=>'ON',
-713=>'ON',
-714=>'ON',
-715=>'ON',
-716=>'ON',
-717=>'ON',
-718=>'ON',
-719=>'ON',
-720=>'L',
-721=>'L',
-722=>'ON',
-723=>'ON',
-724=>'ON',
-725=>'ON',
-726=>'ON',
-727=>'ON',
-728=>'ON',
-729=>'ON',
-730=>'ON',
-731=>'ON',
-732=>'ON',
-733=>'ON',
-734=>'ON',
-735=>'ON',
-736=>'L',
-737=>'L',
-738=>'L',
-739=>'L',
-740=>'L',
-741=>'ON',
-742=>'ON',
-743=>'ON',
-744=>'ON',
-745=>'ON',
-746=>'ON',
-747=>'ON',
-748=>'ON',
-749=>'ON',
-750=>'L',
-751=>'ON',
-752=>'ON',
-753=>'ON',
-754=>'ON',
-755=>'ON',
-756=>'ON',
-757=>'ON',
-758=>'ON',
-759=>'ON',
-760=>'ON',
-761=>'ON',
-762=>'ON',
-763=>'ON',
-764=>'ON',
-765=>'ON',
-766=>'ON',
-767=>'ON',
-768=>'NSM',
-769=>'NSM',
-770=>'NSM',
-771=>'NSM',
-772=>'NSM',
-773=>'NSM',
-774=>'NSM',
-775=>'NSM',
-776=>'NSM',
-777=>'NSM',
-778=>'NSM',
-779=>'NSM',
-780=>'NSM',
-781=>'NSM',
-782=>'NSM',
-783=>'NSM',
-784=>'NSM',
-785=>'NSM',
-786=>'NSM',
-787=>'NSM',
-788=>'NSM',
-789=>'NSM',
-790=>'NSM',
-791=>'NSM',
-792=>'NSM',
-793=>'NSM',
-794=>'NSM',
-795=>'NSM',
-796=>'NSM',
-797=>'NSM',
-798=>'NSM',
-799=>'NSM',
-800=>'NSM',
-801=>'NSM',
-802=>'NSM',
-803=>'NSM',
-804=>'NSM',
-805=>'NSM',
-806=>'NSM',
-807=>'NSM',
-808=>'NSM',
-809=>'NSM',
-810=>'NSM',
-811=>'NSM',
-812=>'NSM',
-813=>'NSM',
-814=>'NSM',
-815=>'NSM',
-816=>'NSM',
-817=>'NSM',
-818=>'NSM',
-819=>'NSM',
-820=>'NSM',
-821=>'NSM',
-822=>'NSM',
-823=>'NSM',
-824=>'NSM',
-825=>'NSM',
-826=>'NSM',
-827=>'NSM',
-828=>'NSM',
-829=>'NSM',
-830=>'NSM',
-831=>'NSM',
-832=>'NSM',
-833=>'NSM',
-834=>'NSM',
-835=>'NSM',
-836=>'NSM',
-837=>'NSM',
-838=>'NSM',
-839=>'NSM',
-840=>'NSM',
-841=>'NSM',
-842=>'NSM',
-843=>'NSM',
-844=>'NSM',
-845=>'NSM',
-846=>'NSM',
-847=>'NSM',
-848=>'NSM',
-849=>'NSM',
-850=>'NSM',
-851=>'NSM',
-852=>'NSM',
-853=>'NSM',
-854=>'NSM',
-855=>'NSM',
-856=>'NSM',
-857=>'NSM',
-858=>'NSM',
-859=>'NSM',
-860=>'NSM',
-861=>'NSM',
-862=>'NSM',
-863=>'NSM',
-864=>'NSM',
-865=>'NSM',
-866=>'NSM',
-867=>'NSM',
-868=>'NSM',
-869=>'NSM',
-870=>'NSM',
-871=>'NSM',
-872=>'NSM',
-873=>'NSM',
-874=>'NSM',
-875=>'NSM',
-876=>'NSM',
-877=>'NSM',
-878=>'NSM',
-879=>'NSM',
-884=>'ON',
-885=>'ON',
-890=>'L',
-891=>'L',
-892=>'L',
-893=>'L',
-894=>'ON',
-900=>'ON',
-901=>'ON',
-902=>'L',
-903=>'ON',
-904=>'L',
-905=>'L',
-906=>'L',
-908=>'L',
-910=>'L',
-911=>'L',
-912=>'L',
-913=>'L',
-914=>'L',
-915=>'L',
-916=>'L',
-917=>'L',
-918=>'L',
-919=>'L',
-920=>'L',
-921=>'L',
-922=>'L',
-923=>'L',
-924=>'L',
-925=>'L',
-926=>'L',
-927=>'L',
-928=>'L',
-929=>'L',
-931=>'L',
-932=>'L',
-933=>'L',
-934=>'L',
-935=>'L',
-936=>'L',
-937=>'L',
-938=>'L',
-939=>'L',
-940=>'L',
-941=>'L',
-942=>'L',
-943=>'L',
-944=>'L',
-945=>'L',
-946=>'L',
-947=>'L',
-948=>'L',
-949=>'L',
-950=>'L',
-951=>'L',
-952=>'L',
-953=>'L',
-954=>'L',
-955=>'L',
-956=>'L',
-957=>'L',
-958=>'L',
-959=>'L',
-960=>'L',
-961=>'L',
-962=>'L',
-963=>'L',
-964=>'L',
-965=>'L',
-966=>'L',
-967=>'L',
-968=>'L',
-969=>'L',
-970=>'L',
-971=>'L',
-972=>'L',
-973=>'L',
-974=>'L',
-976=>'L',
-977=>'L',
-978=>'L',
-979=>'L',
-980=>'L',
-981=>'L',
-982=>'L',
-983=>'L',
-984=>'L',
-985=>'L',
-986=>'L',
-987=>'L',
-988=>'L',
-989=>'L',
-990=>'L',
-991=>'L',
-992=>'L',
-993=>'L',
-994=>'L',
-995=>'L',
-996=>'L',
-997=>'L',
-998=>'L',
-999=>'L',
-1000=>'L',
-1001=>'L',
-1002=>'L',
-1003=>'L',
-1004=>'L',
-1005=>'L',
-1006=>'L',
-1007=>'L',
-1008=>'L',
-1009=>'L',
-1010=>'L',
-1011=>'L',
-1012=>'L',
-1013=>'L',
-1014=>'ON',
-1015=>'L',
-1016=>'L',
-1017=>'L',
-1018=>'L',
-1019=>'L',
-1020=>'L',
-1021=>'L',
-1022=>'L',
-1023=>'L',
-1024=>'L',
-1025=>'L',
-1026=>'L',
-1027=>'L',
-1028=>'L',
-1029=>'L',
-1030=>'L',
-1031=>'L',
-1032=>'L',
-1033=>'L',
-1034=>'L',
-1035=>'L',
-1036=>'L',
-1037=>'L',
-1038=>'L',
-1039=>'L',
-1040=>'L',
-1041=>'L',
-1042=>'L',
-1043=>'L',
-1044=>'L',
-1045=>'L',
-1046=>'L',
-1047=>'L',
-1048=>'L',
-1049=>'L',
-1050=>'L',
-1051=>'L',
-1052=>'L',
-1053=>'L',
-1054=>'L',
-1055=>'L',
-1056=>'L',
-1057=>'L',
-1058=>'L',
-1059=>'L',
-1060=>'L',
-1061=>'L',
-1062=>'L',
-1063=>'L',
-1064=>'L',
-1065=>'L',
-1066=>'L',
-1067=>'L',
-1068=>'L',
-1069=>'L',
-1070=>'L',
-1071=>'L',
-1072=>'L',
-1073=>'L',
-1074=>'L',
-1075=>'L',
-1076=>'L',
-1077=>'L',
-1078=>'L',
-1079=>'L',
-1080=>'L',
-1081=>'L',
-1082=>'L',
-1083=>'L',
-1084=>'L',
-1085=>'L',
-1086=>'L',
-1087=>'L',
-1088=>'L',
-1089=>'L',
-1090=>'L',
-1091=>'L',
-1092=>'L',
-1093=>'L',
-1094=>'L',
-1095=>'L',
-1096=>'L',
-1097=>'L',
-1098=>'L',
-1099=>'L',
-1100=>'L',
-1101=>'L',
-1102=>'L',
-1103=>'L',
-1104=>'L',
-1105=>'L',
-1106=>'L',
-1107=>'L',
-1108=>'L',
-1109=>'L',
-1110=>'L',
-1111=>'L',
-1112=>'L',
-1113=>'L',
-1114=>'L',
-1115=>'L',
-1116=>'L',
-1117=>'L',
-1118=>'L',
-1119=>'L',
-1120=>'L',
-1121=>'L',
-1122=>'L',
-1123=>'L',
-1124=>'L',
-1125=>'L',
-1126=>'L',
-1127=>'L',
-1128=>'L',
-1129=>'L',
-1130=>'L',
-1131=>'L',
-1132=>'L',
-1133=>'L',
-1134=>'L',
-1135=>'L',
-1136=>'L',
-1137=>'L',
-1138=>'L',
-1139=>'L',
-1140=>'L',
-1141=>'L',
-1142=>'L',
-1143=>'L',
-1144=>'L',
-1145=>'L',
-1146=>'L',
-1147=>'L',
-1148=>'L',
-1149=>'L',
-1150=>'L',
-1151=>'L',
-1152=>'L',
-1153=>'L',
-1154=>'L',
-1155=>'NSM',
-1156=>'NSM',
-1157=>'NSM',
-1158=>'NSM',
-1160=>'NSM',
-1161=>'NSM',
-1162=>'L',
-1163=>'L',
-1164=>'L',
-1165=>'L',
-1166=>'L',
-1167=>'L',
-1168=>'L',
-1169=>'L',
-1170=>'L',
-1171=>'L',
-1172=>'L',
-1173=>'L',
-1174=>'L',
-1175=>'L',
-1176=>'L',
-1177=>'L',
-1178=>'L',
-1179=>'L',
-1180=>'L',
-1181=>'L',
-1182=>'L',
-1183=>'L',
-1184=>'L',
-1185=>'L',
-1186=>'L',
-1187=>'L',
-1188=>'L',
-1189=>'L',
-1190=>'L',
-1191=>'L',
-1192=>'L',
-1193=>'L',
-1194=>'L',
-1195=>'L',
-1196=>'L',
-1197=>'L',
-1198=>'L',
-1199=>'L',
-1200=>'L',
-1201=>'L',
-1202=>'L',
-1203=>'L',
-1204=>'L',
-1205=>'L',
-1206=>'L',
-1207=>'L',
-1208=>'L',
-1209=>'L',
-1210=>'L',
-1211=>'L',
-1212=>'L',
-1213=>'L',
-1214=>'L',
-1215=>'L',
-1216=>'L',
-1217=>'L',
-1218=>'L',
-1219=>'L',
-1220=>'L',
-1221=>'L',
-1222=>'L',
-1223=>'L',
-1224=>'L',
-1225=>'L',
-1226=>'L',
-1227=>'L',
-1228=>'L',
-1229=>'L',
-1230=>'L',
-1231=>'L',
-1232=>'L',
-1233=>'L',
-1234=>'L',
-1235=>'L',
-1236=>'L',
-1237=>'L',
-1238=>'L',
-1239=>'L',
-1240=>'L',
-1241=>'L',
-1242=>'L',
-1243=>'L',
-1244=>'L',
-1245=>'L',
-1246=>'L',
-1247=>'L',
-1248=>'L',
-1249=>'L',
-1250=>'L',
-1251=>'L',
-1252=>'L',
-1253=>'L',
-1254=>'L',
-1255=>'L',
-1256=>'L',
-1257=>'L',
-1258=>'L',
-1259=>'L',
-1260=>'L',
-1261=>'L',
-1262=>'L',
-1263=>'L',
-1264=>'L',
-1265=>'L',
-1266=>'L',
-1267=>'L',
-1268=>'L',
-1269=>'L',
-1270=>'L',
-1271=>'L',
-1272=>'L',
-1273=>'L',
-1274=>'L',
-1275=>'L',
-1276=>'L',
-1277=>'L',
-1278=>'L',
-1279=>'L',
-1280=>'L',
-1281=>'L',
-1282=>'L',
-1283=>'L',
-1284=>'L',
-1285=>'L',
-1286=>'L',
-1287=>'L',
-1288=>'L',
-1289=>'L',
-1290=>'L',
-1291=>'L',
-1292=>'L',
-1293=>'L',
-1294=>'L',
-1295=>'L',
-1296=>'L',
-1297=>'L',
-1298=>'L',
-1299=>'L',
-1329=>'L',
-1330=>'L',
-1331=>'L',
-1332=>'L',
-1333=>'L',
-1334=>'L',
-1335=>'L',
-1336=>'L',
-1337=>'L',
-1338=>'L',
-1339=>'L',
-1340=>'L',
-1341=>'L',
-1342=>'L',
-1343=>'L',
-1344=>'L',
-1345=>'L',
-1346=>'L',
-1347=>'L',
-1348=>'L',
-1349=>'L',
-1350=>'L',
-1351=>'L',
-1352=>'L',
-1353=>'L',
-1354=>'L',
-1355=>'L',
-1356=>'L',
-1357=>'L',
-1358=>'L',
-1359=>'L',
-1360=>'L',
-1361=>'L',
-1362=>'L',
-1363=>'L',
-1364=>'L',
-1365=>'L',
-1366=>'L',
-1369=>'L',
-1370=>'L',
-1371=>'L',
-1372=>'L',
-1373=>'L',
-1374=>'L',
-1375=>'L',
-1377=>'L',
-1378=>'L',
-1379=>'L',
-1380=>'L',
-1381=>'L',
-1382=>'L',
-1383=>'L',
-1384=>'L',
-1385=>'L',
-1386=>'L',
-1387=>'L',
-1388=>'L',
-1389=>'L',
-1390=>'L',
-1391=>'L',
-1392=>'L',
-1393=>'L',
-1394=>'L',
-1395=>'L',
-1396=>'L',
-1397=>'L',
-1398=>'L',
-1399=>'L',
-1400=>'L',
-1401=>'L',
-1402=>'L',
-1403=>'L',
-1404=>'L',
-1405=>'L',
-1406=>'L',
-1407=>'L',
-1408=>'L',
-1409=>'L',
-1410=>'L',
-1411=>'L',
-1412=>'L',
-1413=>'L',
-1414=>'L',
-1415=>'L',
-1417=>'L',
-1418=>'ON',
-1425=>'NSM',
-1426=>'NSM',
-1427=>'NSM',
-1428=>'NSM',
-1429=>'NSM',
-1430=>'NSM',
-1431=>'NSM',
-1432=>'NSM',
-1433=>'NSM',
-1434=>'NSM',
-1435=>'NSM',
-1436=>'NSM',
-1437=>'NSM',
-1438=>'NSM',
-1439=>'NSM',
-1440=>'NSM',
-1441=>'NSM',
-1442=>'NSM',
-1443=>'NSM',
-1444=>'NSM',
-1445=>'NSM',
-1446=>'NSM',
-1447=>'NSM',
-1448=>'NSM',
-1449=>'NSM',
-1450=>'NSM',
-1451=>'NSM',
-1452=>'NSM',
-1453=>'NSM',
-1454=>'NSM',
-1455=>'NSM',
-1456=>'NSM',
-1457=>'NSM',
-1458=>'NSM',
-1459=>'NSM',
-1460=>'NSM',
-1461=>'NSM',
-1462=>'NSM',
-1463=>'NSM',
-1464=>'NSM',
-1465=>'NSM',
-1466=>'NSM',
-1467=>'NSM',
-1468=>'NSM',
-1469=>'NSM',
-1470=>'R',
-1471=>'NSM',
-1472=>'R',
-1473=>'NSM',
-1474=>'NSM',
-1475=>'R',
-1476=>'NSM',
-1477=>'NSM',
-1478=>'R',
-1479=>'NSM',
-1488=>'R',
-1489=>'R',
-1490=>'R',
-1491=>'R',
-1492=>'R',
-1493=>'R',
-1494=>'R',
-1495=>'R',
-1496=>'R',
-1497=>'R',
-1498=>'R',
-1499=>'R',
-1500=>'R',
-1501=>'R',
-1502=>'R',
-1503=>'R',
-1504=>'R',
-1505=>'R',
-1506=>'R',
-1507=>'R',
-1508=>'R',
-1509=>'R',
-1510=>'R',
-1511=>'R',
-1512=>'R',
-1513=>'R',
-1514=>'R',
-1520=>'R',
-1521=>'R',
-1522=>'R',
-1523=>'R',
-1524=>'R',
-1536=>'AL',
-1537=>'AL',
-1538=>'AL',
-1539=>'AL',
-1547=>'AL',
-1548=>'CS',
-1549=>'AL',
-1550=>'ON',
-1551=>'ON',
-1552=>'NSM',
-1553=>'NSM',
-1554=>'NSM',
-1555=>'NSM',
-1556=>'NSM',
-1557=>'NSM',
-1563=>'AL',
-1566=>'AL',
-1567=>'AL',
-1569=>'AL',
-1570=>'AL',
-1571=>'AL',
-1572=>'AL',
-1573=>'AL',
-1574=>'AL',
-1575=>'AL',
-1576=>'AL',
-1577=>'AL',
-1578=>'AL',
-1579=>'AL',
-1580=>'AL',
-1581=>'AL',
-1582=>'AL',
-1583=>'AL',
-1584=>'AL',
-1585=>'AL',
-1586=>'AL',
-1587=>'AL',
-1588=>'AL',
-1589=>'AL',
-1590=>'AL',
-1591=>'AL',
-1592=>'AL',
-1593=>'AL',
-1594=>'AL',
-1600=>'AL',
-1601=>'AL',
-1602=>'AL',
-1603=>'AL',
-1604=>'AL',
-1605=>'AL',
-1606=>'AL',
-1607=>'AL',
-1608=>'AL',
-1609=>'AL',
-1610=>'AL',
-1611=>'NSM',
-1612=>'NSM',
-1613=>'NSM',
-1614=>'NSM',
-1615=>'NSM',
-1616=>'NSM',
-1617=>'NSM',
-1618=>'NSM',
-1619=>'NSM',
-1620=>'NSM',
-1621=>'NSM',
-1622=>'NSM',
-1623=>'NSM',
-1624=>'NSM',
-1625=>'NSM',
-1626=>'NSM',
-1627=>'NSM',
-1628=>'NSM',
-1629=>'NSM',
-1630=>'NSM',
-1632=>'AN',
-1633=>'AN',
-1634=>'AN',
-1635=>'AN',
-1636=>'AN',
-1637=>'AN',
-1638=>'AN',
-1639=>'AN',
-1640=>'AN',
-1641=>'AN',
-1642=>'ET',
-1643=>'AN',
-1644=>'AN',
-1645=>'AL',
-1646=>'AL',
-1647=>'AL',
-1648=>'NSM',
-1649=>'AL',
-1650=>'AL',
-1651=>'AL',
-1652=>'AL',
-1653=>'AL',
-1654=>'AL',
-1655=>'AL',
-1656=>'AL',
-1657=>'AL',
-1658=>'AL',
-1659=>'AL',
-1660=>'AL',
-1661=>'AL',
-1662=>'AL',
-1663=>'AL',
-1664=>'AL',
-1665=>'AL',
-1666=>'AL',
-1667=>'AL',
-1668=>'AL',
-1669=>'AL',
-1670=>'AL',
-1671=>'AL',
-1672=>'AL',
-1673=>'AL',
-1674=>'AL',
-1675=>'AL',
-1676=>'AL',
-1677=>'AL',
-1678=>'AL',
-1679=>'AL',
-1680=>'AL',
-1681=>'AL',
-1682=>'AL',
-1683=>'AL',
-1684=>'AL',
-1685=>'AL',
-1686=>'AL',
-1687=>'AL',
-1688=>'AL',
-1689=>'AL',
-1690=>'AL',
-1691=>'AL',
-1692=>'AL',
-1693=>'AL',
-1694=>'AL',
-1695=>'AL',
-1696=>'AL',
-1697=>'AL',
-1698=>'AL',
-1699=>'AL',
-1700=>'AL',
-1701=>'AL',
-1702=>'AL',
-1703=>'AL',
-1704=>'AL',
-1705=>'AL',
-1706=>'AL',
-1707=>'AL',
-1708=>'AL',
-1709=>'AL',
-1710=>'AL',
-1711=>'AL',
-1712=>'AL',
-1713=>'AL',
-1714=>'AL',
-1715=>'AL',
-1716=>'AL',
-1717=>'AL',
-1718=>'AL',
-1719=>'AL',
-1720=>'AL',
-1721=>'AL',
-1722=>'AL',
-1723=>'AL',
-1724=>'AL',
-1725=>'AL',
-1726=>'AL',
-1727=>'AL',
-1728=>'AL',
-1729=>'AL',
-1730=>'AL',
-1731=>'AL',
-1732=>'AL',
-1733=>'AL',
-1734=>'AL',
-1735=>'AL',
-1736=>'AL',
-1737=>'AL',
-1738=>'AL',
-1739=>'AL',
-1740=>'AL',
-1741=>'AL',
-1742=>'AL',
-1743=>'AL',
-1744=>'AL',
-1745=>'AL',
-1746=>'AL',
-1747=>'AL',
-1748=>'AL',
-1749=>'AL',
-1750=>'NSM',
-1751=>'NSM',
-1752=>'NSM',
-1753=>'NSM',
-1754=>'NSM',
-1755=>'NSM',
-1756=>'NSM',
-1757=>'AL',
-1758=>'NSM',
-1759=>'NSM',
-1760=>'NSM',
-1761=>'NSM',
-1762=>'NSM',
-1763=>'NSM',
-1764=>'NSM',
-1765=>'AL',
-1766=>'AL',
-1767=>'NSM',
-1768=>'NSM',
-1769=>'ON',
-1770=>'NSM',
-1771=>'NSM',
-1772=>'NSM',
-1773=>'NSM',
-1774=>'AL',
-1775=>'AL',
-1776=>'EN',
-1777=>'EN',
-1778=>'EN',
-1779=>'EN',
-1780=>'EN',
-1781=>'EN',
-1782=>'EN',
-1783=>'EN',
-1784=>'EN',
-1785=>'EN',
-1786=>'AL',
-1787=>'AL',
-1788=>'AL',
-1789=>'AL',
-1790=>'AL',
-1791=>'AL',
-1792=>'AL',
-1793=>'AL',
-1794=>'AL',
-1795=>'AL',
-1796=>'AL',
-1797=>'AL',
-1798=>'AL',
-1799=>'AL',
-1800=>'AL',
-1801=>'AL',
-1802=>'AL',
-1803=>'AL',
-1804=>'AL',
-1805=>'AL',
-1807=>'BN',
-1808=>'AL',
-1809=>'NSM',
-1810=>'AL',
-1811=>'AL',
-1812=>'AL',
-1813=>'AL',
-1814=>'AL',
-1815=>'AL',
-1816=>'AL',
-1817=>'AL',
-1818=>'AL',
-1819=>'AL',
-1820=>'AL',
-1821=>'AL',
-1822=>'AL',
-1823=>'AL',
-1824=>'AL',
-1825=>'AL',
-1826=>'AL',
-1827=>'AL',
-1828=>'AL',
-1829=>'AL',
-1830=>'AL',
-1831=>'AL',
-1832=>'AL',
-1833=>'AL',
-1834=>'AL',
-1835=>'AL',
-1836=>'AL',
-1837=>'AL',
-1838=>'AL',
-1839=>'AL',
-1840=>'NSM',
-1841=>'NSM',
-1842=>'NSM',
-1843=>'NSM',
-1844=>'NSM',
-1845=>'NSM',
-1846=>'NSM',
-1847=>'NSM',
-1848=>'NSM',
-1849=>'NSM',
-1850=>'NSM',
-1851=>'NSM',
-1852=>'NSM',
-1853=>'NSM',
-1854=>'NSM',
-1855=>'NSM',
-1856=>'NSM',
-1857=>'NSM',
-1858=>'NSM',
-1859=>'NSM',
-1860=>'NSM',
-1861=>'NSM',
-1862=>'NSM',
-1863=>'NSM',
-1864=>'NSM',
-1865=>'NSM',
-1866=>'NSM',
-1869=>'AL',
-1870=>'AL',
-1871=>'AL',
-1872=>'AL',
-1873=>'AL',
-1874=>'AL',
-1875=>'AL',
-1876=>'AL',
-1877=>'AL',
-1878=>'AL',
-1879=>'AL',
-1880=>'AL',
-1881=>'AL',
-1882=>'AL',
-1883=>'AL',
-1884=>'AL',
-1885=>'AL',
-1886=>'AL',
-1887=>'AL',
-1888=>'AL',
-1889=>'AL',
-1890=>'AL',
-1891=>'AL',
-1892=>'AL',
-1893=>'AL',
-1894=>'AL',
-1895=>'AL',
-1896=>'AL',
-1897=>'AL',
-1898=>'AL',
-1899=>'AL',
-1900=>'AL',
-1901=>'AL',
-1920=>'AL',
-1921=>'AL',
-1922=>'AL',
-1923=>'AL',
-1924=>'AL',
-1925=>'AL',
-1926=>'AL',
-1927=>'AL',
-1928=>'AL',
-1929=>'AL',
-1930=>'AL',
-1931=>'AL',
-1932=>'AL',
-1933=>'AL',
-1934=>'AL',
-1935=>'AL',
-1936=>'AL',
-1937=>'AL',
-1938=>'AL',
-1939=>'AL',
-1940=>'AL',
-1941=>'AL',
-1942=>'AL',
-1943=>'AL',
-1944=>'AL',
-1945=>'AL',
-1946=>'AL',
-1947=>'AL',
-1948=>'AL',
-1949=>'AL',
-1950=>'AL',
-1951=>'AL',
-1952=>'AL',
-1953=>'AL',
-1954=>'AL',
-1955=>'AL',
-1956=>'AL',
-1957=>'AL',
-1958=>'NSM',
-1959=>'NSM',
-1960=>'NSM',
-1961=>'NSM',
-1962=>'NSM',
-1963=>'NSM',
-1964=>'NSM',
-1965=>'NSM',
-1966=>'NSM',
-1967=>'NSM',
-1968=>'NSM',
-1969=>'AL',
-1984=>'R',
-1985=>'R',
-1986=>'R',
-1987=>'R',
-1988=>'R',
-1989=>'R',
-1990=>'R',
-1991=>'R',
-1992=>'R',
-1993=>'R',
-1994=>'R',
-1995=>'R',
-1996=>'R',
-1997=>'R',
-1998=>'R',
-1999=>'R',
-2000=>'R',
-2001=>'R',
-2002=>'R',
-2003=>'R',
-2004=>'R',
-2005=>'R',
-2006=>'R',
-2007=>'R',
-2008=>'R',
-2009=>'R',
-2010=>'R',
-2011=>'R',
-2012=>'R',
-2013=>'R',
-2014=>'R',
-2015=>'R',
-2016=>'R',
-2017=>'R',
-2018=>'R',
-2019=>'R',
-2020=>'R',
-2021=>'R',
-2022=>'R',
-2023=>'R',
-2024=>'R',
-2025=>'R',
-2026=>'R',
-2027=>'NSM',
-2028=>'NSM',
-2029=>'NSM',
-2030=>'NSM',
-2031=>'NSM',
-2032=>'NSM',
-2033=>'NSM',
-2034=>'NSM',
-2035=>'NSM',
-2036=>'R',
-2037=>'R',
-2038=>'ON',
-2039=>'ON',
-2040=>'ON',
-2041=>'ON',
-2042=>'R',
-2305=>'NSM',
-2306=>'NSM',
-2307=>'L',
-2308=>'L',
-2309=>'L',
-2310=>'L',
-2311=>'L',
-2312=>'L',
-2313=>'L',
-2314=>'L',
-2315=>'L',
-2316=>'L',
-2317=>'L',
-2318=>'L',
-2319=>'L',
-2320=>'L',
-2321=>'L',
-2322=>'L',
-2323=>'L',
-2324=>'L',
-2325=>'L',
-2326=>'L',
-2327=>'L',
-2328=>'L',
-2329=>'L',
-2330=>'L',
-2331=>'L',
-2332=>'L',
-2333=>'L',
-2334=>'L',
-2335=>'L',
-2336=>'L',
-2337=>'L',
-2338=>'L',
-2339=>'L',
-2340=>'L',
-2341=>'L',
-2342=>'L',
-2343=>'L',
-2344=>'L',
-2345=>'L',
-2346=>'L',
-2347=>'L',
-2348=>'L',
-2349=>'L',
-2350=>'L',
-2351=>'L',
-2352=>'L',
-2353=>'L',
-2354=>'L',
-2355=>'L',
-2356=>'L',
-2357=>'L',
-2358=>'L',
-2359=>'L',
-2360=>'L',
-2361=>'L',
-2364=>'NSM',
-2365=>'L',
-2366=>'L',
-2367=>'L',
-2368=>'L',
-2369=>'NSM',
-2370=>'NSM',
-2371=>'NSM',
-2372=>'NSM',
-2373=>'NSM',
-2374=>'NSM',
-2375=>'NSM',
-2376=>'NSM',
-2377=>'L',
-2378=>'L',
-2379=>'L',
-2380=>'L',
-2381=>'NSM',
-2384=>'L',
-2385=>'NSM',
-2386=>'NSM',
-2387=>'NSM',
-2388=>'NSM',
-2392=>'L',
-2393=>'L',
-2394=>'L',
-2395=>'L',
-2396=>'L',
-2397=>'L',
-2398=>'L',
-2399=>'L',
-2400=>'L',
-2401=>'L',
-2402=>'NSM',
-2403=>'NSM',
-2404=>'L',
-2405=>'L',
-2406=>'L',
-2407=>'L',
-2408=>'L',
-2409=>'L',
-2410=>'L',
-2411=>'L',
-2412=>'L',
-2413=>'L',
-2414=>'L',
-2415=>'L',
-2416=>'L',
-2427=>'L',
-2428=>'L',
-2429=>'L',
-2430=>'L',
-2431=>'L',
-2433=>'NSM',
-2434=>'L',
-2435=>'L',
-2437=>'L',
-2438=>'L',
-2439=>'L',
-2440=>'L',
-2441=>'L',
-2442=>'L',
-2443=>'L',
-2444=>'L',
-2447=>'L',
-2448=>'L',
-2451=>'L',
-2452=>'L',
-2453=>'L',
-2454=>'L',
-2455=>'L',
-2456=>'L',
-2457=>'L',
-2458=>'L',
-2459=>'L',
-2460=>'L',
-2461=>'L',
-2462=>'L',
-2463=>'L',
-2464=>'L',
-2465=>'L',
-2466=>'L',
-2467=>'L',
-2468=>'L',
-2469=>'L',
-2470=>'L',
-2471=>'L',
-2472=>'L',
-2474=>'L',
-2475=>'L',
-2476=>'L',
-2477=>'L',
-2478=>'L',
-2479=>'L',
-2480=>'L',
-2482=>'L',
-2486=>'L',
-2487=>'L',
-2488=>'L',
-2489=>'L',
-2492=>'NSM',
-2493=>'L',
-2494=>'L',
-2495=>'L',
-2496=>'L',
-2497=>'NSM',
-2498=>'NSM',
-2499=>'NSM',
-2500=>'NSM',
-2503=>'L',
-2504=>'L',
-2507=>'L',
-2508=>'L',
-2509=>'NSM',
-2510=>'L',
-2519=>'L',
-2524=>'L',
-2525=>'L',
-2527=>'L',
-2528=>'L',
-2529=>'L',
-2530=>'NSM',
-2531=>'NSM',
-2534=>'L',
-2535=>'L',
-2536=>'L',
-2537=>'L',
-2538=>'L',
-2539=>'L',
-2540=>'L',
-2541=>'L',
-2542=>'L',
-2543=>'L',
-2544=>'L',
-2545=>'L',
-2546=>'ET',
-2547=>'ET',
-2548=>'L',
-2549=>'L',
-2550=>'L',
-2551=>'L',
-2552=>'L',
-2553=>'L',
-2554=>'L',
-2561=>'NSM',
-2562=>'NSM',
-2563=>'L',
-2565=>'L',
-2566=>'L',
-2567=>'L',
-2568=>'L',
-2569=>'L',
-2570=>'L',
-2575=>'L',
-2576=>'L',
-2579=>'L',
-2580=>'L',
-2581=>'L',
-2582=>'L',
-2583=>'L',
-2584=>'L',
-2585=>'L',
-2586=>'L',
-2587=>'L',
-2588=>'L',
-2589=>'L',
-2590=>'L',
-2591=>'L',
-2592=>'L',
-2593=>'L',
-2594=>'L',
-2595=>'L',
-2596=>'L',
-2597=>'L',
-2598=>'L',
-2599=>'L',
-2600=>'L',
-2602=>'L',
-2603=>'L',
-2604=>'L',
-2605=>'L',
-2606=>'L',
-2607=>'L',
-2608=>'L',
-2610=>'L',
-2611=>'L',
-2613=>'L',
-2614=>'L',
-2616=>'L',
-2617=>'L',
-2620=>'NSM',
-2622=>'L',
-2623=>'L',
-2624=>'L',
-2625=>'NSM',
-2626=>'NSM',
-2631=>'NSM',
-2632=>'NSM',
-2635=>'NSM',
-2636=>'NSM',
-2637=>'NSM',
-2649=>'L',
-2650=>'L',
-2651=>'L',
-2652=>'L',
-2654=>'L',
-2662=>'L',
-2663=>'L',
-2664=>'L',
-2665=>'L',
-2666=>'L',
-2667=>'L',
-2668=>'L',
-2669=>'L',
-2670=>'L',
-2671=>'L',
-2672=>'NSM',
-2673=>'NSM',
-2674=>'L',
-2675=>'L',
-2676=>'L',
-2689=>'NSM',
-2690=>'NSM',
-2691=>'L',
-2693=>'L',
-2694=>'L',
-2695=>'L',
-2696=>'L',
-2697=>'L',
-2698=>'L',
-2699=>'L',
-2700=>'L',
-2701=>'L',
-2703=>'L',
-2704=>'L',
-2705=>'L',
-2707=>'L',
-2708=>'L',
-2709=>'L',
-2710=>'L',
-2711=>'L',
-2712=>'L',
-2713=>'L',
-2714=>'L',
-2715=>'L',
-2716=>'L',
-2717=>'L',
-2718=>'L',
-2719=>'L',
-2720=>'L',
-2721=>'L',
-2722=>'L',
-2723=>'L',
-2724=>'L',
-2725=>'L',
-2726=>'L',
-2727=>'L',
-2728=>'L',
-2730=>'L',
-2731=>'L',
-2732=>'L',
-2733=>'L',
-2734=>'L',
-2735=>'L',
-2736=>'L',
-2738=>'L',
-2739=>'L',
-2741=>'L',
-2742=>'L',
-2743=>'L',
-2744=>'L',
-2745=>'L',
-2748=>'NSM',
-2749=>'L',
-2750=>'L',
-2751=>'L',
-2752=>'L',
-2753=>'NSM',
-2754=>'NSM',
-2755=>'NSM',
-2756=>'NSM',
-2757=>'NSM',
-2759=>'NSM',
-2760=>'NSM',
-2761=>'L',
-2763=>'L',
-2764=>'L',
-2765=>'NSM',
-2768=>'L',
-2784=>'L',
-2785=>'L',
-2786=>'NSM',
-2787=>'NSM',
-2790=>'L',
-2791=>'L',
-2792=>'L',
-2793=>'L',
-2794=>'L',
-2795=>'L',
-2796=>'L',
-2797=>'L',
-2798=>'L',
-2799=>'L',
-2801=>'ET',
-2817=>'NSM',
-2818=>'L',
-2819=>'L',
-2821=>'L',
-2822=>'L',
-2823=>'L',
-2824=>'L',
-2825=>'L',
-2826=>'L',
-2827=>'L',
-2828=>'L',
-2831=>'L',
-2832=>'L',
-2835=>'L',
-2836=>'L',
-2837=>'L',
-2838=>'L',
-2839=>'L',
-2840=>'L',
-2841=>'L',
-2842=>'L',
-2843=>'L',
-2844=>'L',
-2845=>'L',
-2846=>'L',
-2847=>'L',
-2848=>'L',
-2849=>'L',
-2850=>'L',
-2851=>'L',
-2852=>'L',
-2853=>'L',
-2854=>'L',
-2855=>'L',
-2856=>'L',
-2858=>'L',
-2859=>'L',
-2860=>'L',
-2861=>'L',
-2862=>'L',
-2863=>'L',
-2864=>'L',
-2866=>'L',
-2867=>'L',
-2869=>'L',
-2870=>'L',
-2871=>'L',
-2872=>'L',
-2873=>'L',
-2876=>'NSM',
-2877=>'L',
-2878=>'L',
-2879=>'NSM',
-2880=>'L',
-2881=>'NSM',
-2882=>'NSM',
-2883=>'NSM',
-2887=>'L',
-2888=>'L',
-2891=>'L',
-2892=>'L',
-2893=>'NSM',
-2902=>'NSM',
-2903=>'L',
-2908=>'L',
-2909=>'L',
-2911=>'L',
-2912=>'L',
-2913=>'L',
-2918=>'L',
-2919=>'L',
-2920=>'L',
-2921=>'L',
-2922=>'L',
-2923=>'L',
-2924=>'L',
-2925=>'L',
-2926=>'L',
-2927=>'L',
-2928=>'L',
-2929=>'L',
-2946=>'NSM',
-2947=>'L',
-2949=>'L',
-2950=>'L',
-2951=>'L',
-2952=>'L',
-2953=>'L',
-2954=>'L',
-2958=>'L',
-2959=>'L',
-2960=>'L',
-2962=>'L',
-2963=>'L',
-2964=>'L',
-2965=>'L',
-2969=>'L',
-2970=>'L',
-2972=>'L',
-2974=>'L',
-2975=>'L',
-2979=>'L',
-2980=>'L',
-2984=>'L',
-2985=>'L',
-2986=>'L',
-2990=>'L',
-2991=>'L',
-2992=>'L',
-2993=>'L',
-2994=>'L',
-2995=>'L',
-2996=>'L',
-2997=>'L',
-2998=>'L',
-2999=>'L',
-3000=>'L',
-3001=>'L',
-3006=>'L',
-3007=>'L',
-3008=>'NSM',
-3009=>'L',
-3010=>'L',
-3014=>'L',
-3015=>'L',
-3016=>'L',
-3018=>'L',
-3019=>'L',
-3020=>'L',
-3021=>'NSM',
-3031=>'L',
-3046=>'L',
-3047=>'L',
-3048=>'L',
-3049=>'L',
-3050=>'L',
-3051=>'L',
-3052=>'L',
-3053=>'L',
-3054=>'L',
-3055=>'L',
-3056=>'L',
-3057=>'L',
-3058=>'L',
-3059=>'ON',
-3060=>'ON',
-3061=>'ON',
-3062=>'ON',
-3063=>'ON',
-3064=>'ON',
-3065=>'ET',
-3066=>'ON',
-3073=>'L',
-3074=>'L',
-3075=>'L',
-3077=>'L',
-3078=>'L',
-3079=>'L',
-3080=>'L',
-3081=>'L',
-3082=>'L',
-3083=>'L',
-3084=>'L',
-3086=>'L',
-3087=>'L',
-3088=>'L',
-3090=>'L',
-3091=>'L',
-3092=>'L',
-3093=>'L',
-3094=>'L',
-3095=>'L',
-3096=>'L',
-3097=>'L',
-3098=>'L',
-3099=>'L',
-3100=>'L',
-3101=>'L',
-3102=>'L',
-3103=>'L',
-3104=>'L',
-3105=>'L',
-3106=>'L',
-3107=>'L',
-3108=>'L',
-3109=>'L',
-3110=>'L',
-3111=>'L',
-3112=>'L',
-3114=>'L',
-3115=>'L',
-3116=>'L',
-3117=>'L',
-3118=>'L',
-3119=>'L',
-3120=>'L',
-3121=>'L',
-3122=>'L',
-3123=>'L',
-3125=>'L',
-3126=>'L',
-3127=>'L',
-3128=>'L',
-3129=>'L',
-3134=>'NSM',
-3135=>'NSM',
-3136=>'NSM',
-3137=>'L',
-3138=>'L',
-3139=>'L',
-3140=>'L',
-3142=>'NSM',
-3143=>'NSM',
-3144=>'NSM',
-3146=>'NSM',
-3147=>'NSM',
-3148=>'NSM',
-3149=>'NSM',
-3157=>'NSM',
-3158=>'NSM',
-3168=>'L',
-3169=>'L',
-3174=>'L',
-3175=>'L',
-3176=>'L',
-3177=>'L',
-3178=>'L',
-3179=>'L',
-3180=>'L',
-3181=>'L',
-3182=>'L',
-3183=>'L',
-3202=>'L',
-3203=>'L',
-3205=>'L',
-3206=>'L',
-3207=>'L',
-3208=>'L',
-3209=>'L',
-3210=>'L',
-3211=>'L',
-3212=>'L',
-3214=>'L',
-3215=>'L',
-3216=>'L',
-3218=>'L',
-3219=>'L',
-3220=>'L',
-3221=>'L',
-3222=>'L',
-3223=>'L',
-3224=>'L',
-3225=>'L',
-3226=>'L',
-3227=>'L',
-3228=>'L',
-3229=>'L',
-3230=>'L',
-3231=>'L',
-3232=>'L',
-3233=>'L',
-3234=>'L',
-3235=>'L',
-3236=>'L',
-3237=>'L',
-3238=>'L',
-3239=>'L',
-3240=>'L',
-3242=>'L',
-3243=>'L',
-3244=>'L',
-3245=>'L',
-3246=>'L',
-3247=>'L',
-3248=>'L',
-3249=>'L',
-3250=>'L',
-3251=>'L',
-3253=>'L',
-3254=>'L',
-3255=>'L',
-3256=>'L',
-3257=>'L',
-3260=>'NSM',
-3261=>'L',
-3262=>'L',
-3263=>'L',
-3264=>'L',
-3265=>'L',
-3266=>'L',
-3267=>'L',
-3268=>'L',
-3270=>'L',
-3271=>'L',
-3272=>'L',
-3274=>'L',
-3275=>'L',
-3276=>'NSM',
-3277=>'NSM',
-3285=>'L',
-3286=>'L',
-3294=>'L',
-3296=>'L',
-3297=>'L',
-3298=>'NSM',
-3299=>'NSM',
-3302=>'L',
-3303=>'L',
-3304=>'L',
-3305=>'L',
-3306=>'L',
-3307=>'L',
-3308=>'L',
-3309=>'L',
-3310=>'L',
-3311=>'L',
-3313=>'ON',
-3314=>'ON',
-3330=>'L',
-3331=>'L',
-3333=>'L',
-3334=>'L',
-3335=>'L',
-3336=>'L',
-3337=>'L',
-3338=>'L',
-3339=>'L',
-3340=>'L',
-3342=>'L',
-3343=>'L',
-3344=>'L',
-3346=>'L',
-3347=>'L',
-3348=>'L',
-3349=>'L',
-3350=>'L',
-3351=>'L',
-3352=>'L',
-3353=>'L',
-3354=>'L',
-3355=>'L',
-3356=>'L',
-3357=>'L',
-3358=>'L',
-3359=>'L',
-3360=>'L',
-3361=>'L',
-3362=>'L',
-3363=>'L',
-3364=>'L',
-3365=>'L',
-3366=>'L',
-3367=>'L',
-3368=>'L',
-3370=>'L',
-3371=>'L',
-3372=>'L',
-3373=>'L',
-3374=>'L',
-3375=>'L',
-3376=>'L',
-3377=>'L',
-3378=>'L',
-3379=>'L',
-3380=>'L',
-3381=>'L',
-3382=>'L',
-3383=>'L',
-3384=>'L',
-3385=>'L',
-3390=>'L',
-3391=>'L',
-3392=>'L',
-3393=>'NSM',
-3394=>'NSM',
-3395=>'NSM',
-3398=>'L',
-3399=>'L',
-3400=>'L',
-3402=>'L',
-3403=>'L',
-3404=>'L',
-3405=>'NSM',
-3415=>'L',
-3424=>'L',
-3425=>'L',
-3430=>'L',
-3431=>'L',
-3432=>'L',
-3433=>'L',
-3434=>'L',
-3435=>'L',
-3436=>'L',
-3437=>'L',
-3438=>'L',
-3439=>'L',
-3458=>'L',
-3459=>'L',
-3461=>'L',
-3462=>'L',
-3463=>'L',
-3464=>'L',
-3465=>'L',
-3466=>'L',
-3467=>'L',
-3468=>'L',
-3469=>'L',
-3470=>'L',
-3471=>'L',
-3472=>'L',
-3473=>'L',
-3474=>'L',
-3475=>'L',
-3476=>'L',
-3477=>'L',
-3478=>'L',
-3482=>'L',
-3483=>'L',
-3484=>'L',
-3485=>'L',
-3486=>'L',
-3487=>'L',
-3488=>'L',
-3489=>'L',
-3490=>'L',
-3491=>'L',
-3492=>'L',
-3493=>'L',
-3494=>'L',
-3495=>'L',
-3496=>'L',
-3497=>'L',
-3498=>'L',
-3499=>'L',
-3500=>'L',
-3501=>'L',
-3502=>'L',
-3503=>'L',
-3504=>'L',
-3505=>'L',
-3507=>'L',
-3508=>'L',
-3509=>'L',
-3510=>'L',
-3511=>'L',
-3512=>'L',
-3513=>'L',
-3514=>'L',
-3515=>'L',
-3517=>'L',
-3520=>'L',
-3521=>'L',
-3522=>'L',
-3523=>'L',
-3524=>'L',
-3525=>'L',
-3526=>'L',
-3530=>'NSM',
-3535=>'L',
-3536=>'L',
-3537=>'L',
-3538=>'NSM',
-3539=>'NSM',
-3540=>'NSM',
-3542=>'NSM',
-3544=>'L',
-3545=>'L',
-3546=>'L',
-3547=>'L',
-3548=>'L',
-3549=>'L',
-3550=>'L',
-3551=>'L',
-3570=>'L',
-3571=>'L',
-3572=>'L',
-3585=>'L',
-3586=>'L',
-3587=>'L',
-3588=>'L',
-3589=>'L',
-3590=>'L',
-3591=>'L',
-3592=>'L',
-3593=>'L',
-3594=>'L',
-3595=>'L',
-3596=>'L',
-3597=>'L',
-3598=>'L',
-3599=>'L',
-3600=>'L',
-3601=>'L',
-3602=>'L',
-3603=>'L',
-3604=>'L',
-3605=>'L',
-3606=>'L',
-3607=>'L',
-3608=>'L',
-3609=>'L',
-3610=>'L',
-3611=>'L',
-3612=>'L',
-3613=>'L',
-3614=>'L',
-3615=>'L',
-3616=>'L',
-3617=>'L',
-3618=>'L',
-3619=>'L',
-3620=>'L',
-3621=>'L',
-3622=>'L',
-3623=>'L',
-3624=>'L',
-3625=>'L',
-3626=>'L',
-3627=>'L',
-3628=>'L',
-3629=>'L',
-3630=>'L',
-3631=>'L',
-3632=>'L',
-3633=>'NSM',
-3634=>'L',
-3635=>'L',
-3636=>'NSM',
-3637=>'NSM',
-3638=>'NSM',
-3639=>'NSM',
-3640=>'NSM',
-3641=>'NSM',
-3642=>'NSM',
-3647=>'ET',
-3648=>'L',
-3649=>'L',
-3650=>'L',
-3651=>'L',
-3652=>'L',
-3653=>'L',
-3654=>'L',
-3655=>'NSM',
-3656=>'NSM',
-3657=>'NSM',
-3658=>'NSM',
-3659=>'NSM',
-3660=>'NSM',
-3661=>'NSM',
-3662=>'NSM',
-3663=>'L',
-3664=>'L',
-3665=>'L',
-3666=>'L',
-3667=>'L',
-3668=>'L',
-3669=>'L',
-3670=>'L',
-3671=>'L',
-3672=>'L',
-3673=>'L',
-3674=>'L',
-3675=>'L',
-3713=>'L',
-3714=>'L',
-3716=>'L',
-3719=>'L',
-3720=>'L',
-3722=>'L',
-3725=>'L',
-3732=>'L',
-3733=>'L',
-3734=>'L',
-3735=>'L',
-3737=>'L',
-3738=>'L',
-3739=>'L',
-3740=>'L',
-3741=>'L',
-3742=>'L',
-3743=>'L',
-3745=>'L',
-3746=>'L',
-3747=>'L',
-3749=>'L',
-3751=>'L',
-3754=>'L',
-3755=>'L',
-3757=>'L',
-3758=>'L',
-3759=>'L',
-3760=>'L',
-3761=>'NSM',
-3762=>'L',
-3763=>'L',
-3764=>'NSM',
-3765=>'NSM',
-3766=>'NSM',
-3767=>'NSM',
-3768=>'NSM',
-3769=>'NSM',
-3771=>'NSM',
-3772=>'NSM',
-3773=>'L',
-3776=>'L',
-3777=>'L',
-3778=>'L',
-3779=>'L',
-3780=>'L',
-3782=>'L',
-3784=>'NSM',
-3785=>'NSM',
-3786=>'NSM',
-3787=>'NSM',
-3788=>'NSM',
-3789=>'NSM',
-3792=>'L',
-3793=>'L',
-3794=>'L',
-3795=>'L',
-3796=>'L',
-3797=>'L',
-3798=>'L',
-3799=>'L',
-3800=>'L',
-3801=>'L',
-3804=>'L',
-3805=>'L',
-3840=>'L',
-3841=>'L',
-3842=>'L',
-3843=>'L',
-3844=>'L',
-3845=>'L',
-3846=>'L',
-3847=>'L',
-3848=>'L',
-3849=>'L',
-3850=>'L',
-3851=>'L',
-3852=>'L',
-3853=>'L',
-3854=>'L',
-3855=>'L',
-3856=>'L',
-3857=>'L',
-3858=>'L',
-3859=>'L',
-3860=>'L',
-3861=>'L',
-3862=>'L',
-3863=>'L',
-3864=>'NSM',
-3865=>'NSM',
-3866=>'L',
-3867=>'L',
-3868=>'L',
-3869=>'L',
-3870=>'L',
-3871=>'L',
-3872=>'L',
-3873=>'L',
-3874=>'L',
-3875=>'L',
-3876=>'L',
-3877=>'L',
-3878=>'L',
-3879=>'L',
-3880=>'L',
-3881=>'L',
-3882=>'L',
-3883=>'L',
-3884=>'L',
-3885=>'L',
-3886=>'L',
-3887=>'L',
-3888=>'L',
-3889=>'L',
-3890=>'L',
-3891=>'L',
-3892=>'L',
-3893=>'NSM',
-3894=>'L',
-3895=>'NSM',
-3896=>'L',
-3897=>'NSM',
-3898=>'ON',
-3899=>'ON',
-3900=>'ON',
-3901=>'ON',
-3902=>'L',
-3903=>'L',
-3904=>'L',
-3905=>'L',
-3906=>'L',
-3907=>'L',
-3908=>'L',
-3909=>'L',
-3910=>'L',
-3911=>'L',
-3913=>'L',
-3914=>'L',
-3915=>'L',
-3916=>'L',
-3917=>'L',
-3918=>'L',
-3919=>'L',
-3920=>'L',
-3921=>'L',
-3922=>'L',
-3923=>'L',
-3924=>'L',
-3925=>'L',
-3926=>'L',
-3927=>'L',
-3928=>'L',
-3929=>'L',
-3930=>'L',
-3931=>'L',
-3932=>'L',
-3933=>'L',
-3934=>'L',
-3935=>'L',
-3936=>'L',
-3937=>'L',
-3938=>'L',
-3939=>'L',
-3940=>'L',
-3941=>'L',
-3942=>'L',
-3943=>'L',
-3944=>'L',
-3945=>'L',
-3946=>'L',
-3953=>'NSM',
-3954=>'NSM',
-3955=>'NSM',
-3956=>'NSM',
-3957=>'NSM',
-3958=>'NSM',
-3959=>'NSM',
-3960=>'NSM',
-3961=>'NSM',
-3962=>'NSM',
-3963=>'NSM',
-3964=>'NSM',
-3965=>'NSM',
-3966=>'NSM',
-3967=>'L',
-3968=>'NSM',
-3969=>'NSM',
-3970=>'NSM',
-3971=>'NSM',
-3972=>'NSM',
-3973=>'L',
-3974=>'NSM',
-3975=>'NSM',
-3976=>'L',
-3977=>'L',
-3978=>'L',
-3979=>'L',
-3984=>'NSM',
-3985=>'NSM',
-3986=>'NSM',
-3987=>'NSM',
-3988=>'NSM',
-3989=>'NSM',
-3990=>'NSM',
-3991=>'NSM',
-3993=>'NSM',
-3994=>'NSM',
-3995=>'NSM',
-3996=>'NSM',
-3997=>'NSM',
-3998=>'NSM',
-3999=>'NSM',
-4000=>'NSM',
-4001=>'NSM',
-4002=>'NSM',
-4003=>'NSM',
-4004=>'NSM',
-4005=>'NSM',
-4006=>'NSM',
-4007=>'NSM',
-4008=>'NSM',
-4009=>'NSM',
-4010=>'NSM',
-4011=>'NSM',
-4012=>'NSM',
-4013=>'NSM',
-4014=>'NSM',
-4015=>'NSM',
-4016=>'NSM',
-4017=>'NSM',
-4018=>'NSM',
-4019=>'NSM',
-4020=>'NSM',
-4021=>'NSM',
-4022=>'NSM',
-4023=>'NSM',
-4024=>'NSM',
-4025=>'NSM',
-4026=>'NSM',
-4027=>'NSM',
-4028=>'NSM',
-4030=>'L',
-4031=>'L',
-4032=>'L',
-4033=>'L',
-4034=>'L',
-4035=>'L',
-4036=>'L',
-4037=>'L',
-4038=>'NSM',
-4039=>'L',
-4040=>'L',
-4041=>'L',
-4042=>'L',
-4043=>'L',
-4044=>'L',
-4047=>'L',
-4048=>'L',
-4049=>'L',
-4096=>'L',
-4097=>'L',
-4098=>'L',
-4099=>'L',
-4100=>'L',
-4101=>'L',
-4102=>'L',
-4103=>'L',
-4104=>'L',
-4105=>'L',
-4106=>'L',
-4107=>'L',
-4108=>'L',
-4109=>'L',
-4110=>'L',
-4111=>'L',
-4112=>'L',
-4113=>'L',
-4114=>'L',
-4115=>'L',
-4116=>'L',
-4117=>'L',
-4118=>'L',
-4119=>'L',
-4120=>'L',
-4121=>'L',
-4122=>'L',
-4123=>'L',
-4124=>'L',
-4125=>'L',
-4126=>'L',
-4127=>'L',
-4128=>'L',
-4129=>'L',
-4131=>'L',
-4132=>'L',
-4133=>'L',
-4134=>'L',
-4135=>'L',
-4137=>'L',
-4138=>'L',
-4140=>'L',
-4141=>'NSM',
-4142=>'NSM',
-4143=>'NSM',
-4144=>'NSM',
-4145=>'L',
-4146=>'NSM',
-4150=>'NSM',
-4151=>'NSM',
-4152=>'L',
-4153=>'NSM',
-4160=>'L',
-4161=>'L',
-4162=>'L',
-4163=>'L',
-4164=>'L',
-4165=>'L',
-4166=>'L',
-4167=>'L',
-4168=>'L',
-4169=>'L',
-4170=>'L',
-4171=>'L',
-4172=>'L',
-4173=>'L',
-4174=>'L',
-4175=>'L',
-4176=>'L',
-4177=>'L',
-4178=>'L',
-4179=>'L',
-4180=>'L',
-4181=>'L',
-4182=>'L',
-4183=>'L',
-4184=>'NSM',
-4185=>'NSM',
-4256=>'L',
-4257=>'L',
-4258=>'L',
-4259=>'L',
-4260=>'L',
-4261=>'L',
-4262=>'L',
-4263=>'L',
-4264=>'L',
-4265=>'L',
-4266=>'L',
-4267=>'L',
-4268=>'L',
-4269=>'L',
-4270=>'L',
-4271=>'L',
-4272=>'L',
-4273=>'L',
-4274=>'L',
-4275=>'L',
-4276=>'L',
-4277=>'L',
-4278=>'L',
-4279=>'L',
-4280=>'L',
-4281=>'L',
-4282=>'L',
-4283=>'L',
-4284=>'L',
-4285=>'L',
-4286=>'L',
-4287=>'L',
-4288=>'L',
-4289=>'L',
-4290=>'L',
-4291=>'L',
-4292=>'L',
-4293=>'L',
-4304=>'L',
-4305=>'L',
-4306=>'L',
-4307=>'L',
-4308=>'L',
-4309=>'L',
-4310=>'L',
-4311=>'L',
-4312=>'L',
-4313=>'L',
-4314=>'L',
-4315=>'L',
-4316=>'L',
-4317=>'L',
-4318=>'L',
-4319=>'L',
-4320=>'L',
-4321=>'L',
-4322=>'L',
-4323=>'L',
-4324=>'L',
-4325=>'L',
-4326=>'L',
-4327=>'L',
-4328=>'L',
-4329=>'L',
-4330=>'L',
-4331=>'L',
-4332=>'L',
-4333=>'L',
-4334=>'L',
-4335=>'L',
-4336=>'L',
-4337=>'L',
-4338=>'L',
-4339=>'L',
-4340=>'L',
-4341=>'L',
-4342=>'L',
-4343=>'L',
-4344=>'L',
-4345=>'L',
-4346=>'L',
-4347=>'L',
-4348=>'L',
-4352=>'L',
-4353=>'L',
-4354=>'L',
-4355=>'L',
-4356=>'L',
-4357=>'L',
-4358=>'L',
-4359=>'L',
-4360=>'L',
-4361=>'L',
-4362=>'L',
-4363=>'L',
-4364=>'L',
-4365=>'L',
-4366=>'L',
-4367=>'L',
-4368=>'L',
-4369=>'L',
-4370=>'L',
-4371=>'L',
-4372=>'L',
-4373=>'L',
-4374=>'L',
-4375=>'L',
-4376=>'L',
-4377=>'L',
-4378=>'L',
-4379=>'L',
-4380=>'L',
-4381=>'L',
-4382=>'L',
-4383=>'L',
-4384=>'L',
-4385=>'L',
-4386=>'L',
-4387=>'L',
-4388=>'L',
-4389=>'L',
-4390=>'L',
-4391=>'L',
-4392=>'L',
-4393=>'L',
-4394=>'L',
-4395=>'L',
-4396=>'L',
-4397=>'L',
-4398=>'L',
-4399=>'L',
-4400=>'L',
-4401=>'L',
-4402=>'L',
-4403=>'L',
-4404=>'L',
-4405=>'L',
-4406=>'L',
-4407=>'L',
-4408=>'L',
-4409=>'L',
-4410=>'L',
-4411=>'L',
-4412=>'L',
-4413=>'L',
-4414=>'L',
-4415=>'L',
-4416=>'L',
-4417=>'L',
-4418=>'L',
-4419=>'L',
-4420=>'L',
-4421=>'L',
-4422=>'L',
-4423=>'L',
-4424=>'L',
-4425=>'L',
-4426=>'L',
-4427=>'L',
-4428=>'L',
-4429=>'L',
-4430=>'L',
-4431=>'L',
-4432=>'L',
-4433=>'L',
-4434=>'L',
-4435=>'L',
-4436=>'L',
-4437=>'L',
-4438=>'L',
-4439=>'L',
-4440=>'L',
-4441=>'L',
-4447=>'L',
-4448=>'L',
-4449=>'L',
-4450=>'L',
-4451=>'L',
-4452=>'L',
-4453=>'L',
-4454=>'L',
-4455=>'L',
-4456=>'L',
-4457=>'L',
-4458=>'L',
-4459=>'L',
-4460=>'L',
-4461=>'L',
-4462=>'L',
-4463=>'L',
-4464=>'L',
-4465=>'L',
-4466=>'L',
-4467=>'L',
-4468=>'L',
-4469=>'L',
-4470=>'L',
-4471=>'L',
-4472=>'L',
-4473=>'L',
-4474=>'L',
-4475=>'L',
-4476=>'L',
-4477=>'L',
-4478=>'L',
-4479=>'L',
-4480=>'L',
-4481=>'L',
-4482=>'L',
-4483=>'L',
-4484=>'L',
-4485=>'L',
-4486=>'L',
-4487=>'L',
-4488=>'L',
-4489=>'L',
-4490=>'L',
-4491=>'L',
-4492=>'L',
-4493=>'L',
-4494=>'L',
-4495=>'L',
-4496=>'L',
-4497=>'L',
-4498=>'L',
-4499=>'L',
-4500=>'L',
-4501=>'L',
-4502=>'L',
-4503=>'L',
-4504=>'L',
-4505=>'L',
-4506=>'L',
-4507=>'L',
-4508=>'L',
-4509=>'L',
-4510=>'L',
-4511=>'L',
-4512=>'L',
-4513=>'L',
-4514=>'L',
-4520=>'L',
-4521=>'L',
-4522=>'L',
-4523=>'L',
-4524=>'L',
-4525=>'L',
-4526=>'L',
-4527=>'L',
-4528=>'L',
-4529=>'L',
-4530=>'L',
-4531=>'L',
-4532=>'L',
-4533=>'L',
-4534=>'L',
-4535=>'L',
-4536=>'L',
-4537=>'L',
-4538=>'L',
-4539=>'L',
-4540=>'L',
-4541=>'L',
-4542=>'L',
-4543=>'L',
-4544=>'L',
-4545=>'L',
-4546=>'L',
-4547=>'L',
-4548=>'L',
-4549=>'L',
-4550=>'L',
-4551=>'L',
-4552=>'L',
-4553=>'L',
-4554=>'L',
-4555=>'L',
-4556=>'L',
-4557=>'L',
-4558=>'L',
-4559=>'L',
-4560=>'L',
-4561=>'L',
-4562=>'L',
-4563=>'L',
-4564=>'L',
-4565=>'L',
-4566=>'L',
-4567=>'L',
-4568=>'L',
-4569=>'L',
-4570=>'L',
-4571=>'L',
-4572=>'L',
-4573=>'L',
-4574=>'L',
-4575=>'L',
-4576=>'L',
-4577=>'L',
-4578=>'L',
-4579=>'L',
-4580=>'L',
-4581=>'L',
-4582=>'L',
-4583=>'L',
-4584=>'L',
-4585=>'L',
-4586=>'L',
-4587=>'L',
-4588=>'L',
-4589=>'L',
-4590=>'L',
-4591=>'L',
-4592=>'L',
-4593=>'L',
-4594=>'L',
-4595=>'L',
-4596=>'L',
-4597=>'L',
-4598=>'L',
-4599=>'L',
-4600=>'L',
-4601=>'L',
-4608=>'L',
-4609=>'L',
-4610=>'L',
-4611=>'L',
-4612=>'L',
-4613=>'L',
-4614=>'L',
-4615=>'L',
-4616=>'L',
-4617=>'L',
-4618=>'L',
-4619=>'L',
-4620=>'L',
-4621=>'L',
-4622=>'L',
-4623=>'L',
-4624=>'L',
-4625=>'L',
-4626=>'L',
-4627=>'L',
-4628=>'L',
-4629=>'L',
-4630=>'L',
-4631=>'L',
-4632=>'L',
-4633=>'L',
-4634=>'L',
-4635=>'L',
-4636=>'L',
-4637=>'L',
-4638=>'L',
-4639=>'L',
-4640=>'L',
-4641=>'L',
-4642=>'L',
-4643=>'L',
-4644=>'L',
-4645=>'L',
-4646=>'L',
-4647=>'L',
-4648=>'L',
-4649=>'L',
-4650=>'L',
-4651=>'L',
-4652=>'L',
-4653=>'L',
-4654=>'L',
-4655=>'L',
-4656=>'L',
-4657=>'L',
-4658=>'L',
-4659=>'L',
-4660=>'L',
-4661=>'L',
-4662=>'L',
-4663=>'L',
-4664=>'L',
-4665=>'L',
-4666=>'L',
-4667=>'L',
-4668=>'L',
-4669=>'L',
-4670=>'L',
-4671=>'L',
-4672=>'L',
-4673=>'L',
-4674=>'L',
-4675=>'L',
-4676=>'L',
-4677=>'L',
-4678=>'L',
-4679=>'L',
-4680=>'L',
-4682=>'L',
-4683=>'L',
-4684=>'L',
-4685=>'L',
-4688=>'L',
-4689=>'L',
-4690=>'L',
-4691=>'L',
-4692=>'L',
-4693=>'L',
-4694=>'L',
-4696=>'L',
-4698=>'L',
-4699=>'L',
-4700=>'L',
-4701=>'L',
-4704=>'L',
-4705=>'L',
-4706=>'L',
-4707=>'L',
-4708=>'L',
-4709=>'L',
-4710=>'L',
-4711=>'L',
-4712=>'L',
-4713=>'L',
-4714=>'L',
-4715=>'L',
-4716=>'L',
-4717=>'L',
-4718=>'L',
-4719=>'L',
-4720=>'L',
-4721=>'L',
-4722=>'L',
-4723=>'L',
-4724=>'L',
-4725=>'L',
-4726=>'L',
-4727=>'L',
-4728=>'L',
-4729=>'L',
-4730=>'L',
-4731=>'L',
-4732=>'L',
-4733=>'L',
-4734=>'L',
-4735=>'L',
-4736=>'L',
-4737=>'L',
-4738=>'L',
-4739=>'L',
-4740=>'L',
-4741=>'L',
-4742=>'L',
-4743=>'L',
-4744=>'L',
-4746=>'L',
-4747=>'L',
-4748=>'L',
-4749=>'L',
-4752=>'L',
-4753=>'L',
-4754=>'L',
-4755=>'L',
-4756=>'L',
-4757=>'L',
-4758=>'L',
-4759=>'L',
-4760=>'L',
-4761=>'L',
-4762=>'L',
-4763=>'L',
-4764=>'L',
-4765=>'L',
-4766=>'L',
-4767=>'L',
-4768=>'L',
-4769=>'L',
-4770=>'L',
-4771=>'L',
-4772=>'L',
-4773=>'L',
-4774=>'L',
-4775=>'L',
-4776=>'L',
-4777=>'L',
-4778=>'L',
-4779=>'L',
-4780=>'L',
-4781=>'L',
-4782=>'L',
-4783=>'L',
-4784=>'L',
-4786=>'L',
-4787=>'L',
-4788=>'L',
-4789=>'L',
-4792=>'L',
-4793=>'L',
-4794=>'L',
-4795=>'L',
-4796=>'L',
-4797=>'L',
-4798=>'L',
-4800=>'L',
-4802=>'L',
-4803=>'L',
-4804=>'L',
-4805=>'L',
-4808=>'L',
-4809=>'L',
-4810=>'L',
-4811=>'L',
-4812=>'L',
-4813=>'L',
-4814=>'L',
-4815=>'L',
-4816=>'L',
-4817=>'L',
-4818=>'L',
-4819=>'L',
-4820=>'L',
-4821=>'L',
-4822=>'L',
-4824=>'L',
-4825=>'L',
-4826=>'L',
-4827=>'L',
-4828=>'L',
-4829=>'L',
-4830=>'L',
-4831=>'L',
-4832=>'L',
-4833=>'L',
-4834=>'L',
-4835=>'L',
-4836=>'L',
-4837=>'L',
-4838=>'L',
-4839=>'L',
-4840=>'L',
-4841=>'L',
-4842=>'L',
-4843=>'L',
-4844=>'L',
-4845=>'L',
-4846=>'L',
-4847=>'L',
-4848=>'L',
-4849=>'L',
-4850=>'L',
-4851=>'L',
-4852=>'L',
-4853=>'L',
-4854=>'L',
-4855=>'L',
-4856=>'L',
-4857=>'L',
-4858=>'L',
-4859=>'L',
-4860=>'L',
-4861=>'L',
-4862=>'L',
-4863=>'L',
-4864=>'L',
-4865=>'L',
-4866=>'L',
-4867=>'L',
-4868=>'L',
-4869=>'L',
-4870=>'L',
-4871=>'L',
-4872=>'L',
-4873=>'L',
-4874=>'L',
-4875=>'L',
-4876=>'L',
-4877=>'L',
-4878=>'L',
-4879=>'L',
-4880=>'L',
-4882=>'L',
-4883=>'L',
-4884=>'L',
-4885=>'L',
-4888=>'L',
-4889=>'L',
-4890=>'L',
-4891=>'L',
-4892=>'L',
-4893=>'L',
-4894=>'L',
-4895=>'L',
-4896=>'L',
-4897=>'L',
-4898=>'L',
-4899=>'L',
-4900=>'L',
-4901=>'L',
-4902=>'L',
-4903=>'L',
-4904=>'L',
-4905=>'L',
-4906=>'L',
-4907=>'L',
-4908=>'L',
-4909=>'L',
-4910=>'L',
-4911=>'L',
-4912=>'L',
-4913=>'L',
-4914=>'L',
-4915=>'L',
-4916=>'L',
-4917=>'L',
-4918=>'L',
-4919=>'L',
-4920=>'L',
-4921=>'L',
-4922=>'L',
-4923=>'L',
-4924=>'L',
-4925=>'L',
-4926=>'L',
-4927=>'L',
-4928=>'L',
-4929=>'L',
-4930=>'L',
-4931=>'L',
-4932=>'L',
-4933=>'L',
-4934=>'L',
-4935=>'L',
-4936=>'L',
-4937=>'L',
-4938=>'L',
-4939=>'L',
-4940=>'L',
-4941=>'L',
-4942=>'L',
-4943=>'L',
-4944=>'L',
-4945=>'L',
-4946=>'L',
-4947=>'L',
-4948=>'L',
-4949=>'L',
-4950=>'L',
-4951=>'L',
-4952=>'L',
-4953=>'L',
-4954=>'L',
-4959=>'NSM',
-4960=>'L',
-4961=>'L',
-4962=>'L',
-4963=>'L',
-4964=>'L',
-4965=>'L',
-4966=>'L',
-4967=>'L',
-4968=>'L',
-4969=>'L',
-4970=>'L',
-4971=>'L',
-4972=>'L',
-4973=>'L',
-4974=>'L',
-4975=>'L',
-4976=>'L',
-4977=>'L',
-4978=>'L',
-4979=>'L',
-4980=>'L',
-4981=>'L',
-4982=>'L',
-4983=>'L',
-4984=>'L',
-4985=>'L',
-4986=>'L',
-4987=>'L',
-4988=>'L',
-4992=>'L',
-4993=>'L',
-4994=>'L',
-4995=>'L',
-4996=>'L',
-4997=>'L',
-4998=>'L',
-4999=>'L',
-5000=>'L',
-5001=>'L',
-5002=>'L',
-5003=>'L',
-5004=>'L',
-5005=>'L',
-5006=>'L',
-5007=>'L',
-5008=>'ON',
-5009=>'ON',
-5010=>'ON',
-5011=>'ON',
-5012=>'ON',
-5013=>'ON',
-5014=>'ON',
-5015=>'ON',
-5016=>'ON',
-5017=>'ON',
-5024=>'L',
-5025=>'L',
-5026=>'L',
-5027=>'L',
-5028=>'L',
-5029=>'L',
-5030=>'L',
-5031=>'L',
-5032=>'L',
-5033=>'L',
-5034=>'L',
-5035=>'L',
-5036=>'L',
-5037=>'L',
-5038=>'L',
-5039=>'L',
-5040=>'L',
-5041=>'L',
-5042=>'L',
-5043=>'L',
-5044=>'L',
-5045=>'L',
-5046=>'L',
-5047=>'L',
-5048=>'L',
-5049=>'L',
-5050=>'L',
-5051=>'L',
-5052=>'L',
-5053=>'L',
-5054=>'L',
-5055=>'L',
-5056=>'L',
-5057=>'L',
-5058=>'L',
-5059=>'L',
-5060=>'L',
-5061=>'L',
-5062=>'L',
-5063=>'L',
-5064=>'L',
-5065=>'L',
-5066=>'L',
-5067=>'L',
-5068=>'L',
-5069=>'L',
-5070=>'L',
-5071=>'L',
-5072=>'L',
-5073=>'L',
-5074=>'L',
-5075=>'L',
-5076=>'L',
-5077=>'L',
-5078=>'L',
-5079=>'L',
-5080=>'L',
-5081=>'L',
-5082=>'L',
-5083=>'L',
-5084=>'L',
-5085=>'L',
-5086=>'L',
-5087=>'L',
-5088=>'L',
-5089=>'L',
-5090=>'L',
-5091=>'L',
-5092=>'L',
-5093=>'L',
-5094=>'L',
-5095=>'L',
-5096=>'L',
-5097=>'L',
-5098=>'L',
-5099=>'L',
-5100=>'L',
-5101=>'L',
-5102=>'L',
-5103=>'L',
-5104=>'L',
-5105=>'L',
-5106=>'L',
-5107=>'L',
-5108=>'L',
-5121=>'L',
-5122=>'L',
-5123=>'L',
-5124=>'L',
-5125=>'L',
-5126=>'L',
-5127=>'L',
-5128=>'L',
-5129=>'L',
-5130=>'L',
-5131=>'L',
-5132=>'L',
-5133=>'L',
-5134=>'L',
-5135=>'L',
-5136=>'L',
-5137=>'L',
-5138=>'L',
-5139=>'L',
-5140=>'L',
-5141=>'L',
-5142=>'L',
-5143=>'L',
-5144=>'L',
-5145=>'L',
-5146=>'L',
-5147=>'L',
-5148=>'L',
-5149=>'L',
-5150=>'L',
-5151=>'L',
-5152=>'L',
-5153=>'L',
-5154=>'L',
-5155=>'L',
-5156=>'L',
-5157=>'L',
-5158=>'L',
-5159=>'L',
-5160=>'L',
-5161=>'L',
-5162=>'L',
-5163=>'L',
-5164=>'L',
-5165=>'L',
-5166=>'L',
-5167=>'L',
-5168=>'L',
-5169=>'L',
-5170=>'L',
-5171=>'L',
-5172=>'L',
-5173=>'L',
-5174=>'L',
-5175=>'L',
-5176=>'L',
-5177=>'L',
-5178=>'L',
-5179=>'L',
-5180=>'L',
-5181=>'L',
-5182=>'L',
-5183=>'L',
-5184=>'L',
-5185=>'L',
-5186=>'L',
-5187=>'L',
-5188=>'L',
-5189=>'L',
-5190=>'L',
-5191=>'L',
-5192=>'L',
-5193=>'L',
-5194=>'L',
-5195=>'L',
-5196=>'L',
-5197=>'L',
-5198=>'L',
-5199=>'L',
-5200=>'L',
-5201=>'L',
-5202=>'L',
-5203=>'L',
-5204=>'L',
-5205=>'L',
-5206=>'L',
-5207=>'L',
-5208=>'L',
-5209=>'L',
-5210=>'L',
-5211=>'L',
-5212=>'L',
-5213=>'L',
-5214=>'L',
-5215=>'L',
-5216=>'L',
-5217=>'L',
-5218=>'L',
-5219=>'L',
-5220=>'L',
-5221=>'L',
-5222=>'L',
-5223=>'L',
-5224=>'L',
-5225=>'L',
-5226=>'L',
-5227=>'L',
-5228=>'L',
-5229=>'L',
-5230=>'L',
-5231=>'L',
-5232=>'L',
-5233=>'L',
-5234=>'L',
-5235=>'L',
-5236=>'L',
-5237=>'L',
-5238=>'L',
-5239=>'L',
-5240=>'L',
-5241=>'L',
-5242=>'L',
-5243=>'L',
-5244=>'L',
-5245=>'L',
-5246=>'L',
-5247=>'L',
-5248=>'L',
-5249=>'L',
-5250=>'L',
-5251=>'L',
-5252=>'L',
-5253=>'L',
-5254=>'L',
-5255=>'L',
-5256=>'L',
-5257=>'L',
-5258=>'L',
-5259=>'L',
-5260=>'L',
-5261=>'L',
-5262=>'L',
-5263=>'L',
-5264=>'L',
-5265=>'L',
-5266=>'L',
-5267=>'L',
-5268=>'L',
-5269=>'L',
-5270=>'L',
-5271=>'L',
-5272=>'L',
-5273=>'L',
-5274=>'L',
-5275=>'L',
-5276=>'L',
-5277=>'L',
-5278=>'L',
-5279=>'L',
-5280=>'L',
-5281=>'L',
-5282=>'L',
-5283=>'L',
-5284=>'L',
-5285=>'L',
-5286=>'L',
-5287=>'L',
-5288=>'L',
-5289=>'L',
-5290=>'L',
-5291=>'L',
-5292=>'L',
-5293=>'L',
-5294=>'L',
-5295=>'L',
-5296=>'L',
-5297=>'L',
-5298=>'L',
-5299=>'L',
-5300=>'L',
-5301=>'L',
-5302=>'L',
-5303=>'L',
-5304=>'L',
-5305=>'L',
-5306=>'L',
-5307=>'L',
-5308=>'L',
-5309=>'L',
-5310=>'L',
-5311=>'L',
-5312=>'L',
-5313=>'L',
-5314=>'L',
-5315=>'L',
-5316=>'L',
-5317=>'L',
-5318=>'L',
-5319=>'L',
-5320=>'L',
-5321=>'L',
-5322=>'L',
-5323=>'L',
-5324=>'L',
-5325=>'L',
-5326=>'L',
-5327=>'L',
-5328=>'L',
-5329=>'L',
-5330=>'L',
-5331=>'L',
-5332=>'L',
-5333=>'L',
-5334=>'L',
-5335=>'L',
-5336=>'L',
-5337=>'L',
-5338=>'L',
-5339=>'L',
-5340=>'L',
-5341=>'L',
-5342=>'L',
-5343=>'L',
-5344=>'L',
-5345=>'L',
-5346=>'L',
-5347=>'L',
-5348=>'L',
-5349=>'L',
-5350=>'L',
-5351=>'L',
-5352=>'L',
-5353=>'L',
-5354=>'L',
-5355=>'L',
-5356=>'L',
-5357=>'L',
-5358=>'L',
-5359=>'L',
-5360=>'L',
-5361=>'L',
-5362=>'L',
-5363=>'L',
-5364=>'L',
-5365=>'L',
-5366=>'L',
-5367=>'L',
-5368=>'L',
-5369=>'L',
-5370=>'L',
-5371=>'L',
-5372=>'L',
-5373=>'L',
-5374=>'L',
-5375=>'L',
-5376=>'L',
-5377=>'L',
-5378=>'L',
-5379=>'L',
-5380=>'L',
-5381=>'L',
-5382=>'L',
-5383=>'L',
-5384=>'L',
-5385=>'L',
-5386=>'L',
-5387=>'L',
-5388=>'L',
-5389=>'L',
-5390=>'L',
-5391=>'L',
-5392=>'L',
-5393=>'L',
-5394=>'L',
-5395=>'L',
-5396=>'L',
-5397=>'L',
-5398=>'L',
-5399=>'L',
-5400=>'L',
-5401=>'L',
-5402=>'L',
-5403=>'L',
-5404=>'L',
-5405=>'L',
-5406=>'L',
-5407=>'L',
-5408=>'L',
-5409=>'L',
-5410=>'L',
-5411=>'L',
-5412=>'L',
-5413=>'L',
-5414=>'L',
-5415=>'L',
-5416=>'L',
-5417=>'L',
-5418=>'L',
-5419=>'L',
-5420=>'L',
-5421=>'L',
-5422=>'L',
-5423=>'L',
-5424=>'L',
-5425=>'L',
-5426=>'L',
-5427=>'L',
-5428=>'L',
-5429=>'L',
-5430=>'L',
-5431=>'L',
-5432=>'L',
-5433=>'L',
-5434=>'L',
-5435=>'L',
-5436=>'L',
-5437=>'L',
-5438=>'L',
-5439=>'L',
-5440=>'L',
-5441=>'L',
-5442=>'L',
-5443=>'L',
-5444=>'L',
-5445=>'L',
-5446=>'L',
-5447=>'L',
-5448=>'L',
-5449=>'L',
-5450=>'L',
-5451=>'L',
-5452=>'L',
-5453=>'L',
-5454=>'L',
-5455=>'L',
-5456=>'L',
-5457=>'L',
-5458=>'L',
-5459=>'L',
-5460=>'L',
-5461=>'L',
-5462=>'L',
-5463=>'L',
-5464=>'L',
-5465=>'L',
-5466=>'L',
-5467=>'L',
-5468=>'L',
-5469=>'L',
-5470=>'L',
-5471=>'L',
-5472=>'L',
-5473=>'L',
-5474=>'L',
-5475=>'L',
-5476=>'L',
-5477=>'L',
-5478=>'L',
-5479=>'L',
-5480=>'L',
-5481=>'L',
-5482=>'L',
-5483=>'L',
-5484=>'L',
-5485=>'L',
-5486=>'L',
-5487=>'L',
-5488=>'L',
-5489=>'L',
-5490=>'L',
-5491=>'L',
-5492=>'L',
-5493=>'L',
-5494=>'L',
-5495=>'L',
-5496=>'L',
-5497=>'L',
-5498=>'L',
-5499=>'L',
-5500=>'L',
-5501=>'L',
-5502=>'L',
-5503=>'L',
-5504=>'L',
-5505=>'L',
-5506=>'L',
-5507=>'L',
-5508=>'L',
-5509=>'L',
-5510=>'L',
-5511=>'L',
-5512=>'L',
-5513=>'L',
-5514=>'L',
-5515=>'L',
-5516=>'L',
-5517=>'L',
-5518=>'L',
-5519=>'L',
-5520=>'L',
-5521=>'L',
-5522=>'L',
-5523=>'L',
-5524=>'L',
-5525=>'L',
-5526=>'L',
-5527=>'L',
-5528=>'L',
-5529=>'L',
-5530=>'L',
-5531=>'L',
-5532=>'L',
-5533=>'L',
-5534=>'L',
-5535=>'L',
-5536=>'L',
-5537=>'L',
-5538=>'L',
-5539=>'L',
-5540=>'L',
-5541=>'L',
-5542=>'L',
-5543=>'L',
-5544=>'L',
-5545=>'L',
-5546=>'L',
-5547=>'L',
-5548=>'L',
-5549=>'L',
-5550=>'L',
-5551=>'L',
-5552=>'L',
-5553=>'L',
-5554=>'L',
-5555=>'L',
-5556=>'L',
-5557=>'L',
-5558=>'L',
-5559=>'L',
-5560=>'L',
-5561=>'L',
-5562=>'L',
-5563=>'L',
-5564=>'L',
-5565=>'L',
-5566=>'L',
-5567=>'L',
-5568=>'L',
-5569=>'L',
-5570=>'L',
-5571=>'L',
-5572=>'L',
-5573=>'L',
-5574=>'L',
-5575=>'L',
-5576=>'L',
-5577=>'L',
-5578=>'L',
-5579=>'L',
-5580=>'L',
-5581=>'L',
-5582=>'L',
-5583=>'L',
-5584=>'L',
-5585=>'L',
-5586=>'L',
-5587=>'L',
-5588=>'L',
-5589=>'L',
-5590=>'L',
-5591=>'L',
-5592=>'L',
-5593=>'L',
-5594=>'L',
-5595=>'L',
-5596=>'L',
-5597=>'L',
-5598=>'L',
-5599=>'L',
-5600=>'L',
-5601=>'L',
-5602=>'L',
-5603=>'L',
-5604=>'L',
-5605=>'L',
-5606=>'L',
-5607=>'L',
-5608=>'L',
-5609=>'L',
-5610=>'L',
-5611=>'L',
-5612=>'L',
-5613=>'L',
-5614=>'L',
-5615=>'L',
-5616=>'L',
-5617=>'L',
-5618=>'L',
-5619=>'L',
-5620=>'L',
-5621=>'L',
-5622=>'L',
-5623=>'L',
-5624=>'L',
-5625=>'L',
-5626=>'L',
-5627=>'L',
-5628=>'L',
-5629=>'L',
-5630=>'L',
-5631=>'L',
-5632=>'L',
-5633=>'L',
-5634=>'L',
-5635=>'L',
-5636=>'L',
-5637=>'L',
-5638=>'L',
-5639=>'L',
-5640=>'L',
-5641=>'L',
-5642=>'L',
-5643=>'L',
-5644=>'L',
-5645=>'L',
-5646=>'L',
-5647=>'L',
-5648=>'L',
-5649=>'L',
-5650=>'L',
-5651=>'L',
-5652=>'L',
-5653=>'L',
-5654=>'L',
-5655=>'L',
-5656=>'L',
-5657=>'L',
-5658=>'L',
-5659=>'L',
-5660=>'L',
-5661=>'L',
-5662=>'L',
-5663=>'L',
-5664=>'L',
-5665=>'L',
-5666=>'L',
-5667=>'L',
-5668=>'L',
-5669=>'L',
-5670=>'L',
-5671=>'L',
-5672=>'L',
-5673=>'L',
-5674=>'L',
-5675=>'L',
-5676=>'L',
-5677=>'L',
-5678=>'L',
-5679=>'L',
-5680=>'L',
-5681=>'L',
-5682=>'L',
-5683=>'L',
-5684=>'L',
-5685=>'L',
-5686=>'L',
-5687=>'L',
-5688=>'L',
-5689=>'L',
-5690=>'L',
-5691=>'L',
-5692=>'L',
-5693=>'L',
-5694=>'L',
-5695=>'L',
-5696=>'L',
-5697=>'L',
-5698=>'L',
-5699=>'L',
-5700=>'L',
-5701=>'L',
-5702=>'L',
-5703=>'L',
-5704=>'L',
-5705=>'L',
-5706=>'L',
-5707=>'L',
-5708=>'L',
-5709=>'L',
-5710=>'L',
-5711=>'L',
-5712=>'L',
-5713=>'L',
-5714=>'L',
-5715=>'L',
-5716=>'L',
-5717=>'L',
-5718=>'L',
-5719=>'L',
-5720=>'L',
-5721=>'L',
-5722=>'L',
-5723=>'L',
-5724=>'L',
-5725=>'L',
-5726=>'L',
-5727=>'L',
-5728=>'L',
-5729=>'L',
-5730=>'L',
-5731=>'L',
-5732=>'L',
-5733=>'L',
-5734=>'L',
-5735=>'L',
-5736=>'L',
-5737=>'L',
-5738=>'L',
-5739=>'L',
-5740=>'L',
-5741=>'L',
-5742=>'L',
-5743=>'L',
-5744=>'L',
-5745=>'L',
-5746=>'L',
-5747=>'L',
-5748=>'L',
-5749=>'L',
-5750=>'L',
-5760=>'WS',
-5761=>'L',
-5762=>'L',
-5763=>'L',
-5764=>'L',
-5765=>'L',
-5766=>'L',
-5767=>'L',
-5768=>'L',
-5769=>'L',
-5770=>'L',
-5771=>'L',
-5772=>'L',
-5773=>'L',
-5774=>'L',
-5775=>'L',
-5776=>'L',
-5777=>'L',
-5778=>'L',
-5779=>'L',
-5780=>'L',
-5781=>'L',
-5782=>'L',
-5783=>'L',
-5784=>'L',
-5785=>'L',
-5786=>'L',
-5787=>'ON',
-5788=>'ON',
-5792=>'L',
-5793=>'L',
-5794=>'L',
-5795=>'L',
-5796=>'L',
-5797=>'L',
-5798=>'L',
-5799=>'L',
-5800=>'L',
-5801=>'L',
-5802=>'L',
-5803=>'L',
-5804=>'L',
-5805=>'L',
-5806=>'L',
-5807=>'L',
-5808=>'L',
-5809=>'L',
-5810=>'L',
-5811=>'L',
-5812=>'L',
-5813=>'L',
-5814=>'L',
-5815=>'L',
-5816=>'L',
-5817=>'L',
-5818=>'L',
-5819=>'L',
-5820=>'L',
-5821=>'L',
-5822=>'L',
-5823=>'L',
-5824=>'L',
-5825=>'L',
-5826=>'L',
-5827=>'L',
-5828=>'L',
-5829=>'L',
-5830=>'L',
-5831=>'L',
-5832=>'L',
-5833=>'L',
-5834=>'L',
-5835=>'L',
-5836=>'L',
-5837=>'L',
-5838=>'L',
-5839=>'L',
-5840=>'L',
-5841=>'L',
-5842=>'L',
-5843=>'L',
-5844=>'L',
-5845=>'L',
-5846=>'L',
-5847=>'L',
-5848=>'L',
-5849=>'L',
-5850=>'L',
-5851=>'L',
-5852=>'L',
-5853=>'L',
-5854=>'L',
-5855=>'L',
-5856=>'L',
-5857=>'L',
-5858=>'L',
-5859=>'L',
-5860=>'L',
-5861=>'L',
-5862=>'L',
-5863=>'L',
-5864=>'L',
-5865=>'L',
-5866=>'L',
-5867=>'L',
-5868=>'L',
-5869=>'L',
-5870=>'L',
-5871=>'L',
-5872=>'L',
-5888=>'L',
-5889=>'L',
-5890=>'L',
-5891=>'L',
-5892=>'L',
-5893=>'L',
-5894=>'L',
-5895=>'L',
-5896=>'L',
-5897=>'L',
-5898=>'L',
-5899=>'L',
-5900=>'L',
-5902=>'L',
-5903=>'L',
-5904=>'L',
-5905=>'L',
-5906=>'NSM',
-5907=>'NSM',
-5908=>'NSM',
-5920=>'L',
-5921=>'L',
-5922=>'L',
-5923=>'L',
-5924=>'L',
-5925=>'L',
-5926=>'L',
-5927=>'L',
-5928=>'L',
-5929=>'L',
-5930=>'L',
-5931=>'L',
-5932=>'L',
-5933=>'L',
-5934=>'L',
-5935=>'L',
-5936=>'L',
-5937=>'L',
-5938=>'NSM',
-5939=>'NSM',
-5940=>'NSM',
-5941=>'L',
-5942=>'L',
-5952=>'L',
-5953=>'L',
-5954=>'L',
-5955=>'L',
-5956=>'L',
-5957=>'L',
-5958=>'L',
-5959=>'L',
-5960=>'L',
-5961=>'L',
-5962=>'L',
-5963=>'L',
-5964=>'L',
-5965=>'L',
-5966=>'L',
-5967=>'L',
-5968=>'L',
-5969=>'L',
-5970=>'NSM',
-5971=>'NSM',
-5984=>'L',
-5985=>'L',
-5986=>'L',
-5987=>'L',
-5988=>'L',
-5989=>'L',
-5990=>'L',
-5991=>'L',
-5992=>'L',
-5993=>'L',
-5994=>'L',
-5995=>'L',
-5996=>'L',
-5998=>'L',
-5999=>'L',
-6000=>'L',
-6002=>'NSM',
-6003=>'NSM',
-6016=>'L',
-6017=>'L',
-6018=>'L',
-6019=>'L',
-6020=>'L',
-6021=>'L',
-6022=>'L',
-6023=>'L',
-6024=>'L',
-6025=>'L',
-6026=>'L',
-6027=>'L',
-6028=>'L',
-6029=>'L',
-6030=>'L',
-6031=>'L',
-6032=>'L',
-6033=>'L',
-6034=>'L',
-6035=>'L',
-6036=>'L',
-6037=>'L',
-6038=>'L',
-6039=>'L',
-6040=>'L',
-6041=>'L',
-6042=>'L',
-6043=>'L',
-6044=>'L',
-6045=>'L',
-6046=>'L',
-6047=>'L',
-6048=>'L',
-6049=>'L',
-6050=>'L',
-6051=>'L',
-6052=>'L',
-6053=>'L',
-6054=>'L',
-6055=>'L',
-6056=>'L',
-6057=>'L',
-6058=>'L',
-6059=>'L',
-6060=>'L',
-6061=>'L',
-6062=>'L',
-6063=>'L',
-6064=>'L',
-6065=>'L',
-6066=>'L',
-6067=>'L',
-6068=>'L',
-6069=>'L',
-6070=>'L',
-6071=>'NSM',
-6072=>'NSM',
-6073=>'NSM',
-6074=>'NSM',
-6075=>'NSM',
-6076=>'NSM',
-6077=>'NSM',
-6078=>'L',
-6079=>'L',
-6080=>'L',
-6081=>'L',
-6082=>'L',
-6083=>'L',
-6084=>'L',
-6085=>'L',
-6086=>'NSM',
-6087=>'L',
-6088=>'L',
-6089=>'NSM',
-6090=>'NSM',
-6091=>'NSM',
-6092=>'NSM',
-6093=>'NSM',
-6094=>'NSM',
-6095=>'NSM',
-6096=>'NSM',
-6097=>'NSM',
-6098=>'NSM',
-6099=>'NSM',
-6100=>'L',
-6101=>'L',
-6102=>'L',
-6103=>'L',
-6104=>'L',
-6105=>'L',
-6106=>'L',
-6107=>'ET',
-6108=>'L',
-6109=>'NSM',
-6112=>'L',
-6113=>'L',
-6114=>'L',
-6115=>'L',
-6116=>'L',
-6117=>'L',
-6118=>'L',
-6119=>'L',
-6120=>'L',
-6121=>'L',
-6128=>'ON',
-6129=>'ON',
-6130=>'ON',
-6131=>'ON',
-6132=>'ON',
-6133=>'ON',
-6134=>'ON',
-6135=>'ON',
-6136=>'ON',
-6137=>'ON',
-6144=>'ON',
-6145=>'ON',
-6146=>'ON',
-6147=>'ON',
-6148=>'ON',
-6149=>'ON',
-6150=>'ON',
-6151=>'ON',
-6152=>'ON',
-6153=>'ON',
-6154=>'ON',
-6155=>'NSM',
-6156=>'NSM',
-6157=>'NSM',
-6158=>'WS',
-6160=>'L',
-6161=>'L',
-6162=>'L',
-6163=>'L',
-6164=>'L',
-6165=>'L',
-6166=>'L',
-6167=>'L',
-6168=>'L',
-6169=>'L',
-6176=>'L',
-6177=>'L',
-6178=>'L',
-6179=>'L',
-6180=>'L',
-6181=>'L',
-6182=>'L',
-6183=>'L',
-6184=>'L',
-6185=>'L',
-6186=>'L',
-6187=>'L',
-6188=>'L',
-6189=>'L',
-6190=>'L',
-6191=>'L',
-6192=>'L',
-6193=>'L',
-6194=>'L',
-6195=>'L',
-6196=>'L',
-6197=>'L',
-6198=>'L',
-6199=>'L',
-6200=>'L',
-6201=>'L',
-6202=>'L',
-6203=>'L',
-6204=>'L',
-6205=>'L',
-6206=>'L',
-6207=>'L',
-6208=>'L',
-6209=>'L',
-6210=>'L',
-6211=>'L',
-6212=>'L',
-6213=>'L',
-6214=>'L',
-6215=>'L',
-6216=>'L',
-6217=>'L',
-6218=>'L',
-6219=>'L',
-6220=>'L',
-6221=>'L',
-6222=>'L',
-6223=>'L',
-6224=>'L',
-6225=>'L',
-6226=>'L',
-6227=>'L',
-6228=>'L',
-6229=>'L',
-6230=>'L',
-6231=>'L',
-6232=>'L',
-6233=>'L',
-6234=>'L',
-6235=>'L',
-6236=>'L',
-6237=>'L',
-6238=>'L',
-6239=>'L',
-6240=>'L',
-6241=>'L',
-6242=>'L',
-6243=>'L',
-6244=>'L',
-6245=>'L',
-6246=>'L',
-6247=>'L',
-6248=>'L',
-6249=>'L',
-6250=>'L',
-6251=>'L',
-6252=>'L',
-6253=>'L',
-6254=>'L',
-6255=>'L',
-6256=>'L',
-6257=>'L',
-6258=>'L',
-6259=>'L',
-6260=>'L',
-6261=>'L',
-6262=>'L',
-6263=>'L',
-6272=>'L',
-6273=>'L',
-6274=>'L',
-6275=>'L',
-6276=>'L',
-6277=>'L',
-6278=>'L',
-6279=>'L',
-6280=>'L',
-6281=>'L',
-6282=>'L',
-6283=>'L',
-6284=>'L',
-6285=>'L',
-6286=>'L',
-6287=>'L',
-6288=>'L',
-6289=>'L',
-6290=>'L',
-6291=>'L',
-6292=>'L',
-6293=>'L',
-6294=>'L',
-6295=>'L',
-6296=>'L',
-6297=>'L',
-6298=>'L',
-6299=>'L',
-6300=>'L',
-6301=>'L',
-6302=>'L',
-6303=>'L',
-6304=>'L',
-6305=>'L',
-6306=>'L',
-6307=>'L',
-6308=>'L',
-6309=>'L',
-6310=>'L',
-6311=>'L',
-6312=>'L',
-6313=>'NSM',
-6400=>'L',
-6401=>'L',
-6402=>'L',
-6403=>'L',
-6404=>'L',
-6405=>'L',
-6406=>'L',
-6407=>'L',
-6408=>'L',
-6409=>'L',
-6410=>'L',
-6411=>'L',
-6412=>'L',
-6413=>'L',
-6414=>'L',
-6415=>'L',
-6416=>'L',
-6417=>'L',
-6418=>'L',
-6419=>'L',
-6420=>'L',
-6421=>'L',
-6422=>'L',
-6423=>'L',
-6424=>'L',
-6425=>'L',
-6426=>'L',
-6427=>'L',
-6428=>'L',
-6432=>'NSM',
-6433=>'NSM',
-6434=>'NSM',
-6435=>'L',
-6436=>'L',
-6437=>'L',
-6438=>'L',
-6439=>'NSM',
-6440=>'NSM',
-6441=>'NSM',
-6442=>'NSM',
-6443=>'NSM',
-6448=>'L',
-6449=>'L',
-6450=>'NSM',
-6451=>'L',
-6452=>'L',
-6453=>'L',
-6454=>'L',
-6455=>'L',
-6456=>'L',
-6457=>'NSM',
-6458=>'NSM',
-6459=>'NSM',
-6464=>'ON',
-6468=>'ON',
-6469=>'ON',
-6470=>'L',
-6471=>'L',
-6472=>'L',
-6473=>'L',
-6474=>'L',
-6475=>'L',
-6476=>'L',
-6477=>'L',
-6478=>'L',
-6479=>'L',
-6480=>'L',
-6481=>'L',
-6482=>'L',
-6483=>'L',
-6484=>'L',
-6485=>'L',
-6486=>'L',
-6487=>'L',
-6488=>'L',
-6489=>'L',
-6490=>'L',
-6491=>'L',
-6492=>'L',
-6493=>'L',
-6494=>'L',
-6495=>'L',
-6496=>'L',
-6497=>'L',
-6498=>'L',
-6499=>'L',
-6500=>'L',
-6501=>'L',
-6502=>'L',
-6503=>'L',
-6504=>'L',
-6505=>'L',
-6506=>'L',
-6507=>'L',
-6508=>'L',
-6509=>'L',
-6512=>'L',
-6513=>'L',
-6514=>'L',
-6515=>'L',
-6516=>'L',
-6528=>'L',
-6529=>'L',
-6530=>'L',
-6531=>'L',
-6532=>'L',
-6533=>'L',
-6534=>'L',
-6535=>'L',
-6536=>'L',
-6537=>'L',
-6538=>'L',
-6539=>'L',
-6540=>'L',
-6541=>'L',
-6542=>'L',
-6543=>'L',
-6544=>'L',
-6545=>'L',
-6546=>'L',
-6547=>'L',
-6548=>'L',
-6549=>'L',
-6550=>'L',
-6551=>'L',
-6552=>'L',
-6553=>'L',
-6554=>'L',
-6555=>'L',
-6556=>'L',
-6557=>'L',
-6558=>'L',
-6559=>'L',
-6560=>'L',
-6561=>'L',
-6562=>'L',
-6563=>'L',
-6564=>'L',
-6565=>'L',
-6566=>'L',
-6567=>'L',
-6568=>'L',
-6569=>'L',
-6576=>'L',
-6577=>'L',
-6578=>'L',
-6579=>'L',
-6580=>'L',
-6581=>'L',
-6582=>'L',
-6583=>'L',
-6584=>'L',
-6585=>'L',
-6586=>'L',
-6587=>'L',
-6588=>'L',
-6589=>'L',
-6590=>'L',
-6591=>'L',
-6592=>'L',
-6593=>'L',
-6594=>'L',
-6595=>'L',
-6596=>'L',
-6597=>'L',
-6598=>'L',
-6599=>'L',
-6600=>'L',
-6601=>'L',
-6608=>'L',
-6609=>'L',
-6610=>'L',
-6611=>'L',
-6612=>'L',
-6613=>'L',
-6614=>'L',
-6615=>'L',
-6616=>'L',
-6617=>'L',
-6622=>'ON',
-6623=>'ON',
-6624=>'ON',
-6625=>'ON',
-6626=>'ON',
-6627=>'ON',
-6628=>'ON',
-6629=>'ON',
-6630=>'ON',
-6631=>'ON',
-6632=>'ON',
-6633=>'ON',
-6634=>'ON',
-6635=>'ON',
-6636=>'ON',
-6637=>'ON',
-6638=>'ON',
-6639=>'ON',
-6640=>'ON',
-6641=>'ON',
-6642=>'ON',
-6643=>'ON',
-6644=>'ON',
-6645=>'ON',
-6646=>'ON',
-6647=>'ON',
-6648=>'ON',
-6649=>'ON',
-6650=>'ON',
-6651=>'ON',
-6652=>'ON',
-6653=>'ON',
-6654=>'ON',
-6655=>'ON',
-6656=>'L',
-6657=>'L',
-6658=>'L',
-6659=>'L',
-6660=>'L',
-6661=>'L',
-6662=>'L',
-6663=>'L',
-6664=>'L',
-6665=>'L',
-6666=>'L',
-6667=>'L',
-6668=>'L',
-6669=>'L',
-6670=>'L',
-6671=>'L',
-6672=>'L',
-6673=>'L',
-6674=>'L',
-6675=>'L',
-6676=>'L',
-6677=>'L',
-6678=>'L',
-6679=>'NSM',
-6680=>'NSM',
-6681=>'L',
-6682=>'L',
-6683=>'L',
-6686=>'L',
-6687=>'L',
-6912=>'NSM',
-6913=>'NSM',
-6914=>'NSM',
-6915=>'NSM',
-6916=>'L',
-6917=>'L',
-6918=>'L',
-6919=>'L',
-6920=>'L',
-6921=>'L',
-6922=>'L',
-6923=>'L',
-6924=>'L',
-6925=>'L',
-6926=>'L',
-6927=>'L',
-6928=>'L',
-6929=>'L',
-6930=>'L',
-6931=>'L',
-6932=>'L',
-6933=>'L',
-6934=>'L',
-6935=>'L',
-6936=>'L',
-6937=>'L',
-6938=>'L',
-6939=>'L',
-6940=>'L',
-6941=>'L',
-6942=>'L',
-6943=>'L',
-6944=>'L',
-6945=>'L',
-6946=>'L',
-6947=>'L',
-6948=>'L',
-6949=>'L',
-6950=>'L',
-6951=>'L',
-6952=>'L',
-6953=>'L',
-6954=>'L',
-6955=>'L',
-6956=>'L',
-6957=>'L',
-6958=>'L',
-6959=>'L',
-6960=>'L',
-6961=>'L',
-6962=>'L',
-6963=>'L',
-6964=>'NSM',
-6965=>'L',
-6966=>'NSM',
-6967=>'NSM',
-6968=>'NSM',
-6969=>'NSM',
-6970=>'NSM',
-6971=>'L',
-6972=>'NSM',
-6973=>'L',
-6974=>'L',
-6975=>'L',
-6976=>'L',
-6977=>'L',
-6978=>'NSM',
-6979=>'L',
-6980=>'L',
-6981=>'L',
-6982=>'L',
-6983=>'L',
-6984=>'L',
-6985=>'L',
-6986=>'L',
-6987=>'L',
-6992=>'L',
-6993=>'L',
-6994=>'L',
-6995=>'L',
-6996=>'L',
-6997=>'L',
-6998=>'L',
-6999=>'L',
-7000=>'L',
-7001=>'L',
-7002=>'L',
-7003=>'L',
-7004=>'L',
-7005=>'L',
-7006=>'L',
-7007=>'L',
-7008=>'L',
-7009=>'L',
-7010=>'L',
-7011=>'L',
-7012=>'L',
-7013=>'L',
-7014=>'L',
-7015=>'L',
-7016=>'L',
-7017=>'L',
-7018=>'L',
-7019=>'NSM',
-7020=>'NSM',
-7021=>'NSM',
-7022=>'NSM',
-7023=>'NSM',
-7024=>'NSM',
-7025=>'NSM',
-7026=>'NSM',
-7027=>'NSM',
-7028=>'L',
-7029=>'L',
-7030=>'L',
-7031=>'L',
-7032=>'L',
-7033=>'L',
-7034=>'L',
-7035=>'L',
-7036=>'L',
-7424=>'L',
-7425=>'L',
-7426=>'L',
-7427=>'L',
-7428=>'L',
-7429=>'L',
-7430=>'L',
-7431=>'L',
-7432=>'L',
-7433=>'L',
-7434=>'L',
-7435=>'L',
-7436=>'L',
-7437=>'L',
-7438=>'L',
-7439=>'L',
-7440=>'L',
-7441=>'L',
-7442=>'L',
-7443=>'L',
-7444=>'L',
-7445=>'L',
-7446=>'L',
-7447=>'L',
-7448=>'L',
-7449=>'L',
-7450=>'L',
-7451=>'L',
-7452=>'L',
-7453=>'L',
-7454=>'L',
-7455=>'L',
-7456=>'L',
-7457=>'L',
-7458=>'L',
-7459=>'L',
-7460=>'L',
-7461=>'L',
-7462=>'L',
-7463=>'L',
-7464=>'L',
-7465=>'L',
-7466=>'L',
-7467=>'L',
-7468=>'L',
-7469=>'L',
-7470=>'L',
-7471=>'L',
-7472=>'L',
-7473=>'L',
-7474=>'L',
-7475=>'L',
-7476=>'L',
-7477=>'L',
-7478=>'L',
-7479=>'L',
-7480=>'L',
-7481=>'L',
-7482=>'L',
-7483=>'L',
-7484=>'L',
-7485=>'L',
-7486=>'L',
-7487=>'L',
-7488=>'L',
-7489=>'L',
-7490=>'L',
-7491=>'L',
-7492=>'L',
-7493=>'L',
-7494=>'L',
-7495=>'L',
-7496=>'L',
-7497=>'L',
-7498=>'L',
-7499=>'L',
-7500=>'L',
-7501=>'L',
-7502=>'L',
-7503=>'L',
-7504=>'L',
-7505=>'L',
-7506=>'L',
-7507=>'L',
-7508=>'L',
-7509=>'L',
-7510=>'L',
-7511=>'L',
-7512=>'L',
-7513=>'L',
-7514=>'L',
-7515=>'L',
-7516=>'L',
-7517=>'L',
-7518=>'L',
-7519=>'L',
-7520=>'L',
-7521=>'L',
-7522=>'L',
-7523=>'L',
-7524=>'L',
-7525=>'L',
-7526=>'L',
-7527=>'L',
-7528=>'L',
-7529=>'L',
-7530=>'L',
-7531=>'L',
-7532=>'L',
-7533=>'L',
-7534=>'L',
-7535=>'L',
-7536=>'L',
-7537=>'L',
-7538=>'L',
-7539=>'L',
-7540=>'L',
-7541=>'L',
-7542=>'L',
-7543=>'L',
-7544=>'L',
-7545=>'L',
-7546=>'L',
-7547=>'L',
-7548=>'L',
-7549=>'L',
-7550=>'L',
-7551=>'L',
-7552=>'L',
-7553=>'L',
-7554=>'L',
-7555=>'L',
-7556=>'L',
-7557=>'L',
-7558=>'L',
-7559=>'L',
-7560=>'L',
-7561=>'L',
-7562=>'L',
-7563=>'L',
-7564=>'L',
-7565=>'L',
-7566=>'L',
-7567=>'L',
-7568=>'L',
-7569=>'L',
-7570=>'L',
-7571=>'L',
-7572=>'L',
-7573=>'L',
-7574=>'L',
-7575=>'L',
-7576=>'L',
-7577=>'L',
-7578=>'L',
-7579=>'L',
-7580=>'L',
-7581=>'L',
-7582=>'L',
-7583=>'L',
-7584=>'L',
-7585=>'L',
-7586=>'L',
-7587=>'L',
-7588=>'L',
-7589=>'L',
-7590=>'L',
-7591=>'L',
-7592=>'L',
-7593=>'L',
-7594=>'L',
-7595=>'L',
-7596=>'L',
-7597=>'L',
-7598=>'L',
-7599=>'L',
-7600=>'L',
-7601=>'L',
-7602=>'L',
-7603=>'L',
-7604=>'L',
-7605=>'L',
-7606=>'L',
-7607=>'L',
-7608=>'L',
-7609=>'L',
-7610=>'L',
-7611=>'L',
-7612=>'L',
-7613=>'L',
-7614=>'L',
-7615=>'L',
-7616=>'NSM',
-7617=>'NSM',
-7618=>'NSM',
-7619=>'NSM',
-7620=>'NSM',
-7621=>'NSM',
-7622=>'NSM',
-7623=>'NSM',
-7624=>'NSM',
-7625=>'NSM',
-7626=>'NSM',
-7678=>'NSM',
-7679=>'NSM',
-7680=>'L',
-7681=>'L',
-7682=>'L',
-7683=>'L',
-7684=>'L',
-7685=>'L',
-7686=>'L',
-7687=>'L',
-7688=>'L',
-7689=>'L',
-7690=>'L',
-7691=>'L',
-7692=>'L',
-7693=>'L',
-7694=>'L',
-7695=>'L',
-7696=>'L',
-7697=>'L',
-7698=>'L',
-7699=>'L',
-7700=>'L',
-7701=>'L',
-7702=>'L',
-7703=>'L',
-7704=>'L',
-7705=>'L',
-7706=>'L',
-7707=>'L',
-7708=>'L',
-7709=>'L',
-7710=>'L',
-7711=>'L',
-7712=>'L',
-7713=>'L',
-7714=>'L',
-7715=>'L',
-7716=>'L',
-7717=>'L',
-7718=>'L',
-7719=>'L',
-7720=>'L',
-7721=>'L',
-7722=>'L',
-7723=>'L',
-7724=>'L',
-7725=>'L',
-7726=>'L',
-7727=>'L',
-7728=>'L',
-7729=>'L',
-7730=>'L',
-7731=>'L',
-7732=>'L',
-7733=>'L',
-7734=>'L',
-7735=>'L',
-7736=>'L',
-7737=>'L',
-7738=>'L',
-7739=>'L',
-7740=>'L',
-7741=>'L',
-7742=>'L',
-7743=>'L',
-7744=>'L',
-7745=>'L',
-7746=>'L',
-7747=>'L',
-7748=>'L',
-7749=>'L',
-7750=>'L',
-7751=>'L',
-7752=>'L',
-7753=>'L',
-7754=>'L',
-7755=>'L',
-7756=>'L',
-7757=>'L',
-7758=>'L',
-7759=>'L',
-7760=>'L',
-7761=>'L',
-7762=>'L',
-7763=>'L',
-7764=>'L',
-7765=>'L',
-7766=>'L',
-7767=>'L',
-7768=>'L',
-7769=>'L',
-7770=>'L',
-7771=>'L',
-7772=>'L',
-7773=>'L',
-7774=>'L',
-7775=>'L',
-7776=>'L',
-7777=>'L',
-7778=>'L',
-7779=>'L',
-7780=>'L',
-7781=>'L',
-7782=>'L',
-7783=>'L',
-7784=>'L',
-7785=>'L',
-7786=>'L',
-7787=>'L',
-7788=>'L',
-7789=>'L',
-7790=>'L',
-7791=>'L',
-7792=>'L',
-7793=>'L',
-7794=>'L',
-7795=>'L',
-7796=>'L',
-7797=>'L',
-7798=>'L',
-7799=>'L',
-7800=>'L',
-7801=>'L',
-7802=>'L',
-7803=>'L',
-7804=>'L',
-7805=>'L',
-7806=>'L',
-7807=>'L',
-7808=>'L',
-7809=>'L',
-7810=>'L',
-7811=>'L',
-7812=>'L',
-7813=>'L',
-7814=>'L',
-7815=>'L',
-7816=>'L',
-7817=>'L',
-7818=>'L',
-7819=>'L',
-7820=>'L',
-7821=>'L',
-7822=>'L',
-7823=>'L',
-7824=>'L',
-7825=>'L',
-7826=>'L',
-7827=>'L',
-7828=>'L',
-7829=>'L',
-7830=>'L',
-7831=>'L',
-7832=>'L',
-7833=>'L',
-7834=>'L',
-7835=>'L',
-7840=>'L',
-7841=>'L',
-7842=>'L',
-7843=>'L',
-7844=>'L',
-7845=>'L',
-7846=>'L',
-7847=>'L',
-7848=>'L',
-7849=>'L',
-7850=>'L',
-7851=>'L',
-7852=>'L',
-7853=>'L',
-7854=>'L',
-7855=>'L',
-7856=>'L',
-7857=>'L',
-7858=>'L',
-7859=>'L',
-7860=>'L',
-7861=>'L',
-7862=>'L',
-7863=>'L',
-7864=>'L',
-7865=>'L',
-7866=>'L',
-7867=>'L',
-7868=>'L',
-7869=>'L',
-7870=>'L',
-7871=>'L',
-7872=>'L',
-7873=>'L',
-7874=>'L',
-7875=>'L',
-7876=>'L',
-7877=>'L',
-7878=>'L',
-7879=>'L',
-7880=>'L',
-7881=>'L',
-7882=>'L',
-7883=>'L',
-7884=>'L',
-7885=>'L',
-7886=>'L',
-7887=>'L',
-7888=>'L',
-7889=>'L',
-7890=>'L',
-7891=>'L',
-7892=>'L',
-7893=>'L',
-7894=>'L',
-7895=>'L',
-7896=>'L',
-7897=>'L',
-7898=>'L',
-7899=>'L',
-7900=>'L',
-7901=>'L',
-7902=>'L',
-7903=>'L',
-7904=>'L',
-7905=>'L',
-7906=>'L',
-7907=>'L',
-7908=>'L',
-7909=>'L',
-7910=>'L',
-7911=>'L',
-7912=>'L',
-7913=>'L',
-7914=>'L',
-7915=>'L',
-7916=>'L',
-7917=>'L',
-7918=>'L',
-7919=>'L',
-7920=>'L',
-7921=>'L',
-7922=>'L',
-7923=>'L',
-7924=>'L',
-7925=>'L',
-7926=>'L',
-7927=>'L',
-7928=>'L',
-7929=>'L',
-7936=>'L',
-7937=>'L',
-7938=>'L',
-7939=>'L',
-7940=>'L',
-7941=>'L',
-7942=>'L',
-7943=>'L',
-7944=>'L',
-7945=>'L',
-7946=>'L',
-7947=>'L',
-7948=>'L',
-7949=>'L',
-7950=>'L',
-7951=>'L',
-7952=>'L',
-7953=>'L',
-7954=>'L',
-7955=>'L',
-7956=>'L',
-7957=>'L',
-7960=>'L',
-7961=>'L',
-7962=>'L',
-7963=>'L',
-7964=>'L',
-7965=>'L',
-7968=>'L',
-7969=>'L',
-7970=>'L',
-7971=>'L',
-7972=>'L',
-7973=>'L',
-7974=>'L',
-7975=>'L',
-7976=>'L',
-7977=>'L',
-7978=>'L',
-7979=>'L',
-7980=>'L',
-7981=>'L',
-7982=>'L',
-7983=>'L',
-7984=>'L',
-7985=>'L',
-7986=>'L',
-7987=>'L',
-7988=>'L',
-7989=>'L',
-7990=>'L',
-7991=>'L',
-7992=>'L',
-7993=>'L',
-7994=>'L',
-7995=>'L',
-7996=>'L',
-7997=>'L',
-7998=>'L',
-7999=>'L',
-8000=>'L',
-8001=>'L',
-8002=>'L',
-8003=>'L',
-8004=>'L',
-8005=>'L',
-8008=>'L',
-8009=>'L',
-8010=>'L',
-8011=>'L',
-8012=>'L',
-8013=>'L',
-8016=>'L',
-8017=>'L',
-8018=>'L',
-8019=>'L',
-8020=>'L',
-8021=>'L',
-8022=>'L',
-8023=>'L',
-8025=>'L',
-8027=>'L',
-8029=>'L',
-8031=>'L',
-8032=>'L',
-8033=>'L',
-8034=>'L',
-8035=>'L',
-8036=>'L',
-8037=>'L',
-8038=>'L',
-8039=>'L',
-8040=>'L',
-8041=>'L',
-8042=>'L',
-8043=>'L',
-8044=>'L',
-8045=>'L',
-8046=>'L',
-8047=>'L',
-8048=>'L',
-8049=>'L',
-8050=>'L',
-8051=>'L',
-8052=>'L',
-8053=>'L',
-8054=>'L',
-8055=>'L',
-8056=>'L',
-8057=>'L',
-8058=>'L',
-8059=>'L',
-8060=>'L',
-8061=>'L',
-8064=>'L',
-8065=>'L',
-8066=>'L',
-8067=>'L',
-8068=>'L',
-8069=>'L',
-8070=>'L',
-8071=>'L',
-8072=>'L',
-8073=>'L',
-8074=>'L',
-8075=>'L',
-8076=>'L',
-8077=>'L',
-8078=>'L',
-8079=>'L',
-8080=>'L',
-8081=>'L',
-8082=>'L',
-8083=>'L',
-8084=>'L',
-8085=>'L',
-8086=>'L',
-8087=>'L',
-8088=>'L',
-8089=>'L',
-8090=>'L',
-8091=>'L',
-8092=>'L',
-8093=>'L',
-8094=>'L',
-8095=>'L',
-8096=>'L',
-8097=>'L',
-8098=>'L',
-8099=>'L',
-8100=>'L',
-8101=>'L',
-8102=>'L',
-8103=>'L',
-8104=>'L',
-8105=>'L',
-8106=>'L',
-8107=>'L',
-8108=>'L',
-8109=>'L',
-8110=>'L',
-8111=>'L',
-8112=>'L',
-8113=>'L',
-8114=>'L',
-8115=>'L',
-8116=>'L',
-8118=>'L',
-8119=>'L',
-8120=>'L',
-8121=>'L',
-8122=>'L',
-8123=>'L',
-8124=>'L',
-8125=>'ON',
-8126=>'L',
-8127=>'ON',
-8128=>'ON',
-8129=>'ON',
-8130=>'L',
-8131=>'L',
-8132=>'L',
-8134=>'L',
-8135=>'L',
-8136=>'L',
-8137=>'L',
-8138=>'L',
-8139=>'L',
-8140=>'L',
-8141=>'ON',
-8142=>'ON',
-8143=>'ON',
-8144=>'L',
-8145=>'L',
-8146=>'L',
-8147=>'L',
-8150=>'L',
-8151=>'L',
-8152=>'L',
-8153=>'L',
-8154=>'L',
-8155=>'L',
-8157=>'ON',
-8158=>'ON',
-8159=>'ON',
-8160=>'L',
-8161=>'L',
-8162=>'L',
-8163=>'L',
-8164=>'L',
-8165=>'L',
-8166=>'L',
-8167=>'L',
-8168=>'L',
-8169=>'L',
-8170=>'L',
-8171=>'L',
-8172=>'L',
-8173=>'ON',
-8174=>'ON',
-8175=>'ON',
-8178=>'L',
-8179=>'L',
-8180=>'L',
-8182=>'L',
-8183=>'L',
-8184=>'L',
-8185=>'L',
-8186=>'L',
-8187=>'L',
-8188=>'L',
-8189=>'ON',
-8190=>'ON',
-8192=>'WS',
-8193=>'WS',
-8194=>'WS',
-8195=>'WS',
-8196=>'WS',
-8197=>'WS',
-8198=>'WS',
-8199=>'WS',
-8200=>'WS',
-8201=>'WS',
-8202=>'WS',
-8203=>'BN',
-8204=>'BN',
-8205=>'BN',
-8206=>'L',
-8207=>'R',
-8208=>'ON',
-8209=>'ON',
-8210=>'ON',
-8211=>'ON',
-8212=>'ON',
-8213=>'ON',
-8214=>'ON',
-8215=>'ON',
-8216=>'ON',
-8217=>'ON',
-8218=>'ON',
-8219=>'ON',
-8220=>'ON',
-8221=>'ON',
-8222=>'ON',
-8223=>'ON',
-8224=>'ON',
-8225=>'ON',
-8226=>'ON',
-8227=>'ON',
-8228=>'ON',
-8229=>'ON',
-8230=>'ON',
-8231=>'ON',
-8232=>'WS',
-8233=>'B',
-8234=>'LRE',
-8235=>'RLE',
-8236=>'PDF',
-8237=>'LRO',
-8238=>'RLO',
-8239=>'CS',
-8240=>'ET',
-8241=>'ET',
-8242=>'ET',
-8243=>'ET',
-8244=>'ET',
-8245=>'ON',
-8246=>'ON',
-8247=>'ON',
-8248=>'ON',
-8249=>'ON',
-8250=>'ON',
-8251=>'ON',
-8252=>'ON',
-8253=>'ON',
-8254=>'ON',
-8255=>'ON',
-8256=>'ON',
-8257=>'ON',
-8258=>'ON',
-8259=>'ON',
-8260=>'CS',
-8261=>'ON',
-8262=>'ON',
-8263=>'ON',
-8264=>'ON',
-8265=>'ON',
-8266=>'ON',
-8267=>'ON',
-8268=>'ON',
-8269=>'ON',
-8270=>'ON',
-8271=>'ON',
-8272=>'ON',
-8273=>'ON',
-8274=>'ON',
-8275=>'ON',
-8276=>'ON',
-8277=>'ON',
-8278=>'ON',
-8279=>'ON',
-8280=>'ON',
-8281=>'ON',
-8282=>'ON',
-8283=>'ON',
-8284=>'ON',
-8285=>'ON',
-8286=>'ON',
-8287=>'WS',
-8288=>'BN',
-8289=>'BN',
-8290=>'BN',
-8291=>'BN',
-8298=>'BN',
-8299=>'BN',
-8300=>'BN',
-8301=>'BN',
-8302=>'BN',
-8303=>'BN',
-8304=>'EN',
-8305=>'L',
-8308=>'EN',
-8309=>'EN',
-8310=>'EN',
-8311=>'EN',
-8312=>'EN',
-8313=>'EN',
-8314=>'ES',
-8315=>'ES',
-8316=>'ON',
-8317=>'ON',
-8318=>'ON',
-8319=>'L',
-8320=>'EN',
-8321=>'EN',
-8322=>'EN',
-8323=>'EN',
-8324=>'EN',
-8325=>'EN',
-8326=>'EN',
-8327=>'EN',
-8328=>'EN',
-8329=>'EN',
-8330=>'ES',
-8331=>'ES',
-8332=>'ON',
-8333=>'ON',
-8334=>'ON',
-8336=>'L',
-8337=>'L',
-8338=>'L',
-8339=>'L',
-8340=>'L',
-8352=>'ET',
-8353=>'ET',
-8354=>'ET',
-8355=>'ET',
-8356=>'ET',
-8357=>'ET',
-8358=>'ET',
-8359=>'ET',
-8360=>'ET',
-8361=>'ET',
-8362=>'ET',
-8363=>'ET',
-8364=>'ET',
-8365=>'ET',
-8366=>'ET',
-8367=>'ET',
-8368=>'ET',
-8369=>'ET',
-8370=>'ET',
-8371=>'ET',
-8372=>'ET',
-8373=>'ET',
-8400=>'NSM',
-8401=>'NSM',
-8402=>'NSM',
-8403=>'NSM',
-8404=>'NSM',
-8405=>'NSM',
-8406=>'NSM',
-8407=>'NSM',
-8408=>'NSM',
-8409=>'NSM',
-8410=>'NSM',
-8411=>'NSM',
-8412=>'NSM',
-8413=>'NSM',
-8414=>'NSM',
-8415=>'NSM',
-8416=>'NSM',
-8417=>'NSM',
-8418=>'NSM',
-8419=>'NSM',
-8420=>'NSM',
-8421=>'NSM',
-8422=>'NSM',
-8423=>'NSM',
-8424=>'NSM',
-8425=>'NSM',
-8426=>'NSM',
-8427=>'NSM',
-8428=>'NSM',
-8429=>'NSM',
-8430=>'NSM',
-8431=>'NSM',
-8448=>'ON',
-8449=>'ON',
-8450=>'L',
-8451=>'ON',
-8452=>'ON',
-8453=>'ON',
-8454=>'ON',
-8455=>'L',
-8456=>'ON',
-8457=>'ON',
-8458=>'L',
-8459=>'L',
-8460=>'L',
-8461=>'L',
-8462=>'L',
-8463=>'L',
-8464=>'L',
-8465=>'L',
-8466=>'L',
-8467=>'L',
-8468=>'ON',
-8469=>'L',
-8470=>'ON',
-8471=>'ON',
-8472=>'ON',
-8473=>'L',
-8474=>'L',
-8475=>'L',
-8476=>'L',
-8477=>'L',
-8478=>'ON',
-8479=>'ON',
-8480=>'ON',
-8481=>'ON',
-8482=>'ON',
-8483=>'ON',
-8484=>'L',
-8485=>'ON',
-8486=>'L',
-8487=>'ON',
-8488=>'L',
-8489=>'ON',
-8490=>'L',
-8491=>'L',
-8492=>'L',
-8493=>'L',
-8494=>'ET',
-8495=>'L',
-8496=>'L',
-8497=>'L',
-8498=>'L',
-8499=>'L',
-8500=>'L',
-8501=>'L',
-8502=>'L',
-8503=>'L',
-8504=>'L',
-8505=>'L',
-8506=>'ON',
-8507=>'ON',
-8508=>'L',
-8509=>'L',
-8510=>'L',
-8511=>'L',
-8512=>'ON',
-8513=>'ON',
-8514=>'ON',
-8515=>'ON',
-8516=>'ON',
-8517=>'L',
-8518=>'L',
-8519=>'L',
-8520=>'L',
-8521=>'L',
-8522=>'ON',
-8523=>'ON',
-8524=>'ON',
-8525=>'ON',
-8526=>'L',
-8531=>'ON',
-8532=>'ON',
-8533=>'ON',
-8534=>'ON',
-8535=>'ON',
-8536=>'ON',
-8537=>'ON',
-8538=>'ON',
-8539=>'ON',
-8540=>'ON',
-8541=>'ON',
-8542=>'ON',
-8543=>'ON',
-8544=>'L',
-8545=>'L',
-8546=>'L',
-8547=>'L',
-8548=>'L',
-8549=>'L',
-8550=>'L',
-8551=>'L',
-8552=>'L',
-8553=>'L',
-8554=>'L',
-8555=>'L',
-8556=>'L',
-8557=>'L',
-8558=>'L',
-8559=>'L',
-8560=>'L',
-8561=>'L',
-8562=>'L',
-8563=>'L',
-8564=>'L',
-8565=>'L',
-8566=>'L',
-8567=>'L',
-8568=>'L',
-8569=>'L',
-8570=>'L',
-8571=>'L',
-8572=>'L',
-8573=>'L',
-8574=>'L',
-8575=>'L',
-8576=>'L',
-8577=>'L',
-8578=>'L',
-8579=>'L',
-8580=>'L',
-8592=>'ON',
-8593=>'ON',
-8594=>'ON',
-8595=>'ON',
-8596=>'ON',
-8597=>'ON',
-8598=>'ON',
-8599=>'ON',
-8600=>'ON',
-8601=>'ON',
-8602=>'ON',
-8603=>'ON',
-8604=>'ON',
-8605=>'ON',
-8606=>'ON',
-8607=>'ON',
-8608=>'ON',
-8609=>'ON',
-8610=>'ON',
-8611=>'ON',
-8612=>'ON',
-8613=>'ON',
-8614=>'ON',
-8615=>'ON',
-8616=>'ON',
-8617=>'ON',
-8618=>'ON',
-8619=>'ON',
-8620=>'ON',
-8621=>'ON',
-8622=>'ON',
-8623=>'ON',
-8624=>'ON',
-8625=>'ON',
-8626=>'ON',
-8627=>'ON',
-8628=>'ON',
-8629=>'ON',
-8630=>'ON',
-8631=>'ON',
-8632=>'ON',
-8633=>'ON',
-8634=>'ON',
-8635=>'ON',
-8636=>'ON',
-8637=>'ON',
-8638=>'ON',
-8639=>'ON',
-8640=>'ON',
-8641=>'ON',
-8642=>'ON',
-8643=>'ON',
-8644=>'ON',
-8645=>'ON',
-8646=>'ON',
-8647=>'ON',
-8648=>'ON',
-8649=>'ON',
-8650=>'ON',
-8651=>'ON',
-8652=>'ON',
-8653=>'ON',
-8654=>'ON',
-8655=>'ON',
-8656=>'ON',
-8657=>'ON',
-8658=>'ON',
-8659=>'ON',
-8660=>'ON',
-8661=>'ON',
-8662=>'ON',
-8663=>'ON',
-8664=>'ON',
-8665=>'ON',
-8666=>'ON',
-8667=>'ON',
-8668=>'ON',
-8669=>'ON',
-8670=>'ON',
-8671=>'ON',
-8672=>'ON',
-8673=>'ON',
-8674=>'ON',
-8675=>'ON',
-8676=>'ON',
-8677=>'ON',
-8678=>'ON',
-8679=>'ON',
-8680=>'ON',
-8681=>'ON',
-8682=>'ON',
-8683=>'ON',
-8684=>'ON',
-8685=>'ON',
-8686=>'ON',
-8687=>'ON',
-8688=>'ON',
-8689=>'ON',
-8690=>'ON',
-8691=>'ON',
-8692=>'ON',
-8693=>'ON',
-8694=>'ON',
-8695=>'ON',
-8696=>'ON',
-8697=>'ON',
-8698=>'ON',
-8699=>'ON',
-8700=>'ON',
-8701=>'ON',
-8702=>'ON',
-8703=>'ON',
-8704=>'ON',
-8705=>'ON',
-8706=>'ON',
-8707=>'ON',
-8708=>'ON',
-8709=>'ON',
-8710=>'ON',
-8711=>'ON',
-8712=>'ON',
-8713=>'ON',
-8714=>'ON',
-8715=>'ON',
-8716=>'ON',
-8717=>'ON',
-8718=>'ON',
-8719=>'ON',
-8720=>'ON',
-8721=>'ON',
-8722=>'ES',
-8723=>'ET',
-8724=>'ON',
-8725=>'ON',
-8726=>'ON',
-8727=>'ON',
-8728=>'ON',
-8729=>'ON',
-8730=>'ON',
-8731=>'ON',
-8732=>'ON',
-8733=>'ON',
-8734=>'ON',
-8735=>'ON',
-8736=>'ON',
-8737=>'ON',
-8738=>'ON',
-8739=>'ON',
-8740=>'ON',
-8741=>'ON',
-8742=>'ON',
-8743=>'ON',
-8744=>'ON',
-8745=>'ON',
-8746=>'ON',
-8747=>'ON',
-8748=>'ON',
-8749=>'ON',
-8750=>'ON',
-8751=>'ON',
-8752=>'ON',
-8753=>'ON',
-8754=>'ON',
-8755=>'ON',
-8756=>'ON',
-8757=>'ON',
-8758=>'ON',
-8759=>'ON',
-8760=>'ON',
-8761=>'ON',
-8762=>'ON',
-8763=>'ON',
-8764=>'ON',
-8765=>'ON',
-8766=>'ON',
-8767=>'ON',
-8768=>'ON',
-8769=>'ON',
-8770=>'ON',
-8771=>'ON',
-8772=>'ON',
-8773=>'ON',
-8774=>'ON',
-8775=>'ON',
-8776=>'ON',
-8777=>'ON',
-8778=>'ON',
-8779=>'ON',
-8780=>'ON',
-8781=>'ON',
-8782=>'ON',
-8783=>'ON',
-8784=>'ON',
-8785=>'ON',
-8786=>'ON',
-8787=>'ON',
-8788=>'ON',
-8789=>'ON',
-8790=>'ON',
-8791=>'ON',
-8792=>'ON',
-8793=>'ON',
-8794=>'ON',
-8795=>'ON',
-8796=>'ON',
-8797=>'ON',
-8798=>'ON',
-8799=>'ON',
-8800=>'ON',
-8801=>'ON',
-8802=>'ON',
-8803=>'ON',
-8804=>'ON',
-8805=>'ON',
-8806=>'ON',
-8807=>'ON',
-8808=>'ON',
-8809=>'ON',
-8810=>'ON',
-8811=>'ON',
-8812=>'ON',
-8813=>'ON',
-8814=>'ON',
-8815=>'ON',
-8816=>'ON',
-8817=>'ON',
-8818=>'ON',
-8819=>'ON',
-8820=>'ON',
-8821=>'ON',
-8822=>'ON',
-8823=>'ON',
-8824=>'ON',
-8825=>'ON',
-8826=>'ON',
-8827=>'ON',
-8828=>'ON',
-8829=>'ON',
-8830=>'ON',
-8831=>'ON',
-8832=>'ON',
-8833=>'ON',
-8834=>'ON',
-8835=>'ON',
-8836=>'ON',
-8837=>'ON',
-8838=>'ON',
-8839=>'ON',
-8840=>'ON',
-8841=>'ON',
-8842=>'ON',
-8843=>'ON',
-8844=>'ON',
-8845=>'ON',
-8846=>'ON',
-8847=>'ON',
-8848=>'ON',
-8849=>'ON',
-8850=>'ON',
-8851=>'ON',
-8852=>'ON',
-8853=>'ON',
-8854=>'ON',
-8855=>'ON',
-8856=>'ON',
-8857=>'ON',
-8858=>'ON',
-8859=>'ON',
-8860=>'ON',
-8861=>'ON',
-8862=>'ON',
-8863=>'ON',
-8864=>'ON',
-8865=>'ON',
-8866=>'ON',
-8867=>'ON',
-8868=>'ON',
-8869=>'ON',
-8870=>'ON',
-8871=>'ON',
-8872=>'ON',
-8873=>'ON',
-8874=>'ON',
-8875=>'ON',
-8876=>'ON',
-8877=>'ON',
-8878=>'ON',
-8879=>'ON',
-8880=>'ON',
-8881=>'ON',
-8882=>'ON',
-8883=>'ON',
-8884=>'ON',
-8885=>'ON',
-8886=>'ON',
-8887=>'ON',
-8888=>'ON',
-8889=>'ON',
-8890=>'ON',
-8891=>'ON',
-8892=>'ON',
-8893=>'ON',
-8894=>'ON',
-8895=>'ON',
-8896=>'ON',
-8897=>'ON',
-8898=>'ON',
-8899=>'ON',
-8900=>'ON',
-8901=>'ON',
-8902=>'ON',
-8903=>'ON',
-8904=>'ON',
-8905=>'ON',
-8906=>'ON',
-8907=>'ON',
-8908=>'ON',
-8909=>'ON',
-8910=>'ON',
-8911=>'ON',
-8912=>'ON',
-8913=>'ON',
-8914=>'ON',
-8915=>'ON',
-8916=>'ON',
-8917=>'ON',
-8918=>'ON',
-8919=>'ON',
-8920=>'ON',
-8921=>'ON',
-8922=>'ON',
-8923=>'ON',
-8924=>'ON',
-8925=>'ON',
-8926=>'ON',
-8927=>'ON',
-8928=>'ON',
-8929=>'ON',
-8930=>'ON',
-8931=>'ON',
-8932=>'ON',
-8933=>'ON',
-8934=>'ON',
-8935=>'ON',
-8936=>'ON',
-8937=>'ON',
-8938=>'ON',
-8939=>'ON',
-8940=>'ON',
-8941=>'ON',
-8942=>'ON',
-8943=>'ON',
-8944=>'ON',
-8945=>'ON',
-8946=>'ON',
-8947=>'ON',
-8948=>'ON',
-8949=>'ON',
-8950=>'ON',
-8951=>'ON',
-8952=>'ON',
-8953=>'ON',
-8954=>'ON',
-8955=>'ON',
-8956=>'ON',
-8957=>'ON',
-8958=>'ON',
-8959=>'ON',
-8960=>'ON',
-8961=>'ON',
-8962=>'ON',
-8963=>'ON',
-8964=>'ON',
-8965=>'ON',
-8966=>'ON',
-8967=>'ON',
-8968=>'ON',
-8969=>'ON',
-8970=>'ON',
-8971=>'ON',
-8972=>'ON',
-8973=>'ON',
-8974=>'ON',
-8975=>'ON',
-8976=>'ON',
-8977=>'ON',
-8978=>'ON',
-8979=>'ON',
-8980=>'ON',
-8981=>'ON',
-8982=>'ON',
-8983=>'ON',
-8984=>'ON',
-8985=>'ON',
-8986=>'ON',
-8987=>'ON',
-8988=>'ON',
-8989=>'ON',
-8990=>'ON',
-8991=>'ON',
-8992=>'ON',
-8993=>'ON',
-8994=>'ON',
-8995=>'ON',
-8996=>'ON',
-8997=>'ON',
-8998=>'ON',
-8999=>'ON',
-9000=>'ON',
-9001=>'ON',
-9002=>'ON',
-9003=>'ON',
-9004=>'ON',
-9005=>'ON',
-9006=>'ON',
-9007=>'ON',
-9008=>'ON',
-9009=>'ON',
-9010=>'ON',
-9011=>'ON',
-9012=>'ON',
-9013=>'ON',
-9014=>'L',
-9015=>'L',
-9016=>'L',
-9017=>'L',
-9018=>'L',
-9019=>'L',
-9020=>'L',
-9021=>'L',
-9022=>'L',
-9023=>'L',
-9024=>'L',
-9025=>'L',
-9026=>'L',
-9027=>'L',
-9028=>'L',
-9029=>'L',
-9030=>'L',
-9031=>'L',
-9032=>'L',
-9033=>'L',
-9034=>'L',
-9035=>'L',
-9036=>'L',
-9037=>'L',
-9038=>'L',
-9039=>'L',
-9040=>'L',
-9041=>'L',
-9042=>'L',
-9043=>'L',
-9044=>'L',
-9045=>'L',
-9046=>'L',
-9047=>'L',
-9048=>'L',
-9049=>'L',
-9050=>'L',
-9051=>'L',
-9052=>'L',
-9053=>'L',
-9054=>'L',
-9055=>'L',
-9056=>'L',
-9057=>'L',
-9058=>'L',
-9059=>'L',
-9060=>'L',
-9061=>'L',
-9062=>'L',
-9063=>'L',
-9064=>'L',
-9065=>'L',
-9066=>'L',
-9067=>'L',
-9068=>'L',
-9069=>'L',
-9070=>'L',
-9071=>'L',
-9072=>'L',
-9073=>'L',
-9074=>'L',
-9075=>'L',
-9076=>'L',
-9077=>'L',
-9078=>'L',
-9079=>'L',
-9080=>'L',
-9081=>'L',
-9082=>'L',
-9083=>'ON',
-9084=>'ON',
-9085=>'ON',
-9086=>'ON',
-9087=>'ON',
-9088=>'ON',
-9089=>'ON',
-9090=>'ON',
-9091=>'ON',
-9092=>'ON',
-9093=>'ON',
-9094=>'ON',
-9095=>'ON',
-9096=>'ON',
-9097=>'ON',
-9098=>'ON',
-9099=>'ON',
-9100=>'ON',
-9101=>'ON',
-9102=>'ON',
-9103=>'ON',
-9104=>'ON',
-9105=>'ON',
-9106=>'ON',
-9107=>'ON',
-9108=>'ON',
-9109=>'L',
-9110=>'ON',
-9111=>'ON',
-9112=>'ON',
-9113=>'ON',
-9114=>'ON',
-9115=>'ON',
-9116=>'ON',
-9117=>'ON',
-9118=>'ON',
-9119=>'ON',
-9120=>'ON',
-9121=>'ON',
-9122=>'ON',
-9123=>'ON',
-9124=>'ON',
-9125=>'ON',
-9126=>'ON',
-9127=>'ON',
-9128=>'ON',
-9129=>'ON',
-9130=>'ON',
-9131=>'ON',
-9132=>'ON',
-9133=>'ON',
-9134=>'ON',
-9135=>'ON',
-9136=>'ON',
-9137=>'ON',
-9138=>'ON',
-9139=>'ON',
-9140=>'ON',
-9141=>'ON',
-9142=>'ON',
-9143=>'ON',
-9144=>'ON',
-9145=>'ON',
-9146=>'ON',
-9147=>'ON',
-9148=>'ON',
-9149=>'ON',
-9150=>'ON',
-9151=>'ON',
-9152=>'ON',
-9153=>'ON',
-9154=>'ON',
-9155=>'ON',
-9156=>'ON',
-9157=>'ON',
-9158=>'ON',
-9159=>'ON',
-9160=>'ON',
-9161=>'ON',
-9162=>'ON',
-9163=>'ON',
-9164=>'ON',
-9165=>'ON',
-9166=>'ON',
-9167=>'ON',
-9168=>'ON',
-9169=>'ON',
-9170=>'ON',
-9171=>'ON',
-9172=>'ON',
-9173=>'ON',
-9174=>'ON',
-9175=>'ON',
-9176=>'ON',
-9177=>'ON',
-9178=>'ON',
-9179=>'ON',
-9180=>'ON',
-9181=>'ON',
-9182=>'ON',
-9183=>'ON',
-9184=>'ON',
-9185=>'ON',
-9186=>'ON',
-9187=>'ON',
-9188=>'ON',
-9189=>'ON',
-9190=>'ON',
-9191=>'ON',
-9216=>'ON',
-9217=>'ON',
-9218=>'ON',
-9219=>'ON',
-9220=>'ON',
-9221=>'ON',
-9222=>'ON',
-9223=>'ON',
-9224=>'ON',
-9225=>'ON',
-9226=>'ON',
-9227=>'ON',
-9228=>'ON',
-9229=>'ON',
-9230=>'ON',
-9231=>'ON',
-9232=>'ON',
-9233=>'ON',
-9234=>'ON',
-9235=>'ON',
-9236=>'ON',
-9237=>'ON',
-9238=>'ON',
-9239=>'ON',
-9240=>'ON',
-9241=>'ON',
-9242=>'ON',
-9243=>'ON',
-9244=>'ON',
-9245=>'ON',
-9246=>'ON',
-9247=>'ON',
-9248=>'ON',
-9249=>'ON',
-9250=>'ON',
-9251=>'ON',
-9252=>'ON',
-9253=>'ON',
-9254=>'ON',
-9280=>'ON',
-9281=>'ON',
-9282=>'ON',
-9283=>'ON',
-9284=>'ON',
-9285=>'ON',
-9286=>'ON',
-9287=>'ON',
-9288=>'ON',
-9289=>'ON',
-9290=>'ON',
-9312=>'ON',
-9313=>'ON',
-9314=>'ON',
-9315=>'ON',
-9316=>'ON',
-9317=>'ON',
-9318=>'ON',
-9319=>'ON',
-9320=>'ON',
-9321=>'ON',
-9322=>'ON',
-9323=>'ON',
-9324=>'ON',
-9325=>'ON',
-9326=>'ON',
-9327=>'ON',
-9328=>'ON',
-9329=>'ON',
-9330=>'ON',
-9331=>'ON',
-9332=>'ON',
-9333=>'ON',
-9334=>'ON',
-9335=>'ON',
-9336=>'ON',
-9337=>'ON',
-9338=>'ON',
-9339=>'ON',
-9340=>'ON',
-9341=>'ON',
-9342=>'ON',
-9343=>'ON',
-9344=>'ON',
-9345=>'ON',
-9346=>'ON',
-9347=>'ON',
-9348=>'ON',
-9349=>'ON',
-9350=>'ON',
-9351=>'ON',
-9352=>'EN',
-9353=>'EN',
-9354=>'EN',
-9355=>'EN',
-9356=>'EN',
-9357=>'EN',
-9358=>'EN',
-9359=>'EN',
-9360=>'EN',
-9361=>'EN',
-9362=>'EN',
-9363=>'EN',
-9364=>'EN',
-9365=>'EN',
-9366=>'EN',
-9367=>'EN',
-9368=>'EN',
-9369=>'EN',
-9370=>'EN',
-9371=>'EN',
-9372=>'L',
-9373=>'L',
-9374=>'L',
-9375=>'L',
-9376=>'L',
-9377=>'L',
-9378=>'L',
-9379=>'L',
-9380=>'L',
-9381=>'L',
-9382=>'L',
-9383=>'L',
-9384=>'L',
-9385=>'L',
-9386=>'L',
-9387=>'L',
-9388=>'L',
-9389=>'L',
-9390=>'L',
-9391=>'L',
-9392=>'L',
-9393=>'L',
-9394=>'L',
-9395=>'L',
-9396=>'L',
-9397=>'L',
-9398=>'L',
-9399=>'L',
-9400=>'L',
-9401=>'L',
-9402=>'L',
-9403=>'L',
-9404=>'L',
-9405=>'L',
-9406=>'L',
-9407=>'L',
-9408=>'L',
-9409=>'L',
-9410=>'L',
-9411=>'L',
-9412=>'L',
-9413=>'L',
-9414=>'L',
-9415=>'L',
-9416=>'L',
-9417=>'L',
-9418=>'L',
-9419=>'L',
-9420=>'L',
-9421=>'L',
-9422=>'L',
-9423=>'L',
-9424=>'L',
-9425=>'L',
-9426=>'L',
-9427=>'L',
-9428=>'L',
-9429=>'L',
-9430=>'L',
-9431=>'L',
-9432=>'L',
-9433=>'L',
-9434=>'L',
-9435=>'L',
-9436=>'L',
-9437=>'L',
-9438=>'L',
-9439=>'L',
-9440=>'L',
-9441=>'L',
-9442=>'L',
-9443=>'L',
-9444=>'L',
-9445=>'L',
-9446=>'L',
-9447=>'L',
-9448=>'L',
-9449=>'L',
-9450=>'ON',
-9451=>'ON',
-9452=>'ON',
-9453=>'ON',
-9454=>'ON',
-9455=>'ON',
-9456=>'ON',
-9457=>'ON',
-9458=>'ON',
-9459=>'ON',
-9460=>'ON',
-9461=>'ON',
-9462=>'ON',
-9463=>'ON',
-9464=>'ON',
-9465=>'ON',
-9466=>'ON',
-9467=>'ON',
-9468=>'ON',
-9469=>'ON',
-9470=>'ON',
-9471=>'ON',
-9472=>'ON',
-9473=>'ON',
-9474=>'ON',
-9475=>'ON',
-9476=>'ON',
-9477=>'ON',
-9478=>'ON',
-9479=>'ON',
-9480=>'ON',
-9481=>'ON',
-9482=>'ON',
-9483=>'ON',
-9484=>'ON',
-9485=>'ON',
-9486=>'ON',
-9487=>'ON',
-9488=>'ON',
-9489=>'ON',
-9490=>'ON',
-9491=>'ON',
-9492=>'ON',
-9493=>'ON',
-9494=>'ON',
-9495=>'ON',
-9496=>'ON',
-9497=>'ON',
-9498=>'ON',
-9499=>'ON',
-9500=>'ON',
-9501=>'ON',
-9502=>'ON',
-9503=>'ON',
-9504=>'ON',
-9505=>'ON',
-9506=>'ON',
-9507=>'ON',
-9508=>'ON',
-9509=>'ON',
-9510=>'ON',
-9511=>'ON',
-9512=>'ON',
-9513=>'ON',
-9514=>'ON',
-9515=>'ON',
-9516=>'ON',
-9517=>'ON',
-9518=>'ON',
-9519=>'ON',
-9520=>'ON',
-9521=>'ON',
-9522=>'ON',
-9523=>'ON',
-9524=>'ON',
-9525=>'ON',
-9526=>'ON',
-9527=>'ON',
-9528=>'ON',
-9529=>'ON',
-9530=>'ON',
-9531=>'ON',
-9532=>'ON',
-9533=>'ON',
-9534=>'ON',
-9535=>'ON',
-9536=>'ON',
-9537=>'ON',
-9538=>'ON',
-9539=>'ON',
-9540=>'ON',
-9541=>'ON',
-9542=>'ON',
-9543=>'ON',
-9544=>'ON',
-9545=>'ON',
-9546=>'ON',
-9547=>'ON',
-9548=>'ON',
-9549=>'ON',
-9550=>'ON',
-9551=>'ON',
-9552=>'ON',
-9553=>'ON',
-9554=>'ON',
-9555=>'ON',
-9556=>'ON',
-9557=>'ON',
-9558=>'ON',
-9559=>'ON',
-9560=>'ON',
-9561=>'ON',
-9562=>'ON',
-9563=>'ON',
-9564=>'ON',
-9565=>'ON',
-9566=>'ON',
-9567=>'ON',
-9568=>'ON',
-9569=>'ON',
-9570=>'ON',
-9571=>'ON',
-9572=>'ON',
-9573=>'ON',
-9574=>'ON',
-9575=>'ON',
-9576=>'ON',
-9577=>'ON',
-9578=>'ON',
-9579=>'ON',
-9580=>'ON',
-9581=>'ON',
-9582=>'ON',
-9583=>'ON',
-9584=>'ON',
-9585=>'ON',
-9586=>'ON',
-9587=>'ON',
-9588=>'ON',
-9589=>'ON',
-9590=>'ON',
-9591=>'ON',
-9592=>'ON',
-9593=>'ON',
-9594=>'ON',
-9595=>'ON',
-9596=>'ON',
-9597=>'ON',
-9598=>'ON',
-9599=>'ON',
-9600=>'ON',
-9601=>'ON',
-9602=>'ON',
-9603=>'ON',
-9604=>'ON',
-9605=>'ON',
-9606=>'ON',
-9607=>'ON',
-9608=>'ON',
-9609=>'ON',
-9610=>'ON',
-9611=>'ON',
-9612=>'ON',
-9613=>'ON',
-9614=>'ON',
-9615=>'ON',
-9616=>'ON',
-9617=>'ON',
-9618=>'ON',
-9619=>'ON',
-9620=>'ON',
-9621=>'ON',
-9622=>'ON',
-9623=>'ON',
-9624=>'ON',
-9625=>'ON',
-9626=>'ON',
-9627=>'ON',
-9628=>'ON',
-9629=>'ON',
-9630=>'ON',
-9631=>'ON',
-9632=>'ON',
-9633=>'ON',
-9634=>'ON',
-9635=>'ON',
-9636=>'ON',
-9637=>'ON',
-9638=>'ON',
-9639=>'ON',
-9640=>'ON',
-9641=>'ON',
-9642=>'ON',
-9643=>'ON',
-9644=>'ON',
-9645=>'ON',
-9646=>'ON',
-9647=>'ON',
-9648=>'ON',
-9649=>'ON',
-9650=>'ON',
-9651=>'ON',
-9652=>'ON',
-9653=>'ON',
-9654=>'ON',
-9655=>'ON',
-9656=>'ON',
-9657=>'ON',
-9658=>'ON',
-9659=>'ON',
-9660=>'ON',
-9661=>'ON',
-9662=>'ON',
-9663=>'ON',
-9664=>'ON',
-9665=>'ON',
-9666=>'ON',
-9667=>'ON',
-9668=>'ON',
-9669=>'ON',
-9670=>'ON',
-9671=>'ON',
-9672=>'ON',
-9673=>'ON',
-9674=>'ON',
-9675=>'ON',
-9676=>'ON',
-9677=>'ON',
-9678=>'ON',
-9679=>'ON',
-9680=>'ON',
-9681=>'ON',
-9682=>'ON',
-9683=>'ON',
-9684=>'ON',
-9685=>'ON',
-9686=>'ON',
-9687=>'ON',
-9688=>'ON',
-9689=>'ON',
-9690=>'ON',
-9691=>'ON',
-9692=>'ON',
-9693=>'ON',
-9694=>'ON',
-9695=>'ON',
-9696=>'ON',
-9697=>'ON',
-9698=>'ON',
-9699=>'ON',
-9700=>'ON',
-9701=>'ON',
-9702=>'ON',
-9703=>'ON',
-9704=>'ON',
-9705=>'ON',
-9706=>'ON',
-9707=>'ON',
-9708=>'ON',
-9709=>'ON',
-9710=>'ON',
-9711=>'ON',
-9712=>'ON',
-9713=>'ON',
-9714=>'ON',
-9715=>'ON',
-9716=>'ON',
-9717=>'ON',
-9718=>'ON',
-9719=>'ON',
-9720=>'ON',
-9721=>'ON',
-9722=>'ON',
-9723=>'ON',
-9724=>'ON',
-9725=>'ON',
-9726=>'ON',
-9727=>'ON',
-9728=>'ON',
-9729=>'ON',
-9730=>'ON',
-9731=>'ON',
-9732=>'ON',
-9733=>'ON',
-9734=>'ON',
-9735=>'ON',
-9736=>'ON',
-9737=>'ON',
-9738=>'ON',
-9739=>'ON',
-9740=>'ON',
-9741=>'ON',
-9742=>'ON',
-9743=>'ON',
-9744=>'ON',
-9745=>'ON',
-9746=>'ON',
-9747=>'ON',
-9748=>'ON',
-9749=>'ON',
-9750=>'ON',
-9751=>'ON',
-9752=>'ON',
-9753=>'ON',
-9754=>'ON',
-9755=>'ON',
-9756=>'ON',
-9757=>'ON',
-9758=>'ON',
-9759=>'ON',
-9760=>'ON',
-9761=>'ON',
-9762=>'ON',
-9763=>'ON',
-9764=>'ON',
-9765=>'ON',
-9766=>'ON',
-9767=>'ON',
-9768=>'ON',
-9769=>'ON',
-9770=>'ON',
-9771=>'ON',
-9772=>'ON',
-9773=>'ON',
-9774=>'ON',
-9775=>'ON',
-9776=>'ON',
-9777=>'ON',
-9778=>'ON',
-9779=>'ON',
-9780=>'ON',
-9781=>'ON',
-9782=>'ON',
-9783=>'ON',
-9784=>'ON',
-9785=>'ON',
-9786=>'ON',
-9787=>'ON',
-9788=>'ON',
-9789=>'ON',
-9790=>'ON',
-9791=>'ON',
-9792=>'ON',
-9793=>'ON',
-9794=>'ON',
-9795=>'ON',
-9796=>'ON',
-9797=>'ON',
-9798=>'ON',
-9799=>'ON',
-9800=>'ON',
-9801=>'ON',
-9802=>'ON',
-9803=>'ON',
-9804=>'ON',
-9805=>'ON',
-9806=>'ON',
-9807=>'ON',
-9808=>'ON',
-9809=>'ON',
-9810=>'ON',
-9811=>'ON',
-9812=>'ON',
-9813=>'ON',
-9814=>'ON',
-9815=>'ON',
-9816=>'ON',
-9817=>'ON',
-9818=>'ON',
-9819=>'ON',
-9820=>'ON',
-9821=>'ON',
-9822=>'ON',
-9823=>'ON',
-9824=>'ON',
-9825=>'ON',
-9826=>'ON',
-9827=>'ON',
-9828=>'ON',
-9829=>'ON',
-9830=>'ON',
-9831=>'ON',
-9832=>'ON',
-9833=>'ON',
-9834=>'ON',
-9835=>'ON',
-9836=>'ON',
-9837=>'ON',
-9838=>'ON',
-9839=>'ON',
-9840=>'ON',
-9841=>'ON',
-9842=>'ON',
-9843=>'ON',
-9844=>'ON',
-9845=>'ON',
-9846=>'ON',
-9847=>'ON',
-9848=>'ON',
-9849=>'ON',
-9850=>'ON',
-9851=>'ON',
-9852=>'ON',
-9853=>'ON',
-9854=>'ON',
-9855=>'ON',
-9856=>'ON',
-9857=>'ON',
-9858=>'ON',
-9859=>'ON',
-9860=>'ON',
-9861=>'ON',
-9862=>'ON',
-9863=>'ON',
-9864=>'ON',
-9865=>'ON',
-9866=>'ON',
-9867=>'ON',
-9868=>'ON',
-9869=>'ON',
-9870=>'ON',
-9871=>'ON',
-9872=>'ON',
-9873=>'ON',
-9874=>'ON',
-9875=>'ON',
-9876=>'ON',
-9877=>'ON',
-9878=>'ON',
-9879=>'ON',
-9880=>'ON',
-9881=>'ON',
-9882=>'ON',
-9883=>'ON',
-9884=>'ON',
-9888=>'ON',
-9889=>'ON',
-9890=>'ON',
-9891=>'ON',
-9892=>'ON',
-9893=>'ON',
-9894=>'ON',
-9895=>'ON',
-9896=>'ON',
-9897=>'ON',
-9898=>'ON',
-9899=>'ON',
-9900=>'L',
-9901=>'ON',
-9902=>'ON',
-9903=>'ON',
-9904=>'ON',
-9905=>'ON',
-9906=>'ON',
-9985=>'ON',
-9986=>'ON',
-9987=>'ON',
-9988=>'ON',
-9990=>'ON',
-9991=>'ON',
-9992=>'ON',
-9993=>'ON',
-9996=>'ON',
-9997=>'ON',
-9998=>'ON',
-9999=>'ON',
-10000=>'ON',
-10001=>'ON',
-10002=>'ON',
-10003=>'ON',
-10004=>'ON',
-10005=>'ON',
-10006=>'ON',
-10007=>'ON',
-10008=>'ON',
-10009=>'ON',
-10010=>'ON',
-10011=>'ON',
-10012=>'ON',
-10013=>'ON',
-10014=>'ON',
-10015=>'ON',
-10016=>'ON',
-10017=>'ON',
-10018=>'ON',
-10019=>'ON',
-10020=>'ON',
-10021=>'ON',
-10022=>'ON',
-10023=>'ON',
-10025=>'ON',
-10026=>'ON',
-10027=>'ON',
-10028=>'ON',
-10029=>'ON',
-10030=>'ON',
-10031=>'ON',
-10032=>'ON',
-10033=>'ON',
-10034=>'ON',
-10035=>'ON',
-10036=>'ON',
-10037=>'ON',
-10038=>'ON',
-10039=>'ON',
-10040=>'ON',
-10041=>'ON',
-10042=>'ON',
-10043=>'ON',
-10044=>'ON',
-10045=>'ON',
-10046=>'ON',
-10047=>'ON',
-10048=>'ON',
-10049=>'ON',
-10050=>'ON',
-10051=>'ON',
-10052=>'ON',
-10053=>'ON',
-10054=>'ON',
-10055=>'ON',
-10056=>'ON',
-10057=>'ON',
-10058=>'ON',
-10059=>'ON',
-10061=>'ON',
-10063=>'ON',
-10064=>'ON',
-10065=>'ON',
-10066=>'ON',
-10070=>'ON',
-10072=>'ON',
-10073=>'ON',
-10074=>'ON',
-10075=>'ON',
-10076=>'ON',
-10077=>'ON',
-10078=>'ON',
-10081=>'ON',
-10082=>'ON',
-10083=>'ON',
-10084=>'ON',
-10085=>'ON',
-10086=>'ON',
-10087=>'ON',
-10088=>'ON',
-10089=>'ON',
-10090=>'ON',
-10091=>'ON',
-10092=>'ON',
-10093=>'ON',
-10094=>'ON',
-10095=>'ON',
-10096=>'ON',
-10097=>'ON',
-10098=>'ON',
-10099=>'ON',
-10100=>'ON',
-10101=>'ON',
-10102=>'ON',
-10103=>'ON',
-10104=>'ON',
-10105=>'ON',
-10106=>'ON',
-10107=>'ON',
-10108=>'ON',
-10109=>'ON',
-10110=>'ON',
-10111=>'ON',
-10112=>'ON',
-10113=>'ON',
-10114=>'ON',
-10115=>'ON',
-10116=>'ON',
-10117=>'ON',
-10118=>'ON',
-10119=>'ON',
-10120=>'ON',
-10121=>'ON',
-10122=>'ON',
-10123=>'ON',
-10124=>'ON',
-10125=>'ON',
-10126=>'ON',
-10127=>'ON',
-10128=>'ON',
-10129=>'ON',
-10130=>'ON',
-10131=>'ON',
-10132=>'ON',
-10136=>'ON',
-10137=>'ON',
-10138=>'ON',
-10139=>'ON',
-10140=>'ON',
-10141=>'ON',
-10142=>'ON',
-10143=>'ON',
-10144=>'ON',
-10145=>'ON',
-10146=>'ON',
-10147=>'ON',
-10148=>'ON',
-10149=>'ON',
-10150=>'ON',
-10151=>'ON',
-10152=>'ON',
-10153=>'ON',
-10154=>'ON',
-10155=>'ON',
-10156=>'ON',
-10157=>'ON',
-10158=>'ON',
-10159=>'ON',
-10161=>'ON',
-10162=>'ON',
-10163=>'ON',
-10164=>'ON',
-10165=>'ON',
-10166=>'ON',
-10167=>'ON',
-10168=>'ON',
-10169=>'ON',
-10170=>'ON',
-10171=>'ON',
-10172=>'ON',
-10173=>'ON',
-10174=>'ON',
-10176=>'ON',
-10177=>'ON',
-10178=>'ON',
-10179=>'ON',
-10180=>'ON',
-10181=>'ON',
-10182=>'ON',
-10183=>'ON',
-10184=>'ON',
-10185=>'ON',
-10186=>'ON',
-10192=>'ON',
-10193=>'ON',
-10194=>'ON',
-10195=>'ON',
-10196=>'ON',
-10197=>'ON',
-10198=>'ON',
-10199=>'ON',
-10200=>'ON',
-10201=>'ON',
-10202=>'ON',
-10203=>'ON',
-10204=>'ON',
-10205=>'ON',
-10206=>'ON',
-10207=>'ON',
-10208=>'ON',
-10209=>'ON',
-10210=>'ON',
-10211=>'ON',
-10212=>'ON',
-10213=>'ON',
-10214=>'ON',
-10215=>'ON',
-10216=>'ON',
-10217=>'ON',
-10218=>'ON',
-10219=>'ON',
-10224=>'ON',
-10225=>'ON',
-10226=>'ON',
-10227=>'ON',
-10228=>'ON',
-10229=>'ON',
-10230=>'ON',
-10231=>'ON',
-10232=>'ON',
-10233=>'ON',
-10234=>'ON',
-10235=>'ON',
-10236=>'ON',
-10237=>'ON',
-10238=>'ON',
-10239=>'ON',
-10240=>'L',
-10241=>'L',
-10242=>'L',
-10243=>'L',
-10244=>'L',
-10245=>'L',
-10246=>'L',
-10247=>'L',
-10248=>'L',
-10249=>'L',
-10250=>'L',
-10251=>'L',
-10252=>'L',
-10253=>'L',
-10254=>'L',
-10255=>'L',
-10256=>'L',
-10257=>'L',
-10258=>'L',
-10259=>'L',
-10260=>'L',
-10261=>'L',
-10262=>'L',
-10263=>'L',
-10264=>'L',
-10265=>'L',
-10266=>'L',
-10267=>'L',
-10268=>'L',
-10269=>'L',
-10270=>'L',
-10271=>'L',
-10272=>'L',
-10273=>'L',
-10274=>'L',
-10275=>'L',
-10276=>'L',
-10277=>'L',
-10278=>'L',
-10279=>'L',
-10280=>'L',
-10281=>'L',
-10282=>'L',
-10283=>'L',
-10284=>'L',
-10285=>'L',
-10286=>'L',
-10287=>'L',
-10288=>'L',
-10289=>'L',
-10290=>'L',
-10291=>'L',
-10292=>'L',
-10293=>'L',
-10294=>'L',
-10295=>'L',
-10296=>'L',
-10297=>'L',
-10298=>'L',
-10299=>'L',
-10300=>'L',
-10301=>'L',
-10302=>'L',
-10303=>'L',
-10304=>'L',
-10305=>'L',
-10306=>'L',
-10307=>'L',
-10308=>'L',
-10309=>'L',
-10310=>'L',
-10311=>'L',
-10312=>'L',
-10313=>'L',
-10314=>'L',
-10315=>'L',
-10316=>'L',
-10317=>'L',
-10318=>'L',
-10319=>'L',
-10320=>'L',
-10321=>'L',
-10322=>'L',
-10323=>'L',
-10324=>'L',
-10325=>'L',
-10326=>'L',
-10327=>'L',
-10328=>'L',
-10329=>'L',
-10330=>'L',
-10331=>'L',
-10332=>'L',
-10333=>'L',
-10334=>'L',
-10335=>'L',
-10336=>'L',
-10337=>'L',
-10338=>'L',
-10339=>'L',
-10340=>'L',
-10341=>'L',
-10342=>'L',
-10343=>'L',
-10344=>'L',
-10345=>'L',
-10346=>'L',
-10347=>'L',
-10348=>'L',
-10349=>'L',
-10350=>'L',
-10351=>'L',
-10352=>'L',
-10353=>'L',
-10354=>'L',
-10355=>'L',
-10356=>'L',
-10357=>'L',
-10358=>'L',
-10359=>'L',
-10360=>'L',
-10361=>'L',
-10362=>'L',
-10363=>'L',
-10364=>'L',
-10365=>'L',
-10366=>'L',
-10367=>'L',
-10368=>'L',
-10369=>'L',
-10370=>'L',
-10371=>'L',
-10372=>'L',
-10373=>'L',
-10374=>'L',
-10375=>'L',
-10376=>'L',
-10377=>'L',
-10378=>'L',
-10379=>'L',
-10380=>'L',
-10381=>'L',
-10382=>'L',
-10383=>'L',
-10384=>'L',
-10385=>'L',
-10386=>'L',
-10387=>'L',
-10388=>'L',
-10389=>'L',
-10390=>'L',
-10391=>'L',
-10392=>'L',
-10393=>'L',
-10394=>'L',
-10395=>'L',
-10396=>'L',
-10397=>'L',
-10398=>'L',
-10399=>'L',
-10400=>'L',
-10401=>'L',
-10402=>'L',
-10403=>'L',
-10404=>'L',
-10405=>'L',
-10406=>'L',
-10407=>'L',
-10408=>'L',
-10409=>'L',
-10410=>'L',
-10411=>'L',
-10412=>'L',
-10413=>'L',
-10414=>'L',
-10415=>'L',
-10416=>'L',
-10417=>'L',
-10418=>'L',
-10419=>'L',
-10420=>'L',
-10421=>'L',
-10422=>'L',
-10423=>'L',
-10424=>'L',
-10425=>'L',
-10426=>'L',
-10427=>'L',
-10428=>'L',
-10429=>'L',
-10430=>'L',
-10431=>'L',
-10432=>'L',
-10433=>'L',
-10434=>'L',
-10435=>'L',
-10436=>'L',
-10437=>'L',
-10438=>'L',
-10439=>'L',
-10440=>'L',
-10441=>'L',
-10442=>'L',
-10443=>'L',
-10444=>'L',
-10445=>'L',
-10446=>'L',
-10447=>'L',
-10448=>'L',
-10449=>'L',
-10450=>'L',
-10451=>'L',
-10452=>'L',
-10453=>'L',
-10454=>'L',
-10455=>'L',
-10456=>'L',
-10457=>'L',
-10458=>'L',
-10459=>'L',
-10460=>'L',
-10461=>'L',
-10462=>'L',
-10463=>'L',
-10464=>'L',
-10465=>'L',
-10466=>'L',
-10467=>'L',
-10468=>'L',
-10469=>'L',
-10470=>'L',
-10471=>'L',
-10472=>'L',
-10473=>'L',
-10474=>'L',
-10475=>'L',
-10476=>'L',
-10477=>'L',
-10478=>'L',
-10479=>'L',
-10480=>'L',
-10481=>'L',
-10482=>'L',
-10483=>'L',
-10484=>'L',
-10485=>'L',
-10486=>'L',
-10487=>'L',
-10488=>'L',
-10489=>'L',
-10490=>'L',
-10491=>'L',
-10492=>'L',
-10493=>'L',
-10494=>'L',
-10495=>'L',
-10496=>'ON',
-10497=>'ON',
-10498=>'ON',
-10499=>'ON',
-10500=>'ON',
-10501=>'ON',
-10502=>'ON',
-10503=>'ON',
-10504=>'ON',
-10505=>'ON',
-10506=>'ON',
-10507=>'ON',
-10508=>'ON',
-10509=>'ON',
-10510=>'ON',
-10511=>'ON',
-10512=>'ON',
-10513=>'ON',
-10514=>'ON',
-10515=>'ON',
-10516=>'ON',
-10517=>'ON',
-10518=>'ON',
-10519=>'ON',
-10520=>'ON',
-10521=>'ON',
-10522=>'ON',
-10523=>'ON',
-10524=>'ON',
-10525=>'ON',
-10526=>'ON',
-10527=>'ON',
-10528=>'ON',
-10529=>'ON',
-10530=>'ON',
-10531=>'ON',
-10532=>'ON',
-10533=>'ON',
-10534=>'ON',
-10535=>'ON',
-10536=>'ON',
-10537=>'ON',
-10538=>'ON',
-10539=>'ON',
-10540=>'ON',
-10541=>'ON',
-10542=>'ON',
-10543=>'ON',
-10544=>'ON',
-10545=>'ON',
-10546=>'ON',
-10547=>'ON',
-10548=>'ON',
-10549=>'ON',
-10550=>'ON',
-10551=>'ON',
-10552=>'ON',
-10553=>'ON',
-10554=>'ON',
-10555=>'ON',
-10556=>'ON',
-10557=>'ON',
-10558=>'ON',
-10559=>'ON',
-10560=>'ON',
-10561=>'ON',
-10562=>'ON',
-10563=>'ON',
-10564=>'ON',
-10565=>'ON',
-10566=>'ON',
-10567=>'ON',
-10568=>'ON',
-10569=>'ON',
-10570=>'ON',
-10571=>'ON',
-10572=>'ON',
-10573=>'ON',
-10574=>'ON',
-10575=>'ON',
-10576=>'ON',
-10577=>'ON',
-10578=>'ON',
-10579=>'ON',
-10580=>'ON',
-10581=>'ON',
-10582=>'ON',
-10583=>'ON',
-10584=>'ON',
-10585=>'ON',
-10586=>'ON',
-10587=>'ON',
-10588=>'ON',
-10589=>'ON',
-10590=>'ON',
-10591=>'ON',
-10592=>'ON',
-10593=>'ON',
-10594=>'ON',
-10595=>'ON',
-10596=>'ON',
-10597=>'ON',
-10598=>'ON',
-10599=>'ON',
-10600=>'ON',
-10601=>'ON',
-10602=>'ON',
-10603=>'ON',
-10604=>'ON',
-10605=>'ON',
-10606=>'ON',
-10607=>'ON',
-10608=>'ON',
-10609=>'ON',
-10610=>'ON',
-10611=>'ON',
-10612=>'ON',
-10613=>'ON',
-10614=>'ON',
-10615=>'ON',
-10616=>'ON',
-10617=>'ON',
-10618=>'ON',
-10619=>'ON',
-10620=>'ON',
-10621=>'ON',
-10622=>'ON',
-10623=>'ON',
-10624=>'ON',
-10625=>'ON',
-10626=>'ON',
-10627=>'ON',
-10628=>'ON',
-10629=>'ON',
-10630=>'ON',
-10631=>'ON',
-10632=>'ON',
-10633=>'ON',
-10634=>'ON',
-10635=>'ON',
-10636=>'ON',
-10637=>'ON',
-10638=>'ON',
-10639=>'ON',
-10640=>'ON',
-10641=>'ON',
-10642=>'ON',
-10643=>'ON',
-10644=>'ON',
-10645=>'ON',
-10646=>'ON',
-10647=>'ON',
-10648=>'ON',
-10649=>'ON',
-10650=>'ON',
-10651=>'ON',
-10652=>'ON',
-10653=>'ON',
-10654=>'ON',
-10655=>'ON',
-10656=>'ON',
-10657=>'ON',
-10658=>'ON',
-10659=>'ON',
-10660=>'ON',
-10661=>'ON',
-10662=>'ON',
-10663=>'ON',
-10664=>'ON',
-10665=>'ON',
-10666=>'ON',
-10667=>'ON',
-10668=>'ON',
-10669=>'ON',
-10670=>'ON',
-10671=>'ON',
-10672=>'ON',
-10673=>'ON',
-10674=>'ON',
-10675=>'ON',
-10676=>'ON',
-10677=>'ON',
-10678=>'ON',
-10679=>'ON',
-10680=>'ON',
-10681=>'ON',
-10682=>'ON',
-10683=>'ON',
-10684=>'ON',
-10685=>'ON',
-10686=>'ON',
-10687=>'ON',
-10688=>'ON',
-10689=>'ON',
-10690=>'ON',
-10691=>'ON',
-10692=>'ON',
-10693=>'ON',
-10694=>'ON',
-10695=>'ON',
-10696=>'ON',
-10697=>'ON',
-10698=>'ON',
-10699=>'ON',
-10700=>'ON',
-10701=>'ON',
-10702=>'ON',
-10703=>'ON',
-10704=>'ON',
-10705=>'ON',
-10706=>'ON',
-10707=>'ON',
-10708=>'ON',
-10709=>'ON',
-10710=>'ON',
-10711=>'ON',
-10712=>'ON',
-10713=>'ON',
-10714=>'ON',
-10715=>'ON',
-10716=>'ON',
-10717=>'ON',
-10718=>'ON',
-10719=>'ON',
-10720=>'ON',
-10721=>'ON',
-10722=>'ON',
-10723=>'ON',
-10724=>'ON',
-10725=>'ON',
-10726=>'ON',
-10727=>'ON',
-10728=>'ON',
-10729=>'ON',
-10730=>'ON',
-10731=>'ON',
-10732=>'ON',
-10733=>'ON',
-10734=>'ON',
-10735=>'ON',
-10736=>'ON',
-10737=>'ON',
-10738=>'ON',
-10739=>'ON',
-10740=>'ON',
-10741=>'ON',
-10742=>'ON',
-10743=>'ON',
-10744=>'ON',
-10745=>'ON',
-10746=>'ON',
-10747=>'ON',
-10748=>'ON',
-10749=>'ON',
-10750=>'ON',
-10751=>'ON',
-10752=>'ON',
-10753=>'ON',
-10754=>'ON',
-10755=>'ON',
-10756=>'ON',
-10757=>'ON',
-10758=>'ON',
-10759=>'ON',
-10760=>'ON',
-10761=>'ON',
-10762=>'ON',
-10763=>'ON',
-10764=>'ON',
-10765=>'ON',
-10766=>'ON',
-10767=>'ON',
-10768=>'ON',
-10769=>'ON',
-10770=>'ON',
-10771=>'ON',
-10772=>'ON',
-10773=>'ON',
-10774=>'ON',
-10775=>'ON',
-10776=>'ON',
-10777=>'ON',
-10778=>'ON',
-10779=>'ON',
-10780=>'ON',
-10781=>'ON',
-10782=>'ON',
-10783=>'ON',
-10784=>'ON',
-10785=>'ON',
-10786=>'ON',
-10787=>'ON',
-10788=>'ON',
-10789=>'ON',
-10790=>'ON',
-10791=>'ON',
-10792=>'ON',
-10793=>'ON',
-10794=>'ON',
-10795=>'ON',
-10796=>'ON',
-10797=>'ON',
-10798=>'ON',
-10799=>'ON',
-10800=>'ON',
-10801=>'ON',
-10802=>'ON',
-10803=>'ON',
-10804=>'ON',
-10805=>'ON',
-10806=>'ON',
-10807=>'ON',
-10808=>'ON',
-10809=>'ON',
-10810=>'ON',
-10811=>'ON',
-10812=>'ON',
-10813=>'ON',
-10814=>'ON',
-10815=>'ON',
-10816=>'ON',
-10817=>'ON',
-10818=>'ON',
-10819=>'ON',
-10820=>'ON',
-10821=>'ON',
-10822=>'ON',
-10823=>'ON',
-10824=>'ON',
-10825=>'ON',
-10826=>'ON',
-10827=>'ON',
-10828=>'ON',
-10829=>'ON',
-10830=>'ON',
-10831=>'ON',
-10832=>'ON',
-10833=>'ON',
-10834=>'ON',
-10835=>'ON',
-10836=>'ON',
-10837=>'ON',
-10838=>'ON',
-10839=>'ON',
-10840=>'ON',
-10841=>'ON',
-10842=>'ON',
-10843=>'ON',
-10844=>'ON',
-10845=>'ON',
-10846=>'ON',
-10847=>'ON',
-10848=>'ON',
-10849=>'ON',
-10850=>'ON',
-10851=>'ON',
-10852=>'ON',
-10853=>'ON',
-10854=>'ON',
-10855=>'ON',
-10856=>'ON',
-10857=>'ON',
-10858=>'ON',
-10859=>'ON',
-10860=>'ON',
-10861=>'ON',
-10862=>'ON',
-10863=>'ON',
-10864=>'ON',
-10865=>'ON',
-10866=>'ON',
-10867=>'ON',
-10868=>'ON',
-10869=>'ON',
-10870=>'ON',
-10871=>'ON',
-10872=>'ON',
-10873=>'ON',
-10874=>'ON',
-10875=>'ON',
-10876=>'ON',
-10877=>'ON',
-10878=>'ON',
-10879=>'ON',
-10880=>'ON',
-10881=>'ON',
-10882=>'ON',
-10883=>'ON',
-10884=>'ON',
-10885=>'ON',
-10886=>'ON',
-10887=>'ON',
-10888=>'ON',
-10889=>'ON',
-10890=>'ON',
-10891=>'ON',
-10892=>'ON',
-10893=>'ON',
-10894=>'ON',
-10895=>'ON',
-10896=>'ON',
-10897=>'ON',
-10898=>'ON',
-10899=>'ON',
-10900=>'ON',
-10901=>'ON',
-10902=>'ON',
-10903=>'ON',
-10904=>'ON',
-10905=>'ON',
-10906=>'ON',
-10907=>'ON',
-10908=>'ON',
-10909=>'ON',
-10910=>'ON',
-10911=>'ON',
-10912=>'ON',
-10913=>'ON',
-10914=>'ON',
-10915=>'ON',
-10916=>'ON',
-10917=>'ON',
-10918=>'ON',
-10919=>'ON',
-10920=>'ON',
-10921=>'ON',
-10922=>'ON',
-10923=>'ON',
-10924=>'ON',
-10925=>'ON',
-10926=>'ON',
-10927=>'ON',
-10928=>'ON',
-10929=>'ON',
-10930=>'ON',
-10931=>'ON',
-10932=>'ON',
-10933=>'ON',
-10934=>'ON',
-10935=>'ON',
-10936=>'ON',
-10937=>'ON',
-10938=>'ON',
-10939=>'ON',
-10940=>'ON',
-10941=>'ON',
-10942=>'ON',
-10943=>'ON',
-10944=>'ON',
-10945=>'ON',
-10946=>'ON',
-10947=>'ON',
-10948=>'ON',
-10949=>'ON',
-10950=>'ON',
-10951=>'ON',
-10952=>'ON',
-10953=>'ON',
-10954=>'ON',
-10955=>'ON',
-10956=>'ON',
-10957=>'ON',
-10958=>'ON',
-10959=>'ON',
-10960=>'ON',
-10961=>'ON',
-10962=>'ON',
-10963=>'ON',
-10964=>'ON',
-10965=>'ON',
-10966=>'ON',
-10967=>'ON',
-10968=>'ON',
-10969=>'ON',
-10970=>'ON',
-10971=>'ON',
-10972=>'ON',
-10973=>'ON',
-10974=>'ON',
-10975=>'ON',
-10976=>'ON',
-10977=>'ON',
-10978=>'ON',
-10979=>'ON',
-10980=>'ON',
-10981=>'ON',
-10982=>'ON',
-10983=>'ON',
-10984=>'ON',
-10985=>'ON',
-10986=>'ON',
-10987=>'ON',
-10988=>'ON',
-10989=>'ON',
-10990=>'ON',
-10991=>'ON',
-10992=>'ON',
-10993=>'ON',
-10994=>'ON',
-10995=>'ON',
-10996=>'ON',
-10997=>'ON',
-10998=>'ON',
-10999=>'ON',
-11000=>'ON',
-11001=>'ON',
-11002=>'ON',
-11003=>'ON',
-11004=>'ON',
-11005=>'ON',
-11006=>'ON',
-11007=>'ON',
-11008=>'ON',
-11009=>'ON',
-11010=>'ON',
-11011=>'ON',
-11012=>'ON',
-11013=>'ON',
-11014=>'ON',
-11015=>'ON',
-11016=>'ON',
-11017=>'ON',
-11018=>'ON',
-11019=>'ON',
-11020=>'ON',
-11021=>'ON',
-11022=>'ON',
-11023=>'ON',
-11024=>'ON',
-11025=>'ON',
-11026=>'ON',
-11027=>'ON',
-11028=>'ON',
-11029=>'ON',
-11030=>'ON',
-11031=>'ON',
-11032=>'ON',
-11033=>'ON',
-11034=>'ON',
-11040=>'ON',
-11041=>'ON',
-11042=>'ON',
-11043=>'ON',
-11264=>'L',
-11265=>'L',
-11266=>'L',
-11267=>'L',
-11268=>'L',
-11269=>'L',
-11270=>'L',
-11271=>'L',
-11272=>'L',
-11273=>'L',
-11274=>'L',
-11275=>'L',
-11276=>'L',
-11277=>'L',
-11278=>'L',
-11279=>'L',
-11280=>'L',
-11281=>'L',
-11282=>'L',
-11283=>'L',
-11284=>'L',
-11285=>'L',
-11286=>'L',
-11287=>'L',
-11288=>'L',
-11289=>'L',
-11290=>'L',
-11291=>'L',
-11292=>'L',
-11293=>'L',
-11294=>'L',
-11295=>'L',
-11296=>'L',
-11297=>'L',
-11298=>'L',
-11299=>'L',
-11300=>'L',
-11301=>'L',
-11302=>'L',
-11303=>'L',
-11304=>'L',
-11305=>'L',
-11306=>'L',
-11307=>'L',
-11308=>'L',
-11309=>'L',
-11310=>'L',
-11312=>'L',
-11313=>'L',
-11314=>'L',
-11315=>'L',
-11316=>'L',
-11317=>'L',
-11318=>'L',
-11319=>'L',
-11320=>'L',
-11321=>'L',
-11322=>'L',
-11323=>'L',
-11324=>'L',
-11325=>'L',
-11326=>'L',
-11327=>'L',
-11328=>'L',
-11329=>'L',
-11330=>'L',
-11331=>'L',
-11332=>'L',
-11333=>'L',
-11334=>'L',
-11335=>'L',
-11336=>'L',
-11337=>'L',
-11338=>'L',
-11339=>'L',
-11340=>'L',
-11341=>'L',
-11342=>'L',
-11343=>'L',
-11344=>'L',
-11345=>'L',
-11346=>'L',
-11347=>'L',
-11348=>'L',
-11349=>'L',
-11350=>'L',
-11351=>'L',
-11352=>'L',
-11353=>'L',
-11354=>'L',
-11355=>'L',
-11356=>'L',
-11357=>'L',
-11358=>'L',
-11360=>'L',
-11361=>'L',
-11362=>'L',
-11363=>'L',
-11364=>'L',
-11365=>'L',
-11366=>'L',
-11367=>'L',
-11368=>'L',
-11369=>'L',
-11370=>'L',
-11371=>'L',
-11372=>'L',
-11380=>'L',
-11381=>'L',
-11382=>'L',
-11383=>'L',
-11392=>'L',
-11393=>'L',
-11394=>'L',
-11395=>'L',
-11396=>'L',
-11397=>'L',
-11398=>'L',
-11399=>'L',
-11400=>'L',
-11401=>'L',
-11402=>'L',
-11403=>'L',
-11404=>'L',
-11405=>'L',
-11406=>'L',
-11407=>'L',
-11408=>'L',
-11409=>'L',
-11410=>'L',
-11411=>'L',
-11412=>'L',
-11413=>'L',
-11414=>'L',
-11415=>'L',
-11416=>'L',
-11417=>'L',
-11418=>'L',
-11419=>'L',
-11420=>'L',
-11421=>'L',
-11422=>'L',
-11423=>'L',
-11424=>'L',
-11425=>'L',
-11426=>'L',
-11427=>'L',
-11428=>'L',
-11429=>'L',
-11430=>'L',
-11431=>'L',
-11432=>'L',
-11433=>'L',
-11434=>'L',
-11435=>'L',
-11436=>'L',
-11437=>'L',
-11438=>'L',
-11439=>'L',
-11440=>'L',
-11441=>'L',
-11442=>'L',
-11443=>'L',
-11444=>'L',
-11445=>'L',
-11446=>'L',
-11447=>'L',
-11448=>'L',
-11449=>'L',
-11450=>'L',
-11451=>'L',
-11452=>'L',
-11453=>'L',
-11454=>'L',
-11455=>'L',
-11456=>'L',
-11457=>'L',
-11458=>'L',
-11459=>'L',
-11460=>'L',
-11461=>'L',
-11462=>'L',
-11463=>'L',
-11464=>'L',
-11465=>'L',
-11466=>'L',
-11467=>'L',
-11468=>'L',
-11469=>'L',
-11470=>'L',
-11471=>'L',
-11472=>'L',
-11473=>'L',
-11474=>'L',
-11475=>'L',
-11476=>'L',
-11477=>'L',
-11478=>'L',
-11479=>'L',
-11480=>'L',
-11481=>'L',
-11482=>'L',
-11483=>'L',
-11484=>'L',
-11485=>'L',
-11486=>'L',
-11487=>'L',
-11488=>'L',
-11489=>'L',
-11490=>'L',
-11491=>'L',
-11492=>'L',
-11493=>'ON',
-11494=>'ON',
-11495=>'ON',
-11496=>'ON',
-11497=>'ON',
-11498=>'ON',
-11513=>'ON',
-11514=>'ON',
-11515=>'ON',
-11516=>'ON',
-11517=>'ON',
-11518=>'ON',
-11519=>'ON',
-11520=>'L',
-11521=>'L',
-11522=>'L',
-11523=>'L',
-11524=>'L',
-11525=>'L',
-11526=>'L',
-11527=>'L',
-11528=>'L',
-11529=>'L',
-11530=>'L',
-11531=>'L',
-11532=>'L',
-11533=>'L',
-11534=>'L',
-11535=>'L',
-11536=>'L',
-11537=>'L',
-11538=>'L',
-11539=>'L',
-11540=>'L',
-11541=>'L',
-11542=>'L',
-11543=>'L',
-11544=>'L',
-11545=>'L',
-11546=>'L',
-11547=>'L',
-11548=>'L',
-11549=>'L',
-11550=>'L',
-11551=>'L',
-11552=>'L',
-11553=>'L',
-11554=>'L',
-11555=>'L',
-11556=>'L',
-11557=>'L',
-11568=>'L',
-11569=>'L',
-11570=>'L',
-11571=>'L',
-11572=>'L',
-11573=>'L',
-11574=>'L',
-11575=>'L',
-11576=>'L',
-11577=>'L',
-11578=>'L',
-11579=>'L',
-11580=>'L',
-11581=>'L',
-11582=>'L',
-11583=>'L',
-11584=>'L',
-11585=>'L',
-11586=>'L',
-11587=>'L',
-11588=>'L',
-11589=>'L',
-11590=>'L',
-11591=>'L',
-11592=>'L',
-11593=>'L',
-11594=>'L',
-11595=>'L',
-11596=>'L',
-11597=>'L',
-11598=>'L',
-11599=>'L',
-11600=>'L',
-11601=>'L',
-11602=>'L',
-11603=>'L',
-11604=>'L',
-11605=>'L',
-11606=>'L',
-11607=>'L',
-11608=>'L',
-11609=>'L',
-11610=>'L',
-11611=>'L',
-11612=>'L',
-11613=>'L',
-11614=>'L',
-11615=>'L',
-11616=>'L',
-11617=>'L',
-11618=>'L',
-11619=>'L',
-11620=>'L',
-11621=>'L',
-11631=>'L',
-11648=>'L',
-11649=>'L',
-11650=>'L',
-11651=>'L',
-11652=>'L',
-11653=>'L',
-11654=>'L',
-11655=>'L',
-11656=>'L',
-11657=>'L',
-11658=>'L',
-11659=>'L',
-11660=>'L',
-11661=>'L',
-11662=>'L',
-11663=>'L',
-11664=>'L',
-11665=>'L',
-11666=>'L',
-11667=>'L',
-11668=>'L',
-11669=>'L',
-11670=>'L',
-11680=>'L',
-11681=>'L',
-11682=>'L',
-11683=>'L',
-11684=>'L',
-11685=>'L',
-11686=>'L',
-11688=>'L',
-11689=>'L',
-11690=>'L',
-11691=>'L',
-11692=>'L',
-11693=>'L',
-11694=>'L',
-11696=>'L',
-11697=>'L',
-11698=>'L',
-11699=>'L',
-11700=>'L',
-11701=>'L',
-11702=>'L',
-11704=>'L',
-11705=>'L',
-11706=>'L',
-11707=>'L',
-11708=>'L',
-11709=>'L',
-11710=>'L',
-11712=>'L',
-11713=>'L',
-11714=>'L',
-11715=>'L',
-11716=>'L',
-11717=>'L',
-11718=>'L',
-11720=>'L',
-11721=>'L',
-11722=>'L',
-11723=>'L',
-11724=>'L',
-11725=>'L',
-11726=>'L',
-11728=>'L',
-11729=>'L',
-11730=>'L',
-11731=>'L',
-11732=>'L',
-11733=>'L',
-11734=>'L',
-11736=>'L',
-11737=>'L',
-11738=>'L',
-11739=>'L',
-11740=>'L',
-11741=>'L',
-11742=>'L',
-11776=>'ON',
-11777=>'ON',
-11778=>'ON',
-11779=>'ON',
-11780=>'ON',
-11781=>'ON',
-11782=>'ON',
-11783=>'ON',
-11784=>'ON',
-11785=>'ON',
-11786=>'ON',
-11787=>'ON',
-11788=>'ON',
-11789=>'ON',
-11790=>'ON',
-11791=>'ON',
-11792=>'ON',
-11793=>'ON',
-11794=>'ON',
-11795=>'ON',
-11796=>'ON',
-11797=>'ON',
-11798=>'ON',
-11799=>'ON',
-11804=>'ON',
-11805=>'ON',
-11904=>'ON',
-11905=>'ON',
-11906=>'ON',
-11907=>'ON',
-11908=>'ON',
-11909=>'ON',
-11910=>'ON',
-11911=>'ON',
-11912=>'ON',
-11913=>'ON',
-11914=>'ON',
-11915=>'ON',
-11916=>'ON',
-11917=>'ON',
-11918=>'ON',
-11919=>'ON',
-11920=>'ON',
-11921=>'ON',
-11922=>'ON',
-11923=>'ON',
-11924=>'ON',
-11925=>'ON',
-11926=>'ON',
-11927=>'ON',
-11928=>'ON',
-11929=>'ON',
-11931=>'ON',
-11932=>'ON',
-11933=>'ON',
-11934=>'ON',
-11935=>'ON',
-11936=>'ON',
-11937=>'ON',
-11938=>'ON',
-11939=>'ON',
-11940=>'ON',
-11941=>'ON',
-11942=>'ON',
-11943=>'ON',
-11944=>'ON',
-11945=>'ON',
-11946=>'ON',
-11947=>'ON',
-11948=>'ON',
-11949=>'ON',
-11950=>'ON',
-11951=>'ON',
-11952=>'ON',
-11953=>'ON',
-11954=>'ON',
-11955=>'ON',
-11956=>'ON',
-11957=>'ON',
-11958=>'ON',
-11959=>'ON',
-11960=>'ON',
-11961=>'ON',
-11962=>'ON',
-11963=>'ON',
-11964=>'ON',
-11965=>'ON',
-11966=>'ON',
-11967=>'ON',
-11968=>'ON',
-11969=>'ON',
-11970=>'ON',
-11971=>'ON',
-11972=>'ON',
-11973=>'ON',
-11974=>'ON',
-11975=>'ON',
-11976=>'ON',
-11977=>'ON',
-11978=>'ON',
-11979=>'ON',
-11980=>'ON',
-11981=>'ON',
-11982=>'ON',
-11983=>'ON',
-11984=>'ON',
-11985=>'ON',
-11986=>'ON',
-11987=>'ON',
-11988=>'ON',
-11989=>'ON',
-11990=>'ON',
-11991=>'ON',
-11992=>'ON',
-11993=>'ON',
-11994=>'ON',
-11995=>'ON',
-11996=>'ON',
-11997=>'ON',
-11998=>'ON',
-11999=>'ON',
-12000=>'ON',
-12001=>'ON',
-12002=>'ON',
-12003=>'ON',
-12004=>'ON',
-12005=>'ON',
-12006=>'ON',
-12007=>'ON',
-12008=>'ON',
-12009=>'ON',
-12010=>'ON',
-12011=>'ON',
-12012=>'ON',
-12013=>'ON',
-12014=>'ON',
-12015=>'ON',
-12016=>'ON',
-12017=>'ON',
-12018=>'ON',
-12019=>'ON',
-12032=>'ON',
-12033=>'ON',
-12034=>'ON',
-12035=>'ON',
-12036=>'ON',
-12037=>'ON',
-12038=>'ON',
-12039=>'ON',
-12040=>'ON',
-12041=>'ON',
-12042=>'ON',
-12043=>'ON',
-12044=>'ON',
-12045=>'ON',
-12046=>'ON',
-12047=>'ON',
-12048=>'ON',
-12049=>'ON',
-12050=>'ON',
-12051=>'ON',
-12052=>'ON',
-12053=>'ON',
-12054=>'ON',
-12055=>'ON',
-12056=>'ON',
-12057=>'ON',
-12058=>'ON',
-12059=>'ON',
-12060=>'ON',
-12061=>'ON',
-12062=>'ON',
-12063=>'ON',
-12064=>'ON',
-12065=>'ON',
-12066=>'ON',
-12067=>'ON',
-12068=>'ON',
-12069=>'ON',
-12070=>'ON',
-12071=>'ON',
-12072=>'ON',
-12073=>'ON',
-12074=>'ON',
-12075=>'ON',
-12076=>'ON',
-12077=>'ON',
-12078=>'ON',
-12079=>'ON',
-12080=>'ON',
-12081=>'ON',
-12082=>'ON',
-12083=>'ON',
-12084=>'ON',
-12085=>'ON',
-12086=>'ON',
-12087=>'ON',
-12088=>'ON',
-12089=>'ON',
-12090=>'ON',
-12091=>'ON',
-12092=>'ON',
-12093=>'ON',
-12094=>'ON',
-12095=>'ON',
-12096=>'ON',
-12097=>'ON',
-12098=>'ON',
-12099=>'ON',
-12100=>'ON',
-12101=>'ON',
-12102=>'ON',
-12103=>'ON',
-12104=>'ON',
-12105=>'ON',
-12106=>'ON',
-12107=>'ON',
-12108=>'ON',
-12109=>'ON',
-12110=>'ON',
-12111=>'ON',
-12112=>'ON',
-12113=>'ON',
-12114=>'ON',
-12115=>'ON',
-12116=>'ON',
-12117=>'ON',
-12118=>'ON',
-12119=>'ON',
-12120=>'ON',
-12121=>'ON',
-12122=>'ON',
-12123=>'ON',
-12124=>'ON',
-12125=>'ON',
-12126=>'ON',
-12127=>'ON',
-12128=>'ON',
-12129=>'ON',
-12130=>'ON',
-12131=>'ON',
-12132=>'ON',
-12133=>'ON',
-12134=>'ON',
-12135=>'ON',
-12136=>'ON',
-12137=>'ON',
-12138=>'ON',
-12139=>'ON',
-12140=>'ON',
-12141=>'ON',
-12142=>'ON',
-12143=>'ON',
-12144=>'ON',
-12145=>'ON',
-12146=>'ON',
-12147=>'ON',
-12148=>'ON',
-12149=>'ON',
-12150=>'ON',
-12151=>'ON',
-12152=>'ON',
-12153=>'ON',
-12154=>'ON',
-12155=>'ON',
-12156=>'ON',
-12157=>'ON',
-12158=>'ON',
-12159=>'ON',
-12160=>'ON',
-12161=>'ON',
-12162=>'ON',
-12163=>'ON',
-12164=>'ON',
-12165=>'ON',
-12166=>'ON',
-12167=>'ON',
-12168=>'ON',
-12169=>'ON',
-12170=>'ON',
-12171=>'ON',
-12172=>'ON',
-12173=>'ON',
-12174=>'ON',
-12175=>'ON',
-12176=>'ON',
-12177=>'ON',
-12178=>'ON',
-12179=>'ON',
-12180=>'ON',
-12181=>'ON',
-12182=>'ON',
-12183=>'ON',
-12184=>'ON',
-12185=>'ON',
-12186=>'ON',
-12187=>'ON',
-12188=>'ON',
-12189=>'ON',
-12190=>'ON',
-12191=>'ON',
-12192=>'ON',
-12193=>'ON',
-12194=>'ON',
-12195=>'ON',
-12196=>'ON',
-12197=>'ON',
-12198=>'ON',
-12199=>'ON',
-12200=>'ON',
-12201=>'ON',
-12202=>'ON',
-12203=>'ON',
-12204=>'ON',
-12205=>'ON',
-12206=>'ON',
-12207=>'ON',
-12208=>'ON',
-12209=>'ON',
-12210=>'ON',
-12211=>'ON',
-12212=>'ON',
-12213=>'ON',
-12214=>'ON',
-12215=>'ON',
-12216=>'ON',
-12217=>'ON',
-12218=>'ON',
-12219=>'ON',
-12220=>'ON',
-12221=>'ON',
-12222=>'ON',
-12223=>'ON',
-12224=>'ON',
-12225=>'ON',
-12226=>'ON',
-12227=>'ON',
-12228=>'ON',
-12229=>'ON',
-12230=>'ON',
-12231=>'ON',
-12232=>'ON',
-12233=>'ON',
-12234=>'ON',
-12235=>'ON',
-12236=>'ON',
-12237=>'ON',
-12238=>'ON',
-12239=>'ON',
-12240=>'ON',
-12241=>'ON',
-12242=>'ON',
-12243=>'ON',
-12244=>'ON',
-12245=>'ON',
-12272=>'ON',
-12273=>'ON',
-12274=>'ON',
-12275=>'ON',
-12276=>'ON',
-12277=>'ON',
-12278=>'ON',
-12279=>'ON',
-12280=>'ON',
-12281=>'ON',
-12282=>'ON',
-12283=>'ON',
-12288=>'WS',
-12289=>'ON',
-12290=>'ON',
-12291=>'ON',
-12292=>'ON',
-12293=>'L',
-12294=>'L',
-12295=>'L',
-12296=>'ON',
-12297=>'ON',
-12298=>'ON',
-12299=>'ON',
-12300=>'ON',
-12301=>'ON',
-12302=>'ON',
-12303=>'ON',
-12304=>'ON',
-12305=>'ON',
-12306=>'ON',
-12307=>'ON',
-12308=>'ON',
-12309=>'ON',
-12310=>'ON',
-12311=>'ON',
-12312=>'ON',
-12313=>'ON',
-12314=>'ON',
-12315=>'ON',
-12316=>'ON',
-12317=>'ON',
-12318=>'ON',
-12319=>'ON',
-12320=>'ON',
-12321=>'L',
-12322=>'L',
-12323=>'L',
-12324=>'L',
-12325=>'L',
-12326=>'L',
-12327=>'L',
-12328=>'L',
-12329=>'L',
-12330=>'NSM',
-12331=>'NSM',
-12332=>'NSM',
-12333=>'NSM',
-12334=>'NSM',
-12335=>'NSM',
-12336=>'ON',
-12337=>'L',
-12338=>'L',
-12339=>'L',
-12340=>'L',
-12341=>'L',
-12342=>'ON',
-12343=>'ON',
-12344=>'L',
-12345=>'L',
-12346=>'L',
-12347=>'L',
-12348=>'L',
-12349=>'ON',
-12350=>'ON',
-12351=>'ON',
-12353=>'L',
-12354=>'L',
-12355=>'L',
-12356=>'L',
-12357=>'L',
-12358=>'L',
-12359=>'L',
-12360=>'L',
-12361=>'L',
-12362=>'L',
-12363=>'L',
-12364=>'L',
-12365=>'L',
-12366=>'L',
-12367=>'L',
-12368=>'L',
-12369=>'L',
-12370=>'L',
-12371=>'L',
-12372=>'L',
-12373=>'L',
-12374=>'L',
-12375=>'L',
-12376=>'L',
-12377=>'L',
-12378=>'L',
-12379=>'L',
-12380=>'L',
-12381=>'L',
-12382=>'L',
-12383=>'L',
-12384=>'L',
-12385=>'L',
-12386=>'L',
-12387=>'L',
-12388=>'L',
-12389=>'L',
-12390=>'L',
-12391=>'L',
-12392=>'L',
-12393=>'L',
-12394=>'L',
-12395=>'L',
-12396=>'L',
-12397=>'L',
-12398=>'L',
-12399=>'L',
-12400=>'L',
-12401=>'L',
-12402=>'L',
-12403=>'L',
-12404=>'L',
-12405=>'L',
-12406=>'L',
-12407=>'L',
-12408=>'L',
-12409=>'L',
-12410=>'L',
-12411=>'L',
-12412=>'L',
-12413=>'L',
-12414=>'L',
-12415=>'L',
-12416=>'L',
-12417=>'L',
-12418=>'L',
-12419=>'L',
-12420=>'L',
-12421=>'L',
-12422=>'L',
-12423=>'L',
-12424=>'L',
-12425=>'L',
-12426=>'L',
-12427=>'L',
-12428=>'L',
-12429=>'L',
-12430=>'L',
-12431=>'L',
-12432=>'L',
-12433=>'L',
-12434=>'L',
-12435=>'L',
-12436=>'L',
-12437=>'L',
-12438=>'L',
-12441=>'NSM',
-12442=>'NSM',
-12443=>'ON',
-12444=>'ON',
-12445=>'L',
-12446=>'L',
-12447=>'L',
-12448=>'ON',
-12449=>'L',
-12450=>'L',
-12451=>'L',
-12452=>'L',
-12453=>'L',
-12454=>'L',
-12455=>'L',
-12456=>'L',
-12457=>'L',
-12458=>'L',
-12459=>'L',
-12460=>'L',
-12461=>'L',
-12462=>'L',
-12463=>'L',
-12464=>'L',
-12465=>'L',
-12466=>'L',
-12467=>'L',
-12468=>'L',
-12469=>'L',
-12470=>'L',
-12471=>'L',
-12472=>'L',
-12473=>'L',
-12474=>'L',
-12475=>'L',
-12476=>'L',
-12477=>'L',
-12478=>'L',
-12479=>'L',
-12480=>'L',
-12481=>'L',
-12482=>'L',
-12483=>'L',
-12484=>'L',
-12485=>'L',
-12486=>'L',
-12487=>'L',
-12488=>'L',
-12489=>'L',
-12490=>'L',
-12491=>'L',
-12492=>'L',
-12493=>'L',
-12494=>'L',
-12495=>'L',
-12496=>'L',
-12497=>'L',
-12498=>'L',
-12499=>'L',
-12500=>'L',
-12501=>'L',
-12502=>'L',
-12503=>'L',
-12504=>'L',
-12505=>'L',
-12506=>'L',
-12507=>'L',
-12508=>'L',
-12509=>'L',
-12510=>'L',
-12511=>'L',
-12512=>'L',
-12513=>'L',
-12514=>'L',
-12515=>'L',
-12516=>'L',
-12517=>'L',
-12518=>'L',
-12519=>'L',
-12520=>'L',
-12521=>'L',
-12522=>'L',
-12523=>'L',
-12524=>'L',
-12525=>'L',
-12526=>'L',
-12527=>'L',
-12528=>'L',
-12529=>'L',
-12530=>'L',
-12531=>'L',
-12532=>'L',
-12533=>'L',
-12534=>'L',
-12535=>'L',
-12536=>'L',
-12537=>'L',
-12538=>'L',
-12539=>'ON',
-12540=>'L',
-12541=>'L',
-12542=>'L',
-12543=>'L',
-12549=>'L',
-12550=>'L',
-12551=>'L',
-12552=>'L',
-12553=>'L',
-12554=>'L',
-12555=>'L',
-12556=>'L',
-12557=>'L',
-12558=>'L',
-12559=>'L',
-12560=>'L',
-12561=>'L',
-12562=>'L',
-12563=>'L',
-12564=>'L',
-12565=>'L',
-12566=>'L',
-12567=>'L',
-12568=>'L',
-12569=>'L',
-12570=>'L',
-12571=>'L',
-12572=>'L',
-12573=>'L',
-12574=>'L',
-12575=>'L',
-12576=>'L',
-12577=>'L',
-12578=>'L',
-12579=>'L',
-12580=>'L',
-12581=>'L',
-12582=>'L',
-12583=>'L',
-12584=>'L',
-12585=>'L',
-12586=>'L',
-12587=>'L',
-12588=>'L',
-12593=>'L',
-12594=>'L',
-12595=>'L',
-12596=>'L',
-12597=>'L',
-12598=>'L',
-12599=>'L',
-12600=>'L',
-12601=>'L',
-12602=>'L',
-12603=>'L',
-12604=>'L',
-12605=>'L',
-12606=>'L',
-12607=>'L',
-12608=>'L',
-12609=>'L',
-12610=>'L',
-12611=>'L',
-12612=>'L',
-12613=>'L',
-12614=>'L',
-12615=>'L',
-12616=>'L',
-12617=>'L',
-12618=>'L',
-12619=>'L',
-12620=>'L',
-12621=>'L',
-12622=>'L',
-12623=>'L',
-12624=>'L',
-12625=>'L',
-12626=>'L',
-12627=>'L',
-12628=>'L',
-12629=>'L',
-12630=>'L',
-12631=>'L',
-12632=>'L',
-12633=>'L',
-12634=>'L',
-12635=>'L',
-12636=>'L',
-12637=>'L',
-12638=>'L',
-12639=>'L',
-12640=>'L',
-12641=>'L',
-12642=>'L',
-12643=>'L',
-12644=>'L',
-12645=>'L',
-12646=>'L',
-12647=>'L',
-12648=>'L',
-12649=>'L',
-12650=>'L',
-12651=>'L',
-12652=>'L',
-12653=>'L',
-12654=>'L',
-12655=>'L',
-12656=>'L',
-12657=>'L',
-12658=>'L',
-12659=>'L',
-12660=>'L',
-12661=>'L',
-12662=>'L',
-12663=>'L',
-12664=>'L',
-12665=>'L',
-12666=>'L',
-12667=>'L',
-12668=>'L',
-12669=>'L',
-12670=>'L',
-12671=>'L',
-12672=>'L',
-12673=>'L',
-12674=>'L',
-12675=>'L',
-12676=>'L',
-12677=>'L',
-12678=>'L',
-12679=>'L',
-12680=>'L',
-12681=>'L',
-12682=>'L',
-12683=>'L',
-12684=>'L',
-12685=>'L',
-12686=>'L',
-12688=>'L',
-12689=>'L',
-12690=>'L',
-12691=>'L',
-12692=>'L',
-12693=>'L',
-12694=>'L',
-12695=>'L',
-12696=>'L',
-12697=>'L',
-12698=>'L',
-12699=>'L',
-12700=>'L',
-12701=>'L',
-12702=>'L',
-12703=>'L',
-12704=>'L',
-12705=>'L',
-12706=>'L',
-12707=>'L',
-12708=>'L',
-12709=>'L',
-12710=>'L',
-12711=>'L',
-12712=>'L',
-12713=>'L',
-12714=>'L',
-12715=>'L',
-12716=>'L',
-12717=>'L',
-12718=>'L',
-12719=>'L',
-12720=>'L',
-12721=>'L',
-12722=>'L',
-12723=>'L',
-12724=>'L',
-12725=>'L',
-12726=>'L',
-12727=>'L',
-12736=>'ON',
-12737=>'ON',
-12738=>'ON',
-12739=>'ON',
-12740=>'ON',
-12741=>'ON',
-12742=>'ON',
-12743=>'ON',
-12744=>'ON',
-12745=>'ON',
-12746=>'ON',
-12747=>'ON',
-12748=>'ON',
-12749=>'ON',
-12750=>'ON',
-12751=>'ON',
-12784=>'L',
-12785=>'L',
-12786=>'L',
-12787=>'L',
-12788=>'L',
-12789=>'L',
-12790=>'L',
-12791=>'L',
-12792=>'L',
-12793=>'L',
-12794=>'L',
-12795=>'L',
-12796=>'L',
-12797=>'L',
-12798=>'L',
-12799=>'L',
-12800=>'L',
-12801=>'L',
-12802=>'L',
-12803=>'L',
-12804=>'L',
-12805=>'L',
-12806=>'L',
-12807=>'L',
-12808=>'L',
-12809=>'L',
-12810=>'L',
-12811=>'L',
-12812=>'L',
-12813=>'L',
-12814=>'L',
-12815=>'L',
-12816=>'L',
-12817=>'L',
-12818=>'L',
-12819=>'L',
-12820=>'L',
-12821=>'L',
-12822=>'L',
-12823=>'L',
-12824=>'L',
-12825=>'L',
-12826=>'L',
-12827=>'L',
-12828=>'L',
-12829=>'ON',
-12830=>'ON',
-12832=>'L',
-12833=>'L',
-12834=>'L',
-12835=>'L',
-12836=>'L',
-12837=>'L',
-12838=>'L',
-12839=>'L',
-12840=>'L',
-12841=>'L',
-12842=>'L',
-12843=>'L',
-12844=>'L',
-12845=>'L',
-12846=>'L',
-12847=>'L',
-12848=>'L',
-12849=>'L',
-12850=>'L',
-12851=>'L',
-12852=>'L',
-12853=>'L',
-12854=>'L',
-12855=>'L',
-12856=>'L',
-12857=>'L',
-12858=>'L',
-12859=>'L',
-12860=>'L',
-12861=>'L',
-12862=>'L',
-12863=>'L',
-12864=>'L',
-12865=>'L',
-12866=>'L',
-12867=>'L',
-12880=>'ON',
-12881=>'ON',
-12882=>'ON',
-12883=>'ON',
-12884=>'ON',
-12885=>'ON',
-12886=>'ON',
-12887=>'ON',
-12888=>'ON',
-12889=>'ON',
-12890=>'ON',
-12891=>'ON',
-12892=>'ON',
-12893=>'ON',
-12894=>'ON',
-12895=>'ON',
-12896=>'L',
-12897=>'L',
-12898=>'L',
-12899=>'L',
-12900=>'L',
-12901=>'L',
-12902=>'L',
-12903=>'L',
-12904=>'L',
-12905=>'L',
-12906=>'L',
-12907=>'L',
-12908=>'L',
-12909=>'L',
-12910=>'L',
-12911=>'L',
-12912=>'L',
-12913=>'L',
-12914=>'L',
-12915=>'L',
-12916=>'L',
-12917=>'L',
-12918=>'L',
-12919=>'L',
-12920=>'L',
-12921=>'L',
-12922=>'L',
-12923=>'L',
-12924=>'ON',
-12925=>'ON',
-12926=>'ON',
-12927=>'L',
-12928=>'L',
-12929=>'L',
-12930=>'L',
-12931=>'L',
-12932=>'L',
-12933=>'L',
-12934=>'L',
-12935=>'L',
-12936=>'L',
-12937=>'L',
-12938=>'L',
-12939=>'L',
-12940=>'L',
-12941=>'L',
-12942=>'L',
-12943=>'L',
-12944=>'L',
-12945=>'L',
-12946=>'L',
-12947=>'L',
-12948=>'L',
-12949=>'L',
-12950=>'L',
-12951=>'L',
-12952=>'L',
-12953=>'L',
-12954=>'L',
-12955=>'L',
-12956=>'L',
-12957=>'L',
-12958=>'L',
-12959=>'L',
-12960=>'L',
-12961=>'L',
-12962=>'L',
-12963=>'L',
-12964=>'L',
-12965=>'L',
-12966=>'L',
-12967=>'L',
-12968=>'L',
-12969=>'L',
-12970=>'L',
-12971=>'L',
-12972=>'L',
-12973=>'L',
-12974=>'L',
-12975=>'L',
-12976=>'L',
-12977=>'ON',
-12978=>'ON',
-12979=>'ON',
-12980=>'ON',
-12981=>'ON',
-12982=>'ON',
-12983=>'ON',
-12984=>'ON',
-12985=>'ON',
-12986=>'ON',
-12987=>'ON',
-12988=>'ON',
-12989=>'ON',
-12990=>'ON',
-12991=>'ON',
-12992=>'L',
-12993=>'L',
-12994=>'L',
-12995=>'L',
-12996=>'L',
-12997=>'L',
-12998=>'L',
-12999=>'L',
-13000=>'L',
-13001=>'L',
-13002=>'L',
-13003=>'L',
-13004=>'ON',
-13005=>'ON',
-13006=>'ON',
-13007=>'ON',
-13008=>'L',
-13009=>'L',
-13010=>'L',
-13011=>'L',
-13012=>'L',
-13013=>'L',
-13014=>'L',
-13015=>'L',
-13016=>'L',
-13017=>'L',
-13018=>'L',
-13019=>'L',
-13020=>'L',
-13021=>'L',
-13022=>'L',
-13023=>'L',
-13024=>'L',
-13025=>'L',
-13026=>'L',
-13027=>'L',
-13028=>'L',
-13029=>'L',
-13030=>'L',
-13031=>'L',
-13032=>'L',
-13033=>'L',
-13034=>'L',
-13035=>'L',
-13036=>'L',
-13037=>'L',
-13038=>'L',
-13039=>'L',
-13040=>'L',
-13041=>'L',
-13042=>'L',
-13043=>'L',
-13044=>'L',
-13045=>'L',
-13046=>'L',
-13047=>'L',
-13048=>'L',
-13049=>'L',
-13050=>'L',
-13051=>'L',
-13052=>'L',
-13053=>'L',
-13054=>'L',
-13056=>'L',
-13057=>'L',
-13058=>'L',
-13059=>'L',
-13060=>'L',
-13061=>'L',
-13062=>'L',
-13063=>'L',
-13064=>'L',
-13065=>'L',
-13066=>'L',
-13067=>'L',
-13068=>'L',
-13069=>'L',
-13070=>'L',
-13071=>'L',
-13072=>'L',
-13073=>'L',
-13074=>'L',
-13075=>'L',
-13076=>'L',
-13077=>'L',
-13078=>'L',
-13079=>'L',
-13080=>'L',
-13081=>'L',
-13082=>'L',
-13083=>'L',
-13084=>'L',
-13085=>'L',
-13086=>'L',
-13087=>'L',
-13088=>'L',
-13089=>'L',
-13090=>'L',
-13091=>'L',
-13092=>'L',
-13093=>'L',
-13094=>'L',
-13095=>'L',
-13096=>'L',
-13097=>'L',
-13098=>'L',
-13099=>'L',
-13100=>'L',
-13101=>'L',
-13102=>'L',
-13103=>'L',
-13104=>'L',
-13105=>'L',
-13106=>'L',
-13107=>'L',
-13108=>'L',
-13109=>'L',
-13110=>'L',
-13111=>'L',
-13112=>'L',
-13113=>'L',
-13114=>'L',
-13115=>'L',
-13116=>'L',
-13117=>'L',
-13118=>'L',
-13119=>'L',
-13120=>'L',
-13121=>'L',
-13122=>'L',
-13123=>'L',
-13124=>'L',
-13125=>'L',
-13126=>'L',
-13127=>'L',
-13128=>'L',
-13129=>'L',
-13130=>'L',
-13131=>'L',
-13132=>'L',
-13133=>'L',
-13134=>'L',
-13135=>'L',
-13136=>'L',
-13137=>'L',
-13138=>'L',
-13139=>'L',
-13140=>'L',
-13141=>'L',
-13142=>'L',
-13143=>'L',
-13144=>'L',
-13145=>'L',
-13146=>'L',
-13147=>'L',
-13148=>'L',
-13149=>'L',
-13150=>'L',
-13151=>'L',
-13152=>'L',
-13153=>'L',
-13154=>'L',
-13155=>'L',
-13156=>'L',
-13157=>'L',
-13158=>'L',
-13159=>'L',
-13160=>'L',
-13161=>'L',
-13162=>'L',
-13163=>'L',
-13164=>'L',
-13165=>'L',
-13166=>'L',
-13167=>'L',
-13168=>'L',
-13169=>'L',
-13170=>'L',
-13171=>'L',
-13172=>'L',
-13173=>'L',
-13174=>'L',
-13175=>'ON',
-13176=>'ON',
-13177=>'ON',
-13178=>'ON',
-13179=>'L',
-13180=>'L',
-13181=>'L',
-13182=>'L',
-13183=>'L',
-13184=>'L',
-13185=>'L',
-13186=>'L',
-13187=>'L',
-13188=>'L',
-13189=>'L',
-13190=>'L',
-13191=>'L',
-13192=>'L',
-13193=>'L',
-13194=>'L',
-13195=>'L',
-13196=>'L',
-13197=>'L',
-13198=>'L',
-13199=>'L',
-13200=>'L',
-13201=>'L',
-13202=>'L',
-13203=>'L',
-13204=>'L',
-13205=>'L',
-13206=>'L',
-13207=>'L',
-13208=>'L',
-13209=>'L',
-13210=>'L',
-13211=>'L',
-13212=>'L',
-13213=>'L',
-13214=>'L',
-13215=>'L',
-13216=>'L',
-13217=>'L',
-13218=>'L',
-13219=>'L',
-13220=>'L',
-13221=>'L',
-13222=>'L',
-13223=>'L',
-13224=>'L',
-13225=>'L',
-13226=>'L',
-13227=>'L',
-13228=>'L',
-13229=>'L',
-13230=>'L',
-13231=>'L',
-13232=>'L',
-13233=>'L',
-13234=>'L',
-13235=>'L',
-13236=>'L',
-13237=>'L',
-13238=>'L',
-13239=>'L',
-13240=>'L',
-13241=>'L',
-13242=>'L',
-13243=>'L',
-13244=>'L',
-13245=>'L',
-13246=>'L',
-13247=>'L',
-13248=>'L',
-13249=>'L',
-13250=>'L',
-13251=>'L',
-13252=>'L',
-13253=>'L',
-13254=>'L',
-13255=>'L',
-13256=>'L',
-13257=>'L',
-13258=>'L',
-13259=>'L',
-13260=>'L',
-13261=>'L',
-13262=>'L',
-13263=>'L',
-13264=>'L',
-13265=>'L',
-13266=>'L',
-13267=>'L',
-13268=>'L',
-13269=>'L',
-13270=>'L',
-13271=>'L',
-13272=>'L',
-13273=>'L',
-13274=>'L',
-13275=>'L',
-13276=>'L',
-13277=>'L',
-13278=>'ON',
-13279=>'ON',
-13280=>'L',
-13281=>'L',
-13282=>'L',
-13283=>'L',
-13284=>'L',
-13285=>'L',
-13286=>'L',
-13287=>'L',
-13288=>'L',
-13289=>'L',
-13290=>'L',
-13291=>'L',
-13292=>'L',
-13293=>'L',
-13294=>'L',
-13295=>'L',
-13296=>'L',
-13297=>'L',
-13298=>'L',
-13299=>'L',
-13300=>'L',
-13301=>'L',
-13302=>'L',
-13303=>'L',
-13304=>'L',
-13305=>'L',
-13306=>'L',
-13307=>'L',
-13308=>'L',
-13309=>'L',
-13310=>'L',
-13311=>'ON',
-13312=>'L',
-19893=>'L',
-19904=>'ON',
-19905=>'ON',
-19906=>'ON',
-19907=>'ON',
-19908=>'ON',
-19909=>'ON',
-19910=>'ON',
-19911=>'ON',
-19912=>'ON',
-19913=>'ON',
-19914=>'ON',
-19915=>'ON',
-19916=>'ON',
-19917=>'ON',
-19918=>'ON',
-19919=>'ON',
-19920=>'ON',
-19921=>'ON',
-19922=>'ON',
-19923=>'ON',
-19924=>'ON',
-19925=>'ON',
-19926=>'ON',
-19927=>'ON',
-19928=>'ON',
-19929=>'ON',
-19930=>'ON',
-19931=>'ON',
-19932=>'ON',
-19933=>'ON',
-19934=>'ON',
-19935=>'ON',
-19936=>'ON',
-19937=>'ON',
-19938=>'ON',
-19939=>'ON',
-19940=>'ON',
-19941=>'ON',
-19942=>'ON',
-19943=>'ON',
-19944=>'ON',
-19945=>'ON',
-19946=>'ON',
-19947=>'ON',
-19948=>'ON',
-19949=>'ON',
-19950=>'ON',
-19951=>'ON',
-19952=>'ON',
-19953=>'ON',
-19954=>'ON',
-19955=>'ON',
-19956=>'ON',
-19957=>'ON',
-19958=>'ON',
-19959=>'ON',
-19960=>'ON',
-19961=>'ON',
-19962=>'ON',
-19963=>'ON',
-19964=>'ON',
-19965=>'ON',
-19966=>'ON',
-19967=>'ON',
-19968=>'L',
-40891=>'L',
-40960=>'L',
-40961=>'L',
-40962=>'L',
-40963=>'L',
-40964=>'L',
-40965=>'L',
-40966=>'L',
-40967=>'L',
-40968=>'L',
-40969=>'L',
-40970=>'L',
-40971=>'L',
-40972=>'L',
-40973=>'L',
-40974=>'L',
-40975=>'L',
-40976=>'L',
-40977=>'L',
-40978=>'L',
-40979=>'L',
-40980=>'L',
-40981=>'L',
-40982=>'L',
-40983=>'L',
-40984=>'L',
-40985=>'L',
-40986=>'L',
-40987=>'L',
-40988=>'L',
-40989=>'L',
-40990=>'L',
-40991=>'L',
-40992=>'L',
-40993=>'L',
-40994=>'L',
-40995=>'L',
-40996=>'L',
-40997=>'L',
-40998=>'L',
-40999=>'L',
-41000=>'L',
-41001=>'L',
-41002=>'L',
-41003=>'L',
-41004=>'L',
-41005=>'L',
-41006=>'L',
-41007=>'L',
-41008=>'L',
-41009=>'L',
-41010=>'L',
-41011=>'L',
-41012=>'L',
-41013=>'L',
-41014=>'L',
-41015=>'L',
-41016=>'L',
-41017=>'L',
-41018=>'L',
-41019=>'L',
-41020=>'L',
-41021=>'L',
-41022=>'L',
-41023=>'L',
-41024=>'L',
-41025=>'L',
-41026=>'L',
-41027=>'L',
-41028=>'L',
-41029=>'L',
-41030=>'L',
-41031=>'L',
-41032=>'L',
-41033=>'L',
-41034=>'L',
-41035=>'L',
-41036=>'L',
-41037=>'L',
-41038=>'L',
-41039=>'L',
-41040=>'L',
-41041=>'L',
-41042=>'L',
-41043=>'L',
-41044=>'L',
-41045=>'L',
-41046=>'L',
-41047=>'L',
-41048=>'L',
-41049=>'L',
-41050=>'L',
-41051=>'L',
-41052=>'L',
-41053=>'L',
-41054=>'L',
-41055=>'L',
-41056=>'L',
-41057=>'L',
-41058=>'L',
-41059=>'L',
-41060=>'L',
-41061=>'L',
-41062=>'L',
-41063=>'L',
-41064=>'L',
-41065=>'L',
-41066=>'L',
-41067=>'L',
-41068=>'L',
-41069=>'L',
-41070=>'L',
-41071=>'L',
-41072=>'L',
-41073=>'L',
-41074=>'L',
-41075=>'L',
-41076=>'L',
-41077=>'L',
-41078=>'L',
-41079=>'L',
-41080=>'L',
-41081=>'L',
-41082=>'L',
-41083=>'L',
-41084=>'L',
-41085=>'L',
-41086=>'L',
-41087=>'L',
-41088=>'L',
-41089=>'L',
-41090=>'L',
-41091=>'L',
-41092=>'L',
-41093=>'L',
-41094=>'L',
-41095=>'L',
-41096=>'L',
-41097=>'L',
-41098=>'L',
-41099=>'L',
-41100=>'L',
-41101=>'L',
-41102=>'L',
-41103=>'L',
-41104=>'L',
-41105=>'L',
-41106=>'L',
-41107=>'L',
-41108=>'L',
-41109=>'L',
-41110=>'L',
-41111=>'L',
-41112=>'L',
-41113=>'L',
-41114=>'L',
-41115=>'L',
-41116=>'L',
-41117=>'L',
-41118=>'L',
-41119=>'L',
-41120=>'L',
-41121=>'L',
-41122=>'L',
-41123=>'L',
-41124=>'L',
-41125=>'L',
-41126=>'L',
-41127=>'L',
-41128=>'L',
-41129=>'L',
-41130=>'L',
-41131=>'L',
-41132=>'L',
-41133=>'L',
-41134=>'L',
-41135=>'L',
-41136=>'L',
-41137=>'L',
-41138=>'L',
-41139=>'L',
-41140=>'L',
-41141=>'L',
-41142=>'L',
-41143=>'L',
-41144=>'L',
-41145=>'L',
-41146=>'L',
-41147=>'L',
-41148=>'L',
-41149=>'L',
-41150=>'L',
-41151=>'L',
-41152=>'L',
-41153=>'L',
-41154=>'L',
-41155=>'L',
-41156=>'L',
-41157=>'L',
-41158=>'L',
-41159=>'L',
-41160=>'L',
-41161=>'L',
-41162=>'L',
-41163=>'L',
-41164=>'L',
-41165=>'L',
-41166=>'L',
-41167=>'L',
-41168=>'L',
-41169=>'L',
-41170=>'L',
-41171=>'L',
-41172=>'L',
-41173=>'L',
-41174=>'L',
-41175=>'L',
-41176=>'L',
-41177=>'L',
-41178=>'L',
-41179=>'L',
-41180=>'L',
-41181=>'L',
-41182=>'L',
-41183=>'L',
-41184=>'L',
-41185=>'L',
-41186=>'L',
-41187=>'L',
-41188=>'L',
-41189=>'L',
-41190=>'L',
-41191=>'L',
-41192=>'L',
-41193=>'L',
-41194=>'L',
-41195=>'L',
-41196=>'L',
-41197=>'L',
-41198=>'L',
-41199=>'L',
-41200=>'L',
-41201=>'L',
-41202=>'L',
-41203=>'L',
-41204=>'L',
-41205=>'L',
-41206=>'L',
-41207=>'L',
-41208=>'L',
-41209=>'L',
-41210=>'L',
-41211=>'L',
-41212=>'L',
-41213=>'L',
-41214=>'L',
-41215=>'L',
-41216=>'L',
-41217=>'L',
-41218=>'L',
-41219=>'L',
-41220=>'L',
-41221=>'L',
-41222=>'L',
-41223=>'L',
-41224=>'L',
-41225=>'L',
-41226=>'L',
-41227=>'L',
-41228=>'L',
-41229=>'L',
-41230=>'L',
-41231=>'L',
-41232=>'L',
-41233=>'L',
-41234=>'L',
-41235=>'L',
-41236=>'L',
-41237=>'L',
-41238=>'L',
-41239=>'L',
-41240=>'L',
-41241=>'L',
-41242=>'L',
-41243=>'L',
-41244=>'L',
-41245=>'L',
-41246=>'L',
-41247=>'L',
-41248=>'L',
-41249=>'L',
-41250=>'L',
-41251=>'L',
-41252=>'L',
-41253=>'L',
-41254=>'L',
-41255=>'L',
-41256=>'L',
-41257=>'L',
-41258=>'L',
-41259=>'L',
-41260=>'L',
-41261=>'L',
-41262=>'L',
-41263=>'L',
-41264=>'L',
-41265=>'L',
-41266=>'L',
-41267=>'L',
-41268=>'L',
-41269=>'L',
-41270=>'L',
-41271=>'L',
-41272=>'L',
-41273=>'L',
-41274=>'L',
-41275=>'L',
-41276=>'L',
-41277=>'L',
-41278=>'L',
-41279=>'L',
-41280=>'L',
-41281=>'L',
-41282=>'L',
-41283=>'L',
-41284=>'L',
-41285=>'L',
-41286=>'L',
-41287=>'L',
-41288=>'L',
-41289=>'L',
-41290=>'L',
-41291=>'L',
-41292=>'L',
-41293=>'L',
-41294=>'L',
-41295=>'L',
-41296=>'L',
-41297=>'L',
-41298=>'L',
-41299=>'L',
-41300=>'L',
-41301=>'L',
-41302=>'L',
-41303=>'L',
-41304=>'L',
-41305=>'L',
-41306=>'L',
-41307=>'L',
-41308=>'L',
-41309=>'L',
-41310=>'L',
-41311=>'L',
-41312=>'L',
-41313=>'L',
-41314=>'L',
-41315=>'L',
-41316=>'L',
-41317=>'L',
-41318=>'L',
-41319=>'L',
-41320=>'L',
-41321=>'L',
-41322=>'L',
-41323=>'L',
-41324=>'L',
-41325=>'L',
-41326=>'L',
-41327=>'L',
-41328=>'L',
-41329=>'L',
-41330=>'L',
-41331=>'L',
-41332=>'L',
-41333=>'L',
-41334=>'L',
-41335=>'L',
-41336=>'L',
-41337=>'L',
-41338=>'L',
-41339=>'L',
-41340=>'L',
-41341=>'L',
-41342=>'L',
-41343=>'L',
-41344=>'L',
-41345=>'L',
-41346=>'L',
-41347=>'L',
-41348=>'L',
-41349=>'L',
-41350=>'L',
-41351=>'L',
-41352=>'L',
-41353=>'L',
-41354=>'L',
-41355=>'L',
-41356=>'L',
-41357=>'L',
-41358=>'L',
-41359=>'L',
-41360=>'L',
-41361=>'L',
-41362=>'L',
-41363=>'L',
-41364=>'L',
-41365=>'L',
-41366=>'L',
-41367=>'L',
-41368=>'L',
-41369=>'L',
-41370=>'L',
-41371=>'L',
-41372=>'L',
-41373=>'L',
-41374=>'L',
-41375=>'L',
-41376=>'L',
-41377=>'L',
-41378=>'L',
-41379=>'L',
-41380=>'L',
-41381=>'L',
-41382=>'L',
-41383=>'L',
-41384=>'L',
-41385=>'L',
-41386=>'L',
-41387=>'L',
-41388=>'L',
-41389=>'L',
-41390=>'L',
-41391=>'L',
-41392=>'L',
-41393=>'L',
-41394=>'L',
-41395=>'L',
-41396=>'L',
-41397=>'L',
-41398=>'L',
-41399=>'L',
-41400=>'L',
-41401=>'L',
-41402=>'L',
-41403=>'L',
-41404=>'L',
-41405=>'L',
-41406=>'L',
-41407=>'L',
-41408=>'L',
-41409=>'L',
-41410=>'L',
-41411=>'L',
-41412=>'L',
-41413=>'L',
-41414=>'L',
-41415=>'L',
-41416=>'L',
-41417=>'L',
-41418=>'L',
-41419=>'L',
-41420=>'L',
-41421=>'L',
-41422=>'L',
-41423=>'L',
-41424=>'L',
-41425=>'L',
-41426=>'L',
-41427=>'L',
-41428=>'L',
-41429=>'L',
-41430=>'L',
-41431=>'L',
-41432=>'L',
-41433=>'L',
-41434=>'L',
-41435=>'L',
-41436=>'L',
-41437=>'L',
-41438=>'L',
-41439=>'L',
-41440=>'L',
-41441=>'L',
-41442=>'L',
-41443=>'L',
-41444=>'L',
-41445=>'L',
-41446=>'L',
-41447=>'L',
-41448=>'L',
-41449=>'L',
-41450=>'L',
-41451=>'L',
-41452=>'L',
-41453=>'L',
-41454=>'L',
-41455=>'L',
-41456=>'L',
-41457=>'L',
-41458=>'L',
-41459=>'L',
-41460=>'L',
-41461=>'L',
-41462=>'L',
-41463=>'L',
-41464=>'L',
-41465=>'L',
-41466=>'L',
-41467=>'L',
-41468=>'L',
-41469=>'L',
-41470=>'L',
-41471=>'L',
-41472=>'L',
-41473=>'L',
-41474=>'L',
-41475=>'L',
-41476=>'L',
-41477=>'L',
-41478=>'L',
-41479=>'L',
-41480=>'L',
-41481=>'L',
-41482=>'L',
-41483=>'L',
-41484=>'L',
-41485=>'L',
-41486=>'L',
-41487=>'L',
-41488=>'L',
-41489=>'L',
-41490=>'L',
-41491=>'L',
-41492=>'L',
-41493=>'L',
-41494=>'L',
-41495=>'L',
-41496=>'L',
-41497=>'L',
-41498=>'L',
-41499=>'L',
-41500=>'L',
-41501=>'L',
-41502=>'L',
-41503=>'L',
-41504=>'L',
-41505=>'L',
-41506=>'L',
-41507=>'L',
-41508=>'L',
-41509=>'L',
-41510=>'L',
-41511=>'L',
-41512=>'L',
-41513=>'L',
-41514=>'L',
-41515=>'L',
-41516=>'L',
-41517=>'L',
-41518=>'L',
-41519=>'L',
-41520=>'L',
-41521=>'L',
-41522=>'L',
-41523=>'L',
-41524=>'L',
-41525=>'L',
-41526=>'L',
-41527=>'L',
-41528=>'L',
-41529=>'L',
-41530=>'L',
-41531=>'L',
-41532=>'L',
-41533=>'L',
-41534=>'L',
-41535=>'L',
-41536=>'L',
-41537=>'L',
-41538=>'L',
-41539=>'L',
-41540=>'L',
-41541=>'L',
-41542=>'L',
-41543=>'L',
-41544=>'L',
-41545=>'L',
-41546=>'L',
-41547=>'L',
-41548=>'L',
-41549=>'L',
-41550=>'L',
-41551=>'L',
-41552=>'L',
-41553=>'L',
-41554=>'L',
-41555=>'L',
-41556=>'L',
-41557=>'L',
-41558=>'L',
-41559=>'L',
-41560=>'L',
-41561=>'L',
-41562=>'L',
-41563=>'L',
-41564=>'L',
-41565=>'L',
-41566=>'L',
-41567=>'L',
-41568=>'L',
-41569=>'L',
-41570=>'L',
-41571=>'L',
-41572=>'L',
-41573=>'L',
-41574=>'L',
-41575=>'L',
-41576=>'L',
-41577=>'L',
-41578=>'L',
-41579=>'L',
-41580=>'L',
-41581=>'L',
-41582=>'L',
-41583=>'L',
-41584=>'L',
-41585=>'L',
-41586=>'L',
-41587=>'L',
-41588=>'L',
-41589=>'L',
-41590=>'L',
-41591=>'L',
-41592=>'L',
-41593=>'L',
-41594=>'L',
-41595=>'L',
-41596=>'L',
-41597=>'L',
-41598=>'L',
-41599=>'L',
-41600=>'L',
-41601=>'L',
-41602=>'L',
-41603=>'L',
-41604=>'L',
-41605=>'L',
-41606=>'L',
-41607=>'L',
-41608=>'L',
-41609=>'L',
-41610=>'L',
-41611=>'L',
-41612=>'L',
-41613=>'L',
-41614=>'L',
-41615=>'L',
-41616=>'L',
-41617=>'L',
-41618=>'L',
-41619=>'L',
-41620=>'L',
-41621=>'L',
-41622=>'L',
-41623=>'L',
-41624=>'L',
-41625=>'L',
-41626=>'L',
-41627=>'L',
-41628=>'L',
-41629=>'L',
-41630=>'L',
-41631=>'L',
-41632=>'L',
-41633=>'L',
-41634=>'L',
-41635=>'L',
-41636=>'L',
-41637=>'L',
-41638=>'L',
-41639=>'L',
-41640=>'L',
-41641=>'L',
-41642=>'L',
-41643=>'L',
-41644=>'L',
-41645=>'L',
-41646=>'L',
-41647=>'L',
-41648=>'L',
-41649=>'L',
-41650=>'L',
-41651=>'L',
-41652=>'L',
-41653=>'L',
-41654=>'L',
-41655=>'L',
-41656=>'L',
-41657=>'L',
-41658=>'L',
-41659=>'L',
-41660=>'L',
-41661=>'L',
-41662=>'L',
-41663=>'L',
-41664=>'L',
-41665=>'L',
-41666=>'L',
-41667=>'L',
-41668=>'L',
-41669=>'L',
-41670=>'L',
-41671=>'L',
-41672=>'L',
-41673=>'L',
-41674=>'L',
-41675=>'L',
-41676=>'L',
-41677=>'L',
-41678=>'L',
-41679=>'L',
-41680=>'L',
-41681=>'L',
-41682=>'L',
-41683=>'L',
-41684=>'L',
-41685=>'L',
-41686=>'L',
-41687=>'L',
-41688=>'L',
-41689=>'L',
-41690=>'L',
-41691=>'L',
-41692=>'L',
-41693=>'L',
-41694=>'L',
-41695=>'L',
-41696=>'L',
-41697=>'L',
-41698=>'L',
-41699=>'L',
-41700=>'L',
-41701=>'L',
-41702=>'L',
-41703=>'L',
-41704=>'L',
-41705=>'L',
-41706=>'L',
-41707=>'L',
-41708=>'L',
-41709=>'L',
-41710=>'L',
-41711=>'L',
-41712=>'L',
-41713=>'L',
-41714=>'L',
-41715=>'L',
-41716=>'L',
-41717=>'L',
-41718=>'L',
-41719=>'L',
-41720=>'L',
-41721=>'L',
-41722=>'L',
-41723=>'L',
-41724=>'L',
-41725=>'L',
-41726=>'L',
-41727=>'L',
-41728=>'L',
-41729=>'L',
-41730=>'L',
-41731=>'L',
-41732=>'L',
-41733=>'L',
-41734=>'L',
-41735=>'L',
-41736=>'L',
-41737=>'L',
-41738=>'L',
-41739=>'L',
-41740=>'L',
-41741=>'L',
-41742=>'L',
-41743=>'L',
-41744=>'L',
-41745=>'L',
-41746=>'L',
-41747=>'L',
-41748=>'L',
-41749=>'L',
-41750=>'L',
-41751=>'L',
-41752=>'L',
-41753=>'L',
-41754=>'L',
-41755=>'L',
-41756=>'L',
-41757=>'L',
-41758=>'L',
-41759=>'L',
-41760=>'L',
-41761=>'L',
-41762=>'L',
-41763=>'L',
-41764=>'L',
-41765=>'L',
-41766=>'L',
-41767=>'L',
-41768=>'L',
-41769=>'L',
-41770=>'L',
-41771=>'L',
-41772=>'L',
-41773=>'L',
-41774=>'L',
-41775=>'L',
-41776=>'L',
-41777=>'L',
-41778=>'L',
-41779=>'L',
-41780=>'L',
-41781=>'L',
-41782=>'L',
-41783=>'L',
-41784=>'L',
-41785=>'L',
-41786=>'L',
-41787=>'L',
-41788=>'L',
-41789=>'L',
-41790=>'L',
-41791=>'L',
-41792=>'L',
-41793=>'L',
-41794=>'L',
-41795=>'L',
-41796=>'L',
-41797=>'L',
-41798=>'L',
-41799=>'L',
-41800=>'L',
-41801=>'L',
-41802=>'L',
-41803=>'L',
-41804=>'L',
-41805=>'L',
-41806=>'L',
-41807=>'L',
-41808=>'L',
-41809=>'L',
-41810=>'L',
-41811=>'L',
-41812=>'L',
-41813=>'L',
-41814=>'L',
-41815=>'L',
-41816=>'L',
-41817=>'L',
-41818=>'L',
-41819=>'L',
-41820=>'L',
-41821=>'L',
-41822=>'L',
-41823=>'L',
-41824=>'L',
-41825=>'L',
-41826=>'L',
-41827=>'L',
-41828=>'L',
-41829=>'L',
-41830=>'L',
-41831=>'L',
-41832=>'L',
-41833=>'L',
-41834=>'L',
-41835=>'L',
-41836=>'L',
-41837=>'L',
-41838=>'L',
-41839=>'L',
-41840=>'L',
-41841=>'L',
-41842=>'L',
-41843=>'L',
-41844=>'L',
-41845=>'L',
-41846=>'L',
-41847=>'L',
-41848=>'L',
-41849=>'L',
-41850=>'L',
-41851=>'L',
-41852=>'L',
-41853=>'L',
-41854=>'L',
-41855=>'L',
-41856=>'L',
-41857=>'L',
-41858=>'L',
-41859=>'L',
-41860=>'L',
-41861=>'L',
-41862=>'L',
-41863=>'L',
-41864=>'L',
-41865=>'L',
-41866=>'L',
-41867=>'L',
-41868=>'L',
-41869=>'L',
-41870=>'L',
-41871=>'L',
-41872=>'L',
-41873=>'L',
-41874=>'L',
-41875=>'L',
-41876=>'L',
-41877=>'L',
-41878=>'L',
-41879=>'L',
-41880=>'L',
-41881=>'L',
-41882=>'L',
-41883=>'L',
-41884=>'L',
-41885=>'L',
-41886=>'L',
-41887=>'L',
-41888=>'L',
-41889=>'L',
-41890=>'L',
-41891=>'L',
-41892=>'L',
-41893=>'L',
-41894=>'L',
-41895=>'L',
-41896=>'L',
-41897=>'L',
-41898=>'L',
-41899=>'L',
-41900=>'L',
-41901=>'L',
-41902=>'L',
-41903=>'L',
-41904=>'L',
-41905=>'L',
-41906=>'L',
-41907=>'L',
-41908=>'L',
-41909=>'L',
-41910=>'L',
-41911=>'L',
-41912=>'L',
-41913=>'L',
-41914=>'L',
-41915=>'L',
-41916=>'L',
-41917=>'L',
-41918=>'L',
-41919=>'L',
-41920=>'L',
-41921=>'L',
-41922=>'L',
-41923=>'L',
-41924=>'L',
-41925=>'L',
-41926=>'L',
-41927=>'L',
-41928=>'L',
-41929=>'L',
-41930=>'L',
-41931=>'L',
-41932=>'L',
-41933=>'L',
-41934=>'L',
-41935=>'L',
-41936=>'L',
-41937=>'L',
-41938=>'L',
-41939=>'L',
-41940=>'L',
-41941=>'L',
-41942=>'L',
-41943=>'L',
-41944=>'L',
-41945=>'L',
-41946=>'L',
-41947=>'L',
-41948=>'L',
-41949=>'L',
-41950=>'L',
-41951=>'L',
-41952=>'L',
-41953=>'L',
-41954=>'L',
-41955=>'L',
-41956=>'L',
-41957=>'L',
-41958=>'L',
-41959=>'L',
-41960=>'L',
-41961=>'L',
-41962=>'L',
-41963=>'L',
-41964=>'L',
-41965=>'L',
-41966=>'L',
-41967=>'L',
-41968=>'L',
-41969=>'L',
-41970=>'L',
-41971=>'L',
-41972=>'L',
-41973=>'L',
-41974=>'L',
-41975=>'L',
-41976=>'L',
-41977=>'L',
-41978=>'L',
-41979=>'L',
-41980=>'L',
-41981=>'L',
-41982=>'L',
-41983=>'L',
-41984=>'L',
-41985=>'L',
-41986=>'L',
-41987=>'L',
-41988=>'L',
-41989=>'L',
-41990=>'L',
-41991=>'L',
-41992=>'L',
-41993=>'L',
-41994=>'L',
-41995=>'L',
-41996=>'L',
-41997=>'L',
-41998=>'L',
-41999=>'L',
-42000=>'L',
-42001=>'L',
-42002=>'L',
-42003=>'L',
-42004=>'L',
-42005=>'L',
-42006=>'L',
-42007=>'L',
-42008=>'L',
-42009=>'L',
-42010=>'L',
-42011=>'L',
-42012=>'L',
-42013=>'L',
-42014=>'L',
-42015=>'L',
-42016=>'L',
-42017=>'L',
-42018=>'L',
-42019=>'L',
-42020=>'L',
-42021=>'L',
-42022=>'L',
-42023=>'L',
-42024=>'L',
-42025=>'L',
-42026=>'L',
-42027=>'L',
-42028=>'L',
-42029=>'L',
-42030=>'L',
-42031=>'L',
-42032=>'L',
-42033=>'L',
-42034=>'L',
-42035=>'L',
-42036=>'L',
-42037=>'L',
-42038=>'L',
-42039=>'L',
-42040=>'L',
-42041=>'L',
-42042=>'L',
-42043=>'L',
-42044=>'L',
-42045=>'L',
-42046=>'L',
-42047=>'L',
-42048=>'L',
-42049=>'L',
-42050=>'L',
-42051=>'L',
-42052=>'L',
-42053=>'L',
-42054=>'L',
-42055=>'L',
-42056=>'L',
-42057=>'L',
-42058=>'L',
-42059=>'L',
-42060=>'L',
-42061=>'L',
-42062=>'L',
-42063=>'L',
-42064=>'L',
-42065=>'L',
-42066=>'L',
-42067=>'L',
-42068=>'L',
-42069=>'L',
-42070=>'L',
-42071=>'L',
-42072=>'L',
-42073=>'L',
-42074=>'L',
-42075=>'L',
-42076=>'L',
-42077=>'L',
-42078=>'L',
-42079=>'L',
-42080=>'L',
-42081=>'L',
-42082=>'L',
-42083=>'L',
-42084=>'L',
-42085=>'L',
-42086=>'L',
-42087=>'L',
-42088=>'L',
-42089=>'L',
-42090=>'L',
-42091=>'L',
-42092=>'L',
-42093=>'L',
-42094=>'L',
-42095=>'L',
-42096=>'L',
-42097=>'L',
-42098=>'L',
-42099=>'L',
-42100=>'L',
-42101=>'L',
-42102=>'L',
-42103=>'L',
-42104=>'L',
-42105=>'L',
-42106=>'L',
-42107=>'L',
-42108=>'L',
-42109=>'L',
-42110=>'L',
-42111=>'L',
-42112=>'L',
-42113=>'L',
-42114=>'L',
-42115=>'L',
-42116=>'L',
-42117=>'L',
-42118=>'L',
-42119=>'L',
-42120=>'L',
-42121=>'L',
-42122=>'L',
-42123=>'L',
-42124=>'L',
-42128=>'ON',
-42129=>'ON',
-42130=>'ON',
-42131=>'ON',
-42132=>'ON',
-42133=>'ON',
-42134=>'ON',
-42135=>'ON',
-42136=>'ON',
-42137=>'ON',
-42138=>'ON',
-42139=>'ON',
-42140=>'ON',
-42141=>'ON',
-42142=>'ON',
-42143=>'ON',
-42144=>'ON',
-42145=>'ON',
-42146=>'ON',
-42147=>'ON',
-42148=>'ON',
-42149=>'ON',
-42150=>'ON',
-42151=>'ON',
-42152=>'ON',
-42153=>'ON',
-42154=>'ON',
-42155=>'ON',
-42156=>'ON',
-42157=>'ON',
-42158=>'ON',
-42159=>'ON',
-42160=>'ON',
-42161=>'ON',
-42162=>'ON',
-42163=>'ON',
-42164=>'ON',
-42165=>'ON',
-42166=>'ON',
-42167=>'ON',
-42168=>'ON',
-42169=>'ON',
-42170=>'ON',
-42171=>'ON',
-42172=>'ON',
-42173=>'ON',
-42174=>'ON',
-42175=>'ON',
-42176=>'ON',
-42177=>'ON',
-42178=>'ON',
-42179=>'ON',
-42180=>'ON',
-42181=>'ON',
-42182=>'ON',
-42752=>'ON',
-42753=>'ON',
-42754=>'ON',
-42755=>'ON',
-42756=>'ON',
-42757=>'ON',
-42758=>'ON',
-42759=>'ON',
-42760=>'ON',
-42761=>'ON',
-42762=>'ON',
-42763=>'ON',
-42764=>'ON',
-42765=>'ON',
-42766=>'ON',
-42767=>'ON',
-42768=>'ON',
-42769=>'ON',
-42770=>'ON',
-42771=>'ON',
-42772=>'ON',
-42773=>'ON',
-42774=>'ON',
-42775=>'ON',
-42776=>'ON',
-42777=>'ON',
-42778=>'ON',
-42784=>'ON',
-42785=>'ON',
-43008=>'L',
-43009=>'L',
-43010=>'NSM',
-43011=>'L',
-43012=>'L',
-43013=>'L',
-43014=>'NSM',
-43015=>'L',
-43016=>'L',
-43017=>'L',
-43018=>'L',
-43019=>'NSM',
-43020=>'L',
-43021=>'L',
-43022=>'L',
-43023=>'L',
-43024=>'L',
-43025=>'L',
-43026=>'L',
-43027=>'L',
-43028=>'L',
-43029=>'L',
-43030=>'L',
-43031=>'L',
-43032=>'L',
-43033=>'L',
-43034=>'L',
-43035=>'L',
-43036=>'L',
-43037=>'L',
-43038=>'L',
-43039=>'L',
-43040=>'L',
-43041=>'L',
-43042=>'L',
-43043=>'L',
-43044=>'L',
-43045=>'NSM',
-43046=>'NSM',
-43047=>'L',
-43048=>'ON',
-43049=>'ON',
-43050=>'ON',
-43051=>'ON',
-43072=>'L',
-43073=>'L',
-43074=>'L',
-43075=>'L',
-43076=>'L',
-43077=>'L',
-43078=>'L',
-43079=>'L',
-43080=>'L',
-43081=>'L',
-43082=>'L',
-43083=>'L',
-43084=>'L',
-43085=>'L',
-43086=>'L',
-43087=>'L',
-43088=>'L',
-43089=>'L',
-43090=>'L',
-43091=>'L',
-43092=>'L',
-43093=>'L',
-43094=>'L',
-43095=>'L',
-43096=>'L',
-43097=>'L',
-43098=>'L',
-43099=>'L',
-43100=>'L',
-43101=>'L',
-43102=>'L',
-43103=>'L',
-43104=>'L',
-43105=>'L',
-43106=>'L',
-43107=>'L',
-43108=>'L',
-43109=>'L',
-43110=>'L',
-43111=>'L',
-43112=>'L',
-43113=>'L',
-43114=>'L',
-43115=>'L',
-43116=>'L',
-43117=>'L',
-43118=>'L',
-43119=>'L',
-43120=>'L',
-43121=>'L',
-43122=>'L',
-43123=>'L',
-43124=>'ON',
-43125=>'ON',
-43126=>'ON',
-43127=>'ON',
-44032=>'L',
-55203=>'L',
-55296=>'L',
-56191=>'L',
-56192=>'L',
-56319=>'L',
-56320=>'L',
-57343=>'L',
-57344=>'L',
-63743=>'L',
-63744=>'L',
-63745=>'L',
-63746=>'L',
-63747=>'L',
-63748=>'L',
-63749=>'L',
-63750=>'L',
-63751=>'L',
-63752=>'L',
-63753=>'L',
-63754=>'L',
-63755=>'L',
-63756=>'L',
-63757=>'L',
-63758=>'L',
-63759=>'L',
-63760=>'L',
-63761=>'L',
-63762=>'L',
-63763=>'L',
-63764=>'L',
-63765=>'L',
-63766=>'L',
-63767=>'L',
-63768=>'L',
-63769=>'L',
-63770=>'L',
-63771=>'L',
-63772=>'L',
-63773=>'L',
-63774=>'L',
-63775=>'L',
-63776=>'L',
-63777=>'L',
-63778=>'L',
-63779=>'L',
-63780=>'L',
-63781=>'L',
-63782=>'L',
-63783=>'L',
-63784=>'L',
-63785=>'L',
-63786=>'L',
-63787=>'L',
-63788=>'L',
-63789=>'L',
-63790=>'L',
-63791=>'L',
-63792=>'L',
-63793=>'L',
-63794=>'L',
-63795=>'L',
-63796=>'L',
-63797=>'L',
-63798=>'L',
-63799=>'L',
-63800=>'L',
-63801=>'L',
-63802=>'L',
-63803=>'L',
-63804=>'L',
-63805=>'L',
-63806=>'L',
-63807=>'L',
-63808=>'L',
-63809=>'L',
-63810=>'L',
-63811=>'L',
-63812=>'L',
-63813=>'L',
-63814=>'L',
-63815=>'L',
-63816=>'L',
-63817=>'L',
-63818=>'L',
-63819=>'L',
-63820=>'L',
-63821=>'L',
-63822=>'L',
-63823=>'L',
-63824=>'L',
-63825=>'L',
-63826=>'L',
-63827=>'L',
-63828=>'L',
-63829=>'L',
-63830=>'L',
-63831=>'L',
-63832=>'L',
-63833=>'L',
-63834=>'L',
-63835=>'L',
-63836=>'L',
-63837=>'L',
-63838=>'L',
-63839=>'L',
-63840=>'L',
-63841=>'L',
-63842=>'L',
-63843=>'L',
-63844=>'L',
-63845=>'L',
-63846=>'L',
-63847=>'L',
-63848=>'L',
-63849=>'L',
-63850=>'L',
-63851=>'L',
-63852=>'L',
-63853=>'L',
-63854=>'L',
-63855=>'L',
-63856=>'L',
-63857=>'L',
-63858=>'L',
-63859=>'L',
-63860=>'L',
-63861=>'L',
-63862=>'L',
-63863=>'L',
-63864=>'L',
-63865=>'L',
-63866=>'L',
-63867=>'L',
-63868=>'L',
-63869=>'L',
-63870=>'L',
-63871=>'L',
-63872=>'L',
-63873=>'L',
-63874=>'L',
-63875=>'L',
-63876=>'L',
-63877=>'L',
-63878=>'L',
-63879=>'L',
-63880=>'L',
-63881=>'L',
-63882=>'L',
-63883=>'L',
-63884=>'L',
-63885=>'L',
-63886=>'L',
-63887=>'L',
-63888=>'L',
-63889=>'L',
-63890=>'L',
-63891=>'L',
-63892=>'L',
-63893=>'L',
-63894=>'L',
-63895=>'L',
-63896=>'L',
-63897=>'L',
-63898=>'L',
-63899=>'L',
-63900=>'L',
-63901=>'L',
-63902=>'L',
-63903=>'L',
-63904=>'L',
-63905=>'L',
-63906=>'L',
-63907=>'L',
-63908=>'L',
-63909=>'L',
-63910=>'L',
-63911=>'L',
-63912=>'L',
-63913=>'L',
-63914=>'L',
-63915=>'L',
-63916=>'L',
-63917=>'L',
-63918=>'L',
-63919=>'L',
-63920=>'L',
-63921=>'L',
-63922=>'L',
-63923=>'L',
-63924=>'L',
-63925=>'L',
-63926=>'L',
-63927=>'L',
-63928=>'L',
-63929=>'L',
-63930=>'L',
-63931=>'L',
-63932=>'L',
-63933=>'L',
-63934=>'L',
-63935=>'L',
-63936=>'L',
-63937=>'L',
-63938=>'L',
-63939=>'L',
-63940=>'L',
-63941=>'L',
-63942=>'L',
-63943=>'L',
-63944=>'L',
-63945=>'L',
-63946=>'L',
-63947=>'L',
-63948=>'L',
-63949=>'L',
-63950=>'L',
-63951=>'L',
-63952=>'L',
-63953=>'L',
-63954=>'L',
-63955=>'L',
-63956=>'L',
-63957=>'L',
-63958=>'L',
-63959=>'L',
-63960=>'L',
-63961=>'L',
-63962=>'L',
-63963=>'L',
-63964=>'L',
-63965=>'L',
-63966=>'L',
-63967=>'L',
-63968=>'L',
-63969=>'L',
-63970=>'L',
-63971=>'L',
-63972=>'L',
-63973=>'L',
-63974=>'L',
-63975=>'L',
-63976=>'L',
-63977=>'L',
-63978=>'L',
-63979=>'L',
-63980=>'L',
-63981=>'L',
-63982=>'L',
-63983=>'L',
-63984=>'L',
-63985=>'L',
-63986=>'L',
-63987=>'L',
-63988=>'L',
-63989=>'L',
-63990=>'L',
-63991=>'L',
-63992=>'L',
-63993=>'L',
-63994=>'L',
-63995=>'L',
-63996=>'L',
-63997=>'L',
-63998=>'L',
-63999=>'L',
-64000=>'L',
-64001=>'L',
-64002=>'L',
-64003=>'L',
-64004=>'L',
-64005=>'L',
-64006=>'L',
-64007=>'L',
-64008=>'L',
-64009=>'L',
-64010=>'L',
-64011=>'L',
-64012=>'L',
-64013=>'L',
-64014=>'L',
-64015=>'L',
-64016=>'L',
-64017=>'L',
-64018=>'L',
-64019=>'L',
-64020=>'L',
-64021=>'L',
-64022=>'L',
-64023=>'L',
-64024=>'L',
-64025=>'L',
-64026=>'L',
-64027=>'L',
-64028=>'L',
-64029=>'L',
-64030=>'L',
-64031=>'L',
-64032=>'L',
-64033=>'L',
-64034=>'L',
-64035=>'L',
-64036=>'L',
-64037=>'L',
-64038=>'L',
-64039=>'L',
-64040=>'L',
-64041=>'L',
-64042=>'L',
-64043=>'L',
-64044=>'L',
-64045=>'L',
-64048=>'L',
-64049=>'L',
-64050=>'L',
-64051=>'L',
-64052=>'L',
-64053=>'L',
-64054=>'L',
-64055=>'L',
-64056=>'L',
-64057=>'L',
-64058=>'L',
-64059=>'L',
-64060=>'L',
-64061=>'L',
-64062=>'L',
-64063=>'L',
-64064=>'L',
-64065=>'L',
-64066=>'L',
-64067=>'L',
-64068=>'L',
-64069=>'L',
-64070=>'L',
-64071=>'L',
-64072=>'L',
-64073=>'L',
-64074=>'L',
-64075=>'L',
-64076=>'L',
-64077=>'L',
-64078=>'L',
-64079=>'L',
-64080=>'L',
-64081=>'L',
-64082=>'L',
-64083=>'L',
-64084=>'L',
-64085=>'L',
-64086=>'L',
-64087=>'L',
-64088=>'L',
-64089=>'L',
-64090=>'L',
-64091=>'L',
-64092=>'L',
-64093=>'L',
-64094=>'L',
-64095=>'L',
-64096=>'L',
-64097=>'L',
-64098=>'L',
-64099=>'L',
-64100=>'L',
-64101=>'L',
-64102=>'L',
-64103=>'L',
-64104=>'L',
-64105=>'L',
-64106=>'L',
-64112=>'L',
-64113=>'L',
-64114=>'L',
-64115=>'L',
-64116=>'L',
-64117=>'L',
-64118=>'L',
-64119=>'L',
-64120=>'L',
-64121=>'L',
-64122=>'L',
-64123=>'L',
-64124=>'L',
-64125=>'L',
-64126=>'L',
-64127=>'L',
-64128=>'L',
-64129=>'L',
-64130=>'L',
-64131=>'L',
-64132=>'L',
-64133=>'L',
-64134=>'L',
-64135=>'L',
-64136=>'L',
-64137=>'L',
-64138=>'L',
-64139=>'L',
-64140=>'L',
-64141=>'L',
-64142=>'L',
-64143=>'L',
-64144=>'L',
-64145=>'L',
-64146=>'L',
-64147=>'L',
-64148=>'L',
-64149=>'L',
-64150=>'L',
-64151=>'L',
-64152=>'L',
-64153=>'L',
-64154=>'L',
-64155=>'L',
-64156=>'L',
-64157=>'L',
-64158=>'L',
-64159=>'L',
-64160=>'L',
-64161=>'L',
-64162=>'L',
-64163=>'L',
-64164=>'L',
-64165=>'L',
-64166=>'L',
-64167=>'L',
-64168=>'L',
-64169=>'L',
-64170=>'L',
-64171=>'L',
-64172=>'L',
-64173=>'L',
-64174=>'L',
-64175=>'L',
-64176=>'L',
-64177=>'L',
-64178=>'L',
-64179=>'L',
-64180=>'L',
-64181=>'L',
-64182=>'L',
-64183=>'L',
-64184=>'L',
-64185=>'L',
-64186=>'L',
-64187=>'L',
-64188=>'L',
-64189=>'L',
-64190=>'L',
-64191=>'L',
-64192=>'L',
-64193=>'L',
-64194=>'L',
-64195=>'L',
-64196=>'L',
-64197=>'L',
-64198=>'L',
-64199=>'L',
-64200=>'L',
-64201=>'L',
-64202=>'L',
-64203=>'L',
-64204=>'L',
-64205=>'L',
-64206=>'L',
-64207=>'L',
-64208=>'L',
-64209=>'L',
-64210=>'L',
-64211=>'L',
-64212=>'L',
-64213=>'L',
-64214=>'L',
-64215=>'L',
-64216=>'L',
-64217=>'L',
-64256=>'L',
-64257=>'L',
-64258=>'L',
-64259=>'L',
-64260=>'L',
-64261=>'L',
-64262=>'L',
-64275=>'L',
-64276=>'L',
-64277=>'L',
-64278=>'L',
-64279=>'L',
-64285=>'R',
-64286=>'NSM',
-64287=>'R',
-64288=>'R',
-64289=>'R',
-64290=>'R',
-64291=>'R',
-64292=>'R',
-64293=>'R',
-64294=>'R',
-64295=>'R',
-64296=>'R',
-64297=>'ES',
-64298=>'R',
-64299=>'R',
-64300=>'R',
-64301=>'R',
-64302=>'R',
-64303=>'R',
-64304=>'R',
-64305=>'R',
-64306=>'R',
-64307=>'R',
-64308=>'R',
-64309=>'R',
-64310=>'R',
-64312=>'R',
-64313=>'R',
-64314=>'R',
-64315=>'R',
-64316=>'R',
-64318=>'R',
-64320=>'R',
-64321=>'R',
-64323=>'R',
-64324=>'R',
-64326=>'R',
-64327=>'R',
-64328=>'R',
-64329=>'R',
-64330=>'R',
-64331=>'R',
-64332=>'R',
-64333=>'R',
-64334=>'R',
-64335=>'R',
-64336=>'AL',
-64337=>'AL',
-64338=>'AL',
-64339=>'AL',
-64340=>'AL',
-64341=>'AL',
-64342=>'AL',
-64343=>'AL',
-64344=>'AL',
-64345=>'AL',
-64346=>'AL',
-64347=>'AL',
-64348=>'AL',
-64349=>'AL',
-64350=>'AL',
-64351=>'AL',
-64352=>'AL',
-64353=>'AL',
-64354=>'AL',
-64355=>'AL',
-64356=>'AL',
-64357=>'AL',
-64358=>'AL',
-64359=>'AL',
-64360=>'AL',
-64361=>'AL',
-64362=>'AL',
-64363=>'AL',
-64364=>'AL',
-64365=>'AL',
-64366=>'AL',
-64367=>'AL',
-64368=>'AL',
-64369=>'AL',
-64370=>'AL',
-64371=>'AL',
-64372=>'AL',
-64373=>'AL',
-64374=>'AL',
-64375=>'AL',
-64376=>'AL',
-64377=>'AL',
-64378=>'AL',
-64379=>'AL',
-64380=>'AL',
-64381=>'AL',
-64382=>'AL',
-64383=>'AL',
-64384=>'AL',
-64385=>'AL',
-64386=>'AL',
-64387=>'AL',
-64388=>'AL',
-64389=>'AL',
-64390=>'AL',
-64391=>'AL',
-64392=>'AL',
-64393=>'AL',
-64394=>'AL',
-64395=>'AL',
-64396=>'AL',
-64397=>'AL',
-64398=>'AL',
-64399=>'AL',
-64400=>'AL',
-64401=>'AL',
-64402=>'AL',
-64403=>'AL',
-64404=>'AL',
-64405=>'AL',
-64406=>'AL',
-64407=>'AL',
-64408=>'AL',
-64409=>'AL',
-64410=>'AL',
-64411=>'AL',
-64412=>'AL',
-64413=>'AL',
-64414=>'AL',
-64415=>'AL',
-64416=>'AL',
-64417=>'AL',
-64418=>'AL',
-64419=>'AL',
-64420=>'AL',
-64421=>'AL',
-64422=>'AL',
-64423=>'AL',
-64424=>'AL',
-64425=>'AL',
-64426=>'AL',
-64427=>'AL',
-64428=>'AL',
-64429=>'AL',
-64430=>'AL',
-64431=>'AL',
-64432=>'AL',
-64433=>'AL',
-64467=>'AL',
-64468=>'AL',
-64469=>'AL',
-64470=>'AL',
-64471=>'AL',
-64472=>'AL',
-64473=>'AL',
-64474=>'AL',
-64475=>'AL',
-64476=>'AL',
-64477=>'AL',
-64478=>'AL',
-64479=>'AL',
-64480=>'AL',
-64481=>'AL',
-64482=>'AL',
-64483=>'AL',
-64484=>'AL',
-64485=>'AL',
-64486=>'AL',
-64487=>'AL',
-64488=>'AL',
-64489=>'AL',
-64490=>'AL',
-64491=>'AL',
-64492=>'AL',
-64493=>'AL',
-64494=>'AL',
-64495=>'AL',
-64496=>'AL',
-64497=>'AL',
-64498=>'AL',
-64499=>'AL',
-64500=>'AL',
-64501=>'AL',
-64502=>'AL',
-64503=>'AL',
-64504=>'AL',
-64505=>'AL',
-64506=>'AL',
-64507=>'AL',
-64508=>'AL',
-64509=>'AL',
-64510=>'AL',
-64511=>'AL',
-64512=>'AL',
-64513=>'AL',
-64514=>'AL',
-64515=>'AL',
-64516=>'AL',
-64517=>'AL',
-64518=>'AL',
-64519=>'AL',
-64520=>'AL',
-64521=>'AL',
-64522=>'AL',
-64523=>'AL',
-64524=>'AL',
-64525=>'AL',
-64526=>'AL',
-64527=>'AL',
-64528=>'AL',
-64529=>'AL',
-64530=>'AL',
-64531=>'AL',
-64532=>'AL',
-64533=>'AL',
-64534=>'AL',
-64535=>'AL',
-64536=>'AL',
-64537=>'AL',
-64538=>'AL',
-64539=>'AL',
-64540=>'AL',
-64541=>'AL',
-64542=>'AL',
-64543=>'AL',
-64544=>'AL',
-64545=>'AL',
-64546=>'AL',
-64547=>'AL',
-64548=>'AL',
-64549=>'AL',
-64550=>'AL',
-64551=>'AL',
-64552=>'AL',
-64553=>'AL',
-64554=>'AL',
-64555=>'AL',
-64556=>'AL',
-64557=>'AL',
-64558=>'AL',
-64559=>'AL',
-64560=>'AL',
-64561=>'AL',
-64562=>'AL',
-64563=>'AL',
-64564=>'AL',
-64565=>'AL',
-64566=>'AL',
-64567=>'AL',
-64568=>'AL',
-64569=>'AL',
-64570=>'AL',
-64571=>'AL',
-64572=>'AL',
-64573=>'AL',
-64574=>'AL',
-64575=>'AL',
-64576=>'AL',
-64577=>'AL',
-64578=>'AL',
-64579=>'AL',
-64580=>'AL',
-64581=>'AL',
-64582=>'AL',
-64583=>'AL',
-64584=>'AL',
-64585=>'AL',
-64586=>'AL',
-64587=>'AL',
-64588=>'AL',
-64589=>'AL',
-64590=>'AL',
-64591=>'AL',
-64592=>'AL',
-64593=>'AL',
-64594=>'AL',
-64595=>'AL',
-64596=>'AL',
-64597=>'AL',
-64598=>'AL',
-64599=>'AL',
-64600=>'AL',
-64601=>'AL',
-64602=>'AL',
-64603=>'AL',
-64604=>'AL',
-64605=>'AL',
-64606=>'AL',
-64607=>'AL',
-64608=>'AL',
-64609=>'AL',
-64610=>'AL',
-64611=>'AL',
-64612=>'AL',
-64613=>'AL',
-64614=>'AL',
-64615=>'AL',
-64616=>'AL',
-64617=>'AL',
-64618=>'AL',
-64619=>'AL',
-64620=>'AL',
-64621=>'AL',
-64622=>'AL',
-64623=>'AL',
-64624=>'AL',
-64625=>'AL',
-64626=>'AL',
-64627=>'AL',
-64628=>'AL',
-64629=>'AL',
-64630=>'AL',
-64631=>'AL',
-64632=>'AL',
-64633=>'AL',
-64634=>'AL',
-64635=>'AL',
-64636=>'AL',
-64637=>'AL',
-64638=>'AL',
-64639=>'AL',
-64640=>'AL',
-64641=>'AL',
-64642=>'AL',
-64643=>'AL',
-64644=>'AL',
-64645=>'AL',
-64646=>'AL',
-64647=>'AL',
-64648=>'AL',
-64649=>'AL',
-64650=>'AL',
-64651=>'AL',
-64652=>'AL',
-64653=>'AL',
-64654=>'AL',
-64655=>'AL',
-64656=>'AL',
-64657=>'AL',
-64658=>'AL',
-64659=>'AL',
-64660=>'AL',
-64661=>'AL',
-64662=>'AL',
-64663=>'AL',
-64664=>'AL',
-64665=>'AL',
-64666=>'AL',
-64667=>'AL',
-64668=>'AL',
-64669=>'AL',
-64670=>'AL',
-64671=>'AL',
-64672=>'AL',
-64673=>'AL',
-64674=>'AL',
-64675=>'AL',
-64676=>'AL',
-64677=>'AL',
-64678=>'AL',
-64679=>'AL',
-64680=>'AL',
-64681=>'AL',
-64682=>'AL',
-64683=>'AL',
-64684=>'AL',
-64685=>'AL',
-64686=>'AL',
-64687=>'AL',
-64688=>'AL',
-64689=>'AL',
-64690=>'AL',
-64691=>'AL',
-64692=>'AL',
-64693=>'AL',
-64694=>'AL',
-64695=>'AL',
-64696=>'AL',
-64697=>'AL',
-64698=>'AL',
-64699=>'AL',
-64700=>'AL',
-64701=>'AL',
-64702=>'AL',
-64703=>'AL',
-64704=>'AL',
-64705=>'AL',
-64706=>'AL',
-64707=>'AL',
-64708=>'AL',
-64709=>'AL',
-64710=>'AL',
-64711=>'AL',
-64712=>'AL',
-64713=>'AL',
-64714=>'AL',
-64715=>'AL',
-64716=>'AL',
-64717=>'AL',
-64718=>'AL',
-64719=>'AL',
-64720=>'AL',
-64721=>'AL',
-64722=>'AL',
-64723=>'AL',
-64724=>'AL',
-64725=>'AL',
-64726=>'AL',
-64727=>'AL',
-64728=>'AL',
-64729=>'AL',
-64730=>'AL',
-64731=>'AL',
-64732=>'AL',
-64733=>'AL',
-64734=>'AL',
-64735=>'AL',
-64736=>'AL',
-64737=>'AL',
-64738=>'AL',
-64739=>'AL',
-64740=>'AL',
-64741=>'AL',
-64742=>'AL',
-64743=>'AL',
-64744=>'AL',
-64745=>'AL',
-64746=>'AL',
-64747=>'AL',
-64748=>'AL',
-64749=>'AL',
-64750=>'AL',
-64751=>'AL',
-64752=>'AL',
-64753=>'AL',
-64754=>'AL',
-64755=>'AL',
-64756=>'AL',
-64757=>'AL',
-64758=>'AL',
-64759=>'AL',
-64760=>'AL',
-64761=>'AL',
-64762=>'AL',
-64763=>'AL',
-64764=>'AL',
-64765=>'AL',
-64766=>'AL',
-64767=>'AL',
-64768=>'AL',
-64769=>'AL',
-64770=>'AL',
-64771=>'AL',
-64772=>'AL',
-64773=>'AL',
-64774=>'AL',
-64775=>'AL',
-64776=>'AL',
-64777=>'AL',
-64778=>'AL',
-64779=>'AL',
-64780=>'AL',
-64781=>'AL',
-64782=>'AL',
-64783=>'AL',
-64784=>'AL',
-64785=>'AL',
-64786=>'AL',
-64787=>'AL',
-64788=>'AL',
-64789=>'AL',
-64790=>'AL',
-64791=>'AL',
-64792=>'AL',
-64793=>'AL',
-64794=>'AL',
-64795=>'AL',
-64796=>'AL',
-64797=>'AL',
-64798=>'AL',
-64799=>'AL',
-64800=>'AL',
-64801=>'AL',
-64802=>'AL',
-64803=>'AL',
-64804=>'AL',
-64805=>'AL',
-64806=>'AL',
-64807=>'AL',
-64808=>'AL',
-64809=>'AL',
-64810=>'AL',
-64811=>'AL',
-64812=>'AL',
-64813=>'AL',
-64814=>'AL',
-64815=>'AL',
-64816=>'AL',
-64817=>'AL',
-64818=>'AL',
-64819=>'AL',
-64820=>'AL',
-64821=>'AL',
-64822=>'AL',
-64823=>'AL',
-64824=>'AL',
-64825=>'AL',
-64826=>'AL',
-64827=>'AL',
-64828=>'AL',
-64829=>'AL',
-64830=>'ON',
-64831=>'ON',
-64848=>'AL',
-64849=>'AL',
-64850=>'AL',
-64851=>'AL',
-64852=>'AL',
-64853=>'AL',
-64854=>'AL',
-64855=>'AL',
-64856=>'AL',
-64857=>'AL',
-64858=>'AL',
-64859=>'AL',
-64860=>'AL',
-64861=>'AL',
-64862=>'AL',
-64863=>'AL',
-64864=>'AL',
-64865=>'AL',
-64866=>'AL',
-64867=>'AL',
-64868=>'AL',
-64869=>'AL',
-64870=>'AL',
-64871=>'AL',
-64872=>'AL',
-64873=>'AL',
-64874=>'AL',
-64875=>'AL',
-64876=>'AL',
-64877=>'AL',
-64878=>'AL',
-64879=>'AL',
-64880=>'AL',
-64881=>'AL',
-64882=>'AL',
-64883=>'AL',
-64884=>'AL',
-64885=>'AL',
-64886=>'AL',
-64887=>'AL',
-64888=>'AL',
-64889=>'AL',
-64890=>'AL',
-64891=>'AL',
-64892=>'AL',
-64893=>'AL',
-64894=>'AL',
-64895=>'AL',
-64896=>'AL',
-64897=>'AL',
-64898=>'AL',
-64899=>'AL',
-64900=>'AL',
-64901=>'AL',
-64902=>'AL',
-64903=>'AL',
-64904=>'AL',
-64905=>'AL',
-64906=>'AL',
-64907=>'AL',
-64908=>'AL',
-64909=>'AL',
-64910=>'AL',
-64911=>'AL',
-64914=>'AL',
-64915=>'AL',
-64916=>'AL',
-64917=>'AL',
-64918=>'AL',
-64919=>'AL',
-64920=>'AL',
-64921=>'AL',
-64922=>'AL',
-64923=>'AL',
-64924=>'AL',
-64925=>'AL',
-64926=>'AL',
-64927=>'AL',
-64928=>'AL',
-64929=>'AL',
-64930=>'AL',
-64931=>'AL',
-64932=>'AL',
-64933=>'AL',
-64934=>'AL',
-64935=>'AL',
-64936=>'AL',
-64937=>'AL',
-64938=>'AL',
-64939=>'AL',
-64940=>'AL',
-64941=>'AL',
-64942=>'AL',
-64943=>'AL',
-64944=>'AL',
-64945=>'AL',
-64946=>'AL',
-64947=>'AL',
-64948=>'AL',
-64949=>'AL',
-64950=>'AL',
-64951=>'AL',
-64952=>'AL',
-64953=>'AL',
-64954=>'AL',
-64955=>'AL',
-64956=>'AL',
-64957=>'AL',
-64958=>'AL',
-64959=>'AL',
-64960=>'AL',
-64961=>'AL',
-64962=>'AL',
-64963=>'AL',
-64964=>'AL',
-64965=>'AL',
-64966=>'AL',
-64967=>'AL',
-65008=>'AL',
-65009=>'AL',
-65010=>'AL',
-65011=>'AL',
-65012=>'AL',
-65013=>'AL',
-65014=>'AL',
-65015=>'AL',
-65016=>'AL',
-65017=>'AL',
-65018=>'AL',
-65019=>'AL',
-65020=>'AL',
-65021=>'ON',
-65024=>'NSM',
-65025=>'NSM',
-65026=>'NSM',
-65027=>'NSM',
-65028=>'NSM',
-65029=>'NSM',
-65030=>'NSM',
-65031=>'NSM',
-65032=>'NSM',
-65033=>'NSM',
-65034=>'NSM',
-65035=>'NSM',
-65036=>'NSM',
-65037=>'NSM',
-65038=>'NSM',
-65039=>'NSM',
-65040=>'ON',
-65041=>'ON',
-65042=>'ON',
-65043=>'ON',
-65044=>'ON',
-65045=>'ON',
-65046=>'ON',
-65047=>'ON',
-65048=>'ON',
-65049=>'ON',
-65056=>'NSM',
-65057=>'NSM',
-65058=>'NSM',
-65059=>'NSM',
-65072=>'ON',
-65073=>'ON',
-65074=>'ON',
-65075=>'ON',
-65076=>'ON',
-65077=>'ON',
-65078=>'ON',
-65079=>'ON',
-65080=>'ON',
-65081=>'ON',
-65082=>'ON',
-65083=>'ON',
-65084=>'ON',
-65085=>'ON',
-65086=>'ON',
-65087=>'ON',
-65088=>'ON',
-65089=>'ON',
-65090=>'ON',
-65091=>'ON',
-65092=>'ON',
-65093=>'ON',
-65094=>'ON',
-65095=>'ON',
-65096=>'ON',
-65097=>'ON',
-65098=>'ON',
-65099=>'ON',
-65100=>'ON',
-65101=>'ON',
-65102=>'ON',
-65103=>'ON',
-65104=>'CS',
-65105=>'ON',
-65106=>'CS',
-65108=>'ON',
-65109=>'CS',
-65110=>'ON',
-65111=>'ON',
-65112=>'ON',
-65113=>'ON',
-65114=>'ON',
-65115=>'ON',
-65116=>'ON',
-65117=>'ON',
-65118=>'ON',
-65119=>'ET',
-65120=>'ON',
-65121=>'ON',
-65122=>'ES',
-65123=>'ES',
-65124=>'ON',
-65125=>'ON',
-65126=>'ON',
-65128=>'ON',
-65129=>'ET',
-65130=>'ET',
-65131=>'ON',
-65136=>'AL',
-65137=>'AL',
-65138=>'AL',
-65139=>'AL',
-65140=>'AL',
-65142=>'AL',
-65143=>'AL',
-65144=>'AL',
-65145=>'AL',
-65146=>'AL',
-65147=>'AL',
-65148=>'AL',
-65149=>'AL',
-65150=>'AL',
-65151=>'AL',
-65152=>'AL',
-65153=>'AL',
-65154=>'AL',
-65155=>'AL',
-65156=>'AL',
-65157=>'AL',
-65158=>'AL',
-65159=>'AL',
-65160=>'AL',
-65161=>'AL',
-65162=>'AL',
-65163=>'AL',
-65164=>'AL',
-65165=>'AL',
-65166=>'AL',
-65167=>'AL',
-65168=>'AL',
-65169=>'AL',
-65170=>'AL',
-65171=>'AL',
-65172=>'AL',
-65173=>'AL',
-65174=>'AL',
-65175=>'AL',
-65176=>'AL',
-65177=>'AL',
-65178=>'AL',
-65179=>'AL',
-65180=>'AL',
-65181=>'AL',
-65182=>'AL',
-65183=>'AL',
-65184=>'AL',
-65185=>'AL',
-65186=>'AL',
-65187=>'AL',
-65188=>'AL',
-65189=>'AL',
-65190=>'AL',
-65191=>'AL',
-65192=>'AL',
-65193=>'AL',
-65194=>'AL',
-65195=>'AL',
-65196=>'AL',
-65197=>'AL',
-65198=>'AL',
-65199=>'AL',
-65200=>'AL',
-65201=>'AL',
-65202=>'AL',
-65203=>'AL',
-65204=>'AL',
-65205=>'AL',
-65206=>'AL',
-65207=>'AL',
-65208=>'AL',
-65209=>'AL',
-65210=>'AL',
-65211=>'AL',
-65212=>'AL',
-65213=>'AL',
-65214=>'AL',
-65215=>'AL',
-65216=>'AL',
-65217=>'AL',
-65218=>'AL',
-65219=>'AL',
-65220=>'AL',
-65221=>'AL',
-65222=>'AL',
-65223=>'AL',
-65224=>'AL',
-65225=>'AL',
-65226=>'AL',
-65227=>'AL',
-65228=>'AL',
-65229=>'AL',
-65230=>'AL',
-65231=>'AL',
-65232=>'AL',
-65233=>'AL',
-65234=>'AL',
-65235=>'AL',
-65236=>'AL',
-65237=>'AL',
-65238=>'AL',
-65239=>'AL',
-65240=>'AL',
-65241=>'AL',
-65242=>'AL',
-65243=>'AL',
-65244=>'AL',
-65245=>'AL',
-65246=>'AL',
-65247=>'AL',
-65248=>'AL',
-65249=>'AL',
-65250=>'AL',
-65251=>'AL',
-65252=>'AL',
-65253=>'AL',
-65254=>'AL',
-65255=>'AL',
-65256=>'AL',
-65257=>'AL',
-65258=>'AL',
-65259=>'AL',
-65260=>'AL',
-65261=>'AL',
-65262=>'AL',
-65263=>'AL',
-65264=>'AL',
-65265=>'AL',
-65266=>'AL',
-65267=>'AL',
-65268=>'AL',
-65269=>'AL',
-65270=>'AL',
-65271=>'AL',
-65272=>'AL',
-65273=>'AL',
-65274=>'AL',
-65275=>'AL',
-65276=>'AL',
-65279=>'BN',
-65281=>'ON',
-65282=>'ON',
-65283=>'ET',
-65284=>'ET',
-65285=>'ET',
-65286=>'ON',
-65287=>'ON',
-65288=>'ON',
-65289=>'ON',
-65290=>'ON',
-65291=>'ES',
-65292=>'CS',
-65293=>'ES',
-65294=>'CS',
-65295=>'CS',
-65296=>'EN',
-65297=>'EN',
-65298=>'EN',
-65299=>'EN',
-65300=>'EN',
-65301=>'EN',
-65302=>'EN',
-65303=>'EN',
-65304=>'EN',
-65305=>'EN',
-65306=>'CS',
-65307=>'ON',
-65308=>'ON',
-65309=>'ON',
-65310=>'ON',
-65311=>'ON',
-65312=>'ON',
-65313=>'L',
-65314=>'L',
-65315=>'L',
-65316=>'L',
-65317=>'L',
-65318=>'L',
-65319=>'L',
-65320=>'L',
-65321=>'L',
-65322=>'L',
-65323=>'L',
-65324=>'L',
-65325=>'L',
-65326=>'L',
-65327=>'L',
-65328=>'L',
-65329=>'L',
-65330=>'L',
-65331=>'L',
-65332=>'L',
-65333=>'L',
-65334=>'L',
-65335=>'L',
-65336=>'L',
-65337=>'L',
-65338=>'L',
-65339=>'ON',
-65340=>'ON',
-65341=>'ON',
-65342=>'ON',
-65343=>'ON',
-65344=>'ON',
-65345=>'L',
-65346=>'L',
-65347=>'L',
-65348=>'L',
-65349=>'L',
-65350=>'L',
-65351=>'L',
-65352=>'L',
-65353=>'L',
-65354=>'L',
-65355=>'L',
-65356=>'L',
-65357=>'L',
-65358=>'L',
-65359=>'L',
-65360=>'L',
-65361=>'L',
-65362=>'L',
-65363=>'L',
-65364=>'L',
-65365=>'L',
-65366=>'L',
-65367=>'L',
-65368=>'L',
-65369=>'L',
-65370=>'L',
-65371=>'ON',
-65372=>'ON',
-65373=>'ON',
-65374=>'ON',
-65375=>'ON',
-65376=>'ON',
-65377=>'ON',
-65378=>'ON',
-65379=>'ON',
-65380=>'ON',
-65381=>'ON',
-65382=>'L',
-65383=>'L',
-65384=>'L',
-65385=>'L',
-65386=>'L',
-65387=>'L',
-65388=>'L',
-65389=>'L',
-65390=>'L',
-65391=>'L',
-65392=>'L',
-65393=>'L',
-65394=>'L',
-65395=>'L',
-65396=>'L',
-65397=>'L',
-65398=>'L',
-65399=>'L',
-65400=>'L',
-65401=>'L',
-65402=>'L',
-65403=>'L',
-65404=>'L',
-65405=>'L',
-65406=>'L',
-65407=>'L',
-65408=>'L',
-65409=>'L',
-65410=>'L',
-65411=>'L',
-65412=>'L',
-65413=>'L',
-65414=>'L',
-65415=>'L',
-65416=>'L',
-65417=>'L',
-65418=>'L',
-65419=>'L',
-65420=>'L',
-65421=>'L',
-65422=>'L',
-65423=>'L',
-65424=>'L',
-65425=>'L',
-65426=>'L',
-65427=>'L',
-65428=>'L',
-65429=>'L',
-65430=>'L',
-65431=>'L',
-65432=>'L',
-65433=>'L',
-65434=>'L',
-65435=>'L',
-65436=>'L',
-65437=>'L',
-65438=>'L',
-65439=>'L',
-65440=>'L',
-65441=>'L',
-65442=>'L',
-65443=>'L',
-65444=>'L',
-65445=>'L',
-65446=>'L',
-65447=>'L',
-65448=>'L',
-65449=>'L',
-65450=>'L',
-65451=>'L',
-65452=>'L',
-65453=>'L',
-65454=>'L',
-65455=>'L',
-65456=>'L',
-65457=>'L',
-65458=>'L',
-65459=>'L',
-65460=>'L',
-65461=>'L',
-65462=>'L',
-65463=>'L',
-65464=>'L',
-65465=>'L',
-65466=>'L',
-65467=>'L',
-65468=>'L',
-65469=>'L',
-65470=>'L',
-65474=>'L',
-65475=>'L',
-65476=>'L',
-65477=>'L',
-65478=>'L',
-65479=>'L',
-65482=>'L',
-65483=>'L',
-65484=>'L',
-65485=>'L',
-65486=>'L',
-65487=>'L',
-65490=>'L',
-65491=>'L',
-65492=>'L',
-65493=>'L',
-65494=>'L',
-65495=>'L',
-65498=>'L',
-65499=>'L',
-65500=>'L',
-65504=>'ET',
-65505=>'ET',
-65506=>'ON',
-65507=>'ON',
-65508=>'ON',
-65509=>'ET',
-65510=>'ET',
-65512=>'ON',
-65513=>'ON',
-65514=>'ON',
-65515=>'ON',
-65516=>'ON',
-65517=>'ON',
-65518=>'ON',
-65529=>'ON',
-65530=>'ON',
-65531=>'ON',
-65532=>'ON',
-65533=>'ON',
-65536=>'L',
-65537=>'L',
-65538=>'L',
-65539=>'L',
-65540=>'L',
-65541=>'L',
-65542=>'L',
-65543=>'L',
-65544=>'L',
-65545=>'L',
-65546=>'L',
-65547=>'L',
-65549=>'L',
-65550=>'L',
-65551=>'L',
-65552=>'L',
-65553=>'L',
-65554=>'L',
-65555=>'L',
-65556=>'L',
-65557=>'L',
-65558=>'L',
-65559=>'L',
-65560=>'L',
-65561=>'L',
-65562=>'L',
-65563=>'L',
-65564=>'L',
-65565=>'L',
-65566=>'L',
-65567=>'L',
-65568=>'L',
-65569=>'L',
-65570=>'L',
-65571=>'L',
-65572=>'L',
-65573=>'L',
-65574=>'L',
-65576=>'L',
-65577=>'L',
-65578=>'L',
-65579=>'L',
-65580=>'L',
-65581=>'L',
-65582=>'L',
-65583=>'L',
-65584=>'L',
-65585=>'L',
-65586=>'L',
-65587=>'L',
-65588=>'L',
-65589=>'L',
-65590=>'L',
-65591=>'L',
-65592=>'L',
-65593=>'L',
-65594=>'L',
-65596=>'L',
-65597=>'L',
-65599=>'L',
-65600=>'L',
-65601=>'L',
-65602=>'L',
-65603=>'L',
-65604=>'L',
-65605=>'L',
-65606=>'L',
-65607=>'L',
-65608=>'L',
-65609=>'L',
-65610=>'L',
-65611=>'L',
-65612=>'L',
-65613=>'L',
-65616=>'L',
-65617=>'L',
-65618=>'L',
-65619=>'L',
-65620=>'L',
-65621=>'L',
-65622=>'L',
-65623=>'L',
-65624=>'L',
-65625=>'L',
-65626=>'L',
-65627=>'L',
-65628=>'L',
-65629=>'L',
-65664=>'L',
-65665=>'L',
-65666=>'L',
-65667=>'L',
-65668=>'L',
-65669=>'L',
-65670=>'L',
-65671=>'L',
-65672=>'L',
-65673=>'L',
-65674=>'L',
-65675=>'L',
-65676=>'L',
-65677=>'L',
-65678=>'L',
-65679=>'L',
-65680=>'L',
-65681=>'L',
-65682=>'L',
-65683=>'L',
-65684=>'L',
-65685=>'L',
-65686=>'L',
-65687=>'L',
-65688=>'L',
-65689=>'L',
-65690=>'L',
-65691=>'L',
-65692=>'L',
-65693=>'L',
-65694=>'L',
-65695=>'L',
-65696=>'L',
-65697=>'L',
-65698=>'L',
-65699=>'L',
-65700=>'L',
-65701=>'L',
-65702=>'L',
-65703=>'L',
-65704=>'L',
-65705=>'L',
-65706=>'L',
-65707=>'L',
-65708=>'L',
-65709=>'L',
-65710=>'L',
-65711=>'L',
-65712=>'L',
-65713=>'L',
-65714=>'L',
-65715=>'L',
-65716=>'L',
-65717=>'L',
-65718=>'L',
-65719=>'L',
-65720=>'L',
-65721=>'L',
-65722=>'L',
-65723=>'L',
-65724=>'L',
-65725=>'L',
-65726=>'L',
-65727=>'L',
-65728=>'L',
-65729=>'L',
-65730=>'L',
-65731=>'L',
-65732=>'L',
-65733=>'L',
-65734=>'L',
-65735=>'L',
-65736=>'L',
-65737=>'L',
-65738=>'L',
-65739=>'L',
-65740=>'L',
-65741=>'L',
-65742=>'L',
-65743=>'L',
-65744=>'L',
-65745=>'L',
-65746=>'L',
-65747=>'L',
-65748=>'L',
-65749=>'L',
-65750=>'L',
-65751=>'L',
-65752=>'L',
-65753=>'L',
-65754=>'L',
-65755=>'L',
-65756=>'L',
-65757=>'L',
-65758=>'L',
-65759=>'L',
-65760=>'L',
-65761=>'L',
-65762=>'L',
-65763=>'L',
-65764=>'L',
-65765=>'L',
-65766=>'L',
-65767=>'L',
-65768=>'L',
-65769=>'L',
-65770=>'L',
-65771=>'L',
-65772=>'L',
-65773=>'L',
-65774=>'L',
-65775=>'L',
-65776=>'L',
-65777=>'L',
-65778=>'L',
-65779=>'L',
-65780=>'L',
-65781=>'L',
-65782=>'L',
-65783=>'L',
-65784=>'L',
-65785=>'L',
-65786=>'L',
-65792=>'L',
-65793=>'ON',
-65794=>'L',
-65799=>'L',
-65800=>'L',
-65801=>'L',
-65802=>'L',
-65803=>'L',
-65804=>'L',
-65805=>'L',
-65806=>'L',
-65807=>'L',
-65808=>'L',
-65809=>'L',
-65810=>'L',
-65811=>'L',
-65812=>'L',
-65813=>'L',
-65814=>'L',
-65815=>'L',
-65816=>'L',
-65817=>'L',
-65818=>'L',
-65819=>'L',
-65820=>'L',
-65821=>'L',
-65822=>'L',
-65823=>'L',
-65824=>'L',
-65825=>'L',
-65826=>'L',
-65827=>'L',
-65828=>'L',
-65829=>'L',
-65830=>'L',
-65831=>'L',
-65832=>'L',
-65833=>'L',
-65834=>'L',
-65835=>'L',
-65836=>'L',
-65837=>'L',
-65838=>'L',
-65839=>'L',
-65840=>'L',
-65841=>'L',
-65842=>'L',
-65843=>'L',
-65847=>'L',
-65848=>'L',
-65849=>'L',
-65850=>'L',
-65851=>'L',
-65852=>'L',
-65853=>'L',
-65854=>'L',
-65855=>'L',
-65856=>'ON',
-65857=>'ON',
-65858=>'ON',
-65859=>'ON',
-65860=>'ON',
-65861=>'ON',
-65862=>'ON',
-65863=>'ON',
-65864=>'ON',
-65865=>'ON',
-65866=>'ON',
-65867=>'ON',
-65868=>'ON',
-65869=>'ON',
-65870=>'ON',
-65871=>'ON',
-65872=>'ON',
-65873=>'ON',
-65874=>'ON',
-65875=>'ON',
-65876=>'ON',
-65877=>'ON',
-65878=>'ON',
-65879=>'ON',
-65880=>'ON',
-65881=>'ON',
-65882=>'ON',
-65883=>'ON',
-65884=>'ON',
-65885=>'ON',
-65886=>'ON',
-65887=>'ON',
-65888=>'ON',
-65889=>'ON',
-65890=>'ON',
-65891=>'ON',
-65892=>'ON',
-65893=>'ON',
-65894=>'ON',
-65895=>'ON',
-65896=>'ON',
-65897=>'ON',
-65898=>'ON',
-65899=>'ON',
-65900=>'ON',
-65901=>'ON',
-65902=>'ON',
-65903=>'ON',
-65904=>'ON',
-65905=>'ON',
-65906=>'ON',
-65907=>'ON',
-65908=>'ON',
-65909=>'ON',
-65910=>'ON',
-65911=>'ON',
-65912=>'ON',
-65913=>'ON',
-65914=>'ON',
-65915=>'ON',
-65916=>'ON',
-65917=>'ON',
-65918=>'ON',
-65919=>'ON',
-65920=>'ON',
-65921=>'ON',
-65922=>'ON',
-65923=>'ON',
-65924=>'ON',
-65925=>'ON',
-65926=>'ON',
-65927=>'ON',
-65928=>'ON',
-65929=>'ON',
-65930=>'ON',
-66304=>'L',
-66305=>'L',
-66306=>'L',
-66307=>'L',
-66308=>'L',
-66309=>'L',
-66310=>'L',
-66311=>'L',
-66312=>'L',
-66313=>'L',
-66314=>'L',
-66315=>'L',
-66316=>'L',
-66317=>'L',
-66318=>'L',
-66319=>'L',
-66320=>'L',
-66321=>'L',
-66322=>'L',
-66323=>'L',
-66324=>'L',
-66325=>'L',
-66326=>'L',
-66327=>'L',
-66328=>'L',
-66329=>'L',
-66330=>'L',
-66331=>'L',
-66332=>'L',
-66333=>'L',
-66334=>'L',
-66336=>'L',
-66337=>'L',
-66338=>'L',
-66339=>'L',
-66352=>'L',
-66353=>'L',
-66354=>'L',
-66355=>'L',
-66356=>'L',
-66357=>'L',
-66358=>'L',
-66359=>'L',
-66360=>'L',
-66361=>'L',
-66362=>'L',
-66363=>'L',
-66364=>'L',
-66365=>'L',
-66366=>'L',
-66367=>'L',
-66368=>'L',
-66369=>'L',
-66370=>'L',
-66371=>'L',
-66372=>'L',
-66373=>'L',
-66374=>'L',
-66375=>'L',
-66376=>'L',
-66377=>'L',
-66378=>'L',
-66432=>'L',
-66433=>'L',
-66434=>'L',
-66435=>'L',
-66436=>'L',
-66437=>'L',
-66438=>'L',
-66439=>'L',
-66440=>'L',
-66441=>'L',
-66442=>'L',
-66443=>'L',
-66444=>'L',
-66445=>'L',
-66446=>'L',
-66447=>'L',
-66448=>'L',
-66449=>'L',
-66450=>'L',
-66451=>'L',
-66452=>'L',
-66453=>'L',
-66454=>'L',
-66455=>'L',
-66456=>'L',
-66457=>'L',
-66458=>'L',
-66459=>'L',
-66460=>'L',
-66461=>'L',
-66463=>'L',
-66464=>'L',
-66465=>'L',
-66466=>'L',
-66467=>'L',
-66468=>'L',
-66469=>'L',
-66470=>'L',
-66471=>'L',
-66472=>'L',
-66473=>'L',
-66474=>'L',
-66475=>'L',
-66476=>'L',
-66477=>'L',
-66478=>'L',
-66479=>'L',
-66480=>'L',
-66481=>'L',
-66482=>'L',
-66483=>'L',
-66484=>'L',
-66485=>'L',
-66486=>'L',
-66487=>'L',
-66488=>'L',
-66489=>'L',
-66490=>'L',
-66491=>'L',
-66492=>'L',
-66493=>'L',
-66494=>'L',
-66495=>'L',
-66496=>'L',
-66497=>'L',
-66498=>'L',
-66499=>'L',
-66504=>'L',
-66505=>'L',
-66506=>'L',
-66507=>'L',
-66508=>'L',
-66509=>'L',
-66510=>'L',
-66511=>'L',
-66512=>'L',
-66513=>'L',
-66514=>'L',
-66515=>'L',
-66516=>'L',
-66517=>'L',
-66560=>'L',
-66561=>'L',
-66562=>'L',
-66563=>'L',
-66564=>'L',
-66565=>'L',
-66566=>'L',
-66567=>'L',
-66568=>'L',
-66569=>'L',
-66570=>'L',
-66571=>'L',
-66572=>'L',
-66573=>'L',
-66574=>'L',
-66575=>'L',
-66576=>'L',
-66577=>'L',
-66578=>'L',
-66579=>'L',
-66580=>'L',
-66581=>'L',
-66582=>'L',
-66583=>'L',
-66584=>'L',
-66585=>'L',
-66586=>'L',
-66587=>'L',
-66588=>'L',
-66589=>'L',
-66590=>'L',
-66591=>'L',
-66592=>'L',
-66593=>'L',
-66594=>'L',
-66595=>'L',
-66596=>'L',
-66597=>'L',
-66598=>'L',
-66599=>'L',
-66600=>'L',
-66601=>'L',
-66602=>'L',
-66603=>'L',
-66604=>'L',
-66605=>'L',
-66606=>'L',
-66607=>'L',
-66608=>'L',
-66609=>'L',
-66610=>'L',
-66611=>'L',
-66612=>'L',
-66613=>'L',
-66614=>'L',
-66615=>'L',
-66616=>'L',
-66617=>'L',
-66618=>'L',
-66619=>'L',
-66620=>'L',
-66621=>'L',
-66622=>'L',
-66623=>'L',
-66624=>'L',
-66625=>'L',
-66626=>'L',
-66627=>'L',
-66628=>'L',
-66629=>'L',
-66630=>'L',
-66631=>'L',
-66632=>'L',
-66633=>'L',
-66634=>'L',
-66635=>'L',
-66636=>'L',
-66637=>'L',
-66638=>'L',
-66639=>'L',
-66640=>'L',
-66641=>'L',
-66642=>'L',
-66643=>'L',
-66644=>'L',
-66645=>'L',
-66646=>'L',
-66647=>'L',
-66648=>'L',
-66649=>'L',
-66650=>'L',
-66651=>'L',
-66652=>'L',
-66653=>'L',
-66654=>'L',
-66655=>'L',
-66656=>'L',
-66657=>'L',
-66658=>'L',
-66659=>'L',
-66660=>'L',
-66661=>'L',
-66662=>'L',
-66663=>'L',
-66664=>'L',
-66665=>'L',
-66666=>'L',
-66667=>'L',
-66668=>'L',
-66669=>'L',
-66670=>'L',
-66671=>'L',
-66672=>'L',
-66673=>'L',
-66674=>'L',
-66675=>'L',
-66676=>'L',
-66677=>'L',
-66678=>'L',
-66679=>'L',
-66680=>'L',
-66681=>'L',
-66682=>'L',
-66683=>'L',
-66684=>'L',
-66685=>'L',
-66686=>'L',
-66687=>'L',
-66688=>'L',
-66689=>'L',
-66690=>'L',
-66691=>'L',
-66692=>'L',
-66693=>'L',
-66694=>'L',
-66695=>'L',
-66696=>'L',
-66697=>'L',
-66698=>'L',
-66699=>'L',
-66700=>'L',
-66701=>'L',
-66702=>'L',
-66703=>'L',
-66704=>'L',
-66705=>'L',
-66706=>'L',
-66707=>'L',
-66708=>'L',
-66709=>'L',
-66710=>'L',
-66711=>'L',
-66712=>'L',
-66713=>'L',
-66714=>'L',
-66715=>'L',
-66716=>'L',
-66717=>'L',
-66720=>'L',
-66721=>'L',
-66722=>'L',
-66723=>'L',
-66724=>'L',
-66725=>'L',
-66726=>'L',
-66727=>'L',
-66728=>'L',
-66729=>'L',
-67584=>'R',
-67585=>'R',
-67586=>'R',
-67587=>'R',
-67588=>'R',
-67589=>'R',
-67592=>'R',
-67594=>'R',
-67595=>'R',
-67596=>'R',
-67597=>'R',
-67598=>'R',
-67599=>'R',
-67600=>'R',
-67601=>'R',
-67602=>'R',
-67603=>'R',
-67604=>'R',
-67605=>'R',
-67606=>'R',
-67607=>'R',
-67608=>'R',
-67609=>'R',
-67610=>'R',
-67611=>'R',
-67612=>'R',
-67613=>'R',
-67614=>'R',
-67615=>'R',
-67616=>'R',
-67617=>'R',
-67618=>'R',
-67619=>'R',
-67620=>'R',
-67621=>'R',
-67622=>'R',
-67623=>'R',
-67624=>'R',
-67625=>'R',
-67626=>'R',
-67627=>'R',
-67628=>'R',
-67629=>'R',
-67630=>'R',
-67631=>'R',
-67632=>'R',
-67633=>'R',
-67634=>'R',
-67635=>'R',
-67636=>'R',
-67637=>'R',
-67639=>'R',
-67640=>'R',
-67644=>'R',
-67647=>'R',
-67840=>'R',
-67841=>'R',
-67842=>'R',
-67843=>'R',
-67844=>'R',
-67845=>'R',
-67846=>'R',
-67847=>'R',
-67848=>'R',
-67849=>'R',
-67850=>'R',
-67851=>'R',
-67852=>'R',
-67853=>'R',
-67854=>'R',
-67855=>'R',
-67856=>'R',
-67857=>'R',
-67858=>'R',
-67859=>'R',
-67860=>'R',
-67861=>'R',
-67862=>'R',
-67863=>'R',
-67864=>'R',
-67865=>'R',
-67871=>'ON',
-68096=>'R',
-68097=>'NSM',
-68098=>'NSM',
-68099=>'NSM',
-68101=>'NSM',
-68102=>'NSM',
-68108=>'NSM',
-68109=>'NSM',
-68110=>'NSM',
-68111=>'NSM',
-68112=>'R',
-68113=>'R',
-68114=>'R',
-68115=>'R',
-68117=>'R',
-68118=>'R',
-68119=>'R',
-68121=>'R',
-68122=>'R',
-68123=>'R',
-68124=>'R',
-68125=>'R',
-68126=>'R',
-68127=>'R',
-68128=>'R',
-68129=>'R',
-68130=>'R',
-68131=>'R',
-68132=>'R',
-68133=>'R',
-68134=>'R',
-68135=>'R',
-68136=>'R',
-68137=>'R',
-68138=>'R',
-68139=>'R',
-68140=>'R',
-68141=>'R',
-68142=>'R',
-68143=>'R',
-68144=>'R',
-68145=>'R',
-68146=>'R',
-68147=>'R',
-68152=>'NSM',
-68153=>'NSM',
-68154=>'NSM',
-68159=>'NSM',
-68160=>'R',
-68161=>'R',
-68162=>'R',
-68163=>'R',
-68164=>'R',
-68165=>'R',
-68166=>'R',
-68167=>'R',
-68176=>'R',
-68177=>'R',
-68178=>'R',
-68179=>'R',
-68180=>'R',
-68181=>'R',
-68182=>'R',
-68183=>'R',
-68184=>'R',
-73728=>'L',
-73729=>'L',
-73730=>'L',
-73731=>'L',
-73732=>'L',
-73733=>'L',
-73734=>'L',
-73735=>'L',
-73736=>'L',
-73737=>'L',
-73738=>'L',
-73739=>'L',
-73740=>'L',
-73741=>'L',
-73742=>'L',
-73743=>'L',
-73744=>'L',
-73745=>'L',
-73746=>'L',
-73747=>'L',
-73748=>'L',
-73749=>'L',
-73750=>'L',
-73751=>'L',
-73752=>'L',
-73753=>'L',
-73754=>'L',
-73755=>'L',
-73756=>'L',
-73757=>'L',
-73758=>'L',
-73759=>'L',
-73760=>'L',
-73761=>'L',
-73762=>'L',
-73763=>'L',
-73764=>'L',
-73765=>'L',
-73766=>'L',
-73767=>'L',
-73768=>'L',
-73769=>'L',
-73770=>'L',
-73771=>'L',
-73772=>'L',
-73773=>'L',
-73774=>'L',
-73775=>'L',
-73776=>'L',
-73777=>'L',
-73778=>'L',
-73779=>'L',
-73780=>'L',
-73781=>'L',
-73782=>'L',
-73783=>'L',
-73784=>'L',
-73785=>'L',
-73786=>'L',
-73787=>'L',
-73788=>'L',
-73789=>'L',
-73790=>'L',
-73791=>'L',
-73792=>'L',
-73793=>'L',
-73794=>'L',
-73795=>'L',
-73796=>'L',
-73797=>'L',
-73798=>'L',
-73799=>'L',
-73800=>'L',
-73801=>'L',
-73802=>'L',
-73803=>'L',
-73804=>'L',
-73805=>'L',
-73806=>'L',
-73807=>'L',
-73808=>'L',
-73809=>'L',
-73810=>'L',
-73811=>'L',
-73812=>'L',
-73813=>'L',
-73814=>'L',
-73815=>'L',
-73816=>'L',
-73817=>'L',
-73818=>'L',
-73819=>'L',
-73820=>'L',
-73821=>'L',
-73822=>'L',
-73823=>'L',
-73824=>'L',
-73825=>'L',
-73826=>'L',
-73827=>'L',
-73828=>'L',
-73829=>'L',
-73830=>'L',
-73831=>'L',
-73832=>'L',
-73833=>'L',
-73834=>'L',
-73835=>'L',
-73836=>'L',
-73837=>'L',
-73838=>'L',
-73839=>'L',
-73840=>'L',
-73841=>'L',
-73842=>'L',
-73843=>'L',
-73844=>'L',
-73845=>'L',
-73846=>'L',
-73847=>'L',
-73848=>'L',
-73849=>'L',
-73850=>'L',
-73851=>'L',
-73852=>'L',
-73853=>'L',
-73854=>'L',
-73855=>'L',
-73856=>'L',
-73857=>'L',
-73858=>'L',
-73859=>'L',
-73860=>'L',
-73861=>'L',
-73862=>'L',
-73863=>'L',
-73864=>'L',
-73865=>'L',
-73866=>'L',
-73867=>'L',
-73868=>'L',
-73869=>'L',
-73870=>'L',
-73871=>'L',
-73872=>'L',
-73873=>'L',
-73874=>'L',
-73875=>'L',
-73876=>'L',
-73877=>'L',
-73878=>'L',
-73879=>'L',
-73880=>'L',
-73881=>'L',
-73882=>'L',
-73883=>'L',
-73884=>'L',
-73885=>'L',
-73886=>'L',
-73887=>'L',
-73888=>'L',
-73889=>'L',
-73890=>'L',
-73891=>'L',
-73892=>'L',
-73893=>'L',
-73894=>'L',
-73895=>'L',
-73896=>'L',
-73897=>'L',
-73898=>'L',
-73899=>'L',
-73900=>'L',
-73901=>'L',
-73902=>'L',
-73903=>'L',
-73904=>'L',
-73905=>'L',
-73906=>'L',
-73907=>'L',
-73908=>'L',
-73909=>'L',
-73910=>'L',
-73911=>'L',
-73912=>'L',
-73913=>'L',
-73914=>'L',
-73915=>'L',
-73916=>'L',
-73917=>'L',
-73918=>'L',
-73919=>'L',
-73920=>'L',
-73921=>'L',
-73922=>'L',
-73923=>'L',
-73924=>'L',
-73925=>'L',
-73926=>'L',
-73927=>'L',
-73928=>'L',
-73929=>'L',
-73930=>'L',
-73931=>'L',
-73932=>'L',
-73933=>'L',
-73934=>'L',
-73935=>'L',
-73936=>'L',
-73937=>'L',
-73938=>'L',
-73939=>'L',
-73940=>'L',
-73941=>'L',
-73942=>'L',
-73943=>'L',
-73944=>'L',
-73945=>'L',
-73946=>'L',
-73947=>'L',
-73948=>'L',
-73949=>'L',
-73950=>'L',
-73951=>'L',
-73952=>'L',
-73953=>'L',
-73954=>'L',
-73955=>'L',
-73956=>'L',
-73957=>'L',
-73958=>'L',
-73959=>'L',
-73960=>'L',
-73961=>'L',
-73962=>'L',
-73963=>'L',
-73964=>'L',
-73965=>'L',
-73966=>'L',
-73967=>'L',
-73968=>'L',
-73969=>'L',
-73970=>'L',
-73971=>'L',
-73972=>'L',
-73973=>'L',
-73974=>'L',
-73975=>'L',
-73976=>'L',
-73977=>'L',
-73978=>'L',
-73979=>'L',
-73980=>'L',
-73981=>'L',
-73982=>'L',
-73983=>'L',
-73984=>'L',
-73985=>'L',
-73986=>'L',
-73987=>'L',
-73988=>'L',
-73989=>'L',
-73990=>'L',
-73991=>'L',
-73992=>'L',
-73993=>'L',
-73994=>'L',
-73995=>'L',
-73996=>'L',
-73997=>'L',
-73998=>'L',
-73999=>'L',
-74000=>'L',
-74001=>'L',
-74002=>'L',
-74003=>'L',
-74004=>'L',
-74005=>'L',
-74006=>'L',
-74007=>'L',
-74008=>'L',
-74009=>'L',
-74010=>'L',
-74011=>'L',
-74012=>'L',
-74013=>'L',
-74014=>'L',
-74015=>'L',
-74016=>'L',
-74017=>'L',
-74018=>'L',
-74019=>'L',
-74020=>'L',
-74021=>'L',
-74022=>'L',
-74023=>'L',
-74024=>'L',
-74025=>'L',
-74026=>'L',
-74027=>'L',
-74028=>'L',
-74029=>'L',
-74030=>'L',
-74031=>'L',
-74032=>'L',
-74033=>'L',
-74034=>'L',
-74035=>'L',
-74036=>'L',
-74037=>'L',
-74038=>'L',
-74039=>'L',
-74040=>'L',
-74041=>'L',
-74042=>'L',
-74043=>'L',
-74044=>'L',
-74045=>'L',
-74046=>'L',
-74047=>'L',
-74048=>'L',
-74049=>'L',
-74050=>'L',
-74051=>'L',
-74052=>'L',
-74053=>'L',
-74054=>'L',
-74055=>'L',
-74056=>'L',
-74057=>'L',
-74058=>'L',
-74059=>'L',
-74060=>'L',
-74061=>'L',
-74062=>'L',
-74063=>'L',
-74064=>'L',
-74065=>'L',
-74066=>'L',
-74067=>'L',
-74068=>'L',
-74069=>'L',
-74070=>'L',
-74071=>'L',
-74072=>'L',
-74073=>'L',
-74074=>'L',
-74075=>'L',
-74076=>'L',
-74077=>'L',
-74078=>'L',
-74079=>'L',
-74080=>'L',
-74081=>'L',
-74082=>'L',
-74083=>'L',
-74084=>'L',
-74085=>'L',
-74086=>'L',
-74087=>'L',
-74088=>'L',
-74089=>'L',
-74090=>'L',
-74091=>'L',
-74092=>'L',
-74093=>'L',
-74094=>'L',
-74095=>'L',
-74096=>'L',
-74097=>'L',
-74098=>'L',
-74099=>'L',
-74100=>'L',
-74101=>'L',
-74102=>'L',
-74103=>'L',
-74104=>'L',
-74105=>'L',
-74106=>'L',
-74107=>'L',
-74108=>'L',
-74109=>'L',
-74110=>'L',
-74111=>'L',
-74112=>'L',
-74113=>'L',
-74114=>'L',
-74115=>'L',
-74116=>'L',
-74117=>'L',
-74118=>'L',
-74119=>'L',
-74120=>'L',
-74121=>'L',
-74122=>'L',
-74123=>'L',
-74124=>'L',
-74125=>'L',
-74126=>'L',
-74127=>'L',
-74128=>'L',
-74129=>'L',
-74130=>'L',
-74131=>'L',
-74132=>'L',
-74133=>'L',
-74134=>'L',
-74135=>'L',
-74136=>'L',
-74137=>'L',
-74138=>'L',
-74139=>'L',
-74140=>'L',
-74141=>'L',
-74142=>'L',
-74143=>'L',
-74144=>'L',
-74145=>'L',
-74146=>'L',
-74147=>'L',
-74148=>'L',
-74149=>'L',
-74150=>'L',
-74151=>'L',
-74152=>'L',
-74153=>'L',
-74154=>'L',
-74155=>'L',
-74156=>'L',
-74157=>'L',
-74158=>'L',
-74159=>'L',
-74160=>'L',
-74161=>'L',
-74162=>'L',
-74163=>'L',
-74164=>'L',
-74165=>'L',
-74166=>'L',
-74167=>'L',
-74168=>'L',
-74169=>'L',
-74170=>'L',
-74171=>'L',
-74172=>'L',
-74173=>'L',
-74174=>'L',
-74175=>'L',
-74176=>'L',
-74177=>'L',
-74178=>'L',
-74179=>'L',
-74180=>'L',
-74181=>'L',
-74182=>'L',
-74183=>'L',
-74184=>'L',
-74185=>'L',
-74186=>'L',
-74187=>'L',
-74188=>'L',
-74189=>'L',
-74190=>'L',
-74191=>'L',
-74192=>'L',
-74193=>'L',
-74194=>'L',
-74195=>'L',
-74196=>'L',
-74197=>'L',
-74198=>'L',
-74199=>'L',
-74200=>'L',
-74201=>'L',
-74202=>'L',
-74203=>'L',
-74204=>'L',
-74205=>'L',
-74206=>'L',
-74207=>'L',
-74208=>'L',
-74209=>'L',
-74210=>'L',
-74211=>'L',
-74212=>'L',
-74213=>'L',
-74214=>'L',
-74215=>'L',
-74216=>'L',
-74217=>'L',
-74218=>'L',
-74219=>'L',
-74220=>'L',
-74221=>'L',
-74222=>'L',
-74223=>'L',
-74224=>'L',
-74225=>'L',
-74226=>'L',
-74227=>'L',
-74228=>'L',
-74229=>'L',
-74230=>'L',
-74231=>'L',
-74232=>'L',
-74233=>'L',
-74234=>'L',
-74235=>'L',
-74236=>'L',
-74237=>'L',
-74238=>'L',
-74239=>'L',
-74240=>'L',
-74241=>'L',
-74242=>'L',
-74243=>'L',
-74244=>'L',
-74245=>'L',
-74246=>'L',
-74247=>'L',
-74248=>'L',
-74249=>'L',
-74250=>'L',
-74251=>'L',
-74252=>'L',
-74253=>'L',
-74254=>'L',
-74255=>'L',
-74256=>'L',
-74257=>'L',
-74258=>'L',
-74259=>'L',
-74260=>'L',
-74261=>'L',
-74262=>'L',
-74263=>'L',
-74264=>'L',
-74265=>'L',
-74266=>'L',
-74267=>'L',
-74268=>'L',
-74269=>'L',
-74270=>'L',
-74271=>'L',
-74272=>'L',
-74273=>'L',
-74274=>'L',
-74275=>'L',
-74276=>'L',
-74277=>'L',
-74278=>'L',
-74279=>'L',
-74280=>'L',
-74281=>'L',
-74282=>'L',
-74283=>'L',
-74284=>'L',
-74285=>'L',
-74286=>'L',
-74287=>'L',
-74288=>'L',
-74289=>'L',
-74290=>'L',
-74291=>'L',
-74292=>'L',
-74293=>'L',
-74294=>'L',
-74295=>'L',
-74296=>'L',
-74297=>'L',
-74298=>'L',
-74299=>'L',
-74300=>'L',
-74301=>'L',
-74302=>'L',
-74303=>'L',
-74304=>'L',
-74305=>'L',
-74306=>'L',
-74307=>'L',
-74308=>'L',
-74309=>'L',
-74310=>'L',
-74311=>'L',
-74312=>'L',
-74313=>'L',
-74314=>'L',
-74315=>'L',
-74316=>'L',
-74317=>'L',
-74318=>'L',
-74319=>'L',
-74320=>'L',
-74321=>'L',
-74322=>'L',
-74323=>'L',
-74324=>'L',
-74325=>'L',
-74326=>'L',
-74327=>'L',
-74328=>'L',
-74329=>'L',
-74330=>'L',
-74331=>'L',
-74332=>'L',
-74333=>'L',
-74334=>'L',
-74335=>'L',
-74336=>'L',
-74337=>'L',
-74338=>'L',
-74339=>'L',
-74340=>'L',
-74341=>'L',
-74342=>'L',
-74343=>'L',
-74344=>'L',
-74345=>'L',
-74346=>'L',
-74347=>'L',
-74348=>'L',
-74349=>'L',
-74350=>'L',
-74351=>'L',
-74352=>'L',
-74353=>'L',
-74354=>'L',
-74355=>'L',
-74356=>'L',
-74357=>'L',
-74358=>'L',
-74359=>'L',
-74360=>'L',
-74361=>'L',
-74362=>'L',
-74363=>'L',
-74364=>'L',
-74365=>'L',
-74366=>'L',
-74367=>'L',
-74368=>'L',
-74369=>'L',
-74370=>'L',
-74371=>'L',
-74372=>'L',
-74373=>'L',
-74374=>'L',
-74375=>'L',
-74376=>'L',
-74377=>'L',
-74378=>'L',
-74379=>'L',
-74380=>'L',
-74381=>'L',
-74382=>'L',
-74383=>'L',
-74384=>'L',
-74385=>'L',
-74386=>'L',
-74387=>'L',
-74388=>'L',
-74389=>'L',
-74390=>'L',
-74391=>'L',
-74392=>'L',
-74393=>'L',
-74394=>'L',
-74395=>'L',
-74396=>'L',
-74397=>'L',
-74398=>'L',
-74399=>'L',
-74400=>'L',
-74401=>'L',
-74402=>'L',
-74403=>'L',
-74404=>'L',
-74405=>'L',
-74406=>'L',
-74407=>'L',
-74408=>'L',
-74409=>'L',
-74410=>'L',
-74411=>'L',
-74412=>'L',
-74413=>'L',
-74414=>'L',
-74415=>'L',
-74416=>'L',
-74417=>'L',
-74418=>'L',
-74419=>'L',
-74420=>'L',
-74421=>'L',
-74422=>'L',
-74423=>'L',
-74424=>'L',
-74425=>'L',
-74426=>'L',
-74427=>'L',
-74428=>'L',
-74429=>'L',
-74430=>'L',
-74431=>'L',
-74432=>'L',
-74433=>'L',
-74434=>'L',
-74435=>'L',
-74436=>'L',
-74437=>'L',
-74438=>'L',
-74439=>'L',
-74440=>'L',
-74441=>'L',
-74442=>'L',
-74443=>'L',
-74444=>'L',
-74445=>'L',
-74446=>'L',
-74447=>'L',
-74448=>'L',
-74449=>'L',
-74450=>'L',
-74451=>'L',
-74452=>'L',
-74453=>'L',
-74454=>'L',
-74455=>'L',
-74456=>'L',
-74457=>'L',
-74458=>'L',
-74459=>'L',
-74460=>'L',
-74461=>'L',
-74462=>'L',
-74463=>'L',
-74464=>'L',
-74465=>'L',
-74466=>'L',
-74467=>'L',
-74468=>'L',
-74469=>'L',
-74470=>'L',
-74471=>'L',
-74472=>'L',
-74473=>'L',
-74474=>'L',
-74475=>'L',
-74476=>'L',
-74477=>'L',
-74478=>'L',
-74479=>'L',
-74480=>'L',
-74481=>'L',
-74482=>'L',
-74483=>'L',
-74484=>'L',
-74485=>'L',
-74486=>'L',
-74487=>'L',
-74488=>'L',
-74489=>'L',
-74490=>'L',
-74491=>'L',
-74492=>'L',
-74493=>'L',
-74494=>'L',
-74495=>'L',
-74496=>'L',
-74497=>'L',
-74498=>'L',
-74499=>'L',
-74500=>'L',
-74501=>'L',
-74502=>'L',
-74503=>'L',
-74504=>'L',
-74505=>'L',
-74506=>'L',
-74507=>'L',
-74508=>'L',
-74509=>'L',
-74510=>'L',
-74511=>'L',
-74512=>'L',
-74513=>'L',
-74514=>'L',
-74515=>'L',
-74516=>'L',
-74517=>'L',
-74518=>'L',
-74519=>'L',
-74520=>'L',
-74521=>'L',
-74522=>'L',
-74523=>'L',
-74524=>'L',
-74525=>'L',
-74526=>'L',
-74527=>'L',
-74528=>'L',
-74529=>'L',
-74530=>'L',
-74531=>'L',
-74532=>'L',
-74533=>'L',
-74534=>'L',
-74535=>'L',
-74536=>'L',
-74537=>'L',
-74538=>'L',
-74539=>'L',
-74540=>'L',
-74541=>'L',
-74542=>'L',
-74543=>'L',
-74544=>'L',
-74545=>'L',
-74546=>'L',
-74547=>'L',
-74548=>'L',
-74549=>'L',
-74550=>'L',
-74551=>'L',
-74552=>'L',
-74553=>'L',
-74554=>'L',
-74555=>'L',
-74556=>'L',
-74557=>'L',
-74558=>'L',
-74559=>'L',
-74560=>'L',
-74561=>'L',
-74562=>'L',
-74563=>'L',
-74564=>'L',
-74565=>'L',
-74566=>'L',
-74567=>'L',
-74568=>'L',
-74569=>'L',
-74570=>'L',
-74571=>'L',
-74572=>'L',
-74573=>'L',
-74574=>'L',
-74575=>'L',
-74576=>'L',
-74577=>'L',
-74578=>'L',
-74579=>'L',
-74580=>'L',
-74581=>'L',
-74582=>'L',
-74583=>'L',
-74584=>'L',
-74585=>'L',
-74586=>'L',
-74587=>'L',
-74588=>'L',
-74589=>'L',
-74590=>'L',
-74591=>'L',
-74592=>'L',
-74593=>'L',
-74594=>'L',
-74595=>'L',
-74596=>'L',
-74597=>'L',
-74598=>'L',
-74599=>'L',
-74600=>'L',
-74601=>'L',
-74602=>'L',
-74603=>'L',
-74604=>'L',
-74605=>'L',
-74606=>'L',
-74752=>'L',
-74753=>'L',
-74754=>'L',
-74755=>'L',
-74756=>'L',
-74757=>'L',
-74758=>'L',
-74759=>'L',
-74760=>'L',
-74761=>'L',
-74762=>'L',
-74763=>'L',
-74764=>'L',
-74765=>'L',
-74766=>'L',
-74767=>'L',
-74768=>'L',
-74769=>'L',
-74770=>'L',
-74771=>'L',
-74772=>'L',
-74773=>'L',
-74774=>'L',
-74775=>'L',
-74776=>'L',
-74777=>'L',
-74778=>'L',
-74779=>'L',
-74780=>'L',
-74781=>'L',
-74782=>'L',
-74783=>'L',
-74784=>'L',
-74785=>'L',
-74786=>'L',
-74787=>'L',
-74788=>'L',
-74789=>'L',
-74790=>'L',
-74791=>'L',
-74792=>'L',
-74793=>'L',
-74794=>'L',
-74795=>'L',
-74796=>'L',
-74797=>'L',
-74798=>'L',
-74799=>'L',
-74800=>'L',
-74801=>'L',
-74802=>'L',
-74803=>'L',
-74804=>'L',
-74805=>'L',
-74806=>'L',
-74807=>'L',
-74808=>'L',
-74809=>'L',
-74810=>'L',
-74811=>'L',
-74812=>'L',
-74813=>'L',
-74814=>'L',
-74815=>'L',
-74816=>'L',
-74817=>'L',
-74818=>'L',
-74819=>'L',
-74820=>'L',
-74821=>'L',
-74822=>'L',
-74823=>'L',
-74824=>'L',
-74825=>'L',
-74826=>'L',
-74827=>'L',
-74828=>'L',
-74829=>'L',
-74830=>'L',
-74831=>'L',
-74832=>'L',
-74833=>'L',
-74834=>'L',
-74835=>'L',
-74836=>'L',
-74837=>'L',
-74838=>'L',
-74839=>'L',
-74840=>'L',
-74841=>'L',
-74842=>'L',
-74843=>'L',
-74844=>'L',
-74845=>'L',
-74846=>'L',
-74847=>'L',
-74848=>'L',
-74849=>'L',
-74850=>'L',
-74864=>'L',
-74865=>'L',
-74866=>'L',
-74867=>'L',
-118784=>'L',
-118785=>'L',
-118786=>'L',
-118787=>'L',
-118788=>'L',
-118789=>'L',
-118790=>'L',
-118791=>'L',
-118792=>'L',
-118793=>'L',
-118794=>'L',
-118795=>'L',
-118796=>'L',
-118797=>'L',
-118798=>'L',
-118799=>'L',
-118800=>'L',
-118801=>'L',
-118802=>'L',
-118803=>'L',
-118804=>'L',
-118805=>'L',
-118806=>'L',
-118807=>'L',
-118808=>'L',
-118809=>'L',
-118810=>'L',
-118811=>'L',
-118812=>'L',
-118813=>'L',
-118814=>'L',
-118815=>'L',
-118816=>'L',
-118817=>'L',
-118818=>'L',
-118819=>'L',
-118820=>'L',
-118821=>'L',
-118822=>'L',
-118823=>'L',
-118824=>'L',
-118825=>'L',
-118826=>'L',
-118827=>'L',
-118828=>'L',
-118829=>'L',
-118830=>'L',
-118831=>'L',
-118832=>'L',
-118833=>'L',
-118834=>'L',
-118835=>'L',
-118836=>'L',
-118837=>'L',
-118838=>'L',
-118839=>'L',
-118840=>'L',
-118841=>'L',
-118842=>'L',
-118843=>'L',
-118844=>'L',
-118845=>'L',
-118846=>'L',
-118847=>'L',
-118848=>'L',
-118849=>'L',
-118850=>'L',
-118851=>'L',
-118852=>'L',
-118853=>'L',
-118854=>'L',
-118855=>'L',
-118856=>'L',
-118857=>'L',
-118858=>'L',
-118859=>'L',
-118860=>'L',
-118861=>'L',
-118862=>'L',
-118863=>'L',
-118864=>'L',
-118865=>'L',
-118866=>'L',
-118867=>'L',
-118868=>'L',
-118869=>'L',
-118870=>'L',
-118871=>'L',
-118872=>'L',
-118873=>'L',
-118874=>'L',
-118875=>'L',
-118876=>'L',
-118877=>'L',
-118878=>'L',
-118879=>'L',
-118880=>'L',
-118881=>'L',
-118882=>'L',
-118883=>'L',
-118884=>'L',
-118885=>'L',
-118886=>'L',
-118887=>'L',
-118888=>'L',
-118889=>'L',
-118890=>'L',
-118891=>'L',
-118892=>'L',
-118893=>'L',
-118894=>'L',
-118895=>'L',
-118896=>'L',
-118897=>'L',
-118898=>'L',
-118899=>'L',
-118900=>'L',
-118901=>'L',
-118902=>'L',
-118903=>'L',
-118904=>'L',
-118905=>'L',
-118906=>'L',
-118907=>'L',
-118908=>'L',
-118909=>'L',
-118910=>'L',
-118911=>'L',
-118912=>'L',
-118913=>'L',
-118914=>'L',
-118915=>'L',
-118916=>'L',
-118917=>'L',
-118918=>'L',
-118919=>'L',
-118920=>'L',
-118921=>'L',
-118922=>'L',
-118923=>'L',
-118924=>'L',
-118925=>'L',
-118926=>'L',
-118927=>'L',
-118928=>'L',
-118929=>'L',
-118930=>'L',
-118931=>'L',
-118932=>'L',
-118933=>'L',
-118934=>'L',
-118935=>'L',
-118936=>'L',
-118937=>'L',
-118938=>'L',
-118939=>'L',
-118940=>'L',
-118941=>'L',
-118942=>'L',
-118943=>'L',
-118944=>'L',
-118945=>'L',
-118946=>'L',
-118947=>'L',
-118948=>'L',
-118949=>'L',
-118950=>'L',
-118951=>'L',
-118952=>'L',
-118953=>'L',
-118954=>'L',
-118955=>'L',
-118956=>'L',
-118957=>'L',
-118958=>'L',
-118959=>'L',
-118960=>'L',
-118961=>'L',
-118962=>'L',
-118963=>'L',
-118964=>'L',
-118965=>'L',
-118966=>'L',
-118967=>'L',
-118968=>'L',
-118969=>'L',
-118970=>'L',
-118971=>'L',
-118972=>'L',
-118973=>'L',
-118974=>'L',
-118975=>'L',
-118976=>'L',
-118977=>'L',
-118978=>'L',
-118979=>'L',
-118980=>'L',
-118981=>'L',
-118982=>'L',
-118983=>'L',
-118984=>'L',
-118985=>'L',
-118986=>'L',
-118987=>'L',
-118988=>'L',
-118989=>'L',
-118990=>'L',
-118991=>'L',
-118992=>'L',
-118993=>'L',
-118994=>'L',
-118995=>'L',
-118996=>'L',
-118997=>'L',
-118998=>'L',
-118999=>'L',
-119000=>'L',
-119001=>'L',
-119002=>'L',
-119003=>'L',
-119004=>'L',
-119005=>'L',
-119006=>'L',
-119007=>'L',
-119008=>'L',
-119009=>'L',
-119010=>'L',
-119011=>'L',
-119012=>'L',
-119013=>'L',
-119014=>'L',
-119015=>'L',
-119016=>'L',
-119017=>'L',
-119018=>'L',
-119019=>'L',
-119020=>'L',
-119021=>'L',
-119022=>'L',
-119023=>'L',
-119024=>'L',
-119025=>'L',
-119026=>'L',
-119027=>'L',
-119028=>'L',
-119029=>'L',
-119040=>'L',
-119041=>'L',
-119042=>'L',
-119043=>'L',
-119044=>'L',
-119045=>'L',
-119046=>'L',
-119047=>'L',
-119048=>'L',
-119049=>'L',
-119050=>'L',
-119051=>'L',
-119052=>'L',
-119053=>'L',
-119054=>'L',
-119055=>'L',
-119056=>'L',
-119057=>'L',
-119058=>'L',
-119059=>'L',
-119060=>'L',
-119061=>'L',
-119062=>'L',
-119063=>'L',
-119064=>'L',
-119065=>'L',
-119066=>'L',
-119067=>'L',
-119068=>'L',
-119069=>'L',
-119070=>'L',
-119071=>'L',
-119072=>'L',
-119073=>'L',
-119074=>'L',
-119075=>'L',
-119076=>'L',
-119077=>'L',
-119078=>'L',
-119082=>'L',
-119083=>'L',
-119084=>'L',
-119085=>'L',
-119086=>'L',
-119087=>'L',
-119088=>'L',
-119089=>'L',
-119090=>'L',
-119091=>'L',
-119092=>'L',
-119093=>'L',
-119094=>'L',
-119095=>'L',
-119096=>'L',
-119097=>'L',
-119098=>'L',
-119099=>'L',
-119100=>'L',
-119101=>'L',
-119102=>'L',
-119103=>'L',
-119104=>'L',
-119105=>'L',
-119106=>'L',
-119107=>'L',
-119108=>'L',
-119109=>'L',
-119110=>'L',
-119111=>'L',
-119112=>'L',
-119113=>'L',
-119114=>'L',
-119115=>'L',
-119116=>'L',
-119117=>'L',
-119118=>'L',
-119119=>'L',
-119120=>'L',
-119121=>'L',
-119122=>'L',
-119123=>'L',
-119124=>'L',
-119125=>'L',
-119126=>'L',
-119127=>'L',
-119128=>'L',
-119129=>'L',
-119130=>'L',
-119131=>'L',
-119132=>'L',
-119133=>'L',
-119134=>'L',
-119135=>'L',
-119136=>'L',
-119137=>'L',
-119138=>'L',
-119139=>'L',
-119140=>'L',
-119141=>'L',
-119142=>'L',
-119143=>'NSM',
-119144=>'NSM',
-119145=>'NSM',
-119146=>'L',
-119147=>'L',
-119148=>'L',
-119149=>'L',
-119150=>'L',
-119151=>'L',
-119152=>'L',
-119153=>'L',
-119154=>'L',
-119155=>'BN',
-119156=>'BN',
-119157=>'BN',
-119158=>'BN',
-119159=>'BN',
-119160=>'BN',
-119161=>'BN',
-119162=>'BN',
-119163=>'NSM',
-119164=>'NSM',
-119165=>'NSM',
-119166=>'NSM',
-119167=>'NSM',
-119168=>'NSM',
-119169=>'NSM',
-119170=>'NSM',
-119171=>'L',
-119172=>'L',
-119173=>'NSM',
-119174=>'NSM',
-119175=>'NSM',
-119176=>'NSM',
-119177=>'NSM',
-119178=>'NSM',
-119179=>'NSM',
-119180=>'L',
-119181=>'L',
-119182=>'L',
-119183=>'L',
-119184=>'L',
-119185=>'L',
-119186=>'L',
-119187=>'L',
-119188=>'L',
-119189=>'L',
-119190=>'L',
-119191=>'L',
-119192=>'L',
-119193=>'L',
-119194=>'L',
-119195=>'L',
-119196=>'L',
-119197=>'L',
-119198=>'L',
-119199=>'L',
-119200=>'L',
-119201=>'L',
-119202=>'L',
-119203=>'L',
-119204=>'L',
-119205=>'L',
-119206=>'L',
-119207=>'L',
-119208=>'L',
-119209=>'L',
-119210=>'NSM',
-119211=>'NSM',
-119212=>'NSM',
-119213=>'NSM',
-119214=>'L',
-119215=>'L',
-119216=>'L',
-119217=>'L',
-119218=>'L',
-119219=>'L',
-119220=>'L',
-119221=>'L',
-119222=>'L',
-119223=>'L',
-119224=>'L',
-119225=>'L',
-119226=>'L',
-119227=>'L',
-119228=>'L',
-119229=>'L',
-119230=>'L',
-119231=>'L',
-119232=>'L',
-119233=>'L',
-119234=>'L',
-119235=>'L',
-119236=>'L',
-119237=>'L',
-119238=>'L',
-119239=>'L',
-119240=>'L',
-119241=>'L',
-119242=>'L',
-119243=>'L',
-119244=>'L',
-119245=>'L',
-119246=>'L',
-119247=>'L',
-119248=>'L',
-119249=>'L',
-119250=>'L',
-119251=>'L',
-119252=>'L',
-119253=>'L',
-119254=>'L',
-119255=>'L',
-119256=>'L',
-119257=>'L',
-119258=>'L',
-119259=>'L',
-119260=>'L',
-119261=>'L',
-119296=>'ON',
-119297=>'ON',
-119298=>'ON',
-119299=>'ON',
-119300=>'ON',
-119301=>'ON',
-119302=>'ON',
-119303=>'ON',
-119304=>'ON',
-119305=>'ON',
-119306=>'ON',
-119307=>'ON',
-119308=>'ON',
-119309=>'ON',
-119310=>'ON',
-119311=>'ON',
-119312=>'ON',
-119313=>'ON',
-119314=>'ON',
-119315=>'ON',
-119316=>'ON',
-119317=>'ON',
-119318=>'ON',
-119319=>'ON',
-119320=>'ON',
-119321=>'ON',
-119322=>'ON',
-119323=>'ON',
-119324=>'ON',
-119325=>'ON',
-119326=>'ON',
-119327=>'ON',
-119328=>'ON',
-119329=>'ON',
-119330=>'ON',
-119331=>'ON',
-119332=>'ON',
-119333=>'ON',
-119334=>'ON',
-119335=>'ON',
-119336=>'ON',
-119337=>'ON',
-119338=>'ON',
-119339=>'ON',
-119340=>'ON',
-119341=>'ON',
-119342=>'ON',
-119343=>'ON',
-119344=>'ON',
-119345=>'ON',
-119346=>'ON',
-119347=>'ON',
-119348=>'ON',
-119349=>'ON',
-119350=>'ON',
-119351=>'ON',
-119352=>'ON',
-119353=>'ON',
-119354=>'ON',
-119355=>'ON',
-119356=>'ON',
-119357=>'ON',
-119358=>'ON',
-119359=>'ON',
-119360=>'ON',
-119361=>'ON',
-119362=>'NSM',
-119363=>'NSM',
-119364=>'NSM',
-119365=>'ON',
-119552=>'ON',
-119553=>'ON',
-119554=>'ON',
-119555=>'ON',
-119556=>'ON',
-119557=>'ON',
-119558=>'ON',
-119559=>'ON',
-119560=>'ON',
-119561=>'ON',
-119562=>'ON',
-119563=>'ON',
-119564=>'ON',
-119565=>'ON',
-119566=>'ON',
-119567=>'ON',
-119568=>'ON',
-119569=>'ON',
-119570=>'ON',
-119571=>'ON',
-119572=>'ON',
-119573=>'ON',
-119574=>'ON',
-119575=>'ON',
-119576=>'ON',
-119577=>'ON',
-119578=>'ON',
-119579=>'ON',
-119580=>'ON',
-119581=>'ON',
-119582=>'ON',
-119583=>'ON',
-119584=>'ON',
-119585=>'ON',
-119586=>'ON',
-119587=>'ON',
-119588=>'ON',
-119589=>'ON',
-119590=>'ON',
-119591=>'ON',
-119592=>'ON',
-119593=>'ON',
-119594=>'ON',
-119595=>'ON',
-119596=>'ON',
-119597=>'ON',
-119598=>'ON',
-119599=>'ON',
-119600=>'ON',
-119601=>'ON',
-119602=>'ON',
-119603=>'ON',
-119604=>'ON',
-119605=>'ON',
-119606=>'ON',
-119607=>'ON',
-119608=>'ON',
-119609=>'ON',
-119610=>'ON',
-119611=>'ON',
-119612=>'ON',
-119613=>'ON',
-119614=>'ON',
-119615=>'ON',
-119616=>'ON',
-119617=>'ON',
-119618=>'ON',
-119619=>'ON',
-119620=>'ON',
-119621=>'ON',
-119622=>'ON',
-119623=>'ON',
-119624=>'ON',
-119625=>'ON',
-119626=>'ON',
-119627=>'ON',
-119628=>'ON',
-119629=>'ON',
-119630=>'ON',
-119631=>'ON',
-119632=>'ON',
-119633=>'ON',
-119634=>'ON',
-119635=>'ON',
-119636=>'ON',
-119637=>'ON',
-119638=>'ON',
-119648=>'L',
-119649=>'L',
-119650=>'L',
-119651=>'L',
-119652=>'L',
-119653=>'L',
-119654=>'L',
-119655=>'L',
-119656=>'L',
-119657=>'L',
-119658=>'L',
-119659=>'L',
-119660=>'L',
-119661=>'L',
-119662=>'L',
-119663=>'L',
-119664=>'L',
-119665=>'L',
-119808=>'L',
-119809=>'L',
-119810=>'L',
-119811=>'L',
-119812=>'L',
-119813=>'L',
-119814=>'L',
-119815=>'L',
-119816=>'L',
-119817=>'L',
-119818=>'L',
-119819=>'L',
-119820=>'L',
-119821=>'L',
-119822=>'L',
-119823=>'L',
-119824=>'L',
-119825=>'L',
-119826=>'L',
-119827=>'L',
-119828=>'L',
-119829=>'L',
-119830=>'L',
-119831=>'L',
-119832=>'L',
-119833=>'L',
-119834=>'L',
-119835=>'L',
-119836=>'L',
-119837=>'L',
-119838=>'L',
-119839=>'L',
-119840=>'L',
-119841=>'L',
-119842=>'L',
-119843=>'L',
-119844=>'L',
-119845=>'L',
-119846=>'L',
-119847=>'L',
-119848=>'L',
-119849=>'L',
-119850=>'L',
-119851=>'L',
-119852=>'L',
-119853=>'L',
-119854=>'L',
-119855=>'L',
-119856=>'L',
-119857=>'L',
-119858=>'L',
-119859=>'L',
-119860=>'L',
-119861=>'L',
-119862=>'L',
-119863=>'L',
-119864=>'L',
-119865=>'L',
-119866=>'L',
-119867=>'L',
-119868=>'L',
-119869=>'L',
-119870=>'L',
-119871=>'L',
-119872=>'L',
-119873=>'L',
-119874=>'L',
-119875=>'L',
-119876=>'L',
-119877=>'L',
-119878=>'L',
-119879=>'L',
-119880=>'L',
-119881=>'L',
-119882=>'L',
-119883=>'L',
-119884=>'L',
-119885=>'L',
-119886=>'L',
-119887=>'L',
-119888=>'L',
-119889=>'L',
-119890=>'L',
-119891=>'L',
-119892=>'L',
-119894=>'L',
-119895=>'L',
-119896=>'L',
-119897=>'L',
-119898=>'L',
-119899=>'L',
-119900=>'L',
-119901=>'L',
-119902=>'L',
-119903=>'L',
-119904=>'L',
-119905=>'L',
-119906=>'L',
-119907=>'L',
-119908=>'L',
-119909=>'L',
-119910=>'L',
-119911=>'L',
-119912=>'L',
-119913=>'L',
-119914=>'L',
-119915=>'L',
-119916=>'L',
-119917=>'L',
-119918=>'L',
-119919=>'L',
-119920=>'L',
-119921=>'L',
-119922=>'L',
-119923=>'L',
-119924=>'L',
-119925=>'L',
-119926=>'L',
-119927=>'L',
-119928=>'L',
-119929=>'L',
-119930=>'L',
-119931=>'L',
-119932=>'L',
-119933=>'L',
-119934=>'L',
-119935=>'L',
-119936=>'L',
-119937=>'L',
-119938=>'L',
-119939=>'L',
-119940=>'L',
-119941=>'L',
-119942=>'L',
-119943=>'L',
-119944=>'L',
-119945=>'L',
-119946=>'L',
-119947=>'L',
-119948=>'L',
-119949=>'L',
-119950=>'L',
-119951=>'L',
-119952=>'L',
-119953=>'L',
-119954=>'L',
-119955=>'L',
-119956=>'L',
-119957=>'L',
-119958=>'L',
-119959=>'L',
-119960=>'L',
-119961=>'L',
-119962=>'L',
-119963=>'L',
-119964=>'L',
-119966=>'L',
-119967=>'L',
-119970=>'L',
-119973=>'L',
-119974=>'L',
-119977=>'L',
-119978=>'L',
-119979=>'L',
-119980=>'L',
-119982=>'L',
-119983=>'L',
-119984=>'L',
-119985=>'L',
-119986=>'L',
-119987=>'L',
-119988=>'L',
-119989=>'L',
-119990=>'L',
-119991=>'L',
-119992=>'L',
-119993=>'L',
-119995=>'L',
-119997=>'L',
-119998=>'L',
-119999=>'L',
-120000=>'L',
-120001=>'L',
-120002=>'L',
-120003=>'L',
-120005=>'L',
-120006=>'L',
-120007=>'L',
-120008=>'L',
-120009=>'L',
-120010=>'L',
-120011=>'L',
-120012=>'L',
-120013=>'L',
-120014=>'L',
-120015=>'L',
-120016=>'L',
-120017=>'L',
-120018=>'L',
-120019=>'L',
-120020=>'L',
-120021=>'L',
-120022=>'L',
-120023=>'L',
-120024=>'L',
-120025=>'L',
-120026=>'L',
-120027=>'L',
-120028=>'L',
-120029=>'L',
-120030=>'L',
-120031=>'L',
-120032=>'L',
-120033=>'L',
-120034=>'L',
-120035=>'L',
-120036=>'L',
-120037=>'L',
-120038=>'L',
-120039=>'L',
-120040=>'L',
-120041=>'L',
-120042=>'L',
-120043=>'L',
-120044=>'L',
-120045=>'L',
-120046=>'L',
-120047=>'L',
-120048=>'L',
-120049=>'L',
-120050=>'L',
-120051=>'L',
-120052=>'L',
-120053=>'L',
-120054=>'L',
-120055=>'L',
-120056=>'L',
-120057=>'L',
-120058=>'L',
-120059=>'L',
-120060=>'L',
-120061=>'L',
-120062=>'L',
-120063=>'L',
-120064=>'L',
-120065=>'L',
-120066=>'L',
-120067=>'L',
-120068=>'L',
-120069=>'L',
-120071=>'L',
-120072=>'L',
-120073=>'L',
-120074=>'L',
-120077=>'L',
-120078=>'L',
-120079=>'L',
-120080=>'L',
-120081=>'L',
-120082=>'L',
-120083=>'L',
-120084=>'L',
-120086=>'L',
-120087=>'L',
-120088=>'L',
-120089=>'L',
-120090=>'L',
-120091=>'L',
-120092=>'L',
-120094=>'L',
-120095=>'L',
-120096=>'L',
-120097=>'L',
-120098=>'L',
-120099=>'L',
-120100=>'L',
-120101=>'L',
-120102=>'L',
-120103=>'L',
-120104=>'L',
-120105=>'L',
-120106=>'L',
-120107=>'L',
-120108=>'L',
-120109=>'L',
-120110=>'L',
-120111=>'L',
-120112=>'L',
-120113=>'L',
-120114=>'L',
-120115=>'L',
-120116=>'L',
-120117=>'L',
-120118=>'L',
-120119=>'L',
-120120=>'L',
-120121=>'L',
-120123=>'L',
-120124=>'L',
-120125=>'L',
-120126=>'L',
-120128=>'L',
-120129=>'L',
-120130=>'L',
-120131=>'L',
-120132=>'L',
-120134=>'L',
-120138=>'L',
-120139=>'L',
-120140=>'L',
-120141=>'L',
-120142=>'L',
-120143=>'L',
-120144=>'L',
-120146=>'L',
-120147=>'L',
-120148=>'L',
-120149=>'L',
-120150=>'L',
-120151=>'L',
-120152=>'L',
-120153=>'L',
-120154=>'L',
-120155=>'L',
-120156=>'L',
-120157=>'L',
-120158=>'L',
-120159=>'L',
-120160=>'L',
-120161=>'L',
-120162=>'L',
-120163=>'L',
-120164=>'L',
-120165=>'L',
-120166=>'L',
-120167=>'L',
-120168=>'L',
-120169=>'L',
-120170=>'L',
-120171=>'L',
-120172=>'L',
-120173=>'L',
-120174=>'L',
-120175=>'L',
-120176=>'L',
-120177=>'L',
-120178=>'L',
-120179=>'L',
-120180=>'L',
-120181=>'L',
-120182=>'L',
-120183=>'L',
-120184=>'L',
-120185=>'L',
-120186=>'L',
-120187=>'L',
-120188=>'L',
-120189=>'L',
-120190=>'L',
-120191=>'L',
-120192=>'L',
-120193=>'L',
-120194=>'L',
-120195=>'L',
-120196=>'L',
-120197=>'L',
-120198=>'L',
-120199=>'L',
-120200=>'L',
-120201=>'L',
-120202=>'L',
-120203=>'L',
-120204=>'L',
-120205=>'L',
-120206=>'L',
-120207=>'L',
-120208=>'L',
-120209=>'L',
-120210=>'L',
-120211=>'L',
-120212=>'L',
-120213=>'L',
-120214=>'L',
-120215=>'L',
-120216=>'L',
-120217=>'L',
-120218=>'L',
-120219=>'L',
-120220=>'L',
-120221=>'L',
-120222=>'L',
-120223=>'L',
-120224=>'L',
-120225=>'L',
-120226=>'L',
-120227=>'L',
-120228=>'L',
-120229=>'L',
-120230=>'L',
-120231=>'L',
-120232=>'L',
-120233=>'L',
-120234=>'L',
-120235=>'L',
-120236=>'L',
-120237=>'L',
-120238=>'L',
-120239=>'L',
-120240=>'L',
-120241=>'L',
-120242=>'L',
-120243=>'L',
-120244=>'L',
-120245=>'L',
-120246=>'L',
-120247=>'L',
-120248=>'L',
-120249=>'L',
-120250=>'L',
-120251=>'L',
-120252=>'L',
-120253=>'L',
-120254=>'L',
-120255=>'L',
-120256=>'L',
-120257=>'L',
-120258=>'L',
-120259=>'L',
-120260=>'L',
-120261=>'L',
-120262=>'L',
-120263=>'L',
-120264=>'L',
-120265=>'L',
-120266=>'L',
-120267=>'L',
-120268=>'L',
-120269=>'L',
-120270=>'L',
-120271=>'L',
-120272=>'L',
-120273=>'L',
-120274=>'L',
-120275=>'L',
-120276=>'L',
-120277=>'L',
-120278=>'L',
-120279=>'L',
-120280=>'L',
-120281=>'L',
-120282=>'L',
-120283=>'L',
-120284=>'L',
-120285=>'L',
-120286=>'L',
-120287=>'L',
-120288=>'L',
-120289=>'L',
-120290=>'L',
-120291=>'L',
-120292=>'L',
-120293=>'L',
-120294=>'L',
-120295=>'L',
-120296=>'L',
-120297=>'L',
-120298=>'L',
-120299=>'L',
-120300=>'L',
-120301=>'L',
-120302=>'L',
-120303=>'L',
-120304=>'L',
-120305=>'L',
-120306=>'L',
-120307=>'L',
-120308=>'L',
-120309=>'L',
-120310=>'L',
-120311=>'L',
-120312=>'L',
-120313=>'L',
-120314=>'L',
-120315=>'L',
-120316=>'L',
-120317=>'L',
-120318=>'L',
-120319=>'L',
-120320=>'L',
-120321=>'L',
-120322=>'L',
-120323=>'L',
-120324=>'L',
-120325=>'L',
-120326=>'L',
-120327=>'L',
-120328=>'L',
-120329=>'L',
-120330=>'L',
-120331=>'L',
-120332=>'L',
-120333=>'L',
-120334=>'L',
-120335=>'L',
-120336=>'L',
-120337=>'L',
-120338=>'L',
-120339=>'L',
-120340=>'L',
-120341=>'L',
-120342=>'L',
-120343=>'L',
-120344=>'L',
-120345=>'L',
-120346=>'L',
-120347=>'L',
-120348=>'L',
-120349=>'L',
-120350=>'L',
-120351=>'L',
-120352=>'L',
-120353=>'L',
-120354=>'L',
-120355=>'L',
-120356=>'L',
-120357=>'L',
-120358=>'L',
-120359=>'L',
-120360=>'L',
-120361=>'L',
-120362=>'L',
-120363=>'L',
-120364=>'L',
-120365=>'L',
-120366=>'L',
-120367=>'L',
-120368=>'L',
-120369=>'L',
-120370=>'L',
-120371=>'L',
-120372=>'L',
-120373=>'L',
-120374=>'L',
-120375=>'L',
-120376=>'L',
-120377=>'L',
-120378=>'L',
-120379=>'L',
-120380=>'L',
-120381=>'L',
-120382=>'L',
-120383=>'L',
-120384=>'L',
-120385=>'L',
-120386=>'L',
-120387=>'L',
-120388=>'L',
-120389=>'L',
-120390=>'L',
-120391=>'L',
-120392=>'L',
-120393=>'L',
-120394=>'L',
-120395=>'L',
-120396=>'L',
-120397=>'L',
-120398=>'L',
-120399=>'L',
-120400=>'L',
-120401=>'L',
-120402=>'L',
-120403=>'L',
-120404=>'L',
-120405=>'L',
-120406=>'L',
-120407=>'L',
-120408=>'L',
-120409=>'L',
-120410=>'L',
-120411=>'L',
-120412=>'L',
-120413=>'L',
-120414=>'L',
-120415=>'L',
-120416=>'L',
-120417=>'L',
-120418=>'L',
-120419=>'L',
-120420=>'L',
-120421=>'L',
-120422=>'L',
-120423=>'L',
-120424=>'L',
-120425=>'L',
-120426=>'L',
-120427=>'L',
-120428=>'L',
-120429=>'L',
-120430=>'L',
-120431=>'L',
-120432=>'L',
-120433=>'L',
-120434=>'L',
-120435=>'L',
-120436=>'L',
-120437=>'L',
-120438=>'L',
-120439=>'L',
-120440=>'L',
-120441=>'L',
-120442=>'L',
-120443=>'L',
-120444=>'L',
-120445=>'L',
-120446=>'L',
-120447=>'L',
-120448=>'L',
-120449=>'L',
-120450=>'L',
-120451=>'L',
-120452=>'L',
-120453=>'L',
-120454=>'L',
-120455=>'L',
-120456=>'L',
-120457=>'L',
-120458=>'L',
-120459=>'L',
-120460=>'L',
-120461=>'L',
-120462=>'L',
-120463=>'L',
-120464=>'L',
-120465=>'L',
-120466=>'L',
-120467=>'L',
-120468=>'L',
-120469=>'L',
-120470=>'L',
-120471=>'L',
-120472=>'L',
-120473=>'L',
-120474=>'L',
-120475=>'L',
-120476=>'L',
-120477=>'L',
-120478=>'L',
-120479=>'L',
-120480=>'L',
-120481=>'L',
-120482=>'L',
-120483=>'L',
-120484=>'L',
-120485=>'L',
-120488=>'L',
-120489=>'L',
-120490=>'L',
-120491=>'L',
-120492=>'L',
-120493=>'L',
-120494=>'L',
-120495=>'L',
-120496=>'L',
-120497=>'L',
-120498=>'L',
-120499=>'L',
-120500=>'L',
-120501=>'L',
-120502=>'L',
-120503=>'L',
-120504=>'L',
-120505=>'L',
-120506=>'L',
-120507=>'L',
-120508=>'L',
-120509=>'L',
-120510=>'L',
-120511=>'L',
-120512=>'L',
-120513=>'L',
-120514=>'L',
-120515=>'L',
-120516=>'L',
-120517=>'L',
-120518=>'L',
-120519=>'L',
-120520=>'L',
-120521=>'L',
-120522=>'L',
-120523=>'L',
-120524=>'L',
-120525=>'L',
-120526=>'L',
-120527=>'L',
-120528=>'L',
-120529=>'L',
-120530=>'L',
-120531=>'L',
-120532=>'L',
-120533=>'L',
-120534=>'L',
-120535=>'L',
-120536=>'L',
-120537=>'L',
-120538=>'L',
-120539=>'L',
-120540=>'L',
-120541=>'L',
-120542=>'L',
-120543=>'L',
-120544=>'L',
-120545=>'L',
-120546=>'L',
-120547=>'L',
-120548=>'L',
-120549=>'L',
-120550=>'L',
-120551=>'L',
-120552=>'L',
-120553=>'L',
-120554=>'L',
-120555=>'L',
-120556=>'L',
-120557=>'L',
-120558=>'L',
-120559=>'L',
-120560=>'L',
-120561=>'L',
-120562=>'L',
-120563=>'L',
-120564=>'L',
-120565=>'L',
-120566=>'L',
-120567=>'L',
-120568=>'L',
-120569=>'L',
-120570=>'L',
-120571=>'L',
-120572=>'L',
-120573=>'L',
-120574=>'L',
-120575=>'L',
-120576=>'L',
-120577=>'L',
-120578=>'L',
-120579=>'L',
-120580=>'L',
-120581=>'L',
-120582=>'L',
-120583=>'L',
-120584=>'L',
-120585=>'L',
-120586=>'L',
-120587=>'L',
-120588=>'L',
-120589=>'L',
-120590=>'L',
-120591=>'L',
-120592=>'L',
-120593=>'L',
-120594=>'L',
-120595=>'L',
-120596=>'L',
-120597=>'L',
-120598=>'L',
-120599=>'L',
-120600=>'L',
-120601=>'L',
-120602=>'L',
-120603=>'L',
-120604=>'L',
-120605=>'L',
-120606=>'L',
-120607=>'L',
-120608=>'L',
-120609=>'L',
-120610=>'L',
-120611=>'L',
-120612=>'L',
-120613=>'L',
-120614=>'L',
-120615=>'L',
-120616=>'L',
-120617=>'L',
-120618=>'L',
-120619=>'L',
-120620=>'L',
-120621=>'L',
-120622=>'L',
-120623=>'L',
-120624=>'L',
-120625=>'L',
-120626=>'L',
-120627=>'L',
-120628=>'L',
-120629=>'L',
-120630=>'L',
-120631=>'L',
-120632=>'L',
-120633=>'L',
-120634=>'L',
-120635=>'L',
-120636=>'L',
-120637=>'L',
-120638=>'L',
-120639=>'L',
-120640=>'L',
-120641=>'L',
-120642=>'L',
-120643=>'L',
-120644=>'L',
-120645=>'L',
-120646=>'L',
-120647=>'L',
-120648=>'L',
-120649=>'L',
-120650=>'L',
-120651=>'L',
-120652=>'L',
-120653=>'L',
-120654=>'L',
-120655=>'L',
-120656=>'L',
-120657=>'L',
-120658=>'L',
-120659=>'L',
-120660=>'L',
-120661=>'L',
-120662=>'L',
-120663=>'L',
-120664=>'L',
-120665=>'L',
-120666=>'L',
-120667=>'L',
-120668=>'L',
-120669=>'L',
-120670=>'L',
-120671=>'L',
-120672=>'L',
-120673=>'L',
-120674=>'L',
-120675=>'L',
-120676=>'L',
-120677=>'L',
-120678=>'L',
-120679=>'L',
-120680=>'L',
-120681=>'L',
-120682=>'L',
-120683=>'L',
-120684=>'L',
-120685=>'L',
-120686=>'L',
-120687=>'L',
-120688=>'L',
-120689=>'L',
-120690=>'L',
-120691=>'L',
-120692=>'L',
-120693=>'L',
-120694=>'L',
-120695=>'L',
-120696=>'L',
-120697=>'L',
-120698=>'L',
-120699=>'L',
-120700=>'L',
-120701=>'L',
-120702=>'L',
-120703=>'L',
-120704=>'L',
-120705=>'L',
-120706=>'L',
-120707=>'L',
-120708=>'L',
-120709=>'L',
-120710=>'L',
-120711=>'L',
-120712=>'L',
-120713=>'L',
-120714=>'L',
-120715=>'L',
-120716=>'L',
-120717=>'L',
-120718=>'L',
-120719=>'L',
-120720=>'L',
-120721=>'L',
-120722=>'L',
-120723=>'L',
-120724=>'L',
-120725=>'L',
-120726=>'L',
-120727=>'L',
-120728=>'L',
-120729=>'L',
-120730=>'L',
-120731=>'L',
-120732=>'L',
-120733=>'L',
-120734=>'L',
-120735=>'L',
-120736=>'L',
-120737=>'L',
-120738=>'L',
-120739=>'L',
-120740=>'L',
-120741=>'L',
-120742=>'L',
-120743=>'L',
-120744=>'L',
-120745=>'L',
-120746=>'L',
-120747=>'L',
-120748=>'L',
-120749=>'L',
-120750=>'L',
-120751=>'L',
-120752=>'L',
-120753=>'L',
-120754=>'L',
-120755=>'L',
-120756=>'L',
-120757=>'L',
-120758=>'L',
-120759=>'L',
-120760=>'L',
-120761=>'L',
-120762=>'L',
-120763=>'L',
-120764=>'L',
-120765=>'L',
-120766=>'L',
-120767=>'L',
-120768=>'L',
-120769=>'L',
-120770=>'L',
-120771=>'L',
-120772=>'L',
-120773=>'L',
-120774=>'L',
-120775=>'L',
-120776=>'L',
-120777=>'L',
-120778=>'L',
-120779=>'L',
-120782=>'EN',
-120783=>'EN',
-120784=>'EN',
-120785=>'EN',
-120786=>'EN',
-120787=>'EN',
-120788=>'EN',
-120789=>'EN',
-120790=>'EN',
-120791=>'EN',
-120792=>'EN',
-120793=>'EN',
-120794=>'EN',
-120795=>'EN',
-120796=>'EN',
-120797=>'EN',
-120798=>'EN',
-120799=>'EN',
-120800=>'EN',
-120801=>'EN',
-120802=>'EN',
-120803=>'EN',
-120804=>'EN',
-120805=>'EN',
-120806=>'EN',
-120807=>'EN',
-120808=>'EN',
-120809=>'EN',
-120810=>'EN',
-120811=>'EN',
-120812=>'EN',
-120813=>'EN',
-120814=>'EN',
-120815=>'EN',
-120816=>'EN',
-120817=>'EN',
-120818=>'EN',
-120819=>'EN',
-120820=>'EN',
-120821=>'EN',
-120822=>'EN',
-120823=>'EN',
-120824=>'EN',
-120825=>'EN',
-120826=>'EN',
-120827=>'EN',
-120828=>'EN',
-120829=>'EN',
-120830=>'EN',
-120831=>'EN',
-131072=>'L',
-173782=>'L',
-194560=>'L',
-194561=>'L',
-194562=>'L',
-194563=>'L',
-194564=>'L',
-194565=>'L',
-194566=>'L',
-194567=>'L',
-194568=>'L',
-194569=>'L',
-194570=>'L',
-194571=>'L',
-194572=>'L',
-194573=>'L',
-194574=>'L',
-194575=>'L',
-194576=>'L',
-194577=>'L',
-194578=>'L',
-194579=>'L',
-194580=>'L',
-194581=>'L',
-194582=>'L',
-194583=>'L',
-194584=>'L',
-194585=>'L',
-194586=>'L',
-194587=>'L',
-194588=>'L',
-194589=>'L',
-194590=>'L',
-194591=>'L',
-194592=>'L',
-194593=>'L',
-194594=>'L',
-194595=>'L',
-194596=>'L',
-194597=>'L',
-194598=>'L',
-194599=>'L',
-194600=>'L',
-194601=>'L',
-194602=>'L',
-194603=>'L',
-194604=>'L',
-194605=>'L',
-194606=>'L',
-194607=>'L',
-194608=>'L',
-194609=>'L',
-194610=>'L',
-194611=>'L',
-194612=>'L',
-194613=>'L',
-194614=>'L',
-194615=>'L',
-194616=>'L',
-194617=>'L',
-194618=>'L',
-194619=>'L',
-194620=>'L',
-194621=>'L',
-194622=>'L',
-194623=>'L',
-194624=>'L',
-194625=>'L',
-194626=>'L',
-194627=>'L',
-194628=>'L',
-194629=>'L',
-194630=>'L',
-194631=>'L',
-194632=>'L',
-194633=>'L',
-194634=>'L',
-194635=>'L',
-194636=>'L',
-194637=>'L',
-194638=>'L',
-194639=>'L',
-194640=>'L',
-194641=>'L',
-194642=>'L',
-194643=>'L',
-194644=>'L',
-194645=>'L',
-194646=>'L',
-194647=>'L',
-194648=>'L',
-194649=>'L',
-194650=>'L',
-194651=>'L',
-194652=>'L',
-194653=>'L',
-194654=>'L',
-194655=>'L',
-194656=>'L',
-194657=>'L',
-194658=>'L',
-194659=>'L',
-194660=>'L',
-194661=>'L',
-194662=>'L',
-194663=>'L',
-194664=>'L',
-194665=>'L',
-194666=>'L',
-194667=>'L',
-194668=>'L',
-194669=>'L',
-194670=>'L',
-194671=>'L',
-194672=>'L',
-194673=>'L',
-194674=>'L',
-194675=>'L',
-194676=>'L',
-194677=>'L',
-194678=>'L',
-194679=>'L',
-194680=>'L',
-194681=>'L',
-194682=>'L',
-194683=>'L',
-194684=>'L',
-194685=>'L',
-194686=>'L',
-194687=>'L',
-194688=>'L',
-194689=>'L',
-194690=>'L',
-194691=>'L',
-194692=>'L',
-194693=>'L',
-194694=>'L',
-194695=>'L',
-194696=>'L',
-194697=>'L',
-194698=>'L',
-194699=>'L',
-194700=>'L',
-194701=>'L',
-194702=>'L',
-194703=>'L',
-194704=>'L',
-194705=>'L',
-194706=>'L',
-194707=>'L',
-194708=>'L',
-194709=>'L',
-194710=>'L',
-194711=>'L',
-194712=>'L',
-194713=>'L',
-194714=>'L',
-194715=>'L',
-194716=>'L',
-194717=>'L',
-194718=>'L',
-194719=>'L',
-194720=>'L',
-194721=>'L',
-194722=>'L',
-194723=>'L',
-194724=>'L',
-194725=>'L',
-194726=>'L',
-194727=>'L',
-194728=>'L',
-194729=>'L',
-194730=>'L',
-194731=>'L',
-194732=>'L',
-194733=>'L',
-194734=>'L',
-194735=>'L',
-194736=>'L',
-194737=>'L',
-194738=>'L',
-194739=>'L',
-194740=>'L',
-194741=>'L',
-194742=>'L',
-194743=>'L',
-194744=>'L',
-194745=>'L',
-194746=>'L',
-194747=>'L',
-194748=>'L',
-194749=>'L',
-194750=>'L',
-194751=>'L',
-194752=>'L',
-194753=>'L',
-194754=>'L',
-194755=>'L',
-194756=>'L',
-194757=>'L',
-194758=>'L',
-194759=>'L',
-194760=>'L',
-194761=>'L',
-194762=>'L',
-194763=>'L',
-194764=>'L',
-194765=>'L',
-194766=>'L',
-194767=>'L',
-194768=>'L',
-194769=>'L',
-194770=>'L',
-194771=>'L',
-194772=>'L',
-194773=>'L',
-194774=>'L',
-194775=>'L',
-194776=>'L',
-194777=>'L',
-194778=>'L',
-194779=>'L',
-194780=>'L',
-194781=>'L',
-194782=>'L',
-194783=>'L',
-194784=>'L',
-194785=>'L',
-194786=>'L',
-194787=>'L',
-194788=>'L',
-194789=>'L',
-194790=>'L',
-194791=>'L',
-194792=>'L',
-194793=>'L',
-194794=>'L',
-194795=>'L',
-194796=>'L',
-194797=>'L',
-194798=>'L',
-194799=>'L',
-194800=>'L',
-194801=>'L',
-194802=>'L',
-194803=>'L',
-194804=>'L',
-194805=>'L',
-194806=>'L',
-194807=>'L',
-194808=>'L',
-194809=>'L',
-194810=>'L',
-194811=>'L',
-194812=>'L',
-194813=>'L',
-194814=>'L',
-194815=>'L',
-194816=>'L',
-194817=>'L',
-194818=>'L',
-194819=>'L',
-194820=>'L',
-194821=>'L',
-194822=>'L',
-194823=>'L',
-194824=>'L',
-194825=>'L',
-194826=>'L',
-194827=>'L',
-194828=>'L',
-194829=>'L',
-194830=>'L',
-194831=>'L',
-194832=>'L',
-194833=>'L',
-194834=>'L',
-194835=>'L',
-194836=>'L',
-194837=>'L',
-194838=>'L',
-194839=>'L',
-194840=>'L',
-194841=>'L',
-194842=>'L',
-194843=>'L',
-194844=>'L',
-194845=>'L',
-194846=>'L',
-194847=>'L',
-194848=>'L',
-194849=>'L',
-194850=>'L',
-194851=>'L',
-194852=>'L',
-194853=>'L',
-194854=>'L',
-194855=>'L',
-194856=>'L',
-194857=>'L',
-194858=>'L',
-194859=>'L',
-194860=>'L',
-194861=>'L',
-194862=>'L',
-194863=>'L',
-194864=>'L',
-194865=>'L',
-194866=>'L',
-194867=>'L',
-194868=>'L',
-194869=>'L',
-194870=>'L',
-194871=>'L',
-194872=>'L',
-194873=>'L',
-194874=>'L',
-194875=>'L',
-194876=>'L',
-194877=>'L',
-194878=>'L',
-194879=>'L',
-194880=>'L',
-194881=>'L',
-194882=>'L',
-194883=>'L',
-194884=>'L',
-194885=>'L',
-194886=>'L',
-194887=>'L',
-194888=>'L',
-194889=>'L',
-194890=>'L',
-194891=>'L',
-194892=>'L',
-194893=>'L',
-194894=>'L',
-194895=>'L',
-194896=>'L',
-194897=>'L',
-194898=>'L',
-194899=>'L',
-194900=>'L',
-194901=>'L',
-194902=>'L',
-194903=>'L',
-194904=>'L',
-194905=>'L',
-194906=>'L',
-194907=>'L',
-194908=>'L',
-194909=>'L',
-194910=>'L',
-194911=>'L',
-194912=>'L',
-194913=>'L',
-194914=>'L',
-194915=>'L',
-194916=>'L',
-194917=>'L',
-194918=>'L',
-194919=>'L',
-194920=>'L',
-194921=>'L',
-194922=>'L',
-194923=>'L',
-194924=>'L',
-194925=>'L',
-194926=>'L',
-194927=>'L',
-194928=>'L',
-194929=>'L',
-194930=>'L',
-194931=>'L',
-194932=>'L',
-194933=>'L',
-194934=>'L',
-194935=>'L',
-194936=>'L',
-194937=>'L',
-194938=>'L',
-194939=>'L',
-194940=>'L',
-194941=>'L',
-194942=>'L',
-194943=>'L',
-194944=>'L',
-194945=>'L',
-194946=>'L',
-194947=>'L',
-194948=>'L',
-194949=>'L',
-194950=>'L',
-194951=>'L',
-194952=>'L',
-194953=>'L',
-194954=>'L',
-194955=>'L',
-194956=>'L',
-194957=>'L',
-194958=>'L',
-194959=>'L',
-194960=>'L',
-194961=>'L',
-194962=>'L',
-194963=>'L',
-194964=>'L',
-194965=>'L',
-194966=>'L',
-194967=>'L',
-194968=>'L',
-194969=>'L',
-194970=>'L',
-194971=>'L',
-194972=>'L',
-194973=>'L',
-194974=>'L',
-194975=>'L',
-194976=>'L',
-194977=>'L',
-194978=>'L',
-194979=>'L',
-194980=>'L',
-194981=>'L',
-194982=>'L',
-194983=>'L',
-194984=>'L',
-194985=>'L',
-194986=>'L',
-194987=>'L',
-194988=>'L',
-194989=>'L',
-194990=>'L',
-194991=>'L',
-194992=>'L',
-194993=>'L',
-194994=>'L',
-194995=>'L',
-194996=>'L',
-194997=>'L',
-194998=>'L',
-194999=>'L',
-195000=>'L',
-195001=>'L',
-195002=>'L',
-195003=>'L',
-195004=>'L',
-195005=>'L',
-195006=>'L',
-195007=>'L',
-195008=>'L',
-195009=>'L',
-195010=>'L',
-195011=>'L',
-195012=>'L',
-195013=>'L',
-195014=>'L',
-195015=>'L',
-195016=>'L',
-195017=>'L',
-195018=>'L',
-195019=>'L',
-195020=>'L',
-195021=>'L',
-195022=>'L',
-195023=>'L',
-195024=>'L',
-195025=>'L',
-195026=>'L',
-195027=>'L',
-195028=>'L',
-195029=>'L',
-195030=>'L',
-195031=>'L',
-195032=>'L',
-195033=>'L',
-195034=>'L',
-195035=>'L',
-195036=>'L',
-195037=>'L',
-195038=>'L',
-195039=>'L',
-195040=>'L',
-195041=>'L',
-195042=>'L',
-195043=>'L',
-195044=>'L',
-195045=>'L',
-195046=>'L',
-195047=>'L',
-195048=>'L',
-195049=>'L',
-195050=>'L',
-195051=>'L',
-195052=>'L',
-195053=>'L',
-195054=>'L',
-195055=>'L',
-195056=>'L',
-195057=>'L',
-195058=>'L',
-195059=>'L',
-195060=>'L',
-195061=>'L',
-195062=>'L',
-195063=>'L',
-195064=>'L',
-195065=>'L',
-195066=>'L',
-195067=>'L',
-195068=>'L',
-195069=>'L',
-195070=>'L',
-195071=>'L',
-195072=>'L',
-195073=>'L',
-195074=>'L',
-195075=>'L',
-195076=>'L',
-195077=>'L',
-195078=>'L',
-195079=>'L',
-195080=>'L',
-195081=>'L',
-195082=>'L',
-195083=>'L',
-195084=>'L',
-195085=>'L',
-195086=>'L',
-195087=>'L',
-195088=>'L',
-195089=>'L',
-195090=>'L',
-195091=>'L',
-195092=>'L',
-195093=>'L',
-195094=>'L',
-195095=>'L',
-195096=>'L',
-195097=>'L',
-195098=>'L',
-195099=>'L',
-195100=>'L',
-195101=>'L',
-917505=>'BN',
-917536=>'BN',
-917537=>'BN',
-917538=>'BN',
-917539=>'BN',
-917540=>'BN',
-917541=>'BN',
-917542=>'BN',
-917543=>'BN',
-917544=>'BN',
-917545=>'BN',
-917546=>'BN',
-917547=>'BN',
-917548=>'BN',
-917549=>'BN',
-917550=>'BN',
-917551=>'BN',
-917552=>'BN',
-917553=>'BN',
-917554=>'BN',
-917555=>'BN',
-917556=>'BN',
-917557=>'BN',
-917558=>'BN',
-917559=>'BN',
-917560=>'BN',
-917561=>'BN',
-917562=>'BN',
-917563=>'BN',
-917564=>'BN',
-917565=>'BN',
-917566=>'BN',
-917567=>'BN',
-917568=>'BN',
-917569=>'BN',
-917570=>'BN',
-917571=>'BN',
-917572=>'BN',
-917573=>'BN',
-917574=>'BN',
-917575=>'BN',
-917576=>'BN',
-917577=>'BN',
-917578=>'BN',
-917579=>'BN',
-917580=>'BN',
-917581=>'BN',
-917582=>'BN',
-917583=>'BN',
-917584=>'BN',
-917585=>'BN',
-917586=>'BN',
-917587=>'BN',
-917588=>'BN',
-917589=>'BN',
-917590=>'BN',
-917591=>'BN',
-917592=>'BN',
-917593=>'BN',
-917594=>'BN',
-917595=>'BN',
-917596=>'BN',
-917597=>'BN',
-917598=>'BN',
-917599=>'BN',
-917600=>'BN',
-917601=>'BN',
-917602=>'BN',
-917603=>'BN',
-917604=>'BN',
-917605=>'BN',
-917606=>'BN',
-917607=>'BN',
-917608=>'BN',
-917609=>'BN',
-917610=>'BN',
-917611=>'BN',
-917612=>'BN',
-917613=>'BN',
-917614=>'BN',
-917615=>'BN',
-917616=>'BN',
-917617=>'BN',
-917618=>'BN',
-917619=>'BN',
-917620=>'BN',
-917621=>'BN',
-917622=>'BN',
-917623=>'BN',
-917624=>'BN',
-917625=>'BN',
-917626=>'BN',
-917627=>'BN',
-917628=>'BN',
-917629=>'BN',
-917630=>'BN',
-917631=>'BN',
-917760=>'NSM',
-917761=>'NSM',
-917762=>'NSM',
-917763=>'NSM',
-917764=>'NSM',
-917765=>'NSM',
-917766=>'NSM',
-917767=>'NSM',
-917768=>'NSM',
-917769=>'NSM',
-917770=>'NSM',
-917771=>'NSM',
-917772=>'NSM',
-917773=>'NSM',
-917774=>'NSM',
-917775=>'NSM',
-917776=>'NSM',
-917777=>'NSM',
-917778=>'NSM',
-917779=>'NSM',
-917780=>'NSM',
-917781=>'NSM',
-917782=>'NSM',
-917783=>'NSM',
-917784=>'NSM',
-917785=>'NSM',
-917786=>'NSM',
-917787=>'NSM',
-917788=>'NSM',
-917789=>'NSM',
-917790=>'NSM',
-917791=>'NSM',
-917792=>'NSM',
-917793=>'NSM',
-917794=>'NSM',
-917795=>'NSM',
-917796=>'NSM',
-917797=>'NSM',
-917798=>'NSM',
-917799=>'NSM',
-917800=>'NSM',
-917801=>'NSM',
-917802=>'NSM',
-917803=>'NSM',
-917804=>'NSM',
-917805=>'NSM',
-917806=>'NSM',
-917807=>'NSM',
-917808=>'NSM',
-917809=>'NSM',
-917810=>'NSM',
-917811=>'NSM',
-917812=>'NSM',
-917813=>'NSM',
-917814=>'NSM',
-917815=>'NSM',
-917816=>'NSM',
-917817=>'NSM',
-917818=>'NSM',
-917819=>'NSM',
-917820=>'NSM',
-917821=>'NSM',
-917822=>'NSM',
-917823=>'NSM',
-917824=>'NSM',
-917825=>'NSM',
-917826=>'NSM',
-917827=>'NSM',
-917828=>'NSM',
-917829=>'NSM',
-917830=>'NSM',
-917831=>'NSM',
-917832=>'NSM',
-917833=>'NSM',
-917834=>'NSM',
-917835=>'NSM',
-917836=>'NSM',
-917837=>'NSM',
-917838=>'NSM',
-917839=>'NSM',
-917840=>'NSM',
-917841=>'NSM',
-917842=>'NSM',
-917843=>'NSM',
-917844=>'NSM',
-917845=>'NSM',
-917846=>'NSM',
-917847=>'NSM',
-917848=>'NSM',
-917849=>'NSM',
-917850=>'NSM',
-917851=>'NSM',
-917852=>'NSM',
-917853=>'NSM',
-917854=>'NSM',
-917855=>'NSM',
-917856=>'NSM',
-917857=>'NSM',
-917858=>'NSM',
-917859=>'NSM',
-917860=>'NSM',
-917861=>'NSM',
-917862=>'NSM',
-917863=>'NSM',
-917864=>'NSM',
-917865=>'NSM',
-917866=>'NSM',
-917867=>'NSM',
-917868=>'NSM',
-917869=>'NSM',
-917870=>'NSM',
-917871=>'NSM',
-917872=>'NSM',
-917873=>'NSM',
-917874=>'NSM',
-917875=>'NSM',
-917876=>'NSM',
-917877=>'NSM',
-917878=>'NSM',
-917879=>'NSM',
-917880=>'NSM',
-917881=>'NSM',
-917882=>'NSM',
-917883=>'NSM',
-917884=>'NSM',
-917885=>'NSM',
-917886=>'NSM',
-917887=>'NSM',
-917888=>'NSM',
-917889=>'NSM',
-917890=>'NSM',
-917891=>'NSM',
-917892=>'NSM',
-917893=>'NSM',
-917894=>'NSM',
-917895=>'NSM',
-917896=>'NSM',
-917897=>'NSM',
-917898=>'NSM',
-917899=>'NSM',
-917900=>'NSM',
-917901=>'NSM',
-917902=>'NSM',
-917903=>'NSM',
-917904=>'NSM',
-917905=>'NSM',
-917906=>'NSM',
-917907=>'NSM',
-917908=>'NSM',
-917909=>'NSM',
-917910=>'NSM',
-917911=>'NSM',
-917912=>'NSM',
-917913=>'NSM',
-917914=>'NSM',
-917915=>'NSM',
-917916=>'NSM',
-917917=>'NSM',
-917918=>'NSM',
-917919=>'NSM',
-917920=>'NSM',
-917921=>'NSM',
-917922=>'NSM',
-917923=>'NSM',
-917924=>'NSM',
-917925=>'NSM',
-917926=>'NSM',
-917927=>'NSM',
-917928=>'NSM',
-917929=>'NSM',
-917930=>'NSM',
-917931=>'NSM',
-917932=>'NSM',
-917933=>'NSM',
-917934=>'NSM',
-917935=>'NSM',
-917936=>'NSM',
-917937=>'NSM',
-917938=>'NSM',
-917939=>'NSM',
-917940=>'NSM',
-917941=>'NSM',
-917942=>'NSM',
-917943=>'NSM',
-917944=>'NSM',
-917945=>'NSM',
-917946=>'NSM',
-917947=>'NSM',
-917948=>'NSM',
-917949=>'NSM',
-917950=>'NSM',
-917951=>'NSM',
-917952=>'NSM',
-917953=>'NSM',
-917954=>'NSM',
-917955=>'NSM',
-917956=>'NSM',
-917957=>'NSM',
-917958=>'NSM',
-917959=>'NSM',
-917960=>'NSM',
-917961=>'NSM',
-917962=>'NSM',
-917963=>'NSM',
-917964=>'NSM',
-917965=>'NSM',
-917966=>'NSM',
-917967=>'NSM',
-917968=>'NSM',
-917969=>'NSM',
-917970=>'NSM',
-917971=>'NSM',
-917972=>'NSM',
-917973=>'NSM',
-917974=>'NSM',
-917975=>'NSM',
-917976=>'NSM',
-917977=>'NSM',
-917978=>'NSM',
-917979=>'NSM',
-917980=>'NSM',
-917981=>'NSM',
-917982=>'NSM',
-917983=>'NSM',
-917984=>'NSM',
-917985=>'NSM',
-917986=>'NSM',
-917987=>'NSM',
-917988=>'NSM',
-917989=>'NSM',
-917990=>'NSM',
-917991=>'NSM',
-917992=>'NSM',
-917993=>'NSM',
-917994=>'NSM',
-917995=>'NSM',
-917996=>'NSM',
-917997=>'NSM',
-917998=>'NSM',
-917999=>'NSM',
-983040=>'L',
-1048573=>'L',
-1048576=>'L',
-1114109=>'L'
-);
-
-/**
- * @var Mirror unicode characters.
- * For information on bidi mirroring, see UAX #9: Bidirectional Algorithm,
- * at http://www.unicode.org/unicode/reports/tr9/
- * @access public
- */
-public $uni_mirror = array (
-0x0028=>0x0029,
-0x0029=>0x0028,
-0x003C=>0x003E,
-0x003E=>0x003C,
-0x005B=>0x005D,
-0x005D=>0x005B,
-0x007B=>0x007D,
-0x007D=>0x007B,
-0x00AB=>0x00BB,
-0x00BB=>0x00AB,
-0x0F3A=>0x0F3B,
-0x0F3B=>0x0F3A,
-0x0F3C=>0x0F3D,
-0x0F3D=>0x0F3C,
-0x169B=>0x169C,
-0x169C=>0x169B,
-0x2018=>0x2019,
-0x2019=>0x2018,
-0x201C=>0x201D,
-0x201D=>0x201C,
-0x2039=>0x203A,
-0x203A=>0x2039,
-0x2045=>0x2046,
-0x2046=>0x2045,
-0x207D=>0x207E,
-0x207E=>0x207D,
-0x208D=>0x208E,
-0x208E=>0x208D,
-0x2208=>0x220B,
-0x2209=>0x220C,
-0x220A=>0x220D,
-0x220B=>0x2208,
-0x220C=>0x2209,
-0x220D=>0x220A,
-0x2215=>0x29F5,
-0x223C=>0x223D,
-0x223D=>0x223C,
-0x2243=>0x22CD,
-0x2252=>0x2253,
-0x2253=>0x2252,
-0x2254=>0x2255,
-0x2255=>0x2254,
-0x2264=>0x2265,
-0x2265=>0x2264,
-0x2266=>0x2267,
-0x2267=>0x2266,
-0x2268=>0x2269,
-0x2269=>0x2268,
-0x226A=>0x226B,
-0x226B=>0x226A,
-0x226E=>0x226F,
-0x226F=>0x226E,
-0x2270=>0x2271,
-0x2271=>0x2270,
-0x2272=>0x2273,
-0x2273=>0x2272,
-0x2274=>0x2275,
-0x2275=>0x2274,
-0x2276=>0x2277,
-0x2277=>0x2276,
-0x2278=>0x2279,
-0x2279=>0x2278,
-0x227A=>0x227B,
-0x227B=>0x227A,
-0x227C=>0x227D,
-0x227D=>0x227C,
-0x227E=>0x227F,
-0x227F=>0x227E,
-0x2280=>0x2281,
-0x2281=>0x2280,
-0x2282=>0x2283,
-0x2283=>0x2282,
-0x2284=>0x2285,
-0x2285=>0x2284,
-0x2286=>0x2287,
-0x2287=>0x2286,
-0x2288=>0x2289,
-0x2289=>0x2288,
-0x228A=>0x228B,
-0x228B=>0x228A,
-0x228F=>0x2290,
-0x2290=>0x228F,
-0x2291=>0x2292,
-0x2292=>0x2291,
-0x2298=>0x29B8,
-0x22A2=>0x22A3,
-0x22A3=>0x22A2,
-0x22A6=>0x2ADE,
-0x22A8=>0x2AE4,
-0x22A9=>0x2AE3,
-0x22AB=>0x2AE5,
-0x22B0=>0x22B1,
-0x22B1=>0x22B0,
-0x22B2=>0x22B3,
-0x22B3=>0x22B2,
-0x22B4=>0x22B5,
-0x22B5=>0x22B4,
-0x22B6=>0x22B7,
-0x22B7=>0x22B6,
-0x22C9=>0x22CA,
-0x22CA=>0x22C9,
-0x22CB=>0x22CC,
-0x22CC=>0x22CB,
-0x22CD=>0x2243,
-0x22D0=>0x22D1,
-0x22D1=>0x22D0,
-0x22D6=>0x22D7,
-0x22D7=>0x22D6,
-0x22D8=>0x22D9,
-0x22D9=>0x22D8,
-0x22DA=>0x22DB,
-0x22DB=>0x22DA,
-0x22DC=>0x22DD,
-0x22DD=>0x22DC,
-0x22DE=>0x22DF,
-0x22DF=>0x22DE,
-0x22E0=>0x22E1,
-0x22E1=>0x22E0,
-0x22E2=>0x22E3,
-0x22E3=>0x22E2,
-0x22E4=>0x22E5,
-0x22E5=>0x22E4,
-0x22E6=>0x22E7,
-0x22E7=>0x22E6,
-0x22E8=>0x22E9,
-0x22E9=>0x22E8,
-0x22EA=>0x22EB,
-0x22EB=>0x22EA,
-0x22EC=>0x22ED,
-0x22ED=>0x22EC,
-0x22F0=>0x22F1,
-0x22F1=>0x22F0,
-0x22F2=>0x22FA,
-0x22F3=>0x22FB,
-0x22F4=>0x22FC,
-0x22F6=>0x22FD,
-0x22F7=>0x22FE,
-0x22FA=>0x22F2,
-0x22FB=>0x22F3,
-0x22FC=>0x22F4,
-0x22FD=>0x22F6,
-0x22FE=>0x22F7,
-0x2308=>0x2309,
-0x2309=>0x2308,
-0x230A=>0x230B,
-0x230B=>0x230A,
-0x2329=>0x232A,
-0x232A=>0x2329,
-0x2768=>0x2769,
-0x2769=>0x2768,
-0x276A=>0x276B,
-0x276B=>0x276A,
-0x276C=>0x276D,
-0x276D=>0x276C,
-0x276E=>0x276F,
-0x276F=>0x276E,
-0x2770=>0x2771,
-0x2771=>0x2770,
-0x2772=>0x2773,
-0x2773=>0x2772,
-0x2774=>0x2775,
-0x2775=>0x2774,
-0x27C3=>0x27C4,
-0x27C4=>0x27C3,
-0x27C5=>0x27C6,
-0x27C6=>0x27C5,
-0x27D5=>0x27D6,
-0x27D6=>0x27D5,
-0x27DD=>0x27DE,
-0x27DE=>0x27DD,
-0x27E2=>0x27E3,
-0x27E3=>0x27E2,
-0x27E4=>0x27E5,
-0x27E5=>0x27E4,
-0x27E6=>0x27E7,
-0x27E7=>0x27E6,
-0x27E8=>0x27E9,
-0x27E9=>0x27E8,
-0x27EA=>0x27EB,
-0x27EB=>0x27EA,
-0x2983=>0x2984,
-0x2984=>0x2983,
-0x2985=>0x2986,
-0x2986=>0x2985,
-0x2987=>0x2988,
-0x2988=>0x2987,
-0x2989=>0x298A,
-0x298A=>0x2989,
-0x298B=>0x298C,
-0x298C=>0x298B,
-0x298D=>0x2990,
-0x298E=>0x298F,
-0x298F=>0x298E,
-0x2990=>0x298D,
-0x2991=>0x2992,
-0x2992=>0x2991,
-0x2993=>0x2994,
-0x2994=>0x2993,
-0x2995=>0x2996,
-0x2996=>0x2995,
-0x2997=>0x2998,
-0x2998=>0x2997,
-0x29B8=>0x2298,
-0x29C0=>0x29C1,
-0x29C1=>0x29C0,
-0x29C4=>0x29C5,
-0x29C5=>0x29C4,
-0x29CF=>0x29D0,
-0x29D0=>0x29CF,
-0x29D1=>0x29D2,
-0x29D2=>0x29D1,
-0x29D4=>0x29D5,
-0x29D5=>0x29D4,
-0x29D8=>0x29D9,
-0x29D9=>0x29D8,
-0x29DA=>0x29DB,
-0x29DB=>0x29DA,
-0x29F5=>0x2215,
-0x29F8=>0x29F9,
-0x29F9=>0x29F8,
-0x29FC=>0x29FD,
-0x29FD=>0x29FC,
-0x2A2B=>0x2A2C,
-0x2A2C=>0x2A2B,
-0x2A2D=>0x2A2E,
-0x2A2E=>0x2A2D,
-0x2A34=>0x2A35,
-0x2A35=>0x2A34,
-0x2A3C=>0x2A3D,
-0x2A3D=>0x2A3C,
-0x2A64=>0x2A65,
-0x2A65=>0x2A64,
-0x2A79=>0x2A7A,
-0x2A7A=>0x2A79,
-0x2A7D=>0x2A7E,
-0x2A7E=>0x2A7D,
-0x2A7F=>0x2A80,
-0x2A80=>0x2A7F,
-0x2A81=>0x2A82,
-0x2A82=>0x2A81,
-0x2A83=>0x2A84,
-0x2A84=>0x2A83,
-0x2A8B=>0x2A8C,
-0x2A8C=>0x2A8B,
-0x2A91=>0x2A92,
-0x2A92=>0x2A91,
-0x2A93=>0x2A94,
-0x2A94=>0x2A93,
-0x2A95=>0x2A96,
-0x2A96=>0x2A95,
-0x2A97=>0x2A98,
-0x2A98=>0x2A97,
-0x2A99=>0x2A9A,
-0x2A9A=>0x2A99,
-0x2A9B=>0x2A9C,
-0x2A9C=>0x2A9B,
-0x2AA1=>0x2AA2,
-0x2AA2=>0x2AA1,
-0x2AA6=>0x2AA7,
-0x2AA7=>0x2AA6,
-0x2AA8=>0x2AA9,
-0x2AA9=>0x2AA8,
-0x2AAA=>0x2AAB,
-0x2AAB=>0x2AAA,
-0x2AAC=>0x2AAD,
-0x2AAD=>0x2AAC,
-0x2AAF=>0x2AB0,
-0x2AB0=>0x2AAF,
-0x2AB3=>0x2AB4,
-0x2AB4=>0x2AB3,
-0x2ABB=>0x2ABC,
-0x2ABC=>0x2ABB,
-0x2ABD=>0x2ABE,
-0x2ABE=>0x2ABD,
-0x2ABF=>0x2AC0,
-0x2AC0=>0x2ABF,
-0x2AC1=>0x2AC2,
-0x2AC2=>0x2AC1,
-0x2AC3=>0x2AC4,
-0x2AC4=>0x2AC3,
-0x2AC5=>0x2AC6,
-0x2AC6=>0x2AC5,
-0x2ACD=>0x2ACE,
-0x2ACE=>0x2ACD,
-0x2ACF=>0x2AD0,
-0x2AD0=>0x2ACF,
-0x2AD1=>0x2AD2,
-0x2AD2=>0x2AD1,
-0x2AD3=>0x2AD4,
-0x2AD4=>0x2AD3,
-0x2AD5=>0x2AD6,
-0x2AD6=>0x2AD5,
-0x2ADE=>0x22A6,
-0x2AE3=>0x22A9,
-0x2AE4=>0x22A8,
-0x2AE5=>0x22AB,
-0x2AEC=>0x2AED,
-0x2AED=>0x2AEC,
-0x2AF7=>0x2AF8,
-0x2AF8=>0x2AF7,
-0x2AF9=>0x2AFA,
-0x2AFA=>0x2AF9,
-0x2E02=>0x2E03,
-0x2E03=>0x2E02,
-0x2E04=>0x2E05,
-0x2E05=>0x2E04,
-0x2E09=>0x2E0A,
-0x2E0A=>0x2E09,
-0x2E0C=>0x2E0D,
-0x2E0D=>0x2E0C,
-0x2E1C=>0x2E1D,
-0x2E1D=>0x2E1C,
-0x3008=>0x3009,
-0x3009=>0x3008,
-0x300A=>0x300B,
-0x300B=>0x300A,
-0x300C=>0x300D,
-0x300D=>0x300C,
-0x300E=>0x300F,
-0x300F=>0x300E,
-0x3010=>0x3011,
-0x3011=>0x3010,
-0x3014=>0x3015,
-0x3015=>0x3014,
-0x3016=>0x3017,
-0x3017=>0x3016,
-0x3018=>0x3019,
-0x3019=>0x3018,
-0x301A=>0x301B,
-0x301B=>0x301A,
-0x301D=>0x301E,
-0x301E=>0x301D,
-0xFE59=>0xFE5A,
-0xFE5A=>0xFE59,
-0xFE5B=>0xFE5C,
-0xFE5C=>0xFE5B,
-0xFE5D=>0xFE5E,
-0xFE5E=>0xFE5D,
-0xFE64=>0xFE65,
-0xFE65=>0xFE64,
-0xFF08=>0xFF09,
-0xFF09=>0xFF08,
-0xFF1C=>0xFF1E,
-0xFF1E=>0xFF1C,
-0xFF3B=>0xFF3D,
-0xFF3D=>0xFF3B,
-0xFF5B=>0xFF5D,
-0xFF5D=>0xFF5B,
-0xFF5F=>0xFF60,
-0xFF60=>0xFF5F,
-0xFF62=>0xFF63,
-0xFF63=>0xFF62);
-
-/**
- * @var Arabic shape substitutions: char code => (isolated, final, initial, medial)
- * @access public
- */
-public $uni_arabicsubst = array(
-1569=>array(65152),
-1570=>array(65153, 65154, 65153, 65154),
-1571=>array(65155, 65156, 65155, 65156),
-1572=>array(65157, 65158),
-1573=>array(65159, 65160, 65159, 65160),
-1574=>array(65161, 65162, 65163, 65164),
-1575=>array(65165, 65166, 65165, 65166),
-1576=>array(65167, 65168, 65169, 65170),
-1577=>array(65171, 65172),
-1578=>array(65173, 65174, 65175, 65176),
-1579=>array(65177, 65178, 65179, 65180),
-1580=>array(65181, 65182, 65183, 65184),
-1581=>array(65185, 65186, 65187, 65188),
-1582=>array(65189, 65190, 65191, 65192),
-1583=>array(65193, 65194, 65193, 65194),
-1584=>array(65195, 65196, 65195, 65196),
-1585=>array(65197, 65198, 65197, 65198),
-1586=>array(65199, 65200, 65199, 65200),
-1587=>array(65201, 65202, 65203, 65204),
-1588=>array(65205, 65206, 65207, 65208),
-1589=>array(65209, 65210, 65211, 65212),
-1590=>array(65213, 65214, 65215, 65216),
-1591=>array(65217, 65218, 65219, 65220),
-1592=>array(65221, 65222, 65223, 65224),
-1593=>array(65225, 65226, 65227, 65228),
-1594=>array(65229, 65230, 65231, 65232),
-1601=>array(65233, 65234, 65235, 65236),
-1602=>array(65237, 65238, 65239, 65240),
-1603=>array(65241, 65242, 65243, 65244),
-1604=>array(65245, 65246, 65247, 65248),
-1605=>array(65249, 65250, 65251, 65252),
-1606=>array(65253, 65254, 65255, 65256),
-1607=>array(65257, 65258, 65259, 65260),
-1608=>array(65261, 65262, 65261, 65262),
-1609=>array(65263, 65264, 64488, 64489),
-1610=>array(65265, 65266, 65267, 65268),
-1649=>array(64336, 64337),
-1655=>array(64477),
-1657=>array(64358, 64359, 64360, 64361),
-1658=>array(64350, 64351, 64352, 64353),
-1659=>array(64338, 64339, 64340, 64341),
-1662=>array(64342, 64343, 64344, 64345),
-1663=>array(64354, 64355, 64356, 64357),
-1664=>array(64346, 64347, 64348, 64349),
-1667=>array(64374, 64375, 64376, 64377),
-1668=>array(64370, 64371, 64372, 64373),
-1670=>array(64378, 64379, 64380, 64381),
-1671=>array(64382, 64383, 64384, 64385),
-1672=>array(64392, 64393),
-1676=>array(64388, 64389),
-1677=>array(64386, 64387),
-1678=>array(64390, 64391),
-1681=>array(64396, 64397),
-1688=>array(64394, 64395, 64394, 64395),
-1700=>array(64362, 64363, 64364, 64365),
-1702=>array(64366, 64367, 64368, 64369),
-1705=>array(64398, 64399, 64400, 64401),
-1709=>array(64467, 64468, 64469, 64470),
-1711=>array(64402, 64403, 64404, 64405),
-1713=>array(64410, 64411, 64412, 64413),
-1715=>array(64406, 64407, 64408, 64409),
-1722=>array(64414, 64415),
-1723=>array(64416, 64417, 64418, 64419),
-1726=>array(64426, 64427, 64428, 64429),
-1728=>array(64420, 64421),
-1729=>array(64422, 64423, 64424, 64425),
-1733=>array(64480, 64481),
-1734=>array(64473, 64474),
-1735=>array(64471, 64472),
-1736=>array(64475, 64476),
-1737=>array(64482, 64483),
-1739=>array(64478, 64479),
-1740=>array(64508, 64509, 64510, 64511),
-1744=>array(64484, 64485, 64486, 64487),
-1746=>array(64430, 64431),
-1747=>array(64432, 64433)
-);
-
-/**
- * @var Arabic laa letter: char code => isolated, final, initial, medial
- * @access public
- */
-public $uni_laa_array = array (
-1570 =>array(65269, 65270, 65269, 65270),
-1571 =>array(65271, 65272, 65271, 65272),
-1573 =>array(65273, 65274, 65273, 65274),
-1575 =>array(65275, 65276, 65275, 65276)
-);
-
-/**
- * @var Array of character substitutions for sequences of two diacritics symbols.
- * Putting the combining mark and character in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
- * second NSM char code => substitution char
- * @access public
- */
-public $uni_diacritics = array (
-1612=>64606, # Shadda + Dammatan
-1613=>64607, # Shadda + Kasratan
-1614=>64608, # Shadda + Fatha
-1615=>64609, # Shadda + Damma
-1616=>64610  # Shadda + Kasra
-);
-
-/**
- * @var Array of character substitutions from UTF-8 Unicode to Latin1
- * @access public
- */
-public $uni_utf8tolatin = array (
-8364=>128, # Euro1
-338=>140,  # OE
-352=>138,  # Scaron
-376=>159,  # Ydieresis
-381=>142,  # Zcaron2
-8226=>149, # bullet3
-710=>136,  # circumflex
-8224=>134, # dagger
-8225=>135, # daggerdbl
-8230=>133, # ellipsis
-8212=>151, # emdash
-8211=>150, # endash
-402=>131,  # florin
-8249=>139, # guilsinglleft
-8250=>155, # guilsinglright
-339=>156,  # oe
-8240=>137, # perthousand
-8222=>132, # quotedblbase
-8220=>147, # quotedblleft
-8221=>148, # quotedblright
-8216=>145, # quoteleft
-8217=>146, # quoteright
-8218=>130, # quotesinglbase
-353=>154,  # scaron
-732=>152,  # tilde
-8482=>153, # trademark
-382=>158   # zcaron2
-);
-
-} // --- END OF CLASS ---
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PasswordHasher.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PasswordHasher.php
index 49ffcef0e2c..65317d55b43 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PasswordHasher.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PasswordHasher.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_PasswordHasher
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/String.php b/htdocs/includes/phpexcel/PHPExcel/Shared/String.php
index aab02f1cd2d..a62a681662a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/String.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/String.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_String
 {
@@ -430,19 +430,29 @@ class PHPExcel_Shared_String
 	 * @param string $value UTF-8 encoded string
 	 * @return string
 	 */
-	public static function UTF8toBIFF8UnicodeShort($value)
+	public static function UTF8toBIFF8UnicodeShort($value, $arrcRuns = array())
 	{
 		// character count
 		$ln = self::CountCharacters($value, 'UTF-8');
 
 		// option flags
-		$opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
-			0x0001 : 0x0000;
-
-		// characters
-		$chars = self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
-
-		$data = pack('CC', $ln, $opt) . $chars;
+		if(empty($arrcRuns)){
+			$opt = (self::getIsIconvEnabled() || self::getIsMbstringEnabled()) ?
+				0x0001 : 0x0000;
+			$data = pack('CC', $ln, $opt);
+			// characters
+			$data .= self::ConvertEncoding($value, 'UTF-16LE', 'UTF-8');
+		}
+		else {
+			$data = pack('vC', $ln, 0x08);
+			$data .= pack('v', count($arrcRuns));
+			// characters
+			$data .= $value;
+			foreach ($arrcRuns as $cRun){
+				$data .= pack('v', $cRun['strlen']);
+				$data .= pack('v', $cRun['fontidx']);
+			}
+		}
 		return $data;
 	}
 
@@ -602,7 +612,7 @@ class PHPExcel_Shared_String
 	{
 		if (!isset(self::$_decimalSeparator)) {
 			$localeconv = localeconv();
-			self::$_decimalSeparator = $localeconv['decimal_point'] != ''
+			self::$_decimalSeparator = ($localeconv['decimal_point'] != '')
 				? $localeconv['decimal_point'] : $localeconv['mon_decimal_point'];
 
 			if (self::$_decimalSeparator == '') {
@@ -634,7 +644,7 @@ class PHPExcel_Shared_String
 	{
 		if (!isset(self::$_thousandsSeparator)) {
 			$localeconv = localeconv();
-			self::$_thousandsSeparator = $localeconv['thousands_sep'] != ''
+			self::$_thousandsSeparator = ($localeconv['thousands_sep'] != '')
 				? $localeconv['thousands_sep'] : $localeconv['mon_thousands_sep'];
 		}
 		return self::$_thousandsSeparator;
@@ -661,7 +671,7 @@ class PHPExcel_Shared_String
 	{
 		if (!isset(self::$_currencyCode)) {
 			$localeconv = localeconv();
-			self::$_currencyCode = $localeconv['currency_symbol'] != ''
+			self::$_currencyCode = ($localeconv['currency_symbol'] != '')
 				? $localeconv['currency_symbol'] : $localeconv['int_curr_symbol'];
 
 			if (self::$_currencyCode == '') {
@@ -673,10 +683,10 @@ class PHPExcel_Shared_String
 	}
 
 	/**
-	 *	Set the currency code. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
+	 * Set the currency code. Only used by PHPExcel_Style_NumberFormat::toFormattedString()
 	 *		to format output by PHPExcel_Writer_HTML and PHPExcel_Writer_PDF
 	 *
-	 *	@param string $pValue Character for currency code
+	 * @param string $pValue Character for currency code
 	 */
 	public static function setCurrencyCode($pValue = '$')
 	{
@@ -703,4 +713,18 @@ class PHPExcel_Shared_String
 		return $pValue;
 	}
 
+	/**
+	 * Retrieve any leading numeric part of a string, or return the full string if no leading numeric
+	 *	(handles basic integer or float, but not exponent or non decimal)
+	 *
+	 * @param	string	$value
+	 * @return	mixed	string or only the leading numeric part of the string
+	 */
+	public static function testStringAsNumeric($value)
+	{
+		if (is_numeric($value))
+			return $value;
+		$v = floatval($value);
+		return (is_numeric(substr($value,0,strlen($v)))) ? $v : $value;
+	}
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/XMLWriter.php b/htdocs/includes/phpexcel/PHPExcel/Shared/XMLWriter.php
index 96ef1b41194..403c0996adb 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/XMLWriter.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/XMLWriter.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 if (!defined('DATE_W3C')) {
@@ -39,7 +39,7 @@ if (!defined('DEBUGMODE_ENABLED')) {
  *
  * @category   PHPExcel
  * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_XMLWriter extends XMLWriter {
 	/** Temporary storage method */
@@ -59,12 +59,14 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
 	 * @param int		$pTemporaryStorage			Temporary storage location
 	 * @param string	$pTemporaryStorageFolder	Temporary storage folder
 	 */
-	public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = './') {
+	public function __construct($pTemporaryStorage = self::STORAGE_MEMORY, $pTemporaryStorageFolder = NULL) {
 		// Open temporary storage
 		if ($pTemporaryStorage == self::STORAGE_MEMORY) {
 			$this->openMemory();
 		} else {
 			// Create temporary filename
+			if ($pTemporaryStorageFolder === NULL)
+				$pTemporaryStorageFolder = PHPExcel_Shared_File::sys_get_temp_dir();
 			$this->_tempFileName = @tempnam($pTemporaryStorageFolder, 'xml');
 
 			// Open storage
@@ -112,6 +114,10 @@ class PHPExcel_Shared_XMLWriter extends XMLWriter {
 	 */
 	public function writeRawData($text)
 	{
+		if (is_array($text)) {
+			$text = implode("\n",$text);
+		}
+
 		if (method_exists($this, 'writeRaw')) {
 			return $this->writeRaw(htmlspecialchars($text));
 		}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/ZipArchive.php b/htdocs/includes/phpexcel/PHPExcel/Shared/ZipArchive.php
index 559f166a6fd..56d7c391854 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/ZipArchive.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/ZipArchive.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,11 +20,14 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_ZipArchive
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
+if (!defined('PCLZIP_TEMPORARY_DIR')) {
+	define('PCLZIP_TEMPORARY_DIR', PHPExcel_Shared_File::sys_get_temp_dir());
+}
 require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PCLZip/pclzip.lib.php';
 
 
@@ -33,11 +36,16 @@ require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PCLZip/pclzip.lib.php';
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared_ZipArchive
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_ZipArchive
 {
 
+	/**	constants */
+	const OVERWRITE		= 'OVERWRITE';
+	const CREATE		= 'CREATE';
+
+
 	/**
 	 * Temporary storage directory
 	 *
@@ -53,6 +61,12 @@ class PHPExcel_Shared_ZipArchive
 	private $_zip;
 
 
+    /**
+	 * Open a new zip archive
+	 *
+	 * @param	string	$fileName	Filename for the zip archive
+	 * @return	boolean
+     */
 	public function open($fileName)
 	{
 		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
@@ -63,11 +77,21 @@ class PHPExcel_Shared_ZipArchive
 	}
 
 
+    /**
+	 * Close this zip archive
+	 *
+     */
 	public function close()
 	{
 	}
 
 
+    /**
+	 * Add a new file to the zip archive from a string of raw data.
+	 *
+	 * @param	string	$localname		Directory/Name of the file to add to the zip archive
+	 * @param	string	$contents		String of data to add to the zip archive
+     */
 	public function addFromString($localname, $contents)
 	{
 		$filenameParts = pathinfo($localname);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/ZipStreamWrapper.php b/htdocs/includes/phpexcel/PHPExcel/Shared/ZipStreamWrapper.php
index 06df19dedc1..58d7e020a1c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/ZipStreamWrapper.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/ZipStreamWrapper.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Shared_ZipStreamWrapper {
 	/**
@@ -71,7 +71,13 @@ class PHPExcel_Shared_ZipStreamWrapper {
     }
 
     /**
-     * Open stream
+	 * Implements support for fopen().
+	 *
+	 * @param	string	$path			resource name including scheme, e.g.
+	 * @param	string	$mode			only "r" is supported
+	 * @param	int		$options		mask of STREAM_REPORT_ERRORS and STREAM_USE_PATH
+	 * @param	string  &$openedPath	absolute path of the opened stream (out parameter)
+	 * @return	bool    true on success
      */
     public function stream_open($path, $mode, $options, &$opened_path) {
         // Check for mode
@@ -95,14 +101,19 @@ class PHPExcel_Shared_ZipStreamWrapper {
     }
 
     /**
-     * Stat stream
+	 * Implements support for fstat().
+	 *
+	 * @return  boolean
      */
     public function stream_stat() {
         return $this->_archive->statName( $this->_fileNameInArchive );
     }
 
     /**
-     * Read stream
+	 * Implements support for fread(), fgets() etc.
+	 *
+	 * @param   int		$count	maximum number of bytes to read
+	 * @return  string
      */
     function stream_read($count) {
         $ret = substr($this->_data, $this->_position, $count);
@@ -111,7 +122,10 @@ class PHPExcel_Shared_ZipStreamWrapper {
     }
 
     /**
-     * Tell stream
+	 * Returns the position of the file pointer, i.e. its offset into the file
+	 * stream. Implements support for ftell().
+	 *
+	 * @return  int
      */
     public function stream_tell() {
         return $this->_position;
@@ -119,6 +133,8 @@ class PHPExcel_Shared_ZipStreamWrapper {
 
     /**
      * EOF stream
+	 *
+	 * @return	bool
      */
     public function stream_eof() {
         return $this->_position >= strlen($this->_data);
@@ -126,6 +142,10 @@ class PHPExcel_Shared_ZipStreamWrapper {
 
     /**
      * Seek stream
+	 *
+	 * @param	int		$offset	byte offset
+	 * @param	int		$whence	SEEK_SET, SEEK_CUR or SEEK_END
+	 * @return	bool
      */
     public function stream_seek($offset, $whence) {
         switch ($whence) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/bestFitClass.php b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/bestFitClass.php
index 4224d4ffbe3..d86424f1a0d 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/bestFitClass.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/bestFitClass.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -30,23 +30,58 @@
  * PHPExcel_Best_Fit
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Best_Fit
 {
+	/**
+	 * Indicator flag for a calculation error
+	 *
+	 * @var	boolean
+	 **/
 	protected $_error				= False;
 
+	/**
+	 * Algorithm type to use for best-fit
+	 *
+	 * @var	string
+	 **/
 	protected $_bestFitType			= 'undetermined';
 
+	/**
+	 * Number of entries in the sets of x- and y-value arrays
+	 *
+	 * @var	int
+	 **/
 	protected $_valueCount			= 0;
 
+	/**
+	 * X-value dataseries of values
+	 *
+	 * @var	float[]
+	 **/
 	protected $_xValues				= array();
 
+	/**
+	 * Y-value dataseries of values
+	 *
+	 * @var	float[]
+	 **/
 	protected $_yValues				= array();
 
+	/**
+	 * Flag indicating whether values should be adjusted to Y=0
+	 *
+	 * @var	boolean
+	 **/
 	protected $_adjustToZero		= False;
 
+	/**
+	 * Y-value series of best-fit values
+	 *
+	 * @var	float[]
+	 **/
 	protected $_yBestFitValues		= array();
 
 	protected $_goodnessOfFit 		= 1;
@@ -88,26 +123,55 @@ class PHPExcel_Best_Fit
 	}	//	function getBestFitType()
 
 
+	/**
+	 * Return the Y-Value for a specified value of X
+	 *
+	 * @param	 float		$xValue			X-Value
+	 * @return	 float						Y-Value
+	 */
 	public function getValueOfYForX($xValue) {
 		return False;
 	}	//	function getValueOfYForX()
 
 
+	/**
+	 * Return the X-Value for a specified value of Y
+	 *
+	 * @param	 float		$yValue			Y-Value
+	 * @return	 float						X-Value
+	 */
 	public function getValueOfXForY($yValue) {
 		return False;
 	}	//	function getValueOfXForY()
 
 
+	/**
+	 * Return the original set of X-Values
+	 *
+	 * @return	 float[]				X-Values
+	 */
 	public function getXValues() {
 		return $this->_xValues;
 	}	//	function getValueOfXForY()
 
 
+	/**
+	 * Return the Equation of the best-fit line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 */
 	public function getEquation($dp=0) {
 		return False;
 	}	//	function getEquation()
 
 
+	/**
+	 * Return the Slope of the line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 */
 	public function getSlope($dp=0) {
 		if ($dp != 0) {
 			return round($this->_slope,$dp);
@@ -116,6 +180,12 @@ class PHPExcel_Best_Fit
 	}	//	function getSlope()
 
 
+	/**
+	 * Return the standard error of the Slope
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 */
 	public function getSlopeSE($dp=0) {
 		if ($dp != 0) {
 			return round($this->_slopeSE,$dp);
@@ -124,6 +194,12 @@ class PHPExcel_Best_Fit
 	}	//	function getSlopeSE()
 
 
+	/**
+	 * Return the Value of X where it intersects Y = 0
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 */
 	public function getIntersect($dp=0) {
 		if ($dp != 0) {
 			return round($this->_intersect,$dp);
@@ -132,6 +208,12 @@ class PHPExcel_Best_Fit
 	}	//	function getIntersect()
 
 
+	/**
+	 * Return the standard error of the Intersect
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 */
 	public function getIntersectSE($dp=0) {
 		if ($dp != 0) {
 			return round($this->_intersectSE,$dp);
@@ -140,6 +222,12 @@ class PHPExcel_Best_Fit
 	}	//	function getIntersectSE()
 
 
+	/**
+	 * Return the goodness of fit for this regression
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to return
+	 * @return	 float
+	 */
 	public function getGoodnessOfFit($dp=0) {
 		if ($dp != 0) {
 			return round($this->_goodnessOfFit,$dp);
@@ -156,6 +244,12 @@ class PHPExcel_Best_Fit
 	}	//	function getGoodnessOfFitPercent()
 
 
+	/**
+	 * Return the standard deviation of the residuals for this regression
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to return
+	 * @return	 float
+	 */
 	public function getStdevOfResiduals($dp=0) {
 		if ($dp != 0) {
 			return round($this->_stdevOfResiduals,$dp);
@@ -308,6 +402,13 @@ class PHPExcel_Best_Fit
 	}	//	function _leastSquareFit()
 
 
+	/**
+	 * Define the regression
+	 *
+	 * @param	float[]		$yValues	The set of Y-values for this regression
+	 * @param	float[]		$xValues	The set of X-values for this regression
+	 * @param	boolean		$const
+	 */
 	function __construct($yValues, $xValues=array(), $const=True) {
 		//	Calculate number of points
 		$nY = count($yValues);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/exponentialBestFitClass.php b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
index b2a3b331345..cc44678bea8 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -33,24 +33,48 @@ require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
  * PHPExcel_Exponential_Best_Fit
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
 {
+	/**
+	 * Algorithm type to use for best-fit
+	 * (Name of this trend class)
+	 *
+	 * @var	string
+	 **/
 	protected $_bestFitType		= 'exponential';
 
 
+	/**
+	 * Return the Y-Value for a specified value of X
+	 *
+	 * @param	 float		$xValue			X-Value
+	 * @return	 float						Y-Value
+	 **/
 	public function getValueOfYForX($xValue) {
 		return $this->getIntersect() * pow($this->getSlope(),($xValue - $this->_Xoffset));
 	}	//	function getValueOfYForX()
 
 
+	/**
+	 * Return the X-Value for a specified value of Y
+	 *
+	 * @param	 float		$yValue			Y-Value
+	 * @return	 float						X-Value
+	 **/
 	public function getValueOfXForY($yValue) {
 		return log(($yValue + $this->_Yoffset) / $this->getIntersect()) / log($this->getSlope());
 	}	//	function getValueOfXForY()
 
 
+	/**
+	 * Return the Equation of the best-fit line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getEquation($dp=0) {
 		$slope = $this->getSlope($dp);
 		$intersect = $this->getIntersect($dp);
@@ -59,6 +83,12 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getEquation()
 
 
+	/**
+	 * Return the Slope of the line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getSlope($dp=0) {
 		if ($dp != 0) {
 			return round(exp($this->_slope),$dp);
@@ -67,6 +97,12 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getSlope()
 
 
+	/**
+	 * Return the Value of X where it intersects Y = 0
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getIntersect($dp=0) {
 		if ($dp != 0) {
 			return round(exp($this->_intersect),$dp);
@@ -75,6 +111,13 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getIntersect()
 
 
+	/**
+	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	 float[]	$yValues	The set of Y-values for this regression
+	 * @param	 float[]	$xValues	The set of X-values for this regression
+	 * @param	 boolean	$const
+	 */
 	private function _exponential_regression($yValues, $xValues, $const) {
 		foreach($yValues as &$value) {
 			if ($value < 0.0) {
@@ -89,6 +132,13 @@ class PHPExcel_Exponential_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function _exponential_regression()
 
 
+	/**
+	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	float[]		$yValues	The set of Y-values for this regression
+	 * @param	float[]		$xValues	The set of X-values for this regression
+	 * @param	boolean		$const
+	 */
 	function __construct($yValues, $xValues=array(), $const=True) {
 		if (parent::__construct($yValues, $xValues) !== False) {
 			$this->_exponential_regression($yValues, $xValues, $const);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/linearBestFitClass.php b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/linearBestFitClass.php
index 19a8641134c..9aa44fec24e 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/linearBestFitClass.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/linearBestFitClass.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -33,24 +33,48 @@ require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
  * PHPExcel_Linear_Best_Fit
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
 {
+	/**
+	 * Algorithm type to use for best-fit
+	 * (Name of this trend class)
+	 *
+	 * @var	string
+	 **/
 	protected $_bestFitType		= 'linear';
 
 
+	/**
+	 * Return the Y-Value for a specified value of X
+	 *
+	 * @param	 float		$xValue			X-Value
+	 * @return	 float						Y-Value
+	 **/
 	public function getValueOfYForX($xValue) {
 		return $this->getIntersect() + $this->getSlope() * $xValue;
 	}	//	function getValueOfYForX()
 
 
+	/**
+	 * Return the X-Value for a specified value of Y
+	 *
+	 * @param	 float		$yValue			Y-Value
+	 * @return	 float						X-Value
+	 **/
 	public function getValueOfXForY($yValue) {
 		return ($yValue - $this->getIntersect()) / $this->getSlope();
 	}	//	function getValueOfXForY()
 
 
+	/**
+	 * Return the Equation of the best-fit line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getEquation($dp=0) {
 		$slope = $this->getSlope($dp);
 		$intersect = $this->getIntersect($dp);
@@ -59,11 +83,25 @@ class PHPExcel_Linear_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getEquation()
 
 
+	/**
+	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	 float[]	$yValues	The set of Y-values for this regression
+	 * @param	 float[]	$xValues	The set of X-values for this regression
+	 * @param	 boolean	$const
+	 */
 	private function _linear_regression($yValues, $xValues, $const) {
 		$this->_leastSquareFit($yValues, $xValues,$const);
 	}	//	function _linear_regression()
 
 
+	/**
+	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	float[]		$yValues	The set of Y-values for this regression
+	 * @param	float[]		$xValues	The set of X-values for this regression
+	 * @param	boolean		$const
+	 */
 	function __construct($yValues, $xValues=array(), $const=True) {
 		if (parent::__construct($yValues, $xValues) !== False) {
 			$this->_linear_regression($yValues, $xValues, $const);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
index e5d98516c01..38aaa880381 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -33,24 +33,48 @@ require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php');
  * PHPExcel_Logarithmic_Best_Fit
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
 {
+	/**
+	 * Algorithm type to use for best-fit
+	 * (Name of this trend class)
+	 *
+	 * @var	string
+	 **/
 	protected $_bestFitType		= 'logarithmic';
 
 
+	/**
+	 * Return the Y-Value for a specified value of X
+	 *
+	 * @param	 float		$xValue			X-Value
+	 * @return	 float						Y-Value
+	 **/
 	public function getValueOfYForX($xValue) {
 		return $this->getIntersect() + $this->getSlope() * log($xValue - $this->_Xoffset);
 	}	//	function getValueOfYForX()
 
 
+	/**
+	 * Return the X-Value for a specified value of Y
+	 *
+	 * @param	 float		$yValue			Y-Value
+	 * @return	 float						X-Value
+	 **/
 	public function getValueOfXForY($yValue) {
 		return exp(($yValue - $this->getIntersect()) / $this->getSlope());
 	}	//	function getValueOfXForY()
 
 
+	/**
+	 * Return the Equation of the best-fit line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getEquation($dp=0) {
 		$slope = $this->getSlope($dp);
 		$intersect = $this->getIntersect($dp);
@@ -59,6 +83,13 @@ class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getEquation()
 
 
+	/**
+	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	 float[]	$yValues	The set of Y-values for this regression
+	 * @param	 float[]	$xValues	The set of X-values for this regression
+	 * @param	 boolean	$const
+	 */
 	private function _logarithmic_regression($yValues, $xValues, $const) {
 		foreach($xValues as &$value) {
 			if ($value < 0.0) {
@@ -73,6 +104,13 @@ class PHPExcel_Logarithmic_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function _logarithmic_regression()
 
 
+	/**
+	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	float[]		$yValues	The set of Y-values for this regression
+	 * @param	float[]		$xValues	The set of X-values for this regression
+	 * @param	boolean		$const
+	 */
 	function __construct($yValues, $xValues=array(), $const=True) {
 		if (parent::__construct($yValues, $xValues) !== False) {
 			$this->_logarithmic_regression($yValues, $xValues, $const);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/polynomialBestFitClass.php b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
index e16e2002ad7..7c05faf61be 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -34,21 +34,44 @@ require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/JAMA/Matrix.php';
  * PHPExcel_Polynomial_Best_Fit
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
 {
+	/**
+	 * Algorithm type to use for best-fit
+	 * (Name of this trend class)
+	 *
+	 * @var	string
+	 **/
 	protected $_bestFitType		= 'polynomial';
 
+	/**
+	 * Polynomial order
+	 *
+	 * @protected
+	 * @var	int
+	 **/
 	protected $_order			= 0;
 
 
+	/**
+	 * Return the order of this polynomial
+	 *
+	 * @return	 int
+	 **/
 	public function getOrder() {
 		return $this->_order;
 	}	//	function getOrder()
 
 
+	/**
+	 * Return the Y-Value for a specified value of X
+	 *
+	 * @param	 float		$xValue			X-Value
+	 * @return	 float						Y-Value
+	 **/
 	public function getValueOfYForX($xValue) {
 		$retVal = $this->getIntersect();
 		$slope = $this->getSlope();
@@ -61,11 +84,23 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getValueOfYForX()
 
 
+	/**
+	 * Return the X-Value for a specified value of Y
+	 *
+	 * @param	 float		$yValue			Y-Value
+	 * @return	 float						X-Value
+	 **/
 	public function getValueOfXForY($yValue) {
 		return ($yValue - $this->getIntersect()) / $this->getSlope();
 	}	//	function getValueOfXForY()
 
 
+	/**
+	 * Return the Equation of the best-fit line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getEquation($dp=0) {
 		$slope = $this->getSlope($dp);
 		$intersect = $this->getIntersect($dp);
@@ -83,6 +118,12 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getEquation()
 
 
+	/**
+	 * Return the Slope of the line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getSlope($dp=0) {
 		if ($dp != 0) {
 			$coefficients = array();
@@ -100,6 +141,14 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getCoefficients()
 
 
+	/**
+	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	int			$order		Order of Polynomial for this regression
+	 * @param	float[]		$yValues	The set of Y-values for this regression
+	 * @param	float[]		$xValues	The set of X-values for this regression
+	 * @param	boolean		$const
+	 */
 	private function _polynomial_regression($order, $yValues, $xValues, $const) {
 		// calculate sums
 		$x_sum = array_sum($xValues);
@@ -149,6 +198,14 @@ class PHPExcel_Polynomial_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function _polynomial_regression()
 
 
+	/**
+	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	int			$order		Order of Polynomial for this regression
+	 * @param	float[]		$yValues	The set of Y-values for this regression
+	 * @param	float[]		$xValues	The set of X-values for this regression
+	 * @param	boolean		$const
+	 */
 	function __construct($order, $yValues, $xValues=array(), $const=True) {
 		if (parent::__construct($yValues, $xValues) !== False) {
 			if ($order < $this->_valueCount) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/powerBestFitClass.php b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/powerBestFitClass.php
index bb82423d35b..20b36741e3f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/powerBestFitClass.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/powerBestFitClass.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -33,24 +33,48 @@ require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/bestFitClass.php';
  * PHPExcel_Power_Best_Fit
  *
  * @category   PHPExcel
- * @package    PHPExcel_Shared_Best_Fit
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
 {
+	/**
+	 * Algorithm type to use for best-fit
+	 * (Name of this trend class)
+	 *
+	 * @var	string
+	 **/
 	protected $_bestFitType		= 'power';
 
 
+	/**
+	 * Return the Y-Value for a specified value of X
+	 *
+	 * @param	 float		$xValue			X-Value
+	 * @return	 float						Y-Value
+	 **/
 	public function getValueOfYForX($xValue) {
 		return $this->getIntersect() * pow(($xValue - $this->_Xoffset),$this->getSlope());
 	}	//	function getValueOfYForX()
 
 
+	/**
+	 * Return the X-Value for a specified value of Y
+	 *
+	 * @param	 float		$yValue			Y-Value
+	 * @return	 float						X-Value
+	 **/
 	public function getValueOfXForY($yValue) {
 		return pow((($yValue + $this->_Yoffset) / $this->getIntersect()),(1 / $this->getSlope()));
 	}	//	function getValueOfXForY()
 
 
+	/**
+	 * Return the Equation of the best-fit line
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getEquation($dp=0) {
 		$slope = $this->getSlope($dp);
 		$intersect = $this->getIntersect($dp);
@@ -59,6 +83,12 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getEquation()
 
 
+	/**
+	 * Return the Value of X where it intersects Y = 0
+	 *
+	 * @param	 int		$dp		Number of places of decimal precision to display
+	 * @return	 string
+	 **/
 	public function getIntersect($dp=0) {
 		if ($dp != 0) {
 			return round(exp($this->_intersect),$dp);
@@ -67,6 +97,13 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function getIntersect()
 
 
+	/**
+	 * Execute the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	 float[]	$yValues	The set of Y-values for this regression
+	 * @param	 float[]	$xValues	The set of X-values for this regression
+	 * @param	 boolean	$const
+	 */
 	private function _power_regression($yValues, $xValues, $const) {
 		foreach($xValues as &$value) {
 			if ($value < 0.0) {
@@ -89,6 +126,13 @@ class PHPExcel_Power_Best_Fit extends PHPExcel_Best_Fit
 	}	//	function _power_regression()
 
 
+	/**
+	 * Define the regression and calculate the goodness of fit for a set of X and Y data values
+	 *
+	 * @param	 float[]	$yValues	The set of Y-values for this regression
+	 * @param	 float[]	$xValues	The set of X-values for this regression
+	 * @param	 boolean	$const
+	 */
 	function __construct($yValues, $xValues=array(), $const=True) {
 		if (parent::__construct($yValues, $xValues) !== False) {
 			$this->_power_regression($yValues, $xValues, $const);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/trendClass.php b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/trendClass.php
index f987831cdc8..63ccc04c311 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/trend/trendClass.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/trend/trendClass.php
@@ -1,4 +1,30 @@
 <?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
 
 require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/linearBestFitClass.php';
 require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/logarithmicBestFitClass.php';
@@ -7,6 +33,13 @@ require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/powerBestFitClass.php';
 require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/trend/polynomialBestFitClass.php';
 
 
+/**
+ * PHPExcel_trendClass
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Shared_Trend
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
 class trendClass
 {
 	const TREND_LINEAR				= 'Linear';
@@ -21,11 +54,21 @@ class trendClass
 	const TREND_BEST_FIT			= 'Bestfit';
 	const TREND_BEST_FIT_NO_POLY	= 'Bestfit_no_Polynomials';
 
+	/**
+	 * Names of the best-fit trend analysis methods
+	 *
+	 * @var string[]
+	 **/
 	private static $_trendTypes = array( self::TREND_LINEAR,
 										 self::TREND_LOGARITHMIC,
 										 self::TREND_EXPONENTIAL,
 										 self::TREND_POWER
 									   );
+	/**
+	 * Names of the best-fit trend polynomial orders
+	 *
+	 * @var string[]
+	 **/
 	private static $_trendTypePolyOrders = array( self::TREND_POLYNOMIAL_2,
 												  self::TREND_POLYNOMIAL_3,
 												  self::TREND_POLYNOMIAL_4,
@@ -33,6 +76,11 @@ class trendClass
 												  self::TREND_POLYNOMIAL_6
 											    );
 
+	/**
+	 * Cached results for each method when trying to identify which provides the best fit
+	 *
+	 * @var PHPExcel_Best_Fit[]
+	 **/
 	private static $_trendCache = array();
 
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style.php b/htdocs/includes/phpexcel/PHPExcel/Style.php
index 4cf468c9c5c..2fdef0e4cc9 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style implements PHPExcel_IComparable
 {
@@ -108,21 +108,26 @@ class PHPExcel_Style implements PHPExcel_IComparable
     /**
      * Create a new PHPExcel_Style
 	 *
-	 * @param boolean $isSupervisor
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
      */
-    public function __construct($isSupervisor = false)
+    public function __construct($isSupervisor = false, $isConditional = false)
     {
     	// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
     	$this->_conditionalStyles 	= array();
-		$this->_font				= new PHPExcel_Style_Font($isSupervisor);
-		$this->_fill				= new PHPExcel_Style_Fill($isSupervisor);
-		$this->_borders				= new PHPExcel_Style_Borders($isSupervisor);
-		$this->_alignment			= new PHPExcel_Style_Alignment($isSupervisor);
-		$this->_numberFormat		= new PHPExcel_Style_NumberFormat($isSupervisor);
-		$this->_protection			= new PHPExcel_Style_Protection($isSupervisor);
+		$this->_font				= new PHPExcel_Style_Font($isSupervisor, $isConditional);
+		$this->_fill				= new PHPExcel_Style_Fill($isSupervisor, $isConditional);
+		$this->_borders				= new PHPExcel_Style_Borders($isSupervisor, $isConditional);
+		$this->_alignment			= new PHPExcel_Style_Alignment($isSupervisor, $isConditional);
+		$this->_numberFormat		= new PHPExcel_Style_NumberFormat($isSupervisor, $isConditional);
+		$this->_protection			= new PHPExcel_Style_Protection($isSupervisor, $isConditional);
 
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {
@@ -414,7 +419,7 @@ class PHPExcel_Style implements PHPExcel_IComparable
 							$this->getActiveSheet()->getStyle($range)->applyFromArray($regionStyles, false);
 						}
 					}
-					return;
+					return $this;
 				}
 
 				// SIMPLE MODE:
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Alignment.php b/htdocs/includes/phpexcel/PHPExcel/Style/Alignment.php
index a274ae0d183..81ca387c5be 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Alignment.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Alignment.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Alignment implements PHPExcel_IComparable
 {
@@ -114,11 +114,24 @@ class PHPExcel_Style_Alignment implements PHPExcel_IComparable
 
 	/**
 	 * Create a new PHPExcel_Style_Alignment
+	 *
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
 	 */
-	public function __construct($isSupervisor = false)
+	public function __construct($isSupervisor = false, $isConditional = false)
 	{
 		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
+
+		if ($isConditional) {
+			$this->_horizontal		= NULL;
+			$this->_vertical		= NULL;
+			$this->_textRotation	= NULL;
+		}
 	}
 
 	/**
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Border.php b/htdocs/includes/phpexcel/PHPExcel/Style/Border.php
index c20de948a0b..6f8767fb277 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Border.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Border.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Border implements PHPExcel_IComparable
 {
@@ -88,14 +88,21 @@ class PHPExcel_Style_Border implements PHPExcel_IComparable
 
 	/**
 	 * Create a new PHPExcel_Style_Border
+	 *
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
 	 */
-	public function __construct($isSupervisor = false)
+	public function __construct($isSupervisor = false, $isConditional = false)
 	{
 		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
-		$this->_color			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+		$this->_color	= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
 
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Borders.php b/htdocs/includes/phpexcel/PHPExcel/Style/Borders.php
index 46c51b6d04c..d8a3196e3af 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Borders.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Borders.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Borders implements PHPExcel_IComparable
 {
@@ -141,18 +141,25 @@ class PHPExcel_Style_Borders implements PHPExcel_IComparable
 
 	/**
      * Create a new PHPExcel_Style_Borders
+	 *
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
      */
-    public function __construct($isSupervisor = false)
+    public function __construct($isSupervisor = false, $isConditional = false)
     {
     	// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
     	// Initialise values
-    	$this->_left				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_right				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_top					= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_bottom				= new PHPExcel_Style_Border($isSupervisor);
-    	$this->_diagonal			= new PHPExcel_Style_Border($isSupervisor);
+    	$this->_left				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
+    	$this->_right				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
+    	$this->_top					= new PHPExcel_Style_Border($isSupervisor, $isConditional);
+    	$this->_bottom				= new PHPExcel_Style_Border($isSupervisor, $isConditional);
+    	$this->_diagonal			= new PHPExcel_Style_Border($isSupervisor, $isConditional);
 		$this->_diagonalDirection	= PHPExcel_Style_Borders::DIAGONAL_NONE;
 
 		// Specially for supervisor
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Color.php b/htdocs/includes/phpexcel/PHPExcel/Style/Color.php
index b36e69c0e81..1c0f3f6808e 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Color.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Color.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @package	PHPExcel_Style
+ * @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version 1.7.8, 2012-10-12
  */
 
 
@@ -30,8 +30,8 @@
  * PHPExcel_Style_Color
  *
  * @category   PHPExcel
- * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package	PHPExcel_Style
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Color implements PHPExcel_IComparable
 {
@@ -59,7 +59,7 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 	 *
 	 * @var string
 	 */
-	private $_argb;
+	private $_argb	= NULL;
 
 	/**
 	 * Supervisor?
@@ -82,19 +82,28 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 	 */
 	private $_parentPropertyName;
 
-    /**
-     * Create a new PHPExcel_Style_Color
-     *
-     * @param string $pARGB
-     */
-    public function __construct($pARGB = PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor = false)
-    {
-    	// Supervisor?
+
+	/**
+	 * Create a new PHPExcel_Style_Color
+	 *
+	 * @param	string	$pARGB			ARGB value for the colour
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 */
+	public function __construct($pARGB = PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor = false, $isConditional = false)
+	{
+		//	Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
-    	// Initialise values
-    	$this->_argb			= $pARGB;
-    }
+		//	Initialise values
+		if (!$isConditional) {
+			$this->_argb = $pARGB;
+		}
+	}
 
 	/**
 	 * Bind parent. Only used for supervisor
@@ -129,17 +138,12 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 	public function getSharedComponent()
 	{
 		switch ($this->_parentPropertyName) {
-		case '_endColor':
-			return $this->_parent->getSharedComponent()->getEndColor();
-			break;
-
-		case '_color':
-			return $this->_parent->getSharedComponent()->getColor();
-			break;
-
-		case '_startColor':
-			return $this->_parent->getSharedComponent()->getStartColor();
-			break;
+			case '_endColor':
+				return $this->_parent->getSharedComponent()->getEndColor();		break;
+			case '_color':
+				return $this->_parent->getSharedComponent()->getColor();		break;
+			case '_startColor':
+				return $this->_parent->getSharedComponent()->getStartColor();	break;
 		}
 	}
 
@@ -184,34 +188,32 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 	public function getStyleArray($array)
 	{
 		switch ($this->_parentPropertyName) {
-		case '_endColor':
-			$key = 'endcolor';
-			break;
-
-		case '_color':
-			$key = 'color';
-			break;
-
-		case '_startColor':
-			$key = 'startcolor';
-			break;
+			case '_endColor':
+				$key = 'endcolor';
+				break;
+			case '_color':
+				$key = 'color';
+				break;
+			case '_startColor':
+				$key = 'startcolor';
+				break;
 
 		}
 		return $this->_parent->getStyleArray(array($key => $array));
 	}
 
-    /**
-     * Apply styles from array
-     *
-     * <code>
-     * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray( array('rgb' => '808080') );
-     * </code>
-     *
-     * @param	array	$pStyles	Array containing style information
-     * @throws	Exception
-     * @return PHPExcel_Style_Color
-     */
-	public function applyFromArray($pStyles = null) {
+	/**
+	 * Apply styles from array
+	 *
+	 * <code>
+	 * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray( array('rgb' => '808080') );
+	 * </code>
+	 *
+	 * @param	array	$pStyles	Array containing style information
+	 * @throws	Exception
+	 * @return PHPExcel_Style_Color
+	 */
+	public function applyFromArray($pStyles = NULL) {
 		if (is_array($pStyles)) {
 			if ($this->_isSupervisor) {
 				$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
@@ -229,28 +231,28 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 		return $this;
 	}
 
-    /**
-     * Get ARGB
-     *
-     * @return string
-     */
-    public function getARGB() {
+	/**
+	 * Get ARGB
+	 *
+	 * @return string
+	 */
+	public function getARGB() {
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getARGB();
 		}
-    	return $this->_argb;
-    }
+		return $this->_argb;
+	}
 
-    /**
-     * Set ARGB
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Color
-     */
-    public function setARGB($pValue = PHPExcel_Style_Color::COLOR_BLACK) {
-    	if ($pValue == '') {
-    		$pValue = PHPExcel_Style_Color::COLOR_BLACK;
-    	}
+	/**
+	 * Set ARGB
+	 *
+	 * @param string $pValue
+	 * @return PHPExcel_Style_Color
+	 */
+	public function setARGB($pValue = PHPExcel_Style_Color::COLOR_BLACK) {
+		if ($pValue == '') {
+			$pValue = PHPExcel_Style_Color::COLOR_BLACK;
+		}
 		if ($this->_isSupervisor) {
 			$styleArray = $this->getStyleArray(array('argb' => $pValue));
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -258,30 +260,30 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 			$this->_argb = $pValue;
 		}
 		return $this;
-    }
+	}
 
-    /**
-     * Get RGB
-     *
-     * @return string
-     */
-    public function getRGB() {
+	/**
+	 * Get RGB
+	 *
+	 * @return string
+	 */
+	public function getRGB() {
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getRGB();
 		}
-    	return substr($this->_argb, 2);
-    }
+		return substr($this->_argb, 2);
+	}
 
-    /**
-     * Set RGB
-     *
-     * @param string $pValue
-     * @return PHPExcel_Style_Color
-     */
-    public function setRGB($pValue = '000000') {
-        if ($pValue == '') {
-    		$pValue = '000000';
-    	}
+	/**
+	 * Set RGB
+	 *
+	 * @param	string	$pValue	RGB value
+	 * @return PHPExcel_Style_Color
+	 */
+	public function setRGB($pValue = '000000') {
+		if ($pValue == '') {
+			$pValue = '000000';
+		}
 		if ($this->_isSupervisor) {
 			$styleArray = $this->getStyleArray(array('argb' => 'FF' . $pValue));
 			$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -289,50 +291,86 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 			$this->_argb = 'FF' . $pValue;
 		}
 		return $this;
-    }
+	}
 
-	private static function _getColourComponent($RGB,$offset,$hex=true) {
-		$colour = substr($RGB,$offset,2);
+	/**
+	 * Get a specified colour component of an RGB value
+	 *
+	 * @private
+	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+	 * @param	int			$offset		Position within the RGB value to extract
+	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
+	 *									decimal value
+	 * @return	string		The extracted colour component
+	 */
+	private static function _getColourComponent($RGB,$offset,$hex=TRUE) {
+		$colour = substr($RGB, $offset, 2);
 		if (!$hex)
 			$colour = hexdec($colour);
 		return $colour;
 	}
 
-	public static function getRed($RGB,$hex=true) {
+	/**
+	 * Get the red colour component of an RGB value
+	 *
+	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
+	 *									decimal value
+	 * @return	string		The red colour component
+	 */
+	public static function getRed($RGB,$hex=TRUE) {
 		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB,2,$hex);
+			return self::_getColourComponent($RGB, 2, $hex);
 		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB,0,$hex);
-		}
-	}
-
-	public static function getGreen($RGB,$hex=true) {
-		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB,4,$hex);
-		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB,2,$hex);
-		}
-	}
-
-	public static function getBlue($RGB,$hex=true) {
-		if (strlen($RGB) == 8) {
-			return self::_getColourComponent($RGB,6,$hex);
-		} elseif (strlen($RGB) == 6) {
-			return self::_getColourComponent($RGB,4,$hex);
+			return self::_getColourComponent($RGB, 0, $hex);
 		}
 	}
 
 	/**
-     * Adjust the brightness of a color
-     *
-     * @param	string		$hex	The colour as an RGB value (e.g. FF00CCCC or CCDDEE
-     * @param	float		$adjustPercentage	The percentage by which to adjust the colour as a float from -1 to 1
-     * @return	string		The adjusted colour as an RGB value (e.g. FF00CCCC or CCDDEE
-     */
+	 * Get the green colour component of an RGB value
+	 *
+	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
+	 *									decimal value
+	 * @return	string		The green colour component
+	 */
+	public static function getGreen($RGB,$hex=TRUE) {
+		if (strlen($RGB) == 8) {
+			return self::_getColourComponent($RGB, 4, $hex);
+		} elseif (strlen($RGB) == 6) {
+			return self::_getColourComponent($RGB, 2, $hex);
+		}
+	}
+
+	/**
+	 * Get the blue colour component of an RGB value
+	 *
+	 * @param	string		$RGB		The colour as an RGB value (e.g. FF00CCCC or CCDDEE
+	 * @param	boolean		$hex		Flag indicating whether the component should be returned as a hex or a
+	 *									decimal value
+	 * @return	string		The blue colour component
+	 */
+	public static function getBlue($RGB,$hex=TRUE) {
+		if (strlen($RGB) == 8) {
+			return self::_getColourComponent($RGB, 6, $hex);
+		} elseif (strlen($RGB) == 6) {
+			return self::_getColourComponent($RGB, 4, $hex);
+		}
+	}
+
+	/**
+	 * Adjust the brightness of a color
+	 *
+	 * @param	string		$hex	The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
+	 * @param	float		$adjustPercentage	The percentage by which to adjust the colour as a float from -1 to 1
+	 * @return	string		The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
+	 */
 	public static function changeBrightness($hex, $adjustPercentage) {
-		$red	= self::getRed($hex,false);
-		$green	= self::getGreen($hex,false);
-		$blue	= self::getBlue($hex,false);
+		$rgba = (strlen($hex) == 8);
+
+		$red	= self::getRed($hex, FALSE);
+		$green	= self::getGreen($hex, FALSE);
+		$blue	= self::getBlue($hex, FALSE);
 		if ($adjustPercentage > 0) {
 			$red	+= (255 - $red) * $adjustPercentage;
 			$green	+= (255 - $green) * $adjustPercentage;
@@ -350,100 +388,96 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 		if ($blue < 0) $blue = 0;
 		elseif ($blue > 255) $blue = 255;
 
-		return strtoupper(	str_pad(dechex($red), 2, '0', 0) .
+		$rgb = strtoupper(	str_pad(dechex($red), 2, '0', 0) .
 							str_pad(dechex($green), 2, '0', 0) .
 							str_pad(dechex($blue), 2, '0', 0)
 						 );
+		return (($rgba) ? 'FF' : '') . $rgb;
 	}
 
 	/**
-     * Get indexed color
-     *
-     * @param	int		$pIndex
-     * @return	PHPExcel_Style_Color
-     */
-    public static function indexedColor($pIndex, $background=false) {
-    	// Clean parameter
+	 * Get indexed color
+	 *
+	 * @param	int			$pIndex			Index entry point into the colour array
+	 * @param	boolean		$background		Flag to indicate whether default background or foreground colour
+	 *											should be returned if the indexed colour doesn't exist
+	 * @return	PHPExcel_Style_Color
+	 */
+	public static function indexedColor($pIndex, $background=FALSE) {
+		// Clean parameter
 		$pIndex = intval($pIndex);
 
-    	// Indexed colors
-    	if (is_null(self::$_indexedColors)) {
-			self::$_indexedColors = array();
-			self::$_indexedColors[] = '00000000';
-			self::$_indexedColors[] = '00FFFFFF';
-			self::$_indexedColors[] = '00FF0000';
-			self::$_indexedColors[] = '0000FF00';
-			self::$_indexedColors[] = '000000FF';
-			self::$_indexedColors[] = '00FFFF00';
-			self::$_indexedColors[] = '00FF00FF';
-			self::$_indexedColors[] = '0000FFFF';
-			self::$_indexedColors[] = '00000000';
-			self::$_indexedColors[] = '00FFFFFF';
-			self::$_indexedColors[] = '00FF0000';
-			self::$_indexedColors[] = '0000FF00';
-			self::$_indexedColors[] = '000000FF';
-			self::$_indexedColors[] = '00FFFF00';
-			self::$_indexedColors[] = '00FF00FF';
-			self::$_indexedColors[] = '0000FFFF';
-			self::$_indexedColors[] = '00800000';
-			self::$_indexedColors[] = '00008000';
-			self::$_indexedColors[] = '00000080';
-			self::$_indexedColors[] = '00808000';
-			self::$_indexedColors[] = '00800080';
-			self::$_indexedColors[] = '00008080';
-			self::$_indexedColors[] = '00C0C0C0';
-			self::$_indexedColors[] = '00808080';
-			self::$_indexedColors[] = '009999FF';
-			self::$_indexedColors[] = '00993366';
-			self::$_indexedColors[] = '00FFFFCC';
-			self::$_indexedColors[] = '00CCFFFF';
-			self::$_indexedColors[] = '00660066';
-			self::$_indexedColors[] = '00FF8080';
-			self::$_indexedColors[] = '000066CC';
-			self::$_indexedColors[] = '00CCCCFF';
-			self::$_indexedColors[] = '00000080';
-			self::$_indexedColors[] = '00FF00FF';
-			self::$_indexedColors[] = '00FFFF00';
-			self::$_indexedColors[] = '0000FFFF';
-			self::$_indexedColors[] = '00800080';
-			self::$_indexedColors[] = '00800000';
-			self::$_indexedColors[] = '00008080';
-			self::$_indexedColors[] = '000000FF';
-			self::$_indexedColors[] = '0000CCFF';
-			self::$_indexedColors[] = '00CCFFFF';
-			self::$_indexedColors[] = '00CCFFCC';
-			self::$_indexedColors[] = '00FFFF99';
-			self::$_indexedColors[] = '0099CCFF';
-			self::$_indexedColors[] = '00FF99CC';
-			self::$_indexedColors[] = '00CC99FF';
-			self::$_indexedColors[] = '00FFCC99';
-			self::$_indexedColors[] = '003366FF';
-			self::$_indexedColors[] = '0033CCCC';
-			self::$_indexedColors[] = '0099CC00';
-			self::$_indexedColors[] = '00FFCC00';
-			self::$_indexedColors[] = '00FF9900';
-			self::$_indexedColors[] = '00FF6600';
-			self::$_indexedColors[] = '00666699';
-			self::$_indexedColors[] = '00969696';
-			self::$_indexedColors[] = '00003366';
-			self::$_indexedColors[] = '00339966';
-			self::$_indexedColors[] = '00003300';
-			self::$_indexedColors[] = '00333300';
-			self::$_indexedColors[] = '00993300';
-			self::$_indexedColors[] = '00993366';
-			self::$_indexedColors[] = '00333399';
-			self::$_indexedColors[] = '00333333';
-    	}
+		// Indexed colors
+		if (is_null(self::$_indexedColors)) {
+			self::$_indexedColors = array(
+					1	=> 'FF000000',	//	System Colour #1 - Black
+					2	=> 'FFFFFFFF',	//	System Colour #2 - White
+					3	=> 'FFFF0000',	//	System Colour #3 - Red
+					4	=> 'FF00FF00',	//	System Colour #4 - Green
+					5	=> 'FF0000FF',	//	System Colour #5 - Blue
+					6	=> 'FFFFFF00',	//	System Colour #6 - Yellow
+					7	=> 'FFFF00FF',	//	System Colour #7- Magenta
+					8	=> 'FF00FFFF',	//	System Colour #8- Cyan
+					9	=> 'FF800000',	//	Standard Colour #9
+					10	=> 'FF008000',	//	Standard Colour #10
+					11	=> 'FF000080',	//	Standard Colour #11
+					12	=> 'FF808000',	//	Standard Colour #12
+					13	=> 'FF800080',	//	Standard Colour #13
+					14	=> 'FF008080',	//	Standard Colour #14
+					15	=> 'FFC0C0C0',	//	Standard Colour #15
+					16	=> 'FF808080',	//	Standard Colour #16
+					17	=> 'FF9999FF',	//	Chart Fill Colour #17
+					18	=> 'FF993366',	//	Chart Fill Colour #18
+					19	=> 'FFFFFFCC',	//	Chart Fill Colour #19
+					20	=> 'FFCCFFFF',	//	Chart Fill Colour #20
+					21	=> 'FF660066',	//	Chart Fill Colour #21
+					22	=> 'FFFF8080',	//	Chart Fill Colour #22
+					23	=> 'FF0066CC',	//	Chart Fill Colour #23
+					24	=> 'FFCCCCFF',	//	Chart Fill Colour #24
+					25	=> 'FF000080',	//	Chart Line Colour #25
+					26	=> 'FFFF00FF',	//	Chart Line Colour #26
+					27	=> 'FFFFFF00',	//	Chart Line Colour #27
+					28	=> 'FF00FFFF',	//	Chart Line Colour #28
+					29	=> 'FF800080',	//	Chart Line Colour #29
+					30	=> 'FF800000',	//	Chart Line Colour #30
+					31	=> 'FF008080',	//	Chart Line Colour #31
+					32	=> 'FF0000FF',	//	Chart Line Colour #32
+					33	=> 'FF00CCFF',	//	Standard Colour #33
+					34	=> 'FFCCFFFF',	//	Standard Colour #34
+					35	=> 'FFCCFFCC',	//	Standard Colour #35
+					36	=> 'FFFFFF99',	//	Standard Colour #36
+					37	=> 'FF99CCFF',	//	Standard Colour #37
+					38	=> 'FFFF99CC',	//	Standard Colour #38
+					39	=> 'FFCC99FF',	//	Standard Colour #39
+					40	=> 'FFFFCC99',	//	Standard Colour #40
+					41	=> 'FF3366FF',	//	Standard Colour #41
+					42	=> 'FF33CCCC',	//	Standard Colour #42
+					43	=> 'FF99CC00',	//	Standard Colour #43
+					44	=> 'FFFFCC00',	//	Standard Colour #44
+					45	=> 'FFFF9900',	//	Standard Colour #45
+					46	=> 'FFFF6600',	//	Standard Colour #46
+					47	=> 'FF666699',	//	Standard Colour #47
+					48	=> 'FF969696',	//	Standard Colour #48
+					49	=> 'FF003366',	//	Standard Colour #49
+					50	=> 'FF339966',	//	Standard Colour #50
+					51	=> 'FF003300',	//	Standard Colour #51
+					52	=> 'FF333300',	//	Standard Colour #52
+					53	=> 'FF993300',	//	Standard Colour #53
+					54	=> 'FF993366',	//	Standard Colour #54
+					55	=> 'FF333399',	//	Standard Colour #55
+					56	=> 'FF333333'	//	Standard Colour #56
+				);
+		}
 
 		if (array_key_exists($pIndex, self::$_indexedColors)) {
 			return new PHPExcel_Style_Color(self::$_indexedColors[$pIndex]);
 		}
 
 		if ($background) {
-	    	return new PHPExcel_Style_Color('FFFFFFFF');
+			return new PHPExcel_Style_Color('FFFFFFFF');
 		}
-    	return new PHPExcel_Style_Color('FF000000');
-    }
+		return new PHPExcel_Style_Color('FF000000');
+	}
 
 	/**
 	 * Get hash code
@@ -454,11 +488,11 @@ class PHPExcel_Style_Color implements PHPExcel_IComparable
 		if ($this->_isSupervisor) {
 			return $this->getSharedComponent()->getHashCode();
 		}
-    	return md5(
-    		  $this->_argb
-    		. __CLASS__
-    	);
-    }
+		return md5(
+			  $this->_argb
+			. __CLASS__
+		);
+	}
 
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Conditional.php b/htdocs/includes/phpexcel/PHPExcel/Style/Conditional.php
index fbdb62368a0..d9f7dd4cf5f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Conditional.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Conditional.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Conditional implements PHPExcel_IComparable
 {
@@ -100,7 +100,7 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
     	$this->_operatorType		= PHPExcel_Style_Conditional::OPERATOR_NONE;
     	$this->_text    			= null;
     	$this->_condition			= array();
-    	$this->_style				= new PHPExcel_Style();
+    	$this->_style				= new PHPExcel_Style(FALSE, TRUE);
     }
 
     /**
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Fill.php b/htdocs/includes/phpexcel/PHPExcel/Style/Fill.php
index b9b1e63ade5..afede653c74 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Fill.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Fill.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Fill implements PHPExcel_IComparable
 {
@@ -109,15 +109,25 @@ class PHPExcel_Style_Fill implements PHPExcel_IComparable
 
 	/**
 	 * Create a new PHPExcel_Style_Fill
+	 *
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
 	 */
-	public function __construct($isSupervisor = false)
+	public function __construct($isSupervisor = false, $isConditional = false)
 	{
 		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
-		$this->_startColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor);
-		$this->_endColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+		if ($isConditional) {
+			$this->_fillType = NULL;
+		}
+		$this->_startColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor, $isConditional);
+		$this->_endColor			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
 
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Font.php b/htdocs/includes/phpexcel/PHPExcel/Style/Font.php
index 869244402f9..59ae7730956 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Font.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Font.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Font implements PHPExcel_IComparable
 {
@@ -89,7 +89,7 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
 	 *
 	 * @var string
 	 */
-	private $_underline		= PHPExcel_Style_Font::UNDERLINE_NONE;
+	private $_underline		= self::UNDERLINE_NONE;
 
 	/**
 	 * Strikethrough
@@ -128,15 +128,33 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
 
 	/**
 	 * Create a new PHPExcel_Style_Font
+	 *
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
 	 */
-	public function __construct($isSupervisor = false)
+	public function __construct($isSupervisor = false, $isConditional = false)
 	{
 		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
 		// Initialise values
-		$this->_color				= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
-
+		if ($isConditional) {
+			$this->_name			= NULL;
+			$this->_size			= NULL;
+			$this->_bold			= NULL;
+			$this->_italic			= NULL;
+			$this->_superScript		= NULL;
+			$this->_subScript		= NULL;
+			$this->_underline		= NULL;
+			$this->_strikethrough	= NULL;
+			$this->_color			= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
+		} else {
+			$this->_color	= new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
+		}
 		// bind parent if we are a supervisor
 		if ($isSupervisor) {
 			$this->_color->bindParent($this, '_color');
@@ -482,12 +500,16 @@ class PHPExcel_Style_Font implements PHPExcel_IComparable
 	/**
 	 * Set Underline
 	 *
-	 * @param string $pValue	PHPExcel_Style_Font underline type
+	 * @param string|boolean $pValue	PHPExcel_Style_Font underline type
+	 *									If a boolean is passed, then true equates to UNDERLINE_SINGLE,
+	 *										false equates to UNDERLINE_NONE
 	 * @return PHPExcel_Style_Font
 	 */
-	public function setUnderline($pValue = PHPExcel_Style_Font::UNDERLINE_NONE) {
-		if ($pValue == '') {
-			$pValue = PHPExcel_Style_Font::UNDERLINE_NONE;
+	public function setUnderline($pValue = self::UNDERLINE_NONE) {
+		if (is_bool($pValue)) {
+			$pValue = ($pValue) ? self::UNDERLINE_SINGLE : self::UNDERLINE_NONE;
+		} elseif ($pValue == '') {
+			$pValue = self::UNDERLINE_NONE;
 		}
 		if ($this->_isSupervisor) {
 			$styleArray = $this->getStyleArray(array('underline' => $pValue));
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/NumberFormat.php b/htdocs/includes/phpexcel/PHPExcel/Style/NumberFormat.php
index 73fe396220c..19e064e4de8 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/NumberFormat.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/NumberFormat.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
 {
@@ -126,11 +126,22 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
 
 	/**
 	 * Create a new PHPExcel_Style_NumberFormat
+	 *
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
 	 */
-	public function __construct($isSupervisor = false)
+	public function __construct($isSupervisor = false, $isConditional = false)
 	{
 		// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
+
+		if ($isConditional) {
+			$this->_formatCode = NULL;
+		}
 	}
 
 	/**
@@ -447,12 +458,18 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
 		}
 	}
 
+	/**
+	 * Search/replace values to convert Excel date/time format masks to PHP format masks
+	 *
+	 * @var array
+	 */
 	private static $_dateFormatReplacements = array(
 			// first remove escapes related to non-format characters
 			'\\'	=> '',
 			//	12-hour suffix
 			'am/pm'	=> 'A',
 			//	4-digit year
+			'e'	=> 'Y',
 			'yyyy'	=> 'Y',
 			//	2-digit year
 			'yy'	=> 'y',
@@ -481,10 +498,20 @@ class PHPExcel_Style_NumberFormat implements PHPExcel_IComparable
 			//	fractional seconds - no php equivalent
 			'.s'	=> ''
 		);
+	/**
+	 * Search/replace values to convert Excel date/time format masks hours to PHP format masks (24 hr clock)
+	 *
+	 * @var array
+	 */
 	private static $_dateFormatReplacements24 = array(
 			'hh'	=> 'H',
 			'h'		=> 'G'
 		);
+	/**
+	 * Search/replace values to convert Excel date/time format masks hours to PHP format masks (12 hr clock)
+	 *
+	 * @var array
+	 */
 	private static $_dateFormatReplacements12 = array(
 			'hh'	=> 'h',
 			'h'		=> 'g'
diff --git a/htdocs/includes/phpexcel/PHPExcel/Style/Protection.php b/htdocs/includes/phpexcel/PHPExcel/Style/Protection.php
index 84201a2f644..477742bd3f5 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Style/Protection.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Style/Protection.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
  * @version    1.4.5, 2007-08-23
  */
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Style
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Style_Protection implements PHPExcel_IComparable
 {
@@ -77,15 +77,24 @@ class PHPExcel_Style_Protection implements PHPExcel_IComparable
 
     /**
      * Create a new PHPExcel_Style_Protection
+	 *
+	 * @param	boolean	$isSupervisor	Flag indicating if this is a supervisor or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
+	 * @param	boolean	$isConditional	Flag indicating if this is a conditional style or not
+	 *									Leave this value at default unless you understand exactly what
+	 *										its ramifications are
      */
-    public function __construct($isSupervisor = false)
+    public function __construct($isSupervisor = false, $isConditional = false)
     {
     	// Supervisor?
 		$this->_isSupervisor = $isSupervisor;
 
     	// Initialise values
-    	$this->_locked			= self::PROTECTION_INHERIT;
-    	$this->_hidden			= self::PROTECTION_INHERIT;
+		if (!$isConditional) {
+	    	$this->_locked			= self::PROTECTION_INHERIT;
+	    	$this->_hidden			= self::PROTECTION_INHERIT;
+		}
     }
 
 	/**
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet.php
index a6d7054c11c..17ed5da962b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet implements PHPExcel_IComparable
 {
@@ -101,6 +101,13 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	private $_drawingCollection = null;
 
+	/**
+	 * Collection of Chart objects
+	 *
+	 * @var PHPExcel_Chart[]
+	 */
+	private $_chartCollection = array();
+
 	/**
 	 * Worksheet title
 	 *
@@ -193,11 +200,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	private $_protectedCells = array();
 
 	/**
-	 * Autofilter Range
+	 * Autofilter Range and selection
 	 *
-	 * @var string
+	 * @var PHPExcel_Worksheet_AutoFilter
 	 */
-	private $_autoFilter = '';
+	private $_autoFilter = NULL;
 
 	/**
 	 * Freeze pane
@@ -328,7 +335,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	{
 		// Set parent and title
 		$this->_parent = $pParent;
-		$this->setTitle($pTitle);
+		$this->setTitle($pTitle, FALSE);
 		$this->setSheetState(PHPExcel_Worksheet::SHEETSTATE_VISIBLE);
 
 		$this->_cellCollection		= PHPExcel_CachedObjectStorageFactory::getInstance($this);
@@ -348,17 +355,27 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		// Drawing collection
 		$this->_drawingCollection	= new ArrayObject();
 
+    	// Chart collection
+    	$this->_chartCollection 	= new ArrayObject();
+
 		// Protection
 		$this->_protection			= new PHPExcel_Worksheet_Protection();
 
 		// Default row dimension
-		$this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(null);
+		$this->_defaultRowDimension = new PHPExcel_Worksheet_RowDimension(NULL);
 
 		// Default column dimension
-		$this->_defaultColumnDimension = new PHPExcel_Worksheet_ColumnDimension(null);
+		$this->_defaultColumnDimension	= new PHPExcel_Worksheet_ColumnDimension(NULL);
+
+		$this->_autoFilter			= new PHPExcel_Worksheet_AutoFilter(NULL, $this);
 	}
 
 
+	/**
+	 * Disconnect all cells from this PHPExcel_Worksheet object,
+	 *    typically so that the worksheet object can be unset
+	 *
+	 */
 	public function disconnectCells() {
 		$this->_cellCollection->unsetWorksheetCells();
 		$this->_cellCollection = null;
@@ -421,7 +438,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 			// Re-order cell collection
 			return $this->sortCellCollection();
 		}
-		if (!is_null($this->_cellCollection)) {
+		if ($this->_cellCollection !== NULL) {
 			return $this->_cellCollection->getCellList();
 		}
 		return array();
@@ -434,7 +451,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	public function sortCellCollection()
 	{
-		if (!is_null($this->_cellCollection)) {
+		if ($this->_cellCollection !== NULL) {
 			return $this->_cellCollection->getSortedCellList();
 		}
 		return array();
@@ -490,6 +507,107 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		return $this->_drawingCollection;
 	}
 
+	/**
+	 * Get collection of charts
+	 *
+	 * @return PHPExcel_Chart[]
+	 */
+	public function getChartCollection()
+	{
+		return $this->_chartCollection;
+	}
+
+	/**
+	 * Add chart
+	 *
+	 * @param PHPExcel_Chart $pChart
+	 * @param int|null $iChartIndex Index where chart should go (0,1,..., or null for last)
+	 * @return PHPExcel_Chart
+	 * @throws Exception
+	 */
+	public function addChart(PHPExcel_Chart $pChart = null, $iChartIndex = null)
+	{
+		$pChart->setWorksheet($this);
+		if (is_null($iChartIndex)) {
+			$this->_chartCollection[] = $pChart;
+		} else {
+			// Insert the chart at the requested index
+			array_splice($this->_chartCollection, $iChartIndex, 0, array($pChart));
+		}
+
+		return $pChart;
+	}
+
+	/**
+	 * Return the count of charts on this worksheet
+	 *
+	 * @return int		The number of charts
+	 * @throws Exception
+	 */
+	public function getChartCount()
+	{
+		return count($this->_chartCollection);
+	}
+
+	/**
+	 * Get a chart by its index position
+	 *
+	 * @param	string	$index			Chart index position
+	 * @return	false|PHPExcel_Chart
+	 * @throws Exception
+	 */
+	public function getChartByIndex($index = null)
+	{
+		$chartCount = count($this->_chartCollection);
+		if ($chartCount == 0) {
+			return false;
+		}
+		if (is_null($index)) {
+			$index = --$chartCount;
+		}
+		if (!isset($this->_chartCollection[$index])) {
+			return false;
+		}
+
+		return $this->_chartCollection[$index];
+	}
+
+	/**
+	 * Return an array of the names of charts on this worksheet
+	 *
+	 * @return string[]		The names of charts
+	 * @throws Exception
+	 */
+	public function getChartNames()
+	{
+		$chartNames = array();
+		foreach($this->_chartCollection as $chart) {
+			$chartNames[] = $chart->getName();
+		}
+		return $chartNames;
+	}
+
+	/**
+	 * Get a chart by name
+	 *
+	 * @param	string	$chartName		Chart name
+	 * @return	false|PHPExcel_Chart
+	 * @throws Exception
+	 */
+	public function getChartByName($chartName = '')
+	{
+		$chartCount = count($this->_chartCollection);
+		if ($chartCount == 0) {
+			return false;
+		}
+		foreach($this->_chartCollection as $index => $chart) {
+			if ($chart->getName() == $chartName) {
+				return $this->_chartCollection[$index];
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Refresh column dimensions
 	 *
@@ -539,6 +657,17 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		return 'A1' . ':' .  $this->getHighestColumn() . $this->getHighestRow();
 	}
 
+	/**
+	 * Calculate worksheet data dimension
+	 *
+	 * @return string  String containing the dimension of this worksheet that actually contain data
+	 */
+	public function calculateWorksheetDataDimension()
+	{
+		// Return
+		return 'A1' . ':' .  $this->getHighestDataColumn() . $this->getHighestDataRow();
+	}
+
 	/**
 	 * Calculate widths for auto-size columns
 	 *
@@ -644,9 +773,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 * Set title
 	 *
 	 * @param string $pValue String containing the dimension of this worksheet
+	 * @param string $updateFormulaCellReferences boolean Flag indicating whether cell references in formulae should
+	 *                                                    be updated to reflect the new sheet name.
+	 *                                                    This should be left as the default true, unless you are
+	 *                                                    certain that no formula cells on any worksheet contain
+	 *                                                    references to this worksheet
 	 * @return PHPExcel_Worksheet
 	 */
-	public function setTitle($pValue = 'Worksheet')
+	public function setTitle($pValue = 'Worksheet', $updateFormulaCellReferences = true)
 	{
 		// Is this a 'rename' or not?
 		if ($this->getTitle() == $pValue) {
@@ -659,38 +793,43 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		// Old title
 		$oldTitle = $this->getTitle();
 
-		// Is there already such sheet name?
-		if ($this->getParent()->getSheetByName($pValue)) {
-			// Use name, but append with lowest possible integer
+        if ($this->getParent()) {
+			// Is there already such sheet name?
+			if ($this->getParent()->sheetNameExists($pValue)) {
+				// Use name, but append with lowest possible integer
 
-			if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
-				$pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
-			}
-			$i = 1;
-			while ($this->getParent()->getSheetByName($pValue . ' ' . $i)) {
-				++$i;
-				if ($i == 10) {
-					if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
-						$pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
-					}
-				} elseif ($i == 100) {
-					if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
-						$pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
+				if (PHPExcel_Shared_String::CountCharacters($pValue) > 29) {
+					$pValue = PHPExcel_Shared_String::Substring($pValue,0,29);
+				}
+				$i = 1;
+				while ($this->getParent()->sheetNameExists($pValue . ' ' . $i)) {
+					++$i;
+					if ($i == 10) {
+						if (PHPExcel_Shared_String::CountCharacters($pValue) > 28) {
+							$pValue = PHPExcel_Shared_String::Substring($pValue,0,28);
+						}
+					} elseif ($i == 100) {
+						if (PHPExcel_Shared_String::CountCharacters($pValue) > 27) {
+							$pValue = PHPExcel_Shared_String::Substring($pValue,0,27);
+						}
 					}
 				}
-			}
 
-			$altTitle = $pValue . ' ' . $i;
-			return $this->setTitle($altTitle);
+				$altTitle = $pValue . ' ' . $i;
+				return $this->setTitle($altTitle,$updateFormulaCellReferences);
+			}
 		}
 
 		// Set title
 		$this->_title = $pValue;
 		$this->_dirty = true;
 
-		// New title
-		$newTitle = $this->getTitle();
-		PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->getParent(), $oldTitle, $newTitle);
+        if ($this->getParent()) {
+			// New title
+			$newTitle = $this->getTitle();
+			if ($updateFormulaCellReferences)
+				PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->getParent(), $oldTitle, $newTitle);
+		}
 
 		return $this;
 	}
@@ -837,6 +976,16 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		return $this->_cachedHighestColumn;
 	}
 
+	/**
+	 * Get highest worksheet column that contains data
+	 *
+	 * @return string Highest column name that contains data
+	 */
+	public function getHighestDataColumn()
+	{
+		return $this->_cellCollection->getHighestColumn();
+	}
+
 	/**
 	 * Get highest worksheet row
 	 *
@@ -847,6 +996,26 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		return $this->_cachedHighestRow;
 	}
 
+	/**
+	 * Get highest worksheet row that contains data
+	 *
+	 * @return string Highest row number that contains data
+	 */
+	public function getHighestDataRow()
+	{
+		return $this->_cellCollection->getHighestRow();
+	}
+
+	/**
+	 * Get highest worksheet column and highest row that have cell records
+	 *
+	 * @return array Highest column name and highest row number
+	 */
+	public function getHighestRowAndColumn()
+	{
+		return $this->_cellCollection->getHighestRowAndColumn();
+	}
+
 	/**
 	 * Set a cell value
 	 *
@@ -857,13 +1026,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	public function setCellValue($pCoordinate = 'A1', $pValue = null, $returnCell = false)
 	{
-		$cell = $this->getCell($pCoordinate);
-		$cell->setValue($pValue);
-
-		if ($returnCell) {
-			return $cell;
-		}
-		return $this;
+		$cell = $this->getCell($pCoordinate)->setValue($pValue);
+		return ($returnCell) ? $cell : $this;
 	}
 
 	/**
@@ -877,13 +1041,8 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	public function setCellValueByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $returnCell = false)
 	{
-		$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow);
-		$cell->setValue($pValue);
-
-		if ($returnCell) {
-			return $cell;
-		}
-		return $this;
+		$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValue($pValue);
+		return ($returnCell) ? $cell : $this;
 	}
 
 	/**
@@ -892,13 +1051,14 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 * @param string	$pCoordinate	Coordinate of the cell
 	 * @param mixed	$pValue			Value of the cell
 	 * @param string	$pDataType		Explicit data type
-	 * @return PHPExcel_Worksheet
+	 * @param bool		$returnCell		Return the worksheet (false, default) or the cell (true)
+	 * @return PHPExcel_Worksheet|PHPExcel_Cell	Depending on the last parameter being specified
 	 */
-	public function setCellValueExplicit($pCoordinate = 'A1', $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
+	public function setCellValueExplicit($pCoordinate = 'A1', $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
 	{
 		// Set value
-		$this->getCell($pCoordinate)->setValueExplicit($pValue, $pDataType);
-		return $this;
+		$cell = $this->getCell($pCoordinate)->setValueExplicit($pValue, $pDataType);
+		return ($returnCell) ? $cell : $this;
 	}
 
 	/**
@@ -908,11 +1068,13 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 * @param string	$pRow			Numeric row coordinate of the cell
 	 * @param mixed		$pValue			Value of the cell
 	 * @param string	$pDataType		Explicit data type
-	 * @return PHPExcel_Worksheet
+	 * @param bool		$returnCell		Return the worksheet (false, default) or the cell (true)
+	 * @return PHPExcel_Worksheet|PHPExcel_Cell	Depending on the last parameter being specified
 	 */
-	public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
+	public function setCellValueExplicitByColumnAndRow($pColumn = 0, $pRow = 1, $pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING, $returnCell = false)
 	{
-		return $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValueExplicit($pValue, $pDataType);
+		$cell = $this->getCell(PHPExcel_Cell::stringFromColumnIndex($pColumn) . $pRow)->setValueExplicit($pValue, $pDataType);
+		return ($returnCell) ? $cell : $this;
 	}
 
 	/**
@@ -939,7 +1101,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
 			(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
 			$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
-			if (!is_null($namedRange)) {
+			if ($namedRange !== NULL) {
 				$pCoordinate = $namedRange->getRange();
 				return $namedRange->getWorksheet()->getCell($pCoordinate);
 			}
@@ -1031,7 +1193,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		if ((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $pCoordinate, $matches)) &&
 			(preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $pCoordinate, $matches))) {
 			$namedRange = PHPExcel_NamedRange::resolveRange($pCoordinate, $this);
-			if (!is_null($namedRange)) {
+			if ($namedRange !== NULL) {
 				$pCoordinate = $namedRange->getRange();
 				if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
 					if (!$namedRange->getLocalOnly()) {
@@ -1116,7 +1278,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 * Get column dimension at a specific column by using numeric cell coordinates
 	 *
 	 * @param	string $pColumn		Numeric column coordinate of the cell
-	 * @param	string $pRow		Numeric row coordinate of the cell
 	 * @return	PHPExcel_Worksheet_ColumnDimension
 	 */
 	public function getColumnDimensionByColumn($pColumn = 0)
@@ -1150,7 +1311,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 * Set default style - should only be used by PHPExcel_IReader implementations!
 	 *
 	 * @deprecated
-	 * @param	PHPExcel_Style $value
+	 * @param	PHPExcel_Style	$pValue
 	 * @throws	Exception
 	 * @return PHPExcel_Worksheet
 	 */
@@ -1269,7 +1430,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 * @throws	Exception
 	 * @return PHPExcel_Worksheet
 	 */
-	 public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '')
+	public function setSharedStyle(PHPExcel_Style $pSharedCellStyle = null, $pRange = '')
 	{
 		$this->duplicateStyle($pSharedCellStyle, $pRange);
 		return $this;
@@ -1339,6 +1500,62 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		return $this;
 	}
 
+	/**
+	 * Duplicate conditional style to a range of cells
+	 *
+	 * Please note that this will overwrite existing cell styles for cells in range!
+	 *
+	 * @param	array of PHPExcel_Style_Conditional	$pCellStyle	Cell style to duplicate
+	 * @param	string								$pRange		Range of cells (i.e. "A1:B10"), or just one cell (i.e. "A1")
+	 * @throws	Exception
+	 * @return PHPExcel_Worksheet
+	 */
+	public function duplicateConditionalStyle(array $pCellStyle = null, $pRange = '')
+	{
+		foreach($pCellStyle as $cellStyle) {
+			if (!is_a($cellStyle,'PHPExcel_Style_Conditional')) {
+				throw new Exception('Style is not a conditional style');
+			}
+		}
+
+		// Uppercase coordinate
+		$pRange = strtoupper($pRange);
+
+		// Is it a cell range or a single cell?
+		$rangeA	= '';
+		$rangeB	= '';
+		if (strpos($pRange, ':') === false) {
+			$rangeA = $pRange;
+			$rangeB = $pRange;
+		} else {
+			list($rangeA, $rangeB) = explode(':', $pRange);
+		}
+
+		// Calculate range outer borders
+		$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
+		$rangeEnd	= PHPExcel_Cell::coordinateFromString($rangeB);
+
+		// Translate column into index
+		$rangeStart[0]	= PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
+		$rangeEnd[0]	= PHPExcel_Cell::columnIndexFromString($rangeEnd[0]) - 1;
+
+		// Make sure we can loop upwards on rows and columns
+		if ($rangeStart[0] > $rangeEnd[0] && $rangeStart[1] > $rangeEnd[1]) {
+			$tmp = $rangeStart;
+			$rangeStart = $rangeEnd;
+			$rangeEnd = $tmp;
+		}
+
+		// Loop through cells and apply styles
+		for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
+			for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
+				$this->setConditionalStyles(PHPExcel_Cell::stringFromColumnIndex($col) . $row, $pCellStyle);
+			}
+		}
+
+		return $this;
+	}
+
 	/**
 	 * Duplicate cell style array to a range of cells
 	 *
@@ -1613,9 +1830,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	}
 
 	/**
-	 * Get Autofilter Range
+	 *	Get Autofilter
 	 *
-	 * @return string
+	 *	@return PHPExcel_Worksheet_AutoFilter
 	 */
 	public function getAutoFilter()
 	{
@@ -1623,35 +1840,32 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	}
 
 	/**
-	 * Set Autofilter Range
+	 *	Set AutoFilter
 	 *
-	 * @param	string		$pRange		Cell range (i.e. A1:E10)
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
+	 *	@param	PHPExcel_Worksheet_AutoFilter|string	$pValue
+	 *			A simple string containing a Cell range like 'A1:E10' is permitted for backward compatibility
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet
 	 */
-	public function setAutoFilter($pRange = '')
+	public function setAutoFilter($pValue)
 	{
-		// Uppercase coordinate
-		$pRange = strtoupper($pRange);
-
-		if (strpos($pRange,':') !== false) {
-			$this->_autoFilter = $pRange;
-			$this->_dirty = true;
-		} else {
-			throw new Exception('Autofilter must be set on a range of cells.');
+		if (is_string($pValue)) {
+			$this->_autoFilter->setRange($pValue);
+		} elseif(is_object($pValue) && ($pValue instanceof PHPExcel_Worksheet_AutoFilter)) {
+			$this->_autoFilter = $pValue;
 		}
 		return $this;
 	}
 
 	/**
-	 * Set Autofilter Range by using numeric cell coordinates
+	 *	Set Autofilter Range by using numeric cell coordinates
 	 *
-	 * @param	int	$pColumn1	Numeric column coordinate of the first cell
-	 * @param	int	$pRow1		Numeric row coordinate of the first cell
-	 * @param	int	$pColumn2	Numeric column coordinate of the second cell
-	 * @param	int	$pRow2		Numeric row coordinate of the second cell
-	 * @throws	Exception
-	 * @return PHPExcel_Worksheet
+	 *	@param	int	$pColumn1	Numeric column coordinate of the first cell
+	 *	@param	int	$pRow1		Numeric row coordinate of the first cell
+	 *	@param	int	$pColumn2	Numeric column coordinate of the second cell
+	 *	@param	int	$pRow2		Numeric row coordinate of the second cell
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet
 	 */
 	public function setAutoFilterByColumnAndRow($pColumn1 = 0, $pRow1 = 1, $pColumn2 = 0, $pRow2 = 1)
 	{
@@ -1669,7 +1883,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
      */
     public function removeAutoFilter()
     {
-    	$this->_autoFilter = '';
+    	$this->_autoFilter->setRange(NULL);
     	return $this;
     }
 
@@ -1686,7 +1900,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	/**
 	 * Freeze Pane
 	 *
-	 * @param	string		$pCell		Cell (i.e. A1)
+	 * @param	string		$pCell		Cell (i.e. A2)
+	 *									Examples:
+	 *										A2 will freeze the rows above cell A2 (i.e row 1)
+	 *										B1 will freeze the columns to the left of cell B1 (i.e column A)
+	 *										B2 will freeze the rows above and to the left of cell A2
+	 *											(i.e row 1 and column A)
 	 * @throws	Exception
 	 * @return PHPExcel_Worksheet
 	 */
@@ -2031,7 +2250,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	/**
 	 * Selected cell
 	 *
-	 * @param	string		$pCell		Cell (i.e. A1)
+	 * @param	string		$pCoordinate	Cell (i.e. A1)
 	 * @return PHPExcel_Worksheet
 	 */
 	public function setSelectedCell($pCoordinate = 'A1')
@@ -2176,11 +2395,12 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		$maxCol++;
 
 		// Loop through rows
+		$r = -1;
 		for ($row = $minRow; $row <= $maxRow; ++$row) {
+			$rRef = ($returnCellRef) ? $row : ++$r;
 			$c = -1;
 			// Loop through columns in the current row
 			for ($col = $minCol; $col != $maxCol; ++$col) {
-				$rRef = ($returnCellRef) ? $row : $row-1;
 				$cRef = ($returnCellRef) ? $col : ++$c;
 				//	Using getCell() will create a new cell if it doesn't already exist. We don't want that to happen
 				//		so we test and retrieve directly against _cellCollection
@@ -2232,7 +2452,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	public function namedRangeToArray($pNamedRange = '', $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false) {
 		$namedRange = PHPExcel_NamedRange::resolveRange($pNamedRange, $this);
-		if (!is_null($namedRange)) {
+		if ($namedRange !== NULL) {
 			$pWorkSheet = $namedRange->getWorksheet();
 			$pCellRange = $namedRange->getRange();
 
@@ -2261,7 +2481,6 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 		//	Identify the range that we need to extract from the worksheet
 		$maxCol = $this->getHighestColumn();
 		$maxRow = $this->getHighestRow();
-
 		// Return
 		return $this->rangeToArray(	'A1:'.$maxCol.$maxRow,
 									$nullValue, $calculateFormulas, $formatData, $returnCellRef);
@@ -2270,10 +2489,11 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	/**
 	 * Get row iterator
 	 *
+     * @param  integer                           $startRow    The row number at which to start iterating
 	 * @return PHPExcel_Worksheet_RowIterator
 	 */
-	public function getRowIterator() {
-		return new PHPExcel_Worksheet_RowIterator($this);
+	public function getRowIterator($startRow = 1) {
+		return new PHPExcel_Worksheet_RowIterator($this,$startRow);
 	}
 
 	/**
@@ -2292,21 +2512,9 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 //		}
 //
 		// Lookup highest column and highest row if cells are cleaned
-		$highestColumn = -1;
-		$highestRow	= 1;
-
-		// Find cells that can be cleaned
-		$col = $row = array();
-		foreach ($this->_cellCollection->getCellList() as $coord) {
-			list($c,$r) = sscanf($coord,'%[A-Z]%d');
-			$row[$r] = $r;
-			$col[$c] = strlen($c).$c;
-		}
-		if (count($row) > 0) {
-			// Determine highest column and row
-			$highestRow = max($row);
-			$highestColumn = PHPExcel_Cell::columnIndexFromString(substr(max($col),1));
-		}
+		$colRow = $this->_cellCollection->getHighestRowAndColumn();
+		$highestRow = $colRow['row'];
+		$highestColumn = PHPExcel_Cell::columnIndexFromString($colRow['column']);
 
 		// Loop through column dimensions
 		foreach ($this->_columnDimensions as $dimension) {
@@ -2409,7 +2617,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	/**
 	 * Hyperlink at a specific coordinate exists?
 	 *
-	 * @param string $pCellCoordinate
+	 * @param string $pCoordinate
 	 * @return boolean
 	 */
 	public function hyperlinkExists($pCoordinate = 'A1')
@@ -2464,7 +2672,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	/**
 	 * Data validation at a specific coordinate exists?
 	 *
-	 * @param string $pCellCoordinate
+	 * @param string $pCoordinate
 	 * @return boolean
 	 */
 	public function dataValidationExists($pCoordinate = 'A1')
@@ -2517,7 +2725,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	public function getTabColor()
 	{
-		if (is_null($this->_tabColor))
+		if ($this->_tabColor === NULL)
 			$this->_tabColor = new PHPExcel_Style_Color();
 
 		return $this->_tabColor;
@@ -2543,7 +2751,7 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 	 */
 	public function isTabColorSet()
 	{
-		return !is_null($this->_tabColor);
+		return ($this->_tabColor !== NULL);
 	}
 
 	/**
@@ -2574,6 +2782,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
 				} elseif ($key == '_drawingCollection') {
 					$newCollection = clone $this->_drawingCollection;
 					$this->_drawingCollection = $newCollection;
+				} elseif (($key == '_autoFilter') && (is_a($this->_autoFilter,'PHPExcel_Worksheet_AutoFilter'))) {
+					$newAutoFilter = clone $this->_autoFilter;
+					$this->_autoFilter = $newAutoFilter;
+					$this->_autoFilter->setParent($this);
 				} else {
 					$this->{$key} = unserialize(serialize($val));
 				}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter.php
new file mode 100644
index 00000000000..e6ea6f207a7
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter.php
@@ -0,0 +1,855 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Worksheet_AutoFilter
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Worksheet_AutoFilter
+{
+	/**
+	 * Autofilter Worksheet
+	 *
+	 * @var PHPExcel_Worksheet
+	 */
+	private $_workSheet = NULL;
+
+
+	/**
+	 * Autofilter Range
+	 *
+	 * @var string
+	 */
+	private $_range = '';
+
+
+	/**
+	 * Autofilter Column Ruleset
+	 *
+	 * @var array of PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	private $_columns = array();
+
+
+    /**
+     * Create a new PHPExcel_Worksheet_AutoFilter
+     */
+    public function __construct($pRange = '', PHPExcel_Worksheet $pSheet = NULL)
+    {
+		$this->_range = $pRange;
+		$this->_workSheet = $pSheet;
+    }
+
+	/**
+	 * Get AutoFilter Parent Worksheet
+	 *
+	 * @return PHPExcel_Worksheet
+	 */
+	public function getParent() {
+		return $this->_workSheet;
+	}
+
+	/**
+	 * Set AutoFilter Parent Worksheet
+	 *
+	 * @param PHPExcel_Worksheet
+	 * @return PHPExcel_Worksheet_AutoFilter
+	 */
+	public function setParent(PHPExcel_Worksheet $pSheet = NULL) {
+		$this->_workSheet = $pSheet;
+
+		return $this;
+	}
+
+	/**
+	 * Get AutoFilter Range
+	 *
+	 * @return string
+	 */
+	public function getRange() {
+		return $this->_range;
+	}
+
+	/**
+	 *	Set AutoFilter Range
+	 *
+	 *	@param	string		$pRange		Cell range (i.e. A1:E10)
+	 *	@throws	PHPExcel_Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter
+	 */
+	public function setRange($pRange = '') {
+		// Uppercase coordinate
+		$cellAddress = explode('!',strtoupper($pRange));
+		if (count($cellAddress) > 1) {
+			list($worksheet,$pRange) = $cellAddress;
+		}
+
+		if (strpos($pRange,':') !== FALSE) {
+			$this->_range = $pRange;
+		} elseif(empty($pRange)) {
+			$this->_range = '';
+		} else {
+			throw new PHPExcel_Exception('Autofilter must be set on a range of cells.');
+		}
+
+		if (empty($pRange)) {
+			//	Discard all column rules
+			$this->_columns = array();
+		} else {
+			//	Discard any column rules that are no longer valid within this range
+			list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
+			foreach($this->_columns as $key => $value) {
+				$colIndex = PHPExcel_Cell::columnIndexFromString($key);
+				if (($rangeStart[0] > $colIndex) || ($rangeEnd[0] < $colIndex)) {
+					unset($this->_columns[$key]);
+				}
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get all AutoFilter Columns
+	 *
+	 * @throws	PHPExcel_Exception
+	 * @return array of PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function getColumns() {
+		return $this->_columns;
+	}
+
+	/**
+	 * Validate that the specified column is in the AutoFilter range
+	 *
+	 * @param	string	$column			Column name (e.g. A)
+	 * @throws	PHPExcel_Exception
+	 * @return	integer	The column offset within the autofilter range
+	 */
+	public function testColumnInRange($column) {
+		if (empty($this->_range)) {
+			throw new PHPExcel_Exception("No autofilter range is defined.");
+		}
+
+		$columnIndex = PHPExcel_Cell::columnIndexFromString($column);
+		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
+		if (($rangeStart[0] > $columnIndex) || ($rangeEnd[0] < $columnIndex)) {
+			throw new PHPExcel_Exception("Column is outside of current autofilter range.");
+		}
+
+		return $columnIndex - $rangeStart[0];
+	}
+
+	/**
+	 * Get a specified AutoFilter Column Offset within the defined AutoFilter range
+	 *
+	 * @param	string	$pColumn		Column name (e.g. A)
+	 * @throws	PHPExcel_Exception
+	 * @return integer	The offset of the specified column within the autofilter range
+	 */
+	public function getColumnOffset($pColumn) {
+		return $this->testColumnInRange($pColumn);
+	}
+
+	/**
+	 * Get a specified AutoFilter Column
+	 *
+	 * @param	string	$pColumn		Column name (e.g. A)
+	 * @throws	PHPExcel_Exception
+	 * @return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function getColumn($pColumn) {
+		$this->testColumnInRange($pColumn);
+
+		if (!isset($this->_columns[$pColumn])) {
+			$this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
+		}
+
+		return $this->_columns[$pColumn];
+	}
+
+	/**
+	 * Get a specified AutoFilter Column by it's offset
+	 *
+	 * @param	integer	$pColumnOffset		Column offset within range (starting from 0)
+	 * @throws	PHPExcel_Exception
+	 * @return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function getColumnByOffset($pColumnOffset = 0) {
+		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
+		$pColumn = PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $pColumnOffset - 1);
+
+		return $this->getColumn($pColumn);
+	}
+
+	/**
+	 *	Set AutoFilter
+	 *
+	 *	@param	PHPExcel_Worksheet_AutoFilter_Column|string		$pColumn
+	 *			A simple string containing a Column ID like 'A' is permitted
+	 *	@throws	PHPExcel_Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter
+	 */
+	public function setColumn($pColumn)
+	{
+		if ((is_string($pColumn)) && (!empty($pColumn))) {
+			$column = $pColumn;
+		} elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
+			$column = $pColumn->getColumnIndex();
+		} else {
+			throw new PHPExcel_Exception("Column is not within the autofilter range.");
+		}
+		$this->testColumnInRange($column);
+
+		if (is_string($pColumn)) {
+			$this->_columns[$pColumn] = new PHPExcel_Worksheet_AutoFilter_Column($pColumn, $this);
+		} elseif(is_object($pColumn) && ($pColumn instanceof PHPExcel_Worksheet_AutoFilter_Column)) {
+			$pColumn->setParent($this);
+			$this->_columns[$column] = $pColumn;
+		}
+		ksort($this->_columns);
+
+		return $this;
+	}
+
+	/**
+	 * Clear a specified AutoFilter Column
+	 *
+	 * @param	string	$pColumn		Column name (e.g. A)
+	 * @throws	PHPExcel_Exception
+	 * @return PHPExcel_Worksheet_AutoFilter
+	 */
+	public function clearColumn($pColumn) {
+		$this->testColumnInRange($pColumn);
+
+		if (isset($this->_columns[$pColumn])) {
+			unset($this->_columns[$pColumn]);
+		}
+
+		return $this;
+	}
+
+	/**
+	 *	Shift an AutoFilter Column Rule to a different column
+	 *
+	 *	Note: This method bypasses validation of the destination column to ensure it is within this AutoFilter range.
+	 *		Nor does it verify whether any column rule already exists at $toColumn, but will simply overrideany existing value.
+	 *		Use with caution.
+	 *
+	 *	@param	string	$fromColumn		Column name (e.g. A)
+	 *	@param	string	$toColumn		Column name (e.g. B)
+	 *	@return PHPExcel_Worksheet_AutoFilter
+	 */
+	public function shiftColumn($fromColumn=NULL,$toColumn=NULL) {
+		$fromColumn = strtoupper($fromColumn);
+		$toColumn = strtoupper($toColumn);
+
+		if (($fromColumn !== NULL) && (isset($this->_columns[$fromColumn])) && ($toColumn !== NULL)) {
+			$this->_columns[$fromColumn]->setParent();
+			$this->_columns[$fromColumn]->setColumnIndex($toColumn);
+			$this->_columns[$toColumn] = $this->_columns[$fromColumn];
+			$this->_columns[$toColumn]->setParent($this);
+			unset($this->_columns[$fromColumn]);
+
+			ksort($this->_columns);
+		}
+
+		return $this;
+	}
+
+
+	/**
+	 *	Test if cell value is in the defined set of values
+	 *
+	 *	@param	mixed		$cellValue
+	 *	@param	mixed[]		$dataSet
+	 *	@return boolean
+	 */
+	private static function _filterTestInSimpleDataSet($cellValue,$dataSet)
+	{
+		$dataSetValues = $dataSet['filterValues'];
+		$blanks = $dataSet['blanks'];
+		if (($cellValue == '') || ($cellValue === NULL)) {
+			return $blanks;
+		}
+		return in_array($cellValue,$dataSetValues);
+	}
+
+	/**
+	 *	Test if cell value is in the defined set of Excel date values
+	 *
+	 *	@param	mixed		$cellValue
+	 *	@param	mixed[]		$dataSet
+	 *	@return boolean
+	 */
+	private static function _filterTestInDateGroupSet($cellValue,$dataSet)
+	{
+		$dateSet = $dataSet['filterValues'];
+		$blanks = $dataSet['blanks'];
+		if (($cellValue == '') || ($cellValue === NULL)) {
+			return $blanks;
+		}
+
+		if (is_numeric($cellValue)) {
+			$dateValue = PHPExcel_Shared_Date::ExcelToPHP($cellValue);
+			if ($cellValue < 1) {
+				//	Just the time part
+				$dtVal = date('His',$dateValue);
+				$dateSet = $dateSet['time'];
+			} elseif($cellValue == floor($cellValue)) {
+				//	Just the date part
+				$dtVal = date('Ymd',$dateValue);
+				$dateSet = $dateSet['date'];
+			} else {
+				//	date and time parts
+				$dtVal = date('YmdHis',$dateValue);
+				$dateSet = $dateSet['dateTime'];
+			}
+			foreach($dateSet as $dateValue) {
+				//	Use of substr to extract value at the appropriate group level
+				if (substr($dtVal,0,strlen($dateValue)) == $dateValue)
+					return TRUE;
+			}
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 *	Test if cell value is within a set of values defined by a ruleset
+	 *
+	 *	@param	mixed		$cellValue
+	 *	@param	mixed[]		$dataSet
+	 *	@return boolean
+	 */
+	private static function _filterTestInCustomDataSet($cellValue,$ruleSet)
+	{
+		$dataSet = $ruleSet['filterRules'];
+		$join = $ruleSet['join'];
+		$customRuleForBlanks = isset($ruleSet['customRuleForBlanks']) ? $ruleSet['customRuleForBlanks'] : FALSE;
+
+		if (!$customRuleForBlanks) {
+			//	Blank cells are always ignored, so return a FALSE
+			if (($cellValue == '') || ($cellValue === NULL)) {
+				return FALSE;
+			}
+		}
+		$returnVal = ($join == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND);
+		foreach($dataSet as $rule) {
+			if (is_numeric($rule['value'])) {
+				//	Numeric values are tested using the appropriate operator
+				switch ($rule['operator']) {
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
+						$retVal	= ($cellValue == $rule['value']);
+						break;
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
+						$retVal	= ($cellValue != $rule['value']);
+						break;
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN :
+						$retVal	= ($cellValue > $rule['value']);
+						break;
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL :
+						$retVal	= ($cellValue >= $rule['value']);
+						break;
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN :
+						$retVal	= ($cellValue < $rule['value']);
+						break;
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL :
+						$retVal	= ($cellValue <= $rule['value']);
+						break;
+				}
+			} elseif($rule['value'] == '') {
+				switch ($rule['operator']) {
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL :
+						$retVal	= (($cellValue == '') || ($cellValue === NULL));
+						break;
+					case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_NOTEQUAL :
+						$retVal	= (($cellValue != '') && ($cellValue !== NULL));
+						break;
+					default :
+						$retVal	= TRUE;
+						break;
+				}
+			} else {
+				//	String values are always tested for equality, factoring in for wildcards (hence a regexp test)
+				$retVal	= preg_match('/^'.$rule['value'].'$/i',$cellValue);
+			}
+			//	If there are multiple conditions, then we need to test both using the appropriate join operator
+			switch ($join) {
+				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR :
+					$returnVal = $returnVal || $retVal;
+					//	Break as soon as we have a TRUE match for OR joins,
+					//		to avoid unnecessary additional code execution
+					if ($returnVal)
+						return $returnVal;
+					break;
+				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND :
+					$returnVal = $returnVal && $retVal;
+					break;
+			}
+		}
+
+		return $returnVal;
+	}
+
+	/**
+	 *	Test if cell date value is matches a set of values defined by a set of months
+	 *
+	 *	@param	mixed		$cellValue
+	 *	@param	mixed[]		$dataSet
+	 *	@return boolean
+	 */
+	private static function _filterTestInPeriodDateSet($cellValue,$monthSet)
+	{
+		//	Blank cells are always ignored, so return a FALSE
+		if (($cellValue == '') || ($cellValue === NULL)) {
+			return FALSE;
+		}
+
+		if (is_numeric($cellValue)) {
+			$dateValue = date('m',PHPExcel_Shared_Date::ExcelToPHP($cellValue));
+			if (in_array($dateValue,$monthSet)) {
+				return TRUE;
+			}
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 *	Search/Replace arrays to convert Excel wildcard syntax to a regexp syntax for preg_matching
+	 *
+	 *	@var	array
+	 */
+	private static $_fromReplace = array('\*', '\?', '~~', '~.*', '~.?');
+	private static $_toReplace   = array('.*', '.',  '~',  '\*',  '\?');
+
+
+	/**
+	 *	Convert a dynamic rule daterange to a custom filter range expression for ease of calculation
+	 *
+	 *	@param	string										$dynamicRuleType
+	 *	@param	PHPExcel_Worksheet_AutoFilter_Column		$filterColumn
+	 *	@return mixed[]
+	 */
+	private function _dynamicFilterDateRange($dynamicRuleType, &$filterColumn)
+	{
+		$rDateType = PHPExcel_Calculation_Functions::getReturnDateType();
+		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC);
+		$val = $maxVal = NULL;
+
+		$ruleValues = array();
+		$baseDate = PHPExcel_Calculation_DateTime::DATENOW();
+		//	Calculate start/end dates for the required date range based on current date
+		switch ($dynamicRuleType) {
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
+				$baseDate = strtotime('-7 days',$baseDate);
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
+				$baseDate = strtotime('-7 days',$baseDate);
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
+				$baseDate = strtotime('-1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
+				$baseDate = strtotime('+1 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
+				$baseDate = strtotime('-3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
+				$baseDate = strtotime('+3 month',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
+				$baseDate = strtotime('-1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
+				$baseDate = strtotime('+1 year',gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+				break;
+		}
+
+		switch ($dynamicRuleType) {
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TODAY :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
+				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
+				$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate);
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE :
+				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(strtotime('+1 day',$baseDate));
+				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR :
+				$maxVal = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,31,12,date('Y',$baseDate)));
+				++$maxVal;
+				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1,date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER :
+				$thisMonth = date('m',$baseDate);
+				$thisQuarter = floor(--$thisMonth / 3);
+				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),(1+$thisQuarter)*3,date('Y',$baseDate)));
+				++$maxVal;
+				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,1+$thisQuarter*3,date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH :
+				$maxVal = (int) PHPExcel_Shared_Date::PHPtoExcel(gmmktime(0,0,0,date('t',$baseDate),date('m',$baseDate),date('Y',$baseDate)));
+				++$maxVal;
+				$val = (int) PHPExcel_Shared_Date::PHPToExcel(gmmktime(0,0,0,1,date('m',$baseDate),date('Y',$baseDate)));
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK :
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK :
+				$dayOfWeek = date('w',$baseDate);
+				$val = (int) PHPExcel_Shared_Date::PHPToExcel($baseDate) - $dayOfWeek;
+				$maxVal = $val + 7;
+				break;
+		}
+
+		switch ($dynamicRuleType) {
+			//	Adjust Today dates for Yesterday and Tomorrow
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY :
+				--$maxVal;
+				--$val;
+				break;
+			case PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW :
+				++$maxVal;
+				++$val;
+				break;
+		}
+
+		//	Set the filter column rule attributes ready for writing
+		$filterColumn->setAttributes(array(	'val' => $val,
+											'maxVal' => $maxVal
+										  )
+									);
+
+		//	Set the rules for identifying rows for hide/show
+		$ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
+							   'value' => $val
+							 );
+		$ruleValues[] = array( 'operator' => PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN,
+							   'value' => $maxVal
+							 );
+		PHPExcel_Calculation_Functions::setReturnDateType($rDateType);
+
+		return array(
+			'method' => '_filterTestInCustomDataSet',
+			'arguments' => array( 'filterRules' => $ruleValues,
+								  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND
+								)
+		);
+	}
+
+	private function _calculateTopTenValue($columnID,$startRow,$endRow,$ruleType,$ruleValue) {
+		$range = $columnID.$startRow.':'.$columnID.$endRow;
+		$dataValues = PHPExcel_Calculation_Functions::flattenArray(
+			$this->_workSheet->rangeToArray($range,NULL,TRUE,FALSE)
+		);
+
+		$dataValues = array_filter($dataValues);
+		if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) {
+			rsort($dataValues);
+		} else {
+			sort($dataValues);
+		}
+
+		return array_pop(array_slice($dataValues,0,$ruleValue));
+	}
+
+	/**
+	 *	Apply the AutoFilter rules to the AutoFilter Range
+	 *
+	 *	@throws	PHPExcel_Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter
+	 */
+	public function showHideRows()
+	{
+		list($rangeStart,$rangeEnd) = PHPExcel_Cell::rangeBoundaries($this->_range);
+
+		//	The heading row should always be visible
+//		echo 'AutoFilter Heading Row ',$rangeStart[1],' is always SHOWN',PHP_EOL;
+		$this->_workSheet->getRowDimension($rangeStart[1])->setVisible(TRUE);
+
+		$columnFilterTests = array();
+		foreach($this->_columns as $columnID => $filterColumn) {
+			$rules = $filterColumn->getRules();
+			switch ($filterColumn->getFilterType()) {
+				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER :
+					$ruleValues = array();
+					//	Build a list of the filter value selections
+					foreach($rules as $rule) {
+						$ruleType = $rule->getRuleType();
+						$ruleValues[] = $rule->getValue();
+					}
+					//	Test if we want to include blanks in our filter criteria
+					$blanks = FALSE;
+					$ruleDataSet = array_filter($ruleValues);
+					if (count($ruleValues) != count($ruleDataSet))
+						$blanks = TRUE;
+					if ($ruleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_FILTER) {
+						//	Filter on absolute values
+						$columnFilterTests[$columnID] = array(
+							'method' => '_filterTestInSimpleDataSet',
+							'arguments' => array( 'filterValues' => $ruleDataSet,
+												  'blanks' => $blanks
+												)
+						);
+					} else {
+						//	Filter on date group values
+						$arguments = array();
+						foreach($ruleDataSet as $ruleValue) {
+							$date = $time = '';
+							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
+								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== ''))
+								$date .= sprintf('%04d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
+							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
+								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != ''))
+								$date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
+							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
+								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== ''))
+								$date .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
+							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
+								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== ''))
+								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
+							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
+								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== ''))
+								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
+							if ((isset($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
+								($ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== ''))
+								$time .= sprintf('%02d',$ruleValue[PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
+							$dateTime = $date . $time;
+							$arguments['date'][] = $date;
+							$arguments['time'][] = $time;
+							$arguments['dateTime'][] = $dateTime;
+						}
+						//	Remove empty elements
+						$arguments['date'] = array_filter($arguments['date']);
+						$arguments['time'] = array_filter($arguments['time']);
+						$arguments['dateTime'] = array_filter($arguments['dateTime']);
+						$columnFilterTests[$columnID] = array(
+							'method' => '_filterTestInDateGroupSet',
+							'arguments' => array( 'filterValues' => $arguments,
+												  'blanks' => $blanks
+												)
+						);
+					}
+					break;
+				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER :
+					$customRuleForBlanks = FALSE;
+					$ruleValues = array();
+					//	Build a list of the filter value selections
+					foreach($rules as $rule) {
+						$ruleType = $rule->getRuleType();
+						$ruleValue = $rule->getValue();
+						if (!is_numeric($ruleValue)) {
+							//	Convert to a regexp allowing for regexp reserved characters, wildcards and escaped wildcards
+							$ruleValue = preg_quote($ruleValue);
+							$ruleValue = str_replace(self::$_fromReplace,self::$_toReplace,$ruleValue);
+							if (trim($ruleValue) == '') {
+								$customRuleForBlanks = TRUE;
+								$ruleValue = trim($ruleValue);
+							}
+						}
+						$ruleValues[] = array( 'operator' => $rule->getOperator(),
+											   'value' => $ruleValue
+											 );
+					}
+					$join = $filterColumn->getJoin();
+					$columnFilterTests[$columnID] = array(
+						'method' => '_filterTestInCustomDataSet',
+						'arguments' => array( 'filterRules' => $ruleValues,
+											  'join' => $join,
+											  'customRuleForBlanks' => $customRuleForBlanks
+											)
+					);
+					break;
+				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER :
+					$ruleValues = array();
+					foreach($rules as $rule) {
+						//	We should only ever have one Dynamic Filter Rule anyway
+						$dynamicRuleType = $rule->getGrouping();
+						if (($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
+							($dynamicRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
+							//	Number (Average) based
+							//	Calculate the average
+							$averageFormula = '=AVERAGE('.$columnID.($rangeStart[1]+1).':'.$columnID.$rangeEnd[1].')';
+							$average = PHPExcel_Calculation::getInstance()->calculateFormula($averageFormula,NULL,$this->_workSheet->getCell('A1'));
+							//	Set above/below rule based on greaterThan or LessTan
+							$operator = ($dynamicRuleType === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE)
+								? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHAN
+								: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHAN;
+							$ruleValues[] = array( 'operator' => $operator,
+												   'value' => $average
+												 );
+							$columnFilterTests[$columnID] = array(
+								'method' => '_filterTestInCustomDataSet',
+								'arguments' => array( 'filterRules' => $ruleValues,
+													  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
+													)
+							);
+						} else {
+							//	Date based
+							if ($dynamicRuleType{0} == 'M' || $dynamicRuleType{0} == 'Q') {
+								//	Month or Quarter
+								list($periodType,$period) = sscanf($dynamicRuleType,'%[A-Z]%d');
+								if ($periodType == 'M') {
+									$ruleValues = array($period);
+								} else {
+									--$period;
+									$periodEnd = (1+$period)*3;
+									$periodStart = 1+$period*3;
+									$ruleValues = range($periodStart,periodEnd);
+								}
+								$columnFilterTests[$columnID] = array(
+									'method' => '_filterTestInPeriodDateSet',
+									'arguments' => $ruleValues
+								);
+								$filterColumn->setAttributes(array());
+							} else {
+								//	Date Range
+								$columnFilterTests[$columnID] = $this->_dynamicFilterDateRange($dynamicRuleType, $filterColumn);
+								break;
+							}
+						}
+					}
+					break;
+				case PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER :
+					$ruleValues = array();
+					$dataRowCount = $rangeEnd[1] - $rangeStart[1];
+					foreach($rules as $rule) {
+						//	We should only ever have one Dynamic Filter Rule anyway
+						$toptenRuleType = $rule->getGrouping();
+						$ruleValue = $rule->getValue();
+						$ruleOperator = $rule->getOperator();
+					}
+					if ($ruleOperator === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) {
+						$ruleValue = floor($ruleValue * ($dataRowCount / 100));
+					}
+					if ($ruleValue < 1) $ruleValue = 1;
+					if ($ruleValue > 500) $ruleValue = 500;
+
+					$maxVal = $this->_calculateTopTenValue($columnID,$rangeStart[1]+1,$rangeEnd[1],$toptenRuleType,$ruleValue);
+
+					$operator = ($toptenRuleType == PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP)
+						? PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL
+						: PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL;
+					$ruleValues[] = array( 'operator' => $operator,
+										   'value' => $maxVal
+										 );
+					$columnFilterTests[$columnID] = array(
+						'method' => '_filterTestInCustomDataSet',
+						'arguments' => array( 'filterRules' => $ruleValues,
+											  'join' => PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_OR
+											)
+					);
+					$filterColumn->setAttributes(
+						array('maxVal' => $maxVal)
+					);
+					break;
+			}
+		}
+
+//		echo 'Column Filter Test CRITERIA',PHP_EOL;
+//		var_dump($columnFilterTests);
+//
+		//	Execute the column tests for each row in the autoFilter range to determine show/hide,
+		for ($row = $rangeStart[1]+1; $row <= $rangeEnd[1]; ++$row) {
+//			echo 'Testing Row = ',$row,PHP_EOL;
+			$result = TRUE;
+			foreach($columnFilterTests as $columnID => $columnFilterTest) {
+//				echo 'Testing cell ',$columnID.$row,PHP_EOL;
+				$cellValue = $this->_workSheet->getCell($columnID.$row)->getCalculatedValue();
+//				echo 'Value is ',$cellValue,PHP_EOL;
+				//	Execute the filter test
+				$result = $result &&
+					call_user_func_array(
+						array('PHPExcel_Worksheet_AutoFilter',$columnFilterTest['method']),
+						array(
+							$cellValue,
+							$columnFilterTest['arguments']
+						)
+					);
+//				echo (($result) ? 'VALID' : 'INVALID'),PHP_EOL;
+				//	If filter test has resulted in FALSE, exit the loop straightaway rather than running any more tests
+				if (!$result)
+					break;
+			}
+			//	Set show/hide for the row based on the result of the autoFilter result
+//			echo (($result) ? 'SHOW' : 'HIDE'),PHP_EOL;
+			$this->_workSheet->getRowDimension($row)->setVisible($result);
+		}
+
+		return $this;
+	}
+
+
+	/**
+	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+	 */
+	public function __clone() {
+		$vars = get_object_vars($this);
+		foreach ($vars as $key => $value) {
+			if (is_object($value)) {
+				if ($key == '_workSheet') {
+					//	Detach from worksheet
+					$this->$key = NULL;
+				} else {
+					$this->$key = clone $value;
+				}
+			} elseif ((is_array($value)) && ($key == '_columns')) {
+				//	The columns array of PHPExcel_Worksheet_AutoFilter objects
+				$this->$key = array();
+				foreach ($value as $k => $v) {
+					$this->$key[$k] = clone $v;
+					// attach the new cloned Column to this new cloned Autofilter object
+					$this->$key[$k]->setParent($this);
+				}
+			} else {
+				$this->$key = $value;
+			}
+		}
+	}
+
+	/**
+	 * toString method replicates previous behavior by returning the range if object is
+	 *    referenced as a property of its parent.
+	 */
+	public function __toString() {
+		return (string) $this->_range;
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php
new file mode 100644
index 00000000000..bb70ec672fe
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php
@@ -0,0 +1,381 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Worksheet
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Worksheet_AutoFilter_Column
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Worksheet
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Worksheet_AutoFilter_Column
+{
+	const AUTOFILTER_FILTERTYPE_FILTER			= 'filters';
+	const AUTOFILTER_FILTERTYPE_CUSTOMFILTER	= 'customFilters';
+	//	Supports no more than 2 rules, with an And/Or join criteria
+	//		if more than 1 rule is defined
+	const AUTOFILTER_FILTERTYPE_DYNAMICFILTER	= 'dynamicFilter';
+	//	Even though the filter rule is constant, the filtered data can vary
+	//		e.g. filtered by date = TODAY
+	const AUTOFILTER_FILTERTYPE_TOPTENFILTER	= 'top10';
+
+	private static $_filterTypes = array(
+		//	Currently we're not handling
+		//		colorFilter
+		//		extLst
+		//		iconFilter
+		self::AUTOFILTER_FILTERTYPE_FILTER,
+		self::AUTOFILTER_FILTERTYPE_CUSTOMFILTER,
+		self::AUTOFILTER_FILTERTYPE_DYNAMICFILTER,
+		self::AUTOFILTER_FILTERTYPE_TOPTENFILTER,
+	);
+
+	/* Multiple Rule Connections */
+	const AUTOFILTER_COLUMN_JOIN_AND	= 'and';
+	const AUTOFILTER_COLUMN_JOIN_OR		= 'or';
+
+	private static $_ruleJoins = array(
+		self::AUTOFILTER_COLUMN_JOIN_AND,
+		self::AUTOFILTER_COLUMN_JOIN_OR,
+	);
+
+	/**
+	 * Autofilter
+	 *
+	 * @var PHPExcel_Worksheet_AutoFilter
+	 */
+	private $_parent = NULL;
+
+
+	/**
+	 * Autofilter Column Index
+	 *
+	 * @var string
+	 */
+	private $_columnIndex = '';
+
+
+	/**
+	 * Autofilter Column Filter Type
+	 *
+	 * @var string
+	 */
+	private $_filterType = self::AUTOFILTER_FILTERTYPE_FILTER;
+
+
+	/**
+	 * Autofilter Multiple Rules And/Or
+	 *
+	 * @var string
+	 */
+	private $_join = self::AUTOFILTER_COLUMN_JOIN_OR;
+
+
+	/**
+	 * Autofilter Column Rules
+	 *
+	 * @var array of PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	private $_ruleset = array();
+
+
+	/**
+	 * Autofilter Column Dynamic Attributes
+	 *
+	 * @var array of mixed
+	 */
+	private $_attributes = array();
+
+
+	/**
+	 * Create a new PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function __construct($pColumn, PHPExcel_Worksheet_AutoFilter $pParent = NULL)
+	{
+		$this->_columnIndex = $pColumn;
+		$this->_parent = $pParent;
+	}
+
+	/**
+	 * Get AutoFilter Column Index
+	 *
+	 * @return string
+	 */
+	public function getColumnIndex() {
+		return $this->_columnIndex;
+	}
+
+	/**
+	 *	Set AutoFilter Column Index
+	 *
+	 *	@param	string		$pColumn		Column (e.g. A)
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function setColumnIndex($pColumn) {
+		// Uppercase coordinate
+		$pColumn = strtoupper($pColumn);
+		if ($this->_parent !== NULL) {
+			$this->_parent->testColumnInRange($pColumn);
+		}
+
+		$this->_columnIndex = $pColumn;
+
+		return $this;
+	}
+
+	/**
+	 * Get this Column's AutoFilter Parent
+	 *
+	 * @return PHPExcel_Worksheet_AutoFilter
+	 */
+	public function getParent() {
+		return $this->_parent;
+	}
+
+	/**
+	 * Set this Column's AutoFilter Parent
+	 *
+	 * @param PHPExcel_Worksheet_AutoFilter
+	 * @return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function setParent(PHPExcel_Worksheet_AutoFilter $pParent = NULL) {
+		$this->_parent = $pParent;
+
+		return $this;
+	}
+
+	/**
+	 * Get AutoFilter Type
+	 *
+	 * @return string
+	 */
+	public function getFilterType() {
+		return $this->_filterType;
+	}
+
+	/**
+	 *	Set AutoFilter Type
+	 *
+	 *	@param	string		$pFilterType
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function setFilterType($pFilterType = self::AUTOFILTER_FILTERTYPE_FILTER) {
+		if (!in_array($pFilterType,self::$_filterTypes)) {
+			throw new PHPExcel_Exception('Invalid filter type for column AutoFilter.');
+		}
+
+		$this->_filterType = $pFilterType;
+
+		return $this;
+	}
+
+	/**
+	 * Get AutoFilter Multiple Rules And/Or Join
+	 *
+	 * @return string
+	 */
+	public function getJoin() {
+		return $this->_join;
+	}
+
+	/**
+	 *	Set AutoFilter Multiple Rules And/Or
+	 *
+	 *	@param	string		$pJoin		And/Or
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function setJoin($pJoin = self::AUTOFILTER_COLUMN_JOIN_OR) {
+		// Lowercase And/Or
+		$pJoin = strtolower($pJoin);
+		if (!in_array($pJoin,self::$_ruleJoins)) {
+			throw new PHPExcel_Exception('Invalid rule connection for column AutoFilter.');
+		}
+
+		$this->_join = $pJoin;
+
+		return $this;
+	}
+
+	/**
+	 *	Set AutoFilter Attributes
+	 *
+	 *	@param	string[]		$pAttributes
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function setAttributes($pAttributes = array()) {
+		$this->_attributes = $pAttributes;
+
+		return $this;
+	}
+
+	/**
+	 *	Set An AutoFilter Attribute
+	 *
+	 *	@param	string		$pName		Attribute Name
+	 *	@param	string		$pValue		Attribute Value
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function setAttribute($pName, $pValue) {
+		$this->_attributes[$pName] = $pValue;
+
+		return $this;
+	}
+
+	/**
+	 * Get AutoFilter Column Attributes
+	 *
+	 * @return string
+	 */
+	public function getAttributes() {
+		return $this->_attributes;
+	}
+
+	/**
+	 * Get specific AutoFilter Column Attribute
+	 *
+	 *	@param	string		$pName		Attribute Name
+	 * @return string
+	 */
+	public function getAttribute($pName) {
+		if (isset($this->_attributes[$pName]))
+			return $this->_attributes[$pName];
+		return NULL;
+	}
+
+	/**
+	 * Get all AutoFilter Column Rules
+	 *
+	 * @throws	PHPExcel_Exception
+	 * @return array of PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function getRules() {
+		return $this->_ruleset;
+	}
+
+	/**
+	 * Get a specified AutoFilter Column Rule
+	 *
+	 * @param	integer	$pIndex		Rule index in the ruleset array
+	 * @return	PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function getRule($pIndex) {
+		if (!isset($this->_ruleset[$pIndex])) {
+			$this->_ruleset[$pIndex] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
+		}
+		return $this->_ruleset[$pIndex];
+	}
+
+	/**
+	 * Create a new AutoFilter Column Rule in the ruleset
+	 *
+	 * @return	PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function createRule() {
+		$this->_ruleset[] = new PHPExcel_Worksheet_AutoFilter_Column_Rule($this);
+
+		return end($this->_ruleset);
+	}
+
+	/**
+	 * Add a new AutoFilter Column Rule to the ruleset
+	 *
+	 * @param	PHPExcel_Worksheet_AutoFilter_Column_Rule	$pRule
+	 * @param	boolean	$returnRule 	Flag indicating whether the rule object or the column object should be returned
+	 * @return	PHPExcel_Worksheet_AutoFilter_Column|PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function addRule(PHPExcel_Worksheet_AutoFilter_Column_Rule $pRule, $returnRule=TRUE) {
+		$pRule->setParent($this);
+		$this->_ruleset[] = $pRule;
+
+		return ($returnRule) ? $pRule : $this;
+	}
+
+	/**
+	 * Delete a specified AutoFilter Column Rule
+	 *	If the number of rules is reduced to 1, then we reset And/Or logic to Or
+	 *
+	 * @param	integer	$pIndex		Rule index in the ruleset array
+	 * @return	PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function deleteRule($pIndex) {
+		if (isset($this->_ruleset[$pIndex])) {
+			unset($this->_ruleset[$pIndex]);
+			//	If we've just deleted down to a single rule, then reset And/Or joining to Or
+			if (count($this->_ruleset) <= 1) {
+				$this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Delete all AutoFilter Column Rules
+	 *
+	 * @return	PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function clearRules() {
+		$this->_ruleset = array();
+		$this->setJoin(self::AUTOFILTER_COLUMN_JOIN_OR);
+
+		return $this;
+	}
+
+	/**
+	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+	 */
+	public function __clone() {
+		$vars = get_object_vars($this);
+		foreach ($vars as $key => $value) {
+			if (is_object($value)) {
+				if ($key == '_parent') {
+					//	Detach from autofilter parent
+					$this->$key = NULL;
+				} else {
+					$this->$key = clone $value;
+				}
+			} elseif ((is_array($value)) && ($key == '_ruleset')) {
+				//	The columns array of PHPExcel_Worksheet_AutoFilter objects
+				$this->$key = array();
+				foreach ($value as $k => $v) {
+					$this->$key[$k] = clone $v;
+					// attach the new cloned Rule to this new cloned Autofilter Cloned object
+					$this->$key[$k]->setParent($this);
+				}
+			} else {
+				$this->$key = $value;
+			}
+		}
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
new file mode 100644
index 00000000000..209012ce180
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
@@ -0,0 +1,462 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Worksheet
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Worksheet_AutoFilter_Column_Rule
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Worksheet
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Worksheet_AutoFilter_Column_Rule
+{
+	const AUTOFILTER_RULETYPE_FILTER		= 'filter';
+	const AUTOFILTER_RULETYPE_DATEGROUP		= 'dateGroupItem';
+	const AUTOFILTER_RULETYPE_CUSTOMFILTER	= 'customFilter';
+	const AUTOFILTER_RULETYPE_DYNAMICFILTER	= 'dynamicFilter';
+	const AUTOFILTER_RULETYPE_TOPTENFILTER	= 'top10Filter';
+
+	private static $_ruleTypes = array(
+		//	Currently we're not handling
+		//		colorFilter
+		//		extLst
+		//		iconFilter
+		self::AUTOFILTER_RULETYPE_FILTER,
+		self::AUTOFILTER_RULETYPE_DATEGROUP,
+		self::AUTOFILTER_RULETYPE_CUSTOMFILTER,
+		self::AUTOFILTER_RULETYPE_DYNAMICFILTER,
+		self::AUTOFILTER_RULETYPE_TOPTENFILTER,
+	);
+
+	const AUTOFILTER_RULETYPE_DATEGROUP_YEAR	= 'year';
+	const AUTOFILTER_RULETYPE_DATEGROUP_MONTH	= 'month';
+	const AUTOFILTER_RULETYPE_DATEGROUP_DAY		= 'day';
+	const AUTOFILTER_RULETYPE_DATEGROUP_HOUR	= 'hour';
+	const AUTOFILTER_RULETYPE_DATEGROUP_MINUTE	= 'minute';
+	const AUTOFILTER_RULETYPE_DATEGROUP_SECOND	= 'second';
+
+	private static $_dateTimeGroups = array(
+		self::AUTOFILTER_RULETYPE_DATEGROUP_YEAR,
+		self::AUTOFILTER_RULETYPE_DATEGROUP_MONTH,
+		self::AUTOFILTER_RULETYPE_DATEGROUP_DAY,
+		self::AUTOFILTER_RULETYPE_DATEGROUP_HOUR,
+		self::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE,
+		self::AUTOFILTER_RULETYPE_DATEGROUP_SECOND,
+	);
+
+	const AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY		= 'yesterday';
+	const AUTOFILTER_RULETYPE_DYNAMIC_TODAY			= 'today';
+	const AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW		= 'tomorrow';
+	const AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE	= 'yearToDate';
+	const AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR		= 'thisYear';
+	const AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER	= 'thisQuarter';
+	const AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH		= 'thisMonth';
+	const AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK		= 'thisWeek';
+	const AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR		= 'lastYear';
+	const AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER	= 'lastQuarter';
+	const AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH		= 'lastMonth';
+	const AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK		= 'lastWeek';
+	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR		= 'nextYear';
+	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER	= 'nextQuarter';
+	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH		= 'nextMonth';
+	const AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK		= 'nextWeek';
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1		= 'M1';
+	const AUTOFILTER_RULETYPE_DYNAMIC_JANUARY		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2		= 'M2';
+	const AUTOFILTER_RULETYPE_DYNAMIC_FEBRUARY		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3		= 'M3';
+	const AUTOFILTER_RULETYPE_DYNAMIC_MARCH			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4		= 'M4';
+	const AUTOFILTER_RULETYPE_DYNAMIC_APRIL			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5		= 'M5';
+	const AUTOFILTER_RULETYPE_DYNAMIC_MAY			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6		= 'M6';
+	const AUTOFILTER_RULETYPE_DYNAMIC_JUNE			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7		= 'M7';
+	const AUTOFILTER_RULETYPE_DYNAMIC_JULY			= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8		= 'M8';
+	const AUTOFILTER_RULETYPE_DYNAMIC_AUGUST		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9		= 'M9';
+	const AUTOFILTER_RULETYPE_DYNAMIC_SEPTEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10		= 'M10';
+	const AUTOFILTER_RULETYPE_DYNAMIC_OCTOBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11		= 'M11';
+	const AUTOFILTER_RULETYPE_DYNAMIC_NOVEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11;
+	const AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12		= 'M12';
+	const AUTOFILTER_RULETYPE_DYNAMIC_DECEMBER		= self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12;
+	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1		= 'Q1';
+	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2		= 'Q2';
+	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3		= 'Q3';
+	const AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4		= 'Q4';
+	const AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE	= 'aboveAverage';
+	const AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE	= 'belowAverage';
+
+	private static $_dynamicTypes = array(
+		self::AUTOFILTER_RULETYPE_DYNAMIC_YESTERDAY,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_TODAY,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_TOMORROW,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_YEARTODATE,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_THISYEAR,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_THISQUARTER,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_THISMONTH,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_THISWEEK,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTYEAR,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTQUARTER,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTMONTH,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_LASTWEEK,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTYEAR,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTQUARTER,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTMONTH,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_NEXTWEEK,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_1,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_2,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_3,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_4,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_5,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_6,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_7,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_8,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_9,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_10,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_11,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_MONTH_12,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_1,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_2,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_3,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_QUARTER_4,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE,
+		self::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE,
+	);
+
+	/*
+	 *	The only valid filter rule operators for filter and customFilter types are:
+	 *		<xsd:enumeration value="equal"/>
+	 *		<xsd:enumeration value="lessThan"/>
+	 *		<xsd:enumeration value="lessThanOrEqual"/>
+	 *		<xsd:enumeration value="notEqual"/>
+	 *		<xsd:enumeration value="greaterThanOrEqual"/>
+	 *		<xsd:enumeration value="greaterThan"/>
+	 */
+	const AUTOFILTER_COLUMN_RULE_EQUAL				= 'equal';
+	const AUTOFILTER_COLUMN_RULE_NOTEQUAL			= 'notEqual';
+	const AUTOFILTER_COLUMN_RULE_GREATERTHAN		= 'greaterThan';
+	const AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL	= 'greaterThanOrEqual';
+	const AUTOFILTER_COLUMN_RULE_LESSTHAN			= 'lessThan';
+	const AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL	= 'lessThanOrEqual';
+
+	private static $_operators = array(
+		self::AUTOFILTER_COLUMN_RULE_EQUAL,
+		self::AUTOFILTER_COLUMN_RULE_NOTEQUAL,
+		self::AUTOFILTER_COLUMN_RULE_GREATERTHAN,
+		self::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
+		self::AUTOFILTER_COLUMN_RULE_LESSTHAN,
+		self::AUTOFILTER_COLUMN_RULE_LESSTHANOREQUAL,
+	);
+
+	const AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE	= 'byValue';
+	const AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT		= 'byPercent';
+
+	private static $_topTenValue = array(
+		self::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE,
+		self::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT,
+	);
+
+	const AUTOFILTER_COLUMN_RULE_TOPTEN_TOP			= 'top';
+	const AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM		= 'bottom';
+
+	private static $_topTenType = array(
+		self::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP,
+		self::AUTOFILTER_COLUMN_RULE_TOPTEN_BOTTOM,
+	);
+
+
+	/* Rule Operators (Numeric, Boolean etc) */
+//	const AUTOFILTER_COLUMN_RULE_BETWEEN			= 'between';		//	greaterThanOrEqual 1 && lessThanOrEqual 2
+	/* Rule Operators (Numeric Special) which are translated to standard numeric operators with calculated values */
+//	const AUTOFILTER_COLUMN_RULE_TOPTEN				= 'topTen';			//	greaterThan calculated value
+//	const AUTOFILTER_COLUMN_RULE_TOPTENPERCENT		= 'topTenPercent';	//	greaterThan calculated value
+//	const AUTOFILTER_COLUMN_RULE_ABOVEAVERAGE		= 'aboveAverage';	//	Value is calculated as the average
+//	const AUTOFILTER_COLUMN_RULE_BELOWAVERAGE		= 'belowAverage';	//	Value is calculated as the average
+	/* Rule Operators (String) which are set as wild-carded values */
+//	const AUTOFILTER_COLUMN_RULE_BEGINSWITH			= 'beginsWith';			// A*
+//	const AUTOFILTER_COLUMN_RULE_ENDSWITH			= 'endsWith';			// *Z
+//	const AUTOFILTER_COLUMN_RULE_CONTAINS			= 'contains';			// *B*
+//	const AUTOFILTER_COLUMN_RULE_DOESNTCONTAIN		= 'notEqual';			//	notEqual *B*
+	/* Rule Operators (Date Special) which are translated to standard numeric operators with calculated values */
+//	const AUTOFILTER_COLUMN_RULE_BEFORE				= 'lessThan';
+//	const AUTOFILTER_COLUMN_RULE_AFTER				= 'greaterThan';
+//	const AUTOFILTER_COLUMN_RULE_YESTERDAY			= 'yesterday';
+//	const AUTOFILTER_COLUMN_RULE_TODAY				= 'today';
+//	const AUTOFILTER_COLUMN_RULE_TOMORROW			= 'tomorrow';
+//	const AUTOFILTER_COLUMN_RULE_LASTWEEK			= 'lastWeek';
+//	const AUTOFILTER_COLUMN_RULE_THISWEEK			= 'thisWeek';
+//	const AUTOFILTER_COLUMN_RULE_NEXTWEEK			= 'nextWeek';
+//	const AUTOFILTER_COLUMN_RULE_LASTMONTH			= 'lastMonth';
+//	const AUTOFILTER_COLUMN_RULE_THISMONTH			= 'thisMonth';
+//	const AUTOFILTER_COLUMN_RULE_NEXTMONTH			= 'nextMonth';
+//	const AUTOFILTER_COLUMN_RULE_LASTQUARTER		= 'lastQuarter';
+//	const AUTOFILTER_COLUMN_RULE_THISQUARTER		= 'thisQuarter';
+//	const AUTOFILTER_COLUMN_RULE_NEXTQUARTER		= 'nextQuarter';
+//	const AUTOFILTER_COLUMN_RULE_LASTYEAR			= 'lastYear';
+//	const AUTOFILTER_COLUMN_RULE_THISYEAR			= 'thisYear';
+//	const AUTOFILTER_COLUMN_RULE_NEXTYEAR			= 'nextYear';
+//	const AUTOFILTER_COLUMN_RULE_YEARTODATE			= 'yearToDate';			//	<dynamicFilter val="40909" type="yearToDate" maxVal="41113"/>
+//	const AUTOFILTER_COLUMN_RULE_ALLDATESINMONTH	= 'allDatesInMonth';	//	<dynamicFilter type="M2"/> for Month/February
+//	const AUTOFILTER_COLUMN_RULE_ALLDATESINQUARTER	= 'allDatesInQuarter';	//	<dynamicFilter type="Q2"/> for Quarter 2
+
+	/**
+	 * Autofilter Column
+	 *
+	 * @var PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	private $_parent = NULL;
+
+
+	/**
+	 * Autofilter Rule Type
+	 *
+	 * @var string
+	 */
+	private $_ruleType = self::AUTOFILTER_RULETYPE_FILTER;
+
+
+	/**
+	 * Autofilter Rule Value
+	 *
+	 * @var string
+	 */
+	private $_value = '';
+
+	/**
+	 * Autofilter Rule Operator
+	 *
+	 * @var string
+	 */
+	private $_operator = '';
+
+	/**
+	 * DateTimeGrouping Group Value
+	 *
+	 * @var string
+	 */
+	private $_grouping = '';
+
+
+	/**
+	 * Create a new PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function __construct(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL)
+	{
+		$this->_parent = $pParent;
+	}
+
+	/**
+	 * Get AutoFilter Rule Type
+	 *
+	 * @return string
+	 */
+	public function getRuleType() {
+		return $this->_ruleType;
+	}
+
+	/**
+	 *	Set AutoFilter Rule Type
+	 *
+	 *	@param	string		$pRuleType
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function setRuleType($pRuleType = self::AUTOFILTER_RULETYPE_FILTER) {
+		if (!in_array($pRuleType,self::$_ruleTypes)) {
+			throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
+		}
+
+		$this->_ruleType = $pRuleType;
+
+		return $this;
+	}
+
+	/**
+	 * Get AutoFilter Rule Value
+	 *
+	 * @return string
+	 */
+	public function getValue() {
+		return $this->_value;
+	}
+
+	/**
+	 *	Set AutoFilter Rule Value
+	 *
+	 *	@param	string|string[]		$pValue
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function setValue($pValue = '') {
+		if (is_array($pValue)) {
+			$grouping = -1;
+			foreach($pValue as $key => $value) {
+				//	Validate array entries
+				if (!in_array($key,self::$_dateTimeGroups)) {
+					//	Remove any invalid entries from the value array
+					unset($pValue[$key]);
+				} else {
+					//	Work out what the dateTime grouping will be
+					$grouping = max($grouping,array_search($key,self::$_dateTimeGroups));
+				}
+			}
+			if (count($pValue) == 0) {
+				throw new PHPExcel_Exception('Invalid rule value for column AutoFilter Rule.');
+			}
+			//	Set the dateTime grouping that we've anticipated
+			$this->setGrouping(self::$_dateTimeGroups[$grouping]);
+		}
+		$this->_value = $pValue;
+
+		return $this;
+	}
+
+	/**
+	 * Get AutoFilter Rule Operator
+	 *
+	 * @return string
+	 */
+	public function getOperator() {
+		return $this->_operator;
+	}
+
+	/**
+	 *	Set AutoFilter Rule Operator
+	 *
+	 *	@param	string		$pOperator
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function setOperator($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL) {
+		if (empty($pOperator))
+			$pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
+		if ((!in_array($pOperator,self::$_operators)) &&
+			(!in_array($pOperator,self::$_topTenValue))) {
+			throw new PHPExcel_Exception('Invalid operator for column AutoFilter Rule.');
+		}
+		$this->_operator = $pOperator;
+
+		return $this;
+	}
+
+	/**
+	 * Get AutoFilter Rule Grouping
+	 *
+	 * @return string
+	 */
+	public function getGrouping() {
+		return $this->_grouping;
+	}
+
+	/**
+	 *	Set AutoFilter Rule Grouping
+	 *
+	 *	@param	string		$pGrouping
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function setGrouping($pGrouping = NULL) {
+		if (($pGrouping !== NULL) &&
+			(!in_array($pGrouping,self::$_dateTimeGroups)) &&
+			(!in_array($pGrouping,self::$_dynamicTypes)) &&
+			(!in_array($pGrouping,self::$_topTenType))) {
+			throw new PHPExcel_Exception('Invalid rule type for column AutoFilter Rule.');
+		}
+
+		$this->_grouping = $pGrouping;
+
+		return $this;
+	}
+
+	/**
+	 *	Set AutoFilter Rule
+	 *
+	 *	@param	string				$pOperator
+	 *	@param	string|string[]		$pValue
+	 *	@param	string				$pGrouping
+	 *	@throws	Exception
+	 *	@return PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function setRule($pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL, $pValue = '', $pGrouping = NULL) {
+		$this->setOperator($pOperator);
+		$this->setValue($pValue);
+		//	Only set grouping if it's been passed in as a user-supplied argument,
+		//		otherwise we're calculating it when we setValue() and don't want to overwrite that
+		//		If the user supplies an argumnet for grouping, then on their own head be it
+		if ($pGrouping !== NULL)
+			$this->setGrouping($pGrouping);
+
+		return $this;
+	}
+
+	/**
+	 * Get this Rule's AutoFilter Column Parent
+	 *
+	 * @return PHPExcel_Worksheet_AutoFilter_Column
+	 */
+	public function getParent() {
+		return $this->_parent;
+	}
+
+	/**
+	 * Set this Rule's AutoFilter Column Parent
+	 *
+	 * @param PHPExcel_Worksheet_AutoFilter_Column
+	 * @return PHPExcel_Worksheet_AutoFilter_Column_Rule
+	 */
+	public function setParent(PHPExcel_Worksheet_AutoFilter_Column $pParent = NULL) {
+		$this->_parent = $pParent;
+
+		return $this;
+	}
+
+	/**
+	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+	 */
+	public function __clone() {
+		$vars = get_object_vars($this);
+		foreach ($vars as $key => $value) {
+			if (is_object($value)) {
+				if ($key == '_parent') {
+					//	Detach from autofilter column parent
+					$this->$key = NULL;
+				} else {
+					$this->$key = clone $value;
+				}
+			} else {
+				$this->$key = $value;
+			}
+		}
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/BaseDrawing.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/BaseDrawing.php
index 6d6c56a6531..1e6725a38ad 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/BaseDrawing.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/BaseDrawing.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/CellIterator.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/CellIterator.php
index 75904eab946..a612d550c62 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/CellIterator.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/CellIterator.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -33,9 +33,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class PHPExcel_Worksheet_CellIterator extends CachingIterator
+class PHPExcel_Worksheet_CellIterator implements Iterator
 {
 	/**
 	 * PHPExcel_Worksheet to iterate
@@ -117,7 +117,7 @@ class PHPExcel_Worksheet_CellIterator extends CachingIterator
     }
 
     /**
-     * More PHPExcel_Cell instances available?
+     * Are there any more PHPExcel_Cell instances available?
      *
      * @return boolean
      */
@@ -151,9 +151,9 @@ class PHPExcel_Worksheet_CellIterator extends CachingIterator
     }
 
 	/**
-	 * Set loop only existing cells
+	 * Set the iterator to loop only existing cells
 	 *
-	 * @return boolean
+	 * @param	boolean		$value
 	 */
     public function setIterateOnlyExistingCells($value = true) {
     	$this->_onlyExistingCells = $value;
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/ColumnDimension.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/ColumnDimension.php
index 227b4df102a..0915a359961 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/ColumnDimension.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/ColumnDimension.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_ColumnDimension
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing.php
index 3a24b8a32e9..1d4e4b53fb0 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_Drawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing/Shadow.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing/Shadow.php
index 2366a799b04..d4a53733dc3 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing/Shadow.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Drawing/Shadow.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet_Drawing
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_Drawing_Shadow implements PHPExcel_IComparable
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooter.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooter.php
index 8cae5526d4d..e2524e1f951 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooter.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooter.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -91,7 +91,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_HeaderFooter
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooterDrawing.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
index 15e1424aa07..94672da4722 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_HeaderFooterDrawing extends PHPExcel_Worksheet_Drawing implements PHPExcel_IComparable
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/MemoryDrawing.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/MemoryDrawing.php
index 71ac2510418..223a29f06b0 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/MemoryDrawing.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/MemoryDrawing.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_MemoryDrawing extends PHPExcel_Worksheet_BaseDrawing implements PHPExcel_IComparable
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageMargins.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageMargins.php
index 6490f61aeb5..7d31a5f6291 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageMargins.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageMargins.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_PageMargins
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageSetup.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageSetup.php
index beeaeeacfb8..693f1c6a83f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageSetup.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/PageSetup.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -102,7 +102,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_PageSetup
 {
@@ -214,7 +214,7 @@ class PHPExcel_Worksheet_PageSetup
 	  *
 	  * @var boolean
 	  */
-	private $_fitToPage		= false;
+	private $_fitToPage		= FALSE;
 
 	/**
 	  * Fit To Height
@@ -251,28 +251,28 @@ class PHPExcel_Worksheet_PageSetup
 	 *
 	 * @var boolean
 	 */
-	private $_horizontalCentered = false;
+	private $_horizontalCentered = FALSE;
 
 	/**
 	 * Center page vertically
 	 *
 	 * @var boolean
 	 */
-	private $_verticalCentered = false;
+	private $_verticalCentered = FALSE;
 
 	/**
 	 * Print area
 	 *
 	 * @var string
 	 */
-	private $_printArea = null;
+	private $_printArea = NULL;
 
 	/**
 	 * First page number
 	 *
 	 * @var int
 	 */
-	private $_firstPageNumber = null;
+	private $_firstPageNumber = NULL;
 
     /**
      * Create a new PHPExcel_Worksheet_PageSetup
@@ -336,10 +336,10 @@ class PHPExcel_Worksheet_PageSetup
 	 * Print scaling. Valid values range from 10 to 400
 	 * This setting is overridden when fitToWidth and/or fitToHeight are in use
 	 *
-	 * @param 	int? 	$pValue
-	 * @param boolean $pUpdate Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
-	 * @throws 	Exception
+	 * @param 	int?	$pValue
+	 * @param boolean	$pUpdate	Update fitToPage so scaling applies rather than fitToHeight / fitToWidth
 	 * @return PHPExcel_Worksheet_PageSetup
+	 * @throws 	Exception
 	 */
 	public function setScale($pValue = 100, $pUpdate = true) {
 		// Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
@@ -370,7 +370,7 @@ class PHPExcel_Worksheet_PageSetup
 	 * @param boolean $pValue
 	 * @return PHPExcel_Worksheet_PageSetup
 	 */
-	public function setFitToPage($pValue = true) {
+	public function setFitToPage($pValue = TRUE) {
 		$this->_fitToPage = $pValue;
 		return $this;
 	}
@@ -391,10 +391,10 @@ class PHPExcel_Worksheet_PageSetup
 	 * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
 	 * @return PHPExcel_Worksheet_PageSetup
 	 */
-	public function setFitToHeight($pValue = 1, $pUpdate = true) {
+	public function setFitToHeight($pValue = 1, $pUpdate = TRUE) {
 		$this->_fitToHeight = $pValue;
 		if ($pUpdate) {
-			$this->_fitToPage = true;
+			$this->_fitToPage = TRUE;
 		}
 		return $this;
 	}
@@ -415,10 +415,10 @@ class PHPExcel_Worksheet_PageSetup
 	 * @param boolean $pUpdate Update fitToPage so it applies rather than scaling
 	 * @return PHPExcel_Worksheet_PageSetup
 	 */
-	public function setFitToWidth($pValue = 1, $pUpdate = true) {
+	public function setFitToWidth($pValue = 1, $pUpdate = TRUE) {
 		$this->_fitToWidth = $pValue;
 		if ($pUpdate) {
-			$this->_fitToPage = true;
+			$this->_fitToPage = TRUE;
 		}
 		return $this;
 	}
@@ -499,7 +499,7 @@ class PHPExcel_Worksheet_PageSetup
 	/**
 	 * Set Rows to repeat at top
 	 *
-	 * @param array $pValue Containing start column and end column, empty array if option unset
+	 * @param array	$pValue	Containing start column and end column, empty array if option unset
 	 * @return PHPExcel_Worksheet_PageSetup
 	 */
 	public function setRowsToRepeatAtTop($pValue = null) {
@@ -564,12 +564,12 @@ class PHPExcel_Worksheet_PageSetup
 	/**
 	 *	Get print area
 	 *
-	 *	@param	int		$index	Identifier for a specific print area range if several ranges have been set
+	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
 	 *							Default behaviour, or a index value of 0, will return all ranges as a comma-separated string
 	 *							Otherwise, the specific range identified by the value of $index will be returned
 	 *							Print areas are numbered from 1
-	 *	@throws	Exception
-	 *	@return	string
+	 * @throws	Exception
+	 * @return	string
 	 */
 	public function getPrintArea($index = 0) {
 		if ($index == 0) {
@@ -583,13 +583,13 @@ class PHPExcel_Worksheet_PageSetup
 	}
 
 	/**
-	 *	Is print area set?
+	 * Is print area set?
 	 *
-	 *	@param	int		$index	Identifier for a specific print area range if several ranges have been set
+	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
 	 *							Default behaviour, or an index value of 0, will identify whether any print range is set
 	 *							Otherwise, existence of the range identified by the value of $index will be returned
 	 *							Print areas are numbered from 1
-	 *	@return	boolean
+	 * @return	boolean
 	 */
 	public function isPrintAreaSet($index = 0) {
 		if ($index == 0) {
@@ -600,13 +600,13 @@ class PHPExcel_Worksheet_PageSetup
 	}
 
 	/**
-	 *	Clear a print area
+	 * Clear a print area
 	 *
-	 *	@param	int		$index	Identifier for a specific print area range if several ranges have been set
+	 * @param	int		$index	Identifier for a specific print area range if several ranges have been set
 	 *							Default behaviour, or an index value of 0, will clear all print ranges that are set
 	 *							Otherwise, the range identified by the value of $index will be removed from the series
 	 *							Print areas are numbered from 1
-	 *	@return	PHPExcel_Worksheet_PageSetup
+	 * @return	PHPExcel_Worksheet_PageSetup
 	 */
 	public function clearPrintArea($index = 0) {
 		if ($index == 0) {
@@ -623,10 +623,10 @@ class PHPExcel_Worksheet_PageSetup
 	}
 
 	/**
-	 *	Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20'
+	 * Set print area. e.g. 'A1:D10' or 'A1:D10,G5:M20'
 	 *
-	 *	@param	string	$value
-	 *	@param	int		$index	Identifier for a specific print area range allowing several ranges to be set
+	 * @param	string	$value
+	 * @param	int		$index	Identifier for a specific print area range allowing several ranges to be set
 	 *							When the method is "O"verwrite, then a positive integer index will overwrite that indexed
 	 *								entry in the print areas list; a negative index value will identify which entry to
 	 *								overwrite working bacward through the print area to the list, with the last entry as -1.
@@ -636,11 +636,11 @@ class PHPExcel_Worksheet_PageSetup
 	 *								Specifying an index value of 0, will always append the new print range at the end of the
 	 *								list.
 	 *							Print areas are numbered from 1
-	 *	@param	string	$method	Determines the method used when setting multiple print areas
+	 * @param	string	$method	Determines the method used when setting multiple print areas
 	 *							Default behaviour, or the "O" method, overwrites existing print area
 	 *							The "I" method, inserts the new print area before any specified index, or at the end of the list
-	 *	@throws	Exception
-	 *	@return	PHPExcel_Worksheet_PageSetup
+	 * @return	PHPExcel_Worksheet_PageSetup
+	 * @throws	Exception
 	 */
 	public function setPrintArea($value, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE) {
 		if (strpos($value,'!') !== false) {
@@ -688,44 +688,44 @@ class PHPExcel_Worksheet_PageSetup
 	}
 
 	/**
-	 *	Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas
+	 * Add a new print area (e.g. 'A1:D10' or 'A1:D10,G5:M20') to the list of print areas
 	 *
-	 *	@param	string	$value
-	 *	@param	int		$index	Identifier for a specific print area range allowing several ranges to be set
+	 * @param	string	$value
+	 * @param	int		$index	Identifier for a specific print area range allowing several ranges to be set
 	 *							A positive index will insert after that indexed entry in the print areas list, while a
 	 *								negative index will insert before the indexed entry.
 	 *								Specifying an index value of 0, will always append the new print range at the end of the
 	 *								list.
 	 *							Print areas are numbered from 1
-	 *	@throws	Exception
-	 *	@return	PHPExcel_Worksheet_PageSetup
+	 * @return	PHPExcel_Worksheet_PageSetup
+	 * @throws	Exception
 	 */
 	public function addPrintArea($value, $index = -1) {
 		return $this->setPrintArea($value, $index, self::SETPRINTRANGE_INSERT);
 	}
 
 	/**
-	 *	Set print area
+	 * Set print area
 	 *
-	 *	@param	int		$column1	Column 1
-	 *	@param	int		$row1		Row 1
-	 *	@param	int		$column2	Column 2
-	 *	@param	int		$row2		Row 2
-	 *	@param	int		$index	Identifier for a specific print area range allowing several ranges to be set
-	 *							When the method is "O"verwrite, then a positive integer index will overwrite that indexed
-	 *								entry in the print areas list; a negative index value will identify which entry to
-	 *								overwrite working bacward through the print area to the list, with the last entry as -1.
-	 *								Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
-	 *							When the method is "I"nsert, then a positive index will insert after that indexed entry in
-	 *								the print areas list, while a negative index will insert before the indexed entry.
-	 *								Specifying an index value of 0, will always append the new print range at the end of the
-	 *								list.
-	 *							Print areas are numbered from 1
-	 *	@param	string	$method	Determines the method used when setting multiple print areas
-	 *							Default behaviour, or the "O" method, overwrites existing print area
-	 *							The "I" method, inserts the new print area before any specified index, or at the end of the list
-	 *	@throws	Exception
-	 *	@return	PHPExcel_Worksheet_PageSetup
+	 * @param	int		$column1	Column 1
+	 * @param	int		$row1		Row 1
+	 * @param	int		$column2	Column 2
+	 * @param	int		$row2		Row 2
+	 * @param	int		$index		Identifier for a specific print area range allowing several ranges to be set
+	 *								When the method is "O"verwrite, then a positive integer index will overwrite that indexed
+	 *									entry in the print areas list; a negative index value will identify which entry to
+	 *									overwrite working bacward through the print area to the list, with the last entry as -1.
+	 *									Specifying an index value of 0, will overwrite <b>all</b> existing print ranges.
+	 *								When the method is "I"nsert, then a positive index will insert after that indexed entry in
+	 *									the print areas list, while a negative index will insert before the indexed entry.
+	 *									Specifying an index value of 0, will always append the new print range at the end of the
+	 *									list.
+	 *								Print areas are numbered from 1
+	 * @param	string	$method		Determines the method used when setting multiple print areas
+	 *								Default behaviour, or the "O" method, overwrites existing print area
+	 *								The "I" method, inserts the new print area before any specified index, or at the end of the list
+	 * @return	PHPExcel_Worksheet_PageSetup
+	 * @throws	Exception
 	 */
     public function setPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = 0, $method = self::SETPRINTRANGE_OVERWRITE)
     {
@@ -733,20 +733,20 @@ class PHPExcel_Worksheet_PageSetup
     }
 
 	/**
-	 *	Add a new print area to the list of print areas
+	 * Add a new print area to the list of print areas
 	 *
-	 *	@param	int		$column1	Column 1
-	 *	@param	int		$row1		Row 1
-	 *	@param	int		$column2	Column 2
-	 *	@param	int		$row2		Row 2
-	 *	@param	int		$index		Identifier for a specific print area range allowing several ranges to be set
+	 * @param	int		$column1	Start Column for the print area
+	 * @param	int		$row1		Start Row for the print area
+	 * @param	int		$column2	End Column for the print area
+	 * @param	int		$row2		End Row for the print area
+	 * @param	int		$index		Identifier for a specific print area range allowing several ranges to be set
 	 *								A positive index will insert after that indexed entry in the print areas list, while a
 	 *									negative index will insert before the indexed entry.
 	 *									Specifying an index value of 0, will always append the new print range at the end of the
 	 *									list.
 	 *								Print areas are numbered from 1
-	 *	@throws	Exception
-	 *	@return	PHPExcel_Worksheet_PageSetup
+	 * @return	PHPExcel_Worksheet_PageSetup
+	 * @throws	Exception
 	 */
     public function addPrintAreaByColumnAndRow($column1, $row1, $column2, $row2, $index = -1)
     {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Protection.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Protection.php
index 17d253903fb..e7c3436f179 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Protection.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Protection.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_Protection
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Row.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Row.php
index fe5e0c92163..ba9d8530b48 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/Row.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/Row.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -33,7 +33,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_Row
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowDimension.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowDimension.php
index f1de4f67825..7bacabd2378 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowDimension.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowDimension.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_RowDimension
 {
@@ -51,6 +51,13 @@ class PHPExcel_Worksheet_RowDimension
 	 */
 	private $_rowHeight		= -1;
 
+ 	/**
+	 * ZeroHeight for Row?
+	 *
+	 * @var bool
+	 */
+	private $_zeroHeight	= false;
+
 	/**
 	 * Visible?
 	 *
@@ -133,6 +140,26 @@ class PHPExcel_Worksheet_RowDimension
     	return $this;
     }
 
+	/**
+	 * Get ZeroHeight
+	 *
+	 * @return bool
+	 */
+	public function getzeroHeight() {
+		return $this->_zeroHeight;
+	}
+
+	/**
+	 * Set ZeroHeight
+	 *
+	 * @param bool $pValue
+	 * @return PHPExcel_Worksheet_RowDimension
+	 */
+	public function setzeroHeight($pValue = false) {
+		$this->_zeroHeight = $pValue;
+		return $this;
+	}
+
     /**
      * Get Visible
      *
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowIterator.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowIterator.php
index 2f16d138fc4..c8e832ed72c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowIterator.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/RowIterator.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @package	PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -32,10 +32,10 @@
  * Used to iterate rows in a PHPExcel_Worksheet
  *
  * @category   PHPExcel
- * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @package	PHPExcel_Worksheet
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class PHPExcel_Worksheet_RowIterator extends CachingIterator
+class PHPExcel_Worksheet_RowIterator implements Iterator
 {
 	/**
 	 * PHPExcel_Worksheet to iterate
@@ -51,14 +51,24 @@ class PHPExcel_Worksheet_RowIterator extends CachingIterator
 	 */
 	private $_position = 1;
 
+	/**
+	 * Start position
+	 *
+	 * @var int
+	 */
+	private $_startRow = 1;
+
+
 	/**
 	 * Create a new row iterator
 	 *
-	 * @param PHPExcel_Worksheet 		$subject
+	 * @param	PHPExcel_Worksheet	$subject	The worksheet to iterate over
+	 * @param	integer				$startRow	The row number at which to start iterating
 	 */
-	public function __construct(PHPExcel_Worksheet $subject = null) {
+	public function __construct(PHPExcel_Worksheet $subject = null, $startRow = 1) {
 		// Set subject
 		$this->_subject = $subject;
+		$this->resetStart($startRow);
 	}
 
 	/**
@@ -69,43 +79,70 @@ class PHPExcel_Worksheet_RowIterator extends CachingIterator
 	}
 
 	/**
-	 * Rewind iterator
+	 * (Re)Set the start row and the current row pointer
+	 *
+	 * @param integer	$startRow	The row number at which to start iterating
 	 */
-    public function rewind() {
-        $this->_position = 1;
-    }
+	public function resetStart($startRow = 1) {
+		$this->_startRow = $startRow;
+		$this->seek($startRow);
+	}
 
-    /**
-     * Current PHPExcel_Worksheet_Row
-     *
-     * @return PHPExcel_Worksheet_Row
-     */
-    public function current() {
-    	return new PHPExcel_Worksheet_Row($this->_subject, $this->_position);
-    }
+	/**
+	 * Set the row pointer to the selected row
+	 *
+	 * @param integer	$row	The row number to set the current pointer at
+	 */
+	public function seek($row = 1) {
+		$this->_position = $row;
+	}
 
-    /**
-     * Current key
-     *
-     * @return int
-     */
-    public function key() {
-        return $this->_position;
-    }
+	/**
+	 * Rewind the iterator to the starting row
+	 */
+	public function rewind() {
+		$this->_position = $this->_startRow;
+	}
 
-    /**
-     * Next value
-     */
-    public function next() {
-        ++$this->_position;
-    }
+	/**
+	 * Return the current row in this worksheet
+	 *
+	 * @return PHPExcel_Worksheet_Row
+	 */
+	public function current() {
+		return new PHPExcel_Worksheet_Row($this->_subject, $this->_position);
+	}
 
-    /**
-     * More PHPExcel_Worksheet_Row instances available?
-     *
-     * @return boolean
-     */
-    public function valid() {
-        return $this->_position <= $this->_subject->getHighestRow();
-    }
+	/**
+	 * Return the current iterator key
+	 *
+	 * @return int
+	 */
+	public function key() {
+		return $this->_position;
+	}
+
+	/**
+	 * Set the iterator to its next value
+	 */
+	public function next() {
+		++$this->_position;
+	}
+
+	/**
+	 * Set the iterator to its previous value
+	 */
+	public function prev() {
+		if ($this->_position > 1)
+			--$this->_position;
+	}
+
+	/**
+	 * Indicate if more rows exist in the worksheet
+	 *
+	 * @return boolean
+	 */
+	public function valid() {
+		return $this->_position <= $this->_subject->getHighestRow();
+	}
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Worksheet/SheetView.php b/htdocs/includes/phpexcel/PHPExcel/Worksheet/SheetView.php
index 84a0ca89698..bdaf323b264 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Worksheet/SheetView.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Worksheet/SheetView.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,10 +31,22 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Worksheet
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Worksheet_SheetView
 {
+
+	/* Sheet View types */
+	const SHEETVIEW_NORMAL				= 'normal';
+	const SHEETVIEW_PAGE_LAYOUT			= 'pageLayout';
+	const SHEETVIEW_PAGE_BREAK_PREVIEW	= 'pageBreakPreview';
+
+	private static $_sheetViewTypes = array(
+		self::SHEETVIEW_NORMAL,
+		self::SHEETVIEW_PAGE_LAYOUT,
+		self::SHEETVIEW_PAGE_BREAK_PREVIEW,
+	);
+
 	/**
 	 * ZoomScale
 	 *
@@ -53,6 +65,15 @@ class PHPExcel_Worksheet_SheetView
 	 */
 	private $_zoomScaleNormal	= 100;
 
+	/**
+	 * View
+	 *
+	 * Valid values range from 10 to 400.
+	 *
+	 * @var string
+	 */
+	private $_sheetviewType		= self::SHEETVIEW_NORMAL;
+
     /**
      * Create a new PHPExcel_Worksheet_SheetView
      */
@@ -116,6 +137,41 @@ class PHPExcel_Worksheet_SheetView
 		return $this;
 	}
 
+	/**
+	 * Get View
+	 *
+	 * @return string
+	 */
+	public function getView() {
+		return $this->_sheetviewType;
+	}
+
+	/**
+	 * Set View
+	 *
+	 * Valid values are
+	 *		'normal'			self::SHEETVIEW_NORMAL
+	 *		'pageLayout'		self::SHEETVIEW_PAGE_LAYOUT
+	 *		'pageBreakPreview'	self::SHEETVIEW_PAGE_BREAK_PREVIEW
+	 *
+	 * @param 	string 	$pValue
+	 * @throws 	Exception
+	 * @return PHPExcel_Worksheet_SheetView
+	 */
+	public function setView($pValue = NULL) {
+		//	MS Excel 2007 allows setting the view to 'normal', 'pageLayout' or 'pageBreakPreview'
+		//		via the user interface
+		if ($pValue === NULL)
+			$pValue = self::SHEETVIEW_NORMAL;
+		if (in_array($pValue, self::$_sheetViewTypes)) {
+			$this->_sheetviewType = $pValue;
+		} else {
+			throw new Exception("Invalid sheetview layout type.");
+		}
+
+		return $this;
+	}
+
 	/**
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
 	 */
diff --git a/htdocs/includes/phpexcel/PHPExcel/WorksheetIterator.php b/htdocs/includes/phpexcel/PHPExcel/WorksheetIterator.php
index fcf20351c94..9eff5382dd9 100644
--- a/htdocs/includes/phpexcel/PHPExcel/WorksheetIterator.php
+++ b/htdocs/includes/phpexcel/PHPExcel/WorksheetIterator.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -33,9 +33,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class PHPExcel_WorksheetIterator extends CachingIterator
+class PHPExcel_WorksheetIterator implements Iterator
 {
 	/**
 	 * Spreadsheet to iterate
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/CSV.php b/htdocs/includes/phpexcel/PHPExcel/Writer/CSV.php
index aa50de78cfb..11a399e3b22 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/CSV.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/CSV.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
 	/**
@@ -83,6 +83,13 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
 	 */
 	private $_useBOM = false;
 
+	/**
+	 * Whether to write a fully Excel compatible CSV file.
+	 *
+	 * @var boolean
+	 */
+	private $_excelCompatibility = false;
+
 	/**
 	 * Create a new PHPExcel_Writer_CSV
 	 *
@@ -95,7 +102,7 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
 	/**
 	 * Save PHPExcel to file
 	 *
-	 * @param	string		$pFileName
+	 * @param	string		$pFilename
 	 * @throws	Exception
 	 */
 	public function save($pFilename = null) {
@@ -113,17 +120,26 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
 			throw new Exception("Could not open file $pFilename for writing.");
 		}
 
-		if ($this->_useBOM) {
+		if ($this->_excelCompatibility) {
+			// Write the UTF-16LE BOM code
+			fwrite($fileHandle, "\xFF\xFE");	//	Excel uses UTF-16LE encoding
+			$this->setEnclosure();				//	Default enclosure is "
+			$this->setDelimiter("\t");			//	Excel delimiter is a TAB
+		} elseif ($this->_useBOM) {
 			// Write the UTF-8 BOM code
 			fwrite($fileHandle, "\xEF\xBB\xBF");
 		}
 
-		// Convert sheet to array
-		$cellsArray = $sheet->toArray('', $this->_preCalculateFormulas);
+		//	Identify the range that we need to extract from the worksheet
+		$maxCol = $sheet->getHighestColumn();
+		$maxRow = $sheet->getHighestRow();
 
 		// Write rows to file
-		foreach ($cellsArray as $row) {
-			$this->_writeLine($fileHandle, $row);
+		for($row = 1; $row <= $maxRow; ++$row) {
+			// Convert the row to an array...
+			$cellsArray = $sheet->rangeToArray('A'.$row.':'.$maxCol.$row,'', $this->_preCalculateFormulas);
+			// ... and write to the file
+			$this->_writeLine($fileHandle, $cellsArray[0]);
 		}
 
 		// Close file
@@ -216,6 +232,27 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
 		return $this;
 	}
 
+	/**
+	 * Get whether the file should be saved with full Excel Compatibility
+	 *
+	 * @return boolean
+	 */
+	public function getExcelCompatibility() {
+		return $this->_excelCompatibility;
+	}
+
+	/**
+	 * Set whether the file should be saved with full Excel Compatibility
+	 *
+	 * @param	boolean	$pValue		Set the file to be written as a fully Excel compatible csv file
+	 *								Note that this overrides other settings such as useBOM, enclosure and delimiter
+	 * @return PHPExcel_Writer_CSV
+	 */
+	public function setExcelCompatibility($pValue = false) {
+		$this->_excelCompatibility = $pValue;
+		return $this;
+	}
+
 	/**
 	 * Get sheet index
 	 *
@@ -270,9 +307,13 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
 			$line .= $this->_lineEnding;
 
 			// Write to file
-			fwrite($pFileHandle, $line);
+			if ($this->_excelCompatibility) {
+				fwrite($pFileHandle, mb_convert_encoding($line,"UTF-16LE","UTF-8"));
+			} else {
+				fwrite($pFileHandle, $line);
+			}
 		} else {
-			throw new Exception("Invalid parameters passed.");
+			throw new Exception("Invalid data row passed to CSV writer.");
 		}
 	}
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007.php
index ebc51c6ec65..6a1b9887d52 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,10 +31,18 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
 {
+	/**
+	 * Write charts that are defined in the workbook?
+	 * Identifies whether the Writer should write definitions for any charts that exist in the PHPExcel object;
+	 *
+	 * @var	boolean
+	 */
+	private $_includeCharts = false;
+
 	/**
 	 * Pre-calculate formulas
 	 *
@@ -145,7 +153,8 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
 									'workbook' 		=> 'PHPExcel_Writer_Excel2007_Workbook',
 									'worksheet' 	=> 'PHPExcel_Writer_Excel2007_Worksheet',
 									'drawing' 		=> 'PHPExcel_Writer_Excel2007_Drawing',
-									'comments' 		=> 'PHPExcel_Writer_Excel2007_Comments'
+									'comments' 		=> 'PHPExcel_Writer_Excel2007_Comments',
+									'chart'			=> 'PHPExcel_Writer_Excel2007_Chart',
 								 );
 
     	//	Initialise writer parts
@@ -181,7 +190,7 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
 	/**
 	 * Save PHPExcel to file
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @throws 	Exception
 	 */
 	public function save($pFilename = null)
@@ -193,7 +202,7 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
 			// If $pFilename is php://output or php://stdout, make it a temporary file...
 			$originalFilename = $pFilename;
 			if (strtolower($pFilename) == 'php://output' || strtolower($pFilename) == 'php://stdout') {
-				$pFilename = @tempnam('./', 'phpxltmp');
+				$pFilename = @tempnam(PHPExcel_Shared_File::sys_get_temp_dir(), 'phpxltmp');
 				if ($pFilename == '') {
 					$pFilename = $originalFilename;
 				}
@@ -224,18 +233,24 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
 			$zipClass = PHPExcel_Settings::getZipClass();
 			$objZip = new $zipClass();
 
+			//	Retrieve OVERWRITE and CREATE constants from the instantiated zip class
+			//	This method of accessing constant values from a dynamic class should work with all appropriate versions of PHP
+			$ro = new ReflectionObject($objZip);
+			$zipOverWrite = $ro->getConstant('OVERWRITE');
+			$zipCreate = $ro->getConstant('CREATE');
+
 			if (file_exists($pFilename)) {
 				unlink($pFilename);
 			}
 			// Try opening the ZIP file
-			if ($objZip->open($pFilename, ZIPARCHIVE::OVERWRITE) !== true) {
-				if ($objZip->open($pFilename, ZIPARCHIVE::CREATE) !== true) {
+			if ($objZip->open($pFilename, $zipOverWrite) !== true) {
+				if ($objZip->open($pFilename, $zipCreate) !== true) {
 					throw new Exception("Could not open " . $pFilename . " for writing.");
 				}
 			}
 
 			// Add [Content_Types].xml to ZIP file
-			$objZip->addFromString('[Content_Types].xml', 			$this->getWriterPart('ContentTypes')->writeContentTypes($this->_spreadSheet));
+			$objZip->addFromString('[Content_Types].xml', 			$this->getWriterPart('ContentTypes')->writeContentTypes($this->_spreadSheet, $this->_includeCharts));
 
 			// Add relationships to ZIP file
 			$objZip->addFromString('_rels/.rels', 					$this->getWriterPart('Rels')->writeRelationships($this->_spreadSheet));
@@ -259,26 +274,43 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
 			$objZip->addFromString('xl/styles.xml', 				$this->getWriterPart('Style')->writeStyles($this->_spreadSheet));
 
 			// Add workbook to ZIP file
-			$objZip->addFromString('xl/workbook.xml', 				$this->getWriterPart('Workbook')->writeWorkbook($this->_spreadSheet));
+			$objZip->addFromString('xl/workbook.xml', 				$this->getWriterPart('Workbook')->writeWorkbook($this->_spreadSheet, $this->_preCalculateFormulas));
 
+			$chartCount = 0;
 			// Add worksheets
 			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
-				$objZip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->_spreadSheet->getSheet($i), $this->_stringTable));
+				$objZip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->_spreadSheet->getSheet($i), $this->_stringTable, $this->_includeCharts));
+				if ($this->_includeCharts) {
+					$charts = $this->_spreadSheet->getSheet($i)->getChartCollection();
+					if (count($charts) > 0) {
+						foreach($charts as $chart) {
+							$objZip->addFromString('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart));
+							$chartCount++;
+						}
+					}
+				}
 			}
 
+			$chartRef1 = $chartRef2 = 0;
 			// Add worksheet relationships (drawings, ...)
 			for ($i = 0; $i < $this->_spreadSheet->getSheetCount(); ++$i) {
 
 				// Add relationships
-				$objZip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', 	$this->getWriterPart('Rels')->writeWorksheetRelationships($this->_spreadSheet->getSheet($i), ($i + 1)));
+				$objZip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', 	$this->getWriterPart('Rels')->writeWorksheetRelationships($this->_spreadSheet->getSheet($i), ($i + 1), $this->_includeCharts));
 
-				// Add drawing relationship parts
-				if ($this->_spreadSheet->getSheet($i)->getDrawingCollection()->count() > 0) {
+				$drawings = $this->_spreadSheet->getSheet($i)->getDrawingCollection();
+				$drawingCount = count($drawings);
+				if ($this->_includeCharts) {
+					$chartCount = $this->_spreadSheet->getSheet($i)->getChartCount();
+				}
+
+				// Add drawing and image relationship parts
+				if (($drawingCount > 0) || ($chartCount > 0)) {
 					// Drawing relationships
-					$objZip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->_spreadSheet->getSheet($i)));
+					$objZip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->_spreadSheet->getSheet($i),$chartRef1, $this->_includeCharts));
 
 					// Drawings
-					$objZip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->_spreadSheet->getSheet($i)));
+					$objZip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->_spreadSheet->getSheet($i),$chartRef2,$this->_includeCharts));
 				}
 
 				// Add comment relationship parts
@@ -447,6 +479,31 @@ class PHPExcel_Writer_Excel2007 implements PHPExcel_Writer_IWriter
     	return $this->_drawingHashTable;
     }
 
+	/**
+	 * Write charts in workbook?
+	 *		If this is true, then the Writer will write definitions for any charts that exist in the PHPExcel object.
+	 *		If false (the default) it will ignore any charts defined in the PHPExcel object.
+	 *
+	 * @return	boolean
+	 */
+	public function getIncludeCharts() {
+		return $this->_includeCharts;
+	}
+
+	/**
+	 * Set write charts in workbook
+	 *		Set to true, to advise the Writer to include any charts that exist in the PHPExcel object.
+	 *		Set to false (the default) to ignore charts.
+	 *
+	 * @param	boolean	$pValue
+	 *
+	 * @return	PHPExcel_Writer_Excel2007
+	 */
+	public function setIncludeCharts($pValue = false) {
+		$this->_includeCharts = (boolean) $pValue;
+		return $this;
+	}
+
     /**
      * Get Pre-Calculate Formulas
      *
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Chart.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Chart.php
new file mode 100644
index 00000000000..d181d517b94
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Chart.php
@@ -0,0 +1,1181 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Writer_Excel2007_Chart
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Writer_Excel2007
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPart
+{
+	/**
+	 * Write charts to XML format
+	 *
+	 * @param 	PHPExcel_Chart				$pChart
+	 * @return 	string 						XML Output
+	 * @throws 	Exception
+	 */
+	public function writeChart(PHPExcel_Chart $pChart = null)
+	{
+		// Create XML writer
+		$objWriter = null;
+		if ($this->getParentWriter()->getUseDiskCaching()) {
+			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
+		} else {
+			$objWriter = new PHPExcel_Shared_XMLWriter(PHPExcel_Shared_XMLWriter::STORAGE_MEMORY);
+		}
+		//	Ensure that data series values are up-to-date before we save
+		$pChart->refresh();
+
+		// XML header
+		$objWriter->startDocument('1.0','UTF-8','yes');
+
+		// c:chartSpace
+		$objWriter->startElement('c:chartSpace');
+			$objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
+			$objWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
+			$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+
+			$objWriter->startElement('c:date1904');
+				$objWriter->writeAttribute('val', 0);
+			$objWriter->endElement();
+			$objWriter->startElement('c:lang');
+				$objWriter->writeAttribute('val', "en-GB");
+			$objWriter->endElement();
+			$objWriter->startElement('c:roundedCorners');
+				$objWriter->writeAttribute('val', 0);
+			$objWriter->endElement();
+
+			$this->_writeAlternateContent($objWriter);
+
+			$objWriter->startElement('c:chart');
+
+				$this->_writeTitle($pChart->getTitle(), $objWriter);
+
+				$objWriter->startElement('c:autoTitleDeleted');
+					$objWriter->writeAttribute('val', 0);
+				$objWriter->endElement();
+
+				$this->_writePlotArea($pChart->getPlotArea(),
+									  $pChart->getXAxisLabel(),
+									  $pChart->getYAxisLabel(),
+									  $objWriter,
+									  $pChart->getWorksheet()
+									 );
+
+				$this->_writeLegend($pChart->getLegend(), $objWriter);
+
+
+				$objWriter->startElement('c:plotVisOnly');
+					$objWriter->writeAttribute('val', 1);
+				$objWriter->endElement();
+
+				$objWriter->startElement('c:dispBlanksAs');
+					$objWriter->writeAttribute('val', "gap");
+				$objWriter->endElement();
+
+				$objWriter->startElement('c:showDLblsOverMax');
+					$objWriter->writeAttribute('val', 0);
+				$objWriter->endElement();
+
+			$objWriter->endElement();
+
+			$this->_writePrintSettings($objWriter);
+
+		$objWriter->endElement();
+
+		// Return
+		return $objWriter->getData();
+	}
+
+	/**
+	 * Write Chart Title
+	 *
+	 * @param	PHPExcel_Chart_Title		$title
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writeTitle(PHPExcel_Chart_Title $title = null, $objWriter)
+	{
+		if (is_null($title)) {
+			return;
+		}
+
+		$objWriter->startElement('c:title');
+			$objWriter->startElement('c:tx');
+				$objWriter->startElement('c:rich');
+
+					$objWriter->startElement('a:bodyPr');
+					$objWriter->endElement();
+
+					$objWriter->startElement('a:lstStyle');
+					$objWriter->endElement();
+
+					$objWriter->startElement('a:p');
+
+						$caption = $title->getCaption();
+						if ((is_array($caption)) && (count($caption) > 0))
+							$caption = $caption[0];
+						$this->getParentWriter()->getWriterPart('stringtable')->writeRichTextForCharts($objWriter, $caption, 'a');
+
+					$objWriter->endElement();
+				$objWriter->endElement();
+			$objWriter->endElement();
+
+			$layout = $title->getLayout();
+			$this->_writeLayout($layout, $objWriter);
+
+			$objWriter->startElement('c:overlay');
+				$objWriter->writeAttribute('val', 0);
+			$objWriter->endElement();
+
+		$objWriter->endElement();
+	}
+
+	/**
+	 * Write Chart Legend
+	 *
+	 * @param	PHPExcel_Chart_Legend		$legend
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writeLegend(PHPExcel_Chart_Legend $legend = null, $objWriter)
+	{
+		if (is_null($legend)) {
+			return;
+		}
+
+		$objWriter->startElement('c:legend');
+
+			$objWriter->startElement('c:legendPos');
+				$objWriter->writeAttribute('val', $legend->getPosition());
+			$objWriter->endElement();
+
+			$layout = $legend->getLayout();
+			$this->_writeLayout($layout, $objWriter);
+
+			$objWriter->startElement('c:overlay');
+				$objWriter->writeAttribute('val', ($legend->getOverlay()) ? '1' : '0');
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:txPr');
+				$objWriter->startElement('a:bodyPr');
+				$objWriter->endElement();
+
+				$objWriter->startElement('a:lstStyle');
+				$objWriter->endElement();
+
+				$objWriter->startElement('a:p');
+					$objWriter->startElement('a:pPr');
+						$objWriter->writeAttribute('rtl', 0);
+
+						$objWriter->startElement('a:defRPr');
+						$objWriter->endElement();
+					$objWriter->endElement();
+
+					$objWriter->startElement('a:endParaRPr');
+						$objWriter->writeAttribute('lang', "en-US");
+					$objWriter->endElement();
+
+				$objWriter->endElement();
+			$objWriter->endElement();
+
+		$objWriter->endElement();
+	}
+
+	/**
+	 * Write Chart Plot Area
+	 *
+	 * @param	PHPExcel_Chart_PlotArea		$plotArea
+	 * @param	PHPExcel_Chart_Title		$xAxisLabel
+	 * @param	PHPExcel_Chart_Title		$yAxisLabel
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writePlotArea(PHPExcel_Chart_PlotArea $plotArea,
+									PHPExcel_Chart_Title $xAxisLabel = NULL,
+									PHPExcel_Chart_Title $yAxisLabel = NULL,
+									$objWriter,
+									PHPExcel_Worksheet $pSheet)
+	{
+		if (is_null($plotArea)) {
+			return;
+		}
+
+		$id1 = $id2 = 0;
+		$objWriter->startElement('c:plotArea');
+
+			$layout = $plotArea->getLayout();
+
+			$this->_writeLayout($layout, $objWriter);
+
+			$chartTypes = self::_getChartType($plotArea);
+			$catIsMultiLevelSeries = $valIsMultiLevelSeries = FALSE;
+			$plotGroupingType = '';
+			foreach($chartTypes as $chartType) {
+				$objWriter->startElement('c:'.$chartType);
+
+					$groupCount = $plotArea->getPlotGroupCount();
+					for($i = 0; $i < $groupCount; ++$i) {
+						$plotGroup = $plotArea->getPlotGroupByIndex($i);
+						$groupType = $plotGroup->getPlotType();
+						if ($groupType == $chartType) {
+
+							$plotStyle = $plotGroup->getPlotStyle();
+							if ($groupType === PHPExcel_Chart_DataSeries::TYPE_RADARCHART) {
+								$objWriter->startElement('c:radarStyle');
+									$objWriter->writeAttribute('val', $plotStyle );
+								$objWriter->endElement();
+							} elseif ($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART) {
+								$objWriter->startElement('c:scatterStyle');
+									$objWriter->writeAttribute('val', $plotStyle );
+								$objWriter->endElement();
+							}
+
+							$this->_writePlotGroup($plotGroup, $chartType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType, $pSheet);
+						}
+					}
+
+					$this->_writeDataLbls($objWriter, $layout);
+
+					if ($chartType === PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
+						//	Line only, Line3D can't be smoothed
+
+						$objWriter->startElement('c:smooth');
+							$objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine() );
+						$objWriter->endElement();
+					} elseif (($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
+						($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
+
+						$objWriter->startElement('c:gapWidth');
+							$objWriter->writeAttribute('val', 150 );
+						$objWriter->endElement();
+
+						if ($plotGroupingType == 'percentStacked' ||
+							$plotGroupingType == 'stacked') {
+
+							$objWriter->startElement('c:overlap');
+								$objWriter->writeAttribute('val', 100 );
+							$objWriter->endElement();
+						}
+					} elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+
+							$objWriter->startElement('c:bubbleScale');
+								$objWriter->writeAttribute('val', 25 );
+							$objWriter->endElement();
+
+							$objWriter->startElement('c:showNegBubbles');
+								$objWriter->writeAttribute('val', 0 );
+							$objWriter->endElement();
+					} elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
+
+							$objWriter->startElement('c:hiLowLines');
+							$objWriter->endElement();
+					}
+
+					//	Generate 2 unique numbers to use for axId values
+//					$id1 = $id2 = rand(10000000,99999999);
+//					do {
+//						$id2 = rand(10000000,99999999);
+//					} while ($id1 == $id2);
+					$id1 = '75091328';
+					$id2 = '75089408';
+
+					if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
+						($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
+						($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+
+						$objWriter->startElement('c:axId');
+							$objWriter->writeAttribute('val', $id1 );
+						$objWriter->endElement();
+						$objWriter->startElement('c:axId');
+							$objWriter->writeAttribute('val', $id2 );
+						$objWriter->endElement();
+					} else {
+						$objWriter->startElement('c:firstSliceAng');
+							$objWriter->writeAttribute('val', 0);
+						$objWriter->endElement();
+
+						if ($chartType === PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) {
+
+							$objWriter->startElement('c:holeSize');
+								$objWriter->writeAttribute('val', 50);
+							$objWriter->endElement();
+						}
+					}
+
+				$objWriter->endElement();
+			}
+
+			if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
+				($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
+				($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+
+				if ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+					$this->_writeValAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
+				} else {
+					$this->_writeCatAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
+				}
+
+				$this->_writeValAx($objWriter,$plotArea,$yAxisLabel,$chartType,$id1,$id2,$valIsMultiLevelSeries);
+			}
+
+		$objWriter->endElement();
+	}
+
+	/**
+	 * Write Data Labels
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @param 	PHPExcel_Chart_Layout		$chartLayout	Chart layout
+	 * @throws 	Exception
+	 */
+	private function _writeDataLbls($objWriter, $chartLayout)
+	{
+		$objWriter->startElement('c:dLbls');
+
+			$objWriter->startElement('c:showLegendKey');
+				$showLegendKey = (empty($chartLayout)) ? 0 : $chartLayout->getShowLegendKey();
+				$objWriter->writeAttribute('val', ((empty($showLegendKey)) ? 0 : 1) );
+			$objWriter->endElement();
+
+
+			$objWriter->startElement('c:showVal');
+				$showVal = (empty($chartLayout)) ? 0 : $chartLayout->getShowVal();
+				$objWriter->writeAttribute('val', ((empty($showVal)) ? 0 : 1) );
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:showCatName');
+				$showCatName = (empty($chartLayout)) ? 0 : $chartLayout->getShowCatName();
+				$objWriter->writeAttribute('val', ((empty($showCatName)) ? 0 : 1) );
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:showSerName');
+				$showSerName = (empty($chartLayout)) ? 0 : $chartLayout->getShowSerName();
+				$objWriter->writeAttribute('val', ((empty($showSerName)) ? 0 : 1) );
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:showPercent');
+				$showPercent = (empty($chartLayout)) ? 0 : $chartLayout->getShowPercent();
+				$objWriter->writeAttribute('val', ((empty($showPercent)) ? 0 : 1) );
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:showBubbleSize');
+				$showBubbleSize = (empty($chartLayout)) ? 0 : $chartLayout->getShowBubbleSize();
+				$objWriter->writeAttribute('val', ((empty($showBubbleSize)) ? 0 : 1) );
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:showLeaderLines');
+				$showLeaderLines = (empty($chartLayout)) ? 1 : $chartLayout->getShowLeaderLines();
+				$objWriter->writeAttribute('val', ((empty($showLeaderLines)) ? 0 : 1) );
+			$objWriter->endElement();
+
+		$objWriter->endElement();
+	}
+
+	/**
+	 * Write Category Axis
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @param 	PHPExcel_Chart_PlotArea		$plotArea
+	 * @param 	PHPExcel_Chart_Title		$xAxisLabel
+	 * @param 	string						$groupType		Chart type
+	 * @param 	string						$id1
+	 * @param 	string						$id2
+	 * @param 	boolean						$isMultiLevelSeries
+	 * @throws 	Exception
+	 */
+	private function _writeCatAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
+	{
+		$objWriter->startElement('c:catAx');
+
+			if ($id1 > 0) {
+				$objWriter->startElement('c:axId');
+					$objWriter->writeAttribute('val', $id1);
+				$objWriter->endElement();
+			}
+
+			$objWriter->startElement('c:scaling');
+				$objWriter->startElement('c:orientation');
+					$objWriter->writeAttribute('val', "minMax");
+				$objWriter->endElement();
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:delete');
+				$objWriter->writeAttribute('val', 0);
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:axPos');
+				$objWriter->writeAttribute('val', "b");
+			$objWriter->endElement();
+
+			if (!is_null($xAxisLabel)) {
+				$objWriter->startElement('c:title');
+					$objWriter->startElement('c:tx');
+						$objWriter->startElement('c:rich');
+
+							$objWriter->startElement('a:bodyPr');
+							$objWriter->endElement();
+
+							$objWriter->startElement('a:lstStyle');
+							$objWriter->endElement();
+
+							$objWriter->startElement('a:p');
+								$objWriter->startElement('a:r');
+
+									$caption = $xAxisLabel->getCaption();
+									if (is_array($caption))
+										$caption = $caption[0];
+									$objWriter->startElement('a:t');
+//										$objWriter->writeAttribute('xml:space', 'preserve');
+										$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
+									$objWriter->endElement();
+
+								$objWriter->endElement();
+							$objWriter->endElement();
+						$objWriter->endElement();
+					$objWriter->endElement();
+
+					$objWriter->startElement('c:overlay');
+						$objWriter->writeAttribute('val', 0);
+					$objWriter->endElement();
+
+					$layout = $xAxisLabel->getLayout();
+					$this->_writeLayout($layout, $objWriter);
+
+				$objWriter->endElement();
+
+			}
+
+			$objWriter->startElement('c:numFmt');
+				$objWriter->writeAttribute('formatCode', "General");
+				$objWriter->writeAttribute('sourceLinked', 1);
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:majorTickMark');
+				$objWriter->writeAttribute('val', "out");
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:minorTickMark');
+				$objWriter->writeAttribute('val', "none");
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:tickLblPos');
+				$objWriter->writeAttribute('val', "nextTo");
+			$objWriter->endElement();
+
+			if ($id2 > 0) {
+					$objWriter->startElement('c:crossAx');
+						$objWriter->writeAttribute('val', $id2);
+					$objWriter->endElement();
+
+					$objWriter->startElement('c:crosses');
+						$objWriter->writeAttribute('val', "autoZero");
+					$objWriter->endElement();
+			}
+
+			$objWriter->startElement('c:auto');
+				$objWriter->writeAttribute('val', 1);
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:lblAlgn');
+				$objWriter->writeAttribute('val', "ctr");
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:lblOffset');
+				$objWriter->writeAttribute('val', 100);
+			$objWriter->endElement();
+
+			if ($isMultiLevelSeries) {
+				$objWriter->startElement('c:noMultiLvlLbl');
+					$objWriter->writeAttribute('val', 0);
+				$objWriter->endElement();
+			}
+		$objWriter->endElement();
+
+	}
+
+
+	/**
+	 * Write Value Axis
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @param 	PHPExcel_Chart_PlotArea		$plotArea
+	 * @param 	PHPExcel_Chart_Title		$yAxisLabel
+	 * @param 	string						$groupType		Chart type
+	 * @param 	string						$id1
+	 * @param 	string						$id2
+	 * @param 	boolean						$isMultiLevelSeries
+	 * @throws 	Exception
+	 */
+	private function _writeValAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries)
+	{
+		$objWriter->startElement('c:valAx');
+
+			if ($id2 > 0) {
+				$objWriter->startElement('c:axId');
+					$objWriter->writeAttribute('val', $id2);
+				$objWriter->endElement();
+			}
+
+			$objWriter->startElement('c:scaling');
+				$objWriter->startElement('c:orientation');
+					$objWriter->writeAttribute('val', "minMax");
+				$objWriter->endElement();
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:delete');
+				$objWriter->writeAttribute('val', 0);
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:axPos');
+				$objWriter->writeAttribute('val', "l");
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:majorGridlines');
+			$objWriter->endElement();
+
+			if (!is_null($yAxisLabel)) {
+				$objWriter->startElement('c:title');
+					$objWriter->startElement('c:tx');
+						$objWriter->startElement('c:rich');
+
+							$objWriter->startElement('a:bodyPr');
+							$objWriter->endElement();
+
+							$objWriter->startElement('a:lstStyle');
+							$objWriter->endElement();
+
+							$objWriter->startElement('a:p');
+								$objWriter->startElement('a:r');
+
+									$caption = $yAxisLabel->getCaption();
+									if (is_array($caption))
+										$caption = $caption[0];
+									$objWriter->startElement('a:t');
+//										$objWriter->writeAttribute('xml:space', 'preserve');
+										$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
+									$objWriter->endElement();
+
+								$objWriter->endElement();
+							$objWriter->endElement();
+						$objWriter->endElement();
+					$objWriter->endElement();
+
+					$objWriter->startElement('c:overlay');
+						$objWriter->writeAttribute('val', 0);
+					$objWriter->endElement();
+
+					if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+						$layout = $yAxisLabel->getLayout();
+						$this->_writeLayout($layout, $objWriter);
+					}
+
+				$objWriter->endElement();
+			}
+
+			$objWriter->startElement('c:numFmt');
+				$objWriter->writeAttribute('formatCode', "General");
+				$objWriter->writeAttribute('sourceLinked', 1);
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:majorTickMark');
+				$objWriter->writeAttribute('val', "out");
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:minorTickMark');
+				$objWriter->writeAttribute('val', "none");
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:tickLblPos');
+				$objWriter->writeAttribute('val', "nextTo");
+			$objWriter->endElement();
+
+			if ($id1 > 0) {
+					$objWriter->startElement('c:crossAx');
+						$objWriter->writeAttribute('val', $id2);
+					$objWriter->endElement();
+
+					$objWriter->startElement('c:crosses');
+						$objWriter->writeAttribute('val', "autoZero");
+					$objWriter->endElement();
+
+					$objWriter->startElement('c:crossBetween');
+						$objWriter->writeAttribute('val', "midCat");
+					$objWriter->endElement();
+			}
+
+			if ($isMultiLevelSeries) {
+				if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+					$objWriter->startElement('c:noMultiLvlLbl');
+						$objWriter->writeAttribute('val', 0);
+					$objWriter->endElement();
+				}
+			}
+		$objWriter->endElement();
+
+	}
+
+
+	/**
+	 * Get the data series type(s) for a chart plot series
+	 *
+	 * @param 	PHPExcel_Chart_PlotArea		$plotArea
+	 * @return	string|array
+	 * @throws 	Exception
+	 */
+	private static function _getChartType($plotArea)
+	{
+		$groupCount = $plotArea->getPlotGroupCount();
+
+		if ($groupCount == 1) {
+			$chartType = array($plotArea->getPlotGroupByIndex(0)->getPlotType());
+		} else {
+			$chartTypes = array();
+			for($i = 0; $i < $groupCount; ++$i) {
+				$chartTypes[] = $plotArea->getPlotGroupByIndex($i)->getPlotType();
+			}
+			$chartType = array_unique($chartTypes);
+			if (count($chartTypes) == 0) {
+				throw new Exception('Chart is not yet implemented');
+			}
+		}
+
+		return $chartType;
+	}
+
+	/**
+	 * Write Plot Group (series of related plots)
+	 *
+	 * @param	PHPExcel_Chart_DataSeries		$plotGroup
+	 * @param	string							$groupType				Type of plot for dataseries
+	 * @param 	PHPExcel_Shared_XMLWriter 		$objWriter 				XML Writer
+	 * @param	boolean							&$catIsMultiLevelSeries	Is category a multi-series category
+	 * @param	boolean							&$valIsMultiLevelSeries	Is value set a multi-series set
+	 * @param	string							&$plotGroupingType		Type of grouping for multi-series values
+	 * @param	PHPExcel_Worksheet 				$pSheet
+	 * @throws 	Exception
+	 */
+	private function _writePlotGroup( $plotGroup,
+									  $groupType,
+									  $objWriter,
+									  &$catIsMultiLevelSeries,
+									  &$valIsMultiLevelSeries,
+									  &$plotGroupingType,
+									  PHPExcel_Worksheet $pSheet
+									)
+	{
+		if (is_null($plotGroup)) {
+			return;
+		}
+
+		if (($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
+			($groupType == PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
+			$objWriter->startElement('c:barDir');
+				$objWriter->writeAttribute('val', $plotGroup->getPlotDirection());
+			$objWriter->endElement();
+		}
+
+		if (!is_null($plotGroup->getPlotGrouping())) {
+			$plotGroupingType = $plotGroup->getPlotGrouping();
+			$objWriter->startElement('c:grouping');
+				$objWriter->writeAttribute('val', $plotGroupingType);
+			$objWriter->endElement();
+		}
+
+		//	Get these details before the loop, because we can use the count to check for varyColors
+		$plotSeriesOrder = $plotGroup->getPlotOrder();
+		$plotSeriesCount = count($plotSeriesOrder);
+
+		if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) &&
+			($groupType !== PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)) {
+
+			if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
+				if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
+					($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
+					($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) ||
+					($plotSeriesCount > 1)) {
+					$objWriter->startElement('c:varyColors');
+						$objWriter->writeAttribute('val', 1);
+					$objWriter->endElement();
+				} else {
+					$objWriter->startElement('c:varyColors');
+						$objWriter->writeAttribute('val', 0);
+					$objWriter->endElement();
+				}
+			}
+		}
+
+		foreach($plotSeriesOrder as $plotSeriesIdx => $plotSeriesRef) {
+			$objWriter->startElement('c:ser');
+
+				$objWriter->startElement('c:idx');
+					$objWriter->writeAttribute('val', $plotSeriesIdx);
+				$objWriter->endElement();
+
+				$objWriter->startElement('c:order');
+					$objWriter->writeAttribute('val', $plotSeriesRef);
+				$objWriter->endElement();
+
+				if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
+					($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
+					($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+
+					$objWriter->startElement('c:dPt');
+						$objWriter->startElement('c:idx');
+							$objWriter->writeAttribute('val', 3);
+						$objWriter->endElement();
+
+						$objWriter->startElement('c:bubble3D');
+							$objWriter->writeAttribute('val', 0);
+						$objWriter->endElement();
+
+						$objWriter->startElement('c:spPr');
+							$objWriter->startElement('a:solidFill');
+								$objWriter->startElement('a:srgbClr');
+									$objWriter->writeAttribute('val', 'FF9900');
+								$objWriter->endElement();
+							$objWriter->endElement();
+						$objWriter->endElement();
+					$objWriter->endElement();
+				}
+
+				//	Labels
+				$plotSeriesLabel = $plotGroup->getPlotLabelByIndex($plotSeriesRef);
+				if ($plotSeriesLabel && ($plotSeriesLabel->getPointCount() > 0)) {
+					$objWriter->startElement('c:tx');
+						$objWriter->startElement('c:strRef');
+							$this->_writePlotSeriesLabel($plotSeriesLabel, $objWriter);
+						$objWriter->endElement();
+					$objWriter->endElement();
+				}
+
+				//	Formatting for the points
+				if ($groupType == PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
+					$objWriter->startElement('c:spPr');
+						$objWriter->startElement('a:ln');
+							$objWriter->writeAttribute('w', 12700);
+						$objWriter->endElement();
+					$objWriter->endElement();
+				}
+
+				$plotSeriesValues = $plotGroup->getPlotValuesByIndex($plotSeriesRef);
+				if ($plotSeriesValues) {
+					$plotSeriesMarker = $plotSeriesValues->getPointMarker();
+					if ($plotSeriesMarker) {
+						$objWriter->startElement('c:marker');
+							$objWriter->startElement('c:symbol');
+								$objWriter->writeAttribute('val', $plotSeriesMarker);
+							$objWriter->endElement();
+
+							if ($plotSeriesMarker !== 'none') {
+								$objWriter->startElement('c:size');
+									$objWriter->writeAttribute('val', 3);
+								$objWriter->endElement();
+							}
+						$objWriter->endElement();
+					}
+				}
+
+				if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
+					($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D) ||
+					($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART)) {
+
+					$objWriter->startElement('c:invertIfNegative');
+						$objWriter->writeAttribute('val', 0);
+					$objWriter->endElement();
+				}
+
+				//	Category Labels
+				$plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesRef);
+				if ($plotSeriesCategory && ($plotSeriesCategory->getPointCount() > 0)) {
+					$catIsMultiLevelSeries = $catIsMultiLevelSeries || $plotSeriesCategory->isMultiLevelSeries();
+
+					if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
+						($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
+						($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+
+						if (!is_null($plotGroup->getPlotStyle())) {
+							$plotStyle = $plotGroup->getPlotStyle();
+							if ($plotStyle) {
+								$objWriter->startElement('c:explosion');
+									$objWriter->writeAttribute('val', 25);
+								$objWriter->endElement();
+							}
+						}
+					}
+
+					if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
+						($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
+						$objWriter->startElement('c:xVal');
+					} else {
+						$objWriter->startElement('c:cat');
+					}
+
+						$this->_writePlotSeriesValues($plotSeriesCategory, $objWriter, $groupType, 'str', $pSheet);
+					$objWriter->endElement();
+				}
+
+				//	Values
+				if ($plotSeriesValues) {
+					$valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries();
+
+					if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
+						($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
+						$objWriter->startElement('c:yVal');
+					} else {
+						$objWriter->startElement('c:val');
+					}
+
+						$this->_writePlotSeriesValues($plotSeriesValues, $objWriter, $groupType, 'num', $pSheet);
+					$objWriter->endElement();
+				}
+
+				if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
+					$this->_writeBubbles($plotSeriesValues, $objWriter, $pSheet);
+				}
+
+			$objWriter->endElement();
+
+		}
+	}
+
+	/**
+	 * Write Plot Series Label
+	 *
+	 * @param	PHPExcel_Chart_DataSeriesValues		$plotSeriesLabel
+	 * @param 	PHPExcel_Shared_XMLWriter 			$objWriter 			XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writePlotSeriesLabel($plotSeriesLabel, $objWriter)
+	{
+		if (is_null($plotSeriesLabel)) {
+			return;
+		}
+
+		$objWriter->startElement('c:f');
+			$objWriter->writeRawData($plotSeriesLabel->getDataSource());
+		$objWriter->endElement();
+
+		$objWriter->startElement('c:strCache');
+			$objWriter->startElement('c:ptCount');
+				$objWriter->writeAttribute('val', $plotSeriesLabel->getPointCount() );
+			$objWriter->endElement();
+
+			foreach($plotSeriesLabel->getDataValues() as $plotLabelKey => $plotLabelValue) {
+				$objWriter->startElement('c:pt');
+					$objWriter->writeAttribute('idx', $plotLabelKey );
+
+					$objWriter->startElement('c:v');
+						$objWriter->writeRawData( $plotLabelValue );
+					$objWriter->endElement();
+				$objWriter->endElement();
+			}
+		$objWriter->endElement();
+
+	}
+
+	/**
+	 * Write Plot Series Values
+	 *
+	 * @param	PHPExcel_Chart_DataSeriesValues		$plotSeriesValues
+	 * @param 	PHPExcel_Shared_XMLWriter 			$objWriter 			XML Writer
+	 * @param	string								$groupType			Type of plot for dataseries
+	 * @param	string								$dataType			Datatype of series values
+	 * @param	PHPExcel_Worksheet 					$pSheet
+	 * @throws 	Exception
+	 */
+	private function _writePlotSeriesValues( $plotSeriesValues,
+											 $objWriter,
+											 $groupType,
+											 $dataType='str',
+											 PHPExcel_Worksheet $pSheet
+										   )
+	{
+		if (is_null($plotSeriesValues)) {
+			return;
+		}
+
+		if ($plotSeriesValues->isMultiLevelSeries()) {
+			$levelCount = $plotSeriesValues->multiLevelCount();
+
+			$objWriter->startElement('c:multiLvlStrRef');
+
+				$objWriter->startElement('c:f');
+					$objWriter->writeRawData( $plotSeriesValues->getDataSource() );
+				$objWriter->endElement();
+
+				$objWriter->startElement('c:multiLvlStrCache');
+
+					$objWriter->startElement('c:ptCount');
+						$objWriter->writeAttribute('val', $plotSeriesValues->getPointCount() );
+					$objWriter->endElement();
+
+					for ($level = 0; $level < $levelCount; ++$level) {
+						$objWriter->startElement('c:lvl');
+
+						foreach($plotSeriesValues->getDataValues() as $plotSeriesKey => $plotSeriesValue) {
+							if (isset($plotSeriesValue[$level])) {
+								$objWriter->startElement('c:pt');
+									$objWriter->writeAttribute('idx', $plotSeriesKey );
+
+									$objWriter->startElement('c:v');
+										$objWriter->writeRawData( $plotSeriesValue[$level] );
+									$objWriter->endElement();
+								$objWriter->endElement();
+							}
+						}
+
+						$objWriter->endElement();
+					}
+
+				$objWriter->endElement();
+
+			$objWriter->endElement();
+		} else {
+			$objWriter->startElement('c:'.$dataType.'Ref');
+
+				$objWriter->startElement('c:f');
+					$objWriter->writeRawData( $plotSeriesValues->getDataSource() );
+				$objWriter->endElement();
+
+				$objWriter->startElement('c:'.$dataType.'Cache');
+
+					if (($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
+						($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
+						($groupType != PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
+
+						if (($plotSeriesValues->getFormatCode() !== NULL) &&
+							($plotSeriesValues->getFormatCode() !== '')) {
+							$objWriter->startElement('c:formatCode');
+								$objWriter->writeRawData( $plotSeriesValues->getFormatCode() );
+							$objWriter->endElement();
+						}
+					}
+
+					$objWriter->startElement('c:ptCount');
+						$objWriter->writeAttribute('val', $plotSeriesValues->getPointCount() );
+					$objWriter->endElement();
+
+					$dataValues = $plotSeriesValues->getDataValues();
+					if (!empty($dataValues)) {
+						if (is_array($dataValues)) {
+							foreach($dataValues as $plotSeriesKey => $plotSeriesValue) {
+								$objWriter->startElement('c:pt');
+									$objWriter->writeAttribute('idx', $plotSeriesKey );
+
+									$objWriter->startElement('c:v');
+										$objWriter->writeRawData( $plotSeriesValue );
+									$objWriter->endElement();
+								$objWriter->endElement();
+							}
+						}
+					}
+
+				$objWriter->endElement();
+
+			$objWriter->endElement();
+		}
+	}
+
+	/**
+	 * Write Bubble Chart Details
+	 *
+	 * @param	PHPExcel_Chart_DataSeriesValues		$plotSeriesValues
+	 * @param 	PHPExcel_Shared_XMLWriter 			$objWriter 			XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writeBubbles($plotSeriesValues, $objWriter, PHPExcel_Worksheet $pSheet)
+	{
+		if (is_null($plotSeriesValues)) {
+			return;
+		}
+
+		$objWriter->startElement('c:bubbleSize');
+			$objWriter->startElement('c:numLit');
+
+				$objWriter->startElement('c:formatCode');
+					$objWriter->writeRawData( 'General' );
+				$objWriter->endElement();
+
+				$objWriter->startElement('c:ptCount');
+					$objWriter->writeAttribute('val', $plotSeriesValues->getPointCount() );
+				$objWriter->endElement();
+
+				$dataValues = $plotSeriesValues->getDataValues();
+				if (!empty($dataValues)) {
+					if (is_array($dataValues)) {
+						foreach($dataValues as $plotSeriesKey => $plotSeriesValue) {
+							$objWriter->startElement('c:pt');
+								$objWriter->writeAttribute('idx', $plotSeriesKey );
+								$objWriter->startElement('c:v');
+									$objWriter->writeRawData( 1 );
+								$objWriter->endElement();
+							$objWriter->endElement();
+						}
+					}
+				}
+
+			$objWriter->endElement();
+		$objWriter->endElement();
+
+		$objWriter->startElement('c:bubble3D');
+			$objWriter->writeAttribute('val', 0 );
+		$objWriter->endElement();
+	}
+
+	/**
+	 * Write Layout
+	 *
+	 * @param	PHPExcel_Chart_Layout		$layout
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writeLayout(PHPExcel_Chart_Layout $layout = NULL, $objWriter)
+	{
+		$objWriter->startElement('c:layout');
+
+			if (!is_null($layout)) {
+				$objWriter->startElement('c:manualLayout');
+
+					$layoutTarget = $layout->getLayoutTarget();
+					if (!is_null($layoutTarget)) {
+						$objWriter->startElement('c:layoutTarget');
+							$objWriter->writeAttribute('val', $layoutTarget);
+						$objWriter->endElement();
+					}
+
+					$xMode = $layout->getXMode();
+					if (!is_null($xMode)) {
+						$objWriter->startElement('c:xMode');
+							$objWriter->writeAttribute('val', $xMode);
+						$objWriter->endElement();
+					}
+
+					$yMode = $layout->getYMode();
+					if (!is_null($yMode)) {
+						$objWriter->startElement('c:yMode');
+							$objWriter->writeAttribute('val', $yMode);
+						$objWriter->endElement();
+					}
+
+					$x = $layout->getXPosition();
+					if (!is_null($x)) {
+						$objWriter->startElement('c:x');
+							$objWriter->writeAttribute('val', $x);
+						$objWriter->endElement();
+					}
+
+					$y = $layout->getYPosition();
+					if (!is_null($y)) {
+						$objWriter->startElement('c:y');
+							$objWriter->writeAttribute('val', $y);
+						$objWriter->endElement();
+					}
+
+					$w = $layout->getWidth();
+					if (!is_null($w)) {
+						$objWriter->startElement('c:w');
+							$objWriter->writeAttribute('val', $w);
+						$objWriter->endElement();
+					}
+
+					$h = $layout->getHeight();
+					if (!is_null($h)) {
+						$objWriter->startElement('c:h');
+							$objWriter->writeAttribute('val', $h);
+						$objWriter->endElement();
+					}
+
+				$objWriter->endElement();
+			}
+
+		$objWriter->endElement();
+	}
+
+	/**
+	 * Write Alternate Content block
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writeAlternateContent($objWriter)
+	{
+		$objWriter->startElement('mc:AlternateContent');
+			$objWriter->writeAttribute('xmlns:mc', 'http://schemas.openxmlformats.org/markup-compatibility/2006');
+
+			$objWriter->startElement('mc:Choice');
+				$objWriter->writeAttribute('xmlns:c14', 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart');
+				$objWriter->writeAttribute('Requires', 'c14');
+
+				$objWriter->startElement('c14:style');
+					$objWriter->writeAttribute('val', '102');
+				$objWriter->endElement();
+			$objWriter->endElement();
+
+			$objWriter->startElement('mc:Fallback');
+				$objWriter->startElement('c:style');
+					$objWriter->writeAttribute('val', '2');
+				$objWriter->endElement();
+			$objWriter->endElement();
+
+		$objWriter->endElement();
+	}
+
+	/**
+	 * Write Printer Settings
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter 	$objWriter 		XML Writer
+	 * @throws 	Exception
+	 */
+	private function _writePrintSettings($objWriter)
+	{
+		$objWriter->startElement('c:printSettings');
+
+			$objWriter->startElement('c:headerFooter');
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:pageMargins');
+				$objWriter->writeAttribute('footer', 0.3);
+				$objWriter->writeAttribute('header', 0.3);
+				$objWriter->writeAttribute('r', 0.7);
+				$objWriter->writeAttribute('l', 0.7);
+				$objWriter->writeAttribute('t', 0.75);
+				$objWriter->writeAttribute('b', 0.75);
+			$objWriter->endElement();
+
+			$objWriter->startElement('c:pageSetup');
+				$objWriter->writeAttribute('orientation', "portrait");
+			$objWriter->endElement();
+
+		$objWriter->endElement();
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Comments.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Comments.php
index 2b758c2a9b5..ec8a2704258 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Comments.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Comments.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_Comments extends PHPExcel_Writer_Excel2007_WriterPart
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/ContentTypes.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/ContentTypes.php
index 0b3191bb129..a6ee53c6d02 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/ContentTypes.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/ContentTypes.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,18 +31,19 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_WriterPart
 {
 	/**
 	 * Write content types to XML format
 	 *
-	 * @param 	PHPExcel $pPHPExcel
+	 * @param 	PHPExcel	$pPHPExcel
+	 * @param	boolean		$includeCharts	Flag indicating if we should include drawing details for charts
 	 * @return 	string 						XML Output
 	 * @throws 	Exception
 	 */
-	public function writeContentTypes(PHPExcel $pPHPExcel = null)
+	public function writeContentTypes(PHPExcel $pPHPExcel = null, $includeCharts = FALSE)
 	{
 		// Create XML writer
 		$objWriter = null;
@@ -99,7 +100,7 @@ class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_W
 			);
 
 			$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-			if (count($customPropertyList) > 0) {
+			if (!empty($customPropertyList)) {
 				$this->_writeOverrideContentType(
 					$objWriter, '/docProps/custom.xml', 'application/vnd.openxmlformats-officedocument.custom-properties+xml'
 				);
@@ -119,12 +120,27 @@ class PHPExcel_Writer_Excel2007_ContentTypes extends PHPExcel_Writer_Excel2007_W
 			);
 
 			// Add worksheet relationship content types
+			$chart = 1;
 			for ($i = 0; $i < $sheetCount; ++$i) {
-				if ($pPHPExcel->getSheet($i)->getDrawingCollection()->count() > 0) {
+				$drawings = $pPHPExcel->getSheet($i)->getDrawingCollection();
+				$drawingCount = count($drawings);
+				$chartCount = ($includeCharts) ? $pPHPExcel->getSheet($i)->getChartCount() : 0;
+
+				//	We need a drawing relationship for the worksheet if we have either drawings or charts
+				if (($drawingCount > 0) || ($chartCount > 0)) {
 					$this->_writeOverrideContentType(
 						$objWriter, '/xl/drawings/drawing' . ($i + 1) . '.xml', 'application/vnd.openxmlformats-officedocument.drawing+xml'
 					);
 				}
+
+				//	If we have charts, then we need a chart relationship for every individual chart
+				if ($chartCount > 0) {
+					for ($c = 0; $c < $chartCount; ++$c) {
+						$this->_writeOverrideContentType(
+							$objWriter, '/xl/charts/chart' . $chart++ . '.xml', 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
+						);
+					}
+				}
 			}
 
 			// Comments
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/DocProps.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/DocProps.php
index f6c6bbcd6dc..84dd06bc1f2 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/DocProps.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/DocProps.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_WriterPart
 {
@@ -209,7 +209,7 @@ class PHPExcel_Writer_Excel2007_DocProps extends PHPExcel_Writer_Excel2007_Write
 	public function writeDocPropsCustom(PHPExcel $pPHPExcel = null)
 	{
 		$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-		if (count($customPropertyList) == 0) {
+		if (empty($customPropertyList)) {
 			return;
 		}
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Drawing.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Drawing.php
index 59b3bfb6405..9b618c56301 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Drawing.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Drawing.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,18 +31,20 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_WriterPart
 {
 	/**
 	 * Write drawings to XML format
 	 *
-	 * @param 	PHPExcel_Worksheet				$pWorksheet
-	 * @return 	string 								XML Output
+	 * @param 	PHPExcel_Worksheet	$pWorksheet
+	 * @param	int					&$chartRef		Chart ID
+	 * @param	boolean				$includeCharts	Flag indicating if we should include drawing details for charts
+	 * @return 	string 				XML Output
 	 * @throws 	Exception
 	 */
-	public function writeDrawings(PHPExcel_Worksheet $pWorksheet = null)
+	public function writeDrawings(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
 	{
 		// Create XML writer
 		$objWriter = null;
@@ -70,12 +72,95 @@ class PHPExcel_Writer_Excel2007_Drawing extends PHPExcel_Writer_Excel2007_Writer
 				++$i;
 			}
 
+			if ($includeCharts) {
+				$chartCount = $pWorksheet->getChartCount();
+				// Loop through charts and write the chart position
+				if ($chartCount > 0) {
+					for ($c = 0; $c < $chartCount; ++$c) {
+						$this->_writeChart($objWriter, $pWorksheet->getChartByIndex($c), $c+$i);
+					}
+				}
+			}
+
+
 		$objWriter->endElement();
 
 		// Return
 		return $objWriter->getData();
 	}
 
+	/**
+	 * Write drawings to XML format
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
+	 * @param 	PHPExcel_Chart				$pChart
+	 * @param 	int							$pRelationId
+	 * @throws 	Exception
+	 */
+	public function _writeChart(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Chart $pChart = null, $pRelationId = -1)
+	{
+		$tl = $pChart->getTopLeftPosition();
+		$tl['colRow'] = PHPExcel_Cell::coordinateFromString($tl['cell']);
+		$br = $pChart->getBottomRightPosition();
+		$br['colRow'] = PHPExcel_Cell::coordinateFromString($br['cell']);
+
+		$objWriter->startElement('xdr:twoCellAnchor');
+
+			$objWriter->startElement('xdr:from');
+				$objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($tl['colRow'][0]) - 1);
+				$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['xOffset']));
+				$objWriter->writeElement('xdr:row', $tl['colRow'][1] - 1);
+				$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($tl['yOffset']));
+			$objWriter->endElement();
+			$objWriter->startElement('xdr:to');
+				$objWriter->writeElement('xdr:col', PHPExcel_Cell::columnIndexFromString($br['colRow'][0]) - 1);
+				$objWriter->writeElement('xdr:colOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['xOffset']));
+				$objWriter->writeElement('xdr:row', $br['colRow'][1] - 1);
+				$objWriter->writeElement('xdr:rowOff', PHPExcel_Shared_Drawing::pixelsToEMU($br['yOffset']));
+			$objWriter->endElement();
+
+			$objWriter->startElement('xdr:graphicFrame');
+				$objWriter->writeAttribute('macro', '');
+				$objWriter->startElement('xdr:nvGraphicFramePr');
+					$objWriter->startElement('xdr:cNvPr');
+						$objWriter->writeAttribute('name', 'Chart '.$pRelationId);
+						$objWriter->writeAttribute('id', 1025 * $pRelationId);
+					$objWriter->endElement();
+					$objWriter->startElement('xdr:cNvGraphicFramePr');
+						$objWriter->startElement('a:graphicFrameLocks');
+						$objWriter->endElement();
+					$objWriter->endElement();
+				$objWriter->endElement();
+
+				$objWriter->startElement('xdr:xfrm');
+					$objWriter->startElement('a:off');
+						$objWriter->writeAttribute('x', '0');
+						$objWriter->writeAttribute('y', '0');
+					$objWriter->endElement();
+					$objWriter->startElement('a:ext');
+						$objWriter->writeAttribute('cx', '0');
+						$objWriter->writeAttribute('cy', '0');
+					$objWriter->endElement();
+				$objWriter->endElement();
+
+				$objWriter->startElement('a:graphic');
+					$objWriter->startElement('a:graphicData');
+						$objWriter->writeAttribute('uri', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
+						$objWriter->startElement('c:chart');
+							$objWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
+							$objWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
+							$objWriter->writeAttribute('r:id', 'rId'.$pRelationId);
+						$objWriter->endElement();
+					$objWriter->endElement();
+				$objWriter->endElement();
+			$objWriter->endElement();
+
+			$objWriter->startElement('xdr:clientData');
+			$objWriter->endElement();
+
+		$objWriter->endElement();
+	}
+
 	/**
 	 * Write drawings to XML format
 	 *
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Rels.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Rels.php
index fbde8cdc2d5..ff550a673db 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Rels.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Rels.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPart
 {
@@ -60,7 +60,7 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
 		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
 
 			$customPropertyList = $pPHPExcel->getProperties()->getCustomProperties();
-			if (count($customPropertyList) > 0) {
+			if (!empty($customPropertyList)) {
 				// Relationship docProps/app.xml
 				$this->_writeRelationship(
 					$objWriter,
@@ -173,12 +173,13 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
 	 * 	rId1 				- Drawings
 	 *  rId_hyperlink_x 	- Hyperlinks
 	 *
-	 * @param 	PHPExcel_Worksheet		$pWorksheet
-	 * @param 	int						$pWorksheetId
-	 * @return 	string 					XML Output
+	 * @param 	PHPExcel_Worksheet	$pWorksheet
+	 * @param 	int					$pWorksheetId
+	 * @param	boolean				$includeCharts	Flag indicating if we should write charts
+	 * @return 	string 				XML Output
 	 * @throws 	Exception
 	 */
-	public function writeWorksheetRelationships(PHPExcel_Worksheet $pWorksheet = null, $pWorksheetId = 1)
+	public function writeWorksheetRelationships(PHPExcel_Worksheet $pWorksheet = null, $pWorksheetId = 1, $includeCharts = FALSE)
 	{
 		// Create XML writer
 		$objWriter = null;
@@ -196,15 +197,37 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
 		$objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/package/2006/relationships');
 
 			// Write drawing relationships?
-			if ($pWorksheet->getDrawingCollection()->count() > 0) {
+			$d = 0;
+			if ($includeCharts) {
+				$charts = $pWorksheet->getChartCollection();
+			} else {
+				$charts = array();
+			}
+			if (($pWorksheet->getDrawingCollection()->count() > 0) ||
+				(count($charts) > 0)) {
 				$this->_writeRelationship(
 					$objWriter,
-					1,
+					++$d,
 					'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
 					'../drawings/drawing' . $pWorksheetId . '.xml'
 				);
 			}
 
+			// Write chart relationships?
+//			$chartCount = 0;
+//			$charts = $pWorksheet->getChartCollection();
+//			echo 'Chart Rels: ' , count($charts) , '<br />';
+//			if (count($charts) > 0) {
+//				foreach($charts as $chart) {
+//					$this->_writeRelationship(
+//						$objWriter,
+//						++$d,
+//						'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
+//						'../charts/chart' . ++$chartCount . '.xml'
+//					);
+//				}
+//			}
+//
 			// Write hyperlink relationships?
 			$i = 1;
 			foreach ($pWorksheet->getHyperlinkCollection() as $hyperlink) {
@@ -259,11 +282,13 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
 	/**
 	 * Write drawing relationships to XML format
 	 *
-	 * @param 	PHPExcel_Worksheet			$pWorksheet
-	 * @return 	string 						XML Output
+	 * @param 	PHPExcel_Worksheet	$pWorksheet
+	 * @param	int					&$chartRef		Chart ID
+	 * @param	boolean				$includeCharts	Flag indicating if we should write charts
+	 * @return 	string 				XML Output
 	 * @throws 	Exception
 	 */
-	public function writeDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null)
+	public function writeDrawingRelationships(PHPExcel_Worksheet $pWorksheet = null, &$chartRef, $includeCharts = FALSE)
 	{
 		// Create XML writer
 		$objWriter = null;
@@ -299,6 +324,21 @@ class PHPExcel_Writer_Excel2007_Rels extends PHPExcel_Writer_Excel2007_WriterPar
 				++$i;
 			}
 
+			if ($includeCharts) {
+				// Loop through charts and write relationships
+				$chartCount = $pWorksheet->getChartCount();
+				if ($chartCount > 0) {
+					for ($c = 0; $c < $chartCount; ++$c) {
+						$this->_writeRelationship(
+							$objWriter,
+							$i++,
+							'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart',
+							'../charts/chart' . ++$chartRef . '.xml'
+						);
+					}
+				}
+			}
+
 		$objWriter->endElement();
 
 		// Return
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/StringTable.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/StringTable.php
index 2e71c67d195..e9fb6600cd8 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/StringTable.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/StringTable.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_WriterPart
 {
@@ -45,14 +45,14 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
 	 */
 	public function createStringTable($pSheet = null, $pExistingTable = null)
 	{
-		if (!is_null($pSheet)) {
+		if ($pSheet !== NULL) {
 			// Create string lookup table
 			$aStringTable = array();
 			$cellCollection = null;
 			$aFlippedStringTable = null;	// For faster lookup
 
 			// Is an existing table given?
-			if (!is_null($pExistingTable) && is_array($pExistingTable)) {
+			if (($pExistingTable !== NULL) && is_array($pExistingTable)) {
 				$aStringTable = $pExistingTable;
 			}
 
@@ -64,17 +64,17 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
 				$cell = $pSheet->getCell($cellID);
 				$cellValue = $cell->getValue();
 				if (!is_object($cellValue) &&
-					!is_null($cellValue) &&
+					($cellValue !== NULL) &&
 					$cellValue !== '' &&
 					!isset($aFlippedStringTable[$cellValue]) &&
 					($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_STRING2 || $cell->getDataType() == PHPExcel_Cell_DataType::TYPE_NULL)) {
 						$aStringTable[] = $cellValue;
-						$aFlippedStringTable[$cellValue] = 1;
+						$aFlippedStringTable[$cellValue] = true;
 				} elseif ($cellValue instanceof PHPExcel_RichText &&
-						  !is_null($cellValue) &&
+						  ($cellValue !== NULL) &&
 						  !isset($aFlippedStringTable[$cellValue->getHashCode()])) {
 								$aStringTable[] = $cellValue;
-								$aFlippedStringTable[$cellValue->getHashCode()] = 1;
+								$aFlippedStringTable[$cellValue->getHashCode()] = true;
 	        	}
 	        }
 
@@ -94,7 +94,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
 	 */
 	public function writeStringTable($pStringTable = null)
 	{
-		if (!is_null($pStringTable)) {
+		if ($pStringTable !== NULL) {
 			// Create XML writer
 			$objWriter = null;
 			if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -142,41 +142,44 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
 	/**
 	 * Write Rich Text
 	 *
-	 * @param 	PHPExcel_Shared_XMLWriter		$objWriter 		XML Writer
-	 * @param 	PHPExcel_RichText				$pRichText		Rich text
+	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
+	 * @param 	PHPExcel_RichText			$pRichText		Rich text
+	 * @param 	string						$prefix			Optional Namespace prefix
 	 * @throws 	Exception
 	 */
-	public function writeRichText(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_RichText $pRichText = null)
+	public function writeRichText(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_RichText $pRichText = null, $prefix=NULL)
 	{
+		if ($prefix !== NULL)
+			$prefix .= ':';
 		// Loop through rich text elements
 		$elements = $pRichText->getRichTextElements();
 		foreach ($elements as $element) {
 			// r
-			$objWriter->startElement('r');
+			$objWriter->startElement($prefix.'r');
 
 				// rPr
 				if ($element instanceof PHPExcel_RichText_Run) {
 					// rPr
-					$objWriter->startElement('rPr');
+					$objWriter->startElement($prefix.'rPr');
 
 						// rFont
-						$objWriter->startElement('rFont');
+						$objWriter->startElement($prefix.'rFont');
 						$objWriter->writeAttribute('val', $element->getFont()->getName());
 						$objWriter->endElement();
 
 						// Bold
-						$objWriter->startElement('b');
+						$objWriter->startElement($prefix.'b');
 						$objWriter->writeAttribute('val', ($element->getFont()->getBold() ? 'true' : 'false'));
 						$objWriter->endElement();
 
 						// Italic
-						$objWriter->startElement('i');
+						$objWriter->startElement($prefix.'i');
 						$objWriter->writeAttribute('val', ($element->getFont()->getItalic() ? 'true' : 'false'));
 						$objWriter->endElement();
 
 						// Superscript / subscript
 						if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
-							$objWriter->startElement('vertAlign');
+							$objWriter->startElement($prefix.'vertAlign');
 							if ($element->getFont()->getSuperScript()) {
 								$objWriter->writeAttribute('val', 'superscript');
 							} else if ($element->getFont()->getSubScript()) {
@@ -186,22 +189,22 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
 						}
 
 						// Strikethrough
-						$objWriter->startElement('strike');
+						$objWriter->startElement($prefix.'strike');
 						$objWriter->writeAttribute('val', ($element->getFont()->getStrikethrough() ? 'true' : 'false'));
 						$objWriter->endElement();
 
 						// Color
-						$objWriter->startElement('color');
+						$objWriter->startElement($prefix.'color');
 						$objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
 						$objWriter->endElement();
 
 						// Size
-						$objWriter->startElement('sz');
+						$objWriter->startElement($prefix.'sz');
 						$objWriter->writeAttribute('val', $element->getFont()->getSize());
 						$objWriter->endElement();
 
 						// Underline
-						$objWriter->startElement('u');
+						$objWriter->startElement($prefix.'u');
 						$objWriter->writeAttribute('val', $element->getFont()->getUnderline());
 						$objWriter->endElement();
 
@@ -209,7 +212,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
 				}
 
 				// t
-				$objWriter->startElement('t');
+				$objWriter->startElement($prefix.'t');
 				$objWriter->writeAttribute('xml:space', 'preserve');
 				$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
 				$objWriter->endElement();
@@ -218,6 +221,79 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
 		}
 	}
 
+	/**
+	 * Write Rich Text
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
+	 * @param 	string|PHPExcel_RichText	$pRichText		text string or Rich text
+	 * @param 	string						$prefix			Optional Namespace prefix
+	 * @throws 	Exception
+	 */
+	public function writeRichTextForCharts(PHPExcel_Shared_XMLWriter $objWriter = null, $pRichText = null, $prefix=NULL)
+	{
+		if (!$pRichText instanceof PHPExcel_RichText) {
+			$textRun = $pRichText;
+			$pRichText = new PHPExcel_RichText();
+			$pRichText->createTextRun($textRun);
+		}
+
+		if ($prefix !== NULL)
+			$prefix .= ':';
+		// Loop through rich text elements
+		$elements = $pRichText->getRichTextElements();
+		foreach ($elements as $element) {
+			// r
+			$objWriter->startElement($prefix.'r');
+
+				// rPr
+				$objWriter->startElement($prefix.'rPr');
+
+					// Bold
+					$objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
+					// Italic
+					$objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? 1 : 0));
+					// Underline
+					$underlineType = $element->getFont()->getUnderline();
+					switch($underlineType) {
+						case 'single' :
+							$underlineType = 'sng';
+							break;
+						case 'double' :
+							$underlineType = 'dbl';
+							break;
+					}
+					$objWriter->writeAttribute('u', $underlineType);
+					// Strikethrough
+					$objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));
+
+					// rFont
+					$objWriter->startElement($prefix.'latin');
+						$objWriter->writeAttribute('typeface', $element->getFont()->getName());
+					$objWriter->endElement();
+
+					// Superscript / subscript
+//					if ($element->getFont()->getSuperScript() || $element->getFont()->getSubScript()) {
+//						$objWriter->startElement($prefix.'vertAlign');
+//						if ($element->getFont()->getSuperScript()) {
+//							$objWriter->writeAttribute('val', 'superscript');
+//						} else if ($element->getFont()->getSubScript()) {
+//							$objWriter->writeAttribute('val', 'subscript');
+//						}
+//						$objWriter->endElement();
+//					}
+//
+				$objWriter->endElement();
+
+				// t
+				$objWriter->startElement($prefix.'t');
+//					$objWriter->writeAttribute('xml:space', 'preserve');	//	Excel2010 accepts, Excel2007 complains
+					$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
+				$objWriter->endElement();
+
+			$objWriter->endElement();
+		}
+	}
+
 	/**
 	 * Flip string table (for index searching)
 	 *
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Style.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Style.php
index 2cdc89adcef..b24deba9a67 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Style.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Style.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPart
 {
@@ -175,11 +175,11 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 	private function _writeFill(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Style_Fill $pFill = null)
 	{
 		// Check if this is a pattern type or gradient type
-		if ($pFill->getFillType() == PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR
-			|| $pFill->getFillType() == PHPExcel_Style_Fill::FILL_GRADIENT_PATH) {
+		if ($pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR ||
+			$pFill->getFillType() === PHPExcel_Style_Fill::FILL_GRADIENT_PATH) {
 			// Gradient fill
 			$this->_writeGradientFill($objWriter, $pFill);
-		} else {
+		} elseif($pFill->getFillType() !== NULL) {
 			// Pattern fill
 			$this->_writePatternFill($objWriter, $pFill);
 		}
@@ -245,15 +245,22 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 			$objWriter->startElement('patternFill');
 				$objWriter->writeAttribute('patternType', $pFill->getFillType());
 
-				// fgColor
-				$objWriter->startElement('fgColor');
-				$objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
-				$objWriter->endElement();
-
-				// bgColor
-				$objWriter->startElement('bgColor');
-				$objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
-				$objWriter->endElement();
+				if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
+					// fgColor
+					if ($pFill->getStartColor()->getARGB()) {
+						$objWriter->startElement('fgColor');
+						$objWriter->writeAttribute('rgb', $pFill->getStartColor()->getARGB());
+						$objWriter->endElement();
+					}
+				}
+				if ($pFill->getFillType() !== PHPExcel_Style_Fill::FILL_NONE) {
+					// bgColor
+					if ($pFill->getEndColor()->getARGB()) {
+						$objWriter->startElement('bgColor');
+						$objWriter->writeAttribute('rgb', $pFill->getEndColor()->getARGB());
+						$objWriter->endElement();
+					}
+				}
 
 			$objWriter->endElement();
 
@@ -271,54 +278,71 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 	{
 		// font
 		$objWriter->startElement('font');
-
-			// Name
-			$objWriter->startElement('name');
-			$objWriter->writeAttribute('val', $pFont->getName());
-			$objWriter->endElement();
-
-			// Size
-			$objWriter->startElement('sz');
-			$objWriter->writeAttribute('val', $pFont->getSize());
-			$objWriter->endElement();
+			//	Weird! The order of these elements actually makes a difference when opening Excel2007
+			//		files in Excel2003 with the compatibility pack. It's not documented behaviour,
+			//		and makes for a real WTF!
 
 			// Bold. We explicitly write this element also when false (like MS Office Excel 2007 does
 			// for conditional formatting). Otherwise it will apparently not be picked up in conditional
 			// formatting style dialog
-			$objWriter->startElement('b');
-			$objWriter->writeAttribute('val', $pFont->getBold() ? '1' : '0');
-			$objWriter->endElement();
+			if ($pFont->getBold() !== NULL) {
+				$objWriter->startElement('b');
+					$objWriter->writeAttribute('val', $pFont->getBold() ? '1' : '0');
+				$objWriter->endElement();
+			}
 
 			// Italic
-			$objWriter->startElement('i');
-			$objWriter->writeAttribute('val', $pFont->getItalic() ? '1' : '0');
-			$objWriter->endElement();
+			if ($pFont->getItalic() !== NULL) {
+				$objWriter->startElement('i');
+					$objWriter->writeAttribute('val', $pFont->getItalic() ? '1' : '0');
+				$objWriter->endElement();
+			}
+
+			// Strikethrough
+			if ($pFont->getStrikethrough() !== NULL) {
+				$objWriter->startElement('strike');
+				$objWriter->writeAttribute('val', $pFont->getStrikethrough() ? '1' : '0');
+				$objWriter->endElement();
+			}
+
+			// Underline
+			if ($pFont->getUnderline() !== NULL) {
+				$objWriter->startElement('u');
+				$objWriter->writeAttribute('val', $pFont->getUnderline());
+				$objWriter->endElement();
+			}
 
 			// Superscript / subscript
-			if ($pFont->getSuperScript() || $pFont->getSubScript()) {
+			if ($pFont->getSuperScript() === TRUE || $pFont->getSubScript() === TRUE) {
 				$objWriter->startElement('vertAlign');
-				if ($pFont->getSuperScript()) {
+				if ($pFont->getSuperScript() === TRUE) {
 					$objWriter->writeAttribute('val', 'superscript');
-				} else if ($pFont->getSubScript()) {
+				} else if ($pFont->getSubScript() === TRUE) {
 					$objWriter->writeAttribute('val', 'subscript');
 				}
 				$objWriter->endElement();
 			}
 
-			// Underline
-			$objWriter->startElement('u');
-			$objWriter->writeAttribute('val', $pFont->getUnderline());
-			$objWriter->endElement();
-
-			// Strikethrough
-			$objWriter->startElement('strike');
-			$objWriter->writeAttribute('val', $pFont->getStrikethrough() ? '1' : '0');
-			$objWriter->endElement();
+			// Size
+			if ($pFont->getSize() !== NULL) {
+				$objWriter->startElement('sz');
+					$objWriter->writeAttribute('val', $pFont->getSize());
+				$objWriter->endElement();
+			}
 
 			// Foreground color
-			$objWriter->startElement('color');
-			$objWriter->writeAttribute('rgb', $pFont->getColor()->getARGB());
-			$objWriter->endElement();
+			if ($pFont->getColor()->getARGB() !== NULL) {
+				$objWriter->startElement('color');
+				$objWriter->writeAttribute('rgb', $pFont->getColor()->getARGB());
+				$objWriter->endElement();
+			}
+
+			// Name
+			if ($pFont->getName() !== NULL) {
+				$objWriter->startElement('name');
+					$objWriter->writeAttribute('val', $pFont->getName());
+				$objWriter->endElement();
+			}
 
 		$objWriter->endElement();
 	}
@@ -351,11 +375,11 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 			}
 
 			// BorderPr
-			$this->_writeBorderPr($objWriter, 'left', 			$pBorders->getLeft());
-			$this->_writeBorderPr($objWriter, 'right', 			$pBorders->getRight());
-			$this->_writeBorderPr($objWriter, 'top', 			$pBorders->getTop());
-			$this->_writeBorderPr($objWriter, 'bottom', 		$pBorders->getBottom());
-			$this->_writeBorderPr($objWriter, 'diagonal', 		$pBorders->getDiagonal());
+			$this->_writeBorderPr($objWriter, 'left',		$pBorders->getLeft());
+			$this->_writeBorderPr($objWriter, 'right',		$pBorders->getRight());
+			$this->_writeBorderPr($objWriter, 'top',		$pBorders->getTop());
+			$this->_writeBorderPr($objWriter, 'bottom',		$pBorders->getBottom());
+			$this->_writeBorderPr($objWriter, 'diagonal',	$pBorders->getDiagonal());
 		$objWriter->endElement();
 	}
 
@@ -404,8 +428,8 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 				} else if ($pStyle->getAlignment()->getTextRotation() < 0) {
 					$textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
 				}
-
 				$objWriter->writeAttribute('textRotation', 	$textRotation);
+
 				$objWriter->writeAttribute('wrapText', 		($pStyle->getAlignment()->getWrapText() ? 'true' : 'false'));
 				$objWriter->writeAttribute('shrinkToFit', 	($pStyle->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
 
@@ -452,32 +476,43 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 
 			// alignment
 			$objWriter->startElement('alignment');
-				$objWriter->writeAttribute('horizontal', 	$pStyle->getAlignment()->getHorizontal());
-				$objWriter->writeAttribute('vertical', 		$pStyle->getAlignment()->getVertical());
-
-				$textRotation = 0;
-				if ($pStyle->getAlignment()->getTextRotation() >= 0) {
-					$textRotation = $pStyle->getAlignment()->getTextRotation();
-				} else if ($pStyle->getAlignment()->getTextRotation() < 0) {
-					$textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
+				if ($pStyle->getAlignment()->getHorizontal() !== NULL) {
+					$objWriter->writeAttribute('horizontal', $pStyle->getAlignment()->getHorizontal());
+				}
+				if ($pStyle->getAlignment()->getVertical() !== NULL) {
+					$objWriter->writeAttribute('vertical', $pStyle->getAlignment()->getVertical());
 				}
 
-				$objWriter->writeAttribute('textRotation', 	$textRotation);
+				if ($pStyle->getAlignment()->getTextRotation() !== NULL) {
+					$textRotation = 0;
+					if ($pStyle->getAlignment()->getTextRotation() >= 0) {
+						$textRotation = $pStyle->getAlignment()->getTextRotation();
+					} else if ($pStyle->getAlignment()->getTextRotation() < 0) {
+						$textRotation = 90 - $pStyle->getAlignment()->getTextRotation();
+					}
+					$objWriter->writeAttribute('textRotation', 	$textRotation);
+				}
 			$objWriter->endElement();
 
 			// border
 			$this->_writeBorder($objWriter, $pStyle->getBorders());
 
 			// protection
-			if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT || $pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-				$objWriter->startElement('protection');
-					if ($pStyle->getProtection()->getLocked() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-						$objWriter->writeAttribute('locked', 		($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-					}
-					if ($pStyle->getProtection()->getHidden() != PHPExcel_Style_Protection::PROTECTION_INHERIT) {
-						$objWriter->writeAttribute('hidden', 		($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
-					}
-				$objWriter->endElement();
+			if (($pStyle->getProtection()->getLocked() !== NULL) ||
+				($pStyle->getProtection()->getHidden() !== NULL)) {
+				if ($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT ||
+					$pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT) {
+					$objWriter->startElement('protection');
+						if (($pStyle->getProtection()->getLocked() !== NULL) &&
+							($pStyle->getProtection()->getLocked() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
+							$objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+						}
+						if (($pStyle->getProtection()->getHidden() !== NULL) &&
+							($pStyle->getProtection()->getHidden() !== PHPExcel_Style_Protection::PROTECTION_INHERIT)) {
+							$objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == PHPExcel_Style_Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
+						}
+					$objWriter->endElement();
+				}
 			}
 
 		$objWriter->endElement();
@@ -521,10 +556,12 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 		$formatCode = $pNumberFormat->getFormatCode();
 
 		// numFmt
-		$objWriter->startElement('numFmt');
-			$objWriter->writeAttribute('numFmtId', 		($pId + 164));
-			$objWriter->writeAttribute('formatCode', 	$formatCode);
-		$objWriter->endElement();
+		if ($formatCode !== NULL) {
+			$objWriter->startElement('numFmt');
+				$objWriter->writeAttribute('numFmtId', ($pId + 164));
+				$objWriter->writeAttribute('formatCode', $formatCode);
+			$objWriter->endElement();
+		}
 	}
 
 	/**
@@ -585,7 +622,6 @@ class PHPExcel_Writer_Excel2007_Style extends PHPExcel_Writer_Excel2007_WriterPa
 		$fill1 = new PHPExcel_Style_Fill();
 		$fill1->setFillType(PHPExcel_Style_Fill::FILL_PATTERN_GRAY125);
 		$aFills[] = $fill1;
-
 		// The remaining fills
 		$aStyles 	= $this->allStyles($pPHPExcel);
 		foreach ($aStyles as $style) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Theme.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Theme.php
index 7af5a939b73..e067efe357e 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Theme.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Theme.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,10 +31,104 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPart
 {
+	/**
+	 * Map of Major fonts to write
+	 * @static	array of string
+	 *
+	 */
+	private static $_majorFonts = array(
+					'Jpan' => 'ＭＳ Ｐゴシック',
+					'Hang' => '맑은 고딕',
+					'Hans' => '宋体',
+					'Hant' => '新細明體',
+					'Arab' => 'Times New Roman',
+					'Hebr' => 'Times New Roman',
+					'Thai' => 'Tahoma',
+					'Ethi' => 'Nyala',
+					'Beng' => 'Vrinda',
+					'Gujr' => 'Shruti',
+					'Khmr' => 'MoolBoran',
+					'Knda' => 'Tunga',
+					'Guru' => 'Raavi',
+					'Cans' => 'Euphemia',
+					'Cher' => 'Plantagenet Cherokee',
+					'Yiii' => 'Microsoft Yi Baiti',
+					'Tibt' => 'Microsoft Himalaya',
+					'Thaa' => 'MV Boli',
+					'Deva' => 'Mangal',
+					'Telu' => 'Gautami',
+					'Taml' => 'Latha',
+					'Syrc' => 'Estrangelo Edessa',
+					'Orya' => 'Kalinga',
+					'Mlym' => 'Kartika',
+					'Laoo' => 'DokChampa',
+					'Sinh' => 'Iskoola Pota',
+					'Mong' => 'Mongolian Baiti',
+					'Viet' => 'Times New Roman',
+					'Uigh' => 'Microsoft Uighur',
+					'Geor' => 'Sylfaen',
+			);
+
+	/**
+	 * Map of Minor fonts to write
+	 * @static	array of string
+	 *
+	 */
+	private static $_minorFonts = array(
+					'Jpan' => 'ＭＳ Ｐゴシック',
+					'Hang' => '맑은 고딕',
+					'Hans' => '宋体',
+					'Hant' => '新細明體',
+					'Arab' => 'Arial',
+					'Hebr' => 'Arial',
+					'Thai' => 'Tahoma',
+					'Ethi' => 'Nyala',
+					'Beng' => 'Vrinda',
+					'Gujr' => 'Shruti',
+					'Khmr' => 'DaunPenh',
+					'Knda' => 'Tunga',
+					'Guru' => 'Raavi',
+					'Cans' => 'Euphemia',
+					'Cher' => 'Plantagenet Cherokee',
+					'Yiii' => 'Microsoft Yi Baiti',
+					'Tibt' => 'Microsoft Himalaya',
+					'Thaa' => 'MV Boli',
+					'Deva' => 'Mangal',
+					'Telu' => 'Gautami',
+					'Taml' => 'Latha',
+					'Syrc' => 'Estrangelo Edessa',
+					'Orya' => 'Kalinga',
+					'Mlym' => 'Kartika',
+					'Laoo' => 'DokChampa',
+					'Sinh' => 'Iskoola Pota',
+					'Mong' => 'Mongolian Baiti',
+					'Viet' => 'Arial',
+					'Uigh' => 'Microsoft Uighur',
+					'Geor' => 'Sylfaen',
+			);
+
+	/**
+	 * Map of core colours
+	 * @static	array of string
+	 *
+	 */
+		private static $_colourScheme = array(
+					'dk2'		=> '1F497D',
+					'lt2'		=> 'EEECE1',
+					'accent1'	=> '4F81BD',
+					'accent2'	=> 'C0504D',
+					'accent3'	=> '9BBB59',
+					'accent4'	=> '8064A2',
+					'accent5'	=> '4BACC6',
+					'accent6'	=> 'F79646',
+					'hlink'		=> '0000FF',
+					'folHlink'	=> '800080',
+			);
+			
 	/**
 	 * Write theme to XML format
 	 *
@@ -63,7 +157,6 @@ class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPa
 				// a:themeElements
 				$objWriter->startElement('a:themeElements');
 
-					{
 					// a:clrScheme
 					$objWriter->startElement('a:clrScheme');
 					$objWriter->writeAttribute('name', 'Office');
@@ -91,505 +184,26 @@ class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPa
 						$objWriter->endElement();
 
 						// a:dk2
-						$objWriter->startElement('a:dk2');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', '1F497D');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:lt2
-						$objWriter->startElement('a:lt2');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', 'EEECE1');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:accent1
-						$objWriter->startElement('a:accent1');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', '4F81BD');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:accent2
-						$objWriter->startElement('a:accent2');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', 'C0504D');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:accent3
-						$objWriter->startElement('a:accent3');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', '9BBB59');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:accent4
-						$objWriter->startElement('a:accent4');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', '8064A2');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:accent5
-						$objWriter->startElement('a:accent5');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', '4BACC6');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:accent6
-						$objWriter->startElement('a:accent6');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', 'F79646');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:hlink
-						$objWriter->startElement('a:hlink');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', '0000FF');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
-
-						// a:folHlink
-						$objWriter->startElement('a:folHlink');
-
-							// a:sysClr
-							$objWriter->startElement('a:srgbClr');
-							$objWriter->writeAttribute('val', '800080');
-							$objWriter->endElement();
-
-						$objWriter->endElement();
+						$this->_writeColourScheme($objWriter);
 
 					$objWriter->endElement();
-					}
 
-					{
 					// a:fontScheme
 					$objWriter->startElement('a:fontScheme');
 					$objWriter->writeAttribute('name', 'Office');
 
 						// a:majorFont
 						$objWriter->startElement('a:majorFont');
-
-							// a:latin
-							$objWriter->startElement('a:latin');
-							$objWriter->writeAttribute('typeface', 'Cambria');
-							$objWriter->endElement();
-
-							// a:ea
-							$objWriter->startElement('a:ea');
-							$objWriter->writeAttribute('typeface', '');
-							$objWriter->endElement();
-
-							// a:cs
-							$objWriter->startElement('a:cs');
-							$objWriter->writeAttribute('typeface', '');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Jpan');
-							$objWriter->writeAttribute('typeface', '?? ?????');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hang');
-							$objWriter->writeAttribute('typeface', '?? ??');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hans');
-							$objWriter->writeAttribute('typeface', '??');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hant');
-							$objWriter->writeAttribute('typeface', '????');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Arab');
-							$objWriter->writeAttribute('typeface', 'Times New Roman');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hebr');
-							$objWriter->writeAttribute('typeface', 'Times New Roman');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Thai');
-							$objWriter->writeAttribute('typeface', 'Tahoma');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Ethi');
-							$objWriter->writeAttribute('typeface', 'Nyala');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Beng');
-							$objWriter->writeAttribute('typeface', 'Vrinda');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Gujr');
-							$objWriter->writeAttribute('typeface', 'Shruti');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Khmr');
-							$objWriter->writeAttribute('typeface', 'MoolBoran');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Knda');
-							$objWriter->writeAttribute('typeface', 'Tunga');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Guru');
-							$objWriter->writeAttribute('typeface', 'Raavi');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Cans');
-							$objWriter->writeAttribute('typeface', 'Euphemia');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Cher');
-							$objWriter->writeAttribute('typeface', 'Plantagenet Cherokee');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Yiii');
-							$objWriter->writeAttribute('typeface', 'Microsoft Yi Baiti');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Tibt');
-							$objWriter->writeAttribute('typeface', 'Microsoft Himalaya');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Thaa');
-							$objWriter->writeAttribute('typeface', 'MV Boli');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Deva');
-							$objWriter->writeAttribute('typeface', 'Mangal');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Telu');
-							$objWriter->writeAttribute('typeface', 'Gautami');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Taml');
-							$objWriter->writeAttribute('typeface', 'Latha');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Syrc');
-							$objWriter->writeAttribute('typeface', 'Estrangelo Edessa');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Orya');
-							$objWriter->writeAttribute('typeface', 'Kalinga');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Mlym');
-							$objWriter->writeAttribute('typeface', 'Kartika');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Laoo');
-							$objWriter->writeAttribute('typeface', 'DokChampa');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Sinh');
-							$objWriter->writeAttribute('typeface', 'Iskoola Pota');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Mong');
-							$objWriter->writeAttribute('typeface', 'Mongolian Baiti');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Viet');
-							$objWriter->writeAttribute('typeface', 'Times New Roman');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Uigh');
-							$objWriter->writeAttribute('typeface', 'Microsoft Uighur');
-							$objWriter->endElement();
-
+							$this->_writeFonts($objWriter, 'Cambria', self::$_majorFonts);
 						$objWriter->endElement();
 
 						// a:minorFont
 						$objWriter->startElement('a:minorFont');
-
-							// a:latin
-							$objWriter->startElement('a:latin');
-							$objWriter->writeAttribute('typeface', 'Calibri');
-							$objWriter->endElement();
-
-							// a:ea
-							$objWriter->startElement('a:ea');
-							$objWriter->writeAttribute('typeface', '');
-							$objWriter->endElement();
-
-							// a:cs
-							$objWriter->startElement('a:cs');
-							$objWriter->writeAttribute('typeface', '');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Jpan');
-							$objWriter->writeAttribute('typeface', '?? ?????');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hang');
-							$objWriter->writeAttribute('typeface', '?? ??');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hans');
-							$objWriter->writeAttribute('typeface', '??');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hant');
-							$objWriter->writeAttribute('typeface', '????');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Arab');
-							$objWriter->writeAttribute('typeface', 'Arial');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Hebr');
-							$objWriter->writeAttribute('typeface', 'Arial');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Thai');
-							$objWriter->writeAttribute('typeface', 'Tahoma');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Ethi');
-							$objWriter->writeAttribute('typeface', 'Nyala');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Beng');
-							$objWriter->writeAttribute('typeface', 'Vrinda');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Gujr');
-							$objWriter->writeAttribute('typeface', 'Shruti');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Khmr');
-							$objWriter->writeAttribute('typeface', 'DaunPenh');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Knda');
-							$objWriter->writeAttribute('typeface', 'Tunga');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Guru');
-							$objWriter->writeAttribute('typeface', 'Raavi');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Cans');
-							$objWriter->writeAttribute('typeface', 'Euphemia');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Cher');
-							$objWriter->writeAttribute('typeface', 'Plantagenet Cherokee');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Yiii');
-							$objWriter->writeAttribute('typeface', 'Microsoft Yi Baiti');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Tibt');
-							$objWriter->writeAttribute('typeface', 'Microsoft Himalaya');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Thaa');
-							$objWriter->writeAttribute('typeface', 'MV Boli');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Deva');
-							$objWriter->writeAttribute('typeface', 'Mangal');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Telu');
-							$objWriter->writeAttribute('typeface', 'Gautami');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Taml');
-							$objWriter->writeAttribute('typeface', 'Latha');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Syrc');
-							$objWriter->writeAttribute('typeface', 'Estrangelo Edessa');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Orya');
-							$objWriter->writeAttribute('typeface', 'Kalinga');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Mlym');
-							$objWriter->writeAttribute('typeface', 'Kartika');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Laoo');
-							$objWriter->writeAttribute('typeface', 'DokChampa');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Sinh');
-							$objWriter->writeAttribute('typeface', 'Iskoola Pota');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Mong');
-							$objWriter->writeAttribute('typeface', 'Mongolian Baiti');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Viet');
-							$objWriter->writeAttribute('typeface', 'Arial');
-							$objWriter->endElement();
-
-							// a:font
-							$objWriter->startElement('a:font');
-							$objWriter->writeAttribute('script', 'Uigh');
-							$objWriter->writeAttribute('typeface', 'Microsoft Uighur');
-							$objWriter->endElement();
-
+							$this->_writeFonts($objWriter, 'Calibri', self::$_minorFonts);
 						$objWriter->endElement();
 
 					$objWriter->endElement();
-					}
 
-					{
 					// a:fmtScheme
 					$objWriter->startElement('a:fmtScheme');
 					$objWriter->writeAttribute('name', 'Office');
@@ -1184,7 +798,6 @@ class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPa
 						$objWriter->endElement();
 
 					$objWriter->endElement();
-					}
 
 				$objWriter->endElement();
 
@@ -1199,4 +812,60 @@ class PHPExcel_Writer_Excel2007_Theme extends PHPExcel_Writer_Excel2007_WriterPa
 			// Return
 			return $objWriter->getData();
 	}
+
+	/**
+	 * Write fonts to XML format
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter
+	 * @param 	string						$latinFont
+	 * @param 	array of string				$fontSet
+	 * @return 	string 						XML Output
+	 * @throws 	Exception
+	 */
+	private function _writeFonts($objWriter, $latinFont, $fontSet)
+	{
+		// a:latin
+		$objWriter->startElement('a:latin');
+		$objWriter->writeAttribute('typeface', $latinFont);
+		$objWriter->endElement();
+
+		// a:ea
+		$objWriter->startElement('a:ea');
+		$objWriter->writeAttribute('typeface', '');
+		$objWriter->endElement();
+
+		// a:cs
+		$objWriter->startElement('a:cs');
+		$objWriter->writeAttribute('typeface', '');
+		$objWriter->endElement();
+
+		foreach($fontSet as $fontScript => $typeface) {
+			$objWriter->startElement('a:font');
+				$objWriter->writeAttribute('script', $fontScript);
+				$objWriter->writeAttribute('typeface', $typeface);
+			$objWriter->endElement();
+		}
+
+	}
+
+	/**
+	 * Write colour scheme to XML format
+	 *
+	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter
+	 * @return 	string 						XML Output
+	 * @throws 	Exception
+	 */
+	private function _writeColourScheme($objWriter)
+	{
+		foreach(self::$_colourScheme as $colourName => $colourValue) {
+			$objWriter->startElement('a:'.$colourName);
+
+				$objWriter->startElement('a:srgbClr');
+					$objWriter->writeAttribute('val', $colourValue);
+				$objWriter->endElement();
+
+			$objWriter->endElement();
+		}
+						
+	}
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Workbook.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Workbook.php
index 6bc8b5a75ac..bbd2f927e9e 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Workbook.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Workbook.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_WriterPart
 {
@@ -39,10 +39,11 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
 	 * Write workbook to XML format
 	 *
 	 * @param 	PHPExcel	$pPHPExcel
+	 * @param	boolean		$recalcRequired	Indicate whether formulas should be recalculated before writing
 	 * @return 	string 		XML Output
 	 * @throws 	Exception
 	 */
-	public function writeWorkbook(PHPExcel $pPHPExcel = null)
+	public function writeWorkbook(PHPExcel $pPHPExcel = null, $recalcRequired = FALSE)
 	{
 		// Create XML writer
 		$objWriter = null;
@@ -82,7 +83,7 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
 			$this->_writeDefinedNames($objWriter, $pPHPExcel);
 
 			// calcPr
-			$this->_writeCalcPr($objWriter);
+			$this->_writeCalcPr($objWriter,$recalcRequired);
 
 		$objWriter->endElement();
 
@@ -185,16 +186,18 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
 	/**
 	 * Write calcPr
 	 *
-	 * @param 	PHPExcel_Shared_XMLWriter $objWriter 		XML Writer
+	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
+	 * @param	boolean						$recalcRequired	Indicate whether formulas should be recalculated before writing
 	 * @throws 	Exception
 	 */
-	private function _writeCalcPr(PHPExcel_Shared_XMLWriter $objWriter = null)
+	private function _writeCalcPr(PHPExcel_Shared_XMLWriter $objWriter = null, $recalcRequired = TRUE)
 	{
 		$objWriter->startElement('calcPr');
 
 		$objWriter->writeAttribute('calcId', 			'124519');
 		$objWriter->writeAttribute('calcMode', 			'auto');
-		$objWriter->writeAttribute('fullCalcOnLoad', 	'1');
+		//	fullCalcOnLoad isn't needed if we've recalculating for the save
+		$objWriter->writeAttribute('fullCalcOnLoad', 	($recalcRequired) ? '0' : '1');
 
 		$objWriter->endElement();
 	}
@@ -303,7 +306,7 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
 	}
 
 	/**
-	 * Write Defined Name for autoFilter
+	 * Write Defined Name for named range
 	 *
 	 * @param 	PHPExcel_Shared_XMLWriter	$objWriter 		XML Writer
 	 * @param 	PHPExcel_NamedRange			$pNamedRange
@@ -344,15 +347,21 @@ class PHPExcel_Writer_Excel2007_Workbook extends PHPExcel_Writer_Excel2007_Write
 	private function _writeDefinedNameForAutofilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $pSheetId = 0)
 	{
 		// definedName for autoFilter
-		if ($pSheet->getAutoFilter() != '') {
+		$autoFilterRange = $pSheet->getAutoFilter()->getRange();
+		if (!empty($autoFilterRange)) {
 			$objWriter->startElement('definedName');
 			$objWriter->writeAttribute('name',			'_xlnm._FilterDatabase');
 			$objWriter->writeAttribute('localSheetId',	$pSheetId);
 			$objWriter->writeAttribute('hidden',		'1');
 
 			// Create absolute coordinate and write as raw text
-			$range = PHPExcel_Cell::splitRange($pSheet->getAutoFilter());
+			$range = PHPExcel_Cell::splitRange($autoFilterRange);
 			$range = $range[0];
+			//	Strip any worksheet ref so we can make the cell ref absolute
+			if (strpos($range[0],'!') !== false) {
+				list($ws,$range[0]) = explode('!',$range[0]);
+			}
+
 			$range[0] = PHPExcel_Cell::absoluteCoordinate($range[0]);
 			$range[1] = PHPExcel_Cell::absoluteCoordinate($range[1]);
 			$range = implode(':', $range);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Worksheet.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Worksheet.php
index a84b0752487..f720af338bf 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Worksheet.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/Worksheet.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_WriterPart
 {
@@ -40,10 +40,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 	 *
 	 * @param	PHPExcel_Worksheet		$pSheet
 	 * @param	string[]				$pStringTable
+	 * @param	boolean					$includeCharts	Flag indicating if we should write charts
 	 * @return	string					XML Output
 	 * @throws	Exception
 	 */
-	public function writeWorksheet($pSheet = null, $pStringTable = null)
+	public function writeWorksheet($pSheet = null, $pStringTable = null, $includeCharts = FALSE)
 	{
 		if (!is_null($pSheet)) {
 			// Create XML writer
@@ -117,8 +118,8 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 				// Breaks
 				$this->_writeBreaks($objWriter, $pSheet);
 
-				// Drawings
-				$this->_writeDrawings($objWriter, $pSheet);
+				// Drawings and/or Charts
+				$this->_writeDrawings($objWriter, $pSheet, $includeCharts);
 
 				// LegacyDrawing
 				$this->_writeLegacyDrawing($objWriter, $pSheet);
@@ -147,6 +148,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 		// sheetPr
 		$objWriter->startElement('sheetPr');
 		//$objWriter->writeAttribute('codeName',		$pSheet->getTitle());
+			$autoFilterRange = $pSheet->getAutoFilter()->getRange();
+			if (!empty($autoFilterRange)) {
+				$objWriter->writeAttribute('filterMode', 1);
+				$pSheet->getAutoFilter()->showHideRows();
+			}
 
 			// tabColor
 			if ($pSheet->isTabColorSet()) {
@@ -193,7 +199,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 	 * @param	PHPExcel_Worksheet					$pSheet			Worksheet
 	 * @throws	Exception
 	 */
-	private function _writeSheetViews(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+	private function _writeSheetViews(PHPExcel_Shared_XMLWriter $objWriter = NULL, PHPExcel_Worksheet $pSheet = NULL)
 	{
 		// sheetViews
 		$objWriter->startElement('sheetViews');
@@ -217,6 +223,11 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 					$objWriter->writeAttribute('zoomScaleNormal',	$pSheet->getSheetView()->getZoomScaleNormal());
 				}
 
+				// View Layout Type
+				if ($pSheet->getSheetView()->getView() !== PHPExcel_Worksheet_SheetView::SHEETVIEW_NORMAL) {
+					$objWriter->writeAttribute('view',	$pSheet->getSheetView()->getView());
+				}
+
 				// Gridlines
 				if ($pSheet->getShowGridlines()) {
 					$objWriter->writeAttribute('showGridLines',	'true');
@@ -271,15 +282,17 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 				}
 
 				// Selection
-				if ($pane != '') {
+//				if ($pane != '') {
 					//	Only need to write selection element if we have a split pane
 					//		We cheat a little by over-riding the active cell selection, setting it to the split cell
 					$objWriter->startElement('selection');
-					$objWriter->writeAttribute('pane', $pane);
+					if ($pane != '') {
+						$objWriter->writeAttribute('pane', $pane);
+					}
 					$objWriter->writeAttribute('activeCell', $activeCell);
 					$objWriter->writeAttribute('sqref', $activeCell);
 					$objWriter->endElement();
-				}
+//				}
 
 			$objWriter->endElement();
 
@@ -303,7 +316,13 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 				$objWriter->writeAttribute('customHeight',		'true');
 				$objWriter->writeAttribute('defaultRowHeight',	PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
 			} else {
-				$objWriter->writeAttribute('defaultRowHeight', '12.75');
+				$objWriter->writeAttribute('defaultRowHeight', '14.4');
+			}
+
+			// Set Zero Height row
+			if ((string)$pSheet->getDefaultRowDimension()->getzeroHeight()  == '1' ||
+				strtolower((string)$pSheet->getDefaultRowDimension()->getzeroHeight()) == 'true' ) {
+				$objWriter->writeAttribute('zeroHeight', '1');
 			}
 
 			// Default column width
@@ -413,21 +432,21 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 			$objWriter->writeAttribute('password',				$pSheet->getProtection()->getPassword());
 		}
 
-		$objWriter->writeAttribute('sheet',				($pSheet->getProtection()->getSheet()				? 'true' : 'false'));
-		$objWriter->writeAttribute('objects',				($pSheet->getProtection()->getObjects()			? 'true' : 'false'));
-		$objWriter->writeAttribute('scenarios',			($pSheet->getProtection()->getScenarios()			? 'true' : 'false'));
-		$objWriter->writeAttribute('formatCells',			($pSheet->getProtection()->getFormatCells()		? 'true' : 'false'));
-		$objWriter->writeAttribute('formatColumns',		($pSheet->getProtection()->getFormatColumns()		? 'true' : 'false'));
+		$objWriter->writeAttribute('sheet',					($pSheet->getProtection()->getSheet()				? 'true' : 'false'));
+		$objWriter->writeAttribute('objects',				($pSheet->getProtection()->getObjects()				? 'true' : 'false'));
+		$objWriter->writeAttribute('scenarios',				($pSheet->getProtection()->getScenarios()			? 'true' : 'false'));
+		$objWriter->writeAttribute('formatCells',			($pSheet->getProtection()->getFormatCells()			? 'true' : 'false'));
+		$objWriter->writeAttribute('formatColumns',			($pSheet->getProtection()->getFormatColumns()		? 'true' : 'false'));
 		$objWriter->writeAttribute('formatRows',			($pSheet->getProtection()->getFormatRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('insertColumns',		($pSheet->getProtection()->getInsertColumns()		? 'true' : 'false'));
+		$objWriter->writeAttribute('insertColumns',			($pSheet->getProtection()->getInsertColumns()		? 'true' : 'false'));
 		$objWriter->writeAttribute('insertRows',			($pSheet->getProtection()->getInsertRows()			? 'true' : 'false'));
 		$objWriter->writeAttribute('insertHyperlinks',		($pSheet->getProtection()->getInsertHyperlinks()	? 'true' : 'false'));
-		$objWriter->writeAttribute('deleteColumns',		($pSheet->getProtection()->getDeleteColumns()		? 'true' : 'false'));
+		$objWriter->writeAttribute('deleteColumns',			($pSheet->getProtection()->getDeleteColumns()		? 'true' : 'false'));
 		$objWriter->writeAttribute('deleteRows',			($pSheet->getProtection()->getDeleteRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('selectLockedCells',	($pSheet->getProtection()->getSelectLockedCells()	? 'true' : 'false'));
+		$objWriter->writeAttribute('selectLockedCells',		($pSheet->getProtection()->getSelectLockedCells()	? 'true' : 'false'));
 		$objWriter->writeAttribute('sort',					($pSheet->getProtection()->getSort()				? 'true' : 'false'));
 		$objWriter->writeAttribute('autoFilter',			($pSheet->getProtection()->getAutoFilter()			? 'true' : 'false'));
-		$objWriter->writeAttribute('pivotTables',			($pSheet->getProtection()->getPivotTables()		? 'true' : 'false'));
+		$objWriter->writeAttribute('pivotTables',			($pSheet->getProtection()->getPivotTables()			? 'true' : 'false'));
 		$objWriter->writeAttribute('selectUnlockedCells',	($pSheet->getProtection()->getSelectUnlockedCells()	? 'true' : 'false'));
 		$objWriter->endElement();
 	}
@@ -451,7 +470,6 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 				// if ($this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ) == '') {
 				//	continue;
 				// }
-
 				if ($conditional->getConditionType() != PHPExcel_Style_Conditional::CONDITION_NONE) {
 					// conditionalFormatting
 					$objWriter->startElement('conditionalFormatting');
@@ -521,7 +539,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 		$dataValidationCollection = $pSheet->getDataValidationCollection();
 
 		// Write data validations?
-		if (count($dataValidationCollection) > 0) {
+		if (!empty($dataValidationCollection)) {
 			$objWriter->startElement('dataValidations');
 			$objWriter->writeAttribute('count', count($dataValidationCollection));
 
@@ -590,7 +608,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 		$relationId = 1;
 
 		// Write hyperlinks?
-		if (count($hyperlinkCollection) > 0) {
+		if (!empty($hyperlinkCollection)) {
 			$objWriter->startElement('hyperlinks');
 
 			foreach ($hyperlinkCollection as $coordinate => $hyperlink) {
@@ -722,10 +740,85 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 	 */
 	private function _writeAutoFilter(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
 	{
-		if ($pSheet->getAutoFilter() != '') {
+		$autoFilterRange = $pSheet->getAutoFilter()->getRange();
+		if (!empty($autoFilterRange)) {
 			// autoFilter
 			$objWriter->startElement('autoFilter');
-			$objWriter->writeAttribute('ref',		$pSheet->getAutoFilter());
+
+			// Strip any worksheet reference from the filter coordinates
+			$range = PHPExcel_Cell::splitRange($autoFilterRange);
+			$range = $range[0];
+			//	Strip any worksheet ref
+			if (strpos($range[0],'!') !== false) {
+				list($ws,$range[0]) = explode('!',$range[0]);
+			}
+			$range = implode(':', $range);
+
+			$objWriter->writeAttribute('ref',	str_replace('$','',$range));
+
+			$columns = $pSheet->getAutoFilter()->getColumns();
+			if (count($columns > 0)) {
+				foreach($columns as $columnID => $column) {
+					$rules = $column->getRules();
+					if (count($rules > 0)) {
+						$objWriter->startElement('filterColumn');
+							$objWriter->writeAttribute('colId',	$pSheet->getAutoFilter()->getColumnOffset($columnID));
+
+							$objWriter->startElement( $column->getFilterType());
+								if ($column->getJoin() == PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_COLUMN_JOIN_AND) {
+									$objWriter->writeAttribute('and',	1);
+								}
+
+								foreach ($rules as $rule) {
+									if (($column->getFilterType() === PHPExcel_Worksheet_AutoFilter_Column::AUTOFILTER_FILTERTYPE_FILTER) &&
+										($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
+										($rule->getValue() === '')) {
+										//	Filter rule for Blanks
+										$objWriter->writeAttribute('blank',	1);
+									} elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
+										//	Dynamic Filter Rule
+										$objWriter->writeAttribute('type', $rule->getGrouping());
+										$val = $column->getAttribute('val');
+										if ($val !== NULL) {
+											$objWriter->writeAttribute('val', $val);
+										}
+										$maxVal = $column->getAttribute('maxVal');
+										if ($maxVal !== NULL) {
+											$objWriter->writeAttribute('maxVal', $maxVal);
+										}
+									} elseif($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_TOPTENFILTER) {
+										//	Top 10 Filter Rule
+										$objWriter->writeAttribute('val',	$rule->getValue());
+										$objWriter->writeAttribute('percent',	(($rule->getOperator() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT) ? '1' : '0'));
+										$objWriter->writeAttribute('top',	(($rule->getGrouping() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_TOP) ? '1': '0'));
+									} else {
+										//	Filter, DateGroupItem or CustomFilter
+										$objWriter->startElement($rule->getRuleType());
+
+											if ($rule->getOperator() !== PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_COLUMN_RULE_EQUAL) {
+												$objWriter->writeAttribute('operator',	$rule->getOperator());
+											}
+											if ($rule->getRuleType() === PHPExcel_Worksheet_AutoFilter_Column_Rule::AUTOFILTER_RULETYPE_DATEGROUP) {
+												// Date Group filters
+												foreach($rule->getValue() as $key => $value) {
+													if ($value > '') $objWriter->writeAttribute($key,	$value);
+												}
+												$objWriter->writeAttribute('dateTimeGrouping',	$rule->getGrouping());
+											} else {
+												$objWriter->writeAttribute('val',	$rule->getValue());
+											}
+
+										$objWriter->endElement();
+									}
+								}
+
+							$objWriter->endElement();
+
+						$objWriter->endElement();
+					}
+				}
+			}
+
 			$objWriter->endElement();
 		}
 	}
@@ -811,7 +904,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 		}
 
 		// rowBreaks
-		if (count($aRowBreaks) > 0) {
+		if (!empty($aRowBreaks)) {
 			$objWriter->startElement('rowBreaks');
 			$objWriter->writeAttribute('count',			count($aRowBreaks));
 			$objWriter->writeAttribute('manualBreakCount',	count($aRowBreaks));
@@ -829,7 +922,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 		}
 
 		// Second, write column breaks
-		if (count($aColumnBreaks) > 0) {
+		if (!empty($aColumnBreaks)) {
 			$objWriter->startElement('colBreaks');
 			$objWriter->writeAttribute('count',			count($aColumnBreaks));
 			$objWriter->writeAttribute('manualBreakCount',	count($aColumnBreaks));
@@ -947,7 +1040,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 	 *
 	 * @param	PHPExcel_Shared_XMLWriter	$objWriter				XML Writer
 	 * @param	PHPExcel_Worksheet			$pSheet					Worksheet
-	 * @param	PHPExcel_Cell				$pCell					Cell
+	 * @param	PHPExcel_Cell				$pCellAddress			Cell Address
 	 * @param	string[]					$pStringTable			String table
 	 * @param	string[]					$pFlippedStringTable	String table (flipped), for faster index searching
 	 * @throws	Exception
@@ -1069,14 +1162,17 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 	/**
 	 * Write Drawings
 	 *
-	 * @param	PHPExcel_Shared_XMLWriter		$objWriter		XML Writer
-	 * @param	PHPExcel_Worksheet				$pSheet			Worksheet
+	 * @param	PHPExcel_Shared_XMLWriter	$objWriter		XML Writer
+	 * @param	PHPExcel_Worksheet			$pSheet			Worksheet
+	 * @param	boolean						$includeCharts	Flag indicating if we should include drawing details for charts
 	 * @throws	Exception
 	 */
-	private function _writeDrawings(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
+	private function _writeDrawings(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null, $includeCharts = FALSE)
 	{
+		$chartCount = ($includeCharts) ? $pSheet->getChartCollection()->count() : 0;
 		// If sheet contains drawings, add the relationships
-		if ($pSheet->getDrawingCollection()->count() > 0) {
+		if (($pSheet->getDrawingCollection()->count() > 0) ||
+			($chartCount > 0)) {
 			$objWriter->startElement('drawing');
 			$objWriter->writeAttribute('r:id', 'rId1');
 			$objWriter->endElement();
@@ -1109,7 +1205,7 @@ class PHPExcel_Writer_Excel2007_Worksheet extends PHPExcel_Writer_Excel2007_Writ
 	 */
 	private function _writeLegacyDrawingHF(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
 	{
-		// If sheet contains comments, add the relationships
+		// If sheet contains images, add the relationships
 		if (count($pSheet->getHeaderFooter()->getImages()) > 0) {
 			$objWriter->startElement('legacyDrawingHF');
 			$objWriter->writeAttribute('r:id', 'rId_headerfooter_vml1');
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/WriterPart.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/WriterPart.php
index 638cbb62c2a..3f5069182e2 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/WriterPart.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel2007/WriterPart.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel2007
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 abstract class PHPExcel_Writer_Excel2007_WriterPart
 {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5.php
index f69bc4d5cdb..9297c78baed 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 {
@@ -49,13 +49,6 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 	 */
 	private $_phpExcel;
 
-	/**
-	 * The BIFF version of the written Excel file, BIFF5 = 0x0500, BIFF8 = 0x0600
-	 *
-	 * @var integer
-	 */
-	private $_BIFF_version	= 0x0600;
-
 	/**
 	 * Total number of shared strings in workbook
 	 *
@@ -98,6 +91,19 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 	 */
 	private $_IDCLs;
 
+	/**
+	 * Basic OLE object summary information
+	 *
+	 * @var array
+	 */
+	private $_summaryInformation;
+
+	/**
+	 * Extended OLE object document summary information
+	 *
+	 * @var array
+	 */
+	private $_documentSummaryInformation;
 
 	/**
 	 * Create a new PHPExcel_Writer_Excel5
@@ -105,15 +111,15 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 	 * @param	PHPExcel	$phpExcel	PHPExcel object
 	 */
 	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel		= $phpExcel;
+		$this->_phpExcel	= $phpExcel;
 
-		$this->_parser			= new PHPExcel_Writer_Excel5_Parser($this->_BIFF_version);
+		$this->_parser		= new PHPExcel_Writer_Excel5_Parser();
 	}
 
 	/**
 	 * Save PHPExcel to file
 	 *
-	 * @param	string		$pFileName
+	 * @param	string		$pFilename
 	 * @throws	Exception
 	 */
 	public function save($pFilename = null) {
@@ -130,18 +136,18 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 		$this->_colors          = array();
 
 		// Initialise workbook writer
-		$this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel, $this->_BIFF_version,
-					$this->_str_total, $this->_str_unique, $this->_str_table, $this->_colors, $this->_parser);
+		$this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel,
+																	 $this->_str_total, $this->_str_unique, $this->_str_table,
+																	 $this->_colors, $this->_parser);
 
 		// Initialise worksheet writers
 		$countSheets = $this->_phpExcel->getSheetCount();
 		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_BIFF_version,
-									   $this->_str_total, $this->_str_unique,
-									   $this->_str_table, $this->_colors,
-									   $this->_parser,
-									   $this->_preCalculateFormulas,
-									   $this->_phpExcel->getSheet($i));
+			$this->_writerWorksheets[$i] = new PHPExcel_Writer_Excel5_Worksheet($this->_str_total, $this->_str_unique,
+																			   $this->_str_table, $this->_colors,
+																			   $this->_parser,
+																			   $this->_preCalculateFormulas,
+																			   $this->_phpExcel->getSheet($i));
 		}
 
 		// build Escher objects. Escher objects for workbooks needs to be build before Escher object for workbook.
@@ -160,8 +166,25 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 			$this->_writerWorkbook->addXfWriter($style, false);
 		}
 
+		// add fonts from rich text eleemnts
+		for ($i = 0; $i < $countSheets; ++$i) {
+			foreach ($this->_writerWorksheets[$i]->_phpSheet->getCellCollection() as $cellID) {
+				$cell = $this->_writerWorksheets[$i]->_phpSheet->getCell($cellID);
+				$cVal = $cell->getValue();
+				if ($cVal instanceof PHPExcel_RichText) {
+					$elements = $cVal->getRichTextElements();
+					foreach ($elements as $element) {
+						if ($element instanceof PHPExcel_RichText_Run) {
+							$font = $element->getFont();
+							$this->_writerWorksheets[$i]->_fntHashIndex[$font->getHashCode()] = $this->_writerWorkbook->_addFont($font);
+						}
+					}
+				}
+			}
+		}
+
 		// initialize OLE file
-		$workbookStreamName = ($this->_BIFF_version == 0x0600) ? 'Workbook' : 'Book';
+		$workbookStreamName = 'Workbook';
 		$OLE = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs($workbookStreamName));
 
 		// Write the worksheet streams before the global workbook stream,
@@ -180,7 +203,32 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 			$OLE->append($this->_writerWorksheets[$i]->getData());
 		}
 
-		$root = new PHPExcel_Shared_OLE_PPS_Root(time(), time(), array($OLE));
+		$this->_documentSummaryInformation = $this->_writeDocumentSummaryInformation();
+		// initialize OLE Document Summary Information
+		if(isset($this->_documentSummaryInformation) && !empty($this->_documentSummaryInformation)){
+			$OLE_DocumentSummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'DocumentSummaryInformation'));
+			$OLE_DocumentSummaryInformation->append($this->_documentSummaryInformation);
+		}
+
+		$this->_summaryInformation = $this->_writeSummaryInformation();
+		// initialize OLE Summary Information
+		if(isset($this->_summaryInformation) && !empty($this->_summaryInformation)){
+		  $OLE_SummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'SummaryInformation'));
+		  $OLE_SummaryInformation->append($this->_summaryInformation);
+		}
+
+		// define OLE Parts
+		$arrRootData = array($OLE);
+		// initialize OLE Properties file
+		if(isset($OLE_SummaryInformation)){
+			$arrRootData[] = $OLE_SummaryInformation;
+		}
+		// initialize OLE Extended Properties file
+		if(isset($OLE_DocumentSummaryInformation)){
+			$arrRootData[] = $OLE_DocumentSummaryInformation;
+		}
+
+		$root = new PHPExcel_Shared_OLE_PPS_Root(time(), time(), $arrRootData);
 		// save the OLE file
 		$res = $root->save($pFilename);
 
@@ -218,10 +266,16 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 		$this->_preCalculateFormulas = $pValue;
 	}
 
+	/**
+	 * Build the Worksheet Escher objects
+	 *
+	 */
 	private function _buildWorksheetEschers()
 	{
 		// 1-based index to BstoreContainer
 		$blipIndex = 0;
+		$lastReducedSpId = 0;
+		$lastSpId = 0;
 
 		foreach ($this->_phpExcel->getAllsheets() as $sheet) {
 			// sheet index
@@ -230,7 +284,8 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 			$escher = null;
 
 			// check if there are any shapes for this sheet
-			if (count($sheet->getDrawingCollection()) == 0) {
+			$filterRange = $sheet->getAutoFilter()->getRange();
+			if (count($sheet->getDrawingCollection()) == 0 && empty($filterRange)) {
 				continue;
 			}
 
@@ -270,6 +325,8 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 
 				// set the shape type
 				$spContainer->setSpType(0x004B);
+				// set the shape flag
+				$spContainer->setSpFlag(0x02);
 
 				// set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
 				$reducedSpId = $countShapes[$sheetIndex];
@@ -305,6 +362,64 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 				$spgrContainer->addChild($spContainer);
 			}
 
+			// AutoFilters
+			if(!empty($filterRange)){
+				$rangeBounds = PHPExcel_Cell::rangeBoundaries($filterRange);
+				$iNumColStart = $rangeBounds[0][0];
+				$iNumColEnd = $rangeBounds[1][0];
+
+				$iInc = $iNumColStart;
+				while($iInc <= $iNumColEnd){
+					++$countShapes[$sheetIndex];
+
+					// create an Drawing Object for the dropdown
+					$oDrawing  = new PHPExcel_Worksheet_BaseDrawing();
+					// get the coordinates of drawing
+					$cDrawing   = PHPExcel_Cell::stringFromColumnIndex($iInc - 1) . $rangeBounds[0][1];
+					$oDrawing->setCoordinates($cDrawing);
+					$oDrawing->setWorksheet($sheet);
+
+					// add the shape
+					$spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
+					// set the shape type
+					$spContainer->setSpType(0x00C9);
+					// set the shape flag
+					$spContainer->setSpFlag(0x01);
+
+					// set the shape index (we combine 1-based sheet index and $countShapes to create unique shape index)
+					$reducedSpId = $countShapes[$sheetIndex];
+					$spId = $reducedSpId
+						| ($sheet->getParent()->getIndex($sheet) + 1) << 10;
+					$spContainer->setSpId($spId);
+
+					// keep track of last reducedSpId
+					$lastReducedSpId = $reducedSpId;
+
+					// keep track of last spId
+					$lastSpId = $spId;
+
+					$spContainer->setOPT(0x007F, 0x01040104); // Protection -> fLockAgainstGrouping
+					$spContainer->setOPT(0x00BF, 0x00080008); // Text -> fFitTextToShape
+					$spContainer->setOPT(0x01BF, 0x00010000); // Fill Style -> fNoFillHitTest
+					$spContainer->setOPT(0x01FF, 0x00080000); // Line Style -> fNoLineDrawDash
+					$spContainer->setOPT(0x03BF, 0x000A0000); // Group Shape -> fPrint
+
+					// set coordinates and offsets, client anchor
+					$endCoordinates = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::stringFromColumnIndex($iInc - 1));
+					$endCoordinates .= $rangeBounds[0][1] + 1;
+
+					$spContainer->setStartCoordinates($cDrawing);
+					$spContainer->setStartOffsetX(0);
+					$spContainer->setStartOffsetY(0);
+					$spContainer->setEndCoordinates($endCoordinates);
+					$spContainer->setEndOffsetX(0);
+					$spContainer->setEndOffsetY(0);
+
+					$spgrContainer->addChild($spContainer);
+					$iInc++;
+				}
+			}
+
 			// identifier clusters, used for workbook Escher object
 			$this->_IDCLs[$dgId] = $lastReducedSpId;
 
@@ -328,6 +443,7 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 		foreach ($this->_phpExcel->getAllSheets() as $sheet) {
 			if (count($sheet->getDrawingCollection()) > 0) {
 				$found = true;
+				break;
 			}
 		}
 
@@ -465,4 +581,381 @@ class PHPExcel_Writer_Excel5 implements PHPExcel_Writer_IWriter
 		$this->_writerWorkbook->setEscher($escher);
 	}
 
-}
+	/**
+	 * Build the OLE Part for DocumentSummary Information
+	 * @return string
+	 */
+	private function _writeDocumentSummaryInformation(){
+
+		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+		$data = pack('v', 0xFFFE);
+		// offset: 2; size: 2;
+		$data .= pack('v', 0x0000);
+		// offset: 4; size: 2; OS version
+		$data .= pack('v', 0x0106);
+		// offset: 6; size: 2; OS indicator
+		$data .= pack('v', 0x0002);
+		// offset: 8; size: 16
+		$data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
+		// offset: 24; size: 4; section count
+		$data .= pack('V', 0x0001);
+
+		// offset: 28; size: 16; first section's class id: 02 d5 cd d5 9c 2e 1b 10 93 97 08 00 2b 2c f9 ae
+		$data .= pack('vvvvvvvv', 0xD502, 0xD5CD, 0x2E9C, 0x101B, 0x9793, 0x0008, 0x2C2B, 0xAEF9);
+		// offset: 44; size: 4; offset of the start
+		$data .= pack('V', 0x30);
+
+		// SECTION
+		$dataSection = array();
+		$dataSection_NumProps = 0;
+		$dataSection_Summary = '';
+		$dataSection_Content = '';
+
+		// GKPIDDSI_CODEPAGE: CodePage
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+							   'data'	=> array('data' => 1252));
+		$dataSection_NumProps++;
+
+		// GKPIDDSI_CATEGORY : Category
+		if($this->_phpExcel->getProperties()->getCategory()){
+			$dataProp = $this->_phpExcel->getProperties()->getCategory();
+			$dataProp = 'Test result file';
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x1E),
+								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+			$dataSection_NumProps++;
+		}
+		// GKPIDDSI_VERSION :Version of the application that wrote the property storage
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x17),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x03),
+							   'data'	=> array('pack' => 'V', 'data' => 0x000C0000));
+		$dataSection_NumProps++;
+		// GKPIDDSI_SCALE : FALSE
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0B),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
+							   'data'	=> array('data' => false));
+		$dataSection_NumProps++;
+		// GKPIDDSI_LINKSDIRTY : True if any of the values for the linked properties have changed outside of the application
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x10),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
+							   'data'	=> array('data' => false));
+		$dataSection_NumProps++;
+		// GKPIDDSI_SHAREDOC : FALSE
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
+							   'data'	=> array('data' => false));
+		$dataSection_NumProps++;
+		// GKPIDDSI_HYPERLINKSCHANGED : True if any of the values for the _PID_LINKS (hyperlink text) have changed outside of the application
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x16),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x0B),
+							   'data'	=> array('data' => false));
+		$dataSection_NumProps++;
+
+		// GKPIDDSI_DOCSPARTS
+		// MS-OSHARED p75 (2.3.3.2.2.1)
+		// Structure is VtVecUnalignedLpstrValue (2.3.3.1.9)
+		// cElements
+		$dataProp = pack('v', 0x0001);
+		$dataProp .= pack('v', 0x0000);
+		// array of UnalignedLpstr
+		  // cch
+		  $dataProp .= pack('v', 0x000A);
+		  $dataProp .= pack('v', 0x0000);
+		  // value
+		  $dataProp .= 'Worksheet'.chr(0);
+
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x101E),
+							   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+		$dataSection_NumProps++;
+
+		// GKPIDDSI_HEADINGPAIR
+		// VtVecHeadingPairValue
+		  // cElements
+		  $dataProp = pack('v', 0x0002);
+		  $dataProp .= pack('v', 0x0000);
+		  // Array of vtHeadingPair
+		    // vtUnalignedString - headingString
+		      // stringType
+		      $dataProp .= pack('v', 0x001E);
+		      // padding
+		      $dataProp .= pack('v', 0x0000);
+		      // UnalignedLpstr
+		        // cch
+		        $dataProp .= pack('v', 0x0013);
+		        $dataProp .= pack('v', 0x0000);
+		        // value
+		        $dataProp .= 'Feuilles de calcul';
+		    // vtUnalignedString - headingParts
+		      // wType : 0x0003 = 32 bit signed integer
+		      $dataProp .= pack('v', 0x0300);
+		      // padding
+		      $dataProp .= pack('v', 0x0000);
+		      // value
+		      $dataProp .= pack('v', 0x0100);
+		      $dataProp .= pack('v', 0x0000);
+			  $dataProp .= pack('v', 0x0000);
+		      $dataProp .= pack('v', 0x0000);
+
+        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
+        					   'offset' => array('pack' => 'V'),
+        					   'type' 	=> array('pack' => 'V', 'data' => 0x100C),
+        					   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+        $dataSection_NumProps++;
+
+		// 		4 	Section Length
+		//		4 	Property count
+		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
+		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
+		foreach ($dataSection as $dataProp){
+			// Summary
+			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
+			// Offset
+			$dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
+			// DataType
+			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
+			// Data
+			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
+				$dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+				$dataSection_Content_Offset += 4 + 4;
+			}
+			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
+				$dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+				$dataSection_Content_Offset += 4 + 4;
+			}
+			elseif($dataProp['type']['data'] == 0x0B){ // Boolean
+				if($dataProp['data']['data'] == false){
+					$dataSection_Content .= pack('V', 0x0000);
+				} else {
+					$dataSection_Content .= pack('V', 0x0001);
+				}
+				$dataSection_Content_Offset += 4 + 4;
+			}
+			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
+				// Null-terminated string
+				$dataProp['data']['data'] .= chr(0);
+				$dataProp['data']['length'] += 1;
+				// Complete the string with null string for being a %4
+				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
+
+				$dataSection_Content .= pack('V', $dataProp['data']['length']);
+				$dataSection_Content .= $dataProp['data']['data'];
+
+				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
+			}
+			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+				$dataSection_Content .= $dataProp['data']['data'];
+
+				$dataSection_Content_Offset += 4 + 8;
+			}
+			else {
+				// Data Type Not Used at the moment
+				$dataSection_Content .= $dataProp['data']['data'];
+
+				$dataSection_Content_Offset += 4 + $dataProp['data']['length'];
+			}
+		}
+		// Now $dataSection_Content_Offset contains the size of the content
+
+		// section header
+		// offset: $secOffset; size: 4; section length
+		// 		+ x  Size of the content (summary + content)
+		$data .= pack('V', $dataSection_Content_Offset);
+		// offset: $secOffset+4; size: 4; property count
+		$data .= pack('V', $dataSection_NumProps);
+		// Section Summary
+		$data .= $dataSection_Summary;
+		// Section Content
+		$data .= $dataSection_Content;
+
+		return $data;
+	}
+
+	/**
+	 * Build the OLE Part for Summary Information
+	 * @return string
+	 */
+	private function _writeSummaryInformation(){
+		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
+		$data = pack('v', 0xFFFE);
+		// offset: 2; size: 2;
+		$data .= pack('v', 0x0000);
+		// offset: 4; size: 2; OS version
+		$data .= pack('v', 0x0106);
+		// offset: 6; size: 2; OS indicator
+		$data .= pack('v', 0x0002);
+		// offset: 8; size: 16
+		$data .= pack('VVVV', 0x00, 0x00, 0x00, 0x00);
+		// offset: 24; size: 4; section count
+		$data .= pack('V', 0x0001);
+
+		// offset: 28; size: 16; first section's class id: e0 85 9f f2 f9 4f 68 10 ab 91 08 00 2b 27 b3 d9
+		$data .= pack('vvvvvvvv', 0x85E0, 0xF29F, 0x4FF9, 0x1068, 0x91AB, 0x0008, 0x272B, 0xD9B3);
+		// offset: 44; size: 4; offset of the start
+		$data .= pack('V', 0x30);
+
+		// SECTION
+		$dataSection = array();
+		$dataSection_NumProps = 0;
+		$dataSection_Summary = '';
+		$dataSection_Content = '';
+
+		// CodePage : CP-1252
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x01),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x02), // 2 byte signed integer
+							   'data'	=> array('data' => 1252));
+		$dataSection_NumProps++;
+
+		//	Title
+		if($this->_phpExcel->getProperties()->getTitle()){
+			$dataProp = $this->_phpExcel->getProperties()->getTitle();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Subject
+		if($this->_phpExcel->getProperties()->getSubject()){
+			$dataProp = $this->_phpExcel->getProperties()->getSubject();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Author (Creator)
+		if($this->_phpExcel->getProperties()->getCreator()){
+			$dataProp = $this->_phpExcel->getProperties()->getCreator();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Keywords
+		if($this->_phpExcel->getProperties()->getKeywords()){
+			$dataProp = $this->_phpExcel->getProperties()->getKeywords();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Comments (Description)
+		if($this->_phpExcel->getProperties()->getDescription()){
+			$dataProp = $this->_phpExcel->getProperties()->getDescription();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Last Saved By (LastModifiedBy)
+		if($this->_phpExcel->getProperties()->getLastModifiedBy()){
+			$dataProp = $this->_phpExcel->getProperties()->getLastModifiedBy();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x1E), // null-terminated string prepended by dword string length
+								   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Created Date/Time
+		if($this->_phpExcel->getProperties()->getCreated()){
+			$dataProp = $this->_phpExcel->getProperties()->getCreated();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+								   'data'	=> array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Modified Date/Time
+		if($this->_phpExcel->getProperties()->getModified()){
+			$dataProp = $this->_phpExcel->getProperties()->getModified();
+			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
+								   'offset' => array('pack' => 'V'),
+								   'type' 	=> array('pack' => 'V', 'data' => 0x40), // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+								   'data'	=> array('data' => PHPExcel_Shared_OLE::LocalDate2OLE($dataProp)));
+			$dataSection_NumProps++;
+		}
+		//	Security
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x13),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x03), // 4 byte signed integer
+							   'data'	=> array('data' => 0x00));
+		$dataSection_NumProps++;
+
+
+		// 		4 	Section Length
+		//		4 	Property count
+		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
+		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
+		foreach ($dataSection as $dataProp){
+			// Summary
+			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
+			// Offset
+			$dataSection_Summary .= pack($dataProp['offset']['pack'], $dataSection_Content_Offset);
+			// DataType
+			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
+			// Data
+			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
+				$dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+				$dataSection_Content_Offset += 4 + 4;
+			}
+			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
+				$dataSection_Content .= pack('V', $dataProp['data']['data']);
+
+				$dataSection_Content_Offset += 4 + 4;
+			}
+			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
+				// Null-terminated string
+				$dataProp['data']['data'] .= chr(0);
+				$dataProp['data']['length'] += 1;
+				// Complete the string with null string for being a %4
+				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
+
+				$dataSection_Content .= pack('V', $dataProp['data']['length']);
+				$dataSection_Content .= $dataProp['data']['data'];
+
+				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
+			}
+			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+				$dataSection_Content .= $dataProp['data']['data'];
+
+				$dataSection_Content_Offset += 4 + 8;
+			}
+			else {
+				// Data Type Not Used at the moment
+			}
+		}
+		// Now $dataSection_Content_Offset contains the size of the content
+
+		// section header
+		// offset: $secOffset; size: 4; section length
+		// 		+ x  Size of the content (summary + content)
+		$data .= pack('V', $dataSection_Content_Offset);
+		// offset: $secOffset+4; size: 4; property count
+		$data .= pack('V', $dataSection_NumProps);
+		// Section Summary
+		$data .= $dataSection_Summary;
+		// Section Content
+		$data .= $dataSection_Content;
+
+		return $data;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/BIFFwriter.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/BIFFwriter.php
index 6ff3c196694..b6782255047 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/BIFFwriter.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/BIFFwriter.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 // Original file header of PEAR::Spreadsheet_Excel_Writer_BIFFwriter (used as the base for this class):
@@ -65,16 +65,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5_BIFFwriter
 {
-	/**
-	 * The BIFF/Excel version (5).
-	 * @var integer
-	 */
-	public $_BIFF_version = 0x0500;
-
 	/**
 	 * The byte order of this architecture. 0 => little endian, 1 => big endian
 	 * @var integer
@@ -98,7 +92,7 @@ class PHPExcel_Writer_Excel5_BIFFwriter
 	 * @var integer
 	 * @see _addContinue()
 	 */
-	public $_limit;
+	public $_limit	= 8224;
 
 	/**
 	 * Constructor
@@ -107,7 +101,7 @@ class PHPExcel_Writer_Excel5_BIFFwriter
 	{
 		$this->_data       = '';
 		$this->_datasize   = 0;
-		$this->_limit      = 2080;
+//		$this->_limit      = 8224;
 	}
 
 	/**
@@ -128,8 +122,7 @@ class PHPExcel_Writer_Excel5_BIFFwriter
 				$byte_order = 1;    // Big Endian
 			} else {
 				// Give up. I'll fix this in a later version.
-				throw new Exception("Required floating point format ".
-										 "not supported on this platform.");
+				throw new Exception("Required floating point format not supported on this platform.");
 			}
 			self::$_byte_order = $byte_order;
 		}
@@ -178,25 +171,16 @@ class PHPExcel_Writer_Excel5_BIFFwriter
 	 */
 	function _storeBof($type)
 	{
-		$record  = 0x0809;        // Record identifier
+		$record  = 0x0809;			// Record identifier	(BIFF5-BIFF8)
+		$length  = 0x0010;
 
-		// According to the SDK $build and $year should be set to zero.
-		// However, this throws a warning in Excel 5. So, use magic numbers.
-		if ($this->_BIFF_version == 0x0500) {
-			$length  = 0x0008;
-			$unknown = '';
-			$build   = 0x096C;
-			$year    = 0x07C9;
-		} elseif ($this->_BIFF_version == 0x0600) {
-			$length  = 0x0010;
+		// by inspection of real files, MS Office Excel 2007 writes the following
+		$unknown = pack("VV", 0x000100D1, 0x00000406);
 
-			// by inspection of real files, MS Office Excel 2007 writes the following
-			$unknown = pack("VV", 0x000100D1, 0x00000406);
+		$build   = 0x0DBB;			//	Excel 97
+		$year    = 0x07CC;			//	Excel 97
 
-			$build   = 0x0DBB;
-			$year    = 0x07CC;
-		}
-		$version = $this->_BIFF_version;
+		$version = 0x0600;			//	BIFF8
 
 		$header  = pack("vv",   $record, $length);
 		$data    = pack("vvvv", $version, $type, $build, $year);
@@ -212,6 +196,7 @@ class PHPExcel_Writer_Excel5_BIFFwriter
 	{
 		$record    = 0x000A;   // Record identifier
 		$length    = 0x0000;   // Number of bytes to follow
+
 		$header    = pack("vv", $record, $length);
 		$this->_append($header);
 	}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Escher.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Escher.php
index aff36828214..94b769ab92b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Escher.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Escher.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,18 +20,18 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
- 
+
 /**
  * PHPExcel_Shared_Escher_DggContainer_BstoreContainer
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5_Escher
 {
@@ -39,19 +39,25 @@ class PHPExcel_Writer_Excel5_Escher
 	 * The object we are writing
 	 */
 	private $_object;
-	
+
 	/**
 	 * The written binary data
 	 */
 	private $_data;
-	
+
 	/**
 	 * Shape offsets. Positions in binary stream where a new shape record begins
 	 *
 	 * @var array
 	 */
 	private $_spOffsets;
-	
+
+	/**
+	 * Shape types.
+	 *
+	 * @var array
+	 */
+	private $_spTypes;
 	
 	/**
 	 * Constructor
@@ -62,7 +68,7 @@ class PHPExcel_Writer_Excel5_Escher
 	{
 		$this->_object = $object;
 	}
-	
+
 	/**
 	 * Process the object to be written
 	 */
@@ -81,6 +87,7 @@ class PHPExcel_Writer_Excel5_Escher
 				$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
 				$this->_data = $writer->close();
 				$this->_spOffsets = $writer->getSpOffsets();
+				$this->_spTypes = $writer->getSpTypes();
 			}
 			break;
 
@@ -156,10 +163,10 @@ class PHPExcel_Writer_Excel5_Escher
 			$recInstance	= count($this->_object->getBSECollection());
 			$recType		= 0xF001;
 			$length			= strlen($innerData);
-			
+
 			$recVerInstance  = $recVer;
 			$recVerInstance |= $recInstance << 4;
-			
+
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
 			$this->_data = $header . $innerData;
@@ -170,23 +177,23 @@ class PHPExcel_Writer_Excel5_Escher
 
 			// initialize
 			$innerData = '';
-			
+
 			// here we treat the inner data
 			if ($blip = $this->_object->getBlip()) {
 				$writer = new PHPExcel_Writer_Excel5_Escher($blip);
 				$innerData .= $writer->close();
 			}
-			
+
 			// initialize
 			$data = '';
-			
+
 			$btWin32 = $this->_object->getBlipType();
 			$btMacOS = $this->_object->getBlipType();
 			$data .= pack('CC', $btWin32, $btMacOS);
-			
+
 			$rgbUid = pack('VVVV', 0,0,0,0); // todo
 			$data .= $rgbUid;
-			
+
 			$tag = 0;
 			$size = strlen($innerData);
 			$cRef = 1;
@@ -196,88 +203,88 @@ class PHPExcel_Writer_Excel5_Escher
 			$unused2 = 0x0;
 			$unused3 = 0x0;
 			$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
-			
+
 			$data .= $innerData;
-			
+
 			// write the record
 			$recVer			= 0x2;
 			$recInstance	= $this->_object->getBlipType();
 			$recType		= 0xF007;
 			$length			= strlen($data);
-			
+
 			$recVerInstance  = $recVer;
 			$recVerInstance |=	$recInstance << 4;
-			
+
 			$header = pack('vvV', $recVerInstance, $recType, $length);
 
 			$this->_data = $header;
-			
+
 			$this->_data .= $data;
 			break;
 
 		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
 			// this is an atom record
-			
+
 			// write the record
 			switch ($this->_object->getParent()->getBlipType()) {
-			
+
 			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
 				// initialize
 				$innerData = '';
-				
+
 				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
 				$innerData .= $rgbUid1;
-				
+
 				$tag = 0xFF; // todo
 				$innerData .= pack('C', $tag);
-				
+
 				$innerData .= $this->_object->getData();
-				
+
 				$recVer			= 0x0;
 				$recInstance	= 0x46A;
 				$recType		= 0xF01D;
 				$length			= strlen($innerData);
-				
+
 				$recVerInstance  = $recVer;
 				$recVerInstance |=	$recInstance << 4;
-				
+
 				$header = pack('vvV', $recVerInstance, $recType, $length);
 
 				$this->_data = $header;
-				
+
 				$this->_data .= $innerData;
 				break;
-				
+
 			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
 				// initialize
 				$innerData = '';
-				
+
 				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
 				$innerData .= $rgbUid1;
-				
+
 				$tag = 0xFF; // todo
 				$innerData .= pack('C', $tag);
-				
+
 				$innerData .= $this->_object->getData();
-				
+
 				$recVer			= 0x0;
 				$recInstance	= 0x6E0;
 				$recType		= 0xF01E;
 				$length			= strlen($innerData);
-				
+
 				$recVerInstance  = $recVer;
 				$recVerInstance |=	$recInstance << 4;
-				
+
 				$header = pack('vvV', $recVerInstance, $recType, $length);
 
 				$this->_data = $header;
-				
+
 				$this->_data .= $innerData;
 				break;
-			
+
 			}
 			break;
-			
+
 		case 'PHPExcel_Shared_Escher_DgContainer':
 			// this is a container record
 
@@ -289,12 +296,12 @@ class PHPExcel_Writer_Excel5_Escher
 			$recInstance	= $this->_object->getDgId();
 			$recType		= 0xF008;
 			$length			= 8;
-			
+
 			$recVerInstance  = $recVer;
 			$recVerInstance |= $recInstance << 4;
 
 			$header = pack('vvV', $recVerInstance, $recType, $length);
-			
+
 			// number of shapes in this drawing (including group shape)
 			$countShapes = count($this->_object->getSpgrContainer()->getChildren());
 			$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
@@ -304,16 +311,18 @@ class PHPExcel_Writer_Excel5_Escher
 			if ($spgrContainer = $this->_object->getSpgrContainer()) {
 				$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
 				$innerData .= $writer->close();
-				
+
 				// get the shape offsets relative to the spgrContainer record
 				$spOffsets = $writer->getSpOffsets();
+				$spTypes   = $writer->getSpTypes();
 				
 				// save the shape offsets relative to dgContainer
 				foreach ($spOffsets as & $spOffset) {
 					$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
 				}
-				
+
 				$this->_spOffsets = $spOffsets;
+				$this->_spTypes = $spTypes;
 			}
 
 			// write the record
@@ -339,7 +348,8 @@ class PHPExcel_Writer_Excel5_Escher
 			// initialize spape offsets
 			$totalSize = 8;
 			$spOffsets = array();
-			
+			$spTypes   = array();
+
 			// treat the inner data
 			foreach ($this->_object->getChildren() as $spContainer) {
 				$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
@@ -349,8 +359,10 @@ class PHPExcel_Writer_Excel5_Escher
 				// save the shape offsets (where new shape records begin)
 				$totalSize += strlen($spData);
 				$spOffsets[] = $totalSize;
+				
+				$spTypes = array_merge($spTypes, $writer->getSpTypes());
 			}
-			
+
 			// write the record
 			$recVer			= 0xF;
 			$recInstance	= 0x0000;
@@ -364,6 +376,7 @@ class PHPExcel_Writer_Excel5_Escher
 
 			$this->_data = $header . $innerData;
 			$this->_spOffsets = $spOffsets;
+			$this->_spTypes = $spTypes;
 			break;
 
 		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
@@ -371,7 +384,7 @@ class PHPExcel_Writer_Excel5_Escher
 			$data = '';
 
 			// build the data
-			
+
 			// write group shape record, if necessary?
 			if ($this->_object->getSpgr()) {
 				$recVer			= 0x1;
@@ -386,6 +399,7 @@ class PHPExcel_Writer_Excel5_Escher
 
 				$data .= $header . pack('VVVV', 0,0,0,0);
 			}
+			$this->_spTypes[] = ($this->_object->getSpType());
 
 			// write the shape record
 			$recVer			= 0x2;
@@ -412,7 +426,7 @@ class PHPExcel_Writer_Excel5_Escher
 					$optData .= pack('vV', $property, $value);
 				}
 				$length			= strlen($optData);
-				
+
 				$recVerInstance  = $recVer;
 				$recVerInstance |= $recInstance << 4;
 
@@ -450,10 +464,10 @@ class PHPExcel_Writer_Excel5_Escher
 				// end offsetY
 				$endOffsetY = $this->_object->getEndOffsetY();
 
-				$clientAnchorData = pack('vvvvvvvvv', 0x02,
+				$clientAnchorData = pack('vvvvvvvvv', $this->_object->getSpFlag(),
 					$c1, $startOffsetX, $r1, $startOffsetY,
 					$c2, $endOffsetX, $r2, $endOffsetY);
-
+				
 				$length			= strlen($clientAnchorData);
 
 				$recVerInstance  = $recVer;
@@ -498,7 +512,7 @@ class PHPExcel_Writer_Excel5_Escher
 
 		return $this->_data;
 	}
-	
+
 	/**
 	 * Gets the shape offsets
 	 *
@@ -508,5 +522,16 @@ class PHPExcel_Writer_Excel5_Escher
 	{
 		return $this->_spOffsets;
 	}
+
+	/**
+	 * Gets the shape types
+	 *
+	 * @return array
+	 */
+	public function getSpTypes()
+	{
+		return $this->_spTypes;
+	}
+	
 	
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Font.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Font.php
index 0da4d20fdc7..f67dd11f048 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Font.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Font.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,17 +31,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5_Font
 {
-	/**
-	 * BIFF version
-	 *
-	 * @var int
-	 */
-	private $_BIFFVersion;
-
 	/**
 	 * Color index
 	 *
@@ -63,7 +56,6 @@ class PHPExcel_Writer_Excel5_Font
 	 */
 	public function __construct(PHPExcel_Style_Font $font = null)
 	{
-		$this->_BIFFVersion = 0x0600;
 		$this->_colorIndex = 0x7FFF;
 		$this->_font = $font;
 	}
@@ -99,9 +91,9 @@ class PHPExcel_Writer_Excel5_Font
 		$bFamily = 0; // Font family
 		$bCharSet = PHPExcel_Shared_Font::getCharsetFromFontName($this->_font->getName()); // Character set
 
-		$record = 0x31; // Record identifier
-		$reserved = 0x00; // Reserved
-		$grbit = 0x00; // Font attributes
+		$record = 0x31;		// Record identifier
+		$reserved = 0x00;	// Reserved
+		$grbit = 0x00;		// Font attributes
 		if ($this->_font->getItalic()) {
 			$grbit |= 0x02;
 		}
@@ -115,34 +107,18 @@ class PHPExcel_Writer_Excel5_Font
 			$grbit |= 0x20;
 		}
 
-		if ($this->_BIFFVersion == 0x0500) {
-			$data = pack("vvvvvCCCCC",
-				$this->_font->getSize() * 20,
-				$grbit,
-				$icv,
-				$this->_mapBold($this->_font->getBold()),
-				$sss,
-				$this->_mapUnderline($this->_font->getUnderline()),
-				$bFamily,
-				$bCharSet,
-				$reserved,
-				strlen($this->_font->getName())
-			);
-			$data .= $this->_font->getName();
-		} elseif ($this->_BIFFVersion == 0x0600) {
-			$data = pack("vvvvvCCCC",
-				$this->_font->getSize() * 20,
-				$grbit,
-				$icv,
-				$this->_mapBold($this->_font->getBold()),
-				$sss,
-				$this->_mapUnderline($this->_font->getUnderline()),
-				$bFamily,
-				$bCharSet,
-				$reserved
-			);
-			$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($this->_font->getName());
-		}
+		$data = pack("vvvvvCCCC",
+			$this->_font->getSize() * 20,						//	Fontsize (in twips)
+			$grbit,
+			$icv,												//	Colour
+			self::_mapBold($this->_font->getBold()),			//	Font weight
+			$sss,												//	Superscript/Subscript
+			self::_mapUnderline($this->_font->getUnderline()),
+			$bFamily,
+			$bCharSet,
+			$reserved
+		);
+		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($this->_font->getName());
 
 		$length = strlen($data);
 		$header = pack("vv", $record, $length);
@@ -150,44 +126,40 @@ class PHPExcel_Writer_Excel5_Font
 		return($header . $data);
 	}
 
-	/**
-	 * Set BIFF version
-	 *
-	 * @param int $BIFFVersion
-	 */
-	public function setBIFFVersion($BIFFVersion)
-	{
-		$this->_BIFFVersion = $BIFFVersion;
-	}
-
 	/**
 	 * Map to BIFF5-BIFF8 codes for bold
 	 *
 	 * @param boolean $bold
 	 * @return int
 	 */
-	private function _mapBold($bold) {
+	private static function _mapBold($bold) {
 		if ($bold) {
-			return 0x2BC;
+			return 0x2BC;	//	700 = Bold font weight
 		}
-		return 0x190;
+		return 0x190;		//	400 = Normal font weight
 	}
 
+	/**
+	 * Map of BIFF2-BIFF8 codes for underline styles
+	 * @static	array of int
+	 *
+	 */
+	private static $_mapUnderline = array(	PHPExcel_Style_Font::UNDERLINE_NONE					=> 0x00,
+											PHPExcel_Style_Font::UNDERLINE_SINGLE				=> 0x01,
+											PHPExcel_Style_Font::UNDERLINE_DOUBLE				=> 0x02,
+											PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING		=> 0x21,
+											PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING		=> 0x22,
+										 );
 	/**
 	 * Map underline
 	 *
 	 * @param string
 	 * @return int
 	 */
-	private function _mapUnderline($underline) {
-		switch ($underline) {
-			case PHPExcel_Style_Font::UNDERLINE_NONE:				return 0x00;
-			case PHPExcel_Style_Font::UNDERLINE_SINGLE:				return 0x01;
-			case PHPExcel_Style_Font::UNDERLINE_DOUBLE:				return 0x02;
-			case PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING:	return 0x21;
-			case PHPExcel_Style_Font::UNDERLINE_DOUBLEACCOUNTING:	return 0x22;
-			default:												return 0x00;
-		}
+	private static function _mapUnderline($underline) {
+		if (isset(self::$_mapUnderline[$underline]))
+			return self::$_mapUnderline[$underline];
+		return 0x00;
 	}
 
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Parser.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Parser.php
index 3d7e0f9a8a4..88b777e0032 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Parser.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Parser.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 // Original file header of PEAR::Spreadsheet_Excel_Writer_Parser (used as the base for this class):
@@ -55,7 +55,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5_Parser
 {
@@ -115,22 +115,13 @@ class PHPExcel_Writer_Excel5_Parser
 	 */
 	public $_references;
 
-	/**
-	 * The BIFF version for the workbook
-	 * @var integer
-	 */
-	public $_BIFF_version;
-
 	/**
 	 * The class constructor
 	 *
-	 * @param integer $byte_order The byte order (Little endian or Big endian) of the architecture
-	 *                           (optional). 1 => big endian, 0 (default) little endian.
 	 */
-	public function __construct($biff_version)
+	public function __construct()
 	{
 		$this->_current_char  = 0;
-		$this->_BIFF_version  = $biff_version;
 		$this->_current_token = '';       // The token we are working on.
 		$this->_formula       = '';       // The formula to parse.
 		$this->_lookahead     = '';       // The character ahead of the current char.
@@ -610,11 +601,7 @@ class PHPExcel_Writer_Excel5_Parser
 			throw new Exception("String is too long");
 		}
 
-		if ($this->_BIFF_version == 0x0500) {
-			return pack("CC", $this->ptg['ptgStr'], strlen($string)).$string;
-		} elseif ($this->_BIFF_version == 0x0600) {
-			return pack('C', $this->ptg['ptgStr']) . PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
-		}
+		return pack('C', $this->ptg['ptgStr']) . PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($string);
 	}
 
 	/**
@@ -629,7 +616,7 @@ class PHPExcel_Writer_Excel5_Parser
 	function _convertFunction($token, $num_args)
 	{
 		$args     = $this->_functions[$token][1];
-		$volatile = $this->_functions[$token][3];
+//		$volatile = $this->_functions[$token][3];
 
 		// Fixed number of args eg. TIME($i,$j,$k).
 		if ($args >= 0) {
@@ -645,7 +632,8 @@ class PHPExcel_Writer_Excel5_Parser
 	 * Convert an Excel range such as A1:D4 to a ptgRefV.
 	 *
 	 * @access private
-	 * @param string $range An Excel range in the A1:A2
+	 * @param string	$range	An Excel range in the A1:A2
+	 * @param int		$class
 	 */
 	function _convertRange2d($range, $class=0)
 	{
@@ -660,10 +648,8 @@ class PHPExcel_Writer_Excel5_Parser
 		}
 
 		// Convert the cell references
-		$cell_array1 = $this->_cellToPackedRowcol($cell1);
-		list($row1, $col1) = $cell_array1;
-		$cell_array2 = $this->_cellToPackedRowcol($cell2);
-		list($row2, $col2) = $cell_array2;
+		list($row1, $col1) = $this->_cellToPackedRowcol($cell1);
+		list($row2, $col2) = $this->_cellToPackedRowcol($cell2);
 
 		// The ptg value depends on the class of the ptg.
 		if ($class == 0) {
@@ -689,42 +675,35 @@ class PHPExcel_Writer_Excel5_Parser
 	 */
 	function _convertRange3d($token)
 	{
-		$class = 0; // formulas like Sheet1!$A$1:$A$2 in list type data validation need this class (0x3B)
+//		$class = 0; // formulas like Sheet1!$A$1:$A$2 in list type data validation need this class (0x3B)
 
 		// Split the ref at the ! symbol
 		list($ext_ref, $range) = explode('!', $token);
 
 		// Convert the external reference part (different for BIFF8)
-		if ($this->_BIFF_version == 0x0500) {
-			$ext_ref = $this->_packExtRef($ext_ref);
-		} elseif ($this->_BIFF_version == 0x0600) {
-			 $ext_ref = $this->_getRefIndex($ext_ref);
-		}
+		$ext_ref = $this->_getRefIndex($ext_ref);
 
 		// Split the range into 2 cell refs
 		list($cell1, $cell2) = explode(':', $range);
 
 		// Convert the cell references
 		if (preg_match("/^(\\$)?[A-Ia-i]?[A-Za-z](\\$)?(\d+)$/", $cell1)) {
-			$cell_array1 = $this->_cellToPackedRowcol($cell1);
-			list($row1, $col1) = $cell_array1;
-			$cell_array2 = $this->_cellToPackedRowcol($cell2);
-			list($row2, $col2) = $cell_array2;
+			list($row1, $col1) = $this->_cellToPackedRowcol($cell1);
+			list($row2, $col2) = $this->_cellToPackedRowcol($cell2);
 		} else { // It's a rows range (like 26:27)
-			 $cells_array = $this->_rangeToPackedRange($cell1.':'.$cell2);
-			 list($row1, $col1, $row2, $col2) = $cells_array;
+			 list($row1, $col1, $row2, $col2) = $this->_rangeToPackedRange($cell1.':'.$cell2);
 		}
 
 		// The ptg value depends on the class of the ptg.
-		if ($class == 0) {
+//		if ($class == 0) {
 			$ptgArea = pack("C", $this->ptg['ptgArea3d']);
-		} elseif ($class == 1) {
-			$ptgArea = pack("C", $this->ptg['ptgArea3dV']);
-		} elseif ($class == 2) {
-			$ptgArea = pack("C", $this->ptg['ptgArea3dA']);
-		} else {
-			throw new Exception("Unknown class $class");
-		}
+//		} elseif ($class == 1) {
+//			$ptgArea = pack("C", $this->ptg['ptgArea3dV']);
+//		} elseif ($class == 2) {
+//			$ptgArea = pack("C", $this->ptg['ptgArea3dA']);
+//		} else {
+//			throw new Exception("Unknown class $class");
+//		}
 
 		return $ptgArea . $ext_ref . $row1 . $row2 . $col1. $col2;
 	}
@@ -738,23 +717,23 @@ class PHPExcel_Writer_Excel5_Parser
 	 */
 	function _convertRef2d($cell)
 	{
-		$class = 2; // as far as I know, this is magick.
+//		$class = 2; // as far as I know, this is magick.
 
 		// Convert the cell reference
 		$cell_array = $this->_cellToPackedRowcol($cell);
 		list($row, $col) = $cell_array;
 
 		// The ptg value depends on the class of the ptg.
-		if ($class == 0) {
-			$ptgRef = pack("C", $this->ptg['ptgRef']);
-		} elseif ($class == 1) {
-			$ptgRef = pack("C", $this->ptg['ptgRefV']);
-		} elseif ($class == 2) {
+//		if ($class == 0) {
+//			$ptgRef = pack("C", $this->ptg['ptgRef']);
+//		} elseif ($class == 1) {
+//			$ptgRef = pack("C", $this->ptg['ptgRefV']);
+//		} elseif ($class == 2) {
 			$ptgRef = pack("C", $this->ptg['ptgRefA']);
-		} else {
-			// TODO: use real error codes
-			throw new Exception("Unknown class $class");
-		}
+//		} else {
+//			// TODO: use real error codes
+//			throw new Exception("Unknown class $class");
+//		}
 		return $ptgRef.$row.$col;
 	}
 
@@ -768,31 +747,27 @@ class PHPExcel_Writer_Excel5_Parser
 	 */
 	function _convertRef3d($cell)
 	{
-		$class = 2; // as far as I know, this is magick.
+//		$class = 2; // as far as I know, this is magick.
 
 		// Split the ref at the ! symbol
 		list($ext_ref, $cell) = explode('!', $cell);
 
 		// Convert the external reference part (different for BIFF8)
-		if ($this->_BIFF_version == 0x0500) {
-			$ext_ref = $this->_packExtRef($ext_ref);
-		} elseif ($this->_BIFF_version == 0x0600) {
-			$ext_ref = $this->_getRefIndex($ext_ref);
-		}
+		$ext_ref = $this->_getRefIndex($ext_ref);
 
 		// Convert the cell reference part
 		list($row, $col) = $this->_cellToPackedRowcol($cell);
 
 		// The ptg value depends on the class of the ptg.
-		if ($class == 0) {
-			$ptgRef = pack("C", $this->ptg['ptgRef3d']);
-		} elseif ($class == 1) {
-			$ptgRef = pack("C", $this->ptg['ptgRef3dV']);
-		} elseif ($class == 2) {
+//		if ($class == 0) {
+//			$ptgRef = pack("C", $this->ptg['ptgRef3d']);
+//		} elseif ($class == 1) {
+//			$ptgRef = pack("C", $this->ptg['ptgRef3dV']);
+//		} elseif ($class == 2) {
 			$ptgRef = pack("C", $this->ptg['ptgRef3dA']);
-		} else {
-			throw new Exception("Unknown class $class");
-		}
+//		} else {
+//			throw new Exception("Unknown class $class");
+//		}
 
 		return $ptgRef . $ext_ref. $row . $col;
 	}
@@ -800,30 +775,31 @@ class PHPExcel_Writer_Excel5_Parser
     /**
      * Convert an error code to a ptgErr
      *
-     * @access private
-     * @param mixed $num an error codefor conversion to its ptg value
+     * @access	private
+	 * @param	string	$errorCode	The error code for conversion to its ptg value
+     * @return	string				The error code ptgErr
      */
     function _convertError($errorCode)
     {
-        switch ($errorCode) {
-            case '#NULL!':	return pack("C", 0x00);
-            case '#DIV/0!':	return pack("C", 0x07);
-            case '#VALUE!':	return pack("C", 0x0F);
-            case '#REF!':	return pack("C", 0x17);
-            case '#NAME?':	return pack("C", 0x1D);
-            case '#NUM!':	return pack("C", 0x24);
-            case '#N/A':	return pack("C", 0x2A);
-        }
-        return pack("C", 0xFF);
+		switch ($errorCode) {
+			case '#NULL!':	return pack("C", 0x00);
+			case '#DIV/0!':	return pack("C", 0x07);
+			case '#VALUE!':	return pack("C", 0x0F);
+			case '#REF!':	return pack("C", 0x17);
+			case '#NAME?':	return pack("C", 0x1D);
+			case '#NUM!':	return pack("C", 0x24);
+			case '#N/A':	return pack("C", 0x2A);
+		}
+		return pack("C", 0xFF);
     }
 
 	/**
 	 * Convert the sheet name part of an external reference, for example "Sheet1" or
 	 * "Sheet1:Sheet2", to a packed structure.
 	 *
-	 * @access private
-	 * @param string $ext_ref The name of the external reference
-	 * @return string The reference index in packed() format
+	 * @access	private
+	 * @param	string	$ext_ref	The name of the external reference
+	 * @return	string				The reference index in packed() format
 	 */
 	function _packExtRef($ext_ref)
 	{
@@ -926,8 +902,9 @@ class PHPExcel_Writer_Excel5_Parser
 	 * sheet names is updated by the addworksheet() method of the
 	 * PHPExcel_Writer_Excel5_Workbook class.
 	 *
-	 * @access private
-	 * @return integer The sheet index, -1 if the sheet was not found
+	 * @access	private
+	 * @param	string	$sheet_name		Sheet name
+	 * @return	integer					The sheet index, -1 if the sheet was not found
 	 */
 	function _getSheetIndex($sheet_name)
 	{
@@ -973,16 +950,11 @@ class PHPExcel_Writer_Excel5_Parser
 		}
 
 		// Set the high bits to indicate if row or col are relative.
-		if ($this->_BIFF_version == 0x0500) {
-			$row    |= $col_rel << 14;
-			$row    |= $row_rel << 15;
-			$col     = pack('C', $col);
-		} elseif ($this->_BIFF_version == 0x0600) {
-			$col    |= $col_rel << 14;
-			$col    |= $row_rel << 15;
-			$col     = pack('v', $col);
-		}
-		$row     = pack('v', $row);
+		$col |= $col_rel << 14;
+		$col |= $row_rel << 15;
+		$col = pack('v', $col);
+
+		$row = pack('v', $row);
 
 		return array($row, $col);
 	}
@@ -1016,19 +988,13 @@ class PHPExcel_Writer_Excel5_Parser
 		}
 
 		// Set the high bits to indicate if rows are relative.
-		if ($this->_BIFF_version == 0x0500) {
-			$row1    |= $row1_rel << 14; // FIXME: probably a bug
-			$row2    |= $row2_rel << 15;
-			$col1     = pack('C', $col1);
-			$col2     = pack('C', $col2);
-		} elseif ($this->_BIFF_version == 0x0600) {
-			$col1    |= $row1_rel << 15;
-			$col2    |= $row2_rel << 15;
-			$col1     = pack('v', $col1);
-			$col2     = pack('v', $col2);
-		}
-		$row1     = pack('v', $row1);
-		$row2     = pack('v', $row2);
+		$col1 |= $row1_rel << 15;
+		$col2 |= $row2_rel << 15;
+		$col1 = pack('v', $col1);
+		$col2 = pack('v', $col2);
+
+		$row1 = pack('v', $row1);
+		$row2 = pack('v', $row2);
 
 		return array($row1, $col1, $row2, $col2);
 	}
@@ -1090,6 +1056,7 @@ class PHPExcel_Writer_Excel5_Parser
 
 		while ($i < $formula_length) {
 			$token .= $this->_formula{$i};
+
 			if ($i < ($formula_length - 1)) {
 				$this->_lookahead = $this->_formula{$i+1};
 			} else {
@@ -1218,6 +1185,11 @@ class PHPExcel_Writer_Excel5_Parser
 				{
 					return $token;
 				}
+				//	It's an argument of some description (e.g. a named range),
+				//		precise nature yet to be determined
+				elseif(substr($token,-1) == ')') {
+					return $token;
+				}
 				return '';
 		}
 	}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Workbook.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Workbook.php
index b0223f8ad52..2e177ceff90 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Workbook.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Workbook.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 // Original file header of PEAR::Spreadsheet_Excel_Writer_Workbook (used as the base for this class):
@@ -66,7 +66,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 {
@@ -193,17 +193,16 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 	/**
 	 * Class constructor
 	 *
-	 * @param PHPExcel $phpExcel The Workbook
-	 * @param int $BIFF_verions BIFF version
-	 * @param int  $str_total		Total number of strings
-	 * @param int  $str_unique		Total number of unique strings
-	 * @param array  $str_table
-	 * @param mixed   $parser	  The formula parser created for the Workbook
+	 * @param PHPExcel	$phpExcel		The Workbook
+	 * @param int		&$str_total		Total number of strings
+	 * @param int		&$str_unique	Total number of unique strings
+	 * @param array		&$str_table		String Table
+	 * @param array		&$colors		Colour Table
+	 * @param mixed		$parser			The formula parser created for the Workbook
 	 */
-	public function __construct(PHPExcel $phpExcel = null, $BIFF_version = 0x0600,
-												&$str_total,
-												&$str_unique, &$str_table, &$colors, $parser
-								)
+	public function __construct(PHPExcel $phpExcel = null,
+								&$str_total, &$str_unique, &$str_table, &$colors,
+								$parser )
 	{
 		// It needs to call its parent's constructor explicitly
 		parent::__construct();
@@ -211,7 +210,6 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_parser           = $parser;
 		$this->_biffsize         = 0;
 		$this->_palette          = array();
-		$this->_codepage         = 0x04E4; // FIXME: should change for BIFF8
 		$this->_country_code     = -1;
 
 		$this->_str_total       = &$str_total;
@@ -222,12 +220,9 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$this->_phpExcel = $phpExcel;
 
-		if ($BIFF_version == 0x0600) {
-			$this->_BIFF_version = 0x0600;
-			// change BIFFwriter limit for CONTINUE records
-			$this->_limit = 8224;
-			$this->_codepage = 0x04B0;
-		}
+		// set BIFFwriter limit for CONTINUE records
+		//		$this->_limit = 8224;
+		$this->_codepage = 0x04B0;
 
 		// Add empty sheets and Build color cache
 		$countSheets = $phpExcel->getSheetCount();
@@ -236,12 +231,10 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 
 			$this->_parser->setExtSheet($phpSheet->getTitle(), $i);  // Register worksheet name with parser
 
-			// for BIFF8
-			if ($this->_BIFF_version == 0x0600) {
-				$supbook_index = 0x00;
-				$ref = pack('vvv', $supbook_index, $i, $i);
-				$this->_parser->_references[] = $ref;  // Register reference with parser
-			}
+			$supbook_index = 0x00;
+			$ref = pack('vvv', $supbook_index, $i, $i);
+			$this->_parser->_references[] = $ref;  // Register reference with parser
+
 			// Sheet tab colors?
 			if ($phpSheet->isTabColorSet()) {
 				$this->_addColor($phpSheet->getTabColor()->getRGB());
@@ -260,25 +253,10 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 	public function addXfWriter($style, $isStyleXf = false)
 	{
 		$xfWriter = new PHPExcel_Writer_Excel5_Xf($style);
-		$xfWriter->setBIFFVersion($this->_BIFF_version);
 		$xfWriter->setIsStyleXf($isStyleXf);
 
 		// Add the font if not already added
-		$fontHashCode = $style->getFont()->getHashCode();
-
-		if (isset($this->_addedFonts[$fontHashCode])) {
-			$fontIndex = $this->_addedFonts[$fontHashCode];
-		} else {
-			$countFonts = count($this->_fontWriters);
-			$fontIndex = ($countFonts < 4) ? $countFonts : $countFonts + 1;
-
-			$fontWriter = new PHPExcel_Writer_Excel5_Font($style->getFont());
-			$fontWriter->setBIFFVersion($this->_BIFF_version);
-			$fontWriter->setColorIndex($this->_addColor($style->getFont()->getColor()->getRGB()));
-			$this->_fontWriters[] = $fontWriter;
-
-			$this->_addedFonts[$fontHashCode] = $fontIndex;
-		}
+		$fontIndex = $this->_addFont($style->getFont());
 
 		// Assign the font index to the xf record
 		$xfWriter->setFontIndex($fontIndex);
@@ -303,8 +281,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 				$this->_numberFormats[$numberFormatIndex] = $style->getNumberFormat();
 				$this->_addedNumberFormats[$numberFormatHashCode] = $numberFormatIndex;
 			}
-		}
-		else {
+		} else {
 			$numberFormatIndex = (int) $style->getNumberFormat()->getBuiltInFormatCode();
 		}
 
@@ -317,6 +294,29 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		return $xfIndex;
 	}
 
+	/**
+	 * Add a font to added fonts
+	 *
+	 * @param PHPExcel_Style_Font $font
+	 * @return int Index to FONT record
+	 */
+	public function _addFont(PHPExcel_Style_Font $font)
+	{
+		$fontHashCode = $font->getHashCode();
+		if(isset($this->_addedFonts[$fontHashCode])){
+			$fontIndex = $this->_addedFonts[$fontHashCode];
+		} else {
+			$countFonts = count($this->_fontWriters);
+			$fontIndex = ($countFonts < 4) ? $countFonts : $countFonts + 1;
+
+			$fontWriter = new PHPExcel_Writer_Excel5_Font($font);
+			$fontWriter->setColorIndex($this->_addColor($font->getColor()->getRGB()));
+			$this->_fontWriters[] = $fontWriter;
+
+			$this->_addedFonts[$fontHashCode] = $fontIndex;
+		}
+		return $fontIndex;
+	}
 	/**
 	 * Alter color palette adding a custom color
 	 *
@@ -419,8 +419,8 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 	 * Assemble worksheets into a workbook and send the BIFF data to an OLE
 	 * storage.
 	 *
-	 * @param array $worksheetSizes The sizes in bytes of the binary worksheet streams
-	 * @return string Binary data for workbook stream
+	 * @param	array	$pWorksheetSizes	The sizes in bytes of the binary worksheet streams
+	 * @return	string	Binary data for workbook stream
 	 */
 	public function writeWorkbook($pWorksheetSizes = null)
 	{
@@ -433,16 +433,8 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		// Add part 1 of the Workbook globals, what goes before the SHEET records
 		$this->_storeBof(0x0005);
 		$this->_writeCodepage();
-		if ($this->_BIFF_version == 0x0600) {
-			$this->_writeWindow1();
-		}
-		if ($this->_BIFF_version == 0x0500) {
-			$this->_writeExterns();    // For print area and repeat rows
-			$this->_writeNames();      // For print area and repeat rows
-		}
-		if ($this->_BIFF_version == 0x0500) {
-			$this->_writeWindow1();
-		}
+		$this->_writeWindow1();
+
 		$this->_writeDatemode();
 		$this->_writeAllFonts();
 		$this->_writeAllNumFormats();
@@ -457,15 +449,13 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		}
 		$part3 .= $this->_writeRecalcId();
 
-		if ($this->_BIFF_version == 0x0600) {
-			$part3 .= $this->_writeSupbookInternal();
-			/* TODO: store external SUPBOOK records and XCT and CRN records
-			in case of external references for BIFF8 */
-			$part3 .= $this->_writeExternsheetBiff8();
-			$part3 .= $this->_writeAllDefinedNamesBiff8();
-			$part3 .= $this->_writeMsoDrawingGroup();
-			$part3 .= $this->_writeSharedStringsTable();
-		}
+		$part3 .= $this->_writeSupbookInternal();
+		/* TODO: store external SUPBOOK records and XCT and CRN records
+		in case of external references for BIFF8 */
+		$part3 .= $this->_writeExternsheetBiff8();
+		$part3 .= $this->_writeAllDefinedNamesBiff8();
+		$part3 .= $this->_writeMsoDrawingGroup();
+		$part3 .= $this->_writeSharedStringsTable();
 
 		$part3 .= $this->writeEof();
 
@@ -488,11 +478,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 	 */
 	function _calcSheetOffsets()
 	{
-		if ($this->_BIFF_version == 0x0600) {
-			$boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
-		} else {
-			$boundsheet_length = 11;
-		}
+		$boundsheet_length = 10;  // fixed length for a BOUNDSHEET record
 
 		// size of Workbook globals part 1 + 3
 		$offset            = $this->_datasize;
@@ -500,11 +486,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		// add size of Workbook globals part 2, the length of the SHEET records
 		$total_worksheets = count($this->_phpExcel->getAllSheets());
 		foreach ($this->_phpExcel->getWorksheetIterator() as $sheet) {
-			if ($this->_BIFF_version == 0x0600) {
-				$offset += $boundsheet_length + strlen(PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
-			} else {
-				$offset += $boundsheet_length + strlen($sheet->getTitle());
-			}
+			$offset += $boundsheet_length + strlen(PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheet->getTitle()));
 		}
 
 		// add the sizes of each of the Sheet substreams, respectively
@@ -565,7 +547,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		// Create EXTERNSHEET for each worksheet
 		for ($i = 0; $i < $countSheets; ++$i) {
-			$this->_writeExternsheet($phpExcel->getSheet($i)->getTitle());
+			$this->_writeExternsheet($this->_phpExcel->getSheet($i)->getTitle());
 		}
 	}
 
@@ -662,7 +644,6 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		}
 	}
 
-
 	/**
 	 * Writes all the DEFINEDNAME records (BIFF8).
 	 * So far this is only used for repeating rows/columns (print titles) and print areas
@@ -799,6 +780,20 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 			}
 		}
 
+		// write autofilters, if any
+		for ($i = 0; $i < $total_worksheets; ++$i) {
+			$sheetAutoFilter = $this->_phpExcel->getSheet($i)->getAutoFilter();
+			$autoFilterRange = $sheetAutoFilter->getRange();
+			if(!empty($autoFilterRange)) {
+				$rangeBounds = PHPExcel_Cell::rangeBoundaries($autoFilterRange);
+
+				//Autofilter built in name
+				$name = pack('C', 0x0D);
+
+				$chunk .= $this->writeData($this->_writeShortNameBiff8($name, $i + 1, $rangeBounds, true));
+			}
+		}
+
 		return $chunk;
 	}
 
@@ -837,6 +832,42 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		return $header . $data;
 	}
 
+	/**
+	 * Write a short NAME record
+	 *
+	 * @param	string		$name
+	 * @param	string		$sheetIndex		1-based sheet index the defined name applies to. 0 = global
+	 * @param	int[][]     $range          rangeboundaries
+	 * @param	bool        $isHidden
+	 * @return	string	Complete binary record data
+	 * */
+	private function _writeShortNameBiff8($name, $sheetIndex = 0, $rangeBounds, $isHidden = false){
+		$record = 0x0018;
+
+		// option flags
+		$options = ($isHidden  ? 0x21 : 0x00);
+
+		$extra  = pack('Cvvvvv',
+				0x3B,
+				$sheetIndex - 1,
+				$rangeBounds[0][1] - 1,
+				$rangeBounds[1][1] - 1,
+				$rangeBounds[0][0] - 1,
+				$rangeBounds[1][0] - 1);
+
+		// size of the formula (in bytes)
+		$sz = strlen($extra);
+
+		// combine the parts
+		$data = pack('vCCvvvCCCCC', $options, 0, 1, $sz, 0, $sheetIndex, 0, 0, 0, 0, 0)
+			. $name . $extra;
+		$length = strlen($data);
+
+		$header = pack('vv', $record, $length);
+
+		return $header . $data;
+	}
+
 	/**
 	 * Stores the CODEPAGE biff record.
 	 */
@@ -908,14 +939,8 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$grbit     = 0x0000;                    // Visibility and sheet type
 
-		if ($this->_BIFF_version == 0x0600) {
-			$data      = pack("VCC", $offset, $ss, $st);
-			$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
-		} else {
-			$cch       = strlen($sheetname);        // Length of sheet name
-			$data      = pack("VCCC", $offset, $ss, $st, $cch);
-			$data .= $sheetname;
-		}
+		$data      = pack("VCC", $offset, $ss, $st);
+		$data .= PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($sheetname);
 
 		$length = strlen($data);
 		$header = pack("vv",  $record, $length);
@@ -972,7 +997,6 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header . $data);
 	}
 
-
 	/**
 	 * Writes Excel FORMAT record for non "built-in" numerical formats.
 	 *
@@ -983,23 +1007,13 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 	{
 		$record    = 0x041E;                      // Record identifier
 
-		if ($this->_BIFF_version == 0x0600) {
-			$numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
-			$length    = 2 + strlen($numberFormatString);      // Number of bytes to follow
-		} elseif ($this->_BIFF_version == 0x0500) {
-			$length    = 3 + strlen($format);      // Number of bytes to follow
-		}
+		$numberFormatString = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($format);
+		$length    = 2 + strlen($numberFormatString);      // Number of bytes to follow
 
 
 		$header    = pack("vv", $record, $length);
-		if ($this->_BIFF_version == 0x0600) {
-			$data      = pack("v", $ifmt) .  $numberFormatString;
-			$this->_append($header . $data);
-		} elseif ($this->_BIFF_version == 0x0500) {
-			$cch       = strlen($format);             // Length of format string
-			$data      = pack("vC", $ifmt, $cch);
-			$this->_append($header . $data . $format);
-		}
+		$data      = pack("v", $ifmt) .  $numberFormatString;
+		$this->_append($header . $data);
 	}
 
 	/**
@@ -1018,7 +1032,6 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header . $data);
 	}
 
-
 	/**
 	 * Write BIFF record EXTERNCOUNT to indicate the number of external sheet
 	 * references in the workbook.
@@ -1041,7 +1054,6 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header . $data);
 	}
 
-
 	/**
 	 * Writes the Excel BIFF EXTERNSHEET record. These references are used by
 	 * formulas. NAME record is required to define the print area and the repeat
@@ -1064,7 +1076,6 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header . $data . $sheetname);
 	}
 
-
 	/**
 	 * Store the NAME record in the short format that is used for storing the print
 	 * area, repeat rows only and repeat columns only.
@@ -1127,7 +1138,6 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header . $data);
 	}
 
-
 	/**
 	 * Store the NAME record in the long format that is used for storing the repeat
 	 * rows and columns when both are specified. This shares a lot of code with
@@ -1314,24 +1324,18 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
 				// there will be need for more than one cylcle, if string longer than one record data block, there
 				// may be need for even more cycles
 
-				if (strlen($recordData) + strlen($string) < $continue_limit) {
+				if (strlen($recordData) + strlen($string) <= $continue_limit) {
 					// then we can write the string (or remainder of string) without any problems
 					$recordData .= $string;
 
-					// we are finished writing this string
-					$finished = true;
-
-				} else if (strlen($recordData) + strlen($string) == $continue_limit) {
-					// then we can also write the string (or remainder of string)
-					$recordData .= $string;
-
-					// but we close the record data block, and initialize a new one
-					$recordDatas[] = $recordData;
-					$recordData = '';
+					if (strlen($recordData) + strlen($string) == $continue_limit) {
+						// we close the record data block, and initialize a new one
+						$recordDatas[] = $recordData;
+						$recordData = '';
+					}
 
 					// we are finished writing this string
 					$finished = true;
-
 				} else {
 					// special treatment writing the string (or remainder of the string)
 					// If the string is very long it may need to be written in more than one CONTINUE record.
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Worksheet.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Worksheet.php
index 3fd9628e07f..9aa5083d915 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Worksheet.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Worksheet.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 // Original file header of PEAR::Spreadsheet_Excel_Writer_Worksheet (used as the base for this class):
@@ -66,7 +66,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 {
@@ -176,7 +176,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 * Sheet object
 	 * @var PHPExcel_Worksheet
 	 */
-	private $_phpSheet;
+	public $_phpSheet;
 
 	/**
 	 * Count cell style Xfs
@@ -192,30 +192,33 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 */
 	private $_escher;
 
+	/**
+	 * Array of font hashes associated to FONT records index
+	 *
+	 * @var array
+	 */
+	public $_fntHashIndex;
+
 	/**
 	 * Constructor
 	 *
-	 * @param int  $BIFF_version		 BIFF version
-	 * @param int  $str_total		Total number of strings
-	 * @param int  $str_unique		Total number of unique strings
-	 * @param array  $str_table
-	 * @param mixed   $parser	  The formula parser created for the Workbook
-	 * @param string   $tempDir	  The temporary directory to be used
+	 * @param int		&$str_total		Total number of strings
+	 * @param int		&$str_unique	Total number of unique strings
+	 * @param array		&$str_table		String Table
+	 * @param array		&$colors		Colour Table
+	 * @param mixed		$parser			The formula parser created for the Workbook
+	 * @param boolean	$preCalculateFormulas	Flag indicating whether formulas should be calculated or just written
+	 * @param string	$phpSheet		The worksheet to write
 	 * @param PHPExcel_Worksheet $phpSheet
 	 */
-	public function __construct($BIFF_version,
-												&$str_total,
-												&$str_unique, &$str_table, &$colors,
-												$parser, $preCalculateFormulas, $phpSheet)
+	public function __construct(&$str_total, &$str_unique, &$str_table, &$colors,
+								$parser, $preCalculateFormulas, $phpSheet)
 	{
 		// It needs to call its parent's constructor explicitly
 		parent::__construct();
 
-		$this->_BIFF_version	= $BIFF_version;
-		if ($BIFF_version == 0x0600) {
-			// change BIFFwriter limit for CONTINUE records
-			$this->_limit = 8224;
-		}
+		// change BIFFwriter limit for CONTINUE records
+//		$this->_limit = 8224;
 
 
 		$this->_preCalculateFormulas = $preCalculateFormulas;
@@ -241,23 +244,23 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_outline_right		= 1;
 		$this->_outline_on			= 1;
 
+		$this->_fntHashIndex	= array();
+
 		// calculate values for DIMENSIONS record
-		$col = $row = array();
-		foreach ($this->_phpSheet->getCellCollection(false) as $cellID) {
-			list($c,$r) = sscanf($cellID,'%[A-Z]%d');
-			$row[$r] = $r;
-			$col[$c] = strlen($c).$c;
-		}
+		$minR = 1;
+		$minC = 'A';
+
+		$maxR  = $this->_phpSheet->getHighestRow();
+		$maxC = $this->_phpSheet->getHighestColumn();
+
 		// Determine lowest and highest column and row
-		$this->_firstRowIndex	= (count($row) > 0) ? min($row) : 1;
-		$this->_lastRowIndex	= (count($row) > 0) ? max($row) : 1;
-		if ($this->_firstRowIndex > 65535) $this->_firstRowIndex = 65535;
-		if ($this->_lastRowIndex > 65535) $this->_lastRowIndex = 65535;
+//		$this->_firstRowIndex = ($minR > 65535) ? 65535 : $minR;
+		$this->_lastRowIndex = ($maxR > 65535) ? 65535 : $maxR ;
 
-		$this->_firstColumnIndex	= (count($col) > 0) ? PHPExcel_Cell::columnIndexFromString(substr(min($col),1)) : 1;
-		$this->_lastColumnIndex		= (count($col) > 0) ? PHPExcel_Cell::columnIndexFromString(substr(max($col),1)) : 1;
+		$this->_firstColumnIndex	= PHPExcel_Cell::columnIndexFromString($minC);
+		$this->_lastColumnIndex		= PHPExcel_Cell::columnIndexFromString($maxC);
 
-		if ($this->_firstColumnIndex > 255) $this->_firstColumnIndex = 255;
+//		if ($this->_firstColumnIndex > 255) $this->_firstColumnIndex = 255;
 		if ($this->_lastColumnIndex > 255) $this->_lastColumnIndex = 255;
 
 		$this->_countCellStyleXfs = count($phpSheet->getParent()->getCellStyleXfCollection());
@@ -272,7 +275,9 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 */
 	function close()
 	{
-		$num_sheets = $this->_phpSheet->getParent()->getSheetCount();
+		$_phpSheet = $this->_phpSheet;
+
+		$num_sheets = $_phpSheet->getParent()->getSheetCount();
 
 		// Write BOF record
 		$this->_storeBof(0x0010);
@@ -287,21 +292,21 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_writeGridset();
 
 		// Calculate column widths
-		$this->_phpSheet->calculateColumnWidths();
+		$_phpSheet->calculateColumnWidths();
 
 		// Column dimensions
-		$maxCol = PHPExcel_Cell::columnIndexFromString($this->_phpSheet->getHighestColumn()) -1;
-		$columnDimensions = $this->_phpSheet->getColumnDimensions();
+		if (($defaultWidth = $_phpSheet->getDefaultColumnDimension()->getWidth()) < 0) {
+			$defaultWidth = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($_phpSheet->getParent()->getDefaultStyle()->getFont());
+		}
+
+		$columnDimensions = $_phpSheet->getColumnDimensions();
+		$maxCol = $this->_lastColumnIndex -1;
 		for ($i = 0; $i <= $maxCol; ++$i) {
 			$hidden = 0;
 			$level = 0;
 			$xfIndex = 15; // there are 15 cell style Xfs
 
-			if ($this->_phpSheet->getDefaultColumnDimension()->getWidth() >= 0) {
-				$width = $this->_phpSheet->getDefaultColumnDimension()->getWidth();
-			} else {
-				$width = PHPExcel_Shared_Font::getDefaultColumnWidthByFont($this->_phpSheet->getParent()->getDefaultStyle()->getFont());
-			}
+			$width = $defaultWidth;
 
 			$columnLetter = PHPExcel_Cell::stringFromColumnIndex($i);
 			if (isset($columnDimensions[$columnLetter])) {
@@ -328,9 +333,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_writeGuts();
 
 		// Write DEFAULTROWHEIGHT
-		if ($this->_BIFF_version == 0x0600) {
-			$this->_writeDefaultRowHeight();
-		}
+		$this->_writeDefaultRowHeight();
 
 		// Write WSBOOL
 		$this->_writeWsbool();
@@ -387,118 +390,126 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 				$this->_writeColinfo($this->_colinfo[$i]);
 			}
 		}
-
-		// Write EXTERNCOUNT of external references
-		if ($this->_BIFF_version == 0x0500) {
-			$this->_writeExterncount($num_sheets);
-		}
-
-		// Write EXTERNSHEET references
-		if ($this->_BIFF_version == 0x0500) {
-			for ($i = 0; $i < $num_sheets; ++$i) {
-				$this->_writeExternsheet($this->_phpSheet->getParent()->getSheet($i)->getTitle());
-			}
+		$autoFilterRange = $_phpSheet->getAutoFilter()->getRange();
+		if (!empty($autoFilterRange)) {
+			// Write AUTOFILTERINFO
+			$this->_writeAutoFilterInfo();
 		}
 
 		// Write sheet dimensions
 		$this->_writeDimensions();
 
 		// Row dimensions
-		foreach ($this->_phpSheet->getRowDimensions() as $rowDimension) {
+		foreach ($_phpSheet->getRowDimensions() as $rowDimension) {
 			$xfIndex = $rowDimension->getXfIndex() + 15; // there are 15 cellXfs
 			$this->_writeRow( $rowDimension->getRowIndex() - 1, $rowDimension->getRowHeight(), $xfIndex, ($rowDimension->getVisible() ? '0' : '1'), $rowDimension->getOutlineLevel() );
 		}
 
 		// Write Cells
-		foreach ($this->_phpSheet->getCellCollection() as $cellID) {
-			$cell = $this->_phpSheet->getCell($cellID);
+		foreach ($_phpSheet->getCellCollection() as $cellID) {
+			$cell = $_phpSheet->getCell($cellID);
 			$row = $cell->getRow() - 1;
 			$column = PHPExcel_Cell::columnIndexFromString($cell->getColumn()) - 1;
 
 			// Don't break Excel!
-			if ($row + 1 > 65536 or $column + 1 > 256) {
+//			if ($row + 1 > 65536 or $column + 1 > 256) {
+			if ($row > 65535 || $column > 255) {
 				break;
 			}
 
 			// Write cell value
 			$xfIndex = $cell->getXfIndex() + 15; // there are 15 cell style Xfs
 
-			if ($cell->getValue() instanceof PHPExcel_RichText) {
-				$this->_writeString($row, $column, $cell->getValue()->getPlainText(), $xfIndex);
+			$cVal = $cell->getValue();
+			if ($cVal instanceof PHPExcel_RichText) {
+				// $this->_writeString($row, $column, $cVal->getPlainText(), $xfIndex);
+				$arrcRun = array();
+				$str_len = strlen($cVal->getPlainText());
+				$str_pos = 0;
+				$elements = $cVal->getRichTextElements();
+				foreach ($elements as $element) {
+					// FONT Index
+					if ($element instanceof PHPExcel_RichText_Run) {
+						$str_fontidx = $this->_fntHashIndex[$element->getFont()->getHashCode()];
+					}
+					else {
+						$str_fontidx = 0;
+					}
+					$arrcRun[] = array('strlen' => $str_pos, 'fontidx' => $str_fontidx);
+					// Position FROM
+					$str_pos += strlen($element->getText());
+				}
+				$this->_writeRichTextString($row, $column, $cVal->getPlainText(), $xfIndex, $arrcRun);
 			} else {
 				switch ($cell->getDatatype()) {
+					case PHPExcel_Cell_DataType::TYPE_STRING:
+					case PHPExcel_Cell_DataType::TYPE_NULL:
+						if ($cVal === '' || $cVal === null) {
+							$this->_writeBlank($row, $column, $xfIndex);
+						} else {
+							$this->_writeString($row, $column, $cVal, $xfIndex);
+						}
+						break;
 
-				case PHPExcel_Cell_DataType::TYPE_STRING:
-					if ($cell->getValue() === '' or $cell->getValue() === null) {
-						$this->_writeBlank($row, $column, $xfIndex);
-					} else {
-						$this->_writeString($row, $column, $cell->getValue(), $xfIndex);
-					}
-					break;
+					case PHPExcel_Cell_DataType::TYPE_NUMERIC:
+						$this->_writeNumber($row, $column, $cVal, $xfIndex);
+						break;
 
-				case PHPExcel_Cell_DataType::TYPE_FORMULA:
-					$calculatedValue = $this->_preCalculateFormulas ?
-						$cell->getCalculatedValue() : null;
-					$this->_writeFormula($row, $column, $cell->getValue(), $xfIndex, $calculatedValue);
-					break;
+					case PHPExcel_Cell_DataType::TYPE_FORMULA:
+						$calculatedValue = $this->_preCalculateFormulas ?
+							$cell->getCalculatedValue() : null;
+						$this->_writeFormula($row, $column, $cVal, $xfIndex, $calculatedValue);
+						break;
 
-				case PHPExcel_Cell_DataType::TYPE_BOOL:
-					$this->_writeBoolErr($row, $column, $cell->getValue(), 0, $xfIndex);
-					break;
+					case PHPExcel_Cell_DataType::TYPE_BOOL:
+						$this->_writeBoolErr($row, $column, $cVal, 0, $xfIndex);
+						break;
 
-				case PHPExcel_Cell_DataType::TYPE_ERROR:
-					$this->_writeBoolErr($row, $column, $this->_mapErrorCode($cell->getValue()), 1, $xfIndex);
-					break;
+					case PHPExcel_Cell_DataType::TYPE_ERROR:
+						$this->_writeBoolErr($row, $column, self::_mapErrorCode($cVal), 1, $xfIndex);
+						break;
 
-				case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-					$this->_writeNumber($row, $column, $cell->getValue(), $xfIndex);
-					break;
 				}
 			}
 		}
 
 		// Append
-		if ($this->_BIFF_version == 0x0600) {
-			$this->_writeMsoDrawing();
-		}
+		$this->_writeMsoDrawing();
+
 		$this->_writeWindow2();
 		$this->_writeZoom();
-		if ($this->_phpSheet->getFreezePane()) {
+		if ($_phpSheet->getFreezePane()) {
 			$this->_writePanes();
 		}
 		$this->_writeSelection();
 		$this->_writeMergedCells();
 
 		// Hyperlinks
-		if ($this->_BIFF_version == 0x0600) {
-			foreach ($this->_phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinate);
+		foreach ($_phpSheet->getHyperLinkCollection() as $coordinate => $hyperlink) {
+			list($column, $row) = PHPExcel_Cell::coordinateFromString($coordinate);
 
-				$url = $hyperlink->getUrl();
+			$url = $hyperlink->getUrl();
 
-				if ( strpos($url, 'sheet://') !== false ) {
-					// internal to current workbook
-					$url = str_replace('sheet://', 'internal:', $url);
+			if ( strpos($url, 'sheet://') !== false ) {
+				// internal to current workbook
+				$url = str_replace('sheet://', 'internal:', $url);
 
-				} else if ( preg_match('/^(http:|https:|ftp:|mailto:)/', $url) ) {
-					// URL
-					// $url = $url;
+			} else if ( preg_match('/^(http:|https:|ftp:|mailto:)/', $url) ) {
+				// URL
+				// $url = $url;
 
-				} else {
-					// external (local file)
-					$url = 'external:' . $url;
-				}
-
-				$this->_writeUrl($row - 1, PHPExcel_Cell::columnIndexFromString($column) - 1, $url);
+			} else {
+				// external (local file)
+				$url = 'external:' . $url;
 			}
+
+			$this->_writeUrl($row - 1, PHPExcel_Cell::columnIndexFromString($column) - 1, $url);
 		}
 
-		if ($this->_BIFF_version == 0x0600) {
-			$this->_writeDataValidity();
-			$this->_writeSheetLayout();
-			$this->_writeSheetProtection();
-			$this->_writeRangeProtection();
-		}
+		$this->_writeDataValidity();
+		$this->_writeSheetLayout();
+		$this->_writeSheetProtection();
+		$this->_writeRangeProtection();
 
 		$this->_storeEof();
 	}
@@ -600,7 +611,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 * @param integer $row	Zero indexed row
 	 * @param integer $col	Zero indexed column
 	 * @param float   $num	The number to write
-	 * @param mixed   $format The optional XF format
+	 * @param mixed   $xfIndex The optional XF format
 	 * @return integer
 	 */
 	private function _writeNumber($row, $col, $num, $xfIndex)
@@ -608,10 +619,10 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$record	= 0x0203;				 // Record identifier
 		$length	= 0x000E;				 // Number of bytes to follow
 
-		$header	= pack("vv",  $record, $length);
-		$data	  = pack("vvv", $row, $col, $xfIndex);
-		$xl_double = pack("d",   $num);
-		if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+		$header		= pack("vv",  $record, $length);
+		$data		= pack("vvv", $row, $col, $xfIndex);
+		$xl_double	= pack("d",   $num);
+		if (self::getByteOrder()) { // if it's Big Endian
 			$xl_double = strrev($xl_double);
 		}
 
@@ -629,12 +640,34 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 */
 	private function _writeString($row, $col, $str, $xfIndex)
 	{
-		if ($this->_BIFF_version == 0x0600) {
-			$this->_writeLabelSst($row, $col, $str, $xfIndex);
-		} else {
-			$this->_writeLabel($row, $col, $str, $xfIndex);
-		}
+		$this->_writeLabelSst($row, $col, $str, $xfIndex);
 	}
+	/**
+	 * Write a LABELSST record or a LABEL record. Which one depends on BIFF version
+	 * It differs from _writeString by the writing of rich text strings.
+	 * @param int $row Row index (0-based)
+	 * @param int $col Column index (0-based)
+	 * @param string $str The string
+	 * @param mixed   $xfIndex The XF format index for the cell
+	 * @param array $arrcRun Index to Font record and characters beginning
+	 */
+	private function _writeRichTextString($row, $col, $str, $xfIndex, $arrcRun){
+		$record	= 0x00FD;				   // Record identifier
+		$length	= 0x000A;				   // Bytes to follow
+
+		$str = PHPExcel_Shared_String::UTF8toBIFF8UnicodeShort($str, $arrcRun);
+
+		/* check if string is already present */
+		if (!isset($this->_str_table[$str])) {
+			$this->_str_table[$str] = $this->_str_unique++;
+		}
+		$this->_str_total++;
+
+		$header	= pack('vv',   $record, $length);
+		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
+		$this->_append($header.$data);
+	}
+
 	/**
 	 * Write a string to the specified row and column (zero indexed).
 	 * NOTE: there is an Excel 5 defined limit of 255 characters.
@@ -647,7 +680,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 * @param integer $row	Zero indexed row
 	 * @param integer $col	Zero indexed column
 	 * @param string  $str	The string to write
-	 * @param mixed   $format The XF format for the cell
+	 * @param mixed   $xfIndex The XF format index for the cell
 	 * @return integer
 	 */
 	private function _writeLabel($row, $col, $str, $xfIndex)
@@ -659,14 +692,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$str_error = 0;
 
 		if ($strlen > $this->_xls_strmax) { // LABEL must be < 255 chars
-			$str	   = substr($str, 0, $this->_xls_strmax);
+			$str	= substr($str, 0, $this->_xls_strmax);
 			$length	= 0x0008 + $this->_xls_strmax;
 			$strlen	= $this->_xls_strmax;
 			$str_error = -3;
 		}
 
 		$header	= pack("vv",   $record, $length);
-		$data	  = pack("vvvv", $row, $col, $xfIndex, $strlen);
+		$data	= pack("vvvv", $row, $col, $xfIndex, $strlen);
 		$this->_append($header . $data . $str);
 		return($str_error);
 	}
@@ -683,7 +716,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 * @param integer $row	Zero indexed row
 	 * @param integer $col	Zero indexed column
 	 * @param string  $str	The string to write
-	 * @param mixed   $format The XF format for the cell
+	 * @param mixed   $xfIndex The XF format index for the cell
 	 * @return integer
 	 */
 	private function _writeLabelSst($row, $col, $str, $xfIndex)
@@ -700,7 +733,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_str_total++;
 
 		$header	= pack('vv',   $record, $length);
-		$data	  = pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
+		$data	= pack('vvvV', $row, $col, $xfIndex, $this->_str_table[$str]);
 		$this->_append($header.$data);
 	}
 
@@ -715,14 +748,13 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	private function _writeNote($row, $col, $note)
 	{
 		$note_length	= strlen($note);
-		$record		 = 0x001C;				// Record identifier
-		$max_length	 = 2048;				  // Maximun length for a NOTE record
-		//$length	  = 0x0006 + $note_length;	// Bytes to follow
+		$record			= 0x001C;			// Record identifier
+		$max_length		= 2048;				// Maximun length for a NOTE record
 
 		// Length for this record is no more than 2048 + 6
 		$length	= 0x0006 + min($note_length, 2048);
 		$header	= pack("vv",   $record, $length);
-		$data	  = pack("vvv", $row, $col, $note_length);
+		$data	= pack("vvv", $row, $col, $note_length);
 		$this->_append($header . $data . substr($note, 0, 2048));
 
 		for ($i = $max_length; $i < $note_length; $i += $max_length) {
@@ -749,7 +781,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 *
 	 * @param integer $row	Zero indexed row
 	 * @param integer $col	Zero indexed column
-	 * @param mixed   $format The XF format
+	 * @param mixed   $xfIndex The XF format index
 	 */
 	function _writeBlank($row, $col, $xfIndex)
 	{
@@ -794,7 +826,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 * @param integer $row	 Zero indexed row
 	 * @param integer $col	 Zero indexed column
 	 * @param string  $formula The formula text string
-	 * @param mixed   $format  The optional XF format
+	 * @param mixed   $xfIndex  The XF format index
 	 * @param mixed   $calculatedValue  Calculated value
 	 * @return integer
 	 */
@@ -807,46 +839,36 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		// calculated value
 		if (isset($calculatedValue)) {
-
 			// Since we can't yet get the data type of the calculated value,
 			// we use best effort to determine data type
-
 			if (is_bool($calculatedValue)) {
 				// Boolean value
 				$num = pack('CCCvCv', 0x01, 0x00, (int)$calculatedValue, 0x00, 0x00, 0xFFFF);
-
 			} elseif (is_int($calculatedValue) || is_float($calculatedValue)) {
 				// Numeric value
 				$num = pack('d', $calculatedValue);
-
 			} elseif (is_string($calculatedValue)) {
 				if (array_key_exists($calculatedValue, PHPExcel_Cell_DataType::getErrorCodes())) {
 					// Error value
-					$num = pack('CCCvCv', 0x02, 0x00, $this->_mapErrorCode($calculatedValue), 0x00, 0x00, 0xFFFF);
-
-				} elseif ($calculatedValue === '' && $this->_BIFF_version == 0x0600) {
+					$num = pack('CCCvCv', 0x02, 0x00, self::_mapErrorCode($calculatedValue), 0x00, 0x00, 0xFFFF);
+				} elseif ($calculatedValue === '') {
 					// Empty string (and BIFF8)
 					$num = pack('CCCvCv', 0x03, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
-
 				} else {
 					// Non-empty string value (or empty string BIFF5)
 					$stringValue = $calculatedValue;
 					$num = pack('CCCvCv', 0x00, 0x00, 0x00, 0x00, 0x00, 0xFFFF);
-
 				}
-
 			} else {
 				// We are really not supposed to reach here
 				$num = pack('d', 0x00);
-
 			}
-
 		} else {
 			$num = pack('d', 0x00);
 		}
 
-		$grbit	 = 0x03;				// Option flags
-		$unknown   = 0x0000;			  // Must be zero
+		$grbit		= 0x03;				// Option flags
+		$unknown	= 0x0000;			// Must be zero
 
 		// Strip the '=' or '@' sign at the beginning of the formula string
 		if ($formula{0} == '=') {
@@ -942,10 +964,8 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	 * @param string  $url	URL string
 	 * @return integer
 	 */
-
 	function _writeUrlRange($row1, $col1, $row2, $col2, $url)
 	{
-
 		// Check for internal/external sheet links or default to web link
 		if (preg_match('[^internal:]', $url)) {
 			return($this->_writeUrlInternal($row1, $col1, $row2, $col2, $url));
@@ -956,7 +976,6 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		return($this->_writeUrlWeb($row1, $col1, $row2, $col2, $url));
 	}
 
-
 	/**
 	 * Used to write http, ftp and mailto hyperlinks.
 	 * The link type ($options) is 0x03 is the same as absolute dir ref without
@@ -1218,26 +1237,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	{
 		$record = 0x0200; // Record identifier
 
-		if ($this->_BIFF_version == 0x0500) {
-			$length = 0x000A;			   // Number of bytes to follow
-			$data = pack("vvvvv"
-					, $this->_firstRowIndex
-					, $this->_lastRowIndex + 1
-					, $this->_firstColumnIndex
-					, $this->_lastColumnIndex + 1
-					, 0x0000 // reserved
-				);
-
-		} elseif ($this->_BIFF_version == 0x0600) {
-			$length = 0x000E;
-			$data = pack('VVvvv'
-					, $this->_firstRowIndex
-					, $this->_lastRowIndex + 1
-					, $this->_firstColumnIndex
-					, $this->_lastColumnIndex + 1
-					, 0x0000 // reserved
-				);
-		}
+		$length = 0x000E;
+		$data = pack('VVvvv'
+				, $this->_firstRowIndex
+				, $this->_lastRowIndex + 1
+				, $this->_firstColumnIndex
+				, $this->_lastColumnIndex + 1
+				, 0x0000 // reserved
+			);
 
 		$header = pack("vv", $record, $length);
 		$this->_append($header.$data);
@@ -1249,11 +1256,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 	private function _writeWindow2()
 	{
 		$record		 = 0x023E;	 // Record identifier
-		if ($this->_BIFF_version == 0x0500) {
-			$length		 = 0x000A;	 // Number of bytes to follow
-		} elseif ($this->_BIFF_version == 0x0600) {
-			$length		 = 0x0012;
-		}
+		$length		 = 0x0012;
 
 		$grbit		  = 0x00B6;	 // Option flags
 		$rwTop		  = 0x0000;	 // Top row visible in window
@@ -1288,16 +1291,13 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$header  = pack("vv",   $record, $length);
 		$data	= pack("vvv", $grbit, $rwTop, $colLeft);
+
 		// FIXME !!!
-		if ($this->_BIFF_version == 0x0500) {
-			$rgbHdr		 = 0x00000000; // Row/column heading and gridline color
-			$data .= pack("V", $rgbHdr);
-		} elseif ($this->_BIFF_version == 0x0600) {
-			$rgbHdr	   = 0x0040; // Row/column heading and gridline color index
-			$zoom_factor_page_break = 0x0000;
-			$zoom_factor_normal	 = 0x0000;
-			$data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
-		}
+		$rgbHdr	   = 0x0040; // Row/column heading and gridline color index
+		$zoom_factor_page_break = 0x0000;
+		$zoom_factor_normal	 = 0x0000;
+		$data .= pack("vvvvV", $rgbHdr, 0x0000, $zoom_factor_page_break, $zoom_factor_normal, 0x00000000);
+
 		$this->_append($header.$data);
 	}
 
@@ -1424,13 +1424,9 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		// make sure we are not out of bounds
 		$colFirst = min($colFirst, 255);
 		$colLast  = min($colLast,  255);
-		if ($this->_BIFF_version == 0x0600) {
-			$rwFirst = min($rwFirst, 65535);
-			$rwLast  = min($rwLast,  65535);
-		} else {
-			$rwFirst = min($rwFirst, 16383);
-			$rwLast  = min($rwLast,  16383);
-		}
+
+		$rwFirst = min($rwFirst, 65535);
+		$rwLast  = min($rwLast,  65535);
 
 		$record   = 0x001D;				  // Record identifier
 		$length   = 0x000F;				  // Number of bytes to follow
@@ -1478,11 +1474,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		}
 
 		// maximum allowed number of merged cells per record
-		if ($this->_BIFF_version == 0x0600) {
-			$maxCountMergeCellsPerRecord = 1027;
-		} else {
-			$maxCountMergeCellsPerRecord = 259;
-		}
+		$maxCountMergeCellsPerRecord = 1027;
 
 		// record identifier
 		$record = 0x00E5;
@@ -1748,7 +1740,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 			// The default column width is 8.43
 			// The following slope and intersection values were interpolated.
 			//
-			$y = 20*$y	  + 255;
+			$y = 20*$y + 255;
 			$x = 113.879*$x + 390;
 		}
 
@@ -1827,7 +1819,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$numHdr = pack("d", $numHdr);
 		$numFtr = pack("d", $numFtr);
-		if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+		if (self::getByteOrder()) { // if it's Big Endian
 			$numHdr = strrev($numHdr);
 			$numFtr = strrev($numFtr);
 		}
@@ -1862,15 +1854,8 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		}
 		*/
 
-		if ($this->_BIFF_version == 0x0600) {
-			$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddHeader());
-			$length = strlen($recordData);
-		} else {
-			$cch	  = strlen($this->_phpSheet->getHeaderFooter()->getOddHeader());		 // Length of header string
-			$length  = 1 + $cch;			 // Bytes to follow
-			$data	  = pack("C",  $cch);
-			$recordData = $data . $this->_phpSheet->getHeaderFooter()->getOddHeader();
-		}
+		$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddHeader());
+		$length = strlen($recordData);
 
 		$header   = pack("vv", $record, $length);
 
@@ -1893,15 +1878,8 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		}
 		*/
 
-		if ($this->_BIFF_version == 0x0600) {
-			$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddFooter());
-			$length = strlen($recordData);
-		} else {
-			$cch	  = strlen($this->_phpSheet->getHeaderFooter()->getOddFooter());		 // Length of footer string
-			$length  = 1 + $cch;
-			$data	  = pack("C",  $cch);
-			$recordData = $data . $this->_phpSheet->getHeaderFooter()->getOddFooter();
-		}
+		$recordData = PHPExcel_Shared_String::UTF8toBIFF8UnicodeLong($this->_phpSheet->getHeaderFooter()->getOddFooter());
+		$length = strlen($recordData);
 
 		$header	= pack("vv", $record, $length);
 
@@ -1953,7 +1931,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$header	= pack("vv",  $record, $length);
 		$data	  = pack("d",   $margin);
-		if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
@@ -1972,7 +1950,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$header	= pack("vv",  $record, $length);
 		$data	  = pack("d",   $margin);
-		if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
@@ -1991,7 +1969,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$header	= pack("vv",  $record, $length);
 		$data	  = pack("d",   $margin);
-		if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
@@ -2010,7 +1988,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 		$header	= pack("vv",  $record, $length);
 		$data	  = pack("d",   $margin);
-		if (PHPExcel_Writer_Excel5_BIFFwriter::getByteOrder()) { // if it's Big Endian
+		if (self::getByteOrder()) { // if it's Big Endian
 			$data = strrev($data);
 		}
 
@@ -2044,7 +2022,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$fPrintGrid  = $this->_phpSheet->getPrintGridlines() ? 1 : 0;	// Boolean flag
 
 		$header	  = pack("vv", $record, $length);
-		$data		= pack("v", $fPrintGrid);
+		$data	  = pack("v", $fPrintGrid);
 		$this->_append($header . $data);
 	}
 
@@ -2064,6 +2042,21 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header . $data);
 	}
 
+	/**
+	 * Write the AUTOFILTERINFO BIFF record. This is used to configure the number of autofilter select used in the sheet.
+	 */
+	private function _writeAutoFilterInfo(){
+		$record	  = 0x009D;						// Record identifier
+		$length	  = 0x0002;						// Bytes to follow
+
+		$rangeBounds = PHPExcel_Cell::rangeBoundaries($this->_phpSheet->getAutoFilter()->getRange());
+		$iNumFilters = 1 + $rangeBounds[1][0] - $rangeBounds[0][0];
+
+		$header   = pack("vv", $record, $length);
+		$data     = pack("v",  $iNumFilters);
+		$this->_append($header . $data);
+	}
+
 	/**
 	 * Write the GUTS BIFF record. This is used to configure the gutter margins
 	 * where Excel outline symbols are displayed. The visibility of the gutters is
@@ -2111,7 +2104,6 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header.$data);
 	}
 
-
 	/**
 	 * Write the WSBOOL BIFF record, mainly for fit-to-page. Used in conjunction
 	 * with the SETUP record.
@@ -2181,7 +2173,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		}
 
 		//horizontal page breaks
-		if (count($hbreaks) > 0) {
+		if (!empty($hbreaks)) {
 
 			// Sort and filter array of page breaks
 			sort($hbreaks, SORT_NUMERIC);
@@ -2191,29 +2183,21 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 			$record  = 0x001b;			   // Record identifier
 			$cbrk	= count($hbreaks);	   // Number of page breaks
-			if ($this->_BIFF_version == 0x0600) {
-				$length  = 2 + 6 * $cbrk;	  // Bytes to follow
-			} else {
-				$length  = 2 + 2 * $cbrk;	  // Bytes to follow
-			}
+			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
 
 			$header  = pack("vv", $record, $length);
 			$data	= pack("v",  $cbrk);
 
 			// Append each page break
 			foreach ($hbreaks as $hbreak) {
-				if ($this->_BIFF_version == 0x0600) {
-					$data .= pack("vvv", $hbreak, 0x0000, 0x00ff);
-				} else {
-					$data .= pack("v", $hbreak);
-				}
+				$data .= pack("vvv", $hbreak, 0x0000, 0x00ff);
 			}
 
 			$this->_append($header . $data);
 		}
 
 		// vertical page breaks
-		if (count($vbreaks) > 0) {
+		if (!empty($vbreaks)) {
 
 			// 1000 vertical pagebreaks appears to be an internal Excel 5 limit.
 			// It is slightly higher in Excel 97/200, approx. 1026
@@ -2227,22 +2211,14 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 			$record  = 0x001a;			   // Record identifier
 			$cbrk	= count($vbreaks);	   // Number of page breaks
-			if ($this->_BIFF_version == 0x0600) {
-				$length  = 2 + 6 * $cbrk;	  // Bytes to follow
-			} else {
-				$length  = 2 + 2 * $cbrk;	  // Bytes to follow
-			}
+			$length  = 2 + 6 * $cbrk;	  // Bytes to follow
 
 			$header  = pack("vv",  $record, $length);
 			$data	= pack("v",   $cbrk);
 
 			// Append each page break
 			foreach ($vbreaks as $vbreak) {
-				if ($this->_BIFF_version == 0x0600) {
-					$data .= pack("vvv", $vbreak, 0x0000, 0xffff);
-				} else {
-					$data .= pack("v", $vbreak);
-				}
+				$data .= pack("vvv", $vbreak, 0x0000, 0xffff);
 			}
 
 			$this->_append($header . $data);
@@ -2339,7 +2315,6 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$this->_append($header . $data);
 	}
 
-
 	/**
 	 * Insert a 24bit bitmap image in a worksheet.
 	 *
@@ -2726,7 +2701,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 			$writer = new PHPExcel_Writer_Excel5_Escher($this->_escher);
 			$data = $writer->close();
 			$spOffsets = $writer->getSpOffsets();
-
+			$spTypes = $writer->getSpTypes();
 			// write the neccesary MSODRAWING, OBJ records
 
 			// split the Escher stream
@@ -2737,7 +2712,6 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 				$record = 0x00EC;			// Record identifier
 
 				// chunk of Escher stream for one shape
-
 				$dataChunk = substr($data, $spOffsets[$i -1], $spOffsets[$i] - $spOffsets[$i - 1]);
 
 				$length = strlen($dataChunk);
@@ -2750,17 +2724,42 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 				$objData = '';
 
 				// ftCmo
-				$objData .=
-					pack('vvvvvVVV'
-						, 0x0015	// 0x0015 = ftCmo
-						, 0x0012	// length of ftCmo data
-						, 0x0008	// object type, 0x0008 = picture
-						, $i		// object id number, Excel seems to use 1-based index, local for the sheet
-						, 0x6011	// option flags, 0x6011 is what OpenOffice.org uses
-						, 0			// reserved
-						, 0			// reserved
-						, 0			// reserved
-					);
+				if($spTypes[$i] == 0x00C9){
+					// Add ftCmo (common object data) subobject
+					$objData .=
+						pack('vvvvvVVV'
+								, 0x0015	// 0x0015 = ftCmo
+								, 0x0012	// length of ftCmo data
+								, 0x0014	// object type, 0x0014 = filter
+								, $i		// object id number, Excel seems to use 1-based index, local for the sheet
+								, 0x2101	// option flags, 0x2001 is what OpenOffice.org uses
+								, 0			// reserved
+								, 0			// reserved
+								, 0			// reserved
+						);
+
+					// Add ftSbs Scroll bar subobject
+					$objData .= pack('vv', 0x00C, 0x0014);
+					$objData .= pack('H*', '0000000000000000640001000A00000010000100');
+					// Add ftLbsData (List box data) subobject
+					$objData .= pack('vv', 0x0013, 0x1FEE);
+					$objData .= pack('H*', '00000000010001030000020008005700');
+				}
+				else {
+					// Add ftCmo (common object data) subobject
+					$objData .=
+						pack('vvvvvVVV'
+							, 0x0015	// 0x0015 = ftCmo
+							, 0x0012	// length of ftCmo data
+							, 0x0008	// object type, 0x0008 = picture
+							, $i		// object id number, Excel seems to use 1-based index, local for the sheet
+							, 0x6011	// option flags, 0x6011 is what OpenOffice.org uses
+							, 0			// reserved
+							, 0			// reserved
+							, 0			// reserved
+						);
+				}
+
 				// ftEnd
 				$objData .=
 					pack('vv'
@@ -2784,21 +2783,21 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 		$dataValidationCollection = $this->_phpSheet->getDataValidationCollection();
 
 		// Write data validations?
-		if (count($dataValidationCollection) > 0) {
+		if (!empty($dataValidationCollection)) {
 
 			// DATAVALIDATIONS record
 			$record = 0x01B2;	  // Record identifier
-		$length	  = 0x0012;	  // Bytes to follow
+			$length	  = 0x0012;	  // Bytes to follow
 
 			$grbit  = 0x0000;	   // Prompt box at cell, no cached validity data at DV records
-		$horPos	  = 0x00000000;  // Horizontal position of prompt box, if fixed position
-		$verPos	  = 0x00000000;  // Vertical position of prompt box, if fixed position
+			$horPos	  = 0x00000000;  // Horizontal position of prompt box, if fixed position
+			$verPos	  = 0x00000000;  // Vertical position of prompt box, if fixed position
 			$objId  = 0xFFFFFFFF;  // Object identifier of drop down arrow object, or -1 if not visible
 
-		$header	  = pack('vv', $record, $length);
-		$data		= pack('vVVVV', $grbit, $horPos, $verPos, $objId,
+			$header	  = pack('vv', $record, $length);
+			$data		= pack('vVVVV', $grbit, $horPos, $verPos, $objId,
 										 count($dataValidationCollection));
-		$this->_append($header.$data);
+			$this->_append($header.$data);
 
 			// DATAVALIDATION records
 			$record = 0x01BE;			  // Record identifier
@@ -2934,8 +2933,11 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
 
 	/**
 	 * Map Error code
+	 *
+	 * @param string $errorCode
+	 * @return int
 	 */
-	private function _mapErrorCode($errorCode) {
+	private static function _mapErrorCode($errorCode) {
 		switch ($errorCode) {
 			case '#NULL!':	return 0x00;
 			case '#DIV/0!':	return 0x07;
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Xf.php b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Xf.php
index 6d48e5bfa03..06fb1d9d8cf 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Xf.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/Excel5/Xf.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 // Original file header of PEAR::Spreadsheet_Excel_Writer_Format (used as the base for this class):
@@ -66,17 +66,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer_Excel5
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_Excel5_Xf
 {
-	/**
-	 * BIFF version
-	 *
-	 * @var int
-	 */
-	private $_BIFFVersion;
-
     /**
 	 * Style XF or a cell XF ?
 	 *
@@ -141,14 +134,12 @@ class PHPExcel_Writer_Excel5_Xf
 	/**
 	 * Constructor
 	 *
-	 * @access private
-	 * @param integer $index the XF index for the format.
-	 * @param PHPExcel_Style
+	 * @access public
+	 * @param PHPExcel_Style	The XF format
 	 */
 	public function __construct(PHPExcel_Style $style = null)
 	{
 		$this->_isStyleXf =     false;
-		$this->_BIFFVersion   = 0x0600;
 		$this->_fontIndex      = 0;
 
 		$this->_numberFormatIndex     = 0;
@@ -173,7 +164,6 @@ class PHPExcel_Writer_Excel5_Xf
 	/**
 	 * Generate an Excel BIFF XF record (style or cell).
 	 *
-	 * @param string $style The type of the XF record ('style' or 'cell').
 	 * @return string The XF record
 	 */
 	function writeXf()
@@ -182,148 +172,100 @@ class PHPExcel_Writer_Excel5_Xf
 		if ($this->_isStyleXf) {
 			$style = 0xFFF5;
 		} else {
-			$style   = $this->_mapLocked($this->_style->getProtection()->getLocked());
-			$style  |= $this->_mapHidden($this->_style->getProtection()->getHidden()) << 1;
+			$style   = self::_mapLocked($this->_style->getProtection()->getLocked());
+			$style  |= self::_mapHidden($this->_style->getProtection()->getHidden()) << 1;
 		}
 
 		// Flags to indicate if attributes have been set.
 		$atr_num     = ($this->_numberFormatIndex != 0)?1:0;
 		$atr_fnt     = ($this->_fontIndex != 0)?1:0;
 		$atr_alc     = ((int) $this->_style->getAlignment()->getWrapText())?1:0;
-		$atr_bdr     = ($this->_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
-						$this->_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
-						$this->_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
-						$this->_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
+		$atr_bdr     = (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
+						self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
+						self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
+						self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
 		$atr_pat     = (($this->_fg_color != 0x40) ||
 						($this->_bg_color != 0x41) ||
-						$this->_mapFillType($this->_style->getFill()->getFillType()))?1:0;
-		$atr_prot    = $this->_mapLocked($this->_style->getProtection()->getLocked())
-						| $this->_mapHidden($this->_style->getProtection()->getHidden());
+						self::_mapFillType($this->_style->getFill()->getFillType()))?1:0;
+		$atr_prot    = self::_mapLocked($this->_style->getProtection()->getLocked())
+						| self::_mapHidden($this->_style->getProtection()->getHidden());
 
 		// Zero the default border colour if the border has not been set.
-		if ($this->_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
+		if (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
 			$this->_bottom_color = 0;
 		}
-		if ($this->_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())  == 0) {
+		if (self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())  == 0) {
 			$this->_top_color = 0;
 		}
-		if ($this->_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
+		if (self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
 			$this->_right_color = 0;
 		}
-		if ($this->_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) == 0) {
+		if (self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) == 0) {
 			$this->_left_color = 0;
 		}
-		if ($this->_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) == 0) {
+		if (self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) == 0) {
 			$this->_diag_color = 0;
 		}
 
 		$record         = 0x00E0;              // Record identifier
-		if ($this->_BIFFVersion == 0x0500) {
-			$length         = 0x0010;              // Number of bytes to follow
-		}
-		if ($this->_BIFFVersion == 0x0600) {
-			$length         = 0x0014;
-		}
+		$length         = 0x0014;              // Number of bytes to follow
 
 		$ifnt           = $this->_fontIndex;   // Index to FONT record
 		$ifmt           = $this->_numberFormatIndex;  // Index to FORMAT record
-		if ($this->_BIFFVersion == 0x0500) {
-			$align          = $this->_mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
-			$align         |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
-			$align         |= $this->_mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
-			$align         |= $this->_text_justlast << 7;
-			$align         |= 0                       << 8; // rotation
-			$align         |= $atr_num                << 10;
-			$align         |= $atr_fnt                << 11;
-			$align         |= $atr_alc                << 12;
-			$align         |= $atr_bdr                << 13;
-			$align         |= $atr_pat                << 14;
-			$align         |= $atr_prot               << 15;
 
-			$icv            = $this->_fg_color;       // fg and bg pattern colors
-			$icv           |= $this->_bg_color      << 7;
+		$align          = $this->_mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
+		$align         |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
+		$align         |= self::_mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
+		$align         |= $this->_text_justlast << 7;
 
-			$fill           = $this->_mapFillType($this->_style->getFill()->getFillType());        // Fill and border line style
-			$fill          |= $this->_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 6;
-			$fill          |= $this->_bottom_color  << 9;
+		$used_attrib    = $atr_num              << 2;
+		$used_attrib   |= $atr_fnt              << 3;
+		$used_attrib   |= $atr_alc              << 4;
+		$used_attrib   |= $atr_bdr              << 5;
+		$used_attrib   |= $atr_pat              << 6;
+		$used_attrib   |= $atr_prot             << 7;
 
-			$border1        = $this->_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle());            // Border line style and color
-			$border1       |= $this->_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())          << 3;
-			$border1       |= $this->_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 6;
-			$border1       |= $this->_top_color     << 9;
+		$icv            = $this->_fg_color;      // fg and bg pattern colors
+		$icv           |= $this->_bg_color      << 7;
 
-			$border2        = $this->_left_color;     // Border color
-			$border2       |= $this->_right_color   << 7;
+		$border1        = self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle());          // Border line style and color
+		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 4;
+		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())           << 8;
+		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 12;
+		$border1       |= $this->_left_color    << 16;
+		$border1       |= $this->_right_color   << 23;
 
-			$header      = pack("vv",       $record, $length);
-			$data        = pack("vvvvvvvv", $ifnt, $ifmt, $style, $align,
-											$icv, $fill,
-											$border1, $border2);
-		} elseif ($this->_BIFFVersion == 0x0600) {
-			$align          = $this->_mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
-			$align         |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
-			$align         |= $this->_mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
-			$align         |= $this->_text_justlast << 7;
+		$diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
+		$diag_tl_to_rb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
+							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_DOWN;
+		$diag_tr_to_lb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
+							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_UP;
+		$border1       |= $diag_tl_to_rb        << 30;
+		$border1       |= $diag_tr_to_lb        << 31;
 
-			$used_attrib    = $atr_num              << 2;
-			$used_attrib   |= $atr_fnt              << 3;
-			$used_attrib   |= $atr_alc              << 4;
-			$used_attrib   |= $atr_bdr              << 5;
-			$used_attrib   |= $atr_pat              << 6;
-			$used_attrib   |= $atr_prot             << 7;
+		$border2        = $this->_top_color;    // Border color
+		$border2       |= $this->_bottom_color   << 7;
+		$border2       |= $this->_diag_color     << 14;
+		$border2       |= self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle())           << 21;
+		$border2       |= self::_mapFillType($this->_style->getFill()->getFillType())        << 26;
 
-			$icv            = $this->_fg_color;      // fg and bg pattern colors
-			$icv           |= $this->_bg_color      << 7;
+		$header      = pack("vv",       $record, $length);
 
-			$border1        = $this->_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle());          // Border line style and color
-			$border1       |= $this->_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 4;
-			$border1       |= $this->_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())           << 8;
-			$border1       |= $this->_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 12;
-			$border1       |= $this->_left_color    << 16;
-			$border1       |= $this->_right_color   << 23;
+		//BIFF8 options: identation, shrinkToFit and  text direction
+		$biff8_options  = $this->_style->getAlignment()->getIndent();
+		$biff8_options |= (int) $this->_style->getAlignment()->getShrinkToFit() << 4;
 
-			$diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
-			$diag_tl_to_rb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
-								|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_DOWN;
-			$diag_tr_to_lb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
-								|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_UP;
-			$border1       |= $diag_tl_to_rb        << 30;
-			$border1       |= $diag_tr_to_lb        << 31;
-
-			$border2        = $this->_top_color;    // Border color
-			$border2       |= $this->_bottom_color   << 7;
-			$border2       |= $this->_diag_color     << 14;
-			$border2       |= $this->_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle())           << 21;
-			$border2       |= $this->_mapFillType($this->_style->getFill()->getFillType())        << 26;
-
-			$header      = pack("vv",       $record, $length);
-
-			//BIFF8 options: identation, shrinkToFit and  text direction
-			$biff8_options  = $this->_style->getAlignment()->getIndent();
-			$biff8_options |= (int) $this->_style->getAlignment()->getShrinkToFit() << 4;
-
-			$data  = pack("vvvC", $ifnt, $ifmt, $style, $align);
-			$data .= pack("CCC"
-				, $this->_mapTextRotation($this->_style->getAlignment()->getTextRotation())
-				, $biff8_options
-				, $used_attrib
-				);
-			$data .= pack("VVv", $border1, $border2, $icv);
-		}
+		$data  = pack("vvvC", $ifnt, $ifmt, $style, $align);
+		$data .= pack("CCC"
+			, self::_mapTextRotation($this->_style->getAlignment()->getTextRotation())
+			, $biff8_options
+			, $used_attrib
+			);
+		$data .= pack("VVv", $border1, $border2, $icv);
 
 		return($header . $data);
 	}
 
-	/**
-	 * Set BIFF version
-	 *
-	 * @param int $BIFFVersion
-	 */
-	public function setBIFFVersion($BIFFVersion)
-	{
-		$this->_BIFFVersion = $BIFFVersion;
-	}
-
 	/**
 	 * Is this a style XF ?
 	 *
@@ -435,58 +377,89 @@ class PHPExcel_Writer_Excel5_Xf
 	}
 
 	/**
-	 * Map border style
+	 * Map of BIFF2-BIFF8 codes for border styles
+	 * @static	array of int
+	 *
 	 */
-	private function _mapBorderStyle($borderStyle) {
-		switch ($borderStyle) {
-			case PHPExcel_Style_Border::BORDER_NONE:				return 0x00;
-			case PHPExcel_Style_Border::BORDER_THIN;				return 0x01;
-			case PHPExcel_Style_Border::BORDER_MEDIUM;				return 0x02;
-			case PHPExcel_Style_Border::BORDER_DASHED;				return 0x03;
-			case PHPExcel_Style_Border::BORDER_DOTTED;				return 0x04;
-			case PHPExcel_Style_Border::BORDER_THICK;				return 0x05;
-			case PHPExcel_Style_Border::BORDER_DOUBLE;				return 0x06;
-			case PHPExcel_Style_Border::BORDER_HAIR;				return 0x07;
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHED;		return 0x08;
-			case PHPExcel_Style_Border::BORDER_DASHDOT;				return 0x09;
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT;		return 0x0A;
-			case PHPExcel_Style_Border::BORDER_DASHDOTDOT;			return 0x0B;
-			case PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;	return 0x0C;
-			case PHPExcel_Style_Border::BORDER_SLANTDASHDOT;		return 0x0D;
-			default:												return 0x00;
-		}
+	private static $_mapBorderStyle = array	( PHPExcel_Style_Border::BORDER_NONE				=> 0x00,
+											  PHPExcel_Style_Border::BORDER_THIN				=> 0x01,
+											  PHPExcel_Style_Border::BORDER_MEDIUM				=> 0x02,
+											  PHPExcel_Style_Border::BORDER_DASHED				=> 0x03,
+											  PHPExcel_Style_Border::BORDER_DOTTED				=> 0x04,
+											  PHPExcel_Style_Border::BORDER_THICK				=> 0x05,
+											  PHPExcel_Style_Border::BORDER_DOUBLE				=> 0x06,
+											  PHPExcel_Style_Border::BORDER_HAIR				=> 0x07,
+											  PHPExcel_Style_Border::BORDER_MEDIUMDASHED		=> 0x08,
+											  PHPExcel_Style_Border::BORDER_DASHDOT				=> 0x09,
+											  PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT		=> 0x0A,
+											  PHPExcel_Style_Border::BORDER_DASHDOTDOT			=> 0x0B,
+											  PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT	=> 0x0C,
+											  PHPExcel_Style_Border::BORDER_SLANTDASHDOT		=> 0x0D,
+											);
+
+	/**
+	 * Map border style
+	 *
+	 * @param string $borderStyle
+	 * @return int
+	 */
+	private static function _mapBorderStyle($borderStyle) {
+		if (isset(self::$_mapBorderStyle[$borderStyle]))
+			return self::$_mapBorderStyle[$borderStyle];
+		return 0x00;
 	}
 
 	/**
-	 * Map fill type
+	 * Map of BIFF2-BIFF8 codes for fill types
+	 * @static	array of int
+	 *
 	 */
-	private function _mapFillType($fillType) {
-		switch ($fillType) {
-			case PHPExcel_Style_Fill::FILL_NONE:					return 0x00;
-			case PHPExcel_Style_Fill::FILL_SOLID:					return 0x01;
-			case PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY:		return 0x02;
-			case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY:		return 0x03;
-			case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY:		return 0x04;
-			case PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL:	return 0x05;
-			case PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL:	return 0x06;
-			case PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN:		return 0x07;
-			case PHPExcel_Style_Fill::FILL_PATTERN_DARKUP:			return 0x08;
-			case PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID:		return 0x09;
-			case PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS:		return 0x0A;
-			case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL:	return 0x0B;
-			case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL:	return 0x0C;
-			case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN:		return 0x0D;
-			case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP:			return 0x0E;
-			case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID:		return 0x0F;
-			case PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS:	return 0x10;
-			case PHPExcel_Style_Fill::FILL_PATTERN_GRAY125:			return 0x11;
-			case PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625:		return 0x12;
-			case PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR:		// does not exist in BIFF8
-			case PHPExcel_Style_Fill::FILL_GRADIENT_PATH:		// does not exist in BIFF8
-			default:												return 0x00;
-		}
+	private static $_mapFillType = array( PHPExcel_Style_Fill::FILL_NONE					=> 0x00,
+										  PHPExcel_Style_Fill::FILL_SOLID					=> 0x01,
+										  PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY		=> 0x02,
+										  PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY		=> 0x03,
+										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY		=> 0x04,
+										  PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL	=> 0x05,
+										  PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL	=> 0x06,
+										  PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN		=> 0x07,
+										  PHPExcel_Style_Fill::FILL_PATTERN_DARKUP			=> 0x08,
+										  PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID		=> 0x09,
+										  PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS		=> 0x0A,
+										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL	=> 0x0B,
+										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL	=> 0x0C,
+										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN		=> 0x0D,
+										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP			=> 0x0E,
+										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID		=> 0x0F,
+										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS	=> 0x10,
+										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY125			=> 0x11,
+										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625		=> 0x12,
+										  PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR			=> 0x00,	// does not exist in BIFF8
+										  PHPExcel_Style_Fill::FILL_GRADIENT_PATH			=> 0x00,	// does not exist in BIFF8
+										);
+	/**
+	 * Map fill type
+	 *
+	 * @param string $fillType
+	 * @return int
+	 */
+	private static function _mapFillType($fillType) {
+		if (isset(self::$_mapFillType[$fillType]))
+			return self::$_mapFillType[$fillType];
+		return 0x00;
 	}
 
+	/**
+	 * Map of BIFF2-BIFF8 codes for horizontal alignment
+	 * @static	array of int
+	 *
+	 */
+	private static $_mapHAlign = array( PHPExcel_Style_Alignment::HORIZONTAL_GENERAL			=> 0,
+										PHPExcel_Style_Alignment::HORIZONTAL_LEFT				=> 1,
+										PHPExcel_Style_Alignment::HORIZONTAL_CENTER				=> 2,
+										PHPExcel_Style_Alignment::HORIZONTAL_RIGHT				=> 3,
+										PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY			=> 5,
+										PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS	=> 6,
+									  );
 	/**
 	 * Map to BIFF2-BIFF8 codes for horizontal alignment
 	 *
@@ -495,31 +468,31 @@ class PHPExcel_Writer_Excel5_Xf
 	 */
 	private function _mapHAlign($hAlign)
 	{
-		switch ($hAlign) {
-			case PHPExcel_Style_Alignment::HORIZONTAL_GENERAL:				return 0;
-			case PHPExcel_Style_Alignment::HORIZONTAL_LEFT:					return 1;
-			case PHPExcel_Style_Alignment::HORIZONTAL_CENTER:				return 2;
-			case PHPExcel_Style_Alignment::HORIZONTAL_RIGHT:				return 3;
-			case PHPExcel_Style_Alignment::HORIZONTAL_JUSTIFY:				return 5;
-			case PHPExcel_Style_Alignment::HORIZONTAL_CENTER_CONTINUOUS:	return 6;
-			default:														return 0;
-		}
+		if (isset(self::$_mapHAlign[$hAlign]))
+			return self::$_mapHAlign[$hAlign];
+		return 0;
 	}
 
+	/**
+	 * Map of BIFF2-BIFF8 codes for vertical alignment
+	 * @static	array of int
+	 *
+	 */
+	private static $_mapVAlign = array( PHPExcel_Style_Alignment::VERTICAL_TOP		=> 0,
+										PHPExcel_Style_Alignment::VERTICAL_CENTER	=> 1,
+										PHPExcel_Style_Alignment::VERTICAL_BOTTOM	=> 2,
+										PHPExcel_Style_Alignment::VERTICAL_JUSTIFY	=> 3,
+									  );
 	/**
 	 * Map to BIFF2-BIFF8 codes for vertical alignment
 	 *
 	 * @param string $vAlign
 	 * @return int
 	 */
-	private function _mapVAlign($vAlign) {
-		switch ($vAlign) {
-			case PHPExcel_Style_Alignment::VERTICAL_TOP:		return 0;
-			case PHPExcel_Style_Alignment::VERTICAL_CENTER:		return 1;
-			case PHPExcel_Style_Alignment::VERTICAL_BOTTOM:		return 2;
-			case PHPExcel_Style_Alignment::VERTICAL_JUSTIFY:	return 3;
-			default:											return 2;
-		}
+	private static function _mapVAlign($vAlign) {
+		if (isset(self::$_mapVAlign[$vAlign]))
+			return self::$_mapVAlign[$vAlign];
+		return 2;
 	}
 
 	/**
@@ -528,7 +501,7 @@ class PHPExcel_Writer_Excel5_Xf
 	 * @param int $textRotation
 	 * @return int
 	 */
-	private function _mapTextRotation($textRotation) {
+	private static function _mapTextRotation($textRotation) {
 		if ($textRotation >= 0) {
 			return $textRotation;
 		}
@@ -546,7 +519,7 @@ class PHPExcel_Writer_Excel5_Xf
 	 * @param string
 	 * @return int
 	 */
-	private function _mapLocked($locked) {
+	private static function _mapLocked($locked) {
 		switch ($locked) {
 			case PHPExcel_Style_Protection::PROTECTION_INHERIT:		return 1;
 			case PHPExcel_Style_Protection::PROTECTION_PROTECTED:	return 1;
@@ -561,7 +534,7 @@ class PHPExcel_Writer_Excel5_Xf
 	 * @param string
 	 * @return int
 	 */
-	private function _mapHidden($hidden) {
+	private static function _mapHidden($hidden) {
 		switch ($hidden) {
 			case PHPExcel_Style_Protection::PROTECTION_INHERIT:		return 0;
 			case PHPExcel_Style_Protection::PROTECTION_PROTECTED:	return 1;
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php b/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php
index 5bbea59da59..f0aafafed34 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license	http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version	1.7.6, 2011-02-27
+ * @version	1.7.8, 2012-10-12
  */
 
 
@@ -31,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package	PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	/**
@@ -145,7 +145,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	/**
 	 * Save PHPExcel to file
 	 *
-	 * @param	string		$pFileName
+	 * @param	string		$pFilename
 	 * @throws	Exception
 	 */
 	public function save($pFilename = null) {
@@ -189,6 +189,9 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 
 	/**
 	 * Map VAlign
+	 *
+	 * @param	string		$vAlign		Vertical alignment
+	 * @return string
 	 */
 	private function _mapVAlign($vAlign) {
 		switch ($vAlign) {
@@ -203,6 +206,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	/**
 	 * Map HAlign
 	 *
+	 * @param	string		$hAlign		Horizontal alignment
 	 * @return string|false
 	 */
 	private function _mapHAlign($hAlign) {
@@ -219,10 +223,13 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 
 	/**
 	 * Map border style
+	 *
+	 * @param	int		$borderStyle		Sheet index
+	 * @return	string
 	 */
 	private function _mapBorderStyle($borderStyle) {
 		switch ($borderStyle) {
-			case PHPExcel_Style_Border::BORDER_NONE:				return '0px';
+			case PHPExcel_Style_Border::BORDER_NONE:				return 'none';
 			case PHPExcel_Style_Border::BORDER_DASHDOT:				return '1px dashed';
 			case PHPExcel_Style_Border::BORDER_DASHDOTDOT:			return '1px dotted';
 			case PHPExcel_Style_Border::BORDER_DASHED:				return '1px dashed';
@@ -302,21 +309,42 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		}
 
 		// Construct HTML
-		$form = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
-		$form .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
-		$form .= '<html>' . PHP_EOL;
-		$form .= '  <head>' . PHP_EOL;
-		$form .= '	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
-		$form .= '	<title>' . htmlspecialchars($this->_phpExcel->getProperties()->getTitle()) . '</title>' . PHP_EOL;
+		$properties = $this->_phpExcel->getProperties();
+		$html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
+		$html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
+		$html .= '<html>' . PHP_EOL;
+		$html .= '  <head>' . PHP_EOL;
+		$html .= '	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
+		if ($properties->getTitle() > '')
+			$html .= '	  <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
+
+		if ($properties->getCreator() > '')
+			$html .= '	  <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
+		if ($properties->getTitle() > '')
+			$html .= '	  <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
+		if ($properties->getDescription() > '')
+			$html .= '	  <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
+		if ($properties->getSubject() > '')
+			$html .= '	  <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
+		if ($properties->getKeywords() > '')
+			$html .= '	  <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
+		if ($properties->getCategory() > '')
+			$html .= '	  <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
+		if ($properties->getCompany() > '')
+			$html .= '	  <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
+		if ($properties->getManager() > '')
+			$html .= '	  <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
+
 		if ($pIncludeStyles) {
-			$form .= $this->generateStyles(true);
+			$html .= $this->generateStyles(true);
 		}
-		$form .= '  </head>' . PHP_EOL;
-		$form .= '' . PHP_EOL;
-		$form .= '  <body>' . PHP_EOL;
+
+		$html .= '  </head>' . PHP_EOL;
+		$html .= '' . PHP_EOL;
+		$html .= '  <body>' . PHP_EOL;
 
 		// Return
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -345,13 +373,13 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		}
 
 		// Construct HTML
-		$form = '';
+		$html = '';
 
 		// Loop all sheets
 		$sheetId = 0;
 		foreach ($sheets as $sheet) {
 			// Write table header
-			$form .= $this->_generateTableHeader($sheet);
+			$html .= $this->_generateTableHeader($sheet);
 
 			// Get worksheet dimension
 			$dimension = explode(':', $sheet->calculateWorksheetDimension());
@@ -384,12 +412,12 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 			while($row++ < $rowMax) {
 				// <thead> ?
 				if ($row == $theadStart) {
-					$form .= '		<thead>' . PHP_EOL;
+					$html .= '		<thead>' . PHP_EOL;
 				}
 
 				// <tbody> ?
 				if ($row == $tbodyStart) {
-					$form .= '		<tbody>' . PHP_EOL;
+					$html .= '		<tbody>' . PHP_EOL;
 				}
 
 				// Write row if there are HTML table cells in it
@@ -406,27 +434,27 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 							$rowData[$column] = '';
 						}
 					}
-					$form .= $this->_generateRow($sheet, $rowData, $row - 1);
+					$html .= $this->_generateRow($sheet, $rowData, $row - 1);
 				}
 
 				// </thead> ?
 				if ($row == $theadEnd) {
-					$form .= '		</thead>' . PHP_EOL;
+					$html .= '		</thead>' . PHP_EOL;
 				}
 
 				// </tbody> ?
 				if ($row == $tbodyEnd) {
-					$form .= '		</tbody>' . PHP_EOL;
+					$html .= '		</tbody>' . PHP_EOL;
 				}
 			}
 
 			// Write table footer
-			$form .= $this->_generateTableFooter();
+			$html .= $this->_generateTableFooter();
 
 			// Writing PDF?
 			if ($this->_isPdf) {
 				if (is_null($this->_sheetIndex) && $sheetId + 1 < $this->_phpExcel->getSheetCount()) {
-					$form .= '<div style="page-break-before:always" />';
+					$html .= '<div style="page-break-before:always" />';
 				}
 			}
 
@@ -435,7 +463,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		}
 
 		// Return
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -460,24 +488,24 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		}
 
 		// Construct HTML
-		$form = '';
+		$html = '';
 
 		// Only if there are more than 1 sheets
 		if (count($sheets) > 1) {
 			// Loop all sheets
 			$sheetId = 0;
 
-			$form .= '<ul class="navigation">' . PHP_EOL;
+			$html .= '<ul class="navigation">' . PHP_EOL;
 
 			foreach ($sheets as $sheet) {
-				$form .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+				$html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
 				++$sheetId;
 			}
 
-			$form .= '</ul>' . PHP_EOL;
+			$html .= '</ul>' . PHP_EOL;
 		}
 
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -490,7 +518,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	 */
 	private function _writeImageTagInCell(PHPExcel_Worksheet $pSheet, $coordinates) {
 		// Construct HTML
-		$form = '';
+		$html = '';
 
 		// Write images
 		foreach ($pSheet->getDrawingCollection() as $drawing) {
@@ -514,14 +542,14 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 					// Convert UTF8 data to PCDATA
 					$filename = htmlspecialchars($filename);
 
-					$form .= PHP_EOL;
-					$form .= '		<img style="position: relative; left: ' . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . $filename . '" border="0" width="' . $drawing->getWidth() . '" height="' . $drawing->getHeight() . '" />' . PHP_EOL;
+					$html .= PHP_EOL;
+					$html .= '		<img style="position: relative; left: ' . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . $filename . '" border="0" width="' . $drawing->getWidth() . '" height="' . $drawing->getHeight() . '" />' . PHP_EOL;
 				}
 			}
 		}
 
 		// Return
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -541,28 +569,28 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		$css = $this->buildCSS($generateSurroundingHTML);
 
 		// Construct HTML
-		$form = '';
+		$html = '';
 
 		// Start styles
 		if ($generateSurroundingHTML) {
-			$form .= '	<style type="text/css">' . PHP_EOL;
-			$form .= '	  html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
+			$html .= '	<style type="text/css">' . PHP_EOL;
+			$html .= '	  html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
 		}
 
 		// Write all other styles
 		foreach ($css as $styleName => $styleDefinition) {
 			if ($styleName != 'html') {
-				$form .= '	  ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
+				$html .= '	  ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
 			}
 		}
 
 		// End styles
 		if ($generateSurroundingHTML) {
-			$form .= '	</style>' . PHP_EOL;
+			$html .= '	</style>' . PHP_EOL;
 		}
 
 		// Return
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -602,7 +630,9 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 
 		// table { }
 		$css['table']['border-collapse']  = 'collapse';
-		$css['table']['page-break-after'] = 'always';
+	    if (!$this->_isPdf) {
+			$css['table']['page-break-after'] = 'always';
+		}
 
 		// .gridlines td { }
 		$css['.gridlines td']['border'] = '1px dotted black';
@@ -752,6 +782,8 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		$css['vertical-align'] = $this->_mapVAlign($pStyle->getVertical());
 		if ($textAlign = $this->_mapHAlign($pStyle->getHorizontal())) {
 			$css['text-align'] = $textAlign;
+			if(in_array($textAlign,array('left','right')))
+				$css['padding-'.$textAlign] = (string)((int)$pStyle->getIndent() * 9).'px';
 		}
 
 		// Return
@@ -818,11 +850,8 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	 * @return	string
 	 */
 	private function _createCSSStyleBorder(PHPExcel_Style_Border $pStyle) {
-		// Construct HTML
-		$css = '';
-
 		// Create CSS
-		$css .= $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
+		$css = $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
 
 		// Return
 		return $css;
@@ -852,12 +881,12 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	 */
 	public function generateHTMLFooter() {
 		// Construct HTML
-		$form = '';
-		$form .= '  </body>' . PHP_EOL;
-		$form .= '</html>' . PHP_EOL;
+		$html = '';
+		$html .= '  </body>' . PHP_EOL;
+		$html .= '</html>' . PHP_EOL;
 
 		// Return
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -871,19 +900,19 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
 
 		// Construct HTML
-		$form = '';
+		$html = '';
 
 		if (!$this->_useInlineCss) {
 			$gridlines = $pSheet->getShowGridLines() ? ' gridlines' : '';
-			$form .= '	<table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
+			$html .= '	<table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
 		} else {
 			$style = isset($this->_cssStyles['table']) ?
 				$this->_assembleCSS($this->_cssStyles['table']) : '';
 
 			if ($this->_isPdf && $pSheet->getShowGridLines()) {
-				$form .= '	<table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
+				$html .= '	<table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
 			} else {
-				$form .= '	<table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
+				$html .= '	<table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
 			}
 		}
 
@@ -891,17 +920,19 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 		$highestColumnIndex = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
 		$i = -1;
 		while($i++ < $highestColumnIndex) {
-			if (!$this->_useInlineCss) {
-				$form .= '		<col class="col' . $i . '">' . PHP_EOL;
-			} else {
-				$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
-					$this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
-				$form .= '		<col style="' . $style . '">' . PHP_EOL;
+		    if (!$this->_isPdf) {
+				if (!$this->_useInlineCss) {
+					$html .= '		<col class="col' . $i . '">' . PHP_EOL;
+				} else {
+					$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
+						$this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
+					$html .= '		<col style="' . $style . '">' . PHP_EOL;
+				}
 			}
 		}
 
 		// Return
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -911,11 +942,11 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	 */
 	private function _generateTableFooter() {
 		// Construct HTML
-		$form = '';
-		$form .= '	</table>' . PHP_EOL;
+		$html = '';
+		$html .= '	</table>' . PHP_EOL;
 
 		// Return
-		return $form;
+		return $html;
 	}
 
 	/**
@@ -930,7 +961,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 	private function _generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0) {
 		if (is_array($pValues)) {
 			// Construct HTML
-			$form = '';
+			$html = '';
 
 			// Sheet index
 			$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
@@ -942,24 +973,24 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 				// check if a break is needed before this row
 				if (isset($breaks['A' . $pRow])) {
 					// close table: </table>
-					$form .= $this->_generateTableFooter();
+					$html .= $this->_generateTableFooter();
 
 					// insert page break
-					$form .= '<div style="page-break-before:always" />';
+					$html .= '<div style="page-break-before:always" />';
 
 					// open table again: <table> + <col> etc.
-					$form .= $this->_generateTableHeader($pSheet);
+					$html .= $this->_generateTableHeader($pSheet);
 				}
 			}
 
 			// Write row start
 			if (!$this->_useInlineCss) {
-				$form .= '		  <tr class="row' . $pRow . '">' . PHP_EOL;
+				$html .= '		  <tr class="row' . $pRow . '">' . PHP_EOL;
 			} else {
 				$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
 					? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
 
-				$form .= '		  <tr style="' . $style . '">' . PHP_EOL;
+				$html .= '		  <tr style="' . $style . '">' . PHP_EOL;
 			}
 
 			// Write cells
@@ -1031,6 +1062,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 								array($this, 'formatColor')
 							);
 						}
+						$cellData = htmlspecialchars($cellData);
 						if ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSuperScript()) {
 							$cellData = '<sup>'.$cellData.'</sup>';
 						} elseif ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSubScript()) {
@@ -1085,9 +1117,9 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 				// Write
 				if ($writeCell) {
 					// Column start
-					$form .= '			<td';
+					$html .= '			<td';
 						if (!$this->_useInlineCss) {
-							$form .= ' class="' . $cssClass . '"';
+							$html .= ' class="' . $cssClass . '"';
 						} else {
 							//** Necessary redundant code for the sake of PHPExcel_Writer_PDF **
 							// We must explicitly write the width of the <td> element because TCPDF
@@ -1110,24 +1142,24 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 							}
 							//** end of redundant code **
 
-							$form .= ' style="' . $this->_assembleCSS($cssClass) . '"';
+							$html .= ' style="' . $this->_assembleCSS($cssClass) . '"';
 						}
 						if ($colSpan > 1) {
-							$form .= ' colspan="' . $colSpan . '"';
+							$html .= ' colspan="' . $colSpan . '"';
 						}
 						if ($rowSpan > 1) {
-							$form .= ' rowspan="' . $rowSpan . '"';
+							$html .= ' rowspan="' . $rowSpan . '"';
 						}
-					$form .= '>';
+					$html .= '>';
 
 					// Image?
-					$form .= $this->_writeImageTagInCell($pSheet, $coordinate);
+					$html .= $this->_writeImageTagInCell($pSheet, $coordinate);
 
 					// Cell data
-					$form .= $cellData;
+					$html .= $cellData;
 
 					// Column end
-					$form .= '</td>' . PHP_EOL;
+					$html .= '</td>' . PHP_EOL;
 				}
 
 				// Next column
@@ -1135,10 +1167,10 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
 			}
 
 			// Write row end
-			$form .= '		  </tr>' . PHP_EOL;
+			$html .= '		  </tr>' . PHP_EOL;
 
 			// Return
-			return $form;
+			return $html;
 		} else {
 			throw new Exception("Invalid parameters passed.");
 		}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/IWriter.php b/htdocs/includes/phpexcel/PHPExcel/Writer/IWriter.php
index 97fd2cae670..af97f0778ce 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/IWriter.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/IWriter.php
@@ -2,27 +2,27 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    1.7.6, 2011-02-27
+ * @version    1.7.8, 2012-10-12
  */
 
 
@@ -31,15 +31,15 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Writer
- * @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_Writer_IWriter
 {
 	/**
 	 * Save PHPExcel to file
 	 *
-	 * @param 	string 		$pFileName
+	 * @param 	string 		$pFilename
 	 * @throws 	Exception
-	 */	
+	 */
 	public function save($pFilename = null);
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php
index 2096aa839b1..7c10445d72e 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php
@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2011 PHPExcel
+ * Copyright (c) 2006 - 2012 PHPExcel
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,127 +20,22 @@
  *
  * @category	PHPExcel
  * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		1.7.6, 2011-02-27
+ * @version		1.7.8, 2012-10-12
  */
 
 
-/** Require FPDF library */
-$k_path_url = dirname(__FILE__) . '/PDF';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/PDF/tcpdf.php';
-
 /**
  * PHPExcel_Writer_PDF
  *
  * @category	PHPExcel
  * @package		PHPExcel_Writer
- * @copyright	Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class PHPExcel_Writer_PDF extends PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
-	/**
-	 * Temporary storage directory
-	 *
-	 * @var string
-	 */
-	private $_tempDir = '';
+class PHPExcel_Writer_PDF {
 
-	/**
-	 * Font
-	 *
-	 * @var string
-	 */
-	private $_font = 'freesans';
-
-	/**
-	 * Orientation (Over-ride)
-	 *
-	 * @var string
-	 */
-	private $_orientation	= null;
-
-	/**
-	 * Paper size (Over-ride)
-	 *
-	 * @var int
-	 */
-	private $_paperSize	= null;
-
-
-	/**
-	 * Paper Sizes xRef List
-	 *
-	 * @var array
-	 */
-	private static $_paperSizes = array(
-		//	Excel Paper Size													TCPDF Paper Size
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER							=> 'LETTER',				//	(8.5 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_SMALL					=> 'LETTER',				//	(8.5 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID							=> array(792.00,1224.00),	//	(11 in. by 17 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEDGER							=> array(1224.00,792.00),	//	(17 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL							=> 'LEGAL',					//	(8.5 in. by 14 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STATEMENT						=> array(396.00,612.00),	//	(5.5 in. by 8.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_EXECUTIVE						=> 'EXECUTIVE',				//	(7.25 in. by 10.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3								=> 'A3',					//	(297 mm by 420 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4								=> 'A4',					//	(210 mm by 297 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_SMALL						=> 'A4',					//	(210 mm by 297 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5								=> 'A5',					//	(148 mm by 210 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4								=> 'B4',					//	(250 mm by 353 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5								=> 'B5',					//	(176 mm by 250 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_FOLIO							=> 'FOLIO',					//	(8.5 in. by 13 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_QUARTO							=> array(609.45,779.53),	//	(215 mm by 275 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_1						=> array(720.00,1008.00),	//	(10 in. by 14 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_2						=> array(792.00,1224.00),	//	(11 in. by 17 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NOTE							=> 'LETTER',				//	(8.5 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO9_ENVELOPE					=> array(279.00,639.00),	//	(3.875 in. by 8.875 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO10_ENVELOPE					=> array(297.00,684.00),	//	(4.125 in. by 9.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO11_ENVELOPE					=> array(324.00,747.00),	//	(4.5 in. by 10.375 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO12_ENVELOPE					=> array(342.00,792.00),	//	(4.75 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO14_ENVELOPE					=> array(360.00,828.00),	//	(5 in. by 11.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C								=> array(1224.00,1584.00),	//	(17 in. by 22 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_D								=> array(1584.00,2448.00),	//	(22 in. by 34 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_E								=> array(2448.00,3168.00),	//	(34 in. by 44 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_DL_ENVELOPE						=> array(311.81,623.62),	//	(110 mm by 220 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C5_ENVELOPE						=> 'C5',					//	(162 mm by 229 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C3_ENVELOPE						=> 'C3',					//	(324 mm by 458 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C4_ENVELOPE						=> 'C4',					//	(229 mm by 324 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C6_ENVELOPE						=> 'C6',					//	(114 mm by 162 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C65_ENVELOPE					=> array(323.15,649.13),	//	(114 mm by 229 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4_ENVELOPE						=> 'B4',					//	(250 mm by 353 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5_ENVELOPE						=> 'B5',					//	(176 mm by 250 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B6_ENVELOPE						=> array(498.90,354.33),	//	(176 mm by 125 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ITALY_ENVELOPE					=> array(311.81,651.97),	//	(110 mm by 230 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_MONARCH_ENVELOPE				=> array(279.00,540.00),	//	(3.875 in. by 7.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_6_3_4_ENVELOPE					=> array(261.00,468.00),	//	(3.625 in. by 6.5 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_US_STANDARD_FANFOLD				=> array(1071.00,792.00),	//	(14.875 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD			=> array(612.00,864.00),	//	(8.5 in. by 12 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD			=> 'FOLIO',					//	(8.5 in. by 13 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B4							=> 'B4',					//	(250 mm by 353 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD		=> array(566.93,419.53),	//	(200 mm by 148 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_1				=> array(648.00,792.00),	//	(9 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_2				=> array(720.00,792.00),	//	(10 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_3				=> array(1080.00,792.00),	//	(15 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_INVITE_ENVELOPE					=> array(623.62,623.62),	//	(220 mm by 220 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER				=> array(667.80,864.00),	//	(9.275 in. by 12 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER				=> array(667.80,1080.00),	//	(9.275 in. by 15 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER				=> array(841.68,1296.00),	//	(11.69 in. by 18 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_EXTRA_PAPER					=> array(668.98,912.76),	//	(236 mm by 322 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER			=> array(595.80,792.00),	//	(8.275 in. by 11 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER				=> 'A4',					//	(210 mm by 297 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER	=> array(667.80,864.00),	//	(9.275 in. by 12 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER			=> array(643.46,1009.13),	//	(227 mm by 356 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER			=> array(864.57,1380.47),	//	(305 mm by 487 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_PLUS_PAPER				=> array(612.00,913.68),	//	(8.5 in. by 12.69 in.)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_PLUS_PAPER					=> array(595.28,935.43),	//	(210 mm by 330 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER				=> 'A5',					//	(148 mm by 210 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER			=> array(515.91,728.50),	//	(182 mm by 257 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_PAPER					=> array(912.76,1261.42),	//	(322 mm by 445 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_EXTRA_PAPER					=> array(493.23,666.14),	//	(174 mm by 235 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER				=> array(569.76,782.36),	//	(201 mm by 276 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A2_PAPER						=> 'A2',					//	(420 mm by 594 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER				=> 'A3',					//	(297 mm by 420 mm)
-		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER		=> array(912.76,1261.42)	//	(322 mm by 445 mm)
-	);
+    private $_renderer = NULL;
 
 	/**
 	 * Create a new PHPExcel_Writer_PDF
@@ -148,181 +43,34 @@ class PHPExcel_Writer_PDF extends PHPExcel_Writer_HTML implements PHPExcel_Write
 	 * @param 	PHPExcel	$phpExcel	PHPExcel object
 	 */
 	public function __construct(PHPExcel $phpExcel) {
-		parent::__construct($phpExcel);
-		$this->setUseInlineCss(true);
-		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+
+		$pdfLibraryName = PHPExcel_Settings::getPdfRendererName();
+		if (is_null($pdfLibraryName)) {
+			throw new Exception("PDF Rendering library has not been defined.");
+		}
+
+		$pdfLibraryPath = PHPExcel_Settings::getPdfRendererPath();
+		if (is_null($pdfLibraryName)) {
+			throw new Exception("PDF Rendering library path has not been defined.");
+		}
+		$includePath = str_replace('\\','/',get_include_path());
+		$rendererPath = str_replace('\\','/',$pdfLibraryPath);
+		if (strpos($rendererPath,$includePath) === false) {
+			set_include_path(get_include_path() . PATH_SEPARATOR . $pdfLibraryPath);
+		}
+
+		$rendererName = 'PHPExcel_Writer_PDF_'.$pdfLibraryName;
+		$this->_renderer = new $rendererName($phpExcel);
 	}
 
-	/**
-	 * Set font. Examples:
-	 *   'arialunicid0-chinese-simplified'
-	 *   'arialunicid0-chinese-traditional'
-	 *   'arialunicid0-korean'
-	 *   'arialunicid0-japanese'
-	 *
-	 * @param	string	$fontName
-	 */
-	public function setFont($fontName) {
-		$this->_font = $fontName;
-		return $this;
-	}
 
-    /**
-     * Get Paper Size
-     *
-     * @return int
-     */
-    public function getPaperSize() {
-    	return $this->_paperSize;
+    public function __call($name, $arguments)
+    {
+        if ($this->_renderer === NULL) {
+			throw new Exception("PDF Renderer has not been defined.");
+        }
+
+        return call_user_func_array(array($this->_renderer,$name),$arguments);
     }
 
-    /**
-     * Set Paper Size
-     *
-     * @param int $pValue
-     * @return PHPExcel_Writer_PDF
-     */
-    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER) {
-    	$this->_paperSize = $pValue;
-    	return $this;
-    }
-
-    /**
-     * Get Orientation
-     *
-     * @return string
-     */
-    public function getOrientation() {
-    	return $this->_orientation;
-    }
-
-    /**
-     * Set Orientation
-     *
-     * @param string $pValue
-     * @return PHPExcel_Writer_PDF
-     */
-    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) {
-    	$this->_orientation = $pValue;
-    	return $this;
-    }
-
-	/**
-	 * Save PHPExcel to file
-	 *
-	 * @param 	string 		$pFileName
-	 * @throws 	Exception
-	 */
-	public function save($pFilename = null) {
-		// garbage collect
-		$this->_phpExcel->garbageCollect();
-
-		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
-		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
-
-		// Open file
-		$fileHandle = fopen($pFilename, 'w');
-		if ($fileHandle === false) {
-			throw new Exception("Could not open file $pFilename for writing.");
-		}
-
-		// Set PDF
-		$this->_isPdf = true;
-
-		// Build CSS
-		$this->buildCSS(true);
-
-		// Generate HTML
-		$form = '';
-		//$form .= $this->generateHTMLHeader(false);
-		$form .= $this->generateSheetData();
-		//$form .= $this->generateHTMLFooter();
-
-		// Default PDF paper size
-		$paperSize = 'LETTER';	//	Letter	(8.5 in. by 11 in.)
-
-		// Check for paper size and page orientation
-		if (is_null($this->getSheetIndex())) {
-			$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
-		} else {
-			$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-			$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-			$printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
-		}
-
-		//	Override Page Orientation
-		if (!is_null($this->_orientation)) {
-			$orientation = ($this->_orientation == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
-		}
-		//	Override Paper Size
-		if (!is_null($this->_paperSize)) {
-			$printPaperSize = $this->_paperSize;
-		}
-
-
-		if (isset(self::$_paperSizes[$printPaperSize])) {
-			$paperSize = self::$_paperSizes[$printPaperSize];
-		}
-
-
-		// Create PDF
-		$pdf = new TCPDF($orientation, 'pt', $paperSize);
-		$pdf->setFontSubsetting(false);
-		//	Set margins, converting inches to points (using 72 dpi)
-		$pdf->SetMargins($printMargins->getLeft() * 72,$printMargins->getTop() * 72,$printMargins->getRight() * 72);
-		$pdf->SetAutoPageBreak(true,$printMargins->getBottom() * 72);
-//		$pdf->setHeaderMargin($printMargins->getHeader() * 72);
-//		$pdf->setFooterMargin($printMargins->getFooter() * 72);
-
-		$pdf->setPrintHeader(false);
-		$pdf->setPrintFooter(false);
-
-		$pdf->AddPage();
-
-		// Set the appropriate font
-		$pdf->SetFont($this->_font);
-		$pdf->writeHTML($form);
-
-		// Document info
-		$pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
-		$pdf->SetAuthor($this->_phpExcel->getProperties()->getCreator());
-		$pdf->SetSubject($this->_phpExcel->getProperties()->getSubject());
-		$pdf->SetKeywords($this->_phpExcel->getProperties()->getKeywords());
-		$pdf->SetCreator($this->_phpExcel->getProperties()->getCreator());
-
-		// Write to file
-		fwrite($fileHandle, $pdf->output($pFilename, 'S'));
-
-		// Close file
-		fclose($fileHandle);
-
-		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
-	}
-
-	/**
-	 * Get temporary storage directory
-	 *
-	 * @return string
-	 */
-	public function getTempDir() {
-		return $this->_tempDir;
-	}
-
-	/**
-	 * Set temporary storage directory
-	 *
-	 * @param 	string	$pValue		Temporary storage directory
-	 * @throws 	Exception	Exception when directory does not exist
-	 * @return PHPExcel_Writer_PDF
-	 */
-	public function setTempDir($pValue = '') {
-		if (is_dir($pValue)) {
-			$this->_tempDir = $pValue;
-		} else {
-			throw new Exception("Directory does not exist: $pValue");
-		}
-		return $this;
-	}
 }
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/Core.php b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/Core.php
new file mode 100644
index 00000000000..b9154ac6bee
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/Core.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/**
+ * PHPExcel_Writer_PDF_Core
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+abstract class PHPExcel_Writer_PDF_Core extends PHPExcel_Writer_HTML {
+	/**
+	 * Temporary storage directory
+	 *
+	 * @var string
+	 */
+	private $_tempDir = '';
+
+	/**
+	 * Font
+	 *
+	 * @var string
+	 */
+	private $_font = 'freesans';
+
+	/**
+	 * Orientation (Over-ride)
+	 *
+	 * @var string
+	 */
+	private $_orientation	= null;
+
+	/**
+	 * Paper size (Over-ride)
+	 *
+	 * @var int
+	 */
+	private $_paperSize	= null;
+
+
+	/**
+	 * Paper Sizes xRef List
+	 *
+	 * @var array
+	 */
+	protected static $_paperSizes = array(
+		//	Excel Paper Size													TCPDF Paper Size
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER							=> 'LETTER',				//	(8.5 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_SMALL					=> 'LETTER',				//	(8.5 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID							=> array(792.00,1224.00),	//	(11 in. by 17 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEDGER							=> array(1224.00,792.00),	//	(17 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL							=> 'LEGAL',					//	(8.5 in. by 14 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STATEMENT						=> array(396.00,612.00),	//	(5.5 in. by 8.5 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_EXECUTIVE						=> 'EXECUTIVE',				//	(7.25 in. by 10.5 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3								=> 'A3',					//	(297 mm by 420 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4								=> 'A4',					//	(210 mm by 297 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_SMALL						=> 'A4',					//	(210 mm by 297 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5								=> 'A5',					//	(148 mm by 210 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4								=> 'B4',					//	(250 mm by 353 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5								=> 'B5',					//	(176 mm by 250 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_FOLIO							=> 'FOLIO',					//	(8.5 in. by 13 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_QUARTO							=> array(609.45,779.53),	//	(215 mm by 275 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_1						=> array(720.00,1008.00),	//	(10 in. by 14 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_2						=> array(792.00,1224.00),	//	(11 in. by 17 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NOTE							=> 'LETTER',				//	(8.5 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO9_ENVELOPE					=> array(279.00,639.00),	//	(3.875 in. by 8.875 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO10_ENVELOPE					=> array(297.00,684.00),	//	(4.125 in. by 9.5 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO11_ENVELOPE					=> array(324.00,747.00),	//	(4.5 in. by 10.375 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO12_ENVELOPE					=> array(342.00,792.00),	//	(4.75 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_NO14_ENVELOPE					=> array(360.00,828.00),	//	(5 in. by 11.5 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C								=> array(1224.00,1584.00),	//	(17 in. by 22 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_D								=> array(1584.00,2448.00),	//	(22 in. by 34 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_E								=> array(2448.00,3168.00),	//	(34 in. by 44 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_DL_ENVELOPE						=> array(311.81,623.62),	//	(110 mm by 220 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C5_ENVELOPE						=> 'C5',					//	(162 mm by 229 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C3_ENVELOPE						=> 'C3',					//	(324 mm by 458 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C4_ENVELOPE						=> 'C4',					//	(229 mm by 324 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C6_ENVELOPE						=> 'C6',					//	(114 mm by 162 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_C65_ENVELOPE					=> array(323.15,649.13),	//	(114 mm by 229 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B4_ENVELOPE						=> 'B4',					//	(250 mm by 353 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B5_ENVELOPE						=> 'B5',					//	(176 mm by 250 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_B6_ENVELOPE						=> array(498.90,354.33),	//	(176 mm by 125 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ITALY_ENVELOPE					=> array(311.81,651.97),	//	(110 mm by 230 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_MONARCH_ENVELOPE				=> array(279.00,540.00),	//	(3.875 in. by 7.5 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_6_3_4_ENVELOPE					=> array(261.00,468.00),	//	(3.625 in. by 6.5 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_US_STANDARD_FANFOLD				=> array(1071.00,792.00),	//	(14.875 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_STANDARD_FANFOLD			=> array(612.00,864.00),	//	(8.5 in. by 12 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_GERMAN_LEGAL_FANFOLD			=> 'FOLIO',					//	(8.5 in. by 13 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B4							=> 'B4',					//	(250 mm by 353 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_JAPANESE_DOUBLE_POSTCARD		=> array(566.93,419.53),	//	(200 mm by 148 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_1				=> array(648.00,792.00),	//	(9 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_2				=> array(720.00,792.00),	//	(10 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_STANDARD_PAPER_3				=> array(1080.00,792.00),	//	(15 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_INVITE_ENVELOPE					=> array(623.62,623.62),	//	(220 mm by 220 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_PAPER				=> array(667.80,864.00),	//	(9.275 in. by 12 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LEGAL_EXTRA_PAPER				=> array(667.80,1080.00),	//	(9.275 in. by 15 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_TABLOID_EXTRA_PAPER				=> array(841.68,1296.00),	//	(11.69 in. by 18 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_EXTRA_PAPER					=> array(668.98,912.76),	//	(236 mm by 322 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_TRANSVERSE_PAPER			=> array(595.80,792.00),	//	(8.275 in. by 11 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_TRANSVERSE_PAPER				=> 'A4',					//	(210 mm by 297 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_EXTRA_TRANSVERSE_PAPER	=> array(667.80,864.00),	//	(9.275 in. by 12 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERA_SUPERA_A4_PAPER			=> array(643.46,1009.13),	//	(227 mm by 356 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_SUPERB_SUPERB_A3_PAPER			=> array(864.57,1380.47),	//	(305 mm by 487 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER_PLUS_PAPER				=> array(612.00,913.68),	//	(8.5 in. by 12.69 in.)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A4_PLUS_PAPER					=> array(595.28,935.43),	//	(210 mm by 330 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_TRANSVERSE_PAPER				=> 'A5',					//	(148 mm by 210 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_JIS_B5_TRANSVERSE_PAPER			=> array(515.91,728.50),	//	(182 mm by 257 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_PAPER					=> array(912.76,1261.42),	//	(322 mm by 445 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A5_EXTRA_PAPER					=> array(493.23,666.14),	//	(174 mm by 235 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_ISO_B5_EXTRA_PAPER				=> array(569.76,782.36),	//	(201 mm by 276 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A2_PAPER						=> 'A2',					//	(420 mm by 594 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_TRANSVERSE_PAPER				=> 'A3',					//	(297 mm by 420 mm)
+		PHPExcel_Worksheet_PageSetup::PAPERSIZE_A3_EXTRA_TRANSVERSE_PAPER		=> array(912.76,1261.42)	//	(322 mm by 445 mm)
+	);
+
+	/**
+	 * Create a new PHPExcel_Writer_PDF
+	 *
+	 * @param 	PHPExcel	$phpExcel	PHPExcel object
+	 */
+	public function __construct(PHPExcel $phpExcel) {
+		parent::__construct($phpExcel);
+		$this->setUseInlineCss(true);
+		$this->_tempDir = PHPExcel_Shared_File::sys_get_temp_dir();
+	}
+
+    /**
+     * Get Font
+     *
+     * @return string
+     */
+    public function getFont() {
+    	return $this->_font;
+    }
+
+	/**
+	 * Set font. Examples:
+	 *   'arialunicid0-chinese-simplified'
+	 *   'arialunicid0-chinese-traditional'
+	 *   'arialunicid0-korean'
+	 *   'arialunicid0-japanese'
+	 *
+	 * @param	string	$fontName
+	 */
+	public function setFont($fontName) {
+		$this->_font = $fontName;
+		return $this;
+	}
+
+    /**
+     * Get Paper Size
+     *
+     * @return int
+     */
+    public function getPaperSize() {
+    	return $this->_paperSize;
+    }
+
+    /**
+     * Set Paper Size
+     *
+     * @param int $pValue
+     * @return PHPExcel_Writer_PDF
+     */
+    public function setPaperSize($pValue = PHPExcel_Worksheet_PageSetup::PAPERSIZE_LETTER) {
+    	$this->_paperSize = $pValue;
+    	return $this;
+    }
+
+    /**
+     * Get Orientation
+     *
+     * @return string
+     */
+    public function getOrientation() {
+    	return $this->_orientation;
+    }
+
+    /**
+     * Set Orientation
+     *
+     * @param string $pValue
+     * @return PHPExcel_Writer_PDF
+     */
+    public function setOrientation($pValue = PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) {
+    	$this->_orientation = $pValue;
+    	return $this;
+    }
+
+	/**
+	 * Get temporary storage directory
+	 *
+	 * @return string
+	 */
+	public function getTempDir() {
+		return $this->_tempDir;
+	}
+
+	/**
+	 * Set temporary storage directory
+	 *
+	 * @param 	string	$pValue		Temporary storage directory
+	 * @throws 	Exception	Exception when directory does not exist
+	 * @return PHPExcel_Writer_PDF
+	 */
+	public function setTempDir($pValue = '') {
+		if (is_dir($pValue)) {
+			$this->_tempDir = $pValue;
+		} else {
+			throw new Exception("Directory does not exist: $pValue");
+		}
+		return $this;
+	}
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/DomPDF.php b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/DomPDF.php
new file mode 100644
index 00000000000..a8ab4efd945
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/DomPDF.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/** Require DomPDF library */
+$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/dompdf_config.inc.php';
+if (file_exists($pdfRendererClassFile)) {
+	require_once $pdfRendererClassFile;
+} else {
+	throw new Exception('Unable to load PDF Rendering library');
+}
+
+/**
+ * PHPExcel_Writer_PDF_DomPDF
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Writer_PDF_DomPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter {
+	/**
+	 * Create a new PHPExcel_Writer_PDF
+	 *
+	 * @param 	PHPExcel	$phpExcel	PHPExcel object
+	 */
+	public function __construct(PHPExcel $phpExcel) {
+		parent::__construct($phpExcel);
+	}
+
+	/**
+	 * Save PHPExcel to file
+	 *
+	 * @param 	string 		$pFileName
+	 * @throws 	Exception
+	 */
+	public function save($pFilename = null) {
+		// garbage collect
+		$this->_phpExcel->garbageCollect();
+
+		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
+		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
+
+		// Open file
+		$fileHandle = fopen($pFilename, 'w');
+		if ($fileHandle === false) {
+			throw new Exception("Could not open file $pFilename for writing.");
+		}
+
+		// Set PDF
+		$this->_isPdf = true;
+		// Build CSS
+		$this->buildCSS(true);
+
+		// Default PDF paper size
+		$paperSize = 'LETTER';	//	Letter	(8.5 in. by 11 in.)
+
+		// Check for paper size and page orientation
+		if (is_null($this->getSheetIndex())) {
+			$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+			$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
+			$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
+		} else {
+			$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+			$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
+			$printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
+		}
+
+		//	Override Page Orientation
+		if (!is_null($this->getOrientation())) {
+			$orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) ?
+				PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT : $this->getOrientation();
+		}
+		//	Override Paper Size
+		if (!is_null($this->getPaperSize())) {
+			$printPaperSize = $this->getPaperSize();
+		}
+
+		if (isset(self::$_paperSizes[$printPaperSize])) {
+			$paperSize = self::$_paperSizes[$printPaperSize];
+		}
+
+		$orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
+
+		// Create PDF
+		$pdf = new DOMPDF();
+		$pdf->set_paper(strtolower($paperSize), $orientation);
+
+		$pdf->load_html(
+			$this->generateHTMLHeader(false) .
+			$this->generateSheetData() .
+			$this->generateHTMLFooter()
+		);
+		$pdf->render();
+
+		// Write to file
+		fwrite($fileHandle, $pdf->output());
+
+		// Close file
+		fclose($fileHandle);
+
+		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/mPDF.php b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/mPDF.php
new file mode 100644
index 00000000000..5f9f2a350fc
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/mPDF.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/** Require mPDF library */
+$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/mpdf.php';
+if (file_exists($pdfRendererClassFile)) {
+	require_once $pdfRendererClassFile;
+} else {
+	throw new Exception('Unable to load PDF Rendering library');
+}
+
+/**
+ * PHPExcel_Writer_PDF_mPDF
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Writer_PDF_mPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter {
+	/**
+	 * Create a new PHPExcel_Writer_PDF
+	 *
+	 * @param 	PHPExcel	$phpExcel	PHPExcel object
+	 */
+	public function __construct(PHPExcel $phpExcel) {
+		parent::__construct($phpExcel);
+	}
+
+	/**
+	 * Save PHPExcel to file
+	 *
+	 * @param 	string 		$pFileName
+	 * @throws 	Exception
+	 */
+	public function save($pFilename = null) {
+		// garbage collect
+		$this->_phpExcel->garbageCollect();
+
+		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
+		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
+
+		// Open file
+		$fileHandle = fopen($pFilename, 'w');
+		if ($fileHandle === false) {
+			throw new Exception("Could not open file $pFilename for writing.");
+		}
+
+		// Set PDF
+		$this->_isPdf = true;
+		// Build CSS
+		$this->buildCSS(true);
+
+		// Default PDF paper size
+		$paperSize = 'LETTER';	//	Letter	(8.5 in. by 11 in.)
+
+		// Check for paper size and page orientation
+		if (is_null($this->getSheetIndex())) {
+			$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+			$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
+			$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
+		} else {
+			$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+			$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
+			$printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
+		}
+		$this->setOrientation($orientation);
+
+		//	Override Page Orientation
+		if (!is_null($this->getOrientation())) {
+			$orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_DEFAULT) ?
+				PHPExcel_Worksheet_PageSetup::ORIENTATION_PORTRAIT : $this->getOrientation();
+		}
+		$orientation = strtoupper($orientation);
+
+		//	Override Paper Size
+		if (!is_null($this->getPaperSize())) {
+			$printPaperSize = $this->getPaperSize();
+		}
+
+		if (isset(self::$_paperSizes[$printPaperSize])) {
+			$paperSize = self::$_paperSizes[$printPaperSize];
+		}
+
+		// Create PDF
+		$pdf = new mpdf();
+		$pdf->_setPageSize(strtoupper($paperSize), $orientation);
+        $pdf->DefOrientation = $orientation;
+		// Document info
+		$pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
+		$pdf->SetAuthor($this->_phpExcel->getProperties()->getCreator());
+		$pdf->SetSubject($this->_phpExcel->getProperties()->getSubject());
+		$pdf->SetKeywords($this->_phpExcel->getProperties()->getKeywords());
+		$pdf->SetCreator($this->_phpExcel->getProperties()->getCreator());
+
+		$pdf->WriteHTML(
+			$this->generateHTMLHeader(false) .
+			$this->generateSheetData() .
+			$this->generateHTMLFooter()
+		);
+
+		// Write to file
+		fwrite($fileHandle, $pdf->Output('','S'));
+
+		// Close file
+		fclose($fileHandle);
+
+		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/tcPDF.php b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/tcPDF.php
new file mode 100644
index 00000000000..d77ab91a9fc
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF/tcPDF.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2012 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version		1.7.8, 2012-10-12
+ */
+
+
+/** Require tcPDF library */
+$pdfRendererClassFile = PHPExcel_Settings::getPdfRendererPath() . '/tcpdf.php';
+if (file_exists($pdfRendererClassFile)) {
+	$k_path_url = PHPExcel_Settings::getPdfRendererPath();
+	require_once $pdfRendererClassFile;
+} else {
+	throw new Exception('Unable to load PDF Rendering library');
+}
+
+/**
+ * PHPExcel_Writer_PDF_tcPDF
+ *
+ * @category	PHPExcel
+ * @package		PHPExcel_Writer
+ * @copyright	Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_Writer_PDF_tcPDF extends PHPExcel_Writer_PDF_Core implements PHPExcel_Writer_IWriter {
+	/**
+	 * Create a new PHPExcel_Writer_PDF
+	 *
+	 * @param 	PHPExcel	$phpExcel	PHPExcel object
+	 */
+	public function __construct(PHPExcel $phpExcel) {
+		parent::__construct($phpExcel);
+	}
+
+	/**
+	 * Save PHPExcel to file
+	 *
+	 * @param 	string 		$pFileName
+	 * @throws 	Exception
+	 */
+	public function save($pFilename = null) {
+		// garbage collect
+		$this->_phpExcel->garbageCollect();
+
+		$saveArrayReturnType = PHPExcel_Calculation::getArrayReturnType();
+		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
+
+		// Open file
+		$fileHandle = fopen($pFilename, 'w');
+		if ($fileHandle === false) {
+			throw new Exception("Could not open file $pFilename for writing.");
+		}
+
+		// Set PDF
+		$this->_isPdf = true;
+		// Build CSS
+		$this->buildCSS(true);
+
+		// Default PDF paper size
+		$paperSize = 'LETTER';	//	Letter	(8.5 in. by 11 in.)
+
+		// Check for paper size and page orientation
+		if (is_null($this->getSheetIndex())) {
+			$orientation = ($this->_phpExcel->getSheet(0)->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+			$printPaperSize = $this->_phpExcel->getSheet(0)->getPageSetup()->getPaperSize();
+			$printMargins = $this->_phpExcel->getSheet(0)->getPageMargins();
+		} else {
+			$orientation = ($this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
+			$printPaperSize = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
+			$printMargins = $this->_phpExcel->getSheet($this->getSheetIndex())->getPageMargins();
+		}
+
+		//	Override Page Orientation
+		if (!is_null($this->getOrientation())) {
+			$orientation = ($this->getOrientation() == PHPExcel_Worksheet_PageSetup::ORIENTATION_LANDSCAPE) ?
+				'L' : 'P';
+		}
+		//	Override Paper Size
+		if (!is_null($this->getPaperSize())) {
+			$printPaperSize = $this->getPaperSize();
+		}
+
+
+		if (isset(self::$_paperSizes[$printPaperSize])) {
+			$paperSize = self::$_paperSizes[$printPaperSize];
+		}
+
+
+		// Create PDF
+		$pdf = new TCPDF($orientation, 'pt', $paperSize);
+		$pdf->setFontSubsetting(false);
+		//	Set margins, converting inches to points (using 72 dpi)
+		$pdf->SetMargins($printMargins->getLeft() * 72,$printMargins->getTop() * 72,$printMargins->getRight() * 72);
+		$pdf->SetAutoPageBreak(true,$printMargins->getBottom() * 72);
+//		$pdf->setHeaderMargin($printMargins->getHeader() * 72);
+//		$pdf->setFooterMargin($printMargins->getFooter() * 72);
+
+		$pdf->setPrintHeader(false);
+		$pdf->setPrintFooter(false);
+
+		$pdf->AddPage();
+
+		// Set the appropriate font
+		$pdf->SetFont($this->getFont());
+		$pdf->writeHTML(
+			$this->generateHTMLHeader(false) .
+			$this->generateSheetData() .
+			$this->generateHTMLFooter()
+		);
+
+		// Document info
+		$pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
+		$pdf->SetAuthor($this->_phpExcel->getProperties()->getCreator());
+		$pdf->SetSubject($this->_phpExcel->getProperties()->getSubject());
+		$pdf->SetKeywords($this->_phpExcel->getProperties()->getKeywords());
+		$pdf->SetCreator($this->_phpExcel->getProperties()->getCreator());
+
+		// Write to file
+		fwrite($fileHandle, $pdf->output($pFilename, 'S'));
+
+		// Close file
+		fclose($fileHandle);
+
+		PHPExcel_Calculation::setArrayReturnType($saveArrayReturnType);
+	}
+
+}
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/cs/config b/htdocs/includes/phpexcel/PHPExcel/locale/cs/config
index 5dc45d42944..38a44128e27 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/cs/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/cs/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/cs/functions b/htdocs/includes/phpexcel/PHPExcel/locale/cs/functions
index ae128b85fed..992dc37535e 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/cs/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/cs/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/da/config b/htdocs/includes/phpexcel/PHPExcel/locale/da/config
index 788feafe237..49292f1cf67 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/da/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/da/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/da/functions b/htdocs/includes/phpexcel/PHPExcel/locale/da/functions
index f83beb9f898..affc19a1ac2 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/da/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/da/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/de/config b/htdocs/includes/phpexcel/PHPExcel/locale/de/config
index 373c10f2553..95193498fe6 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/de/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/de/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/de/functions b/htdocs/includes/phpexcel/PHPExcel/locale/de/functions
index 447868178ce..1c19c5b22ce 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/de/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/de/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/en/uk/config b/htdocs/includes/phpexcel/PHPExcel/locale/en/uk/config
index 28d5d82a8c7..1bcfcb2b79c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/en/uk/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/en/uk/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/es/config b/htdocs/includes/phpexcel/PHPExcel/locale/es/config
index 7495acae2d5..039f5b8c877 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/es/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/es/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/es/functions b/htdocs/includes/phpexcel/PHPExcel/locale/es/functions
index 11e21a0f5b6..9d47f0e491a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/es/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/es/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/fi/config b/htdocs/includes/phpexcel/PHPExcel/locale/fi/config
index 0e29ac0a7df..ba274e1d5c2 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/fi/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/fi/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/fi/functions b/htdocs/includes/phpexcel/PHPExcel/locale/fi/functions
index 9df12c33193..25e08eacd35 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/fi/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/fi/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/fr/config b/htdocs/includes/phpexcel/PHPExcel/locale/fr/config
index acd821415c7..8ae183a698a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/fr/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/fr/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/fr/functions b/htdocs/includes/phpexcel/PHPExcel/locale/fr/functions
index 31157731200..ebb8339b6ac 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/fr/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/fr/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/hu/config b/htdocs/includes/phpexcel/PHPExcel/locale/hu/config
index 49a0f30440b..725b5698f2a 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/hu/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/hu/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/hu/functions b/htdocs/includes/phpexcel/PHPExcel/locale/hu/functions
index 99ae596d0a8..a3855c066e5 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/hu/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/hu/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/it/config b/htdocs/includes/phpexcel/PHPExcel/locale/it/config
index 5be84ec370a..5baad5378d6 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/it/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/it/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/it/functions b/htdocs/includes/phpexcel/PHPExcel/locale/it/functions
index 3e5ea1b759d..3d092048130 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/it/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/it/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/nl/config b/htdocs/includes/phpexcel/PHPExcel/locale/nl/config
index e43da0b04ff..d56b38fdbf7 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/nl/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/nl/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/nl/functions b/htdocs/includes/phpexcel/PHPExcel/locale/nl/functions
index 8c6cc2bd73e..6e941216d13 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/nl/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/nl/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/no/config b/htdocs/includes/phpexcel/PHPExcel/locale/no/config
index dca5197ef3d..482e4bc4464 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/no/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/no/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/no/functions b/htdocs/includes/phpexcel/PHPExcel/locale/no/functions
index 6074c55b972..eb5ae02dd27 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/no/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/no/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/pl/config b/htdocs/includes/phpexcel/PHPExcel/locale/pl/config
index ea3e45e7135..6823761e012 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/pl/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/pl/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
@@ -32,7 +32,7 @@ ArgumentSeparator	= ;
 ##
 ##	(For future use)
 ##
-currencySymbol	= zł	##	Not sure if it should be a € (Euro)
+currencySymbol	= zł
 
 
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/pl/functions b/htdocs/includes/phpexcel/PHPExcel/locale/pl/functions
index dc85e4cd3d5..14858433784 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/pl/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/pl/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/config b/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/config
index 9f471debac6..b8e696454aa 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/functions b/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/functions
index a062a7fad51..11d45f1fd77 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/pt/br/functions
@@ -1,4 +1,4 @@
-##
+##
 ##	Add-in and Automation functions			Funções Suplemento e Automação
 ##
 GETPIVOTDATA		= INFODADOSTABELADINÂMICA	##	Retorna os dados armazenados em um relatório de tabela dinâmica
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/pt/config b/htdocs/includes/phpexcel/PHPExcel/locale/pt/config
index 8ef25422b41..595ee96835b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/pt/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/pt/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/pt/functions b/htdocs/includes/phpexcel/PHPExcel/locale/pt/functions
index ba4eb471bad..05e8bcaea7d 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/pt/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/pt/functions
@@ -1,4 +1,4 @@
-##
+##
 ##	Add-in and Automation functions			Funções de Suplemento e Automatização
 ##
 GETPIVOTDATA		= OBTERDADOSDIN			##	Devolve dados armazenados num relatório de Tabela Dinâmica
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/ru/config b/htdocs/includes/phpexcel/PHPExcel/locale/ru/config
index f914153df3a..aa7e685787b 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/ru/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/ru/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/ru/functions b/htdocs/includes/phpexcel/PHPExcel/locale/ru/functions
index a3a3ba8db4b..f37afc2491c 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/ru/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/ru/functions
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Calculation
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ## Data in this file derived from information provided by web-junior (http://www.web-junior.net/)
 ##
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/sv/config b/htdocs/includes/phpexcel/PHPExcel/locale/sv/config
index 59cbdba785d..6a597781650 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/sv/config
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/sv/config
@@ -1,4 +1,4 @@
-##
+##
 ## PHPExcel
 ##

 ## Copyright (c) 2006 - 2011 PHPExcel
@@ -21,7 +21,7 @@
 ## @package    PHPExcel_Settings
 ## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
 ## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
-## @version    1.7.6, 2011-02-27
+## @version    1.7.8, 2012-10-12
 ##
 ##
 
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/sv/functions b/htdocs/includes/phpexcel/PHPExcel/locale/sv/functions
index 73b2deb5eb2..27f61e7f834 100644
--- a/htdocs/includes/phpexcel/PHPExcel/locale/sv/functions
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/sv/functions
@@ -1,4 +1,4 @@
-##
+##
 ##	Add-in and Automation functions			Tilläggs- och automatiseringsfunktioner
 ##
 GETPIVOTDATA		= HÄMTA.PIVOTDATA		##	Returnerar data som lagrats i en pivottabellrapport
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/tr/config b/htdocs/includes/phpexcel/PHPExcel/locale/tr/config
new file mode 100644
index 00000000000..bd75af628ee
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/tr/config
@@ -0,0 +1,47 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2011 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library 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
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Settings
+## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    1.7.8, 2012-10-12
+##
+##
+
+
+ArgumentSeparator	= ;
+
+
+##
+##	(For future use)
+##
+currencySymbol	= YTL
+
+
+##
+##	Excel Error Codes	(For future use)

+##
+NULL	= #BOŞ!
+DIV0	= #SAYI/0!
+VALUE	= #DEĞER!
+REF	= #BAŞV!
+NAME	= #AD?
+NUM	= #SAYI!
+NA	= #YOK
diff --git a/htdocs/includes/phpexcel/PHPExcel/locale/tr/functions b/htdocs/includes/phpexcel/PHPExcel/locale/tr/functions
new file mode 100644
index 00000000000..f8cd30fbd2e
--- /dev/null
+++ b/htdocs/includes/phpexcel/PHPExcel/locale/tr/functions
@@ -0,0 +1,438 @@
+##
+## PHPExcel
+##

+## Copyright (c) 2006 - 2011 PHPExcel
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library 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
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## @category   PHPExcel
+## @package    PHPExcel_Calculation
+## @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+## @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+## @version    1.7.8, 2012-10-12
+##
+## Data in this file derived from http://www.piuha.fi/excel-function-name-translation/
+##
+##
+
+
+##
+##	Add-in and Automation functions			Eklenti ve Otomasyon fonksiyonları
+##
+GETPIVOTDATA		= ÖZETVERİAL	##	Bir Özet Tablo raporunda saklanan verileri verir.
+
+
+##
+##	Cube functions					Küp işlevleri
+##
+CUBEKPIMEMBER		= KÜPKPIÜYE			##	Kilit performans göstergesi (KPI-Key Performance Indicator) adını, özelliğini ve ölçüsünü verir ve hücredeki ad ve özelliği gösterir. KPI, bir kurumun performansını izlemek için kullanılan aylık brüt kâr ya da üç aylık çalışan giriş çıkışları gibi ölçülebilen bir birimdir.
+CUBEMEMBER			= KÜPÜYE			##	Bir küp hiyerarşisinde bir üyeyi veya kaydı verir. Üye veya kaydın küpte varolduğunu doğrulamak için kullanılır.
+CUBEMEMBERPROPERTY	= KÜPÜYEÖZELLİĞİ	##	Bir küpte bir üyenin özelliğinin değerini verir. Küp içinde üye adının varlığını doğrulamak ve bu üyenin belli özelliklerini getirmek için kullanılır.
+CUBERANKEDMEMBER	= KÜPÜYESIRASI 		##	Bir küme içindeki üyenin derecesini veya kaçıncı olduğunu verir. En iyi satış elemanı, veya en iyi on öğrenci gibi bir kümedeki bir veya daha fazla öğeyi getirmek için kullanılır.
+CUBESET				= KÜPKÜME			##	Kümeyi oluşturan ve ardından bu kümeyi Microsoft Office Excel'e getiren sunucudaki küpe küme ifadelerini göndererek hesaplanan üye veya kayıt kümesini tanımlar.
+CUBESETCOUNT		= KÜPKÜMESAY		##	Bir kümedeki öğelerin sayısını getirir.
+CUBEVALUE			= KÜPDEĞER 			##	Bir küpten toplam değeri getirir.
+
+
+##
+##	Database functions				Veritabanı işlevleri
+##
+DAVERAGE		= VSEÇORT			##	Seçili veritabanı girdilerinin ortalamasını verir.
+DCOUNT			= VSEÇSAY			##	Veritabanında sayı içeren hücre sayısını hesaplar.
+DCOUNTA			= VSEÇSAYDOLU		##	Veritabanındaki boş olmayan hücreleri sayar.
+DGET			= VAL				##	Veritabanından, belirtilen ölçütlerle eşleşen tek bir rapor çıkarır.
+DMAX			= VSEÇMAK			##	Seçili veritabanı girişlerinin en yüksek değerini verir.
+DMIN			= VSEÇMİN			##	Seçili veritabanı girişlerinin en düşük değerini verir.
+DPRODUCT		= VSEÇÇARP			##	Kayıtların belli bir alanında bulunan, bir veritabanındaki ölçütlerle eşleşen değerleri çarpar.
+DSTDEV			= VSEÇSTDSAPMA		##	Seçili veritabanı girişlerinden oluşan bir örneğe dayanarak, standart sapmayı tahmin eder.
+DSTDEVP			= VSEÇSTDSAPMAS		##	Standart sapmayı, seçili veritabanı girişlerinin tüm popülasyonunu esas alarak hesaplar.
+DSUM			= VSEÇTOPLA			##	Kayıtların alan sütununda bulunan, ölçütle eşleşen sayıları toplar.
+DVAR			= VSEÇVAR			##	Seçili veritabanı girişlerinden oluşan bir örneği esas alarak farkı tahmin eder.
+DVARP			= VSEÇVARS			##	Seçili veritabanı girişlerinin tüm popülasyonunu esas alarak farkı hesaplar.
+
+
+##
+##	Date and time functions				Tarih ve saat işlevleri
+##
+DATE			= TARİH				##	Belirli bir tarihin seri numarasını verir.
+DATEVALUE		= TARİHSAYISI		##	Metin biçimindeki bir tarihi seri numarasına dönüştürür.
+DAY				= GÜN				##	Seri numarasını, ayın bir gününe dönüştürür.
+DAYS360			= GÜN360			##	İki tarih arasındaki gün sayısını, 360 günlük yılı esas alarak hesaplar.
+EDATE			= SERİTARİH			##	Başlangıç tarihinden itibaren, belirtilen ay sayısından önce veya sonraki tarihin seri numarasını verir.
+EOMONTH			= SERİAY			##	Belirtilen sayıda ay önce veya sonraki ayın son gününün seri numarasını verir.
+HOUR			= SAAT				##	Bir seri numarasını saate dönüştürür.
+MINUTE			= DAKİKA			##	Bir seri numarasını dakikaya dönüştürür.
+MONTH			= AY				##	Bir seri numarasını aya dönüştürür.
+NETWORKDAYS		= TAMİŞGÜNÜ			##	İki tarih arasındaki tam çalışma günlerinin sayısını verir.
+NOW				= ŞİMDİ				##	Geçerli tarihin ve saatin seri numarasını verir.
+SECOND			= SANİYE			##	Bir seri numarasını saniyeye dönüştürür.
+TIME			= ZAMAN				##	Belirli bir zamanın seri numarasını verir.
+TIMEVALUE		= ZAMANSAYISI		##	Metin biçimindeki zamanı seri numarasına dönüştürür.
+TODAY			= BUGÜN				##	Bugünün tarihini seri numarasına dönüştürür.
+WEEKDAY			= HAFTANINGÜNÜ		##	Bir seri numarasını, haftanın gününe dönüştürür.
+WEEKNUM			= HAFTASAY			##	Dizisel değerini, haftanın yıl içinde bulunduğu konumu sayısal olarak gösteren sayıya dönüştürür.
+WORKDAY			= İŞGÜNÜ			##	Belirtilen sayıda çalışma günü öncesinin ya da sonrasının tarihinin seri numarasını verir.
+YEAR			= YIL				##	Bir seri numarasını yıla dönüştürür.
+YEARFRAC		= YILORAN			##	Başlangıç_tarihi ve bitiş_tarihi arasındaki tam günleri gösteren yıl kesrini verir.
+
+
+##
+##	Engineering functions				Mühendislik işlevleri
+##
+BESSELI			= BESSELI			##	Değiştirilmiş Bessel fonksiyonu In(x)'i verir.
+BESSELJ			= BESSELJ			##	Bessel fonksiyonu Jn(x)'i verir.
+BESSELK			= BESSELK			##	Değiştirilmiş Bessel fonksiyonu Kn(x)'i verir.
+BESSELY			= BESSELY			##	Bessel fonksiyonu Yn(x)'i verir.
+BIN2DEC			= BIN2DEC			##	İkili bir sayıyı, ondalık sayıya dönüştürür.
+BIN2HEX			= BIN2HEX			##	İkili bir sayıyı, onaltılıya dönüştürür.
+BIN2OCT			= BIN2OCT			##	İkili bir sayıyı, sekizliye dönüştürür.
+COMPLEX			= KARMAŞIK			##	Gerçek ve sanal katsayıları, karmaşık sayıya dönüştürür.
+CONVERT			= ÇEVİR				##	Bir sayıyı, bir ölçüm sisteminden bir başka ölçüm sistemine dönüştürür.
+DEC2BIN			= DEC2BIN			##	Ondalık bir sayıyı, ikiliye dönüştürür.
+DEC2HEX			= DEC2HEX			##	Ondalık bir sayıyı, onaltılıya dönüştürür.
+DEC2OCT			= DEC2OCT			##	Ondalık bir sayıyı sekizliğe dönüştürür.
+DELTA			= DELTA				##	İki değerin eşit olup olmadığını sınar.
+ERF				= HATAİŞLEV			##	Hata işlevini verir.
+ERFC			= TÜMHATAİŞLEV		##	Tümleyici hata işlevini verir.
+GESTEP			= BESINIR			##	Bir sayının eşik değerinden büyük olup olmadığını sınar.
+HEX2BIN			= HEX2BIN			##	Onaltılı bir sayıyı ikiliye dönüştürür.
+HEX2DEC			= HEX2DEC			##	Onaltılı bir sayıyı ondalığa dönüştürür.
+HEX2OCT			= HEX2OCT			##	Onaltılı bir sayıyı sekizliğe dönüştürür.
+IMABS			= SANMUTLAK			##	Karmaşık bir sayının mutlak değerini (modül) verir.
+IMAGINARY		= SANAL				##	Karmaşık bir sayının sanal katsayısını verir.
+IMARGUMENT		= SANBAĞ_DEĞİŞKEN	##	Radyanlarla belirtilen bir açı olan teta bağımsız değişkenini verir.
+IMCONJUGATE		= SANEŞLENEK		##	Karmaşık bir sayının karmaşık eşleniğini verir.
+IMCOS			= SANCOS			##	Karmaşık bir sayının kosinüsünü verir.
+IMDIV			= SANBÖL			##	İki karmaşık sayının bölümünü verir.
+IMEXP			= SANÜS				##	Karmaşık bir sayının üssünü verir.
+IMLN			= SANLN				##	Karmaşık bir sayının doğal logaritmasını verir.
+IMLOG10			= SANLOG10			##	Karmaşık bir sayının, 10 tabanında logaritmasını verir.
+IMLOG2			= SANLOG2			##	Karmaşık bir sayının 2 tabanında logaritmasını verir.
+IMPOWER			= SANÜSSÜ			##	Karmaşık bir sayıyı, bir tamsayı üssüne yükseltilmiş olarak verir.
+IMPRODUCT		= SANÇARP			##	Karmaşık sayıların çarpımını verir.
+IMREAL			= SANGERÇEK			##	Karmaşık bir sayının, gerçek katsayısını verir.
+IMSIN			= SANSIN			##	Karmaşık bir sayının sinüsünü verir.
+IMSQRT			= SANKAREKÖK		##	Karmaşık bir sayının karekökünü verir.
+IMSUB			= SANÇIKAR			##	İki karmaşık sayının farkını verir.
+IMSUM			= SANTOPLA			##	Karmaşık sayıların toplamını verir.
+OCT2BIN			= OCT2BIN			##	Sekizli bir sayıyı ikiliye dönüştürür.
+OCT2DEC			= OCT2DEC			##	Sekizli bir sayıyı ondalığa dönüştürür.
+OCT2HEX			= OCT2HEX			##	Sekizli bir sayıyı onaltılıya dönüştürür.
+
+
+##
+##	Financial functions				Finansal fonksiyonlar
+##
+ACCRINT			= GERÇEKFAİZ		##	Dönemsel faiz ödeyen hisse senedine ilişkin tahakkuk eden faizi getirir.
+ACCRINTM		= GERÇEKFAİZV		##	Vadesinde ödeme yapan bir tahvilin tahakkuk etmiş faizini verir.
+AMORDEGRC		= AMORDEGRC			##	Yıpranma katsayısı kullanarak her hesap döneminin değer kaybını verir.
+AMORLINC		= AMORLINC			##	Her hesap dönemi içindeki yıpranmayı verir.
+COUPDAYBS		= KUPONGÜNBD		##	Kupon süresinin başlangıcından alış tarihine kadar olan süredeki gün sayısını verir.
+COUPDAYS		= KUPONGÜN			##	Kupon süresindeki, gün sayısını, alış tarihini de içermek üzere, verir.
+COUPDAYSNC		= KUPONGÜNDSK		##	Alış tarihinden bir sonraki kupon tarihine kadar olan gün sayısını verir.
+COUPNCD			= KUPONGÜNSKT		##	Alış tarihinden bir sonraki kupon tarihini verir.
+COUPNUM			= KUPONSAYI			##	Alış tarihiyle vade tarihi arasında ödenecek kuponların sayısını verir.
+COUPPCD			= KUPONGÜNÖKT		##	Alış tarihinden bir önceki kupon tarihini verir.
+CUMIPMT			= AİÇVERİMORANI		##	İki dönem arasında ödenen kümülatif faizi verir.
+CUMPRINC		= ANA_PARA_ÖDEMESİ	##	İki dönem arasında bir borç üzerine ödenen birikimli temeli verir.
+DB				= AZALANBAKİYE		##	Bir malın belirtilen bir süre içindeki yıpranmasını, sabit azalan bakiye yöntemini kullanarak verir.
+DDB				= ÇİFTAZALANBAKİYE	##	Bir malın belirtilen bir süre içindeki yıpranmasını, çift azalan bakiye yöntemi ya da sizin belirttiğiniz başka bir yöntemi kullanarak verir.
+DISC			= İNDİRİM			##	Bir tahvilin indirim oranını verir.
+DOLLARDE		= LİRAON			##	Kesir olarak tanımlanmış lira fiyatını, ondalık sayı olarak tanımlanmış lira fiyatına dönüştürür.
+DOLLARFR		= LİRAKES			##	Ondalık sayı olarak tanımlanmış lira fiyatını, kesir olarak tanımlanmış lira fiyatına dönüştürür.
+DURATION		= SÜRE				##	Belli aralıklarla faiz ödemesi yapan bir tahvilin yıllık süresini verir.
+EFFECT			= ETKİN				##	Efektif yıllık faiz oranını verir.
+FV				= ANBD				##	Bir yatırımın gelecekteki değerini verir.
+FVSCHEDULE		= GDPROGRAM			##	Bir seri birleşik faiz oranı uyguladıktan sonra, bir başlangıçtaki anaparanın gelecekteki değerini verir.
+INTRATE			= FAİZORANI			##	Tam olarak yatırım yapılmış bir tahvilin faiz oranını verir.
+IPMT			= FAİZTUTARI		##	Bir yatırımın verilen bir süre için faiz ödemesini verir.
+IRR				= İÇ_VERİM_ORANI	##	Bir para akışı serisi için, iç verim oranını verir.
+ISPMT			= ISPMT				##	Yatırımın belirli bir dönemi boyunca ödenen faizi hesaplar.
+MDURATION		= MSÜRE				##	Varsayılan par değeri 10.000.000 lira olan bir tahvil için Macauley değiştirilmiş süreyi verir.
+MIRR			= D_İÇ_VERİM_ORANI	##	Pozitif ve negatif para akışlarının farklı oranlarda finanse edildiği durumlarda, iç verim oranını verir.
+NOMINAL			= NOMİNAL			##	Yıllık nominal faiz oranını verir.
+NPER			= DÖNEM_SAYISI		##	Bir yatırımın dönem sayısını verir.
+NPV				= NBD				##	Bir yatırımın bugünkü net değerini, bir dönemsel para akışları serisine ve bir indirim oranına bağlı olarak verir.
+ODDFPRICE		= TEKYDEĞER			##	Tek bir ilk dönemi olan bir tahvilin değerini, her 100.000.000 lirada bir verir.
+ODDFYIELD		= TEKYÖDEME			##	Tek bir ilk dönemi olan bir tahvilin ödemesini verir.
+ODDLPRICE		= TEKSDEĞER			##	Tek bir son dönemi olan bir tahvilin fiyatını her 10.000.000 lirada bir verir.
+ODDLYIELD		= TEKSÖDEME			##	Tek bir son dönemi olan bir tahvilin ödemesini verir.
+PMT				= DEVRESEL_ÖDEME	##	Bir yıllık dönemsel ödemeyi verir.
+PPMT			= ANA_PARA_ÖDEMESİ	##	Verilen bir süre için, bir yatırımın anaparasına dayanan ödemeyi verir.
+PRICE			= DEĞER				##	Dönemsel faiz ödeyen bir tahvilin fiyatını 10.000.00 liralık değer başına verir.
+PRICEDISC		= DEĞERİND			##	İndirimli bir tahvilin fiyatını 10.000.000 liralık nominal değer başına verir.
+PRICEMAT		= DEĞERVADE			##	Faizini vade sonunda ödeyen bir tahvilin fiyatını 10.000.000 nominal değer başına verir.
+PV				= BD				##	Bir yatırımın bugünkü değerini verir.
+RATE			= FAİZ_ORANI		##	Bir yıllık dönem başına düşen faiz oranını verir.
+RECEIVED		= GETİRİ			##	Tam olarak yatırılmış bir tahvilin vadesinin bitiminde alınan miktarı verir.
+SLN				= DA				##	Bir malın bir dönem içindeki doğrusal yıpranmasını verir.
+SYD				= YAT				##	Bir malın belirli bir dönem için olan amortismanını verir.
+TBILLEQ			= HTAHEŞ			##	Bir Hazine bonosunun bono eşdeğeri ödemesini verir.
+TBILLPRICE		= HTAHDEĞER			##	Bir Hazine bonosunun değerini, 10.000.000 liralık nominal değer başına verir.
+TBILLYIELD		= HTAHÖDEME			##	Bir Hazine bonosunun ödemesini verir.
+VDB				= DAB				##	Bir malın amortismanını, belirlenmiş ya da kısmi bir dönem için, bir azalan bakiye yöntemi kullanarak verir.
+XIRR			= AİÇVERİMORANI		##	Dönemsel olması gerekmeyen bir para akışları programı için, iç verim oranını verir.
+XNPV			= ANBD				##	Dönemsel olması gerekmeyen bir para akışları programı için, bugünkü net değeri verir.
+YIELD			= ÖDEME				##	Belirli aralıklarla faiz ödeyen bir tahvilin ödemesini verir.
+YIELDDISC		= ÖDEMEİND			##	İndirimli bir tahvilin yıllık ödemesini verir; örneğin, bir Hazine bonosunun.
+YIELDMAT		= ÖDEMEVADE			##	Vadesinin bitiminde faiz ödeyen bir tahvilin yıllık ödemesini verir.
+
+
+##
+##	Information functions				Bilgi fonksiyonları
+##
+CELL			= HÜCRE			##	Bir hücrenin biçimlendirmesi, konumu ya da içeriği hakkında bilgi verir.
+ERROR.TYPE		= HATA.TİPİ		##	Bir hata türüne ilişkin sayıları verir.
+INFO			= BİLGİ			##	Geçerli işletim ortamı hakkında bilgi verir.
+ISBLANK			= EBOŞSA		##	Değer boşsa, DOĞRU verir.
+ISERR			= EHATA			##	Değer, #YOK dışındaki bir hata değeriyse, DOĞRU verir.
+ISERROR			= EHATALIYSA	##	Değer, herhangi bir hata değeriyse, DOĞRU verir.
+ISEVEN			= ÇİFTTİR		##	Sayı çiftse, DOĞRU verir.
+ISLOGICAL		= EMANTIKSALSA	##	Değer, mantıksal bir değerse, DOĞRU verir.
+ISNA			= EYOKSA		##	Değer, #YOK hata değeriyse, DOĞRU verir.
+ISNONTEXT		= EMETİNDEĞİLSE	##	Değer, metin değilse, DOĞRU verir.
+ISNUMBER		= ESAYIYSA		##	Değer, bir sayıysa, DOĞRU verir.
+ISODD			= TEKTİR		##	Sayı tekse, DOĞRU verir.
+ISREF			= EREFSE		##	Değer bir başvuruysa, DOĞRU verir.
+ISTEXT			= EMETİNSE		##	Değer bir metinse DOĞRU verir.
+N				= N				##	Sayıya dönüştürülmüş bir değer verir.
+NA				= YOKSAY		##	#YOK hata değerini verir.
+TYPE			= TİP			##	Bir değerin veri türünü belirten bir sayı verir.
+
+
+##
+##	Logical functions				Mantıksal fonksiyonlar
+##
+AND				= VE			##	Bütün bağımsız değişkenleri DOĞRU ise, DOĞRU verir.
+FALSE			= YANLIŞ		##	YANLIŞ mantıksal değerini verir.
+IF				= EĞER			##	Gerçekleştirilecek bir mantıksal sınama belirtir.
+IFERROR			= EĞERHATA		##	Formül hatalıysa belirttiğiniz değeri verir; bunun dışındaki durumlarda formülün sonucunu verir.
+NOT				= DEĞİL			##	Bağımsız değişkeninin mantığını tersine çevirir.
+OR				= YADA			##	Bağımsız değişkenlerden herhangi birisi DOĞRU ise, DOĞRU verir.
+TRUE			= DOĞRU			##	DOĞRU mantıksal değerini verir.
+
+
+##
+##	Lookup and reference functions			Arama ve Başvuru fonksiyonları
+##
+ADDRESS			= ADRES				##	Bir başvuruyu, çalışma sayfasındaki tek bir hücreye metin olarak verir.
+AREAS			= ALANSAY			##	Renvoie le nombre de zones dans une référence.
+CHOOSE			= ELEMAN			##	Değerler listesinden bir değer seçer.
+COLUMN			= SÜTUN				##	Bir başvurunun sütun sayısını verir.
+COLUMNS			= SÜTUNSAY			##	Bir başvurudaki sütunların sayısını verir.
+HLOOKUP			= YATAYARA			##	Bir dizinin en üst satırına bakar ve belirtilen hücrenin değerini verir.
+HYPERLINK		= KÖPRÜ				##	Bir ağ sunucusunda, bir intranette ya da Internet'te depolanan bir belgeyi açan bir kısayol ya da atlama oluşturur.
+INDEX			= İNDİS				##	Başvurudan veya diziden bir değer seçmek için, bir dizin kullanır.
+INDIRECT		= DOLAYLI			##	Metin değeriyle belirtilen bir başvuru verir.
+LOOKUP			= ARA				##	Bir vektördeki veya dizideki değerleri arar.
+MATCH			= KAÇINCI			##	Bir başvurudaki veya dizideki değerleri arar.
+OFFSET			= KAYDIR			##	Verilen bir başvurudan, bir başvuru kaydırmayı verir.
+ROW				= SATIR				##	Bir başvurunun satır sayısını verir.
+ROWS			= SATIRSAY			##	Bir başvurudaki satırların sayısını verir.
+RTD				= RTD				##	COM otomasyonunu destekleyen programdan gerçek zaman verileri alır.
+TRANSPOSE		= DEVRİK_DÖNÜŞÜM	##	Bir dizinin devrik dönüşümünü verir.
+VLOOKUP			= DÜŞEYARA			##	Bir dizinin ilk sütununa bakar ve bir hücrenin değerini vermek için satır boyunca hareket eder.
+
+
+##
+##	Math and trigonometry functions			Matematik ve trigonometri fonksiyonları
+##
+ABS				= MUTLAK			##	Bir sayının mutlak değerini verir.
+ACOS			= ACOS				##	Bir sayının ark kosinüsünü verir.
+ACOSH			= ACOSH				##	Bir sayının ters hiperbolik kosinüsünü verir.
+ASIN			= ASİN				##	Bir sayının ark sinüsünü verir.
+ASINH			= ASİNH				##	Bir sayının ters hiperbolik sinüsünü verir.
+ATAN			= ATAN				##	Bir sayının ark tanjantını verir.
+ATAN2			= ATAN2				##	Ark tanjantı, x- ve y- koordinatlarından verir.
+ATANH			= ATANH				##	Bir sayının ters hiperbolik tanjantını verir.
+CEILING			= TAVANAYUVARLA		##	Bir sayıyı, en yakın tamsayıya ya da en yakın katına yuvarlar.
+COMBIN			= KOMBİNASYON		##	Verilen sayıda öğenin kombinasyon sayısını verir.
+COS				= COS				##	Bir sayının kosinüsünü verir.
+COSH			= COSH				##	Bir sayının hiperbolik kosinüsünü verir.
+DEGREES			= DERECE			##	Radyanları dereceye dönüştürür.
+EVEN			= ÇİFT				##	Bir sayıyı, en yakın daha büyük çift tamsayıya yuvarlar.
+EXP				= ÜS				##	e'yi, verilen bir sayının üssüne yükseltilmiş olarak verir.
+FACT			= ÇARPINIM			##	Bir sayının faktörünü verir.
+FACTDOUBLE		= ÇİFTFAKTÖR		##	Bir sayının çift çarpınımını verir.
+FLOOR			= TABANAYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
+GCD				= OBEB				##	En büyük ortak böleni verir.
+INT				= TAMSAYI			##	Bir sayıyı aşağıya doğru en yakın tamsayıya yuvarlar.
+LCM				= OKEK				##	En küçük ortak katı verir.
+LN				= LN				##	Bir sayının doğal logaritmasını verir.
+LOG				= LOG				##	Bir sayının, belirtilen bir tabandaki logaritmasını verir.
+LOG10			= LOG10				##	Bir sayının 10 tabanında logaritmasını verir.
+MDETERM			= DETERMİNANT		##	Bir dizinin dizey determinantını verir.
+MINVERSE		= DİZEY_TERS		##	Bir dizinin dizey tersini verir.
+MMULT			= DÇARP				##	İki dizinin dizey çarpımını verir.
+MOD				= MODÜLO			##	Bölmeden kalanı verir.
+MROUND			= KYUVARLA			##	İstenen kata yuvarlanmış bir sayı verir.
+MULTINOMIAL		= ÇOKTERİMLİ		##	Bir sayılar kümesinin çok terimlisini verir.
+ODD				= TEK				##	Bir sayıyı en yakın daha büyük tek sayıya yuvarlar.
+PI				= Pİ				##	Pi değerini verir.
+POWER			= KUVVET			##	Bir üsse yükseltilmiş sayının sonucunu verir.
+PRODUCT			= ÇARPIM			##	Bağımsız değişkenlerini çarpar.
+QUOTIENT		= BÖLÜM				##	Bir bölme işleminin tamsayı kısmını verir.
+RADIANS			= RADYAN			##	Dereceleri radyanlara dönüştürür.
+RAND			= S_SAYI_ÜRET		##	0 ile 1 arasında rastgele bir sayı verir.
+RANDBETWEEN		= RASTGELEARALIK	##	Belirttiğiniz sayılar arasında rastgele bir sayı verir.
+ROMAN			= ROMEN				##	Bir normal rakamı, metin olarak, romen rakamına çevirir.
+ROUND			= YUVARLA			##	Bir sayıyı, belirtilen basamak sayısına yuvarlar.
+ROUNDDOWN		= AŞAĞIYUVARLA		##	Bir sayıyı, daha küçük sayıya, sıfıra yakınsayarak yuvarlar.
+ROUNDUP			= YUKARIYUVARLA		##	Bir sayıyı daha büyük sayıya, sıfırdan ıraksayarak yuvarlar.
+SERIESSUM		= SERİTOPLA			##	Bir üs serisinin toplamını, formüle bağlı olarak verir.
+SIGN			= İŞARET			##	Bir sayının işaretini verir.
+SIN				= SİN				##	Verilen bir açının sinüsünü verir.
+SINH			= SİNH				##	Bir sayının hiperbolik sinüsünü verir.
+SQRT			= KAREKÖK			##	Pozitif bir karekök verir.
+SQRTPI			= KAREKÖKPİ			##	(* Pi sayısının) kare kökünü verir.
+SUBTOTAL		= ALTTOPLAM			##	Bir listedeki ya da veritabanındaki bir alt toplamı verir.
+SUM				= TOPLA				##	Bağımsız değişkenlerini toplar.
+SUMIF			= ETOPLA			##	Verilen ölçütle belirlenen hücreleri toplar.
+SUMIFS			= SUMIFS			##	Bir aralıktaki, birden fazla ölçüte uyan hücreleri ekler.
+SUMPRODUCT		= TOPLA.ÇARPIM		##	İlişkili dizi bileşenlerinin çarpımlarının toplamını verir.
+SUMSQ			= TOPKARE			##	Bağımsız değişkenlerin karelerinin toplamını verir.
+SUMX2MY2		= TOPX2EY2			##	İki dizideki ilişkili değerlerin farkının toplamını verir.
+SUMX2PY2		= TOPX2AY2			##	İki dizideki ilişkili değerlerin karelerinin toplamının toplamını verir.
+SUMXMY2			= TOPXEY2			##	İki dizideki ilişkili değerlerin farklarının karelerinin toplamını verir.
+TAN				= TAN				##	Bir sayının tanjantını verir.
+TANH			= TANH				##	Bir sayının hiperbolik tanjantını verir.
+TRUNC			= NSAT				##	Bir sayının, tamsayı durumuna gelecek şekilde, fazlalıklarını atar.
+
+
+##
+##	Statistical functions				İstatistiksel fonksiyonlar
+##
+AVEDEV			= ORTSAP			##	Veri noktalarının ortalamalarından mutlak sapmalarının ortalamasını verir.
+AVERAGE			= ORTALAMA			##	Bağımsız değişkenlerinin ortalamasını verir.
+AVERAGEA		= ORTALAMAA			##	Bağımsız değişkenlerinin, sayılar, metin ve mantıksal değerleri içermek üzere ortalamasını verir.
+AVERAGEIF		= EĞERORTALAMA 		##	Verili ölçütü karşılayan bir aralıktaki bütün hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
+AVERAGEIFS		= EĞERLERORTALAMA 	##	Birden çok ölçüte uyan tüm hücrelerin ortalamasını (aritmetik ortalama) hesaplar.
+BETADIST		= BETADAĞ			##	Beta birikimli dağılım fonksiyonunu verir.
+BETAINV			= BETATERS			##	Belirli bir beta dağılımı için birikimli dağılım fonksiyonunun tersini verir.
+BINOMDIST		= BİNOMDAĞ			##	Tek terimli binom dağılımı olasılığını verir.
+CHIDIST			= KİKAREDAĞ			##	Kikare dağılımın tek kuyruklu olasılığını verir.
+CHIINV			= KİKARETERS		##	Kikare dağılımın kuyruklu olasılığının tersini verir.
+CHITEST			= KİKARETEST		##	Bağımsızlık sınamalarını verir.
+CONFIDENCE		= GÜVENİRLİK		##	Bir popülasyon ortalaması için güvenirlik aralığını verir.
+CORREL			= KORELASYON		##	İki veri kümesi arasındaki bağlantı katsayısını verir.
+COUNT			= BAĞ_DEĞ_SAY		##	Bağımsız değişkenler listesinde kaç tane sayı bulunduğunu sayar.
+COUNTA			= BAĞ_DEĞ_DOLU_SAY	##	Bağımsız değişkenler listesinde kaç tane değer bulunduğunu sayar.
+COUNTBLANK		= BOŞLUKSAY 		##	Aralıktaki boş hücre sayısını hesaplar.
+COUNTIF			= EĞERSAY 			##	Verilen ölçütlere uyan bir aralık içindeki hücreleri sayar.
+COUNTIFS		= ÇOKEĞERSAY 		##	Birden çok ölçüte uyan bir aralık içindeki hücreleri sayar.
+COVAR			= KOVARYANS 		##	Eşleştirilmiş sapmaların ortalaması olan kovaryansı verir.
+CRITBINOM		= KRİTİKBİNOM		##	Birikimli binom dağılımının bir ölçüt değerinden küçük veya ölçüt değerine eşit olduğu en küçük değeri verir.
+DEVSQ			= SAPKARE			##	Sapmaların karelerinin toplamını verir.
+EXPONDIST		= ÜSTELDAĞ			##	Üstel dağılımı verir.
+FDIST			= FDAĞ				##	F olasılık dağılımını verir.
+FINV			= FTERS				##	F olasılık dağılımının tersini verir.
+FISHER			= FISHER			##	Fisher dönüşümünü verir.
+FISHERINV		= FISHERTERS		##	Fisher dönüşümünün tersini verir.
+FORECAST		= TAHMİN			##	Bir doğrusal eğilim boyunca bir değer verir.
+FREQUENCY		= SIKLIK			##	Bir sıklık dağılımını, dikey bir dizi olarak verir.
+FTEST			= FTEST				##	Bir F-test'in sonucunu verir.
+GAMMADIST		= GAMADAĞ			##	Gama dağılımını verir.
+GAMMAINV		= GAMATERS			##	Gama kümülatif dağılımının tersini verir.
+GAMMALN			= GAMALN			##	Gama fonksiyonunun (?(x)) doğal logaritmasını verir.
+GEOMEAN			= GEOORT			##	Geometrik ortayı verir.
+GROWTH			= BÜYÜME			##	Üstel bir eğilim boyunca değerler verir.
+HARMEAN			= HARORT			##	Harmonik ortayı verir.
+HYPGEOMDIST		= HİPERGEOMDAĞ		##	Hipergeometrik dağılımı verir.
+INTERCEPT		= KESMENOKTASI		##	Doğrusal çakıştırma çizgisinin kesişme noktasını verir.
+KURT			= BASIKLIK			##	Bir veri kümesinin basıklığını verir.
+LARGE			= BÜYÜK				##	Bir veri kümesinde k. en büyük değeri verir.
+LINEST			= DOT				##	Doğrusal bir eğilimin parametrelerini verir.
+LOGEST			= LOT				##	Üstel bir eğilimin parametrelerini verir.
+LOGINV			= LOGTERS			##	Bir lognormal dağılımının tersini verir.
+LOGNORMDIST		= LOGNORMDAĞ		##	Birikimli lognormal dağılımını verir.
+MAX				= MAK				##	Bir bağımsız değişkenler listesindeki en büyük değeri verir.
+MAXA			= MAKA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri içermek üzere, en büyük değeri verir.
+MEDIAN			= ORTANCA			##	Belirtilen sayıların orta değerini verir.
+MIN				= MİN				##	Bir bağımsız değişkenler listesindeki en küçük değeri verir.
+MINA			= MİNA				##	Bir bağımsız değişkenler listesindeki, sayılar, metin ve mantıksal değerleri de içermek üzere, en küçük değeri verir.
+MODE			= ENÇOK_OLAN		##	Bir veri kümesindeki en sık rastlanan değeri verir.
+NEGBINOMDIST	= NEGBİNOMDAĞ		##	Negatif binom dağılımını verir.
+NORMDIST		= NORMDAĞ			##	Normal birikimli dağılımı verir.
+NORMINV			= NORMTERS			##	Normal kümülatif dağılımın tersini verir.
+NORMSDIST		= NORMSDAĞ			##	Standart normal birikimli dağılımı verir.
+NORMSINV		= NORMSTERS			##	Standart normal birikimli dağılımın tersini verir.
+PEARSON			= PEARSON			##	Pearson çarpım moment korelasyon katsayısını verir.
+PERCENTILE		= YÜZDEBİRLİK		##	Bir aralık içerisinde bulunan değerlerin k. frekans toplamını verir.
+PERCENTRANK		= YÜZDERANK			##	Bir veri kümesindeki bir değerin yüzde mertebesini verir.
+PERMUT			= PERMÜTASYON		##	Verilen sayıda nesne için permütasyon sayısını verir.
+POISSON			= POISSON			##	Poisson dağılımını verir.
+PROB			= OLASILIK			##	Bir aralıktaki değerlerin iki sınır arasında olması olasılığını verir.
+QUARTILE		= DÖRTTEBİRLİK		##	Bir veri kümesinin dörtte birliğini verir.
+RANK			= RANK				##	Bir sayılar listesinde bir sayının mertebesini verir.
+RSQ				= RKARE				##	Pearson çarpım moment korelasyon katsayısının karesini verir.
+SKEW			= ÇARPIKLIK			##	Bir dağılımın çarpıklığını verir.
+SLOPE			= EĞİM				##	Doğrusal çakışma çizgisinin eğimini verir.
+SMALL			= KÜÇÜK				##	Bir veri kümesinde k. en küçük değeri verir.
+STANDARDIZE		= STANDARTLAŞTIRMA	##	Normalleştirilmiş bir değer verir.
+STDEV			= STDSAPMA			##	Bir örneğe dayanarak standart sapmayı tahmin eder.
+STDEVA			= STDSAPMAA			##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
+STDEVP			= STDSAPMAS			##	Standart sapmayı, tüm popülasyona bağlı olarak hesaplar.
+STDEVPA			= STDSAPMASA		##	Standart sapmayı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
+STEYX			= STHYX				##	Regresyondaki her x için tahmini y değerinin standart hatasını verir.
+TDIST			= TDAĞ				##	T-dağılımını verir.
+TINV			= TTERS				##	T-dağılımının tersini verir.
+TREND			= EĞİLİM			##	Doğrusal bir eğilim boyunca değerler verir.
+TRIMMEAN		= KIRPORTALAMA		##	Bir veri kümesinin içinin ortalamasını verir.
+TTEST			= TTEST				##	T-test'le ilişkilendirilmiş olasılığı verir.
+VAR				= VAR				##	Varyansı, bir örneğe bağlı olarak tahmin eder.
+VARA			= VARA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, bir örneğe bağlı olarak tahmin eder.
+VARP			= VARS				##	Varyansı, tüm popülasyona dayanarak hesaplar.
+VARPA			= VARSA				##	Varyansı, sayılar, metin ve mantıksal değerleri içermek üzere, tüm popülasyona bağlı olarak hesaplar.
+WEIBULL			= WEIBULL			##	Weibull dağılımını hesaplar.
+ZTEST			= ZTEST				##	Z-testinin tek kuyruklu olasılık değerini hesaplar.
+
+
+##
+##	Text functions					Metin fonksiyonları
+##
+ASC				= ASC 				##	Bir karakter dizesindeki çift enli (iki bayt) İngilizce harfleri veya katakanayı yarım enli (tek bayt) karakterlerle değiştirir.
+BAHTTEXT		= BAHTTEXT 			##	Sayıyı, ß (baht) para birimi biçimini kullanarak metne dönüştürür.
+CHAR			= DAMGA 			##	Kod sayısıyla belirtilen karakteri verir.
+CLEAN			= TEMİZ				##	Metindeki bütün yazdırılamaz karakterleri kaldırır.
+CODE			= KOD				##	Bir metin dizesindeki ilk karakter için sayısal bir kod verir.
+CONCATENATE		= BİRLEŞTİR			##	Pek çok metin öğesini bir metin öğesi olarak birleştirir.
+DOLLAR			= LİRA				##	Bir sayıyı YTL (yeni Türk lirası) para birimi biçimini kullanarak metne dönüştürür.
+EXACT			= ÖZDEŞ				##	İki metin değerinin özdeş olup olmadığını anlamak için, değerleri denetler.
+FIND			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
+FINDB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlıdır).
+FIXED			= SAYIDÜZENLE		##	Bir sayıyı, sabit sayıda ondalıkla, metin olarak biçimlendirir.
+JIS				= JIS				##	Bir karakter dizesindeki tek enli (tek bayt) İngilizce harfleri veya katakanayı çift enli (iki bayt) karakterlerle değiştirir.
+LEFT			= SOL				##	Bir metin değerinden en soldaki karakterleri verir.
+LEFTB			= SOLB				##	Bir metin değerinden en soldaki karakterleri verir.
+LEN				= UZUNLUK			##	Bir metin dizesindeki karakter sayısını verir.
+LENB			= UZUNLUKB			##	Bir metin dizesindeki karakter sayısını verir.
+LOWER			= KÜÇÜKHARF			##	Metni küçük harfe çevirir.
+MID				= ORTA				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
+MIDB			= ORTAB				##	Bir metin dizesinden belirli sayıda karakteri, belirttiğiniz konumdan başlamak üzere verir.
+PHONETIC		= SES				##	Metin dizesinden ses (furigana) karakterlerini ayıklar.
+PROPER			= YAZIM.DÜZENİ		##	Bir metin değerinin her bir sözcüğünün ilk harfini büyük harfe çevirir.
+REPLACE			= DEĞİŞTİR			##	Metnin içindeki karakterleri değiştirir.
+REPLACEB		= DEĞİŞTİRB			##	Metnin içindeki karakterleri değiştirir.
+REPT			= YİNELE			##	Metni belirtilen sayıda yineler.
+RIGHT			= SAĞ				##	Bir metin değerinden en sağdaki karakterleri verir.
+RIGHTB			= SAĞB				##	Bir metin değerinden en sağdaki karakterleri verir.
+SEARCH			= BUL				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
+SEARCHB			= BULB				##	Bir metin değerini, bir başkasının içinde bulur (büyük küçük harf duyarlı değildir).
+SUBSTITUTE		= YERİNEKOY			##	Bir metin dizesinde, eski metnin yerine yeni metin koyar.
+T				= M					##	Bağımsız değerlerini metne dönüştürür.
+TEXT			= METNEÇEVİR		##	Bir sayıyı biçimlendirir ve metne dönüştürür.
+TRIM			= KIRP				##	Metindeki boşlukları kaldırır.
+UPPER			= BÜYÜKHARF			##	Metni büyük harfe çevirir.
+VALUE			= SAYIYAÇEVİR		##	Bir metin bağımsız değişkenini sayıya dönüştürür.
diff --git a/htdocs/includes/phpexcel/changelog.txt b/htdocs/includes/phpexcel/changelog.txt
index 02960681b86..3040d3438ca 100644
--- a/htdocs/includes/phpexcel/changelog.txt
+++ b/htdocs/includes/phpexcel/changelog.txt
@@ -1,7 +1,7 @@
 **************************************************************************************
 * PHPExcel
 *
-* Copyright (c) 2006 - 2011 PHPExcel
+* Copyright (c) 2006 - 2012 PHPExcel
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -17,304 +17,456 @@
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 *
-* @copyright  Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel)
+* @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
 * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
-* @version    1.7.6, 2011-02-27
+* @version    1.7.8, 2012-10-12
 **************************************************************************************
 
 
+--------------------------------------------------------------------------------
+BREAKING CHANGE! As part of the planned changes for handling array formulae in
+workbooks, there are some changes that will affect the PHPExcel_Cell object 
+methods.
+
+The following methods are now deprecated, and will be removed in version 1.7.9:
+    getCalculatedValue()      The getValue() method will return calculated
+                                  values for cells containing formulae instead.
+    setCalculatedValue()      The cell value will always contain the result of a
+                                  any formula calculation.
+    setFormulaAttributes()    Will now be determined by the arguments to the
+                                  setFormula() method.
+    getFormulaAttributes()    This will be replaced by the getArrayFormulaRange()
+                                  method.
+
+The following methods will be added in version 1.7.9
+    getFormula()              Use to retrieve a cell formula, will return the cell
+                                  value if the cell doesn't contain a formula, or
+                                  is not part of an array formula range.
+    setFormula()              Use to set a cell formula. It will still be possible
+                                  to set formulae using the setValue() and 
+                                  setValueExplicit() methods.
+    calculate()               Use to execute a formula calculation to update the
+                                  cell value.
+    isFormula()               Use to determine if a cell contains a formula, or is
+                                  part of an array formula range or not.
+    isArrayFormula()          Use to determine if a cell contains an array formula, 
+                                 or is part of an array formula range or not.
+    getArrayFormulaRange()    Use to retrieve an array formula range.
+
+The following methods will be changed in version 1.7.9
+    setValue()                The logic behind this will be modified to store
+                                  formula values in the new cell property structure,
+                                  but it will still perform the same function.
+    setValueExplicit()        The logic behind this will be modified to store
+                                  formula values in the new cell property structure,
+                                  but it will still perform the same function.
+    getValue()                Will no longer return a formula if the cell contains 
+                                  a formula, but will return the calculated value
+                                  instead. For cells that don't contain a formula,
+                                  it will still return the stored value.
+    getDataType()             Will return the datatype of the calculated value for
+                                  cells that contain formulae.
+    setDataType()             Error handling will be added to prevent setting a
+                                  cell datatype to an inappropriate value.
+--------------------------------------------------------------------------------
+
+
+Fixed in develop branch:
+- Special:  (kkamkou)    Phar builder script to add phar file as a distribution option
+- Feature:  (MBaker)     Refactor PDF Writer to allow use with a choice of PDF Rendering library
+                         rather than restricting to tcPDF
+                         Current options are tcPDF, mPDF, DomPDF
+                         tcPDF Library has now been removed from the deployment bundle
+- Feature:  (MBaker)     Initial version of HTML Reader
+- Feature:  (Progi1984) & (blazzy) Work items 9605 - Implement support for AutoFilter in PHPExcel_Writer_Excel5
+- Feature:  (MBaker)     Modified ERF and ERFC Engineering functions to accept Excel 2010's modified acceptance of negative arguments
+- Feature:  (k1LoW)      Support SheetView `view` attribute (Excel2007)
+- Feature:  (MBaker)     Excel compatibility option added for writing CSV files
+                         While Excel 2010 can read CSV files with a simple UTF-8 BOM, Excel2007 and earlier require UTF-16LE encoded tab-separated files.
+                         The new setExcelCompatibility(TRUE) option for the CSV Writer will generate files with this formatting for easy import into Excel2007 and below.
+- Feature:  (MBaker)     Language implementations for Turkish (tr)
+- Feature:  (MBaker)     Added fraction tests to advanced value binder
+- Feature:  (MBaker)     Allow call to font setUnderline() for underline format to specify a simple boolean for UNDERLINE_NONE or UNDERLINE_SINGLE
+- General:  (alexgann)   Add Currency detection to the Advanced Value Binder
+- General:  (MBaker)     Work item 18404 - setCellValueExplicitByColumnAndRow() do not return PHPExcel_Worksheet
+- General:  (MBaker)     Work item 18324 - Reader factory doesn't read anymore XLTX and XLT files
+- General:  (MBaker)     Magic __toString() method added to Cell object to return raw data value as a string
+- General:  (alexgann)   Add cell indent to html rendering
+- General:  (Raghav1981) ZeroHeight for rows in sheet format
+- Bugfix:   (cyberconte) Patch 12318 - OOCalc cells containing <text:span> inside the <text:p> tag
+- Bugfix:   (schir1964)  Fix to listWorksheetInfo() method for OOCalc Reader
+- Bugfix:   (MBaker)     Support for "e" (epoch) date format mask
+                         Rendered as a 4-digit CE year in non-Excel outputs
+- Bugfix:   (MBaker)     Work items 15799 and 18278 - Background color cell is always black when editing cell
+- Bugfix:   (MBaker)     Work items 15905 and 18183 - Allow "no impact" to formats on Conditional Formatting
+- Bugfix:   (wackonline) OOCalc Reader fix for NULL cells
+- Bugfix:   (seltzlab)   Fix to excel2007 Chart Writer when a $plotSeriesValues is empty
+- Bugfix:   (MBaker)     Various fixes to Chart handling
+- Bugfix:   (MBaker)     Work item 18370 - Error loading xlsx file with column breaks
+- Bugfix:   (MBaker)     OOCalc Reader now handles percentage and currency data types
+- Bugfix:   (MBaker)     Work Item 18415 - mb_stripos empty delimiter
+- Bugfix:   (takaakik)   Work Item 15455 - getNestingLevel() Error on Excel5 Read
+- Bugfix:   (MBaker)     Fix to Excel5 Reader when cell annotations are defined before their referenced text objects
+- Bugfix:   (MBaker)     OOCalc Reader modified to process number-rows-repeated
+- Bugfix:   (MBaker)     Work item 18377 - Chart Title compatibility on Excel 2007
+- Bugfix:   (MBaker)     Work item 18146 - Chart Refresh returning cell reference rather than values
+- Bugfix:   (MBaker)     Work item 18145 - Autoshape being identified in twoCellAnchor when includeCharts is TRUE triggering load error
+- Bugfix:   (MBaker)     Work item 18325 - v-type texts for series labels now recognised and parsed correctly
+- Bugfix:   (wolf5x)     Work item 18492 - load file failed if the file has no extensionType
+- Bugfix:   (dverspui)   Pattern fill colours in Excel2007 Style Writer
+- Bugfix:   (MBaker)     Excel2007 Writer order of font style elements to conform with Excel2003 using compatibility pack
+- Bugfix:   (MBaker)     Work item 18425 - Problems with $_activeSheetIndex when decreased below 0.
+- Bugfix:   (MBaker)     Work item 18597 - PHPExcel_CachedObjectStorage_SQLite3::cacheMethodIsAvailable() uses class_exists - autoloader throws error
+- Bugfix:   (MBaker)     Work item 18598 - Cannot access private property PHPExcel_CachedObjectStorageFactory::$_cacheStorageMethod
+- Bugfix:   (MBaker)     Work item 18397 - Data titles for charts
+                         PHPExcel_Chart_Layout now has methods for getting/setting switches for displaying/hiding chart data labels
+- Bugfix:   (MBaker)     Discard single cell merge ranges when reading (stupid that Excel allows them in the first place)
+- Bugfix:   (MBaker)     Discard hidden autoFilter named ranges
+
+
+2012-05-19 (v1.7.7):
+- Bugfix:   (Progi1984) Work item 8916 - Support for Rich-Text in PHPExcel_Writer_Excel5
+- Bugfix:   (cyberconte) Work item 17471 - OOCalc cells contain same data bug?
+- Feature:  (schir1964) listWorksheetInfo() method added to Readers... courtesy of Christopher Mullins
+- Feature:  (MBaker)    Options for cell caching using Igbinary and SQLite/SQlite3.
+- Feature:  (MBaker)    Additional row iterator options: allow a start row to be defined in the constructor; seek(), and prev() methods added.
+- Feature:  (Progi1984) Work item 9759 - Implement document properties in Excel5 writer
+- Feature:  (MBaker)    Work item 16 - Implement chart functionality (EXPERIMENTAL)
+                        Initial definition of chart objects.
+                        Reading Chart definitions through the Excel2007 Reader
+                        Facility to render charts to images using the 3rd-party jpgraph library
+                        Writing Charts using the Excel2007 Writer
+- General:  (MBaker)    Fix to build to ensure that Examples are included with the documentation
+- General:  (MBaker)    Reduce cell caching overhead using dirty flag to ensure that cells are only rewritten to the cache if they have actually been changed
+- General:  (MBaker)    Improved memory usage in CSV Writer
+- General:  (MBaker)    Improved speed and memory usage in Excel5 Writer
+- General:  (MBaker)    Experimental - 
+                        Added getHighestDataColumn(), getHighestDataRow(), getHighestRowAndColumn() and calculateWorksheetDataDimension() methods for the worksheet that return the highest row and column that have cell records
+- General:  (MBaker)    Change iterators to implement Iterator rather than extend CachingIterator, as a fix for PHP 5.4. changes in SPL
+- Bugfix:   (MBaker)    Work item 15459 - Invalid cell coordinate in Autofilter for Excel2007 Writer
+- Bugfix:   (MBaker)    Work item 15518 - PCLZip library issue
+- Bugfix:   (MBaker)    Work item 15537 - Excel2007 Reader canRead function bug
+- Bugfix:   (MBaker)    Support for Excel functions whose return can be used as either a value or as a cell reference depending on its context within a formula
+- Bugfix:   (gilles06)  Work item 15707 - ini_set() call in Calculation class destructor
+- Bugfix:   (MBaker)    Work item 15786 - RangeToArray strange array keys
+- Bugfix:   (MBaker)    Work item 15762 - INDIRECT() function doesn't work with named ranges
+- Bugfix:   (MBaker)    Locale-specific fix to text functions when passing a boolean argument instead of a string
+- Bugfix:   (MBaker)    Work item 16246 - reader/CSV fails on this file
+                        auto_detect_line_endings now set in CSV reader
+- Bugfix:   (MBaker)    Work item 16212 - $arguments improperly used in CachedObjectStorage/PHPTemp.php
+- Bugfix:   (MBaker)    Work item 16643 - Bug In Cache System (cell reference when throwing caching errors)
+- Bugfix:   (MBaker)    Work item 16895 - PHP Invalid index notice on writing excel file when active sheet has been deleted
+- Bugfix:   (MBaker)    Work item 16956 - External links in Excel2010 files cause Fatal error
+- Bugfix:   (MBaker)    Work item 16960 - Previous calculation engine error conditions trigger cyclic reference errors
+- Bugfix:   (mkopinsky) Work item 16266 - PHPExcel_Style::applyFromArray() returns null rather than style object in advanced mode
+- Bugfix:   (fauvel)    Work item 16958 - Cell::getFormattedValue returns RichText object instead of string
+- Bugfix:   (MBaker)    Work item 17166 - Indexed colors do not refer to Excel's indexed colors?
+- Bugfix:   (MBaker)    Work item 17199 - Indexed colors should be consistent with Excel and start from 1 (current index starts at 0)
+- Bugfix:   (MBaker)    Work item 17262 - Named Range definition in .xls when sheet reeference is quote wrapped
+- Bugfix:   (MBaker)    Work item 17403 - duplicateStyle() method doesn't duplicate conditional formats
+                                          Added an equivalent duplicateConditionalStyle() method for duplicating conditional styles
+- Bugfix:   (bnr)       Work item 17501 - =sumproduct(A,B) <> =sumproduct(B,A) in xlsx
+- Bugfix:   (Progi1984) Work item 8916  - Support for Rich-Text in PHPExcel_Writer_Excel5
+- General:  (MBaker)    Work item 15405 - Two easy to fix Issues concerning PHPExcel_Token_Stack (l10n/UC)
+- General:  (MBaker)    Work item 15461 - Locale file paths not fit for windows
+- General:  (MBaker)    Work item 16643 - Add file directory as a cache option for cache_to_discISAM
+- General:  (MBaker)    Work item 16923 - Datatype.php & constant TYPE_NULL
+- General:  (MBaker)    Ensure use of system temp directory for all temporary work files, unless explicitly specified
+- General:  (char101)   Work item 16359 - [Patch] faster stringFromColumnIndex()
+- General:  (whit1206)  Work item 16028 - Fix for projects that still use old autoloaders
+- General:  (atz)       Work item 17024 - Unknown codepage: 10007
+                        Additional Mac codepages
+
+
 2011-02-27 (v1.7.6):
-
-
-2011-02)27 (v1.7.6):
-- Feature:  (MBaker) Provide option to use PCLZip as an alternative to ZipArchive.
-					 This allows the writing of Excel2007 files, even without ZipArchive enabled (it does require zlib), or when php_zip is one of the buggy PHP 5.2.6 or 5.2.8 versions
-					 It can be enabled using PHPExcel_Settings::setZipClass(PHPExcel_Settings::PCLZIP);
-					 Note that it is not yet implemented as an alternative to ZipArchive for those Readers that are extracting from zips
-- Feature:	(MBaker) Work item 14979 - Added listWorksheetNames() method to Readers that support multiple worksheets in a workbook, allowing a user to extract a list of all the worksheet names from a file without parsing/loading the whole file.
-- Feature:	(MBaker) Speed boost and memory reduction in the Worksheet toArray() method.
-- Feature:	(MBaker) Added new rangeToArray() and namedRangeToArray() methods to the PHPExcel_Worksheet object.
-					 Functionally, these are identical to the toArray() method, except that they take an additional first parameter of a Range (e.g. 'B2:C3') or a Named Range name.
-					 Modified the toArray() method so that it actually uses rangeToArray().
-- Feature:	(MBaker) Added support for cell comments in the OOCalc, Gnumeric and Excel2003XML Readers, and in the Excel5 Reader
-- Feature:  (MBaker) Improved toFormattedString() handling for Currency and Accounting formats to render currency symbols
-- Feature:  (MBaker) Work Item  2346 - Implement more Excel calculation functions
-            -   Implemented the DAVERAGE(), DCOUNT(), DCOUNTA(), DGET(), DMAX(), DMIN(), DPRODUCT(), DSTDEV(), DSTDEVP(), DSUM(), DVAR() and DVARP() Database functions
-- Bugfix:   (MBaker) Work item 14888 - Simple =IF() formula disappears
-- Bugfix:	(MBaker) Work item 14898 - PHP Warning: preg_match(): Compilation failed: PCRE does not support \\L, \\l, \\N, \\P, \\p, \\U, \\u, or \\X
-- Bugfix:	(MBaker) Work item 14901 - VLOOKUP choking on parameters in PHPExcel.1.7.5/PHPExcel_Writer_Excel2007
-- Bugfix:	(MBaker) Work item 14973 - PHPExcel_Cell::isInRange() incorrect results - offset by one column
-- Bugfix:   (MBaker) Treat CodePage of 0 as CP1251 (for .xls files written by applications that don't set the CodePage correctly, such as Apple Numbers)
-- Bugfix:	(MB) Work item 11583 - Need method for removing autoFilter
-- Bugfix:	(MBaker) Work item 15029 - coordinateFromString throws exception for rows greater than 99,999
-- Bugfix:	(MBaker) Work item 14999 - PHPExcel Excel2007 Reader colour problems with solidfill
-- Bugfix:	(MBaker) Work item 13215 - Formatting get lost and edit a template XLSX file
-- Bugfix:	(MBaker) Work item 14029 - Excel 2007 Reader /writer lost fontcolor
-- Bugfix:	(MBaker) Work item 13374 - file that makes cells go black
-- Bugfix:	(MBaker) Minor patchfix for Excel2003XML Reader when XML is defined with a charset attribute
-- Bugfix:	(MBaker) Work item 15089 - PHPExcel_Worksheet->toArray() index problem
-- Bugfix:	(MBaker) Work item 15094 - Merge cells 'un-merge' when using an existing spreadsheet
-- Bugfix:	(MBaker) Work item 15129 - Worksheet fromArray() only working with 2-D arrays
-- Bugfix:	(MBaker) Work item 15172 - rangeToarray function modified for non-existent cells
-- Bugfix:	(MBaker) Work item 14980 - Images not getting copyied with the ->clone function
-- Bugfix:	(MBaker) Work item 11576 - AdvancedValueBinder.php: String sometimes becomes a date when it shouldn't
-- Bugfix:	(MBaker) Fix Excel5 Writer so that it only writes column dimensions for columns that are actually used rather than the full range (A to IV)
-- Bugfix:	(MBaker) Work item 15198 - FreezePane causing damaged or modified error
-						The freezePaneByColumnAndRow() method row argument should default to 1 rather than 0.
-						Default row argument for all __ByColumnAndRow() methods should be 1
-- Bugfix:	(MBaker) Work item 15121 - Column reference rather than cell reference in Print Area definition
-						Fix Excel2007 Writer to handle print areas that are defined as row or column ranges rather than just as cell ranges
-- Bugfix:	(MBaker) Reduced false positives from isDateTimeFormatCode() method by suppressing testing within quoted strings
-- Bugfix:	(MBaker) Work item 15312 - Caching and tmp partition exhaustion
-- Bugfix:	(MBaker) Work item 15308 - Writing to Variable No Longer Works. $_tmp_dir Missing in PHPExcel\PHPExcel\Shared\OLE\PPS\Root.php
-- Bugfix:	(MBaker) Work item 15379 - Named ranges with dot don't get parsed properly
-- Bugfix:	(MBaker) Work item 15096 - insertNewRowBefore fails to consistently update references
-- Bugfix:	(MBaker) "i" is not a valid character for Excel date format masks (in isDateTimeFormatCode() method)
-- Bugfix:	(MKunert) Work item 15421 - PHPExcel_ReferenceHelper::insertNewBefore() is missing an 'Update worksheet: comments' section
-- Bugfix:	(MBaker) Work item 15409 - Full column/row references in named ranges not supported by updateCellReference()
-- General:  (MBaker) Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.
-- General:  (MBaker) Improved performance (speed), for PHP to Excel date conversions
-- General:  (MBaker) Enhanced SheetViews element structures in the Excel2007 Writer for frozen panes.
-- General:  (MBaker) Removed Serialized Reader/Writer as these no longer work.
+- Feature:  (MBaker)  Provide option to use PCLZip as an alternative to ZipArchive.
+                      This allows the writing of Excel2007 files, even without ZipArchive enabled (it does require zlib), or when php_zip is one of the buggy PHP 5.2.6 or 5.2.8 versions
+                      It can be enabled using PHPExcel_Settings::setZipClass(PHPExcel_Settings::PCLZIP);
+                      Note that it is not yet implemented as an alternative to ZipArchive for those Readers that are extracting from zips
+- Feature:  (MBaker)  Work item 14979 - Added listWorksheetNames() method to Readers that support multiple worksheets in a workbook, allowing a user to extract a list of all the worksheet names from a file without parsing/loading the whole file.
+- Feature:  (MBaker)  Speed boost and memory reduction in the Worksheet toArray() method.
+- Feature:  (MBaker)  Added new rangeToArray() and namedRangeToArray() methods to the PHPExcel_Worksheet object.
+                      Functionally, these are identical to the toArray() method, except that they take an additional first parameter of a Range (e.g. 'B2:C3') or a Named Range name.
+                      Modified the toArray() method so that it actually uses rangeToArray().
+- Feature:  (MBaker)  Added support for cell comments in the OOCalc, Gnumeric and Excel2003XML Readers, and in the Excel5 Reader
+- Feature:  (MBaker)  Improved toFormattedString() handling for Currency and Accounting formats to render currency symbols
+- Feature:  (MBaker)  Work Item  2346 - Implement more Excel calculation functions
+                      Implemented the DAVERAGE(), DCOUNT(), DCOUNTA(), DGET(), DMAX(), DMIN(), DPRODUCT(), DSTDEV(), DSTDEVP(), DSUM(), DVAR() and DVARP() Database functions
+- Bugfix:   (MBaker)  Work item 14888 - Simple =IF() formula disappears
+- Bugfix:   (MBaker)  Work item 14898 - PHP Warning: preg_match(): Compilation failed: PCRE does not support \\L, \\l, \\N, \\P, \\p, \\U, \\u, or \\X
+- Bugfix:   (MBaker)  Work item 14901 - VLOOKUP choking on parameters in PHPExcel.1.7.5/PHPExcel_Writer_Excel2007
+- Bugfix:   (MBaker)  Work item 14973 - PHPExcel_Cell::isInRange() incorrect results - offset by one column
+- Bugfix:   (MBaker)  Treat CodePage of 0 as CP1251 (for .xls files written by applications that don't set the CodePage correctly, such as Apple Numbers)
+- Bugfix:   (MB)      Work item 11583 - Need method for removing autoFilter
+- Bugfix:   (MBaker)  Work item 15029 - coordinateFromString throws exception for rows greater than 99,999
+- Bugfix:   (MBaker)  Work item 14999 - PHPExcel Excel2007 Reader colour problems with solidfill
+- Bugfix:   (MBaker)  Work item 13215 - Formatting get lost and edit a template XLSX file
+- Bugfix:   (MBaker)  Work item 14029 - Excel 2007 Reader /writer lost fontcolor
+- Bugfix:   (MBaker)  Work item 13374 - file that makes cells go black
+- Bugfix:   (MBaker)  Minor patchfix for Excel2003XML Reader when XML is defined with a charset attribute
+- Bugfix:   (MBaker)  Work item 15089 - PHPExcel_Worksheet->toArray() index problem
+- Bugfix:   (MBaker)  Work item 15094 - Merge cells 'un-merge' when using an existing spreadsheet
+- Bugfix:   (MBaker)  Work item 15129 - Worksheet fromArray() only working with 2-D arrays
+- Bugfix:   (xkeshav) Work item 15172 - rangeToarray function modified for non-existent cells
+- Bugfix:   (MBaker)  Work item 14980 - Images not getting copyied with the ->clone function
+- Bugfix:   (MBaker)  Work item 11576 - AdvancedValueBinder.php: String sometimes becomes a date when it shouldn't
+- Bugfix:   (MBaker)  Fix Excel5 Writer so that it only writes column dimensions for columns that are actually used rather than the full range (A to IV)
+- Bugfix:   (MBaker)  Work item 15198 - FreezePane causing damaged or modified error
+                      The freezePaneByColumnAndRow() method row argument should default to 1 rather than 0.
+                      Default row argument for all __ByColumnAndRow() methods should be 1
+- Bugfix:   (MBaker)  Work item 15121 - Column reference rather than cell reference in Print Area definition
+                      Fix Excel2007 Writer to handle print areas that are defined as row or column ranges rather than just as cell ranges
+- Bugfix:   (MBaker)  Reduced false positives from isDateTimeFormatCode() method by suppressing testing within quoted strings
+- Bugfix:   (MBaker)  Work item 15312 - Caching and tmp partition exhaustion
+- Bugfix:   (MBaker)  Work item 15308 - Writing to Variable No Longer Works. $_tmp_dir Missing in PHPExcel\PHPExcel\Shared\OLE\PPS\Root.php
+- Bugfix:   (MBaker)  Work item 15379 - Named ranges with dot don't get parsed properly
+- Bugfix:   (MBaker)  Work item 15096 - insertNewRowBefore fails to consistently update references
+- Bugfix:   (MBaker)  "i" is not a valid character for Excel date format masks (in isDateTimeFormatCode() method)
+- Bugfix:   (MKunert) Work item 15421 - PHPExcel_ReferenceHelper::insertNewBefore() is missing an 'Update worksheet: comments' section
+- Bugfix:   (MBaker)  Work item 15409 - Full column/row references in named ranges not supported by updateCellReference()
+- General:  (MBaker)  Improved performance (speed), for building the Shared Strings table in the Excel2007 Writer.
+- General:  (MBaker)  Improved performance (speed), for PHP to Excel date conversions
+- General:  (MBaker)  Enhanced SheetViews element structures in the Excel2007 Writer for frozen panes.
+- General:  (MBaker)  Removed Serialized Reader/Writer as these no longer work.
 
 
 2010-12-10 (v1.7.5):
-- Feature:  (MBaker) Work item 8769 - Implement Gnumeric File Format
-                                      Initial work on Gnumeric Reader (Worksheet Data, Document Properties and basic Formatting)
-- Feature:  (MBaker) (incorporating part of Workitem 9759) - Support for Extended Workbook Properties in Excel2007, Excel5 and OOCalc Readers; support for User-defined Workbook Properties in Excel2007 and OOCalc Readers
-- Feature:  (MBaker) Support for Extended and User-defined Workbook Properties in Excel2007 Writer
-- Feature:  (MBaker) Provided a setGenerateSheetNavigationBlock(false); option to suppress generation of the sheet navigation block when writing multiple worksheets to HTML
-- Feature:  (MBaker) Advanced Value Binder now recognises TRUE/FALSE strings (locale-specific) and converts to boolean
-- Feature:  (MBaker) Work item 14301 - PHPExcel_Worksheet->toArray() is returning truncated values
-- Feature:  (MBaker) Configure PDF Writer margins based on Excel Worksheet Margin Settings value
-- Feature:  (MBaker) Added Contiguous flag for the CSV Reader, when working with Read Filters
-- Feature:  (MBaker) Added getFormattedValue() method for cell object
-- Feature:  (MBaker) Added strictNullComparison argument to the worksheet fromArray() method
-- Feature:  (MBaker) Fix to toFormattedString() method in PHPExcel_Style_NumberFormat to handle fractions with a # code for the integer part
-- Bugfix:   (MB) Work item 14143 - NA() doesn't propagate in matrix calc - quick fix in JAMA/Matrix.php
+- Feature:  (MBaker)    Work item 8769 - Implement Gnumeric File Format
+                        Initial work on Gnumeric Reader (Worksheet Data, Document Properties and basic Formatting)
+- Feature:  (MBaker)    (incorporating part of Workitem 9759) - Support for Extended Workbook Properties in Excel2007, Excel5 and OOCalc Readers; support for User-defined Workbook Properties in Excel2007 and OOCalc Readers
+- Feature:  (MBaker)    Support for Extended and User-defined Workbook Properties in Excel2007 Writer
+- Feature:  (MBaker)    Provided a setGenerateSheetNavigationBlock(false); option to suppress generation of the sheet navigation block when writing multiple worksheets to HTML
+- Feature:  (MBaker)    Advanced Value Binder now recognises TRUE/FALSE strings (locale-specific) and converts to boolean
+- Feature:  (MBaker)    Work item 14301 - PHPExcel_Worksheet->toArray() is returning truncated values
+- Feature:  (MBaker)    Configure PDF Writer margins based on Excel Worksheet Margin Settings value
+- Feature:  (MBaker)    Added Contiguous flag for the CSV Reader, when working with Read Filters
+- Feature:  (MBaker)    Added getFormattedValue() method for cell object
+- Feature:  (MBaker)    Added strictNullComparison argument to the worksheet fromArray() method
+- Feature:  (MBaker)    Fix to toFormattedString() method in PHPExcel_Style_NumberFormat to handle fractions with a # code for the integer part
+- Bugfix:   (MB)        Work item 14143 - NA() doesn't propagate in matrix calc - quick fix in JAMA/Matrix.php
 - Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : String constant containing double quotation mark
 - Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Percent
 - Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Error constant
 - Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Concatenation operator
-- Bugfix:   (MBaker) Work item 14146 - Worksheet clone broken for CachedObjectStorage_Memory
-- Bugfix:   (MBaker) Work item 12998 - PHPExcel_Reader_Excel2007 fails when gradient fill without type is present in a file
-- Bugfix:   (MBaker) Work item 14176 - @ format for numeric strings in XLSX to CSV conversion
-- Bugfix:   (MBaker) Work item 14223 - Advanced Value Binder Not Working?
-- Bugfix:   (MBaker) Work item 14226 - unassigned object variable in PHPExcel->removeCellXfByIndex
-- Bugfix:   (MBaker) Work item 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist)
-- Bugfix:   (MBaker) Work items 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string (thanks gorfou)
-- Bugfix:   (MBaker) Work item 14256 - Worksheet title exception when duplicate worksheet is being renamed but exceeds the 31 character limit
-- Bugfix:   (MBaker) Work item 14086 - Named range with sheet name that contains the $ throws exception when getting the cell
-- Bugfix:   (MBaker) Added autoloader to DefaultValueBinder and AdvancedValueBinder
-- Bugfix:   (MBaker) Modified PHPExcel_Shared_Date::isDateTimeFormatCode() to return false if format code begins with "_" or with "0 " to prevent false positives
-                     These leading characters are most commonly associated with number, currency or accounting (or occasionally fraction) formats
-- Bugfix:   (MBaker) Work item 14374 - BUG : Excel5 and setReadFilter ?
-- Bugfix:   (MBaker) Work item 14425 - Wrong exception message while deleting column
-- Bugfix:   (MBaker) Work item 14679 - Formula evaluation fails with Japanese sheet refs
-- Bugfix:   (MBaker) Work item 13559 - PHPExcel_Writer_PDF does not handle cell borders correctly
-- Bugfix:   (MBaker) Work item 14831 - Style : applyFromArray() for 'allborders' not working
-- Bugfix:   (MBaker) Work item 14837 - Using $this when not in object context in Excel5 Reader
-- General:  (MBaker) Applied patch 6609 - Removes a unnecessary loop through each cell when applying conditional formatting to a range.
-- General:  (MBaker) Applied patch 7169 - Removed spurious PHP end tags (?>)
-- General:  (MBaker) Improved performance (speed) and reduced memory overheads, particularly for the Writers, but across the whole library.
+- Bugfix:   (MBaker)    Work item 14146 - Worksheet clone broken for CachedObjectStorage_Memory
+- Bugfix:   (MBaker)    Work item 12998 - PHPExcel_Reader_Excel2007 fails when gradient fill without type is present in a file
+- Bugfix:   (MBaker)    Work item 14176 - @ format for numeric strings in XLSX to CSV conversion
+- Bugfix:   (MBaker)    Work item 14223 - Advanced Value Binder Not Working?
+- Bugfix:   (MBaker)    Work item 14226 - unassigned object variable in PHPExcel->removeCellXfByIndex
+- Bugfix:   (MBaker)    Work item 14236 - problem with getting cell values from another worksheet... (if cell doesn't exist)
+- Bugfix:   (MBaker)    Work items 14260 & 14233 - Setting cell values to one char strings & Trouble reading one character string (thanks gorfou)
+- Bugfix:   (MBaker)    Work item 14256 - Worksheet title exception when duplicate worksheet is being renamed but exceeds the 31 character limit
+- Bugfix:   (MBaker)    Work item 14086 - Named range with sheet name that contains the $ throws exception when getting the cell
+- Bugfix:   (MBaker)    Added autoloader to DefaultValueBinder and AdvancedValueBinder
+- Bugfix:   (MBaker)    Modified PHPExcel_Shared_Date::isDateTimeFormatCode() to return false if format code begins with "_" or with "0 " to prevent false positives
+                        These leading characters are most commonly associated with number, currency or accounting (or occasionally fraction) formats
+- Bugfix:   (MBaker)    Work item 14374 - BUG : Excel5 and setReadFilter ?
+- Bugfix:   (MBaker)    Work item 14425 - Wrong exception message while deleting column
+- Bugfix:   (MBaker)    Work item 14679 - Formula evaluation fails with Japanese sheet refs
+- Bugfix:   (MBaker)    Work item 13559 - PHPExcel_Writer_PDF does not handle cell borders correctly
+- Bugfix:   (MBaker)    Work item 14831 - Style : applyFromArray() for 'allborders' not working
+- Bugfix:   (MBaker)    Work item 14837 - Using $this when not in object context in Excel5 Reader
+- General:  (MBaker)    Applied patch 6609 - Removes a unnecessary loop through each cell when applying conditional formatting to a range.
+- General:  (MBaker)    Applied patch 7169 - Removed spurious PHP end tags (?>)
+- General:  (MBaker)    Improved performance (speed) and reduced memory overheads, particularly for the Writers, but across the whole library.
 
 
 2010-08-26 (v1.7.4):
 - Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Power
 - Bugfix:   (Progi1984) Work item 7895 - Excel5 : Formula : Unary plus
 - Bugfix:   (Progi1984) Excel5 : Just write the Escher stream if necessary in Worksheet
-- Bugfix:   (MBaker) Work item 13433 - Syntax errors in memcache.php 1.7.3c
-- Bugfix:   (MBaker) Work item 13450 - Standard Deviation functions returning DIV/0 Error when Standard Deviation is zero
-- Feature:  (MBaker) Support for print area with several ranges in the Excel2007 reader, and improved features for editing print area with several ranges
-- Feature:  (MBaker) Work item 13769 - Improved Cell Exception Reporting
-- Feature:  (MBaker) Support for row or column ranges in the calculation engine, e.g. =SUM(C:C) or =SUM(1:2)
-					 Also support in the calculation engine for absolute row or column ranges e.g. =SUM($C:$E) or =SUM($3:5)
-- Bugfix:   (ET) Work item 13455 - Picture problem with Excel 2003
-- Bugfix:   (MBaker) Work item 13484 - Wrong variable used in addExternalSheet in PHPExcel.php
-- Bugfix:   (MBaker) Work item 13515 - "Invalid cell coordinate" error when formula access data from an other sheet
-- Bugfix:   (MBaker) (related to Work item 13515) Calculation engine confusing cell range worksheet when referencing cells in a different worksheet to the formula
-- Bugfix:   (MBaker) Work item 13752 - Wrong var naming in Worksheet->garbageCollect()
-- Bugfix:   (MBaker) Work item 13764 - PHPExcel_Style_*::__clone() methods cause cloning loops?
-- Bugfix:   (MBaker) Work item 11488 - Recent builds causing problems loading xlsx files? (ZipArchive issue?)
-- Bugfix:   (MBaker) Work item 13856 - cache_to_apc causes fatal error when processing large data sets
-- Bugfix:   (MBaker) Work item 13880 - OOCalc reader misses first line if it's a 'table-header-row'
-- Bugfix:   (MBaker) Work item 14011 - using cache with copy or clone bug?
-										Fixed $worksheet->copy() or clone $worksheet when using cache_in_memory, cache_in_memory_gzip, cache_in_memory_serialized, cache_to_discISAM, cache_to_phpTemp, cache_to_apc and cache_to_memcache;
-										Fixed but untested when using cache_to_wincache.
-- Bugfix:   (MBaker) Fixed problems with reading Excel2007 Properties
-- General:  (MB) Applied patch 6324 - PHP Strict Standards: Non-static method PHPExcel_Shared_String::utf16_decode() should not be called statically
-- General:  (MBaker) Applied patch 6360 - Array functions were ignored when loading an existing file containing them, and as a result, they would lose their 'cse' status.
-- General:  (MBaker) Minor memory tweaks to Excel2007 Writer
-- General:  (MBaker) Modified ReferenceHelper updateFormulaReferences() method to handle updates to row and column cell ranges (including absolute references e.g. =SUM(A:$E) or =SUM($5:5), and range/cell references that reference a worksheet by name), and to provide both performance and memory improvements.
-- General:  (MBaker) Modified Excel2007 Reader so that ReferenceHelper class is instantiated only once rather than for every shared formula in a workbook.
-- General:  (MBaker) Correct handling for additional (synonym) formula tokens in Excel5 Reader
-- General:  (MBaker) Additional reading of some Excel2007 Extended Properties (Company, Manager)
+- Bugfix:   (MBaker)    Work item 13433 - Syntax errors in memcache.php 1.7.3c
+- Bugfix:   (MBaker)    Work item 13450 - Standard Deviation functions returning DIV/0 Error when Standard Deviation is zero
+- Feature:  (MBaker)    Support for print area with several ranges in the Excel2007 reader, and improved features for editing print area with several ranges
+- Feature:  (MBaker)    Work item 13769 - Improved Cell Exception Reporting
+- Feature:  (MBaker)    Support for row or column ranges in the calculation engine, e.g. =SUM(C:C) or =SUM(1:2)
+                        Also support in the calculation engine for absolute row or column ranges e.g. =SUM($C:$E) or =SUM($3:5)
+- Bugfix:   (ET)        Work item 13455 - Picture problem with Excel 2003
+- Bugfix:   (MBaker)    Work item 13484 - Wrong variable used in addExternalSheet in PHPExcel.php
+- Bugfix:   (MBaker)    Work item 13515 - "Invalid cell coordinate" error when formula access data from an other sheet
+- Bugfix:   (MBaker)    (related to Work item 13515) Calculation engine confusing cell range worksheet when referencing cells in a different worksheet to the formula
+- Bugfix:   (MBaker)    Work item 13752 - Wrong var naming in Worksheet->garbageCollect()
+- Bugfix:   (MBaker)    Work item 13764 - PHPExcel_Style_*::__clone() methods cause cloning loops?
+- Bugfix:   (MBaker)    Work item 11488 - Recent builds causing problems loading xlsx files? (ZipArchive issue?)
+- Bugfix:   (MBaker)    Work item 13856 - cache_to_apc causes fatal error when processing large data sets
+- Bugfix:   (MBaker)    Work item 13880 - OOCalc reader misses first line if it's a 'table-header-row'
+- Bugfix:   (MBaker)    Work item 14011 - using cache with copy or clone bug?
+                                        Fixed $worksheet->copy() or clone $worksheet when using cache_in_memory, cache_in_memory_gzip, cache_in_memory_serialized, cache_to_discISAM, cache_to_phpTemp, cache_to_apc and cache_to_memcache;
+                                        Fixed but untested when using cache_to_wincache.
+- Bugfix:   (MBaker)    Fixed problems with reading Excel2007 Properties
+- General:  (MB)        Applied patch 6324 - PHP Strict Standards: Non-static method PHPExcel_Shared_String::utf16_decode() should not be called statically
+- General:  (MBaker)    Applied patch 6360 - Array functions were ignored when loading an existing file containing them, and as a result, they would lose their 'cse' status.
+- General:  (MBaker)    Minor memory tweaks to Excel2007 Writer
+- General:  (MBaker)    Modified ReferenceHelper updateFormulaReferences() method to handle updates to row and column cell ranges (including absolute references e.g. =SUM(A:$E) or =SUM($5:5), and range/cell references that reference a worksheet by name), and to provide both performance and memory improvements.
+- General:  (MBaker)    Modified Excel2007 Reader so that ReferenceHelper class is instantiated only once rather than for every shared formula in a workbook.
+- General:  (MBaker)    Correct handling for additional (synonym) formula tokens in Excel5 Reader
+- General:  (MBaker)    Additional reading of some Excel2007 Extended Properties (Company, Manager)
 
 
 2010-06-01 (v1.7.3c):
-- Bugfix:   (MB) Work item 13012 - Fatal error: Class 'ZipArchive' not found... ...Reader/Excel2007.php on line 217
+- Bugfix:   (MB)     Work item 13012 - Fatal error: Class 'ZipArchive' not found... ...Reader/Excel2007.php on line 217
 - Bugfix:   (MBaker) Work item 13398 - PHPExcel_Writer_Excel2007 error after 1.7.3b
 
 
 2010-05-31 (v1.7.3b):
 - Bugfix:   (MBaker) Work item 12903 - Infinite loop when reading
-- Bugfix:   (MB) Work item 13381 - Wrong method chaining on PHPExcel_Worksheet class
+- Bugfix:   (MB)     Work item 13381 - Wrong method chaining on PHPExcel_Worksheet class
 
 
 2010-05-17 (v1.7.3):
-- General:  (ET) Applied patch 4990 (modified)
-- General:  (MB) Applied patch 5568 (modified)
-- General:  (MB) Applied patch 5943
-- General:  (MB) Work item 13042 - Upgrade build script to use Phing
-- General:  (ET) Work item 11586 - Replacing var with public/private
+- General:  (ET)     Applied patch 4990 (modified)
+- General:  (MB)     Applied patch 5568 (modified)
+- General:  (MB)     Applied patch 5943
+- General:  (MB)     Work item 13042 - Upgrade build script to use Phing
+- General:  (ET)     Work item 11586 - Replacing var with public/private
 - General:  (MBaker) Applied Anthony's Sterling's Class Autoloader to reduce memory overhead by "Lazy Loading" of classes
 - General:  (MBaker) Modification to functions that accept a date parameter to support string values containing ordinals as per Excel (English language only)
 - General:  (MBaker) Modify PHPExcel_Style_NumberFormat::toFormattedString() to handle dates that fall outside of PHP's 32-bit date range
 - General:  (MBaker) Applied patch 5207
-- General:  (ET) Work item 11970 - PHPExcel developer documentation: Set page margins
-- Feature:  (ET) Work item 11038 - Special characters and accents in SYLK reader
+- General:  (ET)     Work item 11970 - PHPExcel developer documentation: Set page margins
+- Feature:  (ET)     Work item 11038 - Special characters and accents in SYLK reader
 - Feature:  (MBaker) Work Item  2346 - Implement more Excel calculation functions
-            -   Implemented the COUPDAYS(), COUPDAYBS(), COUPDAYSNC(), COUPNCD(), COUPPCD() and PRICE() Financial functions
-            -   Implemented the N() and TYPE() Information functions
-            -	Implemented the HYPERLINK() Lookup and Reference function
-- Feature:  (ET) Work item 11526 - Horizontal page break support in PHPExcel_Writer_PDF
-- Feature:  (ET) Work item 11529 - Introduce method setActiveSheetIndexByName()
-- Feature:  (ET) Work item 11550 - AdvancedValueBinder.php: Automatically wrap text when there is new line in string (ALT+"Enter")
-- Feature:  (ET) Work item 10300 - Data validation support in PHPExcel_Reader_Excel5 and PHPExcel_Writer_Excel5
-- Feature:  (MB) Work item 11616 - Improve autosize calculation
+                     - Implemented the COUPDAYS(), COUPDAYBS(), COUPDAYSNC(), COUPNCD(), COUPPCD() and PRICE() Financial functions
+                     - Implemented the N() and TYPE() Information functions
+                     - Implemented the HYPERLINK() Lookup and Reference function
+- Feature:  (ET)     Work item 11526 - Horizontal page break support in PHPExcel_Writer_PDF
+- Feature:  (ET)     Work item 11529 - Introduce method setActiveSheetIndexByName()
+- Feature:  (ET)     Work item 11550 - AdvancedValueBinder.php: Automatically wrap text when there is new line in string (ALT+"Enter")
+- Feature:  (ET)     Work item 10300 - Data validation support in PHPExcel_Reader_Excel5 and PHPExcel_Writer_Excel5
+- Feature:  (MB)     Work item 11616 - Improve autosize calculation
 - Feature:  (MBaker) Methods to translate locale-specific function names in formulae
-			- Language implementations for Czech (cs), Danish (da), German (de), English (uk), Spanish (es), Finnish (fi), French (fr), Hungarian (hu), Italian (it), Dutch (nl), Norwegian (no), Polish (pl), Portuguese (pt), Brazilian Portuguese (pt_br), Russian (ru) and Swedish (sv)
-- Feature:  (ET) Work item 9759 - Implement document properties in Excel5 reader/writer
-			- Fixed so far for PHPExcel_Reader_Excel5
-- Feature:  (ET) Work item 11849 - Show/hide row and column headers in worksheet
-- Feature:  (ET) Work item 11919 - Can't set font on writing PDF (by key)
-- Feature:  (ET) Work item 12096 - Thousands scale (1000^n) support in PHPExcel_Style_NumberFormat::toFormattedString
-- Feature:  (ET) Work item  6911 - Implement repeating rows in PDF and HTML writer
-- Feature:  (ET) Work item 12289 - Sheet tabs in PHPExcel_Writer_HTML
-- Feature:  (MB) Work item 13041 - Add Wincache CachedObjectProvider
+                     - Language implementations for Czech (cs), Danish (da), German (de), English (uk), Spanish (es), Finnish (fi), French (fr), Hungarian (hu), Italian (it), Dutch (nl), Norwegian (no), Polish (pl), Portuguese (pt), Brazilian Portuguese (pt_br), Russian (ru) and Swedish (sv)
+- Feature:  (ET)     Work item 9759 - Implement document properties in Excel5 reader/writer
+                     - Fixed so far for PHPExcel_Reader_Excel5
+- Feature:  (ET)     Work item 11849 - Show/hide row and column headers in worksheet
+- Feature:  (ET)     Work item 11919 - Can't set font on writing PDF (by key)
+- Feature:  (ET)     Work item 12096 - Thousands scale (1000^n) support in PHPExcel_Style_NumberFormat::toFormattedString
+- Feature:  (ET)     Work item  6911 - Implement repeating rows in PDF and HTML writer
+- Feature:  (ET)     Work item 12289 - Sheet tabs in PHPExcel_Writer_HTML
+- Feature:  (MB)     Work item 13041 - Add Wincache CachedObjectProvider
 - Feature:  (MBaker) Configure PDF Writer paper size based on Excel Page Settings value, and provided methods to override paper size and page orientation with the writer
-			- Note PHPExcel defaults to Letter size, while the previous PDF writer enforced A4 size, so PDF writer will now default to Letter
+                     - Note PHPExcel defaults to Letter size, while the previous PDF writer enforced A4 size, so PDF writer will now default to Letter
 - Feature:  (MBaker) Initial implementation of cell caching: allowing larger workbooks to be managed, but at a cost in speed
 - Feature:  (MBaker) Added an identify() method to the IO Factory that identifies the reader which will be used to load a particular file without actually loading it.
 - Bugfix:   (MBaker) Work item 10979 - Warning messages with INDEX function having 2 arguments
-- Bugfix:   (ET) Work item 11473 - setValue('=') should result in string instead of formula
+- Bugfix:   (ET)     Work item 11473 - setValue('=') should result in string instead of formula
 - Bugfix:   (MBaker) Work item 11471 - method _raiseFormulaError should no be private
-- Bugfix:   (ET) Work item 11485 - Fatal error: Call to undefined function mb_substr() in ...Classes\PHPExcel\Reader\Excel5.php on line 2903
-- Bugfix:   (ET) Work item 11487 - getBold(), getItallic(), getStrikeThrough() not always working with PHPExcel_Reader_Excel2007
-- Bugfix:   (ET) Work item 11492 - AdvancedValueBinder.php not working correctly for $cell->setValue('hh:mm:ss')
+- Bugfix:   (ET)     Work item 11485 - Fatal error: Call to undefined function mb_substr() in ...Classes\PHPExcel\Reader\Excel5.php on line 2903
+- Bugfix:   (ET)     Work item 11487 - getBold(), getItallic(), getStrikeThrough() not always working with PHPExcel_Reader_Excel2007
+- Bugfix:   (ET)     Work item 11492 - AdvancedValueBinder.php not working correctly for $cell->setValue('hh:mm:ss')
 - Bugfix:   (MBaker) Fixed leap year handling for the YEARFRAC() Date/Time function when basis ia 1 (Actual/actual)
 - Bugfix:   (MBaker) Work item 11490 - Warning messages
-			- Calculation Engine code modified to enforce strict standards for pass by reference
-- Bugfix:   (ET) Work item 11483 - PHPExcel_Cell_AdvancedValueBinder doesnt work for dates in far future
-- Bugfix:   (ET) Work item 11528 - MSODRAWING bug with long CONTINUE record in PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 11571 - PHPExcel_Reader_Excel2007 reads print titles as named range when there is more than one sheet
-- Bugfix:   (ET) Work item 11561 - missing @return in phpdocblock in reader classes
-- Bugfix:   (ET) Work item 11576 - AdvancedValueBinder.php: String sometimes becomes a date when it shouldn't
-- Bugfix:   (ET) Work item 11588 - Small numbers escape treatment in PHPExcel_Style_NumberFormat::toFormattedString()
-- Bugfix:   (ET) Work item 11590 - Blank styled cells are not blank in output by HTML writer due to &nbsp;
+                     - Calculation Engine code modified to enforce strict standards for pass by reference
+- Bugfix:   (ET)     Work item 11483 - PHPExcel_Cell_AdvancedValueBinder doesnt work for dates in far future
+- Bugfix:   (ET)     Work item 11528 - MSODRAWING bug with long CONTINUE record in PHPExcel_Reader_Excel5
+- Bugfix:   (ET)     Work item 11571 - PHPExcel_Reader_Excel2007 reads print titles as named range when there is more than one sheet
+- Bugfix:   (ET)     Work item 11561 - missing @return in phpdocblock in reader classes
+- Bugfix:   (ET)     Work item 11576 - AdvancedValueBinder.php: String sometimes becomes a date when it shouldn't
+- Bugfix:   (ET)     Work item 11588 - Small numbers escape treatment in PHPExcel_Style_NumberFormat::toFormattedString()
+- Bugfix:   (ET)     Work item 11590 - Blank styled cells are not blank in output by HTML writer due to &nbsp;
 - Bugfix:   (MBaker) Work item 11587 - Calculation engine bug: Existing, blank cell + number gives #NUM
-- Bugfix:   (ET) Work item 11608 - AutoSize only measures length of first line in cell with multiple lines (ALT+Enter)
-- Bugfix:   (ET) Work item 11608 - Fatal error running Tests/12serializedfileformat.php (PHPExcel 1.7.2)
+- Bugfix:   (ET)     Work item 11608 - AutoSize only measures length of first line in cell with multiple lines (ALT+Enter)
+- Bugfix:   (ET)     Work item 11608 - Fatal error running Tests/12serializedfileformat.php (PHPExcel 1.7.2)
 - Bugfix:   (MBaker) Fixed various errors in the WORKDAY() and NETWORKDAYS() Date/Time functions (particularly related to holidays)
-- Bugfix:   (ET) Work item 11660 - Uncaught exception 'Exception' with message 'Valid scale is between 10 and 400.' in Classes/PHPExcel/Worksheet/SheetView.php:115
-- Bugfix:   (ET) Work item 11551 - "Unrecognized token 39 in formula" with PHPExcel_Reader_Excel5 (occuring with add-in functions)
-- Bugfix:   (ET) Work item 11668 - Excel2007 reader not reading PHPExcel_Style_Conditional::CONDITION_EXPRESSION
+- Bugfix:   (ET)     Work item 11660 - Uncaught exception 'Exception' with message 'Valid scale is between 10 and 400.' in Classes/PHPExcel/Worksheet/SheetView.php:115
+- Bugfix:   (ET)     Work item 11551 - "Unrecognized token 39 in formula" with PHPExcel_Reader_Excel5 (occuring with add-in functions)
+- Bugfix:   (ET)     Work item 11668 - Excel2007 reader not reading PHPExcel_Style_Conditional::CONDITION_EXPRESSION
 - Bugfix:   (MBaker) Fix to the BESSELI(), BESSELJ(), BESSELK(), BESSELY() and COMPLEX() Engineering functions to use correct default values for parameters
 - Bugfix:   (MBaker) Work item 11525 - DATEVALUE function not working for pure time values + allow DATEVALUE() function to handle partial dates (e.g. "1-Jun" or "12/2010")
 - Bugfix:   (MBaker) Fix for empty quoted strings in formulae
 - Bugfix:   (MBaker) Trap for division by zero in Bessel functions
 - Bugfix:   (MBaker) Fix to OOCalc Reader to convert semi-colon (;) argument separator in formulae to a comma (,)
-- Bugfix:   (ET) Work item 11693 - PHPExcel_Writer_Excel5_Parser cannot parse formula like =SUM(C$5:C5)
+- Bugfix:   (ET)     Work item 11693 - PHPExcel_Writer_Excel5_Parser cannot parse formula like =SUM(C$5:C5)
 - Bugfix:   (MBaker) Fix to OOCalc Reader to handle dates that fall outside 32-bit PHP's date range
-- Bugfix:   (ET) Work item 11692 - File->sys_get_temp_dir() can fail in safe mode
-- Bugfix:   (ET) Work item 11727 - Sheet references in Excel5 writer do not work when referenced sheet title contains non-Latin symbols
-- Bugfix:   (ET) Work item 11743 - Bug in HTML writer can result in missing rows in output
-- Bugfix:   (ET) Work item 11674 - setShowGridLines(true) not working with PHPExcel_Writer_PDF
-- Bugfix:   (ET) Work item 11836 - PHPExcel_Worksheet_RowIterator initial position incorrect
-- Bugfix:   (ET) Work item 11835 - PHPExcel_Worksheet_HeaderFooterDrawing Strict Exception thrown (by jshaw86)
-- Bugfix:   (ET) Work item 11850 - Parts of worksheet lost when there are embedded charts (Excel5 reader)
+- Bugfix:   (ET)     Work item 11692 - File->sys_get_temp_dir() can fail in safe mode
+- Bugfix:   (ET)     Work item 11727 - Sheet references in Excel5 writer do not work when referenced sheet title contains non-Latin symbols
+- Bugfix:   (ET)     Work item 11743 - Bug in HTML writer can result in missing rows in output
+- Bugfix:   (ET)     Work item 11674 - setShowGridLines(true) not working with PHPExcel_Writer_PDF
+- Bugfix:   (ET)     Work item 11836 - PHPExcel_Worksheet_RowIterator initial position incorrect
+- Bugfix:   (ET)     Work item 11835 - PHPExcel_Worksheet_HeaderFooterDrawing Strict Exception thrown (by jshaw86)
+- Bugfix:   (ET)     Work item 11850 - Parts of worksheet lost when there are embedded charts (Excel5 reader)
 - Bugfix:   (MBaker) VLOOKUP() function error when lookup value is passed as a cell reference rather than an absolute value
-- Bugfix:   (ET) Work item 12041 - First segment of Rich-Text not read correctly by PHPExcel_Reader_Excel2007
+- Bugfix:   (ET)     Work item 12041 - First segment of Rich-Text not read correctly by PHPExcel_Reader_Excel2007
 - Bugfix:   (MBaker) Work item 12048 - Fatal Error with getCell('name') when name matches the pattern for a cell reference
-- Bugfix:   (ET) Work item 12039 - excel5 writer appears to be swapping image locations
-- Bugfix:   (ET) Work item 11954 - Undefined index: host in ZipStreamWrapper.php, line 94 and line 101
-- Bugfix:   (ET) Work item 11672 - BIFF8 File Format problem (too short COLINFO record)
-- Bugfix:   (ET) Work item 12121 - Column width sometimes changed after read/write with Excel2007 reader/writer
-- Bugfix:   (ET) Work item 11964 - Worksheet.php throws a fatal error when styling is turned off via setReadDataOnly on the reader
+- Bugfix:   (ET)     Work item 12039 - excel5 writer appears to be swapping image locations
+- Bugfix:   (ET)     Work item 11954 - Undefined index: host in ZipStreamWrapper.php, line 94 and line 101
+- Bugfix:   (ET)     Work item 11672 - BIFF8 File Format problem (too short COLINFO record)
+- Bugfix:   (ET)     Work item 12121 - Column width sometimes changed after read/write with Excel2007 reader/writer
+- Bugfix:   (ET)     Work item 11964 - Worksheet.php throws a fatal error when styling is turned off via setReadDataOnly on the reader
 - Bugfix:   (MBaker) Work item 11851 - Checking for Circular References in Formulae
-			- Calculation Engine code now traps for cyclic references, raising an error or throwing an exception, or allows 1 or more iterations through cyclic references, based on a configuration setting
-- Bugfix:   (ET) Work item 12244 - PNG transparency using Excel2007 writer
-- Bugfix:   (ET) Work item 12221 - Custom readfilter error when cell formulas reference excluded cells (Excel5 reader)
-- Bugfix:   (ET) Work item 12288 - Protection problem in XLS
-- Bugfix:   (ET) Work item 12300 - getColumnDimension()->setAutoSize() incorrect on cells with Number Formatting
-- Bugfix:   (ET) Work item 12378 - Notices reading Excel file with Add-in funcitons (PHPExcel_Reader_Excel5)
-- Bugfix:   (ET) Work item 12380 - Excel5 reader not reading formulas with deleted sheet references
-- Bugfix:   (ET) Work item 12404 - Named range (defined name) scope problems for in PHPExcel
-- Bugfix:   (ET) Work item 12423 - PHP Parse error: syntax error, unexpected T_PUBLIC in PHPExcel/Calculation.php on line 3482
-- Bugfix:   (ET) Work item 12505 - Named ranges don't appear in name box using Excel5 writer
-- Bugfix:   (ET) Work item 12509 - Many merged cells + autoSize column -> slows down the writer
-- Bugfix:   (ET) Work item 12539 - Incorrect fallback order comment in Shared/Strings.php ConvertEncoding()
-- Bugfix:   (ET) Work item 12538 - IBM AIX iconv() will not work, should revert to mbstring etc. instead
-- Bugfix:   (ET) Work item 12568 - Excel5 writer and mbstring functions overload
+                     - Calculation Engine code now traps for cyclic references, raising an error or throwing an exception, or allows 1 or more iterations through cyclic references, based on a configuration setting
+- Bugfix:   (ET)     Work item 12244 - PNG transparency using Excel2007 writer
+- Bugfix:   (ET)     Work item 12221 - Custom readfilter error when cell formulas reference excluded cells (Excel5 reader)
+- Bugfix:   (ET)     Work item 12288 - Protection problem in XLS
+- Bugfix:   (ET)     Work item 12300 - getColumnDimension()->setAutoSize() incorrect on cells with Number Formatting
+- Bugfix:   (ET)     Work item 12378 - Notices reading Excel file with Add-in funcitons (PHPExcel_Reader_Excel5)
+- Bugfix:   (ET)     Work item 12380 - Excel5 reader not reading formulas with deleted sheet references
+- Bugfix:   (ET)     Work item 12404 - Named range (defined name) scope problems for in PHPExcel
+- Bugfix:   (ET)     Work item 12423 - PHP Parse error: syntax error, unexpected T_PUBLIC in PHPExcel/Calculation.php on line 3482
+- Bugfix:   (ET)     Work item 12505 - Named ranges don't appear in name box using Excel5 writer
+- Bugfix:   (ET)     Work item 12509 - Many merged cells + autoSize column -> slows down the writer
+- Bugfix:   (ET)     Work item 12539 - Incorrect fallback order comment in Shared/Strings.php ConvertEncoding()
+- Bugfix:   (ET)     Work item 12538 - IBM AIX iconv() will not work, should revert to mbstring etc. instead
+- Bugfix:   (ET)     Work item 12568 - Excel5 writer and mbstring functions overload
 - Bugfix:   (MBaker) Work item 12672 - OFFSET needs to flattenSingleValue the $rows and $columns args
 - Bugfix:   (MBaker) Work item 12546 - Formula with DMAX(): Notice: Undefined offset: 2 in ...\PHPExcel\Calculation.php on line 2365
-			- Note that the Database functions have not yet been implemented
+                     - Note that the Database functions have not yet been implemented
 - Bugfix:   (MBaker) Work item 12839 - Call to a member function getParent() on a non-object in Classes\\PHPExcel\\Calculation.php Title is required
 - Bugfix:   (MBaker) Work item 12935 - Cyclic Reference in Formula
 - Bugfix:   (MBaker) Work item 13025 - Memory error...data validation?
 
 
 2010/01/11 (v1.7.2):
-- General:  (ET) Applied patch 4362
-- General:  (ET) Applied patch 4363 (modified)
+- General:  (ET)     Applied patch 4362
+- General:  (ET)     Applied patch 4363 (modified)
 - General:  (MBaker) Work item 10874 - 1.7.1 Extremely Slow - Refactored PHPExcel_Calculation_Functions::flattenArray() method and set calculation cache timer default to 2.5 seconds
 - General:  (MBaker) Allow formulae to contain line breaks
-- General:  (ET) Work item 10910 - split() function deprecated in PHP 5.3.0
-- General:  (ET) sys_get_temp_dir() requires PHP 5.2.1, not PHP 5.2 [provide fallback function for PHP 5.2.0]
+- General:  (ET)     Work item 10910 - split() function deprecated in PHP 5.3.0
+- General:  (ET)     sys_get_temp_dir() requires PHP 5.2.1, not PHP 5.2 [provide fallback function for PHP 5.2.0]
 - General:  (MBaker) Applied patch 4640 - Implementation of the ISPMT() Financial function by Matt Groves
 - General:  (MBaker) Work item 11052 - Put the example of formula with more arguments in documentation
 - General:  (MBaker) Improved accuracy for the GAMMAINV() Statistical Function
-- Feature:  (ET) Work item 10409 - XFEXT record support to fix colors change from Excel5 reader, and copy/paste color change with Excel5 writer
-            - Excel5 reader reads RGB color information in XFEXT records for borders, font color and fill color
+- Feature:  (ET)     Work item 10409 - XFEXT record support to fix colors change from Excel5 reader, and copy/paste color change with Excel5 writer
+                     - Excel5 reader reads RGB color information in XFEXT records for borders, font color and fill color
 - Feature:  (MBaker) Work Item  2346 - Implement more Excel calculation functions
-            -   Implemented the FVSCHEDULE(), XNPV(), IRR(), MIRR(), XIRR() and RATE() Financial functions
-            -   Implemented the SUMPRODUCT() Mathematical function
-            -   Implemented the ZTEST() Statistical Function
-- Feature:  (ET) Work item 10919 - Multiple print areas in one sheet
-- Feature:  (ET) Work item 10930 - Store calculated values in output by PHPExcel_Writer_Excel5
-- Feature:  (ET) Work item 10939 - Sheet protection options in Excel5 reader/writer
+                     - Implemented the FVSCHEDULE(), XNPV(), IRR(), MIRR(), XIRR() and RATE() Financial functions
+                     - Implemented the SUMPRODUCT() Mathematical function
+                     - Implemented the ZTEST() Statistical Function
+- Feature:  (ET)     Work item 10919 - Multiple print areas in one sheet
+- Feature:  (ET)     Work item 10930 - Store calculated values in output by PHPExcel_Writer_Excel5
+- Feature:  (ET)     Work item 10939 - Sheet protection options in Excel5 reader/writer
 - Feature:  (MBaker) Modification of the COUNT(), AVERAGE(), AVERAGEA(), DEVSQ, AVEDEV(), STDEV(), STDEVA(), STDEVP(), STDEVPA(), VARA() and VARPA() SKEW() and KURT() functions to correctly handle boolean values depending on whether they're passed in as values, values within a matrix or values within a range of cells.
-- Feature:  (ET) Work item  9932 - Cell range selection
-- Feature:  (MB) Work item 10266 - Root-relative path handling
-- Feature:  (ET) Work item 11315 - Named Ranges not working with PHPExcel_Writer_Excel5
-- Bugfix:   (MB) Work item 11206 - Excel2007 Reader fails to load Apache POI generated Excel
-- Bugfix:   (MB) Work item 11154 - Number format is broken when system's thousands separator is empty
-- Bugfix:   (MB) Work item 11401 - ReferenceHelper::updateNamedFormulas throws errors if oldName is empty
-- Bugfix:   (MB) Work item 11296 - parse_url() fails to parse path to an image in xlsx
-- Bugfix:   (ET) Work item 10876 - Workaround for iconv_substr() bug in PHP 5.2.0
-- Bugfix:   (ET) Work item 10877 - 1 pixel error for image width and height with PHPExcel_Writer_Excel5
+- Feature:  (ET)     Work item  9932 - Cell range selection
+- Feature:  (MB)     Work item 10266 - Root-relative path handling
+- Feature:  (ET)     Work item 11315 - Named Ranges not working with PHPExcel_Writer_Excel5
+- Bugfix:   (MB)     Work item 11206 - Excel2007 Reader fails to load Apache POI generated Excel
+- Bugfix:   (MB)     Work item 11154 - Number format is broken when system's thousands separator is empty
+- Bugfix:   (MB)     Work item 11401 - ReferenceHelper::updateNamedFormulas throws errors if oldName is empty
+- Bugfix:   (MB)     Work item 11296 - parse_url() fails to parse path to an image in xlsx
+- Bugfix:   (ET)     Work item 10876 - Workaround for iconv_substr() bug in PHP 5.2.0
+- Bugfix:   (ET)     Work item 10877 - 1 pixel error for image width and height with PHPExcel_Writer_Excel5
 - Bugfix:   (MBaker) Fix to GEOMEAN() Statistical function
-- Bugfix:   (ET) Work item 10884 - setValue('-') and setValue('.') sets numeric 0 instead of 1-character string
-- Bugfix:   (ET) Work item 10885 - Row height sometimes much too low after read with PHPExcel_Reader_Excel5
-- Bugfix:   (ET) Work item 10888 - Diagonal border. Miscellaneous missing support.
-            - Constant PHPExcel_Style_Borders::DIAGONAL_BOTH added to support double-diagonal (cross)
-            - PHPExcel_Reader_Excel2007 not always reading diagonal borders (only recognizes 'true' and not '1')
-            - PHPExcel_Reader_Excel5 support for diagonal borders
-            - PHPExcel_Writer_Excel5 support for diagonal borders
-- Bugfix:   (ET) Work item 10894 - Session bug: Fatal error: Call to a member function bindValue() on a non-object in ...\Classes\PHPExcel\Cell.php on line 217
-- Bugfix:   (ET) Work item 10896 - Colors messed up saving twice with same instance of PHPExcel_Writer_Excel5 (regression since 1.7.0)
-- Bugfix:   (ET) Work item 10917 - Method PHPExcel_Worksheet::setDefaultStyle is not working
-- Bugfix:   (ET) Work item 10897 - PHPExcel_Reader_CSV::canRead() sometimes says false when it shouldn't
-- Bugfix:   (ET) Work item 10922 - Changes in workbook not picked up between two saves with PHPExcel_Writer_Excel2007
-- Bugfix:   (ET) Work item 10913 - Decimal and thousands separators missing in HTML and PDF output
-- Bugfix:   (ET) Work item 10936 - Notices with PHPExcel_Reader_Excel5 and named array constants
+- Bugfix:   (ET)     Work item 10884 - setValue('-') and setValue('.') sets numeric 0 instead of 1-character string
+- Bugfix:   (ET)     Work item 10885 - Row height sometimes much too low after read with PHPExcel_Reader_Excel5
+- Bugfix:   (ET)     Work item 10888 - Diagonal border. Miscellaneous missing support.
+                     - Constant PHPExcel_Style_Borders::DIAGONAL_BOTH added to support double-diagonal (cross)
+                     - PHPExcel_Reader_Excel2007 not always reading diagonal borders (only recognizes 'true' and not '1')
+                     - PHPExcel_Reader_Excel5 support for diagonal borders
+                     - PHPExcel_Writer_Excel5 support for diagonal borders
+- Bugfix:   (ET)     Work item 10894 - Session bug: Fatal error: Call to a member function bindValue() on a non-object in ...\Classes\PHPExcel\Cell.php on line 217
+- Bugfix:   (ET)     Work item 10896 - Colors messed up saving twice with same instance of PHPExcel_Writer_Excel5 (regression since 1.7.0)
+- Bugfix:   (ET)     Work item 10917 - Method PHPExcel_Worksheet::setDefaultStyle is not working
+- Bugfix:   (ET)     Work item 10897 - PHPExcel_Reader_CSV::canRead() sometimes says false when it shouldn't
+- Bugfix:   (ET)     Work item 10922 - Changes in workbook not picked up between two saves with PHPExcel_Writer_Excel2007
+- Bugfix:   (ET)     Work item 10913 - Decimal and thousands separators missing in HTML and PDF output
+- Bugfix:   (ET)     Work item 10936 - Notices with PHPExcel_Reader_Excel5 and named array constants
 - Bugfix:   (MBaker) Work item 10938 - Calculation engine limitation on 32-bit platform with integers > 2147483647
-- Bugfix:   (ET) Work item 10959 - Shared(?) formulae containing absolute cell references not read correctly using Excel5 Reader
+- Bugfix:   (ET)     Work item 10959 - Shared(?) formulae containing absolute cell references not read correctly using Excel5 Reader
 - Bugfix:   (MBaker) Work item 10962 - Warning messages with intersection operator involving single cell
-- Bugfix:   (ET) Work item 10980 - Infinite loop in Excel5 reader caused by zero-length string in SST
-- Bugfix:   (ET) Work item 10983 - Remove unnecessary cell sorting to improve speed by approx. 18% in HTML and PDF writers
+- Bugfix:   (ET)     Work item 10980 - Infinite loop in Excel5 reader caused by zero-length string in SST
+- Bugfix:   (ET)     Work item 10983 - Remove unnecessary cell sorting to improve speed by approx. 18% in HTML and PDF writers
 - Bugfix:   (MBaker) Work item 10977 - Cannot read A1 cell content - OO_Reader
-- Bugfix:   (ET) Work item 11000 - Transliteration failed, invalid encoding
+- Bugfix:   (ET)     Work item 11000 - Transliteration failed, invalid encoding
 
 
 2009/11/02 (v1.7.1):
diff --git a/htdocs/includes/phpexcel/install.txt b/htdocs/includes/phpexcel/install.txt
new file mode 100644
index 00000000000..e52bcda8ef3
--- /dev/null
+++ b/htdocs/includes/phpexcel/install.txt
@@ -0,0 +1,75 @@
+**************************************************************************************
+* PHPExcel
+*
+* Copyright (c) 2006 - 2011 PHPExcel
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+* 
+* This library 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
+* Lesser General Public License for more details.
+* 
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* @copyright  Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
+* @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+* @version    1.7.8, 2012-10-12
+**************************************************************************************
+
+Requirements
+------------
+
+The following requirements should be met prior to using PHPExcel:
+* PHP version 5.2.0 or higher
+* PHP extension php_zip enabled *)
+* PHP extension php_xml enabled
+* PHP extension php_gd2 enabled (if not compiled in)
+
+*) php_zip is only needed by PHPExcel_Reader_Excel2007, PHPExcel_Writer_Excel2007,
+   PHPExcel_Reader_OOCalc. In other words, if you need PHPExcel to handle .xlsx or .ods
+   files you will need the zip extension, but otherwise not.
+
+
+
+Installation instructions
+-------------------------
+
+Installation is quite easy: copy the contents of the Classes folder to any location
+in your application required.
+
+Example:
+
+If your web root folder is /var/www/ you may want to create a subfolder called
+/var/www/Classes/ and copy the files into that folder so you end up with files:
+
+/var/www/Classes/PHPExcel.php
+/var/www/Classes/PHPExcel/Calculation.php
+/var/www/Classes/PHPExcel/Cell.php
+...
+
+
+
+Getting started
+---------------
+
+A good way to get started is to run some of the tests included in the download.
+Copy the "Tests" folder next to your "Classes" folder from above so you end up with:
+
+/var/www/Tests/01simple.php
+/var/www/Tests/02types.php
+...
+
+Start running the test by pointing your browser to the test scripts:
+
+http://example.com/Tests/01simple.php
+http://example.com/Tests/02types.php
+...
+
+Note: It may be necessary to modify the include/require statements at the beginning of
+each of the test scripts if your "Classes" folder from above is named differently.
diff --git a/htdocs/includes/phpexcel/license.txt b/htdocs/includes/phpexcel/license.txt
index 01b2d3154a6..57b74d4c746 100644
--- a/htdocs/includes/phpexcel/license.txt
+++ b/htdocs/includes/phpexcel/license.txt
@@ -1,4 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
+GNU LESSER GENERAL PUBLIC LICENSE
+
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -44,7 +45,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -102,7 +103,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -153,7 +154,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -215,7 +216,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -256,7 +257,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -308,7 +309,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -318,7 +319,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -341,4 +342,4 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
\ No newline at end of file
+END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/htdocs/includes/tcpdf/include/tcpdf_static.php b/htdocs/includes/tcpdf/include/tcpdf_static.php
index e657446aa22..8836e0b8509 100644
--- a/htdocs/includes/tcpdf/include/tcpdf_static.php
+++ b/htdocs/includes/tcpdf/include/tcpdf_static.php
@@ -2767,7 +2767,7 @@ class TCPDF_STATIC {
 	 * Reads entire file into a string.
 	 * The file can be also an URL.
 	 * @param $file (string) Name of the file or URL to read.
-	 * @return The function returns the read data or FALSE on failure. 
+	 * @return The function returns the read data or FALSE on failure.
 	 * @author Nicola Asuni
 	 * @since 6.0.025
 	 * @public static
diff --git a/htdocs/index.php b/htdocs/index.php
index d18c05d4f12..ebc6760252c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -154,7 +154,9 @@ if (empty($user->societe_id))
 	    ! empty($conf->propal->enabled) && $user->rights->propale->lire,
 	    ! empty($conf->commande->enabled) && $user->rights->commande->lire,
 	    ! empty($conf->facture->enabled) && $user->rights->facture->lire,
-	    ! empty($conf->contrat->enabled) && $user->rights->contrat->activer);
+	    ! empty($conf->contrat->enabled) && $user->rights->contrat->activer,
+		! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire,
+		! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire);
 	    // Class file containing the method load_state_board for each line
 	    $includes=array(DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
 	    DOL_DOCUMENT_ROOT."/comm/prospect/class/prospect.class.php",
@@ -165,7 +167,9 @@ if (empty($user->societe_id))
 	    DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
 	    DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
 	    DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
-	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
+	    DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+	    DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php");
 	    // Name class containing the method load_state_board for each line
 	    $classes=array('Client',
 	                   'Prospect',
@@ -173,10 +177,12 @@ if (empty($user->societe_id))
 	                   'Adherent',
 	                   'Product',
 	                   'Service',
-					   'Propal',
-					   'Commande',
-					   'Facture',
-	                   'Contrat');
+	                   'Propal',
+	                   'Commande',
+	                   'Facture',
+	                   'Contrat',
+	                   'CommandeFournisseur',
+	                   'FactureFournisseur');
 	    // Cle array returned by the method load_state_board for each line
 	    $keys=array('customers',
 	                'prospects',
@@ -184,10 +190,12 @@ if (empty($user->societe_id))
 	                'members',
 	                'products',
 	                'services',
-					'proposals',
-					'orders',
-					'invoices',
-					'Contracts');
+	                'proposals',
+	                'orders',
+	                'invoices',
+	                'Contracts',
+	                'supplier_orders',
+	                'supplier_invoices');
 	    // Dashboard Icon lines
 	    $icons=array('company',
 	                 'company',
@@ -195,10 +203,12 @@ if (empty($user->societe_id))
 	                 'user',
 	                 'product',
 	                 'service',
-					 'propal',
-					 'order',
-					 'bill',
-					 'order');
+	                 'propal',
+	                 'order',
+	                 'bill',
+	                 'order',
+	                 'order',
+	                 'bill');
 	    // Translation keyword
 	    $titres=array("ThirdPartyCustomersStats",
 	                  "ThirdPartyProspectsStats",
@@ -209,18 +219,22 @@ if (empty($user->societe_id))
 	                  "CommercialProposalsShort",
 	                  "CustomersOrders",
 	                  "BillsCustomers",
-	                  "Contracts");
+	                  "Contracts",
+	                  "SuppliersOrders",
+	                  "SuppliersInvoices");
 	    // Dashboard Link lines
 	    $links=array(DOL_URL_ROOT.'/comm/list.php',
 	    DOL_URL_ROOT.'/comm/prospect/list.php',
-	    DOL_URL_ROOT.'/fourn/liste.php',
-	    DOL_URL_ROOT.'/adherents/liste.php?statut=1&mainmenu=members',
-	    DOL_URL_ROOT.'/product/liste.php?type=0&mainmenu=products',
-	    DOL_URL_ROOT.'/product/liste.php?type=1&mainmenu=products',
+	    DOL_URL_ROOT.'/fourn/list.php',
+	    DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
+	    DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
+	    DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
 	    DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial',
-	    DOL_URL_ROOT.'/commande/liste.php?mainmenu=commercial',
+	    DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial',
 	    DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=accountancy',
-	    DOL_URL_ROOT.'/contrat/liste.php');
+	    DOL_URL_ROOT.'/contrat/list.php',
+	    DOL_URL_ROOT.'/fourn/commande/list.php',
+	    DOL_URL_ROOT.'/fourn/facture/list.php');
 	    // Translation lang files
 	    $langfile=array("companies",
 	                    "prospects",
@@ -256,7 +270,7 @@ if (empty($user->societe_id))
 	            $text=$langs->trans($titres[$key]);
 	            print '<div class="boxstats">';
 	            print '<a href="'.$links[$key].'" class="nobold nounderline">';
-	            print img_object($text,$icons[$key]).' '.$text.'<br>';
+	            print img_object("",$icons[$key]).' '.$text.'<br>';
 	            print '</a>';
 	            print '<a href="'.$links[$key].'">';
 	            print $board->nb[$val];
@@ -317,7 +331,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
     $board->load_board($user);
     $board->warning_delay=$conf->commande->client->warning_delay/60/60/24;
     $board->label=$langs->trans("OrdersToProcess");
-    $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-3';
+    $board->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3';
     $board->img=img_object($langs->trans("Orders"),"order");
     $rowspan++;
     $dashboardlines[]=$board;
@@ -477,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/liste.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/background.png b/htdocs/install/background.png
deleted file mode 100644
index b264649fcbc..00000000000
Binary files a/htdocs/install/background.png and /dev/null differ
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 486811f7157..1f233e9f551 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013-2014	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -57,7 +57,7 @@ pHeader('','');     // No next step for navigation buttons. Next step is defined
 //print "<br>\n";
 //print $langs->trans("InstallEasy")."<br><br>\n";
 
-print '<b>'.$langs->trans("MiscellaneousChecks")."</b>:<br>\n";
+print '<h3>'.$langs->trans("MiscellaneousChecks").":</h3>\n";
 
 // Check browser
 $useragent=$_SERVER['HTTP_USER_AGENT'];
@@ -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 '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow",'4.3.10');
+	print '<img src="../theme/eldy/img/error.png" alt="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 '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow",'5.3.0');
     $checksok=0;	// 0=error, 1=warning
@@ -152,6 +152,7 @@ if ($memmaxorig != '')
 	preg_match('/([0-9]+)([a-zA-Z]*)/i',$memmax,$reg);
 	if ($reg[2])
 	{
+		if (strtoupper($reg[2]) == 'G') $memmax=$reg[1]*1024*1024*1024;
 		if (strtoupper($reg[2]) == 'M') $memmax=$reg[1]*1024*1024;
 		if (strtoupper($reg[2]) == 'K') $memmax=$reg[1]*1024;
 	}
@@ -393,7 +394,8 @@ else
 								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.5.0', 'to'=>'3.6.0'),
+								array('from'=>'3.6.0', 'to'=>'3.7.0')
 		);
 
 		$count=0;
@@ -438,7 +440,7 @@ else
                 }
             }
 
-            $choice .= '<tr class="listofchoices" '.($recommended_choice ? 'style="background-color:lightyellow"' : '').'>';
+            $choice .= '<tr class="listofchoices '.($recommended_choice ? 'choiceselected' : '').'">';
             $choice .= '<td class="listofchoices nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
             $choice .= '<td class="listofchoices">';
             $choice .= $langs->trans("UpgradeDesc");
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 0c550cd1119..c3feead7a8f 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -18,9 +18,8 @@
 
 body {
 font-size:13px;
-font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
-/* background-color: #F4F4F4; */
+font-family: Verdana, Arial, Helvetica, Tahoma, sans-serif;
+background: #f0f0f0;
 margin: 15px 30px 10px;
 }
 
@@ -33,10 +32,10 @@ span.titre {
 font-size: 1.1em;
 font-weight: bold;
 background: #FFFFFF;
-color: #4965B3;
-border: 1px solid #8CACBB;
+color: #444;
+border: 1px solid #999;
 padding: 5px 5px 5px 5px;
-margin: 0 0 0 0;
+margin: 0 0 0 20px;
 }
 
 div.soustitre {
@@ -45,8 +44,8 @@ font-weight: bold;
 color: #4965B3;
 padding: 0 1.2em 0.5em 2em;
 margin: 1.2em 1.2em 1.2em 1.2em;
-border-bottom: 1px solid #8CACBB;
-border-right: 1px solid #8CACBB;
+border-bottom: 1px solid #999;
+border-right: 1px solid #999;
 text-align: right;
 }
 
@@ -58,6 +57,39 @@ padding: 0 0 0 0;
 margin: 0 0 0 0;
 }
 
+input[type=submit] {
+	border-color: #c5c5c5;
+	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+	display: inline-block;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	text-align: center;
+	cursor: pointer;
+	color: #333333;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbbbbb;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+input:focus, textarea:focus, button:focus, select:focus {
+    box-shadow: 0 0 4px #8091BF;
+}
 input[type=text], input[type=password] {
     border: 1px solid #ACBCBB;
 }
@@ -71,10 +103,21 @@ input:-webkit-autofill {
 }
 
 table.main {
-background: #F0F0F0 url(background.png) repeat-x; 
-text-align: left;
-border: 1px solid #8CACBB;
-color: #000000;
+margin-left: 10px;
+margin-right: 10px;
+padding-left: 6px;
+padding-right: 6px;
+padding-top: 12px;
+padding-bottom: 12px;
+border: 1px solid #A0A0A0;
+border-radius: 8px;
+border: solid 1px rgba(90,90,90,.4);
+-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+background-color: #FFFFFF;
+background: -webkit-gradient(linear, center top, center bottom, color-stop(0%, #fff), color-stop(100%, #f8f8f8));
+background: -moz-linear-gradient(top, #fff, #f8f8f8);
 }
 
 table.main-inside {
@@ -89,7 +132,7 @@ table.listofchoices, tr.listofchoices, td.listofchoices {
 border-collapse: collapse;
     padding: 4px;
     color: #000000;
-border: 1px solid #888888 !important;
+border: 1px solid #999 !important;
 }
 
 tr.listofchoices {
@@ -104,8 +147,8 @@ tr.listofchoices {
 .installchoices table tr td  {
 margin-left: 2px;
 margin-right: 2px;
-border-bottom: 1px solid #8CACBB;
-border-right: 1px solid #8CACBB;
+border-bottom: 1px solid #999;
+border-right: 1px solid #999;
 color: #000000;
 }
 
@@ -178,6 +221,7 @@ margin-top: 10px;
 font-size:16px;
 font-weight: normal;
 color: #4965B3;
+text-shadow: 1px 1px 1px #c0c0c0;
 }
 
 tr.bg1 {
@@ -212,7 +256,7 @@ font-size: 12px;
 
 .install
 {
-border: 1px solid #8CACBB;
+border: 1px solid #999;
 padding: 4px 4px 4px 4px;
 }
 
@@ -246,3 +290,9 @@ ul {
 a.button:hover {
     text-decoration:none;
 }
+
+.choiceselected {
+background-color: #dfd;
+background-repeat: repeat-x;
+background-position: top left;
+}
diff --git a/htdocs/install/doctemplates/index.html b/htdocs/install/doctemplates/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/invoices/index.html b/htdocs/install/doctemplates/invoices/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/orders/index.html b/htdocs/install/doctemplates/orders/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/projects/index.html b/htdocs/install/doctemplates/projects/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/proposals/index.html b/htdocs/install/doctemplates/proposals/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/shipment/index.html b/htdocs/install/doctemplates/shipment/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/tasks/index.html b/htdocs/install/doctemplates/tasks/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/doctemplates/thirdparties/index.html b/htdocs/install/doctemplates/thirdparties/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 43d063bf270..20450760127 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -214,7 +214,9 @@ if (! $error)
             {
                 print '<div class="error">'.$db->error.'</div>';
                 if (! $db->connected) print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+                //print '<a href="#" onClick="javascript: history.back();">';
                 print $langs->trans("ErrorGoBackAndCorrectParameters");
+                //print '</a>';
                 $error++;
             }
         }
@@ -223,7 +225,9 @@ if (! $error)
     {
         print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$db_type.".class.php\")<br>\n";
         print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'</div>';
+        //print '<a href="#" onClick="javascript: history.back();">';
         print $langs->trans("ErrorGoBackAndCorrectParameters");
+        //print '</a>';
         $error++;
     }
 }
@@ -256,8 +260,6 @@ if (! $error && $db->connected)
 {
     if (! empty($_POST["db_create_database"]))	// If we create database, we force default value
     {
-    	//$defaultCharacterSet=getStaticMember(get_class($db),'forcecharset');
-    	//$defaultDBSortingCollation=getStaticMember(get_class($db),'forcecollate');
     	$defaultCharacterSet=$db->forcecharset;
     	$defaultDBSortingCollation=$db->forcecollate;
     }
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 665d766a8dd..2c6a5730100 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -309,8 +309,8 @@ if (! empty($force_install_message))
                     if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete unti sqlit does not manage foreign key creation after table creation
 
 		            // Version min of database
-                    $versionbasemin=getStaticMember($class, 'versionmin');
-                    $note='('.getStaticMember($class, 'label').' >= '.versiontostring($versionbasemin).')';
+                    $versionbasemin=explode('.',$class::VERSIONMIN);
+                    $note='('.$class::LABEL.' >= '.$class::VERSIONMIN.')';
 
 		            // Switch to mysql if mysqli is not present
 		            if ($defaultype=='mysqli' && !function_exists('mysqli_connect')) $defaultype = 'mysql';
diff --git a/htdocs/install/headbg.jpg b/htdocs/install/headbg.jpg
deleted file mode 100644
index 5491c6e4acb..00000000000
Binary files a/htdocs/install/headbg.jpg and /dev/null differ
diff --git a/htdocs/install/lib/index.html b/htdocs/install/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mssql/functions/index.html b/htdocs/install/mssql/functions/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mssql/index.html b/htdocs/install/mssql/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mysql/data/index.html b/htdocs/install/mysql/data/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
new file mode 100644
index 00000000000..a6c0efc77a6
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -0,0 +1,273 @@
+-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+-- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2014 	   Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- Do not add comment at end of line. This file is parsed by install and -- are removed
+
+--
+-- Countries
+--
+
+-- delete from llx_c_country;
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (0,'',NULL,'-',1,1);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (1,'FR','FRA','France',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (2,'BE','BEL','Belgium',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (3,'IT','ITA','Italy',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (4,'ES','ESP','Spain',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (5,'DE','DEU','Germany',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (6,'CH','CHE','Switzerland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (7,'GB','GBR','United Kingdom',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (8,'IE','IRL','Irland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (9,'CN','CHN','China',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (10,'TN','TUN','Tunisia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (11,'US','USA','United States',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (12,'MA','MAR','Maroc',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (13,'DZ','DZA','Algeria',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (14,'CA','CAN','Canada',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (15,'TG','TGO','Togo',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (16,'GA','GAB','Gabon',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (17,'NL','NLD','Nerderland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (18,'HU','HUN','Hongrie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (19,'RU','RUS','Russia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (20,'SE','SWE','Sweden',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (21,'CI','CIV','Côte d''Ivoire',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (22,'SN','SEN','Senegal',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (23,'AR','ARG','Argentine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (24,'CM','CMR','Cameroun',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (25,'PT','PRT','Portugal',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (26,'SA','SAU','Saudi Arabia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (27,'MC','MCO','Monaco',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (28,'AU','AUS','Australia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (29,'SG','SGP','Singapour',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (30,'AF','AFG','Afghanistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (31,'AX','ALA','Iles Aland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (32,'AL','ALB','Albanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (33,'AS','ASM','Samoa américaines',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (34,'AD','AND','Andorre',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (35,'AO','AGO','Angola',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (36,'AI','AIA','Anguilla',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (37,'AQ','ATA','Antarctique',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (39,'AM','ARM','Arménie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (40,'AW','ABW','Aruba',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (41,'AT','AUT','Autriche',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (42,'AZ','AZE','Azerbaïdjan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (43,'BS','BHS','Bahamas',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (44,'BH','BHR','Bahreïn',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (45,'BD','BGD','Bangladesh',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (46,'BB','BRB','Barbade',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (47,'BY','BLR','Biélorussie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (48,'BZ','BLZ','Belize',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (49,'BJ','BEN','Bénin',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (50,'BM','BMU','Bermudes',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (51,'BT','BTN','Bhoutan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (52,'BO','BOL','Bolivie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (53,'BA','BIH','Bosnie-Herzégovine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (54,'BW','BWA','Botswana',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (55,'BV','BVT','Ile Bouvet',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (56,'BR','BRA','Brazil',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (57,'IO','IOT','Territoire britannique de l''Océan Indien',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (58,'BN','BRN','Brunei',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (59,'BG','BGR','Bulgarie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (60,'BF','BFA','Burkina Faso',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (61,'BI','BDI','Burundi',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (62,'KH','KHM','Cambodge',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (63,'CV','CPV','Cap-Vert',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (64,'KY','CYM','Iles Cayman',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (65,'CF','CAF','République centrafricaine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (66,'TD','TCD','Tchad',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (67,'CL','CHL','Chili',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (68,'CX','CXR','Ile Christmas',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (69,'CC','CCK','Iles des Cocos (Keeling)',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (70,'CO','COL','Colombie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (71,'KM','COM','Comores',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (72,'CG','COG','Congo',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (73,'CD','COD','République démocratique du Congo',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (74,'CK','COK','Iles Cook',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (75,'CR','CRI','Costa Rica',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (76,'HR','HRV','Croatie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (77,'CU','CUB','Cuba',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (78,'CY','CYP','Chypre',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (79,'CZ','CZE','République Tchèque',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (80,'DK','DNK','Danemark',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (81,'DJ','DJI','Djibouti',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (82,'DM','DMA','Dominique',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (83,'DO','DOM','République Dominicaine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (84,'EC','ECU','Equateur',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (85,'EG','EGY','Egypte',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (86,'SV','SLV','Salvador',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (87,'GQ','GNQ','Guinée Equatoriale',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (88,'ER','ERI','Erythrée',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (89,'EE','EST','Estonia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (90,'ET','ETH','Ethiopie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (91,'FK','FLK','Iles Falkland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (92,'FO','FRO','Iles Féroé',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (93,'FJ','FJI','Iles Fidji',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (94,'FI','FIN','Finlande',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (95,'GF','GUF','Guyane française',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (96,'PF','PYF','Polynésie française',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (97,'TF','ATF','Terres australes françaises',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (98,'GM','GMB','Gambie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (99,'GE','GEO','Georgia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (100,'GH','GHA','Ghana',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (101,'GI','GIB','Gibraltar',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (102,'GR','GRC','Greece',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (103,'GL','GRL','Groenland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (104,'GD','GRD','Grenade',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (106,'GU','GUM','Guam',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (107,'GT','GTM','Guatemala',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (108,'GN','GIN','Guinea',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (109,'GW','GNB','Guinea-Bissao',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (111,'HT','HTI','Haiti',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (112,'HM','HMD','Iles Heard et McDonald',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (113,'VA','VAT','Saint-Siège (Vatican)',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (114,'HN','HND','Honduras',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (115,'HK','HKG','Hong Kong',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (116,'IS','ISL','Islande',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (117,'IN','IND','India',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (118,'ID','IDN','Indonésie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (119,'IR','IRN','Iran',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (120,'IQ','IRQ','Iraq',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (121,'IL','ISR','Israel',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (122,'JM','JAM','Jamaïque',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (123,'JP','JPN','Japon',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (124,'JO','JOR','Jordanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (125,'KZ','KAZ','Kazakhstan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (126,'KE','KEN','Kenya',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (127,'KI','KIR','Kiribati',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (128,'KP','PRK','North Corea',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (129,'KR','KOR','South Corea',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (130,'KW','KWT','Koweït',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (131,'KG','KGZ','Kirghizistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (132,'LA','LAO','Laos',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (133,'LV','LVA','Lettonie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (134,'LB','LBN','Liban',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (135,'LS','LSO','Lesotho',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (136,'LR','LBR','Liberia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (137,'LY','LBY','Libye',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (138,'LI','LIE','Liechtenstein',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (139,'LT','LTU','Lituanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (140,'LU','LUX','Luxembourg',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (141,'MO','MAC','Macao',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (142,'MK','MKD','ex-République yougoslave de Macédoine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (143,'MG','MDG','Madagascar',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (144,'MW','MWI','Malawi',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (145,'MY','MYS','Malaisie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (146,'MV','MDV','Maldives',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (147,'ML','MLI','Mali',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (148,'MT','MLT','Malte',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (149,'MH','MHL','Iles Marshall',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (151,'MR','MRT','Mauritanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (152,'MU','MUS','Maurice',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (153,'YT','MYT','Mayotte',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (154,'MX','MEX','Mexique',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (155,'FM','FSM','Micronésie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (156,'MD','MDA','Moldavie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (157,'MN','MNG','Mongolie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (158,'MS','MSR','Monserrat',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (159,'MZ','MOZ','Mozambique',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (160,'MM','MMR','Birmanie (Myanmar)',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (161,'NA','NAM','Namibie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (162,'NR','NRU','Nauru',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (163,'NP','NPL','Népal',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (164,'AN',NULL,'Antilles néerlandaises',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (165,'NC','NCL','Nouvelle-Calédonie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (166,'NZ','NZL','Nouvelle-Zélande',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (167,'NI','NIC','Nicaragua',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (168,'NE','NER','Niger',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (169,'NG','NGA','Nigeria',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (170,'NU','NIU','Nioué',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (171,'NF','NFK','Ile Norfolk',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (172,'MP','MNP','Mariannes du Nord',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (173,'NO','NOR','Norvège',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (174,'OM','OMN','Oman',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (175,'PK','PAK','Pakistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (176,'PW','PLW','Palaos',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (177,'PS','PSE','Territoire Palestinien Occupé',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (178,'PA','PAN','Panama',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (179,'PG','PNG','Papouasie-Nouvelle-Guinée',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (180,'PY','PRY','Paraguay',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (181,'PE','PER','Peru',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (182,'PH','PHL','Philippines',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (183,'PN','PCN','Iles Pitcairn',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (184,'PL','POL','Pologne',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (185,'PR','PRI','Porto Rico',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (186,'QA','QAT','Qatar',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (188,'RO','ROU','Roumanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (189,'RW','RWA','Rwanda',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (190,'SH','SHN','Sainte-Hélène',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (191,'KN','KNA','Saint-Christophe-et-Niévès',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (192,'LC','LCA','Sainte-Lucie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (193,'PM','SPM','Saint-Pierre-et-Miquelon',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (195,'WS','WSM','Samoa',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (196,'SM','SMR','Saint-Marin',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (197,'ST','STP','Sao Tomé-et-Principe',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (198,'RS','SRB','Serbie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (199,'SC','SYC','Seychelles',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (200,'SL','SLE','Sierra Leone',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (201,'SK','SVK','Slovaquie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (202,'SI','SVN','Slovénie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (203,'SB','SLB','Iles Salomon',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (204,'SO','SOM','Somalie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (205,'ZA','ZAF','Afrique du Sud',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (207,'LK','LKA','Sri Lanka',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (208,'SD','SDN','Soudan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (209,'SR','SUR','Suriname',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (210,'SJ','SJM','Iles Svalbard et Jan Mayen',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (211,'SZ','SWZ','Swaziland',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (212,'SY','SYR','Syrie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (213,'TW','TWN','Taïwan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (214,'TJ','TJK','Tadjikistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (215,'TZ','TZA','Tanzanie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (216,'TH','THA','Thaïlande',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (217,'TL','TLS','Timor Oriental',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (218,'TK','TKL','Tokélaou',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (219,'TO','TON','Tonga',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (220,'TT','TTO','Trinité-et-Tobago',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (221,'TR','TUR','Turquie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (222,'TM','TKM','Turkménistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (223,'TC','TCA','Iles Turks-et-Caicos',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (224,'TV','TUV','Tuvalu',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (225,'UG','UGA','Ouganda',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (226,'UA','UKR','Ukraine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (227,'AE','ARE','Émirats arabes unis',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (228,'UM','UMI','Iles mineures éloignées des États-Unis',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (229,'UY','URY','Uruguay',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (230,'UZ','UZB','Ouzbékistan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (231,'VU','VUT','Vanuatu',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (232,'VE','VEN','Vénézuela',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (233,'VN','VNM','Viêt Nam',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (234,'VG','VGB','Iles Vierges britanniques',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (235,'VI','VIR','Iles Vierges américaines',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (236,'WF','WLF','Wallis-et-Futuna',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (237,'EH','ESH','Sahara occidental',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (238,'YE','YEM','Yémen',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (239,'ZM','ZMB','Zambie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (240,'ZW','ZWE','Zimbabwe',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (241,'GG','GGY','Guernesey',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (242,'IM','IMN','Ile de Man',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (243,'JE','JEY','Jersey',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (244,'ME','MNE','Monténégro',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (245,'BL','BLM','Saint-Barthélemy',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (246,'MF','MAF','Saint-Martin',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (247,'BU', null, 'Burundi',1,0);
diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql
deleted file mode 100644
index e40eff745e6..00000000000
--- a/htdocs/install/mysql/data/llx_00_c_pays.sql
+++ /dev/null
@@ -1,281 +0,0 @@
--- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
--- Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
--- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
--- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
--- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
---
--- 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 <http://www.gnu.org/licenses/>.
---
---
-
---
--- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
--- de l'install et tous les sigles '--' sont supprimés.
---
-
---
--- Pays
---
-
--- delete from llx_c_pays;
-insert into llx_c_pays (rowid,code,libelle) values (0,  ''  , '-'              );
-insert into llx_c_pays (rowid,code,libelle) values (1,  'FR', 'France'         );
-insert into llx_c_pays (rowid,code,libelle) values (2,  'BE', 'Belgium'        );
-insert into llx_c_pays (rowid,code,libelle) values (3,  'IT', 'Italy'          );
-insert into llx_c_pays (rowid,code,libelle) values (4,  'ES', 'Spain'          );
-insert into llx_c_pays (rowid,code,libelle) values (5,  'DE', 'Germany'        );
-insert into llx_c_pays (rowid,code,libelle) values (6,  'CH', 'Switzerland'    );
-insert into llx_c_pays (rowid,code,libelle) values (7,  'GB', 'United Kingdom' );
-insert into llx_c_pays (rowid,code,libelle) values (8,  'IE', 'Irland'         );
-insert into llx_c_pays (rowid,code,libelle) values (9,  'CN', 'China'          );
-insert into llx_c_pays (rowid,code,libelle) values (10, 'TN', 'Tunisia'        );
-insert into llx_c_pays (rowid,code,libelle) values (11, 'US', 'United States'  );
-insert into llx_c_pays (rowid,code,libelle) values (12, 'MA', 'Maroc'          );
-insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Algeria'        );
-insert into llx_c_pays (rowid,code,libelle) values (14, 'CA', 'Canada'         );
-insert into llx_c_pays (rowid,code,libelle) values (15, 'TG', 'Togo'           );
-insert into llx_c_pays (rowid,code,libelle) values (16, 'GA', 'Gabon'          );
-insert into llx_c_pays (rowid,code,libelle) values (17, 'NL', 'Nerderland'     );
-insert into llx_c_pays (rowid,code,libelle) values (18, 'HU', 'Hongrie'        );
-insert into llx_c_pays (rowid,code,libelle) values (19, 'RU', 'Russia'         );
-insert into llx_c_pays (rowid,code,libelle) values (20, 'SE', 'Sweden'         );
-insert into llx_c_pays (rowid,code,libelle) values (21, 'CI', 'Côte d''Ivoire' );
-insert into llx_c_pays (rowid,code,libelle) values (22, 'SN', 'Senegal'        );
-insert into llx_c_pays (rowid,code,libelle) values (23, 'AR', 'Argentine'      );
-insert into llx_c_pays (rowid,code,libelle) values (24, 'CM', 'Cameroun'       );
-insert into llx_c_pays (rowid,code,libelle) values (25, 'PT', 'Portugal'       );
-insert into llx_c_pays (rowid,code,libelle) values (26, 'SA', 'Saudi Arabia'   );
-insert into llx_c_pays (rowid,code,libelle) values (27, 'MC', 'Monaco'         );
-insert into llx_c_pays (rowid,code,libelle) values (28, 'AU', 'Australia'      );
-insert into llx_c_pays (rowid,code,libelle) values (29, 'SG', 'Singapour'      );
-insert into llx_c_pays (rowid,code,libelle) values (30, 'AF', 'Afghanistan'    );
-insert into llx_c_pays (rowid,code,libelle) values (31, 'AX', 'Iles Aland'     );
-insert into llx_c_pays (rowid,code,libelle) values (32, 'AL', 'Albanie'        );
-insert into llx_c_pays (rowid,code,libelle) values (33, 'AS', 'Samoa américaines');
-insert into llx_c_pays (rowid,code,libelle) values (34, 'AD', 'Andorre'        );
-insert into llx_c_pays (rowid,code,libelle) values (35, 'AO', 'Angola'         );
-insert into llx_c_pays (rowid,code,libelle) values (36, 'AI', 'Anguilla'       );
-insert into llx_c_pays (rowid,code,libelle) values (37, 'AQ', 'Antarctique'    );
-insert into llx_c_pays (rowid,code,libelle) values (38, 'AG', 'Antigua-et-Barbuda');
-insert into llx_c_pays (rowid,code,libelle) values (39, 'AM', 'Arménie'        );
-insert into llx_c_pays (rowid,code,libelle) values (40, 'AW', 'Aruba'          );
-insert into llx_c_pays (rowid,code,libelle) values (41, 'AT', 'Autriche'       );
-insert into llx_c_pays (rowid,code,libelle) values (42, 'AZ', 'Azerbaïdjan'    );
-insert into llx_c_pays (rowid,code,libelle) values (43, 'BS', 'Bahamas'        );
-insert into llx_c_pays (rowid,code,libelle) values (44, 'BH', 'Bahreïn'        );
-insert into llx_c_pays (rowid,code,libelle) values (45, 'BD', 'Bangladesh'     );
-insert into llx_c_pays (rowid,code,libelle) values (46, 'BB', 'Barbade'        );
-insert into llx_c_pays (rowid,code,libelle) values (47, 'BY', 'Biélorussie'    );
-insert into llx_c_pays (rowid,code,libelle) values (48, 'BZ', 'Belize'         );
-insert into llx_c_pays (rowid,code,libelle) values (49, 'BJ', 'Bénin'          );
-insert into llx_c_pays (rowid,code,libelle) values (50, 'BM', 'Bermudes'       );
-insert into llx_c_pays (rowid,code,libelle) values (51, 'BT', 'Bhoutan'        );
-insert into llx_c_pays (rowid,code,libelle) values (52, 'BO', 'Bolivie'        );
-insert into llx_c_pays (rowid,code,libelle) values (53, 'BA', 'Bosnie-Herzégovine');
-insert into llx_c_pays (rowid,code,libelle) values (54, 'BW', 'Botswana'       );
-insert into llx_c_pays (rowid,code,libelle) values (55, 'BV', 'Ile Bouvet'     );
-insert into llx_c_pays (rowid,code,libelle) values (56, 'BR', 'Brazil'         );
-insert into llx_c_pays (rowid,code,libelle) values (57, 'IO', 'Territoire britannique de l''Océan Indien');
-insert into llx_c_pays (rowid,code,libelle) values (58, 'BN', 'Brunei'         );
-insert into llx_c_pays (rowid,code,libelle) values (59, 'BG', 'Bulgarie'       );
-insert into llx_c_pays (rowid,code,libelle) values (60, 'BF', 'Burkina Faso'   );
-insert into llx_c_pays (rowid,code,libelle) values (61, 'BI', 'Burundi'        );
-insert into llx_c_pays (rowid,code,libelle) values (62, 'KH', 'Cambodge'       );
-insert into llx_c_pays (rowid,code,libelle) values (63, 'CV', 'Cap-Vert'       );
-insert into llx_c_pays (rowid,code,libelle) values (64, 'KY', 'Iles Cayman'    );
-insert into llx_c_pays (rowid,code,libelle) values (65, 'CF', 'République centrafricaine');
-insert into llx_c_pays (rowid,code,libelle) values (66, 'TD', 'Tchad'          );
-insert into llx_c_pays (rowid,code,libelle) values (67, 'CL', 'Chili'          );
-insert into llx_c_pays (rowid,code,libelle) values (68, 'CX', 'Ile Christmas'  );
-insert into llx_c_pays (rowid,code,libelle) values (69, 'CC', 'Iles des Cocos (Keeling)');
-insert into llx_c_pays (rowid,code,libelle) values (70, 'CO', 'Colombie'       );
-insert into llx_c_pays (rowid,code,libelle) values (71, 'KM', 'Comores'        );
-insert into llx_c_pays (rowid,code,libelle) values (72, 'CG', 'Congo'          );
-insert into llx_c_pays (rowid,code,libelle) values (73, 'CD', 'République démocratique du Congo');
-insert into llx_c_pays (rowid,code,libelle) values (74, 'CK', 'Iles Cook'      );
-insert into llx_c_pays (rowid,code,libelle) values (75, 'CR', 'Costa Rica'     );
-insert into llx_c_pays (rowid,code,libelle) values (76, 'HR', 'Croatie'        );
-insert into llx_c_pays (rowid,code,libelle) values (77, 'CU', 'Cuba'           );
-insert into llx_c_pays (rowid,code,libelle) values (78, 'CY', 'Chypre'         );
-insert into llx_c_pays (rowid,code,libelle) values (79, 'CZ', 'République Tchèque');
-insert into llx_c_pays (rowid,code,libelle) values (80, 'DK', 'Danemark'       );
-insert into llx_c_pays (rowid,code,libelle) values (81, 'DJ', 'Djibouti'       );
-insert into llx_c_pays (rowid,code,libelle) values (82, 'DM', 'Dominique'      );
-insert into llx_c_pays (rowid,code,libelle) values (83, 'DO', 'République Dominicaine');
-insert into llx_c_pays (rowid,code,libelle) values (84, 'EC', 'Equateur'       );
-insert into llx_c_pays (rowid,code,libelle) values (85, 'EG', 'Egypte'         );
-insert into llx_c_pays (rowid,code,libelle) values (86, 'SV', 'Salvador'       );
-insert into llx_c_pays (rowid,code,libelle) values (87, 'GQ', 'Guinée Equatoriale');
-insert into llx_c_pays (rowid,code,libelle) values (88, 'ER', 'Erythrée'       );
-insert into llx_c_pays (rowid,code,libelle) values (89, 'EE', 'Estonia'        );
-insert into llx_c_pays (rowid,code,libelle) values (90, 'ET', 'Ethiopie'       );
-insert into llx_c_pays (rowid,code,libelle) values (91, 'FK', 'Iles Falkland'  );
-insert into llx_c_pays (rowid,code,libelle) values (92, 'FO', 'Iles Féroé'     );
-insert into llx_c_pays (rowid,code,libelle) values (93, 'FJ', 'Iles Fidji'     );
-insert into llx_c_pays (rowid,code,libelle) values (94, 'FI', 'Finlande'       );
-insert into llx_c_pays (rowid,code,libelle) values (95, 'GF', 'Guyane française');
-insert into llx_c_pays (rowid,code,libelle) values (96, 'PF', 'Polynésie française');
-insert into llx_c_pays (rowid,code,libelle) values (97, 'TF', 'Terres australes françaises');
-insert into llx_c_pays (rowid,code,libelle) values (98, 'GM', 'Gambie'         );
-insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'Georgia'       );
-insert into llx_c_pays (rowid,code,libelle) values (100, 'GH', 'Ghana'         );
-insert into llx_c_pays (rowid,code,libelle) values (101, 'GI', 'Gibraltar'     );
-insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Greece'         );
-insert into llx_c_pays (rowid,code,libelle) values (103, 'GL', 'Groenland'     );
-insert into llx_c_pays (rowid,code,libelle) values (104, 'GD', 'Grenade'       );
---insert into llx_c_pays (rowid,code,libelle) values (105, 'GP', 'Guadeloupe'    );
-insert into llx_c_pays (rowid,code,libelle) values (106, 'GU', 'Guam'          );
-insert into llx_c_pays (rowid,code,libelle) values (107, 'GT', 'Guatemala'     );
-insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guinea'        );
-insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guinea-Bissao' );
---insert into llx_c_pays (rowid,code,libelle) values (110, 'GY', 'Guyana'        );
-insert into llx_c_pays (rowid,code,libelle) values (111, 'HT', 'Haiti'         );
-insert into llx_c_pays (rowid,code,libelle) values (112, 'HM', 'Iles Heard et McDonald');
-insert into llx_c_pays (rowid,code,libelle) values (113, 'VA', 'Saint-Siège (Vatican)');
-insert into llx_c_pays (rowid,code,libelle) values (114, 'HN', 'Honduras'      );
-insert into llx_c_pays (rowid,code,libelle) values (115, 'HK', 'Hong Kong'     );
-insert into llx_c_pays (rowid,code,libelle) values (116, 'IS', 'Islande'       );
-insert into llx_c_pays (rowid,code,libelle) values (117, 'IN', 'India'          );
-insert into llx_c_pays (rowid,code,libelle) values (118, 'ID', 'Indonésie'     );
-insert into llx_c_pays (rowid,code,libelle) values (119, 'IR', 'Iran'          );
-insert into llx_c_pays (rowid,code,libelle) values (120, 'IQ', 'Iraq'          );
-insert into llx_c_pays (rowid,code,libelle) values (121, 'IL', 'Israel'        );
-insert into llx_c_pays (rowid,code,libelle) values (122, 'JM', 'Jamaïque'      );
-insert into llx_c_pays (rowid,code,libelle) values (123, 'JP', 'Japon'         );
-insert into llx_c_pays (rowid,code,libelle) values (124, 'JO', 'Jordanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (125, 'KZ', 'Kazakhstan'    );
-insert into llx_c_pays (rowid,code,libelle) values (126, 'KE', 'Kenya'         );
-insert into llx_c_pays (rowid,code,libelle) values (127, 'KI', 'Kiribati'      );
-insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'North Corea' );
-insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'South Corea'  );
-insert into llx_c_pays (rowid,code,libelle) values (130, 'KW', 'Koweït'        );
-insert into llx_c_pays (rowid,code,libelle) values (131, 'KG', 'Kirghizistan'  );
-insert into llx_c_pays (rowid,code,libelle) values (132, 'LA', 'Laos'          );
-insert into llx_c_pays (rowid,code,libelle) values (133, 'LV', 'Lettonie'      );
-insert into llx_c_pays (rowid,code,libelle) values (134, 'LB', 'Liban'         );
-insert into llx_c_pays (rowid,code,libelle) values (135, 'LS', 'Lesotho'       );
-insert into llx_c_pays (rowid,code,libelle) values (136, 'LR', 'Liberia'       );
-insert into llx_c_pays (rowid,code,libelle) values (137, 'LY', 'Libye'         );
-insert into llx_c_pays (rowid,code,libelle) values (138, 'LI', 'Liechtenstein' );
-insert into llx_c_pays (rowid,code,libelle) values (139, 'LT', 'Lituanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (140, 'LU', 'Luxembourg'    );
-insert into llx_c_pays (rowid,code,libelle) values (141, 'MO', 'Macao'         );
-insert into llx_c_pays (rowid,code,libelle) values (142, 'MK', 'ex-République yougoslave de Macédoine');
-insert into llx_c_pays (rowid,code,libelle) values (143, 'MG', 'Madagascar'    );
-insert into llx_c_pays (rowid,code,libelle) values (144, 'MW', 'Malawi'        );
-insert into llx_c_pays (rowid,code,libelle) values (145, 'MY', 'Malaisie'      );
-insert into llx_c_pays (rowid,code,libelle) values (146, 'MV', 'Maldives'      );
-insert into llx_c_pays (rowid,code,libelle) values (147, 'ML', 'Mali'          );
-insert into llx_c_pays (rowid,code,libelle) values (148, 'MT', 'Malte'         );
-insert into llx_c_pays (rowid,code,libelle) values (149, 'MH', 'Iles Marshall' );
---insert into llx_c_pays (rowid,code,libelle) values (150, 'MQ', 'Martinique'    );
-insert into llx_c_pays (rowid,code,libelle) values (151, 'MR', 'Mauritanie'    );
-insert into llx_c_pays (rowid,code,libelle) values (152, 'MU', 'Maurice'       );
-insert into llx_c_pays (rowid,code,libelle) values (153, 'YT', 'Mayotte'       );
-insert into llx_c_pays (rowid,code,libelle) values (154, 'MX', 'Mexique'       );
-insert into llx_c_pays (rowid,code,libelle) values (155, 'FM', 'Micronésie'    );
-insert into llx_c_pays (rowid,code,libelle) values (156, 'MD', 'Moldavie'      );
-insert into llx_c_pays (rowid,code,libelle) values (157, 'MN', 'Mongolie'      );
-insert into llx_c_pays (rowid,code,libelle) values (158, 'MS', 'Monserrat'     );
-insert into llx_c_pays (rowid,code,libelle) values (159, 'MZ', 'Mozambique'    );
-insert into llx_c_pays (rowid,code,libelle) values (160, 'MM', 'Birmanie (Myanmar)'      );
-insert into llx_c_pays (rowid,code,libelle) values (161, 'NA', 'Namibie'       );
-insert into llx_c_pays (rowid,code,libelle) values (162, 'NR', 'Nauru'         );
-insert into llx_c_pays (rowid,code,libelle) values (163, 'NP', 'Népal'         );
-insert into llx_c_pays (rowid,code,libelle) values (164, 'AN', 'Antilles néerlandaises');
-insert into llx_c_pays (rowid,code,libelle) values (165, 'NC', 'Nouvelle-Calédonie');
-insert into llx_c_pays (rowid,code,libelle) values (166, 'NZ', 'Nouvelle-Zélande');
-insert into llx_c_pays (rowid,code,libelle) values (167, 'NI', 'Nicaragua'     );
-insert into llx_c_pays (rowid,code,libelle) values (168, 'NE', 'Niger'         );
-insert into llx_c_pays (rowid,code,libelle) values (169, 'NG', 'Nigeria'       );
-insert into llx_c_pays (rowid,code,libelle) values (170, 'NU', 'Nioué'         );
-insert into llx_c_pays (rowid,code,libelle) values (171, 'NF', 'Ile Norfolk'   );
-insert into llx_c_pays (rowid,code,libelle) values (172, 'MP', 'Mariannes du Nord');
-insert into llx_c_pays (rowid,code,libelle) values (173, 'NO', 'Norvège'       );
-insert into llx_c_pays (rowid,code,libelle) values (174, 'OM', 'Oman'          );
-insert into llx_c_pays (rowid,code,libelle) values (175, 'PK', 'Pakistan'      );
-insert into llx_c_pays (rowid,code,libelle) values (176, 'PW', 'Palaos'        );
-insert into llx_c_pays (rowid,code,libelle) values (177, 'PS', 'Territoire Palestinien Occupé');
-insert into llx_c_pays (rowid,code,libelle) values (178, 'PA', 'Panama'        );
-insert into llx_c_pays (rowid,code,libelle) values (179, 'PG', 'Papouasie-Nouvelle-Guinée');
-insert into llx_c_pays (rowid,code,libelle) values (180, 'PY', 'Paraguay'      );
-insert into llx_c_pays (rowid,code,libelle) values (181, 'PE', 'Peru'          );
-insert into llx_c_pays (rowid,code,libelle) values (182, 'PH', 'Philippines'   );
-insert into llx_c_pays (rowid,code,libelle) values (183, 'PN', 'Iles Pitcairn' );
-insert into llx_c_pays (rowid,code,libelle) values (184, 'PL', 'Pologne'       );
-insert into llx_c_pays (rowid,code,libelle) values (185, 'PR', 'Porto Rico'    );
-insert into llx_c_pays (rowid,code,libelle) values (186, 'QA', 'Qatar'         );
---insert into llx_c_pays (rowid,code,libelle) values (187, 'RE', 'Réunion'       );
-insert into llx_c_pays (rowid,code,libelle) values (188, 'RO', 'Roumanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (189, 'RW', 'Rwanda'        );
-insert into llx_c_pays (rowid,code,libelle) values (190, 'SH', 'Sainte-Hélène' );
-insert into llx_c_pays (rowid,code,libelle) values (191, 'KN', 'Saint-Christophe-et-Niévès');
-insert into llx_c_pays (rowid,code,libelle) values (192, 'LC', 'Sainte-Lucie'  );
-insert into llx_c_pays (rowid,code,libelle) values (193, 'PM', 'Saint-Pierre-et-Miquelon');
-insert into llx_c_pays (rowid,code,libelle) values (194, 'VC', 'Saint-Vincent-et-les-Grenadines');
-insert into llx_c_pays (rowid,code,libelle) values (195, 'WS', 'Samoa'         );
-insert into llx_c_pays (rowid,code,libelle) values (196, 'SM', 'Saint-Marin'   );
-insert into llx_c_pays (rowid,code,libelle) values (197, 'ST', 'Sao Tomé-et-Principe');
-insert into llx_c_pays (rowid,code,libelle) values (198, 'RS', 'Serbie'        );
-insert into llx_c_pays (rowid,code,libelle) values (199, 'SC', 'Seychelles'    );
-insert into llx_c_pays (rowid,code,libelle) values (200, 'SL', 'Sierra Leone'  );
-insert into llx_c_pays (rowid,code,libelle) values (201, 'SK', 'Slovaquie'     );
-insert into llx_c_pays (rowid,code,libelle) values (202, 'SI', 'Slovénie'      );
-insert into llx_c_pays (rowid,code,libelle) values (203, 'SB', 'Iles Salomon'  );
-insert into llx_c_pays (rowid,code,libelle) values (204, 'SO', 'Somalie'       );
-insert into llx_c_pays (rowid,code,libelle) values (205, 'ZA', 'Afrique du Sud');
-insert into llx_c_pays (rowid,code,libelle) values (206, 'GS', 'Iles Géorgie du Sud et Sandwich du Sud');
-insert into llx_c_pays (rowid,code,libelle) values (207, 'LK', 'Sri Lanka'     );
-insert into llx_c_pays (rowid,code,libelle) values (208, 'SD', 'Soudan'        );
-insert into llx_c_pays (rowid,code,libelle) values (209, 'SR', 'Suriname'      );
-insert into llx_c_pays (rowid,code,libelle) values (210, 'SJ', 'Iles Svalbard et Jan Mayen');
-insert into llx_c_pays (rowid,code,libelle) values (211, 'SZ', 'Swaziland'     );
-insert into llx_c_pays (rowid,code,libelle) values (212, 'SY', 'Syrie'         );
-insert into llx_c_pays (rowid,code,libelle) values (213, 'TW', 'Taïwan'        );
-insert into llx_c_pays (rowid,code,libelle) values (214, 'TJ', 'Tadjikistan'   );
-insert into llx_c_pays (rowid,code,libelle) values (215, 'TZ', 'Tanzanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (216, 'TH', 'Thaïlande'     );
-insert into llx_c_pays (rowid,code,libelle) values (217, 'TL', 'Timor Oriental');
-insert into llx_c_pays (rowid,code,libelle) values (218, 'TK', 'Tokélaou'      );
-insert into llx_c_pays (rowid,code,libelle) values (219, 'TO', 'Tonga'         );
-insert into llx_c_pays (rowid,code,libelle) values (220, 'TT', 'Trinité-et-Tobago');
-insert into llx_c_pays (rowid,code,libelle) values (221, 'TR', 'Turquie'       );
-insert into llx_c_pays (rowid,code,libelle) values (222, 'TM', 'Turkménistan'  );
-insert into llx_c_pays (rowid,code,libelle) values (223, 'TC', 'Iles Turks-et-Caicos');
-insert into llx_c_pays (rowid,code,libelle) values (224, 'TV', 'Tuvalu'        );
-insert into llx_c_pays (rowid,code,libelle) values (225, 'UG', 'Ouganda'       );
-insert into llx_c_pays (rowid,code,libelle) values (226, 'UA', 'Ukraine'       );
-insert into llx_c_pays (rowid,code,libelle) values (227, 'AE', 'Émirats arabes unis');
-insert into llx_c_pays (rowid,code,libelle) values (228, 'UM', 'Iles mineures éloignées des États-Unis');
-insert into llx_c_pays (rowid,code,libelle) values (229, 'UY', 'Uruguay'       );
-insert into llx_c_pays (rowid,code,libelle) values (230, 'UZ', 'Ouzbékistan'   );
-insert into llx_c_pays (rowid,code,libelle) values (231, 'VU', 'Vanuatu'       );
-insert into llx_c_pays (rowid,code,libelle) values (232, 'VE', 'Vénézuela'     );
-insert into llx_c_pays (rowid,code,libelle) values (233, 'VN', 'Viêt Nam'      );
-insert into llx_c_pays (rowid,code,libelle) values (234, 'VG', 'Iles Vierges britanniques');
-insert into llx_c_pays (rowid,code,libelle) values (235, 'VI', 'Iles Vierges américaines');
-insert into llx_c_pays (rowid,code,libelle) values (236, 'WF', 'Wallis-et-Futuna');
-insert into llx_c_pays (rowid,code,libelle) values (237, 'EH', 'Sahara occidental');
-insert into llx_c_pays (rowid,code,libelle) values (238, 'YE', 'Yémen'         );
-insert into llx_c_pays (rowid,code,libelle) values (239, 'ZM', 'Zambie'        );
-insert into llx_c_pays (rowid,code,libelle) values (240, 'ZW', 'Zimbabwe'      );
-insert into llx_c_pays (rowid,code,libelle) values (241, 'GG', 'Guernesey'     );
-insert into llx_c_pays (rowid,code,libelle) values (242, 'IM', 'Ile de Man'    );
-insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey'        );
-insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro'    );
-insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy');
-insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin'  );
-insert into llx_c_pays (rowid,code,libelle) values (247, 'BU', 'Burundi'  );
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index f8cf6e6618f..4415f5711bf 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -32,242 +32,243 @@
 -- Regions
 --
 
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1,0,0,'0',0,'-');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 0,   0,    '0',0,'-');
 
 -- Regions France (id country=1)
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 101, 1,   1,'97105',3,'Guadeloupe');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 102, 1,   2,'97209',3,'Martinique');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 103, 1,   3,'97302',3,'Guyane');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 104, 1,   4,'97411',3,'Réunion');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 105, 1,  11,'75056',1,'Île-de-France');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 106, 1,  21,'51108',0,'Champagne-Ardenne');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 107, 1,  22,'80021',0,'Picardie');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 108, 1,  23,'76540',0,'Haute-Normandie');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 109, 1,  24,'45234',2,'Centre');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 110, 1,  25,'14118',0,'Basse-Normandie');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 111, 1,  26,'21231',0,'Bourgogne');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 112, 1,  31,'59350',2,'Nord-Pas-de-Calais');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 113, 1,  41,'57463',0,'Lorraine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 114, 1,  42,'67482',1,'Alsace');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 115, 1,  43,'25056',0,'Franche-Comté');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 116, 1,  52,'44109',4,'Pays de la Loire');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 117, 1,  53,'35238',0,'Bretagne');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 118, 1,  54,'86194',2,'Poitou-Charentes');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 119, 1,  72,'33063',1,'Aquitaine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 120, 1,  73,'31555',0,'Midi-Pyrénées');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 121, 1,  74,'87085',2,'Limousin');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 122, 1,  82,'69123',2,'Rhône-Alpes');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 123, 1,  83,'63113',1,'Auvergne');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 124, 1,  91,'34172',2,'Languedoc-Roussillon');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 125, 1,  93,'13055',0,'Provence-Alpes-Côte d''Azur');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 126, 1,  94,'2A004',0,'Corse');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,   1,'97105',3,'Guadeloupe');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,   2,'97209',3,'Martinique');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,   3,'97302',3,'Guyane');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,   4,'97411',3,'Réunion');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,   6,'',3,'Mayotte');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  11,'75056',1,'Île-de-France');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  21,'51108',0,'Champagne-Ardenne');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  22,'80021',0,'Picardie');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  23,'76540',0,'Haute-Normandie');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  24,'45234',2,'Centre');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  25,'14118',0,'Basse-Normandie');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  26,'21231',0,'Bourgogne');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  31,'59350',2,'Nord-Pas-de-Calais');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  41,'57463',0,'Lorraine');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  42,'67482',1,'Alsace');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  43,'25056',0,'Franche-Comté');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  52,'44109',4,'Pays de la Loire');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  53,'35238',0,'Bretagne');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  54,'86194',2,'Poitou-Charentes');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  72,'33063',1,'Aquitaine');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  73,'31555',0,'Midi-Pyrénées');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  74,'87085',2,'Limousin');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  82,'69123',2,'Rhône-Alpes');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  83,'63113',1,'Auvergne');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  91,'34172',2,'Languedoc-Roussillon');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  93,'13055',0,'Provence-Alpes-Côte d''Azur');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1,  94,'2A004',0,'Corse');
 
 -- Regions Belgium (id country=2)
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 201, 2, 201,     '',1,'Flandre');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 202, 2, 202,     '',2,'Wallonie');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 203, 2, 203,     '',3,'Bruxelles-Capitale');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 2, 201,     '',1,'Flandre');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 2, 202,     '',2,'Wallonie');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 2, 203,     '',3,'Bruxelles-Capitale');
 
 -- Regions Italy (id country=3)
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (301, 3, 301, NULL, 1, 'Abruzzo');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (302, 3, 302, NULL, 1, 'Basilicata');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (303, 3, 303, NULL, 1, 'Calabria');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (304, 3, 304, NULL, 1, 'Campania');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (305, 3, 305, NULL, 1, 'Emilia-Romagna');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (306, 3, 306, NULL, 1, 'Friuli-Venezia Giulia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (307, 3, 307, NULL, 1, 'Lazio');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (308, 3, 308, NULL, 1, 'Liguria');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (309, 3, 309, NULL, 1, 'Lombardia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (310, 3, 310, NULL, 1, 'Marche');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (311, 3, 311, NULL, 1, 'Molise');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (312, 3, 312, NULL, 1, 'Piemonte');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (313, 3, 313, NULL, 1, 'Puglia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (314, 3, 314, NULL, 1, 'Sardegna');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (315, 3, 315, NULL, 1, 'Sicilia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (316, 3, 316, NULL, 1, 'Toscana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (317, 3, 317, NULL, 1, 'Trentino-Alto Adige');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (318, 3, 318, NULL, 1, 'Umbria');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (319, 3, 319, NULL, 1, 'Valle d Aosta');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (320, 3, 320, NULL, 1, 'Veneto');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 301, NULL, 1, 'Abruzzo');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 302, NULL, 1, 'Basilicata');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 303, NULL, 1, 'Calabria');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 304, NULL, 1, 'Campania');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 305, NULL, 1, 'Emilia-Romagna');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 306, NULL, 1, 'Friuli-Venezia Giulia');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 307, NULL, 1, 'Lazio');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 308, NULL, 1, 'Liguria');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 309, NULL, 1, 'Lombardia');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 310, NULL, 1, 'Marche');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 311, NULL, 1, 'Molise');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 312, NULL, 1, 'Piemonte');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 313, NULL, 1, 'Puglia');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 314, NULL, 1, 'Sardegna');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 315, NULL, 1, 'Sicilia');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 316, NULL, 1, 'Toscana');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 317, NULL, 1, 'Trentino-Alto Adige');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 318, NULL, 1, 'Umbria');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 319, NULL, 1, 'Valle d Aosta');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 320, NULL, 1, 'Veneto');
 
 -- Regions Spain (id country=4)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (401,  4, 401, '', 0, 'Andalucia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (402,  4, 402, '', 0, 'Aragón', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (403,  4, 403, '', 0, 'Castilla y León', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (404,  4, 404, '', 0, 'Castilla la Mancha', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (405,  4, 405, '', 0, 'Canarias', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (406,  4, 406, '', 0, 'Cataluña', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (407,  4, 407, '', 0, 'Comunidad de Ceuta', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (408,  4, 408, '', 0, 'Comunidad Foral de Navarra', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (409,  4, 409, '', 0, 'Comunidad de Melilla', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (410,  4, 410, '', 0, 'Cantabria', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (411,  4, 411, '', 0, 'Comunidad Valenciana', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (412,  4, 412, '', 0, 'Extemadura', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (413,  4, 413, '', 0, 'Galicia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (414,  4, 414, '', 0, 'Islas Baleares', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (415,  4, 415, '', 0, 'La Rioja', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (416,  4, 416, '', 0, 'Comunidad de Madrid', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (417,  4, 417, '', 0, 'Región de Murcia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (418,  4, 418, '', 0, 'Principado de Asturias', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (419,  4, 419, '', 0, 'Pais Vasco', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (420,  4, 420, '', 0, 'Otros', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 401, '', 0, 'Andalucia', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 402, '', 0, 'Aragón', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 403, '', 0, 'Castilla y León', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 404, '', 0, 'Castilla la Mancha', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 405, '', 0, 'Canarias', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 406, '', 0, 'Cataluña', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 407, '', 0, 'Comunidad de Ceuta', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 408, '', 0, 'Comunidad Foral de Navarra', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 409, '', 0, 'Comunidad de Melilla', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 410, '', 0, 'Cantabria', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 411, '', 0, 'Comunidad Valenciana', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 412, '', 0, 'Extemadura', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 413, '', 0, 'Galicia', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 414, '', 0, 'Islas Baleares', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 415, '', 0, 'La Rioja', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 416, '', 0, 'Comunidad de Madrid', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 417, '', 0, 'Región de Murcia', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 418, '', 0, 'Principado de Asturias', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 419, '', 0, 'Pais Vasco', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  4, 420, '', 0, 'Otros', 1);
 
 -- Regions Germany (id country=5) 
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (501,  5, 501, '', 0, 'Deutschland', 1); 
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  5, 501, '', 0, 'Deutschland', 1); 
 
 -- Regions Greece (id_country=102)
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10201, 10201, 102, NULL, NULL, 'Αττική', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10202, 10202, 102, NULL, NULL, 'Στερεά Ελλάδα', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10203, 10203, 102, NULL, NULL, 'Κεντρική Μακεδονία', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10204, 10204, 102, NULL, NULL, 'Κρήτη', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10205, 10205, 102, NULL, NULL, 'Ανατολική Μακεδονία και Θράκη', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10206, 10206, 102, NULL, NULL, 'Ήπειρος', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10207, 10207, 102, NULL, NULL, 'Ιόνια νησιά', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10208, 10208, 102, NULL, NULL, 'Βόρειο Αιγαίο', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10209, 10209, 102, NULL, NULL, 'Πελοπόννησος', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10210, 10210, 102, NULL, NULL, 'Νότιο Αιγαίο', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10211, 10211, 102, NULL, NULL, 'Δυτική Ελλάδα', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10212, 10212, 102, NULL, NULL, 'Θεσσαλία', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10213, 10213, 102, NULL, NULL, 'Δυτική Μακεδονία', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10201, 102, NULL, NULL, 'Αττική', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10202, 102, NULL, NULL, 'Στερεά Ελλάδα', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10203, 102, NULL, NULL, 'Κεντρική Μακεδονία', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10204, 102, NULL, NULL, 'Κρήτη', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10205, 102, NULL, NULL, 'Ανατολική Μακεδονία και Θράκη', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10206, 102, NULL, NULL, 'Ήπειρος', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10207, 102, NULL, NULL, 'Ιόνια νησιά', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10208, 102, NULL, NULL, 'Βόρειο Αιγαίο', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10209, 102, NULL, NULL, 'Πελοπόννησος', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10210, 102, NULL, NULL, 'Νότιο Αιγαίο', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10211, 102, NULL, NULL, 'Δυτική Ελλάδα', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10212, 102, NULL, NULL, 'Θεσσαλία', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10213, 102, NULL, NULL, 'Δυτική Μακεδονία', 1);
 
 -- Regions Switzerland (id country=6) 
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601,  6, 601, '', 1, 'Cantons', 1); 
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  6, 601, '', 1, 'Cantons', 1); 
 
 -- Regions England (id_country=7)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (701,  7, 701, '', 0, 'England', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (702,  7, 702, '', 0, 'Wales', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (703,  7, 703, '', 0, 'Scotland', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (704,  7, 704, '', 0, 'Northern Ireland', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  7, 701, '', 0, 'England', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  7, 702, '', 0, 'Wales', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  7, 703, '', 0, 'Scotland', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  7, 704, '', 0, 'Northern Ireland', 1);
 
 -- Regions Tunisia (id country=10)
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1003,10,1003, '',0,'Ben Arous');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1004,10,1004, '',0,'Bizerte');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1005,10,1005, '',0,'Gabès');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1006,10,1006, '',0,'Gafsa');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1007,10,1007, '',0,'Jendouba');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1008,10,1008, '',0,'Kairouan');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1009,10,1009, '',0,'Kasserine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1010,10,1010, '',0,'Kébili');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1011,10,1011, '',0,'La Manouba');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1012,10,1012, '',0,'Le Kef');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1013,10,1013, '',0,'Mahdia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1014,10,1014, '',0,'Médenine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1015,10,1015, '',0,'Monastir');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1016,10,1016, '',0,'Nabeul');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1017,10,1017, '',0,'Sfax');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1018,10,1018, '',0,'Sidi Bouzid');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1019,10,1019, '',0,'Siliana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1020,10,1020, '',0,'Sousse');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1021,10,1021, '',0,'Tataouine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1022,10,1022, '',0,'Tozeur');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1023,10,1023, '',0,'Tunis');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1024,10,1024, '',0,'Zaghouan');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1001, '',0,'Ariana');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1002, '',0,'Béja');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1003, '',0,'Ben Arous');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1004, '',0,'Bizerte');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1005, '',0,'Gabès');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1006, '',0,'Gafsa');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1007, '',0,'Jendouba');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1008, '',0,'Kairouan');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1009, '',0,'Kasserine');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1010, '',0,'Kébili');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1011, '',0,'La Manouba');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1012, '',0,'Le Kef');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1013, '',0,'Mahdia');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1014, '',0,'Médenine');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1015, '',0,'Monastir');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1016, '',0,'Nabeul');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1017, '',0,'Sfax');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1018, '',0,'Sidi Bouzid');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1019, '',0,'Siliana');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1020, '',0,'Sousse');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1021, '',0,'Tataouine');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1022, '',0,'Tozeur');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1023, '',0,'Tunis');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1024, '',0,'Zaghouan');
 
 -- Region US (id country=11)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 11, 1101, '', 0, 'United-States', 1);
 
 -- Region Canada (id country=14)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1401, 14, 1401, '', 0, 'Canada', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 14, 1401, '', 0, 'Canada', 1);
 
 -- Regions The Netherlands (id country=17)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1701, 17, 1701, '', 0,'Provincies van Nederland ', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 17, 1701, '', 0,'Provincies van Nederland ', 1);
 
 -- Regions Argentina (id country=23)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2301, 23, 2301, '', 0, 'Norte', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2302, 23, 2302, '', 0, 'Litoral', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2303, 23, 2303, '', 0, 'Cuyana', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2304, 23, 2304, '', 0, 'Central', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2305, 23, 2305, '', 0, 'Patagonia', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2301, '', 0, 'Norte', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2302, '', 0, 'Litoral', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2303, '', 0, 'Cuyana', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2304, '', 0, 'Central', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2305, '', 0, 'Patagonia', 1);
 
 -- Regions Australia (id country=28)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2801, 28, 2801, '', 0, 'Australia', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 28, 2801, '', 0, 'Australia', 1);
 
 -- Regions Brazil (id country=56)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (5601, 56, 5601, '', 0, 'Brasil', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 56, 5601, '', 0, 'Brasil', 1);
 
 -- Regions Colombie (id country=70)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (7001,  70, 7001, '', 0, 'Colombie', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  70, 7001, '', 0, 'Colombie', 1);
 
 -- Regions Chile (id country=67)
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6701, 67, NULL, NULL, 'Tarapacá', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6702, 67, NULL, NULL, 'Antofagasta', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6703, 67, NULL, NULL, 'Atacama', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6704, 67, NULL, NULL, 'Coquimbo', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6705, 67, NULL, NULL, 'Valparaíso', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6707, 67, NULL, NULL, 'Maule', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6708, 67, NULL, NULL, 'Biobío', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6709, 67, NULL, NULL, 'Raucanía', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6710, 67, NULL, NULL, 'Los Lagos', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6714, 67, NULL, NULL, 'Los Ríos', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
 
 -- Regions San Salvador (id country=86)
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8602, 8602, 86, NULL, NULL, 'Oriental', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8603, 8603, 86, NULL, NULL, 'Occidental', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 8601, 86, NULL, NULL, 'Central', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 8602, 86, NULL, NULL, 'Oriental', 1);
+INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 8603, 86, NULL, NULL, 'Occidental', 1);
 
 -- Regions Honduras (id country=114)
-insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (11401,  114, 11401, '', 0, 'Honduras', 1);
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  114, 11401, '', 0, 'Honduras', 1);
 
 -- Regions India (id country=117)
-insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (11701,  117, 11701, '', 0, 'India', 1);
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  117, 11701, '', 0, 'India', 1);
 
 -- Regions Mauritius (id country=152)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201,  152, 15201, '', 0, 'Rivière Noire', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202,  152, 15202, '', 0, 'Flacq', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15203,  152, 15203, '', 0, 'Grand Port', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15204,  152, 15204, '', 0, 'Moka', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15205,  152, 15205, '', 0, 'Pamplemousses', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15206,  152, 15206, '', 0, 'Plaines Wilhems', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15207,  152, 15207, '', 0, 'Port-Louis', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15208,  152, 15208, '', 0, 'Rivière du Rempart', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15209,  152, 15209, '', 0, 'Savanne', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15210,  152, 15210, '', 0, 'Rodrigues', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15211,  152, 15211, '', 0, 'Les îles Agaléga', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15212,  152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15201, '', 0, 'Rivière Noire', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15202, '', 0, 'Flacq', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15203, '', 0, 'Grand Port', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15204, '', 0, 'Moka', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15205, '', 0, 'Pamplemousses', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15206, '', 0, 'Plaines Wilhems', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15207, '', 0, 'Port-Louis', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15208, '', 0, 'Rivière du Rempart', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15209, '', 0, 'Savanne', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15210, '', 0, 'Rodrigues', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15211, '', 0, 'Les îles Agaléga', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
 
 -- Regions Mexique (id country=154)
-insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (15401,  154, 15401, '', 0, 'Mexique', 1);
+insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  154, 15401, '', 0, 'Mexique', 1);
 
 -- Regions Barbados (id country=46)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (4601,  46, 4601, '', 0, 'Barbados', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  46, 4601, '', 0, 'Barbados', 1);
 
 -- Regions Venezuela (id country=232)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23201,  232, 23201, '', 0, 'Los Andes', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23202,  232, 23202, '', 0, 'Capital', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23203,  232, 23203, '', 0, 'Central', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23204,  232, 23204, '', 0, 'Cento Occidental', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23205,  232, 23205, '', 0, 'Guayana', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23206,  232, 23206, '', 0, 'Insular', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23207,  232, 23207, '', 0, 'Los Llanos', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23208,  232, 23208, '', 0, 'Nor-Oriental', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23209,  232, 23209, '', 0, 'Zuliana', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23201, '', 0, 'Los Andes', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23202, '', 0, 'Capital', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23203, '', 0, 'Central', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23204, '', 0, 'Cento Occidental', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23205, '', 0, 'Guayana', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23206, '', 0, 'Insular', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23207, '', 0, 'Los Llanos', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23208, '', 0, 'Nor-Oriental', 1);
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values (  232, 23209, '', 0, 'Zuliana', 1);
 
 -- Regions Algeria (id country=13)
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1301, 13, 1301, '', 0, 'Algerie', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 13, 1301, '', 0, 'Algerie', 1);
 
 -- Regions Maroc (id country=12)
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1201, 12, 1201, '', 0, 'Tanger-Tétouan', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1202, 12, 1202, '', 0, 'Gharb-Chrarda-Beni Hssen', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1203, 12, 1203, '', 0, 'Taza-Al Hoceima-Taounate', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1204, 12, 1204, '', 0, 'L''Oriental', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1205, 12, 1205, '', 0, 'Fès-Boulemane', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1206, 12, 1206, '', 0, 'Meknès-Tafialet', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1207, 12, 1207, '', 0, 'Rabat-Salé-Zemour-Zaër', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1208, 12, 1208, '', 0, 'Grand Cassablanca', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1209, 12, 1209, '', 0, 'Chaouia-Ouardigha', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1210, 12, 1210, '', 0, 'Doukahla-Adba', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1211, 12, 1211, '', 0, 'Marrakech-Tensift-Al Haouz', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1212, 12, 1212, '', 0, 'Tadla-Azilal', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1213, 12, 1213, '', 0, 'Sous-Massa-Drâa', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1214, 12, 1214, '', 0, 'Guelmim-Es Smara', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1215, 12, 1215, '', 0, 'Laâyoune-Boujdour-Sakia el Hamra', 1);
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1216, 12, 1216, '', 0, 'Oued Ed-Dahab Lagouira', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1201, '', 0, 'Tanger-Tétouan', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1202, '', 0, 'Gharb-Chrarda-Beni Hssen', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1203, '', 0, 'Taza-Al Hoceima-Taounate', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1204, '', 0, 'L''Oriental', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1205, '', 0, 'Fès-Boulemane', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1206, '', 0, 'Meknès-Tafialet', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1207, '', 0, 'Rabat-Salé-Zemour-Zaër', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1208, '', 0, 'Grand Cassablanca', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1209, '', 0, 'Chaouia-Ouardigha', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1210, '', 0, 'Doukahla-Adba', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1211, '', 0, 'Marrakech-Tensift-Al Haouz', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1212, '', 0, 'Tadla-Azilal', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1213, '', 0, 'Sous-Massa-Drâa', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1214, '', 0, 'Guelmim-Es Smara', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1215, '', 0, 'Laâyoune-Boujdour-Sakia el Hamra', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1216, '', 0, 'Oued Ed-Dahab Lagouira', 1);
 
 -- Regions Tunisia (id country=10)
-INSERT INTO  llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1001, 10, 1001, '', 0, 'Algerie', 1);
+INSERT INTO  llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 10, 1001, '', 0, 'Algerie', 1);
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 739b1d1f537..116f9572052 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -32,7 +32,7 @@
 -- Departements/Cantons/Provinces
 --
 
-insert into llx_c_departements (rowid, fk_region, code_departement,cheflieu,tncc,ncc,nom) values (0,0,'0','0',0,'-','-');
+insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values ( 0, '0',    '0',0,'-','-');
 
 -- Departements France (id country=1)
 insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (82,'01','01053',5,'AIN','Ain');
diff --git a/htdocs/install/mysql/data/llx_accounting.sql b/htdocs/install/mysql/data/llx_accounting.sql
index 3fc66e39b92..afc70f08a9f 100644
--- a/htdocs/install/mysql/data/llx_accounting.sql
+++ b/htdocs/install/mysql/data/llx_accounting.sql
@@ -27,8 +27,8 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-DELETE FROM llx_accountingaccount;
-DELETE FROM llx_accounting_system;
+delete from llx_accountingaccount;
+delete from llx_accounting_system;
 
 --
 -- Descriptif des plans comptables FR PCG99-ABREGE
@@ -1420,3 +1420,792 @@ INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype,
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1355, 'PCMN-BASE', 'FINAN', 'XXXXXX', '5', '', 'Placement de trésorerie et de valeurs disponibles', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1356, 'PCMN-BASE', 'CHARGE', 'XXXXXX', '6', '', 'Charges', '1');
 INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (1357, 'PCMN-BASE', 'PROD', 'XXXXXX', '7', '', 'Produits', '1');
+
+--
+-- Descriptif des plans comptables ES PCG08-PYME
+--
+
+INSERT INTO llx_accounting_system (rowid, pcg_version, fk_pays, label, active) VALUES (4, 'PCG08-PYME', '4', 'The PYME accountancy spanish plan', '1');
+
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4001,'PCG08-PYME','FINANCIACION', 'XXXXXX', '1', '', 'Financiación básica', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4002,'PCG08-PYME','ACTIVO',  'XXXXXX', '2', '', 'Activo no corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4003,'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '3', '', 'Existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4004,'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4', '', 'Acreedores y deudores por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4005,'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5', '', 'Cuentas financieras', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4006,'PCG08-PYME','COMPRAS_GASTOS','XXXXXX', '6', '', 'Compras y gastos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4007,'PCG08-PYME','VENTAS_E_INGRESOS',  'XXXXXX', '7', '', 'Ventas e ingresos', '1');
+
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4008, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '10', '4001', 'CAPITAL', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4009, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '100', '4008', 'Capital social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4010, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '101', '4008', 'Fondo social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4011, 'PCG08-PYME','FINANCIACION', 'CAPITAL', '102', '4008', 'Capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4012, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '103', '4008', 'Socios por desembolsos no exigidos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4013, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1030', '4012', 'Socios por desembolsos no exigidos capital social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4014, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1034', '4012', 'Socios por desembolsos no exigidos capital pendiente de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4015, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '104', '4008', 'Socios por aportaciones no dineradas pendientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4016, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1040', '4015', 'Socios por aportaciones no dineradas pendientes capital social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4017, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1044', '4015', 'Socios por aportaciones no dineradas pendientes capital pendiente de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4018, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '108', '4008', 'Acciones o participaciones propias en situaciones especiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4019, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '109', '4008', 'Acciones o participaciones propias para reducción de capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4020, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '11', '4001', 'Reservas y otros instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4021, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '110', '4020', 'Prima de emisión o asunción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4022, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '111', '4020', 'Otros instrumentos de patrimonio neto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4023, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1110', '4022', 'Patrimonio neto por emisión de instrumentos financieros compuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4024, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1111', '4022', 'Resto de instrumentos de patrimoio neto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4025, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '112', '4020', 'Reserva legal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4026, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '113', '4020', 'Reservas voluntarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4027, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '114', '4020', 'Reservas especiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4028, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1140', '4027', 'Reservas para acciones o participaciones de la sociedad dominante', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4029, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1141', '4027', 'Reservas estatutarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4030, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1142', '4027', 'Reservas por capital amortizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4031, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1143', '4027', 'Reservas por fondo de comercio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4032, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1144', '4028', 'Reservas por acciones propias aceptadas en garantía', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4033, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '115', '4020', 'Reservas por pérdidas y ganancias actuariales y otros ajustes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4034, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '118', '4020', 'Aportaciones de socios o propietarios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4035, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '119', '4020', 'Diferencias por ajuste del capital a euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4036, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '12', '4001', 'Resultados pendientes de aplicación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4037, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '120', '4036', 'Remanente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4038, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '121', '4036', 'Resultados negativos de ejercicios anteriores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4039, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '129', '4036', 'Resultado del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4040, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '13', '4001', 'Subvenciones, donaciones y ajustes por cambio de valor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4041, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '130', '4040', 'Subvenciones oficiales de capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4042, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '131', '4040', 'Donaciones y legados de capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4043, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '132', '4040', 'Otras subvenciones, donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4044, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '133', '4040', 'Ajustes por valoración en activos financieros disponibles para la venta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4045, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '134', '4040', 'Operaciones de cobertura', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4046, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1340', '4045', 'Cobertura de flujos de efectivo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4047, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1341', '4045', 'Cobertura de una inversión neta en un negocio extranjero', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4048, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '135', '4040', 'Diferencias de conversión', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4049, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '136', '4040', 'Ajustes por valoración en activos no corrientes y grupos enajenables de elementos mantenidos para la venta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4050, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '137', '4040', 'Ingresos fiscales a distribuir en varios ejercicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4051, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1370', '4050', 'Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4052, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1371', '4050', 'Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4053, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '14', '4001', 'Provisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4054, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '141', '4053', 'Provisión para impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4055, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '142', '4053', 'Provisión para otras responsabilidades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4056, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '143', '4053', 'Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4057, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '145', '4053', 'Provisión para actuaciones medioambientales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4058, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '15', '4001', 'Deudas a largo plazo con características especiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4059, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '150', '4058', 'Acciones o participaciones a largo plazo consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4060, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '153', '4058', 'Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4061, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1533', '4060', 'Desembolsos no exigidos empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4062, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1534', '4060', 'Desembolsos no exigidos empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4063, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1535', '4060', 'Desembolsos no exigidos otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4064, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1536', '4060', 'Otros desembolsos no exigidos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4065, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '154', '4058', 'Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4066, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1543', '4065', 'Aportaciones no dinerarias pendientes empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4067, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1544', '4065', 'Aportaciones no dinerarias pendientes empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4068, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1545', '4065', 'Aportaciones no dinerarias pendientes otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4069, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1546', '4065', 'Otras aportaciones no dinerarias pendientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4070, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '16', '4001', 'Deudas a largo plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4071, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '160', '4070', 'Deudas a largo plazo con entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4072, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1603', '4071', 'Deudas a largo plazo con entidades de crédito empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4073, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1604', '4071', 'Deudas a largo plazo con entidades de crédito empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4074, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1605', '4071', 'Deudas a largo plazo con otras entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4075, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '161', '4070', 'Proveedores de inmovilizado a largo plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4076, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1613', '4075', 'Proveedores de inmovilizado a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4077, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1614', '4075', 'Proveedores de inmovilizado a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4078, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1615', '4075', 'Proveedores de inmovilizado a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4079, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '162', '4070', 'Acreedores por arrendamiento financiero a largo plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4080, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1623', '4079', 'Acreedores por arrendamiento financiero a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4081, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1624', '4080', 'Acreedores por arrendamiento financiero a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4082, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1625', '4080', 'Acreedores por arrendamiento financiero a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4083, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '163', '4070', 'Otras deudas a largo plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4084, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1633', '4083', 'Otras deudas a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4085, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1634', '4083', 'Otras deudas a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4086, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1635', '4083', 'Otras deudas a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4087, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '17', '4001', 'Deudas a largo plazo por préstamos recibidos empresitos y otros conceptos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4088, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '170', '4087', 'Deudas a largo plazo con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4089, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '171', '4087', 'Deudas a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4090, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '172', '4087', 'Deudas a largo plazo transformables en suvbenciones donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4091, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '173', '4087', 'Proveedores de inmovilizado a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4092, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '174', '4087', 'Acreedores por arrendamiento financiero a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4093, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '175', '4087', 'Efectos a pagar a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4094, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '176', '4087', 'Pasivos por derivados financieros a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4095, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '177', '4087', 'Obligaciones y bonos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4096, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '179', '4087', 'Deudas representadas en otros valores negociables', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4097, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '18', '4001', 'Pasivos por fianzas garantias y otros conceptos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4098, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '180', '4097', 'Fianzas recibidas a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4099, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '181', '4097', 'Anticipos recibidos por ventas o prestaciones de servicios a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4100, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '185', '4097', 'Depositos recibidos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4101, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '19', '4001', 'Situaciones transitorias de financiación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4102, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '190', '4101', 'Acciones o participaciones emitidas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4103, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '192', '4101', 'Suscriptores de acciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4104, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '194', '4101', 'Capital emitido pendiente de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4105, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '195', '4101', 'Acciones o participaciones emitidas consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4106, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '197', '4101', 'Suscriptores de acciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4107, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '199', '4101', 'Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4108, 'PCG08-PYME','ACTIVO', 'XXXXXX', '20', '4002', 'Inmovilizaciones intangibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4109, 'PCG08-PYME','ACTIVO', 'XXXXXX', '200', '4108', 'Investigación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4110, 'PCG08-PYME','ACTIVO', 'XXXXXX', '201', '4108', 'Desarrollo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4111, 'PCG08-PYME','ACTIVO', 'XXXXXX', '202', '4108', 'Concesiones administrativas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4112, 'PCG08-PYME','ACTIVO', 'XXXXXX', '203', '4108', 'Propiedad industrial', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4113, 'PCG08-PYME','ACTIVO', 'XXXXXX', '205', '4108', 'Derechos de transpaso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4114, 'PCG08-PYME','ACTIVO', 'XXXXXX', '206', '4108', 'Aplicaciones informáticas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4115, 'PCG08-PYME','ACTIVO', 'XXXXXX', '209', '4108', 'Anticipos para inmovilizaciones intangibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4116, 'PCG08-PYME','ACTIVO', 'XXXXXX', '21', '4002', 'Inmovilizaciones materiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4117, 'PCG08-PYME','ACTIVO', 'XXXXXX', '210', '4116', 'Terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4118, 'PCG08-PYME','ACTIVO', 'XXXXXX', '211', '4116', 'Construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4119, 'PCG08-PYME','ACTIVO', 'XXXXXX', '212', '4116', 'Instalaciones técnicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4120, 'PCG08-PYME','ACTIVO', 'XXXXXX', '213', '4116', 'Maquinaria', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4121, 'PCG08-PYME','ACTIVO', 'XXXXXX', '214', '4116', 'Utillaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4122, 'PCG08-PYME','ACTIVO', 'XXXXXX', '215', '4116', 'Otras instalaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4123, 'PCG08-PYME','ACTIVO', 'XXXXXX', '216', '4116', 'Mobiliario', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4124, 'PCG08-PYME','ACTIVO', 'XXXXXX', '217', '4116', 'Equipos para procesos de información', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4125, 'PCG08-PYME','ACTIVO', 'XXXXXX', '218', '4116', 'Elementos de transporte', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4126, 'PCG08-PYME','ACTIVO', 'XXXXXX', '219', '4116', 'Otro inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4127, 'PCG08-PYME','ACTIVO', 'XXXXXX', '22', '4002', 'Inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4128, 'PCG08-PYME','ACTIVO', 'XXXXXX', '220', '4127', 'Inversiones en terreons y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4129, 'PCG08-PYME','ACTIVO', 'XXXXXX', '221', '4127', 'Inversiones en construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4130, 'PCG08-PYME','ACTIVO', 'XXXXXX', '23', '4002', 'Inmovilizaciones materiales en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4131, 'PCG08-PYME','ACTIVO', 'XXXXXX', '230', '4130', 'Adaptación de terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4132, 'PCG08-PYME','ACTIVO', 'XXXXXX', '231', '4130', 'Construcciones en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4133, 'PCG08-PYME','ACTIVO', 'XXXXXX', '232', '4130', 'Instalaciones técnicas en montaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4134, 'PCG08-PYME','ACTIVO', 'XXXXXX', '233', '4130', 'Maquinaria en montaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4135, 'PCG08-PYME','ACTIVO', 'XXXXXX', '237', '4130', 'Equipos para procesos de información en montaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4136, 'PCG08-PYME','ACTIVO', 'XXXXXX', '239', '4130', 'Anticipos para inmovilizaciones materiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4137, 'PCG08-PYME','ACTIVO', 'XXXXXX', '24', '4002', 'Inversiones financieras a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4138, 'PCG08-PYME','ACTIVO', 'XXXXXX', '240', '4137', 'Participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4139, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2403', '4138', 'Participaciones a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4140, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2404', '4138', 'Participaciones a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4141, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2405', '4138', 'Participaciones a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4142, 'PCG08-PYME','ACTIVO', 'XXXXXX', '241', '4137', 'Valores representativos de deuda a largo plazo de partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4143, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2413', '4142', 'Valores representativos de deuda a largo plazo de empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4144, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2414', '4142', 'Valores representativos de deuda a largo plazo de empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4145, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2415', '4142', 'Valores representativos de deuda a largo plazo de otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4146, 'PCG08-PYME','ACTIVO', 'XXXXXX', '242', '4137', 'Créditos a largo plazo a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4147, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2423', '4146', 'Créditos a largo plazo a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4148, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2424', '4146', 'Créditos a largo plazo a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4149, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2425', '4146', 'Créditos a largo plazo a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4150, 'PCG08-PYME','ACTIVO', 'XXXXXX', '249', '4137', 'Desembolsos pendientes sobre participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4151, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2493', '4150', 'Desembolsos pendientes sobre participaciones a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4152, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2494', '4150', 'Desembolsos pendientes sobre participaciones a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4153, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2495', '4150', 'Desembolsos pendientes sobre participaciones a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4154, 'PCG08-PYME','ACTIVO', 'XXXXXX', '25', '4002', 'Otras inversiones financieras a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4155, 'PCG08-PYME','ACTIVO', 'XXXXXX', '250', '4154', 'Inversiones financieras a largo plazo en instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4156, 'PCG08-PYME','ACTIVO', 'XXXXXX', '251', '4154', 'Valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4157, 'PCG08-PYME','ACTIVO', 'XXXXXX', '252', '4154', 'Créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4158, 'PCG08-PYME','ACTIVO', 'XXXXXX', '253', '4154', 'Créditos a largo plazo por enajenación de inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4159, 'PCG08-PYME','ACTIVO', 'XXXXXX', '254', '4154', 'Créditos a largo plazo al personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4160, 'PCG08-PYME','ACTIVO', 'XXXXXX', '255', '4154', 'Activos por derivados financieros a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4161, 'PCG08-PYME','ACTIVO', 'XXXXXX', '258', '4154', 'Imposiciones a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4162, 'PCG08-PYME','ACTIVO', 'XXXXXX', '259', '4154', 'Desembolsos pendientes sobre participaciones en el patrimonio neto a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4163, 'PCG08-PYME','ACTIVO', 'XXXXXX', '26', '4002', 'Fianzas y depósitos constituidos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4164, 'PCG08-PYME','ACTIVO', 'XXXXXX', '260', '4163', 'Fianzas constituidas a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4165, 'PCG08-PYME','ACTIVO', 'XXXXXX', '261', '4163', 'Depósitos constituidos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4166, 'PCG08-PYME','ACTIVO', 'XXXXXX', '28', '4002', 'Amortización acumulada del inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4167, 'PCG08-PYME','ACTIVO', 'XXXXXX', '280', '4166', 'Amortización acumulado del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4168, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2800', '4167', 'Amortización acumulada de investigación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4169, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2801', '4167', 'Amortización acumulada de desarrollo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4170, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2802', '4167', 'Amortización acumulada de concesiones administrativas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4171, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2803', '4167', 'Amortización acumulada de propiedad industrial', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4172, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2805', '4167', 'Amortización acumulada de derechos de transpaso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4173, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2806', '4167', 'Amortización acumulada de aplicaciones informáticas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4174, 'PCG08-PYME','ACTIVO', 'XXXXXX', '281', '4166', 'Amortización acumulado del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4175, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2811', '4174', 'Amortización acumulada de construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4176, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2812', '4174', 'Amortización acumulada de instalaciones técnicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4177, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2813', '4174', 'Amortización acumulada de maquinaria', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4178, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2814', '4174', 'Amortización acumulada de utillaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4179, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2815', '4174', 'Amortización acumulada de otras instalaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4180, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2816', '4174', 'Amortización acumulada de mobiliario', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4181, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2817', '4174', 'Amortización acumulada de equipos para proceso de información', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4182, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2818', '4174', 'Amortización acumulada de elementos de transporte', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4183, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2819', '4175', 'Amortización acumulada de otro inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4184, 'PCG08-PYME','ACTIVO', 'XXXXXX', '282', '4166', 'Amortización acumulada de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4185, 'PCG08-PYME','ACTIVO', 'XXXXXX', '29', '4002', 'Deterioro de valor de activos no corrientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4186, 'PCG08-PYME','ACTIVO', 'XXXXXX', '290', '4185', 'Deterioro de valor del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4187, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2900', '4186', 'Deterioro de valor de investigación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4188, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2901', '4186', 'Deterioro de valor de desarrollo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4189, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2902', '4186', 'Deterioro de valor de concesiones administrativas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4190, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2903', '4186', 'Deterioro de valor de propiedad industrial', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4191, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2905', '4186', 'Deterioro de valor de derechos de transpaso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4192, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2906', '4186', 'Deterioro de valor de aplicaciones informáticas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4193, 'PCG08-PYME','ACTIVO', 'XXXXXX', '291', '4185', 'Deterioro de valor del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4194, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2910', '4193', 'Deterioro de valor de terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4195, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2911', '4193', 'Deterioro de valor de construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4196, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2912', '4193', 'Deterioro de valor de instalaciones técnicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4197, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2913', '4193', 'Deterioro de valor de maquinaria', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4198, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2914', '4193', 'Deterioro de valor de utillajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4199, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2915', '4194', 'Deterioro de valor de otras instalaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4200, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2916', '4194', 'Deterioro de valor de mobiliario', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4201, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2917', '4194', 'Deterioro de valor de equipos para proceso de información', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4202, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2918', '4194', 'Deterioro de valor de elementos de transporte', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4203, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2919', '4194', 'Deterioro de valor de otro inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4204, 'PCG08-PYME','ACTIVO', 'XXXXXX', '292', '4185', 'Deterioro de valor de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4205, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2920', '4204', 'Deterioro de valor de terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4206, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2921', '4204', 'Deterioro de valor de construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4207, 'PCG08-PYME','ACTIVO', 'XXXXXX', '293', '4185', 'Deterioro de valor de participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4208, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2933', '4207', 'Deterioro de valor de participaciones a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4209, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2934', '4207', 'Deterioro de valor de sobre participaciones a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4210, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2935', '4207', 'Deterioro de valor de sobre participaciones a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4211, 'PCG08-PYME','ACTIVO', 'XXXXXX', '294', '4185', 'Deterioro de valor de valores representativos de deuda a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4212, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2943', '4211', 'Deterioro de valor de valores representativos de deuda a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4213, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2944', '4211', 'Deterioro de valor de valores representativos de deuda a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4214, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2945', '4211', 'Deterioro de valor de valores representativos de deuda a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4215, 'PCG08-PYME','ACTIVO', 'XXXXXX', '295', '4185', 'Deterioro de valor de créditos a largo plazo a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4216, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2953', '4215', 'Deterioro de valor de créditos a largo plazo a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4217, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2954', '4215', 'Deterioro de valor de créditos a largo plazo a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4218, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2955', '4215', 'Deterioro de valor de créditos a largo plazo a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4219, 'PCG08-PYME','ACTIVO', 'XXXXXX', '296', '4185', 'Deterioro de valor de participaciones en el patrimonio netoa largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4220, 'PCG08-PYME','ACTIVO', 'XXXXXX', '297', '4185', 'Deterioro de valor de valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4221, 'PCG08-PYME','ACTIVO', 'XXXXXX', '298', '4185', 'Deterioro de valor de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4222, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '30', '4003', 'Comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4223, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '300', '4222', 'Mercaderías A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4224, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '301', '4222', 'Mercaderías B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4225, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '31', '4003', 'Materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4226, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '310', '4225', 'Materias primas A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4227, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '311', '4225', 'Materias primas B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4228, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '32', '4003', 'Otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4229, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '320', '4228', 'Elementos y conjuntos incorporables', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4230, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '321', '4228', 'Combustibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4231, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '322', '4228', 'Repuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4232, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '325', '4228', 'Materiales diversos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4233, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '326', '4228', 'Embalajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4234, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '327', '4228', 'Envases', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4235, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '328', '4229', 'Material de oficina', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4236, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '33', '4003', 'Productos en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4237, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '330', '4236', 'Productos en curos A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4238, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '331', '4236', 'Productos en curso B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4239, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '34', '4003', 'Productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4240, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '340', '4239', 'Productos semiterminados A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4241, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '341', '4239', 'Productos semiterminados B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4242, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '35', '4003', 'Productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4243, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '350', '4242', 'Productos terminados A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4244, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '351', '4242', 'Productos terminados B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4245, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '36', '4003', 'Subproductos, residuos y materiales recuperados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4246, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '360', '4245', 'Subproductos A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4247, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '361', '4245', 'Subproductos B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4248, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '365', '4245', 'Residuos A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4249, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '366', '4245', 'Residuos B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4250, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '368', '4245', 'Materiales recuperados A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4251, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '369', '4245', 'Materiales recuperados B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4252, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '39', '4003', 'Deterioro de valor de las existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4253, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '390', '4252', 'Deterioro de valor de las mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4254, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '391', '4252', 'Deterioro de valor de las materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4255, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '392', '4252', 'Deterioro de valor de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4256, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '393', '4252', 'Deterioro de valor de los productos en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4257, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '394', '4252', 'Deterioro de valor de los productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4258, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '395', '4252', 'Deterioro de valor de los productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4259, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '396', '4252', 'Deterioro de valor de los subproductos, residuos y materiales recuperados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4260, 'PCG08-PYME','ACREEDORES_DEUDORES', 'PROVEEDORES', '40', '4004', 'Proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4261, 'PCG08-PYME','ACREEDORES_DEUDORES', 'PROVEEDORES', '400', '4260', 'Proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4262, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4000', '4261', 'Proveedores euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4263, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4004', '4261', 'Proveedores moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4264, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4009', '4261', 'Proveedores facturas pendientes de recibir o formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4265, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '401', '4260', 'Proveedores efectos comerciales a pagar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4266, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '403', '4260', 'Proveedores empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4267, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4030', '4266', 'Proveedores empresas del grupo euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4268, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4031', '4266', 'Efectos comerciales a pagar empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4269, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4034', '4266', 'Proveedores empresas del grupo moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4270, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4036', '4266', 'Envases y embalajes a devolver a proveedores empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4271, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4039', '4266', 'Proveedores empresas del grupo facturas pendientes de recibir o de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4272, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '404', '4260', 'Proveedores empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4273, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '405', '4260', 'Proveedores otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4274, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '406', '4260', 'Envases y embalajes a devolver a proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4275, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '407', '4260', 'Anticipos a proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4276, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '41', '4004', 'Acreedores varios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4277, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '410', '4276', 'Acreedores por prestaciones de servicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4278, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4100', '4277', 'Acreedores por prestaciones de servicios euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4279, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4104', '4277', 'Acreedores por prestaciones de servicios moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4280, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4109', '4277', 'Acreedores por prestaciones de servicios facturas pendientes de recibir o formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4281, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '411', '4276', 'Acreedores efectos comerciales a pagar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4282, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '419', '4276', 'Acreedores por operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4283, 'PCG08-PYME','ACREEDORES_DEUDORES', 'CLIENTES', '43', '4004', 'Clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4284, 'PCG08-PYME','ACREEDORES_DEUDORES', 'CLIENTES', '430', '4283', 'Clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4285, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4300', '4284', 'Clientes euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4286, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4304', '4284', 'Clientes moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4287, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4309', '4284', 'Clientes facturas pendientes de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4288, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '431', '4283', 'Clientes efectos comerciales a cobrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4289, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4310', '4288', 'Efectos comerciales en cartera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4290, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4311', '4288', 'Efectos comerciales descontados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4291, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4312', '4288', 'Efectos comerciales en gestión de cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4292, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4315', '4288', 'Efectos comerciales impagados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4293, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '432', '4283', 'Clientes operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4294, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '433', '4283', 'Clientes empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4295, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4330', '4294', 'Clientes empresas del grupo euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4296, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4331', '4294', 'Efectos comerciales a cobrar empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4297, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4332', '4294', 'Clientes empresas del grupo operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4298, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4334', '4294', 'Clientes empresas del grupo moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4299, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4336', '4294', 'Clientes empresas del grupo dudoso cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4300, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4337', '4294', 'Envases y embalajes a devolver a clientes empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4301, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4339', '4294', 'Clientes empresas del grupo facturas pendientes de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4302, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '434', '4283', 'Clientes empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4303, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '435', '4283', 'Clientes otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4304, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '436', '4283', 'Clientes de dudoso cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4305, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '437', '4283', 'Envases y embalajes a devolver por clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4306, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '438', '4283', 'Anticipos de clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4307, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '44', '4004', 'Deudores varios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4308, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '440', '4307', 'Deudores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4309, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4400', '4308', 'Deudores euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4310, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4404', '4308', 'Deudores moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4311, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4409', '4308', 'Deudores facturas pendientes de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4312, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '441', '4307', 'Deudores efectos comerciales a cobrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4313, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4410', '4312', 'Deudores efectos comerciales en cartera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4314, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4411', '4312', 'Deudores efectos comerciales descontados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4315, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4412', '4312', 'Deudores efectos comerciales en gestión de cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4316, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4415', '4312', 'Deudores efectos comerciales impagados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4317, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '446', '4307', 'Deudores de dusoso cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4318, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '449', '4307', 'Deudores por operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4319, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '46', '4004', 'Personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4320, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '460', '4319', 'Anticipos de renumeraciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4321, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '465', '4319', 'Renumeraciones pendientes de pago', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4322, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '47', '4004', 'Administraciones Públicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4323, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '470', '4322', 'Hacienda Pública deudora por diversos conceptos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4324, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4700', '4323', 'Hacienda Pública deudora por IVA', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4325, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4708', '4323', 'Hacienda Pública deudora por subvenciones concedidas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4326, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4709', '4323', 'Hacienda Pública deudora por devolución de impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4327, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '471', '4322', 'Organismos de la Seguridad Social deudores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4328, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '472', '4322', 'Hacienda Pública IVA soportado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4329, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '473', '4322', 'Hacienda Pública retenciones y pagos a cuenta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4330, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '474', '4322', 'Activos por impuesto diferido', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4331, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4740', '4330', 'Activos por diferencias temporarias deducibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4332, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4742', '4330', 'Derechos por deducciones y bonificaciones pendientes de aplicar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4333, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4745', '4330', 'Crédito por pérdidasa compensar del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4334, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '475', '4322', 'Hacienda Pública acreedora por conceptos fiscales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4335, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4750', '4334', 'Hacienda Pública acreedora por IVA', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4336, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4751', '4334', 'Hacienda Pública acreedora por retenciones practicadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4337, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4752', '4334', 'Hacienda Pública acreedora por impuesto sobre sociedades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4338, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4758', '4334', 'Hacienda Pública acreedora por subvenciones a integrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4339, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '476', '4322', 'Organismos de la Seguridad Social acreedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4340, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '477', '4322', 'Hacienda Pública IVA repercutido', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4341, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '479', '4322', 'Pasivos por diferencias temporarias imponibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4342, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '48', '4004', 'Ajustes por periodificación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4343, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '480', '4342', 'Gastos anticipados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4344, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '485', '4342', 'Ingresos anticipados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4345, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '49', '4004', 'Deterioro de valor de créditos comerciales y provisiones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4346, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '490', '4345', 'Deterioro de valor de créditos por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4347, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '493', '4345', 'Deterioro de valor de créditos por operaciones comerciales con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4348, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4933', '4347', 'Deterioro de valor de créditos por operaciones comerciales con empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4349, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4934', '4347', 'Deterioro de valor de créditos por operaciones comerciales con empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4350, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4935', '4347', 'Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4351, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '499', '4345', 'Provisiones por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4352, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4994', '4351', 'Provisión para contratos anerosos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4353, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4999', '4351', 'Provisión para otras operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4354, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '50', '4005', 'Emprésitos deudas con características especiales y otras emisiones análogas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4355, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '500', '4354', 'Obligaciones y bonos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4356, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '502', '4354', 'Acciones o participaciones a corto plazo consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4357, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '505', '4354', 'Deudas representadas en otros valores negociables a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4358, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '506', '4354', 'Intereses a corto plazo de emprésitos y otras emisiones analógicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4359, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '507', '4354', 'Dividendos de acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4360, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '509', '4354', 'Valores negociables amortizados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4361, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5090', '4360', 'Obligaciones y bonos amortizados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4362, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5095', '4360', 'Otros valores negociables amortizados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4363, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '51', '4005', 'Deudas a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4364, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '510', '4363', 'Deudas a corto plazo con entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4365, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5103', '4364', 'Deudas a corto plazo con entidades de crédito empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4366, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5104', '4364', 'Deudas a corto plazo con entidades de crédito empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4367, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5105', '4364', 'Deudas a corto plazo con otras entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4368, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '511', '4363', 'Proveedores de inmovilizado a corto plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4369, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5113', '4368', 'Proveedores de inmovilizado a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4370, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5114', '4368', 'Proveedores de inmovilizado a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4371, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5115', '4368', 'Proveedores de inmovilizado a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4372, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '512', '4363', 'Acreedores por arrendamiento financiero a corto plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4373, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5123', '4372', 'Acreedores por arrendamiento financiero a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4374, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5124', '4372', 'Acreedores por arrendamiento financiero a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4375, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5125', '4372', 'Acreedores por arrendamiento financiero a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4376, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '513', '4363', 'Otras deudas a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4377, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5133', '4376', 'Otras deudas a corto plazo con empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4378, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5134', '4376', 'Otras deudas a corto plazo con empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4379, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5135', '4376', 'Otras deudas a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4380, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '514', '4363', 'Intereses a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4381, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5143', '4380', 'Intereses a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4382, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5144', '4380', 'Intereses a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4383, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5145', '4380', 'Intereses deudas a corto plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4384, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '52', '4005', 'Deudas a corto plazo por préstamos recibidos y otros conceptos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4385, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '520', '4384', 'Deudas a corto plazo con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4386, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5200', '4385', 'Préstamos a corto plazo de entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4387, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5201', '4385', 'Deudas a corto plazo por crédito dispuesto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4388, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5208', '4385', 'Deudas por efectos descontados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4389, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5209', '4385', 'Deudas por operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4390, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '521', '4384', 'Deudas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4391, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '522', '4384', 'Deudas a corto plazo transformables en subvenciones donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4392, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '523', '4384', 'Proveedores de inmovilizado a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4393, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '526', '4384', 'Dividendo activo a pagar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4394, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '527', '4384', 'Intereses a corto plazo de deudas con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4395, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '528', '4384', 'Intereses a corto plazo de deudas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4396, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '529', '4384', 'Provisiones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4397, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5291', '4396', 'Provisión a corto plazo para impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4398, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5292', '4396', 'Provisión a corto plazo para otras responsabilidades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4399, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5293', '4396', 'Provisión a corto plazo por desmantelamiento retiro o rehabilitación del inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4400, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5295', '4396', 'Provisión a corto plazo para actuaciones medioambientales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4401, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '53', '4005', 'Inversiones financieras a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4402, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '530', '4401', 'Participaciones a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4403, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5303', '4402', 'Participaciones a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4404, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5304', '4402', 'Participaciones a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4405, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5305', '4402', 'Participaciones a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4406, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '531', '4401', 'Valores representativos de deuda a corto plazo de partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4407, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5313', '4406', 'Valores representativos de deuda a corto plazo de empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4408, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5314', '4406', 'Valores representativos de deuda a corto plazo de empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4409, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5315', '4406', 'Valores representativos de deuda a corto plazo de otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4410, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '532', '4401', 'Créditos a corto plazo a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4411, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5323', '4410', 'Créditos a corto plazo a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4412, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5324', '4410', 'Créditos a corto plazo a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4413, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5325', '4410', 'Créditos a corto plazo a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4414, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '533', '4401', 'Intereses a corto plazo de valores representativos de deuda de partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4415, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5333', '4414', 'Intereses a corto plazo de valores representativos de deuda en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4416, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5334', '4414', 'Intereses a corto plazo de valores representativos de deuda en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4417, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5335', '4414', 'Intereses a corto plazo de valores representativos de deuda en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4418, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '534', '4401', 'Intereses a corto plazo de créditos a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4419, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5343', '4418', 'Intereses a corto plazo de créditos a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4420, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5344', '4418', 'Intereses a corto plazo de créditos a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4421, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5345', '4418', 'Intereses a corto plazo de créditos a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4422, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '535', '4401', 'Dividendo a cobrar de inversiones financieras en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4423, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5353', '4422', 'Dividendo a cobrar de empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4424, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5354', '4422', 'Dividendo a cobrar de empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4425, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5355', '4422', 'Dividendo a cobrar de otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4426, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '539', '4401', 'Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4427, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5393', '4426', 'Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4428, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5394', '4426', 'Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4429, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5395', '4426', 'Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4430, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '54', '4005', 'Otras inversiones financieras a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4431, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '540', '4430', 'Inversiones financieras a corto plazo en instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4432, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '541', '4430', 'Valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4433, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '542', '4430', 'Créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4434, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '543', '4430', 'Créditos a corto plazo por enejenación de inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4435, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '544', '4430', 'Créditos a corto plazo al personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4436, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '545', '4430', 'Dividendo a cobrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4437, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '546', '4430', 'Intereses a corto plazo de valores reprsentativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4438, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '547', '4430', 'Intereses a corto plazo de créditos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4439, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '548', '4430', 'Imposiciones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4440, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '549', '4430', 'Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4441, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '55', '4005', 'Otras cuentas no bancarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4442, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '550', '4441', 'Titular de la explotación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4443, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '551', '4441', 'Cuenta corriente con socios y administradores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4444, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '552', '4441', 'Cuenta corriente otras personas y entidades vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4445, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5523', '4444', 'Cuenta corriente con empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4446, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5524', '4444', 'Cuenta corriente con empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4447, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5525', '4444', 'Cuenta corriente con otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4448, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '554', '4441', 'Cuenta corriente con uniones temporales de empresas y comunidades de bienes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4449, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '555', '4441', 'Partidas pendientes de aplicación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4450, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '556', '4441', 'Desembolsos exigidos sobre participaciones en el patrimonio neto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4451, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5563', '4450', 'Desembolsos exigidos sobre participaciones empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4452, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5564', '4450', 'Desembolsos exigidos sobre participaciones empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4453, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5565', '4450', 'Desembolsos exigidos sobre participaciones otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4454, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5566', '4450', 'Desembolsos exigidos sobre participaciones otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4455, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '557', '4441', 'Dividendo activo a cuenta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4456, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '558', '4441', 'Socios por desembolsos exigidos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4457, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5580', '4456', 'Socios por desembolsos exigidos sobre acciones o participaciones ordinarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4458, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5585', '4456', 'Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4459, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '559', '4441', 'Derivados financieros a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4460, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5590', '4459', 'Activos por derivados financieros a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4461, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5595', '4459', 'Pasivos por derivados financieros a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4462, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '56', '4005', 'Finanzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4463, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '560', '4462', 'Finanzas recibidas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4464, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '561', '4462', 'Depósitos recibidos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4465, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '565', '4462', 'Finanzas constituidas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4466, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '566', '4462', 'Depósitos constituidos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4467, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '567', '4462', 'Intereses pagados por anticipado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4468, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '568', '4462', 'Intereses cobrados a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4469, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '57', '4005', 'Tesorería', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4470, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'CAJA', '570', '4469', 'Caja euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4471, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '571', '4469', 'Caja moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4472, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'BANCOS', '572', '4469', 'Bancos e instituciones de crédito cc vista euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4473, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '573', '4469', 'Bancos e instituciones de crédito cc vista moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4474, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '574', '4469', 'Bancos e instituciones de crédito cuentas de ahorro euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4475, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '575', '4469', 'Bancos e instituciones de crédito cuentas de ahorro moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4476, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '576', '4469', 'Inversiones a corto plazo de gran liquidez', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4477, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '59', '4005', 'Deterioro del valor de las inversiones financieras a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4478, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '593', '4477', 'Deterioro del valor de participaciones a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4479, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5933', '4478', 'Deterioro del valor de participaciones a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4480, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5934', '4478', 'Deterioro del valor de participaciones a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4481, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5935', '4478', 'Deterioro del valor de participaciones a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4482, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '594', '4477', 'Deterioro del valor de valores representativos de deuda a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4483, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5943', '4482', 'Deterioro del valor de valores representativos de deuda a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4484, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5944', '4482', 'Deterioro del valor de valores representativos de deuda a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4485, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5945', '4482', 'Deterioro del valor de valores representativos de deuda a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4486, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '595', '4477', 'Deterioro del valor de créditos a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4487, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5953', '4486', 'Deterioro del valor de créditos a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4488, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5954', '4486', 'Deterioro del valor de créditos a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4489, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5955', '4486', 'Deterioro del valor de créditos a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4490, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '596', '4477', 'Deterioro del valor de participaciones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4491, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '597', '4477', 'Deterioro del valor de valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4492, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '598', '4477', 'Deterioro de valor de créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4493, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '60', '4006', 'Compras', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4494, 'PCG08-PYME','COMPRAS_GASTOS', 'COMPRAS', '600', '4493', 'Compras de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4495, 'PCG08-PYME','COMPRAS_GASTOS', 'COMPRAS', '601', '4493', 'Compras de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4496, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '602', '4493', 'Compras de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4497, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '606', '4493', 'Descuentos sobre compras por pronto pago', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4498, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6060', '4497', 'Descuentos sobre compras por pronto pago de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4499, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6061', '4497', 'Descuentos sobre compras por pronto pago de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4500, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6062', '4497', 'Descuentos sobre compras por pronto pago de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4501, 'PCG08-PYME','COMPRAS_GASTOS', 'COMPRAS', '607', '4493', 'Trabajos realizados por otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4502, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '608', '4493', 'Devoluciones de compras y operaciones similares', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4503, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6080', '4502', 'Devoluciones de compras de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4504, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6081', '4502', 'Devoluciones de compras de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4505, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6082', '4502', 'Devoluciones de compras de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4506, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '609', '4493', 'Rappels por compras', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4507, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6090', '4506', 'Rappels por compras de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4508, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6091', '4506', 'Rappels por compras de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4509, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6092', '4506', 'Rappels por compras de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4510, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '61', '4006', 'Variación de existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4511, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '610', '4510', 'Variación de existencias de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4512, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '611', '4510', 'Variación de existencias de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4513, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '612', '4510', 'Variación de existencias de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4514, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '62', '4006', 'Servicios exteriores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4515, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '620', '4514', 'Gastos en investigación y desarrollo del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4516, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '621', '4514', 'Arrendamientos y cánones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4517, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '622', '4514', 'Reparaciones y conservación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4518, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '623', '4514', 'Servicios profesionales independientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4519, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '624', '4514', 'Transportes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4520, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '625', '4514', 'Primas de seguros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4521, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '626', '4514', 'Servicios bancarios y similares', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4522, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '627', '4514', 'Publicidad, propaganda y relaciones públicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4523, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '628', '4514', 'Suministros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4524, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '629', '4514', 'Otros servicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4525, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '63', '4006', 'Tributos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4526, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '630', '4525', 'Impuesto sobre benecifios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4527, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6300', '4526', 'Impuesto corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4528, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6301', '4526', 'Impuesto diferido', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4529, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '631', '4525', 'Otros tributos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4530, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '633', '4525', 'Ajustes negativos en la imposición sobre beneficios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4531, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '634', '4525', 'Ajustes negativos en la imposición indirecta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4532, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6341', '4531', 'Ajustes negativos en IVA de activo corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4533, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6342', '4531', 'Ajustes negativos en IVA de inversiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4534, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '636', '4525', 'Devolución de impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4535, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '638', '4525', 'Ajustes positivos en la imposición sobre beneficios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4536, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '639', '4525', 'Ajustes positivos en la imposición directa', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4537, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6391', '4536', 'Ajustes positivos en IVA de activo corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4538, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6392', '4536', 'Ajustes positivos en IVA de inversiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4539, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '64', '4006', 'Gastos de personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4540, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '640', '4539', 'Sueldos y salarios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4541, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '641', '4539', 'Indemnizaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4542, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '642', '4539', 'Seguridad social a cargo de la empresa', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4543, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '649', '4539', 'Otros gastos sociales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4544, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '65', '4006', 'Otros gastos de gestión', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4545, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '650', '4544', 'Pérdidas de créditos comerciales incobrables', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4546, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '651', '4544', 'Resultados de operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4547, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6510', '4546', 'Beneficio transferido gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4548, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6511', '4546', 'Pérdida soportada participe o asociado no gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4549, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '659', '4544', 'Otras pérdidas en gestión corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4550, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '66', '4006', 'Gastos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4551, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '660', '4550', 'Gastos financieros por actualización de provisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4552, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '661', '4550', 'Intereses de obligaciones y bonos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4553, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6610', '4452', 'Intereses de obligaciones y bonos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4554, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6611', '4452', 'Intereses de obligaciones y bonos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4555, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6612', '4452', 'Intereses de obligaciones y bonos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4556, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6613', '4452', 'Intereses de obligaciones y bonos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4557, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6615', '4452', 'Intereses de obligaciones y bonos a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4558, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6616', '4452', 'Intereses de obligaciones y bonos a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4559, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6617', '4452', 'Intereses de obligaciones y bonos a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4560, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6618', '4452', 'Intereses de obligaciones y bonos a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4561, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '662', '4550', 'Intereses de deudas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4562, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6620', '4561', 'Intereses de deudas empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4563, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6621', '4561', 'Intereses de deudas empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4564, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6622', '4561', 'Intereses de deudas otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4565, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6623', '4561', 'Intereses de deudas con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4566, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6624', '4561', 'Intereses de deudas otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4567, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '663', '4550', 'Pérdidas por valorización de activos y pasivos financieros por su valor razonable', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4568, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '664', '4550', 'Gastos por dividendos de acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4569, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6640', '4568', 'Dividendos de pasivos empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4570, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6641', '4568', 'Dividendos de pasivos empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4571, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6642', '4568', 'Dividendos de pasivos otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4572, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6643', '4568', 'Dividendos de pasivos otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4573, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '665', '4550', 'Intereses por descuento de efectos y operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4574, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6650', '4573', 'Intereses por descuento de efectos en entidades de crédito del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4575, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6651', '4573', 'Intereses por descuento de efectos en entidades de crédito asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4576, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6652', '4573', 'Intereses por descuento de efectos en entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4577, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6653', '4573', 'Intereses por descuento de efectos en otras entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4578, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6654', '4573', 'Intereses por operaciones de factoring con entidades de crédito del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4579, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6655', '4573', 'Intereses por operaciones de factoring con entidades de crédito asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4580, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6656', '4573', 'Intereses por operaciones de factoring con otras entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4581, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6657', '4573', 'Intereses por operaciones de factoring con otras entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4582, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '666', '4550', 'Pérdidas en participaciones y valores representativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4583, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6660', '4582', 'Pérdidas en valores representativos de deuda a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4584, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6661', '4582', 'Pérdidas en valores representativos de deuda a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4585, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6662', '4582', 'Pérdidas en valores representativos de deuda a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4586, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6663', '4582', 'Pérdidas en participaciones y valores representativos de deuda a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4587, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6665', '4582', 'Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4588, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6666', '4582', 'Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4589, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6667', '4582', 'Pérdidas en valores representativos de deuda a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4590, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6668', '4582', 'Pérdidas en valores representativos de deuda a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4591, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '667', '4550', 'Pérdidas de créditos no comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4592, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6670', '4591', 'Pérdidas de créditos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4593, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6671', '4591', 'Pérdidas de créditos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4594, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6672', '4591', 'Pérdidas de créditos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4595, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6673', '4591', 'Pérdidas de créditos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4596, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6675', '4591', 'Pérdidas de créditos a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4597, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6676', '4591', 'Pérdidas de créditos a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4598, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6677', '4591', 'Pérdidas de créditos a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4599, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6678', '4591', 'Pérdidas de créditos a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4600, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '668', '4550', 'Diferencias negativas de cambio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4601, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '669', '4550', 'Otros gastos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4602, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '67', '4006', 'Pérdidas procedentes de activos no corrientes y gastos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4603, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '670', '4602', 'Pérdidas procedentes del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4604, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '671', '4602', 'Pérdidas procedentes del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4605, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '672', '4602', 'Pérdidas procedentes de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4607, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '673', '4602', 'Pérdidas procedentes de participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4608, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6733', '4607', 'Pérdidas procedentes de participaciones a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4609, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6734', '4607', 'Pérdidas procedentes de participaciones a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4610, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6735', '4607', 'Pérdidas procedentes de participaciones a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4611, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '675', '4602', 'Pérdidas por operaciones con obligaciones propias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4612, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '678', '4602', 'Gastos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4613, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '68', '4006', 'Dotaciones para amortizaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4614, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '680', '4613', 'Amortización del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4615, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '681', '4613', 'Amortización del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4616, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '682', '4613', 'Amortización de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4617, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '69', '4006', 'Pérdidas por deterioro y otras dotaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4618, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '690', '4617', 'Pérdidas por deterioro del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4619, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '691', '4617', 'Pérdidas por deterioro del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4620, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '692', '4617', 'Pérdidas por deterioro de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4621, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '693', '4617', 'Pérdidas por deterioro de existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4622, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6930', '4621', 'Pérdidas por deterioro de productos terminados y en curso de fabricación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4623, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6931', '4621', 'Pérdidas por deterioro de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4624, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6932', '4621', 'Pérdidas por deterioro de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4625, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6933', '4621', 'Pérdidas por deterioro de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4626, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '694', '4617', 'Pérdidas por deterioro de créditos por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4627, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '695', '4617', 'Dotación a la provisión por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4628, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6954', '4627', 'Dotación a la provisión por contratos onerosos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4629, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6959', '4628', 'Dotación a la provisión para otras operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4630, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '696', '4617', 'Pérdidas por deterioro de participaciones y valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4631, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6960', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4632, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6961', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4633, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6962', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4634, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6963', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4635, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6965', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4636, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6966', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4637, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6967', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4638, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6968', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4639, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '697', '4617', 'Pérdidas por deterioro de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4640, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6970', '4639', 'Pérdidas por deterioro de créditos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4641, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6971', '4639', 'Pérdidas por deterioro de créditos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4642, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6972', '4639', 'Pérdidas por deterioro de créditos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4643, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6973', '4639', 'Pérdidas por deterioro de créditos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4644, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '698', '4617', 'Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4645, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6980', '4644', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4646, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6981', '4644', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4647, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6985', '4644', 'Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4648, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6986', '4644', 'Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4649, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6988', '4644', 'Pérdidas por deterioro en valores representativos de deuda a corto plazo de otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4650, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '699', '4617', 'Pérdidas por deterioro de crédito a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4651, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6990', '4650', 'Pérdidas por deterioro de crédito a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4652, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6991', '4650', 'Pérdidas por deterioro de crédito a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4653, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6992', '4650', 'Pérdidas por deterioro de crédito a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4654, 'PCG08-PYME','COMPRAS_GASTOS', 'XXXXXX', '6993', '4650', 'Pérdidas por deterioro de crédito a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4655, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '70', '4007', 'Ventas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4656, 'PCG08-PYME','VENTAS_E_INGRESOS', 'VENTAS', '700', '4655', 'Ventas de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4657, 'PCG08-PYME','VENTAS_E_INGRESOS', 'VENTAS', '701', '4655', 'Ventas de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4658, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '702', '4655', 'Ventas de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4659, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '703', '4655', 'Ventas de subproductos y residuos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4660, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '704', '4655', 'Ventas de envases y embalajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4661, 'PCG08-PYME','VENTAS_E_INGRESOS', 'VENTAS', '705', '4655', 'Prestaciones de servicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4662, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '706', '4655', 'Descuentos sobre ventas por pronto pago', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4663, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7060', '4662', 'Descuentos sobre ventas por pronto pago de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4664, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7061', '4662', 'Descuentos sobre ventas por pronto pago de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4665, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7062', '4662', 'Descuentos sobre ventas por pronto pago de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4666, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7063', '4662', 'Descuentos sobre ventas por pronto pago de subproductos y residuos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4667, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '708', '4655', 'Devoluciones de ventas y operacioes similares', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4668, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7080', '4667', 'Devoluciones de ventas de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4669, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7081', '4667', 'Devoluciones de ventas de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4670, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7082', '4667', 'Devoluciones de ventas de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4671, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7083', '4667', 'Devoluciones de ventas de subproductos y residuos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4672, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7084', '4667', 'Devoluciones de ventas de envases y embalajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4673, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '71', '4007', 'Variación de existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4674, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '710', '4673', 'Variación de existencias de productos en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4675, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '711', '4673', 'Variación de existencias de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4676, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '712', '4673', 'Variación de existencias de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4677, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '713', '4673', 'Variación de existencias de subproductos, residuos y materiales recuperados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4678, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '73', '4007', 'Trabajos realizados para la empresa', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4679, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '730', '4678', 'Trabajos realizados para el inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4680, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '731', '4678', 'Trabajos realizados para el inmovilizado tangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4681, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '732', '4678', 'Trabajos realizados en inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4682, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '733', '4678', 'Trabajos realizados para el inmovilizado material en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4683, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '74', '4007', 'Subvenciones, donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4684, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '740', '4683', 'Subvenciones, donaciones y legados a la explotación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4685, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '746', '4683', 'Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4686, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '747', '4683', 'Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4687, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '75', '4007', 'Otros ingresos de gestión', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4688, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '751', '4687', 'Resultados de operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4689, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7510', '4688', 'Pérdida transferida gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4690, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7511', '4688', 'Beneficio atribuido participe o asociado no gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4691, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '752', '4687', 'Ingreso por arrendamiento', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4692, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '753', '4687', 'Ingresos de propiedad industrial cedida en explotación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4693, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '754', '4687', 'Ingresos por comisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4694, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '755', '4687', 'Ingresos por servicios al personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4695, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '759', '4687', 'Ingresos por servicios diversos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4696, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76', '4007', 'Ingresos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4697, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '760', '4696', 'Ingresos de participaciones en instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4698, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7600', '4697', 'Ingresos de participaciones en instrumentos de patrimonio empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4699, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7601', '4697', 'Ingresos de participaciones en instrumentos de patrimonio empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4700, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7602', '4697', 'Ingresos de participaciones en instrumentos de patrimonio otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4701, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7603', '4697', 'Ingresos de participaciones en instrumentos de patrimonio otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4702, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '761', '4696', 'Ingresos de valores representativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4703, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7610', '4702', 'Ingresos de valores representativos de deuda empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4704, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7611', '4702', 'Ingresos de valores representativos de deuda empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4705, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7612', '4702', 'Ingresos de valores representativos de deuda otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4706, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7613', '4702', 'Ingresos de valores representativos de deuda otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4707, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '762', '4696', 'Ingresos de créditos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4708, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7620', '4707', 'Ingresos de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4709, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76200', '4708', 'Ingresos de crédito a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4710, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76201', '4708', 'Ingresos de crédito a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4711, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76202', '4708', 'Ingresos de crédito a largo plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4712, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76203', '4708', 'Ingresos de crédito a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4713, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7621', '4707', 'Ingresos de créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4714, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76210', '4713', 'Ingresos de crédito a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4715, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76211', '4713', 'Ingresos de crédito a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4716, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76212', '4713', 'Ingresos de crédito a corto plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4717, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76213', '4713', 'Ingresos de crédito a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4718, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '763', '4696', 'Beneficios por valorización de activos y pasivos financieros por su valor razonable', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4719, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '766', '4696', 'Beneficios en participaciones y valores representativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4720, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7660', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4721, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7661', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4722, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7662', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4723, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7663', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4724, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7665', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4725, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7666', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4726, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7667', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4727, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7668', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4728, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '768', '4696', 'Diferencias positivas de cambio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4729, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '769', '4696', 'Otros ingresos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4730, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '77', '4007', 'Beneficios procedentes de activos no corrientes e ingresos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4731, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '770', '4730', 'Beneficios procedentes del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4732, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '771', '4730', 'Beneficios procedentes del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4733, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '772', '4730', 'Beneficios procedentes de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4734, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '773', '4730', 'Beneficios procedentes de participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4735, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7733', '4734', 'Beneficios procedentes de participaciones a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4736, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7734', '4734', 'Beneficios procedentes de participaciones a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4737, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7735', '4734', 'Beneficios procedentes de participaciones a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4738, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '775', '4730', 'Beneficios por operaciones con obligaciones propias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4739, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '778', '4730', 'Ingresos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4741, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '79', '4007', 'Excesos y aplicaciones de provisiones y pérdidas por deterioro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4742, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '790', '4741', 'Revisión del deterioro del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4743, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '791', '4741', 'Revisión del deterioro del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4744, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '792', '4741', 'Revisión del deterioro de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4745, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '793', '4741', 'Revisión del deterioro de las existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4746, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7930', '4745', 'Revisión del deterioro de productos terminados y en curso de fabricación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4747, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7931', '4745', 'Revisión del deterioro de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4748, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7932', '4745', 'Revisión del deterioro de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4749, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7933', '4745', 'Revisión del deterioro de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4750, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '794', '4741', 'Revisión del deterioro de créditos por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4751, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '795', '4741', 'Exceso de provisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4752, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7951', '4751', 'Exceso de provisión para impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4753, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7952', '4751', 'Exceso de provisión para otras responsabilidades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4755, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7954', '4751', 'Exceso de provisión para operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4756, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '79544', '4755', 'Exceso de provisión por contratos onerosos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4757, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '79549', '4755', 'Exceso de provisión para otras operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4758, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7955', '4751', 'Exceso de provisión para actuaciones medioambienteales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4759, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '796', '4741', 'Revisión del deterioro de participaciones y valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4760, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7960', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4761, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7961', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4762, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7962', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4763, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7963', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4764, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7965', '4759', 'Revisión del deterioro de valores representativos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4765, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7966', '4759', 'Revisión del deterioro de valores representativos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4766, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7967', '4759', 'Revisión del deterioro de valores representativos a largo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4767, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7968', '4759', 'Revisión del deterioro de valores representativos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4768, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '797', '4741', 'Revisión del deterioro de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4769, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7970', '4768', 'Revisión del deterioro de créditos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4770, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7971', '4768', 'Revisión del deterioro de créditos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4771, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7972', '4768', 'Revisión del deterioro de créditos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4772, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7973', '4768', 'Revisión del deterioro de créditos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4773, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '798', '4741', 'Revisión del deterioro de participaciones y valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4774, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7980', '4773', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4775, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7981', '4773', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4776, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7985', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4777, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7986', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4778, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7987', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4779, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7988', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4780, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '799', '4741', 'Revisión del deterioro de créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4781, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7990', '4780', 'Revisión del deterioro de créditos a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4782, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7991', '4780', 'Revisión del deterioro de créditos a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4783, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7992', '4780', 'Revisión del deterioro de créditos a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4784, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7993', '4780', 'Revisión del deterioro de créditos a corto plazo otras empresas', '1');
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 971d2d7514a..29adb70c46e 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -32,38 +32,42 @@
 -- List of all managed triggered events (used for trigger agenda and for notification)
 --
 delete from llx_c_action_trigger;
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (1,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (2,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (3,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (4,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (5,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (6,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (9,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (10,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (11,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (12,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (13,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (14,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (15,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (16,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (17,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (18,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (19,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (20,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (21,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (22,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (23,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (24,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (25,'MEMBER_SUBSCRIPTION','Member subscribed','Executed when a member is subscribed','member',23);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (26,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (27,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (28,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (30,'PROJECT_CREATE','Project creation','Executed when a project is created','project',30);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (31,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',31);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (32,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',32);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (33,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',33);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (34,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',34);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (35,'TASK_CREATE','Task created','Executed when a project task is created','project',35);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (36,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36);
-insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (37,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION','Member subscribed','Executed when a member is subscribed','member',23);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
+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 ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',30);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2);
+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);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',35);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',36);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37);
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 43c00faba6a..2b84ee6ff82 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -36,6 +36,7 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 2,'AC_FAX','system','Send Fax',NULL, 1, 3);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 4,'AC_EMAIL','system','Send Email',NULL, 1, 4);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 5,'AC_RDV','system','Rendez-vous',NULL, 1, 1);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
 -- Code kept for backward compatibility < 3.3 
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql
index 097539417ee..0d7c0753131 100644
--- a/htdocs/install/mysql/data/llx_c_civilite.sql
+++ b/htdocs/install/mysql/data/llx_c_civilite.sql
@@ -27,12 +27,12 @@
 --
 
 --
--- Civilites
+-- Civilities
 --
 
-delete from llx_c_civilite;
-insert into llx_c_civilite (rowid, code, civilite, active) values (1 , 'MME',  'Madame', 1);
-insert into llx_c_civilite (rowid, code, civilite, active) values (3 , 'MR',   'Monsieur', 1);
-insert into llx_c_civilite (rowid, code, civilite, active) values (5 , 'MLE',  'Mademoiselle', 1);
-insert into llx_c_civilite (rowid, code, civilite, active) values (7 , 'MTRE', 'Maître', 1);
-insert into llx_c_civilite (rowid, code, civilite, active) values (8 , 'DR',   'Docteur', 1);
+delete from llx_c_civility;
+insert into llx_c_civility (rowid, code, label, active) values (1 , 'MME',  'Madame', 1);
+insert into llx_c_civility (rowid, code, label, active) values (3 , 'MR',   'Monsieur', 1);
+insert into llx_c_civility (rowid, code, label, active) values (5 , 'MLE',  'Mademoiselle', 1);
+insert into llx_c_civility (rowid, code, label, active) values (7 , 'MTRE', 'Maître', 1);
+insert into llx_c_civility (rowid, code, label, active) values (8 , 'DR',   'Docteur', 1);
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_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
index a54a392fac7..7bc3f8f590d 100644
--- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql
@@ -31,9 +31,9 @@
 --
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','http://www.colissimo.fr/portail_colissimo/suivre.do?colispart={TRACKID}',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max','',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (5,'UPS','UPS','United Parcel Service','http://wwwapps.ups.com/etracking/tracking.cgi?InquiryNumber2=&InquiryNumber3=&tracknums_displayed=3&loc=fr_FR&TypeOfInquiryNumber=T&HTMLVersion=4.0&InquiryNumber22=&InquiryNumber32=&track=Track&Suivi.x=64&Suivi.y=7&Suivi=Valider&InquiryNumber1={TRACKID}',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}',0);
-INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','http://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/FR01/FR/5004.htm?txtAction=71000&txtRefNo={TRACKID}',0);
+INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','https://gls-group.eu/FR/fr/suivi-colis?match={TRACKID}',0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}',0);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index c8091e3889e..a2e1cb6bbb3 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -66,7 +66,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
 -- CANADA (id country=14)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14,   '7','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14,   '0','0','VAT Rate 0',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','TPS and TVQ rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1);
+--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1);
+--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1);
+--insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1);
 
 
 -- CAMEROUN (id country=24)
@@ -124,10 +127,17 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 3
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34,  3,   '0','0','VAT Rate 0',1);
 
 -- INDIA (id country=117)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1171, 117,  '12.5','0','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1172, 117,  '4','0','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1173, 117,  '1','0','VAT super-reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1174, 117,  '0','0','VAT Rate 0',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1171, 117, '12.5','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1172, 117,    '4','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1173, 117,    '1','0','VAT super-reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1174, 117,    '0','0','VAT Rate 0',1);
+
+-- IRELAND (id country=8)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (81,     8,    '0','0','VAT Rate 0',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (82,     8,   '23','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (83,     8, '13.5','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (84,     8,    '9','0','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (85,     8,  '4.8','0','VAT reduced rate',1);
 
 -- JAPAN (id country=123)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1231, 123, '0','0','VAT Rate 0',1);
@@ -216,10 +226,10 @@ INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (20
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2023, 202,  '0', '0', 'VAT Rate 0', 1);
 
 -- SPAIN (id country=4)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 41, 4,'21','0','5.2','3','-21','1','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 42, 4,'10','0','1.4','3','-21','1','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 43, 4, '4','0','0.5','3','-21','1','VAT super-reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 44, 4, '0','0',  '0','3','-21','1','VAT Rate 0',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 41, 4,'21','0','5.2','3','-21:-9:-2','1','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 42, 4,'10','0','1.4','3','-21:-9:-2','1','VAT reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 43, 4, '4','0','0.5','3','-21:-9:-2','1','VAT super-reduced rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 44, 4, '0','0',  '0','3','-21:-9:-2','1','VAT Rate 0',1);
 
 -- SWEDEN (id country=20)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (201,20,  '25','0','VAT standard rate',1);
diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql
index 55c3268b635..9e763bf5ba8 100644
--- a/htdocs/install/mysql/data/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/data/llx_c_type_fees.sql
@@ -30,6 +30,6 @@
 -- Type fees
 --
 
-insert into llx_c_type_fees (code,libelle,active) values ('TF_OTHER',    'Other',  1);
-insert into llx_c_type_fees (code,libelle,active) values ('TF_TRIP',     'Trip',   1);
-insert into llx_c_type_fees (code,libelle,active) values ('TF_LUNCH',    'Lunch',  1);
+insert into llx_c_type_fees (code,label,active) values ('TF_OTHER',    'Other',  1);
+insert into llx_c_type_fees (code,label,active) values ('TF_TRIP',     'Trip',   1);
+insert into llx_c_type_fees (code,label,active) values ('TF_LUNCH',    'Lunch',  1);
diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql
index 154798cdd4f..918230cc5a3 100644
--- a/htdocs/install/mysql/data/llx_c_typent.sql
+++ b/htdocs/install/mysql/data/llx_c_typent.sql
@@ -27,17 +27,20 @@
 --
 
 --
--- Types entreprises
+-- Types of thirdparties
 --
 
 delete from llx_c_typent;
-insert into llx_c_typent (id,code,libelle,active) values (  0, 'TE_UNKNOWN', '-',             1);
-insert into llx_c_typent (id,code,libelle,active) values (  1, 'TE_STARTUP', 'Start-up',      0);
-insert into llx_c_typent (id,code,libelle,active) values (  2, 'TE_GROUP',   'Grand groupe',  1);
-insert into llx_c_typent (id,code,libelle,active) values (  3, 'TE_MEDIUM',  'PME/PMI',       1);
-insert into llx_c_typent (id,code,libelle,active) values (  4, 'TE_SMALL',   'TPE',           1);
-insert into llx_c_typent (id,code,libelle,active) values (  5, 'TE_ADMIN',   'Administration',1);
-insert into llx_c_typent (id,code,libelle,active) values (  6, 'TE_WHOLE',   'Grossiste',     0);
-insert into llx_c_typent (id,code,libelle,active) values (  7, 'TE_RETAIL',  'Revendeur',     0);
-insert into llx_c_typent (id,code,libelle,active) values (  8, 'TE_PRIVATE', 'Particulier',   1);
-insert into llx_c_typent (id,code,libelle,active) values (100, 'TE_OTHER',   'Autres',        1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  0, 'TE_UNKNOWN', '-',             NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  1, 'TE_STARTUP', 'Start-up',      NULL, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  2, 'TE_GROUP',   'Grand groupe',  NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  3, 'TE_MEDIUM',  'PME/PMI',       NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  4, 'TE_SMALL',   'TPE',           NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  5, 'TE_ADMIN',   'Administration',NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  6, 'TE_WHOLE',   'Grossiste',     NULL, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  7, 'TE_RETAIL',  'Revendeur',     NULL, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (  8, 'TE_PRIVATE', 'Particulier',   NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (100, 'TE_OTHER',   'Autres',        NULL, 1);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (231, 'TE_A_RI',    'Responsable Inscripto',    23, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (232, 'TE_B_RNI',   'Responsable No Inscripto', 23, 0);
+insert into llx_c_typent (id,code,libelle,fk_country,active) values (233, 'TE_C_FE',    'Consumidor Final/Exento',  23, 0);
diff --git a/htdocs/install/mysql/functions/index.html b/htdocs/install/mysql/functions/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mysql/index.html b/htdocs/install/mysql/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql
deleted file mode 100644
index e2205b29953..00000000000
--- a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql
+++ /dev/null
@@ -1,958 +0,0 @@
---
--- Attention a l ordre des requetes.
--- Ce fichier doit etre charge sur une version 2.0.0 
--- sans AUCUNE erreur ni warning
---
-
-create table llx_paiementfourn_facturefourn
-(
-  rowid integer AUTO_INCREMENT PRIMARY KEY,
-  fk_paiementfourn INT(11) DEFAULT NULL,
-  fk_facturefourn  INT(11) DEFAULT NULL,
-  amount DOUBLE DEFAULT '0'
-) TYPE=innodb;
-ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn);
-ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_paiement(fk_paiementfourn);
-
-
-drop table if exists llx_commande_model_pdf;
-drop table if exists llx_commande_fournisseur_model_pdf;
-
-alter table llx_commande add column note_public text after note;
-
-alter table llx_contrat add column note text;
-alter table llx_contrat add column note_public text after note;
-
-alter table llx_facture add column note_public text after note;
-alter table llx_facture add column remise_absolue real DEFAULT 0 after remise_percent;
-alter table llx_facture add column close_code  varchar(16)  after remise;
-alter table llx_facture add column close_note  varchar(128) after close_code;
-alter table llx_facture modify close_code  varchar(16);
-
-alter table llx_propal add column note_public text after note;
-alter table llx_propal add column remise_absolue real DEFAULT 0 after remise_percent;
-
-alter table llx_commande add column remise_absolue real DEFAULT 0 after remise_percent;
-
-ALTER TABLE llx_societe add mode_reglement tinyint;
-ALTER TABLE llx_societe add cond_reglement tinyint;
-ALTER TABLE llx_societe add tva_assuj      tinyint DEFAULT '1';
-ALTER TABLE llx_societe add email          varchar(128) after url;
-
-ALTER TABLE llx_societe change active statut tinyint DEFAULT 0;
-
-ALTER TABLE llx_societe modify mode_reglement     tinyint NULL;
-ALTER TABLE llx_societe modify cond_reglement     tinyint NULL;
-ALTER TABLE llx_societe modify cond_reglement     tinyint NULL;
-ALTER TABLE llx_societe modify fk_stcomm          tinyint        DEFAULT 0;
-ALTER TABLE llx_societe modify services           tinyint        DEFAULT 0;
-ALTER TABLE llx_societe modify client             tinyint        DEFAULT 0;
-ALTER TABLE llx_societe modify fournisseur        tinyint        DEFAULT 0;
-
-ALTER TABLE llx_societe add customer_bad       tinyint        DEFAULT 0 after fournisseur;
-ALTER TABLE llx_societe add customer_rate      real           DEFAULT 0 after customer_bad;
-ALTER TABLE llx_societe add supplier_rate      real           DEFAULT 0 after customer_rate;
-
-ALTER TABLE llx_societe modify siren       varchar(16);
-ALTER TABLE llx_societe modify siret       varchar(16);
-ALTER TABLE llx_societe modify ape         varchar(16);
-ALTER TABLE llx_societe add idprof4        varchar(16) after ape;
-
-ALTER TABLE llx_societe drop column id;
-
-ALTER TABLE llx_societe modify parent             integer;
-UPDATE llx_societe set parent = null where parent = 0;
-
-ALTER TABLE llx_product ADD COLUMN stock_loc VARCHAR(10) DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN gencode VARCHAR(255) DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN weight float DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN weight_units tinyint DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN canvas varchar(15) DEFAULT '';
-
-ALTER TABLE llx_stock_mouvement ADD COLUMN price FLOAT(13,4) DEFAULT 0;
-
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PROFORMA',    6,1, 'Proforma','R�glement avant livraison',0,0);
-
-alter table llx_cond_reglement add (decalage smallint(6) default 0);
-
-alter table llx_commande add fk_cond_reglement integer DEFAULT NULL;
-alter table llx_commande add fk_mode_reglement integer DEFAULT NULL;
-
-
-alter table llx_categorie drop column fk_statut;
-alter table llx_categorie add visible tinyint DEFAULT 1 NOT NULL;
-ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label);
-
-alter table llx_c_actioncomm  add module varchar(16) DEFAULT NULL after libelle;
-
-delete from llx_c_actioncomm where id in (1,2,3,4,5,8,9,50);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 1, 'AC_TEL',  'system', 'Appel Téléphonique' ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 2, 'AC_FAX',  'system', 'Envoi Fax'          ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 3, 'AC_PROP', 'system', 'Envoi Proposition'  ,'propal');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 4, 'AC_EMAIL','system', 'Envoi Email'        ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 5, 'AC_RDV',  'system', 'Rendez-vous'        ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 8, 'AC_COM',  'system', 'Envoi Commande'     ,'order');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 9, 'AC_FAC',  'system', 'Envoi Facture'      ,'invoice');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values (50, 'AC_OTH',  'system', 'Autre'              ,NULL);
-
-alter table llx_actioncomm modify datea datetime;
-alter table llx_actioncomm add column datec datetime after id;
-alter table llx_actioncomm add column datep datetime after datec;
-alter table llx_actioncomm add column datep2 datetime after datep;
-alter table llx_actioncomm add column datea2 datetime after datea;
-alter table llx_actioncomm add column tms timestamp after datea2;
-alter table llx_actioncomm add column fk_commande integer after propalrowid;
-alter table llx_actioncomm add column fk_parent integer NOT NULL default 0 after fk_contact;
-alter table llx_actioncomm add column durationp real after percent;
-alter table llx_actioncomm add column durationa real after durationp;
-alter table llx_actioncomm add column fk_projet integer after label;
-alter table llx_actioncomm add column punctual smallint NOT NULL default 1 after priority;
-
-
-update llx_actioncomm set datec = datea where datec is null;
-update llx_actioncomm set datep = datea where datep is null AND percent < 100;
-update llx_actioncomm set datep = datec where datea is null AND datep is null AND percent < 100;
-update llx_actioncomm set datea = datec where datea is null AND datep is null AND percent = 100;
-update llx_actioncomm set fk_action = '8' where fk_action =  '3' and label = 'Envoi commande par mail';
-
-
-
-drop table if exists llx_expedition_model_pdf;
-
-
-create table llx_product_det
-(
-  rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  fk_product     integer      DEFAULT 0 NOT NULL,
-  lang           varchar(5)   DEFAULT 0 NOT NULL,
-  label          varchar(255) NOT NULL,
-  description    text,
-  note           text
-)ENGINE=innodb;
-
-ALTER TABLE `llx_propal` ADD `date_livraison` DATE;
-ALTER TABLE `llx_commande` ADD `date_livraison` DATE;
-update llx_commande set date_livraison = null where date_livraison = '0000-00-00';
-update llx_commande set date_livraison = null where date_livraison = '1970-01-01';
-
-ALTER TABLE llx_facture_fourn DROP INDEX facnumber;
-ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc);
-ALTER TABLE llx_facture_fourn ADD note_public text after note;
-alter table llx_facture_fourn add column `type` smallint DEFAULT 0 NOT NULL after facnumber;
-
-ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_facture (fk_facture_fourn);
-ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_facture FOREIGN KEY (fk_facture_fourn) REFERENCES llx_facture_fourn (rowid);
-
-
-ALTER TABLE llx_facturedet ADD COLUMN fk_remise_except	integer NULL AFTER remise;
-ALTER TABLE llx_facturedet ADD COLUMN total_ht        real AFTER price;
-ALTER TABLE llx_facturedet ADD COLUMN total_tva       real AFTER total_ht;
-ALTER TABLE llx_facturedet ADD COLUMN total_ttc       real AFTER total_tva;
-ALTER TABLE llx_facturedet ADD COLUMN info_bits		  integer DEFAULT 0 AFTER date_end;
-ALTER TABLE llx_facturedet modify fk_product integer NULL;
-
-UPDATE llx_facturedet SET info_bits=0 where (fk_remise_except IS NULL OR fk_remise_except = 0);
-UPDATE llx_facturedet SET fk_product=NULL where fk_product=0;
-
-ALTER TABLE llx_propaldet ADD COLUMN total_ht        real AFTER price;
-ALTER TABLE llx_propaldet ADD COLUMN total_tva       real AFTER total_ht;
-ALTER TABLE llx_propaldet ADD COLUMN total_ttc       real AFTER total_tva;
-ALTER TABLE llx_propaldet ADD COLUMN info_bits		 integer DEFAULT 0 AFTER total_ttc;
-
-ALTER TABLE llx_commandedet ADD COLUMN total_ht        real AFTER price;
-ALTER TABLE llx_commandedet ADD COLUMN total_tva       real AFTER total_ht;
-ALTER TABLE llx_commandedet ADD COLUMN total_ttc       real AFTER total_tva;
-ALTER TABLE llx_commandedet ADD COLUMN info_bits	   integer DEFAULT 0 AFTER total_ttc;
-
-ALTER TABLE llx_contratdet ADD COLUMN total_ht        real AFTER price_ht;
-ALTER TABLE llx_contratdet ADD COLUMN total_tva       real AFTER total_ht;
-ALTER TABLE llx_contratdet ADD COLUMN total_ttc       real AFTER total_tva;
-ALTER TABLE llx_contratdet ADD COLUMN info_bits	      integer DEFAULT 0 AFTER total_ttc;
-
-
-ALTER TABLE llx_commande ADD INDEX idx_commande_fk_soc (fk_soc);
-ALTER TABLE llx_commande ADD CONSTRAINT fk_commande_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp);
-
-ALTER TABLE llx_commande_fournisseur ADD INDEX idx_commande_fournisseur_fk_soc (fk_soc);
-ALTER TABLE llx_commande_fournisseur ADD CONSTRAINT fk_commande_fournisseur_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp);
-
-
-alter table llx_commande_fournisseur add note_public text after note;
-
-
-drop table if exists llx_avoir_model_pdf;
-
-
-drop table if exists llx_soc_recontact;
-
-
-update llx_const set name='PRODUIT_DESC_IN_FORM' where name='FORM_ADD_PROD_DESC';
-update llx_const set name='PRODUIT_CHANGE_PROD_DESC' where name='CHANGE_PROD_DESC';
-update llx_const set name='COMMANDE_ADD_PROD_DESC' where name='COM_ADD_PROD_DESC';
-update llx_const set name='PROPALE_ADD_PROD_DESC' where name='PROP_ADD_PROD_DESC';
-update llx_const set name='DON_FORM' where name='DONS_FORM';
-update llx_const set name='MAIN_SIZE_LISTE_LIMIT' where name='SIZE_LISTE_LIMIT';
-update llx_const set name='SOCIETE_FISCAL_MONTH_START' where name='FISCAL_MONTH_START';
-update llx_const set visible=0 where name='FACTURE_DISABLE_RECUR';
-update llx_const set visible=0 where name='MAILING_EMAIL_FROM';
-update llx_const set visible=1 where name='PRODUIT_CONFIRM_DELETE_LINE';
-update llx_const set name='NOTIFICATION_EMAIL_FROM', visible=0 where name='MAIN_MAIL_FROM';
-update llx_const set name='NOTIFICATION_EMAIL_FROM', visible=0 where name='MAIN_EMAIL_FROM';
-update llx_const set value=2048, visible=0 where name='MAIN_UPLOAD_DOC' and value=1;
-delete from llx_const where name = 'SIZE_LISTE_LIMIT';
-
-
-insert into llx_const(name,value,type,visible,note) values('MAIN_SHOW_DEVELOPMENT_MODULES','0','yesno',1,'Make development modules visible');
-
-delete from llx_const where name in ('OSC_CATALOG_URL','OSC_LANGUAGE_ID');
-update llx_const set visible=0 where name like 'OSC_DB_%';
-
-alter table llx_paiementfourn add statut smallint(6) NOT NULL DEFAULT 0;
-
-
-alter table llx_bank_url add column type enum("company","payment","member","subscription","donation","sc","payment_sc");
-update llx_bank_url set type=null where type='';
-alter table llx_bank_url modify type enum("company","payment","member","subscription","donation","sc","payment_sc") NOT NULL;
-
-update llx_bank_url set type = 'payment_supplier' where label = '(paiement)' and type='payment' and url like '%/fourn/%';
-
-alter table llx_bank_url drop index fk_bank;
-alter table llx_bank_url drop index fk_bank_2;
-alter table llx_bank_url drop index fk_bank_3;
-alter table llx_bank_url drop index fk_bank_4;
-alter table llx_bank_url drop index fk_bank_5;
-alter table llx_bank_url drop index fk_bank_6;
-alter table llx_bank_url drop index fk_bank_7;
-alter table llx_bank_url drop index fk_bank_8;
-alter table llx_bank_url drop index fk_bank_9;
-
-ALTER TABLE llx_bank_url DROP INDEX uk_bank_url;
-ALTER TABLE llx_bank_url ADD UNIQUE INDEX uk_bank_url (fk_bank,type);
-
-create table llx_societe_adresse_livraison
-(
-  rowid              integer AUTO_INCREMENT PRIMARY KEY,
-  datec	             datetime,
-  tms                timestamp,
-  fk_societe         integer        DEFAULT 0,
-  nom                varchar(60),
-  address            varchar(255),
-  cp                 varchar(10),
-  ville              varchar(50),
-  fk_departement     integer        DEFAULT 0,
-  fk_pays            integer        DEFAULT 0,
-  note               text,
-  fk_user_creat      integer,
-  fk_user_modif      integer
-)ENGINE=innodb;
-
-alter table llx_societe_adresse_livraison add column label varchar(30) after tms;
-
-alter table llx_propal add column fk_adresse_livraison integer after date_livraison;
-alter table llx_commande add column fk_adresse_livraison integer after date_livraison;
-
-alter table llx_c_pays modify libelle varchar(50) NOT NULL;
-
-SET FOREIGN_KEY_CHECKS = 0;
-delete from llx_c_pays;
-SET FOREIGN_KEY_CHECKS = 1;
-insert into llx_c_pays (rowid,code,libelle) values (0,  ''  , '-'              );
-insert into llx_c_pays (rowid,code,libelle) values (1,  'FR', 'France'         );
-insert into llx_c_pays (rowid,code,libelle) values (2,  'BE', 'Belgique'       );
-insert into llx_c_pays (rowid,code,libelle) values (3,  'IT', 'Italie'         );
-insert into llx_c_pays (rowid,code,libelle) values (4,  'ES', 'Espagne'        );
-insert into llx_c_pays (rowid,code,libelle) values (5,  'DE', 'Allemagne'      );
-insert into llx_c_pays (rowid,code,libelle) values (6,  'CH', 'Suisse'         );
-insert into llx_c_pays (rowid,code,libelle) values (7,  'GB', 'Royaume uni'    );
-insert into llx_c_pays (rowid,code,libelle) values (8,  'IE', 'Irlande'        );
-insert into llx_c_pays (rowid,code,libelle) values (9,  'CN', 'Chine'          );
-insert into llx_c_pays (rowid,code,libelle) values (10, 'TN', 'Tunisie'        );
-insert into llx_c_pays (rowid,code,libelle) values (11, 'US', 'Etats Unis'     );
-insert into llx_c_pays (rowid,code,libelle) values (12, 'MA', 'Maroc'          );
-insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Algérie'        );
-insert into llx_c_pays (rowid,code,libelle) values (14, 'CA', 'Canada'         );
-insert into llx_c_pays (rowid,code,libelle) values (15, 'TG', 'Togo'           );
-insert into llx_c_pays (rowid,code,libelle) values (16, 'GA', 'Gabon'          );
-insert into llx_c_pays (rowid,code,libelle) values (17, 'NL', 'Pays Bas'       );
-insert into llx_c_pays (rowid,code,libelle) values (18, 'HU', 'Hongrie'        );
-insert into llx_c_pays (rowid,code,libelle) values (19, 'RU', 'Russie'         );
-insert into llx_c_pays (rowid,code,libelle) values (20, 'SE', 'Suède'          );
-insert into llx_c_pays (rowid,code,libelle) values (21, 'CI', 'Côte d\'Ivoire' );
-insert into llx_c_pays (rowid,code,libelle) values (22, 'SN', 'Sénégal'        );
-insert into llx_c_pays (rowid,code,libelle) values (23, 'AR', 'Argentine'      );
-insert into llx_c_pays (rowid,code,libelle) values (24, 'CM', 'Cameroun'       );
-insert into llx_c_pays (rowid,code,libelle) values (25, 'PT', 'Portugal'       );
-insert into llx_c_pays (rowid,code,libelle) values (26, 'SA', 'Arabie Saoudite');
-insert into llx_c_pays (rowid,code,libelle) values (27, 'MC', 'Monaco'         );
-insert into llx_c_pays (rowid,code,libelle) values (28, 'AU', 'Australie'      );
-insert into llx_c_pays (rowid,code,libelle) values (29, 'SG', 'Singapoure'     );
-insert into llx_c_pays (rowid,code,libelle) values (30, 'AF', 'Afghanistan'    );
-insert into llx_c_pays (rowid,code,libelle) values (31, 'AX', 'Iles Aland'     );
-insert into llx_c_pays (rowid,code,libelle) values (32, 'AL', 'Albanie'        );
-insert into llx_c_pays (rowid,code,libelle) values (33, 'AS', 'Samoa américaines');
-insert into llx_c_pays (rowid,code,libelle) values (34, 'AD', 'Andorre'        );
-insert into llx_c_pays (rowid,code,libelle) values (35, 'AO', 'Angola'         );
-insert into llx_c_pays (rowid,code,libelle) values (36, 'AI', 'Anguilla'       );
-insert into llx_c_pays (rowid,code,libelle) values (37, 'AQ', 'Antarctique'    );
-insert into llx_c_pays (rowid,code,libelle) values (38, 'AG', 'Antigua-et-Barbuda');
-insert into llx_c_pays (rowid,code,libelle) values (39, 'AM', 'Arménie'        );
-insert into llx_c_pays (rowid,code,libelle) values (40, 'AW', 'Aruba'          );
-insert into llx_c_pays (rowid,code,libelle) values (41, 'AT', 'Autriche'       );
-insert into llx_c_pays (rowid,code,libelle) values (42, 'AZ', 'Azerbaïdjan'    );
-insert into llx_c_pays (rowid,code,libelle) values (43, 'BS', 'Bahamas'        );
-insert into llx_c_pays (rowid,code,libelle) values (44, 'BH', 'Bahreïn'        );
-insert into llx_c_pays (rowid,code,libelle) values (45, 'BD', 'Bangladesh'     );
-insert into llx_c_pays (rowid,code,libelle) values (46, 'BB', 'Barbade'        );
-insert into llx_c_pays (rowid,code,libelle) values (47, 'BY', 'Biélorussie'    );
-insert into llx_c_pays (rowid,code,libelle) values (48, 'BZ', 'Belize'         );
-insert into llx_c_pays (rowid,code,libelle) values (49, 'BJ', 'Bénin'          );
-insert into llx_c_pays (rowid,code,libelle) values (50, 'BM', 'Bermudes'       );
-insert into llx_c_pays (rowid,code,libelle) values (51, 'BT', 'Bhoutan'        );
-insert into llx_c_pays (rowid,code,libelle) values (52, 'BO', 'Bolivie'        );
-insert into llx_c_pays (rowid,code,libelle) values (53, 'BA', 'Bosnie-Herzégovine');
-insert into llx_c_pays (rowid,code,libelle) values (54, 'BW', 'Botswana'       );
-insert into llx_c_pays (rowid,code,libelle) values (55, 'BV', 'Ile Bouvet'     );
-insert into llx_c_pays (rowid,code,libelle) values (56, 'BR', 'Brésil'         );
-insert into llx_c_pays (rowid,code,libelle) values (57, 'IO', 'Territoire britannique de l\'Océan Indien');
-insert into llx_c_pays (rowid,code,libelle) values (58, 'BN', 'Brunei'         );
-insert into llx_c_pays (rowid,code,libelle) values (59, 'BG', 'Bulgarie'       );
-insert into llx_c_pays (rowid,code,libelle) values (60, 'BF', 'Burkina Faso'   );
-insert into llx_c_pays (rowid,code,libelle) values (61, 'BI', 'Burundi'        );
-insert into llx_c_pays (rowid,code,libelle) values (62, 'KH', 'Cambodge'       );
-insert into llx_c_pays (rowid,code,libelle) values (63, 'CV', 'Cap-Vert'       );
-insert into llx_c_pays (rowid,code,libelle) values (64, 'KY', 'Iles Cayman'    );
-insert into llx_c_pays (rowid,code,libelle) values (65, 'CF', 'République centrafricaine');
-insert into llx_c_pays (rowid,code,libelle) values (66, 'TD', 'Tchad'          );
-insert into llx_c_pays (rowid,code,libelle) values (67, 'CL', 'Chili'          );
-insert into llx_c_pays (rowid,code,libelle) values (68, 'CX', 'Ile Christmas'  );
-insert into llx_c_pays (rowid,code,libelle) values (69, 'CC', 'Iles des Cocos (Keeling)');
-insert into llx_c_pays (rowid,code,libelle) values (70, 'CO', 'Colombie'       );
-insert into llx_c_pays (rowid,code,libelle) values (71, 'KM', 'Comores'        );
-insert into llx_c_pays (rowid,code,libelle) values (72, 'CG', 'Congo'          );
-insert into llx_c_pays (rowid,code,libelle) values (73, 'CD', 'République démocratique du Congo');
-insert into llx_c_pays (rowid,code,libelle) values (74, 'CK', 'Iles Cook'      );
-insert into llx_c_pays (rowid,code,libelle) values (75, 'CR', 'Costa Rica'     );
-insert into llx_c_pays (rowid,code,libelle) values (76, 'HR', 'Croatie'        );
-insert into llx_c_pays (rowid,code,libelle) values (77, 'CU', 'Cuba'           );
-insert into llx_c_pays (rowid,code,libelle) values (78, 'CY', 'Chypre'         );
-insert into llx_c_pays (rowid,code,libelle) values (79, 'CZ', 'République Tchèque');
-insert into llx_c_pays (rowid,code,libelle) values (80, 'DK', 'Danemark'       );
-insert into llx_c_pays (rowid,code,libelle) values (81, 'DJ', 'Djibouti'       );
-insert into llx_c_pays (rowid,code,libelle) values (82, 'DM', 'Dominique'      );
-insert into llx_c_pays (rowid,code,libelle) values (83, 'DO', 'République Dominicaine');
-insert into llx_c_pays (rowid,code,libelle) values (84, 'EC', 'Equateur'       );
-insert into llx_c_pays (rowid,code,libelle) values (85, 'EG', 'Egypte'         );
-insert into llx_c_pays (rowid,code,libelle) values (86, 'SV', 'Salvador'       );
-insert into llx_c_pays (rowid,code,libelle) values (87, 'GQ', 'Guinée Equatoriale');
-insert into llx_c_pays (rowid,code,libelle) values (88, 'ER', 'Erythrée'       );
-insert into llx_c_pays (rowid,code,libelle) values (89, 'EE', 'Estonie'        );
-insert into llx_c_pays (rowid,code,libelle) values (90, 'ET', 'Ethiopie'       );
-insert into llx_c_pays (rowid,code,libelle) values (91, 'FK', 'Iles Falkland'  );
-insert into llx_c_pays (rowid,code,libelle) values (92, 'FO', 'Iles Féroé'     );
-insert into llx_c_pays (rowid,code,libelle) values (93, 'FJ', 'Iles Fidji'     );
-insert into llx_c_pays (rowid,code,libelle) values (94, 'FI', 'Finlande'       );
-insert into llx_c_pays (rowid,code,libelle) values (95, 'GF', 'Guyane française');
-insert into llx_c_pays (rowid,code,libelle) values (96, 'PF', 'Polynésie française');
-insert into llx_c_pays (rowid,code,libelle) values (97, 'TF', 'Terres australes françaises');
-insert into llx_c_pays (rowid,code,libelle) values (98, 'GM', 'Gambie'         );
-insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'Géorgie'       );
-insert into llx_c_pays (rowid,code,libelle) values (100, 'GH', 'Ghana'         );
-insert into llx_c_pays (rowid,code,libelle) values (101, 'GI', 'Gibraltar'     );
-insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Grèce'         );
-insert into llx_c_pays (rowid,code,libelle) values (103, 'GL', 'Groenland'     );
-insert into llx_c_pays (rowid,code,libelle) values (104, 'GD', 'Grenade'       );
-insert into llx_c_pays (rowid,code,libelle) values (105, 'GP', 'Guadeloupe'    );
-insert into llx_c_pays (rowid,code,libelle) values (106, 'GU', 'Guam'          );
-insert into llx_c_pays (rowid,code,libelle) values (107, 'GT', 'Guatemala'     );
-insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guinée'        );
-insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guinée-Bissao' );
-insert into llx_c_pays (rowid,code,libelle) values (110, 'GY', 'Guyana'        );
-insert into llx_c_pays (rowid,code,libelle) values (111, 'HT', 'Haïti'         );
-insert into llx_c_pays (rowid,code,libelle) values (112, 'HM', 'Iles Heard et McDonald');
-insert into llx_c_pays (rowid,code,libelle) values (113, 'VA', 'Saint-Siège (Vatican)');
-insert into llx_c_pays (rowid,code,libelle) values (114, 'HN', 'Honduras'      );
-insert into llx_c_pays (rowid,code,libelle) values (115, 'HK', 'Hong Kong'     );
-insert into llx_c_pays (rowid,code,libelle) values (116, 'IS', 'Islande'       );
-insert into llx_c_pays (rowid,code,libelle) values (117, 'IN', 'Inde'          );
-insert into llx_c_pays (rowid,code,libelle) values (118, 'ID', 'Indonésie'     );
-insert into llx_c_pays (rowid,code,libelle) values (119, 'IR', 'Iran'          );
-insert into llx_c_pays (rowid,code,libelle) values (120, 'IQ', 'Iraq'          );
-insert into llx_c_pays (rowid,code,libelle) values (121, 'IL', 'Israël'        );
-insert into llx_c_pays (rowid,code,libelle) values (122, 'JM', 'Jamaïque'      );
-insert into llx_c_pays (rowid,code,libelle) values (123, 'JP', 'Japon'         );
-insert into llx_c_pays (rowid,code,libelle) values (124, 'JO', 'Jordanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (125, 'KZ', 'Kazakhstan'    );
-insert into llx_c_pays (rowid,code,libelle) values (126, 'KE', 'Kenya'         );
-insert into llx_c_pays (rowid,code,libelle) values (127, 'KI', 'Kiribati'      );
-insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'Corée du Nord' );
-insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'Corée du Sud'  );
-insert into llx_c_pays (rowid,code,libelle) values (130, 'KW', 'Koweït'        );
-insert into llx_c_pays (rowid,code,libelle) values (131, 'KG', 'Kirghizistan'  );
-insert into llx_c_pays (rowid,code,libelle) values (132, 'LA', 'Laos'          );
-insert into llx_c_pays (rowid,code,libelle) values (133, 'LV', 'Lettonie'      );
-insert into llx_c_pays (rowid,code,libelle) values (134, 'LB', 'Liban'         );
-insert into llx_c_pays (rowid,code,libelle) values (135, 'LS', 'Lesotho'       );
-insert into llx_c_pays (rowid,code,libelle) values (136, 'LR', 'Liberia'       );
-insert into llx_c_pays (rowid,code,libelle) values (137, 'LY', 'Libye'         );
-insert into llx_c_pays (rowid,code,libelle) values (138, 'LI', 'Liechtenstein' );
-insert into llx_c_pays (rowid,code,libelle) values (139, 'LT', 'Lituanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (140, 'LU', 'Luxembourg'    );
-insert into llx_c_pays (rowid,code,libelle) values (141, 'MO', 'Macao'         );
-insert into llx_c_pays (rowid,code,libelle) values (142, 'MK', 'ex-République yougoslave de Macédoine');
-insert into llx_c_pays (rowid,code,libelle) values (143, 'MG', 'Madagascar'    );
-insert into llx_c_pays (rowid,code,libelle) values (144, 'MW', 'Malawi'        );
-insert into llx_c_pays (rowid,code,libelle) values (145, 'MY', 'Malaisie'      );
-insert into llx_c_pays (rowid,code,libelle) values (146, 'MV', 'Maldives'      );
-insert into llx_c_pays (rowid,code,libelle) values (147, 'ML', 'Mali'          );
-insert into llx_c_pays (rowid,code,libelle) values (148, 'MT', 'Malte'         );
-insert into llx_c_pays (rowid,code,libelle) values (149, 'MH', 'Iles Marshall' );
-insert into llx_c_pays (rowid,code,libelle) values (150, 'MQ', 'Martinique'    );
-insert into llx_c_pays (rowid,code,libelle) values (151, 'MR', 'Mauritanie'    );
-insert into llx_c_pays (rowid,code,libelle) values (152, 'MU', 'Maurice'       );
-insert into llx_c_pays (rowid,code,libelle) values (153, 'YT', 'Mayotte'       );
-insert into llx_c_pays (rowid,code,libelle) values (154, 'MX', 'Mexique'       );
-insert into llx_c_pays (rowid,code,libelle) values (155, 'FM', 'Micronésie'    );
-insert into llx_c_pays (rowid,code,libelle) values (156, 'MD', 'Moldavie'      );
-insert into llx_c_pays (rowid,code,libelle) values (157, 'MN', 'Mongolie'      );
-insert into llx_c_pays (rowid,code,libelle) values (158, 'MS', 'Monserrat'     );
-insert into llx_c_pays (rowid,code,libelle) values (159, 'MZ', 'Mozambique'    );
-insert into llx_c_pays (rowid,code,libelle) values (160, 'MM', 'Birmanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (161, 'NA', 'Namibie'       );
-insert into llx_c_pays (rowid,code,libelle) values (162, 'NR', 'Nauru'         );
-insert into llx_c_pays (rowid,code,libelle) values (163, 'NP', 'Népal'         );
-insert into llx_c_pays (rowid,code,libelle) values (164, 'AN', 'Antilles néerlandaises');
-insert into llx_c_pays (rowid,code,libelle) values (165, 'NC', 'Nouvelle-Calédonie');
-insert into llx_c_pays (rowid,code,libelle) values (166, 'NZ', 'Nouvelle-Zélande');
-insert into llx_c_pays (rowid,code,libelle) values (167, 'NI', 'Nicaragua'     );
-insert into llx_c_pays (rowid,code,libelle) values (168, 'NE', 'Niger'         );
-insert into llx_c_pays (rowid,code,libelle) values (169, 'NG', 'Nigeria'       );
-insert into llx_c_pays (rowid,code,libelle) values (170, 'NU', 'Nioué'         );
-insert into llx_c_pays (rowid,code,libelle) values (171, 'NF', 'Ile Norfolk'   );
-insert into llx_c_pays (rowid,code,libelle) values (172, 'MP', 'Mariannes du Nord');
-insert into llx_c_pays (rowid,code,libelle) values (173, 'NO', 'Norvège'       );
-insert into llx_c_pays (rowid,code,libelle) values (174, 'OM', 'Oman'          );
-insert into llx_c_pays (rowid,code,libelle) values (175, 'PK', 'Pakistan'      );
-insert into llx_c_pays (rowid,code,libelle) values (176, 'PW', 'Palaos'        );
-insert into llx_c_pays (rowid,code,libelle) values (177, 'PS', 'territoire Palestinien Occupé');
-insert into llx_c_pays (rowid,code,libelle) values (178, 'PA', 'Panama'        );
-insert into llx_c_pays (rowid,code,libelle) values (179, 'PG', 'Papouasie-Nouvelle-Guinée');
-insert into llx_c_pays (rowid,code,libelle) values (180, 'PY', 'Paraguay'      );
-insert into llx_c_pays (rowid,code,libelle) values (181, 'PE', 'Pérou'         );
-insert into llx_c_pays (rowid,code,libelle) values (182, 'PH', 'Philippines'   );
-insert into llx_c_pays (rowid,code,libelle) values (183, 'PN', 'Iles Pitcairn' );
-insert into llx_c_pays (rowid,code,libelle) values (184, 'PL', 'Pologne'       );
-insert into llx_c_pays (rowid,code,libelle) values (185, 'PR', 'Porto Rico'    );
-insert into llx_c_pays (rowid,code,libelle) values (186, 'QA', 'Qatar'         );
-insert into llx_c_pays (rowid,code,libelle) values (187, 'RE', 'Réunion'       );
-insert into llx_c_pays (rowid,code,libelle) values (188, 'RO', 'Roumanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (189, 'RW', 'Rwanda'        );
-insert into llx_c_pays (rowid,code,libelle) values (190, 'SH', 'Sainte-Hélène' );
-insert into llx_c_pays (rowid,code,libelle) values (191, 'KN', 'Saint-Christophe-et-Niévès');
-insert into llx_c_pays (rowid,code,libelle) values (192, 'LC', 'Sainte-Lucie'  );
-insert into llx_c_pays (rowid,code,libelle) values (193, 'PM', 'Saint-Pierre-et-Miquelon');
-insert into llx_c_pays (rowid,code,libelle) values (194, 'VC', 'Saint-Vincent-et-les-Grenadines');
-insert into llx_c_pays (rowid,code,libelle) values (195, 'WS', 'Samoa'         );
-insert into llx_c_pays (rowid,code,libelle) values (196, 'SM', 'Saint-Marin'   );
-insert into llx_c_pays (rowid,code,libelle) values (197, 'ST', 'Sao Tomé-et-Principe');
-insert into llx_c_pays (rowid,code,libelle) values (198, 'RS', 'Serbie'        );
-insert into llx_c_pays (rowid,code,libelle) values (199, 'SC', 'Seychelles'    );
-insert into llx_c_pays (rowid,code,libelle) values (200, 'SL', 'Sierra Leone'  );
-insert into llx_c_pays (rowid,code,libelle) values (201, 'SK', 'Slovaquie'     );
-insert into llx_c_pays (rowid,code,libelle) values (202, 'SI', 'Slovénie'      );
-insert into llx_c_pays (rowid,code,libelle) values (203, 'SB', 'Iles Salomon'  );
-insert into llx_c_pays (rowid,code,libelle) values (204, 'SO', 'Somalie'       );
-insert into llx_c_pays (rowid,code,libelle) values (205, 'ZA', 'Afrique du Sud');
-insert into llx_c_pays (rowid,code,libelle) values (206, 'GS', 'Iles Géorgie du Sud et Sandwich du Sud');
-insert into llx_c_pays (rowid,code,libelle) values (207, 'LK', 'Sri Lanka'     );
-insert into llx_c_pays (rowid,code,libelle) values (208, 'SD', 'Soudan'        );
-insert into llx_c_pays (rowid,code,libelle) values (209, 'SR', 'Suriname'      );
-insert into llx_c_pays (rowid,code,libelle) values (210, 'SJ', 'Iles Svalbard et Jan Mayen');
-insert into llx_c_pays (rowid,code,libelle) values (211, 'SZ', 'Swaziland'     );
-insert into llx_c_pays (rowid,code,libelle) values (212, 'SY', 'Syrie'         );
-insert into llx_c_pays (rowid,code,libelle) values (213, 'TW', 'Taïwan'        );
-insert into llx_c_pays (rowid,code,libelle) values (214, 'TJ', 'Tadjikistan'   );
-insert into llx_c_pays (rowid,code,libelle) values (215, 'TZ', 'Tanzanie'      );
-insert into llx_c_pays (rowid,code,libelle) values (216, 'TH', 'Thaïlande'     );
-insert into llx_c_pays (rowid,code,libelle) values (217, 'TL', 'Timor Oriental');
-insert into llx_c_pays (rowid,code,libelle) values (218, 'TK', 'Tokélaou'      );
-insert into llx_c_pays (rowid,code,libelle) values (219, 'TO', 'Tonga'         );
-insert into llx_c_pays (rowid,code,libelle) values (220, 'TT', 'Trinité-et-Tobago');
-insert into llx_c_pays (rowid,code,libelle) values (221, 'TR', 'Turquie'       );
-insert into llx_c_pays (rowid,code,libelle) values (222, 'TM', 'Turkménistan'  );
-insert into llx_c_pays (rowid,code,libelle) values (223, 'TC', 'Iles Turks-et-Caicos');
-insert into llx_c_pays (rowid,code,libelle) values (224, 'TV', 'Tuvalu'        );
-insert into llx_c_pays (rowid,code,libelle) values (225, 'UG', 'Ouganda'       );
-insert into llx_c_pays (rowid,code,libelle) values (226, 'UA', 'Ukraine'       );
-insert into llx_c_pays (rowid,code,libelle) values (227, 'AE', 'Emirats arabes unis');
-insert into llx_c_pays (rowid,code,libelle) values (228, 'UM', 'Iles mineures éloignées des états-Unis');
-insert into llx_c_pays (rowid,code,libelle) values (229, 'UY', 'Uruguay'       );
-insert into llx_c_pays (rowid,code,libelle) values (230, 'UZ', 'Ouzbékistan'   );
-insert into llx_c_pays (rowid,code,libelle) values (231, 'VU', 'Vanuatu'       );
-insert into llx_c_pays (rowid,code,libelle) values (232, 'VE', 'Vénézuela'     );
-insert into llx_c_pays (rowid,code,libelle) values (233, 'VN', 'Viêt Nam'      );
-insert into llx_c_pays (rowid,code,libelle) values (234, 'VG', 'Iles Vierges britanniques');
-insert into llx_c_pays (rowid,code,libelle) values (235, 'VI', 'Iles Vierges américaines');
-insert into llx_c_pays (rowid,code,libelle) values (236, 'WF', 'Wallis-et-Futuna');
-insert into llx_c_pays (rowid,code,libelle) values (237, 'EH', 'Sahara occidental');
-insert into llx_c_pays (rowid,code,libelle) values (238, 'YE', 'Yémen'         );
-insert into llx_c_pays (rowid,code,libelle) values (239, 'ZM', 'Zambie'        );
-insert into llx_c_pays (rowid,code,libelle) values (240, 'ZW', 'Zimbabwe'      );
-
-delete from llx_c_regions where rowid='2901' and code_region='2901';
-delete from llx_c_departements where fk_region='2901';
-
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (2801,28,2801,     '',0,'Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NSW','',1,'','New South Wales');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'VIC','',1,'','Victoria');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'QLD','',1,'','Queensland');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'SA','',1,'','South Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'ACT','',1,'','Australia Capital Territory');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'TAS','',1,'','Tasmania');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'WA','',1,'','Western Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'NT','',1,'','Northern Territory');
-
-delete from llx_c_tva where rowid='291' and fk_pays='5';
-delete from llx_c_tva where rowid='292' and fk_pays='5';
-delete from llx_c_tva where rowid='291' and fk_pays='29';
-delete from llx_c_tva where rowid='292' and fk_pays='29';
-delete from llx_c_tva where rowid='261' and fk_pays='26';
-delete from llx_c_tva where rowid='262' and fk_pays='26';
-delete from llx_c_tva where rowid='263' and fk_pays='26';
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (281, 28,  '10','0','VAT Rate 10',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (282, 28,   '0','0','VAT Rate 0',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (251,25,  '17','0','VAT Rate 17',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (252,25,  '12','0','VAT Rate 12',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (253,25,   '0','0','VAT Rate 0',1);
-
-
-update llx_const set name='DON_ADDON_MODEL' where name='DON_ADDON';
-update llx_const set value='neptune' where value='pluton' and name = 'FACTURE_ADDON';
-update llx_const set value='azur' where value='orange' and name = 'PROPALE_ADDON';
-update llx_const set value='mod_commande_diamant' where value='mod_commande_jade' and name ='COMMANDE_ADDON';
-insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON', 'pacific','chaine',0);
-
-alter table llx_propal_model_pdf rename to llx_document_model;
-
-alter table llx_document_model DROP PRIMARY KEY;
-alter table llx_document_model add column rowid integer AUTO_INCREMENT PRIMARY KEY FIRST;
-alter table llx_document_model add column type varchar(20) NOT NULL after nom;
-update llx_document_model set type='propal' where type='';
-
-delete from llx_document_model where nom='adytek';
-delete from llx_document_model where nom='rouge' and type='order';
-delete from llx_document_model where nom='azur' and type='order';
-delete from llx_document_model where nom='orange' and type='propal';
-delete from llx_document_model where nom='transporteur' and type='shipping';
-delete from llx_document_model where nom='dorade' and type='shipping';
-
-
-
-
-ALTER TABLE llx_facture ADD UNIQUE INDEX idx_facture_uk_facnumber (facnumber);
-
-alter table llx_facture_rec add column remise_absolue real default 0 after remise_percent;
-alter table llx_facture_rec add column fk_mode_reglement integer default 0 after fk_cond_reglement;
-alter table llx_facture_rec add column date_lim_reglement date after fk_mode_reglement;
-alter table llx_facture_rec add column note_public text after note;
-update llx_facture_rec set fk_mode_reglement='0' where fk_mode_reglement='NULL';
-
-ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_soc (fk_soc);
-ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_user_author (fk_user_author);
-ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_projet (fk_projet);
-
-ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_user_author    FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
-ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_projet         FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
-
-ALTER TABLE llx_facture_rec ADD UNIQUE INDEX idx_facture_rec_uk_titre (titre);
-
-ALTER TABLE llx_commandedet ADD COLUMN fk_remise_except	integer NULL AFTER remise;
-ALTER TABLE llx_commandedet ADD COLUMN special_code tinyint(1) UNSIGNED DEFAULT 0;
-
-ALTER TABLE llx_propaldet ADD COLUMN fk_remise_except	integer NULL AFTER remise;
-
-ALTER TABLE llx_contratdet ADD COLUMN fk_remise_except	integer NULL AFTER remise;
-
-create table llx_livraison
-(
-  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
-  fk_commande           integer DEFAULT 0,
-  fk_expedition         integer,
-  ref                   varchar(30) NOT NULL,
-  date_creation         datetime,
-  date_valid            datetime,
-  fk_user_author        integer,
-  fk_user_valid         integer,
-  fk_statut             smallint  default 0,
-  note                  text,
-  note_public           text,
-  model_pdf             varchar(50),
-  date_livraison 	      date 	  default NULL,
-  fk_adresse_livraison  integer,
-
-  UNIQUE INDEX (ref),
-  key(fk_commande)
-)ENGINE=innodb;
-
-alter table llx_livraison drop foreign key fk_livraison_societe;
-alter table llx_livraison drop column fk_soc;
-
-
-create table llx_livraisondet
-(
-  rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  fk_livraison      integer,
-  fk_commande_ligne integer NOT NULL,
-  qty               real,
-  key(fk_livraison),
-  key(fk_commande_ligne)
-)ENGINE=innodb;
-
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (90, 'commande',  'internal', 'SALESREPSIGN',  'Commercial signataire de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (91, 'commande',  'internal', 'SALESREPFOLL',  'Commercial suivi de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (100, 'commande',  'external', 'BILLING',       'Contact client facturation commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (101, 'commande',  'external', 'CUSTOMER',      'Contact client suivi commande', 1);
-
-alter table llx_bank_account add column ref varchar(12) NOT NULL;
-alter table llx_bank_account add column url varchar(128);
-alter table llx_bank_account add column currency_code varchar(2) NOT NULL;
-alter table llx_bank_account add column min_allowed integer DEFAULT 0;
-alter table llx_bank_account add column min_desired integer DEFAULT 0;
-alter table llx_bank_account add column comment varchar(254);
-alter table llx_bank_account modify bic varchar(11);
-
-update llx_bank_account set currency_code='EU';
-update llx_bank_account set rappro=0 where courant=2;
-
-ALTER TABLE llx_bank ADD COLUMN fk_bordereau  INTEGER DEFAULT 0;
-ALTER TABLE llx_bank ADD COLUMN banque   varchar(255);
-ALTER TABLE llx_bank ADD COLUMN emetteur varchar(255);
-
-alter table llx_accountingsystem_det rename to llx_accountingaccount;
-
-
-insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (262,'Consulter tous les clients','commercial','r',1,'voir','client');
--- V4.1 insert into llx_user_rights(fk_user,fk_id) select distinct fk_user, '262' from llx_user_rights where fk_id = 261;
-update llx_rights_def set subperms='creer' where subperms='supprimer' AND module='user' AND perms='self' AND id=255;
-update llx_rights_def set module='tax' where module='compta' AND id in ('91','92','93');
-update llx_rights_def set subperms='receptionner' where id=186;
-
-
-alter table llx_commandedet add column rang integer DEFAULT 0;
-alter table llx_propaldet add column rang integer DEFAULT 0;
-
-alter table llx_facture drop column model;
-alter table llx_facture add column model_pdf varchar(50) after note_public;
-
-alter table llx_facture drop foreign key fk_facture_fk_facture;
-alter table llx_facture drop column fk_facture;
-alter table llx_facture add column fk_facture_source integer after fk_user_valid;
-ALTER TABLE llx_facture ADD INDEX idx_facture_fk_facture_source (fk_facture_source);
-ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_source_fk_facture FOREIGN KEY (fk_facture_source)     REFERENCES llx_facture (rowid);
-alter table llx_facture add column type smallint DEFAULT 0 NOT NULL after facnumber;
-
-
--- Supprimme orphelins pour permettre montée de la clé
--- V4 DELETE llx_commandedet FROM llx_commandedet LEFT JOIN llx_commande ON llx_commandedet.fk_commande = llx_commande.rowid WHERE llx_commande.rowid IS NULL;
-
-ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_commande (fk_commande);
-ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commande FOREIGN KEY (fk_commande) REFERENCES llx_commande (rowid);
-
-
--- drop table llx_societe_remise_except;
-create table llx_societe_remise_except
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  fk_soc          integer NOT NULL,
-  datec           datetime,
-  amount_ht       real NOT NULL,
-  fk_user         integer NOT NULL,
-  fk_facture      integer,
-  description     varchar(255) NOT NULL
-)ENGINE=innodb;
-
-alter table llx_societe_remise_except ADD COLUMN amount_tva real DEFAULT 0 NOT NULL after amount_ht;
-alter table llx_societe_remise_except ADD COLUMN amount_ttc real DEFAULT 0 NOT NULL after amount_tva;
-alter table llx_societe_remise_except ADD COLUMN tva_tx real DEFAULT 0 NOT NULL after amount_ttc;
-alter table llx_societe_remise_except ADD COLUMN fk_facture_source integer after fk_user;
-
-update llx_societe_remise_except set amount_tva=0, tva_tx=0, amount_ttc = amount_ht where amount_ttc = 0;
-delete from llx_societe_remise_except WHERE amount_ht=0;
-
--- Supprimme orphelins pour permettre montée de la clé
--- V4 DELETE llx_societe_remise_except FROM llx_societe_remise_except LEFT JOIN llx_facturedet ON llx_societe_remise_except.fk_facture = llx_facturedet.rowid WHERE llx_facturedet.rowid IS NULL;
-
-ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_facture;
-ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_facture_source;
-
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_user (fk_user);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_soc (fk_soc);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_source (fk_facture_source);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_user    FOREIGN KEY (fk_user)    REFERENCES llx_user (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc     FOREIGN KEY (fk_soc)     REFERENCES llx_societe (idp);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facturedet (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_source FOREIGN KEY (fk_facture_source) REFERENCES llx_facture (rowid);
-
-update llx_societe_remise_except set description='Remise sans description' where description is NULL or description ='';
-alter table llx_societe_remise_except modify description varchar(255) NOT NULL;
-
-insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 0, 'Durée de validitée des propales');
-
-alter table llx_propal add column ref_client varchar(30) after ref;
-
-alter table llx_societe_adresse_livraison drop column fk_departement;
-
-alter table llx_user change datelastaccess datelastlogin datetime;
-alter table llx_user add column datepreviouslogin datetime after datelastlogin;
-alter table llx_user add column ldap_sid varchar(255) DEFAULT NULL;
-alter table llx_user add column statut tinyint DEFAULT 1;
-alter table llx_user add column lang varchar(6);
-alter table llx_user add column pass_crypted varchar(128) after pass;
-
-alter table llx_user add column office_phone      varchar(20);
-alter table llx_user add column office_fax        varchar(20);
-alter table llx_user add column user_mobile       varchar(20);
-
-
-alter table llx_user modify login varchar(24) NOT NULL;
-alter table llx_user drop code;
-
-
-update llx_user set pass_crypted = MD5(pass) where pass IS NOT NULL AND pass_crypted IS NULL and length(pass) < 32;
-update llx_user set pass_crypted = pass where pass IS NOT NULL AND pass_crypted IS NULL and length(pass) = 32;
-update llx_user set pass = NULL where length(pass) = 32;
-
-ALTER TABLE llx_user modify fk_societe        integer;
-ALTER TABLE llx_user modify fk_socpeople      integer;
-alter table llx_user add column fk_member integer after fk_socpeople;
-
-update llx_user set fk_societe = NULL where fk_societe = 0;
-update llx_user set fk_socpeople = NULL where fk_socpeople = 0;
-update llx_user set fk_member = NULL where fk_member = 0;
-
-ALTER TABLE llx_user DROP INDEX login;
-
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login);
-
-ALTER TABLE llx_user ADD INDEX uk_user_fk_societe   (fk_societe);
-
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople);
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member    (fk_member);
-
-
-alter table llx_boxes add column fk_user integer;
-
-alter table llx_commande_fournisseur drop column fk_soc_contact;
-alter table llx_commande drop column fk_soc_contact;
-alter table llx_livraison drop column fk_soc_contact;
-alter table llx_propal drop column fk_soc_contact;
-
-alter table llx_commandedet drop column label;
-
-
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_VAL_ORDER_SUUPLIER','Validation commande fournisseur','Déclenché lors de la validation d\'une commande fournisseur','order_supplier');
-
-
-
-drop table if exists llx_sqltables;
-
-
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_1;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_2;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_3;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_4;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_5;
-
-ALTER TABLE llx_categorie_product ADD CONSTRAINT fk_categorie_product_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_product ADD CONSTRAINT fk_categorie_product_product_rowid   FOREIGN KEY (fk_product)   REFERENCES llx_product (rowid);
-
-ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product);
-
-alter table llx_product modify label varchar(255) NOT NULL;
-alter table llx_product modify description text;
-ALTER TABLE llx_product ADD COLUMN price_base_type varchar(3) DEFAULT 'HT' AFTER price;
-ALTER TABLE llx_product ADD COLUMN price_ttc float(12,4) DEFAULT 0 AFTER price_base_type;
-alter table llx_product_det modify label varchar(255) NOT NULL;
-alter table llx_product_det modify description text;
-
-create table llx_accountingdebcred
-(
- fk_transaction  integer		NOT NULL,
- fk_account      integer		NOT NULL,
-	amount          real		NOT NULL,
-	direction       varchar(1)	NOT NULL
-)ENGINE=innodb;
-
-alter table llx_facturedet_rec add column total_ht real;
-alter table llx_facturedet_rec add column total_tva real;
-alter table llx_facturedet_rec add column total_ttc real;
-
-alter table llx_adherent add column phone            varchar(30) after email;
-alter table llx_adherent add column phone_perso      varchar(30) after phone;
-alter table llx_adherent add column phone_mobile     varchar(30) after phone_perso;
-
-delete from llx_adherent_type where libelle IS NULL;
-alter table llx_adherent_type modify libelle          varchar(50) NOT NULL;
-
-update llx_facture set fk_facture_source=null where fk_facture_source is not null and type = 0;
-update llx_facture set fk_statut=2 where paye=1;
-update llx_facture set fk_statut=2 where close_code is not null and close_code != '' and close_code != 'replaced';
-
-
-update llx_boxes set fk_user = 0 where fk_user IS NULL;
-ALTER TABLE llx_boxes modify fk_user integer default 0 NOT NULL;
-
--- Supprimme orphelins pour permettre montee de la cle
--- V4 DELETE llx_boxes FROM llx_boxes LEFT JOIN llx_boxes_def ON llx_boxes.box_id = llx_boxes_def.rowid WHERE llx_boxes_def.rowid IS NULL;
-
-ALTER TABLE llx_boxes ADD INDEX idx_boxes_boxid (box_id);
--- V4 ALTER TABLE llx_boxes ADD CONSTRAINT fk_boxes_box_id FOREIGN KEY (box_id) REFERENCES llx_boxes_def (rowid);
-
-ALTER TABLE llx_boxes ADD INDEX idx_boxes_fk_user (fk_user);
-
-
-create table llx_categorie_fournisseur
-(
-  fk_categorie  integer NOT NULL,
-  fk_societe    integer NOT NULL,
-  UNIQUE (fk_categorie, fk_societe)
-)ENGINE=innodb;
-
-
-create table llx_fournisseur_ca
-(
-  fk_societe    integer,
-  date_calcul   datetime,
-  year          smallint UNSIGNED,
-  ca_genere     float,
-  UNIQUE (fk_societe, year)
-)ENGINE=innodb;
-
-alter table llx_fournisseur_ca add ca_achat float(11,2) DEFAULT 0;
-
-create table llx_product_ca
-(
-  fk_product    integer,
-  date_calcul   datetime,
-  year          smallint UNSIGNED,
-  ca_genere     float,
-  UNIQUE (fk_product, year)
-)ENGINE=innodb;
-
-create table llx_commande_fournisseur_dispatch
-(
-  rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  fk_commande    integer,
-  fk_product     integer,
-  qty            float,              -- quantit�
-  fk_entrepot    integer,
-  fk_user        integer,
-  datec          datetime
-)ENGINE=innodb;
-
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX (fk_commande);
-
-create table llx_stock_valorisation
-(
-  rowid              integer AUTO_INCREMENT PRIMARY KEY,
-  tms                timestamp,             -- date technique mise a jour automatiquement
-  date_valo          datetime,              -- date de valorisation
-  fk_product         integer NOT NULL,      -- id du produit concerne par l'operation
-  qty_ope            float(9,3),            -- quantite de l'operation
-  price_ope          float(12,4),           -- prix unitaire du produit concerne par l'operation
-  valo_ope           float(12,4),           -- valorisation de l'operation
-  price_pmp          float(12,4),           -- valeur PMP de l'operation
-  qty_stock          float(9,3) DEFAULT 0,  -- qunatite en stock
-  valo_pmp           float(12,4),           -- valorisation du stock en PMP
-  fk_stock_mouvement integer,               -- id du mouvement de stock
-
-  key(fk_product)
-)ENGINE=innodb;
-
-
-create table llx_entrepot_valorisation
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,      -- date technique mise a jour automatiquement
-  date_calcul     date,           -- date auquel a ete calcule la valeur
-  fk_entrepot     integer UNSIGNED NOT NULL ,
-  valo_pmp        float(12,4),    -- valoristaion du stock en PMP
-  key(fk_entrepot)
-)ENGINE=innodb;
-
-ALTER TABLE llx_entrepot ADD COLUMN valo_pmp float(12,4) DEFAULT 0;
-
-create table llx_user_entrepot
-(
-  rowid        integer AUTO_INCREMENT PRIMARY KEY,
-  fk_entrepot  integer UNSIGNED, -- pointe sur llx_entrepot
-  fk_user      integer UNSIGNED, -- pointe sur llx_user
-  consult      tinyint(1) UNSIGNED,
-  send         tinyint(1) UNSIGNED
-)ENGINE=innodb;
-
-create table llx_product_subproduct
-(
-  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  fk_product            integer NOT NULL, -- id du produit maitre
-  fk_product_subproduct integer NOT NULL, -- id du sous-produit
-  UNIQUE(fk_product, fk_product_subproduct)
-)ENGINE=innodb;
-
-create table llx_bordereau_cheque
-(
-  rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  datec             datetime,
-  date_bordereau    date,
-  number            mediumint,
-  amount            float(12,2),
-  nbcheque          smallint UNSIGNED DEFAULT 0,
-  fk_bank_account   integer,
-  fk_user_author    integer,
-  note              text,
-  statut            tinyint(1) UNSIGNED DEFAULT 0
-)ENGINE=innodb;
-
-alter table llx_product_price add price_level tinyint(4) NULL DEFAULT 1;
-alter table llx_product_price add column price_ttc float(12,4) DEFAULT 0 after price;
-alter table llx_product_price add column price_base_type varchar(3)  DEFAULT 'HT' after price_ttc;
-
-ALTER TABLE llx_document_model ADD UNIQUE uk_document_model (nom,type);
-
-ALTER TABLE llx_chargesociales drop column date_pai;
-
-UPDATE llx_facture SET type=0 where type=3;
-
-create table llx_export_model
-(
-  	rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  	label         varchar(50) NOT NULL,
-  	type          varchar(20) NOT NULL,
-  	field         text
-)ENGINE=innodb;
-
-ALTER table llx_export_model add fk_user		  integer DEFAULT 0 NOT NULL after rowid;
-
-ALTER TABLE llx_export_model ADD UNIQUE uk_export_model (label);
-
-UPDATE llx_rights_def  SET ID=ID+1001 WHERE ID BETWEEN 180 AND 189 AND module='fournisseur';
-UPDATE llx_user_rights SET fk_id=fk_id+1001 WHERE fk_id BETWEEN 180 AND 189;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1001 WHERE fk_id BETWEEN 180 AND 189;
-
-UPDATE llx_rights_def  SET ID=ID+1000 WHERE ID BETWEEN 230 AND 236 AND module='fournisseur';
-UPDATE llx_user_rights SET fk_id=fk_id+1000 WHERE fk_id BETWEEN 230 AND 236;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1000 WHERE fk_id BETWEEN 230 AND 236;
-
-UPDATE llx_rights_def  SET ID=ID+1 WHERE ID BETWEEN 1320 AND 1320 AND module='facture';
-UPDATE llx_user_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1320 AND 1320;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1320 AND 1320;
-
-UPDATE llx_rights_def  SET ID=ID+1 WHERE ID BETWEEN 1420 AND 1420 AND module='commande';
-UPDATE llx_user_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1420 AND 1420;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1420 AND 1420;
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
diff --git a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql
deleted file mode 100644
index 835c78e151a..00000000000
--- a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql
+++ /dev/null
@@ -1,1183 +0,0 @@
---
--- Attention a l ordre des requetes.
--- Ce fichier doit etre charge sur une version 2.1.0 
--- sans AUCUNE erreur ni warning
---
-
-
-alter table llx_commande_fournisseur_dispatch drop index fk_commande;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_2;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_3;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_4;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_5;
-
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande);
-
---V4.1 UPDATE llx_product_fournisseur_price set fk_user = null where fk_user not in (select rowid from llx_user);
---V4.1 delete llx_commande where fk_soc not in (select rowid from llx_societe);
-
-alter table llx_categorie add column type tinyint DEFAULT 1 NOT NULL;
-
--- Supprime les doublons de la table llx_categories
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- V4.1 CREATE TABLE tmp_categorie1 SELECT * FROM llx_categorie;
--- V4.1 CREATE TABLE tmp_categorie2 SELECT * FROM llx_categorie;
--- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type);
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- Si suppression des doublons precedente a ete faite, on monte la cle sur les categories
--- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type);
-
--- On migre les categories fournisseur de la table llx_fournisseur_categorie qui est obsolete vers table llx_categories qui est generique pour gerer les categories de tout type
--- V4.1 INSERT into llx_categorie (label, description, visible, type) (select distinct label, label, 1, 1 from llx_fournisseur_categorie);
--- V4.1 UPDATE llx_categorie_fournisseur as cf SET cf.fk_categorie = IFNULL((SELECT distinct c.rowid from llx_categorie as c, llx_fournisseur_categorie as fc where fc.rowid = cf.fk_categorie AND c.type = 1 AND c.label = fc.label),cf.fk_categorie);
-
--- Supprime les doublons de la table llx_categories
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- V4.1 CREATE TABLE tmp_categorie1 SELECT * FROM llx_categorie;
--- V4.1 CREATE TABLE tmp_categorie2 SELECT * FROM llx_categorie;
--- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type);
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- Si suppression des doublons precedente a ete faite, on monte la cle sur les categories
--- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type);
-
-
--- Corrige mauvaise insertion du a champ trop court
-alter table llx_action_def modify code varchar(28) UNIQUE NOT NULL;
-alter table llx_action_def modify objet_type varchar(16) NOT NULL;
-update llx_action_def set code = 'NOTIFY_VAL_ORDER_SUPPLIER' where code = 'NOTIFY_VAL_ORDER_SUUPLIE';
-update llx_action_def set objet_type = 'order_supplier' where code = 'NOTIFY_VAL_ORDER_SUPPLIER';
-
--- Nettoyage champ ref table llx_bank_account
-update llx_bank_account set ref=concat('ACCOUNT',rowid) where (ref='' or ref is null);
-
-update llx_bank_account set currency_code='EU' where (currency_code IS NULL or currency_code='');
-alter table llx_bank_account modify currency_code varchar(3) NOT NULL;
-update llx_bank_account set currency_code='EUR' where (currency_code IS NULL or currency_code='' or currency_code='EU');
-
--- Sequence de requete pour nettoyage et correction champ type table llx_bank_url
-update llx_bank_url set type='company'  where (type is null or type = '') and url like '%compta/fiche.php?socid=%';
-alter table llx_bank_url modify `type` varchar(20);
-update llx_bank_url set type='?'  where (type is null or type = '') and url like '%compta/facture.php?facid=%';
-update llx_bank_url set type='payment_supplier' where (type='' or type is null) and url like '%fourn/paiement/fiche.php?id=%';
-update llx_bank_url set type='?'  where (type is null or type = '');
-alter table llx_bank_url modify `type` varchar(20) NOT NULL;
-
-update llx_bank set datev = datec where datev = '1970-01-01 00:00:00' and rappro = 0;
-update llx_bank set dateo = datec where datev = '1970-01-01 00:00:00' and rappro = 0;
-
-alter table llx_c_chargesociales add column actioncompta varchar(12) NOT NULL;
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 1, 'Allocations familiales', 1,1,'TAXFAM');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 2, 'GSG Déductible',         1,1,'TAXCSGD');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 3, 'GSG/CRDS NON Déductible',0,1,'TAXCSGND');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (10, 'Taxe apprentissage',    0,1,'TAXAPP');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (11, 'Taxe professionnelle',   0,1,'TAXPRO');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (12, 'Contribution à la formation professionnelle',  1,1,'TAXOPCA');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (20, 'Impots locaux/fonciers', 0,1,'TAXFON');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (30, 'Assurance Santé (SECU-URSSAF)',  0,1,'TAXSECU');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (40, 'Mutuelle',                       0,1,'TAXMUT');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (50, 'Assurance vieillesse (CNAV)',    0,1,'TAXRET');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (60, 'Assurance Chomage (ASSEDIC)',    0,1,'TAXCHOM');
-update llx_c_chargesociales set actioncompta='TAXFAM'   where id = 1;
-update llx_c_chargesociales set actioncompta='TAXCSGD'  where id = 2;
-update llx_c_chargesociales set actioncompta='TAXCSGND' where id = 3;
-update llx_c_chargesociales set actioncompta='TAXAPP'   where id = 10;
-update llx_c_chargesociales set actioncompta='TAXPRO'   where id = 11;
-update llx_c_chargesociales set actioncompta='TAXFON'   where id = 20;
-alter table llx_chargesociales modify fk_type integer NOT NULL; 
-alter table llx_chargesociales modify libelle varchar(80) NOT NULL;
-
-insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (114,'Rapprocher transactions','banque','w',0,null,'consolidate');
-update llx_rights_def set libelle='Creer/modifier/supprimer ecriture bancaire' where perms='modifier' AND module='banque';
-
--- Supprime colone en doublon avec fk_user_creat
-alter table llx_paiement drop column author;
-
-update llx_actioncomm set fk_action = 9 where fk_action = 10;
-update llx_actioncomm set percent = 100 where percent = 0 and datea is not null;
-
-ALTER TABLE llx_cotisation ADD COLUMN datef date after dateadh;
-ALTER TABLE llx_cotisation modify datef date;
-ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh);
--- V4.1 update llx_cotisation set datef = ADDDATE(ADDDATE(dateadh, INTERVAL 1 YEAR),INTERVAL -1 DAY);
-
-
-delete from llx_const where name='MAIN_SHOW_DEVELOPMENT_MODULES';
-delete from llx_const where name='MAIN_ENABLE_DEVELOPMENT';
-DELETE FROM llx_const WHERE name = 'PRODUIT_CHANGE_PROD_DESC';
-DELETE FROM llx_const WHERE name like 'FICHINTER_ADDON%';
-insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON',    'pacific','chaine',0);
-insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON_PDF','soleil','chaine',0);
-
-INSERT INTO llx_const(name, value, type, note, visible) VALUES ('GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine','location of genbarcode',0);
-insert into llx_const(name, value, type, visible, note) values('MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development');
-
-update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_FROM';
-
-update llx_const set value='bluelagoon' where name='MAIN_THEME' and value ='dolibarr';
-
-update llx_const set visible=0 where name in ('MAIN_UPLOAD_DOC','MAIN_MAIL_SMTP_SERVER','MAIN_MAIL_SMTP_PORT','MAIN_MAIL_EMAIL_FROM');
-
-update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRELEFT'      and  value='default.php';
-update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRETOP'       and  value='default.php';
-update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRELEFT' and  value='default.php';
-update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRETOP'  and  value='default.php';
-
-
-delete from llx_adherent_type where libelle IS NULL;
-alter table llx_adherent_type modify libelle varchar(50) NOT NULL;
-
-
-alter table llx_tva add fk_bank         integer NOT NULL;
-alter table llx_tva add fk_user_creat   integer;
-alter table llx_tva add fk_user_modif   integer;
-
--- V4.1 UPDATE llx_tva as t set fk_bank = (SELECT IFNULL(MIN(rowid),0) FROM llx_bank as b WHERE b.datev = t.datev AND b.amount = -t.amount AND b.label like 'R%glement TVA') WHERE t.fk_bank = 0;
--- V4.1 UPDATE llx_tva as t set fk_user_creat = (SELECT MIN(fk_user_author) FROM llx_bank as b WHERE b.datev = t.datev AND b.amount = -t.amount AND b.label like 'R%glement TVA') WHERE t.fk_user_creat IS NULL;
-
-
--- Extention de la gestion des categories
-alter table llx_categorie ADD type int not null default '0';
--- V4 ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref;
-
-create table `llx_categorie_societe` (
-  `fk_categorie` integer not null,
-  `fk_societe` integer not null,
-  UNIQUE KEY `fk_categorie` (`fk_categorie`,`fk_societe`),
-  KEY `fk_societe` (`fk_societe`)
-) ENGINE=innodb;
-
-alter table `llx_categorie_societe` drop foreign key fk_societe;
-alter table `llx_categorie_societe` add constraint `fk_categorie_societe_categorie_rowid` foreign key(`fk_categorie`) REFERENCES `llx_categorie` (`rowid`);
-alter table `llx_categorie_societe` add constraint `fk_categorie_societe_fk_soc` foreign key(`fk_societe`) REFERENCES `llx_societe` (`rowid`);
-
-create table `llx_categorie_product` (
-  `fk_categorie` integer not null,
-  `fk_product` integer not null,
-  PRIMARY KEY  (`fk_categorie`,`fk_product`),
-  KEY `idx_categorie_product_fk_categorie` (`fk_categorie`),
-  KEY `idx_categorie_product_fk_product` (`fk_product`)
-) ENGINE=innodb;
-
-alter table `llx_categorie_product`
-  add constraint `fk_categorie_product_categorie_rowid` foreign key(`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
-  add constraint `fk_categorie_product_product_rowid` foreign key(`fk_product`) REFERENCES `llx_product` (`rowid`);
-
-  
--- Ajout gestion du droit de pret
-drop table if exists `llx_droitpret_rapport`;
-create table `llx_droitpret_rapport` (
-  `rowid` integer NOT NULL auto_increment,
-  `date_envoie` datetime NOT NULL,
-  `format` varchar(10) NOT NULL,
-  `date_debut` datetime NOT NULL,
-  `date_fin` datetime NOT NULL,
-  `fichier` varchar(255) NOT NULL,
-  `nbfact` integer NOT NULL,
-  PRIMARY KEY  (`rowid`)
-) ENGINE=innodb;
-
-
--- Gestion des menu
-CREATE TABLE `llx_menu` (
-  `rowid` integer NOT NULL,
-  `menu_handler` varchar(16) NOT NULL default 'auguria',
-  `type` enum('top','left') NOT NULL default 'left',
-  `mainmenu` varchar(100) NOT NULL,
-  `fk_menu` integer NOT NULL,
-  `order` tinyint(4) NOT NULL,
-  `url` varchar(255) NOT NULL,
-  `target` varchar(100) NULL,
-  `titre` varchar(255) NOT NULL,
-  `langs` varchar(100),
-  `level` tinyint(1),
-  `leftmenu` varchar(100) NULL,
-  `right` varchar(255),
-  `user` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`rowid`)
-) ENGINE=innodb;
-
-create table `llx_menu_constraint` (
-  `rowid` integer NOT NULL,
-  `action` varchar(255) NOT NULL,
-  PRIMARY KEY  (`rowid`)
-) ENGINE=innodb;
-
-create table `llx_menu_const` (
-  `rowid` integer NOT NULL auto_increment,
-  `fk_menu` integer NOT NULL,
-  `fk_constraint` integer NOT NULL,
-  `user` tinyint(4) NOT NULL default '2',
-  PRIMARY KEY  (`rowid`)
-) ENGINE=innodb;
-
-ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_menu` (`fk_menu`);
-ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_constraint` (`fk_constraint`);
-
-ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_menu` FOREIGN KEY (`fk_menu`) REFERENCES `llx_menu` (`rowid`);
-ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_constraint` FOREIGN KEY (`fk_constraint`) REFERENCES `llx_menu_constraint` (`rowid`);
-
-
--- 
--- Contenu de la table `llx_menu`
--- 
-delete from llx_menu_const;
-delete from llx_menu_constraint;
-delete from llx_menu where menu_handler='auguria';
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1, 'home', '', 0, '/index.php?mainmenu=home&leftmenu=', 'Home', -1, '', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2, 'companies', '', 0, '/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3, 'products', '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4, 'suppliers', '', 0, '/fourn/index.php?mainmenu=suppliers&amp;leftmenu=', 'Suppliers', -1, 'suppliers', '$user->rights->fournisseur->lire', '', 0, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5, 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->commercial->main->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (6, 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire || $user->rights->banque->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (7, 'project', '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (8, 'tools', '', 0, '/index.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (9, 'telephony', '', 0, '/telephonie/index.php?mainmenu=telephony&amp;leftmenu=', 'Telephony', -1, 'telephony', '$user->rights->telephonie->lire', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (10, 'energy', '', 0, '/energie/index.php?mainmenu=energy&amp;leftmenu=', 'Energy', -1, 'energy', '', '', 2, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (11, 'shop', '', 0, '/boutique/index.php?mainmenu=shop&amp;leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (12, 'shop', '', 0, '/oscommerce_ws/index.php?mainmenu=shop&amp;leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 12);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (13, 'webcal', '', 0, '/webcal/webcal.php?mainmenu=webcal&amp;leftmenu=', 'Calendar', -1, 'other', '', '', 0, 13);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (14, 'mantis', '', 0, '/mantis/mantis.php?mainmenu=mantis', 'BugTracker', -1, 'other', '', '', 2, 14);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (15, 'members', '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '', '', 2, 15);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (16, 'phenix', '', 0, '/phenix/phenix.php?mainmenu=phenix&amp;leftmenu=', 'Calendar', -1, 'other', '', '', 0, 16);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (100, 'home', '', 1, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (101, 'home', '$leftmenu=="setup"', 100, '/admin/company.php', 'MenuCompanySetup', 1, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (102, 'home', '$leftmenu=="setup"', 100, '/admin/ihm.php', 'GUISetup', 1, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (103, 'home', '$leftmenu=="setup"', 100, '/admin/modules.php', 'Modules', 1, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (104, 'home', '$leftmenu=="setup"', 100, '/admin/boxes.php', 'Boxes', 1, 'admin', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (105, 'home', '$leftmenu=="setup"', 100, '/admin/menus.php', 'Menus', 1, 'admin', '', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (106, 'home', '$leftmenu=="setup"', 100, '/admin/delais.php', 'DelaysBeforeWarning', 1, 'admin', '', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (107, 'home', '$leftmenu=="setup"', 100, '/admin/triggers.php', 'Triggers', 1, 'admin', '', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (108, 'home', '$leftmenu=="setup"', 100, '/admin/perms.php', 'Security', 1, 'admin', '', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (109, 'home', '$leftmenu=="setup"', 100, '/admin/mails.php', 'Emails', 1, 'admin', '', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (110, 'home', '$leftmenu=="setup"', 100, '/admin/limits.php', 'Limits', 1, 'admin', '', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (111, 'home', '$leftmenu=="setup"', 100, '/admin/dict.php', 'DictionarySetup', 1, 'admin', '', '', 2, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (112, 'home', '$leftmenu=="setup"', 100, '/admin/const.php', 'OtherSetup', 1, 'admin', '', '', 2, 11);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (200, 'home', '', 1, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (201, 'home', '$leftmenu=="system"', 200, '/admin/system/dolibarr.php', 'Dolibarr', 1, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (202, 'home', '$leftmenu=="system"', 201, '/admin/system/constall.php', 'AllParameters', 2, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (203, 'home', '$leftmenu=="system"', 201, '/about.php', 'About', 2, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (204, 'home', '$leftmenu=="system"', 200, '/admin/system/os.php', 'OS', 1, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (205, 'home', '$leftmenu=="system"', 200, '/admin/system/web.php', 'WebServer', 1, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (206, 'home', '$leftmenu=="system"', 200, '/admin/system/phpinfo.php', 'Php', 1, 'admin', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (207, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=conf', 'PhpConf', 2, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (208, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=env', 'PhpEnv', 2, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (209, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=modules', 'PhpModules', 2, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (210, 'home', '$leftmenu=="system"', 200, '/admin/system/database.php', 'Database', 1, 'admin', '', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (211, 'home', '$leftmenu=="system"', 210, '/admin/system/database-tables.php', 'Tables', 2, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (212, 'home', '$leftmenu=="system"', 210, '/admin/system/database-tables-contraintes.php', 'Constraints', 2, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (300, 'home', '', 1, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (301, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/dolibarr_export.php', 'Backup', 1, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (302, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/dolibarr_import.php', 'Restore', 1, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (303, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/purge.php', 'Purge', 1, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (304, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/eaccelerator.php', 'EAccelerator', 1, 'admin', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (400, 'home', '', 1, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (401, 'home', '$leftmenu=="users"', 400, '/user/index.php', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (402, 'home', '$leftmenu=="users"', 401, '/user/fiche.php?action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (403, 'home', '$leftmenu=="users"', 400, '/user/group/index.php', 'Groups', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (404, 'home', '$leftmenu=="users"', 403, '/user/group/fiche.php?action=create', 'NewGroup', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (500, 'companies', '', 2, '/societe.php', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (501, 'companies', '', 500, '/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (502, 'companies', '', 500, '/societe/groupe/index.php', 'MenuSocGroup', 1, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (503, 'companies', '', 500, '/fourn/liste.php?leftmenu=suppliers', 'Suppliers', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (504, 'companies', '', 503, '/soc.php?leftmenu=supplier&action=create&type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (505, 'companies', '', 503, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 2, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (506, 'companies', '', 500, '/comm/prospect/prospects.php?leftmenu=prospects', 'Prospects', 1, 'companies', '$user->rights->societe->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (507, 'companies', '', 506, '/soc.php?leftmenu=prospects&action=create&type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (508, 'companies', '', 506, '/contact/index.php?leftmenu=customers&type=p', 'Contacts', 2, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (509, 'companies', '', 500, '/comm/clients.php?leftmenu=customers', 'Customers', 1, 'companies', '$user->rights->societe->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (510, 'companies', '', 509, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (511, 'companies', '', 509, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 2, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (600, 'companies', '', 2, '/contact/index.php?leftmenu=contacts', 'Contacts', 0, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (601, 'companies', '', 600, '/contact/fiche.php?leftmenu=contacts&action=create', 'NewContact', 1, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (602, 'companies', '', 600, '/contact/index.php?leftmenu=contacts', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (700, 'commercial', '', 5, '/comm/prospect/index.php?leftmenu=prospects', 'Prospects', 0, 'companies', '$user->rights->societe->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (701, 'commercial', '', 700, '/soc.php?leftmenu=prospects&action=create&type=c', 'MenuNewProspect', 1, 'companies', '$user->rights->societe->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (702, 'commercial', '', 700, '/contact/index.php?leftmenu=prospects&type=p', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (703, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=-1', 'LastProspectDoNotContact', 2, 'companies', '$user->rights->societe->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (704, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=0', 'LastProspectNeverContacted', 2, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (705, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=1', 'LastProspectToContact', 2, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (706, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=2', 'LastProspectContactInProcess', 2, 'companies', '$user->rights->societe->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (707, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=3', 'LastProspectContactDone', 2, 'companies', '$user->rights->societe->lire', '', 0, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (708, 'commercial', '', 700, '/contact/index.php?leftmenu=prospects&type=p', 'Contacts', 1, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (800, 'commercial', '', 5, '/comm/index.php?leftmenu=customers', 'Customers', 0, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (801, 'commercial', '', 800, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 1, 'companies', '$user->rights->societe->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (802, 'commercial', '', 800, '/comm/clients.php?leftmenu=customers', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (803, 'commercial', '', 800, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 1, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (900, 'commercial', '', 5, '/contact/index.php?leftmenu=contacts', 'Contacts', 0, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (901, 'commercial', '', 900, '/contact/fiche.php?leftmenu=contacts&action=create', 'NewContact', 1, 'companies', '$user->rights->societe->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (902, 'commercial', '', 900, '/contact/index.php?leftmenu=contacts&action=create', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1000, 'commercial', '', 5, '/comm/action/index.php?leftmenu=actions', 'Actions', 0, 'companies', '$user->rights->societe->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1001, 'commercial', '$leftmenu=="actions"', 1000, '/societe.php?leftmenu=actions', 'NewAction', 1, 'companies', '$user->rights->societe->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1002, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/index.php?leftmenu=actions&status=todo', 'MenuToDoActions', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1003, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/index.php?leftmenu=actions&time=today', 'Today', 1, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1004, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/rapport/index.php?leftmenu=actions', 'Reportings', 1, 'companies', '$user->rights->societe->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1100, 'commercial', '', 5, '/comm/propal.php?leftmenu=propals', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1101, 'commercial', '$leftmenu=="propals"', 1100, '/societe.php?leftmenu=propals', 'NewPropal', 1, 'propal', '$user->rights->propale->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1102, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=0', 'PropalsDraft', 1, 'propal', '$user->rights->propale->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1103, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=1', 'PropalsOpened', 1, 'propal', '$user->rights->propale->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1104, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=2,3,4', 'PropalStatusClosedShort', 1, 'propal', '$user->rights->propale->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1105, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal/stats/index.php?leftmenu=propals', 'Statistics', 1, 'propal', '$user->rights->propale->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1200, 'commercial', '', 5, '/commande/index.php?leftmenu=orders', 'Orders', 0, 'orders', '$user->rights->commande->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1201, 'commercial', '$leftmenu=="orders"', 1200, '/societe.php?leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1202, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1203, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1204, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=2', 'StatusOrderOnProcessShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1205, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=3', 'StatusOrderToBill', 1, 'orders', '$user->rights->commande->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1206, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1207, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1208, 'commercial', '$leftmenu=="orders"', 1200, '/commande/stats/index.php?leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1300, 'commercial', '', 5, '/expedition/index.php?leftmenu=sendings', 'Sendings', 0, 'orders', '$user->rights->expedition->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1301, 'commercial', '$leftmenu=="sendings"', 1300, '/expedition/liste.php?leftmenu=sendings', 'List', 1, 'orders', '$user->rights->expedition->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1302, 'commercial', '$leftmenu=="sendings"', 1300, '/expedition/stats/index.php?leftmenu=sendings', 'Statistics', 1, 'orders', '$user->rights->expedition->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1400, 'commercial', '', 5, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1401, 'commercial', '$leftmenu=="contracts"', 1400, '/societe.php?leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1402, 'commercial', '$leftmenu=="contracts"', 1400, '/contrat/liste.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1403, 'commercial', '$leftmenu=="contracts"', 1400, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1404, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1405, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1406, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=4&filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1407, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1500, 'commercial', '', 5, '/fichinter/index.php?leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1501, 'commercial', '$leftmenu=="ficheinter"', 1500, '/fichinter/fiche.php?action=create&leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1502, 'commercial', '$leftmenu=="ficheinter"', 1500, '/fichinter/index.php?leftmenu=ficheinter', 'List', 1, 'interventions', '$user->rights->ficheinter->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1600, 'accountancy', '', 6, '/compta/index.php?leftmenu=suppliers', 'Suppliers', 0, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1601, 'accountancy', '', 1600, '/soc.php?leftmenu=suppliers&action=create&type=f', 'NewSupplier', 1, 'companies', '$user->rights->societe->creer && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1602, 'accountancy', '', 1600, '/fourn/liste.php?leftmenu=suppliers', 'List', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1603, 'accountancy', '', 1600, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1604, 'accountancy', '', 1600, '/fourn/facture/index.php?leftmenu=suppliers_bills', 'BillsSuppliers', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1605, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/fiche.php?action=create', 'NewBill', 2, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1606, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/impayees.php', 'Unpaid', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1607, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/paiement.php', 'Payments', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1700, 'accountancy', '', 6, '/compta/index.php?leftmenu=customers', 'Customers', 0, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1701, 'accountancy', '', 1700, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 1, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1702, 'accountancy', '', 1700, '/compta/clients.php?leftmenu=customers', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1703, 'accountancy', '', 1700, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1704, 'accountancy', '', 1700, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 1, 'bills', '$user->rights->facture->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1705, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/clients.php?action=facturer&leftmenu=customers_bills', 'NewBill', 2, 'bills', '$user->rights->facture->creer', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1706, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 2, 'bills', '$user->rights->facture->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1707, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills', 'Unpaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1708, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/paiement/liste.php?leftmenu=customers_bills_payments', 'Payments', 2, 'bills', '$user->rights->facture->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1709, 'accountancy', 'preg_match("/customers_bills_payments/i",$leftmenu)', 1708, '/compta/paiement/avalider.php?leftmenu=customers_bills_payments', 'MenuToValid', 3, 'bills', '$user->rights->facture->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1710, 'accountancy', 'preg_match("/customers_bills_payments/i",$leftmenu)', 1708, '/compta/paiement/rapport.php?leftmenu=customers_bills_payments', 'Reportings', 3, 'bills', '$user->rights->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1711, 'accountancy', '', 6, '/compta/paiement/cheque/index.php?leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1712, 'accountancy', 'preg_match("/checks/i",$leftmenu)', 1711, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'bills', '$user->rights->facture->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1713, 'accountancy', 'preg_match("/checks/i",$leftmenu)', 1711, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'MenuChequesReceipts', 1, 'bills', '$user->rights->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1714, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 2, 'bills', '$user->rights->facture->lire', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1715, 'accountancy', '', 1700, '/compta/paiement/cheque/index.php', 'CheckReceipt', 1, 'bills', '$user->rights->facture->lire', '', 1, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1716, 'accountancy', '', 1704, '/compta/paiement/cheque/fiche.php?action=new', 'New', 2, 'bills', '$user->rights->facture->lire', '', 1, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1717, 'accountancy', '', 1704, '/compta/paiement/cheque/liste.php', 'List', 2, 'bills', '$user->rights->facture->lire', '', 1, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1800, 'accountancy', '', 6, '/compta/propal.php', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1900, 'accountancy', '', 6, '/compta/commande/liste.php?leftmenu=orders&status=3&afacturer=1', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2000, 'accountancy', '', 6, '/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2001, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/fiche.php?action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2002, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/liste.php?action=create', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2003, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/stats.php', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2100, 'accountancy', '', 6, '/compta/deplacement/index.php', 'Trips', 0, 'trips', '$user->rights->deplacement->lire', '', 0, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2200, 'accountancy', '', 6, '/compta/charges/index.php?leftmenu=charges&mainmenu=accountancy', 'Charges', 0, 'Charges', '$user->rights->tax->charges->lire', '', 0, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2201, 'accountancy', '$leftmenu=="charges"', 2200, '/compta/sociales/index.php', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2300, 'accountancy', '', 6, '/compta/tva/index.php?leftmenu=vat&mainmenu=accountancy', 'VAT', 0, 'companies', '$user->rights->tax->charges->lire', '', 0, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2301, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/fiche.php?action=create', 'NewPayment', 1, 'companies', '$user->rights->tax->charges->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2302, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/reglement.php', 'Payments', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2303, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/clients.php', 'ReportByCustomers', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2400, 'accountancy', '', 6, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2401, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/liste.php', 'A ventiler', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2402, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/lignes.php', 'Ventil�es', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2403, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2404, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2405, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/fiche.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2406, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2407, 'accountancy', '$leftmenu=="ventil"', 2406, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2408, 'accountancy', '$leftmenu=="ventil"', 2406, '/compta/export/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2500, 'accountancy', '', 6, '/compta/prelevement/index.php?leftmenu=withdraw', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2501, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/demandes.php?status=0', 'StandingOrderToProcess', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2502, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/create.php', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2503, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/bons.php', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2504, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/liste.php', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2505, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/liste_factures.php', 'WithdrawedBills', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2506, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/rejets.php', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2507, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/stats.php', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2508, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/config.php', 'Setup', 1, 'withdrawals', '$user->rights->prelevement->bons->configurer', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2600, 'accountancy', '', 6, '/compta/bank/index.php?leftmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2601, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/fiche.php?action=create', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2602, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/categ.php', 'Categories', 1, 'banks', '$user->rights->banque->configurer', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2603, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/search.php', 'SearchTransaction', 1, 'banks', '$user->rights->banque->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2604, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/budget.php', 'ByRubriques', 1, 'banks', '$user->rights->banque->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2605, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/bilan.php', 'Bilan', 1, 'banks', '$user->rights->banque->lire', '', 0, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2606, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/virement.php', 'BankTransfers', 1, 'banks', '$user->rights->banque->modifier', '', 0, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2607, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/bplc.php', 'Transactions BPLC', 1, 'banks', '', '', 0, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2700, 'accountancy', '', 6, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 11);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2701, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/resultat/index.php?leftmenu=ca', 'R�sultat / Exercice', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2702, 'accountancy', '$leftmenu=="ca"', 2701, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2703, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/stats/index.php?leftmenu=ca', 'Chiffre d''affaire', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2704, 'accountancy', '$leftmenu=="ca"', 2703, '/compta/stats/casoc?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2705, 'accountancy', '$leftmenu=="ca"', 2703, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2800, 'products', '', 3, '/product/index.php?leftmenu=product&type=0', 'Products', 0, 'products', '$user->rights->produit->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2801, 'products', '', 2800, '/product/fiche.php?leftmenu=product&action=create&type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2802, 'products', '', 2800, '/product/liste.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2803, 'products', '', 2800, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->stock->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2804, 'products', '', 2800, '/product/fiche.php?leftmenu=product&action=create&type=0&canvas=livre', 'Nouveau livre', 1, 'products', '$user->rights->produit->creer', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2805, 'products', '', 2800, '/product/liste.php?leftmenu=product&type=0&canvas=livre', 'Livre', 1, 'products', '$user->rights->produit->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2900, 'products', '', 3, '/product/index.php?leftmenu=service&type=1', 'Services', 0, 'products', '$user->rights->produit->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2901, 'products', '', 2900, '/product/fiche.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->produit->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2902, 'products', '', 2900, '/product/liste.php?leftmenu=service&type=1', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3000, 'products', '', 3, '/product/stats/index.php?leftmenu=stats', 'Statistics', 0, 'main', '$user->rights->produit>lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3001, 'products', '', 3000, '/product/popuprop.php?leftmenu=stats', 'Popularity', 1, 'main', '$user->rights->produit>lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3100, 'products', '', 3, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3101, 'products', '$leftmenu=="stock"', 3100, '/product/stock/fiche.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3102, 'products', '$leftmenu=="stock"', 3100, '/product/stock/liste.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3103, 'products', '$leftmenu=="stock"', 3100, '/product/stock/valo.php', 'EnhancedValue', 1, 'stocks', '$user->rights->stock->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3104, 'products', '$leftmenu=="stock"', 3100, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3200, 'products', '', 3, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie>lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3201, 'products', '$leftmenu=="cat"', 3200, '/categories/fiche.php?action=create&type=0', 'NewCat', 1, 'categories', '$user->rights->categorie>creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3300, 'suppliers', '', 4, '/fourn/index.php?leftmenu=suppliers', 'Suppliers', 0, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3301, 'suppliers', '', 3300, '/soc.php?leftmenu=suppliers&action=create&type=f', 'NewSupplier', 1, 'suppliers', '$user->rights->societe->creer && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3302, 'suppliers', '', 3300, '/fourn/liste.php', 'List', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3303, 'suppliers', '', 3300, '/contact/index.php?leftmenu=supplier&type=f', 'Contacts', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3304, 'suppliers', '', 3300, '/fourn/stats.php', 'Statistics', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3400, 'suppliers', '', 4, '/fourn/facture/index.php', 'Bills', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3401, 'suppliers', '', 3400, '/fourn/facture/fiche.php?action=create', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3402, 'suppliers', '', 3400, '/fourn/facture/paiement.php', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3500, 'suppliers', '', 4, '/fourn/commande/index.php?leftmenu=suppliers', 'Orders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3501, 'suppliers', '', 3500, '/societe.php?leftmenu=supplier', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3502, 'suppliers', '', 3500, '/fourn/commande/liste.php?leftmenu=suppliers', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3600, 'project', '', 7, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3601, 'project', '', 3600, '/comm/clients.php?leftmenu=projects', 'NewProject', 1, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3602, 'project', '', 3600, '/projet/liste.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3700, 'project', '', 7, '/projet/tasks', 'Tasks', 0, 'projects', '$user->rights->projet->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3701, 'project', '', 3700, '/projet/tasks/mytasks.php', 'MyTasks', 1, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3800, 'project', '', 7, '/projet/activity', 'Activity', 0, 'projects', '$user->rights->projet->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3801, 'project', '', 3800, '/projet/activity/myactivity.php', 'MyActivity', 1, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3900, 'tools', '', 8, '/comm/mailing/index.php?leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3901, 'tools', '', 3900, '/comm/mailing/fiche.php?leftmenu=mailing&action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3902, 'tools', '', 3900, '/comm/mailing/liste.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4000, 'tools', '', 8, '/bookmarks/liste.php?leftmenu=bookmarks', 'Bookmarks', 0, 'other', '$user->rights->bookmark->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4001, 'tools', '', 4000, '/bookmarks/fiche.php?action=create', 'NewBookmark', 1, 'other', '$user->rights->bookmark->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4002, 'tools', '', 4000, '/bookmarks/liste.php', 'List', 1, 'other', '$user->rights->bookmark->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4100, 'tools', '', 8, '/exports/index.php?leftmenu=export', 'FormatedExport', 0, 'exports', '$user->rights->export->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4101, 'tools', '', 4100, '/exports/export.php?leftmenu=export', 'NewExport', 1, 'exports', '$user->rights->export->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4130, 'tools', '', 8, '/admin/import/index.php?leftmenu=import', 'FormatedImport', 0, 'imports', '$user->rights->import->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4131, 'tools', '', 4130, '/admin/import/import.php?leftmenu=import', 'NewImport', 1, 'imports', '$user->rights->import->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4200, 'members', '', 15, '/adherents/index.php?leftmenu=members&mainmenu=members', 'Members', 0, 'members', '$user->rights->adherent->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4201, 'members', '', 4200, '/adherents/fiche.php?action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4202, 'members', '', 4200, '/adherents/liste.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4203, 'members', '', 4200, '/adherents/liste.php?statut=-1', 'MenuMembersToValidate', 1, 'members', '$user->rights->adherent->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4204, 'members', '', 4200, '/adherents/liste.php?statut=1', 'MenuMembersValidated', 1, 'members', '$user->rights->adherent->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4205, 'members', '', 4200, '/adherents/liste.php?statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 1, 'members', '$user->rights->adherent->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4206, 'members', '', 4200, '/adherents/liste.php?statut=1&filter=uptodate', 'MenuMembersUpToDate', 1, 'members', '$user->rights->adherent->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4207, 'members', '', 4200, '/adherents/liste.php?statut=0', 'MenuMembersResiliated', 1, 'members', '$user->rights->adherent->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4300, 'members', '', 15, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4301, 'members', '', 4300, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4302, 'members', '', 4300, '/adherents/cotisations.php?leftmenu=accountancy', 'List', 1, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4400, 'members', '', 15, '/compta/bank/index.php?leftmenu=accountancy', 'Bank', 0, 'banks', '$user->rights->adherent->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4500, 'members', '', 15, '/adherents/index.php?leftmenu=export&mainmenu=members', 'Exports', 0, 'members', '$user->rights->adherent->export', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4501, 'members', '$leftmenu=="export"', 4500, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4502, 'members', '$leftmenu=="export"', 4500, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4503, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4504, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/etiquette.php?leftmenu=export', 'Etiquettes d''adh�rents', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4600, 'members', '', 15, '/public/adherents/index.php?leftmenu=member_public', 'MemberPublicLinks', 0, 'members', '$user->rights->adherent->export', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4700, 'members', '', 15, '/adherents/index.php?leftmenu=setup&mainmenu=members', 'Setup', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4701, 'members', '', 4700, '/adherents/type.php?leftmenu=setup', 'MembersTypes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4702, 'members', '', 4700, '/adherents/options.php?leftmenu=setup', 'MembersAttributes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4800, 'product', '', 3, '/product/droitpret/index.php?leftmenu=droitpret', 'Droit de pr�t', 0, 'products', '$user->rights->droitpret->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4801, 'product', '$leftmenu=="droitpret"', 4800, '/product/droitpret/index.php?leftmenu=droitpret', 'G�n�rer rapport', 1, 'products', '$user->rights->droitpret->creer', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4900, 'suppliers', '', 4, '/categories/index.php?leftmenu=cat&type=1', 'Categories', 0, 'categories', '$user->rights->categorie>lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4901, 'suppliers', '$leftmenu=="cat"', 4900, '/categories/fiche.php?action=create&type=1', 'NewCat', 1, 'categories', '$user->rights->categorie>creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5000, 'commercial', '', 5, '/categories/index.php?leftmenu=cat&type=2', 'Categories', 0, 'commercial', '$user->rights->categorie>lire', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5001, 'commercial', '$leftmenu=="cat"', 5000, '/categories/fiche.php?action=create&type=2', 'NewCat', 1, 'commercial', '$user->rights->categorie>creer', '', 2, 0);
-update llx_menu set type='top' where level=-1;
-
--- 
--- Contenu de la table `llx_menu_constraint`
--- 
-insert into `llx_menu_constraint` (`rowid`, `action`) values (1, '$user->admin');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (2, '$conf->societe->enabled && $user->rights->societe->lire');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (3, '$user->rights->societe->creer');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (4, 'is_dir("societe/groupe")');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (5, '$conf->societe->enabled && $conf->fournisseur->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (6, '$user->societe_id == 0');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (7, '$conf->propal->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (8, '$conf->commande->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (9, '$conf->expedition->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (10, '$conf->contrat->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (11, '$conf->fichinter->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (12, '$conf->societe->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (13, '$conf->facture->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (14, '! $conf->global->FACTURE_DISABLE_RECUR');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (15, '$conf->don->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (16, '$conf->deplacement->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (17, '$conf->tax->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (18, '($conf->compta->enabled || $conf->comptaexpert->enabled) && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $user->societe_id == 0');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (19, '$conf->compta-enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (20, '$conf->prelevement->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (21, '$conf->banque->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (22, '$conf->compta->enabled || $conf->comptaexpert->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (23, '$conf->produit->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (24, '$conf->stock->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (25, '$conf->service->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (26, '$conf->categorie->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (27, '$conf->projet->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (28, '$conf->mailing->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (29, '$conf->bookmark->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (30, '$conf->export->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (31, '$conf->adherent->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (32, '($conf->societe->enabled && $user->rights->societe->lire) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (33, '$conf->produit->enabled || $conf->service->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (34, '$conf->fournisseur->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (35, '$conf->commercial->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (36, '$conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled\r\n        	|| $conf->commande->enabled || $conf->facture->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (37, '$conf->mailing->enabled || $conf->export->enabled || $conf->bookmark->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (38, '$conf->boutique->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (39, '$conf->oscommerce2->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (40, '$conf->webcal->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (41, '$conf->mantis->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (42, '(dolibarr_get_const($this->db,"PRODUIT_SPECIAL_LIVRE")) && (dolibarr_get_const($this->db,"PRODUCT_CANVAS_ABILITY"))');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (43, '!((dolibarr_get_const($this->db,"PRODUIT_SPECIAL_LIVRE")) && (dolibarr_get_const($this->db,"PRODUCT_CANVAS_ABILITY")))');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (44, '$conf->droitpret->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (45, '$conf->menudb->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (46, '$conf->energie->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (47, '$conf->telephonie->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (48, '($user->admin && function_exists("eaccelerator_info"))');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (49, '$conf->import->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (50, '$conf->phenix->enabled');
-
--- 
--- Contenu de la table `llx_menu_const`
--- 
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (1, 100, 1, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (2, 200, 1, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (3, 300, 1, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (4, 304, 48, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (5, 501, 3, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (6, 502, 4, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (7, 504, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (8, 503, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (9, 504, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (10, 505, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (11, 500, 2, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (12, 1100, 7, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (13, 1200, 8, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (14, 1300, 9, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (15, 1400, 10, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (16, 1500, 11, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (17, 1600, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (18, 1601, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (19, 1603, 12, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (20, 1605, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (21, 1604, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (22, 1605, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (23, 1606, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (24, 1607, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (25, 1701, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (26, 1700, 12, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (27, 1705, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (28, 1706, 14, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (29, 1704, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (30, 1705, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (31, 1706, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (32, 1708, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (33, 1709, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (34, 1710, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (35, 1711, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (36, 1712, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (37, 1713, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (38, 1714, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (39, 1800, 7, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (40, 1900, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (41, 1900, 8, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (42, 2000, 15, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (43, 2100, 16, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (44, 2200, 17, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (45, 2300, 18, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (46, 2400, 19, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (47, 2500, 20, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (48, 2300, 21, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (49, 2700, 22, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (50, 2800, 23, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (51, 2801, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (52, 2803, 24, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (53, 2900, 25, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (54, 2901, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (55, 3000, 7, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (56, 3100, 24, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (57, 3200, 26, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (58, 3201, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (59, 3300, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (60, 3301, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (61, 3400, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (62, 3401, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (63, 3500, 8, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (64, 3600, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (65, 3700, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (66, 3800, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (67, 3900, 28, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (68, 4000, 29, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (69, 4100, 30, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (70, 4130, 49, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (71, 4200, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (72, 4300, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (73, 4400, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (74, 4500, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (75, 4600, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (76, 4700, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (77, 4400, 21, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (78, 4501, 30, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (79, 2, 32, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (80, 3, 33, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (81, 4, 34, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (82, 5, 35, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (83, 6, 36, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (84, 7, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (85, 8, 37, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (86, 9, 47, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (87, 10, 46, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (88, 11, 38, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (89, 12, 39, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (90, 13, 40, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (91, 14, 41, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (92, 15, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (93, 16, 50, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (100, 1715, 13, 1);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (101, 1716, 13, 1);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (102, 1717, 13, 1);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (103, 2804, 42, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (104, 2805, 42, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (105, 2801, 43, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (106, 2802, 43, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (110, 4800, 44, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (111, 4900, 26, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (112, 4901, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (113, 5000, 26, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (114, 5001, 6, 2);
-
-ALTER TABLE llx_product ADD COLUMN volume float DEFAULT NULL after weight_units;
-ALTER TABLE llx_product ADD COLUMN volume_units tinyint DEFAULT NULL after volume;
-
-ALTER TABLE llx_product modify ref varchar(32) NOT NULL;
-
-ALTER TABLE `llx_socpeople` CHANGE `fk_user` `fk_user_creat` INT(11) NULL;
-ALTER TABLE `llx_socpeople` CHANGE `fk_user_create` `fk_user_creat` INT(11) NULL;
--- V4.1 UPDATE llx_socpeople set fk_user_creat = null where llx_socpeople.fk_user_creat is not null and llx_socpeople.fk_user_creat not in (select rowid from llx_user);
--- V4 ALTER TABLE llx_socpeople ADD INDEX idx_socpeople_fk_user_creat (fk_user_creat);
--- V4 ALTER TABLE llx_socpeople DROP INDEX idx_fk_user_creat;
--- V4 ALTER TABLE llx_socpeople ADD CONSTRAINT fk_socpeople_user_creat_user_rowid FOREIGN KEY (fk_user_creat) REFERENCES llx_user (rowid);
-
-ALTER TABLE llx_user add pass_temp VARCHAR(32) NULL after pass_crypted;
-update llx_user set pass = null where pass = pass_crypted and length(pass) = 32;
-
-drop table if exists llx_soc_events;
-drop table if exists llx_todocomm;
-drop table if exists llx_ventes;
-drop table if exists llx_pointmort;
-drop table if exists llx_birthday_alert;
-
-ALTER TABLE llx_commande_fournisseurdet ADD total_ht  double(24,8) DEFAULT 0 after subprice;
-ALTER TABLE llx_commande_fournisseurdet ADD total_tva double(24,8) DEFAULT 0 after total_ht;
-ALTER TABLE llx_commande_fournisseurdet ADD total_ttc double(24,8) DEFAULT 0 after total_tva;
-ALTER TABLE llx_commande_fournisseurdet ADD info_bits integer      DEFAULT 0 after total_ttc;
-
-
--- Pas de limite sur nb decimal des prix dans base car definie en option
--- Tous les prix doivent etre au format float(16,8)
--- Tous les tx tva doivent etre au format float(6,3)
-ALTER TABLE llx_product_price ADD COLUMN price_ttc double(24,8) DEFAULT 0 AFTER price;
-ALTER TABLE llx_product ADD COLUMN price_ttc       double(24,8) DEFAULT 0 AFTER price_base_type;
-
-ALTER TABLE llx_product MODIFY price     double(24,8) DEFAULT 0;
-ALTER TABLE llx_product MODIFY price_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_product MODIFY tva_tx    double(6,3)  DEFAULT 0;
-
-ALTER TABLE llx_product_price MODIFY price     double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_price MODIFY price_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_price MODIFY tva_tx    double(6,3)  DEFAULT 0;
-
-ALTER TABLE llx_product_fournisseur_price_log MODIFY price    double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_fournisseur_price_log MODIFY quantity double;
-ALTER TABLE llx_product_fournisseur_price MODIFY price        double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_fournisseur_price MODIFY quantity     double;
-
-
-ALTER TABLE llx_facture_fourn MODIFY   amount     double(24,8)     DEFAULT 0 NOT NULL;
-ALTER TABLE llx_facture_fourn MODIFY   remise     double(24,8)     DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY   tva        double(24,8)     DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY   total      double(24,8)     DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY   total_ht   double(24,8)     DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY   total_tva  double(24,8)     DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY   total_ttc  double(24,8)     DEFAULT 0;
-
-ALTER TABLE llx_facture_fourn_det MODIFY  pu_ht             double(24,8);
-ALTER TABLE llx_facture_fourn_det ADD     pu_ttc            double(24,8) AFTER pu_ht;
-ALTER TABLE llx_facture_fourn_det MODIFY  pu_ttc            double(24,8);
-ALTER TABLE llx_facture_fourn_det MODIFY  qty               smallint DEFAULT 1;
-ALTER TABLE llx_facture_fourn_det MODIFY  total_ht          double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn_det MODIFY  tva_taux          double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn_det MODIFY  tva               double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn_det MODIFY  total_ttc         double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_propal ADD total_ht double(24,8)     DEFAULT 0 after remise;
-
-ALTER TABLE llx_propal MODIFY   tva      double(24,8)     DEFAULT 0;
-ALTER TABLE llx_propal MODIFY   total_ht double(24,8)     DEFAULT 0;
-ALTER TABLE llx_propal MODIFY   total    double(24,8)     DEFAULT 0;
-
-ALTER TABLE llx_propaldet MODIFY   tva_tx    double(6,3)      DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY   total_ht  double(24,8)     DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY   total_tva double(24,8)     DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY   total_ttc double(24,8)     DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY   subprice  double(24,8)     DEFAULT 0;
-
-ALTER TABLE llx_contratdet MODIFY  tva_tx    double(6,3)  DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY  subprice  double(24,8) DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY  total_ht  double(24,8) DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY  total_tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY  total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_commande MODIFY  total_ht  double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande MODIFY  tva       double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande MODIFY  total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_commande_fournisseur MODIFY  total_ht  double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseur MODIFY  tva       double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseur MODIFY  total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_commandedet MODIFY  subprice   double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY  total_tva  double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY  total_ht   double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY  total_ttc  double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY  tva_tx     double(6,3)  DEFAULT 0;
-
-ALTER TABLE llx_commande_fournisseurdet MODIFY  subprice   double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY  total_tva  double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY  total_ht   double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY  total_ttc  double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY  tva_tx     double(6,3)  DEFAULT 0;
-
-ALTER TABLE llx_societe_remise_except MODIFY  amount_ht     double(24,8) DEFAULT 0;
-ALTER TABLE llx_societe_remise_except MODIFY  amount_tva    double(24,8) DEFAULT 0;
-ALTER TABLE llx_societe_remise_except MODIFY  amount_ttc    double(24,8) DEFAULT 0;
-ALTER TABLE llx_societe_remise_except MODIFY  tva_tx        double(6,3)  DEFAULT 0;
-
-
--- Supprimme orphelins pour permettre montee de la cle
--- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; 
-
-
--- Changement de idp en rowid
--- V4 ALTER TABLE llx_propal DROP FOREIGN KEY llx_propal_ibfk1;
--- V4 ALTER TABLE llx_socpeople DROP FOREIGN KEY fk_socpeople_fk_soc;
--- V4 ALTER TABLE llx_commande DROP FOREIGN KEY fk_commande_societe;
--- V4 ALTER TABLE llx_commande_fournisseur DROP FOREIGN KEY fk_commande_fournisseur_societe;
--- V4 ALTER TABLE llx_contrat DROP FOREIGN KEY fk_contrat_societe;
--- V4 ALTER TABLE llx_facture DROP FOREIGN KEY fk_facture_fk_soc;
--- V4 ALTER TABLE llx_facture_fourn DROP FOREIGN KEY fk_facture_fourn_fk_soc;
--- V4 ALTER TABLE llx_fichinter DROP FOREIGN KEY fk_fichinter_fk_soc;
--- V4 ALTER TABLE llx_osc_customer DROP FOREIGN KEY llx_osc_customer_fk_soc;
--- V4 ALTER TABLE llx_propal DROP FOREIGN KEY fk_propal_fk_soc;
--- V4 ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_soc;
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_soc;
--- V4 ALTER TABLE llx_categorie_societe DROP FOREIGN KEY fk_categorie_societe_societe_rowid;
-
--- V4 ALTER TABLE `llx_osc_customer` DROP FOREIGN KEY llx_osc_customer_societe_idp;
--- V4 ALTER TABLE `llx_osc_customer` DROP FOREIGN KEY fk_osc_customer_fk_soc;
-
--- V4 ALTER TABLE llx_telephonie_adsl_fournisseur DROP FOREIGN KEY fk_soc;
--- V4 ALTER TABLE llx_telephonie_client_stats DROP FOREIGN KEY fk_client_comm;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP FOREIGN KEY fk_contact;
--- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_client_comm;
--- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_soc;
--- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_soc_facture;
--- V4 ALTER TABLE llx_telephonie_tarif_client DROP FOREIGN KEY fk_client;
--- V4 ALTER TABLE llx_telephonie_adsl_fournisseur DROP INDEX fk_soc_2;
--- V4 ALTER TABLE llx_telephonie_commande_ligne DROP INDEX fk_ligne_2;
--- V4 ALTER TABLE llx_telephonie_commande_ligne DROP INDEX fk_commande_2;
--- V4 ALTER TABLE llx_telephonie_commande DROP INDEX fk_user_creat_2;
--- V4 ALTER TABLE llx_telephonie_commande DROP INDEX fk_fournisseur_2;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_contact_2;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_contact_3;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_ligne_2;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_ligne_3;
-
-ALTER TABLE `llx_societe` CHANGE `idp` `rowid` integer AUTO_INCREMENT;
-ALTER TABLE `llx_socpeople` CHANGE `idp` `rowid` integer AUTO_INCREMENT;
-
-ALTER TABLE `llx_osc_customer` CHANGE `osc_custid` `rowid` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_customer` CHANGE `osc_lastmodif` `datem` datetime default NULL;
-ALTER TABLE `llx_osc_customer` CHANGE `doli_socidp` `fk_soc` integer NOT NULL default '0';
-ALTER TABLE `llx_osc_customer` ADD PRIMARY KEY (rowid);
-ALTER TABLE `llx_osc_customer` ADD UNIQUE KEY `fk_soc` (`fk_soc`);
-ALTER TABLE `llx_osc_order` CHANGE `osc_orderid` `rowid` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_order` CHANGE `osc_lastmodif` `datem` datetime default NULL;
-ALTER TABLE `llx_osc_order` CHANGE `doli_orderidp` `fk_commande` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_order` ADD PRIMARY KEY (rowid);
-ALTER TABLE `llx_osc_order` ADD UNIQUE KEY `fk_commande` (`fk_commande`);
-ALTER TABLE `llx_osc_product` CHANGE `osc_prodid` `rowid` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_product` CHANGE `osc_lastmodif` `datem` datetime default NULL;
-ALTER TABLE `llx_osc_product` CHANGE `doli_prodidp` `fk_product` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_product` ADD PRIMARY KEY (rowid);
-ALTER TABLE `llx_osc_product` ADD UNIQUE KEY `fk_product` (`fk_product`);
-
--- V4 ALTER TABLE llx_socpeople ADD CONSTRAINT fk_socpeople_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_commande ADD CONSTRAINT fk_commande_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_commande_fournisseur ADD CONSTRAINT fk_commande_fournisseur_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_contrat ADD CONSTRAINT fk_contrat_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_fichinter ADD CONSTRAINT fk_fichinter_fk_soc	FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_categorie_societe ADD CONSTRAINT fk_categorie_societe_fk_soc   FOREIGN KEY (fk_societe) REFERENCES llx_societe (rowid);
-
--- V4 ALTER TABLE llx_osc_customer ADD CONSTRAINT fk_osc_customer_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-
--- V4 ALTER TABLE llx_telephonie_adsl_fournisseur ADD CONSTRAINT fk_telephonie_adsl_fournisseur_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_telephonie_client_stats ADD CONSTRAINT fk_telephonie_client_stats_societe FOREIGN KEY (fk_client_comm) REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_contact_facture ADD CONSTRAINT fk_telephonie_contact_facture_contact FOREIGN KEY (fk_contact) REFERENCES llx_socpeople (rowid);
--- V4 ALTER TABLE llx_telephonie_contact_facture ADD CONSTRAINT fk_telephonie_contact_facture_ligne FOREIGN KEY (fk_ligne) REFERENCES llx_telephonie_societe_ligne (rowid);
--- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_client_comm FOREIGN KEY (fk_client_comm) REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_soc         FOREIGN KEY (fk_soc)         REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_soc_facture FOREIGN KEY (fk_soc_facture) REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_tarif_client ADD CONSTRAINT llx_telephonie_tarif_client_client FOREIGN KEY (fk_client) REFERENCES llx_societe (rowid);
--- fin du changement idp en rowid
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (120, 'fichinter','internal', 'INTERREPFOLL',  'Responsable suivi de l\'intervention', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (121, 'fichinter','internal', 'INTERVENING',   'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (130, 'fichinter','external', 'BILLING',       'Contact client facturation intervention', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (131, 'fichinter','external', 'CUSTOMER',      'Contact client suivi de l\'intervention', 1);
-
-ALTER TABLE llx_fichinter CHANGE note description text DEFAULT NULL;
-ALTER TABLE llx_fichinter ADD COLUMN note_private text DEFAULT NULL after description;
-ALTER TABLE llx_fichinter ADD COLUMN note_public text DEFAULT NULL after note_private;
-ALTER TABLE llx_fichinter ADD COLUMN tms timestamp after ref;
-ALTER TABLE llx_fichinter ADD COLUMN fk_contrat integer DEFAULT 0 after fk_projet;
-
-drop table if exists `llx_accountingsystem_det`;
-
-
-update llx_bank set label='(InitialBankBalance)' where fk_type='SOLD' and label in ('Balance','(Balance)','Solde','(Solde)');
-
-alter table llx_product_fournisseur_price add unitprice double(24,8);
-alter table llx_product_fournisseur_price MODIFY unitprice double(24,8);
-update llx_product_fournisseur_price set unitprice = ROUND(price/quantity,8) where unitprice IS NULL;
-
-update llx_fichinter set tms=datec where tms < datec;
-update llx_fichinter set tms=date_valid where tms < date_valid;
-
-ALTER TABLE llx_commande_fournisseur DROP INDEX ref;
-ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc);
-
-create table llx_c_ecotaxe
-(
-  rowid        integer      AUTO_INCREMENT PRIMARY KEY,
-  code         varchar(64)  UNIQUE NOT NULL,
-  libelle      varchar(255),
-  price        double(24,8),
-  organization varchar(255),
-  fk_pays      integer NOT NULL,
-  active       tinyint DEFAULT 1  NOT NULL
-)ENGINE=innodb;
-
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (1, 'ER-A-A', 'Mat�riels �lectriques < 0,2kg', 0.01000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (2, 'ER-A-B', 'Mat�riels �lectriques >= 0,2 kg et < 0,5 kg', 0.03000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (3, 'ER-A-C', 'Mat�riels �lectriques >= 0,5 kg et < 1 kg', 0.04000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (4, 'ER-A-D', 'Mat�riels �lectriques >= 1 kg et < 2 kg', 0.13000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (5, 'ER-A-E', 'Mat�riels �lectriques >= 2 kg et < 4kg', 0.21000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (6, 'ER-A-F', 'Mat�riels �lectriques >= 4 kg et < 8 kg', 0.42000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (7, 'ER-A-G', 'Mat�riels �lectriques >= 8 kg et < 15 kg', 0.84000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (8, 'ER-A-H', 'Mat�riels �lectriques >= 15 kg et < 20 kg', 1.25000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (9, 'ER-A-I', 'Mat�riels �lectriques >= 20 kg et < 30 kg', 1.88000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (10, 'ER-A-J', 'Mat�riels �lectriques >= 30 kg', 3.34000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (11, 'ER-M-1', 'TV, Moniteurs < 9kg', 0.84000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (12, 'ER-M-2', 'TV, Moniteurs >= 9kg et < 15kg', 1.67000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (13, 'ER-M-3', 'TV, Moniteurs >= 15kg et < 30kg', 3.34000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (14, 'ER-M-4', 'TV, Moniteurs >= 30 kg', 6.69000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (15, 'EC-A-A', 'Mat�riels �lectriques  0,2 kg max', 0.00840000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (16, 'EC-A-B', 'Mat�riels �lectriques 0,21 kg min - 0,50 kg max', 0.02500000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (17, 'EC-A-C', 'Mat�riels �lectriques  0,51 kg min - 1 kg max', 0.04000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (18, 'EC-A-D', 'Mat�riels �lectriques  1,01 kg min - 2,5 kg max', 0.13000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (19, 'EC-A-E', 'Mat�riels �lectriques  2,51 kg min - 4 kg max', 0.21000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (20, 'EC-A-F', 'Mat�riels �lectriques 4,01 kg min - 8 kg max', 0.42000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (21, 'EC-A-G', 'Mat�riels �lectriques  8,01 kg min - 12 kg max', 0.63000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (22, 'EC-A-H', 'Mat�riels �lectriques 12,01 kg min - 20 kg max', 1.05000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (23, 'EC-A-I', 'Mat�riels �lectriques  20,01 kg min', 1.88000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (24, 'EC-M-1', 'TV, Moniteurs 9 kg max', 0.84000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (25, 'EC-M-2', 'TV, Moniteurs 9,01 kg min - 18 kg max', 1.67000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (26, 'EC-M-3', 'TV, Moniteurs 18,01 kg min - 36 kg max', 3.34000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (27, 'EC-M-4', 'TV, Moniteurs 36,01 kg min', 6.69000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (28, 'ES-M-1', 'TV, Moniteurs <= 20 pouces', 0.84000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (29, 'ES-M-2', 'TV, Moniteurs > 20 pouces et <= 32 pouces', 3.34000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (30, 'ES-M-3', 'TV, Moniteurs > 32 pouces et autres grands �crans', 6.69000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (31, 'ES-A-A', 'Ordinateur fixe, Audio home systems (HIFI), �l�ments hifi s�par�s...', 0.84000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (32, 'ES-A-B', 'Ordinateur portable, CD-RCR, VCR, lecteurs et enregistreurs DVD...  Instruments de musique et caisses de r�sonance, haut parleurs...', 0.25000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (33, 'ES-A-C', 'Imprimante, photocopieur, t�l�copieur,...', 0.42000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (34, 'ES-A-D', 'Accessoires, clavier, souris, PDA, imprimante photo, appareil photo, gps, t�l�phone, r�pondeur, t�l�phone sans fil, modem,...   T�l�commande, casque, cam�scope, baladeur mp3, radio portable, radio K7 et CD portable, set top box, radio r�veil,...', 0.08400000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (35, 'ES-A-E', 'GSM', 0.00840000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (36, 'ES-A-F', 'Jouets et �quipements de loisirs et de sports < 0,5 kg', 0.04200000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (37, 'ES-A-G', 'Jouets et �quipements de loisirs et de sports > 0,5 kg', 0.17000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (38, 'ES-A-H', 'Jouets et �quipements de loisirs et de sports > 10 kg', 1.25000000, 'Eco-syst�mes', 1, 1);
-
-ALTER TABLE llx_commandedet CHANGE coef marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_commandedet ADD COLUMN marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_commandedet ADD COLUMN marque_tx double(6,3) DEFAULT 0 after marge_tx;
-ALTER TABLE llx_commandedet MODIFY marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY marque_tx double(6,3) DEFAULT 0;
-
-ALTER TABLE llx_propaldet CHANGE coef marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_propaldet ADD COLUMN marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_propaldet ADD COLUMN marque_tx double(6,3) DEFAULT 0 after marge_tx;
-ALTER TABLE llx_propaldet MODIFY marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY marque_tx double(6,3) DEFAULT 0;
-
--- Nouveau mode de stockage de l'ordre des box (X99 ou X = colonne et 99 position dans colonne)
-alter table llx_boxes modify box_order varchar(3) NOT NULL;
--- V4.1 update llx_boxes set box_order = concat('A0',box_order) where length(box_order) = 1 and substring(box_order,-1) in ('1','3','5','7','9');
--- V4.1 update llx_boxes set box_order = concat('B0',box_order) where length(box_order) = 1 and substring(box_order,-1) in ('0','2','4','6','8');
--- V4.1 update llx_boxes set box_order = concat('A',box_order) where length(box_order) = 2 and substring(box_order,-1) in ('1','3','5','7','9');
--- V4.1 update llx_boxes set box_order = concat('B',box_order) where length(box_order) = 2 and substring(box_order,-1) in ('0','2','4','6','8');
-
-create table llx_fichinterdet
-(
-  rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  fk_fichinter      integer,
-  date              date,
-  description       text,
-  duree             integer,
-  rang              integer DEFAULT 0
-)ENGINE=innodb;
-
-ALTER TABLE llx_fichinter ADD COLUMN model_pdf varchar(50) after note_public;
-
-ALTER TABLE llx_bordereau_cheque MODIFY number varchar(16) NOT NULL;
-ALTER TABLE llx_bordereau_cheque MODIFY amount double(24,8) NOT NULL;
-ALTER TABLE llx_bordereau_cheque MODIFY nbcheque          smallint NOT NULL;
-ALTER TABLE llx_bordereau_cheque MODIFY statut            smallint(1) NOT NULL DEFAULT 0;
-
-ALTER TABLE llx_facturedet ADD COLUMN special_code tinyint(4) unsigned default 0;
-ALTER TABLE llx_facturedet MODIFY special_code tinyint(4) unsigned default 0;
-
-ALTER TABLE llx_commandedet MODIFY special_code tinyint(4) unsigned default 0;
-
-ALTER TABLE llx_propaldet ADD COLUMN special_code tinyint(4) unsigned default 0 after marque_tx;
-ALTER TABLE llx_propaldet ADD COLUMN pa_ht double(24,8) DEFAULT 0 after info_bits;
-ALTER TABLE llx_propaldet MODIFY pa_ht double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_bank MODIFY amount double(24,8) DEFAULT 0;
-
-
--- Nouveau fonctionnement de la table llx_product_fournisseur_price
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_user;
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_soc;
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_product;
-ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_user;
-ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_soc;
-ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_product;
-ALTER TABLE llx_product_fournisseur_price DROP COLUMN ref_fourn;
--- V4.1 UPDATE llx_product_fournisseur_price as pfp SET pfp.fk_product = (SELECT pf.rowid FROM llx_product_fournisseur AS pf WHERE pfp.fk_product = pf.fk_product AND pfp.fk_soc = pf.fk_soc);
-ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_soc;
-ALTER TABLE llx_product_fournisseur_price CHANGE fk_product fk_product_fournisseur integer NOT NULL;
-ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_user (fk_user);
-ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_product_fournisseur (fk_product_fournisseur);
--- V4 ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_user    FOREIGN KEY (fk_user)    REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_product_fournisseur FOREIGN KEY (fk_product_fournisseur) REFERENCES llx_product_fournisseur (rowid);
-
--- Nouveau fonctionnement de la table llx_product_fournisseur_price_log
--- V4.1 UPDATE llx_product_fournisseur_price_log as pfpl SET pfpl.fk_product = (SELECT pf.rowid FROM llx_product_fournisseur AS pf WHERE pfpl.fk_product = pf.fk_product AND pfpl.fk_soc = pf.fk_soc);
-ALTER TABLE llx_product_fournisseur_price_log DROP COLUMN fk_soc;
-ALTER TABLE llx_product_fournisseur_price_log CHANGE fk_product fk_product_fournisseur integer NOT NULL;
-
-ALTER TABLE llx_commande_fournisseurdet MODIFY fk_commande integer NOT NULL;
-
-ALTER TABLE llx_product ADD COLUMN partnumber varchar(32) after gencode;
-
-ALTER TABLE llx_element_contact ADD INDEX idx_element_contact_fk_socpeople (fk_socpeople);
-
--- Supprimme orphelins pour permettre montee de la cle
--- V4 DELETE llx_fichinter FROM llx_fichinter LEFT JOIN llx_societe ON llx_fichinter.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL;
-
-
-
-ALTER TABLE llx_societe ADD COLUMN supplier_account varchar(32) after fournisseur;
-
-drop table if exists llx_c_barcode;
-
-create table llx_c_barcode_type
-(
-  rowid    integer            AUTO_INCREMENT PRIMARY KEY,
-  code     varchar(16)        NOT NULL,
-  libelle  varchar(50)        NOT NULL,
-  coder    integer            NOT NULL DEFAULT 0,
-  example  varchar(16)        NOT NULL
-)ENGINE=innodb;
-
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (1, 'EAN8', 'EAN8', 0, '1234567');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (2, 'EAN13', 'EAN13', 0, '123456789012');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (3, 'UPC', 'UPC', 0, '123456789012');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (4, 'ISBN', 'ISBN', 0, '123456789');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (5, 'C39', 'Code 39', 0, '1234567890');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (6, 'C128', 'Code 128', 0, 'ABCD1234567890');
-
-ALTER TABLE llx_product CHANGE gencode barcode varchar(255) DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN fk_barcode_type integer DEFAULT 0 after barcode;
-
-create table llx_c_paper_format
-(
-  rowid    integer                          AUTO_INCREMENT PRIMARY KEY,
-  code     varchar(16)                      NOT NULL,
-  label    varchar(50)                      NOT NULL,
-  width    float(6,2)                       DEFAULT 0,
-  height   float(6,2)                       DEFAULT 0,
-  unit     enum('mm','cm','point','inch')   NOT NULL,
-  active   tinyint DEFAULT 1                NOT NULL
-)ENGINE=innodb;
-
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1, '4A0', 'Format 4A0', '1682', '2378', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2, '2A0', 'Format 2A0', '1189', '1682', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3, 'A0', 'Format A0', '840', '1189', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4, 'A1', 'Format A1', '594', '840', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5, 'A2', 'Format A2', '420', '594', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6, 'A3', 'Format A3', '297', '420', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7, 'A4', 'Format A4', '210', '297', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8, 'A5', 'Format A5', '148', '210', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9, 'A6', 'Format A6', '105', '148', 'mm', 1);
-
-ALTER TABLE llx_user ADD COLUMN phenix_login varchar(25) after webcal_login;
-ALTER TABLE llx_user ADD COLUMN phenix_pass varchar(128) after phenix_login;
-
-update llx_propal set total_ht = price where total_ht = 0 and total > 0;
-update llx_propal set date_livraison = NULL where date_livraison = '1970-01-01 00:00:00';
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (102,'commande','external', 'SHIPPING',      'Contact client livraison commande', 1);
-
--- Uniformisation du nom. Rem: Cette table n'est pas utilise en lecture a ce jour
-drop table llx_socstatutlog;
-create table llx_societe_log
-(
-  id          integer AUTO_INCREMENT PRIMARY KEY,
-  datel       datetime,
-  fk_soc      integer,
-  fk_statut   integer,
-  fk_user     integer,
-  author      varchar(30),
-  label       varchar(128)
-)ENGINE=innodb;
-
-
--- Pour la Tunisie (Formes les plus utilisees)
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1000','Société à responsabilité limitée SARL');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1001','Société en Nom Collectif');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1002','Société en Commandite Simple');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1003','société en participation');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1004','Société Anonyme SA');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1005','Société Unipersonnelle à Responsabilité Limitée SUARL');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1006','Groupement d\'intérêt économique GEI');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1007','Groupe de sociétés');
-
--- Regions de Tunisie (id pays=10)
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1003,10,1003, '',0,'Ben Arous');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1004,10,1004, '',0,'Bizerte');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1005,10,1005, '',0,'Gabès');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1006,10,1006, '',0,'Gafsa');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1007,10,1007, '',0,'Jendouba');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1008,10,1008, '',0,'Kairouan');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1009,10,1009, '',0,'Kasserine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1010,10,1010, '',0,'Kèbili');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1011,10,1011, '',0,'La Manouba');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1012,10,1012, '',0,'Le Kef');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1013,10,1013, '',0,'Mahdia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1014,10,1014, '',0,'Médenine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1015,10,1015, '',0,'Monastir');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1016,10,1016, '',0,'Nabeul');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1017,10,1017, '',0,'Sfax');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1018,10,1018, '',0,'Sidi Bouzid');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1019,10,1019, '',0,'Siliana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1020,10,1020, '',0,'Sousse');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1021,10,1021, '',0,'Tataouine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1022,10,1022, '',0,'Tozeur');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1023,10,1023, '',0,'Tunis');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1024,10,1024, '',0,'Zaghouan');
-
--- TUNISIE (id 10)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (101,10, '6','0','TVA 6%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (102,10, '12','0','TVA 12%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (103,10, '18','0','VAT 18%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (104,10, '7.5','0','TVA 6% Majoré à 25% (7.5%)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (105,10, '15','0','TVA 12% Majoré à 25% (15%)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1);
-
--- GUADELOUPE (id 105)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 111, 105, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 112, 105, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 113, 105,   '0','0','VAT Rate 0 ou non applicable',1);
-
--- MARTINIQUE (id 150)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 121, 150, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 122, 150, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 123, 150,   '0','0','VAT Rate 0 ou non applicable',1);
-
--- REUNION (id 187)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 187, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 187, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 187,   '0','0','VAT Rate 0 ou non applicable',1);
-
-ALTER TABLE llx_bank_account MODIFY iban_prefix varchar(50);
-ALTER TABLE llx_bank_account ADD COLUMN country_iban varchar(2) after iban_prefix;
-ALTER TABLE llx_bank_account ADD COLUMN cle_iban varchar(2) after country_iban;
-
-
--- Mise a jour des pays
-update llx_c_pays set libelle = 'Palaos' where rowid = 176 and code = 'PW' and libelle = 'Belau';
-update llx_c_pays set libelle = 'Serbie' where rowid = 198 and code = 'CS';
-update llx_c_pays set code = 'RS' where rowid = 198 and code = 'CS';
-insert into llx_c_pays (rowid,code,libelle) values (241, 'GG', 'Guernesey'     );
-insert into llx_c_pays (rowid,code,libelle) values (242, 'IM', 'Ile de Man'    );
-insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey'        );
-insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro'    );
-insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy');
-insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin'  );
-
-
-ALTER TABLE llx_boxes ADD UNIQUE INDEX uk_boxes (box_id, position, fk_user);
-
--- Nettoyage vieux enregistrement detail pourris
-delete from llx_facturedet where price = 0 and subprice = 0 and remise_percent = 0 and total_ttc = 0 and total_ht = 0;
-
-
--- Drop constraints to allow rename
-ALTER TABLE llx_societe_remise_except drop foreign key fk_societe_remise_fk_facture;
-ALTER TABLE llx_societe_remise_except drop index idx_societe_remise_except_fk_facture;
-
--- Rename field
-ALTER TABLE llx_societe_remise_except change fk_facture fk_facture_line integer;
-ALTER TABLE llx_societe_remise_except add fk_facture integer after fk_facture_line;
-
--- Create constraints
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_line (fk_facture_line);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_line   FOREIGN KEY (fk_facture_line) REFERENCES llx_facturedet (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture        FOREIGN KEY (fk_facture)        REFERENCES llx_facture (rowid);
-
--- Corrige statut des avoirs qui ont ete transforme en reduc et pour lesquels la reduc a ete ensuite supprimee
--- V4.1 update llx_facture set paye=0, fk_statut=1 where paye=1 and type=2 and rowid not in (select fk_facture_source from llx_societe_remise_except);
-
--- Corrige avoirs affectes en ligne a affectation sur facture. On met total a null pour permettre recalcul par upgrade2
--- V4.1 update llx_facture set total_ttc = NULL where rowid in (select fk_facture from llx_facturedet where description = '(CREDIT_NOTE)');
--- V4.1 update llx_societe_remise_except as re set re.fk_facture = (select fk_facture from llx_facturedet as fd where fd.rowid = re.fk_facture_line), re.fk_facture_line = NULL where re.fk_facture_line in (select rowid from llx_facturedet where description = '(CREDIT_NOTE)');
--- V4.1 delete from llx_facturedet where description = '(CREDIT_NOTE)';
-
-update llx_facture set close_code = 'discount_vat' where close_code = 'escompte';
-
-ALTER TABLE llx_commande_fournisseurdet MODIFY fk_product integer;
-
--- Le prix d'un produit ne doit pas avoir la valeur NULL
-UPDATE llx_product SET price = 0 WHERE price is NULL;
-UPDATE llx_product SET price_ttc = 0 WHERE price_ttc is NULL;
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
diff --git a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql
deleted file mode 100644
index 372131e331c..00000000000
--- a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql
+++ /dev/null
@@ -1,351 +0,0 @@
---
--- Attention a l ordre des requetes.
--- Ce fichier doit etre charge sur une version 2.2.0 
---
-
-DROP TABLE llx_facture_tva_sum;
-DROP TABLE llx_c_ape;
-
-delete from llx_const where name='MAIN_GRAPH_LIBRARY' and (value like 'phplot%' or value like 'artichow%');
-
-ALTER TABLE llx_societe_adresse_livraison ADD COLUMN tel varchar(20) after fk_pays;
-ALTER TABLE llx_societe_adresse_livraison ADD COLUMN fax varchar(20) after tel;
-
-RENAME TABLE llx_c_barcode TO llx_c_barcode_type; 
-
-alter table llx_c_barcode_type modify coder varchar(16) NOT NULL;
-update llx_c_barcode_type set coder = 0 where coder in (1,2);
-
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_ALL'      and value='MAIN_FORCE_SETLOCALE_LC_ALL';
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_MONETARY' and value='MAIN_FORCE_SETLOCALE_LC_MONETARY';
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_NUMERIC'  and value='MAIN_FORCE_SETLOCALE_LC_NUMERIC';
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_TIME'     and value='MAIN_FORCE_SETLOCALE_LC_TIME';
-
--- remove old deprecated options
-update llx_const set name='SOCIETE_CODECLIENT_ADDON' where name='CODECLIENT_ADDON';
-update llx_const set name='SOCIETE_CODEFOURNISSEUR_ADDON' where name='CODEFOURNISSEUR_ADDON';
-delete from llx_const where name='CODECLIENT_ADDON';
-delete from llx_const where name='CODEFOURNISSEUR_ADDON';
-
-alter table llx_const add tms timestamp;
-update llx_const set tms=sysdate() where tms is null;
-update llx_const set tms=sysdate() where tms <= 0;
-
-
-alter table llx_document_model modify type varchar(20) NOT NULL;
-
-DELETE FROM llx_rights_def WHERE module = 'menudb';
-
-ALTER table llx_boxes_def drop column name;
-ALTER table llx_boxes_def add column tms timestamp;
-
--- Rename primary key of llx_menu
-ALTER TABLE llx_menu_const drop foreign key fk_menu_const_fk_menu;
-alter table llx_menu drop primary key;
-alter table llx_menu modify rowid integer AUTO_INCREMENT NOT NULL PRIMARY KEY;
-ALTER TABLE llx_menu_const ADD CONSTRAINT fk_menu_const_fk_menu FOREIGN KEY (fk_menu) REFERENCES llx_menu (rowid);
-
-alter table llx_menu modify user integer NOT NULL default '0';
-alter table llx_menu change `order` position integer NOT NULL;
-alter table llx_menu change `right` perms varchar(255);
-alter table llx_menu add column module varchar(64) after menu_handler;
-alter table llx_menu add column tms timestamp;
-
--- Add a unique key
-update llx_menu set url='/comm/prospect/prospects.php?leftmenu=prospects' where rowid=702 and url='/contact/index.php?leftmenu=prospects&type=p';
-ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url);
-
--- Drop unused table
-drop table if exists llx_so_gr;
-
--- Modification expedition
-create table llx_co_exp
-(
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_commande   integer NOT NULL,
-  fk_expedition integer NOT NULL,
-
-  key(fk_commande),
-  key(fk_expedition)
-)ENGINE=innodb;
-
--- V4 ALTER TABLE llx_expedition DROP INDEX fk_expedition_methode;
--- V4 ALTER TABLE llx_expedition DROP INDEX fk_commande;
--- V4 ALTER TABLE llx_expedition DROP INDEX ref;
--- V4 ALTER TABLE llx_expeditiondet DROP INDEX fk_expedition;
--- V4 ALTER TABLE llx_expeditiondet DROP INDEX fk_commande_ligne;
-
--- V4.1 update llx_commande set fk_adresse_livraison = null where fk_adresse_livraison is not null and fk_adresse_livraison not in (select rowid from llx_societe_adresse_livraison);
--- V4.1 delete from llx_expeditiondet where fk_expedition not in (select rowid from llx_expedition);
--- V4.1 delete from llx_livraisondet where fk_livraison not in (select rowid from llx_livraison);
-
-alter table llx_expedition add column fk_soc integer NOT NULL after ref;
-alter table llx_expedition add column fk_adresse_livraison integer DEFAULT NULL after date_expedition;
--- V4.1 UPDATE llx_expedition as e SET e.fk_soc = (SELECT c.fk_soc FROM llx_commande AS c WHERE e.fk_commande = c.rowid);
--- V4.1 UPDATE llx_expedition as e SET e.fk_adresse_livraison = (SELECT c.fk_adresse_livraison FROM llx_commande AS c WHERE e.fk_commande = c.rowid);
-update llx_expedition set fk_adresse_livraison=NULL where fk_adresse_livraison = 0;
-
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_soc (fk_soc);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_author (fk_user_author);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_valid (fk_user_valid);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_adresse_livraison (fk_adresse_livraison);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_expedition_methode (fk_expedition_methode);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc                FOREIGN KEY (fk_soc)                 REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author        FOREIGN KEY (fk_user_author)         REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid         FOREIGN KEY (fk_user_valid)          REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_adresse_livraison  FOREIGN KEY (fk_adresse_livraison)   REFERENCES llx_societe_adresse_livraison (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode FOREIGN KEY (fk_expedition_methode)  REFERENCES llx_expedition_methode (rowid);
-ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref);
-
-ALTER TABLE llx_expeditiondet CHANGE fk_commande_ligne fk_origin_line integer;
-ALTER TABLE llx_expeditiondet ADD COLUMN fk_entrepot integer after fk_origin_line;
-ALTER TABLE llx_expeditiondet ADD COLUMN rang integer DEFAULT 0 after qty;
--- V4.1 UPDATE llx_expeditiondet as ed SET ed.fk_entrepot = (SELECT e.fk_entrepot FROM llx_expedition AS e WHERE ed.fk_expedition = e.rowid);
-ALTER TABLE llx_expedition DROP COLUMN fk_entrepot;
-
-ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_expedition (fk_expedition);
-ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_entrepot (fk_entrepot);
--- V4 ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_expedition FOREIGN KEY (fk_expedition) REFERENCES llx_expedition (rowid);
--- V4 ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_entrepot   FOREIGN KEY (fk_entrepot)   REFERENCES llx_entrepot (rowid);
-
--- Modification livraison
-create table llx_co_liv
-(
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_commande   integer NOT NULL,
-  fk_livraison  integer NOT NULL,
-
-  key(fk_commande),
-  key(fk_livraison)
-)ENGINE=innodb;
-
--- V4 ALTER TABLE llx_livraison DROP INDEX fk_commande;
--- V4 ALTER TABLE llx_livraison DROP INDEX ref;
--- V4 ALTER TABLE llx_livraisondet DROP INDEX fk_livraison;
--- V4 ALTER TABLE llx_livraisondet DROP INDEX fk_commande_ligne;
-ALTER TABLE llx_livraison DROP COLUMN total_ttc;
-
-ALTER TABLE llx_livraison add column total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_livraison MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_livraison MODIFY fk_adresse_livraison integer DEFAULT NULL;
-alter table llx_livraison add column ref_client varchar(30) after ref;
-alter table llx_livraison add column fk_soc integer NOT NULL after ref_client;
-UPDATE llx_livraison SET fk_adresse_livraison = NULL WHERE fk_adresse_livraison = 0;
--- V4.1 UPDATE llx_livraison as l SET l.fk_soc = (SELECT c.fk_soc FROM llx_commande AS c WHERE l.fk_commande = c.rowid);
-
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_author (fk_user_author);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_valid (fk_user_valid);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_adresse_livraison (fk_adresse_livraison);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_soc                FOREIGN KEY (fk_soc)                 REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_author        FOREIGN KEY (fk_user_author)         REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_valid         FOREIGN KEY (fk_user_valid)          REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_adresse_livraison  FOREIGN KEY (fk_adresse_livraison)   REFERENCES llx_societe_adresse_livraison (rowid);
-ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref);
-
-alter table llx_livraisondet add column fk_product  integer after fk_livraison;
-alter table llx_livraisondet add column description text after fk_product;
-alter table llx_livraisondet add column subprice    double(24,8) DEFAULT 0 after qty;
-alter table llx_livraisondet add column total_ht    double(24,8) DEFAULT 0 after subprice;
-alter table llx_livraisondet add column rang        integer      DEFAULT 0 after total_ht;
-
-ALTER TABLE llx_livraisondet ADD INDEX idx_livraisondet_fk_expedition (fk_livraison);
--- V4 ALTER TABLE llx_livraisondet ADD CONSTRAINT fk_livraisondet_fk_livraison FOREIGN KEY (fk_livraison) REFERENCES llx_livraison (rowid);
-
-create table llx_pr_exp
-(
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_propal     integer NOT NULL,
-  fk_expedition integer NOT NULL,
-
-  key(fk_propal),
-  key(fk_expedition)
-)ENGINE=innodb;
-
-create table llx_pr_liv
-(
-  rowid         integer AUTO_INCREMENT PRIMARY KEY,
-  fk_propal     integer NOT NULL,
-  fk_livraison  integer NOT NULL,
-
-  key(fk_propal),
-  key(fk_livraison)
-)ENGINE=innodb;
-
-ALTER TABLE llx_paiement modify fk_bank integer NOT NULL DEFAULT 0;
-
-
-create table llx_element_element
-(
-  rowid           	integer AUTO_INCREMENT PRIMARY KEY,  
-  sourceid			integer NOT NULL,
-  sourcetype		varchar(12) NOT NULL,
-  targetid			integer NOT NULL,
-  targettype		varchar(12) NOT NULL
-) ENGINE=innodb;
-
-
-ALTER TABLE llx_element_element 
-	ADD UNIQUE INDEX idx_element_element_idx1 (sourceid, sourcetype, targetid, targettype);
-
-ALTER TABLE llx_element_element ADD INDEX idx_element_element_targetid (targetid);
-
-
-ALTER  TABLE llx_actioncomm add column fk_user_mod integer after fk_user_author;
-ALTER  TABLE llx_actioncomm add column fk_user_done integer after fk_user_action;
-
---drop table if exists llx_events;
-create table llx_events
-(
-  rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  tms            timestamp,            
-  type			 varchar(32)  NOT NULL, 
-  dateevent      datetime,             
-  fk_user        integer,              
-  description    varchar(250) NOT NULL,        
-  ip			 varchar(32) NOT NULL,
-  fk_object      integer               
-) ENGINE=innodb;
-
-
-ALTER TABLE llx_events ADD INDEX idx_events_dateevent (dateevent);
-
-ALTER TABLE llx_c_forme_juridique ADD isvatexempted	tinyint DEFAULT 0  NOT NULL after libelle;
-
-ALTER TABLE llx_facturedet        ADD product_type	  integer      DEFAULT NULL after total_ttc;
-ALTER TABLE llx_facture_fourn_det ADD product_type	  integer      DEFAULT NULL after total_ttc;
-
--- V4.1 update llx_facturedet        set product_type = 0 where fk_product in (select rowid from llx_product where fk_product_type = 0);
--- V4.1 update llx_facture_fourn_det set product_type = 0 where fk_product in (select rowid from llx_product where fk_product_type = 0);
--- V4.1 update llx_facturedet        set product_type = 1 where fk_product in (select rowid from llx_product where fk_product_type = 1);
--- V4.1 update llx_facture_fourn_det set product_type = 1 where fk_product in (select rowid from llx_product where fk_product_type = 1);
--- V4.1 update llx_facturedet        set product_type = 1 where product_type is null;
--- V4.1 update llx_facture_fourn_det set product_type = 1 where product_type is null;
-
-create table llx_c_prospectlevel
-(
-  code            varchar(12) PRIMARY KEY,
-  label           varchar(30),
-  sortorder       smallint,
-  active          smallint    DEFAULT 1 NOT NULL
-) ENGINE=innodb;
-
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_UNKOWN',    'Unknown',  1);
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_LOW',       'Low',      2);
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_MEDIUM',    'Medium',   3);
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_HIGH',      'High',     4);
-
-
-alter table llx_societe add column fk_prospectlevel varchar(12) after fournisseur;
-alter table llx_societe modify tva_assuj tinyint        DEFAULT 1;
-
-
---update llx_actioncomm set datea = datep where datea is null and percent = 100;
---update llx_actioncomm set datea2 = datea where datea2 is null and percent = 100;
-update llx_actioncomm set datep = datea where datep is null and datea is not null;
-update llx_actioncomm set datep = datec where datep is null and datea is null;
-update llx_actioncomm set datep2 = datep where datep2 is null and percent = 100;
-
-
-alter table llx_projet modify fk_soc           integer;
-
-update llx_rights_def set module='societe' where module='commercial' and perms='client' and subperms='voir';
-
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (25, 'Impots revenus',         0,1,'TAXREV');
-
-alter table llx_socpeople add   priv           smallint NOT NULL DEFAULT 0 after jabberid;
-
-alter table llx_tva modify fk_bank         integer;
-
-delete from llx_const where name='MAIN_USE_PREVIEW_TABS';
-
-alter table llx_menu_const drop column user;
-update llx_menu set leftmenu = '1' where leftmenu != '0';
-alter table llx_menu modify leftmenu varchar(1) default '1';
-
-
-create table llx_ecm_directories
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  label           varchar(32) NOT NULL,
-  fk_parent       integer,
-  description     varchar(255) NOT NULL,
-  cachenbofdoc    integer NOT NULL DEFAULT 0,
-  date_c		  datetime,
-  date_m		  timestamp,
-  fk_user_c		  integer,
-  fk_user_m		  integer
-) ENGINE=innodb;
-
-create table llx_ecm_documents
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  ref             varchar(16)  NOT NULL,
-  filename        varchar(255) NOT NULL,
-  filesize        integer      NOT NULL,
-  filemime        varchar(32)  NOT NULL,
-  fullpath_dol    varchar(255) NOT NULL,
-  fullpath_orig   varchar(255) NOT NULL,
-  description     text,
-  manualkeyword   text,
-  fk_create       integer  NOT NULL,
-  fk_update       integer,
-  date_c	      datetime NOT NULL,
-  date_u		  timestamp,
-  fk_directory    integer,
-  fk_status		  smallint DEFAULT 0,
-  private         smallint DEFAULT 0
-) ENGINE=innodb;
-
-ALTER TABLE llx_bank modify num_chq varchar(50);
-
-ALTER TABLE llx_menu_const ADD UNIQUE KEY uk_menu_const(fk_menu, fk_constraint);
-
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (100, 'USLetter',    'Format Letter (A)',    '216',  '279',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (105, 'USLegal',     'Format Legal',     '216',  '356',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (110, 'USExecutive', 'Format Executive', '190',  '254',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (115, 'USLedger',    'Format Ledger/Tabloid (B)', '279',  '432',  'mm', 0);
-
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (200, 'Canadian P1', 'Format Canadian P1',    '560',  '860',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (205, 'Canadian P2', 'Format Canadian P2',    '430',  '560',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (210, 'Canadian P3', 'Format Canadian P3',    '280',  '430',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (215, 'Canadian P4', 'Format Canadian P4',    '215',  '280',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (220, 'Canadian P5', 'Format Canadian P5',    '140',  '215',  'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (225, 'Canadian P6', 'Format Canadian P6',    '107',  '140',  'mm', 0);
-
-ALTER TABLE llx_commande_fournisseurdet DROP COLUMN price;
-
-alter table llx_adherent modify fk_user_mod integer;
-alter table llx_adherent modify fk_user_valid integer;
-
-create table llx_c_type_fees
-(
-  id        integer      AUTO_INCREMENT PRIMARY KEY,
-  code      varchar(12)  UNIQUE NOT NULL,
-  libelle   varchar(30),
-  active    tinyint DEFAULT 1   NOT NULL
-)ENGINE=innodb;
-
-
-alter table llx_deplacement modify type varchar(12) NOT NULL;
-alter table llx_deplacement modify km real;
-
-insert into llx_c_type_fees (code,libelle,active) values ('TF_OTHER',    'Other',  1);
-insert into llx_c_type_fees (code,libelle,active) values ('TF_TRIP',     'Trip',   1);
-insert into llx_c_type_fees (code,libelle,active) values ('TF_LUNCH',    'Lunch',  1);
-
-drop table llx_comfourn_facfourn;
-
-alter table llx_element_element modify sourcetype		varchar(16) NOT NULL;
-alter table llx_element_element modify targettype		varchar(16) NOT NULL;
-
-update llx_societe set fk_typent = 0 where fk_typent is null;
-
-ALTER TABLE llx_surveys_answers_summary ENGINE=innodb;
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
-
diff --git a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql b/htdocs/install/mysql/migration/2.4.0-2.5.0.sql
deleted file mode 100644
index 36d78dac859..00000000000
--- a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql
+++ /dev/null
@@ -1,115 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.4.0 or higher. 
---
-
-alter table llx_product add column   price_min          double(24,8) DEFAULT 0;
-alter table llx_product add column   price_min_ttc      double(24,8) DEFAULT 0;
-alter table llx_product add column   finished			 tinyint	  DEFAULT NULL after canvas;
-
-alter table llx_product_price   add column price_min              double(24,8) default NULL;
-alter table llx_product_price   add column price_min_ttc          double(24,8) default NULL;
-
-alter table llx_societe add column gencod			 varchar(255);
-
-delete from llx_user_param where page <> '';
-
-alter table llx_expedition add column tracking_number varchar(50) after fk_expedition_methode;
-
-alter table llx_actioncomm add column location varchar(128) after percent;
-
--- remove enum type
-alter table llx_adherent_type modify column cotisation       varchar(3) NOT NULL DEFAULT 'yes';
-alter table llx_adherent_type modify column vote             varchar(3) NOT NULL DEFAULT 'yes';
-alter table llx_adherent modify column morphy           varchar(3) NOT NULL;
-alter table llx_c_paper_format modify column unit     varchar(5)                       NOT NULL;
-alter table llx_const modify column type        varchar(6);
-alter table llx_menu modify column type			varchar(4) NOT NULL;
-alter table llx_notify modify column objet_type      varchar(24) NOT NULL;
-alter table llx_projet_task_actors modify column role           varchar(5) DEFAULT 'admin';
-alter table llx_projet_task modify column statut             varchar(6) DEFAULT 'open';
-alter table llx_rights_def modify column   type          varchar(1);
-
-ALTER TABLE llx_menu ADD COLUMN enabled	varchar(255) NULL default '1' after perms;
-
-ALTER TABLE `llx_commandedet` ADD column `date_start` DATETIME DEFAULT NULL, ADD `date_end` DATETIME DEFAULT NULL ;
-
-alter table llx_categorie add column fk_soc integer DEFAULT NULL after description;
-
-alter table llx_product drop column nbvente;
-
-alter table llx_product     add column import_key         varchar(14);
-alter table llx_socpeople   add column import_key         varchar(14);
-alter table llx_facture     add column import_key         varchar(14);
-alter table llx_facturedet  add column import_key         varchar(14);
-alter table llx_commande    add column import_key         varchar(14);
-alter table llx_commandedet add column import_key         varchar(14);
-alter table llx_facture_fourn     add column import_key         varchar(14);
-alter table llx_facture_fourn_det add column import_key         varchar(14);
-
-alter table llx_commande    modify column source smallint NULL;
-
-update llx_c_prospectlevel set code='PL_NONE', label='None' where code='PL_UNKOWN' or code='PL_NONE';
-
-update llx_societe set fk_prospectlevel=null where fk_prospectlevel='PL_UNKOWN';
-
-alter table llx_expedition add height integer;
-alter table llx_expedition add width integer;
-alter table llx_expedition add size_units integer;
-alter table llx_expedition add size integer;
-alter table llx_expedition add weight_units integer;
-alter table llx_expedition add weight integer;
-
-ALTER TABLE llx_paiement_facture ADD UNIQUE INDEX uk_paiement_facture(fk_paiement, fk_facture);
-ALTER TABLE llx_paiementfourn_facturefourn ADD UNIQUE INDEX uk_paiementfourn_facturefourn(fk_paiementfourn, fk_facturefourn);
-
-update llx_expedition_methode set code='ENL', libelle='Enlevement' where code='enlevement';
-update llx_expedition_methode set code='TRANS', libelle='Transporteur' where code='transporteur';
-
-alter table llx_fichinterdet modify date datetime;
-
-alter table llx_don modify fk_don_projet   integer NULL;
-alter table llx_don modify fk_user_valid   integer NULL;
-alter table llx_don add note_public     text;
-alter table llx_don add model_pdf       varchar(50);
-alter table llx_don add import_key      varchar(14);
-
-ALTER TABLE llx_export_model DROP INDEX uk_export_model;
-ALTER TABLE llx_export_model ADD UNIQUE uk_export_model (label,type);
-
-alter table llx_adherent_options_label add column type varchar(8);
-alter table llx_adherent_options_label add column size integer DEFAULT 0;
-alter table llx_adherent_options_label add column pos integer DEFAULT 0;
-
--- Reverse option
-update llx_const set visible = 1, name = 'FACTURE_ENABLE_RECUR', value='1' where name = 'FACTURE_DISABLE_RECUR' and value = '0';
-delete from llx_const where name = 'FACTURE_DISABLE_RECUR' and value = '1';
-delete from llx_const where name like 'MAIN_FASTSEARCH_%';
-
-alter table llx_bank_account modify comment        text;
-
-update llx_bank_account set ref = label where ref is null or ref = '';
-
--- 2.5.1
-update llx_actioncomm set datep = datea where datep is null;
-
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (70, 'facture_fourn', 'internal', 'SALESREPFOLL',  'Responsable suivi du paiement', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (71, 'facture_fourn', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (72, 'facture_fourn', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (73, 'facture_fourn', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
-
-alter table llx_product_stock add column   pmp             double(24,8) default 0 NOT NULL;
-
-alter table llx_expedition_methode change statut active tinyint DEFAULT 1;
-
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
diff --git a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql b/htdocs/install/mysql/migration/2.5.0-2.6.0.sql
deleted file mode 100644
index 5bfc011e579..00000000000
--- a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql
+++ /dev/null
@@ -1,139 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.5.0 or higher. 
---
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (140,'order_supplier','internal', 'SALESREPFOLL',  'Responsable suivi de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (141,'order_supplier','internal', 'SHIPPING',      'Responsable reception de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (142,'order_supplier','external', 'BILLING',       'Contact fournisseur facturation commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (143,'order_supplier','external', 'CUSTOMER',      'Contact fournisseur suivi commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (145,'order_supplier','external', 'SHIPPING',      'Contact fournisseur livraison commande', 1);
-
-update llx_const set visible = 1 where name = 'PROPALE_ADD_DELIVERY_ADDRESS';
-
-delete from llx_const where name like 'MAIN_LOGEVENTS_%' and name not like 'MAIN_LOGEVENTS_USER%' and name not like 'MAIN_LOGEVENTS_GROUP%'; 
-delete from llx_events where type not like 'USER%' and type not like 'GROUP%';
-
-alter table llx_expedition_methode change statut active tinyint DEFAULT 1;
-
-update llx_actioncomm set datep = datea where datep is null;
-
-
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-UPDATE llx_expedition_methode set code='CATCH',  libelle='Catch',           description='Catch by client'     where rowid=1;
-UPDATE llx_expedition_methode set code='TRANS',  libelle='Transporter',     description='Generic transporter' where rowid=2;
-UPDATE llx_expedition_methode set code='COLSUI', libelle='Colissimo Suivi', description='Colissimo Suivi'     where rowid=3;
-
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (70, 'facture_fourn', 'internal', 'SALESREPFOLL',  'Responsable suivi du paiement', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (71, 'facture_fourn', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (72, 'facture_fourn', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (73, 'facture_fourn', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
-
-alter table llx_product_stock add column   pmp             double(24,8) default 0 NOT NULL;
-alter table llx_product       add column   pmp             double(24,8) default 0 NOT NULL;
-
-alter table llx_product_stock modify column reel real;
-
-ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev);
-ALTER TABLE llx_bank ADD INDEX idx_bank_dateo(dateo);
-ALTER TABLE llx_bank ADD INDEX idx_bank_fk_account(fk_account);
-ALTER TABLE llx_bank ADD INDEX idx_bank_rappro(rappro);
-
-
-ALTER TABLE llx_mailing_cibles add column other           varchar(255) NULL;
-
-ALTER TABLE llx_mailing_cibles ADD INDEX idx_mailing_cibles_email (email);
-
-ALTER TABLE llx_categorie ADD INDEX idx_categorie_type (type);
-
-ALTER TABLE llx_product drop column   stock_propale;
-ALTER TABLE llx_product drop column   stock_commande;
-ALTER TABLE llx_product add column   stock              integer after import_key;
-
-ALTER TABLE llx_product ADD INDEX idx_product_barcode (barcode);
-ALTER TABLE llx_product ADD INDEX idx_product_import_key (import_key);
-
-ALTER TABLE llx_adherent drop index login;
-ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_login (login);
-
-ALTER TABLE llx_adherent add column fk_soc           integer NULL after societe;
-ALTER TABLE llx_adherent ADD INDEX idx_adherent_fk_soc (fk_soc);
-ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-ALTER TABLE llx_adherent modify column fk_user_author   integer NULL;
-
-ALTER TABLE llx_societe drop column rubrique;
-
--- SAINT PIERRE ET MIQUELON
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1931,193,  '0','0','No VAT in SPM',1);
-
--- SAINT MARTIN
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2461,246,  '0','0','VAT Rate 0',1);
-
-
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'35','Regime auto-entrepreneur');
-
-
-alter table llx_user_param drop column page;
-
-alter table llx_commande_fournisseur_log add column comment varchar(255) NULL;
-
-delete from llx_categorie_association where fk_categorie_mere = fk_categorie_fille;
-
-
-alter table llx_societe add price_level tinyint(4) NULL;
-
-delete from llx_document_model where nom = 'huitre' and type = 'invoice';
-
-drop table llx_don_projet;
-
-alter table llx_facture_fourn_det add column date_start        datetime   DEFAULT NULL;
-alter table llx_facture_fourn_det add column date_end          datetime   DEFAULT NULL;
-
-alter table llx_commandedet add column  product_type		  integer    DEFAULT 0 after total_ttc;
-
-alter table llx_propaldet add column  product_type		  integer    DEFAULT 0 after total_ttc;
-alter table llx_propaldet add column  date_start         datetime   DEFAULT NULL after product_type;
-alter table llx_propaldet add column  date_end           datetime   DEFAULT NULL after date_start;
-
-alter table llx_commande_fournisseurdet add column  product_type	integer    DEFAULT 0 after total_ttc;
-alter table llx_commande_fournisseurdet add column  date_start     datetime   DEFAULT NULL after product_type;
-alter table llx_commande_fournisseurdet add column  date_end       datetime   DEFAULT NULL after date_start;
-alter table llx_commande_fournisseur drop column  product_type;
-alter table llx_commande_fournisseur drop column  date_start;
-alter table llx_commande_fournisseur drop column  date_end;
-
-drop table llx_models;
-
--- V4.1 delete from llx_projet_task where fk_projet not in (select rowid from llx_projet);
--- V4.1 ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet)    REFERENCES llx_projet (rowid);
-
-ALTER TABLE llx_adherent modify fk_adherent_type integer NOT NULL;
-ALTER TABLE llx_adherent ADD INDEX idx_adherent_fk_adherent_type (fk_adherent_type);
--- V4.1 delete from llx_adherent where fk_adherent_type not in (select rowid from llx_adherent_type);
--- V4.1 ALTER TABLE llx_adherent ADD CONSTRAINT fk_adherent_adherent_type FOREIGN KEY (fk_adherent_type)    REFERENCES llx_adherent_type (rowid);
-
--- Put at the end. Cas have duplicate values
-ALTER TABLE llx_categorie_association drop index idx_categorie_association_fk_categorie_fille;
-ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association (fk_categorie_mere, fk_categorie_fille);
-ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association_fk_categorie_fille (fk_categorie_fille);
-
--- Multi company
-ALTER TABLE llx_const ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER name;
-ALTER TABLE llx_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER login;
-ALTER TABLE llx_usergroup ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
-
-ALTER TABLE llx_const DROP INDEX name;
-ALTER TABLE llx_user DROP INDEX uk_user_login;
-ALTER TABLE llx_usergroup DROP INDEX nom;
-
-ALTER TABLE llx_const ADD UNIQUE INDEX uk_const (name, entity);
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
-ALTER TABLE llx_usergroup ADD UNIQUE INDEX uk_usergroup_name (nom, entity);
-
-
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
diff --git a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql
deleted file mode 100644
index be3b786e8a7..00000000000
--- a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql
+++ /dev/null
@@ -1,476 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.6.0 or higher. 
---
-
-alter table llx_tmp_caisse modify fk_tva integer NOT NULL;
-
-drop table llx_facture_stats;
-drop table llx_stock_valorisation;
-drop table llx_entrepot_valorisation;
-drop table llx_groupesociete_remise;
-drop table llx_groupesociete;
-
-update llx_actioncomm set datep = datec where datep is null and datec is not null;
-
--- Create new table for import module
-create table llx_import_model
-(
-  	rowid         integer AUTO_INCREMENT PRIMARY KEY,
-	fk_user		  integer DEFAULT 0 NOT NULL,
-  	label         varchar(50) NOT NULL,
-  	type		  varchar(20) NOT NULL,
-  	field         text NOT NULL
-)ENGINE=innodb;
-
-update llx_bank_url set type='banktransfert' where type='?' and label='(banktransfert)';
-
-ALTER TABLE llx_import_model ADD UNIQUE INDEX uk_import_model (label,type);
-
-delete from llx_const where name = 'FACTURE_ENABLE_RECUR';
-
-alter table llx_facturedet_rec add column  product_type		  integer    DEFAULT 0 after fk_product;
-
-alter table llx_c_chargesociales change actioncompta code varchar(12) NOT NULL;
-alter table llx_c_chargesociales add column  fk_pays  integer    DEFAULT 1 NOT NULL;
-
--- Usage of llx_menu_const and llx_menu_constraint is too complicated
--- so we made first change to remove it
-alter table llx_menu_const drop foreign key fk_menu_const_fk_menu;
-update llx_menu_constraint set action = '$conf->societe->enabled' where action = '$conf->commercial->enabled';
-
-ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_fk_soc (fk_soc);
-
-alter table llx_facture add column  tms timestamp after date_valid;
-alter table llx_facture_fourn add column  tms timestamp after datef;
-alter table llx_facture_fourn add column  fk_facture_source   integer after fk_user_valid;
-  
-update llx_facture set tms = datec where tms <= 0;
-update llx_facture_fourn set tms = datec where tms <= 0;
-
-
--- Clean no more required parameters
-delete from llx_const where name = 'MAIN_MODULE_COMMERCIAL';
-delete from llx_const where name like 'MAIN_MODULE_%_DIR_OUTPUT';
-delete from llx_const where name like 'MAIN_MODULE_%_DIR_TEMP';
-delete from llx_const where name like 'PRODUIT_CONFIRM_DELETE_LINE';
-delete from llx_const where name = 'MAIN_MODULE_SYSLOG' and entity = 2;
-delete from llx_const where name = 'SYSLOG_FILE' and entity = 2;
-delete from llx_const where name = 'SYSLOG_LEVEL' and entity = 2;
-
-alter table llx_societe add column import_key varchar(14);
-
- 
--- V4.1 delete from llx_paiementfourn where rowid not in (select fk_paiementfourn from llx_paiementfourn_facturefourn);
--- V4.1 delete from llx_paiementfourn_facturefourn where fk_facturefourn not in (select rowid from llx_facture_fourn);
-
-
- 
--- Multi company
-ALTER TABLE llx_rights_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER module;
-ALTER TABLE llx_events ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER type;
-ALTER TABLE llx_boxes_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER file;
-ALTER TABLE llx_user_param ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_user;
-ALTER TABLE llx_societe ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
-ALTER TABLE llx_socpeople ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc;
-ALTER TABLE llx_product ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_entrepot ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_chargesociales ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER libelle;
-ALTER TABLE llx_tva ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_bank_account ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_document_model ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
-ALTER TABLE llx_menu ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER menu_handler;
-ALTER TABLE llx_ecm_directories ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_mailing ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER titre;
-ALTER TABLE llx_categorie ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_propal ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_commande ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_commande_fournisseur ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_product_fournisseur ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref_fourn;
-ALTER TABLE llx_facture ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER facnumber;
-ALTER TABLE llx_expedition ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_facture_fourn ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER facnumber;
-ALTER TABLE llx_livraison ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_fichinter ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_contrat ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_c_barcode_type ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER code;
-ALTER TABLE llx_dolibarr_modules ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER numero;
-ALTER TABLE llx_bank_categ ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_bordereau_cheque ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER number;
-ALTER TABLE llx_prelevement_bons ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_projet ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_adherent ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
-ALTER TABLE llx_adherent_type ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
-ALTER TABLE llx_adherent_options_label ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER name;
-ALTER TABLE llx_facture_rec ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc;
-
-ALTER TABLE llx_rights_def DROP PRIMARY KEY;
-ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY;
-
-ALTER TABLE llx_adherent_options_label DROP PRIMARY KEY;
-ALTER TABLE llx_adherent_options_label MODIFY COLUMN name varchar(64) NOT NULL;
-ALTER TABLE llx_adherent_options_label ADD COLUMN rowid integer AUTO_INCREMENT PRIMARY KEY FIRST;
-
-ALTER TABLE llx_user_param DROP INDEX fk_user;
-ALTER TABLE llx_societe DROP INDEX uk_societe_prefix_comm;
-ALTER TABLE llx_societe DROP INDEX uk_societe_code_client;
-ALTER TABLE llx_product DROP INDEX uk_product_ref;
-ALTER TABLE llx_entrepot DROP INDEX label;
-ALTER TABLE llx_bank_account DROP INDEX uk_bank_account_label;
-ALTER TABLE llx_document_model DROP INDEX uk_document_model;
-ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu;
-ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref;
-ALTER TABLE llx_propal DROP INDEX ref;
-ALTER TABLE llx_commande DROP INDEX ref;
-ALTER TABLE llx_commande_fournisseur DROP INDEX uk_commande_fournisseur_ref;
-ALTER TABLE llx_product_fournisseur DROP INDEX fk_product;
-ALTER TABLE llx_product_fournisseur DROP INDEX fk_soc;
-ALTER TABLE llx_facture DROP INDEX idx_facture_uk_facnumber;
-ALTER TABLE llx_expedition DROP INDEX idx_expedition_uk_ref;
-ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn_ref;
-ALTER TABLE llx_livraison DROP INDEX idx_expedition_uk_ref;
-ALTER TABLE llx_livraison DROP INDEX idx_livraison_uk_ref;
-ALTER TABLE llx_fichinter DROP INDEX ref;
-ALTER TABLE llx_prelevement_bons DROP INDEX ref;
-ALTER TABLE llx_projet DROP INDEX ref;
-ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def;
-ALTER TABLE llx_adherent DROP INDEX uk_adherent_login;
-ALTER TABLE llx_adherent_type DROP INDEX uk_adherent_type_libelle;
-ALTER TABLE llx_facture_rec DROP INDEX idx_facture_rec_uk_titre;
-
-ALTER TABLE llx_rights_def ADD PRIMARY KEY pk_rights_def (id, entity);
-ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-
-ALTER TABLE llx_user_param ADD UNIQUE INDEX uk_user_param (fk_user,param,entity);
-ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_prefix_comm (prefix_comm, entity);
-ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_code_client (code_client, entity);
-ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_ref (ref, entity);
-ALTER TABLE llx_entrepot ADD UNIQUE INDEX uk_entrepot_label (label, entity);
-ALTER TABLE llx_bank_account ADD UNIQUE INDEX uk_bank_account_label (label, entity);
-ALTER TABLE llx_document_model ADD UNIQUE INDEX uk_document_model (nom, type, entity);
-ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url, entity);
-ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label, type, entity);
-ALTER TABLE llx_propal ADD UNIQUE INDEX uk_propal_ref (ref, entity);
-ALTER TABLE llx_commande ADD UNIQUE INDEX uk_commande_ref (ref, entity);
-ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity);
-ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref (ref_fourn, fk_soc, entity);
-ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity);
-ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity);
-ALTER TABLE llx_facture ADD UNIQUE INDEX idx_facture_uk_facnumber (facnumber, entity);
-ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref, entity);
-ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc, entity);
-ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref, entity);
-ALTER TABLE llx_fichinter ADD UNIQUE INDEX uk_fichinter_ref (ref, entity);
-ALTER TABLE llx_contrat ADD UNIQUE INDEX uk_contrat_ref (ref, entity);
-ALTER TABLE llx_bordereau_cheque ADD UNIQUE INDEX uk_bordereau_cheque (number, entity);
-ALTER TABLE llx_prelevement_bons ADD UNIQUE INDEX uk_prelevement_bons_ref (ref, entity);
-ALTER TABLE llx_projet ADD UNIQUE INDEX uk_projet_ref (ref, entity);
-ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity);
-ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_login (login, entity);
-ALTER TABLE llx_adherent_type ADD UNIQUE INDEX uk_adherent_type_libelle (libelle, entity);
-ALTER TABLE llx_adherent_options_label ADD UNIQUE INDEX uk_adherent_options_label_name (name, entity);
-ALTER TABLE llx_facture_rec ADD UNIQUE INDEX idx_facture_rec_uk_titre (titre, entity);
-
-ALTER TABLE llx_projet ADD INDEX idx_projet_fk_soc (fk_soc);
--- V4.1 update llx_projet set fk_soc=null where fk_soc is not null and fk_soc not in (select rowid from llx_societe);
-ALTER TABLE llx_projet ADD CONSTRAINT fk_projet_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-
-ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-
-
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MODULE_USER' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_POPUP_CALENDAR' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MAIL_SMTP_SERVER' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MAIL_SMTP_PORT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_UPLOAD_DOC' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_FEATURES_LEVEL' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_SOCIETE' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_CONTACT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_PRODUITSERVICE' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_ADHERENT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SIZE_LISTE_LIMIT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SHOW_WORKBOARD' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='SOCIETE_NOLIST_COURRIER' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='GENBARCODE_LOCATION' AND entity=1;
-
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MODULE_SYSLOG';
-UPDATE llx_const SET entity=0 WHERE name='SYSLOG_FILE';
-UPDATE llx_const SET entity=0 WHERE name='SYSLOG_LEVEL';
-
-
--- Fix to solve forgoten names on keys
-ALTER TABLE llx_dolibarr_modules drop primary KEY;
-ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-
-ALTER TABLE llx_events add column user_agent     varchar(128) NULL after ip;
-
-
-alter table llx_commande_fournisseur add column   ref_supplier        varchar(30) after entity;
-
-alter table llx_mailing add column bgcolor  varchar(8) after body;
-alter table llx_mailing add column bgimage  varchar(255) after bgcolor;
-
--- Added US states
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1);
---
--- Provinces US
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AL', 1101, '', 0, 'ALABAMA', 'Alabama', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AK', 1101, '', 0, 'ALASKA', 'Alaska', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AZ', 1101, '', 0, 'ARIZONA', 'Arizona', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AR', 1101, '', 0, 'ARKANSAS', 'Arkansas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CA', 1101, '', 0, 'CALIFORNIA', 'California', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CO', 1101, '', 0, 'COLORADO', 'Colorado', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CT', 1101, '', 0, 'CONNECTICUT', 'Connecticut', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('DE', 1101, '', 0, 'DELAWARE', 'Delaware', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('FL', 1101, '', 0, 'FLORIDA', 'Florida', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('GA', 1101, '', 0, 'GEORGIA', 'Georgia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('HI', 1101, '', 0, 'HAWAII', 'Hawaii', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ID', 1101, '', 0, 'IDAHO', 'Idaho', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IL', 1101, '', 0, 'ILLINOIS','Illinois', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IN', 1101, '', 0, 'INDIANA', 'Indiana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IA', 1101, '', 0, 'IOWA', 'Iowa', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KS', 1101, '', 0, 'KANSAS', 'Kansas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KY', 1101, '', 0, 'KENTUCKY', 'Kentucky', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('LA', 1101, '', 0, 'LOUISIANA', 'Louisiana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ME', 1101, '', 0, 'MAINE', 'Maine', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MD', 1101, '', 0, 'MARYLAND', 'Maryland', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MA', 1101, '', 0, 'MASSACHUSSETTS', 'Massachusetts', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MI', 1101, '', 0, 'MICHIGAN', 'Michigan', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MN', 1101, '', 0, 'MINNESOTA', 'Minnesota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MS', 1101, '', 0, 'MISSISSIPPI', 'Mississippi', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MO', 1101, '', 0, 'MISSOURI', 'Missouri', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MT', 1101, '', 0, 'MONTANA', 'Montana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NE', 1101, '', 0, 'NEBRASKA', 'Nebraska', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NV', 1101, '', 0, 'NEVADA', 'Nevada', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NH', 1101, '', 0, 'NEW HAMPSHIRE', 'New Hampshire', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NJ', 1101, '', 0, 'NEW JERSEY', 'New Jersey', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NM', 1101, '', 0, 'NEW MEXICO', 'New Mexico', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NY', 1101, '', 0, 'NEW YORK', 'New York', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NC', 1101, '', 0, 'NORTH CAROLINA', 'North Carolina', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ND', 1101, '', 0, 'NORTH DAKOTA', 'North Dakota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OH', 1101, '', 0, 'OHIO', 'Ohio', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OK', 1101, '', 0, 'OKLAHOMA', 'Oklahoma', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OR', 1101, '', 0, 'OREGON', 'Oregon', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('PA', 1101, '', 0, 'PENNSYLVANIA', 'Pennsylvania', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('RI', 1101, '', 0, 'RHODE ISLAND', 'Rhode Island', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SC', 1101, '', 0, 'SOUTH CAROLINA', 'South Carolina', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SD', 1101, '', 0, 'SOUTH DAKOTA', 'South Dakota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TN', 1101, '', 0, 'TENNESSEE', 'Tennessee', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TX', 1101, '', 0, 'TEXAS', 'Texas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('UT', 1101, '', 0, 'UTAH', 'Utah', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VT', 1101, '', 0, 'VERMONT', 'Vermont', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VA', 1101, '', 0, 'VIRGINIA', 'Virginia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WA', 1101, '', 0, 'WASHINGTON', 'Washington', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WV', 1101, '', 0, 'WEST VIRGINIA', 'West Virginia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WI', 1101, '', 0, 'WISCONSIN', 'Wisconsin', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WY', 1101, '', 0, 'WYOMING', 'Wyoming', 1);
-
-alter table llx_facture_fourn_det add column ref               varchar(50) after fk_product;
-alter table llx_facture_fourn_det add column label             varchar(255) after ref;
-
-alter table llx_societe_rib modify column iban_prefix varchar(34);
-alter table llx_bank_account modify column iban_prefix varchar(34);
-
-
-alter table llx_projet add column datec date after fk_statut;
-
-delete from llx_action_def;
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (1,'NOTIFY_VAL_FICHINTER','Validation fiche intervention','Executed when a intervention is validated','ficheinter');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (2,'NOTIFY_VAL_FAC','Validation facture client','Executed when a customer invoice is approved','facture');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_APP_ORDER_SUPPLIER','Approbation commande fournisseur','Executed when a supplier order is approved','order_supplier');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (4,'NOTIFY_REF_ORDER_SUPPLIER','Refus commande fournisseur','Executed when a supplier order is refused','order_supplier');
-
-
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5,  '19','0','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 52, 5,   '7','0','VAT reduced rate', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 53, 5,   '0','0','VAT Rate 0', 1); 
-
--- Add rule to avoid duplicate use of discount
-update llx_facturedet set fk_remise_except = null where fk_remise_except = 0;
-ALTER TABLE llx_facturedet ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except);
-
--- Add Mauritius
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15201', 'Mauritius Private Company Limited By Shares', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15202', 'Mauritius Company Limited By Guarantee', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15203', 'Mauritius Public Company Limited By Shares', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15204', 'Mauritius Foreign Company', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15205', 'Mauritius GBC1 (Offshore Company)', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15206', 'Mauritius GBC2 (International Company)', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15207', 'Mauritius General Partnership', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15208', 'Mauritius Limited Partnership', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15209', 'Mauritius Sole Proprietorship', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15210', 'Mauritius Trusts', 1);
-
-insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'MU', 'MUR', 1, 'Roupies mauritiennes');
-
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1521,152,  '0','0','VAT Rate 0',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1522,152,  '15','0','VAT Rate 15',1);
-
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201, 152, 15201, '', 0, 'Rivière Noire', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202, 152, 15202, '', 0, 'Flacq', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15203, 152, 15203, '', 0, 'Grand Port', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15204, 152, 15204, '', 0, 'Moka', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15205, 152, 15205, '', 0, 'Pamplemousses', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15206, 152, 15206, '', 0, 'Plaines Wilhems', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15207, 152, 15207, '', 0, 'Port-Louis', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15208, 152, 15208, '', 0, 'Rivière du Rempart', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15209, 152, 15209, '', 0, 'Savanne', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15210, 152, 15210, '', 0, 'Rodrigues', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15211, 152, 15211, '', 0, 'Les îles Agaléga', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15212, 152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
-
-alter table llx_const modify column name        varchar(255) NOT NULL;
-alter table llx_const modify column value       text NOT NULL;
-
--- SWEDEN (id 20)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (201,20,  '25','0','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (202,20,  '12','0','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (203,20,   '6','0','VAT super-reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (204,20,   '0','0','VAT Rate 0',  1);
-
--- Regions Suisse (id pays=6) 
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601, 6, 601, '', 1, 'Cantons', 1);
-
--- Cantons Suisse 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AG','ARGOVIE','Argovie',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AI','APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AR','APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BE','BERNE','Berne',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BL','BALE CAMPAGNE','Bâle Campagne',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BS','BALE VILLE','Bâle Ville',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'FR','FRIBOURG','Fribourg',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GE','GENEVE','Genève',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GL','GLARIS','Glaris',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GR','GRISONS','Grisons',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'JU','JURA','Jura',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'LU','LUCERNE','Lucerne',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'NE','NEUCHATEL','Neuchâtel',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'NW','NIDWALD','Nidwald',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'OW','OBWALD','Obwald',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SG','SAINT-GALL','Saint-Gall',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SH','SCHAFFHOUSE','Schaffhouse',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SO','SOLEURE','Soleure',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SZ','SCHWYZ','Schwyz',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'TG','THURGOVIE','Thurgovie',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'TI','TESSIN','Tessin',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'UR','URI','Uri',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'VD','VAUD','Vaud',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'VS','VALAIS','Valais',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZG','ZUG','Zug',1); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZH','ZURICH','Zürich',1);
-
--- Regions spain (id pays=4)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (401,  4, 401, '', 0, 'Andalucia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (402,  4, 402, '', 0, 'Aragón', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (403,  4, 403, '', 0, 'Castilla y León', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (404,  4, 404, '', 0, 'Castilla la Mancha', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (405,  4, 405, '', 0, 'Canarias', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (406,  4, 406, '', 0, 'Cataluña', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (407,  4, 407, '', 0, 'Comunidad de Ceuta', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (408,  4, 408, '', 0, 'Comunidad Foral de Navarra', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (409,  4, 409, '', 0, 'Comunidad de Melilla', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (410,  4, 410, '', 0, 'Cantabria', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (411,  4, 411, '', 0, 'Comunidad Valenciana', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (412,  4, 412, '', 0, 'Extemadura', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (413,  4, 413, '', 0, 'Galicia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (414,  4, 414, '', 0, 'Islas Baleares', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (415,  4, 415, '', 0, 'La Rioja', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (416,  4, 416, '', 0, 'Comunidad de Madrid', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (417,  4, 417, '', 0, 'Región de Murcia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (418,  4, 418, '', 0, 'Principado de Asturias', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (419,  4, 419, '', 0, 'Pais Vasco', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (420,  4, 420, '', 0, 'Otros', 1);
-
--- Provinces Spain
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('01', 419, '', 19, 'PAIS VASCO', 'País Vasco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('02', 404, '', 4, 'ALBACETE', 'Albacete', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('03', 411, '', 11, 'ALICANTE', 'Alicante', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('04', 401, '', 1, 'ALMERIA', 'Almería', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('05', 403, '', 3, 'AVILA', 'Avila', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('06', 412, '', 12, 'BADAJOZ', 'Badajoz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('07', 414, '', 14, 'ISLAS BALEARES', 'Islas Baleares', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('08', 406, '', 6, 'BARCELONA', 'Barcelona', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('09', 403, '', 8, 'BURGOS', 'Burgos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('10', 412, '', 12, 'CACERES', 'Cáceres', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('11', 401, '', 1, 'CADIz', 'Cádiz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('12', 411, '', 11, 'CASTELLON', 'Castellón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('13', 404, '', 4, 'CIUDAD REAL', 'Ciudad Real', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('14', 401, '', 1, 'CORDOBA', 'Córdoba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('15', 413, '', 13, 'LA CORUÑA', 'La Coruña', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('16', 404, '', 4, 'CUENCA', 'Cuenca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('17', 406, '', 6, 'GERONA', 'Gerona', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('18', 401, '', 1, 'GRANADA', 'Granada', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('19', 404, '', 4, 'GUADALAJARA', 'Guadalajara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('20', 419, '', 19, 'GUIPUZCOA', 'Guipúzcoa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('21', 401, '', 1, 'HUELVA', 'Huelva', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('22', 402, '', 2, 'HUESCA', 'Huesca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('23', 401, '', 1, 'JAEN', 'Jaén', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('24', 403, '', 3, 'LEON', 'León', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('25', 406, '', 6, 'LERIDA', 'Lérida', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('26', 415, '', 15, 'LA RIOJA', 'La Rioja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('27', 413, '', 13, 'LUGO', 'Lugo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('28', 416, '', 16, 'MADRID', 'Madrid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('29', 401, '', 1, 'MALAGA', 'Málaga', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('30', 417, '', 17, 'MURCIA', 'Murcia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('31', 408, '', 8, 'NAVARRA', 'Navarra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('32', 413, '', 13, 'ORENSE', 'Orense', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('33', 418, '', 18, 'ASTURIAS', 'Asturias', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('34', 403, '', 3, 'PALENCIA', 'Palencia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('35', 405, '', 5, 'LAS PALMAS', 'Las Palmas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('36', 413, '', 13, 'PONTEVEDRA', 'Pontevedra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('37', 403, '', 3, 'SALAMANCA', 'Salamanca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('38', 405, '', 5, 'STA. CRUZ DE TENERIFE', 'Sta. Cruz de Tenerife', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('39', 410, '', 10, 'CANTABRIA', 'Cantabria', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('40', 403, '', 3, 'SEGOVIA', 'Segovia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('41', 401, '', 1, 'SEVILLA', 'Sevilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('42', 403, '', 3, 'SORIA', 'Soria', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('43', 406, '', 6, 'TARRAGONA', 'Tarragona', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('44', 402, '', 2, 'TERUEL', 'Teruel', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('45', 404, '', 5, 'TOLEDO', 'Toledo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('46', 411, '', 11, 'VALENCIA', 'Valencia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('47', 403, '', 3, 'VALLADOLID', 'Valladolid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('48', 419, '', 19, 'VIZCAYA', 'Vizcaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('49', 403, '', 3, 'ZAMORA', 'Zamora', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('50', 402, '', 1, 'ZARAGOZA', 'Zaragoza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('51', 407, '', 7, 'CEUTA', 'Ceuta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('52', 409, '', 9, 'MELILLA', 'Melilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('53', 420, '', 20, 'OTROS', 'Otros', 1);
-
-
-alter table llx_product_price modify price_level smallint NULL DEFAULT 1;
-alter table llx_commandedet modify special_code integer UNSIGNED DEFAULT 0;
-alter table llx_facturedet modify special_code integer UNSIGNED DEFAULT 0;
-alter table llx_propaldet modify special_code integer UNSIGNED DEFAULT 0;
-alter table llx_societe modify special_code integer NULL;
-alter table llx_c_forme_juridique modify code integer NOT NULL;
-
-ALTER TABLE llx_bank_class ADD UNIQUE INDEX idx_bank_class_lineid (lineid);
-ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code);
-ALTER TABLE llx_c_methode_commande_fournisseur ADD UNIQUE INDEX uk_c_methode_commande_fournisseur (code);
-
-ALTER TABLE llx_menu change user usertype      integer NOT NULL default '0';
-
--- Rename index
-ALTER TABLE llx_adherent_options MODIFY COLUMN optid integer;
-ALTER TABLE llx_adherent_options DROP PRIMARY KEY;
-ALTER TABLE llx_adherent_options DROP INDEX uk_adherent_options;
-ALTER TABLE llx_adherent_options DROP INDEX idx_adherent_options;
-ALTER TABLE llx_adherent_options DROP INDEX adhid;
-ALTER TABLE llx_adherent_options CHANGE optid rowid integer AUTO_INCREMENT PRIMARY KEY;
-ALTER TABLE llx_adherent_options CHANGE adhid fk_member integer NOT NULL;
-ALTER TABLE llx_adherent_options ADD INDEX idx_adherent_options (fk_member);
-
-ALTER TABLE llx_adherent DROP INDEX idx_adherent_fk_soc;
-
-ALTER TABLE llx_propaldet ADD INDEX idx_propaldet_fk_propal (fk_propal);
--- V4.1 delete from llx_propaldet where fk_propal not in (select rowid from llx_propal);
-ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_propal FOREIGN KEY (fk_propal) REFERENCES llx_propal (rowid);
-
-ALTER TABLE llx_bank_class DROP INDEX idx_bank_class_lineid;
-ALTER TABLE llx_bank_class DROP INDEX uk_bank_class_lineid;
-ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ);
-
-
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
diff --git a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
deleted file mode 100755
index 045f72cf9f5..00000000000
--- a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
+++ /dev/null
@@ -1,211 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.7.0 or higher. 
---
-
-ALTER TABLE llx_actioncomm CHANGE fk_projet fk_project integer;
-
-ALTER TABLE llx_don ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid;
-ALTER TABLE llx_don ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-
-ALTER TABLE llx_stock_mouvement ADD COLUMN label varchar(128);
-
-ALTER TABLE llx_deplacement ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid;
-ALTER TABLE llx_deplacement ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_deplacement ADD COLUMN note_public text;
-
-ALTER TABLE llx_element_element DROP INDEX idx_element_element_idx1;
-ALTER TABLE llx_element_element DROP INDEX idx_element_element_targetid;
-ALTER TABLE llx_element_element CHANGE sourceid fk_source integer NOT NULL;
-ALTER TABLE llx_element_element CHANGE targetid fk_target integer NOT NULL;
-ALTER TABLE llx_element_element ADD UNIQUE INDEX idx_element_element_idx1 (fk_source, sourcetype, fk_target, targettype);
-ALTER TABLE llx_element_element ADD INDEX idx_element_element_fk_target (fk_target);
-
-ALTER TABLE llx_ecm_document RENAME TO llx_ecm_documents;
-ALTER TABLE llx_ecm_documents ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_ecm_documents ADD COLUMN crc varchar(32) DEFAULT '' NOT NULL AFTER private;
-ALTER TABLE llx_ecm_documents ADD COLUMN cryptkey varchar(50) DEFAULT '' NOT NULL AFTER crc;
-ALTER TABLE llx_ecm_documents ADD COLUMN cipher varchar(50) DEFAULT 'twofish' NOT NULL AFTER cryptkey;
-
-ALTER TABLE llx_facture_fourn_det MODIFY COLUMN qty real;
-
-
-ALTER TABLE llx_notify ADD COLUMN email VARCHAR(255);
-
-ALTER TABLE llx_c_currencies ADD COLUMN labelsing   varchar(64);
-update llx_c_currencies set labelsing='Euro' where code_iso='EUR';
-update llx_c_currencies set labelsing='Dollar' where code_iso='USD';
-
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (5,'NOTIFY_VAL_ORDER','Validation commande client','Executed when a customer order is validated','order');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (6,'NOTIFY_VAL_PROPAL','Validation proposition client','Executed when a commercial proposal is validated','propal');
-
-UPDATE llx_c_type_contact SET element='project' WHERE element='projet';
-
-UPDATE llx_const set value='mail' where value='simplemail' and name='MAIN_MAIL_SENDMODE';
-
-ALTER TABLE llx_projet ADD COLUMN model_pdf varchar(50) AFTER note;
-
-ALTER TABLE llx_societe ADD COLUMN localtax1_assuj          tinyint        DEFAULT 0 after tva_assuj;
-ALTER TABLE llx_societe ADD COLUMN localtax2_assuj          tinyint        DEFAULT 0 after localtax1_assuj;
-
-ALTER TABLE llx_user ADD COLUMN   photo varchar(255) after statut;
-
--- Create table of extra fields
-create table llx_extra_fields
-(
-  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
-  entity                integer  DEFAULT 1 NOT NULL,
-  object 				varchar(64) NOT NULL,
-  assign 				integer,
-  name 					varchar(64) NOT NULL,
-  label					varchar(64) NOT NULL,
-  format				varchar(8) 	NOT NULL,
-  fieldsize 			integer,
-  maxlength 			integer,
-  options 				varchar(45),
-  rank 					integer
-)ENGINE=innodb;
-
-ALTER TABLE llx_extra_fields ADD UNIQUE INDEX idx_extra_fields_name (name, entity);
-
--- Create table of possible values
-create table llx_extra_fields_options
-(
-  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
-  fk_extra_fields 		integer NOT NULL,
-  value 				varchar(255) NOT NULL,
-  rank 					integer
-)ENGINE=innodb;
-
-ALTER TABLE llx_extra_fields_options ADD INDEX idx_extra_fields_options_fk_extra_fields (fk_extra_fields);
-ALTER TABLE llx_extra_fields_options ADD CONSTRAINT fk_extra_fields_options_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid);
-
--- Create table of values
-create table llx_extra_fields_values
-(
-  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
-  entity                integer  DEFAULT 1 NOT NULL,
-  datec					datetime,
-  datem					datetime,
-  fk_object 			integer NOT NULL,
-  fk_extra_fields		integer NOT NULL,
-  value					varchar(255),
-  fk_user_create 		integer,
-  fk_user_modif 		integer
-)ENGINE=innodb;
-
-ALTER TABLE llx_extra_fields_values ADD INDEX idx_extra_fields_values_fk_extra_fields (fk_extra_fields, entity);
-ALTER TABLE llx_extra_fields_values ADD CONSTRAINT fk_extra_fields_values_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid);
-
-ALTER TABLE llx_bank_class DROP INDEX idx_bank_class_lineid;
-ALTER TABLE llx_bank_class DROP INDEX uk_bank_class_lineid;
-ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ);
-
-ALTER TABLE llx_rights_def MODIFY COLUMN module varchar(64);
-
--- Enhancement of project tasks
-ALTER TABLE llx_projet ADD COLUMN datee DATE AFTER dateo;
-ALTER TABLE llx_projet ADD COLUMN public integer;
-
-ALTER TABLE llx_projet_task ADD COLUMN datec datetime AFTER fk_task_parent;
-ALTER TABLE llx_projet_task ADD COLUMN tms timestamp AFTER datec;
-ALTER TABLE llx_projet_task ADD COLUMN dateo datetime AFTER tms;
-ALTER TABLE llx_projet_task ADD COLUMN datee datetime AFTER dateo;
-ALTER TABLE llx_projet_task ADD COLUMN datev datetime AFTER datee;
-ALTER TABLE llx_projet_task CHANGE title label varchar(255) NOT NULL;
-ALTER TABLE llx_projet_task ADD COLUMN description text AFTER label;
-ALTER TABLE llx_projet_task MODIFY description text;
-ALTER TABLE llx_projet_task MODIFY duration_effective real DEFAULT 0 NOT NULL;
-ALTER TABLE llx_projet_task ADD COLUMN progress	integer	DEFAULT 0 AFTER duration_effective;
-ALTER TABLE llx_projet_task ADD COLUMN priority	integer	DEFAULT 0 AFTER progress;
-ALTER TABLE llx_projet_task ADD COLUMN fk_milestone     integer DEFAULT 0 AFTER priority;
-ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer AFTER fk_user_creat;
-ALTER TABLE llx_projet_task ADD COLUMN fk_user_valid integer AFTER fk_user_modif;
-UPDATE llx_projet_task SET statut='1' WHERE statut='open';
-ALTER TABLE llx_projet_task CHANGE statut fk_statut smallint DEFAULT 0 NOT NULL;
-ALTER TABLE llx_projet_task CHANGE note note_private text;
-ALTER TABLE llx_projet_task ADD COLUMN note_public text AFTER note_private;
-ALTER TABLE llx_projet_task ADD COLUMN rang	integer	DEFAULT 0 AFTER note_public;
-
--- Delete old key
-ALTER TABLE llx_projet_task DROP INDEX fk_projet;
-ALTER TABLE llx_projet_task DROP INDEX fk_user_creat;
-ALTER TABLE llx_projet_task DROP INDEX statut;
--- Add new key
-ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_projet (fk_projet);
-ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_user_creat (fk_user_creat);
-ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_user_valid (fk_user_valid);
--- V4.1 DELETE FROM llx_projet_task WHERE fk_projet NOT IN (SELECT rowid from llx_projet);
--- V4.1 UPDATE llx_projet_task set fk_user_creat=NULL WHERE fk_user_creat IS NOT NULL AND fk_user_creat NOT IN (SELECT rowid from llx_user);
--- V4.1 UPDATE llx_projet_task set fk_user_valid=NULL WHERE fk_user_valid IS NOT NULL AND fk_user_valid NOT IN (SELECT rowid from llx_user);
-ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet 	FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
-ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user (rowid);
-ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
-
-ALTER TABLE llx_element_contact DROP FOREIGN KEY fk_element_contact_fk_c_type_contact;
-ALTER TABLE llx_element_contact DROP INDEX fk_element_contact_fk_c_type_contact;
-UPDATE llx_c_type_contact SET rowid='160' WHERE rowid='80';
-UPDATE llx_c_type_contact SET rowid='170' WHERE rowid='81';
-UPDATE llx_element_contact SET fk_c_type_contact='160' WHERE fk_c_type_contact='80';
-UPDATE llx_element_contact SET fk_c_type_contact='170' WHERE fk_c_type_contact='81';
-ALTER TABLE llx_element_contact ADD CONSTRAINT fk_element_contact_fk_c_type_contact FOREIGN KEY (fk_c_type_contact) REFERENCES llx_c_type_contact(rowid);
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (161, 'project',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (171, 'project',  'external', 'CONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (180, 'project_task',  'internal', 'TASKEXECUTIVE', 'Responsable', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (181, 'project_task',  'internal', 'CONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (190, 'project_task',  'external', 'TASKEXECUTIVE', 'Responsable', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (191, 'project_task',  'external', 'CONTRIBUTOR', 'Intervenant', 1);
-
-ALTER TABLE llx_projet ADD COLUMN description text AFTER title;
-ALTER TABLE llx_projet CHANGE note note_private text;
-ALTER TABLE llx_projet ADD COLUMN note_public text AFTER note_private;
-ALTER TABLE llx_projet MODIFY fk_statut smallint DEFAULT 0 NOT NULL;
-ALTER TABLE llx_projet MODIFY fk_user_creat integer NOT NULL;
-
--- Uniformize code: change tva_taux to tva_tx
-ALTER TABLE llx_facturedet CHANGE tva_taux tva_tx real;
-ALTER TABLE llx_facture_fourn_det CHANGE tva_taux tva_tx double(6,3);
-ALTER TABLE llx_facturedet_rec CHANGE tva_taux tva_tx real DEFAULT 19.6;
-
--- Create table for entities
-create table llx_entity
-(
-  rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  tms				timestamp,
-  label				varchar(255) NOT NULL,
-  description		text,
-  datec				datetime,
-  fk_user_creat		integer,
-  visible			tinyint DEFAULT 1 NOT NULL,
-  active			tinyint DEFAULT 1 NOT NULL
-) ENGINE=innodb;
-
-INSERT INTO llx_entity (rowid, label, description, datec, fk_user_creat, visible, active) VALUES (1, 'Default Entity', 'This is the default entity', NOW(), 1, 1, 1);
-
--- Add constraint
--- V4.1 DELETE FROM llx_fichinterdet WHERE fk_fichinter NOT IN (SELECT rowid from llx_fichinter);
-ALTER TABLE llx_fichinterdet ADD INDEX idx_fichinterdet_fk_fichinter (fk_fichinter);
-ALTER TABLE llx_fichinterdet ADD CONSTRAINT fk_fichinterdet_fk_fichinter FOREIGN KEY (fk_fichinter) REFERENCES llx_fichinter (rowid);
-
-
-
--- This was created into 2.9.0 but we need them to avoid errors of migration to 2.8 using new classes
-alter table llx_facture add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facturedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facturedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facturedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_facturedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-
-
--- This was created into 3.0.0 but we need them to avoid errors of migration to 2.8 using new classes
-ALTER TABLE llx_propaldet ADD COLUMN fk_parent_line	integer NULL AFTER fk_propal;
-ALTER TABLE llx_commandedet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande;
-ALTER TABLE llx_facturedet ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
-ALTER TABLE llx_facturedet_rec ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
deleted file mode 100755
index d4c889d9398..00000000000
--- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
+++ /dev/null
@@ -1,329 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.8.0 or higher. 
---
-
--- Add unique key
-ALTER TABLE llx_product_stock ADD UNIQUE INDEX uk_product_stock (fk_product,fk_entrepot);
-
-ALTER TABLE llx_product_stock drop column location;
-
--- Add missing table llx_product_association
-create table llx_product_association
-(
-  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  fk_product_pere       integer NOT NULL DEFAULT 0,
-  fk_product_fils       integer NOT NULL DEFAULT 0,
-  qty                   double NULL
-)ENGINE=innodb;
-
-
-ALTER TABLE llx_product_association ADD UNIQUE INDEX uk_product_association (fk_product_pere, fk_product_fils);
-
-ALTER TABLE llx_product_association ADD INDEX idx_product_association_fils (fk_product_fils);
-
-
-
-ALTER TABLE llx_product ADD INDEX idx_product_label (label);
-
--- V4.1 DELETE FROM llx_projet_task WHERE fk_projet NOT IN (SELECT rowid from llx_projet);
--- V4.1 UPDATE llx_projet_task set fk_user_creat=NULL WHERE fk_user_creat IS NOT NULL AND fk_user_creat NOT IN (SELECT rowid from llx_user);
--- V4.1 UPDATE llx_projet_task set fk_user_valid=NULL WHERE fk_user_valid IS NOT NULL AND fk_user_valid NOT IN (SELECT rowid from llx_user);
-
-ALTER table llx_bank_account ADD COLUMN fk_pays        integer        DEFAULT 0 NOT NULL after domiciliation;
-ALTER TABLE llx_bank_account ADD COLUMN fk_departement integer        DEFAULT NULL after domiciliation;
-ALTER TABLE llx_socpeople ADD COLUMN fk_departement integer        DEFAULT NULL after ville;
-ALTER TABLE llx_adherent  ADD COLUMN fk_departement integer        DEFAULT NULL after ville;
-ALTER TABLE llx_entrepot  ADD COLUMN fk_departement integer        DEFAULT NULL after ville;
-
-ALTER TABLE llx_bookmark ADD COLUMN position integer        DEFAULT 0;
-
--- Rename llx_product_det
-ALTER TABLE llx_product_det RENAME TO llx_product_lang;
-ALTER TABLE llx_product_lang ADD UNIQUE INDEX uk_product_lang (fk_product, lang);
--- V4.1 DELETE FROM llx_product_lang WHERE fk_product NOT IN (SELECT rowid from llx_product);
-ALTER TABLE llx_product_lang ADD CONSTRAINT fk_product_lang_fk_product 	FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
-
-ALTER TABLE llx_product ADD COLUMN virtual tinyint DEFAULT 0 NOT NULL AFTER tms;
-ALTER TABLE llx_product ADD COLUMN fk_parent integer DEFAULT 0 AFTER virtual;
-
-alter table llx_societe add column   default_lang   varchar(6) after price_level;
-alter table llx_socpeople add column   default_lang   varchar(6) after note;
-
-
-alter table llx_mailing add column   joined_file1       varchar(255);
-alter table llx_mailing add column   joined_file2       varchar(255);
-alter table llx_mailing add column   joined_file3       varchar(255);
-alter table llx_mailing add column   joined_file4       varchar(255);
-
-update llx_facture_fourn set fk_statut=2 where fk_statut=1 AND paye=1;
-
-alter table llx_facture_fourn add column close_code          varchar(16) after remise;
-alter table llx_facture_fourn add column close_note          varchar(128) after close_code;
-
--- Add local taxes
-alter table llx_facture add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facturedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facturedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facturedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_facturedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_facture_rec add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture_rec add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facturedet_rec add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facturedet_rec add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facturedet_rec add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_facturedet_rec add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_c_tva add column localtax1 double NOT NULL DEFAULT 0 after taux;
-alter table llx_c_tva add column localtax2 double NOT NULL DEFAULT 0 after localtax1;
-
-alter table llx_propal add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_propal add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_propaldet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_propaldet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_propaldet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_propaldet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_commande add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_commande add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_commandedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_commandedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_commandedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_commandedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_commande_fournisseur add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_commande_fournisseur add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_commande_fournisseurdet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_commande_fournisseurdet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_commande_fournisseurdet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_commande_fournisseurdet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_facture_fourn add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture_fourn add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facture_fourn_det add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facture_fourn_det add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facture_fourn_det add column total_localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture_fourn_det add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_product add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_product add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_product_price add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_product_price add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-
-alter table llx_contratdet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_contratdet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_contratdet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_contratdet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_product add column   hidden             tinyint      DEFAULT 0;
-
-alter table llx_product add column   length             float        DEFAULT NULL after weight_units;
-alter table llx_product add column   length_units       tinyint      DEFAULT NULL after length;
-alter table llx_product add column   surface            float        DEFAULT NULL after length_units;
-alter table llx_product add column   surface_units      tinyint      DEFAULT NULL after surface;
-
-alter table llx_product add column   accountancy_code_sell       varchar(15) after fk_barcode_type;
-alter table llx_product add column   accountancy_code_buy        varchar(15) after accountancy_code_sell;
-
-ALTER TABLE llx_product drop column stock_loc;
-ALTER TABLE llx_product_stock add column location        varchar(32);
-
-ALTER TABLE llx_expedition DROP FOREIGN KEY fk_expedition_fk_adresse_livraison;
-ALTER TABLE llx_expedition DROP INDEX idx_expedition_fk_adresse_livraison;
-ALTER TABLE llx_expedition ADD COLUMN ref_customer varchar(30) AFTER entity;
-ALTER TABLE llx_expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition;
-ALTER TABLE llx_expedition CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL;
-
-ALTER TABLE llx_livraison DROP FOREIGN KEY fk_livraison_fk_adresse_livraison;
-ALTER TABLE llx_livraison DROP INDEX idx_livraison_fk_adresse_livraison;
-ALTER TABLE llx_livraison change ref_client ref_customer varchar(30);
-ALTER TABLE llx_livraison change date_livraison date_delivery date		DEFAULT NULL;
-ALTER TABLE llx_livraison CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL;
-
-ALTER TABLE llx_c_actioncomm MODIFY libelle    varchar(48) NOT NULL;
-
-ALTER TABLE llx_facture MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture MODIFY total double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture MODIFY total_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture MODIFY amount double(24,8) DEFAULT 0 NOT NULL;
-
-ALTER TABLE llx_facturedet MODIFY tva_tx double(6,3);
-ALTER TABLE llx_facturedet MODIFY subprice double(24,8);
-ALTER TABLE llx_facturedet MODIFY price double(24,8);
-ALTER TABLE llx_facturedet MODIFY total_ht double(24,8);
-ALTER TABLE llx_facturedet MODIFY total_tva double(24,8);
-ALTER TABLE llx_facturedet MODIFY total_ttc double(24,8);
-
-ALTER TABLE llx_facture_rec MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_rec MODIFY total double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_rec MODIFY total_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_rec MODIFY amount double(24,8) DEFAULT 0 NOT NULL;
-
-ALTER TABLE llx_facturedet_rec MODIFY tva_tx double(6,3);
-ALTER TABLE llx_facturedet_rec MODIFY subprice double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY price double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY total_ht double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY total_tva double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY total_ttc double(24,8);
-
-
-ALTER TABLE llx_adherent ADD COLUMN civilite varchar(6) after entity;
-
-ALTER TABLE llx_deplacement ADD COLUMN fk_projet integer DEFAULT 0 after fk_soc;
-
--- Custom list
-DROP TABLE llx_c_field_list;
-create table llx_c_field_list
-(
-  rowid			integer  AUTO_INCREMENT PRIMARY KEY,
-  tms			timestamp,
-  element		varchar(64)        			NOT NULL,
-  entity		integer			DEFAULT 1 	NOT NULL,
-  name			varchar(32)        			NOT NULL,
-  alias			varchar(32)					NOT NULL,
-  title			varchar(32)        			NOT NULL,
-  align			varchar(6)		DEFAULT 'left',
-  sort			tinyint 		DEFAULT 1  	NOT NULL,
-  search		tinyint 		DEFAULT 0  	NOT NULL,
-  enabled       varchar(255)	DEFAULT 1,
-  rang      	integer 		DEFAULT 0
-)ENGINE=innodb;
-
-INSERT INTO llx_c_field_list (rowid, element, entity, name, alias, title, align, sort, search, enabled, rang) VALUES
-(1, 'product_default', 1, 'p.ref', 'ref', 'Ref', 'left', 1, 1, '1', 1),
-(2, 'product_default', 1, 'p.label', 'label', 'Label', 'left', 1, 1, '1', 2),
-(3, 'product_default', 1, 'p.barcode', 'barcode', 'BarCode', 'center', 1, 1, '$conf->barcode->enabled', 3),
-(4, 'product_default', 1, 'p.tms', 'datem', 'DateModification', 'center', 1, 0, '1', 4),
-(5, 'product_default', 1, 'p.price', 'price', 'SellingPriceHT', 'right', 1, 0, '1', 5),
-(6, 'product_default', 1, 'p.price_ttc', 'price_ttc', 'SellingPriceTTC', 'right', 1, 0, '1', 6),
-(7, 'product_default', 1, 'p.stock', 'stock', 'Stock', 'right', 0, 0, '$conf->stock->enabled', 7),
-(8, 'product_default', 1, 'p.envente', 'status', 'Status', 'right', 1, 0, '1', 8);
-
-
-UPDATE llx_adherent SET pays = null where pays <= '0' and pays != '0';
-ALTER table llx_adherent MODIFY pays integer;
-
--- Drop old tables
-DROP TABLE llx_projet_milestone;
-ALTER TABLE llx_projet drop column fk_milestone;
-
-ALTER TABLE llx_deplacement ADD COLUMN fk_statut INTEGER DEFAULT 1  NOT NULL after type;
-
-drop table llx_appro;
-
-ALTER TABLE llx_events MODIFY COLUMN user_agent     varchar(255) NULL;
-
-create table llx_categorie_member
-(
-  fk_categorie  integer NOT NULL,
-  fk_member     integer NOT NULL
-)ENGINE=innodb;
-
-ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member);
-ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_categorie (fk_categorie);
-ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_member (fk_member);
-
-ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_member_rowid   FOREIGN KEY (fk_member) REFERENCES llx_adherent (rowid);
-
-ALTER TABLE llx_product ADD COLUMN    canvas varchar(32) DEFAULT 'default@product';
-ALTER TABLE llx_product MODIFY COLUMN canvas varchar(32) DEFAULT 'default@product';
-UPDATE llx_product SET canvas = 'default@product' WHERE fk_product_type = 0 AND (canvas = '' OR canvas = 'default');
-UPDATE llx_product SET canvas = 'service@product' WHERE fk_product_type = 1 AND (canvas = '' OR canvas = 'service');
-UPDATE llx_product SET canvas = 'livre@droitpret' WHERE canvas = 'livre';
-UPDATE llx_product SET canvas = 'livrecontrat@droitpret' WHERE canvas = 'livrecontrat';
-UPDATE llx_product SET canvas = 'livrecouverture@droitpret' WHERE canvas = 'livrecouverture';
-
-
-ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu; 
-
-ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, position, url, entity);
-
-UPDATE llx_const SET name = 'MAIN_MODULE_PRODUCT' WHERE name = 'MAIN_MODULE_PRODUIT';
-
-UPDATE llx_expedition set ref_customer = NULL where ref_customer = '';
-
--- Add more predefined action codes --
-insert into llx_c_actioncomm (id, code, type, libelle, module) values (30, 'AC_SUP_ORD',  'system', 'Send supplier order by email'        ,'supplier_order');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values (31, 'AC_SUP_INV',  'system', 'Send supplier invoice by email'      ,'supplier_invoice');
-
--- Rename llx_societe_adresse_livraison
-ALTER TABLE llx_societe_adresse_livraison RENAME TO llx_societe_address;
-ALTER TABLE llx_societe_address CHANGE COLUMN nom name varchar(60);
-ALTER TABLE llx_societe_address CHANGE COLUMN fk_societe fk_soc integer DEFAULT 0;
-
--- Add new spanish VAT from July 2010
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 45, 4,  '18','0','4','VAT standard rate from July 2010',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 46, 4,   '8','0','1','VAT reduced rate from July 2010',1);
-
--- Add Argentina Data
--- Regions Argentina (id pays=23)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2301, 23, 2301, '', 0, 'Norte', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2302, 23, 2302, '', 0, 'Litoral', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2303, 23, 2303, '', 0, 'Cuyana', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2304, 23, 2304, '', 0, 'Central', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2305, 23, 2305, '', 0, 'Patagonia', 1);
-
--- Provinces Argentina
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2301', 2301, '', 01, 'CATAMARCA', 'Catamarca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2302', 2301, '', 02, 'YUJUY', 'Yujuy', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2303', 2301, '', 03, 'TUCAMAN', 'Tucamán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2304', 2301, '', 04, 'SANTIAGO DEL ESTERO', 'Santiago del Estero', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2305', 2301, '', 05, 'SALTA', 'Salta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2306', 2302, '', 06, 'CHACO', 'Chaco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2307', 2302, '', 07, 'CORRIENTES', 'Corrientes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2308', 2302, '', 08, 'ENTRE RIOS', 'Entre Ríos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2309', 2302, '', 09, 'FORMOSA MISIONES', 'Formosa Misiones', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2310', 2302, '', 10, 'SANTA FE', 'Santa Fe', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2311', 2303, '', 11, 'LA RIOJA', 'La Rioja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2312', 2303, '', 12, 'MENDOZA', 'Mendoza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2313', 2303, '', 13, 'SAN JUAN', 'San Juan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2314', 2303, '', 14, 'SAN LUIS', 'San Luis', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2315', 2304, '', 15, 'CORDOBA', 'Córdoba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2316', 2304, '', 16, 'BUENOS AIRES', 'Buenos Aires', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2317', 2304, '', 17, 'CABA', 'Caba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2318', 2305, '', 18, 'LA PAMPA', 'La Pampa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2319', 2305, '', 19, 'NEUQUEN', 'Neuquén', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2320', 2305, '', 20, 'RIO NEGRO', 'Río Negro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2321', 2305, '', 21, 'CHUBUT', 'Chubut', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2322', 2305, '', 22, 'SANTA CRUZ', 'Santa Cruz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2323', 2305, '', 23, 'TIERRA DEL FUEGO', 'Tierra del Fuego', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2324', 2305, '', 24, 'ISLAS MALVINAS', 'Islas Malvinas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2325', 2305, '', 25, 'ANTARTIDA', 'Antártida', 1);
-
--- Juridical status Argentina
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2301', 'Monotributista', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2302', 'Sociedad Civil', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2303', 'Sociedades Comerciales', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2304', 'Sociedades de Hecho', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2305', 'Sociedades Irregulares', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2306', 'Sociedad Colectiva', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2307', 'Sociedad en Comandita Simple', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2308', 'Sociedad de Capital e Industria', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2309', 'Sociedad Accidental o en participación', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2310', 'Sociedad de Responsabilidad Limitada', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2311', 'Sociedad Anónima', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2312', 'Sociedad Anónima con Participación Estatal Mayoritaria', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2313', 'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)', 1);
-
-
-DELETE from llx_const where name='USER_PASSWORD_GENERATED' and value='default';
-
-
-ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def;
-ALTER TABLE llx_boxes_def MODIFY file varchar(200) NOT NULL;
-ALTER TABLE llx_boxes_def MODIFY note varchar(130);
-ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note);
-
--- Fix bad old data
-UPDATE llx_bank_url SET type='payment' WHERE type='?' AND label='(payment)' AND url LIKE '%compta/paiement/fiche.php%';
-
-
-update llx_const set value ='eldy' where name = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon');
-update llx_user_param set value ='eldy' where param = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon');
-
-
-ALTER TABLE llx_tmp_caisse MODIFY fk_article integer NOT NULL;
diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql
deleted file mode 100644
index b3fbcca8ed1..00000000000
--- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql
+++ /dev/null
@@ -1,169 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.9.0 or higher. 
---
--- 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 change type of field: ALTER TABLE llx_table MODIFY name varchar(60);
--- To remove a column:      ALTER TABLE llx_table DROP COLUMN colname;
-
-ALTER TABLE llx_paiement MODIFY amount double(24,8); 
-ALTER TABLE llx_paiement_facture MODIFY amount double(24,8); 
-
--- Fix bad old data
-UPDATE llx_bank_url SET type='payment' WHERE type='?' AND label='(payment)' AND url LIKE '%compta/paiement/fiche.php%';
-
--- Add recuperableonly field
-ALTER TABLE llx_product       add COLUMN recuperableonly integer NOT NULL DEFAULT '0' after tva_tx;
-ALTER TABLE llx_product_price add COLUMN recuperableonly integer NOT NULL DEFAULT '0' after tva_tx;
-
--- Rename envente into tosell and add tobuy
-ALTER TABLE llx_product CHANGE COLUMN envente tosell tinyint DEFAULT 1;
-ALTER TABLE llx_product add COLUMN tobuy tinyint DEFAULT 1 after tosell;
-ALTER TABLE llx_product_price CHANGE COLUMN envente tosell tinyint DEFAULT 1;
- 
-ALTER TABLE llx_bank MODIFY COLUMN fk_type varchar(6);
-
-ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def;
-ALTER TABLE llx_boxes_def MODIFY file varchar(200) NOT NULL;
-ALTER TABLE llx_boxes_def MODIFY note varchar(130);
-ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note);
-
-ALTER TABLE llx_notify_def MODIFY fk_contact integer NULL;
-ALTER TABLE llx_notify_def ADD COLUMN fk_user integer NULL after fk_contact;
-ALTER TABLE llx_notify_def ADD COLUMN type varchar(16) DEFAULT 'email';
-
-ALTER TABLE llx_notify MODIFY fk_contact integer NULL;
-ALTER TABLE llx_notify ADD COLUMN fk_user integer NULL after fk_contact;
-ALTER TABLE llx_notify ADD COLUMN type varchar(16) DEFAULT 'email';
-
-ALTER TABLE llx_actioncomm MODIFY label varchar(128) NOT NULL;
-
-ALTER TABLE llx_expedition MODIFY date_expedition datetime;
-ALTER TABLE llx_expedition MODIFY date_delivery datetime NULL;
-
-ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) NULL AFTER default_lang;
-ALTER TABLE llx_societe MODIFY canvas varchar(32) NULL;
-
-ALTER TABLE llx_cond_reglement RENAME TO llx_c_payment_term;
-ALTER TABLE llx_expedition_methode RENAME TO llx_c_shipment_mode;
-
-ALTER TABLE llx_facturedet_rec ADD COLUMN special_code integer UNSIGNED DEFAULT 0 AFTER total_ttc;
-ALTER TABLE llx_facturedet_rec ADD COLUMN rang integer DEFAULT 0 AFTER special_code;
-
-ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_order   integer;
-ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_invoice integer;
-
-ALTER TABLE llx_propaldet ADD COLUMN fk_parent_line	integer NULL AFTER fk_propal;
-ALTER TABLE llx_commandedet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande;
-ALTER TABLE llx_facturedet ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
-ALTER TABLE llx_facturedet_rec ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
-
--- Remove old Spanish TVA
-UPDATE llx_c_tva SET taux = '18' WHERE rowid = 41;
-UPDATE llx_c_tva SET taux = '8' WHERE rowid = 42;
-DELETE FROM llx_c_tva WHERE rowid = 45;
-DELETE FROM llx_c_tva WHERE rowid = 46;
-
-
-ALTER TABLE llx_adherent  ADD COLUMN import_key varchar(14);
-ALTER TABLE llx_categorie ADD COLUMN import_key varchar(14);
-
-
-ALTER TABLE llx_product ADD COLUMN customcode varchar(32) after note;
-ALTER TABLE llx_product ADD COLUMN fk_country integer after customcode; 
-
-
-ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX idx_ecm_directories (label, fk_parent, entity);
-ALTER TABLE llx_ecm_documents ADD UNIQUE INDEX idx_ecm_documents (fullpath_dol);
-
--- Add modules facture fournisseur
-INSERT INTO llx_const (name, value, type, note, visible) values ('INVOICE_SUPPLIER_ADDON_PDF', 'canelle','chaine','',0);
-ALTER TABLE llx_facture_fourn ADD COLUMN model_pdf varchar(50) after note_public;
-
-CREATE TABLE llx_c_ziptown
-(
-  rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  code				varchar(5) DEFAULT NULL,
-  fk_county			integer NOT NULL,
-  zip	 			varchar(10) NOT NULL,
-  town				varchar(255) NOT NULL,
-  active 			tinyint NOT NULL DEFAULT 1
-) ENGINE=innodb;
-
-ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_county (fk_county);
-ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county		FOREIGN KEY (fk_county)   REFERENCES llx_c_departements (rowid);
-
-ALTER TABLE llx_socpeople ADD COLUMN canvas varchar(32) NULL after default_lang;
-ALTER TABLE llx_socpeople MODIFY canvas varchar(32) NULL;
-
-UPDATE llx_socpeople SET canvas = 'default' WHERE canvas = 'default@contact';
-UPDATE llx_societe SET canvas = 'default' WHERE canvas = 'default@thirdparty';
-UPDATE llx_societe SET canvas = 'individual' WHERE canvas = 'individual@thirdparty';
-
-INSERT INTO llx_const (name, value, type, note, visible) values ('MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS','7','chaine','Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées',0);
-
-ALTER TABLE llx_actioncomm ADD COLUMN fulldayevent smallint NOT NULL default 0 after priority;
-
--- Enhance POS module
-DROP TABLE llx_tmp_caisse;
-CREATE TABLE llx_pos_tmp (
-  id integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  fk_article integer NOT NULL,
-  qte real NOT NULL,
-  fk_tva integer NOT NULL,
-  remise_percent real NOT NULL,
-  remise real NOT NULL,
-  total_ht double(24,8) NOT NULL,
-  total_tva double(24,8) NOT NULL,
-  total_ttc double(24,8) NOT NULL
-) ENGINE=innodb;
-
--- Add external ref
-ALTER TABLE llx_facture  ADD COLUMN ref_ext varchar(30) after entity;
-ALTER TABLE llx_commande ADD COLUMN ref_ext varchar(30) after entity;
-ALTER TABLE llx_propal   ADD COLUMN ref_ext varchar(30) after entity;
-ALTER TABLE llx_user     ADD COLUMN ref_ext varchar(30) after entity;
-ALTER TABLE llx_societe  ADD COLUMN ref_ext varchar(60) after entity;
-ALTER TABLE llx_product  ADD COLUMN ref_ext varchar(30) after entity;
-
-
-ALTER TABLE llx_mailing_cibles CHANGE COLUMN url source_url integer;
-ALTER TABLE llx_mailing_cibles MODIFY source_url varchar(160);
-ALTER TABLE llx_mailing_cibles ADD COLUMN source_id integer after source_url;
-ALTER TABLE llx_mailing_cibles ADD COLUMN source_type varchar(16) after source_id;
-
-ALTER TABLE llx_facture_rec DROP COLUMN frequency;
-ALTER TABLE llx_facture_rec ADD COLUMN frequency          integer;
-ALTER TABLE llx_facture_rec ADD COLUMN unit_frequency     varchar(2) DEFAULT 'd';
-ALTER TABLE llx_facture_rec ADD COLUMN date_when          datetime DEFAULT NULL;
-ALTER TABLE llx_facture_rec ADD COLUMN date_last_gen      datetime DEFAULT NULL;
-ALTER TABLE llx_facture_rec ADD COLUMN nb_gen_done        integer DEFAULT NULL;
-ALTER TABLE llx_facture_rec ADD COLUMN nb_gen_max         integer DEFAULT NULL;
-
-
-ALTER TABLE llx_user ADD COLUMN openid varchar(255);
-
--- Enhance Withdrawal module
-INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (7,'NOTIFY_TRN_WITHDRAW','Transmit withdraw','Executed when a withdrawal is transmited','withdraw');
-INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (8,'NOTIFY_CRD_WITHDRAW','Credite withdraw','Executed when a withdrawal is credited','withdraw');
-INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (9,'NOTIFY_EMT_WITHDRAW','Emit withdraw','Executed when a withdrawal is emited','withdraw');
-
-ALTER TABLE llx_prelevement_notifications MODIFY action varchar(32);
-
-ALTER TABLE llx_c_tva ADD COLUMN accountancy_code varchar(15) DEFAULT NULL;
-
-
-UPDATE llx_c_actioncomm set module='invoice_supplier' WHERE module='supplier_invoice';
-UPDATE llx_c_actioncomm set module='order_supplier' WHERE module='supplier_order';
-UPDATE llx_documentmodel set type='invoice_supplier' WHERE type='supplier_invoice';
-UPDATE llx_documentmodel set type='order_supplier' WHERE type='supplier_order';
-UPDATE llx_c_type_contact set element='invoice_supplier' WHERE element='facture_fourn';
-UPDATE llx_c_type_contact set module='invoice_supplier' WHERE module='supplier_invoice';
-UPDATE llx_c_type_contact set module='order_supplier' WHERE module='supplier_order';
-
-ALTER TABLE llx_facturedet DROP INDEX uk_fk_remise_except;
-ALTER TABLE llx_facturedet ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture);
-
-ALTER TABLE llx_societe_remise MODIFY remise_client double(6,3) DEFAULT 0 NOT NULL;
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
old mode 100644
new mode 100755
index 0e7a226d0bd..2dc967e2546
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -38,7 +38,7 @@ create table llx_c_email_templates
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
-  type_template   varchar(32),  -- template for wich type of email (send invoice by email, send order, ...)
+  type_template   varchar(32),  -- template for which type of email (send invoice by email, send order, ...)
   datec           datetime,
   label           varchar(255),
   content         text
@@ -196,6 +196,10 @@ ALTER TABLE llx_expeditiondet_batch ADD INDEX idx_fk_expeditiondet (fk_expeditio
 ALTER TABLE llx_expeditiondet_batch ADD CONSTRAINT fk_expeditiondet_batch_fk_expeditiondet FOREIGN KEY (fk_expeditiondet) REFERENCES llx_expeditiondet(rowid);
 
 
+ALTER TABLE llx_product_batch ADD INDEX ix_fk_product_stock (fk_product_stock);
+ALTER TABLE llx_product_batch ADD CONSTRAINT fk_product_batch_fk_product_stock FOREIGN KEY (fk_product_stock) REFERENCES llx_product_stock (rowid);
+
+
 -- New 1074 : Stock mouvement link to origin
 ALTER TABLE llx_stock_mouvement ADD fk_origin integer;
 ALTER TABLE llx_stock_mouvement ADD origintype VARCHAR(32);
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
new file mode 100755
index 00000000000..ad05f850e16
--- /dev/null
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -0,0 +1,1149 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 3.7.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);
+
+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);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19);
+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;
+
+ALTER TABLE llx_bank_account ADD COLUMN fk_user_author integer;
+
+ALTER TABLE llx_c_actioncomm ADD COLUMN color varchar(9);
+
+ALTER TABLE llx_propal ADD COLUMN fk_user_modif integer after fk_user_author;
+ALTER TABLE llx_commande ADD COLUMN fk_user_modif integer after fk_user_author;
+ALTER TABLE llx_facture ADD COLUMN fk_user_modif integer after fk_user_author;
+ALTER TABLE llx_product ADD COLUMN fk_user_modif integer after fk_user_author;
+ALTER TABLE llx_fichinter ADD COLUMN fk_user_modif integer after fk_user_author;
+ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_modif integer after fk_user_author;
+ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_modif integer after fk_user_author;
+ALTER TABLE llx_bank_account ADD COLUMN fk_user_modif integer after fk_user_author;
+
+
+ALTER TABLE llx_fichinter ADD COLUMN ref_ext 	varchar(255);
+
+
+-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
+ALTER TABLE llx_c_typent ADD COLUMN fk_country integer NULL AFTER libelle;
+
+INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
+
+ALTER TABLE llx_user ADD COLUMN fk_user_creat integer AFTER tms;
+ALTER TABLE llx_user ADD COLUMN fk_user_modif integer AFTER fk_user_creat;
+
+-- Add module accounting Expert
+--ALTER TABLE llx_bookkeeping RENAME TO llx_accounting_bookkeeping; -- To update old user of module Accounting Expert -> Line should be added into file sql/x.y.z-a.b.c.sql of module. 
+
+
+CREATE TABLE llx_accounting_bookkeeping
+(
+  rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  doc_date			date NOT NULL,
+  doc_type			varchar(30) NOT NULL,	-- facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
+  doc_ref			varchar(30) NOT NULL,	-- facture_client/reglement_client/... reference number
+  fk_doc			integer NOT NULL,		-- facture_client/reglement_client/... rowid
+  fk_docdet			integer NOT NULL,		-- facture_client/reglement_client/... line rowid
+  code_tiers		varchar(24),			-- code tiers
+  numero_compte		varchar(32) DEFAULT NULL,
+  label_compte		varchar(128) NOT NULL,
+  debit				double NOT NULL,
+  credit			double NOT NULL,
+  montant			double NOT NULL,
+  sens				varchar(1) DEFAULT NULL,
+  fk_user_author	integer NOT NULL,
+  import_key		varchar(14),
+  code_journal		varchar(10) DEFAULT NULL,
+  piece_num		integer NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER active;
+ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT NULL AFTER account_number;
+
+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 fk_user_author integer DEFAULT NULL AFTER label;
+ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author;
+
+-- Qual
+UPDATE llx_const SET name = 'ACCOUNTING_MODE' WHERE name = 'COMPTA_MODE';
+UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_CUSTOMER' WHERE name = 'COMPTA_ACCOUNT_CUSTOMER';
+UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUPPLIER' WHERE name = 'COMPTA_ACCOUNT_SUPPLIER';
+UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_BUY_ACCOUNT' WHERE name = 'COMPTA_PRODUCT_BUY_ACCOUNT';
+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';
+UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUSPENSE' WHERE name = 'ACCOUNTINGEX_ACCOUNT_SUSPENSE';
+UPDATE llx_const SET name = 'ACCOUNTING_SELL_JOURNAL' WHERE name = 'ACCOUNTINGEX_SELL_JOURNAL';
+UPDATE llx_const SET name = 'ACCOUNTING_PURCHASE_JOURNAL' WHERE name = 'ACCOUNTINGEX_PURCHASE_JOURNAL';
+UPDATE llx_const SET name = 'ACCOUNTING_SOCIAL_JOURNAL' WHERE name = 'ACCOUNTINGEX_SOCIAL_JOURNAL';
+UPDATE llx_const SET name = 'ACCOUNTING_CASH_JOURNAL' WHERE name = 'ACCOUNTINGEX_CASH_JOURNAL';
+UPDATE llx_const SET name = 'ACCOUNTING_MISCELLANEOUS_JOURNAL' WHERE name = 'ACCOUNTINGEX_MISCELLANEOUS_JOURNAL';
+UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH' WHERE name = 'ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH';
+UPDATE llx_const SET name = 'ACCOUNTING_MODELCSV' WHERE name = 'ACCOUNTINGEX_MODELCSV';
+UPDATE llx_const SET name = 'ACCOUNTING_LENGTH_GACCOUNT' WHERE name = 'ACCOUNTINGEX_LENGTH_GACCOUNT';
+UPDATE llx_const SET name = 'ACCOUNTING_LENGTH_AACCOUNT' WHERE name = 'ACCOUNTINGEX_LENGTH_AACCOUNT';
+UPDATE llx_const SET name = 'ACCOUNTING_LIMIT_LIST_VENTILATION' WHERE name = 'ACCOUNTINGEX_LIMIT_LIST_VENTILATION';
+UPDATE llx_const SET name = 'ACCOUNTING_LIST_SORT_VENTILATION_TODO' WHERE name = 'ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO';
+UPDATE llx_const SET name = 'ACCOUNTING_LIST_SORT_VENTILATION_DONE' WHERE name = 'ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE';
+
+-- Drop old table
+DROP TABLE llx_compta;
+DROP TABLE llx_compta_account;
+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);
+ALTER TABLE llx_c_revenuestamp MODIFY COLUMN accountancy_code_sell varchar(32);
+ALTER TABLE llx_c_revenuestamp MODIFY COLUMN accountancy_code_buy varchar(32);
+ALTER TABLE llx_c_tva MODIFY COLUMN accountancy_code_sell varchar(32);
+ALTER TABLE llx_c_tva MODIFY COLUMN accountancy_code_buy varchar(32);
+ALTER TABLE llx_product MODIFY COLUMN accountancy_code_sell varchar(32);
+ALTER TABLE llx_product MODIFY COLUMN accountancy_code_buy varchar(32);
+ALTER TABLE llx_user MODIFY COLUMN accountancy_code varchar(32);
+
+
+ALTER TABLE llx_user ADD COLUMN thm double(24,8);
+ALTER TABLE llx_user ADD COLUMN tjm double(24,8);
+ALTER TABLE llx_user ADD COLUMN salary double(24,8);
+ALTER TABLE llx_user ADD COLUMN salaryextra double(24,8);
+ALTER TABLE llx_user ADD COLUMN weeklyhours double(16,8);
+
+
+ALTER TABLE llx_projet_task_time ADD COLUMN task_datehour datetime after task_date;
+
+ALTER TABLE llx_actioncomm_resources CHANGE COLUMN transparent transparency smallint default 1;
+
+
+-- Localtaxes by thirds
+ALTER TABLE llx_c_tva MODIFY COLUMN localtax1 varchar(10);
+ALTER TABLE llx_c_tva MODIFY COLUMN localtax2 varchar(10);
+ALTER TABLE llx_localtax ADD COLUMN localtaxtype tinyint after entity;
+ALTER TABLE llx_societe ADD COLUMN localtax1_value double(6,3) after localtax1_assuj;
+ALTER TABLE llx_societe ADD COLUMN localtax2_value double(6,3) after localtax2_assuj;
+
+-- Change on table c_pays
+ALTER TABLE llx_c_pays RENAME TO llx_c_country;
+
+ALTER TABLE llx_c_country CHANGE COLUMN libelle label VARCHAR(50);
+
+ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_country (rowid);
+ALTER TABLE llx_c_regions ADD CONSTRAINT fk_c_regions_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_country (rowid);
+
+
+-- Added missing relations of llx_product
+-- fk_country
+ALTER TABLE llx_product MODIFY COLUMN fk_country INTEGER NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_country DROP NOT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_country SET DEFAULT NULL;
+UPDATE llx_product SET fk_country = NULL WHERE fk_country = 0;
+ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country);
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES  llx_c_country (rowid);
+-- fk_user_author
+ALTER TABLE llx_product MODIFY COLUMN fk_user_author INTEGER NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_user_author DROP NOT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_user_author SET DEFAULT NULL;
+ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author);
+-- fk_barcode_type
+ALTER TABLE llx_product MODIFY COLUMN fk_barcode_type INTEGER NULL DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_barcode_type DROP NOT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_barcode_type SET 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);
+
+
+-- Added missing relations of llx_product_price
+-- fk_user_author
+ALTER TABLE  llx_product_price ADD INDEX idx_product_price_fk_user_author (fk_user_author);
+UPDATE llx_product_price set fk_user_author = null where fk_user_author = 0;
+ALTER TABLE  llx_product_price ADD CONSTRAINT fk_product_price_user_author FOREIGN KEY (fk_user_author) REFERENCES  llx_user (rowid);
+-- fk_user_author
+ALTER TABLE  llx_product_price ADD INDEX idx_product_price_fk_product (fk_product);
+DELETE from llx_product_price where fk_product NOT IN (SELECT rowid from llx_product);
+ALTER TABLE  llx_product_price ADD CONSTRAINT fk_product_price_product FOREIGN KEY (fk_product) REFERENCES  llx_product (rowid);
+
+ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_account integer AFTER date_livraison;
+ALTER TABLE llx_facture_fourn ADD COLUMN fk_account integer AFTER fk_projet;
+
+-- Fiscal years
+create table llx_accounting_fiscalyear
+(
+	rowid			integer AUTO_INCREMENT PRIMARY KEY,
+	label			varchar(128) NOT NULL,
+	date_start		date,
+	date_end		date,
+	statut			tinyint DEFAULT 0 NOT NULL,
+	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
+	datec			datetime NOT NULL,
+	tms				timestamp,
+	fk_user_author	integer NULL,
+	fk_user_modif	integer NULL
+)ENGINE=innodb;
+
+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;
+
+ALTER TABLE llx_adherents MODIFY COLUMN societe VARCHAR(60);
+
+--
+-- Descriptif des plans comptables ES PCG08-PYME
+--
+
+INSERT INTO llx_accounting_system (rowid, pcg_version, fk_pays, label, active) VALUES (4, 'PCG08-PYME', '4', 'The PYME accountancy spanish plan', '1');
+
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4001,'PCG08-PYME','FINANCIACION', 'XXXXXX', '1', '', 'Financiación básica', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4002,'PCG08-PYME','ACTIVO',  'XXXXXX', '2', '', 'Activo no corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4003,'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '3', '', 'Existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4004,'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4', '', 'Acreedores y deudores por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4005,'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5', '', 'Cuentas financieras', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4006,'PCG08-PYME','COMPRAS_Y_GASTOS','XXXXXX', '6', '', 'Compras y gastos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4007,'PCG08-PYME','VENTAS_E_INGRESOS',  'XXXXXX', '7', '', 'Ventas e ingresos', '1');
+
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4008, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '10', '4001', 'CAPITAL', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4009, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '100', '4008', 'Capital social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4010, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '101', '4008', 'Fondo social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4011, 'PCG08-PYME','FINANCIACION', 'CAPITAL', '102', '4008', 'Capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4012, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '103', '4008', 'Socios por desembolsos no exigidos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4013, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1030', '4012', 'Socios por desembolsos no exigidos capital social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4014, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1034', '4012', 'Socios por desembolsos no exigidos capital pendiente de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4015, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '104', '4008', 'Socios por aportaciones no dineradas pendientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4016, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1040', '4015', 'Socios por aportaciones no dineradas pendientes capital social', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4017, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1044', '4015', 'Socios por aportaciones no dineradas pendientes capital pendiente de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4018, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '108', '4008', 'Acciones o participaciones propias en situaciones especiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4019, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '109', '4008', 'Acciones o participaciones propias para reducción de capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4020, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '11', '4001', 'Reservas y otros instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4021, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '110', '4020', 'Prima de emisión o asunción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4022, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '111', '4020', 'Otros instrumentos de patrimonio neto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4023, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1110', '4022', 'Patrimonio neto por emisión de instrumentos financieros compuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4024, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1111', '4022', 'Resto de instrumentos de patrimoio neto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4025, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '112', '4020', 'Reserva legal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4026, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '113', '4020', 'Reservas voluntarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4027, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '114', '4020', 'Reservas especiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4028, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1140', '4027', 'Reservas para acciones o participaciones de la sociedad dominante', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4029, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1141', '4027', 'Reservas estatutarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4030, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1142', '4027', 'Reservas por capital amortizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4031, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1143', '4027', 'Reservas por fondo de comercio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4032, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1144', '4028', 'Reservas por acciones propias aceptadas en garantía', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4033, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '115', '4020', 'Reservas por pérdidas y ganancias actuariales y otros ajustes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4034, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '118', '4020', 'Aportaciones de socios o propietarios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4035, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '119', '4020', 'Diferencias por ajuste del capital a euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4036, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '12', '4001', 'Resultados pendientes de aplicación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4037, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '120', '4036', 'Remanente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4038, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '121', '4036', 'Resultados negativos de ejercicios anteriores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4039, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '129', '4036', 'Resultado del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4040, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '13', '4001', 'Subvenciones, donaciones y ajustes por cambio de valor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4041, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '130', '4040', 'Subvenciones oficiales de capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4042, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '131', '4040', 'Donaciones y legados de capital', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4043, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '132', '4040', 'Otras subvenciones, donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4044, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '133', '4040', 'Ajustes por valoración en activos financieros disponibles para la venta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4045, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '134', '4040', 'Operaciones de cobertura', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4046, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1340', '4045', 'Cobertura de flujos de efectivo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4047, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1341', '4045', 'Cobertura de una inversión neta en un negocio extranjero', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4048, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '135', '4040', 'Diferencias de conversión', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4049, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '136', '4040', 'Ajustes por valoración en activos no corrientes y grupos enajenables de elementos mantenidos para la venta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4050, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '137', '4040', 'Ingresos fiscales a distribuir en varios ejercicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4051, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1370', '4050', 'Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4052, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1371', '4050', 'Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4053, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '14', '4001', 'Provisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4054, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '141', '4053', 'Provisión para impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4055, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '142', '4053', 'Provisión para otras responsabilidades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4056, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '143', '4053', 'Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4057, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '145', '4053', 'Provisión para actuaciones medioambientales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4058, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '15', '4001', 'Deudas a largo plazo con características especiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4059, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '150', '4058', 'Acciones o participaciones a largo plazo consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4060, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '153', '4058', 'Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4061, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1533', '4060', 'Desembolsos no exigidos empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4062, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1534', '4060', 'Desembolsos no exigidos empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4063, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1535', '4060', 'Desembolsos no exigidos otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4064, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1536', '4060', 'Otros desembolsos no exigidos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4065, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '154', '4058', 'Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4066, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1543', '4065', 'Aportaciones no dinerarias pendientes empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4067, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1544', '4065', 'Aportaciones no dinerarias pendientes empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4068, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1545', '4065', 'Aportaciones no dinerarias pendientes otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4069, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1546', '4065', 'Otras aportaciones no dinerarias pendientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4070, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '16', '4001', 'Deudas a largo plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4071, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '160', '4070', 'Deudas a largo plazo con entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4072, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1603', '4071', 'Deudas a largo plazo con entidades de crédito empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4073, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1604', '4071', 'Deudas a largo plazo con entidades de crédito empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4074, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1605', '4071', 'Deudas a largo plazo con otras entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4075, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '161', '4070', 'Proveedores de inmovilizado a largo plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4076, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1613', '4075', 'Proveedores de inmovilizado a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4077, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1614', '4075', 'Proveedores de inmovilizado a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4078, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1615', '4075', 'Proveedores de inmovilizado a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4079, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '162', '4070', 'Acreedores por arrendamiento financiero a largo plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4080, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1623', '4079', 'Acreedores por arrendamiento financiero a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4081, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1624', '4080', 'Acreedores por arrendamiento financiero a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4082, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1625', '4080', 'Acreedores por arrendamiento financiero a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4083, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '163', '4070', 'Otras deudas a largo plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4084, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1633', '4083', 'Otras deudas a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4085, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1634', '4083', 'Otras deudas a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4086, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '1635', '4083', 'Otras deudas a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4087, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '17', '4001', 'Deudas a largo plazo por préstamos recibidos empresitos y otros conceptos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4088, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '170', '4087', 'Deudas a largo plazo con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4089, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '171', '4087', 'Deudas a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4090, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '172', '4087', 'Deudas a largo plazo transformables en suvbenciones donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4091, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '173', '4087', 'Proveedores de inmovilizado a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4092, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '174', '4087', 'Acreedores por arrendamiento financiero a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4093, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '175', '4087', 'Efectos a pagar a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4094, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '176', '4087', 'Pasivos por derivados financieros a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4095, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '177', '4087', 'Obligaciones y bonos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4096, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '179', '4087', 'Deudas representadas en otros valores negociables', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4097, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '18', '4001', 'Pasivos por fianzas garantias y otros conceptos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4098, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '180', '4097', 'Fianzas recibidas a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4099, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '181', '4097', 'Anticipos recibidos por ventas o prestaciones de servicios a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4100, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '185', '4097', 'Depositos recibidos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4101, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '19', '4001', 'Situaciones transitorias de financiación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4102, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '190', '4101', 'Acciones o participaciones emitidas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4103, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '192', '4101', 'Suscriptores de acciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4104, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '194', '4101', 'Capital emitido pendiente de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4105, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '195', '4101', 'Acciones o participaciones emitidas consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4106, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '197', '4101', 'Suscriptores de acciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4107, 'PCG08-PYME','FINANCIACION', 'XXXXXX', '199', '4101', 'Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4108, 'PCG08-PYME','ACTIVO', 'XXXXXX', '20', '4002', 'Inmovilizaciones intangibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4109, 'PCG08-PYME','ACTIVO', 'XXXXXX', '200', '4108', 'Investigación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4110, 'PCG08-PYME','ACTIVO', 'XXXXXX', '201', '4108', 'Desarrollo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4111, 'PCG08-PYME','ACTIVO', 'XXXXXX', '202', '4108', 'Concesiones administrativas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4112, 'PCG08-PYME','ACTIVO', 'XXXXXX', '203', '4108', 'Propiedad industrial', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4113, 'PCG08-PYME','ACTIVO', 'XXXXXX', '205', '4108', 'Derechos de transpaso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4114, 'PCG08-PYME','ACTIVO', 'XXXXXX', '206', '4108', 'Aplicaciones informáticas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4115, 'PCG08-PYME','ACTIVO', 'XXXXXX', '209', '4108', 'Anticipos para inmovilizaciones intangibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4116, 'PCG08-PYME','ACTIVO', 'XXXXXX', '21', '4002', 'Inmovilizaciones materiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4117, 'PCG08-PYME','ACTIVO', 'XXXXXX', '210', '4116', 'Terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4118, 'PCG08-PYME','ACTIVO', 'XXXXXX', '211', '4116', 'Construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4119, 'PCG08-PYME','ACTIVO', 'XXXXXX', '212', '4116', 'Instalaciones técnicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4120, 'PCG08-PYME','ACTIVO', 'XXXXXX', '213', '4116', 'Maquinaria', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4121, 'PCG08-PYME','ACTIVO', 'XXXXXX', '214', '4116', 'Utillaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4122, 'PCG08-PYME','ACTIVO', 'XXXXXX', '215', '4116', 'Otras instalaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4123, 'PCG08-PYME','ACTIVO', 'XXXXXX', '216', '4116', 'Mobiliario', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4124, 'PCG08-PYME','ACTIVO', 'XXXXXX', '217', '4116', 'Equipos para procesos de información', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4125, 'PCG08-PYME','ACTIVO', 'XXXXXX', '218', '4116', 'Elementos de transporte', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4126, 'PCG08-PYME','ACTIVO', 'XXXXXX', '219', '4116', 'Otro inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4127, 'PCG08-PYME','ACTIVO', 'XXXXXX', '22', '4002', 'Inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4128, 'PCG08-PYME','ACTIVO', 'XXXXXX', '220', '4127', 'Inversiones en terreons y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4129, 'PCG08-PYME','ACTIVO', 'XXXXXX', '221', '4127', 'Inversiones en construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4130, 'PCG08-PYME','ACTIVO', 'XXXXXX', '23', '4002', 'Inmovilizaciones materiales en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4131, 'PCG08-PYME','ACTIVO', 'XXXXXX', '230', '4130', 'Adaptación de terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4132, 'PCG08-PYME','ACTIVO', 'XXXXXX', '231', '4130', 'Construcciones en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4133, 'PCG08-PYME','ACTIVO', 'XXXXXX', '232', '4130', 'Instalaciones técnicas en montaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4134, 'PCG08-PYME','ACTIVO', 'XXXXXX', '233', '4130', 'Maquinaria en montaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4135, 'PCG08-PYME','ACTIVO', 'XXXXXX', '237', '4130', 'Equipos para procesos de información en montaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4136, 'PCG08-PYME','ACTIVO', 'XXXXXX', '239', '4130', 'Anticipos para inmovilizaciones materiales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4137, 'PCG08-PYME','ACTIVO', 'XXXXXX', '24', '4002', 'Inversiones financieras a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4138, 'PCG08-PYME','ACTIVO', 'XXXXXX', '240', '4137', 'Participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4139, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2403', '4138', 'Participaciones a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4140, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2404', '4138', 'Participaciones a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4141, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2405', '4138', 'Participaciones a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4142, 'PCG08-PYME','ACTIVO', 'XXXXXX', '241', '4137', 'Valores representativos de deuda a largo plazo de partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4143, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2413', '4142', 'Valores representativos de deuda a largo plazo de empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4144, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2414', '4142', 'Valores representativos de deuda a largo plazo de empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4145, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2415', '4142', 'Valores representativos de deuda a largo plazo de otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4146, 'PCG08-PYME','ACTIVO', 'XXXXXX', '242', '4137', 'Créditos a largo plazo a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4147, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2423', '4146', 'Créditos a largo plazo a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4148, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2424', '4146', 'Créditos a largo plazo a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4149, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2425', '4146', 'Créditos a largo plazo a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4150, 'PCG08-PYME','ACTIVO', 'XXXXXX', '249', '4137', 'Desembolsos pendientes sobre participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4151, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2493', '4150', 'Desembolsos pendientes sobre participaciones a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4152, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2494', '4150', 'Desembolsos pendientes sobre participaciones a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4153, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2495', '4150', 'Desembolsos pendientes sobre participaciones a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4154, 'PCG08-PYME','ACTIVO', 'XXXXXX', '25', '4002', 'Otras inversiones financieras a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4155, 'PCG08-PYME','ACTIVO', 'XXXXXX', '250', '4154', 'Inversiones financieras a largo plazo en instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4156, 'PCG08-PYME','ACTIVO', 'XXXXXX', '251', '4154', 'Valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4157, 'PCG08-PYME','ACTIVO', 'XXXXXX', '252', '4154', 'Créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4158, 'PCG08-PYME','ACTIVO', 'XXXXXX', '253', '4154', 'Créditos a largo plazo por enajenación de inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4159, 'PCG08-PYME','ACTIVO', 'XXXXXX', '254', '4154', 'Créditos a largo plazo al personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4160, 'PCG08-PYME','ACTIVO', 'XXXXXX', '255', '4154', 'Activos por derivados financieros a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4161, 'PCG08-PYME','ACTIVO', 'XXXXXX', '258', '4154', 'Imposiciones a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4162, 'PCG08-PYME','ACTIVO', 'XXXXXX', '259', '4154', 'Desembolsos pendientes sobre participaciones en el patrimonio neto a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4163, 'PCG08-PYME','ACTIVO', 'XXXXXX', '26', '4002', 'Fianzas y depósitos constituidos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4164, 'PCG08-PYME','ACTIVO', 'XXXXXX', '260', '4163', 'Fianzas constituidas a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4165, 'PCG08-PYME','ACTIVO', 'XXXXXX', '261', '4163', 'Depósitos constituidos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4166, 'PCG08-PYME','ACTIVO', 'XXXXXX', '28', '4002', 'Amortización acumulada del inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4167, 'PCG08-PYME','ACTIVO', 'XXXXXX', '280', '4166', 'Amortización acumulado del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4168, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2800', '4167', 'Amortización acumulada de investigación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4169, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2801', '4167', 'Amortización acumulada de desarrollo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4170, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2802', '4167', 'Amortización acumulada de concesiones administrativas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4171, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2803', '4167', 'Amortización acumulada de propiedad industrial', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4172, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2805', '4167', 'Amortización acumulada de derechos de transpaso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4173, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2806', '4167', 'Amortización acumulada de aplicaciones informáticas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4174, 'PCG08-PYME','ACTIVO', 'XXXXXX', '281', '4166', 'Amortización acumulado del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4175, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2811', '4174', 'Amortización acumulada de construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4176, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2812', '4174', 'Amortización acumulada de instalaciones técnicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4177, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2813', '4174', 'Amortización acumulada de maquinaria', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4178, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2814', '4174', 'Amortización acumulada de utillaje', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4179, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2815', '4174', 'Amortización acumulada de otras instalaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4180, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2816', '4174', 'Amortización acumulada de mobiliario', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4181, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2817', '4174', 'Amortización acumulada de equipos para proceso de información', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4182, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2818', '4174', 'Amortización acumulada de elementos de transporte', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4183, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2819', '4175', 'Amortización acumulada de otro inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4184, 'PCG08-PYME','ACTIVO', 'XXXXXX', '282', '4166', 'Amortización acumulada de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4185, 'PCG08-PYME','ACTIVO', 'XXXXXX', '29', '4002', 'Deterioro de valor de activos no corrientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4186, 'PCG08-PYME','ACTIVO', 'XXXXXX', '290', '4185', 'Deterioro de valor del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4187, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2900', '4186', 'Deterioro de valor de investigación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4188, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2901', '4186', 'Deterioro de valor de desarrollo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4189, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2902', '4186', 'Deterioro de valor de concesiones administrativas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4190, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2903', '4186', 'Deterioro de valor de propiedad industrial', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4191, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2905', '4186', 'Deterioro de valor de derechos de transpaso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4192, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2906', '4186', 'Deterioro de valor de aplicaciones informáticas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4193, 'PCG08-PYME','ACTIVO', 'XXXXXX', '291', '4185', 'Deterioro de valor del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4194, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2910', '4193', 'Deterioro de valor de terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4195, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2911', '4193', 'Deterioro de valor de construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4196, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2912', '4193', 'Deterioro de valor de instalaciones técnicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4197, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2913', '4193', 'Deterioro de valor de maquinaria', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4198, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2914', '4193', 'Deterioro de valor de utillajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4199, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2915', '4194', 'Deterioro de valor de otras instalaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4200, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2916', '4194', 'Deterioro de valor de mobiliario', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4201, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2917', '4194', 'Deterioro de valor de equipos para proceso de información', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4202, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2918', '4194', 'Deterioro de valor de elementos de transporte', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4203, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2919', '4194', 'Deterioro de valor de otro inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4204, 'PCG08-PYME','ACTIVO', 'XXXXXX', '292', '4185', 'Deterioro de valor de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4205, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2920', '4204', 'Deterioro de valor de terrenos y bienes naturales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4206, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2921', '4204', 'Deterioro de valor de construcciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4207, 'PCG08-PYME','ACTIVO', 'XXXXXX', '293', '4185', 'Deterioro de valor de participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4208, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2933', '4207', 'Deterioro de valor de participaciones a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4209, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2934', '4207', 'Deterioro de valor de sobre participaciones a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4210, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2935', '4207', 'Deterioro de valor de sobre participaciones a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4211, 'PCG08-PYME','ACTIVO', 'XXXXXX', '294', '4185', 'Deterioro de valor de valores representativos de deuda a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4212, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2943', '4211', 'Deterioro de valor de valores representativos de deuda a largo plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4213, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2944', '4211', 'Deterioro de valor de valores representativos de deuda a largo plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4214, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2945', '4211', 'Deterioro de valor de valores representativos de deuda a largo plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4215, 'PCG08-PYME','ACTIVO', 'XXXXXX', '295', '4185', 'Deterioro de valor de créditos a largo plazo a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4216, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2953', '4215', 'Deterioro de valor de créditos a largo plazo a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4217, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2954', '4215', 'Deterioro de valor de créditos a largo plazo a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4218, 'PCG08-PYME','ACTIVO', 'XXXXXX', '2955', '4215', 'Deterioro de valor de créditos a largo plazo a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4219, 'PCG08-PYME','ACTIVO', 'XXXXXX', '296', '4185', 'Deterioro de valor de participaciones en el patrimonio netoa largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4220, 'PCG08-PYME','ACTIVO', 'XXXXXX', '297', '4185', 'Deterioro de valor de valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4221, 'PCG08-PYME','ACTIVO', 'XXXXXX', '298', '4185', 'Deterioro de valor de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4222, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '30', '4003', 'Comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4223, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '300', '4222', 'Mercaderías A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4224, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '301', '4222', 'Mercaderías B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4225, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '31', '4003', 'Materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4226, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '310', '4225', 'Materias primas A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4227, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '311', '4225', 'Materias primas B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4228, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '32', '4003', 'Otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4229, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '320', '4228', 'Elementos y conjuntos incorporables', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4230, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '321', '4228', 'Combustibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4231, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '322', '4228', 'Repuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4232, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '325', '4228', 'Materiales diversos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4233, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '326', '4228', 'Embalajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4234, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '327', '4228', 'Envases', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4235, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '328', '4229', 'Material de oficina', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4236, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '33', '4003', 'Productos en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4237, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '330', '4236', 'Productos en curos A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4238, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '331', '4236', 'Productos en curso B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4239, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '34', '4003', 'Productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4240, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '340', '4239', 'Productos semiterminados A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4241, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '341', '4239', 'Productos semiterminados B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4242, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '35', '4003', 'Productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4243, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '350', '4242', 'Productos terminados A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4244, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '351', '4242', 'Productos terminados B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4245, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '36', '4003', 'Subproductos, residuos y materiales recuperados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4246, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '360', '4245', 'Subproductos A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4247, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '361', '4245', 'Subproductos B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4248, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '365', '4245', 'Residuos A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4249, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '366', '4245', 'Residuos B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4250, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '368', '4245', 'Materiales recuperados A', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4251, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '369', '4245', 'Materiales recuperados B', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4252, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '39', '4003', 'Deterioro de valor de las existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4253, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '390', '4252', 'Deterioro de valor de las mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4254, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '391', '4252', 'Deterioro de valor de las materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4255, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '392', '4252', 'Deterioro de valor de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4256, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '393', '4252', 'Deterioro de valor de los productos en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4257, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '394', '4252', 'Deterioro de valor de los productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4258, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '395', '4252', 'Deterioro de valor de los productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4259, 'PCG08-PYME','EXISTENCIAS', 'XXXXXX', '396', '4252', 'Deterioro de valor de los subproductos, residuos y materiales recuperados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4260, 'PCG08-PYME','ACREEDORES_DEUDORES', 'PROVEEDORES', '40', '4004', 'Proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4261, 'PCG08-PYME','ACREEDORES_DEUDORES', 'PROVEEDORES', '400', '4260', 'Proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4262, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4000', '4261', 'Proveedores euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4263, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4004', '4261', 'Proveedores moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4264, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4009', '4261', 'Proveedores facturas pendientes de recibir o formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4265, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '401', '4260', 'Proveedores efectos comerciales a pagar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4266, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '403', '4260', 'Proveedores empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4267, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4030', '4266', 'Proveedores empresas del grupo euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4268, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4031', '4266', 'Efectos comerciales a pagar empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4269, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4034', '4266', 'Proveedores empresas del grupo moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4270, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4036', '4266', 'Envases y embalajes a devolver a proveedores empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4271, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4039', '4266', 'Proveedores empresas del grupo facturas pendientes de recibir o de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4272, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '404', '4260', 'Proveedores empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4273, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '405', '4260', 'Proveedores otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4274, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '406', '4260', 'Envases y embalajes a devolver a proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4275, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '407', '4260', 'Anticipos a proveedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4276, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '41', '4004', 'Acreedores varios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4277, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '410', '4276', 'Acreedores por prestaciones de servicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4278, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4100', '4277', 'Acreedores por prestaciones de servicios euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4279, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4104', '4277', 'Acreedores por prestaciones de servicios moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4280, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4109', '4277', 'Acreedores por prestaciones de servicios facturas pendientes de recibir o formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4281, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '411', '4276', 'Acreedores efectos comerciales a pagar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4282, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '419', '4276', 'Acreedores por operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4283, 'PCG08-PYME','ACREEDORES_DEUDORES', 'CLIENTES', '43', '4004', 'Clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4284, 'PCG08-PYME','ACREEDORES_DEUDORES', 'CLIENTES', '430', '4283', 'Clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4285, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4300', '4284', 'Clientes euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4286, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4304', '4284', 'Clientes moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4287, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4309', '4284', 'Clientes facturas pendientes de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4288, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '431', '4283', 'Clientes efectos comerciales a cobrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4289, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4310', '4288', 'Efectos comerciales en cartera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4290, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4311', '4288', 'Efectos comerciales descontados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4291, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4312', '4288', 'Efectos comerciales en gestión de cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4292, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4315', '4288', 'Efectos comerciales impagados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4293, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '432', '4283', 'Clientes operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4294, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '433', '4283', 'Clientes empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4295, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4330', '4294', 'Clientes empresas del grupo euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4296, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4331', '4294', 'Efectos comerciales a cobrar empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4297, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4332', '4294', 'Clientes empresas del grupo operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4298, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4334', '4294', 'Clientes empresas del grupo moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4299, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4336', '4294', 'Clientes empresas del grupo dudoso cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4300, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4337', '4294', 'Envases y embalajes a devolver a clientes empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4301, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4339', '4294', 'Clientes empresas del grupo facturas pendientes de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4302, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '434', '4283', 'Clientes empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4303, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '435', '4283', 'Clientes otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4304, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '436', '4283', 'Clientes de dudoso cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4305, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '437', '4283', 'Envases y embalajes a devolver por clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4306, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '438', '4283', 'Anticipos de clientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4307, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '44', '4004', 'Deudores varios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4308, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '440', '4307', 'Deudores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4309, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4400', '4308', 'Deudores euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4310, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4404', '4308', 'Deudores moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4311, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4409', '4308', 'Deudores facturas pendientes de formalizar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4312, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '441', '4307', 'Deudores efectos comerciales a cobrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4313, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4410', '4312', 'Deudores efectos comerciales en cartera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4314, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4411', '4312', 'Deudores efectos comerciales descontados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4315, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4412', '4312', 'Deudores efectos comerciales en gestión de cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4316, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4415', '4312', 'Deudores efectos comerciales impagados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4317, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '446', '4307', 'Deudores de dusoso cobro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4318, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '449', '4307', 'Deudores por operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4319, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '46', '4004', 'Personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4320, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '460', '4319', 'Anticipos de renumeraciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4321, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '465', '4319', 'Renumeraciones pendientes de pago', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4322, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '47', '4004', 'Administraciones Públicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4323, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '470', '4322', 'Hacienda Pública deudora por diversos conceptos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4324, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4700', '4323', 'Hacienda Pública deudora por IVA', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4325, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4708', '4323', 'Hacienda Pública deudora por subvenciones concedidas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4326, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4709', '4323', 'Hacienda Pública deudora por devolución de impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4327, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '471', '4322', 'Organismos de la Seguridad Social deudores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4328, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '472', '4322', 'Hacienda Pública IVA soportado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4329, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '473', '4322', 'Hacienda Pública retenciones y pagos a cuenta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4330, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '474', '4322', 'Activos por impuesto diferido', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4331, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4740', '4330', 'Activos por diferencias temporarias deducibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4332, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4742', '4330', 'Derechos por deducciones y bonificaciones pendientes de aplicar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4333, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4745', '4330', 'Crédito por pérdidasa compensar del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4334, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '475', '4322', 'Hacienda Pública acreedora por conceptos fiscales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4335, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4750', '4334', 'Hacienda Pública acreedora por IVA', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4336, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4751', '4334', 'Hacienda Pública acreedora por retenciones practicadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4337, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4752', '4334', 'Hacienda Pública acreedora por impuesto sobre sociedades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4338, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4758', '4334', 'Hacienda Pública acreedora por subvenciones a integrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4339, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '476', '4322', 'Organismos de la Seguridad Social acreedores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4340, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '477', '4322', 'Hacienda Pública IVA repercutido', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4341, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '479', '4322', 'Pasivos por diferencias temporarias imponibles', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4342, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '48', '4004', 'Ajustes por periodificación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4343, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '480', '4342', 'Gastos anticipados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4344, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '485', '4342', 'Ingresos anticipados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4345, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '49', '4004', 'Deterioro de valor de créditos comerciales y provisiones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4346, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '490', '4345', 'Deterioro de valor de créditos por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4347, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '493', '4345', 'Deterioro de valor de créditos por operaciones comerciales con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4348, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4933', '4347', 'Deterioro de valor de créditos por operaciones comerciales con empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4349, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4934', '4347', 'Deterioro de valor de créditos por operaciones comerciales con empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4350, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4935', '4347', 'Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4351, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '499', '4345', 'Provisiones por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4352, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4994', '4351', 'Provisión para contratos anerosos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4353, 'PCG08-PYME','ACREEDORES_DEUDORES', 'XXXXXX', '4999', '4351', 'Provisión para otras operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4354, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '50', '4005', 'Emprésitos deudas con características especiales y otras emisiones análogas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4355, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '500', '4354', 'Obligaciones y bonos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4356, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '502', '4354', 'Acciones o participaciones a corto plazo consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4357, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '505', '4354', 'Deudas representadas en otros valores negociables a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4358, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '506', '4354', 'Intereses a corto plazo de emprésitos y otras emisiones analógicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4359, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '507', '4354', 'Dividendos de acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4360, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '509', '4354', 'Valores negociables amortizados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4361, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5090', '4360', 'Obligaciones y bonos amortizados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4362, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5095', '4360', 'Otros valores negociables amortizados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4363, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '51', '4005', 'Deudas a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4364, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '510', '4363', 'Deudas a corto plazo con entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4365, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5103', '4364', 'Deudas a corto plazo con entidades de crédito empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4366, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5104', '4364', 'Deudas a corto plazo con entidades de crédito empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4367, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5105', '4364', 'Deudas a corto plazo con otras entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4368, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '511', '4363', 'Proveedores de inmovilizado a corto plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4369, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5113', '4368', 'Proveedores de inmovilizado a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4370, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5114', '4368', 'Proveedores de inmovilizado a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4371, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5115', '4368', 'Proveedores de inmovilizado a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4372, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '512', '4363', 'Acreedores por arrendamiento financiero a corto plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4373, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5123', '4372', 'Acreedores por arrendamiento financiero a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4374, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5124', '4372', 'Acreedores por arrendamiento financiero a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4375, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5125', '4372', 'Acreedores por arrendamiento financiero a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4376, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '513', '4363', 'Otras deudas a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4377, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5133', '4376', 'Otras deudas a corto plazo con empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4378, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5134', '4376', 'Otras deudas a corto plazo con empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4379, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5135', '4376', 'Otras deudas a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4380, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '514', '4363', 'Intereses a corto plazo con partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4381, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5143', '4380', 'Intereses a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4382, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5144', '4380', 'Intereses a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4383, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5145', '4380', 'Intereses deudas a corto plazo partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4384, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '52', '4005', 'Deudas a corto plazo por préstamos recibidos y otros conceptos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4385, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '520', '4384', 'Deudas a corto plazo con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4386, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5200', '4385', 'Préstamos a corto plazo de entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4387, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5201', '4385', 'Deudas a corto plazo por crédito dispuesto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4388, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5208', '4385', 'Deudas por efectos descontados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4389, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5209', '4385', 'Deudas por operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4390, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '521', '4384', 'Deudas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4391, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '522', '4384', 'Deudas a corto plazo transformables en subvenciones donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4392, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '523', '4384', 'Proveedores de inmovilizado a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4393, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '526', '4384', 'Dividendo activo a pagar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4394, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '527', '4384', 'Intereses a corto plazo de deudas con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4395, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '528', '4384', 'Intereses a corto plazo de deudas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4396, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '529', '4384', 'Provisiones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4397, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5291', '4396', 'Provisión a corto plazo para impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4398, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5292', '4396', 'Provisión a corto plazo para otras responsabilidades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4399, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5293', '4396', 'Provisión a corto plazo por desmantelamiento retiro o rehabilitación del inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4400, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5295', '4396', 'Provisión a corto plazo para actuaciones medioambientales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4401, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '53', '4005', 'Inversiones financieras a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4402, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '530', '4401', 'Participaciones a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4403, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5303', '4402', 'Participaciones a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4404, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5304', '4402', 'Participaciones a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4405, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5305', '4402', 'Participaciones a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4406, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '531', '4401', 'Valores representativos de deuda a corto plazo de partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4407, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5313', '4406', 'Valores representativos de deuda a corto plazo de empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4408, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5314', '4406', 'Valores representativos de deuda a corto plazo de empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4409, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5315', '4406', 'Valores representativos de deuda a corto plazo de otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4410, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '532', '4401', 'Créditos a corto plazo a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4411, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5323', '4410', 'Créditos a corto plazo a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4412, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5324', '4410', 'Créditos a corto plazo a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4413, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5325', '4410', 'Créditos a corto plazo a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4414, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '533', '4401', 'Intereses a corto plazo de valores representativos de deuda de partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4415, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5333', '4414', 'Intereses a corto plazo de valores representativos de deuda en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4416, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5334', '4414', 'Intereses a corto plazo de valores representativos de deuda en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4417, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5335', '4414', 'Intereses a corto plazo de valores representativos de deuda en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4418, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '534', '4401', 'Intereses a corto plazo de créditos a partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4419, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5343', '4418', 'Intereses a corto plazo de créditos a empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4420, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5344', '4418', 'Intereses a corto plazo de créditos a empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4421, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5345', '4418', 'Intereses a corto plazo de créditos a otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4422, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '535', '4401', 'Dividendo a cobrar de inversiones financieras en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4423, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5353', '4422', 'Dividendo a cobrar de empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4424, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5354', '4422', 'Dividendo a cobrar de empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4425, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5355', '4422', 'Dividendo a cobrar de otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4426, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '539', '4401', 'Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4427, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5393', '4426', 'Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4428, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5394', '4426', 'Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4429, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5395', '4426', 'Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4430, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '54', '4005', 'Otras inversiones financieras a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4431, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '540', '4430', 'Inversiones financieras a corto plazo en instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4432, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '541', '4430', 'Valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4433, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '542', '4430', 'Créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4434, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '543', '4430', 'Créditos a corto plazo por enejenación de inmovilizado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4435, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '544', '4430', 'Créditos a corto plazo al personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4436, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '545', '4430', 'Dividendo a cobrar', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4437, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '546', '4430', 'Intereses a corto plazo de valores reprsentativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4438, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '547', '4430', 'Intereses a corto plazo de créditos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4439, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '548', '4430', 'Imposiciones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4440, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '549', '4430', 'Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4441, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '55', '4005', 'Otras cuentas no bancarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4442, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '550', '4441', 'Titular de la explotación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4443, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '551', '4441', 'Cuenta corriente con socios y administradores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4444, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '552', '4441', 'Cuenta corriente otras personas y entidades vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4445, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5523', '4444', 'Cuenta corriente con empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4446, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5524', '4444', 'Cuenta corriente con empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4447, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5525', '4444', 'Cuenta corriente con otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4448, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '554', '4441', 'Cuenta corriente con uniones temporales de empresas y comunidades de bienes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4449, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '555', '4441', 'Partidas pendientes de aplicación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4450, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '556', '4441', 'Desembolsos exigidos sobre participaciones en el patrimonio neto', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4451, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5563', '4450', 'Desembolsos exigidos sobre participaciones empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4452, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5564', '4450', 'Desembolsos exigidos sobre participaciones empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4453, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5565', '4450', 'Desembolsos exigidos sobre participaciones otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4454, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5566', '4450', 'Desembolsos exigidos sobre participaciones otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4455, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '557', '4441', 'Dividendo activo a cuenta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4456, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '558', '4441', 'Socios por desembolsos exigidos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4457, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5580', '4456', 'Socios por desembolsos exigidos sobre acciones o participaciones ordinarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4458, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5585', '4456', 'Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4459, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '559', '4441', 'Derivados financieros a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4460, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5590', '4459', 'Activos por derivados financieros a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4461, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5595', '4459', 'Pasivos por derivados financieros a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4462, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '56', '4005', 'Finanzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4463, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '560', '4462', 'Finanzas recibidas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4464, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '561', '4462', 'Depósitos recibidos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4465, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '565', '4462', 'Finanzas constituidas a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4466, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '566', '4462', 'Depósitos constituidos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4467, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '567', '4462', 'Intereses pagados por anticipado', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4468, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '568', '4462', 'Intereses cobrados a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4469, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '57', '4005', 'Tesorería', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4470, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'CAJA', '570', '4469', 'Caja euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4471, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '571', '4469', 'Caja moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4472, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'BANCOS', '572', '4469', 'Bancos e instituciones de crédito cc vista euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4473, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '573', '4469', 'Bancos e instituciones de crédito cc vista moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4474, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '574', '4469', 'Bancos e instituciones de crédito cuentas de ahorro euros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4475, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '575', '4469', 'Bancos e instituciones de crédito cuentas de ahorro moneda extranjera', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4476, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '576', '4469', 'Inversiones a corto plazo de gran liquidez', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4477, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '59', '4005', 'Deterioro del valor de las inversiones financieras a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4478, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '593', '4477', 'Deterioro del valor de participaciones a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4479, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5933', '4478', 'Deterioro del valor de participaciones a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4480, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5934', '4478', 'Deterioro del valor de participaciones a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4481, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5935', '4478', 'Deterioro del valor de participaciones a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4482, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '594', '4477', 'Deterioro del valor de valores representativos de deuda a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4483, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5943', '4482', 'Deterioro del valor de valores representativos de deuda a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4484, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5944', '4482', 'Deterioro del valor de valores representativos de deuda a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4485, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5945', '4482', 'Deterioro del valor de valores representativos de deuda a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4486, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '595', '4477', 'Deterioro del valor de créditos a corto plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4487, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5953', '4486', 'Deterioro del valor de créditos a corto plazo en empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4488, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5954', '4486', 'Deterioro del valor de créditos a corto plazo en empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4489, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '5955', '4486', 'Deterioro del valor de créditos a corto plazo en otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4490, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '596', '4477', 'Deterioro del valor de participaciones a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4491, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '597', '4477', 'Deterioro del valor de valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4492, 'PCG08-PYME','CUENTAS_FINANCIERAS', 'XXXXXX', '598', '4477', 'Deterioro de valor de créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4493, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '60', '4006', 'Compras', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4494, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'COMPRAS', '600', '4493', 'Compras de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4495, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'COMPRAS', '601', '4493', 'Compras de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4496, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '602', '4493', 'Compras de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4497, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '606', '4493', 'Descuentos sobre compras por pronto pago', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4498, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6060', '4497', 'Descuentos sobre compras por pronto pago de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4499, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6061', '4497', 'Descuentos sobre compras por pronto pago de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4500, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6062', '4497', 'Descuentos sobre compras por pronto pago de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4501, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'COMPRAS', '607', '4493', 'Trabajos realizados por otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4502, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '608', '4493', 'Devoluciones de compras y operaciones similares', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4503, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6080', '4502', 'Devoluciones de compras de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4504, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6081', '4502', 'Devoluciones de compras de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4505, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6082', '4502', 'Devoluciones de compras de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4506, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '609', '4493', 'Rappels por compras', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4507, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6090', '4506', 'Rappels por compras de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4508, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6091', '4506', 'Rappels por compras de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4509, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6092', '4506', 'Rappels por compras de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4510, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '61', '4006', 'Variación de existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4511, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '610', '4510', 'Variación de existencias de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4512, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '611', '4510', 'Variación de existencias de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4513, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '612', '4510', 'Variación de existencias de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4514, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '62', '4006', 'Servicios exteriores', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4515, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '620', '4514', 'Gastos en investigación y desarrollo del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4516, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '621', '4514', 'Arrendamientos y cánones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4517, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '622', '4514', 'Reparaciones y conservación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4518, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '623', '4514', 'Servicios profesionales independientes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4519, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '624', '4514', 'Transportes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4520, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '625', '4514', 'Primas de seguros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4521, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '626', '4514', 'Servicios bancarios y similares', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4522, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '627', '4514', 'Publicidad, propaganda y relaciones públicas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4523, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '628', '4514', 'Suministros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4524, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '629', '4514', 'Otros servicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4525, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '63', '4006', 'Tributos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4526, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '630', '4525', 'Impuesto sobre benecifios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4527, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6300', '4526', 'Impuesto corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4528, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6301', '4526', 'Impuesto diferido', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4529, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '631', '4525', 'Otros tributos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4530, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '633', '4525', 'Ajustes negativos en la imposición sobre beneficios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4531, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '634', '4525', 'Ajustes negativos en la imposición indirecta', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4532, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6341', '4531', 'Ajustes negativos en IVA de activo corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4533, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6342', '4531', 'Ajustes negativos en IVA de inversiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4534, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '636', '4525', 'Devolución de impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4535, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '638', '4525', 'Ajustes positivos en la imposición sobre beneficios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4536, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '639', '4525', 'Ajustes positivos en la imposición directa', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4537, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6391', '4536', 'Ajustes positivos en IVA de activo corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4538, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6392', '4536', 'Ajustes positivos en IVA de inversiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4539, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '64', '4006', 'Gastos de personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4540, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '640', '4539', 'Sueldos y salarios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4541, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '641', '4539', 'Indemnizaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4542, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '642', '4539', 'Seguridad social a cargo de la empresa', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4543, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '649', '4539', 'Otros gastos sociales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4544, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '65', '4006', 'Otros gastos de gestión', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4545, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '650', '4544', 'Pérdidas de créditos comerciales incobrables', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4546, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '651', '4544', 'Resultados de operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4547, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6510', '4546', 'Beneficio transferido gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4548, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6511', '4546', 'Pérdida soportada participe o asociado no gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4549, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '659', '4544', 'Otras pérdidas en gestión corriente', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4550, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '66', '4006', 'Gastos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4551, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '660', '4550', 'Gastos financieros por actualización de provisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4552, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '661', '4550', 'Intereses de obligaciones y bonos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4553, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6610', '4452', 'Intereses de obligaciones y bonos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4554, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6611', '4452', 'Intereses de obligaciones y bonos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4555, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6612', '4452', 'Intereses de obligaciones y bonos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4556, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6613', '4452', 'Intereses de obligaciones y bonos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4557, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6615', '4452', 'Intereses de obligaciones y bonos a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4558, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6616', '4452', 'Intereses de obligaciones y bonos a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4559, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6617', '4452', 'Intereses de obligaciones y bonos a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4560, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6618', '4452', 'Intereses de obligaciones y bonos a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4561, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '662', '4550', 'Intereses de deudas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4562, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6620', '4561', 'Intereses de deudas empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4563, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6621', '4561', 'Intereses de deudas empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4564, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6622', '4561', 'Intereses de deudas otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4565, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6623', '4561', 'Intereses de deudas con entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4566, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6624', '4561', 'Intereses de deudas otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4567, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '663', '4550', 'Pérdidas por valorización de activos y pasivos financieros por su valor razonable', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4568, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '664', '4550', 'Gastos por dividendos de acciones o participaciones consideradas como pasivos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4569, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6640', '4568', 'Dividendos de pasivos empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4570, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6641', '4568', 'Dividendos de pasivos empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4571, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6642', '4568', 'Dividendos de pasivos otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4572, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6643', '4568', 'Dividendos de pasivos otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4573, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '665', '4550', 'Intereses por descuento de efectos y operaciones de factoring', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4574, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6650', '4573', 'Intereses por descuento de efectos en entidades de crédito del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4575, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6651', '4573', 'Intereses por descuento de efectos en entidades de crédito asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4576, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6652', '4573', 'Intereses por descuento de efectos en entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4577, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6653', '4573', 'Intereses por descuento de efectos en otras entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4578, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6654', '4573', 'Intereses por operaciones de factoring con entidades de crédito del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4579, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6655', '4573', 'Intereses por operaciones de factoring con entidades de crédito asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4580, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6656', '4573', 'Intereses por operaciones de factoring con otras entidades de crédito vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4581, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6657', '4573', 'Intereses por operaciones de factoring con otras entidades de crédito', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4582, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '666', '4550', 'Pérdidas en participaciones y valores representativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4583, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6660', '4582', 'Pérdidas en valores representativos de deuda a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4584, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6661', '4582', 'Pérdidas en valores representativos de deuda a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4585, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6662', '4582', 'Pérdidas en valores representativos de deuda a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4586, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6663', '4582', 'Pérdidas en participaciones y valores representativos de deuda a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4587, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6665', '4582', 'Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4588, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6666', '4582', 'Pérdidas en participaciones y valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4589, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6667', '4582', 'Pérdidas en valores representativos de deuda a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4590, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6668', '4582', 'Pérdidas en valores representativos de deuda a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4591, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '667', '4550', 'Pérdidas de créditos no comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4592, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6670', '4591', 'Pérdidas de créditos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4593, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6671', '4591', 'Pérdidas de créditos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4594, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6672', '4591', 'Pérdidas de créditos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4595, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6673', '4591', 'Pérdidas de créditos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4596, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6675', '4591', 'Pérdidas de créditos a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4597, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6676', '4591', 'Pérdidas de créditos a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4598, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6677', '4591', 'Pérdidas de créditos a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4599, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6678', '4591', 'Pérdidas de créditos a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4600, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '668', '4550', 'Diferencias negativas de cambio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4601, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '669', '4550', 'Otros gastos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4602, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '67', '4006', 'Pérdidas procedentes de activos no corrientes y gastos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4603, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '670', '4602', 'Pérdidas procedentes del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4604, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '671', '4602', 'Pérdidas procedentes del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4605, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '672', '4602', 'Pérdidas procedentes de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4607, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '673', '4602', 'Pérdidas procedentes de participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4608, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6733', '4607', 'Pérdidas procedentes de participaciones a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4609, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6734', '4607', 'Pérdidas procedentes de participaciones a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4610, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6735', '4607', 'Pérdidas procedentes de participaciones a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4611, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '675', '4602', 'Pérdidas por operaciones con obligaciones propias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4612, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '678', '4602', 'Gastos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4613, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '68', '4006', 'Dotaciones para amortizaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4614, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '680', '4613', 'Amortización del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4615, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '681', '4613', 'Amortización del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4616, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '682', '4613', 'Amortización de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4617, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '69', '4006', 'Pérdidas por deterioro y otras dotaciones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4618, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '690', '4617', 'Pérdidas por deterioro del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4619, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '691', '4617', 'Pérdidas por deterioro del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4620, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '692', '4617', 'Pérdidas por deterioro de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4621, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '693', '4617', 'Pérdidas por deterioro de existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4622, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6930', '4621', 'Pérdidas por deterioro de productos terminados y en curso de fabricación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4623, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6931', '4621', 'Pérdidas por deterioro de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4624, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6932', '4621', 'Pérdidas por deterioro de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4625, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6933', '4621', 'Pérdidas por deterioro de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4626, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '694', '4617', 'Pérdidas por deterioro de créditos por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4627, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '695', '4617', 'Dotación a la provisión por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4628, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6954', '4627', 'Dotación a la provisión por contratos onerosos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4629, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6959', '4628', 'Dotación a la provisión para otras operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4630, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '696', '4617', 'Pérdidas por deterioro de participaciones y valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4631, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6960', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4632, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6961', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4633, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6962', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4634, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6963', '4630', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4635, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6965', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4636, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6966', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4637, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6967', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4638, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6968', '4630', 'Pérdidas por deterioro en valores representativos de deuda a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4639, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '697', '4617', 'Pérdidas por deterioro de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4640, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6970', '4639', 'Pérdidas por deterioro de créditos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4641, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6971', '4639', 'Pérdidas por deterioro de créditos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4642, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6972', '4639', 'Pérdidas por deterioro de créditos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4643, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6973', '4639', 'Pérdidas por deterioro de créditos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4644, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '698', '4617', 'Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4645, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6980', '4644', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4646, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6981', '4644', 'Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4647, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6985', '4644', 'Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4648, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6986', '4644', 'Pérdidas por deterioro en valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4649, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6988', '4644', 'Pérdidas por deterioro en valores representativos de deuda a corto plazo de otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4650, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '699', '4617', 'Pérdidas por deterioro de crédito a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4651, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6990', '4650', 'Pérdidas por deterioro de crédito a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4652, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6991', '4650', 'Pérdidas por deterioro de crédito a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4653, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6992', '4650', 'Pérdidas por deterioro de crédito a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4654, 'PCG08-PYME','COMPRAS_Y_GASTOS', 'XXXXXX', '6993', '4650', 'Pérdidas por deterioro de crédito a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4655, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '70', '4007', 'Ventas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4656, 'PCG08-PYME','VENTAS_E_INGRESOS', 'VENTAS', '700', '4655', 'Ventas de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4657, 'PCG08-PYME','VENTAS_E_INGRESOS', 'VENTAS', '701', '4655', 'Ventas de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4658, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '702', '4655', 'Ventas de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4659, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '703', '4655', 'Ventas de subproductos y residuos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4660, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '704', '4655', 'Ventas de envases y embalajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4661, 'PCG08-PYME','VENTAS_E_INGRESOS', 'VENTAS', '705', '4655', 'Prestaciones de servicios', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4662, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '706', '4655', 'Descuentos sobre ventas por pronto pago', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4663, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7060', '4662', 'Descuentos sobre ventas por pronto pago de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4664, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7061', '4662', 'Descuentos sobre ventas por pronto pago de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4665, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7062', '4662', 'Descuentos sobre ventas por pronto pago de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4666, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7063', '4662', 'Descuentos sobre ventas por pronto pago de subproductos y residuos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4667, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '708', '4655', 'Devoluciones de ventas y operacioes similares', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4668, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7080', '4667', 'Devoluciones de ventas de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4669, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7081', '4667', 'Devoluciones de ventas de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4670, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7082', '4667', 'Devoluciones de ventas de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4671, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7083', '4667', 'Devoluciones de ventas de subproductos y residuos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4672, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7084', '4667', 'Devoluciones de ventas de envases y embalajes', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4673, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '71', '4007', 'Variación de existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4674, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '710', '4673', 'Variación de existencias de productos en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4675, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '711', '4673', 'Variación de existencias de productos semiterminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4676, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '712', '4673', 'Variación de existencias de productos terminados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4677, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '713', '4673', 'Variación de existencias de subproductos, residuos y materiales recuperados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4678, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '73', '4007', 'Trabajos realizados para la empresa', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4679, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '730', '4678', 'Trabajos realizados para el inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4680, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '731', '4678', 'Trabajos realizados para el inmovilizado tangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4681, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '732', '4678', 'Trabajos realizados en inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4682, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '733', '4678', 'Trabajos realizados para el inmovilizado material en curso', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4683, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '74', '4007', 'Subvenciones, donaciones y legados', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4684, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '740', '4683', 'Subvenciones, donaciones y legados a la explotación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4685, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '746', '4683', 'Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4686, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '747', '4683', 'Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4687, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '75', '4007', 'Otros ingresos de gestión', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4688, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '751', '4687', 'Resultados de operaciones en común', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4689, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7510', '4688', 'Pérdida transferida gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4690, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7511', '4688', 'Beneficio atribuido participe o asociado no gestor', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4691, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '752', '4687', 'Ingreso por arrendamiento', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4692, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '753', '4687', 'Ingresos de propiedad industrial cedida en explotación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4693, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '754', '4687', 'Ingresos por comisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4694, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '755', '4687', 'Ingresos por servicios al personal', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4695, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '759', '4687', 'Ingresos por servicios diversos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4696, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76', '4007', 'Ingresos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4697, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '760', '4696', 'Ingresos de participaciones en instrumentos de patrimonio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4698, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7600', '4697', 'Ingresos de participaciones en instrumentos de patrimonio empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4699, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7601', '4697', 'Ingresos de participaciones en instrumentos de patrimonio empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4700, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7602', '4697', 'Ingresos de participaciones en instrumentos de patrimonio otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4701, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7603', '4697', 'Ingresos de participaciones en instrumentos de patrimonio otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4702, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '761', '4696', 'Ingresos de valores representativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4703, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7610', '4702', 'Ingresos de valores representativos de deuda empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4704, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7611', '4702', 'Ingresos de valores representativos de deuda empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4705, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7612', '4702', 'Ingresos de valores representativos de deuda otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4706, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7613', '4702', 'Ingresos de valores representativos de deuda otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4707, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '762', '4696', 'Ingresos de créditos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4708, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7620', '4707', 'Ingresos de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4709, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76200', '4708', 'Ingresos de crédito a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4710, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76201', '4708', 'Ingresos de crédito a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4711, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76202', '4708', 'Ingresos de crédito a largo plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4712, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76203', '4708', 'Ingresos de crédito a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4713, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7621', '4707', 'Ingresos de créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4714, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76210', '4713', 'Ingresos de crédito a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4715, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76211', '4713', 'Ingresos de crédito a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4716, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76212', '4713', 'Ingresos de crédito a corto plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4717, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '76213', '4713', 'Ingresos de crédito a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4718, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '763', '4696', 'Beneficios por valorización de activos y pasivos financieros por su valor razonable', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4719, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '766', '4696', 'Beneficios en participaciones y valores representativos de deuda', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4720, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7660', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4721, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7661', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4722, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7662', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4723, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7663', '4719', 'Beneficios en participaciones y valores representativos de deuda a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4724, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7665', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4725, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7666', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4726, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7667', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo otras partes asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4727, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7668', '4719', 'Beneficios en participaciones y valores representativos de deuda a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4728, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '768', '4696', 'Diferencias positivas de cambio', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4729, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '769', '4696', 'Otros ingresos financieros', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4730, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '77', '4007', 'Beneficios procedentes de activos no corrientes e ingresos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4731, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '770', '4730', 'Beneficios procedentes del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4732, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '771', '4730', 'Beneficios procedentes del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4733, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '772', '4730', 'Beneficios procedentes de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4734, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '773', '4730', 'Beneficios procedentes de participaciones a largo plazo en partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4735, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7733', '4734', 'Beneficios procedentes de participaciones a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4736, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7734', '4734', 'Beneficios procedentes de participaciones a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4737, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7735', '4734', 'Beneficios procedentes de participaciones a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4738, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '775', '4730', 'Beneficios por operaciones con obligaciones propias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4739, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '778', '4730', 'Ingresos excepcionales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4741, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '79', '4007', 'Excesos y aplicaciones de provisiones y pérdidas por deterioro', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4742, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '790', '4741', 'Revisión del deterioro del inmovilizado intangible', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4743, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '791', '4741', 'Revisión del deterioro del inmovilizado material', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4744, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '792', '4741', 'Revisión del deterioro de las inversiones inmobiliarias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4745, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '793', '4741', 'Revisión del deterioro de las existencias', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4746, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7930', '4745', 'Revisión del deterioro de productos terminados y en curso de fabricación', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4747, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7931', '4745', 'Revisión del deterioro de mercaderías', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4748, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7932', '4745', 'Revisión del deterioro de materias primas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4749, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7933', '4745', 'Revisión del deterioro de otros aprovisionamientos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4750, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '794', '4741', 'Revisión del deterioro de créditos por operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4751, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '795', '4741', 'Exceso de provisiones', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4752, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7951', '4751', 'Exceso de provisión para impuestos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4753, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7952', '4751', 'Exceso de provisión para otras responsabilidades', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4755, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7954', '4751', 'Exceso de provisión para operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4756, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '79544', '4755', 'Exceso de provisión por contratos onerosos', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4757, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '79549', '4755', 'Exceso de provisión para otras operaciones comerciales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4758, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7955', '4751', 'Exceso de provisión para actuaciones medioambienteales', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4759, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '796', '4741', 'Revisión del deterioro de participaciones y valores representativos de deuda a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4760, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7960', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4761, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7961', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4762, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7962', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4763, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7963', '4759', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4764, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7965', '4759', 'Revisión del deterioro de valores representativos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4765, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7966', '4759', 'Revisión del deterioro de valores representativos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4766, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7967', '4759', 'Revisión del deterioro de valores representativos a largo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4767, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7968', '4759', 'Revisión del deterioro de valores representativos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4768, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '797', '4741', 'Revisión del deterioro de créditos a largo plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4769, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7970', '4768', 'Revisión del deterioro de créditos a largo plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4770, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7971', '4768', 'Revisión del deterioro de créditos a largo plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4771, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7972', '4768', 'Revisión del deterioro de créditos a largo plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4772, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7973', '4768', 'Revisión del deterioro de créditos a largo plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4773, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '798', '4741', 'Revisión del deterioro de participaciones y valores representativos de deuda a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4774, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7980', '4773', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4775, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7981', '4773', 'Revisión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4776, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7985', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4777, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7986', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4778, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7987', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4779, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7988', '4773', 'Revisión del deterioro de valores representativos de deuda a corto plazo otras empresas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4780, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '799', '4741', 'Revisión del deterioro de créditos a corto plazo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4781, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7990', '4780', 'Revisión del deterioro de créditos a corto plazo empresas del grupo', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4782, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7991', '4780', 'Revisión del deterioro de créditos a corto plazo empresas asociadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4783, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7992', '4780', 'Revisión del deterioro de créditos a corto plazo otras partes vinculadas', '1');
+INSERT INTO llx_accountingaccount (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (4784, 'PCG08-PYME','VENTAS_E_INGRESOS', 'XXXXXX', '7993', '4780', 'Revisión del deterioro de créditos a corto plazo otras empresas', '1');
+
+
+DROP TABLE llx_texts;
+
+
+DROP TABLE llx_c_email_templates;
+create table llx_c_email_templates
+(
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
+  module          varchar(32),                    -- Nom du module en rapport avec le modele
+  type_template   varchar(32),  				  -- template for which type of email (send invoice by email, send order, ...)
+  lang            varchar(6),
+  private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
+  fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
+  datec           datetime,
+  tms             timestamp,
+  label           varchar(255),					  -- Label of predefined email
+  position        smallint,					      -- Position
+  active          tinyint DEFAULT 1  NOT NULL,
+  topic			  text,                           -- Predefined topic
+  content         text                            -- Predefined text
+) ENGINE=innodb;
+
+
+ALTER TABLE llx_c_departements DROP FOREIGN KEY fk_departements_fk_region;
+--UPDATE llx_c_regions SET rowid = 0 where rowid = 1;
+
+ALTER TABLE llx_c_regions ADD UNIQUE INDEX uk_code_region (code_region);
+
+DELETE FROM llx_c_departements WHERE fk_region NOT IN (select code_region from llx_c_regions) AND fk_region IS NOT NULL AND fk_region <> 0;
+
+ALTER TABLE llx_c_departements ADD CONSTRAINT fk_departements_code_region FOREIGN KEY (fk_region) REFERENCES llx_c_regions (code_region);
+
+
+CREATE TABLE llx_holiday_types (
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  label varchar(45) NOT NULL,
+  description varchar(255) NOT NULL,
+  affect integer NOT NULL,
+  delay integer NOT NULL,
+  insertAt DATETIME NOT NULL,
+  updateAt DATETIME,
+  deleteAt DATETIME,
+  nbCongesDeducted varchar(255) NOT NULL,
+  nbCongesEveryMonth varchar(255) NOT NULL
+) ENGINE=innodb;
+
+-- Change on table c_civilite
+ALTER TABLE llx_c_civilite DROP INDEX uk_c_civilite;
+ALTER TABLE llx_c_civilite RENAME TO llx_c_civility;
+ALTER TABLE llx_c_civility CHANGE COLUMN civilite label VARCHAR(50);
+ALTER TABLE llx_c_civility ADD UNIQUE INDEX uk_c_civility(code);
+ALTER TABLE llx_adherent CHANGE COLUMN civilite civility VARCHAR(6);
+ALTER TABLE llx_socpeople CHANGE COLUMN civilite civility VARCHAR(6);
+ALTER TABLE llx_user CHANGE COLUMN civilite civility VARCHAR(6);
+
+ALTER TABLE llx_societe MODIFY COLUMN nom varchar(128);
+ALTER TABLE llx_adherent MODIFY COLUMN societe varchar(128);
+
+ALTER TABLE llx_c_type_fees CHANGE COLUMN libelle label VARCHAR(30);
+ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label;
+
+ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_element (fk_element);
+
+ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
+ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
+ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
+
+
+-- add extrafield on ficheinter lines
+CREATE TABLE llx_fichinterdet_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields (fk_object);
+
+CREATE TABLE llx_usergroup_extrafields (
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object);
+
+ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public;
+
+ALTER TABLE llx_c_country ADD COLUMN favorite tinyint DEFAULT 0 AFTER active;
+UPDATE llx_c_country SET favorite = '1' WHERE rowid = '0';
+
+ALTER TABLE llx_c_email_templates DROP INDEX uk_c_email_templates;
+ALTER TABLE llx_c_email_templates ADD UNIQUE INDEX uk_c_email_templates(entity, label, lang);
+ALTER TABLE llx_c_email_templates ADD INDEX idx_type(type_template);
+
+-- Remove OSC module
+DELETE FROM llx_const WHERE name = 'MAIN_MODULE_BOUTIQUE';
+DELETE FROM llx_const WHERE name = 'OSC_DB_HOST';
+DELETE FROM llx_menu WHERE module = 'boutique';
+
+-- Add option always editable on extrafield
+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/index.html b/htdocs/install/mysql/migration/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
old mode 100644
new mode 100755
index 90730796279..9e1ca7bb6f9
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -142,20 +142,44 @@ update llx_societe set barcode = null where (rowid, barcode) in (select max_rowi
 drop table tmp_societe_double;
 
 
-UPDATE llx_projet_task SET fk_task_parent = 0 WHERE fk_task_parent = rowid
+UPDATE llx_projet_task SET fk_task_parent = 0 WHERE fk_task_parent = rowid;
 
 
 UPDATE llx_actioncomm set fk_user_action = fk_user_done where fk_user_done > 0 and (fk_user_action is null or fk_user_action = 0);
 UPDATE llx_actioncomm set fk_user_action = fk_user_author where fk_user_author > 0 and (fk_user_action is null or fk_user_action = 0);
 
 
--- Requests to clean old tables or fields
+UPDATE llx_projet_task_time set task_datehour = task_date where task_datehour IS NULL and task_date IS NOT NULL;
+
+
+-- Requests to clean old tables or external modules tables
 
 -- DROP TABLE llx_c_methode_commande_fournisseur;
 -- DROP TABLE llx_c_source;
+-- DROP TABLE llx_congespayes;
+-- DROP TABLE llx_congespayes_config;
+-- DROP TABLE llx_congespayes_log;
+-- DROP TABLE llx_congespayes_events;
+-- DROP TABLE llx_congespayes_users;
+-- DROP TABLE llx_compta;
+-- DROP TABLE llx_compta_compte_generaux;
+-- DROP TABLE llx_compta_account;
+-- DROP TABLE llx_cabinetmed*;
 -- DROP TABLE llx_cond_reglement;
 -- DROP TABLE llx_expedition_methode;
 -- DROP TABLE llx_product_fournisseur;
+-- DROP TABLE llx_element_rang;
+-- DROP TABLE llx_dolicloud_customers;
+-- DROP TABLE llx_dolicloud_emailstemplates;
+-- DROP TABLE llx_dolicloud_stats;
+-- DROP TABLE llx_submitew_message;
+-- DROP TABLE llx_submitew_targets;
+-- DROP TABLE llx_submitew_targets_param;
+-- DROP TABLE llx_pos_cash;
+-- DROP TABLE llx_pos_control_cash;
+-- DROP TABLE llx_pos_facture;
+-- DROP TABLE llx_pos_moviments;
+-- DROP TABLE llx_pos_ticketdet;
 
 -- To replace amount on all invoice and lines when forgetting to apply a 20% vat
 -- update llx_facturedet set tva_tx = 20 where tva_tx = 0;
@@ -164,6 +188,29 @@ UPDATE llx_actioncomm set fk_user_action = fk_user_author where fk_user_author >
 -- update llx_facture set total = round(total_ttc / 1.2, 5) where total_ht = total_ttc;
 -- update llx_facture set tva = total_ttc - total where tva = 0;
 
+-- To insert elements into a category
+-- Search idcategory: select rowid from llx_categorie where type=0 and ref like '%xxx%'
+-- Select all products to include: select * from llx_product where ref like '%xxx%'
+-- If ok, insert: insert into llx_categorie_product(fk_categorie, fk_product) select idcategory, rowid from llx_product where ref like '%xxx%'
+-- List of product with a category xxx: select distinct cp.fk_product from llx_categorie_product as cp, llx_categorie as c where cp.fk_categorie = c.rowid and c.label like 'xxx-%' order by fk_product;
+-- List of product into 2 categories xxx: select cp.fk_product, count(cp.fk_product) as nb from llx_categorie_product as cp, llx_categorie as c where cp.fk_categorie = c.rowid and c.label like 'xxx-%' group by fk_product having nb > 1;
+-- List of product with no category xxx yet: select rowid, ref from llx_product where rowid not in (select distinct cp.fk_product from llx_categorie_product as cp, llx_categorie as c where cp.fk_categorie = c.rowid and c.label like 'xxx-%' order by fk_product);
+
+-- Replace xxx with your IP Address 
+-- bind-address        = xxx.xxx.xxx.xxx
+-- CREATE USER 'myuser'@'localhost' IDENTIFIED BY 'mypass';
+-- CREATE USER 'myuser'@'%' IDENTIFIED BY 'mypass';
+-- GRANT ALL ON *.* TO 'myuser'@'localhost';
+-- 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/index.html b/htdocs/install/mysql/tables/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
new file mode 100644
index 00000000000..54f24b1ea80
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -0,0 +1,39 @@
+-- ============================================================================
+-- Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
+-- Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TABLE llx_accounting_bookkeeping 
+(
+  rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  doc_date			date NOT NULL,
+  doc_type			varchar(30) NOT NULL,	-- facture_client/reglement_client/facture_fournisseur/reglement_fournisseur
+  doc_ref			varchar(30) NOT NULL,	-- facture_client/reglement_client/... reference number
+  fk_doc			integer NOT NULL,		-- facture_client/reglement_client/... rowid
+  fk_docdet			integer NOT NULL,		-- facture_client/reglement_client/... line rowid
+  code_tiers		varchar(24),			-- code tiers
+  numero_compte		varchar(32) DEFAULT NULL,
+  label_compte		varchar(128) NOT NULL,
+  debit				double NOT NULL,
+  credit			double NOT NULL,
+  montant			double NOT NULL,
+  sens				varchar(1) DEFAULT NULL,
+  fk_user_author	integer NOT NULL,
+  import_key		varchar(14),
+  code_journal		varchar(10) DEFAULT NULL,
+  piece_num			integer NOT NULL
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
new file mode 100644
index 00000000000..569c22dd57e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
@@ -0,0 +1,31 @@
+-- ============================================================================
+-- Copyright (C) 2014		Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+create table llx_accounting_fiscalyear
+(
+	rowid			integer AUTO_INCREMENT PRIMARY KEY,
+	label			varchar(128) NOT NULL,
+	date_start		date,
+	date_end		date,
+	statut			tinyint DEFAULT 0 NOT NULL,
+	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
+	datec			datetime NOT NULL,
+	tms				timestamp,
+	fk_user_author	integer DEFAULT NULL,
+	fk_user_modif	integer DEFAULT NULL
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql
index 5ddd524592e..49758c3d4ea 100644
--- a/htdocs/install/mysql/tables/llx_accountingaccount.key.sql
+++ b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql
@@ -20,5 +20,6 @@
 
 ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version);
 
-
 ALTER TABLE llx_accountingaccount ADD CONSTRAINT fk_accountingaccount_fk_pcg_version  FOREIGN KEY (fk_pcg_version)    REFERENCES llx_accounting_system (pcg_version);
+
+--ALTER TABLE llx_accountingaccount ADD CONSTRAINT fk_accountingaccount_fk_account_number  FOREIGN KEY (fk_account_number)    REFERENCES llx_accountingaccount (account_number);
diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql
index a3143a263f9..f4e4d694471 100644
--- a/htdocs/install/mysql/tables/llx_accountingaccount.sql
+++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2014	   Juanjo Menent	   <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,11 +21,16 @@
 create table llx_accountingaccount
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  entity          integer DEFAULT 1 NOT NULL,
+  datec           datetime,
+  tms             timestamp,
   fk_pcg_version  varchar(12)  NOT NULL,
   pcg_type        varchar(20)  NOT NULL,
   pcg_subtype     varchar(20)  NOT NULL,
-  account_number  varchar(20)  NOT NULL,
-  account_parent  varchar(20),
+  account_number  varchar(32)  NOT NULL,
+  account_parent  varchar(32),
   label           varchar(255) NOT NULL,
+  fk_user_author  integer DEFAULT NULL,
+  fk_user_modif   integer DEFAULT NULL,
   active     	  tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql
index f1191803d0e..f7ea28b127a 100644
--- a/htdocs/install/mysql/tables/llx_accountingdebcred.sql
+++ b/htdocs/install/mysql/tables/llx_accountingdebcred.sql
@@ -20,7 +20,7 @@
 create table llx_accountingdebcred
 (
 	fk_transaction  integer		NOT NULL,
-	account_number  varchar(20) NOT NULL,
+	account_number  varchar(32) NOT NULL,
 	amount          real		NOT NULL,
 	direction       varchar(1)	NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
index 9a48747c4da..1da34c65bab 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
@@ -22,3 +22,4 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_datea (datea);
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_soc (fk_soc);
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_contact (fk_contact);
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_code (code);
+ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_element (fk_element);
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_actioncomm_resources.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
index 6d6999e7232..caaa0969944 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql
@@ -21,5 +21,5 @@
 ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX idx_actioncomm_resources_idx1 (fk_actioncomm, element_type, fk_element);
 ALTER TABLE llx_actioncomm_resources ADD INDEX idx_actioncomm_resources_fk_element (fk_element);
 
--- Pas de contraite sur fk_source et fk_target car pointe sur differentes tables
+-- Pas de contrainte sur fk_source et fk_target car pointe sur differentes tables
 	
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
index bd48ad4f66d..484cd39fb82 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql
@@ -23,10 +23,10 @@
 create table llx_actioncomm_resources
 (
   rowid           	integer AUTO_INCREMENT PRIMARY KEY,  
-  fk_actioncomm		integer NOT NULL,
-  element_type		varchar(50) NOT NULL,
-  fk_element		integer NOT NULL,
+  fk_actioncomm		integer NOT NULL,			-- Id into llx_actioncomm
+  element_type		varchar(50) NOT NULL,		-- Type of resource ('user', 'resource')
+  fk_element		integer NOT NULL,			-- Id into table llx_user or llx_resource
   answer_status		varchar(50) NULL,
-  mandatory		smallint,
-  transparent		smallint
+  mandatory			smallint,
+  transparency		smallint default 1	    -- Used to say if event is 1=OPAQUE=busy or 0=TRANSPARENT
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 6d5a4723462..e7f9c246834 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -30,14 +30,14 @@ create table llx_adherent
   entity           integer DEFAULT 1 NOT NULL,	-- multi company id
   ref_ext          varchar(128),                -- reference into an external system (not used by dolibarr)
 
-  civilite         varchar(6),
+  civility         varchar(6),
   lastname         varchar(50),
   firstname        varchar(50),
   login            varchar(50),          -- login
   pass             varchar(50),          -- password
   fk_adherent_type integer NOT NULL,
   morphy           varchar(3) NOT NULL, -- personne morale / personne physique
-  societe          varchar(50),
+  societe          varchar(128),			-- company name (should be same lenght than societe.name)
   fk_soc           integer NULL,		-- Link to third party linked to member
   address          text,
   zip              varchar(30),
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 198b0ca87ab..ac060bc0df3 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -1,7 +1,8 @@
 -- =============================================================================
--- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2000-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+-- Copyright (C) 2004-2014	Laurent Destailleur 	<eldy@users.sourceforge.net>
+-- Copyright (C) 2005-2012	Regis Houssin       	<regis.houssin@capnetworks.com>
+-- Copyright (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
 --
 -- 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,39 +19,41 @@
 --
 -- =============================================================================
 
--- courant : type de compte: 0 epargne, 1 courant, 2 caisse
--- clos : le compte est-il clos ou encore ouvert
+-- courant : type of account: 0 epargne, 1 curent/card/cheque, 2 cash
+-- clos : is account opened or closed
 
 create table llx_bank_account
 (
-  rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  datec				datetime,
-  tms				timestamp,
-  ref				varchar(12) NOT NULL,
-  label				varchar(30) NOT NULL,
-  entity			integer DEFAULT 1 NOT NULL,	-- multi company id
-  bank				varchar(60),
-  code_banque		varchar(8),
-  code_guichet		varchar(6),
-  number			varchar(255),
-  cle_rib			varchar(5),
-  bic				varchar(11),
-  iban_prefix		varchar(34),				-- 34 according to ISO 13616
-  country_iban		varchar(2),					-- deprecated
-  cle_iban			varchar(2),
-  domiciliation		varchar(255),
-  state_id			integer        DEFAULT NULL,
-  fk_pays			integer        NOT NULL,
-  proprio			varchar(60),
-  owner_address     varchar(255),
-  courant			smallint DEFAULT 0 NOT NULL,
-  clos				smallint DEFAULT 0 NOT NULL,
-  rappro			smallint DEFAULT 1,
-  url				varchar(128),
-  account_number	varchar(24),				-- bank accountancy number
-  currency_code		varchar(3) NOT NULL,
-  min_allowed		integer DEFAULT 0,
-  min_desired		integer DEFAULT 0,
-  comment			text
-  
+  rowid					integer AUTO_INCREMENT PRIMARY KEY,
+  datec					datetime,
+  tms					timestamp,
+  ref					varchar(12) NOT NULL,
+  label					varchar(30) NOT NULL,
+  entity				integer DEFAULT 1 NOT NULL,	-- multi company id
+  fk_user_author		integer,
+  fk_user_modif			integer,
+  bank					varchar(60),
+  code_banque			varchar(8),
+  code_guichet			varchar(6),
+  number				varchar(255),
+  cle_rib				varchar(5),
+  bic					varchar(11),
+  iban_prefix			varchar(34),				-- full iban. 34 according to ISO 13616
+  country_iban			varchar(2),					-- deprecated
+  cle_iban				varchar(2),
+  domiciliation			varchar(255),
+  state_id				integer        DEFAULT NULL,
+  fk_pays				integer        NOT NULL,
+  proprio				varchar(60),
+  owner_address     	varchar(255),
+  courant				smallint DEFAULT 0 NOT NULL,
+  clos					smallint DEFAULT 0 NOT NULL,
+  rappro				smallint DEFAULT 1,
+  url					varchar(128),
+  account_number		varchar(32),				-- bank accountancy number
+  accountancy_journal	varchar(3) DEFAULT NULL,	-- bank accountancy journal
+  currency_code			varchar(3) NOT NULL,
+  min_allowed			integer DEFAULT 0,
+  min_desired			integer DEFAULT 0,
+  comment				text
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
index 26f46c6ff8f..fa8052d77f9 100644
--- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
@@ -14,6 +14,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
+-- This table is a list of all available possible automatic actions
+-- It is read only by admin page to select action code and save them 
+-- into llx_const with name MAIN_AGENDA_ACTIONAUTO_XXX_YYY.
 -- ===================================================================
 
 create table llx_c_action_trigger
@@ -24,5 +27,4 @@ create table llx_c_action_trigger
   description	varchar(255),
   elementtype	varchar(16) 			NOT NULL,
   rang			integer		DEFAULT 0
-  
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
index b0995238f59..9d83cec1acf 100644
--- a/htdocs/install/mysql/tables/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_actioncomm.sql
@@ -24,8 +24,9 @@ create table llx_c_actioncomm
   code       varchar(12) NOT NULL,
   type       varchar(10) DEFAULT 'system' NOT NULL,
   libelle    varchar(48) NOT NULL,
-  module	varchar(16) DEFAULT NULL,
+  module	 varchar(16) DEFAULT NULL,
   active     tinyint DEFAULT 1 NOT NULL,
   todo       tinyint,
+  color      varchar(9),
   position   integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
index b9c448e1d95..5b5cf1edf24 100644
--- a/htdocs/install/mysql/tables/llx_c_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_c_chargesociales.sql
@@ -24,7 +24,7 @@ create table llx_c_chargesociales
   deductible   smallint DEFAULT 0 NOT NULL,
   active       tinyint DEFAULT 1  NOT NULL,
   code         varchar(12) NOT NULL,
-  accountancy_code varchar(24) DEFAULT NULL,
+  accountancy_code varchar(32) DEFAULT NULL,
   fk_pays      integer DEFAULT 1 NOT NULL,
   module       varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_civilite.key.sql b/htdocs/install/mysql/tables/llx_c_civilite.key.sql
deleted file mode 100644
index 1e8e7dee011..00000000000
--- a/htdocs/install/mysql/tables/llx_c_civilite.key.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- ========================================================================
--- Copyright (C) 2012 	   Florian Henry  <florian.henry@open-concept.pro>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ========================================================================
-
-ALTER TABLE llx_c_civilite ADD UNIQUE INDEX uk_c_civilite(code);
diff --git a/htdocs/install/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql
deleted file mode 100644
index da53e4789f7..00000000000
--- a/htdocs/install/mysql/tables/llx_c_civilite.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- ========================================================================
--- Copyright (C) 2004 Benoit Mortier      <benoit.mortier@opensides.be>
--- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ========================================================================
-
-create table llx_c_civilite
-(
-  rowid       integer    PRIMARY KEY,
-  code        varchar(6) NOT NULL,
-  civilite	  varchar(50),
-  active      tinyint DEFAULT 1  NOT NULL,
-  module      varchar(32) NULL
-)ENGINE=innodb;
-
diff --git a/htdocs/install/mysql/tables/llx_c_civility.key.sql b/htdocs/install/mysql/tables/llx_c_civility.key.sql
new file mode 100644
index 00000000000..ff095fe9d03
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_civility.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2012 	   Florian Henry  <florian.henry@open-concept.pro>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_civility ADD UNIQUE INDEX uk_c_civility(code);
diff --git a/htdocs/install/mysql/tables/llx_c_civility.sql b/htdocs/install/mysql/tables/llx_c_civility.sql
new file mode 100644
index 00000000000..139d0b68f3b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_civility.sql
@@ -0,0 +1,28 @@
+-- ========================================================================
+-- Copyright (C) 2004 Benoit Mortier      <benoit.mortier@opensides.be>
+-- Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+create table llx_c_civility
+(
+  rowid       integer    PRIMARY KEY,
+  code        varchar(6) NOT NULL,
+  label		  varchar(50),
+  active      tinyint DEFAULT 1  NOT NULL,
+  module      varchar(32) NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_c_country.key.sql b/htdocs/install/mysql/tables/llx_c_country.key.sql
new file mode 100644
index 00000000000..b65d78d559f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_country.key.sql
@@ -0,0 +1,22 @@
+-- ========================================================================
+-- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+
+ALTER TABLE llx_c_country ADD UNIQUE INDEX idx_c_country_code (code);
+ALTER TABLE llx_c_country ADD UNIQUE INDEX idx_c_country_code_iso (code_iso);
+ALTER TABLE llx_c_country ADD UNIQUE INDEX idx_c_country_label (label);
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
new file mode 100644
index 00000000000..503cc0eec06
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -0,0 +1,29 @@
+-- ========================================================================
+-- Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+-- Copyright (C) 2004		Laurent Destailleur		<eldy@users.sourceforge.net>
+-- Copyright (C) 2014		Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+create table llx_c_country
+(
+  rowid    integer            PRIMARY KEY,
+  code     varchar(2)         NOT NULL,
+  code_iso varchar(3)         ,
+  label    varchar(50)        NOT NULL,
+  active   tinyint DEFAULT 1  NOT NULL,
+  favorite tinyint DEFAULT 0  NOT NULL
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql
index 0d8459c1ba0..66194440610 100644
--- a/htdocs/install/mysql/tables/llx_c_departements.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql
@@ -19,5 +19,10 @@
 
 ALTER TABLE llx_c_departements ADD UNIQUE uk_departements (code_departement,fk_region);
 
-
 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/htdocs/install/mysql/tables/llx_c_email_template.sql b/htdocs/install/mysql/tables/llx_c_email_template.sql
deleted file mode 100644
index b3f8ca1e1e0..00000000000
--- a/htdocs/install/mysql/tables/llx_c_email_template.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- ===================================================================
--- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- Table with templates of emails
--- ===================================================================
-
-create table llx_c_email_templates
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
-  type_template   varchar(32),  -- template for wich type of email (send invoice by email, send order, ...)
-  datec           datetime,
-  label           varchar(255),
-  content         text
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.key.sql b/htdocs/install/mysql/tables/llx_c_email_templates.key.sql
new file mode 100644
index 00000000000..665b8d610f0
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.key.sql
@@ -0,0 +1,22 @@
+-- ===================================================================
+-- Copyright (C) 2014 Laurent Destailleur <eldy@users.sourceforge.net>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- Table with templates of emails
+-- ===================================================================
+
+ALTER TABLE llx_c_email_templates ADD UNIQUE INDEX uk_c_email_templates(entity, label, lang);
+ALTER TABLE llx_c_email_templates ADD INDEX idx_type(type_template);
+
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
new file mode 100644
index 00000000000..b4d2f9a96cb
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -0,0 +1,36 @@
+-- ===================================================================
+-- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- Table with templates of emails
+-- ===================================================================
+
+create table llx_c_email_templates
+(
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
+  module          varchar(32),                    -- Nom du module en rapport avec le modele
+  type_template   varchar(32),  				  -- template for which type of email (send invoice by email, send order, ...)
+  lang            varchar(6),
+  private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
+  fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
+  datec           datetime,
+  tms             timestamp,
+  label           varchar(255),					  -- Label of predefined email
+  position        smallint,					      -- Position
+  active          tinyint DEFAULT 1  NOT NULL,
+  topic			  text,                           -- Predefined topic
+  content         text                            -- Predefined text
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql
index 8d78992a4f8..090dc2c47be 100644
--- a/htdocs/install/mysql/tables/llx_c_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_c_paiement.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2014      Alexandre Spangaro	<alexandre.spangaro@gmail.com>
 --
 -- 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,21 +18,15 @@
 --
 -- ========================================================================
 
-
--- Type :
---
--- 0 : entree d'argent
--- 1 : sortie d'argent
--- 2 : entree ou sortie d'argent
-
 create table llx_c_paiement
 (
-  id         integer     PRIMARY KEY,
-  code       varchar(6)  NOT NULL,
-  libelle    varchar(30),
-  type       smallint,	
-  active     tinyint DEFAULT 1  NOT NULL,
-  module     varchar(32) NULL
+  id				integer     PRIMARY KEY,
+  code       		varchar(6)  NOT NULL,
+  libelle    		varchar(30),
+  type       		smallint,	-- 0: input money, 1: output money, 2: input and output, 3: other
+  active     		tinyint DEFAULT 1  NOT NULL,
+  accountancy_code	varchar(32) NULL,
+  module     		varchar(32) NULL
 )ENGINE=innodb;
 
 
diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql
deleted file mode 100644
index 6714a0644b2..00000000000
--- a/htdocs/install/mysql/tables/llx_c_pays.key.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- ========================================================================
--- Copyright (C) 2005 Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ========================================================================
-
-
-ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_country_code (code);
-ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_country_code_iso (code_iso);
-ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_libelle (libelle);
diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql
deleted file mode 100644
index 6f4401d5110..00000000000
--- a/htdocs/install/mysql/tables/llx_c_pays.sql
+++ /dev/null
@@ -1,27 +0,0 @@
--- ========================================================================
--- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ========================================================================
-
-create table llx_c_pays
-(
-  rowid    integer            PRIMARY KEY,
-  code     varchar(2)         NOT NULL,
-  code_iso varchar(3)         ,
-  libelle  varchar(50)        NOT NULL,
-  active   tinyint DEFAULT 1  NOT NULL
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql
index 838396d5d57..82295ba52b3 100644
--- a/htdocs/install/mysql/tables/llx_c_regions.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql
@@ -18,4 +18,5 @@
 
 
 ALTER TABLE llx_c_regions ADD INDEX idx_c_regions_fk_pays (fk_pays);
-ALTER TABLE llx_c_regions ADD CONSTRAINT fk_c_regions_fk_pays	FOREIGN KEY (fk_pays)     REFERENCES llx_c_pays (rowid);
+ALTER TABLE llx_c_regions ADD UNIQUE INDEX uk_code_region (code_region);
+ALTER TABLE llx_c_regions ADD CONSTRAINT fk_c_regions_fk_pays	FOREIGN KEY (fk_pays)     REFERENCES llx_c_country (rowid);
diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql
index c15c1e9b204..9c677ee44f7 100644
--- a/htdocs/install/mysql/tables/llx_c_regions.sql
+++ b/htdocs/install/mysql/tables/llx_c_regions.sql
@@ -20,7 +20,7 @@
 create table llx_c_regions
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
-  code_region integer UNIQUE NOT NULL,
+  code_region integer NOT NULL,
   fk_pays     integer NOT NULL,
   cheflieu    varchar(50),
   tncc        integer,
diff --git a/htdocs/install/mysql/tables/llx_c_revenuestamp.sql b/htdocs/install/mysql/tables/llx_c_revenuestamp.sql
index 7a47c05dca3..0eb5a46216d 100644
--- a/htdocs/install/mysql/tables/llx_c_revenuestamp.sql
+++ b/htdocs/install/mysql/tables/llx_c_revenuestamp.sql
@@ -23,7 +23,7 @@ create table llx_c_revenuestamp
   taux              double  NOT NULL,
   note              varchar(128),
   active            tinyint DEFAULT 1 NOT NULL,
-  accountancy_code_sell	varchar(15) DEFAULT NULL,
-  accountancy_code_buy	varchar(15) DEFAULT NULL
+  accountancy_code_sell	varchar(32) DEFAULT NULL,
+  accountancy_code_buy	varchar(32) DEFAULT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql
index 46aa3632faa..2a0b275ce96 100644
--- a/htdocs/install/mysql/tables/llx_c_tva.sql
+++ b/htdocs/install/mysql/tables/llx_c_tva.sql
@@ -1,6 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2005           Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2010           Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2010-2014      Juanjo Menent        <jmenent@2byte.es>
 -- Copyright (C) 2011-2012      Alexandre Spangaro   <alexandre.spangaro@gmail.com>
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -23,14 +23,14 @@ create table llx_c_tva
   rowid             integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   fk_pays           integer NOT NULL,
   taux              double  NOT NULL,
-  localtax1         double  NOT NULL DEFAULT 0,
+  localtax1         varchar(10)  NOT NULL DEFAULT '0',
   localtax1_type	varchar(10)	 NOT NULL DEFAULT '0',
-  localtax2         double  NOT NULL DEFAULT 0,
-  localtax2_type	varchar(10) NOT NULL DEFAULT '0',
+  localtax2         varchar(10)  NOT NULL DEFAULT '0',
+  localtax2_type	varchar(10)  NOT NULL DEFAULT '0',
   recuperableonly   integer NOT NULL DEFAULT 0,
   note              varchar(128),
   active            tinyint DEFAULT 1 NOT NULL,
-  accountancy_code_sell	varchar(15) DEFAULT NULL,
-  accountancy_code_buy	varchar(15) DEFAULT NULL
+  accountancy_code_sell	varchar(32) DEFAULT NULL,
+  accountancy_code_buy	varchar(32) DEFAULT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql
index b19aae75e5a..145330012eb 100644
--- a/htdocs/install/mysql/tables/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql
@@ -1,6 +1,7 @@
 -- ========================================================================
 -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004           Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2014           Alexandre Spangaro   <alexandre.spangaro@gmail.com>
 --
 -- 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 +20,10 @@
 
 create table llx_c_type_fees
 (
-  id        integer      AUTO_INCREMENT PRIMARY KEY,
-  code      varchar(12)  NOT NULL,
-  libelle   varchar(30),
-  active    tinyint DEFAULT 1   NOT NULL,
-  module    varchar(32) NULL
+  id        		integer      AUTO_INCREMENT PRIMARY KEY,
+  code      		varchar(12)  NOT NULL,
+  label				varchar(30),
+  accountancy_code	varchar(32) NULL,
+  active    		tinyint DEFAULT 1   NOT NULL,
+  module    		varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
index 62d39cea8ad..06a41727b69 100644
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -19,9 +19,10 @@
 
 create table llx_c_typent
 (
-  id        integer      PRIMARY KEY,
-  code      varchar(12)  NOT NULL,
-  libelle   varchar(30),
-  active    tinyint DEFAULT 1   NOT NULL,
-  module    varchar(32) NULL
+  id         integer      PRIMARY KEY,
+  code       varchar(12)  NOT NULL,
+  libelle    varchar(30),
+  fk_country integer NULL,		-- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B)
+  active     tinyint DEFAULT 1   NOT NULL,
+  module     varchar(32) NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql
index 3bc138d8816..9d4ff705d04 100644
--- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql
@@ -23,6 +23,6 @@ ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_pays   (fk_pays);
 ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_zip       (zip);
 
 ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county	FOREIGN KEY (fk_county) REFERENCES llx_c_departements (rowid);
-ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays   FOREIGN KEY (fk_pays)   REFERENCES llx_c_pays(rowid);
+ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays   FOREIGN KEY (fk_pays)   REFERENCES llx_c_country(rowid);
 
 ALTER TABLE llx_c_ziptown ADD UNIQUE INDEX uk_ziptown_fk_pays (zip, town, fk_pays);
diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql
index 11a0dfe0350..0eaab74af20 100644
--- a/htdocs/install/mysql/tables/llx_c_ziptown.sql
+++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql
@@ -21,7 +21,7 @@ create table llx_c_ziptown
   rowid				integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   code				varchar(5) DEFAULT NULL, 		-- ex: code insee pour la France 
   fk_county			integer,	         			-- State id in llx_c_departements
-  fk_pays           integer NOT NULL DEFAULT 0,     -- Country id in llx_c_pays
+  fk_pays           integer NOT NULL DEFAULT 0,     -- Country id in llx_c_country
   zip	 			varchar(10) NOT NULL,			-- Zip code
   town				varchar(255) NOT NULL,			-- Town name
   active 			tinyint NOT NULL DEFAULT 1
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index f1c12a6741f..90e8fd7af71 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -36,9 +36,10 @@ create table llx_commande
   date_valid			datetime,						-- date de validation
   date_cloture			datetime,						-- date de cloture
   date_commande			date,							-- date de la commande
-  fk_user_author		integer,						-- createur de la commande
-  fk_user_valid			integer,						-- valideur de la commande
-  fk_user_cloture		integer,						-- auteur cloture
+  fk_user_author		integer,						-- user making creation
+  fk_user_modif         integer,                       -- user making last change
+  fk_user_valid			integer,						-- user validating
+  fk_user_cloture		integer,						-- user closing
   source				smallint,
   fk_statut				smallint  default 0,
   amount_ht				real      default 0,
@@ -61,6 +62,7 @@ create table llx_commande
   fk_mode_reglement		integer,						-- mode de reglement
   
   date_livraison		date 	  default NULL,
+  fk_shipping_method    integer,                        -- shipping method id
   fk_availability		integer NULL,
   fk_input_reason		integer,
   fk_delivery_address	integer,						-- delivery address (deprecated)
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 51e57452397..ff87110c72a 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -23,23 +23,24 @@ 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,             -- projet auquel est rattache la commande
+  fk_projet				integer DEFAULT 0,             -- project id
 
   tms					timestamp,
   date_creation			datetime,                      -- date de creation 
   date_valid			datetime,                      -- date de validation
   date_approve			datetime,                      -- date de approve
   date_commande			date,                          -- date de la commande
-  fk_user_author		integer,                       -- createur de la commande
-  fk_user_valid			integer,                       -- valideur de la commande
-  fk_user_approve		integer,                       -- auteur approve
+  fk_user_author		integer,                       -- user making creation
+  fk_user_modif         integer,                       -- user making last change
+  fk_user_valid			integer,                       -- user validating
+  fk_user_approve		integer,                       -- user approving
   source				smallint NOT NULL,
   fk_statut				smallint  default 0,
   amount_ht				real      default 0,
@@ -55,6 +56,7 @@ create table llx_commande_fournisseur
   model_pdf				varchar(255),
 
   date_livraison		date 	  default NULL,
+  fk_account            integer,                       -- bank account
   fk_cond_reglement		integer,                       -- condition de reglement
   fk_mode_reglement		integer,                       -- mode de reglement
   fk_input_method	integer default 0,
diff --git a/htdocs/install/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql
deleted file mode 100644
index b7b06636e51..00000000000
--- a/htdocs/install/mysql/tables/llx_compta.sql
+++ /dev/null
@@ -1,32 +0,0 @@
--- ===================================================================
--- Copyright (C) 2000-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-create table llx_compta
-(
-  rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  datec             datetime,
-  datev             date,           -- date de valeur
-  amount            real DEFAULT 0 NOT NULL ,
-  label             varchar(255),
-  fk_compta_account integer,
-  fk_user_author    integer,
-  fk_user_valid     integer,
-  valid             tinyint DEFAULT 0,
-  note              text
-
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql
deleted file mode 100644
index b70ad9ba160..00000000000
--- a/htdocs/install/mysql/tables/llx_compta_account.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- ===================================================================
--- Copyright (C) 2000-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-create table llx_compta_account
-(
-  rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  datec             datetime,
-  number            varchar(12),
-  label             varchar(255),
-  fk_user_author    integer,
-  note              text
-
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql
deleted file mode 100644
index d830e8dbd66..00000000000
--- a/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- ===================================================================
--- Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ===================================================================
-
-create table llx_compta_compte_generaux
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  date_creation   datetime,
-  numero          varchar(50),
-  intitule        varchar(255),
-  fk_user_author  integer,
-  note            text,
-
-  UNIQUE(numero)
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index 7521eb0aa1b..5efbcdfe1fa 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -1,7 +1,7 @@
 -- ============================================================================
 -- Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@capnetworks.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,11 +20,12 @@
 
 create table llx_contrat
 (
-  rowid						integer AUTO_INCREMENT PRIMARY KEY,  
-  ref						varchar(30),		            -- reference de contrat
+  rowid						integer AUTO_INCREMENT PRIMARY KEY,
+  ref						varchar(30),		            -- contrat reference
+  ref_supplier				varchar(30),		            -- suplier contract ref
   entity					integer DEFAULT 1 NOT NULL,	-- multi company id
   tms						timestamp,
-  datec						datetime,                   -- date de creation de l enregistrement
+  datec						datetime,                   -- creation date
   date_contrat				datetime,
   statut					smallint DEFAULT 0,
   mise_en_service			datetime,
@@ -32,15 +33,16 @@ 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,
   note_private				text,
   note_public				text,
+  model_pdf					varchar(255),
   import_key				varchar(14),
-  extraparams				varchar(255)					-- for stock other parameters with json format
-  
+  extraparams				varchar(255)
+
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_element_resources.sql b/htdocs/install/mysql/tables/llx_element_resources.sql
index 3cc636ceab4..9c67a0d52af 100644
--- a/htdocs/install/mysql/tables/llx_element_resources.sql
+++ b/htdocs/install/mysql/tables/llx_element_resources.sql
@@ -13,16 +13,19 @@
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-- ============================================================================
+-- Table used to link an element actioncomm with a resource or user (llx_resource or llx_user)
+-- ============================================================================
 
 CREATE TABLE llx_element_resources
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  resource_id     integer,
-  resource_type	  varchar(64),
   element_id	  integer,
   element_type    varchar(64),
+  resource_id     integer,			-- id of resource or id of user
+  resource_type	  varchar(64),		-- resource or user
   busy			  integer,
   mandatory		  integer,
-  fk_user_create   integer,
+  fk_user_create  integer,
   tms             timestamp
 )ENGINE=innodb;
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_expeditiondet_batch.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
index 44acf1d7afe..70bfe974f34 100644
--- a/htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
+++ b/htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
@@ -15,5 +15,6 @@
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
 -- ============================================================================
+
 ALTER TABLE llx_expeditiondet_batch ADD INDEX idx_fk_expeditiondet (fk_expeditiondet);
 ALTER TABLE llx_expeditiondet_batch ADD CONSTRAINT fk_expeditiondet_batch_fk_expeditiondet FOREIGN KEY (fk_expeditiondet) REFERENCES llx_expeditiondet(rowid);
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index ba4c7df964f..f91d21fedb1 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -20,15 +20,16 @@
 create table llx_extrafields
 (
 	rowid           integer AUTO_INCREMENT PRIMARY KEY,
-	name            varchar(64) NOT NULL,       -- nom de l'attribut
+	name            varchar(64) NOT NULL,         -- nom de l'attribut
 	entity          integer DEFAULT 1 NOT NULL,	-- multi company id
-    	elementtype     varchar(64) NOT NULL DEFAULT 'member',
+    elementtype     varchar(64) NOT NULL DEFAULT 'member',
 	tms             timestamp,
-	label           varchar(255) NOT NULL,      -- label correspondant a l'attribut
+	label           varchar(255) NOT NULL,        -- label correspondant a l'attribut
 	type            varchar(8),
 	size            varchar(8) DEFAULT NULL,
 	fieldunique     integer DEFAULT 0,
 	fieldrequired   integer DEFAULT 0,
 	pos             integer DEFAULT 0,
+	alwayseditable  integer DEFAULT 0,
 	param		text
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 2522ee7a73e..9757f749cd0 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -56,14 +56,16 @@ create table llx_facture
 
   fk_statut				smallint DEFAULT 0 NOT NULL,
 
-  fk_user_author		integer,								-- createur de la facture
-  fk_user_valid			integer,								-- valideur de la facture
+  fk_user_author		integer,								-- user making creation
+  fk_user_modif         integer,                               -- user making last change
+  fk_user_valid			integer,								-- user validating
 
   fk_facture_source		integer,								-- facture origine si facture avoir
   fk_projet				integer DEFAULT NULL,					-- projet auquel est associee la 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 c980d43e40f..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,
@@ -52,12 +52,14 @@ create table llx_facture_fourn
 
   fk_statut				smallint DEFAULT 0 NOT NULL,
 
-  fk_user_author		integer,                       -- createur de la facture
-  fk_user_valid			integer,                       -- valideur de la facture
+  fk_user_author		integer,                       -- user making creation
+  fk_user_modif         integer,                       -- user making last change
+  fk_user_valid			integer,                       -- user validating
 
   fk_facture_source		integer,                       -- facture origine si facture avoir
   fk_projet				integer,                       -- projet auquel est associee la facture
 
+  fk_account            integer,                       -- bank account
   fk_cond_reglement		integer,   	                   -- condition de reglement (30 jours, fin de mois ...)
   fk_mode_reglement		integer,                	   -- mode de reglement (CHQ, VIR, ...)
   date_lim_reglement 	date,                          -- date limite de reglement
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 <rodolphe@quiedeville.org>
--- Copyright (C) 2012 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2009 Regis Houssin        <regis.houssin@capnetworks.com>
--- Copyright (C) 2010 Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2012-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
 -- 
 -- 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	<rodolphe@quiedeville.org>
--- Copyright (C) 2009		Laurent Destailleur		<eldy@users.sourceforge.net>
+-- Copyright (C) 2009-2014  Laurent Destailleur		<eldy@users.sourceforge.net>
 -- Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
 -- Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
 --
@@ -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_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index b2397b2d2c3..58f953c7196 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -24,13 +24,15 @@ create table llx_fichinter
   fk_projet			integer DEFAULT 0,          -- projet auquel est rattache la fiche
   fk_contrat		integer DEFAULT 0,          -- contrat auquel est rattache la fiche
   ref				varchar(30) NOT NULL,       -- number
+  ref_ext			varchar(255),
   entity			integer DEFAULT 1 NOT NULL, -- multi company id
   tms				timestamp,
   datec				datetime,                   -- date de creation 
   date_valid		datetime,                   -- date de validation
-  datei				date,                       -- date de livraison du bon d'intervention
-  fk_user_author	integer,                    -- createur de la fiche
-  fk_user_valid		integer,                    -- valideur de la fiche
+  datei				date,						-- date de livraison du bon d'intervention
+  fk_user_author	integer,					-- user making creation
+  fk_user_modif     integer,                   -- user making last change
+  fk_user_valid		integer,                   -- valideur de la fiche
   fk_statut			smallint  DEFAULT 0,
   duree				real,                       -- duree totale de l'intervention
   description		text,
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
new file mode 100644
index 00000000000..e80db336c75
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2013 Florian Henry	<florian.henry@open-cocncept.pro>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
new file mode 100644
index 00000000000..4c44e62e1db
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
@@ -0,0 +1,25 @@
+-- ===================================================================
+-- Copyright (C) 2013	florian Henry	<florian.henry@open-concept.pro>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_fichinterdet_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_holiday_types.sql b/htdocs/install/mysql/tables/llx_holiday_types.sql
new file mode 100755
index 00000000000..d49a79f5748
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_holiday_types.sql
@@ -0,0 +1,30 @@
+-- ===================================================================
+-- Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_holiday_types (
+  rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  label varchar(45) NOT NULL,
+  description varchar(255) NOT NULL,
+  affect integer NOT NULL,
+  delay integer NOT NULL,
+  insertAt DATETIME NOT NULL,
+  updateAt DATETIME,
+  deleteAt DATETIME,
+  nbCongesDeducted varchar(255) NOT NULL,
+  nbCongesEveryMonth varchar(255) NOT NULL
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_localtax.sql b/htdocs/install/mysql/tables/llx_localtax.sql
index c7ca3ca44f6..65c9fbe496b 100644
--- a/htdocs/install/mysql/tables/llx_localtax.sql
+++ b/htdocs/install/mysql/tables/llx_localtax.sql
@@ -1,6 +1,6 @@
 -- ===================================================================
--- Copyright (C) 2011	Juanjo Menent	<jmenent@2byte.es>
--- Copyright (C) 2011	Regis Houssin	<regis.houssin@capnetworks.com>
+-- Copyright (C) 2011-2014	Juanjo Menent	<jmenent@2byte.es>
+-- Copyright (C) 2011		Regis Houssin	<regis.houssin@capnetworks.com>
 --
 -- 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,6 +21,7 @@ create table llx_localtax
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1 NOT NULL,
+  localtaxtype    tinyint,
   tms             timestamp,
   datep           date,								-- date of payment
   datev           date,								-- date of value
@@ -30,5 +31,4 @@ create table llx_localtax
   fk_bank         integer,  
   fk_user_creat   integer,                 
   fk_user_modif   integer 
-                      
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql
index fa2936db0fb..1dcfe6af8e6 100644
--- a/htdocs/install/mysql/tables/llx_notify.sql
+++ b/htdocs/install/mysql/tables/llx_notify.sql
@@ -1,6 +1,7 @@
 -- ===================================================================
 -- Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2014 Juanjo Menent		   <jmenent@2byte.es>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -23,8 +24,10 @@ create table llx_notify
   tms             timestamp,
   daten           datetime,           -- date de la notification
   fk_action       integer NOT NULL,
+  fk_soc          integer NULL,
   fk_contact      integer NULL,
   fk_user         integer NULL,
+  type            varchar(16) DEFAULT 'email',
   objet_type      varchar(24) NOT NULL,
   objet_id        integer NOT NULL,
   email           varchar(255)
diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql
index a2cb0e539f9..fb471910230 100644
--- a/htdocs/install/mysql/tables/llx_product.key.sql
+++ b/htdocs/install/mysql/tables/llx_product.key.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -25,6 +26,11 @@ ALTER TABLE llx_product ADD INDEX idx_product_label (label);
 ALTER TABLE llx_product ADD INDEX idx_product_barcode (barcode);
 ALTER TABLE llx_product ADD INDEX idx_product_import_key (import_key);
 ALTER TABLE llx_product ADD INDEX idx_product_seuil_stock_alerte (seuil_stock_alerte);
-
+ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country);
+ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author);
+ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
 ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
 
+
+ALTER TABLE  llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES  llx_c_country (rowid);
+ALTER TABLE  llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 582f8161365..e9703fc90cf 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -4,6 +4,7 @@
 -- Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
 -- Copyright (C) 2010      juanjo Menent        <jmenent@2byte.es>
 -- Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
 --
 -- 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,7 +38,7 @@ create table llx_product
   description				text,
   note						text,
   customcode                varchar(32),                    -- Optionnal custom code
-  fk_country                integer,                        -- Optionnal id of original country 
+  fk_country                integer DEFAULT NULL,                        -- Optionnal id of original country
   price						double(24,8) DEFAULT 0,
   price_ttc					double(24,8) DEFAULT 0,
   price_min					double(24,8) DEFAULT 0,
@@ -47,8 +48,9 @@ create table llx_product
   recuperableonly           integer NOT NULL DEFAULT '0',  -- French NPR VAT
   localtax1_tx				double(6,3)  DEFAULT 0,         -- Spanish local VAT 1 
   localtax2_tx				double(6,3)  DEFAULT 0,         -- Spanish local VAT 2
-  fk_user_author			integer,
-  tosell					tinyint      DEFAULT 1,	            -- Product you sell
+  fk_user_author			integer DEFAULT NULL,			  -- user making creation
+  fk_user_modif             integer,                         -- user making last change
+  tosell					tinyint      DEFAULT 1,	          -- Product you sell
   tobuy						tinyint      DEFAULT 1,            -- Product you buy
   tobatch					tinyint      DEFAULT 0 NOT NULL,  -- Is it a product that need a batch or eat-by management
   fk_product_type			integer      DEFAULT 0,			-- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module)
@@ -56,9 +58,9 @@ create table llx_product
   seuil_stock_alerte		integer      DEFAULT 0,
   url						varchar(255),
   barcode					varchar(255) DEFAULT NULL,
-  fk_barcode_type			integer      DEFAULT 0,
-  accountancy_code_sell		varchar(15),                    -- Selling accountancy code
-  accountancy_code_buy		varchar(15),                    -- Buying accountancy code
+  fk_barcode_type			integer      DEFAULT NULL,
+  accountancy_code_sell		varchar(32),                    -- Selling accountancy code
+  accountancy_code_buy		varchar(32),                    -- Buying accountancy code
   partnumber				varchar(32),                    -- Not used. Used by external modules.
   weight					float        DEFAULT NULL,
   weight_units				tinyint      DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_product_price.key.sql b/htdocs/install/mysql/tables/llx_product_price.key.sql
new file mode 100644
index 00000000000..b3018cea95b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_price.key.sql
@@ -0,0 +1,23 @@
+-- ============================================================================
+-- Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+ALTER TABLE  llx_product_price ADD INDEX idx_product_price_fk_user_author (fk_user_author);
+ALTER TABLE  llx_product_price ADD INDEX idx_product_price_fk_product (fk_product);
+
+ALTER TABLE  llx_product_price ADD CONSTRAINT fk_product_price_user_author FOREIGN KEY (fk_product) REFERENCES  llx_product (rowid);
+ALTER TABLE  llx_product_price ADD CONSTRAINT fk_product_price_product FOREIGN KEY (fk_user_author) REFERENCES  llx_user (rowid);
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_projet_task_time.key.sql b/htdocs/install/mysql/tables/llx_projet_task_time.key.sql
new file mode 100644
index 00000000000..ad1433f8dca
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.key.sql
@@ -0,0 +1,22 @@
+-- ===========================================================================
+-- Copyright (C) 2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ===========================================================================
+
+ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
+ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
+ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
+
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index 8bef980a12e..d5d89812b4a 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -20,7 +20,8 @@ create table llx_projet_task_time
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   fk_task          integer NOT NULL,
-  task_date        date,
+  task_date        date,				-- only the day
+  task_datehour    datetime,			-- day + hour
   task_duration    double,
   fk_user          integer,
   thm			   double(24,8),
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index 0ca800c9bca..90996073021 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -38,9 +38,10 @@ create table llx_propal
   fin_validite			datetime,						-- date de fin de validite
   date_valid			datetime,						-- date de validation
   date_cloture			datetime,						-- date de cloture
-  fk_user_author		integer,						-- createur de la propale
-  fk_user_valid			integer,						-- valideur de la propale
-  fk_user_cloture		integer,						-- cloture de la propale signee ou non signee
+  fk_user_author		integer,						-- user making creation
+  fk_user_modif         integer,                       -- user making last change
+  fk_user_valid			integer,						-- user validating
+  fk_user_cloture		integer,						-- user closing (signed or not)
   fk_statut				smallint DEFAULT 0 NOT NULL,
   price					real         DEFAULT 0,			-- (obsolete)
   remise_percent		real         DEFAULT 0,			-- remise globale relative en pourcent (obsolete)
@@ -61,6 +62,7 @@ create table llx_propal
   note_public			text,
   model_pdf				varchar(255),
   date_livraison		date DEFAULT NULL,				-- delivery date
+  fk_shipping_method    integer,                        -- shipping method id
   fk_availability		integer NULL,
   fk_input_reason		integer,
   import_key			varchar(14),
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.sql b/htdocs/install/mysql/tables/llx_societe.sql
index e2c08d246be..e28cf062224 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -3,6 +3,7 @@
 -- Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
 -- Copyright (C) 2010      Juanjo Menent        <dolibarr@2byte.es>
+-- Copyright (C) 2014      Teddy Andreotti      <125155@supinfo.com>
 --
 -- 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,7 +23,7 @@
 create table llx_societe
 (
   rowid                    integer AUTO_INCREMENT PRIMARY KEY,
-  nom                      varchar(60),                                -- company reference name
+  nom                      varchar(128),                                -- company reference name (should be same length than adherent.societe)
   entity                   integer DEFAULT 1 NOT NULL,               -- multi company id
 
   ref_ext                  varchar(128),                               -- reference into an external system (not used by dolibarr)
@@ -81,7 +82,9 @@ create table llx_societe
   cond_reglement_supplier  tinyint,                             		-- condition de reglement fournisseur
   tva_assuj                tinyint        DEFAULT 1,	        		-- assujeti ou non a la TVA
   localtax1_assuj          tinyint        DEFAULT 0,	        		-- assujeti ou non a local tax 1
+  localtax1_value 		   double(6,3),
   localtax2_assuj          tinyint        DEFAULT 0,	        		-- assujeti ou non a local tax 2
+  localtax2_value 		   double(6,3),
   barcode                  varchar(255),                        		-- barcode
   fk_barcode_type          integer NULL   DEFAULT 0,                    -- barcode type
   price_level              integer NULL,                        		-- level of price for multiprices
@@ -89,5 +92,7 @@ create table llx_societe
   default_lang             varchar(6),									-- default language
   logo                     varchar(255),
   canvas				   varchar(32),			                        -- type of canvas if used (null by default)
-  import_key               varchar(14)                          		-- import key
+  import_key               varchar(14),                          		-- import key
+  webservices_url          varchar(255),                            -- supplier webservice url
+  webservices_key          varchar(128)                            -- supplier webservice key
 )ENGINE=innodb;
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_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index 04635061e59..4b99598a3b9 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -26,7 +26,7 @@ create table llx_socpeople
   fk_soc			integer,									-- lien vers la societe
   entity			integer DEFAULT 1 NOT NULL,					-- multi company id
   ref_ext           varchar(128),                               -- reference into an external system (not used by dolibarr)
-  civilite			varchar(6),
+  civility			varchar(6),
   lastname			varchar(50),
   firstname			varchar(50),
   address			varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql
deleted file mode 100644
index 9e667120287..00000000000
--- a/htdocs/install/mysql/tables/llx_texts.sql
+++ /dev/null
@@ -1,34 +0,0 @@
--- ============================================================================
--- Copyright (C) 2007-2009 Laurent Destailleur <eldy@users.sourceforge.net>
---
--- 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 <http://www.gnu.org/licenses/>.
---
--- ============================================================================
-
-create table llx_texts
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-
-  module          varchar(32),                  -- Nom du module en rapport avec le modele
-  typemodele      varchar(32),                  -- Type du modele
-  sortorder       smallint,						-- Ordre affichage
-  
-  private         smallint DEFAULT 0 NOT NULL,  -- Modele publique ou prive
-  fk_user         integer,                      -- Id utilisateur si modele prive, sinon null
-  title           varchar(128),                 -- Titre du modele
-  filename		  varchar(128),					-- Nom fichier si modele fichier
-  content         text,                         -- Texte si modele texte
-
-  tms             timestamp
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 4b537e21f0c..28385298125 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -28,11 +28,13 @@ create table llx_user
 
   datec             datetime,
   tms               timestamp,
+  fk_user_creat     integer,
+  fk_user_modif     integer,
   login             varchar(24) NOT NULL,
   pass              varchar(32),
   pass_crypted      varchar(128),
   pass_temp         varchar(32),			    -- temporary password when asked for forget password
-  civilite          varchar(6),
+  civility          varchar(6),
   lastname          varchar(50),
   firstname         varchar(50),
   address           varchar(255),                        		-- user personal address
@@ -54,7 +56,6 @@ create table llx_user
   fk_socpeople      integer,
   fk_member         integer,
   fk_user           integer,               -- Hierarchic parent
-  thm				double(24,8),
   note              text DEFAULT NULL,
   datelastlogin     datetime,
   datepreviouslogin datetime,
@@ -67,7 +68,11 @@ create table llx_user
   color				varchar(6),
   barcode			varchar(255) DEFAULT NULL,
   fk_barcode_type	integer      DEFAULT 0,
-  accountancy_code  varchar(24) NULL,
+  accountancy_code  varchar(32) NULL,
   nb_holiday		integer DEFAULT 0,
-  salary			double(24,8)
+  thm				double(24,8),
+  tjm				double(24,8),
+  salary			double(24,8),
+  salaryextra		double(24,8),
+  weeklyhours		double(16,8)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
new file mode 100644
index 00000000000..378f4514539
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2013 Alexis Algoud	<alexis@atm-consulting.fr>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
new file mode 100644
index 00000000000..0a89810dce5
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
@@ -0,0 +1,26 @@
+-- ===================================================================
+-- Copyright (C) 2014	Alexis Algoud	<alexis@atm-consulting.fr>
+--
+-- 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 <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE IF NOT EXISTS llx_usergroup_extrafields (
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+)ENGINE=innodb;
+
+
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 3275d589685..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();
@@ -62,6 +63,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_adherent_type FOR EA
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank_account FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_boxes_def FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_email_templates FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_field_list FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_shipment_mode FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_chargesociales FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -82,6 +84,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_extrafields FOR EACH
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_facture FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_facture_fourn FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinter FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinterdet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_livraison FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_localtax FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_menu FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -111,7 +114,6 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_rib FOR EACH
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_socpeople FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_socpeople_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_stock_mouvement FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_texts FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_tva FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/pgsql/functions/index.html b/htdocs/install/pgsql/functions/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/pgsql/index.html b/htdocs/install/pgsql/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 47456c21c62..48f4b5a6aa6 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -132,7 +132,7 @@ if ($ok)
     }
 }
 
-// Affiche version
+// Show database version
 if ($ok)
 {
     $version=$db->getVersion();
@@ -143,12 +143,15 @@ if ($ok)
     //print '<td align="right">'.join('.',$versionarray).'</td></tr>';
 }
 
-// Force l'affichage de la progression
+// Show wait message
 print '<tr><td colspan="2">'.$langs->trans("PleaseBePatient").'</td></tr>';
 flush();
 
 
-// Run repair SQL file
+/* Start action here */
+
+
+// run_sql: Run repair SQL file
 if ($ok)
 {
     $dir = "mysql/migration/";
@@ -191,86 +194,169 @@ if ($ok)
 }
 
 
-// Search list of fields declared and list of fields created into databases and create fields missing
-$extrafields=new ExtraFields($db);
-$listofmodulesextra=array('societe'=>'societe','adherent'=>'adherent','product'=>'product',
-			'socpeople'=>'socpeople', 'commande'=>'commande', 'facture'=>'facture',
-			'commande_fournisseur'=>'commande_fournisseur', 'actioncomm'=>'actioncomm',
-			'adherent_type'=>'adherent_type','user'=>'user','projet'=>'projet', 'projet_task'=>'projet_task');
-foreach($listofmodulesextra as $tablename => $elementtype)
+// sync_extrafields: Search list of fields declared and list of fields created into databases and create fields missing
+if ($ok)
 {
-    // Get list of fields
-    $tableextra=MAIN_DB_PREFIX.$tablename.'_extrafields';
+	$extrafields=new ExtraFields($db);
+	$listofmodulesextra=array('societe'=>'societe','adherent'=>'adherent','product'=>'product',
+				'socpeople'=>'socpeople', 'commande'=>'commande', 'facture'=>'facture',
+				'commande_fournisseur'=>'commande_fournisseur', 'actioncomm'=>'actioncomm',
+				'adherent_type'=>'adherent_type','user'=>'user','projet'=>'projet', 'projet_task'=>'projet_task');
+	foreach($listofmodulesextra as $tablename => $elementtype)
+	{
+	    // Get list of fields
+	    $tableextra=MAIN_DB_PREFIX.$tablename.'_extrafields';
 
-    // Define $arrayoffieldsdesc
-    $arrayoffieldsdesc=$extrafields->fetch_name_optionals_label($elementtype);
+	    // Define $arrayoffieldsdesc
+	    $arrayoffieldsdesc=$extrafields->fetch_name_optionals_label($elementtype);
 
-    // Define $arrayoffieldsfound
-    $arrayoffieldsfound=array();
-    $resql=$db->DDLDescTable($tableextra);
-    if ($resql)
-    {
-        print '<tr><td>Check availability of extra field for '.$tableextra."<br>\n";
-        $i=0;
-        while($obj=$db->fetch_object($resql))
-        {
-            $fieldname=$fieldtype='';
-            if (preg_match('/mysql/',$db->type))
-            {
-                $fieldname=$obj->Field;
-                $fieldtype=$obj->Type;
-            }
-            else
-            {
-                $fieldname = isset($obj->Key)?$obj->Key:$obj->attname;
-                $fieldtype = isset($obj->Type)?$obj->Type:'varchar';
-            }
+	    // Define $arrayoffieldsfound
+	    $arrayoffieldsfound=array();
+	    $resql=$db->DDLDescTable($tableextra);
+	    if ($resql)
+	    {
+	        print '<tr><td>Check availability of extra field for '.$tableextra."<br>\n";
+	        $i=0;
+	        while($obj=$db->fetch_object($resql))
+	        {
+	            $fieldname=$fieldtype='';
+	            if (preg_match('/mysql/',$db->type))
+	            {
+	                $fieldname=$obj->Field;
+	                $fieldtype=$obj->Type;
+	            }
+	            else
+	            {
+	                $fieldname = isset($obj->Key)?$obj->Key:$obj->attname;
+	                $fieldtype = isset($obj->Type)?$obj->Type:'varchar';
+	            }
 
-            if (empty($fieldname)) continue;
-            if (in_array($fieldname,array('rowid','tms','fk_object','import_key'))) continue;
-            $arrayoffieldsfound[$fieldname]=array('type'=>$fieldtype);
-        }
+	            if (empty($fieldname)) continue;
+	            if (in_array($fieldname,array('rowid','tms','fk_object','import_key'))) continue;
+	            $arrayoffieldsfound[$fieldname]=array('type'=>$fieldtype);
+	        }
 
-        // If it does not match, we create fields
-        foreach($arrayoffieldsdesc as $code => $label)
-        {
-            if (! in_array($code,array_keys($arrayoffieldsfound)))
-            {
-                print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
-                $type=$extrafields->attribute_type[$code]; $value=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null';
-                $field_desc=array(
-                	'type'=>$type,
-                	'value'=>$value,
-                	'attribute'=>$attribute,
-                	'default'=>$default,
-                	'extra'=>$extra,
-                	'null'=>$null
-                );
-                //var_dump($field_desc);exit;
+	        // If it does not match, we create fields
+	        foreach($arrayoffieldsdesc as $code => $label)
+	        {
+	            if (! in_array($code,array_keys($arrayoffieldsfound)))
+	            {
+	                print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
+	                $type=$extrafields->attribute_type[$code]; $value=$extrafields->attribute_size[$code]; $attribute=''; $default=''; $extra=''; $null='null';
+	                $field_desc=array(
+	                	'type'=>$type,
+	                	'value'=>$value,
+	                	'attribute'=>$attribute,
+	                	'default'=>$default,
+	                	'extra'=>$extra,
+	                	'null'=>$null
+	                );
+	                //var_dump($field_desc);exit;
 
-                $result=$db->DDLAddField($tableextra,$code,$field_desc,"");
-                if ($result < 0)
-                {
-                    print "KO ".$db->lasterror."<br>\n";
-                }
-                else
-                {
-                    print "OK<br>\n";
-                }
-            }
-        }
+	                $result=$db->DDLAddField($tableextra,$code,$field_desc,"");
+	                if ($result < 0)
+	                {
+	                    print "KO ".$db->lasterror."<br>\n";
+	                }
+	                else
+	                {
+	                    print "OK<br>\n";
+	                }
+	            }
+	        }
 
-        print "</td><td>&nbsp;</td></tr>\n";
-    }
+	        print "</td><td>&nbsp;</td></tr>\n";
+	    }
+	}
 }
 
 
-// Clean data into ecm_directories table
-clean_data_ecm_directories();
+
+// clean_data_ecm_dir: Clean data into ecm_directories table
+if ($ok)
+{
+	clean_data_ecm_directories();
+}
 
 
-// Check and clean linked elements
-if (GETPOST('clean_linked_elements'))
+
+/* From here, actions need a parameter */
+
+
+
+// clean_linked_elements: Check and clean linked elements
+if ($ok && GETPOST('restore_thirdparties_logos'))
+{
+	//$exts=array('gif','png','jpg');
+
+	$ext='';
+	//foreach($exts as $ext)
+	//{
+		$sql="SELECT s.rowid, s.nom as name, s.logo FROM ".MAIN_DB_PREFIX."societe as s ORDER BY s.nom";
+		$resql=$db->query($sql);
+		if ($resql)
+		{
+			$num=$db->num_rows($resql);
+			$i=0;
+
+			while($i < $num)
+			{
+				$obj=$db->fetch_object($resql);
+
+				/*
+				$name=preg_replace('/é/','',$obj->name);
+				$name=preg_replace('/ /','_',$name);
+				$name=preg_replace('/\'/','',$name);
+				*/
+
+				$tmp=explode('.',$obj->logo);
+				$name=$tmp[0];
+				if (isset($tmp[1])) $ext='.'.$tmp[1];
+
+				if (! empty($name))
+				{
+					$filetotest=$dolibarr_main_data_root.'/societe/logos/'.$name.$ext;
+					$filetotestsmall=$dolibarr_main_data_root.'/societe/logos/thumbs/'.$name.$ext;
+					$exists=dol_is_file($filetotest);
+					print 'Check thirdparty '.$obj->rowid.' name='.$obj->name.' logo='.$obj->logo.' file '.$filetotest." exists=".$exists."<br>\n";
+					if ($exists)
+					{
+						$filetarget=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/'.$name.$ext;
+						$filetargetsmall=$dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/thumbs/'.$name.'_small'.$ext;
+						$existt=dol_is_file($filetarget);
+						if (! $existt)
+						{
+							dol_mkdir($dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos');
+
+							print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotest." -> ".$filetarget."<br>\n";
+							dol_copy($filetotest, $filetarget, '', 0);
+						}
+
+						$existtt=dol_is_file($filetargetsmall);
+						if (! $existtt)
+						{
+							dol_mkdir($dolibarr_main_data_root.'/societe/'.$obj->rowid.'/logos/thumbs');
+
+							print "  &nbsp; &nbsp; &nbsp; -> Copy file ".$filetotestsmall." -> ".$filetargetsmall."<br>\n";
+							dol_copy($filetotestsmall, $filetargetsmall, '', 0);
+						}
+					}
+				}
+
+				$i++;
+			}
+		}
+		else
+		{
+			$ok=0;
+			dol_print_error($db);
+		}
+	//}
+}
+
+
+// clean_linked_elements: Check and clean linked elements
+if ($ok && GETPOST('clean_linked_elements'))
 {
 	// propal => order
 	print "</td><td>".checkLinkedElements('propal', 'commande')."</td></tr>\n";
@@ -292,8 +378,8 @@ if (GETPOST('clean_linked_elements'))
 }
 
 
-// Run purge of directory
-if (GETPOST('purge'))
+// clean_orphelin_dir: Run purge of directory
+if ($ok && GETPOST('clean_orphelin_dir'))
 {
     $conf->setValues($db);
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 9b15d36ffe9..e93b27ab6e9 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -50,6 +50,7 @@ error_reporting(0);
 @set_time_limit(120);
 error_reporting($err);
 
+
 $setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto';
 $langs->setDefaultLang($setuplang);
 $versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]);
@@ -74,6 +75,22 @@ 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;
+}
+
+
 pHeader('',"upgrade2",GETPOST('action'),'versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 $actiondone=0;
@@ -85,12 +102,6 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 
     print '<h3>'.$langs->trans("DatabaseMigration").'</h3>';
 
-    if (! $versionfrom && ! $versionto)
-    {
-        print '<div class="error">Parameter versionfrom or versionto missing. Upgrade is launched from page install/index.php (like a first install) instead of install/upgrade.php</div>';
-        exit;
-    }
-
     print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
     $error=0;
 
@@ -168,7 +179,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion")." : $version");
 
         // Test database version
-        $versionmindb=getStaticMember(get_class($db),'versionmin');
+        $versionmindb=$db::VERSIONMIN;
         //print join('.',$versionarray).' - '.join('.',$versionmindb);
         if (count($versionmindb) && count($versionarray)
         	&& versioncompare($versionarray,$versionmindb) < 0)
@@ -203,7 +214,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 			    $filles=array();
 			    $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
 			    $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
-			    dolibarr_install_syslog("upgrade: search duplicate sql=".$sql);
+			    dolibarr_install_syslog("upgrade: search duplicate", LOG_DEBUG);
 			    $resql = $db->query($sql);
 			    if ($resql)
 			    {
@@ -231,7 +242,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 
 			            // We delete all
 			            $sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
-			            dolibarr_install_syslog("upgrade: delete association sql=".$sql);
+			            dolibarr_install_syslog("upgrade: delete association", LOG_DEBUG);
 			            $resqld=$db->query($sql);
 			            if ($resqld)
 			            {
@@ -240,7 +251,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 			                {
 			                    $sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
 			                    $sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
-			                    dolibarr_install_syslog("upgrade: insert association sql=".$sql);
+			                    dolibarr_install_syslog("upgrade: insert association", LOG_DEBUG);
 			                    $resqli=$db->query($sql);
 			                    if (! $resqli) $error++;
 			                }
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 736346d0f72..d5fa016e02a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -83,6 +83,21 @@ 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;
+}
+
 pHeader('','etape5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 
@@ -343,8 +358,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 		// No specific scripts
 
         // Tasks to do always and only into last targeted version
-        $afterversionarray=explode('.','3.4.9');	// target is after this
-        $beforeversionarray=explode('.','3.5.9');	// target is before this
+        $afterversionarray=explode('.','3.6.9');	// target is after this
+        $beforeversionarray=explode('.','3.7.9');	// target is before this
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
         	// Reload modules (this must be always and only into last targeted version)
@@ -413,7 +428,7 @@ function migrate_paiements($db,$langs,$conf)
 
         $resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements sql=".$sql);
+        dolibarr_install_syslog("upgrade2::migrate_paiements", LOG_DEBUG);
         if ($resql)
         {
             $i = 0;
@@ -513,7 +528,7 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
 
         $resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1 sql=".$sql);
+        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1", LOG_DEBUG);
         $row = array();
         if ($resql)
         {
@@ -639,7 +654,7 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
 
         $resql = $db->query($sql);
 
-        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2 sql=".$sql);
+        dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2", LOG_DEBUG);
         $row = array();
         if ($resql)
         {
@@ -779,7 +794,7 @@ function migrate_contracts_det($db,$langs,$conf)
     $sql.= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
     $resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_det sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_det", LOG_DEBUG);
     if ($resql)
     {
         $i = 0;
@@ -875,7 +890,7 @@ function migrate_links_transfert($db,$langs,$conf)
     $sql.= " AND bu.fk_bank IS NULL";
     $resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_links_transfert sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_links_transfert", LOG_DEBUG);
     if ($resql)
     {
         $i = 0;
@@ -899,7 +914,7 @@ function migrate_links_transfert($db,$langs,$conf)
                 $sql.= ")";
 
                 print $sql.'<br>';
-                dolibarr_install_syslog("migrate_links_transfert sql=".$sql);
+                dolibarr_install_syslog("migrate_links_transfert", LOG_DEBUG);
 
                 if (! $db->query($sql))
                 {
@@ -950,7 +965,7 @@ function migrate_contracts_date1($db,$langs,$conf)
     print '<b>'.$langs->trans('MigrationContractsEmptyDatesUpdate')."</b><br>\n";
 
     $sql="update llx_contrat set date_contrat=tms where date_contrat is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1 sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
@@ -959,7 +974,7 @@ function migrate_contracts_date1($db,$langs,$conf)
     print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."<br>\n";
 
     $sql="update llx_contrat set datec=tms where datec is null";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date1 sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
@@ -989,7 +1004,7 @@ function migrate_contracts_date2($db,$langs,$conf)
     $sql.= " GROUP BY c.rowid, c.date_contrat";
     $resql = $db->query($sql);
 
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date2 sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date2", LOG_DEBUG);
     if ($resql)
     {
         $i = 0;
@@ -1050,7 +1065,7 @@ function migrate_contracts_date3($db,$langs,$conf)
     print '<b>'.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."</b><br>\n";
 
     $sql="update llx_contrat set datec=date_contrat where datec is null or datec > date_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_date3 sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_date3", LOG_DEBUG);
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0)
@@ -1078,7 +1093,7 @@ function migrate_contracts_open($db,$langs,$conf)
 
     $sql = "SELECT c.rowid as cref FROM llx_contrat as c, llx_contratdet as cd";
     $sql.= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
-    dolibarr_install_syslog("upgrade2::migrate_contracts_open sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_contracts_open", LOG_DEBUG);
     $resql = $db->query($sql);
     if (! $resql) dol_print_error($db);
     if ($db->affected_rows($resql) > 0) {
@@ -1148,7 +1163,7 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf)
         $select_sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
         $select_sql.= ' WHERE fk_facture_fourn IS NOT NULL';
 
-        dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn sql=".$select_sql);
+        dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn", LOG_DEBUG);
         $select_resql = $db->query($select_sql);
         if ($select_resql)
         {
@@ -1264,7 +1279,7 @@ function migrate_price_facture($db,$langs,$conf)
     $sql.= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
     //print $sql;
 
-    dolibarr_install_syslog("upgrade2::migrate_price_facture sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_price_facture", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1377,7 +1392,7 @@ function migrate_price_propal($db,$langs,$conf)
     $sql.= " WHERE pd.fk_propal = p.rowid";
     $sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_propal sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_price_propal", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1412,7 +1427,7 @@ function migrate_price_propal($db,$langs,$conf)
 
                 dolibarr_install_syslog("upgrade2: Line $rowid: propalid=$obj->rowid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
                 print ". ";
-                $propalligne->update_total($rowid);
+                $propalligne->update_total();
 
 
                 /* On touche pas a propal mere
@@ -1486,7 +1501,7 @@ function migrate_price_contrat($db,$langs,$conf)
     $sql.= " WHERE cd.fk_contrat = c.rowid";
     $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_contrat sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_price_contrat", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1508,7 +1523,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];
@@ -1521,7 +1536,7 @@ function migrate_price_contrat($db,$langs,$conf)
 
                 dolibarr_install_syslog("upgrade2: Line $rowid: contratdetid=$obj->rowid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent -> $total_ht, $total_tva, $total_ttc");
                 print ". ";
-                $contratligne->update_total($rowid);
+                $contratligne->update_total();
 
                 $i++;
             }
@@ -1571,7 +1586,7 @@ function migrate_price_commande($db,$langs,$conf)
     $sql.= " WHERE cd.fk_commande = c.rowid";
     $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_price_commande", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1606,7 +1621,7 @@ function migrate_price_commande($db,$langs,$conf)
 
                 dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
                 print ". ";
-                $commandeligne->update_total($rowid);
+                $commandeligne->update_total();
 
                 /* On touche pas a facture mere
                  $commande = new Commande($db);
@@ -1685,7 +1700,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
     $sql.= " WHERE cd.fk_commande = c.rowid";
     $sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
 
-    dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur sql=".$sql);
+    dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur", LOG_DEBUG);
     $resql=$db->query($sql);
     if ($resql)
     {
@@ -1720,7 +1735,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
 
                 dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty tva_taux=$txtva remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
                 print ". ";
-                $commandeligne->update_total($rowid);
+                $commandeligne->update_total();
 
                 /* On touche pas a facture mere
                  $commande = new Commande($db);
@@ -2406,7 +2421,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
     $sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
     $sql.= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 1 sql=".$sql);
+    dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 1", LOG_DEBUG);
     $resql = $db->query($sql);
     if ($resql)
     {
@@ -2472,7 +2487,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
     $sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
     $sql.= " WHERE t1.rowid = t2.".$field2.")";
 
-    dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 2 sql=".$sql);
+    dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 2", LOG_DEBUG);
     $resql = $db->query($sql);
     if ($resql)
     {
@@ -3619,137 +3634,170 @@ 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($conf->global->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 (! 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');
+	        }
+	    }
 
+	    if (! empty($conf->global->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 (! 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($conf->global->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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 9242904392b..e5d0499ff88 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=خطأ ، هذا النموذج يتطلب ن
 ErrorDecimalLargerThanAreForbidden=خطأ, برنامج دوليبار <b>%s</b> الحالي لا يدعم دقة أعلى من الحالية
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا النوع محفوظ. يمكنك إستخدام 'user' كقيمة لإضافة السجل الخاص بك
 ErrorCodeCantContainZero=لا يمكن إستخدام القيمة 0 لهذا الكود
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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=أظهر التواريخ الكاملة للأحداث في الصفحة الثالثة
@@ -133,7 +137,7 @@ Box=مربع
 Boxes=مربعات
 MaxNbOfLinesForBoxes=الحد الأقصى لعدد الخطوط في المربعات
 PositionByDefault=الطلبية الإفتراضية
-Position=الطلبية
+Position=Position
 MenusDesc=يمكن لرؤساء القوائم تعريف المحتوى لعمودين من القوائم (عمود افقي وعمود عمودي).
 MenusEditorDesc=محرر القوائم يسمح لك بتعريف مدخلات شخصية في القوائم. استخدامها بعناية لتجنب التأثير على برنامج دوليبار وجعله غير مستقر بالإضافة إلى جعل روابط القوائم غير متاحة. <br> بعض النماذج تظيف خانات في القوائم (في القائمة <b>الكل</b> في معظم الحالات). إذا أزلت بعض هذه القيود عن طريق الخطأ ، يمكنك ان تستعيدها وتعطيل وتمكين النموذج.
 MenuForUsers=قائمة للمستخدمين
@@ -206,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=صناديق متاحة
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=تلقائيا إذا تم تعطيل جافاسك
 AvailableOnlyIfJavascriptNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين
 Required=مطلوب
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=الأمن
 Passwords=كلمة السر
 DoNotStoreClearPassword=لا تخزن كلمات السر في قاعدة بيانات واضحة في
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=بروتوكول نقل البري
 MAIN_MAIL_EMAIL_FROM=مرسل البريد الإلكتروني للرسائل البريد الإلكتروني تلقائيا (افتراضيا في php.ini : <b>٪)</b>
 MAIN_MAIL_ERRORS_TO=أرسلت مرسل البريد الإلكتروني المستخدمة في رسائل البريد الإلكتروني عائدات خطأ
 MAIN_MAIL_AUTOCOPY_TO= إرسال منهجية خفية الكربون نسخة من جميع رسائل البريد الإلكتروني المرسلة إلى
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=تعطيل جميع رسائل البريد الإلكتروني الإرسال (لأغراض الاختبار أو تجريبية)
 MAIN_MAIL_SENDMODE=طريقة استخدام لإرسال رسائل البريد الإلكتروني
 MAIN_MAIL_SMTPS_ID=إذا الهوية SMTP التوثيق اللازم
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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=التبرعات إدارة
-Module800Name=OSCommerce المباشر
-Module800Desc=وتظهر على واجهة OSCommerce أو متجر OSCSS مباشرة عن طريق الوصول إلى قواعد البيانات
-Module900Name=وكان من قبل OSCommerce
-Module900Desc=وتظهر على واجهة المحل OSCommerce الخدمات عبر الإنترنت. \\ nThis حدة requiere لك لتثبيت عناصر من / oscommerce_ws / ws_server الى OSCommerce الخادم الخاص بك. انظر في الملف التمهيدي / oscommerce_ws / ws_server.
 Module1200Name=فرس النبي
 Module1200Desc=فرس النبي التكامل
 Module1400Name=المحاسبة
@@ -493,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=جدول الأعمال
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=إنشاء / تعديل المساهمات الاجتماعية و
 Permission93=حذف المساهمات الاجتماعية وضريبة القيمة المضافة
 Permission94=تصدير المساهمات الاجتماعية
 Permission95=قراءة تقارير
-Permission96=ارسال الإعداد
-Permission97=قراءة ارسال الفواتير والمحاسبة
-Permission98=ارسال الفاتورة 'sخطوط المحاسبة
 Permission101=قراءة الإرسال
 Permission102=إنشاء / تعديل الإرسال
 Permission104=صحة الإرسال
@@ -603,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=إنشاء / تغيير المورد أوامر
@@ -668,7 +679,7 @@ Permission300=شريط قراءة المدونات
 Permission301=إنشاء / تغيير شريط الرموز
 Permission302=حذف شريط الرموز
 Permission311=قراءة الخدمات
-Permission312=إسناد عقود الخدمة
+Permission312=Assign service/subscription to contract
 Permission331=قراءة العناوين
 Permission332=إنشاء / تغيير العناوين
 Permission333=حذف العناوين
@@ -698,8 +709,8 @@ Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
 Permission1001=قراءة مخزونات
-Permission1002=إنشاء / تغيير المخزونات
-Permission1003=حذف الأرصدة
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=قراءة تحركات الأسهم
 Permission1005=إنشاء / تعديل تحركات الأسهم
 Permission1101=قراءة تسليم أوامر
@@ -775,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
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليم
 DefaultLanguage=اللغة الافتراضية لاستخدام (شفرة اللغة)
 EnableMultilangInterface=تتيح واجهة متعددة اللغات
 EnableShowLogo=عرض الشعار على اليسار القائمة
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=النظام الخاص بك تم تحديث بنجاح
 CompanyInfo=الشركة / المؤسسة المعلومات
 CompanyIds=الشركة / المؤسسة الهويات
@@ -1035,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.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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=علامة مائية على مشروع الوثيقة
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=المهنية معرف فريد
 MustBeUnique=يجب أن تكون فريدة من نوعها؟
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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=أوامر الترقيم نمائط
@@ -1142,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 <br> <b>٪ ٪ 1 $ ق</b> qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé <br> <b>٪ ٪</b> 2 $ <b>ق</b> qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre) <br> <b>٪ ٪ ل 3</b> دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur) <br> <b>٪ ٪</b> 4 <b>$</b> ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur).
@@ -1154,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
@@ -1318,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=خدمات وحدة الإعداد
@@ -1378,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=ارسال استلام نموذج
@@ -1408,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=شجرة القوائم
@@ -1474,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 على القائمة اليمنى.
@@ -1531,5 +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 1f4627f4503..0e6094546d3 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=رمز الحدث
 Actions=الأحداث
 ActionsArea=منطقة الأحداث (الأنشطة و المهام)
-Agenda= جدول الأعمال
-Agendas= جداول الأعمال
-Calendar= التقويم
-Calendars= التقاويم
-LocalAgenda=تقويم محلي
-AffectedTo= مناط لـ
-DoneBy= أنهي بواسطة
-Events= الأحداث
+Agenda=جدول الأعمال
+Agendas=جداول الأعمال
+Calendar=التقويم
+Calendars=التقاويم
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=مناط لـ
+DoneBy=أنهي بواسطة
+Event=Event
+Events=الأحداث
 EventsNb=عدد الأحداث
 MyEvents=الأحداث الخاصة بي
 OtherEvents=الأحداث الأخرى
@@ -17,31 +19,33 @@ ListOfActions=قائمة الأحداث
 Location=الموقع
 EventOnFullDay=الأحداث في كامل اليوم (أيام)
 SearchAnAction= البحث عن حدث/ مهمة
-MenuToDoActions= جميع الأحداث الغير مكتملة
-MenuDoneActions= جميع الأحداث الملغية
-MenuToDoMyActions= أحداثي الغير مكتملة
-MenuDoneMyActions= أحداثي الملغاة
-ListOfEvents= قائمة أحداث دوليبار
+MenuToDoActions=جميع الأحداث الغير مكتملة
+MenuDoneActions=جميع الأحداث الملغية
+MenuToDoMyActions=أحداثي الغير مكتملة
+MenuDoneMyActions=أحداثي الملغاة
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=أحداث تم رعايتها بواسطة
 ActionsToDoBy=أحداث عينت لـ
 ActionsDoneBy=أحداث انهيت بواسطة
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= كل أحداثي/ مهامي
 AllActions= جميع الأحداث / المهام
 ViewList=عرض قائمة
 ViewCal=عرض شهري
 ViewDay=عرض يومي
 ViewWeek=عرض اسبوعي
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= قم بالعرض مع الفلاتر المعرفة مسبقاً
 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 من الطلب
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=تم الموافقة على %s من الطلب
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة
 OrderCanceledInDolibarr=تم إلغاء %s من الطلب
-InterventionValidatedInDolibarr=تم توثيق %s من التدخل
 ProposalSentByEMail=تم إرسال العرض الرسمي %s بواسطة البريد الإلكتروني
 OrderSentByEMail=تم إرسال طلبية العميل %s بواسطة البريد الإلكتروني
 InvoiceSentByEMail=تم إرسال فاتروة العميل %s بواسطة البريد الإلكتروني
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=تم إرسال طلبية المزود %s بواسطة
 SupplierInvoiceSentByEMail=تم إرسال فاتروة المزود%s بواسطة البريد الإلكتروني
 ShippingSentByEMail=تم إرسال الشحنة %s بواسطة البريد الإلكتروني
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=تم إرسال التدخل %s بواسطة البريد الإلكتروني
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= تم إنشاء طرف ثالث أو خارجي
 DateActionPlannedStart= التاريخ المخطط للبدء
 DateActionPlannedEnd= التاريخ المخطط للإنهاء
@@ -68,19 +69,24 @@ DateActionStart= تاريخ البدء
 DateActionEnd= تاريخ النهاية
 AgendaUrlOptions1=يمكنك أيضا إضافة المعايير التالية لترشيح النتائج:
 AgendaUrlOptions2=<b>login=<b>login=%s</b> لتقييد الانتاج المنشأ أو الذي تم الإنتهاء منه بواسطة المستخدم <b>%s</b>
-AgendaUrlOptions3=<b>logina=<b>logina=%s</b> لتقييد الانتاج للإجراءات التي أنشأها المستخدم <b>%s</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=<b>logint=%s</b> لتقييد الانتاج للإجراءات المناطة للمستخدم <b>%s</b>
-AgendaUrlOptions5=<b>logind=<b>logind=%s</b> لتقييد الانتاج للإجراءات التي قام بها المستخدم <b>%s</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=أظهر تاريخ الميلاد في عناوين الإتصال
 AgendaHideBirthdayEvents=أخفي تاريخ الميلاد في عناوين الإتصال
 Busy=مشغول
 ExportDataset_event1=قائمة الأحداث في جدول الأعمال
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=تصدير التقويم
 ExtSites=استيراد التقويمات الخارجية
-ExtSitesEnableThisTool=عرض التقويمات الخارجية في جدول الأعمال
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=عدد التقاويم
 AgendaExtNb=رقم التقويم %s
 ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical
 ExtSiteNoLabel=لا يوجد وصف
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 2e011acd4bc..828582f7b39 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=علما الائتمان
 InvoiceAvoirAsk=علما الائتمان لتصحيح الفاتورة
 InvoiceAvoirDesc=<b>الفضل</b> في <b>المذكرة</b> سلبية الفاتورة تستخدم لحل كون فاتورة بمبلغ قد يختلف عن المبلغ المدفوع فعلا (لأنه دفع الكثير من العملاء عن طريق الخطأ ، أو لن تدفع بالكامل منذ عودته لبعض المنتجات على سبيل المثال).
 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=بعبارة فاتورة ق ٪
@@ -85,8 +85,9 @@ ClassifyPaid=تصنيف 'مدفوع'
 ClassifyPaidPartially=تصنيف 'مدفوع جزئيا'
 ClassifyCanceled=تصنيف 'المهجورة'
 ClassifyClosed=تصنيف 'مغلقة'
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=إنشاء الفاتورة
-AddBill=تضيف المذكرة الائتمان أو فاتورة
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=شطب فاتورة
 SearchACustomerInvoice=البحث عن زبون فاتورة
@@ -98,7 +99,7 @@ DoPaymentBack=هل لدفع الظهر
 ConvertToReduc=تحويل الخصم في المستقبل
 EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
 EnterPaymentDueToCustomer=من المقرر أن يسدد العميل
-DisabledBecauseRemainderToPayIsZero=لأن بقية المعوقين الدفع صفر
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=مبلغ
 PriceBase=سعر الأساس
 BillStatus=حالة الفاتورة
@@ -136,8 +137,6 @@ BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
 NewBill=فاتورة جديدة
-Prélèvements=من أجل الوقوف
-Prélèvements=من أجل الوقوف
 LastBills=آخر الفواتير ق ٪
 LastCustomersBills=٪ ق الماضي فواتير العملاء
 LastSuppliersBills=٪ ق الماضي فواتير الموردين
@@ -155,9 +154,9 @@ ConfirmCancelBill=هل أنت متأكد من أنك تريد إلغاء الف
 ConfirmCancelBillQuestion=لماذا تريدها لتصنيف هذه الفاتورة 'المهجورة؟
 ConfirmClassifyPaidPartially=هل أنت متأكد من أنك تريد تغيير فاتورة <b>٪ ق</b> لمركز paid؟
 ConfirmClassifyPaidPartiallyQuestion=هذه الفاتورة لم تدفع بالكامل. ما هي أسباب قريبة لك هذه الفاتورة؟
-ConfirmClassifyPaidPartiallyReasonAvoir=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا مع تصحيح وضع ضريبة القيمة المضافة علما ائتمان.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. إنني أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=دفع ما تبقى <b>(٪ ق ٪)</b> هي الخصم الممنوح لدفع مبلغ من قبل. أنا استرداد ضريبة القيمة المضافة على هذا الائتمان والخصم من دون ملاحظة.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=العملاء سيئة
 ConfirmClassifyPaidPartiallyReasonProductReturned=المنتجات عاد جزئيا
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
@@ -190,15 +189,15 @@ 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=تلقى الزائدة
 EscompteOffered=عرض الخصم (الدفع قبل الأجل)
-SendBillRef=ارسال الفاتورة ٪ ق
-SendReminderBillRef=ارسال الفاتورة ٪ ق (تذكرة)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=أوامر دائمة
 StandingOrder=من أجل الوقوف
 NoDraftBills=أي مشروع الفواتير
@@ -218,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=قائمة العملاء والفواتير والفواتير 'خطوط
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=مجموعه جديدتين الخصم يج
 ConfirmRemoveDiscount=هل أنت متأكد من أنك تريد إزالة هذا الخصم؟
 RelatedBill=الفاتورة ذات الصلة
 RelatedBills=الفواتير ذات الصلة
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=فورا
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index c6ab978cf3f..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index fdc2a6d6f3c..0646bcd465e 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=يجب إنشاء رسائل البريد الإلكت
 ListSuppliersShort=قائمة الموردين
 ListProspectsShort=قائمة التوقعات
 ListCustomersShort=قائمة العملاء
-ThirdPartiesArea=أطراف ثالثة منطقة
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=%s آخر تعديل لأطراف ثالثة
 UniqueThirdParties=مجموع الأطراف الثالثة فريدة من نوعها
 InActivity=فتح
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=عودة número مع الشكل nnnn - ٪ syymm الزبون ورمز وnnnn - ٪ syymm مورد للقانون حيث السنة هو السنة ، هو شهر ملم وnnnn هو تسلسل بلا كسر وعدم العودة إلى 0.
 LeopardNumRefModelDesc=العميل / المورد مدونة مجانية. هذا القانون يمكن تعديلها في أي وقت.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 2d307a8aefc..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=تهيئة لتلقي الودائع على حساب : ٪ ق
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 ff07f971de5..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=هدية الوعد
@@ -30,3 +30,9 @@ SearchADonation=البحث تبرع
 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 72a5ebe58ba..670c99a851a 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=رمز المورد المطلوب
 ErrorSupplierCodeAlreadyUsed=الشفرة المستخدمة بالفعل مورد
 ErrorBadParameters=بارامترات سيئة
 ErrorBadValueForParameter=قيمة خاطئة &quot;%s 'ل' %s&quot; المعلمة غير صحيحة
-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=لا يستطيع المستخدم الدخول مع <b>
 ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية.
 ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة أخرى مع القيمة الجديدة ...
 ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%s لا تكون سلبية
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index 2180c759d68..0ef10b99cea 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=رقم الحساب
 BankAccountNumberKey=مفتاح
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 92137c9150a..0e453b01075 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=تاريخ البدء
 DateFinCP=نهاية التاريخ
@@ -18,24 +18,24 @@ ApprovedCP=وافق
 CancelCP=ألغيت
 RefuseCP=رفض
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=وصف
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=تحرير
 DeleteCP=حذف
 ActionValidCP=صحة
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=الغاء
 StatutCP=حالة
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=تحديث
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=سبب
 UserCP=مستخدم
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=صحة
 UpdateEventCP=Update events
 CreateEventCP=خلق
@@ -127,23 +126,23 @@ UpdateEventOptionCP=تحديث
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 66d8331e72f..b1a63938f44 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -25,14 +25,14 @@ ErrorGoBackAndCorrectParameters=العودة إلى الوراء وتصحيح ا
 ErrorWrongValueForParameter=قد تكون لديكم مطبوعة خاطئة قيمة معلمة '٪ ق.
 ErrorFailedToCreateDatabase=فشل إنشاء قاعدة بيانات '٪ ق.
 ErrorFailedToConnectToDatabase=فشل في الاتصال بقاعدة البيانات '٪ ق.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
+ErrorDatabaseVersionTooLow=إصدار قاعدة البيانات  (s%) قديمة جدا. مطلوب نسخة s% أو أعلى
 ErrorPHPVersionTooLow=PHP نسخة قديمة جدا. النسخة ٪ ق هو مطلوب.
 WarningPHPVersionTooLow=PHP نسخة قديمة جدا. ومن المتوقع %s نسخة أو أكثر. وينبغي أن تسمح هذه النسخة تثبيت ولكن لم يتم اعتماد.
 ErrorConnectedButDatabaseNotFound=خادم الصدد الى قاعدة البيانات ولكن النجاح في '٪ ق' لم يتم العثور عليه.
 ErrorDatabaseAlreadyExists=قاعدة البيانات '٪ ق' موجود بالفعل.
 IfDatabaseNotExistsGoBackAndUncheckCreate=إذا كان لا وجود قاعدة بيانات ، والتأكد من العودة الخيار "إنشاء قاعدة بيانات".
 IfDatabaseExistsGoBackAndCheckCreate=إذا كانت قاعدة البيانات موجود بالفعل ، من العودة وإلغاء "إنشاء قاعدة بيانات" الخيار.
-WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
+WarningBrowserTooOld=نسخة قديمة جدا من المتصفح. ننصحك جيدا بترقية متصفحك إلى نسخة حديثة عن فايرفوكس، كروم أو أوبرا
 PHPVersion=PHP الإصدار
 YouCanContinue=يمكنك الاستمرار...
 PleaseBePatient=يرجى التحلي بالصبر...
@@ -154,7 +154,7 @@ MigrationShippingDelivery2=ترقية تخزين الشحن 2
 MigrationFinished=الانتهاء من الهجرة
 LastStepDesc=<strong>الخطوة الأخيرة</strong> : تعريف المستخدم وكلمة السر هنا كنت تخطط لاستخدامها للاتصال البرمجيات. لا تفقد هذا كما هو حساب لإدارة جميع الآخرين.
 ActivateModule=تفعيل وحدة %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
 
 #########
 # upgrade
@@ -205,7 +205,7 @@ MigrationProjectUserResp=بيانات fk_user_resp مجال الهجرة من ll
 MigrationProjectTaskTime=تحديث الوقت الذي يقضيه في ثوان
 MigrationActioncommElement=تحديث البيانات على الإجراءات
 MigrationPaymentMode=بيانات الهجرة لطريقة الدفع
-MigrationCategorieAssociation=Migration of categories
+MigrationCategorieAssociation=تحديث الفئات
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=عرض خيارات غير متوفرة
+HideNotAvailableOptions=إخفاء خيارات غير متوفرة
diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
index 2706a96f71d..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=إجراءات على التدخل
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=هل أنت متأكد من أنك تريد حذف
 NameAndSignatureOfInternalContact=الاسم والتوقيع على التدخل :
 NameAndSignatureOfExternalContact=اسم وتوقيع العميل :
 DocumentModelStandard=نموذج وثيقة موحدة للتدخلات
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=تصنيف &quot;وصفت&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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=التدخل
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=عدد نموذج عامة
 ArcticNumRefModelError=فشل لتفعيل
 PacificNumRefModelDesc1=عودة número مع الشكل nnnn - ٪ syymm فيها السنة هي السنة ، هو شهر ملم وnnnn هو كسر التسلسل وليس هناك عودة لل0
 PacificNumRefModelError=تدخل البطاقة ابتداء من دولار ويوجد بالفعل syymm لا تتفق مع هذا النموذج من التسلسل. إزالة أو تغيير تسميتها لتصبح لتفعيل هذه الوحدة.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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<br/>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=أن يسدد الاشتراك باستخدام حوالة مصرفية، راجع صفحة <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> الدفع باستخدام بطاقة ائتمان أو باي بال، وانقر على زر في أسفل هذه الصفحة. <br>
-# 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=هل أنت متأكد أنك تريد استعادة <b>
 ConfirmCancelOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟
 ConfirmMakeOrder=هل أنت متأكد من أن يؤكد لك هذا النظام على <b>٪ ق؟</b>
 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=ويكرس هذا المجال لمجموعة الأدوات المتنوعة التي لم تتوفر في إدخالات القوائم الأخرى. <br><br> ويمكن الوصول إلى هذه الأدوات من القائمة على الجانب.
 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 5a9f39c9058..49d6fff5689 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=مغلقة
 ContractStatusRunning=على التوالي
 ContractStatusExpired=انتهى
 ContractStatusOnHold=لا تعمل
-ContractStatusToRun=ألف mettre én الخدمة
+ContractStatusToRun=To get running
 ContractNotRunning=هذا العقد لا تعمل
 ErrorProductAlreadyExists=منتج مع الإشارة ٪ ق موجود بالفعل.
 ErrorProductBadRefOrLabel=قيمة خاطئة لإشارة أو علامة.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=الموردين
 SupplierRef=المرجع المورد.
 ShowProduct=وتظهر المنتج
@@ -116,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=الكلمة الرئيسية فلتر
@@ -131,7 +132,7 @@ AddDel=إضافة / حذف
 Quantity=الكمية
 NoMatchFound=العثور على أي مباراة
 ProductAssociationList=قائمة المنتجات المتعلقة / الخدمات : اسم المنتج / الخدمة (الكمية المتضررة)
-ProductParentList=قائمة من المنتجات / الخدمات مع هذا المنتج كعنصر
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
 DeleteProduct=حذف المنتجات / الخدمات
 ConfirmDeleteProduct=هل أنت متأكد من حذف هذه المنتجات / الخدمات؟
@@ -178,7 +179,7 @@ CloneProduct=استنساخ المنتجات أو الخدمات
 ConfirmCloneProduct=هل أنت متأكد من أن المنتج أو الخدمة استنساخ <b>٪ ق؟</b>
 CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات
 ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=ويستخدم هذا المنتج
 NewRefForClone=المرجع. من المنتجات الجديدة / خدمة
 CustomerPrices=أسعار العملاء
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 00deba271f8..26d051445c3 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (
 Myprojects=بلدي المشاريع
 ProjectsArea=مشاريع المنطقة
 NewProject=مشروع جديد
-AddProject=يضيف المشروع
+AddProject=إنشاء مشروع
 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=خلق مهمة
 AddDuration=تضاف المدة
 Activity=النشاط
 Activities=المهام والأنشطة
@@ -85,18 +87,18 @@ ActionsOnProject=الإجراءات على المشروع
 YouAreNotContactOfProject=كنت لا اتصال لهذا المشروع الخاص
 DeleteATimeSpent=قضى الوقت حذف
 ConfirmDeleteATimeSpent=هل أنت متأكد أنك تريد حذف هذا الوقت الذي يقضيه؟
-DoNotShowMyTasksOnly=أنا لم تتأثر وانظر أيضا إلى المهام ط
-ShowMyTasksOnly=أنا تأثرت المهام عرض فقط الأول
+DoNotShowMyTasksOnly=انظر أيضا المهام  الغير موكلة الي
+ShowMyTasksOnly=عرض فقط المهام الموكلة الي
 TaskRessourceLinks=ملتقيات
 ProjectsDedicatedToThisThirdParty=مشاريع مخصصة لهذا الطرف الثالث
 NoTasks=أية مهام لهذا المشروع
 LinkedToAnotherCompany=ربط طرف ثالث آخر
-TaskIsNotAffectedToYou=مهمة لم تخصص لك
+TaskIsNotAffectedToYou=مهمة غيرموكلة اليك
 ErrorTimeSpentIsEmpty=الوقت الذي يقضيه فارغة
 ThisWillAlsoRemoveTasks=وهذا العمل أيضا حذف كافة مهام المشروع <b>(%s</b> المهام في الوقت الحاضر) وجميع المدخلات من الوقت الذي تستغرقه.
 IfNeedToUseOhterObjectKeepEmpty=إذا كانت بعض الكائنات (فاتورة، والنظام، ...)، الذين ينتمون إلى طرف ثالث آخر، يجب أن تكون مرتبطة بمشروع لإنشاء، والحفاظ على هذا فارغة لديها مشروع كونها متعددة الأطراف الثالثة.
-CloneProject=Clone project
-CloneTasks=Clone tasks
+CloneProject=استنساخ المشروع
+CloneTasks=استنساخ المهام
 CloneContacts=Clone contacts
 CloneNotes=Clone notes
 CloneProjectFiles=Clone project joined files
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=وهناك مشروع كامل لنموذج التقرير (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 01d5a37350a..8821b3f6aca 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=ق الماضي ٪ الإرسال
 SearchASending=البحث المرسلة
 StatisticsOfSendings=إحصاءات الإرسال
 NbOfSendings=عدد الإرسال
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=إرسال بطاقة
 NewSending=ارسال جديدة
 CreateASending=خلق إرسال
@@ -50,27 +50,31 @@ Enlevement=حصلت من قبل العميل
 DocumentModelSimple=وثيقة نموذج بسيط
 DocumentModelMerou=Mérou A5 نموذج
 WarningNoQtyLeftToSend=تحذير ، لا تنتظر أن المنتجات المشحونة.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=مسطح تاريخ التسليم
 DateReceived=تلقى تاريخ التسليم
 SendShippingByEMail=ارسال شحنة عن طريق البريد الالكتروني
-SendShippingRef=ارسال شحنة %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=الأحداث على شحنة
 LinkToTrackYourPackage=رابط لتتبع الحزمة الخاصة بك
 ShipmentCreationIsDoneFromOrder=لحظة، ويتم إنشاء لشحنة جديدة من أجل بطاقة.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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=القبض على العملاء
 SendingMethodTRANS=نقل
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=نموذج بسيط لتسليم وثيقة من وثائق وإيصالات
 DocumentModelTyphon=أكمل نموذج لتسليم وثيقة من وثائق الإيصالات (logo...)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت لم تحدد
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/ar_SA/shop.lang b/htdocs/langs/ar_SA/shop.lang
deleted file mode 100644
index 4127cac2321..00000000000
--- a/htdocs/langs/ar_SA/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=متجر
-ShopWeb=تسوق على الإنترنت
-LastOrders=أوامر الماضي
-OnStandBy=على اهبة الاستعداد
-TreatmentInProgress=التقدم في العلاج
-LastCustomers=آخر الزبائن
-OSCommerceShop=OSCommerce متجر
-OSCommerce=OSCommerce
-AddProd=بيع على الانترنت
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/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index a8ace63c1b1..716337242f6 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=من أجل التاريخ
 BuyingPrice=سعر الشراء
 BuyingPriceMin=الحد الأدنى من سعر الشراء
 BuyingPriceMinShort=يوجد سعر الشراء
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=إضافة مورد الأسعار
 ChangeSupplierPrice=تغيير سعر المورد
 ErrorQtyTooLowForThisSupplier=كمية منخفضة جدا لهذا المورد أو لا يعرف سعر هذا المنتج لهذا المورد
@@ -27,7 +27,7 @@ RefSupplierShort=المرجع. المورد
 Availability=توفر
 ExportDataset_fournisseur_1=قائمة فواتير الموردين والفواتير 'خطوط
 ExportDataset_fournisseur_2=فواتير الموردين والمدفوعات
-# ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=الموافقة على هذا النظام
 ConfirmApproveThisOrder=هل أنت متأكد من أن يوافق على هذا الأمر؟
 DenyingThisOrder=ونفى هذا الأمر
@@ -39,4 +39,6 @@ AddSupplierOrder=من أجل خلق مورد
 AddSupplierInvoice=خلق مورد فاتورة
 ListOfSupplierProductForSupplier=قائمة المنتجات والأسعار لمورد <b>ق ٪</b>
 NoneOrBatchFileNeverRan=أو لا شيء دفعة <b>٪ ق</b> لا يتعارض مؤخرا
-# SentToSuppliers=Sent to suppliers
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
index f1f5c2fdca2..a0e4ca8661a 100644
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=رحلة
 ListTripsAndExpenses=قائمة الرحلات والمصاريف
 ExpensesArea=رحلات ومنطقة النفقات
 SearchATripAndExpense=بحث عن رحلة والنفقات
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..56ea784ecdf
--- /dev/null
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -0,0 +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=Инструменти
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Отчети
+ByCustomerInvoice=By invoices customers
+ByMonth=По месец
+NewAccount=New accounting account
+Update=Update
+List=Списък
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=Разделител 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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Тип на документа
+Docdate=Дата
+Docref=Справка
+Numerocompte=Сметка
+Code_tiers=Трета страна
+Labelcompte=Етикет на сметка
+Debit=Дебит
+Credit=Кредит
+Amount=Сума
+Sens=Sens
+Codejournal=Дневник
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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=Валидирайте автоматично
+
+ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 891417d5a22..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 за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
+ConfirmLockNewSessions=Сигурни ли сте, че желаете да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
 UnlockNewSessions=Разрешаване на свързването
 YourSession=Вашата сесия
 Sessions=Потребителска сесия
@@ -42,18 +42,22 @@ RestoreLock=Възстановете файла <b>%s,</b> само с прав
 SecuritySetup=Настройки на сигурността
 ErrorModuleRequirePHPVersion=Грешка, този модул изисква PHP версия %s или по-висока
 ErrorModuleRequireDolibarrVersion=Грешка, този модул изисква Dolibarr версия %s или по-висока
-ErrorDecimalLargerThanAreForbidden=Грешка, с точност по-висока от <b>%s</b> не се поддържа.
+ErrorDecimalLargerThanAreForbidden=Грешка, точност по-висока от <b>%s</b> не се поддържа.
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
-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)
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+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=Показване на пълните събития дати в третия лист
@@ -68,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 <b>%s,</b> независимо от стойността на този параметър е
+MustBeLowerThanPHPLimit=Забележка: PHP ограничава размера на всяко качване на файлове на <b>%s</b> %s, независимо от стойността на този параметър е
 NoMaxSizeByPHPLimit=Забележка: Не срокът се определя в конфигурацията на вашия PHP
 MaxSizeForUploadedFiles=Максимален размер за качените файлове (0 за да забраните качване)
 UseCaptchaCode=Използвайте графичен код (CAPTCHA) на страницата за вход
@@ -116,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=Ред
+PositionByDefault=Default order
+Position=Длъжност
 MenusDesc=Менюта мениджърите определят съдържанието на две ленти с менюта (хоризонтална лента и вертикална лента).
 MenusEditorDesc=Менюто редактор ви позволяват да определите персонализирани вписвания в менютата. Използвайте го внимателно, за да се избегне dolibarr нестабилна и записи в менюто постоянно недостижим. <br> Някои модули добавяне на записи в менютата (в менюто <b>Всички</b> в повечето случаи). Ако сте премахнали някои от тези записи по погрешка, можете да ги възстановите, като изключите и отново да активирате модула.
 MenuForUsers=Меню за потребители
-LangFile=.lang file
+LangFile=.lang файл
 System=Система
 SystemInfo=Системна информация
 SystemTools=Системни инструменти
@@ -169,7 +173,7 @@ ImportMethod=Внос метод
 ToBuildBackupFileClickHere=За изграждането на резервно копие на файла, натиснете <a href="%s">тук</a> .
 ImportMySqlDesc=За да импортирате архивния файл, трябва да използвате MySQL команда от командния ред:
 ImportPostgreSqlDesc=За да импортирате архивния файл, трябва да използвате pg_restore команда от командния ред:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Име на генерирания файл
 Compression=Компресия
@@ -206,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=Изходният файл
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Автоматично Ако Javascript е деа
 AvailableOnlyIfJavascriptNotDisabled=Предлага се само ако JavaScript не е забранен
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Предлага се само ако JavaScript не е забранен
 Required=Задължително
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Сигурност
 Passwords=Пароли
 DoNotStoreClearPassword=Да не се магазин ясни пароли в базата данни, но се съхранява само криптирана стойност (Активира се препоръчва)
@@ -235,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, често задавани въпроси ...), <br> можете да намерите в Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Хост (Не дефи
 MAIN_MAIL_EMAIL_FROM=Подател за автоматични имейли (По подразбиране в php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender електронна поща се използва за грешка връща имейли изпратени
 MAIN_MAIL_AUTOCOPY_TO= Изпрати систематично скрит въглероден копие на всички изпратени имейли
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Изключване на всички имейли sendings (за тестови цели или демонстрации)
 MAIN_MAIL_SENDMODE=Метод за изпращане на имейли
 MAIN_MAIL_SMTPS_ID=SMTP ID, ако разпознаване, изискван
@@ -277,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).
@@ -296,7 +305,7 @@ CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Отидете на страницата, която се актуализира структурата на базата данни и презареждане на: %s.
 LastStableVersion=Последна стабилна версия
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> клиентския код в знака n <br><b>{cccc000}</b>клиентския код в знак n се следва от брояч предназначен за клиента. Този брояч предназначен за клиента се нулира в същото време в което и глобалния брояч.<br><b>{tttt}</b> Кодът на типа трети страни в знака n (погледнете речник-типове трети страни).<br>
 GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
 GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Пример за трета страна е създаден на 2007-03-01:</u> <br>
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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=Управление на дарения
-Module800Name=OSCommerce чрез директен достъп до базата данни
-Module800Desc=Интерфейс, за да покаже OSCommerce или OSCSS магазин чрез пряк достъп до базата данни
-Module900Name=OSCommerce от WS
-Module900Desc=Интерфейс, за да покаже OSCommerce магазин чрез уеб услуги. Този модул ви requiere да инсталирате компоненти от / oscommerce_ws / ws_server във вашия OSCommerce сървър. Вижте README файл в / oscommerce_ws / ws_server.
 Module1200Name=Богомолка
 Module1200Desc=Mantis интеграция
 Module1400Name=Счетоводство
@@ -493,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=Дневен ред
@@ -501,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 Клиент
@@ -512,16 +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 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=Полета
@@ -575,9 +588,6 @@ Permission92=Създаване / промяна на социалните вн
 Permission93=Изтриване на социалноосигурителните вноски и ДДС
 Permission94=Експортиране на социалноосигурителните вноски
 Permission95=Прочети доклада
-Permission96=Настройка на експедиция
-Permission97=Фактура за счетоводството експедиция
-Permission98=Изпращането фактура линии счетоводни
 Permission101=Прочети sendings
 Permission102=Създаване / промяна sendings
 Permission104=Проверка на sendings
@@ -603,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=Създаване / промяна на доставчика поръчки
@@ -668,7 +679,7 @@ Permission300=Баркодове
 Permission301=Създаване / промяна на баркодове
 Permission302=Изтриване на баркодове
 Permission311=Прочети услуги
-Permission312=Присвояване услуга за сключване на договор
+Permission312=Assign service/subscription to contract
 Permission331=Прочетете отметките
 Permission332=Създаване / промяна на отметки
 Permission333=Изтриване на отметки
@@ -698,8 +709,8 @@ Permission701=Прочети дарения
 Permission702=Създаване / промяна на дарения
 Permission703=Изтриване на дарения
 Permission1001=Прочети запаси
-Permission1002=Създаване / промяна на запасите
-Permission1003=Изтриване на запасите
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Движението на стоковите наличности
 Permission1005=Създаване / промяна на движението на стоковите наличности
 Permission1101=Поръчките за доставка
@@ -775,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
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=Постоянна форма за търсене в л
 DefaultLanguage=Език по подразбиране (код на езика)
 EnableMultilangInterface=Разрешаване на многоезичен интерфейс
 EnableShowLogo=Показване на логото в лявото меню
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Вашата система е актуализиран успешно
 CompanyInfo=Информация за фирмата/организацията
 CompanyIds=Идентичност на фирмата/организацията
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Връщане счетоводна код, постр
 ModuleCompanyCodePanicum=Връща празна код счетоводство.
 ModuleCompanyCodeDigitaria=Счетоводството код зависи от код на трето лице. Код се състои от буквата &quot;C&quot; на първа позиция, следван от първите 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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=Воден знак върху проект на документ
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Професионална Id уникален
 MustBeUnique=Трябва да е уникален?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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=Поръчки номериране модули
@@ -1142,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, можете да използвате маркери <br> <b>__PHONETO__,</b> Които ще бъдат заменени с телефонния номер на лицето, да се обадите <br> <b>__PHONEFROM__,</b> Че ще бъде заменен с телефонния номер на повикващата лице (твое) <br> <b>__LOGIN__,</b> Които ще бъдат заменени с clicktodial вход (определено на вашето потребителско карта) <br> <b>__PASS__,</b> Които ще бъдат заменени с clicktodial вашата парола (определено на вашето потребителско карта).
@@ -1154,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
@@ -1318,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=Услуги модул за настройка
@@ -1378,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=Изпращане получаване модел
@@ -1408,8 +1424,9 @@ OSCommerceTestOk=Връзка към &quot;%s&quot; сървър на &quot;%s&q
 OSCommerceTestKo1=Свързване към сървър &quot;%s успее, но база данни&quot; %s &quot;не може да бъде постигнато.
 OSCommerceTestKo2=Връзка към сървъра &quot;%s&quot; с потребителя %s &quot;се провали.
 ##### 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 менюта
@@ -1474,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 или външни уеб сайтове в лявото меню.
@@ -1531,5 +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 b5c229691ab..6affd27cc53 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID на събитие
 Actions=Събития
 ActionsArea=Събития (дейности и задачи)
-Agenda= Дневен ред
-Agendas= Дневен ред
-Calendar= Календар
-Calendars= Календари
-LocalAgenda=Локален календар
-AffectedTo= Възложено на
-DoneBy= Извършено от
-Events= Събития
+Agenda=Дневен ред
+Agendas=Дневен ред
+Calendar=Календар
+Calendars=Календари
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Възложено на
+DoneBy=Извършено от
+Event=Event
+Events=Събития
 EventsNb=Брой събития
 MyEvents=Моите събития
 OtherEvents=Други събития
@@ -17,31 +19,33 @@ ListOfActions=Списък на събитията
 Location=Място
 EventOnFullDay=Събитие по цял ден (дни)
 SearchAnAction= Търсене на събитие/задача
-MenuToDoActions= Всички незавършени събития
-MenuDoneActions= Всички прекратени събития
-MenuToDoMyActions= Моите незавършени събития
-MenuDoneMyActions= Моите прекратени събития
-ListOfEvents= Списък на Dolibarr събитията
+MenuToDoActions=Всички незавършени събития
+MenuDoneActions=Всички прекратени събития
+MenuToDoMyActions=Моите незавършени събития
+MenuDoneMyActions=Моите прекратени събития
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Събития създадени от
 ActionsToDoBy=Събития възложени на
 ActionsDoneBy=Събития извършени от
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Всички мои събития/задачи
 AllActions= Всички събития/задачи
 ViewList=Списъчен изглед
 ViewCal=Месечен изглед
 ViewDay=Дневен изглед
 ViewWeek=Седмичен изглед
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Изглед с предварително дефинирани филтри
 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 валидирани
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=Поръчка %s одобрен
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова
 OrderCanceledInDolibarr=Поръчка %s отменен
-InterventionValidatedInDolibarr=Намеса %s валидирани
 ProposalSentByEMail=Търговски %s предложението, изпратено по електронна поща
 OrderSentByEMail=, Изпратени по електронната поща %s поръчка на клиента
 InvoiceSentByEMail=, Изпратени по електронната поща %s клиенти фактура
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=%s доставчик реда, изпратени по
 SupplierInvoiceSentByEMail=, Изпратени по електронната поща %s доставчик фактура
 ShippingSentByEMail=Доставка %s изпращат по електронна поща
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Намеса %s изпращат по електронна поща
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Създадено от трета страна
 DateActionPlannedStart= Планирана начална дата
 DateActionPlannedEnd= Планирана крайна дата
@@ -68,19 +69,24 @@ DateActionStart= Начална дата
 DateActionEnd= Крайна дата
 AgendaUrlOptions1=Можете да добавите и следните параметри, за да филтрирате изход:
 AgendaUrlOptions2=<b>вход = %s</b> да ограничи изход към действия, създадени от засегнати или направено от потребителя <b>%s.</b>
-AgendaUrlOptions3=<b>logina = %s</b> да се ограничи производството на действията, създадени от потребителя <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> да се ограничи производството на действията, засегнати на потребителските <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> да се ограничи производството за действия, извършени от потребителя <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Показване на контактите, които имат рожден ден
 AgendaHideBirthdayEvents=Скриване на контактите, които имат рожден ден
 Busy=Зает
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Изнасяне на календар
 ExtSites=Импортиране на външни календари
-ExtSitesEnableThisTool=Показване на външните календари в дневния ред
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Брой календари
 AgendaExtNb=Календар No %s
 ExtSiteUrlAgenda=URL адрес за достъп до файла .Ical
 ExtSiteNoLabel=Няма описание
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 02225ad012a..35f5d89a4cd 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Кредитно известие
 InvoiceAvoirAsk=Кредитно известие за коригиране на фактура
 InvoiceAvoirDesc=<b>Кредитно известие</b> е отрицателна фактура, използвани за решаване на факта, че фактурата е сумата, която се различава от сумата, наистина са платени (защото платил твърде много от грешка, или няма да се изплаща напълно, тъй като той се върна някои продукти, например).
 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
@@ -85,8 +85,9 @@ ClassifyPaid=Класифициране 'Платено'
 ClassifyPaidPartially=Класифициране 'Платено частично'
 ClassifyCanceled=Класифициране 'Изоставено'
 ClassifyClosed=Класифициране 'Затворено'
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Създаване на фактура
-AddBill=Добави фактура или кредитно известие
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=Изтриване на фактура
 SearchACustomerInvoice=Търсене за клиент фактура
@@ -98,7 +99,7 @@ DoPaymentBack=Направете плащане със задна дата
 ConvertToReduc=Конвертиране в бъдеще отстъпка
 EnterPaymentReceivedFromCustomer=Въведете получено плащане от клиент
 EnterPaymentDueToCustomer=Дължимото плащане на клиента
-DisabledBecauseRemainderToPayIsZero=Хора с увреждания, тъй като остатъка за плащане е равна на нула
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Размер
 PriceBase=Цена база
 BillStatus=Състояние на фактурата
@@ -136,8 +137,6 @@ BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
 NewBill=Нова фактура
-Prélèvements=Постоянния цел
-Prélèvements=Постоянния цел
 LastBills=Последните %s фактури
 LastCustomersBills=Последните %s фактури на клиенти
 LastSuppliersBills=Последните %s фактури на доставчици
@@ -155,9 +154,9 @@ ConfirmCancelBill=Сигурен ли сте, че искате да отмен
 ConfirmCancelBillQuestion=Защо искате да класифицирате тази фактура като "изоставена"?
 ConfirmClassifyPaidPartially=Сигурен ли сте, че искате да промените фактура <b>%s</b> до статута на платен?
 ConfirmClassifyPaidPartiallyQuestion=Тази фактура не е платена изцяло. Какви са причините за да се затвори тази фактура?
-ConfirmClassifyPaidPartiallyReasonAvoir=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Нормализира ДДС кредитно известие.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Приемам да губят ДДС върху тази отстъпка.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Остатък за плащане <b>(%s %s)</b> е отстъпка, предоставена, тъй като плащането е направено преди термина. Възстановяване на ДДС върху тази отстъпка, без кредитно известие.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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=Сума, изоставен за друга причина
@@ -190,15 +189,15 @@ 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=Превишение получи
 EscompteOffered=Отстъпка предложи (плащане преди термина)
-SendBillRef=Изпрати фактура %s
-SendReminderBillRef=Изпрати фактура %s (напомняне)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Постоянните поръчки
 StandingOrder=Постоянния цел
 NoDraftBills=Няма тяга фактури
@@ -218,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=Фактури списък с клиенти и фактура линии
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Общо на две нови отстъп
 ConfirmRemoveDiscount=Сигурен ли сте, че искате да премахнете тази отстъпка?
 RelatedBill=Свързани фактура
 RelatedBills=Свързани фактури
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Непосредствен
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index efb25de5f9c..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 6ae8506a43d..e41800f668c 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Трябва да създадете контакти
 ListSuppliersShort=Списък на доставчиците
 ListProspectsShort=Списък на перспективите
 ListCustomersShort=Списък на клиенти
-ThirdPartiesArea=Трети страни област
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Последните %s променени трети страни
 UniqueThirdParties=Общо уникални трети страни
 InActivity=Отворен
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Връщане Numero с формат %syymm-NNNN за клиента код и %syymm-NNNN за доставчика код, където YY е годината, mm е месец и NNNN е последователност, без почивка и няма връщане назад до 0.
 LeopardNumRefModelDesc=Кодът е безплатно. Този код може да бъде променен по всяко време.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 92759e243bb..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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=Клониране на социално-осигурителни вноски
+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. <BR> For exemple to fetch method of Dol
 CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-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 941497a2fe7..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,3 +30,9 @@ SearchADonation=Търсене на дарение
 DonationRecipient=Получател на дарението
 ThankYou=Благодарим Ви!
 IConfirmDonationReception=Получателят декларира, че е получил дарение на стойност
+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 7c6113c9cb5..f75d1b490b1 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Доставчик изисква код
 ErrorSupplierCodeAlreadyUsed=Доставчик код вече се използва
 ErrorBadParameters=Лошите параметри
 ErrorBadValueForParameter=Грешна стойност &quot;%s&quot; за параметрите неправилни &quot;%s&quot;
-ErrorBadImageFormat=Image файла не е поддържан формат
+ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=&quot;%s&quot; Стойност има грешна дата формат
 ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Неуспех при запис в директорията %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Потребителя <b>%s</b> не е намерен.
 ErrorLoginHasNoEmail=Този потребител няма имейл адрес. Процес прекратено.
 ErrorBadValueForCode=Неправилна стойност за код за сигурност. Опитайте отново с нова стойност ...
 ErrorBothFieldCantBeNegative=Полетата %s и %s не може да бъде едновременно отрицателен
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Потребителски акаунт <b>%s</b> използват за извършване на уеб сървър не разполага с разрешение за това
 ErrorNoActivatedBarcode=Не е тип баркод активира
 ErrUnzipFails=Неуспех да разархивирате %s с ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Задължителни параметри на настройката все още не са определени
@@ -154,3 +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=Датата на плащане (%s) е по-ранна от датата на фактуриране (%s) за фактура %s.
+WarningTooManyDataPleaseUseMoreFilters=Твърде много данни. Моля, използвайте повече филтри
diff --git a/htdocs/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
index 1f07cbce94f..f15637ba35a 100644
--- a/htdocs/langs/bg_BG/exports.lang
+++ b/htdocs/langs/bg_BG/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Номер на сметка
 BankAccountNumberKey=Ключ
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 09d044b54ee..f3d9c9dcba9 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=ЧР
-Holidays=Отпуски
-CPTitreMenu=Отпуски
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Месечно извлечение
-MenuAddCP=Кандидатстване за отпуск
-NotActiveModCP=Трябва да вкючите модула за отпуски, за да видите тази страница.
-NotConfigModCP=Необходимо е да конфигурирате модула за отпуски за да видите тази страница. За да направите това, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> щтракнете тук </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Кандидатстване за отпуск
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Служител
 DateDebCP=Начална дата
 DateFinCP=Крайна дата
@@ -18,24 +18,24 @@ ApprovedCP=Утвърден
 CancelCP=Отменен
 RefuseCP=Отказ
 ValidatorCP=Утвърждаващ
-ListeCP=Списък на отпуски
+ListeCP=List of leaves
 ReviewedByCP=Ще бъде утвърден от
 DescCP=Описание
-SendRequestCP=Създаване на заявление за отпуск
-DelayToRequestCP=Заявлението за отпуск трябва да бъде подадено най-малко <b>%s ден(а),</b> преди началната му дата.
-MenuConfCP=Редактиране на баланса на отпуските
-UpdateAllCP=Актуализиране на отпуските
-SoldeCPUser=Баланса на отпуска е <b>%s</b> дни.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Трябва да изберете крайната дата, по-голяма от началната дата.
 ErrorSQLCreateCP=Възникна SQL грешка по време на създаването:
-ErrorIDFicheCP=Възникна грешка, искането за почивка не съществува.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Назад към предишната страница
-ErrorUserViewCP=Вие нямате право да чете това искане за отпуск.
-InfosCP=Информация на търсенето на празници
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Информация Workflow
 RequestByCP=По искане на
-TitreRequestCP=Лист с отпуски
-NbUseDaysCP=Брой на дните на използваните отпуски
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Редактиране
 DeleteCP=Изтриване
 ActionValidCP=Утвърждаване
@@ -43,26 +43,25 @@ ActionRefuseCP=Отказване
 ActionCancelCP=Отказ
 StatutCP=Състояние
 SendToValidationCP=Изпращане за утвърждаване
-TitleDeleteCP=Изтриване на искането за отпуск
-ConfirmDeleteCP=Потвърждавате ли изтриването на това искане за отпуск?
-ErrorCantDeleteCP=Грешка: нямате необходимите права за да изтриете това искане за отпуск.
-CantCreateCP=Вие нямате право да кандидатствате за отпуск.
-InvalidValidatorCP=Вие трябва да изберете утвърждаващ на искането на отпуск.
-UpdateButtonCP=Актуализация
-CantUpdate=Не можете да актуализирате това искане за отпуск.
+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=Трябва да изберете началната дата.
 NoDateFin=Трябва да изберете крайна дата.
-ErrorDureeCP=Вашето искане за почивка не съдържа работен ден.
-TitleValidCP=Утвърждава искането за отпуск
-ConfirmValidCP=Сигурни ли сте, че желаете да утвърдите искането за отпуск?
+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=Изпращане на заявление за отпуск
-ConfirmToValidCP=Сигурни ли сте, че желаете да изпратите заявлението за отпуск?
-TitleRefuseCP=Отхвърляне на заявлението за отпуск
-ConfirmRefuseCP=Сигурни ли сте, че желаете да откажите искането на отпуск?
+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=Вие трябва да изберете причина за отказ на искането.
-TitleCancelCP=Анулира заявката празници
-ConfirmCancelCP=Сигурен ли сте, че искате да отмените искане на празници?
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Причина за отказа
 DateRefusCP=Дата на отказ
 DateCancelCP=Дата на анулирането
@@ -72,42 +71,42 @@ MotifCP=Причина
 UserCP=Потребител
 ErrorAddEventToUserCP=Възникна грешка при добавяне на изключително отпуск.
 AddEventToUserOkCP=Добавянето на извънредния отпуск е завършена.
-MenuLogCP=Преглед на извършените административни действия на празници
-LogCP=Вход на актуализации на празниците
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 ActionByCP=В изпълнение на
 UserUpdateCP=За потребителя
 PrevSoldeCP=Предишен баланс
 NewSoldeCP=Нов баланс
-alreadyCPexist=Вече е направено искане за отпуск за този период.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Име
 Employee=Служители
-FirstDayOfHoliday=Първи ден от отпуска
-LastDayOfHoliday=Последен ден на отпуска
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Настройки на модула за отпуски
+ConfCP=Configuration of leave request module
 DescOptionCP=Описание на опцията
 ValueOptionCP=Стойност
-GroupToValidateCP=Група с възможност за валидиране на празниците
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Потвърждаване на конфигурацията
-LastUpdateCP=Последна автоматична актуализация на отпуските
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Актуализира се успешно.
 ErrorUpdateConfCP=Възникна грешка по време на актуализацията, моля опитайте отново.
-AddCPforUsers=Моля, добавете баланса на празниците на потребителите, като <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">кликнете тук</a> .
-DelayForSubmitCP=Краен срок за кандидатстване за отпуск
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Отказване, ако не е спазен срока за заявяване на отпуска
-AlertValidorSoldeCP=Отказване, ако желаните дни са над баланса
-nbUserCP=Брой на потребителите, подкрепена в модула празници
-nbHolidayDeductedCP=Колко отпуск да се приспада за всеки ден от отпуска
-nbHolidayEveryMonthCP=Колко отпуск да се добавя всеки месец
-Module27130Name= Управление на празници
-Module27130Desc= Управление на празници
-TitleOptionMainCP=Основни настройки на отпуските
-TitleOptionEventCP=Настройки на празниците, свързана със събития
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Проверка на
 UpdateEventCP=Актуализиране на събития
 CreateEventCP=Създаване на
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Актуализация
 ErrorMailNotSend=Възникна грешка при изпращане на имейл:
 NoCPforMonth=Не оставяйте този месец.
 nbJours=Брой дни
-TitleAdminCP=Конфигурация на празници
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang
index d5ffcbc941b..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,10 +24,21 @@ NameAndSignatureOfInternalContact=Име и подпис на намеса:
 NameAndSignatureOfExternalContact=Име и подпис на клиента:
 DocumentModelStandard=Стандартен документ модел за интервенции
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Класифициране 'Таксувана'
+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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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=Параметъра <b>%s</b> не е дефиниран в конфигурационния файл на Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Не можа да се намери потребител <b>%s</b> в базата данни на Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Грешка, без ДДС ставки, определени за &quot;%s&quot; страна.
+ErrorNoVATRateDefinedForSellerCountry=Грешка, няма дефинирани ДДС ставки, за държавата '%s'.
 ErrorNoSocialContributionForSellerCountry=Грешка, не е социален тип участие, определено за &quot;%s&quot; страна.
 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=Файлът е избран за прикачане, но все още не е качен. Кликнете върху &quot;Прикачи файл&quot;.
 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=Тази област е посветена на група разни инструменти, достъпни в други вписвания в менюто. <br><br> Тези инструменти могат да бъдат достигнати от менюто на страната.
 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 8c660d45eb9..4d6d702069e 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Затворен
 ContractStatusRunning=Работи
 ContractStatusExpired=изтекъл
 ContractStatusOnHold=Не работи
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=Този договор не се изпълнява
 ErrorProductAlreadyExists=Вече съществува продукт с референция %s .
 ErrorProductBadRefOrLabel=Грешна стойност за референция или етикет.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Доставчици
 SupplierRef=Продукт доставчик изх.
 ShowProduct=Покажи продукт
@@ -116,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=Филтър по ключова дума
@@ -131,7 +132,7 @@ AddDel=Добавяне/Изтриване
 Quantity=Количество
 NoMatchFound=Не са намерени съвпадения
 ProductAssociationList=Списък на продукти / услуги, свързани с: име на продукта / услугата (количество засегнати)
-ProductParentList=Списък на продукти / услуги с този продукт като компонент
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Един от избрания продукт е родител с настоящия продукт
 DeleteProduct=Изтриване на продукта/услугата
 ConfirmDeleteProduct=Сигурни ли сте, че желаете да изтриете този продукт/услуга?
@@ -178,7 +179,7 @@ CloneProduct=Клониране на продукт или услуга
 ConfirmCloneProduct=Сигурни ли сте, че желаете да клонирате продукта или услугата <b>%s?</b>?
 CloneContentProduct=Клониране на всички основни данни за продукта/услугата
 ClonePricesProduct=Клониране на основните данни и цени
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Този продукт е използван
 NewRefForClone=Реф. на нов продукт/услуга
 CustomerPrices=Цени за клиенти
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 87f88a3f33e..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=Задачите / дейностите
@@ -85,13 +87,13 @@ ActionsOnProject=Събития по проекта
 YouAreNotContactOfProject=Вие не сте контакт на този частен проект
 DeleteATimeSpent=Изтриване на времето, прекарано
 ConfirmDeleteATimeSpent=Сигурен ли сте, че искате да изтриете това време, прекарано?
-DoNotShowMyTasksOnly=Вижте също задачи, които не са разпределени за мен
-ShowMyTasksOnly=Виж само задачи, възложени за мен
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Проекти, насочени към тази трета страна
 NoTasks=Няма задачи за този проект
 LinkedToAnotherCompany=Свързано с друга трета страна
-TaskIsNotAffectedToYou=Задачи, които не са разпределени за вас
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Изразходваното време е празна
 ThisWillAlsoRemoveTasks=Това действие ще изтрие всички задачи на проекта <b>(%s</b> задачи в момента) и всички входове на времето, прекарано.
 IfNeedToUseOhterObjectKeepEmpty=Ако някои обекти (фактура, поръчка, ...), принадлежащи към друга трета страна, трябва да бъдат свързани с проекта за създаване, запазете тази празна да има проект е мулти трети страни.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Прекъсни връзката към елемента
 # Documents models
 DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..)
 PlannedWorkload = Planned workload
@@ -128,3 +131,4 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
+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 66a89f57a80..9f5a8b85470 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=Последен превоз %s
 SearchASending=Търсене за превоз
 StatisticsOfSendings=Статистика за превози
 NbOfSendings=Брой на пратките
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Доставка карта
 NewSending=Нова пратка
 CreateASending=Създаване на пратка
@@ -50,27 +50,31 @@ Enlevement=Набият по желание на клиента
 DocumentModelSimple=Обикновено документ модел
 DocumentModelMerou=Merou A5 модел
 WarningNoQtyLeftToSend=Внимание, няма продукти, които чакат да бъдат изпратени.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Нарязани датата на доставка
 DateReceived=Дата на доставка
 SendShippingByEMail=Изпращане на пратка по имейл
-SendShippingRef=Изпрати спедиция %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Събития на пратка
 LinkToTrackYourPackage=Линк за проследяване на вашия пакет
 ShipmentCreationIsDoneFromOrder=За момента се извършва от картата с цел създаване на нова пратка.
 RelatedShippings=Свързани shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+ShipmentLine=Shipment line
+CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
 
 # Sending methods
 SendingMethodCATCH=Улов от клиента
 SendingMethodTRANS=Транспортьор
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Simple образеца на документа за доставка постъпления
 DocumentModelTyphon=Повече целия документ модел за доставка постъпления (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянно EXPEDITION_ADDON_NUMBER не е определен
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Склад детайли
+DetailWarehouseFormat= Тегло:%s (Количество : %d)
diff --git a/htdocs/langs/bg_BG/shop.lang b/htdocs/langs/bg_BG/shop.lang
deleted file mode 100644
index 6f793aeca45..00000000000
--- a/htdocs/langs/bg_BG/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Магазин
-ShopWeb=Web Shop
-LastOrders=Последни поръчки
-OnStandBy=В режим на готовност
-TreatmentInProgress=Лечението е в ход
-LastCustomers=Последни клиенти
-OSCommerceShop=OSCommerce магазин
-OSCommerce=OSCommerce
-AddProd=Продавайте онлайн
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/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index bc575f04d98..93810c22e1e 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=Дата на поръчката
 BuyingPrice=Изкупната цена
 BuyingPriceMin=Минимална покупната цена
 BuyingPriceMinShort=Покупка мин. Цена
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Добави награда доставчик
 ChangeSupplierPrice=Промяна доставчик цена
 ErrorQtyTooLowForThisSupplier=Количество твърде ниска за този доставчик или няма цена, определена за този продукт на този доставчик
@@ -27,7 +27,7 @@ RefSupplierShort=Не. снабдител
 Availability=Наличност
 ExportDataset_fournisseur_1=Фактури и фактура линии
 ExportDataset_fournisseur_2=Фактури и наредби
-# ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Одобряване на поръчката
 ConfirmApproveThisOrder=Сигурен ли сте, че искате да одобри <b>%s Поръчката?</b>
 DenyingThisOrder=Да откаже поръчката
@@ -39,4 +39,6 @@ AddSupplierOrder=Създаване на поръчка за покупка
 AddSupplierInvoice=Създаване на фактура
 ListOfSupplierProductForSupplier=Списък на доставчици на стоки и цени <b>%s</b>
 NoneOrBatchFileNeverRan=Няма или не се изпълнява партида <b>%s</b> наскоро
-# SentToSuppliers=Sent to suppliers
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
index 81374e01124..cde887226a8 100644
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Екскурзия
 ListTripsAndExpenses=Списък на пътувания и разходи
 ExpensesArea=Екскурзии и разходи площ
 SearchATripAndExpense=Търсене на пътуване и разходи
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..954d9c60650
--- /dev/null
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Računovodstvo
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index fd78d070b7f..19cb28c82fd 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Otpremanje postavki
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 ed9849d3946..1b80e817bee 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID događaja
 Actions=Događaji
 ActionsArea=Područje za događaje (akcije i zadaci)
-Agenda= Agenda
-Agendas= Agende
-Calendar= Kalendar
-Calendars= Kalendari
-LocalAgenda=Lokalni kalendar
-AffectedTo= Dodijeljeno korisniku
-DoneBy= Učinio/la
-Events= Događaji
+Agenda=Agenda
+Agendas=Agende
+Calendar=Kalendar
+Calendars=Kalendari
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Dodijeljeno korisniku
+DoneBy=Učinio/la
+Event=Event
+Events=Događaji
 EventsNb=Broj događaja
 MyEvents=Moj događaji
 OtherEvents=Ostali događaji
@@ -17,31 +19,33 @@ ListOfActions=Lista događaja
 Location=Lokacija
 EventOnFullDay=Događaj za cijeli dan(e)
 SearchAnAction= Traži događaj/zadatak
-MenuToDoActions= Svi nepotpuni događaji
-MenuDoneActions= Sve završeni događaji
-MenuToDoMyActions= Moji nepotpuni događaji
-MenuDoneMyActions= Moji završeni događaji
-ListOfEvents= Lista Dolibarr događaja
+MenuToDoActions=Svi nepotpuni događaji
+MenuDoneActions=Sve završeni događaji
+MenuToDoMyActions=Moji nepotpuni događaji
+MenuDoneMyActions=Moji završeni događaji
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Događaje izvijestio/la
 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
 ViewCal=Mjesečni pregled
 ViewDay=Dnevni pregled
 ViewWeek=Sedmični pregled
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Pogledaj sa unaprijed definiranim filterima
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Datum početka
 DateActionEnd= Datum završetka
 AgendaUrlOptions1=Također možete dodati sljedeće parametre za filtriranje prikazanog:
 AgendaUrlOptions2=<b>login =%s</b> ​​da se ograniči prikaz na akcije kreiranje, dodiljene ili završene od strane korisnika <b>%s.</b>
-AgendaUrlOptions3=<b>logina=%s</b> ​​da se ograniči prikaz na akcije kreirane od strane korisnika <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> ​​da se ograniči prikaz na akcije dodijeljene korisniku <b>%s.</b>
-AgendaUrlOptions5=<b>logind=%s</b> ​​da se ograniči prikaz na akcije završene os strane korisnika <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Prikaži rođendane kontakata
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
 ExportDataset_event1=Lista događaja u agendi
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export kalendara
 ExtSites=Import eksternih kalendara
-ExtSitesEnableThisTool=Prikaži eksterne kalendare u agendi
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Broj kalendara
 AgendaExtNb=Kalendar broj %s
 ExtSiteUrlAgenda=URL za pristup .ical fajla
 ExtSiteNoLabel=Nema opisa
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index b4d9bfada30..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Označi kao 'Plaćeno'
 ClassifyPaidPartially=Označi kao 'Djelimično plaćeno'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Jeste li sigurni da želite otkazati fakturu <b>%s</b> ?
 ConfirmCancelBillQuestion=Zašto želite da se ova faktura označi kao 'otkazano'?
 ConfirmClassifyPaidPartially=Jeste li sigurni da želite promijeniti fakturu <b>%s</b> na status plaćeno?
 ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije u potpunosti plaćena. Koji su razlozi za zatvaranje fakture?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Popust ponuđen (uplata prije roka)
-SendBillRef=Pošalji fakturu %s
-SendReminderBillRef=Pošalji fakturu %s (opomena)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Trajni nalozi
 StandingOrder=Trajni nalog
 NoDraftBills=Nema uzoraka faktura
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Ukupno za dva nova popusta mora biti jednak
 ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezana faktura
 RelatedBills=Povezane fakture
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Odmah
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 90c115aa548..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 9b7abd934cf..94c67f22f85 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Morate prvo kreirati emailove kontakata za subjekte da
 ListSuppliersShort=Lista dobavljača
 ListProspectsShort=Lista mogućih klijenata
 ListCustomersShort=Lista kupaca
-ThirdPartiesArea=Područje za subjekte
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Zadnjih %s izmijenjenih subjekata
 UniqueThirdParties=Ukupno unikatnih subjekata
 InActivity=Otvori
@@ -410,3 +410,5 @@ OutstandingBillReached=Dostugnut je max. za neplaćeni račun
 MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index f63bcd65b3c..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 612bf1d5850..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
@@ -30,3 +30,9 @@ SearchADonation=Traži donaciju
 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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/bs_BA/exports.lang
+++ b/htdocs/langs/bs_BA/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 54c94293460..23d4c100a2f 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Kadrovska služba
-Holidays=Godišnji odmori
-CPTitreMenu=Godišnji odmori
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Mjesečni izvještaj
-MenuAddCP=Prijavi se za godišnji odmor
-NotActiveModCP=Morate omogućiti modul godišnji odmori da bi vidjeli ovu stranicu.
-NotConfigModCP=Morate konfigurisati modul godišnji odmori da bi vidjeli ovu stranicu. Da bi ste uradili ovo, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">kliknite ovdje<a>.
-NoCPforUser=Nema te zahtjeva za godišnje odmore.
-AddCP=Prijavi se za godišnji odmor
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Zaposlenik
 DateDebCP=Datum početka
 DateFinCP=Datum završetka
@@ -18,24 +18,24 @@ ApprovedCP=Odobren
 CancelCP=Otkazan
 RefuseCP=Odbijen
 ValidatorCP=Osoba koja odobrava
-ListeCP=Lista godišnjih odmora
+ListeCP=List of leaves
 ReviewedByCP=Bit će pregledano od strane
 DescCP=Opis
-SendRequestCP=Kreiranje zahtjeva za godišnji odmor
-DelayToRequestCP=Aplikacija za godišnji odmor mora biti napravljena bar <b>%s dan(a)</b> prije samog odmora.
-MenuConfCP=Izmjena stanja za godišnje odmore.
-UpdateAllCP=Ažuriranje godišnjih odmora
-SoldeCPUser=Stanje godišnjih odmora je <b>%s</b> dana.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Datum završetka mora biti poslije datuma početka.
 ErrorSQLCreateCP=Desila se SQL greška prilikom kreiranja: 
-ErrorIDFicheCP=Desila se greška, zahtjev za odmor ne postoji.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Vrati se na prethodnu stranicu
-ErrorUserViewCP=Niste autorizovani da čitate ovaj zahtjev za godišnji odmor.
-InfosCP=Informacije o zahtjevu za odmor
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Workflow informacija
 RequestByCP=Zahtjev poslao
-TitreRequestCP=Lista godišnjih odmora
-NbUseDaysCP=Broj iskorištenih dana godišnjeg odmora
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Izmjena
 DeleteCP=Obrisati
 ActionValidCP=Potvrdi
@@ -43,26 +43,25 @@ ActionRefuseCP=Odbij
 ActionCancelCP=Poništi
 StatutCP=Status
 SendToValidationCP=Posalji na potvrđivanje
-TitleDeleteCP=Obrisati zahtjev za godišnji odmor
-ConfirmDeleteCP=Potvrda brisanja ovog zahtjeva za godišnji odmor?
-ErrorCantDeleteCP=Greška nemate pravo da obriše ovaj zahtjev za godišnji odmor.
-CantCreateCP=Nemaš prava da se prijave za godišnji odmor.
-InvalidValidatorCP=Morate odabrati osobu za odobravanja vašeg godišnjeg odmora.
-UpdateButtonCP=Ažuriranje
-CantUpdate=Ne možete ažurirati ovaj zahtjev za godišnji odmor.
+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=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
-ConfirmValidCP=Jeste li sigurni da želite da odobrite 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=Pošalji zahtjev za godišnji odmor
-ConfirmToValidCP=Jeste li sigurni da želite poslati zahtjev za godišnji odmor?
-TitleRefuseCP=Odbiti zahtjev za godišnji odmor
-ConfirmRefuseCP=Jeste li sigurni da želite odbiti zahtjev za godišnji odmor?
+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=Morate odabrati razlog za odbijanje zahtjeva.
-TitleCancelCP=Poništi zahtjev za godišnji odmor
-ConfirmCancelCP=Jeste li sigurni da želite otkazati 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
 DateCancelCP=Datum poništavanja
@@ -72,42 +71,42 @@ MotifCP=Razlog
 UserCP=Korisnik
 ErrorAddEventToUserCP=Došlo je do greške prilikom dodavanja izuzetnog odsustva.
 AddEventToUserOkCP=Dodavanje izuzetno odsustva je kopmletirano.
-MenuLogCP=Pogledaj izvjestaje za godišnje odmore
-LogCP=Izvještaji ažuriranja godišnjih odmora
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Prvi dan godišnjeg odmora
-LastDayOfHoliday=Zadnji dan godišnjeg odmora
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Mjesečno ažuriranje
 ManualUpdate=Ručno ažuriranje
-HolidaysCancelation=Poništavanje godišnjih odmora
+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=Grupa sa mogućnosti da odobrava godišnje odmore
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Potvrdite konfiguraciju
-LastUpdateCP=Zadnje ažuriranje automatskih godišnjih odmora
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikom ovdje</a>.
-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
-AlertValidatorDelayCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da odmor prelazi odgađanje
-AlertValidorSoldeCP=Spriječi osobu koja odobrava godišnji odmor u slučaju da odmor prelazi trenutno stanje
-nbUserCP=Broj podržanih korisnika u modulu za godišnje odmore
-nbHolidayDeductedCP=Broj godišnjih odmora za odbijanje po danu uzetog odmora
-nbHolidayEveryMonthCP=Broj dana godišnjeg odmora za dodati svaki mjesec
-Module27130Name= Upravljanje godišnjim odmorima
-Module27130Desc= Upravljanje godišnjim odmorima
-TitleOptionMainCP=Glavne postavke godišnjih odmora
-TitleOptionEventCP=Postavke za godišnje odmore povezane sa događajima
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Potvrdi
 UpdateEventCP=Ažuriraj događaje
 CreateEventCP=Kreiraj
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Ažuriraj
 ErrorMailNotSend=Desila se greška prilikom slanja emaila:
 NoCPforMonth=Nema odsustva za ovaj mjesec.
 nbJours=Broj dana
-TitleAdminCP=Konfiguracija godišnjih odmora
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Zdravo
-HolidaysToValidate=Potvrdi godišnje odmore
-HolidaysToValidateBody=Ispod su zahtjevi godišnjih odmora za potvrđivanje.
-HolidaysToValidateDelay=Ovaj zahtjev za godišji odmor će se desiti u periodu od manje od %s dana.
-HolidaysToValidateAlertSolde=Korisnici koji su postavili ovaj zahtjev nemaju dovoljan broj dostupnih dana.
-HolidaysValidated=Potvrđeni godišnji odmori
-HolidaysValidatedBody=Vaš zahtjev za godišnji odmor od %s do %s je potvrđen.
-HolidaysRefused=Odbijeni godišnji odmori
-HolidaysRefusedBody=Vaš zahtjev za godišnji odmor od %s do %s je odbijen zbog: 
-HolidaysCanceled=Poništeni godišnji odmori
-HolidaysCanceledBody=Vaš zahtjev za godišnji odmor od %s fo %s je poništen.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Pregledaj izvještaj o izmijenjenim godišnjim odmorima
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang
index dc08dc466d0..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Ime i potpis servisera:
 NameAndSignatureOfExternalContact=Ime i potpis kupca:
 DocumentModelStandard=Standardni dokument za intervencije
 InterventionCardsAndInterventionLines=Intervencije i tekstovi intervencija
-ClassifyBilled=Klasifikuj "Fakturisane"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> od strane sesije za slanje.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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<br/>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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+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 <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
+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 <b>%s</b> ?
+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.<br><br>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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 4db26d213d7..90ab1fa6e30 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 ce474404ca4..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
@@ -85,13 +87,13 @@ ActionsOnProject=Događaji na projektu
 YouAreNotContactOfProject=Vi niste kontakt ovog privatnog projekta
 DeleteATimeSpent=Brisanje provedenog vremena
 ConfirmDeleteATimeSpent=Jeste li sigurni da želite obrisati ovo provedeno vrijeme?
-DoNotShowMyTasksOnly=Vidi i zadatke koji nisu dodijeljeni meni
-ShowMyTasksOnly=Pogledaj samo zadake dodijeljene meni
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Izvori
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu
 NoTasks=Nema zadataka za ovaj projekat
 LinkedToAnotherCompany=U vezi sa drugim subjektom
-TaskIsNotAffectedToYou=Zadaci koji nisu dodjeljeni meni
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Vrijeme provedeno je prazno
 ThisWillAlsoRemoveTasks=Ova akcija će također izbrisati sve zadatke projekta (<b>%s</b> zadataka u ovom trenutku) i sve unose provedenog vremena.
 IfNeedToUseOhterObjectKeepEmpty=Ako neki objekti (faktura, narudžbe, ...), pripadaju drugom subjektu, mora biti u vezi sa projektom za kreiranje, ostavite ovo prazno da bi imali projekat što više subjekata.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 08d9542b1c8..60d641fecdc 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -50,27 +50,31 @@ Enlevement=Preuzeto od strane kupca
 DocumentModelSimple=Jednostavni model dokumenta
 DocumentModelMerou=Model dokumenta Merou A5
 WarningNoQtyLeftToSend=Upozorenje, nema proizvoda na čekanju za slanje
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Planirani datum isporuke
 DateReceived=Datum prijema isporuke
 SendShippingByEMail=Pošalji pošiljku na e-mail
-SendShippingRef=Pošalji pošiljku %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Događaji na pošiljki
 LinkToTrackYourPackage=Link za praćenje paketa
 ShipmentCreationIsDoneFromOrder=U ovom trenutku, nova pošiljka se kreira sa kartice narudžbe
 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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Suma količina proizvoda
 SumOfProductWeights=Suma težina proizvoda
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/bs_BA/shop.lang b/htdocs/langs/bs_BA/shop.lang
deleted file mode 100644
index a52f4da4322..00000000000
--- a/htdocs/langs/bs_BA/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Prodavnica
-ShopWeb=Web Shop
-LastOrders=Zadnje narudžbe
-OnStandBy=Na stanju pripravnosti
-TreatmentInProgress=Postupak u toku
-LastCustomers=Zadnji kupci
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Prodaj online
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/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 64874a271e3..c9dd370a476 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Kreiraj fakturu za dobavljača
 ListOfSupplierProductForSupplier=Lista proizvoda i cijena za dobavljača <b>%s</b>
 NoneOrBatchFileNeverRan=Nijedan ili gomila <b>%s</b> nije pokrenuto nedavno
 SentToSuppliers=Poslano prema dobavljačima
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index 03603515c43..3129380dd57 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Putovanje
 ListTripsAndExpenses=Lista putovanja i troškova
 ExpensesArea=Područje za putovanja i troškove
 SearchATripAndExpense=Traži putovanja i troškove
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index e369e6f34d5..739cd6fb23b 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s
 ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a <b>%s</b> no estan suportades.
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està reservat. Podeu utilitzar 'user' com a valor per afegir el seu propi registre
 ErrorCodeCantContainZero=El codi no pot contenir el valor 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Panell
 Boxes=Panells
 MaxNbOfLinesForBoxes=Nº de línies màxim per als panells
 PositionByDefault=Posició per defecte
-Position=Ordre
+Position=Position
 MenusDesc=Els gestors de menú defineixen el contingut de les 2 barres de menús (la barra horitzontal i la barra vertical). És possible assignar gestors diferents segons l'usuari sigui intern o extern.
 MenusEditorDesc=L'editor de menús permet definir entrades personalitzades en els menús. S'ha d'utilitzar amb prudència sota pena de posar a Dolibarr en una situació inestable essent necessària una instal·lació per trobar un menú coherent.
 MenuForUsers=Menú per als usuaris
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automàtic si el JavaScript està desactivat
 AvailableOnlyIfJavascriptNotDisabled=Disponible només si Javascript està activat
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible només si Javascript i Ajax estan activats
 Required=Requerit
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Seguretat
 Passwords=Contrasenyes
 DoNotStoreClearPassword=No emmagatzemar la contrasenya sense xifrar a la base
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMT
 MAIN_MAIL_EMAIL_FROM=Correu electrònic de l'emissor per trameses e automàtics (Per defecte en php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=E-Mail usat per als retorns d'error dels e-mails enviats
 MAIN_MAIL_AUTOCOPY_TO= Enviar automàticament còpia oculta dels e-mails enviats a
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Desactivar globalment tot enviament de correus electrònics (per mode de proves)
 MAIN_MAIL_SENDMODE=Mètode d'enviament d'e-mails
 MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP si es requereix autenticació SMTP
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce 1
-Module800Desc=Interface de visualització d'una botiga OSCommerce mitjançant accés directe a la seva base de dades
-Module900Name=OSCommerce 2
-Module900Desc=Interface de visualització d'una botiga OSCommerce mitjançant web services. Aquest mòdul requereix instal lar els fitxers de /oscommerce_ws/ws_server a OSCommerce. Consulteu el fitxer README de la carpeta /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis
 Module1400Name=Comptabilitat experta
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Crear/modificar impostos i IVA
 Permission93=Eliminar impostos i IVA
 Permission94=Exporta impostos
 Permission95=Consultar balanços i resultats
-Permission96=Parametritzar desglossament
-Permission97=Llegir línies de factures
-Permission98=Desglossar línies de factures
 Permission101=Consultar expedicions
 Permission102=Crear/modificar expedicions
 Permission104=Validar expedicions
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Retorna un codi comptable compost de<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Règles sobre els ID professionals
 MustBeUnique=Ha de ser únic?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 1bb546f82be..a9c55c4f272 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Esdeveniments
 ActionsArea=Àrea d'esdeveniments (accions i tasques)
-Agenda= Agenda
-Agendas= Agendes
-Calendar= Calendari
-Calendars= Calendaris
-LocalAgenda=Calendari local
-AffectedTo= Assignada a
-DoneBy= Realitzat per
-Events= Esdeveniments
+Agenda=Agenda
+Agendas=Agendes
+Calendar=Calendari
+Calendars=Calendaris
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assignada a
+DoneBy=Realitzat per
+Event=Event
+Events=Esdeveniments
 EventsNb=Nombre d'esdeveniments
 MyEvents=Els meus events
 OtherEvents=Altres events
@@ -17,31 +19,33 @@ ListOfActions=Llista d'esdeveniments
 Location=Localització
 EventOnFullDay=Esdeveniment per tot el dia
 SearchAnAction= Cercar un esdeveniment/tasca
-MenuToDoActions= Esdeveniments incomplets
-MenuDoneActions= Esdeveniments acabats
-MenuToDoMyActions= Els meus esdeveniments incomplets
-MenuDoneMyActions= Els meus esdeveniments acabats
-ListOfEvents= Llistat d'esdeveniments Dolibarr
+MenuToDoActions=Esdeveniments incomplets
+MenuDoneActions=Esdeveniments acabats
+MenuToDoMyActions=Els meus esdeveniments incomplets
+MenuDoneMyActions=Els meus esdeveniments acabats
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Esdeveniments registrats per
 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
 ViewCal=Vista mensual
 ViewDay=Vista diària
 ViewWeek=Vista setmanal
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Veure amb els filtres predefinits
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Data d'inici
 DateActionEnd= Data finalització
 AgendaUrlOptions1=Podeu també afegir aquests paràmetres al filtre de sortida:
 AgendaUrlOptions2=<b>login=%s</b> per a restringir insercions a accions creades, que afectin o realitzades per l'usuari <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> per a restringir insercions a accciones creades per l'usuari <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> per a restringir insercions a accions que afectin a l'usuari <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> per a restringir insercions a accions realitzades per l'usuari <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Mostra aniversari dels contactes
 AgendaHideBirthdayEvents=Amaga aniversari dels contacte
 Busy=Ocupat
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Exportar calendari
 ExtSites=Calendaris externs
-ExtSitesEnableThisTool=Mostrar calendaris externs a l'agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Nombre de calendaris
 AgendaExtNb=Calendari nº %s
 ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical
 ExtSiteNoLabel=Sense descripció
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index a74778af6e7..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 <b>abonament</ b> é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
@@ -85,8 +85,9 @@ ClassifyPaid=Classificar 'Pagat'
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Esteu segur de voler anul·lar la factura <b>%s</b>?
 ConfirmCancelBillQuestion=Per quina raó vol abandonar la factura?
 ConfirmClassifyPaidPartially=Esteu segur de voler classificar la factura <b>%s</b> com pagada?
 ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada?
-ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar <b>(%s %s)</b> s'ha regularitzat (ja que article s'ha tornat, oblidat lliurar, descompte no definit ...) mitjançant un abonament
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
-ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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ó
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Descompte (pagament aviat)
-SendBillRef=Enviament de la factura %s
-SendReminderBillRef=Recordatori de la factura %s
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Domiciliacions
 StandingOrder=Domiciliació
 NoDraftBills=Cap factura esborrany
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma de l'import dels 2 nous descomptes
 ConfirmRemoveDiscount=Esteu segur de voler eliminar aquest descompte?
 RelatedBill=Factura associada
 RelatedBills=Factures associades
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=A la recepció
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index fca6650c6c7..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 4679a935de9..a4f4f32f6d3 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Ha d'establir contactes amb e-mail en els tercers per
 ListSuppliersShort=Llistat de proveïdors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
-ThirdPartiesArea=Àrea Tercers
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Els %s últims tercers modificats
 UniqueThirdParties=Total de tercers únics
 InActivity=Actiu
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Retorna un número sota el format %syymm-nnnn per als codis de clients  i %syymm-nnnn per als codis dels proveïdors, on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0.
 LeopardNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index aee43830170..098a65b11f5 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -3,7 +3,7 @@ Accountancy=Comptabilitat
 AccountancyCard=Fitxa comptable
 Treasury=Tresoreria
 MenuFinancial=Financera
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRules=Anar a <a href="%s">configuració  mòdul impostos</a> per modificar les regles de càlcul
 TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Opció de gestió comptable
 OptionModeTrue=Opció Ingressos-Despeses
@@ -32,7 +32,7 @@ Profit=Benefici
 Balance=Saldo
 Debit=Dèbit
 Credit=Crèdit
-Piece=Accounting Doc.
+Piece=Doc. Comptabilitat
 Withdrawal=Reintegrament
 Withdrawals=Reintegraments
 AmountHTVATRealReceived=Total repercutit
@@ -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
@@ -119,42 +120,42 @@ ConfirmPaySocialContribution=Esteu segur de voler classificar aquesta càrrega s
 DeleteSocialContribution=Eliminar càrrega social
 ConfirmDeleteSocialContribution=Esteu segur de voler eliminar aquesta càrrega social?
 ExportDataset_tax_1=Càrregues socials i pagaments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
+CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
+CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
+CalcModeDebt=Mode <b>%sReclamacions-Deutes%s</b> anomenada <b>Comptabilitad de compromís</b>.
+CalcModeEngagement=Mode <b>%sIngressos-Despeses%s</b> anomenada <b>Comptabilitad de caixa</b>.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
 CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
 CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
 CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
 CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
 CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualSummaryDueDebtMode=Saldo d'ingressos i despeses, resum anual
+AnnualSummaryInputOutputMode=Saldo d'ingressos i despeses, resum anual
 AnnualByCompaniesDueDebtMode=Balanç d'ingressos i despeses, desglossat per tercers, en mode <b>%sCrèdits-Deutes%s </ b> anomenada<b> comptabilitat de compromís</b>.
 AnnualByCompaniesInputOutputMode=Balanç d'ingressos i despeses, desglossat per tercers, en mode <b>%sIngressos-Despeses%s </b> anomenada <b>comptabilitat de caixa </b>.
 SeeReportInInputOutputMode=Veure l'informe <b>%sIngressos-Despeses%s </b> anomenat <b>comptabilitat de caixa </b> per a un càlcul sobre les factures pagades
 SeeReportInDueDebtMode=Veure l'informe <b>%sCrèdits-Deutes%  </b> anomenada <b> comptabilitat de compromís </b> per a un càlcul de les factures pendents de pagament
 RulesAmountWithTaxIncluded=- Els imports mostrats són amb tots els impostos inclosos.
 RulesResultDue=- Els imports mostrats són imports totals<br>- Inclou les factures, càrregues i IVA deguts, que estiguin pagades o no.<br>- Es basa en la data de validació per a les factures i l'IVA i en la data de venciment per les càrregues.<br>
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
+RulesResultInOut=- Inclou els pagaments reals efectuats en factures, les despeses i l'IVA. <br> - Es basa en les dates de pagament de les factures, les despeses i l'IVA.
 RulesCADue=- Inclou les factures a clients (excloent les de bestreta), estiguin pagades o no.<br>- Es base en la data de validació de les mateixes.<br>
 RulesCAIn=- Inclou els pagaments efectuats de les factures a clients.<br>- Es basa en la data de pagament de les mateixes<br>
 DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
 DepositsAreIncluded=- Les factures de bestreta estan incloses
 LT2ReportByCustomersInInputOutputModeES=Informe per tercer del 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
+VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat
+VATReportByCustomersInDueDebtMode=Informe per clients d'IVA cobrat i pagat
+VATReportByQuartersInInputOutputMode=Informe per tipus d'IVA cobrat i pagat
 LT1ReportByQuartersInInputOutputMode=Report by RE rate
 LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
+VATReportByQuartersInDueDebtMode=Informe per tipus d'IVA cobrat i pagat
 LT1ReportByQuartersInDueDebtMode=Report by RE rate
 LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
 SeeVATReportInInputOutputMode=Veure l'informe <b>%sIVA pagat%s </b> per a un mode de càlcul estàndard
 SeeVATReportInDueDebtMode=Veure l'informe <b>%s IVA degut%s </b> per a un mode de càlcul amb l'opció sobre el degut
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA rebuts o emesos en base a la data de pagament.
 RulesVATInProducts=- Per als béns materials, inclou l'IVA de les factures en base a la data de la factura.
 RulesVATDueServices=- Per als serveis, l'informe inclou l'IVA de les factures degudes, pagades o no basant-se en la data d'aquestes factures.
 RulesVATDueProducts=- Per als béns materials, inclou l'IVA de les factures en base a la data de la factura.
@@ -186,21 +187,20 @@ InvoiceDispatched=Factures desglossades
 AccountancyDashboard=Resum financer
 ByProductsAndServices=Per productes i serveis
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=linked to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-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 <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
+ToCreateAPredefinedInvoice=Per crear una factura predefinida, creu una factura estàndard llavors, sense validar, feu clic al botó "Convertir la factura predefinida".
+LinkedOrder=Link to order
+ReCalculate=Recalcular
+Mode1=Mètode 1
+Mode2=Mètode 2
+CalculationRuleDesc=Per calcular la totalitat de l'IVA, hi ha dos mètodes:<br>Mètode 1 és l'arrodoniment de l'IVA en cada línia, llavors es sumen-<br>Mètode 2 és la suma de tot l'IVA en cada línia, a continuació, arrodonint el resultat.<br>.El resultat final pot difereix uns pocs centaus. El mètode per defecte és <b>% s</b>.
+CalculationRuleDescSupplier=segons el proveïdor, triar el mètode adequat per aplicar la mateixa regla de càlcul per obtenir el resultat esperat pel seu proveïdor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode <b>comptabilitat de caixa </b> no és rellevant. Aquest informe només està disponible quan s'utilitza el mode <b>compromís comptable</b>(consulteu la configuració del mòdul de comptabilitat).
+CalculationMode=Mode de càlcul
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 f9a5311a697..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ó
@@ -30,3 +30,9 @@ SearchADonation=Cercar una donació
 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 4e739c5e053..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 <b>%s</b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Els paràmetres obligatoris de configuració no estan encara definits
@@ -154,3 +174,5 @@ WarningUsingThisBoxSlowDown=Atenció, l'ús d'aquest panell provoca serioses ale
 WarningClickToDialUserSetupNotComplete=La configuració de ClickToDial per al compte d'usuari no està completa (vegeu la pestanya ClickToDial en la seva fitxa d'usuari)
 WarningNotRelevant=Operació irrellevant per a aquest conjunt de dades
 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
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 56d6ceb117b..53bc32af044 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Número compte
 BankAccountNumberKey=Dígit Control
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=Si vol aplicar un filtre sobre alguns valors, introduïu-los aquí.
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 e4877b093e9..87309561946 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=RRHH
-Holidays=Vacacions
-CPTitreMenu=Vacacions
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Estat mensual
-MenuAddCP=Nova petició
-NotActiveModCP=Heu d'activar el mòdul Vacacions per veure aquesta pàgina.
-NotConfigModCP=Heu de configurar el mòdul Vacacions per veure aquesta pàgina. per configurar, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">feu clic aquí</a>.
-NoCPforUser=No té peticions de vacances.
-AddCP=Crear petició de vacances
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Empleat
 DateDebCP=Data inici
 DateFinCP=Data fi
@@ -18,24 +18,24 @@ ApprovedCP=Aprovada
 CancelCP=Anul·lada
 RefuseCP=Rebutjada
 ValidatorCP=Validador
-ListeCP=Llista de vacances
+ListeCP=List of leaves
 ReviewedByCP=Serà revisada per
 DescCP=Descripció
-SendRequestCP=Enviar la petició de vacances
-DelayToRequestCP=Les peticions de vacances s'han de fer almenys <b>%s dies</b> abans.
-MenuConfCP=Definir les vacances
-UpdateAllCP=Actualitzar les vacances
-SoldeCPUser=El seu saldo de vacances és de <b>%s dies</b>.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Ha d'indicar una data de fi superior a la data d'inici.
 ErrorSQLCreateCP=S'ha produït un error de SQL durant la creació:
-ErrorIDFicheCP=S'ha produït un error, aquesta sol·licitud de vacances no existeix.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Tornar a la pàgina anterior
-ErrorUserViewCP=No està autoritzat a llegir aquesta petició de vacances.
-InfosCP=Informació de la petició de vacances
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Informació del workflow
 RequestByCP=Comandada per
-TitreRequestCP=Fitxa vacances
-NbUseDaysCP=Nombre de dies de vacances consumits
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Modificar
 DeleteCP=Eliminar
 ActionValidCP=Validar
@@ -43,26 +43,25 @@ ActionRefuseCP=Rebutjar
 ActionCancelCP=Anul·lar
 StatutCP=Estat
 SendToValidationCP=Enviar validació
-TitleDeleteCP=Eliminar la petició de vacances
-ConfirmDeleteCP=Està segur de voler eliminar aquesta petició de vacances?
-ErrorCantDeleteCP=Error, no té vacances per eliminar aquesta petició de vacances.
-CantCreateCP=No té vacances per realitzar peticions de vacances.
-InvalidValidatorCP=Ha d'indicar un validador per a la seva petició de vacances.
-UpdateButtonCP=Actualitzar
-CantUpdate=No pot actualitzar aquesta petició de vacances.
+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=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
-ConfirmValidCP=Esteu segur de voler validar aquesta 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=Enviar la petició de vacances
-ConfirmToValidCP=Esteu segur de voler enviar la petició de vacances?
-TitleRefuseCP=Rebutjar la petició de vacances
-ConfirmRefuseCP=Esteu segur de voler rebutjar la petició de vacances?
+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=Ha de seleccionar un motiu per rebutjar aquesta petició.
-TitleCancelCP=Anul·lar la petició de vacances
-ConfirmCancelCP=Esteu segur de voler 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
 DateCancelCP=Data de l'anul·lació
@@ -72,42 +71,42 @@ MotifCP=Motiu
 UserCP=Usuari
 ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional.
 AddEventToUserOkCP=S'ha afegit el permís excepcional.
-MenuLogCP=Veure els logs de vacances
-LogCP=Logs d'actualitzacions de vacances
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Primer dia lliure
-LastDayOfHoliday=Últim dí lliure
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Actualització mensual
 ManualUpdate=Actualització manual
-HolidaysCancelation=Holidays cancelation
+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=Grup amb possibilitat d'aprovar les vacances
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validar la configuració
-LastUpdateCP=Darrera actualització automàtica de vacances
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">fent clic aquí</a>.
-DelayForSubmitCP=Antelació mínima per sol·licitar vacances
-AlertapprobatortorDelayCP=Advertir al validador si la petició no correspon a la data límit
-AlertValidatorDelayCP=Advertir a l'usuari validador si la petició no respecta el límit previst
-AlertValidorSoldeCP=Advertir a l'usuari validador si l'usuari demana vacances superiors al seu saldo
-nbUserCP=Nombre d'usuaris presos en compte en el mòdul vacances
-nbHolidayDeductedCP=Nombre de dies retribuïts a deduir per dia de vacances
-nbHolidayEveryMonthCP=Nombre de vacances afegides per mes
-Module27130Name= Gestió de les vacances
-Module27130Desc= Gestió de dies lliures
-TitleOptionMainCP=Ajustaments principals de vacances
-TitleOptionEventCP=Ajustaments de vacances enllaçats a esdeveniments
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validar
 UpdateEventCP=Actualitzar els esdeveniments
 CreateEventCP=Crear
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Actualitzar
 ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic:
 NoCPforMonth=Sense vacances aquest mes.
 nbJours=Número de dies
-TitleAdminCP=Configuració de les vacances
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hola
-HolidaysToValidate=Dies retribuïts a validar
-HolidaysToValidateBody=A continuació trobareu una sol·licitud de dies retribuïts per validar
-HolidaysToValidateDelay=Aquesta sol·licitud de dies retribuïts tindrà lloc en un termini de menys de %s dies.
-HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies retribuïts no disposa de suficients dies disponibles.
-HolidaysValidated=Dies retribuïts validats
-HolidaysValidatedBody=La seva sol·licitud de dies retribuïts des de %s al %s ha estat validada.
-HolidaysRefused=Dies retribuïts denegats
-HolidaysRefusedBody=La seva sol·licitud de dies retribuïts des de %s al %s ha estat denegada pel següent motiu:
-HolidaysCanceled=Dies retribuïts cancel·lats
-HolidaysCanceledBody=La seva sol·licitud de dies retribuïts des de %s al %s ha estat cancel·lada.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Consultar l'historial de modificacions de permisos retribuïts
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index 1a3046552be..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ó
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Nom i signatura del participant:
 NameAndSignatureOfExternalContact=Nom i signatura del client:
 DocumentModelStandard=Document model estàndard per a intervencions
 InterventionCardsAndInterventionLines=Fitxes i línies d'intervenció
-ClassifyBilled=Classificar "Facturado"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> destinataris per sessió d'enviament.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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 <br/> 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: <b>%s</b>)
@@ -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ú.<br><br>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 6bae8d69b20..e8b8b6b5053 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Tancat
 ContractStatusRunning=En servei
 ContractStatusExpired=Expirat
 ContractStatusOnHold=Fora de servei
-ContractStatusToRun=A posar en servei
+ContractStatusToRun=To get running
 ContractNotRunning=Aquest contracte no està en servei
 ErrorProductAlreadyExists=Un producte amb la referència %s ja existeix.
 ErrorProductBadRefOrLabel=El valor de la referència o etiqueta és incorrecte
 ErrorProductClone=S'ha produït un error en intentar clonar el producte o servei.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Proveïdors
 SupplierRef=Ref. producte proveïdor
 ShowProduct=Mostrar producte
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clonar producte/servei
 ConfirmCloneProduct=Esteu segur de voler clonar el producte o servei <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 8f2250a7b9e..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
@@ -85,13 +87,13 @@ ActionsOnProject=Esdeveniments del projecte
 YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat
 DeleteATimeSpent=Eliminació de temps dedicat
 ConfirmDeleteATimeSpent=Esteu segur de voler eliminar aquest temps dedicat?
-DoNotShowMyTasksOnly=Veure també les tasques que no m'afecten
-ShowMyTasksOnly=Només veure les tasques que m'afecten
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Recursos afectats
 ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer
 NoTasks=Cap tasca per a aquest projecte
 LinkedToAnotherCompany=Enllaçat a una altra empresa
-TaskIsNotAffectedToYou=Tasca que no l'afecta
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=No s'ha establert el temps consumit
 ThisWillAlsoRemoveTasks=Aquesta operació també destruirà les tasques del projecte (<b>%s</b> tasques) i els seus temps dedicats.
 IfNeedToUseOhterObjectKeepEmpty=Si els elements (factura, comanda, ...) pertanyen a un tercer que no és el seleccionat, havent aquests estar lligats al projecte a crear, deixeu buit per permetre el projecte a multi-tercers.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Model d'informe de projecte complet (logo...)
 PlannedWorkload = Càrrega de treball prevista
@@ -128,3 +131,4 @@ ProjectReferers=Objectes vinculats
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
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 fd2af377b9a..1ccb69ba341 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Estadístiques realitzades únicament sobre les ex
 DateDeliveryPlanned=Data prevista de lliurament
 DateReceived=Data real de recepció
 SendShippingByEMail=Enviament d'expedició per e-mail
-SendShippingRef=Enviament d'expedició %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events sobre l'expedició
 LinkToTrackYourPackage=Enllaç per al seguiment del seu paquet
 ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es realitza des de la fitxa de comanda.
 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
 SendingMethodTRANS=Transportista
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Model simple nota de lliurament
 DocumentModelTyphon=Model complet de nota de lliurament (logo...)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER no definida
 SumOfProductVolumes=Suma del volum dels productes
 SumOfProductWeights=Suma del pes dels productes
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/ca_ES/shop.lang b/htdocs/langs/ca_ES/shop.lang
deleted file mode 100644
index 31969b6b2ce..00000000000
--- a/htdocs/langs/ca_ES/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Tenda
-ShopWeb=Tenda web
-LastOrders=Ultimes comandes
-OnStandBy=En espera
-TreatmentInProgress=En procés
-LastCustomers=Ultims clients
-OSCommerceShop=Tenda OS Commerce
-OSCommerce=OSCommerce
-AddProd=Venda en línia
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/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index e9eab88efbc..6dbf65d95c1 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=Data comanda
 BuyingPrice=Preu de compra
 BuyingPriceMin=Preu mínim de compra
 BuyingPriceMinShort=Preu mín compra
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Afegir preu de proveïdor
 ChangeSupplierPrice=Canviar preu de proveïdor
 ErrorQtyTooLowForThisSupplier=Quantitat insuficient per aquest proveïdor
@@ -40,3 +40,5 @@ AddSupplierInvoice=Crear factura de proveïdor
 ListOfSupplierProductForSupplier=Llistat de productes i preus del proveïdor <b>%s</b>
 NoneOrBatchFileNeverRan=Cap o lot <b>%s</b> no s'ha executat recentment
 SentToSuppliers=Enviat a proveïdors
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 8b5997298e5..74f7e7cdb55 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Viatge
 ListTripsAndExpenses=Llistat notes de honoraris
 ExpensesArea=Àrea Notes d'honoraris
 SearchATripAndExpense=Cercar un honorari
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 4434e83a72d..e4a6da486cf 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verze %s
 ErrorDecimalLargerThanAreForbidden=Chyba, přesnost vyšší než <b>%s</b> není podporována.
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Hodnota &quot;system&quot; a &quot;systemauto&quot; je vyhrazena. Můžete použít &quot;user&quot; k pŕidání vlastního záznamu
 ErrorCodeCantContainZero=Kód nemůže obsahovat hodnotu 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxy
 MaxNbOfLinesForBoxes=Maximální počet řádků pro boxy
 PositionByDefault=Výchozí pořadí
-Position=Pořadí
+Position=Position
 MenusDesc=V nastavení menu nastavíte obsah obou panelů nabídek (horizontální i vertikální).
 MenusEditorDesc=Edito menu vám umožní upravovat položky v menu. Používejte jej opatrně, při nesprávném použití může dojít k nestabilnímu chodu systému Dolibarr nebo ke ztrátě některých položek v menu. <br> Některé moduly přidají položky v menu. Pokud jste omylem odstranili některé z těchto položek, můžete je obnovit vypnutím a opětovným zapnutím modulu.
 MenuForUsers=Menu pro uživatele
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatická, pokud je zakázána Javascript
 AvailableOnlyIfJavascriptNotDisabled=Dostupné pouze v případě, že není zakázán JavaScript
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupné pouze v případě, že není zakázán JavaScript
 Required=Potřebný
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Zabezpečení
 Passwords=Hesla
 DoNotStoreClearPassword=Ukládat hesla v databázi pouze šifrovaně (Doporučeno)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Hosts (Nedefinováno
 MAIN_MAIL_EMAIL_FROM=Odesílatel automatických e-mailů (Výchozí nastavení v php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Odesílatel e-mailů navrácených s chybou
 MAIN_MAIL_AUTOCOPY_TO= Poslat systémovou skrytou kopii všech odeslaných e-mailů na
+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=Zakázat veškeré odesílání e-mailů (pro testovací účely apod.)
 MAIN_MAIL_SENDMODE=Metoda odesílání e-mailů
 MAIN_MAIL_SMTPS_ID=SMTP ID je-li vyžadováno ověření
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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í
-Module800Name=OsCommerce přímým přístup k databázi
-Module800Desc=Rozhraní ukazovat osCommerce nebo OSCSS obchod prostřednictvím přímého přístupu do databáze
-Module900Name=OsCommerce podle WS
-Module900Desc=Rozhraní ukazovat osCommerce obchod prostřednictvím webových služeb. Tento modul requiere k instalaci komponenty / oscommerce_ws / ws_server do osCommerce serveru. Viz soubor README v / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integrace
 Module1400Name=Účetnictví
@@ -493,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í
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Vytvořit / upravit příspěvky na sociální zabezpečení a dan
 Permission93=Odstranění sociální příspěvky a daně z přidané hodnoty
 Permission94=Export příspěvky na sociální zabezpečení
 Permission95=Přečtěte si zprávy
-Permission96=Nastavení zasílání
-Permission97=Přečtěte si faktury účetnictví dispečink
-Permission98=Po odeslání faktury účetní linky
 Permission101=Přečtěte si sendings
 Permission102=Vytvořit / upravit sendings
 Permission104=Ověřit sendings
@@ -603,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
@@ -668,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
@@ -698,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í
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Vrátit evidence kód postavený podle: <br> %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 &quot;C&quot; 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Pravidla pro profesionální IDs
 MustBeUnique=Musí být jedinečný?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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ů
@@ -1142,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 <br> <b>__PHONETO__</b> Který bude nahrazen s telefonním číslem osoby volat <br> <b>__PHONEFROM__</b> Který bude nahrazen tel. číslo volajícího (vaše) <br> <b>__LOGIN__</b> Který bude nahrazen s clicktodial přihlášení (definované na kartě uživatele) <br> <b>__PASS__</b> Který bude nahrazen s clicktodial heslo (definované na kartě uživatele).
@@ -1154,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
@@ -1318,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í
@@ -1378,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
@@ -1408,8 +1424,9 @@ OSCommerceTestOk=Připojení k serveru &quot;%s&quot; na databázi &quot;%s&quot
 OSCommerceTestKo1=Připojení k &quot;%s&quot; serveru úspěšná, ale databáze &quot;%s&quot; by nebylo možno dosáhnout.
 OSCommerceTestKo2=Připojení k serveru &quot;%s&quot; s uživatelem &quot;%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
@@ -1474,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.
@@ -1531,5 +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 e249daf548f..06b4b7d4a32 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID události
 Actions=Události
 ActionsArea=Akce plocha (Akce a úkoly)
-Agenda= Pořad jednání
-Agendas= Pořad
-Calendar= Kalendář
-Calendars= Kalendáře
-LocalAgenda=Místní kalendář
-AffectedTo= Přiřazeno
-DoneBy= Provedl
-Events= Události
+Agenda=Pořad jednání
+Agendas=Pořad
+Calendar=Kalendář
+Calendars=Kalendáře
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Přiřazeno
+DoneBy=Provedl
+Event=Event
+Events=Události
 EventsNb=Počet událostí
 MyEvents=Moje události
 OtherEvents=Další akce
@@ -17,31 +19,33 @@ ListOfActions=Seznam událostí
 Location=Umístění
 EventOnFullDay=Akce po celý den (y)
 SearchAnAction= Hledat událost / úkol
-MenuToDoActions= Všechny neúplné události
-MenuDoneActions= Všechny ukončené akce
-MenuToDoMyActions= Moje neúplné události
-MenuDoneMyActions= Moje ukončených akcí
-ListOfEvents= Seznam událostí Dolibarr
+MenuToDoActions=Všechny neúplné události
+MenuDoneActions=Všechny ukončené akce
+MenuToDoMyActions=Moje neúplné události
+MenuDoneMyActions=Moje ukončených akcí
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Akce hlášeny
 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
 ViewCal=Měsíční pohled
 ViewDay=Denní zobrazení
 ViewWeek=Zobrazit týden
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Zobrazit s předem definovanými filtry
 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
@@ -49,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
@@ -57,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í
@@ -68,19 +69,24 @@ DateActionStart= Datum zahájení
 DateActionEnd= Datum ukončení
 AgendaUrlOptions1=Můžete také přidat následující parametry filtrování výstupu:
 AgendaUrlOptions2=<b>login = %s</b> omezit výstup na akce vytvořené, přidělených nebo provést uživatele <b>%s.</b>
-AgendaUrlOptions3=<b>Logina = %s</b> omezit výstup na akce vytvořené uživatelem <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> omezit výstup na akce přiřazených uživatelských <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> omezit výstup na akce provedené uživatelem <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Zobrazit narozeniny kontaktů
 AgendaHideBirthdayEvents=Skrýt narozeniny kontaktů
 Busy=Zaneprázdněný
 ExportDataset_event1=Seznam agendy událostí
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export kalendář
 ExtSites=Importovat externí kalendáře
-ExtSitesEnableThisTool=Zobrazit externích kalendáře do programu
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Počet kalendářů
 AgendaExtNb=Kalendář nb %s
 ExtSiteUrlAgenda=URL pro přístup. Soubor iCal
 ExtSiteNoLabel=Ne Popis
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 94f3e36a82b..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=<b>Dobropis</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Klasifikaci &quot;Zaplaceno&quot;
 ClassifyPaidPartially=Klasifikovat &quot;Placené částečně&quot;
 ClassifyCanceled=Klasifikovat &quot;Opuštěné&quot;
 ClassifyClosed=Klasifikaci &quot;uzavřeným&quot;
+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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Jste si jisti, že chcete zrušit faktury <b>%s?</b>
 ConfirmCancelBillQuestion=Proč chcete klasifikovat faktura &quot;opuštěný&quot;?
 ConfirmClassifyPaidPartially=Jste si jisti, že chcete změnit fakturační <b>%s</b> do stavu placené?
 ConfirmClassifyPaidPartiallyQuestion=Tato faktura nebyla zaplacena úplně. Jaké jsou důvody pro vás zavřít tuto fakturu?
-ConfirmClassifyPaidPartiallyReasonAvoir=Zbytek platit <b>(%s %s)</b> je sleva poskytnuta, protože platba byla provedena před horizontu. I zjednat DPH s dobropisu.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zbytek platit <b>(%s %s)</b> je sleva poskytnuta, protože platba byla provedena před horizontu. Souhlasím ztratit DPH u této slevy.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Zbytek platit <b>(%s %s)</b> je sleva poskytnuta, protože platba byla provedena před horizontu. Jsem zpět DPH na této slevě bez dobropisu.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Sleva nabídl (platba před semestru)
-SendBillRef=Poslat faktury %s
-SendReminderBillRef=Poslat faktury %s (připomínka)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Trvalé příkazy
 StandingOrder=Trvalý příkaz
 NoDraftBills=Žádné návrhy faktury
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Celkem dva nové slevy musí být roven pů
 ConfirmRemoveDiscount=Jste si jisti, že chcete odstranit tuto slevu?
 RelatedBill=Související faktura
 RelatedBills=Související faktury
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Bezprostřední
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% předem, 50%% při dodání
 FixAmount=Fix množství
 VarAmount=Variabilní částka (%% celk.)
-
 # PaymentType
 PaymentTypeVIR=Bankovní vklad
 PaymentTypeShortVIR=Bankovní vklad
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index 5f5d76b3f7a..fe5121d4974 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -66,7 +66,7 @@ ReturnInCompany=Zpět na zákazníka / Vyhlídka karty
 ContentsVisibleByAll=Obsah bude vidět všichni
 ContentsVisibleByAllShort=Obsah viditelné všemi
 ContentsNotVisibleByAllShort=Obsah není vidět všichni
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=Odstranit kategorii
 ConfirmDeleteCategory=Jste si jisti, že chcete smazat tuto kategorii?
 RemoveFromCategory=Odstraňte spojení s kategoriích
@@ -101,13 +101,12 @@ 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?
-# 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
+DeletePicture=Picture delete
+ConfirmDeletePicture=Confirm picture deletion?
+ExtraFieldsCategories=Complementary attributes
+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/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index a67bf6c78c7..4508bdde30d 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Pro přidání e-mailových notifikací musíte přida
 ListSuppliersShort=Seznam dodavatelů
 ListProspectsShort=Seznam cílů
 ListCustomersShort=Seznam zákazníků
-ThirdPartiesArea=Oblast třetích stran
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Posledních %s editovaných třetích stran
 UniqueThirdParties=Celkem unikátních třetích stran
 InActivity=Otevřeno
@@ -410,3 +410,5 @@ OutstandingBillReached=Dosaženo max. pro nezaplacený účet
 MonkeyNumRefModelDesc=Vrátí číslo ve formátu %syymm-nnnn pro kód zákazníka a %syymm-nnnn pro ód dodavatele kde yy je rok, mm měsíc a nnnn je číselná řada bez přerušení a bez návratu k 0.
 LeopardNumRefModelDesc=Kód je zdarma. Tento kód lze kdykoli změnit.
 ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 83ce6e5305d..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
@@ -187,7 +188,7 @@ AccountancyDashboard=Účetnictví shrnutí
 ByProductsAndServices=Výrobky a službami
 RefExt=Externí ref
 ToCreateAPredefinedInvoice=Chcete-li vytvořit předem definovaný fakturu, vytvořte standardní fakturu a pak, aniž by ji potvrdíte, klikněte na tlačítko &quot;Převést do předem faktura&quot;.
-LinkedOrder=linked to order
+LinkedOrder=Link to order
 ReCalculate=Přepočítat
 Mode1=Method 1
 Mode2=Metoda 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=podle dodavatele zvolit vhodnou metodu použít stej
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat zpráva za zboží, při použití <b>hotovosti evidence</b> režim není relevantní. Tato zpráva je k dispozici pouze při použití <b>zásnubní evidence</b> režimu (viz nastavení účetního modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Účetnictví standardní kód pro zákaznické thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Účetnictví standardní kód pro dodavatele thirdparties
+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
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. <BR> Např načíst metody objektu výro
 CronMethodHelp=Objekt způsob startu. <BR> Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, hodnota metody je <i>fecth</i>
 CronArgsHelp=Metoda argumenty. <BR> Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, může být hodnota paramters být <i>0, ProductRef</i>
 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 &quot;Home - Moduly nářadí - Seznam úloh&quot; vidět a upravovat naplánované úlohy.
diff --git a/htdocs/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang
index 9bbc6d9b503..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
@@ -30,3 +30,9 @@ SearchADonation=Hledat daru
 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 34e8162ae2a..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 &quot;%s&quot; pro nastavení parametrů nesprávných &quot;%s&quot;
-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 &quot;%s&quot; 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 <b>%s</b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Chyba, musí mít PHP modul <b>%s</b> nainstalovat tuto funkc
 ErrorOpenIDSetupNotComplete=Můžete nastavení Dolibarr konfigurační soubor, aby OpenID ověřování, ale URL OpenID služby není definován do stálých %s
 ErrorWarehouseMustDiffers=Zdrojové a cílové sklady musí se liší
 ErrorBadFormat=Bad format!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Povinné parametry jsou dosud stanoveny
@@ -154,3 +174,5 @@ WarningUsingThisBoxSlowDown=Upozornění Při použití tohoto políčka zpomali
 WarningClickToDialUserSetupNotComplete=Nastavení ClickToDial informací pro uživatele si nejsou kompletní (viz tab ClickToDial na vaše uživatelské karty).
 WarningNotRelevant=Nerozhoduje provoz v našem souboru
 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
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index d84d1484178..7f6a87c6762 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Číslo účtu
 BankAccountNumberKey=Klíč
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=Chcete-li filtrovat některé hodnoty, stačí zadat hodnoty zde.
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 d7436e783d7..0c62056dd33 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Prázdniny
-CPTitreMenu=Prázdniny
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Měsíční výkaz
-MenuAddCP=Použít pro dovolenou
-NotActiveModCP=Musíte umožnit modul svátky zobrazení této stránky.
-NotConfigModCP=Musíte nakonfigurovat modul dovolenou k zobrazení této stránky. Chcete-li to provést, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">klikněte sem</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
-NoCPforUser=Nemáte poptávku na dovolenou.
-AddCP=Použít pro dovolenou
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Zaměstnanec
 DateDebCP=Datum zahájení
 DateFinCP=Datum ukončení
@@ -18,24 +18,24 @@ ApprovedCP=Schválený
 CancelCP=Zrušený
 RefuseCP=Odmítl
 ValidatorCP=Approbator
-ListeCP=Seznam svátků
+ListeCP=List of leaves
 ReviewedByCP=Bude přezkoumána
 DescCP=Popis
-SendRequestCP=Vytvoření poptávky po prázdninách
-DelayToRequestCP=Žádosti o dovolenou musí být podána alespoň <b>den %s (y)</b> před nimi.
-MenuConfCP=Upravit rovnováhu dovolenou
-UpdateAllCP=Aktualizujte dovolenou
-SoldeCPUser=Dovolená rovnováha je <b>%s</b> dní.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Musíte vybrat koncové datum je větší než datum zahájení.
 ErrorSQLCreateCP=SQL chyba při tvorbě:
-ErrorIDFicheCP=Došlo k chybě, žádost o dovolenou neexistuje.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Zpět na předchozí stránku
-ErrorUserViewCP=Nejste oprávněn číst toto žádosti o dovolenou.
-InfosCP=Informace o poptávce po prázdninách
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Informace Workflow
 RequestByCP=Žádost
-TitreRequestCP=List dovolenou
-NbUseDaysCP=Počet dní dovolené spotřebovaných
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Upravit
 DeleteCP=Vymazat
 ActionValidCP=Potvrdit
@@ -43,26 +43,25 @@ ActionRefuseCP=Odmítnout
 ActionCancelCP=Zrušit
 StatutCP=Postavení
 SendToValidationCP=Poslat na potvrzení
-TitleDeleteCP=Odstranit žádost dovolenou
-ConfirmDeleteCP=Potvrďte odstranění této žádosti o dovolenou?
-ErrorCantDeleteCP=Chyba nemáte právo smazat tuto dovolenou žádosti.
-CantCreateCP=Nemáte právo požádat o dovolenou.
-InvalidValidatorCP=Musíte vybrat approbator na dovolenou vyžádání.
-UpdateButtonCP=Aktualizovat
-CantUpdate=Nelze aktualizovat tento požadavek svátků.
+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=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
-ConfirmValidCP=Jste si jisti, že chcete schválit žádost o 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=Odeslat žádost o dovolenou
-ConfirmToValidCP=Jste si jisti, že chcete odeslat požadavek na dovolenou?
-TitleRefuseCP=Žádost odmítnout dovolenou
-ConfirmRefuseCP=Jste si jisti, že chcete odmítnout žádost o prázdninách?
+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=Musíte si vybrat důvod pro odmítnutí žádosti.
-TitleCancelCP=Zrušit požadavek dovolenou
-ConfirmCancelCP=Jste si jisti, že chcete zrušit požadavek na 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í
 DateCancelCP=Datum zrušení
@@ -72,42 +71,42 @@ MotifCP=Důvod
 UserCP=Uživatel
 ErrorAddEventToUserCP=Došlo k chybě při přidávání výjimečnou dovolenou.
 AddEventToUserOkCP=Přidání mimořádné dovolené byla dokončena.
-MenuLogCP=Zobrazit protokoly dovolenou
-LogCP=Přihlaste o změnách dovolených
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=První den dovolené
-LastDayOfHoliday=Poslední den dovolené
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Měsíční aktualizace
 ManualUpdate=Ruční aktualizace
-HolidaysCancelation=Dovolená storno
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Konfigurace modulu dovolenou
+ConfCP=Configuration of leave request module
 DescOptionCP=Popis možnosti
 ValueOptionCP=Hodnota
-GroupToValidateCP=Skupina s možností schválit dovolenou
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Ověření konfigurace
-LastUpdateCP=Poslední aktualizace automaticky prázdnin
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">kliknutím zde</a> .
-DelayForSubmitCP=Uzávěrka žádat o dovolenou
-AlertapprobatortorDelayCP=Zabraňte approbator pokud svátek žádost neodpovídá lhůtu
-AlertValidatorDelayCP=Préevent na approbator Pokud požadavek přesahuje dovolenou zpoždění
-AlertValidorSoldeCP=Zabraňte approbator pokud svátek požadavek přesahuje zůstatek
-nbUserCP=Počet uživatelů podporovány v modulu dovolenou
-nbHolidayDeductedCP=Počet svátků se odečtou za každý den dovolené přijatých
-nbHolidayEveryMonthCP=Počet dovolenou přidávány každý měsíc
-Module27130Name= Řízení dovolenou
-Module27130Desc= Řízení dovolenou
-TitleOptionMainCP=Základní nastavení dovolenou
-TitleOptionEventCP=Nastavení dovolené týkající se událostí
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Potvrdit
 UpdateEventCP=Aktualizace akce
 CreateEventCP=Vytvořit
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Aktualizovat
 ErrorMailNotSend=Došlo k chybě při odesílání e-mail:
 NoCPforMonth=Ne opustit tento měsíc.
 nbJours=Počet dní
-TitleAdminCP=Konfigurace svátky
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Ahoj
-HolidaysToValidate=Ověřit dovolenou
-HolidaysToValidateBody=Níže je žádost o dovolenou pro potvrzování
-HolidaysToValidateDelay=Tato žádost o prázdninách se uskuteční ve lhůtě kratší než %s dní.
-HolidaysToValidateAlertSolde=Uživatel, který z tohoto požadavku pro dovolenou nemají k dispozici dostatek dny.
-HolidaysValidated=Ověřené prázdniny
-HolidaysValidatedBody=Vaše žádost o dovolenou pro %s na %s byl ověřen.
-HolidaysRefused=Odepření prázdniny
-HolidaysRefusedBody=Vaše žádost o dovolenou pro %s na %s byl zamítnut z těchto důvodů:
-HolidaysCanceled=Zrušené svátky
-HolidaysCanceledBody=Vaše žádost o dovolenou pro %s na %s byla zrušena.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Recenze protokol modifikovaných dovolenou
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang
index b0f456f41a2..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Jméno a podpis intervence:
 NameAndSignatureOfExternalContact=Jméno a podpis objednavatele:
 DocumentModelStandard=Standardní dokument model pro zásahy
 InterventionCardsAndInterventionLines=Intervence a linky intervencí
-ClassifyBilled=Klasifikovat &quot;účtovaný&quot;
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> příjemce zasláním relace.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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..02a8a1c3fe9 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepodařilo se najít uživatele <b>%s</b>
 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 &quot;ON&quot;, bude marže rovnat nule na lince (nákupní cena = prodejní cena), v opačném případě (&quot;OFF&quot;), 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 <br/> Č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 &quot;Členové typy&quot;
 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 &quot;%s&quot;
 Error_FailedToLoad_COMMANDE_ADDON_File=Nepodařilo se načíst soubor modulu &quot;%s&quot;
 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 &quot;zpracování&quot; 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. <br><br> 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 &quot;Přímý tisk&quot; 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 d904b3cbbb8..43becba423e 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Zavřeno
 ContractStatusRunning=Běh
 ContractStatusExpired=vypršela
 ContractStatusOnHold=Neběží
-ContractStatusToRun=Mettre en služba
+ContractStatusToRun=To get running
 ContractNotRunning=Tato smlouva není v chodu
 ErrorProductAlreadyExists=Výrobek s referenčním %s již existuje.
 ErrorProductBadRefOrLabel=Chybná hodnota pro referenční nebo etikety.
 ErrorProductClone=Vyskytl se problém při pokusu o klonování produkt nebo službu.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Dodavatelé
 SupplierRef=Dodavatele produktů čj.
 ShowProduct=Zobrazit produkt
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone produkt nebo službu
 ConfirmCloneProduct=Jste si jisti, že chcete klonovat produktů nebo služeb <b>%s?</b>
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 f6e259da1b3..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
@@ -85,13 +87,13 @@ ActionsOnProject=Události na projektu
 YouAreNotContactOfProject=Nejste kontakt tohoto privátního projektu
 DeleteATimeSpent=Odstranit strávený čas
 ConfirmDeleteATimeSpent=Jste si jisti, že chcete smazat tento strávený čas?
-DoNotShowMyTasksOnly=Viz také úkoly nepřidělené mně
-ShowMyTasksOnly=Zobrazit pouze úkoly přidělené mně
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Zdroje
 ProjectsDedicatedToThisThirdParty=Projekty této třetí strany
 NoTasks=Žádné úkoly na tomto projektu
 LinkedToAnotherCompany=Připojené k jiné třetí straně
-TaskIsNotAffectedToYou=Úkol není přidělený Vám
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Čas strávený je prázdný
 ThisWillAlsoRemoveTasks=Tato akce rovněž odstraní všechny úkoly projektu (<b>%s</b> úkolů v tuto chvíli) a všechny strávené časy vstupující do projektu.
 IfNeedToUseOhterObjectKeepEmpty=Pokud je k projektu třeba připojit některé objekty jiných třetích stran (faktury, objednávky, ...), ponechte toto prázdné (projekt bude moci obsahovat více třetích stran)
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Přispěvatel
 TypeContact_project_task_external_TASKCONTRIBUTOR=Přispěvatel
 SelectElement=Vyberte prvek
 AddElement=Odkaz na prvek
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Kompletní projektový report (logo. ..)
 PlannedWorkload = Plánované vytížení
@@ -128,3 +131,4 @@ ProjectReferers=Odkazující objekty
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
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 1b2234fa761..986d8018caf 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Statistiky provedena na zásilky pouze ověřenýc
 DateDeliveryPlanned=Čelní termín dodání
 DateReceived=Datum doručení obdržel
 SendShippingByEMail=Poslat zásilku EMail
-SendShippingRef=Poslat zásilek %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Události na zásilky
 LinkToTrackYourPackage=Odkaz pro sledování balíku
 ShipmentCreationIsDoneFromOrder=Pro tuto chvíli, je vytvoření nové zásilky provést z objednávky karty.
 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
 SendingMethodTRANS=Přepravce
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Jednoduchý model pro dokument o doručení
 DocumentModelTyphon=Více Celý dokument model pro potvrzení o doručení (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstantní EXPEDITION_ADDON_NUMBER není definováno
 SumOfProductVolumes=Součet objemů produktů
 SumOfProductWeights=Součet hmotností produktů
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/cs_CZ/shop.lang b/htdocs/langs/cs_CZ/shop.lang
deleted file mode 100644
index 2c7084b4645..00000000000
--- a/htdocs/langs/cs_CZ/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Obchod
-ShopWeb=Web Shop
-LastOrders=Poslední objednávky
-OnStandBy=Na pohotovosti
-TreatmentInProgress=Léčba probíhá
-LastCustomers=Poslední zákazníky
-OSCommerceShop=OsCommerce obchod
-OSCommerce=OsCommerce
-AddProd=Prodej on-line
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/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index e55a755ea91..1035bf97a0c 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=Objednat Datum
 BuyingPrice=Nákup cenu
 BuyingPriceMin=Minimální kupní cena
 BuyingPriceMinShort=Minimální kupní cena
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Přidat cena dodavatele zboží
 ChangeSupplierPrice=Změna dodavatele cenu
 ErrorQtyTooLowForThisSupplier=Nedostatečné množství tohoto podniku, nebo není definována cena k tomuto produktu tohoto podniku
@@ -40,3 +40,5 @@ AddSupplierInvoice=Vytvořte dodavatelské faktury
 ListOfSupplierProductForSupplier=Seznam výrobků a cen dodavatelských <b>%s</b>
 NoneOrBatchFileNeverRan=Žádný nebo dávkový <b>%s</b> ne běžel nedávno
 SentToSuppliers=Odeslané dodavatelům
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
index 7d9ae1e2f51..9de98944f52 100644
--- a/htdocs/langs/cs_CZ/trips.lang
+++ b/htdocs/langs/cs_CZ/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Výlet
 ListTripsAndExpenses=Seznam cest a nákladů
 ExpensesArea=Výlety a náklady oblast
 SearchATripAndExpense=Hledat na výlet a náklady
+ClassifyRefunded=Classify 'Refunded'
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 &quot;odeslaný soubor&quot;
 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
new file mode 100644
index 00000000000..69ee72f82ed
--- /dev/null
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Regnskab
+Globalparameters=Globale parametre
+Chartofaccounts=Kontoplan
+Fiscalyear=Finansår
+Menuaccount=Regnskabskonti
+Menuthirdpartyaccount=Trediepartskonti
+MenuTools=Værktøjer
+
+ConfigAccountingExpert=Konfiguration af ekspert Regnskabsmodulet
+Journaux=Journaler
+JournalFinancial=Finans journal
+Exports=Eksporter
+Modelcsv=Eksportmodul
+Selectmodelcsv=Vælg en eksportmodel
+Modelcsv_normal=Klassisk eksport
+Modelcsv_CEGID=Eksporter med CEGID ekspert
+BackToChartofaccounts=Returner kontoplan
+Back=Returner
+
+Definechartofaccounts=Definer en kontoplan
+Selectchartofaccounts=Vælg en kontoplan
+Validate=Godkend
+Addanaccount=Tilføj en regnskabsmæssig konto
+AccountAccounting=Regnskabsmæssig konto
+Ventilation=Breakdown
+ToDispatch=Afsend
+Dispatched=Afsendt
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+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=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Linje
+
+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=Forny
+VentilationAuto=Automatic breakdown
+
+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 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=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=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=Konto overførsel
+ACCOUNTING_ACCOUNT_SUSPENSE=Ventende konto
+
+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=Dokumenttype
+Docdate=Dato
+Docref=Reference
+Numerocompte=Konto
+Code_tiers=Trediepart
+Labelcompte=Kontonavn
+Debit=Debet
+Credit=Kredit
+Amount=Beløb
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Slet posterne i kontoplanen
+
+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=Kontant betaling
+
+SupplierInvoicePayment=Betaling af leverandørfakturaer
+CustomerInvoicePayment=Betaling af kundefaktura
+
+ThirdPartyAccount=Tredjepart konto
+
+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=Tredjeparts konto liste
+DescThirdPartyReport=Gå til en liste over de tredjeparts kunder og leverandører og deres regnskabssystemer konti
+
+ListAccounts=Liste over de regnskabsmæssige konti
+
+Pcgversion=Version af planen
+Pcgtype=Kontoens klasse
+Pcgsubtype=Kontoens underklasse
+Accountparent=Roden af kontoen
+Active=Erklæring
+
+NewFiscalYear=Nyt finansår
+
+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 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=Forny automatisk
+
+ErrorAccountancyCodeIsAlreadyUse=Fejl, kan du ikke slette denne regnskabsmæssige konto, fordi den bruges
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 9bb251eb4da..92eb78a915a 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Fejl, dette modul kræver Dolibarr version %s
 ErrorDecimalLargerThanAreForbidden=Fejl, en præcision højere <b>end %s</b> er ikke understøttet.
 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=Kode kan ikke indeholde værdien 0
 DisableJavascript=Deaktiver JavaScript og Ajax-funktioner (Anbefales til blinde personer eller tekstbrowsere)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Bokse
 MaxNbOfLinesForBoxes=Max antal linjer for bokse
 PositionByDefault=Standard for
-Position=Rækkefølge
+Position=Position
 MenusDesc=Menuer ledere definere indholdet af de 2 menulinjer (vandret stang og lodret bar).
 MenusEditorDesc=Menuen editor giver dig mulighed for at definere tilpassede poster i menuerne. Brug den omhyggeligt for at undgå at foretage dolibarr ustabil og menupunkter permanent unreachable. <br> Nogle moduler føje poster i menuerne (i menuen <b>Alle</b> i de fleste tilfælde). Hvis du har fjernet nogle af disse poster ved en fejltagelse, kan du gendanne dem ved at deaktivere og reenabling modulet.
 MenuForUsers=Menu for brugere
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatisk hvis Javascript er deaktiveret
 AvailableOnlyIfJavascriptNotDisabled=Kun tilgængelig, hvis JavaScript ikke er slået
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Kun tilgængelig, hvis JavaScript ikke er slået
 Required=Påkrævet
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Sikkerhed
 Passwords=Passwords
 DoNotStoreClearPassword=Må ikke gemme adgangskoder i klar i databasen
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (Ikke defineret i PHP p
 MAIN_MAIL_EMAIL_FROM=Sender e-mail til automatiske e-mails (som standard i <b>php.ini: %s)</b>
 MAIN_MAIL_ERRORS_TO=Sender e-mail bruges til fejlmeddelelser afkast e-mails sendt
 MAIN_MAIL_AUTOCOPY_TO= Send systematisk en skjult carbon-kopi af alle sendte e-mails til
+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=Deaktiver alle de e-mails sendings (til forskningsformål eller demoer)
 MAIN_MAIL_SENDMODE=Metode til at bruge til at sende e-mails
 MAIN_MAIL_SMTPS_ID=SMTP ID hvis påkrævet
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OsCommerce direkte
-Module800Desc=Interface til at vise en osCommerce eller OSCSS shop via direkte database adgang
-Module900Name=OsCommerce fra WAS
-Module900Desc=Interface til at vise en osCommerce shop via Web services. \\ NDette modul requiere dig om at installere komponenter fra / oscommerce_ws / ws_server ind på din osCommerce server. Se README-fil i / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Regnskabsmæssig ekspert
@@ -493,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
@@ -501,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
@@ -512,16 +521,20 @@ 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 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
@@ -575,9 +588,6 @@ Permission92=Opret / ændre sociale bidrag og moms
 Permission93=Slet sociale bidrag og moms
 Permission94=Eksporter sociale bidrag
 Permission95=Læs rapporter
-Permission96=Setup lastfordelingen
-Permission97=Læs faktura regnskabspool lastfordelingen
-Permission98=Ekspeditionscentre faktura's regnskabslinjer
 Permission101=Læs sendings
 Permission102=Opret / ændre sendings
 Permission104=Valider sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Chart of accounts
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup gemt
 BackToModuleList=Tilbage til moduler liste
 BackToDictionaryList=Back to dictionaries list
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Professionel Id unikke
 MustBeUnique=Skal være unik?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 3a4d648203c..577f4ba40ef 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Aktioner
 ActionsArea=Aktioner område (Events og opgaver)
-Agenda= Agenda
-Agendas= Dagsordener
-Calendar= Kalender
-Calendars= Kalendere
-LocalAgenda=Lokal kalender
-AffectedTo= Påvirkes i
-DoneBy= Gøres ved at
-Events= Events
+Agenda=Agenda
+Agendas=Dagsordener
+Calendar=Kalender
+Calendars=Kalendere
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Påvirkes i
+DoneBy=Gøres ved at
+Event=Event
+Events=Events
 EventsNb=Number of events
 MyEvents=Mine begivenheder
 OtherEvents=Andre arrangementer
@@ -17,31 +19,33 @@ ListOfActions=Liste over begivenheder
 Location=Placering
 EventOnFullDay=Begivenhed på fuld dag
 SearchAnAction= Søg en action / opgave
-MenuToDoActions= Alle ufuldstændige tiltag
-MenuDoneActions= Alle henlagt aktioner
-MenuToDoMyActions= Min ufuldstændige aktioner
-MenuDoneMyActions= Min henlagt aktioner
-ListOfEvents= Liste over Dolibarr begivenheder
+MenuToDoActions=Alle ufuldstændige tiltag
+MenuDoneActions=Alle henlagt aktioner
+MenuToDoMyActions=Min ufuldstændige aktioner
+MenuDoneMyActions=Min henlagt aktioner
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Handlinger registreres af
 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
 ViewCal=Vis kalender
 ViewDay=Dagsvisning
 ViewWeek=Ugevisning
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Se med foruddefinerede filtre
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Startdato
 DateActionEnd= Slutdato
 AgendaUrlOptions1=Du kan også tilføje følgende parametre til at filtrere output:
 AgendaUrlOptions2=<b>login=<b>login= %s</b> for at begrænse produktionen til aktioner skabt af, påvirkes i eller udføres af <b>brugeren %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s</b> for at begrænse produktionen til aktioner skabt af <b>brugeren %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=<b>logint= %s</b> for at begrænse produktionen til aktioner påvirket til <b>brugeren %s.</b>
-AgendaUrlOptions5=<b>logind=<b>logind= %s</b> for at begrænse produktionen til aktioner udført af <b>brugeren %s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Vis fødselsdag kontakter
 AgendaHideBirthdayEvents=Skjul fødselsdag kontakter
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Eksport kalender
 ExtSites=Importer eksterne kalendere
-ExtSitesEnableThisTool=Vis eksterne kalendere til dagsorden
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Antallet af kalendere
 AgendaExtNb=Kalender nb %s
 ExtSiteUrlAgenda=URL for at få adgang. ICal fil
 ExtSiteNoLabel=Ingen beskrivelse
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 8fdd8d7fded..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=<b>Kreditformidleren note</b> 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). <br><br> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Klassificere "betales"
 ClassifyPaidPartially=Klassificere 'betales delvist'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Er du sikker på du vil annullere <b>faktura %s?</b>
 ConfirmCancelBillQuestion=hvorfor har du lyst til at klassificere denne faktura 'opgivet'?
 ConfirmClassifyPaidPartially=Er du sikker på du vil ændre <b>faktura %s</b> 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 <b>( %s %s)</b> er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg legalisere moms med en kreditnota.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløb til at betale <b>( %s %s)</b> 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 <b>( %s %s)</b> er en rabat, der ydes, fordi betalingen var foretaget før sigt. Jeg inddrive moms på denne rabat uden en kreditnota.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Rabat (betaling før sigt)
-SendBillRef=Send faktura %s
-SendReminderBillRef=Send faktura %s (påmindelse)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Stående ordrer
 StandingOrder=Stående ordre
 NoDraftBills=Nr. udkast til fakturaer
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total af to nye rabatten skal svare til de
 ConfirmRemoveDiscount=Er du sikker på du vil fjerne denne rabat?
 RelatedBill=Relaterede faktura
 RelatedBills=Relaterede fakturaer
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Omgående
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Bankindskud
 PaymentTypeShortVIR=Bankindskud
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index ca9b5b710f9..ec63e24aba0 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -16,7 +16,7 @@ SuppliersCategoriesArea=Suppliers' kategorier område
 CustomersCategoriesArea=Kundernes kategorier område
 ThirdPartyCategoriesArea=Tredjeparters kategorier område
 MembersCategoriesArea=Medlemmer kategorier område
-# ContactsCategoriesArea=Contacts categories area
+ContactsCategoriesArea=Contacts categories area
 MainCats=Hovedkategorier
 SubCats=Underkategorier
 CatStatistics=Statistik
@@ -50,15 +50,15 @@ SupplierIsInCategories=Tredjemand ejer til følgende leverandører kategorier
 CompanyIsInCustomersCategories=Denne tredjepart ejer til følgende kunder / udsigter kategorier
 CompanyIsInSuppliersCategories=Denne tredjepart ejer til følgende leverandører kategorier
 MemberIsInCategories=Dette medlem ejer til følgende medlemmer kategorier
-# ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=This contact owns to following contacts categories
 ProductHasNoCategory=Dette produkt / service er ikke i alle kategorier
 SupplierHasNoCategory=Denne leverandør er ikke i alle kategorier
 CompanyHasNoCategory=Dette selskab er ikke i alle kategorier
 MemberHasNoCategory=Dette medlem er ikke på nogen kategorier
-# ContactHasNoCategory=This contact is not in any categories
+ContactHasNoCategory=This contact is not in any categories
 ClassifyInCategory=Klassificering i kategori
 NoneCategory=Ingen
-# NotCategorized=Without category
+NotCategorized=Without category
 CategoryExistsAtSameLevel=Denne kategori allerede findes på samme sted
 ReturnInProduct=Tilbage til produkt / service kortet
 ReturnInSupplier=Tilbage til leverandøren kortet
@@ -66,7 +66,7 @@ ReturnInCompany=Tilbage til kunde / udsigt kortet
 ContentsVisibleByAll=Indholdet vil være synlige fra alle
 ContentsVisibleByAllShort=Indhold synlige fra alle
 ContentsNotVisibleByAllShort=Indholdet ikke er synligt fra alle
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=Slet kategori
 ConfirmDeleteCategory=Er du sikker på du vil slette denne kategori?
 RemoveFromCategory=Fjern link med Categorie
@@ -81,12 +81,12 @@ CustomersCategoriesShort=Kunder kategorier
 CustomersProspectsCategoriesShort=Custo. / prosp. kategorier
 ProductsCategoriesShort=Produkter kategorier
 MembersCategoriesShort=Medlemmer kategorier
-# ContactCategoriesShort=Contacts categories
+ContactCategoriesShort=Contacts categories
 ThisCategoryHasNoProduct=Denne kategori indeholder ingen produkt.
 ThisCategoryHasNoSupplier=Denne kategori indeholder ingen leverandør.
 ThisCategoryHasNoCustomer=Denne kategori indeholder ingen kunde.
 ThisCategoryHasNoMember=Denne kategori indeholder ikke et medlem.
-# ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Henføres til en kunde
 AssignedToTheCustomer=Henføres til kundens
 InternalCategory=Inernal kategori
@@ -96,18 +96,17 @@ CatSupList=Liste over leverandør kategorier
 CatCusList=Liste over kunde / udsigt kategorier
 CatProdList=Liste over produkter kategorier
 CatMemberList=Liste over medlemmer kategorier
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 91de76f8a6d..dcf77ba4f56 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Du skal oprette e-mails kontakter til tredjepart fø d
 ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over emner
 ListCustomersShort=Liste over kunder
-ThirdPartiesArea=Tredjeparter område
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Sidste %s ændret tredjeparter
 UniqueThirdParties=Samlet unikke tredjeparter
 InActivity=Åbent
@@ -410,3 +410,5 @@ OutstandingBillReached=Maks. for udstående fakturaer er nået
 MonkeyNumRefModelDesc=Retur værdi med format %syymm-nnnn for kunde-kode og %syymm-nnnn for leverandøren kode hvor yy er årstal, MM er måneden og nnnn er en sekvens uden mellemrum og ikke vende tilbage til 0.
 LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til enhver tid ændres.
 ManagingDirectors=Leder(e) navne (CEO, direktør, chef...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index cd807bc9c4c..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
@@ -187,7 +188,7 @@ 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=linket til ordre
+LinkedOrder=Link to order
 ReCalculate=Genberegn
 Mode1=Metode 1
 Mode2=Metode 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Kalkulations mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 29acfb9a95a..64929d78199 100644
--- a/htdocs/langs/da_DK/donations.lang
+++ b/htdocs/langs/da_DK/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donation
 Donations=Donationer
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=Donor
 Donors=Donorer
-AddDonation=Tilføj en donation
+AddDonation=Create a donation
 NewDonation=Ny donation
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=Gave løfte
 PromisesNotValid=Ikke valideret løfter
 PromisesValid=Valideret løfter
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Udkast
 DonationStatusPromiseValidatedShort=Valideret
 DonationStatusPaidShort=Modtaget
 ValidPromess=Validér løfte
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=Build modtagelse
 DonationsModels=Dokumenter modeller for donation kvitteringer
 LastModifiedDonations=Sidste %s ændret donationer
 SearchADonation=Søg en donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 37617620953..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 &quot;%s&quot; for parameter forkerte &quot;%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 <b>login %s</b> 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 <b>%s</b> anvendes til at udføre web-server har ikke tilladelse til at
 ErrorNoActivatedBarcode=Ingen stregkode aktiveret typen
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
index bbb34325b8f..133199646a2 100644
--- a/htdocs/langs/da_DK/exports.lang
+++ b/htdocs/langs/da_DK/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Kontonummer
 BankAccountNumberKey=Nøgle
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 8f49c732719..ad2a6324a0f 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Startdato
 DateFinCP=Slutdato
@@ -18,24 +18,24 @@ ApprovedCP=Godkendt
 CancelCP=Aflyst
 RefuseCP=Afviste
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Beskrivelse
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Redigér
 DeleteCP=Slet
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Annuller
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Opdatering
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Årsag
 UserCP=Bruger
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Opret
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Opdatering
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
index 214ec2c4965..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
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=Er du sikker på du vil slette denne intervention
 NameAndSignatureOfInternalContact=Navn og underskrift for at gribe ind:
 NameAndSignatureOfExternalContact=Navn og underskrift af kunde:
 DocumentModelStandard=Standard dokument model for indgreb
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Klassificere &quot;Billed&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=Generic antal model
 ArcticNumRefModelError=Det lykkedes ikke at aktivere
 PacificNumRefModelDesc1=Retur numero med format %syymm-nnnn hvor ÅÅ er årstal, MM er måneden og nnnn er en sekvens uden pause, og ikke vende tilbage til 0
 PacificNumRefModelError=En intervention kortet begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>bruger %s</b> 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<br/>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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> At betale med kreditkort eller Paypal, klik på knappen nederst på denne side. <br>
-# 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 <b>%s</b>
 ConfirmCancelOrder=Er du sikker på du vil annullere denne ordre?
 ConfirmMakeOrder=Er du sikker på du vil bekræfte, du har foretaget denne ordre <b>på %s?</b>
 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. <br><br> 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 a59caad3cc2..b267137b5e1 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Lukket
 ContractStatusRunning=Kørsel
 ContractStatusExpired=udløbet
 ContractStatusOnHold=Ikke kører
-ContractStatusToRun=En mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=Denne kontrakt er ikke kører
 ErrorProductAlreadyExists=Et produkt med henvisning %s eksisterer allerede.
 ErrorProductBadRefOrLabel=Forkert værdi for reference eller etiket.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Leverandører
 SupplierRef=Leverandør ref.
 ShowProduct=Vis produkt
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Klon vare eller tjenesteydelse
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller <b>tjenesteydelse %s?</b>
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 b1f670c8196..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
@@ -85,13 +87,13 @@ ActionsOnProject=Initiativer på projektet
 YouAreNotContactOfProject=Du er ikke en kontakt af denne private projekt
 DeleteATimeSpent=Slet tid
 ConfirmDeleteATimeSpent=Er du sikker på du vil slette denne tid?
-DoNotShowMyTasksOnly=Se også opgaver jeg er ikke påvirket
-ShowMyTasksOnly=Vis kun opgaver jeg er påvirket
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projekter dedikeret til denne tredjepart
 NoTasks=Ingen opgaver for dette projekt
 LinkedToAnotherCompany=Knyttet til tredjemand
-TaskIsNotAffectedToYou=Opgave ikke er allokeret til dig
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Tilbragte Tiden er tom
 ThisWillAlsoRemoveTasks=Denne handling vil også slette alle opgaver i projektet <b>(%s</b> opgaver i øjeblikket), og alle indgange af tid.
 IfNeedToUseOhterObjectKeepEmpty=Hvis nogle objekter (faktura, ordre, ...), der tilhører en anden tredjepart, skal knyttet til projektet for at skabe, holde denne tomme for at få projektet er flere tredjeparter.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=En komplet projekt rapport model (logo. ..)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 4d768428ab5..feec180528b 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=Seneste %s sendings
 SearchASending=Søg en sendeorganisation
 StatisticsOfSendings=Statistik over sendings
 NbOfSendings=Antal sendings
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Afsendelse kortet
 NewSending=Ny afsendelse
 CreateASending=Opret en sendeorganisation
@@ -50,27 +50,31 @@ Enlevement=Fået efter kunde
 DocumentModelSimple=Simpelt dokument model
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Advarsel, ikke produkter som venter på at blive afsendt.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Høvlet leveringsdato
 DateReceived=Dato levering modtaget
 SendShippingByEMail=Send forsendelse via e-mail
-SendShippingRef=Send forsendelse %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Arrangementer på forsendelse
 LinkToTrackYourPackage=Link til at spore din pakke
 ShipmentCreationIsDoneFromOrder=For øjeblikket er skabelsen af ​​en ny forsendelse udført af ordrekortet.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Simpelt dokument model for levering kvitteringer
 DocumentModelTyphon=Mere komplet dokument model for levering kvitteringer (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke defineret
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/da_DK/shop.lang b/htdocs/langs/da_DK/shop.lang
deleted file mode 100644
index 3d8769d31e3..00000000000
--- a/htdocs/langs/da_DK/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Seneste kendelser
-OnStandBy=På standby
-TreatmentInProgress=Behandling i gang
-LastCustomers=Seneste kunder
-OSCommerceShop=OsCommerce shop
-OSCommerce=OsCommerce
-AddProd=Sælge online
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/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index 602e012124d..4bb65dd313c 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=Bestil dato
 BuyingPrice=Koebspris
 BuyingPriceMin=Min købskurs
 BuyingPriceMinShort=Min købskurs
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Tilføj leverandør pris
 ChangeSupplierPrice=Skifte leverandør pris
 ErrorQtyTooLowForThisSupplier=Mængde for lav for denne leverandør eller ingen pris defineret om dette produkt for denne leverandør
@@ -27,7 +27,7 @@ RefSupplierShort=Ref. leverandør
 Availability=Tilgængelighed
 ExportDataset_fournisseur_1=Leverandør fakturaer listen og fakturaer 'linjer
 ExportDataset_fournisseur_2=Leverandør fakturaer og betalinger
-# ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Godkende denne ordre
 ConfirmApproveThisOrder=Er du sikker på at du vil godkende denne ordre?
 DenyingThisOrder=Benægte denne ordre
@@ -39,4 +39,6 @@ AddSupplierOrder=Opret leverandør for
 AddSupplierInvoice=Opret leverandørens faktura
 ListOfSupplierProductForSupplier=Liste over produkter og priser for <b>leverandørens %s</b>
 NoneOrBatchFileNeverRan=Ingen eller <b>parti %s</b> ikke kørte for nylig
-# SentToSuppliers=Sent to suppliers
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang
index 5bb096ae2de..e4f3690f70d 100644
--- a/htdocs/langs/da_DK/trips.lang
+++ b/htdocs/langs/da_DK/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Tur
 ListTripsAndExpenses=Liste over ture og omkostninger
 ExpensesArea=Udflugter og udgifter området
 SearchATripAndExpense=Søg en tur og regning
+ClassifyRefunded=Classify 'Refunded'
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_AT/shop.lang b/htdocs/langs/de_AT/shop.lang
deleted file mode 100644
index 5e7756c5b2b..00000000000
--- a/htdocs/langs/de_AT/shop.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-ShopWeb=Webshop
-OnStandBy=Im Standby-Modus
-TreatmentInProgress=Abwicklung in Arbeit
-AddProd=Produkt hinzuf�
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
new file mode 100644
index 00000000000..26cd766b83e
--- /dev/null
+++ b/htdocs/langs/de_CH/companies.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - companies
+JuridicalStatus600=Einzelfirma
+JuridicalStatus601=Einfache Gesellschaft
+JuridicalStatus602=Kollektivgesellschaft
+JuridicalStatus603=Kommanditgesellschaft
+JuridicalStatus604=Aktiengesellschaft (AG)
+JuridicalStatus605=Kommanditaktiengesellschaft
+JuridicalStatus606=Gesellschaft mit beschränkter Haftung (GmbH)
+JuridicalStatus607=Genossenschaft
+JuridicalStatus608=Verein
+JuridicalStatus609=Stiftung
\ No newline at end of file
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
new file mode 100644
index 00000000000..adbf494c99e
--- /dev/null
+++ b/htdocs/langs/de_CH/main.lang
@@ -0,0 +1,20 @@
+# 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
\ No newline at end of file
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
new file mode 100644
index 00000000000..96c7bf1a336
--- /dev/null
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Buchhaltung
+Globalparameters=Globale Parameter
+Chartofaccounts=Kontenplan
+Fiscalyear=Fiskalische Jahre
+Menuaccount=Buchhaltung Konten
+Menuthirdpartyaccount=Partnerkonten
+MenuTools=Werkzeuge
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journale
+JournalFinancial=Finanz-Journale
+Exports=Exports
+Modelcsv=Exportmodell
+Selectmodelcsv=Wählen Sie ein Exportmodell
+Modelcsv_normal=Klassischer Export
+Modelcsv_CEGID=Export zu CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Rückkehr 
+
+Definechartofaccounts=Kontenplan definieren
+Selectchartofaccounts=Kontenplan wählen
+Validate=Freigeben
+Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
+AccountAccounting=Buchhaltungs Konto
+Ventilation=Breakdown
+ToDispatch=Zu versenden
+Dispatched=Versandt
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Handelsspanne
+Reports=Berichte
+ByCustomerInvoice=Nach Kundenrechnungen
+ByMonth=Nach Monat
+NewAccount=Neues Buchhaltungskonto
+Update=Aktualisieren
+List=Liste
+Create=Erstelle
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=Hauptbuch
+AccountBalanceByMonth=Kontostand pro Monat
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Zeile
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=erörtern
+VentilationAuto=Automatic breakdown
+
+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=CSV Trennzeichen
+
+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=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
+ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Dokumententyp
+Docdate=Datum
+Docref=Referenz
+Numerocompte=Konto
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Soll
+Credit=Haben
+Amount=Betrag
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Verkaufsjournal
+PurchasesJournal=Einkaufsjournal
+DescSellsJournal=Verkaufsjournal
+DescPurchasesJournal=Einkaufsjournal
+BankJournal=Bankauszug
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Kassenbeleg
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Barzahlung
+
+SupplierInvoicePayment=Rechnungszahlung (Lieferant)
+CustomerInvoicePayment=Rechnungszahlung (Kunde)
+
+ThirdPartyAccount=Partner Konto
+
+NewAccountingMvt=Neue Änderung
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden
+
+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 des Plans
+Pcgtype=Kontenklasse
+Pcgsubtype=Unterkontenklasse
+Accountparent=Root of the account
+Active=Auszug
+
+NewFiscalYear=Neues fiskalisches Jahr
+
+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 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=Automatisch geltend machen
+
+ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nicht löschen, da es benutzt wird.
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 22824feca6b..bf4499985bc 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -45,15 +45,19 @@ ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls erfordert Dolibarr Versi
 ErrorDecimalLargerThanAreForbidden=Fehler: Eine höhere Genauigkeit als <b>%s</b> wird nicht unterstützt.
 DictionarySetup=Wörterbucheinstellungen
 Dictionary=Wörterbücher
+Chartofaccounts=Kontenplan
+Fiscalyear=Fiskalische Jahre
 ErrorReservedTypeSystemSystemAuto=Die Werte 'system' und 'systemauto' für Typ sind reserviert. Sie können 'user' als Wert verwenden, um Ihren eigenen Datensatz hinzuzufügen
 ErrorCodeCantContainZero=Code darf keinen Wert 0 enthalten
 DisableJavascript=JavaScript- und Ajax-Funktionen deaktivieren (empfohlen für Blinde und Text-Browser)
 ConfirmAjax=Ajax-Bestätigungs-Popups verwenden
-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.
+UseSearchToSelectCompanyTooltip=Wenn Sie eine große Anzahl von Partnern (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectCompany=Suchfeld statt Listenansicht für Partnerauswahl verwenden.
 ActivityStateToSelectCompany= Setzt einen Filter um Partner ein-/ausblenden, welche aktiv oder inaktiv sind.
-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.
+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
@@ -66,7 +70,7 @@ PreviewNotAvailable=Vorschau nicht verfügbar
 ThemeCurrentlyActive=Derzeit aktivierte Oberfläche
 CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
 MySQLTimeZone=Aktuelle Zeitzone von MySql (Datenbank)
-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=Daten werden vom Datenbank-Server gespeichert und zurückgeliefert, als würde der eingegebene String abgelegt werden. Die Zeitzone hat nur dann eine Auswirkung, wenn die UNIX_TIMESTAMP-Funktion benutzt wird (Dolibarr nutzt diese nicht, daher sollte die Datenbank-TZ keine Rolle spielen, selbst wenn diese nach Dateneingabe geändert wird).
 Space=Raum
 Table=Tabelle
 Fields=Felder
@@ -76,7 +80,7 @@ NextValue=Nächster Wert
 NextValueForInvoices=Nächster Wert (Rechnungen)
 NextValueForCreditNotes=Nächster Wert (Gutschriften)
 NextValueForDeposit=Nächster Wert (Scheck)
-NextValueForReplacements=Next value (replacements)
+NextValueForReplacements=Nächster Wert (Ersatz)
 MustBeLowerThanPHPLimit=Hinweis: Ihre PHP-Einstellungen beschränken die Größe für Dateiuploads auf <b>%s</b>%s
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Größenbeschränkungen hinterlegt
 MaxSizeForUploadedFiles=Maximale Größe für Dateiuploads (0 verbietet jegliche Uploads)
@@ -123,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
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Bei deaktiviertem JavaScript automatisch
 AvailableOnlyIfJavascriptNotDisabled=Nur bei aktiviertem JavaScript verfügbar
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Nur bei aktiviertem JavaScript und AJAX verfügbar
 Required=Erforderlich
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Sicherheit
 Passwords=Passwörter
 DoNotStoreClearPassword=Passwörter in der Datenbank nicht im Klartext speichern (Empfohlene Einstellung)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-Host (nicht in PHP definiert
 MAIN_MAIL_EMAIL_FROM=E-Mail-Absender für automatisch erzeugte Mails (standardmäßig in php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=E-Mail-Absender für rückkehrende fehlerhafte E-Mails
 MAIN_MAIL_AUTOCOPY_TO= Senden Sie automatisch eine Blindkopie aller gesendeten Mails an
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Senden Sie automatisch eine Blindkopie der verschickten Angebote an
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Senden Sie automatisch eine Blindkopie der verschickten Bestellungen an
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Senden Sie automatisch eine Blindkopie der gesendeten Rechnungen an
 MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen abschalten (für Test- oder Demozwecke)
 MAIN_MAIL_SENDMODE=Methode zum Senden von E-Mails
 MAIN_MAIL_SMTPS_ID=SMTP ID, wenn Authentifizierung erforderlich
@@ -388,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 <strong>%s</strong> records on <strong>%s</strong> %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 <strong>%s</strong> Datensätze in <strong>%s</strong> 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?
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce
-Module800Desc=Schnittstelle zur Verwaltung von OSCommerce über direkten Datenbankzugriff
-Module900Name=OSCommerce über Webservices
-Module900Desc=Schnittstelle zur Verwaltung von OSCommerce über WebServices \nDiese Modul erfordert die Installatio der Komponente /oscommerce_ws/ws_server auf Ihrem OSCommerce-Sercer. Siehe Readme-Datei in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis-Integation
 Module1400Name=Buchhaltung
@@ -493,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
@@ -501,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
@@ -512,18 +521,22 @@ Module5000Name=Mandantenfähigkeit
 Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Ferien
-Module20000Desc=Declare and follow employees holidays
+Module20000Name=Urlaubsantrags-Verwaltung
+Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
+Module39000Name=Produktstapel
+Module39000Desc=Chargen- oder Serien-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten
 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=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...)
 Module59000Name=Gewinnspannen
 Module59000Desc=Modul zur Verwaltung von Gewinnspannen
 Module60000Name=Kommissionen
@@ -575,9 +588,6 @@ Permission92=Steuern/Sozialbeiträge erstellen/bearbeiten
 Permission93=Steuern/Sozialbeiträge löschen
 Permission94=Sozialbeiträge exportieren
 Permission95=Berichte einsehen
-Permission96=Verbuchung einstellen
-Permission97=Rechnungszuweisung einsehen
-Permission98=Zuweisung der Rechnungszeilen
 Permission101=Sendungen einsehen
 Permission102=Sendungen erstellen/bearbeiten
 Permission104=Sendungen freigeben
@@ -603,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
@@ -640,7 +651,7 @@ Permission223=E-Mail-Kampagnen freigeben (erlaubt das Senden)
 Permission229=E-Mail-Kampagnen löschen
 Permission237=Zeige Empfänger und Info
 Permission238=Mails manuell senden
-Permission239=Delete mailings after validation or sent
+Permission239=Postausgang löschen nachdem die Gültigkeit ausgelaufen ist oder die Nachricht gesendet wurde.
 Permission241=Kategorien einsehen
 Permission242=Kategorien erstellen/bearbeiten
 Permission243=Kategorien löschen
@@ -668,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
@@ -698,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
@@ -746,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
@@ -775,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
@@ -788,15 +800,15 @@ VATIsNotUsedExampleFR=-
 LTRate=Rate
 LocalTax1IsUsed=Zweite Steuer nutzen
 LocalTax1IsNotUsed=Zweite Steuer nicht nutzen
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
+LocalTax1IsUsedDesc=Benutzen sie eine zweite Art von Steuer (andere als Mehrwertsteuer)
+LocalTax1IsNotUsedDesc=Benutzen sie keine andere Art von Steuer (anders als Mehrwertsteuer)
 LocalTax1Management=Zweite Steuer-Art
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsUsed=Dritte Steuer nutzen
 LocalTax2IsNotUsed=Dritte Steuer nicht nutzen
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
+LocalTax2IsUsedDesc=Benutzen Sie eine dritte Art von Steuer (anders als Mehrwertsteuer)
+LocalTax2IsNotUsedDesc=Benutzen sie keine andere Art von Steuer (anders als Mehrwertsteuer)
 LocalTax2Management=Dritte Steuer-Art
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
@@ -884,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
@@ -934,8 +947,8 @@ InfoWebServer=Infos Webserver
 InfoDatabase=Infos Datenbank
 InfoPHP=Infos PHP
 InfoPerf=Leistungs-Informationen
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=Browser Name
+BrowserOS=Betriebssystem des Browsers
 ListEvents=Liste aller protokollierten Ereignisse
 ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
 SecurityEventsPurged=Security-Ereignisse gelöscht
@@ -1035,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.
@@ -1046,10 +1058,10 @@ 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=Get barcode
+GetBarCode=Erhalten Sie einen Barcode
 EmptyNumRefModelDesc=Der Code ist frei. Dieser Code kann jederzeit geändert werden.
 ##### Module password generation
 PasswordGenerationStandard=Generiere ein Passwort nach dem internen Systemalgorithmus: 8 Zeichen, Zahlen und Kleinbuchstaben.
@@ -1071,10 +1083,11 @@ 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:<br>* pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.<br>* 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
+JSOnPaimentBill=Feature aktivieren, um Zahlungs-Zeilen in Zahlungs-Formularen automatisch zu füllen
 CompanyIdProfChecker=Berufs-Identifikation einzigartige
 MustBeUnique=Eindeutig sein müssen?
 MustBeMandatory=Erforderlich um Partner anzulegen?
@@ -1134,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
@@ -1142,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<br><b>%%1$s</b> wird durch die Telefonnummer des Angerufenen ersetzt<br><b>%%2$s</b> wird durch die Telefonnummer des Anrufers (Ihre) ersetzt<br><b>%%3$s</b> wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)<br><b>%%4$s</b> wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt).
@@ -1154,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 #####
@@ -1301,7 +1316,7 @@ LDAPDescGroups=Auf dieser Seite definieren Sie die LDAP-Attribute im LDAP-Baum f
 LDAPDescMembers=Auf dieser Seite definieren Sie die LDAP-Attribute im LDAP-Baum für jeden Datensatz zu dolibarr-Mitgliedern.
 LDAPDescValues=Die Beispielwerte für <b>OpenLDAP</b> verfügen über folgende Muster: <b>core.schema, cosine.schema, inetorgperson.schema</b>. Wenn Sie diese Werte für OpenLDAP verwenden möchten, passen Sie bitte die LDAP-Konfigurationsdateu <b>slapd.conf</b> entsprechend an, damit all diese Muster geladen werden.
 ForANonAnonymousAccess=Für einen authentifizierten Zugang (z.B. für Schreibzugriff)
-PerfDolibarr=Performance setup/optimizing report
+PerfDolibarr=Leistungs-Einstellungen/Optimierungsreport
 YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder Hinweise zur Leistung.
 NotInstalled=Nicht installiert, Ihr Server wird dadurch nicht verlangsamt.
 ApplicativeCache=Applicative cache
@@ -1310,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
@@ -1318,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
@@ -1328,12 +1343,12 @@ ConfirmDeleteProductLineAbility=Bestätigung für die Entfernung von Produktzeil
 ModifyProductDescAbility=Produktbeschreibungen in Formularen individuell anpassbar
 ViewProductDescInFormAbility=Anzeige dr Produktbeschreibungen in Formularen (andernfalls als Popup-Tooltip)
 ViewProductDescInThirdpartyLanguageAbility=Visualisierung von Produkten Beschreibungen in der Sprache 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.
+UseSearchToSelectProductTooltip=Wenn Sie eine große Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden.
 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
@@ -1364,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
@@ -1378,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
@@ -1401,15 +1417,16 @@ FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformati
 FCKeditorForProductDetails=WYSIWIG Erstellung/Bearbeitung der Produktdetails für alle Dokumente (Angebote, Bestellungen, Rechnungen, etc. ..) <br>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
@@ -1444,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: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Dienstleistungen
 OptionVatDebitOptionDesc=Mehrwertsteuerschuld entsteht: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Rechnungslegung (Lastschrift) für Dienstleistungen
 SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der MwSt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option:
@@ -1459,26 +1476,29 @@ Sell=Verkaufen
 InvoiceDateUsed=Rechnungsdatum verwendet
 YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine MwSt.-Verwendung definiert (Übersicht-Einstellungen-Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine MwSt.-Optionen zur Verfügung.
 AccountancyCode=Rechnungswesen-Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Verkaufskonto-Code
+AccountancyCodeBuy=Einkaufskonto-Code
 ##### Agenda #####
 AgendaSetup=Agenda-Moduleinstellungen
 PasswordTogetVCalExport=Passwort für den VCal-Export
 PastDelayVCalExport=Keine Termine exportieren die älter sind als
 AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_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.
@@ -1515,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
@@ -1531,5 +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: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 46de9cf169a..cdf2c1620ab 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -1,47 +1,51 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID Veranstaltung
-Actions=Aktionen
-ActionsArea=Bereich Maßnahmen (Veranstaltungen und Aufgaben)
-Agenda= Agenda
-Agendas= Tagesordnungen
-Calendar= Kalender
-Calendars= Kalender
-LocalAgenda=Lokaler Kalender
-AffectedTo= Zugewiesen an
-DoneBy= Erldedigt von
-Events= Veranstaltungen
-EventsNb=Anzahl Veranstaltungen
-MyEvents=Meine Veranstaltungen
-OtherEvents=Weitere Veranstaltungen
-ListOfActions=Veranstaltungsliste
+Actions=Termine
+ActionsArea=Bereich Termine (Veranstaltungen und Aufgaben)
+Agenda=Terminplanung
+Agendas=Tagesordnungen
+Calendar=Kalender
+Calendars=Kalender
+LocalAgenda=Internetkalender
+ActionsOwnedBy=Maßnahme gehört
+AffectedTo=Zugewiesen an
+DoneBy=Erldedigt von
+Event=Aktion
+Events=Termine
+EventsNb=Anzahl der Termine
+MyEvents=Meine Termine
+OtherEvents=Weitere Termine
+ListOfActions=Terminliste
 Location=Ort
 EventOnFullDay=Ganztägig
 SearchAnAction= Suche Maßnahme / Aufgabe
-MenuToDoActions= Alle unvollständigen Maßnahmen
-MenuDoneActions= Alle abgeschlossenen Maßnahmen
-MenuToDoMyActions= Meine offenen Maßnahmen
-MenuDoneMyActions= Meine abgeschlossenen Maßnahmen
-ListOfEvents= Veranstaltungsliste
-ActionsAskedBy=Maßnahmen erbeten von
-ActionsToDoBy=Maßnahmen zugewiesen an
-ActionsDoneBy=Maßnahmen erledigt von
+MenuToDoActions=Alle unvollständigen Termine
+MenuDoneActions=Alle abgeschlossenen Termine
+MenuToDoMyActions=Meine offenen Termine
+MenuDoneMyActions=Meine abgeschlossenen Termine
+ListOfEvents=Liste der Termine (Internetkalender)
+ActionsAskedBy=Termine eingetragen von
+ActionsToDoBy=Termine zugewiesen an
+ActionsDoneBy=Termine erledigt von
 ActionsForUser=Maßnahmen für Benutzer
 ActionsForUsersGroup=Maßnahmen für alle Benutzer der Gruppe
-AllMyActions= Alle meine Maßnahmen / Aufgaben
-AllActions= Alle Maßnahmen / Aufgaben
+ActionAssignedTo=Event assigned to
+AllMyActions= Alle meine Termine/Aufgaben
+AllActions= Alle Termine / Aufgaben
 ViewList=Listenansicht
 ViewCal=Kalenderansicht
 ViewDay=Tagesansicht
 ViewWeek=Wochenansicht
-ViewPerUser=Per user
+ViewPerUser=Ansicht nach Benutzer
 ViewWithPredefinedFilters= Ansicht mit vordefinierten Filtern
 AutoActions= Automatische Befüllung der Tagesordnung
-AgendaAutoActionDesc= Definieren Sie hier Maßnahmen zur automatischen Übernahme in die Agenda. Ist nichts aktviert (Standard), umfasst die Agenda nur manuell eingetragene Maßnahmen.
+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
@@ -49,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
@@ -57,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
@@ -70,17 +71,22 @@ AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern:
 AgendaUrlOptions2=<b>login=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> erstellte, betroffene oder erledigte Maßnahmen.
 AgendaUrlOptions3=<b>logina=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> erstellte Maßnahmen.
 AgendaUrlOptions4=<b>logint=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> betroffene Maßnahmen.
-AgendaUrlOptions5=<b>logind=%s</b> begrenzt die Ausgabe auf von Benutzer <b>%s</b> erledigte Maßnahmen.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> begrenzt die die Ausgabe auf Maßnahmen im Zusammenhang mit Projekt <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Zeige Geburtstage
 AgendaHideBirthdayEvents=Geburtstage ausblenden
 Busy=Besetzt
 ExportDataset_event1=Liste der Massnahmen
-
+DefaultWorkingDays=Standard-Werktage der Woche (z.B. 1-5, 1-6)
+DefaultWorkingHours=Reguläre Arbeitszeit pro Tag (z.B. 9-18)
 # External Sites ical
 ExportCal=Export Kalender
 ExtSites=Importieren von externen Kalendern
-ExtSitesEnableThisTool=Zeige externe Kalender in der Agenda
+ExtSitesEnableThisTool=Zeige externe Kalender (im globalen Setup definiert) in der Agenda. Betrifft nicht benutzerdefinierte externe Kalender.
 ExtSitesNbOfAgenda=Anzahl der Kalender
 AgendaExtNb=Kalender Anzahl %s
 ExtSiteUrlAgenda=URL Adresse um .ical Datei zu erreichen
 ExtSiteNoLabel=Keine Beschreibung
+WorkingTimeRange=Arbeitszeit-Bereich
+WorkingDaysRange=Arbeitstag-Bereich
+AddEvent=Maßnahme erstellen
+MyAvailability=Meine Verfügbarkeit
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 876edebae30..dc64c7dc846 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -133,7 +133,7 @@ CashBudget=Bargeldbestand
 PlannedTransactions=Geplante Transaktionen
 Graph=Grafiken
 ExportDataset_banque_1=Bankbewegungen und Kontoauszug
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Einzahlungsbeleg
 TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto
 TransactionWithOtherAccount=Konto Transaktion
 PaymentNumberUpdateSucceeded=Zahlungsnummer erfolgreich aktualisiert
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 6d9ca5cd957..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 <b>Gutschrift</b> 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
@@ -85,6 +85,7 @@ ClassifyPaid=Als 'bezahlt' markieren
 ClassifyPaidPartially=Als 'teilweise bezahlt' markieren
 ClassifyCanceled=Als 'storniert' markieren
 ClassifyClosed=Als 'geschlossen' markieren
+ClassifyUnBilled=Als "nicht verrechnet" markieren
 CreateBill=Erstelle Rechnung
 AddBill=Rechnung/Gutschrift erstellen
 AddToDraftInvoices=Zu Rechnungsentwurf hinzufügen
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Möchten Sie die Rechnung <b>%s</b> wirklich stornieren?
 ConfirmCancelBillQuestion=Warum wollen Sie klassifizieren diese Rechnung "aufgegeben"?
 ConfirmClassifyPaidPartially=Möchten Sie die Rechnung <b>%s</b> 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 <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Zur Korrektur der MwSt. lege ich eine Gutschrift an.
+ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Zur Korrektur der MwSt. wird eine Gutschrift angelegt.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Ich akzeptiere den Verlust der MwSt. aus diesem Rabatt.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Ich stelle die Mehrwertsteuer aus diesem Rabatt über eine Gutschrift wiederher.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Der offene Zahlbetrag <b>( %s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 ExcessReceived=Erhaltener Überschuss
 EscompteOffered=Rabatt angeboten (Skonto)
-SendBillRef=Sende Rechnung %s
-SendReminderBillRef=Rechnung senden %s (Zahlungserinnerung)
+SendBillRef=Einreichung der Rechnung %s
+SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
 StandingOrders=Daueraufträge
 StandingOrder=Dauerauftrag
 NoDraftBills=Keine Rechnungsentwürfe
@@ -218,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
@@ -289,12 +287,14 @@ DisabledBecauseReplacedInvoice=Aktion unzulässig, da die betreffende Rechnung e
 DescTaxAndDividendsArea=Dieser Bereich stellt eine Übersicht aller Zahlungen für sonstige Ausgaben dar. Nur Datensätze mit Zahlung im festgelegten Jahr sind enthalten.
 NbOfPayments=Zahl der Zahlungen
 SplitDiscount=Split Rabatt in zwei
-ConfirmSplitDiscount=Sind Sie sicher, dass Sie teilen wollen diesen Rabatt <b>von %s %s</b> in 2 niedrigere Rabatte?
+ConfirmSplitDiscount=Sind Sie sicher, dass Sie diesen Rabatt in Höhe von <b>%s</b>%s in 2 kleinere Rabatte teilen wollen?
 TypeAmountOfEachNewDiscount=Input für jeden der zwei Teile:
 TotalOfTwoDiscountMustEqualsOriginal=Insgesamt zwei neue Rabatt muss gleich zu den ursprünglichen Betrag Rabatt.
-ConfirmRemoveDiscount=Sind Sie sicher, dass Sie möchten, entfernen Sie diesen Rabatt?
+ConfirmRemoveDiscount=Sind Sie sicher, dass Sie diesen Rabatt entfernen möchten?
 RelatedBill=Ähnliche Rechnung
 RelatedBills=Ähnliche Rechnungen
+LatestRelatedBill=Letzte ähnliche Rechnung
+WarningBillExist=Achtung, es existiert bereits mindestens eine Rechnung
 
 # PaymentConditions
 PaymentConditionShortRECEP=Prompt
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% im Voraus, 50%% bei Lieferung
 FixAmount=Fester Betrag
 VarAmount=Variabler Betrag (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Banküberweisung
 PaymentTypeShortVIR=Banküberweisung
@@ -366,7 +365,7 @@ LawApplicationPart3=des Verkäufers bis zur vollständigen Bezahlung
 LawApplicationPart4=des Preises.
 LimitedLiabilityCompanyCapital=SARL mit einem Kapital von
 UseLine=Übernehmen
-UseDiscount=Verwenden
+UseDiscount=Rabatt verwenden
 UseCredit=Verwenden Sie diese Gutschrift
 UseCreditNoteInInvoicePayment=Reduzieren Sie die Zahlung mit dieser Gutschrift
 MenuChequeDeposits=Scheckeinlagen
@@ -396,8 +395,8 @@ ToMakePayment=Bezahlen
 ToMakePaymentBack=Rückzahlung
 ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen
 NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind.
-RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+RevenueStamp=Steuermarke
+YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird
 PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage)
 TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes 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
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 4e57b242874..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,3 +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=Folgendes Produkt/Dienstleistungen hinzufügen
+ShowCategory=Zeige Kategorie
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 751e4dd4a0b..955f35f8118 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -23,7 +23,7 @@ TaskRDVWith=Treffen mit %s
 ShowTask=Zeige Aufgabe
 ShowAction=Zeige Maßnahme
 ActionsReport=Maßnahmenbericht
-ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative
+ThirdPartiesOfSaleRepresentative=Partner mit Vertriebsmitarbeiter
 SalesRepresentative=Vertriebsmitarbeiter
 SalesRepresentatives=Vertreter
 SalesRepresentativeFollowUp=Vertriebsmitarbeiter (Follow-up)
@@ -44,8 +44,8 @@ DoneActions=Abgeschlossene Maßnahmen
 DoneActionsFor=Abgeschlossene Maßnahmen für %s
 ToDoActions=Unvollständige Maßnahmen
 ToDoActionsFor=Unvollständige Maßnahmen für %s
-SendPropalRef=Unser Angebot %s
-SendOrderRef=Sende Bestellung %s
+SendPropalRef=Einreichung der Angebote %s
+SendOrderRef=Einreichung der Bestellung %s
 StatusNotApplicable=Nicht anwendbar
 StatusActionToDo=Zu erledigen
 StatusActionDone=Abgeschlossen
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontaktaufnahme erledigt
 DateActionPlanned=Geplantes Erledigungsdatum
 DateActionDone=Echtes Erledigungsdatum
 ActionAskedBy=Maßnahme erbeten von
-ActionAffectedTo=Maßnahme zugewiesen an
+ActionAffectedTo=Maßnahme gehört
 ActionDoneBy=Maßnahme erledigt von
 ActionUserAsk=Aufgenommen durch
 ErrorStatusCantBeZeroIfStarted=Ist das Feld '<b>Echtes Erledigungsdatum</b>' ausgefüllt, so wurde die Aktion bereits gestartet (oder beendet) und der '<b>Status</b>' kann nicht 0%% sein.
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 13ff957914d..740a928cb51 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF wird verwendet
 LocalTax2IsNotUsedES= IRPF wird nicht verwendet
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=RE Typ
+TypeLocaltax2ES=EKSt. Typ
+TypeES=Typ
 ThirdPartyEMail=%s
 WrongCustomerCode=Kunden-Code ungültig
 WrongSupplierCode=Lieferanten-Code ungültig
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte für einen Partner an
 ListSuppliersShort=Liste der Lieferanten
 ListProspectsShort=Liste der Leads
 ListCustomersShort=Liste der Kunden
-ThirdPartiesArea=Partnerübersicht
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Letzten 15 bearbeiteten Partner
 UniqueThirdParties=Gesamte Anzahl der Kontakte
 InActivity=Aktiv
@@ -410,3 +410,5 @@ OutstandingBillReached=Maximum für ausstehende Rechnung erreicht
 MonkeyNumRefModelDesc=Zurück NUMERO mit Format %syymm-nnnn für den Kunden-Code und syymm%-nnnn für die Lieferanten-Code ist, wenn JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und kein Zurück mehr gibt, auf 0 gesetzt.
 LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden.
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 8e9aa735602..13aa22245fc 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -19,8 +19,8 @@ AmountToBeCharged=Zu zahlender Gesamtbetrag:
 AccountsGeneral=Konten
 Account=Konto
 Accounts=Konten
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Kontohalter
+Accountsparent=Kontohalter
 BillsForSuppliers=Lieferantenrechnungen
 Income=Einnahmen
 Outcome=Ausgaben
@@ -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,16 +179,16 @@ 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
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
+InvoiceDispatched=Versandte Rechnungen
+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=verknüpft mit Bestellung
+LinkedOrder=Link zur Bestellung
 ReCalculate=Neuberechnung
 Mode1=Methode 1
 Mode2=Methode 2
@@ -195,12 +196,11 @@ CalculationRuleDesc=Zur Berechnung der Gesamt-MwSt. gibt es zwei Methoden: <br>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 <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Berechnungsmodus
-AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
-COMPTA_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
-COMPTA_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen
-COMPTA_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen
-COMPTA_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen
-COMPTA_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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=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 17d09551e73..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
@@ -88,9 +88,10 @@ NoExpiredServices=Keine abgelaufen aktiven Dienste
 ListOfServicesToExpireWithDuration=Liste der Leistungen die in %s Tagen ablaufen
 ListOfServicesToExpireWithDurationNeg=Liste der Services die seit mehr als %s Tagen abgelaufen sind
 ListOfServicesToExpire=Liste der Services die ablaufen
-NoteListOfYourExpiredServices=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:
+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. <BR> For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 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 45670426545..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,4 +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
+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 68595d0d901..55b246e3c98 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Kein Fehler, wir führen fort
 # Errors
 Error=Fehler
 Errors=Fehler
-ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorButCommitIsDone=Fehler aufgetreten, Freigabe erfolgt dennoch
 ErrorBadEMail=E-Mail %s ist nicht korrekt
 ErrorBadUrl=URL %s ist nicht korrekt
 ErrorLoginAlreadyExists=Login %s existiert bereits.
@@ -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
@@ -63,7 +63,7 @@ ErrorSizeTooLongForVarcharType=Die Größe überschreitet das Maximum für den T
 ErrorNoValueForSelectType=Bitte Wert für Auswahlliste eingeben
 ErrorNoValueForCheckBoxType=Bitte Wert für Checkbox-Liste eingeben
 ErrorNoValueForRadioType=Bitte Wert für Radiobutton-Liste eingeben
-ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
+ErrorBadFormatValueList=Die Liste darf nicht mehr als ein <u>%s</u> enthalten, muss aber mindestens eines aus "llave,valores" beinhalten
 ErrorFieldCanNotContainSpecialCharacters=Das Feld <b>%s</b> darf keine Sonderzeichen enthalten.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf weder Sonderzeichen noch Großbuchstaben enthalten.
 ErrorNoAccountancyModuleLoaded=Kein Buchhaltungsmodul aktiviert
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Benutzer mit Anmeldung <b>%s</b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Fehler, Ihr PHP muss das Modul <b>%s</b> installiert haben um
 ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt, dass die Anmeldung mit OpenID möglich ist, aber die URL zum OpenID Service ist noch nicht in %s definiert.
 ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein
 ErrorBadFormat=Falsches Format!
-ErrorPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) darf nicht vor Rechnungsdatum (%s) liegen für Rechnung %s.
-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.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen.
 ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich.
+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
@@ -149,8 +169,10 @@ WarningsOnXLines=Warnhinweise in <b>%s</b> Quellzeilen
 WarningNoDocumentModelActivated=Für das Erstellen von Dokumenten ist keine Vorlage gewählt. Eine Vorlage wird standardmäßig ausgewählt, bis Sie die Moduleinstellungen angepasst haben.
 WarningLockFileDoesNotExists=Warnung, wenn Setup abgeschlossen ist, müssen Sie die Installations- und Migration-Tools deaktivieren. Dazu fügen Sie die Datei <b>install.lock</b> dem Verzeichnis <b> %s</b> hinzu. Das fehlend dieser Datei stelle eine Sicherheitslücke dar.
 WarningUntilDirRemoved=Diese Warnung bleibt so lange bestehen, bis die Sicherheitslücke geschlossen wurde (nur für Administratoren sichtbar).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningCloseAlways=Achtung: es wird auch dann geschlossen, wenn der Betrag zwischen Quelle und Ziel unterschiedlich ist. Aktivieren Sie dieses Feature mit Bedacht.
 WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtliche Seiten mit dieser Box spürbar.
 WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+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=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/exports.lang b/htdocs/langs/de_DE/exports.lang
index 4f4624a8e98..13bfdcaa123 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Kontonummer
 BankAccountNumberKey=Schlüssel
 SpecialCode=Spezialcode
 ExportStringFilter=%% erlaubt die Ersetzung eines oder mehrerer Zeichen im Text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtert nach einem Jahr/Monat/Tag<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filtert über einen Bereich von Jahren/Monaten/Tagen<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filtert auf die folgenden Jahre/Monate/Tage<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filtert auf die vorhergehenden Jahre/Monate/Tage
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filtert genau einen Wert<br>'NNNNN+NNNNN' filtert einen Wertebereich<br>'&gt;NNNNN' filtert nach kleineren Werten<br>'&gt;NNNNN' filtert nach größeren Werten
 ## filters
 SelectFilterFields=Wenn Sie nach bestimmten Werten filtern wollen, geben Sie diese Werte hier ein.
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/help.lang b/htdocs/langs/de_DE/help.lang
index b2c338165c3..1ab43a1a734 100644
--- a/htdocs/langs/de_DE/help.lang
+++ b/htdocs/langs/de_DE/help.lang
@@ -25,4 +25,4 @@ LinkToGoldMember=Sie können einen, vom System für Ihre Sprache (%s) automatisc
 PossibleLanguages=Unterstützte Sprachen
 MakeADonation=Unterstützen Sie das Projekt über eine Spende
 SubscribeToFoundation=Helfen auch Sie dem Dolibarr Projekt und unterstützen uns mit einer Abo-Spende.
-# SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Für offizielle Dolibarr Unterstützung in Ihrer Sprache: br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 820bace2c78..1a83603119d 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -1,41 +1,41 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Mitarbeiter
-Holidays=Ferien
-CPTitreMenu=Ferien
+Holidays=Urlaub
+CPTitreMenu=Urlaub
 MenuReportMonth=Monatsauszug
-MenuAddCP=Ferienantrag
-NotActiveModCP=Sie müssen das Ferien-Modul aktivieren um diese Seite zu sehen.
-NotConfigModCP=Sie müssen das Ferien-Modul konfigurieren um diese Seite zu sehen. Dazu <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> klicken Sie hier </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Ferienantrag
-Employe=Angestellter
-DateDebCP=Ferienbeginn
-DateFinCP=Ferienende
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">klicken Sie bitte hier</a>.
+NoCPforUser=Sie haben keinen Anspruch auf Urlaub.
+AddCP=Urlaubs-Antrag einreichen
+Employe=Mitarbeiter
+DateDebCP=Urlaubsbeginn
+DateFinCP=Urlaubsende
 DateCreateCP=Erstellungsdatum
 DraftCP=Entwurf
 ToReviewCP=Wartet auf Genehmigung
 ApprovedCP=Genehmigt
-CancelCP=Storno
+CancelCP=Zurückgezogen
 RefuseCP=Abgelehnt
 ValidatorCP=genehmigt durch
-ListeCP=Ferienliste
+ListeCP=Urlaubsliste
 ReviewedByCP=Wird geprüft von
 DescCP=Beschreibung
-SendRequestCP=Ferienantrag stellen
-DelayToRequestCP=Anträge für Ferien müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Ferien aktualisieren 
+SendRequestCP=Urlaubs-Antrag erstellen
+DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
+MenuConfCP=Urlaubsliste bearbeiten
+UpdateAllCP=Urlaube aktualisieren
 SoldeCPUser=Feriensaldo ist <b>%s</b> 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=Ein Fehler trat auf, der Antrag auf Ferien existiert nicht.
+ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht.
 ReturnCP=Zurück zur vorherigen Seite
-ErrorUserViewCP=Sie sind nicht berechtigt diese Ferien-Anträge zu lesen.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=Sie sind nicht berechtigt diesen Urlaubs-Antrag zu lesen.
+InfosCP=Hinweis zum Urlaubsantrag
 InfosWorkflowCP=Information Workflow
 RequestByCP=Beantragt von
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Anzahl Ferientage bezogen
+TitreRequestCP=Urlaubsantrag
+NbUseDaysCP=Anzahl genommene Urlaubstage
 EditCP=Bearbeiten
 DeleteCP=Lösche Gruppe
 ActionValidCP=Freigeben
@@ -43,71 +43,70 @@ ActionRefuseCP=Ablehnen
 ActionCancelCP=Abbrechen
 StatutCP=Status
 SendToValidationCP=Zur Überprüfung senden
-TitleDeleteCP=Antrag auf Ferien löschen
-ConfirmDeleteCP=Löschung dieses Ferienantrags bestätigen?
-ErrorCantDeleteCP=Fehler, Sie haben nicht die Berechtigung diesen Ferien-Antrag zu löschen.
-CantCreateCP=Sie haben nicht die Berechtigung Ferien zu beantragen.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Aktualisieren
-CantUpdate=You cannot update this request of holidays.
+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.
-TitleValidCP=Approve the request holidays
-ConfirmValidCP=Möchten Sie diesen Ferienantrag wirklich genehmigen?
-DateValidCP=Date approved
-TitleToValidCP=Ferienantrag senden
-ConfirmToValidCP=Möchten Sie diesen Ferienantrag wirklich senden?
-TitleRefuseCP=Ferienantrag ablehnen
-ConfirmRefuseCP=Möchten Sie diesen Ferienantrag wirklich ablehnen?
+ErrorDureeCP=Ihr Urlaubsantrag enthält keine Werktage.
+TitleValidCP=Urlaubsantrag genehmigen
+ConfirmValidCP=Möchten Sie diesen Urlaubsantrag wirklich genehmigen?
+DateValidCP=Datum genehmigt
+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=Möchten Sie diesen Ferienantrag wirklich abbrechen?
+TitleCancelCP=Urlaubsantrag stornieren
+ConfirmCancelCP=Möchten Sie diesen Urlaubsantrag wirklich stornieren?
 DetailRefusCP=Ablehnungsgrund
 DateRefusCP=Datum der Ablehnung
-DateCancelCP=Date of cancellation
+DateCancelCP=Datum der Absage
 DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+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 holidays
-LogCP=Liste von neuen Ferieneinträgen
+MenuLogCP=Zeige Logdaten zu Urlaubsanträgen
+LogCP=Log of updates of available vacation days
 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=Erster Ferientag
-LastDayOfHoliday=Letzter Ferientag
+FirstDayOfHoliday=Erster Urlaubstag
+LastDayOfHoliday=Letzter Urlaubstag
 HolidaysMonthlyUpdate=Monatliches Update
 ManualUpdate=Manuelles Update
-HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Konfiguration des Ferienmoduls
+ConfCP=Konfiguration des Urlaubsmoduls
 DescOptionCP=Beschreibung der Wahlmöglichkeit
 ValueOptionCP=Warenwert
-GroupToValidateCP=Gruppe mit der Fähigkeit Ferien zu bewilligen
+GroupToValidateCP=Gruppe mit der Berechtigung Urlaub zu bewilligen
 ConfirmConfigCP=Konfiguration bestätigen
-LastUpdateCP=Last updated automatically of holidays
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Erfolgreich bearbeitet.
 ErrorUpdateConfCP=Ein Fehler trat beim Bearbeiten auf, bitte nochmals versuchen.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Letzter Termin für Ferienanträge
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Anzahl unterstützte Benutzer im Ferienmodul
-nbHolidayDeductedCP=Anzahl Urlaubstage, die für jeden genommenem Ferientag abgezogen werden
-nbHolidayEveryMonthCP=Anzahl hinzugefügter Ferientage pro Monat
-Module27130Name= Verwaltung der Ferien
-Module27130Desc= Verwaltung der Ferien
-TitleOptionMainCP=Wichtigste Ferien-Einstellungen
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Bitte geben Sie die Anzahl Urlaubstage der Benutzer an,  <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">indem Sie hier klicken</a>.
+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=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
 CreateEventCP=Erstelle
@@ -125,25 +124,25 @@ TitleUpdateEventCP=Edit or delete a exceptional leave
 DeleteEventOptionCP=Lösche Gruppe
 UpdateEventOptionCP=Aktualisieren
 ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten:
-NoCPforMonth=No leave this month.
+NoCPforMonth=Kein Urlaub diesen Monat
 nbJours=Anzahl der Tage
-TitleAdminCP=Konfiguration der Ferien
+TitleAdminCP=Konfiguration der Urlaube
 #Messages
 Hello=Hallo
-HolidaysToValidate=Ferien freigeben
-HolidaysToValidateBody=Es folgt ein Ferienantrag zur Freigabe
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=Der Benutzer dieses Ferienantrags besitzt nicht mehr genügend verfügbare Tage.
-HolidaysValidated=Freigegebene Ferien
-HolidaysValidatedBody=Ihr Antrag auf Ferien von %s bis %s wurde bewilligt.
-HolidaysRefused=Abgelehnte Ferien
-HolidaysRefusedBody=Ihr Antrag auf Ferien von %s bis %s wurde aus folgendem Grund abgelehnt:
-HolidaysCanceled=Stornierte Ferien
-HolidaysCanceledBody=Ihr Antrag auf Ferien von %s bis %s wurde storniert.
-Permission20000=Eigene Ferien lesen
-Permission20001=Anlegen/Ändern Ihrer Ferien
-Permission20002=Anlegen/Ändern der Ferien für alle
+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=Benutzer-Ferien definieren
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+Permission20004=Bestimme die verfügbaren Urlaubstage des Benutzers
+Permission20005=Review log of modified leave requests
+Permission20006=Monatlichen Urlaubsbericht einsehen
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 62f5943aea2..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,10 +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
-ClassifyBilled=Eingegordnet "Angekündigt"
+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
@@ -39,4 +50,4 @@ ArcticNumRefModelError=Fehler beim aktivieren
 PacificNumRefModelDesc1=Liefere Nummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm das Monat und nnnn eine Zahlensequenz ohne Nullwert oder Leerzeichen ist
 PacificNumRefModelError=Eine Interventionskarte beginnend mit $syymm existiert bereits und ist nicht mir dieser Numerierungssequenz kompatibel. Bitte löschen oder umbenennen.
 PrintProductsOnFichinter=Drucke Produkte auf Eingriffskarte
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=forinterventions generated from orders
diff --git a/htdocs/langs/de_DE/link.lang b/htdocs/langs/de_DE/link.lang
index 8b1efb75ef3..759caca0876 100644
--- a/htdocs/langs/de_DE/link.lang
+++ b/htdocs/langs/de_DE/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 '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Verknüpfen Sie ein neues Dokument/Datei
+LinkedFiles=Verknüpfte Dateien und Dokumente
+NoLinkFound=Keine eingetragenen Verknüpfungen
+LinkComplete=Die Datei wurde erfolgreich verknüpft
+ErrorFileNotLinked=Die Datei konnte nicht Verknüpft werden
+LinkRemoved=Die Verknüpfung %s wurde entfernt
+ErrorFailedToDeleteLink= Fehler beim Löschen des Links  '<b>%s</b>'
+ErrorFailedToUpdateLink= Fehler beim Aktualisieren der Verknüpfung  '<b>%s</b>'
diff --git a/htdocs/langs/de_DE/mailmanspip.lang b/htdocs/langs/de_DE/mailmanspip.lang
index 8d117d47e23..443e785f10a 100644
--- a/htdocs/langs/de_DE/mailmanspip.lang
+++ b/htdocs/langs/de_DE/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
 MailmanSpipSetup=Konfiguration Mailman und SPIP Modul
-# MailmanTitle=Mailman mailing list system
-# TestSubscribe=To test subscription to Mailman lists
-# TestUnSubscribe=To test unsubscribe from Mailman lists
-# MailmanCreationSuccess=Subscription test was executed succesfully
-# MailmanDeletionSuccess=Unsubscription test was executed succesfully
-# SynchroMailManEnabled=A Mailman update will be performed
-# SynchroSpipEnabled=A Spip update will be performed
-# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-# DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed succesfully
+MailmanDeletionSuccess=Unsubscription test was executed succesfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
 SPIPTitle=SPIP Content Management System
 DescADHERENT_SPIP_SERVEUR=SPIP-Server
 DescADHERENT_SPIP_DB=SPIP-Datenbankname
 DescADHERENT_SPIP_USER=SPIP-Datenbankkennung
 DescADHERENT_SPIP_PASS=SPIP-Datenbankpasswort
-# AddIntoSpip=Add into SPIP
-# AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-# AddIntoSpipError=Failed to add the user in SPIP
-# DeleteIntoSpip=Remove from SPIP
-# DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-# DeleteIntoSpipError=Failed to suppress the user from SPIP
-# SPIPConnectionFailed=Failed to connect to SPIP
-# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Von SPIP entfernen
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
+SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
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 <b>%s</b> Empfänger je Sitzung beschränkt.
+LimitSendingEmailing=Hinweis: Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versand von E-Mails auf <b>%s</b> 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 <b>Komma</b>
-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 <strong>'%s'</strong> 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 <b>%s</b> 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 773da6f8764..33f2f2d402b 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -5,12 +5,12 @@ Margins=Gewinnspannen
 TotalMargin=Gesamt-Spanne
 MarginOnProducts=Gewinnspanne / Produkte
 MarginOnServices=Gewinnspanne / Services
-MarginRate=Margin rate
+MarginRate=Gewinnspannen-Rate
 MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
+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=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/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: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>Um mittels Kreditkarte zu zahlen, klicken Sie auf den Button am Seitenende.<br>
-# 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 fda7c03a005..0260b5de948 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -53,9 +53,9 @@ 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=Search a customer order
+SearchACustomerOrder=Kundenauftrag suchen
 ShipProduct=Produkt versenden
 Discount=Rabatt
 CreateOrder=Erzeuge Bestellung
@@ -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
@@ -101,7 +101,6 @@ RelatedOrders=Verknüpfte Bestellungen
 OnProcessOrders=Bestellungen in Bearbeitung
 RefOrder=Bestell-Nr.
 RefCustomerOrder=Kunden-Bestellung-Nr.
-CustomerOrder=Kundenbestellung
 RefCustomerOrderShort=Kunden-BestellNr.
 SendOrderByMail=Bestellung per Post versenden
 ActionsOnOrder=Maßnahmen zu dieser Bestellung
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konstante COMMANDE_ADDON nicht definiert
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Fehler beim Laden der Moduldatei '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Fehler beim Laden der Moduldatei '%s'
 Error_OrderNotChecked=Keine zu verrechnende Bestellungen ausgewählt
-
-
 # Sources
 OrderSource0=Angebot
 OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Vertrieb
 OrderSource6=Andere
 QtyOrdered=Bestellmenge
 AddDeliveryCostLine=Fügen Sie eine Versandkostenzeile zur Erfassung des Bestellgewichts ein
-
 # Documents models
 PDFEinsteinDescription=Eine vollständige Bestellvorlage (Logo, uwm.)
 PDFEdisonDescription=Eine einfache Bestellungsvorlage
@@ -155,14 +151,12 @@ OrderByFax=Fax
 OrderByEMail=E-Mail
 OrderByWWW=Online
 OrderByPhone=Telefon
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
+CreateInvoiceForThisCustomer=Bestellung verrechnen
+NoOrdersToInvoice=Keine Bestellungen Rechnungsfähig
 CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als "verarbeitet".
-MenuOrdersToBill2=Zu verrechnende Bestellungen
-# OrderCreation=Order creation
+OrderCreation=Erstellen einer Bestellung
 Ordered=Bestellt
 OrderCreated=Ihre Bestellungen wurden erstellt
 OrderFail=Ein Fehler trat beim Erstellen der Bestellungen auf
 CreateOrders=Erzeuge Bestellungen
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=Um eine Rechnung für verschiedene Bestellungen zu erstellen, klicken Sie erst auf Kunde und dann wählen Sie "%s".
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.<br /><br /> 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)-<b>Test</b> Mail (das Wort Test muss in Fettschrift erscheinen). <br> 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.<br>Die Änderungen an Ihrem Passwort werden erst wirksam, wenn Sie auf den im Mail enthaltenen Bestätigungslink klicken. <br> Ü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/paypal.lang b/htdocs/langs/de_DE/paypal.lang
index 4664f3ea94c..0ee356b52f7 100644
--- a/htdocs/langs/de_DE/paypal.lang
+++ b/htdocs/langs/de_DE/paypal.lang
@@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Sie befinden sich im &quot;Sandbox&quot;-Modus
 NewPaypalPaymentReceived=Neue PayPal-Zahlung erhalten
 NewPaypalPaymentFailed=Neue Paypal-Zahlung probiert, aber fehlgeschlagen
 PAYPAL_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht)
-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=Rückkehr-URL nach Zahlung
+ValidationOfPaypalPaymentFailed=Validierung der Paypal-Zahlung gescheitert
+PaypalConfirmPaymentPageWasCalledButFailed=Zahlungsbestätigungsseite für Paypal wurde von Paypal aufgerufen, aber Bestätigung fehlgeschlagen
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 f3ffd2fbb5b..e222cf88f90 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Produktreferenz
 ProductLabel=Produkt-Beschriftung
-ProductServiceCard=Produkt-/Services-Karte
+ProductServiceCard=Produkt-/Dienstleistungs-Karte
 Products=Produkte
-Services=Services
+Services=Dienstleistungen
 Product=Produkt
-Service=Service
-ProductId=Produkt/Service ID
+Service=Dienstleistung
+ProductId=Produkt/Dienstleistungs ID
 Create=Erstelle
 Reference=Referenz
 NewProduct=Neues Produkt
-NewService=Neuer Service
+NewService=Neue Dienstleistung
 ProductCode=Produkt-Code
-ServiceCode=Service-Code
+ServiceCode=Dienstleistungs-Code
 ProductVatMassChange=MwSt-Massenänderung
-ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Services von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank!
+ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Dienstleistungen von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank!
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
 ProductAccountancyBuyCode=Buchhaltung - Aufwandskonto
 ProductAccountancySellCode=Buchhaltung - Erlöskonto
-ProductOrService=Produkt oder Service
-ProductsAndServices=Produkte und Services
-ProductsOrServices=Produkte oder Services
-ProductsAndServicesOnSell=Verfügbare Produkte und Services
-ProductsAndServicesNotOnSell=Aufgelassene Produkte und Services
-ProductsAndServicesStatistics=Produkt- und Service-Statistik
+ProductOrService=Produkt oder Dienstleistung
+ProductsAndServices=Produkte und Dienstleistungen
+ProductsOrServices=Produkte oder Dienstleistungen
+ProductsAndServicesOnSell=Verfügbare Produkte und Dienstleistungen
+ProductsAndServicesNotOnSell=Aufgelassene Produkte und Dienstleistungen
+ProductsAndServicesStatistics=Produkt- und Dienstleistungs-Statistik
 ProductsStatistics=Produktstatistik
 ProductsOnSell=Verfügbare Produkte
 ProductsNotOnSell=Aufgelassene Produkte
 ProductsOnSellAndOnBuy=Produkte weder für Ein- noch Verkauf
-ServicesOnSell=Verfügbare Services
-ServicesNotOnSell=Aufgelassene Services
-ServicesOnSellAndOnBuy=Services weder für Ein- noch Verkauf
+ServicesOnSell=Verfügbare Dienstleistungen
+ServicesNotOnSell=Aufgelassene Dienstleistungen
+ServicesOnSellAndOnBuy=Dienstleistungen weder für Ein- noch Verkauf
 InternalRef=Interne Referenz
-LastRecorded=Zuletzt erfasste, verfügbare Produkte/Services
-LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Services
-LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Services
+LastRecorded=Zuletzt erfasste, verfügbare Produkte/Dienstleistungen
+LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Dienstleistungen
+LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Dienstleistungen
 LastRecordedProducts=%s zuletzt erfasste Produkte
-LastRecordedServices=%s zuletzt erfasste Services
+LastRecordedServices=%s zuletzt erfasste Dienstleistungen
 LastProducts=Neueste Produkte
 CardProduct0=Produkt-Karte
-CardProduct1=Service-Karte
+CardProduct1=Dienstleistungs-Karte
 CardContract=Auftrags-Karte
 Warehouse=Warenlager
 Warehouses=Warenlager
@@ -74,24 +74,25 @@ NewPrice=Neuer Preis
 MinPrice=Mindestverkaufspreis
 MinPriceHT=Mindest-Verkaufspreis (ohne MwSt.)
 MinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
-CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt, wenn Sie einen zu hohen Rabatt geben.
+CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 ContractStatus=Vertragsstatus
 ContractStatusClosed=Geschlossen
 ContractStatusRunning=In Arbeit
 ContractStatusExpired=Abgelaufen
 ContractStatusOnHold=Nicht in Arbeit
-ContractStatusToRun=Zu bearbeiten
+ContractStatusToRun=zu bearbeiten
 ContractNotRunning=Dieser Vertrag wird nicht bearbeitet
 ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits.
 ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben.
-ErrorProductClone=Beim Duplizieren des Produkts oder Service ist ein Problem aufgetreten
+ErrorProductClone=Beim Duplizieren des Produkts oder der Dienstleistung ist ein Problem aufgetreten
+ErrorPriceCantBeLowerThanMinPrice=Fehler - Preis darf nicht unter dem Minimalpreis liegen.
 Suppliers=Lieferanten
 SupplierRef=Lieferanten-Artikelnummer
 ShowProduct=Produkt anzeigen
-ShowService=Zeige Service
-ProductsAndServicesArea=Produkt-und Services-Übersicht
+ShowService=Dienstleistung anzeigen
+ProductsAndServicesArea=Produkt-und Dienstleistungs-Übersicht
 ProductsArea=Produktübersicht
-ServicesArea=Services-Übersicht
+ServicesArea=Dienstleistungs-Übersicht
 AddToMyProposals=Zu meinen Angebote hinzufügen
 AddToOtherProposals=Zu Angeboten Anderer hinzufügen
 AddToMyBills=Zu meinen Rechnungen hinzufügen
@@ -112,16 +113,16 @@ SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ
 BarcodeValue=Barcode-Wert
 NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...)
 CreateCopy=Kopie erstellen
-ServiceLimitedDuration=Ist die Leistungserbringung eines Service zeitlich beschränkt:
-MultiPricesAbility=Mehrere Preisstufen pro Produkt/Service
-MultiPricesNumPrices=Preisnummer
+ServiceLimitedDuration=Ist die Erringung einer Dienstleistung zeitlich beschränkt:
+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
@@ -131,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?
@@ -143,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
@@ -158,14 +159,14 @@ DiscountQtyMin=Standard-Rabatt für die Menge
 NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert
 NoSupplierPriceDefinedForThisProduct=Einkaufskonditionen für dieses Produkt noch nicht definiert
 RecordedProducts=Erfasste Produkte
-RecordedServices=Erfasste Services
+RecordedServices=Erfasste Dienstleistungen
 RecordedProductsAndServices=Erfasste Produkte/Leistungen
 PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte
-PredefinedServicesToSell=Vordefinierte Services zum Verkauf
-PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Services
+PredefinedServicesToSell=Vordefinierte Dienstleistungen zum Verkauf
+PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Dienstleistungen
 PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte
-PredefinedServicesToPurchase=Vordefinierte Services zum Einkauf
-PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Services
+PredefinedServicesToPurchase=Vordefinierte Dienstleistungen zum Einkauf
+PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Dienstleistungen
 GenerateThumb=Erzeuge Vorschaubild
 ProductCanvasAbility=Verwende spezielle "canvas" Add-Ons
 ServiceNb=Leistung #%s
@@ -175,31 +176,31 @@ ListServiceByPopularity=Liste der Leistungen nach Beliebtheit
 Finished=Eigenproduktion
 RowMaterial=Rohmaterial
 CloneProduct=Produkt/Leistung duplizieren
-ConfirmCloneProduct=Möchten Sie <b>%s</b> wirklich duplizieren?
+ConfirmCloneProduct=Möchten Sie die Leistung <b>%s</b> wirklich duplizieren?
 CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
 ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
-CloneCompositionProduct=Unterprodukt/-Service duplizieren
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
 CustomerPrices=Kundenpreise
 SuppliersPrices=Lieferantenpreise
-SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Services)
+SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Dienstleistungen)
 CustomCode=Interner Code
 CountryOrigin=Urspungsland
 HiddenIntoCombo=In ausgewählten Listen nicht anzeigen
 Nature=Art
 ProductCodeModel=Vorlage für Produktreferenz
-ServiceCodeModel=Vorlage für Service-Referenz
+ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
 AddThisProductCard=Produktkarte erstellen
 HelpAddThisProductCard=Dies gibt ihnen die Möglichkeit, ein Produkt zu erstellen oder zu duplizieren wenn es noch nicht existiert.
-AddThisServiceCard=Service-Karte erstellen
-HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, einen Service zu erstellen oder zu duplizieren wenn er noch nicht existiert.
+AddThisServiceCard=Dienstleistungs-Karte erstellen
+HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, eine Dienstleistung zu erstellen oder zu duplizieren wenn sie noch nicht existiert.
 CurrentProductPrice=Aktueller Preis
-AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Service nutzen
+AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Dienstleistung nutzen
 AlwaysUseFixedPrice=Festen Preis nutzen
 PriceByQuantity=Preis nach Menge
 PriceByQuantityRange=Bereich der Menge
-ProductsDashboard=Produkt-und Services-Zusammenfassung
+ProductsDashboard=Produkt- und Dienstleistungs-Zusammenfassung
 UpdateOriginalProductLabel=Ursprüngliches Label verändern
 HelpUpdateOriginalProductLabel=Gibt die Möglichkeit, den Namen des Produkts zu bearbeiten
 ### composition fabrication
@@ -213,7 +214,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Automatisch für Produktion verbraucht
 ProductBuilded=Produktion fertiggestellt
 ProductsMultiPrice=Produkt Multi-Preis
-ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Services, Multi-Preise)
+ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Dienstleistungen, Multi-Preise)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=1. Quartal
@@ -233,9 +234,16 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner
 BarCodeDataForProduct=Barcode-Information von Produkt %s:
 BarCodeDataForThirdparty=Barcode-Information von Partner %s:
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Price by customer
-PriceCatalogue=Unique price per product/service
+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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 009c36d1a7c..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
@@ -91,7 +93,7 @@ TaskRessourceLinks=Ressourcen
 ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte
 NoTasks=Keine Aufgaben für dieses Projekt
 LinkedToAnotherCompany=Mit Partner verknüpft
-TaskIsNotAffectedToYou=Der Aufgabe sind sie nicht zugeordnet
+TaskIsNotAffectedToYou=Aufgabe nicht Ihnen zugeordnet
 ErrorTimeSpentIsEmpty=Zeitaufwand ist leer
 ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (<b>%s</b> 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,11 +122,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Mitwirkender
 TypeContact_project_task_external_TASKCONTRIBUTOR=Mitwirkender
 SelectElement=Element wählen
 AddElement=Mit Element verknüpfen
+UnlinkElement=Verknüpfung zu Element aufheben
 # Documents models
 DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.)
 PlannedWorkload = Geplante Auslastung
 WorkloadOccupation= Beeinflussung der Auslastung
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+ProjectReferers=Bezugnahmen
+SearchAProject=Suchen Sie ein Projekt
+ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
+ProjectDraft=Projekt-Entwürfe
+FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 0fbf941d777..dd29ee21783 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -98,5 +98,5 @@ TypeContact_propal_external_CUSTOMER=Partnerkontakt für Angebot
 DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, uwm.)
 DocModelJauneDescription=Angebotsvorlage <Jaune>
 DefaultModelPropalCreate=Erstellung Standardvorlage
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung)
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/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 8748f77ee64..b1477807c4e 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Buchhaltungscode für Bezahlung der Gehälter
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
 Salary=Lohn
 Salaries=Löhne
 Employee=Angestellter
@@ -6,3 +8,5 @@ NewSalaryPayment=Neue Lohnzahlung
 SalaryPayment=Lohnzahlung
 SalariesPayments=Lohnzahlungen
 ShowSalaryPayment=Zeige Lohnzahlung
+THM=Durchschnittlicher Stundenpreis
+TJM=Durchschnittlicher Tagespreis
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index cfe8e713759..294d8e50e77 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -50,27 +50,31 @@ Enlevement=Vom Kunden erhalten
 DocumentModelSimple=Einfache Dokumentvorlage
 DocumentModelMerou=Merou A5-Modell
 WarningNoQtyLeftToSend=Achtung, keine Produkte für den Versand
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Versandstatistik (nur Freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
 DateDeliveryPlanned=Geplantes Zustellungsdatum
 DateReceived=Datum der Zustellung
 SendShippingByEMail=Verand per E-Mail
-SendShippingRef=Senden Lieferung %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Anmerkungen zur Sendung
 LinkToTrackYourPackage=Link zur Sendungsnachverfolgung
 ShipmentCreationIsDoneFromOrder=Aktuell ist die Erstellung der neuen Sendung über die Bestellkarte erfolgt.
 RelatedShippings=Ähnliche Sendungen
 ShipmentLine=Sendungszeilen
 CarrierList=Liste der Transporter
+SendingRunning=Produkt aus Kundenbestellung bereits versandt
+SuppliersReceiptRunning=Produkt aus Lieferantenbestellung bereits erhalten
 
 # Sending methods
 SendingMethodCATCH=Abholung durch Kunden
 SendingMethodTRANS=Spedition
 SendingMethodCOLSUI=Expressversand
-
 # ModelDocument
 DocumentModelSirocco=Einfache Dokumentvorlage für die Lieferungscheine
 DocumentModelTyphon=Vollständig Dokumentvorlage für die Lieferungscheine (Logo, ...)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstante EXPEDITION_ADDON_NUMBER nicht definiert
 SumOfProductVolumes=Summe der Produktevolumen
 SumOfProductWeights=Summe der Produktegewichte
+
+# warehouse details
+DetailWarehouseNumber= Warenlager-Details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/de_DE/shop.lang b/htdocs/langs/de_DE/shop.lang
deleted file mode 100644
index d435660b0f1..00000000000
--- a/htdocs/langs/de_DE/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Internetshop
-LastOrders=Letzte Bestellungen
-OnStandBy=Im Warte-Modus
-TreatmentInProgress=In Bearbeitung
-LastCustomers=Letzte Kunden
-OSCommerceShop=OsCommerce Shop
-OSCommerce=OSCommerce
-AddProd=Produkt hinzufügen
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 02cdb4098ed..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
@@ -88,7 +88,7 @@ PersonalStock=Persönlicher Warenbestand %s
 ThisWarehouseIsPersonalStock=Dieses Lager bezeichnet den persönlichen Bestand von %s %s
 SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme
 SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang
-NoStockAction=No stock action
+NoStockAction=Keine Vorratsänderung
 LastWaitingSupplierOrders=Bestellungen warten auf Wareneingang
 DesiredStock=gewünschter Lagerbestand
 StockToBuy=zu bestellen
@@ -109,10 +109,10 @@ WarehouseForStockIncrease=Das Lager <b>%s</b> wird für Wareneingang verwendet
 ForThisWarehouse=Für dieses Lager
 ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte, deren Lagerbestand unter dem Sollbestand liegt (bzw. unter der Alarmschwelle, wenn die Auswahlbox "Nur Alarm" gewählt ist) , die Ihnen Vorschläge für Lieferantenbestellungen liefert, um die Differenzen auszugleichen.
 ReplenishmentOrdersDesc=Dies ist die Liste aller offenen Lieferantenbestellungen
-Replenishments=Replenishments
+Replenishments=Nachschub
 NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
 NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
-MassMovement=Mass movement
+MassMovement=Massenbewegung
 MassStockMovement=Massen-Umlagerung
 SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s".
 RecordMovement=Record transfert
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 697448686a6..4db654bb0ac 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Lieferantenrechnung erstellen
 ListOfSupplierProductForSupplier=Produkt- und Preisliste für Anbieter <b>%s</b>
 NoneOrBatchFileNeverRan=Keiner oder Batch-Job <b>%s</b> wurde nie ausgeführt
 SentToSuppliers=An Lieferanten geschickt
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index caab416d3e9..a4dabc3ce01 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Reise
 ListTripsAndExpenses=Liste der Reisen und Spesen
 ExpensesArea=Spesenübersicht
 SearchATripAndExpense=Suchen nach einer Reise oder Aufwänden
+ClassifyRefunded=Classify 'Refunded'
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 221b0f125b6..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?
@@ -114,8 +113,10 @@ YourRole=Ihre Rolle
 YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht
 NbOfUsers=Anzahl der Benutzer
 DontDowngradeSuperAdmin=Nur ein SuperAdmin kann einen SuperAdmin downgraden
-HierarchicalResponsible=In der Hierarchie verantwortlich
+HierarchicalResponsible=Aufseher
 HierarchicView=Hierarchische Ansicht
 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 fef59beb67f..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
@@ -56,7 +56,7 @@ StatusCredited=Eingelöst
 StatusRefused=Abgelehnt
 StatusMotif0=Nicht spezifiziert
 StatusMotif1=Unzureichende Deckung
-StatusMotif2=Request contested
+StatusMotif2=Anfrage bestritten
 StatusMotif3=Kein Abbuchungsauftrag
 StatusMotif4=Kundenanfrage
 StatusMotif5=nicht nutzbare Kontodaten
@@ -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
new file mode 100644
index 00000000000..d77b366a57c
--- /dev/null
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Λογιστική
+Globalparameters=Βασικοί Παράμετροι
+Chartofaccounts=Διάγραμμα των λογαριασμών
+Fiscalyear=Οικονομικά έτη
+Menuaccount=Λογαριασμοί Λογιστικής
+Menuthirdpartyaccount=Λογαριασμοί Πελ./Προμ.
+MenuTools=Εργαλεία
+
+ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert
+Journaux=Ημερολόγια
+JournalFinancial=Οικονιμικά ημερολόγια
+Exports=Εξαγωγές
+Modelcsv=Πρότυπο εξαγωγής
+Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή
+Modelcsv_normal=Κλασική εξαγωγή
+Modelcsv_CEGID=Εξαγωγή προς CEGID εμπειρογνωμόνων
+BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
+Back=Επιστροφή
+
+Definechartofaccounts=Ορίστε ένα διάγραμμα των λογαριασμών
+Selectchartofaccounts=Επιλέξτε ένα διάγραμμα των λογαριασμών
+Validate=Επικύρωση
+Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
+AccountAccounting=Λογιστική λογαριασμού
+Ventilation=Ανάλυση
+ToDispatch=Για την αποστολή
+Dispatched=Αποστέλλονται
+
+CustomersVentilation=Ανάλυση πελατών
+SuppliersVentilation=Ανάλυση προμηθευτών
+TradeMargin=Εμπορικό Περιθώριο
+Reports=Αναφορές
+ByCustomerInvoice=Με τιμολόγια πελατών
+ByMonth=Μέχρι το μήνα
+NewAccount=Νέος λογιστικός λογαριασμός
+Update=Ενημέρωση
+List=Λίστα
+Create=Δημιουργία
+UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού
+UpdateMvts=Τροποποίηση μιας κίνησης
+WriteBookKeeping=Εγγραφή λογαριασμών σε γενικό βιβλίο
+Bookkeeping=Γενικό Καθολικό
+AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα
+
+AccountingVentilation=Ανάλυση των λογαριασμών
+AccountingVentilationSupplier=Ανάλυση λογιστικών προμηθευτή
+AccountingVentilationCustomer=Ανάλυση λογιστικών των πελατών
+Line=Γραμμή
+
+CAHTF=Σύνολο προμηθευτή αγορά ΗΤ
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=Στο λογιστικό λογαριασμό
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Επεξεργασία
+EndProcessing=Τέλος της επεξεργασίας
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Επιλεγμένες γραμμές
+Lineofinvoice=Γραμμή τιμολογίου
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=Διαχωριστικό CSV
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+
+AccountLength=Μήκος των λογιστικών λογαριασμών που φαίνονται στο Dolibarr
+AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρίνεαι μήκος του λογιστικού λογαριασμού αντικαθιστώντας χώρους από τον αριθμό μηδέν. Η λειτουργία αυτή αγγίζει μόνο την οθόνη, δεν τροποποιούν τους λογιστικούς λογαριασμούς στο Dolibarr. Για την εξαγωγή, αυτή η λειτουργία είναι απαραίτητη για να είναι συμβατή με το συγκεκριμένο λογισμικό.
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Τύπος εγγράφου
+Docdate=Ημερομηνία
+Docref=Παραπομπή
+Numerocompte=Λογαριασμός
+Code_tiers=Πελ./Προμ.
+Labelcompte=Ετικέτα λογαριασμού
+Debit=Χρέωση
+Credit=Πίστωση
+Amount=Σύνολο
+Sens=Σημασία
+Codejournal=Ημερολόγιο
+
+DelBookKeeping=Διαγράψτε τα αρχεία της γενικής λογιστικής
+
+SellsJournal=Ημερολόγιο πωλήσεων
+PurchasesJournal=Ημερολόγιο αγορών
+DescSellsJournal=Ημερολόγιο πωλήσεων
+DescPurchasesJournal=Ημερολόγιο αγορών
+BankJournal=Τραπεζικό ημερολόγιο
+DescBankJournal=Ημερολόγιο Τράπεζας, συμπεριλαμβανομένων όλων των ειδών πληρωμών εκτός από τα μετρητά
+CashJournal=Ημερολόγιο μετρητών
+DescCashJournal=Ημερολόγιο μετρητών καθώς και το είδος των ταμειακών πληρωμών
+
+CashPayment=Καταβολή Μετρητών
+
+SupplierInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
+CustomerInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
+
+ThirdPartyAccount=Λογαριασμός Πελ./Προμ.
+
+NewAccountingMvt=Νέα κίνηση
+NumMvts=Αριθμός κίνησης
+ListeMvts=Λίστα των κινήσεων
+ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
+
+ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ.
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=Λίστα των λογιστικών λογαριασμών
+
+Pcgversion=Έκδοση του σχεδίου
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=Νέα οικονομική χρονιά
+
+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 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=Αυτόματη επικύρωση
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 8fc2ca802a0..14ccab0887d 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Λάθος, αυτό το module απαιτε
 ErrorDecimalLargerThanAreForbidden=Λάθος, μια διευκρίνιση μεγαλύτερη από <b>%s</b> δεν υποστηρίζεται.
 DictionarySetup=Ρύθμισης λεξικού
 Dictionary=Λεξικά
+Chartofaccounts=Διάγραμμα λογαριασμών
+Fiscalyear=Οικονομικά έτη
 ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» για τον τύπο είναι κατοχυρωμένα. Μπορείτε να χρησιμοποιήσετε το «χρήστη» ως αξία για να προσθέσετε το δικό σας μητρώο
 ErrorCodeCantContainZero=Ο κώδικας δεν μπορεί να περιέχει την τιμή 0
 DisableJavascript=Απενεργοποίηση της Java ακολουθίας και των Ajax  λειτουργιών (Προτείνεται για χρήση από άτομα με προβλήματα όρασης ή φυλλομετρητές κειμένου)
@@ -54,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=Εμφάνιση πλήρους χρονοδιαγράμματος γεγονότων στο φύλλο ΠΕΛ./ΠΡΟΜ.
@@ -116,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)
@@ -133,7 +137,7 @@ Box=Πλαίσιο
 Boxes=Πλαίσια
 MaxNbOfLinesForBoxes=Μέγιστο πλήθος γραμμών για τα πλαίσια πληροφοριών
 PositionByDefault=Προκαθορισμένη σειρά
-Position=Σειρά
+Position=Θέση
 MenusDesc=Οι διαχειριστές μενού καθορίζουν το περιεχόμενο των 2 μπαρ μενού (οριζόντια γραμμή και κάθετη γραμμή).
 MenusEditorDesc=Ο επεξεργαστής μενού σας επιτρέπει να ορίσετε προσωπικές καταχωρήσεις στα μενού.  Χρησιμοποιήστε το με προσοχή για να αποφύγετε να κάνετε το dolibarr ασταθές και τις καταχωρήσεις μενού μόνιμα απρόσιτες.<br>Μερικές μονάδες προσθέτουν καταχωρήσεις στα μενού (στο μενού <b> All </ b> στις περισσότερες περιπτώσεις). Εάν αφαιρεθεί κάποια από αυτές τις καταχωρήσεις κατά λάθος, μπορείτε να τα επαναφέρετε με την απενεργοποίηση και εκ νέου ενεργοποίηση της μονάδας.
 MenuForUsers=Μενού για τους χρήστες
@@ -206,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=Διαθέσιμα Πλαίσια
@@ -217,6 +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=Χρησιμοποιείται μόνο από κάποια επιλογή της ατζέντας
 Security=Ασφάλεια
 Passwords=Συνθηματικά
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,8 +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: <b>%s</b>)
 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_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=Μέθοδος που χρησιμοποιείτε για αποστολή 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
@@ -307,7 +316,7 @@ ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
 DoTestServerAvailability=Έλεγχος διασύνδεσης server
 DoTestSend=Δοκιμή Αποστολής
-DoTestSendHTML=Test sending HTML
+DoTestSendHTML=Δοκιμή αποστολής HTML
 ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ για να μηδενίσετε το μετρητή για κάθε έτος, εάν η ακολουθία {yy} ή {yyyy} δεν είναι μάσκα.
 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.
@@ -431,14 +440,14 @@ Module52Name=Αποθήκες
 Module52Desc=Stock's management of products
 Module53Name=Υπηρεσίες
 Module53Desc=Service management
-Module54Name=Συμβόλαια
-Module54Desc=Contract's and service's management
+Module54Name=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Τηλεφωνία
 Module56Desc=Telephony integration
 Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -469,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=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=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα)
@@ -478,13 +487,9 @@ Module500Desc=Διαχείριση των ειδικών δαπανών, όπω
 Module510Name=Μισθοί
 Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
 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=Δωρεές
 Module700Desc=Donation management
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,6 +498,8 @@ Module1780Name=Κατηγορίες
 Module1780Desc=Category management (products, suppliers and customers)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Μενού
 Module2300Desc=Scheduled task management
 Module2400Name=Ατζέντα
@@ -501,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
@@ -512,16 +521,20 @@ Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Ροή εργασίας
 Module6000Desc=Διαχείρισης Ροών Εργασιών
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
+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=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=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Ανοικτή Ψηφοφορία
 Module55000Desc=Πρόσθετο για την δημιουργία μιας διαδικτυακής έρευνας (όπως Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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=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=Διαγραφή ταξιδιών και εξόδων
+Permission174=Read all trips and expenses
+Permission178=Εξαγωγή ταξιδιών και εξόδων
 Permission180=Read suppliers
 Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
@@ -668,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
@@ -698,8 +709,8 @@ Permission701=Read donations
 Permission702=Δημιουργία / τροποποίηση δωρεές
 Permission703=Διαγραφή δωρεές
 Permission1001=Διαβάστε τα αποθέματα
-Permission1002=Δημιουργία / τροποποίηση των αποθεμάτων
-Permission1003=Διαγραφή των αποθεμάτων
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Διαβάστε τις κινήσεις αποθεμάτων
 Permission1005=Δημιουργία / τροποποίηση των κινήσεων του αποθέματος
 Permission1101=Read delivery orders
@@ -775,6 +786,7 @@ DictionaryOrderMethods=Μέθοδος Παραγγελίας
 DictionarySource=Προέλευση των προτάσεων/παραγγελιών
 DictionaryAccountancyplan=Λογιστικό σχέδιο
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 BackToModuleList=Πίσω στη λίστα με τα modules
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Προκαθορισμένη Γλώσσα (κωδ. γλώσσας)
 EnableMultilangInterface=Ενεργοποίησ πολυγλωσσικού περιβάλλοντος
 EnableShowLogo=Εμφάνιση λογότυπου στο αριστερό μενού
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Το σύστημά σας αναβαθμίστηκε επιτυχώς
 CompanyInfo=Πληροφορίες Εταιρίας/Οργανισμού
 CompanyIds=Ταυτότητες Εταιρίας/Οργανισμού
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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 on draft document
+JSOnPaimentBill=Ενεργοποιήστε τη δυνατότητα να συμπληρώνει αυτόματα τις γραμμές πληρωμής σε έντυπο πληρωμής
 CompanyIdProfChecker=Επαγγελματική ταυτότητα μοναδική
 MustBeUnique=Πρέπει να είναι μοναδικό;
 MustBeMandatory=Υποχρεωτική για τη δημιουργία Πελ./Προμ.;
@@ -1134,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
@@ -1142,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=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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,7 +1169,7 @@ FicheinterNumberingModules=Intervention numbering models
 TemplatePDFInterventions=Intervention card documents models
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
 ##### Contracts #####
-ContractsSetup=Συμβάσεις εγκατάσταση μονάδας
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=Συμβάσεις αρίθμησης ενοτήτων
 TemplatePDFContracts=Συμβάσεις μοντέλα εγγράφων
 FreeLegalTextOnContracts=Ελεύθερο κείμενο για τις συμβάσεις
@@ -1318,7 +1333,7 @@ FilesOfTypeNotCompressed=Αρχεία τύπου %s δεν συμπιέζοντ
 CacheByServer=Cache από τον server
 CacheByClient=Cache από τον browser
 CompressionOfResources=Συμπίεση HTTP απαντήσεων
-TestNotPossibleWithCurrentBrowsers=Αυτόματη ανίχνευση δεν είναι δυνατή
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας
@@ -1378,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=Κατάλογος των διαθέσιμων κοινοποιήσεων (Αυτή η λίστα εξαρτάται από την ενεργοποίηση 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
@@ -1408,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
@@ -1474,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=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.
@@ -1531,5 +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=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
+NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
+NbSpeMin=Ελάχιστος αριθμός ειδικών χαρακτήρων
+NbIteConsecutive=Ελάχιστος αριθμός επανάληψης ίδιων χαρακτήρων
+NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+SalariesSetup=Setup of module salaries
+SortOrder=Σειρά ταξινόμησης
 Format=Μορφή
+TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 437e12e05f8..cf4031d8785 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=Αναγνωριστικού συμβάντος
 Actions=Ενέργειες
 ActionsArea=Περιοχή Ενεργειών (γεγονότα και εργασίες)
-Agenda= Ημερολόγιο
-Agendas= Ημερολόγια
-Calendar= Ημερολόγιο
-Calendars= Ημερολόγια
-LocalAgenda=Τοπικό ημερολόγιο
-AffectedTo= Ανάθεση σε
-DoneBy= Έγινε από
-Events= Ενέργειες
+Agenda=Ημερολόγιο
+Agendas=Ημερολόγια
+Calendar=Ημερολόγιο
+Calendars=Ημερολόγια
+LocalAgenda=Εσωτερικό ημερολόγιο
+ActionsOwnedBy=Το γεγονός ανήκει
+AffectedTo=Ανάθεση σε
+DoneBy=Έγινε από
+Event=Εκδήλωση
+Events=Ενέργειες
 EventsNb=Αριθμός γεγονότων
 MyEvents=Τα γεγονότα μου
 OtherEvents=Άλλα γεγονότα
@@ -17,31 +19,33 @@ ListOfActions=Λίστα γεγονότων
 Location=Τοποθεσία
 EventOnFullDay=Ολοήμερο Γεγονός
 SearchAnAction= Αναζήτηση ενέργειας/εργασίας
-MenuToDoActions= Όλες οι ημιτελής ενέργειες
-MenuDoneActions= Όλες οι ολοκληρ. ενέργειες
-MenuToDoMyActions= Ημιτελής ενέργειες
-MenuDoneMyActions= Ολοκληρωμένες ενέργειες
-ListOfEvents= Λίστα γεγονότων του Dolibarr
+MenuToDoActions=Όλες οι ημιτελής ενέργειες
+MenuDoneActions=Όλες οι ολοκληρ. ενέργειες
+MenuToDoMyActions=Ημιτελής ενέργειες
+MenuDoneMyActions=Ολοκληρωμένες ενέργειες
+ListOfEvents=Κατάλογος των συμβάντων (εσωτερικό ημερολόγιο)
 ActionsAskedBy=Ενέργειες που καταχωρήθηκαν από
 ActionsToDoBy=Ενέργειες που ανατέθηκαν σε
 ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από
 ActionsForUser=Γεγονότα για τον χρήστη
 ActionsForUsersGroup=Γεγονότα όλων των χρηστών της ομάδας
+ActionAssignedTo=Event assigned to
 AllMyActions= Όλες οι ενέργειες/εργασίες μου
 AllActions= Όλες οι ενέργειες/εργασίες
 ViewList=Εμφάνιση Λίστας
 ViewCal=Μηνιαία προβολή
 ViewDay=Προβολή ημέρας
 ViewWeek=Προβολή εβδομάδας
-ViewPerUser=Ανά χρήστη
+ViewPerUser=Προβολή ανά χρήστη
 ViewWithPredefinedFilters= Εμφάνιση με προκαθορισμένα φίλτρα
 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 επικυρώθηκε
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=Παραγγελία %s εγκρίθηκε
 OrderRefusedInDolibarr=Παραγγελία %s απορριφθεί
 OrderBackToDraftInDolibarr=Παραγγελία %s θα επιστρέψει στην κατάσταση σχέδιο
 OrderCanceledInDolibarr=Παραγγελία %s ακυρώθηκε
-InterventionValidatedInDolibarr=Η παρέμβαση %s επικυρώθηκε
 ProposalSentByEMail=Η εμπορική πρόταση %s στάλθηκε με e-mail
 OrderSentByEMail=Η παραγγελία του πελάτη %s εστάλη με EMail
 InvoiceSentByEMail=Το τιμολόγιο του πελάτη %s εστάλη με EMail
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=Η παραγγελία προμηθευτή %s στά
 SupplierInvoiceSentByEMail=Το τιμολόγιο προμηθευτή %s στάλθηκε με e-mail
 ShippingSentByEMail=Αποστολές %s αποστέλλονται με ηλεκτρονικό ταχυδρομείο
 ShippingValidated= Αποστολές %s επικυρωθεί
-InterventionSentByEMail=Παρέμβαση %s αποστέλλονται με ηλεκτρονικό ταχυδρομείο
-InterventionClassifiedBilled=Παρέμβαση %s ταξινόμηση ως τιμολογημένα
 NewCompanyToDolibarr= Το στοιχείο δημιουργήθηκε
 DateActionPlannedStart= Προγρ/σμένη ημερομηνία έναρξης
 DateActionPlannedEnd= Προγρ/σμένη ημερομηνία λήξης
@@ -68,19 +69,24 @@ DateActionStart= Ημερομηνία έναρξης
 DateActionEnd= Ημερομηνία λήξης
 AgendaUrlOptions1=Μπορείτε ακόμη να προσθέσετε τις ακόλουθες παραμέτρους για να φιλτράρετε τα αποτέλεσμα:
 AgendaUrlOptions2=<b>login=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν και έγιναν από τον χρήστη <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που δημιουργήθηκαν από τον χρήστη<b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> να περιορίσει την παραγωγή ενεργειών που ανήκουν στον χρήστη <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που αφορούν τον χρήστη<b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> για να περιορίσετε τα αποτελέσματα σε ενέργειες που έγιναν από τον χρήστη <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> να περιορίσει την παραγωγή της σε ενέργειες που σχετίζονται με το έργο <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Εμφάνιση γενεθλίων των προσώπων επικοινωνίας
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των προσώπων επικοινωνίας
 Busy=Απασχολ.
 ExportDataset_event1=Κατάλογος των εκδηλώσεων
-
+DefaultWorkingDays=Προεπιλογή εργάσιμες ημέρες που κυμαίνονται την εβδομάδα (παράδειγμα: 1-5, 1-6)
+DefaultWorkingHours=Προεπιλογή ώρες εργασίας ανά ημέρα (Παράδειγμα: 9-18)
 # External Sites ical
 ExportCal=Εξαγωγή ημερολογίου
 ExtSites=Εισαγωγή εξωτερικών ημερολογίων
-ExtSitesEnableThisTool=Εμφάνιση εξωτερικών ημερολογίων στην ατζέντα
+ExtSitesEnableThisTool=Εμφάνιση εξωτερικών ημερολογίων (ορίζεται από τις γενικές ρυθμίσεις) στην ημερήσια διάταξη. Δεν επηρεάζει τα εξωτερικά ημερολόγια που ορίζονται από τους χρήστες.
 ExtSitesNbOfAgenda=Αριθμός ημερολογίων
 AgendaExtNb=Ημερολόγιο nb %s
 ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .ical αρχείο
 ExtSiteNoLabel=Χωρίς Περιγραφή
+WorkingTimeRange=Εύρος χρόνου εργασίας
+WorkingDaysRange=Εύρος ημερών εργασίας
+AddEvent=Δημιουργία συμβάντος
+MyAvailability=Η διαθεσιμότητα μου
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index b7a53568915..c8a0d2af2e3 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Πιστωτικό σημείωμα
 InvoiceAvoirAsk=Πιστωτικό σημείωμα για την διόρθωση τιμολογίου
 InvoiceAvoirDesc=Το <b>πιστωτικό σημείωμα</b>είναι ένα αρνητικό τιμολόγιο που χρησιμοποιείτε για να λύσει τη κατάσταση κατά την οποία το σύνολο του τιμολογίου διαφέρει από το σύνολο της πραγματικής πληρωμής (ίσως επειδή ο πελάτης πλήρωσε περισσότερα -- από λάθος, ή επειδή πλήρωσε λιγότερα και επέστρεψε κάποια προϊόντα).
 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
@@ -85,8 +85,9 @@ ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο''
 ClassifyPaidPartially=Χαρακτηρισμός ως 'Μη Εξοφλημένο'
 ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο'
 ClassifyClosed=Χαρακτηρισμός ως 'Κλειστό'
+ClassifyUnBilled=Ταξινομήστε τα «Μη τιμολογημένα»
 CreateBill=Δημιουργία Τιμολογίου
-AddBill=Προσθήκη τιμολ./πιστ. σημ.
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Προσθήκη στο πρόχειρο τιμολόγιο
 DeleteBill=Διαγραφή Τιμολογίου
 SearchACustomerInvoice=Εύρεση τιμολογίου πελάτη
@@ -98,7 +99,7 @@ DoPaymentBack=Do payment back
 ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
-DisabledBecauseRemainderToPayIsZero=Απενεργοποιήθηκε λόγω μηδενικού υπολοίπου
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Σύνολο
 PriceBase=Τιμή βάσης
 BillStatus=Κατάσταση τιμολογίου
@@ -136,8 +137,6 @@ BillFrom=Από
 BillTo=Στοιχεία Πελάτη
 ActionsOnBill=Ενέργειες στο τιμολόγιο
 NewBill=Νέο τιμολόγιο
-Prélèvements=Πάγιες Εντολές
-Prélèvements=Πάγιες Εντολές
 LastBills=Τελευταία %s τιμολόγια
 LastCustomersBills=Τελευταία %s τιμολόγια πελατών
 LastSuppliersBills=Τελευταία %s τιμολόγια προμηθευτών
@@ -155,9 +154,9 @@ ConfirmCancelBill=Είστε σίγουροι ότι θέλετε να ακυρ
 ConfirmCancelBillQuestion=Γιατί θέλετε να χαρακτηρίσετε το τιμολόγιο ώς "Εγκαταλειμμένο"
 ConfirmClassifyPaidPartially=Είστε σίγουροι ότι θέλετε να αλλάξετε την κατάσταση τιμολογίου <b>%s</b> σε 'Πληρωμένο';
 ConfirmClassifyPaidPartiallyQuestion=Το τιμολόγιο δεν αποπληρώθηκε. Για ποιο λόγο θέλετε να κλείσετε το τιμολόγιο;
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
 ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
 ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους
@@ -190,15 +189,15 @@ AlreadyPaid=Ήδη πληρωμένο
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις)
 Abandoned=Εγκαταλελειμμένο
-RemainderToPay=Υπόλοιπο
-RemainderToTake=Υπόλοιπο προς είσπραξη
-RemainderToPayBack=Υπόλοιπο για την αποπληρωμή
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
 Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Περίσσεια που λήφθηκε
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Αποστολή τιμολογίου %s
-SendReminderBillRef=Αποστολή τιμολογίου %s (υπενθύμιση)
+SendBillRef=Υποβολή των τιμολογίων %s
+SendReminderBillRef=Υποβολή των τιμολογίων %s (υπενθύμιση)
 StandingOrders=Πάγιες Εντολές
 StandingOrder=Πάγια εντολή
 NoDraftBills=Δεν υπάρχουν προσχέδια
@@ -218,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=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=Create from template invoice
 CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
 CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
 ExportDataset_invoice_1=Customer invoices list and invoice's lines
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Το σύνολο των δύο νέων τ
 ConfirmRemoveDiscount=Είστε σίγουροι ότι θέλετε να αφαιρέσετε την έκπτωση;
 RelatedBill=Σχετιζόμενο τιμολόγιο
 RelatedBills=Σχετιζόμενα τιμολόγια
+LatestRelatedBill=Τελευταίο σχετικό τιμολόγιο
+WarningBillExist=Προσοχή, ένα ή περισσότερα τιμολόγια υπάρχουν ήδη
 
 # PaymentConditions
 PaymentConditionShortRECEP=Άμεση
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 61543f9747e..c011ce85374 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -12,6 +12,7 @@ BoxLastProspects=Τελευταίες τροποποιημένες προοπτ
 BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες
 BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές
 BoxLastCustomerOrders=Τελευταίες παραγγελίες πελατών
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Τελευταία Βιβλία
 BoxLastActions=Τελευταίες Ενέργειες
 BoxLastContracts=Τελευταία συμβόλαια
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Πλήθος πελατών
 BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s
 BoxTitleLastProducts=Τα %s πιο πρόσφατα τροποποιημένα προϊόντα/υπηρεσίες
 BoxTitleProductsAlertStock=Προειδοποίηση προϊόντων σε απόθεμα
-BoxTitleLastCustomerOrders=Οι %s πιο πρόσφατα τροποποιημένες παραγγελίες πελατών
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Οι %s πιο πρόσφατα καταχωρημένοι προμηθευτές
 BoxTitleLastCustomers=Οι %s πιο πρόσφατα καταχωρημένοι πελάτες
 BoxTitleLastModifiedSuppliers=Οι %s πιο πρόσφατα τροποποιημένοι προμηθευτές
 BoxTitleLastModifiedCustomers=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες
-BoxTitleLastCustomersOrProspects=Οι %s πιο πρόσφατα τροποποιημένοι πελάτες ή προοπτικές
-BoxTitleLastPropals=Οι %s πιο πρόσφατα καταχωρημένες προσφορές
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Τα %s πιο πρόσφατα τιμολόγια πελατών
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Τα %s πιο πρόσφατα τιμολόγια προμηθευτών
-BoxTitleLastProspects=Οι %s πιο πρόσφατες προσφορές
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Οι %s πιο πρόσφατα τροποποιημένες προσφορές
 BoxTitleLastProductsInContract=Τα %s πιο πρόσφατα συμβόλαια με προϊόντα/υπηρεσίες
-BoxTitleLastModifiedMembers=Τελευταία %s τροποποίηση των μελών
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Τελευταία %s ενημέρωση παρέμβασης
-BoxTitleOldestUnpaidCustomerBills=Τα %s παλαιότερα απλήρωτα τιμολόγια πελατών
-BoxTitleOldestUnpaidSupplierBills=Τα %s παλαιότερα απλήρωτα τιμολόγια προμηθευτών
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Άνοιξε τα υπόλοιπα των λογαριασμών
 BoxTitleSalesTurnover=Κύκλος εργασιών των πωλήσεων
 BoxTitleTotalUnpaidCustomerBills=Απλήρωτα τιμολόγια πελατών
-BoxTitleTotalUnpaidSuppliersBills=Απλήρωτα τιμολόγια προμηθευτών
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Οι  τελευταίες %s τροποποιημένες επαφές / διευθύνσεις
 BoxMyLastBookmarks=Οι %s νεότεροι σελιδοδείκτες μου
 BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει
@@ -76,7 +80,8 @@ NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβό
 NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια
 NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις
 BoxLatestSupplierOrders=Τελευταίες παραγγελίες προμηθευτών
-BoxTitleLatestSupplierOrders=Οι %s τελευταίες παραγγελίες προμηθευτών
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=Δεν υπάρχουν καταχωρημένες παραγγελίες προμηθευτών
 BoxCustomersInvoicesPerMonth=Τιμολόγια πελατών ανά μήνα
 BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτών ανά μήνα
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index d432192c352..542fb2cf04f 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -66,7 +66,7 @@ ReturnInCompany=Πίσω στην καρτέλα πελάτη/προοπτική
 ContentsVisibleByAll=Τα περιεχόμενα θα είναι ορατά από όλους
 ContentsVisibleByAllShort=Περιεχόμενα ορατά από όλους
 ContentsNotVisibleByAllShort=Περιεχόμενα μη ορατά από όλους
-# CategoriesTree=Categories tree
+CategoriesTree=Δέντρο κατηγοριών
 DeleteCategory=Διαγραφή Κατηγορίας
 ConfirmDeleteCategory=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την κατηγορία;
 RemoveFromCategory=Αφαιρέστε το σύνδεσμο από την κατηγορία
@@ -101,13 +101,12 @@ CatSupLinks=Προμηθευτές
 CatCusLinks=Πελάτες/Προοπτικές
 CatProdLinks=Προϊόντα
 CatMemberLinks=Σχέσεις μεταξύ των μελών και των κατηγοριών
-CatProdLinks=Προϊόντα
-CatCusLinks=Πελάτες/Προοπτικές
-CatSupLinks=Προμηθευτές
 DeleteFromCat=Κατάργηση από την κατηγορία
-# 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
+DeletePicture=Διαγραφή εικόνας
+ConfirmDeletePicture=Επιβεβαιώστε τη διαγραφή εικόνας
+ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
+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=Εάν το πεδίο '<b>Date done</b>' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο '<b>Status</b>' δεν μπορεί να είναι 0%%.
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 532bbaf1d40..420b797c36c 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Πρέπει να δημιουργήσετε αντι
 ListSuppliersShort=Λίστα Προμηθευτών
 ListProspectsShort=Λίστα Προοπτικών
 ListCustomersShort=Λίστα Πελατών
-ThirdPartiesArea=Περιοχή Στοιχείων
+ThirdPartiesArea=Περιοχή Πελ./Προμ. και επαφών
 LastModifiedThirdParties=%s τελευταίοι τροποποιημένοι Πελ./Προμ.
 UniqueThirdParties=Σύνολο μοναδικών Πελ./Προμ.
 InActivity=Ανοιχτό
@@ -410,3 +410,5 @@ OutstandingBillReached=Έφτασε στο όριο. για των εκκρεμ
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
 ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
+SearchThirdparty=Αναζήτηση Πελ./Προμ.
+SearchContact=Αναζήτηση επαφής
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 89dac1035d2..c9aaba74e1a 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/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=Έλεγχος Πίστωσης
 CheckReceiptShort=Check deposit
+LastCheckReceiptShort=Έλεγχος τελευταίων %s εισπράξεων
 NewCheckReceipt=Νέα έκπτωση
 NewCheckDeposit=Νέα κατάθεση επιταγής
 NewCheckDepositOn=Create receipt for deposit on account: %s
@@ -187,7 +188,7 @@ AccountancyDashboard=Accountancy summary
 ByProductsAndServices=By products and services
 RefExt=Εξωτερικές αναφορές
 ToCreateAPredefinedInvoice=Για να δημιουργήσει ένα προκαθορισμένο τιμολόγιο, δημιουργήσετε ένα πρότυπο τιμολόγιο στη συνέχεια, χωρίς επικύρωση, κάντε κλικ στο κουμπί "Μετατροπή σε προκαθορισμένο τιμολόγιο".
-LinkedOrder=που συνδέονται με την παραγγελία
+LinkedOrder=Σύνδεση με παραγγελία
 ReCalculate=Επανυπολογισμός
 Mode1=Μέθοδος 1
 Mode2=Τρόπος 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε
 TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακής λογιστικής</b> mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστικής δέσμευσης</b> τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής).
 CalculationMode=Τρόπο υπολογισμού
 AccountancyJournal=Λογιστικος Κωδικός περιοδικό
-COMPTA_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για να αγοράσουν τα προϊόντα
-COMPTA_PRODUCT_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση των προϊόντων
-COMPTA_SERVICE_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την αγορά των υπηρεσιών
-COMPTA_SERVICE_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση υπηρεσιών
-COMPTA_VAT_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ
-COMPTA_VAT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ
-COMPTA_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτη
-COMPTA_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για προμηθευτή
+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. <BR> For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
 CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
 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/dict.lang b/htdocs/langs/el_GR/dict.lang
index d711c0c5c2a..cf78416afc0 100644
--- a/htdocs/langs/el_GR/dict.lang
+++ b/htdocs/langs/el_GR/dict.lang
@@ -253,7 +253,6 @@ CivilityMR=Κύριος
 CivilityMLE=Κυρία
 CivilityMTRE=Master
 CivilityDR=Doctor
-
 ##### Currencies #####
 Currencyeuros=€
 CurrencyAUD=AU Dollars
@@ -290,10 +289,10 @@ 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=Εκστρατεία για τις Ταχυδρομικές
@@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Word of mouth
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Employee
 DemandReasonTypeSRC_SPONSORING=Sponsorship
-
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang
index 0ca29f1560b..69898f3d4aa 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=Create a donation
 NewDonation=Νέα δωρεά
 ShowDonation=Εμφάνιση δωρεάς
 DonationPromise=Υπόσχεση δώρου
@@ -30,3 +30,9 @@ SearchADonation=Αναζήτηση μια δωρεά
 DonationRecipient=Δικαιούχος δωρεάς
 ThankYou=Σας ευχαριστούμε
 IConfirmDonationReception=Ο δικαιούχος δηλώνει αποδοχή, ως δωρεά, το ακόλουθο ποσό
+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/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 4614ceff6ba..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=Χρήστης με <b>%s</b> login δεν θα μπορ
 ErrorLoginHasNoEmail=Αυτός ο χρήστης δεν έχει τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Επεξεργασία ματαιώθηκε.
 ErrorBadValueForCode=Κακό αξία για τον κωδικό ασφαλείας. Δοκιμάστε ξανά με νέα τιμή ...
 ErrorBothFieldCantBeNegative=Πεδία %s %s και δεν μπορεί να είναι τόσο αρνητικές όσο
+ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμή στα τιμολόγια των πελατών δεν μπορεί να είναι αρνητική
 ErrorWebServerUserHasNotPermission=Λογαριασμό χρήστη <b>%s</b> χρησιμοποιείται για την εκτέλεση του web server δεν έχει άδεια για τη συγκεκριμένη
 ErrorNoActivatedBarcode=Δεν ενεργοποιείται τύπου barcode
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Σφάλμα, η PHP σας πρέπει να έχει το m
 ErrorOpenIDSetupNotComplete=Μπορείτε να ρυθμίσετε το Dolibarr αρχείο config να επιτρέψει OpenID ταυτότητα, αλλά το URL OpenID υπηρεσίας δεν ορίζεται σε συνεχή %s
 ErrorWarehouseMustDiffers=Η πηγή και ο στόχος των αποθηκών πρέπει να είναι διαφορετικός.
 ErrorBadFormat=Κακή μορφή!
-ErrorPaymentDateLowerThanInvoiceDate=Ημερομηνία πληρωμής (%s) δεν μπορεί να είναι πριν από την ημερομηνία έκδοσης του τιμολογίου (%s) για το τιμολόγιο %s.
 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
@@ -154,3 +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=Απενεργοποιημένη λειτουργία όταν οι ρυθμίσεις της οθόνης έχουν προσαρμοστεί για χρήση από άτομα με προβλήματα όρασης ή φυλλομετρητές κειμένου.
+WarningPaymentDateLowerThanInvoiceDate=Η ημερομηνία πληρωμής (%s) είναι νωρίτερα από την ημερομηνία του τιμολογίου (%s) για το τιμολόγιο %s.
+WarningTooManyDataPleaseUseMoreFilters=Πάρα πολλά στοιχεία. Παρακαλούμε χρησιμοποιήστε περισσότερα φίλτρα
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index b4520cdeafd..4c7db6faa17 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Αριθμός Λογαριασμού
 BankAccountNumberKey=Κωδ.
 SpecialCode=Ειδικός κωδικός
 ExportStringFilter=%% επιτρέπει την αντικατάσταση ενός ή περισσότερων χαρακτήρων στο κείμενο του
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': φίλτρα κατά ένα οικονομικό έτος/μήνας/ημέρα<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': φίλτρα σε μια σειρά από χρόνια/μήνες/ημέρες<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': φίλτρα για τα επόμενα οικονομικά έτη/μήνες/ημέρες<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': φίλτρα για τα προηγούμενα οικονομικά έτη/μήνες/ημέρες
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' φίλτρα από μία τιμή<br>'NNNNN+NNNNN' φίλτρα σε ένα εύρος τιμών<br>'&gt;NNNNN' φίλτρα από τις χαμηλότερες τιμές<br>'&gt;NNNNN' φίλτρα από τις υψηλότερες τιμές
 ## filters
 SelectFilterFields=Αν θέλετε να φιλτράρετε ορισμένες τιμές, απλά εισάγετε τις τιμές εδώ.
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 838f62eb8de..dd9c902036a 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -3,11 +3,11 @@ HRM=HRM
 Holidays=Άδειες
 CPTitreMenu=Άδειες
 MenuReportMonth=Μηνιαία αναφορά
-MenuAddCP=Εφαρμογή για άδεια
-NotActiveModCP=Πρέπει να ενεργοποιήσετε τις άδειες στα module για να δείτε αυτή τη σελίδα.
-NotConfigModCP=Πρέπει να ρυθμίσετε τις άδειες στο module για να δείτε αυτή τη σελίδα. Για να το κάνετε αυτό, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> πατήστε εδώ </ a>.
-NoCPforUser=Δεν υπάρχει ζήτηση για άδεια.
-AddCP=Εφαρμογή για άδεια
+MenuAddCP=Κάντε αίτηση άδειας
+NotActiveModCP=Θα πρέπει να ενεργοποιήσετε τις Άδειες module για να δείτε αυτή τη σελίδα.
+NotConfigModCP=Μπορείτε να ρυθμίσετε το module Άδειες για να δείτε αυτή τη σελίδα.Για να το κάνετε αυτό, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> κάντε κλικ εδώ </ a>.
+NoCPforUser=Δεν έχετε διαθέσιμες ημέρες.
+AddCP=Κάντε αίτηση άδειας
 Employe=Εργαζόμενος
 DateDebCP=Ημερ. έναρξης
 DateFinCP=Ημερ. τέλους
@@ -18,24 +18,24 @@ ApprovedCP=Εγκεκριμένο
 CancelCP=Ακυρώθηκε
 RefuseCP=Απόρριψη
 ValidatorCP=Έγκριση
-ListeCP=Λίστα αδειών
+ListeCP=Λίστα των αδειών
 ReviewedByCP=Θα πρέπει να επανεξεταστεί από
 DescCP=Περιγραφή
-SendRequestCP=Δημιουργία ζήτησης για άδεια
-DelayToRequestCP=Οι αιτήσεις για τις άδειες πρέπει να γίνουν τουλάχιστον <b>%s Ημέρα (ες)</b> πριν.
-MenuConfCP=Επεξεργασία υπόλοιπο των αδειών
-UpdateAllCP=Ενημερώστε τις άδειες
-SoldeCPUser=Ισορροπία αδειών είναι <b>%s</b> ημέρες.
+SendRequestCP=Δημιουργήστε το αίτημα άδειας
+DelayToRequestCP=Tα αιτήματα πρέπει να γίνονται τουλάχιστον <b>%s ημέρα(ες)</b> πριν από τις.
+MenuConfCP=Επεξεργασία ισορροπίας των αδειών
+UpdateAllCP=Ενημέρωση των αδειών
+SoldeCPUser=Η ισορροπία των αδειών είναι <b>%s</b> ημέρες.
 ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης.
 ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας:
-ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, το αίτημα για τις άδειες δεν υπάρχει.
+ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, η αίτηση άδειας δεν υπάρχει.
 ReturnCP=Επιστροφή στην προηγούμενη σελίδα
-ErrorUserViewCP=Δεν έχετε δικαίωμα να διαβάσετε αυτό το αίτημα για τις άδειες.
-InfosCP=Πληροφορίες για τη ζήτηση των αδειών
+ErrorUserViewCP=Δεν έχετε άδεια για να διαβάσετε αυτή την αίτηση αδείας.
+InfosCP=Πληροφορίες για την αίτησης άδειας
 InfosWorkflowCP=Πληροφορίες για την ροή εργασιών
 RequestByCP=Ζητήθηκε από
-TitreRequestCP=Φύλλο αδειών
-NbUseDaysCP=Αριθμός ημερών αδειών που καταναλώνονται
+TitreRequestCP=Αφήστε το αίτημα
+NbUseDaysCP=Αριθμός των ημερών για τις άδειες που καταναλώνεται
 EditCP=Επεξεργασία
 DeleteCP=Διαγραφή
 ActionValidCP=Επικύρωση
@@ -43,26 +43,25 @@ ActionRefuseCP=Απορρίφθηκε
 ActionCancelCP=Άκυρο
 StatutCP=Κατάσταση
 SendToValidationCP=Στάλθηκε για επικύρωση
-TitleDeleteCP=Διαγράψτε το αίτημα των αδειών
-ConfirmDeleteCP=Επιβεβαιώστε τη διαγραφή του αιτήματος για τις άδειες
-ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψετε αυτό το αίτημα αδειών.
-CantCreateCP=Δεν έχετε το δικαίωμα να υποβάλετε αίτηση για τις άδειες.
-InvalidValidatorCP=Μπορείτε να επιλέξετε μια έγκριση στο αίτημα των αδειών σας.
-UpdateButtonCP=Ανανέωση
-CantUpdate=Δεν μπορείτε να ενημερώσετε το αίτημα των αδειών.
+TitleDeleteCP=Διαγράψτε την αίτηση άδειας
+ConfirmDeleteCP=Επιβεβαιώστε τη διαγραφή αυτήν την αίτηση άδειας;
+ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψει αυτό το αίτημα αδείας.
+CantCreateCP=Δεν έχετε το δικαίωμα να ζητήσετε άδεια.
+InvalidValidatorCP=Μπορείτε να επιλέξετε ένα εκπρόσωπο να εγκρίνει την άδειά σας.
+CantUpdate=Δεν μπορείτε να ενημερώσετε αυτό το αίτημα άδειας.
 NoDateDebut=Πρέπει να επιλέξετε μια ημερομηνία έναρξης.
 NoDateFin=Πρέπει να επιλέξετε μια ημερομηνία λήξης.
-ErrorDureeCP=Το αίτημά σας για την άδεια δεν περιέχει εργάσιμη ημέρα.
-TitleValidCP=Εγκρίνετε το αίτημα για την άδεια
-ConfirmValidCP=Είστε σίγουροι ότι θέλετε να εγκρίνει το αίτημα των αδειών;
+ErrorDureeCP=Your leave request does not contain working day.
+TitleValidCP=Approve the leave request
+ConfirmValidCP=Είστε βέβαιοι ότι θέλετε να εγκρίνει την αίτηση άδειας;
 DateValidCP=Ημερομηνία έγκρισης
-TitleToValidCP=Αποστολή αιτήματος για άδεια
-ConfirmToValidCP=Είστε σίγουροι ότι θέλετε να στείλετε το αίτημα των αδειών;
-TitleRefuseCP=Απόρριψη αιτήματος αδειών
-ConfirmRefuseCP=Είστε σίγουροι ότι θέλετε να απορρίψετε την αίτηση των αδειών;
+TitleToValidCP=Στείλτε αίτηση άδειας
+ConfirmToValidCP=Είστε βέβαιοι ότι θέλετε να στείλετε την αίτηση άδειας;
+TitleRefuseCP=Refuse the leave request
+ConfirmRefuseCP=Είστε βέβαιοι ότι θέλετε να απορρίψει την αίτηση άδειας;
 NoMotifRefuseCP=Πρέπει να επιλέξετε ένα λόγο απόρριψης της αίτησης.
-TitleCancelCP=Ακύρωση του αιτήματος τις άδειας
-ConfirmCancelCP=Είστε σίγουροι ότι θέλετε να ακυρώσετε το αίτημα τις άδειας;
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Είστε βέβαιοι ότι θέλετε να ακυρώσετε την αίτηση άδειας;
 DetailRefusCP=Λόγος για την απόρριψη
 DateRefusCP=Ημερομηνία της άρνησης
 DateCancelCP=Ημερομηνία της ακύρωσης
@@ -72,42 +71,42 @@ MotifCP=Λόγος
 UserCP=Χρήστης
 ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας.
 AddEventToUserOkCP=Η προσθήκη της έκτακτης άδειας έχει ολοκληρωθεί.
-MenuLogCP=Δείτε τα αρχεία καταγραφών των αδειών
-LogCP=Αρχεία καταγραφών των ενημερώσεων των αδειών
+MenuLogCP=Δείτε τα αρχεία καταγραφών των αιτήσεων άδειας
+LogCP=Αρχείο καταγραφής για ενημέρωση των διαθέσιμων ημερών των αδειών
 ActionByCP=Διενεργείται από
 UserUpdateCP=Για το χρήστη
 PrevSoldeCP=Προηγούμενο Υπόλοιπο
 NewSoldeCP=Νέο υπόλοιπο
-alreadyCPexist=Η αίτηση για την άδεια έχει ήδη γίνει για αυτή την περίοδο.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Όνομα
 Employee=Υπάλληλος
-FirstDayOfHoliday=Πρώτη μέρα άδειας
-LastDayOfHoliday=Τελευταία μέρα άδειας
+FirstDayOfHoliday=Πρώτη μέρα των αδειών
+LastDayOfHoliday=Τελευταία μέρα των αδειών
 HolidaysMonthlyUpdate=Μηνιαία ενημέρωση
 ManualUpdate=Χειροκίνητη ενημέρωση
-HolidaysCancelation=Ακύρωση αδειών
+HolidaysCancelation=Αφήστε το αίτημα ακύρωσης
 
 ## Configuration du Module ##
-ConfCP=Διαμόρφωση του module αδειών
+ConfCP=Configuration of leave request module
 DescOptionCP=Περιγραφή της επιλογής
 ValueOptionCP=Αξία
-GroupToValidateCP=Ομάδα με τη δυνατότητα να εγκρίνει τις άδειες
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Επικύρωση της διαμόρφωσης
-LastUpdateCP=Τελευταία αυτόματη ενημέρωση των αδειών
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Ενημερώθηκε με επιτυχία.
 ErrorUpdateConfCP=Παρουσιάστηκε σφάλμα κατά την ενημέρωση, παρακαλώ προσπαθήστε ξανά.
-AddCPforUsers=Παρακαλώ προσθέστε το υπόλοιπο αδειών των χρηστών από <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">κάνοντας κλικ εδώ</a> .
-DelayForSubmitCP=Προθεσμία υποβολής αιτήσεων για άδειες
-AlertapprobatortorDelayCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας δεν ταιριάζει με την προθεσμία
-AlertValidatorDelayCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας υπερβαίνει καθυστέρηση
-AlertValidorSoldeCP=Αποτρέψτε την έγκριση εάν η αίτηση άδειας υπερβαίνει το υπόλοιπο
-nbUserCP=Αριθμός χρηστών που υποστηρίζονται στο module για τις άδειες
-nbHolidayDeductedCP=Αριθμός των αδειών πρέπει να αφαιρεθούν ανά ημέρα ληφθέντων αδειών
-nbHolidayEveryMonthCP=Αριθμός των αδειών που προστίθενται κάθε μήνα
-Module27130Name= Διαχείριση των αδειών
-Module27130Desc= Διαχείριση των αδειών
-TitleOptionMainCP=Κύριες ρυθμίσεις των αδειών
-TitleOptionEventCP=Ρυθμίσεις των αδειών που σχετίζονται με τα γεγονότα
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+DelayForSubmitCP=Deadline to make a leave requests
+AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
+AlertValidatorDelayCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει καθυστέρηση
+AlertValidorSoldeCP=Εμποδίστε τον εκπρόσωπο εάν η αίτηση άδειας υπερβαίνει το υπόλοιπο
+nbUserCP=Αριθμός των χρηστών που υποστηρίζονται στο module αδειών
+nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of leave days added every month
+Module27130Name= Διαχείριση των αιτήσεων αδειών
+Module27130Desc= Διαχείριση των αιτήσεων αδειών
+TitleOptionMainCP=Main settings of leave request
+TitleOptionEventCP=Ρυθμίσεις των αδειών αίτημα για εκδηλώσεις
 ValidEventCP=Επικύρωση
 UpdateEventCP=Ενημέρωση εκδηλώσεων
 CreateEventCP=Δημιουργία
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Ανανέωση
 ErrorMailNotSend=Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail:
 NoCPforMonth=Όχι αυτό το μήνα.
 nbJours=Αριθμός ημερών
-TitleAdminCP=Διαμόρφωση αδειών
+TitleAdminCP=Διαμόρφωση των αδειών
 #Messages
 Hello=Γεια σας
-HolidaysToValidate=Επικύρωση άδειας
-HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδειας για επικύρωση
-HolidaysToValidateDelay=Αυτό το αίτημα άδειας θα λάβει χώρα εντός περιόδου μικρότερης των ημερών %s .
-HolidaysToValidateAlertSolde=Ο χρήστης που έκανε την αίτηση για την άδεια δεν έχει αρκετό υπόλοιπο.
-HolidaysValidated=Επικυρώθηκε η άδεια
-HolidaysValidatedBody=Το αίτημα σας για άδεια από %s έως %s έχει επικυρωθεί.
-HolidaysRefused=Άρνηση άδειας
-HolidaysRefusedBody=Το αίτημα σας για την άδεια από %s έως %s έχει απορριφθεί για τους ακόλουθους λόγους:
-HolidaysCanceled=Ακύρωση άδειας
-HolidaysCanceledBody=Το αίτημά σας για άδεια από %s έως %s έχει ακυρωθεί.
-Permission20000=Δείτε τις δικές σας άδειες
-Permission20001=Δημιουργία/τροποποίηση της άδειάς σας
-Permission20002=Δημιουργία/τροποποίηση των αδειών για όλους
-Permission20003=Αιτήματα διαγραφής αδειών
-Permission20004=Ρύθμιση χρηστών για της άδειες
-Permission20005=Επανεξέταση καταγραφής των τροποποιημένων αδειών
-Permission20006=Δείτε την μηνιαία αναφορά αδειών
+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 b0b234fdd41..88304fbdc30 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=Create intervention
 ListOfInterventions=Λίστα παρεμβάσεων
 EditIntervention=Τροποποίηση παρέμβασης
 ActionsOnFicheInter=Δράσεις για την παρέμβαση
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Όνομα και υπογραφή του πα
 NameAndSignatureOfExternalContact=Όνομα και υπογραφή του πελάτη:
 DocumentModelStandard=Τυπικό είδος εγγράφου παρέμβασης
 InterventionCardsAndInterventionLines=Παρεμβάσεις και τις γραμμές των παρεμβάσεων
-ClassifyBilled=Ταξινόμηση "Τιμολογημένων"
+InterventionClassifyBilled=Ταξινομήστε τα "Τιμολογημένα"
+InterventionClassifyUnBilled=Ταξινομήστε τα μη "Τιμολογημένα"
 StatusInterInvoiced=Τιμολογείται
 RelatedInterventions=Οι παρεμβάσεις που σχετίζονται
 ShowIntervention=Εμφάνιση παρέμβασης
+SendInterventionRef=Υποβολή παρέμβασης %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/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 92d71df9b11..21f18dfbeb6 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 περιορίζονται για την ασφάλεια και τη λήξη χρόνου λόγοι για να <b>%s</b> παραλήπτες με την αποστολή συνεδρίας.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 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=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 <strong>'%s'</strong> 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/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..9fa082ec702 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -8,26 +8,20 @@ MarginOnServices=Περιθώριο / Υπηρεσίες
 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=Αρχικό περιθώριο: τιμή πώλησης - τιμή αγοράς<br/>Το καθαρό περιθώριο: τιμή πώλησης - τιμή κόστους
-
 CostPrice=Τιμή κόστους
 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/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..8fd2c21cf77 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=Αυτή η περιοχή είναι αφιερωμένη στην ομάδα διάφορα εργαλεία που είναι διαθέσιμα δεν σε άλλες καταχωρήσεις μενού. <br><br> Αυτά τα εργαλεία είναι προσβάσιμα από το μενού στο πλάι.
 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=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=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..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 41c087e1a67..bdc764a85d2 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Κλειστό
 ContractStatusRunning=Ενεργό
 ContractStatusExpired=Ληγμένο
 ContractStatusOnHold=Ανενεργό
-ContractStatusToRun=Μια υπηρεσία mettre en
+ContractStatusToRun=Για να πάρετε την εκτέλεση
 ContractNotRunning=Το Συμβόλαιο είναι Ανενεργό
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
 ErrorProductBadRefOrLabel=Λάθος τιμή για την αναφορά ή την ετικέτα.
 ErrorProductClone=Υπήρξε ένα πρόβλημα κατά την προσπάθεια για την κλωνοποίηση του προϊόντος ή της υπηρεσίας.
+ErrorPriceCantBeLowerThanMinPrice=Σφάλμα η τιμή δεν μπορεί να είναι χαμηλότερη από την ελάχιστο τιμή.
 Suppliers=Προμηθευτές
 SupplierRef=Κωδ. Προμηθευτή
 ShowProduct=Εμφάνιση προϊόντων
@@ -116,12 +117,12 @@ ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσί
 MultiPricesAbility=Πολλά επίπεδα των τιμών ανά προϊόν/υπηρεσία
 MultiPricesNumPrices=Αριθμός τιμής
 MultiPriceLevelsName=Κατηγορίες τιμών
-AssociatedProductsAbility=Ενεργοποίηση υποπροϊόντων
-AssociatedProducts=Υποπροϊόντα
-AssociatedProductsNumber=Πλήθος προϊόντων που συνθέτουν αυτό το προϊόν
-ParentProductsNumber=Αριθμός προϊόντος μητρικής
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+AssociatedProductsAbility=Ενεργοποίηση της δυνατότητας εικονικών πακέτων
+AssociatedProducts=Πακέτο προϊόντων
+AssociatedProductsNumber=Number of products composing this virtual package product
+ParentProductsNumber=Number of parent packaging product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
 EditAssociate=Συσχέτιση
 Translation=Μετάφραση
 KeywordFilter=Φίλτρο λέξης-κλειδιού
@@ -131,7 +132,7 @@ AddDel=Προσθήκη/Διαγραφή
 Quantity=Ποσότητα
 NoMatchFound=Δεν βρέθηκε κατάλληλη εγγραφή
 ProductAssociationList=Κατάλογος των σχετικών προϊόντων / υπηρεσιών: το όνομα του προϊόντος / υπηρεσίας (επηρεάζονται ποσότητα)
-ProductParentList=Κατάλογος των προϊόντων / υπηρεσιών με αυτό το προϊόν ως συστατικό
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
 ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
@@ -178,7 +179,7 @@ CloneProduct=Κλώνοποίηση προϊόντος ή υπηρεσίας
 ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσει το προϊόν ή την υπηρεσία <b>%s;</b>
 CloneContentProduct=Κλώνος όλες τις κύριες πληροφορίες του προϊόντος / υπηρεσίας
 ClonePricesProduct=Κλώνος κύριες πληροφορίες και τιμές
-CloneCompositionProduct=Εικονικός κλώνος προϊόντων/υπηρεσιών
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Μεταχειρισμένο
 NewRefForClone=Ref. of new product/service
 CustomerPrices=Τιμές πελατών
@@ -239,3 +240,10 @@ PricingRule=Κανόνες τιμολόγησης
 AddCustomerPrice=Προσθέστε τιμή των πελατών
 ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη
 PriceByCustomerLog=Τιμή ανά πελάτη log
+MinimumPriceLimit=Ελάχιστη τιμή δεν μπορεί να είναι μικρότερη από %s
+MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είναι: %s
+PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
+PriceExpressionSelected=Επιλογή συνάρτησης τιμών
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Αριθμός
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 0a8a86d666b..eba1f92f7b3 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -14,7 +14,7 @@ TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα κ
 Myprojects=Τα έργα μου
 ProjectsArea=Περιοχή Έργων
 NewProject=Νέο Έργο
-AddProject=Προσθήκη Έργου
+AddProject=Δημιουργία έργου
 DeleteAProject=Διαγραφή Έργου
 DeleteATask=Διαγραφή Εργασίας
 ConfirmDeleteAProject=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το έργο;
@@ -36,6 +36,8 @@ TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Νέος χρόνος που δαπανάται
 MyTimeSpent=Ο χρόνος μου πέρασε
 MyTasks=Οι Εργασίες μου
@@ -45,7 +47,7 @@ TaskDateStart=Ημερομηνία έναρξης εργασιών
 TaskDateEnd=Ημερομηνία λήξης εργασιών
 TaskDescription=Περιγραφή των εργασιών
 NewTask=Νέα Εργασία
-AddTask=Προσθήκη Εργασίας
+AddTask=Δημιουργία εργασίας
 AddDuration=Προσθήκη Διάρκειας
 Activity=Δραστηριότητα
 Activities=Εργασίες/Δραστηριότητες
@@ -85,13 +87,13 @@ ActionsOnProject=Δράσεις για το έργο
 YouAreNotContactOfProject=Δεν έχετε μια επαφή του ιδιωτικού έργου,
 DeleteATimeSpent=Διαγράψτε το χρόνο που δαπανάται
 ConfirmDeleteATimeSpent=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το χρόνο;
-DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν διατίθενται για μένα
-ShowMyTasksOnly=Προβολή μόνο καθήκοντα που θα μου
+DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν ανατέθηκαν σε μένα
+ShowMyTasksOnly=Δείτε τα καθήκοντα που σας έχουν ανατεθεί
 TaskRessourceLinks=Πόροι
 ProjectsDedicatedToThisThirdParty=Έργα που αφορούν αυτό το στοιχείο
 NoTasks=Δεν υπάρχουν εργασίες για αυτό το έργο
 LinkedToAnotherCompany=Συνδέεται με άλλο τρίτο μέρος
-TaskIsNotAffectedToYou=Καθήκον που δεν έχει διατεθεί για σας
+TaskIsNotAffectedToYou=Εργασία που δεν έχει ανατεθεί σε εσάς
 ErrorTimeSpentIsEmpty=Χρόνος που δαπανάται είναι άδειο
 ThisWillAlsoRemoveTasks=Αυτή η ενέργεια θα διαγράψει επίσης όλα τα καθήκοντα του έργου <b>(%s</b> καθηκόντων προς το παρόν) και όλες οι είσοδοι του χρόνου.
 IfNeedToUseOhterObjectKeepEmpty=Εάν ορισμένα αντικείμενα (τιμολόγιο, προκειμένου, ...), που ανήκουν σε άλλο τρίτο μέρος, πρέπει να συνδέεται με το έργο να δημιουργήσει, διατηρήσει αυτό το κενό να έχει το έργο να είναι πολλαπλών τρίτους.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Συνεισφέρων
 TypeContact_project_task_external_TASKCONTRIBUTOR=Συνεισφέρων
 SelectElement=Επιλέξτε το στοιχείο
 AddElement=Σύνδεση με το στοιχείο
+UnlinkElement=Αποσύνδεση στοιχείου
 # Documents models
 DocumentModelBaleine=Μοντέλο έκθεση Μια πλήρης έργου (logo. ..)
 PlannedWorkload = Σχέδιο φόρτου εργασίας
@@ -128,3 +131,4 @@ ProjectReferers=Αναφορές από αντικείμενα
 SearchAProject=Αναζήτηση ένα έργο
 ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
 ProjectDraft=Πρόχειρα έργα
+FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου
diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
new file mode 100644
index 00000000000..a28060f39b6
--- /dev/null
+++ b/htdocs/langs/el_GR/resource.lang
@@ -0,0 +1,34 @@
+
+MenuResourceIndex=Πόροι
+MenuResourceAdd=Νέος πόρος
+MenuResourcePlanning=Προγραμματισμός των πόρων
+DeleteResource=Διαγραφή πόρων
+ConfirmDeleteResourceElement=Επιβεβαιώστε τη διαγραφή των πόρων για αυτό το στοιχείο
+NoResourceInDatabase=No resource in database.
+NoResourceLinked=No resource linked
+
+ResourcePageIndex=Λίστα Πόρων
+ResourceSingular=Πόρος
+ResourceCard=Κάρτα Πόρων
+AddResource=Δημιουργήστε έναν πόρο
+ResourceFormLabel_ref=Όνομα Πόρου
+ResourceType=Τύπος Πόρου
+ResourceFormLabel_description=Η περιγραφή πόρου
+
+ResourcesLinkedToElement=Πόροι που σχετίζονται με το στοιχείο
+
+ShowResourcePlanning=Show resource planning
+GotoDate=Μετάβαση στην ημερομηνία
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Ο Πόρος δημιουργήθηκε με επιτυχία
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+TitleResourceCard=Resource card
+ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτού του πόρου
+RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία
+DictionaryResourceType=Το είδος των πόρων
+
+SelectResource=Επιλέξτε πόρο
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index ee950679af5..2b00a7dfb0b 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Στατιστικά στοιχεία σχετικ
 DateDeliveryPlanned=Προγραμματισμένη ημερομηνία παράδοσης
 DateReceived=Παράδοση Ημερομηνία παραλαβής
 SendShippingByEMail=Στείλτε αποστολή με e-mail
-SendShippingRef=Στείλτε αποστολή %s
+SendShippingRef=Υποβολή της αποστολής %s
 ActionsOnShipping=Εκδηλώσεις για την αποστολή
 LinkToTrackYourPackage=Σύνδεσμος για να παρακολουθείτε το πακέτο σας
 ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργία μιας νέας αποστολής γίνεται από την κάρτα παραγγελίας.
 RelatedShippings=Σχετικές αποστολές
 ShipmentLine=Σειρά αποστολής
 CarrierList=Κατάλογος των μεταφορέων
+SendingRunning=Προϊόν από παραγγελία του πελάτη που έχει ήδη αποσταλεί
+SuppliersReceiptRunning=Προϊόν από παραγγελία προμηθευτή έχει ληφθεί
 
 # Sending methods
 SendingMethodCATCH=Πιάσε τον πελάτη
 SendingMethodTRANS=Μεταφορέας
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Απλό μοντέλο έγγραφο για αποδεικτικά παράδοσης
 DocumentModelTyphon=Πληρέστερο πρότυπο έγγραφο για αποδεικτικά παράδοσης (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Σταθερή EXPEDITION_ADDON_NUMBER δεν ορίζεται
 SumOfProductVolumes=Άθροισμα όγκου του προϊόντος
 SumOfProductWeights=Άθροισμα το βάρος των προϊόντων
+
+# warehouse details
+DetailWarehouseNumber= Λεπτομέρειες Αποθήκης
+DetailWarehouseFormat= W:%s (Ποσότητα : %d)
diff --git a/htdocs/langs/el_GR/shop.lang b/htdocs/langs/el_GR/shop.lang
deleted file mode 100644
index 1c353b5677a..00000000000
--- a/htdocs/langs/el_GR/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Κατάστημα
-ShopWeb=Web Shop
-LastOrders=Τελευταία παραγγελίες
-OnStandBy=Σε κατάσταση αναμονής
-TreatmentInProgress=Επεξεργασία σε εξέλιξη
-LastCustomers=Τελευταίοι πελάτες
-OSCommerceShop=OsCommerce κατάστημα
-OSCommerce=OsCommerce
-AddProd=Online Πώληση
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/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 0b2f2428515..743d0787740 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Δημιουργία τιμολογίου προμηθευτ
 ListOfSupplierProductForSupplier=Λίστα προϊόντων και τιμών του προμηθευτή <b>%s</b>
 NoneOrBatchFileNeverRan=Κανένας ή παρτίδα <b>%s</b> έχει τρέξει πρόσφατα
 SentToSuppliers=Αποστολή σε προμηθευτές
+ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτών
+MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index f1692836fda..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,3 +19,4 @@ TF_TRIP=Ταξίδι
 ListTripsAndExpenses=Λίστα ταξιδιών και εξόδων
 ExpensesArea=Ταξίδια και έξοδα περιοχή
 SearchATripAndExpense=Αναζήτηση ένα ταξίδι και τα έξοδα
+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..fe1365fda56 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=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. του τιμολογίου με το αίτημα απόσυρσης
@@ -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=Για τους τραπεζικούς λογαριασμούς
 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/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
new file mode 100644
index 00000000000..e1713acd57c
--- /dev/null
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6e67c9c8765..cbf898a67fc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -45,9 +45,11 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
-DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
 ConfirmAjax=Use Ajax confirmation popups
 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.
@@ -206,6 +208,7 @@ ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for
 ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)  
 WebSiteDesc=Web site providers you can search to find more modules...
 URL=Link
 BoxesAvailable=Boxes available
@@ -217,6 +220,7 @@ AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
 AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +261,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -296,7 +303,7 @@ CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and datas: %s.
 LastStableVersion=Last stable version
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> 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. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> 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. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of company type on n characters (see dictionary-company types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -431,14 +438,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
@@ -469,8 +476,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)
@@ -478,13 +485,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -501,6 +504,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
@@ -512,16 +517,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 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
@@ -575,9 +584,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,15 +609,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
@@ -668,7 +675,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
@@ -698,8 +705,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
@@ -775,6 +782,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
@@ -785,6 +793,7 @@ VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases li
 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
 LocalTax1IsUsed=Use second tax
 LocalTax1IsNotUsed=Do not use second tax
 LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
@@ -809,6 +818,13 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices,
 LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
+CalcLocaltax=Reports
+CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax2ES=Purchases
+CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax3ES=Sales
+CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
@@ -920,11 +936,14 @@ EventsSetup=Setup for events logs
 LogEvents=Security audit events
 Audit=Audit
 InfoDolibarr=Infos Dolibarr
+InfoBrowser=Infos Browser
 InfoOS=Infos OS
 InfoWebServer=Infos web server
 InfoDatabase=Infos database
 InfoPHP=Infos PHP
 InfoPerf=Infos performances
+BrowserName=Browser name
+BrowserOS=Browser OS
 ListEvents=Audit events
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
@@ -1024,7 +1043,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.
@@ -1060,10 +1078,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1123,6 +1142,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
@@ -1131,6 +1151,8 @@ 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
+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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1143,7 +1165,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
@@ -1367,9 +1389,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
@@ -1397,8 +1420,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
@@ -1455,16 +1479,22 @@ AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
 PastDelayVCalExport=Do not export event older than
 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
 ##### ClickToDial #####
 ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ##### 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.
@@ -1504,7 +1534,27 @@ TasksNumberingModules=Tasks numbering module
 TaskModelModule=Tasks reports document model
 ##### ECM (GED) #####
 ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document  
-
-
+ECMAutoTree = Automatic tree folder and document
+##### Fiscal Year #####
+FiscalYears=Fiscal years
+FiscalYear=Fiscal year
+FiscalYearCard=Fiscal year card
+NewFiscalYear=New fiscal year
+EditFiscalYear=Edit fiscal year
+OpenFiscalYear=Open fiscal year
+CloseFiscalYear=Close fiscal year
+DeleteFiscalYear=Delete fiscal year
+ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+Opened=Opened
+Closed=Closed
+AlwaysEditable=Can always be edited
+MAIN_APPLICATION_TITLE=Force visible name of 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 687e3cae146..1cc01ec2e7b 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Events
 ActionsArea=Events area (Actions and tasks)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendar
+Calendars=Calendars
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by 
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+Events=Events
 EventsNb=Number of events
 MyEvents=My events
 OtherEvents=Other events
@@ -17,28 +19,33 @@ ListOfActions=List of events
 Location=Location
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -46,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
@@ -54,7 +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
 NewCompanyToDolibarr= Third party created
 DateActionPlannedStart= Planned start date
 DateActionPlannedEnd= Planned end date
@@ -64,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 9f8353acfda..9429a682857 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Credit note
 InvoiceAvoirAsk=Credit note to correct invoice
 InvoiceAvoirDesc=The <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. 
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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 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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index e7e9da7dc1b..bf118b9b88e 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -12,6 +12,7 @@ BoxLastProspects=Last modified prospects
 BoxLastCustomers=Last modified customers
 BoxLastSuppliers=Last modified suppliers
 BoxLastCustomerOrders=Last customer orders
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Last books
 BoxLastActions=Last actions
 BoxLastContracts=Last contracts
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Number of clients
 BoxTitleLastRssInfos=Last %s news from %s
 BoxTitleLastProducts=Last %s modified products/services
 BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Last %s modified customer orders
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Last %s recorded suppliers
 BoxTitleLastCustomers=Last %s recorded customers
 BoxTitleLastModifiedSuppliers=Last %s modified suppliers
 BoxTitleLastModifiedCustomers=Last %s modified customers
-BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects
-BoxTitleLastPropals=Last %s recorded proposals
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Last %s customer's invoices
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Last %s supplier's invoices
-BoxTitleLastProspects=Last %s recorded prospects
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Last %s modified prospects
 BoxTitleLastProductsInContract=Last %s products/services in a contract
-BoxTitleLastModifiedMembers=Last %s modified members
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Opened account's balances
 BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices
+BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
 BoxMyLastBookmarks=My last %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
@@ -76,7 +80,8 @@ NoContractedProducts=No products/services contracted
 NoRecordedContracts=No recorded contracts
 NoRecordedInterventions=No recorded interventions
 BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=%s latest supplier orders
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=No recorded supplier order
 BoxCustomersInvoicesPerMonth=Customer invoices per month
 BoxSuppliersInvoicesPerMonth=Supplier invoices per month
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index fb9ad8a3b6d..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,3 +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
+ShowCategory=Show category
\ No newline at end of file
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 3f2f5a6a96a..390a7f837e8 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/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
@@ -71,6 +71,7 @@ ActionAC_FAX=Send fax
 ActionAC_PROP=Send proposal by mail
 ActionAC_EMAIL=Send Email
 ActionAC_RDV=Meetings
+ActionAC_INT=Intervention on site
 ActionAC_FAC=Send customer invoice by mail
 ActionAC_REL=Send customer invoice by mail (reminder)
 ActionAC_CLO=Close
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 000d7496afc..7bfaf799f3a 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -91,6 +91,9 @@ LocalTax2IsUsedES= IRPF is used
 LocalTax2IsNotUsedES= IRPF is not used
 LocalTax1ES=RE
 LocalTax2ES=IRPF
+TypeLocaltax1ES=RE Type
+TypeLocaltax2ES=IRPF Type
+TypeES=Type
 ThirdPartyEMail=%s
 WrongCustomerCode=Customer code invalid
 WrongSupplierCode=Supplier code invalid
@@ -256,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
@@ -265,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
@@ -376,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
@@ -394,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -407,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
\ No newline at end of file
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index e0931bf5812..89a32876dc3 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -4,6 +4,7 @@ AccountancyCard=Accountancy card
 Treasury=Treasury
 MenuFinancial=Financial
 TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
 OptionMode=Option for accountancy
 OptionModeTrue=Option Incomes-Expenses
 OptionModeVirtual=Option Claims-Debts
@@ -11,6 +12,7 @@ OptionModeTrueDesc=In this context, the turnover is calculated over payments (da
 OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. 
 FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
 VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
 Param=Setup
 RemainingAmountPayment=Amount payment remaining :
 AmountToBeCharged=Total amount to pay :
@@ -40,11 +42,15 @@ VATReceived=VAT received
 VATToCollect=VAT purchases
 VATSummary=VAT Balance
 LT2SummaryES=IRPF Balance
+LT1SummaryES=RE Balance
 VATPaid=VAT paid
 SalaryPaid=Salary paid
 LT2PaidES=IRPF Paid
+LT1PaidES=RE Paid
 LT2CustomerES=IRPF sales
 LT2SupplierES=IRPF purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
 VATCollected=VAT collected
 ToPay=To pay
 ToGet=To get back
@@ -77,8 +83,11 @@ DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 NewVATPayment=New VAT payment
 newLT2PaymentES=New IRPF payment
+newLT1PaymentES=New RE payment
 LT2PaymentES=IRPF Payment
 LT2PaymentsES=IRPF Payments
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
 VATPayment=VAT Payment
 VATPayments=VAT Payments
 SocialContributionsPayments=Social contributions payments
@@ -99,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
@@ -114,6 +124,12 @@ CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
+CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
+CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
+CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
 AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
 AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -128,10 +144,15 @@ RulesCAIn=- It includes all the effective payments of invoices received from cli
 DepositsAreNotIncluded=- Deposit invoices are nor included
 DepositsAreIncluded=- Deposit invoices are included
 LT2ReportByCustomersInInputOutputModeES=Report by third party 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
 SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
 SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
@@ -175,11 +196,11 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is
 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 <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+AccountancyJournal=Accountancy code journal
+ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+CloneTax=Clone a social contribution
+ConfirmCloneTax=Confirm the clone of a social contribution
+CloneTaxForNextMonth=Clone it for next month
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 8a554a9770b..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
@@ -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 % 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/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index cabd31a3a32..c96a506281d 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -24,3 +24,5 @@ Deliverer=Deliverer :
 Sender=Sender
 Recipient=Recipient
 ErrorStockIsNotEnough=There's not enough stock
+Shippable=Shippable
+NonShippable=Not Shippable
diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
index 728661dfa04..77d91ad801d 100644
--- a/htdocs/langs/en_US/donations.lang
+++ b/htdocs/langs/en_US/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
@@ -30,3 +30,9 @@ SearchADonation=Search a donation
 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
index 4f5ac8fb9ec..0187c567eb6 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -135,6 +136,8 @@ ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
 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
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -154,4 +157,4 @@ WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your
 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
\ No newline at end of file
+WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index 58579a74276..c79da05364e 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Name and signature of intervening :
 NameAndSignatureOfExternalContact=Name and signature of customer :
 DocumentModelStandard=Standard document model for interventions
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Classify "Billed"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index e94e8e13ac3..d20aab00146 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -10,8 +10,10 @@ Language_da_DA=Danish
 Language_da_DK=Danish
 Language_de_DE=German
 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 0ad86123313..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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 9b8f06f262e..bfded6f40e2 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -58,12 +58,13 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> 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
+SeeHere=See here
 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)
@@ -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.
@@ -266,6 +268,7 @@ Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
 HourShort=H
+MinuteShort=mn
 Rate=Rate
 UseLocalTax=Include tax
 Bytes=Bytes
@@ -340,6 +343,7 @@ FullList=Full list
 Statistics=Statistics
 OtherStatistics=Other statistics
 Status=Status
+Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 RefSupplier=Ref. supplier
@@ -356,6 +360,7 @@ ActionNotApplicable=Not applicable
 ActionRunningNotStarted=To start
 ActionRunningShort=Started
 ActionDoneShort=Finished
+ActionUncomplete=Uncomplete
 CompanyFoundation=Company/Foundation
 ContactsForCompany=Contacts for this third party
 ContactsAddressesForCompany=Contacts/addresses for this third party
@@ -364,6 +369,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
@@ -644,6 +650,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
@@ -671,11 +678,13 @@ HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
 OriginFileName=Original filename
 SetDemandReason=Set source
+SetBankAccount=Define Bank Account
+AccountCurrency=Account Currency
 ViewPrivateNote=View notes
 XMoreLines=%s line(s) hidden
 PublicUrl=Public URL
 AddBox=Add box
-
+SelectElementAndClickRefresh=Select an element and click Refresh
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index 3fca6d7a644..0cf9bc34410 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index fd17000a8e0..3593e4c879f 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index d50f8615dc8..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
@@ -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=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/other.lang b/htdocs/langs/en_US/other.lang
index 6a8fdd730c9..f5b39b3f704 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/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.<br><br>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/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..0102f688b1b 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -1,19 +1,21 @@
 # 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 lot or 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
index e290bd49c31..8314c0cd906 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/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 <b>%s</b> ?
 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
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=This option allows you to create or clone a service if it
 CurrentProductPrice=Current price
 AlwaysUseNewPrice=Always use current price of product/service
 AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Price by quantity
+PriceByQuantity=Different prices by quantity
 PriceByQuantityRange=Quantity range
 ProductsDashboard=Products/Services summary
 UpdateOriginalProductLabel=Modify original label
@@ -234,9 +234,11 @@ 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
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index e9d04c8c8db..84624b219f9 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -12,10 +12,9 @@ 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=Add project
+AddProject=Create project
 DeleteAProject=Delete a project
 DeleteATask=Delete a task
 ConfirmDeleteAProject=Are you sure you want to delete this project ?
@@ -37,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
@@ -46,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
@@ -86,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -121,8 +122,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (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
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 8970d1eb2df..2b6d12870a1 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Prospect list
 DeleteProp=Delete commercial proposal
 ValidateProp=Validate commercial proposal
-AddProp=Add proposal
+AddProp=Create proposal
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
 ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
 LastPropals=Last %s proposals
@@ -55,8 +55,6 @@ NoOpenedPropals=No opened commercial proposals
 NoOtherOpenedPropals=No other opened commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
 AssociatedDocuments=Documents associated with the proposal:
 ErrorCantOpenDir=Can't open directory
 DatePropal=Date of proposal
diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
old mode 100755
new mode 100644
index b17cae82f29..32bdd92f884
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -10,17 +10,14 @@ NoResourceLinked=No resource linked
 ResourcePageIndex=Resources list
 ResourceSingular=Resource
 ResourceCard=Resource card
-AddResource=Add a resource
+AddResource=Create a resource
 ResourceFormLabel_ref=Resource name
 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/salaries.lang b/htdocs/langs/en_US/salaries.lang
index edca71a1829..0087cbe83e6 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
 Salary=Salary
 Salaries=Salaries
 Employee=Employee
@@ -6,3 +8,5 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 039d47f6aa9..f6111bac684 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated.
 DateDeliveryPlanned=Planed date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
-SendShippingRef=Send shipment %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
 ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
 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
@@ -72,3 +74,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/en_US/shop.lang b/htdocs/langs/en_US/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/en_US/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 7a08148c9ce..b03d26dbe1d 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
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index fdc0787646a..ca3a81639bf 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Suppliers
 Supplier=Supplier
-AddSupplier=Add a supplier
+AddSupplier=Create a supplier
 SupplierRemoved=Supplier removed
 SuppliersInvoice=Suppliers invoice
 NewSupplier=New supplier
@@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
 NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
 SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
\ No newline at end of file
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 06d46c7ac65..64adbeb0dd6 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -4,7 +4,7 @@ Trips=Trips
 TripsAndExpenses=Trips and expenses
 TripsAndExpensesStatistics=Trips and expenses statistics
 TripCard=Trip card
-AddTrip=Add trip
+AddTrip=Create trip
 ListOfTrips=List of trips
 ListOfFees=List of fees
 NewTrip=New trip
@@ -19,3 +19,4 @@ TF_TRIP=Trip
 ListTripsAndExpenses=List of trips and expenses
 ExpensesArea=Trips and expenses area
 SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
\ No newline at end of file
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index a9d789b8c31..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
@@ -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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index d3dd7c9ca7c..7894351c01f 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/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=Charge the rejection to customer
+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 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_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
index 0d837cbe9f6..4474b523ba5 100644
--- a/htdocs/langs/es_DO/compta.lang
+++ b/htdocs/langs/es_DO/compta.lang
@@ -24,5 +24,5 @@ RulesVATInServices=- Para los servicios, el informe incluye el ITBIS de los pago
 RulesVATInProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura.
 RulesVATDueServices=- Para los servicios, el informe incluye el ITBIS de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
 RulesVATDueProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura.
-COMPTA_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido
-COMPTA_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado
\ No newline at end of file
+ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido
+ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
new file mode 100644
index 00000000000..d26e84d7a36
--- /dev/null
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Contabilidad
+Globalparameters=Configuración global
+Chartofaccounts=Plan contable
+Fiscalyear=Años fiscales
+Menuaccount=Cuentas contables
+Menuthirdpartyaccount=Cuentas de terceros
+MenuTools=Utilidades
+
+ConfigAccountingExpert=Configuración del módulo contable
+Journaux=Diarios
+JournalFinancial=Diarios financieros
+Exports=Exportaciones
+Modelcsv=Modelo de exportación
+Selectmodelcsv=Seleccione un modelo de exportación
+Modelcsv_normal=Exportación clásica
+Modelcsv_CEGID=Exportar a Cegid Expert
+BackToChartofaccounts=Volver al plan contable
+Back=Volver
+
+Definechartofaccounts=Definir plan contable
+Selectchartofaccounts=Seleccione un plan contable
+Validate=Validar
+Addanaccount=Añadir una cuenta contable
+AccountAccounting=Cuenta contable
+Ventilation=Contabilizar
+ToDispatch=A realizar
+Dispatched=Realizadas
+
+CustomersVentilation=Contabilizar clientes
+SuppliersVentilation=Contabilizar proveedores
+TradeMargin=Margen de beneficio
+Reports=Informes
+ByCustomerInvoice=Por facturas a clientes
+ByMonth=Por mes
+NewAccount=Nueva cuenta contable
+Update=Actualizar
+List=Listado
+Create=Crear
+UpdateAccount=Modificar una cuenta contable
+UpdateMvts=Modificar un movimiento
+WriteBookKeeping=Registrar los asientos en el libro mayor
+Bookkeeping=Libro Mayor
+AccountBalanceByMonth=Saldo mensual
+
+AccountingVentilation=Descuadre contabilidad
+AccountingVentilationSupplier=Contablilización compras
+AccountingVentilationCustomer=Contabilización ventas
+Line=Línea
+
+CAHTF=Total (base imponible) compras a proveedor
+InvoiceLines=Líneas de factura para contabilizar
+InvoiceLinesDone=Líneas de facturas contabilizadas
+IntoAccount=En la cuenta
+
+Ventilate=Contabilizar
+VentilationAuto=Contabilización automática
+
+Processing=Tratamiento
+EndProcessing=Final del tratamiento
+AnyLineVentilate=No hay líneas para contabilizar
+SelectedLines=Líneas seleccionadas
+Lineofinvoice=Línea de la factura
+VentilatedinAccount=Contabilizada con éxito en la cuenta contable
+NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
+
+ACCOUNTING_SEPARATORCSV=Separador CSV
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
+
+AccountLength=Longitud de las cuentas contables mostradas en Dolibarr
+AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas.
+ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas generales
+ACCOUNTING_LENGTH_AACCOUNT=Longitud de las subcuentas
+
+ACCOUNTING_SELL_JOURNAL=Diario de ventas
+ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
+ACCOUNTING_BANK_JOURNAL=Diario bancario
+ACCOUNTING_CASH_JOURNAL=Diario de caja
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de operaciones diversas
+ACCOUNTING_SOCIAL_JOURNAL=Diario social
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta de caja
+ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servicio)
+
+Doctype=Tipo de documento
+Docdate=Fecha
+Docref=Referencia
+Numerocompte=Cuenta
+Code_tiers=Tercero
+Labelcompte=Descripción
+Debit=Debe
+Credit=Crédito
+Amount=Cantidad
+Sens=Sentido
+Codejournal=Diario
+
+DelBookKeeping=Eliminar los registros del Diario Mayor
+
+SellsJournal=Diario de ventas
+PurchasesJournal=Diario de compras
+DescSellsJournal=Diario de ventas
+DescPurchasesJournal=Diario de compras
+BankJournal=Diario bancario
+DescBankJournal=El diario bancario incluye todos los tipos pagos que no sean de efectivo
+CashJournal=Diario de caja
+DescCashJournal=El diario de caja incluye el tipo de pago efectivo
+
+CashPayment=Pago en efectivo
+
+SupplierInvoicePayment=Pago de factura de proveedor
+CustomerInvoicePayment=Cobro de factura a cliente
+
+ThirdPartyAccount=Cuenta de tercero
+
+NewAccountingMvt=Nuevo movimiento
+NumMvts=Número del movimiento
+ListeMvts=Listado del movimiento
+ErrorDebitCredit=Debe y Haber no pueden contener un valor al mismo tiempo
+
+ReportThirdParty=Listado cuentas de terceros
+DescThirdPartyReport=Consulte aquí el listado de clientes y proveedores y sus códigos contables
+
+ListAccounts=Listado de cuentas contables
+
+Pcgversion=Versión del plan
+Pcgtype=Tipo del plan
+Pcgsubtype=Subcuenta
+Accountparent=Padre de la cuenta
+Active=Estado
+
+NewFiscalYear=Nuevo año fiscal
+
+DescVentilCustomer=Consulte aquí la contabilización anual de sus facturas a clientes
+TotalVente=Total ventas (base imponible)
+TotalMarge=Total margen ventas
+DescVentilDoneCustomer=Consulte aquí las líneas de facturas a clientes y sus cuentas contables
+DescVentilTodoCustomer=Contabilice sus líneas de facturas a clientes con una cuenta contable
+ChangeAccount=Cambie la cuenta para las líneas seleccionadas a la cuenta:
+Vide=-
+DescVentilSupplier=Consulte aquí la contabilidad anual de sus facturas de proveedores
+DescVentilTodoSupplier=Contabilize sus líneas de facturas de proveedores
+DescVentilDoneSupplier=Consulte aquí la lista de facturas de proveedores y sus cuentas contables
+
+ValidateHistory=Validar automáticamente
+
+ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
+
+FicheVentilation=Ficha contable
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 12d3b0eedd6..e2c2f124b2e 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, este módulo requiere una versión %s o
 ErrorDecimalLargerThanAreForbidden=Error, las precisiones superiores a <b>%s</b> no están soportadas.
 DictionarySetup=Diccionarios
 Dictionary=Diccionarios
+Chartofaccounts=Plan contable
+Fiscalyear=Años fiscales
 ErrorReservedTypeSystemSystemAuto=El uso del tipo 'system' y 'systemauto' está reservado. Puede utilizar 'user' como valor para añadir su propio registro
 ErrorCodeCantContainZero=El código no puede contener el valor 0
 DisableJavascript=Deshabilitar Javascript y funciones Ajax (Recomendado para personas ciegas o navegadores de texto)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Panel
 Boxes=Paneles
 MaxNbOfLinesForBoxes=Nº de líneas máximo para los paneles
 PositionByDefault=Posición por defecto
-Position=Orden
+Position=Posición
 MenusDesc=Los gestores de menú definen el contenido de las 2 barras de menús (la barra horizontal y la barra vertical). Es posible asignar gestores diferentes según el usuario sea interno o externo.
 MenusEditorDesc=El editor de menús permite definir entradas personalizadas en los menús. Debe utilizarse con prudencia so pena de poner a Dolibarr en una situación inestable siendo necesaria una reinstalación para encontrar un menú coherente.
 MenuForUsers=Menú para los usuarios
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automático si Javascript está desactivado
 AvailableOnlyIfJavascriptNotDisabled=Disponible solamente si Javascript esta activado
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible solamente si Javascript y Ajax están activados
 Required=Requerido
+UsedOnlyWithTypeOption=Usado solamente por alguna opción de la agenda
 Security=Seguridad
 Passwords=Contraseñas
 DoNotStoreClearPassword=No almacenar la contraseña sin cifrar en la base
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nombre servidor o ip del servidor
 MAIN_MAIL_EMAIL_FROM=E-Mail del emisor para envíos E-Mail automáticos (Por defecto en php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=E-Mail usado para los retornos de error de los e-mails enviados
 MAIN_MAIL_AUTOCOPY_TO= Enviar automáticamente copia oculta de los e-mails enviados a
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Enviar una copia oculta de los presupuestos que se envían por e-mail a
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Enviar una copia oculta de los pedidos que se envían por e-mail a
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Enviar una copia oculta de las facturas que se envían por e-mail a
 MAIN_DISABLE_ALL_MAILS=Desactivar globalmente todo envío de correos electrónicos (para modo de pruebas o demo)
 MAIN_MAIL_SENDMODE=Método de envío de e-mails
 MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  si se requiere autenticación SMTP
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ Module500Desc=Gestión de los gastos especiales como impuestos, gastos sociales,
 Module510Name=Salarios
 Module510Desc=Gestión de salarios y pagos
 Module600Name=Notificaciones
-Module600Desc=Envío de notificaciones (por correo electrónico) sobre los eventos de trabajo Dolibarr
+Module600Desc=Envío de notificaciones por e-mail en algunos eventos de negocio de Dolibarr a contactos de terceros (configurado en cada tercero)
 Module700Name=Donaciones
 Module700Desc=Gestión de donaciones
-Module800Name=OSCommerce 1
-Module800Desc=Interfaz de visualización de una tienda OSCommerce mediante acceso directo a su base de datos
-Module900Name=OSCommerce 2
-Module900Desc=Interfaz de visualización de una tienda OSCommerce mediante Web services. Este módulo requiere instalar los archivos de /oscommerce_ws/ws_server en OSCommerce. Lea el archivo README del directorio /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis
 Module1400Name=Contabilidad experta
@@ -493,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
@@ -501,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
@@ -512,16 +521,20 @@ Module5000Name=Multi-empresa
 Module5000Desc=Permite gestionar varias empresas
 Module6000Name=Flujo de trabajo
 Module6000Desc=Gestión del flujo de trabajo
-Module20000Name=Días libres
-Module20000Desc=Gestión de los días libres de los empleados
+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 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
 Module50100Desc=Terminal Punto de Venta para la venta en mostrador
-Module50200Name= Paypal
-Module50200Desc= Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paypal
+Module50200Name=Paypal
+Module50200Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paypal
+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
@@ -575,9 +588,6 @@ Permission92=Crear/modificar impuestos e IVA
 Permission93=Eliminar impuestos e IVA
 Permission94=Exportar impuestos
 Permission95=Consultar balances y resultados
-Permission96=Parametrizar desglose
-Permission97=Leer líneas de facturas
-Permission98=Desglosar líneas de facturas
 Permission101=Consultar expediciones
 Permission102=Crear/modificar expediciones
 Permission104=Validar expediciones
@@ -603,15 +613,16 @@ 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
-Permission171=Leer los desplazamientos
-Permission172=Crear/modificar los desplazamientos
-Permission173=Eliminar desplazamientos
-Permission178=Exportar desplazamientos
+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
+Permission174=Leer todos los honorarios
+Permission178=Exportar honorarios
 Permission180=Consultar proveedores
 Permission181=Consultar pedidos a proveedores
 Permission182=Crear/modificar pedidos a proveedores
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de<br>%s seguid
 ModuleCompanyCodePanicum=Devuelve un código contable vacío.
 ModuleCompanyCodeDigitaria=Devuelve un código contable compuesto siguiendo el código de tercero. El código está formado por carácter ' C ' en primera posición seguido de los 5 primeros caracteres del código tercero.
 UseNotifications=Usar notificaciones
-NotificationsDesc=La función de las notificaciones permite enviar automáticamente un correo electrónico para un determinado evento Dolibarr en las empresas configuradas para ello
+NotificationsDesc=La función de las notificaciones permite enviar automáticamente un e-mail para algunos eventos de Dolibarr. Los destinatarios de las notificaciones pueden definirse:<br>* por contactos de terceros (clientes o proveedores), un tercero a la vez.<br>* o configurando un destinatario global en la configuración del módulo.
 ModelModules=Modelos de documentos
 DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca de agua en los documentos borrador
+JSOnPaimentBill=Activar función para autocompletar las líneas de pago en la entrada de pagos
 CompanyIdProfChecker=Reglas sobre los ID profesionales
 MustBeUnique=¿Debe ser único?
 MustBeMandatory=¿Obligatorio para crear terceros?
@@ -1134,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
@@ -1142,6 +1156,7 @@ HideTreadedOrders=Ocultar del listado los pedidos tratados o cancelados
 ValidOrderAfterPropalClosed=Validar el pedido después del cierre del presupuesto, permite no pasar por el pedido provisional
 FreeLegalTextOnOrders=Texto libre en pedidos
 WatermarkOnDraftOrders=Marca de agua en pedidos borrador (en caso de estar vacío)
+ShippableOrderIconInList=Añadir un icono en el listado de pedidos que indica si el pedido es enviable
 ##### Clicktodial #####
 ClickToDialSetup=Configuración del módulo Click To Dial
 ClickToDialUrlDesc=URL de llamada haciendo click en el icono teléfono. <br>La URL completa de llamada será: URL?login=...&password=...&caller=...&called=telellamada
@@ -1154,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
@@ -1380,7 +1395,8 @@ MailingEMailError=E-Mail de respuesta (Errors-to) para las respuestas acerca de
 ##### Notification #####
 NotificationSetup=Configuración del módulo notificaciones
 NotificationEMailFrom=E-Mail emisor (From) de los correos enviados a través de notificaciones
-ListOfAvailableNotifications=Listado de notificaciones disponibles (depende de los módulos activados)
+ListOfAvailableNotifications=Listado de eventos que se pueden configurar para notificar para cada tercero (entrar a la ficha del tercero para configurar) o configurando un e-mail fijo (El listado depende de los módulos activados)
+FixedEmailTarget=Destinatario fijo
 ##### Sendings #####
 SendingsSetup=Configuración del módulo Expediciones
 SendingsReceiptModel=Modelo de notas de entrega
@@ -1408,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
@@ -1433,7 +1450,7 @@ DetailEnabled=Condición de mostrar o no
 DetailRight=Condición de visualización completa o restringida
 DetailLangs=Archivo .lang para la traducción del título
 DetailUser=Interno / Externo / Todos
-Target=Objetivo
+Target=Destinatario
 DetailTarget=Comportamiento del enlace (_blank para abrir una nueva ventana)
 DetailLevel=Nivel (-1:menú superior, 0:principal, >0 menú y submenú)
 ModifMenu=Modificación del menú
@@ -1474,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.
@@ -1531,5 +1551,14 @@ DeleteFiscalYear=Eliminar año fiscal
 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 f7ee9b536f1..078045f4c14 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID de evento
 Actions=Eventos
 ActionsArea=Área de eventos (acciones y tareas)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendario
-Calendars= Calendarios
-LocalAgenda=Calendario local
-AffectedTo= Asignada a
-DoneBy= Realizado por
-Events= Eventos
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendario
+Calendars=Calendarios
+LocalAgenda=Calendario interno
+ActionsOwnedBy=Acontecimiento asignado a
+AffectedTo=Asignada a
+DoneBy=Realizado por
+Event=Acontecimiento
+Events=Eventos
 EventsNb=Número de eventos
 MyEvents=Mis eventos
 OtherEvents=Otros eventos
@@ -17,31 +19,33 @@ ListOfActions=Listado de eventos
 Location=Localización
 EventOnFullDay=Evento para todo el día
 SearchAnAction= Buscar un evento/tarea
-MenuToDoActions= Eventos incompletos
-MenuDoneActions= Eventos terminados
-MenuToDoMyActions= Mis eventos incompletos
-MenuDoneMyActions= Mis eventos terminados
-ListOfEvents= Listado de eventos Dolibarr
+MenuToDoActions=Eventos incompletos
+MenuDoneActions=Eventos terminados
+MenuToDoMyActions=Mis eventos incompletos
+MenuDoneMyActions=Mis eventos terminados
+ListOfEvents=lista de acontecimientos (calendario interno)
 ActionsAskedBy=Eventos registrados por
 ActionsToDoBy=Eventos asignados a
 ActionsDoneBy=Eventos realizados por
-ActionsForUser=Eventos del usuario
-ActionsForUsersGroup=Eventos de todos los usuarios del grupo
+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
 ViewCal=Vista mensual
 ViewDay=Vista diaria
 ViewWeek=Vista semanal
-ViewPerUser=Por usuario
+ViewPerUser=Vista por usuario
 ViewWithPredefinedFilters= Ver con los filtros predefinidos
 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
@@ -49,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
@@ -57,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
@@ -70,17 +71,22 @@ AgendaUrlOptions1=Puede también añadir estos parámetros al filtro de salida:
 AgendaUrlOptions2=<b>login=%s</b> para restringir inserciones a acciones creadas , que afecten o realizadas por el usuario <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> para restringir inserciones a acciones creadas por el usuario <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> para restringir inserciones a acciones que afecten al usuario <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> para restringir inserciones a acciones realizadas por el usuario <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir inserciones a acciones asociadas al proyecto <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Mostrar cumpleaños de los contactos
 AgendaHideBirthdayEvents=Ocultar cumpleaños de los contactos
 Busy=Ocupado
 ExportDataset_event1=Listado de eventos de la agenda
-
+DefaultWorkingDays=Días laborables por defecto (Por ejemplo: 1-5, 1-6)
+DefaultWorkingHours=Jornada laboral diaria en horas (Por ejemplo 9-18)
 # External Sites ical
 ExportCal=Exportar calendario
 ExtSites=Calendarios externos
-ExtSitesEnableThisTool=Mostrar calendarios externos en la agenda
+ExtSitesEnableThisTool=Mostrar calendarios externos (definido en la configuración global) en la agenda. No afecta a los calendarios externos definidos por los usuarios
 ExtSitesNbOfAgenda=Número de calendarios
 AgendaExtNb=Calendario nº %s
 ExtSiteUrlAgenda=Url de acceso al archivo .ical
 ExtSiteNoLabel=Sin descripción
+WorkingTimeRange=Rango temporal
+WorkingDaysRange=Rango diario
+AddEvent=Crear evento
+MyAvailability=Mi disponibilidad
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 97604d0054f..7e4a1e1376d 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Abono
 InvoiceAvoirAsk=Abono para corregir la factura
 InvoiceAvoirDesc=El <b>abono</b> es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo).
 invoiceAvoirWithLines=Crear abono con las líneas de la factura original
-invoiceAvoirWithPaymentRestAmount=Crear abono con el importe pendiente de la factura origen
-invoiceAvoirLineWithPaymentRestAmount=Abono del importe pendiente de la factura
+invoiceAvoirWithPaymentRestAmount=Crear abono con el resto a cobrar de la factura origen
+invoiceAvoirLineWithPaymentRestAmount=Abono del resto por cobrar
 ReplaceInvoice=Rectificar la factura %s
 ReplacementInvoice=Rectificación factura
 ReplacedByInvoice=Rectificada por la factura %s
@@ -85,6 +85,7 @@ ClassifyPaid=Clasificar 'Pagado'
 ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
 ClassifyCanceled=Clasificar 'Abandonado'
 ClassifyClosed=Clasificar 'Cerrado'
+ClassifyUnBilled=Clasificar 'No facturado'
 CreateBill=Crear factura
 AddBill=Crear factura o abono
 AddToDraftInvoices=Añadir a factura borrador
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=¿Está seguro de querer anular la factura <b>%s</b> ?
 ConfirmCancelBillQuestion=¿Por qué razón quiere abandonar la factura?
 ConfirmClassifyPaidPartially=¿Está seguro de querer clasificar la factura <b>%s</b> como pagada?
 ConfirmClassifyPaidPartiallyQuestion=Esta factura no ha sido totalmente pagada. ¿Por qué quiere clasificarla como pagada?
-ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar <b>(%s %s)</b> se ha regularizado (ya que artículo se ha devuelto, olvidado entregar, descuento no definido...)  mediante un abono
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar <b>(%s %s)</b> es un descuento acordado después de la factura. Acepto perder el IVA de este descuento
-ConfirmClassifyPaidPartiallyReasonDiscountVat=El resto a pagar<b>(%s %s)</b> es un descuento
+ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar <b>(%s %s)</b> es un descuento otorgado por pronto pago. Regularizaré el IVA con un abono.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar <b>(%s %s)</b> es un descuento otorgado por pronto pago. Acepto perder el IVA en este descuento.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=El resto a pagar <b>(%s %s)</b> es un descuento otorgado por pronto pago. Recuperaré el IVA sin usar un abono.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productos devueltos en parte
 ConfirmClassifyPaidPartiallyReasonOther=Por otra razón
@@ -190,15 +189,15 @@ AlreadyPaid=Ya pagado
 AlreadyPaidBack=Ya reembolsado
 AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos los abonos y anticipos)
 Abandoned=Abandonada
-RemainderToPay=Queda por pagar
-RemainderToTake=Queda por cobrar
-RemainderToPayBack=Queda por reembolsar
+RemainderToPay=Resta por pagar
+RemainderToTake=Resta por cobrar
+RemainderToPayBack=Resta por reembolsar
 Rest=Pendiente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
 EscompteOffered=Descuento (Pronto pago)
 SendBillRef=Envío de la factura %s
-SendReminderBillRef=Recordatorio de la factura %s
+SendReminderBillRef=Envío de la factura %s (recordatorio)
 StandingOrders=Domiciliaciones
 StandingOrder=Domiciliación
 NoDraftBills=Ninguna factura borrador
@@ -218,19 +217,18 @@ 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
 Billed=Facturado
-RepeatableInvoice=Factura recurrente
-RepeatableInvoices=Facturas recurrentes
-Repeatable=Recurrente
-Repeatables=Recurrentes
-ChangeIntoRepeatableInvoice=Convertir en recurrente
-CreateRepeatableInvoice=Crear factura recurrente
-CreateFromRepeatableInvoice=Crear desde factura recurrente
+RepeatableInvoice=Plantilla de factura
+RepeatableInvoices=Plantilla de facturas
+Repeatable=Plantilla
+Repeatables=Plantillas
+ChangeIntoRepeatableInvoice=Convertir en plantilla
+CreateRepeatableInvoice=Crear plantilla de factura
+CreateFromRepeatableInvoice=Crear desde plantilla de factura
 CustomersInvoicesAndInvoiceLines=Facturas a clientes y líneas de facturas
 CustomersInvoicesAndPayments=Facturas a clientes y pagos
 ExportDataset_invoice_1=Facturas a clientes y líneas de factura
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma del importe de los 2 nuevos descuen
 ConfirmRemoveDiscount=¿Está seguro de querer eliminar este descuento?
 RelatedBill=Factura asociada
 RelatedBills=Facturas asociadas
+LatestRelatedBill=Última factura relacionada
+WarningBillExist=Atención, ya existe al menos una factura
 
 # PaymentConditions
 PaymentConditionShortRECEP=A la recepción
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 5038f138113..56353b2006e 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -12,6 +12,7 @@ BoxLastProspects=Últimos clientes potenciales modificados
 BoxLastCustomers=Últimos clientes modificados
 BoxLastSuppliers=Últimos proveedores modificados
 BoxLastCustomerOrders=Últimos pedidos
+BoxLastValidatedCustomerOrders=Últimos pedidos de clientes validados
 BoxLastBooks=Últimos books
 BoxLastActions=Últimos eventos
 BoxLastContracts=Últimos contratos
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Número de clientes
 BoxTitleLastRssInfos=Las %s últimas infos de %s
 BoxTitleLastProducts=Los %s últimos productos/servicios registrados
 BoxTitleProductsAlertStock=Productos en alerta de stock
-BoxTitleLastCustomerOrders=Los %s últimos pedidos de clientes modificados
+BoxTitleLastCustomerOrders=Últimos %s pedidos de clientes
+BoxTitleLastModifiedCustomerOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastSuppliers=Los %s últimos proveedores registrados
 BoxTitleLastCustomers=Los %s últimos clientes registrados
 BoxTitleLastModifiedSuppliers=Los %s últimos proveedores modificados
 BoxTitleLastModifiedCustomers=Los %s últimos clientes modificados
-BoxTitleLastCustomersOrProspects=Los %s últimos clientes o clientes potenciales registrados
-BoxTitleLastPropals=Los %s últimos presupuestos registrados
+BoxTitleLastCustomersOrProspects=Últimos %s clientes o clientes potenciales
+BoxTitleLastPropals=Últimos %s presupuestos
+BoxTitleLastModifiedPropals=Últimos %s presupuestos modificados
 BoxTitleLastCustomerBills=Las %s últimas facturas a clientes modificadas
+BoxTitleLastModifiedCustomerBills=Últimas %s facturas a clientes modificadas
 BoxTitleLastSupplierBills=Las %s últimas facturas de proveedores modificadas
-BoxTitleLastProspects=Los %s últimos clientes potenciales registrados
+BoxTitleLastModifiedSupplierBills=Últimas %s facturas de proveedores modificadas
 BoxTitleLastModifiedProspects=Los %s últimos clientes potenciales modificados
 BoxTitleLastProductsInContract=Los %s últimos productos/servicios contratados
-BoxTitleLastModifiedMembers=Los %s últimos miembros modificados
+BoxTitleLastModifiedMembers=Últimos %s miembros 
 BoxTitleLastFicheInter=Las %s últimas intervenciones modificadas
-BoxTitleOldestUnpaidCustomerBills=Las %s facturas más antiguas a clientes pendientes de cobro
-BoxTitleOldestUnpaidSupplierBills=Las %s facturas más antiguas de proveedores pendientes de pago
+BoxTitleOldestUnpaidCustomerBills=%s facturas a clientes más antiguras pendientes de cobro
+BoxTitleOldestUnpaidSupplierBills=%s facturas de proveedores más antiguas pendientes de pago
 BoxTitleCurrentAccounts=Balances de cuentas abiertas
 BoxTitleSalesTurnover=Volumen de ventas realizado
-BoxTitleTotalUnpaidCustomerBills=Pendiente de clientes
-BoxTitleTotalUnpaidSuppliersBills=Pendiente a proveedores
+BoxTitleTotalUnpaidCustomerBills=Facturas a clientes pendientes de cobro
+BoxTitleTotalUnpaidSuppliersBills=Facturas de proveedores pendientes de pago
 BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificadas
 BoxMyLastBookmarks=Mis %s últimos marcadores
 BoxOldestExpiredServices=Servicios antiguos expirados
@@ -76,7 +80,8 @@ NoContractedProducts=Sin productos/servicios contratados
 NoRecordedContracts=Sin contratos registrados
 NoRecordedInterventions=Sin intervenciones guardadas
 BoxLatestSupplierOrders=Últimos pedidos a proveedores
-BoxTitleLatestSupplierOrders=Los %s últimos pedidos a proveedores
+BoxTitleLatestSupplierOrders=Últimos %s pedidos a proveedores
+BoxTitleLatestModifiedSupplierOrders=Últimos %s pedidos a proveedores modificados
 NoSupplierOrder=Sin pedidos a proveedores
 BoxCustomersInvoicesPerMonth=Facturas a clientes por mes
 BoxSuppliersInvoicesPerMonth=Facturas de proveedores por mes
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 42c24bbae94..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?
@@ -111,3 +108,5 @@ ExtraFieldsCategories=Atributos complementarios
 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/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index b902891cd1d..99219ff6c2f 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Clientes potenciales contactados
 DateActionPlanned=Fecha planificación
 DateActionDone=Fecha realización
 ActionAskedBy=Acción preguntada por
-ActionAffectedTo=Acción asignada a
+ActionAffectedTo=Evento para
 ActionDoneBy=Acción realizada por
 ActionUserAsk=Registrada por
 ErrorStatusCantBeZeroIfStarted=Si el campo '<b>Fecha de realización</b>' contiene datos la acción está en curso , por lo que el campo ' Estado ' no puede ser 0%.
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 2f123f1a0b1..f86ea312ac3 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -379,7 +379,7 @@ DeliveryAddressLabel=Etiqueta de envío
 DeleteDeliveryAddress=Eliminar una dirección de envío
 ConfirmDeleteDeliveryAddress=¿Está seguro de querer eliminar esta dirección de envío?
 NewDeliveryAddress=Nueva dirección de envío
-AddDeliveryAddress=Añadir la dirección
+AddDeliveryAddress=Crear dirección
 AddAddress=Crear dirección
 NoOtherDeliveryAddress=No hay direcciones alternativas definidas
 SupplierCategory=Categoría de proveedor
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Debe establecer contactos con e-mail en los terceros p
 ListSuppliersShort=Listado de proveedores
 ListProspectsShort=Listado de clientes potenciales
 ListCustomersShort=Listado de clientes
-ThirdPartiesArea=Área Terceros
+ThirdPartiesArea=Área terceros y contactos
 LastModifiedThirdParties=Los %s últimos terceros modificados
 UniqueThirdParties=Total de terceros únicos
 InActivity=Activo
@@ -410,3 +410,5 @@ OutstandingBillReached=Importe máximo alcanzado
 MonkeyNumRefModelDesc=Devuelve un número bajo el formato %syymm-nnnn para los códigos de clientes y %syymm-nnnn para los códigos de los proveedores, donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0.
 LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Puede ser modificado en cualquier momento.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
+SearchThirdparty=Buscar tercero
+SearchContact=Buscar contacto
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 9fc192ecbb1..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
@@ -165,8 +166,8 @@ ProposalStats=Estadísticas de presupuestos
 OrderStats=Estadísticas de pedidos
 InvoiceStats=Estadísticas de facturas
 Dispatch=Desglose
-Dispatched=Desglosados
-ToDispatch=A desglosar
+Dispatched=Contabilizadas
+ToDispatch=A contabilizar
 ThirdPartyMustBeEditAsCustomer=El tercero debe de estar definido como cliente
 SellsJournal=Diario de ventas
 PurchasesJournal=Diario de compras
@@ -181,7 +182,7 @@ DatePaymentTermCantBeLowerThanObjectDate=La fecha límite de pago no puede ser i
 Pcg_version=Versión del plan
 Pcg_type=Tipo de cuenta
 Pcg_subtype=Subtipo de cuenta
-InvoiceLinesToDispatch=Líneas de facturas a desglosar
+InvoiceLinesToDispatch=Líneas de facturas a contabilizar
 InvoiceDispatched=Facturas desglosadas
 AccountancyDashboard=Resumen financiero
 ByProductsAndServices=Por productos y servicios
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a
 TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo <b>contabilidad de caja</b> no es relevante. Este informe sólo está disponible cuando se utiliza en modo <b>contabilidad de compromiso</b> (consulte la configuración del módulo de contabilidad).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
-COMPTA_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos
-COMPTA_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos
-COMPTA_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios
-COMPTA_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios
-COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido
-COMPTA_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado
-COMPTA_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes
-COMPTA_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores
+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
+ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores
+CloneTax=Clonar una carga social
+ConfirmCloneTax=Confirme la clonación de la carga social
+CloneTaxForNextMonth=Clonarla para el próximo mes
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 ffcf2d3d1d6..883b32aefa9 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -1,22 +1,14 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
-#
 About = Acerca de
 CronAbout = Acerca de Cron
 CronAboutPage = Acerca de Cron
-
-#
 # Right
-#
 Permission23101 = Leer tareas programadas
 Permission23102 = Crear/actualizar tareas programadas
 Permission23103 = Borrar tarea programada
 Permission23104 = Ejecutar tarea programada
-
-#
 # Admin
-#
 CronSetup= Configuración del módulo Programador
 URLToLaunchCronJobs=URL para ejecutar tareas Cron
 OrToLaunchASpecificJob=O para ejecutar una tarea en concreto
@@ -24,20 +16,11 @@ KeyForCronAccess=Clave para la URL para ejecutar tareas Cron
 FileToLaunchCronJobs=Comando para ejecutar tareas Cron
 CronExplainHowToRunUnix=En entorno Unix debes usar crontab para ejecutar el comando cada varios minutos
 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.
 CronLastResult=Últ. cód. res.
@@ -70,10 +53,7 @@ CronLabel=Descripcion
 CronNbRun=Núm. ejec.
 CronEach=Toda(s)
 JobFinished=Tareas lanzadas y finalizadas
-
-#
 #Page card
-#
 CronAdd= Tarea Nueva
 CronHourStart= Fecha y hora de inicio de la tarea
 CronEvery= Y ejecutar la tarea cada
@@ -95,20 +75,12 @@ CronObjectHelp=El nombre del objeto a cargar. <BR> Por ejemplo para realizar un
 CronMethodHelp=El métpdp a lanzar. <BR> Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, el valor del método es <i>fecth</i>
 CronArgsHelp=Los argumentos del método. <BR> Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, los valores pueden ser <i>0, ProductRef</i>
 CronCommandHelp=El comando en línea del sistema a ejecutar.
-
-#
 # Info
-#
 CronInfoPage=Información
-
-
-#
 # Common
-#
 CronType=Tipo de tarea
 CronType_method=Llamar a un método de clase Dolibarr
 CronType_command=Comando Shell
 CronMenu=Programador
 CronCannotLoadClass=No se puede cargar la clase %s u objeto %s
-
 UseMenuModuleToolsToAddCronJobs=Ir a "Inicio - Utilidades módulos - Lista de tareas Cron" para ver y editar tareas programadas.
diff --git a/htdocs/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
index 4cfe6c90065..6dbcd26544c 100644
--- a/htdocs/langs/es_ES/deliveries.lang
+++ b/htdocs/langs/es_ES/deliveries.lang
@@ -24,3 +24,5 @@ Deliverer=Destinatario :
 Sender=Origen
 Recipient=Destinatario
 ErrorStockIsNotEnough=No hay suficiente stock
+Shippable=Enviable
+NonShippable=No enviable
diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang
index 7b440d71211..42c6d967657 100644
--- a/htdocs/langs/es_ES/dict.lang
+++ b/htdocs/langs/es_ES/dict.lang
@@ -253,7 +253,6 @@ CivilityMR=Señor
 CivilityMLE=Señorita
 CivilityMTRE=Don
 CivilityDR=Doctor
-
 ##### Currencies #####
 Currencyeuros=Euros
 CurrencyAUD=Dólares Aus.
@@ -290,10 +289,10 @@ CurrencyXOF=Francos CFA BCEAO
 CurrencySingXOF=Franco CFA BCEAO
 CurrencyXPF=Francos CFP
 CurrencySingXPF=Franco CFP
-
 CurrencyCentSingEUR=céntimo
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=milésimo
-
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Campaña correo
@@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Boca a boca
 DemandReasonTypeSRC_PARTNER=Socio
 DemandReasonTypeSRC_EMPLOYEE=Empleado
 DemandReasonTypeSRC_SPONSORING=Patrocinador
-
 #### Paper formats ####
 PaperFormatEU4A0=Formato 4A0
 PaperFormatEU2A0=Formato 2A0
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index dd5e5d3d200..dda4508af8a 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -4,7 +4,7 @@ Donations=Donaciones
 DonationRef=Ref. donación
 Donor=Donante
 Donors=Donantes
-AddDonation=Añadir donación
+AddDonation=Crear una donación
 NewDonation=Nueva donación
 ShowDonation=Mostrar donación
 DonationPromise=Promesa de donación
@@ -30,3 +30,9 @@ SearchADonation=Buscar una donación
 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 19c12805da2..71715c703db 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Código proveedor obligatorio
 ErrorSupplierCodeAlreadyUsed=Código de proveedor ya utilizado
 ErrorBadParameters=Parámetros incorrectos
 ErrorBadValueForParameter=Valor '%s' incorrecto para el parámetro '%s'
-ErrorBadImageFormat=La imagen no tiene un formato reconocido
+ErrorBadImageFormat=El archivo de imagen es de un formato no soportado (Su PHP no soporta las funciones de conversión de este formato de imagen)
 ErrorBadDateFormat=El valor '%s' tiene un formato de fecha no reconocido
 ErrorWrongDate=¡La fecha no es correcta!
 ErrorFailedToWriteInDir=Imposible escribir en el directorio %s
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=La cuenta de usuario de <b>%s</b> no se ha encontrado.
 ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar.
 ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un nuevo valor...
 ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos
+ErrorQtyForCustomerInvoiceCantBeNegative=Las cantidades en las líneas de facturas a clientes no pueden ser negativas
 ErrorWebServerUserHasNotPermission=La cuenta de ejecución del servidor web <b>%s</b> no dispone de los permisos para esto
 ErrorNoActivatedBarcode=No hay activado ningún tipo de código de barras
 ErrUnzipFails=No se ha podido descomprimir el archivo %s con ZipArchive
@@ -135,6 +136,26 @@ ErrorWarehouseMustDiffers=El almacén de origen y destino deben de ser diferente
 ErrorBadFormat=¡El formato es erróneo!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no está enlazado a un tercero. Enlace el miembro a un tercero existente o cree un tercero nuevo antes de crear la suscripción con la factura.
 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
@@ -153,4 +174,5 @@ WarningUsingThisBoxSlowDown=Atención, el uso de este panel provoca serias ralen
 WarningClickToDialUserSetupNotComplete=La configuración de ClickToDial para su cuenta de usuario no está completa (vea la pestaña ClickToDial en su ficha de usuario)
 WarningNotRelevant=Operación irrelevante para este conjunto de datos
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalidad desactivada cuando la configuración de visualización es optimizada para personas ciegas o navegadores de texto.
-WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha (%s) de la factura %s.
\ No newline at end of file
+WarningPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) es anterior a la fecha (%s) de la factura %s.
+WarningTooManyDataPleaseUseMoreFilters=Demasiados datos. Utilice más filtros
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index f1f6e4d3c09..09e4698b4f1 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Número cuenta
 BankAccountNumberKey=Dígito Control
 SpecialCode=Código especial
 ExportStringFilter=%% permite reemplazar uno o más carácteres en el texto
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtro por un año/mes/día<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD':  filtro en un rango de años/meses/días<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filtro en los siguentes años/meses/días<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filtro en los años/meses/días anteriores
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtros por un año/mes/día<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtros entre un rango de años/meses/días<br> > YYYY, > YYYYMM, > YYYYMMDD : filtros en todos los años/meses/días siguientes <br> < YYYY, < YYYYMM, < YYYYMMDD : filtros en todos los años/meses/días anteriores 
 ExportNumericFilter='NNNNN' filtros para un valor<br>'NNNNN+NNNNN' filtros sobre un rango de valores<br>'&gt;NNNNN' filtros para valores menores<br>'&gt;NNNNN' filtros para valores mayores
 ## filters
 SelectFilterFields=Si quiere aplicar un filtro sobre algunos valores, introdúzcalos aquí.
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 8c34109bf13..c0fc36fcada 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=RRHH
-Holidays=Vacaciones
-CPTitreMenu=Vacaciones
+Holidays=Días libres
+CPTitreMenu=Días libres
 MenuReportMonth=Estado mensual
-MenuAddCP=Nueva petición
-NotActiveModCP=Debe activar el módulo Vacaciones para ver esta página.
-NotConfigModCP=Debe configurar el módulo Vacaciones para ver esta página. Para configurarlo, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">haga clic aquí</a>.
-NoCPforUser=No tiene peticiones de vacaciones.
-AddCP=Crear petición de vacaciones
+MenuAddCP=Realizar una petición de días libres
+NotActiveModCP=Debe activar el módulo Días libres retribuidos para ver esta página
+NotConfigModCP=Debe configurar el módulo Días libres retribuidos para ver esta página. Para configurarlo, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">haga clic aquí</a>.
+NoCPforUser=No tiene peticiones de días libres.
+AddCP=Realizar una petición de días libres
 Employe=Empleado
 DateDebCP=Fecha inicio
 DateFinCP=Fecha fin
@@ -18,24 +18,24 @@ ApprovedCP=Aprobada
 CancelCP=Anulada
 RefuseCP=Rechazada
 ValidatorCP=Validador
-ListeCP=Lista de vacaciones
+ListeCP=Listado de días libres
 ReviewedByCP=Será revisada por
 DescCP=Descripción
-SendRequestCP=Enviar la petición de vacaciones
-DelayToRequestCP=Las peticiones de vacaciones deben realizarse al menos <b>%s días</b> antes.
-MenuConfCP=Definir las vacaciones
-UpdateAllCP=Actualizar las vacaciones
-SoldeCPUser=Su saldo de vacaciones es de <b>%s días</b>.
+SendRequestCP=Enviar la petición de días libres
+DelayToRequestCP=Las peticiones de días libres deben realizarse al menos <b>%s días</b> antes.
+MenuConfCP=Definir los días libres
+UpdateAllCP=Actualizar los días libres
+SoldeCPUser=Su saldo de días libres es de <b>%s días</b>.
 ErrorEndDateCP=Debe indicar una fecha de fin superior a la fecha de inicio.
 ErrorSQLCreateCP=Se ha producido un error de SQL durante la creación :
-ErrorIDFicheCP=Se produjo un error, esta solicitud de vacaciones no existe.
+ErrorIDFicheCP=Se produjo un error, esta solicitud de días libres no existe.
 ReturnCP=Volver a la página anterior
-ErrorUserViewCP=No está autorizado a leer esta petición de vacaciones.
-InfosCP=Información de la petición de vacaciones
+ErrorUserViewCP=No está autorizado a leer esta petición de días libres.
+InfosCP=Información de la petición de días libres
 InfosWorkflowCP=Información del workflow
 RequestByCP=Pedido por
-TitreRequestCP=Ficha vacaciones
-NbUseDaysCP=Número de días de vacaciones consumidos
+TitreRequestCP=Ficha días libres
+NbUseDaysCP=Número de días libres consumidos
 EditCP=Modificar
 DeleteCP=Eliminar
 ActionValidCP=Validar
@@ -43,26 +43,25 @@ ActionRefuseCP=Rechazar
 ActionCancelCP=Anular
 StatutCP=Estado
 SendToValidationCP=Enviar validación
-TitleDeleteCP=Eliminar la petición de vacaciones
-ConfirmDeleteCP=¿Está seguro de querer eliminar esta petición de vacaciones?
-ErrorCantDeleteCP=Error, no tiene vacaciones para eliminar esta petición de vacaciones.
-CantCreateCP=No tiene vacaciones para realizar peticiones de vacaciones.
-InvalidValidatorCP=Debe indicar un validador para su petición de vacaciones.
-UpdateButtonCP=Actualizar
-CantUpdate=No puede actualizar esta petición de vacaciones.
+TitleDeleteCP=Eliminar la petición de días libres
+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.
+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.
-ErrorDureeCP=Su petición de vacaciones no contiene ningún día hábil.
-TitleValidCP=Validar la petición de vacaciones
-ConfirmValidCP=¿Está seguro de querer validar esta petición de vacaciones?
+ErrorDureeCP=Su petición de días libres no contiene ningún día hábil.
+TitleValidCP=Aprobar la petición de días libres
+ConfirmValidCP=¿Está seguro de querer validar esta petición de días libres?
 DateValidCP=Fecha de validación
-TitleToValidCP=Enviar la petición de vacaciones
-ConfirmToValidCP=¿Está seguro de querer enviar la petición de vacaciones?
-TitleRefuseCP=Rechazar la petición de vacaciones
-ConfirmRefuseCP=¿Está seguro de querer rechazar la petición de vacaciones?
+TitleToValidCP=Enviar la petición de días libres
+ConfirmToValidCP=¿Está seguro de querer enviar la petición de días libres?
+TitleRefuseCP=Rechazar la petición de días libres
+ConfirmRefuseCP=¿Está seguro de querer rechazar la petición de días libres?
 NoMotifRefuseCP=Debe seleccionar un motivo para rechazar esta petición.
-TitleCancelCP=Anular la petición de vacaciones
-ConfirmCancelCP=¿Está seguro de querer anular la petición de vacaciones?
+TitleCancelCP=Cancelar la petición de días libres
+ConfirmCancelCP=¿Está seguro de querer anular la petición de días libres?
 DetailRefusCP=Motivo del rechazo
 DateRefusCP=Fecha del rechazo
 DateCancelCP=Fecha de la anulación
@@ -72,42 +71,42 @@ MotifCP=Motivo
 UserCP=Usuario
 ErrorAddEventToUserCP=Se ha producido un error en la asignación del permiso excepcional.
 AddEventToUserOkCP=Se ha añadido el permiso excepcional.
-MenuLogCP=Ver los logs de vacaciones
-LogCP=Logs de actualizaciones de vacaciones
+MenuLogCP=Ver el historial de días libres
+LogCP=Historial de actualizaciones de días libres
 ActionByCP=Realizado por
 UserUpdateCP=Para el usuario
 PrevSoldeCP=Saldo anterior
 NewSoldeCP=Nuevo saldo
-alreadyCPexist=Ya se ha efectuado una petición de vacaciones para este periodo.
+alreadyCPexist=Ya se ha efectuado una petición de días libres para este periodo.
 UserName=Nombre Apellidos
 Employee=Empleado
 FirstDayOfHoliday=Primer día libre
 LastDayOfHoliday=Último día libre
 HolidaysMonthlyUpdate=Actualización mensual
 ManualUpdate=Actualización manual
-HolidaysCancelation=Anulación vacaciones
+HolidaysCancelation=Anulación días libres
 
 ## Configuration du Module ##
-ConfCP=Configuración del módulo Vacaciones
+ConfCP=Configuración del módulo de días libres retribuidos
 DescOptionCP=Descripción de la opción
 ValueOptionCP=Valor
-GroupToValidateCP=Grupo con posibilidad de aprobar las vacaciones
+GroupToValidateCP=Grupo con posibilidad de aprobar los días libres
 ConfirmConfigCP=Validar la configuración
-LastUpdateCP=Última actualización automática de vacaciones
+LastUpdateCP=Última actualización automática de días libres
 UpdateConfCPOK=Actualización efectuada correctamente.
 ErrorUpdateConfCP=Se ha producido un error durante la actualización, vuélvalo a intentar.
-AddCPforUsers=Añada los saldos de vacaciones de los usuarios <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">haciendo clic aquí</a>.
-DelayForSubmitCP=Antelación mínima para solicitar vacaciones
+AddCPforUsers=Añada los saldos de días libres de los usuarios <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">haciendo clic aquí</a>.
+DelayForSubmitCP=Fecha límite para realizar peticiones de días libres
 AlertapprobatortorDelayCP=Advertir al validador si la petición no corresponde a la fecha límite
 AlertValidatorDelayCP=Advertir al usuario validador si la petición no respeta el límite previsto
-AlertValidorSoldeCP=Advertir al usuario validador si el usuario pide vacaciones superiores a su saldo
-nbUserCP=Número de usuarios tomados en cuenta en el módulo vacaciones
-nbHolidayDeductedCP=Número de días retribuídos a deducir por día de vacaciones
-nbHolidayEveryMonthCP=Número de vacaciones añadidas por mes
-Module27130Name= Gestion de las vacaciones
+AlertValidorSoldeCP=Advertir al usuario validador si el usuario pide días libres superiores a su saldo
+nbUserCP=Número de usuarios tomados en cuenta en el módulo días libres retribuidos
+nbHolidayDeductedCP=Número de días retribuídos a deducir por día líbre
+nbHolidayEveryMonthCP=Número de días libres añadidos por mes
+Module27130Name= Gestión de los días libres
 Module27130Desc= Gestión de días libres
-TitleOptionMainCP=Ajustes principales de vacaciones
-TitleOptionEventCP=Ajustes de vacaciones enlazados a eventos
+TitleOptionMainCP=Ajustes principales de días libres
+TitleOptionEventCP=Ajustes de días libres enlazados a eventos
 ValidEventCP=Validar
 UpdateEventCP=Actualizar los eventos
 CreateEventCP=Crear
@@ -125,25 +124,25 @@ TitleUpdateEventCP=Modificar o eliminar un permiso excepcional
 DeleteEventOptionCP=Eliminar
 UpdateEventOptionCP=Actualizar
 ErrorMailNotSend=Se ha producido un error en el envío del e-mail :
-NoCPforMonth=Sin vacaciones este mes.
+NoCPforMonth=Sin días libres este mes.
 nbJours=Número de días
-TitleAdminCP=Configuración de las vacaciones
+TitleAdminCP=Configuración de los días libres retribuidos
 #Messages
 Hello=Hola
-HolidaysToValidate=Días retribuidos a validar
-HolidaysToValidateBody=A continuación encontrará una solicitud de días retribuidos para validar
-HolidaysToValidateDelay=Esta solicitud de días retribuidos tendrá lugar en un plazo de menos de %s días.
-HolidaysToValidateAlertSolde=El usuario que ha realizado la solicitud de días retribuidos no dispone de suficientes días disponibles.
-HolidaysValidated=Días retribuidos validados
-HolidaysValidatedBody=Su solicitud de días retribuidos desde el %s al %s ha sido validada.
-HolidaysRefused=Días retribuidos denegados
-HolidaysRefusedBody=Su solicitud de días retribuidos desde el %s al %s ha sido denegada por el siguiente motivo :
-HolidaysCanceled=Días retribuidos cancelados
-HolidaysCanceledBody=Su solicitud de días retribuidos desde el %s al %s ha sido cancelada.
-Permission20000=Leer sus propios días retribuidos
-Permission20001=Crear/modificar sus días retribuidos
-Permission20002=Crear/modificar días retribuidos para todos
-Permission20003=Eliminar peticiones de días retribuidos
-Permission20004=Configurar días retribuidos de usuarios
-Permission20005=Consultar el historial de modificaciones de permisos retribuídos
-Permission20006=Leer informe mensual de días retribuidos
+HolidaysToValidate=Días libres retribuidos a validar
+HolidaysToValidateBody=A continuación encontrará una solicitud de días libres retribuidos para validar
+HolidaysToValidateDelay=Esta solicitud de días libres retribuidos tendrá lugar en un plazo de menos de %s días.
+HolidaysToValidateAlertSolde=El usuario que ha realizado la solicitud de días libres retribuidos no dispone de suficientes días disponibles.
+HolidaysValidated=Días libres retribuidos validados
+HolidaysValidatedBody=Su solicitud de días libres retribuidos desde el %s al %s ha sido validada.
+HolidaysRefused=Días libres retribuidos denegados
+HolidaysRefusedBody=Su solicitud de días libres retribuidos desde el %s al %s ha sido denegada por el siguiente motivo :
+HolidaysCanceled=Días libres retribuidos cancelados
+HolidaysCanceledBody=Su solicitud de días libres retribuidos desde el %s al %s ha sido cancelada.
+Permission20000=Leer sus propios días libres retribuidos
+Permission20001=Crear/modificar sus días libres retribuidos
+Permission20002=Crear/modificar días libres retribuidos para todos
+Permission20003=Eliminar peticiones de días libres retribuidos
+Permission20004=Configurar días libres retribuidos de usuarios
+Permission20005=Consultar el historial de modificaciones de días libres retribuídos
+Permission20006=Leer informe mensual de días libres retribuidos
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index c940706699e..d674f45fc5d 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Nombre y firma del participante:
 NameAndSignatureOfExternalContact=Nombre y firma del cliente:
 DocumentModelStandard=Documento modelo estándar para intervenciones
 InterventionCardsAndInterventionLines=Fichas y líneas de intervención
-ClassifyBilled=Clasificar "Facturado"
+InterventionClassifyBilled=Clasificar "Facturada"
+InterventionClassifyUnBilled=Clasificar "No facturada"
 StatusInterInvoiced=Facturado
 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 9c2dd9f8d4e..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 <b>%s</b> 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 <b>%s</b> 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
@@ -133,6 +133,9 @@ Notifications=Notificaciones
 NoNotificationsWillBeSent=Ninguna notificación por e-mail está prevista para este evento y empresa
 ANotificationsWillBeSent=1 notificación va a ser enviada por e-mail
 SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail
-AddNewNotification=Activar una nueva solicitud de notificación
-ListOfActiveNotifications=Lista de las solicitudes de notificaciones activas
-ListOfNotificationsDone=Lista de notificaciones de e-mails enviadas
+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 <strong>'%s'</strong> 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 7764545ed0a..0f13a2540a2 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Imposible encontrar el usuario <b>%s</b> e
 ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para el país '%s'.
 ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de carga social definida para el país '%s'.
 ErrorFailedToSaveFile=Error, el registro del archivo falló.
-ErrorOnlyPngJpgSupported=Error, solamente se soportan los formatos de imagen jpg y png.
-ErrorImageFormatNotSupported=Su PHP no soporta las funciones de conversión de este formato de imagen.
 SetDate=Fijar fecha
 SelectDate=Seleccione una fecha
 SeeAlso=Ver también %s
 BackgroundColorByDefault=Color de fondo
+FileNotUploaded=No se ha subido el archivo
+FileUploaded=El archivo se ha subido correctamente
 FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo" para ello.
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Consultar la ayuda (puede requerir acceso a Internet)
@@ -266,6 +266,7 @@ Afternoon=Tarde
 Quadri=Trimestre
 MonthOfDay=Mes del día
 HourShort=H
+MinuteShort=min
 Rate=Tipo
 UseLocalTax=Incluir tasas
 Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Listado completo
 Statistics=Estadísticas
 OtherStatistics=Otras estadísticas
 Status=Estado
+Favorite=Favorito
 ShortInfo=Info.
 Ref=Ref.
 RefSupplier=Ref. proveedor
@@ -365,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
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Configuración de los atributos opcionales
 URLPhoto=Url de la foto/logo
 SetLinkToThirdParty=Vincular a otro tercero
 CreateDraft=Crear borrador
+SetToDraft=Volver a borrador
 ClickToEdit=Clic para editar
 ObjectDeleted=Objeto %s eliminado
 ByCountry=Par país
@@ -678,7 +682,7 @@ ViewPrivateNote=Ver notas
 XMoreLines=%s línea(s) ocultas
 PublicUrl=URL pública
 AddBox=Añadir caja
-
+SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 23b8e9acd90..2094ff8761a 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Costos
 UnitCharges=Carga unitaria
 Charges=Cargas
 AgentContactType=Tipo de contacto comisionado
-AgentContactTypeDetails=Indica el tipo de contacto enlazado a las facturas que serán asociados a los agentes comerciales
+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 ebccec6be14..afff6708e0d 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=En retraso
 SubscriptionNotReceivedShort=No recibida
 ListOfSubscriptions=Listado de afiliaciones
 SendCardByMail=Enviar ficha por e-mail
-AddMember=Añadir miembro
+AddMember=Crear miembro
 NoTypeDefinedGoToSetup=Ningún tipo de miembro definido. Vaya a Configuración -> Tipos de miembros
 NewMemberType=Nuevo tipo de miembro
 WelcomeEMail=E-mail
@@ -125,7 +125,7 @@ Date=Fecha
 DateAndTime=Fecha y hora
 PublicMemberCard=Ficha pública miembro
 MemberNotOrNoMoreExpectedToSubscribe=No sometida a cotización
-AddSubscription=Añadir afiliación
+AddSubscription=Crear afiliación
 ShowSubscription=Mostrar afiliación
 MemberModifiedInDolibarr=Miembro modificado en Dolibarr
 SendAnEMailToMember=Enviar e-mail de información al miembro (E-mail: <b>%s</b>)
@@ -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/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 05617644690..fe430c2878c 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Código seguridad
 Calendar=Calendario
-AddTrip=Crear honorario
 Tools=Utilidades
 ToolsDesc=Esta área está dedicada al reagrupamiento de diversas utilidades no disponibles en las otras entradas de menú.<br><br>La lista de estas utilidades es accesible mediante el menú de al lado.
 Birthday=Aniversario
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Creación de proyecto
 Notify_TASK_CREATE=Tarea creada
 Notify_TASK_MODIFY=Tarea modificada
 Notify_TASK_DELETE=Tarea eliminada
+SeeModuleSetup=Consulte la configuración del módulo
 NbOfAttachedFiles=Número archivos/documentos adjuntos
 TotalSizeOfAttachedFiles=Tamaño total de los archivos/documentos adjuntos
 MaxSize=Tamaño máximo
@@ -80,6 +80,16 @@ ModifiedBy=Modificado por %s
 ValidatedBy=Validado por %s
 CanceledBy=Anulado por %s
 ClosedBy=Cerrado por %s
+CreatedById=Id usuario que ha creado
+ModifiedById=Id usuario que ha realizado último cambio
+ValidatedById=Id usuario que ha validado
+CanceledById=Id usuario que ha cancelado
+ClosedById=Id usuario que ha cerrado
+CreatedByLogin=Login usuario que ha creado
+ModifiedByLogin=Login usuario que ha realizado último cambio
+ValidatedByLogin=Login usuario que ha validado
+CanceledByLogin=Login usuario que ha cancelado
+ClosedByLogin=Login usuario que ha cerrado
 FileWasRemoved=El archivo %s ha sido eliminado
 DirWasRemoved=El directorio %s ha sido eliminado
 FeatureNotYetAvailableShort=Disponible en una próxima versión
@@ -193,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 51f594b02c0..693cdfdd193 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Cerrado
 ContractStatusRunning=En servicio
 ContractStatusExpired=Expirado
 ContractStatusOnHold=Fuera de servicio
-ContractStatusToRun=A poner en servicio
+ContractStatusToRun=A iniciar
 ContractNotRunning=Este contrato no está en servicio
 ErrorProductAlreadyExists=Un producto con la referencia %s ya existe.
 ErrorProductBadRefOrLabel=El valor de la referencia o etiqueta es incorrecto
 ErrorProductClone=Ha ocurrido un error al intentar clonar el producto o servicio.
+ErrorPriceCantBeLowerThanMinPrice=Error el Precio no puede ser menor que el precio mínimo.
 Suppliers=Proveedores
 SupplierRef=Ref. producto proveedor
 ShowProduct=Mostrar producto
@@ -116,12 +117,12 @@ ServiceLimitedDuration=Si el servicio es de duración limitada :
 MultiPricesAbility=Varios niveles de precio por producto/servicio
 MultiPricesNumPrices=Nº de precios
 MultiPriceLevelsName=Categoría de precios
-AssociatedProductsAbility=Activar productos compuestos
-AssociatedProducts=Productos compuestos
+AssociatedProductsAbility=Activar la funcionalidad de productos compuestos
+AssociatedProducts=Producto compuesto
 AssociatedProductsNumber=Nº de productos que componen este producto
 ParentProductsNumber=Nº de productos que este producto compone
-IfZeroItIsNotAVirtualProduct=Si 0, este producto no es un producto virtual
-IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no está siendo utilizado por ningún producto virtual
+IfZeroItIsNotAVirtualProduct=Si 0, este producto no es un producto compuesto
+IfZeroItIsNotUsedByVirtualProduct=Si 0, este producto no puede ser usado por ningún producto compuesto
 EditAssociate=Componer
 Translation=Traducción
 KeywordFilter=Filtro por clave
@@ -178,7 +179,7 @@ CloneProduct=Clonar producto/servicio
 ConfirmCloneProduct=¿Está seguro de querer clonar el producto o servicio <b>%s</b>?
 CloneContentProduct=Clonar solamente la información general del producto/servicio
 ClonePricesProduct=Clonar la información general y los precios
-CloneCompositionProduct=Clonar producto/servicio virtual
+CloneCompositionProduct=Clonar productos/servicios compuestos
 ProductIsUsed=Este producto es utilizado
 NewRefForClone=Ref. del nuevo producto/servicio
 CustomerPrices=Precios clientes
@@ -239,3 +240,10 @@ PricingRule=Reglas de precio
 AddCustomerPrice=Añadir precio por clientes
 ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clientes
 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<br>ExtraFields son variables como "#options_myextrafieldkey# * 2"<br>Existen variables especiales como #quantity# y #tva_tx#<br>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 f393616f898..3a6ed7f8784 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -37,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
@@ -46,7 +48,7 @@ TaskDateStart=Fecha inicio
 TaskDateEnd=Fecha finalización
 TaskDescription=Descripción tarea
 NewTask=Nueva tarea
-AddTask=Añadir tarea
+AddTask=Crear tarea
 AddDuration=Indicar duración
 Activity=Actividad
 Activities=Tareas/actividades
@@ -86,13 +88,13 @@ ActionsOnProject=Eventos del proyecto
 YouAreNotContactOfProject=Usted no es contacto de este proyecto privado
 DeleteATimeSpent=Eliminación de tiempo dedicado
 ConfirmDeleteATimeSpent=¿Está seguro de querer eliminar este tiempo dedicado?
-DoNotShowMyTasksOnly=Ver también las tareas que no me afectan
-ShowMyTasksOnly=Solamente ver las tareas que me afectan
+DoNotShowMyTasksOnly=Ver también tareas no asignadas a mí
+ShowMyTasksOnly=Ver solamente tareas asignadas a mí
 TaskRessourceLinks=Recursos afectados
 ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero
 NoTasks=Ninguna tarea para este proyecto
 LinkedToAnotherCompany=Enlazado a otra empresa
-TaskIsNotAffectedToYou=Tarea que no le afecta
+TaskIsNotAffectedToYou=Tarea no asignada a usted
 ErrorTimeSpentIsEmpty=No se ha establecido el tiempo consumido
 ThisWillAlsoRemoveTasks=Esta operación también destruirá las tareas del proyecto (<b>%s</b> tareas) y sus tiempos dedicados.
 IfNeedToUseOhterObjectKeepEmpty=Si los elementos (factura, pedido, ...) pertenecen a un tercero que no és el seleccionado, debiendo estos estar ligados al proyecto a crear, déjelo vacío para permitir el proyecto a multi-terceros.
@@ -121,6 +123,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante
 TypeContact_project_task_external_TASKCONTRIBUTOR=Participante
 SelectElement=Seleccione elemento
 AddElement=Vincular a elmento
+UnlinkElement=Desvincular elemento
 # Documents models
 DocumentModelBaleine=Modelo de informe de proyecto completo (logo...)
 PlannedWorkload = Carga de trabajo prevista
@@ -129,3 +132,4 @@ ProjectReferers=Objetos vinculados
 SearchAProject=Buscar un proyecto
 ProjectMustBeValidatedFirst=El proyecto debe validarse primero
 ProjectDraft=Proyectos borrador
+FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index b90258f5049..2dc18972359 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -55,8 +55,6 @@ NoOpenedPropals=Sin presupuestos abiertos
 NoOtherOpenedPropals=Ningún otro presupuesto abierto
 RefProposal=Ref. presupuesto
 SendPropalByMail=Enviar presupuesto por e-mail
-FileNotUploaded=No se ha subido el archivo
-FileUploaded=El archivo se ha subido correctamente
 AssociatedDocuments=Documentos asociados al presupuesto:
 ErrorCantOpenDir=Imposible abrir el directorio
 DatePropal=Fecha presupuesto
@@ -83,7 +81,7 @@ ProposalsAndProposalsLines=Presupuestos a clientes y líneas de presupuestos
 ProposalLine=Línea de presupuesto
 AvailabilityPeriod=Tiempo de entrega
 SetAvailability=Definir el tiempo de entrega
-AfterOrder=despues del pedido
+AfterOrder=desde la firma
 ##### Availability #####
 AvailabilityTypeAV_NOW=Inmediata
 AvailabilityTypeAV_1W=1 semana
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/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index bc4079feb21..c8e3707d5df 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable pago de salarios
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable cargas financieras
 Salary=Salario
 Salaries=Salarios
 Employee=Empleado
@@ -6,3 +8,5 @@ NewSalaryPayment=Nuevo pago
 SalaryPayment=Pago de salario
 SalariesPayments=Pagos de salarios
 ShowSalaryPayment=Ver pago
+THM=Precio medio por hora
+TJM=Precio medio por día
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 8baee47d141..4335c234d11 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Estadísticas realizadas únicamente sobre las exp
 DateDeliveryPlanned=Fecha prevista de entrega
 DateReceived=Fecha real de recepción
 SendShippingByEMail=Envío de expedición por e-mail
-SendShippingRef=Envío expedición %s
+SendShippingRef=Envío de la expedición %s
 ActionsOnShipping=Eventos sobre la expedición
 LinkToTrackYourPackage=Enlace para el seguimento de su paquete
 ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedición se realiza desde la ficha de pedido.
 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
 SendingMethodTRANS=Transportista
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Modelo simple de nota de entrega / recepción
 DocumentModelTyphon=Modelo completo de nota de entrega / recepción (logo...)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definida
 SumOfProductVolumes=Suma del volumen de los productos
 SumOfProductWeights=Suma del peso de los productos
+
+# warehouse details
+DetailWarehouseNumber= Detalles del almacén
+DetailWarehouseFormat= Alm.:%s (Cant. : %d)
diff --git a/htdocs/langs/es_ES/shop.lang b/htdocs/langs/es_ES/shop.lang
deleted file mode 100644
index 67bf61fb702..00000000000
--- a/htdocs/langs/es_ES/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=No se pudo conectar con la base de datos oscommerce. Compruebe la configuración del módulo
-Shop=Tienda
-ShopWeb=Tienda web
-LastOrders=Últimos pedidos
-OnStandBy=En espera
-TreatmentInProgress=En proceso
-LastCustomers=Ultimos clientes
-OSCommerceShop=Tienda OSCommerce
-OSCommerce=OSCommerce
-AddProd=Venta en línea
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/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index 52458b713de..06079f22874 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Proveedores
 Supplier=Proveedor
-AddSupplier=Añadir proveedor
+AddSupplier=Crear un proveedor
 SupplierRemoved=Proveedor eliminado
 SuppliersInvoice=Factura proveedor
 NewSupplier=Nuevo proveedor
@@ -40,3 +40,5 @@ AddSupplierInvoice=Crear factura de proveedor
 ListOfSupplierProductForSupplier=Listado de productos y precios del proveedor <b>%s</b>
 NoneOrBatchFileNeverRan=Ninguno o lote <b>%s</b> no se ha ejecutado recientemente
 SentToSuppliers=Enviado a proveedores
+ListOfSupplierOrders=Listado de pedidos a proveedor
+MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index b19ed5e8352..ff2cdf724bd 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Viaje
 ListTripsAndExpenses=Listado notas de honorarios
 ExpensesArea=Área de Notas de honorarios
 SearchATripAndExpense=Buscar un honorario
+ClassifyRefunded=Clasificar 'Reembolsado'
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index d514b328877..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
@@ -114,8 +113,10 @@ YourRole=Sus roles
 YourQuotaOfUsersIsReached=¡Ha llegado a su cuota de usuarios activos!
 NbOfUsers=Nº de usuarios
 DontDowngradeSuperAdmin=Sólo un superadmin puede degradar un superadmin
-HierarchicalResponsible=Responsable jerárquico
+HierarchicalResponsible=Supervisor
 HierarchicView=Vista jerárquica
 UseTypeFieldToChange=Modificar el campo Tipo para cambiar
 OpenIDURL=Dirección OpenID
 LoginUsingOpenID=Usar OpenID para iniciar sesión
+WeeklyHours=Horas semanales
+ColorUser=Color para el usuario
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 6e12cbccf47..de91cb28d0a 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -14,8 +14,9 @@ WithdrawalReceiptShort=Orden
 LastWithdrawalReceipts=Las %s últimas órdenes de domiciliación
 WithdrawedBills=Facturas domiciliadas
 WithdrawalsLines=Lineas de domiciliación
-RequestStandingOrderToTreat=Pedidos de domiciliaciones a tratar
-RequestStandingOrderTreated=Pedidos de domiciliaciones procesados
+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/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
index 29196f1372e..396d234b2df 100644
--- a/htdocs/langs/es_HN/compta.lang
+++ b/htdocs/langs/es_HN/compta.lang
@@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe <b>%sISV pagado%s</b> para un modo
 SeeVATReportInDueDebtMode=Ver el informe <b>%sISV debido%s</b> para un modo de cálculo con la opción sobre lo debido
 RulesVATIn=- Para los servicios, el informe incluye el ISV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.<br>- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura.
 RulesVATDue=- Para los servicios, el informe incluye el ISV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.<br>- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura.
-COMPTA_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV")
+ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV")
diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang
index 782dfe6ec94..2dbc3cc49b9 100644
--- a/htdocs/langs/es_PE/compta.lang
+++ b/htdocs/langs/es_PE/compta.lang
@@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe <b>%sIGV pagado%s</b> para un modo
 SeeVATReportInDueDebtMode=Ver el informe <b>%sIGV debido%s</b> para un modo de cálculo con la opción sobre lo debido
 RulesVATIn=- Para los servicios, el informe incluye el IGV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.<br>- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura.
 RulesVATDue=- Para los servicios, el informe incluye el IGV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.<br>- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura.
-COMPTA_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV")
+ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV")
diff --git a/htdocs/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang
index 0ba46f2c682..c9226abe8f1 100644
--- a/htdocs/langs/es_PR/compta.lang
+++ b/htdocs/langs/es_PR/compta.lang
@@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe <b>%sIVU pagado%s</b> para un modo
 SeeVATReportInDueDebtMode=Ver el informe <b>%sIVU debido%s</b> para un modo de cálculo con la opción sobre lo debido
 RulesVATIn=- Para los servicios, el informe incluye el IVU de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.<br>- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura.
 RulesVATDue=- Para los servicios, el informe incluye el IVU de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.<br>- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura.
-COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU")
+ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU")
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index bece2d3070c..105335add8e 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Ühendus
+Foundation=Sihtasutus
 Version=Versioon
 VersionProgram=Programmi versioon
 VersionLastInstall=Esmapaigalduse versioon
@@ -24,7 +24,7 @@ NoSessionFound=Tundub, et PHP ei luba luua aktiivsete sessioonide nimekirja. Ses
 HTMLCharset=HTML lehtede loomiseks kasutatav märgistik
 DBStoringCharset=Märgistik, mida kasutatakse andmete salvestamiseks andmebaasi
 DBSortingCharset=Märgistik, mida kasutada andmete sorteerimiseks andmebaasis
-WarningModuleNotActive=Moodul <b>%s</b> peab olema sisse lülitatud
+WarningModuleNotActive=Moodul <b>%s</b> peab olema sisse lülitatud.
 WarningOnlyPermissionOfActivatedModules=Antud lehel näidatakse vaid aktiivsete moodulitega seotud õigusi. Teisi mooduleid saab aktiveerida Kodu->Seadistamine->Moodulid lehel.
 DolibarrSetup=Dolibarri paigaldamine või uuendamine
 DolibarrUser=Dolibarri kasutaja
@@ -36,24 +36,28 @@ GlobalSetup=Globaalne seadistamine
 GUISetup=Kuva
 SetupArea=Seadistamise ala
 FormToTestFileUploadForm=Failide üleslaadimise teistimiseks kasutatav vorm (vastavalt seadistustele)
-IfModuleEnabled=Märkus: jah töötab vaid siis, kui moodul <b>%s</b> on lubatud
+IfModuleEnabled=Märkus: jah töötab vaid siis, kui moodul <b>%s</b> on sisse lülitatud.
 RemoveLock=Kui fail <b>%s</b> on juba olemas, siis eemalda see, et võimaldada uuendamise tööriista kasutamist.
 RestoreLock=Taasta fail <b>%s</b> ja luba sellele failile lugemisõigused uuendustööriista kasutamise keelamiseks.
 SecuritySetup=Turvaseaded
-ErrorModuleRequirePHPVersion=Viga: see moodul nõuab PHP versiooni %s või kõrgemat
-ErrorModuleRequireDolibarrVersion=Viga: see moodul nõuab Dolibarri versiooni %s või kõrgemat
+ErrorModuleRequirePHPVersion=Viga: see moodul nõuab PHP versiooni %s või uuemat.
+ErrorModuleRequireDolibarrVersion=Viga: see moodul nõuab Dolibarri versiooni %s või uuemat.
 ErrorDecimalLargerThanAreForbidden=Viga, suurem täpsus kui <b>%s</b> ei ole toetatud.
 DictionarySetup=Sõnaraamatu seadistamine
 Dictionary=Sõnaraamatud
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Tüübi väärtused 'system' ja 'systemauto' on reserveeritud. Omaloodud kirje väärtuseks võib kasutada väärtust 'user'.
 ErrorCodeCantContainZero=Kood ei või sisaldada väärtust 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Lülita JavaScripti ja Ajaxi funktsioonid välja (soovitatav vaegnägijate või tekstibrauserite jaoks)
 ConfirmAjax=Kasuta Ajax kinnituse hüpikaknaid
-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=Kasuta kolmandate isikute valimiseks rippmenüü asemel automaatsete vastete pakkumisega välju 
-ActivityStateToSelectCompany= Lisa filter, mis võimaldab filtreerida kolmandaid isikuid nende aktiivsuse järgi
-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=Kasuta kontakti valimiseks rippmenüü asemel automaatsete vastete pakkumisega välju 
+UseSearchToSelectCompanyTooltip=Suure kolmandate isikute arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi COMPANY_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
+UseSearchToSelectCompany=Kasuta kolmandate isikute valimiseks nimekirja asemel automaatsete vastete pakkumisega välju 
+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
@@ -65,8 +69,8 @@ ShowPreview=Kuva eelvaade
 PreviewNotAvailable=Eelvaade pole saadaval
 ThemeCurrentlyActive=Hetkel kasutatav teema
 CurrentTimeZone=PHP ajavöönd (serveri ajavöönd)
-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).
+MySQLTimeZone=MySQLi (andmebaasi) ajavöönd
+TZHasNoEffect=Andmebaasiserver säilitab ja tagastab kuupäevi sisestatud sõnena. Ajavöönd omab mõju vaid UNIX_TIMESTAMP funktsiooni kasutamisel (mida Dolibarr ei tohiks kasutada, seega ei tohiks andmebaasi ajavöönd omada mitte mingit mõju isegi pärast seda, kui ajavööndit muudetakse pärast andmete sisestamist)
 Space=Ruum
 Table=Tabel
 Fields=Väljad
@@ -133,7 +137,7 @@ Box=Kast
 Boxes=Kastid
 MaxNbOfLinesForBoxes=Maksimaalne ridade arv kastis
 PositionByDefault=Vaikimisi järjestus
-Position=Järjestus
+Position=Position
 MenusDesc=Menüühaldurites on määratletud 2 menüüriba sisu (horisontaalne ja vertikaalne riba).
 MenusEditorDesc=Menüü toimeti võimaldab menüüsid isikustada. Kasutage seda ettevaatlikult, et vältida Dolibarri muutmist ebastabiilseks ja menüüde kirjeid igavesti kättesaamatuks.<br>Mõned moodulid lisavad ise menüüdesse kirjeid (tavaliselt menüüsse <b>Kõik</b>). Kui sa oled mõne neist kannetest ekslikult ära kustutanud, saab nad taastada mooduli välja ja sisse lülitamisega.
 MenuForUsers=Kasutajatele mõeldud menüü
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automaatne, kui Javascript on keelatud
 AvailableOnlyIfJavascriptNotDisabled=Saadaval ainult siis, kui JavaScript pole keelatud
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Saadaval ainult siis, kui JavaScript pole keelatud
 Required=Nõutud
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Turvalisus
 Passwords=Paroolid
 DoNotStoreClearPassword=Ära säilita paroole andmebaasis avatud tekstis, vaid ainult krüpteeritud väärtusi (soovitatav aktiveeritud).
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS host (pole Unix laadset
 MAIN_MAIL_EMAIL_FROM=Saatja e-mail automaatsete e-kirjade saatmiseks (vaikimisi php.ini failis: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Saatja e-posti aadress, kuhu saata kirjade saatmisel tekkivad veateated
 MAIN_MAIL_AUTOCOPY_TO= Saada kõigist saadetud kirjadest automaatselt pimekoopia aadressile
+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=Keela e-kirjade saatmine (testimis või demo paigaldused)
 MAIN_MAIL_SENDMODE=E-kirjade saatmiseks kasutatav meetod
 MAIN_MAIL_SMTPS_ID=SMTP kasutaja, kui autentimine on nõutud
@@ -296,7 +305,7 @@ CurrentVersion=Dolibarri praegune versioo
 CallUpdatePage=Mine lehele, mis uuendab andmebaasi struktuuri ja andmed: %s.
 LastStableVersion=Viimane stabiilne versioon
 GenericMaskCodes=Sa võid sisestada suvalise numeratsiooni maski. Järgnevas maskis saab kasutada järgmisi silte:<br><b>{000000}</b> vastab arvule, mida suurendatakse iga sündmuse %s korral. Sisesta niipalju nulle, kui soovid loenduri pikkuseks. Loendurile lisatakse vasakult alates niipalju nulle, et ta oleks maskiga sama pikk.<br><b>{000000+000}</b> on eelmisega sama, kuid esimesele %s lisatakse nihe, mis vastab + märgist paremal asuvale arvule.<br><b>{000000@x}</b> on eelmisega sama, ent kuuni x jõudmisel nullitakse loendur (x on 1 ja 12 vahel, või 0 seadistuses määratletud majandusaasta alguse kasutamiseks, või 99 loenduri nullimiseks iga kuu alguses). Kui kasutad seda funktsiooni ja x on 2 või kõrgem, siis on jada {yy}{mm} or {yyyy}{mm} nõutud.<br><b>{dd}</b> päev (01 kuni 31).<br><b>{mm}</b> kuu (01 kuni 12).<br><b>{yy}</b>, <b>{yyyy}</b> või <b>{y}</b> aasta 2, 4 või 1 numbri kasutamisks.<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> kliendi kood, n tähemärki<br><b>{cccc000}</b> n tähemärgiga kliendi koodile järgneb kliendile määratletud loenduri väärtus. Kliendile määratletud loendur lähtestatakse koos üldise loenduriga.<br><b>{tttt}</b> Kolmanda isiku koodi liik n tähemärgiga (vt Sõnastik->Kolmandate isikute liigid)<br>
 GenericMaskCodes3=Kõik teised maskis olevad tähemärgid jäävad puutuamata.<br>Tühikud ei ole lubatud.<br>
 GenericMaskCodes4a=<u>Näiteks 99ndal %s tegi kolmas isik KolmasIsik 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Näiteks 2007-03-01 loodud kolmas isik:</u> <br>
@@ -373,10 +382,10 @@ ExtrafieldSelectList = Vali tabelist
 ExtrafieldSeparator=Eraldaja
 ExtrafieldCheckBox=Märkeruut
 ExtrafieldRadio=Raadionupp
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpselect=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>jne<br><br>Nimekirja teisest nimekirjast sõltuvaks muutmiseks:<br>1,väärtus1|ema_nimekirja_kood:ema_võti<br>2,väärtus2|ema_nimekirja_kood:ema_võti
+ExtrafieldParamHelpcheckbox=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>...
+ExtrafieldParamHelpradio=Parameetrite nimekiri peab olema kujul võti,väärtus<br><br>Näiteks:<br>1,väärtus1<br>2,väärtus2<br>3,väärtus3<br>...
+ExtrafieldParamHelpsellist=Parameetrite nimekiri on määratletud tabelis<br>Süntaks: tabeli_nimi:välja_silt:välja_id::filter<br>Näiteks: c_typent:libelle:id::filter<br><br>filter võib olla lihtne test (nt active=1) ainult aktiivse väärtuse näitamiseks <br> Lisaväljade põhjal filtreerimiseks kasuta süntaksit extra.fieldcode=... (kus välja kood on lisavälja e extrafieldi kood)<br><br>Nimekirja teisest nimekirjast sõltuvaks muutmiseks tee nii:<br>c_typent:libelle:id:vanem_listi_kood|vanema_veerg:filter
 LibraryToBuildPDF=PDFide loomiseks kasutatav teek
 WarningUsingFPDF=Hoiatus: <b>conf.php</b> sisaldab direktiivi <b>dolibarr_pdf_force_fpdf=1</b>. See tähendab, et PDF failide loomiseks kasutatakse FPDF teeki. FPDF teek on vananenud ja ei toeta paljusid võimalusi (Unicode, läbipaistvad pildid, kirillitsa, araabia ja aasia märgistikke jne), seega võib PDFi loomise ajal tekkida vigu.<br>Probleemide vältimiseks ja täieliku PDFi loomise toe jaoks palun lae alla <a href="http://www.tcpdf.org/" target="_blank">TCPDF teek</a> ning seejärel kommenteeri välja või kustuta rida <b>$dolibarr_pdf_force_fpdf=1</b> ja lisa rida <b>$dolibarr_lib_TCPDF_PATH='TCPDF_kausta_rada'</b>
 LocalTaxDesc=Mõnedes riikides rakendub igale arve reale 2 või 3 maksu. Sellisel juhul vali vali teise või kolmanda maksu tüüp ja maksu määr. Võimalikud tüübid on järgnevad:<br>1 - kohalik maks, rakendub ainult käibemaksuta toodetele ja teenustele (käibemaksu ei rakendata kohalikule maksule)<br>2 - kohalik maks, rakendub toodetele ja teenustele enne käibemaksu (käibemaksu arvutatakse summa + kohalik_maks pealt)<br>3 - kohalik maks rakendub käibemaksuta toodetele (käibemaksu ei rakendata kohalikule maksule)<br>4 - kohalik maks rakendub toodetele enne käibemaksu (käibemaksu arvutatakse summa + kohalik_maks pealt)<br>5 - kohalik maks rakendub käibemaksuta teenustele (käibemaksu ei rakendata kohalikule maksule)<br>6 - kohalik maks rakendub teenustele enne käibemaksu (käibemaksu arvutatakse summa + kohalik_maks pealt)
@@ -388,15 +397,15 @@ KeepEmptyToUseDefault=Jäta tühjaks vaikeväärtuse kasutamiseks
 DefaultLink=Vaikimisi link
 ValueOverwrittenByUserSetup=Hoiatus: kasutaja võib selle väärtuse üle kirjutada oma seadetega (iga kasutaja saab määratleda isikliku clicktodial URLi)
 ExternalModule=Väline moodul - paigaldatud kausta %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
+BarcodeInitForThirdparties=Kolmandate isikute jaoks vöötkoodide massiline loomine
+BarcodeInitForProductsOrServices=Toodete/teenuste jaoks massiline vöötkoodide loomine või lähtestamine
+CurrentlyNWithoutBarCode=Hetkel on <strong>%s</strong> kirjet <strong>%s</strong> %s määratlemata vöötkoodiga
+InitEmptyBarCode=Järgmise %s tühja kirje lähtestamise väärtus
 EraseAllCurrentBarCode=Kustuta kõik hetkel kasutatavad vöötkoodide väärtused
 ConfirmEraseAllCurrentBarCode=Kas oled täiesti kindel, et soovid kustutada kõik hetkel kasutatavad vöötkoodide väärtused?
 AllBarcodeReset=Kõik triipkoodi väärtused on eemaldatud
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+NoBarcodeNumberingTemplateDefined=Vöötkoodide mooduli seadistuses pole määratletud ühtki vöötkoodide numeratsiooni malli
+NoRecordWithoutBarcodeDefined=Pole ühtki puuduva vöötkoodiga kirjet
 
 # Modules
 Module0Name=Kasutajad ja grupid
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OsCommerce integratsioon otsese andmebaasi ligipääsu abil
-Module800Desc=Liides, mis näitab OSCommercei või OSCSSi poodi otsese andmebaasi ligipääsu abil
-Module900Name=OSCommercei tegi WS
-Module900Desc=Liides, mis näitab OSCommercei poodi veebiteenuste abil. See moodul nõuab /oscommerce_ws/ws_server kaustast pärit komponentide paigaldamist OSCommercei serverisse. Loe README faili /oscommerce_ws/ws_server kaustas.
 Module1200Name=Mantis
 Module1200Desc=Mantise integratsioon
 Module1400Name=Raamatupidamine
@@ -493,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
@@ -501,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
@@ -512,24 +521,28 @@ 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 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=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Desc=Online küsitluste korraldamise moodul (nagu Doodle, Studs, Rdvz jms)
 Module59000Name=Marginaalid
 Module59000Desc=Marginaalide haldamise moodu
 Module60000Name=Komisjonitasu
 Module60000Desc=Komisjonitasude haldamise moodu
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module150010Name=Partii number, söö-kuni kuupäev ja müü-kuni kuupäev
+Module150010Desc=Toote partii numbri, söö-kuni ja müü-kuni kuupäevade haldamine
 Permission11=Müügiarvete vaatamine
 Permission12=Müügiarvete loomine/toimetamine
 Permission13=Müügiarvete muutmine
@@ -575,9 +588,6 @@ Permission92=Sotsiaal- ja käibemaksu loomine/muutmine
 Permission93=Sotsiaal- ja käibemaksu kustutamine
 Permission94=Sotsiaalmaksu eksport
 Permission95=Aruannete vaatamine
-Permission96=Saatmise seadistamine
-Permission97=Arvete raamatupidamisse saatmise vaatamine
-Permission98=Arvete raamatupidamisse saatmise read
 Permission101=Saatmiste vaatamine
 Permission102=Saatmiste loomine/muutmine
 Permission104=Saatmiste kinnitamine
@@ -603,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
@@ -668,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
@@ -698,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
@@ -748,33 +759,34 @@ Permission50202=Tehingute impor
 Permission54001=Prindi
 Permission55001=Küsitluste vaatamine
 Permission55002=Küsitluste loomine/muutmine
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
+Permission59001=Marginaalide vaatamine
+Permission59002=Marginaalide määratlemine
 DictionaryCompanyType=Kolmandate isikute tüüp
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
+DictionaryCompanyJuridicalType=Kolmandate isikute juriidilised liigid
+DictionaryProspectLevel=Huvilise huvitatuse tase
 DictionaryCanton=Maakonnad
 DictionaryRegion=Piirkonnad
 DictionaryCountry=Riigid
 DictionaryCurrency=Valuutad
-DictionaryCivility=Civility title
+DictionaryCivility=Tiitel
 DictionaryActions=Päevakava sündmuste tüüp
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Sotsiaalmaksude liigid
 DictionaryVAT=Käibe- või müügimaksumäärad
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryRevenueStamp=Maksumärkide kogus
 DictionaryPaymentConditions=Maksetingimused
 DictionaryPaymentModes=Maksmine režiimid
 DictionaryTypeContact=Kontakti/Aadressi tüübid
 DictionaryEcotaxe=Ökomaks (WEEE)
 DictionaryPaperFormat=Paberiformaadid
-DictionaryFees=Type of fees
+DictionaryFees=Teenustasude liik
 DictionarySendingMethods=Saatmismeetodid
 DictionaryStaff=Personal
 DictionaryAvailability=Tarneaeg
 DictionaryOrderMethods=Tellimisviisid
-DictionarySource=Origin of proposals/orders
+DictionarySource=Pakkumiste/tellimuste päritolu
 DictionaryAccountancyplan=Kontode graafik
-DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancysystem=Kontoplaani mudelid
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Seadistused salvestatud
 BackToModuleList=Tagasi moodulite nimekirja
 BackToDictionaryList=Tagasi sõnastike nimekirja
@@ -785,7 +797,7 @@ VATIsNotUsedDesc=Vaikimisi pakutakse käibemaksumääraks 0, mida kasutavad näi
 VATIsUsedExampleFR=Prantsusmaa juhul tähendab see ettevõtteid või organisatsioone, mis kasutavad real fiscal süsteemi (simplified real või normal real), ehk süsteemi, kus deklareeritakse käibemaks.
 VATIsNotUsedExampleFR=Prantsusmaal tähendab see ühendusi, mis ei ole käibemaksukohuslased, või ettevõtteid, organisatsioone või kutsetegevuse vallas tegutsejaid, kes kasutavad mikroettevõtte fiskaalsüsteemi (frantsiisi käibemaks) ning maksavad frantsiisi käibemaksu ise käibemaksu deklareerimata. See valik näitab arvetel viidet "Non applicable VAT - art-293B of CGI".
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Määr
 LocalTax1IsUsed=Kasuta teist maksu
 LocalTax1IsNotUsed=Ära kasuta teist maksu
 LocalTax1IsUsedDesc=Kasuta teist liiki maksu (mitte KM)
@@ -810,13 +822,13 @@ LocalTax2IsUsedDescES= Pakkumiste, arvete, tellimuste jne loomisel kasutatav RE
 LocalTax2IsNotUsedDescES= Vaikimisi pakutud IRPF on 0. Reegli lõpp.
 LocalTax2IsUsedExampleES= Hispaanias on nad vabakutselised ja spetsialistid, kes pakuvad teenuseid ja ettevõtted, kes on valinud moodulipõhise maksusüsteemi.
 LocalTax2IsNotUsedExampleES= Hispaanias on nad ettevõtted, kes ei kasuta moodulipõhist maksusüsteemi.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax=Aruanded
+CalcLocaltax1ES=Müügid - Ostud
+CalcLocaltax1Desc=Kohalike maksude aruannete arvutamiseks kasutatakse kohalike maksude müügi ja kohalike maksude ostude vahet
+CalcLocaltax2ES=Ostud
+CalcLocaltax2Desc=Kohalike maksude aruanded on kohalike maksude ostude summas
+CalcLocaltax3ES=Müügid
+CalcLocaltax3Desc=Kohalike maksude aruanded on kohalike maksude müükide summas
 LabelUsedByDefault=Vaikimisi kasutatav silt, kui koodile ei leitud tõlke vastet
 LabelOnDocuments=Dokumentide silt
 NbOfDays=Päevade arv
@@ -884,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
@@ -928,14 +941,14 @@ EventsSetup=Sündmuste logide seadistamine
 LogEvents=Sündmuste turvaaudit
 Audit=Audit
 InfoDolibarr=Dolibarri info
-InfoBrowser=Infos Browser
+InfoBrowser=Info sirvija
 InfoOS=Operatsioonisüsteemi info
 InfoWebServer=Veebiserveri info
 InfoDatabase=Andmebaasi info
 InfoPHP=PHP info
 InfoPerf=Jõudluse info
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=Sirvija nimi
+BrowserOS=Sirvija operatsioonisüsteem
 ListEvents=Sündmuste audi
 ListOfSecurityEvents=Dolibarri turvasündmuste nimekiri
 SecurityEventsPurged=Turvasündmused tühjendatud
@@ -956,7 +969,7 @@ TriggerDisabledAsModuleDisabled=Selles failis olevad trigerid on blokeeritud, ku
 TriggerAlwaysActive=Selles failis olevad trigerid on alati aktiivsed hoolimata aktiveeritud Dolibarri moodulitest.
 TriggerActiveAsModuleActive=Selles failis olevad trigerid on aktiivsed, kuna moodul <b>%s</b> on aktiivne.
 GeneratedPasswordDesc=Määratle siin uue parooli loomise reegel, kui keegi tahab kasutada automaatselt loodud parooli.
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Määratle kõik lähteandmed siin. Eelmääratletud väärtusi saad täiendada enda poolt valitutega.
 ConstDesc=See lehekülg võimaldab muuta kõiki parameetreid, mis ei olnud eelmistel lehtedel saadaval. Tegu on edasijõudnud arendajate või programmi silujate jaoks mõeldud parameetritega.
 OnceSetupFinishedCreateUsers=Hoiatus: oled sisse logitud Dolibarri administraatorina. Administraatoreid kasutatakse Dolibarri seadistamiseks. Igapäevaseks kasutamiseks on soovitav kasutada tavakasutajat, kes on loodud Kasutajad & Grupid menüü abil.
 MiscellaneousDesc=Määratle siin muud parameetrid, mis on seotud turvalisusega.
@@ -1035,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.
@@ -1050,7 +1062,7 @@ FieldEdition=Välja %s muutmine
 FixTZ=Ajavööndi parandus
 FillThisOnlyIfRequired=Näide: +2 (täida vaid siis, kui koged ajavööndi nihkega probleeme)
 GetBarCode=Hangi triipkood
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+EmptyNumRefModelDesc=Antud kood on vaba, seda saab igal ajal muuta.
 ##### Module password generation
 PasswordGenerationStandard=Tagastab parooli, mis vastab Dolibarri sisemisele algoritmile: 8 tähemärki pikk ja koosneb väikestest tähtedest ja numbritest.
 PasswordGenerationNone=Ära soovita parooli automaatset genereerimist, parooli peab käsitsi sisestama.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Tagasta raamatupidamise kood kujul:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Registreerimisnumbrite reeglid
 MustBeUnique=Peab olema unikaalne?
 MustBeMandatory=Kas kolmandate isikute loomine on kohustuslik?
@@ -1134,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
@@ -1142,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:<br><b>__PHONETO__</b> asendatakse helistatava inimese telefoninumbriga<br><b>__PHONEFROM__</b> asendatakse helistaja (Sinu) telefoninumbriga<br><b>__LOGIN__</b> asendatakse clicktodial kasutajanimega (määratletud Sinu kasutajakaardil)<br><b>__PASS__</b> asendatakse clicktodial parooliga (määratletud Sinu kasutajakaardil).
@@ -1154,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
@@ -1233,7 +1248,7 @@ LDAPSynchroKO=Sünkroniseerimise testimine ebaõnnestus
 LDAPSynchroKOMayBePermissions=Sünkroniseerimise test ebaõnnestus. Kontrolli, et ühendus serveriga on õigestu seadistatud ning et LDAPi uuendused on lubatud
 LDAPTCPConnectOK=TCP ühendust LDAPi serveriga õnnestus (server=%s, port=%s)
 LDAPTCPConnectKO=TCP ühendust LDAPi serveriga ebaõnnestus (server=%s, port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=LDAP serveriga ühendamine/autentimine õnnestus (Server=%s, Port=%s, Admin=%s, Parool=%s)
 LDAPBindKO=LDAPi serveriga ühendumine/autentimine ebaõnnestus (Server=%s, Port=%s, Admin=%s, Password=%s)
 LDAPUnbindSuccessfull=Lahti ühendumine oli edukas
 LDAPUnbindFailed=Lahti ühendumine ebaõnnestus
@@ -1305,9 +1320,9 @@ PerfDolibarr=Jõudluse seadistamise/optimeerimise aruanne
 YouMayFindPerfAdviceHere=Sellelt lehelt leiad mõningaid jõudlusega seotud kontrolle või nõuandeid.
 NotInstalled=Pole paigaldatud, seega ei aegusta serverit.
 ApplicativeCache=Rakenduse vahemälu
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>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=Puhvermälu ei leitud. Jõudluse suurendamiseks paigalda puhverserver Memcached ja selle kasutamist võimaldav moodul.<br>Rohkem infot siit <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Pane tähele, et paljud veebimajutused sellist serverit teenusena ei paku.
+MemcachedModuleAvailableButNotSetup=Puhvri jaoks kasutatav moodul memcached on olemas, kuid mooduli seadistamine on lõpuni viimata
+MemcachedAvailableAndSetup=Memcached serverit kasutav memcached moodul on sisse lülitatud.
 OPCodeCache=OPCode vahemälu
 NoOPCodeCacheFound=OPCode vahemälu ei leitud. Võib-olla kasutada mõnda muud OPCode vahemälu peale XCache või eAcceleratori (hea), aga võib-olla ei ole OPCode vahemälu kasutusel (väga halb).
 HTTPCacheStaticResources=HTTP vahemälu staatiliste ressursside jaoks (CSS, pildid, JavaScript)
@@ -1318,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
@@ -1365,7 +1380,7 @@ BarcodeDescC39=C39 tüüpi vöötkood
 BarcodeDescC128=C128 tüüpi vöötkood
 GenbarcodeLocation=Käsurea tööriist vöötkoodi genereerimiseks (sisemine mootor kasutab seda mõnda tüüpi vöötkoodide loomiseks)
 BarcodeInternalEngine=Sisemine mootor
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarCodeNumberManager=Automaatselt määratletud vöötkoodide haldamine
 ##### Prelevements #####
 WithdrawalsSetup=Väljamaksete mooduli seadistami
 ##### ExternalRSS #####
@@ -1378,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
@@ -1408,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
@@ -1444,11 +1461,11 @@ ConfirmDeleteLine=Kas oled täiesti kindel, et soovid selle rea kustutada?
 ##### Tax #####
 TaxSetup=Maksude, sotsiaalkindlustusmaksete ja dividendide mooduli seadistamine
 OptionVatMode=KM kuupäev
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Kassapõhine
+OptionVATDebitOption=Tekkepõhine
 OptionVatDefaultDesc=KM on tingitud:<br>- kaupade üleandmisel (arve kuupäev)<br>- teenuste eest maksmisel
 OptionVatDebitOptionDesc=KM on tingitud:<br>- kaupade üleandmisel (arve kuupäev)<br>- arve esitamisel (deebet) teenuste eest
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Käibemaksu kõlbulikuks arvestamise vaikimisi aeg vastavalt määratletud seadetele:
 OnDelivery=Üleandmisel
 OnPayment=Maksmisel
 OnInvoice=Arve esitamisel
@@ -1465,20 +1482,23 @@ AccountancyCodeBuy=Ostukonto kood
 AgendaSetup=Tegevuste ja päevakava mooduli seadistamine
 PasswordTogetVCalExport=Ekspordilingi autoriseerimise võti
 PastDelayVCalExport=Ära ekspordi tegevusi, mis on vanemad kui
-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=Kasuta tegevuste liike (haldamine menüüst Seadistamine->Sõnastik->Päevakava tegevuste liigid)
+AGENDA_DEFAULT_FILTER_TYPE=Seda liiki sündmus lisatakse automaatselt vaate otsingufiltrisse
+AGENDA_DEFAULT_FILTER_STATUS=Seda liiki tegevuse staatus lisatakse automaatselt päevakava otsingufiltrisse
+AGENDA_DEFAULT_VIEW=Vaikimisi avatav sakk päevakava avamisel
 ##### ClickToDial #####
 ClickToDialDesc=See moodul võimaldab lisada ikooni pärast telefoninumbreid. Klõps sellel ikoonil helistab allpool määratletud URLiga serverisse. See võimaldab näiteks Dolibarrist helistada kõnekeskuse süsteemi, mis helistab SIP-süsteemis olevale numbrile.
 ##### 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.
@@ -1520,16 +1540,25 @@ TaskModelModule=Ülesannete aruande dokumendi mudel
 ECMSetup = GED seadistamine
 ECMAutoTree = Automaatmne kaustapuu ja dokument
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-
+FiscalYears=Majandusaastad
+FiscalYear=Majandusaasta
+FiscalYearCard=Majandusaasta kaart
+NewFiscalYear=Uus majandusaasta
+EditFiscalYear=Muuda majandusaastat
+OpenFiscalYear=Ava majandusaasta
+CloseFiscalYear=Sulge majandusaasta
+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 171d95f84a2..743d827082a 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=Sündmuse ID
 Actions=Tegevused
 ActionsArea=Tegevuste ala (sündmused ja ülesanded)
-Agenda= Päevakava
-Agendas= Päevakavad
-Calendar= Kalender
-Calendars= Kalendrid
-LocalAgenda=Kohalik kalender
-AffectedTo= Mõjutatud isik
-DoneBy= Teinud isik
-Events= Tegevused
+Agenda=Päevakava
+Agendas=Päevakavad
+Calendar=Kalender
+Calendars=Kalendrid
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Mõjutatud isik
+DoneBy=Teinud isik
+Event=Event
+Events=Tegevused
 EventsNb=Tegevuste arv
 MyEvents=Minu tegevused
 OtherEvents=Muud tegevused
@@ -17,31 +19,33 @@ ListOfActions=Tegevuste nimekiri
 Location=Asukoht
 EventOnFullDay=Tegevus kestab kogu/kõik päeva(d)
 SearchAnAction= Otsi tegevust/ülesannet
-MenuToDoActions= Kõik lõpetamata tegevused
-MenuDoneActions= Kõik lõpetatud tegevused
-MenuToDoMyActions= Minu lõpetamata tegevused
-MenuDoneMyActions= Minu lõpetatud tegevused
-ListOfEvents= Dolibarri tegevused
+MenuToDoActions=Kõik lõpetamata tegevused
+MenuDoneActions=Kõik lõpetatud tegevused
+MenuToDoMyActions=Minu lõpetamata tegevused
+MenuDoneMyActions=Minu lõpetatud tegevused
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Tegevused, mille sisestas
 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
 ViewCal=Kuu vaade
 ViewDay=Päeva vaade
 ViewWeek=Nädala vaade
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Näita määratletud filtritega
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Alguskuupäev
 DateActionEnd= Lõppkuupäev
 AgendaUrlOptions1=Otsingutulemuste piiramiseks võib kasutada ka järgmisi parameetreid:
 AgendaUrlOptions2=<b>login=%s</b> tagastab vastusena kasutaja poolt algatatud, talle määratud ja lõpetatud sündmused<b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> tagastab vastusena ainult kasutaja poolt algatatud sündmused<b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> tagastab vastusena ainult kasutajale määratud tegevused <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> tagastab vastusena ainult kasutaja poolt lõpetatud tegevused <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Näita kontaktide sünnipäevi
 AgendaHideBirthdayEvents=Peida kontaktide sünnipäevad
 Busy=Hõivatud
 ExportDataset_event1=Päevakavas olevate tegevuste nimekiri
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Ekspordi kalender
 ExtSites=Impordi väline kalender
-ExtSitesEnableThisTool=Näita väliseid kalendreid päevakavas
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Kalendrite arv
 AgendaExtNb=Kalendreid: %s
 ExtSiteUrlAgenda=URL .ical failile ligi pääsemiseks
 ExtSiteNoLabel=Kirjeldus puudub
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index d0183fc317c..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=<b>Kreeditarve</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Liigita 'Makstud'
 ClassifyPaidPartially=Liigita 'Osaliselt makstud'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Kas oled täesti kindel, et soovid tühistada arve <b>%s</b>?
 ConfirmCancelBillQuestion=Miks Sa tahad selle arve liigitada hüljatuks?
 ConfirmClassifyPaidPartially=Kas oled täiesti kindel, et soovid arve <b>%s</b> märkida makstuks?
 ConfirmClassifyPaidPartiallyQuestion=See arve ei ole täielikult tasutud. Mis on selle arve sulgemise põhjus?
-ConfirmClassifyPaidPartiallyReasonAvoir=Makstava summa jääk <b>(%s %s)</b> on allahindlus, sest makse on tehtud enne tähtaega. Ma reguleerin käibemaksu kreeditarvega.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Makstava summa jääk <b>(%s %s)</b> on allahindlus, sest makse on tehtud enne tähtaega. Nõustun sellelt allahindluselt käibemaksu kaotusega.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Makstava summa jääk <b>(%s %s)</b> on allahindlus, sest makse on tehtud enne tähtaega. Ma saan sellelt allahindluselt käibemaksu tagasi kreeditarveta.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Soodustus pakutud (makse enne tähtaega)
-SendBillRef=Saada arve %s
-SendReminderBillRef=Saada arve %s (meeldetuletus)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Püsikorraldused
 StandingOrder=Püsikorraldus
 NoDraftBills=Arvete mustandeid ei ole
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Kahe uue allahindluse summa peab olema võr
 ConfirmRemoveDiscount=Kas oled täiesti kindel, et soovid selle allahindluse eemaldada?
 RelatedBill=Seotud arve
 RelatedBills=Seotud arved
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Kohene
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 417088dfb25..328c06c3a03 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -66,7 +66,7 @@ ReturnInCompany=Tagasi kliendi/huvilise kaardile
 ContentsVisibleByAll=Antud sisu on kõigile nähtav
 ContentsVisibleByAllShort=Sisu on kõigile nähtav
 ContentsNotVisibleByAllShort=Sisu ei ole kõigile nähtav
-# CategoriesTree=Categories tree
+CategoriesTree=Kategooriate puu
 DeleteCategory=Kustuta kategooria
 ConfirmDeleteCategory=Kas oled kindel, et soovid antud kategooria kustutada?
 RemoveFromCategory=Eemalda seos kategooriaga
@@ -101,13 +101,12 @@ 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=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
+DeletePicture=Pildi kustutamine
+ConfirmDeletePicture=Kinnitada pildi kustutamine?
+ExtraFieldsCategories=Complementary attributes
+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/companies.lang b/htdocs/langs/et_EE/companies.lang
index 6f332fe05ef..4b94f2e23e3 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -18,7 +18,7 @@ NewCompany=Uus ettevõte (pot klient, klient, hankija)
 NewThirdParty=Uus kolmas isik (pot klient, klient, hankija)
 NewSocGroup=Uus ettevõtete grupp
 NewPrivateIndividual=Uus eraisik (pot klient, klient, hankija)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateDolibarrThirdPartySupplier=Loo kolmas isik (hankija)
 ProspectionArea=Huviliste ala
 SocGroup=Ettevõtete grupp
 IdThirdParty=Kolmanda osapoole ID
@@ -83,7 +83,7 @@ DefaultLang=Vaikimisi keel
 VATIsUsed=Käibemaksuga
 VATIsNotUsed=Käibemaksuta
 CopyAddressFromSoc=Kasuta aadressivälja täitmiseks kolmanda isiku aadressi
-NoEmailDefined=There is no email defined
+NoEmailDefined=Ühtki e-posti aadressi pole määratletud
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE on kasutuses
 LocalTax1IsNotUsedES= RE pole kasutuses
@@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF on kasutuses
 LocalTax2IsNotUsedES= IRPF pole kasutuses
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=RE liik
+TypeLocaltax2ES=IRPF liik
+TypeES=Liik
 ThirdPartyEMail=%s
 WrongCustomerCode=Vigane kliendi kood
 WrongSupplierCode=Vigane hankija kood
@@ -367,10 +367,10 @@ ExportCardToFormat=Ekspordi kaart formaati
 ContactNotLinkedToCompany=Kontakt ole seotud ühegi kolmanda isikuga
 DolibarrLogin=Dolibarri kasutaja
 NoDolibarrAccess=Dolibarri ligipääs puudub
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Kolmandad isikud (äriühingud/sihtasutused/füüsilised isikud) ja nende omadused
 ExportDataset_company_2=Kontaktid ja omadused
-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=Kolmandad isikud (äriühingud/sihtasutused/füüsilised isikud) ja nende omadused
+ImportDataset_company_2=Kontaktid/aadressid (k.a kolmandad isikud) ja nende atribuudid
 ImportDataset_company_3=Pangarekvisiidid
 PriceLevel=Hinnatase
 DeliveriesAddress=Tarneaadressid
@@ -397,16 +397,18 @@ YouMustCreateContactFirst=Pead looma kolmanda isikuga seotud e-posti kontaktid e
 ListSuppliersShort=Hankijate nimekiri
 ListProspectsShort=Huviliste nimekiri
 ListCustomersShort=Klientide nimekiri
-ThirdPartiesArea=Kolmandate isikute ala
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Viimased %s muudetud kolmandat isikut
 UniqueThirdParties=Kokku unikaalseid kolmandaid isikuid
 InActivity=Avatud
 ActivityCeased=Suletud
 ActivityStateFilter=Aktiivsuse staatus
-ProductsIntoElements=List of products into %s
+ProductsIntoElements=Toodete nimekiri kohta %s
 CurrentOutstandingBill=Hetkel maksmata summa
 OutstandingBill=Suurim võimalik maksmata arve
 OutstandingBillReached=Jõudis maksmata summa maksimumini
 MonkeyNumRefModelDesc=Tagasta arv formaadiga %syymm-nnnn kliendikoodi jaoks ja %syymm-nnnn hankija koodi jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestuseta jada, mille väärtus pole kunagi 0.
 LeopardNumRefModelDesc=Kood on vaba, seda saab igal ajal muuta.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
+ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 2dac123a3fe..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=seotud tellimusega
+LinkedOrder=Viide tellimusele
 ReCalculate=Arvuta uuesti
 Mode1=Meetod 1
 Mode2=Meetod 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=vastavalt hankijale, vali sobiv meetod sama reegli r
 TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, <b>kassapõhist raamatupidamist</b> kasutades pole režiim oluline. See aruanne on saadaval vaid <b>tekkepõhist raamatupidamist</b> kasutades (vaata raamatupidamise mooduli seadistust).
 CalculationMode=Arvutusrežiim
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Vaikimisi kasutatav raamatupidamise kood klientide loomisel
-COMPTA_ACCOUNT_SUPPLIER=Vaikimisi kasutatav raamatupidamise kood hankijate loomisel
+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
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. <BR> Näiteks Dolibarri Product objekti /ht
 CronMethodHelp=Kasutatava objekti korral käivitatav meetod. <BR> Näiteks Dolibarr Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel on meetodi väärtuseks <i>fetch</i>
 CronArgsHelp=Meetodile antavad argumendid. <BR> Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla <i>0, ProductRef</i>.
 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 4d7ec8e3813..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
@@ -30,3 +30,9 @@ SearchADonation=Otsi annetust
 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 242eb3613e0..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 <b>%s</b> 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 <b>%s</b> ei ole selleks õigusi
 ErrorNoActivatedBarcode=Ühtki vöötkoodi tüüpi pole aktiveeritud
 ErrUnzipFails=%s lahti pakkimine ZipArchivega ebaõnnestus
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Viga: selle võimaluse kasutamiseks peab PHPs olema võimalda
 ErrorOpenIDSetupNotComplete=Dolibarri seadistusfail lubab OpenIDga autentimist, ent konstandis %s ei ole OpenID teenuse URL määratletud
 ErrorWarehouseMustDiffers=Lähteladu ja sihtladu peavad olema erinevad
 ErrorBadFormat=Vigane vorming!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Kohustuslikud seadistusparameetrid on määratlemata
@@ -154,3 +174,5 @@ WarningUsingThisBoxSlowDown=Hoiatus: selle kasti kasutamine muudab kõik seda ka
 WarningClickToDialUserSetupNotComplete=Sinu kasutaja ClickToDial info seadistamine ei ole lõpetatud (vaata oma kasutaja kaardi ClickToDial sakki).
 WarningNotRelevant=Selle andmehulga juures ei ole see tegevus otstarbekas
 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
diff --git a/htdocs/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
index 057b98bcca9..7870fe96db8 100644
--- a/htdocs/langs/et_EE/exports.lang
+++ b/htdocs/langs/et_EE/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Konto number
 BankAccountNumberKey=Võti
 SpecialCode=Erikood
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=Kui soovid mõnede väärtuste põhjal filtreerida, siis sisesta nad siia.
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 372a684ee5e..c1b981dc57d 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Personalihaldus
-Holidays=Puhkused
-CPTitreMenu=Puhkused
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Kuu aruanne
-MenuAddCP=Taotle puhkust
-NotActiveModCP=Selle lehe vaatamiseks pead sisse lülitama puhkuste mooduli
-NotConfigModCP=Selle lehe vaatamiseks pead seadistama puhkuste mooduli. Selle jaoks <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">klõpsa siia</a>.
-NoCPforUser=Sul ei ole puhkuse vajadust.
-AddCP=Taotle puhkust
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Töötaja
 DateDebCP=Alguskuupäev
 DateFinCP=Lõppkuupäev
@@ -18,24 +18,24 @@ ApprovedCP=Heaks kiidetud
 CancelCP=Tühistatud
 RefuseCP=Keeldutud
 ValidatorCP=Heaks kiitja
-ListeCP=Puhkuste nimekiri
+ListeCP=List of leaves
 ReviewedByCP=Ülevaatav isik
 DescCP=Kirjeldus
-SendRequestCP=Puhkusevajaduste loomine
-DelayToRequestCP=Puhkusetaotlusd peab esitama vähemalt <b>%s päev(a)</b> enne puhkust.
-MenuConfCP=Puhkuste saldo
-UpdateAllCP=Uuenda puhkusi
-SoldeCPUser=Puhkuste saldo on <b>%s</b> päeva.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Lõppkuupäev peab olema alguskuupäevast suurem.
 ErrorSQLCreateCP=Loomisel tekkis SQLi viga:
-ErrorIDFicheCP=Tekkis viga, puhkusetaotlust ei ole olemas.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Mine tagasi eelmisele lehele
-ErrorUserViewCP=Sul ei ole ligipääsuõigusi antud puhkusetaotluse vaatamiseks.
-InfosCP=Puhkusevajaduse info
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Informatsiooni töövoog
 RequestByCP=Taotles
-TitreRequestCP=Puhkuste leht
-NbUseDaysCP=Kulutatud puhkusepäevade arv
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Muuda
 DeleteCP=Kustuta
 ActionValidCP=Kinnita
@@ -43,26 +43,25 @@ ActionRefuseCP=Keeldu
 ActionCancelCP=Tühista
 StatutCP=Staatus
 SendToValidationCP=Saada kinnitamiseks
-TitleDeleteCP=Kustuta puhkusetaotlus
-ConfirmDeleteCP=Kas oled täiesti kindel, et soovid antud puhkusetaotluse kustutada?
-ErrorCantDeleteCP=Viga: antud puhkusetaotluse kustutamiseks puuduvad õigused.
-CantCreateCP=Puhkusetaotluse esitamiseks puuduvad õigused.
-InvalidValidatorCP=Puhkuse taotluse jaoks peab valima heaks kiitja.
-UpdateButtonCP=Uuenda
-CantUpdate=Seda puhkusetaotlust ei saa uuendada.
+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=Pead valima alguskuupäeva.
 NoDateFin=Pead valima lõppkuupäeva.
-ErrorDureeCP=Puhkusetaotlus ei sisalda ühtki tööpäeva.
-TitleValidCP=Kiida puhkusetaotlus heaks
-ConfirmValidCP=Kas oled täiesti kindel, et soovid antud puhkusetaotluse heaks kiita?
+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=Saada puhkusetaotlus
-ConfirmToValidCP=Kas oled täiesti kindel, et soovid puhkusetaotluse saata?
-TitleRefuseCP=Keeldu puhkusetaotlusest
-ConfirmRefuseCP=Kas oled täiesti kindel, et soovid antud puhkusetaotlusest keelduda?
+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=Keeldumiseks peab valima põhjuse.
-TitleCancelCP=Tühista puhkusetaotlus
-ConfirmCancelCP=Kas oled täiesti kindel, et soovid puhkusetaotluse tühistada?
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Keeldumise põhjus
 DateRefusCP=Keeldumise kuupäev
 DateCancelCP=Tühistamise kuupäev
@@ -72,42 +71,42 @@ MotifCP=Põhjus
 UserCP=Kasutaja
 ErrorAddEventToUserCP=Erakorralise puhkuse lisamisel tekkis viga
 AddEventToUserOkCP=Erakorralise puhkuse lisamine edukalt lõpetatud.
-MenuLogCP=Vaata puhkuste logi
-LogCP=Puhkuste uuenduste logi
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Puhkuse esimene kuupäev
-LastDayOfHoliday=Puhkuse viimane kuupäev
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Igakuine uuendus
 ManualUpdate=Käsitsi uuendus
-HolidaysCancelation=Puhkuste tühistamine
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Puhkuste mooduli seadistamine
+ConfCP=Configuration of leave request module
 DescOptionCP=Valiku kirjeldus
 ValueOptionCP=Väärtus
-GroupToValidateCP=Grupp, kes võib puhkusi heaks kiita
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Valideeri seadistus
-LastUpdateCP=Puhkuste viimane automaatne uuendus
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Edukalt uuendatud.
 ErrorUpdateConfCP=Uuendamise ajal tekkis viga, palun proovi uuesti.
-AddCPforUsers=Palun lisa kasutajate puhkuste saldo <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">siia klõpsates</a>.
-DelayForSubmitCP=Puhkusetaotluste esitamise tähtaeg
-AlertapprobatortorDelayCP=Peata heakskiit, kui puhkusetaotlus ei vasta tähtajale
-AlertValidatorDelayCP=Pea heakskiit, kui puhkusetaotlus ületab viivitust
-AlertValidorSoldeCP=Peata heakskiit, kui puhkusetaotlus ületab saldot
-nbUserCP=Puhkuste moodulis toetatud kasutajate arv
-nbHolidayDeductedCP=Kasutatud puhkusepäeva kohta lahutatav puhkuste arv
-nbHolidayEveryMonthCP=Igas kuus lisatavate puhkuste arv
-Module27130Name= Puhkuste haldamine
-Module27130Desc= Puhkuste haldamine
-TitleOptionMainCP=Puhkuste põhilised seaded
-TitleOptionEventCP=Puhkuste ja tegevuste vahelised seosed
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Kinnita
 UpdateEventCP=Uuenda tegevused
 CreateEventCP=Loo
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Uuenda
 ErrorMailNotSend=E-kirja saatmisel tekkis viga:
 NoCPforMonth=Sellel kuul pole puhkusi.
 nbJours=Päevade arv
-TitleAdminCP=Puhkuste seadistamine
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Tere
-HolidaysToValidate=Kinnita puhkused
-HolidaysToValidateBody=Allpool on kinnitamist nõudvad puhkusetaotlused
-HolidaysToValidateDelay=Selle taotluse puhkus toimub perioodil, mis on lühem kui %s päeva.
-HolidaysToValidateAlertSolde=Antud puhkusetaotluse esitanud kasutajal pole piisavalt päevi saadaval.
-HolidaysValidated=Kinnitatud puhkused
-HolidaysValidatedBody=Sinu puhkusetaotlus alates %s kuni %s on kinnitatud.
-HolidaysRefused=Tagasi lükatud puhkused
-HolidaysRefusedBody=Sinu puhkusetaotlus alates %s kuni %s on tagasi lükatud põhjusel:
-HolidaysCanceled=Tühistatud puhkused
-HolidaysCanceledBody=Sinu puhkusetaotlus alates %s kuni %s on tühistatud.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Muudetud puhkuste logi vaatamine
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang
index 90b557e55d6..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Sekkuja nimi ja allkiri:
 NameAndSignatureOfExternalContact=Kliendi nimi ja allkiri:
 DocumentModelStandard=Sekkumiste tüüpvormi mudel
 InterventionCardsAndInterventionLines=Sekkumised ja sekkumiste read
-ClassifyBilled=Liigita "Arve esitatud"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> saajale sessiooni kohta.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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 &quot;Lisa fail&quot; 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 "<strong>%s</strong>" (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.<br><br>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 5d3d71a6242..df8001d04b8 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Suletud
 ContractStatusRunning=Aktiivne
 ContractStatusExpired=aegunud
 ContractStatusOnHold=Mitteaktiivne
-ContractStatusToRun=Kasutusele võtmiseks
+ContractStatusToRun=To get running
 ContractNotRunning=Käesolev leping ei ole aktiivne
 ErrorProductAlreadyExists=Toode viitega %s on juba olemas.
 ErrorProductBadRefOrLabel=Vale viite või nime väärtus.
 ErrorProductClone=Toote või teenuse kloonimisel tekkis probleem.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Hankijad
 SupplierRef=Hankija toote viide
 ShowProduct=Näita toodet
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Klooni toode või teenus
 ConfirmCloneProduct=Kas oled täiesti kindel, et soovid kloonida toote või teenuse <b>%s</b>?
 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
@@ -239,3 +240,10 @@ PricingRule=Hinnareeglid
 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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 aaacd99c22f..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
@@ -85,13 +87,13 @@ ActionsOnProject=Projekti tegevused
 YouAreNotContactOfProject=Sa ei ole antud privaatse projekti kontakt
 DeleteATimeSpent=Kustuta kulutatud aeg
 ConfirmDeleteATimeSpent=Kas oled kindel, et soovid selle kulutatud aja kustutada?
-DoNotShowMyTasksOnly=Vaata ka ülesandeid, mis ei ole minule määratud
-ShowMyTasksOnly=Vaata ainult minule määratud ülesandeid
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressursid
 ProjectsDedicatedToThisThirdParty=Selle kolmanda isikuga seotud projektid
 NoTasks=Selle projektiga ei ole seotud ühtki ülesannet
 LinkedToAnotherCompany=Seotud muu kolmanda isikuga
-TaskIsNotAffectedToYou=Ülesanne ei ole sinule määratud
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Kulutatud aeg on tüh
 ThisWillAlsoRemoveTasks=See kustutab ka kõik projekti ülesanded (hetkel <b>%s</b> ülesannet) ja kõik kulutatud aja sisestused.
 IfNeedToUseOhterObjectKeepEmpty=Kui mingid projekti loomiseks vajalikud objektid (arve, tellimus jne) kuuluvad mõnele muule kolmandale isikule, siis jäta see tühjaks, et oleks projekti võimalik siduda mitme kolmanda isikuga.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Toetaja
 TypeContact_project_task_external_TASKCONTRIBUTOR=Toetaja
 SelectElement=Vali element
 AddElement=Seosta elemendiga
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Täielik projekti aruande mudel (logo jne)
 PlannedWorkload = Planeeritav koormus
@@ -128,3 +131,4 @@ ProjectReferers=Viitavad objektid
 SearchAProject=Otsi projekti
 ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama
 ProjectDraft=Projektide mustandid
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
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 38201659c22..4d441895359 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Statistika põhineb vaid kinnitatud saadetistel. K
 DateDeliveryPlanned=Plaanitud kohaletoimetamise aeg
 DateReceived=Saadetise kättesaamise kuupäev
 SendShippingByEMail=Saada saadetis e-postiga
-SendShippingRef=Läheta saadetis %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Saatmisel toimuvad tegevused
 LinkToTrackYourPackage=Paki jälgimise link
 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
 SendingMethodTRANS=Transportija
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Lihtne saatelehtede dokumendi mudel
 DocumentModelTyphon=Täiuslikum saatelehtede dokumendi mudel (logo jne)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER on määratlemata
 SumOfProductVolumes=Toodete ruumala summa
 SumOfProductWeights=Toodete kaalude summa
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/et_EE/shop.lang b/htdocs/langs/et_EE/shop.lang
deleted file mode 100644
index 5de29a9d33e..00000000000
--- a/htdocs/langs/et_EE/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Pood
-ShopWeb=Veebipood
-LastOrders=Viimased tellimused
-OnStandBy=Ootel
-TreatmentInProgress=Töötlemine pooleli
-LastCustomers=Viimased kliendid
-OSCommerceShop=OsCommercei pood
-OSCommerce=OsCommerce
-AddProd=Müü veebis
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/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 6a05b9bc0e3..fb019da9c5f 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Loo ostuarve
 ListOfSupplierProductForSupplier=Hankija <b>%s</b> toodete ja hindade nimekiri
 NoneOrBatchFileNeverRan=Puudub või partiid <b>%s</b> pole hiljuti käivitatud
 SentToSuppliers=Saadetud hankijatele
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index 552729ea4f5..c9ec60bb29b 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Reis
 ListTripsAndExpenses=List reiside ja kulude
 ExpensesArea=Matkad ja kulud ala
 SearchATripAndExpense=Otsi reisi ja kulu
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index e9a2fe332ec..cbdb7bc6d98 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -1,121 +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 <b>%s</b> 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 <b>%s</b> 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 (<b>%s</b>) 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 <b>%s</b> must be enabled
+WarningModuleNotActive=<b>%s</b> 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 <b>%s</b> is enabled
 RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
 RestoreLock=Restore file <b>%s</b>, 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 <b>%s</b> 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 <b>%s</b> %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<br>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
@@ -123,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=Order
+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.<br>Some modules add entries in the menus (in menu <b>All</b> 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 <b>%s</b> 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 <b>%s</b> 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 <b>%s</b>. 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=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
+PurgeRunNow=Orain garbitu
+PurgeNothingToDelete=Ez dago ezabatzeko karpeta edo fitxategirik
+PurgeNDirectoriesDeleted=<b>%s</b> 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 <a href="%s">here</a>.
 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
@@ -192,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 <a href="%s">enabled modules</a> 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.
@@ -204,35 +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
-Security=Security
-Passwords=Passwords
+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=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 <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
 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)
@@ -246,55 +252,58 @@ 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: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS ataka (berez php.ini fitxategian adierazita: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS zerbitzaria (berez php.ini fitxategian adierazita: <b>%s</b>)
 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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 <b>langs/%s</b> 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 <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 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.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*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:<br><b>{000000}</b> 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. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> 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. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
@@ -306,8 +315,8 @@ GenericNumRefModelDesc=Returns a customizable number according to a defined mask
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
 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.
@@ -317,11 +326,11 @@ UseACacheDelay= Delay for caching export response in seconds (0 or empty for no
 DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
 DisableLinkToHelp=Hide link "<b>%s Online help</b>" 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 ?<br>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.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b>.
@@ -329,14 +338,14 @@ NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directo
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>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 <b>%s</b> must be enabled first before using this feature.
 SecurityToken=Key to secure URLs
@@ -348,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<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>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 <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. 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.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 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:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>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 <strong>%s</strong>
-RefreshPhoneLink=Refresh link
+RefreshPhoneLink=Esteka freskatu
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
 DefaultLink=Default link
@@ -399,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
@@ -447,63 +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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
+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
@@ -512,31 +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 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
@@ -544,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)
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -736,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
@@ -775,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:<br>If the seller is not subjected to VAT, then VAT by default=0. End of rule.<br>If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule. <br>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.<br>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.<br>If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.<br>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.
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1279,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
@@ -1318,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
@@ -1340,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
@@ -1357,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 b91bcb1f323..e5470c8011a 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -1,47 +1,51 @@
 # 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
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
-EventsNb=Number of events
-MyEvents=My events
+Agenda=Agenda
+Agendas=Agendak
+Calendar=Egutegia
+Calendars=Egutegiak
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+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
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index ad7e2cefc7c..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 <b>credit note</b> 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 ?<br>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. <br> 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. <br> Edit your entry, otherwise confirm.
@@ -85,20 +85,21 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -136,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 <b>%s</b> ?
 ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status ?
 ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid ?
@@ -155,10 +154,10 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> 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 <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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»)
@@ -172,33 +171,33 @@ ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other case
 ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s ?
 ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Bank deposit
 PaymentTypeShortVIR=Bank deposit
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 b28086fa933..22914931db1 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-# Category=Category
-# Categories=Categories
-# Rubrique=Category
-# Rubriques=Categories
-# categories=categories
-# TheCategorie=The category
-# NoCategoryYet=No category of this type created
-# In=In
-# AddIn=Add in
-# modify=modify
-# Classify=Classify
-# CategoriesArea=Categories area
-# ProductsCategoriesArea=Products/Services categories area
-# SuppliersCategoriesArea=Suppliers categories area
-# CustomersCategoriesArea=Customers categories area
-# ThirdPartyCategoriesArea=Third parties categories area
-# MembersCategoriesArea=Members categories area
-# ContactsCategoriesArea=Contacts categories area
-# MainCats=Main categories
-# SubCats=Subcategories
-# CatStatistics=Statistics
-# CatList=List of categories
-# AllCats=All categories
-# ViewCat=View category
-# NewCat=Add category
-# NewCategory=New category
-# ModifCat=Modify category
-# CatCreated=Category created
-# CreateCat=Create category
-# CreateThisCat=Create this category
-# ValidateFields=Validate the fields
-# NoSubCat=No subcategory.
-# SubCatOf=Subcategory
-# FoundCats=Found categories
-# FoundCatsForName=Categories found for the name :
-# FoundSubCatsIn=Subcategories found in the category
-# ErrSameCatSelected=You selected the same category several times
-# ErrForgotCat=You forgot to choose the category
-# ErrForgotField=You forgot to inform the fields
-# ErrCatAlreadyExists=This name is already used
-# AddProductToCat=Add this product to a category?
-# ImpossibleAddCat=Impossible to add the category
-# ImpossibleAssociateCategory=Impossible to associate the category to
-# WasAddedSuccessfully=<b>%s</b> was added successfully.
-# ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-# CategorySuccessfullyCreated=This category %s has been added with success.
-# ProductIsInCategories=Product/service owns to following categories
-# SupplierIsInCategories=Third party owns to following suppliers categories
-# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-# MemberIsInCategories=This member owns to following members categories
-# ContactIsInCategories=This contact owns to following contacts categories
-# ProductHasNoCategory=This product/service is not in any categories
-# SupplierHasNoCategory=This supplier is not in any categories
-# CompanyHasNoCategory=This company is not in any categories
-# MemberHasNoCategory=This member is not in any categories
-# ContactHasNoCategory=This contact is not in any categories
-# ClassifyInCategory=Classify in category
-# NoneCategory=None
-# NotCategorized=Without category
-# CategoryExistsAtSameLevel=This category already exists with this ref
-# ReturnInProduct=Back to product/service card
-# ReturnInSupplier=Back to supplier card
-# ReturnInCompany=Back to customer/prospect card
-# ContentsVisibleByAll=The contents will be visible by all
-# ContentsVisibleByAllShort=Contents visible by all
-# ContentsNotVisibleByAllShort=Contents not visible by all
-# CategoriesTree=Categories tree
-# DeleteCategory=Delete category
-# ConfirmDeleteCategory=Are you sure you want to delete this category ?
-# RemoveFromCategory=Remove link with categorie
-# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-# NoCategoriesDefined=No category defined
-# SuppliersCategoryShort=Suppliers category
-# CustomersCategoryShort=Customers category
-# ProductsCategoryShort=Products category
-# MembersCategoryShort=Members category
-# SuppliersCategoriesShort=Suppliers categories
-# CustomersCategoriesShort=Customers categories
-# CustomersProspectsCategoriesShort=Custo./Prosp. categories
-# ProductsCategoriesShort=Products categories
-# MembersCategoriesShort=Members categories
-# ContactCategoriesShort=Contacts categories
-# ThisCategoryHasNoProduct=This category does not contain any product.
-# ThisCategoryHasNoSupplier=This category does not contain any supplier.
-# ThisCategoryHasNoCustomer=This category does not contain any customer.
-# ThisCategoryHasNoMember=This category does not contain any member.
-# ThisCategoryHasNoContact=This category does not contain any contact.
-# AssignedToCustomer=Assigned to a customer
-# AssignedToTheCustomer=Assigned to the customer
-# InternalCategory=Internal category
-# CategoryContents=Category contents
-# CategId=Category id
-# CatSupList=List of supplier categories
-# CatCusList=List of customer/prospect categories
-# CatProdList=List of products categories
-# CatMemberList=List of members categories
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+Category=Category
+Categories=Categories
+Rubrique=Category
+Rubriques=Categories
+categories=categories
+TheCategorie=The category
+NoCategoryYet=No category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Categories area
+ProductsCategoriesArea=Products/Services categories area
+SuppliersCategoriesArea=Suppliers categories area
+CustomersCategoriesArea=Customers categories area
+ThirdPartyCategoriesArea=Third parties categories area
+MembersCategoriesArea=Members categories area
+ContactsCategoriesArea=Contacts categories area
+MainCats=Main categories
+SubCats=Subcategories
+CatStatistics=Statistics
+CatList=List of categories
+AllCats=All categories
+ViewCat=View category
+NewCat=Add category
+NewCategory=New category
+ModifCat=Modify category
+CatCreated=Category created
+CreateCat=Create category
+CreateThisCat=Create this category
+ValidateFields=Validate the fields
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found categories
+FoundCatsForName=Categories found for the name :
+FoundSubCatsIn=Subcategories found in the category
+ErrSameCatSelected=You selected the same category several times
+ErrForgotCat=You forgot to choose the category
+ErrForgotField=You forgot to inform the fields
+ErrCatAlreadyExists=This name is already used
+AddProductToCat=Add this product to a category?
+ImpossibleAddCat=Impossible to add the category
+ImpossibleAssociateCategory=Impossible to associate the category to
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this category.
+CategorySuccessfullyCreated=This category %s has been added with success.
+ProductIsInCategories=Product/service owns to following categories
+SupplierIsInCategories=Third party owns to following suppliers categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
+MemberIsInCategories=This member owns to following members categories
+ContactIsInCategories=This contact owns to following contacts categories
+ProductHasNoCategory=This product/service is not in any categories
+SupplierHasNoCategory=This supplier is not in any categories
+CompanyHasNoCategory=This company is not in any categories
+MemberHasNoCategory=This member is not in any categories
+ContactHasNoCategory=This contact is not in any categories
+ClassifyInCategory=Classify in category
+NoneCategory=None
+NotCategorized=Without category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ReturnInProduct=Back to product/service card
+ReturnInSupplier=Back to supplier card
+ReturnInCompany=Back to customer/prospect card
+ContentsVisibleByAll=The contents will be visible by all
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+CategoriesTree=Categories tree
+DeleteCategory=Delete category
+ConfirmDeleteCategory=Are you sure you want to delete this category ?
+RemoveFromCategory=Remove link with categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
+NoCategoriesDefined=No category defined
+SuppliersCategoryShort=Suppliers category
+CustomersCategoryShort=Customers category
+ProductsCategoryShort=Products category
+MembersCategoryShort=Members category
+SuppliersCategoriesShort=Suppliers categories
+CustomersCategoriesShort=Customers categories
+CustomersProspectsCategoriesShort=Custo./Prosp. categories
+ProductsCategoriesShort=Products categories
+MembersCategoriesShort=Members categories
+ContactCategoriesShort=Contacts categories
+ThisCategoryHasNoProduct=This category does not contain any product.
+ThisCategoryHasNoSupplier=This category does not contain any supplier.
+ThisCategoryHasNoCustomer=This category does not contain any customer.
+ThisCategoryHasNoMember=This category does not contain any member.
+ThisCategoryHasNoContact=This category does not contain any contact.
+AssignedToCustomer=Assigned to a customer
+AssignedToTheCustomer=Assigned to the customer
+InternalCategory=Internal category
+CategoryContents=Category contents
+CategId=Category id
+CatSupList=List of supplier categories
+CatCusList=List of customer/prospect categories
+CatProdList=List of products categories
+CatMemberList=List of members categories
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+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 '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' 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 1b2ea17215b..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
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 12a72464cae..f7aed91cf81 100644
--- a/htdocs/langs/eu_ES/donations.lang
+++ b/htdocs/langs/eu_ES/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
-# Donations=Donations
-# DonationRef=Donation ref.
-# Donor=Donor
-# Donors=Donors
-# AddDonation=Add a donation
-# NewDonation=New donation
-# ShowDonation=Show donation
-# DonationPromise=Gift promise
-# PromisesNotValid=Not validated promises
-# PromisesValid=Validated promises
-# DonationsPaid=Donations paid
-# DonationsReceived=Donations received
-# PublicDonation=Public donation
-# DonationsNumber=Donation number
-# DonationsArea=Donations area
-# DonationStatusPromiseNotValidated=Draft promise
-# DonationStatusPromiseValidated=Validated promise
-# DonationStatusPaid=Donation received
-# DonationStatusPromiseNotValidatedShort=Draft
-# DonationStatusPromiseValidatedShort=Validated
-# DonationStatusPaidShort=Received
-# ValidPromess=Validate promise
-# DonationReceipt=Donation receipt
-# BuildDonationReceipt=Build receipt
-# DonationsModels=Documents models for donation receipts
-# LastModifiedDonations=Last %s modified donations
-# SearchADonation=Search a donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+Donors=Donors
+AddDonation=Create a donation
+NewDonation=New donation
+ShowDonation=Show donation
+DonationPromise=Gift promise
+PromisesNotValid=Not validated promises
+PromisesValid=Validated promises
+DonationsPaid=Donations paid
+DonationsReceived=Donations received
+PublicDonation=Public donation
+DonationsNumber=Donation number
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+BuildDonationReceipt=Build receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Last %s modified donations
+SearchADonation=Search a donation
+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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/eu_ES/exports.lang b/htdocs/langs/eu_ES/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/eu_ES/exports.lang
+++ b/htdocs/langs/eu_ES/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 <b>%s</b>.
-# FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (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 <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang
index 0a5b3e15467..c79da05364e 100644
--- a/htdocs/langs/eu_ES/interventions.lang
+++ b/htdocs/langs/eu_ES/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
-# Interventions=Interventions
-# InterventionCard=Intervention card
-# NewIntervention=New intervention
-# AddIntervention=Add intervention
-# ListOfInterventions=List of interventions
-# EditIntervention=Edit intervention
-# ActionsOnFicheInter=Actions on intervention
-# LastInterventions=Last %s interventions
-# AllInterventions=All interventions
-# CreateDraftIntervention=Create draft
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
-# InterventionContact=Intervention contact
-# DeleteIntervention=Delete intervention
-# ValidateIntervention=Validate intervention
-# ModifyIntervention=Modify intervention
-# DeleteInterventionLine=Delete intervention line
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
-# NameAndSignatureOfExternalContact=Name and signature of customer :
-# DocumentModelStandard=Standard document model for interventions
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-# ClassifyBilled=Classify "Billed"
-# StatusInterInvoiced=Billed
-# RelatedInterventions=Related interventions
-# ShowIntervention=Show intervention
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ListOfInterventions=List of interventions
+EditIntervention=Edit intervention
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Last %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+CustomerDoesNotHavePrefix=Customer does not have a prefix
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+NameAndSignatureOfInternalContact=Name and signature of intervening :
+NameAndSignatureOfExternalContact=Name and signature of customer :
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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
-# TypeContact_fichinter_external_BILLING=Billing customer contact
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
+TypeContact_fichinter_internal_INTERVENING=Intervening
+TypeContact_fichinter_external_BILLING=Billing customer contact
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
-# ArcticNumRefModelError=Failed to activate
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Generic number model
+ArcticNumRefModelError=Failed to activate
+PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+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 '<b>%s</b>' esteka ezabatu
+ErrorFailedToUpdateLink= Ezin izan da '<b>%s</b>' 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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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 <b>%s</b> 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 <b>%s</b> ?
-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 <b>%s</b>
-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<br/>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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+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 <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
+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 <b>%s</b> ?
+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.<br><br>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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 3bb65c295d2..f6111bac684 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -1,76 +1,80 @@
 # Dolibarr language file - Source file is en_US - sendings
-# RefSending=Ref. shipment
-# Sending=Shipment
-# Sendings=Shipments
-# Shipment=Shipment
-# Shipments=Shipments
-# Receivings=Receivings
-# SendingsArea=Shipments area
-# ListOfSendings=List of shipments
-# SendingMethod=Shipping method
-# SendingReceipt=Shipping receipt
-# LastSendings=Last %s shipments
-# SearchASending=Search for shipment
-# StatisticsOfSendings=Statistics for shipments
-# NbOfSendings=Number of shipments
-# NumberOfShipmentsByMonth=Number of shipments by month
-# SendingCard=Shipping card
-# NewSending=New shipment
-# CreateASending=Create a shipment
-# CreateSending=Create shipment
-# QtyOrdered=Qty ordered
-# QtyShipped=Qty shipped
-# QtyToShip=Qty to ship
-# QtyReceived=Qty received
-# KeepToShip=Keep to ship
-# OtherSendingsForSameOrder=Other shipments for this order
-# DateSending=Date sending order
-# DateSendingShort=Date sending order
-# SendingsForSameOrder=Shipments for this order
-# SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-# SendingsToValidate=Shipments to validate
-# StatusSendingCanceled=Canceled
-# StatusSendingDraft=Draft
-# StatusSendingValidated=Validated (products to ship or already shipped)
-# StatusSendingProcessed=Processed
-# StatusSendingCanceledShort=Canceled
-# StatusSendingDraftShort=Draft
-# StatusSendingValidatedShort=Validated
-# StatusSendingProcessedShort=Processed
-# SendingSheet=Sending sheet
-# Carriers=Carriers
-# Carrier=Carrier
-# CarriersArea=Carriers area
-# NewCarrier=New carrier
-# ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-# ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-# ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-# GenericTransport=Generic transport
-# Enlevement=Gotten by customer
-# DocumentModelSimple=Simple document model
-# DocumentModelMerou=Merou A5 model
-# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-# DateDeliveryPlanned=Planed date of delivery
-# DateReceived=Date delivery received
-# SendShippingByEMail=Send shipment by EMail
-# SendShippingRef=Send shipment %s
-# ActionsOnShipping=Events on shipment
-# LinkToTrackYourPackage=Link to track your package
-# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+Shipment=Shipment
+Shipments=Shipments
+Receivings=Receivings
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+SendingReceipt=Shipping receipt
+LastSendings=Last %s shipments
+SearchASending=Search for shipment
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipping card
+NewSending=New shipment
+CreateASending=Create a shipment
+CreateSending=Create shipment
+QtyOrdered=Qty ordered
+QtyShipped=Qty shipped
+QtyToShip=Qty to ship
+QtyReceived=Qty received
+KeepToShip=Keep to ship
+OtherSendingsForSameOrder=Other shipments for this order
+DateSending=Date sending order
+DateSendingShort=Date sending order
+SendingsForSameOrder=Shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingCanceledShort=Canceled
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Sending sheet
+Carriers=Carriers
+Carrier=Carrier
+CarriersArea=Carriers area
+NewCarrier=New carrier
+ConfirmDeleteSending=Are you sure you want to delete this shipment ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
+ConfirmCancelSending=Are you sure you want to cancel this shipment ?
+GenericTransport=Generic transport
+Enlevement=Gotten by customer
+DocumentModelSimple=Simple document model
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planed date of delivery
+DateReceived=Date delivery received
+SendShippingByEMail=Send shipment by EMail
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
 
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/eu_ES/shop.lang b/htdocs/langs/eu_ES/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/eu_ES/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index 01c90ede80f..b1545d6ca3c 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
-# Suppliers=Suppliers
-# Supplier=Supplier
-# AddSupplier=Add a supplier
-# SupplierRemoved=Supplier removed
-# SuppliersInvoice=Suppliers invoice
-# NewSupplier=New supplier
-# History=History
-# ListOfSuppliers=List of suppliers
-# ShowSupplier=Show supplier
-# OrderDate=Order date
-# BuyingPrice=Buying price
-# BuyingPriceMin=Minimum buying price
-# BuyingPriceMinShort=Min buying price
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
-# AddSupplierPrice=Add supplier price
-# ChangeSupplierPrice=Change supplier price
-# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-# NoRecordedSuppliers=No suppliers recorded
-# SupplierPayment=Supplier payment
-# SuppliersArea=Suppliers area
-# RefSupplierShort=Ref. supplier
-# Availability=Availability
-# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-# ExportDataset_fournisseur_2=Supplier invoices and payments
-# ExportDataset_fournisseur_3=Supplier orders and order lines
-# ApproveThisOrder=Approve this order
-# ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-# DenyingThisOrder=Denying this order
-# ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-# ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-# AddCustomerOrder=Create customer order
-# AddCustomerInvoice=Create customer invoice
-# AddSupplierOrder=Create supplier order
-# AddSupplierInvoice=Create supplier invoice
-# ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-# NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-# SentToSuppliers=Sent to suppliers
+Suppliers=Suppliers
+Supplier=Supplier
+AddSupplier=Add a supplier
+SupplierRemoved=Supplier removed
+SuppliersInvoice=Suppliers invoice
+NewSupplier=New supplier
+History=History
+ListOfSuppliers=List of suppliers
+ShowSupplier=Show supplier
+OrderDate=Order date
+BuyingPrice=Buying price
+BuyingPriceMin=Minimum buying price
+BuyingPriceMinShort=Min buying price
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add supplier price
+ChangeSupplierPrice=Change supplier price
+ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+NoRecordedSuppliers=No suppliers recorded
+SupplierPayment=Supplier payment
+SuppliersArea=Suppliers area
+RefSupplierShort=Ref. supplier
+Availability=Availability
+ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
+ExportDataset_fournisseur_2=Supplier invoices and payments
+ExportDataset_fournisseur_3=Supplier orders and order lines
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+DenyingThisOrder=Denying this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+AddCustomerOrder=Create customer order
+AddCustomerInvoice=Create customer invoice
+AddSupplierOrder=Create supplier order
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
+NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index 55ce45bfce8..e9d7c242e07 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-# TF_OTHER=Other
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+Trip=Bidaia
+Trips=Bidaiak
+TripsAndExpenses=Trips and expenses
+TripsAndExpensesStatistics=Trips and expenses statistics
+TripCard=Trip card
+AddTrip=Bidaia sortu
+ListOfTrips=Bidaien zerrenda
+ListOfFees=List of fees
+NewTrip=Bidai berria
+CompanyVisited=Bisitatutako konpania/erakundea
+Kilometers=Kilometroak
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Bidaia ezabatu
+ConfirmDeleteTrip=Ziur zaude bidai hau ezabatu nahi duzuna?
+TF_OTHER=Other
+TF_LUNCH=Bazkaria
+TF_TRIP=Bidaia
+ListTripsAndExpenses=List of trips and expenses
+ExpensesArea=Trips and expenses area
+SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 07fc523143f..a5889dd5197 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=خطا، این ماژول نیاز به Dolib
 ErrorDecimalLargerThanAreForbidden=خطا، دقت بالاتر <b>از٪ s</b> پشتیبانی نمی شود.
 DictionarySetup=راه اندازی فرهنگ لغت
 Dictionary=واژه نامه ها
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=ارزش 'سیستم' و 'systemauto برای نوع محفوظ است. شما می توانید 'کاربر' به عنوان ارزش برای اضافه کردن رکورد خود استفاده کنید
 ErrorCodeCantContainZero=کد می تواند مقدار 0 را شامل نمی شود
 DisableJavascript=توابع غیر فعال کردن جاوا اسکریپت و آژاکس (توصیه شده برای فرد نابینا یا مرورگرهای متنی)
@@ -54,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=نمایش رویدادهای تاریخ های کامل در برگه سوم
@@ -133,7 +137,7 @@ Box=جعبه
 Boxes=جعبه
 MaxNbOfLinesForBoxes=حداکثر تعداد خطوط برای جعبه
 PositionByDefault=به طور پیش فرض منظور
-Position=سفارش
+Position=Position
 MenusDesc=مدیران منوها محتوا از 2 میله منو (نوار افقی و نوار عمودی) را تعریف کنیم.
 MenusEditorDesc=ویرایشگر منو به شما اجازه تعریف نوشته های شخصی در منوها. استفاده از آن را به دقت برای جلوگیری از ساخت dolibarr نوشته های ناپایدار و منو برای همیشه غیر قابل دسترس. <br> برخی از ماژول اضافه کردن ورودی در منو (در منو <b>همه</b> در اغلب موارد). اگر برخی از این نوشته های به اشتباه حذف خواهند، شما می توانید آنها را غیر فعال و reenabling ماژول بازگرداند.
 MenuForUsers=منو برای کاربران
@@ -206,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=جعبه دسترس
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=به صورت خودکار اگر جاوا اسک
 AvailableOnlyIfJavascriptNotDisabled=فقط در صورت های جاوا اسکریپت غیر فعال است
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=فقط در صورت های جاوا اسکریپت غیر فعال است
 Required=ضروری
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=امنیت
 Passwords=کلمه عبور
 DoNotStoreClearPassword=آیا بدون رمز عبور روشن ذخیره در پایگاه داده، اما ذخیره تنها مقدار رمز شده (فعال توصیه می شود)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS هاست (به PHP ب
 MAIN_MAIL_EMAIL_FROM=فرستنده ایمیل برای ایمیل های خودکار (به طور پیش فرض در فایل php.ini <b>اجرا:٪ بازدید کنندگان)</b>
 MAIN_MAIL_ERRORS_TO=فرستنده ایمیل مورد استفاده برای خطا را برمی گرداند ایمیل های فرستاده شده
 MAIN_MAIL_AUTOCOPY_TO= ارسال سیستماتیک مخفی کربن کپی از همه ایمیل های ارسال شده به
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=غیر فعال کردن همه sendings ایمیل (برای تست و یا دموی)
 MAIN_MAIL_SENDMODE=روش استفاده برای ارسال ایمیل
 MAIN_MAIL_SMTPS_ID=SMTP ID اگر احراز هویت مورد نیاز
@@ -431,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
@@ -469,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=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام)
@@ -478,13 +487,9 @@ 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=مدیریت کمک مالی
-Module800Name=آهنگ تولد با دسترسی به پایگاه داده مستقیم
-Module800Desc=رابط برای نشان دادن آهنگ تولد و یا فروشگاه OSCSS از طریق دسترسی به پایگاه داده مستقیم
-Module900Name=آهنگ تولد توسط WS
-Module900Desc=رابط برای نشان دادن یک فروشگاه آهنگ تولد از طریق خدمات وب است. این ماژول requiere شما به نصب قطعات از / oscommerce_ws / ws_server به سرور آهنگ تولد خود را. فایل README را در / oscommerce_ws / ws_server کنید.
 Module1200Name=اخوندک
 Module1200Desc=ادغام آخوندک
 Module1400Name=حسابداری
@@ -493,6 +498,8 @@ Module1780Name=دسته بندی ها
 Module1780Desc=مدیریت گروه (محصولات، تامین کنندگان و مشتریان)
 Module2000Name=ویرایشگر WYSIWYG
 Module2000Desc=اجازه می دهد به ویرایش برخی از متن با استفاده از ویرایشگر پیشرفته
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=cron را
 Module2300Desc=وظیفه مدیریت برنامه ریزی
 Module2400Name=دستور کار
@@ -501,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 کارفرما
@@ -512,16 +521,20 @@ Module5000Name=چند شرکت
 Module5000Desc=اجازه می دهد تا به شما برای مدیریت شرکت های متعدد
 Module6000Name=گردش کار
 Module6000Desc=مدیریت گردش کار
-Module20000Name=تعطیلات
-Module20000Desc=اعلام و کارکنان تعطیلات را دنبال
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
+Module39000Name=Product batch
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 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=حاشیه
@@ -575,9 +588,6 @@ Permission92=ایجاد / تغییر مشارکتهای اجتماعی و مال
 Permission93=حذف کمک های اجتماعی و مالیات بر ارزش افزوده
 Permission94=کمک های اجتماعی صادرات
 Permission95=دفعات بازدید: گزارش
-Permission96=راه اندازی اعزام
-Permission97=خوانده شده فاکتور اعزام حسابداری
-Permission98=خطوط حسابداری فاکتور اعزام
 Permission101=خوانده شده sendings
 Permission102=ایجاد / تغییر sendings
 Permission104=اعتبارسنجی sendings
@@ -603,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=ایجاد / تغییر سفارشات کالا
@@ -668,7 +679,7 @@ Permission300=دفعات بازدید: بارکد
 Permission301=ایجاد / تغییر کدهای نوار
 Permission302=حذف کدهای نوار
 Permission311=خوانده شده خدمات
-Permission312=اختصاص خدمات به قرارداد
+Permission312=Assign service/subscription to contract
 Permission331=خوانده شده بوک مارک ها
 Permission332=ایجاد / تغییر بوک مارک ها
 Permission333=حذف بوک مارک ها
@@ -698,8 +709,8 @@ Permission701=خوانده شده
 Permission702=ایجاد / تغییر کمک های مالی
 Permission703=حذف کمک های مالی
 Permission1001=خوانده شده سهام
-Permission1002=ایجاد / تغییر سهام
-Permission1003=حذف سهام
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=خوانده شده جنبش های سهام
 Permission1005=ایجاد / تغییر جنبش های سهام
 Permission1101=خوانده شده تحویل سفارشات
@@ -775,6 +786,7 @@ DictionaryOrderMethods=مرتب سازی بر روش
 DictionarySource=منبع از پیشنهادات / سفارشات
 DictionaryAccountancyplan=نمودار حساب
 DictionaryAccountancysystem=مدل برای نمودار حساب
+DictionaryEMailTemplates=Emails templates
 SetupSaved=راه اندازی نجات داد
 BackToModuleList=بازگشت به لیست ماژول ها
 BackToDictionaryList=برگشت به فهرست واژه نامه ها
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=فرم جستجو دائمی در منوی سمت چپ
 DefaultLanguage=زبان پیش فرض برای استفاده از (زبان)
 EnableMultilangInterface=فعال کردن رابط کاربری چند زبانه
 EnableShowLogo=نمایش لوگو را در منوی سمت چپ
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=سیستم شما با موفقیت به روز رسانی شده است
 CompanyInfo=شرکت / اطلاعات پایه
 CompanyIds=هویت شرکت / بنیاد
@@ -1035,7 +1048,6 @@ YesInSummer=بله در فصل تابستان
 OnlyFollowingModulesAreOpenedToExternalUsers=توجه داشته باشید، فقط ماژول های زیر را به کاربران خارجی (هر چه باشد اجازه چنین کاربران) باز:
 SuhosinSessionEncrypt=ذخیره سازی جلسه رمز شده توسط Suhosin
 ConditionIsCurrently=وضعیت در حال حاضر از٪ s
-TestNotPossibleWithCurrentBrowsers=تشخیص خودکار امکان پذیر نمی باشد
 YouUseBestDriver=شما با استفاده از راننده٪ است که بهترین راننده های موجود در حال حاضر.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=شما فقط٪ محصولات / خدمات را به پایگاه داده باشد. این به این مورد نیاز هر بهینه سازی خاص است.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
 ModelModules=اسناد قالب
 DocumentModelOdt=تولید اسناد از OpenDocuments قالب (. ODT و یا فایل های ODS برای آفیس اپن سورس کنند، KOffice، TextEdit، ...)
 WatermarkOnDraft=تعیین میزان مد آب در پیش نویس سند
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=قوانین در حرفه شناسه
 MustBeUnique=باید منحصر به فرد باشد؟
 MustBeMandatory=اجباری برای ایجاد اشخاص ثالث؟
@@ -1134,6 +1147,7 @@ AddDeliveryAddressAbility=توانایی اضافه کردن تاریخ تحوی
 UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار صفر به عنوان یک گزینه در نظر گرفته
 FreeLegalTextOnProposal=متن رایگان در طرح های تجاری
 WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=راه اندازی مدیریت سفارش
 OrdersNumberingModules=سفارشات شماره مدل
@@ -1142,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، شما می توانید برچسب ها <br> <b>__PHONETO__</b> خواهد شد که با شماره تلفن از فرد جایگزین را به تماس <br> <b>__PHONEFROM__</b> خواهد شد که با شماره تلفن تماس شخص (شما) به جای <br> <b>__LOGIN__</b> خواهد شد که با ورود clicktodial خود را جایگزین (تعریف شده در کارت کاربر شما) <br> <b>__PASS__</b> خواهد شد که با رمز عبور clicktodial شما (تعریف شده در کارت کاربر خود را) جایگزین شده است.
@@ -1154,7 +1169,7 @@ FicheinterNumberingModules=مداخله شماره مدل
 TemplatePDFInterventions=اسناد کارت مداخله مدل
 WatermarkOnDraftInterventionCards=تعیین میزان مد آب در اسناد کارت مداخله (هیچ اگر خالی)
 ##### Contracts #####
-ContractsSetup=راه اندازی ماژول قراردادها
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=قرارداد شماره ماژول ها
 TemplatePDFContracts=اسناد قرارداد مدل
 FreeLegalTextOnContracts=متن رایگان در قرارداد
@@ -1318,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=راه اندازی خدمات ماژول
@@ -1378,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=ارسال مدل رسید
@@ -1408,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=منوها درخت
@@ -1474,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 در منوی سمت چپ خود را اضافه کنید.
@@ -1531,5 +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 cca59fccaa2..31bd6a514ab 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=رویداد ID
 Actions=رویدادها
 ActionsArea=منطقه رویدادها (عملیات و وظایف)
-Agenda= دستور کار
-Agendas= برنامه
-Calendar= تقویم
-Calendars= تقویم
-LocalAgenda=تقویم محلی
-AffectedTo= واگذار شده به
-DoneBy= انجام شده توسط
-Events= رویدادها
+Agenda=دستور کار
+Agendas=برنامه
+Calendar=تقویم
+Calendars=تقویم
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=واگذار شده به
+DoneBy=انجام شده توسط
+Event=Event
+Events=رویدادها
 EventsNb=تعداد حوادث
 MyEvents=رویدادهای من
 OtherEvents=رویدادهای دیگر
@@ -17,31 +19,33 @@ ListOfActions=فهرست وقایع
 Location=محل
 EventOnFullDay=رویداد در تمام طول روز (بازدید کنندگان)
 SearchAnAction= جستجو یک رویداد / کار
-MenuToDoActions= همه رویدادها ناقص
-MenuDoneActions= همه رویدادها خاتمه یافته
-MenuToDoMyActions= رویدادهای ناقص من
-MenuDoneMyActions= رویدادهای خاتمه من
-ListOfEvents= فهرست وقایع Dolibarr
+MenuToDoActions=همه رویدادها ناقص
+MenuDoneActions=همه رویدادها خاتمه یافته
+MenuToDoMyActions=رویدادهای ناقص من
+MenuDoneMyActions=رویدادهای خاتمه من
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=رویدادهای گزارش شده توسط
 ActionsToDoBy=رویدادهای اختصاص یافته به
 ActionsDoneBy=رویدادهای انجام شده توسط
 ActionsForUser=رویدادهای ها برای کاربر
 ActionsForUsersGroup=رویدادها برای همه کاربران گروه
+ActionAssignedTo=Event assigned to
 AllMyActions= همه رویدادها من / وظایف
 AllActions= همه رویدادها / وظایف
 ViewList=مشاهده لیست
 ViewCal=مشاهده ماه
 ViewDay=نمای روز
 ViewWeek=مشاهده هفته
-ViewPerUser=در طول کاربر
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= نمایش با فیلترهای از پیش تعریف شده
 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 معتبر
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=منظور از٪ s را تایید
 OrderRefusedInDolibarr=منظور از٪ s را رد کرد
 OrderBackToDraftInDolibarr=منظور از٪ s به بازگشت به پیش نویس وضعیت
 OrderCanceledInDolibarr=منظور از٪ s را لغو
-InterventionValidatedInDolibarr=مداخله٪ بازدید کنندگان اعتبار
 ProposalSentByEMail=پیشنهاد تجاری٪ s ارسال با ایمیل
 OrderSentByEMail=سفارش مشتری٪ s ارسال با ایمیل
 InvoiceSentByEMail=صورت حساب به مشتری٪ s ارسال با ایمیل
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=تامین کننده نظم٪ s ارسال با ایم
 SupplierInvoiceSentByEMail=تامین کننده فاکتور٪ s ارسال با ایمیل
 ShippingSentByEMail=حمل و نقل٪ s ارسال با ایمیل
 ShippingValidated= حمل و نقل از٪ s معتبر
-InterventionSentByEMail=مداخله٪ s ارسال با ایمیل
-InterventionClassifiedBilled=مداخله٪ s در طبقه بندی گونه که اعلام شده
 NewCompanyToDolibarr= شخص ثالث ایجاد شده
 DateActionPlannedStart= تاریخ شروع برنامه ریزی شده
 DateActionPlannedEnd= تاریخ پایان برنامه ریزی شده
@@ -68,19 +69,24 @@ DateActionStart= تاریخ شروع
 DateActionEnd= تاریخ پایان
 AgendaUrlOptions1=شما همچنین می توانید پارامترهای زیر برای فیلتر کردن خروجی اضافه:
 AgendaUrlOptions2=<b>ورود =٪ s را</b> برای محدود کردن خروجی به اقدامات ایجاد شده توسط، اختصاص یافته به و یا انجام شده توسط <b>کاربر٪ s را.</b>
-AgendaUrlOptions3=<b>logina =٪ s را</b> برای محدود کردن خروجی به اقدامات ایجاد شده توسط <b>کاربر٪ s را.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint =٪ s را</b> برای محدود کردن خروجی به اقدامات داده شده به کاربر <b>از٪ s.</b>
-AgendaUrlOptions5=<b>logind =٪ s را</b> برای محدود کردن خروجی به اقدامات انجام شده توسط <b>کاربر٪ s را.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=نمایش تماس های تولد را
 AgendaHideBirthdayEvents=مخفی کردن تماس های تولد را
 Busy=مشغول
 ExportDataset_event1=فهرست رویدادی دستور کار
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=تقویم صادرات
 ExtSites=واردات تقویم خارجی
-ExtSitesEnableThisTool=نمایش تقویم های خارجی را در دستور کار
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=شماره تقویم
 AgendaExtNb=تقویم توجه از٪ s
 ExtSiteUrlAgenda=فایل مقرون URL برای دسترسی به.
 ExtSiteNoLabel=بدون شرح
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 0eeaa5e170d..7b7d6b27fd8 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -5,9 +5,9 @@ BillsCustomers=صورت حساب مشتری
 BillsCustomer=صورت حساب مشتری
 BillsSuppliers=فاکتورها تامین کننده
 BillsCustomersUnpaid=صورت حساب به مشتری پرداخت نشده است
-BillsCustomersUnpaidForCompany=صورت حساب به مشتری پرداخت نشده است برای%s
+BillsCustomersUnpaidForCompany=صورت حساب به مشتری پرداخت نشده است برای٪ s
 BillsSuppliersUnpaid=فاکتورها منبع پرداخت نشده است
-BillsSuppliersUnpaidForCompany=فاکتورها منبع پرداخت نشده است برای%s
+BillsSuppliersUnpaidForCompany=فاکتورها منبع پرداخت نشده است برای٪ s
 BillsLate=پرداخت در اواخر
 BillsStatistics=فاکتورها آمار مشتری
 BillsStatisticsSuppliers=فاکتورها آمار تامین کننده
@@ -28,15 +28,15 @@ InvoiceAvoir=توجه داشته باشید اعتباری
 InvoiceAvoirAsk=توجه داشته باشید اعتباری برای اصلاح صورت حساب
 InvoiceAvoirDesc=<b>توجه داشته باشید اعتباری</b> فاکتور منفی استفاده می شود برای حل این واقعیت است که فاکتور دارای مقدار است که از مقدار واقعا پرداخت می شود، متفاوت است (به دلیل مشتری های خطا بیش از حد پرداخت می شود، و یا به طور کامل پرداخت می شود چرا که او بازگشت برخی از محصولات به عنوان مثال) است.
 invoiceAvoirWithLines=ایجاد اعتبار توجه با خطوط از فاکتور مبدا
-invoiceAvoirWithPaymentRestAmount=ایجاد اعتبار توجه با مقدار دریاچه منشاء فاکتور پرداخت در
-invoiceAvoirLineWithPaymentRestAmount=مقدار اعتبار توجه از دریاچه پرداخت صورتحساب در
-ReplaceInvoice=به جای صورتحساب از%s
+invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
+invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+ReplaceInvoice=به جای صورتحساب از٪ s
 ReplacementInvoice=فاکتور تعویض
-ReplacedByInvoice=به جای صورتحساب از%s
+ReplacedByInvoice=به جای صورتحساب از٪ s
 ReplacementByInvoice=به جای صورتحساب
-CorrectInvoice=فاکتور صحیح از%s
+CorrectInvoice=فاکتور صحیح از٪ s
 CorrectionInvoice=فاکتور تصحیح
-UsedByInvoice=مورد استفاده به پرداخت صورتحساب از%s
+UsedByInvoice=مورد استفاده به پرداخت صورتحساب از٪ s
 ConsumedBy=مصرف شده توسط
 NotConsumed=مصرف نشده
 NoReplacableInvoice=بدون فاکتورها جایگزین
@@ -68,7 +68,7 @@ ReceivedPayments=دریافت پرداخت
 ReceivedCustomersPayments=پرداخت دریافت از مشتریان
 PayedSuppliersPayments=پرداخت غیر انتفایی به تامین کنندگان
 ReceivedCustomersPaymentsToValid=مشتریان دریافت پرداخت ها به اعتبار
-PaymentsReportsForYear=گزارش پرداخت برای%s
+PaymentsReportsForYear=گزارش پرداخت برای٪ s
 PaymentsReports=گزارش پرداخت
 PaymentsAlreadyDone=پرداخت از قبل انجام می شود
 PaymentsBackAlreadyDone=پرداخت به عقب در حال حاضر انجام می شود
@@ -85,8 +85,9 @@ ClassifyPaid=طبقه بندی 'پرداخت'
 ClassifyPaidPartially=طبقه بندی 'پرداخت تا حدی'
 ClassifyCanceled=طبقه بندی 'رها'
 ClassifyClosed=طبقه بندی »بسته '
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=ایجاد فاکتور
-AddBill=اضافه کردن فاکتور و یا اعتباری توجه داشته باشید
+AddBill=Create invoice or credit note
 AddToDraftInvoices=اضافه کردن به پیش نویس فاکتور
 DeleteBill=حذف فاکتور
 SearchACustomerInvoice=جستجو برای یک صورتحساب مشتری
@@ -98,7 +99,7 @@ DoPaymentBack=آیا پرداخت به عقب
 ConvertToReduc=تبدیل به تخفیف آینده
 EnterPaymentReceivedFromCustomer=پرداخت های دریافت شده از مشتری را وارد کنید
 EnterPaymentDueToCustomer=پرداخت با توجه به مشتری
-DisabledBecauseRemainderToPayIsZero=غیر فعال به دلیل باقی مانده به پرداخت صفر است
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=مقدار
 PriceBase=پایه قیمت
 BillStatus=وضعیت فاکتور
@@ -126,8 +127,8 @@ PaymentStatusToValidShort=به اعتبار
 ErrorVATIntraNotConfigured=تعداد مالیات بر ارزش افزوده Intracommunautary هنوز تعریف نشده
 ErrorNoPaiementModeConfigured=بدون حالت پرداخت به طور پیش فرض تعریف شده است. برو به نصب ماژول فاکتور به رفع این.
 ErrorCreateBankAccount=ایجاد یک حساب بانکی، سپس به پنل راه اندازی ماژول فاکتور به تعریف حالت های پرداخت
-ErrorBillNotFound=فاکتور%s وجود ندارد
-ErrorInvoiceAlreadyReplaced=خطا، شما سعی می کنید به اعتبار صورتحساب به جای صورتحساب٪ است. اما این یکی در حال حاضر توسط فاکتور%s را جایگزین کرد.
+ErrorBillNotFound=فاکتور٪ s وجود ندارد
+ErrorInvoiceAlreadyReplaced=خطا، شما سعی می کنید به اعتبار صورتحساب به جای صورتحساب٪ است. اما این یکی در حال حاضر توسط فاکتور٪ s را جایگزین کرد.
 ErrorDiscountAlreadyUsed=خطا، تخفیف ویژه در حال حاضر استفاده می شود
 ErrorInvoiceAvoirMustBeNegative=خطا، فاکتور صحیح باید یک مقدار منفی داشته
 ErrorInvoiceOfThisTypeMustBePositive=خطا، این نوع از فاکتور باید یک مقدار مثبت
@@ -136,9 +137,7 @@ BillFrom=از
 BillTo=به
 ActionsOnBill=عملیات در فاکتور
 NewBill=صورت حساب جدید
-Prélèvements=نظام نامه
-Prélèvements=نظام نامه
-LastBills=تاریخ و زمان آخرین%s را فاکتورها
+LastBills=تاریخ و زمان آخرین٪ s را فاکتورها
 LastCustomersBills=تاریخ و زمان آخرین٪ مشتریان فاکتورها
 LastSuppliersBills=تاریخ و زمان آخرین٪ بازدید کنندگان تامین کنندگان فاکتورها
 AllBills=تمام فاکتورها
@@ -148,16 +147,16 @@ CustomersDraftInvoices=مشتریان پیش نویس فاکتورها
 SuppliersDraftInvoices=تولید کنندگان پیش نویس فاکتورها
 Unpaid=پرداخت نشده
 ConfirmDeleteBill=آیا مطمئن هستید که می خواهید این فاکتور را حذف کنید؟
-ConfirmValidateBill=آیا مطمئن هستید که می خواهید به اعتبار این فاکتور با <b>مرجع%s را؟</b>
-ConfirmUnvalidateBill=آیا مطمئن هستید که می خواهید به تغییر صورت <b>حساب%s به</b> پیش نویس وضعیت؟
-ConfirmClassifyPaidBill=آیا مطمئن هستید که می خواهید به تغییر صورت <b>حساب%s به</b> وضعیت پرداخت می شود؟
-ConfirmCancelBill=آیا مطمئن هستید که می خواهید برای صرفنظر کردن از <b>فاکتور%s را؟</b>
+ConfirmValidateBill=آیا مطمئن هستید که می خواهید به اعتبار این فاکتور با <b>مرجع٪ s را؟</b>
+ConfirmUnvalidateBill=آیا مطمئن هستید که می خواهید به تغییر صورت <b>حساب٪ s به</b> پیش نویس وضعیت؟
+ConfirmClassifyPaidBill=آیا مطمئن هستید که می خواهید به تغییر صورت <b>حساب٪ s به</b> وضعیت پرداخت می شود؟
+ConfirmCancelBill=آیا مطمئن هستید که می خواهید برای صرفنظر کردن از <b>فاکتور٪ s را؟</b>
 ConfirmCancelBillQuestion=چرا شما می خواهید برای طبقه بندی این فاکتور "رها"؟
-ConfirmClassifyPaidPartially=آیا مطمئن هستید که می خواهید به تغییر صورت <b>حساب%s به</b> وضعیت پرداخت می شود؟
+ConfirmClassifyPaidPartially=آیا مطمئن هستید که می خواهید به تغییر صورت <b>حساب٪ s به</b> وضعیت پرداخت می شود؟
 ConfirmClassifyPaidPartiallyQuestion=این فاکتور به طور کامل پرداخت نشده است. دلایل شما برای بستن این فاکتور ها چه هستند؟
-ConfirmClassifyPaidPartiallyReasonAvoir=باقی مانده به پرداخت <b>(٪ S٪ بازدید کنندگان)</b> تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. I تنظیم مالیات بر ارزش افزوده با توجه داشته باشید اعتباری.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=باقی مانده به پرداخت <b>(٪ S٪ بازدید کنندگان)</b> تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. من قبول می کنم به از دست دادن مالیات بر ارزش افزوده در این تخفیف.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=باقی مانده به پرداخت <b>(٪ S٪ بازدید کنندگان)</b> تخفیف داده است به دلیل پرداخت قبل از واژه ساخته شده است. I مالیات بر ارزش افزوده در این تخفیف بهبود می یابند بدون توجه داشته باشید اعتباری.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=مشتری بد
 ConfirmClassifyPaidPartiallyReasonProductReturned=محصولات نیمه بازگشت
 ConfirmClassifyPaidPartiallyReasonOther=میزان دلیل دیگر رها
@@ -169,8 +168,8 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=این گزینه استف
 ConfirmClassifyPaidPartiallyReasonOtherDesc=با استفاده از این انتخاب اگر تمام دیگر مناسب نیست، به عنوان مثال در شرایط زیر است: <br> - پرداخت کامل نیست چرا که برخی از محصولات پشت حمل می شد <br> - مقدار بیش از حد مهم است ادعا کرد به دلیل تخفیف به فراموشی سپرده شد <br> در همه موارد، مقدار بیش از حد ادعا باید در سیستم حسابداری با ایجاد یک یادداشت اعتباری را اصلاح کرد.
 ConfirmClassifyAbandonReasonOther=دیگر
 ConfirmClassifyAbandonReasonOtherDesc=این انتخاب خواهد شد در تمام موارد دیگر استفاده می شود. به عنوان مثال دلیل این که شما برنامه ریزی برای ایجاد یک فاکتور جایگزین.
-ConfirmCustomerPayment=آیا شما تایید این ورودی پرداخت شده <b>برای%s٪</b> s را؟
-ConfirmSupplierPayment=آیا شما تایید این ورودی پرداخت شده <b>برای%s٪</b> s را؟
+ConfirmCustomerPayment=آیا شما تایید این ورودی پرداخت شده <b>برای٪ s٪</b> s را؟
+ConfirmSupplierPayment=آیا شما تایید این ورودی پرداخت شده <b>برای٪ s٪</b> s را؟
 ConfirmValidatePayment=آیا مطمئن هستید که می خواهید به اعتبار این پرداخت؟ بدون تغییر می تواند به صورت یک بار پرداخت اعتبار است.
 ValidateBill=اعتبار فاکتور
 UnvalidateBill=فاکتور Unvalidate
@@ -190,15 +189,15 @@ AlreadyPaid=در حال حاضر پرداخت می شود
 AlreadyPaidBack=در حال حاضر باز پرداخت
 AlreadyPaidNoCreditNotesNoDeposits=در حال حاضر (بدون یادداشت های اعتباری و سپرده) پرداخت می شود
 Abandoned=متروک
-RemainderToPay=باقی مانده به پرداخت
-RemainderToTake=باقی مانده را به
-RemainderToPayBack=باقی مانده به پرداخت
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
 Rest=در انتظار
 AmountExpected=مقدار ادعا
 ExcessReceived=اضافی دریافت
 EscompteOffered=تخفیف ارائه شده (پرداخت قبل از ترم)
-SendBillRef=ارسال صورتحساب از%s
-SendReminderBillRef=ارسال صورتحساب از%s (یادآوری)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=سفارشات ایستاده
 StandingOrder=نظام نامه
 NoDraftBills=بدون پیش نویس فاکتورها
@@ -218,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=فهرست فاکتورها مشتری و خطوط صورت حساب را
@@ -256,8 +254,8 @@ CreditNote=توجه داشته باشید اعتباری
 CreditNotes=یادداشت های اعتباری
 Deposit=سپرده
 Deposits=سپرده ها
-DiscountFromCreditNote=تخفیف از اعتبار توجه داشته باشید از%s
-DiscountFromDeposit=پرداخت از سپرده فاکتور از%s
+DiscountFromCreditNote=تخفیف از اعتبار توجه داشته باشید از٪ s
+DiscountFromDeposit=پرداخت از سپرده فاکتور از٪ s
 AbsoluteDiscountUse=این نوع از اعتبار را می توان در صورتحساب قبل از اعتبار آن استفاده می شود
 CreditNoteDepositUse=فاکتور باید دارای اعتبار برای استفاده از این پادشاه اعتبارات
 NewGlobalDiscount=تخفیف های جدید مطلق
@@ -284,17 +282,19 @@ RemoveDiscount=حذف تخفیف
 WatermarkOnDraftBill=تعیین میزان مد آب در پیش نویس فاکتورها (هیچ اگر خالی)
 InvoiceNotChecked=بدون فاکتور انتخاب شده
 CloneInvoice=فاکتور کلون
-ConfirmCloneInvoice=آیا مطمئن هستید که می خواهید به کلون کردن این <b>فاکتور%s را؟</b>
+ConfirmCloneInvoice=آیا مطمئن هستید که می خواهید به کلون کردن این <b>فاکتور٪ s را؟</b>
 DisabledBecauseReplacedInvoice=اقدام غیر فعال به دلیل فاکتور جایگزین شده است
 DescTaxAndDividendsArea=این منطقه خلاصه ای از تمام پرداخت های ساخته شده برای مصارف خاص است. تنها پرونده با پرداخت در طول سال ثابت هستند در اینجا گنجانده شده است.
 NbOfPayments=Nb و پرداخت
 SplitDiscount=تخفیف تقسیم در دو
-ConfirmSplitDiscount=آیا مطمئن هستید که می خواهید به تقسیم این تخفیف <b>از%s در٪</b> s به 2 تخفیف پایین تر؟
+ConfirmSplitDiscount=آیا مطمئن هستید که می خواهید به تقسیم این تخفیف <b>از٪ s در٪</b> s به 2 تخفیف پایین تر؟
 TypeAmountOfEachNewDiscount=مقدار ورودی برای هر یک از دو بخش است:
 TotalOfTwoDiscountMustEqualsOriginal=مجموع دو تخفیف های جدید باید به مقدار تخفیف اصلی برابر باشد.
 ConfirmRemoveDiscount=آیا مطمئن هستید که می خواهید به حذف این تخفیف؟
 RelatedBill=فاکتور های مرتبط
 RelatedBills=فاکتورها مرتبط
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=فوری
@@ -354,7 +354,7 @@ FullPhoneNumber=تلفن
 TeleFax=فکس
 PrettyLittleSentence=قبول مقدار پرداخت دلیل توسط چک به نام من به عنوان یک عضو انجمن حسابداری تایید شده توسط اداره مالی صادر شده است.
 IntracommunityVATNumber=تعداد Intracommunity از مالیات بر ارزش افزوده
-PaymentByChequeOrderedTo=چک پرداخت (از جمله مالیات) قابل پرداخت می باشد به%s ارسال به
+PaymentByChequeOrderedTo=چک پرداخت (از جمله مالیات) قابل پرداخت می باشد به٪ s ارسال به
 PaymentByChequeOrderedToShort=چک پرداخت (از جمله مالیات) قابل پرداخت به می باشد
 SendTo=ارسال شده به
 PaymentByTransferOnThisBankAccount=پرداخت از طریق انتقال در حساب بانکی زیر
@@ -376,11 +376,11 @@ ChequesReceipts=چک رسید
 ChequesArea=منطقه چک سپرده
 ChequeDeposits=چک سپرده
 Cheques=چک
-CreditNoteConvertedIntoDiscount=این یادداشت اعتباری و یا واریز صورت حساب شده است به%s را تبدیل
+CreditNoteConvertedIntoDiscount=این یادداشت اعتباری و یا واریز صورت حساب شده است به٪ s را تبدیل
 UsBillingContactAsIncoiveRecipientIfExist=استفاده از حسابداری و مدیریت مشتری آدرس تماس به جای آدرس شخص ثالث به عنوان دریافت کننده برای صورت حساب
 ShowUnpaidAll=نمایش همه فاکتورها پرداخت نشده
 ShowUnpaidLateOnly=نمایش فاکتورها اواخر سال پرداخت نشده و تنها
-PaymentInvoiceRef=پرداخت صورتحساب از%s
+PaymentInvoiceRef=پرداخت صورتحساب از٪ s
 ValidateInvoice=اعتبار فاکتور
 Cash=پول نقد
 Reported=به تاخیر افتاده
@@ -398,8 +398,8 @@ NoteListOfYourUnpaidInvoices=توجه: این لیست فقط شامل صورت
 RevenueStamp=تمبر درآمد
 YouMustCreateInvoiceFromThird=این گزینه تنها زمانی ایجاد فاکتور از تب "مشتری" از thirdparty
 PDFCrabeDescription=فاکتور PDF قالب Crabe. قالب فاکتور کامل (قالب توصیه می شود)
-TerreNumRefModelDesc1=تعداد بازگشت با فرمت%syymm-NNNN برای فاکتورها استاندارد و%syymm-NNNN برای یادداشت های اعتباری که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است
-MarsNumRefModelDesc1=تعداد بازگشت با فرمت%syymm-NNNN برای صورت حساب استاندارد،%syymm-NNNN برای فاکتورها جایگزین،%syymm-NNNN برای یادداشت های اعتباری و%syymm-NNNN برای یادداشت های اعتباری که در آن YY سال است، میلی متر در ماه است و NNNN یک دنباله با هیچ است استراحت و بدون بازگشت به 0
+TerreNumRefModelDesc1=تعداد بازگشت با فرمت٪ syymm-NNNN برای فاکتورها استاندارد و٪ syymm-NNNN برای یادداشت های اعتباری که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است
+MarsNumRefModelDesc1=تعداد بازگشت با فرمت٪ syymm-NNNN برای صورت حساب استاندارد،٪ syymm-NNNN برای فاکتورها جایگزین،٪ syymm-NNNN برای یادداشت های اعتباری و٪ syymm-NNNN برای یادداشت های اعتباری که در آن YY سال است، میلی متر در ماه است و NNNN یک دنباله با هیچ است استراحت و بدون بازگشت به 0
 TerreNumRefModelError=لایحه با $ شروع میشوند syymm حال حاضر وجود دارد و سازگار با این مدل توالی نیست. آن را حذف و یا تغییر نام آن را به این ماژول را فعال کنید.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=نماینده زیر تا صورتحساب مشتری
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index 53d7abd3002..427073d5f48 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -42,9 +42,9 @@ ErrCatAlreadyExists=این نام قبلا استفاده شده
 AddProductToCat=اضافه کردن این محصول را به یک موضوع؟
 ImpossibleAddCat=غیر ممکن برای اضافه کردن گروه
 ImpossibleAssociateCategory=غیر ممکن است از دسته
-WasAddedSuccessfully=<b>%s</b> با <b>موفقیت</b> اضافه شد.
+WasAddedSuccessfully=<b>٪ s</b> با <b>موفقیت</b> اضافه شد.
 ObjectAlreadyLinkedToCategory=عنصر در حال حاضر به این گروه مرتبط است.
-CategorySuccessfullyCreated=این رده در%s را با موفقیت اضافه شده است.
+CategorySuccessfullyCreated=این رده در٪ s را با موفقیت اضافه شده است.
 ProductIsInCategories=محصولات / خدمات دارای به مقوله های زیر است
 SupplierIsInCategories=شخص ثالث صاحب به زیر تامین کنندگان مجموعه ها
 CompanyIsInCustomersCategories=این شخص ثالث صاحب به زیر مشتریان / چشم انداز مجموعه ها
@@ -101,9 +101,6 @@ CatSupLinks=ارتباط بین تامین کنندگان و گروهها
 CatCusLinks=ارتباط بین مشتریان / چشم انداز ها و دسته ها
 CatProdLinks=لینک بین محصولات / خدمات و دسته ها
 CatMemberLinks=ارتباط بین اعضا و گروهها
-CatProdLinks=لینک بین محصولات / خدمات و دسته ها
-CatCusLinks=ارتباط بین مشتریان / چشم انداز ها و دسته ها
-CatSupLinks=ارتباط بین تامین کنندگان و گروهها
 DeleteFromCat=حذف از گروه
 DeletePicture=تصویر حذف کنید
 ConfirmDeletePicture=تأیید حذف تصویر؟
@@ -111,3 +108,5 @@ ExtraFieldsCategories=ویژگی های مکمل
 CategoriesSetup=شاخه ها راه اندازی
 CategorieRecursiv=پیوند با گروه پدر و مادر به طور خودکار
 CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته پدر و مادر مرتبط است که با اضافه کردن به زیرشاخه
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 538b392b4ea..ed26730f90b 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=شما باید ایمیل تماس برای شخص ث
 ListSuppliersShort=فهرست تامین کنندگان
 ListProspectsShort=فهرست چشم انداز
 ListCustomersShort=فهرست مشتریان
-ThirdPartiesArea=منطقه احزاب سوم
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=تاریخ و زمان آخرین٪ بازدید کنندگان اشخاص ثالث اصلاح شده
 UniqueThirdParties=مجموع اشخاص ثالث منحصر به فرد
 InActivity=باز
@@ -410,3 +410,5 @@ OutstandingBillReached=رسیدم حداکثر. برای لایحه برجسته
 MonkeyNumRefModelDesc=numero بازگشت با فرمت syymm-NNNN برای کد مشتری و٪ syymm-NNNN برای کد منبع که در آن YY سال است٪، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است.
 LeopardNumRefModelDesc=کد آزاد است. این کد را می توان در هر زمان تغییر یافتهاست.
 ManagingDirectors=مدیر (بازدید کنندگان) نام (مدیر عامل شرکت، مدیر، رئيس جمهور ...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index f6bdd7dca9a..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 را
@@ -187,7 +188,7 @@ AccountancyDashboard=خلاصه حسابداری
 ByProductsAndServices=با محصولات و خدمات
 RefExt=کد عکس خارجی
 ToCreateAPredefinedInvoice=برای ایجاد یک فاکتور از پیش تعریف شده، ایجاد یک فاکتور استاندارد پس از آن، بدون تأیید آن، با کلیک بر روی دکمه "تبدیل به فاکتور از پیش تعریف شده".
-LinkedOrder=وابسته به سفارش
+LinkedOrder=Link to order
 ReCalculate=دوباره حساب کردن
 Mode1=روش 1
 Mode2=روش 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م
 TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت <b>حسابداری نقدی</b> مربوط نیست. این گزارش که با استفاده از <b>تعامل</b> حالت <b>حسابداری</b> (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است.
 CalculationMode=حالت محاسبه
 AccountancyJournal=کد حسابداری مجله
-COMPTA_PRODUCT_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید محصولات
-COMPTA_PRODUCT_SOLD_ACCOUNT=کد پیش فرض حسابداری برای فروش محصولات
-COMPTA_SERVICE_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید خدمات
-COMPTA_SERVICE_SOLD_ACCOUNT=کد پیش فرض حسابداری به فروش خدمات
-COMPTA_VAT_ACCOUNT=پیش فرض کد حسابداری برای جمع آوری مالیات بر ارزش افزوده
-COMPTA_VAT_BUY_ACCOUNT=پیش فرض کد حسابداری برای پرداخت مالیات بر ارزش افزوده
-COMPTA_ACCOUNT_CUSTOMER=کد حسابداری به طور پیش فرض برای thirdparties مشتری
-COMPTA_ACCOUNT_SUPPLIER=کد حسابداری به طور پیش فرض برای thirdparties منبع
+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
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 af3a84a2a75..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=وعده هدیه
@@ -30,3 +30,9 @@ SearchADonation=جستجوی یک کمک مالی
 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 2b8a8c2fc35..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=کاربر با ورود <b>به٪ s را</b> می تو
 ErrorLoginHasNoEmail=این کاربر هیچ آدرس ایمیل. فرآیند سقط شده.
 ErrorBadValueForCode=ارزش بد برای کد امنیتی. دوباره سعی کنید با ارزش جدید ...
 ErrorBothFieldCantBeNegative=زمینه های٪ s و٪ s نمی تواند هر دو منفی
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=حساب <b>کاربری٪ s را</b> برای اجرای وب سرور بدون اجازه که
 ErrorNoActivatedBarcode=بدون بارکد از نوع فعال
 ErrUnzipFails=برای جدا کردن٪ s با ZipArchive ناموفق
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=خطا، PHP شما باید <b>بخش٪ s</b> نصب کرد
 ErrorOpenIDSetupNotComplete=شما راه اندازی Dolibarr فایل پیکربندی اجازه می دهد تا احراز هویت ایجاد حساب کاربری، اما URL خدمات ایجاد حساب کاربری به٪ ثابت تعریف نشده
 ErrorWarehouseMustDiffers=منبع و هدف انبارها باید متفاوت
 ErrorBadFormat=فرمت بد!
-ErrorPaymentDateLowerThanInvoiceDate=تاریخ پرداخت (٪ بازدید کنندگان) نمی باشد قبل از تاریخ فاکتور (٪ s) برای فاکتور٪ است.
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطا، این عضو هنوز رتبهدهی نشده است به هر thirdparty مرتبط است. عضو لینک به یک شخص ثالث موجود یا ایجاد یک thirdparty جدید قبل از ایجاد اشتراک با فاکتور.
 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=پارامترهای راه اندازی اجباری هنوز تعریف نشده
@@ -154,3 +174,5 @@ WarningUsingThisBoxSlowDown=اخطار، با استفاده از این جعب
 WarningClickToDialUserSetupNotComplete=راه اندازی از اطلاعات ClickToDial برای کاربر شما کامل نیست (ClickToDial زبانه دیدن بر روی کارت کاربر خود را).
 WarningNotRelevant=عملیات بی ربط برای این مجموعه داده
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=قابلیت غیر فعال زمانی که راه اندازی صفحه نمایش برای فرد نابینا یا از مرورگرهای متن بهینه شده است.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
index fd0c8a59a88..9d727e6749b 100644
--- a/htdocs/langs/fa_IR/exports.lang
+++ b/htdocs/langs/fa_IR/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=شماره حساب
 BankAccountNumberKey=کلید
 SpecialCode=کد ویژه
 ExportStringFilter=٪٪ اجازه می دهد تا به جای یک یا چند کاراکتر در متن
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD: فیلتر های یک سال / ماه / روز <br> 'YYYY + YYYY' 'YYYYMM + YYYYMM' 'YYYYMMDD + YYYYMMDD: فیلتر بیش از یک طیف وسیعی از سال / ماه / روز <br> '> YYYY' '> YYYYMM' '> YYYYMMDD: فیلتر در زیر سال / ماه / روز <br> '<YYYY' '<YYYYMM' '<YYYYMMDD: فیلتر ها بر روی گذشته سال / ماه / روز
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter=فیلتر 'NNNNN توسط یک ارزش <br> فیلتر 'NNNNN + NNNNN' بیش از یک طیف وسیعی از مقادیر <br> '> NNNNN' فیلتر شده توسط مقادیر پایین تر <br> '> NNNNN' فیلتر شده توسط ارزش بالاتر
 ## filters
 SelectFilterFields=اگر می خواهید برای فیلتر کردن در برخی از ارزش ها، فقط مقادیر ورودی در اینجا.
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 29606821a20..238eb5a9f12 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=تعطیلات
-CPTitreMenu=تعطیلات
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=بیانیه ماهانه
-MenuAddCP=درخواست برای تعطیلات
-NotActiveModCP=شما باید تعطیلات ماژول را قادر می سازد به این صفحه.
-NotConfigModCP=شما باید تعطیلات ماژول را پیکربندی کنید به این صفحه. برای این کار، <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">اینجا را کلیک کنید</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
-NoCPforUser=شما یک تقاضا برای تعطیلات ندارد.
-AddCP=درخواست برای تعطیلات
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=کارمند
 DateDebCP=تاریخ شروع
 DateFinCP=تاریخ پایان
@@ -18,24 +18,24 @@ ApprovedCP=تایید شده
 CancelCP=لغو شد
 RefuseCP=رد
 ValidatorCP=Approbator
-ListeCP=فهرست از تعطیلات
+ListeCP=List of leaves
 ReviewedByCP=خواهد شد بررسی
 DescCP=توصیف
-SendRequestCP=ایجاد تقاضا برای تعطیلات
-DelayToRequestCP=برنامه های کاربردی برای تعطیلات باید <b>حداقل%s را روز</b> قبل از آنها ساخته شده است.
-MenuConfCP=ویرایش تعادل از تعطیلات
-UpdateAllCP=به روز رسانی تعطیلات
-SoldeCPUser=تعادل <b>تعطیلات%s</b> روز است.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=شما باید تاریخ پایان بیشتر از تاریخ شروع انتخاب کنید.
 ErrorSQLCreateCP=خطای SQL در ایجاد رخ داده است:
-ErrorIDFicheCP=یک خطا رخ داده است، درخواست برای تعطیلات وجود ندارد.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=بازگشت به صفحه قبل
-ErrorUserViewCP=شما مجاز به خواندن این درخواست برای تعطیلات.
-InfosCP=اطلاعات تقاضا از تعطیلات
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=گردش کار اطلاعات
 RequestByCP=درخواست شده توسط
-TitreRequestCP=ورق از تعطیلات
-NbUseDaysCP=تعداد روز از تعطیلات مصرف
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=ویرایش
 DeleteCP=حذف کردن
 ActionValidCP=معتبر ساختن
@@ -43,26 +43,25 @@ ActionRefuseCP=رد کردن
 ActionCancelCP=لغو کردن
 StatutCP=وضعیت
 SendToValidationCP=ارسال به اعتبار سنجی
-TitleDeleteCP=حذف درخواست از تعطیلات
-ConfirmDeleteCP=تایید حذف این درخواست برای تعطیلات؟
-ErrorCantDeleteCP=خطا شما حق این درخواست تعطیلی را حذف کنید ندارد.
-CantCreateCP=شما این حق را برای تعطیلات اعمال می شود ندارد.
-InvalidValidatorCP=شما باید approbator به درخواست تعطیلات خود را انتخاب کنید.
-UpdateButtonCP=به روز رسانی
-CantUpdate=شما می توانید این درخواست از تعطیلات به روز رسانی نیست.
+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=شما باید یک تاریخ شروع انتخاب کنید.
 NoDateFin=شما باید تاریخ پایان را انتخاب کنید.
-ErrorDureeCP=درخواست شما برای تعطیلات حاوی روز کار نمی کند.
-TitleValidCP=تصویب تعطیلات درخواست
-ConfirmValidCP=آیا مطمئن هستید که می خواهید برای تایید درخواست تعطیلات؟
+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=ارسال تعطیلات درخواست
-ConfirmToValidCP=آیا مطمئن هستید که می خواهید برای ارسال درخواست از تعطیلات؟
-TitleRefuseCP=امتناع تعطیلات درخواست
-ConfirmRefuseCP=آیا مطمئن هستید که می خواهید به رد درخواست از تعطیلات؟
+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=شما باید دلیلی برای امتناع از درخواست را انتخاب کنید.
-TitleCancelCP=لغو تعطیلات درخواست
-ConfirmCancelCP=آیا مطمئن هستید که می خواهید برای صرفنظر کردن از درخواست از تعطیلات؟
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=دلیل امتناع
 DateRefusCP=تاریخ امتناع
 DateCancelCP=عضویت لغو
@@ -72,42 +71,42 @@ MotifCP=دلیل
 UserCP=کاربر
 ErrorAddEventToUserCP=در حالی که با اضافه کردن مرخصی استثنایی خطایی رخ داد.
 AddEventToUserOkCP=علاوه بر این از مرخصی استثنایی کامل شده است.
-MenuLogCP=نمایش سیاهههای مربوط از تعطیلات
-LogCP=ورود از به روز رسانی از تعطیلات
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 ActionByCP=انجام شده توسط
 UserUpdateCP=برای کاربر
 PrevSoldeCP=موجودی قبلی
 NewSoldeCP=موجودی جدید
-alreadyCPexist=درخواست برای تعطیلات در حال حاضر در این دوره انجام می شود.
+alreadyCPexist=A leave request has already been done on this period.
 UserName=نام
 Employee=کارمند
-FirstDayOfHoliday=اولین روز از تعطیلات
-LastDayOfHoliday=آخرین روز از تعطیلات
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=به روز رسانی ماهانه
 ManualUpdate=دستی به روز رسانی
-HolidaysCancelation=تعطیلات لغو
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=تنظیمات ماژول تعطیلات
+ConfCP=Configuration of leave request module
 DescOptionCP=شرح گزینه
 ValueOptionCP=ارزش
-GroupToValidateCP=گروه با توانایی به تصویب تعطیلات
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=اعتبارسنجی پیکربندی
-LastUpdateCP=تاریخ و زمان آخرین طور خودکار از تعطیلات به روز شده
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=به روز رسانی با موفقیت.
 ErrorUpdateConfCP=خطا در به روز رسانی رخ داد، لطفا دوباره سعی کنید.
-AddCPforUsers=لطفا تعادل از تعطیلات از کاربران با استفاده از Add <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">اینجا را کلیک کنید</a> .
-DelayForSubmitCP=آخرین مهلت برای تعطیلات اعمال می شود
-AlertapprobatortorDelayCP=جلوگیری از approbator اگر درخواست تعطیلات می کند مهلت مطابقت ندارد
-AlertValidatorDelayCP=Préevent approbator اگر درخواست تعطیلات تجاوز تاخیر
-AlertValidorSoldeCP=جلوگیری از approbator اگر درخواست تعطیلات بیش از تعادل
-nbUserCP=شماره کاربر پشتیبانی در تعطیلات ماژول
-nbHolidayDeductedCP=تعداد تعطیلات به در روز از تعطیلات گرفته شده کسر می شود
-nbHolidayEveryMonthCP=تعداد تعطیلات اضافه شده هر ماه
-Module27130Name= مدیریت از تعطیلات
-Module27130Desc= مدیریت از تعطیلات
-TitleOptionMainCP=تنظیمات اصلی از تعطیلات
-TitleOptionEventCP=تنظیمات از تعطیلات مربوط به حوادث
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=معتبر ساختن
 UpdateEventCP=رویدادی به روز رسانی
 CreateEventCP=ساختن
@@ -127,23 +126,23 @@ UpdateEventOptionCP=به روز رسانی
 ErrorMailNotSend=در حالی که ارسال ایمیل یک خطا رخ داده است:
 NoCPforMonth=بدون این ماه را ترک کنند.
 nbJours=شماره روز
-TitleAdminCP=تنظیمات تعطیلات
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=سلام
-HolidaysToValidate=اعتبارسنجی تعطیلات
-HolidaysToValidateBody=در زیر یک درخواست برای تعطیلات به اعتبار است
-HolidaysToValidateDelay=این درخواست برای تعطیلات در طی یک دوره کمتر از%s روز است.
-HolidaysToValidateAlertSolde=کاربری که این درخواست برای تعطیلات ساخته شده را روز به اندازه کافی در دسترس ندارد.
-HolidaysValidated=تعطیلات اعتبار
-HolidaysValidatedBody=درخواست شما برای تعطیلات را برای%s به%s دارای اعتبار بوده است.
-HolidaysRefused=تعطیلات را رد کرد
-HolidaysRefusedBody=درخواست شما برای تعطیلات را برای%s به%s شده است به این دلیل رد کرده است:
-HolidaysCanceled=تعطیلات لغو شد
-HolidaysCanceledBody=درخواست شما برای تعطیلات را برای%s به%s لغو شده است.
-Permission20000=خوانده شده شما تعطیلات خود
-Permission20001=ایجاد / اصلاح تعطیلات خود را
-Permission20002=ایجاد / اصلاح تعطیلات برای همه
-Permission20003=حذف تعطیلات درخواست
-Permission20004=کاربران راه اندازی تعطیلات
-Permission20005=ورود به سیستم فایل را نقد کنید از تعطیلات تغییر
-Permission20006=دفعات بازدید: تعطیلات گزارش ماهانه
+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
diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
index 94e01b3ec51..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=عملیات مداخله
@@ -17,17 +17,28 @@ ValidateIntervention=اعتبارسنجی مداخله
 ModifyIntervention=اصلاح مداخله
 DeleteInterventionLine=حذف خط مداخله
 ConfirmDeleteIntervention=آیا مطمئن هستید که می خواهید این مداخله را حذف کنید؟
-ConfirmValidateIntervention=آیا مطمئن هستید که می خواهید به اعتبار این مداخله تحت <b>نام%s را؟</b>
+ConfirmValidateIntervention=آیا مطمئن هستید که می خواهید به اعتبار این مداخله تحت <b>نام٪ s را؟</b>
 ConfirmModifyIntervention=آیا مطمئن هستید که می خواهید به تغییر این مداخله؟
 ConfirmDeleteInterventionLine=آیا مطمئن هستید که می خواهید این خط مداخله را حذف کنید؟
 NameAndSignatureOfInternalContact=نام و امضا از مداخله:
 NameAndSignatureOfExternalContact=نام و امضا از مشتری:
 DocumentModelStandard=مدل استاندارد سند برای مداخلات
 InterventionCardsAndInterventionLines=مداخلات و خطوط مداخلات
-ClassifyBilled=طبقه بندی "صورتحساب"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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=مداخله
@@ -36,7 +47,7 @@ TypeContact_fichinter_external_CUSTOMER=پس تا مشتری تماس
 # Modele numérotation
 ArcticNumRefModelDesc1=مدل تعداد عمومی
 ArcticNumRefModelError=برای فعال سازی ناموفق
-PacificNumRefModelDesc1=بازگشت numero با فرمت%syymm-NNNN که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است
+PacificNumRefModelDesc1=بازگشت numero با فرمت٪ syymm-NNNN که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است
 PacificNumRefModelError=کارت مداخله با $ شروع میشوند syymm حال حاضر وجود دارد و سازگار با این مدل توالی نیست. آن را حذف و یا تغییر نام آن را به این ماژول را فعال کنید.
 PrintProductsOnFichinter=محصول چاپ بر روی کارت مداخله
 PrintProductsOnFichinterDetails=forinterventions تولید شده از سفارشات
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 برای امنیت و فاصله دلایل <b>به٪ s</b> دریافت کنندگان با ارسال وارد نمایید محدود شده است.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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=برای پیدا کردن <b>کاربر٪
 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=یکی دیگر از عضو (نام و نام <b>خانوادگی:٪ S،</b> وارد <b>کنید:%s)</b> در حال حاضر به شخص <b>ثالث%s در</b> ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود.
+ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام و نام <b>خانوادگی:٪ S،</b> وارد <b>کنید:٪ s)</b> در حال حاضر به شخص <b>ثالث٪ s در</b> ارتباط است. حذف این لینک برای اولین بار به دلیل یک شخص ثالث می تواند تنها به یک عضو (و بالعکس) پیوند داده نمی شود.
 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=آیا مطمئن هستید که می خواهید به اعتبار این منظور با <b>نام%s را؟</b>
-ConfirmUnvalidateOrder=آیا مطمئن هستید که می خواهید برای بازگرداندن نظم <b>به%s به</b> پیش نویس وضعیت؟
+ConfirmValidateOrder=آیا مطمئن هستید که می خواهید به اعتبار این منظور با <b>نام٪ s را؟</b>
+ConfirmUnvalidateOrder=آیا مطمئن هستید که می خواهید برای بازگرداندن نظم <b>به٪ s به</b> پیش نویس وضعیت؟
 ConfirmCancelOrder=آیا مطمئن هستید که می خواهید به لغو این منظور؟
-ConfirmMakeOrder=آیا مطمئن هستید که می خواهید برای تایید شما به این منظور <b>در%s</b> ساخته شده است؟
+ConfirmMakeOrder=آیا مطمئن هستید که می خواهید برای تایید شما به این منظور <b>در٪ s</b> ساخته شده است؟
 GenerateBill=تولید صورت حساب
 ClassifyShipped=طبقه بندی تحویل
 ClassifyBilled=طبقه بندی صورتحساب
@@ -110,10 +110,10 @@ AuthorRequest=درخواست نویسنده
 UseCustomerContactAsOrderRecipientIfExist=اگر به جای آدرس شخص ثالث به عنوان آدرس دریافت کننده منظور تعریف شده استفاده از آدرس ارتباط با مشتری
 RunningOrders=سفارشات در فرآیند
 UserWithApproveOrderGrant=کاربران داده با "سفارشات تایید" اجازه.
-PaymentOrderRef=پرداخت منظور از%s
+PaymentOrderRef=پرداخت منظور از٪ s
 CloneOrder=منظور کلون
-ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور <b>از%s؟</b>
-DispatchSupplierOrder=دریافت کننده کالا منظور از%s
+ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور <b>از٪ s؟</b>
+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=این منطقه به گروه ابزار دیگر در دسترس را به دیگر نوشته های منو نمی اختصاص یافته است. <br><br> این ابزار را می توانید از منوی سمت رسیده است.
 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=این فرم به شما اجازه درخواست رمز عبور جدید. از آن خواهد شد به آدرس الکترونیک شما ارسال می کند. <br> تغییر تنها پس از کلیک کردن بر روی لینک تایید در داخل این ایمیل موثر خواهد بود. <br> نرم افزار ایمیل خوان خود را چک کنید.
 BackToLoginPage=بازگشت به صفحه ورود
-AuthenticationDoesNotAllowSendNewPassword=نحوه <b>تایید%s است.</b> <br> در این حالت، Dolibarr نمی توانند بفهمند و نه رمز عبور خود را تغییر دهید. <br> تماس با مدیر سیستم شما اگر می خواهید رمز عبور خود را تغییر دهید.
+AuthenticationDoesNotAllowSendNewPassword=نحوه <b>تایید٪ s است.</b> <br> در این حالت، Dolibarr نمی توانند بفهمند و نه رمز عبور خود را تغییر دهید. <br> تماس با مدیر سیستم شما اگر می خواهید رمز عبور خود را تغییر دهید.
 EnableGDLibraryDesc=نصب و یا فعال کتابخانه GD با PHP خود را برای استفاده از این گزینه.
 EnablePhpAVModuleDesc=شما نیاز به نصب یک ماژول سازگار با آنتی ویروس خود را. (ClamAV درحال: PHP4-clamavlib OU PHP5-clamavlib)
-ProfIdShortDesc=<b>پروفسور کد از%s</b> اطلاعات بسته به کشور های شخص ثالث است. <br> به عنوان مثال، برای <b>کشور٪، این کد٪ بازدید کنندگان</b> است.
+ProfIdShortDesc=<b>پروفسور کد از٪ s</b> اطلاعات بسته به کشور های شخص ثالث است. <br> به عنوان مثال، برای <b>کشور٪، این کد٪ بازدید کنندگان</b> است.
 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=عرض جدید <b>OR</b> ارتفاع جدید را وارد کنید. نسبت در طول تغییر اندازه نگه داشته ...
@@ -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 <b>و برچسب = <i>مقدار</i></b> را به هر یک از این URL (فقط برای پرداخت رایگان مورد نیاز) برای اضافه کردن خود برچسب توضیحات پرداخت خود اضافه کنید.
-SetupPayBoxToHavePaymentCreatedAutomatically=راه اندازی خزانه خود را با <b>آدرس%s را</b> به پرداخت زمانی که توسط خزانه اعتبار به طور خودکار ساخته.
+SetupPayBoxToHavePaymentCreatedAutomatically=راه اندازی خزانه خود را با <b>آدرس٪ s را</b> به پرداخت زمانی که توسط خزانه اعتبار به طور خودکار ساخته.
 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 50b8477e1f5..dc472f3b7c8 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=بسته
 ContractStatusRunning=در حال اجرا
 ContractStatusExpired=سپری
 ContractStatusOnHold=در حال اجرا نیست
-ContractStatusToRun=mettre EN خدمات
+ContractStatusToRun=To get running
 ContractNotRunning=این قرارداد در حال اجرا نیست
 ErrorProductAlreadyExists=محصول با مرجع٪ s در حال حاضر وجود دارد.
 ErrorProductBadRefOrLabel=ارزش اشتباه به عنوان مرجع و یا برچسب.
 ErrorProductClone=یک مشکل وجود دارد در حالی که تلاش برای کلون کردن محصول و یا خدمات.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=تولید کنندگان
 SupplierRef=کد عکس محصول تامین کننده است.
 ShowProduct=نمایش محصول
@@ -116,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=فیلتر کلمه کلیدی
@@ -131,7 +132,7 @@ AddDel=اضافه کردن / حذف
 Quantity=مقدار
 NoMatchFound=هیچ بازی یافت
 ProductAssociationList=فهرست محصولات مرتبط / خدمات: نام محصول / خدمات (مقدار تحت تاثیر قرار)
-ProductParentList=لیست محصولات مجازی / خدمات با این محصول به عنوان یک جزء
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=یکی از محصول انتخاب پدر و مادر با محصول فعلی است
 DeleteProduct=حذف یک محصول / خدمات
 ConfirmDeleteProduct=آیا مطمئن هستید که می خواهید به حذف این محصول / خدمات؟
@@ -178,7 +179,7 @@ CloneProduct=محصول کلون یا خدمات
 ConfirmCloneProduct=آیا مطمئن هستید که می خواهید به کلون کردن محصول و یا خدمات <b>از٪ s؟</b>
 CloneContentProduct=کلون تمام اطلاعات اصلی محصول / خدمات
 ClonePricesProduct=اطلاعات اصلی کلون و قیمت
-CloneCompositionProduct=کلون مجازی محصولات / خدمات
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=این محصول مورد استفاده قرار گیرد
 NewRefForClone=کد عکس. محصول جدید / خدمات
 CustomerPrices=مشتریان قیمت
@@ -239,3 +240,10 @@ PricingRule=قوانين قيمت گذاری
 AddCustomerPrice=اضافه کردن قيمت های مشتريان
 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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 da634d13a72..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=وظایف / فعالیت ها
@@ -85,13 +87,13 @@ ActionsOnProject=رویدادها در پروژه
 YouAreNotContactOfProject=شما یک تماس از این پروژه خصوصی نیست
 DeleteATimeSpent=زمان صرف شده حذف
 ConfirmDeleteATimeSpent=آیا مطمئن هستید که می خواهید به حذف این زمان صرف شده؟
-DoNotShowMyTasksOnly=همچنین نگاه کنید به وظایف به من اختصاص داده نشده
-ShowMyTasksOnly=نمایش فقط وظایف اختصاص داده شده به من
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=پروژه ها اختصاص داده شده به این شخص ثالث
 NoTasks=بدون وظایف برای این پروژه
 LinkedToAnotherCompany=لینک به دیگر شخص ثالث
-TaskIsNotAffectedToYou=کار به شما اختصاص ندارد
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=مدت زمان صرف شده خالی است
 ThisWillAlsoRemoveTasks=این کار همچنین تمام کارهای پروژه <b>(وظایف٪ s</b> در حال حاضر) حذف و تمام ورودی ها از زمان صرف شده.
 IfNeedToUseOhterObjectKeepEmpty=اگر برخی از اشیاء (فاکتور، سفارش، ...)، متعلق به شخص ثالث دیگری، باید به این پروژه برای ایجاد، نگه داشتن این خالی به این پروژه که احزاب چند سوم مرتبط است.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=شرکت کننده
 TypeContact_project_task_external_TASKCONTRIBUTOR=شرکت کننده
 SelectElement=انتخاب عنصر
 AddElement=لینک به عنصر
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=مدل گزارش یک پروژه کامل (logo. ..)
 PlannedWorkload = حجم کار برنامه ریزی شده
@@ -128,3 +131,4 @@ ProjectReferers=مراجعه اشیاء
 SearchAProject=جستجوی یک پروژه
 ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد
 ProjectDraft=پروژه های پیش نویس
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
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 fbffc79235b..0ecdd9a541a 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -43,7 +43,7 @@ Carrier=حامل
 CarriersArea=منطقه حامل
 NewCarrier=حامل جدید
 ConfirmDeleteSending=آیا مطمئن هستید که می خواهید این حمل و نقل را حذف کنید؟
-ConfirmValidateSending=آیا مطمئن هستید که می خواهید به اعتبار این حمل و نقل با <b>اشاره%s را؟</b>
+ConfirmValidateSending=آیا مطمئن هستید که می خواهید به اعتبار این حمل و نقل با <b>اشاره٪ s را؟</b>
 ConfirmCancelSending=آیا مطمئن هستید که می خواهید به لغو این حمل و نقل؟
 GenericTransport=عمومی حمل و نقل
 Enlevement=بدست شده توسط مشتری
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=آمار انجام شده بر روی محمول
 DateDeliveryPlanned=تاریخ ورقه زایمان
 DateReceived=تاریخ تحویل
 SendShippingByEMail=ارسال محموله از طریق ایمیل
-SendShippingRef=ارسال محموله از%s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=رویدادهای در حمل و نقل
 LinkToTrackYourPackage=لینک به پیگیری بسته بندی خود را
 ShipmentCreationIsDoneFromOrder=برای لحظه ای، ایجاد یک محموله های جدید از کارت منظور انجام می شود.
 RelatedShippings=shippings های مرتبط
 ShipmentLine=خط حمل و نقل
 CarrierList=فهرست از حمل و نقل
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
 
 # Sending methods
 SendingMethodCATCH=گرفتن توسط مشتری
@@ -72,3 +74,7 @@ DocumentModelTyphon=مدل سند کامل بیشتر برای رسید تحوی
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت تعریف نشده
 SumOfProductVolumes=مجموع حجم محصول
 SumOfProductWeights=مجموع وزن محصول
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/fa_IR/shop.lang b/htdocs/langs/fa_IR/shop.lang
deleted file mode 100644
index 72454575e51..00000000000
--- a/htdocs/langs/fa_IR/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=برای اتصال به پایگاه داده با همکاری شکست خورد. بررسی کنید راه اندازی ماژول شما
-Shop=فروشگاه
-ShopWeb=وب سایت فروشگاه
-LastOrders=آخرین سفارشات
-OnStandBy=آماده به کار
-TreatmentInProgress=درمان در حال پیشرفت است
-LastCustomers=تاریخ و زمان آخرین مشتریان
-OSCommerceShop=فروشگاه آهنگ تولد
-OSCommerce=آهنگ تولد
-AddProd=فروش آنلاین
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/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 62385267614..6b3644b6796 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -19,7 +19,7 @@ ChangeSupplierPrice=تغییر قیمت عرضه کننده کالا
 ErrorQtyTooLowForThisSupplier=مقدار خیلی کم برای این عرضه کننده کالا یا بدون قیمت در این محصول برای این کالا تعریف شده
 ErrorSupplierCountryIsNotDefined=کشور برای این کالا تعریف نشده است. اولین تصحیح این.
 ProductHasAlreadyReferenceInThisSupplier=این محصول در حال حاضر یک مرجع در این منبع
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=این منبع مرجع در حال حاضر با یک مرجع در ارتباط است:%s را
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=این منبع مرجع در حال حاضر با یک مرجع در ارتباط است:٪ s را
 NoRecordedSuppliers=بدون تامین کنندگان ثبت
 SupplierPayment=پرداخت کننده
 SuppliersArea=منطقه تامین کنندگان
@@ -29,14 +29,16 @@ ExportDataset_fournisseur_1=فهرست فاکتورها تامین کننده و
 ExportDataset_fournisseur_2=فاکتورها تامین کننده و پرداخت
 ExportDataset_fournisseur_3=سفارشات تامین کننده و خطوط جهت
 ApproveThisOrder=تصویب این منظور
-ConfirmApproveThisOrder=آیا مطمئن هستید که می خواهید برای تایید <b>از%s؟</b>
+ConfirmApproveThisOrder=آیا مطمئن هستید که می خواهید برای تایید <b>از٪ s؟</b>
 DenyingThisOrder=انکار این منظور
-ConfirmDenyingThisOrder=آیا مطمئن هستید که می خواهید برای انکار این منظور <b>از%s؟</b>
-ConfirmCancelThisOrder=آیا مطمئن هستید که می خواهید به لغو این منظور <b>از%s؟</b>
+ConfirmDenyingThisOrder=آیا مطمئن هستید که می خواهید برای انکار این منظور <b>از٪ s؟</b>
+ConfirmCancelThisOrder=آیا مطمئن هستید که می خواهید به لغو این منظور <b>از٪ s؟</b>
 AddCustomerOrder=ایجاد سفارش مشتری
 AddCustomerInvoice=ایجاد فاکتور مشتری
 AddSupplierOrder=ایجاد نظم عرضه کننده کالا
 AddSupplierInvoice=ایجاد کننده کالا فاکتور
-ListOfSupplierProductForSupplier=لیست محصولات و قیمت ها را برای عرضه کننده کالا <b>از%s</b>
-NoneOrBatchFileNeverRan=هیچ و یا دسته ای <b>از%s</b> فرار نمی اخیرا
+ListOfSupplierProductForSupplier=لیست محصولات و قیمت ها را برای عرضه کننده کالا <b>از٪ s</b>
+NoneOrBatchFileNeverRan=هیچ و یا دسته ای <b>از٪ s</b> فرار نمی اخیرا
 SentToSuppliers=ارسال شده به تامین کنندگان
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
index 6143a83387f..5cefadd2e55 100644
--- a/htdocs/langs/fa_IR/trips.lang
+++ b/htdocs/langs/fa_IR/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=سفر
 ListTripsAndExpenses=فهرست سفر و هزینه های عملیاتی
 ExpensesArea=سفر و هزینه های عملیاتی منطقه
 SearchATripAndExpense=جستجوی یک سفر و هزینه
+ClassifyRefunded=Classify 'Refunded'
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=منظور ایستاده٪ بازدید کنندگان شده است توسط بانک پرداخت می شود <br> اطلاعات پرداخت:%s را
+InfoCreditMessage=منظور ایستاده٪ بازدید کنندگان شده است توسط بانک پرداخت می شود <br> اطلاعات پرداخت:٪ s را
 InfoTransSubject=انتقال ایستاده منظور٪ به بانک
-InfoTransMessage=منظور ایستاده%s بر به بانک توسط%s%s ارسال شد. <br><br>
-InfoTransData=مقدار:%s را <br> روش: از%s <br> تاریخ:%s را
+InfoTransMessage=منظور ایستاده٪ s بر به بانک توسط٪ s٪ s ارسال شد. <br><br>
+InfoTransData=مقدار:٪ s را <br> روش: از٪ s <br> تاریخ:٪ s را
 InfoFoot=این یک پیام خودکار ارسال شده توسط Dolibarr است
 InfoRejectSubject=منظور ایستاده خودداری کرد
-InfoRejectMessage=سلام، <br><br> به ترتیب ایستاده از فاکتور%s را مربوط به شرکت٪، با میزان٪ بازدید کنندگان شده است توسط بانک خودداری کرد. <br><br> - <br> از%s
+InfoRejectMessage=سلام، <br><br> به ترتیب ایستاده از فاکتور٪ s را مربوط به شرکت٪، با میزان٪ بازدید کنندگان شده است توسط بانک خودداری کرد. <br><br> - <br> از٪ s
 ModeWarning=انتخاب برای حالت واقعی تنظیم نشده بود، ما بعد از این شبیه سازی را متوقف کند
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 6bee4f50389..311fd107278 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Virhe Tätä moduulia edellyttää Dolibarr ve
 ErrorDecimalLargerThanAreForbidden=Virhe, tarkkuuden suurempi <b>kuin %s</b> ei ole tuettu.
 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)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Laatikot
 MaxNbOfLinesForBoxes=Max määrä rivit laatikot
 PositionByDefault=Oletus jotta
-Position=Tilata
+Position=Position
 MenusDesc=Valikot johtajien määritellä sisältö, 2 valikkopalkki tangot (rekki ja vertikaalisten bar).
 MenusEditorDesc=Valikon editorin avulla voit määritellä henkikökohtaiset merkinnät valikoissa. Käytä sitä huolellisesti välttää dolibarr epävakaa ja valikkoon rivit pysyvästi saavuttamaton. <br> Jotkut moduulit lisätä merkintöjä valikot (valikossa <b>Kaikki</b> useimmissa tapauksissa). Jos olet poistanut joitakin näistä merkinnöistä vahingossa, voit palauttaa ne pois ja reenabling moduulin.
 MenuForUsers=Valikko käyttäjille
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automaattinen, jos JavaScript ei ole käytössä
 AvailableOnlyIfJavascriptNotDisabled=Käytettävissä vain, jos JavaScript ei ole poistettu
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Käytettävissä vain, jos JavaScript ei ole poistettu
 Required=Vaadittu
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Turvallisuus
 Passwords=Salasanat
 DoNotStoreClearPassword=Onko mitään salasanoja vuonna selväksi tietokantaan
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (Ei määritelty osaksi
 MAIN_MAIL_EMAIL_FROM=Lähettäjän e-mail automaattisen sähköpostit (oletusarvoisesti <b>php.ini: %s)</b>
 MAIN_MAIL_ERRORS_TO=Lähettäjän e-mail käytetään virheiden palaa lähetetyt sähköpostit
 MAIN_MAIL_AUTOCOPY_TO= Lähetä järjestelmällisesti piilotettu hiili-kopio kaikki lähetetyt sähköpostit
+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=Poista kaikki sähköpostiviestit sendings (testi-tai demos)
 MAIN_MAIL_SENDMODE=Menetelmä käyttää lähettäessään Sähköpostit
 MAIN_MAIL_SMTPS_ID=SMTP tunnus, jos vaaditaan
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce suoraan
-Module800Desc=Liitäntä osoittavat OSCommerce tai OSCSS liikkeen kautta suoraan tietokantaan pääsy
-Module900Name=OSCommerce se oli
-Module900Desc=Liitäntä osoittavat OSCommerce liikkeen kautta web-palveluja. \\ NTämä moduuli requiere voit asentaa komponentteja / oscommerce_ws / ws_server osaksi OSCommerce palvelimeen. Katso README-tiedosto / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis yhdentyminen
 Module1400Name=Kirjanpidon asiantuntija
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Luoda / muuttaa sosiaaliturvamaksut ja alv
 Permission93=Poista sosiaaliturvamaksut ja alv
 Permission94=Vienti sosiaaliturvamaksut
 Permission95=Lue raportit
-Permission96=Setup lähetyskeskukset
-Permission97=Lue laskun kirjanpitotietojen lähetyskeskukset
-Permission98=Lähetysvaihetta laskun n kirjanpitotapahtumaa
 Permission101=Lue sendings
 Permission102=Luoda / muuttaa sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Ammatillinen tunnus ainutlaatuinen
 MustBeUnique=Täytyy olla ainutlaatuinen?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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 <br> <b>%% 1 $ s</b> qui seerumien remplac par le tlphone de <b>l'appelbr&gt;%%</b> 2 $ s qui seerumien remplac par le tlphone de l'appelant (le votre) <br> <b>%% 3 $ s</b> qui seerumien remplac par votre sisäänkirjoittautumissivuksesi clicktodial (dfini sur votre fiche utilisateur) <br> <b>%% 4</b> $ s qui seerumien remplac par votre mot de elähtänyt clicktodial (dfini sur votre fiche utilisateur).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 7a94e8ef211..88c4c033422 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Toimet
 ActionsArea=Toimien alueella (tapahtumat ja tehtävät)
-Agenda= Agenda
-Agendas= Esityslistat
-Calendar= Kalenteri
-Calendars= Kalenterit
-LocalAgenda=Paikallinen kalenteri
-AffectedTo= Vaikuttaa
-DoneBy= Tekemiäni
-Events= Tapahtumat
+Agenda=Agenda
+Agendas=Esityslistat
+Calendar=Kalenteri
+Calendars=Kalenterit
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Vaikuttaa
+DoneBy=Tekemiäni
+Event=Event
+Events=Tapahtumat
 EventsNb=Number of events
 MyEvents=My tapahtumia
 OtherEvents=Muut tapahtumat
@@ -17,31 +19,33 @@ ListOfActions=Luettelo tapahtumista
 Location=Sijainti
 EventOnFullDay=Tapahtuma on koko päivä
 SearchAnAction= Haku toimintasuunnitelma / tehtävä
-MenuToDoActions= Kaikki puutteelliset toimet
-MenuDoneActions= Kaikki irti toimia
-MenuToDoMyActions= Oma puutteellisia toimia
-MenuDoneMyActions= Oma irtisanotaan toimia
-ListOfEvents= Luettelo Dolibarr tapahtumat
+MenuToDoActions=Kaikki puutteelliset toimet
+MenuDoneActions=Kaikki irti toimia
+MenuToDoMyActions=Oma puutteellisia toimia
+MenuDoneMyActions=Oma irtisanotaan toimia
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Toimet kirjattava
 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
 ViewCal=Näytä kalenteri
 ViewDay=Päivä näkymä
 ViewWeek=Viikkonäkymä
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Näytä ennalta suodattimet
 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
@@ -49,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
@@ -57,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ää
@@ -68,19 +69,24 @@ DateActionStart= Aloituspäivämäärä
 DateActionEnd= Lopetuspäivä
 AgendaUrlOptions1=Voit myös lisätä seuraavat parametrit suodattaa output:
 AgendaUrlOptions2=<b>login=<b>login= %s</b> rajoittaa tuotannon toimiin luotu, vaikuttaa tavalla tai tehdä <b>käyttäjä %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s</b> rajoittaa tuotannon toimiin luotu <b>käyttäjän %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=<b>logint= %s</b> rajoittaa tuotannon toimet vaikuttavat <b>käyttäjän %s.</b>
-AgendaUrlOptions5=<b>logind=<b>sisäänkirj= %s</b> rajoittaa tuotannon toimet tehdään <b>käyttäjän %s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Näytä syntymäpäivä yhteyksiä
 AgendaHideBirthdayEvents=Piilota syntymäpäivä yhteyksiä
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Vie kalenteri
 ExtSites=Tuo ulkoinen kalenterit
-ExtSitesEnableThisTool=Näytä ulkoinen kalenterit otetaan asialistalle
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Määrä kalenterit
 AgendaExtNb=Kalenteri nb %s
 ExtSiteUrlAgenda=URL päästä. ICal-tiedostona
 ExtSiteNoLabel=Ei kuvausta
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 436f09e71ca..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=<b>Luoton merkintä</b> 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). <br><br> 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,16 +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. <br> 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. <br> 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=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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Oletko varma, että haluat peruuttaa <b>laskun %s?</b>
 ConfirmCancelBillQuestion=Miksi haluat luokitella tämän kauppalaskuilmoituksen "hylätty"?
 ConfirmClassifyPaidPartially=Oletko varma, että haluat muuttaa <b>laskun %s</b> tila maksetaan?
 ConfirmClassifyPaidPartiallyQuestion=Tämä lasku ei ole maksanut kokonaan. Mitkä ovat syyt voit sulkea tämän laskun?
-ConfirmClassifyPaidPartiallyReasonAvoir=Jäävä palkka <b>( %s %s)</b> on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. I säännönmukaistaa alv luotto-merkintä.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Jäävä palkka <b>( %s %s)</b> on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. Hyväksyn menettää alv-alennusta.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Jäävä palkka <b>( %s %s)</b> on alennus myönnettiin, koska maksu suoritettiin ennen aikavälillä. I perittävä alv-alennus ilman luotto-merkintä.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount tarjotaan (maksu ennen aikavälillä)
-SendBillRef=Lähetä lasku %s
-SendReminderBillRef=Lähetä lasku %s (muistutus)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Pysyvän tilaukset
 StandingOrder=Kestotilaus
 NoDraftBills=Ei Luonnos laskut
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Yhteensä kaksi uutta alennus on oltava alk
 ConfirmRemoveDiscount=Oletko varma, että haluat poistaa tämän edullisista?
 RelatedBill=Related lasku
 RelatedBills=Related laskut
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
 
 # PaymentConditions
 PaymentConditionShortRECEP=Välittömät
@@ -393,7 +393,7 @@ ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid
 AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;.
 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 e7a6848faa1..7fcb659df3b 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -16,7 +16,7 @@ SuppliersCategoriesArea=Toimittajien luokkiin alue
 CustomersCategoriesArea=Asiakkaiden kategoriat alueella
 ThirdPartyCategoriesArea=Kolmansien osapuolten luokkiin alue
 MembersCategoriesArea=Jäsenet luokat alue
-# ContactsCategoriesArea=Contacts categories area
+ContactsCategoriesArea=Contacts categories area
 MainCats=Pääryhmään
 SubCats=Alaluokat
 CatStatistics=Tilastot
@@ -50,15 +50,15 @@ SupplierIsInCategories=Kolmas osapuoli omistaa seuraavien toimittajien tuoteryhm
 CompanyIsInCustomersCategories=Tämä kolmas osapuoli omistaa seuraavien asiakkaat / näkymät tuoteryhmät
 CompanyIsInSuppliersCategories=Tämä kolmas osapuoli omistaa seuraavien toimittajien tuoteryhmät
 MemberIsInCategories=Tämä jäsen omistaa seuraaville jäsenille ryhmiin
-# ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=This contact owns to following contacts categories
 ProductHasNoCategory=Tämä tuote / palvelu ei ole mitään luokkia
 SupplierHasNoCategory=Tämä toimittaja ei ole mitään luokkia
 CompanyHasNoCategory=Tämä yritys ei ole mitään luokkia
 MemberHasNoCategory=Tämä jäsen ei ole mitään luokkiin
-# ContactHasNoCategory=This contact is not in any categories
+ContactHasNoCategory=This contact is not in any categories
 ClassifyInCategory=Luokitella luokkaan
 NoneCategory=Ei mitään
-# NotCategorized=Without category
+NotCategorized=Without category
 CategoryExistsAtSameLevel=Tämä luokka on jo olemassa samassa paikassa
 ReturnInProduct=Takaisin tuotteen / palvelun kortti
 ReturnInSupplier=Palaa toimittaja-kortti
@@ -66,7 +66,7 @@ ReturnInCompany=Palaa asiakas / näköpiirissä kortti
 ContentsVisibleByAll=Sisältö näkyy kaikkien
 ContentsVisibleByAllShort=Sisällys näkyviin kaikki
 ContentsNotVisibleByAllShort=Sisältö ei näy kaikissa
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=Poista luokka
 ConfirmDeleteCategory=Oletko varma, että haluat poistaa tämän luokan?
 RemoveFromCategory=Poista yhteys Categorie
@@ -81,12 +81,12 @@ CustomersCategoriesShort=Asiakkaat tuoteryhmät
 CustomersProspectsCategoriesShort=Custo. / prosp. luokat
 ProductsCategoriesShort=Tuotteet Tuoteryhmät
 MembersCategoriesShort=Jäsenet luokat
-# ContactCategoriesShort=Contacts categories
+ContactCategoriesShort=Contacts categories
 ThisCategoryHasNoProduct=Tämä kategoria ei sisällä mitään tuotetta.
 ThisCategoryHasNoSupplier=Tämä kategoria ei sisällä mitään toimittaja.
 ThisCategoryHasNoCustomer=Tämä kategoria ei sisällä asiakkaalle.
 ThisCategoryHasNoMember=Tämä kategoria ei sisällä mitään jäsen.
-# ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Annetaan asiakkaalle
 AssignedToTheCustomer=Annetaan asiakkaan
 InternalCategory=Inernal luokka
@@ -96,18 +96,17 @@ CatSupList=Luettelo toimittaja tuoteryhmät
 CatCusList=Luettelo asiakas / näköpiirissä tuoteryhmät
 CatProdList=Luettelo tuotteista tuoteryhmät
 CatMemberList=Jäsenlista luokkien
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 3f08cafba50..213d6d299c2 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Sinun on luotava sähköpostit yhteyksiä kolmannen os
 ListSuppliersShort=Luettelo toimittajat
 ListProspectsShort=Luettelo näkymät
 ListCustomersShort=Luettelo asiakkaiden
-ThirdPartiesArea=Kolmannet osapuolet alue
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Viimeksi %s muutettu kolmansien osapuolten
 UniqueThirdParties=Yhteensä ainutlaatuinen kolmannen osapuolen
 InActivity=Avoinna
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Paluu numero on muodossa %syymm-nnnn asiakkaan koodi ja %syymm-nnnn luovuttajalle koodi jos VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0.
 LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi voidaan muuttaa milloin tahansa.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 585b9bac3f8..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 33a50fd202b..597852e41b8 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -1,114 +1,86 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
-#
-About = Noin
-# CronAbout = About Cron
-# CronAboutPage = Cron about page
-
-#
+About = Yleisesti
+CronAbout = Yleisesti Cronista
+CronAboutPage = Cron yleisesti sivu
 # Right
-#
-# Permission23101 = Read Scheduled task
-# Permission23102 = Create/update Scheduled task
-# Permission23103 = Delete Scheduled task
-# Permission23104 = Execute Scheduled task
-
-#
+Permission23101 = Hae ajastetut tehtävät
+Permission23102 = Luo/päivitä ajastettu tehtävä
+Permission23103 = Poista ajastettu tehtävä
+Permission23104 = Suorita ajastettu tehtävä
 # 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= Ajastettujen tehtävien asetusten hallinta
+URLToLaunchCronJobs=URL-osoite ajastettujen tehtävien tarkistamiseen ja ajamiseen tarvittaessa
+OrToLaunchASpecificJob=Tai tietyn tehtävän tarkistamiseen ja ajamiseen
+KeyForCronAccess=Turva avain ajastettujen  tehtävien ajamiseen URL-sta
+FileToLaunchCronJobs=Ajastettujen tehtävien komentorivi
+CronExplainHowToRunUnix=Unix ympäristössä sinun tulee käyttää crontabia ajaaksesi komnetoriviä joka minuutti
+CronExplainHowToRunWin=Microsoft(tm) Windows ympäristössä voit käyttää ajastetut tehtävät -työkalua ajaaksesi komentorivin minuuteittain
 # 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=Hylättyjen tehtävien lista
 # 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=Viimeinen ajo
+CronLastOutput=Viimeisen ajon tulostus
+CronLastResult=Viimeisen tuloksen koodi
+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= Ei mitään
 CronDtStart=Aloituspäivämäärä
 CronDtEnd=Lopetuspäivä
-# CronDtNextLaunch=Next execution
-# CronDtLastLaunch=Last execution
-# CronFrequency=Frequancy
-# CronClass=Classe
+CronDtNextLaunch=Next execution
+CronDtLastLaunch=Last execution
+CronFrequency=Frequancy
+CronClass=Classe
 CronMethod=Menetelmä
 CronModule=Moduuli
-# CronAction=Action
+CronAction=Action
 CronStatus=Tila
 CronStatusActive=Enabled
 CronStatusInactive=Disabled
-# CronNoJobs=No jobs registered
+CronNoJobs=No jobs registered
 CronPriority=Prioriteetti
 CronLabel=Kuvaus
-# 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=Parametrit
-# CronSaveSucess=Save succesfully
+CronSaveSucess=Save succesfully
 CronNote=Kommentti
-# 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=Poistaa käytöstä
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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/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 cf4a35da27f..85d041a84cf 100644
--- a/htdocs/langs/fi_FI/donations.lang
+++ b/htdocs/langs/fi_FI/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Lahjoitus
 Donations=Lahjoitukset
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=Rahoittajien
 Donors=Luovuttajat
-AddDonation=Lisää lahjoitus
+AddDonation=Create a donation
 NewDonation=Uusi lahjoitus
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=Gift lupaus
 PromisesNotValid=Ei validoitava lupaukset
 PromisesValid=Validoidut lupaukset
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Vedos
 DonationStatusPromiseValidatedShort=Validoidut
 DonationStatusPaidShort=Vastatut
 ValidPromess=Vahvista lupaus
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=Rakenna vastaanottamisesta
 DonationsModels=Asiakirjat malleja lahjoitus kuitit
 LastModifiedDonations=Viimeksi %s muutettu lahjoitukset
 SearchADonation=Etsi lahjoitus
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 1df5c5123fa..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 &quot;%s&quot; parametrien väärä &quot;%s&quot;
-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 &quot;%s&quot; 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 <b>sisäänkirjoittautumissivuksesi %s</b
 ErrorLoginHasNoEmail=Tämä käyttäjä ei ole sähköpostiosoitetta. Process aborted.
 ErrorBadValueForCode=Bad arvotyypeillä koodin. Yritä uudelleen uuteen arvoon ...
 ErrorBothFieldCantBeNegative=Kentät %s ja %s voi olla sekä kielteisiä
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Käyttäjätili <b>%s</b> käyttää myös toteuttaa web-palvelimella ei ole lupaa, että
 ErrorNoActivatedBarcode=Ei viivakoodin tyyppi aktivoitu
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
index 73c3a74893f..09fb3e3dd41 100644
--- a/htdocs/langs/fi_FI/exports.lang
+++ b/htdocs/langs/fi_FI/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Tilinumero
 BankAccountNumberKey=Avain
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
diff --git a/htdocs/langs/fi_FI/externalsite.lang b/htdocs/langs/fi_FI/externalsite.lang
index 124c4a4411a..565918db18f 100644
--- a/htdocs/langs/fi_FI/externalsite.lang
+++ b/htdocs/langs/fi_FI/externalsite.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup linkki ulkoiseen sivustolla
-ExternalSiteURL=Ulkoinen Sivuston URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+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 45287c46ec2..67fd6390553 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Vapaapäivät
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=Sinun täytyy aktivoida lomat -moduuli nähdäksesi tämän sivun.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=Sinulla ei ole voimassa olevaa lomatoivomusta.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Työntekijä
 DateDebCP=Aloituspäivämäärä
 DateFinCP=Lopetuspäivä
@@ -18,24 +18,24 @@ ApprovedCP=Hyväksytty
 CancelCP=Peruttu
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Kuvaus
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Muokkaa
 DeleteCP=Poistaa
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Peruuta
 StatutCP=Tila
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Päivittää
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Syy
 UserCP=Käyttäjä
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Luo
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Päivittää
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 57adbc177ae..ed864f6244a 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Me yritimme tehdä Dolibarr setup mahdollisimman helppoa. Seuraa ohjeita vaihe vaiheelta.
-MiscellaneousChecks=Esitiedot tarkistaa
-DolibarrWelcome=Tervetuloa Dolibarr
-ConfFileExists=Configuration <b>file %s</b> on olemassa.
-ConfFileDoesNotExists=Configuration <b>file %s</b> ei ole olemassa!
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration <b>file %s</b> ei ole olemassa, ja ei voi luoda!
-ConfFileCouldBeCreated=Configuration <b>file %s</b> voitaisiin luoda.
-ConfFileIsNotWritable=Kokoonpano <b>tiedostoa %s</b> ei ole kirjoitettavissa. Tarkista käyttöoikeudet. Ensimmäistä kertaa asentaa, verkkopalvelimesi on myönnettävä voi kirjoittaa tämä tiedosto aikana asennusprosessi ( "chmod 666" esimerkiksi Unix kuten OS).
+InstallEasy=Seuraa ohjeita askel askeleelta.
+MiscellaneousChecks=Ehtojen tarkistus
+DolibarrWelcome=Tervetuloa Dolibarriin
+ConfFileExists=Asetustiedosto <b>%s</b> on olemassa.
+ConfFileDoesNotExists=Asetustiedosto <b>%s</b> ei ole olemassa!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Asetustiedostoa <b>%s</b> ei ole olemassa, ja sitä ei voi luoda!
+ConfFileCouldBeCreated=Asetustiedosto <b>%s</b> voitaisiin luoda.
+ConfFileIsNotWritable=Asetustiedosto <b>%s</b> ei ole kirjoitettavissa. Tarkista käyttöoikeudet. Ensimmäistä kertaa asennettaessa, verkkopalvelimesi on annettava kirjoituslupa tämän asetusprosessin aikana asennus ( esimerkiksi "chmod 666"  Unix tyylisisä OSsiessa).
 ConfFileIsWritable=Configuration <b>file %s</b> on kirjoitettavissa.
-ConfFileReload=Päivitä kaikki tiedot asetustiedosto.
+ConfFileReload=Uudelleen lataa kaikki tiedot asetustiedostosta.
 PHPSupportSessions=Tämä PHP tukee istuntoja.
 PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja GET.
 PHPSupportPOSTGETKo=On mahdollista, sinun PHP asennusohjelma ei tue muuttujat POST tai GET. Tarkista parametri <b>variables_order</b> vuonna php.ini.
@@ -207,5 +207,5 @@ MigrationActioncommElement=Päivitä tiedot toimista
 MigrationPaymentMode=Tiedot muuttoliike maksua tilassa
 MigrationCategorieAssociation=Kategorioiden siirto 
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Näytä ei saatavilla olevat valinnat
+HideNotAvailableOptions=Piilota ei saatavilla olevat valinnat
diff --git a/htdocs/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang
index 413754a5d1e..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
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=Oletko varma, että haluat poistaa tämän interve
 NameAndSignatureOfInternalContact=Nimi ja allekirjoitus puuttua:
 NameAndSignatureOfExternalContact=Nimi ja allekirjoitus asiakas:
 DocumentModelStandard=Vakioasiakirja malli interventioiden
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Luokitella &quot;Laskutetaan&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=Generic numero malli
 ArcticNumRefModelError=Epäonnistui aktivoida
 PacificNumRefModelDesc1=Paluu numero on muodossa %syymm-nnnn jossa VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0
 PacificNumRefModelError=Interventiokynnyksen kortin alkaen $ syymm jo olemassa, ja ei ole yhteensopiva tämän mallin järjestyksessä. Poistaa sen tai nimetä sen aktivoida tämän moduulin.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>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<br/>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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Voit maksaa luottokortilla tai PayPal, klikkaa painiketta sivun alalaidassa. <br>
-# 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 <b>%s</
 ConfirmCancelOrder=Oletko varma, että haluat peruuttaa tämän tilauksen?
 ConfirmMakeOrder=Oletko varma, että haluat vahvistaa olet tehnyt tämän <b>tilauksen %s?</b>
 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. <br><br> 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 9163fdf5791..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
@@ -80,11 +80,12 @@ ContractStatusClosed=Suljettu
 ContractStatusRunning=Running
 ContractStatusExpired=lakkaa
 ContractStatusOnHold=Ole käynnissä
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=Tämä sopimus ei ole käynnissä
 ErrorProductAlreadyExists=Tuotteen viitaten %s on jo olemassa.
 ErrorProductBadRefOrLabel=Väärä arvo viite-tai etiketissä.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Tavarantoimittajat
 SupplierRef=Toimittaja ref.
 ShowProduct=Näytä tuote
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Klooni tuotteen tai palvelun
 ConfirmCloneProduct=Oletko varma, että haluat klooni tuotteen tai <b>palvelun %s?</b>
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 5d86143c191..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
@@ -85,13 +87,13 @@ ActionsOnProject=Toimien hanketta
 YouAreNotContactOfProject=Et ole kosketuksissa tämän yksityisen hankkeen
 DeleteATimeSpent=Poista käytetty aika
 ConfirmDeleteATimeSpent=Oletko varma että haluat poistaa tämän aika?
-DoNotShowMyTasksOnly=Katso myös tehtävien En vaikuteta
-ShowMyTasksOnly=Näytä vain tehtäviä olen vaikuttaa
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Hankkeet omistettu tälle kolmannelle
 NoTasks=Ei tehtävät hankkeen
 LinkedToAnotherCompany=Liittyy muihin kolmannen osapuolen
-TaskIsNotAffectedToYou=Tehtävä ei ole kohdistettu sinua
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Käytetty aika on tyhjä
 ThisWillAlsoRemoveTasks=Tämä toiminto poistaa myös kaikki tehtävät projektin <b>(%s</b> tehtävät tällä hetkellä) ja kaikki panokset käytetty aika.
 IfNeedToUseOhterObjectKeepEmpty=Jos jotkin esineet (lasku, tilaus, ...), jotka kuuluvat toiselle kolmannelle osapuolelle, on liityttävä hankkeeseen luoda, pitää tämä tyhjä saada hanke on multi kolmansille osapuolille.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Täydellinen hankkeen tarkastusraportin malli (logo. ..)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 c855359a862..01f15eedb3b 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=Viimeisin %s sendings
 SearchASending=Haku lähettävä
 StatisticsOfSendings=Tilastot sendings
 NbOfSendings=Lukumäärä sendings
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Lähetysvalinnat-kortti
 NewSending=Uusi lähettäminen
 CreateASending=Luo lähettäminen
@@ -50,27 +50,31 @@ Enlevement=Saanut asiakkaan
 DocumentModelSimple=Yksinkertaisen mallin
 DocumentModelMerou=Merou A5 malli
 WarningNoQtyLeftToSend=Varoitus, ei tuotteet odottavat lähettämistä.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Höylätty toimituspäivämäärä
 DateReceived=Päivämäärä toimitus sai
 SendShippingByEMail=Lähetä lähetys sähköpostitse
-SendShippingRef=Lähetä lähetys %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Tapahtumat lähetystä
 LinkToTrackYourPackage=Linkki seurata pakettisi
 ShipmentCreationIsDoneFromOrder=Tällä hetkellä uuden lähetys tehdään tilauksesta kortin.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Yksinkertaisen mallin toimitusten kuitit
 DocumentModelTyphon=Täydellisempi mallin toimitusten kuitit (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Jatkuva EXPEDITION_ADDON_NUMBER ei määritelty
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/fi_FI/shop.lang b/htdocs/langs/fi_FI/shop.lang
deleted file mode 100644
index cef02012db1..00000000000
--- a/htdocs/langs/fi_FI/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Viimeisin tilaukset
-OnStandBy=Valmiustilassa
-TreatmentInProgress=Käsittely kehitykseen
-LastCustomers=Viimeisin asiakkaille
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index 137e021fd2a..034f9fd1652 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Luo toimittajan laskun
 ListOfSupplierProductForSupplier=Luettelo tuotteista ja hinnoista <b>toimittaja %s</b>
 NoneOrBatchFileNeverRan=Ei mitään tai <b>erän %s</b> ei juoksi hiljattain
 SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
index 4a62a60475d..c8c22dcbe9e 100644
--- a/htdocs/langs/fi_FI/trips.lang
+++ b/htdocs/langs/fi_FI/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Matka
 ListTripsAndExpenses=Luettelo matkat ja kulut
 ExpensesArea=Retket ja kulut alue
 SearchATripAndExpense=Etsi matka-ja kulut
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..4ba112f6ba7
--- /dev/null
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Comptabilité
+Globalparameters=Paramètres globaux
+Chartofaccounts=Plan comptable
+Fiscalyear=Années fiscales
+Menuaccount=Comptes comptables
+Menuthirdpartyaccount=Comptes de tiers
+MenuTools=Outils
+
+ConfigAccountingExpert=Configuration du module comptabilité expert
+Journaux=Journaux
+JournalFinancial=Journaux financiers
+Exports=Exports
+Modelcsv=Modèle d'export
+Selectmodelcsv=Sélectionner un modèle d'export
+Modelcsv_normal=Export standard
+Modelcsv_CEGID=Export vers CEGID Expert
+BackToChartofaccounts=Retour au plan comptable
+Back=Retour
+
+Definechartofaccounts=Définir un plan comptable
+Selectchartofaccounts=Sélectionner un plan comptable
+Validate=Valider
+Addanaccount=Ajouter un compte comptable
+AccountAccounting=Compte comptable
+Ventilation=Ventilation
+ToDispatch=A ventiler
+Dispatched=Ventilés
+
+CustomersVentilation=Ventilation clients
+SuppliersVentilation=Ventilation fournisseurs
+TradeMargin=Marge commerciale
+Reports=Rapports
+ByCustomerInvoice=Par factures clients
+ByMonth=Par mois
+NewAccount=Nouveau compte comptable
+Update=Modifier
+List=Liste
+Create=Créer
+UpdateAccount=Modification de compte comptable
+UpdateMvts=Modification de mouvements
+WriteBookKeeping=Enregistrer les écritures dans le grand livre
+Bookkeeping=Grand livre
+AccountBalanceByMonth=Solde par mois
+
+AccountingVentilation=Ventilation comptable
+AccountingVentilationSupplier=Ventilation comptable client
+AccountingVentilationCustomer=Ventilation comptable fournisseur
+Line=Ligne
+
+CAHTF=Total achats fournisseur HT
+InvoiceLines=Lignes de factures à ventiler
+InvoiceLinesDone=Lignes de factures ventilées
+IntoAccount=Dans le compte comptable
+
+Ventilate=Ventiler
+VentilationAuto=Ventilation automatique
+
+Processing=Traitement en cours
+EndProcessing=Fin du traitement
+AnyLineVentilate=Aucune ligne à ventiler
+SelectedLines=Lignes sélectionnées
+Lineofinvoice=Ligne de la facture
+VentilatedinAccount=Ventilé avec succès dans le compte comptable
+NotVentilatedinAccount=Non ventilé dans le compte comptable
+
+ACCOUNTING_SEPARATORCSV=Séparateur CSV
+
+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=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=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=Compte comptable de tranfert
+ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente
+
+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=Référence
+Numerocompte=Compte
+Code_tiers=Tiers
+Labelcompte=Libellé du compte
+Debit=Débit
+Credit=Crédit
+Amount=Montant
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Supprimer les écritures du grand livre
+
+SellsJournal=Journal des ventes
+PurchasesJournal=Journal des achats
+DescSellsJournal=Journal des ventes
+DescPurchasesJournal=Journal des achats
+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=Règlement espèce
+
+SupplierInvoicePayment=Paiement de facture fournisseur
+CustomerInvoicePayment=Paiement de facture client
+
+ThirdPartyAccount=Comptes de tiers
+
+NewAccountingMvt=Nouveau mouvement
+NumMvts=Nombre de mouvement
+ListeMvts=Liste des mouvements
+ErrorDebitCredit=Débit et crédit ne peuvent pas avoir la même valeur en même temps.
+
+ReportThirdParty=Liste compte tiers
+DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables
+
+ListAccounts=Liste des comptes comptables
+
+Pcgversion=Version du plan
+Pcgtype=Classe de compte
+Pcgsubtype=Sous classe de compte
+Accountparent=Racine des comptes
+Active=Relevé
+
+NewFiscalYear=Nouvelle année fiscale
+
+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=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=Valider Automatiquement
+
+ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
+
+FicheVentilation=Fiche ventilation
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 1624a8222bd..13c55401371 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Erreur, ce module requiert une version %s ou s
 ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à <b>%s</b> ne sont pas prises en charge.
 DictionarySetup=Dictionnaires
 Dictionary=Dictionnaires
+Chartofaccounts=Plan comptable
+Fiscalyear=Année fiscale
 ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements
 ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0
 DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text).
@@ -54,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
@@ -65,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
@@ -133,7 +137,7 @@ Box=Boîte
 Boxes=Boîtes
 MaxNbOfLinesForBoxes=Nombre max de lignes pour les boîtes
 PositionByDefault=Position par défaut
-Position=Ordre
+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.
 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.<br>Certains modules ajoutent des entrées personnalisées aux menus (dans le menu <b>Tous</b> 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
@@ -167,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 <a href="%s">ici</a>.
-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
@@ -176,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
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatique si Javascript est désactivé
 AvailableOnlyIfJavascriptNotDisabled=Disponible uniquement si Javascript activé
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible uniquement si Javascript activé
 Required=Requis
+UsedOnlyWithTypeOption=Utilisé par certaines options de l'agenda uniquement
 Security=Sécurité
 Passwords=Mots de passe
 DoNotStoreClearPassword=Ne pas stocker de mots de passe en clair dans la base (Activation recommandée)
@@ -249,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: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom d'hôte ou adresse IP du serve
 MAIN_MAIL_EMAIL_FROM=Adresse email de l'émetteur pour l'envoi d'emails automatiques (Par défaut dans php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Adresse email utilisée pour les retours d'erreurs des emails envoyés
 MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée des emails envoyés à
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Envoyer systématiquement une copie cachée des propositions envoyées par email à
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Envoyer systématiquement une copie cachée des commandes envoyées par emails à
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Envoyer systématiquement une copie cachée des factures envoyées par email à
 MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode test ou démos)
 MAIN_MAIL_SENDMODE=Méthode d'envoi des emails
 MAIN_MAIL_SMTPS_ID=Identifiant d'authentification SMTP si authentification SMTP requise
@@ -314,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).<br>Ce doit être la valeur octale (par exemple 0666 signifie lecture/écriture pour tous).<br>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 "<b>Besoin d'un support ou aide</b>" sur la page de connexion
+DisableLinkToHelpCenter=Cacher le lien «<b>Besoin d'aide ou d'assistance</b>» sur la page de connexion
 DisableLinkToHelp=Cacher le lien "<b>%s Aide en ligne</b>" 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é
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales
 Module510Name=Salaires
 Module510Desc=Gestion des paiements des salaires des employés
 Module600Name=Notifications
-Module600Desc=Envoi de notifications (par email) aux contacts de tiers sur certains événements métiers
+Module600Desc=Envoi de notifications Email sur certains événements métiers Dolibarr, aux contacts de tiers (configuration réalisé sur chaque tiers)
 Module700Name=Dons
 Module700Desc=Gestion des dons
-Module800Name=OSCommerce direct
-Module800Desc=Interface de visualisation d'une boutique OSCommerce ou OSCSS par accès direct en base
-Module900Name=OSCommerce by WS
-Module900Desc=Interface de visualisation d'une boutique OSCommerce par accès via des Web services. Ce module requiert d'installer les fichiers de /oscommerce_ws/ws_server sur OSCommerce. Voir fichier README dans /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Interface avec le bug tracker Mantis
 Module1400Name=Comptabilité
@@ -493,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
@@ -501,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
@@ -512,16 +521,20 @@ Module5000Name=Multi-société
 Module5000Desc=Permet de gérer plusieurs sociétés
 Module6000Name=Workflow
 Module6000Desc=Gérer le Workflow
-Module20000Name=Congés
+Module20000Name=Gestion de la demande de congès
 Module20000Desc=Déclaration et suivi des congès des employés
+Module39000Name=Lot
+Module39000Desc=Gestion des lots et numéro de série, et date de péremption sur les produits
 Module50000Name=PayBox
 Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox
 Module50100Name=Point de vente
 Module50100Desc=Caisse enregistreuse de point de vente
-Module50200Name= Paypal
-Module50200Desc= Module permettant d'offrir en ligne une page de paiement par carte de crédit avec Paypal
+Module50200Name=Paypal
+Module50200Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec Paypal
+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
@@ -534,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
@@ -575,9 +588,6 @@ Permission92=Créer/modifier les charges et la TVA
 Permission93=Supprimer les charges et la TVA
 Permission94=Exporter les charges
 Permission95=Consulter CA, bilans et résultats
-Permission96=Paramétrer la ventilation
-Permission97=Lire les lignes de factures
-Permission98=Ventiler les lignes de factures
 Permission101=Consulter les expéditions
 Permission102=Créer/modifier les expéditions
 Permission104=Valider les expéditions
@@ -603,15 +613,16 @@ 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
-Permission171=Consulter les déplacements
-Permission172=Créer/modifier les déplacements
-Permission173=Supprimer les déplacements
-Permission178=Exporter les déplacements
+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
+Permission174=Lire toutes les notes de frais
+Permission178=Exporter les notes de frais / déplacements
 Permission180=Consulter les fournisseurs
 Permission181=Consulter les commandes fournisseurs
 Permission182=Créer/modifier les commandes fournisseurs
@@ -634,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
@@ -668,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
@@ -698,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
@@ -720,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)
@@ -775,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 :<br>Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>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.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.<br>Sinon TVA proposée par défaut=0. Fin de règle.<br>
+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 :<br>Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>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.<br>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.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.<br>Sinon TVA proposée par défaut=0. Fin de règle.<br>
 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.
@@ -884,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
@@ -1025,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 <b>-ba</b> (paramètre <b>mail.force_extra_parameters</b> dans le fichier <b>php.ini</b>). Si certains de vos destinataires ne reçoivent pas de message, essayer de modifier ce paramètre PHP avec <b>mail.force_extra_parameters = -ba</b>.
 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:<br>* Soit de manière globale depuis le menu <strong>Accueil - Configuration - Affichage</strong><br>* Soit de manière spécifique à l'utilisateur depuis l'onglet <strong>Interface utilisateur</strong> de sa fiche utilisateur (cliquer sur l'identifiant en haut de l'écran).
 TotalNumberOfActivatedModules=Nombre total de modules fonctionnels activés: <b>%s</b>
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Renvoie un code comptable composé de :<br>%s suivi du
 ModuleCompanyCodePanicum=Renvoie un code comptable vide.
 ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers.
 UseNotifications=Utiliser les notifications
-NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, pour certains événements Dolibarr, aux tiers (sociétés clients, prospects ou fournisseurs) configurés pour. Le choix des notifications et contacts destinataires se fait tiers par tiers.
+NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, lors de certains événements Dolibarr. La cible des notifications peut être défini:<br>* par contacts de tiers (clients, prospects ou fournisseurs), tiers par tiers.<br>* ou en positionnant un email en paramètre global sur la page de configuration du module notification.
 ModelModules=Modèle de documents
 DocumentModelOdt=Génération depuis des modèles OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
 WatermarkOnDraft=Filigrane sur les documents brouillons
+JSOnPaimentBill=Activer la fonctionnalité de remplissage automatique des lignes de paiement sur le formulaire de paiement
 CompanyIdProfChecker=Règles sur les Identifiants professionnels
 MustBeUnique=Doit être unique ?
 MustBeMandatory=Obligatoire pour creer tiers ?
@@ -1134,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
@@ -1142,6 +1156,7 @@ HideTreadedOrders=Cacher les commandes traitées ou annulées de la liste
 ValidOrderAfterPropalClosed=Valider la commande après la clôture de la proposition commerciale, permet de ne pas passer par la commande provisoire
 FreeLegalTextOnOrders=Mention complémentaire sur les commandes
 WatermarkOnDraftOrders=Filigrane sur les brouillons de commandes (aucun si vide)
+ShippableOrderIconInList=Ajouter un icône dans la liste des commandes qui indique si la commande est expédiable.  
 ##### Clicktodial #####
 ClickToDialSetup=Configuration du module Click To Dial
 ClickToDialUrlDesc=URL appelée lors d'un clic sur le pictogramme téléphone. Dans l'URL, vous pouvez utiliser les balises<br><b>__PHONETO__</b> qui sera remplacée par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacée par le téléphone de l'appelant (le votre, défini sur votre fiche utilisateur)<br><b>__LOGIN__</b> qui sera remplacée par votre identifiant clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacée par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1154,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
@@ -1262,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
@@ -1318,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
@@ -1378,9 +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
-NotificationEMailFrom=Email émetteur (From) des mails envoyés lors des notifications
-ListOfAvailableNotifications=Liste des notifications disponibles (cette liste dépend des modules actifs)
+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
 ##### Sendings #####
 SendingsSetup=Configuration du module Expédition/Livraison
 SendingsReceiptModel=Modèles de bordereau d'expédition
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +1551,14 @@ DeleteFiscalYear=Effacer année fiscale
 ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cette année fiscale ?
 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 80ffc54e07e..bd3c25da359 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID évènement
 Actions=Événements
 ActionsArea=Espace événements (actions et tâches)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendrier
-Calendars= Calendriers
-LocalAgenda=Calendrier local
-AffectedTo= Affecté à
-DoneBy= Réalisé par
-Events= Événements
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendrier
+Calendars=Calendriers
+LocalAgenda=Calendrier interne
+ActionsOwnedBy=Propriétaire de l'événement
+AffectedTo=Affecté à
+DoneBy=Réalisé par
+Event=Evénement
+Events=Événements
 EventsNb=Nombre d'événements
 MyEvents=Mes événements
 OtherEvents=Autres événements
@@ -17,31 +19,33 @@ ListOfActions=Liste des événements
 Location=Lieu
 EventOnFullDay=Événement sur la(les) journée(s)
 SearchAnAction= Rechercher un événement/tâche
-MenuToDoActions= Événements incomplets
-MenuDoneActions= Événements terminés
-MenuToDoMyActions= Mes événem. incomplets
-MenuDoneMyActions= Mes événem. terminés
-ListOfEvents= Liste des événements Dolibarr
+MenuToDoActions=Événements incomplets
+MenuDoneActions=Événements terminés
+MenuToDoMyActions=Mes événem. incomplets
+MenuDoneMyActions=Mes événem. terminés
+ListOfEvents=Liste des événements (calendrier interne)
 ActionsAskedBy=Événements enregistrés par
 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
 ViewCal=Vue mois
 ViewDay=Vue jour
 ViewWeek=Vue semaine
-ViewPerUser=Par utilisateur
+ViewPerUser=Vue par utilisateur
 ViewWithPredefinedFilters= Vues avec filtres prédéfinis
 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
@@ -49,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
@@ -68,19 +69,24 @@ DateActionStart= Date de début
 DateActionEnd= Date de fin
 AgendaUrlOptions1=Vous pouvez aussi ajouter les paramètres suivants pour filtrer les réponses :
 AgendaUrlOptions2=<b>login=%s</b> pour limiter l'export aux actions créées, affectées ou réalisées par l'utilisateur <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> pour limiter l'export aux actions créées par l'utilisateur <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> pour limiter l'export aux actions dont l'utilisateur <b>%s</b> est propriétaire.
 AgendaUrlOptions4=<b>logint=%s</b> pour limiter l'export aux actions affectées à l'utilisateur <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> pour limiter l'export aux actions réalisées par l'utilisateur <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pour restreindre aux écévements associés au projet <b>PROJECT_ID</b>.
 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 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
 ExtSites=Import calendriers externes
-ExtSitesEnableThisTool=Afficher les calendriers externes sur l'agenda
+ExtSitesEnableThisTool=Afficher les calendriers externes (définis dans la configuration globale du module) dans l'agenda. N'affecte pas les calendriers externes définis par les utilisateurs.
 ExtSitesNbOfAgenda=Nombre de calendriers
 AgendaExtNb=Calendrier no %s
 ExtSiteUrlAgenda=URL d'accès au fichier ical
 ExtSiteNoLabel=Aucune description
+WorkingTimeRange=Plage d'heures travaillées
+WorkingDaysRange=Plage de jours travaillés
+AddEvent=Créer un événement
+MyAvailability=Ma disponibilité
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index a61bbd6cef0..24ebe5ff923 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -29,7 +29,7 @@ InvoiceAvoirAsk=Facture avoir pour correction de la facture
 InvoiceAvoirDesc=La <b>facture d'avoir</b> est une facture négative destinée à compenser un montant de facture qui diffère du montant réellement versé (suite à un trop versé par le client par erreur ou un manque non versé par le client suite à un retour produit par exemple).
 invoiceAvoirWithLines=Créer l'avoir avec les même lignes que la factures dont il est issu
 invoiceAvoirWithPaymentRestAmount=Créer l'avoir avec le montant restant à payer de la facture dont il est issu.
-invoiceAvoirLineWithPaymentRestAmount=Avoir du montant du reste à payer des factures dues.
+invoiceAvoirLineWithPaymentRestAmount=Avoir sur le reste à payer
 ReplaceInvoice=Remplace la facture %s
 ReplacementInvoice=Remplacement facture
 ReplacedByInvoice=Remplacée par la facture %s
@@ -85,8 +85,9 @@ ClassifyPaid=Classer 'Payée'
 ClassifyPaidPartially=Classer 'Payée partiellement'
 ClassifyCanceled=Classer 'Abandonnée'
 ClassifyClosed=Classer 'Fermée'
+ClassifyUnBilled=Classer 'Non facturée'
 CreateBill=Créer Facture
-AddBill=Créer facture ou avoir
+AddBill=Créer une facture ou un avoir
 AddToDraftInvoices=Ajouter à facture brouillon
 DeleteBill=Supprimer facture
 SearchACustomerInvoice=Rechercher une facture client
@@ -136,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
@@ -155,7 +154,7 @@ ConfirmCancelBill=Êtes-vous sûr de vouloir annuler la facture <b>%s</b> ?
 ConfirmCancelBillQuestion=Pour quelle raison voulez-vous classer la facture abandonnée ?
 ConfirmClassifyPaidPartially=Êtes-vous sûr de vouloir classer la facture <b>%s</b> comme payée ?
 ConfirmClassifyPaidPartiallyQuestion=Cette facture n'a pas été payée à hauteur du montant initial. Pour quelle raison voulez-vous la classer malgré tout ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Le reste à payer <b>(%s %s)</b> est un trop facturé (car article retourné, oubli, escompte non défini...) régularisé par un avoir
+ConfirmClassifyPaidPartiallyReasonAvoir=Le reste à payer <b>(%s %s)</b> est un trop facturé (car article retourné, oubli, escompte réalisé...), régularisé par un avoir
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Le reste à payer <b>(%s %s)</b> est un escompte accordé après facture. J'accepte de perdre la TVA sur cet escompte
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Le reste à payer <b>(%s %s)</b> est un escompte
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Mauvais payeur
@@ -190,15 +189,15 @@ AlreadyPaid=Déjà réglé
 AlreadyPaidBack=Déjà remboursé
 AlreadyPaidNoCreditNotesNoDeposits=Déjà réglé (hors avoirs et acomptes)
 Abandoned=Abandonné
-RemainderToPay=Reste à payer
-RemainderToTake=Reste à encaisser
-RemainderToPayBack=Reste à rembourser
+RemainderToPay=Restant impayé
+RemainderToTake=Montant restant à percevoir
+RemainderToPayBack=Montant à rembourser
 Rest=Créance
 AmountExpected=Montant réclamé
 ExcessReceived=Trop perçu
 EscompteOffered=Escompte (règlement avant échéance)
-SendBillRef=Envoi facture %s
-SendReminderBillRef=Relance facture %s
+SendBillRef=Envoi de la facture %s
+SendReminderBillRef=Relance de la facture %s (rappel)
 StandingOrders=Prélèvements
 StandingOrder=Prélèvement
 NoDraftBills=Pas de facture brouillon
@@ -207,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
@@ -218,19 +217,18 @@ 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
 Billed=Facturé
-RepeatableInvoice=Facture prédéfinie
-RepeatableInvoices=Factures prédéfinies
-Repeatable=Prédéfinie
-Repeatables=Prédéfinies
-ChangeIntoRepeatableInvoice=Convertir en prédéfinie
-CreateRepeatableInvoice=Créer facture prédéfinie
-CreateFromRepeatableInvoice=Créer depuis facture prédéfinie
+RepeatableInvoice=Facture modèle
+RepeatableInvoices=Factures modèles
+Repeatable=Modèle
+Repeatables=Modèles
+ChangeIntoRepeatableInvoice=Convertir en facture modèle
+CreateRepeatableInvoice=Créer facture modèle
+CreateFromRepeatableInvoice=Créer depuis facture modèle
 CustomersInvoicesAndInvoiceLines=Factures clients et lignes de factures
 CustomersInvoicesAndPayments=Factures clients et règlements
 ExportDataset_invoice_1=Factures clients et lignes de facture
@@ -257,7 +255,7 @@ CreditNotes=Avoirs
 Deposit=Acompte
 Deposits=Acomptes
 DiscountFromCreditNote=Remise issue de l'avoir %s
-DiscountFromDeposit=Paiement issu de l'acompte %s
+DiscountFromDeposit=Paiements issus de l'acompte %s
 AbsoluteDiscountUse=Ce type de crédit ne peut s'utiliser que sur une facture non validée
 CreditNoteDepositUse=La facture doit être validée pour pouvoir utiliser ce type de crédit
 NewGlobalDiscount=Nouvelle ligne de déduction
@@ -295,10 +293,12 @@ TotalOfTwoDiscountMustEqualsOriginal=La somme du montant des 2 nouvelles réduct
 ConfirmRemoveDiscount=Êtes-vous sûr de vouloir supprimer cette réduction ?
 RelatedBill=Facture associée
 RelatedBills=Factures associées
+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
@@ -310,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
@@ -335,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/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 252a379ffbc..a98fa367fbe 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -12,6 +12,7 @@ BoxLastProspects=Derniers prospects modifiés
 BoxLastCustomers=Derniers clients modifiés
 BoxLastSuppliers=Derniers fournisseurs modifiés
 BoxLastCustomerOrders=Dernières commandes
+BoxLastValidatedCustomerOrders=Dernières commandes clients validées
 BoxLastBooks=Derniers livres
 BoxLastActions=Derniers événements
 BoxLastContracts=Derniers contrats
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Nombre de clients
 BoxTitleLastRssInfos=Les %s dernières informations de %s
 BoxTitleLastProducts=Les %s derniers produits/services enregistrés
 BoxTitleProductsAlertStock=Produits en alerte stock
-BoxTitleLastCustomerOrders=Les %s dernières commandes clients modifiées
+BoxTitleLastCustomerOrders=Les %s dernières commandes clients
+BoxTitleLastModifiedCustomerOrders=Les %s dernières commandes clients modifiées
 BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistrés
 BoxTitleLastCustomers=Les %s derniers clients enregistrés
 BoxTitleLastModifiedSuppliers=Les %s derniers fournisseurs modifiés
 BoxTitleLastModifiedCustomers=Les %s derniers clients modifiés
-BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects modifiés
-BoxTitleLastPropals=Les %s dernières propositions enregistrées
-BoxTitleLastCustomerBills=Les %s dernières factures clients modifiées
-BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs modifiées
-BoxTitleLastProspects=Les %s derniers prospects enregistrés
+BoxTitleLastCustomersOrProspects=Les %s derniers prospects
+BoxTitleLastPropals=Les %s dernières propales
+BoxTitleLastModifiedPropals=Les %s dernières propositions commerciales modifiées
+BoxTitleLastCustomerBills=Les %s dernières factures clients
+BoxTitleLastModifiedCustomerBills=Les %s dernières factures clients modifiées
+BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs
+BoxTitleLastModifiedSupplierBills=Les %s dernières factures fournisseurs modifiées
 BoxTitleLastModifiedProspects=Les %s derniers prospects modifiés
 BoxTitleLastProductsInContract=Les %s derniers produits/services contractés
-BoxTitleLastModifiedMembers=Les %s derniers adhérents modifiés
-BoxTitleLastFicheInter=Les %s dernières fiches d'intervention modifiées
+BoxTitleLastModifiedMembers=Les %s derniers adhérents
+BoxTitleLastFicheInter=Les %s dernières fiche d'intervention modifiée
 BoxTitleOldestUnpaidCustomerBills=Les %s plus anciennes factures clients impayées
 BoxTitleOldestUnpaidSupplierBills=Les %s plus anciennes factures fournisseurs impayées
 BoxTitleCurrentAccounts=Soldes des comptes ouverts
 BoxTitleSalesTurnover=Le chiffre d'affaires réalisé
-BoxTitleTotalUnpaidCustomerBills=Impayés clients
-BoxTitleTotalUnpaidSuppliersBills=Impayés fournisseurs
+BoxTitleTotalUnpaidCustomerBills=Factures clients impayées
+BoxTitleTotalUnpaidSuppliersBills=Factures fournisseurs impayées
 BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés
 BoxMyLastBookmarks=Mes %s derniers marque-pages
 BoxOldestExpiredServices=Plus anciens services expirés
@@ -76,7 +80,8 @@ NoContractedProducts=Pas de produit/service contracté
 NoRecordedContracts=Pas de contrat enregistré
 NoRecordedInterventions=Pas fiche d'intervention enregistrée
 BoxLatestSupplierOrders=Dernières commandes fournisseur
-BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées
+BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseurs
+BoxTitleLatestModifiedSupplierOrders=Les %s dernières commandes fournisseurs
 NoSupplierOrder=Pas de commande fournisseur enregistrée
 BoxCustomersInvoicesPerMonth=Factures clients par mois
 BoxSuppliersInvoicesPerMonth=Factures fournisseurs par mois
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 6570eec5638..1c29dfc7772 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -101,13 +101,12 @@ 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 ?
 ExtraFieldsCategories=Attributs supplémentaires
 CategoriesSetup=Configuration du module catégories
 CategorieRecursiv=Lier avec les catégories parentes
-CategorieRecursivHelp=Si activer, quand un élément est ajouté dans une catégorie, ajouter aussi l'élément dans toutes 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/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index 15851bcc37b..d3125a8edd6 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -9,8 +9,8 @@ Prospect=Prospect
 Prospects=Prospects
 DeleteAction=Effacer un événement/tâche
 NewAction=Nouvel événement
-AddAction=Créer événement
-AddAnAction=Créer un événement
+AddAction=Créer un événement / une tâche
+AddAnAction=Créer un événement / une tâche
 AddActionRendezVous=Créer un rendez-vous
 Rendez-Vous=Rendez-vous
 ConfirmDeleteAction=Êtes-vous sûr de vouloir effacer cet événement ?
@@ -44,8 +44,8 @@ DoneActions=Liste des événements réalisés
 DoneActionsFor=Liste des événements réalisés pour %s
 ToDoActions=Liste des événements incomplets
 ToDoActionsFor=Liste des événements incomplets pour %s
-SendPropalRef=Envoi proposition commerciale %s
-SendOrderRef=Envoi commande %s
+SendPropalRef=Envoi de la proposition commerciale %s
+SendOrderRef=Envoi de la commande %s
 StatusNotApplicable=Non applicable
 StatusActionToDo=À faire
 StatusActionDone=Réalisé
@@ -62,7 +62,7 @@ LastProspectContactDone=Prospects contactés
 DateActionPlanned=Date réalisation prévue
 DateActionDone=Date réalisation effective
 ActionAskedBy=Action enregistrée par
-ActionAffectedTo=Action affectée à
+ActionAffectedTo=Propriétaire de l'événement
 ActionDoneBy=Action faite par
 ActionUserAsk=Enregistré par
 ErrorStatusCantBeZeroIfStarted=Si le champ '<b>Date début réalisation réelle</b>' est renseigné alors l'action est commencée voire finie, aussi le champ 'État' ne peut être 0%%.
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index e0f33d6ec27..af76117f213 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -379,7 +379,7 @@ DeliveryAddressLabel=Libellé de l'adresse
 DeleteDeliveryAddress=Supprimer une adresse de livraison
 ConfirmDeleteDeliveryAddress=Êtes-vous sûr de vouloir supprimer cette adresse de livraison ?
 NewDeliveryAddress=Nouvelle adresse de livraison
-AddDeliveryAddress=Ajouter l'adresse
+AddDeliveryAddress=Créer adresse
 AddAddress=Créer adresse
 NoOtherDeliveryAddress=Pas d'adresse alternative définie
 SupplierCategory=Catégorie du fournisseur
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Vous devez créer des contacts avec emails sur le tier
 ListSuppliersShort=Liste fournisseurs
 ListProspectsShort=Liste prospects
 ListCustomersShort=Liste clients
-ThirdPartiesArea=Espace Tiers
+ThirdPartiesArea=Espace tiers et contacts
 LastModifiedThirdParties=Les %s derniers tiers modifiés
 UniqueThirdParties=Total de tiers uniques
 InActivity=En activité
@@ -410,3 +410,5 @@ OutstandingBillReached=Montant max. endetté
 MonkeyNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn pour les codes clients et %syymm-nnnn pour les codes fournisseurs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0.
 LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment.
 ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...)
+SearchThirdparty=Rechercher tiers
+SearchContact=Rechercher contact
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index daf273cee3d..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,6 +197,13 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse
 TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode <b>comptabilité de caisse</b> n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit <b>comptabilité d'engagement</b> (voir la configuration du module de comptabilité).
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptabilité
+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
+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
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/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index 4f61426e83c..02dd54275f6 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -24,3 +24,5 @@ Deliverer=Livreur(s) :
 Sender=Expéditeur
 Recipient=Destinataire
 ErrorStockIsNotEnough=Le stock est insuffisant
+Shippable=Expédiable
+NonShippable=Non Expédiable
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index eb8a65ed46c..cb3260e6108 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -253,7 +253,6 @@ CivilityMR=Monsieur
 CivilityMLE=Mademoiselle
 CivilityMTRE=Maître
 CivilityDR=Docteur
-
 ##### Currencies #####
 Currencyeuros=Euros
 CurrencyAUD=Dollars Aus.
@@ -290,10 +289,10 @@ CurrencyXOF=Francs CFA BCEAO
 CurrencySingXOF=Franc CFA BCEAO
 CurrencyXPF=Francs CFP
 CurrencySingXPF=Franc CFP
-
 CurrencyCentSingEUR=centime
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=millime
-
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Campagne Publipostage
@@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Bouche à oreille
 DemandReasonTypeSRC_PARTNER=Partenaire
 DemandReasonTypeSRC_EMPLOYEE=Employé
 DemandReasonTypeSRC_SPONSORING=Parrainage/Sponsoring
-
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang
index f8a71165842..84081b64576 100644
--- a/htdocs/langs/fr_FR/donations.lang
+++ b/htdocs/langs/fr_FR/donations.lang
@@ -4,7 +4,7 @@ Donations=Dons
 DonationRef=Réf. donation
 Donor=Donateur
 Donors=Donateurs
-AddDonation=Ajouter don
+AddDonation=Créer un don
 NewDonation=Nouveau don
 ShowDonation=Montrer don
 DonationPromise=Promesse de don
@@ -30,3 +30,9 @@ SearchADonation=Rechercher un don
 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 954a83375b9..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 '<b>%s</b>' en '<b>%s</b>'.
@@ -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=L'image n'a pas un format reconnu
+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 <b>safe_mode</b> 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,21 +99,22 @@ 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é.<br>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 <b>Safe Mode</b> PHP est actif, vérifiez que la commande se trouve dans un répertoire défini dans le paramètre <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Échec de modification du mot de passe
-ErrorLoginDoesNotExists=Le compte utilisateur de login <b>%s</b> n'a pu être trouvé.
+ErrorLoginDoesNotExists=Le compte utilisateur identifié par <b>%s</b> 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
+ErrorQtyForCustomerInvoiceCantBeNegative=La quantité d'une ligne ne peut pas être négative dans les factures clients 
 ErrorWebServerUserHasNotPermission=Le compte d'exécution du serveur web <b>%s</b> n'a pas les permissions pour cela
 ErrorNoActivatedBarcode=Aucun type de code-barres activé
 ErrUnzipFails=Impossible de décompresser le fichier %s avec ZipArchive
@@ -135,6 +136,26 @@ ErrorWarehouseMustDiffers=Les entrepôts source et destination doivent être dif
 ErrorBadFormat=Mauvais format
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'est lié à aucun tiers. Lier l'adhérent à un tiers existant ou créer un nouveau tiers pour le lier avant de créer l'adhésion avec facture.
 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
@@ -153,4 +174,5 @@ WarningUsingThisBoxSlowDown=Attention, l'utilisation de cette boite provoque de
 WarningClickToDialUserSetupNotComplete=La configuration ClickToDial pour votre compte utilisateur n'est pas complète (voir l'onglet ClickToDial sur votre fiche utilisateur)
 WarningNotRelevant=Opération non pertinente pour cet ensemble de données
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivé quand l'affichage est en mode optimisé pour les personnes aveugles ou les navigateurs textes.
-WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturaction (%s) de la facture %s.
+WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturation (%s) de la facture %s.
+WarningTooManyDataPleaseUseMoreFilters=Trop de données. Utilisez des filtres plus précis.
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index cd946767a58..bf70976481c 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Numéro de compte
 BankAccountNumberKey=Clé RIB
 SpecialCode=Code spécial
 ExportStringFilter=%% permet de remplacer 1 ou plusieurs caractères dans le texte
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtre pour une année/mois/jour<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filtre pour une plage année/mois/jour<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filtre pour une date supérieure à une année/mois/jour donnée<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filtre pour une date inférieure à une année/mois/jour donnée
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtre pour une année/mois/jour<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filtre pour une plage année/mois/jour<br> > YYYY, > YYYYMM, > YYYYMMDD': filtre pour une date supérieure à une année/mois/jour donné<br> < YYYY, < YYYYMM, < YYYYMMDD: filtre pour une date inférieure à une année/mois/jour donné
 ExportNumericFilter='NNNNN' filtres sur une valeur<br>'NNNNN+NNNNN' filtres sur une place de valeurs<br>'&gt;NNNNN' filtres sur les valeurs plus petites<br>'&gt;NNNNN' filtres sur les valeurs plus grandes
 ## filters
 SelectFilterFields=Si vous voulez filtrer sur certaines valeurs, saisissez ces valeurs.
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 e4c997cb859..88da0f5c87b 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -2,12 +2,12 @@
 HRM=GRH
 Holidays=Congés
 CPTitreMenu=Congés
-MenuReportMonth=Etat mensuel
-MenuAddCP=Nouvelle demande
+MenuReportMonth=État mensuel
+MenuAddCP=Créer une 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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">cliquer ici</a>.
-NoCPforUser=Vous n'avez pas encore de demande de congés.
-AddCP=Créer demande de congés
+NoCPforUser=Vous n'avez plus de jours disponibles
+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 congés
+ListeCP=Liste des demandes de congés
 ReviewedByCP=Sera approuvé par
 DescCP=Description
-SendRequestCP=Envoyer la demande de congés
-DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jours</b> avant la date</b> de ceux-ci.
-MenuConfCP=Mettre à jour solde
+SendRequestCP=Créer une demande de congés
+DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jour(s)</b> avant la date de ceux-ci.
+MenuConfCP=Éditer le solde de congés
 UpdateAllCP=Mettre à jour les congés
 SoldeCPUser=Solde de congés: <b>%s jours</b>.
 ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début.
@@ -31,10 +31,10 @@ 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=Informations de la demande de congés
+InfosCP=Information sur la demande de congés
 InfosWorkflowCP=Informations du workflow
 RequestByCP=Demandée par
-TitreRequestCP=Fiche Congés
+TitreRequestCP=Demande de congés
 NbUseDaysCP=Nombre de jours de congés consommés
 EditCP=Modifier
 DeleteCP=Supprimer
@@ -46,22 +46,21 @@ SendToValidationCP=Envoyer en validation
 TitleDeleteCP=Supprimer la demande de Congés
 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=Vous n'avez pas le droit de faire des demandes 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=Valider la demande de Congés Payés
-ConfirmValidCP=Êtes-vous sûr de vouloir valider 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=Envoyer la demande de Congés Payés
-ConfirmToValidCP=Êtes-vous sûr de vouloir envoyer la demande de congés ?
-TitleRefuseCP=Refuser la demande de Congés Payés
-ConfirmRefuseCP=Êtes-vous sûr de vouloir refuser la demande de congés ?
+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
+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 Congés Payé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,41 +71,41 @@ 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 congés
-LogCP=Logs des mises à jours des congés
+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
 NewSoldeCP=Nouveau Solde
-alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période.
+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 jour de congés
+LastDayOfHoliday=Dernier jours de congés
 HolidaysMonthlyUpdate=Mise à jour mensuelle
 ManualUpdate=Mise à jour manuelle
-HolidaysCancelation=Annulation 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 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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cliquant ici</a>.
-DelayForSubmitCP=Délai pour faire une demande de congés  avant ceux-ci
+DelayForSubmitCP=Délai pour faire des demandes de congés
 AlertapprobatortorDelayCP=Prévenir le validateur si la demande de congés ne correspond pas à la date limite
-AlertValidatorDelayCP=Prévenir le valideur si la demande de congés ne respecte le délai prévu
+AlertValidatorDelayCP=Prévenir le valideur si la demande de congés ne respecte pas le délai prévu
 AlertValidorSoldeCP=Prévenir le valideur si l'utilisateur demande des congés dépassant son solde
 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 payés ajoutés chaque mois
-Module27130Name= Gestion des congés
-Module27130Desc= Gestion des congés
-TitleOptionMainCP=Réglages principaux des congés
+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
 TitleOptionEventCP=Réglages des congés liés à des évènements
 ValidEventCP=Valider
 UpdateEventCP=Mettre à jour les évènements
@@ -117,33 +116,33 @@ 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 des Congés
+TitleAdminCP=Configuration du module congés
 #Messages
 Hello=Bonjour
-HolidaysToValidate=Congés payés à valider
-HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés payés à valider.
-HolidaysToValidateDelay=Cette demande de congés payés à été effectué dans un délai de moins de %s jours avant ceux-ci.
+HolidaysToValidate=Valider les demandes de congés
+HolidaysToValidateBody=Veuillez trouver ci-dessous une demande de congés à valider.
+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=Congés payés validée
-HolidaysValidatedBody=Votre demande de congés payés du %s au %s vient d'être validée!
-HolidaysRefused=Congés payés refusée
+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=Congés payés annulée
-HolidaysCanceledBody=Votre demande de congés %s à %s va été annulée.
-Permission20000=Lire ses propres congès
-Permission20001=Créer/modifier ses propres congès
-Permission20002=Créer/modifier les congès pour tout le monde
-Permission20003=Supprimer les demandes de congés
-Permission20004=Définir les congés des utilisateurs
-Permission20005=Voir les logs de modification des congés payé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
+Permission20003=Supprimer la demande de Congés
+Permission20004=Configuration des jours disponibles
+Permission20005=Voir l'historique des demandes de congés
 Permission20006=Accéder au rapport mensuel des congés
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index 47fb8c1c376..3f15a153823 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Nom et signature de l'intervenant :
 NameAndSignatureOfExternalContact=Nom et signature du client :
 DocumentModelStandard=Modèle de fiche d'intervention standard
 InterventionCardsAndInterventionLines=Fiches interventions et lignes d'interventions
-ClassifyBilled=Classer "Facturée"
+InterventionClassifyBilled=Classer "Facturée"
+InterventionClassifyUnBilled=Classer "Non facturée"
 StatusInterInvoiced=Facturée
 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 9bc53fc6293..8cb4cdcecd1 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -75,18 +75,18 @@ SentTo=Envoyés à <b>%s</b>
 MailingStatusRead=Lu
 CheckRead=Accusé de réception
 YourMailUnsubcribeOK=L'adresse email <b>%s</b> 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=<b>%s</b> 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 à <b>%s</b> 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, <b>%s</b> 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 <b>virgule</b> pour spécifier plusieurs destinataires.
@@ -133,6 +133,9 @@ Notifications=Notifications
 NoNotificationsWillBeSent=Aucune notification par email n'est prévue pour cet événement et société
 ANotificationsWillBeSent=1 notification va être envoyée par email
 SomeNotificationsWillBeSent=%s notifications vont être envoyées par email
-AddNewNotification=Activer une nouvelle demande de notification email
-ListOfActiveNotifications=Liste des demandes de notifications emails actives
+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 <strong>'%s'</strong> 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 e6baf54974d..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
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossible de trouver l'utilisateur <b>%s<
 ErrorNoVATRateDefinedForSellerCountry=Erreur, aucun taux tva défini pour le pays '%s'.
 ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
 ErrorFailedToSaveFile=Erreur, l'enregistrement du fichier a échoué.
-ErrorOnlyPngJpgSupported=Erreur, seuls les formats images .jpg et .png sont supportés.
-ErrorImageFormatNotSupported=Votre PHP ne supporte pas les fonctions de conversion de ce format d'image.
 SetDate=Définir date
 SelectDate=Sélectionnez une date
 SeeAlso=Voir aussi %s
 BackgroundColorByDefault=Couleur de fond
+FileNotUploaded=Le fichier n'a pas été téléchargé
+FileUploaded=Le fichier a été transféré avec succès
 FileWasNotUploaded=Un fichier a été sélectionné pour attachement mais n'a pas encore été uploadé. Cliquez sur "Joindre ce fichier" pour cela.
 NbOfEntries=Nb d'entrées
 GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet)
@@ -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 <b>%s</b> ?
+ConfirmSendCardByMail=Voulez vous envoyer le contenu de cette fiche par email à l'adresse <b>%s</b> ?
 Delete=Supprimer
 Remove=Enlever
 Resiliate=Résilier
@@ -266,6 +266,7 @@ Afternoon=Après-midi
 Quadri=Trimestre
 MonthOfDay=Mois du jour
 HourShort=H
+MinuteShort=mn
 Rate=Taux
 UseLocalTax=Inclure taxe
 Bytes=Octets
@@ -340,6 +341,7 @@ FullList=Liste complète
 Statistics=Statistiques
 OtherStatistics=Autres statistiques
 Status=État
+Favorite=Favori
 ShortInfo=Infos
 Ref=Réf.
 RefSupplier=Réf. fournisseur
@@ -365,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
@@ -429,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
@@ -542,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
@@ -615,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 <b>%s</b> est autorisé à utiliser l'application en ce moment.
+WarningYouAreInMaintenanceMode=Attention, vous êtes en mode maintenance, aussi seul l'utilisateur identifié par <b>%s</b> 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
@@ -623,7 +626,7 @@ FieldsWithAreMandatory=Les champs marqués par un <b>%s</b> sont obligatoires
 FieldsWithIsForPublic=Les champs marqués par <b>%s</b> 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
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Configuration des attributs complémentaires
 URLPhoto=URL de la photo/logo
 SetLinkToThirdParty=Lier vers un autre tiers
 CreateDraft=Créer brouillon
+SetToDraft=Retour en brouillon
 ClickToEdit=Cliquer ici pour éditer
 ObjectDeleted=Objet %s supprimé
 ByCountry=Par pays
@@ -678,7 +682,7 @@ ViewPrivateNote=Voir les notes
 XMoreLines=%s ligne(s) cachées
 PublicUrl=URL publique
 AddBox=Ajouter boite
-
+SelectElementAndClickRefresh=Sélectionnez un élément et cliquez sur Rafraichir
 # Week day
 Monday=Lundi
 Tuesday=Mardi
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index dabd381ab1a..94ffd5e48a6 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -10,24 +10,18 @@ MarkRate=Taux de marque
 DisplayMarginRates=Afficher les taux de marge
 DisplayMarkRates=Afficher les taux de marque
 InputPrice=Saisir un prix
-
 margin=Gestion des marges
 margesSetup=Paramétrage de la gestion des marges
-
 MarginDetails=Détails des marges réalisées
-
 ProductMargins=Marges par produit
 CustomerMargins=Marges par client
 SalesRepresentativeMargins=Marges commerciaux
-
 ProductService=Produit ou Service
 AllProducts=Tous les produits et services
 ChooseProduct/Service=Choisissez le produit ou le service
-
 StartDate=Date de début
 EndDate=Date de fin
 Launch=Démarrer
-
 ForceBuyingPriceIfNull=Forcer le prix d'achat si non renseigné
 ForceBuyingPriceIfNullDetails=Si "ON", la ligne sera prise en compte avec une marge nulle (on forcera le prix d'achat avec le prix de vente) , sinon ("OFF") la marge sera égale au prix de vente pour cette ligne (prix d'achat à zéro).
 MARGIN_METHODE_FOR_DISCOUNT=Méthode de gestion des remises globales
@@ -35,16 +29,16 @@ UseDiscountAsProduct=Comme un produit
 UseDiscountAsService=Comme un service
 UseDiscountOnTotal=Sur le total
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Définit si une remise globale est prise en compte comme un produit, comme un service ou uniquement sur le total lors du calcul des marges.
-
 MARGIN_TYPE=Type de marge gérée
 MargeBrute=Marge brute
 MargeNette=Marge nette
 MARGIN_TYPE_DETAILS=Marge brute : Prix de vente HT - Prix d'achat HT<br/>Marge nette : Prix de vente HT - Coût de revient
-
 CostPrice=Prix de revient
 BuyingCost=Coût de revient
 UnitCharges=Charge unitaire
 Charges=Charges
-
 AgentContactType=Type de contact agent commercial
-AgentContactTypeDetails=Permet de définir le type de contact associé aux factures qui sera utilisé pour le rapport de marges par 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 608af130b48..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: <b>%s</b>, login: <b>%s</b>) est déjà lié au tiers <b>%s</b>. 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: <b>%s</b>, identifiant : <b>%s</b>) est déjà lié au tiers <b>%s</b>. 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,8 +84,8 @@ SubscriptionNotReceived=Cotisation non reçue
 SubscriptionLateShort=En retard
 SubscriptionNotReceivedShort=Non reçue
 ListOfSubscriptions=Liste des cotisations
-SendCardByMail=Envoyer fiche par mail
-AddMember=Ajouter adhérent
+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
 WelcomeEMail=Email d'accueil
@@ -125,21 +125,21 @@ Date=Date
 DateAndTime=Date et heure
 PublicMemberCard=Fiche adhérent publique
 MemberNotOrNoMoreExpectedToSubscribe=Non soumis ou plus soumis à cotisation
-AddSubscription=Ajouter adhésion/cotisation
+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 5811bf3d940..2b5cfa336ab 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -53,9 +53,9 @@ 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 code client
+SearchACustomerOrder=Rechercher une commande client
 ShipProduct=Expédier produit
 Discount=Remise
 CreateOrder=Créer Commande
@@ -101,9 +101,8 @@ RelatedOrders=Commandes rattachées
 OnProcessOrders=Commandes en cours de traitement
 RefOrder=Réf. commande
 RefCustomerOrder=Réf. commande client
-CustomerOrder=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
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON non définie
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Échec chargement du fichier module '%s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Échec chargement du fichier module '%s'
 Error_OrderNotChecked=Pas de commandes à facturer sélectionnées
-
-
 # Sources
 OrderSource0=Proposition commerciale
 OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Commercial
 OrderSource6=Magasin
 QtyOrdered=Qté commandée
 AddDeliveryCostLine=Ajouter une ligne de frais port indiquant le poids de la commande
-
 # Documents models
 PDFEinsteinDescription=Modèle de commande complet (logo…)
 PDFEdisonDescription=Modèle de commande simple
@@ -155,11 +151,9 @@ OrderByFax=Fax
 OrderByEMail=Email
 OrderByWWW=En ligne
 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 f5a83e574a6..1c23cce68cb 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Code de sécurité
 Calendar=Calendrier
-AddTrip=Créer note de frais
 Tools=Outils
 ToolsDesc=Cet espace est dédié au regroupement d'outils divers non disponibles dans les autres entrées du menu.<br><br>La liste de ces outils est accessible par le menu sur le côté.
 Birthday=Anniversaire
@@ -24,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
@@ -48,6 +47,7 @@ Notify_PROJECT_CREATE=Création de projet
 Notify_TASK_CREATE=Tâche créée
 Notify_TASK_MODIFY=Tâche modifiée
 Notify_TASK_DELETE=Tâche supprimée
+SeeModuleSetup=Voir la configuration du module
 NbOfAttachedFiles=Nombre de fichiers/documents liés
 TotalSizeOfAttachedFiles=Taille totale fichiers/documents liés
 MaxSize=Taille maximum
@@ -80,6 +80,16 @@ ModifiedBy=Modifié par %s
 ValidatedBy=Validé par %s
 CanceledBy=Annulé par %s
 ClosedBy=Clôturé par %s
+CreatedById=Id utilisateur créateur
+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=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
@@ -135,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.<br>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.<br>Surveillez votre messagerie.
+SendNewPasswordDesc=Ce formulaire permet d'envoyer un nouveau mot de passe. Il sera envoyé à l'adresse email de votre utilisateur.<br>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.<br>Surveillez votre messagerie.
 BackToLoginPage=Retour page de connexion
 AuthenticationDoesNotAllowSendNewPassword=Le mode d'authentification de Dolibarr est configuré à "<b>%s</b>".<br>Dans ce mode, Dolibarr n'a pas la possibilité de connaître ni de modifier votre mot de passe.<br>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.
@@ -189,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 68ff2cbefbb..a1af422e24b 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Clôturé
 ContractStatusRunning=En service
 ContractStatusExpired=expiré
 ContractStatusOnHold=Hors service
-ContractStatusToRun=À mettre en service
+ContractStatusToRun=A activer
 ContractNotRunning=Ce contrat n'est pas en service
 ErrorProductAlreadyExists=Un produit avec la référence %s existe déjà.
 ErrorProductBadRefOrLabel=La valeur de la référence ou du libellé est incorrecte.
 ErrorProductClone=Il y a eu un problème lors de la tentative de clonage du produit ou du service.
+ErrorPriceCantBeLowerThanMinPrice=Erreur, le prix ne peut être inférieur au prix minimum.
 Suppliers=Fournisseurs
 SupplierRef=Réf. produit fournisseur
 ShowProduct=Afficher produit
@@ -116,12 +117,12 @@ ServiceLimitedDuration=Si produit de type service à durée limitée :
 MultiPricesAbility=Plusieurs niveaux de prix par produit/service
 MultiPricesNumPrices=Nombre de prix
 MultiPriceLevelsName=Catégorie de prix
-AssociatedProductsAbility=Prise en charge des produits virtuels
-AssociatedProducts=Produit virtuel
-AssociatedProductsNumber=Nbre de sous-produits constituant ce produit virtuel
-ParentProductsNumber=Nbre de produits virtuels parent
-IfZeroItIsNotAVirtualProduct=Si 0, ce produit n'est pas un produit virtuel
-IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est pas utilisé par un produit virtuel
+AssociatedProductsAbility=Prise en charge des produits virtuels/packs
+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
+IfZeroItIsNotUsedByVirtualProduct=Si 0, ce produit n'est pas utilisé par un produit virtuel/package
 EditAssociate=Composer comme produit virtuel
 Translation=Traduction
 KeywordFilter=Filtre par mot-clé
@@ -131,7 +132,7 @@ AddDel=Ajouter/Retirer
 Quantity=Quantité
 NoMatchFound=Aucun résultat n'a été trouvé
 ProductAssociationList=Liste des produits/services composant ce produit virtuel: Le nombre entre parenthèse est la quantité affectée dans cette composition.
-ProductParentList=Liste des produits/services virtuels avec ce produit comme composante
+ProductParentList=Liste des produits/services virtuels/packages avec ce produit comme composante
 ErrorAssociationIsFatherOfThis=L'un des produits sélectionnés est parent du produit en cours
 DeleteProduct=Supprimer un produit/service
 ConfirmDeleteProduct=Êtes-vous sûr de vouloir supprimer ce produit/service ?
@@ -178,7 +179,7 @@ CloneProduct=Cloner produit/service
 ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner le produit ou service <b>%s</b> ?
 CloneContentProduct=Cloner les informations générales du produit/service
 ClonePricesProduct=Cloner les informations générales et les prix
-CloneCompositionProduct=Cloner les produits/services virtuels
+CloneCompositionProduct=Cloner les produits/services composant ce produit
 ProductIsUsed=Ce produit est utilisé
 NewRefForClone=Réf. du nouveau produit/service
 CustomerPrices=Prix clients
@@ -239,3 +240,10 @@ PricingRule=Règle de prix
 AddCustomerPrice=Ajouter prix par clients
 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<br>Les champs personnalisés sont des variables de la forme « #options_macléchampperso# * 2 »<br>Il y a des variables spéciales telles que « #quantity# » et « #tva_tx# »<br>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 e76a2777161..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
@@ -91,7 +93,7 @@ TaskRessourceLinks=Affectation ressources
 ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
 NoTasks=Aucune tâche pour ce projet
 LinkedToAnotherCompany=Liés à autre société
-TaskIsNotAffectedToYou=Tâche qui ne vous est pas affectée
+TaskIsNotAffectedToYou=Tâche qui ne vous sont pas affectées
 ErrorTimeSpentIsEmpty=Le temps consommé n'est pas renseigné
 ThisWillAlsoRemoveTasks=Cette opération détruira également les tâches du projet (<b>%s</b> tâches actuellement) et le suivi des consommés.
 IfNeedToUseOhterObjectKeepEmpty=Si des objets (facture, commande, ...), appartenant à un autre tiers que celui choisi, doivent être liés au projet à créer, laisser vide afin de laisser le projet multi-tiers.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur
 SelectElement=Séléctionnez l'élément
 AddElement=Link to element
+UnlinkElement=Délier l'élément
 # Documents models
 DocumentModelBaleine=Modèle de rapport de projet complet (logo...)
 PlannedWorkload = Charge de travail prévue
@@ -128,3 +131,4 @@ ProjectReferers=Objets associés
 SearchAProject=Rechercher un projet
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
 ProjectDraft=Projets brouillons
+FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index 598a7a8fcfc..e8a47528202 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Liste des prospects
 DeleteProp=Supprimer proposition
 ValidateProp=Valider proposition
-AddProp=Créer proposition
+AddProp=Créer une proposition
 ConfirmDeleteProp=Êtes-vous sûr de vouloir effacer cette proposition commerciale ?
 ConfirmValidateProp=Êtes-vous sûr de vouloir valider cette proposition commerciale sous la référence <b>%s</b> ?
 LastPropals=Les %s dernières propales
@@ -55,8 +55,6 @@ NoOpenedPropals=Pas de proposition ouverte
 NoOtherOpenedPropals=Pas d'autre proposition brouillon
 RefProposal=Réf. proposition commerciale
 SendPropalByMail=Envoyer proposition commerciale par email
-FileNotUploaded=Le fichier n'a pas été envoyé
-FileUploaded=Le fichier a été envoyé correctement
 AssociatedDocuments=Documents associés à la proposition :
 ErrorCantOpenDir=Impossible d'ouvrir le répertoire
 DatePropal=Date de proposition
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/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 34b7e1cbb9c..c76f03c8d9f 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Code comptable pour les paiements des salaires
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Code comptable pour les charges financières
 Salary=Salaires
 Salaries=Salaires
 Employee=Employé
@@ -6,3 +8,5 @@ NewSalaryPayment=Nouveau règlement de salaire
 SalaryPayment=Règlement salaire
 SalariesPayments=Règlements des salaires
 ShowSalaryPayment=Afficher règlement de salaire
+THM=Tarif horaire moyen
+TJM=Tarif journalier moyen
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index c7994bbba36..4e7528f2db7 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Statistiques effectuées sur les expéditions vali
 DateDeliveryPlanned=Date de livraison prévue
 DateReceived=Date de réception réelle
 SendShippingByEMail=Envoyer bon d'expédition par email
-SendShippingRef=Envoi bon d'expédition %s
+SendShippingRef=Envoi du bordereau d'expédition %s
 ActionsOnShipping=Événements sur l'expédition
 LinkToTrackYourPackage=Lien pour le suivi de votre colis
 ShipmentCreationIsDoneFromOrder=Pour le moment, la création d'une nouvelle expédition se fait depuis la fiche commande.
 RelatedShippings=Expédition(s) associée(s)
 ShipmentLine=Ligne d'expédition
 CarrierList=Liste des transporteurs
+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
 SendingMethodTRANS=Transporteur
 SendingMethodCOLSUI=Colissimo Suivi
-
 # ModelDocument
 DocumentModelSirocco=Modèle de bon de réception/livraison simple
 DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
 SumOfProductVolumes=Somme des volumes des produits
 SumOfProductWeights=Somme des poids des produits
+
+# warehouse details
+DetailWarehouseNumber= Détail de l'entrepôt
+DetailWarehouseFormat= W:%s (Qté : %d)
diff --git a/htdocs/langs/fr_FR/shop.lang b/htdocs/langs/fr_FR/shop.lang
deleted file mode 100644
index a04bb133c21..00000000000
--- a/htdocs/langs/fr_FR/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Impossible de se connecter à la base de données oscommerce. Vérifiez la configuration du module
-Shop=Boutique
-ShopWeb=Boutique Web
-LastOrders=Dernières commandes
-OnStandBy=En attente
-TreatmentInProgress=Traitement en cours
-LastCustomers=Derniers clients
-OSCommerceShop=Boutique OSCommerce
-OSCommerce=OSCommerce
-AddProd=Vendre en ligne
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 <b>%s</b> 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/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 8e0f3475db4..dab237aeb2d 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Fournisseurs
 Supplier=Fournisseur
-AddSupplier=Ajouter un fournisseur
+AddSupplier=Créer un fournisseur
 SupplierRemoved=Fournisseur supprimé
 SuppliersInvoice=Facture fournisseur
 NewSupplier=Nouveau fournisseur
@@ -40,3 +40,5 @@ AddSupplierInvoice=Créer facture fournisseur
 ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b>
 NoneOrBatchFileNeverRan=Aucun ou traitement par lot <b>%s</b> non exécuté récemment
 SentToSuppliers=Envoyés aux fournisseurs
+ListOfSupplierOrders=Liste des commandes fournisseurs
+MenuOrdersSupplierToBill=Commandes fournisseurs en facture
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index db05989b2df..5cad7a4b4a0 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Déplacement
 ListTripsAndExpenses=Liste des notes de frais
 ExpensesArea=Espace notes de frais
 SearchATripAndExpense=Rechercher une note de frais
+ClassifyRefunded=Classer 'Remboursé'
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 834d63cadd5..6b0f7772e37 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
@@ -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 ?
@@ -119,3 +118,5 @@ HierarchicView=Vue hiérarchique
 UseTypeFieldToChange=Modifier le champ Type pour changer
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Se connecter par OpenID
+WeeklyHours=Heures de travail hebdomadaires
+ColorUser=Couleur de l'utilisateur
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 8182fbf8afb..d04253ac0d9 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=שגיאה, מודול זה דורש %s Doliba
 ErrorDecimalLargerThanAreForbidden=שגיאה, דיוק גבוה יותר <b>%s</b> אינו נתמך.
 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)
@@ -54,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
@@ -133,7 +137,7 @@ Box=קופסה
 Boxes=תיבות
 MaxNbOfLinesForBoxes=מקס מספר השורות עבור תיבות
 PositionByDefault=ברירת המחדל של סדר
-Position=סדר
+Position=Position
 MenusDesc=מנהלי תפריטים להגדיר את התוכן של 2 שורות התפריטים (שורת אופקי קו אנכי).
 MenusEditorDesc=עורך התפריט מאפשר לך להגדיר ערכים אישית בתפריטים. השתמש בו בזהירות כדי להימנע dolibarr יציב ערכי תפריט נגיש באופן קבוע. <br> כמה מודולים להוסיף ערכים על התפריטים (בתפריט <b>כל</b> ברוב המקרים). אם הסרת חלק מן הערכים הללו בטעות, ניתן לשחזר אותם על ידי השבתת reenabling מודול.
 MenuForUsers=תפריט עבור משתמשים
@@ -206,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=הזמינות תיבות
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=אוטומטי אם JavaScript מושבת
 AvailableOnlyIfJavascriptNotDisabled=אפשרות זו זמינה רק אם JavaScript לא מבוטלת
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=אפשרות זו זמינה רק אם JavaScript לא מבוטלת
 Required=דרוש
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=בטחון
 Passwords=סיסמאות
 DoNotStoreClearPassword=האם כל חנות סיסמאות ברורות במסד הנתונים אלא רק בחנות ערך מוצפן (הופעל מומלץ)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS מארח (לא מוג
 MAIN_MAIL_EMAIL_FROM=* טלפון נייד עבור מיילים אוטומטיים (כברירת מחדל ב php.ini: <b>%s)</b>
 MAIN_MAIL_ERRORS_TO=* טלפון נייד המשמש מיילים מחזיר שגיאה שלח
 MAIN_MAIL_AUTOCOPY_TO= שלח שיטתי מוסתר פחמן עותק של כל הודעות הדוא&quot;ל שנשלחו
+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=הפוך את כל הודעות דואר אלקטרוני sendings (למטרות בדיקה או הדגמות)
 MAIN_MAIL_SENDMODE=שיטה להשתמש כדי לשלוח מיילים
 MAIN_MAIL_SMTPS_ID=SMTP מזהה אם נדרש אימות
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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=התרומה של ההנהלה
-Module800Name=OsCommerce על ידי גישה ישירה באתר
-Module800Desc=ממשק להראות osCommerce או חנות OSCSS באמצעות גישה ישירה באתר
-Module900Name=OsCommerce ידי WS
-Module900Desc=ממשק להראות חנות osCommerce באמצעות שירותי אינטרנט. מודול זה requiere לך להתקין רכיבים מ / oscommerce_ws / ws_server אל שרת osCommerce שלך. הצג הקובץ README ב / oscommerce_ws / ws_server.
 Module1200Name=גמל שלמה
 Module1200Desc=גמל שלמה אינטגרציה
 Module1400Name=חשבונאות
@@ -493,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=סדר היום
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=צור / לשנות לביטוח הלאומי ומס ערך מוס
 Permission93=מחק לביטוח הלאומי ומס ערך מוסף
 Permission94=ייצוא הפרשות סוציאליות
 Permission95=לקרוא דוחות
-Permission96=הגדרת שיגור
-Permission97=קרא את חשבון חשבונית שיגור
-Permission98=שדר הקווים חשבונאות של חשבוניות
 Permission101=לקרוא sendings
 Permission102=צור / לשנות sendings
 Permission104=אמת sendings
@@ -603,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=ליצור / לשנות הספק הזמנות
@@ -668,7 +679,7 @@ Permission300=לקרוא ברקודים
 Permission301=צור / לשנות הברקודים
 Permission302=מחק את הברקודים
 Permission311=לקרוא שירותים
-Permission312=הקצאת שירות לחוזה
+Permission312=Assign service/subscription to contract
 Permission331=קרא את הסימניות
 Permission332=צור / לשנות הסימניות
 Permission333=מחק סימניות
@@ -698,8 +709,8 @@ Permission701=לקרוא תרומות
 Permission702=צור / לשנות תרומות
 Permission703=מחק תרומות
 Permission1001=לקרוא מניות
-Permission1002=יצירה / שינוי במניות
-Permission1003=מחיקת מניות
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=לקרוא תנועות של מניות
 Permission1005=צור / לשנות תנועות של מניות
 Permission1101=לקרוא הזמנות משלוחים
@@ -775,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
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי
 DefaultLanguage=ברירת המחדל של השפה להשתמש (קוד שפה)
 EnableMultilangInterface=אפשר ממשק רב לשוני
 EnableShowLogo=הצג את הלוגו בתפריט השמאלי
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=המערכת עודכנה בהצלחה
 CompanyInfo=החברה / בסיס מידע
 CompanyIds=החברה / קרן זהויות
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=חזור קוד חשבון נבנה על ידי: <br>
 ModuleCompanyCodePanicum=חזור קוד חשבון ריק.
 ModuleCompanyCodeDigitaria=קוד חשבונאות תלוי קוד של צד שלישי. הקוד מורכב בעל אופי &quot;C&quot; בעמדה 1 ואחריו את 5 התווים הראשונים של קוד של צד שלישי.
 UseNotifications=השתמש הודעות
-NotificationsDesc=הודעות דוא&quot;ל והודעות התכונה מאפשרת לך בשקט לשלוח דואר אוטומטי, על כמה אירועים Dolibarr, לצדדים שלישיים (לקוחות או ספקים) אשר מוגדרים. הבחירה של ההודעה פעיל במגעים מטרות עשוי צד אחד 3 בזמן.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
 ModelModules=תבניות מסמכים
 DocumentModelOdt=צור מסמכים מתבניות OpenDocuments (. ODT קבצים של אופן אופיס, KOffice, TextEdit, ...)
 WatermarkOnDraft=סימן מים על מסמך טיוטה
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Professional מזהה ייחודי
 MustBeUnique=חייב להיות ייחודי?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,6 +1147,7 @@ AddDeliveryAddressAbility=הוסף תאריך יכולת המסירה
 UseOptionLineIfNoQuantity=קו של המוצר / שירות עם כמות אפס נחשבת כאופציה
 FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות
 WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=התקנה וניהול של סדר
 OrdersNumberingModules=הזמנות מספור מודולים
@@ -1142,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, ניתן להשתמש בתגיות <br> <b>__PHONETO__</b> כי יוחלף מספר הטלפון של אדם לקרוא <br> <b>__PHONEFROM__</b> כי יוחלף מספר הטלפון של אדם קורא (שלך) <br> <b>__LOGIN__</b> כי יוחלפו התחברות clicktodial שלך (המוגדר בכרטיס המשתמש שלך) <br> <b>__PASS__</b> כי יוחלף עם הסיסמה clicktodial שלך (המוגדר בכרטיס המשתמש שלך).
@@ -1154,7 +1169,7 @@ FicheinterNumberingModules=התערבות מודולים מספור
 TemplatePDFInterventions=כרטיס התערבות מסמכים דגמים
 WatermarkOnDraftInterventionCards=סימן מים על מסמכים כרטיס התערבות (כל אם ריק)
 ##### Contracts #####
-ContractsSetup=חוזים מודול ההתקנה
+ContractsSetup=Contracts/Subscriptions module setup
 ContractsNumberingModules=חוזים מספור מודולים
 TemplatePDFContracts=Contracts documents models
 FreeLegalTextOnContracts=Free text on contracts
@@ -1318,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=מודול שירותי התקנה
@@ -1378,9 +1393,10 @@ MailingSetup=שליחת הדוא&quot;ל ההתקנה מודול
 MailingEMailFrom=כתובת אימייל של השולח (מ) על הודעות דוא&quot;ל שנשלחו על ידי דואר אלקטרוני מודול
 MailingEMailError=חזור דואר אלקטרוני (שגיאות ל) עבור הודעות דוא&quot;ל עם שגיאות
 ##### Notification #####
-NotificationSetup=הודעה על מודול bu דוא&quot;ל ההתקנה
+NotificationSetup=EMail notification module setup
 NotificationEMailFrom=כתובת אימייל של השולח (מ) על הודעות דוא&quot;ל שנשלחו עבור הודעות
-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=שליחת מודל קבלת
@@ -1408,8 +1424,9 @@ OSCommerceTestOk=חיבור &quot;%s של שרת&quot; %s &quot;מסד נתונ
 OSCommerceTestKo1=חיבור &quot;%s&quot; שרת להצליח אבל &quot;%s&quot; מסד נתונים לא ניתן היה להשיג.
 OSCommerceTestKo2=חיבור &quot;%s של שרת עם&quot; %s &quot;המשתמש נכשל.
 ##### 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=עץ תפריטים
@@ -1474,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 בתפריט השמאלי.
@@ -1531,5 +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 f0d5f876cf1..38507100e11 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Events
 ActionsArea=Events area (Actions and tasks)
-Agenda= סדר היום
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
+Agenda=סדר היום
+Agendas=Agendas
+Calendar=Calendar
+Calendars=Calendars
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+Events=Events
 EventsNb=Number of events
 MyEvents=My events
 OtherEvents=Other events
@@ -17,31 +19,33 @@ ListOfActions=List of events
 Location=Location
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 8073e4b5d1d..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=הוראות קבע
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Bank deposit
 PaymentTypeShortVIR=Bank deposit
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index d6000e2825f..244341b4fba 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-# Category=Category
+Category=Category
 Categories=קטגוריות
-# Rubrique=Category
+Rubrique=Category
 Rubriques=קטגוריות
-# categories=categories
-# TheCategorie=The category
-# NoCategoryYet=No category of this type created
-# In=In
-# AddIn=Add in
-# modify=modify
-# Classify=Classify
-# CategoriesArea=Categories area
-# ProductsCategoriesArea=Products/Services categories area
-# SuppliersCategoriesArea=Suppliers categories area
-# CustomersCategoriesArea=Customers categories area
-# ThirdPartyCategoriesArea=Third parties categories area
-# MembersCategoriesArea=Members categories area
-# ContactsCategoriesArea=Contacts categories area
-# MainCats=Main categories
-# SubCats=Subcategories
-# CatStatistics=Statistics
-# CatList=List of categories
-# AllCats=All categories
-# ViewCat=View category
-# NewCat=Add category
-# NewCategory=New category
-# ModifCat=Modify category
-# CatCreated=Category created
-# CreateCat=Create category
-# CreateThisCat=Create this category
-# ValidateFields=Validate the fields
-# NoSubCat=No subcategory.
-# SubCatOf=Subcategory
-# FoundCats=Found categories
-# FoundCatsForName=Categories found for the name :
-# FoundSubCatsIn=Subcategories found in the category
-# ErrSameCatSelected=You selected the same category several times
-# ErrForgotCat=You forgot to choose the category
-# ErrForgotField=You forgot to inform the fields
-# ErrCatAlreadyExists=This name is already used
-# AddProductToCat=Add this product to a category?
-# ImpossibleAddCat=Impossible to add the category
-# ImpossibleAssociateCategory=Impossible to associate the category to
-# WasAddedSuccessfully=<b>%s</b> was added successfully.
-# ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-# CategorySuccessfullyCreated=This category %s has been added with success.
-# ProductIsInCategories=Product/service owns to following categories
-# SupplierIsInCategories=Third party owns to following suppliers categories
-# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-# MemberIsInCategories=This member owns to following members categories
-# ContactIsInCategories=This contact owns to following contacts categories
-# ProductHasNoCategory=This product/service is not in any categories
-# SupplierHasNoCategory=This supplier is not in any categories
-# CompanyHasNoCategory=This company is not in any categories
-# MemberHasNoCategory=This member is not in any categories
-# ContactHasNoCategory=This contact is not in any categories
-# ClassifyInCategory=Classify in category
+categories=categories
+TheCategorie=The category
+NoCategoryYet=No category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Categories area
+ProductsCategoriesArea=Products/Services categories area
+SuppliersCategoriesArea=Suppliers categories area
+CustomersCategoriesArea=Customers categories area
+ThirdPartyCategoriesArea=Third parties categories area
+MembersCategoriesArea=Members categories area
+ContactsCategoriesArea=Contacts categories area
+MainCats=Main categories
+SubCats=Subcategories
+CatStatistics=Statistics
+CatList=List of categories
+AllCats=All categories
+ViewCat=View category
+NewCat=Add category
+NewCategory=New category
+ModifCat=Modify category
+CatCreated=Category created
+CreateCat=Create category
+CreateThisCat=Create this category
+ValidateFields=Validate the fields
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found categories
+FoundCatsForName=Categories found for the name :
+FoundSubCatsIn=Subcategories found in the category
+ErrSameCatSelected=You selected the same category several times
+ErrForgotCat=You forgot to choose the category
+ErrForgotField=You forgot to inform the fields
+ErrCatAlreadyExists=This name is already used
+AddProductToCat=Add this product to a category?
+ImpossibleAddCat=Impossible to add the category
+ImpossibleAssociateCategory=Impossible to associate the category to
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this category.
+CategorySuccessfullyCreated=This category %s has been added with success.
+ProductIsInCategories=Product/service owns to following categories
+SupplierIsInCategories=Third party owns to following suppliers categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
+MemberIsInCategories=This member owns to following members categories
+ContactIsInCategories=This contact owns to following contacts categories
+ProductHasNoCategory=This product/service is not in any categories
+SupplierHasNoCategory=This supplier is not in any categories
+CompanyHasNoCategory=This company is not in any categories
+MemberHasNoCategory=This member is not in any categories
+ContactHasNoCategory=This contact is not in any categories
+ClassifyInCategory=Classify in category
 NoneCategory=None
-# NotCategorized=Without category
-# CategoryExistsAtSameLevel=This category already exists with this ref
-# ReturnInProduct=Back to product/service card
-# ReturnInSupplier=Back to supplier card
-# ReturnInCompany=Back to customer/prospect card
-# ContentsVisibleByAll=The contents will be visible by all
-# ContentsVisibleByAllShort=Contents visible by all
-# ContentsNotVisibleByAllShort=Contents not visible by all
-# CategoriesTree=Categories tree
-# DeleteCategory=Delete category
-# ConfirmDeleteCategory=Are you sure you want to delete this category ?
-# RemoveFromCategory=Remove link with categorie
-# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-# NoCategoriesDefined=No category defined
-# SuppliersCategoryShort=Suppliers category
-# CustomersCategoryShort=Customers category
-# ProductsCategoryShort=Products category
-# MembersCategoryShort=Members category
-# SuppliersCategoriesShort=Suppliers categories
-# CustomersCategoriesShort=Customers categories
-# CustomersProspectsCategoriesShort=Custo./Prosp. categories
-# ProductsCategoriesShort=Products categories
-# MembersCategoriesShort=Members categories
-# ContactCategoriesShort=Contacts categories
-# ThisCategoryHasNoProduct=This category does not contain any product.
-# ThisCategoryHasNoSupplier=This category does not contain any supplier.
-# ThisCategoryHasNoCustomer=This category does not contain any customer.
-# ThisCategoryHasNoMember=This category does not contain any member.
-# ThisCategoryHasNoContact=This category does not contain any contact.
-# AssignedToCustomer=Assigned to a customer
-# AssignedToTheCustomer=Assigned to the customer
-# InternalCategory=Internal category
-# CategoryContents=Category contents
-# CategId=Category id
-# CatSupList=List of supplier categories
-# CatCusList=List of customer/prospect categories
-# CatProdList=List of products categories
-# CatMemberList=List of members categories
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+NotCategorized=Without category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ReturnInProduct=Back to product/service card
+ReturnInSupplier=Back to supplier card
+ReturnInCompany=Back to customer/prospect card
+ContentsVisibleByAll=The contents will be visible by all
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+CategoriesTree=Categories tree
+DeleteCategory=Delete category
+ConfirmDeleteCategory=Are you sure you want to delete this category ?
+RemoveFromCategory=Remove link with categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
+NoCategoriesDefined=No category defined
+SuppliersCategoryShort=Suppliers category
+CustomersCategoryShort=Customers category
+ProductsCategoryShort=Products category
+MembersCategoryShort=Members category
+SuppliersCategoriesShort=Suppliers categories
+CustomersCategoriesShort=Customers categories
+CustomersProspectsCategoriesShort=Custo./Prosp. categories
+ProductsCategoriesShort=Products categories
+MembersCategoriesShort=Members categories
+ContactCategoriesShort=Contacts categories
+ThisCategoryHasNoProduct=This category does not contain any product.
+ThisCategoryHasNoSupplier=This category does not contain any supplier.
+ThisCategoryHasNoCustomer=This category does not contain any customer.
+ThisCategoryHasNoMember=This category does not contain any member.
+ThisCategoryHasNoContact=This category does not contain any contact.
+AssignedToCustomer=Assigned to a customer
+AssignedToTheCustomer=Assigned to the customer
+InternalCategory=Internal category
+CategoryContents=Category contents
+CategId=Category id
+CatSupList=List of supplier categories
+CatCusList=List of customer/prospect categories
+CatProdList=List of products categories
+CatMemberList=List of members categories
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 57db383c40a..95e682bcb67 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 22edf9746b3..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 88e58bd5b98..8f009f4a115 100644
--- a/htdocs/langs/he_IL/donations.lang
+++ b/htdocs/langs/he_IL/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
+Donation=Donation
 Donations=תרומות
-# DonationRef=Donation ref.
-# Donor=Donor
-# Donors=Donors
-# AddDonation=Add a donation
-# NewDonation=New donation
-# ShowDonation=Show donation
-# DonationPromise=Gift promise
-# PromisesNotValid=Not validated promises
-# PromisesValid=Validated promises
-# DonationsPaid=Donations paid
-# DonationsReceived=Donations received
-# PublicDonation=Public donation
-# DonationsNumber=Donation number
-# DonationsArea=Donations area
-# DonationStatusPromiseNotValidated=Draft promise
-# DonationStatusPromiseValidated=Validated promise
-# DonationStatusPaid=Donation received
-# DonationStatusPromiseNotValidatedShort=Draft
-# DonationStatusPromiseValidatedShort=Validated
-# DonationStatusPaidShort=Received
-# ValidPromess=Validate promise
-# DonationReceipt=Donation receipt
-# BuildDonationReceipt=Build receipt
-# DonationsModels=Documents models for donation receipts
-# LastModifiedDonations=Last %s modified donations
-# SearchADonation=Search a donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+DonationRef=Donation ref.
+Donor=Donor
+Donors=Donors
+AddDonation=Create a donation
+NewDonation=New donation
+ShowDonation=Show donation
+DonationPromise=Gift promise
+PromisesNotValid=Not validated promises
+PromisesValid=Validated promises
+DonationsPaid=Donations paid
+DonationsReceived=Donations received
+PublicDonation=Public donation
+DonationsNumber=Donation number
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+BuildDonationReceipt=Build receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Last %s modified donations
+SearchADonation=Search a donation
+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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
index 785cb5043d3..23bcf3dc69d 100644
--- a/htdocs/langs/he_IL/exports.lang
+++ b/htdocs/langs/he_IL/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 7b5c96e3671..0b2eb810e67 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=תאור
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang
index 421e1bfe35b..b472c41f7a6 100644
--- a/htdocs/langs/he_IL/interventions.lang
+++ b/htdocs/langs/he_IL/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
+Intervention=Intervention
 Interventions=התערבויות
-# InterventionCard=Intervention card
-# NewIntervention=New intervention
-# AddIntervention=Add intervention
-# ListOfInterventions=List of interventions
-# EditIntervention=Edit intervention
-# ActionsOnFicheInter=Actions on intervention
-# LastInterventions=Last %s interventions
-# AllInterventions=All interventions
-# CreateDraftIntervention=Create draft
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
-# InterventionContact=Intervention contact
-# DeleteIntervention=Delete intervention
-# ValidateIntervention=Validate intervention
-# ModifyIntervention=Modify intervention
-# DeleteInterventionLine=Delete intervention line
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
-# NameAndSignatureOfExternalContact=Name and signature of customer :
-# DocumentModelStandard=Standard document model for interventions
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-# ClassifyBilled=Classify "Billed"
-# StatusInterInvoiced=Billed
-# RelatedInterventions=Related interventions
-# ShowIntervention=Show intervention
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ListOfInterventions=List of interventions
+EditIntervention=Edit intervention
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Last %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+CustomerDoesNotHavePrefix=Customer does not have a prefix
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+NameAndSignatureOfInternalContact=Name and signature of intervening :
+NameAndSignatureOfExternalContact=Name and signature of customer :
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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
-# TypeContact_fichinter_external_BILLING=Billing customer contact
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
+TypeContact_fichinter_internal_INTERVENING=Intervening
+TypeContact_fichinter_external_BILLING=Billing customer contact
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
-# ArcticNumRefModelError=Failed to activate
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Generic number model
+ArcticNumRefModelError=Failed to activate
+PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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<br/>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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+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 <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
+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 <b>%s</b> ?
+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.<br><br>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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 e6f659b9a07..6cc95b19193 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=ספקים
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 6b6396451b5..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 fd098bb307c..a3398b27c8b 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -1,76 +1,80 @@
 # Dolibarr language file - Source file is en_US - sendings
-# RefSending=Ref. shipment
-# Sending=Shipment
+RefSending=Ref. shipment
+Sending=Shipment
 Sendings=משלוחים
-# Shipment=Shipment
+Shipment=Shipment
 Shipments=משלוחים
-# Receivings=Receivings
-# SendingsArea=Shipments area
-# ListOfSendings=List of shipments
-# SendingMethod=Shipping method
-# SendingReceipt=Shipping receipt
-# LastSendings=Last %s shipments
-# SearchASending=Search for shipment
-# StatisticsOfSendings=Statistics for shipments
-# NbOfSendings=Number of shipments
-# NumberOfShipmentsByMonth=Number of shipments by month
-# SendingCard=Shipping card
-# NewSending=New shipment
-# CreateASending=Create a shipment
-# CreateSending=Create shipment
-# QtyOrdered=Qty ordered
-# QtyShipped=Qty shipped
-# QtyToShip=Qty to ship
-# QtyReceived=Qty received
-# KeepToShip=Keep to ship
-# OtherSendingsForSameOrder=Other shipments for this order
-# DateSending=Date sending order
-# DateSendingShort=Date sending order
-# SendingsForSameOrder=Shipments for this order
-# SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-# SendingsToValidate=Shipments to validate
-# StatusSendingCanceled=Canceled
-# StatusSendingDraft=Draft
-# StatusSendingValidated=Validated (products to ship or already shipped)
-# StatusSendingProcessed=Processed
-# StatusSendingCanceledShort=Canceled
-# StatusSendingDraftShort=Draft
-# StatusSendingValidatedShort=Validated
-# StatusSendingProcessedShort=Processed
-# SendingSheet=Sending sheet
-# Carriers=Carriers
-# Carrier=Carrier
-# CarriersArea=Carriers area
-# NewCarrier=New carrier
-# ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-# ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-# ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-# GenericTransport=Generic transport
-# Enlevement=Gotten by customer
-# DocumentModelSimple=Simple document model
-# DocumentModelMerou=Merou A5 model
-# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-# DateDeliveryPlanned=Planed date of delivery
-# DateReceived=Date delivery received
-# SendShippingByEMail=Send shipment by EMail
-# SendShippingRef=Send shipment %s
-# ActionsOnShipping=Events on shipment
-# LinkToTrackYourPackage=Link to track your package
-# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+Receivings=Receivings
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+SendingReceipt=Shipping receipt
+LastSendings=Last %s shipments
+SearchASending=Search for shipment
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipping card
+NewSending=New shipment
+CreateASending=Create a shipment
+CreateSending=Create shipment
+QtyOrdered=Qty ordered
+QtyShipped=Qty shipped
+QtyToShip=Qty to ship
+QtyReceived=Qty received
+KeepToShip=Keep to ship
+OtherSendingsForSameOrder=Other shipments for this order
+DateSending=Date sending order
+DateSendingShort=Date sending order
+SendingsForSameOrder=Shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingCanceledShort=Canceled
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Sending sheet
+Carriers=Carriers
+Carrier=Carrier
+CarriersArea=Carriers area
+NewCarrier=New carrier
+ConfirmDeleteSending=Are you sure you want to delete this shipment ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
+ConfirmCancelSending=Are you sure you want to cancel this shipment ?
+GenericTransport=Generic transport
+Enlevement=Gotten by customer
+DocumentModelSimple=Simple document model
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planed date of delivery
+DateReceived=Date delivery received
+SendShippingByEMail=Send shipment by EMail
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
 
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/he_IL/shop.lang b/htdocs/langs/he_IL/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/he_IL/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 8098c7e9fd4..7f83fb30440 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=ספקים
-# Supplier=Supplier
-# AddSupplier=Add a supplier
-# SupplierRemoved=Supplier removed
-# SuppliersInvoice=Suppliers invoice
-# NewSupplier=New supplier
-# History=History
-# ListOfSuppliers=List of suppliers
-# ShowSupplier=Show supplier
-# OrderDate=Order date
-# BuyingPrice=Buying price
-# BuyingPriceMin=Minimum buying price
-# BuyingPriceMinShort=Min buying price
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
-# AddSupplierPrice=Add supplier price
-# ChangeSupplierPrice=Change supplier price
-# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-# NoRecordedSuppliers=No suppliers recorded
-# SupplierPayment=Supplier payment
-# SuppliersArea=Suppliers area
-# RefSupplierShort=Ref. supplier
-# Availability=Availability
-# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-# ExportDataset_fournisseur_2=Supplier invoices and payments
-# ExportDataset_fournisseur_3=Supplier orders and order lines
-# ApproveThisOrder=Approve this order
-# ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-# DenyingThisOrder=Denying this order
-# ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-# ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-# AddCustomerOrder=Create customer order
-# AddCustomerInvoice=Create customer invoice
-# AddSupplierOrder=Create supplier order
-# AddSupplierInvoice=Create supplier invoice
-# ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-# NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-# SentToSuppliers=Sent to suppliers
+Supplier=Supplier
+AddSupplier=Add a supplier
+SupplierRemoved=Supplier removed
+SuppliersInvoice=Suppliers invoice
+NewSupplier=New supplier
+History=History
+ListOfSuppliers=List of suppliers
+ShowSupplier=Show supplier
+OrderDate=Order date
+BuyingPrice=Buying price
+BuyingPriceMin=Minimum buying price
+BuyingPriceMinShort=Min buying price
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add supplier price
+ChangeSupplierPrice=Change supplier price
+ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+NoRecordedSuppliers=No suppliers recorded
+SupplierPayment=Supplier payment
+SuppliersArea=Suppliers area
+RefSupplierShort=Ref. supplier
+Availability=Availability
+ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
+ExportDataset_fournisseur_2=Supplier invoices and payments
+ExportDataset_fournisseur_3=Supplier orders and order lines
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+DenyingThisOrder=Denying this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+AddCustomerOrder=Create customer order
+AddCustomerInvoice=Create customer invoice
+AddSupplierOrder=Create supplier order
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
+NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
index fe38c5e8add..2874de3a593 100644
--- a/htdocs/langs/he_IL/trips.lang
+++ b/htdocs/langs/he_IL/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+Trip=Trip
+Trips=Trips
+TripsAndExpenses=Trips and expenses
+TripsAndExpensesStatistics=Trips and expenses statistics
+TripCard=Trip card
+AddTrip=Add trip
+ListOfTrips=List of trips
+ListOfFees=List of fees
+NewTrip=New trip
+CompanyVisited=Company/foundation visited
+Kilometers=Kilometers
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete trip
+ConfirmDeleteTrip=Are you sure you want to delete this trip ?
 TF_OTHER=אחר
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+TF_LUNCH=Lunch
+TF_TRIP=Trip
+ListTripsAndExpenses=List of trips and expenses
+ExpensesArea=Trips and expenses area
+SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 292e8b60003..a9ded699060 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Kutija
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 be7a31952d5..508164a1448 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID događaja
 Actions=Događaji
 ActionsArea=Područje za događaje (akcije i zadaci)
-Agenda= Podsjetnik
-Agendas= Podsjetnici
-Calendar= Kalendar
-Calendars= Kalendari
-LocalAgenda=Lokalni kalendar
-AffectedTo= Dodjeljeno korisniku
-DoneBy= Učinio/la
-Events= Događaj
+Agenda=Podsjetnik
+Agendas=Podsjetnici
+Calendar=Kalendar
+Calendars=Kalendari
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Dodjeljeno korisniku
+DoneBy=Učinio/la
+Event=Event
+Events=Događaj
 EventsNb=Broj događaja
 MyEvents=Moji događaji
 OtherEvents=Drugi događaji
@@ -17,31 +19,33 @@ ListOfActions=Lista događaja
 Location=Lokacija
 EventOnFullDay=Događaji za cijeli dan(e)
 SearchAnAction= Traži događaj/zadatak
-MenuToDoActions= Svi nepotpuni događaji
-MenuDoneActions= Svi prekinuti događaji
-MenuToDoMyActions= Svi nedovršeni događaji
-MenuDoneMyActions= Moji prekinuti događaji
-ListOfEvents= Lista od Dolibarr događaja
+MenuToDoActions=Svi nepotpuni događaji
+MenuDoneActions=Svi prekinuti događaji
+MenuToDoMyActions=Svi nedovršeni događaji
+MenuDoneMyActions=Moji prekinuti događaji
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Događaje izvijestio/la
 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
 ViewCal=Mjesečni pregled
 ViewDay=Dnevni pregled
 ViewWeek=Tjedni pregled
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Pogledaj sa unaprijed definiranim filterima
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Datum početka
 DateActionEnd= Datum završetka
 AgendaUrlOptions1=Možete isto dodati sljedeće paramete za filtriranje prikazanog: 
 AgendaUrlOptions2=<b>Prijava=%s</b> za ograničavanje prikaza akcije kreiranja , dodijeljene ili završene od strane korisnika<b>%s</b>.
-AgendaUrlOptions3=<b>Prijava=%s</b> da se ograniči prikaz akcija kreiranih od korisnika<b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>Prijava=%s</b>da se ograniči prikaz na akcije dodijeljene korisniku  <b>%s</b>.
-AgendaUrlOptions5=<b>Prijava=%s</b> da se ograniči prikaz na akcije završene od strane korisnika <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Prikaži rođendan kontakata
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
 ExportDataset_event1=Lista podsjetnika događaja
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Izvezi kalendar
 ExtSites=Uvezi vanjski kalendar
-ExtSitesEnableThisTool=Prikaži vanjske kalendare u podsjetnike
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Broj kalendara
 AgendaExtNb=Calendar broj %s
 ExtSiteUrlAgenda=URL za pristup .ical datoteki
 ExtSiteNoLabel=Bez opisa
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index bd0b6e8aff9..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=<b>kredit<b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Označi kao plaćeno
 ClassifyPaidPartially=Označi kao djelomično plaćeno
 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
@@ -98,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
@@ -136,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
@@ -155,14 +154,14 @@ ConfirmCancelBill=Jeste li sigurni da poništiti račun <b>%s</b>?
 ConfirmCancelBillQuestion=Zašto želite ovaj račun označiti kao napušten?
 ConfirmClassifyPaidPartially=Jeste li sigurni da želite račun <b>%s</b> označiti kao plaćen?
 ConfirmClassifyPaidPartiallyQuestion=Ovaj račun nije plaćen u cijelosti. Iz kojeg razloga ga želite zatvortiti?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
 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»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim zemljama, taj izbor može biti moguć samo ako vaš račun sadrži ispravne bilješke.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji odbija platit svoj dug.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen.
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
-SendBillRef=Pošalji račun %s
-SendReminderBillRef=Pošalji račun %s (podsjetnik)
+SendBillRef=Podnošenje računa %s
+SendReminderBillRef=Podnošenje Računa %s (podsjetnik)
 StandingOrders=Otvorene narudžbe
 StandingOrder=Otvorene narudžbe
 NoDraftBills=Nema skica računa
@@ -218,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
@@ -227,11 +225,11 @@ 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=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Računi klijenata i redovi računa
 CustomersInvoicesAndPayments=Računi i plaćanja kupca
 ExportDataset_invoice_1=Računi kupca i popis računa
 ExportDataset_invoice_2=Računi i plaćanja kupca
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezani račun
 RelatedBills=Povezani račun
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Odmah
@@ -366,7 +366,7 @@ LawApplicationPart4=njihove cijene.
 LimitedLiabilityCompanyCapital=SARL with Capital of
 UseLine=Primjeni
 UseDiscount=Iskoriti popust
-UseCredit=Use credit
+UseCredit=Koristite kredit
 UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
 MenuChequeDeposits=Checks deposits
 MenuCheques=Čekovi
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 0596d677c46..d67c219ddc9 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -1,91 +1,91 @@
 # Dolibarr language file - Source file is en_US - boxes
-# BoxLastRssInfos=Rss information
-# BoxLastProducts=Last %s products/services
-# BoxProductsAlertStock=Products in stock alert
-# BoxLastProductsInContract=Last %s contracted products/services
-# BoxLastSupplierBills=Last supplier's invoices
-# BoxLastCustomerBills=Last customer's invoices
-# BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
-# BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
-# BoxLastProposals=Last commercial proposals
-# BoxLastProspects=Last modified prospects
-# BoxLastCustomers=Last modified customers
-# BoxLastSuppliers=Last modified suppliers
-# BoxLastCustomerOrders=Last customer orders
-# BoxLastBooks=Last books
-# BoxLastActions=Last actions
-# BoxLastContracts=Last contracts
-# BoxLastContacts=Last contacts/addresses
-# BoxLastMembers=Last members
-# BoxFicheInter=Last interventions
-# BoxCurrentAccounts=Opened accounts balance
-# BoxSalesTurnover=Sales turnover
-# BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
-# BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
-# BoxTitleLastBooks=Last %s recorded books
-# BoxTitleNbOfCustomers=Number of clients
-# BoxTitleLastRssInfos=Last %s news from %s
-# BoxTitleLastProducts=Last %s modified products/services
-# BoxTitleProductsAlertStock=Products in stock alert
-# BoxTitleLastCustomerOrders=Last %s modified customer orders
-# BoxTitleLastSuppliers=Last %s recorded suppliers
-# BoxTitleLastCustomers=Last %s recorded customers
-# BoxTitleLastModifiedSuppliers=Last %s modified suppliers
-# BoxTitleLastModifiedCustomers=Last %s modified customers
-# BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects
-# BoxTitleLastPropals=Last %s recorded proposals
-# BoxTitleLastCustomerBills=Last %s customer's invoices
-# BoxTitleLastSupplierBills=Last %s supplier's invoices
-# BoxTitleLastProspects=Last %s recorded prospects
-# BoxTitleLastModifiedProspects=Last %s modified prospects
-# BoxTitleLastProductsInContract=Last %s products/services in a contract
-# BoxTitleLastModifiedMembers=Last %s modified members
-# BoxTitleLastFicheInter=Last %s modified intervention
-# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices
-# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices
-# BoxTitleCurrentAccounts=Opened account's balances
-# BoxTitleSalesTurnover=Sales turnover
-# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices
-# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices
-# BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
-# BoxMyLastBookmarks=My last %s bookmarks
-# BoxOldestExpiredServices=Oldest active expired services
-# BoxLastExpiredServices=Last %s oldest contacts with active expired services
-# BoxTitleLastActionsToDo=Last %s actions to do
-# BoxTitleLastContracts=Last %s contracts
-# BoxTitleLastModifiedDonations=Last %s modified donations
-# BoxTitleLastModifiedExpenses=Last %s modified expenses
-# BoxGlobalActivity=Global activity (invoices, proposals, orders)
-# FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
-# LastRefreshDate=Last refresh date
-# NoRecordedBookmarks=No bookmarks defined.
-# ClickToAdd=Click here to add.
-# NoRecordedCustomers=No recorded customers
-# NoRecordedContacts=No recorded contacts
-# NoActionsToDo=No actions to do
-# NoRecordedOrders=No recorded customer's orders
-# NoRecordedProposals=No recorded proposals
-# NoRecordedInvoices=No recorded customer's invoices
-# NoUnpaidCustomerBills=No unpaid customer's invoices
-# NoRecordedSupplierInvoices=No recorded supplier's invoices
-# NoUnpaidSupplierBills=No unpaid supplier's invoices
-# NoModifiedSupplierBills=No recorded supplier's invoices
-# NoRecordedProducts=No recorded products/services
-# NoRecordedProspects=No recorded prospects
-# NoContractedProducts=No products/services contracted
-# NoRecordedContracts=No recorded contracts
-# NoRecordedInterventions=No recorded interventions
-# BoxLatestSupplierOrders=Latest supplier orders
-# BoxTitleLatestSupplierOrders=%s latest supplier orders
-# NoSupplierOrder=No recorded supplier order
-# BoxCustomersInvoicesPerMonth=Customer invoices per month
-# BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-# BoxCustomersOrdersPerMonth=Customer orders per month
-# BoxSuppliersOrdersPerMonth=Supplier orders per month
-# BoxProposalsPerMonth=Proposals per month
-# NoTooLowStockProducts=No product under the low stock limit
-# BoxProductDistribution=Products/Services distribution
-# BoxProductDistributionFor=Distribution of %s for %s
-# ForCustomersInvoices=Customers invoices
-# ForCustomersOrders=Customers orders
-# ForProposals=Proposals
+BoxLastRssInfos=RSS Informacije
+BoxLastProducts=Zadnjih %s proizvoda / usluga
+BoxProductsAlertStock=Proizvodi u skaldištu - uzbuna
+BoxLastProductsInContract=Zadnjih %s ugovorenih proizvoda / usluga
+BoxLastSupplierBills=Posljednji računi od dobavljača
+BoxLastCustomerBills=Posljednji računi od kupaca
+BoxOldestUnpaidCustomerBills=Najstariji neplaćeni računi kupaca
+BoxOldestUnpaidSupplierBills=Najstariji neplaćeni računi dobavljača
+BoxLastProposals=Najnovije ponude
+BoxLastProspects=Posljednji izmijenjeni potencijalni kupci
+BoxLastCustomers=Posljednji izmijenjeni kupci
+BoxLastSuppliers=Posljednji izmijenjeni dobavljači
+BoxLastCustomerOrders=Najnovije narudžbe kupaca
+BoxLastBooks=Najnovije knjige
+BoxLastActions=Najnovije aktivnosti
+BoxLastContracts=Najnoviji ugovori
+BoxLastContacts=Najnoviji kontakti / Adrese
+BoxLastMembers=Najnoviji članovi
+BoxFicheInter=Najnovije intervencije
+BoxCurrentAccounts=Stanje otvorenih računa
+BoxSalesTurnover=Promet
+BoxTotalUnpaidCustomerBills=Ukupni neplaćeni računi kupaca
+BoxTotalUnpaidSuppliersBills=Ukupni neplaćeni računi dobavljača
+BoxTitleLastBooks=Posljednjih %s spremljenih knjige
+BoxTitleNbOfCustomers=Broj klijenata
+BoxTitleLastRssInfos=Posljednjih %s vijesti iz %s
+BoxTitleLastProducts=Posljednjih %s izmijenjenih proizvoda / usluga
+BoxTitleProductsAlertStock=Proizvodi u skladištu - uzbuna
+BoxTitleLastCustomerOrders=Posljdnjih %s izmijenjenih narudžba kupaca
+BoxTitleLastSuppliers=Prošlogodišnjih %s spremljenih dobavljača
+BoxTitleLastCustomers=Posljednjih %s spremljenih kupaca
+BoxTitleLastModifiedSuppliers=Posljednjih %s izmijenjenih dobavljača
+BoxTitleLastModifiedCustomers=Posljednjih %s izmijenjenih kupaca
+BoxTitleLastCustomersOrProspects=Posljednjih %s izmijenjenih kupaca ili potencijalnih kupaca
+BoxTitleLastPropals=Posljednjih %s spremljenih ponuda
+BoxTitleLastCustomerBills=Posljednjih %s računi kupaca
+BoxTitleLastSupplierBills=Posljednjih %s računi dobavljača
+BoxTitleLastProspects=Posljednjih %s spremljenih potencijalnih kupaca
+BoxTitleLastModifiedProspects=Posljednjih %s izmijenjenih potencijalnih kupaca
+BoxTitleLastProductsInContract=Posljednjih %s proizvoda / usluga u ugovorima
+BoxTitleLastModifiedMembers=Prošlogodišnji% s modificirani članovi
+BoxTitleLastFicheInter=Prošlogodišnji% s modificirani intervencija
+BoxTitleOldestUnpaidCustomerBills=Najstariji% s neplaćene račune kupca
+BoxTitleOldestUnpaidSupplierBills=Najstariji% s neplaćene račune dobavljača
+BoxTitleCurrentAccounts=Stanja otvorila korisničkog računa
+BoxTitleSalesTurnover=Promet
+BoxTitleTotalUnpaidCustomerBills=Neplaćeni računi kupca
+BoxTitleTotalUnpaidSuppliersBills=Neplaćeni računi dobavljača
+BoxTitleLastModifiedContacts=Prošlogodišnji% s modificirani kontakti / Adrese
+BoxMyLastBookmarks=Moja posljednja% s oznake
+BoxOldestExpiredServices=Najstariji aktivni istekli usluge
+BoxLastExpiredServices=Prošlogodišnji% s Najstariji kontakti s aktivnim istekao usluge
+BoxTitleLastActionsToDo=Prošlogodišnji% s akcije učiniti
+BoxTitleLastContracts=Prošlogodišnji% s ugovorima
+BoxTitleLastModifiedDonations=Prošlogodišnji% s modificirani donacije
+BoxTitleLastModifiedExpenses=Prošlogodišnji% s modificirani rashodi
+BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
+FailedToRefreshDataInfoNotUpToDate=Nisam uspio osvježiti RSS tok. Zadnja uspješna datum osvježavanja:% s
+LastRefreshDate=Posljednji dan osvježavanja
+NoRecordedBookmarks=Nema oznaka definirana.
+ClickToAdd=Kliknite ovdje za dodavanje.
+NoRecordedCustomers=Nema snimljene kupci
+NoRecordedContacts=Nema snimljene kontakti
+NoActionsToDo=Nema akcije učiniti
+NoRecordedOrders=Nema zabilježenih kupca narudžbe
+NoRecordedProposals=Nema snimljene prijedlozi
+NoRecordedInvoices=Nema zabilježenih kupca račune
+NoUnpaidCustomerBills=Ne neplaćene račune kupca
+NoRecordedSupplierInvoices=Nema zabilježenih dobavljača računi
+NoUnpaidSupplierBills=Ne neplaćene račune dobavljača
+NoModifiedSupplierBills=Nema zabilježenih dobavljača računi
+NoRecordedProducts=Nema zabilježenih proizvodi / usluge
+NoRecordedProspects=Nema snimljene perspektive
+NoContractedProducts=Nema proizvoda / usluge ugovorene
+NoRecordedContracts=Nema snimljene ugovori
+NoRecordedInterventions=Nema zabilježenih intervencija
+BoxLatestSupplierOrders=Najnoviji dobavljač narudžbe
+BoxTitleLatestSupplierOrders=% s najnovijim narudžbe dobavljačima
+NoSupplierOrder=Ne bilježi dobavljač bi
+BoxCustomersInvoicesPerMonth=Korisnički računi mjesečno
+BoxSuppliersInvoicesPerMonth=Dobavljač računi mjesečno
+BoxCustomersOrdersPerMonth=Korisnički nalozi mjesečno
+BoxSuppliersOrdersPerMonth=Dobavljač naloga mjesečno
+BoxProposalsPerMonth=Prijedlozi mjesečno
+NoTooLowStockProducts=Nema proizvoda pod niskim granice dionica
+BoxProductDistribution=Proizvodi / usluge distribucije
+BoxProductDistributionFor=Raspodjela% s za% s
+ForCustomersInvoices=Kupci računi
+ForCustomersOrders=Kupci narudžbe
+ForProposals=Prijedlozi
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index b28086fa933..22914931db1 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-# Category=Category
-# Categories=Categories
-# Rubrique=Category
-# Rubriques=Categories
-# categories=categories
-# TheCategorie=The category
-# NoCategoryYet=No category of this type created
-# In=In
-# AddIn=Add in
-# modify=modify
-# Classify=Classify
-# CategoriesArea=Categories area
-# ProductsCategoriesArea=Products/Services categories area
-# SuppliersCategoriesArea=Suppliers categories area
-# CustomersCategoriesArea=Customers categories area
-# ThirdPartyCategoriesArea=Third parties categories area
-# MembersCategoriesArea=Members categories area
-# ContactsCategoriesArea=Contacts categories area
-# MainCats=Main categories
-# SubCats=Subcategories
-# CatStatistics=Statistics
-# CatList=List of categories
-# AllCats=All categories
-# ViewCat=View category
-# NewCat=Add category
-# NewCategory=New category
-# ModifCat=Modify category
-# CatCreated=Category created
-# CreateCat=Create category
-# CreateThisCat=Create this category
-# ValidateFields=Validate the fields
-# NoSubCat=No subcategory.
-# SubCatOf=Subcategory
-# FoundCats=Found categories
-# FoundCatsForName=Categories found for the name :
-# FoundSubCatsIn=Subcategories found in the category
-# ErrSameCatSelected=You selected the same category several times
-# ErrForgotCat=You forgot to choose the category
-# ErrForgotField=You forgot to inform the fields
-# ErrCatAlreadyExists=This name is already used
-# AddProductToCat=Add this product to a category?
-# ImpossibleAddCat=Impossible to add the category
-# ImpossibleAssociateCategory=Impossible to associate the category to
-# WasAddedSuccessfully=<b>%s</b> was added successfully.
-# ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-# CategorySuccessfullyCreated=This category %s has been added with success.
-# ProductIsInCategories=Product/service owns to following categories
-# SupplierIsInCategories=Third party owns to following suppliers categories
-# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-# MemberIsInCategories=This member owns to following members categories
-# ContactIsInCategories=This contact owns to following contacts categories
-# ProductHasNoCategory=This product/service is not in any categories
-# SupplierHasNoCategory=This supplier is not in any categories
-# CompanyHasNoCategory=This company is not in any categories
-# MemberHasNoCategory=This member is not in any categories
-# ContactHasNoCategory=This contact is not in any categories
-# ClassifyInCategory=Classify in category
-# NoneCategory=None
-# NotCategorized=Without category
-# CategoryExistsAtSameLevel=This category already exists with this ref
-# ReturnInProduct=Back to product/service card
-# ReturnInSupplier=Back to supplier card
-# ReturnInCompany=Back to customer/prospect card
-# ContentsVisibleByAll=The contents will be visible by all
-# ContentsVisibleByAllShort=Contents visible by all
-# ContentsNotVisibleByAllShort=Contents not visible by all
-# CategoriesTree=Categories tree
-# DeleteCategory=Delete category
-# ConfirmDeleteCategory=Are you sure you want to delete this category ?
-# RemoveFromCategory=Remove link with categorie
-# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-# NoCategoriesDefined=No category defined
-# SuppliersCategoryShort=Suppliers category
-# CustomersCategoryShort=Customers category
-# ProductsCategoryShort=Products category
-# MembersCategoryShort=Members category
-# SuppliersCategoriesShort=Suppliers categories
-# CustomersCategoriesShort=Customers categories
-# CustomersProspectsCategoriesShort=Custo./Prosp. categories
-# ProductsCategoriesShort=Products categories
-# MembersCategoriesShort=Members categories
-# ContactCategoriesShort=Contacts categories
-# ThisCategoryHasNoProduct=This category does not contain any product.
-# ThisCategoryHasNoSupplier=This category does not contain any supplier.
-# ThisCategoryHasNoCustomer=This category does not contain any customer.
-# ThisCategoryHasNoMember=This category does not contain any member.
-# ThisCategoryHasNoContact=This category does not contain any contact.
-# AssignedToCustomer=Assigned to a customer
-# AssignedToTheCustomer=Assigned to the customer
-# InternalCategory=Internal category
-# CategoryContents=Category contents
-# CategId=Category id
-# CatSupList=List of supplier categories
-# CatCusList=List of customer/prospect categories
-# CatProdList=List of products categories
-# CatMemberList=List of members categories
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+Category=Category
+Categories=Categories
+Rubrique=Category
+Rubriques=Categories
+categories=categories
+TheCategorie=The category
+NoCategoryYet=No category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Categories area
+ProductsCategoriesArea=Products/Services categories area
+SuppliersCategoriesArea=Suppliers categories area
+CustomersCategoriesArea=Customers categories area
+ThirdPartyCategoriesArea=Third parties categories area
+MembersCategoriesArea=Members categories area
+ContactsCategoriesArea=Contacts categories area
+MainCats=Main categories
+SubCats=Subcategories
+CatStatistics=Statistics
+CatList=List of categories
+AllCats=All categories
+ViewCat=View category
+NewCat=Add category
+NewCategory=New category
+ModifCat=Modify category
+CatCreated=Category created
+CreateCat=Create category
+CreateThisCat=Create this category
+ValidateFields=Validate the fields
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found categories
+FoundCatsForName=Categories found for the name :
+FoundSubCatsIn=Subcategories found in the category
+ErrSameCatSelected=You selected the same category several times
+ErrForgotCat=You forgot to choose the category
+ErrForgotField=You forgot to inform the fields
+ErrCatAlreadyExists=This name is already used
+AddProductToCat=Add this product to a category?
+ImpossibleAddCat=Impossible to add the category
+ImpossibleAssociateCategory=Impossible to associate the category to
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this category.
+CategorySuccessfullyCreated=This category %s has been added with success.
+ProductIsInCategories=Product/service owns to following categories
+SupplierIsInCategories=Third party owns to following suppliers categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
+MemberIsInCategories=This member owns to following members categories
+ContactIsInCategories=This contact owns to following contacts categories
+ProductHasNoCategory=This product/service is not in any categories
+SupplierHasNoCategory=This supplier is not in any categories
+CompanyHasNoCategory=This company is not in any categories
+MemberHasNoCategory=This member is not in any categories
+ContactHasNoCategory=This contact is not in any categories
+ClassifyInCategory=Classify in category
+NoneCategory=None
+NotCategorized=Without category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ReturnInProduct=Back to product/service card
+ReturnInSupplier=Back to supplier card
+ReturnInCompany=Back to customer/prospect card
+ContentsVisibleByAll=The contents will be visible by all
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+CategoriesTree=Categories tree
+DeleteCategory=Delete category
+ConfirmDeleteCategory=Are you sure you want to delete this category ?
+RemoveFromCategory=Remove link with categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
+NoCategoriesDefined=No category defined
+SuppliersCategoryShort=Suppliers category
+CustomersCategoryShort=Customers category
+ProductsCategoryShort=Products category
+MembersCategoryShort=Members category
+SuppliersCategoriesShort=Suppliers categories
+CustomersCategoriesShort=Customers categories
+CustomersProspectsCategoriesShort=Custo./Prosp. categories
+ProductsCategoriesShort=Products categories
+MembersCategoriesShort=Members categories
+ContactCategoriesShort=Contacts categories
+ThisCategoryHasNoProduct=This category does not contain any product.
+ThisCategoryHasNoSupplier=This category does not contain any supplier.
+ThisCategoryHasNoCustomer=This category does not contain any customer.
+ThisCategoryHasNoMember=This category does not contain any member.
+ThisCategoryHasNoContact=This category does not contain any contact.
+AssignedToCustomer=Assigned to a customer
+AssignedToTheCustomer=Assigned to the customer
+InternalCategory=Internal category
+CategoryContents=Category contents
+CategId=Category id
+CatSupList=List of supplier categories
+CatCusList=List of customer/prospect categories
+CatProdList=List of products categories
+CatMemberList=List of members categories
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index ffb3fc0f522..48d8b78f547 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -26,7 +26,7 @@ IdCompany=Id kompanije
 IdContact=Id kontakta
 Contacts=Kontakti/Adrese
 ThirdPartyContacts=Kontakti treće stranke
-ThirdPartyContact=Third party contact/address
+ThirdPartyContact=Stranka kontakt / adresa
 StatusContactValidated=Status of contact/address
 Company=Kompanija
 CompanyName=Ime kompanije 
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=Lista dobavljača
 ListProspectsShort=Lista potencijalnih kupaca
 ListCustomersShort=Lista kupaca
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Otvoren
@@ -410,3 +410,5 @@ OutstandingBillReached=Dosegnut je maksimalni iznos za otvorene stavke
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 12a72464cae..f7aed91cf81 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
-# Donations=Donations
-# DonationRef=Donation ref.
-# Donor=Donor
-# Donors=Donors
-# AddDonation=Add a donation
-# NewDonation=New donation
-# ShowDonation=Show donation
-# DonationPromise=Gift promise
-# PromisesNotValid=Not validated promises
-# PromisesValid=Validated promises
-# DonationsPaid=Donations paid
-# DonationsReceived=Donations received
-# PublicDonation=Public donation
-# DonationsNumber=Donation number
-# DonationsArea=Donations area
-# DonationStatusPromiseNotValidated=Draft promise
-# DonationStatusPromiseValidated=Validated promise
-# DonationStatusPaid=Donation received
-# DonationStatusPromiseNotValidatedShort=Draft
-# DonationStatusPromiseValidatedShort=Validated
-# DonationStatusPaidShort=Received
-# ValidPromess=Validate promise
-# DonationReceipt=Donation receipt
-# BuildDonationReceipt=Build receipt
-# DonationsModels=Documents models for donation receipts
-# LastModifiedDonations=Last %s modified donations
-# SearchADonation=Search a donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+Donors=Donors
+AddDonation=Create a donation
+NewDonation=New donation
+ShowDonation=Show donation
+DonationPromise=Gift promise
+PromisesNotValid=Not validated promises
+PromisesValid=Validated promises
+DonationsPaid=Donations paid
+DonationsReceived=Donations received
+PublicDonation=Public donation
+DonationsNumber=Donation number
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+BuildDonationReceipt=Build receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Last %s modified donations
+SearchADonation=Search a donation
+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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang
index 0a5b3e15467..c79da05364e 100644
--- a/htdocs/langs/hr_HR/interventions.lang
+++ b/htdocs/langs/hr_HR/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
-# Interventions=Interventions
-# InterventionCard=Intervention card
-# NewIntervention=New intervention
-# AddIntervention=Add intervention
-# ListOfInterventions=List of interventions
-# EditIntervention=Edit intervention
-# ActionsOnFicheInter=Actions on intervention
-# LastInterventions=Last %s interventions
-# AllInterventions=All interventions
-# CreateDraftIntervention=Create draft
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
-# InterventionContact=Intervention contact
-# DeleteIntervention=Delete intervention
-# ValidateIntervention=Validate intervention
-# ModifyIntervention=Modify intervention
-# DeleteInterventionLine=Delete intervention line
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
-# NameAndSignatureOfExternalContact=Name and signature of customer :
-# DocumentModelStandard=Standard document model for interventions
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-# ClassifyBilled=Classify "Billed"
-# StatusInterInvoiced=Billed
-# RelatedInterventions=Related interventions
-# ShowIntervention=Show intervention
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ListOfInterventions=List of interventions
+EditIntervention=Edit intervention
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Last %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+CustomerDoesNotHavePrefix=Customer does not have a prefix
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+NameAndSignatureOfInternalContact=Name and signature of intervening :
+NameAndSignatureOfExternalContact=Name and signature of customer :
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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
-# TypeContact_fichinter_external_BILLING=Billing customer contact
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
+TypeContact_fichinter_internal_INTERVENING=Intervening
+TypeContact_fichinter_external_BILLING=Billing customer contact
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
-# ArcticNumRefModelError=Failed to activate
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Generic number model
+ArcticNumRefModelError=Failed to activate
+PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index 685db01debc..7c63d8971c4 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -10,7 +10,7 @@ Language_da_DA=Danski
 Language_da_DK=Danski
 Language_de_DE=Njemački
 Language_de_AT=Njemački (Austrija)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Njemački (Švicarska)
 Language_el_GR=Grčki
 Language_en_AU=Engleski (Australija)
 Language_en_GB=Engleski (United Kingdom)
@@ -20,7 +20,7 @@ Language_en_SA=Engleski (Saudijska Arabija)
 Language_en_US=Engleski (United States)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španjolski
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Španjolski (Dominikanska Republika)
 Language_es_AR=Španjolski (Argentina)
 Language_es_CL=Španjolski (Čile)
 Language_es_HN=Španjolski (Honduras)
@@ -40,7 +40,7 @@ Language_fr_NC=Francuski (Nova Kaledonija)
 Language_he_IL=Hebrew
 Language_hr_HR=Hrvatski
 Language_hu_HU=Mađarski
-Language_id_ID=Indonesian
+Language_id_ID=Indonezijski
 Language_is_IS=Islandski
 Language_it_IT=Talijanski
 Language_ja_JP=Japanski
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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<br/>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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+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 <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
+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 <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
+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.<br><br>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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 f2db3018ac0..765c7e211a2 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Zatvoreno
 ContractStatusRunning=U tijeku
 ContractStatusExpired=isteklo
 ContractStatusOnHold=Nije u tijeku
-ContractStatusToRun=Pustiti u rad
+ContractStatusToRun=To get running
 ContractNotRunning=Ovaj ugovor nije u tijeku
 ErrorProductAlreadyExists=Proizvod s oznakom %s već postoji
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Dobavljači
 SupplierRef=Supplier's product ref.
 ShowProduct=Prikaži proizvod
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 5ca3c3e3f95..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 <b>%s</b>?
 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 e404bb39120..6e769ef91e7 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - sendings
-# RefSending=Ref. shipment
+RefSending=Ref. shipment
 Sending=Pošiljka
 Sendings=Pošiljke
 Shipment=Pošiljka
 Shipments=Pošiljke
-# Receivings=Receivings
-# SendingsArea=Shipments area
+Receivings=Receivings
+SendingsArea=Shipments area
 ListOfSendings=Popis pošiljki
 SendingMethod=Metoda dostave
 SendingReceipt=Otpremnica pošiljke
@@ -14,7 +14,7 @@ SearchASending=Pretraži pošiljke
 StatisticsOfSendings=Statistike pošiljki
 NbOfSendings=Broj pošiljki
 NumberOfShipmentsByMonth=Broj pošiljki tijekom mjeseca
-# SendingCard=Shipping card
+SendingCard=Shipping card
 NewSending=Nova pošiljka
 CreateASending=Kreiraj pošiljku
 CreateSending=Kreiraj pošiljku
@@ -22,22 +22,22 @@ QtyOrdered=Količina naručena
 QtyShipped=Količina poslana
 QtyToShip=Količina za poslat
 QtyReceived=Količina primljena
-# KeepToShip=Keep to ship
-# OtherSendingsForSameOrder=Other shipments for this order
-# DateSending=Date sending order
-# DateSendingShort=Date sending order
-# SendingsForSameOrder=Shipments for this order
-# SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-# SendingsToValidate=Shipments to validate
+KeepToShip=Keep to ship
+OtherSendingsForSameOrder=Other shipments for this order
+DateSending=Date sending order
+DateSendingShort=Date sending order
+SendingsForSameOrder=Shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
+SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Poništeno
 StatusSendingDraft=Skica
-# StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Obrađen
 StatusSendingCanceledShort=Poništeno
 StatusSendingDraftShort=Skica
 StatusSendingValidatedShort=Ovjereno
 StatusSendingProcessedShort=Obrađen
-# SendingSheet=Sending sheet
+SendingSheet=Sending sheet
 Carriers=Dostavljači
 Carrier=Dostavljač
 CarriersArea=Područje dostavljača
@@ -45,32 +45,36 @@ NewCarrier=Novi dostavljač
 ConfirmDeleteSending=Jeste li sigurni da želite izbrisati ovu pošiljku?
 ConfirmValidateSending=jeste li sigurni da želite ovjeriti ovu pošiljku sa referencom <b>%s</b> ?
 ConfirmCancelSending=Jeste li sigurni da želite poništiti ovu pošiljku?
-# GenericTransport=Generic transport
-# Enlevement=Gotten by customer
+GenericTransport=Generic transport
+Enlevement=Gotten by customer
 DocumentModelSimple=Jednostavan model dokumenta
-# DocumentModelMerou=Merou A5 model
-# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-# DateDeliveryPlanned=Planed date of delivery
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planed date of delivery
 DateReceived=Datum primitka pošiljke
 SendShippingByEMail=Pošalji pošiljku Emailom
-SendShippingRef=Pošalji pošiljku %s
-# ActionsOnShipping=Events on shipment
-# LinkToTrackYourPackage=Link to track your package
-# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
 RelatedShippings=Povezane pošiljke
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Ukupni volumen proizvoda
 SumOfProductWeights=Ukupna težina proizvoda
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/hr_HR/shop.lang b/htdocs/langs/hr_HR/shop.lang
deleted file mode 100644
index 595948cc6fb..00000000000
--- a/htdocs/langs/hr_HR/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Trgovina
-ShopWeb=Web trgovina
-LastOrders=Zadnje narudžbe
-OnStandBy=Na čekanju
-TreatmentInProgress=Tretman je u tijeku
-LastCustomers=Zadnji kupci
-OSCommerceShop=OScommerce trgovina
-OSCommerce=OSCommerce
-AddProd=Prodavaj putem web trgovine
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/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index 01c90ede80f..b1545d6ca3c 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
-# Suppliers=Suppliers
-# Supplier=Supplier
-# AddSupplier=Add a supplier
-# SupplierRemoved=Supplier removed
-# SuppliersInvoice=Suppliers invoice
-# NewSupplier=New supplier
-# History=History
-# ListOfSuppliers=List of suppliers
-# ShowSupplier=Show supplier
-# OrderDate=Order date
-# BuyingPrice=Buying price
-# BuyingPriceMin=Minimum buying price
-# BuyingPriceMinShort=Min buying price
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
-# AddSupplierPrice=Add supplier price
-# ChangeSupplierPrice=Change supplier price
-# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-# NoRecordedSuppliers=No suppliers recorded
-# SupplierPayment=Supplier payment
-# SuppliersArea=Suppliers area
-# RefSupplierShort=Ref. supplier
-# Availability=Availability
-# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-# ExportDataset_fournisseur_2=Supplier invoices and payments
-# ExportDataset_fournisseur_3=Supplier orders and order lines
-# ApproveThisOrder=Approve this order
-# ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-# DenyingThisOrder=Denying this order
-# ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-# ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-# AddCustomerOrder=Create customer order
-# AddCustomerInvoice=Create customer invoice
-# AddSupplierOrder=Create supplier order
-# AddSupplierInvoice=Create supplier invoice
-# ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-# NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-# SentToSuppliers=Sent to suppliers
+Suppliers=Suppliers
+Supplier=Supplier
+AddSupplier=Add a supplier
+SupplierRemoved=Supplier removed
+SuppliersInvoice=Suppliers invoice
+NewSupplier=New supplier
+History=History
+ListOfSuppliers=List of suppliers
+ShowSupplier=Show supplier
+OrderDate=Order date
+BuyingPrice=Buying price
+BuyingPriceMin=Minimum buying price
+BuyingPriceMinShort=Min buying price
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add supplier price
+ChangeSupplierPrice=Change supplier price
+ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+NoRecordedSuppliers=No suppliers recorded
+SupplierPayment=Supplier payment
+SuppliersArea=Suppliers area
+RefSupplierShort=Ref. supplier
+Availability=Availability
+ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
+ExportDataset_fournisseur_2=Supplier invoices and payments
+ExportDataset_fournisseur_3=Supplier orders and order lines
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+DenyingThisOrder=Denying this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+AddCustomerOrder=Create customer order
+AddCustomerInvoice=Create customer invoice
+AddSupplierOrder=Create supplier order
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
+NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index 55ce45bfce8..4b0501a8346 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-# TF_OTHER=Other
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+Trip=Trip
+Trips=Trips
+TripsAndExpenses=Trips and expenses
+TripsAndExpensesStatistics=Trips and expenses statistics
+TripCard=Trip card
+AddTrip=Add trip
+ListOfTrips=List of trips
+ListOfFees=List of fees
+NewTrip=New trip
+CompanyVisited=Company/foundation visited
+Kilometers=Kilometers
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete trip
+ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+TF_OTHER=Other
+TF_LUNCH=Lunch
+TF_TRIP=Trip
+ListTripsAndExpenses=List of trips and expenses
+ExpensesArea=Trips and expenses area
+SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 9003d43e9b7..b5757284f28 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Hiba történt, ez a modul Dolibarr %s verzió
 ErrorDecimalLargerThanAreForbidden=Hiba, a precíziós magasabb <b>%s</b> nem támogatott.
 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)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Doboz
 Boxes=Dobozok
 MaxNbOfLinesForBoxes=Max. sorok száma a dobozok
 PositionByDefault=Alapértelmezett sorrend
-Position=Megrendelés
+Position=Position
 MenusDesc=Menük vezetők határozzák meg tartalmát, a 2 menüsorok (vízszintes és függőleges bar bar).
 MenusEditorDesc=A menü szerkesztő teszik, hogy megadjuk a menükben személyes bejegyzéseket. Használja óvatosan, hogy ne dolibarr instabil és menüpontok tartósan elérhetetlen. <br> Néhány modul bejegyzéseket a menükben (a menü <b>Összes</b> a legtöbb esetben). Ha eltávolította ezeket a bejegyzéseket néhány véletlenül, vissza tudja állítani őket, és letiltja reenabling a modul.
 MenuForUsers=Menü a felhasználók
@@ -206,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ő
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatikus ha a JavaScript le van tiltva
 AvailableOnlyIfJavascriptNotDisabled=Csak ha a JavaScript nincs letiltva
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Csak ha a JavaScript nincs letiltva
 Required=Kötelező
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Biztonság
 Passwords=Jelszavak
 DoNotStoreClearPassword=Do No Store egyértelmű jelszavakat adatbázisban tárolja, de csak a titkosított érték (aktivált ajánlott)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (nem definiált
 MAIN_MAIL_EMAIL_FROM=Feladó e-mail automatikus e-maileket (alapértelmezés a php.ini-ben: <b>%s)</b>
 MAIN_MAIL_ERRORS_TO=Feladó e-mail használt hiba visszatér elküldött e-mailek
 MAIN_MAIL_AUTOCOPY_TO= Küldje szisztematikusan rejtett szén-másolatot az összes elküldött e-mailek
+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=Tiltsa le az összes e-mailek küldésének (vizsgálati célokra, vagy demo)
 MAIN_MAIL_SENDMODE=Módszer használata küldjön e-mailt
 MAIN_MAIL_SMTPS_ID=SMTP hitelesítés szükséges, ha ID
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=Webáruház közvetlen adatbázis elérés
-Module800Desc=Interfész mutatnak OsCommerce vagy OSCSS üzlet Közvetlen adatbázis hozzáférés
-Module900Name=OsCommerce WS
-Module900Desc=Interfész mutatnak OsCommerce üzlet web-szolgáltatásokat. Ez a modul telepítését requiere komponenseket / oscommerce_ws / ws_server be OsCommerce szerverre. Lásd a README fájl a / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integráció
 Module1400Name=Számvitel
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Létrehozza / módosítja a társadalombiztosítási járulékok é
 Permission93=Törlés társadalombiztosítási járulékok és az áfa
 Permission94=Export társadalombiztosítási járulékok
 Permission95=Olvassa jelentések
-Permission96=Setup szállítási
-Permission97=Olvassa el szállítási nyilvántartási számla
-Permission98=A számla elküldése számviteli vonalak
 Permission101=Olvassa küldések
 Permission102=Létrehozza / módosítja küldések
 Permission104=Érvényesítés küldések
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Vissza 1 számviteli kódot építette: <br> %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 &quot;C&quot;-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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Professzionális egyedi azonosító
 MustBeUnique=Egyedinek kell lennie?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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 <br> <b>__PHONETO__</b> Hogy fogja helyettesíteni a telefonszámot hívott személynek <br> <b>__PHONEFROM__</b> Hogy váltják fel a hívó telefonszámát személy (a tiéd) <br> <b>__LOGIN__</b> Hogy váltják fel clicktodial login (azaz a felhasználói kártya) <br> <b>__PASS__</b> Hogy váltják a clicktodial jelszót (amelyeket a felhasználói kártya).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,8 +1424,9 @@ OSCommerceTestOk=Csatlakozás a szerverhez &quot;%s&quot; az adatbázis &quot;%s
 OSCommerceTestKo1=Csatlakozás a szerverhez &quot;%s&quot; sikerül, de adatbázis &quot;%s&quot; nem lehet elérni.
 OSCommerceTestKo2=Csatlakozás a szerverhez &quot;%s&quot; felhasználói &quot;%s&quot; 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
@@ -1474,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.
@@ -1531,5 +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 68fb2c9acec..45bc191ced2 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Cselekvés
 ActionsArea=Cselekvés terület (Események és Feladatok)
-Agenda= Napirend
-Agendas= Napirendek
-Calendar= Naptár
-Calendars= Naptárak
-LocalAgenda=Helyi naptár
-AffectedTo= Befolyásolhatja
-DoneBy= Által végzett
-Events= Események
+Agenda=Napirend
+Agendas=Napirendek
+Calendar=Naptár
+Calendars=Naptárak
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Befolyásolhatja
+DoneBy=Által végzett
+Event=Event
+Events=Események
 EventsNb=Number of events
 MyEvents=Saját rendezvények
 OtherEvents=Egyéb események
@@ -17,31 +19,33 @@ ListOfActions=Események listája
 Location=Helyszín
 EventOnFullDay=Egész napos esemény
 SearchAnAction= Cselekvés/feladat keresése
-MenuToDoActions= Minden nem teljesített cselekvés
-MenuDoneActions= Minden megszüntetett cselekvés
-MenuToDoMyActions= Nem teljesített cselekvéseim
-MenuDoneMyActions= Megszüntetett cselekvéseim
-ListOfEvents= Dolibarr események listája
+MenuToDoActions=Minden nem teljesített cselekvés
+MenuDoneActions=Minden megszüntetett cselekvés
+MenuToDoMyActions=Nem teljesített cselekvéseim
+MenuDoneMyActions=Megszüntetett cselekvéseim
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Cselekvéseket rögzítette
 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
 ViewCal=Naptár megtekintése
 ViewDay=Nap nézet
 ViewWeek=Hét nézet
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Előre definiált szűrőkkel való megtekintés
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ 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=<b>login=%s</b> kimenet szükítése a <b>%s</b> felhasználó által létrehozott cselekvésekre, érintő cselekvésekre,által végzett cselekvésekre.
-AgendaUrlOptions3=<b>logina=%s</b> kimenet szükítése a <b>%s</b> felhasználó által létrehozott cselekvésekre.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> kimenet szükítése a <b>%s</b> felhasználó érintő cselekvésekre.
-AgendaUrlOptions5=<b>logind=%s</b> kimenet szükítése a <b>%s</b> felhasználó által végzett cselekvésekre.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Kapcsolatok születésnapjának mutatása
 AgendaHideBirthdayEvents=Kapcsolatok születésnapjának elrejtése
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export naptár
 ExtSites=Importálása külső naptárak
-ExtSitesEnableThisTool=Mutasd a napirendi külső naptárak
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Száma naptárak
 AgendaExtNb=Naptár nb %s
 ExtSiteUrlAgenda=URL eléréséhez. ICal fájl
 ExtSiteNoLabel=Nincs leírás
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 643d7e5112e..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 <b>jóváírást</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify &quot;fizetni&quot;
 ClassifyPaidPartially=Osztályozása &quot;részben fizetett&quot;
 ClassifyCanceled=Classify &quot;elhagyott&quot;
 ClassifyClosed=Classify &quot;zárt&quot;
+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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Biztosan meg akarja szakítani <b>%s</b> számlát?
 ConfirmCancelBillQuestion=Miért akar minősíteni ezt a számlát &quot;elhagyott&quot;?
 ConfirmClassifyPaidPartially=Biztosan meg szeretné változtatni a status <b>%s</b> 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 <b>(%s %s)</b> egy engedmény, mert a fizetés előtt távon. Azt szabályozza az ÁFA-jóváírást.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Fennmaradó fizetni <b>(%s %s)</b> egy engedmény, mert a fizetés előtt távon. Elfogadom, hogy elveszíti a HÉA-e kedvezmény.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Fennmaradó fizetni <b>(%s %s)</b> 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 <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Árengedmény (kifizetés előtt tartó)
-SendBillRef=Küldjön számlát %s
-SendReminderBillRef=Küldje számla %s (emlékeztető)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Állandó megbízás
 StandingOrder=Állandó érvényű parancs
 NoDraftBills=Nincs tervezet számlák
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Összesen két új kedvezményt meg kell eg
 ConfirmRemoveDiscount=Biztosan el akarja távolítani ezt a kedvezményt?
 RelatedBill=Kapcsolódó számla
 RelatedBills=Kapcsolódó számlák
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Azonnali
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Bankbetét
 PaymentTypeShortVIR=Bankbetét
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 41fe7fbada0..348f309e7f2 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -16,7 +16,7 @@ SuppliersCategoriesArea=Beszállítói kategóriák terület
 CustomersCategoriesArea=Ügyfél kategóriák terület
 ThirdPartyCategoriesArea=Harmadik fél kategóriák terület
 MembersCategoriesArea=Tagok kategória terület
-# ContactsCategoriesArea=Contacts categories area
+ContactsCategoriesArea=Contacts categories area
 MainCats=Fő kategóriák
 SubCats=Alkategóriák
 CatStatistics=Statisztikák
@@ -50,15 +50,15 @@ SupplierIsInCategories=Ez a harmadik fél a következő beszállítókat tulajdo
 CompanyIsInCustomersCategories=Ez a harmadik fél a következő ügyfeleket/kilátásokat tulajdonolják
 CompanyIsInSuppliersCategories=Ez a harmadik fél a következő beszállítókat tulajdonolják
 MemberIsInCategories=Ez a tag ebbe a tag kategóriába tartozik
-# ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=This contact owns to following contacts categories
 ProductHasNoCategory=Ez a termék/szolgáltatás nincs egy kategóriában sem
 SupplierHasNoCategory=Ez a beszállító nincs egy kategóriában sem
 CompanyHasNoCategory=Ez a cég nincs egy kategóriában sem
 MemberHasNoCategory=Ez a tag nincs egy kategóriában sem
-# ContactHasNoCategory=This contact is not in any categories
+ContactHasNoCategory=This contact is not in any categories
 ClassifyInCategory=Kategorizálni
 NoneCategory=Nincs
-# NotCategorized=Without category
+NotCategorized=Without category
 CategoryExistsAtSameLevel=Ez a kategória ezzel a ref# -el már létezik
 ReturnInProduct=Vissza a termék/szolgáltatás kártyához
 ReturnInSupplier=Vissza a beszállító kártyához
@@ -66,7 +66,7 @@ ReturnInCompany=Vissza az ügyfél/kilátás kártyához
 ContentsVisibleByAll=A tartalom mindenki számára látható lesz
 ContentsVisibleByAllShort=Tartalom látható mindenki számára
 ContentsNotVisibleByAllShort=Tartalom nem látható mindenki számára
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=Kategória törlése
 ConfirmDeleteCategory=Biztos törölni akarja a kategóriát?
 RemoveFromCategory=Kategória link eltávolítása
@@ -81,12 +81,12 @@ CustomersCategoriesShort=Vásárlói kategória
 CustomersProspectsCategoriesShort=Vásárló/Kilátás kategóriák
 ProductsCategoriesShort=Termék kategória
 MembersCategoriesShort=Tag kategória
-# ContactCategoriesShort=Contacts categories
+ContactCategoriesShort=Contacts categories
 ThisCategoryHasNoProduct=Ez a kategória nem tartalmaz termékeket.
 ThisCategoryHasNoSupplier=Ez a kategória nem tartalmaz beszállítót.
 ThisCategoryHasNoCustomer=Ez a kategória nem tartalmaz vásárlót.
 ThisCategoryHasNoMember=Ez a kategória nem tartalmaz tagot.
-# ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Vásárlóhoz rendelve
 AssignedToTheCustomer=Vásárlóhoz rendelve
 InternalCategory=Belső kategória
@@ -96,18 +96,17 @@ CatSupList=Beszállítói kategóriák listázása
 CatCusList=Ügyfél/kilátás kategóriák listázása
 CatProdList=Termék kategóriák listázása
 CatMemberList=Tag kategóriák listázása
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index f3e560298d9..0e5a758e750 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Létre kell hoznia e-mail kapcsolatokat a harmadik pá
 ListSuppliersShort=Beszállítók listája
 ListProspectsShort=Listája kilátások
 ListCustomersShort=Ügyfelek listája
-ThirdPartiesArea=Harmadik fél területén
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Utolsó módosítás %s harmadik fél
 UniqueThirdParties=Összesen egyedi harmadik fél
 InActivity=Nyitva
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Vissza a numero formátumban %syymm-nnnn kódot, és az ügyfelek %syymm-nnnn kódot, ahol a szállító yy év, hónap és mm nnnn sorozata szünet nélkül, és nincs visszaút 0-ra.
 LeopardNumRefModelDesc=Vevő / szállító kód ingyenes. Ez a kód lehet bármikor módosítható.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 357d0092b75..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 d0a18bec5ad..78108dcd9dc 100644
--- a/htdocs/langs/hu_HU/donations.lang
+++ b/htdocs/langs/hu_HU/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Adomány
 Donations=Adományok
-# DonationRef=Donation ref.
+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
+ShowDonation=Show donation
 DonationPromise=Ajándék ígéret
 PromisesNotValid=Nem hitelesített ígéretek
 PromisesValid=Hitelesített ígéretek
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Vázlat
 DonationStatusPromiseValidatedShort=Hitelesített
 DonationStatusPaidShort=Kapott
 ValidPromess=Érvényesítés ígéret
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=Nyugta készítése
 DonationsModels=Dokumentum modellek adományok nyugtájához
 LastModifiedDonations=Utolsó módosítás adományok %s
 SearchADonation=Keresés adományt
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 ac29c8970db..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 &quot;%s&quot; helytelen paraméter &quot;%s&quot;
-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 &quot;%s&quot; 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 <b>%s</b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
index f4b83ce25b0..da15f4169e5 100644
--- a/htdocs/langs/hu_HU/exports.lang
+++ b/htdocs/langs/hu_HU/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Számlaszám
 BankAccountNumberKey=Kulcs
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 1bab1342ddc..6b94d93f203 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Kezdési dátum
 DateFinCP=Befejezési dátum
@@ -18,24 +18,24 @@ ApprovedCP=Jóváhagyott
 CancelCP=Megszakítva
 RefuseCP=Megtagadta
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Leírás
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Szerkesztés
 DeleteCP=Törlés
 ActionValidCP=Hitelesítés
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Megszakítás
 StatutCP=Állapot
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Frissítés
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Ok
 UserCP=Felhasználó
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Hitelesítés
 UpdateEventCP=Update events
 CreateEventCP=Létrehozás
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Frissítés
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
index c7eaf7499b8..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
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=Biztos törölni akarja ezt az intervenciót vonal
 NameAndSignatureOfInternalContact=Beavatkozó neve és aláírása:
 NameAndSignatureOfExternalContact=Ügyfél neve és aláírása:
 DocumentModelStandard=Standard dokumentum modell intervenciókhoz
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Classify &quot;számlázott&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=Általános szám modell
 ArcticNumRefModelError=Sikertelen aktiválás
 PacificNumRefModelDesc1=Számot ad a következő formában: %syymm-nnnn ahol yy az év, mm a hónap és nnnn 4 szám 0-tól indúlva
 PacificNumRefModelError=Egy intervenciós kártya $syymm kezdéssel már létezik és nem kompatibilies ezzel a szekvencia modellel. Távolítsa el vagy nevezze át hogy aktiválhassa a modult.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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=<b>%s</b> 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<br/>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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Fizetni hitelkártyával vagy PayPal, kattintson gombra a lap alján. <br>
-# 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 <b>%s</b
 ConfirmCancelOrder=Biztosan meg akarja szakítani ezt a sorrendet?
 ConfirmMakeOrder=Biztos vagy benne, hogy megerősítse annak érdekében tették ezt a <b>%s?</b>
 GenerateBill=Számla generálása
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
 ClassifyBilled=Classify &quot;számlázott&quot;
 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 &quot;%s&quot;
 Error_FailedToLoad_COMMANDE_ADDON_File=Nem sikerült betölteni a modul fájlt &quot;%s&quot;
-# 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. <br><br> 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 be99ba4cbd8..bdcddfabdcf 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Lezárva
 ContractStatusRunning=Folyamatban
 ContractStatusExpired=lejárt
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=Ez a szerződés nincs folyamatban
 ErrorProductAlreadyExists=Egy terméke ezzel a referenciával %s már létezik.
 ErrorProductBadRefOrLabel=Rossz érték a referenciának vagy feliratnak.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Beszállítók
 SupplierRef=Beszállítók ref#.
 ShowProduct=Termék megmutatása
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Termék vagy szolgáltatás klónozása
 ConfirmCloneProduct=Biztos, hogy klónozni akarja ezt a szolgáltatást: <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 ae4d0dcb20a..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
@@ -85,13 +87,13 @@ ActionsOnProject=Projekteh tartozó cselekvések
 YouAreNotContactOfProject=Nem kapcsolata ennek a privát projektnek
 DeleteATimeSpent=Eltöltött idő törlése
 ConfirmDeleteATimeSpent=Biztos törölni akarja az eltöltött időt?
-DoNotShowMyTasksOnly=Minden feladat mutatása
-ShowMyTasksOnly=Csak azon feladatok mutatása ami érintő
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Erőforrások
 ProjectsDedicatedToThisThirdParty=Harmadik félhnek dedikált projektek
 NoTasks=Nincs a projekthez tartozó feladat
 LinkedToAnotherCompany=Harmadik félhez kapcsolva
-TaskIsNotAffectedToYou=Feladat nem osztottak neked
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Töltött idő üres
 ThisWillAlsoRemoveTasks=Ez a művelet is törli az összes feladatot a projekt <b>(%s</b> feladatokat a pillanatban), és az összes bemenet eltöltött idő.
 IfNeedToUseOhterObjectKeepEmpty=Ha egyes tárgyakat (számla, megrendelés, ...), amelyek egy másik harmadik félnek kell kapcsolódniuk a projekt létrehozásához, tartsa ezt az üres, hogy a projekt, hogy több harmadik fél.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Teljes jelentés modell (logo, ...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 bc7da1abf28..dc143062fc8 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=%s utolsó szállítás
 SearchASending=Szállítás keresése
 StatisticsOfSendings=Szállítási statisztikák
 NbOfSendings=Szállítások száma
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Szállítási kártya
 NewSending=Új szállítás
 CreateASending=Szállítás létrehozása
@@ -50,27 +50,31 @@ Enlevement=Ügyfél átvette
 DocumentModelSimple=Egyszerű dokumentum modell
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Figyelem, nincs szállításra váró termék.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Tervezett szállítási dátum
 DateReceived=Átvétel dátuma
 SendShippingByEMail=Küldés e-mailben szállítás
-SendShippingRef=Küldje szállítás %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Események a szállítás
 LinkToTrackYourPackage=Link követni a csomagot
 ShipmentCreationIsDoneFromOrder=Ebben a pillanatban, létrejön egy új szállítmány kerül sor a sorrendben kártyát.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
 SendingMethodTRANS=Szállító
 SendingMethodCOLSUI=Futár szolgálat
-
 # ModelDocument
 DocumentModelSirocco=Egyszerű dokumentum modell bizonylatokhoz
 DocumentModelTyphon=Teljesebb dokumentum modell bizonylatokhoz (logo...)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Állandó EXPEDITION_ADDON_NUMBER nincs definiálva
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/hu_HU/shop.lang b/htdocs/langs/hu_HU/shop.lang
deleted file mode 100644
index 07c66d77d53..00000000000
--- a/htdocs/langs/hu_HU/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Bolt
-ShopWeb=Web Bolt
-LastOrders=Utolsó rendelések
-OnStandBy=Készenléti állapotban
-TreatmentInProgress=Kezelés folyamatban
-LastCustomers=Utolsó vásárlók
-OSCommerceShop=OSCommerce bolt
-OSCommerce=OSCommerce
-AddProd=Online eladás
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/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 95b02f57429..ea6dcc26afa 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=Megrendelés dátuma
 BuyingPrice=Vásárlási ár
 BuyingPriceMin=Minimális felvásárlási árat
 BuyingPriceMinShort=Min felvásárlási ár
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Beszállítói ár hozzáadása
 ChangeSupplierPrice=Beszállítói ár megváltoztatása
 ErrorQtyTooLowForThisSupplier=A mennyiség túl kicsi ehhez a beszállítóhoz vagy nincs ár meghatározva erre a termékre ettől beszállítótól.
@@ -27,7 +27,7 @@ RefSupplierShort=Beszállító #
 Availability=Elérhetőség
 ExportDataset_fournisseur_1=Beszállítói számla lista és számla sorok
 ExportDataset_fournisseur_2=Beszállítói számlák és fizetések
-# ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Megrendelés jóváhagyása
 ConfirmApproveThisOrder=Biztos jóvá akarja hagyni a megrendelést?
 DenyingThisOrder=Megrendelés elutasítása
@@ -39,4 +39,6 @@ AddSupplierOrder=Beszállítói megrendelés létrehozása
 AddSupplierInvoice=Beszállítói számla létrehozása
 ListOfSupplierProductForSupplier=<b>%s</b> beszállító termékei és árai
 NoneOrBatchFileNeverRan=Nincs vagy a <b>%s</b> batch fájl nem futott az utóbbi időben
-# SentToSuppliers=Sent to suppliers
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index d5291bb50a7..9daea3f2f0e 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Trip
 ListTripsAndExpenses=Utak és kiadások listája
 ExpensesArea=Kirándulások és kiadások területén
 SearchATripAndExpense=Keresés út és költségek
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..dd797a93449
--- /dev/null
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Akuntansi
+Globalparameters=Parameter Global
+Chartofaccounts=Tabel Akun
+Fiscalyear=Tahun Pajak
+Menuaccount=Akun akuntansi
+Menuthirdpartyaccount=Akun Pihak Ketiga
+MenuTools=Alat
+
+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=Akun pembalik
+Back=Kembali
+
+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=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=Mencatat akun di buku besar
+Bookkeeping=Buku besar
+AccountBalanceByMonth=Saldo per bulan
+
+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
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Perincian Otomatis
+
+Processing=Pengolahan
+EndProcessing=Akhir dari pengolahan
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Baris yg dipilih
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=pembatas CSV
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
+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=Panjang akun umum
+ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga
+
+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=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)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=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=Hapus catatan buku besar
+
+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=Pembayaran Tunai
+
+SupplierInvoicePayment=Pembayaran Nota Pemasok
+CustomerInvoicePayment=Pembayaran Nota Pelanggan
+
+ThirdPartyAccount=Akun pihak ketiga
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debet dan Kredit tidak boleh ada nilai di saat yg sama
+
+ReportThirdParty=Daftar akun pihak ketiga
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=Daftar akun-akun akunting
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=Tahun Pajak Baru
+
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+TotalVente=Total turnover HT
+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 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=Validasi Otomatis
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 66439b5081b..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
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Ada yang salah, modul ini membutuhkan versi Do
 ErrorDecimalLargerThanAreForbidden=Ada yang salah, presisi yang lebih tinggi dari <b>%s</b> tidak didukung
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Nilai atau value 'system' dan 'systemauto' untuk tipe / type sudah ada. Anda bisa menggunakan 'user' sebagai nilai / value untuk membuat pencatatan / record Anda sendiri.
 ErrorCodeCantContainZero=Kode tidak boleh menggandung nilai / value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -115,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=Order
+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.<br>Some modules add entries in the menus (in menu <b>All</b> 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 <b>%s</b> 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 <b>%s</b> 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 <b>%s</b>. 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=<b>%s</b> 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 <a href="%s">here</a>.
+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 <a href="%s">disini</a>.
 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
@@ -192,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 <a href="%s">enabled modules</a> 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,33 +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
-Security=Security
-Passwords=Passwords
+Required=Diperlukan
+UsedOnlyWithTypeOption=Used by some agenda option only
+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 <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
 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)
@@ -246,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: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
@@ -257,26 +263,29 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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 <b>langs/%s</b> 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
@@ -285,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 <b>%s</b>
 SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
 NotExistsDirect=The alternative root directory is not defined.<br>
 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.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*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:<br><b>{000000}</b> 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. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> 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. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
@@ -305,9 +314,9 @@ GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br
 GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
 ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-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.
@@ -320,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 ?<br>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
@@ -329,14 +338,14 @@ NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directo
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>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 <b>%s</b> must be enabled first before using this feature.
 SecurityToken=Key to secure URLs
@@ -348,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
@@ -363,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<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
@@ -385,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 <strong>%s</strong> (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
@@ -399,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
@@ -447,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
@@ -459,40 +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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 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
@@ -501,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
@@ -512,41 +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 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)
@@ -556,28 +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
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
+Permission95=Membaca Laporan
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -586,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
@@ -603,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
@@ -645,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
@@ -668,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
@@ -676,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
@@ -689,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
@@ -716,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)
@@ -743,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
@@ -775,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
@@ -820,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 <a href="%s">Update now</a>.
 Upgrade=Upgrade
 MenuUpgrade=Upgrade / Extend
@@ -833,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
@@ -860,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
@@ -878,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
@@ -902,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 9814086e743..369ba05b614 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Acara
 ActionsArea=Acara daerah (Tindakan dan tugas)
-Agenda= Agenda
-Agendas= Agenda
-Calendar= Kalender
-Calendars= Kalender
-LocalAgenda=Kalender lokal
-AffectedTo= Ditugaskan untuk
-DoneBy= Dilakukan oleh
-Events= Acara
+Agenda=Agenda
+Agendas=Agenda
+Calendar=Kalender
+Calendars=Kalender
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Ditugaskan untuk
+DoneBy=Dilakukan oleh
+Event=Event
+Events=Acara
 EventsNb=Jumlah kejadian
 MyEvents=Acara saya
 OtherEvents=Peristiwa lain
@@ -17,31 +19,33 @@ ListOfActions=Daftar kejadian
 Location=Tempat
 EventOnFullDay=Acara di sepanjang hari (s)
 SearchAnAction= Cari acara / tugas
-MenuToDoActions= Semua peristiwa yang tidak lengkap
-MenuDoneActions= Semua acara dihentikan
-MenuToDoMyActions= Acara lengkap saya
-MenuDoneMyActions= Acara saya dihentikan
-ListOfEvents= Daftar kejadian Dolibarr
+MenuToDoActions=Semua peristiwa yang tidak lengkap
+MenuDoneActions=Semua acara dihentikan
+MenuToDoMyActions=Acara lengkap saya
+MenuDoneMyActions=Acara saya dihentikan
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Acara yang dilaporkan oleh
 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
 ViewCal=Tampilan bulan
 ViewDay=Tampilan hari
 ViewWeek=Tampilan minggu
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Lihat dengan filter yang telah ditetapkan
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index abfd23f0301..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=<b>Catatan kredit</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Menggolongkan 'Telah dibayar'
 ClassifyPaidPartially=Menggolongkan 'Telah dibayarkan sebagian'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Anda yakin untuk membatalkan tagihan <b>%s</b> ?
 ConfirmCancelBillQuestion=Kenapa Anda ingin memasukan tagihan ini kedalam klasifikasi 'diabaikan' ?
 ConfirmClassifyPaidPartially=Anda yakin untuk merubah tagihan <b>%s</b> ke status sudah dibayar ?
 ConfirmClassifyPaidPartiallyQuestion=Tagihan ini belum dibayar sepenuhnya. Apa alasan Anda untuk menutup tagihan ini ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index b28086fa933..22914931db1 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-# Category=Category
-# Categories=Categories
-# Rubrique=Category
-# Rubriques=Categories
-# categories=categories
-# TheCategorie=The category
-# NoCategoryYet=No category of this type created
-# In=In
-# AddIn=Add in
-# modify=modify
-# Classify=Classify
-# CategoriesArea=Categories area
-# ProductsCategoriesArea=Products/Services categories area
-# SuppliersCategoriesArea=Suppliers categories area
-# CustomersCategoriesArea=Customers categories area
-# ThirdPartyCategoriesArea=Third parties categories area
-# MembersCategoriesArea=Members categories area
-# ContactsCategoriesArea=Contacts categories area
-# MainCats=Main categories
-# SubCats=Subcategories
-# CatStatistics=Statistics
-# CatList=List of categories
-# AllCats=All categories
-# ViewCat=View category
-# NewCat=Add category
-# NewCategory=New category
-# ModifCat=Modify category
-# CatCreated=Category created
-# CreateCat=Create category
-# CreateThisCat=Create this category
-# ValidateFields=Validate the fields
-# NoSubCat=No subcategory.
-# SubCatOf=Subcategory
-# FoundCats=Found categories
-# FoundCatsForName=Categories found for the name :
-# FoundSubCatsIn=Subcategories found in the category
-# ErrSameCatSelected=You selected the same category several times
-# ErrForgotCat=You forgot to choose the category
-# ErrForgotField=You forgot to inform the fields
-# ErrCatAlreadyExists=This name is already used
-# AddProductToCat=Add this product to a category?
-# ImpossibleAddCat=Impossible to add the category
-# ImpossibleAssociateCategory=Impossible to associate the category to
-# WasAddedSuccessfully=<b>%s</b> was added successfully.
-# ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-# CategorySuccessfullyCreated=This category %s has been added with success.
-# ProductIsInCategories=Product/service owns to following categories
-# SupplierIsInCategories=Third party owns to following suppliers categories
-# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-# MemberIsInCategories=This member owns to following members categories
-# ContactIsInCategories=This contact owns to following contacts categories
-# ProductHasNoCategory=This product/service is not in any categories
-# SupplierHasNoCategory=This supplier is not in any categories
-# CompanyHasNoCategory=This company is not in any categories
-# MemberHasNoCategory=This member is not in any categories
-# ContactHasNoCategory=This contact is not in any categories
-# ClassifyInCategory=Classify in category
-# NoneCategory=None
-# NotCategorized=Without category
-# CategoryExistsAtSameLevel=This category already exists with this ref
-# ReturnInProduct=Back to product/service card
-# ReturnInSupplier=Back to supplier card
-# ReturnInCompany=Back to customer/prospect card
-# ContentsVisibleByAll=The contents will be visible by all
-# ContentsVisibleByAllShort=Contents visible by all
-# ContentsNotVisibleByAllShort=Contents not visible by all
-# CategoriesTree=Categories tree
-# DeleteCategory=Delete category
-# ConfirmDeleteCategory=Are you sure you want to delete this category ?
-# RemoveFromCategory=Remove link with categorie
-# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-# NoCategoriesDefined=No category defined
-# SuppliersCategoryShort=Suppliers category
-# CustomersCategoryShort=Customers category
-# ProductsCategoryShort=Products category
-# MembersCategoryShort=Members category
-# SuppliersCategoriesShort=Suppliers categories
-# CustomersCategoriesShort=Customers categories
-# CustomersProspectsCategoriesShort=Custo./Prosp. categories
-# ProductsCategoriesShort=Products categories
-# MembersCategoriesShort=Members categories
-# ContactCategoriesShort=Contacts categories
-# ThisCategoryHasNoProduct=This category does not contain any product.
-# ThisCategoryHasNoSupplier=This category does not contain any supplier.
-# ThisCategoryHasNoCustomer=This category does not contain any customer.
-# ThisCategoryHasNoMember=This category does not contain any member.
-# ThisCategoryHasNoContact=This category does not contain any contact.
-# AssignedToCustomer=Assigned to a customer
-# AssignedToTheCustomer=Assigned to the customer
-# InternalCategory=Internal category
-# CategoryContents=Category contents
-# CategId=Category id
-# CatSupList=List of supplier categories
-# CatCusList=List of customer/prospect categories
-# CatProdList=List of products categories
-# CatMemberList=List of members categories
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+Category=Category
+Categories=Categories
+Rubrique=Category
+Rubriques=Categories
+categories=categories
+TheCategorie=The category
+NoCategoryYet=No category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Categories area
+ProductsCategoriesArea=Products/Services categories area
+SuppliersCategoriesArea=Suppliers categories area
+CustomersCategoriesArea=Customers categories area
+ThirdPartyCategoriesArea=Third parties categories area
+MembersCategoriesArea=Members categories area
+ContactsCategoriesArea=Contacts categories area
+MainCats=Main categories
+SubCats=Subcategories
+CatStatistics=Statistics
+CatList=List of categories
+AllCats=All categories
+ViewCat=View category
+NewCat=Add category
+NewCategory=New category
+ModifCat=Modify category
+CatCreated=Category created
+CreateCat=Create category
+CreateThisCat=Create this category
+ValidateFields=Validate the fields
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found categories
+FoundCatsForName=Categories found for the name :
+FoundSubCatsIn=Subcategories found in the category
+ErrSameCatSelected=You selected the same category several times
+ErrForgotCat=You forgot to choose the category
+ErrForgotField=You forgot to inform the fields
+ErrCatAlreadyExists=This name is already used
+AddProductToCat=Add this product to a category?
+ImpossibleAddCat=Impossible to add the category
+ImpossibleAssociateCategory=Impossible to associate the category to
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this category.
+CategorySuccessfullyCreated=This category %s has been added with success.
+ProductIsInCategories=Product/service owns to following categories
+SupplierIsInCategories=Third party owns to following suppliers categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
+MemberIsInCategories=This member owns to following members categories
+ContactIsInCategories=This contact owns to following contacts categories
+ProductHasNoCategory=This product/service is not in any categories
+SupplierHasNoCategory=This supplier is not in any categories
+CompanyHasNoCategory=This company is not in any categories
+MemberHasNoCategory=This member is not in any categories
+ContactHasNoCategory=This contact is not in any categories
+ClassifyInCategory=Classify in category
+NoneCategory=None
+NotCategorized=Without category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ReturnInProduct=Back to product/service card
+ReturnInSupplier=Back to supplier card
+ReturnInCompany=Back to customer/prospect card
+ContentsVisibleByAll=The contents will be visible by all
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+CategoriesTree=Categories tree
+DeleteCategory=Delete category
+ConfirmDeleteCategory=Are you sure you want to delete this category ?
+RemoveFromCategory=Remove link with categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
+NoCategoriesDefined=No category defined
+SuppliersCategoryShort=Suppliers category
+CustomersCategoryShort=Customers category
+ProductsCategoryShort=Products category
+MembersCategoryShort=Members category
+SuppliersCategoriesShort=Suppliers categories
+CustomersCategoriesShort=Customers categories
+CustomersProspectsCategoriesShort=Custo./Prosp. categories
+ProductsCategoriesShort=Products categories
+MembersCategoriesShort=Members categories
+ContactCategoriesShort=Contacts categories
+ThisCategoryHasNoProduct=This category does not contain any product.
+ThisCategoryHasNoSupplier=This category does not contain any supplier.
+ThisCategoryHasNoCustomer=This category does not contain any customer.
+ThisCategoryHasNoMember=This category does not contain any member.
+ThisCategoryHasNoContact=This category does not contain any contact.
+AssignedToCustomer=Assigned to a customer
+AssignedToTheCustomer=Assigned to the customer
+InternalCategory=Internal category
+CategoryContents=Category contents
+CategId=Category id
+CatSupList=List of supplier categories
+CatCusList=List of customer/prospect categories
+CatProdList=List of products categories
+CatMemberList=List of members categories
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 1b2ea17215b..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
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 12a72464cae..f7aed91cf81 100644
--- a/htdocs/langs/id_ID/donations.lang
+++ b/htdocs/langs/id_ID/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
-# Donations=Donations
-# DonationRef=Donation ref.
-# Donor=Donor
-# Donors=Donors
-# AddDonation=Add a donation
-# NewDonation=New donation
-# ShowDonation=Show donation
-# DonationPromise=Gift promise
-# PromisesNotValid=Not validated promises
-# PromisesValid=Validated promises
-# DonationsPaid=Donations paid
-# DonationsReceived=Donations received
-# PublicDonation=Public donation
-# DonationsNumber=Donation number
-# DonationsArea=Donations area
-# DonationStatusPromiseNotValidated=Draft promise
-# DonationStatusPromiseValidated=Validated promise
-# DonationStatusPaid=Donation received
-# DonationStatusPromiseNotValidatedShort=Draft
-# DonationStatusPromiseValidatedShort=Validated
-# DonationStatusPaidShort=Received
-# ValidPromess=Validate promise
-# DonationReceipt=Donation receipt
-# BuildDonationReceipt=Build receipt
-# DonationsModels=Documents models for donation receipts
-# LastModifiedDonations=Last %s modified donations
-# SearchADonation=Search a donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+Donors=Donors
+AddDonation=Create a donation
+NewDonation=New donation
+ShowDonation=Show donation
+DonationPromise=Gift promise
+PromisesNotValid=Not validated promises
+PromisesValid=Validated promises
+DonationsPaid=Donations paid
+DonationsReceived=Donations received
+PublicDonation=Public donation
+DonationsNumber=Donation number
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+BuildDonationReceipt=Build receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Last %s modified donations
+SearchADonation=Search a donation
+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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
index c5ecb8afa63..0c926f8fd04 100644
--- a/htdocs/langs/id_ID/exports.lang
+++ b/htdocs/langs/id_ID/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
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 <b>%s</b> exists.
-ConfFileDoesNotExists=Configuration file <b>%s</b> does not exist !
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> 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 <b>%s</b> telah ada
+ConfFileDoesNotExists=File konfigurasi <b>%s</b> tidak ada
+ConfFileDoesNotExistsAndCouldNotBeCreated=File konfigurasi <b>%s</b>  tidak ada dan tidak dapat dibuat
+ConfFileCouldBeCreated=File konfigurasi <b>%s</b>  dapat dibuat
+ConfFileIsNotWritable=File konfigurasi <b>%s</b>  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 <b>%s</b> 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 <b>variables_order</b> 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 <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> 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).<br>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 '<b>%s</b>' 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 '<b>%s</b>' 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 <b>install.lock</b> 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 <b>conf.php</b> 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=<strong>Last step</strong>: 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 0a5b3e15467..c79da05364e 100644
--- a/htdocs/langs/id_ID/interventions.lang
+++ b/htdocs/langs/id_ID/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
-# Interventions=Interventions
-# InterventionCard=Intervention card
-# NewIntervention=New intervention
-# AddIntervention=Add intervention
-# ListOfInterventions=List of interventions
-# EditIntervention=Edit intervention
-# ActionsOnFicheInter=Actions on intervention
-# LastInterventions=Last %s interventions
-# AllInterventions=All interventions
-# CreateDraftIntervention=Create draft
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
-# InterventionContact=Intervention contact
-# DeleteIntervention=Delete intervention
-# ValidateIntervention=Validate intervention
-# ModifyIntervention=Modify intervention
-# DeleteInterventionLine=Delete intervention line
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
-# NameAndSignatureOfExternalContact=Name and signature of customer :
-# DocumentModelStandard=Standard document model for interventions
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-# ClassifyBilled=Classify "Billed"
-# StatusInterInvoiced=Billed
-# RelatedInterventions=Related interventions
-# ShowIntervention=Show intervention
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ListOfInterventions=List of interventions
+EditIntervention=Edit intervention
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Last %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+CustomerDoesNotHavePrefix=Customer does not have a prefix
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+NameAndSignatureOfInternalContact=Name and signature of intervening :
+NameAndSignatureOfExternalContact=Name and signature of customer :
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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
-# TypeContact_fichinter_external_BILLING=Billing customer contact
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
+TypeContact_fichinter_internal_INTERVENING=Intervening
+TypeContact_fichinter_external_BILLING=Billing customer contact
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
-# ArcticNumRefModelError=Failed to activate
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Generic number model
+ArcticNumRefModelError=Failed to activate
+PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
diff --git a/htdocs/langs/id_ID/link.lang b/htdocs/langs/id_ID/link.lang
index 8b1efb75ef3..c3ac00b7f99 100644
--- a/htdocs/langs/id_ID/link.lang
+++ b/htdocs/langs/id_ID/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 '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Tautan untuk berkas/dokumen baru
+LinkedFiles=Tautan berkas dan dokumen
+NoLinkFound=Link tidak terdaftar
+LinkComplete=Berkas telah berhasil ditautkan
+ErrorFileNotLinked=Berkas tidak dapat ditautkan
+LinkRemoved=Tautan %s telah dihapus
+ErrorFailedToDeleteLink= gagal untuk menghapus tautan '<b>%s</b>'
+ErrorFailedToUpdateLink= Gagal untuk memperbaharui tautan '<b>%s</b>'
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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<br/>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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+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 <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
+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 <b>%s</b> ?
+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.<br><br>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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index edca71a1829..666632bf28e 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/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=Kode Akuntansi untuk pembayaran gaji
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=kode akuntansi untuk pembiayaan keuangan
+Salary=Gaji
+Salaries=Gaji
+Employee=karyawan
+NewSalaryPayment=Pembayaran Gaji Baru
+SalaryPayment=Pembayaran Gaji
+SalariesPayments=Pembayaran Gaji
+ShowSalaryPayment=Menampilkan Pembayaran Gaji
+THM=rata - rata per jam
+TJM=rata - rata per hari
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index 3bb65c295d2..f6111bac684 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -1,76 +1,80 @@
 # Dolibarr language file - Source file is en_US - sendings
-# RefSending=Ref. shipment
-# Sending=Shipment
-# Sendings=Shipments
-# Shipment=Shipment
-# Shipments=Shipments
-# Receivings=Receivings
-# SendingsArea=Shipments area
-# ListOfSendings=List of shipments
-# SendingMethod=Shipping method
-# SendingReceipt=Shipping receipt
-# LastSendings=Last %s shipments
-# SearchASending=Search for shipment
-# StatisticsOfSendings=Statistics for shipments
-# NbOfSendings=Number of shipments
-# NumberOfShipmentsByMonth=Number of shipments by month
-# SendingCard=Shipping card
-# NewSending=New shipment
-# CreateASending=Create a shipment
-# CreateSending=Create shipment
-# QtyOrdered=Qty ordered
-# QtyShipped=Qty shipped
-# QtyToShip=Qty to ship
-# QtyReceived=Qty received
-# KeepToShip=Keep to ship
-# OtherSendingsForSameOrder=Other shipments for this order
-# DateSending=Date sending order
-# DateSendingShort=Date sending order
-# SendingsForSameOrder=Shipments for this order
-# SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-# SendingsToValidate=Shipments to validate
-# StatusSendingCanceled=Canceled
-# StatusSendingDraft=Draft
-# StatusSendingValidated=Validated (products to ship or already shipped)
-# StatusSendingProcessed=Processed
-# StatusSendingCanceledShort=Canceled
-# StatusSendingDraftShort=Draft
-# StatusSendingValidatedShort=Validated
-# StatusSendingProcessedShort=Processed
-# SendingSheet=Sending sheet
-# Carriers=Carriers
-# Carrier=Carrier
-# CarriersArea=Carriers area
-# NewCarrier=New carrier
-# ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-# ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-# ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-# GenericTransport=Generic transport
-# Enlevement=Gotten by customer
-# DocumentModelSimple=Simple document model
-# DocumentModelMerou=Merou A5 model
-# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-# DateDeliveryPlanned=Planed date of delivery
-# DateReceived=Date delivery received
-# SendShippingByEMail=Send shipment by EMail
-# SendShippingRef=Send shipment %s
-# ActionsOnShipping=Events on shipment
-# LinkToTrackYourPackage=Link to track your package
-# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+Shipment=Shipment
+Shipments=Shipments
+Receivings=Receivings
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+SendingReceipt=Shipping receipt
+LastSendings=Last %s shipments
+SearchASending=Search for shipment
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipping card
+NewSending=New shipment
+CreateASending=Create a shipment
+CreateSending=Create shipment
+QtyOrdered=Qty ordered
+QtyShipped=Qty shipped
+QtyToShip=Qty to ship
+QtyReceived=Qty received
+KeepToShip=Keep to ship
+OtherSendingsForSameOrder=Other shipments for this order
+DateSending=Date sending order
+DateSendingShort=Date sending order
+SendingsForSameOrder=Shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingCanceledShort=Canceled
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Sending sheet
+Carriers=Carriers
+Carrier=Carrier
+CarriersArea=Carriers area
+NewCarrier=New carrier
+ConfirmDeleteSending=Are you sure you want to delete this shipment ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
+ConfirmCancelSending=Are you sure you want to cancel this shipment ?
+GenericTransport=Generic transport
+Enlevement=Gotten by customer
+DocumentModelSimple=Simple document model
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planed date of delivery
+DateReceived=Date delivery received
+SendShippingByEMail=Send shipment by EMail
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
 
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/id_ID/shop.lang b/htdocs/langs/id_ID/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/id_ID/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 01c90ede80f..b1545d6ca3c 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
-# Suppliers=Suppliers
-# Supplier=Supplier
-# AddSupplier=Add a supplier
-# SupplierRemoved=Supplier removed
-# SuppliersInvoice=Suppliers invoice
-# NewSupplier=New supplier
-# History=History
-# ListOfSuppliers=List of suppliers
-# ShowSupplier=Show supplier
-# OrderDate=Order date
-# BuyingPrice=Buying price
-# BuyingPriceMin=Minimum buying price
-# BuyingPriceMinShort=Min buying price
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
-# AddSupplierPrice=Add supplier price
-# ChangeSupplierPrice=Change supplier price
-# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-# NoRecordedSuppliers=No suppliers recorded
-# SupplierPayment=Supplier payment
-# SuppliersArea=Suppliers area
-# RefSupplierShort=Ref. supplier
-# Availability=Availability
-# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-# ExportDataset_fournisseur_2=Supplier invoices and payments
-# ExportDataset_fournisseur_3=Supplier orders and order lines
-# ApproveThisOrder=Approve this order
-# ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-# DenyingThisOrder=Denying this order
-# ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-# ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-# AddCustomerOrder=Create customer order
-# AddCustomerInvoice=Create customer invoice
-# AddSupplierOrder=Create supplier order
-# AddSupplierInvoice=Create supplier invoice
-# ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-# NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-# SentToSuppliers=Sent to suppliers
+Suppliers=Suppliers
+Supplier=Supplier
+AddSupplier=Add a supplier
+SupplierRemoved=Supplier removed
+SuppliersInvoice=Suppliers invoice
+NewSupplier=New supplier
+History=History
+ListOfSuppliers=List of suppliers
+ShowSupplier=Show supplier
+OrderDate=Order date
+BuyingPrice=Buying price
+BuyingPriceMin=Minimum buying price
+BuyingPriceMinShort=Min buying price
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add supplier price
+ChangeSupplierPrice=Change supplier price
+ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+NoRecordedSuppliers=No suppliers recorded
+SupplierPayment=Supplier payment
+SuppliersArea=Suppliers area
+RefSupplierShort=Ref. supplier
+Availability=Availability
+ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
+ExportDataset_fournisseur_2=Supplier invoices and payments
+ExportDataset_fournisseur_3=Supplier orders and order lines
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+DenyingThisOrder=Denying this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+AddCustomerOrder=Create customer order
+AddCustomerInvoice=Create customer invoice
+AddSupplierOrder=Create supplier order
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
+NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang
index 55ce45bfce8..4b0501a8346 100644
--- a/htdocs/langs/id_ID/trips.lang
+++ b/htdocs/langs/id_ID/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-# TF_OTHER=Other
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+Trip=Trip
+Trips=Trips
+TripsAndExpenses=Trips and expenses
+TripsAndExpensesStatistics=Trips and expenses statistics
+TripCard=Trip card
+AddTrip=Add trip
+ListOfTrips=List of trips
+ListOfFees=List of fees
+NewTrip=New trip
+CompanyVisited=Company/foundation visited
+Kilometers=Kilometers
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete trip
+ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+TF_OTHER=Other
+TF_LUNCH=Lunch
+TF_TRIP=Trip
+ListTripsAndExpenses=List of trips and expenses
+ExpensesArea=Trips and expenses area
+SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 6f6482185ad..a72321ea970 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Villa, þessa einingu þarf Dolibarr útgáfu
 ErrorDecimalLargerThanAreForbidden=Villa, a nákvæmni hærra <b>en %s </b> er ekki studd.
 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)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Hnefaleikar
 MaxNbOfLinesForBoxes=Max fjölda lína fyrir kassa
 PositionByDefault=Sjálfgefin röð
-Position=Panta
+Position=Position
 MenusDesc=Matseðlar stjórnendur skilgreina innihald 2 Valmynd bars (lárétt bar og lóðrétt bar).
 MenusEditorDesc=Á matseðlinum ritstjóri leyfa þér að skilgreina persónulega færslur í valmyndir. Nota hana vandlega til að koma í veg fyrir að dolibarr óstöðug og matseðill færslur varanlega til staðar. <br> Sum mát bæta við færslum í valmyndir (í valmyndinni <b>Allt</b> í flestum tilvikum). Ef þú fjarri sumum af þessum færslum fyrir mistök, getur þú endurheimt þau með því að slökkva og reenabling einingar.
 MenuForUsers=Matseðill fyrir notendur
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Sjálfvirk ef Javascript er fatlaður
 AvailableOnlyIfJavascriptNotDisabled=Aðeins í boði ef JavaScript er ekki fatlaður
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Aðeins í boði ef JavaScript er ekki fatlaður
 Required=Krafist
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Öryggi
 Passwords=Lykilorð
 DoNotStoreClearPassword=Gera ekki geyma skýrar lykilorð í gagnagrunninum en geyma aðeins dulkóðuð gildi (Virkja mælt með)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (skilgreint ekki
 MAIN_MAIL_EMAIL_FROM=Sendandi tölvupósts fyrir sjálfvirka tölvupósti (Með því sjálfgefið í <b>php.ini: %s )</b>
 MAIN_MAIL_ERRORS_TO=Netfang sendanda er notað fyrir villa skilar tölvupósti send
 MAIN_MAIL_AUTOCOPY_TO= Senda kerfisbundið falin kolefnis-afrit af öllum sendi tölvupóst til
+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=Slökkva á öllum tölvupósti sendings (með tilliti til próf eða demo)
 MAIN_MAIL_SENDMODE=Aðferð til að nota til að senda tölvupóst
 MAIN_MAIL_SMTPS_ID=SMTP ID ef sannprófun sem krafist
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OsCommerce með beinni gagnasafn aðgang
-Module800Desc=Tengi til að birta osCommerce eða OSCSS versla með beinni gagnasafn aðgang
-Module900Name=OsCommerce eftir WS
-Module900Desc=Tengi til að birta osCommerce búð um Vefur þjónustu. Þessi eining requiere þér að setja inn hluti frá / oscommerce_ws / ws_server inn osCommerce netþjóninn. Sjá README skrá í / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis sameining
 Module1400Name=Bókhald
@@ -493,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á
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Búa til / breyta félagslegum framlögum og VSK
 Permission93=Eyða félagsleg framlög og VSK
 Permission94=Útflutningur tryggingagjöld
 Permission95=Lesa skýrslur
-Permission96=Skipulag dispatching
-Permission97=Lesa Reikningar bókhalds dispatching
-Permission98=bókhalds línur Sending Reikningar's
 Permission101=Lesa sendings
 Permission102=Búa til / breyta sendings
 Permission104=Staðfesta sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Professional Id einstakt
 MustBeUnique=Verður að vera einstakt?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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 <br> <b>%% 1 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelé <br> <b>%% 2 $ s</b> Qui Sera remplacé jöfnuður æ Sími de l'appelant (æ votre) <br> <b>%% 3 $ s</b> Qui Sera remplacé jöfnuður votre innskráningu clicktodial (skilgreining sur votre fiche utilisateur) <br> <b>%% 4 $ s</b> Qui Sera remplacé jöfnuður votre mot de passe clicktodial (skilgreining sur votre fiche utilisateur).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 ac7b999824b..9426f2e6177 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Actions
 ActionsArea=Actions svæði (Viðburðir og verkefni)
-Agenda= Dagskrá
-Agendas= Dagskrá
-Calendar= Calendar
-Calendars= Dagatöl
-LocalAgenda=Staðbundin dagbók
-AffectedTo= Áhrifum á
-DoneBy= Lokið við
-Events= Viðburðir
+Agenda=Dagskrá
+Agendas=Dagskrá
+Calendar=Calendar
+Calendars=Dagatöl
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Áhrifum á
+DoneBy=Lokið við
+Event=Event
+Events=Viðburðir
 EventsNb=Number of events
 MyEvents=Viðburðir mín
 OtherEvents=Aðrir viðburðir
@@ -17,31 +19,33 @@ ListOfActions=Listi yfir atburði
 Location=Staðsetning
 EventOnFullDay=Atburður á fullu dag
 SearchAnAction= Leita aðgerð / verkefni
-MenuToDoActions= Allar ófullnægjandi aðgerðir
-MenuDoneActions= Allir ljúka aðgerðum
-MenuToDoMyActions= ófullnægjandi aðgerðir mínar
-MenuDoneMyActions= Hætta aðgerðum minn
-ListOfEvents= Listi yfir Dolibarr viðburðir
+MenuToDoActions=Allar ófullnægjandi aðgerðir
+MenuDoneActions=Allir ljúka aðgerðum
+MenuToDoMyActions=ófullnægjandi aðgerðir mínar
+MenuDoneMyActions=Hætta aðgerðum minn
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Actions skráð
 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
 ViewCal=Skoða dagatal
 ViewDay=Dagsskjár
 ViewWeek=Vikuskjár
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View með fyrirfram skilgreindum filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Upphafsdagur
 DateActionEnd= Lokadagur
 AgendaUrlOptions1=Þú getur einnig bætt við eftirfarandi breytur til að sía framleiðsla:
 AgendaUrlOptions2=<b>login = %s </b> til að takmarka framleiðsla til aðgerða stofnuðum af áhrifum eða gert með <b>notandann %s .</b>
-AgendaUrlOptions3=<b>logina = %s </b> til að takmarka framleiðsla til aðgerða skapa við <b>notandann %s .</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s </b> til að takmarka framleiðsla til aðgerða áhrif til <b>notandi %s .</b>
-AgendaUrlOptions5=<b>logind = %s </b> til að takmarka framleiðsla til aðgerða gert með <b>notandann %s .</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=tengiliði Sýna afmæli's
 AgendaHideBirthdayEvents=tengiliðir Fela afmæli's
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Útflutningur dagbók
 ExtSites=Flytja ytri dagatöl
-ExtSitesEnableThisTool=Sýna utanaðkomandi dagatöl í dagskrá
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Fjöldi dagatal
 AgendaExtNb=Dagatal nb %s
 ExtSiteUrlAgenda=Slóð til að opna. Kvæmd skrá
 ExtSiteNoLabel=Engin lýsing
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index b7d3d6a230a..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=<b>Kredit huga</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Flokka 'Greiddur'
 ClassifyPaidPartially=Flokka 'Greiddur hluta'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Ertu viss um að þú viljir hætta við <b>Reikningar %s ?</b
 ConfirmCancelBillQuestion=hvers vegna viltu að flokka þennan reikning 'yfirgefin?
 ConfirmClassifyPaidPartially=Ertu viss um að þú viljir breyta <b>reikningi %s </b> 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 <b>( %s  %s )</b> er afsláttur veittur vegna greiðslu var áður litið. Ég regularize VSK með kredit nóta.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Afganginn til að greiða <b>( %s  %s )</b> 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 <b>( %s  %s )</b> 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 <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Afsláttur í boði (greiðsla fyrir tíma)
-SendBillRef=Senda reikning %s
-SendReminderBillRef=Senda reikning %s  (áminning)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standandi pantanir
 StandingOrder=Standandi pöntun
 NoDraftBills=Nei drög reikninga
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Samtals tvö ný afsláttur verður jafn up
 ConfirmRemoveDiscount=Ertu viss um að þú viljir fjarlægja þetta afslætti?
 RelatedBill=Svipaðir Reikningar
 RelatedBills=Svipaðir reikningum
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Skjótur
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index b8346498c60..4308d85801f 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -16,7 +16,7 @@ SuppliersCategoriesArea=Birgjar flokkar area
 CustomersCategoriesArea=Viðskiptavinir flokkar area
 ThirdPartyCategoriesArea=Í þriðja aðila flokkar area
 MembersCategoriesArea=Members flokkar area
-# ContactsCategoriesArea=Contacts categories area
+ContactsCategoriesArea=Contacts categories area
 MainCats=Helstu flokkar
 SubCats=Undirflokkar
 CatStatistics=Tölfræði
@@ -50,15 +50,15 @@ SupplierIsInCategories=Þriðji aðili er eigandi að eftirtöldum birgjum flokk
 CompanyIsInCustomersCategories=Þessi þriðji aðili er eigandi að fylgja viðskiptavinum / horfur flokkar
 CompanyIsInSuppliersCategories=Þessi þriðji aðili er eigandi að eftirtöldum birgjum flokkar
 MemberIsInCategories=Þessi aðili er eigandi að eftirfarandi aðilar flokkar
-# ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=This contact owns to following contacts categories
 ProductHasNoCategory=Þessi vara / þjónusta er ekki í neinum flokkum
 SupplierHasNoCategory=Þetta birgir ekki í neinum flokkum
 CompanyHasNoCategory=Þetta fyrirtæki er ekki í neinum flokkum
 MemberHasNoCategory=Þessi aðili er ekki í neinum flokkum
-# ContactHasNoCategory=This contact is not in any categories
+ContactHasNoCategory=This contact is not in any categories
 ClassifyInCategory=Flokka í flokki
 NoneCategory=None
-# NotCategorized=Without category
+NotCategorized=Without category
 CategoryExistsAtSameLevel=Þessi flokkur er þegar til með þessu tilv
 ReturnInProduct=Til baka vöru / þjónustu kort
 ReturnInSupplier=Til baka birgir kort
@@ -66,7 +66,7 @@ ReturnInCompany=Til baka viðskiptavina / horfur kort
 ContentsVisibleByAll=Inntak verður sýnilegt af öllum
 ContentsVisibleByAllShort=Efnisyfirlit sýnileg um alla
 ContentsNotVisibleByAllShort=Efnisyfirlit ekki sýnileg um alla
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=Eyða flokki
 ConfirmDeleteCategory=Ertu viss um að þú viljir eyða þessum flokki?
 RemoveFromCategory=Fjarlægja hlekk með Flokkur
@@ -81,12 +81,12 @@ CustomersCategoriesShort=Viðskiptavinir flokkar
 CustomersProspectsCategoriesShort=Custo. / Prosp. Flokkur
 ProductsCategoriesShort=Vörur flokkar
 MembersCategoriesShort=Members flokkar
-# ContactCategoriesShort=Contacts categories
+ContactCategoriesShort=Contacts categories
 ThisCategoryHasNoProduct=Þessi flokkur inniheldur ekki vöruna.
 ThisCategoryHasNoSupplier=Þessi flokkur inniheldur ekki birgir.
 ThisCategoryHasNoCustomer=Þessi flokkur inniheldur ekki allir viðskiptavinur.
 ThisCategoryHasNoMember=Þessi flokkur inniheldur ekki meðlimur.
-# ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Úthlutað til viðskiptavinar
 AssignedToTheCustomer=Úthlutað til viðskiptavinar
 InternalCategory=Innri flokkur
@@ -96,18 +96,17 @@ CatSupList=Listi yfir flokka birgir
 CatCusList=Listi yfir viðskiptavini / horfur flokkar
 CatProdList=Listi yfir vörur flokkar
 CatMemberList=Listi yfir meðlimi flokkar
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 5cc49658483..f46c9383cc2 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Þú verður að búa til tölvupóst tengiliði fyrir
 ListSuppliersShort=Listi yfir birgja
 ListProspectsShort=Listi yfir horfur
 ListCustomersShort=Listi yfir viðskiptavini
-ThirdPartiesArea=Þriðja aðila svæði
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Síðustu %s breytt þriðja aðila
 UniqueThirdParties=Samtals einstaka þriðja aðila
 InActivity=Opnaðu
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Fara aftur numero með snið %s yymm-NNNN fyrir kóða viðskiptavina og %s yymm-NNNN fyrir númer birgja þar sem YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0.
 LeopardNumRefModelDesc=Viðskiptavinur / birgir númerið er ókeypis. Þessi kóði getur breytt hvenær sem er.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index f31764f0036..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 8b8a68840b8..12fc71b3b9e 100644
--- a/htdocs/langs/is_IS/donations.lang
+++ b/htdocs/langs/is_IS/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Framlög
 Donations=Fjárframlög
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=Gjafa
 Donors=Styrktaraðila
-AddDonation=Bæta við framlag
+AddDonation=Create a donation
 NewDonation=New málefnið
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=Gjöf loforð
 PromisesNotValid=Ekki staðfest loforð
 PromisesValid=Staðfestar loforð
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Víxill
 DonationStatusPromiseValidatedShort=Staðfestar
 DonationStatusPaidShort=Móttekin
 ValidPromess=Staðfesta loforð
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=Byggja kvittun
 DonationsModels=Skjöl líkan fyrir kvittunum framlag
 LastModifiedDonations=Síðustu %s breytt framlög
 SearchADonation=Leita að framlag
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 a6a23b7b1ed..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 &quot;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ð <b>notandanafn %s </b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/is_IS/exports.lang b/htdocs/langs/is_IS/exports.lang
index bfa012411ee..32f095ac0a8 100644
--- a/htdocs/langs/is_IS/exports.lang
+++ b/htdocs/langs/is_IS/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Reikningsnúmer
 BankAccountNumberKey=Lykill
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 5b48021e0c2..a29a400f47d 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Upphafsdagur
 DateFinCP=Lokadagur
@@ -18,24 +18,24 @@ ApprovedCP=Samþykkt
 CancelCP=Hætt við
 RefuseCP=Neitaði
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Lýsing
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Breyta
 DeleteCP=Eyða
 ActionValidCP=Staðfesta
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Hætta við
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Uppfæra
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Ástæða
 UserCP=Notandi
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Staðfesta
 UpdateEventCP=Update events
 CreateEventCP=Búa til
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Uppfæra
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang
index 0e3e87c7e59..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
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=Ertu viss um að þú viljir eyða þessari íhlut
 NameAndSignatureOfInternalContact=Nafn og undirritun íhlutun:
 NameAndSignatureOfExternalContact=Nafn og undirritun viðskiptavinar:
 DocumentModelStandard=Staðlað skjal líkan fyrir afskipti
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Flokka &quot;borgað&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=Generic tala líkan
 ArcticNumRefModelError=Ekki tókst að virkja
 PacificNumRefModelDesc1=Fara aftur numero með snið %s yymm-NNNN þar YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0
 PacificNumRefModelError=Íhlutun kort sem byrjar á $ syymm er til nú þegar og er ekki með þessari tegund af röð. Fjarlægja hana eða gefa henni nýtt heiti þess að virkja þessa einingu.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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ð <b>notandann %s </b> í 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<br/>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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Til að greiða með kreditkorti eða PayPal, smelltu á hnappinn neðst á síðunni. <br>
-# 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öð <b>%s</b>
 ConfirmCancelOrder=Ertu viss um að þú viljir hætta í þessari röð?
 ConfirmMakeOrder=Ertu viss um að þú viljir að staðfesta sem þú gerðir í þessari röð <b>á %s ?</b>
 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. <br><br> Þ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 e726c1a7636..861e2f2c32e 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Loka
 ContractStatusRunning=Running
 ContractStatusExpired=útrunnið
 ContractStatusOnHold=Ekki í keyrslu
-ContractStatusToRun=A mettre en þjónusta
+ContractStatusToRun=To get running
 ContractNotRunning=Þessi samningur er ekki í gangi
 ErrorProductAlreadyExists=Vara með% tilvísun s er þegar til.
 ErrorProductBadRefOrLabel=Wrong gildi fyrir tilvísun eða merki.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Birgjar
 SupplierRef=Birgir dómari.
 ShowProduct=Sýna vörur
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Klóna vöru eða þjónustu
 ConfirmCloneProduct=Ertu viss um að þú viljir klón vöru eða <b>þjónustu %s ?</b>
 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ð
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 a04898ee5f2..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
@@ -85,13 +87,13 @@ ActionsOnProject=Aðgerðir á verkefninu
 YouAreNotContactOfProject=Þú ert ekki samband við þessa einka verkefni
 DeleteATimeSpent=Eyða tíma
 ConfirmDeleteATimeSpent=Ertu viss um að þú viljir eyða þessum tíma varið?
-DoNotShowMyTasksOnly=Sjá einnig verkefni ég er ekki áhrif á
-ShowMyTasksOnly=Skoða aðeins verkefni ég er hrærður til
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Verkefni hollur til þessa þriðja aðila
 NoTasks=Engin verkefni fyrir þetta verkefni
 LinkedToAnotherCompany=Tengjast öðrum þriðja aðila
-TaskIsNotAffectedToYou=Verkefni úthlutað ekki við þig
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Tími er tómur
 ThisWillAlsoRemoveTasks=Þessi aðgerð mun einnig eyða öllum verkefnum verkefnisins <b>(%s</b> verkefni í augnablikinu) og allt inntak tíma varið.
 IfNeedToUseOhterObjectKeepEmpty=Ef sumir hlutir (nótum röð ...), sem tilheyra öðrum þriðja aðila, verður að vera í tengslum við verkefnið til að búa til, halda þessu tóm til að hafa verkefni verði fjölnota þriðja aðila.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=skýrslu lýkur verkefninu er líkan (logo. ..)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 e7b178259dd..cafdc4253af 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=Last %s  sendingar
 SearchASending=Leita að sendingunni
 StatisticsOfSendings=Tölfræði fyrir sendingar
 NbOfSendings=Fjöldi sendinga
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Shipping kort
 NewSending=New sendingunni
 CreateASending=Búa til sendingu
@@ -50,27 +50,31 @@ Enlevement=Fengið við viðskiptavini
 DocumentModelSimple=Einföld skjal líkan
 DocumentModelMerou=Merou A5 líkan
 WarningNoQtyLeftToSend=Aðvörun, að engar vörur sem bíður sendar.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Flugvél fæðingardag
 DateReceived=Date sending berast
 SendShippingByEMail=Senda sendingu með tölvupósti
-SendShippingRef=Senda sendingunni %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Viðburðir á sendingunni
 LinkToTrackYourPackage=Tengill til að fylgjast með pakka
 ShipmentCreationIsDoneFromOrder=Í augnablikinu er sköpun af a nýr sendingunni gert úr þeirri röð kortinu.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Einföld skjal líkan fyrir kvittunum sending
 DocumentModelTyphon=Meira heill skjal líkan fyrir kvittunum sending (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER skilgreind ekki
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/is_IS/shop.lang b/htdocs/langs/is_IS/shop.lang
deleted file mode 100644
index 1647180583a..00000000000
--- a/htdocs/langs/is_IS/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Vefverslun
-LastOrders=Síðasta pantanir
-OnStandBy=Í biðstöðu
-TreatmentInProgress=Meðhöndlun í gangi
-LastCustomers=Síðasta viðskiptavina
-OSCommerceShop=OsCommerce Vefverslun
-OSCommerce=OsCommerce
-AddProd=Sala á netinu
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/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 45fc029d1c1..72b1f89b046 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=Panta dagsetningu
 BuyingPrice=Kaupverð
 BuyingPriceMin=Lágmark Kaupverð
 BuyingPriceMinShort=Min Kaupverð
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Bæta við birgi verð
 ChangeSupplierPrice=Breyta birgir verð
 ErrorQtyTooLowForThisSupplier=Magn of lágt fyrir þetta birgis eða ekkert verði skilgreind á þessa vöru fyrir þennan birgir
@@ -27,7 +27,7 @@ RefSupplierShort=Tilv. birgir
 Availability=Framboð
 ExportDataset_fournisseur_1=Birgir reikningum lista og línur reiknings er
 ExportDataset_fournisseur_2=Birgir reikninga og greiðslur
-# ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=Samþykkja þessari röð
 ConfirmApproveThisOrder=Ertu viss um að þú viljir samþykkja þessari röð?
 DenyingThisOrder=Afneita þessari röð
@@ -39,4 +39,6 @@ AddSupplierOrder=Búa til birgja þess
 AddSupplierInvoice=Búa til birgja Reikningar
 ListOfSupplierProductForSupplier=Listi yfir vörur og verð <b>fyrir%</b> söluaðila <b>s</b>
 NoneOrBatchFileNeverRan=Enginn eða <b>hópur %s </b> er ekki hljóp nýlega
-# SentToSuppliers=Sent to suppliers
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang
index f698f18fcf5..39edbd5faa3 100644
--- a/htdocs/langs/is_IS/trips.lang
+++ b/htdocs/langs/is_IS/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Ferðalag
 ListTripsAndExpenses=Listi yfir ferðir og gjöld
 ExpensesArea=Ferðir og gjöld area
 SearchATripAndExpense=Leita ferð og kostnað
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..c581fbcf534
--- /dev/null
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Contabilità avanzata
+Globalparameters=Parametri globali
+Chartofaccounts=Lista degli account
+Fiscalyear=Anni fiscali
+Menuaccount=Account contabilità
+Menuthirdpartyaccount=Account terze parti
+MenuTools=Strumenti
+
+ConfigAccountingExpert=Configurazione del modulo contabilità esperta
+Journaux=Giornali
+JournalFinancial=Giornali finanziari
+Exports=Esportazioni
+Modelcsv=Modello di esportazione
+Selectmodelcsv=Seleziona un modello di esportazione
+Modelcsv_normal=Esportazione classica
+Modelcsv_CEGID=Esporta tramite CEGID Esperto
+BackToChartofaccounts=Ritorna alla lista dell'account
+Back=Indietro
+
+Definechartofaccounts=Definisci una lista degli account
+Selectchartofaccounts=Seleziona una lista degli account
+Validate=Convalida
+Addanaccount=Aggiungi un account di contabilità
+AccountAccounting=Account di contabilità
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Margine commerciale
+Reports=Report
+ByCustomerInvoice=Per fatture clienti
+ByMonth=Per mese
+NewAccount=Nuovo account di contabilità
+Update=Aggiorna
+List=Elenco
+Create=Crea
+UpdateAccount=Modifica di un account di contabilità
+UpdateMvts=Modifica di un movimento
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=Contabilità generale
+AccountBalanceByMonth=Account balance by month
+
+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
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Righe selezionate
+Lineofinvoice=Riga fattura
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=Separatore 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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Tipo documento
+Docdate=Data
+Docref=Riferimento
+Numerocompte=Account
+Code_tiers=Terza parte
+Labelcompte=Etichetta account
+Debit=Debito
+Credit=Credito
+Amount=Importo
+Sens=Sens
+Codejournal=Giornale
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Giornale di vendita
+PurchasesJournal=Giornale acquisti
+DescSellsJournal=Giornale di vendita
+DescPurchasesJournal=Giornale acquisti
+BankJournal=Giornale bancario
+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
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+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
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=Nuovo anno fiscale
+
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+TotalVente=Total turnover HT
+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 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=Convalida automaticamente
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 8ade33331e8..b0a7137761f 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -43,8 +43,10 @@ SecuritySetup=Impostazioni per la sicurezza
 ErrorModuleRequirePHPVersion=Errore: questo modulo richiede almeno la versione %s di PHP.
 ErrorModuleRequireDolibarrVersion=Errore: questo modulo richiede almeno la versione %s di Dolibarr
 ErrorDecimalLargerThanAreForbidden=Errore: Non è supportata una precisione superiore a <b> %s </b>.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
+DictionarySetup=Impostazioni dizionario
+Dictionary=Dizionari
+Chartofaccounts=Chart of accounts
+Fiscalyear=Anni Fiscali
 ErrorReservedTypeSystemSystemAuto=I valori 'system' e 'systemauto' sono riservati. Puoi usare 'user' come valore da aggiungere al tuo record.
 ErrorCodeCantContainZero=Il codice non può contenere il valore 0
 DisableJavascript=Disabilita funzioni JavaScript and Ajax (Raccomandato per persone non vedenti o browser testuali)
@@ -54,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
@@ -104,9 +108,9 @@ OtherOptions=Altre opzioni
 OtherSetup=Altre impostazioni
 CurrentValueSeparatorDecimal=Separatore decimale
 CurrentValueSeparatorThousand=Separatore per le migliaia
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Destinazione
+IdModule=Modulo ID
+IdPermissions=Permessi ID
 Modules=Moduli
 ModulesCommon=Moduli principali
 ModulesOther=Altri moduli
@@ -133,7 +137,7 @@ Box=Casella
 Boxes=Caselle riassuntive
 MaxNbOfLinesForBoxes=Numero di linee max per casella
 PositionByDefault=Per impostazione predefinita
-Position=Ordine
+Position=Posizione
 MenusDesc=Gestione del contenuto delle 2 barre dei menu (barra orizzontale e barra verticale).
 MenusEditorDesc=L'editor dei menu consente di definire voci personalizzate nei menu. Utilizzare con attenzione onde evitare di rendere instabile Dolibarr (es. voci di menu irraggiungibili per sempre). <br> Alcuni moduli aggiungono voci nei menu (nel menu <b> Tutti </b> nella maggior parte dei casi). Se alcune di queste voci vengono rimosse per errore, è possibile ripristinarle disattivando e riattivando il modulo.
 MenuForUsers=Menu per gli utenti
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatico se Javascript à disattivato
 AvailableOnlyIfJavascriptNotDisabled=Disponibile solo se JavaScript non è disattivato
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibile solo se JavaScript e Ajax non sono disattivati
 Required=Richiesto
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Sicurezza
 Passwords=Password
 DoNotStoreClearPassword=Non memorizzare le password in chiaro nel database (raccomandato)
@@ -237,7 +243,7 @@ OfficialDemo=Dolibarr demo online
 OfficialMarketPlace=Market ufficiale per moduli esterni e addon
 OfficialWebHostingService=Servizi di hosting web referenziati (Hosting Cloud)
 ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OtherResources=Altre risorse
 ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr: <br/>Dai un'occhiata a <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Per qualsiasi altro problema/domanda, si può utilizzare il forum di Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
 HelpCenterDesc1=In quest'area puoi cercare un servizio di supporto su Dolibarr.
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (non disponibile in PHP
 MAIN_MAIL_EMAIL_FROM=Mittente automatico per le email (Di default in php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Mittente utilizzato per l'invio messaggi di errore via email
 MAIN_MAIL_AUTOCOPY_TO= Inviare sistematicamente una copia carbone nascosta di tutte le email a
+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=Disabilitare la spedizione di tutti i messaggi email (per test o demo)
 MAIN_MAIL_SENDMODE=Metodo da utilizzare per l'invio di email
 MAIN_MAIL_SMTPS_ID=Id per l'autenticazione SMTP, se necessario
@@ -383,10 +392,10 @@ LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Link Aggiorna
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+LinkToTest=Collegamento cliccabile generato per l'utente <strong>%s</strong> (clicca numero di telefono per testare)
 KeepEmptyToUseDefault=Lasciare vuoto per utilizzare il valore di default
-DefaultLink=Default link
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+DefaultLink=Link predefinito
+ValueOverwrittenByUserSetup=Attenzione, questo valore potrebbe essere sovrascritto da un impostazione specifica dell'utente (ogni utente può settare il proprio url clicktodial)
 ExternalModule=External module - Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
@@ -431,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
@@ -469,22 +478,18 @@ 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=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
-Module510Name=Salaries
+Module500Name=Spese speciali (tasse, contributi sociali, dividendi)
+Module500Desc=Amministrazione delle spese speciali quali tasse, contributi sociali, dividendi e salari.
+Module510Name=Stipendi
 Module510Desc=Management of employees salaries and payments
 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
-Module800Name=OsCommerce
-Module800Desc=Interfaccia per un negozio online osCommerce tramite l'accesso diretto al database
-Module900Name=OsCommerce da WS
-Module900Desc=Interfaccia per mostrare un osCommerce tramite webservices. <br/>Il modulo richiede l'installazione sul server di componenti da /oscommerce_ws/ws_server. Vedere file README in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Integrazione Mantis
 Module1400Name=Contabilità avanzata
@@ -493,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
@@ -501,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
@@ -510,20 +519,24 @@ Module3100Name=Skype
 Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
 Module5000Name=Multiazienda
 Module5000Desc=Permette la gestione di diverse aziende
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module20000Name=Ferie
-Module20000Desc=Declare and follow employees holidays
+Module6000Name=Flusso di lavoro
+Module6000Desc=Gestione flussi di lavoro
+Module20000Name=Leave Requests management
+Module20000Desc=Declare and follow employees leaves requests
+Module39000Name=Product batch
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 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=Print via Cups IPP Printer.
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
 Module59000Desc=Modulo per gestire margini
 Module60000Name=Commissioni
@@ -575,13 +588,10 @@ Permission92=Creare/modificare contributi e iva
 Permission93=Eliminare contributi e iva
 Permission94=Esportare contributi
 Permission95=Vedere report
-Permission96=Impostazioni della contabilità
-Permission97=Vedere la contabilità delle fatture
-Permission98=Contabilità linee delle fatture
 Permission101=Vedere invii
 Permission102=Creare/modificare spedizioni
 Permission104=Convalidare spedizioni
-Permission106=Export sendings
+Permission106=Esporta gli invii
 Permission109=Eliminare spedizioni
 Permission111=Vedere i conti bancari
 Permission112=Creare/modificare/cancellare e confrontare operazioni bancarie
@@ -603,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
@@ -638,7 +649,7 @@ Permission221=Vedere invii email
 Permission222=Creare/modificare email (titolo, destinatari ...)
 Permission223=Convalidare email (consente l'invio)
 Permission229=Eliminare email
-Permission237=View recipients and info
+Permission237=Vedi destinatari e info
 Permission238=Spedisci mail manualmente
 Permission239=Cancella le mail dopo la validazione o dopo l'invio
 Permission241=Vedere categorie
@@ -668,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
@@ -698,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
@@ -714,7 +725,7 @@ Permission1185=Approvare ordini fornitore
 Permission1186=Ordinare ordini fornitore
 Permission1187=Accettare consegna ordini fornitore
 Permission1188=Chiudere ordini fornitore
-Permission1201=Get result of an export
+Permission1201=Ottieni il risultato di un esportazione
 Permission1202=Creare/Modificare esportazioni
 Permission1231=Vedere fatture fornitore
 Permission1232=Creare fatture fornitore
@@ -722,7 +733,7 @@ Permission1233=Convalidare fatture passive
 Permission1234=Eliminare fatture fornitore
 Permission1235=Inviare fatture fornitore tramite email
 Permission1236=Esportare fatture fornitore, attributi e pagamenti
-Permission1237=Export supplier orders and their details
+Permission1237=Esportazione ordini fornitori e loro dettagli
 Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load)
 Permission1321=Esportare fatture cliente, attributi e pagamenti
 Permission1421=Esportare ordini cliente e attributi
@@ -740,44 +751,45 @@ Permission2501=Vedere/scaricare documenti
 Permission2502=Caricare o cancellare  documenti
 Permission2503=Proporre o cancellare documenti
 Permission2515=Impostare directory documenti
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
+Permission2801=Client FTP in sola lettura (solo download e navigazione dei file)
+Permission2802=Client FTP in lettura e scrittura (caricamento e eliminazione dei file)
 Permission50101=Usa punto vendita
 Permission50201=Vedere transazioni
 Permission50202=Importare transazioni
 Permission54001=Stampa
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
+Permission55001=Leggi sondaggi
+Permission55002=Crea/modifica sondaggi
+Permission59001=Leggi margini commerciali
+Permission59002=Definisci margini commerciali
+DictionaryCompanyType=Tipi di soggetti terzi
+DictionaryCompanyJuridicalType=Forme giuridiche dei soggetti terzi
 DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
+DictionaryCanton=Province/Cantoni
 DictionaryRegion=Regioni
 DictionaryCountry=Paesi
 DictionaryCurrency=Valute
 DictionaryCivility=Titoli civili
 DictionaryActions=Tipi di azioni/eventi
 DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
+DictionaryVAT=Aliquote IVA o Tasse di vendita
 DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
+DictionaryPaymentConditions=Termini di pagamento
+DictionaryPaymentModes=Modalità di pagamento
 DictionaryTypeContact=Contact/Address types
 DictionaryEcotaxe=Ecotassa (WEEE)
 DictionaryPaperFormat=Formati di carta
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
+DictionaryFees=Tipi di tasse
+DictionarySendingMethods=Metodi di spedizione
 DictionaryStaff=Personale
 DictionaryAvailability=Delivery delay
 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=Back to dictionaries list
+BackToDictionaryList=Torna alla lista dei dizionari
 VATReceivedOnly=Tariffa speciale non dovuta
 VATManagement=Gestione IVA
 VATIsUsedDesc=Impostazione predefinita dell'aliquota IVA usata per la creazione di prospetti, fatture, ordini, ecc  <br/> Applicata se il venditore è soggetto ad IVA.
@@ -785,19 +797,19 @@ VATIsNotUsedDesc=Impostazione predefinita in cui l'aliquota IVA è pari a 0. Ada
 VATIsUsedExampleFR=In Francia si intendono le imprese o organizzazioni che hanno un vero e proprio sistema fiscale (Semplificato, nominale o normale). Un sistema in cui l'IVA à dichiarata.
 VATIsNotUsedExampleFR=In Francia le associazioni non sono tenute alla dichiarazione IVA, così come le società, le organizzazioni o i liberi professionisti che hanno scelto la microimpresa come sistema fiscale (IVA a forfait) e il versamento di una franchigia IVA senza alcuna dichiarazione IVA. In questo caso viene visualizzata la dicitura "non applicabile IVA - Art-293B del CGI" sulle fatture.
 ##### 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
+LTRate=Tariffa
+LocalTax1IsUsed=Usa seconda tassa
+LocalTax1IsNotUsed=Non usare seconda tassa
+LocalTax1IsUsedDesc=Usa il secondo tipo di tassa (altra oltre l'IVA)
+LocalTax1IsNotUsedDesc=Non usare altro tipo di tassa (altra oltre IVA)
+LocalTax1Management=Secondo tipo di tassa
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2IsUsed=Usa terza tassa
+LocalTax2IsNotUsed=Non usare terza tassa
+LocalTax2IsUsedDesc=Usa un terzo tipo di tassa (altra oltre IVA)
+LocalTax2IsNotUsedDesc=Non usare altro tipo di tassa (altra oltre IVA)
+LocalTax2Management=Terzo tipo di tassa
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= Gestione RE
@@ -811,11 +823,11 @@ LocalTax2IsNotUsedDescES= Per impostazione predefinita la proposta di IRPF è 0.
 LocalTax2IsUsedExampleES= In Spagna, liberi professionisti e freelance che forniscono servizi e le aziende che hanno scelto il regime fiscale modulare.
 LocalTax2IsNotUsedExampleES= Vale per le imprese spagnole che non hanno optato per il sistema fiscale modulare.
 CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax1ES=Vendite - Acquisti
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2ES=Acquisti
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3ES=Vendite
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esiste la traduzione)
 LabelOnDocuments=Descrizione sul documento
@@ -884,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
@@ -928,14 +941,14 @@ EventsSetup=Impostazioni log degli eventi
 LogEvents=Eventi di audit di sicurezza
 Audit=Audit
 InfoDolibarr=Informazioni su Dolibarr
-InfoBrowser=Infos Browser
+InfoBrowser=Info Browser
 InfoOS=Informazioni OS
 InfoWebServer=Informazioni web server
 InfoDatabase=Informazioni database
 InfoPHP=Informazioni PHP
 InfoPerf=Infos performances
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=Browser
+BrowserOS=Sistema operativo
 ListEvents=Audit eventi
 ListOfSecurityEvents=Elenco degli eventi di sicurezza Dolibarr
 SecurityEventsPurged=Eventi di sicurezza eliminati
@@ -978,7 +991,7 @@ BackupDesc2=* Salvare il contenuto della directory dei documenti <b>( %s)</b> ch
 BackupDesc3=* Salvare il contenuto del database in un dump. È possibile utilizzare l'assistente.
 BackupDescX=L'archivio delle directory va conservato in un luogo sicuro.
 BackupDescY=Il file generato va conservato in un luogo sicuro.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
+BackupPHPWarning=Il backup non può essere garantito con questo metodo. Preferito quello precedente
 RestoreDesc=Per ripristinare un backup Dolibarr, è necessario:
 RestoreDesc2=* Ripristinare il contenuto della directory dei documenti <b>(%s)</b> dal file di archivio (.zip, per esempio).
 RestoreDesc3=* Ripristinare i dati dal file di backup del database nel database del nuovo Dolibarr o dell'installazione corrente.<br/> Attenzione: con questa operazione verranno ripristinate anche le password esistenti al momento del backup, può essere quindi necessaria una nuova autenticazione.<br/><br/> Per ripristinare un backup del database nell'installazione corrente è possibile seguire questo assistente.
@@ -992,7 +1005,7 @@ YourPHPDoesNotHaveSSLSupport=Il PHP del server non supporta SSL
 DownloadMoreSkins=Scarica altre skin
 SimpleNumRefModelDesc=Restituisce un numero di riferimento nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0.
 ShowProfIdInAddress=Nei documenti mostra identità professionale completa di indirizzi
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
+ShowVATIntaInAddress=Nascondi il num IVA Intra con indirizzo sui documenti
 TranslationUncomplete=Traduzione incompleta
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 MenuUseLayout=Permetti di nascondere il menu verticale (javascript non può essere disabilitato)
@@ -1008,17 +1021,17 @@ MAIN_PROXY_PASS=Password per utilizzare il server proxy
 DefineHereComplementaryAttributes=Definire qui tutti gli attributi non predefiniti che vuoi supportati da %s.
 ExtraFields=Campi extra
 ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
+ExtraFieldsThirdParties=Attributi complementari (terze parti)
+ExtraFieldsContacts=Attributi Complementari (contatti/indirizzi)
+ExtraFieldsMember=Attributi Complementari (membri)
+ExtraFieldsMemberType=Attributi Complementari (tipo di membro)
 ExtraFieldsCustomerOrders=Complementary attributes (orders)
 ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldsSupplierOrders=Attributi Complementari (ordini)
+ExtraFieldsSupplierInvoices=Attributi Complementari (fatture)
+ExtraFieldsProject=Attributi Complementari (progetti)
+ExtraFieldsProjectTask=Attributi Complementari (attività)
+ExtraFieldHasWrongValue=L'attributo %s ha un valore errato.
 AlphaNumOnlyCharsAndNoSpace=Solo lettere e numeri, senza spazi
 AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
 SendingMailSetup=Impostazioni per l'invio di email
@@ -1026,30 +1039,29 @@ SendmailOptionNotComplete=Attenzione: su alcuni sistemi Linux, per poter inviare
 PathToDocuments=Percorso documenti
 PathDirectory=Percorso directory
 SendmailOptionMayHurtBuggedMTA=Funzione per inviare mail usando il metodo &quot;PHP mail direct&quot;. Genererà messaggi di posta che potrebbero non essere correttamente interpretati da alcuni server di posta. Il risultato è che alcuni messaggi potrebbero non essere letti da persone ospitate su piattaforme gestite con tali server. Ciò vale per alcuni provider (Per esempio Orange in Francia). Questo non è un problema di Dolibarr né del PHP, ma del server in ricezione. È tuttavia possibile inserire il valore 1 all'opzione MAIN_FIX_FOR_BUGGED_MTA nella configurazione di Dolibarr per evitarlo. Potrebbero, però, verificarsi problemi con altri server che rispettano rigorosamente lo standard SMTP. L'altra soluzione (raccomandata) è di utilizzare il metodo &quot;SMTP socket library&quot; che non presenta svantaggi.
-TranslationSetup=Configuration de la traduction
+TranslationSetup=Configurazione della traduzione
 TranslationDesc=LA scelta della lingua visualizzata su schermo può essere modidificata:<br>* Globalmente dal menu <strong>Home - Setup - Display</strong><br>* O per utente dalla linguetta <strong>User display</strong> della scheda utente (cliccare l'icona di login in alto sullo schermo).
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TotalNumberOfActivatedModules=Numero totale di moduli attivati: <b>%s</b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=La classe %s non è stata trovata al percorso PHP indicato
 YesInSummer=Si in estate
-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=Rilevamento automatico non è possibile
+OnlyFollowingModulesAreOpenedToExternalUsers=Nota, solo i seguenti moduli sono aperti agli utenti esterni (qualunque siano i permessi per questi utenti)
+SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin
+ConditionIsCurrently=La condizione corrente è %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
-SearchOptim=Search optimization
+SearchOptim=Ottimizzazione della ricerca
 YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+BrowserIsOK=Stai utilizzando il browser %s. Questo browser è ok per sicurezza è performance.
+BrowserIsKO=Stai utilizzando il browser web %s. Questo browser è noto per essere una cattiva scelta per sicurezza, performance e stabilità. Ti raccomandiamo di usare Chrome, Firefox, Opera o Safari.
+XDebugInstalled=XDebug caricato
+XCacheInstalled=XCache attivato
 AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink
 FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+FixTZ=Correzione del fuso orario
+FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario)
+GetBarCode=Ottieni codice a barre
 EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
 ##### Module password generation
 PasswordGenerationStandard=Genera una password in base all'algoritmo interno di  Dolibarr: 8 caratteri comprensivi di numeri e lettere minuscole.
@@ -1071,14 +1083,15 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
 ModelModules=Modelli per i documenti
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...)
 WatermarkOnDraft=Filigrana sulle bozze
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Unicità dell'identità
 MustBeUnique=Dev'essere unico?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeMandatory=Obbligatorio per creare terze parti?
+MustBeInvoiceMandatory=Obbligatorio per validare fatture?
 Miscellaneous=Varie
 ##### Webcal setup #####
 WebCalSetup=Impostazioni collegamento Webcalendar
@@ -1092,7 +1105,7 @@ WebCalServer=Server di hosting calendario
 WebCalDatabaseName=Nome del database
 WebCalUser=Utente per l'accesso al database
 WebCalSetupSaved=Configurazione del calendario salvata con successo.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s' riuscita.
 WebCalTestKo1=Connessione al server ' %s' effettuata con successo, ma il database' %s' non è raggiungibile.
 WebCalTestKo2=Connessione al server ' %s' con l'utente' %s' fallita.
 WebCalErrorConnectOkButWrongDatabase=Connessione dati effettuata, ma il database è errato.
@@ -1120,7 +1133,7 @@ EnableEditDeleteValidInvoice=Attiva la possibilità di modificare/cancellare una
 SuggestPaymentByRIBOnAccount=Suggerire il pagamento tramite bonifico bancario
 SuggestPaymentByChequeToAddress=Suggerire il pagamento mediante assegno a
 FreeLegalTextOnInvoices=Testo libero sulle fatture
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+WatermarkOnDraftInvoices=Bozze delle fatture filigranate (nessuna filigrana se vuoto)
 ##### Proposals #####
 PropalSetup=Impostazioni proposte commerciali
 CreateForm=Crea formulario
@@ -1133,15 +1146,17 @@ AddShippingDateAbility=Aggiungi la possibilità di inserire la data di spedizion
 AddDeliveryAddressAbility=Aggiungi la possibilità di inserire la data di consegna
 UseOptionLineIfNoQuantity=Una linea di prodotto/servizio con un importo pari a 0 è considerata come opzione
 FreeLegalTextOnProposal=Testo libero sulle proposte commerciali
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
+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
 OrdersModelModule=Modelli per ordini in pdf
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+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=Watermark on draft orders (none if empty)
+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 <br/><b>__PHONETO__</b> che verrà sostituito con il numero telefonico a cui collegarsi, <br/><b>__PHONEFROM__</b> che verrà sostituito con il numero chiamante (il vostro), <br/><b>__LOGIN__</b> che verrà sostituito con il nome utente usato per il servizio e <br/><b>__PASS__</b> che verrà sostituito con la password del servizio ClickToDial.
@@ -1152,13 +1167,13 @@ InterventionsSetup=Impostazioni modulo interventi
 FreeLegalTextOnInterventions=Testo libero sui documenti d'intervento
 FicheinterNumberingModules=Numerazione dei moduli di intervento
 TemplatePDFInterventions=Modelli per moduli di intervento in pdf
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+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=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Modelli per documenti e contratti
+FreeLegalTextOnContracts=Testo libero sui contratti
+WatermarkOnDraftContractCards=Bozze dei contratti filigranate (nessuna filigrana se vuoto)
 ##### Members #####
 MembersSetup=Impostazioni modulo membri
 MemberMainOptions=Opzioni principali
@@ -1227,15 +1242,15 @@ LDAPTestSynchroContact=Test sincronizzazione contatti
 LDAPTestSynchroUser=Test sincronizzazione utenti
 LDAPTestSynchroGroup=Test sincronizzazione gruppi
 LDAPTestSynchroMember=Test sincronizzazione membri
-LDAPTestSearch= Test a LDAP search
+LDAPTestSearch= Test della ricerca LDAP
 LDAPSynchroOK=Test sincronizzazione OK
 LDAPSynchroKO=Test sincronizzazione fallito
 LDAPSynchroKOMayBePermissions=Sincronizzazione di prova non riuscita. Controllare che la connessione al server sia configurata correttamente e permetta gli aggiornamenti LDAP
 LDAPTCPConnectOK=Connessione TCP al server LDAP Ok (Server=%s, Port=%s)
 LDAPTCPConnectKO=Connessione TCP al server LDAP non riuscita (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Connessione/Autenticazione sul server LDAP completata con successo (Server=%s, Porta=%s, Admin=%s, Password=%s)
 LDAPBindKO=Connessione/Autenticazione sul server LDAP non riuscita (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Disconnessione completata con successo
 LDAPUnbindFailed=Disconnessione fallita
 LDAPConnectToDNSuccessfull=Connessione al DN ( %s) riuscita
 LDAPConnectToDNFailed=Connessione al DN ( %s) fallita
@@ -1292,7 +1307,7 @@ LDAPFieldSidExample=Esempio: objectSid
 LDAPFieldEndLastSubscription=Data di fine abbonamento
 LDAPFieldTitle=Posizione/funzione
 LDAPFieldTitleExample=Esempio: titolo
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPParametersAreStillHardCoded=I parametri LDAP sono ancora hardcoded (nella classe contact)
 LDAPSetupNotComplete=Configurazione LDAP incompleta (vai alle altre schede)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nessun amministratore o password forniti. L'accesso a LDAP sarà eseguito in forma anonima e in sola lettura.
 LDAPDescContact=Questa pagina consente di definire i nomi degli attributi nella gerarchia LDAP corrispondenti ad ognuno dei dati dei contatti in Dolibarr.
@@ -1301,24 +1316,24 @@ LDAPDescGroups=Questa pagina consente di definire i nomi degli attributi nella g
 LDAPDescMembers=Questa pagina consente di definire i nomi degli attributi nella gerarchia LDAP corrispondenti ad ognuno dei dati dei membri in Dolibarr.
 LDAPDescValues=I valori di esempio sono progettati per <b>OpenLDAP</b> con i seguenti schemi di carico: <b>core.schema, cosine.schema, inetorgperson.schema</b>). Se si utilizzano tali schemi in OpenLDAP, modificare il file di configurazione <b>slapd.conf</b> per caricare tutti tali schemi.
 ForANonAnonymousAccess=Per un accesso autenticato (per esempio un accesso in scrittura)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
+PerfDolibarr=Report di setup/ottimizzazione della performance
+YouMayFindPerfAdviceHere=Troverai su questa pagina alcune informazioni o avvisi relative alla performance.
+NotInstalled=Non installato, il tuo server non è rallentato per questo.
+ApplicativeCache=Cache applicativa
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
 HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+FilesOfTypeCached=I file di tipo %s vengono serviti dalla cache del server HTTP
+FilesOfTypeNotCached=I file di tipo %s non vengono serviti dalla cache del server HTTP
+FilesOfTypeCompressed=I file di tipo %s vengono compressi dal server HTTP
+FilesOfTypeNotCompressed=I file di tipo %s non vengono compressi dal server HTTP
 CacheByServer=Cache per server
 CacheByClient=Cache per browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Rilevamento automatico non è possibile
+CompressionOfResources=Compressione delle risposte HTTP
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Impostazioni modulo prodotti
 ServiceSetup=Impostazioni modulo servizi
@@ -1329,11 +1344,11 @@ ModifyProductDescAbility=Personalizzazione delle descrizioni dei prodotti nei fo
 ViewProductDescInFormAbility=Visualizzare la descrizione dei prodotti nei form (altrimenti appariranno come tooltip popup)
 ViewProductDescInThirdpartyLanguageAbility=Visualizzazione delle descrizioni dei prodotti nella lingua di terzi
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
+UseSearchToSelectProduct=Utilizza il form di ricerca per scegliere un prodotto (invece della lista a tendina)
 UseEcoTaxeAbility=Usare l'eco-Tax (RAEE)
 SetDefaultBarcodeTypeProducts=Tipo di codici a barre predefinito da utilizzare per i prodotti
 SetDefaultBarcodeTypeThirdParties=Tipo di codici a barre predefinito da utilizzare per terze parti
-ProductCodeChecker= Module for product code generation and checking (product or service)
+ProductCodeChecker= Modulo per la generazione e verifica dei codici prodotto (prodotto o servizio)
 ProductOtherConf= Configurazione Prodotto/servizio
 ##### Syslog #####
 SyslogSetup=Impostazioni modulo per i log
@@ -1345,7 +1360,7 @@ SyslogSimpleFile=File
 SyslogFilename=Nome file e percorso
 YouCanUseDOL_DATA_ROOT=È possibile utilizzare DOL_DATA_ROOT/dolibarr.log come file di log per la directory "documenti". È anche possibile impostare un percorso diverso per tale file.
 ErrorUnknownSyslogConstant=La costante %s è sconosciuta a syslog.
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=Solo utenti Windows supportano LOG_USER
 ##### Donations #####
 DonationsSetup=Impostazioni modulo donazioni
 DonationsReceiptModel=Modello di ricevuta per donazioni
@@ -1365,7 +1380,7 @@ BarcodeDescC39=Codice a barre di tipo C39
 BarcodeDescC128=Codice a barre di tipo C128
 GenbarcodeLocation=Programma a riga di comando per generare i codici a barre (utilizzato dal modulo phpbarcode per alcuni tipi di codici a barre)
 BarcodeInternalEngine=Motore interno
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarCodeNumberManager=Manager per auto-definizione dei numeri barcode
 ##### Prelevements #####
 WithdrawalsSetup=Modulo impostazione prelievi
 ##### ExternalRSS #####
@@ -1378,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.)
@@ -1400,16 +1416,17 @@ FCKeditorForCompany=Editor WYSIWIG per le società
 FCKeditorForProduct=Editor WYSIWIG per i prodotti/servizi
 FCKeditorForProductDetails=Editor WYSIWIG per il testo libero in tutti i moduli (proposte, ordini, fatture, ecc ..)
 FCKeditorForMailing= Editor WYSIWIG per le email
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=WYSIWIG creazione/modifica della firma utente
+FCKeditorForMail=WYSIWIG creazione/modifica per tutte le mail (eccetto Outlis->eMailing)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=la connessione al server riuscita, ma il database è errato.
 OSCommerceTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s' riuscita.
 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
@@ -1459,13 +1476,13 @@ Sell=Vendi
 InvoiceDateUsed=Data utilizzata per la fatturazione
 YourCompanyDoesNotUseVAT=Società non soggetta all'IVA. Non ci sono parametri da impostare.
 AccountancyCode=Codice contabile
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Codice contabilità vendite
+AccountancyCodeBuy=Codice contabilità acquisti
 ##### Agenda #####
 AgendaSetup=Impostazioni modulo agenda
 PasswordTogetVCalExport=Chiave per autorizzare l'esportazione di link
 PastDelayVCalExport=Non esportare evento più vecchio di
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Usa tipi di eventi (amministrazione nel menu Impostazioni -> Dizionario -> Tipi di eventi agenda)
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
@@ -1474,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.
@@ -1502,7 +1522,7 @@ MultiCompanySetup=Impostazioni modulo multiazienda
 SuppliersSetup=Impostazioni modulo fornitori
 SuppliersCommandModel=Modello completo di ordine fornitore (logo...)
 SuppliersInvoiceModel=Modello completo di fattura fornitore (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitore
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Impostazioni modulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
@@ -1520,16 +1540,25 @@ TaskModelModule=Tasks reports document model
 ECMSetup = GED Setup
 ECMAutoTree = Automatic tree folder and document
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-
-Format=Format
+FiscalYears=Anni fiscali
+FiscalYear=Anno fiscale
+FiscalYearCard=Scheda dell'anno fiscale
+NewFiscalYear=Nuovo anno fiscale
+EditFiscalYear=Modifica anno fiscale
+OpenFiscalYear=Apri anno fiscale
+CloseFiscalYear=Chiudi anno fiscale
+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 6572a57b9d8..7a63495c2c1 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID evento
 Actions=Azioni
 ActionsArea=Area eventi (azioni e compiti)
-Agenda= Ordine del giorno
-Agendas= Ordini del giorno
-Calendar= Calendario
-Calendars= Calendari
-LocalAgenda=Calendario locale
-AffectedTo= Azione assegnata a
-DoneBy= Fatto da
-Events= Eventi
+Agenda=Agenda
+Agendas=Agende
+Calendar=Calendario
+Calendars=Calendari
+LocalAgenda=Calendario interno
+ActionsOwnedBy=Evento amministrato da
+AffectedTo=Azione assegnata a
+DoneBy=Fatto da
+Event=Evento
+Events=Eventi
 EventsNb=Numero di eventi
 MyEvents=I miei eventi
 OtherEvents=Altri eventi
@@ -17,31 +19,33 @@ ListOfActions=Lista delle azioni
 Location=Luogo
 EventOnFullDay=Dura tutto il giorno
 SearchAnAction= Cerca un compito/azione
-MenuToDoActions= Tutte le azioni incomplete
-MenuDoneActions= Tutte le azioni passate
-MenuToDoMyActions= I mie eventi non completati
-MenuDoneMyActions= I miei eventi passati
-ListOfEvents= Lista degli eventi
+MenuToDoActions=Tutte le azioni incomplete
+MenuDoneActions=Tutte le azioni passate
+MenuToDoMyActions=I mie eventi non completati
+MenuDoneMyActions=I miei eventi passati
+ListOfEvents=Lista di eventi (calendario interno)
 ActionsAskedBy=Azioni richieste da
 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
 ViewCal=Vista mensile
 ViewDay=Vista giornaliera
 ViewWeek=Vista settimanale
-ViewPerUser=Per utente
+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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Data di inizio
 DateActionEnd= Data di fine
 AgendaUrlOptions1=È inoltre possibile aggiungere i seguenti parametri ai filtri di output:
 AgendaUrlOptions2=<b>login = %s</b> per visualizzare solo le azioni create da, o che coinvolgono l'utente <b>%s</b>.
-AgendaUrlOptions3=<b>logina = %s</b> per limitare l'output alle azioni create dall'<b>utente %s</b>.
+AgendaUrlOptions3=<b>logina = %s</b> per limitare l'output alle azioni amministrate dall'utente<b>%s</b>
 AgendaUrlOptions4=<b>logint = %s</b> per limitare l'output alle azioni modificate dall'<b>utente %s</b>.
-AgendaUrlOptions5=<b>logind = %s</b> per limitare l'output alle azioni fatte dall'<b>utente %s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per limitare l'output alle azioni associate al progetto <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti
 AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti
 Busy=Occupato
 ExportDataset_event1=Lista degli eventi in agenda
-
+DefaultWorkingDays=Intervallo di giorni lavorativi standard in una settiamana (Esempio: 1-5, 1-6)
+DefaultWorkingHours=Ore lavorative di base in una giornata (Esempio: 9-18)
 # External Sites ical
 ExportCal=Esporta calendario
 ExtSites=Calendari esterni
-ExtSitesEnableThisTool=Mostra i calendari esterni nell'ordine del giorno
+ExtSitesEnableThisTool=Mostra calendari esterni (definiti nelle impostazioni generali) nell'agenda. Questo non influisce sui calendari esterni definiti dall'utente.
 ExtSitesNbOfAgenda=Numero di calendari
 AgendaExtNb=Calendario numero %s
 ExtSiteUrlAgenda=URL per accedere al file ICal
 ExtSiteNoLabel=Nessuna descrizione
+WorkingTimeRange=Intervallo di tempo di lavoro
+WorkingDaysRange=Intervallo di giorni di lavoro
+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 <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
-CheckTransmitter=Emittente
-ValidateCheckReceipt=Convalidare questo deposito di assegno?
+CheckTransmitter=Ordinante
+ValidateCheckReceipt=Convalidare la ricevuta dell'assegno?
 ConfirmValidateCheckReceipt=Vuoi davvero convalidare questa ricevuta?<br/>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 5656abca69d..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 <b>fattura proforma</b> è uguale ad una fattura vera, ma non ha valore contabile.
 InvoiceReplacement=Fattura sostitutiva
-InvoiceReplacementAsk=Sostituzione fattura per fattura
-InvoiceReplacementDesc=La <b>sostituzione fattura</b> è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.<br><br>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 <b>fattura sostitutiva</b> è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.<br><br>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 <b>nota di credito a correzione</b> è 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).<br/><br/>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 <b>nota di credito</b> è 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,20 +85,21 @@ ClassifyPaid=Classifica come "pagata"
 ClassifyPaidPartially=Classifica come "parzialmente pagata"
 ClassifyCanceled=Classifica come "abbandonata"
 ClassifyClosed=Classifica come "chiusa"
+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
@@ -136,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
@@ -149,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 <b> %s </b>?
-ConfirmUnvalidateBill=Vuoi davvero portare la fattura <b>%s</b> allo stato di progetto?
+ConfirmUnvalidateBill=Sei sicuro di voler convertire la fattura <b>%s</b> in bozza?
 ConfirmClassifyPaidBill=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "pagata"?
 ConfirmCancelBill=Vuoi davvero annullare la fattura <b>%s</b>?
 ConfirmCancelBillQuestion=Perché si desidera classificare questa fattura come "abbandonata" ?
 ConfirmClassifyPaidPartially=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "parzialmente pagata"?
 ConfirmClassifyPaidPartiallyQuestion=La fattura non è stata pagata completamente. Quali sono i motivi per chiudere questa fattura?
-ConfirmClassifyPaidPartiallyReasonAvoir=La rimanenza da pagare <b>( %s %s)</b> 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 <b>( %s %s)</b> 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 <b>( %s %s)</b> 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 <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sarà regolarizzata mediante nota di credito.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. Accetto di perdere l'IVA sullo sconto.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Il restante da pagare <b>(%s %s)</b> 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
@@ -168,7 +167,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>cattivo cliente</b> è 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: <br/>- il pagamento non è completo, in quanto alcuni prodotti sono stati restituiti.<br/>- l'importo richiesto è troppo oneroso per essere trasformato in uno sconto.<br/>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 <b>%s</b> %s?
 ConfirmSupplierPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche.
@@ -183,24 +182,24 @@ 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=Invia fattura %s
-SendReminderBillRef=Invia fattura %s (promemoria)
-StandingOrders=Ordini permanenti
-StandingOrder=Ordine permanente
+SendBillRef=Invio della fattura %s
+SendReminderBillRef=Invio della fattura %s (promemoria)
+StandingOrders=Mandati di pagamento
+StandingOrder=Mandato di pagamento
 NoDraftBills=Nessuna bozza di fatture
 NoOtherDraftBills=Nessun'altra bozza di fatture
 NoDraftInvoices=Nessuna fattura in bozza
@@ -218,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
@@ -254,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
@@ -295,6 +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=Ultima fattura correlata
+WarningBillExist=Attenzione, una o più fatture già esistenti
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediato
@@ -333,10 +333,10 @@ PaymentTypeShortVAD=Pagamen. online
 PaymentTypeTRA=Cambiale tratta
 PaymentTypeShortTRA=Cambiale
 BankDetails=Dati banca
-BankCode=Codice banca
-DeskCode=Codice sportello
-BankAccountNumber=Numero di conto
-BankAccountNumberKey=Chiave
+BankCode=ABI
+DeskCode=CAB
+BankAccountNumber=C.C.
+BankAccountNumberKey=CIN
 Residence=Domiciliazione
 IBANNumber=Codice IBAN
 IBAN=IBAN
@@ -346,8 +346,8 @@ ExtraInfos=Extra info
 RegulatedOn=Regolamentato su
 ChequeNumber=Assegno N°
 ChequeOrTransferNumber=Assegno/Bonifico N°
-ChequeMaker=Emittente assegno
-ChequeBank=Banca dell'assegno
+ChequeMaker=Traente dell'assegno
+ChequeBank=Banca emittente
 NetToBePaid=Netto a pagare
 PhoneNumber=Tel
 FullPhoneNumber=Telefono
@@ -371,7 +371,7 @@ UseCreditNoteInInvoicePayment=Riduci l'ammontare del pagamento con la nota di cr
 MenuChequeDeposits=Depositi assegni
 MenuCheques=Assegni
 MenuChequesReceipts=Ricezione assegni
-NewChequeDeposit=Nuovo deposito
+NewChequeDeposit=Nuovo acconto
 ChequesReceipts=Ricevute assegni
 ChequesArea=Area assegni
 ChequeDeposits=Depositi assegni
@@ -388,7 +388,7 @@ DisabledBecausePayments=Impossibile perché ci sono dei pagamenti
 CantRemovePaymentWithOneInvoicePaid=Impossibile rimuovere il pagamento. C'è almeno una fattura classificata come pagata
 ExpectedToPay=Pagamento previsto
 PayedByThisPayment=Pagato con questo pagamento
-ClosePaidInvoicesAutomatically=Classifica come &quot;pagate&quot; tutte le fatture interamente saldate.
+ClosePaidInvoicesAutomatically=Classifica come "pagate" tutte le fatture interamente saldate.
 ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate
 AllCompletelyPayedInvoiceWillBeClosed=Tutte le fatture totalmente pagate saranno automaticamente chiuse allo stato "Pagato".
 ToMakePayment=Paga
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 4aa4d3ce0d9..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,3 +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=Aggiungi il seguente prodotto/servizio
+ShowCategory=Show category
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index d537ab7ebc9..aef6f6cc559 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=È necessario inserire un contatto email del soggetto
 ListSuppliersShort=Elenco fornitori
 ListProspectsShort=Elenco clienti potenziali
 ListCustomersShort=Elenco clienti
-ThirdPartiesArea=Area soggetti terzi
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Ultime %s terze parti modificate
 UniqueThirdParties=Totale soggetti terzi
 InActivity=In attività
@@ -410,3 +410,5 @@ OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
 MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per codice cliente e %syymm-nnnn per il fornitore, in cui yy è  l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0.
 LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 8c60b656a72..d32a581c27b 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -4,7 +4,7 @@ AccountancyCard=Scheda contabilità
 Treasury=Tesoreria
 MenuFinancial=Finanziario
 TaxModuleSetupToModifyRules=Per modificare il modo in cui viene effettuato il calcolo, vai al <a href="%s">modulo di configurazione delle tasse</a>.
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Vai a  <a href="%s">Impostazioni Azienda per modificare le regole del calcolo
 OptionMode=Opzione per la gestione contabile
 OptionModeTrue=Opzione entrate-uscite
 OptionModeVirtual=Opzione crediti-debiti
@@ -12,7 +12,7 @@ OptionModeTrueDesc=In questo caso, il fatturato è calcolato sulla base dei paga
 OptionModeVirtualDesc=In modalità il fatturato è calcolato sulle fatture (data di convalida).<br/>Alla data di scadenza le fatture verranno calcolate automaticamente in attivo o passivo, che siano state pagate o meno.
 FeatureIsSupportedInInOutModeOnly=Caratteristica disponibile solo in modalità contabile CREDITI-DEBITI (vedi <b>Impostazioni modulo contabilità</b>)
 VATReportBuildWithOptionDefinedInModule=Gli importi mostrati sono calcolati secondo le regole stabilite nelle impostazioni del modulo tasse e contributi.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=I totali qui mostrati sono calcolati usando le regole definite per le impostazioni dell'azienda
 Param=Configurazione
 RemainingAmountPayment=Pagamento a saldo:
 AmountToBeCharged=Importo totale da pagare:
@@ -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.
@@ -120,7 +121,7 @@ DeleteSocialContribution=Eliminazione di un contributo sociale
 ConfirmDeleteSocialContribution=Vuoi davvero eliminare questo contributo?
 ExportDataset_tax_1=Contributi e pagamenti
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
+CalcModeVATEngagement=Calcola <b>%sIVA su entrate-uscite%s</b>
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -140,16 +141,16 @@ RulesResultDue=- Gli importi indicati sono tutti tasse incluse<br/>- Comprendono
 RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
 RulesCADue=- Comprende le fatture del cliente, che siano state pagate o meno.<br/>- Si basa sulla data di tali fatture.<br/>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
-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 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
+VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
+VATReportByCustomersInDueDebtMode=Report per IVA cliente riscossa e pagata
+VATReportByQuartersInInputOutputMode=Report per tasso di IVA riscossa e pagata
 LT1ReportByQuartersInInputOutputMode=Report by RE rate
 LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
+VATReportByQuartersInDueDebtMode=Report per tasso di IVA riscossa e pagata
 LT1ReportByQuartersInDueDebtMode=Report by RE rate
 LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
 SeeVATReportInInputOutputMode=Vedi il report <b>%sIVA pagata%s</b> per la modalità di calcolo standard
@@ -176,18 +177,18 @@ 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
-Pcg_subtype=Pcg subtype
+Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
 InvoiceDispatched=Fatture spedite *consegnate
 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=collegato agli ordini
+LinkedOrder=Collega a ordine
 ReCalculate=Ricalcola
 Mode1=Metodo 1
 Mode2=Metodo 2
@@ -195,12 +196,11 @@ CalculationRuleDesc=Ci sono due metodi per calcolare l'IVA totale:<br/>Metodo 1:
 CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo appropriato per applicare le stesse regole di calcolo e ottenere gli stessi risultati previsti dal fornitore.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Metodo di calcolo
-AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Codice contabile predefinito per acquistare prodotti
-COMPTA_PRODUCT_SOLD_ACCOUNT=Codice contabile predefinito per vendere prodotti
-COMPTA_SERVICE_BUY_ACCOUNT=Codice contabile predefinito per comprare servizi
-COMPTA_SERVICE_SOLD_ACCOUNT=Codice contabile predefinito per vendere servizi
-COMPTA_VAT_ACCOUNT=Codice contabile predefinito per IVA a credito
-COMPTA_VAT_BUY_ACCOUNT=Codice contabile predefinito per IVA a debito
-COMPTA_ACCOUNT_CUSTOMER=Codice contabile predefinito per clienti
-COMPTA_ACCOUNT_SUPPLIER=Codice contabile predefinito per fornitori
+AccountancyJournal=Codice del giornale di contabilità
+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=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. <BR>Per esempio per ottenere il me
 CronMethodHelp=Nome del metodo dell'oggetto da eseguire. <BR>Per esempio per ottenere il metodo dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è <i>fetch</i>
 CronArgsHelp=Argomenti del metodo.<br/> Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/<u>product.class.php</u>, il valore dei parametri può essere <i>0, ProductRef</i>
 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 7dd79ec3930..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,3 +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=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 68ff9abb518..96edeef52f2 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Nessun errore, assegnamo
 # Errors
 Error=Errore
 Errors=Errori
@@ -25,11 +25,11 @@ ErrorFromToAccountsMustDiffers=I conti bancari di origine e destinazione devono
 ErrorBadThirdPartyName=Valore non valido per il nome del soggetto terzo
 ErrorProdIdIsMandatory=%s obbligatorio
 ErrorBadCustomerCodeSyntax=Sintassi del codice cliente errata
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Sintassi del barcode errata
 ErrorCustomerCodeRequired=Il codice cliente è obbligatorio
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Barcode richiesto
 ErrorCustomerCodeAlreadyUsed=Codice cliente già utilizzato
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=Barcode già in uso
 ErrorPrefixRequired=È richiesto il prefisso
 ErrorUrlNotValid=L'indirizzo del sito è errato
 ErrorBadSupplierCodeSyntax=Sintassi del codice fornitore errata
@@ -37,9 +37,9 @@ 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=Date is not correct!
+ErrorWrongDate=La data non è corretta!
 ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s
 ErrorFoundBadEmailInFile=Sintassi email errata nelle righe %s del file (ad esempio alla riga %s con email = %s)
 ErrorUserCannotBeDelete=L'utente non può essere eliminato. Probabilmente è collegato a qualcosa.
@@ -65,16 +65,16 @@ ErrorNoValueForCheckBoxType=Per favore immetti un valore per la lista di control
 ErrorNoValueForRadioType=Per favore immetti un valore per la lista radio
 ErrorBadFormatValueList=La lista non può avere più di un'entrata : <u>%s</u>, ma ne serve almeno una: llave,valores
 ErrorFieldCanNotContainSpecialCharacters=Il campo <b>%s</b> non può contenere caratteri speciali.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Il campo <b>%s</b> non deve contenere caratteri speciali o maiuscole.
 ErrorNoAccountancyModuleLoaded=Modulo contabilità disattivato
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Questo nome profilo già esiste per questo set di esportazione
 ErrorLDAPSetupNotComplete=La configurazione per l'uso di LDAP è incompleta
 ErrorLDAPMakeManualTest=È stato generato un file Ldif nella directory %s. Prova a caricarlo dalla riga di comando per avere maggiori informazioni sugli errori.
 ErrorCantSaveADoneUserWithZeroPercentage=Impossibile salvare un'azione con "stato non iniziato" se il campo "da fare" non è vuoto.
 ErrorRefAlreadyExists=Il riferimento utilizzato esiste già.
 ErrorPleaseTypeBankTransactionReportName=Indicare il nome del rapporto della transazione bancaria (Nel formato AAAAMM o AAAAMMGG)
 ErrorRecordHasChildren=Impossibile eliminare i record da cui dipendono altri record
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorRecordIsUsedCantDelete=Impossibile eliminare il dato. E' già in uso o incluso in altro oggetto.
 ErrorModuleRequireJavascript=Per questa funzionalità Javascript deve essere attivo. Per abilitare/disabilitare Javascript, vai su <b>Home - Impostazioni - Schermo</b>
 ErrorPasswordsMustMatch=Le due password digitate devono essere identiche
 ErrorContactEMail=Si è verificato un errore tecnico. Si prega di contattare l'amministratore all'indirizzo <b>%s</b> <b>%s</b> indicando il codice di errore nel messaggio, o, meglio ancora, allegando uno screenshot della schermata attuale.
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=Utente con accesso <b>%s</b> 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 <b>%s</b> 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
@@ -121,21 +122,40 @@ ErrNoZipEngine=Non c'è modo di spacchettare i file %s in questo PHP
 ErrorFileMustBeADolibarrPackage=Il file %s deve essere un archivio zip Dolibarr
 ErrorFileRequired=Ci vuole un file del pacchetto Dolibarr
 ErrorPhpCurlNotInstalled=PHP CURL non risulta installato, ma è necessario per comunicare con Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorFailedToAddToMailmanList=Impossibile aggiungere il dato %s alla Mailman lista %s o SPIP base
+ErrorFailedToRemoveToMailmanList=Impossibile rimuovere il dato %s alla Mailman lista %s o SPIP base
 ErrorNewValueCantMatchOldValue=Il nuovo valore non può essere uguale al precedente
 ErrorFailedToValidatePasswordReset=Cambio password fallito. Forse è già stato richiesto (questo link può essere usato una volta sola). Se no, prova a rifare la procedura dall'inizio.
 ErrorToConnectToMysqlCheckInstance=Connessione al database fallita. Controlla che il server Mysql sia in attività (nella maggior parte dei casi puoi avviarlo digitando 'sudo /etc/init.d/mysql start' in un terminale).
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date can not be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
-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.
+ErrorFailedToAddContact=Impossibile aggiungere il contatto
+ErrorDateMustBeBeforeToday=La data non può essere maggiore di quella odierna
+ErrorPaymentModeDefinedToWithoutSetup=Un metodo di pagamento è stato impostato come %s ma il setup del modulo Fattura non è stato completato per definire le impostazioni da mostrare per questo metodo di pagamento.
+ErrorPHPNeedModule=Errore, il tuo PHP deve avere il modulo <b>%s</b> installato per usare questa funzionalità.
+ErrorOpenIDSetupNotComplete=Hai impostato il config file di Dolibarr per permettere l'autenticazione tramite OpenID, ma l'URL del service di OpenID non è definita nella costante %s
+ErrorWarehouseMustDiffers=Il magazzino di origine e quello di destinazione devono essere differenti
+ErrorBadFormat=Formato non valido!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Errore, questo membro non è stato ancora collegato a nessuna terza parte. Collega il membro ad una delle terze parti esistenti o creane una nuova prima di creare sottoscrizioni con fattura.
+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
@@ -151,6 +171,8 @@ WarningLockFileDoesNotExists=Attenzione, una volta finito il setup, devi disabil
 WarningUntilDirRemoved=Questo avviso sarà visualizzato fino a quando questa directory è presente (disponibile solo per gli utenti admin).
 WarningCloseAlways=Attenzione, la chiusura è effettiva anche se il numero degli elementi non coincide fra inizio e fine. Abilitare questa opzione con cautela.
 WarningUsingThisBoxSlowDown=Attenzione: l'uso di questo box rallenterà pesantemente tutte le pagine che lo visualizzano
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+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=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funzione disabilitata quando le impostazioni di visualizzazione sono ottimizzate per persone non vedenti o browser testuali.
+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 aeb24b7e453..ede6d91614d 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -8,7 +8,7 @@ ImportableDatas=Dati importabili
 SelectExportDataSet=Scegli di dati che si desidera esportare ...
 SelectImportDataSet=Scegli di dati che si desidera importare ...
 SelectExportFields=Scegli i campi che si desidera esportare, o selezionare un profilo predefinito di esportazione
-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=Scegli i campi che si desidera importare e quelli di destinazione nel database, muovendoli sopra e sotto con l'ancora %s, o seleziona un profilo predefinito di importazione:
 NotImportedFields=Campi di fonte non file importato
 SaveExportModel=Salvare il profilo di esportazione, se si ha intenzione di riutilizzare in un secondo momento ...
 SaveImportModel=Salva il profilo di importazione, se si prevede di riutilizzare in un secondo momento ...
@@ -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
@@ -64,9 +64,9 @@ ChooseFormatOfFileToImport=Scegliete il formato di file da utilizzare per l'impo
 ChooseFileToImport=Scegli il file da importare e poi clicca sull'icona %s
 SourceFileFormat=Fonte formato di file
 FieldsInSourceFile=Campi nel file sorgente
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+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
@@ -81,7 +81,7 @@ DoNotImportFirstLine=Non importare prima riga del file sorgente
 NbOfSourceLines=Numero di linee nel file sorgente
 NowClickToTestTheImport=Verificare i parametri di importazione che avete definito. Se sono corretti, fare clic sul pulsante <b>"%s"</b> per lanciare una simulazione del processo di importazione (i dati non saranno modificate nel database, è solo una simulazione per il momento) ...
 RunSimulateImportFile=Lanciare la simulazione di importazione
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=Questo campo richiede dati dal file sorgente
 SomeMandatoryFieldHaveNoSource=Alcuni campi obbligatori non hanno origine dai dati del file
 InformationOnSourceFile=Informazioni sui file di origine
 InformationOnTargetTables=Informazioni sui campi di destinazione
@@ -102,33 +102,33 @@ NbOfLinesImported=Numero di linee importati con successo: <b>%s.</b>
 DataComeFromNoWhere=Valore da inserire viene dal nulla nel file di origine.
 DataComeFromFileFieldNb=Il valore da inserire deriva dal numero del campo <b>%s</b> nel file di origine.
 DataComeFromIdFoundFromRef=Valore che viene dal numero <b>%s</b> campo di file sorgente sarà utilizzato per trovare id del genitore oggetto da utilizzare (Così il <b>%s</b> Objet che ha il ref. Dal file sorgente deve esiste in Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Il codice che proviene dal campo numero <b>%s</b> del file sorgente sarà usato per trovare l'id dell'oggetto principale da utilizzare (quindi il codice dal file sorgente deve esistere nel dizionario <b>%s</b>). Nota che se conosci l'id, puoi usarlo anche nel file sorgente invece del codice. L'importazione dovrebbe funzionare in entrambi i casi.
 DataIsInsertedInto=I dati provenienti dal file sorgente sarà inserito nel campo seguente:
 DataIDSourceIsInsertedInto=L'id del genitore oggetto trovato utilizzando i dati in file di origine, sarà inserito nel campo seguente:
 DataCodeIDSourceIsInsertedInto=L'id della riga superiore trovato dal codice verrà inserito nel campo seguente:
 SourceRequired=valore dei dati è obbligatorio
 SourceExample=Esempio di possibile valore di dati
 ExampleAnyRefFoundIntoElement=Qualsiasi ref trovati per <b>%s</b> elementi
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Nessun codice (o id) è stato trovato nel dizionario <b>%s</b>
 CSVFormatDesc=Formato <b>Comma Separated Value</b> (.Csv).<br/>File di testo dove i campi sono separati dal separatore [%s]. Se il separatore è situato all'interno di un contenuto del campo, il campo è circondato dal carattere di contenimento [%s]. Il carattere di escape per il carattere di contenimento è [%s].
 Excel95FormatDesc=Formato <b>Excel</b> (.xls)<br>Questo è il formato nativo Excel 95 (BIFF5).
 Excel2007FormatDesc=Formato <b>Excel</b> (.xlsx)<br>Questo è il formato nativo Excel 2007 (SpreadsheetML).
 TsvFormatDesc=<b>Valori Separati da Tab </b> (.tsv)<br>E' un formato testo con i valori separati da un [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> 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).
+ExportFieldAutomaticallyAdded=Il campo <b>%s</b> è stato aggiunto automaticamente. Questo ti evita di avere linee simili che possono essere scambiate come valori duplicati (con questo campo aggiunto, tutte le linee avranno il proprio id e saranno differenti).
 CsvOptions=Opzioni Csv
 Separator=Separatore
-Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
+Enclosure=Allegato
+SuppliersProducts=Prodotti fornitore
 BankCode=Codice banca
 DeskCode=Codice sportello
 BankAccountNumber=Num. conto
 BankAccountNumberKey=Chiave
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+SpecialCode=Codice speciale
+ExportStringFilter=%% permette di sostituire uno o più caratteri nel testo
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtra per un anno/mese/giorno<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtra con un intervallo di anni/mesi/giorni<br> > YYYY, > YYYYMM, > YYYYMMDD : filtra sui seguenti anni/mesi/giorni<br> < YYYY, < YYYYMM, < YYYYMMDD : filtra su tutti i precedenti anni/mesi/giorni
+ExportNumericFilter='NNNNN' filtra per un solo valore<br>'NNNNN+NNNNN' filtra su un range di valori<br>'&gt;NNNNN' filtra per valori inferiori<br>'&gt;NNNNN' filtra per valori superiori
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+SelectFilterFields=Se vuoi filtrare su qualche valore, inserisci qui il valore.
+FilterableFields=Campi filtrabili
+FilteredFields=Campi filtrati
+FilteredFieldsValues=Valore per il filtro
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 13427049139..b1ffbd72fb4 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Risorse umane
-Holidays=Ferie
-CPTitreMenu=Ferie
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Estratto conto mensile
-MenuAddCP=Richiedi ferie
-NotActiveModCP=Per vedere questa pagina devi attivare il modulo ferie.
-NotConfigModCP=Per vedere questa pagina devi configurare il modulo ferie. <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> Clicca qui </ a> per attivarlo.
-NoCPforUser=Non hai richieste di ferie.
-AddCP=Richiedi ferie
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Dipendente
 DateDebCP=Data di inizio
 DateFinCP=Data di fine
@@ -18,24 +18,24 @@ ApprovedCP=Approvato
 CancelCP=Cancellato
 RefuseCP=Rifiutato
 ValidatorCP=Approvato da
-ListeCP=Elenco ferie
+ListeCP=List of leaves
 ReviewedByCP=Sarà valutato da
 DescCP=Descrizione
-SendRequestCP=Genero richiesta ferie
-DelayToRequestCP=Le richieste di ferie devono essere inoltrate almeno <b>%s giorni</b> prima.
-MenuConfCP=Modifica ferie rimanenti
-UpdateAllCP=Aggiorna le ferie
-SoldeCPUser=Rimangono <b>%s</b> giorni di ferie
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=La data di fine deve essere posteriore alla data di inizio.
 ErrorSQLCreateCP=Si è verificato un errore SQL durante la creazione:
-ErrorIDFicheCP=Si è verificato un errore, la richiesta di ferie non esiste.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Torna alla pagina precedente
-ErrorUserViewCP=Non sei autorizzato a leggere questa richiesta di ferie.
-InfosCP=Informazioni sulla richiesta ferie
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Flusso di informazioni
 RequestByCP=Richiesto da
-TitreRequestCP=Scheda ferie
-NbUseDaysCP=Numero giorni i ferie goduti
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Modifica
 DeleteCP=Cancella
 ActionValidCP=Convalida
@@ -43,26 +43,25 @@ ActionRefuseCP=Rifiuta
 ActionCancelCP=Annulla
 StatutCP=Stato
 SendToValidationCP=Invia alla convalida
-TitleDeleteCP=Cancella la richiesta di ferie
-ConfirmDeleteCP=Vuoi davvero eliminare questa richiesta di ferie?
-ErrorCantDeleteCP=Errore: non sei autorizzato a cancellare questa richiesta di ferie.
-CantCreateCP=Non hai diritto a richiedere ferie.
-InvalidValidatorCP=Indica chi dovrà approvare la richiesta.
-UpdateButtonCP=Aggiorna
-CantUpdate=Non puoi aggiornare questa richiesta di ferie.
+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=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
-ConfirmValidCP=Vuoi davvero approvare 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=Invia richiesta
-ConfirmToValidCP=Vuoi davvero inoltrare la richiesta di ferie?
-TitleRefuseCP=Rifiuta la richiesta
-ConfirmRefuseCP=Vuoi davvero rifiutare la richiesta di ferie?
+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=Devi indicare un motivo per il rifiuto.
-TitleCancelCP=Annulla la richiesta
-ConfirmCancelCP=Vuoi davvero annullare la richiesta di ferie?
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Motivo del rifiuto
 DateRefusCP=Data del rifiuto
 DateCancelCP=Data dell'annullamento
@@ -72,42 +71,42 @@ MotifCP=Motivo
 UserCP=Utente
 ErrorAddEventToUserCP=Si è verificato un errore nell'assegnazione del permesso straordinario.
 AddEventToUserOkCP=Permesso straordinario assegnato correttamente.
-MenuLogCP=Vedi lo storico ferie
-LogCP=Log degli aggiornamenti ferie
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Primo giorno di ferie
-LastDayOfHoliday=Ultimo giorno di ferie
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Aggiornamento mensile
 ManualUpdate=Aggiornamento manuale
-HolidaysCancelation=Cancellazione ferie
+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=Gruppo autorizzato ad approvare le ferie
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Convalida la configurazione
-LastUpdateCP=Ultimo aggiornamento automatico delle ferie
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">facendo click qui</a>.
-DelayForSubmitCP=Scadenza per l'inoltro di richieste ferie
-AlertapprobatortorDelayCP=Impedisci l'approvazione delle ferie se la richiesta non corrisponde alla deadline
-AlertValidatorDelayCP=Impedisci l'approvazione se la richiesta ferie eccede il ritardo massimo
-AlertValidorSoldeCP=Impedisci l'apporvazione ferie se la richiesta eccede la disponibilità residua
-nbUserCP=Numero di utenti gestiti dal modulo ferie
-nbHolidayDeductedCP=Numero di giorni di ferie da scalare per ogni giorno di ferie goduto
-nbHolidayEveryMonthCP=Numero di giorni di ferie maturati al mese
-Module27130Name= Gestione ferie
-Module27130Desc= Gestione ferie
-TitleOptionMainCP=Impostazioni principali della gestione ferie
-TitleOptionEventCP=Impostazioni per le ferie relative ad eventi
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Convalida
 UpdateEventCP=Aggiorna eventi
 CreateEventCP=Crea
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Aggiorna
 ErrorMailNotSend=Si è verificato un errore nell'invio dell'email:
 NoCPforMonth=Nessun permesso questo mese.
 nbJours=Numero di giorni
-TitleAdminCP=Impostazioni delle ferie
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Salve
-HolidaysToValidate=Convalida ferie
-HolidaysToValidateBody=Di sotto una richiesta ferie da verificare
-HolidaysToValidateDelay=Questa è una richiesta di ferie da godere fra meno di %s giorni
-HolidaysToValidateAlertSolde=L'utente che ha fatto questa richiesta ferie non dispone di abbastanza ferie residue
-HolidaysValidated=Ferie convalidate
-HolidaysValidatedBody=La tua richiesta di ferie dal %s al %s è stata convalidata.
-HolidaysRefused=Ferie negate
-HolidaysRefusedBody=La tua richiesta di ferie dal %s al %s è stata negata con la seguente motivazione:
-HolidaysCanceled=Ferie annullate
-HolidaysCanceledBody=La tua richiesta di ferie dal %s al %s è stata annullata.
-Permission20000=Visualizza le tue ferie
-Permission20001=Crea/modifica le tue ferie
-Permission20002=Crea/modifica le ferie di tutti
-Permission20003=Cancella richieste ferie
-Permission20004=Imposta ferie
-Permission20005=Controlla il log delle modifiche alle ferie
-Permission20006=Visualizza il report sulle ferie del mese
+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
diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
index 2b8f0a8aa3f..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,10 +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
-ClassifyBilled=Classifica come "Fatturato"
+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
@@ -39,4 +50,4 @@ ArcticNumRefModelError=Impossibile attivare
 PacificNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza senza pausa e che non ritorna a 0
 PacificNumRefModelError=Un modello di numerazione degli interventi che inizia con $syymm è già esistente e non è compatibile con questo modello di sequenza. Rimuovere o rinominare per attivare questo modulo.
 PrintProductsOnFichinter=Stampa prodotti sulla scheda di intervento
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=Per interventi generati da ordini
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 <b>%s</b> destinatari per ogni sessione di invio
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> nel
 ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquote IVA per: <b>%s</b>.
 ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: <b>%s</b>.
 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 <b>Allega file</b> 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.<br/><br/>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 <b>di test</b> (la parola test deve risultare in grassetto).<br/> 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 01e6e194907..82fb5481e67 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -13,10 +13,10 @@ NewProduct=Nuovo prodotto
 NewService=Nuovo servizio
 ProductCode=Codice prodotto
 ServiceCode=Codice  servizio
-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=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 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
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Statistiche Prodotti e Servizi
 ProductsStatistics=Statistiche Prodotti
 ProductsOnSell=Prodotti in vendita
 ProductsNotOnSell=Prodotti non in vendita
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Prodotti non per la vendita o per l'acquisto
 ServicesOnSell=Servizi in vendita
 ServicesNotOnSell=Servizi non in vendita
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Servizi non per la vendita o per l'acquisto
 InternalRef=Riferimento interno
 LastRecorded=Ultimi prodotti/servizi in vendita registrati
 LastRecordedProductsAndServices=Ultimi %s prodotti/servizi registrati
@@ -72,8 +72,8 @@ PublicPrice=Prezzo al pubblico
 CurrentPrice=Prezzo attuale
 NewPrice=Nuovo prezzo
 MinPrice=Prezzo minimo di vendita
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Prezzo minimo di vendita (al netto delle tasse)
+MinPriceTTC=Prezzo minimo di vendita (tasse incluse)
 CantBeLessThanMinPrice=Il prezzo di vendita non può essere inferiore al minimo consentito per questo prodotto ( %s IVA esclusa)
 ContractStatus=Stato del Contratto
 ContractStatusClosed=Chiuso
@@ -85,6 +85,7 @@ 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=Errore. Il prezzo non può essere inferiore del Prezzo minimo
 Suppliers=Fornitori
 SupplierRef=Rif. fornitore
 ShowProduct=Visualizza prodotto
@@ -113,15 +114,15 @@ BarcodeValue=Valore codice a barre
 NoteNotVisibleOnBill=Nota (non visibile su fatture, proposte ...)
 CreateCopy=Crea copia
 ServiceLimitedDuration=Se il prodotto è un servizio di durata limitata:
-MultiPricesAbility=Several level of prices per product/service
+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
@@ -131,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?
@@ -160,12 +161,12 @@ NoSupplierPriceDefinedForThisProduct=Nessun prezzo fornitore definito per questo
 RecordedProducts=Prodotti registrati
 RecordedServices=Servizi registrati
 RecordedProductsAndServices=Prodotti/servizi registrati
-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=Prodotti predefiniti per la vendita
+PredefinedServicesToSell=Servizi predefiniti per la vendita
+PredefinedProductsAndServicesToSell=Prodotti/servizi predefiniti per la vendita
+PredefinedProductsToPurchase=Prodotti predefiniti per l'acquisto
+PredefinedServicesToPurchase=Servizi predefiniti per l'acquisto
+PredefinedProductsAndServicesToPurchase=Prodotti/servizi predefiniti per l'acquisto
 GenerateThumb=Genera miniatura
 ProductCanvasAbility=Uso estensioni speciali "canvas"
 ServiceNb=Servizio non %s
@@ -178,18 +179,18 @@ CloneProduct=Clona prodotto/servizio
 ConfirmCloneProduct=Vuoi davvero clonare il prodotto/servizio <b>%s</b>?
 CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
 ClonePricesProduct=Clona principali informazioni e prezzi
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clona prodotto/servizio associato
 ProductIsUsed=Questo prodotto è in uso
 NewRefForClone=Rif. del nuovo prodotto/servizio
 CustomerPrices=Prezzi al cliente
 SuppliersPrices=Prezzi fornitori
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Prezzo fornitore (di prodotti e servizi)
 CustomCode=Codice dogana
 CountryOrigin=Paese di origine
 HiddenIntoCombo=Nascosti nelle tendine di selezione
 Nature=Natura
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Template di rif. prodotto
+ServiceCodeModel=Template di rif. servizio
 AddThisProductCard=Crea scheda prodotto
 HelpAddThisProductCard=Questa opzione permette la creazione o la clonazione di un prodotto se non esiste.
 AddThisServiceCard=Crea scheda servizio
@@ -213,29 +214,36 @@ CostPmpHT=Totale netto VWAP
 ProductUsedForBuild=Autoconsumato dalla produzione
 ProductBuilded=Produzione completata
 ProductsMultiPrice=Prodotto con più prezzi
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Prezzo clienti (di prodotti o servizi, multi-prezzo)
 ProductSellByQuarterHT=Turnover dei prodotti trimestrale VWAP
 ServiceSellByQuarterHT=Turnover trimestrale dei servizi VWAP
 Quarter1=Primo trimestre
 Quarter2=Secondo trimestre
 Quarter3=Terzo trimestre
 Quarter4=Quarto trimestre
-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 <b>%s</b>.
-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
+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 <b>%s</b>.
+NumberOfStickers=Numero di etichette da stampare sulla pagina
+PrintsheetForOneBarCode=Stampa più etichette per singolo codice a barre
+BuildPageToPrint=Genera pagina da stampare
+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=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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 0a6e8ec956e..62d699144c6 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Rif. progetto
+ProjectId=Id progetto
 Project=Progetto
 Projects=Progetti
 SharedProject=Progetto condiviso
@@ -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?
@@ -32,20 +32,22 @@ TimeSpent=Tempo lavorato
 TimesSpent=Tempo lavorato
 RefTask=Rif. compito
 LabelTask=Etichetta compito
-TaskTimeSpent=Time spent on tasks
+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
 Tasks=Compiti
 Task=Compito
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+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à
@@ -54,8 +56,8 @@ MyActivities=I miei compiti / operatività
 MyProjects=I miei progetti
 DurationEffective=Durata effettiva
 Progress=Avanzamento
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Progresso dichiarato
+ProgressCalculated=Progresso calcolato
 Time=Tempo
 ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto
 ListOrdersAssociatedProject=Elenco degli ordini associati al progetto
@@ -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=Vedi anche compiti non assegnati a me
-ShowMyTasksOnly=Visualizza solo i miei compiti
+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=Questo compito non è assegnato a te
+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 <b>%s</b> 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.
@@ -99,16 +101,16 @@ CloneProject=Clona progetto
 CloneTasks=Clona compiti
 CloneContacts=Clona contatti
 CloneNotes=Clona note
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneProjectFiles=Clona progetto con file collegati
+CloneTaskFiles=Clona i file collegati alle(a) attività (se le(a) attività sono clonate)
 ConfirmCloneProject=Vuoi davvero clonare il progetto?
 ProjectReportDate=Cambia la data del compito a seconda della data di inizio progetto
 ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto
 ProjectsAndTasksLines=Progetti e compiti
 ProjectCreatedInDolibarr=Progetto %s creato
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+TaskCreatedInDolibarr=Attività %s creata
+TaskModifiedInDolibarr=Attività %s modificata
+TaskDeletedInDolibarr=Attività %s cancellata
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Capo progetto
 TypeContact_project_external_PROJECTLEADER=Capo progetto
@@ -118,13 +120,15 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Responsabile del compito
 TypeContact_project_task_external_TASKEXECUTIVE=Responsabile del compito
 TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributore
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributore
-SelectElement=Select element
-AddElement=Link to element
+SelectElement=Seleziona elemento
+AddElement=Link all'elemento
+UnlinkElement=Rimuovi collegamento
 # Documents models
 DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..)
 PlannedWorkload = Carico di lavoro previsto
 WorkloadOccupation= Carico di lavoro supposto
 ProjectReferers=Elementi correlati
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+SearchAProject=Cerca un progetto
+ProjectMustBeValidatedFirst=I progetti devono prima essere validati
+ProjectDraft=Progetti bozza
+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 39ae8d602e2..96c7036a771 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Statistiche calcolate solo sulle spedizioni conval
 DateDeliveryPlanned=Data di consegna prevista
 DateReceived=Data di consegna ricevuto
 SendShippingByEMail=Invia spedizione via EMail
-SendShippingRef=Invia %s spedizione
+SendShippingRef=Invio della spedizione %s
 ActionsOnShipping=Acions sulla spedizione
 LinkToTrackYourPackage=Link a monitorare il tuo pacchetto
 ShipmentCreationIsDoneFromOrder=Per il momento, la creazione di una nuova spedizione viene effettuata dalla scheda dell'ordine.
 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
 SendingMethodTRANS=A cura del mittente
 SendingMethodCOLSUI=Corriere espresso
-
 # ModelDocument
 DocumentModelSirocco=Semplice modello di documento per le ricevute di consegna
 DocumentModelTyphon=Modello più completo di documento per le ricevute di consegna (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER costante non definita
 SumOfProductVolumes=Totale volume prodotti
 SumOfProductWeights=Totale peso prodotti
+
+# warehouse details
+DetailWarehouseNumber= Dettagli magazzino
+DetailWarehouseFormat= Peso:%s (Qtà : %d)
diff --git a/htdocs/langs/it_IT/shop.lang b/htdocs/langs/it_IT/shop.lang
deleted file mode 100644
index edcdd0c7478..00000000000
--- a/htdocs/langs/it_IT/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Connessione al database di oscommerce fallita. Controlla le impostazioni di setup del tuo modulo.
-Shop=Negozio
-ShopWeb=Negozio online
-LastOrders=Ultimi ordini
-OnStandBy=In standby
-TreatmentInProgress=Trattamento in corso
-LastCustomers=Ultimi clienti
-OSCommerceShop=Negozio OSCommerce
-OSCommerce=OSCommerce
-AddProd=Vendita online
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index d5dab356e12..0b5b610b2b6 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Etichetta del magazzino mancante
 CorrectStock=Scorte di magazzino corrette
 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
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 7bf6b2ed7c5..e7c9fbcbd5e 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Crea fattura fornitore
 ListOfSupplierProductForSupplier=Elenco prodotti e prezzi per il fornitore <b>%s</b>
 NoneOrBatchFileNeverRan=Nessuno batch file o <b>%s</b> non eseguito di recente
 SentToSuppliers=Inviato ai fornitori
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
index ee248b69766..413dcf89c4c 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Viaggio
 ListTripsAndExpenses=Elenco dei viaggi e delle spese
 ExpensesArea=Area viaggi e spese
 SearchATripAndExpense=Cerca viaggi e spese
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index fedbc7bd254..06e48cdad56 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=エラー、このモジュールはDolibarr
 ErrorDecimalLargerThanAreForbidden=<b>%s</b>より精度の高いエラーは、サポートされていません。
 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)
@@ -54,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つ目のシートの完全な日付のイベントを表示
@@ -133,7 +137,7 @@ Box=ボックス
 Boxes=ボックス
 MaxNbOfLinesForBoxes=ボックスの行の最大数
 PositionByDefault=デフォルト順
-Position=オーダー
+Position=Position
 MenusDesc=メニューマネージャは、2メニューバー（横棒と縦棒）の内容を定義します。
 MenusEditorDesc=メニューエディタでは、メニューのパーソナライズされたエントリを定義することができます。 dolibarr不安定とメニューエントリは永久に到達できないことを避けるために慎重にそれを使用しています。 <br>いくつかのモジュールは、メニュー（ <b>すべての</b>ほとんどの場合、メニュー内）にエントリを追加します。誤ってこれらのエントリの一部を削除した場合は、モジュールを無効化と再有効化によってそれらを復元することができます。
 MenuForUsers=ユーザーのためのメニュー
@@ -206,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=利用可能なボックス
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=自動Javascriptが無効になっている場合
 AvailableOnlyIfJavascriptNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能
 Required=必須
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=セキュリティー
 Passwords=パスワード
 DoNotStoreClearPassword=行うにはデータベースに格納しない明確なパスワードがストアのみ暗号化された値（活性化推奨）
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPSホスト（システ
 MAIN_MAIL_EMAIL_FROM=自動電子メールの送信者の電子メール（php.iniのデフォルト<b>：%s）</b>
 MAIN_MAIL_ERRORS_TO=送信者の電子メール送信エラーを返し電子メールを使用する
 MAIN_MAIL_AUTOCOPY_TO= 体系的にすべての送信メールの隠されたカーボンコピーを送信
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=すべての電子メールsendings（テストの目的やデモのために）無効にする
 MAIN_MAIL_SENDMODE=電子メールを送信するために使用する方法
 MAIN_MAIL_SMTPS_ID=認証が必要な場合は、SMTPには、ID
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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=寄付金の管理
-Module800Name=データベースに直接アクセスでosCommerceの
-Module800Desc=データベースへの直接アクセスを介してosCommerceのかOSCSS店を表示するためのインタフェース
-Module900Name=WSでosCommerceの
-Module900Desc=Webサービスを介してosCommerceのショップを表示するためのインターフェース。このモジュールは、/ oscommerce_ws / ws_serverからあなたのosCommerceのサーバーにコンポーネントをインストールすることができrequiere。 / oscommerce_ws / ws_serverのREADMEファイルを参照してください。
 Module1200Name=カマキリ
 Module1200Desc=カマキリの統合
 Module1400Name=会計
@@ -493,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=議題
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=社会貢献とバットを作成/変更
 Permission93=社会貢献とバットを削除します。
 Permission94=社会貢献をエクスポートします。
 Permission95=レポートを読む
-Permission96=派遣セットアップ
-Permission97=派遣請求書会計を読む
-Permission98=請求書の会計の行を派遣
 Permission101=sendingsを読む
 Permission102=sendingsを作成/変更
 Permission104=sendingsを検証する
@@ -603,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=作成/変更サプライヤーの受注
@@ -668,7 +679,7 @@ Permission300=バーコードを読み取る
 Permission301=バーコードを作成/変更
 Permission302=バーコードを削除します。
 Permission311=サービスを読む
-Permission312=契約にサービスを割り当てる
+Permission312=Assign service/subscription to contract
 Permission331=ブックマークを読み込む
 Permission332=ブックマークを作成/変更
 Permission333=ブックマークを削除
@@ -698,8 +709,8 @@ Permission701=寄付を読む
 Permission702=寄付を作成/変更
 Permission703=寄付を削除します。
 Permission1001=株式を読む
-Permission1002=株を作成/変更
-Permission1003=銘柄を削除します。
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=株式の動きを読む
 Permission1005=株式の動きを作成/変更
 Permission1101=配信の注文をお読みください
@@ -775,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
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=使用する既定の言語（言語コード）
 EnableMultilangInterface=多言語のインターフェイスをイネーブルにします。
 EnableShowLogo=左メニューのロゴを表示する
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=お使いのシステムは正常に更新されました
 CompanyInfo=会社概要/基礎情報
 CompanyIds=会社概要/基礎アイデンティティ
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=によって建てられた会計コードを返しま
 ModuleCompanyCodePanicum=空の会計コードを返します。
 ModuleCompanyCodeDigitaria=会計コードがサードパーティのコードに依存しています。コー​​ドは、文字サードパーティのコードの最初の5文字が続く最初の位置に &quot;C&quot;で構成されています。
 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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=ドラフト文書に透かし
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=ユニークなイドプロ
 MustBeUnique=一意である必要がありますか？
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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=モジュールの番号受注
@@ -1142,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では、タグを使用することができます<br>呼び出すために人の電話番号に置き換えられます<b>__PHONETO__</b> <br>呼び出し人の電話番号（あなた）に置き換えられます<b>__PHONEFROM__</b> <br>あなたのclicktodialログイン（ユーザーカードに定義されています）に置き換えられます<b>__LOGIN__</b> <br>あなたのclicktodialパスワード（ユーザーカードに定義されています）に置き換えられます<b>__PASS__。</b>
@@ -1154,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
@@ -1318,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=サービスモジュールのセットアップ
@@ -1378,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=領収書のモデルを送信する
@@ -1408,8 +1424,9 @@ OSCommerceTestOk=ユーザー '%s'成功したデータベース &quot;%s&quot;
 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=ツリーメニュー
@@ -1474,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サイトへのショートカットを追加することができます。
@@ -1531,5 +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 c99a45dc40c..d2ed716615c 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=イベント
 ActionsArea=イベントエリア（アクションとタスク）
-Agenda= 議題
-Agendas= アジェンダ
-Calendar= カレンダー
-Calendars= カレンダー
-LocalAgenda=ローカルカレンダー
-AffectedTo= 影響を受ける
-DoneBy= によって行われ
-Events= イベント
+Agenda=議題
+Agendas=アジェンダ
+Calendar=カレンダー
+Calendars=カレンダー
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=影響を受ける
+DoneBy=によって行われ
+Event=Event
+Events=イベント
 EventsNb=Number of events
 MyEvents=自分のイベント
 OtherEvents=その他のイベント
@@ -17,31 +19,33 @@ ListOfActions=イベントのリスト
 Location=場所
 EventOnFullDay=一日のイベント
 SearchAnAction= イベント/タスクを検索
-MenuToDoActions= すべての不完全なイベント
-MenuDoneActions= すべての終了イベント
-MenuToDoMyActions= 私の不完全なイベント
-MenuDoneMyActions= 私の終了イベント
-ListOfEvents= Dolibarrイベントのリスト
+MenuToDoActions=すべての不完全なイベント
+MenuDoneActions=すべての終了イベント
+MenuToDoMyActions=私の不完全なイベント
+MenuDoneMyActions=私の終了イベント
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=によって報告されたイベント
 ActionsToDoBy=イベントへの影響を受けた
 ActionsDoneBy=によって行われたイベント
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= すべての私のイベント/タスク
 AllActions= すべてのイベント/タスク
 ViewList=リストビュー
 ViewCal=月間表示
 ViewDay=日表示
 ViewWeek=週ビュー
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= 定義済みのフィルタを使用して表示
 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は、検証
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=注文%sは、承認された
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=注文%sは、ドラフトの状態に戻って
 OrderCanceledInDolibarr=ご注文はキャンセル%s
-InterventionValidatedInDolibarr=介入%sは、検証
 ProposalSentByEMail=電子メールで送信商業提案%s
 OrderSentByEMail=電子メールで送信、顧客の注文%s
 InvoiceSentByEMail=電子メールで送信顧客の請求書%s
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=電子メールで送信サプライヤの注文%s
 SupplierInvoiceSentByEMail=電子メールで送信サプライヤの請求書%s
 ShippingSentByEMail=電子メールで送信出荷%s
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=電子メールで送信介入%s
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= 第三者が作成した
 DateActionPlannedStart= 計画開始日
 DateActionPlannedEnd= 計画終了日
@@ -68,19 +69,24 @@ DateActionStart= 開始日
 DateActionEnd= 終了日
 AgendaUrlOptions1=また、出力をフィルタリングするには、次のパラメータを追加することができます。
 AgendaUrlOptions2=<b>ログインは= %s</b>に影響を受けた、またはユーザー<b>%s</b>によって行われ、作成されたアクションに出力を制限する。
-AgendaUrlOptions3=ユーザー<b>%s</b>によって作成されたアクションに出力を制限loginA <b>に= %s。</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=ユーザー<b>%s</b>に影響を受けたアクションに出力を制限する<b>logint = %s。</b>
-AgendaUrlOptions5=ユーザー<b>%s</b>によって行われたアクションへの出力を制限する<b>logind = %s。</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=誕生日の連絡先を表示する
 AgendaHideBirthdayEvents=誕生日の接点を隠す
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=輸出カレンダー
 ExtSites=外部カレンダーをインポートする
-ExtSitesEnableThisTool=議題に外部カレンダーを表示する
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=カレンダーの数
 AgendaExtNb=カレンダーNB %s
 ExtSiteUrlAgenda=。iCalファイルにアクセスするためのURL
 ExtSiteNoLabel=全く説明がありません
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 06c73f1130e..cf608e4a380 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=クレジットメモ
 InvoiceAvoirAsk=請求書を訂正するためにクレジットノート
 InvoiceAvoirDesc=<b>クレジット·ノートでは、</b>請求書が実際に支払った量よりも異なります（顧客がエラーによってあまりにも多くを支払った、または彼が例えば、いくつかの製品が返されましたので、完全に支払われないため）量を持っているという事実を解決するために使用される負の請求書です。
 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によって置き換えられ
@@ -85,8 +85,9 @@ ClassifyPaid=分類 '有料'
 ClassifyPaidPartially='は部分的に有料 &quot;に分類
 ClassifyCanceled=&quot;放棄&quot;を分類する
 ClassifyClosed=&quot;クローズ&quot;を分類する
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=請求書を作成します。
-AddBill=請求書やクレジットメモを追加
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=請求書を削除します。
 SearchACustomerInvoice=顧客の請求書の検索
@@ -98,7 +99,7 @@ DoPaymentBack=戻って支払いを行う
 ConvertToReduc=将来の割引に変換
 EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力します。
 EnterPaymentDueToCustomer=顧客のために支払いをする
-DisabledBecauseRemainderToPayIsZero=支払うために剰余がゼロになるので、無効に
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=量
 PriceBase=価格ベース
 BillStatus=請求書の状況
@@ -136,8 +137,6 @@ BillFrom=から
 BillTo=請求する
 ActionsOnBill=請求書上のアクション
 NewBill=新しい請求書
-Prélèvements=立っているため、
-Prélèvements=立っているため、
 LastBills=最後%sの請求書
 LastCustomersBills=最後%sのお客様の請求書
 LastSuppliersBills=最後%sサプライヤーの請求書
@@ -155,9 +154,9 @@ ConfirmCancelBill=あなたが請求書<b>%sを</b>キャンセルしてもよ
 ConfirmCancelBillQuestion=なぜあなたは、この請求書 &quot;放棄&quot;を分類したいですか？
 ConfirmClassifyPaidPartially=あなたが支払った状態に送り状<b>%sを</b>変更してもよろしいですか？
 ConfirmClassifyPaidPartiallyQuestion=この請求書は完全に支払われていません。この請求書を閉じるには、あなたのための理由は何ですか？
-ConfirmClassifyPaidPartiallyReasonAvoir=支払うために残りの<b>（%s %s）は、</b>支払いが期間前になされたために付与された割引です。私はクレジットノートとVATを定例化する。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=支払うために残りの<b>（%s %s）は、</b>支払いが期間前になされたために付与された割引です。私は、この割引に付加価値を失うことを受け入れる。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=支払うために残りの<b>（%s %s）は、</b>支払いが期間前になされたために付与された割引です。 Iは、信用メモせずに、この割引にVATを回復します。
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=悪い顧客
 ConfirmClassifyPaidPartiallyReasonProductReturned=製品は、部分的に返される
 ConfirmClassifyPaidPartiallyReasonOther=その他の理由で放棄された金額
@@ -190,15 +189,15 @@ 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=過剰は、受信した
 EscompteOffered=提供される割引（用語の前にお支払い）
-SendBillRef=請求書%sを送る
-SendReminderBillRef=請求書%s（リマインダー）を送信
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=立っている受注
 StandingOrder=立っているため、
 NoDraftBills=いいえドラフトの請求なし
@@ -218,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=顧客の請求書のリストと請求書の行
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=二つの新しい割引の合計は元の
 ConfirmRemoveDiscount=この割引を削除してよろしいですか？
 RelatedBill=関連する請求書
 RelatedBills=関連する請求書
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=即時の
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index bcd458c1ad3..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 7f5e61f6d16..3fd8c12c29a 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=あなたは、電子メール通知を追加できる
 ListSuppliersShort=サプライヤーのリスト
 ListProspectsShort=見込み客リスト
 ListCustomersShort=顧客リスト
-ThirdPartiesArea=第三者のエリア
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=最後%sは、第三者を変更
 UniqueThirdParties=ユニークな第三者の合計
 InActivity=開く
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=yyは年である顧客コードと仕入先コードの%syymm-nnnnの形式%syymm-NNNNとニュメロを返し、mmは月とnnnnはありません休憩0〜ノーリターンでシーケンスです。
 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。このコードは、いつでも変更することができます。
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 4520b58c2d3..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：アカウント上で預金の領収書を作成する
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 d36096f4c15..10ce21a04c4 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=寄付
 Donations=寄付
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=ドナー
 Donors=ドナー
-AddDonation=寄付を追加します。
+AddDonation=Create a donation
 NewDonation=新しい寄付
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=ギフト約束
 PromisesNotValid=検証されていない約束
 PromisesValid=検証の約束
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=ドラフト
 DonationStatusPromiseValidatedShort=検証
 DonationStatusPaidShort=受信された
 ValidPromess=約束を検証する
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=領収書を構築する
 DonationsModels=寄付金の領収書のドキュメントモデル
 LastModifiedDonations=最後%sは寄付を変更
 SearchADonation=寄付を検索
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 7c6cea3468f..9742a4ad7c7 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=サプライヤーコードが必要です
 ErrorSupplierCodeAlreadyUsed=サプライヤーコードが既に使用され
 ErrorBadParameters=パラメータが不正で
 ErrorBadValueForParameter=パラメータが正しくない &quot;%s&quot;のために間違った値 &quot;%s&quot;
-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=ログイン<b>%s</b>を持つユーザーを見つけ
 ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていません。プロセスが中止されました。
 ErrorBadValueForCode=セキュリティコードの値が正しくありません。新しい値で再試行してください...
 ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできません
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用<b>%s</b>そのための権限を持っていない
 ErrorNoActivatedBarcode=活性化バーコード·タイプません
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index d94a41b3f0c..d4f9e41664b 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=口座番号
 BankAccountNumberKey=キー
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 d50a1db2f96..53fdbe451e8 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=開始日
 DateFinCP=終了日
@@ -18,24 +18,24 @@ ApprovedCP=承認された
 CancelCP=キャンセル
 RefuseCP=拒否
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=説明
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=編集
 DeleteCP=削除する
 ActionValidCP=検証
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=キャンセル
 StatutCP=ステータス
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=更新
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=理由
 UserCP=ユーザー
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=検証
 UpdateEventCP=Update events
 CreateEventCP=作る
@@ -127,23 +126,23 @@ UpdateEventOptionCP=更新
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index 37cadf42a7b..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=介入のアクション
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=あなたはこの介入の行を削除しても
 NameAndSignatureOfInternalContact=介入の名前と署名：
 NameAndSignatureOfExternalContact=顧客の名前と署名：
 DocumentModelStandard=介入のための標準のドキュメントモデル
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=&quot;銘打たれた&quot;分類
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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=間にある
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=一般的な数値モデル
 ArcticNumRefModelError=アクティブ化に失敗
 PacificNumRefModelDesc1=yyは年である%syymm - nnnnの形式でニュメロを返す、mmは月ですと、nnnnはなく休憩と0〜ノーリターンでシーケンスです。
 PacificNumRefModelError=$ syymmで始まる介入のカードは、すでに存在し、シーケンスのこのモデルと互換性がありません。それを削除するか、このモジュールをアクティブにするには、その名前を変更。
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために &quot;添付ファイル&quot;をクリックしてください。
 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<br/>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=銀行振込を使用してサブスクリプション費用の支払いを行うには、ページ参照<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribeを</a> 。 <br>クレジットカードまたはPayPalでお支払いには、このページの下部にあるボタンをクリックします。 <br>
-# 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=下書きのステータスに注文<b>%sを</b>復元し
 ConfirmCancelOrder=あなたがこの注文をキャンセルしてもよろしいですか？
 ConfirmMakeOrder=あなたは<b>%s</b>にこの順序を作ったことを確認してもよろしいですか？
 GenerateBill=請求書を生成します。
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
 ClassifyBilled=&quot;銘打たれた&quot;分類
 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=この領域は他のメニューエントリに利用できないグループ雑多なツールに捧げられています。 <br><br>これらのツールは、メニューから側に到達することができます。
 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 7aeca3bfaf2..8753a3c1353 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=閉じた
 ContractStatusRunning=ランニング
 ContractStatusExpired=期限切れの
 ContractStatusOnHold=実行していない
-ContractStatusToRun=mettre ENサービス
+ContractStatusToRun=To get running
 ContractNotRunning=この契約は実行されていません
 ErrorProductAlreadyExists=参照%sした製品はすでに存在しています。
 ErrorProductBadRefOrLabel=参照またはラベルの間違った値。
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=サプライヤー
 SupplierRef=サプライヤーの製品REF。
 ShowProduct=製品を表示
@@ -116,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=キーワードフィルタ
@@ -131,7 +132,7 @@ AddDel=追加/削除
 Quantity=量
 NoMatchFound=マッチするものが見つからない
 ProductAssociationList=関連製品/サービスのリスト：製品/サービスの名前（量の影響）
-ProductParentList=コンポーネントとしては、この製品と製品/サービスのリスト
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親です。
 DeleteProduct=製品/サービスを削除します。
 ConfirmDeleteProduct=この製品/サービスを削除してもよろしいですか？
@@ -178,7 +179,7 @@ CloneProduct=クローン製品やサービス
 ConfirmCloneProduct=あなたが製品やサービス<b>%sの</b>クローン<b>を作成</b>してもよろしいですか？
 CloneContentProduct=製品/サービスのすべての主要な情報のクローンを作成する
 ClonePricesProduct=主な情報と価格のクローンを作成する
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=本製品が使用されます
 NewRefForClone=REF。新製品/サービスの
 CustomerPrices=お客様の価格
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 1f927e48261..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=タスク/活動
@@ -85,13 +87,13 @@ ActionsOnProject=プロジェクトのイベント
 YouAreNotContactOfProject=この民間プロジェクトの接触ではありません
 DeleteATimeSpent=費やした時間を削除します。
 ConfirmDeleteATimeSpent=この時間を過ごし削除してもよろしいですか？
-DoNotShowMyTasksOnly=私に割り当てられていないタスクも参照してください。
-ShowMyTasksOnly=私に割り当てられたタスクのみを表示
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=この第三者に専用のプロジェクト
 NoTasks=このプロジェクトのための作業をしない
 LinkedToAnotherCompany=他の第三者へのリンク
-TaskIsNotAffectedToYou=タスクがあなたに割り当てられていない
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=費やした時間は空です
 ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべてのタスク（現時点では<b>%s</b>タスク）と過ごした時間のすべての入力を削除します。
 IfNeedToUseOhterObjectKeepEmpty=いくつかのオブジェクト（請求書、注文、...）、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数のサードパーティ中のプロジェクトを持っているこの空を保持します。
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=完全なプロジェクトのレポートモデル（logo. ..）
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 b94da43470a..9a886c508f4 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=最後%s出荷
 SearchASending=出荷の検索
 StatisticsOfSendings=出荷の統計
 NbOfSendings=出荷数
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=配送カード
 NewSending=新しい出荷
 CreateASending=出荷を作成します。
@@ -50,27 +50,31 @@ Enlevement=顧客が得
 DocumentModelSimple=簡単な文書モデル
 DocumentModelMerou=メロウA5モデル
 WarningNoQtyLeftToSend=警告は、出荷されるのを待っていない製品。
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=配達のかんな日付
 DateReceived=日付の配信は、受信した
 SendShippingByEMail=電子メールで貨物を送る
-SendShippingRef=出荷%sを送る
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=出荷のイベント
 LinkToTrackYourPackage=あなたのパッケージを追跡するためのリンク
 ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、注文カードから行われます。
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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=顧客がキャッチ
 SendingMethodTRANS=トランスポーター
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=配信確認のためのシンプルなドキュメントモデル
 DocumentModelTyphon=配信確認のために、より完全なドキュメントモデル（logo. ..）
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=定数EXPEDITION_ADDON_NUMBERが定義されていません
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/ja_JP/shop.lang b/htdocs/langs/ja_JP/shop.lang
deleted file mode 100644
index d6aee12c58e..00000000000
--- a/htdocs/langs/ja_JP/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=ショップ
-ShopWeb=ウェブショップ
-LastOrders=ラストオーダー
-OnStandBy=待機して
-TreatmentInProgress=進行中の治療
-LastCustomers=最後のお客さま
-OSCommerceShop=osCommerceのショップ
-OSCommerce=osCommerceの
-AddProd=オンライン販売
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/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index a18e7cf8d10..393bbfc7871 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=注文日
 BuyingPrice=買価
 BuyingPriceMin=最小購入価格
 BuyingPriceMinShort=最小購入価格
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=サプライヤ価格を追加します。
 ChangeSupplierPrice=サプライヤ価格を変更する
 ErrorQtyTooLowForThisSupplier=このサプライヤーのために低すぎる量やサプライヤーのために本製品に定義されていない価格
@@ -27,7 +27,7 @@ RefSupplierShort=REF。サプライヤー
 Availability=可用性
 ExportDataset_fournisseur_1=サプライヤの請求書のリストと請求書の行
 ExportDataset_fournisseur_2=サプライヤーの請求書と支払い
-# ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=この注文を承認
 ConfirmApproveThisOrder=あなたは、注文<b>%sを</b>承認してもよろしいですか？
 DenyingThisOrder=この順序を否定
@@ -39,4 +39,6 @@ AddSupplierOrder=サプライヤーの順序を作成します。
 AddSupplierInvoice=サプライヤの請求書を作成します。
 ListOfSupplierProductForSupplier=サプライヤー<b>%s</b>の製品と価格の一覧
 NoneOrBatchFileNeverRan=noneまたはバッチ<b>%sは</b>最近走っていない
-# SentToSuppliers=Sent to suppliers
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 4e30b7c9ae6..e4999a7b1ec 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=旅行
 ListTripsAndExpenses=旅行や費用のリスト
 ExpensesArea=旅行や経費エリア
 SearchATripAndExpense=旅行と費用を検索
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index db26ef5a278..c8f846c9e55 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 469182075dc..b2ab74c91bc 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=이벤트
 ActionsArea=이벤트 영역 (액션과 작업)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= 이벤트
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendar
+Calendars=Calendars
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+Events=이벤트
 EventsNb=Number of events
 MyEvents=내 이벤트
 OtherEvents=Other events
@@ -17,31 +19,33 @@ ListOfActions=이벤트 목록
 Location=위치
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 3041825db57..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index b28086fa933..22914931db1 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-# Category=Category
-# Categories=Categories
-# Rubrique=Category
-# Rubriques=Categories
-# categories=categories
-# TheCategorie=The category
-# NoCategoryYet=No category of this type created
-# In=In
-# AddIn=Add in
-# modify=modify
-# Classify=Classify
-# CategoriesArea=Categories area
-# ProductsCategoriesArea=Products/Services categories area
-# SuppliersCategoriesArea=Suppliers categories area
-# CustomersCategoriesArea=Customers categories area
-# ThirdPartyCategoriesArea=Third parties categories area
-# MembersCategoriesArea=Members categories area
-# ContactsCategoriesArea=Contacts categories area
-# MainCats=Main categories
-# SubCats=Subcategories
-# CatStatistics=Statistics
-# CatList=List of categories
-# AllCats=All categories
-# ViewCat=View category
-# NewCat=Add category
-# NewCategory=New category
-# ModifCat=Modify category
-# CatCreated=Category created
-# CreateCat=Create category
-# CreateThisCat=Create this category
-# ValidateFields=Validate the fields
-# NoSubCat=No subcategory.
-# SubCatOf=Subcategory
-# FoundCats=Found categories
-# FoundCatsForName=Categories found for the name :
-# FoundSubCatsIn=Subcategories found in the category
-# ErrSameCatSelected=You selected the same category several times
-# ErrForgotCat=You forgot to choose the category
-# ErrForgotField=You forgot to inform the fields
-# ErrCatAlreadyExists=This name is already used
-# AddProductToCat=Add this product to a category?
-# ImpossibleAddCat=Impossible to add the category
-# ImpossibleAssociateCategory=Impossible to associate the category to
-# WasAddedSuccessfully=<b>%s</b> was added successfully.
-# ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-# CategorySuccessfullyCreated=This category %s has been added with success.
-# ProductIsInCategories=Product/service owns to following categories
-# SupplierIsInCategories=Third party owns to following suppliers categories
-# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-# MemberIsInCategories=This member owns to following members categories
-# ContactIsInCategories=This contact owns to following contacts categories
-# ProductHasNoCategory=This product/service is not in any categories
-# SupplierHasNoCategory=This supplier is not in any categories
-# CompanyHasNoCategory=This company is not in any categories
-# MemberHasNoCategory=This member is not in any categories
-# ContactHasNoCategory=This contact is not in any categories
-# ClassifyInCategory=Classify in category
-# NoneCategory=None
-# NotCategorized=Without category
-# CategoryExistsAtSameLevel=This category already exists with this ref
-# ReturnInProduct=Back to product/service card
-# ReturnInSupplier=Back to supplier card
-# ReturnInCompany=Back to customer/prospect card
-# ContentsVisibleByAll=The contents will be visible by all
-# ContentsVisibleByAllShort=Contents visible by all
-# ContentsNotVisibleByAllShort=Contents not visible by all
-# CategoriesTree=Categories tree
-# DeleteCategory=Delete category
-# ConfirmDeleteCategory=Are you sure you want to delete this category ?
-# RemoveFromCategory=Remove link with categorie
-# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-# NoCategoriesDefined=No category defined
-# SuppliersCategoryShort=Suppliers category
-# CustomersCategoryShort=Customers category
-# ProductsCategoryShort=Products category
-# MembersCategoryShort=Members category
-# SuppliersCategoriesShort=Suppliers categories
-# CustomersCategoriesShort=Customers categories
-# CustomersProspectsCategoriesShort=Custo./Prosp. categories
-# ProductsCategoriesShort=Products categories
-# MembersCategoriesShort=Members categories
-# ContactCategoriesShort=Contacts categories
-# ThisCategoryHasNoProduct=This category does not contain any product.
-# ThisCategoryHasNoSupplier=This category does not contain any supplier.
-# ThisCategoryHasNoCustomer=This category does not contain any customer.
-# ThisCategoryHasNoMember=This category does not contain any member.
-# ThisCategoryHasNoContact=This category does not contain any contact.
-# AssignedToCustomer=Assigned to a customer
-# AssignedToTheCustomer=Assigned to the customer
-# InternalCategory=Internal category
-# CategoryContents=Category contents
-# CategId=Category id
-# CatSupList=List of supplier categories
-# CatCusList=List of customer/prospect categories
-# CatProdList=List of products categories
-# CatMemberList=List of members categories
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+Category=Category
+Categories=Categories
+Rubrique=Category
+Rubriques=Categories
+categories=categories
+TheCategorie=The category
+NoCategoryYet=No category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Categories area
+ProductsCategoriesArea=Products/Services categories area
+SuppliersCategoriesArea=Suppliers categories area
+CustomersCategoriesArea=Customers categories area
+ThirdPartyCategoriesArea=Third parties categories area
+MembersCategoriesArea=Members categories area
+ContactsCategoriesArea=Contacts categories area
+MainCats=Main categories
+SubCats=Subcategories
+CatStatistics=Statistics
+CatList=List of categories
+AllCats=All categories
+ViewCat=View category
+NewCat=Add category
+NewCategory=New category
+ModifCat=Modify category
+CatCreated=Category created
+CreateCat=Create category
+CreateThisCat=Create this category
+ValidateFields=Validate the fields
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found categories
+FoundCatsForName=Categories found for the name :
+FoundSubCatsIn=Subcategories found in the category
+ErrSameCatSelected=You selected the same category several times
+ErrForgotCat=You forgot to choose the category
+ErrForgotField=You forgot to inform the fields
+ErrCatAlreadyExists=This name is already used
+AddProductToCat=Add this product to a category?
+ImpossibleAddCat=Impossible to add the category
+ImpossibleAssociateCategory=Impossible to associate the category to
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this category.
+CategorySuccessfullyCreated=This category %s has been added with success.
+ProductIsInCategories=Product/service owns to following categories
+SupplierIsInCategories=Third party owns to following suppliers categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
+MemberIsInCategories=This member owns to following members categories
+ContactIsInCategories=This contact owns to following contacts categories
+ProductHasNoCategory=This product/service is not in any categories
+SupplierHasNoCategory=This supplier is not in any categories
+CompanyHasNoCategory=This company is not in any categories
+MemberHasNoCategory=This member is not in any categories
+ContactHasNoCategory=This contact is not in any categories
+ClassifyInCategory=Classify in category
+NoneCategory=None
+NotCategorized=Without category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ReturnInProduct=Back to product/service card
+ReturnInSupplier=Back to supplier card
+ReturnInCompany=Back to customer/prospect card
+ContentsVisibleByAll=The contents will be visible by all
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+CategoriesTree=Categories tree
+DeleteCategory=Delete category
+ConfirmDeleteCategory=Are you sure you want to delete this category ?
+RemoveFromCategory=Remove link with categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
+NoCategoriesDefined=No category defined
+SuppliersCategoryShort=Suppliers category
+CustomersCategoryShort=Customers category
+ProductsCategoryShort=Products category
+MembersCategoryShort=Members category
+SuppliersCategoriesShort=Suppliers categories
+CustomersCategoriesShort=Customers categories
+CustomersProspectsCategoriesShort=Custo./Prosp. categories
+ProductsCategoriesShort=Products categories
+MembersCategoriesShort=Members categories
+ContactCategoriesShort=Contacts categories
+ThisCategoryHasNoProduct=This category does not contain any product.
+ThisCategoryHasNoSupplier=This category does not contain any supplier.
+ThisCategoryHasNoCustomer=This category does not contain any customer.
+ThisCategoryHasNoMember=This category does not contain any member.
+ThisCategoryHasNoContact=This category does not contain any contact.
+AssignedToCustomer=Assigned to a customer
+AssignedToTheCustomer=Assigned to the customer
+InternalCategory=Internal category
+CategoryContents=Category contents
+CategId=Category id
+CatSupList=List of supplier categories
+CatCusList=List of customer/prospect categories
+CatProdList=List of products categories
+CatMemberList=List of members categories
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 1b2ea17215b..5580d87b517 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 12a72464cae..f7aed91cf81 100644
--- a/htdocs/langs/ko_KR/donations.lang
+++ b/htdocs/langs/ko_KR/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
-# Donations=Donations
-# DonationRef=Donation ref.
-# Donor=Donor
-# Donors=Donors
-# AddDonation=Add a donation
-# NewDonation=New donation
-# ShowDonation=Show donation
-# DonationPromise=Gift promise
-# PromisesNotValid=Not validated promises
-# PromisesValid=Validated promises
-# DonationsPaid=Donations paid
-# DonationsReceived=Donations received
-# PublicDonation=Public donation
-# DonationsNumber=Donation number
-# DonationsArea=Donations area
-# DonationStatusPromiseNotValidated=Draft promise
-# DonationStatusPromiseValidated=Validated promise
-# DonationStatusPaid=Donation received
-# DonationStatusPromiseNotValidatedShort=Draft
-# DonationStatusPromiseValidatedShort=Validated
-# DonationStatusPaidShort=Received
-# ValidPromess=Validate promise
-# DonationReceipt=Donation receipt
-# BuildDonationReceipt=Build receipt
-# DonationsModels=Documents models for donation receipts
-# LastModifiedDonations=Last %s modified donations
-# SearchADonation=Search a donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+Donors=Donors
+AddDonation=Create a donation
+NewDonation=New donation
+ShowDonation=Show donation
+DonationPromise=Gift promise
+PromisesNotValid=Not validated promises
+PromisesValid=Validated promises
+DonationsPaid=Donations paid
+DonationsReceived=Donations received
+PublicDonation=Public donation
+DonationsNumber=Donation number
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+BuildDonationReceipt=Build receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Last %s modified donations
+SearchADonation=Search a donation
+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 9fd6bc63ea4..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/ko_KR/exports.lang b/htdocs/langs/ko_KR/exports.lang
index dbcd9b0c858..4a8f1e22f59 100644
--- a/htdocs/langs/ko_KR/exports.lang
+++ b/htdocs/langs/ko_KR/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang
index 0a5b3e15467..c79da05364e 100644
--- a/htdocs/langs/ko_KR/interventions.lang
+++ b/htdocs/langs/ko_KR/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
-# Interventions=Interventions
-# InterventionCard=Intervention card
-# NewIntervention=New intervention
-# AddIntervention=Add intervention
-# ListOfInterventions=List of interventions
-# EditIntervention=Edit intervention
-# ActionsOnFicheInter=Actions on intervention
-# LastInterventions=Last %s interventions
-# AllInterventions=All interventions
-# CreateDraftIntervention=Create draft
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
-# InterventionContact=Intervention contact
-# DeleteIntervention=Delete intervention
-# ValidateIntervention=Validate intervention
-# ModifyIntervention=Modify intervention
-# DeleteInterventionLine=Delete intervention line
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
-# NameAndSignatureOfExternalContact=Name and signature of customer :
-# DocumentModelStandard=Standard document model for interventions
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-# ClassifyBilled=Classify "Billed"
-# StatusInterInvoiced=Billed
-# RelatedInterventions=Related interventions
-# ShowIntervention=Show intervention
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ListOfInterventions=List of interventions
+EditIntervention=Edit intervention
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Last %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+CustomerDoesNotHavePrefix=Customer does not have a prefix
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+NameAndSignatureOfInternalContact=Name and signature of intervening :
+NameAndSignatureOfExternalContact=Name and signature of customer :
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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
-# TypeContact_fichinter_external_BILLING=Billing customer contact
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
+TypeContact_fichinter_internal_INTERVENING=Intervening
+TypeContact_fichinter_external_BILLING=Billing customer contact
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
-# ArcticNumRefModelError=Failed to activate
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Generic number model
+ArcticNumRefModelError=Failed to activate
+PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 데이타베이스에서 <b>%s</b
 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=엔트리 Nb
 GoToWikiHelpPage=온라인 도움말 읽기(인터넷 액세스 )
@@ -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=월요일
 Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
index e8d5fed1af9..606d5e5053a 100644
--- a/htdocs/langs/ko_KR/margins.lang
+++ b/htdocs/langs/ko_KR/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<br/>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/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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+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 <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
+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 <b>%s</b> ?
+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.<br><br>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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 3bb65c295d2..f6111bac684 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -1,76 +1,80 @@
 # Dolibarr language file - Source file is en_US - sendings
-# RefSending=Ref. shipment
-# Sending=Shipment
-# Sendings=Shipments
-# Shipment=Shipment
-# Shipments=Shipments
-# Receivings=Receivings
-# SendingsArea=Shipments area
-# ListOfSendings=List of shipments
-# SendingMethod=Shipping method
-# SendingReceipt=Shipping receipt
-# LastSendings=Last %s shipments
-# SearchASending=Search for shipment
-# StatisticsOfSendings=Statistics for shipments
-# NbOfSendings=Number of shipments
-# NumberOfShipmentsByMonth=Number of shipments by month
-# SendingCard=Shipping card
-# NewSending=New shipment
-# CreateASending=Create a shipment
-# CreateSending=Create shipment
-# QtyOrdered=Qty ordered
-# QtyShipped=Qty shipped
-# QtyToShip=Qty to ship
-# QtyReceived=Qty received
-# KeepToShip=Keep to ship
-# OtherSendingsForSameOrder=Other shipments for this order
-# DateSending=Date sending order
-# DateSendingShort=Date sending order
-# SendingsForSameOrder=Shipments for this order
-# SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-# SendingsToValidate=Shipments to validate
-# StatusSendingCanceled=Canceled
-# StatusSendingDraft=Draft
-# StatusSendingValidated=Validated (products to ship or already shipped)
-# StatusSendingProcessed=Processed
-# StatusSendingCanceledShort=Canceled
-# StatusSendingDraftShort=Draft
-# StatusSendingValidatedShort=Validated
-# StatusSendingProcessedShort=Processed
-# SendingSheet=Sending sheet
-# Carriers=Carriers
-# Carrier=Carrier
-# CarriersArea=Carriers area
-# NewCarrier=New carrier
-# ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-# ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-# ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-# GenericTransport=Generic transport
-# Enlevement=Gotten by customer
-# DocumentModelSimple=Simple document model
-# DocumentModelMerou=Merou A5 model
-# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-# DateDeliveryPlanned=Planed date of delivery
-# DateReceived=Date delivery received
-# SendShippingByEMail=Send shipment by EMail
-# SendShippingRef=Send shipment %s
-# ActionsOnShipping=Events on shipment
-# LinkToTrackYourPackage=Link to track your package
-# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+Shipment=Shipment
+Shipments=Shipments
+Receivings=Receivings
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+SendingReceipt=Shipping receipt
+LastSendings=Last %s shipments
+SearchASending=Search for shipment
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipping card
+NewSending=New shipment
+CreateASending=Create a shipment
+CreateSending=Create shipment
+QtyOrdered=Qty ordered
+QtyShipped=Qty shipped
+QtyToShip=Qty to ship
+QtyReceived=Qty received
+KeepToShip=Keep to ship
+OtherSendingsForSameOrder=Other shipments for this order
+DateSending=Date sending order
+DateSendingShort=Date sending order
+SendingsForSameOrder=Shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingCanceledShort=Canceled
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Sending sheet
+Carriers=Carriers
+Carrier=Carrier
+CarriersArea=Carriers area
+NewCarrier=New carrier
+ConfirmDeleteSending=Are you sure you want to delete this shipment ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
+ConfirmCancelSending=Are you sure you want to cancel this shipment ?
+GenericTransport=Generic transport
+Enlevement=Gotten by customer
+DocumentModelSimple=Simple document model
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planed date of delivery
+DateReceived=Date delivery received
+SendShippingByEMail=Send shipment by EMail
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
 
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/ko_KR/shop.lang b/htdocs/langs/ko_KR/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/ko_KR/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 01c90ede80f..b1545d6ca3c 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
-# Suppliers=Suppliers
-# Supplier=Supplier
-# AddSupplier=Add a supplier
-# SupplierRemoved=Supplier removed
-# SuppliersInvoice=Suppliers invoice
-# NewSupplier=New supplier
-# History=History
-# ListOfSuppliers=List of suppliers
-# ShowSupplier=Show supplier
-# OrderDate=Order date
-# BuyingPrice=Buying price
-# BuyingPriceMin=Minimum buying price
-# BuyingPriceMinShort=Min buying price
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
-# AddSupplierPrice=Add supplier price
-# ChangeSupplierPrice=Change supplier price
-# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-# NoRecordedSuppliers=No suppliers recorded
-# SupplierPayment=Supplier payment
-# SuppliersArea=Suppliers area
-# RefSupplierShort=Ref. supplier
-# Availability=Availability
-# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-# ExportDataset_fournisseur_2=Supplier invoices and payments
-# ExportDataset_fournisseur_3=Supplier orders and order lines
-# ApproveThisOrder=Approve this order
-# ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-# DenyingThisOrder=Denying this order
-# ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-# ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-# AddCustomerOrder=Create customer order
-# AddCustomerInvoice=Create customer invoice
-# AddSupplierOrder=Create supplier order
-# AddSupplierInvoice=Create supplier invoice
-# ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-# NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-# SentToSuppliers=Sent to suppliers
+Suppliers=Suppliers
+Supplier=Supplier
+AddSupplier=Add a supplier
+SupplierRemoved=Supplier removed
+SuppliersInvoice=Suppliers invoice
+NewSupplier=New supplier
+History=History
+ListOfSuppliers=List of suppliers
+ShowSupplier=Show supplier
+OrderDate=Order date
+BuyingPrice=Buying price
+BuyingPriceMin=Minimum buying price
+BuyingPriceMinShort=Min buying price
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add supplier price
+ChangeSupplierPrice=Change supplier price
+ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+NoRecordedSuppliers=No suppliers recorded
+SupplierPayment=Supplier payment
+SuppliersArea=Suppliers area
+RefSupplierShort=Ref. supplier
+Availability=Availability
+ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
+ExportDataset_fournisseur_2=Supplier invoices and payments
+ExportDataset_fournisseur_3=Supplier orders and order lines
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+DenyingThisOrder=Denying this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+AddCustomerOrder=Create customer order
+AddCustomerInvoice=Create customer invoice
+AddSupplierOrder=Create supplier order
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
+NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang
index 55ce45bfce8..4b0501a8346 100644
--- a/htdocs/langs/ko_KR/trips.lang
+++ b/htdocs/langs/ko_KR/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-# TF_OTHER=Other
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+Trip=Trip
+Trips=Trips
+TripsAndExpenses=Trips and expenses
+TripsAndExpensesStatistics=Trips and expenses statistics
+TripCard=Trip card
+AddTrip=Add trip
+ListOfTrips=List of trips
+ListOfFees=List of fees
+NewTrip=New trip
+CompanyVisited=Company/foundation visited
+Kilometers=Kilometers
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete trip
+ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+TF_OTHER=Other
+TF_LUNCH=Lunch
+TF_TRIP=Trip
+ListTripsAndExpenses=List of trips and expenses
+ExpensesArea=Trips and expenses area
+SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 6c82e1d5a05..3d1cd8a7cb2 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Klaida, šiam moduliui reikalinga Dolibarr ver
 ErrorDecimalLargerThanAreForbidden=Klaida, tikslumas viršyjantis <b>%s</b> nėra palaikomas.
 DictionarySetup=Žodyno nustatymas
 Dictionary=Žodynai
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Vertės 'system' ir 'systemauto' yra rezervuotos šiam tipui. Galite naudoti 'user' vertę, jei norite įvesti savo įrašą
 ErrorCodeCantContainZero=Kode negali būti vertės 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Dėžutė
 Boxes=Dėžutės
 MaxNbOfLinesForBoxes=Maks. eilučių skaičius dėžutėje
 PositionByDefault=Numatytoji paraiška
-Position=Paraiška
+Position=Position
 MenusDesc=Meniu tvarkytojas nustato 2 meniu juostelių turinį (horizonatalų ir vertikalų)
 MenusEditorDesc=Meniu redaktorius leidžia nustatyti asmeninius meniu įrašus. Naudoti atsargiai, nes dolibarr gali tapti nestabilus ir meniu punktai nepasiekiami.<br>Kai kurie moduliai prideda įrašų į meniu (meniu <b>Visi</b> daugeliu atvejų). Jeigu netyčia ištrynėte meniu įrašą, galite jį atstatyti išjungdami ir vėl įjungdami modulį.
 MenuForUsers=Vartotojų meniu
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatiškai, jei Javascript yra išjungtas
 AvailableOnlyIfJavascriptNotDisabled=Galimas tik tuomet, kai JavaScript neišjungtas
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Galimas tik tuomet, kai JavaScript neišjungtas
 Required=Reikalingas
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Saugumas
 Passwords=Slaptažodžiai
 DoNotStoreClearPassword=Nesaugokite aiškių slaptažodžių duomenų bazėje, laikykite tik užšifruotus (Activated recomended)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS host (neapibrėžtas PH
 MAIN_MAIL_EMAIL_FROM=Siuntėjo el. paštas automatiniams laiškams (pagal nutylėjimą php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Siuntėjo el. paštas naudojamas siunčiamų laiškų klaidų pranešimams
 MAIN_MAIL_AUTOCOPY_TO= Sistemingai siųsti visų išsiųstų laiškų paslėptas kopijas BCC į 
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Išjungti visus el. pašto siuntimus (bandymo ar demo tikslais)
 MAIN_MAIL_SENDMODE=El. pašto siuntimui naudoti metodą
 MAIN_MAIL_SMTPS_ID=SMTP ID, jei reikalingas autentiškumo patvirtinimas
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce pagal tiesioginį priėjimą prie duomenų bazės
-Module800Desc=Sąsaja rodo OSCommerce ar OSCSS parduotuvę per tiesioginį priėjimą prie duomenų bazės
-Module900Name=OSCommerce pagal WS
-Module900Desc=Sąsaja rodo OSCommerce parduotuvę per interneto paslaugas. Šis modulis reikalauja įdiegti komponentus iš /oscommerce_ws/ws_server į savo OSCommerce serverį. Žiūrėti README failą į /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mančio integracija
 Module1400Name=Apskaita
@@ -493,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ė
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Sukurti/keisti socialines įmokas ir PVM
 Permission93=Ištrinti socialines įmokas ir PVM
 Permission94=Eksportuoti socialinės įmokas
 Permission95=Skaityti ataskaitas
-Permission96=Atlikimo/įvykdymo nustatymai
-Permission97=Skaityti sąskaitų apskaitos atlikimą
-Permission98=Atlikti sąskaitos apskaitos eilutes
 Permission101=Skaityti siuntinius
 Permission102=Sukurti/keisti siuntinius
 Permission104=Patvirtinti siuntinius
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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šą
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Grąžinti apskaitos kodą, sudarytą pagal:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Profesionalių IDS taisyklės
 MustBeUnique=Turi būti unikalus?
 MustBeMandatory=Privaloma sukurti trečiąsias šalis ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b>, tam, kad pakeisti asmens, kuriam skambinama, telefono numeriu<br><b>__PHONEFROM__</b>, tam, kad pakeisti asmens, kuris skambina, telefono numeriu (Jūsų)<br><b>__LOGIN__</b>, tam, kad  pakeisti Jūsų ClickToDial prisijungimo vardu (nustatytu vartotojo kortelėje)<br><b>__PASS__</b>, tam, kad pakeisti Jūsų ClickToDial slaptažodį (nustatytą vartotojo kortelėje).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 4e0cfd3d22b..3d2da4f6b67 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID įvykis
 Actions=Įvykiai
 ActionsArea=Įvykių sritis (Veiksmai ir uždaviniai)
-Agenda= Operacijų sąrašas
-Agendas= Operacijų sąrašai
-Calendar= Kalendorius
-Calendars= Kalendoriai
-LocalAgenda=Vietinis kalendorius
-AffectedTo= Priskirtas
-DoneBy= Atliko
-Events= Įvykiai
+Agenda=Operacijų sąrašas
+Agendas=Operacijų sąrašai
+Calendar=Kalendorius
+Calendars=Kalendoriai
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Priskirtas
+DoneBy=Atliko
+Event=Event
+Events=Įvykiai
 EventsNb=Įvykių skaičius
 MyEvents=Mano įvykiai
 OtherEvents=Kiti įvykiai
@@ -17,31 +19,33 @@ ListOfActions=Įvykių sąrašas
 Location=Vieta
 EventOnFullDay=Visos (-ų) dienos (-ų) įvykis
 SearchAnAction= Ieškoti įvykio/užduoties
-MenuToDoActions= Visi neužbaigti įvykiai
-MenuDoneActions= Visi užbaigti/nutraukti įvykiai
-MenuToDoMyActions= Mano neužbaigti įvykiai
-MenuDoneMyActions= Mano užbaigti/nutraukti įvykiai
-ListOfEvents= Dolibarr įvykių sąrašas
+MenuToDoActions=Visi neužbaigti įvykiai
+MenuDoneActions=Visi užbaigti/nutraukti įvykiai
+MenuToDoMyActions=Mano neužbaigti įvykiai
+MenuDoneMyActions=Mano užbaigti/nutraukti įvykiai
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Įvykiai, apie kuriuos pranešė
 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
 ViewCal=Mėnesio vaizdas
 ViewDay=Dienos vaizdas
 ViewWeek=Savaitės vaizdas
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Peržiūrėti su nustatytais filtrais
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Pradžios data
 DateActionEnd= Pabaigos data
 AgendaUrlOptions1=Taip pat galite pridėti šiuos parametrus išvesties filtravimui:
 AgendaUrlOptions2=<b>login=%s</b> ​​apriboti išvedimą veiksmais, sukurtais, priskirtais arba įvykdytais vartotojo <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> ​​apriboti išvedimą veiksmais, sukurtais vartotojo <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint =%s</b> ​​apriboti išvedimą veiksmais, priskirtais vartotojui <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> ​​apriboti išvedimo veiksmais, padarytais vartotojo <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Rodyti gimtadienio adresatus
 AgendaHideBirthdayEvents=Paslėpti gimtadienio adresatus
 Busy=Užimtas
 ExportDataset_event1=Operacijos įvykių sąrašas
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Eksportuoti kalendorių
 ExtSites=Importuoti išorinį kalendorių
-ExtSitesEnableThisTool=Rodyti išorinį kalendorių operacijose
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Kalendorių skaičius
 AgendaExtNb=Kalendoriaus nb %s
 ExtSiteUrlAgenda=URL prieiga prie .ical failo
 ExtSiteNoLabel=Aprašymo nėra
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index ad7e2cefc7c..640764f26bd 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -1,413 +1,412 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Invoice
-Bills=Invoices
-BillsCustomers=Customer's invoices
-BillsCustomer=Customer's invoice
-BillsSuppliers=Supplier's invoices
-BillsCustomersUnpaid=Unpaid customer's invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
-BillsLate=Late payments
-BillsStatistics=Customer's invoices statistics
-BillsStatisticsSuppliers=Supplier's invoices statistics
-DisabledBecauseNotErasable=Disabled because can not be erased
-InvoiceStandard=Standard invoice
-InvoiceStandardAsk=Standard invoice
-InvoiceStandardDesc=This kind of invoice is the common invoice.
-InvoiceDeposit=Deposit invoice
-InvoiceDepositAsk=Deposit invoice
-InvoiceDepositDesc=This kind of invoice is done when a deposit has been received.
-InvoiceProForma=Proforma invoice
-InvoiceProFormaAsk=Proforma invoice
-InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
-InvoiceReplacement=Replacement invoice
-InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>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'.
-InvoiceAvoir=Credit note
-InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> 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
-ReplaceInvoice=Replace invoice %s
-ReplacementInvoice=Replacement invoice
-ReplacedByInvoice=Replaced by invoice %s
-ReplacementByInvoice=Replaced by invoice
-CorrectInvoice=Correct invoice %s
-CorrectionInvoice=Correction invoice
-UsedByInvoice=Used to pay invoice %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
-NoReplacableInvoice=No replacable invoices
-NoInvoiceToCorrect=No invoice to correct
-InvoiceHasAvoir=Corrected by one or several invoices
-CardBill=Invoice card
-PredefinedInvoices=Predefined Invoices
-Invoice=Invoice
-Invoices=Invoices
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
-SupplierInvoice=Supplier invoice
-SuppliersInvoices=Suppliers invoices
-SupplierBill=Supplier invoice
-SupplierBills=suppliers invoices
-Payment=Payment
-PaymentBack=Payment back
-Payments=Payments
-PaymentsBack=Payments back
-PaidBack=Paid back
-DatePayment=Payment date
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment ?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>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
-PayedSuppliersPayments=Payments payed to suppliers
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
-PaymentsBackAlreadyDone=Payments back already done
-PaymentRule=Payment rule
-PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
-PaymentAmount=Payment amount
-ValidatePayment=Validate payment
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> 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. <br> Edit your entry, otherwise confirm.
-ClassifyPaid=Classify 'Paid'
-ClassifyPaidPartially=Classify 'Paid partially'
-ClassifyCanceled=Classify 'Abandoned'
-ClassifyClosed=Classify 'Closed'
-CreateBill=Create Invoice
-AddBill=Add 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
-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
-Amount=Amount
-PriceBase=Price base
-BillStatus=Invoice status
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
-BillStatusCanceled=Abandoned
-BillStatusValidated=Validated (needs to be paid)
-BillStatusStarted=Started
-BillStatusNotPaid=Not paid
-BillStatusClosedUnpaid=Closed (unpaid)
-BillStatusClosedPaidPartially=Paid (partially)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
-BillShortStatusConverted=Processed
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusClosedUnpaid=Closed
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
-ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-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
-OtherBills=Other invoices
-DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
-Unpaid=Unpaid
-ConfirmDeleteBill=Are you sure you want to delete this invoice ?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b> ?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status ?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid ?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> 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
-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»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
-ConfirmClassifyAbandonReasonOther=Other
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s ?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %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
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
-AmountOfBills=Amount of invoices
-AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show deposit invoice
-ShowPayment=Show payment
-File=File
-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
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
-NoDraftBills=No draft invoices
-NoOtherDraftBills=No other draft invoices
-NoDraftInvoices=No draft invoices
-RefBill=Invoice ref
-ToBill=To bill
-RemainderToBill=Remainder to bill
-SendBillByMail=Send invoice by email
-SendReminderBillByMail=Send reminder by email
-RelatedCommercialProposals=Related commercial proposals
-MenuToValid=To valid
-DateMaxPayment=Payment due before
-DateEcheance=Due date limit
-DateInvoice=Invoice date
-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
-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
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
-CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
-ExportDataset_invoice_2=Customer invoices and payments
-ProformaBill=Proforma Bill:
-Reduction=Reduction
-ReductionShort=Reduc.
-Reductions=Reductions
-ReductionsShort=Reduc.
-Discount=Discount
-Discounts=Discounts
-AddDiscount=Create discount
-AddRelativeDiscount=Create relative discount
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=Create absolute discount
-EditGlobalDiscounts=Edit absolute discounts
-AddCreditNote=Create credit note
-ShowDiscount=Show discount
-ShowReduc=Show the deduction
-RelativeDiscount=Relative discount
-GlobalDiscount=Global discount
-CreditNote=Credit note
-CreditNotes=Credit notes
-Deposit=Deposit
-Deposits=Deposits
-DiscountFromCreditNote=Discount from credit note %s
-DiscountFromDeposit=Payments from deposit invoice %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
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
-NoteReason=Note/Reason
-ReasonDiscount=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
-BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
-PaymentId=Payment id
-InvoiceId=Invoice id
-InvoiceRef=Invoice ref.
-InvoiceDateCreation=Invoice creation date
-InvoiceStatus=Invoice status
-InvoiceNote=Invoice note
-InvoicePaid=Invoice paid
-PaymentNumber=Payment number
-RemoveDiscount=Remove discount
-WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
-InvoiceNotChecked=No invoice selected
-CloneInvoice=Clone invoice
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b> ?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
-SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts ?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
-RelatedBill=Related invoice
-RelatedBills=Related invoices
+Bill=Sąskaita-faktūra
+Bills=Sąskaitos-faktūros
+BillsCustomers=Kliento sąskaitos-faktūros
+BillsCustomer=Kliento sąskaita-faktūra
+BillsSuppliers=Tiekėjo sąskaitos-faktūros
+BillsCustomersUnpaid=Neapmokėtos kliento sąskaitos-faktūros
+BillsCustomersUnpaidForCompany=Neapmokėtos kliento sąskaitos-faktūros %s
+BillsSuppliersUnpaid=Neapmokėtos tiekėjo sąskaitos-faktūros
+BillsSuppliersUnpaidForCompany=Neapmokėtos tiekėjo sąskaitos-faktūros %s
+BillsLate=Pavėluoti mokėjimai
+BillsStatistics=Kliento sąskaitų-faktūrų statistika
+BillsStatisticsSuppliers=Tiekėjo sąskaitų-faktūrų statistika
+DisabledBecauseNotErasable=Išjungta, nes negalima ištrinti
+InvoiceStandard=Standartinė sąskaita-faktūra
+InvoiceStandardAsk=Standartinė sąskaita-faktūra
+InvoiceStandardDesc=Šio tipo sąskaita-faktūra yra bendra sąskaita-faktūra.
+InvoiceDeposit=Depozito sąskaita-faktūra
+InvoiceDepositAsk=Depozito sąskaita-faktūra
+InvoiceDepositDesc=Ši sąskaita-faktūra įvykdyta, kada depozitas gautas.
+InvoiceProForma=Išankstinė (proforma) sąskaita-faktūra
+InvoiceProFormaAsk=išankstinė (proforma) sąskaita-faktūra
+InvoiceProFormaDesc=<b>Išankstinė sąskaita-faktūra</b> yra tikros sąskaitos forma, bet neatvaizduojama realioje apskaitoje.
+InvoiceReplacement=Sąskaitos-faktūros pakeitimas
+InvoiceReplacementAsk=Sąskaitos-faktūros pakeitimas sąskaita-faktūra
+InvoiceReplacementDesc=<b>Sąskaitos-faktūros pakeitimas</b> naudojamas atšaukti ir visiškai pakeisti gautą ir neapmokėtą sąskaitą-faktūrą.<br><br> Pastaba: Tik neapmokėtos sąskaitos-faktūros gali būti pakeičiamos. Jei sąskaita-faktūra, kurią keičiate, dar nėra uždaryta, ji bus automatiškai uždaryta ir pažymėta kaip  "neįvykusi".
+InvoiceAvoir=Kreditinė sąskaita (kredito aviza)
+InvoiceAvoirAsk=Kreditinė sąskaita tikslinanti sąskaitą-faktūrą
+InvoiceAvoirDesc=<b>Kreditinė sąskaita</b> 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=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
+ReplacementByInvoice=Pakeistas sąskaita
+CorrectInvoice=Koreguoti sąskaitą-faktūrą %s
+CorrectionInvoice=Sąskaitos korekcija
+UsedByInvoice=Panaudota sąskaitos-faktūros apmokėjimui %s
+ConsumedBy=Suvartota
+NotConsumed=Nesuvartota
+NoReplacableInvoice=Nėra keičiamų sąskaitų-faktūrų
+NoInvoiceToCorrect=Nėra koreguojamų sąskaitų-faktūrų
+InvoiceHasAvoir=Koreguota pagal vieną ar kelias sąskaitas-faktūras
+CardBill=Sąskaitos-faktūros kortelė
+PredefinedInvoices=Iš anksto apibrėžtos sąskaitos-faktūros
+Invoice=Sąskaita-faktūra
+Invoices=Sąskaitos-faktūros
+InvoiceLine=Sąskaitos-faktūros linija
+InvoiceCustomer=Kliento sąskaita-faktūra
+CustomerInvoice=Kliento sąskaita-faktūra
+CustomersInvoices=Klientų sąskaitos-faktūros
+SupplierInvoice=Tiekėjo sąskaita-faktūra
+SuppliersInvoices=Tiekėjų sąskaitos-faktūros
+SupplierBill=Tiekėjo sąskaita-faktūra
+SupplierBills=tiekėjų sąskaitos-faktūros
+Payment=Mokėjimas
+PaymentBack=Mokėjimas atgal (grąžinimas)
+Payments=Mokėjimai
+PaymentsBack=Mokėjimai atgal (grąžinimai)
+PaidBack=Sumokėta atgal (grąžinta)
+DatePayment=Mokėjimo data
+DeletePayment=Ištrinti mokėjimą
+ConfirmDeletePayment=Ar tikrai norite ištrinti šį mokėjimą ?
+ConfirmConvertToReduc=Ar norite konvertuoti šią kreditinę sąskaitą ar depozitą į gryną (absoliutinę) nuolaidą ? <br>Suma bus išsaugota tarp visų nuolaidų ir galės būti naudojama kaip nuolaida esamoms ar ateities sąskaitoms-faktūroms šiam klientui.
+SupplierPayments=Tiekėjų mokėjimai
+ReceivedPayments=Gauti mokėjimai
+ReceivedCustomersPayments=Iš klientų gauti mokėjimai
+PayedSuppliersPayments=Mokėjimai sumokėti tiekėjams
+ReceivedCustomersPaymentsToValid=Gauti klientų mokėjimai tikrinimui ir pripažinimui galiojančiais
+PaymentsReportsForYear=Mokėjimų ataskaitos %s
+PaymentsReports=Mokėjimų ataskaitos
+PaymentsAlreadyDone=Jau atlikti mokėjimai
+PaymentsBackAlreadyDone=Jau atlikti mokėjimai atgal (grąžinimai)
+PaymentRule=Mokėjimo taisyklė
+PaymentMode=Mokėjimo būdas
+PaymentConditions=Mokėjimo terminas
+PaymentConditionsShort=Mokėjimo terminas
+PaymentAmount=Mokėjimo suma
+ValidatePayment=Mokėjimą pripažinti galiojančiu
+PaymentHigherThanReminderToPay=Mokėjimas svarbesnis už priminimą sumokėti
+HelpPaymentHigherThanReminderToPay=Dėmesio, vienos ar kelių sąskaitų mokėjimo suma yra didesnė nei reikalingas sumokėti likutis.<br> Redaguokite įvedimą, arba patvirtinkite ir galvokite apie kreditinės sąskaitos kūrimą gautam perviršiui nuo kiekvienos permokėtos sąskaitos.
+HelpPaymentHigherThanReminderToPaySupplier=Dėmesio, vienos ar kelių sąskaitų mokėjimo suma yra didesnė nei mokėjimo likutis. <br> Redaguoti įrašą, arba kitu atveju patvirtinti.
+ClassifyPaid=Priskirti 'Apmokėtos'
+ClassifyPaidPartially=Priskirti 'Dalinai apmokėtos'
+ClassifyCanceled=Priskirti 'Neįvykusios'
+ClassifyClosed=Priskirti 'Uždarytos'
+ClassifyUnBilled=Classify 'Unbilled'
+CreateBill=Sukurti sąskaitą-faktūrą
+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
+SearchASupplierInvoice=Ieškoti tiekėjo sąskaitos-faktūros
+CancelBill=Atšaukti sąskaitą-faktūrą
+SendRemindByMail=Siųsti priminimą e-paštu
+DoPayment=Atlikti mokėjimą
+DoPaymentBack=Atlikti sumokėtos sumos grąžinimą
+ConvertToReduc=Konvertuoti į ateities nuolaidą
+EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą
+EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+Amount=Suma
+PriceBase=Kainos bazė
+BillStatus=Sąskaitos-faktūros būklė
+BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
+BillStatusPaid=Apmokėtas
+BillStatusPaidBackOrConverted=Apmokėtas arba konvertuotas į nuolaidą
+BillStatusConverted=Apmokėtas (paruoštas galutinei sąskaitai-faktūrai)
+BillStatusCanceled=Neįvykęs
+BillStatusValidated=Pripažintas galiojančiu (turi būti apmokėtas)
+BillStatusStarted=Pradėtas
+BillStatusNotPaid=Neapmokėta
+BillStatusClosedUnpaid=Uždaryta (neapmokėta)
+BillStatusClosedPaidPartially=Dalinai apmokėta
+BillShortStatusDraft=Projektas
+BillShortStatusPaid=Apmokėta
+BillShortStatusPaidBackOrConverted=Apdorota
+BillShortStatusConverted=Apdorota
+BillShortStatusCanceled=Neįvykusi
+BillShortStatusValidated=Pripažinta galiojančia
+BillShortStatusStarted=Pradėta
+BillShortStatusNotPaid=Neapmokėta
+BillShortStatusClosedUnpaid=Uždaryta
+BillShortStatusClosedPaidPartially=Dalinai apmokėta
+PaymentStatusToValidShort=Pripažinti galiojančia
+ErrorVATIntraNotConfigured=Vidinis PVM numeris nėra apibrėžtas
+ErrorNoPaiementModeConfigured=Mokėjimo būdas pagal nutylėjimą nėra apibrėžtas. Eiti į Sąskaitų-faktūrų modulio nustatymus išspręsti šią problemą.
+ErrorCreateBankAccount=Sukurti banko sąskaitą, tada eiti į Nustatymų meniu Sąskaitų-faktūrų modulį ir apibrėžti mokėjimo būdus
+ErrorBillNotFound=Sąskaita-faktūra %s neegzistuoja
+ErrorInvoiceAlreadyReplaced=Klaida, Jūs bandote pripažinti galiojančia sąskaitą-faktūrą ir ja pakeisti sąskaitą-faktūrą %s. Bet ši jau anksčiau buvo pakeista sąskaita-faktūra: %s.
+ErrorDiscountAlreadyUsed=Klaida, nuolaida jau panaudota
+ErrorInvoiceAvoirMustBeNegative=Klaida, teisinga sąskaita-faktūra turi turėti neigiamą sumą
+ErrorInvoiceOfThisTypeMustBePositive=Klaida, šis sąskaitos-faktūros tipas turi turėti teigiamą sumą
+ErrorCantCancelIfReplacementInvoiceNotValidated=Klaida negalima atšaukti sąskaitos-faktūros, kuri buvo pakeista kita sąskaita-faktūra, kuri vis dar yra projektinėje būklėje
+BillFrom=Iš
+BillTo=Į
+ActionsOnBill=Veiksmai sąskaitoje-faktūroje
+NewBill=Nauja sąskaita-faktūra
+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
+AllBills=Visos sąskaitos-faktūros
+OtherBills=Kitos sąskaitos-faktūros
+DraftBills=Sąskaitų-faktūrų projektai
+CustomersDraftInvoices=Klientų sąskaitų-faktūrų projektai
+SuppliersDraftInvoices=Tiekėjų sąskaitų-faktūrų projektai
+Unpaid=Neapmokėta
+ConfirmDeleteBill=Ar tikrai norite ištrinti šią sąskaitą-faktūrą ?
+ConfirmValidateBill=Ar tikrai norite pripažinti galiojančia šią sąskaitą-faktūrą su nuoroda<b>%s</b> ?
+ConfirmUnvalidateBill=Ar tikrai norite pakeisti sąskaitos-faktūros <b>%s</b> būklę į "Projektas" ?
+ConfirmClassifyPaidBill=Ar tikrai norite pakeisti sąskaitos-faktūros <b>%s</b> būklę į "Apmokėta" ?
+ConfirmCancelBill=Ar tikrai norite atšaukti sąskaitą-faktūrą <b>%s</b> ?
+ConfirmCancelBillQuestion=Kodėl norite priskirti šią sąskaitą-faktūrą prie "Neįvykusi" ?
+ConfirmClassifyPaidPartially=Ar tikrai norite pakeisti sąskaitos-faktūros <b>%s</b> 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=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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ų
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Šis pasirinkimas yra įmanomas, jei jūsų sąskaita-faktūra buvo pateikta su tinkama pastaba. (Pvz.:"Tik mokesčiai, susiję su kaina, kuri buvo faktiškai sumokėta, suteikia teises į išskaitą")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Kai kuriose šalyse, šis pasirinkimas galimas tik tada, jei jūsų sąskaita-faktūra turi tinkamą pastabą.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Naudokite šį pasirinkimą, jei visi kiti netinka
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Blogas klientas</b> yra klientas, kad atsisako apmokėti savo skolą.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Šis pasirinkimas yra naudojamas, kai mokėjimas neatliktas, nes kai kurie produktai buvo grąžinti
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Naudokite šį pasirinkimą, jei visi kiti netinka, pvz., šiais atvejais: <br>- Apmokėjimas neatliktas, nes kai kurie produktai buvo išsiųsti atgal<br>- Reikalaujama suma pernelyg svarbi, nes nuolaida buvo pamiršta <br>Visais atvejais per didelė reikalaujama suma turi būti ištaisyta apskaitos sistemoje sukuriant kreditinę sąskaitą.
+ConfirmClassifyAbandonReasonOther=Kita
+ConfirmClassifyAbandonReasonOtherDesc=Šis pasirinkimas bus naudojamas visais kitais atvejais. Pvz, kai jūs ketinate sukurti pakeičiančią sąskaitą-faktūrą.
+ConfirmCustomerPayment=Ar galite patvirtinti šio mokėjimo įvedimą <b>%s</b> %s ?
+ConfirmSupplierPayment=Ar galite patvirtinti šį mokėjimo įrašą <b>%s</b> %s ?
+ConfirmValidatePayment=Ar tikrai norite pripažinti galiojančiu šį mokėjimą ? Po mokėjimo pripažinimo galiojančiu vėliau bus negalimi jokie pakeitimai.
+ValidateBill=Sąskaitą-faktūrą pripažinti galiojančia
+UnvalidateBill=Sąskaitą-faktūra pripažinti negaliojančia
+NumberOfBills=Sąskaitų-faktūrų skaičius
+NumberOfBillsByMonth=Sąskaitų-faktūrų skaičius pagal mėnesius
+AmountOfBills=Sąskaitų-faktūrų suma
+AmountOfBillsByMonthHT=Sąskaitų-faktūrų suma pagal mėnesius (atskaičius mokesčius)
+ShowSocialContribution=Rodyti socialines įmokas
+ShowBill=Rodyti sąskaitą-faktūrą
+ShowInvoice=Rodyti sąskaitą-faktūrą
+ShowInvoiceReplace=Rodyti pakeičiančią sąskaitą-faktūrą
+ShowInvoiceAvoir=Rodyti kreditinę sąskaitą
+ShowInvoiceDeposit=Rodyti depozito sąskaitą-faktūrą
+ShowPayment=Rodyti mokėjimą
+File=Failas
+AlreadyPaid=Jau apmokėta
+AlreadyPaidBack=Mokėjimas jau grąžintas
+AlreadyPaidNoCreditNotesNoDeposits=Jau apmokėta (be kreditinių sąskaitų ir depozitų)
+Abandoned=Neįvykusi
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
+Rest=Laukiantis
+AmountExpected=Reikalaujama suma
+ExcessReceived=Gautas perviršis
+EscompteOffered=Siūloma nuolaida (mokėjimas prieš terminą)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
+StandingOrders=Pastovūs užsakymai
+StandingOrder=Pastovus užsakymas
+NoDraftBills=Nėra sąskaitų-faktūrų projektų
+NoOtherDraftBills=Nėra kitų sąskaitų-faktūrų projektų
+NoDraftInvoices=Nėra sąskaitų-faktūrų projektų
+RefBill=Sąskaitos-faktūros nuoroda
+ToBill=Pateikti sąskaitą
+RemainderToBill=Pateikti sąskatą likučiui
+SendBillByMail=Siųsti sąskaitą-faktūrą e-paštu
+SendReminderBillByMail=Siųsti priminimą e-paštu
+RelatedCommercialProposals=Susiję komerciniai pasiūlymai
+MenuToValid=Įteisinti
+DateMaxPayment=Mokėjimas apmokėtinas prieš
+DateEcheance=Numatytas datos apribojimas
+DateInvoice=Sąskaitos-faktūros data
+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=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=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
+ExportDataset_invoice_2=Kliento sąskaitos-faktūros ir mokėjimai
+ProformaBill=Išankstinė sąskaita:
+Reduction=Sumažinimas
+ReductionShort=Mažinimo.
+Reductions=Sumažinimai
+ReductionsShort=Mažinimo.
+Discount=Nuolaida
+Discounts=Nuolaidos
+AddDiscount=Sukurti nuolaidą
+AddRelativeDiscount=Sukurti susijusią nuolaidą
+EditRelativeDiscount=Redaguoti susijusią nuolaidą
+AddGlobalDiscount=Sukurti absoliutinę nuolaidą
+EditGlobalDiscounts=Redaguoti absoliutines nuolaidos
+AddCreditNote=Sukurti kreditinę sąskaitą
+ShowDiscount=Rodyti nuolaidą
+ShowReduc=Rodyti atskaitymą
+RelativeDiscount=Susijusi nuolaida
+GlobalDiscount=Visuotinė nuolaida
+CreditNote=Kreditinė sąskaita
+CreditNotes=Kreditinės sąskaitos
+Deposit=Depozitas
+Deposits=Depozitai
+DiscountFromCreditNote=Nuolaida kreditinei sąskaitai %s
+DiscountFromDeposit=Mokėjimai iš depozito sąskaitos-faktūros %s
+AbsoluteDiscountUse=Ši kredito rūšis gali būti naudojama sąskaitai-faktūrai prieš ją pripažįstant galiojančia
+CreditNoteDepositUse=Sąskaita-faktūra turi būti pripažinta galiojančia, norint naudoti šią kredito rūšį
+NewGlobalDiscount=Nauja absoliutinė nuolaida
+NewRelativeDiscount=Naujas susijusi nuolaida
+NoteReason=Pastaba / Priežastis
+ReasonDiscount=Priežastis
+DiscountOfferedBy=Suteiktos
+DiscountStillRemaining=Nuolaidos dar išlikusios
+DiscountAlreadyCounted=Nuolaidos jau suskaičiuotos
+BillAddress=Sąskaitos adresas
+HelpEscompte=Ši nuolaida yra nuolaida suteikiama klientui, nes jo mokėjimas buvo atliktas prieš terminą.
+HelpAbandonBadCustomer=Šios sumos buvo atsisakyta (blogas klientas) ir ji yra laikoma išimtiniu nuostoliu.
+HelpAbandonOther=Šios sumos buvo atsisakyta, nes tai buvo klaida (pvz.: neteisingas klientas arba sąskaita-faktūra buvo pakeista kita)
+IdSocialContribution=Socialinių įmokų ID
+PaymentId=Mokėjimo ID
+InvoiceId=Sąskaitos-faktūros ID
+InvoiceRef=Sąskaitos-faktūros nuoroda
+InvoiceDateCreation=Sąskaitos-faktūros sukūrimo datą
+InvoiceStatus=Sąskaitos-faktūros būklė
+InvoiceNote=Sąskaitos-faktūros pastaba
+InvoicePaid=Sąskaita-faktūra apmokėta
+PaymentNumber=Mokėjimo numeris
+RemoveDiscount=Pašalinti nuolaidą
+WatermarkOnDraftBill=Vandens ženklas ant sąskaitos-faktūros projekto (nėra, jei lapas tuščias)
+InvoiceNotChecked=Nėra pasirinktų sąskaitų-faktūrų
+CloneInvoice=Klonuoti sąskaitą-faktūrą
+ConfirmCloneInvoice=Ar tikrai norite klonuoti šią sąskaitą-faktūrą <b>%s</b> ?
+DisabledBecauseReplacedInvoice=Veiksmas išjungtas, nes sąskaita-faktūra buvo pakeista
+DescTaxAndDividendsArea=Ši sritis parodo visų specialioms išlaidoms atliktų mokėjimų sumą. Čia įtraukiami tik fiksuotų vienerių metų įrašai.
+NbOfPayments=Mokėjimų numeriai
+SplitDiscount=Padalinti nuolaidą į dvi dalis
+ConfirmSplitDiscount=Ar tikrai norite padalintišią nuolaidą <b>%s</b> %s į 2 mažesnes nuolaidas ?
+TypeAmountOfEachNewDiscount=Įveskite sumą kiekvienai iš dviejų dalių:
+TotalOfTwoDiscountMustEqualsOriginal=Dviejų naujų nuolaidų suma turi būti lygi pradinei nuolaidai.
+ConfirmRemoveDiscount=Ar tikrai norite pašalinti šią nuolaidą ?
+RelatedBill=Susijusi sąskaita-faktūra
+RelatedBills=Susiję sąskaitos-faktūros
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
-PaymentConditionShort30D=30 days
-PaymentCondition30D=30 days
-PaymentConditionShort30DENDMONTH=30 days end of month
-PaymentCondition30DENDMONTH=30 days end of month
-PaymentConditionShort60D=60 days
-PaymentCondition60D=60 days
-PaymentConditionShort60DENDMONTH=60 days end of month
-PaymentCondition60DENDMONTH=60 days end of month
-PaymentConditionShortPT_DELIVERY=Delivery
-PaymentConditionPT_DELIVERY=On delivery
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortRECEP=Nedelsiamas
+PaymentConditionRECEP=Nedelsiamas
+PaymentConditionShort30D=30 dienų
+PaymentCondition30D=30 dienų
+PaymentConditionShort30DENDMONTH=30 dienų mėnuo
+PaymentCondition30DENDMONTH=30 dienų mėnuo
+PaymentConditionShort60D=60 dienų
+PaymentCondition60D=60 dienų
+PaymentConditionShort60DENDMONTH=60 dienų mėneio pabaiga
+PaymentCondition60DENDMONTH=60 dienų mėnesio pabaiga
+PaymentConditionShortPT_DELIVERY=Pristatymas
+PaymentConditionPT_DELIVERY=Pristatymo metu
+PaymentConditionShortPT_ORDER=Užsakymo metu
+PaymentConditionPT_ORDER=Užsakymo metu
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
-
+PaymentConditionPT_5050=50%% iš anksto, 50%% pristatymo metu
+FixAmount=Nustatyti dydį
+VarAmount=Kintamas dydis (%% tot.)
 # PaymentType
-PaymentTypeVIR=Bank deposit
-PaymentTypeShortVIR=Bank deposit
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Check
-PaymentTypeShortCHQ=Check
+PaymentTypeVIR=Banko depozitas
+PaymentTypeShortVIR=Banko depozitas
+PaymentTypePRE=Banko nurodymas
+PaymentTypeShortPRE=Banko pavedimas
+PaymentTypeLIQ=Grynieji pinigai
+PaymentTypeShortLIQ=Grynieji pinigai
+PaymentTypeCB=Kreditinė kortelė
+PaymentTypeShortCB=Kreditinė kortelė
+PaymentTypeCHQ=Čekis
+PaymentTypeShortCHQ=Čekis
 PaymentTypeTIP=TIP
 PaymentTypeShortTIP=TIP
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
-PaymentTypeTRA=Bill payment
-PaymentTypeShortTRA=Bill
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Desk code
-BankAccountNumber=Account number
-BankAccountNumberKey=Key
-Residence=Domiciliation
-IBANNumber=IBAN number
+PaymentTypeVAD=Tiesioginis mokėjimas (online)
+PaymentTypeShortVAD=Tiesioginis mokėjimas (online)
+PaymentTypeTRA=Sąskaitos apmokėjimas
+PaymentTypeShortTRA=Sąskaita
+BankDetails=Banko duomenys
+BankCode=Banko kodas
+DeskCode=Skyriaus kodas
+BankAccountNumber=Sąskaitos numeris
+BankAccountNumberKey=Raktas
+Residence=Gyvenamoji vieta
+IBANNumber=IBAN numeris
 IBAN=IBAN
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT number
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeMaker=Check transmitter
-ChequeBank=Bank of Check
-NetToBePaid=Net to be paid
+BICNumber=BIC/SWIFT numeris
+ExtraInfos=Papildoma informacija
+RegulatedOn=Reguliuojama
+ChequeNumber=Čekio N°
+ChequeOrTransferNumber=Čekio/Pervedimo N°
+ChequeMaker=Čekio siuntėjas
+ChequeBank=Čekio bankas
+NetToBePaid=Grynasis mokėjimas
 PhoneNumber=Tel
-FullPhoneNumber=Telephone
-TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-IntracommunityVATNumber=Intracommunity number of VAT
-PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to
-PaymentByChequeOrderedToShort=Check payment (including tax) are payable to
-SendTo=sent to
-PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
-LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
-LawApplicationPart4=their price.
-LimitedLiabilityCompanyCapital=SARL with Capital of
-UseLine=Apply
-UseDiscount=Use discount
-UseCredit=Use credit
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Checks deposits
-MenuCheques=Checks
-MenuChequesReceipts=Checks receipts
-NewChequeDeposit=New deposit
-ChequesReceipts=Checks receipts
-ChequesArea=Checks deposits area
-ChequeDeposits=Checks deposits
-Cheques=Checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
-ShowUnpaidAll=Show all unpaid invoices
-ShowUnpaidLateOnly=Show late unpaid invoices only
-PaymentInvoiceRef=Payment invoice %s
-ValidateInvoice=Validate invoice
-Cash=Cash
-Reported=Delayed
-DisabledBecausePayments=Not possible since there are some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
-ExpectedToPay=Expected payment
-PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard or replacement invoices entirely paid.
-ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-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
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
-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
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes 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
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+FullPhoneNumber=Telefonas
+TeleFax=Faksas
+PrettyLittleSentence=Priimti mokėtiną sumą čekiais išleistais mano vardu kaip Apskaitos Asociacijos, patvirtintos Fiskalinės Administracijos, nariui.
+IntracommunityVATNumber=Bendrijos vidinis PVM numeris
+PaymentByChequeOrderedTo=Čekį (įskaitant mokesčius), mokamą į %s siųsti
+PaymentByChequeOrderedToShort=Čekis (įskaitant mokesčius) yra mokamas
+SendTo=išsiųstas
+PaymentByTransferOnThisBankAccount=Apmokėjimas pavedimu į šią banko sąskaitą
+VATIsNotUsedForInvoice=* Netaikoma PVM art-293B iš CGI
+LawApplicationPart1=Taikant įstatymus 80,335 iš 12/05/80
+LawApplicationPart2=Prekės lieka nuosavybe
+LawApplicationPart3=Pardavėjas, iki pilno išgryninimo iš
+LawApplicationPart4=jų kaina.
+LimitedLiabilityCompanyCapital=SARL su Kapitalu
+UseLine=Taikyti
+UseDiscount=Taikyti nuolaidą
+UseCredit=Taikyti kreditą
+UseCreditNoteInInvoicePayment=Sumažinti mokėjimo sumą su šiuo kreditu
+MenuChequeDeposits=Čekių depozitai
+MenuCheques=Čekiai
+MenuChequesReceipts=Čekių įplaukos
+NewChequeDeposit=Naujas depozitas
+ChequesReceipts=Čekių įplaukos
+ChequesArea=Čekių depozitų sritis
+ChequeDeposits=Čekių depozitai
+Cheques=Čekiai
+CreditNoteConvertedIntoDiscount=Ši kreditinė sąskaita ar depozito sąskaita-faktūra buvo konvertuota į %s
+UsBillingContactAsIncoiveRecipientIfExist=Naudoti kliento kontaktinį adresą, o ne trečiosios šalies, kaip sąskaitų-faktūrų gavėjo, adresą
+ShowUnpaidAll=Rodyti visas neapmokėtas sąskaitas-faktūras
+ShowUnpaidLateOnly=Rodyti tik vėluojančias neapmokėtas sąskaitas
+PaymentInvoiceRef=Mokėjimo sąskaita-faktūra %s
+ValidateInvoice=Sąskaitą-faktūrą pripažinti galiojančia
+Cash=Grynieji pinigai
+Reported=Uždelstas
+DisabledBecausePayments=Neįmanoma nuo tada, kai atsirado kai kurie mokėjimai
+CantRemovePaymentWithOneInvoicePaid=Negalima pašalinti mokėjimo, nuo tada kai čia yra bent viena sąskaita-faktūra priskirta apmokėtoms
+ExpectedToPay=Laukiamas mokėjimas
+PayedByThisPayment=Sumokėta šiuo mokėjimu
+ClosePaidInvoicesAutomatically=Priskirti "Apmokėta" visas standartines arba pakeistas visiškai apmokėtas sąskaitas-faktūras.
+ClosePaidCreditNotesAutomatically=Priskirtii "Apmokėta" visas pilnai grąžintas kreditines sąskaitas.
+AllCompletelyPayedInvoiceWillBeClosed=Visos sąskaitos-faktūros, neturinčios neapmokėto likučio bus automatiškai uždarytos ir perkeltos į "Apmokėta".
+ToMakePayment=Mokėti
+ToMakePaymentBack=Grąžinti
+ListOfYourUnpaidInvoices=Sąrašas neapmokėtų sąskaitų-faktūrų
+NoteListOfYourUnpaidInvoices=Pastaba: Šis sąrašas rodo tik sąskaitas trečiosioms šalims, su kuriom Jūs susijęs kaip prekybos atstovas.
+RevenueStamp=Įplaukų rūšis
+YouMustCreateInvoiceFromThird=Ši opcija galima tik tada, kai kuriama sąskaita-faktūra iš trečiosios šalies kortelės "Klientas"
+PDFCrabeDescription=Sąskaitos-faktūros PDF šablonas Crabe. Pilnas sąskaitos-faktūros šablonas (rekomenduojamas Šablonas)
+TerreNumRefModelDesc1=Grąžinimo numeris formatu %syymm-nnnn standartinėms sąskaitoms-faktūroms ir %syymm-nnnn kreditinėms sąskaitoms, kur yy yra metai, mm mėnuo ir nnnn yra seka be pertrūkių ir be grįžimo į 0
+MarsNumRefModelDesc1=Grąžinimo numeris formatu %syymm-nnnn standartinėms sąskaitoms-faktūroms, %syymm-nnnn sąskaitų-faktūrų pakeitimui, % syymm-nnnn kreditinėms sąskaitoms ir %syymm-nnnn kreditinėms sąskaitoms, kur yy yra metai, mm mėnuo ir nnn seka be pertrūkių ir be grįžimo į 0
+TerreNumRefModelError=Sąskaita, prasidedanti $syymm, jau egzistuoja ir yra nesuderinama su šiuo sekos modeliu. Pašalinkite ją arba pakeiskite jį, kad aktyvuoti šį modulį.
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
-TypeContact_facture_external_SHIPPING=Customer shipping contact
-TypeContact_facture_external_SERVICE=Customer service contact
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice
-TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
+TypeContact_facture_internal_SALESREPFOLL=Atstovas šiai kliento sąskaitai-faktūrai
+TypeContact_facture_external_BILLING=Kliento sąskaitos-faktūros kontaktas
+TypeContact_facture_external_SHIPPING=Kliento pristatymo kontaktas
+TypeContact_facture_external_SERVICE=Kliento paslaugos kontaktai
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Atstovas šiai tiekėjo sąskaitai-faktūrai
+TypeContact_invoice_supplier_external_BILLING=Tiekėjo sąskaitos-faktūros kontaktai
+TypeContact_invoice_supplier_external_SHIPPING=Tiekėjo pristatymo kontaktai
+TypeContact_invoice_supplier_external_SERVICE=Tiekėjo paslaugos kontaktai
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index b28086fa933..ffa404fbb6d 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-# Category=Category
-# Categories=Categories
-# Rubrique=Category
-# Rubriques=Categories
-# categories=categories
-# TheCategorie=The category
-# NoCategoryYet=No category of this type created
-# In=In
-# AddIn=Add in
-# modify=modify
-# Classify=Classify
-# CategoriesArea=Categories area
-# ProductsCategoriesArea=Products/Services categories area
-# SuppliersCategoriesArea=Suppliers categories area
-# CustomersCategoriesArea=Customers categories area
-# ThirdPartyCategoriesArea=Third parties categories area
-# MembersCategoriesArea=Members categories area
-# ContactsCategoriesArea=Contacts categories area
-# MainCats=Main categories
-# SubCats=Subcategories
-# CatStatistics=Statistics
-# CatList=List of categories
-# AllCats=All categories
-# ViewCat=View category
-# NewCat=Add category
-# NewCategory=New category
-# ModifCat=Modify category
-# CatCreated=Category created
-# CreateCat=Create category
-# CreateThisCat=Create this category
-# ValidateFields=Validate the fields
-# NoSubCat=No subcategory.
-# SubCatOf=Subcategory
-# FoundCats=Found categories
-# FoundCatsForName=Categories found for the name :
-# FoundSubCatsIn=Subcategories found in the category
-# ErrSameCatSelected=You selected the same category several times
-# ErrForgotCat=You forgot to choose the category
-# ErrForgotField=You forgot to inform the fields
-# ErrCatAlreadyExists=This name is already used
-# AddProductToCat=Add this product to a category?
-# ImpossibleAddCat=Impossible to add the category
-# ImpossibleAssociateCategory=Impossible to associate the category to
-# WasAddedSuccessfully=<b>%s</b> was added successfully.
-# ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-# CategorySuccessfullyCreated=This category %s has been added with success.
-# ProductIsInCategories=Product/service owns to following categories
-# SupplierIsInCategories=Third party owns to following suppliers categories
-# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-# MemberIsInCategories=This member owns to following members categories
-# ContactIsInCategories=This contact owns to following contacts categories
-# ProductHasNoCategory=This product/service is not in any categories
-# SupplierHasNoCategory=This supplier is not in any categories
-# CompanyHasNoCategory=This company is not in any categories
-# MemberHasNoCategory=This member is not in any categories
-# ContactHasNoCategory=This contact is not in any categories
-# ClassifyInCategory=Classify in category
-# NoneCategory=None
-# NotCategorized=Without category
-# CategoryExistsAtSameLevel=This category already exists with this ref
-# ReturnInProduct=Back to product/service card
-# ReturnInSupplier=Back to supplier card
-# ReturnInCompany=Back to customer/prospect card
-# ContentsVisibleByAll=The contents will be visible by all
-# ContentsVisibleByAllShort=Contents visible by all
-# ContentsNotVisibleByAllShort=Contents not visible by all
-# CategoriesTree=Categories tree
-# DeleteCategory=Delete category
-# ConfirmDeleteCategory=Are you sure you want to delete this category ?
-# RemoveFromCategory=Remove link with categorie
-# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-# NoCategoriesDefined=No category defined
-# SuppliersCategoryShort=Suppliers category
-# CustomersCategoryShort=Customers category
-# ProductsCategoryShort=Products category
-# MembersCategoryShort=Members category
-# SuppliersCategoriesShort=Suppliers categories
-# CustomersCategoriesShort=Customers categories
-# CustomersProspectsCategoriesShort=Custo./Prosp. categories
-# ProductsCategoriesShort=Products categories
-# MembersCategoriesShort=Members categories
-# ContactCategoriesShort=Contacts categories
-# ThisCategoryHasNoProduct=This category does not contain any product.
-# ThisCategoryHasNoSupplier=This category does not contain any supplier.
-# ThisCategoryHasNoCustomer=This category does not contain any customer.
-# ThisCategoryHasNoMember=This category does not contain any member.
-# ThisCategoryHasNoContact=This category does not contain any contact.
-# AssignedToCustomer=Assigned to a customer
-# AssignedToTheCustomer=Assigned to the customer
-# InternalCategory=Internal category
-# CategoryContents=Category contents
-# CategId=Category id
-# CatSupList=List of supplier categories
-# CatCusList=List of customer/prospect categories
-# CatProdList=List of products categories
-# CatMemberList=List of members categories
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+Category=Kategorija
+Categories=Kategorijos
+Rubrique=Kategorija
+Rubriques=Kategorijos
+categories=kategorijos
+TheCategorie=Kategorija
+NoCategoryYet=Tokiam tipui nėra sukurtų kategorijų
+In=Į
+AddIn=Įtraukti
+modify=Pakeisti
+Classify=Priskirti
+CategoriesArea=Kategorijų sritis
+ProductsCategoriesArea=Produktų/Paslaugų kategorijų sritis
+SuppliersCategoriesArea=Tiekėjų kategorijų sritis
+CustomersCategoriesArea=Klientų kategorijų sritis
+ThirdPartyCategoriesArea=Trečiųjų šalių kategorijų sritis
+MembersCategoriesArea=Narių kategorijų sritis
+ContactsCategoriesArea=Adresatų kategorijų sritis
+MainCats=Pagrindinės kategorijos
+SubCats=Subkategorijos
+CatStatistics=Statistika
+CatList=Kategorijų sąrašas
+AllCats=Visos kategorijos
+ViewCat=Žiūrėti kategoriją
+NewCat=Įtraukti kategoriją
+NewCategory=Nauja kategorija
+ModifCat=Keisti kategoriją
+CatCreated=Kategorija sukurta
+CreateCat=Sukurti kategoriją
+CreateThisCat=Sukurti šią kategoriją
+ValidateFields=Patvirtinti laukus
+NoSubCat=Nėra subkategorijos
+SubCatOf=Subkategorija
+FoundCats=Rastos kategorijos
+FoundCatsForName=Rasta kategorijos pavadinimui:
+FoundSubCatsIn=Kategorijoje rastos Subkategorijos
+ErrSameCatSelected=Pasirinkote tą pačią kategoriją keletą kartų
+ErrForgotCat=Pamiršote pasirinkti kategoriją
+ErrForgotField=Pamiršote informuoti laukus
+ErrCatAlreadyExists=Šis pavadinimas jau naudojamas
+AddProductToCat=Pridėti šį produktą į kategoriją ?
+ImpossibleAddCat=Neįmanoma pridėti kategoriją
+ImpossibleAssociateCategory=Neįmanoma susieti kategoriją
+WasAddedSuccessfully=<b>%s</b> buvo sėkmingai įrašytas.
+ObjectAlreadyLinkedToCategory=Elementas jau yra susietas su šia kategorija
+CategorySuccessfullyCreated=Ši kategorija %s buvo pridėta sėkmingai
+ProductIsInCategories=Produktas/paslauga turi šias kategorijas
+SupplierIsInCategories=Trečioji šalis turi sekančias tiekėjų kategorijas
+CompanyIsInCustomersCategories=Ši trečioji šalis turi sekančias klientų/planų kategorijas
+CompanyIsInSuppliersCategories=Ši trečioji šalis turi sekančias tiekėjų kategorijas
+MemberIsInCategories=Šis narys priklauso sekančioms narių kategorijoms
+ContactIsInCategories=Šis adresatas priklauso sekančioms adresatų kategorijoms
+ProductHasNoCategory=Šis produktas/paslauga neturi jokių kategorijų
+SupplierHasNoCategory=Šis tiekėjas neturi jokių kategorijų
+CompanyHasNoCategory=Ši įmonė neturi jokių kategorijų
+MemberHasNoCategory=Šis narys neturi jokių kategorijų
+ContactHasNoCategory=Šis adresatas nėra jokioje kategorijoje
+ClassifyInCategory=Priskirti kategorijai
+NoneCategory=Nė vienas
+NotCategorized=Be kategorijos
+CategoryExistsAtSameLevel=Ši kategorija jau egzistuoja su šia nuoroda
+ReturnInProduct=Atgal į produkto/paslaugos kortelę
+ReturnInSupplier=Atgal į tiekėjo kortelę
+ReturnInCompany=Atgal į kliento/plano kortelę
+ContentsVisibleByAll=Turinys bus matomas visiems
+ContentsVisibleByAllShort=Turinys matomas visiems
+ContentsNotVisibleByAllShort=Turinys nėra matomos visiems
+CategoriesTree=Kategorijų medis
+DeleteCategory=Ištrinti kategoriją
+ConfirmDeleteCategory=Ar tikrai norite ištrinti šią kategoriją?
+RemoveFromCategory=Pašalinti ryšį su kategorija
+RemoveFromCategoryConfirm=Ar tikrai norite pašalinti ryšį tarp operacijos ir kategorijos ?
+NoCategoriesDefined=Nėra apibrėžtos kategorijos
+SuppliersCategoryShort=Tiekėjų kategorija
+CustomersCategoryShort=Klientų kategorija
+ProductsCategoryShort=Produktų kategorija
+MembersCategoryShort=Narių kategorija
+SuppliersCategoriesShort=Tiekėjų kategorijos
+CustomersCategoriesShort=Klientų kategorijos
+CustomersProspectsCategoriesShort=Klientų/Planų kategorijos
+ProductsCategoriesShort=Produktų kategorijos
+MembersCategoriesShort=Narių kategorijos
+ContactCategoriesShort=Adresatų kategorijos
+ThisCategoryHasNoProduct=Ši kategorija neturi jokių produktų.
+ThisCategoryHasNoSupplier=Ši kategorija neturi jokių tiekėjų.
+ThisCategoryHasNoCustomer=Ši kategorija neturi jokių klientų.
+ThisCategoryHasNoMember=Ši kategorija neturi jokių narių.
+ThisCategoryHasNoContact=Ši kategorija neturi jokių adresatų
+AssignedToCustomer=Paskirti klientui
+AssignedToTheCustomer=Paskirtas klientui
+InternalCategory=Vidinė kategorija
+CategoryContents=Kategorijos turinys
+CategId=Kategorijos ID
+CatSupList=Tiekėjo kategorijų sąrašas
+CatCusList=Kliento/Plano kategorijų sąrašas
+CatProdList=Produktų kategorijų sąrašas
+CatMemberList=Narių kategorijų sąrašas
+CatContactList=Adresatų kategorijų ir adresatų sąrašas
+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ų
+DeleteFromCat=Pašalinti iš kategorijos
+DeletePicture=Ištrinti nuotrauką
+ConfirmDeletePicture=Patvirtinkite nuotraukos trynimą
+ExtraFieldsCategories=Papildomi atributai
+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/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 59cfb5f0bfd..96086bc442f 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Pirmiausia Jūs turite sukurti kontaktus e-laiškams t
 ListSuppliersShort=Tiekėjų sąrašas
 ListProspectsShort=Numatomų klientų sąrašas
 ListCustomersShort=Klientų sąrašas
-ThirdPartiesArea=Trečiųjų šalių sritis
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Paskutinės %s modifikuotos trečiosios šalys
 UniqueThirdParties=Viso unikalių trečiųjų šalių
 InActivity=Atviras
@@ -410,3 +410,5 @@ OutstandingBillReached=Pasiekė neapmokėtų sąskaitų-faktūrų maksimumą
 MonkeyNumRefModelDesc=Gražinimo numeris formatu %syymm-nnnn kliento kodui ir %syymm-nnnn tiekėjo kodui, kur yy yra metai, mm yra mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0.
 LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas bet kada.
 ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 3ddf4470a93..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ą
@@ -187,7 +188,7 @@ AccountancyDashboard=Apskaitos suvestinė
 ByProductsAndServices=Pagal Produktus ir Paslaugas
 RefExt=Išorinė nuoroda
 ToCreateAPredefinedInvoice=Norėdami sukurti iš anksto nustatytą sąskaitą-faktūrą, sukurkite standartinę sąskaitą-faktūrą, be patvirtinimo, spauskite  mygtuką "Keisti į iš anksto nustatytą sąskaitą-faktūrą."
-LinkedOrder=Susietas su užsakymu
+LinkedOrder=Link to order
 ReCalculate=Perskaičiuoti
 Mode1=Metodas 1
 Mode2=Metodas 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas <b>Pinigų apskaita</b> būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama <b>Įsipareigojimų apskaita</b> režimas (žr. Apskaitos modulio nustatymus).
 CalculationMode=Skaičiavimo metodas
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pirkimui
-COMPTA_PRODUCT_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pardavimui
-COMPTA_SERVICE_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pirkimui
-COMPTA_SERVICE_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pardavimui
-COMPTA_VAT_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą gaunama PVM
-COMPTA_VAT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą sumokamam PVM
-COMPTA_ACCOUNT_CUSTOMER=Apskaitos taisyklės pagal nutylėjimą klientui trečiajai šaliai
-COMPTA_ACCOUNT_SUPPLIER=Apskaitos taisyklės pagal nutylėjimą tiekėjams trečiosioms šalims
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/<u>product</u>/class/product.class.php, modulio reikšmė yra <i>product</i>
+CronClassFileHelp=Failo pavadinimas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/<u>product.class.php</u>, klasės failo vardo reikšmė yra <i>product.class.php</i>
+CronObjectHelp=Objekto pavadinimas įkėlimui. <BR> Pvz.:Dolibarr Produkto objekto patraukimo metodas /htdocs/product/clas/product.class.php, klasės failo vardo reikšmė yra <i>Product</i>
+CronMethodHelp=Objekto metodas įkėlimui. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, metodo reikšmė yra <i>fecth</i>
+CronArgsHelp=Metodo argumentai. <BR> Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti <i>0, ProductRef</i>
+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 12a72464cae..145d05b7cf1 100644
--- a/htdocs/langs/lt_LT/donations.lang
+++ b/htdocs/langs/lt_LT/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
-# Donations=Donations
-# DonationRef=Donation ref.
-# Donor=Donor
-# Donors=Donors
-# AddDonation=Add a donation
-# NewDonation=New donation
-# ShowDonation=Show donation
-# DonationPromise=Gift promise
-# PromisesNotValid=Not validated promises
-# PromisesValid=Validated promises
-# DonationsPaid=Donations paid
-# DonationsReceived=Donations received
-# PublicDonation=Public donation
-# DonationsNumber=Donation number
-# DonationsArea=Donations area
-# DonationStatusPromiseNotValidated=Draft promise
-# DonationStatusPromiseValidated=Validated promise
-# DonationStatusPaid=Donation received
-# DonationStatusPromiseNotValidatedShort=Draft
-# DonationStatusPromiseValidatedShort=Validated
-# DonationStatusPaidShort=Received
-# ValidPromess=Validate promise
-# DonationReceipt=Donation receipt
-# BuildDonationReceipt=Build receipt
-# DonationsModels=Documents models for donation receipts
-# LastModifiedDonations=Last %s modified donations
-# SearchADonation=Search a donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+Donation=Auka
+Donations=Aukos
+DonationRef=Aukos nuoroda
+Donor=Donoras
+Donors=Donorai
+AddDonation=Create a donation
+NewDonation=Nauja auka
+ShowDonation=Rodyti auką
+DonationPromise=Dovanos pažadas
+PromisesNotValid=Nepripažinti galiojančiais pažadai
+PromisesValid=Pripažinti galiojančiais pažadai
+DonationsPaid=Sumokėtos aukos
+DonationsReceived=Gautos aukos
+PublicDonation=Viešos aukos
+DonationsNumber=Aukos numeris
+DonationsArea=Aukų sritis
+DonationStatusPromiseNotValidated=Pažado projektas
+DonationStatusPromiseValidated=Patvirtintas pažadas
+DonationStatusPaid=Gauta auka
+DonationStatusPromiseNotValidatedShort=Projektas/apmatai
+DonationStatusPromiseValidatedShort=Pripažintas galiojančiu
+DonationStatusPaidShort=Gautas
+ValidPromess=Pažadą pripažinti galiojančiu
+DonationReceipt=Aukos įplaukos
+BuildDonationReceipt=Sukurti įplaukas
+DonationsModels=Aukos įplaukų dokumentų modeliai
+LastModifiedDonations=Paskutinės %s pakeistos aukos
+SearchADonation=Ieškoti aukos
+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 70ac77164a1..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 <b>%s</b> 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 <b>%s</b> naudojama web serverio vykdymui neturi leidimo tam.
 ErrorNoActivatedBarcode=Nėra įjungta brūkšninio kodo tipo
 ErrUnzipFails=Nepavyko išpakuoti %s su ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Klaida, Jūsų PHP turi turėti modulį <b>%s</b> įdiegtą 
 ErrorOpenIDSetupNotComplete=Nustatyti Dolibarr config failą, kad būtų leidžiama OpenID patvirtinimas, bet OpenID paslaugos URL nėra apibrėžtas kaip konstanta %s.
 ErrorWarehouseMustDiffers=Šaltinio ir paskirties sandėliai privalo skirtis
 ErrorBadFormat=Blogas formatas !
-ErrorPaymentDateLowerThanInvoiceDate=Mokėjimo data (%s) negali būti ankstesnė už sąskaitos-faktūros %s datą (%s) .
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Klaida, šis narys nėra susijęs su jokia trečiąja šalimi. Prijungti narį prie esamos trečiosios šalies arba sukurti naują trečiąją šalį prieš kuriant pasirašymą su sąskaita-faktūra.
 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
@@ -154,3 +174,5 @@ WarningUsingThisBoxSlowDown=Įspėjimas. Naudojant šią dėžutę sulėtėja vi
 WarningClickToDialUserSetupNotComplete=Nustatymo ClickToDial informacija savo vartotojui nėra išsamūs (žr. skirtuką ClickToDial savo vartotojo kortelėje).
 WarningNotRelevant=Neaktuali operacija šiam duomenų rinkiniui
 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
diff --git a/htdocs/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang
index 8d0728dce41..255138f655b 100644
--- a/htdocs/langs/lt_LT/exports.lang
+++ b/htdocs/langs/lt_LT/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Sąskaitos numeris
 BankAccountNumberKey=Raktas
 SpecialCode=Specialusis kodas
 ExportStringFilter=%% leidžia pakeisti vieną ar daugiau simbolių tekste
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtruos pagal vieną metai/mėnuo/diena<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filtruos diapazoną metų/mėnesių/dienų<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filtruos ateinančių metų/mėnesių/dienų<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filtruos praėjusių metų/mėnesių/dienų
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filtruos pagal vieną reikšmę<br>'NNNNN+NNNNN' filtruos diapazono reikšmes<br>'&gt;NNNNN' filtruos mažesnes reikšmes<br>'&gt;NNNNN' filtruos didesnes reikšmes.
 ## filters
 SelectFilterFields=Jei norite filtruoti pagal kai kokias reikšmes, įveskite reikšmes čia.
diff --git a/htdocs/langs/lt_LT/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 2e27a46a61a..597f964781a 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Žmogiškųjų išteklių valdymas (HRM)
-Holidays=Šventės
-CPTitreMenu=Šventės
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Mėnesio suvestinė
-MenuAddCP=Prašyti atostogų
-NotActiveModCP=Turite įjungti atostogų modulį, kad galėtumėte mstyti šį puslapį.
-NotConfigModCP=Reikia sukonfigūruoti atostogų modulį, kad galėtumėte matyti šį puslapį. Norėdami tai padaryti, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> spauskite čia</a>.
-NoCPforUser=Jūs neturite atostogų paraiškų.
-AddCP=Prašyti atostogų
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Darbuotojas
 DateDebCP=Pradžios data
 DateFinCP=Pabaigos data
@@ -18,24 +18,24 @@ ApprovedCP=Patvirtinta
 CancelCP=Atšauktas
 RefuseCP=Atmestas
 ValidatorCP=Tvirtintojas/aprobatorius
-ListeCP=Švenčių sąrašas
+ListeCP=List of leaves
 ReviewedByCP=Bus peržiūrėtas
 DescCP=Aprašymas
-SendRequestCP=Sukurti atostogų paraišką
-DelayToRequestCP=Prašymai dėl atostogų turi būti pateikti ne mažiau kaip <b>%s dienų</b> iki atostogų.
-MenuConfCP=Redaguoti atostogų/švenčių balansą
-UpdateAllCP=Atnaujinti atostogas/šventes
-SoldeCPUser=Atostogų/švenčių balansas yra <b>%s</b> dienų.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Turite pasirinkti pabaigos datą didesnę nei pradžios data.
 ErrorSQLCreateCP=Kuriant įvyko SQL klaida:
-ErrorIDFicheCP=Įvyko klaida, atostogų prašymas neegzistuoja.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Grįžti į ankstesnį puslapį
-ErrorUserViewCP=Jūs neturite teisės skaityti šį prašymą atostogoms.
-InfosCP=Informacija apie atostogų pareiklavimą
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Workflow informacija
 RequestByCP=Prašoma
-TitreRequestCP=Atostogų lapas
-NbUseDaysCP=Sunaudotų atostogų dienų skaičius
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Redaguoti
 DeleteCP=Ištrinti
 ActionValidCP=Patvirtinti
@@ -43,26 +43,25 @@ ActionRefuseCP=Atmesti
 ActionCancelCP=Atšaukti
 StatutCP=Būklė
 SendToValidationCP=Siųsti patvirtinimui
-TitleDeleteCP=Ištrinti atostogų prašymą
-ConfirmDeleteCP=Patvirtinti šio prašymo atostogoms ištrynimą ?
-ErrorCantDeleteCP=Klaida. Jūs neturite teisės ištrinti šį atostogų prašymą.
-CantCreateCP=Jūs neturite teisės prašyti atostogų.
-InvalidValidatorCP=Jūs turite pasirinkti Tvirtintoją/aprobatorių atostogų prašymui pateikti
-UpdateButtonCP=Atnaujinimas
-CantUpdate=Jūs negalite atnaujinti šio atostogų prašymo.
+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=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ą
-ConfirmValidCP=Ar tikrai norite 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=Siųsti prašymą atostogoms
-ConfirmToValidCP=Ar jūs tikrai norite išsiųsti atostogų prašymą?
-TitleRefuseCP=Atmesti atostogų prašymą
-ConfirmRefuseCP=Ar tikrai norite atmesti atostogų prašymą ?
+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=Jūs turite pasirinkti priežastį dėl prašymo atostogoms atmetimo
-TitleCancelCP=Atšaukti atostogų prašymą
-ConfirmCancelCP=Ar tikrai norite 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
 DateCancelCP=Atšaukimo data
@@ -72,42 +71,42 @@ MotifCP=Priežastis
 UserCP=Vartotojas
 ErrorAddEventToUserCP=Pridedant išimtines atostogas įvyko klaida.
 AddEventToUserOkCP=Išimtinių atostogų pridėjimas baigtas.
-MenuLogCP=Peržiūrėti atostogų žurnalus
-LogCP=Atostogų atnaujinimų žurnalas
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Pirma atostogų diena
-LastDayOfHoliday=Paskutinė atostogų diena
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Mėnesio atnaujinimas
 ManualUpdate=Rankinis atnaujinimas
-HolidaysCancelation=Atostogų atšaukimas
+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=Grupė su galimybe patvirtinti atostogas
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Patvirtinti konfigūraciją
-LastUpdateCP=Paskutinės automatiškai atnaujintos atostogos
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">paspaudę čia</a> .
-DelayForSubmitCP=Terminas kreiptis dėl atostogų
-AlertapprobatortorDelayCP=Neleidžia aprobuoti, jeigu atostogų prašymo pateikimui praleisti terminai
-AlertValidatorDelayCP=Préevent į approbator jei atostogų prašyme viršyti uždelsimą
-AlertValidorSoldeCP=Neleidžia patvirtinti, jei prašoma atostogų virš balanso (jau išnaudotos)
-nbUserCP=Atostogų modulyje palaikomų vartotojų skaičius
-nbHolidayDeductedCP=Atostogų dienų akaičius, atimamas per dieną iš paimtų atostogų
-nbHolidayEveryMonthCP=Kiekvieną mėnesį pridėtas atostogų skaičius
-Module27130Name= Atostogų valdymas
-Module27130Desc= Atostogų valdymas
-TitleOptionMainCP=Atostogų pagrindiniai nustatymai
-TitleOptionEventCP=Atostogų/švenčių, susijusių su įvykiais, nustatymai
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Patvirtinti
 UpdateEventCP=Atnaujinti įvykius
 CreateEventCP=Sukurti
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Atnaujinimas
 ErrorMailNotSend=Siunčiant laišką įvyko klaida:
 NoCPforMonth=Šį mėnesį nėra išimtinių atostogų
 nbJours=Dienų skaičius
-TitleAdminCP=Atotogų konfigūracija
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Sveiki !
-HolidaysToValidate=Patvirtinti atostogas
-HolidaysToValidateBody=Žemiau yra atostogų prašymas tvirtinimui
-HolidaysToValidateDelay=Šis atostogų prašymas galios trumpesnį laikotarpį nei %s dienų.
-HolidaysToValidateAlertSolde=Vartotojas, kuris pateikė šį atostogų prašymą neturi pakankamai neišnaudotų dienų.
-HolidaysValidated=Patvirtintos atostogos
-HolidaysValidatedBody=Jūsų prašymas suteikti atostogas nuo %s iki %s buvo patvirtintas.
-HolidaysRefused=Atmestos atostogos
-HolidaysRefusedBody=Jūsų prašymas suteikti atostogas nuo %s iki %s buvo atmestas dėl sekančios priežasties:
-HolidaysCanceled=Atšauktos atostogos
-HolidaysCanceledBody=Jūsų prašymas suteikti atostogas nuo %s iki %s buvo atšauktas.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Peržiūrėti modifikuotų atostogų žurnalą
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang
index 0a5b3e15467..f50261243a8 100644
--- a/htdocs/langs/lt_LT/interventions.lang
+++ b/htdocs/langs/lt_LT/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
-# Interventions=Interventions
-# InterventionCard=Intervention card
-# NewIntervention=New intervention
-# AddIntervention=Add intervention
-# ListOfInterventions=List of interventions
-# EditIntervention=Edit intervention
-# ActionsOnFicheInter=Actions on intervention
-# LastInterventions=Last %s interventions
-# AllInterventions=All interventions
-# CreateDraftIntervention=Create draft
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
-# InterventionContact=Intervention contact
-# DeleteIntervention=Delete intervention
-# ValidateIntervention=Validate intervention
-# ModifyIntervention=Modify intervention
-# DeleteInterventionLine=Delete intervention line
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
-# NameAndSignatureOfExternalContact=Name and signature of customer :
-# DocumentModelStandard=Standard document model for interventions
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-# ClassifyBilled=Classify "Billed"
-# StatusInterInvoiced=Billed
-# RelatedInterventions=Related interventions
-# ShowIntervention=Show intervention
+Intervention=Intervencija
+Interventions=Intervencijos
+InterventionCard=Intervencijos kortelė
+NewIntervention=Nauja intervencija
+AddIntervention=Create intervention
+ListOfInterventions=Intervencijų sąrašas
+EditIntervention=Redaguoti intervenciją
+ActionsOnFicheInter=Intervencijos veiksmai
+LastInterventions=Paskutinės %s intervencijos
+AllInterventions=Visos intervencijos
+CreateDraftIntervention=Sukurti projektą
+CustomerDoesNotHavePrefix=Klientas neturi prefikso
+InterventionContact=Intervencijos kontaktai
+DeleteIntervention=Ištrinti intervenciją
+ValidateIntervention=Patvirtinti intervenciją
+ModifyIntervention=Pakeisti intervenciją
+DeleteInterventionLine=Ištrinti intervencijos eilutę
+ConfirmDeleteIntervention=Ar tikrai norite ištrinti šią intervenciją?
+ConfirmValidateIntervention=Ar tikrai norite patvirtinti šią intervenciją su pavadinimu <b>%s</b> ?
+ConfirmModifyIntervention=Ar tikrai norite pakeisti šią intervenciją?
+ConfirmDeleteInterventionLine=Ar tikrai norite ištrinti šią intervencijos eilutę ?
+NameAndSignatureOfInternalContact=Intervencijos Pavadinimas/vardas ir parašas:
+NameAndSignatureOfExternalContact=Kliento Pavadinimas/vardas ir parašas:
+DocumentModelStandard=Intervencijų standartinio dokumento modelis
+InterventionCardsAndInterventionLines=Intervencijos ir intervencijų eilutės
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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=Representative following-up intervention
-# TypeContact_fichinter_internal_INTERVENING=Intervening
-# TypeContact_fichinter_external_BILLING=Billing customer contact
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Sekančios intervencijos atstovas
+TypeContact_fichinter_internal_INTERVENING=Intervencija
+TypeContact_fichinter_external_BILLING=Kliento kontaktas sąskaitų pateikimui
+TypeContact_fichinter_external_CUSTOMER=Sekantis kiento kontaktas
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
-# ArcticNumRefModelError=Failed to activate
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Bendrasis numerių modelis
+ArcticNumRefModelError=Nepavyko suaktyvinti
+PacificNumRefModelDesc1=Grąžinti numerį su formatu %syymm-nnnn, kur yy yra metai, mm mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0
+PacificNumRefModelError=Intervencijos kortelė pradedant $syymm jau egzistuoja ir yra nesuderinama su šios sekos modeliu. Pašalinti ją arba pakeisti vardą šio modulio aktyvavimui.
+PrintProductsOnFichinter=Spausdinti produktus intervencinėje kortelėje
+PrintProductsOnFichinterDetails=Intervencijoms, sukurtoms iš užsakymų
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 <b>%s</b> gavėjams pagal siuntimo sesiją.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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<br/>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<br/> 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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: <b>%s</b>, prisijungimas: <b>%s</b>) jau yra susietas su trečiąja šalimi <b>%s</b>. 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.: <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br> Mokėti naudojant kreditinę kortelę arba PayPal, spauskite mygtuką šio puslapio apačioje.<br>
+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.<br><br> Š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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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ą <a href="http://www.paybox.com" target="_blank">Paybox</a> 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ą <b>&tag=<i>value</i></b> į bet kurį URL (reikalingas tik nemokamam mokėjimui) pridėti nuosavo mokėjimo komentaro žymę.
+SetupPayBoxToHavePaymentCreatedAutomatically=Nustatyti savo Paybox su URL <b>%s</b>, 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 a064b9a26d9..d2b0da1e0f3 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Uždarytas
 ContractStatusRunning=Veikia
 ContractStatusExpired=Pasibaigęs
 ContractStatusOnHold=Neveikia
-ContractStatusToRun=Paleidimas
+ContractStatusToRun=To get running
 ContractNotRunning=Ši sutartis nevykdoma
 ErrorProductAlreadyExists=Produktas su nuoroda %s jau egzistuoja.
 ErrorProductBadRefOrLabel=Neteisinga nuorodos ar etiketės reikšmė
 ErrorProductClone=Iškilo problema bandant klonuoti produktą ar paslaugą.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Tiekėjai
 SupplierRef=Tiekėjo produkto nuoroda
 ShowProduct=Rodyti produktą
@@ -116,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
@@ -131,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ą ?
@@ -178,7 +179,7 @@ CloneProduct=Klonuoti produktą ar paslaugą
 ConfirmCloneProduct=Ar tikrai norite klonuoti produktą ar paslaugą <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ PricingRule=Kainodaros taisyklės
 AddCustomerPrice=Pridėti kainą pagal klientus
 ForceUpdateChildPriceSoc=Nustatykite tą pačią kainą ir kliento dukterinėms įmonė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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 5a2e4c5a647..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
@@ -85,13 +87,13 @@ ActionsOnProject=Projekto įvykiai
 YouAreNotContactOfProject=Jūs nesate šios privataus projekto kontaktinis adresatas
 DeleteATimeSpent=Ištrinti praleistą laiką
 ConfirmDeleteATimeSpent=Ar tikrai norite ištrinti šį praleistą laiką ?
-DoNotShowMyTasksOnly=Taip pat žiūrėti užduotis nepriskiriamas man
-ShowMyTasksOnly=Peržiūrėti tik man priskirtas užduotis
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ištekliai
 ProjectsDedicatedToThisThirdParty=Projektai, skirti šiai trečiąjai šaliai
 NoTasks=Nėra uždavinių šiam projektui
 LinkedToAnotherCompany=Susijęs su kita trečiąja šalimi
-TaskIsNotAffectedToYou=Užduotis nėra skirta Jums
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Praleistas laikas yra tuščias
 ThisWillAlsoRemoveTasks=Šis veiksmas taip pat ištrins visas projekto užduotis (<b>%s</b> užduotis šiuo metu) ir visus praleisto laiko įvestus duomenis.
 IfNeedToUseOhterObjectKeepEmpty=Jei kai kurie objektai (sąskaitos-faktūros, užsakymai, ...), priklausantys kitai trečiąjai šaliai, turi būti susiję su kuriamu projektu, laikykite šitą tuščią, kad projektas būtų kelių trečiųjų šalių (multi).
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Aukotojas
 TypeContact_project_task_external_TASKCONTRIBUTOR=Straipsnio autorius
 SelectElement=Pasirinkti elementą
 AddElement=Susieti su elementu
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Pilnas projekto ataskaitos modelis (logo. ..)
 PlannedWorkload = Planuojamas darbo krūvis
@@ -128,3 +131,4 @@ ProjectReferers=Nurodomi objektai
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
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 75d3ed7d2fa..38030437e9b 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Tik patvirtintas siuntas parodanti statistika. Nau
 DateDeliveryPlanned=Suplanuota pristatymo data
 DateReceived=Pristatymo gavimo data
 SendShippingByEMail=Siųsti siuntą e-paštu
-SendShippingRef=Siųsti siuntą %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Siuntų įvykiai
 LinkToTrackYourPackage=Nuoroda sekti Jūsų siuntos kelią
 ShipmentCreationIsDoneFromOrder=Šiuo metu, naujos siuntos sukūrimas atliktas iš užsakymo kortelės.
 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ė
@@ -72,3 +74,7 @@ DocumentModelTyphon=Labiau išsamus dokumento modelis pristatymo kvitui (logo. .
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nėra apibrėžta
 SumOfProductVolumes=Produkcijos apimties suma
 SumOfProductWeights=Produktų svorių suma
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/lt_LT/shop.lang b/htdocs/langs/lt_LT/shop.lang
deleted file mode 100644
index 5d214fe63fa..00000000000
--- a/htdocs/langs/lt_LT/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Parduotuvė
-ShopWeb=Interneto parduotuvė
-LastOrders=Paskutiniai užsakymai
-OnStandBy=Budėjimo režimu
-TreatmentInProgress=Apdorojimas vyksta
-LastCustomers=Naujausi klientai
-OSCommerceShop=OSCommerce parduotuvė
-OSCommerce=OSCommerce
-AddProd=Parduoti internete
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/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index d0a13633f41..d7103dbc295 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Sukurti tiekėjo sąskaitą-faktūrą
 ListOfSupplierProductForSupplier=Produktų ir kainų sąrašas tiekėjui <b>%s</b>
 NoneOrBatchFileNeverRan=Nėra arba grupinis <b>%s</b> neseniai neįvyko
 SentToSuppliers=Nusiųsta tiekėjams
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
index 55ce45bfce8..42c60e6a183 100644
--- a/htdocs/langs/lt_LT/trips.lang
+++ b/htdocs/langs/lt_LT/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-# TF_OTHER=Other
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+Trip=Išjungimas
+Trips=Išjungimai
+TripsAndExpenses=Išjungimai ir išlaidos
+TripsAndExpensesStatistics=Išjungimų ir išlaidų statistika
+TripCard=Išjungimo kortelė
+AddTrip=Pridėti išjungimą
+ListOfTrips=Išjungimų sąrašas
+ListOfFees=Įmokų sąrašas
+NewTrip=Naujas išjungimas
+CompanyVisited=aplankyta įmonė/organizacija
+Kilometers=Kilometrų
+FeesKilometersOrAmout=Kilometrų kiekis
+DeleteTrip=Ištrinti išjungimą
+ConfirmDeleteTrip=Ar tikrai norite ištrinti šį išjungimą ?
+TF_OTHER=Kitas
+TF_LUNCH=Pietūs
+TF_TRIP=Išjungimas
+ListTripsAndExpenses=Išjungimų ir išlaidų sąrašas
+ExpensesArea=Išjungimų ir išlaidų sritis
+SearchATripAndExpense=Ieškoti išjungimo ir išlaidų
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..cb192f1f684
--- /dev/null
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Globālie iestatījumi
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiskālie gadi
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Trešo personu komti
+MenuTools=Rīki
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Žurnāli
+JournalFinancial=Financial journals
+Exports=Eksports
+Modelcsv=Eksporta modulis
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Klasiskais eksports
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Atgriezšana
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Apstiprināt
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=Jānosūta
+Dispatched=Nosūtīts
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Atskaites
+ByCustomerInvoice=By invoices customers
+ByMonth=Šķirot pēc mēneša
+NewAccount=New accounting account
+Update=Atjaunot
+List=Saraksts
+Create=Izveidot
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=Virsgrāmata
+AccountBalanceByMonth=Konta bilance pa mēnešiem
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Apstrādā
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=CSV atdalītājs
+
+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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Dokumenta veids
+Docdate=Datums
+Docref=Atsauce
+Numerocompte=Konts
+Code_tiers=Trešās personas
+Labelcompte=Konta nosaukums
+Debit=Debets
+Credit=Kredīts
+Amount=Apjoms
+Sens=Sens
+Codejournal=Žurnāls
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Pārdošanas žurnāls
+PurchasesJournal=Iepirkumu žurnāls
+DescSellsJournal=Pārdošanas žurnāls
+DescPurchasesJournal=Pirkumu žurnāls
+BankJournal=Bankas žurnāls
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Skaidras naudas žurnāls
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Trešās personas konts
+
+NewAccountingMvt=Jauna pārvietošana
+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=Plāna versija
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=Jaauns fiskālais gads
+
+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 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/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 5654ecedf58..5debf8efd8c 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -3,7 +3,7 @@ Foundation=Organizācija
 Version=Versija
 VersionProgram=Programmas versija
 VersionLastInstall=Sākotnējā instalētā versija
-VersionLastUpgrade=Jaunākajai jauninājums
+VersionLastUpgrade=Pēdējo reizi versija atjaunijnāta
 VersionExperimental=Eksperimentāls
 VersionDevelopment=Attīstība
 VersionUnknown=Nezināms
@@ -12,9 +12,9 @@ SessionId=Sesijas ID
 SessionSaveHandler=Handler, lai saglabātu sesijas
 SessionSavePath=Atmiņas sesija lokalizācija
 PurgeSessions=Iztīrīt sesijas
-ConfirmPurgeSessions=Vai jūs tiešām vēlaties, lai iztīrītu visus sesijas? Tas atvienot katram lietotājam (izņemot sevi).
+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 <b>%s</b> varēs pieslēgties pēc tam.
 UnlockNewSessions=Noņemt savienojuma bloķēšanu
 YourSession=Jūsu sesija
@@ -35,7 +35,7 @@ ExternalUsers=Ārējie lietotāji
 GlobalSetup=Globālie iestatījumi
 GUISetup=Attēlojums
 SetupArea=Iestatījumi
-FormToTestFileUploadForm=Veidlapa, lai pārbaudītu failu augšupielādes (pēc uzstādīšanas)
+FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem)
 IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots
 RemoveLock=Dzēst failu <b>%s</b>, ja tāds ir, lai varētu izmantošanu atjaunināšanas rīku.
 RestoreLock=Atjaunot failu <b>%s</b> ar lasīšanas tiesībām tikai, lai bloķētu atjaunošanas rīka izmantošanu.
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr v
 ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</b> netiek atbalstīta.
 DictionarySetup=Vārdnīcas iestatījumi
 Dictionary=Vārdnīcas
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiskālais gads
 ErrorReservedTypeSystemSystemAuto=Vērtību "sistēma" un "systemauto" veida tiek aizsargātas. Jūs varat izmantot "lietotājs", kā vērtība, lai pievienotu savu ierakstu
 ErrorCodeCantContainZero=Kods nevar saturēt 0 vērtību
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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ā
@@ -124,8 +128,8 @@ PHPServerOffsetWithGreenwich=PHP servera kompensēt platums Greenwich (sekundes)
 ClientOffsetWithGreenwich=Klienta / Browser kompensēt platums Greenwich (sekundes)
 DaylingSavingTime=Vasaras laiks
 CurrentHour=PHP laiks (servera)
-CompanyTZ=Uzņēmuma Time Zone (galvenais uzņēmums)
-CompanyHour=Uzņēmums laiks (galvenais uzņēmums)
+CompanyTZ=Uzņēmuma Laika Zona (galvenais uzņēmums)
+CompanyHour=Uzņēmuma laiks (galvenais uzņēmums)
 CurrentSessionTimeOut=Pašreizējais sesijas taimauts
 YouCanEditPHPTZ=Noteikt atšķirīgu PHP laika joslu (nav obligāti), jūs varat mēģināt, lai pievienotu failu htacces ar līniju, piemēram, šīs "setenv TZ Eiropa / Paris"
 OSEnv=OS Vide
@@ -133,7 +137,7 @@ Box=Kaste
 Boxes=Kastes
 MaxNbOfLinesForBoxes=Maksimālais attēloto ierakstu skaits
 PositionByDefault=Noklusējuma secība
-Position=Pasūtījums
+Position=Pozīcija
 MenusDesc=Izvēlnes vadītāji nosaka saturu 2 izvēlnes bāros (horizontāla josla un vertikāla josla).
 MenusEditorDesc=Izvēlne redaktors ļauj jums noteikt personalizētu ierakstus izvēlnēs. Izmantojiet to uzmanīgi, lai netiktu dolibarr nestabila un ēdienkarte ierakstus pastāvīgi sasniedzams. <br> Daži moduļi pievienot ierakstus izvēlnēs (izvēlnē <b>All</b> vairumā gadījumu). Ja jūs izņemt kādu no šiem ierakstiem kļūdas dēļ, tos var atjaunot ar invaliditāti un atkārtotas iespējošanas moduli.
 MenuForUsers=Lietotāju izvēlne
@@ -167,8 +171,8 @@ NoBackupFileAvailable=Nav rezerves kopiju faili pieejami
 ExportMethod=Eksportēšanas veids
 ImportMethod=Importēšanas veids
 ToBuildBackupFileClickHere=Lai izveidotu rezerves kopiju noklikšķiniet <a href="%s">šeit</a> .
-ImportMySqlDesc=Importēt dublējuma failu, jums ir izmantot mysql komandu no komandrindas:
-ImportPostgreSqlDesc=Importēt dublējuma failu, jums ir jāizmanto pg_restore komandu no komandrindas:
+ImportMySqlDesc=Lai importētu rezerves kopijas failu, jums ir jāizmanto mysql komandas komandrinda:
+ImportPostgreSqlDesc=Lai importētu rezerves kopijas failu, jums ir jāizmanto pg_restore komandu komandrindā:
 ImportMySqlCommand=%s %s < manarezerveskopija.sql
 ImportPostgreSqlCommand=%s %s mybackupfails.sql
 FileNameToGenerate=Faila nosaukumu kuru izveido
@@ -206,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
@@ -217,9 +222,10 @@ AutomaticIfJavascriptDisabled=Automātiski, ja Javascript ir atslēgts
 AvailableOnlyIfJavascriptNotDisabled=Pieejams tikai tad, ja JavaScript nav atslēgts
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Pieejams tikai tad, ja JavaScript nav atslēgts
 Required=Nepieciešams
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Drošība
 Passwords=Paroles
-DoNotStoreClearPassword=Vai nav veikals skaidri paroles datu bāzē, bet veikalā tikai šifrēta vērtība (aktivētā ieteicams)
+DoNotStoreClearPassword=Neglabāt nešifrētas paroles datubāzē bet izmantot šifrētas (aktivizācija ieteicama)
 MainDbPasswordFileConfEncrypted=Datubāzes paroli šifrēti conf.php (aktivēt ieteicams)
 InstrucToEncodePass=Lai iegūtu paroli, iekodētas <b>conf.php</b> failu, nomainiet līnija <br> <b>$ Dolibarr_main_db_pass = "..."</b> <br> līdz <br> <b>$ Dolibarr_main_db_pass = "crypted: %s"</b>
 InstrucToClearPass=Lai iegūtu paroli, dekodēt (skaidri) uz <b>conf.php</b> failu, nomainiet līnija <br> <b>$ Dolibarr_main_db_pass = "crypted: ..."</b> <br> līdz <br> <b>$ Dolibarr_main_db_pass = "%s"</b>
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Nav noteikts uz
 MAIN_MAIL_EMAIL_FROM=Sūtītāja e-pasta automātisko e-pastu (Pēc noklusējuma php.ini: <b>%s)</b>
 MAIN_MAIL_ERRORS_TO=Sūtītāja e-pasta izmantotas kļūdu atgriešanās e-pastu nosūtīts
 MAIN_MAIL_AUTOCOPY_TO= Nosūtīt sistemātiski slēptu oglekļa-kopiju visu nosūtīto e-pastus
+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=Atspējot visus e-pastus sendings (izmēģinājuma nolūkā vai demos)
 MAIN_MAIL_SENDMODE=Metode ko izmantot sūtot e-pastus
 MAIN_MAIL_SMTPS_ID=SMTP ID ja autentificēšana nepieciešama
@@ -302,7 +311,7 @@ GenericMaskCodes4a=<u>Piemērs par 99. %s trešās puses Thecompany darīts 2007
 GenericMaskCodes4b=<u>Piemērs trešā persona veidota 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Piemērs produkts veidots 2007-03-01:</u><br>
 GenericMaskCodes5=<b>ABC {gggg} {mm} - {000000}</b> dos <b>ABC0701-000099</b> <br> <b>{0000 +100 @ 1}-ZZZ / {dd} / XXX</b> dos <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Atgriež pielāgojamu numuru atbilstoši noteiktai masku.
+GenericNumRefModelDesc=Atgriež pielāgojamu numuru atbilstoši noteiktajai maskai.
 ServerAvailableOnIPOrPort=Serveris ir pieejams adresē <b>%s</b> ports <b>%s</b>
 ServerNotAvailableOnIPOrPort=Serveris nav pieejams adresē <b>%s</b> ports <b>%s</b>
 DoTestServerAvailability=Pārbaudīt servera savienojumu
@@ -351,9 +360,9 @@ HideDetailsOnPDF=Paslēpt produktu līnijas informāciju izveidotajā PDF
 Library=Bibliotēka
 UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
 SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL
-EnterRefToBuildUrl=Ievadiet atsauce objektu %s
+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
@@ -387,7 +396,7 @@ LinkToTest=Klikšķināmos saites, kas izveidotas lietotāju <strong>%s</strong>
 KeepEmptyToUseDefault=Saglabājiet tukšu, lai izmantotu noklusēto vērtību
 DefaultLink=Noklusējuma saite
 ValueOverwrittenByUserSetup=Uzmanību, šī vērtība var pārrakstīt ar lietotāja konkrētu uzstādīšanas (katrs lietotājs var iestatīt savu clicktodial URL)
-ExternalModule=Ārējā modulis - Uzstāda uz uzziņu %s
+ExternalModule=Ārējais modulis - Instalēts direktorijā %s
 BarcodeInitForThirdparties=Masveida svītrkoda izveidošana trešajām personām
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
@@ -402,7 +411,7 @@ NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
 Module0Name=Lietotāji un grupas
 Module0Desc=Lietotāju un grupu vadība
 Module1Name=Trešās personas
-Module1Desc=Uzņēmumi un kontaktinformācija vadība (klientu, perspektīvas ...)
+Module1Desc=Uzņēmumu un kontaktinformācijas vadība (klientu, perspektīvu ...)
 Module2Name=Tirdzniecība
 Module2Desc=Komerciālā pārvaldība
 Module10Name=Grāmatvedība
@@ -431,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
@@ -469,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)
@@ -478,21 +487,19 @@ 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
-Module800Name=OsCommerce tieša datu bāzes piekļuves
-Module800Desc=Saskarne uzrāda OsCommerce vai OSCSS veikalu, izmantojot tiešu datu bāzes piekļuvi
-Module900Name=OsCommerce ar WS
-Module900Desc=Saskarne uzrāda osCommerce veikalu, izmantojot Web pakalpojumus. Šis modulis requiere instalēt komponentus no / oscommerce_ws / ws_server jūsu osCommerce serverī. Skatīt README failu / oscommerce_ws / ws_server.
 Module1200Name=Dievlūdzējs
 Module1200Desc=Mantis integrācija
 Module1400Name=Grāmatvedība
 Module1400Desc=Grāmatvedības vadība (dubultā partijas)
-Module1780Name=Kategorijas
+Module1780Name=Sadaļas
 Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem)
 Module2000Name=WYSIWYG redaktors
 Module2000Desc=Ļauj rediģēt kādu teksta apgabalu, izmantojot uzlabotas redaktoru
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Plānotais uzdevumu pārvaldība
 Module2400Name=Darba kārtība
@@ -501,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
@@ -512,22 +521,26 @@ 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 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
 Module59000Desc=Moduli, lai pārvaldītu peļņu
 Module60000Name=Komisijas
-Module60000Desc=Moduli, lai pārvaldītu komisijas
+Module60000Desc=Modulis lai pārvaldītu komisijas
 Module150010Name=Batch number, eat-by date and sell-by date
 Module150010Desc=batch number, eat-by date and sell-by date management for product
 Permission11=Lasīt klientu rēķinus
@@ -537,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
@@ -575,9 +588,6 @@ Permission92=Izveidot/labot sociālās iemaksas un PVN
 Permission93=Dzēst sociālās iemaksas un PVN
 Permission94=Eksportēt sociālās iemaksas
 Permission95=Lasīt atskaites
-Permission96=Nosūtīšanas iestatīšana
-Permission97=Lasīt rēķina grāmatvedību nosūtīšana
-Permission98=Nosūtīšanas rēķinu grāmatvedības līnijas
 Permission101=Lasīt sūtījumus
 Permission102=Izveidot/mainīt sūtījumus
 Permission104=Apstiprināt sūtījumus
@@ -585,7 +595,7 @@ Permission106=Eksportēt sūtījumus
 Permission109=Dzēst sūtījumus
 Permission111=Lasīt finanšu kontus
 Permission112=Izveidot/labot/dzēst un salīdzināt darījumus
-Permission113=Setup financiel konti (izveidot, pārvaldīt kategorijas)
+Permission113=Setup financiel konti (izveidot, pārvaldīt sadaļas)
 Permission114=Konsolidēt darījumus
 Permission115=Eksportēt darījumus un kontu izrakstus
 Permission116=Pārvietot starp kontiem
@@ -603,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
@@ -661,14 +672,14 @@ Permission281=Lasīt kontaktus
 Permission282=Izveidot/mainīt kontaktus
 Permission283=Dzēst kontaktus
 Permission286=Eksportēt kontaktus
-Permission291=Lasīt tarifus
+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īgumu
+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
@@ -698,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=Create/modify warehouses
+Permission1003=Delete warehouses
 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
@@ -714,7 +725,7 @@ Permission1185=Apstiprināt piegādātājq pasūtījumus
 Permission1186=Pasūtīt piegādātāja pasūtījumus
 Permission1187=Saņemšanu piegādātāju pasūtījumu
 Permission1188=Dzēst piegādātāju pasūtījumus
-Permission1201=Saņemt rezultātu eksportu
+Permission1201=Saņemt eksportēšanas rezultātu
 Permission1202=Izveidot/Modificēt eksportu
 Permission1231=Lasīt piegādātāja rēķinus
 Permission1232=Izveidot/mainīt piegādātāja rēķinus
@@ -726,11 +737,11 @@ Permission1237=Eksporta piegādātāju pasūtījumus un to detaļas
 Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde)
 Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
 Permission1421=Eksporta klientu pasūtījumus un atribūti
-Permission23001 = Lasīt Plānotais uzdevumu
-Permission23002 = Izveidot / atjaunināt Plānotais uzdevumu
+Permission23001 = Skatīt plānoto uzdevumu
+Permission23002 = Izveidot/atjaunināt plānoto uzdevumu
 Permission23003 = Dzēst plānoto uzdevumu
 Permission23004 = Izpildīt plānoto uzdevumu
-Permission2401=Lasīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
+Permission2401=SKatīt darbības (pasākumi vai uzdevumi), kas saistīti ar kontu
 Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
 Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
 Permission2411=Lasīt darbības (pasākumi vai uzdevumi) par citiem
@@ -775,13 +786,14 @@ DictionaryOrderMethods=Pasūtījumu veidi
 DictionarySource=Origin of proposals/orders
 DictionaryAccountancyplan=Kontu līknes
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Iestatījumi saglabāti
 BackToModuleList=Atpakaļ uz moduļu sarakstu
 BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
 VATReceivedOnly=Īpaša likme nav jāmaksā
 VATManagement=PVN Vadība
 VATIsUsedDesc=PVN likme pēc noklusējuma, veidojot izredzes, rēķini, rīkojumi uc sekot aktīvo standarta noteikums: <br> Ja pārdevējs nav pakļauta PVN, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Ja (pārdošanas valstij = pērkot valsti), tad pēc noklusējuma PVN = PVN no produkta pārdošanas valstī. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienā, un preces ir transporta līdzekļi (auto, kuģis, lidmašīna), noklusējuma PVN = 0 (PVN būtu jāmaksā pircējam pie customoffice savas valsts, nevis pārdevējs). Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs nav uzņēmums, tad PVN pēc noklusējuma = PVN no pārdotā produkta. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs ir uzņēmums, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Else ierosinātā noklusējuma PVN = 0. Beigas varu.
-VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijām, cilvēki ou mazos uzņēmumus.
+VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijās, idnividuālie komersanti.
 VATIsUsedExampleFR=Francijā, tas nozīmē, uzņēmumiem vai organizācijām, kas reāli fiskālo sistēmu (Vienkāršota reālu vai normāla īsto). Sistēma, kurā PVN ir deklarēta.
 VATIsNotUsedExampleFR=Francijā, tas ir asociācijas, kas nav PVN deklarētas vai uzņēmumi, organizācijas vai brīvo profesiju, kas ir izvēlējušies mikrouzņēmumu nodokļu sistēmu (PVN ar franšīzes), un tā maksā franšīzes PVN bez PVN deklarācijas. Šī izvēle būs redzams atskaites "Nav piemērojams PVN - art-293B CGI" rēķinā.
 ##### Local Taxes #####
@@ -813,7 +825,7 @@ LocalTax2IsNotUsedExampleES= Spānijā tie Bussines neattiecas uz nodokļu sist
 CalcLocaltax=Atskaites
 CalcLocaltax1ES=Pārdošana - Iepirkumi
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2ES=Pirkumi
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3ES=Pārdošana
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
@@ -864,7 +876,7 @@ SummarySystem=Sistēmas informācijas kopsavilkums
 SummaryConst=Sarakstu ar visiem Dolibarr uzstādīšanas parametriem
 SystemUpdate=Sistēmas atjaunināšana
 SystemSuccessfulyUpdate=Jūsu sistēma ir atjaunināta veiksmīgi
-MenuCompanySetup=Kompānija / Foundation
+MenuCompanySetup=Kompānija/Organizācija
 MenuNewUser=Jauns lietotājs
 MenuTopManager=Top menu vadītājs
 MenuLeftManager=Kreisā izvēlne vadītājs
@@ -884,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
@@ -949,7 +962,7 @@ AvailableModules=Pieejamie moduļi
 ToActivateModule=Lai aktivizētu moduļus, dodieties uz iestatīšanas zonas (Home->Setup->Moduļi).
 SessionTimeOut=Sesijas pārtraukums
 SessionExplanation=Šis numurs garantiju, ka sesija nekad beidzas pirms šī kavēšanās, ja sesija tīrītājs tiek darīts ar Iekšējā PHP sesijas tīrāku (un nekas cits). Iekšējā PHP sesijas tīrītājs nav garantija, ka sesija beigsies tikai pēc šīs kavēšanās. Tas beigsies, pēc šī kavēšanās, un, kad sesija tīrītājs ir ilga, tāpēc ik <b>%s / %s</b> piekļuves, bet tikai laikā piekļūt dokumentiem, ko citās sēdēs. <br> Piezīme: par dažiem ar ārēju sesijas tīrīšanas mehānisma (cron zem Debian, Ubuntu ...) serveriem, sesijas var tikt iznīcināti pēc posmā, kas noteikts pēc noklusējuma <strong>session.gc_maxlifetime,</strong> vienalga kāds vērtību ieraksta šeit.
-TriggersAvailable=Pieejamie izraisa
+TriggersAvailable=Pieejamie slēdži
 TriggersDesc=Palaide ir faili, kas mainīs uz Dolibarr darbplūsmas uzvedību, kad nokopēto uz direktoriju <b>htdocs / core / izraisa.</b> Viņi saprata, jaunas darbības, aktivizēta Dolibarr notikumiem (jauns uzņēmums radīšana, rēķinu apstiprināšanu, ...).
 TriggerDisabledByName=Trigeri Šajā failā ir invalīdi <b>ar-NORUN</b> piedēkli savu vārdu.
 TriggerDisabledAsModuleDisabled=Trigeri Šajā failā ir invalīdi, kā modulis <b>%s</b> ir atspējots.
@@ -963,13 +976,13 @@ MiscellaneousDesc=Definēt šeit visus citus parametrus, kas saistīti ar droš
 LimitsSetup=Ierobežojumi / Precision iestatīšanas
 LimitsDesc=Jūs varat noteikt limitus, precizējumus un optimizācijas, kas izmantotas ar Dolibarr šeit
 MAIN_MAX_DECIMALS_UNIT=Maksimālais ciparu skaits aiz komata cenām
-MAIN_MAX_DECIMALS_TOT=Max decimāldaļas attiecībā uz kopējo cenu
+MAIN_MAX_DECIMALS_TOT=Maksimālās decimāldaļas kopējai cenai
 MAIN_MAX_DECIMALS_SHOWN=Max aiz komata par cenām parādīta ekrānā (Add <b>...</b> pēc šo numuru, ja jūs vēlaties redzēt <b>...</b> kad numurs tiek apcirsti, kad redzams uz ekrāna)
 MAIN_DISABLE_PDF_COMPRESSION=Izmantot PDF saspiešanu izveidotajiem PDF failiem.
 MAIN_ROUNDING_RULE_TOT= Izmērs noapaļošanas diapazons (par retajām valstīm, kur noapaļošana tiek darīts uz kaut ko citu par 10 bāzes)
 UnitPriceOfProduct=Neto vienības produkta cena
-TotalPriceAfterRounding=Kopējā cena (neto / pvn / ar nodokli) pēc noapaļošanas
-ParameterActiveForNextInputOnly=Parametrs spēkā nākamās ievades tikai
+TotalPriceAfterRounding=Kopējā cena (neto/pvn/ar nodokli) pēc noapaļošanas
+ParameterActiveForNextInputOnly=Parametrs stājas spēkā no nākamās ievades
 NoEventOrNoAuditSetup=Nav drošības pasākums ir ierakstīta vēl. Tas var būt normāls, ja audits nav iespējots uz "Setup - drošība - revīzijas" lapā.
 NoEventFoundWithCriteria=Nav drošības pasākums ir atzīts par šādiem meklēšanas kritērijiem ir.
 SeeLocalSendMailSetup=Skatiet sendmail iestatījumus
@@ -989,12 +1002,12 @@ WeekStartOnDay=Pirmā nedēļas diena
 RunningUpdateProcessMayBeRequired=Running jaunināšanas procesu, šķiet, ir nepieciešams (Programmas versija %s atšķiras no bāzes versijas %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no komandrindas pēc pieteikšanās uz apvalks ar lietotāju <b>%s,</b> vai jums ir pievienot-W iespēju beigās komandrindas, lai sniegtu <b>%s</b> paroli.
 YourPHPDoesNotHaveSSLSupport=SSL funkcijas, kas nav pieejama jūsu PHP
-DownloadMoreSkins=Vairāk ādas, lai lejupielādētu
+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 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+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 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Atgriezties grāmatvedības kodu būvēts pēc: <br> %
 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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ā
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Noteikumi par profesionālo IDS
 MustBeUnique=Jābūt unikālam?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1120,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
@@ -1134,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 <br> <b>__PHONETO__</b> Kas tiks aizstāts ar tālruņa numuru personai, lai izsauktu <br> <b>__PHONEFROM__</b> Kas tiks aizstāts ar tālruņa numuru, aicinot personas (jūsu) <br> <b>__LOGIN__</b> Kas tiks aizstāts ar jūsu clicktodial pieteikšanās (definēts jūsu lietotāja kartes) <br> <b>__PASS__</b> Kas tiks aizstāts ar jūsu clicktodial paroli (definēts jūsu lietotāja kartes).
@@ -1154,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
@@ -1246,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
@@ -1260,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
@@ -1318,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
@@ -1378,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
@@ -1408,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=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=Izvēlne dzēsta
 TreeMenu=Izvēlņu koks
@@ -1474,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ē.
@@ -1504,7 +1524,7 @@ SuppliersCommandModel=Pilnīga veidni no piegādātāja secībā (logo. ..)
 SuppliersInvoiceModel=Pilnīga veidni no piegādātāja rēķina (logo. ..)
 SuppliersInvoiceNumberingModel=Piegādātāju rēķinu numerācijas modeļus
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP MaxMind modulis iestatīšana
+GeoIPMaxmindSetup=GeoIP MaxMind moduļa iestatīšana
 PathToGeoIPMaxmindCountryDataFile=Ceļš uz failu, kas satur MaxMind ip uz valsti tulkojumu. <br> Piemēri: <br> / Usr / local / share / GeoIP / GeoIP.dat <br> / Usr / share / GeoIP / GeoIP.dat
 NoteOnPathLocation=Ņemiet vērā, ka jūsu ip uz valsts datu failā jābūt iekšā direktoriju jūsu PHP var lasīt (uz Jūsu PHP open_basedir iestatīšanu un filesystem atļaujas).
 YouCanDownloadFreeDatFileTo=Jūs varat lejupielādēt <b>bezmaksas demo versiju</b> MaxMind GeoIP valsts failu no %s.
@@ -1531,5 +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=Sort order
 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 5192d1f330b..f6a8e0897fd 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=Notikuma ID
 Actions=Notikumi
 ActionsArea=Pasākumi sadaļa (notikumi un uzdevumi)
-Agenda= Darba kārtība
-Agendas= Darba kārtības
-Calendar= Kalendārs
-Calendars= Kalendāri
-LocalAgenda=Lokālais kalendārs
-AffectedTo= Piešķirts
-DoneBy= Izdarījis
-Events= Notikumi
+Agenda=Darba kārtība
+Agendas=Darba kārtības
+Calendar=Kalendārs
+Calendars=Kalendāri
+LocalAgenda=Iekšējais kalendārs
+ActionsOwnedBy=Event owned by
+AffectedTo=Piešķirts
+DoneBy=Izdarījis
+Event=Notikums
+Events=Notikumi
 EventsNb=Notikumu skaits
 MyEvents=Mani notikumi
 OtherEvents=Citi notikumi
@@ -17,31 +19,33 @@ ListOfActions=Notikumu saraksts
 Location=Atrašanās vieta
 EventOnFullDay=Notikums visu -ām dienu -ām
 SearchAnAction= Meklēt notikumu/uzdevumu
-MenuToDoActions= Visi nepabeigtie pasākumi
-MenuDoneActions= Visi izbeigtie notikumi
-MenuToDoMyActions= Mani nepabeigtie notikumi
-MenuDoneMyActions= Mani izbeigtie notikumi
-ListOfEvents= Dolibarr notikumu saraksts
+MenuToDoActions=Visi nepabeigtie pasākumi
+MenuDoneActions=Visi izbeigtie notikumi
+MenuToDoMyActions=Mani nepabeigtie notikumi
+MenuDoneMyActions=Mani izbeigtie notikumi
+ListOfEvents=Notikumi (iekšējais kalendārs)
 ActionsAskedBy=Notikumu ziņoja
 ActionsToDoBy=Pasākums piešķirts
-ActionsDoneBy=Pasākumi, ko veikušas
+ActionsDoneBy=Pasākumi, ko veikuši
 ActionsForUser=Lietotāja notikumi
 ActionsForUsersGroup=Notikumi visiem grupas lietotājiem
+ActionAssignedTo=Event assigned to
 AllMyActions= Visi mani notikumi/uzdevumi
 AllActions= Visi notikumi/uzdevumi
 ViewList=Saraksta skats
 ViewCal=Mēneša skats
 ViewDay=Dienas skats
 ViewWeek=Nedēļas skats
-ViewPerUser=Pēc lietotāja
-ViewWithPredefinedFilters= Skatīt ar iepriekš filtriem
+ViewPerUser=Per user view
+ViewWithPredefinedFilters= Skatīt ar iepriekš definētiem filtriem
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Sākuma datums
 DateActionEnd= Beigu datums
 AgendaUrlOptions1=Jūs varat pievienot arī šādus parametrus, lai filtrētu produkciju:
 AgendaUrlOptions2=<b>login=%s</b> ierobežot izejas uz darbībām, ko rada, piešķirto vai izdarīt lietotāju <b>%s.</b>
-AgendaUrlOptions3=<b>Logina = %s</b> ierobežot izejas uz darbībām, ko rada lietotāju <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> ierobežot izejas darbībām piešķirto lietotāja <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> ierobežot izejas uz darbībām, ko veic lietotājs <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Rādīt kontaktu dzimšanas dienas
 AgendaHideBirthdayEvents=Slēpt kontaktu dzimšanas dienas
 Busy=Aizņemts
 ExportDataset_event1=Notikumu saraksts
-
+DefaultWorkingDays=Noklusētās darba dienas nedēļā (Piemēram: 1-5, 1-6)
+DefaultWorkingHours=Noklusējuma darba stundas dienā (Piemēram: 9-18)
 # External Sites ical
 ExportCal=Eksportēt kalendāru
 ExtSites=Importēt ārējos kalendārus
-ExtSitesEnableThisTool=Rādīt ārējos kalendārus programmā
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Kalendāru skaits
 AgendaExtNb=Kalendārs nb %s
 ExtSiteUrlAgenda=URL, lai piekļūtu. ICal failam
 ExtSiteNoLabel=Nav Apraksta
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Izveidot notikumu
+MyAvailability=My availability
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 5cdf17d6e48..8a698934629 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -63,7 +63,7 @@ Debts=Parādi
 LabelBankCashAccount=Banka vai naudas nosaukums
 AccountType=Konta veids
 BankType0=Krājkonts
-BankType1=Pašreizējā vai kredītkartes konta
+BankType1=Pašreizējais vai kredītkartes konts
 BankType2=Skaidras naudas konts
 IfBankAccount=Ja bankas konts
 AccountsArea=Kontu sadaļa
@@ -73,16 +73,16 @@ ConfirmDeleteAccount=Vai tiešām vēlaties dzēst šo kontu?
 Account=Konts
 ByCategories=Pēc kategorijām
 ByRubriques=Pēc kategorijām
-BankTransactionByCategories=Bankas darījumi pa kategorijām
-BankTransactionForCategory=Bankas darījumi kategorijas <b>%s</b>
+BankTransactionByCategories=Bankas darījumi pa sadaļām
+BankTransactionForCategory=Bankas darījumi sadaļai <b>%s</b>
 RemoveFromRubrique=Noņemt saiti ar sadaļu
-RemoveFromRubriqueConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījuma un kategorijā?
+RemoveFromRubriqueConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījumu un kategoriju?
 ListBankTransactions=Saraksts ar bankas darījumiem
 IdTransaction=Darījuma ID
 BankTransactions=Banku darījumi
 SearchTransaction=Meklēt darījumu
 ListTransactions=Darījumu saraksts
-ListTransactionsByCategory=Saraksts darījuma / kategorija
+ListTransactionsByCategory=Saraksts darījuma / sadaļa
 TransactionsToConciliate=Darījumi, lai saskaņotu
 Conciliable=Var saskaņot
 Conciliate=Samierināt
@@ -135,9 +135,9 @@ Graph=Grafiks
 ExportDataset_banque_1=Banku darījumi un konta izraksts
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Pārskaitījums uz otru kontu
-TransactionWithOtherAccount=Konta pārsūtīšana
+TransactionWithOtherAccount=Konta pārskaitījumi
 PaymentNumberUpdateSucceeded=Maksājuma numurs atjaunināts veiksmīgi
-PaymentNumberUpdateFailed=Maksājumu skaits nevar atjaunināt
+PaymentNumberUpdateFailed=Maksājumu numuru nevar atjaunināt
 PaymentDateUpdateSucceeded=Maksājuma datums atjaunināt veiksmīgi
 PaymentDateUpdateFailed=Maksājuma datumu nevar atjaunināt
 Transactions=Darījumi
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index a1f20970d8c..bca0426a8b5 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -9,7 +9,7 @@ BillsCustomersUnpaidForCompany=Neapmaksātie klientu rēķini %s
 BillsSuppliersUnpaid=Neapmaksātie piegādātāja -u rēķini
 BillsSuppliersUnpaidForCompany=Neapmaksātie piegādātāja -u rēķini %s
 BillsLate=Kavētie maksājumi
-BillsStatistics=Klienta-u rēķinu statistika
+BillsStatistics=Klientu rēķinu statistika
 BillsStatisticsSuppliers=Piegādātāja-u rēķinu statistika
 DisabledBecauseNotErasable=Bloķēts, jo nedrīkst dzēst
 InvoiceStandard=Standarta rēķins
@@ -25,11 +25,11 @@ InvoiceReplacement=Nomaiņa rēķins
 InvoiceReplacementAsk=Nomaiņa rēķins par rēķinu
 InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>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'.
 InvoiceAvoir=Kredīta piezīme
-InvoiceAvoirAsk=Kredītu piezīmi, lai koriģētu rēķinu
+InvoiceAvoirAsk=Kredīta piezīme, lai koriģētu rēķinu
 InvoiceAvoirDesc=<b>Kredīts piezīme</b> 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
@@ -42,7 +42,7 @@ NotConsumed=Nepatērē
 NoReplacableInvoice=Nav aizvietojamu rēķinu
 NoInvoiceToCorrect=Nav rēķinu kurus jālabo
 InvoiceHasAvoir=Labots ar vienu vai vairākiem rēķiniem
-CardBill=Rēķina karte
+CardBill=Rēķina kartiņa
 PredefinedInvoices=Iepriekš definēti rēķini
 Invoice=Rēķins
 Invoices=Rēķini
@@ -85,8 +85,9 @@ ClassifyPaid=Klasificēt "Apmaksāts"
 ClassifyPaidPartially=Klasificēt 'Apmaksāts daļēji'
 ClassifyCanceled=Klasificēt &quot;Abandoned&quot;
 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
@@ -98,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
@@ -136,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
@@ -152,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 <b>%s</b> uz sagataves statusu?
 ConfirmClassifyPaidBill=Vai esat pārliecināts, ka vēlaties mainīt rēķina <b>%s,</b> statusu uz maksāts?
 ConfirmCancelBill=Vai esat pārliecināts, ka vēlaties atcelt rēķinu <b>%s</b> ?
-ConfirmCancelBillQuestion=Kāpēc jūs vēlaties, lai klasificētu šo rēķinu &quot;pamesta&quot;?
+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 <b>%s</b> 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 <b>(%s %s)</b> 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 <b>(%s %s)</b> 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 <b>(%s %s)</b> 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 <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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ēļ
@@ -181,24 +180,24 @@ AmountOfBillsByMonthHT=Summa rēķini mēnesī (neto pēc nodokļiem)
 ShowSocialContribution=Rādīt sociālās iemaksas
 ShowBill=Rādīt rēķinu
 ShowInvoice=Rādīt rēķinu
-ShowInvoiceReplace=Rādīt aizstājot rēķinu
+ShowInvoiceReplace=Rādīt aizstājošo rēķinu
 ShowInvoiceAvoir=Rādīt kredīta piezīmi
 ShowInvoiceDeposit=Rādīt depozīta rēķinu
 ShowPayment=Rādīt maksājumu
 File=Fails
 AlreadyPaid=Jau samaksāts
 AlreadyPaidBack=Jau atgriezta nauda
-AlreadyPaidNoCreditNotesNoDeposits=Jau izmaksātās (bez kredīta piezīmes un noguldījumu)
+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
 EscompteOffered=Piedāvāto atlaidi (maksājums pirms termiņa)
-SendBillRef=Sūtīt rēķinu %s
-SendReminderBillRef=Nosūtīt rēķina %s (atgādinājumu)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Regulārie maksājumi
 StandingOrder=Regulārais maksājums
 NoDraftBills=Nav rēķinu sagataves
@@ -206,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
@@ -218,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
@@ -267,7 +265,7 @@ ReasonDiscount=Iemesls
 DiscountOfferedBy=Piešķir
 DiscountStillRemaining=Atlaides vēl atlikušas
 DiscountAlreadyCounted=Atlaides jau ir skaitītas
-BillAddress=Bill adrese
+BillAddress=Rēķina adrese
 HelpEscompte=Šī atlaide ir atlaide piešķirta, lai klientam, jo ​​tās maksājums tika veikts pirms termiņa.
 HelpAbandonBadCustomer=Šī summa ir pamests (klients teica, ka slikts klients), un tiek uzskatīts par ārkārtēju zaudēt.
 HelpAbandonOther=Šī summa ir atteikusies, jo tā bija kļūda (nepareizs klients vai rēķins aizstāt ar citiem, piemēram)
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Divām jaunajām atlaidēm jābūt vienāda
 ConfirmRemoveDiscount=Vai tiešām vēlaties noņemt šo atlaidi?
 RelatedBill=Saistītais rēķins
 RelatedBills=Saistītie rēķini
+LatestRelatedBill=Jaunākais sasitītais rēķins
+WarningBillExist=Uzmanību, viens vai vairāki rēķini jau eksistē
 
 # PaymentConditions
 PaymentConditionShortRECEP=Tūlītēja
@@ -308,7 +308,7 @@ PaymentCondition60D=60 dienas
 PaymentConditionShort60DENDMONTH=60 dienas, mēneša beigās
 PaymentCondition60DENDMONTH=60 dienas, mēneša beigās
 PaymentConditionShortPT_DELIVERY=Piegāde
-PaymentConditionPT_DELIVERY=Par piegādi
+PaymentConditionPT_DELIVERY=Pēc piegādes
 PaymentConditionShortPT_ORDER=Pēc pasūtījuma
 PaymentConditionPT_ORDER=Pēc pasūtījuma
 PaymentConditionShortPT_5050=50-50
@@ -319,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
@@ -347,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
@@ -390,7 +390,7 @@ ExpectedToPay=Gaidāmais maksājums
 PayedByThisPayment=Samaksāts ar šo maksājumu
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+AllCompletelyPayedInvoiceWillBeClosed=Visi rēķini, kas ir apmaksāti pilnībā automātiski tiks aizvērti ar statusu "Samaksāts".
 ToMakePayment=Maksāt
 ToMakePaymentBack=Atmaksāt
 ListOfYourUnpaidInvoices=Saraksts ar neapmaksātiem rēķiniem
@@ -407,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/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 907c9a9f58b..48eed47a280 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -63,8 +63,8 @@ ClickToAdd=Klikšķiniet šeit, lai pievienotu.
 NoRecordedCustomers=Nav ierakstīti klienti
 NoRecordedContacts=Nav ierakstītie kontakti
 NoActionsToDo=Nav nevienas darbības ko darīt
-NoRecordedOrders=Nav ierakstīti klienta-u pasūtījumi
-NoRecordedProposals=Nav ierakstītie priekšlikumi
+NoRecordedOrders=Nav klientu pasūtījumu
+NoRecordedProposals=Nav saglabātu priekšlikumu
 NoRecordedInvoices=Nav reģistrētu klientu rēķini
 NoUnpaidCustomerBills=Nav neapmaksātu klienta'u rēķinu
 NoRecordedSupplierInvoices=Bez reģistrētas piegādātāja rēķinus
@@ -73,11 +73,11 @@ NoModifiedSupplierBills=Nav ierakstīti piegādātāja-u rēķini
 NoRecordedProducts=Nav ierakstīti produkti/pakalpojumi
 NoRecordedProspects=Nav ierakstītie perspektīvas
 NoContractedProducts=Nav produktu / pakalpojumu līgumi
-NoRecordedContracts=Nav ierakstītie līgumi
+NoRecordedContracts=Nav saglabātu līgumu
 NoRecordedInterventions=Nav ierakstītie pasākumi
 BoxLatestSupplierOrders=Jaunākie piegādātāja pasūtījumi
 BoxTitleLatestSupplierOrders=%s jaunākie piegādātāju pasūtījumi
-NoSupplierOrder=Nav reģistrēts piegādātājs, lai
+NoSupplierOrder=Nav ierakstītu piegādātāju pasūtījumu
 BoxCustomersInvoicesPerMonth=Klientu rēķini mēnesī
 BoxSuppliersInvoicesPerMonth=Piegādātājs rēķini mēnesī
 BoxCustomersOrdersPerMonth=Klientu pasūtījumi mēnesī
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 6fba1d35f6f..95aa9d16c4c 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorija
-Categories=Kategorijas
-Rubrique=Kategorija
-Rubriques=Kategorijas
-categories=kategorijas
-TheCategorie=Kategorija
+Category=Sadaļa
+Categories=Sadaļas
+Rubrique=Sadaļa
+Rubriques=Sadaļas
+categories=sadaļas
+TheCategorie=Sadaļa
 NoCategoryYet=No category šī radīja veida
 In=Uz
 AddIn=Pievienot
@@ -16,12 +16,12 @@ SuppliersCategoriesArea=Piegādātāju sadaļa
 CustomersCategoriesArea=Klientu sadaļa
 ThirdPartyCategoriesArea=Trešo personu sadaļa
 MembersCategoriesArea=Dalībnieku sadaļa
-ContactsCategoriesArea=Kontakti kategorijas platība
-MainCats=Galvenās kategorijas
+ContactsCategoriesArea=Kontaktu sadaļa
+MainCats=Galvenās sadaļas
 SubCats=Apakšsadaļas
 CatStatistics=Statistika
 CatList=Sadaļu saraksts
-AllCats=Visas kategorijas
+AllCats=Visas sadaļas
 ViewCat=Skatīt sadaļu
 NewCat=Pievienot sadaļu
 NewCategory=Jauna sadaļa
@@ -34,7 +34,7 @@ NoSubCat=Nav apakšsadaļas.
 SubCatOf=Apakšsadaļa
 FoundCats=Atrastās sadaļas
 FoundCatsForName=Sadaļas atrastas ar nosaukumu:
-FoundSubCatsIn=Apakškategorijas atrasts kategorijā
+FoundSubCatsIn=Apakšsadaļas atrastas sadaļā
 ErrSameCatSelected=Izvēlējāties to pašu sadaļu vairākas reizes
 ErrForgotCat=Jūs aizmirsāt izvēlēties sadaļu
 ErrForgotField=Jūs aizmirsāt, lai informētu laukus
@@ -46,9 +46,9 @@ WasAddedSuccessfully=<b>%s</b> tika veiksmīgi pievienots.
 ObjectAlreadyLinkedToCategory=Elements ir jau saistīts ar šo sadaļu.
 CategorySuccessfullyCreated=Šī sadaļa %s ir pievienota veiksmīgi.
 ProductIsInCategories=Produkts / pakalpojums pieder pie šādām kategorijām
-SupplierIsInCategories=Trešai personai pieder pie pēc piegādātājiem kategorijas
+SupplierIsInCategories=Trešai personai pieder sekojoša piegādātāju sadaļas
 CompanyIsInCustomersCategories=Šī trešā persona pieder pie šādiem klientiem / perspektīvas kategorijām
-CompanyIsInSuppliersCategories=Šī trešā persona pieder, lai pēc piegādātājiem kategorijas
+CompanyIsInSuppliersCategories=Šī trešā persona pieder, lai pēc piegādātājiem sadaļas
 MemberIsInCategories=Šis dalībnieks ir šādās dalībnieku sadaļās
 ContactIsInCategories=Šī kontaktpersona pieder pie šādiem kontaktiem kategorijām
 ProductHasNoCategory=Šis produkts/pakalpojums nav nevienā sadaļā
@@ -65,24 +65,24 @@ 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
-ProductsCategoryShort=Produktu kategorija
+ProductsCategoryShort=Produktu sadaļa
 MembersCategoryShort=Dalībnieku sadaļa
 SuppliersCategoriesShort=Piegādātāju sdaļas
 CustomersCategoriesShort=Klientu sadaļas
-CustomersProspectsCategoriesShort=Custo / prosp.. kategorijas
+CustomersProspectsCategoriesShort=Custo / prosp. sadaļas
 ProductsCategoriesShort=Produktu sadaļas
 MembersCategoriesShort=Dalībnieku sadaļas
-ContactCategoriesShort=Kontakti kategorijas
-ThisCategoryHasNoProduct=Šī kategorija nesatur produktu.
+ContactCategoriesShort=Kontaktu sadaļas
+ThisCategoryHasNoProduct=Šī sadaļā nav produktu.
 ThisCategoryHasNoSupplier=Šajā sadaļā nav neviena piegādātāja.
 ThisCategoryHasNoCustomer=Šī sadaļa nesatur klientu.
 ThisCategoryHasNoMember=Šajā sadaļaā nav neviena dalībnieka.
@@ -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
@@ -111,3 +108,5 @@ ExtraFieldsCategories=Complementary attributes
 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=Show category
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 66578e97d99..efb066851ea 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -240,7 +240,7 @@ VATIntraSyntaxIsValid=Sintakse ir pareiza
 VATIntraValueIsValid=Vērtība ir pareizas
 ProspectCustomer=Prospect / Klients
 Prospect=Perspektīva
-CustomerCard=Klienta karte
+CustomerCard=Klienta kartiņa
 Customer=Klients
 CustomerDiscount=Klienta Atlaide
 CustomerRelativeDiscount=Relatīvā klienta atlaide
@@ -339,7 +339,7 @@ PL_HIGH=Augsts
 TE_UNKNOWN=-
 TE_STARTUP=Starta
 TE_GROUP=Liels uzņēmums
-TE_MEDIUM=Vidēja uzņēmums
+TE_MEDIUM=Vidējs uzņēmums
 TE_ADMIN=Valsts iestāde
 TE_SMALL=Mazs uzņēmums
 TE_RETAIL=Mazumtirgotājs
@@ -382,7 +382,7 @@ NewDeliveryAddress=Jauna piegādes adrese
 AddDeliveryAddress=Pievienot adresi
 AddAddress=Pievienot adresi
 NoOtherDeliveryAddress=Nav definēta alternatīva piegādes adrese
-SupplierCategory=Piegādātāja kategorija
+SupplierCategory=Piegādātāja sadaļa
 JuridicalStatus200=Neatkarīgs
 DeleteFile=Izdzēst failu
 ConfirmDeleteFile=Vai jūs tiešām vēlaties izdzēst šo failu?
@@ -397,10 +397,10 @@ YouMustCreateContactFirst=Jums ir izveidot e-pastus kontaktus trešās puses vis
 ListSuppliersShort=Piegādātāju saraksts
 ListProspectsShort=Saraksts perspektīvas
 ListCustomersShort=Klientu saraksts
-ThirdPartiesArea=Trešo personu sadaļa
-LastModifiedThirdParties=Pēdējās %s modificētāss trešās personas
+ThirdPartiesArea=Third parties and contact area
+LastModifiedThirdParties=Pēdējās %s labotās trešās personas
 UniqueThirdParties=Kopējās unikālās trešās personas
-InActivity=Atvērt
+InActivity=Atvērts
 ActivityCeased=Slēgts
 ActivityStateFilter=Aktivitātes statuss
 ProductsIntoElements=Preču saraksts %s
@@ -410,3 +410,5 @@ OutstandingBillReached=Sasniedza maks. par izcilu rēķinu
 MonkeyNumRefModelDesc=Atgriešanās Numero ar formātu %syymm-NNNN par klientu kodu un %syymm-NNNN forsupplier kodu, kur gg ir gads, MM ir mēnesis, un nnnn ir secība bez pārtraukuma un bez atgriezties 0.
 LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) 
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index fcb2cd6b575..51818210e66 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
 Accountancy=Grāmatvedība
-AccountancyCard=Grāmatvedība karte
+AccountancyCard=Grāmatvedības kartiņa
 Treasury=Valsts kase
 MenuFinancial=Finansu
 TaxModuleSetupToModifyRules=Iet uz <a href="%s">Nodokļi moduļa uzstādīšanas</a> mainīt aprēķināšanas noteikumus
@@ -106,8 +106,9 @@ ByUserAuthorOfInvoice=Ar rēķinu autors
 AccountancyExport=Grāmatvedība eksports
 ErrorWrongAccountancyCodeForCompany=Bad klienta grāmatvedības kodu %s
 SuppliersProductsSellSalesTurnover=Radītais apgrozījums, ko no piegādātāja produkcijas pārdošanas.
-CheckReceipt=Pārbaudiet depozītu
+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
@@ -161,7 +162,7 @@ RulesVATDueProducts=- Par materiālo vērtību, tas ietver PVN rēķinus, pamato
 OptionVatInfoModuleComptabilite=Piezīme: materiālo aktīvu, tai vajadzētu izmantot dzemdību datumu ir vairāk godīgi.
 PercentOfInvoice=%%/Rēķins
 NotUsedForGoods=Nav izmantots precēm
-ProposalStats=Statistika par priekšlikumiem
+ProposalStats=Priekšlikumu statistika
 OrderStats=Pastūtījumu statistika
 InvoiceStats=Rēķinu statistika
 Dispatch=Nosūtīšana
@@ -187,7 +188,7 @@ AccountancyDashboard=Grāmatvedība kopsavilkums
 ByProductsAndServices=Ar precēm un pakalpojumiem
 RefExt=Ārējā ref
 ToCreateAPredefinedInvoice=Lai izveidotu iepriekš rēķinu, izveidot standarta rēķinu, tad, bez apstiprinot to, noklikšķiniet uz pogas &quot;Konvertēt uz iepriekš rēķinu&quot;.
-LinkedOrder=linked to order
+LinkedOrder=Link to order
 ReCalculate=Pārrēķināt
 Mode1=Metode 1
 Mode2=Metode 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=no piegādātāja, izvēlēties piemērotu metodi pi
 TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot <b>skaidras naudas uzskaites</b> režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto <b>saderināšanās grāmatvedības</b> režīmu (skat. iestatīšanu grāmatvedības moduli).
 CalculationMode=Aprēķinu režīms
 AccountancyJournal=Kontu žurnāls
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Grāmatvedība kods pēc noklusējuma klientu thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Grāmatvedība kods pēc noklusējuma piegādātāja thirdparties
+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
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index 8a77b2f5e62..47372bde2af 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -1,20 +1,20 @@
 # 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īgums karte
+ContractCard=Līguma kartiņa
 ContractStatus=Līgums statuss
 ContractStatusNotRunning=Nedarbojas
 ContractStatusRunning=Darbojas
 ContractStatusDraft=Projekts
-ContractStatusValidated=Validēta
+ContractStatusValidated=Apstiprināts
 ContractStatusClosed=Slēgts
 ServiceStatusInitial=Nedarbojas
-ServiceStatusRunning=Ekspluatācijas
-ServiceStatusNotLate=Skriešana, nav beidzies
+ServiceStatusRunning=Darbojas
+ServiceStatusNotLate=Darbojas, nav beidzies
 ServiceStatusNotLateShort=Nav beidzies
-ServiceStatusLate=Skriešana, beidzās
+ServiceStatusLate=Darbojas, beidzies
 ServiceStatusLateShort=Beidzies
 ServiceStatusClosed=Slēgts
 ServicesLegend=Pakalpojumu apraksts
@@ -23,11 +23,11 @@ Contract=Līgums
 NoContracts=Nav līgumi
 MenuServices=Pakalpojumi
 MenuInactiveServices=Pakalpojumi, kas nav aktīvi
-MenuRunningServices=Running pakalpojumi
+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=Last %s contracts
 LastActivatedServices=Pēdējais %s aktivizētais pakalpojums
 LastModifiedServices=Pēdējais %s labotais pakalpojums
 EditServiceLine=Edit servisa līnija
@@ -67,7 +67,7 @@ DateStartReal=Real sākuma datums
 DateStartRealShort=Real sākuma datums
 DateEndReal=Real beigu datums
 DateEndRealShort=Real beigu datums
-NbOfServices=Nb pakalpojumu
+NbOfServices=Pakalpojumu skaits
 CloseService=Aizvērt pakalpojumu
 ServicesNomberShort=%s pakalpojums(-i)
 RunningServices=Darbojošies pakalpojumi
@@ -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 68586a09cfb..fdbba9abcff 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -17,15 +17,14 @@ FileToLaunchCronJobs=Komandrindas uzsākt cron darbavietas
 CronExplainHowToRunUnix=Par Unix vidē, jums vajadzētu izmantot crontab palaist komandrindas viena otras minūtes
 CronExplainHowToRunWin=Microsoft (tm), Windows environement jūs varat izmantot regulāro uzdevums rīkus, lai palaistu komandrindas viena otras minūtes
 # Menu
-CronJobs=Plānotais darba vietas
-CronListActive= Aktīvo darbu saraksts
-CronListInactive= Saraksts ar invaliditāti darba vietas
-CronListActive= Aktīvo darbu saraksts
+CronJobs=Plānotie darbi
+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
@@ -45,7 +44,7 @@ CronClass=Klase
 CronMethod=Metode
 CronModule=Modulis
 CronAction=Darbība
-CronStatus=Status
+CronStatus=Statuss
 CronStatusActive=Ieslēgts
 CronStatusInactive=Bloķēts
 CronNoJobs=Nav reģistrētu darbu
@@ -53,10 +52,10 @@ CronPriority=Prioritāte
 CronLabel=Apraksts
 CronNbRun=Nb. sākt
 CronEach=Katru
-JobFinished=Darba uzsākta un pabeigta
+JobFinished=Darbs uzsākts un pabeigts
 #Page card
 CronAdd= Pievienot darbu
-CronHourStart= Starta laiks un uzdevuma datumu
+CronHourStart= Starta laiks un uzdevuma datums
 CronEvery= Un izpildīt uzdevumu katrā
 CronObject= Instances / Object, lai radītu
 CronArgs=Parametri
diff --git a/htdocs/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang
index 20d22986f1d..c42f8b91f05 100644
--- a/htdocs/langs/lv_LV/dict.lang
+++ b/htdocs/langs/lv_LV/dict.lang
@@ -290,15 +290,17 @@ CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=KZP franki
 CurrencySingXPF=CFP Franc
 CurrencyCentSingEUR=cents
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=tūkstošais
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internets
-DemandReasonTypeSRC_CAMP_MAIL=Pasta kampaņu
-DemandReasonTypeSRC_CAMP_EMAIL=Pasta vēstuļu sūtīšanas kampaņu
+DemandReasonTypeSRC_CAMP_MAIL=Pasta kampaņa
+DemandReasonTypeSRC_CAMP_EMAIL=E-pasta vēstuļu sūtīšanas kampaņa
 DemandReasonTypeSRC_CAMP_PHO=Tālruņa kampaņa
 DemandReasonTypeSRC_CAMP_FAX=Faksa kampaņa
-DemandReasonTypeSRC_COMM=Commercial kontakts
-DemandReasonTypeSRC_SHOP=Veikals kontakts
+DemandReasonTypeSRC_COMM=Komerciālais kontakts
+DemandReasonTypeSRC_SHOP=Veikala kontakts
 DemandReasonTypeSRC_WOM=No mutes mutē
 DemandReasonTypeSRC_PARTNER=Partneris
 DemandReasonTypeSRC_EMPLOYEE=Darbinieks
diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang
index 8b15c7b5fc6..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
@@ -15,18 +15,24 @@ DonationsReceived=Ziedojumi saņemti
 PublicDonation=Sabiedrības ziedojums
 DonationsNumber=Ziedojuma numurs
 DonationsArea=Ziedojumu sadaļa
-DonationStatusPromiseNotValidated=Projekts solījumu
+DonationStatusPromiseNotValidated=Sagataves solījums
 DonationStatusPromiseValidated=Apstiprinātas solījumu
-DonationStatusPaid=Ziedojums saņemti
+DonationStatusPaid=Ziedojums saņemts
 DonationStatusPromiseNotValidatedShort=Melnraksts
-DonationStatusPromiseValidatedShort=Validēta
+DonationStatusPromiseValidatedShort=Apstiprināts
 DonationStatusPaidShort=Saņemti
 ValidPromess=Apstiprināt solījumu
-DonationReceipt=Ziedojums saņemšana
-BuildDonationReceipt=Veidot saņemšanu
+DonationReceipt=Ziedojuma kvīts
+BuildDonationReceipt=Veidot kvīti
 DonationsModels=Dokumenti modeļi ziedojumu ieņēmumiem
 LastModifiedDonations=Pēdējie %s labotie ziedojumi
 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
+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/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index ec8036bb5fc..569a9cb69d3 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -8,7 +8,7 @@ DocsContracts=Līgumu dokumenti
 DocsProposals=Dokumenti priekšlikumi
 DocsOrders=Dokumenti pasūtījumi
 DocsInvoices=Dokumenti rēķini
-ECMNbOfDocs=Nb Dokumentu katalogs
+ECMNbOfDocs=Dokumentu skaits sadaļā
 ECMNbOfDocsSmall=Nb doc.
 ECMSection=Katalogs
 ECMSectionManual=Manuālā sadaļa
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index c65bd32673f..257f6ce5e0e 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -22,7 +22,7 @@ ErrorFailedToDeleteJoinedFiles=Nevar izdzēst vide, jo tur ir daži pievienojās
 ErrorThisContactIsAlreadyDefinedAsThisType=Šī kontaktpersona jau ir definēts kā kontaktpersona šāda veida.
 ErrorCashAccountAcceptsOnlyCashMoney=Šis bankas konts ir naudas konts, lai tā pieņem maksājumus no veida tikai skaidrā naudā.
 ErrorFromToAccountsMustDiffers=Avots un mērķiem banku kontiem jābūt atšķirīgai.
-ErrorBadThirdPartyName=Slikti vērtība trešo personu vārda
+ErrorBadThirdPartyName=Nepareiza vērtība trešo personu nosaukumā
 ErrorProdIdIsMandatory=%s ir obligāti
 ErrorBadCustomerCodeSyntax=Nepareiza klienta koda sintakse
 ErrorBadBarCodeSyntax=Nepareiza sintakse svītrukodam
@@ -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
@@ -59,7 +59,7 @@ ErrorNoTmpDir=Pagaidu direktorija %s neeksistē.
 ErrorUploadBlockedByAddon=Augšupielāde bloķēja ar PHP/Apache spraudni.
 ErrorFileSizeTooLarge=Faila izmērs ir pārāk liels.
 ErrorSizeTooLongForIntType=Izmērs ir pārāk garš int tipam (%s cipari maksimums)
-ErrorSizeTooLongForVarcharType=Izmērs ir pārāk ilgi stīgu tipu (%s simboli maksimums)
+ErrorSizeTooLongForVarcharType=Izmērs ir pārāk garš (%s simboli maksimums)
 ErrorNoValueForSelectType=Lūdzu izvēlieties vērtību no saraksta
 ErrorNoValueForCheckBoxType=Lūdzu, aizpildiet vērtību rūtiņu sarakstā
 ErrorNoValueForRadioType=Lūdzu, aizpildiet vērtību radio pogu sarakstā
@@ -77,8 +77,8 @@ ErrorRecordHasChildren=Neizdevās dzēst ierakstus, jo tas ir daži Childs.
 ErrorRecordIsUsedCantDelete=Nevar izdzēst ierakstu. Tas ir pievienots citam objektam.
 ErrorModuleRequireJavascript=Javascript nedrīkst tikt izslēgti, ka šī funkcija strādā. Lai aktivizētu / deaktivizētu Javascript, dodieties uz izvēlni Home-&gt; Setup-&gt; Display.
 ErrorPasswordsMustMatch=Abām ievadītām parolēm jāsakrīt
-ErrorContactEMail=Tehniska kļūda. Lūdzu, sazinieties ar administratoru, lai pēc e-pasta <b>%s</b> en sniegt kļūdas kods <b>%s</b> jūsu ziņu, vai pat labāk, pievienojot ekrāna kopiju šajā lapā.
-ErrorWrongValueForField=Nepareiza vērtība lauka numuru <b>%s</b> (vērtība <b>&quot;%s&quot;</b> nesakrīt regex noteikums <b>%s)</b>
+ErrorContactEMail=Tehniska kļūda. Lūdzu, sazinieties ar administratoru pa sekojošu e-pastu <b>%s</b>, lai iesniegtu kļūdas kodu <b>%s</b> jūsu ziņojumā, vai labāk, pievienojot šīs lapas ekrāna.
+ErrorWrongValueForField=Nepareiza vērtība lauka numuru <b>%s</b> (vērtība '<b>%s</b>' nesakrīt regex noteikums <b>%s</b>)
 ErrorFieldValueNotIn=Nepareiza vērtība lauka numura <b>%s</b> (vērtība <b>&quot;%s&quot;</b> nav vērtība, pieejams uz lauka <b>%s</b> galda <b>%s)</b>
 ErrorFieldRefNotIn=Nepareiza vērtība lauka numuru <b>%s</b> (vērtība <b>&quot;%s&quot;</b> nav <b>%s</b> esošo ref)
 ErrorsOnXLines=Kļūdas <b>%s</b> avota ierakstu (-s)
@@ -92,20 +92,20 @@ ErrorBadMask=Kļūda masku
 ErrorBadMaskFailedToLocatePosOfSequence=Kļūda, maska ​​bez kārtas numuru
 ErrorBadMaskBadRazMonth=Kļūdas, slikta reset vērtība
 ErrorSelectAtLeastOne=Kļūda. Izvēlieties vismaz vienu ierakstu.
-ErrorProductWithRefNotExist=Preces ar norādi <i>&quot;%s&quot;</i> neeksistē
+ErrorProductWithRefNotExist=Preces ar atsauci '<i>%s</i>' neeksistē
 ErrorDeleteNotPossibleLineIsConsolidated=Izdzēst nav iespējams, jo ieraksts ir saistīts ar bankas darījumu summa, kas tiek conciliated
 ErrorProdIdAlreadyExist=%s piešķirta citai trešajai
 ErrorFailedToSendPassword=Neizdevās nosūtīt paroli
 ErrorFailedToLoadRSSFile=Nespēj iegūt RSS barotni. Centieties, lai pievienotu pastāvīgu MAIN_SIMPLEXMLLOAD_DEBUG ja kļūdu ziņojumi nesniedz pietiekamu informāciju.
 ErrorPasswordDiffers=Paroles atšķiras, lūdzu, ierakstiet tās atkal.
 ErrorForbidden=Pieeja liegta. <br> Jūs mēģināt piekļūt lapu, zonā vai funkciju nenonākot norakstu sesijā vai, kas nav atļauts jūsu lietotāja.
-ErrorForbidden2=Atļauja šajā saitā var definēt ar savu Dolibarr administrators no izvēlnes %s-&gt; %s.
+ErrorForbidden2=Atļaujas šajā lapā var definēt Dolibarr administrators no izvēlnes %s->%s.
 ErrorForbidden3=Šķiet, ka Dolibarr netiek izmantota, izmantojot autentiskums sesiju. Ieskatieties Dolibarr uzstādīšanas dokumentācijas zināt, kā pārvaldīt apstiprinājumi (Htaccess, mod_auth vai citu ...).
 ErrorNoImagickReadimage=Klases Imagick nav atrodams šajā PHP. Priekšskatījums nav, var būt pieejamas. Administratori var atspējot šo uzlīmi no izvēlnes Setup - displejs.
 ErrorRecordAlreadyExists=Ieraksts jau eksistē
 ErrorCantReadFile=Neizdevās nolasīt failu '%s'
 ErrorCantReadDir=Neizdevās nolasīt katalogu '%s'
-ErrorFailedToFindEntity=Neizdevās nolasīt Vide '%s'
+ErrorFailedToFindEntity=Neizdevās nolasīt vidi '%s'
 ErrorBadLoginPassword=Nepareiza vērtība lietotājvārdam vai parolei
 ErrorLoginDisabled=Jūsu konts ir bloķēts
 ErrorFailedToRunExternalCommand=Neizdevās palaist ārēju komandu. Pārbaudiet, tas ir pieejams, un skrienams ar savu PHP servera. Ja PHP <b>Safe Mode</b> ir iespējots, pārbaudiet, vai komanda ir iekšā direktorijā noteiktajā parametru <b>safe_mode_exec_dir.</b>
@@ -114,11 +114,12 @@ ErrorLoginDoesNotExists=Lietotājs ar pieteikšanās <b>%s</b> 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 <b>%s</b> izmantot, lai veiktu web serveri nav atļauja, kas
 ErrorNoActivatedBarcode=Nav svītrkodu veids aktivizēts
 ErrUnzipFails=Neizdevās atarhivēt %s izmantojot ZipArchive
 ErrNoZipEngine=Nav dzinēja unzip %s failu šajā PHP
-ErrorFileMustBeADolibarrPackage=Failu %s jābūt Dolibarr zip paketi
+ErrorFileMustBeADolibarrPackage=Failam %s jābūt Dolibarr zip
 ErrorFileRequired=Tas aizņem paketi Dolibarr failu
 ErrorPhpCurlNotInstalled=PHP CURL nav uzstādīts, tas ir svarīgi runāt ar Paypal
 ErrorFailedToAddToMailmanList=Neizdevās pievienot ierakstu %s, lai pastnieks saraksta %s vai SPIP bāze
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Kļūda, jūsu PHP ir jābūt moduli <b>%s</b> uzstādītas,
 ErrorOpenIDSetupNotComplete=Jūs uzstādīšana Dolibarr config failu, lai ļautu OpenID autentifikācijas, bet OpenID pakalpojuma URL nav definēts spēkā salīdzināmajās %s
 ErrorWarehouseMustDiffers=Avota un mērķa noliktavas jābūt atšķiras
 ErrorBadFormat=Nepareizs formāts
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Obligātie uzstādīšanas parametri vēl nav definētas
@@ -154,3 +174,5 @@ WarningUsingThisBoxSlowDown=Uzmanību, izmantojot šo lodziņu palēnināt nopie
 WarningClickToDialUserSetupNotComplete=Iestatīšana ClickToDial informāciju par jūsu lietotāja nav pilnīga (skat. tab ClickToDial uz jūsu lietotāja kartes).
 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=Par daudz datu, lūdzu izmantojiet vairāk filtru 
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index d8a686cbb31..337f2aa5f39 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -18,8 +18,8 @@ ExportableFields=Eksportējami lauki
 ExportedFields=Eksportēti lauki
 ImportModelName=Importēšanas profila nosaukums
 ImportModelSaved=Importēšanas profils saglabāts ar nosaukumu <b>%s</b>.
-ImportableFields=Importēt lauki
-ImportedFields=Importētās lauki
+ImportableFields=Importējamie lauki
+ImportedFields=Importētie lauki
 DatasetToExport=Datu kopa eksportēt
 DatasetToImport=Importēt failu datu kopas
 NoDiscardedFields=Nav avota failā lauki tiek atmesti
@@ -29,11 +29,11 @@ FieldsOrder=Lauku secība
 FieldsTitle=Lauku nosaukums
 FieldOrder=Lauku kārtība
 FieldTitle=Lauka nosaukums
-ChooseExportFormat=Izvēlieties eksporta formātu
+ChooseExportFormat=Izvēlieties eksportēšanas formātu
 NowClickToGenerateToBuildExportFile=Tagad izvēlieties faila formātu Combo lodziņā un noklikšķiniet uz &quot;Izveidot&quot;, lai izveidotu eksporta failu ...
 AvailableFormats=Pieejamie formāti
 LibraryShort=Bibliotēka
-LibraryUsed=Bibliotēkas izmanto,
+LibraryUsed=Izmantotā bibliotēka
 LibraryVersion=Versija
 Step=Solis
 FormatedImport=Importēšanas palīgs
@@ -49,7 +49,7 @@ FileSuccessfullyBuilt=Eksporta fails izveidots
 SQLUsedForExport=SQL Pieprasījums izmanto, lai veidotu eksporta failu
 LineId=Līnijas id
 LineDescription=Līnijas apraksts
-LineUnitPrice=Vienības cena līnijas
+LineUnitPrice=Vienības cenas līnija
 LineVATRate=PVN likme līnijas
 LineQty=Daudzums līnijas
 LineTotalHT=Summa bez nodokļiem līnijas
@@ -81,9 +81,9 @@ DoNotImportFirstLine=Neimportēt pirmo rindiņu no avota faila
 NbOfSourceLines=Līniju skaits avota failā
 NowClickToTestTheImport=Pārbaudiet importa rādītājus esat definējis. Ja tie ir pareizi, noklikšķiniet uz pogas <b>&quot;%s&quot;,</b> lai palaistu simulāciju importa process (dati tiks mainīti jūsu datu bāzē, tas ir tikai simulācija uz brīdi) ...
 RunSimulateImportFile=Uzsākt importa simulāciju
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=Šim laukam nepieciešami dati no avota faila
 SomeMandatoryFieldHaveNoSource=Daži obligātie lauki nav avotu, no datu faila
-InformationOnSourceFile=Informācija par avota failā
+InformationOnSourceFile=Informācija avota failā
 InformationOnTargetTables=Informācija par mērķa laukiem
 SelectAtLeastOneField=Pārslēgt vismaz vienu avota lauku slejā jomās eksportēt
 SelectFormat=Izvēlieties šo importa failu formātu
@@ -125,7 +125,7 @@ BankAccountNumber=Konta numurs
 BankAccountNumberKey=Taustiņš
 SpecialCode=Speciāls kods
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=Ja jūs vēlaties filtrēt dažas vērtības, vienkārši ievadi vērtības šeit.
diff --git a/htdocs/langs/lv_LV/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang
index 2c84feb75bb..55591b840fa 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=My menu entry
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index e4ac91f36d2..358ca95141d 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=CRV
-Holidays=Brīvdienas
-CPTitreMenu=Brīvdienas
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Ikmēneša paziņojums
-MenuAddCP=Pieteikties brīvdienām
-NotActiveModCP=Jums ir jābūt ieslēgtam modulim brīvdienas, lai apskatītu šo lapu.
-NotConfigModCP=Jums ir konfigurēt modulis brīvdienas, lai apskatītu šo lapu. Lai to izdarītu, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">noklikšķiniet šeit</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
-NoCPforUser=Jums nav pieprasījumu pēc brīvdienām.
-AddCP=Pieteikties brīvdienām
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=Jums nav nevienas brīvas dienas
+AddCP=Make a leave request
 Employe=Darbinieks
 DateDebCP=Sākuma datums
 DateFinCP=Beigu datums
@@ -18,24 +18,24 @@ ApprovedCP=Apstiprināts
 CancelCP=Atcelts
 RefuseCP=Atteikts
 ValidatorCP=Approbator
-ListeCP=Brīvdienu saraksts
+ListeCP=List of leaves
 ReviewedByCP=Būs jāpārskata
 DescCP=Apraksts
-SendRequestCP=Radot pieprasījumu pēc brīvdienām
-DelayToRequestCP=Pieteikumi par brīvdienām jāveic vismaz <b>%s diena (s)</b> pirms viņiem.
-MenuConfCP=Labot līdzsvaru brīvdienas
-UpdateAllCP=Atjaunot brīvdienas
-SoldeCPUser=Brīvdienu bilance ir <b>%s</b> dienas.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Jums ir jāizvēlas beigu datumu lielāks nekā sākuma datuma.
 ErrorSQLCreateCP=SQL kļūda izveides laikā:
-ErrorIDFicheCP=Kļūda, brīvdienām pieprasījums neeksistē.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Atgriezties uz iepriekšējo lappusi
-ErrorUserViewCP=Jums nav atļauts lasīt šo pieprasījumu brīvdienas.
-InfosCP=Informāciju par pieprasījuma brīvdienas
-InfosWorkflowCP=Informācijas Workflow
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
+InfosWorkflowCP=Informācijas plūsma
 RequestByCP=Pieprasījis
-TitreRequestCP=Loksne brīvdienas
-NbUseDaysCP=Dienu skaits patērēto brīvdienās
+TitreRequestCP=Leave request
+NbUseDaysCP=Patērēto atvaļinājuma dienu skaits
 EditCP=Rediģēt
 DeleteCP=Dzēst
 ActionValidCP=Apstiprināt
@@ -43,26 +43,25 @@ ActionRefuseCP=Atteikt
 ActionCancelCP=Atcelt
 StatutCP=Statuss
 SendToValidationCP=Sūtīt uz apstiprināšanu
-TitleDeleteCP=Dzēst lūgumu brīvdienas
-ConfirmDeleteCP=Apstiprinātu dzēšanu šā pieprasījuma brīvdienās?
-ErrorCantDeleteCP=Kļūda jums nav tiesības dzēst šo svētku pieprasījumu.
-CantCreateCP=Jums nav tiesību pretendēt uz brīvdienām.
-InvalidValidatorCP=Jums ir jāizvēlas approbator jūsu brīvdienu pieprasījumu.
-UpdateButtonCP=Atjaunināt
-CantUpdate=Jūs nevarat atjaunināt šo lūgumu brīvdienas.
+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.
+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
-ConfirmValidCP=Vai jūs tiešām vēlaties 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=Nosūtīt brīvdienu pieprasījumu
-ConfirmToValidCP=Vai jūs tiešām vēlaties nosūtīt brīvdienu pieprasījumu?
-TitleRefuseCP=Noraidīt brīvdienu pieprasījumu
-ConfirmRefuseCP=Vai tiešām vēlaties atteikties no brīvdienu pieprasīšanas?
+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=Jums ir jāizvēlas iemesls kāpēc atteikt pieprasījums.
-TitleCancelCP=Atcelt brīvdienu pieprasījumu
-ConfirmCancelCP=Vai esat pārliecināts, ka vēlaties 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
 DateCancelCP=Atcelšanas datums
@@ -72,42 +71,42 @@ MotifCP=Iemesls
 UserCP=Lietotājs
 ErrorAddEventToUserCP=Kļūda, pievienojot ārkārtas atvaļinājumu.
 AddEventToUserOkCP=Par ārkārtas atvaļinājumu papildinājums ir pabeigta.
-MenuLogCP=Skatīt žurnālus brīvdienas
-LogCP=Pieteikties par jaunumiem no brīvdienām
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Pirmā brīvdienu diena
-LastDayOfHoliday=Pēdējā brīvdienu diena
+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=Brīvdienas atcelšanas
+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=Grupa ar spēju apstiprināt brīvdienas
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Apstiprināt konfigurāciju
-LastUpdateCP=Pēdējo reizi atjaunots automātiski no brīvdienām
+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, <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">klikšķinot šeit</a> .
-DelayForSubmitCP=Termiņš, lai pieteiktos brīvdienām
-AlertapprobatortorDelayCP=Novērst approbator ja brīvdienu pieprasījums neatbilst termiņu
-AlertValidatorDelayCP=Préevent ar approbator ja brīvdienu pieprasījums pārsniedz kavēšanos
-AlertValidorSoldeCP=Novērst approbator ja brīvdienu pieprasījums pārsniedz līdzsvaru
-nbUserCP=Lietotāju skaits atbalstīta moduļa brīvdienās
-nbHolidayDeductedCP=Brīvdienu skaits, kas jāatskaita katru dienu veikti brīvdienās
-nbHolidayEveryMonthCP=Brīvdienu skaits pievienoti katru mēnesi
-Module27130Name= Brīvdienu vadība
-Module27130Desc= Vadība brīvdienas
-TitleOptionMainCP=Galvenie uzstādījumi brīvdienas
-TitleOptionEventCP=Uzstādījumi brīvdienas ir saistīts ar notikumiem
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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=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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Apstiprināt
 UpdateEventCP=Atjaunināt notikumus
 CreateEventCP=Izveidot
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Atjaunot
 ErrorMailNotSend=Kļūda sūtot e-pastu:
 NoCPforMonth=Nē atstāt šo mēnesi.
 nbJours=Dienu skaits
-TitleAdminCP=Brīvdienu konfigurācija
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Sveiki
-HolidaysToValidate=Apstiprināt brīvdienas
-HolidaysToValidateBody=Zemāk ir brīvdienas, lai izvērtētu pieprasījumu
-HolidaysToValidateDelay=Šis brīvdienām pieprasījums notiks laika posmā, kas ir mazāks nekā %s dienām.
-HolidaysToValidateAlertSolde=Lietotājs, kas padarīja šo pieprasījumu brīvdienas nav pietiekami daudz brīvas dienas.
-HolidaysValidated=Apstiprinātas brīvdienas
-HolidaysValidatedBody=Jūsu pieprasījums brīvdienās %s uz %s ir apstiprināta.
-HolidaysRefused=Liegtas brīvdienas
-HolidaysRefusedBody=Jūsu pieprasījums brīvdienās %s uz %s ir liegta šādu iemeslu dēļ:
-HolidaysCanceled=Atceltās brīvdienas
-HolidaysCanceledBody=Jūsu pieprasījums brīvdienās %s uz %s ir atcelts.
-Permission20000=Apskatīt savas brīvdienas
-Permission20001=Izveidot/labot brīvdienas
-Permission20002=Izveidot/labot brīvdienas visiem
-Permission20003=Dzēst brīvdienu pieprasījumus
-Permission20004=Iestatīt lietotāju brīvdienas
-Permission20005=Pārskatīt žurnālu modificētu brīvdienas
-Permission20006=Skatīt brīvdienu mēnešu atskaites
+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=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.
+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
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 414164f9556..58646a1e012 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -73,11 +73,11 @@ DatabaseConnection=Datubāzes savienojums
 DatabaseCreation=Datubāzes izveide
 UserCreation=Lietotāja izveidošana
 CreateDatabaseObjects=Datu bāzes objektu izveide
-ReferenceDataLoading=Atsauces dati iekraušana
+ReferenceDataLoading=Atsauces datu ielāde
 TablesAndPrimaryKeysCreation=Tabulu un primāro atslēgu veidošana
 CreateTableAndPrimaryKey=Izveidot tabulu %s
 CreateOtherKeysForTable=Izveidot ārvalstu atslēgas un indeksi attiecībā uz galda %s
-OtherKeysCreation=Ārvalstu atslēgas un indeksi radīšana
+OtherKeysCreation=Atslēgu un indeksu veidošana
 FunctionsCreation=Funkcijas izveide
 AdminAccountCreation=Administrator pieteikšanās izveide
 PleaseTypePassword=Lūdzu, ievadiet paroli, tukšas paroles ir aizliegtas!
@@ -86,7 +86,7 @@ PasswordsMismatch=Paroles atšķiras, lūdzu, mēģiniet vēlreiz!
 SetupEnd=Beigas iestatīšanas
 SystemIsInstalled=Instalācija ir pabeigta.
 SystemIsUpgraded=Dolibarr ir atjaunota veiksmīgi.
-YouNeedToPersonalizeSetup=Jums ir nepieciešams, lai konfigurētu Dolibarr, lai atbilstu jūsu vajadzībām (izskats, funkcijas, ...). Lai to izdarītu, lūdzu, sekojiet saitei zemāk:
+YouNeedToPersonalizeSetup=Jums ir nepieciešams konfigurēt Dolibarr, lai atbilstu Jūsu vajadzībām (izskats, funkcijas, ...). Lai to izdarītu, lūdzu, sekojiet saitei zemāk:
 AdminLoginCreatedSuccessfuly=Dolibarr Administratora lietotāja vārds '<b>%s</b>' izveidots veiksmīgi.
 GoToDolibarr=Iet uz Dolibarr
 GoToSetupArea=Iet uz Dolibarr (iestatīšanas apgabalu)
@@ -96,9 +96,9 @@ Examples=Piemēri
 WithNoSlashAtTheEnd=Bez slīpsvītras "/" beigās
 DirectoryRecommendation=Ieteicams izmantot mapi ārpus mājas lapas failu direktorijas.
 LoginAlreadyExists=Jau eksistē
-DolibarrAdminLogin=Dolibarr administratora ieeja
+DolibarrAdminLogin=Dolibarr administratora lietotāja vārds
 AdminLoginAlreadyExists=Dolibarr administratora konts '<b>%s</b>' jau eksistē. Dodieties atpakaļ, ja jūs vēlaties izveidot vēl vienu kontu.
-WarningRemoveInstallDir=Brīdinājums, drošības apsvērumu dēļ kad instalēšana vai atjaunināšana ir pabeigta, lai izvairīties no instalēšanas rīku atkal izmantošanas, jums vajadzētu pievienot failu ar nosaukumu <b>install.lock</b> Dolibarr dokumentu direktorijā, lai novērstu ļaunprātīgu tās izmantošanu.
+WarningRemoveInstallDir=Brīdinājums, drošības apsvērumu dēļ pēc instalēšanas vai atjaunināšanas beigām, lai izvairītos no instalēšanas rīku atkārtotas izmantošanas, Jums jāpievieno failu ar nosaukumu <b>install.lock</b> Dolibarr dokumentu direktorijā, lai novērstu ļaunprātīgu instalācijas izmantošanu.
 ThisPHPDoesNotSupportTypeBase=Šis PHP sistēma neatbalsta nevienu interfeisu, lai piekļūtu datu bāzes tipa %s
 FunctionNotAvailableInThisPHP=Nav pieejams šajā PHP versijā
 MigrateScript=Migrācijas skripts
@@ -108,13 +108,13 @@ DatabaseMigration=Struktūras datu bāzes migrācija
 ProcessMigrateScript=Skripts darbojas
 ChooseYourSetupMode=Izvēlies savu instalācijas režīmu un noklikšķiniet uz "Sākt" ...
 FreshInstall=Svaiga instalēšana
-FreshInstallDesc=Izmantojiet šo režīmu, ja tas ir jūsu pirmo reizi instalēt. Ja nē, šis režīms var izlabot nepilnīgu iepriekšējo instalēt, bet, ja jūs vēlaties uzlabot savu versiju, izvēlieties "Upgrade" režīmā.
+FreshInstallDesc=Izmantojiet šo režīmu, ja pirmo reizi instalējat. Ja nē, šis režīms var izlabot nepilnīgu iepriekšējo instalāciju. Ja jūs vēlaties atjaunot versiju, izvēlieties "Atjaunošanas" režīmu.
 Upgrade=Atjaunot
-UpgradeDesc=Izmantojiet šo režīmu, ja esat nomainījis veco Dolibarr failus ar failiem no jaunāku versiju. Tas būs uzlabot savu datu bāzi un datus.
+UpgradeDesc=Izmantojiet šo režīmu, ja vēlaties atjaunot veco Dolibarr versiju uz jaunāku. Šis process atjauno datu bāzi un failus.
 Start=Sākt
-InstallNotAllowed=Setup nav atļauts ar <b>conf.php</b> atļaujas
+InstallNotAllowed=Instalēšana nav atļauta ar <b>conf.php</b> tiesībām
 NotAvailable=Nav pieejams
-YouMustCreateWithPermission=Jums ir izveidot failu %s un noteikt rakstīt atļaujas par to, lai web serveri laikā instalēšanas procesu.
+YouMustCreateWithPermission=Jums ir jāizveido fails %s un jāpiešķir rakstīšanas atļaujas tam, lai web serveris instalēšanas laikā varētu to izmantot.
 CorrectProblemAndReloadPage=Lūdzu atrisiniet problēmu un nospiediet F5, lai pārlādētu lapu.
 AlreadyDone=Jau pārvietoti
 DatabaseVersion=Datubāzes versija
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index c781d865760..2b5798ca198 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - interventions
 Intervention=Iejaukšanās
 Interventions=Iejaukšanās
-InterventionCard=Intervences karte
-NewIntervention=Jauna intervences
-AddIntervention=Pievienot iejaukšanās
-ListOfInterventions=Saraksts iejaukšanās
-EditIntervention=Labot iejaukšanās
+InterventionCard=Iejaukšanās kartiņa
+NewIntervention=Jauna iejaukšanās
+AddIntervention=Create intervention
+ListOfInterventions=Iejaukšanās saraksts
+EditIntervention=Labot iejaukšanos
 ActionsOnFicheInter=Pasākumi attiecībā uz intervenci
 LastInterventions=Pēdējās %s iejaukšanās
-AllInterventions=Visi pasākumi
+AllInterventions=Visas iejaukšanās
 CreateDraftIntervention=Izveidot projektu
 CustomerDoesNotHavePrefix=Klientam nav prefiksu
 InterventionContact=Intervences kontakts
@@ -16,7 +16,7 @@ DeleteIntervention=Dzēst iejaukšanās
 ValidateIntervention=Apstiprināt iejaukšanās
 ModifyIntervention=Modificēt iejaukšanās
 DeleteInterventionLine=Dzēst intervences līnija
-ConfirmDeleteIntervention=Vai tiešām vēlaties dzēst šo pasākumu?
+ConfirmDeleteIntervention=Vai tiešām vēlaties dzēst šo iejaukšanos?
 ConfirmValidateIntervention=Vai jūs tiešām vēlaties, lai apstiprinātu šo intervenci ar nosaukumu <b>%s?</b>
 ConfirmModifyIntervention=Vai esat pārliecināts, ka vēlaties mainīt šo pasākumu?
 ConfirmDeleteInterventionLine=Vai tiešām vēlaties dzēst šo intervences līnijas?
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Vārds, uzvārds un paraksts iejaukties:
 NameAndSignatureOfExternalContact=Vārds un klienta paraksts:
 DocumentModelStandard=Standarta dokumenta paraugs intervencēm
 InterventionCardsAndInterventionLines=Iejaukšanās un līnijas intervenču
-ClassifyBilled=Klasificēt "Jāmaksā"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 be7983ee3c2..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
@@ -35,7 +35,7 @@ TestMailing=Testa e-pasts
 ValidMailing=Derīgas pasta vēstuļu sūtīšanas
 ApproveMailing=Apstiprināt e-pastu
 MailingStatusDraft=Projekts
-MailingStatusValidated=Validēta
+MailingStatusValidated=Apstiprināts
 MailingStatusApproved=Apstiprināts
 MailingStatusSent=Nosūtīts
 MailingStatusSentPartialy=Nosūtīts daļēji
@@ -74,7 +74,7 @@ DateSending=Sūtīšanas datums
 SentTo=Nosūtīts <b>%s</b>
 MailingStatusRead=Lasīt
 CheckRead=Lasīt kvīti
-YourMailUnsubcribeOK=E-pasts <b>%s</b> ir pareizi unsubcribe no adresātu saraksta
+YourMailUnsubcribeOK=E-pasts <b>%s</b> ir veiksmīgi izņemts no adresātu saraksta
 MailtoEMail=Saite uz e-pastu
 ActivateCheckRead=Atļaut izmantot "Atrakstīšanās" saiti
 ActivateCheckReadKey=Galvenais izmantot, lai šifrētu URL izmantošanu, lai "izlasītu saņemšanai" un "Unsubcribe" funkciju
@@ -94,9 +94,9 @@ MailingModuleDescDolibarrUsers=Dolibarr lietotājiem
 MailingModuleDescFundationMembers=Fonda biedri ar e-pastiem
 MailingModuleDescEmailsFromFile=E-pastus no teksta faila (e-pasts, Uzvārds, Vārds, cits)
 MailingModuleDescEmailsFromUser=Pastus no lietotāja ievadi (e-pasts, Uzvārds, Vārds, cits)
-MailingModuleDescContactsCategories=Trešās personas (pēc kategorijas)
+MailingModuleDescContactsCategories=Trešās personas (pēc sadaļas)
 MailingModuleDescDolibarrContractsLinesExpired=Trešās personas ar beidzies līgums ir līnijas
-MailingModuleDescContactsByCompanyCategory=Kontakti / adreses trešajām personām (trešo personu kategorija)
+MailingModuleDescContactsByCompanyCategory=Kontakti/adreses trešajām personām (trešo personu sadaļas)
 MailingModuleDescContactsByCategory=Kontakti / adreses trešajām personām kategorijā
 MailingModuleDescMembersCategories=Fonda biedri (pa kategorijām)
 MailingModuleDescContactsByFunction=Kontakti / adreses trešajām personām (pēc pozīcijas / funkciju)
@@ -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 <b>%s</b> adresātus, nosūtot sesiju.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> nav definētas Dolibarr konfigurācijas failā <b>conf.php.</b>
 ErrorCantLoadUserFromDolibarrDatabase=Neizdevās atrast lietotāju <b>%s</b> Dolibarr datu bāzē.
-ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij &quot;%s&quot;.
+ErrorNoVATRateDefinedForSellerCountry=Kļūda, PVN likme nav definēta sekojošai valstij '%s'.
 ErrorNoSocialContributionForSellerCountry=Kļūda, nav definēts sociālās iemaksas veids  valstī &quot;%s&quot;.
 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 &quot;Pievienot failu&quot;, 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 &quot;ON&quot;, starpība būs nulle tiešsaistē (pirkšanas cena = pārdošanas cenu), pretējā gadījumā (&quot;OFF&quot;), 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 728d6a2b851..027c6024f71 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -2,7 +2,7 @@
 MembersArea=Dalībnieku sadaļa
 PublicMembersArea=Sabiedrības dalībnieku zonā
 MemberCard=Dalībnieka karte
-SubscriptionCard=Abonēšana karte
+SubscriptionCard=Abonēšana kartiņa
 Member=Dalībnieks
 Members=Dalībnieki
 MemberAccount=Biedrs pieteikšanās
@@ -18,7 +18,7 @@ ListOfValidatedPublicMembers=Saraksts ar apstiprināto valsts locekļu
 ErrorThisMemberIsNotPublic=Šis dalībnieks nav publisks
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Vēl viens dalībnieks (nosaukums: <b>%s,</b> pieteikšanās: <b>%s)</b> jau ir saistīts ar trešo personu <b>%s.</b> Noņemt šo saiti vispirms tāpēc, ka trešā persona nevar saistīt tikai loceklim (un otrādi).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Drošības apsvērumu dēļ, jums ir jāpiešķir atļaujas, lai rediģētu visi lietotāji varētu saistīt locekli, lai lietotājam, kas nav jūsu.
-ThisIsContentOfYourCard=Šī ir informācija par jūsu karti
+ThisIsContentOfYourCard=Šī ir informācija par jūsu kartiņu
 CardContent=Saturu jūsu dalības kartes
 SetLinkToUser=Saite uz Dolibarr lietotāju
 SetLinkToThirdParty=Saite uz Dolibarr trešajai personai
@@ -54,7 +54,7 @@ SearchAMember=Meklēt dalībnieku
 MemberStatusDraft=Projekts (ir jāapstiprina)
 MemberStatusDraftShort=Projekts
 MemberStatusActive=Validēta (gaidīšanas abonements)
-MemberStatusActiveShort=Validēta
+MemberStatusActiveShort=Apstiprināts
 MemberStatusActiveLate=abonements beidzies
 MemberStatusActiveLateShort=Beidzies
 MemberStatusPaid=Abonēšana atjaunināta
@@ -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
@@ -105,7 +105,7 @@ DeleteSubscription=Dzēst abonementu
 ConfirmDeleteSubscription=Vai tiešām vēlaties dzēst šo abonementu?
 Filehtpasswd=Htpasswd failu
 ValidateMember=Apstiprināt dalībnieku
-ConfirmValidateMember=Vai jūs tiešām vēlaties, lai apstiprinātu šo biedrs?
+ConfirmValidateMember=Vai jūs tiešām vēlaties apstiprināt šo biedru?
 FollowingLinksArePublic=Šādas saites ir atvērtas lapas, kas nav aizsargāti ar kādu Dolibarr atļauju. Tie nav formated lapas, sniedz kā piemērs, lai parādītu, kā uzskaitīt biedrus datu bāzi.
 PublicMemberList=Sabiedrības Biedru saraksts
 BlankSubscriptionForm=Publiskā auto-abonēšanas veidlapu
@@ -123,9 +123,9 @@ Text=Teksts
 Int=Int
 Date=Datums
 DateAndTime=Datums un laiks
-PublicMemberCard=Dalībvalsts publisko karte
+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
@@ -158,7 +158,7 @@ MoreActions=Papildu darbības ar ierakstu
 MoreActionsOnSubscription=Papildina rīcību, kas ierosināta pēc noklusējuma, ierakstot abonementu
 MoreActionBankDirect=Izveidot tiešu darījumu ierakstu par kontu
 MoreActionBankViaInvoice=Izveidot rēķinu un maksājumu par kontu
-MoreActionInvoiceOnly=Izveidot rēķinu bez maksājumu
+MoreActionInvoiceOnly=Izveidot rēķinu bez maksājuma
 LinkToGeneratedPages=Izveidot vizītkartes
 LinkToGeneratedPagesDesc=Šis ekrāns ļauj jums, lai radītu PDF failus ar vizītkartēm visiem saviem biedriem, vai konkrētā loceklis.
 DocForAllMembersCards=Izveidot vizītkartes visiem dalībniekiem
@@ -168,8 +168,8 @@ SubscriptionPayment=Abonēšanas maksa
 LastSubscriptionDate=Pēdējā abonēšanas datums
 LastSubscriptionAmount=Pēdējā parakstīšanās summu
 MembersStatisticsByCountries=Dalībnieku statistika pa valstīm
-MembersStatisticsByState=Dalībnieku statistika pēc valsts / province
-MembersStatisticsByTown=Dalībnieku statistika pa pilsētu
+MembersStatisticsByState=Dalībnieku statistika pēc štatiem/provincēm
+MembersStatisticsByTown=Dalībnieku statistika pa pilsētām
 MembersStatisticsByRegion=Members statistics by region
 MemberByRegion=Members by region
 NbOfMembers=Biedru skaits
@@ -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 36f2a166d77..a15b3d85d24 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Klienti pasūtījumu sadaļa
 SuppliersOrdersArea=Piegādātāji pasūtījumi platība
-OrderCard=Lai karte
+OrderCard=Pasūtījumu kartiņa
 OrderId=Pasūtījuma ID
 Order=Rīkojums
 Orders=Pasūtījumi
@@ -9,25 +9,25 @@ OrderLine=Lai līnija
 OrderFollow=Sekojiet līdzi
 OrderDate=Pasūtīt datumu
 OrderToProcess=Pasūtījums, kas jāapstrādā
-NewOrder=Jauns rīkojums
+NewOrder=Jauns pasūtījums
 ToOrder=Veicot pasūtījumu
 MakeOrder=Veicot pasūtījumu
 SupplierOrder=Piegādātājs rīkojums
 SuppliersOrders=Piegādātāji pasūtījumi
 SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi
 CustomerOrder=Klienta rīkojums
-CustomersOrders=Klienta-u pasūtījumi
+CustomersOrders=Klientu pasūtījumi
 CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi
 CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas
 OrdersToValid=Klienta pasūtījumu apstiprināšanai,
-OrdersToBill=Klienta rīkojumi piegādāts
-OrdersInProcess=Klienta rīkojumus procesā
-OrdersToProcess=Klienta rīkojumi apstrādāt
+OrdersToBill=Klienta pasūtījumi piegādāti
+OrdersInProcess=Klienta pasūtījumi procesā
+OrdersToProcess=Klienta pasūtījumi kas jāapstrādā
 SuppliersOrdersToProcess=Piegādātāja rīkojumi apstrādāt
 StatusOrderCanceledShort=Atcelts
 StatusOrderDraftShort=Projekts
-StatusOrderValidatedShort=Validēta
-StatusOrderSentShort=Šajā procesā
+StatusOrderValidatedShort=Apstiprināts
+StatusOrderSentShort=Procesā
 StatusOrderSent=Sūtījuma procesā
 StatusOrderOnProcessShort=Reģistratūra
 StatusOrderProcessedShort=Apstrādāti
@@ -40,7 +40,7 @@ StatusOrderReceivedPartiallyShort=Daļēji saņemti
 StatusOrderReceivedAllShort=Viss saņemts
 StatusOrderCanceled=Atcelts
 StatusOrderDraft=Projekts (ir jāapstiprina)
-StatusOrderValidated=Validēta
+StatusOrderValidated=Apstiprināts
 StatusOrderOnProcess=Gaida, lai saņemtu
 StatusOrderProcessed=Apstrādāts
 StatusOrderToBill=Piegādāts
@@ -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
@@ -81,9 +81,9 @@ AllOrders=Visi pasūtījumi
 NbOfOrders=Pasūtījumu skaits
 OrdersStatistics=Pasūtījuma-u statistika
 OrdersStatisticsSuppliers=Piegādātāj pasūtījuma/u statistika
-NumberOfOrdersByMonth=Pasutījumu skaits pa mēnešiem
-AmountOfOrdersByMonthHT=Summa rīkojumus mēnesī (neto pēc nodokļiem)
-ListOfOrders=Saraksts pasūtījumu
+NumberOfOrdersByMonth=Pasūtījumu skaits pa mēnešiem
+AmountOfOrdersByMonthHT=Summa pasūtījumi mēnesī (bez nodokļiem)
+ListOfOrders=Pasūtījumu saraksts
 CloseOrder=Aizvērt kārtība
 ConfirmCloseOrder=Vai jūs tiešām vēlaties, lai uzstādītu šo rīkojumu deliverd? Pēc tam, kad pasūtījums tiek piegādāts, to var iestatīt, lai jāmaksā.
 ConfirmCloseOrderIfSending=Vai jūs tiešām vēlaties, lai aizvērtu šo pasūtījumu? Jums jāslēdz rīkojumu tikai tad, kad visi kuģniecības tiek darīts.
@@ -95,7 +95,7 @@ ConfirmMakeOrder=Vai jūs tiešām vēlaties, lai apstiprinātu veicāt šo rīk
 GenerateBill=Izveidot rēķinu
 ClassifyShipped=Klasificēt piegādāts
 ClassifyBilled=Klasificēt rēķins
-ComptaCard=Grāmatvedība karte
+ComptaCard=Grāmatvedības kartiņa
 DraftOrders=Projekts pasūtījumi
 RelatedOrders=Saistītie pasūtījumi
 OnProcessOrders=Pasūtījumi procesā
@@ -154,7 +154,6 @@ OrderByPhone=Telefons
 CreateInvoiceForThisCustomer=Rēķinu pasūtījumi
 NoOrdersToInvoice=Nav pasūtījumi apmaksājamo
 CloseProcessedOrdersAutomatically=Klasificēt &quot;apstrādā&quot; 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 e8d5f68655d..c7d228cf34c 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. <br><br> Šos rīkus var sasniegt no izvēlnes uz pusi.
 Birthday=Dzimšanas diena
@@ -39,15 +38,16 @@ Notify_CONTRACT_VALIDATE=Līgums apstiprināts
 Notify_FICHEINTER_VALIDATE=Intervences apstiprināts
 Notify_SHIPPING_VALIDATE=Piegāde apstiprināta
 Notify_SHIPPING_SENTBYMAIL=Piegāde nosūtīt pa pastu
-Notify_MEMBER_VALIDATE=Loceklis apstiprināts
+Notify_MEMBER_VALIDATE=Dalībnieks apstiprināts
 Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Dalībvalsts parakstītā
+Notify_MEMBER_SUBSCRIPTION=Dalībnieks pierakstījies
 Notify_MEMBER_RESILIATE=Biedrs resiliated
 Notify_MEMBER_DELETE=Biedrs svītrots
 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 <b>tests</b> pasts (vārds testam jābūt treknrakstā). <br> Abas līnijas ir atdalīti ar rakstatgriezi. <br><br> __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__
@@ -67,7 +67,7 @@ PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the s
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr ir kompakts ERP / CRM veido vairāki funkcionālos moduļus. Demo, kas ietver visus moduļus nenozīmē neko, jo tas nekad nav noticis. Tātad, vairāki demo profili ir pieejami.
-ChooseYourDemoProfil=Izvēlieties demo profilu, kas atbilstu jūsu darbību ...
+ChooseYourDemoProfil=Izvēlieties demo profilu, kas atbilstu jūsu darbībai ...
 DemoFundation=Pārvaldīt locekļus nodibinājumam
 DemoFundation2=Pārvaldīt dalībniekus un bankas kontu nodibinājumam
 DemoCompanyServiceOnly=Pārvaldīt ārštata darbības pārdošanas pakalpojumus tikai
@@ -80,6 +80,16 @@ ModifiedBy=Laboja %s
 ValidatedBy=Apstiprināja %s
 CanceledBy=Atcēla %s
 ClosedBy=Slēdza %s
+CreatedById=Lietotāja id kurš izveidojis
+ModifiedById=Lietotāja id kurš veica pēdējās izmaiņas
+ValidatedById=Lietotāja id, kurš apstiprināja
+CanceledById=Lietotāja id kurš atcēlis
+ClosedById=Lietotāja id kurš aiztaisījis
+CreatedByLogin=Lietotāja lietotājs kurš izveidojis
+ModifiedByLogin=Lietotājs, kurš pēdējais labojis
+ValidatedByLogin=Lietotājs, kurš apstiprinājis
+CanceledByLogin=Lietotājs, kurš atcēlis
+ClosedByLogin=Lietotājs, kurš slēdzis
 FileWasRemoved=Fails %s tika dzēsts
 DirWasRemoved=Katalogs %s tika dzēsts
 FeatureNotYetAvailableShort=Pieejams nākamajā versijā
@@ -154,14 +164,14 @@ NumberOfUnitsCustomerOrders=Klientu pasūtījumos pasūtīto preču skaits pēd
 NumberOfUnitsCustomerInvoices=Skaits klientiem izrakstītajos rēķinos pēdējo 12 mēnešu laikā
 NumberOfUnitsSupplierOrders=Vienību skaits kuras pasūtītas pēdējos 12 mēnešos
 NumberOfUnitsSupplierInvoices=Skaits piegādātāju rēķinos pēdējo 12 mēnešu laikā
-EMailTextInterventionValidated=Intervences %s ir apstiprināta.
+EMailTextInterventionValidated=Iejaukšanās %s ir apstiprināta.
 EMailTextInvoiceValidated=Rēķins %s ir apstiprināts.
-EMailTextProposalValidated=Priekšlikums %s ir apstiprināta.
-EMailTextOrderValidated=Lai %s ir apstiprināta.
-EMailTextOrderApproved=Lai %s ir apstiprināts.
-EMailTextOrderApprovedBy=Lai %s ir apstiprinājusi %s.
-EMailTextOrderRefused=Lai %s ir noraidīts.
-EMailTextOrderRefusedBy=Lai %s ir noraidījusi %s.
+EMailTextProposalValidated=Priekšlikums %s ir apstiprināts.
+EMailTextOrderValidated=Pasūtījums %s ir apstiprināts.
+EMailTextOrderApproved=Pasūtījums %s ir apstiprināts.
+EMailTextOrderApprovedBy=Pasūtījumu %s ir apstiprinājis %s.
+EMailTextOrderRefused=Pasūtījums %s ir noraidīts.
+EMailTextOrderRefusedBy=Pasūtījums %s ir noraidījis %s.
 EMailTextExpeditionValidated=Kuģniecības %s ir apstiprināta.
 ImportedWithSet=Ievešanas datu kopu
 DolibarrNotification=Automātiska paziņošana
@@ -193,32 +203,33 @@ 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 darīts Dolibarr
-CustomerPaymentDoneInDolibarr=Klientu maksājumu %s darīts Dolibarr
-SupplierPaymentDoneInDolibarr=Piegādātājs maksājumu %s darīts Dolibarr
-MemberValidatedInDolibarr=Dalībvalstis %s apstiprinātas ar Dolibarr
-MemberResiliatedInDolibarr=Dalībvalstis %s resiliated jo Dolibarr
-MemberDeletedInDolibarr=Dalībvalstis %s izdzēsts no Dolibarr
-MemberSubscriptionAddedInDolibarr=Parakstīšanās uz dalībvalstīm %s papildina Dolibarr
-ShipmentValidatedInDolibarr=Sūtījuma %s validētas Dolibarr
-ShipmentDeletedInDolibarr=Sūtījums %s izdzēsts no 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ēt
 ExportsArea=Eksportēšanas sadaļa
 AvailableFormats=Pieejamie formāti
 LibraryUsed=Librairy lieto
 LibraryVersion=Versija
-ExportableDatas=Eksportējami dati
+ExportableDatas=Eksportējamie dati
 NoExportableData=Nav eksportējami dati (nav moduļi ar eksportējami datu ielādes, vai trūkstošos atļaujas)
 ToExport=Eksportēt
 NewExport=Jauns eksports
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..835e6827f12 100644
--- a/htdocs/langs/lv_LV/printipp.lang
+++ b/htdocs/langs/lv_LV/printipp.lang
@@ -1,18 +1,14 @@
-/*
- * Language code: lv_LV
- * Automatic generated via autotranslator.php tool
- * Generation date 2013-11-09 12:40:15
- */
-
-
-// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15).
-// Reference language: en_US -> lv_LV
-PrintIPPSetup=Setup moduļa Direct Print
-PrintIPPDesc=Ce modulis Përmet d'Ajouter ANO Bouton d'iespaids tieši des dokumenti vers votre imprimante. Il requiert ANO systeme Linux équipé de Kausi.
-PRINTIPP_ENABLED=Rādīt Picto &quot;Direct print&quot; par dokumentu saraksts
-PRINTIPP_HOST=Drukas serveris
-PRINTIPP_PORT=Osta
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Parole
-NoPrinterFound=Nav printeri atrasts (pārbaudiet savu tases etup)
-// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:49:40).
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index a2a7afa643f..d81b413812e 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -80,16 +80,17 @@ ContractStatusClosed=Slēgts
 ContractStatusRunning=Ekspluatācijas
 ContractStatusExpired=beidzies
 ContractStatusOnHold=Nedarbojas
-ContractStatusToRun=Mettre en pakalpojums
+ContractStatusToRun=To get running
 ContractNotRunning=Šis līgums nedarbojas
-ErrorProductAlreadyExists=Ar atsauci %s produkts jau pastāv.
+ErrorProductAlreadyExists=Prece ar atsauci %s jau pastāv.
 ErrorProductBadRefOrLabel=Nepareiza vērtība atsauces vai etiķeti.
 ErrorProductClone=Radās problēma, mēģinot klons produktu vai pakalpojumu.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Piegādātāji
 SupplierRef=Piegādātāja produkta ref.
 ShowProduct=Rādīt preci
 ShowService=Rādīt pakalpojumu
-ProductsAndServicesArea=Produktu un pakalpojumu jomā
+ProductsAndServicesArea=Produktu un pakalpojumu sadaļa
 ProductsArea=Preču sadaļa
 ServicesArea=Pakalpojumu sadaļa
 AddToMyProposals=Pievienot pie maniem priekšlikumiem
@@ -115,23 +116,23 @@ CreateCopy=Izveidot kopiju
 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 kategorijas
-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
+MultiPriceLevelsName=Cenu sadaļa
+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
-CategoryFilter=Kategorijas filtrs
+CategoryFilter=Sadaļu filtrs
 ProductToAddSearch=Meklēt produktu, lai pievienotu
 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?
@@ -154,12 +155,12 @@ QtyMin=Minimālais Daudzums
 PriceQty=Cena par šo daudzumu
 PriceQtyMin=Cena par šo min. daudzums (bez atlaides)
 VATRateForSupplierProduct=PVN likme (šim piegādātājam / produktam)
-DiscountQtyMin=Noklusējuma atlaide qty
-NoPriceDefinedForThisSupplier=Nē cena / gab definētas šim piegādātājam / produktu
-NoSupplierPriceDefinedForThisProduct=Piegādātājs cena / gab definētas šo produktu
-RecordedProducts=Produkti reģistrē
-RecordedServices=Pakalpojumi reģistrē
-RecordedProductsAndServices=Produkti / pakalpojumi ierakstītas
+DiscountQtyMin=Noklusējuma apjoma atlaide
+NoPriceDefinedForThisSupplier=Nav cena /gab definēti šim piegādātājam/precei
+NoSupplierPriceDefinedForThisProduct=Nav piegādātāja cena/gab definēti šim produktam
+RecordedProducts=Produkti saglabāti
+RecordedServices=Pakalpojumi saglabāti
+RecordedProductsAndServices=Produkti/pakalpojumi saglabāti
 PredefinedProductsToSell=Predefined products to sell
 PredefinedServicesToSell=Predefined services to sell
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
@@ -178,7 +179,7 @@ CloneProduct=Klonēt produktu vai pakalpojumu
 ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu <b>%s?</b>
 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
@@ -201,7 +202,7 @@ PriceByQuantity=Cena pēc daudzuma
 PriceByQuantityRange=Daudzuma diapazons
 ProductsDashboard=Produkti / Pakalpojumi kopsavilkums
 UpdateOriginalProductLabel=Labot sākotnējo nosaukumu
-HelpUpdateOriginalProductLabel=Ļauj, lai rediģētu produkta nosaukumu
+HelpUpdateOriginalProductLabel=Ļauj rediģēt produkta nosaukumu
 ### composition fabrication
 Building=Ražošana un priekšmeti dispatchment
 Build=Ražot
@@ -227,7 +228,7 @@ PrintsheetForOneBarCode=Drukāt vairākas svītrkoda uzlīmes
 BuildPageToPrint=Ģenerēt lapu drukāšanai
 FillBarCodeTypeAndValueManually=Aizpildīt svītrukodu veidu un vērtību manuāli.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Aizpildīt svītrkodu veidu un vērtību no trešo pušu svītrkoda.
 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=Svītrkoda produkta informācija %s :
@@ -236,6 +237,13 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
 PriceByCustomer=Klienta cena
 PriceCatalogue=Unikāla cena poduktam/pakalpojumam
 PricingRule=Cenu veidošanas noteikumi
-AddCustomerPrice=Add price by customers
+AddCustomerPrice=Pievienot cenu klientiem
 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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index f078c1a4e26..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?
@@ -32,12 +32,14 @@ TimeSpent=Laiks, kas pavadīts
 TimesSpent=Laiks, kas patērēts
 RefTask=Ref. uzdevums
 LabelTask=Label uzdevums
-TaskTimeSpent=Time spent on tasks
+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 laiks pavadīts
+MyTimeSpent=Mans pavadīts laiks
 MyTasks=Mani uzdevumi
 Tasks=Uzdevumi
 Task=Uzdevums
@@ -45,14 +47,14 @@ 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
 MyActivity=Manas darbības
 MyActivities=Mani uzdevumi / aktivitātes
 MyProjects=Mani projekti
-DurationEffective=Efektīva ilgums
+DurationEffective=Efektīvais ilgums
 Progress=Progress
 ProgressDeclared=Deklarētais progress
 ProgressCalculated=Aprēķinātais progress
@@ -73,25 +75,25 @@ ActivityOnProjectThisYear=Aktivitāte projektā šogad
 ChildOfTask=Bērna projekta / uzdevuma
 NotOwnerOfProject=Ne īpašnieks šo privātam projektam
 AffectedTo=Piešķirtas
-CantRemoveProject=Šis projekts nevar noņemt, jo tas ir atsauce ar kādu citu objektu (rēķinu, rīkojumus vai citus). Skatīt atsaucēm? Tab.
+CantRemoveProject=Šo projektu nevar noņemt, jo tam ir atsauce ar kādu citu objektu (rēķinu, rīkojumus vai cits). Skatīt atsauču sadaļa.
 ValidateProject=Apstiprināt Projet
-ConfirmValidateProject=Vai jūs tiešām vēlaties, lai apstiprinātu šo projektu?
+ConfirmValidateProject=Vai jūs tiešām vēlaties apstiprināt šo projektu?
 CloseAProject=Aizvērt projektu
-ConfirmCloseAProject=Vai jūs tiešām vēlaties, lai aizvērtu šo projektu?
+ConfirmCloseAProject=Vai jūs tiešām vēlaties aizvērt šo projektu?
 ReOpenAProject=Atvērt projektu
 ConfirmReOpenAProject=Vai jūs tiešām vēlaties no jauna atvērtu šo projektu?
 ProjectContact=Projekta kontakti
 ActionsOnProject=Pasākumi par projektu
 YouAreNotContactOfProject=Jūs neesat kontakts šīs privātam projektam
 DeleteATimeSpent=Dzēst pavadīts laiks
-ConfirmDeleteATimeSpent=Vai tiešām vēlaties šo dzēst pavadītais laiks?
-DoNotShowMyTasksOnly=Skatīt arī uzdevumus, kas nav piešķirti mani
-ShowMyTasksOnly=Skatīt tikai uzdevumus, kas man
+ConfirmDeleteATimeSpent=Vai tiešām vēlaties dzēst pavadīto laiku?
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Resursi
 ProjectsDedicatedToThisThirdParty=Projekti, kas veltīta šai trešajai personai
 NoTasks=Neviens uzdevumi šajā projektā
 LinkedToAnotherCompany=Saistīts ar citām trešajām personām
-TaskIsNotAffectedToYou=Uzdevums nav piešķirts jums
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Pavadīts laiks ir tukšs
 ThisWillAlsoRemoveTasks=Šī darbība arī izdzēst visus uzdevumus projekta <b>(%s</b> uzdevumi brīdī) un visu laiku ieguldījumiem pavadīts.
 IfNeedToUseOhterObjectKeepEmpty=Ja daži objekti (rēķinu, pasūtījumu, ...), kas pieder citai trešai personai, ir saistītas ar projektu, lai izveidotu, saglabāt šo tukšo, lai būtu projektam, multi trešajām personām.
@@ -119,7 +121,8 @@ TypeContact_project_task_external_TASKEXECUTIVE=Uzdevuma izpildītājs
 TypeContact_project_task_internal_TASKCONTRIBUTOR=Ieguldītājs
 TypeContact_project_task_external_TASKCONTRIBUTOR=Ieguldītājs
 SelectElement=Izvēlieties elementu
-AddElement=Saite uz elementa
+AddElement=Saite uz elementu
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Pilnīgu projekta ziņojums modelis (logo. ..)
 PlannedWorkload = Plānotais darba apjoms
@@ -128,3 +131,4 @@ ProjectReferers=Atsaucoties objekti
 SearchAProject=Meklēt projektu
 ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda
 ProjectDraft=Melnraksta projekts
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index c43d6a05baf..7a7603d4e8f 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -27,21 +27,21 @@ LastProposals=Jaunākie priekšlikumi
 SearchAProposal=Meklēt priekšlikumu
 ProposalsStatistics=Komerciālo priekšlikuma'u statistika
 NumberOfProposalsByMonth=Numurs pēc mēneša
-AmountOfProposalsByMonthHT=Summa, ko mēnesī (neto pēc nodokļiem)
+AmountOfProposalsByMonthHT=Summa pa mēnešiem (neto pēc nodokļiem)
 NbOfProposals=Skaits tirdzniecības priekšlikumiem
 ShowPropal=Rādīt priekšlikumu
 PropalsDraft=Sagatave
 PropalsOpened=Atvērts
 PropalsNotBilled=Slēgts nav apmaksāts
 PropalStatusDraft=Projekts (ir jāapstiprina)
-PropalStatusValidated=Validēta (priekšlikums ir atvērta)
-PropalStatusOpened=Validēta (priekšlikums ir atvērta)
+PropalStatusValidated=Apstiprināts (priekšlikums ir atvērts)
+PropalStatusOpened=Apstiprināts (priekšlikums ir atvērts)
 PropalStatusClosed=Slēgts
 PropalStatusSigned=Parakstīts (vajadzības rēķinu)
 PropalStatusNotSigned=Nav parakstīts (slēgta)
 PropalStatusBilled=Jāmaksā
 PropalStatusDraftShort=Melnraksts
-PropalStatusValidatedShort=Validēta
+PropalStatusValidatedShort=Apstiprināts
 PropalStatusOpenedShort=Atvērts
 PropalStatusClosedShort=Slēgts
 PropalStatusSignedShort=Parakstīts
diff --git a/htdocs/langs/lv_LV/resource.lang b/htdocs/langs/lv_LV/resource.lang
new file mode 100644
index 00000000000..32bdd92f884
--- /dev/null
+++ b/htdocs/langs/lv_LV/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/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 1725d579493..7eed9a6f743 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -5,8 +5,8 @@ Sendings=Sūtījumi
 Shipment=Sūtījums
 Shipments=Sūtījumi
 Receivings=Receivings
-SendingsArea=Sūtījumi platība
-ListOfSendings=Saraksts sūtījumiem
+SendingsArea=Sūtījumu sadaļa
+ListOfSendings=Sūtījumu saraksts
 SendingMethod=Sūtīšanas metode
 SendingReceipt=Piegāde saņemšana
 LastSendings=Pēdējie %s sūtījumi
@@ -14,7 +14,7 @@ SearchASending=Meklēt sūtījumu
 StatisticsOfSendings=Sūtījumu statistika
 NbOfSendings=Sūtījumu skaits
 NumberOfShipmentsByMonth=Sūtījumu skaits pa mēnešiem
-SendingCard=Piegādes karte
+SendingCard=Piegādes kartiņa
 NewSending=Jauns sūtījums
 CreateASending=Izveidot sūtījumu
 CreateSending=Izveidot sūtījumu
@@ -35,7 +35,7 @@ StatusSendingValidated=Apstiprinātas (produkti, uz kuģi vai jau nosūtīti)
 StatusSendingProcessed=Apstrādāts
 StatusSendingCanceledShort=Atcelts
 StatusSendingDraftShort=Melnraksts
-StatusSendingValidatedShort=Validēta
+StatusSendingValidatedShort=Apstiprināts
 StatusSendingProcessedShort=Apstrādāti
 SendingSheet=Nosūtot lapu
 Carriers=Pārvadātāji
@@ -54,17 +54,19 @@ StatsOnShipmentsOnlyValidated=Statistika veikti uz sūtījumiem tikai apstiprin
 DateDeliveryPlanned=Plānotais piegādes datums
 DateReceived=Datums piegāde saņemti
 SendShippingByEMail=Nosūtīt sūtījumu pa e-pastu
-SendShippingRef=Nosūtīt sūtījuma %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Notikumi sūtījumu
 LinkToTrackYourPackage=Saite uz izsekot savu paketi
 ShipmentCreationIsDoneFromOrder=Izveidot jaunu sūtījumu var no pasūtījuma kartiņas.
-RelatedShippings=Saistītie shippings
-ShipmentLine=Sūtījuma līnija
+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
-SendingMethodTRANS=Transporter
+SendingMethodTRANS=Pārvadātājs
 SendingMethodCOLSUI=Colissimo
 # ModelDocument
 DocumentModelSirocco=Vienkāršs dokuments modelis piegādes ieņēmumiem
@@ -72,3 +74,7 @@ DocumentModelTyphon=Vairāk pilnīgu dokumentu modelis piegādes ieņēmumiem (l
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Pastāvīga EXPEDITION_ADDON_NUMBER nav noteikts
 SumOfProductVolumes=Summa saražotās produkcijas apjomu
 SumOfProductWeights=Summēt produkta svaru
+
+# warehouse details
+DetailWarehouseNumber= Noliktavas detaļas
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/lv_LV/shop.lang b/htdocs/langs/lv_LV/shop.lang
deleted file mode 100644
index 32d11e3bc0b..00000000000
--- a/htdocs/langs/lv_LV/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Kļūda, nevar pieslēgties oscommerce datubāzei. Pārbaudiet moduļa iestatījumus
-Shop=Veikals
-ShopWeb=Interneta veikals
-LastOrders=Pēdējie pasūtījumi
-OnStandBy=Gaidīšanas režīmā
-TreatmentInProgress=Apstrādāšana procesā
-LastCustomers=Pēdējais klients
-OSCommerceShop=OsCommerce veikals
-OSCommerce=OsCommerce
-AddProd=Pārdot internetā
diff --git a/htdocs/langs/lv_LV/sms.lang b/htdocs/langs/lv_LV/sms.lang
index 30681baa42b..280969541ed 100644
--- a/htdocs/langs/lv_LV/sms.lang
+++ b/htdocs/langs/lv_LV/sms.lang
@@ -41,7 +41,7 @@ WarningNoSmsAdded=Nav jaunu tālruņa numuru, lai pievienotu mērķa sarakstam
 ConfirmValidSms=Vai varat apstiprināt, apstiprināt šīs informācijas kampaņas?
 ConfirmResetMailing=Uzmanību, ja jūs veicat reinit par Sms informācijas kampaņas <b>%s,</b> jums ļaus veikt masu nosūtot to otrreiz. Vai tas tiešām ir tas, ko jūs wan darīt?
 ConfirmDeleteMailing=Vai varat apstiprināt, likvidējot informācijas kampaņas?
-NbOfRecipients=Skaits mērķus
+NbOfRecipients=Mērķu skaits
 NbOfUniqueSms=Nb DOF unikālo tālruņa numuriem
 NbOfSms=Nbre no fona numuru
 ThisIsATestMessage=Šī ir testa ziņa
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 511331310fe..7d8e5c0b9ae 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Noliktava karte
+WarehouseCard=Noliktava kartiņa
 Warehouse=Noliktava
 Warehouses=Noliktavas
 NewWarehouse=Jauns noliktavu / Noliktavas platība
@@ -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=Warehouses area
 Location=Vieta
 LocationSummary=Īsais atrašanās vietas nosaukums
 NumberOfDifferentProducts=Dažādu produktu skaits
@@ -35,7 +35,7 @@ Unit=Vienība
 StockCorrection=Labot krājumus
 StockTransfer=Krājumu pārvietošana
 StockMovement=Pārvietot
-StockMovements=Krājumu pārvieošanas
+StockMovements=Krājumu pārvietošanas
 LabelMovement=Kustību nosaukums
 NumberOfUnit=Vienību skaits
 UnitPurchaseValue=Vienības iepirkuma cena
@@ -73,7 +73,7 @@ MininumStockShort=Krājumu min
 StockUpShort=Krājumi
 IdWarehouse=Id noliktava
 DescWareHouse=Apraksts noliktava
-LieuWareHouse=Lokalizācija noliktava
+LieuWareHouse=Lokālā noliktava
 WarehousesAndProducts=Noliktavas un produkti
 AverageUnitPricePMPShort=Vidējais svērtais ieejas cena
 AverageUnitPricePMP=Vidējais svērtais ieejas cena
@@ -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/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 4456f1d4e92..7434400985b 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -31,12 +31,14 @@ ExportDataset_fournisseur_3=Piegādātājs pasūtījumus un pasūtījumu līnija
 ApproveThisOrder=Apstiprināt šo pasūtījumu
 ConfirmApproveThisOrder=Vai jūs tiešām vēlaties apstiprināt pasūtījumu <b>%s?</b>
 DenyingThisOrder=Liedzot šo pasūtījumu
-ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties, lai liegtu šo rīkojumu <b>%s?</b>
-ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo rīkojumu <b>%s?</b>
+ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties aizliegt šo pasūtījumu <b>%s</b> ?
+ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo pasūtījumu <b>%s</b> ?
 AddCustomerOrder=Izveidot klienta pasūtījumu
 AddCustomerInvoice=Izveidot klienta rēķinu
 AddSupplierOrder=Izveidot piegādātāju pasūtījumu
 AddSupplierInvoice=Izveidot piegādātāju rēķinu
-ListOfSupplierProductForSupplier=To produktu saraksts, un cenām piegādātāju <b>%s</b>
+ListOfSupplierProductForSupplier=Produktu saraksts un piegādātāju cenas <b>%s</b>
 NoneOrBatchFileNeverRan=Neviens vai partijas <b>%s</b> ne skrēja nesen
 SentToSuppliers=Nosūtīti uz piegādātājiem
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index 38f09dc35ef..6fa2983bfa0 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -3,7 +3,7 @@ Trip=Brauciens
 Trips=Braucieni
 TripsAndExpenses=Trips un izdevumi
 TripsAndExpensesStatistics=Trips un izdevumi statistika
-TripCard=Ceļojuma karte
+TripCard=Ceļojuma kartiņa
 AddTrip=Pievienot ceļojumu
 ListOfTrips=Saraksts braucieniem
 ListOfFees=Saraksts maksu
@@ -19,3 +19,4 @@ TF_TRIP=Brauciens
 ListTripsAndExpenses=Saraksts braucienu un izdevumu
 ExpensesArea=Trips un izdevumi zona
 SearchATripAndExpense=Meklēt ceļojumu un izdevumiem
+ClassifyRefunded=Classify 'Refunded'
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 &quot;File Sent&quot;
+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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index ec1979fdc56..f12efa61626 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 b91bcb1f323..a24c678a2e5 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Events
 ActionsArea=Events area (Actions and tasks)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendar
+Calendars=Calendars
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+Events=Events
 EventsNb=Number of events
 MyEvents=My events
 OtherEvents=Other events
@@ -17,31 +19,33 @@ ListOfActions=List of events
 Location=Location
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index ad7e2cefc7c..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Bank deposit
 PaymentTypeShortVIR=Bank deposit
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index b28086fa933..22914931db1 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-# Category=Category
-# Categories=Categories
-# Rubrique=Category
-# Rubriques=Categories
-# categories=categories
-# TheCategorie=The category
-# NoCategoryYet=No category of this type created
-# In=In
-# AddIn=Add in
-# modify=modify
-# Classify=Classify
-# CategoriesArea=Categories area
-# ProductsCategoriesArea=Products/Services categories area
-# SuppliersCategoriesArea=Suppliers categories area
-# CustomersCategoriesArea=Customers categories area
-# ThirdPartyCategoriesArea=Third parties categories area
-# MembersCategoriesArea=Members categories area
-# ContactsCategoriesArea=Contacts categories area
-# MainCats=Main categories
-# SubCats=Subcategories
-# CatStatistics=Statistics
-# CatList=List of categories
-# AllCats=All categories
-# ViewCat=View category
-# NewCat=Add category
-# NewCategory=New category
-# ModifCat=Modify category
-# CatCreated=Category created
-# CreateCat=Create category
-# CreateThisCat=Create this category
-# ValidateFields=Validate the fields
-# NoSubCat=No subcategory.
-# SubCatOf=Subcategory
-# FoundCats=Found categories
-# FoundCatsForName=Categories found for the name :
-# FoundSubCatsIn=Subcategories found in the category
-# ErrSameCatSelected=You selected the same category several times
-# ErrForgotCat=You forgot to choose the category
-# ErrForgotField=You forgot to inform the fields
-# ErrCatAlreadyExists=This name is already used
-# AddProductToCat=Add this product to a category?
-# ImpossibleAddCat=Impossible to add the category
-# ImpossibleAssociateCategory=Impossible to associate the category to
-# WasAddedSuccessfully=<b>%s</b> was added successfully.
-# ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-# CategorySuccessfullyCreated=This category %s has been added with success.
-# ProductIsInCategories=Product/service owns to following categories
-# SupplierIsInCategories=Third party owns to following suppliers categories
-# CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-# CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-# MemberIsInCategories=This member owns to following members categories
-# ContactIsInCategories=This contact owns to following contacts categories
-# ProductHasNoCategory=This product/service is not in any categories
-# SupplierHasNoCategory=This supplier is not in any categories
-# CompanyHasNoCategory=This company is not in any categories
-# MemberHasNoCategory=This member is not in any categories
-# ContactHasNoCategory=This contact is not in any categories
-# ClassifyInCategory=Classify in category
-# NoneCategory=None
-# NotCategorized=Without category
-# CategoryExistsAtSameLevel=This category already exists with this ref
-# ReturnInProduct=Back to product/service card
-# ReturnInSupplier=Back to supplier card
-# ReturnInCompany=Back to customer/prospect card
-# ContentsVisibleByAll=The contents will be visible by all
-# ContentsVisibleByAllShort=Contents visible by all
-# ContentsNotVisibleByAllShort=Contents not visible by all
-# CategoriesTree=Categories tree
-# DeleteCategory=Delete category
-# ConfirmDeleteCategory=Are you sure you want to delete this category ?
-# RemoveFromCategory=Remove link with categorie
-# RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-# NoCategoriesDefined=No category defined
-# SuppliersCategoryShort=Suppliers category
-# CustomersCategoryShort=Customers category
-# ProductsCategoryShort=Products category
-# MembersCategoryShort=Members category
-# SuppliersCategoriesShort=Suppliers categories
-# CustomersCategoriesShort=Customers categories
-# CustomersProspectsCategoriesShort=Custo./Prosp. categories
-# ProductsCategoriesShort=Products categories
-# MembersCategoriesShort=Members categories
-# ContactCategoriesShort=Contacts categories
-# ThisCategoryHasNoProduct=This category does not contain any product.
-# ThisCategoryHasNoSupplier=This category does not contain any supplier.
-# ThisCategoryHasNoCustomer=This category does not contain any customer.
-# ThisCategoryHasNoMember=This category does not contain any member.
-# ThisCategoryHasNoContact=This category does not contain any contact.
-# AssignedToCustomer=Assigned to a customer
-# AssignedToTheCustomer=Assigned to the customer
-# InternalCategory=Internal category
-# CategoryContents=Category contents
-# CategId=Category id
-# CatSupList=List of supplier categories
-# CatCusList=List of customer/prospect categories
-# CatProdList=List of products categories
-# CatMemberList=List of members categories
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+Category=Category
+Categories=Categories
+Rubrique=Category
+Rubriques=Categories
+categories=categories
+TheCategorie=The category
+NoCategoryYet=No category of this type created
+In=In
+AddIn=Add in
+modify=modify
+Classify=Classify
+CategoriesArea=Categories area
+ProductsCategoriesArea=Products/Services categories area
+SuppliersCategoriesArea=Suppliers categories area
+CustomersCategoriesArea=Customers categories area
+ThirdPartyCategoriesArea=Third parties categories area
+MembersCategoriesArea=Members categories area
+ContactsCategoriesArea=Contacts categories area
+MainCats=Main categories
+SubCats=Subcategories
+CatStatistics=Statistics
+CatList=List of categories
+AllCats=All categories
+ViewCat=View category
+NewCat=Add category
+NewCategory=New category
+ModifCat=Modify category
+CatCreated=Category created
+CreateCat=Create category
+CreateThisCat=Create this category
+ValidateFields=Validate the fields
+NoSubCat=No subcategory.
+SubCatOf=Subcategory
+FoundCats=Found categories
+FoundCatsForName=Categories found for the name :
+FoundSubCatsIn=Subcategories found in the category
+ErrSameCatSelected=You selected the same category several times
+ErrForgotCat=You forgot to choose the category
+ErrForgotField=You forgot to inform the fields
+ErrCatAlreadyExists=This name is already used
+AddProductToCat=Add this product to a category?
+ImpossibleAddCat=Impossible to add the category
+ImpossibleAssociateCategory=Impossible to associate the category to
+WasAddedSuccessfully=<b>%s</b> was added successfully.
+ObjectAlreadyLinkedToCategory=Element is already linked to this category.
+CategorySuccessfullyCreated=This category %s has been added with success.
+ProductIsInCategories=Product/service owns to following categories
+SupplierIsInCategories=Third party owns to following suppliers categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
+MemberIsInCategories=This member owns to following members categories
+ContactIsInCategories=This contact owns to following contacts categories
+ProductHasNoCategory=This product/service is not in any categories
+SupplierHasNoCategory=This supplier is not in any categories
+CompanyHasNoCategory=This company is not in any categories
+MemberHasNoCategory=This member is not in any categories
+ContactHasNoCategory=This contact is not in any categories
+ClassifyInCategory=Classify in category
+NoneCategory=None
+NotCategorized=Without category
+CategoryExistsAtSameLevel=This category already exists with this ref
+ReturnInProduct=Back to product/service card
+ReturnInSupplier=Back to supplier card
+ReturnInCompany=Back to customer/prospect card
+ContentsVisibleByAll=The contents will be visible by all
+ContentsVisibleByAllShort=Contents visible by all
+ContentsNotVisibleByAllShort=Contents not visible by all
+CategoriesTree=Categories tree
+DeleteCategory=Delete category
+ConfirmDeleteCategory=Are you sure you want to delete this category ?
+RemoveFromCategory=Remove link with categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
+NoCategoriesDefined=No category defined
+SuppliersCategoryShort=Suppliers category
+CustomersCategoryShort=Customers category
+ProductsCategoryShort=Products category
+MembersCategoryShort=Members category
+SuppliersCategoriesShort=Suppliers categories
+CustomersCategoriesShort=Customers categories
+CustomersProspectsCategoriesShort=Custo./Prosp. categories
+ProductsCategoriesShort=Products categories
+MembersCategoriesShort=Members categories
+ContactCategoriesShort=Contacts categories
+ThisCategoryHasNoProduct=This category does not contain any product.
+ThisCategoryHasNoSupplier=This category does not contain any supplier.
+ThisCategoryHasNoCustomer=This category does not contain any customer.
+ThisCategoryHasNoMember=This category does not contain any member.
+ThisCategoryHasNoContact=This category does not contain any contact.
+AssignedToCustomer=Assigned to a customer
+AssignedToTheCustomer=Assigned to the customer
+InternalCategory=Internal category
+CategoryContents=Category contents
+CategId=Category id
+CatSupList=List of supplier categories
+CatCusList=List of customer/prospect categories
+CatProdList=List of products categories
+CatMemberList=List of members categories
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 1b2ea17215b..5580d87b517 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 12a72464cae..f7aed91cf81 100644
--- a/htdocs/langs/mk_MK/donations.lang
+++ b/htdocs/langs/mk_MK/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-# Donation=Donation
-# Donations=Donations
-# DonationRef=Donation ref.
-# Donor=Donor
-# Donors=Donors
-# AddDonation=Add a donation
-# NewDonation=New donation
-# ShowDonation=Show donation
-# DonationPromise=Gift promise
-# PromisesNotValid=Not validated promises
-# PromisesValid=Validated promises
-# DonationsPaid=Donations paid
-# DonationsReceived=Donations received
-# PublicDonation=Public donation
-# DonationsNumber=Donation number
-# DonationsArea=Donations area
-# DonationStatusPromiseNotValidated=Draft promise
-# DonationStatusPromiseValidated=Validated promise
-# DonationStatusPaid=Donation received
-# DonationStatusPromiseNotValidatedShort=Draft
-# DonationStatusPromiseValidatedShort=Validated
-# DonationStatusPaidShort=Received
-# ValidPromess=Validate promise
-# DonationReceipt=Donation receipt
-# BuildDonationReceipt=Build receipt
-# DonationsModels=Documents models for donation receipts
-# LastModifiedDonations=Last %s modified donations
-# SearchADonation=Search a donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+Donation=Donation
+Donations=Donations
+DonationRef=Donation ref.
+Donor=Donor
+Donors=Donors
+AddDonation=Create a donation
+NewDonation=New donation
+ShowDonation=Show donation
+DonationPromise=Gift promise
+PromisesNotValid=Not validated promises
+PromisesValid=Validated promises
+DonationsPaid=Donations paid
+DonationsReceived=Donations received
+PublicDonation=Public donation
+DonationsNumber=Donation number
+DonationsArea=Donations area
+DonationStatusPromiseNotValidated=Draft promise
+DonationStatusPromiseValidated=Validated promise
+DonationStatusPaid=Donation received
+DonationStatusPromiseNotValidatedShort=Draft
+DonationStatusPromiseValidatedShort=Validated
+DonationStatusPaidShort=Received
+ValidPromess=Validate promise
+DonationReceipt=Donation receipt
+BuildDonationReceipt=Build receipt
+DonationsModels=Documents models for donation receipts
+LastModifiedDonations=Last %s modified donations
+SearchADonation=Search a donation
+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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/mk_MK/exports.lang b/htdocs/langs/mk_MK/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/mk_MK/exports.lang
+++ b/htdocs/langs/mk_MK/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang
index 0a5b3e15467..c79da05364e 100644
--- a/htdocs/langs/mk_MK/interventions.lang
+++ b/htdocs/langs/mk_MK/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-# Intervention=Intervention
-# Interventions=Interventions
-# InterventionCard=Intervention card
-# NewIntervention=New intervention
-# AddIntervention=Add intervention
-# ListOfInterventions=List of interventions
-# EditIntervention=Edit intervention
-# ActionsOnFicheInter=Actions on intervention
-# LastInterventions=Last %s interventions
-# AllInterventions=All interventions
-# CreateDraftIntervention=Create draft
-# CustomerDoesNotHavePrefix=Customer does not have a prefix
-# InterventionContact=Intervention contact
-# DeleteIntervention=Delete intervention
-# ValidateIntervention=Validate intervention
-# ModifyIntervention=Modify intervention
-# DeleteInterventionLine=Delete intervention line
-# ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-# ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-# ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-# ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-# NameAndSignatureOfInternalContact=Name and signature of intervening :
-# NameAndSignatureOfExternalContact=Name and signature of customer :
-# DocumentModelStandard=Standard document model for interventions
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-# ClassifyBilled=Classify "Billed"
-# StatusInterInvoiced=Billed
-# RelatedInterventions=Related interventions
-# ShowIntervention=Show intervention
+Intervention=Intervention
+Interventions=Interventions
+InterventionCard=Intervention card
+NewIntervention=New intervention
+AddIntervention=Create intervention
+ListOfInterventions=List of interventions
+EditIntervention=Edit intervention
+ActionsOnFicheInter=Actions on intervention
+LastInterventions=Last %s interventions
+AllInterventions=All interventions
+CreateDraftIntervention=Create draft
+CustomerDoesNotHavePrefix=Customer does not have a prefix
+InterventionContact=Intervention contact
+DeleteIntervention=Delete intervention
+ValidateIntervention=Validate intervention
+ModifyIntervention=Modify intervention
+DeleteInterventionLine=Delete intervention line
+ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
+ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
+ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
+ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
+NameAndSignatureOfInternalContact=Name and signature of intervening :
+NameAndSignatureOfExternalContact=Name and signature of customer :
+DocumentModelStandard=Standard document model for interventions
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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
-# TypeContact_fichinter_external_BILLING=Billing customer contact
-# TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention
+TypeContact_fichinter_internal_INTERVENING=Intervening
+TypeContact_fichinter_external_BILLING=Billing customer contact
+TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
-# ArcticNumRefModelDesc1=Generic number model
-# ArcticNumRefModelError=Failed to activate
-# PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-# PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Generic number model
+ArcticNumRefModelError=Failed to activate
+PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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<br/>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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-# 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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
+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 <b>%s</b> ?
-# ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
-# 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 <b>%s</b> ?
+ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
+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 <b>%s</b> ?
+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.<br><br>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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
-# SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 <a href="http://www.paybox.com" target="_blank">Paybox</a> 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 <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> 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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 3bb65c295d2..f6111bac684 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -1,76 +1,80 @@
 # Dolibarr language file - Source file is en_US - sendings
-# RefSending=Ref. shipment
-# Sending=Shipment
-# Sendings=Shipments
-# Shipment=Shipment
-# Shipments=Shipments
-# Receivings=Receivings
-# SendingsArea=Shipments area
-# ListOfSendings=List of shipments
-# SendingMethod=Shipping method
-# SendingReceipt=Shipping receipt
-# LastSendings=Last %s shipments
-# SearchASending=Search for shipment
-# StatisticsOfSendings=Statistics for shipments
-# NbOfSendings=Number of shipments
-# NumberOfShipmentsByMonth=Number of shipments by month
-# SendingCard=Shipping card
-# NewSending=New shipment
-# CreateASending=Create a shipment
-# CreateSending=Create shipment
-# QtyOrdered=Qty ordered
-# QtyShipped=Qty shipped
-# QtyToShip=Qty to ship
-# QtyReceived=Qty received
-# KeepToShip=Keep to ship
-# OtherSendingsForSameOrder=Other shipments for this order
-# DateSending=Date sending order
-# DateSendingShort=Date sending order
-# SendingsForSameOrder=Shipments for this order
-# SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-# SendingsToValidate=Shipments to validate
-# StatusSendingCanceled=Canceled
-# StatusSendingDraft=Draft
-# StatusSendingValidated=Validated (products to ship or already shipped)
-# StatusSendingProcessed=Processed
-# StatusSendingCanceledShort=Canceled
-# StatusSendingDraftShort=Draft
-# StatusSendingValidatedShort=Validated
-# StatusSendingProcessedShort=Processed
-# SendingSheet=Sending sheet
-# Carriers=Carriers
-# Carrier=Carrier
-# CarriersArea=Carriers area
-# NewCarrier=New carrier
-# ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-# ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-# ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-# GenericTransport=Generic transport
-# Enlevement=Gotten by customer
-# DocumentModelSimple=Simple document model
-# DocumentModelMerou=Merou A5 model
-# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-# DateDeliveryPlanned=Planed date of delivery
-# DateReceived=Date delivery received
-# SendShippingByEMail=Send shipment by EMail
-# SendShippingRef=Send shipment %s
-# ActionsOnShipping=Events on shipment
-# LinkToTrackYourPackage=Link to track your package
-# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+Shipment=Shipment
+Shipments=Shipments
+Receivings=Receivings
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+SendingReceipt=Shipping receipt
+LastSendings=Last %s shipments
+SearchASending=Search for shipment
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipping card
+NewSending=New shipment
+CreateASending=Create a shipment
+CreateSending=Create shipment
+QtyOrdered=Qty ordered
+QtyShipped=Qty shipped
+QtyToShip=Qty to ship
+QtyReceived=Qty received
+KeepToShip=Keep to ship
+OtherSendingsForSameOrder=Other shipments for this order
+DateSending=Date sending order
+DateSendingShort=Date sending order
+SendingsForSameOrder=Shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingCanceledShort=Canceled
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Sending sheet
+Carriers=Carriers
+Carrier=Carrier
+CarriersArea=Carriers area
+NewCarrier=New carrier
+ConfirmDeleteSending=Are you sure you want to delete this shipment ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
+ConfirmCancelSending=Are you sure you want to cancel this shipment ?
+GenericTransport=Generic transport
+Enlevement=Gotten by customer
+DocumentModelSimple=Simple document model
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planed date of delivery
+DateReceived=Date delivery received
+SendShippingByEMail=Send shipment by EMail
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
 
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/mk_MK/shop.lang b/htdocs/langs/mk_MK/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/mk_MK/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index 01c90ede80f..b1545d6ca3c 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
-# Suppliers=Suppliers
-# Supplier=Supplier
-# AddSupplier=Add a supplier
-# SupplierRemoved=Supplier removed
-# SuppliersInvoice=Suppliers invoice
-# NewSupplier=New supplier
-# History=History
-# ListOfSuppliers=List of suppliers
-# ShowSupplier=Show supplier
-# OrderDate=Order date
-# BuyingPrice=Buying price
-# BuyingPriceMin=Minimum buying price
-# BuyingPriceMinShort=Min buying price
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
-# AddSupplierPrice=Add supplier price
-# ChangeSupplierPrice=Change supplier price
-# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-# NoRecordedSuppliers=No suppliers recorded
-# SupplierPayment=Supplier payment
-# SuppliersArea=Suppliers area
-# RefSupplierShort=Ref. supplier
-# Availability=Availability
-# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-# ExportDataset_fournisseur_2=Supplier invoices and payments
-# ExportDataset_fournisseur_3=Supplier orders and order lines
-# ApproveThisOrder=Approve this order
-# ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-# DenyingThisOrder=Denying this order
-# ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-# ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-# AddCustomerOrder=Create customer order
-# AddCustomerInvoice=Create customer invoice
-# AddSupplierOrder=Create supplier order
-# AddSupplierInvoice=Create supplier invoice
-# ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-# NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-# SentToSuppliers=Sent to suppliers
+Suppliers=Suppliers
+Supplier=Supplier
+AddSupplier=Add a supplier
+SupplierRemoved=Supplier removed
+SuppliersInvoice=Suppliers invoice
+NewSupplier=New supplier
+History=History
+ListOfSuppliers=List of suppliers
+ShowSupplier=Show supplier
+OrderDate=Order date
+BuyingPrice=Buying price
+BuyingPriceMin=Minimum buying price
+BuyingPriceMinShort=Min buying price
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add supplier price
+ChangeSupplierPrice=Change supplier price
+ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+NoRecordedSuppliers=No suppliers recorded
+SupplierPayment=Supplier payment
+SuppliersArea=Suppliers area
+RefSupplierShort=Ref. supplier
+Availability=Availability
+ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
+ExportDataset_fournisseur_2=Supplier invoices and payments
+ExportDataset_fournisseur_3=Supplier orders and order lines
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+DenyingThisOrder=Denying this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+AddCustomerOrder=Create customer order
+AddCustomerInvoice=Create customer invoice
+AddSupplierOrder=Create supplier order
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
+NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang
index 55ce45bfce8..4b0501a8346 100644
--- a/htdocs/langs/mk_MK/trips.lang
+++ b/htdocs/langs/mk_MK/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-# TF_OTHER=Other
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+Trip=Trip
+Trips=Trips
+TripsAndExpenses=Trips and expenses
+TripsAndExpensesStatistics=Trips and expenses statistics
+TripCard=Trip card
+AddTrip=Add trip
+ListOfTrips=List of trips
+ListOfFees=List of fees
+NewTrip=New trip
+CompanyVisited=Company/foundation visited
+Kilometers=Kilometers
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete trip
+ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+TF_OTHER=Other
+TF_LUNCH=Lunch
+TF_TRIP=Trip
+ListTripsAndExpenses=List of trips and expenses
+ExpensesArea=Trips and expenses area
+SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..8c7bb031ba0
--- /dev/null
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Regnskap
+Globalparameters=Globale parametre
+Chartofaccounts=Chart of accounts
+Fiscalyear=Regnskapsår
+Menuaccount=Regnskapskonti
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Verktøy
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Tredjepart
+Labelcompte=Kontoetikett
+Debit=Debet
+Credit=Kredit
+Amount=Beløp
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Slett innholdet i hovedboken
+
+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
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 66741fed3c8..af6294c16fe 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -45,15 +45,19 @@ ErrorModuleRequireDolibarrVersion=Feil: Denne modulen krever Dolibarr versjon %s
 ErrorDecimalLargerThanAreForbidden=Feil: Presisjon over <b>%s</b> støttes ikke.
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Value 'system' og 'systemauto' for type er reservert. Du kan bruke 'user' som verdi å legge til din egen oppføring
 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
@@ -118,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)
@@ -143,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 <b>%s</b>). 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 <b>%s</b> definert for Syslog modul (ingen risiko for å miste data)
 PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (medfører ingen risiko for å miste data)
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatisk hvis Javascript er slått av
 AvailableOnlyIfJavascriptNotDisabled=Tilgjengelig bare når JavaScript ikke er slått av
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Tilgjengelig bare hvis Javascript og Ajax ikke er slått av
 Required=Påkrevet
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Sikkerhet
 Passwords=Passord
 DoNotStoreClearPassword=Har ingen butikk klar passord i databasen men butikken bare kryptert verdi (Aktiverte anbefales)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-server (Settes ikke i PHP på
 MAIN_MAIL_EMAIL_FROM=Avsenders e-postadresse for automatiske e-poster (I php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Avsender e-post brukes for feil avkastning e-poster sendt
 MAIN_MAIL_AUTOCOPY_TO= Send systematisk en skjult karbon-kopi av alle sendte e-post til
+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=Slå av alle e-postutsendelser (for testformål eller demonstrasjoner)
 MAIN_MAIL_SENDMODE=Metoden å bruke for å sende e-post
 MAIN_MAIL_SMTPS_ID=SMTP-ID hvis godkjenning kreves
@@ -289,7 +298,7 @@ DownloadPackageFromWebSite=Last ned pakken fra nettstedet %s.
 UnpackPackageInDolibarrRoot=Pakk ut filen i Dolibarrs rotmappe <b>%s</b>
 SetupIsReadyForUse=Installasjonen er ferdig og Dolibarr er klar til bruk med den nye modulen.
 NotExistsDirect=Alternativ rotkatalog er ikke definert. <br>
-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.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
+InfDirAlt=Etter versjon 3 er det mulig å definere en alternativ rotkatalog. Dette lar deg lagre plug-ins og egendefinerte maler på samme sted.<br>Bare lag en katalog i roten av Dolibarr (f.eks: egendefinert).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
 YouCanSubmitFile=Velg modul:
 CurrentVersion=Dolibarr gjeldende versjon
@@ -300,8 +309,8 @@ GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}<
 GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er ikke tillatt. <br>
 GenericMaskCodes4a=<u>Eksempel på 99nde %s av tredje part TheCompany gjort 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Eksempel på tredjeparts opprettet på 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
+GenericMaskCodes4c=<u>Eksempel på produkt opprettet 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b>
 GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal.
 ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen <b>%s</b> på port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Serveren er ikke tilgjengelig på adressen  <b>%s</b> på port <b>%s</b>
@@ -387,7 +396,7 @@ LinkToTest=Klikkbar link generert for <strong>bruker%s</strong> (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 <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce direkte
-Module800Desc=Viser nettbutikk (OSCommerce eller OSCSS) via direkte databasetilgang
-Module900Name=OSCommerce med WS
-Module900Desc=Viser en OSCommerce nettbutikk via Web services.\nDenne modulen krever at du installerer komponenter fra  /oscommerce_ws/ws_server i din OSCommerce server. Se filen README i /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantisintegrasjon
 Module1400Name=Regnskapsekspert
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Lage/endre avgifter og MVA
 Permission93=Slette avgifter og MVA
 Permission94=Eksporter sosiale bidrag
 Permission95=Vise rapporter
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice's accountancy lines
 Permission101=Vise forsendelser
 Permission102=Lage/endre forsendelser
 Permission104=Godjenne forsendelser
@@ -603,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
@@ -668,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
@@ -698,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
@@ -745,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
@@ -771,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Profesjonell Id unik
 MustBeUnique=Må være unik?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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.<br>Full url vil være: URL?login=...&password=...&caller=...&called=phonecalled
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 c748e6128b6..b277a015704 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID hendelse
 Actions=Handlinger
 ActionsArea=Handlingsområde (Hendelser og oppgaver)
-Agenda= Agenda
-Agendas= Agendaer
-Calendar= Kalender
-Calendars= Kalendrer
-LocalAgenda=Lokal kalender
-AffectedTo= Relatert til
-DoneBy= Utført av
-Events= Hendelser
+Agenda=Agenda
+Agendas=Agendaer
+Calendar=Kalender
+Calendars=Kalendrer
+LocalAgenda=Intern kalender
+ActionsOwnedBy=Hendelse tilhører
+AffectedTo=Relatert til
+DoneBy=Utført av
+Event=Hendelse
+Events=Hendelser
 EventsNb=Antall hendelser
 MyEvents=Mine hendelser
 OtherEvents=Andre arrangementer
@@ -17,31 +19,33 @@ ListOfActions=Oversikt over hendelser
 Location=Lokasjon
 EventOnFullDay=Event på full dag
 SearchAnAction= Finn handling/oppgave
-MenuToDoActions= Alle åpne handlinger
-MenuDoneActions= Alle avsluttede handlinger
-MenuToDoMyActions= Mine åpne handlinger
-MenuDoneMyActions= Mine avsluttede handlinger
-ListOfEvents= Oversikt over Dolibarr-hendelser
+MenuToDoActions=Alle åpne handlinger
+MenuDoneActions=Alle avsluttede handlinger
+MenuToDoMyActions=Mine åpne handlinger
+MenuDoneMyActions=Mine avsluttede handlinger
+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
+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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Startdato
 DateActionEnd= Sluttdato
 AgendaUrlOptions1=Du kan også bruke følgende parametere til å filtrere listen:
 AgendaUrlOptions2=<b>login=%s</b> for å begrense utvalg til handlinger registrert av, relatert til eller utført av bruker <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> for å begrense utvalg til handlinger registrert av bruker <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> for å begrense utvalg til handlinger relatert til bruker <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> for å begrense utvalg til handlinger utført av bruker <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Vis fødselsdager
 AgendaHideBirthdayEvents=Skjul fødselsdager
 Busy=Opptatt
 ExportDataset_event1=Liste over agenda hendelser
-
+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=Vis eksterne kalendere til agenda
+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=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 23046891b51..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 <b>kreditnota</b> 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.).<br><br>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. <br> 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. <br> Edit your entry, otherwise confirm.
@@ -85,8 +85,9 @@ ClassifyPaid=Merk 'Betalt'
 ClassifyPaidPartially=Merk 'Delbetalt'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Er du sikker på at du vil kansellere faktura <b>%s</b> ?
 ConfirmCancelBillQuestion=hvorfor vil du tapsføre denne fakturaen?
 ConfirmClassifyPaidPartially=Er du sikker på at du vil endre status på faktura <b>%s</b> til betalt?
 ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hva er grunnen til at du vil lukke fakturaen?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rebatten.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet <b>(%s %s)</b> er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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)
-SendBillRef=Send faktura %s
-SendReminderBillRef=Send faktura %s (påminnelse)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Utestående ordre
 StandingOrder=Utestående ordre
 NoDraftBills=Ingen fakturakladder
@@ -219,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Totalt to nye rabatt må være lik original
 ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabatten?
 RelatedBill=Relaterte faktura
 RelatedBills=Relaterte fakturaer
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Kontant
@@ -312,10 +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
@@ -365,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
@@ -392,9 +391,9 @@ PayedByThisPayment=Betales av denne betalingen
 ClosePaidInvoicesAutomatically=Klassifisere &quot;betalt&quot; 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 &quot;betales&quot;.
-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 9fabd9f4133..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,3 +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=Legg til følgende produkt/tjeneste
+ShowCategory=Show category
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index acc45333969..81f355a8e62 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Du må opprette e-postmeldinger kontakter for tredjepa
 ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste av prospekter
 ListCustomersShort=Liste over kunder
-ThirdPartiesArea=Tredje parter område
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Siste %s endret tredjeparter
 UniqueThirdParties=Totalt unike tredjeparter
 InActivity=Åpent
@@ -410,3 +410,5 @@ OutstandingBillReached=Nådd maks. for utestående regning
 MonkeyNumRefModelDesc=Tilbake numero med format %syymm-nnnn for kunden koden og %syymm-nnnn for leverandør koden der åå er året, er mm måned og nnnn er en sekvens uten pause og ingen retur til 0.
 LeopardNumRefModelDesc=Kunde / leverandør-koden er gratis. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 53d0c060922..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 898856341ac..9d2ec5ceac9 100644
--- a/htdocs/langs/nb_NO/donations.lang
+++ b/htdocs/langs/nb_NO/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donasjon
 Donations=Donasjoner
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=Giver
 Donors=Givere
-AddDonation=Legg til donasjon
+AddDonation=Create a donation
 NewDonation=Ny donasjon
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=Lovet donasjon
 PromisesNotValid=Ikke godkjente løfter
 PromisesValid=Godkjente løfter
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Kladd
 DonationStatusPromiseValidatedShort=Godkjent
 DonationStatusPaidShort=Mottatt
 ValidPromess=Valider lover
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=Opprett kvittering
 DonationsModels=Dokumentmal for donasjonskvitteringer
 LastModifiedDonations=Siste %s endret donasjoner
 SearchADonation=Søk etter donasjon
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 74b10669344..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 &quot;%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 <b>%s</b> 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 <b>%s</b> brukes til å utføre web-server har ikke tillatelse til at
 ErrorNoActivatedBarcode=Ingen strekkodetype aktivert
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index 3171d99c57d..2477c01aff7 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Kontonummer
 BankAccountNumberKey=Nøkkel
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 43d8718f4f1..77547730107 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Startdato
 DateFinCP=Sluttdato
@@ -18,24 +18,24 @@ ApprovedCP=Godkjent
 CancelCP=Kansellert
 RefuseCP=Nektet
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Beskrivelse
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Rediger
 DeleteCP=Slett
 ActionValidCP=Godkjenn
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Avbryt
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Oppdater
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Begrunnelse
 UserCP=Bruker
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Godkjenn
 UpdateEventCP=Update events
 CreateEventCP=Opprett
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Oppdater
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index d312a657ef4..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
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=Er du sikker på at du vil slette denne intervensj
 NameAndSignatureOfInternalContact=Navn og signatur tekniker :
 NameAndSignatureOfExternalContact=Navn og signatutr kunde :
 DocumentModelStandard=Standard dokumentet modell for intervensjoner
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Klassifisere &quot;Faktureres&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=Generisk nummereringsmodell
 ArcticNumRefModelError=Feil ved aktivering
 PacificNumRefModelDesc1=Gir et nummer med formatet %sååmm-nnnn hvor åå er året, mm er måneden og nnnn er et løpenummer som ikke settes tilbake til null
 PacificNumRefModelError=Det finnes allerede et intervensjonskort som starter med  $sååmm, og dette er ikke kompatibelt med denne nummereringsmodellen. Du må fjerne denne for å aktivere denne modellen.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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=<b>%s</b> recipients added into target list
+XTargetsAdded=<b>%s</b> 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 <b>til %s</b> mottakere ved å sende økten.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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. <br><br> 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 db52ea1dc67..6590ee183f2 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Lukket
 ContractStatusRunning=Løpende
 ContractStatusExpired=utløpt
 ContractStatusOnHold=Ikke i gang
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=Denne kontrakten er ikke i gang
 ErrorProductAlreadyExists=En vare med varenummere %s eksisterer allerede.
 ErrorProductBadRefOrLabel=Ugyldig varenummer eller navn.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Leverandører
 SupplierRef=Leverandør ref.
 ShowProduct=Vis vare
@@ -116,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
@@ -131,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?
@@ -154,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
@@ -178,7 +179,7 @@ CloneProduct=Klon produkt eller tjeneste
 ConfirmCloneProduct=Er du sikker på at du vil klone produktet eller tjenesten <b>%s?</b>
 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
@@ -190,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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 ec593c17b16..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
@@ -85,13 +87,13 @@ ActionsOnProject=Handlinger på prosjektet
 YouAreNotContactOfProject=Du er ikke en kontakt på denne private prosjektet
 DeleteATimeSpent=Slett tidsbruk
 ConfirmDeleteATimeSpent=Er du sikker på at du vil slette denne gangen brukt?
-DoNotShowMyTasksOnly=Se også oppgaver jeg er ikke påvirket
-ShowMyTasksOnly=Se bare oppgaver jeg er berørt
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressurser
 ProjectsDedicatedToThisThirdParty=Prosjekter dedikert til denne tredje part
 NoTasks=Ingen oppgaver for dette prosjektet
 LinkedToAnotherCompany=Knyttet opp til andre tredjepart
-TaskIsNotAffectedToYou=Oppgaven ikke allokert til deg
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Tid brukt er tom
 ThisWillAlsoRemoveTasks=Denne handlingen vil også slette alle oppgaver av prosjektet <b>(%s</b> oppgaver for øyeblikket) og alle innganger av medgått tid.
 IfNeedToUseOhterObjectKeepEmpty=Dersom noen objekter (faktura, orden, ...), som tilhører en annen tredjepart, må knyttes til prosjektet for å lage, beholde denne tomme for å få prosjektet blir flere tredjeparter.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=En komplett prosjektets rapport modell (logo. ..)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 00f52d72b18..7c11ec56d1e 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=Siste %s leveringer
 SearchASending=Finn levering
 StatisticsOfSendings=Statistikk
 NbOfSendings=Antall leveringer
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Leveringekort
 NewSending=Ny levering
 CreateASending=Lag en levering
@@ -50,27 +50,31 @@ Enlevement=Hentet av kunde
 DocumentModelSimple=ENkel dokumentmodell
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Advarsel, ingen produkter venter sendes.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Høvlet levering
 DateReceived=Dato levering mottatt
 SendShippingByEMail=Send forsendelse via e-post
-SendShippingRef=Send forsendelse %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Hendelser på forsendelse
 LinkToTrackYourPackage=Lenke for å spore pakken
 ShipmentCreationIsDoneFromOrder=For øyeblikket er opprettelsen av en ny forsendelse gjort fra ordren kortet.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Enkelt dokument modellen for levering kvitteringer
 DocumentModelTyphon=Mer fullstendig dokument modellen for levering kvitteringer (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke definert
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/nb_NO/shop.lang b/htdocs/langs/nb_NO/shop.lang
deleted file mode 100644
index 0a89a344017..00000000000
--- a/htdocs/langs/nb_NO/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Butikk
-ShopWeb=Nettbutikk
-LastOrders=Siste ordre
-OnStandBy=På vent
-TreatmentInProgress=Under behandling
-LastCustomers=Siste kunder
-OSCommerceShop=OSCommerce butikk
-OSCommerce=OSCommerce
-AddProd=Selg i nettbutikk
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/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index d5dbd74233a..a71a1ec74a4 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Opprett innkjøpsfaktura
 ListOfSupplierProductForSupplier=Oversikt over produkter og priser for leverandøren <b>%s</b>
 NoneOrBatchFileNeverRan=Ingen eller batch <b>%s</b> ikke løp nylig
 SentToSuppliers=Sendt til leverandører
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index 0c3b2992dd5..c96afd01553 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Reise
 ListTripsAndExpenses=Liste over turer og utgifter
 ExpensesArea=Turer og utgifter området
 SearchATripAndExpense=Søk etter tur og regning
+ClassifyRefunded=Classify 'Refunded'
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 <b>intern</b> bruker er er en som er en del av firmaet/organisasjonen.<br>En <b>ekstern</b> bruker er en kunde, leverandør eller annen tredjeperson.<br><br>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=<b>login=%s</b> om de uitkomst van de acties te beperken:  gemaakt door, beïnvloed door of gedaan door gebruiker <b>%s</b>
 AgendaUrlOptions3=<b>logina=%s</b> om de uitkomst van de acties te beperken:  gemaakt door gebruiker <b>%s</b>
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions affected to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> om de uitkomst van de acties te beperken: gedaan door gebruiker <b>%s</b>
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 <b>%s</b> is niet gedefinieerd binnen D
 ErrorCantLoadUserFromDolibarrDatabase=Niet vinden van gebruiker <b>%s</b> 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/shop.lang b/htdocs/langs/nl_BE/shop.lang
deleted file mode 100644
index b491fb35e91..00000000000
--- a/htdocs/langs/nl_BE/shop.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-LastCustomers=Laatste klanten
-OSCommerceShop=OSCommerce shop
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 <b>%s</b> 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 <b>interne</b> gebruiker is een gebruiker die deel uitmaakt van uw bedrijf. <br> Een <b>externe</b> gebruiker is een klant, leverancier of andere. <br><br> 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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 80c59d57c18..91728e6f234 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s o
 ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan <b>%s</b> wordt niet ondersteund.
 DictionarySetup=Woordenboek setup
 Dictionary=Woordenboeken
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
 ErrorCodeCantContainZero=Code mag geen 0 bevatten
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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'
@@ -133,7 +137,7 @@ Box=Vak
 Boxes=Vakken
 MaxNbOfLinesForBoxes=Max aantal regels voor de vakken
 PositionByDefault=Standaardvolgorde
-Position=Volgorde
+Position=Position
 MenusDesc=Menuverwerkers bepalen de inhoud van de 2 menubalken (horizontale en verticale menubalken).
 MenusEditorDesc=Met behulp van de menu-editor kunt u gepersonaliseerde items in menu's instellen. Gebruik deze functionaliteit zorgvuldig om te vermijden dat Dolibarr instabiel wordt en menu-items permanent onbereikbaar worden.<br>Sommige modules voegen items toe in de menu's (in de meeste gevallen in het menu <b>Alle</b>). Als u sommige van deze items per ongeluk verwijderd, kunt u ze herstellen de module eerst uit te schakelen en daarna opnieuw in te schakelen.
 MenuForUsers=Gebruikersmenu
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatisch als Javascript is uitgeschakeld
 AvailableOnlyIfJavascriptNotDisabled=Alleen beschikbaar als JavaScript niet is uitgeschakeld
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Alleen beschikbaar als JavaScript en AJAX niet zijn uitgeschakeld
 Required=Verplicht
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Beveiliging
 Passwords=Wachtwoorden
 DoNotStoreClearPassword=Geen onversleutelde wachtwoorden opslaan in de database, maar alleen versleutelde (Activering aanbevolen)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-host (Niet gedefiniee
 MAIN_MAIL_EMAIL_FROM=E-mailafzender voor automatische e-mails (Standaard in php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Afzender e-mail gebruikt voor error rendementen e-mails verzonden
 MAIN_MAIL_AUTOCOPY_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle verzonden e-mails naar
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Schakel alle e-mailverzendingen uit (voor testdoeleinden of demonstraties)
 MAIN_MAIL_SENDMODE=Te gebruiken methode om e-mails te verzenden
 MAIN_MAIL_SMTPS_ID=SMTP-gebruikersnaam indien verificatie vereist
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce door directe databasetoegang
-Module800Desc=Interface om een OSCommerce of osCSS winkel via directe databasetoegang weer te geven
-Module900Name=OSCommerce door WS
-Module900Desc=Interface om een OSCommerce winkel via webdiensten weer te geven. Deze module vereist installatie van componenten van /oscommerce_ws/ws_server in uw OSCommerce server. Zie het README bestand in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integratie
 Module1400Name=Boekhouden
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Creëer / wijzig sociale bijdragen en BTW
 Permission93=Verwijder sociale bijdragen en BTW
 Permission94=Exporteer sociale bijdragen
 Permission95=Bekijk de verslagen
-Permission96=Verzendingsinstellingen
-Permission97=Bekijk factuur boekhouding verzending
-Permission98=Verzending van de factuur boekhoudkundige regel
 Permission101=Bekijk verzendingen
 Permission102=Creëer / wijzig verzendingen
 Permission104=Valideer verzendingen
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Geef een boekhoudkundige code terug opgebouwd uit "401
 ModuleCompanyCodePanicum=Geef een lege boekhoudkundige code terug.
 ModuleCompanyCodeDigitaria=Boekhoudkundige-code is afhankelijk van derden code. De code bestaat uit het teken "C" in de eerste positie, gevolgd door de eerste 5 tekens van de derden code.
 UseNotifications=Gebruik kennisgevingen
-NotificationsDesc=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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Professionele Id unieke
 MustBeUnique=Moet uniek zijn?
 MustBeMandatory=Verplicht om relaties te creëren?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> zal vervangen worden met het telefoonnummer dat gebeld moet worden<br><b>__PHONEFROM__</b> zal worden vervangen met het telefoonnummer van de bellende persoon (uw telefoonnummer)<br><b>__LOGIN__</b> zal vervangen worden door uw 'Click-To-Dial'-accountgebruikersnaam (Zoals ingesteld op uw gebruikerskaartdetails<br><b>__PASS__</b> zal vervangen worden door uw "Click-To-Dial"-accountwachtwoord (Zoals ingesteld op uw gebruikerskaartdetails).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 f20011a9cff..7ba26ccd595 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID gebeurtenis
 Actions=Acties
 ActionsArea=Actieoverzicht (Gebeurtenissen en taken)
-Agenda= Agenda
-Agendas= Agenda's
-Calendar= Kalender
-Calendars= Kalenders
-LocalAgenda=Lokale kalender
-AffectedTo= Geaffecteerden
-DoneBy= Gedaan door
-Events= Gebeurtenissen
+Agenda=Agenda
+Agendas=Agenda's
+Calendar=Kalender
+Calendars=Kalenders
+LocalAgenda=Interne kalender
+ActionsOwnedBy=Event owned by
+AffectedTo=Geaffecteerden
+DoneBy=Gedaan door
+Event=Event
+Events=Gebeurtenissen
 EventsNb=Aantal gebeurtenissen
 MyEvents=Mijn evenementen
 OtherEvents=Andere evenementen
@@ -17,31 +19,33 @@ ListOfActions=Gebeurtenissenlijst
 Location=Locatie
 EventOnFullDay=Gebeurtenis volledige dag
 SearchAnAction= Zoek een actie / taak
-MenuToDoActions= Alle openstaande acties
-MenuDoneActions= Alle beëindigde acties
-MenuToDoMyActions= Mijn openstaande acties
-MenuDoneMyActions= Mijn beëindigde acties
-ListOfEvents= Dolibarr gebeurtenissenlijst
+MenuToDoActions=Alle openstaande acties
+MenuDoneActions=Alle beëindigde acties
+MenuToDoMyActions=Mijn openstaande acties
+MenuDoneMyActions=Mijn beëindigde acties
+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
 ViewCal=Bekijk kalender
 ViewDay=Dag te bekijken
 ViewWeek=Weekweergave
-ViewPerUser=Per gebruiker
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Bekijk met voorgedefinieerde filters
 AutoActions= Automatisch invullen van de agenda
 AgendaAutoActionDesc= Stel hier de gebeurtenissen in waarvoor u wilt dat Dolibarr automatische een afspraak in de agenda creëert. Als er niets is aangevinkt (standaard), zullen alleen handmatige acties worden opgenomen in de agenda.
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Startdatum
 DateActionEnd= Einddatum
 AgendaUrlOptions1=U kunt ook de volgende parameters gebruiken om te filteren:
 AgendaUrlOptions2=<b>login=%s</b> om uitvoer van acties gecreëerd door, toegewezen aan of gedaan door gebruiker <b>%s</b> te beperken.
-AgendaUrlOptions3=<b>login=%s</b> om uitvoer van acties gecreëerd door gebruiker <b>%s</b> te beperken.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>login=%s</b> om uitvoer van acties toegewezen aan gebruiker <b>%s</b> te beperken.
-AgendaUrlOptions5=<b>login=%s</b> om uitvoer van acties gedaan door gebruiker <b>%s</b> te beperken.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Toon verjaardagen van contacten
 AgendaHideBirthdayEvents=Verberg verjaardagen van contacten
 Busy=Bezig
 ExportDataset_event1=Lijst van agenda-gebeurtenissen
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export kalender
 ExtSites=Externe agenda
-ExtSitesEnableThisTool=hoe externe kalenders in de agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Aantal kalenders
 AgendaExtNb=Kalender nb %s
 ExtSiteUrlAgenda=URL aan. Ical bestand te openen
 ExtSiteNoLabel=Geen omschrijving
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 69f50ec3ffe..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 <b>creditnota</b> 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).<br><br>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
@@ -85,8 +85,9 @@ ClassifyPaid=Klassificeer 'betaald'
 ClassifyPaidPartially=Classificeer 'gedeeltelijk betaald'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Weet u zeker dat u<b>factuur %s</b> wilt annuleren?
 ConfirmCancelBillQuestion=Waarom zou u deze rekening als 'verlaten' willen classificeren ?
 ConfirmClassifyPaidPartially=Weet u zeker dat u <b>factuur %s</b> 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 <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd gedaan vóór de termijn. Ik regulariseer de BTW met een creditnota.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restant te betalen <b>(%s %s)</b> 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 <b>(%s %s)</b> 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 <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Korting aangeboden (betaling vóór termijn)
-SendBillRef=Stuur factuur %s
-SendReminderBillRef=Stuur factuur %s (herinnering)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Doorlopende opdrachten
 StandingOrder=Doorlopende opdracht
 NoDraftBills=Geen conceptfacturen
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Totaal van de twee nieuwe korting moet geli
 ConfirmRemoveDiscount=Weet u zeker dat u van deze korting wilt verwijderen?
 RelatedBill=Gerelateerde factuur
 RelatedBills=Gerelateerde facturen
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Direct
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index dc4d7fd1ca2..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,3 +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=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 '<b>Datum uitgevoerd</b>' is gevuld, is de actie gestart (of afgelopen), dus veld '<b>Status</b>' kan niet 0%% worden.
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index bad8270ff62..ba55536c159 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=U dient voor de Klant eerst contactpersonen met een e-
 ListSuppliersShort=Leveranciersoverzicht
 ListProspectsShort=Prospectenoverzicht
 ListCustomersShort=Afnemersoverzicht
-ThirdPartiesArea=Overzicht van derde partijen
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Laatste %s bewerkte derde partijen
 UniqueThirdParties=Totaal aantal unieke derde partijen
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Maximum bereikt voor openstaande rekening
 MonkeyNumRefModelDesc=Geeft een nummer als %syymm-nnnn voor afnemerscodes en %sjjmm-nnnn voor leverancierscodes waar jj het jaar is, mm de maand en nnnn een opeenvolgend nummer vanaf 0.
 LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 0d6f8ac174c..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
@@ -187,7 +188,7 @@ AccountancyDashboard=Boekhouding samenvatting
 ByProductsAndServices=Volgens producten en diensten
 RefExt=Externe ref
 ToCreateAPredefinedInvoice=Om een ​​vooraf gedefinieerde factuur maken, maakt een standaard factuur dan, zonder te valideren, klikt u op de knop "Converteer naar voorgedefinieerde factuur".
-LinkedOrder=gekoppeld aan bestelling
+LinkedOrder=Link to order
 ReCalculate=Herberekenen
 Mode1=Methode 1
 Mode2=Methode 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om
 TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een <b>kas boukhoudings-modus</b> is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van <b>betrokkenheid accountancy-modus</b> (zie setup van boukhoud module).
 CalculationMode=Berekeningswijze
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Standaard boekhoud code om producten te kopen
-COMPTA_PRODUCT_SOLD_ACCOUNT=Standaard boekhoud code om producten te verkopen
-COMPTA_SERVICE_BUY_ACCOUNT=Standaard boekhoud code om diensten te kopen
-COMPTA_SERVICE_SOLD_ACCOUNT=Standaard boekhoud code om diensten te verkopen
-COMPTA_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW
-COMPTA_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw
-COMPTA_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties
-COMPTA_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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/donations.lang b/htdocs/langs/nl_NL/donations.lang
index bf72bd7a612..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
@@ -30,3 +30,9 @@ SearchADonation=Zoek een donatie
 DonationRecipient=Gift ontvanger
 ThankYou=Dank u
 IConfirmDonationReception=De ontvanger verklaart ontvangst als gift van het volgende bedrag
+MinimumAmount=Minimum amount is  %s
+FreeTextOnDonations=Free text to show in footer
+FrenchOptions=Options for France
+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 d82ec88a6bf..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 <b>%s</b> 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 <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
 ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 ErrUnzipFails=uitpakken %s mislukt met ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Bron en doel magazijnen moeten verschillend zijn
 ErrorBadFormat=Verkeerd formaat!
-ErrorPaymentDateLowerThanInvoiceDate=Datum van betaling (%s) kan niet voor factuurdatum zijn (%s) voor factuur %s.
 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=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
@@ -154,3 +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
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index 1afaa7b18b7..c35d6a65dbc 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Rekeningnummer
 BankAccountNumberKey=Sleutel
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=Vul hier de waarden in waarop je wil filteren.
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 fa2ce079c18..7986b74bc44 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Begindatum
 DateFinCP=Einddatum
@@ -18,24 +18,24 @@ ApprovedCP=Goedgekeurd
 CancelCP=Geannuleerd
 RefuseCP=Geweigerd
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Beschrijving
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Bewerken
 DeleteCP=Verwijderen
 ActionValidCP=Valideer
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Annuleren
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reden
 UserCP=Gebruiker
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Valideer
 UpdateEventCP=Update events
 CreateEventCP=Creëren
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang
index 33dfc276c21..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Naam en handtekening van de uitvoerder:
 NameAndSignatureOfExternalContact=Naam en handtekening van de afnemer:
 DocumentModelStandard=Standaard modeldocument voor interventies
 InterventionCardsAndInterventionLines=Inteventiebladen en -regels
-ClassifyBilled=Classificeren "Gefactureerd"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>gebruiker %s</b> 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/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. <br><br> 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 62984eceb6a..0902653a39e 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Gesloten
 ContractStatusRunning=Lopende
 ContractStatusExpired=Verstreken
 ContractStatusOnHold=Niet actief
-ContractStatusToRun=In gebruik
+ContractStatusToRun=To get running
 ContractNotRunning=Dit contract is niet actief
 ErrorProductAlreadyExists=Een product met verwijzing %s bestaat reeds.
 ErrorProductBadRefOrLabel=Verkeerde waarde voor de referentie of label.
 ErrorProductClone=Er was een probleem bij het clonen van het product of de dienst.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Leveranciers
 SupplierRef=Leveranciersreferentie
 ShowProduct=Toon product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Kopieer product of dienst
 ConfirmCloneProduct=Weet u zeker dat u het product of de dienst <b>%s</b> 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 b233de69c35..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
@@ -85,13 +87,13 @@ ActionsOnProject=Acties in het project
 YouAreNotContactOfProject=U bent geen contactpersoon van dit privé project
 DeleteATimeSpent=Verwijder gespendeerde tijd
 ConfirmDeleteATimeSpent=Weet u zeker dat u de gespendeerde tijd wilt verwijderen?
-DoNotShowMyTasksOnly=Bekijk ook taken niet aan mij toegewezen
-ShowMyTasksOnly=Bekijk alleen de taken aan mij toegewezen
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Bronnen
 ProjectsDedicatedToThisThirdParty=Projecten gewijd aan deze derde partij
 NoTasks=Geen taken voor dit project
 LinkedToAnotherCompany=Gekoppeld aan een andere derde partij
-TaskIsNotAffectedToYou=Taken niet toegewezen aan u
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Gespendeerde tijd is leeg
 ThisWillAlsoRemoveTasks=Deze actie zal ook alle taken van het project <b>(%s</b> taken op het moment) en alle ingangen van de tijd doorgebracht.
 IfNeedToUseOhterObjectKeepEmpty=Als sommige objecten (factuur, order, ...), die behoren tot een andere derde, moet worden gekoppeld aan het project te maken, houden deze leeg naar het project dat met meerdere derden.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Een compleet projectrapportagemodel (logo, etc)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 4cb99384408..bf423135d82 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Statistiek op verzendingen die bevestigd zijn.  Da
 DateDeliveryPlanned=Geplande leveringsdatum
 DateReceived=Datum leveringsonvangst
 SendShippingByEMail=Stuur verzending per e-mail
-SendShippingRef=Stuur scheepvaart %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Acions op verzendkosten
 LinkToTrackYourPackage=Link naar uw pakket
 ShipmentCreationIsDoneFromOrder=Op dit moment, is oprichting van een nieuwe zending gedaan van de volgorde kaart.
 RelatedShippings=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
 SendingMethodTRANS=Vervoerder
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Eenvoudig leveringsbewijs documentmodel
 DocumentModelTyphon=Completer leveringsbewijs documentmodel (logo, etc)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER niet gedefinieerd
 SumOfProductVolumes=Som van alle productvolumes
 SumOfProductWeights=Som van product-gewichten
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/nl_NL/shop.lang b/htdocs/langs/nl_NL/shop.lang
deleted file mode 100644
index 95f3ad3c5ee..00000000000
--- a/htdocs/langs/nl_NL/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Winkel
-ShopWeb=Webwinkel
-LastOrders=Laatste orders
-OnStandBy=Op stand-by
-TreatmentInProgress=Behandeling in uitvoering
-LastCustomers=Laatste afnemers
-OSCommerceShop=OSCommerce winkel
-OSCommerce=OSCommerce
-AddProd=Verkopen online
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/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index 4954f46200d..b7608db10a3 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Voeg leveranciersfactuur toe
 ListOfSupplierProductForSupplier=Lijst van producten en de prijzen van de leverancier <b>%s</b>
 NoneOrBatchFileNeverRan=Geen of bundel (batch) <b>%s</b> niet recentelijk gedraaid
 SentToSuppliers=Stuur naar leveranciers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index b68d27142ee..9496bc1e921 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Reis
 ListTripsAndExpenses=Lijst van de reis- en onkosten
 ExpensesArea=Trips en uitgaven gebied
 SearchATripAndExpense=Zoek een reis en kosten
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 8a470228b6f..9dd96d2668b 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lu
 ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa <b>niż %s</b> nie jest obsługiwany.
 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=Kod nie może zawierać wartości "0"
 DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Pulpity informacyjne
 MaxNbOfLinesForBoxes=Maksymalna liczba linii na polach
 PositionByDefault=Domyślna kolejność
-Position=Porządek
+Position=Position
 MenusDesc=Menu menedżerów określić zawartość menu 2 bary (prętem poziomym i pionowym pasku).
 MenusEditorDesc=W menu edytora pozwala określić indywidualną pozycje w menu. Używaj go ostrożnie, aby uniknąć podejmowania dolibarr niestabilne i stałe pozycje menu nieosiągalny. <br> Niektóre moduły dodać pozycje w menu (w menu <b>Wszystkie</b> w większości przypadków). Jeśli usunęliśmy niektóre z tych zapisów przez pomyłkę, możesz przywrócić im przez wyłączenie i reenabling modułu.
 MenuForUsers=Menu dla użytkowników
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatyczne gdy JavaScript jest wyłączony
 AvailableOnlyIfJavascriptNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony
 Required=Wymagany
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Bezpieczeństwo
 Passwords=Hasła
 DoNotStoreClearPassword=Czy nie przechowywać hasła w sposób jasny w bazie danych
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP (Nie zdefiniowany w PHP,
 MAIN_MAIL_EMAIL_FROM=Nadawca e-mail do automatycznego przetwarzania wiadomości e-mail (domyślnie w <b>php.ini: %s)</b>
 MAIN_MAIL_ERRORS_TO=Nadawca e-mail używany do wiadomości powraca błędach wysyłane
 MAIN_MAIL_AUTOCOPY_TO= Wyślij systematycznie ukryte węgla kopie wszystkich wysłanych e-maili do
+MAIN_MAIL_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=Wyłącz wszystkie e-maile sendings (dla celów badań lub demo)
 MAIN_MAIL_SENDMODE=Metoda użyć do wysyłania e-maili
 MAIN_MAIL_SMTPS_ID=SMTP identyfikator, jeżeli wymaga uwierzytelniania
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OsCommerce bezpośrednie
-Module800Desc=Interfejs do wykazują osCommerce lub OSCSS sklepu za pośrednictwem bezpośredniego dostępu do baz danych
-Module900Name=OsCommerce przez WAS
-Module900Desc=Interfejs do wykazują osCommerce sklep z web services. \\ NW tym module requiere o zainstalowanie składników z / oscommerce_ws / ws_server osCommerce do swojego serwera. Zobacz plik README w / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integracji
 Module1400Name=Księgowość ekspertów
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Tworzenie / modyfikacji składek na ubezpieczenia społeczne i poda
 Permission93=Usuń składek na ubezpieczenia społeczne i podatku VAT
 Permission94=Eksport składek na ubezpieczenia społeczne
 Permission95=Przeczytaj raporty
-Permission96=Konfiguracja wysyłek
-Permission97=Czytaj faktury rachunkowych wysyłkowe
-Permission98=Wysłanie faktury w księgowości linie
 Permission101=Czytaj sendings
 Permission102=Utwórz / Modyfikuj sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Profesjonalny Identyfikator unikalny
 MustBeUnique=Musi być wyjątkowa?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 298e477f250..35b55585299 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID zdarzenia
 Actions=Działania
 ActionsArea=Obszar działań (Zdarzenia i zadania)
-Agenda= Agenda
-Agendas= Agendy
-Calendar= Kalendarz
-Calendars= Kalendarze
-LocalAgenda=Kalendarz lokalny
-AffectedTo= Przypisany do
-DoneBy= Wykonane przez
-Events= Zdarzenia
+Agenda=Agenda
+Agendas=Agendy
+Calendar=Kalendarz
+Calendars=Kalendarze
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Przypisany do
+DoneBy=Wykonane przez
+Event=Event
+Events=Zdarzenia
 EventsNb=Ilość zdarzeń
 MyEvents=Moje zdarzenia
 OtherEvents=Inne zdarzenia
@@ -17,31 +19,33 @@ ListOfActions=Lista zdarzeń
 Location=Lokalizacja
 EventOnFullDay=Zdarzenie całodniowe
 SearchAnAction= Szukaj zdarzenia/zadania
-MenuToDoActions= Wszystkie zdarzenia niekompletne
-MenuDoneActions= Wszystkie zdarzenia zakończone
-MenuToDoMyActions= Moje działania niekompletne
-MenuDoneMyActions= Moje zdarzenia zakończone
-ListOfEvents= Lista zdarzeń Dolibarr
+MenuToDoActions=Wszystkie zdarzenia niekompletne
+MenuDoneActions=Wszystkie zdarzenia zakończone
+MenuToDoMyActions=Moje działania niekompletne
+MenuDoneMyActions=Moje zdarzenia zakończone
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Akcje zostały zarejestrowane przez
 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
 ViewCal=Pokaż miesiąc
 ViewDay=Pokaż dzień
 ViewWeek=Pokaż tydzień
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Widok ze zdefiniowanymi filtrami
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Data rozpoczęcia
 DateActionEnd= Data zakończenia
 AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy:
 AgendaUrlOptions2=<b>login= %s,</b> aby ograniczyć wyjście do działań stworzonych lub przypisanych do <b>użytkownika %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s,</b> aby ograniczyć wyjście do działań stworzonych przez użytkownika <b %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s,</b> aby ograniczyć wyjścia do działań przypisanych do użytkownika <b>%s.</b>
-AgendaUrlOptions5=<b>logind=%s,</b> aby ograniczyć wyjście do działań wykonanych przez użytkownika <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Pokaż urodziny kontaktów
 AgendaHideBirthdayEvents=Ukryj urodzin kontaktów
 Busy=Zajęty
 ExportDataset_event1=Lista zdarzeń w agendzie
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Eksport kalendarza
 ExtSites=Import zewnętrznych kalendarzy
-ExtSitesEnableThisTool=Pokaż zewnętrzne kalendarze w agendzie
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Ilość kalendarzy
 AgendaExtNb=Kalendarz nb %s
 ExtSiteUrlAgenda=URL dostępu. Plik iCal
 ExtSiteNoLabel=Brak opisu
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 51c3ba570c3..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=<b>Kredyt notatka</b> 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). <br><br> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Klasyfikacja "wypłata"
 ClassifyPaidPartially=Klasyfikacja "paid częściowo"
 ClassifyCanceled=Klasyfikacji &quot;Abandoned&quot;
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Czy na pewno chcesz anulować <b>fakturę %s?</b>
 ConfirmCancelBillQuestion=Dlaczego chcesz zaklasyfikować tę fakturę "opuszczonych"?
 ConfirmClassifyPaidPartially=Czy na pewno chcesz zmienić <b>fakturę %s</b> 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 <b>( %s %s)</b> 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 <b>( %s %s)</b> 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 <b>( %s %s)</b> 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 <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Rabat oferowane (płatność przed kadencji)
-SendBillRef=Wyślij faktury %s
-SendReminderBillRef=Wyślij faktury %s (przypomnienie)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Zlecenia stałe
 StandingOrder=Zlecenie stałe
 NoDraftBills=Projekt nr faktury
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Suma dwóch nowych rabatu musi być równa
 ConfirmRemoveDiscount=Czy na pewno chcesz usunąć ten rabat?
 RelatedBill=Podobne faktury
 RelatedBills=Faktur związanych
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Natychmiastowe
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Lokat bankowych
 PaymentTypeShortVIR=Lokat bankowych
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 01c7fa59b77..8afe23bd46a 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -16,7 +16,7 @@ SuppliersCategoriesArea=Dostawcy kategorii powierzchni
 CustomersCategoriesArea=Klienci kategorii powierzchni
 ThirdPartyCategoriesArea=Stron trzecich kategorii powierzchni
 MembersCategoriesArea=Członków kategorii obszaru
-# ContactsCategoriesArea=Contacts categories area
+ContactsCategoriesArea=Contacts categories area
 MainCats=Główne kategorie
 SubCats=Podkategorie
 CatStatistics=Statystyki
@@ -50,15 +50,15 @@ SupplierIsInCategories=Trzeciej posiada do następujących kategorii dostawców
 CompanyIsInCustomersCategories=Wspomniana strona trzecia posiada do następujących klientów / perspektywy kategorii\nTen kontrahent posiada następujące kategorie klientów / potencjalnych klientów
 CompanyIsInSuppliersCategories=Wspomniana strona trzecia posiada do następujących kategorii dostawców
 MemberIsInCategories=Ten użytkownik posiada do następujących kategorii użytkowników
-# ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=This contact owns to following contacts categories
 ProductHasNoCategory=Ten produkt / usługa nie jest w żaden kategorii
 SupplierHasNoCategory=To dostawca nie jest w żaden kategorii
 CompanyHasNoCategory=Ta firma nie jest w żaden kategorii
 MemberHasNoCategory=Członek ten nie jest w żadnym kategorii
-# ContactHasNoCategory=This contact is not in any categories
+ContactHasNoCategory=This contact is not in any categories
 ClassifyInCategory=Klasyfikacja w kategorii
 NoneCategory=Żaden
-# NotCategorized=Without category
+NotCategorized=Without category
 CategoryExistsAtSameLevel=Ta kategoria już istnieje w tym samym miejscu
 ReturnInProduct=Powrót do produktów / usług karty
 ReturnInSupplier=Powrót do dostawcy kart
@@ -66,7 +66,7 @@ ReturnInCompany=Powrót do klienta / perspektywa karty
 ContentsVisibleByAll=Zawartość będzie widoczny przez wszystkich
 ContentsVisibleByAllShort=Zawartość widoczna przez wszystkie
 ContentsNotVisibleByAllShort=Treść nie jest widoczna dla wszystkich
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=Usuwanie kategorii
 ConfirmDeleteCategory=Czy na pewno chcesz usunąć tę kategorię?
 RemoveFromCategory=Usuń powiązanie z kategorii
@@ -81,12 +81,12 @@ CustomersCategoriesShort=Klienci kategorii
 CustomersProspectsCategoriesShort=Custo. / prosp. kategorie
 ProductsCategoriesShort=Produkty kategorii
 MembersCategoriesShort=Członków kategorii
-# ContactCategoriesShort=Contacts categories
+ContactCategoriesShort=Contacts categories
 ThisCategoryHasNoProduct=Ta kategoria nie zawiera żadnych produktów.
 ThisCategoryHasNoSupplier=Ta kategoria nie zawiera żadnego dostawcy.
 ThisCategoryHasNoCustomer=Ta kategoria nie zawiera żadnych klientów.
 ThisCategoryHasNoMember=Ta kategoria nie zawiera żadnych członków.
-# ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Przypisany do klienta
 AssignedToTheCustomer=Przypisany do klienta
 InternalCategory=Inernal kategorii
@@ -96,18 +96,17 @@ CatSupList=Lista kategorii dostawcy
 CatCusList=Lista klientów / perspektywa kategorii
 CatProdList=Lista produktów kategorii
 CatMemberList=Lista członków kategorii
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 62fc1e30367..c38e732a362 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Musisz stworzyć e-maile, kontakty dla trzeciej pierws
 ListSuppliersShort=Lista dostawców
 ListProspectsShort=Lista potencjalnych klientów
 ListCustomersShort=Lista klientów
-ThirdPartiesArea=Strona kontrahentów
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=%s ostatnio modyfikowanych kontrahentów
 UniqueThirdParties=Łącznie unikatowych kontrahentów
 InActivity=Otwarte
@@ -410,3 +410,5 @@ OutstandingBillReached=Osiągnieto maksimum niezapłaconych rachunków
 MonkeyNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn klienta i kod %syymm-nnnn dla dostawcy kod yy gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0.\nZwraca numer w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie yy to rok, mm to miesiąc i nnnn jest sekwencją bez przerwy, bez powrotu do 0.
 LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 6525bb0d511..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 21528e90934..2318d3bf19f 100644
--- a/htdocs/langs/pl_PL/donations.lang
+++ b/htdocs/langs/pl_PL/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Darowizna
 Donations=Darowizny
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=Donor
 Donors=Darczyńcy
-AddDonation=Dodaj darowiznę
+AddDonation=Create a donation
 NewDonation=Nowe wpłaty
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=Prezent obietnicy
 PromisesNotValid=Nie potwierdzone obietnic
 PromisesValid=Zatwierdzona obietnic
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Szkic
 DonationStatusPromiseValidatedShort=Zatwierdzona
 DonationStatusPaidShort=Odebrane
 ValidPromess=Sprawdź obietnicy
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=Zbuduj otrzymania
 DonationsModels=Dokumenty modeli oddawania wpływy
 LastModifiedDonations=Ostatnie %s modyfikowane darowizn
 SearchADonation=Szukaj darowiznę
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 b90c05248da..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 &quot;dla parametrów nieprawidłowe&quot; %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 &quot;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 <b>logowania %s</b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index b6381dc08c3..6e701b96939 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Numer konta
 BankAccountNumberKey=Klucz
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 9d6a6d89525..bbf13703b82 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Data rozpoczęcia
 DateFinCP=Data zakończenia
@@ -18,24 +18,24 @@ ApprovedCP=Zatwierdzony
 CancelCP=Odwołany
 RefuseCP=Odmówił
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Opis
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edytuj
 DeleteCP=Usunąć
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Zrezygnuj
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Uaktualnić
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Powód
 UserCP=Użytkownik
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Edytuj
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Uaktualnić
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
index 467d6c5cf32..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
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=Czy na pewno chcesz usunąć tę linię interwencj
 NameAndSignatureOfInternalContact=Nazwisko i podpis interwencji:
 NameAndSignatureOfExternalContact=Nazwisko i podpis klienta:
 DocumentModelStandard=Model standardowy dokument dla interwencji
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Klasyfikowanie &quot;Zapowiadane&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 StatusInterInvoiced=Zapowiadane
 RelatedInterventions=Podobne interwencje
 ShowIntervention=Pokaż interwencji
+SendInterventionRef=Submission of intervention %s
+SendInterventionByMail=Send intervention by Email
+InterventionCreatedInDolibarr=Intervention %s created
+InterventionValidatedInDolibarr=Intervention %s validated
+InterventionModifiedInDolibarr=Intervention %s modified
+InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
+InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
+InterventionSentByEMail=Intervention %s sent by EMail
+InterventionDeletedInDolibarr=Intervention %s deleted
+SearchAnIntervention=Search an intervention
 ##### Types de contacts #####
 TypeContact_fichinter_internal_INTERREPFOLL=Przedstawiciela w ślad za interwencję
 TypeContact_fichinter_internal_INTERVENING=Interwencja
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=Generic numer modelu
 ArcticNumRefModelError=Nie można włączyć
 PacificNumRefModelDesc1=Wróć NUMERO z formatu %syymm rr-nnnn gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0
 PacificNumRefModelError=Interwencja karty zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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źć <b>użytkownika %s</b
 ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraju " %s".
 ErrorNoSocialContributionForSellerCountry=Błąd, nie typ społeczny wkład określone dla kraju &quot;%s&quot;.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
-ErrorOnlyPngJpgSupported=Błąd tylko. Png i. Obrazu w formacie jpg plików są obsługiwane.
-ErrorImageFormatNotSupported=PHP nie obsługuje funkcje do konwersji obrazów tego formatu.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s
 BackgroundColorByDefault=domyślny kolor tła
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=Wybraniu pliku do zamocowania, ale jeszcze nie wysłał. Kliknij na &quot;Dołącz plik&quot; w tej sprawie.
 NbOfEntries=Uwaga wpisów
 GoToWikiHelpPage=Przeczytaj pomoc online (potrzeba dostępu do Internetu)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Miesiąc dzień
 HourShort=O
+MinuteShort=mn
 Rate=Tempo
 UseLocalTax=Include tax
 Bytes=Bajty
@@ -340,6 +341,7 @@ FullList=Pełna lista
 Statistics=Statystyki
 OtherStatistics=Inne statystyki
 Status=Stan
+Favorite=Favorite
 ShortInfo=Info.
 Ref=Nr ref.
 RefSupplier=Nr ref. Dostawca
@@ -365,6 +367,7 @@ ActionsOnCompany=Działania na temat tej osoby trzeciej
 ActionsOnMember=Wydarzenia O tego użytkownika
 NActions=%s działania
 NActionsLate=%s późno
+RequestAlreadyDone=Request already recorded
 Filter=Filtr
 RemoveFilter=Usuń filtr
 ChartGenerated=Wykres generowany
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Dodatkowa konfiguracja atrybutów
 URLPhoto=Url zdjęciem / logo
 SetLinkToThirdParty=Link do innych stron trzecich
 CreateDraft=Utwórz projekt
+SetToDraft=Back to draft
 ClickToEdit=Kliknij, aby edytować
 ObjectDeleted=%s obiekt usunięty
 ByCountry=Według kraju
@@ -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=Poniedziałek
 Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index 2c6d1974e70..f8b405f2218 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/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 lub usługa
 AllProducts=All products and services
 ChooseProduct/Service=Choose product or service
-
 StartDate=Data rozpoczęcia
 EndDate=Data zakończenia
 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<br/>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/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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe~~dobj</a> . <br> Aby zapłacić za pomocą karty kredytowej lub PayPal, kliknij przycisk na dole tej strony. <br>
-# 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ć <b>%s</b> zamówień ze
 ConfirmCancelOrder=Czy na pewno chcesz anulować zamówienie?
 ConfirmMakeOrder=Czy na pewno chcesz, aby potwierdzić wprowadzone tym celu <b>na %s?</b>
 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. <br><br> 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 f58dbad39cc..a334b7f2828 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Zamknięte
 ContractStatusRunning=W trakcie realizacji
 ContractStatusExpired=minął
 ContractStatusOnHold=Nie działa
-ContractStatusToRun=W realizacji
+ContractStatusToRun=To get running
 ContractNotRunning=Zamówienie nie jest realizowane
 ErrorProductAlreadyExists=Produkt o numerze referencyjnym %s już istnieje.
 ErrorProductBadRefOrLabel=Błędna wartość referencyjna lub etykieta.
 ErrorProductClone=Podczas próby sklonowania produktu lub usługi wystąpił problem.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Dostawcy
 SupplierRef=Nr referencyjny dostawcy produktu
 ShowProduct=Pokaż produkt
@@ -116,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
@@ -131,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ę?
@@ -178,7 +179,7 @@ CloneProduct=Duplikuj produkt lub usługę
 ConfirmCloneProduct=Czy na pewno chcesz wykonać duplikat produktu <b>lub usługi %s?</b>?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 b1b995d3d41..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
@@ -85,13 +87,13 @@ ActionsOnProject=Działania w ramach projektu
 YouAreNotContactOfProject=Nie masz kontaktu to prywatne przedsięwzięcie
 DeleteATimeSpent=Czas spędzony Usuń
 ConfirmDeleteATimeSpent=Czy na pewno chcesz usunąć ten czas?
-DoNotShowMyTasksOnly=Zobacz także zadania i nie jestem wpływ na
-ShowMyTasksOnly=Zobacz zadania ja jestem tylko wpływ na
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Zasoby
 ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej trzeciej
 NoTasks=Brak zadań dla tego projektu
 LinkedToAnotherCompany=Powiązane z innymi trzeciej
-TaskIsNotAffectedToYou=Zadanie nie przypisane do Ciebie
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Czas spędzony jest pusty
 ThisWillAlsoRemoveTasks=Działanie to będzie także usunąć wszystkie zadania projektu <b>(%s</b> zadania w tej chwili) i wszystkimi wejściami czasu spędzonego.
 IfNeedToUseOhterObjectKeepEmpty=Jeżeli pewne obiekty (faktura, zamówienie, ...), należące do innej osoby trzeciej, musi być związane z projektem tworzenia, zachować ten pusty mieć projekt jest multi osób trzecich.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Kompletny model projektu sprawozdania (logo. ..)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 443e9bccbaa..3ff7b8f5fb7 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=Ostatnia %s sendings
 SearchASending=Wyszukaj wysyłanie
 StatisticsOfSendings=Statystyka sendings
 NbOfSendings=Liczba sendings
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=Wysyłanie kart
 NewSending=Nowe wysyłanie
 CreateASending=Utwórz wysyłanie
@@ -50,27 +50,31 @@ Enlevement=Zgarnięte przez klienta
 DocumentModelSimple=Prosty wzór dokumentu
 DocumentModelMerou=Mérou model A5
 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Strugane daty dostawy
 DateReceived=Data otrzymania dostawy
 SendShippingByEMail=Wyślij przesyłki przez e-mail
-SendShippingRef=Wyślij %s przesyłki
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Wydarzenia na dostawy
 LinkToTrackYourPackage=Link do strony śledzenia paczki
 ShipmentCreationIsDoneFromOrder=Na razie utworzenie nowego przesyłki odbywa się z karty zamówienia.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Prosty dokument model dostawy wpływy
 DocumentModelTyphon=Więcej kompletny dokument model dostawy wpływy (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Stała EXPEDITION_ADDON_NUMBER nie zdefiniowano
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/pl_PL/shop.lang b/htdocs/langs/pl_PL/shop.lang
deleted file mode 100644
index cebcc7e1a75..00000000000
--- a/htdocs/langs/pl_PL/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Sklep
-ShopWeb=Shop internetowy
-LastOrders=Ostatnie zamówienia
-OnStandBy=Oczekuje
-TreatmentInProgress=W przygotowaniu
-LastCustomers=Ostatni klienci
-OSCommerceShop=Sklep osCommerce
-OSCommerce=OsCommerce
-AddProd=Sprzedaż online
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/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index 29bdc720408..2f6cdd78859 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Stwórz fakturę dostawcy
 ListOfSupplierProductForSupplier=Wykaz produktów i cen dostawcy <b>%s</b>
 NoneOrBatchFileNeverRan=Brak lub partii <b> %s</b> nie prowadził niedawno
 SentToSuppliers=Wysyłane do dostawców
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 2b8c86429c3..526bdf77d25 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Wycieczka
 ListTripsAndExpenses=Lista wycieczek i wydatków
 ExpensesArea=Wycieczki i obszar wydatki
 SearchATripAndExpense=Szukaj w podróż i wydatki
+ClassifyRefunded=Classify 'Refunded'
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 d9c7953d06f..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 <b>%s</b> estiver ativado
 RemoveLock=Exclua o arquivo <b>%s</ b> se tem permissão da ferramenta de atualização.
 RestoreLock=Substituir o arquivo <b>%s</b> 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 <b>%s</b> 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 <b>%s</b> %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 <br> Exemplo de Mexilhão: / usr / bin / clamscan
-AntiVirusParam= Mais parâmetros na linha de comando
-AntiVirusParamExample= Exemplo de Parametro de Comando: - database = &quot;C: \\ Program Files (x86) \\ lib ClamWin \\&quot;
-ComptaSetup=Configuração do Módulo Contabilidade
+AntiVirusCommandExample=Exemplo de Comando: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe <br> Exemplo de Mexilhão: / usr / bin / clamscan
+AntiVirusParam=Mais parâmetros na linha de comando
+AntiVirusParamExample=Exemplo de Parametro de Comando: - database = &quot;C: \\ Program Files (x86) \\ lib ClamWin \\&quot;
 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 <a href="%s">here</a>.
 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 <a href="%s"> habilitado módulos </ a> 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 </ b> file <b>, 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: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Nome host ou ip do servidor SMTP (Por padrao em php.ini: <b>%s</b>)
-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: <b>%s</b>)
 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 <b> langs /% s </ b> 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 <b>%s</b>
 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 <br> apenas crie um diretório na raiz do Dolibarr. (Por exemplo: custom) <br>
@@ -305,7 +230,6 @@ GenericMaskCodes5=<b>ABC {yy} {mm} - {000000}</b> dará <b>ABC0701-000099</b> <b
 GenericNumRefModelDesc=Devolve um número criado na linha em uma máscara definida.
 ServerAvailableOnIPOrPort=Servidor disponível não endereço <b>%s</b> na porta <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor não disponível não endereço <b>%s</b> na Porta <b>%s</b>
-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).<br>Este deve ter o valor octal (por Exemplo, 0666 significa leitura / escrita para todos).<br>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 <b> Precisa ajuda ou suporte </b>" na página de login
 DisableLinkToHelp=Esconde link "<b>%s Ajuda online </b>" 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:<br>c:\\mydir<br>/home/mydir<br>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 <br><br> por exemplo: <br> 1, valor1 <br> 2, valor2 <br> 3, value3 <br> ...
-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 <br> Sintaxe: table_name: label_field: id_field :: filtro <br> Exemplo: c_typent: libelle: id :: filtro <br><br> filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> se você deseja filtrar extrafields usar syntaxt extra.fieldcode = ... (onde código de campo é o código de extrafield) <br><br> A fim de ter a lista dependendo outro: <br> c_typent: libelle: id: parent_list_code | parent_column: Filtro
 LibraryToBuildPDF=Biblioteca utilizada para criar o PDF
 WarningUsingFPDF=Atenção: Seu <b>conf.php</b> contém <b>dolibarr_pdf_force_fpdf</b> directiva <b>= 1.</b> 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. <br> Para resolver isso e ter um apoio total de geração de PDF, faça o download <a href="http://www.tcpdf.org/" target="_blank">da biblioteca TCPDF</a> , em seguida, comentar ou remover a linha <b>$ dolibarr_pdf_force_fpdf = 1,</b> e adicione ao invés <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
 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: <br> 1: impostos locais, aplicar sobre produtos e serviços, sem IVA (IVA não é aplicado sobre o imposto local) <br> 2: impostos locais, aplicar sobre produtos e serviços antes de IVA (IVA é calculado sobre o montante + localtax) <br> 3: impostos locais, aplicar em produtos sem IVA (IVA não é aplicado sobre o imposto local) <br> 4: impostos locais, aplicadas aos produtos antes de IVA (IVA é calculado sobre o montante + localtax) <br> 5: impostos locais, aplicar em serviços sem IVA (IVA não é aplicado sobre o imposto local) <br> 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 <strong>usuário% s</strong>
-RefreshPhoneLink=Atualizar link
 LinkToTest=Link clicável gerado para o <strong>usuário% s</strong> (clique número de telefone para testar)
 KeepEmptyToUseDefault=Manter em branco para usar o valor padrão
 DefaultLink=Link padrão
@@ -397,95 +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
-Module800Name=OSCommerce 1
-Module800Desc=Interface de visualização de uma loja OSCommerce mediante acesso direto à sua base de dados
-Module900Name=OSCommerce 2
-Module900Desc=Interface de visualização de uma loja OSCommerce mediante Web services.\nEste módulo requer instalar os arquivos de /oscommerce_ws/ws_server em OSCommerce. Leia o Arquivo README da pasta /oscommerce_ws/ws_server.
-Module1200Name=Mantis
 Module1200Desc=Interface com o sistema de seguimento de incidências Mantis
 Module1400Name=Contabilidade
 Module1400Desc=Gestão de Contabilidade (partes duplas)
@@ -493,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
@@ -537,107 +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
-Permission96=Parametrizar repartição
-Permission97=Ler linhas de faturas
-Permission98=Repartir linhas de faturas
-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
@@ -646,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
@@ -654,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
@@ -689,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
@@ -698,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
@@ -726,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
@@ -738,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
@@ -754,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
@@ -767,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
@@ -784,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: <br> Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra. <br> Se o comprador está sujeito a RE então o RE por padrão. Fim da regra. <br>
-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: <br> Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra. <br> Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra. <br>
-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: <br> Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra. <br> Se o comprador está sujeito a RE então o RE por padrão. Fim da regra. <br>
+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: <br> Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra. <br> Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra. <br>
+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
@@ -817,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 <a href
-Upgrade=Atualização
 MenuUpgrade=Atualização / Estender
-AddExtensionThemeModuleOrOther=Ajustar extensão (tema, módulo, etc.)
-WebServer=Servidor web
-DocumentRootServer=Pasta raiz das páginas web
 DataRootServer=Pasta raiz dos arquivos de dados
-IP=IP
-Port=Porta
-VirtualServerName=Nome do servidor virtual
-AllParameters=Todos os parâmetros
-OS=SO
-PhpEnv=Env
-PhpModules=Módulos
-PhpConf=Conf
-PhpWebLink=link Web-PHP
-Pear=Pear
 PearPackages=pacotes Pear
 Browser=Navegador
-Server=Servidor
-Database=Base de dados
-DatabaseServer=Hospedeiro do banco de dados
-DatabaseName=Nome da base de dados
-DatabasePort=Porta da base de dados
 DatabaseUser=Usuário de banco de dados
 DatabasePassword=Senha de banco de dados
 DatabaseConfiguration=configuração da base de dados
-Tables=Tabelas
-TableName=Nome da tabela
-TableLineFormat=Formato linhas
 NbOfRecord=N� Reg.
-Constraints=Constrangimentos
-ConstraintsType=Tipo de constrangimento
 ConstraintsToShowOrNotEntry=Constrangimento para mostrar não menu de entrada
-AllMustBeOk=Todos devem ser controlados
-Host=Servidor
-DriverType=Tipo de driver
 SummarySystem=Resumo da informação de sistemas ERP
 SummaryConst=Lista de todos os parâmetros de configuração dolibarr
 SystemUpdate=Atualização do sistema
 SystemSuccessfulyUpdate=a sua sistema atualizou-se corretamente
-MenuCompanySetup=Empresa/Instituição
 MenuNewUser=Novo Usuário
 MenuTopManager=Administração do menu superior
 MenuLeftManager=Administração do menu esquerdo
-MenuManager=Administração do menu
-MenuSmartphoneManager=Gestor de menu Smartphone
 DefaultMenuTopManager=Administração do menu superior
 DefaultMenuLeftManager=Administração do menu esquerdo
-DefaultMenuManager= Gestor de menu padrão
-DefaultMenuSmartphoneManager=Gestor de menu Smartphone
 Skin=Tema Visual
 DefaultSkin=Tema visual por default
 MaxSizeList=Longuitude máxima de listados
 DefaultMaxSizeList=Longuitude máxima de listados por default
-MessageOfDay=Mensagem do día
-MessageLogin=Mensagem do login
-PermanentLeftSearchForm=Zona de pesquisa permanente do menu esquerdo
 DefaultLanguage=Idioma por default a utilizar (código idioma)
 EnableMultilangInterface=Ativar interface Multi Idioma
 EnableShowLogo=Mostrar logotipo no menu à esquerda
 SystemSuccessfulyUpdated=a sua sitema está atualizado
-CompanyInfo=Informação da Empresa/Instituição
-CompanyIds=Identificação regulamentação
-CompanyName=Nome/Razão social
-CompanyAddress=Morada
-CompanyZip=Código Postal
 CompanyTown=Município
-CompanyCountry=País
-CompanyCurrency=Moeda principal
 Logo=Logotipo
-DoNotShow=Não mostrar
 DoNotSuggestPaymentMode=Não sugerenciar
 NoActiveBankAccountDefined=Nenhuma conta bancaria ativa definida
-OwnerOfBankAccount=Titular da conta %s
 BankModuleNotActive=O módulo de contas bancarias não se encontra ativado
 ShowBugTrackLink=Mostrar link "Senhalar um bug"
-ShowWorkBoard=Mostrar painel de informação na página principal
-Alerts=Alertas
-Delays=Prazos
 DelayBeforeWarning=Prazo antes de alerta
 DelaysBeforeWarning=Prazos antes de alerta
 DelaysOfToleranceBeforeWarning=Prazos de tolerância antes de alerta
@@ -921,22 +615,17 @@ Delays_MAIN_DELAY_MEMBERS=Tolerância de atraso (em dias) antes de alerta sobre
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerância de atraso (em dias) antes de alerta para cheques depósito para fazer
 SetupDescription1=Todas as opções desta área de configuração são opções que permitem configurar a Dolibarr antes de começar a sua utilização.
 SetupDescription2=Os 2 Passos indispensáveis da configuração são as 2 primeiras do menu esquerdo:  a configuração da empresa/Instituição e a configuração dos módulos:
-SetupDescription3=A configuração <b>Empresa/Instituição</b> 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 <b>Módulos</b> é 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 <b>ferramentas do sistema - Auditoria</b>.Atenção, esta característica pode consumir uma gran quantidade de dados na base de dados.
@@ -966,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 <b>...</b> depois do máximo quer ver <b>...</b> 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 (<b>%s</b>) 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.
@@ -983,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 (<b>%s</b>).
 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
@@ -999,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.
@@ -1049,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
@@ -1063,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.
@@ -1104,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 <b>%s</b> 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
@@ -1121,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. <br>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
@@ -1209,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
@@ -1236,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.
@@ -1300,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 <b>OpenLDAP</b> com os schemas carregados: <b>core.schema, cosine.schema, inetorgperson.schema</b>). sim voçê utiliza os a valores sugeridos e OpenLDAP, modifique a sua arquivo de configuração LDAP <b>slapd.conf</b> 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.
@@ -1318,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
@@ -1333,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)
@@ -1432,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 <b>%s</b> ?
 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 é: <br>-ao envio dos bens <br>-sobre o pagamento por os serviços
 OptionVatDebitOptionDesc=a carga do ICMS é: <br>-ao envio dos bens <br>-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
@@ -1469,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=<b>Usuário=%s</b> permitir apenas resultados para atividades atribuídas, criadas ou concluídas pelo usuário <b>%s</b>.
-AgendaUrlOptions3=<b>Usuário=%s</b> permitir resultados apenas para atividades criadas pelo usuário <b>%s</b>
+AgendaUrlOptions3=<b>logina=%s</b> para restringir açoes de propriedade do usuario <b>%s</b>.
 AgendaUrlOptions4=<b>Usuário=%s</b> permitir apenas resultados para atividades atribuídas ao usuário <b>%s</b>.
-AgendaUrlOptions5=<b>Usuário=%s</b> não permitir resultados para atividades concluídas pelo usuário <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir a saida de açoes associadas ao projeto <b>PROJECT_ID</b>.
 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 <b>%s</b> fazia <b>%s</b> de <b>%s</b> %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=<b>Fatura Pro-Forma</b> é uma verdadeira imagem de uma fatu
 InvoiceReplacement=Substituição da Fatura
 InvoiceReplacementAsk=Substituição da Fatura para Fatura
 InvoiceReplacementDesc=A <b>fatura retificada</b> serve para cancelar e para substituir uma fatura existente em que ainda não existe pagamentos.<br><br>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 <b>Nota de Crédito</b> é 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).<br><br>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?<br>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.<br>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. <br> 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 <b>%s</b> ?
 ConfirmCancelBillQuestion=Por qué Razão quer abandonar a fatura?
 ConfirmClassifyPaidPartially=Tem certeza de que deseja voltar a fatura: <b> %s </b> ao status de paga ?
 ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi paga em completo. Qual as razoes para fecha-la ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Restante a pagar <b> (%s %s) </ b> é um desconto concedido porque foi feita antes de prazo de pagamento. Regularizar o ICMS, com uma nota de crédito.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restante a pagar <b> (%s %s) </ b> é um desconto concedido porque foi feita antes de prazo de pagamento. Eu aceito perder o ICMS sobre este desconto.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Restante a pagar <b> (%s %s) </ b> é 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 <b>(%s %s)</b> 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 <b>(%s %s)</b> 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 <b>(%s %s)</b> 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: <br> - pagamento não está completo porque alguns produtos foram enviados de volta <br> - montante reclamado muito importante porque um desconto foi esquecido <br> 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 <b>%s</b> %s ?
 ConfirmSupplierPayment=Confirma o processo deste pagamento de <b>%s</b> %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 <b>Desconto</b> é 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 <br> 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 '<b>Ficha de Realização</b>' 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 <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente não tem Descontos relativos por default
 CompanyHasAbsoluteDiscount=Este cliente tem <b>%s %s</b> Descontos fixos disponíveis
 CompanyHasCreditNote=Este cliente tem <b>%s %s</b> 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 <b>%s</b> 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 <a href
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossível. O serviço de verificação não é prestado pelo país membro (%s).
-NorProspectNorCustomer=Nem Cliente, Nem Cliente Potencial
-JuridicalStatus=Forma Jurídica
-Staff=Empregados
-ProspectLevelShort=Cli. Potenc.
-ProspectLevel=Cliente Potencial
-ContactPrivate=Privado
+NorProspectNorCustomer=Nem cliente, nem cliente em potencial
+ProspectLevel=Cliente em potencial
 ContactPublic=Compartilhado
-ContactVisibility=Visibilidade
-OthersNotLinkedToThirdParty=Outros, não associado a um Fornecedor
-ProspectStatus=Estado cliente potencial
-PL_NONE=Nenhum
-PL_UNKNOWN=Desconhecida
-PL_LOW=Baixo
-PL_MEDIUM=Medio
-PL_HIGH=Alto
+OthersNotLinkedToThirdParty=Outros, não associado à um cliente/fornecedor
+ProspectStatus=Estado do cliente em potencial
 TE_UNKNOWN=-
-TE_STARTUP=Pequena
-TE_GROUP=Grande
-TE_MEDIUM=Media
-TE_ADMIN=Administração Pública
-TE_SMALL=Pequena
-TE_RETAIL=Retalhista
-TE_WHOLE=Grossista
-TE_PRIVATE=Micro
-TE_OTHER=Outro
-StatusProspect-1=Não Contactar
-StatusProspect0=Nunca Contactado
-StatusProspect1=A Contactar
+StatusProspect-1=Não contatar
+StatusProspect1=A contatar
 StatusProspect2=Contato em Curso
 StatusProspect3=Contato Realizado
-ChangeDoNotContact=Alterar o Estado para ' Não Contactar '
-ChangeNeverContacted=Alterar o Estado para 'Nunca Nontactado'
-ChangeToContact=Alterar o Estado para 'A Contactar'
+ChangeDoNotContact=Alterar o estado para ' Não contatar '
+ChangeToContact=Alterar o estado para 'A contatar'
 ChangeContactInProcess=Alterar o Estado para 'Contato em Curso'
 ChangeContactDone=Alterar o Estado para 'Contato Realizado'
-ProspectsByStatus=Clientes Potenciais por Estado
+ProspectsByStatus=Clientes em potencial por estado
 BillingContact=Contato para Faturação
 NbOfAttachedFiles=N de Arquivos Anexos
 AttachANewFile=Adicionar um Novo Arquivo
-NoRIB=Nenhuma Conta Definida
-NoParentCompany=Nenhuma
-ExportImport=Importar-Exportar
 ExportCardToFormat=Exportar Ficha para o Formato
-ContactNotLinkedToCompany=Contato não Vinculado a um Fornecedor
-DolibarrLogin=Login
-NoDolibarrAccess=Sem Acesso
-ExportDataset_company_1=Terceiros (Empresas/Fondacoes/Pessoas Fisicas) e propriedades
+ContactNotLinkedToCompany=Contato não associado à um cliente/fornecedor
+ExportDataset_company_1=Cilentes/Fornecedores (Empresas/Instituíções/Pessoas Fisicas) e propriedades
 ExportDataset_company_2=Contatos de Fornecedor e Atributos
-ImportDataset_company_1=Terceiros (Empresas/Fondacoes/Pessoas Fisicas) e propriedades
-ImportDataset_company_2=Contatos/Enderecos (dos terceiros e nao) e atributos
+ImportDataset_company_1=Clientes/Fornecedores (Empresas/Fundações/Pessoas Físicas) e propriedades
+ImportDataset_company_2=Contatos/Enderecos (de clientes/fornecedores ou não) e atributos
 ImportDataset_company_3=Dados Bancários
 PriceLevel=Nível de Preços
 DeliveriesAddress=Endereço(ões) de Envio
@@ -379,8 +176,8 @@ DeliveryAddressLabel=Etiqueta de Envio
 DeleteDeliveryAddress=Eliminar uma Endereço de Envio
 ConfirmDeleteDeliveryAddress=? Tem certeza que quer eliminar esta endereço de envio?
 NewDeliveryAddress=Nova Endereço de Envio
-AddDeliveryAddress=Adicionar Endereço
-AddAddress=Adicionar Endereço
+AddDeliveryAddress=Criar endereço
+AddAddress=Criar endereço
 NoOtherDeliveryAddress=Não Existe Endereço alternatica definidas
 SupplierCategory=Categoria de Fornecedor
 JuridicalStatus200=Estado Juridico
@@ -389,24 +186,20 @@ ConfirmDeleteFile=? Tem certeza que quer eliminar este Arquivo?
 AllocateCommercial=Assinado ao representate de vendas
 SelectCountry=Selecionar um País
 SelectCompany=Selecionar um Fornecedor
-Organization=Organismo
 AutomaticallyGenerated=Gerado Automaticamente
-FiscalYearInformation=Informação do Ano Fiscal
-FiscalMonthStart=Mês de Inicio do Exercício
-YouMustCreateContactFirst=E obrigatorio cadastrar contatos email para um terceiro para ser possivel adicionar notificacoes por email.
+YouMustCreateContactFirst=Você deve cadastrar contatos de e-mail para um cliente/fornecedor para ser possível adicionar notificações por e-mail.
 ListSuppliersShort=Lista de Fornecedores
-ListProspectsShort=Lista de Clientes Potenciais
+ListProspectsShort=Lista de clientes em potencial
 ListCustomersShort=Lista de Clientes
-ThirdPartiesArea=Area terceiros
-LastModifiedThirdParties=Os ultimos %s terceiros modificados
-UniqueThirdParties=Total de terceiros unicos
-InActivity=Aberto
-ActivityCeased=Fechado
+ThirdPartiesArea=Área de clientes/fornecedores e contatos
+LastModifiedThirdParties=Os ultimos %s clitentes/fornecedores modificados
+UniqueThirdParties=Total de clientes/fornecedores únicos
 ActivityStateFilter=Status das atividades
 ProductsIntoElements=Lista de produtos para %s
 CurrentOutstandingBill=Notas aberta correntes
 OutstandingBill=Max. permitido para uma nota aberta
 OutstandingBillReached=Chegou ao max permitido para nostas abertas
 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 seq�ê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 do Representante(CEO,Diretor,Presidente...)
+SearchThirdparty=Procurar cliente/fornecedor
+SearchContact=Procurar contato
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 8da28ed9638..c50fcd7173d 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -1,41 +1,22 @@
 # Dolibarr language file - Source file is en_US - compta
-Accountancy=Contabilidade
-AccountancyCard=Ficha Contabilidade
-Treasury=Tesouraria
-MenuFinancial=Financeira
 TaxModuleSetupToModifyRules=Vá para <a href="%s">configuração do módulo Impostos</a> para modificar regras de cálculo
 TaxModuleSetupToModifyRulesLT=Ir para <a href="%s">Configurações da Empresa</a> 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=<b>Modo% S VAT compromisso da contabilidade% s.</b>
 CalcModeVATEngagement=<b>Modo% SVAT sobre os rendimentos e as despesas% s.</b>
 CalcModeDebt=Modo <b>% s declarações de dívidas% s </ b> diz <b> Compromisso da contabilidade </ b>.
 CalcModeEngagement=Modo <b>% s rendimentos e as despesas% s </ b> contabilidade do caixa <b> </ b>>
-CalcModeLT1= Modo <b>%sRE nas faturas dos clientes - faturas dos fornecedores%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeLT1=Modo <b>%sRE nas faturas dos clientes - faturas dos fornecedores%s</b>
+CalcModeLT1Debt=Modo <b>%sRE nas faturas dos clientes%s</b>
+CalcModeLT1Rec=Modo <b>%sRE nas faturas dos fornecedores%s</b>
+CalcModeLT2=Modo <b>%sIRPF nas faturas de clientes - fornecedores%s</b>
+CalcModeLT2Debt=Modo <b>%sIRPF nas faturas de clientes%s</b>
+CalcModeLT2Rec=Modo <b>%sIRPF nas faturas de fornecedores%s</b>
 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 <b>%sCréditos-dividas%s</b> chamada <b>Contabilidade de compromisso</b>.
@@ -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 <b>%sIVA pago%s</b> para um modo de cálculo Standard
 SeeVATReportInDueDebtMode=Ver o Relatório <b>%sIVA a dever%s</b> 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: <br> Método 1 é arredondamento cuba em cada linha, em seguida, soma-los. <br> Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado. <br> Resultado final pode difere de alguns centavos. O modo padrão é o <b>modo% s.</b>
 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 <b>contabilidade de caixa</b> não é relevante. Este relatório está disponível somente quando utilizar o modo de <b>contabilidade engajamento</b> (ver configuração do módulo de contabilidade).
-CalculationMode=Modo de cálculo
 AccountancyJournal=Codigo do jornal fiscal
-COMPTA_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos
-COMPTA_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos
-COMPTA_SERVICE_BUY_ACCOUNT=Código de contabilidade padrão para comprar serviços
-COMPTA_SERVICE_SOLD_ACCOUNT=Código de contabilidade padrão para vender serviços
-COMPTA_VAT_ACCOUNT=Código de contabilidade padrão para cobrança do VAT
-COMPTA_VAT_BUY_ACCOUNT=Código de contabilidade padrão para pagar o VAT
-COMPTA_ACCOUNT_CUSTOMER=Código Contabilidade por padrão para fornecedores de clientes
-COMPTA_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/<u>produto</u>/class/product.class.php, o valor do módulo é o <i>produto</i>
 CronClassFileHelp=O nome do arquivo a ser carregado.<BR>Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/classe/<u>product.class.php</u>, o valor do nome do arquivo de classe é <i>product.class.php</i>
@@ -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 é <i>fecth</i>
 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 <i>0, ProductRef</i>
 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 <b>%s</b> ?
-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.<br>* As pastas manuais podem ser usados ​​para guardar documentos sem ligação a um cadastro do sistema.
-ECMSectionWasRemoved=A pasta <b>%s</b> 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 <b>%s</b> ?
@@ -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 <b>'% s'</b> para <b>'% s'.</b
 ErrorFailToDeleteFile=Error à eliminar o Arquivo '<b>%s</b>'.
 ErrorFailToCreateFile=Erro ao criar o arquivo '<b<%s</b>'
 ErrorFailToRenameDir=Error à renombar a pasta '<b>%s</b>' a '<b>%s</b>'.
-ErrorFailToCreateDir=Erro ao criar a pasta '<b>%s</b>'
 ErrorFailToDeleteDir=Error à eliminar a pasta '<b>%s</b>'.
 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 <b>especie</b>.
 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 <b>e-mail% s</b> en fornecer o código de <b>erro% s</b> em sua mensagem, ou ainda melhor, adicionando uma cópia de tela da página.
 ErrorWrongValueForField=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não corresponde <b>regra% s)</b>
 ErrorFieldValueNotIn=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não é um valor disponível no <b>campo% s</b> da <b>tabela% s)</b>
 ErrorFieldRefNotIn=Valor errado para o número do <b>campo% s</b> (valor <b>'% s'</b> não é <b>um% s</b> ref existente)
 ErrorsOnXLines=Erros no registro de <b>origem% s</b> (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 <b>'% s'</b> tem um valor não é compatível para usar Dolibarr (deve ter o valor <b>'% s').</b>
 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 <i>'% s'</i>
 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.<br>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 <b>%s</b> 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 <b>módulo% s</b> 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 <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
 WarningAllowUrlFopenMustBeOn=o parâmetro <b>allow_url_fopen</b> deve ser especificado a <b>on</b> ao Arquivo <b>php.ini</b> 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 <b>%s</b>.
-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 <b>%s</b>.
 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 <b>"% s"</b> 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 <br> 'AAAA + AAAA' YYYYMM + YYYYMM 'AAAAMMDD + AAAAMMDD': filtros mais uma série de anos / meses / dias <br> > AAAA ''> YYYYMM ''> AAAAMMDD ': filtros nos seguintes anos / meses / dias <br> '<AAAA' '<YYYYMM' '<AAAAMMDD': filtros nos anos / meses / dias anteriores
 ExportNumericFilter=filtros "NNNNN" por um valor <br> filtros "NNNNN + NNNNN 'mais de uma faixa de valores <br> '> NNNNN' filtros por valores mais baixos <br> '> 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 <b>%s</ b>.
 FTPFailedToRemoveDir=Falha ao remover diretório <b>%s</ b> (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 <b>%s</b>: 
+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 <b>%s</b>:
 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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> clickque aqui </ a>.
-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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+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 <b>%s dias</b> 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 <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> 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 <b>conf.php</b> existe.
 ConfFileDoesNotExists=Arquivo de <b>configuração %s</b> não existe!
 ConfFileDoesNotExistsAndCouldNotBeCreated=Arquivo de <b>configuração %s</b> 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 <b>variables_order</b> 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 <b>para %s.</b> Isto deve ser suficiente.
 PHPMemoryTooLow=Seu PHP max sessão memória está definido <b>para %s</b> bytes. Isto deve ser muito baixo. Alterar o seu <b>php.inem memory_limit</b> para definir parâmetro para pelo <b>menos %s</b> 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).<br>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. <br> 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. <br> 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 <b>' %s'</b> 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 <b>diretório</b> de <b>instalação ou renomeá-lo para install.lock a fim de evitar o seu uso malicioso.</b>
 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 <b>conf.php</b> 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. <br/> 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. <br/> 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. <br/> Esse parâmetro não pode ser definido se de dados já existe.
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de <b>dados %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> permissões.
-YouAskLoginCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados <b>login %s,</b> mas, para isso, Dolibarr necessidade de se conectar ao servidor com o <b>super-usuário %s %s</b> 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 <b>" %s",</b> nome do banco de dados <b>" %s",</b> login <b>" %s",</b> 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 <b>%s</b> da sua versao corrente <b>%s</b>
 InstallChoiceSuggested=<b>Escolha sugerida pelo sistema de installação</b>
 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=<strong>Ultimo passo</strong>: 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 '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+ErrorFailedToDeleteLink=Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink=Failed to update link '<b>%s</b>'
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 <b>%s</b>
-MailingStatusRead=Ler
 CheckRead=Ler recebidor
 YourMailUnsubcribeOK=O e-mail <b>%s</b> 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.<b>%s</b> 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, <b>%s</b> 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 <b>coma </b> 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 <strong>'%s'</strong> 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 <b>%s</b> não está definido ao arquivo de configuração Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário <b>%s</b> 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 <b>%s</b> ao arquivo de configuração <b>conf.php</b>.<br> 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 <b>%s</b> 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 <b>%s</b> 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 <b>%s</b> são obrigatorios
 FieldsWithIsForPublic=Campos com <b>%s</b> 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 "<strong>%s</strong>" (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<br/>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<br/>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: <b>%s</b>)
-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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Para pagar utilizando um cartão de crédito ou Paypal, clique no botão na parte inferior desta página. <br>
 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 <strong>%s</strong> não existe.
-OpenSurveyNothingToSetup=Não há nenhuma configuração específica a fazer.
-PollWillExpire=Sua votação expira automaticamente em <strong>%s</strong> 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:<br>- vazio,<br>- "8h", "8H" ou "08:00"  horário de início da reunião, <br>- "8-11", "8h-11h", "8H-11H" ou "8:00-11:00" horário de início da reunião e do termino,<br> - "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<b>%s</b>
 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<b>%s</b> ?
 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.<br><br>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.<br><br>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 <b>teste</b> (a palavra test deve ser em bold).<br>As duas linhas estao separadas por retorno de linha.<br><br>__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<br>a modificação da senha não será efetiva até que o usuário click no link de confirmação neste e-mail.<br>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=<b>Prof Id %s</b> é uma informação dePendente do país do Fornecedor.<br>Por Exemplo, para o país  <b>%s</b>, é o código <b>%s</b>.
-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 <b>OU</b> 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 <a href
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponíveis para permitir a um cliente efetuar um pagamento
 PaymentForm=Formulário de Pagamento
 WelcomeOnPaymentPage=Bem Vindos a Nossos serviços de pagamento on-line
 ThisScreenAllowsYouToPay=Esta página lhe permite fazer seu pagamento on-line destinado a %s.
 ThisIsInformationOnPayment=Aqui está a informação sobre o pagamento a realizar
-ToComplete=A completar
-YourEMail=E-Mail de confirmação de pagamento
 Creditor=Beneficiário
-PaymentCode=Código de pagamento
 PayBoxDoPayment=Continuar o pagamento com cartão
 YouWillBeRedirectedOnPayBox=Va a ser redirecionado a a página segura de  Paybox para indicar seu cartão de crédito
-PleaseBePatient=Espere uns segundos
-Continue=Continuar
 ToOfferALinkForOnlinePayment=URL para %s pagamento
 ToOfferALinkForOnlinePaymentOnOrder=URL que oferece uma interface de pagamento on-line %s baseada no valor de un pedido de cliente
 ToOfferALinkForOnlinePaymentOnInvoice=URL que oferece uma interface de pagamento on-line %s baseada no valor de uma fatura
@@ -26,7 +20,7 @@ YourPaymentHasBeenRecorded=Esta pagina confirma que o seu pagamento foi registra
 YourPaymentHasNotBeenRecorded=Seu pagamento nao foi registrado e a transaçao foi cancelada. Obrigado.
 AccountParameter=Parametros da conta
 UsageParameter=Parametros de uso
-InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta 
+InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
 PAYBOX_CGI_URL_V2=URL do Paybox CGI modulo para pagamento
 VendorName=Nome do vendedor
 CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
@@ -35,3 +29,6 @@ MessageKO=Mensagem na página de retorno de pagamento cancelado
 NewPayboxPaymentReceived=Novo pagamento recebido Paybox
 NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu
 PAYBOX_PAYONLINE_SENDEMAIL=Aviso por e-mail depois de um pagamento (sucesso ou falha)
+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/pt_BR/paypal.lang b/htdocs/langs/pt_BR/paypal.lang
index 4e9e60ebe80..c9d3eba7af7 100644
--- a/htdocs/langs/pt_BR/paypal.lang
+++ b/htdocs/langs/pt_BR/paypal.lang
@@ -6,20 +6,18 @@ PaypalDoPayment=Pagar com Paypal
 PaypalCBDoPayment=Pagar com cartao de credito
 PAYPAL_API_SANDBOX=Modo teste/caixa de areia
 PAYPAL_API_USER=API usuario
-PAYPAL_API_PASSWORD=API senha
 PAYPAL_API_SIGNATURE=API assinatura
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferecer pagamento "integral" (Cartao de credito + Paypal) ou somente "Paypal"
 PaypalModeIntegral=Integralmente
-PaypalModeOnlyPaypal=Somente Paypal 
+PaypalModeOnlyPaypal=Somente Paypal
 PAYPAL_CSS_URL=URL opcional do CSS estilos na pagina de pagamento
 ThisIsTransactionId=Id da transaçao: <b>%s</b>
 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 <b>%s</b> ?
 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 <b>(tarefas% s</b> 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/shop.lang b/htdocs/langs/pt_BR/shop.lang
deleted file mode 100644
index f9084688bf0..00000000000
--- a/htdocs/langs/pt_BR/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Falha na conexão com banco de dados do osCommerce. Verifique a configuração do módulo
-Shop=Loja
-ShopWeb=Loja web
-LastOrders=últimos pedidos
-OnStandBy=Em espera
-TreatmentInProgress=Em progresso
-LastCustomers=últimos clientes
-OSCommerceShop=Loja OS Commerce
-OSCommerce=OSCommerce
-AddProd=Venda em linha
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 <b>%s</b>, 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 <b>%s</b>
 NoneOrBatchFileNeverRan=Nenhum lote ou <b>%s</b> 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 <b>%s</b> ?
 ConfirmReinitPassword=Você tem certeza que quer gerar uma nova senha para o usuário <b>%s</b> ?
 ConfirmSendNewPassword=Você tem certeza que quer enviar uma nova senha para o usuário <b>%s</b> ?
 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 <b>%s</b>.
 PasswordChangeRequestSent=Solicitação para alterar a senha para <b>%s</b> enviada a <b>%s</b>.
 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 <b>interno</b> é um usuário que pertence à sua Empresa/Instituição.<br>Um usuário <b>externo</b> é um usuário cliente, fornecedor ou outro.<br><br>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 <br> 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
new file mode 100644
index 00000000000..99a473d063b
--- /dev/null
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=contabilidade
+Globalparameters=Parâmetros Globais
+Chartofaccounts=Plano de contas
+Fiscalyear=Anos fiscais
+Menuaccount=contas contabilisticas
+Menuthirdpartyaccount=Contas de terceiros
+MenuTools=Ferramentas
+
+ConfigAccountingExpert=A configuração do módulo especialista em contabilidade
+Journaux=Diarios
+JournalFinancial=Diarios financeiros
+Exports=exportados
+Modelcsv=Modelo de exportação
+Selectmodelcsv=selecionar 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=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=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=contabilidade desagregada
+AccountingVentilationSupplier=Contabilidade desagregada de Fornecedor
+AccountingVentilationCustomer=Contabilidade desagregada de Cliente
+Line=Linha
+
+CAHTF=Total de compras fornecedor HT
+InvoiceLines=Linhas de fatura a ser limpa
+InvoiceLinesDone=Linhas limpas de fatura
+IntoAccount=Na conta de contabilidade
+
+Ventilate=Limpar
+VentilationAuto=Desagregação automática 
+
+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=Separador CSV
+
+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=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=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=Conta de transferencia 
+ACCOUNTING_ACCOUNT_SUSPENSE=conta de espera
+
+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=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=Apagar os registos em Contabilidade geral
+
+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=Pagamento em moeda
+
+SupplierInvoicePayment=Pagamento de fatura de fornecedor
+CustomerInvoicePayment=Pagamento de fatura de cliente
+
+ThirdPartyAccount=Conta de terceiros
+
+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=Lista de contas de terceiros
+DescThirdPartyReport=Consulte aqui a lista  terceiros, clientes  e de fornecedores e as suas contas contábeis
+
+ListAccounts=Lista de contas contabeis
+
+Pcgversion=Versão do plano
+Pcgtype=Classe de conta
+Pcgsubtype=sub-classe de conta
+Accountparent=raiz da conta
+Active=Declaração
+
+NewFiscalYear=Novo ano fiscal
+
+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=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=Validação automatica 
+
+ErrorAccountancyCodeIsAlreadyUse=Erro, Não pode apagar uma conta em uso
+
+FicheVentilation=Carta de desagregação
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 9bb55247875..3e195800e80 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Erro, este módulo requer a versão %s ou supe
 ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a <b>%s</b> não são suportadas.
 DictionarySetup=Configurar Dicionário
 Dictionary=Dicionários
+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=O código não pode conter o valor 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Caixa
 Boxes=Caixas
 MaxNbOfLinesForBoxes=Nº de linhas máximo para as caixas
 PositionByDefault=Posição por defeito
-Position=Ordem
+Position=Position
 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
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automático se o Javascript está desactivado
 AvailableOnlyIfJavascriptNotDisabled=Disponivel somente se o Javascript esta activo
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponivel somente se o Javascript e Ajax estiverem activos
 Required=Requerido
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Segurança
 Passwords=Palavras-Passe
 DoNotStoreClearPassword=Não guardar a palavra-passe sem codificar na base de dados
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome servidor ou ip do servidor SM
 MAIN_MAIL_EMAIL_FROM=E-Mail do emissor para envios E-Mail automáticos (Por defeito em php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Remetente de e-mail usado para e-mails enviados retorna erro
 MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os e-mails enviados para
+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_MAIL_SENDMODE=Método de envío de e-mails
 MAIN_MAIL_SMTPS_ID=ID SMTP para autenticação SMTP
@@ -431,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=Contracts/Subscriptions
+Module54Desc=Management of contracts (services or reccuring subscriptions)
 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
@@ -469,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=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Interface com calendario Webcalendar
 Module500Name=Special expenses (tax, social contributions, dividends)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce 1
-Module800Desc=Interface de visualização de uma loja OSCommerce mediante acesso directo à sua base de dados
-Module900Name=OSCommerce 2
-Module900Desc=Interface de visualização de uma loja OSCommerce mediante Web services.\nEste módulo requer a instalação os ficheiros de /oscommerce_ws/ws_server em OSCommerce. Leia o Ficheiro README da pasta /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Interface com o sistema de seguimento de incidencias Mantis
 Module1400Name=Perito de Contabilidade
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Criar/Modificar Impostos e IVA
 Permission93=Eliminar Impostos e IVA
 Permission94=Exportar Impostos Sociais
 Permission95=Consultar balanços e resultados
-Permission96=Parametrizar repartição
-Permission97=Leer linhas de facturas
-Permission98=Repartir linhas de facturas
 Permission101=Consultar Expedições
 Permission102=Criar/Modificar Expedições
 Permission104=Confirmar Expedições
@@ -603,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=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 Fornecedores
 Permission181=Consultar pedidos a Fornecedores
 Permission182=Criar/Modificar pedidos a Fornecedores
@@ -668,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
@@ -698,8 +709,8 @@ Permission701=Consultar Bolsas
 Permission702=Criar/Modificar Bolsas
 Permission703=Eliminar Bolsas
 Permission1001=Consultar stocks
-Permission1002=Criar/Modificar stocks
-Permission1003=Eliminar stocks
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Consultar movimientos de stock
 Permission1005=Criar/Modificar movimentos de stock
 Permission1101=Consultar ordens de envío
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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&#39
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Identidade profissional única
 MustBeUnique=Deve ser exclusivo?
 MustBeMandatory=Obrigatório para criar os terceiros?
@@ -1134,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
@@ -1142,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 . <br>a 'url completa da chamada será: URL?login
@@ -1154,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
@@ -1318,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
@@ -1378,9 +1393,10 @@ 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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 00f27f04dea..37be1a827f9 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID do evento
 Actions=Acções
 ActionsArea=Área de Acções
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendário
-Calendars= Calendários
-LocalAgenda=Calendário local
-AffectedTo= Afecta o
-DoneBy= Realizado por
-Events= Eventos
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendário
+Calendars=Calendários
+LocalAgenda=Calendário interno
+ActionsOwnedBy=Event owned by
+AffectedTo=Afecta o
+DoneBy=Realizado por
+Event=Event
+Events=Eventos
 EventsNb=Número de eventos
 MyEvents=Meus eventos
 OtherEvents=Outros eventos
@@ -17,39 +19,40 @@ ListOfActions=Lista de Eventos
 Location=Localização
 EventOnFullDay=Evento para todo o dia
 SearchAnAction= Procurar uma Acção
-MenuToDoActions= Acções a fazer
-MenuDoneActions= Todos os eventos terminados
-MenuToDoMyActions= Os meus eventos incompletos
-MenuDoneMyActions= Os meus eventos terminados
-ListOfEvents= Lista de Eventos
+MenuToDoActions=Acções a fazer
+MenuDoneActions=Todos os eventos terminados
+MenuToDoMyActions=Os meus eventos incompletos
+MenuDoneMyActions=Os meus eventos terminados
+ListOfEvents=Lista de eventos (Calendário interno)
 ActionsAskedBy=Os meus eventos reportados
 ActionsToDoBy=Eventos atribuídos a
 ActionsDoneBy=Eventos realizados por
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
+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
 ViewCal=Ver Calendário
 ViewDay=Modo de exibição Dia
 ViewWeek=Vista da semana
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Ver com filtros predefinidos
 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
 OrderApprovedInDolibarr=Encomenda %s aprovada
-OrderRefusedInDolibarr=Order %s refused
+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
@@ -57,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=Intervention %s classified as Billed
 NewCompanyToDolibarr= Nova Empresa Adicionada
 DateActionPlannedStart= Planeada data de início
 DateActionPlannedEnd= Planeada data de fim
@@ -68,19 +69,24 @@ DateActionStart= Data de Início
 DateActionEnd= Data Fim
 AgendaUrlOptions1=Também pode adicionar os seguintes parâmetros de filtro de saída:
 AgendaUrlOptions2=<b>login=%s</b>para restringir a produção para acções criadas por, ou afectadas a fazer pelo utilizador <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> para restringir a produção para acções criadas pelo utilizador <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> para restringir a produção para as acções para o utilizador afectado <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> para restringir a produção para acções feitas pelo utilizador <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Mostrar Aniversários dos Contactos
 AgendaHideBirthdayEvents=Esconder Aniversários dos Contactos
 Busy=Ocupado
 ExportDataset_event1=Lista de eventos da agenda
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Exportar calendário
 ExtSites=Importar calendários externos
-ExtSitesEnableThisTool=Mostrar calendários externos na agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Número de calendários
 AgendaExtNb=Calendário nb %s
 ExtSiteUrlAgenda=URL para aceder. Ficheiro iCal
 ExtSiteNoLabel=Sem Descrição
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 2304a6d4be4..57682ef6df2 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -23,13 +23,13 @@ InvoiceProFormaAsk=Factura Pro-Forma
 InvoiceProFormaDesc=<b>Factura Pro-Forma</b> é uma verdadeira imagem de uma factura, mas não tem valor contabilístico.
 InvoiceReplacement=Factura Rectificativa
 InvoiceReplacementAsk=Factura Rectificativa da Factura
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>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=<b>Fatura de substituição</b> é usada para cancelar e substituir completamente uma factura sem o pagamento já recebido. <br><br> Nota: Apenas as faturas sem pagamento podem ser substituídas. Se a fatura de substituição ainda não está fechada, ela será automaticamente fechada para "abandonado".
 InvoiceAvoir=Nota de Crédito
 InvoiceAvoirAsk=Nota de Crédito para Corrigir a Factura
 InvoiceAvoirDesc=A <b>Nota de Crédito</b> é 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).<br><br>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=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=Criar Nota de Crédito com as linhas da fatura de origem
+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
@@ -58,7 +58,7 @@ Payment=pagamento
 PaymentBack=Reembolso
 Payments=pagamentos
 PaymentsBack=Reembolsos
-PaidBack=Paid back
+PaidBack=Devolver Pagamento
 DatePayment=data de pagamento
 DeletePayment=Eliminar o pagamento
 ConfirmDeletePayment=Está seguro de querer eliminar este pagamento?
@@ -66,12 +66,12 @@ ConfirmConvertToReduc=Quer converter este deposito numa redução futura?<br>o M
 SupplierPayments=Pagamentos a Fornecedores
 ReceivedPayments=Pagamentos recebidos
 ReceivedCustomersPayments=Pagamentos recebidos de cliente
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Pagamentos pagos a fornecedores
 ReceivedCustomersPaymentsToValid=Pagamentos recebidos de cliente a Confirmar
 PaymentsReportsForYear=Relatórios de pagamentos de %s
 PaymentsReports=Relatórios de pagamentos
 PaymentsAlreadyDone=Pagamentos efectuados
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Devolução de pagamentos efetuados
 PaymentRule=Estado do Pagamento
 PaymentMode=Forma de Pagamento
 PaymentConditions=Tipo de Pagamento
@@ -85,9 +85,10 @@ ClassifyPaid=Classificar 'Pago'
 ClassifyPaidPartially=Classificar 'Pago Parcialmente'
 ClassifyCanceled=Classificar 'Abandonado'
 ClassifyClosed=Classificar 'Fechado'
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Criar Factura
-AddBill=Criar Factura ou Deposito
-AddToDraftInvoices=Add to draft invoice
+AddBill=Create invoice or credit note
+AddToDraftInvoices=Adicionar à fatura rascunho
 DeleteBill=Eliminar Factura
 SearchACustomerInvoice=Procurar uma factura de cliente
 SearchASupplierInvoice=Procurar uma factura de fornecedor
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Está seguro de querer anular a factura <b>%s</b> ?
 ConfirmCancelBillQuestion=Porque Razão quer abandonar a factura?
 ConfirmClassifyPaidPartially=Está seguro de querer classificar a factura <b>%s</b> como paga?
 ConfirmClassifyPaidPartiallyQuestion=Esta factura não foi totalmente paga.Porque quer classifica-la como paga?
-ConfirmClassifyPaidPartiallyReasonAvoir=O resto a pagar <b>(%s %s)</b> foi regularizado (já que artigo foi devolvido, esquecido de entregar, Desconto não definido...)  mediante um deposito
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=O resto a pagar <b>(%s %s)</b> é um Desconto acordado depois da factura. Aceito perder o IVA deste Desconto
-ConfirmClassifyPaidPartiallyReasonDiscountVat=O resto a pagar<b>(%s %s)</b> é um Desconto
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -170,7 +169,7 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta eleição será possível, por
 ConfirmClassifyAbandonReasonOther=Outro
 ConfirmClassifyAbandonReasonOtherDesc=Esta eleição será para qualquer outro caso. Por Exemplo a raiz da intenção de Criar uma factura rectificativa.
 ConfirmCustomerPayment=Confirma o processo  deste pagamento de <b>%s</b> %s ?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
+ConfirmSupplierPayment=Deseja confirmar este pagamento para <b>%s</b> %s?
 ConfirmValidatePayment=Está seguro de querer confirmar este pagamento (Nenhuma modificação é possível uma vez o pagamento esteja validado)?
 ValidateBill=Confirmar factura
 UnvalidateBill=Factura invalida
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Desconto (Pronto pagamento)
-SendBillRef=Enviar factura %s
-SendReminderBillRef=Recordar factura %s
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Débitos Directos
 StandingOrder=Domiciliação
 NoDraftBills=Nenhuma factura rascunho
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual
 ConfirmRemoveDiscount=Tem certeza de que deseja remover este desconto?
 RelatedBill=factura relacionados
 RelatedBills=facturas relacionadas
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Pronto Pagamento
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index d66dd071134..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?
@@ -111,3 +108,5 @@ ExtraFieldsCategories=Complementary attributes
 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 74159d98598..83024e188b6 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -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=Área de terceiros
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=%s Última modificação terceiros
 UniqueThirdParties=Total de originais terceiros
 InActivity=Aberto
@@ -410,3 +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
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index f05ffdf57c7..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
@@ -187,7 +188,7 @@ AccountancyDashboard=Accountancy summary
 ByProductsAndServices=By products and services
 RefExt=Ref externa
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=associado à encomenda
+LinkedOrder=Link to order
 ReCalculate=Recalcular
 Mode1=Método 1
 Mode2=Método 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 790da1a9b6e..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
@@ -30,3 +30,9 @@ SearchADonation=Procure uma doação
 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 e46de45abe8..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=&quot;%s&quot; 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=&quot;%s&quot; 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 <b>%s</b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Erro, o php deve ter o módulo <b>%s</b> instalado para utili
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Os armazéns de origem e de destino não devem ser iguais
 ErrorBadFormat=Formato incorrecto!
-ErrorPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) não pode ser anterior à data de faturação (%s) para a fatura %s.
 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=Os parâmetros de configuração obrigatórios ainda não estão definidos
@@ -154,3 +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
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index 29bc1c0ff10..38a96a3e61f 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Número de conta
 BankAccountNumberKey=Dígito Control
 SpecialCode=Código Especial
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 996875e7368..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=Férias
-CPTitreMenu=Férias
+Holidays=Folgas
+CPTitreMenu=Folgas
 MenuReportMonth=Monthly statement
-MenuAddCP=Efectuar pedido de férias
-NotActiveModCP=É necessário activar o módulo "Férias" para visualizar esta página.
-NotConfigModCP=É necessário configurar o módulo "Férias" para visualizar esta página. <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> Clique aqui </ a> para o fazer.
-NoCPforUser=Não possui qualquer pedido de férias.
-AddCP=Efectuar pedido de férias
+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,  <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+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=Lista de férias
+ListeCP=Lista de folgas
 ReviewedByCP=Será analisado por
 DescCP=Descrição
-SendRequestCP=Enviar pedido de férias
-DelayToRequestCP=Os pedidos de férias devem ser efectuados com, pelo menos, <b>% s dia(s) </ b> de antecedência.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Criar requisição de folga
+DelayToRequestCP=Requisição de folga de ser feita pelo menos <b>%s dia(s)</b> antes de.
+MenuConfCP=Editar balanço de folgas
+UpdateAllCP=Atualisar folgas
+SoldeCPUser=Balanço de folgas é <b>%s</b> dias
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação:
-ErrorIDFicheCP=Ocorreu um erro, o pedido de férias não existe.
+ErrorIDFicheCP=Um erro ocorreu, a requisição de folga não existe
 ReturnCP=Voltar à página anterior
-ErrorUserViewCP=Não possui permissões para visualizar este pedido de férias.
-InfosCP=Informações do pedido de Férias
+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=Folha de férias
-NbUseDaysCP=Número de dias de férias utilizados
+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=Apagar o pedido de férias
-ConfirmDeleteCP=Tem a certeza que deseja eliminar este pedido de férias?
-ErrorCantDeleteCP=Não possui permissões para apagar este pedido de férias.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Actualizar
-CantUpdate=Não é possível modificar este pedido de férias.
+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=Tema certeza que deseja aprovar este pedido de férias?
+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=Enviar pedido de férias
-ConfirmToValidCP=Tem a certeza que deseja enviar este pedido de férias?
-TitleRefuseCP=Recusar pedido de férias
-ConfirmRefuseCP=Tem a certeza que deseja recusar este pedido de férias?
+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=Tem a certeza que deseja cancelar este pedido de férias?
+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,42 +71,42 @@ 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 holidays
-LogCP=Log of updates of holidays
+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=Primeiro dia de férias
-LastDayOfHoliday=Último dia de férias
+LastDayOfHoliday=Ultimo dia de férias
 HolidaysMonthlyUpdate=Actualização Mensal
 ManualUpdate=Actualização Manual
-HolidaysCancelation=Cancelamento de Férias
+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 holidays
+GroupToValidateCP=Grupo habilitado para aprovar requisições
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validar
 UpdateEventCP=Update events
 CreateEventCP=Criar
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Actualizar
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuração de Férias
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Olá
-HolidaysToValidate=Aprovar férias
-HolidaysToValidateBody=Abaixo encontram-se os pedidos de férias por validar
-HolidaysToValidateDelay=Este pedido de férias terá início em menos de %s dias.
-HolidaysToValidateAlertSolde=O utilizador que efectuou este pedido de férias não tem dias disponíveis suficientes.
-HolidaysValidated=Férias aprovadas
-HolidaysValidatedBody=O seu pedido de férias de %s a %s foi aprovado.
-HolidaysRefused=Férias recusadas
-HolidaysRefusedBody=O seu pedido de férias de %s a %s foi recusado pelo seguinte motivo:
-HolidaysCanceled=Férias canceladas
-HolidaysCanceledBody=O seu pedido de férias de %s a %s foi cancelado.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 12ca0b0b0ed..2881be0fc16 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -207,5 +207,5 @@ MigrationActioncommElement=Atualizar os dados sobre as ações
 MigrationPaymentMode=A migração de dados para o modo de pagamento
 MigrationCategorieAssociation=Migração de categorias
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Mostrar opções ocultas
+HideNotAvailableOptions=Esconder opções ocultas
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index 12557b65f32..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
@@ -24,10 +24,21 @@ 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=Classificar &quot;Faturado&quot;
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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/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 '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+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 '<b>%s</b>'
+ErrorFailedToUpdateLink= Falha na atualização de ligação '<b>%s</b>'
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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..4d6bfc4b519 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossivel encontrar o utilizador <b>%s</b
 ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o país '%s'.
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país &quot;%s&quot;.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro 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=Seleccionar uma data
 SeeAlso=Ver também %s
 BackgroundColorByDefault=Cor de fundo por omissão
+FileNotUploaded=O ficheiro não foi enviado
+FileUploaded=O ficheiro foi enviado com sucesso
 FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar.
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Ler ajuda on-line (é necessário acesso à Internet)
@@ -206,7 +206,7 @@ Limit=Limite
 Limits=Limites
 DevelopmentTeam=Equipa de Desenvolvimento
 Logout=Terminar Sessão
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+NoLogoutProcessWithAuthMode=Função aplicativo não desconetado com modo de autenticação  <b>%s</b>
 Connection=Ligação
 Setup=Configuração
 Alert=Alerta
@@ -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
@@ -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
@@ -340,6 +341,7 @@ FullList=Lista completa
 Statistics=Estatísticas
 OtherStatistics=Outras estatísticas
 Status=Estado
+Favorite=Favoritos
 ShortInfo=Informação
 Ref=Ref.
 RefSupplier=Ref. fornecedor
@@ -356,7 +358,7 @@ ActionNotApplicable=Não aplicável
 ActionRunningNotStarted=Não Iniciado
 ActionRunningShort=Iniciado
 ActionDoneShort=Terminado
-ActionUncomplete=Uncomplete
+ActionUncomplete=Incompleta
 CompanyFoundation=Empresa ou Instituição
 ContactsForCompany=Contactos desta empresa
 ContactsAddressesForCompany=Contatos / endereços para este terceiro
@@ -365,6 +367,7 @@ ActionsOnCompany=Acções nesta sociedade
 ActionsOnMember=Eventos sobre este membro
 NActions=%s acções
 NActionsLate=%s em atraso
+RequestAlreadyDone=O pedido já foi realizado anteriormente
 Filter=Filtro
 RemoveFilter=Eliminar filtro
 ChartGenerated=Gráficos gerados
@@ -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  "<strong>%s</strong>" (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<br/>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 4afff564f64..b30a848fa5a 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Área Membros
-PublicMembersArea=Área pública dos Membros
+MembersArea=Área de Membros
+PublicMembersArea=Área pública de Membros
 MemberCard=Ficha membro
-SubscriptionCard=Ficha filiação
+SubscriptionCard=Ficha de Subscrição
 Member=Membro
 Members=Membros
 MemberAccount=Login membro
@@ -10,7 +10,7 @@ ShowMember=Mostrar ficha membro
 UserNotLinkedToMember=Utilizador não vinculado a um membro
 ThirdpartyNotLinkedToMember=Terceiro não está associado a um membro
 MembersTickets=Etiquetas Membros
-FundationMembers=Membros da associação
+FundationMembers=Membros da organização
 Attributs=Atributos
 ErrorMemberTypeNotDefined=Não foi indicado o tipo de membro
 ListOfPublicMembers=Lista de Membros públicos
@@ -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
@@ -93,9 +93,9 @@ 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
+Physical=Pessoa Singular
+Moral=Pessoa Coletiva
+MorPhy=Pessoa Singular/Pessoa Coletiva
 Reenable=Reactivar
 ResiliateMember=Dar de baixa um membro
 ConfirmResiliateMember=Está seguro de querer dar de baixa a este membro?
@@ -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: <b>%s</b>)
@@ -170,7 +170,7 @@ LastSubscriptionAmount=Montante de subscrição Última
 MembersStatisticsByCountries=Membros estatísticas por país
 MembersStatisticsByState=Membros estatísticas por estado / província
 MembersStatisticsByTown=Membros estatísticas por cidade
-MembersStatisticsByRegion=Members statistics by region
+MembersStatisticsByRegion=Estatísticas do membros por região
 MemberByRegion=Membros por região
 NbOfMembers=Número de membros
 NoValidatedMemberYet=Nenhum membro validado encontrado
@@ -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. <br><br> 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..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 69a6e8b887c..a8d228293be 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Fechado
 ContractStatusRunning=Em Serviço
 ContractStatusExpired=Expirado
 ContractStatusOnHold=Fora de serviço
-ContractStatusToRun=A colocar em serviço
+ContractStatusToRun=To get running
 ContractNotRunning=Este contrato não está em serviço
 ErrorProductAlreadyExists=Um produto com a referencia %s já existe.
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorrecto
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Fornecedores
 SupplierRef=Ref. fornecedor
 ShowProduct=Mostrar produto
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Copie produto ou serviço
 ConfirmCloneProduct=Tem certeza de que pretende copiar produto ou <b>serviço %s?</b>
 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
@@ -239,3 +240,10 @@ PricingRule=Regras de Preços
 AddCustomerPrice=Adicionar preço por clientes
 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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 c3539118df9..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
@@ -85,13 +87,13 @@ ActionsOnProject=Ações sobre o projeto
 YouAreNotContactOfProject=Não é um contato deste projeto privado
 DeleteATimeSpent=Excluir o tempo gasto
 ConfirmDeleteATimeSpent=Tem certeza que quer eliminar este tempo dispensado?
-DoNotShowMyTasksOnly=Ver também as tarefas não atribuidas por mim
-ShowMyTasksOnly=Ver tarefas atribuidas por mim
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
 NoTasks=Não existem tarefas para este projeto
 LinkedToAnotherCompany=Vinculado a Terceiros
-TaskIsNotAffectedToYou=Tarefa não atribuida a si
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Tempo dispensado está vazio
 ThisWillAlsoRemoveTasks=Esta ação também vai excluir todas as tarefas do projeto (<b>%s</b> tarefas no momento) e todas as entradas de tempo dispensadas.
 IfNeedToUseOhterObjectKeepEmpty=Caso alguns objetos (fatura, encomenda, ...), pertencentes a um terceiro, deve estar vinculado ao projeto para criar, manter este vazio para ter o projeto sendo multi-terceiros.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Selecionar elemento
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=modelo de um projeto completo do relatório (logo. ..)
 PlannedWorkload = Carga de trabalho planeada
@@ -128,3 +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
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/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 952806d131c..fa7ca1d6070 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -50,27 +50,31 @@ Enlevement=Pick-up por o Cliente
 DocumentModelSimple=Modelo Simples
 DocumentModelMerou=Mérou modelo A5
 WarningNoQtyLeftToSend=Atenção, não existe qualquer produto à espera de ser enviado.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Data de entrega planeada
 DateReceived=Data da entrega recebida
 SendShippingByEMail=Efectuar envio por e-mail
-SendShippingRef=Enviar %s embarque
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Eventos em embarque
 LinkToTrackYourPackage=Link para acompanhar o seu pacote
 ShipmentCreationIsDoneFromOrder=A criação de uma nova remessa é efectuada a partir da encomenda.
 RelatedShippings=Envios relacionados
-# ShipmentLine=Shipment line
+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
 SendingMethodTRANS=Transportador
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Modelo de documento simples de recibos de entrega
 DocumentModelTyphon=Modelo de documento mais completo para a entrega recibos (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER constante não definida
 SumOfProductVolumes=Soma dos volumes dos produtos
 SumOfProductWeights=Soma dos pesos dos produtos
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/pt_PT/shop.lang b/htdocs/langs/pt_PT/shop.lang
deleted file mode 100644
index 39b80d52387..00000000000
--- a/htdocs/langs/pt_PT/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Loja
-ShopWeb=Loja web
-LastOrders=Últimos pedidos
-OnStandBy=Em espera
-TreatmentInProgress=Em progresso
-LastCustomers=Últimos clientes
-OSCommerceShop=Loja OS Commerce
-OSCommerce=OSCommerce
-AddProd=Venda em linha
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/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index ee7aafedc5b..116f00ca116 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Criar Factura do Fornecedor
 ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor <b>%s</b>
 NoneOrBatchFileNeverRan=Nenhum lote <b>ou %s</b> não executou recentemente
 SentToSuppliers=Enviado para os fornecedores
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
index ca420537539..09f269a57e1 100644
--- a/htdocs/langs/pt_PT/trips.lang
+++ b/htdocs/langs/pt_PT/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Viagem
 ListTripsAndExpenses=Lista de viagens e despesas
 ExpensesArea=Viagens e área de despesas
 SearchATripAndExpense=Procure uma viagem e despesas
+ClassifyRefunded=Classify 'Refunded'
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 71a0ea1871d..6f65fee482b 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -63,7 +63,6 @@ ShowGroup=Ver grupo
 ShowUser=Ver utilizador
 NonAffectedUsers=Utilizadores não destinados ao grupo
 UserModified=Utilizador correctamente modificado
-GroupModified=Grupo %s Modificado
 PhotoFile=Fotografia
 UserWithDolibarrAccess=Utilizador com acesso ao Dolibarr
 ListOfUsersInGroup=Lista de Utilizadores deste grupo
@@ -103,7 +102,7 @@ UserDisabled=Utilizador %s Desactivado
 UserEnabled=Utilizador %s Activado
 UserDeleted=Utilizador %s Eliminado
 NewGroupCreated=Grupo %s Criado
-GroupModified=Grupo %s Modificado
+GroupModified=Group %s modified
 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?
@@ -114,8 +113,10 @@ YourRole=Seus papéis
 YourQuotaOfUsersIsReached=A sua quota de utilizadores foi atingida!
 NbOfUsers=N º de utilizadores
 DontDowngradeSuperAdmin=Apenas um superadmin pode desclassificar um superadmin
-HierarchicalResponsible=Responsabilidade Hierárquica
+HierarchicalResponsible=Supervisor
 HierarchicView=Vista Hierárquica
 UseTypeFieldToChange=Use Tipo de Campo para mudar
 OpenIDURL=Endereço OpenID
 LoginUsingOpenID=Utilizar OpenID para autenticação
+WeeklyHours=Weekly hours
+ColorUser=Color of the user
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
new file mode 100644
index 00000000000..4aa5d073a0e
--- /dev/null
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Contabilitate
+Globalparameters=Parametri globali
+Chartofaccounts=Plan de conturi
+Fiscalyear=Ani fiscali
+Menuaccount=Conturi contabile
+Menuthirdpartyaccount=Conturi terţi
+MenuTools=Instrumente
+
+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 către CEGID Expert
+BackToChartofaccounts=Înapi la plan de conturi
+Back=Return
+
+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=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=Crează
+UpdateAccount=Modificare cont contabil
+UpdateMvts=Modificare mişcare
+WriteBookKeeping=Înregistrare contabilă in Cartea Mare
+Bookkeeping=Cartea Mare
+AccountBalanceByMonth=Sold pe luni
+
+AccountingVentilation=Ventilare contabilă
+AccountingVentilationSupplier=Ventilare contabila furnizor
+AccountingVentilationCustomer=Ventilare contabila  client
+Line=Linie
+
+CAHTF=Total cumpărări furnizor fara taxe
+InvoiceLines=Liniile facturii de ventilat
+InvoiceLinesDone=Liniile facturii ventilate
+IntoAccount=În conturi contabile
+
+Ventilate=Ventilează
+VentilationAuto=Ventilare automată
+
+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=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=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=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=Cont transfer
+ACCOUNTING_ACCOUNT_SUSPENSE=Cont  contabil de aşteptare
+
+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=Tipul documentului
+Docdate=Data
+Docref=Referinţă
+Numerocompte=Cont
+Code_tiers=Terţ
+Labelcompte=Etichetă cont
+Debit=Debit
+Credit=Credit
+Amount=Sumă
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Şterge înregistrări din Cartea Mare
+
+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=Plaţi numerar
+
+SupplierInvoicePayment=Plata factura furnizor
+CustomerInvoicePayment=Plata factura client
+
+ThirdPartyAccount=Cont terţi
+
+NewAccountingMvt=Transfer nou
+NumMvts=Numarul transferurilor
+ListeMvts=Lista transferurilor
+ErrorDebitCredit=Debitul și creditul nu pot avea o valoare, în același timp,
+
+ReportThirdParty=Lista Conturi terţi
+DescThirdPartyReport=Consultati aici lista terţilor furnizori și clienţi şi conturile lor  contabile
+
+ListAccounts=Lista conturilor contabile
+
+Pcgversion=Versiunea planului
+Pcgtype=Clasa contului
+Pcgsubtype=Sub Clasa contului
+Accountparent=Rădăcina contului
+Active=Extras 
+
+NewFiscalYear=An fiscal nou
+
+DescVentilCustomer=Consultati aici ventilarea contabilă anuală a facturilor de clienților ale dvs.
+TotalVente=Total Cifră de afaceri fără taxe
+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=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=Validează automat
+
+ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit
+
+FicheVentilation=Fişă Ventilare
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index d972c4ce4d5..82af6b13bb6 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -43,17 +43,21 @@ SecuritySetup=Setări Securitate
 ErrorModuleRequirePHPVersion=Eroare, acest modul necesită PHP versiunea %s sau mai mare
 ErrorModuleRequireDolibarrVersion=Eroare, acest modul Dolibarr necesită versiunea %s sau mai mare
 ErrorDecimalLargerThanAreForbidden=Eroare, o precizie mai mare decât  <b>%s</b> nu este suportat.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
+DictionarySetup=Setări Dictionar
+Dictionary=Dicţionare
+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
@@ -66,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
@@ -104,9 +108,9 @@ OtherOptions=Alte opţiuni
 OtherSetup=Alte Setări
 CurrentValueSeparatorDecimal=Separator zecimal
 CurrentValueSeparatorThousand=Separator mii
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Destinaţii
+IdModule=ID Modul
+IdPermissions=ID Permisiuni
 Modules=Module
 ModulesCommon=Module Principale
 ModulesOther=Alte Module
@@ -116,14 +120,14 @@ ParameterInDolibarr=Parametru %s
 LanguageParameter=Parametru Limba %s
 LanguageBrowserParameter=Parametru %s
 LocalisationDolibarrParameters=Parametrii Localizare
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
+ClientTZ=Time Zone client (utilizator)
+ClientHour=Client Time(utilizator)
+OSTZ=Time Zone Server OS
 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
@@ -133,7 +137,7 @@ Box=Căsuţă
 Boxes=Căsuţe
 MaxNbOfLinesForBoxes=Max numărul de linii pentru căsuţe
 PositionByDefault=Poziţia implicită
-Position=Ordinea
+Position=Poziţie
 MenusDesc=Meniuri manageri definesc conţinutul de 2 bare de meniu (bara orizontală şi bară verticală).
 MenusEditorDesc=Meniul editor vă permit să definiţi personalizate intrările din meniuri. Utilizaţi-l cu atenţie, pentru a evita luarea dolibarr instabilă şi intrări de meniu permanent inaccesibil. <br> Unele module se adaugă intrările din meniuri (în meniul <b>Tot</b> în cele mai multe cazuri). Dacă aţi eliminat unele din aceste intrări din greşeală, puteţi să le restaura de reenabling şi dezactivarea modulului.
 MenuForUsers=Meniu pentru utilizatori
@@ -161,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
@@ -176,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
@@ -206,6 +210,7 @@ ModulesJobDesc=Business furniza module simple predefinite de configurare de Doli
 ModulesMarketPlaceDesc=Puteţi găsi mai multe module pentru descărcare pe site-uri web externe de pe Internet ...
 ModulesMarketPlaces=Module mai multe ...
 DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr ERP / CRM
+DoliPartnersDesc=Listă cu unele companii care pot furniza / dezvolta module  la cerere  sau noi  funcţionalităţi (Notă: orice companie Open Source cunoscând limbajul  PHP vă poate oferi dezvoltări specifice)
 WebSiteDesc=Site-ul Web al furnizorilor unde puteţi căuta şi  găsi mai multe module ...
 URL=Link
 BoxesAvailable=Căsuţe disponibile
@@ -217,6 +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=Folosit numai de unele optiuni agenda
 Security=Securitate
 Passwords=Parolele
 DoNotStoreClearPassword=Nu stoca parole în mod clar în baza de date
@@ -226,7 +232,7 @@ InstrucToClearPass=Pentru a avea parola decodificate (clare) în <b>conf.php</b>
 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
@@ -235,9 +241,9 @@ 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)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OfficialWebHostingService=Referinţă Servicii de web hosting (Cloud hosting)
+ReferencedPreferredPartners=Parteneri preferati
+OtherResources=Alte Resurse
 ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> aruncăm o privire la Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Pentru orice alte întrebări / ajutor, se poate utiliza Dolibarr forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
 HelpCenterDesc1=Această zonă vă poate ajuta să obţineţi un suport de Ajutor de servicii pe Dolibarr.
@@ -257,18 +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 <b>php.ini: %s)</b>
 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= Trimite sistematic un CC ascuns cu propunerilor 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 <b>langs</b> directorul <b>/ %s</b> ş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
@@ -296,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: <br> <b>{000000}</b> 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. <br> <b>{000000} +000</b> fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima% s. <br> <b>{000000 @ x}</b> 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ă. <br> <b>{Dd}</b> zi (01 la 31). <br> <b>{Mm}</b> luni (01 la 12). <br> <b>{AA}, {AAAA}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{Cccc}</b> codul de client pe n caractere <br> <b>{Cccc000}</b> 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. <br><b>{tttt}</b>Tipul  codului terţului  pe n caractere (a se vedea tipurile dicționarului-terţi). <br>
 GenericMaskCodes3=Toate celelalte caractere în masca va rămâne intactă. <br> Spaţiile nu sunt permise. <br>
 GenericMaskCodes4a=<u>Exemplu pe 99th %s de-a treia parte TheCompany făcut 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Exemplu de la o terţă parte a creat pe 2007-03-01:</u> <br>
@@ -317,11 +326,11 @@ UseACacheDelay= Întârziere pentru caching de export de răspuns în câteva se
 DisableLinkToHelpCenter=Ascundere link-ul <b>"Aveţi nevoie de ajutor sau sprijin"</b> de la pagina de login
 DisableLinkToHelp=Ascundere link-ul <b>" %s Online Help"</b> 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? <br> 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. <br><br> Pune aici plin patetic de directoare. <br> Adauga un retur de car între directorul eah. <br> Pentru a adăuga un director a modulului GED, adăugaţi aici <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> Fişierele din aceste directoare trebuie să se termine <b>cu. Odt.</b>
@@ -368,15 +377,15 @@ 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<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ... <br><br> Pentru a avea listă în funcție de o alta:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpcheckbox=Lista de parametri trebuie să fie de tip cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip  cheie, valoare <br><br> pentru exemplul: <br> 1, valoare1 <br> 2, valoare2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=Lista de parametri a venit de la tabelul <br>Sintaxa: able_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br> filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă <br> dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)<br><br>În scopul de avea lista depinzând de alta  :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=Librairie utilizată la construirea PDF ului
 WarningUsingFPDF=Atenție: <b>conf.php</b> contine Directiva <b>dolibarr_pdf_force_fpdf = 1.</b> 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. <br> Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , atunci comentariu sau elimina linia <b>$ dolibarr_pdf_force_fpdf = 1,</b> și se adaugă în schimb <b>$ dolibarr_lib_TCPDF_PATH = &#39;path_to_TCPDF_dir&#39;</b>
 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: <br> 1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala) <br> 2: taxa locala aplica pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax) <br> 3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala) <br> 4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax) <br> 5: Taxa locală  se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala) <br> 6: TTaxa locală  se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax)
@@ -388,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 <strong>%s</strong> records on <strong>%s</strong> %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 <strong>%s</strong> înregistări pe <strong>%s</strong> %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
@@ -419,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
@@ -431,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
@@ -469,22 +478,18 @@ 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ă, comanda, propunere, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
-Module500Name=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
+Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
+Module500Desc=Managementul cheltuielilor speciale cum ar fi taxele , contribuţiile sociale, dividendele si salariile
+Module510Name=Salarii
+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
-Module800Name=OSCommerce direct
-Module800Desc=Interfata pentru a afişa o OSCommerce OSCSS magazin sau prin intermediul bazei de date de acces direct
-Module900Name=OSCommerce de WS
-Module900Desc=Interfata pentru a afişa un magazin OSCommerce prin servicii Web. \\ NAcest modul requiere vă pentru a instala componente de la / oscommerce_ws / ws_server în OSCommerce server. Vezi README fişier în / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integrare
 Module1400Name=Contabilitate
@@ -493,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
@@ -501,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
@@ -512,28 +521,32 @@ 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
+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
@@ -552,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
@@ -575,9 +588,6 @@ Permission92=Creare / Modificare a contribuţiilor sociale şi a TVA-ului
 Permission93=Ştergere a contribuţiilor sociale şi a TVA-ului
 Permission94=Export contribuţiilor sociale
 Permission95=Citeşte rapoarte
-Permission96=Setup expediţie
-Permission97=Citeşte contabilitate factura de expediţie
-Permission98=Expedierii facturii de contabilitate linii
 Permission101=Citeşte sendings
 Permission102=Creare / Modificare Livrare
 Permission104=Validează livrari
@@ -603,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
@@ -668,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
@@ -685,21 +696,21 @@ Permission401=Citiţi cu reduceri
 Permission402=Creare / Modificare reduceri
 Permission403=Validate reduceri
 Permission404=Ştergere reduceri
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission510=Citeşte salarii
+Permission512=Creare / Modificare salarii
+Permission514=Şterge salarii
+Permission517=Export salarii
 Permission531=Citeşte servicii
 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
@@ -746,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
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
+Permission55001=Cieşte sondaje
+Permission55002=Creare / Modificare sondaje
+Permission59001=Citeşte marje comerciale
+Permission59002=Defineşte marje comerciale
+DictionaryCompanyType=Tip Terţ
+DictionaryCompanyJuridicalType=Tipuri juridice terţi
+DictionaryProspectLevel=Nivel potenţial Prospect
+DictionaryCanton=Stat/Judeţ
+DictionaryRegion=Regiuni
+DictionaryCountry=Ţări
+DictionaryCurrency=Monede
+DictionaryCivility=Mod adresare
+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=Tipuri Contact/adresă
+DictionaryEcotaxe=Ecotax (DEEE)
+DictionaryPaperFormat=Formate hârtie
+DictionaryFees=Tip de taxe
+DictionarySendingMethods=Metode Livrare
+DictionaryStaff=Efectiv
+DictionaryAvailability=Livrare întârziere
+DictionaryOrderMethods=Metode de comandă
+DictionarySource=Originea de propuneri / comenzi
+DictionaryAccountancyplan=Plan de conturi
+DictionaryAccountancysystem=Model pentru plan de conturi
+DictionaryEMailTemplates=Șabloane e-mailuri 
 SetupSaved=Setup salvate
 BackToModuleList=Inapoi la lista de module
-BackToDictionaryList=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: <br> În cazul în care vânzătorul nu este supusă TVA-ului, apoi TVA-ul implicit = 0. Sfârșitul regulă. <br> Î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ă. <br> Î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ă. <br> Î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ă. <br> Î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ă. <br> Altfel propus implicit TVA = 0. Sfârșitul regulă.
@@ -785,7 +797,7 @@ VATIsNotUsedDesc=În mod implicit propuse de TVA este 0, care poate fi utilizat
 VATIsUsedExampleFR=În Franţa, aceasta înseamnă societăţilor sau organizaţiilor care au un real sistemului fiscal (Simplified reale sau normale de real). Un sistem în care TVA-ul este declarat.
 VATIsNotUsedExampleFR=În Franţa, înseamnă că asociaţiile care nu sunt declarate de TVA sau de companii, organizaţii sau profesiilor liberale care au ales de micro-întreprindere sistemului fiscal (TVA în franciză) şi a plătit o franciza de TVA, fără nici o declaraţie de TVA. Această opţiune va afişa de referinţă "nu se aplică TVA - art-293B din CGI" pe facturi.
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Rată
 LocalTax1IsUsed=Utilizează taxa secundă
 LocalTax1IsNotUsed=Nu utilizează taxa secundă
 LocalTax1IsUsedDesc=Utilizează un al doilea tip de taxă ( altul decât TVA )
@@ -810,13 +822,13 @@ LocalTax2IsUsedDescES= Rata de RE, în mod implicit atunci când perspectivele c
 LocalTax2IsNotUsedDescES= În mod implicit propus IRPF este 0. Sfârşitul regulă.
 LocalTax2IsUsedExampleES= În Spania, liber profesionişti şi specialişti independenţi, care presta servicii şi companiile care au ales sistemul de impozitare de module.
 LocalTax2IsNotUsedExampleES= În Spania nu sunt afaceri care fac obiectul sistemului de impozitare de module.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax=Rapoarte
+CalcLocaltax1ES=Vânzări - Cumpârări
+CalcLocaltax1Desc=Rapoarte Taxe Locale este calcult ca diferenţă dintre taxele locale de vanzare şi taxele locale de cumparare
+CalcLocaltax2ES=Achiziţii
+CalcLocaltax2Desc=Rapoarte Taxe Locale este totalul taxelor locale de cumpărare
+CalcLocaltax3ES=Vânzări
+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
@@ -884,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
@@ -928,13 +941,13 @@ EventsSetup=Setup pentru jurnalele de evenimente
 LogEvents=Audit de securitate evenimente
 Audit=Audit
 InfoDolibarr=Info Dolibarr
-InfoBrowser=Infos Browser
+InfoBrowser=Info Browser
 InfoOS=Info SO
 InfoWebServer=Info  server web
 InfoDatabase=Info database
 InfoPHP=Info PHP
 InfoPerf=Info performanţe
-BrowserName=Browser name
+BrowserName=Nume Browser
 BrowserOS=Browser OS
 ListEvents=Audit evenimente
 ListOfSecurityEvents=Lista de evenimente Dolibarr de securitate
@@ -956,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 <b>modul %s</b> 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.
@@ -994,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 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+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 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 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
@@ -1018,9 +1031,9 @@ ExtraFieldsSupplierOrders=Atribute complementare (comenzi)
 ExtraFieldsSupplierInvoices=Atribute complementare (facturi)
 ExtraFieldsProject=Atribute complementare (proiecte)
 ExtraFieldsProjectTask=Atribute complementare (sarcini)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+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
@@ -1035,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.
@@ -1071,14 +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: <br> * Pe contactele terţilor  (clienti sau furnizori), un terţ terță o dată<br> * 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=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
@@ -1092,7 +1105,7 @@ 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.
@@ -1134,14 +1147,16 @@ AddDeliveryAddressAbility=Adauga data de capacitatea de livrare
 UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este considerat ca fiind o opţiune
 FreeLegalTextOnProposal=Free text pe comercial propuneri
 WatermarkOnDraftProposal=Filigranul pe propunerile comerciale ciornă (niciunul daca e gol)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al propuneri
 ##### 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
+HideTreadedOrders=Ascunde comenzile tratate sau anulate  în lista
 ValidOrderAfterPropalClosed=Pentru a valida pentru propunerea după mai aproape, 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)
+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<br><b>__PHONETO__</b> qui sera remplac� par le t�l�phone de l'appel�<br><b>__PHONEFROM__</b> qui sera remplac� par le t�l�phone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur).
@@ -1154,11 +1169,11 @@ FicheinterNumberingModules=Modulele de intervenţie de numerotare
 TemplatePDFInterventions=Carte de modele de documente de intervenţie
 WatermarkOnDraftInterventionCards=Filigranul pe documentele fişelor de intervenţie (niciunul daca e gol)
 ##### Contracts #####
-ContractsSetup=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
@@ -1233,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
@@ -1263,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
@@ -1292,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.
@@ -1305,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.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>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. <br>Mai multe informatii aici <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.\n<br>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)
@@ -1318,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
@@ -1328,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
@@ -1365,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 #####
@@ -1378,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
@@ -1408,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
@@ -1444,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ă: <br> - La livrare / plăţile pentru mărfurile <br> - Privind plăţile pentru serviciile
 OptionVatDebitOptionDesc=TVA este datorată: <br> - La livrare / plăţile pentru mărfurile <br> - 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
@@ -1465,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.
@@ -1520,16 +1540,25 @@ TaskModelModule=Modele  de document de rapoarte taskuri
 ECMSetup = GED Setup
 ECMAutoTree = Arborescenţa automată este disponibilă
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-
+FiscalYears=Ani fiscali
+FiscalYear=An fiscal
+FiscalYearCard=Fişa An fiscal
+NewFiscalYear=An fiscal nou
+EditFiscalYear=Editează an fiscal
+OpenFiscalYear=Deschide an fiscal
+CloseFiscalYear=Închide an fiscal
+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: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 7653c4fc5e4..d73a2321e91 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID eveniment
 Actions=Evenimente
 ActionsArea=Zona evenimente (acțiuni și sarcini)
-Agenda= Agenda
-Agendas= Agende
-Calendar= Calendar
-Calendars= Calendare
-LocalAgenda=Calendar local
-AffectedTo= Atribuit lui
-DoneBy= Realizat de
-Events= Evenimente
+Agenda=Agenda
+Agendas=Agende
+Calendar=Calendar
+Calendars=Calendare
+LocalAgenda=Calendar intern
+ActionsOwnedBy=Evenimente aparţinând de
+AffectedTo=Atribuit lui
+DoneBy=Realizat de
+Event=Eveniment
+Events=Evenimente
 EventsNb=Număr evenimente
 MyEvents=Evenimentele mele
 OtherEvents=Evenimente altora
@@ -17,31 +19,33 @@ ListOfActions=Lista  evenimente
 Location=Locație
 EventOnFullDay=Eveniment toată zi(ua)lele
 SearchAnAction= Caută un eveniment / sarcină
-MenuToDoActions= Toate evenimentele neterminate
-MenuDoneActions= Toate evenimentele    terminate
-MenuToDoMyActions= Evenimentele mele neterminate
-MenuDoneMyActions= Evenimentele mele   terminate
-ListOfEvents= Lista  evenimente Dolibarr
+MenuToDoActions=Toate evenimentele neterminate
+MenuDoneActions=Toate evenimentele    terminate
+MenuToDoMyActions=Evenimentele mele neterminate
+MenuDoneMyActions=Evenimentele mele   terminate
+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=Pe utilizator
+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ă
+ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
+PropalValidatedInDolibarr=Propunerea %s validată
+InvoiceValidatedInDolibarr=Factura %s validată
+InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS
 InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată
 InvoiceDeleteDolibarr=Factura %s ştearsă
 OrderValidatedInDolibarr= Comanda %s validată
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=Comanda %s aprobată
 OrderRefusedInDolibarr=Comanda %s refuzată
 OrderBackToDraftInDolibarr=Comanda %s revenită de statutul nevalidată
 OrderCanceledInDolibarr=Comanda  %s anulată
-InterventionValidatedInDolibarr=Intervenţie  %s  validată
 ProposalSentByEMail=Propunerea comercială %s  trimisă prin e-mail
 OrderSentByEMail=Comanda client %s trimisă prin e-mail
 InvoiceSentByEMail=Factura client %s trimisă prin e-mail
@@ -57,8 +60,6 @@ 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
@@ -68,19 +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=<b>login=%s</b> ​​pentru a limita exportul de acțiuni create de, atribuite lui sau făcut de utilizatorul<b>% s</b>.
-AgendaUrlOptions3=<b>logina=% s</b> ​​pentru a limita exportul de acțiuni create de utilizatorul <b>% s</b>.
+AgendaUrlOptions3=<b>logind=%s</b> ​​pentru a limita exportul de acțiuni deţinute de utilizatorul <b>%s</b>
 AgendaUrlOptions4=<b>logint=% s</b> ​​pentru a limita exportul de acțiuni atribuite utilizatorului <b>% s</b>.
-AgendaUrlOptions5=<b>logind=% s</b> ​​pentru a limita exportul de acțiuni efectuate de utilizatorul <b>% s</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pentru a limita exportul de acțiuni asociate la proiectul <b>PROJECT_ID</b>.
 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=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=Afişează calendare externe, în agendă
+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=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 93b737edda5..5782f2b37f2 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -133,7 +133,7 @@ CashBudget=Buget de trezorerie
 PlannedTransactions=Tranzacţii Prevăzute
 Graph=Grafice
 ExportDataset_banque_1=Tranzacţii bancare şi extrase de cont
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Formular depunere
 TransactionOnTheOtherAccount=Tranzacţie pe de alt cont
 TransactionWithOtherAccount=Transfer Cont
 PaymentNumberUpdateSucceeded=Plata numărul fost actualizat cu succes
@@ -155,6 +155,6 @@ BankDashboard=Sinteză  conturi bancare
 DefaultRIB=IBAN Implicit
 AllRIB=Tot BAN
 LabelRIB=Etichetă BAN
-NoBANRecord=Nici o înregistrare BAN
+NoBANRecord=Nicio înregistrare BAN
 DeleteARib=Ștergeți înregistrarea BAN
 ConfirmDeleteRib=Sigur doriţi să ştergeţi  această înregistrare BAN ?
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 30b15107e77..287171e92b8 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -23,19 +23,19 @@ InvoiceProFormaAsk=Factură Proformă
 InvoiceProFormaDesc=<b>Factura Proformă </b> 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=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>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=<b>;Factură de Înlocuire&lt;/b> este utilizată pentru a anula şi înlocui complet o factură fără nicio plată primită . <br><br> 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=<b>Nota de credit</b> 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,11 +80,12 @@ 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ă. <br> 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. <br> 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ă. <br> Editați intrarea, altfel confirmaţi.
 ClassifyPaid=Clasează "Platită"
 ClassifyPaidPartially=Clasează "Platită Parţial"
 ClassifyCanceled=Clasează "Abandonată"
 ClassifyClosed=Clasează "Închisă"
+ClassifyUnBilled=Clasează Nefacturat
 CreateBill=Crează  Factura
 AddBill=Crează  Factura sau Notă de Credit
 AddToDraftInvoices=Adaugă la factura nevalidată
@@ -136,8 +137,6 @@ 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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Sigur doriţi să anulaţi factura <b> %s</b> ?
 ConfirmCancelBillQuestion=De ce vrei să clasezi această factură "abandonată"?
 ConfirmClassifyPaidPartially=Sigur doriţi să clasaţi factura  <b>%s</b>ca 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ă <b>( %s %s)</b> 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ă <b>( %s %s)</b> 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ă <b>( %s %s)</b> 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ă <b>( %s %s)</b> 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ă <b>( %s %s)</b> 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ă <b>( %s %s)</b> 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
@@ -170,7 +169,7 @@ 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 <b>%s</b> %s ?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s ?
+ConfirmSupplierPayment=Confirmaţi introducerea plăţii  de <b>%s</b> %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
@@ -197,8 +196,8 @@ Rest=Creanţă
 AmountExpected=Suma reclamată
 ExcessReceived=Primit în plus
 EscompteOffered=Discount  oferit ( plată înainte de termen)
-SendBillRef=Trimiteţi factura %s
-SendReminderBillRef=Retrimiteţi factura %s (reamintire)
+SendBillRef=Trimitere factura %s
+SendReminderBillRef=Trimitere factura %s ( reamintire)
 StandingOrders=Ordine de plată
 StandingOrder=Ordin de plată
 NoDraftBills=Nici o  factură nevalidată
@@ -218,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
@@ -286,7 +284,7 @@ InvoiceNotChecked=Nicio factură selectată
 CloneInvoice=Clonează factura
 ConfirmCloneInvoice=Sigur doriţi să clonaţi această factură <b> %s</b>?
 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 <b>%s</b> %s  în 2 mai mici ?
@@ -295,6 +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=Ultima Factură asociată
+WarningBillExist=Avertisment, una sau mai multe facturi există deja
 
 # PaymentConditions
 PaymentConditionShortRECEP=Imediat
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% în avans, 50%% la livrare
 FixAmount=Valoare fixă
 VarAmount=Valoare variabilă (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=Depozit bancar
 PaymentTypeShortVIR=Depozit bancar
@@ -386,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..054fdee5758 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -12,13 +12,14 @@ BoxLastProspects=Ultima perspectivele
 BoxLastCustomers=Ultima clienţi
 BoxLastSuppliers=Ultima furnizori
 BoxLastCustomerOrders=Ultima client ordinelor
+BoxLastValidatedCustomerOrders=Ultimele comenzi clienţi validate
 BoxLastBooks=Ultimele cărţi
 BoxLastActions=Ultima acţiuni
 BoxLastContracts=Ultimele contracte
 BoxLastContacts=Ultimele date de contact / adresele
 BoxLastMembers=Ultimele membri
 BoxFicheInter=Ultimele intervenţii
-# BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Sold deschidere cont
 BoxSalesTurnover=Vanzari cifra de afaceri
 BoxTotalUnpaidCustomerBills=Total facturi neachitate clientului
 BoxTotalUnpaidSuppliersBills=Total facturi neachitate furnizorului
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Nombre de client
 BoxTitleLastRssInfos=Ultimele noutăţi de la %s %s
 BoxTitleLastProducts=Ultima %s modificate produse / servicii
 BoxTitleProductsAlertStock=Alertă produse în stoc
-BoxTitleLastCustomerOrders=Ultima modificare %s client ordinelor
+BoxTitleLastCustomerOrders=Ultimele %s comenzi clienți
+BoxTitleLastModifiedCustomerOrders=Ultimele %s comenzi clienţi validate
 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
+BoxTitleLastCustomersOrProspects=Ultimii %s clienti sau prospecţi
+BoxTitleLastPropals=Ultimele %s propuneri
+BoxTitleLastModifiedPropals=Ultimele %s cpropuneri modificate
 BoxTitleLastCustomerBills=Ultima %s clientului facturi
+BoxTitleLastModifiedCustomerBills=Ultimele %s facturi clienţi modificate
 BoxTitleLastSupplierBills=Ultima %s furnizorului facturi
-BoxTitleLastProspects=Ultima %s înregistrate perspectivele
+BoxTitleLastModifiedSupplierBills=Ultimele %s  facturi clienţi modificate
 BoxTitleLastModifiedProspects=%s Ultima modificare perspective
 BoxTitleLastProductsInContract=Ultima %s produse / servicii intr-un contract
-BoxTitleLastModifiedMembers=%s Ultimele membri modificate
+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
+BoxTitleOldestUnpaidCustomerBills=Cele mai vechi %s  facturi client neachitate 
+BoxTitleOldestUnpaidSupplierBills=Cele mai vechi %s  facturi furnizor neachitate 
+BoxTitleCurrentAccounts=Solduri deschidere conturi 
 BoxTitleSalesTurnover=Vanzari cifra de afaceri
-BoxTitleTotalUnpaidCustomerBills=Neachitate clientului facturi
-BoxTitleTotalUnpaidSuppliersBills=Furnizorului, facturi neachitate
+BoxTitleTotalUnpaidCustomerBills=Facturi Clienţi Neîncasate
+BoxTitleTotalUnpaidSuppliersBills=Facturi Furnizori Neachitate 
 BoxTitleLastModifiedContacts=%s Ultima modificare contacte / adrese
 BoxMyLastBookmarks=Ultima mea %s marcaje
 BoxOldestExpiredServices=Cele mai vechi active de servicii a expirat
@@ -77,6 +81,7 @@ NoRecordedContracts=Nr contracte înregistrate
 NoRecordedInterventions=Nici o 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ă
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 <br> 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 42e34f0ddf3..4e5a03a7523 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -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,13 +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
+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..3ce69c33345 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -9,9 +9,9 @@ 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 propunere comercială  %s
+SendOrderRef=Transmitere comandă  %s
 StatusNotApplicable=Nu se aplică
 StatusActionToDo=De realizat
 StatusActionDone=Realizat
@@ -62,7 +62,7 @@ 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 <b>"Data reală debut  realizare"</b> este completat, acţiunea este începută  (sau terminată), astfel câmpul <b>"Status"</b> nu poate fi 0%%.
@@ -71,7 +71,7 @@ ActionAC_FAX=Trimitere fax
 ActionAC_PROP=Trimitere  propunere 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
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 496133b1829..25e8fbd7c98 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -18,7 +18,7 @@ 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)
+CreateDolibarrThirdPartySupplier=Creare terţ ( furnizor)
 ProspectionArea=Zona Prospecte
 SocGroup=Grup de societăţi
 IdThirdParty=ID Terţ
@@ -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
@@ -367,10 +367,10 @@ ExportCardToFormat=Export fişă la 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,16 +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=Zona Terţi
+ThirdPartiesArea=Zona Terţi şi contact
 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...)
+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 d77a0d6abf8..5fe76b345ce 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 <a href="%s"> Configurare modul Taxe</a> pentru a modifica regulile de calcul
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Du-te la <a href="%s">Companie setup </a> 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,35 +32,35 @@ 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
+SpecialExpensesArea=Zona pentru toate plăţile speciale
 TaxAndDividendsArea=Zona 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ă
@@ -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 <b>%s TVA pe baza contabilității de angajament %s</b>.
 CalcModeVATEngagement=Mod <b>%s TVA pe baza venituri-cheltuieli%s.</b>
 CalcModeDebt=Mod <b>%sCreanțe-Datorii%s</b> zisă <b> contabilitatea de angajamente</b>
 CalcModeEngagement=Mod <b>%sVenituri- Cheltuieli%s</b> zisă <b> contabilitatea de casă</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeLT1= Mode <b>%sRE pe facturi clienţi - facturi furnizori %s</b>
+CalcModeLT1Debt=Mode <b>%sRE pe facturi clienţi%s</b>
+CalcModeLT1Rec= Mode <b>%sRE pe facturi furnizori%s</b>
+CalcModeLT2= Mode <b>%sIRPF pe facturi clienţi - facturi furnizori%s</b>
+CalcModeLT2Debt=Mode <b>%sIRPF pe facturi clienţi%s</b>
+CalcModeLT2Rec= Mode <b>%sIRPF pe facturi furnizori%s</b>
 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 <b>Mod %sCrances-Dettes %s</b> dit <b>comptabilit de angajament.</b>
@@ -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 <b>%sVAT encasement%s</b> pentru un calcul standard
 SeeVATReportInDueDebtMode=A se vedea raportul <b>privind %sVAT flow%s</b> 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.
@@ -166,7 +167,7 @@ OrderStats=Statistici privind comenzile
 InvoiceStats=Statistici privind facturile
 Dispatch=Dispecerizare
 Dispatched=Expediate
-ToDispatch=Pentru a expedierii
+ToDispatch=De  expediat
 ThirdPartyMustBeEditAsCustomer=A treia parte trebuie să fie definit ca un client
 SellsJournal=Jurnalul de vânzări
 PurchasesJournal=Jurnalul de cumpărări
@@ -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,20 +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=linked 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: <br> Metoda 1 este rotunjirea TVA-ului pe fiecare linie, apoi însumarea lor. <br> Metoda 2 este însumarea tututor TVA rilor de pe fiecare linie, apoi rotunjirea rezultatului. <br> Rezultatul final poate fi diferit cu câțiva cenți. Modul implicit este <b>%s</b>.
 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 <b>contabilitate de casă</b> nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul  <b>contabilitate de angajament</b> (a se vedea configurarea modulului de contabilitate).
 CalculationMode=Mod calcul
-AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Contul contabil implicit pentru terţii clienţi
-COMPTA_ACCOUNT_SUPPLIER=Contul contabil implicit pentru terţii furnizori
+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..c955006df8d 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Zona Contracte
 ListOfContracts=Lista contracte
-LastContracts=Ultimele %s contracte modificare
+LastModifiedContracts=Ultimele %s contracte modificare
 AllContracts=Toate contractele
 ContractCard=Fişă Contract
 ContractStatus=Status Contract
@@ -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
@@ -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. <BR> De exemplu să aducă metod
 CronMethodHelp=Metoda obiectului de încărcat. <BR> De exemplu să aducă metoda de obiect Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea metodei  este  <i>fecth</i>
 CronArgsHelp=Argumentele metodei . <BR> De exemplu să aducă metoda  obiect ului Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea parametrilor pot fi este  <i>0, ProductRef</i>
 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..78c832f8d85 100644
--- a/htdocs/langs/ro_RO/deliveries.lang
+++ b/htdocs/langs/ro_RO/deliveries.lang
@@ -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/dict.lang b/htdocs/langs/ro_RO/dict.lang
index 5910c295f25..431816c8561 100644
--- a/htdocs/langs/ro_RO/dict.lang
+++ b/htdocs/langs/ro_RO/dict.lang
@@ -253,7 +253,6 @@ CivilityMR=Dl
 CivilityMLE=Doamna
 CivilityMTRE=Maestru
 CivilityDR=Doctor
-
 ##### Currencies #####
 Currencyeuros=Euro
 CurrencyAUD=Dolar AU
@@ -290,10 +289,10 @@ CurrencyXOF=CFA BCEAO Franci
 CurrencySingXOF=CFA franc BCEAO
 CurrencyXPF=PCP franci
 CurrencySingXPF=PCP franc
-
 CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=mii
-
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Mailing campanie
@@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=din gură în gură
 DemandReasonTypeSRC_PARTNER=Partener
 DemandReasonTypeSRC_EMPLOYEE=Angajat
 DemandReasonTypeSRC_SPONSORING=Sponsor
-
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index e2f881e539f..c392d15d66f 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
@@ -30,3 +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=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/errors.lang b/htdocs/langs/ro_RO/errors.lang
index c776db3534a..e83f98969fc 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -25,11 +25,11 @@ 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=Bar code required
+ErrorBarCodeRequired=Cod de bare cerut
 ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=cod bare utilizat deja
 ErrorPrefixRequired=Prefix necesare
 ErrorUrlNotValid=Site-ul este incorect adresa
 ErrorBadSupplierCodeSyntax=Bad sintaxă pentru furnizor cod
@@ -37,9 +37,9 @@ ErrorSupplierCodeRequired=Furnizor codul necesar
 ErrorSupplierCodeAlreadyUsed=Furnizor de cod folosit deja
 ErrorBadParameters=Bad parametrii
 ErrorBadValueForParameter=Valoarea greşită &quot;%s&quot; incorecte &quot;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=&quot;%s&quot; Valoarea are formatul de dată greşit
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=Data nu este corecta!
 ErrorFailedToWriteInDir=Nu a reuşit să scrie în directorul %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Found incorecte de email sintaxă pentru %s linii în fişier (de exemplu linia de e-mail cu %s= %s)
 ErrorUserCannotBeDelete=Utilizatorul nu poate fi şters. Mai fi ce este asociată pe Dolibarr entităţi.
@@ -65,16 +65,16 @@ 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ă: <b>% s </ b>, dar trebuie să aibă cel puțin una: cheie, valoare
 ErrorFieldCanNotContainSpecialCharacters=<b>Câmp %s</b> trebuie să nu conţine caractere speciale.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Câmpul <b>%s</b> 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.
 ErrorRefAlreadyExists=Ref utilizate pentru crearea există deja.
 ErrorPleaseTypeBankTransactionReportName=Vă rugăm să scrieţi numele băncii primirea în cazul în care tranzacţia este raportate (Format YYYYMM sau YYYYMMDD)
 ErrorRecordHasChildren=Nu a reuşit să ştergeţi înregistrări, deoarece acesta are unele Childs.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorRecordIsUsedCantDelete=Nu se ppate sterge inregistrarea. Este inca utilizata sau inclusa intr-un alt obiect
 ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivate pentru a avea această facilitate de lucru. Pentru a activa / dezactiva Javascript, du-te la meniul Home-> Configurare-> Display.
 ErrorPasswordsMustMatch=Ambele parolele tastate trebuie să se potrivească reciproc
 ErrorContactEMail=O eroare de tehnică avut loc. Vă rugăm, contactaţi administratorul de a urma <b>%s</b> de e-mail ro oferi <b>%s</b> cod de eroare în mesajul Dvs., sau chiar mai bine prin adăugarea o copie ecran a acestei pagini.
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=User login <b>cu %s</b> 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 <b>%s</b> 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
@@ -132,10 +133,29 @@ ErrorPaymentModeDefinedToWithoutSetup=Un modul de plată a fost setat la tipul%
 ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modul <b>%s</b> instalat pentru a utiliza această funcţionalitate.
 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=Bad format!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
-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.
+ErrorBadFormat=Format gresit!
+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 conciliată
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin un factură cu statutul platită
+ErrorPriceExpression1=Nu se poate atribui la constanta '%s'
+ErrorPriceExpression2=Nu se poate redefini  funcția built-in  '%s'
+ErrorPriceExpression3=Variabila nedefinita '%s'  în definiția funcției
+ErrorPriceExpression4=Caracter ilegal '%s'
+ErrorPriceExpression5=Neașteptat '%s'
+ErrorPriceExpression6=Număr greșit de argumente (%s dat, %s așteptat)
+ErrorPriceExpression8=Operator neașteptat '%s'
+ErrorPriceExpression9=A apărut o eroare neașteptată
+ErrorPriceExpression10=Iperator '%s' lipsă operand
+ErrorPriceExpression11=Asteptam '%s'
+ErrorPriceExpression14=Împărţirea la zero,
+ErrorPriceExpression17=Variabila  '%s' nedefinită
+ErrorPriceExpression19=Expresia nu a fost găsită
+ErrorPriceExpression20=Expresie goală
+ErrorPriceExpression21=Rezultat gol '%s'
+ErrorPriceExpression22=Rezultat negativ '%s'
+ErrorPriceExpressionInternal=Eroare internă '%s'
+ErrorPriceExpressionUnknown=Eroare Necunoscută '%s'
 
 # Warnings
 WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
@@ -153,4 +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.
+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 84d9d7f0615..8280d0ff212 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -8,7 +8,7 @@ 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:
+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=Domenii de fişier 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 ...
@@ -81,7 +81,7 @@ 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 <b>"%s"</b> 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ă
@@ -102,14 +102,14 @@ NbOfLinesImported=Numărul de linii cu succes importate: <b>%s.</b>
 DataComeFromNoWhere=Valoare pentru a introduce vine de nicăieri în fişierul sursă.
 DataComeFromFileFieldNb=Valoare pentru a introduce <b>%s</b> vine de la numărul de câmp în fişierul sursă.
 DataComeFromIdFoundFromRef=Valoare care vine de la <b>%s</b> 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 <b>%s</b> Objet care a ref). Sursă de la dosar trebuie să există în Dolibarr.
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). 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 <b>%s</b> 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<b>%s</b>). 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 <b>%s</b> element
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Orice cod (sau id) găsit  în dicţionarul <b>%s</b> 
 CSVFormatDesc=<b>Comma Separated Value</b> formatul de fişier (). Csv. <br> 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].
 Excel95FormatDesc=<b>Excel</b> format fişier (.xls) <br>Acesta este format nativ Excel 95 (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> format fişier (.xlsx) <br>Acesta este format nativ Excel 2007 (SpreadsheetML).
@@ -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<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;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<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtrează peste un rang de ani/luni/zile<br> > YYYY, > YYYYMM, > YYYYMMDD : filtrează pe toţi următorii ani/luni/zile<br> < YYYY, < YYYYMM, < YYYYMMDD : filtrează pe toşi precedenţii ani/luni/zile
+ExportNumericFilter='NNNNN' filtrează după o valoare<br>'NNNNN+NNNNN' filtrează peste un rang de valori<br>'&gt;NNNNN' filtrează după valori mai mici<br>'&gt;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/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index 2c0416d083a..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=Vacanţe
-CPTitreMenu=Vacanţe
+Holidays=Concedii
+CPTitreMenu=Concedii
 MenuReportMonth=Situaţia lunară
-MenuAddCP=Aplică pentru concediu
+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 de concedii pentru a vedea această pagină.Pentru aceasta , <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> clic aici </ a>.
-NoCPforUser=Nu aveţi o cerere de concediu.
-AddCP=Aplică pentru concediu
+NotConfigModCP=Trebuie să configuraţi modulul Concedii pentru a vedea această pagină.Pentru aceasta , <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> clic aici </ a>.
+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,10 +18,10 @@ ApprovedCP=Aprobat
 CancelCP=Şters
 RefuseCP=Refuzat
 ValidatorCP=Aprobator
-ListeCP=Listă vacanţe
-ReviewedByCP=Va fi revăzut de
+ListeCP=Listă cereri de concedii
+ReviewedByCP=Va fi aprobat de
 DescCP=Descriere
-SendRequestCP=Creare cerere de concediu
+SendRequestCP=Crează o cerere de concediu
 DelayToRequestCP=Cererile pentru concediu trebuiesc făcute cu cel puţin <b>%s zi(le)</b> înainte.
 MenuConfCP=Editează soldul concediilor
 UpdateAllCP=Actualizează concediile
@@ -34,7 +34,7 @@ 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=Foaia concediilor
+TitreRequestCP=Cereri de concedii
 NbUseDaysCP=Numărul de zile de concediu consumate
 EditCP=Editare
 DeleteCP=Ştergere
@@ -43,17 +43,16 @@ ActionRefuseCP=Refuzare
 ActionCancelCP=Anulare
 StatutCP=Status
 SendToValidationCP=Trimite spre validare
-TitleDeleteCP=Şterge cererile de concediu
-ConfirmDeleteCP=Confirmaţi ştergerea a acestei cereri de concediu?
+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 dreptul de a aplica pentru concediu
-InvalidValidatorCP=Dvs trebuie sa alegeti un validator pentru cererea dvs de concediu.
-UpdateButtonCP=Actualizare
+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
+TitleValidCP=Aprobă cererea de concediu
 ConfirmValidCP=Sunteţi sigur că doriţi să aprobaţi  această cerere de concediu ?
 DateValidCP=Data aprobării
 TitleToValidCP=Trimite cererea de concediu
@@ -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=Vezi logurile concediilor
-LogCP=Loguri de actualizari concedii
+MenuLogCP=Vezi logurile cererilor de concedii
+LogCP=Loguri al actualizărilor zilelor de concediu
 ActionByCP=Realizat de
 UserUpdateCP=Pentru utilizatorul
 PrevSoldeCP=Soldul precedent
@@ -85,29 +84,29 @@ FirstDayOfHoliday=Prima zi a concediului
 LastDayOfHoliday=Ultima zi a concediului
 HolidaysMonthlyUpdate=Actualizare lunară
 ManualUpdate=Actualizare manuală
-HolidaysCancelation=Anulare vacanţe
+HolidaysCancelation=Anulare cerere concediu
 
 ## Configuration du Module ##
 ConfCP=Configurarea modulului concedii
 DescOptionCP=Descrierea opţiunii
 ValueOptionCP=Valoare
-GroupToValidateCP=Grup cu drepturi de validare a concediilor
+GroupToValidateCP=Grup cu drepturi de  aprobare a concediilor
 ConfirmConfigCP=Validare configuraţie
 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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clic aici</a>.
-DelayForSubmitCP=Termen maxim de a aplica pentru concediu
+AddCPforUsers=Adaugaţi soldul concediului alocat utilizatorului la <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clic aici</a>.
+DelayForSubmitCP=Termen maxim  de a face o cerere de concediu
 AlertapprobatortorDelayCP=Previne aprobatorul daca cerere de concediu nu corespunde cu data limită
 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=Setări a concediilor corelate la evenimente
-nbHolidayEveryMonthCP=Numarul de concedii adaugate în fiecare lună
-Module27130Name= Managementul vacanţelor
-Module27130Desc= Managementul vacanţelor
-TitleOptionMainCP=Setări principale vacanţe
-TitleOptionEventCP=Setări concedii referitoare la evenimente
+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=Configurarea Concediilor
+TitleAdminCP=Configurarea modulului concedii
 #Messages
 Hello=Salut
-HolidaysToValidate=Concedii validate
+HolidaysToValidate=Validează cereri concedii
 HolidaysToValidateBody=Mai jos este o cerere de concediu de validat
-HolidaysToValidateDelay=Această cerere de concediuva avea loc intr-o  perioadă mai puţin de %s zile.
+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=Vacanţe validate
+HolidaysValidated=Cereri de concedii validate
 HolidaysValidatedBody=Cererea dvs pentru concediu  pentru %s la %s a fost validată.
-HolidaysRefused=Concedii respinse
+HolidaysRefused=Cerere respinsă
 HolidaysRefusedBody=Cererea dvs pentru concediu  pentru %s la %s a fost respinsă pentru următoul motiv:
-HolidaysCanceled=Concedii anulate
+HolidaysCanceled=Cereri Concedii anulate
 HolidaysCanceledBody=Cererea dvs pentru concediu  pentru %s la %s a fost anulată.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Revezi logurile ale concediilor modificate
-Permission20006=Read holidays monthly report
+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..7001d1c09c5 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=Doar urmaţi instrucţiunile pas cu pas.
-MiscellaneousChecks=Cerinţe preliminare a verifica
+MiscellaneousChecks=Verificare Cerinţe preliminare 
 DolibarrWelcome=Bine ati venit la Dolibarr
 ConfFileExists=<b>%s</b> fişierul de configurare există.
 ConfFileDoesNotExists=<b>%s</b> fişier de configurare nu exista!
 ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> de fişiere de configurare nu există şi nu a putut fi creat!
-ConfFileCouldBeCreated=<b>%s</b> fişier de configurare ar putea fi creat.
+ConfFileCouldBeCreated=Fişier de configurare <b>%s</b> ar putea fi creat.
 ConfFileIsNotWritable=<b>%s</b> 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 (&quot;chmod 666&quot;, de exemplu, pe un Unix ca OS).
 ConfFileIsWritable=<b>%s</b> 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 <b>variables_order</b> 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 <b>%s.</b> Acest lucru ar trebui să fie suficient.
 PHPMemoryTooLow=PHP max memorie sesiune este setată la octeţi <b>%s.</b> Acest lucru ar trebui să fie prea mic. Modificarea <b>php.ini</b> pentru a seta parametrul <b>memory_limit</b> de bytes <b>%s</b> 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 &quot;%s&quot;.
-ErrorFailedToCreateDatabase=Nu a reuşit să creeze &quot;%s&quot; bază de date.
-ErrorFailedToConnectToDatabase=Nu a reuşit să se conecteze la &quot;%s&quot; 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 &quot;%s&quot; bază de date nu a fost găsit.
-ErrorDatabaseAlreadyExists=&quot;%s&quot; 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 &quot;Creare bază de date&quot;.
 IfDatabaseExistsGoBackAndCheckCreate=Dacă baza de date există deja, du-te înapoi şi debifaţi &quot;Crearea bazei de date&quot; 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). <br> 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 &quot;localhost&quot;, 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=<b>&quot;%s&quot;</b> 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 &quot;Start&quot; ...
-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 &quot;Upgrade&quot; 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. <br/> Set de caractere implicit propusă este una din baza de date.
 DBSortingCollation=Caracter de sortare pentru
@@ -144,14 +144,14 @@ InstallChoiceSuggested=<b>Instalaţi alegere sugerat de instalator.</b>
 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 <b>&quot;%s&quot;</b> 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 &quot;Creare bază de date&quot;.
-OpenBaseDir=PHP openbasedir parametru
+OpenBaseDir= Parametru openbasedir PHP 
 YouAskToCreateDatabaseSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date&quot;. Pentru aceasta, aveţi nevoie pentru a oferi autentificare user / parola de superuser (partea de jos a formularului).
 YouAskToCreateDatabaseUserSoRootRequired=Ai verificat caseta &quot;Crearea bazei de date proprietar&quot;. 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=<strong>Ultimul pas:</strong> Definirea aici nume de utilizator şi parola pe care intenţionaţi să îl utilizaţi pentru conectarea la software-ul. Nu pierde aceasta ca este cont pentru a administra toate celelalte.
 ActivateModule=Activaţi modul %s
 ShowEditTechnicalParameters=Click aici pentru a vedea / edita  parametrii avansaţi (mod expert)
@@ -167,7 +167,7 @@ MigrationContract=Migrarea datelor pentru contracte
 MigrationSuccessfullUpdate=Upgrade de succes
 MigrationUpdateFailed=Procesul de actualizare a eşuat
 MigrationRelationshipTables=Migrare a datelor pentru tabelele relaţie (%s)
-MigrationPaymentsUpdate=De plată de date de corecţie
+MigrationPaymentsUpdate=Corecţie dată de plată 
 MigrationPaymentsNumberToUpdate=De plată %s (e) pentru a actualiza
 MigrationProcessPaymentUpdate=Actualizaţi plată (e) %s
 MigrationPaymentsNothingToUpdate=Nu există mai multe lucruri de făcut
@@ -189,23 +189,23 @@ MigrationContractsIncoherentCreationDateUpdate=Bad contract de crearea de valoar
 MigrationContractsIncoherentCreationDateUpdateSuccess=Bad contract de crearea de valoare data de corecţie făcut cu succes
 MigrationContractsIncoherentCreationDateNothingToUpdate=Nici o valoare rău pentru data de creare contractului pentru a corecta
 MigrationReopeningContracts=Contract de deschis închis de eroare
-MigrationReopenThisContract=Redeschide %s contractuale
-MigrationReopenedContractsNumber=Contracte de %s modificate
+MigrationReopenThisContract=Redeschide  contract %s 
+MigrationReopenedContractsNumber=%s Contracte modificate
 MigrationReopeningContractsNothingToUpdate=Nici un contract închis pentru a deschide
 MigrationBankTransfertsUpdate=Actualizaţi legături între tranzacţie bancară şi un transfer bancar
 MigrationBankTransfertsNothingToUpdate=Toate link-uri sunt de până la zi
 MigrationShipmentOrderMatching=Trimiteri la data primirii de actualizare
 MigrationDeliveryOrderMatching=Livrare la primirea de actualizare
-MigrationDeliveryDetail=Livrare de actualizare
+MigrationDeliveryDetail=Actualizare Livrare 
 MigrationStockDetail=Actualizarea valoarea stocului de produse
 MigrationMenusDetail=Actualizaţi tabelele de meniuri dinamice
 MigrationDeliveryAddress=Actualizaţi adresa de livrare în transporturi
 MigrationProjectTaskActors=Migrare de date pentru tabel llx_projet_task_actors
 MigrationProjectUserResp=Migrarea datelor domeniul fk_user_resp de llx_projet la llx_element_contact
 MigrationProjectTaskTime=Actualizare de timp petrecut în secunde
-MigrationActioncommElement=Actualiza datele privind acţiunile
+MigrationActioncommElement=Actualizare date pe acţiuni
 MigrationPaymentMode=Migrare de date pentru modul de plată
 MigrationCategorieAssociation=Migrarea categoriilor
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Afişează opţiunile nedisponibile
+HideNotAvailableOptions=Acunde opţiunile nedisponibile
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index 377836c4819..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,10 +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
-ClassifyBilled=Clasează Facturat
+InterventionClassifyBilled=Clasează Facturat
+InterventionClassifyUnBilled=Clasează Nefacturat
 StatusInterInvoiced=Facturat
 RelatedInterventions=Intervenţii asociate
 ShowIntervention=Afişează  intervenţie
+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/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 '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+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 '<b>%s</b>'
+ErrorFailedToUpdateLink= Eşec la modificarea linkului '<b>%s</b>'
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index e5394eeffc5..12c12ea721a 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -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=<b>%s</b> 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=<b>%s</b> 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, ...)
@@ -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  <b>%s</b> 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, <b>%s</b> 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 <b>comma</b> 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  <strong>'%s'</strong> 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 92a8b0f81c3..090c392f0af 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Utilizatorul<b>%s</b>  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)
@@ -266,6 +266,7 @@ Afternoon=După amiază
 Quadri=Trimestru
 MonthOfDay=Luna curentă
 HourShort=H
+MinuteShort=mn
 Rate=Rată
 UseLocalTax=Include taxa
 Bytes=Bytes
@@ -340,6 +341,7 @@ FullList=Lista completă
 Statistics=Statistici
 OtherStatistics=Alte statistici
 Status=Status
+Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 RefSupplier=Ref. furnizor
@@ -356,7 +358,7 @@ ActionNotApplicable=Nu se aplică
 ActionRunningNotStarted=De realizat
 ActionRunningShort=Început
 ActionDoneShort=Terminat
-ActionUncomplete=Uncomplete
+ActionUncomplete=Incomplet
 CompanyFoundation=Societate sau Instituţie
 ContactsForCompany=Contacte pentru aceast terţ
 ContactsAddressesForCompany=Contacte pentru aceast terţ
@@ -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
@@ -508,7 +511,7 @@ NbOfCustomers=Număr clienţi
 NbOfLines=Număr linii
 NbOfObjects=Număr obiecte
 NbOfReferers=Număr referinţe
-Referers=Refering objects
+Referers=Obiecte referite
 TotalQuantity=Cantitatea totală
 DateFromTo=De la %s la %s
 DateFrom=Începând cu %s
@@ -645,6 +648,7 @@ 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
 ClickToEdit=Clic pentru a edita
 ObjectDeleted=Obiect %s şters
 ByCountry=Pe ţară
@@ -672,13 +676,13 @@ HelpCopyToClipboard=Utilizați Ctrl + C pentru a copia în clipboard
 SaveUploadedFileWithMask=Salvați fișierul pe server cu numele "<strong>%s</strong>" (altfel"%s")
 OriginFileName=Nume fişier original
 SetDemandReason=Setează sursa
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Defineste Cont bancar
+AccountCurrency=Moneda Contabilitate
 ViewPrivateNote=Vezi notițe
 XMoreLines=%s linii(e) ascunse
 PublicUrl=URL Public
-AddBox=Add box
-
+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<br/> 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..a60474b8897 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Întârziate
 SubscriptionNotReceivedShort=Neîncasată
 ListOfSubscriptions=Lista cotizaţii
 SendCardByMail=Trimite fişa pe email
-AddMember=Adaugă membru
-MemberType=Tip Membru
+AddMember=Creare membru
 NoTypeDefinedGoToSetup=Nici un  tip de membru definit.  Du-te la meniull "Tipuri Membri"
 NewMemberType=Tip nou Membru
 WelcomeEMail=Email de bun venit
@@ -126,7 +125,7 @@ Date=Dată
 DateAndTime=Data şi ora
 PublicMemberCard=Fişa Membru public
 MemberNotOrNoMoreExpectedToSubscribe=Membrii care n-au plătit cotizaţia
-AddSubscription=Adaugă cotizaţie
+AddSubscription=Creare adeziune
 ShowSubscription=Afişează adeziune
 MemberModifiedInDolibarr=Membrii modificaţi în Dolibarr
 SendAnEMailToMember=Trimite e-mail de informare membrului
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Valoarea ultimei cotizaţii
 MembersStatisticsByCountries=Statistici Membri după ţară
 MembersStatisticsByState=Statistici Membri  după regiune / judeţ
 MembersStatisticsByTown=Statistici Membri după oraşe
+MembersStatisticsByRegion=Statistici Membri  după regiune
+MemberByRegion=Membrii după regiune
 NbOfMembers=Număr  membri
 NoValidatedMemberYet=Nici un membru validat găsit
 MembersByCountryDesc=Acest ecran vă arată statisticile cu privire la membrii după ţări. Graficul depinde  serviciul on-line Google grafic şi este disponibil numai în cazul în care conexiunea la internet este activă.
@@ -202,3 +203,4 @@ MembersByNature=Membri după personalitate juridică
 VATToUseForSubscriptions=Rata TVA utilizată pentru înscrieri
 NoVatOnSubscription=Fără TVA la adeziuni
 MEMBER_PAYONLINE_SENDEMAIL=Email de avertizare atunci când Dolibarr primeşte o confirmare a unei plăți validate pentru înscriere
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produs folosit pentru linia  abonamentului în factura:  %s
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index 5d96afed81f..fc26a38bace 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=Zona 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: <br>- gol,<br>- "8h", "8H" or "8:00"  pentru a da ora de start a întâlnirii, <br> - "8-11", "8h-11h", "8H-11H" or "8:00-11:00" pentru a da startul și ora finală, <br> - ""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..52e5bd348e1 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -53,9 +53,9 @@ ShippingExist=O expediţie există
 DraftOrWaitingApproved=Comenzi Schiţe sau încă  neaprobate
 DraftOrWaitingShipped=Comenzi Schiţe 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ţă
@@ -101,7 +101,6 @@ 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,8 +131,6 @@ 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ă
 OrderSource1=Internet
@@ -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..8d336efc6ff 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. <br><br> Aceste instrumente se poate ajunge din meniul de pe partea.
 Birthday=Zi de naştere
@@ -17,14 +16,14 @@ 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_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_COMPANY_SENTBYMAIL=Emailuri trimise din cardul terţului
 Notify_PROPAL_SENTBYMAIL=Propunerea comercial trimise prin poştă
 Notify_BILL_PAYED=Factura platita clienţilor
 Notify_BILL_CANCEL=Factura client anulat
@@ -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 <b>de testare</b> (test de cuvânt trebuie să fie în aldine). <br> 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 propunerea 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
@@ -193,25 +203,26 @@ 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=Propunere %s semnată
+PropalClosedRefusedInDolibarr=Propunere %s refuzată
+PropalValidatedInDolibarr=Propunere %s validată
+PropalClassifiedBilledInDolibarr=Propunerea %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
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 &quot;sandbox&quot; 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 1ea8aa11a31..f2e97e17072 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,19 +72,20 @@ 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)
+MinPriceHT=Preţ minim vânzare (fără taxe)
+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ă taxe). 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=De pus în service
+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=Eroare Preţul nu poate fi mai mic decât Preţul Minim
 Suppliers=Furnizori
 SupplierRef=Ref. produs furnizor
 ShowProduct=Afişează  produs
@@ -113,15 +114,15 @@ BarcodeValue=Valoarea coduri de bare
 NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, propuneri ...)
 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
@@ -131,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?
@@ -160,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
@@ -178,18 +179,18 @@ CloneProduct=Clone produs sau un serviciu
 ConfirmCloneProduct=Sigur doriţi să clonaţi produsul sau serviciul <b>%s</b> ?
 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
@@ -213,29 +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 <b>%s</b>.
-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
+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 <b>%s</b>.
+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 <br> Extra câmpurile sunt variabile, cum ar fi ""#options_myextrafieldkey# * 2"<br> Există variabile speciale, cum ar fi#quantity# and #tva_tx#<br> 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 bbe22906c65..e5fb1a57e8c 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Ref. proiect
+ProjectId=ID proiect
 Project=Proiect
 Projects=Proiecte
 SharedProject=Toată lumea
@@ -14,7 +14,7 @@ TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni d
 Myprojects=Proiectele mele
 ProjectsArea=Zona 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?
@@ -32,20 +32,22 @@ TimeSpent=Timp comsumat
 TimesSpent=Timpi consumaţi
 RefTask=Ref. Task
 LabelTask=Eticheta Task
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
+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
 Tasks=Taskuri
 Task=Task
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+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
@@ -91,7 +93,7 @@ TaskRessourceLinks=Resurse
 ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
 NoTasks=Nr sarcini pentru acest proiect
 LinkedToAnotherCompany=Legat de terţe părţi, alta
-TaskIsNotAffectedToYou=Sarcina nu alocate pentru tine
+TaskIsNotAffectedToYou=Sarcină neatribuită ţie
 ErrorTimeSpentIsEmpty=Timpul consumat nu este completat
 ThisWillAlsoRemoveTasks=Această acţiune va şterge, de asemenea, toate taskurile proiectului (<b>%s</b> ) 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.
@@ -106,9 +108,9 @@ ProjectReportDate=Schimbă data taskului conform cu data de debut a proiectului
 ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului
 ProjectsAndTasksLines=Proiecte şi taskuri
 ProjectCreatedInDolibarr=Proiect %s creat
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+TaskCreatedInDolibarr=Task %s creat
+TaskModifiedInDolibarr=Task %s modificat
+TaskDeletedInDolibarr=Task %s sters
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Şef de Proiect
 TypeContact_project_external_PROJECTLEADER=Şef de Proiect
@@ -120,11 +122,13 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Selectați elementul
 AddElement=Link către 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=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+SearchAProject=Cauta proiect
+ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
+ProjectDraft=Proiecte draft
+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..250c4a62f8b 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Listă Prospecte
 DeleteProp=Ştergere Propunere Comercială
 ValidateProp=Validează Propunere Comercială
-AddProp=Adaugă propunere
+AddProp=Crează propunere
 ConfirmDeleteProp=Sigur doriţi să ştergeţi această propunere comercială ?
 ConfirmValidateProp=Sigur doriţi să validaţi această propunere comercială <b>%s</b>?
 LastPropals=Ultimele %s propuneri
@@ -55,8 +55,6 @@ 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:
 ErrorCantOpenDir=Nu se poate deschide directorul
 DatePropal=Dată  Propunere
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/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 0ad770b7db7..3dde850405b 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -1,8 +1,12 @@
 # Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cont  contabil pentru plata salariilor
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cont contabil pentru cheltuieli financiare
+Salary=Salariu
+Salaries=Salarii
 Employee=Angajat
 NewSalaryPayment=Plata noua salariu
 SalaryPayment=Plata salariu
 SalariesPayments=Plati salarii
 ShowSalaryPayment=Arata plata salariu
+THM=Pret mediu pe ora
+TJM=Pret mediu zilnic
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 933a2d43402..b1d76156af1 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -54,23 +54,27 @@ 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=Trimite dispoziţia de livrare  %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
 SendingMethodTRANS=Transportator
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Model simplu pentru dispoziţie de livrare
 DocumentModelTyphon=Model complet pentru dispoziţie de livrare  (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constanta EXPEDITION_ADDON_NUMBER nu este definită
 SumOfProductVolumes=Volumul total al produselor
 SumOfProductWeights=Greutatea totală a produselor
+
+# warehouse details
+DetailWarehouseNumber= Detalii Depozit
+DetailWarehouseFormat= W:%s (Cant : %d)
diff --git a/htdocs/langs/ro_RO/shop.lang b/htdocs/langs/ro_RO/shop.lang
deleted file mode 100644
index cb9e5b921e4..00000000000
--- a/htdocs/langs/ro_RO/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Ultima ordinelor
-OnStandBy=Pe de aşteptare
-TreatmentInProgress=Tratamentul în curs de desfăşurare
-LastCustomers=Ultima clienţi
-OSCommerceShop=OSCommerce magazin
-OSCommerce=OSCommerce
-AddProd=Vanzare online
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 07cbe484dab..b951fc80a47 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Eticheta Depozit este obligatorie
 CorrectStock=Corectează stoc
 ListOfWarehouses=Lista  depozite
 ListOfStockMovements=Lista mişcări de stoc
-StocksArea=Zona Stocuri
+StocksArea=Zona Depozite
 Location=Locație
 LocationSummary=Nume scurt locaţie
 NumberOfDifferentProducts=Numărul de produse diferite
@@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Comanda nu mai este sau nu mai are  un statut care
 StockDiffPhysicTeoric=Motivul pentru diferenţa dintre stocurile fizice şicele  teoretice
 NoPredefinedProductToDispatch=Nu sunt produse predefinite pentru acest obiect. Deci, nici o dispecerizare  în stoc necesară.
 DispatchVerb=Dispecerizează
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Limita pentru alerta
+StockLimit=Stoc limită pentru alerta
 PhysicalStock=Stoc  Fizic
 RealStock=Stoc Real
 VirtualStock=Stoc Virtual
@@ -94,32 +94,32 @@ 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
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
+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
+CurentlyUsingVirtualStock=Stoc Virtual 
+CurentlyUsingPhysicalStock=Stoc  Fizic
 RuleForStockReplenishment=Reguli pentru reaprovizionarea stocului
 SelectProductWithNotNullQty=Selectați cel puțin un produs cu cantitatea nenulă și un furnizor
 AlertOnly= Numai Alerte
 WarehouseForStockDecrease=Depozitul <b>%s</b> va fi utilizat pentru scăderea stocului
 WarehouseForStockIncrease=Depozitul <b>%s</b> 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
-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
+StockMovementRecorded=Mişcări stoc înregistrate
+RuleForStockAvailability=Reguli pentru cereri stoc
+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 84641224b57..04593e3e5f2 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
@@ -40,3 +40,5 @@ AddSupplierInvoice=Crează  factură furnizor
 ListOfSupplierProductForSupplier=Lista  produse şi preţuri pentru furnizorul  <b>%s</b>
 NoneOrBatchFileNeverRan=Nici una sau tratate <b>%s</b> ne executate recent
 SentToSuppliers=Trimite la furnizori
+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 2822dd9649e..1846842c439 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -4,7 +4,7 @@ Trips=Deplasări
 TripsAndExpenses=Decont de cheltuieli
 TripsAndExpensesStatistics=Statistici Deconturi de cheltuieli
 TripCard=Fişă Cheltuieli
-AddTrip=Adaugă Decont de cheltuieli
+AddTrip=Creare deplasare
 ListOfTrips=Lista cheltuieli
 ListOfFees=Lista note cheltuieli
 NewTrip=Decont de cheltuieli nou
@@ -19,3 +19,4 @@ TF_TRIP=Deplasare
 ListTripsAndExpenses=Lista Deconturi de cheltuieli
 ExpensesArea=Zona Deconturi de cheltuieli
 SearchATripAndExpense=Caută Decont de cheltuieli
+ClassifyRefunded=Clasează "Rambursată"
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 8f4120b8092..e6a719a0b0e 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=Zona HRM 
 UserCard=Utilizator carte
 ContactCard=Contact carte
 GroupCard=Grupul de carte
@@ -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 <b>intern</b> este un utilizator care este parte a firmei dvs. / Fundaţia. <br> Un utilizator <b>extern</b> este un client, furnizor sau de altă parte. <br><br> Î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..0793f5019ea 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -14,12 +14,13 @@ WithdrawalReceiptShort=Chitanţă
 LastWithdrawalReceipts=Ultima %s retragere încasări
 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
+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
@@ -34,20 +35,19 @@ ThirdPartyBankCode=Terţă parte de cod bancar
 ThirdPartyDeskCode=A treia parte birou cod
 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
@@ -76,19 +76,20 @@ 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ă <br> Datele de plata: %s
 InfoTransSubject=Transmiterea %s ordine permanente la banca
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+InfoTransMessage=Ordinul de plată %s a fost trimis la bancă de %s  %s. <br><br>
 InfoTransData=Suma: %s <br> Metoda: %s <br> Data: %s
 InfoFoot=Acesta este un mesaj automat trimis de Dolibarr
 InfoRejectSubject=Pentru a refuzat permanent
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index acb9d26b757..d85f4bd7539 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Ошибка, этот модуль требу
 ErrorDecimalLargerThanAreForbidden=Ошибка, точность выше, чем <b>%s</b>, не поддерживается.
 DictionarySetup=Настройка словаря
 Dictionary=Словари
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Значение 'system' и 'systemauto' для типа зарезервировано. Вы можете использовать значение 'user' для добавления вашей собственной записи
 ErrorCodeCantContainZero=Код не может содержать значение 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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=Показать полный даты действия в третий лист
@@ -133,7 +137,7 @@ Box=Бокс
 Boxes=Боксы
 MaxNbOfLinesForBoxes=Максимальное количество строк в боксе
 PositionByDefault=Стандартный порядок
-Position=Заказ
+Position=Position
 MenusDesc=Менеджеры меню определяют содержание 2-х меню-баров (горизонтального и вертикального бара).
 MenusEditorDesc=Редактор меню позволяет определить персональные пункты в меню. Используйте его осторожно во избежание нестабильной работы dolibarr или даже полной недоступности меню. <br> Некоторые модули добавляют пункты в меню (в большинстве случаев в меню <b>Все</b>). Если вы удалили некоторые из пунктов меню по ошибке, вы можете восстановить их, путем отключения и затем опять включения модуля.
 MenuForUsers=Меню для пользователей
@@ -206,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=Доступные боксы
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Автоматически, если Javascript о
 AvailableOnlyIfJavascriptNotDisabled=Доступно, только если JavaScript не отключен
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно, только если JavaScript не отключен
 Required=Обязательный
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Безопасность
 Passwords=Пароли
 DoNotStoreClearPassword=Не храните пароли в чистом виде в базе данных - храните зашифрованные значения (Рекомендуем)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Не опреде
 MAIN_MAIL_EMAIL_FROM=Отправитель электронной почты для автоматических писем (по умолчанию в php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Отправитель электронной почты, используемый для ошибки возвращает письма, отправленные
 MAIN_MAIL_AUTOCOPY_TO= Отправить систематически скрытые отсылать копии всех послал письма на
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=Отключение всех сообщений электронной почты отправок (для испытательных целей или Demos)
 MAIN_MAIL_SENDMODE=Метод, используемый для передачи сообщения электронной почты
 MAIN_MAIL_SMTPS_ID=SMTP ID, если требуется проверка подлинности
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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=Пожертвования управления
-Module800Name=OSCommerce прямой
-Module800Desc=Интерфейс показать OSCommerce или OSCSS магазина с помощью прямого доступа к базам данных
-Module900Name=OSCommerce по БЫЛО
-Module900Desc=Интерфейс показать OSCommerce магазина с помощью веб-служб. \\ NThis модуль requiere устанавливать компоненты из oscommerce_ws / ws_server в вашем OSCommerce сервера. Смотрите README файл в / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis интеграции
 Module1400Name=Бухгалтерия эксперт
@@ -493,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=Повестка дня
@@ -501,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
@@ -512,16 +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 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=Наценки
@@ -575,9 +588,6 @@ Permission92=Создать / изменить социальных отчисл
 Permission93=Удалить социального взноса и налога на добавленную стоимость
 Permission94=Экспорт социальных взносов
 Permission95=Читать сообщения
-Permission96=Установка диспетчерского
-Permission97=Читать счета бухгалтерского диспетчерского
-Permission98=Отправка счета в бухгалтерских линий
 Permission101=Читать отправок
 Permission102=Создать / изменить отправок
 Permission104=Проверка отправок
@@ -603,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=Создать / изменить поставщика заказы
@@ -668,7 +679,7 @@ Permission300=Читать штрих-коды
 Permission301=Создать / изменить штрих-коды
 Permission302=Удалить штрих-коды
 Permission311=Читать услуги
-Permission312=Назначить службы на контракт
+Permission312=Assign service/subscription to contract
 Permission331=Читать закладок
 Permission332=Создать / изменить закладки
 Permission333=Удаление закладок
@@ -698,8 +709,8 @@ Permission701=Читать пожертвований
 Permission702=Создать / изменить пожертвований
 Permission703=Удалить пожертвований
 Permission1001=Читать запасов
-Permission1002=Создание / изменение запасов
-Permission1003=Удалить запасов
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=Читать фондового движения
 Permission1005=Создать / изменить фондового движения
 Permission1101=Читать доставка заказов
@@ -775,6 +786,7 @@ DictionaryOrderMethods=Ordering methods
 DictionarySource=Происхождение Коммерческих предложений / Заказов
 DictionaryAccountancyplan=План счетов
 DictionaryAccountancysystem=Models for chart of accounts
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Настройки сохранены
 BackToModuleList=Вернуться к списку модулей
 BackToDictionaryList=Назад к списку словарей
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево
 DefaultLanguage=Язык по умолчанию (код языка)
 EnableMultilangInterface=Включить многоязычный интерфейс
 EnableShowLogo=Показать логотип на левом меню
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Система была успешно обновлена
 CompanyInfo=Информация о Компании / фонде
 CompanyIds=Компания / фундамент тождествам
@@ -1035,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 Товаров/Услуг в базе данных. Это не требует никакой оптимизации.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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 по проекту документа
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Профессиональные Id уникальным
 MustBeUnique=Должно быть уникальным?
 MustBeMandatory=Обязательно создавать Контрагентов?
@@ -1134,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=Приказы нумерации модулей
@@ -1142,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<br><b>__PHONETO__</b> qui sera remplacé par le téléphone de l'appelé<br><b>__PHONEFROM__</b> qui sera remplacé par le téléphone de l'appelant (le votre)<br><b>__LOGIN__</b> qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)<br><b>__PASS__</b> qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1154,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
@@ -1318,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=Услуги установки модуля
@@ -1378,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=Отправка получения модели
@@ -1408,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=Дерево меню
@@ -1474,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 веб-сайтов на левом меню.
@@ -1531,5 +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 e82d93b3507..ff1b49742b4 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID события
 Actions=События
 ActionsArea=Действия области (События и задач)
-Agenda= Повестка дня
-Agendas= Повестка дня
-Calendar= Календарь
-Calendars= Календари
-LocalAgenda=Местный календарь
-AffectedTo= Ответств.
-DoneBy= Сделано
-Events= События
+Agenda=Повестка дня
+Agendas=Повестка дня
+Calendar=Календарь
+Calendars=Календари
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Ответств.
+DoneBy=Сделано
+Event=Event
+Events=События
 EventsNb=Количество событий
 MyEvents=Мои события
 OtherEvents=Другие события
@@ -17,31 +19,33 @@ ListOfActions=Список событий
 Location=Местонахождение
 EventOnFullDay=Событие на весь день (все дни)
 SearchAnAction= Поиск события / задачи
-MenuToDoActions= Все незавершенные события
-MenuDoneActions= Все прекращенные события
-MenuToDoMyActions= Мои незавершенные события
-MenuDoneMyActions= Мои прекращенные события
-ListOfEvents= Список Dolibarr событий
+MenuToDoActions=Все незавершенные события
+MenuDoneActions=Все прекращенные события
+MenuToDoMyActions=Мои незавершенные события
+MenuDoneMyActions=Мои прекращенные события
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Действия зарегистрированы
 ActionsToDoBy=События назначенные
 ActionsDoneBy=Действия, проделанную
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= Все мои действия / задачи
 AllActions= Все ле действия / задачи
 ViewList=Посмотреть список
 ViewCal=Просмотр календаря
 ViewDay=Обзор дня
 ViewWeek=Обзор недели
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Вид с встроенные фильтры
 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 проверен
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=Заказ %s утвержден
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Заказ %s возращен в статус черновик
 OrderCanceledInDolibarr=Заказ %s отменен
-InterventionValidatedInDolibarr=Intervensjon %s validert
 ProposalSentByEMail=Коммерческое предложение %s отправлены по электронной почте
 OrderSentByEMail=Заказ покупателя %s отправлен по электронной почте
 InvoiceSentByEMail=Счет-фактура клиента %s отправлен по электронной почте
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=Поставщик порядке %s отправлен
 SupplierInvoiceSentByEMail=Поставщиком счета %s отправлены по электронной почте
 ShippingSentByEMail=Доставка %s отправлены по электронной почте
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Вмешательство %s отправлены по электронной почте
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= Третья группа создала
 DateActionPlannedStart= Планируемая дата начала
 DateActionPlannedEnd= Планируемая дата окончания
@@ -68,19 +69,24 @@ DateActionStart= Начальная дата
 DateActionEnd= Конечная дата
 AgendaUrlOptions1=Можно также добавить следующие параметры для фильтрации вывода:
 AgendaUrlOptions2=<b>login=<b>логин= %s</b> ограничить выход на действия, созданный, пострадавших или сделали <b>пользователем %s.</b>
-AgendaUrlOptions3=<b>logina=<b>logina= %s</b> ограничить выход на действия, созданные <b>пользователем %s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=<b>logint= %s</b> ограничить выход на действия пользователя, <b>пострадавших %s.</b>
-AgendaUrlOptions5=<b>logind=<b>logind= %s</b> ограничить выход на действия пользователя, <b>проделанной %s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Показать рождения контакты
 AgendaHideBirthdayEvents=Скрыть рождения контакты
 Busy=Занят
 ExportDataset_event1=Список запланированных мероприятий
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Экспорт календаря
 ExtSites=Внешние календари
-ExtSitesEnableThisTool=как внешние календари в повестку дня
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Количество календарей
 AgendaExtNb=Календарь NB %s
 ExtSiteUrlAgenda=URL для доступа. Ческих файлов
 ExtSiteNoLabel=Нет описания
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index c8b59f92d08..5d8569d427e 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=Кредитовое авизо
 InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры
 InvoiceAvoirDesc=<b>Кредитовое авизо</b> - это 'обратный' счет-фактура, который используется для решения проблемы, когда выставлен счета-фактуры в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или не наоборот - не оплатил счет-фактуру полностью, поскольку он вернулся некоторые продукты, например).
 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
@@ -85,8 +85,9 @@ ClassifyPaid=Классифицировать как 'Оплачен'
 ClassifyPaidPartially=Классифицировать как 'Оплачен частично'
 ClassifyCanceled=Классифицировать как 'Аннулирован'
 ClassifyClosed=Классифицировать как 'Закрыт'
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Создать счет-фактуру
-AddBill=Добавить счет-фактуру или кредитовое авизо
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=Удалить счет-фактуру
 SearchACustomerInvoice=Поиск счета-фактуры Покупателю
@@ -98,7 +99,7 @@ DoPaymentBack=Возвратить платеж
 ConvertToReduc=Преобразовать в будущую скидку
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
 EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
-DisabledBecauseRemainderToPayIsZero=Неактивно, поскольку напоминание о платеже равно нулю
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=Сумма
 PriceBase=Ценовая база
 BillStatus=Статус счета-фактуры
@@ -136,8 +137,6 @@ BillFrom=Продавец
 BillTo=Покупатель
 ActionsOnBill=Действия со счетом-фактурой
 NewBill=Новый счет-фактура
-Prélèvements=Постоянные поручения
-Prélèvements=Постоянные поручения
 LastBills=Последние %s счетов-фактур
 LastCustomersBills=Последние %s счетов-фактур Покупателям
 LastSuppliersBills=Последние %s счетов-фактур Поставщиков
@@ -155,9 +154,9 @@ ConfirmCancelBill=Вы уверены, что хотите отменить сч
 ConfirmCancelBillQuestion=Почему вы хотите классифицировать этот счет-фактуру как 'Аннулирован'?
 ConfirmClassifyPaidPartially=Вы  уверены, что хотите изменить статус счет-фактуры <b>%s</b>  на 'Оплачен'?
 ConfirmClassifyPaidPartiallyQuestion=Этот счет-фактура не оплачен полностью. Укажите причины закрытия счета-фактуры?
-ConfirmClassifyPaidPartiallyReasonAvoir=Остаток к оплате <b>(%s %s)</b> предоставлен в виде скидки, так как платеж был произведен досрочно. Я отрегулирую НДС при помощи кредитового авизо.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Остаток к оплате <b>(%s %s)</b> предоставлен в виде скидки, так как платеж был произведен досрочно. Я согласен потерять НДС по этой скидке.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Остаток к оплате <b>(%s %s)</b> предоставлен в виде скидки, так как платеж был произведен досрочно. Я восстановлю НДС по этой скидке без кредитового авизо.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Плохой Покупатель
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукция частично возвращена
 ConfirmClassifyPaidPartiallyReasonOther=Сумма, аннулированная по другим причинам
@@ -190,15 +189,15 @@ 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=Полученный излишек
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
-SendBillRef=Отправить счет-фактуру %s
-SendReminderBillRef=Отправить счет-фактуру %s (напоминание)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Регламенты
 StandingOrder=Регламент
 NoDraftBills=Нет проектов счетов-фактур
@@ -218,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=Счета-фактуры Покупателям и строки счетов-фактур
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Сумма двух новых скидок
 ConfirmRemoveDiscount=Вы уверены, что хотите удалить эту скидку?
 RelatedBill=Связанный счет-фактура
 RelatedBills=Связанные счета-фактуры
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Немедленно
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 06a821c24e5..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=Подтверждаете удаление изображения?
@@ -111,3 +108,5 @@ ExtraFieldsCategories=Дополнительные атрибуты
 CategoriesSetup=Настройка категорий
 CategorieRecursiv=Автоматически связать с родительской категорией
 CategorieRecursivHelp=Если активировать, то продукт будет связан с родительской категорией при добавлении в подкатегорию
+AddProductServiceIntoCategory=Add the following product/service
+ShowCategory=Show category
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index e25c1123ade..d453f1b3fba 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Вы должны сначала создать кон
 ListSuppliersShort=Список поставщиков
 ListProspectsShort=Список потенц. клиентов
 ListCustomersShort=Список покупателей
-ThirdPartiesArea=Область контрагентов
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Последние %s измененных контрагентов
 UniqueThirdParties=Всего уникальных контрагентов
 InActivity=Открыто
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 25fc3fdd5dd..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
@@ -187,7 +188,7 @@ AccountancyDashboard=Accountancy summary
 ByProductsAndServices=По продуктам и услугам
 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=Связано с заказом
+LinkedOrder=Link to order
 ReCalculate=Пересчитать
 Mode1=Метод 1
 Mode2=Метод 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Режим вычислений
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 8404cc729cb..e8339fe9701 100644
--- a/htdocs/langs/ru_RU/donations.lang
+++ b/htdocs/langs/ru_RU/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Пожертвование
 Donations=Пожертвования
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=Донор
 Donors=Доноры
-AddDonation=Добавить пожертвование
+AddDonation=Create a donation
 NewDonation=Новое пожертвование
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=Обещание пожертвования
 PromisesNotValid=Неподтвержденные обещания
 PromisesValid=Подтвержденные обещания
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Подтверждено
 DonationStatusPaidShort=Получено
 ValidPromess=Подтвердить обещание
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=Создать подтверждение получения
 DonationsModels=Модели документов для подтверждение получения пожертвования
 LastModifiedDonations=Последние %s измененных пожертвований
 SearchADonation=Поиск пожертвования
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 39578cf5daf..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=Пользователь с <b>логином %s</b> н
 ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван.
 ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ...
 ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя <b>%s</b> используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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=Неправильный формат!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Обязательные параметры не определены
@@ -154,3 +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
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 8e08fc9a1ab..8b787afcef0 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Номер счета
 BankAccountNumberKey=Ключ
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 0c48cd60953..5d133e0bbf7 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=Вы должны включить модуль Выходные для просмотра данной страницы
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Сотрудник
 DateDebCP=Начальная дата
 DateFinCP=Конечная дата
@@ -18,24 +18,24 @@ ApprovedCP=Утверждено
 CancelCP=Отменено
 RefuseCP=Отказано
 ValidatorCP=Утвердивший
-ListeCP=Список выходных дней
+ListeCP=List of leaves
 ReviewedByCP=Проверит
 DescCP=Описание
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Заявки на отпуск должны быть сделаны как минимум за <b>%s дня(ей)</b> до него.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Обновить выходные дни
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Выберите конечную дату позже чем начальную.
 ErrorSQLCreateCP=Ошибка SQL возникла во время создания:
-ErrorIDFicheCP=Возникла ошибка, запроса на выходные дни не существует
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Вернуться на предыдущую страницу
-ErrorUserViewCP=У вас нет прав на просмотр списка выходных дней
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=График отпусков
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Редактировать
 DeleteCP=Удалить
 ActionValidCP=Проверить
@@ -43,26 +43,25 @@ ActionRefuseCP=Отказать
 ActionCancelCP=Отмена
 StatutCP=Статус
 SendToValidationCP=Отправить на проверку
-TitleDeleteCP=Удалить заявку на выходные дни
-ConfirmDeleteCP=Подтверждаете удаление этой заявки на выходные?
-ErrorCantDeleteCP=Ошибка, вы не имеете права на удаление заявки на выходные дни
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=Вы должны выбрать того, кто утвердить вашу заявку на выходные дни.
-UpdateButtonCP=Обновить
-CantUpdate=Вы не можете обновлять этот запрос на выходные дни
+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=Вы должны выбрать начальную дату
 NoDateFin=Вы должны выбрать конечную дату
-ErrorDureeCP=Ваш запрос на выходной не содержит рабочих дней
-TitleValidCP=Approve the request holidays
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=Вы должны выбрать причину отказа на запрос о выходных днях
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
 DetailRefusCP=Причина отказа
 DateRefusCP=Дата отказа
 DateCancelCP=Дата отмены
@@ -72,42 +71,42 @@ MotifCP=Причина
 UserCP=Пользователь
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Первый день отпуска
-LastDayOfHoliday=Последний день отпуска
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Ежемесячное обновление
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Настройка модуля выходных дней
+ConfCP=Configuration of leave request module
 DescOptionCP=Описание опции
 ValueOptionCP=Значение
-GroupToValidateCP=Group with the ability to approve holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Проверить конфигурацию
-LastUpdateCP=Last updated automatically of holidays
+LastUpdateCP=Last automatic update of leaves allocation
 UpdateConfCPOK=Обновлено успешно
 ErrorUpdateConfCP=Во время обновления произошла ошибка. Пожалуйста, попробуйте еще раз.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Проверить
 UpdateEventCP=Update events
 CreateEventCP=Создать
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Обновить
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index cd6b9106a58..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=Действия по вмешательству
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=Вы уверены, что хотите удал
 NameAndSignatureOfInternalContact=Имя и подпись вмешательства:
 NameAndSignatureOfExternalContact=Имя и подпись клиента:
 DocumentModelStandard=Стандартная модель документа для выступлений
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Классифицировать &quot;Объявленный&quot;
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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=Вмешательство
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=Общие номера модели
 ArcticNumRefModelError=Ошибка при активации
 PacificNumRefModelDesc1=Вернуться Numero с форматом %syymm-YY, где NNNN это год, мм в месяц, и это NNNN последовательности без перерыва и не вернуться до 0
 PacificNumRefModelError=Вмешательство карточки начиная с $ syymm уже и не совместимы с этой моделью последовательности. Удалить или переименовать его, чтобы активировать этот модуль.
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 4ff75fca9fe..6d2e03bcbb3 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Клиенты заказы области
-SuppliersOrdersArea=Поставщики заказы области
-OrderCard=Заказать карту
-# OrderId=Order Id
+OrdersArea=Раздел заказов клиентов
+SuppliersOrdersArea=Раздел заказов поставщиков
+OrderCard=Карточка заказа
+OrderId=Идентификатор заказа
 Order=Заказ
-Orders=Приказы
+Orders=Заказы
 OrderLine=Заказ линии
 OrderFollow=Последующие меры
 OrderDate=Дата заказа
@@ -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=Последнее% с измененными заказов
@@ -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=Вы уверены, что хотите, чтобы подтвердить вы сделали этот заказ <b>на %s?</b>
 GenerateBill=Создать счет-фактуру
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
 ClassifyBilled=Классифицировать "Billed"
 ComptaCard=Бухгалтерия карту
 DraftOrders=Проект распоряжения
@@ -101,7 +101,6 @@ RelatedOrders=Похожие заказов
 OnProcessOrders=В процессе заказов
 RefOrder=Ref. заказ
 RefCustomerOrder=Ref. Для клиента
-CustomerOrder=Для клиентов
 RefCustomerOrderShort=Ref. CUST. заказ
 SendOrderByMail=Отправить заказ по почте
 ActionsOnOrder=Меры по заказу
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_
 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=EMail
 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/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=Эта область посвящена группе разные инструменты не доступны в другие пункты меню. <br><br> Эти инструменты могут быть достигнуты из меню на стороне.
 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 476874e2df7..c94b0a8803c 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Закрытые
 ContractStatusRunning=Запуск
 ContractStatusExpired=истек
 ContractStatusOnHold=Не работает
-ContractStatusToRun=Претворить в службу
+ContractStatusToRun=To get running
 ContractNotRunning=Этот контракт не выполняется
 ErrorProductAlreadyExists=Продукции с учетом% уже существует.
 ErrorProductBadRefOrLabel=Неправильное значение для справки или этикетку.
 ErrorProductClone=Возникла проблема при попытке дублирования продукта или услуги
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Поставщики
 SupplierRef=Поставщик исх.
 ShowProduct=Показать продукта
@@ -116,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=Ключевое слово фильтр
@@ -131,7 +132,7 @@ AddDel=Добавить / Удалить
 Quantity=Кол-во
 NoMatchFound=Не найдено соответствия
 ProductAssociationList=Список продуктов / услуг: Наименование товара / услуги (количество пострадавших)
-ProductParentList=Список продуктов / услуг с этим продуктом в качестве компонента
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=Один из выбранного продукта родителей с действующим продукта
 DeleteProduct=Удалить товар / услугу
 ConfirmDeleteProduct=Вы уверены, что хотите удалить этот продукт / услугу?
@@ -178,7 +179,7 @@ CloneProduct=Клон продукт или услугу
 ConfirmCloneProduct=Вы уверены, что хотите клонировать продукт или <b>услуга %s?</b>
 CloneContentProduct=Клон все основные данные о продукции / услуг
 ClonePricesProduct=Клон основные данные и цены
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 CustomerPrices=Клиенты цены
@@ -239,3 +240,10 @@ PricingRule=Правила ценообразования
 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<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 4e12d779682..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=Задачи / мероприятия
@@ -85,13 +87,13 @@ ActionsOnProject=Действия по проекту
 YouAreNotContactOfProject=Вы не контакт этого частного проекта
 DeleteATimeSpent=Удалить времени
 ConfirmDeleteATimeSpent=Вы уверены, что хотите удалить этот раз провели?
-DoNotShowMyTasksOnly=См. также задачи, я не влияет на
-ShowMyTasksOnly=Открыть только задачи я затронутые
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Библиография
 ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне
 NoTasks=Нет задач, для этого проекта
 LinkedToAnotherCompany=Связь с другими третий участник
-TaskIsNotAffectedToYou=Задача не выделено для вас
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Время, проведенное пуста
 ThisWillAlsoRemoveTasks=Это действие приведет к удалению всех задач проекта <b>(%s</b> задач на данный момент), и все входы затраченного времени.
 IfNeedToUseOhterObjectKeepEmpty=Если некоторые объекты (счет-фактура, заказ, ...), принадлежащей другому третьему лицу, должна быть увязана с проектом по созданию, держать этот пустой иметь проект, несколько третьих лиц.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Выберите элемент
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=доклад полной проекта модели (logo. ..)
 PlannedWorkload = Запланированная нагрузка
@@ -128,3 +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
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 fdda6c1fcf5..d78afdf7338 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -13,8 +13,8 @@ LastSendings=Последнее %s отправок
 SearchASending=Поиск направления
 StatisticsOfSendings=Статистика отправок
 NbOfSendings=Число отправок
-# NumberOfShipmentsByMonth=Number of shipments by month
-# SendingCard=Shipping card
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipping card
 NewSending=Новые направления
 CreateASending=Создать отправке
 CreateSending=Создать отправке
@@ -50,27 +50,31 @@ Enlevement=Полученной клиентом
 DocumentModelSimple=Простая модель документа
 DocumentModelMerou=Mérou модели A5
 WarningNoQtyLeftToSend=Внимание, без продуктов, ожидающих отправки.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=Планируемая дата поставки
 DateReceived=Дата доставки получили
 SendShippingByEMail=Отправить доставкой по EMail
-SendShippingRef=Отправить доставки %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Acions на судоходство
 LinkToTrackYourPackage=Ссылка на дорожку ваш пакет
 ShipmentCreationIsDoneFromOrder=На данный момент, создание новой партии производится с целью карту.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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 заказчиком
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Простая модель документа для доставки квитанций
 DocumentModelTyphon=Более полная модель документа для доставки квитанций (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянное EXPEDITION_ADDON_NUMBER не определена
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/ru_RU/shop.lang b/htdocs/langs/ru_RU/shop.lang
deleted file mode 100644
index b982ab65dd9..00000000000
--- a/htdocs/langs/ru_RU/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Магазин
-ShopWeb=Интернет-магазин
-LastOrders=Последние заказы
-OnStandBy=В ожидании
-TreatmentInProgress=В обработке
-LastCustomers=Последние Покупатели
-OSCommerceShop=Магазин OSCommerce
-OSCommerce=OSCommerce
-AddProd=Онлайн Продажа
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/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index 0216ac8558b..9ce90a49a4b 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Создать поставщику счет-фактуру
 ListOfSupplierProductForSupplier=Перечень продукции и цен для <b>поставщиков %s</b>
 NoneOrBatchFileNeverRan=Ни одна партия <b>или% не</b> побежал в последнее время
 SentToSuppliers=Отправлено поставщикам
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index e418108c8ef..f72d0e09b18 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Поездка
 ListTripsAndExpenses=Список поездок и расходов
 ExpensesArea=Область поездок и расходов
 SearchATripAndExpense=Поиск поездок и расходов
+ClassifyRefunded=Classify 'Refunded'
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/ru_UA/shop.lang b/htdocs/langs/ru_UA/shop.lang
deleted file mode 100644
index be8df87052e..00000000000
--- a/htdocs/langs/ru_UA/shop.lang
+++ /dev/null
@@ -1 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 825b57690a9..c726f320ec8 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verzie %
 ErrorDecimalLargerThanAreForbidden=Chyba, presnosť vyššia než <b>%s</b> nie je podporované.
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Hodnota &quot;systém&quot; a &quot;systemauto&quot; typu je vyhradená. Môžete použiť &quot;používateľom&quot; ako hodnota pridať svoj vlastný rekord
 ErrorCodeCantContainZero=Kód môže obsahovať hodnotu 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Krabica
 MaxNbOfLinesForBoxes=Maximálny počet riadkov pre boxy
 PositionByDefault=Predvolené poradie
-Position=Objednávka
+Position=Position
 MenusDesc=Ponuky manažéri definovať obsah 2 panely ponúk (horizontálny a vertikálny bar bar).
 MenusEditorDesc=Menu Editor vám umožní definovať individuálne položky v menu. Použite ho opatrne, aby sa vyhla Dolibarr nestabilné a položky menu trvale nedostupný. <br> Niektoré moduly pridať položky v menu (v menu <b>Všetko</b> vo väčšine prípadov). Ak ste odstránili niektoré z týchto položiek omylom, môžete ich obnoviť vypnutím a opätovným zapnutím modulu.
 MenuForUsers=Menu pre užívateľov
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatická, ak je zakázaná Javascript
 AvailableOnlyIfJavascriptNotDisabled=Dostupné len v prípade, že je JavaScript nie je zakázaný
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupné len v prípade, že je JavaScript nie je zakázaný
 Required=Potrebný
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Zabezpečenie
 Passwords=Heslá
 DoNotStoreClearPassword=Do žiadny obchod jasná heslá v databáze, ale iba šifrované úložisko hodnota (Activated odporúčané)
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Nie je definova
 MAIN_MAIL_EMAIL_FROM=E-mail odosielateľa pre automatické e-maily (V predvolenom nastavení v php.ini: <b>%s)</b>
 MAIN_MAIL_ERRORS_TO=E-mail odosielateľa používajú e-maily chýb výkazy zaslané
 MAIN_MAIL_AUTOCOPY_TO= Poslať systematicky skrytú uhlík-kópie všetkých odoslaných e-mailov
+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=Zakážte všetky e-maily sendings (len na skúšobné účely alebo ukážky)
 MAIN_MAIL_SENDMODE=Použitá metóda pri odosielaní e-mailov
 MAIN_MAIL_SMTPS_ID=SMTP ID ak sa vyžaduje overenie
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=Oscommerce priamym prístup k databáze
-Module800Desc=Rozhranie ukazovať osCommerce alebo OSCSS obchod prostredníctvom priameho prístupu do databázy
-Module900Name=Oscommerce podľa WS
-Module900Desc=Rozhranie ukazovať osCommerce obchod prostredníctvom webových služieb. Tento modul requiere k inštalácii komponenty / oscommerce_ws / ws_server do osCommerce servera. Pozri súbor README v / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integrácia
 Module1400Name=Účtovníctvo
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Vytvoriť / upraviť príspevky na sociálne zabezpečenie a dane z
 Permission93=Odstránenie sociálne príspevky a dane z pridanej hodnoty
 Permission94=Export príspevky na sociálne zabezpečenie
 Permission95=Prečítajte si správy
-Permission96=Nastavenie zasielania
-Permission97=Prečítajte si faktúry účtovníctva dispečing
-Permission98=Po odoslaní faktúry účtovné linky
 Permission101=Prečítajte si sendings
 Permission102=Vytvoriť / upraviť sendings
 Permission104=Overiť sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Vrátiť evidencia kód postavený podľa: <br> %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 &quot;C&quot; 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Pravidlá pre profesionálne IDs
 MustBeUnique=Musí byť jedinečný?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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 <br> <b>__PHONETO__</b> Ktorý bude nahradený s telefónnym číslom osoby volať <br> <b>__PHONEFROM__</b> Ktorý bude nahradený telefónne číslo volajúceho (vaše) <br> <b>__LOGIN__</b> Ktorý bude nahradený s clicktodial prihlásenie (definované na karte užívateľa) <br> <b>__PASS__</b> Ktorý bude nahradený s clicktodial heslo (definované na karte užívateľa).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,8 +1424,9 @@ OSCommerceTestOk=Pripojenie k serveru &quot;%s&quot; na databázu &quot;%s&quot;
 OSCommerceTestKo1=Pripojenie k &quot;%s&quot; servera úspešná, ale databáza &quot;%s&quot; by nebolo možné dosiahnuť.
 OSCommerceTestKo2=Pripojenie k serveru &quot;%s&quot; s užívateľom &quot;%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
@@ -1474,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.
@@ -1531,5 +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 be1eeb60344..6aaa3b7800d 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID udalosti
 Actions=Udalosti
 ActionsArea=Akcia plocha (Akcie a úlohy)
-Agenda= Program rokovania
-Agendas= Program
-Calendar= Kalendár
-Calendars= Kalendára
-LocalAgenda=Miestny kalendár
-AffectedTo= Priradené
-DoneBy= Vykonal
-Events= Udalosti
+Agenda=Program rokovania
+Agendas=Program
+Calendar=Kalendár
+Calendars=Kalendára
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Priradené
+DoneBy=Vykonal
+Event=Event
+Events=Udalosti
 EventsNb=Počet udalostí
 MyEvents=Moje udalosti
 OtherEvents=Ďalšie akcie
@@ -17,31 +19,33 @@ ListOfActions=Zoznam udalostí
 Location=Umiestnenie
 EventOnFullDay=Akcie po celý deň (y)
 SearchAnAction= Hľadať udalosť / úlohu
-MenuToDoActions= Všetky neúplné udalosti
-MenuDoneActions= Všetky ukončené akcie
-MenuToDoMyActions= Moje neúplné udalosti
-MenuDoneMyActions= Moje ukončených akcií
-ListOfEvents= Zoznam udalostí Dolibarr
+MenuToDoActions=Všetky neúplné udalosti
+MenuDoneActions=Všetky ukončené akcie
+MenuToDoMyActions=Moje neúplné udalosti
+MenuDoneMyActions=Moje ukončených akcií
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Akcia hlásené
 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
 ViewCal=Mesačný pohľad
 ViewDay=Denné zobrazenie
 ViewWeek=Zobraziť týždeň
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Zobraziť s preddefinovanými filtrami
 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á
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Dátum začatia
 DateActionEnd= Dátum ukončenia
 AgendaUrlOptions1=Môžete tiež pridať nasledujúce parametre filtrovania výstupu:
 AgendaUrlOptions2=<b>login = %s</b> obmedziť výstup na akcie vytvorené, pridelených alebo vykonať užívateľa <b>%s.</b>
-AgendaUrlOptions3=<b>Logina = %s</b> obmedziť výstup na akcie vytvorené užívateľom <b>%s.</b>
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> obmedziť výstup na akcie priradených užívateľských <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> obmedziť výstup na akcie vykonané užívateľom <b>%s.</b>
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Zobraziť narodeniny kontaktov
 AgendaHideBirthdayEvents=Skryť narodeniny kontaktov
 Busy=Zaneprázdnený
 ExportDataset_event1=Zoznam agendy udalostí
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export kalendár
 ExtSites=Importovať externé kalendára
-ExtSitesEnableThisTool=Zobraziť externých kalendára do programu
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Počet kalendárov
 AgendaExtNb=Kalendár nb %s
 ExtSiteUrlAgenda=URL pre prístup. Súbor iCal
 ExtSiteNoLabel=Nie Popis
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index ec3d9384092..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=<b>Dobropis</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Klasifikáciu &quot;Zaplatené&quot;
 ClassifyPaidPartially=Klasifikovať &quot;Platené čiastočne&quot;
 ClassifyCanceled=Klasifikovať &quot;Opustené&quot;
 ClassifyClosed=Klasifikáciu &quot;uzavretým&quot;
+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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Ste si istí, že chcete zrušiť faktúry <b>%s?</b>
 ConfirmCancelBillQuestion=Prečo chcete klasifikovať faktúra &quot;opustený&quot;?
 ConfirmClassifyPaidPartially=Ste si istí, že chcete zmeniť fakturačnú <b>%s</b> 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ť <b>(%s %s)</b> je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Aj zjednať DPH s dobropisu.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zvyšok platiť <b>(%s %s)</b> 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ť <b>(%s %s)</b> je zľava poskytnutá, pretože platba bola uskutočnená pred horizonte. Som späť DPH na tejto zľave bez dobropisu.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Zľava ponúkol (platba pred semestra)
-SendBillRef=Poslať faktúry %s
-SendReminderBillRef=Poslať faktúry %s (pripomienka)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Trvalé príkazy
 StandingOrder=Trvalý príkaz
 NoDraftBills=Žiadne návrhy faktúry
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Celkom dva nové zľavy musí byť rovný p
 ConfirmRemoveDiscount=Ste si istí, že chcete odstrániť túto zľavu?
 RelatedBill=Súvisiace faktúra
 RelatedBills=Súvisiace faktúry
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Bezprostredný
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index b44194d9b9c..36369689d28 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -66,7 +66,7 @@ ReturnInCompany=Späť na zákazníka / Vyhliadka karty
 ContentsVisibleByAll=Obsah bude vidieť všetci
 ContentsVisibleByAllShort=Obsah viditeľné všetkými
 ContentsNotVisibleByAllShort=Obsah nie je vidieť všetci
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=Odstrániť kategóriu
 ConfirmDeleteCategory=Ste si istí, že chcete zmazať túto kategóriu?
 RemoveFromCategory=Odstráňte spojenie s kategóriách
@@ -101,13 +101,12 @@ 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?
-# 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
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 944943c5a7c..edca2288e6a 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Musíte vytvoriť e-maily, kontakty pre tretie strany
 ListSuppliersShort=Zoznam dodávateľov
 ListProspectsShort=Zoznam vyhliadky
 ListCustomersShort=Zoznam zákazníkov
-ThirdPartiesArea=Tretie strany plocha
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Posledné %s upravené tretej strany
 UniqueThirdParties=Celkom jedinečné tretích strán
 InActivity=Otvorené
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Späť numero vo formáte %syymm-nnnn pre zákazníka kódu a %syymm-NNNN s dodávateľmi kódu, kde yy je rok, MM je mesiac a nnnn je sekvencia bez prerušenia a bez návratu na 0.
 LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 361ca593eef..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
@@ -187,7 +188,7 @@ AccountancyDashboard=Účtovníctvo zhrnutie
 ByProductsAndServices=Výrobkami a službami
 RefExt=Externé ref
 ToCreateAPredefinedInvoice=Ak chcete vytvoriť vopred definovaný faktúru, vytvorte štandardné faktúru a potom, bez toho aby ju potvrdíte, kliknite na tlačidlo &quot;Previesť do vopred faktúra&quot;.
-LinkedOrder=linked to order
+LinkedOrder=Link to order
 ReCalculate=Prepočítať
 Mode1=Method 1
 Mode2=Metóda 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=podľa dodávateľa zvoliť vhodnú metódu použiť
 TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití <b>hotovosti evidencia</b> režim nie je relevantná. Táto správa je k dispozícii len pri použití <b>zásnubný evidencia</b> režimu (pozri nastavenie účtovného modulu).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Účtovníctvo štandardný kód pre zákaznícke thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Účtovníctvo štandardný kód pre dodávateľov thirdparties
+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
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ť. <BR> Napr načítať metódy objektu v
 CronMethodHelp=Objekt spôsob štartu. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, hodnota metódy je <i>fecth</i>
 CronArgsHelp=Metóda argumenty. <BR> Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť <i>0, ProductRef</i>
 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 &quot;Home - Moduly náradie - Zoznam úloh&quot; vidieť a upravovať naplánované úlohy.
diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang
index 8743faa71db..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
@@ -30,3 +30,9 @@ SearchADonation=Hľadať daru
 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 4d0a2cdf850..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 &quot;%s&quot; pre nastavenie parametrov nesprávnych &quot;%s&quot;
-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 &quot;%s&quot; 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 <b>%s</b> 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 <b>%s</b> 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
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Chyba, musí mať PHP modul <b>%s</b> nainštalovať túto fu
 ErrorOpenIDSetupNotComplete=Môžete nastavenie Dolibarr konfiguračný súbor, aby OpenID overovania, ale URL OpenID služby nie je definovaný do stálych %s
 ErrorWarehouseMustDiffers=Zdrojovej a cieľovej sklady musia sa líši
 ErrorBadFormat=Bad format!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Povinné parametre sú doteraz stanovené
@@ -154,3 +174,5 @@ WarningUsingThisBoxSlowDown=Upozornenie Pri použití tohto políčka spomaliť
 WarningClickToDialUserSetupNotComplete=Nastavenie ClickToDial informácií pre užívateľa si nie sú kompletné (pozri tab ClickToDial na vaše užívateľské karty).
 WarningNotRelevant=Nerozhoduje prevádzku v našom súbore
 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
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index 920422248e9..84b2a45c816 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Číslo účtu
 BankAccountNumberKey=Kľúč
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=Ak chcete filtrovať niektoré hodnoty, stačí zadať hodnoty tu.
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 afd04a2ddf8..3b3b9c6a95f 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Prázdniny
-CPTitreMenu=Prázdniny
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Mesačný výkaz
-MenuAddCP=Použiť pre dovolenku
-NotActiveModCP=Musíte umožniť modul sviatky zobrazenie tejto stránky.
-NotConfigModCP=Musíte nakonfigurovať modul dovolenku na zobrazenie tejto stránky. Ak to chcete vykonať, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">kliknite sem</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
-NoCPforUser=Nemáte dopyt na dovolenku.
-AddCP=Použiť pre dovolenku
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Zamestnanec
 DateDebCP=Dátum začatia
 DateFinCP=Dátum ukončenia
@@ -18,24 +18,24 @@ ApprovedCP=Schválený
 CancelCP=Zrušený
 RefuseCP=Odmietol
 ValidatorCP=Approbator
-ListeCP=Zoznam sviatkov
+ListeCP=List of leaves
 ReviewedByCP=Bude preskúmaná
 DescCP=Popis
-SendRequestCP=Vytvorenie dopytu po prázdninách
-DelayToRequestCP=Žiadosti o dovolenku musí byť podaná aspoň <b>deň %s (y)</b> pred nimi.
-MenuConfCP=Upraviť rovnováhu dovolenku
-UpdateAllCP=Aktualizujte dovolenku
-SoldeCPUser=Dovolenka rovnováha je <b>%s</b> dní.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=Musíte vybrať koncový dátum je väčší ako dátum začatia.
 ErrorSQLCreateCP=SQL chyba pri tvorbe:
-ErrorIDFicheCP=Došlo k chybe, žiadosť o dovolenku neexistuje.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Späť na predchádzajúcu stránku
-ErrorUserViewCP=Nie ste oprávnený čítať toto žiadosti o dovolenku.
-InfosCP=Informácie o dopyte po prázdninách
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Informácie Workflow
 RequestByCP=Žiadosť
-TitreRequestCP=List dovolenku
-NbUseDaysCP=Počet dní dovolenky spotrebovaných
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Upraviť
 DeleteCP=Vymazať
 ActionValidCP=Potvrdiť
@@ -43,26 +43,25 @@ ActionRefuseCP=Odmietnuť
 ActionCancelCP=Zrušiť
 StatutCP=Postavenie
 SendToValidationCP=Poslať na potvrdenie
-TitleDeleteCP=Odstrániť žiadosť dovolenku
-ConfirmDeleteCP=Potvrďte odstránenie tejto žiadosti o dovolenku?
-ErrorCantDeleteCP=Chyba nemáte právo zmazať túto dovolenku žiadosti.
-CantCreateCP=Nemáte právo požiadať o dovolenku.
-InvalidValidatorCP=Musíte vybrať approbator na dovolenku vyžiadanie.
-UpdateButtonCP=Aktualizovať
-CantUpdate=Nemožno aktualizovať túto požiadavku sviatkov.
+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=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
-ConfirmValidCP=Ste si istí, že chcete schváliť žiadosť o 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=Odoslať žiadosť o dovolenku
-ConfirmToValidCP=Ste si istí, že chcete odoslať požiadavku na dovolenku?
-TitleRefuseCP=Žiadosť odmietnuť dovolenku
-ConfirmRefuseCP=Ste si istí, že chcete odmietnuť žiadosť o prázdninách?
+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=Musíte si vybrať dôvod pre odmietnutie žiadosti.
-TitleCancelCP=Zrušiť požiadavku dovolenku
-ConfirmCancelCP=Ste si istí, že chcete zrušiť požiadavku na 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
 DateCancelCP=Dátum zrušenia
@@ -72,42 +71,42 @@ MotifCP=Dôvod
 UserCP=Užívateľ
 ErrorAddEventToUserCP=Došlo k chybe pri pridávaní výnimočnú dovolenku.
 AddEventToUserOkCP=Pridanie mimoriadnej dovolenky bola dokončená.
-MenuLogCP=Zobraziť protokoly dovolenku
-LogCP=Prihláste o zmenách dovoleniek
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=Prvý deň dovolenky
-LastDayOfHoliday=Posledný deň dovolenky
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Mesačná aktualizácia
 ManualUpdate=Manuálna aktualizácia
-HolidaysCancelation=Dovolenka storno
+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=Skupina s možnosťou schváliť dovolenku
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Overenie konfigurácie
-LastUpdateCP=Posledná aktualizácia automaticky prázdnin
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">kliknutím tu</a> .
-DelayForSubmitCP=Uzávierka žiadať o dovolenku
-AlertapprobatortorDelayCP=Zabráňte approbator ak sviatok žiadosť nezodpovedá lehotu
-AlertValidatorDelayCP=Préevent na approbator Ak požiadavka presahuje dovolenku meškanie
-AlertValidorSoldeCP=Zabráňte approbator ak sviatok požiadavka presahuje zostatok
-nbUserCP=Počet užívateľov podporované v module dovolenku
-nbHolidayDeductedCP=Počet sviatkov sa odpočítavajú za každý deň dovolenky prijatých
-nbHolidayEveryMonthCP=Počet dovolenku pridávané každý mesiac
-Module27130Name= Riadenie dovolenku
-Module27130Desc= Riadenie dovolenku
-TitleOptionMainCP=Základné nastavenie dovolenku
-TitleOptionEventCP=Nastavenie dovolenky týkajúce sa udalostí
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Potvrdiť
 UpdateEventCP=Aktualizácia akcie
 CreateEventCP=Vytvoriť
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Aktualizovať
 ErrorMailNotSend=Došlo k chybe pri odosielaní e-mail:
 NoCPforMonth=Nie opustiť tento mesiac.
 nbJours=Počet dní
-TitleAdminCP=Konfigurácia sviatky
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Ahoj
-HolidaysToValidate=Overiť dovolenku
-HolidaysToValidateBody=Nižšie je žiadosť o dovolenku pre potvrdzovanie
-HolidaysToValidateDelay=Táto žiadosť o prázdninách sa uskutoční v lehote kratšej ako %s dní.
-HolidaysToValidateAlertSolde=Užívateľ, ktorý z tejto požiadavky pre dovolenku nemajú k dispozícii dostatok dni.
-HolidaysValidated=Overené prázdniny
-HolidaysValidatedBody=Vaša žiadosť o dovolenku pre %s na %s bol overený.
-HolidaysRefused=Odopretie prázdniny
-HolidaysRefusedBody=Vaša žiadosť o dovolenku pre %s na %s bol zamietnutý z nasledujúcich dôvodov:
-HolidaysCanceled=Zrušené sviatky
-HolidaysCanceledBody=Vaša žiadosť o dovolenku pre %s na %s bola zrušená.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Recenzia protokol modifikovaných dovolenku
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang
index 3f1d7b9edca..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Meno a podpis intervencie:
 NameAndSignatureOfExternalContact=Meno a podpis objednávateľa:
 DocumentModelStandard=Štandardný dokument model pre zásahy
 InterventionCardsAndInterventionLines=Intervencia a linky intervencií
-ClassifyBilled=Klasifikovať &quot;účtovaný&quot;
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> príjemcu zaslaním relácie.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</
 ErrorNoVATRateDefinedForSellerCountry=Chyba, žiadne sadzby DPH stanovenej pre krajinu &quot;%s&quot;.
 ErrorNoSocialContributionForSellerCountry=Chyba, žiadny sociálny príspevok typu definované pre krajinu &quot;%s&quot;.
 ErrorFailedToSaveFile=Chyba sa nepodarilo uložiť súbor.
-ErrorOnlyPngJpgSupported=Chyba, iba. Png a Jpg image súbor vo formáte sú podporované.
-ErrorImageFormatNotSupported=Vaše PHP nepodporuje funkcie, ktoré chcete previesť obrázky v tomto formáte.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=Pozri tiež %s
 BackgroundColorByDefault=Predvolené farba pozadia
+FileNotUploaded=The file was not uploaded
+FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=Súbor vybraný pre pripojenie, ale ešte nebol nahraný. Kliknite na &quot;Priložiť súbor&quot; za to.
 NbOfEntries=Nb záznamov
 GoToWikiHelpPage=Prečítajte si nápovedu (vyžadovaný prístup k Internetu)
@@ -266,6 +266,7 @@ Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Mesiaca odo dňa
 HourShort=H
+MinuteShort=mn
 Rate=Sadzba
 UseLocalTax=Vrátane DPH
 Bytes=Bytov
@@ -340,6 +341,7 @@ FullList=Plný zoznam
 Statistics=Štatistika
 OtherStatistics=Ďalšie štatistiky
 Status=Postavenie
+Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref
 RefSupplier=Ref dodávateľ
@@ -365,6 +367,7 @@ ActionsOnCompany=Akcia o tejto tretej osobe
 ActionsOnMember=Akcia o tomto členovi
 NActions=%s udalosti
 NActionsLate=%s neskoro
+RequestAlreadyDone=Request already recorded
 Filter=Filter
 RemoveFilter=Vyberte filter
 ChartGenerated=Graf generovaný
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra nastavenia atribútov
 URLPhoto=URL of photo/logo
 SetLinkToThirdParty=Odkaz na inej tretej osobe
 CreateDraft=Vytvorte návrh
+SetToDraft=Back to draft
 ClickToEdit=Kliknutím možno upraviť
 ObjectDeleted=Objekt %s zmazaný
 ByCountry=Podľa krajiny
@@ -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=Pondelok
 Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
index 92bb3272b82..081f1ba7f8e 100644
--- a/htdocs/langs/sk_SK/margins.lang
+++ b/htdocs/langs/sk_SK/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Veľkoobchodná 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/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 473092c87c0..eec0d8666a4 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -85,8 +85,7 @@ SubscriptionLateShort=Neskoro
 SubscriptionNotReceivedShort=Nikdy nedostal
 ListOfSubscriptions=Zoznam predplatné
 SendCardByMail=Poslať kartu e-mailom
-AddMember=Pridať člena
-MemberType=Členské typ
+AddMember=Create member
 NoTypeDefinedGoToSetup=Žiadny člen definované typy. Choď na menu &quot;Členovia typy&quot;
 NewMemberType=Nový člen typu
 WelcomeEMail=Vitajte e-mail
@@ -126,7 +125,7 @@ Date=Dátum
 DateAndTime=Dátum a čas
 PublicMemberCard=Členské verejné karta
 MemberNotOrNoMoreExpectedToSubscribe=Člen, ktorý alebo nie viac očakáva, že k odberu
-AddSubscription=Pridať predplatné
+AddSubscription=Create subscription
 ShowSubscription=Zobraziť predplatné
 MemberModifiedInDolibarr=Člen upravený v Dolibarr
 SendAnEMailToMember=Poslať e-mail Informácie o členovi
@@ -171,6 +170,8 @@ LastSubscriptionAmount=Posledný úpisu
 MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
+MembersStatisticsByRegion=Members statistics by region
+MemberByRegion=Members by region
 NbOfMembers=Počet členov
 NoValidatedMemberYet=Žiadne overené členmi nájdených
 MembersByCountryDesc=Táto obrazovka vám ukáže štatistiku členov jednotlivých krajinách. Grafika však závisí od Google on-line služby grafu a je k dispozícii iba v prípade, je pripojenie k internetu funguje.
@@ -202,3 +203,4 @@ MembersByNature=Členovia od prírody
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
 NoVatOnSubscription=Nie TVA za upísané vlastné imanie
 MEMBER_PAYONLINE_SENDEMAIL=E-mail upozorniť pri Dolibarr obdržíte potvrdenie o overenú platby za predplatné
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index 906a5e2e662..5cf1ecc1818 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -53,9 +53,9 @@ ShippingExist=Zásielka existuje
 DraftOrWaitingApproved=Návrh alebo schválená ešte objednať
 DraftOrWaitingShipped=Návrh alebo overené doposiaľ odoslaný
 MenuOrdersToBill=Objednávky dodaný
-MenuOrdersToBill2=Objednávky do účtu
+MenuOrdersToBill2=Billable orders
 SearchOrder=Hľadať účelom
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
 ShipProduct=Loď produkt
 Discount=Zľava
 CreateOrder=Vytvoriť objednávku
@@ -65,7 +65,7 @@ ValidateOrder=Potvrdenie objednávky
 UnvalidateOrder=Unvalidate objednávku
 DeleteOrder=Zmazať objednávku
 CancelOrder=Zrušenie objednávky
-AddOrder=Objednané
+AddOrder=Create order
 AddToMyOrders=Pridať do mojich objednávok
 AddToOtherOrders=Pridať do iných objednávok
 AddToDraftOrders=Pridať k predlohe
@@ -101,7 +101,6 @@ RelatedOrders=Súvisiace objednávky
 OnProcessOrders=V procese 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šlite poštou
 ActionsOnOrder=Akcie na objednávku
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konštantná COMMANDE_ADDON nie je definované
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nepodarilo sa načítať súbor modulu &quot;%s&quot;
 Error_FailedToLoad_COMMANDE_ADDON_File=Nepodarilo sa načítať súbor modulu &quot;%s&quot;
 Error_OrderNotChecked=Žiadne objednávky do faktúry vybranej
-
-
 # Sources
 OrderSource0=Komerčné návrh
 OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Obchodné
 OrderSource6=Skladujte
 QtyOrdered=Množstvo objednať
 AddDeliveryCostLine=Pridať prepravné čiaru označujúcu hmotnosť 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=Telefón
-
 CreateInvoiceForThisCustomer=Bill objednávky
 NoOrdersToInvoice=Žiadne objednávky zúčtovateľné
 CloseProcessedOrdersAutomatically=Klasifikovať &quot;spracovanie&quot; všetky vybrané príkazy.
-MenuOrdersToBill2=Objednávky do účtu
 OrderCreation=Objednať tvorba
 Ordered=Objednal
 OrderCreated=Vaše objednávky boli vytvorené
 OrderFail=Došlo k chybe pri vytváraní objednávky
 CreateOrders=Vytvorenie 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/sk_SK/oscommerce.lang b/htdocs/langs/sk_SK/oscommerce.lang
deleted file mode 100644
index 4c5f8668978..00000000000
--- a/htdocs/langs/sk_SK/oscommerce.lang
+++ /dev/null
@@ -1,8 +0,0 @@
-# Dolibarr language file - Source file is en_US - oscommerce
-OSCommerce=OS Commerce
-OSCommerceSetup=OS Commerce modul nastavenia
-OSCommerceSetupSaved=OS Commerce nastavenie uloží
-OSCommerceServer=OS Commerce Server host / ip
-OSCommerceDatabaseName=OS Commerce názov databázy
-OSCommercePrefix=OS Commerce tabuľky prefix
-OSCommerceUser=OS Commerce databázy login
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index f3774d486a1..113f2d7dc2e 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Bezpečnostný kód
 Calendar=Kalendár
-AddTrip=Pridať výlet
 Tools=Nástroje
 ToolsDesc=Táto oblasť je určená pre skupiny rôznych strojov, ktoré nie sú k dispozícii na iné položky menu. <br><br> 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 &quot;Priama tlač&quot; 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 f16ba7d540a..c8e4d892a18 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Zatvorené
 ContractStatusRunning=Beh
 ContractStatusExpired=vypršala
 ContractStatusOnHold=Nebeží
-ContractStatusToRun=Mettre en služba
+ContractStatusToRun=To get running
 ContractNotRunning=Táto zmluva nie je v chode
 ErrorProductAlreadyExists=Výrobok s referenčným %s už existuje.
 ErrorProductBadRefOrLabel=Chybná hodnota pre referenčné alebo etikety.
 ErrorProductClone=Vyskytol sa problém pri pokuse o klonovaní produkt alebo službu.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Dodávatelia
 SupplierRef=Dodávateľa produktov čj.
 ShowProduct=Zobraziť produkt
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone produkt alebo službu
 ConfirmCloneProduct=Ste si istí, že chcete klonovať produktov alebo služieb <b>%s?</b>
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 01c1babff62..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
@@ -85,13 +87,13 @@ ActionsOnProject=Udalosti na projekte
 YouAreNotContactOfProject=Nie ste kontakt tomto súkromnom projekte
 DeleteATimeSpent=Odstrániť čas strávený
 ConfirmDeleteATimeSpent=Ste si istí, že chcete zmazať tento čas strávený?
-DoNotShowMyTasksOnly=Pozri tiež úlohy, ktoré neboli pridelené pre mňa
-ShowMyTasksOnly=Zobraziť iba úlohy pridelené mne
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Zdroje
 ProjectsDedicatedToThisThirdParty=Projekty venovaný tejto tretej osobe
 NoTasks=Žiadne úlohy tohto projektu
 LinkedToAnotherCompany=Súvisí s tretej strane
-TaskIsNotAffectedToYou=Úloha nebude vám pridelená
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Čas strávený je prázdny
 ThisWillAlsoRemoveTasks=Táto akcia bude tiež odstrániť všetky úlohy projektu <b>(%s</b> úlohy v túto chvíľu) a všetky vstupy času stráveného.
 IfNeedToUseOhterObjectKeepEmpty=Ak sú niektoré predmety (faktúra, objednávka, ...), ktoré patria do inej tretej osobe, musí byť spojené s projektom, vytvoriť, aby bol tento prázdny mať projekt bytia multi tretej strany.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Vyberte prvok
 AddElement=Odkaz na elementu
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Kompletné projektu model zostavy (logo. ..)
 PlannedWorkload = Plánované zaťaženie
@@ -128,3 +131,4 @@ ProjectReferers=Odkazujúce objekty
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
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 66fce201540..45310862422 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=Štatistiky vykonaná na zásielky iba overených.
 DateDeliveryPlanned=Čelné termín dodania
 DateReceived=Dátum doručenia obdržal
 SendShippingByEMail=Poslať zásielku EMail
-SendShippingRef=Poslať zásielok %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Udalosti na zásielky
 LinkToTrackYourPackage=Odkaz pre sledovanie balíkov
 ShipmentCreationIsDoneFromOrder=Pre túto chvíľu, je vytvorenie novej zásielky vykonať z objednávky karty.
 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
 SendingMethodTRANS=Prepravca
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Jednoduchý model pre dokument o doručenie
 DocumentModelTyphon=Viac Celý dokument model pre potvrdenie o doručení (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konštantná EXPEDITION_ADDON_NUMBER nie je definované
 SumOfProductVolumes=Súčet objemov produktov
 SumOfProductWeights=Súčet hmotností produktov
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/sk_SK/shop.lang b/htdocs/langs/sk_SK/shop.lang
deleted file mode 100644
index db6390a243c..00000000000
--- a/htdocs/langs/sk_SK/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Obchod
-ShopWeb=Web Shop
-LastOrders=Posledné objednávky
-OnStandBy=Na pohotovosti
-TreatmentInProgress=Liečba prebieha
-LastCustomers=Posledný zákazníkmi
-OSCommerceShop=Oscommerce obchod
-OSCommerce=Oscommerce
-AddProd=Predaj on-line
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/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 4897ef99037..fe08da6e0bc 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=Objednať Dátum
 BuyingPrice=Nákup cenu
 BuyingPriceMin=Minimálna kúpna cena
 BuyingPriceMinShort=Minimálna kúpna cena
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Pridať cena dodávateľa tovaru
 ChangeSupplierPrice=Zmena dodávateľa cenu
 ErrorQtyTooLowForThisSupplier=Nedostatočné množstvo tohto podniku, alebo nie je definovaná cena k tomuto produktu tohto podniku
@@ -40,3 +40,5 @@ AddSupplierInvoice=Vytvorte dodávateľskej faktúry
 ListOfSupplierProductForSupplier=Zoznam výrobkov a cien dodávateľských <b>%s</b>
 NoneOrBatchFileNeverRan=Žiadny alebo dávkový <b>%s</b> nie bežal nedávno
 SentToSuppliers=Odoslané dodávateľom
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
index 4d872f71c18..1367186b021 100644
--- a/htdocs/langs/sk_SK/trips.lang
+++ b/htdocs/langs/sk_SK/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Výlet
 ListTripsAndExpenses=Zoznam ciest a nákladov
 ExpensesArea=Výlety a náklady oblasť
 SearchATripAndExpense=Hľadať na výlet a náklady
+ClassifyRefunded=Classify 'Refunded'
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 &quot;odoslaný súbor&quot;
 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
new file mode 100644
index 00000000000..2b4fde49279
--- /dev/null
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Računovodstvo
+Globalparameters=Globalni parametri
+Chartofaccounts=Kontni
+Fiscalyear=Fiskalna leta
+Menuaccount=Računovodski izkazi
+Menuthirdpartyaccount=Thirdparty računi
+MenuTools=Orodja
+
+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=Vrni se kontni
+Back=Return
+
+Definechartofaccounts=Določite kontni
+Selectchartofaccounts=Izberite kontni
+Validate=Potrjevanje
+Addanaccount=Dodaj računovodskega račun
+AccountAccounting=Računovodstvo račun
+Ventilation=Breakdown
+ToDispatch=Odpremo
+Dispatched=Odpošlje
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trgovska marža
+Reports=Poročila
+ByCustomerInvoice=Z računov strank,
+ByMonth=Po mesecih
+NewAccount=Novi računovodski račun
+Update=Update
+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=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+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=Prezračiti
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+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=Ločilo 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=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=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=Račun za prenos
+ACCOUNTING_ACCOUNT_SUSPENSE=Račun čakanja
+
+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=Vrsta dokumenta
+Docdate=Datum
+Docref=Reference
+Numerocompte=Račun
+Code_tiers=Thirdparty
+Labelcompte=Račun Label
+Debit=Debetne
+Credit=Credit
+Amount=Znesek
+Sens=Sens
+Codejournal=Revija
+
+DelBookKeeping=Izbriši zapise v glavno knjigo
+
+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=Gotovina Plačilo
+
+SupplierInvoicePayment=Plačilo dobavitelju računa
+CustomerInvoicePayment=Plačilo računa kupca
+
+ThirdPartyAccount=Thirdparty račun
+
+NewAccountingMvt=Novo gibanje
+NumMvts=Število gibanja
+ListeMvts=Seznam gibanja
+ErrorDebitCredit=Debetne in Credit ne more imeti vrednosti hkrati
+
+ReportThirdParty=Seznam thirdparty račun
+DescThirdPartyReport=Posvetujejo tukaj seznam thirdparty kupcev in dobaviteljev in njihovih računovodskih računov
+
+ListAccounts=Seznam računovodskih računov
+
+Pcgversion=Različica načrta
+Pcgtype=Razred račun
+Pcgsubtype=Pod razred račun
+Accountparent=Root računa
+Active=Izjava
+
+NewFiscalYear=Novo poslovno leto
+
+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 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=Potrditi Samodejno
+
+ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 3e9a17e36e1..dc018fa38c8 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -43,17 +43,21 @@ SecuritySetup=Varnostne nastavitve
 ErrorModuleRequirePHPVersion=Napaka, ta modul zahteva PHP različico %s ali višjo
 ErrorModuleRequireDolibarrVersion=Napaka, Ta modul zahteva Dolibarr različico %s ali višjo
 ErrorDecimalLargerThanAreForbidden=Napaka, višja natančnost od <b>%s</b> ni podprta.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
+DictionarySetup=Nastavitve slovarja
+Dictionary=Slovarji
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
 ErrorReservedTypeSystemSystemAuto=Vrednosti 'system' in 'systemauto' za tip sta rezervirani. Uporabite lahko 'user' za dodajanje lastnih zapisov
 ErrorCodeCantContainZero=Koda ne sme vsebovati vrednosti 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Onemogoči JavaScript in Ajax funkcije (priporočeno za slepe osebe ali tekstualne brskalnike)
 ConfirmAjax=Za potrditev uporabi Ajax pojavni meni
-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.
+UseSearchToSelectCompanyTooltip=Č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.
 UseSearchToSelectCompany=Za izbiranje partnerjev uporabite polja z avtomatsko izpolnitvijo namesto seznama.
 ActivityStateToSelectCompany= Dodaj opcijo filtra za prikaz/skritje partnerjev, ki so trenutno neaktivni ali so prekinili aktivnosti
-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.
+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
@@ -65,7 +69,7 @@ ShowPreview=Prikaži predogled
 PreviewNotAvailable=Predogled ni na voljo
 ThemeCurrentlyActive=Trenutno aktivna tema
 CurrentTimeZone=Časovni pas PHP strežnika
-MySQLTimeZone=TimeZone MySql (database)
+MySQLTimeZone=Časovni pas MySql (baze podatkov)
 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=Presledek
 Table=Tabela
@@ -75,8 +79,8 @@ Mask=Maska
 NextValue=Naslednja vrednost
 NextValueForInvoices=Naslednja vrednost (fakture)
 NextValueForCreditNotes=Naslednja vrednost (dobropisi)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=Naslednja vrednost (depozit)
+NextValueForReplacements=Naslednja vrednost (zamenjave)
 MustBeLowerThanPHPLimit=Opomba: vaš PHP omejuje velikost datoteke za prenos na <b>%s</b> %s, kot je vrednost tega parametra
 NoMaxSizeByPHPLimit=Opomba: V vaši PHP konfiguraciji ni nastavljenih omejitev
 MaxSizeForUploadedFiles=Največja velikost prenesene datoteke (0 za prepoved vseh prenosov)
@@ -104,9 +108,9 @@ OtherOptions=Ostale opcije
 OtherSetup=Ostale nastavitve
 CurrentValueSeparatorDecimal=Decimalno ločilo
 CurrentValueSeparatorThousand=Ločilo tisočic
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Destinacija
+IdModule=ID modula
+IdPermissions=ID dovoljenj
 Modules=Moduli
 ModulesCommon=Osnovni moduli
 ModulesOther=Ostali moduli
@@ -127,13 +131,13 @@ CurrentHour=Ura PHP strežnika
 CompanyTZ=Časovna cona podjetja (osnovno podjetje)
 CompanyHour=Ura podjetja (osnovno podjetje)
 CurrentSessionTimeOut=Časovna omejitev trenutne seje
-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"
+YouCanEditPHPTZ=Za nastavitev drugačne PHP časovne cone (ni obvezno), lahko poskusite dodati datoteko .htacces z vrstico, kot je ta "SetEnv TZ Europe/Paris"
 OSEnv=OS okolje
 Box=Polje
 Boxes=Polja
 MaxNbOfLinesForBoxes=Največje število vrstic v polju
 PositionByDefault=Privzet vrstni red
-Position=Vrstni red
+Position=Položaj
 MenusDesc=Menijski vmesnik določa vsebino 2 menijskih vrstic (vodoravne vrstice in navpične vrstice).
 MenusEditorDesc=Urejevalnik menijev omogoča definicijo prilagojenih vnosov v menijih. To funkcijo uporabljajte previdno, da ne bi Dolibarr postal nestabilen in menijske postavke permanentno nedosegljive.<br>Nekateri moduli dodajo vnose v menije (največkrat v meniju <b>Vsi</b>). Če po pomoti odstranite katero od teh postavk, jih lahko obnovite z onemogočenjem in ponovnim aktiviranjem modula.
 MenuForUsers=Meni za uporabnika
@@ -206,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
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Avtomatsko, če je Javascript onemogočen
 AvailableOnlyIfJavascriptNotDisabled=Na voljo samo, če JavaScript ni onemogočen
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Na voljo samo, če JavaScript in Ajax nista onemogočena
 Required=Zahtevano
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Varnost
 Passwords=Gesla
 DoNotStoreClearPassword=Ne shranjujte v bazi podatkov celih gesel, temveč samo šifrirane vrednosti (priporočena aktivacija)
@@ -236,8 +242,8 @@ OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Uradna tržnica za zunanje module/dodatke
 OfficialWebHostingService=Referenčne storitve spletnega gostovanja (gostovanje v oblaku)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+ReferencedPreferredPartners=Preferirani partnerji
+OtherResources=Drugi izvori
 ForDocumentationSeeWiki=Glede dokumentacije za uporabnike in razvojnike (Doc, FAQ...),<br>poglejte na Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=Za vsa ostala vprašanja/pomoč lahko uporabite Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=To področje vam omogoča dostop do storitve »Dolibarr Help Support«.
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS gostitelj (Ni definiran
 MAIN_MAIL_EMAIL_FROM=Pošiljateljev e-mail za avtomatske emaile (Privzeto v php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=E-mail naslov pošiljatelja je uporabljen za vrnitev napačno poslanih e-mailov
 MAIN_MAIL_AUTOCOPY_TO= Sistematično pošilljanje skritih kopij (cc) vseh poslanih emailov za
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Sistematično pošilljanje skritih kopij -cc- ponudb, poslanih po e-pošti za
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Sistematično pošilljanje skritih kopij -cc- naročil, poslanih po e-pošti za
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Sistematično pošilljanje skritih kopij -cc- računov, poslanih po e-pošti za
 MAIN_DISABLE_ALL_MAILS=Onemogoči vsa pošiljanja e-mailov (za namene testiranja ali demonstracij)
 MAIN_MAIL_SENDMODE=Načini za pošiljanje e-pošte
 MAIN_MAIL_SMTPS_ID=SMTP ID, če je zahtevano preverjanje pristnosti
@@ -308,7 +317,7 @@ ServerNotAvailableOnIPOrPort=Strežnik ni na voljo na naslovu <b>%s</b> na vrati
 DoTestServerAvailability=Test povezljivosti strežnika
 DoTestSend=Testno pošiljanje
 DoTestSendHTML=Testno pošiljanje HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Napaka, ni možno uporabiti opcije @, za vsakoletno resetiranje števca, če sekvence {yy} ali {yyyy} ni v maski.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Napaka, ni možno uporabiti opcije @, če sekvence {yy}{mm} ali {yyyy}{mm} ni v maski.
 UMask=UMask parameter za nove datoteke na Unix/Linux/BSD datotečnem sistemu.
 UMaskExplanation=Ta parameter omogoča definicijo privzetih dovoljenj za datoteke na strežniku, ki jih je kreiral Dolibarr (na primer med nalaganjem).<br>Vrednost  je oktalna (na primer, 0666 pomeni branje in pisanje za vse).<br>Tega parametra ni na Windows strežniku.
@@ -387,7 +396,7 @@ LinkToTest=Generiran link z možnostjo klika za uporabnika <strong>%s</strong> (
 KeepEmptyToUseDefault=Pusti prazno za uporabo privzete vrednosti
 DefaultLink=Privzeta povezava
 ValueOverwrittenByUserSetup=Pozor, ta vrednost bo morda prepisana s specifično nastavitvijo uporabnika (vsak uporabnik lahko nastavi lastno povezavo za klic s klikom)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=Zunanji modul - nameščen v mapo %s
 BarcodeInitForThirdparties=Mass barcode init for thirdparties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
@@ -431,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
@@ -469,22 +478,18 @@ 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)
 Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki, dividende in plače
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+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
-Module800Name=OSCommerce z direktnim dostopom do baze
-Module800Desc=Vmesnik za prikaz OSCommerce ali OSCSS trgovine z direktnim dostopom do baze
-Module900Name=OSCommerce z WS
-Module900Desc=Vmesnik za prikaz OSCommerce trgovine preko Web storitev. Ta modul zahteva inštalacijo komponent s strežnika /oscommerce_ws/ws_server v vaš OSCommerce strežnik. Glejte datoteko README v /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integracija
 Module1400Name=Računovodstvo
@@ -493,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
@@ -501,29 +508,35 @@ 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
 Module2900Name=GeoIPMaxmind
 Module2900Desc=Možnost konverzije GeoIP Maxmind
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Dodaj Skype gumb v kartico pripadnikov / partnerjev / kontaktov
 Module5000Name=Skupine podjetij
 Module5000Desc=Omogoča upravljaje skupine podjetij
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module20000Name=Počitnice
-Module20000Desc=Določitev in sledenje dopustov zaposlenih
+Module6000Name=Potek dela
+Module6000Desc=Upravljanje poteka dela
+Module20000Name=Upravljanje zahtevkov za dopust
+Module20000Desc=Določitev in sledenje zahtevkov za dopustov zaposlenih
+Module39000Name=Product batch
+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
-Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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=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
 Module59000Desc=Modul za upravljanje z maržami
 Module60000Name=Provizije
@@ -575,9 +588,6 @@ Permission92=Kreiranje/spreminjanje socialnih prispevkov in DDV
 Permission93=Brisanje socialnih prispevkov in DDV
 Permission94=Izvoz socialnih prispevkov
 Permission95=Branje poročil
-Permission96=Nastavitve odpreme
-Permission97=Branje odposlanih računovodskih listin
-Permission98=Branje postavk računovodskih listin
 Permission101=Branje pošiljk
 Permission102=Kreiranje/spreminjanje pošiljk
 Permission104=Potrjevanje pošiljk
@@ -603,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
@@ -668,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
@@ -685,7 +696,7 @@ Permission401=Branje popustov
 Permission402=Kreiranje/spreminjanje popustov
 Permission403=Potrjevanje popustov
 Permission404=Brisanje popustov
-Permission510=Read Salaries
+Permission510=Branje plač
 Permission512=Ustvari/spremeni plače
 Permission514=Izbris plač
 Permission517=Izvoz plač
@@ -698,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
@@ -745,39 +756,40 @@ Permission2802=Uporaba FTP klienta za pisanje (brisanje ali nalaganje datotek)
 Permission50101=Uporabi prodajno mesto
 Permission50201=Branje prenosov
 Permission50202=Uvoz prenosov
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
+Permission54001=Tiskaj
+Permission55001=Branje anket
+Permission55002=Kreiranje/spreminjanje anket
+Permission59001=Branje komercialnih marž
+Permission59002=Določitev komercialnih marž
+DictionaryCompanyType=Tip partnerjev
+DictionaryCompanyJuridicalType=Pravna oblika partnerjev
+DictionaryProspectLevel=Nivo potenciala možne stranke
+DictionaryCanton=Dežele/kantoni
+DictionaryRegion=Regije
+DictionaryCountry=Države
+DictionaryCurrency=Valute
+DictionaryCivility=Vljudnostni nazivi
+DictionaryActions=Tipi aktivnosti
+DictionarySocialContributions=Vrste socialnih prispevkov
+DictionaryVAT=Stopnje DDV ali davkov
+DictionaryRevenueStamp=Znesek kolekov
+DictionaryPaymentConditions=Pogoji plačil
+DictionaryPaymentModes=Načini plačil
+DictionaryTypeContact=Tipi kontaktov/naslovov
+DictionaryEcotaxe=Ekološka taksa (WEEE)
+DictionaryPaperFormat=Formati papirja
+DictionaryFees=Tipi stroškov
+DictionarySendingMethods=Načini pošiljanja
+DictionaryStaff=Zaposleni
+DictionaryAvailability=Zakasnitev dobave
+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=Back to dictionaries list
+BackToDictionaryList=Nazaj na seznam slovarjev
 VATReceivedOnly=Posebna stopnja ni zaračunana
 VATManagement=Upravljanje DDV
 VATIsUsedDesc=Privzeta stopnja DDV pri kreiranju možnih strank, računov, naročil itd. sledi aktivnemu standardnemu pravilu:<br>Če je prodajalec davčni zavezanec, je privzeta stopnja DDV=0. Konec pravila.<br>Če je (država prodaje = država nakupa), potem je privzeta davčna stopnja=DDV v državi prodaje. Konec pravila. <br>Če sta prodajalec in kupec iz držav članic EU in se blago prevaža s transportnim sredstvom (avto, ladja, letalo), je privzeta stopnja DDV=0 ( DDV mora plačati kupec pri carinskem uradu svoje države in ne prodajalec blaga). Konec pravila.<br> Če sta prodajalec in kupec iz držav članic EU in se blago ne prevaža s transportnim sredstvom, je privzeta stopnja DDV=DDV prodanega proizvoda.  Konec pravila.<br>Drugače je predlagan privzet DDV=1. Konec pravila.
@@ -785,7 +797,7 @@ VATIsNotUsedDesc=Privzeta predlagana stopnja DDV je 0, kar se lahko uporabi za p
 VATIsUsedExampleFR=V Franciji to pomeni podjetja ali organizacije, ki imajo realen fiskalni sistem (poenostavljen realen ali normalen realen), v katerem mora biti DDV prikazan.
 VATIsNotUsedExampleFR=V Franciji to pomeni združenja, ki niso davčni zavezanci ali podjetja, organizacije ali svobodni poklici, ki so izbrali davčni sistem za mikro podjetja (franšizni DDV) in plačajo franšizni DDV brez davčne izjave.  Ta izbira prikaže na računu opombo "DDV ni obračunan v skladu z …".
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Stopnja
 LocalTax1IsUsed=Uporabi drugi davek
 LocalTax1IsNotUsed=Ne uporabi drugega davka
 LocalTax1IsUsedDesc=Uporabi drugo vrsto davka (poleg DDV)
@@ -810,12 +822,12 @@ LocalTax2IsUsedDescES= RE obrestno mero za zamudne pri ustvarjanju možnosti, iz
 LocalTax2IsNotUsedDescES= Privzeto predlagani IRPF je 0. Konec pravila.
 LocalTax2IsUsedExampleES= V Španiji, samostojnimi in neodvisni strokovnjaki, ki opravljajo storitve in podjetja, ki so se odločili davčni sistem modulov.
 LocalTax2IsNotUsedExampleES= V Španiji so poslovne niso predmet davčnega sistema modulov.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Poročila
+CalcLocaltax1ES=Prodaja - Nabava
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2ES=Nabava
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3ES=Prodaja
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Privzet naziv, če za kodo ne obstaja prevod
 LabelOnDocuments=Naslov na dokumentu
@@ -884,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
@@ -928,14 +941,14 @@ EventsSetup=Nastavitve za dnevnik dogodkov
 LogEvents=Dogodki v zvezi z nadzorovanjem varnosti
 Audit=Nadzor
 InfoDolibarr=Dolibarr informacije
-InfoBrowser=Infos Browser
+InfoBrowser=Informacije o brskalniku
 InfoOS=Informacije o operacijskem sistemu
 InfoWebServer=Informacije o spletnem strežniku
 InfoDatabase=Informacije o bazi podatkov
 InfoPHP=Informacije o PHP
-InfoPerf=Infos performances
-BrowserName=Browser name
-BrowserOS=Browser OS
+InfoPerf=Informacija o zmogljivosti
+BrowserName=Ime brskalnika
+BrowserOS=OS brskalnika
 ListEvents=Dogodki nadzora
 ListOfSecurityEvents=Seznam varnostnih dogodkov Dolibarr
 SecurityEventsPurged=Varnostni dogodki očistimo
@@ -956,7 +969,7 @@ TriggerDisabledAsModuleDisabled=Prožilci v tej datoteki so onemogočeni, ker je
 TriggerAlwaysActive=Prožilci v tej datoteki so aktivni vedno, ne glede na aktiven Dolibarr module.
 TriggerActiveAsModuleActive=Prožilci v tej datoteki so aktivni, ker je omogočen modul <b>%s</b> .
 GeneratedPasswordDesc=Tukaj določite, katero pravilo želite uporabiti za generiranje novega gesla, če ste zahtevali avtomatsko generiranje gesla
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Tukaj definirate vse referenčne podatke. Vnaprej določene vrednosti lahko dopolnite z vašimi.
 ConstDesc=Ta stran omogoča urejanje vseh ostalih parametrov, ki niso na voljo na prejšnjih straneh. To so rezervirani parametri za napredne razvijalce ali za odpravljanje težav.
 OnceSetupFinishedCreateUsers=Pozor, vi ste Dolibarr administrator. Administrator lahko nastavlja Dolibarr. Za navadno uporabo aplikacije Dolibarr, se priporočajo nastavitve navadnega uporabnika, ki nima administratorskih pravic in ga kreirate preko menija 'Uporabniki & Skupine'.
 MiscellaneousDesc=Tukaj definirate vse ostale parametre, povezane z varnostjo.
@@ -1007,20 +1020,20 @@ MAIN_PROXY_USER=Uporabniško ime za uporabo proxy strežnika
 MAIN_PROXY_PASS=Geslo za uporabo proxy strežnika
 DefineHereComplementaryAttributes=Tukaj doloćite vse atribute, ki niso na voljo kot privzeti, vendar želite da so podprti za %s.
 ExtraFields=Koplementarni atributi
-ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsLines=Koplementarni atributi (postavke)
 ExtraFieldsThirdParties=Koplementarni atributi (partner)
 ExtraFieldsContacts=Koplementarni atributi (kontakt/naslov)
 ExtraFieldsMember=Koplementarni atributi (član)
 ExtraFieldsMemberType=Koplementarni atributi (tip člana)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
+ExtraFieldsCustomerOrders=Koplementarni atributi (naročila)
+ExtraFieldsCustomerInvoices=Koplementarni atributi (računi)
 ExtraFieldsSupplierOrders=Koplementarni atributi (naročila)
 ExtraFieldsSupplierInvoices=Koplementarni atributi (računi)
 ExtraFieldsProject=Koplementarni atributi (projekti)
 ExtraFieldsProjectTask=Koplementarni atributi (naloge)
 ExtraFieldHasWrongValue=Atribut %s ima napačno vrednost.
 AlphaNumOnlyCharsAndNoSpace=samo alfanumerični znaki brez presledkov
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=samo alfanumerični znaki in male črke brez presledkov
 SendingMailSetup=Nastavitev pošiljanja z elektronsko pošto
 SendmailOptionNotComplete=Pozor, na nekaterih Linux sistemih mora za pošiljanje pošte z vašega naslova nastavitev vsebovati opcijo -ba (parameter mail.force_extra_parameters v vaši datoteki php.ini). Če nekateri prejemniki nikoli ne dobijo pošte, poskusite popraviti PHP parameter z mail.force_extra_parameters = -ba).
 PathToDocuments=Pot do dokumentov
@@ -1030,27 +1043,26 @@ TranslationSetup=Konfiguracija prevoda
 TranslationDesc=Izbira na zaslonu vidnega jezika se lahko spremeni:<br>* Globalno preko menija <strong>Domov - Nastavitve - Prikaz</strong><br>* Samo za uporabnike preko zavihka <strong>Nastavitev zaslona uporabnika</strong> (klik na login na vrhu ekrana).
 TotalNumberOfActivatedModules=Skupno število aktiviranih modulov za lastnosti: <b>%s</b>
 YouMustEnableOneModule=Omogočiti morate vsaj 1 modul
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
+ClassNotFoundIntoPathWarning=Ratzred %s ni najedn na poti PHP
 YesInSummer=Da poleti
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+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=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.
+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.
 SearchOptim=Iskanje optimizacijo
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+YouHaveXProductUseSearchOptim=V baziiomate %s proizvodov. V meni Domov-Nastavitve-Ostalo morate dodati konstanto PRODUCT_DONOTSEARCH_ANYWHERE = 1 , s čimer omejite iskanje na začetek niza, kar omogoča bazi uporabo indeksov in s tem hitrejši odziv.
+BrowserIsOK=Uporabljate spletni brskalnik %s. Ta brskalnik je ustrezen tako glede varnosti, kot glede zmogljivosti.
+BrowserIsKO=Uporabljate spletni brskalnik %s. Ta brskalnik je slaba izbira glede varnosti, zmogljivosti in zanesljivosti. Priporočamo uporabo Firefox, Chrome, Opera ali Safari.
+XDebugInstalled=Naložen je XDebug
+XCacheInstalled=Naložen je XCache.
+AddRefInList=Prikaži reference stranke/dobavitelja kot seznam (izbor seznama Combobox) in večinoo povezav
+FieldEdition=%s premenjenih polj
+FixTZ=Fiksiranje časovne cone
+FillThisOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave s časovno cono)
+GetBarCode=Pridobi črtno kodo
+EmptyNumRefModelDesc=Koda je prosta. Lahko jo kadarkoli spremenite.
 ##### Module password generation
 PasswordGenerationStandard=Predlaga geslo, generirano glede na interni Dolibarr algoritem: 8 mest, ki vsebujejo različne številke in male črke.
 PasswordGenerationNone=Ne predlaga nobenega generiranega gesla. Geslo je potrebno vnesti ročno.
@@ -1071,10 +1083,11 @@ 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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Aktivacija funkcije za avtomatsko izpolnitev plačilnih vrstic na obrazcu za plačilo
 CompanyIdProfChecker=Strokovno Id edinstven
 MustBeUnique=Mora biti edinstven?
 MustBeMandatory=Obvezno kreiranje partnerjev
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> ki predstavlja telefon klicanega<br><b>__PHONEFROM__</b> ki predstavlja telefon klicatelja (vaša številka)<br><b>__LOGIN__</b> ki predstavlja vašo prijavo na klicanje s klikom (določena z vašo uporabniško kodo)<br><b>__PASS__</b> ki predstavlja vaše geslo za klicanje s klikom (določena z vašo uporabniško kodo).
@@ -1154,11 +1169,11 @@ 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=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Modeli obrazcev pogodb
+FreeLegalTextOnContracts=Poljubno besedilo na pogodbah
+WatermarkOnDraftContractCards=Vodni tisk na osnutkih pogodb (brez, če je prazno)
 ##### Members #####
 MembersSetup=Nastavitve modula članov
 MemberMainOptions=Glavne opcije
@@ -1291,8 +1306,8 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
 LDAPFieldTitle=Položaj/Funkcija
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPFieldTitleExample=Primer: naziv
+LDAPParametersAreStillHardCoded=LDAP parametres are still hardcoded (in contact class)
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
 LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
@@ -1301,24 +1316,24 @@ LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree
 LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
 LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
 ForANonAnonymousAccess=For an authenticated acces (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
+PerfDolibarr=Nastavitev zmogljivosti/optimizacija poročila
+YouMayFindPerfAdviceHere=Na tej strani najdete nekaj kontrol ali nasvetov, povezanih z zmogljivostjo.
+NotInstalled=Ni nameščeno, zato to ni vzrok počasnosti strežnika
+ApplicativeCache=Aplikativni predpomnilnik
+MemcachedNotAvailable=Ni najden aplikativni predpomnilnik. Zmogljivost lahko izboljšate z namestitvijo predpomnilniškega strežnika Memcached in modula, ki zna uporabljati ta predpomnilniški strežnik.<br>Več informacij najdete tukaj <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Vedite, da veliko gostiteljev spletnih strani ne zagotavlja takega predpomnilniškega strežnika..
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+OPCodeCache=OPCode predpomnilnik
+NoOPCodeCacheFound=Ni najden OPCode predpomnilnik. Morda uporabljate drugačen OPCode predpomnilnik, kot sta XCache ali eAccelerator (v redu), morda pa nimate OPCode predpomnilnika (zelo slabo).
+HTTPCacheStaticResources=HTTP predpomnilnik za statične vire (css, img, javascript)
+FilesOfTypeCached=Datoteke tipa %s so shranjene v predpomnilniku HTTP strežnika
+FilesOfTypeNotCached=Datoteke tipa %s niso shranjene v predpomnilniku HTTP strežnika
+FilesOfTypeCompressed=Datoteke tipa %s so komprimirane v HTTP strežniku
+FilesOfTypeNotCompressed=Datoteke tipa %s niso komprimirane v HTTP strežniku
+CacheByServer=Predpomnilnik v strežniku
+CacheByClient=Predpomnilnik v brskalniku
+CompressionOfResources=Kompresija HTTP odgovorov
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Nastavitve modula za proizvode
 ServiceSetup=Storitve modul nastavitev
@@ -1328,8 +1343,8 @@ ConfirmDeleteProductLineAbility=Potrditev izbrisa vrstice proizvoda z obrazca
 ModifyProductDescAbility=Prilagoditev opisa proizvoda na obrazcu
 ViewProductDescInFormAbility=Ponazoritev opisa proizvoda na obrazcu (kot pojavni opis)
 ViewProductDescInThirdpartyLanguageAbility=Vizualizacija Poimenovanja izdelkov v thirdparty jeziku
-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=Če je število proizvodov zelo veliko (> 100 000), lahko povečate hitrost z nastavitvijo konstante PRODUCT_DONOTSEARCH_ANYWHERE na vrednost 1 v Nastavitve->Ostale nastavitve. S tem bo iskanje omejeno na začetek niza.
+UseSearchToSelectProduct=Uporabi iskanje za izbiro proizvoda (raje kot padajoči seznam)
 UseEcoTaxeAbility=Podpora ekološke takse (WEEE)
 SetDefaultBarcodeTypeProducts=Privzet tip črtne kode za proizvode
 SetDefaultBarcodeTypeThirdParties=Privzet tip črtne kode za partnerje
@@ -1345,7 +1360,7 @@ SyslogSimpleFile=Datoteka
 SyslogFilename=Ime datoteke in pot
 YouCanUseDOL_DATA_ROOT=Za log datoteko v Dolibarr dokumentni mapi lahko uporabite DOL_DATA_ROOT/dolibarr.log. Za shranjevanje te datoteke lahko nastavite tudi drugačno pot.
 ErrorUnknownSyslogConstant=Konstanta %s ni znana syslog konstanta
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=Windowsi podpirajo samo LOG_USER
 ##### Donations #####
 DonationsSetup=Nastanitev modula za donacije
 DonationsReceiptModel=Predloga računa za donacijo
@@ -1364,23 +1379,24 @@ BarcodeDescISBN=Črtna koda tipa ISBN
 BarcodeDescC39=Črtna koda tipa C39
 BarcodeDescC128=Črtna koda tipa C128
 GenbarcodeLocation=Orodje za generiranje črtne kode preko komandne vrstice (uporablja ga 'phpbarcode engine' za nekatere tipe črtnih kod)
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeInternalEngine=Interno orodje
+BarCodeNumberManager=Upravljanje avtomatskega določanja številk črtnih kod
 ##### Prelevements #####
 WithdrawalsSetup=Nastavitev modula za dvige
 ##### ExternalRSS #####
 ExternalRSSSetup=Nastavitev uvoza zunanjih RSS
 NewRSS=Nov vir RSS
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=Zanimiv vir RSS
 ##### Mailing #####
 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
@@ -1400,16 +1416,17 @@ FCKeditorForCompany=WYSIWIG kreiranje/urejanje opisa podjetij in opomb
 FCKeditorForProduct=WYSIWIG kreiranje/urejanje opisa proizvodov/storitev in opomb
 FCKeditorForProductDetails=WYSIWIG kreiranje/urejanje vrstic za podrobnosti za vse entitete (ponudbe, naročila, računi, itd...)<br>Opozorilo: Uporaba te opcije resnično ni priporočljiva, ker lahko povzroči težave s posebnimi znaki in formatiranjem strani PDF datotek.
 FCKeditorForMailing= WYSIWIG kreiranje/urejanje pošte
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=WYSIWIG kreiranje/urejanje podpisa uporabnika
+FCKeditorForMail=WYSIWIG kreiranje/urejanje za vse pošte (razen Outils->eMailing)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Povezava je uspela, vendar baza podatkov ne izgleda kot OSCommerce baza podatkov (Ključ %s ni bil najden v tabeli %s).
 OSCommerceTestOk=Povezava s strežnikom '%s' na bazo podatkov '%s' uporabnika '%s' je bila uspešna.
 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
@@ -1444,11 +1461,11 @@ ConfirmDeleteLine=Ali zares želite izbrisati to vrstico ?
 ##### Tax #####
 TaxSetup=Modul za nastavitve davkov, socialnih prispevkov in dividend
 OptionVatMode=Rok za DDV
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Gotovinska osnova
+OptionVATDebitOption=Povečana osnova
 OptionVatDefaultDesc=DDV zapade:<br>- ob dobavi/plačilu blaga<br>- ob plačilu storitev
 OptionVatDebitOptionDesc=DDV zapade:<br>- ob dobavi/plačilu blaga<br>- ob računu (zapadlosti) za storitev
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Privzeta zapadlost DDV glede na izbrano opcijo:
 OnDelivery=Ob dobavi
 OnPayment=Ob plačilu
 OnInvoice=Ob izdaji računa
@@ -1459,26 +1476,29 @@ Sell=Prodaja
 InvoiceDateUsed=Uporabljen datum računa
 YourCompanyDoesNotUseVAT=Vaše podjetje ni davčni zavezanec (Domov - Nastavitve - Podjetje/ustanova), zato ni možno nastaviti opcij za DDV.
 AccountancyCode=Računovodstvo zakonik
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Računovodska koda prodaje
+AccountancyCodeBuy=Računovodska koda nabave
 ##### Agenda #####
 AgendaSetup=Nastavitev modula za aktivnosti in dnevni red
 PasswordTogetVCalExport=Ključ za avtorizacijo izvoznega linka
 PastDelayVCalExport=Ne izvažaj dogodekov, starejših od
-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=Uporabi tipe aktivnosti (urejanje v meniju Nastavitve -> Slovarji -> Tipi planiranih aktivnosti)
+AGENDA_DEFAULT_FILTER_TYPE=Avtomatsko nastavi ta tip aktivnosti v iskalni filter v pogledu dnevnega reda
+AGENDA_DEFAULT_FILTER_STATUS=Avtomatsko nastavi ta status aktivnosti v iskalni filter v pogledu dnevnega reda
+AGENDA_DEFAULT_VIEW=Kateri zavihek naj se privzeto odpre ko izberete meni Dnevni red
 ##### ClickToDial #####
 ClickToDialDesc=Ta modul omogoča dodajanje ikone za telefonsko številko Dolibarr kontakta. S klikom na ikono boste poklicali strežnik z določenim URL naslovom, ki ga definirate spodaj. To lahko uporabite za klic sistema klicnega centra iz aplikacije Dolibarr, ki lahko kliče telefonsko številko na primer na sistemu SIP.
 ##### 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.
@@ -1502,10 +1522,10 @@ MultiCompanySetup=Nastavitev modula za več podjetij
 SuppliersSetup=Nastavitev modula za dobavitelje
 SuppliersCommandModel=Celotna predloga naročila dobavitelja (logo...)
 SuppliersInvoiceModel=Celotna predloga računa dobavitelja (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+SuppliersInvoiceNumberingModel=Modeli številčenja računov dobaviteljev
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Nastavitev modula GeoIP Maxmind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Pot do datoteke, ki vsebuje Maxmind ip za prevode po državah.<br>Primer:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Pazite, da je mora biti vaš ip do datoteke s podatki o državi znotraj mape, ki jo PHP lahko bere (Na vašem PHP preverite nastavitve 'open_basedir' in dovoljenja za datotečni sistem).
 YouCanDownloadFreeDatFileTo=<b>Brezplačno demo različico</b> Maxmind GeoIP deželne datoteke lahko prenesete z %s.
 YouCanDownloadAdvancedDatFileTo=Lahko tudi prenesete bolj <b>popolno različico, s posodobitvami,</b> deželne datoteke Maxmind GeoIP z %s.
@@ -1514,22 +1534,31 @@ TestGeoIPResult=Test pretvorbe IP -> država
 ProjectsNumberingModules=Modul za številčenje projektov
 ProjectsSetup=Nastavitve modula za projekte
 ProjectsModelModule=Vzorec dokumenta poročila o projektih
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
+TasksNumberingModules=Moduli za številčenje nalog
+TaskModelModule=Modeli obrazcev poročil o nalogah
 ##### ECM (GED) #####
-ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMSetup = Nastavitve GED
+ECMAutoTree = Avtomatska drevesna struktura mape in dokumenta
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-
+FiscalYears=Fiskalna leta
+FiscalYear=Fiskalno leto
+FiscalYearCard=Kartica fiskalnega leta
+NewFiscalYear=Novo fiskalno leto
+EditFiscalYear=Uredi fiskalno leto
+OpenFiscalYear=Odpri fiskalno leto
+CloseFiscalYear=Zapri fiskalno leto
+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 39ba576ca7c..db29ff08f42 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID dogodka
 Actions=Dogodki
 ActionsArea=Področje dogodkov (aktivnosti in naloge)
-Agenda= Urnik
-Agendas= Urniki
-Calendar= Koledar
-Calendars= Koledarji
-LocalAgenda=Lokalni koledar
-AffectedTo= Se nanaša na
-DoneBy= Izdelal
-Events= Dogodki
+Agenda=Urnik
+Agendas=Urniki
+Calendar=Koledar
+Calendars=Koledarji
+LocalAgenda=Notranji koledar
+ActionsOwnedBy=Zasebni dogodek od
+AffectedTo=Se nanaša na
+DoneBy=Izdelal
+Event=Aktivnost
+Events=Dogodki
 EventsNb=Število dogodkov
 MyEvents=Moji dogodki
 OtherEvents=Drugi dogodki
@@ -17,31 +19,33 @@ ListOfActions=Seznam dogodkov
 Location=Lokacija
 EventOnFullDay=Dogodek na celoten dan(ni)
 SearchAnAction= Iskanje dogodka/naloge
-MenuToDoActions= Vsi nedokončani dogodki
-MenuDoneActions= Vsi prekinjeni dogodki
-MenuToDoMyActions= Moji nedokončani dogodki
-MenuDoneMyActions= Moji prekinjeni dogodki
-ListOfEvents= Seznam Dolibarr dogodkov
+MenuToDoActions=Vsi nedokončani dogodki
+MenuDoneActions=Vsi prekinjeni dogodki
+MenuToDoMyActions=Moji nedokončani dogodki
+MenuDoneMyActions=Moji prekinjeni dogodki
+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
 ViewCal=Mesečni pogled
 ViewDay=Dnevni pogled
 ViewWeek=Tedenski pogled
-ViewPerUser=Na uporabnika
+ViewPerUser=Pogled po uporabniku
 ViewWithPredefinedFilters= Glej z prednastavljenimi filtri
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Začetni datum
 DateActionEnd= Končni datum
 AgendaUrlOptions1=V filtriran izhod lahko dodate tudi naslednje parametre:
 AgendaUrlOptions2=<b>login=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo, ali jih je naredil uporabnik <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> za omejitev izhoda na aktivnosti, ki jih je naredil uporabnik <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> za omejitev izhoda na aktivnosti v lasti uporabnika <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> za omejitev izhoda na aktivnosti, ki se nanašajo na uporabnika <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> za omejitev izhoda na aktivnosti uporabnika <b>%s</b>.
+AgendaUrlOptionsProject=<b>projekt=PROJECT_ID</b> za omejitev izhoda na aktivnosti povezane s projektom<b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Prikaži rojstni dan kontakta
 AgendaHideBirthdayEvents=Skrij rojstni dan kontakta
 Busy=Zaseden
 ExportDataset_event1=Seznam aktivnosti
-
+DefaultWorkingDays=Privzeti delovni dnevi v tednu (primer: 1-5, 1-6)
+DefaultWorkingHours=Privzet dnevni delovnik (primer: 9-18)
 # External Sites ical
 ExportCal=Izvoz koledarja
 ExtSites=Zunanji koledarji
-ExtSitesEnableThisTool=Prikaži zunanji koledar v urniku
+ExtSitesEnableThisTool=Prikaži zunanje koledarje (definirane v globalnih nastavitvah) v agendi. Nima učinka na zunanje koledarje, ki jih določi uporabnik.
 ExtSitesNbOfAgenda=Število koledarjev
 AgendaExtNb=Koledar št. %s
 ExtSiteUrlAgenda=URL za dostop do .ical datoteke
 ExtSiteNoLabel=Ni opisa
+WorkingTimeRange=Delovni čas
+WorkingDaysRange=Delovni dnevi
+AddEvent=Ustvari dogodek
+MyAvailability=Moja dostopnost
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 48e937c5e5d..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=<b>Dobropis</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Označeno kot 'Plačano'
 ClassifyPaidPartially=Označeno kot 'Delno plačano'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Ali zares želite preklicati račun <b>%s</b> ?
 ConfirmCancelBillQuestion=Zakaj želite označiti ta račun kot 'opuščen' ?
 ConfirmClassifyPaidPartially=Ali zares želite spremeniti račun <b>%s</b> 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 <b>(%s %s)</b> je odobren popust, ker je bilo plačilo izvršeno predčasno. DDV je reguliran z dobropisom.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Na opominu za plačilo  <b>(%s %s)</b> 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  <b>(%s %s)</b> je odobren popust, ker je bilo plačilo izvršeno predčasno. DDV na ta popust bo vrnjen brez dobropisa.
+ConfirmClassifyPaidPartiallyReasonAvoir=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. DDV je bil popravljen z dobropisom.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Neplačan preostanek <b>(%s %s)</b> je popust zaradi predčasnega plačila. Strinjam se z izgubo DDV zaradi tega popusta.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Neplačan preostanek <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Ponujen popust (plačilo pred rokom)
-SendBillRef=Pošlji račun %s
-SendReminderBillRef=Pošlji račun %s (opomin)
+SendBillRef=Oddaja račuuna %s
+SendReminderBillRef=Oddaja računa %s (opomin)
 StandingOrders=Trajniki
 StandingOrder=Trajnik
 NoDraftBills=Ni osnutka računa
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Vsota obeh novih popustov mora biti enaka o
 ConfirmRemoveDiscount=Ali zares želite odstraniti ta popust ?
 RelatedBill=Podobni račun
 RelatedBills=Povezani računi
+LatestRelatedBill=Zadnji povezan račun
+WarningBillExist=Pozor, obstaja že en ali več računov
 
 # PaymentConditions
 PaymentConditionShortRECEP=Takoj
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index b6aa05ed20e..53f17b73fa9 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -16,7 +16,7 @@ SuppliersCategoriesArea=Področje kategorij dobaviteljev
 CustomersCategoriesArea=Področje kategorij kupcev
 ThirdPartyCategoriesArea=Področje kategorij partnerjev
 MembersCategoriesArea=Področje kategorij članov
-# ContactsCategoriesArea=Contacts categories area
+ContactsCategoriesArea=Področje kategorij kontaktov
 MainCats=Glavne kategorije
 SubCats=Podkategorije
 CatStatistics=Statistika
@@ -50,15 +50,15 @@ SupplierIsInCategories=Partner pripada naslednjim kategorijam dobaviteljev
 CompanyIsInCustomersCategories=Ta partner pripada naslednjim kategorijam kupcev/možnih strank
 CompanyIsInSuppliersCategories=Ta partner pripada naslednjim kategorijam dobaviteljev
 MemberIsInCategories=Ta član pripada naslednjim kategorijam
-# ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=Ta kontakt pripada naslednjim kategorijam kontaktov
 ProductHasNoCategory=Ta proizvod/storitev ni vključen v nobeno kategorijo
 SupplierHasNoCategory=Ta dobavitelj ni vključen v nobeno kategorijo
 CompanyHasNoCategory=To podjetje ni vključeno v nobeno kategorijo
 MemberHasNoCategory=Ta član ni v nobeni kategoriji
-# ContactHasNoCategory=This contact is not in any categories
+ContactHasNoCategory=Ta kontakt ni v nobeni kategoriji
 ClassifyInCategory=Razvrsti v kategorijo
 NoneCategory=Nobena
-# NotCategorized=Without category
+NotCategorized=Brez kategorije
 CategoryExistsAtSameLevel=Kategorija s to referenco že obstaja
 ReturnInProduct=Nazaj na kartico proizvodov/storitev
 ReturnInSupplier=Nazaj na kartico dobaviteljev
@@ -66,7 +66,7 @@ ReturnInCompany=Nazaj na kartico kupcev/možnih strank
 ContentsVisibleByAll=Vsebina bo vidna vsem
 ContentsVisibleByAllShort=Vsebina vidna vsem
 ContentsNotVisibleByAllShort=Vsebina ni vidna vsem
-# CategoriesTree=Categories tree
+CategoriesTree=Drevesna struktura kategorij
 DeleteCategory=Izbriši kategorijo
 ConfirmDeleteCategory=Ali zares želite izbrisati to kategorijo?
 RemoveFromCategory=Odstranite povezavo s kategorijo
@@ -81,12 +81,12 @@ CustomersCategoriesShort=Kategorije kupcev
 CustomersProspectsCategoriesShort=Kategorije kupcev/možnih strank
 ProductsCategoriesShort=Kategorije proizvodov
 MembersCategoriesShort=Kategorije članov
-# ContactCategoriesShort=Contacts categories
+ContactCategoriesShort=Kategorije kontaktov
 ThisCategoryHasNoProduct=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoSupplier=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoCustomer=Ta kategorija ne vsebuje nobenega kupca.
 ThisCategoryHasNoMember=Ta kategorija ne vsebuje nobenega člana.
-# ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=Ta kategorija ne vsebuje nobenega kontakta.
 AssignedToCustomer=Dodeljeno kupcu
 AssignedToTheCustomer=Dodeljeno kupcu
 InternalCategory=Interna kategorija
@@ -96,18 +96,17 @@ CatSupList=Seznam kategorij dobaviteljev
 CatCusList=Seznam kategorij kupcev/možnih strank
 CatProdList=Seznam kategorij proizvodov
 CatMemberList=Seznam kategorij članov
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+CatContactList=Seznam kategorij kontaktov in kontaktov
+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
+DeleteFromCat=Odstrani iz kategorije
+DeletePicture=Izbriši sliko
+ConfirmDeletePicture=Potrdi izbris slike?
+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=Dodaj sledeči produkt/storitev
+ShowCategory=Prikaži kategorijo
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 5ff74d798a7..32202272217 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=Če želite dodati e-mail obveščanje, morate najprej
 ListSuppliersShort=Seznam dobaviteljev
 ListProspectsShort=Seznam možnih strank
 ListCustomersShort=Seznam kupcev
-ThirdPartiesArea=Področje partnerjev
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Zadnjih %s spremenjenih partnerjev
 UniqueThirdParties=Skupno število partnerjev
 InActivity=Aktiven
@@ -410,3 +410,5 @@ OutstandingBillReached=Dosežen maksimum za neplačan račun
 MonkeyNumRefModelDesc=Predlaga kodo kupca v formatu %syymm-nnnn in kodo dobavitelja v formatu %syymm-nnnn kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledka, večja od 0.
 LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli spremenite.
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 88bb0773392..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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/donations.lang b/htdocs/langs/sl_SI/donations.lang
index 5271b7a345c..0af6246a824 100644
--- a/htdocs/langs/sl_SI/donations.lang
+++ b/htdocs/langs/sl_SI/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donacija
 Donations=Donacije
-# DonationRef=Donation ref.
+DonationRef=Referenca donacije
 Donor=Donator
 Donors=Donatorji
-AddDonation=Dodaj donacijo
+AddDonation=Ustvari donacijo
 NewDonation=Nova donacija
-# ShowDonation=Show donation
+ShowDonation=Prikaži donacijo
 DonationPromise=Obljuba darila
 PromisesNotValid=Nepotrjene obljube
 PromisesValid=Potrjene obljube
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Osnutek
 DonationStatusPromiseValidatedShort=Potrjena
 DonationStatusPaidShort=Prejeta
 ValidPromess=Potrjena obljuba
-# DonationReceipt=Donation receipt
+DonationReceipt=Prejem donacije
 BuildDonationReceipt=Izdelava potrdila
 DonationsModels=Modeli dokumentov za potrdila o donacijah
 LastModifiedDonations=Zadnjih %s spremenjenih donacij
 SearchADonation=Iskanje donacij
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+DonationRecipient=Prejemnik donacije
+ThankYou=Hvala
+IConfirmDonationReception=Prejemnik potrjuje prejem donacije v naslednjem znesku
+MinimumAmount=Najmanjši znesek je %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/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 328b32d52b6..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 &quot;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 <b>%s</b> 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 <b>%s</b> uporablja za izvedbo spletni strežnik nima dovoljenja za to
 ErrorNoActivatedBarcode=Noben tip črtne kode ni aktiviran
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/sl_SI/exports.lang b/htdocs/langs/sl_SI/exports.lang
index 88d1c8f6e2f..7193b6f7e18 100644
--- a/htdocs/langs/sl_SI/exports.lang
+++ b/htdocs/langs/sl_SI/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Številka konta
 BankAccountNumberKey=Ključ
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 42f3b6da611..dc8de0063da 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -1,149 +1,148 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
-MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
-Employe=Employee
+Holidays=Leaves
+CPTitreMenu=Leaves
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
+Employe=Zaposleni
 DateDebCP=Začetni datum
 DateFinCP=Končni datum
 DateCreateCP=Datum kreiranja
 DraftCP=Osnutek
-ToReviewCP=Awaiting approval
-ApprovedCP=Odobren
+ToReviewCP=Čaka odobritev
+ApprovedCP=Odobreno
 CancelCP=Preklicano
 RefuseCP=Zavrnjeno
-ValidatorCP=Approbator
-ListeCP=List of holidays
-ReviewedByCP=Will be reviewed by
+ValidatorCP=Odobril
+ListeCP=List of leaves
+ReviewedByCP=Pregledal
 DescCP=Opis
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
+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.
+ReturnCP=Nazaj na prejšnjo stran
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
+InfosWorkflowCP=Pretok informacij
+RequestByCP=Zahteval
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Uredi
 DeleteCP=Izbriši
 ActionValidCP=Potrdi
-ActionRefuseCP=Refuse
+ActionRefuseCP=Zavrnitev
 ActionCancelCP=Razveljavi
 StatutCP=Status
-SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Posodobi
-CantUpdate=You cannot update this request of holidays.
-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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
-DateValidCP=Date approved
-TitleToValidCP=Send request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+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.
+CantUpdate=You cannot update this leave request.
+NoDateDebut=Izbrati morate začetni datum.
+NoDateFin=Izbrati morate končni datum.
+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 odobritve
+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=Izbrati morate razlog za zavrnitev zahtevka.
+TitleCancelCP=Cancel the leave request
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
+DetailRefusCP=Razlog za zavrnitev
+DateRefusCP=Datum zavrnitve
+DateCancelCP=Datum preklica
+DefineEventUserCP=Dodeli izredno odsotnost uporabniku
+addEventToUserCP=Dodeli odsotnost
 MotifCP=Razlog
 UserCP=Uporabnik
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
-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.
+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
+ActionByCP=Izvajalec
+UserUpdateCP=Za uporabnika
+PrevSoldeCP=Prejšnje stanje
+NewSoldeCP=Novo stanje
+alreadyCPexist=A leave request has already been done on this period.
 UserName=Priimek
-Employee=Employee
-FirstDayOfHoliday=First day of holiday
-LastDayOfHoliday=Last day of holiday
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+Employee=Zaposleni
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
+HolidaysMonthlyUpdate=Mesečna posodobitev
+ManualUpdate=Ročna posodobitev
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=Configuration of holidays module
-DescOptionCP=Description of the option
+ConfCP=Configuration of leave request module
+DescOptionCP=Opis opcij
 ValueOptionCP=Vrednost
-GroupToValidateCP=Group with the ability to approve holidays
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+GroupToValidateCP=Group with the ability to approve leave requests
+ConfirmConfigCP=Potrditev konfiguracije
+LastUpdateCP=Last automatic update of leaves allocation
+UpdateConfCPOK=Uspešno posodobljeno.
+ErrorUpdateConfCP=Pri posodabljanju je prišlo do napake, prosimo poskusite ponovno.
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Potrdi
-UpdateEventCP=Update events
+UpdateEventCP=Posodobitev aktivnosti
 CreateEventCP=Kreiraj
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
+NameEventCP=Ime aktivnosti
+OkCreateEventCP=Uspešno izvedeno dodajanje aktivnosti.
+ErrorCreateEventCP=Napaka pri ustvarjanju aktivnosti.
+UpdateEventOkCP=Uspešno izvedena posodobitev aktivnosti.
+ErrorUpdateEventCP=Napaka pri posodobitvi aktivnosti.
+DeleteEventCP=Brisanje aktivnosti
+DeleteEventOkCP=Aktivnost je bila izbrisana.
+ErrorDeleteEventCP=Napaka pri brisanju aktivnosti.
+TitleDeleteEventCP=Brisanje izredne odsotnosti
+TitleCreateEventCP=Ustvari izredno odsotnost
+TitleUpdateEventCP=Uredi ali izbriši izredno odsotnost
 DeleteEventOptionCP=Izbriši
 UpdateEventOptionCP=Posodobi
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+ErrorMailNotSend=Pri pošiljanju e-pošte je prišlo do napake:
+NoCPforMonth=Ta mesec ni odsotnosti.
+nbJours=Število dni
+TitleAdminCP=Configuration of Leaves
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang
index 9e9727bca9e..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Ime in podpis serviserja :
 NameAndSignatureOfExternalContact=Ime in podpis kupca :
 DocumentModelStandard=Standardni vzorec dokumenta za intervencijo
 InterventionCardsAndInterventionLines=Intervencije in vrstice na intervenciji
-ClassifyBilled=Označi kot "Zaračunano"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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..fe6b027fac1 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 <b>%s</b>
 MailingStatusRead=Preberite
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email <b>%s</b>  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=<b>%s</b> 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 <b>%s</b>  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=<b>%s</b> 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 <b>%s</b> 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=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 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 <b>vejico</b> 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=Activate a new email notification target
+ListOfActiveNotifications=List all active email notification targets
 ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
+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 <strong>'%s'</strong> 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/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 <b>%s</b> 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 "<strong>%s</strong>" (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<br/>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<br/>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.<br><br>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 <b>test</b> mail (beseda test mora biti v krepkem tisku).<br>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.<br>Sprememba bo učinkovala šele po kliku na potrditveni link v tem emailu.<br>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 <b>ALI</b> 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..835e6827f12
--- /dev/null
+++ b/htdocs/langs/sl_SI/printipp.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - printipp
+PrintIPPSetup=Setup of Direct Print module
+PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PRINTIPP_ENABLED=Show "Direct print" icon in document lists
+PRINTIPP_HOST=Print server
+PRINTIPP_PORT=Port
+PRINTIPP_USER=Login
+PRINTIPP_PASSWORD=Password
+NoPrinterFound=No printers found (check your CUPS setup)
+FileWasSentToPrinter=File %s was sent to printer
+NoDefaultPrinterDefined=No default printer defined
+DefaultPrinter=Default printer
+Printer=Printer
+CupsServer=CUPS Server
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
new file mode 100644
index 00000000000..ca3e49749ab
--- /dev/null
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -0,0 +1,20 @@
+# ProductBATCH language file - en_US - ProductBATCH
+ManageLotSerial=Manage batch/serial
+ProductStatusOnBatch=Managed
+ProductStatusNotOnBatch=Not Managed
+ProductStatusOnBatchShort=Managed
+ProductStatusNotOnBatchShort=Not Managed
+Batch=Batch/Serial
+atleast1batchfield=Eat-by date or Sell-by date or Batch number
+batch_number=Batch/Serial number
+l_eatby=Eat-by date
+l_sellby=Sell-by date
+DetailBatchNumber=Batch/Serial details
+DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+printBatch=Batch: %s
+printEatby=Eat-by: %s
+printSellby=Sell-by: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Add a line for Shelf Life dispatching
+BatchDefaultNumber=Undefined
+WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index e7e2607ec30..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,19 +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=Za izvedbo
+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.
+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
@@ -113,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
@@ -131,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?
@@ -150,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
@@ -178,64 +179,71 @@ CloneProduct=Kloniraj proizvod ali storitev
 ConfirmCloneProduct=Ali zares želite klonirati ta proizvod ali storitev <b>%s</b> ?
 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 <b>%s</b>.
-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
+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 <b>%s</b>.
+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<br>Posebna polja so spremenljivke kot "#opcije_mojaposebnapolja# * 2"<br>Tukaj so uporabljene posebne spremenljivke kot #količina# in #tva_tx#<br> ; 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 f5234ed759b..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
@@ -85,27 +87,27 @@ ActionsOnProject=Aktivnosti o projektu
 YouAreNotContactOfProject=Niste kontakt tega privatnega projekta
 DeleteATimeSpent=Izbrišite porabljen čas
 ConfirmDeleteATimeSpent=Ali zares želite izbrisati porabljen čas?
-DoNotShowMyTasksOnly=Prikaži tudi naloge, ki se me ne tičejo
-ShowMyTasksOnly=Prikaži samo naloge, ki se me tičejo
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Izvori
 ProjectsDedicatedToThisThirdParty=Projekti, ki so povezani s tem partnerjem
 NoTasks=Ni nalog za ta projekt
 LinkedToAnotherCompany=Povezane z drugimi partnerji
-TaskIsNotAffectedToYou=Naloga ni namenjena vam
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Ni porabljenega časa
 ThisWillAlsoRemoveTasks=Ta aktivnost bo tudi izbrisala vse naloge projekta (<b>%s</b> trenutne naloge) in vse vnose porabljenega časa.
 IfNeedToUseOhterObjectKeepEmpty=Če nekateri objekti (računi, naročila, ...), ki pripadajo drugemu partnerju, morajo biti vezani na projekt, ki se kreira, pustite polje prazno, da je projekt lahko vezan na več partnerjev.
-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
+CloneProject=Kloniraj projekt
+CloneTasks=Kloniraj naloge
+CloneContacts=Kloniraj kontakte
+CloneNotes=Kloniraj opombe
+CloneProjectFiles=Kloniraj skupne datoteke projekta
+CloneTaskFiles=Kloniraj skupno(e) datoteko(e) naloge (če je bila naloga klonirana)
+ConfirmCloneProject=Ali zares želite klonirati ta projekt?
+ProjectReportDate=Spremenite datum naloge glede na začetni datum projekta
+ErrorShiftTaskDate=Nemogoče je spremeniti datum naloge glede na nov začetni datum projekta
+ProjectsAndTasksLines=Projekti in naloge
+ProjectCreatedInDolibarr=Projekt %s je bil ustvarjen
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -118,13 +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
+SelectElement=Izberi element
+AddElement=Povezava do elementa
+UnlinkElement=Nepovezan element
 # Documents models
 DocumentModelBaleine=Model poročila za celoten projekt (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+PlannedWorkload = Planirana delovna obremenitev
+WorkloadOccupation= Pretvarjanje delovne obremenitve
+ProjectReferers=Referenčni objekti
+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 2185f869726..d36f18d27ac 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Statistika na osnovi potrjenih pošiljk. Uporablje
 DateDeliveryPlanned=Planiran datum dobave
 DateReceived=Datum prejema dobave
 SendShippingByEMail=Pošlji odpremnico po e-mailu
-SendShippingRef=Pošlji odpremnico %s
+SendShippingRef=Oddaja pošiljke %s
 ActionsOnShipping=Aktivnosti v zvezi z odpremnico
 LinkToTrackYourPackage=Povezave za sledenje vaše pošiljke
 ShipmentCreationIsDoneFromOrder=Za trenutek je oblikovanje nove pošiljke opravi od naročila kartice.
 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
@@ -72,3 +74,7 @@ DocumentModelTyphon=Popolnejši vzorec dobavnice (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined==
 SumOfProductVolumes=Vsota volumnov proizvodov
 SumOfProductWeights=Vsota tež proizvodov
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/sl_SI/shop.lang b/htdocs/langs/sl_SI/shop.lang
deleted file mode 100644
index 369edcaa29a..00000000000
--- a/htdocs/langs/sl_SI/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Povezava z bazo podatkov oscommerce ni uspela. Preverite nastavitve modula
-Shop=Trgovina
-ShopWeb=Spletna trgovina
-LastOrders=Zadnja naročila
-OnStandBy=Na čakanju
-TreatmentInProgress=Obdelava v teku
-LastCustomers=Zadnje stranke
-OSCommerceShop=OSCommerce trgovina
-OSCommerce=OSCommerce
-AddProd=Spletna prodaja
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 <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> 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 <b>%s</b> bo uporabljeno za zmanjšanje zaloge
+WarehouseForStockIncrease=Skladišče <b>%s</b> 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/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index 283374dce1c..5fb3d415dac 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Kreirajte račun dobavitelja
 ListOfSupplierProductForSupplier=Seznam proizvodov in cen dobavitelja <b>%s</b>
 NoneOrBatchFileNeverRan=Nobena datoteka ali paket <b>%s</b> nedavno ni bila zagnana
 SentToSuppliers=Pošlji dobaviteljem
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang
index 483dcc9b29a..ae053137a54 100644
--- a/htdocs/langs/sl_SI/trips.lang
+++ b/htdocs/langs/sl_SI/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Pot
 ListTripsAndExpenses=Seznam poti in stroškov
 ExpensesArea=Področje poti in stroškov
 SearchATripAndExpense=Iskanje poti in stroška
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index ec1979fdc56..f12efa61626 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 b91bcb1f323..a24c678a2e5 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Events
 ActionsArea=Events area (Actions and tasks)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendar
+Calendars=Calendars
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+Events=Events
 EventsNb=Number of events
 MyEvents=My events
 OtherEvents=Other events
@@ -17,31 +19,33 @@ ListOfActions=List of events
 Location=Location
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 3041825db57..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 27c4fc44394..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 1b2ea17215b..5580d87b517 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 728661dfa04..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
@@ -30,3 +30,9 @@ SearchADonation=Search a donation
 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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
index 58579a74276..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Name and signature of intervening :
 NameAndSignatureOfExternalContact=Name and signature of customer :
 DocumentModelStandard=Standard document model for interventions
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Classify "Billed"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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.<br><br>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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 039d47f6aa9..f6111bac684 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated.
 DateDeliveryPlanned=Planed date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
-SendShippingRef=Send shipment %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
 ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
 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
@@ -72,3 +74,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/sq_AL/shop.lang b/htdocs/langs/sq_AL/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/sq_AL/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index fdc0787646a..b1545d6ca3c 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
 NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
 SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index 06d46c7ac65..4b0501a8346 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Trip
 ListTripsAndExpenses=List of trips and expenses
 ExpensesArea=Trips and expenses area
 SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..9e3a4d80c03
--- /dev/null
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Redovisning
+Globalparameters=Globala parametrar
+Chartofaccounts=Kontoplan
+Fiscalyear=Räkenskapsår
+Menuaccount=Redovisnings konton
+Menuthirdpartyaccount=Tredjeparts konton
+MenuTools=Verktyg
+
+ConfigAccountingExpert=Konfiguration av modulen redovisningsexpert
+Journaux=Journaler
+JournalFinancial=Finansiella journaler
+Exports=Export
+Modelcsv=Modell av export
+Selectmodelcsv=Välj en modell av export
+Modelcsv_normal=Klassisk export
+Modelcsv_CEGID=Export mot CEGID Expert
+BackToChartofaccounts=Avkastning kontoplan
+Back=Avkastning
+
+Definechartofaccounts=Definiera en kontoplan
+Selectchartofaccounts=Välj en kontoplan
+Validate=Validera
+Addanaccount=Lägg till ett redovisningskonto
+AccountAccounting=Redovisningskonto
+Ventilation=Fördelning
+ToDispatch=Avsändandet
+Dispatched=Levereras
+
+CustomersVentilation=Fördelning kunder
+SuppliersVentilation=Fördelning leverantörerna
+TradeMargin=Handelsmarginal
+Reports=Rapporter
+ByCustomerInvoice=Enligt faktura kunder
+ByMonth=Enligt månad
+NewAccount=Nytt redovisningskonto
+Update=Uppdatera
+List=Lista
+Create=Skapa
+UpdateAccount=Ändring av ett redovisningskonto
+UpdateMvts=Ändring av en rörelse
+WriteBookKeeping=Record konton i huvudboken
+Bookkeeping=Huvudbok
+AccountBalanceByMonth=Saldo per månad
+
+AccountingVentilation=Uppdelning redovisning
+AccountingVentilationSupplier=Uppdelning redovisnings leverantör
+AccountingVentilationCustomer=Uppdelning redovisnings kund
+Line=Linje
+
+CAHTF=Totala köpesleverantörs HT
+InvoiceLines=Linjer av faktura som ska ventileras
+InvoiceLinesDone=Ventilerade linjer faktura
+IntoAccount=I bokföringskonto
+
+Ventilate=Ventilera
+VentilationAuto=Automatisk uppdelning
+
+Processing=Bearbetning
+EndProcessing=I slutet av behandlingen
+AnyLineVentilate=Några rader för att ventilera
+SelectedLines=Valda linjer
+Lineofinvoice=Line of faktura
+VentilatedinAccount=Ventilerade framgångsrikt i redovisningskonto
+NotVentilatedinAccount=Inte ventilerad i redovisningskonto
+
+ACCOUNTING_SEPARATORCSV=Separator CSV
+
+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.
+ACCOUNTING_LENGTH_GACCOUNT=Längd på de allmänna räkenskaperna
+ACCOUNTING_LENGTH_AACCOUNT=Längd av tredjepartskonton
+
+ACCOUNTING_SELL_JOURNAL=Sell ​​tidskrift
+ACCOUNTING_PURCHASE_JOURNAL=Bara tidskrift
+ACCOUNTING_BANK_JOURNAL=Bank tidskrift
+ACCOUNTING_CASH_JOURNAL=Cash journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverse tidskrift
+ACCOUNTING_SOCIAL_JOURNAL=Social tidskrift
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Redogörelse för överföring
+ACCOUNTING_ACCOUNT_SUSPENSE=Redogörelse för vänta
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Redovisning kontot som standard för köpta produkter (om den inte anges i produktbladet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Redovisning kontot som standard för de sålda produkterna (om den inte anges i produktbladet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Redovisning konto som standard för de köpte tjänster (om den inte anges i servicebladet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Redovisning kontot som standard för sålda tjänster (om den inte anges i servicebladet)
+
+Doctype=Typ av dokument
+Docdate=Datum
+Docref=Referens
+Numerocompte=Konto
+Code_tiers=Tredjeparts
+Labelcompte=Etikett konto
+Debit=Debit
+Credit=Kredit
+Amount=Belopp
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Ta bort posterna i huvudboken
+
+SellsJournal=Försäljnings journal
+PurchasesJournal=Inköp tidskrift
+DescSellsJournal=Sells tidskrift
+DescPurchasesJournal=Inköp tidskrift
+BankJournal=Bank tidskrift
+DescBankJournal=Bank journal inklusive alla typer av annat än pengar betalningar
+CashJournal=Cash journal
+DescCashJournal=Cash journal inklusive typ av betalning kontant
+
+CashPayment=Kontantbetalning
+
+SupplierInvoicePayment=Betalning av leverantörsfaktura
+CustomerInvoicePayment=Betalning av faktura kund
+
+ThirdPartyAccount=Tredjeparts konto
+
+NewAccountingMvt=Ny rörelse
+NumMvts=Antal rörelse
+ListeMvts=Lista över rörelsen
+ErrorDebitCredit=Debit och kredit kan inte ha ett värde på samma gång
+
+ReportThirdParty=Listan tredjeparts konto
+DescThirdPartyReport=Konsul här listan över de tredjeparts kunder och leverantörer och deras bokföringskonton
+
+ListAccounts=Förteckning över redovisningskonton
+
+Pcgversion=Version av planen
+Pcgtype=Klass konto
+Pcgsubtype=Under klass konto
+Accountparent=Roten till kontot
+Active=Uttalande
+
+NewFiscalYear=Nytt räkenskapsår
+
+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 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
+
+ValidateHistory=Validera Automatiskt
+
+ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
+
+FicheVentilation=Uppdelning kort
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index df00996dc65..264a54e753c 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,23 +37,27 @@ GUISetup=Visa
 SetupArea=Setup område
 FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar)
 IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
-RemoveLock=Ta bort filen <b>%s</b> om den finns så att uppdatera verktyget.
-RestoreLock=Ersätt en fil <b>%s</b> 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 <b>%s</b> om den finns godkänns uppdatering verktyget.
+RestoreLock=Ersätt en fil <b>%s</b> 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 <b>%s</b> stöds inte.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
+DictionarySetup=Lexikon inställnings
+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.
 ErrorCodeCantContainZero=Kod får inte innehålla värdet 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Inaktivera JavaScript och Ajax-funktioner (rekommenderas för blinda personer eller textbaserade webbläsare)
 ConfirmAjax=Använd Ajax bekräftelse popups
-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=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant COMPANY_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
+UseSearchToSelectCompany=Använd automatisk komplettering fält för att välja tredje man istället för att använda en listruta.
 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=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=Även om du har ett stort antal tredje parter (> 100 000), kan du öka hastigheten genom att sätta konstant CONTACT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
+UseSearchToSelectContact=Använd automatisk komplettering fält för att välja kontakt (istället för att använda en listruta).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Sök filter alternativ
 NumberOfKeyToSearch=NBR tecken för att utlösa Sök: %s
 ViewFullDateActions=Visa fullständig datum åtgärder i tredje blad
@@ -65,8 +69,8 @@ ShowPreview=Visa förhandsgranskning
 PreviewNotAvailable=Förhandsgranska inte tillgänglig
 ThemeCurrentlyActive=Tema för tillfället
 CurrentTimeZone=PHP server tidszon
-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).
+MySQLTimeZone=Timezone MySql (databas)
+TZHasNoEffect=Datum lagras och returneras av databasserver som om de hålls som LAGTS sträng. Den tidszon har effekt endast vid användning UNIX_TIMESTAMP funktion (som inte bör användas av Dolibarr, så databas TZ ska ha någon effekt, även om det ändras efter uppgifterna angavs).
 Space=Space
 Table=Tabell
 Fields=Fält
@@ -75,8 +79,8 @@ Mask=Mask
 NextValue=Nästa värde
 NextValueForInvoices=Nästa värde (fakturor)
 NextValueForCreditNotes=Nästa värde (kreditnotor)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=Nästa värde (deposition)
+NextValueForReplacements=Nästa värde (ersättare)
 MustBeLowerThanPHPLimit=Obs: Din PHP gränser varje filuppladdning storlek till <b>%s</b> %s, oavsett denna parameter värde är
 NoMaxSizeByPHPLimit=Obs: Ingen gräns som anges i din PHP konfiguration
 MaxSizeForUploadedFiles=Maximala storleken för uppladdade filer (0 att förkasta varje uppladdning)
@@ -88,7 +92,7 @@ AntiVirusParam= Fler parametrar på kommandoraden
 AntiVirusParamExample= Exempel för ClamWin - databas = &quot;C: \\ Program Files (x86) \\ ClamWin \\ lib&quot;
 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)
@@ -96,17 +100,17 @@ 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
-IdModule=Module ID
-IdPermissions=Permissions ID
+IdModule=Modul ID
+IdPermissions=Behörighet ID
 Modules=Moduler
 ModulesCommon=Huvudmoduler
 ModulesOther=Andra moduler
@@ -118,22 +122,22 @@ LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Lokalisering parametrar
 ClientTZ=Kund tidzon (användare)
 ClientHour=Kund tid (användare)
-OSTZ=Server OS Time Zone
+OSTZ=Server OS tidszon
 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
-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"
+YouCanEditPHPTZ=För att ställa in en annan PHP tidszon (inget krav), kan du försöka lägga till en fil .htacces med en rad som denna "setenv TZ Europe / Paris"
 OSEnv=OS Miljö
 Box=Låda
 Boxes=Lådor
 MaxNbOfLinesForBoxes=Max antal rader om lådor
 PositionByDefault=Standard för
-Position=Beställ
+Position=Position
 MenusDesc=Menyer chefer definiera innehållet i de två menyrader (horisontal och vertikal bar).
 MenusEditorDesc=Menyn redaktör kan du definiera anpassade poster i menyer. Använd den försiktigt för att undvika att göra dolibarr instabila och menyposter permanent otillgänglig. <br> Vissa moduler lägga till poster i menyerna (i menyn <b>i</b> de flesta fall). Om du har tagit bort några av dessa uppgifter av misstag kan du återställa dem genom att inaktivera och reenabling modulen.
 MenuForUsers=Meny för användare
@@ -169,7 +173,7 @@ ImportMethod=Import metoden
 ToBuildBackupFileClickHere=Att bygga en backup fil, klicka <a href="%s">här</a> .
 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 &lt;mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Filnamn för att generera
 Compression=Komprimering
@@ -193,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å &quot;Aktivera&quot; 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 <a href="%s">aktiverade moduler</a> 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.
@@ -206,6 +210,7 @@ ModulesJobDesc=Business moduler ge enkla fördefinierade inställningar för Dol
 ModulesMarketPlaceDesc=Du kan hitta fler moduler för att ladda ner på externa webbplatser på Internet ...
 ModulesMarketPlaces=Fler moduler ...
 DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Webbplats leverantörer kan du söka för att hitta fler moduler ...
 URL=Länk
 BoxesAvailable=Rutor
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=Automatisk om Javascript är avstängt
 AvailableOnlyIfJavascriptNotDisabled=Endast tillgängligt om JavaScript är inte oduglig
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Endast tillgängligt om JavaScript är inte oduglig
 Required=Obligatorisk
+UsedOnlyWithTypeOption=Används av en viss agenda alternativet
 Security=Säkerhet
 Passwords=Lösenord
 DoNotStoreClearPassword=Har ingen butik tydlig lösenord i databasen, men endast lagra krypterade värde (Aktiverad rekommenderas)
@@ -235,7 +241,7 @@ OfficialWebSiteFr=Officiella franska hemsida
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Officiella marknadsplats för externa moduler / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWebHostingService=Refererade webbhotell (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Autres ressources
 ForDocumentationSeeWiki=För användarens eller utvecklarens dokumentation (Doc, FAQs ...), <br> ta en titt på Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPs Host (Ej definierad i
 MAIN_MAIL_EMAIL_FROM=Avsändare e-post för automatisk e-post (som standard i php.ini: <b>%s)</b>
 MAIN_MAIL_ERRORS_TO=Avsändarens e-postadress används för fel returer e-post skickas
 MAIN_MAIL_AUTOCOPY_TO= Skicka systematiskt en dold kol-kopia av alla skickade email till
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Skicka systematiskt en dold kol-kopia av förslag skickas med e-post till
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Skicka systematiskt en dold kol-kopia av order skickas med e-post till
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Skicka systematiskt en dold kol-kopia på faktura skickas med e-post till
 MAIN_DISABLE_ALL_MAILS=Inaktivera alla e-postmeddelanden sendings (på försök eller demos)
 MAIN_MAIL_SENDMODE=Metod för att skicka e-post
 MAIN_MAIL_SMTPS_ID=SMTP-ID om autentisering krävs
@@ -290,13 +299,13 @@ UnpackPackageInDolibarrRoot=Packa upp paketet fil till Dolibarr s katalog <b>%s<
 SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten.
 NotExistsDirect=Den alternativa rotkatalogen är inte definierad.<br>
 InfDirAlt=Sedab version 3 är det möjligt att definiera en alternativ rotkatalog. Detta medger en gemensam plats att lagra plugin och anpassade mallar.<br>Skapa en katalog i Dolibarrs rot (t.ex. custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
+InfDirExample=<br> Sedan förklara den i filen conf.php <br> $ Dolibarr_main_url_root_alt = 'http: // myserver / anpassad " <br> $ Dolibarr_main_document_root_alt = '/ sökväg / till / Dolibarr / htdocs / anpassad " <br> * Dessa linjer kommen med "#", för att kommentera bort bara ta bort tecknet.
 YouCanSubmitFile=Välj modul:
 CurrentVersion=Dolibarr nuvarande version
 CallUpdatePage=Gå till sidan som uppdaterar databasen struktur och data: %s.
 LastStableVersion=Senaste stabila version
 GenericMaskCodes=Du kan ange någon numrering mask. I denna mask skulle följande taggar användas: <br> <b>(000000)</b> motsvarar ett antal som kommer att ökas på varje %s. Ange så många nollor som den önskade längden på disken. Räknaren kommer att fyllas ut med nollor från vänster för att få så många nollor som masken. <br> <b>(000000 000)</b> samma som tidigare men en kompensation som motsvarar det antal till höger om tecknet + tillämpas med början den första %s. <br> <b>(000000 @ x)</b> samma som tidigare, men räknaren återställs till noll när månaden x uppnås (x mellan 1 och 12). Om detta alternativ används och x är 2 eller högre, då sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) krävs också. <br> <b>(Dd)</b> dag (01 till 31). <br> <b>(Mm)</b> månad (01 till 12). <br> <b>(Yy), (ÅÅÅÅ) eller (y)</b> år under 2, 4 eller ett nummer. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{Cccc}</b> klientkoden på n tecken <br> <b>{Cccc000}</b> klientkoden på n tecken följs av en räknare dedikerad för kunden. Denna räknare tillägnad kund återställs vid samma tidpunkt än den globala räknare. <br> <b>{Tttt}</b> Koden för tredjeparts typ på n tecken (se ordlistan-tredjeparts typer). <br>
 GenericMaskCodes3=Alla andra tecken i masken förblir intakt. <br> Blanksteg är inte tillåtna. <br>
 GenericMaskCodes4a=<u>Exempel på 99. %s den tredje part TheCompany gjort 2007/01/31:</u> <br>
 GenericMaskCodes4b=<u>Exempel på tredje part som har skapats på 2007/03/01:</u> <br>
@@ -308,7 +317,7 @@ ServerNotAvailableOnIPOrPort=Servern är inte tillgänglig på adress <b>%s</b>
 DoTestServerAvailability=Test serveranslutning
 DoTestSend=Testa att skicka
 DoTestSendHTML=Testa att skicka HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Fel, kan inte använda alternativet @ för att återställa räknaren varje år om sekvens {åå} eller {yyyy} inte är i mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fel, kan inte använda alternativet @ om sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) inte är i mask.
 UMask=Umask parameter för nya filer på Unix / Linux / BSD-filsystemet.
 UMaskExplanation=Denna parameter gör att du kan definiera behörigheter som standard på filer skapade av Dolibarr på servern (under upp till exempel). <br> Det måste vara det oktala värdet (till exempel 0666 innebär läsa och skriva för alla). <br> Denna parameter är meningslöst på en Windows server.
@@ -356,7 +365,7 @@ GetSecuredUrl=Få beräknat URL
 ButtonHideUnauthorized=Visa ej knappar för åtgärder för vilka behörighet saknas istället för att visa knapparna inaktiverade
 OldVATRates=Gammal momssats
 NewVATRates=Ny momssats
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
+PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
 MassConvert=Starta masskonvertering
 String=String
 TextLong=Lång text
@@ -373,29 +382,29 @@ ExtrafieldSelectList = Välj från tabell
 ExtrafieldSeparator=Avskiljare
 ExtrafieldCheckBox=Kryssruta
 ExtrafieldRadio=Radioknapp
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpselect=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ... <br><br> För att få en lista beroende på en annan: <br> 1, value1 | parent_list_code: parent_key <br> 2, värde2 | parent_list_code: parent_key
+ExtrafieldParamHelpcheckbox=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=Parametrar lista kommer från en tabell <br> Syntax: tabellnamn: label_field: id_field :: filtrering <br> Exempel: c_typent: libelle: id :: filter <br><br> Filtret kan vara ett enkelt test (t.ex. aktiv = 1) för att visa endast aktiv värde <br> Om du vill filtrera på extrafields använder syntaxt extra.fieldcode = ... (där fältkoden är koden för Mig &) <br><br> För att få en lista beroende på en annan: <br> c_typent: libelle: id: parent_list_code | parent_column: filter
 LibraryToBuildPDF=Katalog som används för att skapa PDF
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. 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.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-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:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+WarningUsingFPDF=Varning: Din <b>conf.php</b> innehåller direktiv <b>dolibarr_pdf_force_fpdf = 1.</b> Detta innebär att du använder fpdf bibliotek för att generera PDF-filer. Detta bibliotek är gammalt och inte stöder en mängd funktioner (Unicode, bild öppenhet, kyrilliska, arabiska och asiatiska språk, ...), så att du kan uppleva fel under PDF generation. <br> För att lösa detta och ha ett fullt stöd för PDF-generering, ladda ner <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotek</a> , sedan kommentera eller ta bort linjen <b>$ dolibarr_pdf_force_fpdf = 1,</b> och lägg istället <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
+LocalTaxDesc=Vissa länder tillämpar 2 eller 3 skatter på varje fakturarad. Om så är fallet, välj typ för andra och tredje skatte- och dess hastighet. Möjlig typ är: <br> 1: lokal skatt tillämpas på produkter och tjänster utan moms (moms inte tillämpas på lokal skatt) <br> 2: lokal skatt tillämpas på produkter och tjänster innan moms (moms beräknas på beloppet + localtax) <br> 3: lokal skatt tillämpas på produkter utan moms (moms inte tillämpas på lokal skatt) <br> 4: lokal skatt tillämpas på produkter innan moms (moms beräknas på beloppet + localtax) <br> 5: lokal skatt tillämpas på tjänster utan moms (moms inte tillämpas på lokal skatt) <br> 6: lokal skatt tillämpas på tjänster innan moms (moms beräknas på beloppet + localtax)
 SMS=SMS
 LinkToTestClickToDial=Skriv in ett telefonnummer att ringa upp för att visa en länk för att prova ClickToDial url för användare <strong>%s</strong>
 RefreshPhoneLink=Uppdatera länk
 LinkToTest=Väljbar länk genererad för användare <strong>%s</strong> (klicka på tfn-nummer för att prova)
 KeepEmptyToUseDefault=Lämna tom för standardvärde
 DefaultLink=Standardlänk
-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
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
+ValueOverwrittenByUserSetup=Varning, kan detta värde skrivas över av användarspecifik installation (varje användare kan ställa in sin egen clicktodial url)
+ExternalModule=Extern modul - Installerad i katalogen %s
+BarcodeInitForThirdparties=Mäss streckkod init för thirdparties
+BarcodeInitForProductsOrServices=Mass streckkod init eller återställning efter produkter eller tjänster
+CurrentlyNWithoutBarCode=För närvarande har <strong>du% s</strong> skivor <strong>på% s%</strong> s utan streckkod definieras.
+InitEmptyBarCode=Init värde för nästa% s tomma poster
 EraseAllCurrentBarCode=Radera alla nuvarande streckkoder
 ConfirmEraseAllCurrentBarCode=Vill du radera alla nuvarande streckkoder?
 AllBarcodeReset=Alla värden för streckkod har raderats
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+NoBarcodeNumberingTemplateDefined=Ingen numrering streckkod mall aktiverat i streckkodsmodul setup.
 NoRecordWithoutBarcodeDefined=Ingen post utan angivet värde för streckkod.
 
 # Modules
@@ -431,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=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -469,22 +478,18 @@ 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=Projects/Opportunities/Leads
+Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
 Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Desc=Förvaltning av särskilda kostnader som skatter, sociala avgifter, utdelningar och löner
 Module510Name=Löner
-Module510Desc=Management of employees salaries and payments
+Module510Desc=Förvaltning av de anställdas löner och betalningar
 Module600Name=Anmälningar
-Module600Desc=Skicka meddelanden via e-post på några Dolibarr affärshändelser till annans kontakter
+Module600Desc=Skicka e-postmeddelanden på vissa Dolibarr affärshändelser till kontakter tredjeparts (inställnings definieras på varje tredjeparts)
 Module700Name=Donationer
 Module700Desc=Donation ledning
-Module800Name=OSCommerce genom direkt databasåtkomst
-Module800Desc=Gränssnitt för att visa en OSCommerce eller OSCSS butik via direkta databasåtkomst
-Module900Name=OSCommerce av WS
-Module900Desc=Gränssnitt för att visa en OSCommerce butik via webbtjänster. Denna modul requiere du installera komponenter från / oscommerce_ws / ws_server i din OSCommerce server. Se README-filen i / oscommerce_ws / ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Bokföring
@@ -493,6 +498,8 @@ Module1780Name=Kategorier
 Module1780Desc=Categorie ledning (produkter, leverantörer och kunder)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=Hantera planlagda uppgifter
 Module2400Name=Agenda
@@ -501,35 +508,41 @@ Module2500Name=Electronic Content Management
 Module2500Desc=Spara och dela dokument
 Module2600Name=WebServices
 Module2600Desc=Aktivera Dolibarr webbtjänster server
+Module2650Name=WebServices (client)
+Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Använder online Gravatar tjänst (www.gravatar.com) för att visa foto av användare / medlemmar (hittade med sin e-post). Behöver en internet
-Module2800Desc=FTP Client
+Module2800Desc=FTP-klient
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind omvandlingar kapacitet
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Lägga till en Skype-knapp i kort anhängare / tredje man / kontakter
 Module5000Name=Multi-bolag
 Module5000Desc=Gör att du kan hantera flera företag
 Module6000Name=Workflow
 Module6000Desc=Workflow management
-Module20000Name=Ledighet
-Module20000Desc=Deklarera och följ anställdas ledighet
+Module20000Name=Lämna Framställningar förvaltning
+Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar
+Module39000Name=Produktsats
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul för att erbjuda en online-betalning sidan genom kreditkort med Paybox
 Module50100Name=Point of sales
 Module50100Desc=Point of sales modul
-Module50200Name= Paypal
-Module50200Desc= Modul för att erbjuda en online-betalning sidan med kreditkort med Paypal
+Module50200Name=Paypal
+Module50200Desc=Modul för att erbjuda en online-betalning sidan med kreditkort med Paypal
+Module50400Name=Redovisning (avancerad)
+Module50400Desc=Bokföring och redovisning (dubbla parter)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
+Module55000Name=Öppen Poll
+Module55000Desc=Modul för att göra online omröstningar (som Doodle, öar Rdvz, ...)
+Module59000Name=Marginaler
+Module59000Desc=Modul för att hantera marginaler
+Module60000Name=Provision
+Module60000Desc=Modul för att hantera uppdrag
+Module150010Name=Batchnummer, äter före-datum och bäst före-datum
+Module150010Desc=batchnummer, äter före-datum och bäst före-datum hantering för produkt
 Permission11=Läs fakturor
 Permission12=Skapa / ändra fakturor
 Permission13=Unvalidate fakturor
@@ -575,13 +588,10 @@ Permission92=Skapa / ändra sociala avgifter och moms
 Permission93=Ta bort sociala avgifter och moms
 Permission94=Export sociala avgifter
 Permission95=Läs rapporter
-Permission96=Setup avsändning
-Permission97=Läs faktura bokföring expedierar
-Permission98=Dispatch fakturornas bokföringsposter
 Permission101=Läs sendings
 Permission102=Skapa / ändra sendings
 Permission104=Validate sendings
-Permission106=Export sendings
+Permission106=Exportsend
 Permission109=Ta bort sendings
 Permission111=Läs finansiella räkenskaper
 Permission112=Skapa / ändra / radera och jämför transaktioner
@@ -603,15 +613,16 @@ 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
-Permission171=Läs resor
-Permission172=Skapa / modifiera resor
-Permission173=Ta bort resor
-Permission178=Export resor
+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
+Permission174=Läsa alla resor och kostnader
+Permission178=Export resor och kostnader
 Permission180=Läs leverantörer
 Permission181=Läs leverantör order
 Permission182=Skapa / ändra leverantör order
@@ -638,9 +649,9 @@ Permission221=Läs emailings
 Permission222=Skapa / ändra emailings (ämne, mottagare ...)
 Permission223=Validera emailings (medger sändning)
 Permission229=Ta bort emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission237=Visa mottagare och info
+Permission238=Skicka försändelserna manuellt
+Permission239=Radera utskick efter validering eller skickas
 Permission241=Läs kategorier
 Permission242=Skapa / ändra kategorier
 Permission243=Ta bort kategorier
@@ -668,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
@@ -685,10 +696,10 @@ Permission401=Läs rabatter
 Permission402=Skapa / ändra rabatter
 Permission403=Validate rabatter
 Permission404=Ta bort rabatter
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission510=Läs Löner
+Permission512=Skapa / ändra löner
+Permission514=Radera löner
+Permission517=Export löner
 Permission531=Läs tjänster
 Permission532=Skapa / modifiera tjänster
 Permission534=Ta bort tjänster
@@ -699,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
@@ -722,7 +733,7 @@ Permission1233=Validate leverantörsfakturor
 Permission1234=Ta bort leverantörsfakturor
 Permission1235=Skicka leverantörsfakturor via e-post
 Permission1236=Export leverantörsfakturor, attribut och betalningar
-Permission1237=Export supplier orders and their details
+Permission1237=Export leverantörsorder och tillhörande information
 Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
 Permission1421=Export kundorder och attribut
@@ -740,44 +751,45 @@ Permission2501=Läsa dokument
 Permission2502=Skicka eller ta bort dokument
 Permission2503=Lämna eller ta bort dokument
 Permission2515=Setup dokument kataloger
-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
+Permission2801=Använd FTP-klient i läsläge (bläddra och ladda endast)
+Permission2802=Använd FTP-klient i skrivläge (radera eller ladda upp filer)
+Permission50101=Användning Försäljningsställen
 Permission50201=Läs transaktioner
 Permission50202=Importera transaktioner
 Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
+Permission55001=Läs omröstningar
+Permission55002=Skapa / ändra omröstningar
+Permission59001=Läs kommersiella marginaler
+Permission59002=Definiera kommersiella marginaler
+DictionaryCompanyType=Thirdparties typ
+DictionaryCompanyJuridicalType=Juridiska sorters thirdparties
+DictionaryProspectLevel=Prospect potentiella nivå
+DictionaryCanton=Statliga / kantoner
+DictionaryRegion=Regioner
+DictionaryCountry=Länder
+DictionaryCurrency=Valutor
+DictionaryCivility=Civility titel
+DictionaryActions=Typ av dagordningen händelser
+DictionarySocialContributions=Sociala avgifter typer
+DictionaryVAT=Moms Priser och Sales Tax Rates
+DictionaryRevenueStamp=Mängd skattestämpel
+DictionaryPaymentConditions=Betalningsvillkor
+DictionaryPaymentModes=Betalningssätten
+DictionaryTypeContact=Kontakt / adresstyper
+DictionaryEcotaxe=Miljöskatt (WEEE)
+DictionaryPaperFormat=Pappersformat
+DictionaryFees=Typ av avgifter
+DictionarySendingMethods=Fraktmetoder
+DictionaryStaff=Personal
+DictionaryAvailability=Leveransförsening
+DictionaryOrderMethods=Beställningsmetoder
 DictionarySource=Ursprung av affärsförslag / beställning
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
+DictionaryAccountancyplan=Kontoplan
+DictionaryAccountancysystem=Modeller för kontoplan
+DictionaryEMailTemplates=Emails templates
 SetupSaved=Setup sparas
 BackToModuleList=Tillbaka till moduler lista
-BackToDictionaryList=Back to dictionaries list
+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: <br> Om säljaren är föremål för mervärdesskatt, då moms som standard = 0. Slut på regeln. <br> 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. <br> 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. <br> 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. <br> Om säljaren och köparen i Europeiska gemenskapen och köparen är ett företag, då moms som standard = 0. Slut på regeln. <br> Else föreslagna standard moms = 0. Slut på regeln.
@@ -785,19 +797,19 @@ VATIsNotUsedDesc=Som standard föreslås moms 0 som kan användas för de fall s
 VATIsUsedExampleFR=I Frankrike betyder det företag eller organisationer som har en verklig skattesystemet (förenklad verkliga eller normal verklig). Ett system där mervärdesskatt ska deklareras.
 VATIsNotUsedExampleFR=I Frankrike betyder det föreningar som inte är moms deklarerats eller företag, organisationer eller fria yrken som har valt mikroföretag skattesystemet (mervärdesskatt i franchise) och betalade en franchise moms utan momsdeklaration. Detta val kommer att visa referens &quot;Ej tillämpligt mervärdesskatt - konst-293B av CGI&quot; på fakturorna.
 ##### 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
+LTRate=Betyg
+LocalTax1IsUsed=Använda andra skatte
+LocalTax1IsNotUsed=Använd inte andra skatte
+LocalTax1IsUsedDesc=Använd en annan typ av skatt (exklusive moms)
+LocalTax1IsNotUsedDesc=Använd inte andra typer av skatt (exklusive moms)
+LocalTax1Management=Andra typen av skatt
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2IsUsed=Använd tredje skatt
+LocalTax2IsNotUsed=Använd inte tredje skatt
+LocalTax2IsUsedDesc=Använd en tredje typ av skatt (exklusive moms)
+LocalTax2IsNotUsedDesc=Använd inte andra typer av skatt (exklusive moms)
+LocalTax2Management=Tredje typen av skatt
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE Förvaltning
@@ -810,13 +822,13 @@ LocalTax2IsUsedDescES= RE räntesats som standard när du skapar framtidsutsikte
 LocalTax2IsNotUsedDescES= Som standard föreslås IRPF är 0. Slut på regeln.
 LocalTax2IsUsedExampleES= I Spanien, frilansare och oberoende yrkesutövare som tillhandahåller tjänster och företag som har valt skattesystemet i moduler.
 LocalTax2IsNotUsedExampleES= I Spanien de bussines inte omfattas av skattesystemet i moduler.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax=Rapporter
+CalcLocaltax1ES=Försäljning - Inköp
+CalcLocaltax1Desc=Lokala skatter rapporter beräknas med skillnaden mellan localtaxes försäljning och localtaxes inköp
+CalcLocaltax2ES=Inköp
+CalcLocaltax2Desc=Lokala skatter rapporter är summan av localtaxes inköp
+CalcLocaltax3ES=Försäljning
+CalcLocaltax3Desc=Lokala skatter rapporter är summan av localtaxes försäljning
 LabelUsedByDefault=Etikett som används som standard om ingen översättning kan hittas för kod
 LabelOnDocuments=Etikett på dokument
 NbOfDays=Nb dagar
@@ -841,7 +853,7 @@ PhpConf=Conf
 PhpWebLink=Webb-php länk
 Pear=Päron
 PearPackages=Päron paket
-Browser=Browser
+Browser=Webbläsare
 Server=Server
 Database=Databas
 DatabaseServer=Databas värd
@@ -868,7 +880,7 @@ MenuCompanySetup=Företag / stiftelsen
 MenuNewUser=Ny användare
 MenuTopManager=Toppmenyn chef
 MenuLeftManager=Vänstermenyn chef
-MenuManager=Menu manager
+MenuManager=Menyhanteraren
 MenuSmartphoneManager=Smartphone menyhanteraren
 DefaultMenuTopManager=Toppmenyn chef
 DefaultMenuLeftManager=Vänstermenyn chef
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Default språk att använda (språkkod)
 EnableMultilangInterface=Aktivera flerspråkigt gränssnitt
 EnableShowLogo=Visa logotypen på vänstra menyn
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Att ditt system har uppdaterats
 CompanyInfo=Företag / stiftelse information
 CompanyIds=Företag / stiftelse identiteter
@@ -927,14 +940,14 @@ SetupDescription5=Andra menyalternativ hantera valfria parametrar.
 EventsSetup=Setup för händelser stockar
 LogEvents=Säkerhetsgranskning evenemang
 Audit=Revision
-InfoDolibarr=Infos Dolibarr
-InfoBrowser=Infos Browser
-InfoOS=Infos OS
-InfoWebServer=Infos web server
-InfoDatabase=Infos database
-InfoPHP=Infos PHP
-InfoPerf=Infos performances
-BrowserName=Browser name
+InfoDolibarr=Information Dolibarr
+InfoBrowser=Information Browser
+InfoOS=Information om OS
+InfoWebServer=Information om webbserver
+InfoDatabase=Information om databasen
+InfoPHP=Information om PHP
+InfoPerf=Information om uppträdanden
+BrowserName=Browser namn
 BrowserOS=Browser OS
 ListEvents=Revision evenemang
 ListOfSecurityEvents=Förteckning över Dolibarr säkerhetshändelser
@@ -956,7 +969,7 @@ TriggerDisabledAsModuleDisabled=Triggers i denna fil är funktionshindrade modul
 TriggerAlwaysActive=Triggers i denna fil är alltid aktiva, oavsett är det aktiverade Dolibarr moduler.
 TriggerActiveAsModuleActive=Triggers i denna fil är verksamma som modul <b>%s</b> är aktiverat.
 GeneratedPasswordDesc=Ange här vilken regel du vill använda för att generera nytt lösenord om du begära att få automatiskt genererat lösenord
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Här definierar du alla referens datas. Du kan komplettera fördefinierat värde med din.
 ConstDesc=Denna sida kan du redigera alla andra parametrar som inte fanns i tidigare sidor. De är reserverade parametrar för avancerade utvecklare eller troubleshouting.
 OnceSetupFinishedCreateUsers=Varning, du är en Dolibarr administratör. Administratör användare används för att ställa in Dolibarr. För en vanlig användning av Dolibarr, rekommenderas att använda en icke administratör skapas från Användare & Grupper menyn.
 MiscellaneousDesc=Ange här alla andra parametrar som rör säkerhet.
@@ -978,7 +991,7 @@ BackupDesc2=* Spara innehållet i de dokument katalog <b>(%s)</b> som innehålle
 BackupDesc3=* Spara innehållet i din databas till en soptipp fil. för detta kan du använda följande assistent.
 BackupDescX=Arkiverade katalogen bör förvaras på ett säkert ställe.
 BackupDescY=Den genererade dumpfilen bör förvaras på ett säkert ställe.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
+BackupPHPWarning=Backup kan inte guaranted med denna metod. Föredrar tidigare ett
 RestoreDesc=Om du vill återställa en Dolibarr säkerhetskopia måste du:
 RestoreDesc2=* Återställ arkivfil (zip-fil till exempel) av handlingar katalog att extrahera träd av filer i dokument katalog med en ny Dolibarr anläggning eller i den här aktuella dokument directoy <b>(%s).</b>
 RestoreDesc3=* Återställ data från en säkerhetskopia dumpfil in i databasen av den nya Dolibarr installationen eller i databasen för den aktuella installationen. Varning när återställningen är klar måste du använda ett användarnamn / lösenord, som fanns när säkerhetskopian gjordes, att ansluta igen. Om du vill återställa en backup databas i den nuvarande installationen kan du följa denna assistent.
@@ -992,9 +1005,9 @@ YourPHPDoesNotHaveSSLSupport=SSL-funktioner inte är tillgängliga i din PHP
 DownloadMoreSkins=Mer skinn att ladda ner
 SimpleNumRefModelDesc=Returnera referensnummer format %syymm-nnnn där YY är år, mm månaden och nnnn är en sekvens utan hål och utan återställning
 ShowProfIdInAddress=Visa branschorganisationer id med adresser på dokument
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
+ShowVATIntaInAddress=Dölj moms Intra num med adresser på dokument
 TranslationUncomplete=Partiell översättning
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Vissa språk kan vara delvis översatt eller maj innehåller fel. Om du upptäcker några, kan du fixa språkfiler som registrerar till <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a> .
 MenuUseLayout=Gör vertikal meny hidable (tillval Javascript måste inte inaktiveras)
 MAIN_DISABLE_METEO=Inaktivera meteo vy
 TestLoginToAPI=Testa logga in API
@@ -1007,18 +1020,18 @@ MAIN_PROXY_USER=Logga in för att använda proxyservern
 MAIN_PROXY_PASS=Lösenord för att använda proxyservern
 DefineHereComplementaryAttributes=Här definierar du alla atributes inte redan finns tillgänglig som standard, och att du vill bli stöd för %s.
 ExtraFields=Komplementära egenskaper
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldsLines=Kompletterande attribut (rader)
+ExtraFieldsThirdParties=Kompletterande attribut (tredjeparts)
+ExtraFieldsContacts=Kompletterande attribut (kontaktperson / adress)
+ExtraFieldsMember=Kompletterande attribut (medlem)
+ExtraFieldsMemberType=Kompletterande attribut (ledamot typ)
+ExtraFieldsCustomerOrders=Kompletterande attribut (beslut)
+ExtraFieldsCustomerInvoices=Kompletterande attribut (fakturor)
+ExtraFieldsSupplierOrders=Kompletterande attribut (beslut)
+ExtraFieldsSupplierInvoices=Kompletterande attribut (fakturor)
+ExtraFieldsProject=Kompletterande attribut (projekt)
+ExtraFieldsProjectTask=Kompletterande attribut (arbetsuppgifter)
+ExtraFieldHasWrongValue=Attribut% s har ett felaktigt värde.
 AlphaNumOnlyCharsAndNoSpace=endast alfanumeriska tecken utan mellanslag
 AlphaNumOnlyLowerCharsAndNoSpace=endast gemena alfanumeriska tecken utan mellanslag
 SendingMailSetup=Inställning av sändningarna via e-post
@@ -1027,30 +1040,29 @@ PathToDocuments=Sökväg till handlingar
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Funktion för att skicka e-post med hjälp av metoden &quot;PHP mail direkt&quot; kommer att generera ett e-postmeddelande som kanske inte korrekt tolkas av vissa som får e-postservrar. Resultatet är att vissa post inte kan läsas av människor som tillhandahålls av thoose avlyssnat plattformar. Det är fallet för vissa Internetleverantörer (Ex: Orange i Frankrike). Detta är inte ett problem till Dolibarr heller i PHP, men på inkommande e-post server. Du kan dock lägga möjlighet MAIN_FIX_FOR_BUGGED_MTA till 1 i Setup - andra att ändra Dolibarr att undvika detta. Du kan dock uppleva problem med andra servrar som strikt respektera SMTP standard. Den andra lösningen (Rekomenderad) är att använda metoden &quot;SMTP socket bibliotek&quot; som inte har några nackdelar.
 TranslationSetup=Konfigurera översättning
-TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
+TranslationDesc=Val av språk visas på skärmen kan ändras: <br> * Globalt från menyn <strong>Hem - Inställningar - Display</strong> <br> * För användaren endast från fliken <strong>Användar visning</strong> av användarkort (klicka på inloggning på toppen av skärmen).
+TotalNumberOfActivatedModules=Totalt antal aktiverade <b>funktionsmoduler:% s</b>
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
 ClassNotFoundIntoPathWarning=Klass %s inte funnen i PHP-sökvägen
 YesInSummer=Ja, under sommaren
-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.
-SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+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
+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.
+SearchOptim=Sökoptimering
+YouHaveXProductUseSearchOptim=Du har %s produkter i databasen. Du bör lägga den ständiga PRODUCT_DONOTSEARCH_ANYWHERE till 1 till Home-Setup-Övrigt begränsar du sökningen till början av strängar som gör möjligt för databasen att använda index och du bör få ett omedelbart svar.
+BrowserIsOK=Du använder webbläsaren %s. Denna webbläsare är ok för säkerhet och prestanda.
+BrowserIsKO=Du använder webbläsaren %s. Denna webbläsare är känt för att vara ett dåligt val för säkerhet, prestanda och tillförlitlighet. Vi rekommendera att du använder Firefox, Chrome, Opera eller Safari.
+XDebugInstalled=Xdebug är laddad.
+XCacheInstalled=Xcache är laddad.
+AddRefInList=Display kund / leverantörs ref i listan (välj lista eller kombinationsrutan) och de flesta av hyperlänk
+FieldEdition=Edition av fält %s
+FixTZ=Timezone fix
+FillThisOnlyIfRequired=Exempel: +2 (fyll endast om tidszon offset problem är erfarna)
+GetBarCode=Få streckkod
+EmptyNumRefModelDesc=Koden är fri. Koden kan ändras när som helst.
 ##### Module password generation
 PasswordGenerationStandard=Återgå ett lösenord som genererats enligt interna Dolibarr algoritm: 8 tecken som innehåller delade siffror och tecken med gemener.
 PasswordGenerationNone=Tyder inte på någon genererade lösenord. Lösenord måste skriva in manuellt.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Avkastningen en bokföring kod byggd med %s följt av
 ModuleCompanyCodePanicum=Avkastningen en tom bokföring kod.
 ModuleCompanyCodeDigitaria=Bokföring kod beror på tredje part kod. Koden består av tecknet &quot;C&quot; i den första positionen och därefter det första fem bokstäver av tredje part koden.
 UseNotifications=Använd anmälningar
-NotificationsDesc=E-post meddelanden funktionen kan du tyst skicka automatiska e-post, för vissa Dolibarr evenemang, till tredje man (kunder eller leverantörer) som är konfigurerade för. Val av aktiva anmälan och mål kontakter görs en tredje part i taget.
+NotificationsDesc=E-post meddelanden funktionen kan du tyst skicka automatiska e-post, för vissa Dolibarr händelser. Mål av anmälningar kan definieras: <br> * Per tredje parter kontakter (kunder eller leverantörer), en tredje part vid tidpunkten. <br> * Eller genom att sätta ett globalt mål e-postadress på modulens inställningssida.
 ModelModules=Dokument mallar
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Generera dokument från OpenDocuments mallar (.odt eller .ods filer för Openoffice, KOffice, Textedit, ...)
 WatermarkOnDraft=Vattenstämpel utkast
+JSOnPaimentBill=Aktivera funktionen för att fylla automatiskt betalningslinjer på inbetalningskort
 CompanyIdProfChecker=Professionell Id unik
 MustBeUnique=Måste vara unikt?
 MustBeMandatory=Obligatoriskt att skapa tredje part?
@@ -1092,7 +1105,7 @@ WebCalServer=Server-hosting kalender databas
 WebCalDatabaseName=Databas namn
 WebCalUser=Användaren tillgång till databasen
 WebCalSetupSaved=WebCalendar setup sparats.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Anslutning till servern "% s" på databasen "% s" med användare "% s framgångsrika.
 WebCalTestKo1=Anslutning till servern &quot;%s&quot; lyckas, men databas %s &quot;kunde inte nås.
 WebCalTestKo2=Anslutning till servern &quot;%s&quot; med användare &quot;%s&quot; misslyckades.
 WebCalErrorConnectOkButWrongDatabase=Anslutning lyckats men databasen inte ser ut att vara en WebCalendar databas.
@@ -1134,14 +1147,16 @@ 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
 OrdersModelModule=Beställ dokument modeller
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Dölja de behandlade eller annullerade order i listan
 ValidOrderAfterPropalClosed=Att godkänna beställningen efter förslaget närmare, gör det möjligt att inte steg av den provisoriska ordning
 FreeLegalTextOnOrders=Fri text på order
 WatermarkOnDraftOrders=Vattenstämpel på utkast till beställningar (ingen om tom)
+ShippableOrderIconInList=Lägg en ikon i Order lista som anger om beställningen är shippable
 ##### Clicktodial #####
 ClickToDialSetup=Klicka för att Dial modul setup
 ClickToDialUrlDesc=Url anropas när ett klick på telefon picto görs. I URL kan du använda taggar <br> <b>__PHONETO__</b> Som kommer att ersättas med telefonnumret för personen att ringa <br> <b>__PHONEFROM__</b> Som ska ersättas med telefonnummer att ringa person (er) <br> <b>__LOGIN__</b> Som ska ersättas med clicktodial inloggning (definierad på ditt användarnamn kort) <br> <b>__PASS__</b> Som ska ersättas med ditt clicktodial lösenord (definierad på ditt användarnamn kort).
@@ -1154,11 +1169,11 @@ 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=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Contract documents modeller
+FreeLegalTextOnContracts=Fritext om avtal
+WatermarkOnDraftContractCards=Vattenstämpel på kontraktsförslag (inget om de är tomma)
 ##### Members #####
 MembersSetup=Medlemmar modul setup
 MemberMainOptions=Huvudalternativ
@@ -1227,15 +1242,15 @@ LDAPTestSynchroContact=Test kontakts synkronisering
 LDAPTestSynchroUser=Test användarens synkronisering
 LDAPTestSynchroGroup=Test gruppens synkronisering
 LDAPTestSynchroMember=Test medlemmens synkronisering
-LDAPTestSearch= Test a LDAP search
+LDAPTestSearch= Testa en LDAP-sökning
 LDAPSynchroOK=Synkronisering test framgångsrika
 LDAPSynchroKO=Misslyckades synkronisering test
 LDAPSynchroKOMayBePermissions=Misslyckades synkronisering test. Kontrollera att connexion att servern är korrekt konfigurerad och tillåter LDAP udpates
 LDAPTCPConnectOK=TCP ansluta till LDAP-servern framgångsrika (Server = %s, Port = %s)
 LDAPTCPConnectKO=TCP ansluta till LDAP-servern misslyckades (Server = %s, Port = %s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Anslut / Authentificate till LDAP-servern framgångsrik (Server =%s, Port =%s, Admin =%s, Lösenord = %s)
 LDAPBindKO=Anslut / Authentificate till LDAP-servern misslyckades (Server = %s, Port = %s, Admin = %s, Lösenord = %s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Koppla framgångsrik
 LDAPUnbindFailed=Koppla misslyckades
 LDAPConnectToDNSuccessfull=Anslutning au DN (%s) ri ¿½ ussie
 LDAPConnectToDNFailed=Anslutning au DN (%s) ï ¿½ chouï ¿½ e
@@ -1291,8 +1306,8 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Exempel: objectsid
 LDAPFieldEndLastSubscription=Datum för teckning slut
 LDAPFieldTitle=Post / Funktion
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPFieldTitleExample=Exempel: titel
+LDAPParametersAreStillHardCoded=LDAP parametrar fortfarande hårdkodad (i kontakt klass)
 LDAPSetupNotComplete=LDAP setup komplett inte (gå på andra flikar)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ingen administratör eller lösenord anges. LDAP tillgång kommer att bli anonym och i skrivskyddat läge.
 LDAPDescContact=På denna sida kan du ange LDAP-attribut namn i LDAP träd för varje data finns på Dolibarr kontakter.
@@ -1301,24 +1316,24 @@ LDAPDescGroups=På denna sida kan du ange LDAP-attribut namn i LDAP träd för v
 LDAPDescMembers=På denna sida kan du ange LDAP-attribut namn i LDAP träd för varje data finns på Dolibarr medlemmar modul.
 LDAPDescValues=Exempel på värden är avsedda för <b>OpenLDAP</b> med följande laddade scheman: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Om du använder thoose värderingar och OpenLDAP, ändra LDAP-fil <b>slapd.conf</b> config att ha alla thoose scheman laddad.
 ForANonAnonymousAccess=För en bestyrkt tillbehör (för en skrivåtkomst till exempel)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+PerfDolibarr=Prestanda inställningar / optimering rapport
+YouMayFindPerfAdviceHere=Du kommer att hitta på den här sidan vissa kontroller eller råd relaterade till prestanda.
+NotInstalled=Inte installerat, så din server inte sakta ner av detta.
+ApplicativeCache=Applikativ cache
+MemcachedNotAvailable=Ingen applikativ cache hittades. Du kan förbättra prestanda genom att installera en cache-server Memcached och en modul kunna använda denna cache-server. <br> Mer information här <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Observera att en hel del webbhotell leverantör inte lämnar sådana cache-server.
+MemcachedModuleAvailableButNotSetup=Modul memcached för applikativ cache hittades men installationen av modulen är inte fullständig.
+MemcachedAvailableAndSetup=Modul memcached tillägnad använda memcached server är aktiverad.
+OPCodeCache=OPCODE cache
+NoOPCodeCacheFound=Ingen opkod cache hittades. Får du använda en annan opcode cache än xcache eller eAccelerator (bra), kanske du inte har opkod cache (mycket dåligt).
+HTTPCacheStaticResources=HTTP-cache för statiska resurser (css, img, javascript)
+FilesOfTypeCached=Filer av typen %s cachelagras av HTTP-server
+FilesOfTypeNotCached=Filer av typen %s är inte cachas av HTTP-server
+FilesOfTypeCompressed=Filer av typen %s komprimeras med HTTP-server
+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=En sådan automatisk detektering är inte möjligt med nuvarande webbläsare
 ##### Products #####
 ProductSetup=Produkter modul setup
 ServiceSetup=Tjänster modul konfiguration
@@ -1328,13 +1343,13 @@ ConfirmDeleteProductLineAbility=Bekräftelse vid borttagning produktserier i for
 ModifyProductDescAbility=Anpassning av produktbeskrivning i former
 ViewProductDescInFormAbility=Visualisering av produktbeskrivning i formulären (i övrigt enligt popup tooltip)
 ViewProductDescInThirdpartyLanguageAbility=Visualisering av produktbeskrivningar på tredjeparts språket
-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=Även om du har ett stort antal produkter (> 100 000), kan du öka hastigheten genom att sätta konstant PRODUCT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
+UseSearchToSelectProduct=Använd ett sökformuläret för att välja en produkt (i stället för en listruta).
 UseEcoTaxeAbility=Stöd Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Standard streckkod som ska användas för produkter
 SetDefaultBarcodeTypeThirdParties=Standard streckkod som ska användas för tredje part
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
+ProductCodeChecker= Modul för produkt kodgenerering och kontroll (produkt eller tjänst)
+ProductOtherConf= Produkt / tjänst konfiguration
 ##### Syslog #####
 SyslogSetup=Syslog-modul setup
 SyslogOutput=Logga utgång
@@ -1345,7 +1360,7 @@ SyslogSimpleFile=Arkiv
 SyslogFilename=Filnamn och sökväg
 YouCanUseDOL_DATA_ROOT=Du kan använda DOL_DATA_ROOT / dolibarr.log för en loggfil i Dolibarr &quot;dokument&quot; katalogen. Du kan ställa in en annan väg för att lagra den här filen.
 ErrorUnknownSyslogConstant=Konstant %s är inte en känd syslog konstant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=Endast Windows stöder LOG_USER
 ##### Donations #####
 DonationsSetup=Donation modul setup
 DonationsReceiptModel=Mall för donation kvitto
@@ -1364,23 +1379,24 @@ BarcodeDescISBN=Barcode av typ ISBN
 BarcodeDescC39=Streckkod av typen C39
 BarcodeDescC128=Barcode av typ C128
 GenbarcodeLocation=Bar kodgenerering kommandoradsverktyg (som används av phpbarcode motor för vissa typer streckkod)
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeInternalEngine=Intern motor
+BarCodeNumberManager=Manager för att automatiskt definiera streckkodsnummer
 ##### Prelevements #####
 WithdrawalsSetup=Återkallelse modul setup
 ##### ExternalRSS #####
 ExternalRSSSetup=Externa RSS import setup
 NewRSS=Nytt RSS-flöde
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=En intressant RSS-flöde
 ##### Mailing #####
 MailingSetup=E-post modul setup
 MailingEMailFrom=Avsändare Epost (från) för e-post skickas via e-post modul
 MailingEMailError=Retur-e (fel-till) för e-post med fel
 ##### Notification #####
-NotificationSetup=Anmälan bu e-modul setup
+NotificationSetup=EMail modul anmälan inställnings
 NotificationEMailFrom=Avsändare Epost (från) för e-post som skickas till anmälningar
-ListOfAvailableNotifications=Lista över tillgängliga anmälningar (Denna listan beror på aktiverade moduler)
+ListOfAvailableNotifications=Förteckning över händelser som du kan ställa in en anmälan om, för varje tredjeparts (gå in tredjeparts kort att installera) eller genom att ange en fast e-post (Lista beror på aktiverade moduler)
+FixedEmailTarget=Fast e målet
 ##### Sendings #####
 SendingsSetup=Sända modul setup
 SendingsReceiptModel=Att skicka kvitto modell
@@ -1400,16 +1416,17 @@ FCKeditorForCompany=WYSIWYG skapande / upplaga av Companie beskrivning och noter
 FCKeditorForProduct=WYSIWYG skapande / upplaga av produkter / tjänster: s beskrivning och anteckning
 FCKeditorForProductDetails=WYSIWYG skapande / utgåva av produkter detaljer linjer för alla enheter (förslag, order, fakturor, etc. ..). <font class="warning">Varning: Använd detta alternativ för det här fallet är allvarligt inte rekommenderat eftersom det kan skapa problem med specialtecken och sida formationen för att bygga PDF filer.</font>
 FCKeditorForMailing= WYSIWYG skapande / utgåva av försändelser
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=WYSIWYG skapande / upplaga av signatur
+FCKeditorForMail=WYSIWYG skapande / utgåva för alla mail (utom Outils-> mejla)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Anslutning lyckats men databasen ser inte ut att vara en OSCommerce databas (Key %s som inte finns i tabellen %s).
 OSCommerceTestOk=Anslutning till servern &quot;%s&quot; på databas %s &quot;med användare&quot; %s framgångsrika.
 OSCommerceTestKo1=Anslutning till servern &quot;%s&quot; lyckas, men databas %s &quot;kunde inte nås.
 OSCommerceTestKo2=Anslutning till servern &quot;%s&quot; med användare &quot;%s&quot; 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
@@ -1444,11 +1461,11 @@ ConfirmDeleteLine=Är du säker på att du vill ta bort denna linje?
 ##### Tax #####
 TaxSetup=Skatter, sociala avgifter och utdelningar modul setup
 OptionVatMode=Mervärdesskatt
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Kontantmetoden
+OptionVATDebitOption=Periodiseringsprincipen
 OptionVatDefaultDesc=Mervärdesskatt skall betalas: <br> - Om leverans / betalning för varor <br> - Bestämmelser om betalningar för tjänster
 OptionVatDebitOptionDesc=Mervärdesskatt skall betalas: <br> - Om leverans / betalning för varor <br> - På fakturan (debet) för tjänster
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Tid för moms exigibility standard enligt vald alternativ:
 OnDelivery=Vid leverans
 OnPayment=Mot betalning
 OnInvoice=På faktura
@@ -1459,26 +1476,29 @@ Sell=Sälj
 InvoiceDateUsed=Fakturadatum används
 YourCompanyDoesNotUseVAT=Ditt företag har definierats att inte använda moms (Hem - Setup - Företaget / Foundation), så det finns ingen mervärdesskatt alternativ för installationen.
 AccountancyCode=Bokföring kod
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Försäljning konto. kod
+AccountancyCodeBuy=Köpa konto. kod
 ##### Agenda #####
 AgendaSetup=Åtgärder och dagordning modul setup
 PasswordTogetVCalExport=Viktiga att tillåta export länk
 PastDelayVCalExport=Inte exporterar fall äldre än
-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=Använd händelser typer (hanteras i inställningsmenyn -> ordlista -> Typ av dagordningen händelser)
+AGENDA_DEFAULT_FILTER_TYPE=Ställs in automatiskt denna typ av händelse till sökfilter av dagordning view
+AGENDA_DEFAULT_FILTER_STATUS=Ställs in automatiskt denna status för evenemang till sökfilter av dagordning view
+AGENDA_DEFAULT_VIEW=Vilken flik vill du öppna som standard vid val av meny Agenda
 ##### ClickToDial #####
 ClickToDialDesc=Denna modul gör det möjligt att lägga till en ikon efter telefonnummer. Ett klick på denna ikon för att kalla en server med en viss webbadress du anger nedan. Detta kan användas för att ringa ett system call center från Dolibarr som kan ringa upp telefonnumret på en SIP-system till exempel.
 ##### 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.
@@ -1502,10 +1522,10 @@ MultiCompanySetup=Multi-bolag modul setup
 SuppliersSetup=Leverantör modul setup
 SuppliersCommandModel=Fullständig mall av leverantör för (logo. ..)
 SuppliersInvoiceModel=Komplett mall leverantörsfaktura (logo. ..)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+SuppliersInvoiceNumberingModel=Leverantörsfakturor numrerings modeller
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Sökväg till fil innehåller MaxMind ip till land översättning. <br> Exempel: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Observera att ditt ip till land datafil måste vara inne i en katalog din PHP kan läsa (Kolla din PHP open_basedir inställningar och behörigheter filsystem).
 YouCanDownloadFreeDatFileTo=Du kan ladda ner en <b>gratis demoversion</b> av Maxmind GeoIP landet filen på %s.
 YouCanDownloadAdvancedDatFileTo=Du kan också ladda ner en mer <b>komplett version, med uppdateringar av</b> de Maxmind GeoIP landet filen på %s.
@@ -1514,22 +1534,31 @@ TestGeoIPResult=Test av en omvandling IP -> land
 ProjectsNumberingModules=Projekt numrering modul
 ProjectsSetup=Projekt modul setup
 ProjectsModelModule=S rapport dokument modell
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
+TasksNumberingModules=Uppgifter nummermodulen
+TaskModelModule=Uppgifter rapporter dokumentmodell
 ##### ECM (GED) #####
 ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMAutoTree = Automatisk träd mapp och dokument
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-
+FiscalYears=Räkenskapsår
+FiscalYear=Räkenskapsåret
+FiscalYearCard=Räkenskapsår kort
+NewFiscalYear=Nytt räkenskapsår
+EditFiscalYear=Redigera räkenskapsår
+OpenFiscalYear=Öppet räkenskapsår
+CloseFiscalYear=Close räkenskapsår
+DeleteFiscalYear=Radera räkenskapsår
+ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhetsår?
+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 4d13e7327ec..df18edf920f 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -1,64 +1,65 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
+IdAgenda=ID händelse
 Actions=Åtgärder
 ActionsArea=Åtgärder område (händelser och uppgifter)
-Agenda= Agenda
-Agendas= Dagordningar
-Calendar= Kalender
-Calendars= Kalendrar
-LocalAgenda=Lokal kalender
-AffectedTo= Påverkas i
-DoneBy= Utfärdat av
-Events= Evenemang
-EventsNb=Number of events
+Agenda=Agenda
+Agendas=Dagordningar
+Calendar=Kalender
+Calendars=Kalendrar
+LocalAgenda=Intern kalender
+ActionsOwnedBy=Händelse som ägs av
+AffectedTo=Påverkas i
+DoneBy=Utfärdat av
+Event=Händelse
+Events=Evenemang
+EventsNb=Antal händelser
 MyEvents=Mina aktiviteter
 OtherEvents=Övriga händelser
 ListOfActions=Lista över evenemang
 Location=Läge
 EventOnFullDay=Händelse heldag
 SearchAnAction= Sök en handling / uppgift
-MenuToDoActions= Alla ofullständiga handlingar
-MenuDoneActions= Alla avslutade åtgärder
-MenuToDoMyActions= Min ofullständiga handlingar
-MenuDoneMyActions= Min avslutas åtgärder
-ListOfEvents= Lista över Dolibarr händelser
+MenuToDoActions=Alla ofullständiga handlingar
+MenuDoneActions=Alla avslutade åtgärder
+MenuToDoMyActions=Min ofullständiga handlingar
+MenuDoneMyActions=Min avslutas åtgärder
+ListOfEvents=Förteckning över händelser (intern kalender)
 ActionsAskedBy=Åtgärder som registrerats av
 ActionsToDoBy=Åtgärder påverkas
 ActionsDoneBy=Åtgärder som utförs av
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
+ActionsForUser=Händelser för användaren
+ActionsForUsersGroup=Händelser för alla användare av grupp
+ActionAssignedTo=Event assigned to
 AllMyActions= Alla mina handlingar och uppgifter
 AllActions= Alla åtgärder / uppgifter
 ViewList=Visa lista
 ViewCal=Visa kalender
 ViewDay=Dagsvy
 ViewWeek=Veckovy
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= Visa med fördefinierade filter
 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=Invoice %s deleted
+InvoiceDeleteDolibarr=Faktura %s raderas
 OrderValidatedInDolibarr= Beställ %s validerade
 OrderApprovedInDolibarr=Ordningens %s godkänd
-OrderRefusedInDolibarr=Order %s refused
+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
 SupplierOrderSentByEMail=Leverantör beställa %s via e-post
 SupplierInvoiceSentByEMail=Leverantörsfaktura %s via e-post
 ShippingSentByEMail=Frakt %s via e-post
-ShippingValidated= Shipping %s validated
-InterventionSentByEMail=Intervention %s via e-post
-InterventionClassifiedBilled=Intervention %s classified as Billed
+ShippingValidated= Frakt %s validerade
 NewCompanyToDolibarr= Tredje part har skapats
 DateActionPlannedStart= Planerat startdatum
 DateActionPlannedEnd= Planerat slutdatum
@@ -68,19 +69,24 @@ DateActionStart= Startdatum
 DateActionEnd= Slutdatum
 AgendaUrlOptions1=Du kan också lägga till följande parametrar för att filtrera utgång:
 AgendaUrlOptions2=<b>login = %s</b> att begränsa produktionen till åtgärder inrättade av, påverkas eller göras av användaren <b>%s.</b>
-AgendaUrlOptions3=<b>logina = %s</b> att begränsa produktionen till åtgärder som skapats av användaren <b>%s.</b>
+AgendaUrlOptions3=<b>Logina =%s</b> ​​att begränsa produktionen till åtgärder som ägs av en användare<b>%s.</b>
 AgendaUrlOptions4=<b>logint = %s</b> att begränsa produktionen till handlande påverkade användarnas <b>%s.</b>
-AgendaUrlOptions5=<b>logind = %s</b> att begränsa produktionen till åtgärder som utförts av användaren <b>%s.</b>
+AgendaUrlOptionsProject=<b>projekt = PROJECT_ID</b> att begränsa produktionen till åtgärder i samband med projektet <b>PROJECT_ID.</b>
 AgendaShowBirthdayEvents=Visa födelsedag kontakter
 AgendaHideBirthdayEvents=Dölj födelsedag kontakter
-Busy=Busy
-ExportDataset_event1=List of agenda events
-
+Busy=Upptagen
+ExportDataset_event1=Lista över dagordningen händelser
+DefaultWorkingDays=Standard arbetsdagar varierar i veckan (exempel: 1-5, 1-6)
+DefaultWorkingHours=Standard arbetstiden i dag (exempel: 9-18)
 # External Sites ical
 ExportCal=Export kalender
 ExtSites=Importera externa kalendrar
-ExtSitesEnableThisTool=Visa externa kalendrar till dagordning
+ExtSitesEnableThisTool=Visa externa kalendrar (definierade i globala inställningar) i dagordningen. Påverkar inte externa kalendrar definierat av användare.
 ExtSitesNbOfAgenda=Antal kalendrar
 AgendaExtNb=Kalender nb %s
 ExtSiteUrlAgenda=URL att komma åt. Ical-fil
 ExtSiteNoLabel=Ingen beskrivning
+WorkingTimeRange=Arbetstid intervall
+WorkingDaysRange=Arbetsdagar sträcker
+AddEvent=Skapa event
+MyAvailability=Min tillgänglighet
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index e738ac615a3..77a566b712f 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -19,8 +19,8 @@ SavingAccount=Sparkonto
 SavingAccounts=Sparkonton
 ErrorBankLabelAlreadyExists=Finansiell balans etikett finns redan
 BankBalance=Balans
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
+BankBalanceBefore=Balans innan
+BankBalanceAfter=Balans efter
 BalanceMinimalAllowed=Minsta tillåtna balans
 BalanceMinimalDesired=Lägsta önskvärd balans
 InitialBankBalance=Initial jämvikt
@@ -28,7 +28,7 @@ EndBankBalance=Avsluta balans
 CurrentBalance=Aktuellt saldo
 FutureBalance=Framtida balans
 ShowAllTimeBalance=Visa balans från start
-AllTime=From start
+AllTime=Från början
 Reconciliation=Avstämning
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
@@ -105,7 +105,7 @@ ConciliatedBy=Förenas med
 DateConciliating=Reconcile datum
 BankLineConciliated=Transaktion förenas
 CustomerInvoicePayment=Kundbetalning
-CustomerInvoicePaymentBack=Customer payment back
+CustomerInvoicePaymentBack=Kund betalning tillbaka
 SupplierInvoicePayment=Leverantör betalning
 WithdrawalPayment=Tillbakadragande betalning
 SocialContributionPayment=Sociala avgifter betalas
@@ -133,28 +133,28 @@ CashBudget=Cash budget
 PlannedTransactions=Planerade transaktioner
 Graph=Grafiken
 ExportDataset_banque_1=Bank transaktioner och kontoutdrag
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Insättningsblankett
 TransactionOnTheOtherAccount=Transaktionen på det andra kontot
 TransactionWithOtherAccount=Kontoöverföring
 PaymentNumberUpdateSucceeded=Betalning nummer uppdaterats
 PaymentNumberUpdateFailed=Betalningsnummer kunde inte uppdateras
 PaymentDateUpdateSucceeded=Betalningsdag uppdatera framgångsrikt
 PaymentDateUpdateFailed=Betalningsdagen kunde inte uppdateras
-Transactions=Transactions
+Transactions=Transaktioner
 BankTransactionLine=Bank transaktion
 AllAccounts=Alla bank / Likvida medel
 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å &quot;Skapa&quot;.
-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
-ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+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=Kontrollera sedan linjerna som finns i kontoutdraget och klicka
+BankDashboard=Bankkonton sammandrag
+DefaultRIB=Standard BAN
+AllRIB=Alla BAN
+LabelRIB=BAN etikett
+NoBANRecord=Inget BAN rad
+DeleteARib=Radera BAN rad
+ConfirmDeleteRib=Är du säker på att du vill ta bort denna BAN rad?
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 781c61e811e..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,21 +21,21 @@ InvoiceDepositDesc=Denna typ av faktura sker när en insättning har mottagits.
 InvoiceProForma=Proforma faktura
 InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=<b>Proforma faktura</b> ä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
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>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'.
+InvoiceReplacement=Ersättnings faktura
+InvoiceReplacementAsk=Ersättnings faktura för faktura
+InvoiceReplacementDesc=<b> Ersättning faktura </b> används för att avbryta och byta helt en faktura utan betalningar.<br><br>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
 InvoiceAvoirDesc=Den <b>kreditnota</b> är en negativ faktura används för att lösa det faktum att en faktura har ett värde som skiljer än beloppet verkligen betalat (eftersom kunden betalat för mycket av misstag, eller kommer inte betalas helt sedan han återvände vissa produkter till exempel).
 invoiceAvoirWithLines=Skapa kreditnota med innehållet i originalfakturan 
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
-invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake
-ReplaceInvoice=Byt faktura %s
+invoiceAvoirWithPaymentRestAmount=Skapa kreditnota med återstående obetald faktura ursprung
+invoiceAvoirLineWithPaymentRestAmount=Kredit notering för återstående obetalda beloppet
+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
@@ -72,21 +72,22 @@ PaymentsReportsForYear=Betalningar rapporter för %s
 PaymentsReports=Betalningar rapporter
 PaymentsAlreadyDone=Betalningar redan gjort
 PaymentsBackAlreadyDone=Återbetalningar är utförda tidigare
-PaymentRule=Betalning regel
-PaymentMode=Betalning typ
-PaymentConditions=Betalning sikt
-PaymentConditionsShort=Betalning sikt
+PaymentRule=Betalningsregel
+PaymentMode=Betalningssätt
+PaymentConditions=Betalningsvillkor
+PaymentConditionsShort=Betalningsvillkor
 PaymentAmount=Betalningsbelopp
 ValidatePayment=Bekräfta betalning
 PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala
 HelpPaymentHigherThanReminderToPay=Uppmärksamheten är för betalning är en eller flera räkningar högre än resten att betala. <br> Redigera din post, bekräfta något annat och tänka på att skapa en kreditnota det felaktigt erhållna beloppet för varje överskjutande fakturor.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm.
-ClassifyPaid=Klassificera &quot;Betalda&quot;
-ClassifyPaidPartially=Klassificera &quot;Betalda delvis&quot;
-ClassifyCanceled=Klassificera &quot;svikna&quot;
-ClassifyClosed=Klassificera &quot;sluten&quot;
+HelpPaymentHigherThanReminderToPaySupplier=Obs, betalningsbeloppet av en eller flera räkningar är högre än återstående belopp att betala. <br> Redigera din post, annars bekräfta.
+ClassifyPaid=Klassificera "betalda"
+ClassifyPaidPartially=Klassificera "betalda delvis"
+ClassifyCanceled=Klassificera "övergivna"
+ClassifyClosed=Klassificera "avsluten"
+ClassifyUnBilled=Klassificera 'ofakturerade'
 CreateBill=Skapa faktura
-AddBill=Lägg faktura eller kreditnota
+AddBill=Skapa faktura eller en kredit nota
 AddToDraftInvoices=Lägg till faktura-utkast
 DeleteBill=Ta bort faktura
 SearchACustomerInvoice=Sök efter en kundfaktura
@@ -98,7 +99,7 @@ DoPaymentBack=Gör betalning tillbaka
 ConvertToReduc=Konvertera till framtida rabatt
 EnterPaymentReceivedFromCustomer=Skriv in avgifter från kunderna
 EnterPaymentDueToCustomer=Gör betalning till kunden
-DisabledBecauseRemainderToPayIsZero=Funktionshindrade eftersom resten att betala är noll
+DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är noll
 Amount=Belopp
 PriceBase=Prisbasbelopp
 BillStatus=Faktura status
@@ -108,36 +109,34 @@ BillStatusPaidBackOrConverted=Betalats eller omvandlas till rabatt
 BillStatusConverted=Omräknat i rabatt
 BillStatusCanceled=Övergiven
 BillStatusValidated=Validerad (måste betalas)
-BillStatusStarted=Började
+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
@@ -155,10 +154,10 @@ ConfirmCancelBill=Är du säker på att du vill avbryta faktura <b>%s?</b>
 ConfirmCancelBillQuestion=Varför vill du att klassificera denna faktura &quot;svikna&quot;?
 ConfirmClassifyPaidPartially=Är du säker på att du vill ändra faktura <b>%s</b> till status betalas?
 ConfirmClassifyPaidPartiallyQuestion=Denna faktura inte har betalats helt. Vad finns skäl för dig att stänga denna faktura?
-ConfirmClassifyPaidPartiallyReasonAvoir=Återstår att betala <b>(%s %s)</b> är en rabatt som beviljats på grund av betalningen gjordes före sikt. Jag reglera moms med en kreditnota.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Återstår att betala <b>(%s %s)</b> är en rabatt som beviljats på grund av betalningen gjordes före sikt. Jag accepterar att förlora mervärdesskatten på denna rabatt.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Återstår att betala <b>(%s %s)</b> är en rabatt som beviljats på grund av betalningen gjordes före sikt. Jag återfå mervärdesskatten på denna rabatt utan en kreditnota.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad kund
+ConfirmClassifyPaidPartiallyReasonAvoir=Återstående obetalt <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag reglerar momsen med en kreditnota.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Återstående obetalt <b>(%s %s)</ b> ä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 <b>(%s %s)</ b> är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag återskapar momsen på denna rabatt med en kreditnota.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Dålig kund
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkter som returneras delvis
 ConfirmClassifyPaidPartiallyReasonOther=Belopp övergivna av annan orsak
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Detta val är möjligt om din faktura har försetts med lämplig kommentar. (Exempel «Endast den skatt som motsvarar det pris som verkligen har betalats ger rätt till avdrag»)
@@ -172,10 +171,10 @@ ConfirmClassifyAbandonReasonOtherDesc=Detta val kommer att användas i alla andr
 ConfirmCustomerPayment=Har du bekräfta denna betalning ingång för <b>%s</b> %s?
 ConfirmSupplierPayment=Bekräftar du denna betalning för <b>%s</b> %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=Validate faktura
-UnvalidateBill=Unvalidate faktura
-NumberOfBills=Nb av fakturor
-NumberOfBillsByMonth=Nb av fakturor per månad
+ValidateBill=Validera faktura
+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
@@ -190,52 +189,51 @@ AlreadyPaid=Redan betalats ut
 AlreadyPaidBack=Redan återbetald
 AlreadyPaidNoCreditNotesNoDeposits=Redan betalats (utan kreditnotor och inlåning)
 Abandoned=Övergiven
-RemainderToPay=Återstår att betala
-RemainderToTake=Återstår att ta
-RemainderToPayBack=Påminnelse om återbetalning
+RemainderToPay=Återstående obetalt
+RemainderToTake=Återstående belopp att ta
+RemainderToPayBack=Återstående belopp att återbetala
 Rest=Avvaktande
 AmountExpected=Yrkade beloppet
 ExcessReceived=Överskott fått
 EscompteOffered=Rabatterna (betalning innan terminen)
-SendBillRef=Skicka faktura %s
-SendReminderBillRef=Skicka faktura %s (påminnelse)
+SendBillRef=Inlämning av faktura %s
+SendReminderBillRef=Inlämning av faktura %s (påminnelse)
 StandingOrders=Stående order
 StandingOrder=Stående order
 NoDraftBills=Inget förslag fakturor
 NoOtherDraftBills=Inga andra förslag fakturor
 NoDraftInvoices=Inget faktura-utkast
 RefBill=Faktura ref
-ToBill=Till Bill
-RemainderToBill=Återstår att räkningen
+ToBill=Fakturamottagare
+RemainderToBill=Återstår att fakturan
 SendBillByMail=Skicka faktura via e-post
 SendReminderBillByMail=Skicka påminnelse via e-post
 RelatedCommercialProposals=Relaterade kommersiella förslag
 MenuToValid=Till giltiga
 DateMaxPayment=Betalning innan
-DateEcheance=Förfallodagen gräns
+DateEcheance=Förfallodag
 DateInvoice=Fakturadatum
 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
 Billed=Fakturerade
-RepeatableInvoice=Fördefinierade faktura
-RepeatableInvoices=Fördefinierade fakturor
-Repeatable=Fördefinierade
-Repeatables=Fördefinierade
-ChangeIntoRepeatableInvoice=Konvertera till fördefinierade
-CreateRepeatableInvoice=Skapa fördefinierade faktura
-CreateFromRepeatableInvoice=Skapa från fördefinierade faktura
+RepeatableInvoice=Fakturamall
+RepeatableInvoices=Fakturamallar
+Repeatable=Mall
+Repeatables=Mallar
+ChangeIntoRepeatableInvoice=Konvertera till fakturamall
+CreateRepeatableInvoice=Skapa fakturamall
+CreateFromRepeatableInvoice=Skapa från fakturamall
 CustomersInvoicesAndInvoiceLines=Kundfakturor och fakturornas linjer
 CustomersInvoicesAndPayments=Kund fakturor och betalningar
 ExportDataset_invoice_1=Kundfakturor listan och fakturornas linjer
 ExportDataset_invoice_2=Kund fakturor och betalningar
-ProformaBill=Proforma Bill:
+ProformaBill=Proforma faktura:
 Reduction=Minskning
 ReductionShort=Minskningar.
 Reductions=Minskningar
@@ -262,12 +260,12 @@ AbsoluteDiscountUse=Denna typ av krediter kan användas på fakturan innan valid
 CreditNoteDepositUse=Fakturan ska valideras för att använda denna kung av tillgodohavanden
 NewGlobalDiscount=Ny fix rabatt
 NewRelativeDiscount=Nya relativa rabatt
-NoteReason=Not / Reason
-ReasonDiscount=Reason
+NoteReason=Not/orsak
+ReasonDiscount=Orsak
 DiscountOfferedBy=Beviljats av
 DiscountStillRemaining=Rabatt återstår fortfarande
 DiscountAlreadyCounted=Rabatt räknas redan
-BillAddress=Bill adress
+BillAddress=Faktureringsadress
 HelpEscompte=Denna rabatt är en rabatt som kund eftersom betalningen gjordes före sikt.
 HelpAbandonBadCustomer=Detta belopp har övergivits (kund sägs vara en dålig kund) och anses som en exceptionell lös.
 HelpAbandonOther=Detta belopp har övergivits eftersom det var ett misstag (fel kund eller faktura ersättas av en annan till exempel)
@@ -286,8 +284,8 @@ InvoiceNotChecked=Faktura vald
 CloneInvoice=Klon faktura
 ConfirmCloneInvoice=Är du säker på att du vill klona denna faktura <b>%s?</b>
 DisabledBecauseReplacedInvoice=Åtgärd funktionshindrade eftersom faktura har ersatts
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
-NbOfPayments=Nb av utbetalningar
+DescTaxAndDividendsArea=Detta område ger en sammanfattning av alla betalningar för särskilda utgifter. Endast poster med betalning under fasta året ingår här.
+NbOfPayments=Antal utbetalningar
 SplitDiscount=Split rabatt i två
 ConfirmSplitDiscount=Är du säker på att du vill dela denna rabatt <b>%s</b> %s i två lägre rabatter?
 TypeAmountOfEachNewDiscount=Ingång belopp för var och en av två delar:
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Totalt för två nya rabatt måste vara lik
 ConfirmRemoveDiscount=Är du säker på att du vill ta bort denna rabatt?
 RelatedBill=Relaterade faktura
 RelatedBills=Relaterade fakturor
+LatestRelatedBill=Senast relaterad faktura
+WarningBillExist=Varning, en eller flera fakturor finns redan
 
 # PaymentConditions
 PaymentConditionShortRECEP=Omedelbar
@@ -330,14 +330,14 @@ PaymentTypeTIP=TIPS
 PaymentTypeShortTIP=TIPS
 PaymentTypeVAD=På rad betalning
 PaymentTypeShortVAD=På rad betalning
-PaymentTypeTRA=Bill betalning
-PaymentTypeShortTRA=Bill
+PaymentTypeTRA=Faktura betalning
+PaymentTypeShortTRA=Faktura
 BankDetails=Bankuppgifter
 BankCode=Bankkod
 DeskCode=Reception kod
 BankAccountNumber=Kontonummer
 BankAccountNumberKey=Nyckel
-Residence=Domiciliation
+Residence=Säte
 IBANNumber=IBAN-nummer
 IBAN=IBAN
 BIC=BIC / SWIFT
@@ -348,7 +348,7 @@ ChequeNumber=Kontrollera nr
 ChequeOrTransferNumber=Kontrollera / Transfer nr
 ChequeMaker=Kontrollera sändare
 ChequeBank=Bank av Check
-NetToBePaid=Net som skall betalas
+NetToBePaid=Netto som skall betalas
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
 TeleFax=Fax
@@ -381,7 +381,7 @@ UsBillingContactAsIncoiveRecipientIfExist=Använda kundens faktureringsadress ad
 ShowUnpaidAll=Visa alla obetalda fakturor
 ShowUnpaidLateOnly=Visa sent obetald faktura endast
 PaymentInvoiceRef=Betalning faktura %s
-ValidateInvoice=Validate faktura
+ValidateInvoice=Validera faktura
 Cash=Kontanter
 Reported=Försenad
 DisabledBecausePayments=Inte möjlig eftersom det inte finns några betalningar
@@ -390,16 +390,16 @@ ExpectedToPay=Förväntad utbetalning
 PayedByThisPayment=Betalas av denna betalning
 ClosePaidInvoicesAutomatically=Klassificera &quot;betalade&quot; 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 &quot;betald&quot;.
+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
-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
+NoteListOfYourUnpaidInvoices=OBS: Denna lista innehåller bara fakturor för tredje parti som du är kopplade till som en försäljning representant.
+RevenueStamp=Intäkt stämpel
+YouMustCreateInvoiceFromThird=Det här alternativet är endast tillgängligt när du skapar faktura från fliken "kund" hos tredje parts
 PDFCrabeDescription=Faktura modell Crabe. En fullständig faktura modell (Stöd moms alternativet, rabatter, betalningar villkor, logotyp, etc. ..)
-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
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes 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=Återger nummer med formatet %syymm-nnnn för standardfakturor och %syymm-NNNN för kreditnotor där yy är året, mm månaden och nnnn är en sekvens med ingen paus och ingen återgång till 0
+MarsNumRefModelDesc1=Återger nummer med formatet %syymm-nnnn för standardfakturor, %syymm-nnnn för kreditnotor där åå är år, är mm %syymm-nnnn för ersättningsfakturor, %syymm-nnnn för kreditnotor och månad och nnnn är en sekvens utan sönder och ingen återgång till 0
 TerreNumRefModelError=Ett lagförslag som 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.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Representanten uppföljning kundfaktura
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 6f03c265227..a8fadb4e77b 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=RSS-information
 BoxLastProducts=Senaste %s produkter / tjänster
-# BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Produkter i lager alert
 BoxLastProductsInContract=Senaste %s avtalade produkter / tjänster
 BoxLastSupplierBills=Senaste leverantörens fakturor
 BoxLastCustomerBills=Senaste kundens fakturor
@@ -12,41 +12,45 @@ BoxLastProspects=Senast uppdaterad framtidsutsikter
 BoxLastCustomers=Senast uppdaterad kunder
 BoxLastSuppliers=Senast uppdaterad leverantörer
 BoxLastCustomerOrders=Senaste kundorder
+BoxLastValidatedCustomerOrders=Senast validerade kundorder
 BoxLastBooks=Senast böcker
 BoxLastActions=Senaste åtgärder
 BoxLastContracts=Senaste kontrakt
 BoxLastContacts=Senaste kontakter / adresser
 BoxLastMembers=Sista medlemmar
-# BoxFicheInter=Last interventions
-# BoxCurrentAccounts=Opened accounts balance
+BoxFicheInter=Sista interventioner
+BoxCurrentAccounts=Öppnade balans konton
 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=Products in stock alert
-BoxTitleLastCustomerOrders=Senast %s uppdaterad kundorder
+BoxTitleProductsAlertStock=Produkter i lager alert
+BoxTitleLastCustomerOrders=Senaste %s kundorder
+BoxTitleLastModifiedCustomerOrders=Senaste %s modifierade kundorder
 BoxTitleLastSuppliers=Senaste %s registreras leverantörer
 BoxTitleLastCustomers=Senaste %s registreras kunder
 BoxTitleLastModifiedSuppliers=Senast %s uppdaterad leverantörer
 BoxTitleLastModifiedCustomers=Senast %s uppdaterad kunder
-BoxTitleLastCustomersOrProspects=Senast %s modifierade eller tilltänkta kunder
-BoxTitleLastPropals=Senaste %s registreras förslag
+BoxTitleLastCustomersOrProspects=Senaste %s kunder eller framtidsutsikter
+BoxTitleLastPropals=Senaste %s förslag
+BoxTitleLastModifiedPropals=Senaste %s ändrade förslag
 BoxTitleLastCustomerBills=Senaste %s kundens fakturor
+BoxTitleLastModifiedCustomerBills=Senaste %s modifierade kundfakturor
 BoxTitleLastSupplierBills=Senaste %s leverantörens fakturor
-BoxTitleLastProspects=Senaste %s registreras framtidsutsikter
+BoxTitleLastModifiedSupplierBills=Senaste %s modifierade leverantörsfakturor
 BoxTitleLastModifiedProspects=Senast %s uppdaterad framtidsutsikter
 BoxTitleLastProductsInContract=Senaste %s produkter / tjänster i ett avtal
-BoxTitleLastModifiedMembers=Sista %s modifierade medlemmar
-# BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Äldsta %s obetalda kundens fakturor
-BoxTitleOldestUnpaidSupplierBills=Äldsta %s obetalda leverantörs fakturor
-# BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleLastModifiedMembers=Senaste %s medlemmar
+BoxTitleLastFicheInter=Senaste %s modifierade ingripande
+BoxTitleOldestUnpaidCustomerBills=Äldsta %s obetalda kundfakturor
+BoxTitleOldestUnpaidSupplierBills=Äldsta %s obetalda leverantörsfakturor
+BoxTitleCurrentAccounts=Öppnade kontots saldon
 BoxTitleSalesTurnover=Omsättningen
-BoxTitleTotalUnpaidCustomerBills=Obetalda kundens fakturor
-BoxTitleTotalUnpaidSuppliersBills=Obetalda leverantörs fakturor
+BoxTitleTotalUnpaidCustomerBills=Obetalda kundfakturor
+BoxTitleTotalUnpaidSuppliersBills=Obetalda leverantörsfakturor
 BoxTitleLastModifiedContacts=Senaste %s modifierade kontakter / adresser
 BoxMyLastBookmarks=Min sista %s bokmärken
 BoxOldestExpiredServices=Äldsta aktiva passerat tjänster
@@ -55,7 +59,7 @@ BoxTitleLastActionsToDo=Senaste %s åtgärder för att göra
 BoxTitleLastContracts=Senaste %s kontrakt
 BoxTitleLastModifiedDonations=Sista %s modifierad donationer
 BoxTitleLastModifiedExpenses=Sista %s modifierad kostnader
-# BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
 FailedToRefreshDataInfoNotUpToDate=Misslyckades med att uppdatera RSS-flöde. Senaste framgångsrika uppdatera datum: %s
 LastRefreshDate=Senaste uppdateringen datum
 NoRecordedBookmarks=Inga bokmärken definieras. Klicka <a href="%s">här</a> för att lägga till bokmärken.
@@ -74,18 +78,19 @@ NoRecordedProducts=Inga registrerade produkter / tjänster
 NoRecordedProspects=Inga registrerade framtidsutsikter
 NoContractedProducts=Inga produkter / tjänster avtalade
 NoRecordedContracts=Inga registrerade kontrakt
-# NoRecordedInterventions=No recorded interventions
-# BoxLatestSupplierOrders=Latest supplier orders
-# BoxTitleLatestSupplierOrders=%s latest supplier orders
-# NoSupplierOrder=No recorded supplier order
-# BoxCustomersInvoicesPerMonth=Customer invoices per month
-# BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-# BoxCustomersOrdersPerMonth=Customer orders per month
-# BoxSuppliersOrdersPerMonth=Supplier orders per month
-# BoxProposalsPerMonth=Proposals per month
-# NoTooLowStockProducts=No product under the low stock limit
-# BoxProductDistribution=Products/Services distribution
-# BoxProductDistributionFor=Distribution of %s for %s
+NoRecordedInterventions=Inga inspelade interventioner
+BoxLatestSupplierOrders=Senaste leverantörs order
+BoxTitleLatestSupplierOrders=Senaste %s leverantörsorder
+BoxTitleLatestModifiedSupplierOrders=Senaste %s modifierade leverantörs order
+NoSupplierOrder=Inga inspelade leverantör ordning
+BoxCustomersInvoicesPerMonth=Kund fakturor per månad
+BoxSuppliersInvoicesPerMonth=Leverantörs fakturor per månad
+BoxCustomersOrdersPerMonth=Kundorder per månad
+BoxSuppliersOrdersPerMonth=Leverantörs order per månad
+BoxProposalsPerMonth=Förslag per månad
+NoTooLowStockProducts=Ingen produkt under den låga aktiegränsen
+BoxProductDistribution=Produkter / tjänster fördelning
+BoxProductDistributionFor=Fördelning av %s för %s
 ForCustomersInvoices=Kundens fakturor
-# ForCustomersOrders=Customers orders
+ForCustomersOrders=Kund beställningar
 ForProposals=Förslag
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 9dc083d5e44..b423702c634 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -12,7 +12,7 @@ CashDeskProducts=Produkter
 CashDeskStock=Lager
 CashDeskOn=på
 CashDeskThirdParty=Tredje part
-# CashdeskDashboard=Point of sale access
+CashdeskDashboard=Försäljningsställe
 ShoppingCart=Kundvagn
 NewSell=Nya säljer
 BackOffice=Back office
@@ -36,5 +36,5 @@ BankToPay=KONTO
 ShowCompany=Visar företaget
 ShowStock=Visar lagret
 DeleteArticle=Klicka här för att ta bort den här artikeln
-# FilterRefOrLabelOrBC=Search (Ref/Label)
-# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Sök (Ref / etikett)
+UserNeedPermissionToEditStockToUsePos=Du ber att minska lager på faktura skapelse, så användare som använder POS behöver ha behörighet att redigera lager.
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 660a820d021..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?
@@ -111,3 +108,5 @@ ExtraFieldsCategories=Extra attibut
 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/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
index db67958f331..4e4fd7f51aa 100644
--- a/htdocs/langs/sv_SE/commercial.lang
+++ b/htdocs/langs/sv_SE/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
 Prospects=Framtidsutsikter
 DeleteAction=Ta bort en handling / uppgift
 NewAction=Ny åtgärd / uppgift
-AddAction=Lägg till åtgärd / uppgift
-AddAnAction=Lägg till en handling / uppgift
-AddActionRendezVous=Lägg till en Rendezvous uppgift
+AddAction=Skapa händelse / uppgift
+AddAnAction=Skapa en händelse / uppgift
+AddActionRendezVous=Skapa en Rendez-vous händelse
 Rendez-Vous=Rendezvous
 ConfirmDeleteAction=Är du säker på att du vill ta bort denna uppgift?
 CardAction=Action-kort
@@ -44,8 +44,8 @@ DoneActions=Genomförda åtgärder
 DoneActionsFor=Genomförda åtgärder för %s
 ToDoActions=Ofullständig åtgärder
 ToDoActionsFor=Ofullständiga åtgärder för %s
-SendPropalRef=Skicka kommersiella förslag %s
-SendOrderRef=Skicka beställningen %s
+SendPropalRef=Inlämning av kommersiella förslag %s
+SendOrderRef=Inlämning av ordning %s
 StatusNotApplicable=Ej tillämpligt
 StatusActionToDo=För att göra
 StatusActionDone=Komplett
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontakta gjort
 DateActionPlanned=Datum planerade åtgärder för
 DateActionDone=Datum insatser görs
 ActionAskedBy=Åtgärd bad
-ActionAffectedTo=Åtgärd påverkas
+ActionAffectedTo=Händelse som ägs av
 ActionDoneBy=Åtgärder som utförs av
 ActionUserAsk=Registrerats av
 ErrorStatusCantBeZeroIfStarted=Om fältet <b>&quot;Datum gjort&quot;</b> är fylld, är arbetet igång (eller färdiga), så fältet <b>&quot;Status&quot;</b> kan inte 0%%.
@@ -71,7 +71,7 @@ ActionAC_FAX=Skicka fax
 ActionAC_PROP=Skicka förslag via e-post
 ActionAC_EMAIL=Skicka e-post
 ActionAC_RDV=Möten
-ActionAC_INT=Intervention on site
+ActionAC_INT=Intervention på plats
 ActionAC_FAC=Skicka kundfaktura med post
 ActionAC_REL=Skicka kundfaktura via post (påminnelse)
 ActionAC_CLO=Stäng
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 6095f7c37c7..1e640e1b80e 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF används
 LocalTax2IsNotUsedES= IRPF används inte
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=RE Typ
+TypeLocaltax2ES=IRPF Typ
+TypeES=Typ
 ThirdPartyEMail=%s
 WrongCustomerCode=Kundkod ogiltig
 WrongSupplierCode=Leverantörkod ogiltig
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Absoluta rabatter
 DiscountNone=Ingen
 Supplier=Leverantör
 CompanyList=Företagslista
-AddContact=Lägg till kontakt
-AddContactAddress=Lägg till kontakt / adress
+AddContact=Skapa kontakt
+AddContactAddress=Skapa kontakt / adress
 EditContact=Redigera kontakt / adress
 EditContactAddress=Redigera kontakt / adress
 Contact=Kontakt
@@ -268,8 +268,8 @@ ContactsAddresses=Kontakt / Adresser
 NoContactDefinedForThirdParty=Ingen kontakt inlagd för denna tredje part
 NoContactDefined=Ingen kontakt inlagd
 DefaultContact=Standard kontakt / adress
-AddCompany=Lägg till företag
-AddThirdParty=Lägg till tredje part
+AddCompany=Skapa företag
+AddThirdParty=Skapa tredje part
 DeleteACompany=Ta bort ett företag
 PersonalInformations=Personuppgifter
 AccountancyCode=Bokföring kod
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Leverans adresskortet
 DeleteDeliveryAddress=Ta bort en leveransadress
 ConfirmDeleteDeliveryAddress=Är du säker på att du vill ta bort denna leveransadress?
 NewDeliveryAddress=Ny leveransadress
-AddDeliveryAddress=Lägg till adress
-AddAddress=Lägg till adress
+AddDeliveryAddress=Skapa adress
+AddAddress=Skapa adress
 NoOtherDeliveryAddress=Ingen alternativ leveransadress definierad
 SupplierCategory=Leverantör kategori
 JuridicalStatus200=Oberoende
@@ -397,16 +397,18 @@ YouMustCreateContactFirst=Du måste först skapa e-postkontakter för tredje par
 ListSuppliersShort=Lista över leverantörer
 ListProspectsShort=Lista över möjliga kunder
 ListCustomersShort=Lista över kunder
-ThirdPartiesArea=Tredje part området
+ThirdPartiesArea=Tredje part och kontaktyta
 LastModifiedThirdParties=Senaste %s modifierade tredje part
 UniqueThirdParties=Totalt unika tredje part
 InActivity=Öppet
 ActivityCeased=Stängt
 ActivityStateFilter=Sysselsättningsstatus
-ProductsIntoElements=List of products into %s
+ProductsIntoElements=Lista produkter till %s
 CurrentOutstandingBill=Obetalda fakturor
 OutstandingBill=Max för obetald faktura
 OutstandingBillReached=Upnått tak för obetalda fakturor
 MonkeyNumRefModelDesc=Ger nummer med format %syymm-nnnn för kundnummer och %syymm-nnnn för leverantörnummer där YY är år, mm månad och nnnn är en sekvens utan avbrott och utan återgång till 0.
 LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändras när som helst.
 ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...)
+SearchThirdparty=Sök tredjeparts
+SearchContact=Sök kontakt
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 21e59c35abb..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 <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
+TaxModuleSetupToModifyRules=Gå till <a href="%s">skatt modul inställning</a> att ändra reglerna för beräkning
+TaxModuleSetupToModifyRulesLT=Gå till <a href="%s">Företag inställning</a> 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 <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
+CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
+CalcModeDebt=<b>Läges% sClaims-Skulder% s</b> sa <b>Åtagande redovisning.</b>
+CalcModeEngagement=<b>Läge% sIncomes-Kostnader% s</b> sa <b>kassaredovisning</b>
+CalcModeLT1= <b>Läge% SRE på kundfakturor - leverantörerna fakturerar% s</b>
+CalcModeLT1Debt=<b>Läge% SRE på kundfakturor% s</b>
+CalcModeLT1Rec= <b>Läge% SRE på leverantörerna fakturerar% s</b>
+CalcModeLT2= <b>Läge% sIRPF på kundfakturor - leverantörer fakturor% s</b>
+CalcModeLT2Debt=<b>Läge% sIRPF på kundfakturor% s</b>
+CalcModeLT2Rec= <b>Läge% sIRPF på leverantörernas fakturor% s</b>
+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 <b>%sClaims-Debts%s</b> sa <b>Åtagande redovisning.</b>
 AnnualByCompaniesInputOutputMode=Överskott av intäkter och kostnader, detalj av tredje part, mode <b>%sRevenues-Expenses%s</b> sa <b>redovisning enligt kontantmetoden.</b>
 SeeReportInInputOutputMode=Se rapporten <b>%sIncomes-Expenses%s</b> sa <b>kontanter står</b> för en beräkning på faktiska betalningar
 SeeReportInDueDebtMode=Se rapporten <b>%sClaims-Debts%s</b> sa <b>åtagande står</b> 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 <br> - Det omfattar utestående fakturor, utlägg och mervärdesskatt oavsett om de betalas eller inte. <br> - 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. <br>- 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. <br> - Den bygger på datum för fakturor, kostnader och moms betalning.
 RulesCADue=- Det omfattar kundens förfallna fakturor oavsett om de betalas eller inte. <br> - Den bygger på valideringen dagen för dessa fakturor. <br>
 RulesCAIn=- Den innehåller alla faktiska utbetalningar av fakturor från kunder. <br> - Den bygger på betalningsdagen för dessa fakturor <br>
 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 <b>%sVAT encasement%s</b> en vanlig beräkning
 SeeVATReportInDueDebtMode=Se rapporten <b>%sVAT om flow%s</b> 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,30 +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=linked to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-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 <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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: <br> Metod 1 är avrundning moms på varje rad, sedan summera dem. <br> Metod 2 är summera all moms på varje rad, sedan avrundning resultatet. <br> Slutresultat kan skiljer sig från några cent. Standardläget är <b>läget% s.</b>
+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 <b>kontantredovisningsläge</b> inte är relevant. Denna rapport är endast tillgänglig när du använder <b>engagemang bokföring</b> 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 98e98e079c6..0d5b012104f 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Kontrakt område
 ListOfContracts=Förteckning över avtal
-LastContracts=Senast %s ändrat avtal
+LastModifiedContracts=Senaste %s modifierade kontrakt
 AllContracts=Alla kontrakt
 ContractCard=Kontrakt kort
 ContractStatus=Kontrakt status
@@ -27,7 +27,7 @@ MenuRunningServices=Löpande tjänster
 MenuExpiredServices=Utlöpta tjänster
 MenuClosedServices=Stängda tjänster
 NewContract=Nytt kontrakt
-AddContract=Lägg till kontrakt
+AddContract=Skapa kontrakt
 SearchAContract=Sök ett kontrakt
 DeleteAContract=Ta bort ett kontrakt
 CloseAContract=Stäng ett kontrakt
@@ -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=Last %s contracts
 LastActivatedServices=Senaste %s aktiverade tjänster
 LastModifiedServices=Senast %s uppdaterade tjänster
 EditServiceLine=Redigera servicelinjen
@@ -89,8 +89,9 @@ ListOfServicesToExpireWithDuration=Förteckning över tjänster som löper ut in
 ListOfServicesToExpireWithDurationNeg=Förteckning över tjänster som löpt ut sedan mer än %s dagar
 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=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
+StandardContractsTemplate=Standardkontrakt mall
+ContactNameAndSignature=För %s, namn och underskrift:
+OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Säljare som tecknar avtal
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 518d8c5695f..cf4ed34e6ae 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -1,42 +1,39 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = Om
 CronAbout = Om Cron
-CronAboutPage = Cron about page
-
+CronAboutPage = Cron om sidan
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Läs schedulerad uppgift
+Permission23102 = Skapa / uppdatera Schemalagd aktivitet
+Permission23103 = Ta bort schemalagd aktivitet
+Permission23104 = Kör schemalagd aktivitet
 # 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
+CronSetup= Planerad jobbhantering installation
+URLToLaunchCronJobs=URL för att kontrollera och starta cron-jobb om det behövs
+OrToLaunchASpecificJob=Eller för att kontrollera och starta ett specifikt arbete
+KeyForCronAccess=Säkerhetsnyckel för URL för att lansera cron-jobb
 FileToLaunchCronJobs=Kommandorad för att starta cron jobb
-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
+CronExplainHowToRunUnix=På Unix-miljö bör du använda crontab för att köra kommandoraden varje minuter
+CronExplainHowToRunWin=På Microsoft (tm) Windows environement kan du använda schemalagd aktivitet verktyg för att köra kommandoraden varje minuter
 # Menu
-CronJobs=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronJobs=Schemalagda jobb
+CronListActive=Lista över aktiva / schemalagda jobb
+CronListInactive=Lista över handikappade jobb
 # Page list
 CronDateLastRun=Senaste körning
-CronLastOutput=Last run output
-CronLastResult=Last result code
-CronListOfCronJobs=List of scheduled jobs
+CronLastOutput=Sista loppet utgång
+CronLastResult=Senaste resultat code
+CronListOfCronJobs=Lista över schemalagda jobb
 CronCommand=Kommando
-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
+CronList=Listan Jobb
+CronDelete= Radera cron-jobb
+CronConfirmDelete= Är du säker på att du vill ta bort denna cron-jobb?
+CronExecute=Starta jobb
+CronConfirmExecute= Är du säker på att utföra detta jobb nu
+CronInfo= Jobb möjligt att utföra uppgiften som har planerats
+CronWaitingJobs=Wainting jobb
+CronTask=Jobb
 CronNone= Ingen
 CronDtStart=Startdatum
 CronDtEnd=Slutdatum
@@ -46,44 +43,44 @@ CronFrequency=Frekvens
 CronClass=Klass
 CronMethod=Metod
 CronModule=Modul
-CronAction=Action
+CronAction=Åtgärd
 CronStatus=Status
 CronStatusActive=Aktiverat
 CronStatusInactive=Funktionshindrade
-CronNoJobs=No jobs registered
+CronNoJobs=Inga jobb registrerade
 CronPriority=Prioritet
 CronLabel=Beskrivning
-CronNbRun=Nb. launch
+CronNbRun=Nb. lanseringen
 CronEach=Varje
-JobFinished=Job launched and finished
+JobFinished=Job lanserad och klar
 #Page card
-CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronAdd= Lägg till jobb
+CronHourStart= Start Hour och datum för uppgiften
+CronEvery= Och köra uppgiften varje
+CronObject= Instans / Object för att skapa
 CronArgs=Parametrar
-CronSaveSucess=Save succesfully
+CronSaveSucess=Spara framgångsrikt
 CronNote=Kommentar
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
+CronFieldMandatory=Fält %s är obligatoriskt
+CronErrEndDateStartDt=Slutdatum kan inte vara före startdatum
 CronStatusActiveBtn=Aktivera
 CronStatusInactiveBtn=Inaktivera
-CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
+CronTaskInactive=Det här jobbet är avaktiverat
+CronDtLastResult=Senaste resultatet datum
 CronId=Id
 CronClassFile=Klasser (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
+CronModuleHelp=Namn på Dolibarr modul katalog (även arbeta med extern Dolibarr modul). <BR> För exemple att hämta metod för Dolibarr Produkt objektet / htdocs / <u>produkt</u> /class/product.class.php, värdet av modulen är <i>produkten</i>
+CronClassFileHelp=Filnamnet för att ladda. <BR> För exemple att hämta metod för Dolibarr Produkt objektet / htdocs / produkt / klass / <u>product.class.php,</u> är värdet av klass filnamn <i>product.class.php</i>
+CronObjectHelp=Det objektnamn som ska läsas in. <BR> För exemple att hämta metod för Dolibarr Produktobjekt /htdocs/product/class/product.class.php, är värdet av klass filnamn <i>Produkt</i>
+CronMethodHelp=Objektet metod för att starta. <BR> För exemple att hämta metod för Dolibarr Produktobjekt /htdocs/product/class/product.class.php, värdet av metoden är är <i>fecth</i>
+CronArgsHelp=Metoden argument. <BR> Till exemple att hämta förfarande för Dolibarr Produkt objekt /htdocs/product/class/product.class.php kan värdet av paramters vara <i>0, ProductRef</i>
+CronCommandHelp=Systemet kommandoraden som ska köras.
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType=Task typ
+CronType_method=Call metod för en Dolibarr klass
+CronType_command=Skalkommando
 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=Det går inte att läsa in klassen% s eller objekt% s
+UseMenuModuleToolsToAddCronJobs=Gå in på menyn "Home - Moduler verktyg - Job list" för att se och redigera schemalagda jobb.
diff --git a/htdocs/langs/sv_SE/deliveries.lang b/htdocs/langs/sv_SE/deliveries.lang
index 393ba2ebbcc..315f3668602 100644
--- a/htdocs/langs/sv_SE/deliveries.lang
+++ b/htdocs/langs/sv_SE/deliveries.lang
@@ -24,3 +24,5 @@ Deliverer=Utlämnad av:
 Sender=Avsändare
 Recipient=Mottagare
 ErrorStockIsNotEnough=Det finns inte tillräckligt i lager
+Shippable=Sändbara
+NonShippable=Inte sändbara
diff --git a/htdocs/langs/sv_SE/dict.lang b/htdocs/langs/sv_SE/dict.lang
index c69b273c44a..1c6f314ac0f 100644
--- a/htdocs/langs/sv_SE/dict.lang
+++ b/htdocs/langs/sv_SE/dict.lang
@@ -6,7 +6,7 @@ CountryES=Spanien
 CountryDE=Tyskland
 CountryCH=Schweiz
 CountryGB=STORBRITANNIEN
-# CountryUK=United Kingdom
+CountryUK=United Kingdom
 CountryIE=Irland
 CountryCN=Kina
 CountryTN=Tunisien
@@ -252,8 +252,7 @@ CivilityMME=Mrs
 CivilityMR=Mr
 CivilityMLE=Ms
 CivilityMTRE=Master
-# CivilityDR=Doctor
-
+CivilityDR=Doktor
 ##### Currencies #####
 Currencyeuros=Euro
 CurrencyAUD=AU dollar
@@ -290,10 +289,10 @@ CurrencyXOF=FCFA BCEAO
 CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=Fiskeripolitiken franc
 CurrencySingXPF=CFP-franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=tusendel
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Post kampanj
@@ -302,28 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Telefonen kampanj
 DemandReasonTypeSRC_CAMP_FAX=Fax kampanjen
 DemandReasonTypeSRC_COMM=Kommersiella kontakt
 DemandReasonTypeSRC_SHOP=Handla kontakt
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Anställd
+DemandReasonTypeSRC_SPONSORING=Sponsor
 #### 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=A6-format
+PaperFormatUSLETTER=Format Letter US
+PaperFormatUSLEGAL=Format Legal US
+PaperFormatUSEXECUTIVE=Format Executive US
+PaperFormatUSLEDGER=Formatet Ledger / Tabloid
+PaperFormatCAP1=Format P1 Kanada
+PaperFormatCAP2=Format P2 Kanada
+PaperFormatCAP3=Format P3 Kanada
+PaperFormatCAP4=Format P4 Kanada
+PaperFormatCAP5=Format P5 Kanada
+PaperFormatCAP6=Format P6 Kanada
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index e776feab572..a66b54ae5af 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Donation
 Donations=Donationer
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=Givare
 Donors=Givare
-AddDonation=Lägg till en donation
+AddDonation=Skapa en donation
 NewDonation=Ny donation
-# ShowDonation=Show donation
+ShowDonation=Visa donation
 DonationPromise=Gift löfte
 PromisesNotValid=Inte validerade löften
 PromisesValid=Validerad löften
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=Förslag
 DonationStatusPromiseValidatedShort=Validerad
 DonationStatusPaidShort=Mottagna
 ValidPromess=Validate löfte
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation kvitto
 BuildDonationReceipt=Bygg kvitto
 DonationsModels=Dokument modeller för donation kvitton
 LastModifiedDonations=Sista %s modifierad donationer
 SearchADonation=Sök en donation
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 5b61533edd0..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
@@ -23,10 +23,10 @@ ECMNewDocument=Nytt dokument
 ECMCreationDate=Datum för skapande
 ECMNbOfFilesInDir=Antalet filer i katalogen
 ECMNbOfSubDir=Antal underkataloger
-# ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=Antalet filer i underkataloger
 ECMCreationUser=Creator
-# ECMArea=EDM area
-# ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=EDM område
+ECMAreaDesc=EDM (Electronic Document Management) området kan du spara, dela och snabbt söka alla typer av dokument i Dolibarr.
 ECMAreaDesc2=* Automatisk kataloger fylls automatiskt när man lägger till dokument från kort av ett element. <br> * Manuell kataloger kan användas för att spara dokument inte är knutna till ett visst element.
 ECMSectionWasRemoved=Nummer <b>%s</b> har tagits bort.
 ECMDocumentsSection=Dokument om katalogen
@@ -35,14 +35,14 @@ ECMSearchByEntity=Sök på objektet
 ECMSectionOfDocuments=Register över handlingar
 ECMTypeManual=Manuell
 ECMTypeAuto=Automatisk
-# ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Handlingar som är kopplade till sociala avgifter
 ECMDocsByThirdParties=Dokument med koppling till tredje part
 ECMDocsByProposals=Dokument med koppling till förslagen
 ECMDocsByOrders=Dokument med koppling till kunderna order
 ECMDocsByContracts=Handlingar som är kopplade till kontrakt
 ECMDocsByInvoices=Dokument med koppling till kunderna fakturor
 ECMDocsByProducts=Dokument med koppling till produkter
-# ECMDocsByProjects=Documents linked to projects
+ECMDocsByProjects=Handlingar som är kopplade till projekt
 ECMNoDirectoryYet=Ingen katalog skapas
 ShowECMSection=Visa katalog
 DeleteSection=Ta bort katalog
@@ -51,5 +51,5 @@ ECMDirectoryForFiles=Relativ katalog för filer
 CannotRemoveDirectoryContainsFiles=Flyttat inte möjligt eftersom det innehåller några filer
 ECMFileManager=Filhanteraren
 ECMSelectASection=Välj en katalog på vänster träd ...
-# DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+DirNotSynchronizedSyncFirst=Denna katalog verkar skapas eller ändras utanför ECM-modulen. Du måste klicka på "Uppdatera" knappen först att synkronisera disk och databas för att få innehållet i den här katalogen.
 
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 7216280e10a..e05970fa6f1 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Inget fel
 # Errors
 Error=Fel
 Errors=Fel
-ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorButCommitIsDone=Fel hittades men vi validera trots detta
 ErrorBadEMail=EMail %s är fel
 ErrorBadUrl=Url %s är fel
 ErrorLoginAlreadyExists=Logga %s finns redan.
@@ -23,23 +23,23 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Denna kontakt redan har definierats s
 ErrorCashAccountAcceptsOnlyCashMoney=Detta bankkonto är en kontant-konto, så det tar emot betalningar av typ kontanter endast.
 ErrorFromToAccountsMustDiffers=Källa och mål bankkonton måste vara olika.
 ErrorBadThirdPartyName=Felaktigt värde för tredje part namn
-ErrorProdIdIsMandatory=The %s is mandatory
+ErrorProdIdIsMandatory=%s är obligatoriskt
 ErrorBadCustomerCodeSyntax=Dålig syntax för kundkod
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Dålig syntax för streckkod
 ErrorCustomerCodeRequired=Kunden som erfordras
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Streckkod krävs
 ErrorCustomerCodeAlreadyUsed=Kund-kod som används redan
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=Streckkod som redan används
 ErrorPrefixRequired=Prefix krävs
 ErrorUrlNotValid=Webbplatsen adressen är felaktig
 ErrorBadSupplierCodeSyntax=Bad syntax för leverantör kod
 ErrorSupplierCodeRequired=Leverantör som erfordras
 ErrorSupplierCodeAlreadyUsed=Leverantör kod som används redan
-ErrorBadParameters=Bad parametrar
+ErrorBadParameters=Dåliga parametrar
 ErrorBadValueForParameter=Fel värde &quot;%s&quot; för parameter oriktiga &quot;%s kallad konventionen
-ErrorBadImageFormat=Bildfil har inte ett format som stöds
+ErrorBadImageFormat=Bildfilen har inte ett format som stöds (Din PHP stöder inte funktioner för att konvertera bilder av det här formatet)
 ErrorBadDateFormat=Värde &quot;%s&quot; har fel datumformat
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=Datum är inte korrekt!
 ErrorFailedToWriteInDir=Misslyckades med att skriva i katalogen %s
 ErrorFoundBadEmailInFile=Hittade felaktig e-syntax för %s rader i filen (t.ex. linje %s med email = %s)
 ErrorUserCannotBeDelete=Användaren kan inte tas bort. Får den hör samman på Dolibarr enheter.
@@ -60,21 +60,21 @@ ErrorUploadBlockedByAddon=Ladda upp blockeras av en PHP / Apache plugin.
 ErrorFileSizeTooLarge=Filen är för stor.
 ErrorSizeTooLongForIntType=Storlek för lång för int typ (%s siffror max)
 ErrorSizeTooLongForVarcharType=Storlek för lång för sträng typ (%s tecken max)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
+ErrorNoValueForSelectType=Vänligen fyll i värde för utvald lista
+ErrorNoValueForCheckBoxType=Vänligen fyll i värde för krysslista
+ErrorNoValueForRadioType=Vänligen fyll i värde för radiolista
+ErrorBadFormatValueList=Listans värd kan inte ha mer än ett komma: <u>%s</u>,  men behöver åtminstone en: Llave, valores
 ErrorFieldCanNotContainSpecialCharacters=Fält <b>%s</b> inte innehåller specialtecken.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Fältet <b>%s</b> får inte innehåller specialtecken eller versaler.
 ErrorNoAccountancyModuleLoaded=Ingen bokföring modul aktiverad
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Detta profilnamn finns redan för denna export.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchning inte är fullständig.
 ErrorLDAPMakeManualTest=A. LDIF filen har genererats i katalogen %s. Försök att läsa in den manuellt från kommandoraden för att få mer information om fel.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan inte spara en åtgärd med &quot;inte Statut startade&quot; om fältet &quot;görs av&quot; är också fylld.
 ErrorRefAlreadyExists=Ref används för att skapa finns redan.
 ErrorPleaseTypeBankTransactionReportName=Skriv namn bank kvitto där transaktionen rapporteras (Format ÅÅÅÅMM eller ÅÅÅÅMMDD)
 ErrorRecordHasChildren=Misslyckades med att radera poster eftersom det har några barns.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorRecordIsUsedCantDelete=Kan inte ta bort posten. Den används redan eller ingå i annat föremål.
 ErrorModuleRequireJavascript=Javascript måste inte avaktiveras att ha denna funktion fungerar. Aktivera / inaktivera Javascript, gå till menyn Hem-> Inställningar-> Display.
 ErrorPasswordsMustMatch=Båda skrivit lösenord måste matcha varandra
 ErrorContactEMail=Ett tekniskt fel uppstod. Vänligen kontakta administratören att följa <b>e-%s</b> en ge <b>%s</b> felkod i ditt meddelande, eller ännu bättre genom att lägga till en skärm kopia av denna sida.
@@ -114,31 +114,51 @@ ErrorLoginDoesNotExists=Användaren med inloggning <b>%s</b> kunde inte hittas.
 ErrorLoginHasNoEmail=Denna användare har inga e-postadress. Process avbruten.
 ErrorBadValueForCode=Dåligt värde typer för kod. Försök igen med ett nytt värde ...
 ErrorBothFieldCantBeNegative=Fält %s och %s kan inte vara både negativt
+ErrorQtyForCustomerInvoiceCantBeNegative=Kvantitet för linje i kundfakturor kan inte vara negativt
 ErrorWebServerUserHasNotPermission=Användarkonto <b>%s</b> användas för att exekvera webbserver har ingen behörighet för den
 ErrorNoActivatedBarcode=Ingen streckkod typ aktiveras
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date can not be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
-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.
+ErrUnzipFails=Det gick inte att packa upp %s med ZipArchive
+ErrNoZipEngine=Ingen motor att packa upp %s fil i denna PHP
+ErrorFileMustBeADolibarrPackage=Filen %s måste vara ett Dolibarr zip-paket
+ErrorFileRequired=Det tar ett paket Dolibarr fil
+ErrorPhpCurlNotInstalled=PHP CURL är inte installerat, detta är viktigt för att prata med Paypal
+ErrorFailedToAddToMailmanList=Det gick inte att lägga till post %s till Mailman listan %s eller SPIP bas
+ErrorFailedToRemoveToMailmanList=Det gick inte att ta bort posten %s till Mailman listan %s eller SPIP bas
+ErrorNewValueCantMatchOldValue=Nytt värde kan inte vara lika med gamla
+ErrorFailedToValidatePasswordReset=Det gick inte att REINIT lösenord. Kan vara reinit var redan gjort (den här länken kan bara användas en gång). Om inte, försök att starta om reinit processen.
+ErrorToConnectToMysqlCheckInstance=Anslut till databasen misslyckas. Kolla Mysql servern är igång (i de flesta fall kan du starta det från kommandoraden med "sudo /etc/init.d/mysql start").
+ErrorFailedToAddContact=Det gick inte att lägga till kontakt
+ErrorDateMustBeBeforeToday=Datumet kan inte vara större än i dag
+ErrorPaymentModeDefinedToWithoutSetup=Ett betalningsläge var inställt för att skriva %s, men installationen av modulens faktura fördes inte att definiera informationen som ska visas för den här betalningsläget.
+ErrorPHPNeedModule=Fel, din PHP måste ha modul <b>%s</b> installerad för att använda den här funktionen.
+ErrorOpenIDSetupNotComplete=Du inställning för Dolibarr konfigurationsfil möjliggör OpenID autentisering, men webbadressen OpenID tjänsten definieras inte i ständig %s
+ErrorWarehouseMustDiffers=Källa och mål lager måste skiljer
+ErrorBadFormat=Dåligt format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fel, denna medlem ännu kopplad till någon tredjeparts. Länka medlem i en befintlig tredje part eller skapa en ny tredjeparts innan du skapar abonnemang med faktura.
+ErrorThereIsSomeDeliveries=Fel, det finns några leveranser kopplade till denna sändning. Radering vägrade.
+ErrorCantDeletePaymentReconciliated=Kan inte ta bort en betalning som hade genererat en banktransaktion som conciliated
+ErrorCantDeletePaymentSharedWithPayedInvoice=Kan inte ta bort en betalning som delas av minst en faktura med status betalt
+ErrorPriceExpression1=Cannot assign to constant '%s'
+ErrorPriceExpression2=Cannot redefine built-in function '%s'
+ErrorPriceExpression3=Undefined variable '%s' in function definition
+ErrorPriceExpression4=Illegal character '%s'
+ErrorPriceExpression5=Unexpected '%s'
+ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
+ErrorPriceExpression8=Unexpected operator '%s'
+ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression10=Iperator '%s' lacks operand
+ErrorPriceExpression11=Expecting '%s'
+ErrorPriceExpression14=Division by zero
+ErrorPriceExpression17=Undefined variable '%s'
+ErrorPriceExpression19=Expression not found
+ErrorPriceExpression20=Empty expression
+ErrorPriceExpression21=Empty result '%s'
+ErrorPriceExpression22=Negative result '%s'
+ErrorPriceExpressionInternal=Internal error '%s'
+ErrorPriceExpressionUnknown=Unknown error '%s'
 
 # Warnings
-WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
+WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
 WarningSafeModeOnCheckExecDir=Varning, PHP alternativ <b>safe_mode</b> är på så kommando måste stoppas in i en katalog som deklarerats av php parameter <b>safe_mode_exec_dir.</b>
 WarningAllowUrlFopenMustBeOn=Parameter <b>allow_url_fopenär</b> måste vara <b>aktiverat</b> i filer <b>php.ini</b> för att ha den här modulen att fungera. Du måste ändra denna fil manuellt.
 WarningBuildScriptNotRunned=Script <b>%s</b> ännu inte sprang för att bygga grafik eller det inte finns några data att visa.
@@ -147,10 +167,12 @@ WarningPassIsEmpty=Varning, är databasen lösenord tom. Detta är ett säkerhet
 WarningConfFileMustBeReadOnly=Varning, konfigurationsfilen <b>(htdocs / conf / conf.php)</b> kan din skrivas över av den webbserver. Detta är ett allvarligt säkerhetshål. Ändra behörigheter på fil för att vara i skrivskyddat läge för operativsystem som användare som används av webbservern. Om du använder Windows och FAT format för din disk, måste du veta att det här filsystemet inte är möjligt att lägga till behörigheter för filen, så kan inte vara helt säker.
 WarningsOnXLines=Varningar om <b>%s</b> källrader
 WarningNoDocumentModelActivated=Ingen modell för handling generation, har aktiverats. En modell kommer att valde som standard tills du kontrollera din modul konfiguration.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole.
+WarningLockFileDoesNotExists=Varning, när installationen är klar måste du inaktivera installera / migrera verktyg genom att lägga till en fil <b>install.lock</b> i <b>katalogen %s.</b> Saknas denna fil så är det ett säkerhetshål.
 WarningUntilDirRemoved=Alla säkerhetsvarningar (synlig av admin-användare) förblir aktiv så länge sårbarheten är närvarande (eller att konstant MAIN_REMOVE_INSTALL_WARNING läggs i Start-> Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-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.
+WarningCloseAlways=Varning, är stängning göras även om beloppet varierar mellan källa och mål element. Aktivera den här funktionen med försiktighet.
+WarningUsingThisBoxSlowDown=Varning, använder denna ruta bromsa allvarligt alla sidor som visar lådan.
+WarningClickToDialUserSetupNotComplete=Inställning av ClickToDial informationen för ditt användarkonto är inte fullständiga (se fliken ClickToDial på din användarkortet).
+WarningNotRelevant=Irrelevant operation för denna datamängd
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature inaktiveras när display inställning är optimerad för blinda personer eller textbaserade webbläsare.
+WarningPaymentDateLowerThanInvoiceDate=Betalningsdag (%s) är tidigare än fakturadatum (%s) för faktura %s.
+WarningTooManyDataPleaseUseMoreFilters=För många uppgifter. Använd flera filter
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index 951a2d1d05b..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 <b>&quot;%s&quot;</b> 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: <b>%s.</b>
 DataComeFromNoWhere=Värde att infoga kommer från ingenstans i källfilen.
 DataComeFromFileFieldNb=Värde att infoga kommer från nummer <b>%s</b> fältet i källfilen.
 DataComeFromIdFoundFromRef=Värde som kommer från flera <b>%s</b> på källfil kommer att användas för att hitta ID förälder motsätta sig att använda (Så objet <b>%s</b> som har ref. Från källfilen måste finns i Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). 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 <b>fältnummer %s</b> 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 <b>ordlistan %s).</b> 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 <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Varje kod (eller id) fann i <b>ordlistan% s</b>
 CSVFormatDesc=<b>Semikolonavgränsade</b> filformat (. Csv). <br> 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=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> 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=<b>Excel-format</b> (.xls) <br> Detta är Excel 95-format (BIFF5).
+Excel2007FormatDesc=<b>Excel-format</b> (.xlsx) <br> Detta är Excel 2007-format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separerad Värde</b> filformat (.tsv) <br> Detta är en textfil format där fälten skiljs åt av en tabulator [flik].
+ExportFieldAutomaticallyAdded=<b>Fält %s</b> 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<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;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 <br> ÅÅÅÅ + ÅÅÅÅ, ÅÅÅÅMM + ÅÅÅÅMM, ÅÅÅÅMMDD + ÅÅÅÅMMDD: filter över en rad år / månader / dagar <br> > ÅÅÅÅ,> ÅÅÅÅMM,> ÅÅÅÅMMDD: filter på alla följande år / månader / dagar <br> <ÅÅÅÅ, <ÅÅÅÅMM, <ÅÅÅÅMMDD: filter på alla tidigare år / månader / dagar
+ExportNumericFilter='NNNNN "filter med en värde <br> 'NNNNN + NNNNN' filter över ett intervall av värden <br> "> NNNNN" filter med lägre värden <br> "> 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 005efed6796..e8162ce8502 100644
--- a/htdocs/langs/sv_SE/externalsite.lang
+++ b/htdocs/langs/sv_SE/externalsite.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=Setup länk till extern webbplats
 ExternalSiteURL=Extern webbplats URL
-# ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
+ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad.
+ExampleMyMenuEntry=Min meny posten
diff --git a/htdocs/langs/sv_SE/ftp.lang b/htdocs/langs/sv_SE/ftp.lang
index 6699a7be8ef..17a8cfaf436 100644
--- a/htdocs/langs/sv_SE/ftp.lang
+++ b/htdocs/langs/sv_SE/ftp.lang
@@ -9,4 +9,4 @@ FailedToConnectToFTPServer=Misslyckades att ansluta till FTP-server (%s server p
 FailedToConnectToFTPServerWithCredentials=Det gick inte att logga in på FTP-servern med definierade login / lösenord
 FTPFailedToRemoveFile=Misslyckades med att ta bort fil <b>%s.</b>
 FTPFailedToRemoveDir=Misslyckades med att ta bort katalogen <b>%s</b> (Kontrollera behörigheter och att katalogen är tom).
-# FTPPassiveMode=Passive mode
+FTPPassiveMode=Passivt läge
diff --git a/htdocs/langs/sv_SE/help.lang b/htdocs/langs/sv_SE/help.lang
index 0c590f1337e..be926acaa14 100644
--- a/htdocs/langs/sv_SE/help.lang
+++ b/htdocs/langs/sv_SE/help.lang
@@ -24,5 +24,5 @@ BackToHelpCenter=Annars, här klickar du gå <a href="%s">tillbaka för att hjä
 LinkToGoldMember=Du kan ringa en av de tränare förvalda genom Dolibarr för ditt språk (%s) genom att klicka på hans Widget (status och högsta pris uppdateras automatiskt):
 PossibleLanguages=Språk som stöds
 MakeADonation=Hjälp Dolibarr projekt, göra en donation
-# SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-# SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+SubscribeToFoundation=Hjälp Dolibarr projektet, prenumerera på stiftelsen
+SeeOfficalSupport=För officiell Dolibarr support på ditt språk: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index 62c7499ad0f..2c04b219b95 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -1,149 +1,148 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
-MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
-Employe=Employee
+Holidays=Löv
+CPTitreMenu=Löv
+MenuReportMonth=Månatlig rapport
+MenuAddCP=Gör en förfrågan ledighet
+NotActiveModCP=Du måste aktivera modulen Löv att se denna sida.
+NotConfigModCP=Du måste konfigurera modulen Lämnar för att se den här sidan. För att göra detta, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">klicka här</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
+NoCPforUser=Du har inte någon tillgänglig dag.
+AddCP=Gör en förfrågan ledighet
+Employe=Anställd
 DateDebCP=Startdatum
 DateFinCP=Slutdatum
 DateCreateCP=Datum för skapande
 DraftCP=Utkast
-ToReviewCP=Awaiting approval
+ToReviewCP=Väntar på godkännande
 ApprovedCP=Godkänd
 CancelCP=Annullerad
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
-ReviewedByCP=Will be reviewed by
+ListeCP=Lista över blad
+ReviewedByCP=Kommer att granskas av
 DescCP=Beskrivning
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+SendRequestCP=Skapa permission begäran
+DelayToRequestCP=Lämna begäran måste göras <b>minst %s dag (ar) </b> före dem.
+MenuConfCP=Redigera balans blad
+UpdateAllCP=Uppdatera bladen
+SoldeCPUser=Lämnar balans <b>är %s</b> dagar.
+ErrorEndDateCP=Du måste välja ett slutdatum senare än startdatum.
+ErrorSQLCreateCP=Ett SQL-fel uppstod under skapandet:
+ErrorIDFicheCP=Ett fel har uppstått, inte existerar begäran ledighet.
+ReturnCP=Tillbaka till föregående sida
+ErrorUserViewCP=Du har inte behörighet att läsa denna ledighet begäran.
+InfosCP=Information om begäran ledigheten
 InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+RequestByCP=Begäran från
+TitreRequestCP=Lämna begäran
+NbUseDaysCP=Antal dagars semester konsumeras
 EditCP=Redigera
 DeleteCP=Ta bort
 ActionValidCP=Validate
-ActionRefuseCP=Refuse
+ActionRefuseCP=Vägra
 ActionCancelCP=Avbryt
 StatutCP=Status
-SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Uppdatera
-CantUpdate=You cannot update this request of holidays.
-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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
-DateValidCP=Date approved
-TitleToValidCP=Send request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+SendToValidationCP=Skicka till validering
+TitleDeleteCP=Radera begäran ledighet
+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.
+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.
+ErrorDureeCP=Din ledighet framställningen inte innehåller arbetsdag.
+TitleValidCP=Godkänna begäran ledighet
+ConfirmValidCP=Är du säker på att du vill godkänna begäran ledighet?
+DateValidCP=Datum godkänd
+TitleToValidCP=Skicka permission begäran
+ConfirmToValidCP=Är du säker på att du vill skicka en begäran ledighet?
+TitleRefuseCP=Avslå begäran ledighet
+ConfirmRefuseCP=Är du säker på att du vill avslå begäran ledighet?
+NoMotifRefuseCP=Du måste välja ett skäl för att vägra begäran.
+TitleCancelCP=Avbryta begäran ledighet
+ConfirmCancelCP=Är du säker på att du vill avbryta din semester?
+DetailRefusCP=Orsak till avslag
+DateRefusCP=Datum för avslag
+DateCancelCP=Datum för annullering
+DefineEventUserCP=Tilldela en exceptionell ledighet för en användare
+addEventToUserCP=Tilldela ledighet
 MotifCP=Reason
 UserCP=Användare
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
+ErrorAddEventToUserCP=Ett fel uppstod när den exceptionella ledighet.
+AddEventToUserOkCP=Tillägget av den exceptionella ledigheten har slutförts.
+MenuLogCP=Visa loggar för ledighet förfrågningar
+LogCP=Log av uppdateringar av tillgängliga semesterdagar
+ActionByCP=Framförd av
+UserUpdateCP=För användaren
+PrevSoldeCP=Föregående Balance
 NewSoldeCP=New Balance
-alreadyCPexist=A request for holidays has already been done on this period.
+alreadyCPexist=En begäran ledigheten har redan gjorts på denna period.
 UserName=Namn
-Employee=Employee
-FirstDayOfHoliday=First day of holiday
-LastDayOfHoliday=Last day of holiday
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+Employee=Anställd
+FirstDayOfHoliday=Första dagen på semestern
+LastDayOfHoliday=Sista dagen på semestern
+HolidaysMonthlyUpdate=Månads uppdatering
+ManualUpdate=Manuell uppdatering
+HolidaysCancelation=Lämna begäran Spärr
 
 ## Configuration du Module ##
-ConfCP=Configuration of holidays module
-DescOptionCP=Description of the option
+ConfCP=Konfiguration av ledighet begäran modul
+DescOptionCP=Beskrivning av alternativ
 ValueOptionCP=Värde
-GroupToValidateCP=Group with the ability to approve holidays
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+GroupToValidateCP=Grupp med möjlighet att godkänna ledighet förfrågningar
+ConfirmConfigCP=Bekräfta konfigurationen
+LastUpdateCP=Senast automatisk uppdatering av löv fördelning
+UpdateConfCPOK=Uppdaterats.
+ErrorUpdateConfCP=Ett fel uppstod under uppdateringen, vänligen försök igen.
+AddCPforUsers=Vänligen lägg till balansen i bladen fördelning av användare genom <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">att klicka här</a> .
+DelayForSubmitCP=Sista dag för att göra en ledighet förfrågningar
+AlertapprobatortorDelayCP=Förhindra approbator om begäran ledigheten inte matchar den tidsfrist
+AlertValidatorDelayCP=Préevent den approbator om begäran ledigheten överskrider fördröjning
+AlertValidorSoldeCP=Förhindra approbator om begäran ledigheten överstiga balansen
+nbUserCP=Antal användare stöds i modul Löv
+nbHolidayDeductedCP=Antal semesterdagar som skall dras av per dag semester tas
+nbHolidayEveryMonthCP=Antal semesterdagar till varje månad
+Module27130Name= Hantering av ledighet förfrågningar
+Module27130Desc= Hantering av ledighet förfrågningar
+TitleOptionMainCP=Huvudinställningar ledighet begäran
+TitleOptionEventCP=Inställningar av ledighets begäran därom för evenemang
 ValidEventCP=Validate
-UpdateEventCP=Update events
+UpdateEventCP=Uppdateringshändelser
 CreateEventCP=Skapa
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
+NameEventCP=Händelsenamn
+OkCreateEventCP=Tillsatsen av händelsen gick bra.
+ErrorCreateEventCP=Fel skapa händelsen.
+UpdateEventOkCP=Uppdateringen av händelsen gick bra.
+ErrorUpdateEventCP=Fel vid uppdatering av händelsen.
+DeleteEventCP=Radera Händelse
+DeleteEventOkCP=Händelsen har tagits bort.
+ErrorDeleteEventCP=Fel vid borttagning av händelsen.
+TitleDeleteEventCP=Radera ett särskilt tillstånd
+TitleCreateEventCP=Skapa ett särskilt tillstånd
+TitleUpdateEventCP=Redigera eller ta bort ett särskilt tillstånd
 DeleteEventOptionCP=Ta bort
 UpdateEventOptionCP=Uppdatera
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+ErrorMailNotSend=Ett fel uppstod när du skickar e-post:
+NoCPforMonth=Ingen lämnar denna månad.
+nbJours=Antal dagar
+TitleAdminCP=Konfiguration av Leaves
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+Hello=Hallå
+HolidaysToValidate=Validera ledighets förfrågningar
+HolidaysToValidateBody=Nedan finns en ledighet begäran om att validera
+HolidaysToValidateDelay=Denna ledighet begäran kommer att ske inom en period på mindre än %s dagar.
+HolidaysToValidateAlertSolde=Användaren som gjort detta lämnar de krävs inte har tillräckligt med tillgängliga dagar.
+HolidaysValidated=Validerade ledighets förfrågningar
+HolidaysValidatedBody=Din ledighets begäran om %s till %s har validerats.
+HolidaysRefused=Begäran nekades
+HolidaysRefusedBody=Din ledighet begäran om %s till %s har nekats av följande skäl:
+HolidaysCanceled=Annulleras leaved begäran
+HolidaysCanceledBody=Din ledighet begäran om %s till %s har avbrutits.
+Permission20000=Läs du äger ledighet förfrågningar
+Permission20001=Skapa / ändra dina ledighet förfrågningar
+Permission20002=Skapa / ändra ledighetsansökningar för alla
+Permission20003=Radera ledighets förfrågningar
+Permission20004=Setup användare tillgängliga semesterdagar
+Permission20005=Omdöme logg över modifierade ledighets förfrågningar
+Permission20006=Läs lämnar månadsrapport
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index bbead3d106f..cfb2d4ee6d7 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -207,5 +207,5 @@ MigrationActioncommElement=Uppdatera uppgifter om åtgärder
 MigrationPaymentMode=Datamigrering betalning mode
 MigrationCategorieAssociation=Migreringskategorier
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Visa ej tillgängliga val
+HideNotAvailableOptions=Dölj ej tillgängliga val
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index 60c65ee763e..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,11 +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
-ClassifyBilled=Klassificera &quot;Fakturerade&quot;
+InterventionCardsAndInterventionLines=Ingrepp och linjer av interventioner
+InterventionClassifyBilled=Klassificera "Fakturerad"
+InterventionClassifyUnBilled=Classify "ofakturerade"
 StatusInterInvoiced=Fakturerade
 RelatedInterventions=Insatserna
 ShowIntervention=Visar ingripande
+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
@@ -38,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/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 40613aa97b2..1c0bdd80aa2 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -10,7 +10,7 @@ Language_da_DA=Danska
 Language_da_DK=Danskt
 Language_de_DE=Tyska
 Language_de_AT=Tyska (Österrike)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Tyska (Schweiz)
 Language_el_GR=Grekiska
 Language_en_AU=Engelska (Australien)
 Language_en_GB=Engelska (Storbritannien)
@@ -20,7 +20,7 @@ Language_en_SA=Engelska (Saudiarabien)
 Language_en_US=Engelska (USA)
 Language_en_ZA=Engelska (Sydafrika)
 Language_es_ES=Spanska
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Spanska (Dominikanska republiken)
 Language_es_AR=Spanska (Argentina)
 Language_es_CL=Spanska (Chile)
 Language_es_HN=Spanska (Honduras)
@@ -40,7 +40,7 @@ Language_fr_NC=Franska (Nya Kaledonien)
 Language_he_IL=Hebreiska
 Language_hr_HR=Kroatiska
 Language_hu_HU=Ungerska
-Language_id_ID=Indonesian
+Language_id_ID=Indonesiska
 Language_is_IS=Isländska
 Language_it_IT=Italienska
 Language_ja_JP=Japanska
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/link.lang b/htdocs/langs/sv_SE/link.lang
index 8b1efb75ef3..8601aba8abf 100644
--- a/htdocs/langs/sv_SE/link.lang
+++ b/htdocs/langs/sv_SE/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 '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Länka en ny fil / dokument
+LinkedFiles=Länkade filer och dokument
+NoLinkFound=Inga registrerade länkar
+LinkComplete=Filen har kopplats framgångsrikt
+ErrorFileNotLinked=Filen kunde inte kopplas
+LinkRemoved=Länken %s har tagits bort
+ErrorFailedToDeleteLink= Det gick inte att ta bort länk '<b>%s</b>'
+ErrorFailedToUpdateLink= Det gick inte att uppdatera länken '<b>%s</b>'
diff --git a/htdocs/langs/sv_SE/mailmanspip.lang b/htdocs/langs/sv_SE/mailmanspip.lang
index 4df2bf08bde..1568d28175b 100644
--- a/htdocs/langs/sv_SE/mailmanspip.lang
+++ b/htdocs/langs/sv_SE/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=Subscription test was executed succesfully
-# MailmanDeletionSuccess=Unsubscription test was executed succesfully
-# SynchroMailManEnabled=A Mailman update will be performed
-# SynchroSpipEnabled=A Spip update will be performed
-# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-# DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-# SPIPTitle=SPIP Content Management System
-# DescADHERENT_SPIP_SERVEUR=SPIP Server
-# DescADHERENT_SPIP_DB=SPIP database name
-# DescADHERENT_SPIP_USER=SPIP database login
-# DescADHERENT_SPIP_PASS=SPIP database password
-# AddIntoSpip=Add into SPIP
-# AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-# AddIntoSpipError=Failed to add the user in SPIP
-# DeleteIntoSpip=Remove from SPIP
-# DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-# DeleteIntoSpipError=Failed to suppress the user from SPIP
-# SPIPConnectionFailed=Failed to connect to SPIP
-# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+MailmanSpipSetup=Brevbärare och SPIP modul Setup
+MailmanTitle=Mailman sändlista systemet
+TestSubscribe=För att testa prenumeration på Mailman listor
+TestUnSubscribe=För att testa unsubscribe från Mailman listor
+MailmanCreationSuccess=Prenumerations testet utfördes framgångsrikt
+MailmanDeletionSuccess=Avbeställning testet utfördes framgångsrikt
+SynchroMailManEnabled=En Mailman uppdatering kommer att utföras
+SynchroSpipEnabled=En SPIP uppdatering kommer att utföras
+DescADHERENT_MAILMAN_ADMINPW=Mailman administratörslösenord
+DescADHERENT_MAILMAN_URL=URL för Mailman prenumerationer
+DescADHERENT_MAILMAN_UNSUB_URL=URL för Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List (ar) för automatisk inskription av nya medlemmar (separerade med ett kommatecken)
+SPIPTitle=SPIP Content Management System
+DescADHERENT_SPIP_SERVEUR=SPIP Server
+DescADHERENT_SPIP_DB=SPIP databasnamn
+DescADHERENT_SPIP_USER=SPIP databas inloggning
+DescADHERENT_SPIP_PASS=SPIP databas lösenord
+AddIntoSpip=Lägg till SPIP
+AddIntoSpipConfirmation=Är du säker på att du vill lägga till denna medlem i SPIP?
+AddIntoSpipError=Det gick inte att lägga till användaren i SPIP
+DeleteIntoSpip=Ta bort från SPIP
+DeleteIntoSpipConfirmation=Är du säker på att du vill ta bort den här medlemmen från SPIP?
+DeleteIntoSpipError=Det gick inte att undertrycka användaren från SPIP
+SPIPConnectionFailed=Det gick inte att ansluta till SPIP
+SuccessToAddToMailmanList=Lägg till %s till mailman listan %s eller SPIP databas gjort
+SuccessToRemoveToMailmanList=Borttagning av %s från mailman listan %s eller SPIP databas gjort
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 <b>%s,</b> 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 <b>%s,</b> 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 &quot;mottagare&quot;)
+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 <b>%s</b>
 MailingStatusRead=Läsa
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email <b>%s</b>  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=<b>%s</b> 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=<b>E-post %s</b> ä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=<b>% s</b> 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 <b>%s</b> 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 <b>skäl,% s</b> 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 <b>kommateckenavgränsare</b> 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 <strong>'% s'</strong> 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 15fde81699e..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.
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Det gick inte att hitta användare <b>%s</
 ErrorNoVATRateDefinedForSellerCountry=Fel, ingen moms har definierats för landet '%s'.
 ErrorNoSocialContributionForSellerCountry=Fel, inga sociala avgifter har definierats för land '%s'.
 ErrorFailedToSaveFile=Fel, kunde inte spara filen.
-ErrorOnlyPngJpgSupported=Fel, endast .png och .jpg-bild-fil stöds.
-ErrorImageFormatNotSupported=Din PHP stöder inte funktioner för att konvertera bilder av detta format.
 SetDate=Ställ in datum
 SelectDate=Välj datum
 SeeAlso=Se även %s
 BackgroundColorByDefault=Standard bakgrundsfärg
+FileNotUploaded=Filen har inte laddats upp
+FileUploaded=Filen har laddats upp
 FileWasNotUploaded=En fil är vald att bifogas, men har ännu inte laddats upp. Klicka på 'Bifoga fil' för detta.
 NbOfEntries=Antal värden
 GoToWikiHelpPage=Läs online hjälp (kräver tillgång till Internet)
@@ -77,7 +77,7 @@ IsNotDefined=odefinierad
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr autentiseringsläge är inställd för att <b>%s</b> i konfigurationsfilen <b>conf.php.</b> <br> 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
@@ -206,7 +206,7 @@ Limit=Gräns
 Limits=Gränser
 DevelopmentTeam=Development Team
 Logout=Logga ut
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
+NoLogoutProcessWithAuthMode=Ingen applikativ koppling funktionen med autentisering läge <b>%s</b>
 Connection=Anslutning
 Setup=Setup
 Alert=Alert
@@ -266,6 +266,7 @@ Afternoon=Eftermiddag
 Quadri=Quadri
 MonthOfDay=Dagens månad
 HourShort=H
+MinuteShort=mn
 Rate=Sats
 UseLocalTax=Inkludera skatt
 Bytes=Bytes
@@ -289,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
@@ -314,7 +315,7 @@ Total=Summa
 SubTotal=Delsumma
 TotalHTShort=Summa (netto)
 TotalTTCShort=Summa (inkl. moms)
-TotalHT=Total (netto efter skatt)
+TotalHT=Totalt (netto)
 TotalHTforthispage=Summa (exkl. skatt) för denna sida
 TotalTTC=Summa (inkl. moms)
 TotalTTCToYourCredit=Summa kredit (inkl. moms)
@@ -340,6 +341,7 @@ FullList=Fullständig lista
 Statistics=Statistik
 OtherStatistics=Övrig statistik
 Status=Status
+Favorite=Favorit
 ShortInfo=Info
 Ref=Ref.
 RefSupplier=Ref. leverantör
@@ -356,7 +358,7 @@ ActionNotApplicable=Ej tillämpligt
 ActionRunningNotStarted=Inte påbörjats
 ActionRunningShort=Började
 ActionDoneShort=Färdiga
-ActionUncomplete=Uncomplete
+ActionUncomplete=Icke klar
 CompanyFoundation=Företag / stiftelse
 ContactsForCompany=Kontakter till denna tredje part
 ContactsAddressesForCompany=Kontakter / adresser för denna tredje part
@@ -365,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
@@ -508,7 +511,7 @@ NbOfCustomers=Antal kunder
 NbOfLines=Antal rader
 NbOfObjects=Antal objekt
 NbOfReferers=Antal hänvisningsadresserna
-Referers=Refering objects
+Referers=Hänvisnings objekt
 TotalQuantity=Total kvantitet
 DateFromTo=Från %s till %s
 DateFrom=Från %s
@@ -541,7 +544,7 @@ Undo=Ångra
 Redo=Gör om
 ExpandAll=Expandera alla
 UndoExpandAll=Ångra expandera
-Reason=Reason
+Reason=Orsak
 FeatureNotYetSupported=Funktionen inte stöds ännu
 CloseWindow=Stäng fönster
 Question=Fråga
@@ -552,16 +555,16 @@ MailSentBy=E-post skickas med
 TextUsedInTheMessageBody=E-organ
 SendAcknowledgementByMail=Skicka Ack. via e-post
 NoEMail=Ingen e-post
-NoMobilePhone=No mobile phone
+NoMobilePhone=Ingen mobiltelefon
 Owner=Ägare
-DetectedVersion=Upptäckta version
+DetectedVersion=Upptäckt version
 FollowingConstantsWillBeSubstituted=Följande konstanter kommer att ersätta med motsvarande värde.
 Refresh=Uppdatera
 BackToList=Tillbaka till listan
 GoBack=Gå tillbaka
 CanBeModifiedIfOk=Kan ändras om det är giltigt
 CanBeModifiedIfKo=Kan ändras om inte giltigt
-RecordModifiedSuccessfully=Record ändrades korrekt
+RecordModifiedSuccessfully=Post ändrades korrekt
 RecordsModified=%s poster ändrade
 AutomaticCode=Automatisk kod
 NotManaged=Inte lyckats
@@ -578,7 +581,7 @@ TotalWoman=Totalt
 TotalMan=Totalt
 NeverReceived=Aldrig fick
 Canceled=Annullerad
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+YouCanChangeValuesForThisListFromDictionarySetup=Du kan ändra värden för denna lista från menyinställning - ordbok
 Color=Färg
 Documents=Länkade filer
 DocumentsNb=Länkade filer (%s)
@@ -593,7 +596,7 @@ ThisLimitIsDefinedInSetup=Dolibarr gräns (meny hem-setup-säkerhet): %s Kb, PHP
 NoFileFound=Inga dokument har sparats i denhär katalogen
 CurrentUserLanguage=Nuvarande språk
 CurrentTheme=Nuvarande tema
-CurrentMenuManager=Current menu manager
+CurrentMenuManager=Nuvarande menyhanterare
 DisabledModules=Avaktiverade moduler
 For=För
 ForCustomer=För kund
@@ -607,13 +610,13 @@ Notes=Anteckningar
 AddNewLine=Lägg till ny rad
 AddFile=Lägg till fil
 ListOfFiles=Förteckning över tillgängliga filer
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
+FreeZone=Fritt inlägg
+FreeLineOfType=Fritt inlägg typ
 CloneMainAttributes=Klona objekt med dess viktigaste attribut
 PDFMerge=PDF-dokument
 Merge=Sammanfoga
 PrintContentArea=Visa sidan för att skriva ut huvudinnehållet
-MenuManager=Menu manager
+MenuManager=Menyhanteraren
 NoMenu=Ingen undermeny
 WarningYouAreInMaintenanceMode=Varning, du är i en underhållsmode, så bara login <b>%s</b> får använda tillämpningen för tillfället.
 CoreErrorTitle=Systemfel
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Extra attribut inställning
 URLPhoto=URL foto / logo
 SetLinkToThirdParty=Länk till en annan tredje part
 CreateDraft=Skapa utkast
+SetToDraft=Tillbaka till utkast
 ClickToEdit=Klicka för att redigera
 ObjectDeleted=Objekt %s raderad
 ByCountry=Per land
@@ -663,7 +667,7 @@ ModulesSystemTools=Modulverktyg
 Test=Test
 Element=Element
 NoPhotoYet=Inga bilder tillgängliga
-HomeDashboard=Home summary
+HomeDashboard=Hem översikt
 Deductible=Avdragsgill
 from=från
 toward=mot
@@ -672,13 +676,13 @@ HelpCopyToClipboard=Använd Ctrl+C för att kopiera till klippbordet
 SaveUploadedFileWithMask=Spara filen på servern med namnet "<strong>%s</strong>" (annars "%s")
 OriginFileName=Ursprungligt filnamn
 SetDemandReason=Ställ in källa
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Definiera bankkonto
+AccountCurrency=Konto valuta
 ViewPrivateNote=Se noter
 XMoreLines=%s rader osynliga
 PublicUrl=Offentlig webbadress
-AddBox=Add box
-
+AddBox=Lägg till låda
+SelectElementAndClickRefresh=Välj ett element och klicka på uppdatera
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
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<br/>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 63e23311d96..1fcf12f9f2b 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -85,7 +85,7 @@ SubscriptionLateShort=Sent
 SubscriptionNotReceivedShort=Aldrig fått
 ListOfSubscriptions=Förteckning över abonnemang
 SendCardByMail=Sänd kort via e-post
-AddMember=Lägg till medlem
+AddMember=Skapa medlem
 NoTypeDefinedGoToSetup=Ingen medlem definierade typer. Gå till Setup - Medlemmar typer
 NewMemberType=Ny medlemstyp
 WelcomeEMail=Välkomst e-post
@@ -125,7 +125,7 @@ Date=Datum
 DateAndTime=Datum och tid
 PublicMemberCard=Medlem offentlig kort
 MemberNotOrNoMoreExpectedToSubscribe=Medlem som inte eller inte mer förväntas prenumerera
-AddSubscription=Lägg till prenumeration
+AddSubscription=Skapa prenumeration
 ShowSubscription=Visa prenumeration
 MemberModifiedInDolibarr=Medlem ändrad i Dolibarr
 SendAnEMailToMember=Skicka informations-e-post till medlem
@@ -203,3 +203,4 @@ MembersByNature=Medlemmar på sort
 VATToUseForSubscriptions=Moms-sats för prenumeration
 NoVatOnSubscription=Ingen moms för prenumeration
 MEMBER_PAYONLINE_SENDEMAIL=E-post för att varna när Dolibarr mottager en bekräftelse för en validerad betalning för en prenumeration
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
diff --git a/htdocs/langs/sv_SE/opensurvey.lang b/htdocs/langs/sv_SE/opensurvey.lang
index ea04e5fd922..97ea739efce 100644
--- a/htdocs/langs/sv_SE/opensurvey.lang
+++ b/htdocs/langs/sv_SE/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=Enkät
+Surveys=Enkäter
+OrganizeYourMeetingEasily=Organisera dina möten och enkäter lätt. Först välj typ av enkät ...
+NewSurvey=Ny enkät
+NoSurveysInDatabase=%s enkät (er) i databasen.
+OpenSurveyArea=Enkät område
+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=Få ett mail för varje omröstning
+TypeDate=Typ Datum
+TypeClassic=Typ standard
+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=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=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 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
+YesNoList=List (tom/ja/nej)
+PourContreList=Lista (tom/för/emot)
+AddNewColumn=Lägg till ny kolumn
+TitleChoice=Val av etikett
+ExportSpreadsheet=Export resultat kalkylblad
 ExpireDate=Begränsa datum
-# 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 <strong>%s</strong> does not exists.
-# OpenSurveyNothingToSetup=There is no specific setup to do.
-# PollWillExpire=Your poll will expire automatically <strong>%s</strong> 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 :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "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=Antal enkäter
+NbOfVoters=Antal av väljarna
+SurveyResults=Resultat
+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=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 <strong>enkät% s</strong> inte existerar.
+OpenSurveyNothingToSetup=Det finns ingen specifik inställning att göra.
+PollWillExpire=Din enkät förfaller <strong>automatiskt% s</strong> 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=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: <br> - Tom, <br> - "8h", "8H" eller "08:00" för att ge ett möte start timme, <br> - "8-11", "8h-11h", "8H-11H" eller "8: 00-11: 00" för att ge en mötets början och slut timme, <br> - "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=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 6ea791fb212..ad1112357ea 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -2,7 +2,7 @@
 OrdersArea=Kunder order område
 SuppliersOrdersArea=Leverantörer order område
 OrderCard=Beställ kort
-# OrderId=Order Id
+OrderId=Order Id
 Order=Beställ
 Orders=Beställningar
 OrderLine=Orderrad
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=Annullerad
 StatusOrderDraftShort=Förslag
 StatusOrderValidatedShort=Validerad
 StatusOrderSentShort=I processen
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Sändning pågår
 StatusOrderOnProcessShort=Den process
 StatusOrderProcessedShort=Bearbetade
 StatusOrderToBillShort=Till Bill
@@ -53,9 +53,9 @@ 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=Orders to bill
+MenuOrdersToBill2=Fakturerbara order
 SearchOrder=Sök ordning
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Sök en kundorder
 ShipProduct=Ship produkt
 Discount=Rabatt
 CreateOrder=Skapa ordning
@@ -65,14 +65,14 @@ ValidateOrder=Verifiera att
 UnvalidateOrder=Unvalidate För
 DeleteOrder=Radera ordning
 CancelOrder=Avbryt för
-AddOrder=Lägg ordning
+AddOrder=Skapa order
 AddToMyOrders=Lägg till i mitt order
 AddToOtherOrders=Lägg till övriga beställningar
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Lägg till förlags order
 ShowOrder=Visa att
 NoOpenedOrders=Ingen öppnade order
 NoOtherOpenedOrders=Ingen annan öppnas order
-# NoDraftOrders=No draft orders
+NoDraftOrders=Inga förslag till beslut
 OtherOrders=Övriga beställningar
 LastOrders=Senaste %s order
 LastModifiedOrders=Senast %s uppdaterad order
@@ -82,7 +82,7 @@ NbOfOrders=Antal order
 OrdersStatistics=Beställ statistik
 OrdersStatisticsSuppliers=Leverantören för statistik
 NumberOfOrdersByMonth=Antal beställningar per månad
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Mängd order per månad (netto efter skatt)
 ListOfOrders=Lista över beställningar
 CloseOrder=Stäng ordning
 ConfirmCloseOrder=Är du säker på att du vill stänga denna beställning? När en order är stängd, kan den bara faktureras.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Är du säker på att du vill återställa ordningen <b>%
 ConfirmCancelOrder=Är du säker på att du vill avbryta denna order?
 ConfirmMakeOrder=Är du säker på att du vill bekräfta att du gjort detta beställning på <b>%s?</b>
 GenerateBill=Skapa faktura
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Klassificera levereras
 ClassifyBilled=Klassificera &quot;Fakturerade&quot;
 ComptaCard=Bokföring kort
 DraftOrders=Förslag till beslut
@@ -101,7 +101,6 @@ RelatedOrders=Relaterade order
 OnProcessOrders=I processen order
 RefOrder=Ref. För
 RefCustomerOrder=Ref. kundorder
-CustomerOrder=Kundorder
 RefCustomerOrderShort=Ref. cust. För
 SendOrderByMail=Skicka beställningen per post
 ActionsOnOrder=Åtgärder för att
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON inte d
 Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON inte definierat
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Kunde inte ladda modulen fil %s
 Error_FailedToLoad_COMMANDE_ADDON_File=Kunde inte ladda modulen fil %s
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=Inga order att fakturera valda
 # Sources
 OrderSource0=Kommersiella förslag
 OrderSource1=Internet
@@ -144,25 +141,22 @@ OrderSource5=Kommersiella
 OrderSource6=Store
 QtyOrdered=Antal beställda
 AddDeliveryCostLine=Lägg till en line-kostnad som visar vikten av beslutet
-
 # Documents models
 PDFEinsteinDescription=En fullständig för-modellen (logo. ..)
 PDFEdisonDescription=En enkel ordning modell
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=En fullständig proforma faktura (logo ...)
 # Orders modes
 OrderByMail=Post
 OrderByFax=Faxa
 OrderByEMail=EMail
 OrderByWWW=Nätet
 OrderByPhone=Telefonen
-
-# 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=Faktura order
+NoOrdersToInvoice=Inga order fakturerbar
+CloseProcessedOrdersAutomatically=Klassificera "bearbetade" alla valda order.
+OrderCreation=Order skapning
+Ordered=Beställt
+OrderCreated=Din order har skapats
+OrderFail=Ett fel inträffade under din order skapande
+CreateOrders=Skapa order
+ToBillSeveralOrderSelectCustomer=För att skapa en faktura för flera ordrar, klicka först på kunden och välj sedan "%s".
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 fe9d174153f..326d05f3b36 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -1,30 +1,29 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Säkerhetskod
 Calendar=Kalender
-AddTrip=Lägg resa
 Tools=Verktyg
 ToolsDesc=Detta område är avsedd för gruppen diverse verktyg som inte finns i andra menyposter. <br><br> 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
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_SENTBYMAIL=Ingripande skickas per post
 Notify_BILL_VALIDATE=Kundfaktura validerade
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Kundfakturan Fraktpris saknas
 Notify_ORDER_SUPPLIER_APPROVE=Leverantör för godkänd
 Notify_ORDER_SUPPLIER_REFUSE=Leverantör för vägrat
 Notify_ORDER_VALIDATE=Kundorder validerade
 Notify_PROPAL_VALIDATE=Kunden förslag validerade
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Kunden propal stängd tecknat
+Notify_PROPAL_CLOSE_REFUSED=Kunden propal stängd vägrade
 Notify_WITHDRAW_TRANSMIT=Överföring tillbakadragande
 Notify_WITHDRAW_CREDIT=Credit tillbakadragande
 Notify_WITHDRAW_EMIT=Isue tillbakadragande
 Notify_ORDER_SENTBYMAIL=Kundorder skickas per post
 Notify_COMPANY_CREATE=Tredje part som skapats
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Post som skickas från tredjepartskort
 Notify_PROPAL_SENTBYMAIL=Kommersiell förslag skickas per post
 Notify_BILL_PAYED=Kundfaktura betalade
 Notify_BILL_CANCEL=Kundfaktura avbryts
@@ -34,20 +33,21 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverantör beställning skickas per post
 Notify_BILL_SUPPLIER_VALIDATE=Leverantörsfaktura validerade
 Notify_BILL_SUPPLIER_PAYED=Leverantörsfaktura betalas
 Notify_BILL_SUPPLIER_SENTBYMAIL=Leverantör faktura skickas per post
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Leverantör faktura annulleras
 Notify_CONTRACT_VALIDATE=Kontrakt validerade
 Notify_FICHEINTER_VALIDATE=Intervention validerade
 Notify_SHIPPING_VALIDATE=Frakt validerade
 Notify_SHIPPING_SENTBYMAIL=Leverans skickas per post
 Notify_MEMBER_VALIDATE=Medlem validerade
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Medlem modifierad
 Notify_MEMBER_SUBSCRIPTION=Medlem tecknat
 Notify_MEMBER_RESILIATE=Medlem resiliated
 Notify_MEMBER_DELETE=Elementet bort
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
+Notify_PROJECT_CREATE=Projekt skapande
+Notify_TASK_CREATE=Task skapade
+Notify_TASK_MODIFY=Task modifierad
+Notify_TASK_DELETE=Uppgift utgår
+SeeModuleSetup=Se modul inställnings
 NbOfAttachedFiles=Antal bifogade filer / dokument
 TotalSizeOfAttachedFiles=Total storlek på bifogade filer / dokument
 MaxSize=Maximal storlek
@@ -55,17 +55,17 @@ 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 <b>test</b> post (ordet Provningen skall i fetstil). <br> De två linjerna är åtskilda av en vagnretur.
-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__
-PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+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__ \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__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Här hittar sjöfarten __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Här hittar interventionen __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
 DemoDesc=Dolibarr är en kompakt ERP / CRM består av flera funktionella moduler. En demo som inkluderar alla moduler inte betyder något som detta inträffar aldrig. Så, flera demo profiler finns tillgängliga.
 ChooseYourDemoProfil=Välj demo profil som matchar din aktivitet ...
 DemoFundation=Hantera medlemmar av en stiftelse
@@ -80,6 +80,16 @@ ModifiedBy=Uppdaterad av %s
 ValidatedBy=Bekräftad av %s
 CanceledBy=Annullerats av %s
 ClosedBy=Stängt av %s
+CreatedById=Användarkod som skapade
+ModifiedById=Användarkod som gjorde förra förändring
+ValidatedById=Användarkod som validerats
+CanceledById=Användar-ID som annulleras
+ClosedById=Användar-ID som stängd
+CreatedByLogin=Användarinloggning som skapade
+ModifiedByLogin=Användarinloggning som gjorde förra förändring
+ValidatedByLogin=Användarinloggning som validerats
+CanceledByLogin=Användarinloggning som annullerats
+ClosedByLogin=Användarinloggning som stängde
 FileWasRemoved=Arkiv %s togs bort
 DirWasRemoved=Nummer %s togs bort
 FeatureNotYetAvailableShort=Finns i en kommande version
@@ -133,7 +143,7 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=tum
 SizeUnitfoot=fot
-SizeUnitpoint=point
+SizeUnitpoint=poäng
 BugTracker=Bug tracker
 SendNewPasswordDesc=Denna blankett kan du begära ett nytt lösenord. Det kommer att skickas till din e-postadress. <br> Förändring kommer att ha verkan först efter att klicka på bekräftelse länk inne i den här e-postmeddelandet. <br> Kontrollera dina program e läsare.
 BackToLoginPage=Tillbaka till inloggningssidan
@@ -147,12 +157,12 @@ StatsByNumberOfEntities=Statistik på antalet nationella enheter
 NumberOfProposals=Antal förslag om senaste 12 månaderna
 NumberOfCustomerOrders=Antal kundorder på senaste 12 månaderna
 NumberOfCustomerInvoices=Antal kundfakturor den senaste 12 månaderna
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
+NumberOfSupplierOrders=Antal leverantörsorder på senaste 12 månaderna
 NumberOfSupplierInvoices=Antal leverantörsfakturor på senaste 12 månaderna
 NumberOfUnitsProposals=Antal enheter på förslag om senaste 12 månaderna
 NumberOfUnitsCustomerOrders=Antal enheter på kundens order på senaste 12 månaderna
 NumberOfUnitsCustomerInvoices=Antal enheter på kundernas fakturor senaste 12 månaderna
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
+NumberOfUnitsSupplierOrders=Antal enheter på leverantörsorder på senaste 12 månaderna
 NumberOfUnitsSupplierInvoices=Antal enheter på leverantörsfakturor på senaste 12 månaderna
 EMailTextInterventionValidated=Interventionen %s har validerats.
 EMailTextInvoiceValidated=Fakturan %s har validerats.
@@ -162,7 +172,7 @@ EMailTextOrderApproved=Ordern %s har godkänts.
 EMailTextOrderApprovedBy=Ordern %s har godkänts av %s.
 EMailTextOrderRefused=Ordern %s har avslagits.
 EMailTextOrderRefusedBy=Ordern %s har avslagits %s.
-EMailTextExpeditionValidated=The shipping %s has been validated.
+EMailTextExpeditionValidated=Leveransen %s har validerats.
 ImportedWithSet=Import dataunderlaget
 DolibarrNotification=Automatisk anmälan
 ResizeDesc=Ange nya <b>bredd</b> eller ny höjd. Förhållandet kommer att hållas under storleksändring ...
@@ -184,34 +194,35 @@ StartUpload=Starta upp
 CancelUpload=Avbryt upp
 FileIsTooBig=Filer är för stor
 PleaseBePatient=Ha tålamod ...
-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=En begäran om att ändra Dolibarr lösenord har mottagits
+NewKeyIs=Det här är din nya nycklar för att logga in
+NewKeyWillBe=Din nya knappen för att logga in på programvaran kommer att vara
+ClickHereToGoTo=Klicka här för att gå till %s
+YouMustClickToChange=Du måste dock först klicka på följande länk för att bekräfta detta lösenord förändring
+ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta mail. Dina referenser förvaras säkert.
 
 ##### 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=Shipment %s deleted from 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/paypal.lang b/htdocs/langs/sv_SE/paypal.lang
index a4d576e7f5a..d9b9f5962b7 100644
--- a/htdocs/langs/sv_SE/paypal.lang
+++ b/htdocs/langs/sv_SE/paypal.lang
@@ -10,16 +10,16 @@ PAYPAL_API_PASSWORD=API-lösenord
 PAYPAL_API_SIGNATURE=API signatur
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Erbjuder betalning &quot;integrerad&quot; (Kreditkort + Paypal) eller &quot;Paypal&quot; endast
 PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
+PaypalModeOnlyPaypal=PayPal endast
 PAYPAL_CSS_URL=Optionnal Url av CSS-formatmall om betalning sidan
 ThisIsTransactionId=Detta är id transaktion: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Lägg till URL Paypal betalning när du skickar ett dokument per post
 PAYPAL_IPN_MAIL_ADDRESS=E-postadress att omedelbart anmälan av betalning (IPN)
-PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
+PredefinedMailContentLink=Du kan klicka på den säkra länken nedan för att göra din betalning (PayPal), om det inte redan är gjort.\n\n %s\n\n
 YouAreCurrentlyInSandboxMode=Du är för närvarande i &quot;sandlåda&quot;-läget
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
-PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+NewPaypalPaymentReceived=Nya Paypal mottagen betalning
+NewPaypalPaymentFailed=Nya Paypal betalning försökt men misslyckats
+PAYPAL_PAYONLINE_SENDEMAIL=EMail att varna efter en betalning (framgång eller ej)
+ReturnURLAfterPayment=Återgå URL efter betalning
+ValidationOfPaypalPaymentFailed=Validering av Paypal betalning misslyckades
+PaypalConfirmPaymentPageWasCalledButFailed=Betalning bekräftelsesidan för Paypal kallades av Paypal utan bekräftelse misslyckades
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 061286bf548..d9456de8b17 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -28,10 +28,10 @@ ProductsAndServicesStatistics=Produkter och tjänster statistik
 ProductsStatistics=Produkter statistik
 ProductsOnSell=Tillgängliga produkter
 ProductsNotOnSell=Föråldrade produkter
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
+ProductsOnSellAndOnBuy=Produkter inte till salu eller köp
 ServicesOnSell=Tillgängliga tjänster
 ServicesNotOnSell=Föråldrade tjänster
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
+ServicesOnSellAndOnBuy=Tjänster som inte till salu eller köp
 InternalRef=Intern hänvisning
 LastRecorded=Senaste produkter / tjänster att sälja in
 LastRecordedProductsAndServices=Senaste %s inspelade produkter / tjänster
@@ -72,19 +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=En mettre en tjänst
+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=Fel Pris Kan inte vara lägre än Lägsta pris.
 Suppliers=Leverantörer
 SupplierRef=Leverantör ref.
 ShowProduct=Visa produkt
@@ -116,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
@@ -131,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?
@@ -178,12 +179,12 @@ CloneProduct=Klon produkt eller tjänst
 ConfirmCloneProduct=Är du säker på att du vill klona produkt eller tjänst <b>%s?</b>
 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
@@ -208,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
@@ -239,3 +240,10 @@ PricingRule=Prisregler
 AddCustomerPrice=Lägg till pris per kund
 ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
 PriceByCustomerLog=Pris per kundlogg
+MinimumPriceLimit=Minimipris kan inte vara lägre än %s
+MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>Use ; to separate expressions
+PriceMode=Price mode
+PriceNumeric=Number
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 3291cea2e70..b771cfecc0b 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Ref. projekt
+ProjectId=Projekt Id
 Project=Projekt
 Projects=Projekt
 SharedProject=Alla
@@ -14,7 +14,7 @@ TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din använda
 Myprojects=Mina projekt
 ProjectsArea=Projekt område
 NewProject=Nytt projekt
-AddProject=Lägg till projektet
+AddProject=Skapa projekt
 DeleteAProject=Ta bort ett projekt
 DeleteATask=Ta bort en uppgift
 ConfirmDeleteAProject=Är du säker på att du vill ta bort detta projekt?
@@ -32,20 +32,22 @@ TimeSpent=Tid som tillbringas
 TimesSpent=Tid
 RefTask=Ref. uppgift
 LabelTask=Label uppgift
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
+TaskTimeSpent=Tid som ägnas åt uppgifter
+TaskTimeUser=Användare
+TaskTimeNote=Anmärkning
+TaskTimeDate=Datum
+TasksOnOpenedProject=Tasks on opened projects
+WorkloadNotDefined=Workload not defined
 NewTimeSpent=Ny tid
 MyTimeSpent=Min tid
 MyTasks=Mina uppgifter
 Tasks=Uppgifter
 Task=Uppgift
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Uppgift startdatum
+TaskDateEnd=Uppgift slutdatum
+TaskDescription=Uppgiftsbeskrivning
 NewTask=Ny uppgift
-AddTask=Lägg till uppgift
+AddTask=Skapa uppgift
 AddDuration=Lägg varaktighet
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
@@ -54,8 +56,8 @@ MyActivities=Mina uppgifter / aktiviteter
 MyProjects=Mina projekt
 DurationEffective=Effektiv längd
 Progress=Framsteg
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Förklarades framsteg
+ProgressCalculated=Beräknat framsteg
 Time=Tid
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet
 ListOrdersAssociatedProject=Förteckning över kundens order i samband med projektet
@@ -85,46 +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=Se även uppgifter jag er inte påverkas i
-ShowMyTasksOnly=Se bara uppgifter jag påverkas
+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=Uppgift tilldelas inte dig
+TaskIsNotAffectedToYou=Uppgift inte tilldelats dig
 ErrorTimeSpentIsEmpty=Tid är tom
 ThisWillAlsoRemoveTasks=Denna åtgärd kommer också att ta bort alla aktiviteter av projekt <b>(%s</b> 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
+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
+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/propal.lang b/htdocs/langs/sv_SE/propal.lang
index 1dcf8a037fd..c4a0da04ecb 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -16,7 +16,7 @@ Prospect=Prospect
 ProspectList=Prospect lista
 DeleteProp=Ta bort kommersiella förslag
 ValidateProp=Validate kommersiella förslag
-AddProp=Lägg till förslaget
+AddProp=Skapa förslag
 ConfirmDeleteProp=Är du säker på att du vill ta bort denna kommersiella förslag?
 ConfirmValidateProp=Är du säker på att du vill validera denna kommersiella förslag?
 LastPropals=Senaste %s förslag
@@ -55,8 +55,6 @@ NoOpenedPropals=Ingen öppnade kommersiella förslag
 NoOtherOpenedPropals=Ingen annan öppnas kommersiella förslag
 RefProposal=Kommersiella förslag ref
 SendPropalByMail=Skicka kommersiella förslag per post
-FileNotUploaded=Filen var inte upp
-FileUploaded=Filen har lagts upp
 AssociatedDocuments=Handlingar i samband med förslaget:
 ErrorCantOpenDir=Kan inte öppna katalog
 DatePropal=Datum för förslag
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/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index edca71a1829..f2fc8c20068 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/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=Bokförings kod för löne utbetalningar
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Bokförings kod för finansiell kostnad
+Salary=Lön
+Salaries=Löner
+Employee=Anställd
+NewSalaryPayment=Ny löneutbetalning
+SalaryPayment=Lönebetalning
+SalariesPayments=Löneutbetalningar
+ShowSalaryPayment=Visa löneutbetalning
+THM=Genomsnitt timpris
+TJM=Genomsnittlig dagligt pris
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 08008caa374..5c4e735ad88 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=Senaste %s transporter
 SearchASending=Sök efter transport
 StatisticsOfSendings=Statistik för transporter
 NbOfSendings=Antal transporter
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Antal leveranser per månad
 SendingCard=Frakt-kort
 NewSending=Ny leverans
 CreateASending=Skapa en sändning
@@ -50,27 +50,31 @@ Enlevement=Fått av kunden
 DocumentModelSimple=Enkel förlagan
 DocumentModelMerou=Merou A5-modellen
 WarningNoQtyLeftToSend=Varning, att inga produkter väntar sändas.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistik utförda på försändelser endast valideras. Datum som används är datum för godkännandet av leveransen (planerat leveransdatum är inte alltid känt).
 DateDeliveryPlanned=Hyvlat leveransdatum
 DateReceived=Datum leverans fick
 SendShippingByEMail=Skicka leverans via e-post
-SendShippingRef=Skicka transport %s
+SendShippingRef=Inlämning av leveransen %s
 ActionsOnShipping=Evenemang på leverans
 LinkToTrackYourPackage=Länk till spåra ditt paket
 ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans sker från ordern kortet.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+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
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=Enkel handling modell för leverans kvitton
 DocumentModelTyphon=Mer komplett dokument modell för leverans intäkter (logo. ..)
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER definieras inte
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Summan av produktvolymer
+SumOfProductWeights=Summan av produktvikter
+
+# warehouse details
+DetailWarehouseNumber= Lagerinformation
+DetailWarehouseFormat= W:%s (Antal : %d)
diff --git a/htdocs/langs/sv_SE/shop.lang b/htdocs/langs/sv_SE/shop.lang
deleted file mode 100644
index 94f6e3efb88..00000000000
--- a/htdocs/langs/sv_SE/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Sista beställningen
-OnStandBy=I beredskap
-TreatmentInProgress=Behandling pågår
-LastCustomers=Senaste kunder
-OSCommerceShop=OSCommerce butik
-OSCommerce=OSCommerce
-AddProd=Sälja online
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 481efd59b1b..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
@@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Beställningen har ännu inte / inte längre statu
 StockDiffPhysicTeoric=Orsak till skillnad mellan verklig och beräknad lagerställning
 NoPredefinedProductToDispatch=Inga fördefinierade produkter för det här objektet. Så ingen sändning till lager krävs.
 DispatchVerb=Sändning
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Gräns ​​för varning
+StockLimit=Stock gräns för larm
 PhysicalStock=Fysisk lager
 RealStock=Real Stock
 VirtualStock=Virtuellt lager
@@ -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
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
+UsePhysicalStock=Använd fysiskt lager
+CurentSelectionMode=Curent urvalsläget
+CurentlyUsingVirtualStock=Virtuell lager
+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
@@ -112,14 +112,14 @@ ReplenishmentOrdersDesc=Detta är en lista över alla öppna leverantörsorder
 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=Mass movement
-MassStockMovement=Mass stock movement
+MassMovement=Massrörelse
+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 77aedee3391..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 <b>%s?</b>
 DenyingThisOrder=Att förneka denna beställning
@@ -39,4 +39,6 @@ AddSupplierOrder=Skapa leverantör för
 AddSupplierInvoice=Skapa leverantörsfaktura
 ListOfSupplierProductForSupplier=Förteckning över produkter och priser för leverantör <b>%s</b>
 NoneOrBatchFileNeverRan=Ingen eller parti <b>%s</b> sprang inte nyligen
-# SentToSuppliers=Sent to suppliers
+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 1bbec2f6eaf..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,3 +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=Klassificerad 'Återbetalas'
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index da62d760f12..34a10699b5c 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=HRM område
 UserCard=Användarkort
 ContactCard=Kontaktkort
 GroupCard=Grupp kort
@@ -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
@@ -87,7 +86,7 @@ MyInformations=Mina uppgifter
 ExportDataset_user_1=Dolibarr-användarnas behov och egenskaper
 DomainUser=Domän användare %s
 Reactivate=Återaktivera
-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=Detta formulär tillåter dig att skapa en användare internt på ditt företag / stiftelse. För att skapa en extern användare (kund, leverantör, ...) använder du knappen "Skapa Dolibarr användare" från tredje parts kontaktkort.
 InternalExternalDesc=En <b>intern</b> användare är en användare som är en del av ert företag / stiftelse. <br> En <b>extern</b> användare är en kund, leverantör eller annan. <br><br> I båda fallen definierar behörigheter rättigheter Dolibarr, även externa användare kan ha en annan meny manager än interna användare (Se startsida - Setup - Display)
 PermissionInheritedFromAGroup=Tillstånd beviljas, eftersom ärvt från en av en användares grupp.
 Inherited=Ärvda
@@ -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?
@@ -114,8 +113,10 @@ YourRole=Din roller
 YourQuotaOfUsersIsReached=Din kvot på aktiva användare är nådd!
 NbOfUsers=Nb av användare
 DontDowngradeSuperAdmin=Endast en SuperAdmin kan nedgradera en SuperAdmin
-HierarchicalResponsible=Hierarkiskt ansvarig
+HierarchicalResponsible=Handledare
 HierarchicView=Hierarkisk vy
 UseTypeFieldToChange=Använd fält Typ för att ändra
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Logga in med OpenID
+WeeklyHours=Vecko timmar
+ColorUser=Färg på användaren
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 9a9b38c0b5c..49cab6a2f77 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=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFile=Utträde fil
+SetToStatusSent=Ställ in på status "File Skickat"
+ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid"
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Betalning av %s stående order av banken
@@ -92,5 +93,5 @@ InfoTransMessage=Den stående beställning %s har transmited till bank med %s %s
 InfoTransData=Belopp: %s <br> Metode: %s <br> Datum: %s
 InfoFoot=Detta är ett automatiskt meddelande skickas av Dolibarr
 InfoRejectSubject=Stående order vägrade
-InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectMessage=Hej, <br><br> den stående beställning av faktura %s relaterad till bolagets %s, med en mängd %s har avslagits av banken. <br><br>--<br> %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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index cab2881d1fa..df4ca8e96de 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 b91bcb1f323..a24c678a2e5 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Events
 ActionsArea=Events area (Actions and tasks)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendar
+Calendars=Calendars
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+Events=Events
 EventsNb=Number of events
 MyEvents=My events
 OtherEvents=Other events
@@ -17,31 +19,33 @@ ListOfActions=List of events
 Location=Location
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 3041825db57..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 27c4fc44394..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 1b2ea17215b..5580d87b517 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 728661dfa04..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
@@ -30,3 +30,9 @@ SearchADonation=Search a donation
 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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
index 58579a74276..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Name and signature of intervening :
 NameAndSignatureOfExternalContact=Name and signature of customer :
 DocumentModelStandard=Standard document model for interventions
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Classify "Billed"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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.<br><br>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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 039d47f6aa9..f6111bac684 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated.
 DateDeliveryPlanned=Planed date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
-SendShippingRef=Send shipment %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
 ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
 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
@@ -72,3 +74,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/th_TH/shop.lang b/htdocs/langs/th_TH/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/th_TH/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index fdc0787646a..b1545d6ca3c 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
 NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
 SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang
index 06d46c7ac65..4b0501a8346 100644
--- a/htdocs/langs/th_TH/trips.lang
+++ b/htdocs/langs/th_TH/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Trip
 ListTripsAndExpenses=List of trips and expenses
 ExpensesArea=Trips and expenses area
 SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..f481824e463
--- /dev/null
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Muhasebe
+Globalparameters=Genel parametreler
+Chartofaccounts=Hesap planı
+Fiscalyear=Mali yıllar
+Menuaccount=Muhasebe hesapları
+Menuthirdpartyaccount=Üçüncü parti hesapları
+MenuTools=Araçlar
+
+ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması
+Journaux=Günlükler
+JournalFinancial=Mali günlükler
+Exports=Dışaaktarımlar
+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ı cirosu
+Back=Ciro
+
+Definechartofaccounts=Hesap planı tanımla
+Selectchartofaccounts=Hesap planı seç
+Validate=Doğrula
+Addanaccount=Muhasebe hesabı ekle
+AccountAccounting=Muhasebe hesabı
+Ventilation=Analiz
+ToDispatch=Gönderilecek
+Dispatched=Gönderilmiş
+
+CustomersVentilation=Müşterilerin analizi
+SuppliersVentilation=Tedarikçilerin analizi
+TradeMargin=Ticaret oranı
+Reports=Raporlar
+ByCustomerInvoice=Müşteri faturalarına göre
+ByMonth=Aya göre
+NewAccount=Yeni muhasebe hesabı
+Update=Güncelle
+List=Liste
+Create=Oluştur
+UpdateAccount=Bir muhasebe hesabının değiştirilmesi
+UpdateMvts=Bir hareketin değiştirilmesi
+WriteBookKeeping=Büyük defter hesap kayıtları
+Bookkeeping=Büyük Defter
+AccountBalanceByMonth=Aylık hesap bakiyesi
+
+AccountingVentilation=Analiz muhasebesi
+AccountingVentilationSupplier=Tedarikçi hesabı analizi
+AccountingVentilationCustomer=Müşteri hesabı analizi
+Line=Satır
+
+CAHTF=Tedarikçi HT toplam sipariş
+InvoiceLines=Analiz edilecek fatura kalemleri
+InvoiceLinesDone=Analiz edilen fatura kalemleri
+IntoAccount=Muhasebe hesabında
+
+Ventilate=Analiz
+VentilationAuto=Otomatik analiz
+
+Processing=İşleme
+EndProcessing=İşleme sonu
+AnyLineVentilate=Analiz edilecek herhangi bir kalem
+SelectedLines=Seçilen satırlar
+Lineofinvoice=Fatura satırı
+VentilatedinAccount=Muhasebe hesabında başarıyla analiz edildi
+NotVentilatedinAccount=Muhasebe hesabında analiz edilmedi.
+
+ACCOUNTING_SEPARATORCSV=CSV Ayırıcı
+
+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.
+ACCOUNTING_LENGTH_GACCOUNT=Genel hesapların uzunluğu
+ACCOUNTING_LENGTH_AACCOUNT=Üçüncü parti hesaplarının uzunluğu
+
+ACCOUNTING_SELL_JOURNAL=Satış günlüğü
+ACCOUNTING_PURCHASE_JOURNAL=Satınalma günlüğü
+ACCOUNTING_BANK_JOURNAL=Banka günlüğü
+ACCOUNTING_CASH_JOURNAL=Kasa günlüğü
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Çeşitli günlük
+ACCOUNTING_SOCIAL_JOURNAL=Sosyal günlük
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Transfer hesabı
+ACCOUNTING_ACCOUNT_SUSPENSE=Bekleme hesabı
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Satınalınan ürünler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılan ürünler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Satınalınan hizmetler için varsayılan muhasebe hesabı (ürün kartlarında tanımlanmışsa)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılan hizmetler için varsayılan muhasebe kodu (hizmet sayfasında tanımlanmamışsa)
+
+Doctype=Belge türü
+Docdate=Tarih
+Docref=Referans
+Numerocompte=Hesap
+Code_tiers=Üçüncü parti
+Labelcompte=Hesap etiketi
+Debit=Borç
+Credit=Alacak
+Amount=Tutar
+Sens=Sens (borsa haberleri yayınlama günlüğü)
+Codejournal=Günlük
+
+DelBookKeeping=Büyük defter kayıtlarını sil
+
+SellsJournal=Satış günlüğü
+PurchasesJournal=Satınalma günlüğü
+DescSellsJournal=Satış günlüğü
+DescPurchasesJournal=Satınalma günlüğü
+BankJournal=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üğü
+
+CashPayment=Nakit ödeme
+
+SupplierInvoicePayment=Tedarikçi faturası ödemesi
+CustomerInvoicePayment=Müşteri faturası ödemesi
+
+ThirdPartyAccount=Üçüncü parti hesabı
+
+NewAccountingMvt=Yeni hareket
+NumMvts=Hareket sayısı
+ListeMvts=Hareket listesi
+ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz
+
+ReportThirdParty=Üçüncü parti hesabını listele
+DescThirdPartyReport=Burada üçüncü parti müşterileri ve tedarikçileri ile onların muhasebe hesaplarının listesine bakın
+
+ListAccounts=Muhasebe hesapları listesi
+
+Pcgversion=Plan sürümü
+Pcgtype=Hesap sınıfı
+Pcgsubtype=Hesap sınıfı altında
+Accountparent=Hesabın kökü
+Active=Hesap özeti
+
+NewFiscalYear=Yeni mali yıl
+
+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=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
+
+ValidateHistory=Otomatikman doğrula
+
+ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
+
+FicheVentilation=Analiz kartı
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 690b1d80c69..f1710cd2aad 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -3,16 +3,16 @@ Foundation=Dernek
 Version=Sürüm
 VersionProgram=Program sürümü
 VersionLastInstall=İlk kurulan sürüm
-VersionLastUpgrade=Yükseltilen son sürüm
+VersionLastUpgrade=Son yükseltilen sürüm
 VersionExperimental=Deneysel
 VersionDevelopment=Geliştirme
 VersionUnknown=Bilinmeyen
 VersionRecommanded=Önerilen
-SessionId=Oturum ID
-SessionSaveHandler=Oturum kayıt işlemcisi
+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 <b>%s</b> kullanıcısı bağlanabilecektir.
@@ -35,28 +35,32 @@ 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 <b>%s</b> modülü etkinse etkilidir.
-RemoveLock=<b>%s</b> dosyasını, güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
-RestoreLock=<b>%s</b> 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 <b>%s</b> modülü etkinse evet etkilidir.
+RemoveLock=Bu dosyayı <b>%s</b> eğer güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
+RestoreLock=Bu dosyayı <b>%s</b> 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, <b>%s</b> den daha yüksek hassasiyet desteklenmez.
+ErrorDecimalLargerThanAreForbidden=Hata, <b>%s</b> 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=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.
+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.
 UseSearchToSelectCompany=Üçüncü parti seçimi için liste kutusu kullanmak yerine oto tamamlamalı alan kullanın
 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=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.
+UseSearchToSelectContactTooltip=Ayrıca çok fazla sayıda üçüncü partiniz varsa (>100 000), Kurulum->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectContact=Kişi seçimi için oto tamamlamalı alan kullanın (liste kutusu kullanmak yerine).
+DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
+DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 SearchFilter=Arama süzgeçi seçenekleri
 NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
-ViewFullDateActions=Üçüncü sayfada tam gün 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
@@ -65,8 +69,8 @@ ShowPreview=Önizleme göster
 PreviewNotAvailable=Önizleme yok
 ThemeCurrentlyActive=Geçerli etkin tema
 CurrentTimeZone=PHP Saat Dilimi (sunucu)
-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).
+MySQLTimeZone=ZamanDilimi MySql (veritabanı)
+TZHasNoEffect=Tarihler, sanki gönderilen dizeler olarak tutulmuş gibi veritabanı sunucusu tarafından saklanır ve çağrılır. Zaman dilimi yalnızca UNIX_TIMESTAMP işlevi kullanılırken etkilenir (bu Dolibarr tarafından kullanılmamalıdır, böylece ZD veritabanının hiçbir etkisi olmaz, veri girildikten sonra değiştirilse bile)
 Space=Boşluk
 Table=Tablo
 Fields=Alanlar
@@ -74,13 +78,13 @@ Index=Dizin
 Mask=Maske
 NextValue=Sonraki değer
 NextValueForInvoices=Sonraki değer (faturalar)
-NextValueForCreditNotes=Sonraki değer (alacak dekontları)
+NextValueForCreditNotes=Sonraki değer (iade faturaları)
 NextValueForDeposit=Sonraki değer (yatırılan)
 NextValueForReplacements=Sonraki değer (yenileme)
 MustBeLowerThanPHPLimit=Not: PHP niz yüklenen her dosyanın boyutunu, parametrelerin değeri ne olursa olsun <b>%s</b> %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<br>ClamAv için örnek: /usr/bin/clamscan
@@ -90,8 +94,8 @@ ComptaSetup=Muhasebe modülü ayarları
 UserSetup=Kullanıcı yönetimi ayarları
 MenuSetup=Menü yönetimi ayarları
 MenuLimits=Sınırlar ve doğruluk
-MenuIdParent=Ana menü ID
-DetailMenuIdParent=Ana menü ID (bir üst menü için boş)
+MenuIdParent=Ana menü Kimliği
+DetailMenuIdParent=Ana menü Kimliği (bir üst menü için boş)
 DetailPosition=Menü konumunu tanımlamak için sıra numarası
 PersonalizedMenusNotSupported=Kişiselleştirilmiş menüler desteklenmiyor
 AllMenus=Tümü
@@ -105,8 +109,8 @@ OtherSetup=Diğer ayarlar
 CurrentValueSeparatorDecimal=Ondalık ayırıcı
 CurrentValueSeparatorThousand=Binlik ayırıcı
 Destination=Hedef
-IdModule=Modül ID
-IdPermissions=İzin ID
+IdModule=Modül Kimliği
+IdPermissions=İzin Kimliği
 Modules=Modüller
 ModulesCommon=Ana modüller
 ModulesOther=Diğer modüller
@@ -118,26 +122,26 @@ 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ı
 PositionByDefault=Varsayılan sıra
-Position=Sıra
+Position=Durum
 MenusDesc=Menü yöneticisi 2 adet menü çubuğunun içeriğini tanımlar (yatay çubuk ve dikey çubuk).
 MenusEditorDesc=Menü düzenleyici, menülerde kişiselleştirilmiş girdilerin tanımlanmasına izin verir. Dolibarr ve menü girişlerinin kararsız hale gelip sürekli erişilemiyor olmaması için dikkatli kullanın.<br>Bazı modüller menülere girdi ekler (Çoğu durumlarda <b>Hepsi</b> (<b>All</b>) menüsününde). Eğer yanlışlıkla bazı girişleri kaldırdıysanız, modülleri kaldırıp tekrar etinleştirerek bunları düzeltebilirsiniz.
 MenuForUsers=Kullanıcı menüsü
-LangFile=Dosya. Lang
+LangFile=.lang dosyası
 System=Sistem
 SystemInfo=Sistem bilgileri
 SystemTools=Sistem araçları
@@ -157,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 <a href="%s"> </a> 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
@@ -195,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 <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir.
@@ -206,6 +210,7 @@ ModulesJobDesc=İş modülleri belirli bir iş için önceden tanımlanmış bas
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesMarketPlaces=Daha çok modül...
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
 WebSiteDesc=Daha çok modül arayabileceğiniz Web sitesi sağlayıcıları...
 URL=Bağlantı
 BoxesAvailable=Kutular mevcut
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=JavaScript devre dışı ise otomatiktir
 AvailableOnlyIfJavascriptNotDisabled=Yalnızca JavaScript devre dışı değilse vardır
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Yalnızca JavaScript ve Ajax devre dışı değilse vardır
 Required=Gerekli
+UsedOnlyWithTypeOption=Bazı gündem seçeneği tarafından kullanılan
 Security=Güvenlik
 Passwords=Parolalar
 DoNotStoreClearPassword=Parolaları veritabanında saklamayın silin, yalnızca şifreli değerleri saklayın (Etkinleştirme önerilir)
@@ -248,7 +254,7 @@ CurrentMenuHandler=Geçerli menü işlemcisi
 CurrentSmartphoneMenuHandler=Geçerli smartphone menü işlemcisi
 MeasuringUnit=Ölçü birimi
 Emails=E-postalar
-EMailsSetup=E-posta kurulumu
+EMailsSetup=E-posta ayarları
 EMailsDesc=Bu sayfa e-posta göndermek için PHP parametrelerini çiğnemenize izin verir. UNIX/Linux İşletim Sisteminde çoğu durumda PHP niz doğru kurulmuştur ve bu parametreler kullanışsızdır.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Sunucu (php.ini de varsayılan: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Php.ini SMTP / SMTPS Host <b>(Varsayılan:% s)</b>
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Sunucu (Unix gibi siste
 MAIN_MAIL_EMAIL_FROM=Otomatik e-postalarda gönderici (php.inide varsayılan: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Gönderilen hatalı e-postalar için kullanılacak gönderici e-postası
 MAIN_MAIL_AUTOCOPY_TO= Gönderilen bütün epostaların bir gizli karbon-kopyasını sistemli olarak gönder
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Eposta ile gönderilen tekliflerin bir karbon kopyasını bu adrese sistematik olarak gönder
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Eposta ile gönderilen siparişlerin bir karbon kopyasını bu adrese sistematik olarak gönder
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Eposta ile gönderilen faturaların bir karbon kopyasını bu adrese sistematik olarak gönder
 MAIN_DISABLE_ALL_MAILS=Bütün e-posta gönderimlerini engelle (test yada demo amacıyla)
 MAIN_MAIL_SENDMODE=E-posta göndermek için kullanılan yöntem
 MAIN_MAIL_SMTPS_ID=Doğrulama gerektirdiğinde SMTP Kimliği
@@ -314,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.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>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 "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
+DisableLinkToHelpCenter=Kullanıcı girişi sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
 DisableLinkToHelp=Sol menüde "<b>%s Çevrimiçi yardım</b>" 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?<br>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.
@@ -350,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
@@ -363,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
@@ -376,7 +385,7 @@ ExtrafieldRadio=Onay düğmesi
 ExtrafieldParamHelpselect=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...<br><br>Başka bir listeye bağlı bir liste elde etmek için :<br>1,değer1|parent_list_code:parent_key<br>2,değer2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...
 ExtrafieldParamHelpradio=Parametre listesi anahtar.değer gibi olmalı, örneğin <br><br> : <br>1,değer1<br>2,değer2<br>3,değer3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=Parametre listesi bir tablodan gelir<br>Sözdizimi : table_name:label_field:id_field::filter<br>Örnek: c_typent:libelle:id::filter<br><br>Süzgeç yalnızca etkin değeri (eg active=1) basit bir test olabilir <br> daha çok alanda süzecekseniz bu söz dizimini kullanın extra.fieldcode=... (burada kod ek alanın kodudur)<br><br>Başkasına dayalı listeyi almak için :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. 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.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 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:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
@@ -406,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
@@ -416,7 +425,7 @@ Module23Desc= Enerji tüketimlerinin izlenmesi
 Module25Name=Müşteri Siparişleri
 Module25Desc=Müşteri siparişleri yönetimi
 Module30Name=Faturalar
-Module30Desc=Müşteri faturaları ve alacak dekontları yönetimi. Tedarikçi fatura yönetimi
+Module30Desc=Müşteri faturaları ve iade faturaları yönetimi. Tedarikçi fatura yönetimi
 Module40Name=Tedarikçiler
 Module40Desc=Tedarikçi yönetimi ve satın alma (siparişler ve faturalar)
 Module42Name=Kütükler
@@ -431,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=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
 Module59Name=Bookmark4u
@@ -459,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ı)
@@ -469,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)
@@ -478,13 +487,9 @@ Module500Desc=Vergiler, sosyal katkı payları, temettüler ve maaşlar gibi öz
 Module510Name=Ücretler
 Module510Desc=Çalışanların maaş ve ödeme yönetimi
 Module600Name=Duyurlar
-Module600Desc=Dolibarr iş etkinleri için üçüncü partilerin ilgililerine eposta ile duyurular gönderin
+Module600Desc=Üçüncü parti kişilerine bazı Dolibarr iş etkinlikleriyle ilgili Eposta bildirimleri gönderin (her üçüncü parti için ayarlar tanımlanmıştır)
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
-Module800Name=Doğrudan veritabanı erişimi yoluyla OSCommerce
-Module800Desc=Doğrudan veritabanı erişimi yoluyla OSCommerce ya da OSCSS mağazası
-Module900Name=OsCommerce Türkiye WS (web servisi yoluyla)
-Module900Desc=OSCommerce mağazasını Web servisi yoluyla gösteren arayüz. Bu modül /oscommerce_ws/ws_server den sizin OSCommerce sunucusuna bileşen kurmanızı gerektirir. /oscommerce_ws/ws_server daki README dosyasına bakın.
 Module1200Name=Mantis
 Module1200Desc=Mantis entegrasyonu
 Module1400Name=Muhasebe
@@ -493,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
@@ -512,24 +521,28 @@ Module5000Name=Çoklu-firma
 Module5000Desc=Birden çok firmayı yönetmenizi sağlar
 Module6000Name=İş akışı
 Module6000Desc=İş akışı yönetimi
-Module20000Name=Tatiller
-Module20000Desc=Çalışanların tatillerini bildir ve izle
+Module20000Name=İzin İstekleri yönetimi
+Module20000Desc=Çalışanların izin isteklerini bildirin ve izleyin
+Module39000Name=Ürün kümesi
+Module39000Desc=Parti ya da seri numarası, ürünlerin son yenme tarihi ve son satma tarihi yönetimi
 Module50000Name=PayBox
 Module50000Desc=PayBox modülü ile kredi kartı ile çevrimiçi ödeme sayfası sunmak için
 Module50100Name=Satış Noktaları
 Module50100Desc=Satış Noktası modülü
-Module50200Name= Paypal
-Module50200Desc= Kredi kartı ya da Paypal ile ödeme sağlayan çevrimiçi ödeme sayfası modülü
+Module50200Name=Paypal
+Module50200Desc=Kredi kartı ya da Paypal ile ödeme sağlayan çevrimiçi ödeme sayfası modülü
+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
@@ -575,9 +588,6 @@ Permission92=Sosyal katkı payı ve KDV oluştur/düzenle
 Permission93=Sosyal katkı payı ve KDV sil
 Permission94=Sosyal katkı payı dışaaktar
 Permission95=Rapor oku
-Permission96=Dağıtım ayarla
-Permission97=Fatura kayıtları dağıtımlarını oku
-Permission98=Faturaların muhasebesel satırlarını dağıt
 Permission101=Gönderilenleri oku
 Permission102=Gönderilenleri oluştur/düzenle
 Permission104=Gönderilenleri doğrula
@@ -594,24 +604,25 @@ Permission121=Kullanıcıya bağlı üçüncü partileri oku
 Permission122=Kullanıcıya bağlı üçüncü parti oluştur/değiştir
 Permission125=Kullanıcıya bağlı üçüncü partileri sil
 Permission126=Üçüncü partileri dışaaktar
-Permission141=Proje oku (benim ilişkide olmadığım Özel olanları da)
+Permission141=Proje oku (benim ilişkide olmadığım özel olanları da)
 Permission142=Proje oluştur/değiştir (benim ilişkide olmadığım Özel olanları da)
-Permission144=Proje sil (benim ilişkide olmadığım Özel olanları da)
+Permission144=Proje sil (benim ilişkide olmadığım özel olanları da)
 Permission146=Sağlayıcıları oku
 Permission147=İstatistikleri oku
 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
-Permission171=Gezi oluştur/değiştir
-Permission172=Gezi sil
-Permission173=Gezi sil
-Permission178=Gezi dışaaktar
+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
+Permission174=Bütün gezi ve giderleri oku
+Permission178=Gezi ve gider dışaaktar
 Permission180=Tedarikçi oku
 Permission181=Tedarikçi siparişi oku
 Permission182=Tedarikçi siparişi oluştur/değiştir
@@ -668,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
@@ -698,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
@@ -714,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
@@ -730,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
@@ -753,7 +764,7 @@ Permission59002=Ticari oran tanımla
 DictionaryCompanyType=Üçüncü parti türleri
 DictionaryCompanyJuridicalType=Üçüncü parti yasal türleri
 DictionaryProspectLevel=Aday potansiyel düzeyi
-DictionaryCanton=Eyalet/Kanton
+DictionaryCanton=Eyalet/Şehir
 DictionaryRegion=Bölgeler
 DictionaryCountry=Ülkeler
 DictionaryCurrency=Para birimleri
@@ -775,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
@@ -812,11 +824,11 @@ LocalTax2IsUsedExampleES= İspanya'da, hizmet işleri yapan serbest meslek sahip
 LocalTax2IsNotUsedExampleES= İspanya’da vergi sistemine tabi olmayan işler.
 CalcLocaltax=Raporlar
 CalcLocaltax1ES=Satışlar - Satınalmalar
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax1Desc=Yerel Vergi raporları, yerek satış vergileri ile yerel satınalma vergileri farkı olarak hesaplanır
 CalcLocaltax2ES=Satınalmalar
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=Yerel Vergi raporları satınalmaların yerel vergileri toplamıdır
 CalcLocaltax3ES=Satışlar
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax3Desc=Yerel Vergi raporları satışların yerel vergileri toplamıdır
 LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanılan etiket
 LabelOnDocuments=Belgeler üzerindeki etiket
 NbOfDays=Gün Sayısı
@@ -879,11 +891,12 @@ DefaultSkin=Varsayılan dış görünüm teması
 MaxSizeList=Listenin ençok uzunluğu
 DefaultMaxSizeList=Liste için varsayılan ençok uzunluk
 MessageOfDay=Günün mesajı
-MessageLogin=Giriş sayfası mesajı
+MessageLogin=Kullanıcı girişi sayfası mesajı
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=Sisteminiz başarıyla güncellendi
 CompanyInfo=Firma/dernek bilgileri
 CompanyIds=Firma/dernek kimlikleri
@@ -907,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).
@@ -919,27 +932,27 @@ 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=<a href="%s">Ayarlar->Firma/dernek</a> 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=<b>Ayarlar->Modüller<b> 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=Infos Browser
+InfoBrowser=Tarayıcı bilgileri
 InfoOS=OS bilgileri
 InfoWebServer=Web sunucusu bilgileri
 InfoDatabase=Database bilgileri
 InfoPHP=PHP bilgileri
 InfoPerf=Bilgi performansları
-BrowserName=Browser name
-BrowserOS=Browser 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 <b>Sistem araçları->Denetim</b> menüsünden içeriği görebilir. Uyarı, bu özellik veritabanında büyük miktarda veri tüketebilir.
+BrowserName=Tarayıcı adı
+BrowserOS=Tarayıcı OS
+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 <b>Sistem araçları->Denetim</b> 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 <b>yönetici kullanıcılar</b> 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.
@@ -950,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.<br>Not: hiçbir belirli sistem ile iç PHP süreci her <b>%s</b> erişiminde oturumu temizlemeyecektir ancak erişim diğer oturumlar tarafından yapılan yapılırsa temizlenir.
 TriggersAvailable=Mevcut tetikleyiciler
-TriggersDesc=Tetikleyiciler <b>htdocs/core/triggers</b> 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 <b>htdocs/core/triggers</b> 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 <b>-NORUN</b> soneki tarafından devre dışı bırakılır.
 TriggerDisabledAsModuleDisabled=Bu dosyadaki tetikleyiciler <b>%s</b> 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.
@@ -970,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 (<b>%s</b>) belge dizinin içeriğini kaydedin(örneğin bir zip dosyası yapabilirsiniz).
@@ -981,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 <b>(% s)</b> 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(<b>%s</b>).
-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 <b>s</b> 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 <b>%s</b> 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 <b>%s</b> kullanıcısı ile bir kabuğa giriş yaptıktan sonra komut satırından çalıştırabilir ya da parolayı <b>%s</b> 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 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
+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 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
 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)
@@ -1035,9 +1048,8 @@ 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=You use drive %s but driver %s is recommended.
+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.
 SearchOptim=Optimizasyon ara
 YouHaveXProductUseSearchOptim=Veritabanında %s ürün var. Giriş-Ayarlar-Diğer den PRODUCT_DONOTSEARCH_ANYWHERE değişmezini 1 olarak eklemelisiniz. Veritabanının dizin kullanmasını sağlamak için aramayı dizelerin başlangıcıyla sınırlandırır ve hemen yanıt alırsınız.
@@ -1060,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 #####
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=%s tarafından oluşturulan bir muhasebe kodunu getir:
 ModuleCompanyCodePanicum=Boş bir muhasebe kodu girin.
 ModuleCompanyCodeDigitaria=Muhasebe kodu üçüncü parti koduna bağlıdır. Kod üçüncü parti kodunun ilk 5 karakterini izleyen birinci konumda "C" karakterinden oluşmaktadır.
 UseNotifications=Bildirimleri kullanın
-NotificationsDesc=E-posta bildirimleri özelliği, sessiz şekilde otomatik posta göndermenizi sağlar, bazı Dolibarr olayları için üçüncü şahıslara yapılandırılmıştır (müşteriler ya da tedarikçiler). Etkin bildirim ve hedef kişileri seçimi aynı anda bir üçüncü parti için yapılır.
+NotificationsDesc=Eposta bildirimleri özelliği bazı Dolibarr etkinlikleri ile ilgili sessizce otomatik posta göndermenizi sağlar. Bildirim hedefleri bu şekilde tanımlanır:<br>* üçüncü parti kişileri başına (müşteri ya da tedarikçi), her seferinde bir üçüncü parti.<br>*
 ModelModules=Belge şablonları
 DocumentModelOdt=OpenDocuments şablonlarından belgeler oluşturun (OpenOffice, KOffice, TextEdit .ODT veya .ODS dosyaları)
 WatermarkOnDraft=Taslak belge üzerinde filigran
+JSOnPaimentBill=Ödeme formunda ödeme satırlarını otomatik doldurma özelliğini etkinleştir
 CompanyIdProfChecker=Uzman Kimliği kuralları
 MustBeUnique=Benzersiz olmalıdır?
 MustBeMandatory=Üçüncü partileri oluşturmak zorunludur ?
@@ -1107,12 +1120,12 @@ WebCalCheckWebcalSetup=Webcal modülü kurulumu doğru olmayabilir.
 ##### Invoices #####
 BillsSetup=Faturalar modülünün kurulumu
 BillsDate=Fatura tarihi
-BillsNumberingModule=Fatura ve alacak dekontları numaralandırma modülü
+BillsNumberingModule=Fatura ve iade faturaları numaralandırma modülü
 BillsPDFModules=Fatura belgesi modelleri
-CreditNoteSetup=Alacak dekontları modülü kurulumu
-CreditNotePDFModules=Alacak dekontları belge modelleri
-CreditNote=Alacak dekontu
-CreditNotes=Alacak dekontları
+CreditNoteSetup=İade faturaları modülü kurulumu
+CreditNotePDFModules=İade faturaları belge modelleri
+CreditNote=İade faturası
+CreditNotes=İade faturaları
 ForceInvoiceDate=Fatura tarihini fatura doğrulama tarihine zorla
 DisableRepeatable=Tekrarlanabilir faturaları engelle
 SuggestedPaymentModesIfNotDefinedInInvoice=Varsayılan olarak faturada tanımlanmamışsa önerilen ödeme biçimi
@@ -1127,13 +1140,14 @@ CreateForm=Form oluştur
 NumberOfProductLines=Ürün satır sayısı
 ProposalsNumberingModules=Teklif numaralandırma modülü
 ProposalsPDFModules=Teklif belge modelleri
-ClassifiedInvoiced=Sınıflandırılmış faturalar
+ClassifiedInvoiced=Faturalandı olarak sınıflandı
 HideTreadedPropal=İşlenmiş teklifleri listede gizle
 AddShippingDateAbility=Nakliye tarihi özelliği ekle
 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ü
@@ -1142,6 +1156,7 @@ HideTreadedOrders=İşlem görmüş ya da iptal edilmiş siprişleri listede giz
 ValidOrderAfterPropalClosed=Teklifin kapatılmasından sonra siparişi doğrulamak için geçici teklifin izlenmemesini sağlar
 FreeLegalTextOnOrders=Siparişte serbest metin
 WatermarkOnDraftOrders=Taslak siparişlerde filigran (boşsa yoktur)
+ShippableOrderIconInList=Sipariş listesine sevk edilebilir olup olmadığını belirten bir simge koyun
 ##### Clicktodial #####
 ClickToDialSetup=TıklaAra modülü kurulumu
 ClickToDialUrlDesc=Telefon resmi üzerine tıklandığında Url aranır. URL’de aranan kişinin telefon numarası ile değişecek <br><b>__PHONETO__</b> etiketini kullanabilirsiniz
@@ -1154,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
@@ -1163,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 #####
@@ -1243,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
@@ -1306,8 +1321,8 @@ YouMayFindPerfAdviceHere=Bu sayfada bazı denetimler veya performans ile ilgili
 NotInstalled=Yüklü değil, yani sunucu bundan dolayı yavaş değil.
 ApplicativeCache=\t\nUygulamalı önbellek
 MemcachedNotAvailable=Uygulanabilir önbellek bulunamadı. Performansı Memcached önbellek sunucusu ve bu önbellek sunucusunu kullanabilecek bir modül kurarak arttırabilirsiniz.<br>Daha fazla bilgiyi buradan <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>bulabilirsiniz. Bu tür önbellek sunucusunu çok fazla web barındırıcısının sağlamadığını unutmayın.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+MemcachedModuleAvailableButNotSetup=Uygulamalı önbellek için memcached modülü bulundu ama modülün kurulumu tamamlanmamış.
+MemcachedAvailableAndSetup=Memcached modülü etkinleştirilmiş memcached sunucusunu kullanmak içindir.
 OPCodeCache=OPCode önbelleği
 NoOPCodeCacheFound=OPCode önbelleği bulunamadı. Belki XCache den başka bir OPCode önbelleği kullanabilirsiniz veya eAccelerator (iyi), belki de OPCode önbelleğiniz yoktur (çok kötü).
 HTTPCacheStaticResources=Statik kaynaklar (css, img, javascript) için HTTP önbelleği
@@ -1318,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
@@ -1328,7 +1343,7 @@ ConfirmDeleteProductLineAbility=Formlardan ürün satırı silerken onaylama
 ModifyProductDescAbility=Formlarda ürün tanımlamalarının kişiselleştirilmesi
 ViewProductDescInFormAbility=Formlarda ürün tanımlarının görselleştirilmesi (aksi durumda açılır araç ipucu olarak)
 ViewProductDescInThirdpartyLanguageAbility=Ürün açıklamalarının üçüncü partilerin dilinde gösterilmesi
-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=Ayrıca çok fazla sayıda ürününüz varsa (>100 000), Kurulum->Diğer den PRODUCT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectProduct=Bir ürün seçmek için arama formu kullanın (liste kutusu yerine).
 UseEcoTaxeAbility=Eko-Vergi Desteği (WEEE)
 SetDefaultBarcodeTypeProducts=Ürünler için kullanılacak varsayılan barkod türü
@@ -1367,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
@@ -1378,9 +1393,10 @@ MailingSetup=E-postalama modülü kurulumu
 MailingEMailFrom=EPostalama modülü tarafından gönderilen e-postalar için gönderici e-posta (gönderen)
 MailingEMailError=Hatalı e-postalar için iade e-postası (Hatalar-kime)
 ##### Notification #####
-NotificationSetup=Bildiri e-posta modülü kurulumu
+NotificationSetup=Eposta bildirimi modülü ayarları
 NotificationEMailFrom=Bildirimler için gönderilen e-postalar için gönderici e-posta (gönderen)
-ListOfAvailableNotifications=Mevcut bildirimlerin listesi (Bu liste etkin modüllere bağlıdır)
+ListOfAvailableNotifications=Her üçüncü parti için (ayarlar için üçüncü parti kartına git) bildirim ayarlayacağınız etkinlikler listesi veya sabit bir eposta ayarlama yoluyla (liste etkin modüllere bağlıdır) 
+FixedEmailTarget=Sabit eposta hedefi
 ##### Sendings #####
 SendingsSetup=Gönderme modülü kurulumu
 SendingsReceiptModel=Makbuz gönderme modeli
@@ -1408,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
@@ -1421,7 +1438,7 @@ Menu=Menü seçimi
 MenuHandler=Menü işleyicisi
 MenuModule=Kaynak modül
 HideUnauthorizedMenu= Yetkisiz menüleri gizle (gri)
-DetailId=ID menüsü
+DetailId=Kimlik menüsü
 DetailMenuHandler=Yeni menü göstermek için menü işleyicisi
 DetailMenuModule=Eğer menü girişi bir modülden geliyorsa modül adı
 DetailType=Menü türü (üst ya da sol)
@@ -1448,7 +1465,7 @@ OptionVATDefault=Nakit temelli
 OptionVATDebitOption=Tahakkuk temelli
 OptionVatDefaultDesc=KDV nedeniyle: <br> - malların tesliminde ( fatura tarihini kullanırız) <br>- hizmet ödemelerinde (borç)
 OptionVatDebitOptionDesc=KDV nedeniyle: <br> - malların tesliminde ( fatura tarihini kullanırız) <br> - hizmet faturalarında (borç)
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Seçilen seçeneğe göre KDV uygunluk süresi:
 OnDelivery=Teslimatta
 OnPayment=Ödemede
 OnInvoice=Faturada
@@ -1462,23 +1479,26 @@ 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=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_FILTER_TYPE=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
+AGENDA_DEFAULT_VIEW=Gündem menüsünü seçtiğinizde varsayılan olarak hangi sekmenin açılmasını istiyorsunuz
 ##### ClickToDial #####
 ClickToDialDesc=Bu modül, telefon numaraları ardına bir simge eklemenizi sağlar. Bu simgeye tıkladığınızda aşağıda tanımladığınız belirli bir URL ile bir sunucuyu arar. Bu Dolibarr’dan bir çağrı merkezi sisteminin aranması için kullanılır, örneğin SIP sistemindeki bir telefon numarası aranır.
 ##### 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.
@@ -1531,5 +1551,14 @@ DeleteFiscalYear=Mali yıl sil
 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 4d22018f862..4dc82ae066f 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -1,47 +1,51 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=Kimlik etkinliği
-Actions=Eylemler
-ActionsArea=Eylem alanı (Olaylar ve görevler)
-Agenda= Gündem
-Agendas= Gündemler
-Calendar= Takvim
-Calendars= Takvimler
-LocalAgenda=Yerel takvim
-AffectedTo= Etkilenen
-DoneBy= Yapan
-Events= Etkinlikler
+IdAgenda=Etkinlik kimliği
+Actions=Etkinlikler
+ActionsArea=Etkinlik alanı (Olaylar ve görevler)
+Agenda=Gündem
+Agendas=Gündemler
+Calendar=Takvim
+Calendars=Takvimler
+LocalAgenda=İç takvim
+ActionsOwnedBy=Etkinlik sahibi
+AffectedTo=Etkilenen
+DoneBy=Yapan
+Event=Etkinlik
+Events=Etkinlikler
 EventsNb=Etkinlik sayısı
 MyEvents=Etkinliklerim
 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
-ListOfEvents= Dolibarr eylem listesi
-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
+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=Etkinliği bildiren
+ActionsToDoBy=Etkinlikten etkilenen
+ActionsDoneBy=Etkinliği yapan
+ActionsForUser=Kullanıcı etkinlikleri
+ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler
+ActionAssignedTo=Event assigned to
+AllMyActions= Tüm etkinliklerim/görevlerim
+AllActions= Tüm etkinlikler/görevler
 ViewList=Liste görünümü
 ViewCal=Ay görünümü
 ViewDay=Gün görünümü
 ViewWeek=Hafta görünümü
-ViewPerUser=Kullancı başına
+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ı
@@ -49,16 +53,13 @@ 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 Ticari teklifi Eposta ile gönderildi
+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
 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
@@ -67,20 +68,25 @@ 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ı <b>login=%s</b> sınırlayacak kullanıcı <b>%s</b>.
-AgendaUrlOptions3=Çıktıyı kullanıcı <b>%s</b> tarafından oluşturulan etkinliklerle sınırlamak için<b>logina=%s</b>.
+AgendaUrlOptions2=Eylem çıktılarını eylem, oluşturan, eylemden etkilenen ya da eylemi yapan kullanıcı <b>kullanıcı girişi=%s</b> sınırlayacak kullanıcı <b>%s</b>.
+AgendaUrlOptions3=<b>kullanıcı girişi=%s</b>,  bir <b>%s</b> kullanıcısına ait eylemlerin çıkışlarını sınırlamak içindir.
 AgendaUrlOptions4=Çıktıyı kullanıcı <b>%s</b> tarafından etkilenen etkinliklerle sınırlamak için<b>logint=%s</b>.
-AgendaUrlOptions5=Çıktıyı kullanıcı<b>%s</b> tarafından yapılan etkinliklerle sınırlamak için<b>logind=%s</b>.
+AgendaUrlOptionsProject=<b>proje=PROJECT_ID</b>, bu <b>PROJECT_ID</b> projesi ile ilişkilendirilmiş eylemlerin çıkışını çıkışını sınırlamak içindir.
 AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
 AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle
 Busy=Meşgul
 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=Dış takvimleri gündemde göster
+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ı
 AgendaExtNb=Takvim sayısı %s
 ExtSiteUrlAgenda=.ical dosyasına erişmek için URL
 ExtSiteNoLabel=Tanımlama yok
+WorkingTimeRange=Çalışma saati aralığı
+WorkingDaysRange=Çalışma günleri aralığı
+AddEvent=Etkinlik oluştur
+MyAvailability=Uygunluğum
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index f9fd9894a2d..03f1d2e99b7 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -9,15 +9,15 @@ FinancialAccounts=Hesaplar
 BankAccount=Banka hesabı
 BankAccounts=Banka hesapları
 AccountRef=Ticari hesap ref
-AccountLabel=Ticari hesap etiketi
+AccountLabel=Ticari hesap adı
 CashAccount=Kasa hesabı
 CashAccounts=Kasa hesapları
 MainAccount=Ana hesap
 CurrentAccount=Cari hesap
 CurrentAccounts=Cari hesaplar
-SavingAccount=Tasarruf hesabı
-SavingAccounts=Tasarruf hesapları
-ErrorBankLabelAlreadyExists=Ticari hesap etiketi zaten var
+SavingAccount=Mevduat hesabı
+SavingAccounts=Mevduat hesapları
+ErrorBankLabelAlreadyExists=Ticari hesap adı zaten var
 BankBalance=Bakiye
 BankBalanceBefore=Önceki bakiye
 BankBalanceAfter=Sonraki bakiye
@@ -54,15 +54,15 @@ NewBankAccount=Yeni banka hesabı
 NewFinancialAccount=Yeni ticari hesap
 MenuNewFinancialAccount=Yeni ticari hesap
 NewCurrentAccount=Yeni cari hesap
-NewSavingAccount=Yeni tasarruf hesabı
+NewSavingAccount=Yeni mevduat hesabı
 NewCashAccount=Yeni kasa hesabı
 EditFinancialAccount=Hesap düzenle
 AccountSetup=Ticari hesap ayarları
 SearchBankMovement=Banka hareketi ara
 Debts=Borçlar
-LabelBankCashAccount=Banka veya kasa etiketi
+LabelBankCashAccount=Banka veya kasa adı
 AccountType=Hesap türü
-BankType0=Tasarruf hesabı
+BankType0=Mevduat hesabı
 BankType1=Cari ya da kredi kartı hesabı
 BankType2=Kasa hesabı
 IfBankAccount=Banka hesabıysa
@@ -131,7 +131,7 @@ ThisWillAlsoDeleteBankRecord=Bu oluşturulan banka işlemlerini de silecektir.
 BankMovements=Hareketler
 CashBudget=Nakit bütçesi
 PlannedTransactions=Planlanan işlemler
-Graph=Grafik
+Graph=Grafikler
 ExportDataset_banque_1=Banka işlemleri ve hesap özeti
 ExportDataset_banque_2=Banka cüzdanı
 TransactionOnTheOtherAccount=Diğer hesaptaki işlemler
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index d0cf0f860b2..643815b8abe 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -24,12 +24,12 @@ InvoiceProFormaDesc=<b>Proforma fatura</b> gerçek faturanın bir görüntüsüd
 InvoiceReplacement=Fatura değiştirme
 InvoiceReplacementAsk=Fatura değiştirme yapılacak fatura
 InvoiceReplacementDesc=<b>Fatura değiştirme</b> henüz tahsilat yapılmamış bir faturanın iptal edilmesi ve tamamen değiştirilmesi için kullanılır.<br><br>Not: Yalnızca ödeme yapılmamış faturalar değiştirilebilir. Değiştirdiğiniz fatura eğer henüz kapataılmamışsa, kullanılmamak üzere otomatik olarak kapatılacaktır.
-InvoiceAvoir=Alacak dekontu
-InvoiceAvoirAsk=Fatura düzeltmek için alacak dekontu
-InvoiceAvoirDesc=<b>Alacak Dekontu</b>bir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade ettiğinden).
-invoiceAvoirWithLines=İlk faturadan alınan kalemlerle Alacak Dekontu oluştur
-invoiceAvoirWithPaymentRestAmount=Orijinal faturaya alınan ödeme tutarı ile Alacak Dekontu oluştur
-invoiceAvoirLineWithPaymentRestAmount=Faturaya alınan ödeme tutarında Alacak Dekontu
+InvoiceAvoir=İade faturası
+InvoiceAvoirAsk=İade faturası fatura düzeltmek için kullanılır
+InvoiceAvoirDesc=<b>İade Faturası</b>bir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade ettiğinden).
+invoiceAvoirWithLines=İlk faturadan alınan kalemlerle İade Faturası oluştur
+invoiceAvoirWithPaymentRestAmount=İlk faturanın ödenmemiş bakiyeli İade Faturası
+invoiceAvoirLineWithPaymentRestAmount=Ödenmemiş kalan tutar için İade Faturası
 ReplaceInvoice=%s Faturasını değiştir
 ReplacementInvoice=Fatura değiştirme
 ReplacedByInvoice=Değiştirilen fatura %s
@@ -62,7 +62,7 @@ PaidBack=Geri ödenen
 DatePayment=Ödeme tarihi
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
-ConfirmConvertToReduc=Bu alacak dekontunu ya da nakit avans faturasını mutlak bir indirime dönüştürmek istiyor musunuz? <br>Bu tutar diğer indirimlerin arasına kaydedilecek olup bu müşteri için mevcut ya da ileride kesilecek faturada indirim olarak kullanılabilecektir.
+ConfirmConvertToReduc=Bu iade faturasını ya da nakit avans faturasını mutlak bir indirime dönüştürmek istiyor musunuz? <br>Bu tutar diğer indirimlerin arasına kaydedilecek olup bu müşteri için mevcut ya da ileride kesilecek faturada indirim olarak kullanılabilecektir.
 SupplierPayments=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
 ReceivedCustomersPayments=Müşterilerden alınan ödemeler
@@ -81,12 +81,13 @@ ValidatePayment=Ödeme doğrula
 PaymentHigherThanReminderToPay=Ödeme hatırlatmasından daha yüksek ödeme
 HelpPaymentHigherThanReminderToPay=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.<br>Girişinizi düzeltin, aksi durumda her fazla ödenen fatura için bir iade faturası oluşturmayı onaylayın ve düşünün.
 HelpPaymentHigherThanReminderToPaySupplier=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.<br>Girişinizi düzeltin, aksi durumda onaylayın.
-ClassifyPaid=‘Ödendi’ olarak sınıflandır
-ClassifyPaidPartially=‘Kısmen ödendi’ olarak sınıflandır
+ClassifyPaid=Sınıflandırma ‘Ödendi’
+ClassifyPaidPartially=Sınıflandırma ‘Kısmen ödendi’
 ClassifyCanceled=’Terkedildi’ olarak sınıflandır
 ClassifyClosed=‘Kapalı’ olarak sınıflandır
+ClassifyUnBilled=Sınıflandırma 'Faturalanmadı'
 CreateBill=Fatura oluştur
-AddBill=Fatura ya da alacak dekontu ekle
+AddBill=Fatura ya da iade faturası oluştur
 AddToDraftInvoices=Taslak fatura ekle
 DeleteBill=Fatura sil
 SearchACustomerInvoice=Müşteri faturası ara
@@ -98,13 +99,13 @@ DoPaymentBack=Geri ödeme yap
 ConvertToReduc=Gelecekteki indirime dönüştür
 EnterPaymentReceivedFromCustomer=Müşteriden alınan ödeme girin
 EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
-DisabledBecauseRemainderToPayIsZero=Engelli Çünkü geri kalan ödeme sıfırdır
+DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
 Amount=Tutar
 PriceBase=Temel fiyat
 BillStatus=Fatura durumu
 BillStatusDraft=Taslak (doğrulanma gerektirir)
-BillStatusPaid=Ödenmiş
-BillStatusPaidBackOrConverted=Ödenmiş ya da indirime dönüştürülen
+BillStatusPaid=Ödendi
+BillStatusPaidBackOrConverted=Ödenmiş ya da indirime dönüştürülmüş
 BillStatusConverted=Ödenmiş (son fatura için hazır)
 BillStatusCanceled=Terkedilmiş
 BillStatusValidated=Doğrulanmış (ödenmesi gerekir)
@@ -136,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ı
@@ -155,9 +154,9 @@ ConfirmCancelBill=<b>%s</b> Faturasını iptal etmek istediğinizden emin misini
 ConfirmCancelBillQuestion=Neden bu faturayı ‘terkedilmiş’ olarak sınıflandırmak istiyorsunuz?
 ConfirmClassifyPaidPartially=<b>%s</b> Faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz?
 ConfirmClassifyPaidPartiallyQuestion=Bu fatura tamamen ödenmemiş. Bu faturayı kapatmak için nedenler nelerdir?
-ConfirmClassifyPaidPartiallyReasonAvoir=Ödeme vadesinden önce yapıldığı için kalan bakiye <b>(%s %s)</b> indirim olarak verildi. Bir iade faturası ile KDV’yi ayarladım.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Ödeme vadesinden önce yapıldığı için kalan bakiye <b>(%s %s)</b> indirim olarak verildi. Bu indirimle KDV’yi kaybetmeyi kabul ettim.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Ödeme vadesinden önce yapıldığı için kalan bakiye <b>(%s %s)</b> indirim olarak verildi. Bu indirimdeki KDV’yi bir iade faturası olmadan kurtardım.
+ConfirmClassifyPaidPartiallyReasonAvoir=Kalan bakiye <b>(%s %s)</b> ödeme vadesinden önce yapıldığından dolayı verilmiş bir indirimdr. KDV bir iade faturasıyla ayarIanır.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Kalan ödenmemiş tutar <b>(%s %s)</b> ödeme vadesinden önce ödendiğinden bir indirim olarak verilmiştir. Burada KDV sini kaybetmeyi kabul ediyorum.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Kalan bakiye <b>(%s %s)</b> ödeme vadesinden önce yapıldığından dolayı verilmiş bir indirimdr. KDV bir iade faturasıyla düzeltilir.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Kötü müşteri
 ConfirmClassifyPaidPartiallyReasonProductReturned=Ürünler kısmen iade edildi
 ConfirmClassifyPaidPartiallyReasonOther=Diğer bir nedenle terkedilen tutar
@@ -182,23 +181,23 @@ ShowSocialContribution=Sosyal katkı payını göster
 ShowBill=Fatura göster
 ShowInvoice=Fatura göster
 ShowInvoiceReplace=Değiştirilen faturayı göster
-ShowInvoiceAvoir=Alacak dekontu göster
+ShowInvoiceAvoir=İade faturası göster
 ShowInvoiceDeposit=Nakit avans faturası göster
 ShowPayment=Ödeme göster
 File=Dosya
 AlreadyPaid=Zaten ödenmiş
 AlreadyPaidBack=Zaten geri ödenmiş
-AlreadyPaidNoCreditNotesNoDeposits=Zaten ödenmiş (alacak dekontu ve nakit avans faturası olmadan)
+AlreadyPaidNoCreditNotesNoDeposits=Zaten ödenmiş (iade faturası ve nakit avans faturası olmadan)
 Abandoned=Terkedilen
-RemainderToPay=Kalan ödeme
-RemainderToTake=Kalan alacak
-RemainderToPayBack=Kalan geri ödeme
+RemainderToPay=Ödenmemiş kalan
+RemainderToTake=Alınacak kalan tutar
+RemainderToPayBack=Geri ödenecek kalan tutar
 Rest=Bekleyen
 AmountExpected=İstenen tutar
 ExcessReceived=Fazla alınan
 EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
-SendBillRef=%s Faturasını gönder
-SendReminderBillRef=%s Faturasını gönder (hatırlatma)
+SendBillRef=%s faturasının gönderilmesi
+SendReminderBillRef=%s faturasının gönderilmesi (anımsatma)
 StandingOrders=Ödeme talimatları
 StandingOrder=Ödeme talimatı
 NoDraftBills=Hiç taslak fatura yok
@@ -218,19 +217,18 @@ 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
-Billed=Faturalandı
-RepeatableInvoice=Ön tanımlı fatura
-RepeatableInvoices=Ön tanımlı faturalar
-Repeatable=Ön tanımlı
-Repeatables=Ön tanımlı
-ChangeIntoRepeatableInvoice=Ön tanımlıya dönüştür
-CreateRepeatableInvoice=Ön tanımlı fatura oluştur
-CreateFromRepeatableInvoice=Ön tanımlı faturadan oluştur
+Billed=Faturalanmış
+RepeatableInvoice=Fatura şablonu
+RepeatableInvoices=Fatura şablonları
+Repeatable=Şablon
+Repeatables=Şablonlar
+ChangeIntoRepeatableInvoice=Fatura şablonuna dönüştür
+CreateRepeatableInvoice=Fatura şablonu oluştur
+CreateFromRepeatableInvoice=Fatura şablonundan oluştur
 CustomersInvoicesAndInvoiceLines=Müşteri faturaları ve fatura satırları
 CustomersInvoicesAndPayments=Müşteri faturaları ve ödemeleri
 ExportDataset_invoice_1=Müşteri faturaları listesi ve fatura satırları
@@ -247,13 +245,13 @@ AddRelativeDiscount=Göreceli indirim oluştur
 EditRelativeDiscount=Göreceli indirim düzenle
 AddGlobalDiscount=Mutlak indirim ekle
 EditGlobalDiscounts=Mutlak indirim düzenle
-AddCreditNote=Alacak Dekontu oluştur
+AddCreditNote=İade faturası oluştur
 ShowDiscount=İndirim göster
 ShowReduc=Kesinti göster
 RelativeDiscount=Göreceli indirim
 GlobalDiscount=Genel indirim
-CreditNote=Alacak dekontu
-CreditNotes=Alacak dekontları
+CreditNote=İade faturası
+CreditNotes=İade faturaları
 Deposit=Nakit avans
 Deposits=Nakit avanslar
 DiscountFromCreditNote=İade faturası %s ten indirim
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=İki yeni indirimin toplamı orijinal indir
 ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz?
 RelatedBill=İlgili fatura
 RelatedBills=İlgili faturalar
+LatestRelatedBill=Son ilgili fatura
+WarningBillExist=Uyarı, bir yada çok fatura zaten var
 
 # PaymentConditions
 PaymentConditionShortRECEP=Derhal
@@ -368,15 +368,15 @@ UseLine=Uygula
 UseDiscount=İndirim kullan
 UseCredit=Kredi kullan
 UseCreditNoteInInvoicePayment=Bu alacağın ödeme miktarını düşür
-MenuChequeDeposits=Çek mevduatı
+MenuChequeDeposits=Çek hesabı
 MenuCheques=Çekler
 MenuChequesReceipts=Çek makbuzları
-NewChequeDeposit=Yeni mevduat
+NewChequeDeposit=Yeni hesap
 ChequesReceipts=Çek makbuzları
-ChequesArea=Çek mevduat alanı
-ChequeDeposits=Çek mevduatları
+ChequesArea=Çek hesabı alanı
+ChequeDeposits=Çek hesapları
 Cheques=Çekler
-CreditNoteConvertedIntoDiscount=Bu alacak dekontu ya da nakit avans faturası %s durumuna dönüştürüldü
+CreditNoteConvertedIntoDiscount=Bu iade faturası ya da nakit avans faturası %s durumuna dönüştürüldü
 UsBillingContactAsIncoiveRecipientIfExist=Fatura alıcısı olarak üçüncü parti adresi yerine müşteri faturası kişi adresini kullan
 ShowUnpaidAll=Tüm ödenmemiş faturaları göster
 ShowUnpaidLateOnly=Ödenmemiş bütün faturaları göster
@@ -389,7 +389,7 @@ CantRemovePaymentWithOneInvoicePaid=En az bir fatura ödenmiş olarak sınıflan
 ExpectedToPay=Beklenen ödeme
 PayedByThisPayment=Bu ödeme ile ödenmiş
 ClosePaidInvoicesAutomatically=Tamamı ödenmiş bütün standart ve değiştirilmiş faturaları "Ödendi" olarak sınıflandır.
-ClosePaidCreditNotesAutomatically=Tamamı ödenmiş alacak dekontlarını "Ödendi" olarak sınıflandır.
+ClosePaidCreditNotesAutomatically=Tamamı ödenmiş iade faturalarını "Ödendi" olarak sınıflandır.
 AllCompletelyPayedInvoiceWillBeClosed=Bakiyesi kalmayan bütün faturalar otomatikmen kapatılarak "Ödendi" durumuna getirilecektir.
 ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
@@ -398,8 +398,8 @@ NoteListOfYourUnpaidInvoices=Not: Bu liste, satış temsilcisi olarak bağlı ol
 RevenueStamp=Bandrol
 YouMustCreateInvoiceFromThird=Bu seçenek, yalnızca fatura oluştururken, üçüncü parti *müşteri* sekmesinde belirir
 PDFCrabeDescription=Fatura PDF şablonu Crabe. Tam fatura şablonu  (Önerilen şablon)
-TerreNumRefModelDesc1=Standart faturalar için numarayı  %syymm-nnnn biçiminde ve alacak dekontları için %syymm-nnnn biçiminde göster, yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir.
-MarsNumRefModelDesc1=Belge numarasını, standart faturalar için %syymm-nnnn, değiştirilen faturalar için %syymm-nnnn, alacak dekontları için %syymm-nnnn ve nakit avans faturaları için %syymm-nnnn biçiminde verir. Burada yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir
+TerreNumRefModelDesc1=Standart faturalar için numarayı  %syymm-nnnn biçiminde ve iade faturaları için %syymm-nnnn biçiminde göster, yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir.
+MarsNumRefModelDesc1=Belge numarasını, standart faturalar için %syymm-nnnn, değiştirilen faturalar için %syymm-nnnn, iade faturaları için %syymm-nnnn ve nakit avans faturaları için %syymm-nnnn biçiminde verir. Burada yy yıl, mm ay ve nnnn boşluksuz ve 0 olmayan bir dizidir
 TerreNumRefModelError=$syymm ile başlayan bir fatura hali hazırda vardır ve bu sıra dizisi için uygun değildir. Bu modülü etkinleştirmek için onu kaldırın ya da adını değiştirin.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Müşteri fatura izleme temsilci
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 3407f90d6dc..5d88bf29ebc 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -7,11 +7,12 @@ BoxLastSupplierBills=Son tedarikçi faturaları
 BoxLastCustomerBills=Son müşteri faturaları
 BoxOldestUnpaidCustomerBills=En eski ödenmemiş müşteri faturaları
 BoxOldestUnpaidSupplierBills=En eski ödenmemiş tedarikçi faturaları
-BoxLastProposals=Son ticari teklifler
-BoxLastProspects=Son adaylar
+BoxLastProposals=Son teklifler
+BoxLastProspects=Son değiştirilen adaylar
 BoxLastCustomers=Son değiştirilen müşteriler
 BoxLastSuppliers=Son değiştirilen tedarikçiler
 BoxLastCustomerOrders=Son müşteri siparişleri
+BoxLastValidatedCustomerOrders=Doğrulanan son müşteri siparişleri
 BoxLastBooks=Son kayıtlar
 BoxLastActions=Son eylemler
 BoxLastContracts=Son sözleşmeler
@@ -27,19 +28,22 @@ BoxTitleNbOfCustomers=Müşteri sayısı
 BoxTitleLastRssInfos=%s ten en son %s haberler
 BoxTitleLastProducts=Son değiştirilen % s ürün/hizmet
 BoxTitleProductsAlertStock=Stok uyarısındaki ürünler
-BoxTitleLastCustomerOrders=Son değiştirilen %s müşteri siparişi
+BoxTitleLastCustomerOrders=Son %s müşteri siparişi
+BoxTitleLastModifiedCustomerOrders=Değiştirilen son %s müşteri faturası
 BoxTitleLastSuppliers=Son kaydedilen %s tedarikçi
 BoxTitleLastCustomers=Son kaydedilen %s müşteri
 BoxTitleLastModifiedSuppliers=Son değiştirilen %s tedarikçi
 BoxTitleLastModifiedCustomers=Son değiştirilen %s müşteri
-BoxTitleLastCustomersOrProspects=Son değiştirilen %s müşteri veya aday
-BoxTitleLastPropals=Son kaydedilen %s teklif
+BoxTitleLastCustomersOrProspects=Son %s müşteri veya aday
+BoxTitleLastPropals=Son %s teklif
+BoxTitleLastModifiedPropals=Değiştirilen son %s teklif
 BoxTitleLastCustomerBills=Son %s müşteri faturası
+BoxTitleLastModifiedCustomerBills=Değiştirilen son %s müşteri faturası
 BoxTitleLastSupplierBills=Son kaydedilen %s tedarikçi faturası
-BoxTitleLastProspects=Son kaydedilen %s aday
+BoxTitleLastModifiedSupplierBills=Değiştirilen son %s tedarikçi faturası
 BoxTitleLastModifiedProspects=Son değiştirilen %s aday
 BoxTitleLastProductsInContract=Bir sözleşmedeki son  %s ürün/hizmet
-BoxTitleLastModifiedMembers=Son değiştirilen %s üye
+BoxTitleLastModifiedMembers=Son %s üye
 BoxTitleLastFicheInter=Değiştirilen son %s müdahale
 BoxTitleOldestUnpaidCustomerBills=En eski ödenmemiş %s müşteri faturası
 BoxTitleOldestUnpaidSupplierBills=En eski ödenmemiş %s tedarikçi faturası
@@ -50,7 +54,7 @@ BoxTitleTotalUnpaidSuppliersBills=Ödenmemiş tedarikçi faturaları
 BoxTitleLastModifiedContacts=Son değiştirilen %s kişi/adres
 BoxMyLastBookmarks=En son %s yerimim
 BoxOldestExpiredServices=Süresi dolmuş en eski etkin hizmetler
-BoxLastExpiredServices=Etkinlik hizmet süresi dolmuş enson %s eski kişi
+BoxLastExpiredServices=Etkinlik hizmet süresi dolmuş son %s en eski kişi
 BoxTitleLastActionsToDo=Son yapılan %s eylem
 BoxTitleLastContracts=Son %s sözleşme
 BoxTitleLastModifiedDonations=Son değiştirilen %s bağış
@@ -77,8 +81,9 @@ NoRecordedContracts=Kayıtlı sözleşme yok
 NoRecordedInterventions=Kayıtlı müdahale yok
 BoxLatestSupplierOrders=Son tedarikçi siparişleri
 BoxTitleLatestSupplierOrders=Son %s tedarikçi siparişi
+BoxTitleLatestModifiedSupplierOrders=Değiştirilen son %s tedarikçi siparişi
 NoSupplierOrder=Kayıtlı tedarikçi siparişi yok
-BoxCustomersInvoicesPerMonth=Aylık müşteri siparişleri
+BoxCustomersInvoicesPerMonth=Aylık müşteri faturaları
 BoxSuppliersInvoicesPerMonth=Aylık tedarikçi faturaları
 BoxCustomersOrdersPerMonth=Aylık müşteri siparişleri
 BoxSuppliersOrdersPerMonth=Aylık tedarikçi siparişleri
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 1cea1c555ae..e440ab7c4f4 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -93,7 +93,7 @@ InternalCategory=İç kategori
 CategoryContents=Kategori içeriği
 CategId=Kategori kimliği
 CatSupList=Tedarikçi kategorileri listesi
-CatCusList=Müşteri/aday kategorileri listesi
+CatCusList=Müşteri/beklenti kategorileri listesi
 CatProdList=Ürün kategorileri Listesi
 CatMemberList=Üye kategorileri Listesi
 CatContactList=Kişi kategorileri ve kişi listesi
@@ -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
@@ -111,3 +108,5 @@ ExtraFieldsCategories=Tamamlayıcı öznitelikler
 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/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 144c82d0f29..dc040a6d77c 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Ticari
-CommercialArea=Ticari alan
-CommercialCard=Ticari kart
+Commercial=Ticaret
+CommercialArea=Ticaret alanı
+CommercialCard=Ticaret kartı
 CustomerArea=Müşteriler alanı
 Customer=Müşteri
 Customers=Müşteriler
@@ -9,9 +9,9 @@ Prospect=Aday
 Prospects=Adaylar
 DeleteAction=Bir etkinlik/görev sil
 NewAction=Yeni etkinlik/görev
-AddAction=Etkinlik/görev ekle
-AddAnAction=Bir etkinlik/görev ekle
-AddActionRendezVous=Bir randevu etkinliği ekle
+AddAction=Etkinlik/görev oluştur
+AddAnAction=Bir etkinlik/görev oluştur
+AddActionRendezVous=Randevu etkinliği oluştur
 Rendez-Vous=Rendevu
 ConfirmDeleteAction=Bu etkinliği/görevi silmek istediğinizden emin misiniz?
 CardAction=Etkinlik kartı
@@ -37,15 +37,15 @@ ListOfProspects=Aday listesi
 ListOfCustomers=Müşteri listesi
 LastDoneTasks=Tamamlanan son %s görev
 LastRecordedTasks=Son kaydedilen görevler
-LastActionsToDo=Tamamlanan son %s en eski işlem
+LastActionsToDo=Tamamlanmamış son %s en eski işlem
 DoneAndToDoActionsFor=%s için tamamlanan ve yapılacak etkinlikler
 DoneAndToDoActions=Tamamlanan ve yapılacak görevler
 DoneActions=Tamamlanan etkinlikler
 DoneActionsFor=%s için tamamlanan etkinlikler
 ToDoActions=Tamamlanmamış etkinlikler
 ToDoActionsFor=%s için tamalanmamış etkinlikler
-SendPropalRef=%s teklifini gönder
-SendOrderRef=% siparişini gönder
+SendPropalRef=%s Teklifinin sunulması
+SendOrderRef=%s Teklifinin sunulması
 StatusNotApplicable=Uygulanamaz
 StatusActionToDo=Yapılacaklar
 StatusActionDone=Tamamla
@@ -62,7 +62,7 @@ LastProspectContactDone=Görüşme yapıldı
 DateActionPlanned=Planlanan etkinlik tarihi
 DateActionDone=Etkinliğin yapıldığı tarih
 ActionAskedBy=Etkinliği sunan
-ActionAffectedTo=Etkinlikten etkilenen
+ActionAffectedTo=Etkinlik sahibi
 ActionDoneBy=Etkinliği yapan
 ActionUserAsk=Raporlayan
 ErrorStatusCantBeZeroIfStarted=Eğer <b>Yapıldığı tarih</b> alanı doluysa, etkinlik başlamıştır (veya bitmiştir),  bu durumda '<b>Durum</b>' alanı 0%% olamaz.
@@ -93,4 +93,4 @@ NoData=Veri yok
 StatusProsp=Aday durumu
 DraftPropals=Taslak teklifler
 SearchPropal=Bir teklif ara
-CommercialDashboard=Ticari özet
+CommercialDashboard=Ticaret özeti
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 584486a23e7..94e1b382509 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -76,7 +76,7 @@ PhoneMobile=Mobil
 No_Email=Toplu e-posta gönderme
 Fax=Faks
 Zip=Posta Kodu
-Town=Şehir
+Town=İlçesi
 Web=Web
 Poste= Durumu
 DefaultLang=Varsayılan dili
@@ -91,8 +91,8 @@ LocalTax2IsUsedES= IRPF kullanılır
 LocalTax2IsNotUsedES= IRPF kullanılmaz
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
+TypeLocaltax1ES=RE Türü
+TypeLocaltax2ES=IRPF Türü
 TypeES=Türü
 ThirdPartyEMail=%s
 WrongCustomerCode=Müşteri kodu geçersiz
@@ -140,7 +140,7 @@ ProfId4BR=CPF
 ProfId1CH=--
 ProfId2CH=--
 ProfId3CH=Prof No 1 (Federal no)
-ProfId4CH=Prof No 2 (Ticari kayıt numarası)
+ProfId4CH=Prof No 2 (Ticaret Kayıt numarası)
 ProfId5CH=-
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
@@ -211,7 +211,7 @@ ProfId5NL=-
 ProfId6NL=-
 ProfId1PT=Prof No 1 (NIPC)
 ProfId2PT=Prof No 2 (Sosyal güvenlik numarası)
-ProfId3PT=Prof No 3 (Ticari kayıt numarası)
+ProfId3PT=Prof No 3 (Ticaret Kayıt numarası)
 ProfId4PT=Prof No 4 (Conservatory)
 ProfId5PT=-
 ProfId6PT=-
@@ -250,7 +250,7 @@ CustomerAbsoluteDiscountShort=Mutlak indirim
 CompanyHasRelativeDiscount=Bu müşterinin varsayılan bir <b>%s%%</b> indirimi var
 CompanyHasNoRelativeDiscount=Bu müşterinin varsayılan hiçbir göreceli indirimi yok
 CompanyHasAbsoluteDiscount=Bu müşterinin <b>%s</b> %s için halen indirim alacağı ya da birikimi var
-CompanyHasCreditNote=Bu müşterinin hala <b>%s</b> %s için alacak dekontu var
+CompanyHasCreditNote=Bu müşterinin hala <b>%s</b> %s için iade faturaları var
 CompanyHasNoAbsoluteDiscount=Bu müşterinin hiçbir indirim alacağı yoktur
 CustomerAbsoluteDiscountAllUsers=Mutlak indirimler (tüm kullanıcılar tarafından verilen)
 CustomerAbsoluteDiscountMy=Mutlak indirimler (kendiniz tarafından verilen)
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Varolan mutlak indirimler
 DiscountNone=Hiçbiri
 Supplier=Tedarikçi
 CompanyList=Firmaların listesi
-AddContact=Kişi ekle
-AddContactAddress=Kişi/adres ekle
+AddContact=Kişi oluştur
+AddContactAddress=Kişi/adres oluştur
 EditContact=Kişi düzenle
 EditContactAddress=Kişi/adres düzenle
 Contact=Kişi
@@ -268,17 +268,17 @@ ContactsAddresses=Kişiler/adresler
 NoContactDefinedForThirdParty=Bu üçüncü parti için tanımlı kişi yok
 NoContactDefined=Bu üçüncü parti için kişi tanımlanmamış
 DefaultContact=Varsayılan kişi
-AddCompany=Firma ekle
-AddThirdParty=Üçüncü parti ekle
-DeleteACompany=Bir firma sil
+AddCompany=Firma oluştur
+AddThirdParty=Üçüncü parti oluştur
+DeleteACompany=Firma sil
 PersonalInformations=Kişisel bilgiler
 AccountancyCode=Muhasebe kodu
 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
@@ -288,7 +288,7 @@ ProspectToContact=İletişime geçilecek aday
 CompanyDeleted="%s" Firması veritabanından silindi.
 ListOfContacts=Kişi/adres listesi
 ListOfContactsAddresses=Kişiler/adresler listesi
-ListOfProspectsContacts=Aday yetkilileri listesi
+ListOfProspectsContacts=Aday ilgilileri listesi
 ListOfCustomersContacts=Müşteri yetkilileri listesi
 ListOfSuppliersContacts=Tedarikçi yetkilileri listesi
 ListOfCompanies=Firmalar listesi
@@ -302,7 +302,7 @@ ContactForProposals=Teklif yetkilisi
 ContactForContracts=Sözleşme yetkilisi
 ContactForInvoices=Fatura yetkilisi
 NoContactForAnyOrder=Bu kişi herhangi bir siparişin yetkilisi değildir
-NoContactForAnyProposal=Bu kişi herhangi bir ticari teklifin yetkilisi değildir
+NoContactForAnyProposal=Bu kişi herhangi bir teklifin yetkilisi değildir
 NoContactForAnyContract=Bu kişi herhangi bir sözleşmenin yetkilisi değildir
 NoContactForAnyInvoice=Bu kişi herhangi bir faturanın yetkilisi değildir
 NewContact=Yeni kişi
@@ -311,7 +311,7 @@ LastContacts=Son kişiler
 MyContacts=Kişilerim
 Phones=Telefonlar
 Capital=Sermaye
-CapitalOf=%s nin sermayesi
+CapitalOf=%s firmasının sermayesi
 EditCompany=Firma düzenle
 EditDeliveryAddress=Teslimat adresi düzenle
 ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir
@@ -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
@@ -379,16 +379,16 @@ DeliveryAddressLabel=Teslimat adresi etiketi
 DeleteDeliveryAddress=Bir teslimat adresi sil
 ConfirmDeleteDeliveryAddress=Bu teslimat adresini silmek istediğinizden emin misiniz?
 NewDeliveryAddress=Yeni teslimat adresi
-AddDeliveryAddress=Adres ekle
-AddAddress=Adres ekle
+AddDeliveryAddress=Adres oluştur
+AddAddress=Adres oluştur
 NoOtherDeliveryAddress=Alternatif teslimat adresi tanımlanmamış
 SupplierCategory=Tedarikçi kategorisi
 JuridicalStatus200=Bağımsız
 DeleteFile=Dosya sil
 ConfirmDeleteFile=Bu dosyayı silmek istediğinizden emin misiniz?
-AllocateCommercial=Bir ticari tahsis et
-SelectCountry=Bir ülke seçin
-SelectCompany=Bir üçüncü parti seçin
+AllocateCommercial=Satış temsilcisine atanmış
+SelectCountry=Bir ülke seç
+SelectCompany=Bir üçüncü parti seç
 Organization=Kuruluş
 AutomaticallyGenerated=Otomatikman oluşturulur
 FiscalYearInformation=Mali yıla ait bilgi
@@ -397,16 +397,18 @@ YouMustCreateContactFirst=Eposta bildirimleri ekleyebilmek için üçüncü part
 ListSuppliersShort=Tedarikçi listesi
 ListProspectsShort=Aday Listesi
 ListCustomersShort=Müşteri listesi
-ThirdPartiesArea=Üçüncü parti alanı
+ThirdPartiesArea=Üçüncü partiler kişi alanı
 LastModifiedThirdParties=Değiştirilen son %s üçüncü parti
 UniqueThirdParties=Toplam eşsiz üçüncü parti
 InActivity=Açık
 ActivityCeased=Kapalı
 ActivityStateFilter=Etkinlik durumu
-ProductsIntoElements=Ürünleri %s 'li listele
+ProductsIntoElements=Ürünleri %s te listele
 CurrentOutstandingBill=Geçerli bekleyen fatura
 OutstandingBill=Ödenmemiş fatura için ençok tutar
 OutstandingBillReached=En yüksek ödenmemiş fatura tutarına ulaşıldı
 MonkeyNumRefModelDesc=Sayı biçimini müşteri için %syymm-nnn, tedarikçi için %syymm-nnn gösterir, yy yıl, mm ay ve nnnn ise 0 olmayan bir dizidir
 LeopardNumRefModelDesc=Müşteri/tedarikçi kodu serbesttir. Bu kod herhangi bir zamanda değiştirilebilir.
 ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...)
+SearchThirdparty=Üçüncü parti ara
+SearchContact=Kişi ara
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 86bdd1945d3..20a21a9f512 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -42,15 +42,15 @@ VATReceived=KDV alınan
 VATToCollect=KDV satınalımlar
 VATSummary=KDV bakiyesi
 LT2SummaryES=IRPF bakiyesi
-LT1SummaryES=RE Balance
+LT1SummaryES=RE Bakiye
 VATPaid=KDV ödenmiş
 SalaryPaid=Ödenen ücret
 LT2PaidES=IRPF ödenmiş
-LT1PaidES=RE Paid
+LT1PaidES=RE Ödenen
 LT2CustomerES=IRPF satışlar
 LT2SupplierES=IRPF satınalımlar
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE satışlar
+LT1SupplierES=RE satınalmalar
 VATCollected=KDV alınan
 ToPay=Ödenecek
 ToGet=Geri alınacak
@@ -83,11 +83,11 @@ DateStartPeriod=Başlangıç dönemi tarihi
 DateEndPeriod=Bitiş dönemi tarihi
 NewVATPayment=Yeni KDV ödemesi
 newLT2PaymentES=Yeni IRPF ödemesi
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Yeni RE ödemesi
 LT2PaymentES=IRPF Ödemesi
 LT2PaymentsES=IRPF Ödemeleri
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE Ödeme
+LT1PaymentsES=RE Ödemesi
 VATPayment=KDV Ödemesi
 VATPayments=KDV Ödemeleri
 SocialContributionsPayments=Sosyal katkı payı ödemeleri
@@ -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
@@ -121,14 +122,14 @@ ConfirmDeleteSocialContribution=Bu sosyal katkı payını silmek istediğinizden
 ExportDataset_tax_1=Sosyal katkı payları ve ödemeleri
 CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
 CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
-CalcModeDebt=Mod <b>%sAlacaklar-Borçlar, taahhüt hesabı%s için</b>.
-CalcModeEngagement=Mod <b>%sAlacaklar-Borçlar, kasa hesabı%s için</b>.
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeDebt=Mod <b>%sAlacaklar-Borçlar%s</b>, <b>Taahhüt hesabı içindir</b>.
+CalcModeEngagement=Mod <b>%sAlacaklar-Borçlar%s</b>, <b>kasa hesabı içindir</b>.
+CalcModeLT1= Müşteri faturaları için mod <b>%sRE tedrikçi faturaları için mod %s</b>
+CalcModeLT1Debt=Biçim durumu<b>%sRE, bu müşteri faturası için%s</b>
+CalcModeLT1Rec= Biçim durumu<b>%sRE, bu tedarikçi faturası için%s</b>
+CalcModeLT2= Biçim durumu<b>%sIRPF, bu müşteri faturası - tedarikçi faturası için%s</b>
+CalcModeLT2Debt=Biçim durumu<b>%sIRPF, bu müşteri faturası için%s</b>
+CalcModeLT2Rec= Biçim durumu<b>%sIRPF, bu tedarikçi faturası için%s</b>
 AnnualSummaryDueDebtMode=Gelir ve gider bilançosu, yıllık özet
 AnnualSummaryInputOutputMode=Gelir ve gider bilançosu, yıllık özet
 AnnualByCompaniesDueDebtMode=Gelir ve gider bilançosu, üçüncü şahıslara göre ayrıntılı, <b>%sAlacaklar-Borçlar%s</b> söz konusu <b>Taahhüt hesabı</b> modu.
@@ -143,15 +144,15 @@ RulesCAIn=- Müşterilerden alınan tüm geçerli fatura ödemelerini içerir.<b
 DepositsAreNotIncluded=- Teminat faturalarını içermez
 DepositsAreIncluded=- Teminat faturalarını içerir
 LT2ReportByCustomersInInputOutputModeES=Üçüncü parti IRPF Raporu
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
+LT1ReportByCustomersInInputOutputModeES=RE Üçüncü partiye göre rapor
 VATReportByCustomersInInputOutputMode=Müşteriye göre alınan ve ödenen KDV raporu
 VATReportByCustomersInDueDebtMode=Müşteriye göre alınan ve ödenen KDV raporu
 VATReportByQuartersInInputOutputMode=Orana göre alınan ve ödenen KDV raporu
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
+LT1ReportByQuartersInInputOutputMode=RE orana göre rapor
+LT2ReportByQuartersInInputOutputMode=IRPF orana göre rapor
 VATReportByQuartersInDueDebtMode=Orana göre alınan ve ödenen KDV raporu
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByQuartersInDueDebtMode=RE Orana göre rapor
+LT2ReportByQuartersInDueDebtMode=IRPF Orana göre rapor
 SeeVATReportInInputOutputMode=Standart bir hesaplama için <b>%sKDV kapsamı%s</b> raporuna bak
 SeeVATReportInDueDebtMode=Akış seçenekli bir hesaplama için <b>%sKDV akışı%s</b> raporuna bak
 RulesVATInServices=- Hizmetler için, rapor ödeme tarihine dayalı olarak gerçekte alınan ya da verilen KDV düzenlemelerini içerir.
@@ -187,7 +188,7 @@ AccountancyDashboard=Muhasebe özeti
 ByProductsAndServices=Ürün ve hizmete göre
 RefExt=Dış ref
 ToCreateAPredefinedInvoice=Ön tanımlı bir fatura oluşturmak için, standart bir fatura oluşturun, sonra onu doğrulamadan "Ön tanımlı faturaya dönüştür" düğmesine tıklayın.
-LinkedOrder=bu siparişle bağlantılı
+LinkedOrder=Siparişe bağlantıla
 ReCalculate=Yeniden hesapla
 Mode1=Yöntem 1
 Mode2=Yöntem 2
@@ -195,12 +196,11 @@ CalculationRuleDesc=Toplam KDV hesabı için 2 yöntem vardır:<br>Yöntem 1, he
 CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kullanmak üzere uygun yöntemi seçin ve tedarikçiyle aynı sonucu alın.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
 CalculationMode=Hesaplama modu
-AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu
-COMPTA_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu
-COMPTA_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu
-COMPTA_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu
-COMPTA_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu
-COMPTA_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu
-COMPTA_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu
-COMPTA_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu
+AccountancyJournal=Muhasebe kodu günlüğü
+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
+ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partiler için varsayılan muhasebe kodu
+CloneTax=Bir sosyal katkı payı kopyala
+ConfirmCloneTax=Bir sosyal katkı payı kopyalanmasını onayla
+CloneTaxForNextMonth=Sonraki aya kopyala
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index 068824b8b54..d5b9448378c 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Sözleşmeler alanı
 ListOfContracts=Sözleşme Listesi
-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
@@ -27,8 +27,8 @@ MenuRunningServices=Yürürlükte olan hizmetler
 MenuExpiredServices=Süresi dolmuş hizmetler
 MenuClosedServices=Kapalı hizmetler
 NewContract=Yeni sözleşme
-AddContract=Sözleşme ekle
-SearchAContract=Bir sözleşme ara
+AddContract=Sözleşme oluştur
+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=Only lines with type "Service" will be cloned.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Sözleşmeyi imzalalayacak satış temsilcisi
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 34400a5094a..2e5755e83e9 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
 About = Hakkında
 CronAbout = Cron hakkında
 CronAboutPage = Cron hakkında sayfası
-
 # Right
 Permission23101 = Planlı görev oku
 Permission23102 = Planlı görev oluştur/güncelle
@@ -20,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ı
@@ -70,7 +67,7 @@ CronStatusActiveBtn=Etkin
 CronStatusInactiveBtn=Engelle
 CronTaskInactive=Bu iş devre dışı
 CronDtLastResult=Son sonuç tarihi
-CronId=Id
+CronId=Kimlik
 CronClassFile=Sınıflar (dosyaadı.sınıf.php)
 CronModuleHelp=Dolibarr modül dizini adı (aynı zamanda dış Dolibarr modülü ile de çalışır). <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/<u>product</u>/class/product.class.php, modül değeri <i>product</i>
 CronClassFileHelp=Yüklenecek dosya adı. <BR> Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/<u>product.class.php</u>, sınıf dosya adı değeri <i>product.class.php</i>
diff --git a/htdocs/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang
index beb78b2a16a..f88670ba0b9 100644
--- a/htdocs/langs/tr_TR/dict.lang
+++ b/htdocs/langs/tr_TR/dict.lang
@@ -248,11 +248,11 @@ CountryBL=Saint Barthelemy
 CountryMF=Saint Martin
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
+CivilityMME=Bn.
+CivilityMR=Bay
+CivilityMLE=Bn.
 CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityDR=Doktor
 ##### Currencies #####
 Currencyeuros=Euro
 CurrencyAUD=AU Doları
@@ -290,6 +290,8 @@ CurrencySingXOF=CFA Frangı BCEAO
 CurrencyXPF=CFP Frangı
 CurrencySingXPF=CFP Frangı
 CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=thousandth
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
@@ -297,7 +299,7 @@ DemandReasonTypeSRC_CAMP_MAIL=Posta kampanyası
 DemandReasonTypeSRC_CAMP_EMAIL=Eposta kampanyası
 DemandReasonTypeSRC_CAMP_PHO=Telefon kampanyası
 DemandReasonTypeSRC_CAMP_FAX=Faks kampanyası
-DemandReasonTypeSRC_COMM=Ticari görüşme
+DemandReasonTypeSRC_COMM=Ticari ilgili
 DemandReasonTypeSRC_SHOP=İş yerinde görüşme
 DemandReasonTypeSRC_WOM=Başkasından duyarak
 DemandReasonTypeSRC_PARTNER=İş Ortağı
@@ -316,7 +318,7 @@ PaperFormatEUA6=Biçim A6
 PaperFormatUSLETTER=Mektup Biçimi US
 PaperFormatUSLEGAL=Yasal Biçim US
 PaperFormatUSEXECUTIVE=İş Biçimi US
-PaperFormatUSLEDGER=Defter/Tablet
+PaperFormatUSLEDGER=Defter/Tablet Biçimi
 PaperFormatCAP1=Biçim P1 Kanada
 PaperFormatCAP2=Biçim P2 Kanada
 PaperFormatCAP3=Biçim P3 Kanada
diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang
index 1994626d299..234a7e4c859 100644
--- a/htdocs/langs/tr_TR/donations.lang
+++ b/htdocs/langs/tr_TR/donations.lang
@@ -4,7 +4,7 @@ Donations=Bağışlar
 DonationRef=Bağış ref.
 Donor=Bağışçı
 Donors=Bağışçılar
-AddDonation=Bir bağış ekle
+AddDonation=Bir bağış oluştur
 NewDonation=Yeni bağış
 ShowDonation=Bağış göster
 DonationPromise=Hibe sözü
@@ -30,3 +30,9 @@ SearchADonation=Bağış ara
 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 c34c5299c29..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='<b>%s</b>' dosyası '<b>%s</b>' içine kopyalanamadı.
@@ -37,7 +37,7 @@ ErrorSupplierCodeRequired=Tedarikçi kodu gereklidir
 ErrorSupplierCodeAlreadyUsed=Tedarikçi kodu zaten kullanılmaktadır
 ErrorBadParameters=Hatalı parametreler
 ErrorBadValueForParameter=Hatalı '%s' parametresi için yanlış '%s' değeri
-ErrorBadImageFormat=Görüntü dosyası desteklenen bir biçimde değil.
+ErrorBadImageFormat=Resim dosyası desteklenen biçimde değil (PHP niz bu biçimdeki resimlerin dönüştürülme işlevini desteklemez)
 ErrorBadDateFormat=%s değeri yanlış tarih biçiminde
 ErrorWrongDate=Tarih doğru değil!
 ErrorFailedToWriteInDir=%s dizinine yazılamadı
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=<b>%s</b> girişli kullanıcı bulunamadı.
 ErrorLoginHasNoEmail=Bu kullanıcının e-posta adresi yoktur. İşlem iptal edildi.
 ErrorBadValueForCode=Güvenlik kodu için hatalı değer. Yeni değer ile tekrar deneyin...
 ErrorBothFieldCantBeNegative=%s ve %s alanlarının ikisi birden eksi olamaz
+ErrorQtyForCustomerInvoiceCantBeNegative=Müşteri faturasındaki kalem miktarı eksi olamaz
 ErrorWebServerUserHasNotPermission=Web sunucusunu çalıştırmak için kullanılan <b>%s</b> kullanıcı hesabnın bunun için izni yok
 ErrorNoActivatedBarcode=Etkinleştirilmiş barkod türü yok
 ErrUnzipFails=% ZipArchive ile sıkıştırılamıyor
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Hata, bu özelliği kulanmak için PHP nizde <b>%s</b> modül
 ErrorOpenIDSetupNotComplete=Dolibarr yapılandırma dosyasını OpenID kimlik doğrulamaya izin verecek şekilde ayarladınız, ancak OpenID hizmetine ait URL, %s değişmezine tanımlanmamıştır
 ErrorWarehouseMustDiffers=Kaynak ve hedef depo farklı olmalıdır
 ErrorBadFormat=Hatalı biçim!
-ErrorPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) önce bu faturada %s olamaz.
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üçüncü partiye bağlanmamıştır. Üyeyi varolan bir üçüncü partiye bağlayın ya da faturayla abonelik oluşturmadan önce yeni bir üçüncü parti oluşturun.
 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ış
@@ -153,4 +173,6 @@ WarningCloseAlways=Uyarı, kaynak ve hedef öğeleri arasında tutar farklı da
 WarningUsingThisBoxSlowDown=Uyarı, bu kutuyu kullanmak kutuyu gösteren tüm sayfaları ciddi olarak yavaşlatır.
 WarningClickToDialUserSetupNotComplete=Kullanıcınızın ClickToDial bilgileri ayarı tamamlanmamış (kullanıcı kartınızdaki ClickToDial tabına bakın)
 WarningNotRelevant=Bu veri kümesi için alakasız işlem
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Bu özellik, ekran görme engelliler için ya da metin tarayıcılar için ayarlandığında devre dışı kalır.
+WarningPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) daha önce, bu fatura için %s.
+WarningTooManyDataPleaseUseMoreFilters=Çok fazla veri. Lütfen daha çok süzgeç kullanın
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index 754c0e6597a..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 <b>%s</b> adıyla kaydedildi.
-ExportableFields=Verilebilir alanlar
-ExportedFields=Verilen alanlar
-ImportModelName=Alma profili adı
-ImportModelSaved=Alma profili <b>%s</b> adıyla kaydedildi.
+ExportableFields=Dışaaktarılabilir alanlar
+ExportedFields=Dışaaktarılan alanlar
+ImportModelName=İçeaktarma profili adı
+ImportModelSaved=İçeaktarma profili <b>%s</b> adıyla kaydedildi.
 ImportableFields=İçeaktarılabilir alanlar
 ImportedFields=İçeaktarılan alanlar
 DatasetToExport=Dışaaktarılacak veri kümesi
@@ -47,7 +47,7 @@ Sheet=Sayfa
 NoImportableData=İçeaktarılacak veri yok (veri içeaktarmaya izin veren tanımlara sahip bir modül yok)
 FileSuccessfullyBuilt=Dışaaktarma dosyası oluşturuldu
 SQLUsedForExport=Dışaaktarılacakı dosyayı oluşturmak için kullanılan SQL sorgusu
-LineId=Satır No
+LineId=Satır no
 LineDescription=Satır açıklaması
 LineUnitPrice=Satırın birim fiyat
 LineVATRate=Satırın KDV oranı
@@ -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: <b>%s</b>
+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: <b>%s</b>
 ErrorMissingMandatoryValue=Kaynak dosyada alan için zorunlu veri boş <b>%s</b>.
 TooMuchErrors=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> hatalı satır daha var.
 TooMuchWarnings=Kaynak dosyasında, liste sınırlandığından görüntülenmeyen <b>%s</b> 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 <b>%s</b> sayısı ile alındı.
-YouCanUseImportIdToFindRecord=Veritabanınızı <b>import_key='%s'</b> ölçütü ile süzerseniz alınmış tüm kayıtları görebilirsiniz.
+YouCanUseImportIdToFindRecord=Veritabanınızı <b>import_key='%s'</b> ö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ı:<b>%s</b>.
-NbOfLinesImported=Sorunsuz alınan satır sayısı:<b>%s</b>.
+NbOfLinesImported=Sorunsuz içeaktarılan satır sayısı:<b>%s</b>.
 DataComeFromNoWhere=Eklenecek değer kaynak dosyada hiç bir yerden gelmiyor.
 DataComeFromFileFieldNb=Eklenecek değer kaynak dosyada <b>%s</b> numaralı alandan geliyor.
 DataComeFromIdFoundFromRef=Kaynak dosyanın <b>%s</b> numaralı alanından gelen değer, üst nesne kodunun bulunması için kullanılacak (yani kaynak dosyadaki ilgili <b>%s</b> nesnesi önceden Dolibarr içinde bulunmalıdır).
@@ -109,7 +109,7 @@ DataCodeIDSourceIsInsertedInto=Koddan bulunan üst satır kodu , şu alana eklen
 SourceRequired=Veri değeri zorunludur
 SourceExample=Olası veri değeri örneği
 ExampleAnyRefFoundIntoElement=<b>%s</b> bileşeni için bulunan ilgi
-ExampleAnyCodeOrIdFoundIntoDictionary=<b>%s</b> sözlüğünde bulunan herhangi bir kod (veya id)
+ExampleAnyCodeOrIdFoundIntoDictionary=<b>%s</b> sözlüğünde bulunan herhangi bir kod (veya kimlik)
 CSVFormatDesc=<b>Virgülle Ayrılmış Değer</b> dosya biçimi (.csv).<br>Alanların birbirinden ayıraç ile ayrıldığı bir metin dosyası biçimi [ %s ]. Bir alan içeriğinde ayıraç bulunursa, yuvarlatma karakteri ile alan yuvarlanır [ %s ]. Yuvarlatma karakterinden çıkmak için Escape karakteri kullanılır [%s].
 Excel95FormatDesc=<b>Excel</b> dosya biçimi (.xls)<br>Doğal Excel 95 biçimi (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> dosya biçimi (.xlsx)<br>Doğal Excel 2007 biçimi (ÇalışmasayfasıML).
@@ -125,8 +125,8 @@ BankAccountNumber=Hesap numarası
 BankAccountNumberKey=Anahtar
 SpecialCode=Özel kod
 ExportStringFilter=%% metinde bir ya da fazla karakterin değiştirilmesine izin verir
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : bir yıılık yıl/ay/gün süzgeçi<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : yıllar arası yıllar/aylar/günler süzgeçi<br> > YYYY, > YYYYMM, > YYYYMMDD : izleyen tüm yıllar için yıılar/aylar/günler süzgeçi<br> < YYYY, < YYYYMM, < YYYYMMDD : bütün önceki yıllar/aylar/günler süzgeçi
+ExportNumericFilter='NNNNN' bir değere göre süzgeç<br>'NNNNN+NNNNN' bir değerler aralığı süzgeçi<br>'&gt;NNNNN' düşük değerlere göre süzgeç<br>'&gt;NNNNN' yüksek değerlere göre süzgeç
 ## filters
 SelectFilterFields=Süzmek istediğiniz değerleri buraya yazın.
 FilterableFields=Süzülebilir Champs
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/help.lang b/htdocs/langs/tr_TR/help.lang
index 63ddb6a853c..abce4eafbfb 100644
--- a/htdocs/langs/tr_TR/help.lang
+++ b/htdocs/langs/tr_TR/help.lang
@@ -10,7 +10,7 @@ DolibarrHelpCenter=Dolibarr yardım ve destek merkezi
 ToGoBackToDolibarr=Aksi takdirde Dolibarr’ı kullanmak için<a href="%s">burayı tıklayın</a>
 TypeOfSupport=Destek Kaynağı
 TypeSupportCommunauty=Genel (ücretsiz)
-TypeSupportCommercial=Ticari
+TypeSupportCommercial=Ticaret
 TypeOfHelp=Tür
 NeedHelpCenter=Yardım veya desteğe mi gereksiniminiz var?
 Efficiency=Verim
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index a79c0e1fd8a..7dbeba5d859 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=IK
-Holidays=Tatiller
-CPTitreMenu=Tatiller
+Holidays=İzinler
+CPTitreMenu=İzinler
 MenuReportMonth=Aylık özet
-MenuAddCP=Tatil için başvur
-NotActiveModCP=Bu sayfayı görmek için tatiller modülünü etkinleştirmelisiniz.
-NotConfigModCP=Bu sayfayı görmek için tatiller modülünü etkinleştirmelisiniz. Bunu yapmak için, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> buraya tıklayın </ a>.
-NoCPforUser=Bir tatil isteğiniz yok.
-AddCP=Tatil için başvur
+MenuAddCP=Bir izin isteği yap
+NotActiveModCP=Bu sayfayı görmek için İzinler modülünü etkinleştirmelisiniz
+NotConfigModCP=Bu sayfayı görmeniz için İzinler modülünü yapılandırmalısınız. Bunu yapmak için <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> bağlantısına tıklayın </ a>.
+NoCPforUser=Hiç uygun gününüz yok.
+AddCP=Bir izin isteği yap
 Employe=Çalışan
 DateDebCP=Başlama tarihi
 DateFinCP=Bitiş tarihi
@@ -18,24 +18,24 @@ ApprovedCP=Onaylandı
 CancelCP=İptal edildi
 RefuseCP=Reddedildi
 ValidatorCP=Onaylayan
-ListeCP=Tatil listesi
+ListeCP=İzinler listesi
 ReviewedByCP=İnceleyen
 DescCP=Açıklama
-SendRequestCP=Tatil isteği oluşturma
-DelayToRequestCP=Tatil başvuruları enaz <b>%s gün </b> önce yapılmalı.
-MenuConfCP=Tatil bakiyesi düzenle
-UpdateAllCP=Tatilleri güncelle
-SoldeCPUser=Tatil bakiyesi <b>%s</b> gündür.
+SendRequestCP=İzin isteği oluştur
+DelayToRequestCP=İzin istekleri enaz <b>%s gün</b> önce yapolmalıdır.
+MenuConfCP=İzin bakiyelerini düzenle
+UpdateAllCP=İzinleri güncelle
+SoldeCPUser=İzin bakiyesi <b>%s</b> gündür.
 ErrorEndDateCP=Başlama tarihinden büyük bir bitiş tarihi seçmelisiniz.
 ErrorSQLCreateCP=Oluşturma sırasında bir SQL hatası oluştu:
-ErrorIDFicheCP=Bir hata oluştu, tatil isteği mevcut değil.
+ErrorIDFicheCP=Bir hata oluştu, izin isteği yok.
 ReturnCP=Önceki sayfaya dön
-ErrorUserViewCP=Tatil isteklerini okumaya yetkili değilsiniz.
-InfosCP=Tatil isteği bilgileri
+ErrorUserViewCP=İzin isteklerini okumak için yetkiniz yok.
+InfosCP=İzin isteği bilgisi
 InfosWorkflowCP=Bilgi işakışı
 RequestByCP=İsteyen
-TitreRequestCP=Tatil tablosu
-NbUseDaysCP=Harcanan tatil günleri
+TitreRequestCP=İzin isteği
+NbUseDaysCP=Tüketilen tatil gün sayısı
 EditCP=Düzenle
 DeleteCP=Sil
 ActionValidCP=Doğrula
@@ -43,26 +43,25 @@ ActionRefuseCP=Reddet
 ActionCancelCP=İptal
 StatutCP=Durumu
 SendToValidationCP=Doğrulamaya gönder
-TitleDeleteCP=Tatil isteğini sil
-ConfirmDeleteCP=Bu tatil isteğinin silinmesini onayla?
-ErrorCantDeleteCP=Bu tatil isteğini silme hakkınız yok.
-CantCreateCP=Tatil için başvuru yapma hakkınız yok.
-InvalidValidatorCP=Tatil isteğiniz için onaylayacak birini seçmelisiniz.
-UpdateButtonCP=Güncelle
-CantUpdate=Bu tatil isteğini güncelleyemezsiniz.
+TitleDeleteCP=İzin isteği sil
+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.
+CantUpdate=Bu izin isteğini güncelleyemezsiniz.
 NoDateDebut=Bir başlama tarihi seçmelisiniz.
 NoDateFin=Bir bitiş tarihi seçmelisiniz.
-ErrorDureeCP=Tatil isteğiniz çalışma günlerini kapsamıyor.
-TitleValidCP=Tatil isteğini onayla
-ConfirmValidCP=Tatil isteğini onaylamak istediğinizden emin misiniz?
+ErrorDureeCP=İzin isteğiniz çalışma günü içermiyor.
+TitleValidCP=Izin isteğini onayla
+ConfirmValidCP=Izin isteğini onaylamak istediğinizden emin misiniz?
 DateValidCP=Tarih onaylandı
-TitleToValidCP=Tatil isteği gönder
-ConfirmToValidCP=Tatil isteğini göndermek istediğinizden emin misiniz?
-TitleRefuseCP=Tatil isteğini reddet
-ConfirmRefuseCP=Tatil isteğini reddetmek istediğinizden emin misiniz?
+TitleToValidCP=İzin isteği gönder
+ConfirmToValidCP=Izin isteğini göndermek istediğinizden emin misiniz?
+TitleRefuseCP=İzin isteğini reddet
+ConfirmRefuseCP=Izin isteğini reddetmek istediğinizden emin misiniz?
 NoMotifRefuseCP=İsteği reddetmek için bir neden seçmelisiniz.
-TitleCancelCP=Tatil isteğini iptal et
-ConfirmCancelCP=Tatil isteğini iptal etmek istediğinizden emin misiniz?
+TitleCancelCP=İzin isteğini iptal et
+ConfirmCancelCP=Izin isteğini iptal etmek istediğinizden emin misiniz?
 DetailRefusCP=Ret nedeni
 DateRefusCP=Ret tarihi
 DateCancelCP=İptal tarihi
@@ -72,47 +71,47 @@ MotifCP=Neden
 UserCP=Kullanıcı
 ErrorAddEventToUserCP=Özel izin eklenirken hata oluştu.
 AddEventToUserOkCP=Özel izin eklenmesi tamamlanmıştır.
-MenuLogCP=Tatil kayıtlarını gör
-LogCP=Tatil güncellemeleri kayıtı
+MenuLogCP=İzin isteği kayıtlarına bak
+LogCP=Uygun tatil günlerinin güncellenme kayıtı
 ActionByCP=Uygulayan
 UserUpdateCP=Kullanıcı için
 PrevSoldeCP=Önceki Bakiye
 NewSoldeCP=Yeni Bakiye
-alreadyCPexist=Bu dönem için bir tatil isteği zaten yapılmış.
+alreadyCPexist=Bu dönem için bir izin isteği zaten yapılmış.
 UserName=Adı
 Employee=Çalışan
-FirstDayOfHoliday=Tatilin ilk günü
+FirstDayOfHoliday=Tatilin birinci günü
 LastDayOfHoliday=Tatilin son günü
 HolidaysMonthlyUpdate=Aylık güncelleme
 ManualUpdate=Elle güncelleme
-HolidaysCancelation=Tatil iptali
+HolidaysCancelation=İzin isteği iptali
 
 ## Configuration du Module ##
-ConfCP=Tatil modülünün yapılandırılması
+ConfCP=İzin isteği modülünün yapılandırılması
 DescOptionCP=Seçeneğin tanımı
 ValueOptionCP=Değer
-GroupToValidateCP=Tatilleri onaylama yetkisindeki grup
+GroupToValidateCP=İzin isteklerini olabilirliğine göre gruplandır
 ConfirmConfigCP=Yapılandırmayı onayla
-LastUpdateCP=Tatillerin son otomatik güncellenmesi
+LastUpdateCP=İzin tahsislerini otomatik güncelle
 UpdateConfCPOK=Güncelleme başarılı
 ErrorUpdateConfCP=Güncelleme sırasında bir hata oluştu, lütfen yeniden deneyin.
-AddCPforUsers=Kullanıcıların tatil bakiyelerini eklemek için lütfen <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">buraya tıklayın</a>.
-DelayForSubmitCP=Tatil için son başvuru tarihi
-AlertapprobatortorDelayCP=Eğer tatil istekleri son tarihle eşleşmezse onaylayanı uyar
-AlertValidatorDelayCP=Eğer tatil istekleri son tarihle eşleşmezse onaylayanı uyar
-AlertValidorSoldeCP=Eğer tatil istekleri bakiyeyi aşarsa onayalayanı uyar
-nbUserCP=Tatil modülünde desteklenen kullanıcı sayısı
-nbHolidayDeductedCP=Alınan tatilden düşülecek tatil günü sayısı
-nbHolidayEveryMonthCP=Her eklenen tatil sayısı
-Module27130Name= Tatillerin yönetimi
-Module27130Desc= Tatillerin yönetimi
-TitleOptionMainCP=Tatillerin ana ayarları
-TitleOptionEventCP=Tatillerin etkinliklerle ilişkilendirilme ayarları
+AddCPforUsers=Kullanıcıların izin tahsisleri bakiyelerini  <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">yoluyla eklemek için buraya tıklayın</a>.
+DelayForSubmitCP=İzin isteği yapmak için son tarih
+AlertapprobatortorDelayCP=İzin isteği son tarihe uymuyorsa onaylamayı engelle
+AlertValidatorDelayCP=İzin isteği süreyi geçiyorsa onaylamayı engelle
+AlertValidorSoldeCP=İzin isteği izin bakiyesini aşıyorsa onaylamayı engelle
+nbUserCP=İzinler modülünün desteklediği kullanıcı sayısı
+nbHolidayDeductedCP=Alınan izinden düşülecek izin günü sayısı
+nbHolidayEveryMonthCP=Her ay eklenen izin günü sayısı
+Module27130Name= İzin istekleri yönetimi
+Module27130Desc= İzin istekleri yönetimi
+TitleOptionMainCP=İzin istekleri ana ayarları
+TitleOptionEventCP=Etkiinlikler için izin istekleri ayarları
 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.
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Güncelle
 ErrorMailNotSend=Eposta gönderilirken bir hata oluştu:
 NoCPforMonth=Bu ay hiç izin yok.
 nbJours=Gün sayısı
-TitleAdminCP=Tatillerin Yapılandırması
+TitleAdminCP=İzinlerin Yapılandırılması
 #Messages
 Hello=Merhaba
-HolidaysToValidate=Tatil doğrula
-HolidaysToValidateBody=Aşağıda doğrulanacak bir tatil isteği var
-HolidaysToValidateDelay=Bu tatil isteği %s günden daha az bir sürede gerçekleşecektir.
-HolidaysToValidateAlertSolde=Bu tatil isteğini yapan kullanıcının yeterli günü yoktur.
-HolidaysValidated=Tatil doğrula
-HolidaysValidatedBody=%s tarihinden %s tarihine kadar tatil isteğiniz doğrulanmıştır.
-HolidaysRefused=Tatil reddedildi
-HolidaysRefusedBody=%s tarihinden %s tarihine kadar olan tatil isteğiniz aşağıdaki nedenden dolayı reddeilmiştir :
-HolidaysCanceled=İptal edilen tatiller
-HolidaysCanceledBody=%s tarihinden %s tarihine kadar olan tatil isteğiniz iptal edilmiştir.
-Permission20000=Tatillerinizi okuyun
-Permission20001=Tatilini oluştur/değiştir
-Permission20002=herkes için tatilleri oluştur/değiştir
-Permission20003=Tatil isteklerini sil
-Permission20004=Kullanıcıların tatillerini tanımla
-Permission20005=Değiştirilen tatil kayıtlarını incele
-Permission20006=Aylık tatil raporlarını oku
+HolidaysToValidate=İzin isteği doğrula
+HolidaysToValidateBody=Doğrulanacak izin isteği aşağıdadır
+HolidaysToValidateDelay=Bu izin isteği %s günden kısa bir sürede gerçekleşecektir.
+HolidaysToValidateAlertSolde=Bu izin isteğini yapan kullanıcının yeterli uygun günü yok.
+HolidaysValidated=Doğrulanmış izin istekleri
+HolidaysValidatedBody=İzin isteğiniz %s - %s arası doğrulanmıştır.
+HolidaysRefused=İstek reddedildi
+HolidaysRefusedBody=%s - %s arası izin isteğiniz aşağıdaki nedenden dolayı reddedilmiştir:
+HolidaysCanceled=İptal edilen izin istekleri
+HolidaysCanceledBody=%s - %s arası izin isteğiniz iptal edilmiştir.
+Permission20000=Kendi izin isteklerini oku
+Permission20001=İzin isteklerinizi oluşturun/düzenleyin
+Permission20002=Herkes için izin isteği oluştur/düzenle
+Permission20003=İzin isteği sil
+Permission20004=Kullanıcıların uygun tatil günlerini ayarla
+Permission20005=Değiştirilmiş izin izin istekleri kayıtlarını incele
+Permission20006=Aylık izin raporu oku
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index bbf1322546b..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,10 +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ı
-ClassifyBilled="Faturalandırıldı"
-StatusInterInvoiced=Faturalandırılmış
+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/link.lang b/htdocs/langs/tr_TR/link.lang
index 8b1efb75ef3..fbc4b921387 100644
--- a/htdocs/langs/tr_TR/link.lang
+++ b/htdocs/langs/tr_TR/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
+LinkANewFile=Yeni bir dosya/belge bağlantıla
+LinkedFiles=Bağlantılı dosyalar ve belgeler
+NoLinkFound=Kayıtlı bağlantı yok
+LinkComplete=Dosya bağlantısı başarılı
 ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkRemoved=Bağlantı %s kaldırıldı
+ErrorFailedToDeleteLink= Bu bağlantı kaldırılamadı '<b>%s</b>'
+ErrorFailedToUpdateLink= Bu bağlantı güncellemesi yapılamadı '<b>%s</b>'
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 9e71844c4a4..128034c94d7 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -32,7 +32,7 @@ CreateMailing=Eposta oluştur
 MailingDesc=Bu sayfa bir gruBa Eposta göndermenizi sağlar.
 MailingResult=Eposta sonuçlarını gönderiyor
 TestMailing=Eposta testi
-ValidMailing=Geçerli Eposta
+ValidMailing=Geçerli eposta
 ApproveMailing=Eposta onayla
 MailingStatusDraft=Taslak
 MailingStatusValidated=Doğrulanmış
@@ -49,11 +49,11 @@ Unsuscribe=Aboneliği kaldır
 MailingStatusNotContact=Bir daha görüşme
 ErrorMailRecipientIsEmpty=Eposta alıcısı boş
 WarningNoEMailsAdded=Alıcının listesine ekli yeni Eposta yok.
-ConfirmValidMailing=Bu Epostayı doğrulamak istediğinizden emin misiniz?
+ConfirmValidMailing=Bu epostayı doğrulamak istediğinizden emin misiniz?
 ConfirmResetMailing=Uyarı, Bu <b>%s</b> 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,8 +106,8 @@ MailSelectedRecipients=Seçilen alıcılar
 MailingArea=Eposta alanı
 LastMailings=Son %s eposta
 TargetsStatistics=Hedef istatistikleri
-NbOfCompaniesContacts=Şirketlerin eşsiz kişileri
-MailNoChangePossible=Doğrulanmış Epostaların alıcıları değiştirilemez
+NbOfCompaniesContacts=Benzersiz kişiler/adresler
+MailNoChangePossible=Doğrulanmış epostaların alıcıları değiştirilemez
 SearchAMailing=Eposta ara
 SendMailing=E-posta gönder
 SendMail=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 <b>%s</b> 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 <b>%s<b> 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 e-posta bildirimi isteği etkinleştir
-ListOfActiveNotifications=Tüm etkin Eposta bildirimi istekleri
+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 <strong>'%s'</strong> 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 5982b0f04da..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=None
+SeparatorThousand=.
 FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
@@ -58,12 +58,12 @@ ErrorCantLoadUserFromDolibarrDatabase=Dolibarr veritabanında kullanıcı <b>%s<
 ErrorNoVATRateDefinedForSellerCountry=Hata, ülke '%s' için herhangi bir KDV oranı tanımlanmamış.
 ErrorNoSocialContributionForSellerCountry=Hata, ülke %s için herhangi bir sosyal güvenlik primi türü tanımlanmış.
 ErrorFailedToSaveFile=Hata, dosya kaydedilemedi.
-ErrorOnlyPngJpgSupported=Hata yalnızca .Png ve .jpg görüntü dosya formatları desteklenmektedir.
-ErrorImageFormatNotSupported=PHP bu biçimdeki görüntüleri dönüştürecek işlevleri desteklemez.
 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ı
 FileWasNotUploaded=Bu ekleme için bir dosya seçildi ama henüz gönderilmedi. Bunun için “Dosya ekle” ye tıklayın.
 NbOfEntries=Kayıt sayısı
 GoToWikiHelpPage=Çevrimiçi yardım oku (Internet erişimi gerekir)
@@ -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ı <b>conf.php</b>da Dolibarr kimlik doğrulama modu <b>%s</b> a ayarlanmıştır.<br>Bu demektir ki; veritabanı parolası Dolibarr dışıdır, yani bu alanı değiştirmek hiçbir etki yaratmaz.
+DolibarrInHttpAuthenticationSoPasswordUseless=Yapılandırma dosyası <b>conf.php</b> içinde Dolibarr kimlik doğrulama modu buna <b>%s</b> ayarlanmıştır.<br>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 <b>%s</b> a göndermek istiyor musunuz?
+ConfirmSendCardByMail=Bu kartın içeriğini posta ile gerçekten  buna <b>%s</b> göndermek istiyor musunuz?
 Delete=Sil
 Remove=Kaldır
 Resiliate=Sonlandır
@@ -266,6 +266,7 @@ Afternoon=Öğleden sonra
 Quadri=Çeyrek
 MonthOfDay=Ayın günü
 HourShort=H
+MinuteShort=ay
 Rate=Oran
 UseLocalTax=Vergi dahil
 Bytes=Bayt
@@ -340,15 +341,16 @@ FullList=Tüm liste
 Statistics=İstatistikler
 OtherStatistics=Diğer istatistikler
 Status=Durum
+Favorite=Sık kullanılan
 ShortInfo=Bilgi.
 Ref=Ref.
 RefSupplier=Ref. tedarikçi
 RefPayment=Ref. ödeme
 CommercialProposalsShort=Teklifler
-Comment=Yorum
-Comments=Yorumlar
-ActionsToDo=Yapılacak eylemler
-ActionsDone=Biten eylemler
+Comment=Açıklama
+Comments=Açıklamalar
+ActionsToDo=Yapılacak etkinlikler
+ActionsDone=Biten etkinlikler
 ActionsToDoShort=Yapılacaklar
 ActionsRunningshort=Başladı
 ActionsDoneShort=Yapıldı
@@ -361,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
@@ -490,7 +493,7 @@ ReportDescription=Açıklama
 Report=Rapor
 Keyword=Anahtar kelime
 Legend=Gösterge
-FillTownFromZip=İli Posta Kodundan (zip) al
+FillTownFromZip=İli Posta Kodundan çıkart
 Fill=Doldur
 Reset=Sıfırla
 ShowLog=Günlüğü göster
@@ -645,6 +648,7 @@ OptionalFieldsSetup=Ekstra öznitelik ayarları
 URLPhoto=Fotoğraf/logo İnternet adresi
 SetLinkToThirdParty=Başka bir üçüncü parti bağlantısı
 CreateDraft=Taslak oluştur
+SetToDraft=Taslağa geri dön
 ClickToEdit=Düzenlemek için tıklayın
 ObjectDeleted=Nesne %s silindi
 ByCountry=Ülkeye göre
@@ -669,16 +673,16 @@ from=itibaren
 toward=yönünde
 Access=Erişim
 HelpCopyToClipboard=Panoya kopyalamak için Crtl+C
-SaveUploadedFileWithMask=Dosyayı sunucuya "<strong>%s</strong>" (aksi durumda "%s") adıyla kaydedin
+SaveUploadedFileWithMask=Dosyayı "<strong>%s</strong>" adlı sunucuya kaydedin (aksi durumda "%s")
 OriginFileName=Özgün dosya adı
 SetDemandReason=Kaynağı ayarlayın
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Banka Hesabı Tanımla
+AccountCurrency=Hesap Para Birimi
 ViewPrivateNote=Notları izle
-XMoreLines=%s gizli satır(lar)
+XMoreLines=%s gizli satır
 PublicUrl=Genel URL
-AddBox=Add box
-
+AddBox=Kutu ekle
+SelectElementAndClickRefresh=Bir öğe seçin ve Yenile'ye tıkla
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index 05b423db433..26da20b82a5 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -38,4 +38,7 @@ BuyingCost=Maliyet fiyatı
 UnitCharges=Birim masrafları
 Charges=Masraflar
 AgentContactType=Ticari temsilci ilgili tipi
-AgentContactTypeDetails=Ticari temsilciler tarafından oran raporları ile ilişkilendirilecek kişi türünü (faturalarla bağlantılı) tanımlayın
+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 a982292a7a8..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
@@ -65,7 +65,7 @@ ValidateOrder=Doğrulamak amacıyla
 UnvalidateOrder=Siparişten doğrulamayı kaldır
 DeleteOrder=Sipariş sil
 CancelOrder=Siparişi iptal et
-AddOrder=Sipariş ekle
+AddOrder=Sipariş oluştur
 AddToMyOrders=Siparişlerime ekle
 AddToOtherOrders=Diğer siparişlere ekle
 AddToDraftOrders=Taslak siparişe ekle
@@ -94,16 +94,16 @@ ConfirmCancelOrder=Bu siparişi iptal etmek istediğinizden emin misiniz?
 ConfirmMakeOrder=Bu siparişi <b>%s</b> üzerine yaptığınızı onaylamak istediğinizden emin misiniz?
 GenerateBill=Fatura oluştur
 ClassifyShipped=Teslim edildi sınıflandır
-ClassifyBilled=Faturalandı 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
@@ -137,7 +137,7 @@ OrderSource1=Internet
 OrderSource2=Posta kampanyası
 OrderSource3=Telefon kampanyası
 OrderSource4=Faks kampanyası
-OrderSource5=Reklam
+OrderSource5=Ticaret
 OrderSource6=Mağaza
 QtyOrdered=Sipariş miktarı
 AddDeliveryCostLine=Siparişin ağırlığını belirten bir teslimat satırı ekleyin
@@ -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 ac878191a7f..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.<br><br>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
@@ -59,12 +59,12 @@ PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayr
 PredefinedMailTestHtml=Bu bir <b>deneme</b> postası (deneme sözcüğü koyu olmalı).<br>İki satır enter tuşu ile ayrılmıştır.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız  __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz buradadır __PROPREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\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__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nSevkiyatınız bilgilerinize sunulmuştur __SHIPPINGREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nMüdahale bilgilerinize sunulmuştur __FICHINTERREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n__PERSONALIZED__\n__SIGNATURE__
 DemoDesc=Dolibarr birçok fonksiyonel modülden oluşan derlitoplu bir ERP/CRM programıdır. Bu durumda  tüm modülleri içeren bir demo asla hiçbir şey demek değildir. Yani, birçok demo profili vardır.
 ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
@@ -80,6 +80,16 @@ ModifiedBy=%s tarafından düzenlendi
 ValidatedBy=%s tarafından onaylandı
 CanceledBy=%s tarafından iptal edildi
 ClosedBy=%s tarafından kapatıldı
+CreatedById=Oluşturanın kullanıcı kimliği
+ModifiedById=Son değişikliği yapan kullanıcı kimliği
+ValidatedById=Doğrulayanın kullanıcı kimliği
+CanceledById=İptal edenin kullanıcı kimliği
+ClosedById=Kapatanın kullanıcı kimliği
+CreatedByLogin=Oluşturanın kullanıcı adı
+ModifiedByLogin=Son değişikliği yapanın kullanıcı adı
+ValidatedByLogin=Doğrulayanın kullanıcı adı
+CanceledByLogin=İptal edenin kullanıcı adı
+ClosedByLogin=Kapatanın kullanıcı adı
 FileWasRemoved=%s dosyası kaldırıldı
 DirWasRemoved=%s dizini kaldırıldı
 FeatureNotYetAvailableShort=Gelecek sürümde olacaktır
@@ -172,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
@@ -193,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 a4804fb3ebb..9ec2f349d3b 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -14,9 +14,9 @@ NewService=Yeni hizmet
 ProductCode=Ürün kodu
 ServiceCode=Hizmet kodu
 ProductVatMassChange=Toplu KDV değiştir
-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.
+ProductVatMassChangeDesc=Bu sayfa, ürünler ve hizmetler için tanımlanmış KDV oranının bir değerden başka bir değere değiştirilmesi için kullanılır. Uyarı, bu değişiklik tüm veritabanına uygulanır.
 MassBarcodeInit=Toplu barkod başlatma
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+MassBarcodeInitDesc=Bu sayfa, barkod tanımlanmamış nesneler üzerinde barkod başlatmak için kullanılabilir. Önce barkod modülü kurulumunun tamamlandığını denetleyin.
 ProductAccountancyBuyCode=Muhasebe kodu (alış)
 ProductAccountancySellCode=Muhasebe kodu (satış)
 ProductOrService=Ürün veya Hizmet
@@ -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
@@ -80,11 +80,12 @@ ContractStatusClosed=Kapalı
 ContractStatusRunning=Yürürlükte
 ContractStatusExpired=süresi doldu
 ContractStatusOnHold=Yürürlükte değil
-ContractStatusToRun=Hizmete konulacak
+ContractStatusToRun=Yürülüğe alınacak
 ContractNotRunning=Bu sözleşme çalışmıyor
 ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var.
 ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer.
 ErrorProductClone=Ürün ya da hizmetin klonlanmasına çalışılırken bir sorun oluştu.
+ErrorPriceCantBeLowerThanMinPrice=Hata! Fiyat Enaz Fiyattan düşük olamaz
 Suppliers=Tedarikçiler
 SupplierRef=Tedarikçi ürün ref.
 ShowProduct=Ürün Göster
@@ -101,7 +102,7 @@ AddPhoto=Fotoğraf ekle
 ListOfStockMovements=Stok hareketleri listesi
 BuyingPrice=Alış Fiyat
 SupplierCard=Tedarikçi kartı
-CommercialCard=Ticari Kart
+CommercialCard=Ticaret Kartı
 AllWays=Stokta ürün bulmak için yol
 NoCat=Ürününüz herhangi bir kategoride değil
 PrimaryWay=Birincil yol
@@ -113,15 +114,15 @@ BarcodeValue=Barkod değeri
 NoteNotVisibleOnBill=Not (faturalarda, tekliflerde ... görünmez)
 CreateCopy=Kopya oluştur
 ServiceLimitedDuration=Eğer ürün sınırlı süreli bir hizmetse:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Ürünler/hizmetler için çok seviyeli fiyat
 MultiPricesNumPrices=Fiyat sayısı
 MultiPriceLevelsName=Fiyat kategorileri
-AssociatedProductsAbility=Yan ürünleri etkinleştir
-AssociatedProducts=Yan ürünler
-AssociatedProductsNumber=Bu ürünü oluşturan ürün sayısı
-ParentProductsNumber=Ana ürün numarası
-IfZeroItIsNotAVirtualProduct=0 ise, bu ürün bir sanal ürün değildir
-IfZeroItIsNotUsedByVirtualProduct=0 ise, bu ürün hiçbir sanal ürün tarafından kullanılmıyor
+AssociatedProductsAbility=Sanal paket özelliğini etkinleştir
+AssociatedProducts=Paket ürün
+AssociatedProductsNumber=Bu sanal paket ürünü oluşturan ürün sayısı
+ParentProductsNumber=Ana paket ürünü sayısı
+IfZeroItIsNotAVirtualProduct=Eğer 0 ise, bu ürün bir sanal paket ürünü değildir
+IfZeroItIsNotUsedByVirtualProduct=Eğer 0 ise, bu ürün her hangi bir sanal paket ürünü tarafından kullanılmaz
 EditAssociate=Ilişkilendir
 Translation=Çeviri
 KeywordFilter=Anahtar kelime süzgeçi
@@ -131,7 +132,7 @@ AddDel=Ekle/Sil
 Quantity=Miktar
 NoMatchFound=Eşleşme bulunamadı
 ProductAssociationList=İlgili ürün/hizmet listesi: ürün/hizmet adı (miktar etkilenir)
-ProductParentList=Bu ürünün bir bileşen olan ürünle/hizmetle ilgili liste
+ProductParentList=Bu ürünü bir bileşen olarak kullanan ürünlerin/hizmetlerin listesi
 ErrorAssociationIsFatherOfThis=Seçilen üründen biri güncel ürünün üstü konumundadır
 DeleteProduct=Bir ürün/hizmet sil
 ConfirmDeleteProduct=Bu ürünü/hizmeti silmek istediğinizden emin misiniz?
@@ -170,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
@@ -178,7 +179,7 @@ CloneProduct=Ürün veya hizmet klonla
 ConfirmCloneProduct=Ürün veya hizmet klonlamak istediğinizden emin misiniz <b>%s</b> ?
 CloneContentProduct=Ürünün/hizmet bütün temel bilgilerini klonla
 ClonePricesProduct=Ana bilgileri ve fiyatları klonla
-CloneCompositionProduct=Sanal ürün/hizmet kopyala
+CloneCompositionProduct=Paket ürünü/hizmeti kopyala
 ProductIsUsed=Bu ürün kullanılır.
 NewRefForClone=Yeni ürün/hizmet ref.
 CustomerPrices=Müşteri fiyatları
@@ -232,10 +233,17 @@ DefinitionOfBarCodeForProductNotComplete=Barkod türü tanımı ve değeri %s ü
 DefinitionOfBarCodeForThirdpartyNotComplete=Barkod türü tanımı ve değeri %s ürünü için tamamlanmamıştır.
 BarCodeDataForProduct=%s Ürünü için barkod bilgisi :
 BarCodeDataForThirdparty=%s Üçüncü parti için barkod bilgisi :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
+ResetBarcodeForAllRecords=Bütün kayıtlar için barkod değeri tanımla (bu işlem halihazırda yeni değerler tanımlanmış barkod değerlerini sıfırlayacaktır)
 PriceByCustomer=Müşteri fiyatı
 PriceCatalogue=Ürün/Servis için birim fiyat
 PricingRule=Fiyatlandırma yetkileri
 AddCustomerPrice=Müşteriler için fiyat ekle
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+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"<br>EkAlanlar "#options_myextrafieldkey# * 2" benzeri değişkenlerdir<br>#quantity# and #tva_tx# benzeri özel değişkenler vardır<br>İ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 1a29e5540e4..3fc2b0041c6 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Referans Proje
-ProjectId=Proje Id
+ProjectId=Proje Kimliği
 Project=Proje
 Projects=Projeler
 SharedProject=Herkes
@@ -14,7 +14,7 @@ TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kulla
 Myprojects=Projelerim
 ProjectsArea=Projeler alanı
 NewProject=Yeni proje
-AddProject=Proje ekle
+AddProject=Proje oluştur
 DeleteAProject=Bir proje sil
 DeleteATask=Bir görev sil
 ConfirmDeleteAProject=Bu projeyi silmek istediğinizden emin misiniz?
@@ -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
@@ -45,7 +47,7 @@ TaskDateStart=Görev başlama tarihi
 TaskDateEnd=Görev bitiş tarihi
 TaskDescription=Görev açıklaması
 NewTask=Yeni görev
-AddTask=Görev ekle
+AddTask=Görev oluştur
 AddDuration=Süre ekle
 Activity=Etkinlik
 Activities=Görevler/etkinlikler
@@ -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
@@ -85,13 +87,13 @@ ActionsOnProject=Proje etkinlikleri
 YouAreNotContactOfProject=Bu özel projenin bir ilgilisi değilsiniz
 DeleteATimeSpent=Harcana süre sil
 ConfirmDeleteATimeSpent=Bu harcanan süreyi silmek istediğinizden emin misiniz?
-DoNotShowMyTasksOnly=Bana ayrılmamış görevlere de bakın
-ShowMyTasksOnly=Sadece bana ayrılan görevleri gözter
+DoNotShowMyTasksOnly=Bana atanmamış görevleri de göster
+ShowMyTasksOnly=Yalnızca bana atanmış görevleri göster
 TaskRessourceLinks=Kaynaklar
 ProjectsDedicatedToThisThirdParty=Bu üçüncü parti atanmış projeler
 NoTasks=Bu proje için hiçbir görev yok
 LinkedToAnotherCompany=Diğer üçüncü partiye bağlantılı
-TaskIsNotAffectedToYou=Görev size ayrılmamış
+TaskIsNotAffectedToYou=Sana atanmamış görevler
 ErrorTimeSpentIsEmpty=Harcanan süre boş
 ThisWillAlsoRemoveTasks=Bu eylem aynı zamanda projenin tüm görevlerini (şu andaki <b>%s</b> görevleri) ve tüm harcanan süre girişlernii siler .
 IfNeedToUseOhterObjectKeepEmpty=Eğer bazı nesneler başka bir üçüncü partiye aitse  (fatura, sipariş, ...), oluşturulması  için bu projeye bağlanmalıdır, projenin birden çok üçüncü partiye bağlı olması için bunu boş bırakın.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Katılımcı
 TypeContact_project_task_external_TASKCONTRIBUTOR=Katılımcı
 SelectElement=Öğe seç
 AddElement=Öğeye bağlan
+UnlinkElement=Öğenin bağlantısını kaldır
 # Documents models
 DocumentModelBaleine=Eksiksiz bir proje rapor modeli (logo. ..)
 PlannedWorkload = Planlı işyükü
@@ -128,3 +131,4 @@ ProjectReferers=Yönlendirme nesneleri
 SearchAProject=Bir proje ara
 ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
 ProjectDraft=Taslak projeler
+FirstAddRessourceToAllocateTime=Zaman ayırmak için bir kaynak ilişkilendirin
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 8682cdc2452..d06f3c3525b 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -37,7 +37,7 @@ PropalStatusDraft=Taslak (doğrulanması gerekir)
 PropalStatusValidated=Onaylı (teklif açık)
 PropalStatusOpened=Onaylı (teklif açık)
 PropalStatusClosed=Kapalı
-PropalStatusSigned=İmzalanmış(faturalanması gerekiyor)
+PropalStatusSigned=İmzalı(faturalanacak)
 PropalStatusNotSigned=İmzalanmamış (kapalı)
 PropalStatusBilled=Faturalanmış
 PropalStatusDraftShort=Taslak
@@ -48,7 +48,7 @@ PropalStatusSignedShort=İmzalı
 PropalStatusNotSignedShort=İmzalanmamış
 PropalStatusBilledShort=Faturalanmış
 PropalsToClose=Kapatılacak teklifler
-PropalsToBill=Faturalandırılacak imzalı teklifler
+PropalsToBill=Faturalanacak imzalı teklifler
 ListOfProposals=Teklif listesi
 ActionsOnPropal=Tekliler için yapılan eylemler
 NoOpenedPropals=Açık teklif yok
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/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 848deb6d150..61c1db446e8 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Ücret ödemeleri muhasebe kodu
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Mali yükümlülük için muhasebe kodu
 Salary=Ücret
 Salaries=Ücretler
 Employee=Çalışan
@@ -6,3 +8,5 @@ NewSalaryPayment=Yeni ücret ödemesi
 SalaryPayment=Ücret ödemesi
 SalariesPayments=Ücret ödemeleri
 ShowSalaryPayment=Ücret ödemesi göster
+THM=Ortalama saat ücreti
+TJM=Ortalama günlük ücret
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 4398ed92213..ea8adf02c7f 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=İstatistikler yalnızca doğrulanmış sevkiyatla
 DateDeliveryPlanned=Planlanan teslim tarihi
 DateReceived=Teslim alınan tarih
 SendShippingByEMail=Sevkiyatı EPostayla gönder
-SendShippingRef=%s sevkiyatını gönder
-ActionsOnShipping=Sevkiyat eylemleri
+SendShippingRef=% Nakliyatının yapılması
+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
@@ -72,3 +74,7 @@ DocumentModelTyphon=Teslimat makbuzları için daha fazla eksiksiz doküman mode
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER değişmezi tanımlanmamış
 SumOfProductVolumes=Ürün hacimleri toplamı
 SumOfProductWeights=Ürün ağırlıkları toplamı
+
+# warehouse details
+DetailWarehouseNumber= Depo ayrıntıları
+DetailWarehouseFormat= Ağ:%s (Mik : %d)
diff --git a/htdocs/langs/tr_TR/shop.lang b/htdocs/langs/tr_TR/shop.lang
deleted file mode 100644
index 4925111b19a..00000000000
--- a/htdocs/langs/tr_TR/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Oscommerce veritabanına bağlantıda hata oluştu. Modül kurulumunu kontrol ediniz.
-Shop=Mağaza
-ShopWeb=Web Mağazası
-LastOrders=Son siparişler
-OnStandBy=Beklemede
-TreatmentInProgress=İşlemi devam ediyor
-LastCustomers=Son müşteriler
-OSCommerceShop=OSCommerce mağazası
-OSCommerce=OSCommerce
-AddProd=Çevrimiçi satış
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 85fccc85f84..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ı
@@ -51,10 +51,10 @@ QtyDispatched=Sevkedilen miktar
 OrderDispatch=Stok sevkiyatı
 RuleForStockManagementDecrease=Stok azaltma yönetimi kuralı
 RuleForStockManagementIncrease=Stok arttırma yönetimi kuralı
-DeStockOnBill=Müşteri faturalarının/alacak dekontlarının doğrulanması üzerine gerçek stokları azalt
+DeStockOnBill=Müşteri faturalarının/iade faturalarının doğrulanması üzerine gerçek stokları azalt
 DeStockOnValidateOrder=Müşteri siparişlerinin doğrulanması üzerine gerçek stokları azalt
 DeStockOnShipment=Sevkiyat doğrulaması üzerine gerçek stokları azalt
-ReStockOnBill=Müşteri faturalarının/alacak dekontlarının doğrulanması üzerine gerçek stokları arttır
+ReStockOnBill=Müşteri faturalarının/iade faturalarının doğrulanması üzerine gerçek stokları arttır
 ReStockOnValidateOrder=Tedarikçi siparişlerinin onanması üzerine gerçek stokları arttır
 ReStockOnDispatchOrder=Tedarikçi siparişi aldıktan sonra, elle yapılan sevk üzerine gerçek stokları artırın
 ReStockOnDeleteInvoice=Fatura silinirse gerçek stokları arttır
@@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Sipariş henüz yoksa veya stok deposundan gönder
 StockDiffPhysicTeoric=Fiziksel ve teorik stok arasındaki stok farkı
 NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyok. Yani stoktan sevk gerekli değildir.
 DispatchVerb=Dağıtım
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Uyarı sınırı
+StockLimit=Stok sınırı uyarısı
 PhysicalStock=Fiziksel stok
 RealStock=Gerçek Stok
 VirtualStock=Sanal stok
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index 41702fff665..0b89e0a28d6 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Tedarikçiler
 Supplier=Tedarikçi
-AddSupplier=Bir tedarikçi ekle
+AddSupplier=Bir tedarikçi oluştur
 SupplierRemoved=Tedarikçi kaldırıldı
 SuppliersInvoice=Tedarikçi faturası
 NewSupplier=Yeni tedarikçi
@@ -40,3 +40,5 @@ AddSupplierInvoice=Tedarikçi faturası oluştur
 ListOfSupplierProductForSupplier=Tedarikçi <b>%s</b> için ürün ve fiyat listesi
 NoneOrBatchFileNeverRan=Hiçbiri veya toplu <b>%s</b> yürütülmedi
 SentToSuppliers=Tedarikçilere gönderilen
+ListOfSupplierOrders=Tedarikçi siparişleri listesi
+MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index 730de9c089d..bd709af9859 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Gezi
 ListTripsAndExpenses=Geziler ve giderler listesi
 ExpensesArea=Geziler ve giderler alanı
 SearchATripAndExpense=Bir gezi ve gider ara
+ClassifyRefunded=Sınıflandırma 'İade edildi'
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 2c38dcba787..b160e4cc1c7 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -15,7 +15,7 @@ AvailableRights=Varolan izinler
 OwnedRights=Sahip olunan izinler
 GroupRights=Grup izinleri
 UserRights=Kullanıcı izinleri
-UserGUISetup=Kullanıcı ekranı kurulumu
+UserGUISetup=Kullanıcı ekranı ayarları
 DisableUser=Engelle
 DisableAUser=Bir kullanıcıyı engelle
 DeleteUser=Sil
@@ -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
@@ -87,13 +86,13 @@ MyInformations=Verilerim
 ExportDataset_user_1=Dolibarr kullanıcıları ve özellikleri
 DomainUser=Etki alanı kullanıcısı %s
 Reactivate=Yeniden etkinleştir
-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=Bu form firmanız/kurumunuz içinde kullanıcı oluşturmanızı sağlar. Dış kullanıcı (müşteri, tedarikçi,...) oluşturmak için üçüncü parti kişi kartlarından 'Dolibarr Kullanıcısı Oluştur' dğmesini kullan.
 InternalExternalDesc=Bir <b>iç</b> kullanıcı firmanızın/derneğinizin bir parçasıdır. <br>Bir<b>dış</b> kullanıcı bir müşteri, tedarikçi veya bir başkasıdır.<br><br>Her iki durumda da, izinler Dolibarr’daki hakları tanımlar, aynı zamanda dış kullanıcı iç kullanıcıdan farklı bir menü yöeticisine sahiptir (Giriş->Kurulum->Görünüm’e bakın)
 PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
 Inherited=İntikal eden
 UserWillBeInternalUser=Oluşturulacak kullanıcı bir iç kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılı değildir)
 UserWillBeExternalUser=Oluşturulacak kullanıcı bir dış kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılıdır)
-IdPhoneCaller=Kimlik telefonu arayıcı
+IdPhoneCaller=Telefon açanın kimliği
 UserLogged=Kullanıcı %s bağlı
 UserLogoff=Kullanıcı %s çıkış yaptı
 NewUserCreated=Kullanıcı %s oluşturuldu
@@ -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?
@@ -114,8 +113,10 @@ YourRole=Sizin rolünüz
 YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
 NbOfUsers=Kullanıcı sayısı
 DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir
-HierarchicalResponsible=Sorumlu sıradüzeni
+HierarchicalResponsible=Yönetici
 HierarchicView=Sıradüzeni görünümü
 UseTypeFieldToChange=Değiştirmek için Alan türünü kullan
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Giriş için OpenID kullan
+WeeklyHours=Haftalık saatler
+ColorUser=Kullanıcı rengi
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 857baa3f521..ed188e7fdb8 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=This tab allows you to request a standing order. Once donee, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Para çekme dosyası
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
 ThisWillAlsoAddPaymentOnInvoice=Bu aynı zamanda faturalara ödeme oluşturur ve onları "ödendi" olarak sınıflandırır
+StatisticsByLineStatus=Statistics by status of lines
 
 ### Notifications
 InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index ec1979fdc56..d68844d9f62 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Version initial install
-VersionLastUpgrade=Version last upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-SessionId=Session ID
+Foundation=Установа
+Version=Версія
+VersionProgram=Версія програми
+VersionLastInstall=Версія первинної інсталяції
+VersionLastUpgrade=Версія останнього оновлення
+VersionExperimental=Експериментальна
+VersionDevelopment=Розробча
+VersionUnknown=Невизначена
+VersionRecommanded=Рекомендована
+SessionId=ID Сессії
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
 PurgeSessions=Purge of sessions
@@ -17,14 +17,14 @@ NoSessionListWithThisHandler=Save session handler configured in your PHP does no
 LockNewSessions=Lock new connections
 ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
 UnlockNewSessions=Remove connection lock
-YourSession=Your session
+YourSession=Ваш сеанс
 Sessions=Users session
 WebUserGroup=Web server user/group
 NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) 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 <b>%s</b> must be enabled
+WarningModuleNotActive=Модуль <b>%s</b> повинен бути активованим
 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
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 b91bcb1f323..13d9dea3c7e 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -1,47 +1,51 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID event
-Actions=Events
-ActionsArea=Events area (Actions and tasks)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
-EventsNb=Number of events
-MyEvents=My events
-OtherEvents=Other events
-ListOfActions=List of events
-Location=Location
-EventOnFullDay=Event on all day(s)
-SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+Actions=Події
+ActionsArea=Ділянка Подій (Дії та задачі)
+Agenda=Повістка дня
+Agendas=Повістки денні
+Calendar=Календар
+Calendars=Календарі
+LocalAgenda=Внутрішній календар
+ActionsOwnedBy=Event owned by
+AffectedTo=Призначено
+DoneBy=Виконано
+Event=Event
+Events=Події
+EventsNb=Кількість подій
+MyEvents=Мої події
+OtherEvents=Інші події
+ListOfActions=Список подій
+Location=Розташування
+EventOnFullDay=Подія на цілий день(дні)
+SearchAnAction= Шукати подію/задачу
+MenuToDoActions=Усі невиконані події
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 3041825db57..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 27c4fc44394..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 1b2ea17215b..5580d87b517 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 728661dfa04..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
@@ -30,3 +30,9 @@ SearchADonation=Search a donation
 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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
index 58579a74276..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Name and signature of intervening :
 NameAndSignatureOfExternalContact=Name and signature of customer :
 DocumentModelStandard=Standard document model for interventions
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Classify "Billed"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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.<br><br>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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 3bb65c295d2..f6111bac684 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -1,76 +1,80 @@
 # Dolibarr language file - Source file is en_US - sendings
-# RefSending=Ref. shipment
-# Sending=Shipment
-# Sendings=Shipments
-# Shipment=Shipment
-# Shipments=Shipments
-# Receivings=Receivings
-# SendingsArea=Shipments area
-# ListOfSendings=List of shipments
-# SendingMethod=Shipping method
-# SendingReceipt=Shipping receipt
-# LastSendings=Last %s shipments
-# SearchASending=Search for shipment
-# StatisticsOfSendings=Statistics for shipments
-# NbOfSendings=Number of shipments
-# NumberOfShipmentsByMonth=Number of shipments by month
-# SendingCard=Shipping card
-# NewSending=New shipment
-# CreateASending=Create a shipment
-# CreateSending=Create shipment
-# QtyOrdered=Qty ordered
-# QtyShipped=Qty shipped
-# QtyToShip=Qty to ship
-# QtyReceived=Qty received
-# KeepToShip=Keep to ship
-# OtherSendingsForSameOrder=Other shipments for this order
-# DateSending=Date sending order
-# DateSendingShort=Date sending order
-# SendingsForSameOrder=Shipments for this order
-# SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-# SendingsToValidate=Shipments to validate
-# StatusSendingCanceled=Canceled
-# StatusSendingDraft=Draft
-# StatusSendingValidated=Validated (products to ship or already shipped)
-# StatusSendingProcessed=Processed
-# StatusSendingCanceledShort=Canceled
-# StatusSendingDraftShort=Draft
-# StatusSendingValidatedShort=Validated
-# StatusSendingProcessedShort=Processed
-# SendingSheet=Sending sheet
-# Carriers=Carriers
-# Carrier=Carrier
-# CarriersArea=Carriers area
-# NewCarrier=New carrier
-# ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-# ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-# ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-# GenericTransport=Generic transport
-# Enlevement=Gotten by customer
-# DocumentModelSimple=Simple document model
-# DocumentModelMerou=Merou A5 model
-# WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-# DateDeliveryPlanned=Planed date of delivery
-# DateReceived=Date delivery received
-# SendShippingByEMail=Send shipment by EMail
-# SendShippingRef=Send shipment %s
-# ActionsOnShipping=Events on shipment
-# LinkToTrackYourPackage=Link to track your package
-# ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-# RelatedShippings=Related shippings
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+RefSending=Ref. shipment
+Sending=Shipment
+Sendings=Shipments
+Shipment=Shipment
+Shipments=Shipments
+Receivings=Receivings
+SendingsArea=Shipments area
+ListOfSendings=List of shipments
+SendingMethod=Shipping method
+SendingReceipt=Shipping receipt
+LastSendings=Last %s shipments
+SearchASending=Search for shipment
+StatisticsOfSendings=Statistics for shipments
+NbOfSendings=Number of shipments
+NumberOfShipmentsByMonth=Number of shipments by month
+SendingCard=Shipping card
+NewSending=New shipment
+CreateASending=Create a shipment
+CreateSending=Create shipment
+QtyOrdered=Qty ordered
+QtyShipped=Qty shipped
+QtyToShip=Qty to ship
+QtyReceived=Qty received
+KeepToShip=Keep to ship
+OtherSendingsForSameOrder=Other shipments for this order
+DateSending=Date sending order
+DateSendingShort=Date sending order
+SendingsForSameOrder=Shipments for this order
+SendingsAndReceivingForSameOrder=Shipments and receivings for this order
+SendingsToValidate=Shipments to validate
+StatusSendingCanceled=Canceled
+StatusSendingDraft=Draft
+StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingProcessed=Processed
+StatusSendingCanceledShort=Canceled
+StatusSendingDraftShort=Draft
+StatusSendingValidatedShort=Validated
+StatusSendingProcessedShort=Processed
+SendingSheet=Sending sheet
+Carriers=Carriers
+Carrier=Carrier
+CarriersArea=Carriers area
+NewCarrier=New carrier
+ConfirmDeleteSending=Are you sure you want to delete this shipment ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
+ConfirmCancelSending=Are you sure you want to cancel this shipment ?
+GenericTransport=Generic transport
+Enlevement=Gotten by customer
+DocumentModelSimple=Simple document model
+DocumentModelMerou=Merou A5 model
+WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+DateDeliveryPlanned=Planed date of delivery
+DateReceived=Date delivery received
+SendShippingByEMail=Send shipment by EMail
+SendShippingRef=Submission of shipment %s
+ActionsOnShipping=Events on shipment
+LinkToTrackYourPackage=Link to track your package
+ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
+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
-# SendingMethodTRANS=Transporter
-# SendingMethodCOLSUI=Colissimo
-
+SendingMethodCATCH=Catch by customer
+SendingMethodTRANS=Transporter
+SendingMethodCOLSUI=Colissimo
 # ModelDocument
-# DocumentModelSirocco=Simple document model for delivery receipts
-# DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelSirocco=Simple document model for delivery receipts
+DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
 
-# Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/uk_UA/shop.lang b/htdocs/langs/uk_UA/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/uk_UA/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index 01c90ede80f..b1545d6ca3c 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
-# Suppliers=Suppliers
-# Supplier=Supplier
-# AddSupplier=Add a supplier
-# SupplierRemoved=Supplier removed
-# SuppliersInvoice=Suppliers invoice
-# NewSupplier=New supplier
-# History=History
-# ListOfSuppliers=List of suppliers
-# ShowSupplier=Show supplier
-# OrderDate=Order date
-# BuyingPrice=Buying price
-# BuyingPriceMin=Minimum buying price
-# BuyingPriceMinShort=Min buying price
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
-# AddSupplierPrice=Add supplier price
-# ChangeSupplierPrice=Change supplier price
-# ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-# ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-# ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-# ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-# NoRecordedSuppliers=No suppliers recorded
-# SupplierPayment=Supplier payment
-# SuppliersArea=Suppliers area
-# RefSupplierShort=Ref. supplier
-# Availability=Availability
-# ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-# ExportDataset_fournisseur_2=Supplier invoices and payments
-# ExportDataset_fournisseur_3=Supplier orders and order lines
-# ApproveThisOrder=Approve this order
-# ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-# DenyingThisOrder=Denying this order
-# ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-# ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-# AddCustomerOrder=Create customer order
-# AddCustomerInvoice=Create customer invoice
-# AddSupplierOrder=Create supplier order
-# AddSupplierInvoice=Create supplier invoice
-# ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-# NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-# SentToSuppliers=Sent to suppliers
+Suppliers=Suppliers
+Supplier=Supplier
+AddSupplier=Add a supplier
+SupplierRemoved=Supplier removed
+SuppliersInvoice=Suppliers invoice
+NewSupplier=New supplier
+History=History
+ListOfSuppliers=List of suppliers
+ShowSupplier=Show supplier
+OrderDate=Order date
+BuyingPrice=Buying price
+BuyingPriceMin=Minimum buying price
+BuyingPriceMinShort=Min buying price
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
+AddSupplierPrice=Add supplier price
+ChangeSupplierPrice=Change supplier price
+ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+NoRecordedSuppliers=No suppliers recorded
+SupplierPayment=Supplier payment
+SuppliersArea=Suppliers area
+RefSupplierShort=Ref. supplier
+Availability=Availability
+ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
+ExportDataset_fournisseur_2=Supplier invoices and payments
+ExportDataset_fournisseur_3=Supplier orders and order lines
+ApproveThisOrder=Approve this order
+ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
+DenyingThisOrder=Denying this order
+ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
+ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
+AddCustomerOrder=Create customer order
+AddCustomerInvoice=Create customer invoice
+AddSupplierOrder=Create supplier order
+AddSupplierInvoice=Create supplier invoice
+ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
+NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
index 55ce45bfce8..4b0501a8346 100644
--- a/htdocs/langs/uk_UA/trips.lang
+++ b/htdocs/langs/uk_UA/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-# Trip=Trip
-# Trips=Trips
-# TripsAndExpenses=Trips and expenses
-# TripsAndExpensesStatistics=Trips and expenses statistics
-# TripCard=Trip card
-# AddTrip=Add trip
-# ListOfTrips=List of trips
-# ListOfFees=List of fees
-# NewTrip=New trip
-# CompanyVisited=Company/foundation visited
-# Kilometers=Kilometers
-# FeesKilometersOrAmout=Amount or kilometers
-# DeleteTrip=Delete trip
-# ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-# TF_OTHER=Other
-# TF_LUNCH=Lunch
-# TF_TRIP=Trip
-# ListTripsAndExpenses=List of trips and expenses
-# ExpensesArea=Trips and expenses area
-# SearchATripAndExpense=Search a trip and expense
+Trip=Trip
+Trips=Trips
+TripsAndExpenses=Trips and expenses
+TripsAndExpensesStatistics=Trips and expenses statistics
+TripCard=Trip card
+AddTrip=Add trip
+ListOfTrips=List of trips
+ListOfFees=List of fees
+NewTrip=New trip
+CompanyVisited=Company/foundation visited
+Kilometers=Kilometers
+FeesKilometersOrAmout=Amount or kilometers
+DeleteTrip=Delete trip
+ConfirmDeleteTrip=Are you sure you want to delete this trip ?
+TF_OTHER=Other
+TF_LUNCH=Lunch
+TF_TRIP=Trip
+ListTripsAndExpenses=List of trips and expenses
+ExpensesArea=Trips and expenses area
+SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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 ec1979fdc56..f12efa61626 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %
 ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> 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
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -54,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
@@ -133,7 +137,7 @@ Box=Box
 Boxes=Boxes
 MaxNbOfLinesForBoxes=Max number of lines for boxes
 PositionByDefault=Default order
-Position=Order
+Position=Position
 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.<br>Some modules add entries in the menus (in menu <b>All</b> 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
@@ -206,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
@@ -217,6 +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=Required
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Security
 Passwords=Passwords
 DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
@@ -257,6 +263,9 @@ 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: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_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
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
@@ -493,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
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=Create/modify social contributions and vat
 Permission93=Delete social contributions and vat
 Permission94=Export social contributions
 Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
@@ -603,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
@@ -668,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
@@ -698,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
@@ -775,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
@@ -884,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
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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
@@ -1318,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
@@ -1378,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
@@ -1408,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
@@ -1474,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.
@@ -1531,5 +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 b91bcb1f323..a24c678a2e5 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=Events
 ActionsArea=Events area (Actions and tasks)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
+Agenda=Agenda
+Agendas=Agendas
+Calendar=Calendar
+Calendars=Calendars
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=Assigned to
+DoneBy=Done by
+Event=Event
+Events=Events
 EventsNb=Number of events
 MyEvents=My events
 OtherEvents=Other events
@@ -17,31 +19,33 @@ ListOfActions=List of events
 Location=Location
 EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
+MenuToDoActions=All incomplete events
+MenuDoneActions=All terminated events
+MenuToDoMyActions=My incomplete events
+MenuDoneMyActions=My terminated events
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=Events reported by
 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
 ViewCal=Month view
 ViewDay=Day view
 ViewWeek=Week view
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= View with predefined filters
 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
@@ -49,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
@@ -57,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
@@ -68,19 +69,24 @@ DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=Export calendar
 ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Number of calendars
 AgendaExtNb=Calendar nb %s
 ExtSiteUrlAgenda=URL to access .ical file
 ExtSiteNoLabel=No Description
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 3041825db57..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 <b>credit note</b> 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
@@ -85,8 +85,9 @@ ClassifyPaid=Classify 'Paid'
 ClassifyPaidPartially=Classify 'Paid partially'
 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
@@ -98,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
@@ -136,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
@@ -155,9 +154,9 @@ ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
 ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
 ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
 ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> 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
@@ -190,15 +189,15 @@ 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
 EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=Standing orders
 StandingOrder=Standing order
 NoDraftBills=No draft invoices
@@ -218,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
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=Immediate
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 27c4fc44394..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?
@@ -111,3 +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
+ShowCategory=Show category
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 1b2ea17215b..5580d87b517 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
 ListSuppliersShort=List of suppliers
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Last %s modified third parties
 UniqueThirdParties=Total of unique third parties
 InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 30b41b5316e..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
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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 728661dfa04..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
@@ -30,3 +30,9 @@ SearchADonation=Search a donation
 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 6f96b00f5f2..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 <b>%s</b> 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 <b>%s</b> used to execute web server has no permission for that
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index 3acad0d32cd..d79df485608 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=Account number
 BankAccountNumberKey=Key
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 da03299e0da..f5b87fefb08 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=Start date
 DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
 CancelCP=Canceled
 RefuseCP=Refused
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
 DeleteCP=Delete
 ActionValidCP=Validate
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=Cancel
 StatutCP=Status
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=Validate
 UpdateEventCP=Update events
 CreateEventCP=Create
@@ -127,23 +126,23 @@ UpdateEventOptionCP=Update
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index 58579a74276..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
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=Name and signature of intervening :
 NameAndSignatureOfExternalContact=Name and signature of customer :
 DocumentModelStandard=Standard document model for interventions
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Classify "Billed"
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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 <b>%s</b> 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.<br><br>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 37012349b02..81d217ddb54 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=Closed
 ContractStatusRunning=Running
 ContractStatusExpired=expired
 ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=This contract is not running
 ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=Suppliers
 SupplierRef=Supplier's product ref.
 ShowProduct=Show product
@@ -116,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
@@ -131,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?
@@ -178,7 +179,7 @@ CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 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
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 55970f0b35c..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
@@ -85,13 +87,13 @@ ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=Ressources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=Time spent is empty
 ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
 IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
 PlannedWorkload = Planned workload
@@ -128,3 +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
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 039d47f6aa9..f6111bac684 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -54,13 +54,15 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated.
 DateDeliveryPlanned=Planed date of delivery
 DateReceived=Date delivery received
 SendShippingByEMail=Send shipment by EMail
-SendShippingRef=Send shipment %s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=Events on shipment
 LinkToTrackYourPackage=Link to track your package
 ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
 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
@@ -72,3 +74,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/uz_UZ/shop.lang b/htdocs/langs/uz_UZ/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/uz_UZ/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
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/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index fdc0787646a..b1545d6ca3c 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice
 ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
 NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
 SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index 06d46c7ac65..4b0501a8346 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=Trip
 ListTripsAndExpenses=List of trips and expenses
 ExpensesArea=Trips and expenses area
 SearchATripAndExpense=Search a trip and expense
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..8eba08cd1d6
--- /dev/null
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Kế toán
+Globalparameters=Các thông số toàn cầu
+Chartofaccounts=Biểu đồ tài khoản
+Fiscalyear=Năm tài chính
+Menuaccount=Tài khoản kế toán
+Menuthirdpartyaccount=Tài khoản của bên thứ ba
+MenuTools=Công cụ
+
+ConfigAccountingExpert=Cấu hình của các chuyên gia kế toán mô-đun
+Journaux=Tạp chí
+JournalFinancial=Tạp chí tài chính
+Exports=Xuất khẩu
+Modelcsv=Mô hình xuất khẩu
+Selectmodelcsv=Chọn một mô hình xuất khẩu
+Modelcsv_normal=Cổ điển xuất khẩu
+Modelcsv_CEGID=Xuất khẩu theo hướng CEGID chuyên gia
+BackToChartofaccounts=Quay trở lại biểu đồ của tài khoản
+Back=Quay trở lại
+
+Definechartofaccounts=Xác định một biểu đồ của tài khoản
+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=Breakdown
+ToDispatch=Gửi đi
+Dispatched=Đã gửi đi
+
+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
+ByMonth=Theo tháng
+NewAccount=Tài khoản kế toán mới
+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 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=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 ventilation
+InvoiceLinesDone=Đường ventilation hóa đơn
+IntoAccount=Trong tài khoản kế toán
+
+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 để ventilation
+SelectedLines=Đường lựa chọn
+Lineofinvoice=Dòng của hóa đơ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 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=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=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=Tài khoản chuyển nhượng
+ACCOUNTING_ACCOUNT_SUSPENSE=Tài khoản của chờ đợi
+
+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
+Docref=Tài liệu tham khảo
+Numerocompte=Tài khoản
+Code_tiers=Của bên thứ ba
+Labelcompte=Tài khoản Label
+Debit=Nợ
+Credit=Tín dụng
+Amount=Số tiền
+Sens=Sens
+Codejournal=Tạp chí
+
+DelBookKeeping=Xóa các bản ghi của sổ kế toán tổng
+
+SellsJournal=Bán tạp chí
+PurchasesJournal=Mua tạp chí
+DescSellsJournal=Bán tạp chí
+DescPurchasesJournal=Mua tạp chí
+BankJournal=Tạp chí Ngân hàng
+DescBankJournal=Tạp chí Ngân hàng bao gồm tất cả các loại chi phí khác hơn tiền mặt
+CashJournal=Tạp chí Tiền
+DescCashJournal=Tiền tạp chí bao gồm cả các loại tiền thanh toán
+
+CashPayment=Thanh toán bằng tiền mặt
+
+SupplierInvoicePayment=Thanh toán hóa đơn của nhà cung cấp
+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=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
+DescThirdPartyReport=Tham khảo ý kiến ​​ở đây là danh sách các khách hàng của bên thứ ba và các nhà cung cấp và các tài khoản kế toán
+
+ListAccounts=Danh sách các tài khoản kế toán
+
+Pcgversion=Phiên bản kế hoạch
+Pcgtype=Lớp tài khoản
+Pcgsubtype=Trong lớp học của các tài khoản
+Accountparent=Gốc của tài khoản
+Active=Trữ
+
+NewFiscalYear=Năm tài chính mới
+
+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=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=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=Breakdown card
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 0461994732e..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 <b>%s</b> 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 <b>%s</b> 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
@@ -43,17 +43,21 @@ SecuritySetup=Thiết lập an nin
 ErrorModuleRequirePHPVersion=Lỗi, module này yêu cầu phiên bản PHP %s hoặc mới hơn
 ErrorModuleRequireDolibarrVersion=Lỗi, module này yêu cầu Dolibarr phiên bản %s hoặc mới hơn
 ErrorDecimalLargerThanAreForbidden=Lỗi, thao tác này có độ ưu tiên cao hơn <b>%s</b> sẽ không được hỗ trợ.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
+DictionarySetup=Thiết lập từ điển
+Dictionary=Từ điển
+Chartofaccounts=Biểu đồ tài khoản
+Fiscalyear=Năm tài chính
 ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'hệ thống tự động' đối với loại đã được lưu trữ. Bạn có thể sử dụng 'người dùng' như là dạng giá trị để thêm vào bản ghi của riêng mình
 ErrorCodeCantContainZero=Mã lệnh không thể chứa giá trị 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DisableJavascript=Vô hiệu hóa JavaScript và Ajax chức năng (Đề xuất cho người mù hoặc văn bản trình duyệt)
 ConfirmAjax=Sử dụng popups xác định từ 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=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập COMPANY_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi.
+UseSearchToSelectCompany=Sử dụng các lĩnh vực tự động gõ để lựa chọn bên thứ ba thay vì sử dụng một hộp danh sách.
 ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa
-UseSearchToSelectContactTooltip=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=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
@@ -65,8 +69,8 @@ ShowPreview=Hiển thị xem trước
 PreviewNotAvailable=Xem trước hiện không khả dụng
 ThemeCurrentlyActive=Giao diện hiện đã kích hoạt
 CurrentTimeZone=Mã vùng thời gian 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).
+MySQLTimeZone=TimeZone MySql (cơ sở dữ liệu)
+TZHasNoEffect=Ngày được lưu trữ và máy chủ cơ sở dữ liệu trả về bởi như thể chúng được lưu giữ như là chuỗi đệ trình. Các múi giờ có tác dụng chỉ khi sử dụng chức năng UNIX_TIMESTAMP (mà không nên được sử dụng bởi Dolibarr, vì vậy cơ sở dữ liệu TZ nên không có hiệu lực, ngay cả khi thay đổi sau khi dữ liệu đã được nhập vào).
 Space=Khoảng trống
 Table=Bàn
 Fields=Trường
@@ -75,8 +79,8 @@ Mask=Mặt nạ
 NextValue=Giá trị tiếp theo
 NextValueForInvoices=Giá trị tiếp theo (invoices)
 NextValueForCreditNotes=Giá trị tiếp theo (ghi chú tín dụng)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=Giá trị tiếp theo (tiền đặt cọc)
+NextValueForReplacements=Giá trị tiếp theo (thay thế)
 MustBeLowerThanPHPLimit=Chú ý: PHP của bạn giới hạn kích thước của tập tin tải lên là <b>%s</b>%s, cho dù giá trị thông số phần này là
 NoMaxSizeByPHPLimit=Chú ý: Không có giới hạn được chỉnh sửa trong phần chỉnh sửa PHP
 MaxSizeForUploadedFiles=Kích thước tối đa của tập tin được tải lên (0 sẽ tắt chế độ tải lên)
@@ -104,9 +108,9 @@ OtherOptions=Tùy chọn khác
 OtherSetup=Cài đặt khác
 CurrentValueSeparatorDecimal=Phân cách tập phân
 CurrentValueSeparatorThousand=Phân cách phần ngàn
-Destination=Destination
+Destination=Điểm đến
 IdModule=Module ID
-IdPermissions=Permissions ID
+IdPermissions=Quyền ID
 Modules=Module
 ModulesCommon=Module chính
 ModulesOther=Các module khác
@@ -116,28 +120,28 @@ ParameterInDolibarr=Thông số %s
 LanguageParameter=Thông số ngôn ngữ %s
 LanguageBrowserParameter=Thông số %s
 LocalisationDolibarrParameters=Địa phương hóa thông số
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
+ClientTZ=Time Zone khách hàng (người sử dụng)
+ClientHour=Hiện khách hàng (người sử dụng)
+OSTZ=Máy chủ hệ điều hành Time Zone
+PHPTZ=PHP máy chủ Time Zone
 PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (giây)
 ClientOffsetWithGreenwich=Client/Trình duyệt độ rộng offset Greenwich (giây)
 DaylingSavingTime=Tiết kiệm thời gian ban ngày
-CurrentHour=PHP Time (server)
-CompanyTZ=Company Time Zone (main company)
-CompanyHour=Company Time (main company)
+CurrentHour=PHP thời gian (máy chủ)
+CompanyTZ=Thời gian Công ty Zone (công ty chính)
+CompanyHour=Công ty thời gian (công ty chính)
 CurrentSessionTimeOut=Thời gian hết hạn của phiên làm việc hiện tại
-YouCanEditPHPTZ=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"
+YouCanEditPHPTZ=Để thiết lập một PHP múi giờ khác nhau (không bắt buộc), bạn có thể cố gắng thêm một tập tin .htacces với một dòng như thế này "setenv TZ Châu Âu / Paris"
 OSEnv=Môi trường hệ điều hành
 Box=Hộp
 Boxes=Các Hộp
 MaxNbOfLinesForBoxes=Số lượng dòng tối đa đối với các hộp
 PositionByDefault=Trật tự mặc định
-Position=Trật tự
+Position=Chức vụ
 MenusDesc=Phần quản lý menu xác định nội dung đối với 2 thanh menu (thanh đặt ở chiều ngang và đặt theo chiều dọc).
-MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.<br>Some modules add entries in the menus (in menu <b>All</b> in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module.
+MenusEditorDesc=Các biên tập viên menu cho phép bạn xác định mục cá nhân trong các menu. Sử dụng nó một cách cẩn thận để tránh làm cho dolibarr không ổn định và các mục trình đơn vĩnh viễn không thể truy cập. <br> Một số mô-đun thêm các mục trong menu (trong trình đơn <b>Tất cả</b> trong hầu hết các trường hợp). Nếu bạn loại bỏ một số trong những mục do nhầm lẫn, bạn có thể khôi phục lại chúng bằng cách vô hiệu hóa và kích hoạt lại các mô-đun.
 MenuForUsers=Menu dành cho người sử dụng
-LangFile=.lang file
+LangFile=tập tin .lang
 System=Hệ thống
 SystemInfo=Thông tin về hệ thống
 SystemTools=Công cụ hệ thống
@@ -147,1389 +151,1414 @@ 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 <b>%s</b>). 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 <b>%s</b> đượ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=Delete all files in directory <b>%s</b>. 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=<b>%s</b> 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
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-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 <a href="%s">here</a>.
-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:
+PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư mục <b>%s</b>. 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=<b>%</b> 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
+GenerateBackup=Tạo sao lưu
+Backup=Sao lưu
+Restore=Khôi phục
+RunCommandSummary=Sao lưu đã được đưa ra với lệnh sau đây
+RunCommandSummaryToLaunch=Sao lưu có thể được đưa ra với lệnh sau đây
+WebServerMustHavePermissionForCommand=Máy chủ web của bạn phải có sự cho phép để chạy các lệnh như vậy
+BackupResult=Kết quả sao lưu
+BackupFileSuccessfullyCreated=Tập tin sao lưu được tạo ra thành công
+YouCanDownloadBackupFile=Các tập tin được tạo ra có thể được tải về
+NoBackupFileAvailable=Không sao lưu tập tin có sẵn.
+ExportMethod=Phương pháp xuất khẩu
+ImportMethod=Phương pháp nhập khẩu
+ToBuildBackupFileClickHere=Để xây dựng một tập tin sao lưu, nhấn vào <a href="%s">đây</a> .
+ImportMySqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh mysql từ dòng lệnh:
+ImportPostgreSqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh pg_restore từ dòng lệnh:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-Datas=Data
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-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
-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 <a href="%s">enabled modules</a> 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.
-ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services.
-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...
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
-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
-Security=Security
-Passwords=Passwords
-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 <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="..."</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>by<br><b>$dolibarr_main_db_pass="%s"</b>
-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
+FileNameToGenerate=Tên tập tin để tạo ra
+Compression=Nén
+CommandsToDisableForeignKeysForImport=Lệnh để vô hiệu hóa các phím nước ngoài nhập khẩu
+CommandsToDisableForeignKeysForImportWarning=Bắt buộc nếu bạn muốn để có thể khôi phục lại bãi sql của bạn sau này
+ExportCompatibility=Khả năng tương thích của tập tin xuất khẩu tạo ra
+MySqlExportParameters=Thông số xuất khẩu MySQL
+PostgreSqlExportParameters= Thông số xuất khẩu PostgreSQL
+UseTransactionnalMode=Sử dụng chế độ giao dịch
+FullPathToMysqldumpCommand=Đường dẫn đầy đủ để mysqldump lệnh
+FullPathToPostgreSQLdumpCommand=Đường dẫn đầy đủ để pg_dump lệnh
+ExportOptions=Tùy chọn xuất khẩu
+AddDropDatabase=Thêm lệnh DATABASE thả
+AddDropTable=Thêm DROP TABLE lệnh
+ExportStructure=Cơ cấu
+Datas=Dữ liệu
+NameColumn=Cột Name
+ExtendedInsert=Mở rộng INSERT
+NoLockBeforeInsert=Không khóa lệnh trên INSERT
+DelayedInsert=Chèn bị trì hoãn
+EncodeBinariesInHexa=Mã hóa dữ liệu nhị phân trong hệ thập lục phân
+IgnoreDuplicateRecords=Bỏ qua lỗi của bản ghi trùng lặp (INSERT bỏ qua)
+Yes=Có
+No=Không có
+AutoDetectLang=Tự động (ngôn ngữ trình duyệt)
+FeatureDisabledInDemo=Tính năng vô hiệu hóa trong bản demo
+Rights=Quyền
+BoxesDesc=Hộp là khu vực màn hình hiển thị một mẩu thông tin trên một số trang. Bạn có thể chọn giữa việc hiển thị hộp hay không bằng cách chọn trang mục tiêu và nhấp vào 'Kích hoạt', hoặc bằng cách nhấn vào thùng rác để vô hiệu hóa nó.
+OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">kích hoạt module</a> được hiển thị.
+ModulesDesc=Module Dolibarr xác định các chức năng được kích hoạt trong phần mềm. Một số module yêu cầu cấp phép mà bạn phải cấp cho người sử dụng, sau khi kích hoạt module. Click vào nút on / off trong cột "Trạng thái" để cho phép một mô-đun / tính năng.
+ModulesInterfaceDesc=Các Dolibarr giao diện module cho phép bạn thêm các tính năng phụ thuộc vào phần mềm bên ngoài, hệ thống hoặc dịch vụ.
+ModulesSpecialDesc=Các mô-đun đặc biệt là các mô-đun rất cụ thể hoặc ít khi sử dụng.
+ModulesJobDesc=Module kinh doanh cung cấp thiết lập được xác định trước đơn giản của Dolibarr cho một doanh nghiệp cụ thể.
+ModulesMarketPlaceDesc=Bạn có thể tìm thấy các mô-đun tải bên ngoài trang web trên Internet ...
+ModulesMarketPlaces=Nhiều mô-đun ...
+DoliStoreDesc=DoliStore, trên thị trường chính thức cho Dolibarr ERP / CRM module bên ngoài
+DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
+WebSiteDesc=Cung cấp dịch vụ trang web, bạn có thể tìm kiếm để tìm các mô-đun ...
+URL=Liên kết
+BoxesAvailable=Hộp có sẵn
+BoxesActivated=Hộp kích hoạt
+ActivateOn=Kích hoạt trên
+ActiveOn=Đã kích hoạt trên
+SourceFile=Tập tin nguồn
+AutomaticIfJavascriptDisabled=Tự động nếu Javascript bị vô hiệu hóa
+AvailableOnlyIfJavascriptNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa
+Required=Yêu cầu
+UsedOnlyWithTypeOption=Được sử dụng bởi một số chương trình nghị sự lựa chọn duy nhất
+Security=An ninh
+Passwords=Mật khẩu
+DoNotStoreClearPassword=Do không có cửa hàng mật khẩu rõ ràng trong cơ sở dữ liệu nhưng cửa hàng chỉ có giá trị được mã hóa (đề nghị Đã kích hoạt)
+MainDbPasswordFileConfEncrypted=Cơ sở dữ liệu mật khẩu được mã hóa trong conf.php (Đã kích hoạt được đề nghị)
+InstrucToEncodePass=Để có mật khẩu mã hóa vào tập tin <b>conf.php</b>, thay thế dòng <br><b>$dolibarr_main_db_pass="..."</b><br> bởi <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
+InstrucToClearPass=Để có mật khẩu giải mã (làm sạch) vào tập tin <b>conf.php</b>, thay thế dòng <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> bởi <br><b>$dolibarr_main_db_pass="%s"</b>
+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
+DolibarrLicense=Giấy phép
 DolibarrProjectLeader=Người lãnh đạo dự án
-Developpers=Developers/contributors
-OtherDeveloppers=Other developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteFr=French official web site
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-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
-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: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-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: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all 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_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send 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 <b>langs/%s</b> and submit modified files on www.dolibarr.org forum.
-ModuleSetup=Module setup
-ModulesSetup=Modules setup
+Developpers=Các nhà phát triển / thành viên góp
+OtherDeveloppers=Phát triển khác / đóng góp
+OfficialWebSite=Dolibarr trang web chính thức quốc tế
+OfficialWebSiteFr=Trang web chính thức của Pháp
+OfficialWiki=Tài liệu Dolibarr trên Wiki
+OfficialDemo=Dolibarr demo trực tuyến
+OfficialMarketPlace=Thị trường chính thức cho các module bên ngoài / addons
+OfficialWebHostingService=Dịch vụ lưu trữ web tham chiếu (Cloud lưu trữ)
+ReferencedPreferredPartners=Đối tác ưa thích
+OtherResources=Autres nguồn tài
+ForDocumentationSeeWiki=Đối với người dùng hay tài liệu hướng dẫn phát triển (tài liệu, Hỏi đáp về ...), <br> hãy xem các Dolibarr Wiki: <br><b><a href="%s" target="_blank">%s</a></b>
+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: <br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Khu vực này có thể giúp bạn để có được một dịch vụ hỗ trợ giúp về Dolibarr.
+HelpCenterDesc2=Một số phần của dịch vụ này có sẵn <b>chỉ trong tiếng Anh</b>.
+CurrentTopMenuHandler=Xử lý menu trên cùng hiện tại
+CurrentLeftMenuHandler=Xử lý menu bên trái hiện tại
+CurrentMenuHandler=Xử lý menu hiện tại
+CurrentSmartphoneMenuHandler=Xử lý menu điện thoại thông minh hiện tại
+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: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Theo mặc định trong php.ini: <b>%s</b>)
+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: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Tên người gửi e-mail được sử dụng cho các lỗi trả về email được gửi
+MAIN_MAIL_AUTOCOPY_TO= Gửi một cách có hệ thống ẩn carbon bản sao của tất cả các email gửi tới
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Gửi một cách có hệ thống ẩn carbon bản sao của kiến ​​nghị gửi qua email
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Gửi một cách có hệ thống ẩn carbon bản sao của đơn đặt hàng được gửi qua email đến
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Gửi một cách có hệ thống ẩn carbon bản sao hoá đơn gửi bằng email đến
+MAIN_DISABLE_ALL_MAILS=Vô hiệu hoá tất cả các e-mail sendings (cho mục đích thử nghiệm hoặc trình diễn)
+MAIN_MAIL_SENDMODE=Phương pháp sử dụng để gửi email
+MAIN_MAIL_SMTPS_ID=SMTP ID nếu có yêu cầu xác thực
+MAIN_MAIL_SMTPS_PW=Mật khẩu SMTP nếu có yêu cầu xác thực
+MAIN_MAIL_EMAIL_TLS= Sử dụng TLS (SSL) mã hóa
+MAIN_DISABLE_ALL_SMS=Vô hiệu hoá tất cả sendings SMS (cho mục đích thử nghiệm hoặc trình diễn)
+MAIN_SMS_SENDMODE=Phương pháp sử dụng để gửi tin nhắn SMS
+MAIN_MAIL_SMS_FROM=Số điện thoại mặc định cho người gửi SMS gửi
+FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ thống. Kiểm tra chương trình sendmail của bạn tại địa phương.
+SubmitTranslation=Nếu dịch cho ngôn ngữ này không phải là hoàn toàn hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục <b>langs/%s</b> 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
-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
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-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.
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
-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.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and datas: %s.
-LastStableVersion=Last stable version
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> 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. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> 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. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending 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.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link "<b>%s Online help</b>" 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
-ConfirmPurge=Are you sure you want to execute this purge ?<br>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
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+ModuleFamilyCrm=Quản lý quan hệ khách hàng (CRM)
+ModuleFamilyProducts=Quản lý sản phẩm
+ModuleFamilyHr=Quản lý nguồn nhân lực
+ModuleFamilyProjects=Các dự án / công trình hợp tác
+ModuleFamilyOther=Khác
+ModuleFamilyTechnic=Nhiều mô-đun công cụ
+ModuleFamilyExperimental=Các mô-đun thí nghiệm
+ModuleFamilyFinancial=Mô-đun tài chính (Kế toán / Tài chính)
+ModuleFamilyECM=Quản lý nội dung điện tử (ECM)
+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).
+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 <b>%s</b>
+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. <br>
+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. <br> 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). <br>
+InfDirExample=<br> Sau đó khai báo trong tập tin conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>* 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: <br><b>{000000}</b>  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ạ. <br><b>{000000+000}</b> 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. <br><b>{000000@x}</b> 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. <br><b>{dd}</b> ngày (01 đến 31). <br><b>{mm}</b> tháng (01 đến 12). <br><b>{yy}</b>, <b>{yyyy}</b> hoặc <b>{y}</b> năm trên 2, 4 hoặc 1 con số. <br>
+GenericMaskCodes2=<b>{cccc}</b> mã khách hàng về n ký tự <br><b>{cccc000}</b> 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. <br><b>{tttt}</b> Đ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). <br>
+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. <br> Khoảng trống không được phép. <br>
+GenericMaskCodes4a=<u>Ví dụ trên %s thứ 99 của bên thứ ba TheCompany đã hoàn thành 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Ví dụ về bên thứ ba tạo ra trên 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Ví dụ về sản phẩm tạo ra trên 2007-03-01:</u><br>
+GenericMaskCodes5=b>ABC{yy}{mm}-{000000}</b>  sẽ gửi cho <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> sẽ gửi cho <b>0199-ZZZ/31/XXX</b>
+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ỉ <b>%s</b> trêncổng <b>%s</b>
+ServerNotAvailableOnIPOrPort=Máy chủ không có sẵn tại địa chỉ <b>%s</b> trên cổng <b>%s</b>
+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 {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ụ). <br> 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). <br> 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 <b>"Cần giúp đỡ hoặc hỗ trợ"</b> trên trang đăng nhập
+DisableLinkToHelp=Ẩn liên kết "<b>%s Hỗ trợ trực tuyến</b>"  trên menu bên trái
+AddCRIfTooLong=Không có gói tự động, do đó, nếu dòng là ra khỏi trang trên các tài liệu bởi vì quá dài, bạn phải thêm mình xuống dòng trong khung văn bản.
+ModuleDisabled=Mô-đun bị vô hiệu hóa
+ModuleDisabledSoNoEvent=Mô-đun để vô hiệu hóa sự kiện không bao giờ tạo ra
+ConfirmPurge=Bạn Bạn có chắc chắn muốn thực hiện cuộc thanh trừng này? <br> Điều này chắc chắn sẽ xóa tất cả các file dữ liệu của bạn không có cách nào khôi phục lại được (file ECM, file đính kèm ...).
+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ở. <br><br> Đặt ở đây đường dẫn đầy đủ của thư mục. <br> Thêm một trở về vận chuyển giữa các thư mục EAH. <br> Để thêm một thư mục của module GED, thêm ở đây <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> File trong thư mục phải kết thúc với <b>.odt</b>
+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: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br> Để 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=Position of Name/Lastname
-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
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first before using this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
+FirstnameNamePosition=Chức vụ Tên / LastName
+DescWeather=Những hình ảnh sau đây sẽ được hiển thị trên bảng điều khiển khi số hành động cuối đạt các giá trị sau đây:
+KeyForWebServicesAccess=Chìa khóa để sử dụng dịch vụ Web (tham số "dolibarrkey" trong webservices)
+TestSubmitForm=Hình thức kiểm tra đầu vào
+ThisForceAlsoTheme=Quản lý sử dụng trình đơn này cũng sẽ sử dụng chủ đề của riêng mình bất cứ điều gì là sự lựa chọn của người dùng. Ngoài ra menu này quản lý chuyên ngành cho điện thoại thông minh không hoạt động trên tất cả các điện thoại thông minh. Quản lý sử dụng một trình đơn nếu bạn gặp vấn đề trên của bạn.
+ThemeDir=Skins thư mục
+ConnectionTimeout=Connexion thời gian chờ
+ResponseTimeout=Đáp ứng thời gian chờ
+SmsTestMessage=Tin nhắn kiểm tra từ __PHONEFROM__ để __PHONETO__
+ModuleMustBeEnabledFirst=<b>Mô-đun%s</b> 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
 PDF=PDF
-PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-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
-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
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
-String=String
-TextLong=Long text
+PDFDesc=Bạn có thể thiết lập cho mỗi tùy chọn toàn cầu liên quan đến các thế hệ PDF
+PDFAddressForging=Quy định giả mạo địa chỉ hộp
+HideAnyVATInformationOnPDF=Ẩn tất cả các thông tin liên quan đến thuế GTGT đối với PDF được tạo ra
+HideDescOnPDF=Ẩn mô tả sản phẩm vào PDF được tạo ra
+HideRefOnPDF=Ẩn các sản phẩm ref. PDF được tạo ra trên
+HideDetailsOnPDF=Ẩn dòng sản phẩm chi tiết về PDF được tạo ra
+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
+GetSecuredUrl=Nhận URL tính
+ButtonHideUnauthorized=Ẩn nút cho các hành động trái phép, thay vì hiển thị các nút khuyết tật
+OldVATRates=Thuế suất thuế GTGT cũ
+NewVATRates=Thuế suất thuế GTGT mới
+PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu được xác định trên cơ sở
+MassConvert=Khởi động chuyển đổi hàng loạt
+String=Chuỗi
+TextLong=Văn bản dài
 Int=Integer
 Float=Float
-DateAndTime=Date and hour
-Unique=Unique
+DateAndTime=Ngày và giờ
+Unique=Độc đáo
 Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
+ExtrafieldPhone = Điện thoại
+ExtrafieldPrice = Giá
 ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
+ExtrafieldSelect = Danh sách lựa chọn
+ExtrafieldSelectList = Chọn từ bảng
 ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value <br> if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
-WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. 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.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
-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:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+ExtrafieldRadio=Nút radio
+ExtrafieldParamHelpselect=Danh sách các thông số phải như quan trọng, giá trị <br><br> ví dụ: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ... <br><br> Để có danh sách tùy thuộc vào khác: <br> 1, value1 | parent_list_code: parent_key <br> 2, value2 | parent_list_code: parent_key
+ExtrafieldParamHelpcheckbox=Danh sách các thông số phải như quan trọng, giá trị <br><br> ví dụ: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpradio=Danh sách các thông số phải như quan trọng, giá trị <br><br> ví dụ: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=Danh sách các thông số xuất phát từ một bảng <br> Cú pháp: tên_bảng: label_field: id_field :: lọc <br> Ví dụ: c_typent: libelle: id :: lọc <br><br> 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 <br> 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) <br><br> Để có danh sách tùy thuộc vào khác: <br> 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: <b>conf.php</b> của bạn có chứa trực tiếp <b>dolibarr_pdf_force_fpdf=1</b>.</b> Đ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. <br> Để 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 <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, sau đó bình luận hoặc loại bỏ các dòng <b>$dolibarr_pdf_force_fpdf=1</b>, và thêm thay vì <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
+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à: <br> 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) <br> 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) <br> 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) <br> 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) <br> 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) <br> 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=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default 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
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %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.
+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 <strong>%s</strong>
+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 <strong>%s</strong> (bấm số điện thoại để kiểm tra)
+KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định
+DefaultLink=Liên kết mặc định
+ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể người sử dụng (mỗi người dùng có thể thiết lập url clicktodial riêng của mình)
+ExternalModule=Bên ngoài mô-đun - cài đặt vào thư mục%s
+BarcodeInitForThirdparties=Init mã vạch hàng loạt cho thirdparties
+BarcodeInitForProductsOrServices=Init mã vạch khối lượng hoặc thiết lập lại các sản phẩm hoặc dịch vụ
+CurrentlyNWithoutBarCode=Hiện tại, bạn có <strong>%s</strong> biên bản <strong>%s</strong> %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ỏ
+NoBarcodeNumberingTemplateDefined=Không có đánh số mã vạch mẫu kích hoạt vào thiết lập mô-đun mã vạch.
+NoRecordWithoutBarcodeDefined=Không có hồ sơ không có giá trị xác định mã vạch.
 
 # Modules
-Module0Name=Users & groups
-Module0Desc=Users and groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
-Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-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
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management
+Module0Name=Người dùng & nhóm
+Module0Desc=Người dùng và nhóm quản lý
+Module1Name=Các bên thứ ba
+Module1Desc=Các công ty và quản lý liên lạc (khách hàng, khách hàng tiềm năng ...)
+Module2Name=Thương mại
+Module2Desc=Quản lý thương mại
+Module10Name=Kế toán
+Module10Desc=Báo cáo kế toán đơn giản (các tạp chí, kim ngạch) dựa vào nội dung cơ sở dữ liệu. Không có điều phối.
+Module20Name=Đề xuất
+Module20Desc=Quản lý đề nghị thương mại
+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=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
+Module42Desc=Các cơ sở khai thác gỗ (tập tin, nhật ký hệ thống, ...)
+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=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=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=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=Integration of a ClickToDial system (Asterisk, ...)
+Module58Desc=Tích hợp hệ thống ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-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
+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=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=External site
-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
+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
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
+Module200Desc=Đồng bộ hóa thư mục LDAP
 Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr datas (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import datas in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
+Module210Desc=PostNuke hội nhập
+Module240Name=Xuất khẩu dữ liệu
+Module240Desc=Công cụ để xuất khẩu Dolibarr dữ liệu ngay (với các trợ lý)
+Module250Name=Import dữ liệu
+Module250Desc=Công cụ để import dữ liệu ngay trong Dolibarr (với trợ lý)
+Module310Name=Thành viên
+Module310Desc=Quản lý thành viên công ty
 Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmark management
-Module400Name=Các dự án
-Module400Desc=Project management inside other modules
+Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibarr
+Module330Name=Đánh dấu
+Module330Desc=Quản lý Bookmark
+Module400Name=Projects/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
-Module700Desc=Donation management
-Module800Name=OSCommerce by direct database access
-Module800Desc=Interface to show an OSCommerce or OSCSS shop via direct database access
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
+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 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ợ
 Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor
+Module1200Desc=Mantis hội nhập
+Module1400Name=Kế toán
+Module1400Desc=Kế toán quản trị (đôi bên)
+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=Scheduled task management
-Module2400Name=Agenda
-Module2400Desc=Events/tasks and agenda management
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
+Module2300Desc=Quản lý công việc theo lịch trình
+Module2400Name=Chương trình nghị sự
+Module2400Desc=Sự kiện / nhiệm vụ và quản lý chương trình nghị sự
+Module2500Name=Quản lý nội dung điện tử
+Module2500Desc=Lưu và chia sẻ tài liệu
 Module2600Name=WebServices
-Module2600Desc=Enable the Dolibarr web services server
+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=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
+Module2700Desc=Sử dụng dịch vụ trực tuyến Gravatar (www.gravatar.com) để hiển thị hình ảnh của người sử dụng / thành viên (được tìm thấy với các email của họ). Cần truy cập internet
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
+Module2900Desc=GeoIP MaxMind khả năng chuyển đổi
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module20000Name=Holidays
-Module20000Desc=Declare and follow employees holidays
-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
+Module3100Desc=Thêm một nút Skype vào thẻ tín đồ / bên thứ ba / địa chỉ liên lạc
+Module5000Name=Nhiều công ty
+Module5000Desc=Cho phép bạn quản lý nhiều công ty
+Module6000Name=Quy trình làm việc
+Module6000Desc=Quản lý công việc
+Module20000Name=Để lại yêu cầu quản lý
+Module20000Desc=Khai báo và nhân viên theo yêu cầu nghỉ phép
+Module39000Name=Hàng loạt sản phẩm
+Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module50000Name=Nơi trả tiền
+Module50000Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với nơi trả tiền
+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
+Module50400Name=Kế toán (nâng cao)
+Module50400Desc=Kế toán quản trị (đôi bên)
 Module54000Name=PrintIPP
-Module54000Desc=Print via Cups IPP Printer.
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-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
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
+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
+Module59000Desc=Mô-đun để quản lý lợi nhuận
+Module60000Name=Hoa hồng
+Module60000Desc=Mô-đun để quản lý hoa hồng
+Module150010Name=Số lô, ăn theo ngày và bán theo ngày
+Module150010Desc=số lô, ăn theo ngày và bán theo quản lý ngày cho sản phẩm
+Permission11=Đọc hóa đơn của khách hàng
+Permission12=Tạo / chỉnh sửa hóa đơn khách hàng
+Permission13=Hóa đơn khách hàng Unvalidate
+Permission14=Xác nhận hoá đơn của khách hàng
+Permission15=Gửi hóa đơn khách hàng qua email
+Permission16=Tạo hoá đơn thanh toán cho khách hàng
+Permission19=Xóa hóa đơn của khách hàng
+Permission21=Đọc đề xuất thương mại
+Permission22=Tạo / sửa đổi đề xuất thương mại
+Permission24=Xác nhận đề xuất thương mại
+Permission25=Gửi đề nghị thương mại
+Permission26=Đóng đề xuất thương mại
+Permission27=Xóa đề xuất thương mại
+Permission28=Xuất khẩu đề nghị thương mại
+Permission31=Ðọc sản phẩm
+Permission32=Tạo / chỉnh sửa sản phẩm
+Permission34=Xóa sản phẩm
+Permission36=Xem / quản lý sản phẩm ẩn
 Permission38=Export products
-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)
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types and attributes for members
+Permission41=Đọc các dự án (dự án được chia sẻ và các dự án tôi liên lạc)
+Permission42=Tạo / sửa đổi dự án (dự án chung và các dự án tôi liên lạc)
+Permission44=Xóa dự án (dự án chung và các dự án tôi liên lạc)
+Permission61=Đọc can thiệp
+Permission62=Tạo / chỉnh sửa can thiệp
+Permission64=Xóa can thiệp
+Permission67=Can thiệp xuất khẩu
+Permission71=Thành viên đã đọc
+Permission72=Tạo / thay đổi thành viên
+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=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
-Permission94=Export social contributions
-Permission95=Read reports
-Permission96=Setup dispatching
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financiel accounts (create, manage categories)
-Permission114=Consolidate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
+Permission78=Đọc đăng ký
+Permission79=Tạo / sửa đổi đăng ký
+Permission81=Xem đơn đặt hàng của khách hàng
+Permission82=Tạo / sửa đổi đơn đặt hàng của khách hàng
+Permission84=Xác nhận đơn đặt hàng cho khách hàng
+Permission86=Gửi đơn đặt hàng cho khách hàng
+Permission87=Đóng khách hàng đơn đặt hàng
+Permission88=Hủy bỏ đơn đặt hàng khách hàng
+Permission89=Xóa khách hàng đơn đặt hàng
+Permission91=Đọc đóng góp xã hội và vat
+Permission92=Tạo / sửa đổi các khoản đóng góp xã hội và vat
+Permission93=Xóa đóng góp xã hội và vat
+Permission94=Đóng góp xã hội xuất khẩu
+Permission95=Đọc báo cáo
+Permission101=Đọc sendings
+Permission102=Tạo / sửa đổi sendings
+Permission104=Xác nhận sendings
+Permission106=Sendings xuất khẩu
+Permission109=Xóa sendings
+Permission111=Đọc các tài khoản tài chính
+Permission112=Tạo / sửa đổi / xóa và so sánh giao dịch
+Permission113=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ý việc gửi séc
+Permission121=Đọc các bên thứ ba liên quan đến người sử dụng
+Permission122=Tạo / chỉnh sửa các bên thứ ba liên quan đến người sử dụng
+Permission125=Xóa các bên thứ ba liên quan đến người sử dụng
 Permission126=Export third parties
-Permission141=Read projects (also private i am not contact for)
-Permission142=Create/modify projects (also private i am not contact for)
-Permission144=Delete projects (also private i am not contact for)
-Permission146=Read providers
-Permission147=Read stats
-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
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-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
-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
-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
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-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
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-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
-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
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-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
-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)
-Permission1321=Export customer invoices, attributes and payments
-Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
-Permission2401=Read actions (events or tasks) linked to his account
-Permission2402=Create/modify actions (events or tasks) linked to his account
-Permission2403=Delete actions (events or tasks) linked to his account
-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
-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
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
+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=Xem nhà cung cấp
+Permission147=Đọc số liệu thống kê
+Permission151=Đọc lệnh đứng
+Permission152=Tạo / sửa đổi một yêu cầu đơn đặt hàng thường trực
+Permission153=Đơn đặt hàng đứng truyền thu
+Permission154=Tín dụng / từ chối đứng đơn đặt hàng biên lai
+Permission161=Read contracts/subscriptions
+Permission162=Create/modify contracts/subscriptions
+Permission163=Activate a service/subscription of a contract
+Permission164=Disable a service/subscription of a contract
+Permission165=Delete contracts/subscriptions
+Permission171=Đọc các chuyến đi và các chi phí (riêng và cấp dưới của mình)
+Permission172=Tạo / chỉnh sửa các chuyến đi và các chi phí
+Permission173=Xóa các chuyến đi và các chi phí
+Permission174=Đọc tất cả các chuyến đi và các chi phí
+Permission178=Xuất dữ liệu chuyến đi và chi phí
+Permission180=Đọc cung cấp
+Permission181=Đọc đơn đặt hàng nhà cung cấp
+Permission182=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp
+Permission183=Xác nhận đơn đặt hàng nhà cung cấp
+Permission184=Phê duyệt đơn đặt hàng nhà cung cấp
+Permission185=Đơn đặt hàng nhà cung cấp thứ tự
+Permission186=Nhận đặt hàng cung cấp
+Permission187=Đóng cửa các đơn đặt hàng nhà cung cấp
+Permission188=Hủy bỏ đơn đặt hàng nhà cung cấp
+Permission192=Tạo dòng
+Permission193=Hủy bỏ dòng
+Permission194=Đọc những dòng băng thông
+Permission202=Tạo kết nối ADSL
+Permission203=Kết nối để đơn đặt hàng
+Permission204=Kết nối theo thứ tự
+Permission205=Quản lý kết nối
+Permission206=Đọc kết nối
+Permission211=Đọc điện thoại
+Permission212=Dòng thứ tự
+Permission213=Kích hoạt dòng
+Permission214=Cài đặt điện thoại
+Permission215=Các nhà cung cấp thiết lập
+Permission221=Đọc emailings
+Permission222=Tạo / sửa đổi emailings (đề, nhận ...)
+Permission223=Xác nhận emailings (cho phép gửi)
+Permission229=Xóa emailings
+Permission237=Xem người nhận và các thông tin
+Permission238=Tự gửi thư
+Permission239=Xóa thư sau khi xác nhận hoặc gửi
+Permission241=Đã đọc chuyên mục
+Permission242=Tạo / sửa đổi danh mục
+Permission243=Xóa danh mục
+Permission244=Xem nội dung của thể loại ẩn
+Permission251=Đọc người dùng và các nhóm khác
+PermissionAdvanced251=Ðọc những người dùng khác
+Permission252=Đọc các điều khoản của người dùng khác
+Permission253=Tạo / sửa đổi những người dùng khác, các nhóm và permisssions
+PermissionAdvanced253=Tạo / thay đổi người sử dụng nội bộ / bên ngoài và cho phép
+Permission254=Tạo / chỉnh sửa người dùng bên ngoài chỉ
+Permission255=Thay đổi mật khẩu của những người dùng khác
+Permission256=Xóa hoặc vô hiệu hóa những người dùng khác
+Permission262=Mở rộng quyền truy cập vào tất cả các bên thứ ba (không phải chỉ có những người liên quan đến người sử dụng). Không có hiệu quả cho người dùng bên ngoài (luôn có giới hạn cho bản thân).
+Permission271=CA đã đọc
+Permission272=Đọc hóa đơn
+Permission273=Hóa đơn phát hành
+Permission281=Đọc địa chỉ liên lạc
+Permission282=Tạo / chỉnh sửa địa chỉ liên lạc
+Permission283=Xóa số liên lạc
+Permission286=Xuất khẩu địa chỉ liên lạc
+Permission291=Đọc thuế
+Permission292=Thiết lập quyền truy cập vào các mức thuế
+Permission293=Sửa đổi mức thuế costumers
+Permission300=Đọc mã vạch
+Permission301=Tạo / chỉnh sửa mã vạch
+Permission302=Xóa mã vạch
+Permission311=Đọc dịch vụ
+Permission312=Assign service/subscription to contract
+Permission331=Đánh dấu đã đọc
+Permission332=Tạo / chỉnh sửa bookmark
+Permission333=Xóa dấu trang
+Permission341=Đọc các điều khoản riêng của mình
+Permission342=Tạo / chỉnh sửa thông tin người dùng của mình
+Permission343=Thay đổi mật khẩu của mình
+Permission344=Sửa đổi điều khoản riêng của mình
+Permission351=Đọc thông tin nhóm
+Permission352=Đọc thông tin về quyền của nhóm
+Permission353=Tạo / sửa đổi nhóm
+Permission354=Xóa hoặc vô hiệu hóa các nhóm
+Permission358=Xuất dữ liệu người dùng
+Permission401=Ðọc thông tin giảm giá
+Permission402=Tạo / sửa đổi giảm giá
+Permission403=Xác nhận giảm giá
+Permission404=Xóa giảm giá
+Permission510=Đọc Lương
+Permission512=Tạo / sửa đổi tiền lương
+Permission514=Xóa lương
+Permission517=Xuất khẩu lương
+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=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 tồn kho
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
+Permission1004=Đọc chuyển động tồn kho
+Permission1005=Tạo / sửa đổi chuyển động tồn kho
+Permission1101=Đọc lệnh giao hàng
+Permission1102=Tạo / chỉnh sửa lệnh giao hàng
+Permission1104=Xác nhận lệnh giao hàng
+Permission1109=Xóa lệnh giao hàng
+Permission1181=Đọc thông tin Nhà cung cấp
+Permission1182=Đọc đơn đặt hàng nhà cung cấp
+Permission1183=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp
+Permission1184=Xác nhận đơn đặt hàng nhà cung cấp
+Permission1185=Phê duyệt đơn đặt hàng nhà cung cấp
+Permission1186=Đơn đặt hàng nhà cung cấp thứ tự
+Permission1187=Xác nhận đã nhận đơn đặt hàng nhà cung cấp
+Permission1188=Xóa đơn đặt hàng nhà cung cấp
+Permission1201=Nhận kết quả của một xuất khẩu
+Permission1202=Tạo / Sửa đổi một xuất khẩu
+Permission1231=Đọc hóa đơn nhà cung cấp
+Permission1232=Tạo / chỉnh sửa hóa đơn nhà cung cấp
+Permission1233=Xác nhận hoá đơn nhà cung cấp
+Permission1234=Xóa hóa đơn nhà cung cấp
+Permission1235=Gửi hóa đơn nhà cung cấp qua email
+Permission1236=Nhà cung cấp xuất hóa đơn, thuộc tính và thanh toán
+Permission1237=Đơn đặt hàng nhà cung cấp xuất khẩu và chi tiết của họ
+Permission1251=Chạy nhập khẩu khối lượng của dữ liệu bên ngoài vào cơ sở dữ liệu (tải dữ liệu)
+Permission1321=Xuất dữ liệu Hóa đơn của khách hàng, các thuộc tính và thanh toán
+Permission1421=Xuất dữ liệu Đơn đặt hàng và các thuộc tính
+Permission23001 = Đọ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 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
+Permission2515=Tài liệu thiết lập các thư mục
+Permission2801=Sử dụng FTP client trong chế độ đọc (duyệt và chỉ tải về)
+Permission2802=Sử dụng FTP client trong chế độ ghi (xóa hoặc tải lên các tập tin)
+Permission50101=Sử dụng điểm bán hàng
+Permission50201=Đọc các giao dịch
+Permission50202=Các giao dịch nhập khẩu
+Permission54001=In
+Permission55001=Đọc các cuộc thăm dò
+Permission55002=Tạo / sửa đổi các cuộc thăm dò
+Permission59001=Đọc lợi nhuận thương mại
+Permission59002=Xác định lợi nhuận thương mại
+DictionaryCompanyType=Thirdparties loại
+DictionaryCompanyJuridicalType=Các loại pháp nhân của thirdparties
+DictionaryProspectLevel=Triển vọng mức tiềm năng
+DictionaryCanton=Nhà nước / Cantons
+DictionaryRegion=Khu vực
+DictionaryCountry=Nước
+DictionaryCurrency=Đơn vị tiền tệ
+DictionaryCivility=Tiêu đề lịch sự
+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=Đ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)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATReceivedOnly=Special rate not charged
-VATManagement=VAT Management
-VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to VAT, then VAT by default=0. End of rule.<br>If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule. <br>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.<br>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.<br>If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.<br>Else the proposed default VAT=0. End of rule.
-VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
-VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+DictionaryPaperFormat=Định dạng giấy
+DictionaryFees=Loại phí
+DictionarySendingMethods=Phương pháp vận chuyển
+DictionaryStaff=Nhân viên
+DictionaryAvailability=Chậm trễ giao hàng
+DictionaryOrderMethods=Phương pháp đặt hàng
+DictionarySource=Nguồn gốc của các đề xuất / đơn đặt hàng
+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
+VATReceivedOnly=Tỷ lệ đặc biệt không bị tính phí
+VATManagement=Quản lý thuế GTGT
+VATIsUsedDesc=Thuế suất thuế GTGT theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động: <br> Nếu người bán không phải chịu thuế GTGT, sau đó thuế GTGT theo mặc định = 0. Kết thúc quy tắc. <br> Nếu (bán nước = mua nước), sau đó thuế GTGT theo mặc định = thuế GTGT của sản phẩm trong nước bán. Kết thúc quy tắc. <br> Nếu người bán và người mua trong cộng đồng và hàng hóa châu Âu là những sản phẩm giao thông (ô tô, tàu, máy bay), thuế GTGT mặc định = 0 (Thuế GTGT phải được thanh toán của người mua tại customoffice của đất nước của mình và không ít người bán). Kết thúc quy tắc. <br> Nếu người bán và người mua trong Cộng đồng châu Âu và người mua không phải là một công ty, sau đó thuế GTGT theo mặc định = thuế GTGT của sản phẩm bán ra. Kết thúc quy tắc. <br> Nếu người bán và người mua trong Cộng đồng châu Âu và người mua là một công ty, sau đó thuế GTGT theo mặc định = 0. Kết thúc quy tắc. <br> Thuế GTGT khác đề xuất mặc định = 0. Kết thúc quy tắc.
+VATIsNotUsedDesc=Theo mặc định, đề xuất thuế GTGT là 0 có thể được sử dụng cho các trường hợp như các hiệp hội, cá nhân ou công ty nhỏ.
+VATIsUsedExampleFR=Ở Pháp, nó có nghĩa là các công ty, tổ chức có một hệ thống tài chính thực (giản thể thực sự hay bình thường thực tế). Một hệ thống trong đó thuế GTGT đã kê khai.
+VATIsNotUsedExampleFR=Ở Pháp, nó có nghĩa là hiệp hội được khai báo không thuế VAT hoặc các công ty, tổ chức, nghề nghiệp tự do đã lựa chọn hệ thống tài chính doanh nghiệp nhỏ (VAT trong nhượng quyền thương mại) và nộp thuế GTGT nhượng quyền thương mại mà không có bất kỳ kê khai thuế GTGT. Lựa chọn này sẽ hiển thị các tài liệu tham khảo "không được áp dụng thuế GTGT - nghệ thuật-293B của CGI" trên hoá đơn.
 ##### 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
+LTRate=Tỷ giá
+LocalTax1IsUsed=Thuế sử dụng thứ hai
+LocalTax1IsNotUsed=Không sử dụng thuế thứ hai
+LocalTax1IsUsedDesc=Sử dụng một loại thứ hai của thuế (trừ thuế GTGT)
+LocalTax1IsNotUsedDesc=Không sử dụng các loại thuế khác (trừ thuế GTGT)
+LocalTax1Management=Loại thứ hai của thuế
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2IsUsed=Thuế sử dụng thứ ba
+LocalTax2IsNotUsed=Không sử dụng thuế thứ ba
+LocalTax2IsUsedDesc=Sử dụng một loại thứ ba của thuế (trừ thuế GTGT)
+LocalTax2IsNotUsedDesc=Không sử dụng các loại thuế khác (trừ thuế GTGT)
+LocalTax2Management=Loại thứ ba của thuế
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
-LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
-LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-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
-Offset=Offset
-AlwaysActive=Always active
-UpdateRequired=Your system needs to be updated. To do this, click on <a href="%s">Update now</a>.
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
+LocalTax1ManagementES= Quản lý RE
+LocalTax1IsUsedDescES= Tỷ lệ RE theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động: <br> Nếu te mua không chịu RE, RE mặc định = 0. Kết thúc quy tắc. <br> Nếu người mua là đối tượng của RE thì RE theo mặc định. Kết thúc quy tắc. <br>
+LocalTax1IsNotUsedDescES= Theo mặc định, RE đề xuất là 0 Kết thúc quy tắc.
+LocalTax1IsUsedExampleES= Tại Tây Ban Nha họ là các chuyên gia phụ thuộc vào một số phần cụ thể của các IAE Tây Ban Nha.
+LocalTax1IsNotUsedExampleES= Tại Tây Ban Nha họ rất chuyên nghiệp và xã hội và có thể phần nào đó của IAE Tây Ban Nha.
+LocalTax2ManagementES= Quản lý IRPF
+LocalTax2IsUsedDescES= Tỷ lệ RE theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động: <br> Nếu người bán không chịu IRPF, sau đó IRPF theo mặc định = 0. Kết thúc quy tắc. <br> Nếu người bán phải chịu IRPF thì IRPF theo mặc định. Kết thúc quy tắc. <br>
+LocalTax2IsNotUsedDescES= Theo mặc định, IRPF đề xuất là 0 Kết thúc quy tắc.
+LocalTax2IsUsedExampleES= Tại Tây Ban Nha, dịch giả tự do và các chuyên gia độc lập cung cấp dịch vụ và các công ty đã chọn hệ thống thuế của mô-đun.
+LocalTax2IsNotUsedExampleES= Tại Tây Ban Nha họ Bussines không phụ thuộc vào hệ thống thuế của mô-đun.
+CalcLocaltax=Báo cáo
+CalcLocaltax1ES=Bán - mua
+CalcLocaltax1Desc=Thuế địa phương báo cáo được tính toán với sự khác biệt giữa localtaxes bán hàng và mua hàng localtaxes
+CalcLocaltax2ES=Mua
+CalcLocaltax2Desc=Thuế địa phương báo cáo là tổng của localtaxes mua
+CalcLocaltax3ES=Bán hàng
+CalcLocaltax3Desc=Thuế địa phương báo cáo là tổng của localtaxes bán hàng
+LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy mã
+LabelOnDocuments=Nhãn trên các tài liệu
+NbOfDays=Nb ngày
+AtEndOfMonth=Vào cuối tháng
+Offset=Bù đắp
+AlwaysActive=Luôn luôn hoạt động
+UpdateRequired=Hệ thống của bạn cần được cập nhật. Để làm điều này, bấm vào <a href="%s">Update now</a> .
+Upgrade=Nâng cấp
+MenuUpgrade=Nâng cấp / Mở rộng
+AddExtensionThemeModuleOrOther=Thêm phần mở rộng (chủ đề, mô-đun, ...)
+WebServer=Máy chủ Web
+DocumentRootServer=Thư mục gốc của máy chủ Web
+DataRootServer=Dữ liệu thư mục tập tin
 IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-AllParameters=All parameters
-OS=OS
+Port=Cảng
+VirtualServerName=Tên máy chủ ảo
+AllParameters=Tất cả các thông số
+OS=Hệ điều hành
 PhpEnv=Env
 PhpModules=Module
 PhpConf=Conf
-PhpWebLink=Web-Php link
+PhpWebLink=Liên kết web Php
 Pear=Pear
-PearPackages=Pear Packages
-Browser=Browser
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-DatabaseConfiguration=Database setup
-Tables=Tables
-TableName=Table name
-TableLineFormat=Line format
-NbOfRecord=Nb of records
-Constraints=Constraints
-ConstraintsType=Constraints type
-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
-SummaryConst=List of all Dolibarr setup parameters
-SystemUpdate=System update
-SystemSuccessfulyUpdate=Your system has been updated successfuly
-MenuCompanySetup=Company/Foundation
-MenuNewUser=New user
-MenuTopManager=Top menu manager
-MenuLeftManager=Left menu manager
-MenuManager=Menu manager
-MenuSmartphoneManager=Smartphone menu manager
-DefaultMenuTopManager=Top menu manager
-DefaultMenuLeftManager=Left menu manager
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for list
-MessageOfDay=Message of the day
-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
-SystemSuccessfulyUpdated=Your system has been updated successfully
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
+PearPackages=Gói lê
+Browser=Trình duyệt
+Server=Máy chủ
+Database=Cơ sở dữ liệu
+DatabaseServer=Máy chủ cơ sở dữ liệu
+DatabaseName=Tên cơ sở dữ liệu
+DatabasePort=Cổng cơ sở dữ liệu
+DatabaseUser=Cơ sở dữ liệu người dùng
+DatabasePassword=Cơ sở dữ liệu mật khẩu
+DatabaseConfiguration=Thiết lập cơ sở dữ liệu
+Tables=Bàn
+TableName=Tên bảng
+TableLineFormat=Định dạng dòng
+NbOfRecord=Nb hồ sơ
+Constraints=Hạn chế
+ConstraintsType=Hạn chế loại
+ConstraintsToShowOrNotEntry=Hạn chế để hiển thị hoặc không phải là mục trình đơn
+AllMustBeOk=Tất cả những điều này phải được kiểm tra
+Host=Máy chủ
+DriverType=Loại điều khiển
+SummarySystem=Hệ thống thông tin tóm tắt
+SummaryConst=Danh sách của tất cả các thông số cài đặt Dolibarr
+SystemUpdate=Cập nhật hệ thống
+SystemSuccessfulyUpdate=Hệ thống của bạn đã được cập nhật successfuly
+MenuCompanySetup=Công ty / cơ sở
+MenuNewUser=Người dùng mới
+MenuTopManager=Quản lý menu phía trên
+MenuLeftManager=Quản lý menu bên trái
+MenuManager=Quản lý menu
+MenuSmartphoneManager=Quản lý đơn điện thoại thông minh
+DefaultMenuTopManager=Quản lý menu phía trên
+DefaultMenuLeftManager=Quản lý menu bên trái
+DefaultMenuManager= Quản lý menu chuẩn
+DefaultMenuSmartphoneManager=Quản lý menu điện thoại thông minh
+Skin=Skin chủ đề
+DefaultSkin=Giao diện mặc định da
+MaxSizeList=Max length cho danh sách
+DefaultMaxSizeList=Mặc định chiều dài tối đa cho danh sách
+MessageOfDay=Tin trong ngày
+MessageLogin=Tin trang đăng nhập
+PermanentLeftSearchForm=Hình thức tìm kiếm thường xuyên trên menu bên trái
+DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ)
+EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ
+EnableShowLogo=Hiển thị biểu tượng trên menu bên trái
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+SystemSuccessfulyUpdated=Hệ thống của bạn đã được cập nhật thành công
+CompanyInfo=Thông tin Công ty / cơ sở
+CompanyIds=Xác định Công ty/ Cơ sở
+CompanyName=Tên
+CompanyAddress=Địa chỉ
 CompanyZip=Zip
 CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
+CompanyCountry=Đất nước
+CompanyCurrency=Tiền tệ chính
 Logo=Logo
-DoNotShow=Do not show
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "Report a bug"
-ShowWorkBoard=Show "workbench" on homepage
-Alerts=Alerts
-Delays=Delays
-DelayBeforeWarning=Delay before warning
-DelaysBeforeWarning=Delays before warning
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
-DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it.
-SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus.
-SetupDescription5=Other menu entries manage optional parameters.
-EventsSetup=Setup for events logs
-LogEvents=Security audit events
-Audit=Audit
+DoNotShow=Không hiển thị
+DoNotSuggestPaymentMode=Không đề nghị
+NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định
+OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng%s
+BankModuleNotActive=Ngân hàng mô-đun tài khoản chưa được kích hoạt
+ShowBugTrackLink=Hiển thị liên kết "Báo cáo một lỗi"
+ShowWorkBoard=Xem "bàn làm việc" trên trang chủ
+Alerts=Cảnh báo
+Delays=Sự chậm trễ
+DelayBeforeWarning=Chậm trễ trước khi cảnh báo
+DelaysBeforeWarning=Sự chậm trễ trước khi cảnh báo
+DelaysOfToleranceBeforeWarning=Sự chậm trễ khoan dung trước khi cảnh báo
+DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định sự chậm trễ trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto%s cho mỗi phần tử cuối.
+Delays_MAIN_DELAY_ACTIONS_TODO=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các sự kiện theo kế hoạch chưa thực hiện
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về đơn đặt hàng chưa qua chế biến
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo các nhà cung cấp đơn đặt hàng chưa qua chế biến
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các đề xuất để đóng
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các đề xuất không hóa đơn
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về dịch vụ để kích hoạt
+Delays_MAIN_DELAY_RUNNING_SERVICES=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về dịch vụ hết hạn
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về hóa đơn chưa thanh toán nhà cung cấp
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về hóa đơn chưa thanh toán của khách hàng
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về cấp phát ngân hàng hòa giải
+Delays_MAIN_DELAY_MEMBERS=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về lệ phí thành viên bị trì hoãn
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo đối với tiền gửi kiểm tra để làm
+SetupDescription1=Tất cả các thông số có sẵn trong khu vực thiết lập cho phép bạn thiết lập Dolibarr trước khi bắt đầu sử dụng nó.
+SetupDescription2=2 bước thiết lập quan trọng nhất là 2 người đầu tiên trong menu cài đặt bên trái, điều này có nghĩa là công ty / cơ sở trang thiết lập và cài đặt module trang:
+SetupDescription3=Các thông số trong menu <a href="%s">Setup -> Công ty / cơ sở</a> được yêu cầu bởi vì các thông tin đầu vào được sử dụng trên Dolibarr hiển thị và chỉnh sửa Dolibarr hành vi (ví dụ cho các tính năng liên quan đến đất nước của bạn).
+SetupDescription4=Các thông số trong menu <a href="%s">Setup -> module</a> được yêu cầu bởi vì Dolibarr không phải là một hệ thống ERP / CRM cố định nhưng một số tiền của một số mô-đun, tất cả ít nhiều độc lập. Nó chỉ sau khi kích hoạt module bạn thú vị trong đó bạn sẽ thấy các tính năng xuất hiện trong menu.
+SetupDescription5=Mục trình đơn khác quản lý các thông số tùy chọn.
+EventsSetup=Thiết lập cho các sự kiện nhật ký
+LogEvents=Sự kiện kiểm toán bảo mật
+Audit=Kiểm toán
 InfoDolibarr=Infos Dolibarr
-InfoBrowser=Infos Browser
-InfoOS=Infos OS
-InfoWebServer=Infos web server
-InfoDatabase=Infos database
+InfoBrowser=Infos trình duyệt
+InfoOS=Infos hệ điều hành
+InfoWebServer=Infos máy chủ web
+InfoDatabase=Cơ sở dữ liệu Infos
 InfoPHP=Infos PHP
-InfoPerf=Infos performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListEvents=Audit events
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available modules
-ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
-SessionTimeOut=Time out for session
-SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every <b>%s/%s</b> access, but only during access made by other sessions.<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default <strong>session.gc_maxlifetime</strong>, no matter what the value entered here.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. They are reserved parameters for advanced developers or for troubleshouting.
-OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu.
-MiscellaneousDesc=Define here all other parameters related to security.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
-MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files.
-MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
-NoEventFoundWithCriteria=No security event has been found for such search criterias.
-SeeLocalSendMailSetup=See your local sendmail setup
-BackupDesc=To make a complete backup of Dolibarr, you must:
-BackupDesc2=* Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant.
-BackupDescX=Archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-RestoreDesc=To restore a Dolibarr backup, you must:
-RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
-RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
-PreviousDumpFiles=Available database backup dump files
-WeekStartOnDay=First day of week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
-YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled)
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
-MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
-MAIN_PROXY_HOST=Name/Address of proxy server
-MAIN_PROXY_PORT=Port of proxy server
-MAIN_PROXY_USER=Login to use the proxy server
-MAIN_PROXY_PASS=Password to use the proxy server
-DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendingMailSetup=Setup of sendings by email
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by thoose bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommanded) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=Choice of language visible on screen can be modified:<br>* Globally from menu <strong>Home - Setup - Display</strong><br>* For user only from tab <strong>User display</strong> of user card (click on login on top of screen).
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-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.
-SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+InfoPerf=Infos biểu diễn
+BrowserName=Tên trình duyệt
+BrowserOS=Trình duyệt hệ điều hành
+ListEvents=Sự kiện kiểm toán
+ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr
+SecurityEventsPurged=Sự kiện bảo mật thanh lọc
+LogEventDesc=Bạn có thể kích hoạt ở đây khai thác gỗ cho các sự kiện an ninh Dolibarr. Sau đó các quản trị viên có thể xem nội dung của nó thông qua <b>các công cụ hệ thống</b> menu <b>- Kiểm toán.</b> Cảnh báo, tính năng này có thể tiêu thụ một lượng lớn dữ liệu trong cơ sở dữ liệu.
+AreaForAdminOnly=Những tính năng này có thể được sử dụng bởi những <b>người dùng quản trị.</b>
+SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và nhìn thấy chỉ quản trị viên.
+SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số các điều khoản Dolibarr có thể làm giảm giới hạn này.
+CompanyFundationDesc=Chỉnh sửa trên trang này được biết tất cả thông tin của công ty hoặc nền tảng bạn cần quản lý (Đối với điều này, nhấn vào nút "Sửa đổi" ở dưới cùng của trang)
+DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr nhìn và cảm thấy ở đây
+AvailableModules=Các mô-đun có sẵn
+ToActivateModule=Để kích hoạt mô-đun, đi vào thiết lập trong khu vực (chủ-> Setup-> Modules).
+SessionTimeOut=Thời gian cho phiên
+SessionExplanation=Bảo lãnh này con số đó sẽ không bao giờ hết hạn phiên trước sự chậm trễ này, nếu phiên sạch được thực hiện bằng nội PHP phiên sạch hơn (và không có gì khác). Nội phiên PHP sạch hơn không làm bảo lãnh rằng phiên sẽ hết hiệu lực ngay sau khi sự chậm trễ này. Nó sẽ hết hạn, sau khi sự chậm trễ này, và khi phiên sạch hơn là chạy, vì vậy <b>mỗi%s /% s</b> 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. <br> 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 <strong>session.gc_maxlifetime</strong> 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 <b>htdocs / core / gây nên.</b> 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ố <b>-NORUN</b> trong tên của họ.
+TriggerDisabledAsModuleDisabled=Gây ra trong tập tin này bị vô hiệu hóa như <b>mô-đun%s</b> 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ư <b>mô-đun%s</b> được kích hoạt.
+GeneratedPasswordDesc=Xác định đây mà cai trị mà bạn muốn sử dụng để tạo mật khẩu mới nếu bạn hỏi có tự động tạo ra mật khẩu
+DictionaryDesc=Xác định đây tất cả dữ liệu ngay tài liệu tham khảo. Bạn có thể hoàn thành được xác định trước giá trị với bạn.
+ConstDesc=Trang này cho phép bạn chỉnh sửa tất cả các thông số khác không có sẵn trong các trang trước đó. Họ được dành riêng cho các nhà phát triển các thông số cao cấp hoặc cho troubleshouting.
+OnceSetupFinishedCreateUsers=Cảnh báo, bạn là một người dùng quản trị Dolibarr. Người sử dụng quản trị viên được sử dụng để thiết lập Dolibarr. Đối với một cách sử dụng thông thường của Dolibarr, nó được khuyến khích sử dụng một người dùng không quản trị được tạo ra từ người sử dụng và đơn Groups.
+MiscellaneousDesc=Xác định đây tất cả các thông số khác liên quan đến an ninh.
+LimitsSetup=Giới hạn / thiết lập chính xác
+LimitsDesc=Bạn có thể xác định giới hạn, độ chính xác và tối ưu hoá được sử dụng bởi Dolibarr đây
+MAIN_MAX_DECIMALS_UNIT=Max số thập phân cho đơn giá
+MAIN_MAX_DECIMALS_TOT=Max số thập phân cho tổng giá
+MAIN_MAX_DECIMALS_SHOWN=Max số thập phân cho giá được hiển thị trên màn hình (Add <b>...</b> sau khi con số này nếu bạn muốn xem <b>...</b> khi số là cắt ngắn khi hiển thị trên màn hình)
+MAIN_DISABLE_PDF_COMPRESSION=Sử dụng PDF nén các file PDF được tạo ra.
+MAIN_ROUNDING_RULE_TOT= Kích thước của phạm vi làm tròn (đối với các quốc gia hiếm hoi mà làm tròn được thực hiện trên một cái gì đó khác hơn so với cơ số 10)
+UnitPriceOfProduct=Đơn giá ròng của một sản phẩm
+TotalPriceAfterRounding=Tổng giá (net / thùng / bao gồm thuế) sau khi làm tròn
+ParameterActiveForNextInputOnly=Thông số hiệu quả cho đầu vào tiếp theo chỉ
+NoEventOrNoAuditSetup=Không có sự kiện an ninh đã được ghi lại được nêu ra. Đây có thể là bình thường nếu kiểm toán đã không được kích hoạt trên "thiết lập - an ninh - kiểm toán" trang.
+NoEventFoundWithCriteria=Không có sự kiện bảo mật đã được tìm thấy cho các tiêu chí tìm kiếm như vậy.
+SeeLocalSendMailSetup=Xem thiết lập sendmail địa phương của bạn
+BackupDesc=Để thực hiện một sao lưu đầy đủ Dolibarr, bạn phải:
+BackupDesc2=* Lưu nội dung của tài liệu thư mục <b>(% s)</b> có chứa tất cả các tập tin tải lên và tạo ra (bạn có thể làm cho một zip ví dụ).
+BackupDesc3=* Lưu nội dung của cơ sở dữ liệu của bạn vào một tập tin dump. Đối với điều này, bạn có thể sử dụng trợ lý sau.
+BackupDescX=Thư mục lưu trữ nên được lưu trữ ở một nơi an toàn.
+BackupDescY=Tạo ra các tập tin dump nên được lưu trữ ở một nơi an toàn.
+BackupPHPWarning=Sao lưu không thể được guaranted với phương pháp này. Thích trước đó
+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 <b>(% s).</b>
+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 <b>phải%s</b> 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ử <b>dụng%s</b> hoặc bạn phải thêm tùy chọn -W ở cuối dòng lệnh để cung <b>cấp%s</b> 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
+ShowProfIdInAddress=Hiển thị id professionnal với các địa chỉ trên các tài liệu
+ShowVATIntaInAddress=Ẩn VAT nội num với các địa chỉ trên các tài liệu
+TranslationUncomplete=Một phần dịch
+SomeTranslationAreUncomplete=Một số ngôn ngữ có thể được dịch một phần hoặc tháng năm có lỗi. Nếu bạn phát hiện một số, bạn có thể sửa chữa các file ngôn ngữ đăng ký <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a> .
+MenuUseLayout=Hãy hidable menu dọc (tùy chọn javascript không được vô hiệu hóa)
+MAIN_DISABLE_METEO=Xem khí tượng vô hiệu hóa
+TestLoginToAPI=Kiểm tra đăng nhập vào API
+ProxyDesc=Một số tính năng của Dolibarr cần phải có một kết nối Internet để làm việc. Xác định các thông số ở đây cho việc này. Nếu máy chủ Dolibarr là phía sau một máy chủ proxy, các tham số cho Dolibarr làm thế nào để truy cập Internet thông qua nó.
+ExternalAccess=Truy cập bên ngoài
+MAIN_PROXY_USE=Sử dụng một máy chủ proxy (truy cập nếu không trực tiếp đến internet)
+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.
+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)
+ExtraFieldsContacts=Thuộc tính bổ sung (liên lạc / địa chỉ)
+ExtraFieldsMember=Thuộc tính bổ sung (thành viên)
+ExtraFieldsMemberType=Thuộc tính bổ sung (loại thành viên)
+ExtraFieldsCustomerOrders=Thuộc tính bổ sung (đơn đặt hàng)
+ExtraFieldsCustomerInvoices=Thuộc tính bổ sung (hoá đơn)
+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.
+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
+SendmailOptionNotComplete=Cảnh báo, trên một số hệ thống Linux, để gửi email từ email của bạn, thiết lập sendmail thực hiện phải có lựa chọn -ba (mail.force_extra_parameters tham số vào file php.ini của bạn). Nếu một số người nhận không bao giờ nhận được email, hãy thử để chỉnh sửa thông số này PHP với mail.force_extra_parameters = -ba).
+PathToDocuments=Đường dẫn đến tài liệu
+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: <br> * Trên toàn cầu từ menu <strong>Home - Cài đặt - Hiển thị</strong> <br> * Đối với người dùng chỉ từ tab <strong>hiển thị tài khoản</strong> 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: <b>%s</b>
+YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
+ClassNotFoundIntoPathWarning=Lớp%s không tìm thấy con đường vào PHP
+YesInSummer=Có trong mùa hè
+OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, các mô-đun chỉ sau đây được mở cho người dùng bên ngoài (bất cứ điều gì là sự cho phép của người dùng như vậy):
+SuhosinSessionEncrypt=Lưu trữ phiên mã hóa bằng Suhosin
+ConditionIsCurrently=Điều kiện hiện nay là %s
+YouUseBestDriver=Bạn sử dụng trình điều khiển%s đó là điều khiển tốt nhất có sẵn hiện nay.
+YouDoNotUseBestDriver=Bạn sử dụng ổ đĩa%s%s, nhưng lái xe được khuyến khích.
+NbOfProductIsLowerThanNoPb=Bạn chỉ có%s sản phẩm / dịch vụ vào cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa đặc biệt.
+SearchOptim=Tối ưu hóa tìm kiếm
+YouHaveXProductUseSearchOptim=Bạn có sản phẩm%s vào cơ sở dữ liệu. Bạn nên thêm PRODUCT_DONOTSEARCH_ANYWHERE liên tục tới 1 vào Home-Setup khác, bạn giới hạn tìm kiếm với đầu dây làm cho cơ sở dữ liệu có thể sử dụng chỉ số và bạn sẽ nhận được một phản ứng ngay lập tức.
+BrowserIsOK=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này là ok cho bảo mật và hiệu suất.
+BrowserIsKO=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay Safari.
+XDebugInstalled=XDebug được tải.
+XCacheInstalled=XCache được tải.
+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
+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
+EmptyNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào.
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually.
+PasswordGenerationStandard=Quay trở lại một mật khẩu được tạo ra theo thuật toán Dolibarr nội bộ: 8 ký tự có chứa số chia sẻ và ký tự trong chữ thường.
+PasswordGenerationNone=Không đề nghị bất kỳ mật khẩu được tạo ra. Mật khẩu phải được gõ bằng tay.
 ##### Users setup #####
-UserGroupSetup=Users and groups module setup
-GeneratePassword=Suggest a generated password
-RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DoNotSuggest=Do not suggest any password
-EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
+UserGroupSetup=Người sử dụng và nhóm thiết lập mô-đun
+GeneratePassword=Đề nghị một mật khẩu được tạo ra
+RuleForGeneratedPasswords=Quy tắc để tạo mật khẩu đề nghị hoặc xác nhận mật khẩu
+DoNotSuggest=Không đề nghị bất kỳ mật khẩu
+EncryptedPasswordInDatabase=Để cho phép mã hóa các mật khẩu trong cơ sở dữ liệu
+DisableForgetPasswordLinkOnLogonPage=Không hiển thị liên kết "Quên mật khẩu" trên trang đăng nhập
+UsersSetup=Thiết lập người sử dụng mô-đun
+UserMailRequired=Email cần thiết để tạo một người dùng mới
 ##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-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.
-ModelModules=Documents templates
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique ?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
-Miscellaneous=Miscellaneous
+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: <br>%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, <br>%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 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: <br> * 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. <br> * 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
+JSOnPaimentBill=Kích hoạt tính năng tự động điền vào các dòng tiền vào hình thức thanh toán
+CompanyIdProfChecker=Các quy định về chuyên môn Id
+MustBeUnique=Phải là duy nhất?
+MustBeMandatory=Bắt buộc để tạo ra các bên thứ ba?
+MustBeInvoiceMandatory=Bắt buộc để xác nhận hóa đơn?
+Miscellaneous=Linh tinh
 ##### Webcal setup #####
-WebCalSetup=Webcalendar link setup
-WebCalSyncro=Add Dolibarr events to WebCalendar
-WebCalAllways=Always, no asking
-WebCalYesByDefault=On demand (yes by default)
-WebCalNoByDefault=On demand (no by default)
-WebCalNever=Never
-WebCalURL=URL for calendar access
-WebCalServer=Server hosting calendar database
-WebCalDatabaseName=Database name
-WebCalUser=User to access database
-WebCalSetupSaved=Webcalendar setup saved successfully.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
-WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-WebCalTestKo2=Connection to server '%s' with user '%s' failed.
-WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database.
-WebCalAddEventOnCreateActions=Add calendar event on actions create
-WebCalAddEventOnCreateCompany=Add calendar event on companies create
-WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change
-WebCalAddEventOnStatusContract=Add calendar event on contracts status change
-WebCalAddEventOnStatusBill=Add calendar event on bills status change
-WebCalAddEventOnStatusMember=Add calendar event on members status change
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
-WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct.
+WebCalSetup=Thiết lập liên kết Webcalendar
+WebCalSyncro=Thêm sự kiện Dolibarr để WebCalendar
+WebCalAllways=Luôn luôn, không chào bán
+WebCalYesByDefault=Theo yêu cầu (có mặc định)
+WebCalNoByDefault=Theo yêu cầu (không theo mặc định)
+WebCalNever=Không bao giờ
+WebCalURL=URL để truy cập lịch
+WebCalServer=Máy chủ cơ sở dữ liệu lưu trữ lịch
+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.
+WebCalErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu Webcalendar.
+WebCalAddEventOnCreateActions=Thêm sự kiện lịch về các hoạt động tạo ra
+WebCalAddEventOnCreateCompany=Thêm sự kiện lịch trên các công ty tạo ra
+WebCalAddEventOnStatusPropal=Thêm sự kiện lịch trên đề xuất thương mại thay đổi trạng thái
+WebCalAddEventOnStatusContract=Thêm sự kiện lịch trên hợp đồng thay đổi trạng thái
+WebCalAddEventOnStatusBill=Thêm sự kiện lịch trên hóa đơn thay đổi trạng thái
+WebCalAddEventOnStatusMember=Thêm sự kiện lịch trên các thành viên thay đổi trạng thái
+WebCalUrlForVCalExport=Một liên kết xuất khẩu sang định dạng <b>%s</b> 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=Invoices module setup
-BillsDate=Invoices date
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNoteSetup=Credit note module setup
-CreditNotePDFModules=Credit note document models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-DisableRepeatable=Disable repeatable invoices
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+BillsSetup=Thiết lập mô-đun hóa đơn
+BillsDate=Ngày hóa đơn
+BillsNumberingModule=Hoá đơn, ghi chú tín dụng đánh số mô hình
+BillsPDFModules=Tài liệu mô hình hóa đơn
+CreditNoteSetup=Thiết lập mô-đun lưu ý tín dụng
+CreditNotePDFModules=Mô hình tín dụng tài liệu lưu ý
+CreditNote=Lưu ý tín dụng
+CreditNotes=Ghi chú tín dụng
+ForceInvoiceDate=Lực lượng ngày hóa đơn cho đến nay xác nhận
+DisableRepeatable=Vô hiệu hoá đơn lặp lại
+SuggestedPaymentModesIfNotDefinedInInvoice=Đề nghị chế độ thanh toán trên hoá đơn theo mặc định nếu không được xác định cho hóa đơn
+EnableEditDeleteValidInvoice=Kích hoạt tính năng khả năng để chỉnh sửa / xóa hóa đơn hợp lệ không có thanh toán
+SuggestPaymentByRIBOnAccount=Đề nghị thanh toán bằng thu hồi vào tài khoản
+SuggestPaymentByChequeToAddress=Đề nghị thanh toán bằng séc để
+FreeLegalTextOnInvoices=Miễn phí văn bản trên hoá đơn
+WatermarkOnDraftInvoices=Watermark về dự thảo hoá đơn (nếu không có sản phẩm nào)
 ##### Proposals #####
-PropalSetup=Commercial proposals module setup
-CreateForm=Create forms
-NumberOfProductLines=Number of product lines
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-ClassifiedInvoiced=Classified invoiced
-HideTreadedPropal=Hide the treated commercial proposals in the list
-AddShippingDateAbility=Add shipping date ability
-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)
+PropalSetup=Đề xuất thương mại thiết lập mô-đun
+CreateForm=Tạo các biểu mẫu
+NumberOfProductLines=Số dòng sản phẩm
+ProposalsNumberingModules=Mô hình đánh số đề nghị thương mại
+ProposalsPDFModules=Văn bản đề nghị thương mại mô hình
+ClassifiedInvoiced=Phân loại hóa đơn
+HideTreadedPropal=Ẩn đề xuất thương mại được điều trị trong danh sách
+AddShippingDateAbility=Thêm khả năng vận chuyển ngày
+AddDeliveryAddressAbility=Thêm khả năng ngày giao hàng
+UseOptionLineIfNoQuantity=Một dòng sản phẩm / dịch vụ với một số lượng không được coi là một lựa chọn
+FreeLegalTextOnProposal=Miễn phí văn bản trên đề xuất thương mại
+WatermarkOnDraftProposal=Watermark về dự thảo đề xuất thương mại (nếu không có sản phẩm nào)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-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)
+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=Click To Dial module setup
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
+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ẻ <br> <b>__PHONETO__</b> Sẽ được thay thế bằng số điện thoại của người gọi <br> <b>__PHONEFROM__</b> Sẽ được thay thế bằng số điện thoại của người gọi (của bạn) <br> <b>__LOGIN__</b> 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) <br> <b>__PASS__</b> 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).
 ##### Bookmark4u #####
-Bookmark4uSetup=Bookmark4u module setup
+Bookmark4uSetup=Thiết lập mô-đun Bookmark4u
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=Thiết lập mô-đun can thiệp
+FreeLegalTextOnInterventions=Miễn phí văn bản trên các tài liệu can thiệp
+FicheinterNumberingModules=Mô hình can thiệp đánh số
+TemplatePDFInterventions=Tài liệu mô hình can thiệp thẻ
+WatermarkOnDraftInterventionCards=Watermark vào tài liệu thẻ can thiệp (nếu không có sản phẩm nào)
 ##### Contracts #####
-ContractsSetup=Contracts module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=Contracts/Subscriptions module setup
+ContractsNumberingModules=Hợp đồng đánh số module
+TemplatePDFContracts=Hợp đồng tài liệu mô hình
+FreeLegalTextOnContracts=Miễn phí văn bản về hợp đồng
+WatermarkOnDraftContractCards=Watermark vào dự thảo hợp đồng (nếu không có sản phẩm nào)
 ##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-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
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MembersSetup=Thiết lập các thành viên mô-đun
+MemberMainOptions=Lựa chọn chính
+AddSubscriptionIntoAccount=Đề nghị theo mặc định để tạo ra một giao dịch ngân hàng, trong mô-đun ngân hàng, khi thêm một thuê bao payed mới
+AdherentLoginRequired= Quản lý một Đăng nhập cho mỗi thành viên
+AdherentMailRequired=Email cần thiết để tạo ra một thành viên mới
+MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
-LDAPToDolibarr=LDAP -> Dolibarr
+LDAPSetup=Thiết lập LDAP
+LDAPGlobalParameters=Các thông số toàn cầu
+LDAPUsersSynchro=Người sử dụng
+LDAPGroupsSynchro=Nhóm
+LDAPContactsSynchro=Liên hệ
+LDAPMembersSynchro=Thành viên
+LDAPSynchronization=Đồng bộ hóa LDAP
+LDAPFunctionsNotAvailableOnPHP=LDAP chức năng không có sẵn trên PHP của bạn
+LDAPToDolibarr=LDAP - Dolibarr>
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPTypeExample=OpenLdap, Egroupware or Active Directory
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPPasswordExample=Admin password
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveYes=Activated synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPMemberTypeDn=Dolibarr members type DN
-LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPUnbindSuccessfull=Disconnect successful
-LDAPUnbindFailed=Disconnect failed
-LDAPConnectToDNSuccessfull=Connection to DN (%s) successful
-LDAPConnectToDNFailed=Connection to DN (%s) failed
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPassword=Password
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonName=Common name
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
+LDAPNamingAttribute=Quan trọng trong LDAP
+LDAPSynchronizeUsers=Tổ chức của người sử dụng trong LDAP
+LDAPSynchronizeGroups=Tổ chức của các nhóm trong LDAP
+LDAPSynchronizeContacts=Tổ chức liên lạc trong LDAP
+LDAPSynchronizeMembers=Tổ chức thành viên sáng lập trong LDAP
+LDAPTypeExample=OpenLDAP, eGroupWare hoặc Active Directory
+LDAPPrimaryServer=Máy chủ chính
+LDAPSecondaryServer=Máy chủ thứ cấp
+LDAPServerPort=Cổng máy chủ
+LDAPServerPortExample=Cổng mặc định: 389
+LDAPServerProtocolVersion=Phiên bản giao thức
+LDAPServerUseTLS=Sử dụng TLS
+LDAPServerUseTLSExample=LDAP của bạn sử dụng máy chủ TLS
+LDAPServerDn=Máy chủ DN
+LDAPAdminDn=Quản trị DN
+LDAPAdminDnExample=Toàn bộ DN (ví dụ: cn = admin, dc = Ví dụ, dc = com)
+LDAPPassword=Mật khẩu quản trị
+LDAPUserDn=DN của người sử dụng
+LDAPUserDnExample=Toàn bộ DN (ví dụ: ou = người dùng, dc = Ví dụ, dc = com)
+LDAPGroupDn=DN nhóm '
+LDAPGroupDnExample=Toàn bộ DN (ví dụ: ou = nhóm, dc = Ví dụ, dc = com)
+LDAPServerExample=Địa chỉ máy chủ (ví dụ: localhost, 192.168.0.2, LDAPS: //ldap.example.com/)
+LDAPServerDnExample=Toàn bộ DN (ví dụ: dc = Ví dụ, dc = com)
+LDAPPasswordExample=Mật khẩu quản trị
+LDAPDnSynchroActive=Người sử dụng và nhóm đồng bộ hóa
+LDAPDnSynchroActiveExample=LDAP để Dolibarr hoặc Dolibarr để đồng bộ hóa LDAP
+LDAPDnContactActive=Đồng bộ hóa địa chỉ liên lạc '
+LDAPDnContactActiveYes=Đồng bộ hóa kích hoạt
+LDAPDnContactActiveExample=Kích hoạt / Unactivated đồng bộ hóa
+LDAPDnMemberActive=Đồng bộ của các thành viên
+LDAPDnMemberActiveExample=Kích hoạt / Unactivated đồng bộ hóa
+LDAPContactDn=DN Dolibarr liên lạc '
+LDAPContactDnExample=Toàn bộ DN (ví dụ: ou = địa chỉ liên lạc, dc = Ví dụ, dc = com)
+LDAPMemberDn=Thành viên Dolibarr DN
+LDAPMemberDnExample=Toàn bộ DN (ví dụ: ou = thành viên, dc = Ví dụ, dc = com)
+LDAPMemberObjectClassList=Danh sách objectClass
+LDAPMemberObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục)
+LDAPUserObjectClassList=Danh sách objectClass
+LDAPUserObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục)
+LDAPGroupObjectClassList=Danh sách objectClass
+LDAPGroupObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, groupOfUniqueNames)
+LDAPContactObjectClassList=Danh sách objectClass
+LDAPContactObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục)
+LDAPMemberTypeDn=Thành viên Dolibarr nhập DN
+LDAPMemberTypeDnExample=Toàn bộ DN (ví dụ: ou = type_members, dc = Ví dụ, dc = com)
+LDAPTestConnect=Kiểm tra kết nối LDAP
+LDAPTestSynchroContact=Kiểm tra đồng bộ hóa địa chỉ liên lạc
+LDAPTestSynchroUser=Đồng bộ hóa sử dụng thử nghiệm
+LDAPTestSynchroGroup=Đồng bộ hóa nhóm thử nghiệm
+LDAPTestSynchroMember=Đồng bộ thành viên kiểm tra
+LDAPTestSearch= Kiểm tra một tìm kiếm LDAP
+LDAPSynchroOK=Kiểm tra đồng bộ thành công
+LDAPSynchroKO=Kiểm tra đồng bộ hóa thất bại
+LDAPSynchroKOMayBePermissions=Kiểm tra đồng bộ hóa thất bại. Kiểm tra xem xui đến máy chủ được cấu hình đúng và cho phép udpates LDAP
+LDAPTCPConnectOK=TCP kết nối với máy chủ LDAP thành công (Server =%s, Port =%s)
+LDAPTCPConnectKO=TCP kết nối với máy chủ LDAP thất bại (Server =%s, Port =%s)
+LDAPBindOK=Kết nối / Authentificate đến máy chủ LDAP thành công (Server =%s, Port =%s, Admin =%s, mật khẩu =%s)
+LDAPBindKO=Kết nối / Authentificate đến máy chủ LDAP thất bại (Server =%s, Port =%s, Admin =%s, mật khẩu =%s)
+LDAPUnbindSuccessfull=Ngắt kết nối thành công
+LDAPUnbindFailed=Ngắt kết nối thất bại
+LDAPConnectToDNSuccessfull=Kết nối với DN (%s) thành công
+LDAPConnectToDNFailed=Kết nối với DN (%s) không thành công
+LDAPSetupForVersion3=Máy chủ LDAP cấu hình cho phiên bản 3
+LDAPSetupForVersion2=Máy chủ LDAP cấu hình của phiên bản 2
+LDAPDolibarrMapping=Dolibarr bản đồ
+LDAPLdapMapping=LDAP bản đồ
+LDAPFieldLoginUnix=Đăng nhập (Unix)
+LDAPFieldLoginExample=Ví dụ: uid
+LDAPFilterConnection=Bộ lọc tìm kiếm
+LDAPFilterConnectionExample=Ví dụ: &(objectClass = inetOrgPerson)
+LDAPFieldLoginSamba=Đăng nhập (samba, ActiveDirectory)
+LDAPFieldLoginSambaExample=Ví dụ: sAMAccountName
+LDAPFieldFullname=Họ và tên
+LDAPFieldFullnameExample=Ví dụ: cn
+LDAPFieldPassword=Mật khẩu
+LDAPFieldPasswordNotCrypted=Mật khẩu không crypted
+LDAPFieldPasswordCrypted=Mật khẩu crypted
+LDAPFieldPasswordExample=Ví dụ: userPassword
+LDAPFieldCommonName=Tên thường gặp
+LDAPFieldCommonNameExample=Ví dụ: cn
+LDAPFieldName=Tên
+LDAPFieldNameExample=Ví dụ: sn
+LDAPFieldFirstName=Tên đầu tiên
+LDAPFieldFirstNameExample=Ví dụ: givenName
+LDAPFieldMail=Địa chỉ email
+LDAPFieldMailExample=Ví dụ mail của bạn:
+LDAPFieldPhone=Số điện thoại chuyên nghiệp
+LDAPFieldPhoneExample=Ví dụ: telephonenumber
+LDAPFieldHomePhone=Số điện thoại cá nhân
+LDAPFieldHomePhoneExample=Ví dụ: HomePhone
+LDAPFieldMobile=Điện thoại di động
+LDAPFieldMobileExample=Ví dụ: điện thoại di động
+LDAPFieldFax=Số fax
+LDAPFieldFaxExample=Ví dụ: facsimiletelephonenumber
+LDAPFieldAddress=Đường phố
+LDAPFieldAddressExample=Ví dụ: đường phố
 LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
+LDAPFieldZipExample=Ví dụ: Mã Bưu chính
 LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldCountryExample=Example : c
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldBirthdateExample=Example :
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
+LDAPFieldTownExample=Ví dụ: l
+LDAPFieldCountry=Đất nước
+LDAPFieldCountryExample=Ví dụ: c
+LDAPFieldDescription=Mô tả
+LDAPFieldDescriptionExample=Ví dụ: Mô tả
+LDAPFieldGroupMembers= Nhóm thành viên
+LDAPFieldGroupMembersExample= Ví dụ: uniqueMember
+LDAPFieldBirthdate=Ngày sinh
+LDAPFieldBirthdateExample=Ví dụ:
+LDAPFieldCompany=Công ty
+LDAPFieldCompanyExample=Ví dụ: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated access (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
+LDAPFieldSidExample=Ví dụ: objectsid
+LDAPFieldEndLastSubscription=Ngày đăng ký cuối cùng
+LDAPFieldTitle=Bài / Chức năng
+LDAPFieldTitleExample=Ví dụ: tiêu đề
+LDAPParametersAreStillHardCoded=Thông số LDAP vẫn được mã hóa (trong lớp liên lạc)
+LDAPSetupNotComplete=Thiết lập LDAP không hoàn thành (đi trên các tab khác)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Không có người quản trị hoặc mật khẩu được cung cấp. Truy cập LDAP sẽ được ẩn danh và ở chế độ chỉ đọc.
+LDAPDescContact=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên địa chỉ liên lạc Dolibarr.
+LDAPDescUsers=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên người sử dụng Dolibarr.
+LDAPDescGroups=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên các nhóm Dolibarr.
+LDAPDescMembers=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên các thành viên Dolibarr mô-đun.
+LDAPDescValues=Ví dụ giá trị được thiết kế cho <b>OpenLDAP</b> với các lược đồ sau đây nạp: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Nếu bạn sử dụng thoose giá trị và OpenLDAP, LDAP sửa đổi tập tin cấu hình <b>slapd.conf</b> của bạn có tất cả các lược đồ thoose nạp.
+ForANonAnonymousAccess=Đối với một truy cập xác thực (đối với quyền truy cập ghi ví dụ)
+PerfDolibarr=Thiết lập hiệu suất / tối ưu hóa báo cáo
+YouMayFindPerfAdviceHere=Bạn sẽ tìm thấy trên trang này một số kiểm tra và tư vấn liên quan đến hiệu suất.
+NotInstalled=Không cài đặt, do máy chủ của bạn không làm chậm của thành viên này.
+ApplicativeCache=Bộ nhớ cache applicative
+MemcachedNotAvailable=Không có bộ nhớ cache applicative được tìm thấy. Bạn có thể nâng cao hiệu suất bằng cách cài đặt một máy chủ memcached bộ nhớ cache và một mô-đun có thể sử dụng máy chủ cache này. <br> Thêm thông tin ở đây <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Lưu ý rằng rất nhiều nhà cung cấp máy chủ web không cung cấp máy chủ cache như vậy.
+MemcachedModuleAvailableButNotSetup=Mô-đun bộ nhớ cache memcached cho applicative tìm thấy nhưng cài đặt các mô-đun không đầy đủ.
+MemcachedAvailableAndSetup=Memcached mô-đun dành riêng cho sử dụng máy chủ memcached được kích hoạt.
+OPCodeCache=Bộ nhớ cache opcode
+NoOPCodeCacheFound=Không có bộ nhớ cache opcode được tìm thấy. Có thể là bạn sử dụng một bộ nhớ cache opcode hơn XCache hoặc eAccelerator (tốt), có thể bạn không có bộ nhớ cache opcode (rất xấu).
+HTTPCacheStaticResources=Bộ nhớ cache HTTP cho tài nguyên tĩnh (css, img, javascript)
+FilesOfTypeCached=Files of type%s được lưu trữ bởi máy chủ HTTP
+FilesOfTypeNotCached=Files of type%s không được lưu trữ bởi máy chủ HTTP
+FilesOfTypeCompressed=Files of type%s được nén bởi máy chủ HTTP
+FilesOfTypeNotCompressed=Files of type%s không bị nén bởi máy chủ HTTP
+CacheByServer=Bộ nhớ cache của máy chủ
+CacheByClient=Bộ nhớ cache của trình duyệt
+CompressionOfResources=Nén các phản hồi HTTP
+TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Services module setup
-ProductServiceSetup=Products and Services modules setup
-NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
-ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
-ModifyProductDescAbility=Personalization of product descriptions in forms
-ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
-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).
-UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
+ProductSetup=Thiết lập mô-đun sản phẩm
+ServiceSetup=Thiết lập mô-đun dịch vụ
+ProductServiceSetup=Thiết lập mô-đun sản phẩm và dịch vụ
+NumberOfProductShowInSelect=Số lượng tối đa của sản phẩm trong danh sách combo chọn (0 = không giới hạn)
+ConfirmDeleteProductLineAbility=Xác nhận khi loại bỏ các dòng sản phẩm trong các hình thức
+ModifyProductDescAbility=Cá nhân mô tả sản phẩm dưới nhiều hình thức
+ViewProductDescInFormAbility=Hình ảnh của mô tả sản phẩm bằng các hình thức (nếu không như bật lên tooltip)
+ViewProductDescInThirdpartyLanguageAbility=Hình ảnh của sản phẩm mô tả trong ngôn ngữ của bên thứ ba
+UseSearchToSelectProductTooltip=Ngoài ra nếu bạn có một số lượng lớn các sản phẩm (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập PRODUCT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi.
+UseSearchToSelectProduct=Sử dụng một hình thức tìm kiếm để chọn một sản phẩm (chứ không phải là một danh sách thả xuống).
+UseEcoTaxeAbility=Hỗ trợ sinh thái taxe (WEEE)
+SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm
+SetDefaultBarcodeTypeThirdParties=Mặc định loại mã vạch để sử dụng cho các bên thứ ba
+ProductCodeChecker= Module cho hệ mã sản phẩm và kiểm tra (sản phẩm hoặc dịch vụ)
+ProductOtherConf= Sản phẩm / dịch vụ cấu hình
 ##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
+SyslogSetup=Thiết lập các bản ghi mô-đun
+SyslogOutput=Bản ghi kết quả đầu ra
 SyslogSyslog=Syslog
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogSimpleFile=File
-SyslogFilename=File name and path
-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
+SyslogFacility=Cơ sở
+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
+OnlyWindowsLOG_USER=Windows chỉ hỗ trợ LOG_USER
 ##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
+DonationsSetup=Thiết lập mô-đun tặng
+DonationsReceiptModel=Mẫu nhận tặng
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-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
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeSetup=Thiết lập mã vạch
+PaperFormatModule=Mô-đun định dạng In
+BarcodeEncodeModule=Mã vạch kiểu mã hóa
+UseBarcodeInProductModule=Sử dụng mã vạch cho sản phẩm
+CodeBarGenerator=Máy phát điện mã vạch
+ChooseABarCode=Không có máy phát điện được xác định
+FormatNotSupportedByGenerator=Định dạng không được hỗ trợ bởi máy phát điện này
+BarcodeDescEAN8=Barcode loại EAN8
+BarcodeDescEAN13=Barcode loại EAN13
+BarcodeDescUPC=Mã vạch UPC loại
+BarcodeDescISBN=Barcode loại ISBN
+BarcodeDescC39=Barcode loại C39
+BarcodeDescC128=Barcode loại C128
+GenbarcodeLocation=Thanh công cụ dòng lệnh thế hệ mã (sử dụng động cơ nội bộ đối với một số loại mã vạch)
+BarcodeInternalEngine=Động cơ nội bộ
+BarCodeNumberManager=Manager để tự động xác định số mã vạch
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Thiết lập mô-đun thu hồi
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
+ExternalRSSSetup=RSS ngoài nhập khẩu thiết lập
+NewRSS=RSS Feed Mới
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=Một nguồn cấp dữ liệu RSS thú vị
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
+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=Notification bu email module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
-ListOfAvailableNotifications=List of available notifications (This list depends on activated modules)
+NotificationSetup=Thư điện tử của thiết lập mô-đun thông báo
+NotificationEMailFrom=Tên người gửi thư điện tử (Từ) cho các email gửi đi thông báo
+ListOfAvailableNotifications=Danh sách các sự kiện mà bạn có thể thiết lập thông báo trên, cho mỗi của bên thứ ba (đi vào thẻ của bên thứ ba để thiết lập) hoặc bằng cách thiết lập một email cố định (Danh sách phụ thuộc vào mô-đun kích hoạt)
+FixedEmailTarget=Mục tiêu email cố định
 ##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support sendings sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shippings
+SendingsSetup=Gửi thiết lập mô-đun
+SendingsReceiptModel=Gửi mô hình nhận
+SendingsNumberingModules=Sendings đánh số module
+SendingsAbility=Hỗ trợ sendings tờ cho việc giao hàng của khách hàng
+NoNeedForDeliveryReceipts=Trong hầu hết các trường hợp, sendings hóa đơn được sử dụng như tờ cho việc giao hàng của khách hàng (danh sách các sản phẩm để gửi) và tấm được recevied và chữ ký của khách hàng. Vì vậy, phân phối sản phẩm hóa đơn là một tính năng sao chép và hiếm khi được kích hoạt.
+FreeLegalTextOnShippings=Miễn phí văn bản trên shippings
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=Sản phẩm phân phối mô-đun số nhận
+DeliveryOrderModel=Sản phẩm mô hình giao nhận
+DeliveriesOrderAbility=Sản phẩm hỗ trợ giao biên lai
+FreeLegalTextOnDeliveryReceipts=Văn bản miễn phí trên hóa đơn giao hàng
 ##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommanded as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+AdvancedEditor=Biên tập viên cao cấp
+ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho:
+FCKeditorForCompany=WYSIWIG tạo / phiên bản của các yếu tố mô tả và lưu ý (trừ các sản phẩm / dịch vụ)
+FCKeditorForProduct=WYSIWIG tạo / phiên bản của sản phẩm / dịch vụ mô tả và lưu ý
+FCKeditorForProductDetails=WYSIWIG tạo / phiên bản của sản phẩm chi tiết cho tất cả các dòng thực thể (đề xuất, đơn đặt hàng, hóa đơn, vv ...). <font class="warning">Cảnh báo: Sử dụng tùy chọn này trong trường hợp này là nghiêm túc không recommanded vì nó có thể tạo ra các vấn đề với các ký tự đặc biệt và các định dạng trang khi xây dựng PDF tập tin.</font>
+FCKeditorForMailing= WYSIWIG tạo / phiên bản cho eMailings khối (Tools> gửi email)
+FCKeditorForUserSignature=WYSIWIG tạo / phiên bản của chữ ký người sử dụng
+FCKeditorForMail=WYSIWIG tạo / phiên bản cho tất cả thư (trừ Outils-> gửi email)
 ##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s).
-OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull.
-OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
-OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
+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=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
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NewMenu=New menu
-MenuConf=Menus setup
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+MenuDeleted=Đơn bị xóa
+TreeMenu=Menu cây
+Menus=Thực đơn
+TreeMenuPersonalized=Menu cá nhân
+NewMenu=Đơn mới
+MenuConf=Thiết lập menu
+Menu=Lựa chọn các đơn
+MenuHandler=Xử lý đơn
+MenuModule=Mô-đun mã nguồn
+HideUnauthorizedMenu= Ẩn menu trái phép (màu xám)
 DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailMainmenu=Group for which it belongs (obsolete)
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailLeftmenu=Display condition or not (obsolete)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line ?
+DetailMenuHandler=Đơn xử lý vị trí hiển thị trình đơn mới
+DetailMenuModule=Tên module nếu mục trình đơn đến từ một mô-đun
+DetailType=Loại menu (trên hoặc bên trái)
+DetailTitre=Nhãn Menu hoặc nhãn mã cho dịch
+DetailMainmenu=Nhóm mà nó thuộc về (đã lỗi thời)
+DetailUrl=URL nơi đơn gửi cho bạn (liên kết URL tuyệt đối hoặc liên kết bên ngoài với http: //)
+DetailLeftmenu=Điều kiện hiển thị hay không (đã lỗi thời)
+DetailEnabled=Điều kiện để hiển thị hoặc không nhập
+DetailRight=Điều kiện để hiển thị menu màu xám trái phép
+DetailLangs=Tên file lang cho dịch nhãn mã
+DetailUser=Intern / ở ngoài / Tất cả
+Target=Mục tiêu
+DetailTarget=Mục tiêu cho các liên kết (_blank đầu mở một cửa sổ mới)
+DetailLevel=Cấp (-1: menu trên cùng, 0: đơn tiêu đề,> 0 menu và menu phụ)
+ModifMenu=Thực đơn thay đổi
+DeleteMenu=Xóa mục trình đơn
+ConfirmDeleteMenu=Bạn có chắc chắn muốn xóa mục trình đơn <b>%s</b> ?
+DeleteLine=Xóa dòng
+ConfirmDeleteLine=Bạn Bạn có chắc chắn muốn xóa dòng này?
 ##### Tax #####
-TaxSetup=Taxes, social contributions and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+TaxSetup=Thuế, các khoản đóng góp xã hội và cổ tức thiết lập mô-đun
+OptionVatMode=Thuế GTGT do
+OptionVATDefault=Tiền cơ sở
+OptionVATDebitOption=Cơ sở dồn tích
+OptionVatDefaultDesc=Thuế GTGT là do: <br> - Giao hàng đối với hàng hóa (chúng ta sử dụng ngày hóa đơn) <br> - Về chi trả dịch vụ
+OptionVatDebitOptionDesc=Thuế GTGT là do: <br> - Giao hàng đối với hàng hóa (chúng ta sử dụng ngày hóa đơn) <br> - Trên hoá đơn (ghi nợ) cho các dịch vụ
+SummaryOfVatExigibilityUsedByDefault=Thời gian exigibility thuế GTGT theo mặc định theo lựa chọn lựa chọn:
+OnDelivery=Ngày giao hàng
+OnPayment=Ngày thanh toán
+OnInvoice=Trên hóa đơn
+SupposedToBePaymentDate=Ngày thanh toán sử dụng
+SupposedToBeInvoiceDate=Ngày sử dụng hóa đơn
+Buy=Mua
+Sell=Bán
+InvoiceDateUsed=Ngày sử dụng hóa đơn
+YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không sử dụng thuế GTGT (Trang chủ - Thiết lập - Công ty / cơ sở), vì vậy không có tùy chọn để thiết lập thuế GTGT.
+AccountancyCode=Kế toán Mã
+AccountancyCodeSell=Tài khoản bán hàng. Mã
+AccountancyCodeBuy=Mua tài khoản. Mã
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
-PastDelayVCalExport=Do not export event older than
-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
+AgendaSetup=Sự kiện và thiết lập mô-đun chương trình nghị sự
+PasswordTogetVCalExport=Key cho phép xuất liên kết
+PastDelayVCalExport=Không xuất dữ liệu sự kiện cũ hơn
+AGENDA_USE_EVENT_TYPE=Loại hình sử dụng sự kiện (quản lý vào menu Setup -> từ điển -> Loại sự kiện chương trình)
+AGENDA_DEFAULT_FILTER_TYPE=Thiết lập tự động loại sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự
+AGENDA_DEFAULT_FILTER_STATUS=Tự động thiết lập trạng thái này cho các sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự
+AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn chương trình nghị sự đơn
 ##### ClickToDial #####
-ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
+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=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=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
+CashDesk=Điểm bán hàng
+CashDeskSetup=Thiết lập mô-đun Điểm bán hàng
+CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskBankAccountForSell=Tài khoản mặc định để sử dụng để nhận thanh toán bằng tiền mặt
+CashDeskBankAccountForCheque= Tài khoản mặc định để sử dụng để nhận thanh toán bằng séc
+CashDeskBankAccountForCB= Tài khoản mặc định để sử dụng để nhận thanh toán bằng thẻ tín dụng
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+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.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+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.
+NbOfBoomarkToShow=Số lượng tối đa các trang đánh dấu để hiển thị trong menu bên trái
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
+WebServicesSetup=Thiết lập mô-đun webservices
+WebServicesDesc=Bằng cách cho phép mô-đun này, Dolibarr trở thành một máy chủ dịch vụ web để cung cấp dịch vụ web linh tinh.
+WSDLCanBeDownloadedHere=Các tập tin mô tả WSDL của dịch vụ cung cấp có thể được tải về tại đây
+EndPointIs=SOAP khách hàng phải gửi yêu cầu tới các thiết bị đầu cuối Dolibarr tại Url
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
+BankSetupModule=Thiết lập mô-đun Ngân hàng
+FreeLegalTextOnChequeReceipts=Văn bản miễn phí trên hóa đơn kiểm tra
+BankOrderShow=Để hiển thị các tài khoản ngân hàng cho các nước đang sử dụng "số ngân hàng chi tiết"
+BankOrderGlobal=Chung
+BankOrderGlobalDesc=Thứ tự hiển thị chung
+BankOrderES=Tây Ban Nha
+BankOrderESDesc=Thứ tự hiển thị tiếng Tây Ban Nha
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=Thiết lập mô-đun Multi-công ty
 ##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+SuppliersSetup=Thiết lập mô-đun nhà cung cấp
+SuppliersCommandModel=Hoàn thành mẫu đơn đặt hàng nhà cung cấp (logo ...)
+SuppliersInvoiceModel=Toàn bộ mẫu của nhà cung cấp hóa đơn (biểu tượng ...)
+SuppliersInvoiceNumberingModel=Nhà cung cấp hoá đơn đánh số mô hình
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+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. <br> Ví dụ: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /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 <b>phiên bản demo miễn phí</b> của tập tin nước MaxMind GeoIP tại%s.
+YouCanDownloadAdvancedDatFileTo=Bạn cũng có thể tải về một <b>phiên bản hoàn thiện hơn, với bản cập nhật,</b> 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=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
+ProjectsNumberingModules=Dự án đánh số mô-đun
+ProjectsSetup=Thiết lập mô-đun dự án
+ProjectsModelModule=Dự án báo cáo mô hình tài liệu
+TasksNumberingModules=Nhiệm vụ đánh số mô-đun
+TaskModelModule=Nhiệm vụ báo cáo mô hình tài liệu
 ##### ECM (GED) #####
-ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMSetup = GED cài đặt
+ECMAutoTree = Cây thư mục tự động và tài liệu
 ##### 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
+FiscalYears=Năm tài chính
+FiscalYear=Năm tài chính
+FiscalYearCard=Thẻ năm tài chính
+NewFiscalYear=Năm tài chính mới
+EditFiscalYear=Chỉnh sửa năm tài chính
+OpenFiscalYear=Mở cửa năm tài chính
+CloseFiscalYear=Đóng năm tài chính
+DeleteFiscalYear=Xóa năm tài chính
+ConfirmDeleteFiscalYear=Bạn chắc chắn muốn xóa năm tài chính này?
+Opened=Mở
+Closed=Đóng
+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 b91bcb1f323..d382aef3a06 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -1,86 +1,92 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
-Actions=Events
-ActionsArea=Events area (Actions and tasks)
-Agenda= Agenda
-Agendas= Agendas
-Calendar= Calendar
-Calendars= Calendars
-LocalAgenda=Local calendar
-AffectedTo= Assigned to
-DoneBy= Done by
-Events= Events
-EventsNb=Number of events
-MyEvents=My events
-OtherEvents=Other events
-ListOfActions=List of events
-Location=Location
-EventOnFullDay=Event on all day(s)
-SearchAnAction= Search an event/task
-MenuToDoActions= All incomplete events
-MenuDoneActions= All terminated events
-MenuToDoMyActions= My incomplete events
-MenuDoneMyActions= My terminated events
-ListOfEvents= List of Dolibarr events
-ActionsAskedBy=Events reported by
-ActionsToDoBy=Events assigned to
-ActionsDoneBy=Events done by
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-AllMyActions= All my events/tasks
-AllActions= All events/tasks
-ViewList=List view
-ViewCal=Month view
-ViewDay=Day view
-ViewWeek=Week view
-ViewPerUser=Per user
-ViewWithPredefinedFilters= View with predefined filters
-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
-InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
-InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
-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
-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
-DateActionDoneStart= Real start date
-DateActionDoneEnd= Real end date
-DateActionStart= Start date
-DateActionEnd= End date
-AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
-AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
-AgendaShowBirthdayEvents=Show birthday's contacts
-AgendaHideBirthdayEvents=Hide birthday's contacts
-Busy=Busy
-ExportDataset_event1=List of agenda events
-
+IdAgenda=ID sự kiện
+Actions=Sự kiện
+ActionsArea=Khu vực sự kiện (hành động và nhiệm vụ)
+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=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
+Events=Sự kiện
+EventsNb=Số sự kiện
+MyEvents=Sự kiện của tôi
+OtherEvents=Các sự kiện khác
+ListOfActions=Danh sách các sự kiện
+Location=Đến từ
+EventOnFullDay=Sự kiện trên tất cả các ngày (s)
+SearchAnAction= Tìm kiếm một sự kiện / nhiệm vụ
+MenuToDoActions=Tất cả các sự kiện không đầy đủ
+MenuDoneActions=Tất cả các sự kiện kết thúc
+MenuToDoMyActions=Sự kiện không đầy đủ của tôi
+MenuDoneMyActions=Sự kiện chấm dứt của tôi
+ListOfEvents=Danh sách các sự kiện (lịch nội bộ)
+ActionsAskedBy=Sự kiện báo cáo của
+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
+ViewCal=Xem tháng
+ViewDay=Ngày xem
+ViewWeek=Xem theo tuần
+ViewPerUser=Trung bình mỗi người dùng xem
+ViewWithPredefinedFilters= Xem với các bộ lọc được xác định trước
+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
+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
+DateActionDoneStart= Ngày bắt đầu thực
+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=<b>login =%s</b> ​​để 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 <b>%s</b>.
+AgendaUrlOptions3=<b>Logina =%s</b> ​​để hạn chế sản lượng để hành động thuộc sở hữu của một người dùng <b>%s</b>.
+AgendaUrlOptions4=<b>logint =%s</b> ​​để hạn chế sản lượng để hành động được gán cho người dùng <b>%s</b>.
+AgendaUrlOptionsProject=<b>dự án = PROJECT_ID</b> để hạn chế sản lượng để hành động liên quan đến dự án <b>PROJECT_ID.</b>
+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
+ExportDataset_event1=Danh sách các sự kiện chương trình nghị sự
+DefaultWorkingDays=Mặc định ngày làm việc trong phạm vi tuần (Ví dụ: 1-5, 1-6)
+DefaultWorkingHours=Mặc định giờ làm việc trong ngày (Ví dụ: 9-18)
 # External Sites ical
-ExportCal=Export calendar
-ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars into agenda
-ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar nb %s
-ExtSiteUrlAgenda=URL to access .ical file
-ExtSiteNoLabel=No Description
+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
+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=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 05156a723ad..5a05d8f4b62 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -1,160 +1,160 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-Banks=Banks
-MenuBankCash=Bank/Cash
-MenuSetupBank=Bank/Cash setup
-BankName=Bank name
-FinancialAccount=Account
-FinancialAccounts=Accounts
-BankAccount=Bank account
-BankAccounts=Bank accounts
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-MainAccount=Main account
-CurrentAccount=Current account
-CurrentAccounts=Current accounts
-SavingAccount=Savings account
-SavingAccounts=Savings accounts
-ErrorBankLabelAlreadyExists=Financial account label already exists
-BankBalance=Balance
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=Minimum allowed balance
-BalanceMinimalDesired=Minimum desired balance
-InitialBankBalance=Initial balance
-EndBankBalance=End balance
-CurrentBalance=Current balance
-FutureBalance=Future balance
-ShowAllTimeBalance=Show balance from start
-AllTime=From start
-Reconciliation=Reconciliation
-RIB=Bank Account Number
-IBAN=IBAN number
-BIC=BIC/SWIFT number
-StandingOrders=Standing orders
-StandingOrder=Standing order
-Withdrawals=Withdrawals
-Withdrawal=Withdrawal
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
+Bank=Ngân hàng
+Banks=Các ngân hàng
+MenuBankCash=Ngân hàng / Tiền
+MenuSetupBank=Thiết lập Ngân hàng / Tiền
+BankName=Tên ngân hàng
+FinancialAccount=Tài khoản
+FinancialAccounts=Tài khoản
+BankAccount=Tài khoản ngân hàng
+BankAccounts=Tài khoản ngân hàng
+AccountRef=Tài khoản tài chính ref
+AccountLabel=Nhãn tài khoản tài chính
+CashAccount=Tài khoản tiền mặt
+CashAccounts=Tài khoản tiền mặt
+MainAccount=Tài khoản chính
+CurrentAccount=Tài khoản vãng lai
+CurrentAccounts=Tài khoản vãng lai
+SavingAccount=Tài khoản tiết kiệm
+SavingAccounts=Tài khoản tiết kiệm
+ErrorBankLabelAlreadyExists=Nhãn tài khoản tài chính đã tồn tại
+BankBalance=Cân bằng
+BankBalanceBefore=Cân bằng trước
+BankBalanceAfter=Cân bằng sau
+BalanceMinimalAllowed=Cân bằng tối thiểu cho phép
+BalanceMinimalDesired=Cân bằng mong muốn tối thiểu
+InitialBankBalance=Cân bằng ban đầu
+EndBankBalance=Dư cuối
+CurrentBalance=Số dư hiện tại
+FutureBalance=Cân bằng trong tương lai
+ShowAllTimeBalance=Hiển thị cân bằng từ đầu
+AllTime=Từ đầu
+Reconciliation=Hòa giải
+RIB=Số tài khoản ngân hàng
+IBAN=Số IBAN
+BIC=BIC / SWIFT số
+StandingOrders=Đứng đơn đặt hàng
+StandingOrder=Lệnh chuyển tiền định
+Withdrawals=Tiền thu hồi
+Withdrawal=Rút
+AccountStatement=Sao kê tài khoản
+AccountStatementShort=Trữ
+AccountStatements=Báo cáo tài khoản
+LastAccountStatements=Báo cáo tài khoản cuối cùng
 Rapprochement=Reconciliate
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
-CreateAccount=Create account
-NewAccount=New account
-NewBankAccount=New bank account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-NewCurrentAccount=New current account
-NewSavingAccount=New savings account
-NewCashAccount=New cash account
-EditFinancialAccount=Edit account
-AccountSetup=Financial accounts setup
-SearchBankMovement=Search bank movement
-Debts=Debts
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-IfBankAccount=If bank account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account ?
-Account=Account
-ByCategories=By categories
-ByRubriques=By categories
-BankTransactionByCategories=Bank transactions by categories
-BankTransactionForCategory=Bank transactions for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ?
-ListBankTransactions=List of bank transactions
-IdTransaction=Transaction ID
-BankTransactions=Bank transactions
-SearchTransaction=Search transaction
-ListTransactions=List transactions
-ListTransactionsByCategory=List transaction/category
-TransactionsToConciliate=Transactions to reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-ConciliationForAccount=Reconcile this account
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
-StatusAccountClosed=Closed
-AccountIdShort=Number
-EditBankRecord=Edit record
-LineRecord=Transaction
-AddBankRecord=Add transaction
-AddBankRecordLong=Add transaction manually
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Transaction reconciled
-CustomerInvoicePayment=Customer payment
-CustomerInvoicePaymentBack=Customer payment back
-SupplierInvoicePayment=Supplier payment
-WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social contribution payment
-FinancialAccountJournal=Financial account journal
-BankTransfer=Bank transfer
-BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
-TransferFrom=From
-TransferTo=To
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+IOMonthlyReporting=Báo cáo hàng tháng
+BankAccountDomiciliation=Địa chỉ tài khoản
+BankAccountCountry=Tài khoản quốc gia
+BankAccountOwner=Tên chủ tài khoản
+BankAccountOwnerAddress=Địa chỉ chủ sở hữu tài khoản
+RIBControlError=Kiểm tra tính toàn vẹn của các giá trị bị lỗi. Điều này có nghĩa là thông tin về số tài khoản này là không đầy đủ hoặc sai (kiểm tra cả nước, con số và IBAN).
+CreateAccount=Tạo tài khoản
+NewAccount=Tài khoản mới
+NewBankAccount=Tài khoản ngân hàng mới
+NewFinancialAccount=Tài khoản tài chính mới
+MenuNewFinancialAccount=Tài khoản tài chính mới
+NewCurrentAccount=Tài khoản vãng lai mới
+NewSavingAccount=Tài khoản tiết kiệm mới
+NewCashAccount=Tài khoản tiền mới
+EditFinancialAccount=Chỉnh sửa tài khoản
+AccountSetup=Thiết lập tài khoản tài chính
+SearchBankMovement=Phong trào tìm kiếm ngân hàng
+Debts=Các khoản nợ
+LabelBankCashAccount=Ngân hàng hoặc nhãn tiền
+AccountType=Loại tài khoản
+BankType0=Tài khoản tiết kiệm
+BankType1=Tài khoản vãng lai hoặc thẻ tín dụng
+BankType2=Tài khoản tiền mặt
+IfBankAccount=Nếu tài khoản ngân hàng
+AccountsArea=Khu vực tài khoản
+AccountCard=Thẻ tài khoản
+DeleteAccount=Xóa tài khoản
+ConfirmDeleteAccount=Bạn Bạn có chắc chắn muốn xóa tài khoản này?
+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 <b>%s</b>
+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
+IdTransaction=Mã số giao dịch
+BankTransactions=Giao dịch ngân hàng
+SearchTransaction=Giao dịch tìm kiếm
+ListTransactions=Danh sách giao dịch
+ListTransactionsByCategory=Danh sách giao dịch / thể loại
+TransactionsToConciliate=Giao dịch để hòa giải
+Conciliable=Có thể được hòa giải
+Conciliate=Hòa giải
+Conciliation=Hòa giải
+ConciliationForAccount=Đối chiếu tài khoản này
+IncludeClosedAccount=Bao gồm các tài khoản đã đóng
+OnlyOpenedAccount=Chỉ có tài khoản mở
+AccountToCredit=Tài khoản tín dụng
+AccountToDebit=Tài khoản ghi nợ
+DisableConciliation=Vô hiệu hoá tính năng hòa giải cho tài khoản này
+ConciliationDisabled=Tính năng hòa giải bị vô hiệu hóa
+StatusAccountOpened=Mở
+StatusAccountClosed=Đóng
+AccountIdShort=Số
+EditBankRecord=Sửa kỷ lục
+LineRecord=Giao dịch
+AddBankRecord=Thêm giao dịch
+AddBankRecordLong=Thêm giao dịch bằng tay
+ConciliatedBy=Hòa giải bởi
+DateConciliating=Ngày hòa giải
+BankLineConciliated=Giao dịch hòa giải
+CustomerInvoicePayment=Thanh toán của khách hàng
+CustomerInvoicePaymentBack=Lại thanh toán của khách hàng
+SupplierInvoicePayment=Thanh toán nhà cung cấp
+WithdrawalPayment=Thanh toán rút
+SocialContributionPayment=Thanh toán đóng góp xã hội
+FinancialAccountJournal=Tạp chí tài khoản tài chính
+BankTransfer=Chuyển khoản ngân hàng
+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ừ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi nhận.
 CheckTransmitter=Transmitter
-ValidateCheckReceipt=Validate this check receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this check receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks waiting for deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
-DeleteTransaction=Delete transaction
-ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions
-BankMovements=Movements
-CashBudget=Cash budget
-PlannedTransactions=Planned transactions
-Graph=Graphics
-ExportDataset_banque_1=Bank transactions and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-TransactionWithOtherAccount=Account transfer
-PaymentNumberUpdateSucceeded=Payment number updated succesfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date update succesfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank transaction
-AllAccounts=All bank/cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-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
-ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-DefaultRIB=Default BAN
-AllRIB=All BAN
+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?
+DeleteCheckReceipt=Xóa nhận việc kiểm tra này?
+ConfirmDeleteCheckReceipt=Bạn Bạn có chắc chắn muốn xóa nhận việc kiểm tra này?
+BankChecks=Kiểm tra ngân hàng
+BankChecksToReceipt=Kiểm tra chờ đợi tiền gửi
+ShowCheckReceipt=Hiện nhận tiền gửi kiểm tra
+NumberOfCheques=Nb của kiểm tra
+DeleteTransaction=Xóa giao dịch
+ConfirmDeleteTransaction=Bạn Bạn có chắc chắn muốn xóa giao dịch này?
+ThisWillAlsoDeleteBankRecord=Điều này cũng sẽ xóa các giao dịch ngân hàng tạo ra
+BankMovements=Biến động
+CashBudget=Tiền ngân sách
+PlannedTransactions=Giao dịch dự kiến
+Graph=Đồ họa
+ExportDataset_banque_1=Giao dịch ngân hàng và số tài khoản
+ExportDataset_banque_2=Tiền đặt cọc trượt
+TransactionOnTheOtherAccount=Giao dịch trên tài khoản khác
+TransactionWithOtherAccount=Chuyển khoản
+PaymentNumberUpdateSucceeded=Số thanh toán cập nhật thành công
+PaymentNumberUpdateFailed=Số thanh toán không thể được cập nhật
+PaymentDateUpdateSucceeded=Thanh toán cập nhật ngày thành công
+PaymentDateUpdateFailed=Ngày thanh toán không thể được cập nhật
+Transactions=Giao dịch
+BankTransactionLine=Giao dịch ngân hàng
+AllAccounts=Tất cả ngân hàng / tài khoản tiền mặt
+BackToAccount=Trở lại vào tài khoản
+ShowAllAccounts=Hiển thị cho tất cả tài khoản
+FutureTransaction=Giao dịch trong futur. Không có cách nào để hoà giải.
+SelectChequeTransactionAndGenerate=Chọn / kiểm tra bộ lọc để đưa vào nhận tiền gửi kiểm tra và bấm vào "Create".
+InputReceiptNumber=Chọn kê ngân hàng liên quan đến hoà giải. Sử dụng một giá trị số có thể phân loại (ví dụ như, YYYYMM)
+EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ
+ToConciliate=Hoà giải?
+ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp
+BankDashboard=Tài khoản ngân hàng tóm tắt
+DefaultRIB=Mặc định BAN
+AllRIB=Tất cả BAN
 LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+NoBANRecord=Không có hồ sơ BAN
+DeleteARib=Xóa BAN kỷ lục
+ConfirmDeleteRib=Bạn Bạn có chắc chắn muốn xóa bản ghi BAN này?
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 3041825db57..ec7882a6bf0 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -1,412 +1,412 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Invoice
-Bills=Invoices
-BillsCustomers=Customer's invoices
-BillsCustomer=Customer's invoice
-BillsSuppliers=Supplier's invoices
-BillsCustomersUnpaid=Unpaid customer's invoices
-BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s
-BillsSuppliersUnpaid=Unpaid supplier's invoices
-BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s
-BillsLate=Late payments
-BillsStatistics=Customer's invoices statistics
-BillsStatisticsSuppliers=Supplier's invoices statistics
-DisabledBecauseNotErasable=Disabled because can not be erased
-InvoiceStandard=Standard invoice
-InvoiceStandardAsk=Standard invoice
-InvoiceStandardDesc=This kind of invoice is the common invoice.
-InvoiceDeposit=Deposit invoice
-InvoiceDepositAsk=Deposit invoice
-InvoiceDepositDesc=This kind of invoice is done when a deposit has been received.
-InvoiceProForma=Proforma invoice
-InvoiceProFormaAsk=Proforma invoice
-InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
-InvoiceReplacement=Replacement invoice
-InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>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'.
-InvoiceAvoir=Credit note
-InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> 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
-ReplaceInvoice=Replace invoice %s
-ReplacementInvoice=Replacement invoice
-ReplacedByInvoice=Replaced by invoice %s
-ReplacementByInvoice=Replaced by invoice
-CorrectInvoice=Correct invoice %s
-CorrectionInvoice=Correction invoice
-UsedByInvoice=Used to pay invoice %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
-NoReplacableInvoice=No replacable invoices
-NoInvoiceToCorrect=No invoice to correct
-InvoiceHasAvoir=Corrected by one or several invoices
-CardBill=Invoice card
-PredefinedInvoices=Predefined Invoices
-Invoice=Invoice
-Invoices=Invoices
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
-CustomersInvoices=Customers invoices
-SupplierInvoice=Supplier invoice
-SuppliersInvoices=Suppliers invoices
-SupplierBill=Supplier invoice
-SupplierBills=suppliers invoices
-Payment=Payment
-PaymentBack=Payment back
-Payments=Payments
-PaymentsBack=Payments back
-PaidBack=Paid back
-DatePayment=Payment date
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment ?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>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
-PayedSuppliersPayments=Payments payed to suppliers
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
-PaymentsBackAlreadyDone=Payments back already done
-PaymentRule=Payment rule
-PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
-PaymentAmount=Payment amount
-ValidatePayment=Validate payment
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> 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. <br> Edit your entry, otherwise confirm.
-ClassifyPaid=Classify 'Paid'
-ClassifyPaidPartially=Classify 'Paid partially'
-ClassifyCanceled=Classify 'Abandoned'
-ClassifyClosed=Classify 'Closed'
-CreateBill=Create Invoice
-AddBill=Add 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
-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
-Amount=Amount
-PriceBase=Price base
-BillStatus=Invoice status
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Paid or converted into discount
-BillStatusConverted=Paid (ready for final invoice)
-BillStatusCanceled=Abandoned
-BillStatusValidated=Validated (needs to be paid)
-BillStatusStarted=Started
-BillStatusNotPaid=Not paid
-BillStatusClosedUnpaid=Closed (unpaid)
-BillStatusClosedPaidPartially=Paid (partially)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Processed
-BillShortStatusConverted=Processed
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusClosedUnpaid=Closed
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
-ErrorBillNotFound=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-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
-OtherBills=Other invoices
-DraftBills=Draft invoices
-CustomersDraftInvoices=Customers draft invoices
-SuppliersDraftInvoices=Suppliers draft invoices
-Unpaid=Unpaid
-ConfirmDeleteBill=Are you sure you want to delete this invoice ?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b> ?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status ?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid ?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b> ?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remainder to pay <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remainder to pay <b>(%s %s)</b> 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
-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»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuse to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
-ConfirmClassifyAbandonReasonOther=Other
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s ?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %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
-NumberOfBills=Nb of invoices
-NumberOfBillsByMonth=Nb of invoices by month
-AmountOfBills=Amount of invoices
-AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
-ShowSocialContribution=Show social contribution
-ShowBill=Show invoice
-ShowInvoice=Show invoice
-ShowInvoiceReplace=Show replacing invoice
-ShowInvoiceAvoir=Show credit note
-ShowInvoiceDeposit=Show deposit invoice
-ShowPayment=Show payment
-File=File
-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
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-EscompteOffered=Discount offered (payment before term)
-SendBillRef=Send invoice %s
-SendReminderBillRef=Send invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
-NoDraftBills=No draft invoices
-NoOtherDraftBills=No other draft invoices
-NoDraftInvoices=No draft invoices
-RefBill=Invoice ref
-ToBill=To bill
-RemainderToBill=Remainder to bill
-SendBillByMail=Send invoice by email
-SendReminderBillByMail=Send reminder by email
-RelatedCommercialProposals=Related commercial proposals
-MenuToValid=To valid
-DateMaxPayment=Payment due before
-DateEcheance=Due date limit
-DateInvoice=Invoice date
-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
-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
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
-CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
-ExportDataset_invoice_2=Customer invoices and payments
+Bill=Hoá đơn
+Bills=Hoá đơn
+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
+BillsSuppliersUnpaid=Hoá đơn chưa thanh toán của nhà cung cấp
+BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho %s
+BillsLate=Khoản thanh toán trễ
+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ê
+DisabledBecauseNotErasable=Vô hiệu hóa vì không thể bị xóa
+InvoiceStandard=Hóa đơn tiêu chuẩn
+InvoiceStandardAsk=Hóa đơn tiêu chuẩn
+InvoiceStandardDesc=Đây là loại hóa đơn là hóa đơn thông thường.
+InvoiceDeposit=Hóa đơn tiền gửi
+InvoiceDepositAsk=Hóa đơn tiền gửi
+InvoiceDepositDesc=Đây là loại hoá đơn được thực hiện khi một khoản tiền gửi đã được nhận.
+InvoiceProForma=Proforma hóa đơn
+InvoiceProFormaAsk=Proforma hóa đơn
+InvoiceProFormaDesc=<b>Proforma hóa đơn</b> là một hình ảnh của một hóa đơn đúng, nhưng không có giá trị kế toán.
+InvoiceReplacement=Thay thế hóa đơn
+InvoiceReplacementAsk=Thay thế hóa đơn cho hóa đơn
+InvoiceReplacementDesc=<b>Thay thế hóa đơn</b> đượ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. <br><br> Lưu ý: Chỉ có hoá đơn không có thanh toán trên nó có thể được thay thế. Nếu bạn thay thế hóa đơn chưa khép kín, nó sẽ được tự động đóng cửa để 'bỏ rơi'.
+InvoiceAvoir=Ghi nợ
+InvoiceAvoirAsk=Ghi nợ cho hóa đơn đúng
+InvoiceAvoirDesc=Những <b>lưu ý ghi nợ</b> 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
+ReplacementByInvoice=Thay thế bằng hóa đơn
+CorrectInvoice=Hóa đơn đúng %s
+CorrectionInvoice=Chỉnh hóa đơn
+UsedByInvoice=Được sử dụng để thanh toán hoá đơn %s
+ConsumedBy=Tiêu thụ
+NotConsumed=Không tiêu thụ
+NoReplacableInvoice=Không có hoá đơn replacable
+NoInvoiceToCorrect=Không có hoá đơn để điều chỉnh
+InvoiceHasAvoir=Sửa chữa theo một hoặc một số hoá đơn
+CardBill=Thẻ hóa đơn
+PredefinedInvoices=Hoá đơn được xác định trước
+Invoice=Hoá đơn
+Invoices=Hoá đơn
+InvoiceLine=Đường hóa đơn
+InvoiceCustomer=Hóa đơn của khách hàng
+CustomerInvoice=Hóa đơn của khách hàng
+CustomersInvoices=Khách hàng hoá đơn
+SupplierInvoice=Nhà cung cấp hóa đơn
+SuppliersInvoices=Nhà cung cấp hoá đơn
+SupplierBill=Nhà cung cấp hóa đơn
+SupplierBills=các nhà cung cấp hoá đơn
+Payment=Thanh toán
+PaymentBack=Lại thanh toán
+Payments=Thanh toán
+PaymentsBack=Thanh toán lại
+PaidBack=Trả lại
+DatePayment=Ngày thanh toán
+DeletePayment=Xóa thanh toán
+ConfirmDeletePayment=Bạn Bạn có chắc chắn muốn xóa thanh toán này?
+ConfirmConvertToReduc=Bạn có muốn chuyển đổi giấy báo này hoặc khoản đặt cọc vào một giảm giá tuyệt đối? <br> Số lượng như vậy sẽ được lưu trong số tất cả giảm giá và có thể được sử dụng như giảm giá cho một hiện tại hoặc tương lai hóa đơn cho khách hàng này.
+SupplierPayments=Nhà cung cấp các khoản thanh toán
+ReceivedPayments=Khoản tiền nhận được
+ReceivedCustomersPayments=Khoản tiền nhận được từ khách hàng
+PayedSuppliersPayments=Thanh toán payed để nhà cung cấp
+ReceivedCustomersPaymentsToValid=Nhận được khoản thanh toán cho khách hàng để xác nhận
+PaymentsReportsForYear=Báo cáo thanh toán cho%s
+PaymentsReports=Thanh toán báo cáo
+PaymentsAlreadyDone=Thanh toán đã được thực hiện
+PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại
+PaymentRule=Quy tắc thanh toán
+PaymentMode=Phương thức thanh toán
+PaymentConditions=Thời hạn thanh toán
+PaymentConditionsShort=Thời hạn thanh toán
+PaymentAmount=Số tiền thanh toán
+ValidatePayment=Xác nhận thanh toán
+PaymentHigherThanReminderToPay=Thanh toán cao hơn so với lời nhắc nhở phải trả
+HelpPaymentHigherThanReminderToPay=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền. <br> Chỉnh sửa mục nhập của bạn, nếu không xác nhận và suy nghĩ về việc tạo ra một giấy báo có của dư thừa nhận được cho mỗi hoá đơn đã nộp thừa.
+HelpPaymentHigherThanReminderToPaySupplier=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền. <br> Chỉnh sửa mục nhập của bạn, nếu không xác nhận.
+ClassifyPaid=Phân loại 'trả tiền'
+ClassifyPaidPartially=Phân loại 'trả một phần'
+ClassifyCanceled=Phân loại 'bỏ rơi'
+ClassifyClosed=Phân loại 'Đóng'
+ClassifyUnBilled=Phân loại 'chưa lập hoá đơn'
+CreateBill=Tạo hóa đơn
+AddBill=Tạo hóa đơn hoặc ghi nợ lưu ý
+AddToDraftInvoices=Thêm vào dự thảo hóa đơn
+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=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 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
+BillStatusDraft=Dự thảo (cần phải được xác nhận)
+BillStatusPaid=Trả
+BillStatusPaidBackOrConverted=Trả tiền hoặc chuyển đổi thành giảm giá
+BillStatusConverted=Trả (sẵn sàng cho hóa đơn cuối cùng)
+BillStatusCanceled=Bị bỏ rơi
+BillStatusValidated=Xác nhận (cần phải được thanh toán)
+BillStatusStarted=Bắt đầu
+BillStatusNotPaid=Không trả tiền
+BillStatusClosedUnpaid=Đóng (chưa thanh toán)
+BillStatusClosedPaidPartially=Trả tiền (một phần)
+BillShortStatusDraft=Dự thảo
+BillShortStatusPaid=Trả
+BillShortStatusPaidBackOrConverted=Xử lý
+BillShortStatusConverted=Xử lý
+BillShortStatusCanceled=Bị bỏ rơi
+BillShortStatusValidated=Xác nhận
+BillShortStatusStarted=Bắt đầu
+BillShortStatusNotPaid=Không trả tiền
+BillShortStatusClosedUnpaid=Đóng
+BillShortStatusClosedPaidPartially=Trả tiền (một phần)
+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.
+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
+ErrorCantCancelIfReplacementInvoiceNotValidated=Lỗi, không thể hủy bỏ một hóa đơn đã được thay thế bằng hóa đơn khác mà vẫn còn trong tình trạng dự thảo
+BillFrom=Từ
+BillTo=Để
+ActionsOnBill=Hoạt động trên hoá đơn
+NewBill=Hóa đơn mới
+LastBills=Hoá đơn cuối %s
+LastCustomersBills=Cuối% của hoá đơn cho khách hàng
+LastSuppliersBills=Cuối%s nhà cung cấp hoá đơn
+AllBills=Tất cả hóa đơn
+OtherBills=Hoá đơn khác
+DraftBills=Dự thảo hoá đơn
+CustomersDraftInvoices=Khách hàng soạn thảo hoá đơn
+SuppliersDraftInvoices=Nhà cung cấp dự thảo hoá đơn
+Unpaid=Chưa thanh toán
+ConfirmDeleteBill=Bạn Bạn có chắc chắn muốn xóa hóa đơn này?
+ConfirmValidateBill=Bạn có chắc chắn bạn muốn xác nhận hóa đơn này với tham chiếu <b>%s</b> ?
+ConfirmUnvalidateBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn <b>%s</b> để 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 <b>%s</b> đế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 <b>%s</b> ?
+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 <b>%s</b> đến tình trạng thanh toán?
+ConfirmClassifyPaidPartiallyQuestion=Hoá đơn này chưa được thanh toán hoàn toàn. Lý do để bạn có thể đóng hóa đơn này là gì?
+ConfirmClassifyPaidPartiallyReasonAvoir=Còn lại chưa thanh toán <b>(%s %s)</b> 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 <b>(%s %s)</b> 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 <b>(%s %s)</b> 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ừ»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số nước, sự lựa chọn này có thể là có thể chỉ khi hóa đơn của bạn có đúng ý.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp với
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Một <b>khách hàng xấu</b> 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: <br> - 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 <br> - Số tiền đòi quá quan trọng bởi vì giảm giá bị lãng quên <br> 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 <b>%s</b> %s ?
+ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này cho <b>%s</b> %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
+NumberOfBills=Nb hoá đơn
+NumberOfBillsByMonth=Nb hoá đơn theo tháng
+AmountOfBills=Số tiền của hóa đơn
+AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (sau thuế)
+ShowSocialContribution=Hiển thị đóng góp xã hội
+ShowBill=Hiện hóa đơn
+ShowInvoice=Hiện hóa đơn
+ShowInvoiceReplace=Hiển thị thay thế hóa đơn
+ShowInvoiceAvoir=Xem tin ghi nợ
+ShowInvoiceDeposit=Hiện tiền gửi hóa đơn
+ShowPayment=Hiện thanh toán
+File=Tập tin
+AlreadyPaid=Đã thanh toán
+AlreadyPaidBack=Đã thanh toán lại
+AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú ghi nợ và tiền gửi)
+Abandoned=Bị bỏ rơi
+RemainderToPay=Còn lại chưa thanh toán
+RemainderToTake=Số tiền còn lại để mất
+RemainderToPayBack=Số tiền còn lại để trả lại
+Rest=Cấp phát
+AmountExpected=Số tiền tuyên bố
+ExcessReceived=Dư thừa đã nhận
+EscompteOffered=Giảm giá cung cấp (thanh toán trước hạn)
+SendBillRef=Trình hóa đơn%s
+SendReminderBillRef=Trình hóa đơn%s (nhắc nhở)
+StandingOrders=Đứng đơn đặt hàng
+StandingOrder=Lệnh chuyển tiền định
+NoDraftBills=Không có dự thảo hoá đơn
+NoOtherDraftBills=Không có dự thảo hoá đơn khác
+NoDraftInvoices=Không có dự thảo hoá đơn
+RefBill=Ref hóa đơn
+ToBill=Vào hóa đơn
+RemainderToBill=Còn lại vào hóa đơn
+SendBillByMail=Gửi hóa đơn qua email
+SendReminderBillByMail=Gửi lời nhắc nhở bằng email
+RelatedCommercialProposals=Các đề xuất liên quan đến thương mại
+MenuToValid=Để hợp lệ
+DateMaxPayment=Thanh toán do trước
+DateEcheance=Giới hạn thời hạn
+DateInvoice=Ngày hóa đơn
+NoInvoice=Không có hoá đơn
+ClassifyBill=Phân loại hóa đơn
+SupplierBillsToPay=Nhà cung cấp hoá đơn thanh toán
+CustomerBillsUnpaid=Hóa đơn khách hàng chưa thanh toán
+DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+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=Hóa đơn mẫu
+RepeatableInvoices=Hoá đơn mẫu
+Repeatable=Template
+Repeatables=Templates
+ChangeIntoRepeatableInvoice=Chuyển đổi thành mẫu hóa đơn
+CreateRepeatableInvoice=Tạo mẫu hóa đơn
+CreateFromRepeatableInvoice=Tạo ra từ mẫu hóa đơn
+CustomersInvoicesAndInvoiceLines=Hoá đơn của khách hàng và dòng hóa đơn của
+CustomersInvoicesAndPayments=Hoá đơn và các khoản thanh toán của khách hàng
+ExportDataset_invoice_1=Hóa đơn khách hàng danh sách và đường hóa đơn của
+ExportDataset_invoice_2=Hoá đơn và các khoản thanh toán của khách hàng
 ProformaBill=Proforma Bill:
-Reduction=Reduction
+Reduction=Giảm
 ReductionShort=Reduc.
-Reductions=Reductions
+Reductions=Giảm
 ReductionsShort=Reduc.
-Discount=Discount
-Discounts=Discounts
-AddDiscount=Create discount
-AddRelativeDiscount=Create relative discount
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=Create absolute discount
-EditGlobalDiscounts=Edit absolute discounts
-AddCreditNote=Create credit note
-ShowDiscount=Show discount
-ShowReduc=Show the deduction
-RelativeDiscount=Relative discount
-GlobalDiscount=Global discount
-CreditNote=Credit note
-CreditNotes=Credit notes
-Deposit=Deposit
-Deposits=Deposits
-DiscountFromCreditNote=Discount from credit note %s
-DiscountFromDeposit=Payments from deposit invoice %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
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
-NoteReason=Note/Reason
-ReasonDiscount=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts still remaining
-DiscountAlreadyCounted=Discounts already counted
-BillAddress=Bill address
-HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social contribution id
-PaymentId=Payment id
-InvoiceId=Invoice id
-InvoiceRef=Invoice ref.
-InvoiceDateCreation=Invoice creation date
-InvoiceStatus=Invoice status
-InvoiceNote=Invoice note
-InvoicePaid=Invoice paid
-PaymentNumber=Payment number
-RemoveDiscount=Remove discount
-WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
-InvoiceNotChecked=No invoice selected
-CloneInvoice=Clone invoice
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b> ?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
-NbOfPayments=Nb of payments
-SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into 2 lower discounts ?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
-RelatedBill=Related invoice
-RelatedBills=Related invoices
+Discount=Giảm giá
+Discounts=Giảm giá
+AddDiscount=Tạo giảm giá
+AddRelativeDiscount=Tạo giảm giá tương đối
+EditRelativeDiscount=Chỉnh sửa giảm giá tương đối
+AddGlobalDiscount=Tạo giảm tuyệt đối
+EditGlobalDiscounts=Chỉnh sửa giảm giá tuyệt đối
+AddCreditNote=Tạo ghi chú ghi nợ
+ShowDiscount=Hiện giảm giá
+ShowReduc=Các khấu trừ
+RelativeDiscount=Giảm tương đối
+GlobalDiscount=Giảm giá toàn cầu
+CreditNote=Ghi nợ
+CreditNotes=Ghi nợ
+Deposit=Tiền đặt cọc
+Deposits=Tiền gửi
+DiscountFromCreditNote=Giảm giá từ giấy báo %s
+DiscountFromDeposit=Thanh toán từ hóa đơn tiền gửi %s
+AbsoluteDiscountUse=Đây là loại ghi nợ có thể được sử dụng trên hóa đơn trước khi xác nhận nó
+CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng vị vua này ghi nợ
+NewGlobalDiscount=Giảm giá mới tuyệt đối
+NewRelativeDiscount=Giảm giá mới tương đối
+NoteReason=Lưu ý / Lý do
+ReasonDiscount=Lý do
+DiscountOfferedBy=Do
+DiscountStillRemaining=Giảm giá vẫn còn lại
+DiscountAlreadyCounted=Giảm giá đã tính
+BillAddress=Địa chỉ hóa đơn
+HelpEscompte=Giảm giá này là giảm giá dành cho các khách hàng thanh toán bởi vì nó đã được thực hiện trước thời hạn.
+HelpAbandonBadCustomer=Số tiền này đã bị bỏ rơi (khách hàng cho là một khách hàng xấu) và được coi là một ngoại lệ lỏng lẻo.
+HelpAbandonOther=Số tiền này đã bị bỏ rơi vì đó là một lỗi (khách hàng sai hoặc hóa đơn thay thế bằng một ví dụ khác)
+IdSocialContribution=Xã hội đóng góp id
+PaymentId=Id thanh toán
+InvoiceId=Id hóa đơn
+InvoiceRef=Ref hóa đơn.
+InvoiceDateCreation=Ngày tạo hóa đơn
+InvoiceStatus=Tình trạng hóa đơn
+InvoiceNote=Lưu ý hóa đơn
+InvoicePaid=Hoá đơn thanh toán
+PaymentNumber=Số thanh toán
+RemoveDiscount=Hủy bỏ giảm giá
+WatermarkOnDraftBill=Watermark về dự thảo hoá đơn (không có gì nếu trống)
+InvoiceNotChecked=Không có hoá đơn được lựa chọn
+CloneInvoice=Hóa đơn sao chép
+ConfirmCloneInvoice=Bạn có chắc chắn bạn muốn nhân bản hóa đơn này <b>%s</b> ?
+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 <b>%s</b> %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?
+RelatedBill=Hóa đơn liên quan
+RelatedBills=Hoá đơn liên quan
+LatestRelatedBill=Tất cả các hóa đơn
+WarningBillExist=Cảnh báo, một hoặc nhiều hóa đơn đã tồn tại
 
 # PaymentConditions
-PaymentConditionShortRECEP=Immediate
-PaymentConditionRECEP=Immediate
-PaymentConditionShort30D=30 days
-PaymentCondition30D=30 days
-PaymentConditionShort30DENDMONTH=30 days end of month
-PaymentCondition30DENDMONTH=30 days end of month
-PaymentConditionShort60D=60 days
-PaymentCondition60D=60 days
-PaymentConditionShort60DENDMONTH=60 days end of month
-PaymentCondition60DENDMONTH=60 days end of month
-PaymentConditionShortPT_DELIVERY=Delivery
-PaymentConditionPT_DELIVERY=On delivery
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortRECEP=Ngay lập tức
+PaymentConditionRECEP=Ngay lập tức
+PaymentConditionShort30D=30 ngày
+PaymentCondition30D=30 ngày
+PaymentConditionShort30DENDMONTH=30 ngày cuối tháng
+PaymentCondition30DENDMONTH=30 ngày cuối tháng
+PaymentConditionShort60D=60 ngày
+PaymentCondition60D=60 ngày
+PaymentConditionShort60DENDMONTH=60 ngày cuối tháng
+PaymentCondition60DENDMONTH=60 ngày cuối tháng
+PaymentConditionShortPT_DELIVERY=Giao hàng tận nơi
+PaymentConditionPT_DELIVERY=Ngày giao hàng
+PaymentConditionShortPT_ORDER=Theo lệnh
+PaymentConditionPT_ORDER=Theo lệnh
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
+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
-PaymentTypeVIR=Bank deposit
-PaymentTypeShortVIR=Bank deposit
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Check
-PaymentTypeShortCHQ=Check
+PaymentTypeVIR=Tiền gửi ngân hàng
+PaymentTypeShortVIR=Tiền gửi ngân hàng
+PaymentTypePRE=Để Ngân hàng
+PaymentTypeShortPRE=Để Ngân hàng
+PaymentTypeLIQ=Tiền
+PaymentTypeShortLIQ=Tiền
+PaymentTypeCB=Thẻ ghi nợ
+PaymentTypeShortCB=Thẻ ghi nợ
+PaymentTypeCHQ=Kiểm tra
+PaymentTypeShortCHQ=Kiểm tra
 PaymentTypeTIP=TIP
 PaymentTypeShortTIP=TIP
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
-PaymentTypeTRA=Bill payment
+PaymentTypeVAD=Thanh toán trực tuyến
+PaymentTypeShortVAD=Thanh toán trực tuyến
+PaymentTypeTRA=Thanh toán hóa đơn
 PaymentTypeShortTRA=Bill
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Desk code
-BankAccountNumber=Account number
-BankAccountNumberKey=Key
+BankDetails=Chi tiết ngân hàng
+BankCode=Mã ngân hàng
+DeskCode=Đang bàn
+BankAccountNumber=Số tài khoản
+BankAccountNumberKey=Chính
 Residence=Domiciliation
-IBANNumber=IBAN number
+IBANNumber=Số IBAN
 IBAN=IBAN
-BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT number
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeMaker=Check transmitter
-ChequeBank=Bank of Check
-NetToBePaid=Net to be paid
-PhoneNumber=Tel
-FullPhoneNumber=Telephone
+BIC=BIC / SWIFT
+BICNumber=BIC / SWIFT số
+ExtraInfos=Infos thêm
+RegulatedOn=Quy định về
+ChequeNumber=Kiểm tra N °
+ChequeOrTransferNumber=Kiểm tra / Chuyển N °
+ChequeMaker=Kiểm tra máy phát
+ChequeBank=Ngân hàng Kiểm tra
+NetToBePaid=Net để được thanh toán
+PhoneNumber=Điện thoại
+FullPhoneNumber=Điện thoại
 TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-IntracommunityVATNumber=Intracommunity number of VAT
-PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to
-PaymentByChequeOrderedToShort=Check payment (including tax) are payable to
-SendTo=sent to
-PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
-LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until the complete cashing of
-LawApplicationPart4=their price.
-LimitedLiabilityCompanyCapital=SARL with Capital of
-UseLine=Apply
-UseDiscount=Use discount
-UseCredit=Use credit
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Checks deposits
-MenuCheques=Checks
-MenuChequesReceipts=Checks receipts
-NewChequeDeposit=New deposit
-ChequesReceipts=Checks receipts
-ChequesArea=Checks deposits area
-ChequeDeposits=Checks deposits
-Cheques=Checks
-CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
-ShowUnpaidAll=Show all unpaid invoices
-ShowUnpaidLateOnly=Show late unpaid invoices only
-PaymentInvoiceRef=Payment invoice %s
-ValidateInvoice=Validate invoice
-Cash=Cash
-Reported=Delayed
-DisabledBecausePayments=Not possible since there are some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
-ExpectedToPay=Expected payment
-PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard or replacement invoices entirely paid.
-ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-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
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
-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
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes 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
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PrettyLittleSentence=Chấp nhận tiền thanh toán bằng séc do ban hành trong tên của tôi là một thành viên của một hiệp hội kế toán được chấp thuận của Cục Quản lý tài chính.
+IntracommunityVATNumber=Intracommunity số thuế GTGT
+PaymentByChequeOrderedTo=Kiểm tra thanh toán (bao gồm thuế) được trả cho%s gửi đến
+PaymentByChequeOrderedToShort=Kiểm tra thanh toán (bao gồm thuế) được trả cho
+SendTo=gửi đến
+PaymentByTransferOnThisBankAccount=Thanh toán bằng chuyển khoản vào tài khoản ngân hàng sau
+VATIsNotUsedForInvoice=* Không áp dụng thuế GTGT nghệ thuật-293B của CGI
+LawApplicationPart1=Bằng cách áp dụng pháp luật của 80,335 12/05/80
+LawApplicationPart2=hàng hóa là tài sản của
+LawApplicationPart3=người bán cho đến khi đổi tiền mặt hoàn toàn
+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 ghi nợ
+UseCreditNoteInInvoicePayment=Giảm số tiền thanh toán bằng ghi nợ này
+MenuChequeDeposits=Tiền gửi kiểm tra
+MenuCheques=Kiểm tra
+MenuChequesReceipts=Kiểm tra biên lai
+NewChequeDeposit=Huy động mới
+ChequesReceipts=Kiểm tra biên lai
+ChequesArea=Khu vực tiền gửi kiểm tra
+ChequeDeposits=Tiền gửi kiểm tra
+Cheques=Kiểm tra
+CreditNoteConvertedIntoDiscount=Ghi nợ này hoặc hóa đơn tiền gửi đã được chuyển đổi thành%s
+UsBillingContactAsIncoiveRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng thanh toán thay vì địa chỉ của bên thứ ba là người nhận hoá đơn
+ShowUnpaidAll=Hiển thị tất cả các hoá đơn chưa thanh toán
+ShowUnpaidLateOnly=Hiện hoá đơn chưa thanh toán cuối chỉ
+PaymentInvoiceRef=Thanh toán hóa đơn%s
+ValidateInvoice=Xác nhận hóa đơn
+Cash=Tiền
+Reported=Bị trì hoãn
+DisabledBecausePayments=Không thể vì có một số khoản thanh toán
+CantRemovePaymentWithOneInvoicePaid=Không thể loại bỏ thanh toán kể từ khi có ít nhất một hóa đơn thanh toán phân loại
+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ú 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
+ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa thanh toán
+NoteListOfYourUnpaidInvoices=Lưu ý: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn đang kết nối như là một đại diện bán hàng.
+RevenueStamp=Đóng dấu doanh thu
+YouMustCreateInvoiceFromThird=Tùy chọn này chỉ có sẵn khi tạo hóa đơn từ tab "khách hàng" của của bên thứ ba
+PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
+TerreNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0
+MarsNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn%,% syymm-nnnn cho hoá đơn thay thế,% syymm-nnnn cho các ghi chú ghi nợ và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm, mm là tháng và NNNN là một chuỗi không có phá vỡ và không trở về 0
+TerreNumRefModelError=Một dự luật bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này.
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
-TypeContact_facture_external_SHIPPING=Customer shipping contact
-TypeContact_facture_external_SERVICE=Customer service contact
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice
-TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
+TypeContact_facture_internal_SALESREPFOLL=Đại diện sau lên hóa đơn của khách hàng
+TypeContact_facture_external_BILLING=Hóa đơn của khách hàng liên lạc
+TypeContact_facture_external_SHIPPING=Vận chuyển khách hàng liên hệ
+TypeContact_facture_external_SERVICE=Liên hệ với dịch vụ khách hàng
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Đại diện theo dõi nhà cung cấp hóa đơn
+TypeContact_invoice_supplier_external_BILLING=Nhà cung cấp hóa đơn liên lạc
+TypeContact_invoice_supplier_external_SHIPPING=Nhà cung cấp vận chuyển liên lạc
+TypeContact_invoice_supplier_external_SERVICE=Nhà cung cấp dịch vụ liên lạc
diff --git a/htdocs/langs/vi_VN/bookmarks.lang b/htdocs/langs/vi_VN/bookmarks.lang
index 7acb946bb62..5c2449cfbdb 100644
--- a/htdocs/langs/vi_VN/bookmarks.lang
+++ b/htdocs/langs/vi_VN/bookmarks.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add this page to bookmarks
+AddThisPageToBookmarks=Thêm trang này vào bookmark
 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
+Bookmarks=Đánh dấu
+NewBookmark=Bookmark mới
+ShowBookmark=Hiện dấu
+OpenANewWindow=Mở cửa sổ mới
+ReplaceWindow=Thay thế cửa sổ hiện tại
+BookmarkTargetNewWindowShort=Cửa sổ mới
+BookmarkTargetReplaceWindowShort=Cửa sổ hiện tại
+BookmarkTitle=Bookmark tiêu đề
 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
+BehaviourOnClick=Hành vi khi một URL được nhấp
+CreateBookmark=Tạo dấu
+SetHereATitleForLink=Đặt tên cho bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Sử dụng một URL http bên ngoài hoặc một URL tương đối Dolibarr
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Chọn nếu một trang mở liên kết phải xuất hiện trên cửa sổ hiện tại hoặc mới
+BookmarksManagement=Quản lý bookmark
+ListOfBookmarks=Danh sách bookmark
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index e7e9da7dc1b..622461f3da6 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -1,91 +1,96 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Rss information
-BoxLastProducts=Last %s products/services
-BoxProductsAlertStock=Products in stock alert
-BoxLastProductsInContract=Last %s contracted products/services
-BoxLastSupplierBills=Last supplier's invoices
-BoxLastCustomerBills=Last customer's invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
-BoxLastProposals=Last commercial proposals
-BoxLastProspects=Last modified prospects
-BoxLastCustomers=Last modified customers
-BoxLastSuppliers=Last modified suppliers
-BoxLastCustomerOrders=Last customer orders
-BoxLastBooks=Last books
-BoxLastActions=Last actions
-BoxLastContracts=Last contracts
-BoxLastContacts=Last contacts/addresses
-BoxLastMembers=Last members
-BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
-BoxSalesTurnover=Sales turnover
-BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
-BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
-BoxTitleLastBooks=Last %s recorded books
-BoxTitleNbOfCustomers=Number of clients
-BoxTitleLastRssInfos=Last %s news from %s
-BoxTitleLastProducts=Last %s modified products/services
-BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Last %s modified customer orders
-BoxTitleLastSuppliers=Last %s recorded suppliers
-BoxTitleLastCustomers=Last %s recorded customers
-BoxTitleLastModifiedSuppliers=Last %s modified suppliers
-BoxTitleLastModifiedCustomers=Last %s modified customers
-BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects
-BoxTitleLastPropals=Last %s recorded proposals
-BoxTitleLastCustomerBills=Last %s customer's invoices
-BoxTitleLastSupplierBills=Last %s supplier's invoices
-BoxTitleLastProspects=Last %s recorded prospects
-BoxTitleLastModifiedProspects=Last %s modified prospects
-BoxTitleLastProductsInContract=Last %s products/services in a contract
-BoxTitleLastModifiedMembers=Last %s modified members
-BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices
-BoxTitleCurrentAccounts=Opened account's balances
-BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices
-BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
-BoxMyLastBookmarks=My last %s bookmarks
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Last %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Last %s actions to do
-BoxTitleLastContracts=Last %s contracts
-BoxTitleLastModifiedDonations=Last %s modified donations
-BoxTitleLastModifiedExpenses=Last %s modified expenses
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
-LastRefreshDate=Last refresh date
-NoRecordedBookmarks=No bookmarks defined.
-ClickToAdd=Click here to add.
-NoRecordedCustomers=No recorded customers
-NoRecordedContacts=No recorded contacts
-NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded customer's orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer's invoices
-NoUnpaidCustomerBills=No unpaid customer's invoices
-NoRecordedSupplierInvoices=No recorded supplier's invoices
-NoUnpaidSupplierBills=No unpaid supplier's invoices
-NoModifiedSupplierBills=No recorded supplier's invoices
-NoRecordedProducts=No recorded products/services
-NoRecordedProspects=No recorded prospects
-NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
-NoRecordedInterventions=No recorded interventions
-BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=%s latest supplier orders
-NoSupplierOrder=No recorded supplier order
-BoxCustomersInvoicesPerMonth=Customer invoices per month
-BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-BoxCustomersOrdersPerMonth=Customer orders per month
-BoxSuppliersOrdersPerMonth=Supplier orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No product under the low stock limit
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
+BoxLastRssInfos=Thông tin Rss
+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ụ
+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 đã 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
+BoxLastContacts=Địa chỉ liên lạc cuối cùng / địa chỉ
+BoxLastMembers=Thành viên cuối cùng
+BoxFicheInter=Can thiệp cuối cùng
+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
+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ụ
+BoxTitleProductsAlertStock=Sản phẩm trong kho cảnh báo
+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=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=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í đã 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
+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.
+NoRecordedCustomers=Không có khách hàng ghi nhận
+NoRecordedContacts=Không có địa chỉ liên lạc ghi
+NoActionsToDo=Không có hành động để làm
+NoRecordedOrders=Đơn đặt hàng không có khách hàng ghi nhận của
+NoRecordedProposals=Không có đề nghị ghi
+NoRecordedInvoices=Hoá đơn không có khách hàng ghi nhận của
+NoUnpaidCustomerBills=Không có hoá đơn chưa thanh toán của khách hàng
+NoRecordedSupplierInvoices=Không có nhà cung cấp hoá đơn ghi nhận của
+NoUnpaidSupplierBills=Không có hoá đơn chưa thanh toán của nhà cung cấp
+NoModifiedSupplierBills=Không có nhà cung cấp hoá đơn ghi nhận của
+NoRecordedProducts=Không ghi nhận sản phẩm / dịch vụ
+NoRecordedProspects=Không có triển vọng ghi
+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=Đơ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
+BoxCustomersOrdersPerMonth=Đơn đặt hàng của khách hàng mỗi tháng
+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
+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 d3dcfb68e64..fb5a7b99c2a 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -1,40 +1,40 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDesks=Point of sales
-CashDeskBank=Bank account
-CashDeskBankCash=Bank account (cash)
-CashDeskBankCB=Bank account (card)
-CashDeskBankCheque=Bank account (cheque)
-CashDeskWarehouse=Warehouse
-CashdeskShowServices=Selling services
-CashDeskProducts=Products
-CashDeskStock=Stock
-CashDeskOn=on
-CashDeskThirdParty=Third party
-CashdeskDashboard=Point of sale access
-ShoppingCart=Shopping cart
-NewSell=New sell
-BackOffice=Back office
-AddThisArticle=Add this article
-RestartSelling=Go back on sell
-SellFinished=Sell finished
-PrintTicket=Print ticket
-NoProductFound=No article found
-ProductFound=product found
-ProductsFound=products found
-NoArticle=No article
-Identification=Identification
-Article=Article
-Difference=Difference
-TotalTicket=Total ticket
-NoVAT=No VAT for this sale
-Change=Excess received
-CalTip=Click to view the calendar
-CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined<br>Change stock module setup, or choose a warehouse
-BankToPay=Charge Account
-ShowCompany=Show company
-ShowStock=Show warehouse
-DeleteArticle=Click to remove this article
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+CashDeskMenu=Điểm bán hàng
+CashDesk=Điểm bán hàng
+CashDesks=Điểm bán hàng
+CashDeskBank=Tài khoản ngân hàng
+CashDeskBankCash=Tài khoản ngân hàng (tiền mặt)
+CashDeskBankCB=Tài khoản ngân hàng (thẻ)
+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=Tồn kho
+CashDeskOn=trên
+CashDeskThirdParty=Bên thứ ba
+CashdeskDashboard=Điểm truy cập bán
+ShoppingCart=Giỏ hàng
+NewSell=Bán mới
+BackOffice=Trở lại văn phòng
+AddThisArticle=Thêm bài viết này
+RestartSelling=Quay trở lại trên bán
+SellFinished=Bán thành phẩm
+PrintTicket=In vé
+NoProductFound=Không có bài viết được tìm thấy
+ProductFound=sản phẩm tìm thấy
+ProductsFound=sản phẩm tìm thấy
+NoArticle=Không có bài viết
+Identification=Xác định
+Article=Điều
+Difference=Sự khác biệt
+TotalTicket=Tổng số vé
+NoVAT=Không có thuế GTGT đối với bán này
+Change=Dư thừa đã nhận
+CalTip=Nhấn vào đây để xem lịch
+CashDeskSetupStock=Bạn yêu cầu để giảm chứng khoán vào việc tạo hóa đơn nhưng kho cho điều này là không được xác định <br> Thay đổi thiết lập mô-đun chứng khoán, hoặc chọn một nhà kho
+BankToPay=Tài khoản phí
+ShowCompany=Hiện công ty
+ShowStock=Hiện kho
+DeleteArticle=Nhấn vào đây để gỡ bỏ bài viết này
+FilterRefOrLabelOrBC=Tìm kiếm (Ref / Label)
+UserNeedPermissionToEditStockToUsePos=Bạn yêu cầu để giảm chứng khoán vào việc tạo ra hóa đơn, vì vậy người dùng có sử dụng POS cần phải có sự cho phép để chỉnh sửa chứng khoán.
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 27c4fc44394..70049b18354 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -1,113 +1,112 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
-SubCats=Subcategories
-CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
-ValidateFields=Validate the fields
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
-ErrForgotField=You forgot to inform the fields
-ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
-NoneCategory=None
-NotCategorized=Without category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ReturnInProduct=Back to product/service card
-ReturnInSupplier=Back to supplier card
-ReturnInCompany=Back to customer/prospect card
-ContentsVisibleByAll=The contents will be visible by all
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
-CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
-ThisCategoryHasNoProduct=This category does not contain any product.
-ThisCategoryHasNoSupplier=This category does not contain any supplier.
-ThisCategoryHasNoCustomer=This category does not contain any customer.
-ThisCategoryHasNoMember=This category does not contain any member.
-ThisCategoryHasNoContact=This category does not contain any contact.
-AssignedToCustomer=Assigned to a customer
-AssignedToTheCustomer=Assigned to the customer
-InternalCategory=Internal category
-CategoryContents=Category contents
+Category=Danh mục
+Categories=Loại
+Rubrique=Danh mục
+Rubriques=Loại
+categories=loại
+TheCategorie=Các thể loại
+NoCategoryYet=Không có loại của loại hình này tạo ra
+In=Trong
+AddIn=Thêm vào
+modify=sửa đổi
+Classify=Phân loại
+CategoriesArea=Loại khu vực
+ProductsCategoriesArea=Khu vực sản phẩm / dịch vụ loại
+SuppliersCategoriesArea=Khu vực Nhà cung cấp loại
+CustomersCategoriesArea=Khu vực khách hàng mục
+ThirdPartyCategoriesArea=Khu vực bên thứ ba loại
+MembersCategoriesArea=Thành viên khu vực loại
+ContactsCategoriesArea=Khu vực Liên hệ loại
+MainCats=Loại chính
+SubCats=Tiểu thể loại
+CatStatistics=Thống kê
+CatList=Danh sách các loại
+AllCats=Tất cả thể loại
+ViewCat=Xem thể loại
+NewCat=Thêm thể loại
+NewCategory=Thể loại mới
+ModifCat=Sửa đổi thể loại
+CatCreated=Loại tạo
+CreateCat=Tạo ra thể loại
+CreateThisCat=Tạo ra thể loại này
+ValidateFields=Xác nhận các lĩnh vực
+NoSubCat=Không có tiểu thể loại.
+SubCatOf=Danh mục con
+FoundCats=Tìm thấy loại
+FoundCatsForName=Loại được tìm thấy cho tên:
+FoundSubCatsIn=Tiểu thể tìm thấy trong các loại
+ErrSameCatSelected=Bạn đã chọn cùng một loại nhiều lần
+ErrForgotCat=Bạn quên chọn thể loại
+ErrForgotField=Bạn quên thông báo cho các lĩnh vực
+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=<b>%s</b> đã đượ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.
+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
+CompanyIsInSuppliersCategories=Bên thứ ba này sở hữu để sau nhà cung cấp các loại
+MemberIsInCategories=Thành viên này sở hữu để các thành viên sau đây loại
+ContactIsInCategories=Liên hệ này sở hữu để liên lạc sau loại
+ProductHasNoCategory=Đây sản phẩm / dịch vụ không có trong bất kỳ loại
+SupplierHasNoCategory=Nhà cung cấp này không có trong bất kỳ loại
+CompanyHasNoCategory=Công ty này không có trong bất kỳ loại
+MemberHasNoCategory=Thành viên này không có trong bất kỳ loại
+ContactHasNoCategory=Liên hệ này không có trong bất kỳ loại
+ClassifyInCategory=Phân loại trong thể loại
+NoneCategory=Không
+NotCategorized=Nếu không có loại
+CategoryExistsAtSameLevel=Thể loại này đã tồn tại với ref này
+ReturnInProduct=Về sản phẩm / dịch vụ thẻ
+ReturnInSupplier=Về thẻ nhà cung cấp
+ReturnInCompany=Về khách hàng / thẻ tiềm năng
+ContentsVisibleByAll=Các nội dung sẽ được hiển thị tất cả
+ContentsVisibleByAllShort=Nội dung có thể nhìn thấy tất cả
+ContentsNotVisibleByAllShort=Nội dung không thể nhìn thấy bởi tất cả
+CategoriesTree=Loại cây
+DeleteCategory=Xóa thể loại
+ConfirmDeleteCategory=Bạn Bạn có chắc chắn muốn xóa thể loại này?
+RemoveFromCategory=Hủy bỏ liên kết với categorie
+RemoveFromCategoryConfirm=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?
+NoCategoriesDefined=Không có loại được xác định
+SuppliersCategoryShort=Loại nhà cung cấp
+CustomersCategoryShort=Loại khách hàng
+ProductsCategoryShort=Danh mục sản phẩm
+MembersCategoryShort=Loại thành viên
+SuppliersCategoriesShort=Nhà cung cấp các loại
+CustomersCategoriesShort=Khách hàng mục
+CustomersProspectsCategoriesShort=Custo. / Prosp. loại
+ProductsCategoriesShort=Danh mục sản phẩm
+MembersCategoriesShort=Thành viên loại
+ContactCategoriesShort=Liên hệ loại
+ThisCategoryHasNoProduct=Thể loại này không chứa bất kỳ sản phẩm.
+ThisCategoryHasNoSupplier=Thể loại này không chứa bất kỳ nhà cung cấp.
+ThisCategoryHasNoCustomer=Thể loại này không chứa bất kỳ khách hàng.
+ThisCategoryHasNoMember=Thể loại này không chứa bất kỳ thành viên.
+ThisCategoryHasNoContact=Thể loại này không chứa bất kỳ liên lạc.
+AssignedToCustomer=Giao cho một khách hàng
+AssignedToTheCustomer=Giao cho khách hàng
+InternalCategory=Loại nội bộ
+CategoryContents=Danh mục nội dung
 CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-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?
-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
+CatSupList=Danh sách các loại nhà cung cấp
+CatCusList=Danh sách khách hàng / loại khách hàng tiềm năng
+CatProdList=Danh sách sản phẩm loại
+CatMemberList=Danh sách thành viên loại
+CatContactList=Danh sách các hạng mục liên lạc và tiếp xúc
+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
+DeleteFromCat=Di chuyển từ mục
+DeletePicture=Ảnh xóa
+ConfirmDeletePicture=Xác nhận xoá hình ảnh?
+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=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 e7d2de76503..438fc7048a3 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -1,96 +1,96 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commercial
-CommercialArea=Commercial area
-CommercialCard=Commercial card
-CustomerArea=Customers area
-Customer=Customer
-Customers=Customers
-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
+Commercial=Thương mại
+CommercialArea=Khu vực thương mại
+CommercialCard=Thẻ thương mại
+CustomerArea=Khu vực khách hàng
+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 / 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=Are you sure you want to delete this event/task ?
-CardAction=Event card
-PercentDone=Percentage complete
-ActionOnCompany=Task about company
-ActionOnContact=Task about contact
-TaskRDV=Meetings
-TaskRDVWith=Meeting with %s
-ShowTask=Show task
-ShowAction=Show event
-ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative
-SalesRepresentative=Sales representative
-SalesRepresentatives=Sales representatives
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-CommercialInterlocutor=Commercial interlocutor
-ErrorWrongCode=Wrong code
-NoSalesRepresentativeAffected=No particular sales representative assigned
-ShowCustomer=Show customer
-ShowProspect=Show prospect
-ListOfProspects=List of prospects
-ListOfCustomers=List of customers
-LastDoneTasks=Last %s completed tasks
-LastRecordedTasks=Last recorded tasks
-LastActionsToDo=Last %s oldest actions not completed
-DoneAndToDoActionsFor=Completed and To do events for %s
-DoneAndToDoActions=Completed and To do events
-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
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
-StatusActionDone=Complete
-MyActionsAsked=Events I have recorded
-MyActionsToDo=Events I have to do
-MyActionsDone=Events assigned to me
-StatusActionInProcess=In process
-TasksHistoryForThisContact=Events for this contact
-LastProspectDoNotContact=Do not contact
-LastProspectNeverContacted=Never contacted
-LastProspectToContact=To contact
-LastProspectContactInProcess=Contact in process
-LastProspectContactDone=Contact done
-DateActionPlanned=Date event planned for
-DateActionDone=Date event done
-ActionAskedBy=Event reported by
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
-ActionUserAsk=Reported by
-ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
-ActionAC_TEL=Phone call
-ActionAC_FAX=Send fax
-ActionAC_PROP=Send proposal by mail
-ActionAC_EMAIL=Send Email
-ActionAC_RDV=Meetings
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Send customer invoice by mail
-ActionAC_REL=Send customer invoice by mail (reminder)
-ActionAC_CLO=Close
-ActionAC_EMAILING=Send mass email
-ActionAC_COM=Send customer order by mail
-ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
-ActionAC_OTH=Other
-ActionAC_OTH_AUTO=Other (automatically inserted events)
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-Stats=Sales statistics
-CAOrder=Sales volume (validated orders)
-FromTo=from %s to %s
-MargeOrder=Margins (validated orders)
-RecapAnnee=Summary of the year
-NoData=There is no data
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-SearchPropal=Search a commercial proposal
-CommercialDashboard=Commercial summary
+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=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 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
+SalesRepresentative=Đại diện bán hàng
+SalesRepresentatives=Đại diện bán hàng
+SalesRepresentativeFollowUp=Đại diện bán hàng (theo dõi)
+SalesRepresentativeSignature=Đại diện bán hàng (chữ ký)
+CommercialInterlocutor=Đối thoại thương mại
+ErrorWrongCode=Sai mã
+NoSalesRepresentativeAffected=Không có đại diện bán hàng đặc biệt được chỉ định
+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 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
+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 đơn hàng %s
+StatusNotApplicable=Không áp dụng
+StatusActionToDo=Để làm
+StatusActionDone=Hoàn thành
+MyActionsAsked=Tôi đã ghi lại sự kiện
+MyActionsToDo=Sự kiện tôi phải làm
+MyActionsDone=Sự kiện được gán cho tôi
+StatusActionInProcess=Trong quá trình
+TasksHistoryForThisContact=Sự kiện cho liên hệ này
+LastProspectDoNotContact=Không liên hệ
+LastProspectNeverContacted=Không bao giờ liên lạc
+LastProspectToContact=Để liên hệ
+LastProspectContactInProcess=Liên hệ trong quá trình
+LastProspectContactDone=Liên hệ với thực hiện
+DateActionPlanned=Ngày lên kế hoạch cho sự kiện
+DateActionDone=Ngày thực hiện sự kiện
+ActionAskedBy=Tổ chức sự kiện báo cáo của
+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 <b>'ngày thực hiện</b> "được làm đầy, hành động được bắt đầu (hoặc hoàn thành), do đó lĩnh vực' <b>Trạng thái</b> 'không thể là 0 %%.
+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ư
+ActionAC_RDV=Các cuộc họp
+ActionAC_INT=Can thiệp trên trang web
+ActionAC_FAC=Gửi hóa đơn của khách hàng qua đường bưu điện
+ActionAC_REL=Gửi hóa đơn của khách hàng qua đường bưu điện (nhắc nhở)
+ActionAC_CLO=Đóng
+ActionAC_EMAILING=Gửi email hàng loạt
+ActionAC_COM=Gửi đơn đặt hàng qua bưu điện
+ActionAC_SHIP=Gửi vận chuyển qua đường bưu điện
+ActionAC_SUP_ORD=Gửi đơn đặt hàng nhà cung cấp qua đường bưu điện
+ActionAC_SUP_INV=Gửi tin nhà cung cấp hóa đơn qua đường bưu điện
+ActionAC_OTH=Khác
+ActionAC_OTH_AUTO=Khác (sự kiện tự động chèn vào)
+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
+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
+StatusProsp=Tình trạng khách hàng tiềm năng
+DraftPropals=Dự thảo đề xuất thương mại
+SearchPropal=Tìm kiếm một đề nghị thương mại
+CommercialDashboard=Tóm tắt thương mại
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index aa679d9da56..c63934a0536 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -1,131 +1,131 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
-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
-MenuNewPrivateIndividual=New private individual
-MenuSocGroup=Groups
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-NewSocGroup=New company group
-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
-ThirdPartyContact=Third party contact/address
-StatusContactValidated=Status of contact/address
-Company=Company
-CompanyName=Company name
-Companies=Companies
-CountryIsInEEC=Country is inside European Economic Community
-ThirdPartyName=Third party name
-ThirdParty=Third party
-ThirdParties=Third parties
-ThirdPartyAll=Third parties (all)
-ThirdPartyProspects=Prospects
-ThirdPartyProspectsStats=Prospects
-ThirdPartyCustomers=Customers
-ThirdPartyCustomersStats=Customers
-ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
-ThirdPartyType=Third party type
-Company/Fundation=Company/Foundation
-Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
-ParentCompany=Parent company
-Subsidiary=Subsidiary
-Subsidiaries=Subsidiaries
-NoSubsidiary=No subsidiary
-ReportByCustomers=Report by customers
-ReportByQuarter=Report by rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
-Name=Name
-Lastname=Last name
-Firstname=First name
-PostOrFunction=Post/Function
-UserTitle=Title
-Surname=Surname/Pseudo
-Address=Address
-State=State/Province
-Region=Region
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Phone
+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
+ConfirmDeleteCompany=Bạn có chắc chắn muốn xóa công ty này và tất cả các thông tin di truyền?
+DeleteContact=Xóa một số liên lạc / địa chỉ
+ConfirmDeleteContact=Bạn có chắc chắn muốn xóa liên hệ này và tất cả các thông tin di truyền?
+MenuNewThirdParty=Bên thứ ba mới
+MenuNewCompany=Công ty mới
+MenuNewCustomer=Khách hàng mới
+MenuNewProspect=Triển vọng mới
+MenuNewSupplier=Nhà cung cấp mới
+MenuNewPrivateIndividual=Cá nhân riêng tư mới
+MenuSocGroup=Nhóm
+NewCompany=Công ty mới (khách hàng tiềm năng, khách hàng, nhà cung cấp)
+NewThirdParty=Bên thứ ba mới (khách hàng tiềm năng, khách hàng, nhà cung cấp)
+NewSocGroup=Nhóm công ty mới
+NewPrivateIndividual=Cá nhân riêng tư mới (khách hàng tiềm năng, khách hàng, nhà cung cấp)
+CreateDolibarrThirdPartySupplier=Tạo một bên thứ ba (nhà cung cấp)
+ProspectionArea=Khu vực thăm dò
+SocGroup=Nhóm các công ty
+IdThirdParty=Id của bên thứ ba
+IdCompany=Mã công ty
+IdContact=Id Liên hệ
+Contacts=Liên hệ / địa chỉ
+ThirdPartyContacts=Địa chỉ liên lạc của bên thứ ba
+ThirdPartyContact=Bên thứ ba liên lạc / địa chỉ
+StatusContactValidated=Tình hình liên lạc / địa chỉ
+Company=Công ty
+CompanyName=Tên công ty
+Companies=Các công ty
+CountryIsInEEC=Đất nước là bên trong Cộng đồng Kinh tế châu Âu
+ThirdPartyName=Tên của bên thứ ba
+ThirdParty=Bên thứ ba
+ThirdParties=Các bên thứ ba
+ThirdPartyAll=Các bên thứ ba (tất cả)
+ThirdPartyProspects=Triển vọng
+ThirdPartyProspectsStats=Triển vọng
+ThirdPartyCustomers=Khách hàng
+ThirdPartyCustomersStats=Khách hàng
+ThirdPartyCustomersWithIdProf12=Khách hàng có%s hay%s
+ThirdPartySuppliers=Nhà cung cấp
+ThirdPartyType=Loại bên thứ ba
+Company/Fundation=Công ty / cơ sở
+Individual=Cá thể
+ToCreateContactWithSameName=Sẽ tự động tạo ra một tiếp xúc vật lý với cùng một thông tin
+ParentCompany=Công ty mẹ
+Subsidiary=Công ty con
+Subsidiaries=Các công ty con
+NoSubsidiary=Không có công ty con
+ReportByCustomers=Báo cáo của khách hàng
+ReportByQuarter=Báo cáo của tỷ lệ
+CivilityCode=Mã văn minh
+RegisteredOffice=Trụ sở đăng ký
+Name=Tên
+Lastname=Họ
+Firstname=Tên đầu tiên
+PostOrFunction=Bài / Chức năng
+UserTitle=Tiêu đề
+Surname=Họ / Pseudo
+Address=Địa chỉ
+State=Tiểu bang / tỉnh
+Region=Khu vực
+Country=Đất nước
+CountryCode=Mã quốc gia
+CountryId=Country ID
+Phone=Điện thoại
 Skype=Skype
-Call=Call
-Chat=Chat
-PhonePro=Prof. phone
-PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+Call=Gọi
+Chat=Trò chuyện
+PhonePro=Giáo sư điện thoại
+PhonePerso=Pers. điện thoại
+PhoneMobile=Điện thoại di động
+No_Email=Không gửi hàng loạt thư điện tử
 Fax=Fax
 Zip=Zip Code
-Town=City
+Town=Thành phố
 Web=Web
-Poste= Position
-DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
-NoEmailDefined=There is no email defined
+Poste= Chức vụ
+DefaultLang=Ngôn ngữ mặc định
+VATIsUsed=Thuế GTGT được sử dụng
+VATIsNotUsed=Thuế GTGT không được sử dụng
+CopyAddressFromSoc=Điền địa chỉ với địa chỉ của bên thứ ba
+NoEmailDefined=Không có email được xác định
 ##### Local Taxes #####
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
+LocalTax1IsUsedES= RE được sử dụng
+LocalTax1IsNotUsedES= RE không được sử dụng
+LocalTax2IsUsedES= IRPF được sử dụng
+LocalTax2IsNotUsedES= IRPF không được sử dụng
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=Loại RE
+TypeLocaltax2ES=IRPF Loại
+TypeES=Loại
 ThirdPartyEMail=%s
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
-Gencod=Bar code
+WrongCustomerCode=Mã khách hàng không hợp lệ
+WrongSupplierCode=Mã nhà cung cấp không hợp lệ
+CustomerCodeModel=Mô hình mã khách hàng
+SupplierCodeModel=Nhà cung cấp mô hình mã
+Gencod=Mã vạch
 ##### Professional ID #####
-ProfId1Short=Prof. id 1
-ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
-ProfId4Short=Prof. id 4
-ProfId5Short=Prof. id 5
-ProfId6Short=Prof. id 5
-ProfId1=Professional ID 1
-ProfId2=Professional ID 2
-ProfId3=Professional ID 3
-ProfId4=Professional ID 4
-ProfId5=Professional ID 5
-ProfId6=Professional ID 6
-ProfId1AR=Prof Id 1 (CUIT/CUIL)
-ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId1Short=Giáo sư id 1
+ProfId2Short=Giáo sư id 2
+ProfId3Short=Giáo sư id 3
+ProfId4Short=Giáo sư id 4
+ProfId5Short=Giáo sư id 5
+ProfId6Short=Giáo sư id 5
+ProfId1=ID chuyên nghiệp 1
+ProfId2=ID chuyên nghiệp 2
+ProfId3=ID chuyên nghiệp 3
+ProfId4=ID chuyên nghiệp 4
+ProfId5=ID chuyên nghiệp 5
+ProfId6=ID chuyên nghiệp 6
+ProfId1AR=Giáo sư Id 1 (CUIT / Cuil)
+ProfId2AR=Giáo sư Id 2 (Revenu xử tàn bạo)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=Giáo sư Id 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=Giáo sư Id 1 (số chuyên nghiệp)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
@@ -133,47 +133,47 @@ ProfId5BE=-
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
+ProfId3BR=IM (Inscricao thành phố)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId3CH=Giáo sư Id 1 (số liên bang)
+ProfId4CH=Giáo sư Id 2 (Ghi lại số thương mại)
 ProfId5CH=-
 ProfId6CH=-
-ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId1CL=Giáo sư Id 1 (RUT)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId1CO=Giáo sư Id 1 (RUT)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId1DE=Giáo sư Id 1 (USt.-IdNr)
+ProfId2DE=Giáo sư Id 2 (USt.-Nr)
+ProfId3DE=Giáo sư Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
-ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
-ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
+ProfId1ES=Giáo sư Id 1 (CIF / NIF)
+ProfId2ES=Giáo sư Id 2 (số an sinh xã hội)
+ProfId3ES=Giáo sư Id 3 (CNAE)
+ProfId4ES=Giáo sư Id 4 (số Collegiate)
 ProfId5ES=-
 ProfId6ES=-
-ProfId1FR=Prof Id 1 (SIREN)
-ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
+ProfId1FR=Giáo sư Id 1 (SIREN)
+ProfId2FR=Giáo sư Id 2 (SIRET)
+ProfId3FR=Giáo sư Id 3 (NAF, APE cũ)
+ProfId4FR=Giáo sư Id 4 (RCS / RM)
 ProfId5FR=-
 ProfId6FR=-
-ProfId1GB=Registration Number
+ProfId1GB=Số đăng ký
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
@@ -185,34 +185,34 @@ ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Prof Id 1 (TIN)
-ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
-ProfId4IN=Prof Id 4
-ProfId5IN=Prof Id 5
+ProfId1IN=Giáo sư Id 1 (TIN)
+ProfId2IN=Giáo sư Id 2 (PAN)
+ProfId3IN=Giáo sư Id 3 (thuế SRVC)
+ProfId4IN=Giáo sư Id 4
+ProfId5IN=Giáo sư Id 5
 ProfId6IN=-
-ProfId1MA=Id prof. 1 (R.C.)
+ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
-ProfId3MA=Id prof. 3 (I.F.)
-ProfId4MA=Id prof. 4 (C.N.S.S.)
+ProfId3MA=Id prof. 3 (IF)
+ProfId4MA=Id prof. 4 (CNSS)
 ProfId5MA=-
 ProfId6MA=-
-ProfId1MX=Prof Id 1 (R.F.C).
-ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId1MX=Giáo sư Id 1 (RFC).
+ProfId2MX=Giáo sư Id 2 (R..P. IMSS)
+ProfId3MX=Giáo sư Id 3 (Profesional điều lệ)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=KVK Nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
 ProfId5NL=-
 ProfId6NL=-
-ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
-ProfId3PT=Prof Id 3 (Commercial Record number)
-ProfId4PT=Prof Id 4 (Conservatory)
+ProfId1PT=Giáo sư Id 1 (NIPC)
+ProfId2PT=Giáo sư Id 2 (số an sinh xã hội)
+ProfId3PT=Giáo sư Id 3 (Ghi lại số thương mại)
+ProfId4PT=Giáo sư Id 4 (viện)
 ProfId5PT=-
 ProfId6PT=-
 ProfId1SN=RC
@@ -221,192 +221,194 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane code)
-ProfId4TN=Prof Id 4 (BAN)
+ProfId1TN=Giáo sư Id 1 (RC)
+ProfId2TN=Giáo sư Id 2 (matricule tài chính)
+ProfId3TN=Giáo sư Id 3 (mã Douane)
+ProfId4TN=Giáo sư Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1RU=Prof Id 1 (OGRN)
-ProfId2RU=Prof Id 2 (INN)
-ProfId3RU=Prof Id 3 (KPP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=Giáo sư Id 1 (OGRN)
+ProfId2RU=Giáo sư Id 2 (INN)
+ProfId3RU=Giáo sư Id 3 (KPP)
+ProfId4RU=Giáo sư Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-VATIntra=VAT number
-VATIntraShort=VAT number
-VATIntraVeryShort=VAT
-VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
-ProspectCustomer=Prospect / Customer
-Prospect=Prospect
-CustomerCard=Customer Card
-Customer=Customer
-CustomerDiscount=Customer Discount
-CustomerRelativeDiscount=Relative customer discount
-CustomerAbsoluteDiscount=Absolute customer discount
-CustomerRelativeDiscountShort=Relative discount
-CustomerAbsoluteDiscountShort=Absolute discount
-CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
-CompanyHasNoRelativeDiscount=This customer has no relative discount by default
-CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for <b>%s</b> %s
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
-DefaultDiscount=Default discount
-AvailableGlobalDiscounts=Absolute discounts available
-DiscountNone=None
-Supplier=Supplier
-CompanyList=Company's list
-AddContact=Add contact
-AddContactAddress=Add contact/address
-EditContact=Edit contact
-EditContactAddress=Edit contact/address
-Contact=Contact
-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
-DeleteACompany=Delete a company
-PersonalInformations=Personal data
-AccountancyCode=Accountancy code
-CustomerCode=Customer code
-SupplierCode=Supplier code
-CustomerAccount=Customer account
-SupplierAccount=Supplier account
-CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
-RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
-ValidityControledByModule=Validity controled by module
-ThisIsModuleRules=This is rules for this module
-LastProspect=Last
-ProspectToContact=Prospect to contact
-CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contacts/addresses
-ListOfContactsAddresses=List of contacts/adresses
-ListOfProspectsContacts=List of prospect contacts
-ListOfCustomersContacts=List of customer contacts
-ListOfSuppliersContacts=List of supplier contacts
-ListOfCompanies=List of companies
-ListOfThirdParties=List of third parties
-ShowCompany=Show company
-ShowContact=Show contact
-ContactsAllShort=All (No filter)
-ContactType=Contact type
-ContactForOrders=Order's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New contact/address
-LastContacts=Last contacts
-MyContacts=My contacts
-Phones=Phones
-Capital=Capital
-CapitalOf=Capital of %s
-EditCompany=Edit company
-EditDeliveryAddress=Edit delivery address
-ThisUserIsNot=This user is not a prospect, customer nor supplier
-VATIntraCheck=Check
-VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
+VATIntra=Số thuế GTGT
+VATIntraShort=Số thuế GTGT
+VATIntraVeryShort=Thuế GTGT
+VATIntraSyntaxIsValid=Cú pháp là hợp lệ
+VATIntraValueIsValid=Giá trị là hợp lệ
+ProspectCustomer=Khách hàng tiềm năng / khách hàng
+Prospect=Triển vọng
+CustomerCard=Thẻ khách hàng
+Customer=Khách hàng
+CustomerDiscount=Giảm giá khách hàng
+CustomerRelativeDiscount=Giảm giá của khách hàng liên quan
+CustomerAbsoluteDiscount=Giảm giá khách hàng tuyệt đối
+CustomerRelativeDiscountShort=Giảm tương đối
+CustomerAbsoluteDiscountShort=Giảm giá tuyệt đối
+CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định của <b>%s%%</b>
+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 <b>%s</b> %s
+CompanyHasCreditNote=Khách hàng này vẫn có giấy báo cho <b>%s</b> %s
+CompanyHasNoAbsoluteDiscount=Khách hàng này không có tín dụng giảm giá có sẵn
+CustomerAbsoluteDiscountAllUsers=Giảm giá tuyệt đối (do tất cả người dùng)
+CustomerAbsoluteDiscountMy=Giảm giá tuyệt đối (do chính mình)
+DefaultDiscount=Mặc định giảm giá
+AvailableGlobalDiscounts=Giảm giá tuyệt đối có sẵn
+DiscountNone=Không
+Supplier=Nhà cung cấp
+CompanyList=Danh sách của công ty
+AddContact=Tạo liên hệ
+AddContactAddress=Tạo liên hệ / địa chỉ
+EditContact=Sửa liên lạc
+EditContactAddress=Sửa liên lạc / địa chỉ
+Contact=Liên hệ
+ContactsAddresses=Liên hệ / địa chỉ
+NoContactDefinedForThirdParty=Không liên lạc được xác định cho bên thứ ba này
+NoContactDefined=Không liên lạc được xác định
+DefaultContact=Mặc định liên lạc / địa chỉ
+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
+CustomerCode=Mã khách hàng
+SupplierCode=Mã nhà cung cấp
+CustomerAccount=Tài khoản của khách hàng
+SupplierAccount=Tài khoản nhà cung cấp
+CustomerCodeDesc=Mã số khách hàng, duy nhất cho tất cả khách hàng
+SupplierCodeDesc=Mã nhà cung cấp, độc đáo cho tất cả các nhà cung cấp
+RequiredIfCustomer=Yêu cầu nếu bên thứ ba là một khách hàng hoặc khách hàng tiềm năng
+RequiredIfSupplier=Yêu cầu nếu bên thứ ba là nhà cung cấp
+ValidityControledByModule=Hiệu lực điều khiển bởi mô-đun
+ThisIsModuleRules=Đây là quy tắc cho các mô-đun này
+LastProspect=Cuối
+ProspectToContact=Khách hàng tiềm năng để liên hệ
+CompanyDeleted=Công ty "%s" sẽ bị xóa khỏi cơ sở dữ liệu.
+ListOfContacts=Danh sách địa chỉ liên lạc / địa chỉ
+ListOfContactsAddresses=Danh sách địa chỉ liên lạc / adresses
+ListOfProspectsContacts=Danh sách liên hệ khách hàng tiềm năng
+ListOfCustomersContacts=Danh sách địa chỉ liên lạc của khách hàng
+ListOfSuppliersContacts=Danh sách liên hệ nhà cung cấp
+ListOfCompanies=Danh sách các công ty
+ListOfThirdParties=Danh sách các bên thứ ba
+ShowCompany=Hiện công ty
+ShowContact=Hiện liên lạc
+ContactsAllShort=Tất cả (không chọn lọc)
+ContactType=Loại Liên hệ
+ContactForOrders=Liên hệ với đơn đặt hàng của
+ContactForProposals=Liên lạc đề nghị của
+ContactForContracts=Hợp đồng liên lạc của
+ContactForInvoices=Tiếp xúc của hóa đơn
+NoContactForAnyOrder=Liên hệ này không phải là một số liên lạc cho bất kỳ thứ tự
+NoContactForAnyProposal=Liên hệ này không phải là một số liên lạc cho bất kỳ đề xuất thương mại
+NoContactForAnyContract=Liên hệ này không phải là một số liên lạc cho bất cứ hợp đồng
+NoContactForAnyInvoice=Liên hệ này không phải là một số liên lạc cho bất kỳ hóa đơn
+NewContact=Liên lạc mới
+NewContactAddress=Liên lạc mới / địa chỉ
+LastContacts=Địa chỉ liên lạc cuối cùng
+MyContacts=Địa chỉ liên lạc của tôi
+Phones=Điện thoại
+Capital=Vốn
+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 <b>%s</b> 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=Check Intracomunnautary VAT on European commision site
-VATIntraManualCheck=You can also check manually from european web site <a href="%s" target="_blank">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Nor prospect, nor customer
-JuridicalStatus=Juridical status
-Staff=Staff
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potential
-ContactPrivate=Private
-ContactPublic=Shared
-ContactVisibility=Visibility
-OthersNotLinkedToThirdParty=Others, not linked to a third party
-ProspectStatus=Prospect status
-PL_NONE=None
+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 <a href="%s" target="_blank">% s</a>
+ErrorVATCheckMS_UNAVAILABLE=Kiểm tra không thể. Kiểm tra dịch vụ không được cung cấp bởi các quốc gia thành viên (% s).
+NorProspectNorCustomer=Cũng không phải khách hàng tiềm năng, cũng không phải khách hàng
+JuridicalStatus=Tư cách pháp nhân
+Staff=Nhân viên
+ProspectLevelShort=Tiềm năng
+ProspectLevel=Triển vọng tiềm năng
+ContactPrivate=Tin
+ContactPublic=Chia sẻ
+ContactVisibility=Tầm nhìn
+OthersNotLinkedToThirdParty=Người khác, không liên kết với một bên thứ ba
+ProspectStatus=Tình trạng khách hàng tiềm năng
+PL_NONE=Không
 PL_UNKNOWN=Chưa rõ
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+PL_LOW=Thấp
+PL_MEDIUM=Trung bình
+PL_HIGH=Cao
 TE_UNKNOWN=-
-TE_STARTUP=Startup
-TE_GROUP=Large company
-TE_MEDIUM=Medium company
-TE_ADMIN=Governmental
-TE_SMALL=Small company
-TE_RETAIL=Retailer
+TE_STARTUP=Khởi động
+TE_GROUP=Công ty lớn
+TE_MEDIUM=Công ty vừa
+TE_ADMIN=Chính phủ
+TE_SMALL=Công ty nhỏ
+TE_RETAIL=Cửa hàng bán lẻ
 TE_WHOLE=Wholetailer
-TE_PRIVATE=Private individual
-TE_OTHER=Other
-StatusProspect-1=Do not contact
-StatusProspect0=Never contacted
-StatusProspect1=To contact
-StatusProspect2=Contact in process
-StatusProspect3=Contact done
-ChangeDoNotContact=Change status to 'Do not contact'
-ChangeNeverContacted=Change status to 'Never contacted'
-ChangeToContact=Change status to 'To contact'
-ChangeContactInProcess=Change status to 'Contact in process'
-ChangeContactDone=Change status to 'Contact done'
-ProspectsByStatus=Prospects by status
-BillingContact=Billing contact
-NbOfAttachedFiles=Number of attached files
-AttachANewFile=Attach a new file
-NoRIB=No BAN defined
-NoParentCompany=None
-ExportImport=Import-Export
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Contact not linked to any third party
-DolibarrLogin=Dolibarr login
-NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-PriceLevel=Price level
-DeliveriesAddress=Delivery addresses
-DeliveryAddress=Delivery address
-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
-NoOtherDeliveryAddress=No alternative delivery address defined
-SupplierCategory=Supplier category
-JuridicalStatus200=Independant
-DeleteFile=Delete file
-ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Assigned to sale representative
-SelectCountry=Select a country
-SelectCompany=Select a third party
-Organization=Organization
-AutomaticallyGenerated=Automatically generated
-FiscalYearInformation=Information on the fiscal year
-FiscalMonthStart=Starting month of the fiscal year
-YouMustCreateContactFirst=You must create emails contacts for third party first to be able to add emails notifications.
-ListSuppliersShort=List of suppliers
-ListProspectsShort=List of prospects
-ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
-LastModifiedThirdParties=Last %s modified third parties
-UniqueThirdParties=Total of unique third parties
-InActivity=Open
-ActivityCeased=Closed
-ActivityStateFilter=Activity status
-ProductsIntoElements=List of products into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Reached max. for outstanding bill
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
-LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
+TE_PRIVATE=Cá thể
+TE_OTHER=Khác
+StatusProspect-1=Không liên hệ
+StatusProspect0=Không bao giờ liên lạc
+StatusProspect1=Để liên hệ
+StatusProspect2=Liên hệ trong quá trình
+StatusProspect3=Liên hệ với thực hiện
+ChangeDoNotContact=Thay đổi trạng thái để 'Đừng liên lạc'
+ChangeNeverContacted=Thay đổi trạng thái để 'Không bao giờ liên lạc'
+ChangeToContact=Thay đổi trạng thái để 'Để liên hệ với'
+ChangeContactInProcess=Thay đổi trạng thái để 'Liên hệ trong quá trình'
+ChangeContactDone=Thay đổi trạng thái để 'Liên hệ với thực hiện'
+ProspectsByStatus=Triển vọng bởi tình trạng
+BillingContact=Liên hệ thanh toán
+NbOfAttachedFiles=Số lượng hồ sơ đính kèm
+AttachANewFile=Đính kèm một tập tin mới
+NoRIB=Không có định nghĩa BAN
+NoParentCompany=Không
+ExportImport=Xuất nhập khẩu
+ExportCardToFormat=Thẻ xuất khẩu sang các định dạng
+ContactNotLinkedToCompany=Liên không liên quan đến bất kỳ bên thứ ba
+DolibarrLogin=Đăng nhập Dolibarr
+NoDolibarrAccess=Không truy cập Dolibarr
+ExportDataset_company_1=Các bên thứ ba (công ty / cơ sở / người vật lý) và tài sản
+ExportDataset_company_2=Liên hệ và tài sản
+ImportDataset_company_1=Các bên thứ ba (công ty / cơ sở / người vật lý) và tài sản
+ImportDataset_company_2=Liên hệ / địa chỉ (của thirdparties hay không) và các thuộc tính
+ImportDataset_company_3=Chi tiết ngân hàng
+PriceLevel=Mức giá
+DeliveriesAddress=Địa chỉ giao hàng
+DeliveryAddress=Địa chỉ giao hàng
+DeliveryAddressLabel=Giao hàng tận nơi nhãn địa chỉ
+DeleteDeliveryAddress=Xóa một địa chỉ giao hàng
+ConfirmDeleteDeliveryAddress=Bạn Bạn có chắc chắn muốn xóa địa chỉ giao hàng này?
+NewDeliveryAddress=Địa chỉ giao hàng mới
+AddDeliveryAddress=Tạo địa chỉ
+AddAddress=Tạo địa chỉ
+NoOtherDeliveryAddress=Không có địa chỉ giao hàng thay thế được xác định
+SupplierCategory=Loại nhà cung cấp
+JuridicalStatus200=Độc lập
+DeleteFile=Xóa tập tin
+ConfirmDeleteFile=Bạn Bạn có chắc chắn muốn xóa ảnh này?
+AllocateCommercial=Giao cho đại diện bán
+SelectCountry=Chọn một quốc gia
+SelectCompany=Chọn một bên thứ ba
+Organization=Tổ chức
+AutomaticallyGenerated=Tự động tạo ra
+FiscalYearInformation=Thông tin về năm tài chính
+FiscalMonthStart=Bắt đầu từ tháng của năm tài chính
+YouMustCreateContactFirst=Bạn phải tạo ra các email liên lạc cho bên thứ ba đầu tiên để có thể thêm các email thông báo.
+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=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
+CurrentOutstandingBill=Hóa đơn đang lưu hành
+OutstandingBill=Max. cho hóa đơn xuất sắc
+OutstandingBillReached=Đạt tối đa. cho hóa đơn xuất sắc
+MonkeyNumRefModelDesc=Quay trở lại với các định dạng numero syymm-nnnn cho mã khách hàng và% syymm-nnnn cho mã nhà cung cấp nơi yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0.
+LeopardNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào.
+ManagingDirectors=Quản lý (các) tên (Giám đốc điều hành, giám đốc, chủ tịch ...)
+SearchThirdparty=Tìm kiếm của bên thứ ba
+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 73c0eb59742..c169fe2afbc 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -1,206 +1,206 @@
 # Dolibarr language file - Source file is en_US - compta
-Accountancy=Accountancy
-AccountancyCard=Accountancy card
-Treasury=Treasury
-MenuFinancial=Financial
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
-VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Cài đặt
-RemainingAmountPayment=Amount payment remaining :
-AmountToBeCharged=Total amount to pay :
-AccountsGeneral=Accounts
-Account=Account
-Accounts=Accounts
-Accountparent=Account parent
-Accountsparent=Accounts parent
-BillsForSuppliers=Bills for suppliers
-Income=Income
-Outcome=Expense
-ReportInOut=Income / Expense
-ReportTurnover=Turnover
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
-Profit=Profit
-Balance=Balance
-Debit=Debit
-Credit=Credit
-Piece=Accounting Doc.
-Withdrawal=Withdrawal
-Withdrawals=Withdrawals
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
-VATReceived=VAT received
-VATToCollect=VAT purchases
-VATSummary=VAT Balance
-LT2SummaryES=IRPF Balance
-LT1SummaryES=RE Balance
-VATPaid=VAT paid
-SalaryPaid=Salary paid
-LT2PaidES=IRPF Paid
-LT1PaidES=RE Paid
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-VATCollected=VAT collected
-ToPay=To pay
-ToGet=To get back
-SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Tax, social contributions and dividends area
-SocialContribution=Social contribution
-SocialContributions=Social contributions
-MenuSpecialExpenses=Special expenses
-MenuTaxAndDividends=Taxes and dividends
-MenuSalaries=Salaries
-MenuSocialContributions=Social contributions
-MenuNewSocialContribution=New contribution
-NewSocialContribution=New social contribution
-ContributionsToPay=Contributions to pay
-AccountancyTreasuryArea=Accountancy/Treasury area
-AccountancySetup=Accountancy setup
-NewPayment=New payment
-Payments=Payments
-PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
-PaymentSocialContribution=Social contribution payment
-PaymentVat=VAT payment
-PaymentSalary=Salary payment
-ListPayment=List of payments
-ListOfPayments=List of payments
-ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
-DatePayment=Payment date
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-NewVATPayment=New VAT payment
-newLT2PaymentES=New IRPF payment
-newLT1PaymentES=New RE payment
-LT2PaymentES=IRPF Payment
-LT2PaymentsES=IRPF Payments
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-VATPayment=VAT Payment
-VATPayments=VAT Payments
-SocialContributionsPayments=Social contributions payments
-ShowVatPayment=Show VAT payment
-TotalToPay=Total to pay
-TotalVATReceived=Total VAT received
-CustomerAccountancyCode=Customer accountancy code
-SupplierAccountancyCode=Supplier accountancy code
-AccountNumberShort=Account number
-AccountNumber=Account number
-NewAccount=New account
-SalesTurnover=Sales turnover
-SalesTurnoverMinimum=Minimum sales turnover
-ByThirdParties=By third parties
-ByUserAuthorOfInvoice=By invoice author
-AccountancyExport=Accountancy export
-ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
-SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
-CheckReceipt=Check deposit
-CheckReceiptShort=Check deposit
-NewCheckReceipt=New discount
-NewCheckDeposit=New check deposit
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=No checks waiting for deposit.
-DateChequeReceived=Check reception date
-NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social contribution
-ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid?
-DeleteSocialContribution=Delete a social contribution
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution?
-ExportDataset_tax_1=Social contributions and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See report <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b> for a calculation on actual payments made
-SeeReportInDueDebtMode=See report <b>%sClaims-Debts%s</b> said <b>commitment accounting</b> for a calculation on issued invoices
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not. <br>- It is based on the validation date of invoices and VAT and on the due date for expenses.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. <br>- It is based on the payment dates of the invoices, expenses and VAT.
-RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices. <br>
-RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party 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
-SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
-PercentOfInvoice=%%/invoice
-NotUsedForGoods=Not used on goods
-ProposalStats=Statistics on proposals
-OrderStats=Statistics on orders
-InvoiceStats=Statistics on bills
-Dispatch=Dispatching
-Dispatched=Dispatched
-ToDispatch=To dispatch
-ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
-SellsJournal=Sales Journal
-PurchasesJournal=Purchases Journal
-DescSellsJournal=Sales Journal
-DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
-CodeNotDef=Not defined
-AddRemind=Dispatch available amount
-RemainToDivide= Remain to dispatch :
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-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=linked to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-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 <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+Accountancy=Kế toán
+AccountancyCard=Thẻ kế toán
+Treasury=Kho bạc
+MenuFinancial=Tài chính
+TaxModuleSetupToModifyRules=Tới <a href="%s">Thuế thiết lập mô-đun</a> để sửa đổi quy định để tính
+TaxModuleSetupToModifyRulesLT=Tới <a href="%s">thiết lập Công ty</a> để sửa đổi quy định để tính
+OptionMode=Lựa chọn cho kế toán
+OptionModeTrue=Lựa chọn Thu nhập-chi phí
+OptionModeVirtual=Lựa chọn bố-Các khoản nợ
+OptionModeTrueDesc=Trong bối cảnh này, doanh thu được tính toán trên các khoản thanh toán (ngày thanh toán). Tính hợp lệ của số liệu được đảm bảo chỉ khi sổ sách được xem xét kỹ lưỡng thông qua các đầu vào / đầu ra trên các tài khoản thông qua hoá đơn.
+OptionModeVirtualDesc=Trong bối cảnh này, doanh thu được tính toán trên hoá đơn (ngày xác nhận). Khi các hóa đơn đến hạn, cho dù họ đã được trả tiền hay không, chúng được liệt kê trong đầu ra doanh thu.
+FeatureIsSupportedInInOutModeOnly=Tính năng chỉ có sẵn trong chế độ kế toán TÍN-NỢ (Xem cấu hình mô-đun kế toán)
+VATReportBuildWithOptionDefinedInModule=Lượng hiển thị ở đây được tính toán bằng cách sử dụng quy tắc được xác định bởi cài đặt mô-đun thuế.
+LTReportBuildWithOptionDefinedInModule=Lượng hiển thị ở đây được tính toán bằng cách sử dụng quy tắc được xác định bởi thiết lập Công ty.
+Param=Thiết lập
+RemainingAmountPayment=Thanh toán số tiền còn lại:
+AmountToBeCharged=Tổng số tiền phải trả:
+AccountsGeneral=Tài khoản
+Account=Tài khoản
+Accounts=Tài khoản
+Accountparent=Mẹ tài khoản
+Accountsparent=Tài khoản mẹ
+BillsForSuppliers=Hóa đơn cho các nhà cung cấp
+Income=Thu nhập
+Outcome=Chi phí
+ReportInOut=Thu nhập / chi phí
+ReportTurnover=Doanh thu
+PaymentsNotLinkedToInvoice=Thanh toán không liên quan đến bất kỳ hóa đơn, do đó không liên quan đến bất kỳ bên thứ ba
+PaymentsNotLinkedToUser=Thanh toán không liên quan đến bất kỳ người dùng
+Profit=Lợi nhuận
+Balance=Cân bằng
+Debit=Nợ
+Credit=Tín dụng
+Piece=Kế toán Doc.
+Withdrawal=Rút
+Withdrawals=Tiền thu hồi
+AmountHTVATRealReceived=Net thu
+AmountHTVATRealPaid=Net trả
+VATToPay=Bán VAT
+VATReceived=Nhận thuế GTGT
+VATToCollect=Mua VAT
+VATSummary=Cân bằng thuế GTGT
+LT2SummaryES=IRPF cân
+LT1SummaryES=RE cân
+VATPaid=Nộp thuế GTGT
+SalaryPaid=Lương
+LT2PaidES=IRPF trả tiền
+LT1PaidES=RE trả tiền
+LT2CustomerES=Bán hàng IRPF
+LT2SupplierES=Mua IRPF
+LT1CustomerES=RE bán hàng
+LT1SupplierES=RE mua
+VATCollected=Thu thuế GTGT
+ToPay=Để trả
+ToGet=Để quay trở lại
+SpecialExpensesArea=Khu vực dành cho tất cả các khoản thanh toán đặc biệt
+TaxAndDividendsArea=Thuế, xã hội đóng góp và cổ tức khu vực
+SocialContribution=Đóng góp xã hội
+SocialContributions=Đóng góp xã hội
+MenuSpecialExpenses=Chi phí đặc biệt
+MenuTaxAndDividends=Thuế và cổ tức
+MenuSalaries=Tiền lương
+MenuSocialContributions=Đóng góp xã hội
+MenuNewSocialContribution=Đóng góp mới
+NewSocialContribution=Đóng góp xã hội mới
+ContributionsToPay=Đóng góp để trả tiền
+AccountancyTreasuryArea=Kế toán / Tài chính khu vực
+AccountancySetup=Thiết lập Kế toán
+NewPayment=Thanh toán mới
+Payments=Thanh toán
+PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng
+PaymentSupplierInvoice=Thanh toán hóa đơn nhà cung cấp
+PaymentSocialContribution=Thanh toán đóng góp xã hội
+PaymentVat=Nộp thuế GTGT
+PaymentSalary=Thanh toán tiền lương
+ListPayment=Danh sách thanh toán
+ListOfPayments=Danh sách thanh toán
+ListOfCustomerPayments=Danh sách các khoản thanh toán của khách hàng
+ListOfSupplierPayments=Danh sách các khoản thanh toán nhà cung cấp
+DatePayment=Ngày thanh toán
+DateStartPeriod=Ngày giai đoạn bắt đầu
+DateEndPeriod=Thời gian cuối ngày
+NewVATPayment=Nộp thuế GTGT mới
+newLT2PaymentES=Thanh toán IRPF mới
+newLT1PaymentES=Thanh toán RE mới
+LT2PaymentES=IRPF thanh toán
+LT2PaymentsES=IRPF Thanh toán
+LT1PaymentES=RE Thanh toán
+LT1PaymentsES=RE Thanh toán
+VATPayment=Thanh toán thuế GTGT
+VATPayments=Thanh toán thuế GTGT
+SocialContributionsPayments=Đóng góp xã hội thanh toán
+ShowVatPayment=Hiện nộp thuế GTGT
+TotalToPay=Tổng số trả
+TotalVATReceived=Tổng số thuế GTGT được
+CustomerAccountancyCode=Đang kế toán của khách hàng
+SupplierAccountancyCode=Nhà cung cấp đang kế toán
+AccountNumberShort=Số tài khoản
+AccountNumber=Số tài khoản
+NewAccount=Tài khoản mới
+SalesTurnover=Doanh thu bán hàng
+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
+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
+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
+PaySocialContribution=Trả khoản đóng góp xã hội
+ConfirmPaySocialContribution=Bạn có chắc chắn bạn muốn phân loại đóng góp xã hội này như thanh toán?
+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ế độ <b>%sVAT về kế toán cam kết%s</b>.
+CalcModeVATEngagement=Chế độ <b>%sVAT đối với thu nhập-chi phí%s.</b>
+CalcModeDebt=Chế độ <b>%sClaims-Các khoản nợ%s</b> cho biết <b>kế toán cam kết.</b>
+CalcModeEngagement=Chế độ <b>%sIncomes-Chi%s</b> cho biết <b>kế toán tiền mặt</b>
+CalcModeLT1= Chế độ <b>%sRE trên hoá đơn của khách hàng - nhà cung cấp hoá đơn%s</b>
+CalcModeLT1Debt=Chế độ <b>%sRE% trên hóa đơn khách hàng%s</b>
+CalcModeLT1Rec= Chế độ <b>%sRE các nhà cung cấp hoá đơn%s</b>
+CalcModeLT2= Chế độ <b>%sIRPF trên hoá đơn của khách hàng - nhà cung cấp hóa đơn%s</b>
+CalcModeLT2Debt=Chế độ <b>%sIRPF trên hóa đơn khách hàng%s</b>
+CalcModeLT2Rec= Chế độ <b>%sIRPF các nhà cung cấp hóa đơn%s</b>
+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ế độ <b>%sClaims-Các khoản nợ%s</b> biết <b>kế toán cam kết.</b>
+AnnualByCompaniesInputOutputMode=Cán cân thu nhập và chi phí, chi tiết do các bên thứ ba, <b>%sIncomes-Expenses%s</b> cho biết <b>kế toán tiền mặt.</b>
+SeeReportInInputOutputMode=Xem báo <b>cáo %sIncomes-Chi%s</b> cho biết <b>tiền mặt chiếm</b> một tính toán thanh toán thực tế được thực hiện
+SeeReportInDueDebtMode=Xem báo <b>cáo%sClaims-Các khoản nợ%s</b> cho biết <b>cam kết chiếm</b> 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. <br> - Đó 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. <br> - Đó là dựa vào ngày thanh toán hoá đơn, chi phí và thuế GTGT.
+RulesCADue=- Nó bao gồm hoá đơn do của khách hàng cho dù họ được trả tiền hay không. <br> - Đó là dựa vào ngày xác nhận các hóa đơn. <br>
+RulesCAIn=- Nó bao gồm tất cả các khoản thanh toán có hiệu quả các hóa đơn nhận được từ khách hàng. <br> - Nó được dựa trên ngày thanh toán các hoá đơn <br>
+DepositsAreNotIncluded=- Hóa đơn tiền gửi cũng không được bao gồm
+DepositsAreIncluded=- Hóa đơn tiền gửi mới có
+LT2ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba IRPF
+LT1ReportByCustomersInInputOutputModeES=Báo cáo của bên thứ ba RE
+VATReportByCustomersInInputOutputMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả
+VATReportByCustomersInDueDebtMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả
+VATReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ thuế GTGT thu, nộp
+LT1ReportByQuartersInInputOutputMode=Báo cáo của tỷ lệ RE
+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 <b>%sVAT vỏ bọc%s</b> cho một tính toán tiêu chuẩn
+SeeVATReportInDueDebtMode=Xem báo cáo <b>%sVAT trên dòng%s</b> 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.
+RulesVATDueProducts=- Đối với tài sản vật chất, nó bao gồm các hoá đơn GTGT, dựa trên ngày hóa đơn.
+OptionVatInfoModuleComptabilite=Lưu ý: Đối với tài sản vật chất, nó sẽ sử dụng ngày giao hàng để được công bằng hơn.
+PercentOfInvoice=%% / Hóa đơn
+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=Đ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í
+DescSellsJournal=Tạp chí Kinh doanh
+DescPurchasesJournal=Mua Tạp chí
+InvoiceRef=Ref hóa đơn.
+CodeNotDef=Không xác định
+AddRemind=Công văn số tiền có sẵn
+RemainToDivide= Vẫn giữ nguyên văn:
+WarningDepositsNotIncluded=Tiền gửi hoá đơn không được bao gồm trong phiên bản này với các phân hệ kế toán này.
+DatePaymentTermCantBeLowerThanObjectDate=Ngày thanh toán hạn không thể thấp hơn so với ngày đối tượng.
+Pcg_version=Phiên bản PCG
+Pcg_type=PCG loại
+Pcg_subtype=PCG chủng
+InvoiceLinesToDispatch=Dòng hoá đơn để gửi
+InvoiceDispatched=Hoá đơn cử
+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=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: <br> Phương pháp 1 đang đi ngang vat trên mỗi dòng, sau đó tổng hợp chúng. <br> 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ả. <br> Kết quả cuối cùng có thể khác với vài xu. Chế độ mặc định là chế <b>độ%s.</b>
+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ế độ <b>kế toán tiền mặt</b> là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ <b>kế toán tham gia</b> (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_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 e5ad112b222..e5d7db9f1bb 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -1,101 +1,102 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Contracts area
-ListOfContracts=List of contracts
-LastContracts=Last %s modified contracts
-AllContracts=All contracts
-ContractCard=Contract card
-ContractStatus=Contract status
-ContractStatusNotRunning=Not running
-ContractStatusRunning=Running
-ContractStatusDraft=Draft
-ContractStatusValidated=Validated
-ContractStatusClosed=Closed
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
-ServiceStatusClosed=Closed
-ServicesLegend=Services legend
-Contracts=Contracts
-Contract=Contract
-NoContracts=No contracts
-MenuServices=Services
-MenuInactiveServices=Services not active
-MenuRunningServices=Running services
-MenuExpiredServices=Expired services
-MenuClosedServices=Closed services
-NewContract=New contract
-AddContract=Add contract
-SearchAContract=Search a contract
-DeleteAContract=Delete a contract
-CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b> ?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b> ?
-ValidateAContract=Validate a contract
-ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b> ?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
-DateServiceUnactivate=Service deactivation date
-DateServiceStart=Date for beginning of service
-DateServiceEnd=Date for end of service
-ShowContract=Show contract
-ListOfServices=List of services
-ListOfInactiveServices=List of not active services
-ListOfExpiredServices=List of expired active services
-ListOfClosedServices=List of closed services
-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
-LastActivatedServices=Last %s activated services
-LastModifiedServices=Last %s modified services
-EditServiceLine=Edit service line
-ContractStartDate=Start date
-ContractEndDate=End date
-DateStartPlanned=Planned start date
-DateStartPlannedShort=Planned start date
-DateEndPlanned=Planned end date
-DateEndPlannedShort=Planned end date
-DateStartReal=Real start date
-DateStartRealShort=Real start date
-DateEndReal=Real end date
-DateEndRealShort=Real end date
-NbOfServices=Nb of services
-CloseService=Close service
-ServicesNomberShort=%s service(s)
-RunningServices=Running services
-BoardRunningServices=Expired running services
-ServiceStatus=Status of service
-DraftContracts=Drafts contracts
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it
-CloseAllContracts=Close all contract lines
-DeleteContractLine=Delete a contract line
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line ?
-MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ?
-PaymentRenewContractId=Renew contract line (number %s)
-ExpiredSince=Expiration date
-RelatedContracts=Related contracts
-NoExpiredServices=No expired active services
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-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:
+ContractsArea=Phạm vi hợp đồng
+ListOfContracts=Danh sách các hợp đồng
+LastModifiedContracts=Last %s modified contracts
+AllContracts=Tất cả các hợp
+ContractCard=Thẻ đồng
+ContractStatus=Tình trạng hợp đồng
+ContractStatusNotRunning=Không chạy
+ContractStatusRunning=Chạy
+ContractStatusDraft=Dự thảo
+ContractStatusValidated=Xác nhận
+ContractStatusClosed=Đóng
+ServiceStatusInitial=Không chạy
+ServiceStatusRunning=Chạy
+ServiceStatusNotLate=Chạy, chưa hết hạn
+ServiceStatusNotLateShort=Không hết hạn
+ServiceStatusLate=Chạy, hết hạn
+ServiceStatusLateShort=Hết hạn
+ServiceStatusClosed=Đóng
+ServicesLegend=Dịch vụ truyền thuyết
+Contracts=Hợp đồng
+Contract=Hợp đồng
+NoContracts=Không có hợp đồng
+MenuServices=Dịch vụ
+MenuInactiveServices=Dịch vụ không hoạt động
+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=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
+ConfirmDeleteAContract=Bạn Bạn có chắc chắn muốn xóa hợp đồng này và tất cả các dịch vụ của mình?
+ConfirmValidateContract=Bạn có chắc chắn bạn muốn xác nhận hợp đồng này dưới <b>tên% s?</b>
+ConfirmCloseContract=Điều này sẽ đóng tất cả các dịch vụ (hoạt động hay không). Bạn có chắc là bạn muốn đóng hợp đồng này?
+ConfirmCloseService=Bạn có chắc bạn muốn đóng dịch vụ này với <b>ngày% s?</b>
+ValidateAContract=Xác nhận hợp đồng
+ActivateService=Kích hoạt dịch vụ
+ConfirmActivateService=Bạn có chắc chắn bạn muốn kích hoạt dịch vụ này với <b>ngày% s?</b>
+RefContract=Tài liệu tham khảo Hợp đồng
+DateContract=Ngày ký hợp đồng
+DateServiceActivate=Dịch vụ của ngày kích hoạt
+DateServiceUnactivate=Dịch vụ ngày Chấm dứt hoạt
+DateServiceStart=Ngày đầu cho dịch vụ
+DateServiceEnd=Ngày đăng ký cuối cùng của dịch vụ
+ShowContract=Hiện hợp đồng
+ListOfServices=Danh sách dịch vụ
+ListOfInactiveServices=Danh sách các dịch vụ không hoạt động
+ListOfExpiredServices=Danh sách các dịch vụ đang hoạt động đã hết hạn
+ListOfClosedServices=Danh sách các dịch vụ khép kín
+ListOfRunningContractsLines=Danh sách các đường chạy hợp đồng
+ListOfRunningServices=Danh sách các dịch vụ đang chạy
+NotActivatedServices=Dịch vụ không hoạt động (trong hợp đồng xác nhận)
+BoardNotActivatedServices=Dịch vụ để kích hoạt các hợp đồng xác nhận
+LastContracts=Last %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ụ
+ContractStartDate=Ngày bắt đầu
+ContractEndDate=Ngày kết thúc
+DateStartPlanned=Ngày bắt đầu lên kế hoạch
+DateStartPlannedShort=Ngày bắt đầu lên kế hoạch
+DateEndPlanned=Ngày kết thúc kế hoạch
+DateEndPlannedShort=Ngày kết thúc kế hoạch
+DateStartReal=Ngày bắt đầu thực
+DateStartRealShort=Ngày bắt đầu thực
+DateEndReal=Bất ngày cuối
+DateEndRealShort=Bất ngày cuối
+NbOfServices=Nb dịch vụ
+CloseService=Đóng cửa dịch vụ
+ServicesNomberShort=Dịch vụ% s (s)
+RunningServices=Dịch vụ đang chạy
+BoardRunningServices=Dịch vụ chạy hết hạn
+ServiceStatus=Trạng thái dịch vụ
+DraftContracts=Dự thảo hợp đồng
+CloseRefusedBecauseOneServiceActive=Hợp đồng không thể đóng cửa là phát sinh ít nhất một dịch vụ mở vào nó
+CloseAllContracts=Đóng tất cả các dòng đồng
+DeleteContractLine=Xóa một dòng đồng
+ConfirmDeleteContractLine=Bạn Bạn có chắc chắn muốn xóa dòng hợp đồng này?
+MoveToAnotherContract=Di chuyển dịch vụ vào hợp đồng khác.
+ConfirmMoveToAnotherContract=Tôi chọn lựa hợp đồng mục tiêu mới và xác nhận tôi muốn chuyển dịch vụ này vào hợp đồng này.
+ConfirmMoveToAnotherContractQuestion=Chọn trong đó hợp đồng (của cùng một bên thứ ba) hiện có, bạn muốn di chuyển dịch vụ này để?
+PaymentRenewContractId=Gia hạn hợp đồng đường (số% s)
+ExpiredSince=Ngày hết hạn
+RelatedContracts=Hợp đồng liên quan
+NoExpiredServices=Không có dịch vụ hoạt động đã hết hạn
+ListOfServicesToExpireWithDuration=Danh sách Dịch vụ hết hạn trong% s ngày
+ListOfServicesToExpireWithDurationNeg=Danh sách Dịch vụ hết hạn từ hơn% s ngày
+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=Sales representative signing contract
-TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
-TypeContact_contrat_external_BILLING=Billing customer contact
-TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
-TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
-Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined
+TypeContact_contrat_internal_SALESREPSIGN=Bán hàng ký kết hợp đồng đại diện
+TypeContact_contrat_internal_SALESREPFOLL=Đại diện bán hàng theo dõi hợp đồng
+TypeContact_contrat_external_BILLING=Thanh toán liên lạc của khách hàng
+TypeContact_contrat_external_CUSTOMER=Theo dõi liên lạc của khách hàng
+TypeContact_contrat_external_SALESREPSIGN=Ký kết hợp đồng liên hệ khách hàng
+Error_CONTRACT_ADDON_NotDefined=CONTRACT_ADDON liên tục không được xác định
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 768cd012384..019e6939edb 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -1,89 +1,86 @@
 # Dolibarr language file - Source file is en_US - cron
-#
 # About page
-About = About
-CronAbout = About Cron
-CronAboutPage = Cron about page
-
+About = Về
+CronAbout = Về Cron
+CronAboutPage = Định kỳ về trang web
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Đọc nhiệm vụ theo lịch trình
+Permission23102 = Tạo / cập nhật theo lịch trình công việc
+Permission23103 = Xóa nhiệm vụ theo lịch trình
+Permission23104 = Thực hiện nhiệm vụ theo lịch trình
 # 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= Theo lịch trình thiết lập quản lý công việc
+URLToLaunchCronJobs=URL để kiểm tra và khởi động công việc cron nếu được yêu cầu
+OrToLaunchASpecificJob=Hoặc để kiểm tra và khởi động một công việc cụ thể
+KeyForCronAccess=Khóa bảo mật cho URL để khởi động công việc cron
+FileToLaunchCronJobs=Dòng lệnh để khởi động công việc cron
+CronExplainHowToRunUnix=Về môi trường Unix bạn nên sử dụng crontab để chạy dòng lệnh mỗi phút
+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=Scheduled jobs
-CronListActive= List of active jobs
-CronListInactive= List of disabled jobs
-CronListActive= List of active jobs
+CronJobs=Việc theo lịch trình
+CronListActive=List of active/scheduled jobs
+CronListInactive=Danh sách việc làm người khuyết tật
 # 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
+CronDateLastRun=Chạy cuối
+CronLastOutput=Bài đầu ra chạy
+CronLastResult=Cuối mã kết quả
+CronListOfCronJobs=Danh sách công việc dự kiến
+CronCommand=Lệnh
+CronList=Danh sách công việc
+CronDelete= Xóa công việc cron
+CronConfirmDelete= Bạn Bạn có chắc chắn muốn xóa công việc định kỳ này?
+CronExecute=Việc ra mắt
+CronConfirmExecute= Bạn có chắc chắn để thực hiện công việc này ngay bây giờ
+CronInfo= Việc cho phép để thực hiện nhiệm vụ đã được lên kế hoạch
+CronWaitingJobs=Wainting việc làm
+CronTask=Công việc
+CronNone= Không
+CronDtStart=Ngày bắt đầu
+CronDtEnd=Ngày kết thúc
+CronDtNextLaunch=Thực hiện tiếp theo
+CronDtLastLaunch=Thực hiện cuối
 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
+CronMethod=Phương pháp
+CronModule=Mô-đun
+CronAction=Hành động
+CronStatus=Tình trạng
+CronStatusActive=Bật
+CronStatusInactive=Người khuyết tật
+CronNoJobs=Không có công ăn việc làm đăng ký
+CronPriority=Ưu tiên
+CronLabel=Mô tả
+CronNbRun=Nb. ra mắt
+CronEach=Mỗi
+JobFinished=Việc đưa ra và hoàn thành
 #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
+CronAdd= Thêm công việc
+CronHourStart= Bắt đầu giờ và ngày nhiệm vụ
+CronEvery= Và thực hiện nhiệm vụ mỗi
+CronObject= Ví dụ / đối tượng để tạo ra
+CronArgs=Các thông số
+CronSaveSucess=Lưu thành công
+CronNote=Nhận xét
+CronFieldMandatory=Fields% s là bắt buộc
+CronErrEndDateStartDt=Ngày kết thúc không thể trước ngày bắt đầu
+CronStatusActiveBtn=Kích hoạt
+CronStatusInactiveBtn=Vô hiệu hoá
+CronTaskInactive=Công việc này bị vô hiệu hóa
+CronDtLastResult=Cuối ngày kết quả
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
+CronClassFile=Lớp học (filename.class.php)
+CronModuleHelp=Tên của thư mục module Dolibarr (cũng làm việc với mô-đun Dolibarr bên ngoài). <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm / htdocs / <u>sản phẩm</u> /class/product.class.php lấy, giá trị của mô-đun là <i>sản phẩm</i>
+CronClassFileHelp=Tên tập tin để tải. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm / htdocs / sản phẩm / lớp / <u>product.class.php</u> lấy, giá trị của tên tập tin lớp học là <i>product.class.php</i>
+CronObjectHelp=Tên đối tượng để tải. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của tên tập tin lớp học là <i>sản phẩm</i>
+CronMethodHelp=Phương pháp đối tượng để khởi động. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của phương pháp là <i>fecth</i>
+CronArgsHelp=Các đối số phương pháp. <BR> Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của paramters có thể là <i>0, ProductRef</i>
+CronCommandHelp=Các dòng lệnh hệ thống để thực thi.
 # Info
-CronInfoPage=Information
+CronInfoPage=Thông tin
 # Common
-CronType=Task type
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType=Loại nhiệm vụ
+CronType_method=Gọi phương thức của một lớp Dolibarr
+CronType_command=Shell lệnh
 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=Không thể tải lớp% s hoặc đối tượng% s
+UseMenuModuleToolsToAddCronJobs=Đi vào menu "Trang chủ - module công cụ - danh sách công việc" để xem và chỉnh sửa các công việc theo lịch trình.
diff --git a/htdocs/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang
index bb78c5ac7c2..eaad58cffcb 100644
--- a/htdocs/langs/vi_VN/deliveries.lang
+++ b/htdocs/langs/vi_VN/deliveries.lang
@@ -1,26 +1,28 @@
 # Dolibarr language file - Source file is en_US - deliveries
-Delivery=Delivery
-Deliveries=Deliveries
-DeliveryCard=Delivery card
-DeliveryOrder=Delivery order
-DeliveryOrders=Delivery orders
-DeliveryDate=Delivery date
-DeliveryDateShort=Deliv. date
-CreateDeliveryOrder=Generate delivery order
-QtyDelivered=Qty delivered
-SetDeliveryDate=Set shipping date
-ValidateDeliveryReceipt=Validate delivery receipt
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ?
-DeleteDeliveryReceipt=Delete delivery receipt
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b> ?
-DeliveryMethod=Delivery method
-TrackingNumber=Tracking number
-DeliveryNotValidated=Delivery not validated
+Delivery=Giao hàng tận nơi
+Deliveries=Việc giao hàng
+DeliveryCard=Thẻ Giao hàng tận nơi
+DeliveryOrder=Lệnh giao hàng
+DeliveryOrders=Lệnh giao hàng
+DeliveryDate=Ngày giao hàng
+DeliveryDateShort=Deliv. ngày
+CreateDeliveryOrder=Tạo lệnh giao hàng
+QtyDelivered=Số lượng giao
+SetDeliveryDate=Thiết lập ngày vận chuyển
+ValidateDeliveryReceipt=Xác nhận giao hàng
+ValidateDeliveryReceiptConfirm=Bạn có chắc chắn bạn muốn xác nhận giao hàng này?
+DeleteDeliveryReceipt=Xóa nhận giao hàng
+DeleteDeliveryReceiptConfirm=Bạn Bạn có chắc chắn muốn xóa nhận giao hàng <b>%s</b> ?
+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
 # merou PDF model
-NameAndSignature=Name and Signature :
-ToAndDate=To___________________________________ on ____/_____/__________
-GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer :
-Sender=Sender
-Recipient=Recipient
-ErrorStockIsNotEnough=There's not enough stock
+NameAndSignature=Tên và chữ ký:
+ToAndDate=To___________________________________ vào ____ / _____ / __________
+GoodStatusDeclaration=Đã nhận được hàng hoá trên trong tình trạng tốt,
+Deliverer=Giao:
+Sender=Tên người gửi
+Recipient=Người nhận
+ErrorStockIsNotEnough=Không có đủ tồn kho
+Shippable=Shippable
+NonShippable=Không shippable
diff --git a/htdocs/langs/vi_VN/dict.lang b/htdocs/langs/vi_VN/dict.lang
index 4b724056147..a9218c84d34 100644
--- a/htdocs/langs/vi_VN/dict.lang
+++ b/htdocs/langs/vi_VN/dict.lang
@@ -1,46 +1,46 @@
 # 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
+CountryFR=Pháp
+CountryBE=Bỉ
+CountryIT=Ý
+CountryES=Tây Ban Nha
+CountryDE=Đức
+CountryCH=Thụy Sĩ
+CountryGB=Vương quốc Anh
+CountryUK=Vương quốc Anh
 CountryIE=Ireland
-CountryCN=China
+CountryCN=Trung Quốc
 CountryTN=Tunisia
-CountryUS=United States
+CountryUS=Hoa Kỳ
 CountryMA=Morocco
 CountryDZ=Algeria
 CountryCA=Canada
 CountryTG=Togo
 CountryGA=Gabon
-CountryNL=Netherlands
+CountryNL=Hà Lan
 CountryHU=Hungary
-CountryRU=Russia
-CountrySE=Sweden
+CountryRU=Nga
+CountrySE=Thụy Điển
 CountryCI=Ivoiry Coast
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Cameroon
-CountryPT=Portugal
-CountrySA=Saudi Arabia
+CountryPT=Bồ Đào Nha
+CountrySA=Ả Rập Saudi
 CountryMC=Monaco
-CountryAU=Australia
+CountryAU=Úc
 CountrySG=Singapore
 CountryAF=Afghanistan
-CountryAX=Åland Islands
+CountryAX=Quần đảo Åland
 CountryAL=Albania
-CountryAS=American Samoa
+CountryAS=Samoa thuộc Mỹ
 CountryAD=Andorra
 CountryAO=Angola
 CountryAI=Anguilla
-CountryAQ=Antarctica
-CountryAG=Antigua and Barbuda
+CountryAQ=Nam Cực
+CountryAG=Antigua và Barbuda
 CountryAM=Armenia
 CountryAW=Aruba
-CountryAT=Austria
+CountryAT=Áo
 CountryAZ=Azerbaijan
 CountryBS=Bahamas
 CountryBH=Bahrain
@@ -52,56 +52,56 @@ CountryBJ=Benin
 CountryBM=Bermuda
 CountryBT=Bhutan
 CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
+CountryBA=Bosnia và Herzegovina
 CountryBW=Botswana
-CountryBV=Bouvet Island
+CountryBV=Đảo Bouvet
 CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
+CountryIO=Argentina
 CountryBN=Brunei Darussalam
 CountryBG=Bulgaria
 CountryBF=Burkina Faso
 CountryBI=Burundi
-CountryKH=Cambodia
+CountryKH=Campuchia
 CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
+CountryKY=Quần đảo Cayman
+CountryCF=Cộng hòa Trung Phi
 CountryTD=Chad
 CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
+CountryCX=Đảo Christmas
+CountryCC=Quần đảo Cocos (Keeling)
 CountryCO=Colombia
 CountryKM=Comoros
 CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
+CountryCD=Congo, Cộng hòa Dân chủ
+CountryCK=Quần đảo Cook
 CountryCR=Costa Rica
 CountryHR=Croatia
 CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
-CountryDK=Denmark
+CountryCY=Síp
+CountryCZ=Cộng hòa Séc
+CountryDK=Đan Mạch
 CountryDJ=Djibouti
 CountryDM=Dominica
-CountryDO=Dominican Republic
+CountryDO=Cộng hòa Dominica
 CountryEC=Ecuador
-CountryEG=Egypt
+CountryEG=Ai Cập
 CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
+CountryGQ=Guinea Xích Đạo
 CountryER=Eritrea
 CountryEE=Estonia
 CountryET=Ethiopia
-CountryFK=Falkland Islands
-CountryFO=Faroe Islands
-CountryFJ=Fiji Islands
-CountryFI=Finland
-CountryGF=French Guiana
+CountryFK=Quần đảo Falkland
+CountryFO=Quần đảo Faroe
+CountryFJ=Quần đảo Fiji
+CountryFI=Phần Lan
+CountryGF=Guiana thuộc Pháp
 CountryPF=French Polynesia
-CountryTF=French Southern Territories
+CountryTF=Gà tây
 CountryGM=Gambia
 CountryGE=Georgia
 CountryGH=Ghana
 CountryGI=Gibraltar
-CountryGR=Greece
+CountryGR=Hy Lạp
 CountryGL=Greenland
 CountryGD=Grenada
 CountryGP=Guadeloupe
@@ -110,133 +110,133 @@ CountryGT=Guatemala
 CountryGN=Guinea
 CountryGW=Guinea-Bissau
 CountryGY=Guyana
-CountryHT=Haïti
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
+CountryHT=Haiti
+CountryHM=Đảo Heard và McDonald
+CountryVA=Tòa Thánh (Vatican City State)
 CountryHN=Honduras
-CountryHK=Hong Kong
+CountryHK=Hồng Kông
 CountryIS=Icelande
-CountryIN=India
+CountryIN=Ấn Độ
 CountryID=Indonesia
 CountryIR=Iran
 CountryIQ=Iraq
 CountryIL=Israel
 CountryJM=Jamaica
-CountryJP=Japan
+CountryJP=Nhật Bản
 CountryJO=Jordan
 CountryKZ=Kazakhstan
 CountryKE=Kenya
 CountryKI=Kiribati
-CountryKP=North Korea
-CountryKR=South Korea
+CountryKP=Bắc Triều Tiên
+CountryKR=Hàn Quốc
 CountryKW=Kuwait
 CountryKG=Kyrghyztan
-CountryLA=Lao
+CountryLA=Lào
 CountryLV=Latvia
 CountryLB=Lebanon
 CountryLS=Lesotho
 CountryLR=Liberia
-CountryLY=Libyan
+CountryLY=Libya
 CountryLI=Liechtenstein
 CountryLT=Lituania
 CountryLU=Luxembourg
 CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
+CountryMK=Macedonia, cựu Nam Tư của
 CountryMG=Madagascar
 CountryMW=Malawi
 CountryMY=Malaysia
 CountryMV=Maldives
 CountryML=Mali
 CountryMT=Malta
-CountryMH=Marshall Islands
+CountryMH=Quần đảo Marshall
 CountryMQ=Martinique
 CountryMR=Mauritania
 CountryMU=Mauritius
 CountryYT=Mayotte
 CountryMX=Mexico
-CountryFM=Micronesia
+CountryFM=Liên bang Micronesia
 CountryMD=Moldova
-CountryMN=Mongolia
+CountryMN=Mông Cổ
 CountryMS=Monserrat
 CountryMZ=Mozambique
 CountryMM=Birmania (Myanmar)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
-CountryAN=Netherlands Antilles
+CountryAN=Antille thuộc Hà Lan
 CountryNC=New Caledonia
 CountryNZ=New Zealand
 CountryNI=Nicaragua
 CountryNE=Niger
 CountryNG=Nigeria
 CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
-CountryNO=Norway
+CountryNF=Đảo Norfolk
+CountryMP=Quần đảo Bắc Mariana
+CountryNO=Na Uy
 CountryOM=Oman
 CountryPK=Pakistan
 CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
+CountryPS=Lãnh thổ Palestine bị chiếm đóng
 CountryPA=Panama
 CountryPG=Papua New Guinea
 CountryPY=Paraguay
 CountryPE=Peru
 CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poland
+CountryPN=Quần đảo Pitcairn
+CountryPL=Ba Lan
 CountryPR=Puerto Rico
 CountryQA=Qatar
 CountryRE=Reunion
 CountryRO=Romania
 CountryRW=Rwanda
 CountrySH=Saint Helena
-CountryKN=Saint Kitts and Nevis
+CountryKN=Saint Kitts và Nevis
 CountryLC=Saint Lucia
-CountryPM=Saint Pierre and Miquelon
-CountryVC=Saint Vincent and Grenadines
+CountryPM=Saint Pierre và Miquelon
+CountryVC=Saint Vincent và Grenadines
 CountryWS=Samoa
 CountrySM=San Marino
-CountryST=Sao Tome and Principe
+CountryST=Sao Tome và Principe
 CountryRS=Serbia
 CountrySC=Seychelles
 CountrySL=Sierra Leone
 CountrySK=Slovakia
 CountrySI=Slovenia
-CountrySB=Solomon Islands
+CountrySB=Quần đảo Solomon
 CountrySO=Somalia
-CountryZA=South Africa
-CountryGS=South Georgia and the South Sandwich Islands
+CountryZA=Nam Phi
+CountryGS=Quần đảo Nam Sandwich Nam Georgia và
 CountryLK=Sri Lanka
 CountrySD=Sudan
 CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
+CountrySJ=Quần đảo Svalbard và Jan Mayen
 CountrySZ=Swaziland
-CountrySY=Syrian
-CountryTW=Taiwan
+CountrySY=Syria
+CountryTW=Đài Loan
 CountryTJ=Tajikistan
 CountryTZ=Tanzania
-CountryTH=Thailand
-CountryTL=Timor-Leste
+CountryTH=Thái Lan
+CountryTL=Đông Timor
 CountryTK=Tokelau
 CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turkey
+CountryTT=Trinidad và Tobago
+CountryTR=Thổ Nhĩ Kỳ
 CountryTM=Turkmenistan
-CountryTC=Turks and Cailos Islands
+CountryTC=Quần đảo Turks và Cailos
 CountryTV=Tuvalu
 CountryUG=Uganda
-CountryUA=Ukraine
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
+CountryUA=Ukraina
+CountryAE=Tiểu Vương Quốc Ả Rập Thống Nhất
+CountryUM=Hoa Kỳ Ma-rốc
 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
+CountryVN=Việt Nam
+CountryVG=Quần đảo Virgin, Anh
+CountryVI=Quần đảo Virgin, Mỹ
+CountryWF=Wallis và Futuna
+CountryEH=Tây Sahara
 CountryYE=Yemen
 CountryZM=Zambia
 CountryZW=Zimbabwe
@@ -248,78 +248,80 @@ CountryBL=Saint Barthelemy
 CountryMF=Saint Martin
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=Bà
+CivilityMR=Ông
+CivilityMLE=Cô
+CivilityMTRE=Thạc sĩ
+CivilityDR=Tiến sĩ
 ##### Currencies #####
-Currencyeuros=Euros
-CurrencyAUD=AU Dollars
-CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
-CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
-CurrencyEUR=Euros
+Currencyeuros=Euro
+CurrencyAUD=Đô Úc
+CurrencySingAUD=Đô Úc
+CurrencyCAD=Đô Canada
+CurrencySingCAD=Đô Canada
+CurrencyCHF=Francs Thụy Sĩ
+CurrencySingCHF=Franc Thụy Sĩ
+CurrencyEUR=Euro
 CurrencySingEUR=Euro
-CurrencyFRF=French Francs
-CurrencySingFRF=French Franc
-CurrencyGBP=GB Pounds
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indian rupee
+CurrencyFRF=Francs Pháp
+CurrencySingFRF=Franc Pháp
+CurrencyGBP=Bảng Anh
+CurrencySingGBP=Bảng Anh
+CurrencyINR=Rupee Ấn Độ
+CurrencySingINR=Rupee Ấn Độ
 CurrencyMAD=Dirham
 CurrencySingMAD=Dirham
 CurrencyMGA=Ariary
 CurrencySingMGA=Ariary
-CurrencyMUR=Mauritius rupees
+CurrencyMUR=Rupee Mauritius
 CurrencySingMUR=Mauritius rupee
-CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian krone
-CurrencyTND=Tunisian dinars
-CurrencySingTND=Tunisian dinar
-CurrencyUSD=US Dollars
-CurrencySingUSD=US Dollar
+CurrencyNOK=Krones Na Uy
+CurrencySingNOK=Krone Na Uy
+CurrencyTND=Dinar Tunisia
+CurrencySingTND=Dinar Tunisia
+CurrencyUSD=Đô la Mỹ
+CurrencySingUSD=Đô la Mỹ
 CurrencyUAH=Hryvnia
 CurrencySingUAH=Hryvnia
 CurrencyXAF=CFA Francs BEAC
 CurrencySingXAF=CFA Franc BEAC
-CurrencyXOF=CFA Francs BCEAO
+CurrencyXOF=CFA Franc BCEAO
 CurrencySingXOF=CFA Franc BCEAO
 CurrencyXPF=CFP Francs
 CurrencySingXPF=CFP Franc
-CurrencyCentSingEUR=cent
-CurrencyThousandthSingTND=thousandth
+CurrencyCentSingEUR=phần trăm
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=nghìn
 #### 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_CAMP_MAIL=Chiến dịch gửi thư tay
+DemandReasonTypeSRC_CAMP_EMAIL=Chiến dịch gửi thư điện tử
+DemandReasonTypeSRC_CAMP_PHO=Chiến dịch gọi Điện thoại
+DemandReasonTypeSRC_CAMP_FAX=Chiến dịch gửi Fax
+DemandReasonTypeSRC_COMM=Liên lạc thương mại
+DemandReasonTypeSRC_SHOP=Cửa hàng liên lạc
+DemandReasonTypeSRC_WOM=Truyền miệng
+DemandReasonTypeSRC_PARTNER=Đối tác
+DemandReasonTypeSRC_EMPLOYEE=Nhân viên
+DemandReasonTypeSRC_SPONSORING=Tài trợ
 #### 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=Định dạng 4A0
+PaperFormatEU2A0=Định dạng 2A0
+PaperFormatEUA0=Định dạng A0
+PaperFormatEUA1=Định dạng A1
+PaperFormatEUA2=Định dạng A2
+PaperFormatEUA3=Định dạng A3
+PaperFormatEUA4=Định dạng A4
+PaperFormatEUA5=Định dạng A5
+PaperFormatEUA6=Định dạng A6
+PaperFormatUSLETTER=Định dạng Letter Mỹ
+PaperFormatUSLEGAL=Định dạng Legal Mỹ
+PaperFormatUSEXECUTIVE=Định dạng Executive Mỹ
+PaperFormatUSLEDGER=Định dạng Ledger / Tabloid
+PaperFormatCAP1=Định dạng P1 Canada
+PaperFormatCAP2=Định dạng P2 Canada
+PaperFormatCAP3=Định dạng P3 Canada
+PaperFormatCAP4=Định dạng P4 Canada
+PaperFormatCAP5=Định dạng P5 Canada
+PaperFormatCAP6=Định dạng P6 Canada
diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang
index 728661dfa04..3fd817258c2 100644
--- a/htdocs/langs/vi_VN/donations.lang
+++ b/htdocs/langs/vi_VN/donations.lang
@@ -1,32 +1,38 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=Donation
-Donations=Donations
-DonationRef=Donation ref.
-Donor=Donor
-Donors=Donors
-AddDonation=Add a donation
-NewDonation=New donation
-ShowDonation=Show donation
-DonationPromise=Gift promise
-PromisesNotValid=Not validated promises
-PromisesValid=Validated promises
-DonationsPaid=Donations paid
-DonationsReceived=Donations received
-PublicDonation=Public donation
-DonationsNumber=Donation number
-DonationsArea=Donations area
-DonationStatusPromiseNotValidated=Draft promise
-DonationStatusPromiseValidated=Validated promise
-DonationStatusPaid=Donation received
-DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
-DonationStatusPaidShort=Received
-ValidPromess=Validate promise
-DonationReceipt=Donation receipt
-BuildDonationReceipt=Build receipt
-DonationsModels=Documents models for donation receipts
-LastModifiedDonations=Last %s modified donations
-SearchADonation=Search a donation
-DonationRecipient=Donation recipient
-ThankYou=Thank You
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+Donation=Tài trợ
+Donations=Tài trợ
+DonationRef=Mã tài trợ
+Donor=Nhà tài trợ
+Donors=Các nhà 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ợ
+PromisesNotValid=Chưa xác nhận khoản tài trợ
+PromisesValid=Đã xác nhận khoản tài trợ
+DonationsPaid=Khoản tài trợ đã thanh toán
+DonationsReceived=Đã nhận được khoản tài trợ
+PublicDonation=Hiển thị công khai
+DonationsNumber=Số tài trợ
+DonationsArea=Khu vực tài trợ
+DonationStatusPromiseNotValidated=Khoản tài trợ dự kiến
+DonationStatusPromiseValidated=Đã xác nhận khoản tài trợ
+DonationStatusPaid=Đã nhận được khoản tài trợ
+DonationStatusPromiseNotValidatedShort=Dự thảo
+DonationStatusPromiseValidatedShort=Đã xác nhận
+DonationStatusPaidShort=Đã nhận
+ValidPromess=Xác nhận tài trợ
+DonationReceipt=Nhận tài trợ
+BuildDonationReceipt=Tạo Phiếu thu tài trợ
+DonationsModels=Mẫu Phiếu thu tài trợ
+LastModifiedDonations=%s khoản tài trợ mới được điều chỉnh
+SearchADonation=Tìm kiếm tài trợ
+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 90ace355500..b8c8e2d59a3 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - ecm
-MenuECM=Documents
-DocsMine=My documents
-DocsGenerated=Generated documents
-DocsElements=Elements documents
-DocsThirdParties=Documents third parties
-DocsContracts=Documents contracts
-DocsProposals=Documents proposals
-DocsOrders=Documents orders
-DocsInvoices=Documents invoices
-ECMNbOfDocs=Nb of documents in directory
-ECMNbOfDocsSmall=Nb of doc.
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
-ECMRoot=Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
-ECMNewDocument=New document
-ECMCreationDate=Creation date
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
-ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
-ECMDocumentsSection=Document of directory
-ECMSearchByKeywords=Search by keywords
-ECMSearchByEntity=Search by object
-ECMSectionOfDocuments=Directories of documents
-ECMTypeManual=Manual
-ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social contributions
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMNoDirectoryYet=No directory created
-ShowECMSection=Show directory
-DeleteSection=Remove directory
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b> ?
-ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
-ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+MenuECM=Tài liệu
+DocsMine=Tài liệu của tôi
+DocsGenerated=Các tài liệu được tạo ra
+DocsElements=Các yếu tố văn bản
+DocsThirdParties=Tài liệu các bên thứ ba
+DocsContracts=Hợp đồng văn bản
+DocsProposals=Văn bản đề nghị
+DocsOrders=Các tài liệu đơn đặt hàng
+DocsInvoices=Tài liệu hoá đơn
+ECMNbOfDocs=Nb các tài liệu trong thư mục
+ECMNbOfDocsSmall=Nb của doc.
+ECMSection=Thư mục
+ECMSectionManual=Hướng dẫn sử dụng thư mục
+ECMSectionAuto=Thư mục tự động
+ECMSectionsManual=Hướng dẫn sử dụng cây
+ECMSectionsAuto=Cây tự động
+ECMSections=Thư mục
+ECMRoot=Gốc
+ECMNewSection=Thư mục mới
+ECMAddSection=Thêm thư mục
+ECMNewDocument=Tài liệu mới
+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ườ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ử. <br> * 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ể.
+ECMSectionWasRemoved=Thư <b>mục% s</b> đã bị xóa.
+ECMDocumentsSection=Tài liệu của thư mục
+ECMSearchByKeywords=Tìm kiếm theo từ khóa
+ECMSearchByEntity=Tìm kiếm theo đối tượng
+ECMSectionOfDocuments=Thư mục tài liệu
+ECMTypeManual=Hướng dẫn sử dụng
+ECMTypeAuto=Tự động
+ECMDocsBySocialContributions=Các tài liệu liên quan đến các khoản đóng góp xã hội
+ECMDocsByThirdParties=Các tài liệu liên quan đến các bên thứ ba
+ECMDocsByProposals=Các tài liệu liên quan đến đề xuất
+ECMDocsByOrders=Các tài liệu liên quan đến khách hàng các đơn đặt hàng
+ECMDocsByContracts=Các tài liệu liên quan đến hợp đồng
+ECMDocsByInvoices=Các tài liệu liên quan đến hoá đơn cho khách hàng
+ECMDocsByProducts=Các tài liệu liên quan đến sản phẩm
+ECMDocsByProjects=Các tài liệu liên quan đến dự án
+ECMNoDirectoryYet=Không có thư mục được tạo ra
+ShowECMSection=Hiện thư mục
+DeleteSection=Hủy bỏ thư mục
+ConfirmDeleteSection=Bạn có thể xác nhận bạn muốn xóa các thư <b>mục% s?</b>
+ECMDirectoryForFiles=Thư mục cho các tập tin tương đối
+CannotRemoveDirectoryContainsFiles=Loại bỏ không thể vì nó có chứa một số tập tin
+ECMFileManager=Quản lý tập tin
+ECMSelectASection=Chọn một thư mục trên cây trái ...
+DirNotSynchronizedSyncFirst=Thư mục này dường như được tạo ra hoặc sửa đổi bên ngoài mô-đun ECM. Bạn phải nhấp vào nút "Refresh" đầu tiên để đồng bộ hóa cơ sở dữ liệu và đĩa để có được nội dung của thư mục này.
 
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 7a20fdb7e41..a949fb6453e 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -1,156 +1,178 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Không có lỗi, chúng tôi cam kết
 # Errors
 Error=Lỗi
-Errors=Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=EMail %s is wrong
-ErrorBadUrl=Url %s is wrong
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorRecordNotFound=Record not found.
-ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
-ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
-ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
-ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
-ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first.
-ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third party name
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
-ErrorCustomerCodeRequired=Customer code required
-ErrorBarCodeRequired=Bar code required
-ErrorCustomerCodeAlreadyUsed=Customer code already used
-ErrorBarCodeAlreadyUsed=Bar code already used
-ErrorPrefixRequired=Prefix required
-ErrorUrlNotValid=The website address is incorrect
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-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
-ErrorBadDateFormat=Value '%s' has wrong date format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Failed to write in directory %s
-ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
-ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities.
-ErrorFieldsRequired=Some required fields were not filled.
-ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
-ErrorNoMailDefinedForThisUser=No mail defined for this user
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
-ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
-ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
-ErrorDirAlreadyExists=A directory with this name already exists.
-ErrorFileAlreadyExists=A file with this name already exists.
-ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
-ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
-ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
-ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
-ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref used for creation already exists.
-ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete records since it has some childs.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
-ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> en provide the error code <b>%s</b> in your message, or even better by adding a screen copy of this page.
-ErrorWrongValueForField=Wrong value for field number <b>%s</b> (value '<b>%s</b>' does not match regex rule <b>%s</b>)
-ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b>)
-ErrorFieldRefNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a <b>%s</b> existing ref)
-ErrorsOnXLines=Errors on <b>%s</b> source record(s)
-ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
-ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorDatabaseParameterWrong=Database setup parameter '<b>%s</b>' has a value not compatible to use Dolibarr (must have value '<b>%s</b>').
-ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete.
-ErrorBadMask=Error on mask
-ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
-ErrorBadMaskBadRazMonth=Error, bad reset value
-ErrorSelectAtLeastOne=Error. Select at least one entry.
-ErrorProductWithRefNotExist=Product with reference '<i>%s</i>' don't exist
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
-ErrorFailedToSendPassword=Failed to send password
-ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorPasswordDiffers=Passwords differs, please type them again.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorFailedToFindEntity=Failed to read environment '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
-ErrorFailedToChangePassword=Failed to change password
-ErrorLoginDoesNotExists=User with login <b>%s</b> 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
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
-ErrorNoActivatedBarcode=No barcode type activated
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date can not be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
-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.
+Errors=Lỗi
+ErrorButCommitIsDone=Lỗi được tìm thấy nhưng chúng tôi xác nhận mặc dù điều này
+ErrorBadEMail=Thư điện tử của% s là sai
+ErrorBadUrl=Url% s là sai
+ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
+ErrorGroupAlreadyExists=Nhóm% s đã tồn tại.
+ErrorRecordNotFound=Ghi lại không tìm thấy.
+ErrorFailToCopyFile=Không thể sao chép tập tin <b>'% s'</b> vào <b>'% s'.</b>
+ErrorFailToRenameFile=Không thể đổi tên tập tin <b>'% s'</b> vào <b>'% s'.</b>
+ErrorFailToDeleteFile=Không thể loại bỏ các tập tin <b>'% s'.</b>
+ErrorFailToCreateFile=Không thể tạo tập tin <b>'% s'.</b>
+ErrorFailToRenameDir=Không thể đổi tên thư mục <b>'% s'</b> vào <b>'% s'.</b>
+ErrorFailToCreateDir=Không thể tạo thư mục <b>'% s'.</b>
+ErrorFailToDeleteDir=Không thể xóa thư mục <b>'% s'.</b>
+ErrorFailedToDeleteJoinedFiles=Không thể xóa môi trường bởi vì có một số tác phẩm tham gia. Hủy bỏ các tập tin đầu tiên tham gia.
+ErrorThisContactIsAlreadyDefinedAsThisType=Liên hệ này đã được xác định là liên lạc cho loại hình này.
+ErrorCashAccountAcceptsOnlyCashMoney=Tài khoản ngân hàng Đây là một tài khoản tiền mặt, vì vậy nó chấp nhận thanh toán các loại chỉ tiền mặt.
+ErrorFromToAccountsMustDiffers=Nguồn tài khoản ngân hàng và các mục tiêu phải khác.
+ErrorBadThirdPartyName=Bad giá trị so với tên của bên thứ ba
+ErrorProdIdIsMandatory=% S là bắt buộc
+ErrorBadCustomerCodeSyntax=Bad cú pháp cho mã khách hàng
+ErrorBadBarCodeSyntax=Bad cú pháp mã vạch
+ErrorCustomerCodeRequired=Mã khách hàng yêu cầu
+ErrorBarCodeRequired=Mã vạch yêu cầu
+ErrorCustomerCodeAlreadyUsed=Mã số khách hàng đã sử dụng
+ErrorBarCodeAlreadyUsed=Mã vạch đã được sử dụng
+ErrorPrefixRequired=Tiền tố cần thiết
+ErrorUrlNotValid=Địa chỉ trang web là không chính xác
+ErrorBadSupplierCodeSyntax=Bad cú pháp mã nhà cung cấp
+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=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
+ErrorFoundBadEmailInFile=Tìm thấy cú pháp email không chính xác cho% s dòng trong tập tin (ví dụ dòng% s với email =% s)
+ErrorUserCannotBeDelete=Người dùng không thể bị xóa. Có thể nó được kết hợp vào các đơn vị Dolibarr.
+ErrorFieldsRequired=Một số trường yêu cầu không được lấp đầy.
+ErrorFailedToCreateDir=Không thể tạo một thư mục. Kiểm tra xem người sử dụng máy chủ web có quyền ghi vào thư mục tài liệu Dolibarr. Nếu tham số <b>safe_mode</b> được kích hoạt trên PHP này, hãy kiểm tra các tập tin php Dolibarr sở hữu cho người sử dụng máy chủ web (hoặc một nhóm).
+ErrorNoMailDefinedForThisUser=Không có thư xác định cho người dùng này
+ErrorFeatureNeedJavascript=Tính năng này cần javascript để được kích hoạt để làm việc. Thay đổi điều này trong thiết lập - hiển thị.
+ErrorTopMenuMustHaveAParentWithId0=Một thực đơn của loại 'Top' không thể có một trình đơn phụ huynh. Đặt 0 trong trình đơn phụ huynh hoặc chọn một trình đơn của loại 'trái'.
+ErrorLeftMenuMustHaveAParentId=Một thực đơn của loại 'trái' phải có một id cha mẹ.
+ErrorFileNotFound=Tập <b>tin% s</b> không tìm thấy (đường dẫn không hợp, cho phép sai hoặc truy cập bị từ chối bởi PHP openbasedir hoặc tham số safe_mode)
+ErrorDirNotFound=Thư <b>mục% s</b> không tìm thấy (con đường xấu, cho phép sai hoặc truy cập bị từ chối bởi PHP openbasedir hoặc tham số safe_mode)
+ErrorFunctionNotAvailableInPHP=Chức <b>năng% s</b> là cần thiết cho tính năng này nhưng không có sẵn trong phiên bản này / thiết lập PHP.
+ErrorDirAlreadyExists=Một thư mục với tên này đã tồn tại.
+ErrorFileAlreadyExists=Một tập tin với tên này đã tồn tại.
+ErrorPartialFile=File không nhận được hoàn toàn bởi máy chủ.
+ErrorNoTmpDir=Directy tạm thời% s không tồn tại.
+ErrorUploadBlockedByAddon=Tải bị chặn bởi một plugin PHP / Apache.
+ErrorFileSizeTooLarge=Kích thước quá lớn.
+ErrorSizeTooLongForIntType=Kích thước quá dài cho kiểu int (tối đa số% s)
+ErrorSizeTooLongForVarcharType=Kích thước quá dài cho kiểu chuỗi (ký tự tối đa% s)
+ErrorNoValueForSelectType=Xin vui lòng điền giá trị so với danh sách lựa chọn
+ErrorNoValueForCheckBoxType=Xin vui lòng điền giá trị so với danh sách hộp
+ErrorNoValueForRadioType=Xin vui lòng điền giá trị so với danh sách phát thanh
+ErrorBadFormatValueList=Giá trị danh sách không thể có nhiều hơn một <u>đến:% s,</u> nhưng cần ít nhất một: Llave, Valores
+ErrorFieldCanNotContainSpecialCharacters=<b>Dòng% s</b> không được chứa các ký tự đặc biệt.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>Dòng% s</b> không được chứa các ký tự đặc biệt, cũng không phải ký tự trường hợp trên.
+ErrorNoAccountancyModuleLoaded=Không có mô-đun kế toán kích hoạt
+ErrorExportDuplicateProfil=Tên hồ sơ này đã tồn tại cho bộ xuất khẩu này.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP phù hợp là không đầy đủ.
+ErrorLDAPMakeManualTest=Một tập tin .ldif đã được tạo ra trong thư mục% s. Hãy thử để tải nó bằng tay từ dòng lệnh để có thêm thông tin về lỗi.
+ErrorCantSaveADoneUserWithZeroPercentage=Không thể lưu một hành động với "statut không bắt đầu" nếu trường "được thực hiện bởi" cũng được làm đầy.
+ErrorRefAlreadyExists=Tài liệu tham khảo dùng để tạo đã tồn tại.
+ErrorPleaseTypeBankTransactionReportName=Vui lòng nhập tên ngân hàng nhận nơi giao dịch được báo cáo (Định dạng YYYYMM hoặc YYYYMMDD)
+ErrorRecordHasChildren=Không thể xóa các bản ghi vì nó có một số Childs.
+ErrorRecordIsUsedCantDelete=Không thể xóa kỷ lục. Nó đã được sử dụng hoặc đưa vào đối tượng khác.
+ErrorModuleRequireJavascript=Javascript không được vô hiệu hóa để làm việc có tính năng này. Để kích hoạt / vô hiệu hóa Javascript, bạn vào menu chủ-> Setup-> Display.
+ErrorPasswordsMustMatch=Cả hai mật khẩu gõ phải phù hợp với nhau
+ErrorContactEMail=Một lỗi kỹ thuật xảy ra. Xin vui lòng liên hệ với quản trị viên để sau <b>email% s</b> en cung cấp các mã <b>lỗi% s</b> trong thông điệp của bạn, hoặc thậm chí tốt hơn bằng cách thêm một bản sao màn hình của trang này.
+ErrorWrongValueForField=Giá trị sai số cho lĩnh <b>vực% s</b> (giá trị <b>'% s'</b> không phù hợp với quy tắc <b>regex% s)</b>
+ErrorFieldValueNotIn=Giá trị sai số cho lĩnh <b>vực% s</b> (giá trị <b>'% s'</b> không phải là một giá trị có sẵn vào lĩnh <b>vực% s</b> của <b>bảng% s)</b>
+ErrorFieldRefNotIn=Giá trị sai số cho lĩnh <b>vực% s</b> (giá trị <b>'% s'</b> không phải là ref <b>hiện% s)</b>
+ErrorsOnXLines=Lỗi được ghi nhận <b>nguồn% s</b> (s)
+ErrorFileIsInfectedWithAVirus=Các chương trình chống virus đã không thể xác nhận các tập tin (tập tin có thể bị nhiễm bởi một loại virus)
+ErrorSpecialCharNotAllowedForField=Ký tự đặc biệt không được phép cho lĩnh vực "% s"
+ErrorDatabaseParameterWrong=Thiết lập cơ sở dữ liệu tham số <b>'% s'</b> có một giá trị không tương thích để sử dụng Dolibarr (phải có giá trị <b>'% s').</b>
+ErrorNumRefModel=Một tham chiếu tồn tại vào cơ sở dữ liệu (% s) và không tương thích với quy tắc đánh số này. Di chuyển hồ sơ hoặc tài liệu tham khảo đổi tên để kích hoạt module này.
+ErrorQtyTooLowForThisSupplier=Số lượng quá thấp đối với nhà cung cấp hoặc không có giá quy định về sản phẩm này cho nhà cung cấp này
+ErrorModuleSetupNotComplete=Thiết lập các mô-đun có vẻ là uncomplete. Đi vào Setup - module để hoàn thành.
+ErrorBadMask=Lỗi trên mặt nạ
+ErrorBadMaskFailedToLocatePosOfSequence=Lỗi, mặt nạ mà không có số thứ tự
+ErrorBadMaskBadRazMonth=Lỗi, giá trị thiết lập lại xấu
+ErrorSelectAtLeastOne=Lỗi. Chọn ít nhất một mục.
+ErrorProductWithRefNotExist=Sản phẩm có sự tham khảo <i>'% s'</i> không tồn tại
+ErrorDeleteNotPossibleLineIsConsolidated=Xóa không thể vì hồ sơ được liên kết với một ngân hàng transation được hoà giải
+ErrorProdIdAlreadyExist=% S được gán cho một phần ba
+ErrorFailedToSendPassword=Không gửi mật khẩu
+ErrorFailedToLoadRSSFile=Không có nguồn cấp dữ liệu RSS. Cố gắng thêm MAIN_SIMPLEXMLLOAD_DEBUG liên tục nếu các thông báo lỗi không cung cấp đủ thông tin.
+ErrorPasswordDiffers=Mật khẩu có khác nhau, vui lòng nhập lại.
+ErrorForbidden=Truy cập bị từ chối. <br> Bạn cố gắng truy cập vào một trang, khu vực hoặc tính năng mà không cần là một phiên chứng thực hoặc không được phép sử dụng của bạn.
+ErrorForbidden2=Cho phép đăng nhập này có thể được xác định bởi người quản trị Dolibarr của bạn từ trình đơn% s ->% s.
+ErrorForbidden3=Dường như Dolibarr không được sử dụng thông qua một phiên chứng thực. Hãy xem tài liệu hướng dẫn thiết lập Dolibarr biết làm thế nào để quản lý xác thực (htaccess, mod_auth hay khác ...).
+ErrorNoImagickReadimage=Lớp Imagick không tìm thấy trong PHP này. Không có xem trước có thể có sẵn. Quản trị có thể vô hiệu hóa tab này từ menu Setup - Hiển thị.
+ErrorRecordAlreadyExists=Kỷ lục đã tồn tại
+ErrorCantReadFile=Không thể đọc tập tin '% s'
+ErrorCantReadDir=Không thể đọc thư mục '% s'
+ErrorFailedToFindEntity=Không thể đọc môi trường '% s'
+ErrorBadLoginPassword=Bad giá trị để đăng nhập hoặc mật khẩu
+ErrorLoginDisabled=Tài khoản của bạn đã bị vô hiệu
+ErrorFailedToRunExternalCommand=Không thể chạy lệnh bên ngoài. Kiểm tra xem nó có sẵn và Runnable bởi máy chủ PHP của bạn. Nếu PHP <b>Safe Mode</b> được kích hoạt, kiểm tra lệnh đó là bên trong một thư mục được xác định bởi tham số <b>safe_mode_exec_dir.</b>
+ErrorFailedToChangePassword=Không thể thay đổi mật khẩu
+ErrorLoginDoesNotExists=Người sử dụng có đăng <b>nhập% s</b> không thể được tìm thấy.
+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 <b>dùng% s</b> đượ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
+ErrNoZipEngine=Không có công cụ để giải nén tập tin% s trong PHP này
+ErrorFileMustBeADolibarrPackage=Các tập tin% s phải là một gói zip Dolibarr
+ErrorFileRequired=Phải mất một tập tin gói Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL không được cài đặt, điều này là cần thiết để nói chuyện với Paypal
+ErrorFailedToAddToMailmanList=Không thể để thêm biểu ghi% s vào danh sách Mailman% s hoặc cơ sở SPIP
+ErrorFailedToRemoveToMailmanList=Không thể loại bỏ kỷ lục% s vào danh sách Mailman% s hoặc cơ sở SPIP
+ErrorNewValueCantMatchOldValue=Giá trị mới không thể bằng cũ
+ErrorFailedToValidatePasswordReset=Không thể reinit mật khẩu. Có thể là reinit đã được thực hiện (liên kết này có thể được sử dụng một lần duy nhất). Nếu không, hãy thử khởi động lại quá trình reinit.
+ErrorToConnectToMysqlCheckInstance=Kết nối với cơ sở dữ liệu bị lỗi. Kiểm tra Mysql máy chủ đang chạy (trong hầu hết trường hợp, bạn có thể khởi chạy nó từ dòng lệnh với 'sudo /etc/init.d/mysql bắt đầu').
+ErrorFailedToAddContact=Không thể thêm số điện thoại
+ErrorDateMustBeBeforeToday=Ngày không có thể lớn hơn ngày hôm nay
+ErrorPaymentModeDefinedToWithoutSetup=Một phương thức thanh toán đã được thiết lập để gõ% s nhưng thiết lập các mô-đun hóa đơn không được hoàn thành để xác định thông tin để hiển thị cho phương thức thanh toán này.
+ErrorPHPNeedModule=Lỗi, PHP của bạn phải có <b>mô-đun% s</b> được cài đặt để sử dụng tính năng này.
+ErrorOpenIDSetupNotComplete=Bạn thiết lập Dolibarr tập tin cấu hình để cho phép xác thực OpenID, nhưng URL của dịch vụ OpenID không được xác định vào liên tục% s
+ErrorWarehouseMustDiffers=Nguồn và đích kho phải có khác nhau
+ErrorBadFormat=Bad định dạng!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Lỗi, thành viên này chưa được liên kết với bất kỳ của bên thứ ba. Liên kết thành viên với một bên thứ ba hiện có hoặc tạo mới của bên thứ ba trước khi tạo đăng ký với hóa đơn.
+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=Mandatory setup parameters are not yet defined
-WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
-WarningAllowUrlFopenMustBeOn=Parameter <b>allow_url_fopen</b> must be set to <b>on</b> in filer <b>php.ini</b> for having this module working completely. You must modify this file manually.
-WarningBuildScriptNotRunned=Script <b>%s</b> was not yet ran to build graphics, or there is no data to show.
-WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
-WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
-WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
-WarningsOnXLines=Warnings on <b>%s</b> source record(s)
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-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.
+WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định
+WarningSafeModeOnCheckExecDir=Cảnh báo, PHP <b>safe_mode</b> lựa chọn là do đó, lệnh phải được lưu trữ bên trong một thư mục tuyên bố tham số php <b>safe_mode_exec_dir.</b>
+WarningAllowUrlFopenMustBeOn=Thông số <b>allow_url_fopen</b> phải được đặt <b>vào</b> trong filer <b>php.ini</b> để có mô-đun này làm việc hoàn toàn. Bạn phải thay đổi tập tin này bằng tay.
+WarningBuildScriptNotRunned=<b>Script% s</b> vẫn chưa chạy để xây dựng đồ họa, hoặc không có dữ liệu để hiển thị.
+WarningBookmarkAlreadyExists=Dấu trang với danh hiệu này hay mục tiêu này (URL) đã tồn tại.
+WarningPassIsEmpty=Cảnh báo, mật khẩu cơ sở dữ liệu rỗng. Đây là một lỗ hổng bảo mật. Bạn nên thêm một mật khẩu để cơ sở dữ liệu của bạn và thay đổi tập tin conf.php của bạn để phản ánh điều này.
+WarningConfFileMustBeReadOnly=Cảnh báo, tập tin cấu hình của bạn <b>(htdocs / conf / conf.php)</b> có thể được ghi đè bởi các máy chủ web. Đây là một lỗ hổng bảo mật nghiêm trọng. Sửa đổi quyền của tập tin được trong chế độ chỉ đọc cho người sử dụng hệ điều hành được sử dụng bởi máy chủ Web. Nếu bạn sử dụng Windows và định dạng FAT cho đĩa cứng của bạn, bạn phải biết rằng hệ thống tập tin này không cho phép để thêm quyền truy cập vào tập tin, vì vậy không thể hoàn toàn an toàn.
+WarningsOnXLines=Cảnh báo trên hồ sơ <b>nguồn% s</b> (s)
+WarningNoDocumentModelActivated=Không có mô hình, để phát tài liệu, đã được kích hoạt. Một mô hình sẽ được chọn lựa theo mặc định cho đến khi bạn kiểm tra cài đặt module của bạn.
+WarningLockFileDoesNotExists=Cảnh báo, một khi cài đặt xong, bạn phải vô hiệu hóa cài đặt / di chuyển các công cụ bằng cách thêm một <b>install.lock</b> tập tin vào thư <b>mục% s.</b> Thiếu tập tin này là một lỗ hổng bảo mật.
+WarningUntilDirRemoved=Tất cả các cảnh báo bảo mật (có thể nhìn thấy bằng cách chỉ sử dụng admin) sẽ vẫn hoạt động miễn là dễ bị tổn thương có mặt (hoặc MAIN_REMOVE_INSTALL_WARNING liên tục được thêm vào trong Setup-> thiết lập khác).
+WarningCloseAlways=Cảnh báo, đóng cửa được thực hiện ngay cả khi số lượng khác nhau giữa các nguồn và đích yếu tố. Bật tính năng này một cách thận trọng.
+WarningUsingThisBoxSlowDown=Cảnh báo, sử dụng hộp này làm chậm nghiêm túc tất cả các trang hiển thị hộp.
+WarningClickToDialUserSetupNotComplete=Thiết lập các thông tin ClickToDial cho người dùng của bạn không hoàn thành (xem tab ClickToDial vào thẻ người dùng của bạn).
+WarningNotRelevant=Hoạt động không thích hợp cho dữ liệu này
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Tính năng bị vô hiệu hóa khi thiết lập hiển thị được tối ưu hóa cho người mù hoặc văn bản trình duyệt.
+WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index 3983ee5fe32..e5de485ea10 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -1,134 +1,134 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exports area
-ImportArea=Import area
-NewExport=New export
-NewImport=New import
-ExportableDatas=Exportable dataset
-ImportableDatas=Importable dataset
-SelectExportDataSet=Choose dataset you want to export...
-SelectImportDataSet=Choose dataset you want to import...
-SelectExportFields=Choose fields you want to export, or select a predefined export profile
-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=Fields of source file not imported
-SaveExportModel=Save this export profile if you plan to reuse it later...
-SaveImportModel=Save this import profile if you plan to reuse it later...
-ExportModelName=Export profile name
-ExportModelSaved=Export profile saved under name <b>%s</b>.
-ExportableFields=Exportable fields
-ExportedFields=Exported fields
-ImportModelName=Import profile name
-ImportModelSaved=Import profile saved under name <b>%s</b>.
-ImportableFields=Importable fields
-ImportedFields=Imported fields
-DatasetToExport=Dataset to export
-DatasetToImport=Import file into dataset
-NoDiscardedFields=No fields in source file are discarded
+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 <b>tên% s.</b>
+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 <b>tên% s.</b>
+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
-ChooseFieldsOrdersAndTitle=Choose fields order...
-FieldsOrder=Fields order
-FieldsTitle=Fields title
-FieldOrder=Field order
-FieldTitle=Field title
-ChooseExportFormat=Choose export format
-NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file...
-AvailableFormats=Available formats
-LibraryShort=Library
-LibraryUsed=Library used
+ChooseFieldsOrdersAndTitle=Chọn lĩnh vực đặt hàng ...
+FieldsOrder=Lĩnh vực trật tự
+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 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=Step
-FormatedImport=Import assistant
-FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge.
-FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load.
-FormatedExport=Export assistant
-FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order.
-FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
-Sheet=Sheet
-NoImportableData=No importable data (no module with definitions to allow data imports)
-FileSuccessfullyBuilt=Export file generated
-SQLUsedForExport=SQL Request used to build export file
-LineId=Id of line
-LineDescription=Description of line
-LineUnitPrice=Unit price of line
-LineVATRate=VAT Rate of line
-LineQty=Quantity for line
-LineTotalHT=Amount net of tax for line
-LineTotalTTC=Amount with tax for line
-LineTotalVAT=Amount of VAT for line
-TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
-FileWithDataToImport=File with data to import
-FileToImport=Source file to import
-FileMustHaveOneOfFollowingFormat=File to import must have one of following format
-DownloadEmptyExample=Download example of empty source file
-ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it...
-ChooseFileToImport=Upload file then click on picto %s to select file as source import file...
-SourceFileFormat=Source file format
-FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
-Field=Field
-NoFields=No fields
-MoveField=Move field column number %s
+Step=Bước
+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 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 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 (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
+LineVATRate=Thuế GTGT Tỷ giá đường
+LineQty=Số lượng cho dòng
+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 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 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)
+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=Save this import profile
-ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
-ImportSummary=Import setup summary
-TablesTarget=Targeted tables
-FieldsTarget=Targeted fields
-TableTarget=Targeted table
-FieldTarget=Targeted field
-FieldSource=Source field
-DoNotImportFirstLine=Do not import first line of source file
-NbOfSourceLines=Number of lines in source file
-NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "<b>%s</b>" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)...
-RunSimulateImportFile=Launch the import simulation
-FieldNeedSource=This field requires data from the source file
-SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Information on target fields
-SelectAtLeastOneField=Switch at least one source field in the column of fields to export
-SelectFormat=Choose this import file format
-RunImportFile=Launch import file
-NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import.
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s<b>
-ErrorMissingMandatoryValue=Mandatory data is empty in source file for field <b>%s</b>.
-TooMuchErrors=There is still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There is still <b>%s</b> other source lines with warnings but output has been limited.
-EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import.
-FileWasImported=File was imported with number <b>%s</b>.
-YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
-NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
-DataComeFromNoWhere=Value to insert comes from nowhere in source file.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the objet <b>%s</b> that has the ref. from source file must exists into Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
-DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
-SourceRequired=Data value is mandatory
-SourceExample=Example of possible data value
-ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> 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
+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
+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 dữ liệu bạn đã xác định. Nếu đúng, hãy nhấp vào nút <b>"% s"</b> để 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 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: <b>%s</b>
+ErrorMissingMandatoryValue=Dữ liệu bắt buộc có sản phẩm nào trong tập tin nguồn cho trường <b>%s</b>.
+TooMuchErrors=Hiện vẫn còn <b>%s</b> 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 <b>%s</b> 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 dữ liệu dứt khoát.
+FileWasImported=Tập tin được nhập dữ liệu với số <b>%s</b>.
+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 <b>import_key = '%s'.</b>
+NbOfLinesOK=Số dòng không có lỗi và không có cảnh báo <b>%s</b>.
+NbOfLinesImported=Số dòng nhập thành công <b>%s</b>.
+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 <b>%s</b> trong tập tin nguồn.
+DataComeFromIdFoundFromRef=Giá trị xuất phát từ số lĩnh vực <b>%s</b> 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 <b>%s</b> 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 <b>%s</b> 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 <b>%s</b>). 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ừ <b>%s</b>.
+ExampleAnyCodeOrIdFoundIntoDictionary=Bất kỳ mã (hoặc id) được tìm thấy vào từ điển <b>%s</b>.
+CSVFormatDesc=<b>Comma</b> định dạng tập tin <b>Giá trị Ly</b> (csv). <br> Đâ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 <b>Excel</b> (xls) <br> Đây là nguồn gốc Excel 95 định dạng (BIFF5).
+Excel2007FormatDesc=Định dạng tập tin <b>Excel</b> (xlsx) <br> Đây là nguồn gốc định dạng Excel 2007 (SpreadsheetML).
+TsvFormatDesc=<b>Tab Ly</b> định dạng tập tin <b>Giá trị</b> (.tsv) <br> Đâ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 <b>%s</b> đã đượ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=Enclosure
-SuppliersProducts=Suppliers Products
-BankCode=Bank code
-DeskCode=Desk code
-BankAccountNumber=Account number
-BankAccountNumberKey=Key
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+Enclosure=Bao vây
+SuppliersProducts=Nhà cung cấp sản phẩm
+BankCode=Mã ngân hàng
+DeskCode=Đang bàn
+BankAccountNumber=Số tài khoản
+BankAccountNumberKey=Chính
+SpecialCode=Mã số đặc biệt
+ExportStringFilter=%% Cho phép thay thế một hay nhiều ký tự trong văn bản
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: bộ lọc một năm / tháng / ngày <br> YYYY + YYYY, YYYYMM + YYYYMM, YYYYMMDD + YYYYMMDD: bộ lọc trên một loạt các năm / tháng / ngày <br> > YYYY,> YYYYMM,> YYYYMMDD: bộ lọc trên tất cả các năm / tháng / ngày sau <br> <YYYY, <YYYYMM, <YYYYMMDD: bộ lọc trên tất cả các năm / tháng / ngày trước
+ExportNumericFilter=Bộ lọc 'nnnnn' bởi một giá trị <br> Bộ lọc 'nnnnn + nnnnn "trên một loạt các giá trị <br> '> Nnnnn "bộ lọc các giá trị thấp <br> '> Nnnnn "bộ lọc các giá trị cao hơn
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
+SelectFilterFields=Nếu bạn muốn lọc vào một số giá trị, giá trị chỉ vào đây.
 FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFields=Lĩnh vực lọc
+FilteredFieldsValues=Giá trị bộ lọc
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/ftp.lang b/htdocs/langs/vi_VN/ftp.lang
index 9984ce689ee..a7979993609 100644
--- a/htdocs/langs/vi_VN/ftp.lang
+++ b/htdocs/langs/vi_VN/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 <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
+FTPClientSetup=FTP thiết lập mô-đun Khách hàng
+NewFTPClient=Mới thiết lập kết nối FTP
+FTPArea=FTP Diện tích
+FTPAreaDesc=Màn hình này hiển thị cho bạn xem nội dung của một máy chủ FTP
+SetupOfFTPClientModuleNotComplete=Thiết lập các mô-đun FTP client có vẻ là không hoàn thành
+FTPFeatureNotSupportedByYourPHP=PHP của bạn không hỗ trợ chức năng FTP
+FailedToConnectToFTPServer=Không thể kết nối đến máy chủ FTP (máy chủ% s, cổng% s)
+FailedToConnectToFTPServerWithCredentials=Không thể đăng nhập vào máy chủ FTP với quy định đăng nhập / mật khẩu
+FTPFailedToRemoveFile=Không thể loại bỏ các tập <b>tin% s.</b>
+FTPFailedToRemoveDir=Không thể loại bỏ thư <b>mục% s</b> (Kiểm tra quyền truy cập và thư mục mà là trống).
+FTPPassiveMode=Chế độ thụ động
diff --git a/htdocs/langs/vi_VN/help.lang b/htdocs/langs/vi_VN/help.lang
index 1bbd6e94f03..6cdf113d588 100644
--- a/htdocs/langs/vi_VN/help.lang
+++ b/htdocs/langs/vi_VN/help.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-ClickHere=Click here
-HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
-TypeSupportCommunauty=Community (free)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-NeedHelpCenter=Need help or support ?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-MakeADonation=Help Dolibarr project, make a donation
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+CommunitySupport=Diễn đàn / hỗ trợ Wiki
+EMailSupport=Email hỗ trợ
+RemoteControlSupport=Trực tuyến thời gian thực / hỗ trợ từ xa
+OtherSupport=Hỗ trợ khác
+ToSeeListOfAvailableRessources=Để liên hệ / xem các nguồn lực có sẵn:
+ClickHere=Click vào đây
+HelpCenter=Trung tâm trợ giúp
+DolibarrHelpCenter=Dolibarr trợ giúp và trung tâm hỗ trợ
+ToGoBackToDolibarr=Nếu không, bấm <a href="%s">vào đây để sử dụng Dolibarr</a>
+TypeOfSupport=Nguồn hỗ trợ
+TypeSupportCommunauty=Cộng đồng (miễn phí)
+TypeSupportCommercial=Thương mại
+TypeOfHelp=Loại
+NeedHelpCenter=Cần giúp đỡ hoặc hỗ trợ?
+Efficiency=Hiệu quả
+TypeHelpOnly=Chỉ giúp
+TypeHelpDev=Trợ giúp + Phát triển
+TypeHelpDevForm=Trợ giúp phát triển + + hình thành
+ToGetHelpGoOnSparkAngels1=Một số công ty có thể cung cấp một hỗ trợ trực tuyến nhanh chóng (đôi khi ngay lập tức) và hiệu quả hơn bằng cách kiểm soát máy tính của bạn. Giúp đỡ này có thể được tìm thấy trên trang <b>web% s:</b>
+ToGetHelpGoOnSparkAngels3=Bạn cũng có thể vào danh sách của tất cả các huấn luyện viên cho Dolibarr, cho điều này bấm vào nút
+ToGetHelpGoOnSparkAngels2=Đôi khi, không có công ty có sẵn tại thời điểm bạn thực hiện tìm kiếm của bạn, vì vậy suy nghĩ để thay đổi bộ lọc để tìm kiếm "tất cả sẵn sàng". Bạn sẽ có thể gửi nhiều yêu cầu.
+BackToHelpCenter=Nếu không, bấm vào đây để đi <a href="%s">lại để giúp trang chủ trung tâm</a> .
+LinkToGoldMember=Bạn có thể gọi một trong những huấn luyện viên chọn trước bởi Dolibarr cho ngôn ngữ (% s) bằng cách nhấp vào Widget của mình (tình trạng và giá tối đa sẽ được tự động cập nhật):
+PossibleLanguages=Ngôn ngữ được hỗ trợ
+MakeADonation=Giúp dự án Dolibarr, thực hiện một hiến
+SubscribeToFoundation=Giúp dự án Dolibarr, đăng ký với cơ sở
+SeeOfficalSupport=Để được hỗ trợ Dolibarr chính thức ngôn ngữ của bạn: <br> <a href="%s" target="_blank"><b>% S</b></a>
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index da03299e0da..78b2efdd9b6 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -1,149 +1,148 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
-MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
-Employe=Employee
-DateDebCP=Start date
-DateFinCP=End date
-DateCreateCP=Creation date
-DraftCP=Draft
-ToReviewCP=Awaiting approval
-ApprovedCP=Approved
-CancelCP=Canceled
-RefuseCP=Refused
+Holidays=Nghỉ phép
+CPTitreMenu=Nghỉ phép
+MenuReportMonth=Báo cáo hàng tháng
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">nhấn vào đây</a> </ a> <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">.</a>
+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
+DateCreateCP=Ngày tạo
+DraftCP=Dự thảo
+ToReviewCP=Đang chờ phê duyệt
+ApprovedCP=Đã được phê duyệt
+CancelCP=Hủy bỏ
+RefuseCP=Từ chối
 ValidatorCP=Approbator
-ListeCP=List of holidays
-ReviewedByCP=Will be reviewed by
-DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
-EditCP=Edit
-DeleteCP=Delete
-ActionValidCP=Validate
-ActionRefuseCP=Refuse
-ActionCancelCP=Cancel
-StatutCP=Status
-SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
-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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
-DateValidCP=Date approved
-TitleToValidCP=Send request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
-MotifCP=Reason
-UserCP=User
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
+ListeCP=Danh sách nghỉ phép
+ReviewedByCP=Sẽ được xem xét bởi
+DescCP=Mô tả
+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 <b>ngày</b> thứ nhất <b>là% s (s)</b> 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ư <b>là% s</b> 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=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=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=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
+ActionRefuseCP=Từ chối
+ActionCancelCP=Hủy bỏ
+StatutCP=Tình trạng
+SendToValidationCP=Gửi cho xác nhận
+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 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=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ỏ 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
+DefineEventUserCP=Chỉ định một nghỉ phép đặc biệt cho người sử dụng
+addEventToUserCP=Chỉ định nghỉ
+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=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=A request for holidays has already been done on this period.
-UserName=Name
-Employee=Employee
-FirstDayOfHoliday=First day of holiday
-LastDayOfHoliday=Last day of holiday
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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=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=Để lại yêu cầu hủy bỏ
 
 ## Configuration du Module ##
-ConfCP=Configuration of holidays module
-DescOptionCP=Description of the option
-ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve holidays
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
-ValidEventCP=Validate
-UpdateEventCP=Update events
-CreateEventCP=Create
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
-DeleteEventOptionCP=Delete
-UpdateEventOptionCP=Update
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+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=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=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 nghỉ phép phân bổ của người sử dụng bằng <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cách nhấn vào đây</a> .
+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
+NameEventCP=Tên sự kiện
+OkCreateEventCP=Việc bổ sung các sự kiện diễn ra tốt đẹp.
+ErrorCreateEventCP=Lỗi tạo sự kiện.
+UpdateEventOkCP=Bản cập nhật của sự kiện diễn ra tốt đẹp.
+ErrorUpdateEventCP=Lỗi khi cập nhật sự kiện này.
+DeleteEventCP=Xóa sự kiện
+DeleteEventOkCP=Sự kiện này đã bị xóa.
+ErrorDeleteEventCP=Lỗi khi xóa sự kiện này.
+TitleDeleteEventCP=Xóa nghỉ đặc biệt
+TitleCreateEventCP=Tạo nghỉ đặc biệt
+TitleUpdateEventCP=Chỉnh sửa hoặc xóa nghỉ đặc biệt
+DeleteEventOptionCP=Xóa
+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=Cấu hình của Nghỉ phép
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+Hello=Xin chào
+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 aa37bf920ae..e59c45f7a10 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -1,211 +1,211 @@
 # 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 <b>%s</b> exists.
-ConfFileDoesNotExists=Configuration file <b>%s</b> does not exist !
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created !
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> 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).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileReload=Reload all information from configuration file.
-PHPSupportSessions=This PHP supports sessions.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
-PHPSupportGD=This PHP support GD graphical functions.
-PHPSupportUTF8=This PHP support UTF8 functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> 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.
-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.
-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
-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).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseChoice=Database choice
-DatabaseType=Database type
-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
-DatabasePrefix=Database prefix table
-Login=Login
-AdminLogin=Login for Dolibarr database owner.
-Password=Password
-PasswordAgain=Retype password a second time
-AdminPassword=Password for Dolibarr database owner.
-CreateDatabase=Create database
-CreateUser=Create owner
-DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check box if database does not exist and must be created.<br>In this case, you must fill the login/password for superuser account at the bottom of this page.
-CheckToCreateUser=Check box if database owner does not exist and must be created.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
-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
+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 <b>%s</b> tồn tại.
+ConfFileDoesNotExists=Cấu hình tập tin <b>%s</b> không tồn tại!
+ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập tin <b>%s</b> không tồn tại và không thể được tạo ra!
+ConfFileCouldBeCreated=Cấu hình tập tin <b>%s</b> có thể được tạo ra.
+ConfFileIsNotWritable=Tập tin cấu hình <b>%s</b> 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 <b>%s</b> 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 <b>variables_order</b> 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 <b>%s</b>. Điều này là đủ.
+PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b> byte. Điều này cần được quá thấp. Thay đổi <b>php.ini</b> của bạn để thiết lập thông số <b>memory_limit</b> ít nhất <b>%s</b> 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.
+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.
+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.
+PHPVersion=Phiên bản PHP
+YouCanContinue=Bạn có thể tiếp tục ...
+PleaseBePatient=Xin hãy kiên nhẫn ...
+License=Sử dụng giấy phép
+ConfigurationFile=Tập tin cấu hình
+WebPagesDirectory=Thư mục các trang web được lưu trữ
+DocumentsDirectory=Thư mục để lưu trữ các tài liệu được tải lên và tạo ra
+URLRoot=Gốc URL
+ForceHttps=Lực lượng kết nối an toàn (https)
+CheckToForceHttps=Chọn tùy chọn này để buộc kết nối an toàn (https). <br> Điều này đòi hỏi các máy chủ web được cấu hình với một chứng chỉ SSL.
+DolibarrDatabase=Cơ sở dữ liệu Dolibarr
+DatabaseChoice=Lựa chọn cơ sở dữ liệu
+DatabaseType=Loại cơ sở dữ liệu
+DriverType=Loại điều khiển
+Server=Máy chủ
+ServerAddressDescription=Tên tài khoản hoặc địa chỉ ip cho máy chủ cơ sở dữ liệu, thường là 'localhost' khi máy chủ cơ sở dữ liệu được lưu trữ trên cùng một máy chủ hơn so với máy chủ web
+ServerPortDescription=Cổng máy chủ cơ sở dữ liệu. Giữ sản phẩm nào nếu chưa biết.
+DatabaseServer=Máy chủ cơ sở dữ liệu
+DatabaseName=Tên cơ sở dữ liệu
+DatabasePrefix=Bảng cơ sở dữ liệu tiền tố
+Login=Đăng nhập
+AdminLogin=Đăng nhập cho chủ sở hữu cơ sở dữ liệu Dolibarr.
+Password=Mật khẩu
+PasswordAgain=Nhập lại mật khẩu một lần thứ hai
+AdminPassword=Mật khẩu cho chủ sở hữu cơ sở dữ liệu Dolibarr.
+CreateDatabase=Tạo cơ sở dữ liệu
+CreateUser=Tạo chủ sở hữu
+DatabaseSuperUserAccess=Máy chủ cơ sở dữ liệu - truy cập superuser
+CheckToCreateDatabase=Kiểm tra hộp nếu cơ sở dữ liệu không tồn tại và phải được tạo ra. <br> Trong trường hợp này, bạn phải điền tên đăng nhập / mật khẩu cho tài khoản superuser ở dưới cùng của trang này.
+CheckToCreateUser=Kiểm tra hộp nếu chủ sở hữu cơ sở dữ liệu không tồn tại và phải được tạo ra. <br> Trong trường hợp này, bạn phải chọn tên đăng nhập và mật khẩu của mình và cũng có thể điền tên đăng nhập / mật khẩu cho tài khoản superuser ở dưới cùng của trang này. Nếu hộp này được đánh dấu, cơ sở dữ liệu và mật khẩu chủ sở hữu của nó phải tồn tại.
+Experimental=(Thử nghiệm)
+DatabaseRootLoginDescription=Đăng nhập của người dùng được phép để tạo ra cơ sở dữ liệu mới hoặc người dùng mới, bắt buộc nếu cơ sở dữ liệu của bạn hoặc chủ sở hữu của nó không đã tồn tại.
+KeepEmptyIfNoPassword=Để trống nếu người dùng không có mật khẩu (tránh điều này)
+SaveConfigurationFile=Lưu giá trị
+ConfigurationSaving=Lưu file cấu hình
+ServerConnection=Kết nối máy chủ
 DatabaseConnection=Liên kết dữ liệu
-DatabaseCreation=Database creation
-UserCreation=User creation
-CreateDatabaseObjects=Database objects creation
-ReferenceDataLoading=Reference data loading
-TablesAndPrimaryKeysCreation=Tables and Primary keys creation
-CreateTableAndPrimaryKey=Create table %s
-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 !
-PleaseTypeALogin=Please type a login !
-PasswordsMismatch=Passwords differs, please try again !
-SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
-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 '<b>%s</b>' created successfuly.
-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
-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
-DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' 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 <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
-ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s
-FunctionNotAvailableInThisPHP=Not available on this PHP
-MigrateScript=Migration script
-ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-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
-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
-InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-NotAvailable=Not available
-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.
-AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
-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
-CharacterSetClientComment=Choose character set for web display.<br/> Default proposed character set is the one of your database.
-DBSortingCollation=Character sorting order
-DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.<br/>This parameter can't be defined if database already exists.
-CharacterSetDatabase=Character set for database
-CharacterSetDatabaseComment=Choose character set wanted for database creation.<br/>This parameter can't be defined if database already exists.
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login <b>%s</b>, but for this, Dolibarr need to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
-KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
-KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or PHP client version may be too old compared to database version.
-InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
-InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished.
-CheckThatDatabasenameIsCorrect=Check that database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form).
-YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form).
-NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing.
-MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: 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)
+DatabaseCreation=Tạo ra cơ sở dữ liệu
+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
+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ị
+PleaseTypePassword=Xin vui lòng nhập một mật khẩu, mật khẩu rỗng không được phép!
+PleaseTypeALogin=Xin vui lòng nhập một tên đăng nhập!
+PasswordsMismatch=Có khác nhau mật khẩu, hãy thử lại!
+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 '<b>%s</b>' 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.
+GoToUpgradePage=Tới nâng cấp trang lại
+Examples=Ví dụ
+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ị '<b>%s</b>' đã 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à <b>install.lock</b> 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
+MigrateScript=Kịch bản di chuyển
+ChoosedMigrateScript=Chọn kịch bản di cư
+DataMigration=Di chuyển dữ liệu
+DatabaseMigration=Di chuyển cơ sở dữ liệu cấu trúc
+ProcessMigrateScript=Xử lý kịch bản
+ChooseYourSetupMode=Chọn chế độ cài đặt của bạn và bấm vào nút "Bắt đầu" ...
+FreshInstall=Cài đặt mới
+FreshInstallDesc=Sử dụng chế độ này nếu điều này là cài đặt đầu tiên của bạn. Nếu không, chế độ này có thể sửa chữa cài đặt trước đó không đầy đủ, nhưng nếu bạn muốn nâng cấp phiên bản của bạn, chọn "Nâng cấp" chế độ.
+Upgrade=Nâng cấp
+UpgradeDesc=Sử dụng chế độ này nếu bạn đã thay thế các tập tin Dolibarr cũ với các tập tin từ một phiên bản mới hơn. Điều này sẽ nâng cấp cơ sở dữ liệu và dữ liệu của bạn.
+Start=Bắt đầu
+InstallNotAllowed=Thiết lập không cho phép quyền <b>conf.php</b>
+NotAvailable=Không có sẵn
+YouMustCreateWithPermission=Bạn phải tạo tập tin% s và cho phép ghi vào nó cho máy chủ web trong quá trình cài đặt.
+CorrectProblemAndReloadPage=Hãy khắc phục vấn đề và bấm F5 để tải lại trang.
+AlreadyDone=Đã di cư
+DatabaseVersion=Phiên bản cơ sở dữ liệu
+ServerVersion=Phiên bản máy chủ cơ sở dữ liệu
+YouMustCreateItAndAllowServerToWrite=Bạn phải tạo thư mục này và cho phép các máy chủ web để viết vào đó.
+CharsetChoice=Ký tự lựa chọn
+CharacterSetClient=Ký tự được sử dụng để tạo ra các trang web HTML
+CharacterSetClientComment=Chọn bộ ký tự để hiển thị web. <br/> Mặc định đề xuất ký tự là một trong những cơ sở dữ liệu của bạn.
+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. <br/> 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. <br/> 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 <b>%s</b>, nhưng cho điều này, Dolibarr cần kết nối với máy chủ <b>%s</b> với quyền super user <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Bạn hỏi để tạo ra cơ sở dữ liệu đăng nhập <b>%s</b>,</b> nhưng cho điều này, Dolibarr cần kết nối với máy chủ <b>%s</b> với quyền super user <b>%s</b>.
+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.
+KeepDefaultValuesWamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ DoliWamp, 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.
+KeepDefaultValuesDeb=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ một gói phần mềm Linux (Ubuntu, Debian, Fedora ...), do đó giá trị đề xuất ở đây đã được tối ưu hóa. Chỉ có mật khẩu của chủ sở hữu cơ sở dữ liệu để tạo ra phải được hoàn tất. Thay đổi các thông số khác chỉ khi bạn biết những gì bạn làm.
+KeepDefaultValuesMamp=Bạn sử dụng các hướng dẫn cài đặt Dolibarr từ DoliMamp, 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.
+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 "<b>%s</b>" tên cơ sở dữ liệu "<b>%s</b>" đăng nhập "<b>%s</b>" 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 <b>%s</b> từ phiên bản hiện tại của bạn <b>%s</b>
+InstallChoiceSuggested=<b>Cài đặt lựa chọn được đề xuất bởi trình cài đặt.</b>
+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 "<b>%s</b>" 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).
+YouAskToCreateDatabaseUserSoRootRequired=Bạn đã chọn hộp "Tạo chủ sở hữu 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).
+NextStepMightLastALongTime=Bước hiện tại có thể kéo dài vài phút. Hãy đợi cho đến khi màn hình tiếp theo được thể hiện hoàn toàn trước khi tiếp tục.
+MigrationCustomerOrderShipping=Di chuyển vận chuyển cho các đơn đặt hàng của khách hàng lưu trữ
+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=<strong>Bước cuối cùng:</strong> 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
+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)
 
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-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
-MigrationRelationshipTables=Data migration for relationship tables (%s)
-MigrationPaymentsUpdate=Payment data correction
-MigrationPaymentsNumberToUpdate=%s payment(s) to update
-MigrationProcessPaymentUpdate=Update payment(s) %s
-MigrationPaymentsNothingToUpdate=No more things to do
-MigrationPaymentsNothingUpdatable=No more payments that can be corrected
-MigrationContractsUpdate=Contract data correction
-MigrationContractsNumberToUpdate=%s contract(s) to update
-MigrationContractsLineCreation=Create contract line for contract ref %s
-MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly
-MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
-MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
-MigrationContractsInvalidDatesUpdate=Bad value date contract correction
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
-MigrationContractsInvalidDatesNumber=%s contracts modified
-MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
-MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly
-MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
-MigrationReopeningContracts=Open contract closed by error
-MigrationReopenThisContract=Reopen contract %s
-MigrationReopenedContractsNumber=%s contracts modified
-MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer
-MigrationBankTransfertsNothingToUpdate=All links are up to date
-MigrationShipmentOrderMatching=Sendings receipt update
-MigrationDeliveryOrderMatching=Delivery receipt update
-MigrationDeliveryDetail=Delivery update
-MigrationStockDetail=Update stock value of products
-MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
-MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
-MigrationProjectTaskTime=Update time spent in seconds
-MigrationActioncommElement=Update data on actions
-MigrationPaymentMode=Data migration for payment mode
-MigrationCategorieAssociation=Migration of categories
+MigrationFixData=Sửa chữa cho các dữ liệu denormalized
+MigrationOrder=Di chuyển dữ liệu cho các đơn hàng của khách hàng
+MigrationSupplierOrder=Di chuyển dữ liệu cho các đơn đặt hàng của nhà cung cấp
+MigrationProposal=Di chuyển dữ liệu cho đề xuất thương mại
+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)
+MigrationPaymentsUpdate=Chỉnh sửa dữ liệu thanh toán
+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 (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
+MigrationContractsEmptyDatesUpdateSuccess=Hợp đồng sửa chữa ngày emtpy thực hiện successfuly
+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
+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
+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
+MigrationShipmentOrderMatching=Sendings cập nhật nhận
+MigrationDeliveryOrderMatching=Cập nhật nhận giao hàng
+MigrationDeliveryDetail=Cập nhật Giao hàng tận nơi
+MigrationStockDetail=Cập nhật giá trị cổ phiếu của sản phẩm
+MigrationMenusDetail=Cập nhật bảng menu động
+MigrationDeliveryAddress=Cập nhật địa chỉ giao hàng trong lô hàng
+MigrationProjectTaskActors=Di chuyển dữ liệu cho bảng llx_projet_task_actors
+MigrationProjectUserResp=Di chuyển dữ liệu lĩnh vực fk_user_resp của llx_projet để llx_element_contact
+MigrationProjectTaskTime=Cập nhật dành thời gian trong vài giây
+MigrationActioncommElement=Cập nhật dữ liệu về các hoạt động
+MigrationPaymentMode=Di chuyển dữ liệu cho phương thức thanh toán
+MigrationCategorieAssociation=Di chuyển các loại
 
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Hiển thị tùy chọn không có sẵn
+HideNotAvailableOptions=Ẩn các tùy chọn không có sẵn
diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang
index 58579a74276..ca16bedea78 100644
--- a/htdocs/langs/vi_VN/interventions.lang
+++ b/htdocs/langs/vi_VN/interventions.lang
@@ -1,42 +1,53 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervention
-Interventions=Interventions
-InterventionCard=Intervention card
-NewIntervention=New intervention
-AddIntervention=Add intervention
-ListOfInterventions=List of interventions
-EditIntervention=Edit intervention
-ActionsOnFicheInter=Actions on intervention
-LastInterventions=Last %s interventions
-AllInterventions=All interventions
-CreateDraftIntervention=Create draft
-CustomerDoesNotHavePrefix=Customer does not have a prefix
-InterventionContact=Intervention contact
-DeleteIntervention=Delete intervention
-ValidateIntervention=Validate intervention
-ModifyIntervention=Modify intervention
-DeleteInterventionLine=Delete intervention line
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-NameAndSignatureOfInternalContact=Name and signature of intervening :
-NameAndSignatureOfExternalContact=Name and signature of customer :
-DocumentModelStandard=Standard document model for interventions
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=Classify "Billed"
-StatusInterInvoiced=Billed
-RelatedInterventions=Related interventions
-ShowIntervention=Show intervention
+Intervention=Can thiệp
+Interventions=Các can thiệp
+InterventionCard=Thẻ can thiệp
+NewIntervention=Can thiệp mới
+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
+LastInterventions=Can thiệp cuối% s
+AllInterventions=Tất cả các can thiệp
+CreateDraftIntervention=Tạo dự thảo
+CustomerDoesNotHavePrefix=Khách hàng không có một tiền tố
+InterventionContact=Liên lạc can thiệp
+DeleteIntervention=Xóa can thiệp
+ValidateIntervention=Xác nhận can thiệp
+ModifyIntervention=Sửa can thiệp
+DeleteInterventionLine=Xóa đường can thiệp
+ConfirmDeleteIntervention=Bạn Bạn có chắc chắn muốn xóa can thiệp này?
+ConfirmValidateIntervention=Bạn có chắc chắn bạn muốn xác nhận can thiệp này dưới <b>tên% s?</b>
+ConfirmModifyIntervention=Bạn có chắc là bạn muốn thay đổi can thiệp này?
+ConfirmDeleteInterventionLine=Bạn Bạn có chắc chắn muốn xóa dòng can thiệp này?
+NameAndSignatureOfInternalContact=Tên và chữ ký của can thiệp:
+NameAndSignatureOfExternalContact=Tên và chữ ký của khách hàng:
+DocumentModelStandard=Mô hình tài liệu chuẩn cho các can thiệp
+InterventionCardsAndInterventionLines=Can thiệp và dòng của các can thiệp
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
+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=Representative following-up intervention
-TypeContact_fichinter_internal_INTERVENING=Intervening
-TypeContact_fichinter_external_BILLING=Billing customer contact
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_internal_INTERREPFOLL=Đại diện theo dõi can thiệp
+TypeContact_fichinter_internal_INTERVENING=Can thiệp
+TypeContact_fichinter_external_BILLING=Thanh toán liên lạc của khách hàng
+TypeContact_fichinter_external_CUSTOMER=Theo dõi liên lạc của khách hàng
 # Modele numérotation
-ArcticNumRefModelDesc1=Generic number model
-ArcticNumRefModelError=Failed to activate
-PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-PrintProductsOnFichinter=Print products on intervention card
-PrintProductsOnFichinterDetails=forinterventions generated from orders
+ArcticNumRefModelDesc1=Mô hình số chung
+ArcticNumRefModelError=Không thể kích hoạt
+PacificNumRefModelDesc1=Quay trở lại với các định dạng numero% syymm-nnnn nơi yyyy là năm, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0
+PacificNumRefModelError=Thẻ can thiệp bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này.
+PrintProductsOnFichinter=Sản phẩm in trên thẻ can thiệp
+PrintProductsOnFichinterDetails=forinterventions tạo ra từ các đơn đặt hàng
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index 3e11d70449e..46ef6c6678e 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - languages
 
-Language_ar_AR=Tiếng Ả Rập
-Language_ar_SA=Tiếng Ả Rập
+Language_ar_AR=Ả Rập
+Language_ar_SA=Ả Rập
 Language_bg_BG=Bungari
-Language_bs_BA=Tiếng Bosnia
+Language_bs_BA=Bosnia
 Language_ca_ES=Catalan
-Language_cs_CZ=Séc
+Language_cs_CZ=Cộng hòa Séc
 Language_da_DA=Đan Mạch
 Language_da_DK=Đan Mạch
 Language_de_DE=Đức
 Language_de_AT=Đức (Áo)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Đức (Thụy Sĩ)
 Language_el_GR=Hy Lạp
-Language_en_AU=Tiếng Anh (Úc)
-Language_en_GB=English (United Kingdom)
-Language_en_IN=Tiếng Anh (Ấn Độ)
-Language_en_NZ=Tiếng Anh (New Zealand)
-Language_en_SA=Tiếng Anh (Saudi Arabia)
-Language_en_US=English (United States)
-Language_en_ZA=Tiếng Anh (Nam Phi)
+Language_en_AU=Anh (Úc)
+Language_en_GB=Anh (Vương quốc Anh)
+Language_en_IN=Anh (Ấn Độ)
+Language_en_NZ=Anh (New Zealand)
+Language_en_SA=Anh (Ả rập Saudi)
+Language_en_US=Anh (Hoa Kỳ)
+Language_en_ZA=Anh (Nam Phi)
 Language_es_ES=Tây Ban Nha
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Tây Ban Nha (Cộng hòa Dominica)
 Language_es_AR=Tây Ban Nha (Argentina)
-Language_es_CL=Spanish (Chile)
+Language_es_CL=Tây Ban Nha (Chile)
 Language_es_HN=Tây Ban Nha (Honduras)
 Language_es_MX=Tây Ban Nha (Mexico)
 Language_es_PY=Tây Ban Nha (Paraguay)
@@ -30,24 +30,24 @@ Language_es_PE=Tây Ban Nha (Peru)
 Language_es_PR=Tây Ban Nha (Puerto Rico)
 Language_et_EE=Estonia
 Language_eu_ES=Basque
-Language_fa_IR=Tiếng Ba Tư
-Language_fi_FI=Vây
+Language_fa_IR=Ba Tư
+Language_fi_FI=Fins
 Language_fr_BE=Pháp (Bỉ)
-Language_fr_CA=Tiếng Pháp (Canada)
+Language_fr_CA=Pháp (Canada)
 Language_fr_CH=Pháp (Thụy Sĩ)
 Language_fr_FR=Pháp
 Language_fr_NC=Pháp (New Caledonia)
-Language_he_IL=Tiếng Do Thái
+Language_he_IL=Do Thái
 Language_hr_HR=Croatia
 Language_hu_HU=Hungary
-Language_id_ID=Indonesian
+Language_id_ID=Indonesia
 Language_is_IS=Iceland
 Language_it_IT=Ý
 Language_ja_JP=Nhật Bản
 Language_ko_KR=Hàn Quốc
 Language_lt_LT=Lithuania
 Language_lv_LV=Latvia
-Language_mk_MK=Người mang đầu trượng
+Language_mk_MK=Macedonian
 Language_nb_NO=Na Uy (Bokmål)
 Language_nl_BE=Hà Lan (Bỉ)
 Language_nl_NL=Hà Lan (Hà Lan)
@@ -61,11 +61,11 @@ Language_tr_TR=Thổ Nhĩ Kỳ
 Language_sl_SI=Slovenia
 Language_sv_SV=Thụy Điển
 Language_sv_SE=Thụy Điển
-Language_sq_AL=Albanian
+Language_sq_AL=Albania
 Language_sk_SK=Slovakia
 Language_th_TH=Thái Lan
 Language_uk_UA=Ukraina
-Language_uz_UZ=Tiếng Uzbek
+Language_uz_UZ=Uzbek
 Language_vi_VN=Việt
 Language_zh_CN=Trung Quốc
 Language_zh_TW=Trung Quốc (truyền thống)
diff --git a/htdocs/langs/vi_VN/ldap.lang b/htdocs/langs/vi_VN/ldap.lang
index 02e457446a6..3cf778b41e8 100644
--- a/htdocs/langs/vi_VN/ldap.lang
+++ b/htdocs/langs/vi_VN/ldap.lang
@@ -1,29 +1,29 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LdapUacf_NORMAL_ACCOUNT=User account
-LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires
-LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
-LDAPAttribute=LDAP attribute
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
-LDAPGroups=Groups in LDAP database
-LDAPFieldStatus=Status
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
-SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP)
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+DomainPassword=Mật khẩu cho tên miền
+YouMustChangePassNextLogon=Mật khẩu cho người <b>dùng% s</b> trên <b>miền% s</b> phải được thay đổi.
+UserMustChangePassNextLogon=Người dùng phải thay đổi mật khẩu trên các tên miền% s
+LdapUacf_NORMAL_ACCOUNT=Tài khoản người dùng
+LdapUacf_DONT_EXPIRE_PASSWORD=Mật khẩu không bao giờ hết hạn
+LdapUacf_ACCOUNTDISABLE=Tài khoản bị vô hiệu hóa trong miền% s
+LDAPInformationsForThisContact=Thông tin trong cơ sở dữ liệu LDAP cho liên hệ này
+LDAPInformationsForThisUser=Thông tin trong cơ sở dữ liệu LDAP cho người dùng này
+LDAPInformationsForThisGroup=Thông tin trong cơ sở dữ liệu LDAP cho nhóm này
+LDAPInformationsForThisMember=Thông tin trong cơ sở dữ liệu LDAP của thành viên này
+LDAPAttribute=Thuộc tính LDAP
+LDAPAttributes=Thuộc tính LDAP
+LDAPCard=Thẻ LDAP
+LDAPRecordNotFound=Ghi lại không có trong cơ sở dữ liệu LDAP
+LDAPUsers=Người sử dụng trong cơ sở dữ liệu LDAP
+LDAPGroups=Nhóm trong cơ sở dữ liệu LDAP
+LDAPFieldStatus=Tình trạng
+LDAPFieldFirstSubscriptionDate=Ngày đăng ký đầu tiên
+LDAPFieldFirstSubscriptionAmount=Số lượng thuê bao đầu tiên
+LDAPFieldLastSubscriptionDate=Cuối ngày đăng ký
+LDAPFieldLastSubscriptionAmount=Số lượng đăng ký cuối cùng
+SynchronizeDolibarr2Ldap=Đồng bộ hóa sử dụng (Dolibarr -> LDAP)
+UserSynchronized=Sử dụng đồng bộ
+GroupSynchronized=Nhóm đồng bộ
+MemberSynchronized=Thành viên đồng bộ
+ContactSynchronized=Liên hệ đồng bộ
+ForceSynchronize=Lực lượng đồng bộ hóa Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Không thể đọc cơ sở dữ liệu LDAP. Kiểm tra thiết lập mô-đun LDAP và khả năng tiếp cận cơ sở dữ liệu.
diff --git a/htdocs/langs/vi_VN/mailmanspip.lang b/htdocs/langs/vi_VN/mailmanspip.lang
index c85b3d60db2..da985d73ee5 100644
--- a/htdocs/langs/vi_VN/mailmanspip.lang
+++ b/htdocs/langs/vi_VN/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=Subscription test was executed succesfully
-MailmanDeletionSuccess=Unsubscription test was executed succesfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+MailmanSpipSetup=Mailman và mô-đun cài đặt SPIP
+MailmanTitle=Gửi thư Mailman hệ thống danh sách
+TestSubscribe=Để kiểm tra đăng ký vào danh sách Mailman
+TestUnSubscribe=Để kiểm tra hủy đăng ký từ danh sách Mailman
+MailmanCreationSuccess=Kiểm tra đăng ký đã được thực hiện thành công
+MailmanDeletionSuccess=Huỷ đăng ký thử nghiệm đã được thực hiện thành công
+SynchroMailManEnabled=Một bản cập nhật Mailman sẽ được thực hiện
+SynchroSpipEnabled=Một bản cập nhật Spip sẽ được thực hiện
+DescADHERENT_MAILMAN_ADMINPW=Mật khẩu quản trị Mailman
+DescADHERENT_MAILMAN_URL=URL cho đăng ký Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL cho unsubscriptions Mailman
+DescADHERENT_MAILMAN_LISTS=Danh sách (s) để tự động ghi các thành viên mới (cách nhau bằng dấu phẩy)
+SPIPTitle=SPIP hệ thống quản trị nội dung
+DescADHERENT_SPIP_SERVEUR=SPIP máy chủ
+DescADHERENT_SPIP_DB=Tên cơ sở dữ liệu SPIP
+DescADHERENT_SPIP_USER=Đăng nhập cơ sở dữ liệu SPIP
+DescADHERENT_SPIP_PASS=SPIP mật khẩu cơ sở dữ liệu
+AddIntoSpip=Thêm vào SPIP
+AddIntoSpipConfirmation=Bạn có chắc bạn muốn thêm thành viên này vào SPIP?
+AddIntoSpipError=Không thể thêm người sử dụng trong SPIP
+DeleteIntoSpip=Gỡ bỏ khỏi SPIP
+DeleteIntoSpipConfirmation=Bạn có chắc là bạn muốn loại bỏ thành viên này từ SPIP?
+DeleteIntoSpipError=Không thể ngăn chặn người dùng từ SPIP
+SPIPConnectionFailed=Không thể kết nối với SPIP
+SuccessToAddToMailmanList=Thêm% s vào danh sách đưa thư% s hoặc cơ sở dữ liệu SPIP làm
+SuccessToRemoveToMailmanList=Loại bỏ% s trong danh sách đưa thư% s hoặc cơ sở dữ liệu SPIP làm
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 0130de1547b..89dd796dbf0 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -1,138 +1,141 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=EMailing
-EMailing=EMailing
+Mailing=Gửi email
+EMailing=Gửi email
 Mailings=EMailings
 EMailings=EMailings
-AllEMailings=All eMailings
-MailCard=EMailing card
-MailTargets=Targets
-MailRecipients=Recipients
-MailRecipient=Recipient
-MailTitle=Description
-MailFrom=Sender
-MailErrorsTo=Errors to
-MailReply=Reply to
-MailTo=Receiver(s)
-MailCC=Copy to
-MailCCC=Cached copy to
-MailTopic=EMail topic
-MailText=Message
-MailFile=Attached files
-MailMessage=EMail body
-ShowEMailing=Show emailing
-ListOfEMailings=List of emailings
-NewMailing=New emailing
-EditMailing=Edit emailing
-ResetMailing=Resend emailing
-DeleteMailing=Delete emailing
-DeleteAMailing=Delete an emailing
-PreviewMailing=Preview emailing
-PrepareMailing=Prepare emailing
-CreateMailing=Create emailing
-MailingDesc=This page allows you to send emailings to a group of people.
-MailingResult=Sending emails result
-TestMailing=Test email
-ValidMailing=Valid emailing
-ApproveMailing=Approve emailing
-MailingStatusDraft=Draft
-MailingStatusValidated=Validated
-MailingStatusApproved=Approved
-MailingStatusSent=Sent
-MailingStatusSentPartialy=Sent partialy
-MailingStatusSentCompletely=Sent completely
+AllEMailings=Tất cả eMailings
+MailCard=Gửi email thẻ
+MailTargets=Mục tiêu
+MailRecipients=Người nhận
+MailRecipient=Người nhận
+MailTitle=Mô tả
+MailFrom=Tên người gửi
+MailErrorsTo=Lỗi để
+MailReply=Trả lời
+MailTo=Thu (s)
+MailCC=Sao chép vào
+MailCCC=Bản cache để
+MailTopic=Thư điện tử chủ đề
+MailText=Tin nhắn
+MailFile=File đính kèm
+MailMessage=Thư điện tử của cơ thể
+ShowEMailing=Hiện gửi email
+ListOfEMailings=Danh sách emailings
+NewMailing=Gửi email mới
+EditMailing=Sửa gửi email
+ResetMailing=Gửi lại email
+DeleteMailing=Xóa email
+DeleteAMailing=Xóa một thư điện tử theo
+PreviewMailing=Xem trước gửi email
+PrepareMailing=Chuẩn bị gửi email
+CreateMailing=Tạo email
+MailingDesc=Trang này cho phép bạn gửi emailings cho một nhóm người.
+MailingResult=Gửi email kết quả
+TestMailing=Kiểm tra email
+ValidMailing=Gửi email hợp lệ
+ApproveMailing=Phê duyệt email
+MailingStatusDraft=Dự thảo
+MailingStatusValidated=Xác nhận
+MailingStatusApproved=Đã được phê duyệt
+MailingStatusSent=Gửi
+MailingStatusSentPartialy=Gửi partialy
+MailingStatusSentCompletely=Gửi hoàn toàn
 MailingStatusError=Lỗi
-MailingStatusNotSent=Not sent
-MailSuccessfulySent=Email successfully sent (from %s to %s)
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-Unsuscribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
-ErrorMailRecipientIsEmpty=Email recipient is empty
-WarningNoEMailsAdded=No new Email to add to recipient's list.
-ConfirmValidMailing=Are you sure you want to validate this emailing ?
-ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ?
-ConfirmDeleteMailing=Are you sure you want to delete this emailling ?
-NbOfRecipients=Number of recipients
-NbOfUniqueEMails=Nb of unique emails
-NbOfEMails=Nb of EMails
-TotalNbOfDistinctRecipients=Number of distinct recipients
-NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
-AddRecipients=Add recipients
-RemoveRecipient=Remove recipient
-CommonSubstitutions=Common substitutions
-YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
-EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
-MailingAddFile=Attach this file
-NoAttachedFiles=No attached files
-BadEMail=Bad value for EMail
-CloneEMailing=Clone Emailing
-ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
-CloneContent=Clone message
-CloneReceivers=Cloner recipients
-DateLastSend=Date of last sending
-DateSending=Date sending
-SentTo=Sent to <b>%s</b>
-MailingStatusRead=Read
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email <b>%s</b>  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=<b>%s</b> 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
+MailingStatusNotSent=Không gửi
+MailSuccessfulySent=Email đã được gửi thành công (từ% s đến% s)
+MailingSuccessfullyValidated=Gửi email xác nhận thành công
+MailUnsubcribe=Hủy đăng ký
+Unsuscribe=Hủy đăng ký
+MailingStatusNotContact=Không liên hệ nữa
+ErrorMailRecipientIsEmpty=Email người nhận có sản phẩm nào
+WarningNoEMailsAdded=Không có Email mới để thêm vào danh sách người nhận.
+ConfirmValidMailing=Bạn có chắc chắn bạn muốn gửi email để xác nhận điều này?
+ConfirmResetMailing=Cảnh báo, bằng cách gửi email <b>reinitializing% s,</b> bạn cho phép để thực hiện một khối lượng gửi email này lúc khác. Bạn có chắc bạn này là những gì bạn muốn làm gì?
+ConfirmDeleteMailing=Bạn Bạn có chắc chắn muốn xóa emailling này?
+NbOfRecipients=Số người nhận
+NbOfUniqueEMails=Nb email độc đáo
+NbOfEMails=Nb email
+TotalNbOfDistinctRecipients=Số người nhận khác biệt
+NoTargetYet=Không có người nhận định chưa (Đi vào tab 'nhận')
+AddRecipients=Thêm người nhận
+RemoveRecipient=Di chuyển người nhận
+CommonSubstitutions=Thay thế phổ biến
+YouCanAddYourOwnPredefindedListHere=Để tạo mô-đun bạn chọn email, xem htdocs / core / modules / thư / README.
+EMailTestSubstitutionReplacedByGenericValues=Khi sử dụng chế độ kiểm tra, thay thế các biến được thay thế bằng các giá trị chung
+MailingAddFile=Đính kèm tập tin này
+NoAttachedFiles=Không có tập tin đính kèm
+BadEMail=Bad giá trị so với thư điện tử
+CloneEMailing=Clone gửi email
+ConfirmCloneEMailing=Bạn có chắc chắn bạn muốn sao chép các thư điện tử này?
+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 <b>%s</b>
+MailingStatusRead=Đọc
+CheckRead=Đọc nhận
+YourMailUnsubcribeOK=Email <b>%s</b> 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 <b>%s</b> 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)
+SendRemind=Gửi lời nhắc nhở bằng email
+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ở
 
 # Libelle des modules de liste de destinataires mailing
-MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...)
-MailingModuleDescDolibarrUsers=Dolibarr users
-MailingModuleDescFundationMembers=Foundation members with emails
-MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other)
-MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other)
-MailingModuleDescContactsCategories=Third parties (by category)
-MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines
-MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category)
-MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
-MailingModuleDescMembersCategories=Foundation members (by categories)
-MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function)
-LineInFile=Line %s in file
-RecipientSelectionModules=Defined requests for recipient's selection
-MailSelectedRecipients=Selected recipients
-MailingArea=EMailings area
-LastMailings=Last %s emailings
-TargetsStatistics=Targets statistics
-NbOfCompaniesContacts=Unique contacts/addresses
-MailNoChangePossible=Recipients for validated emailing can't be changed
-SearchAMailing=Search mailing
-SendMailing=Send emailing
-SendMail=Send email
-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 <b>%s</b> recipients by sending session.
-TargetsReset=Clear list
-ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
-ToAddRecipientsChooseHere=Add recipients by choosing from the lists
-NbOfEMailingsReceived=Mass emailings received
-NbOfEMailingsSend=Mass emailings sent
-IdRecord=ID record
-DeliveryReceipt=Delivery Receipt
-YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
-TagMailtoEmail=Recipient EMail
+MailingModuleDescContactCompanies=Liên hệ / địa chỉ của tất cả các bên thứ ba (khách hàng, khách hàng tiềm năng, nhà cung cấp, ...)
+MailingModuleDescDolibarrUsers=Người sử dụng Dolibarr
+MailingModuleDescFundationMembers=Thành viên sáng lập với các email
+MailingModuleDescEmailsFromFile=Email từ một tập tin văn bản (email, LastName, FirstName, khác)
+MailingModuleDescEmailsFromUser=Email từ người dùng nhập vào (email, LastName, FirstName, khác)
+MailingModuleDescContactsCategories=Các bên thứ ba (theo thể loại)
+MailingModuleDescDolibarrContractsLinesExpired=Các bên thứ ba với những đường nét hết hạn hợp đồng của
+MailingModuleDescContactsByCompanyCategory=Liên hệ / địa chỉ của các bên thứ ba (theo thể loại bên thứ ba)
+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
+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
+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
+SearchAMailing=Tìm kiếm chỉ gửi thư
+SendMailing=Gửi email
+SendMail=Gửi email
+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=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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
+NbOfEMailingsReceived=Emailings Thánh Lễ nhận
+NbOfEMailingsSend=Emailings hàng loạt gửi
+IdRecord=Ghi lại ID
+DeliveryReceipt=Giao hàng tận nơi nhận
+YouCanUseCommaSeparatorForSeveralRecipients=Bạn có thể sử dụng dấu phân cách <b>nhau bởi dấu phẩy</b> để chỉ định nhiều người nhận.
+TagCheckMail=Ca khúc mở đầu email
+TagUnsubscribe=Liên kết Hủy đăng ký
+TagSignature=Chữ ký gửi người sử dụng
+TagMailtoEmail=Người nhận thư điện tử
 # Module Notifications
-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
-ListOfNotificationsDone=List all email notifications sent
+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 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 <strong>'%s'</strong> 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 d46a4fad93c..e4f8cd66622 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -4,10 +4,10 @@ DIRECTION=ltr
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
-FONTFORPDF=DejaVuSans
+FONTFORPDF=Helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
-SeparatorThousand=None
+SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
@@ -22,685 +22,689 @@ 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=Liên kết dữ liệu
-NoTranslation=Chưa được dịch
-NoRecordFound=No record found
+DatabaseConnection=Kết nối cơ sở dữ liệu
+NoTranslation=Không có bản dịch
+NoRecordFound=Không có hồ sơ tìm thấy
 NoError=Không có lỗi
 Error=Lỗi
-ErrorFieldRequired=Cần khai báo trường '%s'
-ErrorFieldFormat=Trường '%s' có giá trị sai
-ErrorFileDoesNotExists=Tệp %s không tồn tại
-ErrorFailedToOpenFile=Lỗi mở tệp %s
+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 khai báo
-ErrorUnknown=Unknown error
+ErrorConstantNotDefined=Thông số% s chưa được xác định
+ErrorUnknown=Lỗi không xác định
 ErrorSQL=Lỗi SQL
-ErrorLogoFileNotFound=Không tìm thấy tệp logo '%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)
-ErrorAttachedFilesDisabled=File attaching is disabled on this server
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorNoRequestRan=No request ran
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later.
-ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
-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
-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)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DefinedAndHasThisValue=Defined and value to
-IsNotDefined=undefined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that password database is extern to Dolibarr, so changing this field may have no effects.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten ?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Last connection
-PreviousConnexion=Previous connection
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentification mode
-RequestedUrl=Requested Url
-DatabaseTypeManager=Database type manager
-RequestLastAccess=Request for last database access
-RequestLastAccessInError=Request for last database access in error
-ReturnCodeLastAccessInError=Return code for last database access in error
-InformationLastAccessInError=Information for last database access in error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This is information that can help diagnostic
-MoreInformation=More information
-TechnicalInformation=Technical information
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
+ErrorLogoFileNotFound=Logo tập tin '% s' không được tìm thấy
+ErrorGoToGlobalSetup=Đi đến 'Công ty / cơ sở "thiết lập để sửa lỗi này
+ErrorGoToModuleSetup=Tới Học phần thiết lập để sửa lỗi này
+ErrorFailedToSendMail=Không thể gửi thư (người gửi =%s, thu =%s)
+ErrorAttachedFilesDisabled=Tập tin đính bị vô hiệu hóa trên máy chủ này
+ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có đã là một tập tin có cùng tên trong thư mục này.
+ErrorInternalErrorDetected=Lỗi được phát hiện
+ErrorNoRequestRan=Không có yêu cầu chạy
+ErrorWrongHostParameter=Tham số máy chủ sai
+ErrorYourCountryIsNotDefined=Đất nước các bạn không được xác định. Đi đến Trang chủ-Setup-Chỉnh sửa và đăng lại hình thức.
+ErrorRecordIsUsedByChild=Không thể xóa hồ sơ này. Kỷ lục này được sử dụng bởi ít nhất một hồ sơ trẻ em.
+ErrorWrongValue=Giá trị sai
+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ố <b>%s</b> không được định nghĩa trong tập tin cấu hình Dolibarr <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Không thể tìm thấy người dùng <b>%s</b> 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.
+SetDate=Thiết lập ngày
+SelectDate=Chọn một ngày
+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)
+GoToHelpPage=Đọc giúp đỡ
+RecordSaved=Ghi lưu
+RecordDeleted=Ghi lại bị xóa
+LevelOfFeature=Mức độ tính năng
+NotDefined=Không xác định
+DefinedAndHasThisValue=Xác định và giá trị
+IsNotDefined=không xác định
+DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập để <b>%s</b> trong tập tin cấu hình <b>conf.php</b>.<br> Đ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?
+SeeAbove=Xem ở trên
+HomeArea=Khu vực nhà
+LastConnexion=Kết nối cuối
+PreviousConnexion=Kết nối trước
+ConnectedOnMultiCompany=Kết nối trên môi trường
+ConnectedSince=Kết nối từ
+AuthenticationMode=Chế độ xác thực
+RequestedUrl=Url yêu cầu
+DatabaseTypeManager=Loại cơ sở dữ liệu quản lý
+RequestLastAccess=Yêu cầu truy cập cơ sở dữ liệu mới nhất
+RequestLastAccessInError=Yêu cầu cuối cùng truy cập cơ sở dữ liệu lỗi
+ReturnCodeLastAccessInError=Quay trở lại mã cho cuối cùng truy cập cơ sở dữ liệu lỗi
+InformationLastAccessInError=Thông tin cho cơ sở dữ liệu truy cập cuối cùng lỗi
+DolibarrHasDetectedError=Dolibarr đã phát hiện một lỗi kỹ thuật
+InformationToHelpDiagnose=Đây là thông tin có thể giúp chẩn đoán
+MoreInformation=Thông tin chi tiết
+TechnicalInformation=Thông tin kỹ thuật
+NotePublic=Lưu ý (công cộng)
+NotePrivate=Lưu ý (tư nhân)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để hạn chế độ chính xác của các đơn giá cho <b>%s</b> 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.
+yes=có
+Yes=Có
+no=không có
+No=Không có
 All=Tất cả
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-Update=Update
-AddActionToDo=Add event to do
-AddActionDone=Add event done
-Close=Close
-Close2=Close
-Confirm=Confirm
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b> ?
-Delete=Delete
-Remove=Remove
+Home=Trang chủ
+Help=Trợ giúp
+OnlineHelp=Hỗ trợ trực tuyến
+PageWiki=Trang wiki
+Always=Luôn luôn
+Never=Không bao giờ
+Under=dưới
+Period=Thời gian
+PeriodEndDate=Ngày kết thúc trong khoảng thời gian
+Activate=Kích hoạt
+Activated=Kích hoạt
+Closed=Đóng
+Closed2=Đóng
+Enabled=Bật
+Deprecated=Phản đối
+Disable=Vô hiệu hoá
+Disabled=Người khuyết tật
+Add=Thêm
+AddLink=Thêm liên kết
+Update=Cập nhật
+AddActionToDo=Thêm sự kiện vào làm
+AddActionDone=Thêm sự kiện thực hiện
+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 <b>%s</b> ?
+Delete=Xóa
+Remove=Hủy bỏ
 Resiliate=Resiliate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ToValidate=To validate
-Save=Save
+Cancel=Hủy bỏ
+Modify=Sửa đổi
+Edit=Chỉnh sửa
+Validate=Xác nhận
+ToValidate=Để xác nhận
+Save=Lưu
 SaveAs=Save As
-TestConnection=Test connection
+TestConnection=Kết nối thử nghiệm
 ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
+ConfirmClone=Chọn dữ liệu bạn muốn sao chép:
+NoCloneOptionsSpecified=Không có dữ liệu để sao lưu được xác định.
+Of=của
+Go=Tới
 Run=Run
-CopyOf=Copy of
-Show=Show
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
+CopyOf=Bản sao
+Show=Hiện
+ShowCardHere=Hiện thẻ
+Search=Tìm kiếm
+SearchOf=Tìm kiếm
+Valid=Hợp lệ
+Approve=Phê duyệt
 ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-ChooseLangage=Please choose your language
-Resize=Resize
+Upload=Gửi tập tin
+ToLink=Liên kết
+Select=Chọn
+Choose=Chọn
+ChooseLangage=Vui lòng chọn ngôn ngữ của bạn
+Resize=Thay đổi kích thước
 Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-GlobalValue=Global value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-CurrentNote=Current note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-Model=Model
-DefaultModel=Default model
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-DevelopmentTeam=Development Team
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Cài đặt
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-Date=Date
-DateStart=Date start
-DateEnd=Date end
-DateCreation=Creation date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Last modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DatePlanShort=Date planed
-DateRealShort=Date real.
-DateBuild=Report build date
-DatePayment=Date of payment
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
+Author=Tác giả
+User=Người sử dụng
+Users=Người sử dụng
+Group=Nhóm
+Groups=Nhóm
+Password=Mật khẩu
+PasswordRetype=Nhập lại mật khẩu của bạn
+NoteSomeFeaturesAreDisabled=Lưu ý rằng rất nhiều tính năng / modules bị vô hiệu hóa trong trình diễn này.
+Name=Tên
+Person=Người
+Parameter=Thông số
+Parameters=Các thông số
+Value=Giá trị
+GlobalValue=Giá trị toàn cầu
+PersonalValue=Giá trị cá nhân
+NewValue=Giá trị mới
+CurrentValue=Giá trị hiện tại
+Code=Mã
+Type=Loại
+Language=Ngôn ngữ
+MultiLanguage=Đa ngôn ngữ
+Note=Lưu ý
+CurrentNote=Lưu ý hiện tại
+Title=Tiêu đề
+Label=Nhãn
+RefOrLabel=Tài liệu tham khảo. hay nhãn hiệu
+Info=Đăng nhập
+Family=Gia đình
+Description=Mô tả
+Designation=Mô tả
+Model=Mô hình
+DefaultModel=Mô hình mặc định
+Action=Sự kiện
+About=Về
+Number=Số
+NumberByMonth=Số theo tháng
+AmountByMonth=Số tiền theo tháng
+Numero=Số
+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 <b>%s</b>
+Connection=Kết nối
+Setup=Thiết lập
+Alert=Báo
+Previous=Trước
+Next=Tiếp theo
+Cards=Thẻ
+Card=Thẻ
+Now=Bây giờ
+Date=Ngày
+DateStart=Ngày bắt đầu
+DateEnd=Ngày kết thúc
+DateCreation=Ngày tạo
+DateModification=Ngày sửa đổi
+DateModificationShort=Modif. ngày
+DateLastModification=Cuối ngày sửa đổi
+DateValidation=Ngày xác nhận
+DateClosing=Ngày kết thúc
+DateDue=Ngày đáo hạn
+DateValue=Giá trị ngày
+DateValueShort=Giá trị ngày
+DateOperation=Ngày hoạt động
+DateOperationShort=Oper. Ngày
+DateLimit=Giới hạn ngày
+DateRequest=Ngày yêu cầu
+DateProcess=Ngày quá trình
+DatePlanShort=Ngày bào
+DateRealShort=Ngày thực.
+DateBuild=Báo cáo xây dựng ngày
+DatePayment=Ngày thanh toán
+DurationYear=năm
+DurationMonth=tháng
+DurationWeek=tuần
+DurationDay=ngày
+DurationYears=năm
+DurationMonths=tháng
+DurationWeeks=tuần
+DurationDays=ngày
+Year=Năm
+Month=Tháng
+Week=Tuần
+Day=Ngày
+Hour=Giờ
+Minute=Phút
+Second=Thứ hai
+Years=Năm
+Months=Tháng
+Days=Ngày
+days=ngày
+Hours=Giờ
+Minutes=Phút
+Seconds=Giây
+Today=Hôm nay
+Yesterday=Hôm qua
+Tomorrow=Ngày mai
+Morning=Buổi sáng
+Afternoon=Chiều
 Quadri=Quadri
-MonthOfDay=Month of the day
+MonthOfDay=Tháng ngày
 HourShort=H
-Rate=Rate
-UseLocalTax=Include tax
+MinuteShort=mn
+Rate=Tỷ giá
+UseLocalTax=Bao gồm thuế
 Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
+KiloBytes=Kilobyte
+MegaBytes=MB
+GigaBytes=Gigabyte
+TeraBytes=Terabyte
 b=b.
 Kb=Kb
 Mb=Mb
 Gb=Gb
 Tb=Tb
 Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-DefaultGlobalValue=Global value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUTTC=U.P.
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyHT=Price for this quantity (net of tax)
-PriceQtyMinHT=Price quantity min. (net of tax)
-PriceQtyTTC=Price for this quantity (inc. tax)
-PriceQtyMinTTC=Price quantity min. (inc. of tax)
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-IncludedVAT=Included tax
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
+Copy=Sao chép
+Paste=Dán
+Default=Mặc định
+DefaultValue=Giá trị mặc định
+DefaultGlobalValue=Giá trị toàn cầu
+Price=Giá
+UnitPrice=Đơn giá
+UnitPriceHT=Đơn giá (net)
+UnitPriceTTC=Đơn giá
+PriceU=UP
+PriceUHT=UP (net)
+PriceUTTC=UP
+Amount=Số tiền
+AmountInvoice=Lượng hóa đơn
+AmountPayment=Số tiền thanh toán
+AmountHTShort=Số tiền (ròng)
+AmountTTCShort=(Bao gồm thuế). Số tiền
+AmountHT=Số tiền (đã trừ thuế)
+AmountTTC=(Bao gồm thuế). Số tiền
+AmountVAT=Số tiền thuế
+AmountLT1=Số tiền thuế 2
+AmountLT2=Số tiền thuế 3
+AmountLT1ES=Số tiền RE
+AmountLT2ES=Số tiền IRPF
+AmountTotal=Tổng số tiền
+AmountAverage=Số tiền trung bình
+PriceQtyHT=Giá cho số lượng này (đã trừ thuế)
+PriceQtyMinHT=Giá số lượng phút. (Đã trừ thuế)
+PriceQtyTTC=Giá cho số lượng (bao thuế). Này
+PriceQtyMinTTC=Giá số lượng phút. (Inc. Thuế)
+Percentage=Tỷ lệ phần trăm
+Total=Tổng số
+SubTotal=Tổng số tiền
+TotalHTShort=Tổng số (net)
+TotalTTCShort=(Bao gồm thuế). Tổng số
+TotalHT=Tổng số (đã trừ thuế)
+TotalHTforthispage=Tổng số (đã trừ thuế) cho trang này
+TotalTTC=(Bao gồm thuế). Tổng số
+TotalTTCToYourCredit=Tổng số (inc. Thuế) để tín dụng của bạn
+TotalVAT=Tổng số thuế
+TotalLT1=Tổng số thuế 2
+TotalLT2=Tổng số thuế 3
+TotalLT1ES=Tổng RE
+TotalLT2ES=Tổng số IRPF
+IncludedVAT=Đã bao gồm thuế
+HT=Sau thuế
+TTC=Inc thuế
+VAT=Thuế bán hàng
 LT1ES=RE
 LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
+VATRate=Thuế suất
+Average=Trung bình
 Sum=Sum
 Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-ShortInfo=Info.
-Ref=Ref.
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsDone=Events done
-ActionsToDoShort=To do
-ActionsRunningshort=Started
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=Started
-ActionDoneShort=Finished
+Module=Mô-đun
+Option=Lựa chọn
+List=Danh sách
+FullList=Danh mục đầy đủ
+Statistics=Thống kê
+OtherStatistics=Số liệu thống kê khác
+Status=Tình trạng
+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
+RefPayment=Tài liệu tham khảo. thanh toán
+CommercialProposalsShort=Đề nghị thương mại
+Comment=Nhận xét
+Comments=Bình luận
+ActionsToDo=Sự kiện làm
+ActionsDone=Sự kiện thực hiện
+ActionsToDoShort=Để làm
+ActionsRunningshort=Bắt đầu
+ActionsDoneShort=Xong
+ActionNotApplicable=Không áp dụng
+ActionRunningNotStarted=Để bắt đầu
+ActionRunningShort=Bắt đầu
+ActionDoneShort=Hoàn thành
 ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events about this third party
-ActionsOnMember=Events about this member
-NActions=%s events
-NActionsLate=%s late
-Filter=Filter
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-MyBookmarks=My bookmarks
-OtherInformationsBoxes=Other information boxes
-DolibarrBoard=Dolibarr board
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Popularity=Popularity
-Categories=Categories
-Category=Category
+CompanyFoundation=Công ty / cơ sở
+ContactsForCompany=Liên hệ với bên thứ ba này
+ContactsAddressesForCompany=Liên hệ / địa chỉ cho các bên thứ ba này
+AddressesForCompany=Địa chỉ cho các bên thứ ba này
+ActionsOnCompany=Sự kiện về bên thứ ba này
+ActionsOnMember=Sự kiện về thành viên này
+NActions=Sự kiện% s
+NActionsLate=% S cuối
+RequestAlreadyDone=Request already recorded
+Filter=Lọc
+RemoveFilter=Bỏ bộ lọc
+ChartGenerated=Biểu đồ được tạo ra
+ChartNotGenerated=Biểu đồ không được tạo ra
+GeneratedOn=Xây dựng trên% s
+Generate=Tạo
+Duration=Thời gian
+TotalDuration=Tổng thời gian
+Summary=Tóm tắt
+MyBookmarks=Dấu trang của tôi
+OtherInformationsBoxes=Hộp thông tin khác
+DolibarrBoard=Ban Dolibarr
+DolibarrStateBoard=Thống kê
+DolibarrWorkBoard=Nhiệm vụ công việc của hội đồng quản trị
+Available=Có sẵn
+NotYetAvailable=Chưa có
+NotAvailable=Không có sẵn
+Popularity=Phổ biến
+Categories=Loại
+Category=Danh mục
 By=By
-From=From
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ReCalculate=Recalculate
-ResultOk=Success
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Opened
-New=New
-Discount=Discount
-Unknown=Chưa rõ
-General=General
-Size=Size
-Received=Received
-Paid=Paid
+From=Từ
+to=để
+and=và
+or=hoặc
+Other=Khác
+Others=Loại khác
+OtherInformations=Thông tin khác
+Quantity=Số lượng
+Qty=Số lượng
+ChangedBy=Thay đổi bằng cách
+ReCalculate=Tính toán lại
+ResultOk=Thành công
+ResultKo=Không
+Reporting=Báo cáo
+Reportings=Báo cáo
+Draft=Dự thảo
+Drafts=Dự thảo
+Validated=Xác nhận
+Opened=Mở
+New=Mới
+Discount=Giảm giá
+Unknown=Không biết
+General=Chung
+Size=Kích thước
+Received=Nhận
+Paid=Trả
 Topic=Sujet
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Receipts=Receipts
+ByCompanies=Do các bên thứ ba
+ByUsers=Người sử dụng
+Links=Liên kết
+Link=Liên kết
+Receipts=Tiền thu
 Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-PreviousStep=Previous step
-Datas=Data
-None=None
-NoneF=None
-Late=Late
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-Login=Login
-CurrentLogin=Current login
-January=January
-February=February
-March=March
-April=April
+Preview=Xem trước
+NextStep=Bước tiếp theo
+PreviousStep=Bước trước
+Datas=Dữ liệu
+None=Không
+NoneF=Không
+Late=Cuối
+Photo=Hình ảnh
+Photos=Hình ảnh
+AddPhoto=Thêm hình ảnh
+Login=Đăng nhập
+CurrentLogin=Đăng nhập hiện tại
+January=Tháng một
+February=Tháng Hai
+March=Tháng
+April=Tháng Tư
 May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
+June=Tháng Sáu
+July=Tháng Bảy
+August=Tháng Tám
+September=Tháng Chín
+October=Tháng Mười
+November=Tháng mười một
+December=Tháng Mười Hai
 JanuaryMin=Jan
-FebruaryMin=Feb
+FebruaryMin=Tháng Hai
 MarchMin=Mar
-AprilMin=Apr
+AprilMin=Tháng Tư
 MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
+JuneMin=Tháng Sáu
+JulyMin=Tháng Bảy
+AugustMin=Tháng Tám
+SeptemberMin=Tháng Chín
+OctoberMin=Tháng Mười
+NovemberMin=Tháng mười một
+DecemberMin=Tháng Mười Hai
+Month01=Tháng một
+Month02=Tháng Hai
+Month03=Tháng
+Month04=Tháng Tư
 Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
+Month06=Tháng Sáu
+Month07=Tháng Bảy
+Month08=Tháng Tám
+Month09=Tháng Chín
+Month10=Tháng Mười
+Month11=Tháng mười một
+Month12=Tháng Mười Hai
 MonthShort01=Jan
-MonthShort02=Feb
+MonthShort02=Tháng Hai
 MonthShort03=Mar
-MonthShort04=Apr
+MonthShort04=Tháng Tư
 MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
+MonthShort06=Tháng Sáu
+MonthShort07=Tháng Bảy
+MonthShort08=Tháng Tám
+MonthShort09=Tháng Chín
+MonthShort10=Tháng Mười
+MonthShort11=Tháng mười một
+MonthShort12=Tháng Mười Hai
+AttachedFiles=Tập tin và tài liệu kèm theo
+FileTransferComplete=Tập tin đã được tải lên successfuly
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
-DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Mot clé
-Legend=Legend
-FillTownFromZip=Fill city from zip
-Fill=Fill
-Reset=Reset
-ShowLog=Show log
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfCustomers=Number of customers
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfReferers=Number of referrers
-Referers=Refering objects
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildPDF=Build PDF
-RebuildPDF=Rebuild PDF
-BuildDoc=Build Doc
-RebuildDoc=Rebuild Doc
-Entity=Environment
-Entities=Entities
-EventLogs=Logs
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-AccountancyPreview=Accountancy preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-ShowAccountancyPreview=Show accountancy preview
-ShowProspectPreview=Show prospect preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Question=Question
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send Ack. by email
-NoEMail=No email
-NoMobilePhone=No mobile phone
-Owner=Owner
-DetectedVersion=Detected version
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s records modified
-AutomaticCode=Automatic code
-NotManaged=Not managed
-FeatureDisabled=Feature disabled
-MoveBox=Move box %s
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-PartialWoman=Partial
-PartialMan=Partial
-TotalWoman=Total
-TotalMan=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-Color=Color
-Documents=Linked files
-DocumentsNb=Linked files (%s)
-Documents2=Documents
-BuildDocuments=Generated documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
+DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
+ReportName=Tên báo cáo
+ReportPeriod=Kỳ báo cáo
+ReportDescription=Mô tả
+Report=Báo cáo
+Keyword=Một Clé
+Legend=Huyền thoại
+FillTownFromZip=Điền vào thành phố từ zip
+Fill=Điền
+Reset=Thiết lập lại
+ShowLog=Hiển thị bản ghi
+File=Tập tin
+Files=Tập tin
+NotAllowed=Không được phép
+ReadPermissionNotAllowed=Cho phép đọc không được phép
+AmountInCurrency=Số tiền tệ trong %s
+Example=Ví dụ
+Examples=Ví dụ
+NoExample=Không có ví dụ
+FindBug=Thông báo lỗi
+NbOfThirdParties=Số của bên thứ ba
+NbOfCustomers=Số lượng khách hàng
+NbOfLines=Số dòng
+NbOfObjects=Số đối tượng
+NbOfReferers=Số referrers
+Referers=Đề cập đối tượng
+TotalQuantity=Tổng số lượng
+DateFromTo=Từ %s đến %s
+DateFrom=Từ% s
+DateUntil=Cho đến% s
+Check=Kiểm tra
+Internal=Nội bộ
+External=Bên ngoài
+Internals=Nội bộ
+Externals=Bên ngoài
+Warning=Cảnh báo
+Warnings=Cảnh báo
+BuildPDF=Xây dựng PDF
+RebuildPDF=Xây dựng lại định dạng file pdf
+BuildDoc=Xây dựng Doc
+RebuildDoc=Xây dựng lại Doc
+Entity=Môi trường
+Entities=Các đối tượng
+EventLogs=Bản ghi
+CustomerPreview=Xem trước của khách hàng
+SupplierPreview=Nhà cung cấp bản xem trước
+AccountancyPreview=Kế toán xem trước
+ShowCustomerPreview=Hiện khách hàng xem trước
+ShowSupplierPreview=Hiện nhà cung cấp xem trước
+ShowAccountancyPreview=Hiện kế toán xem trước
+ShowProspectPreview=Hiện khách hàng tiềm năng xem trước
+RefCustomer=Tài liệu tham khảo. khách hàng
+Currency=Ngoại tệ
+InfoAdmin=Thông tin dành cho quản trị viên
+Undo=Hoàn tác
+Redo=Làm lại
+ExpandAll=Mở rộng tất cả
+UndoExpandAll=Hoàn tác mở rộng
+Reason=Lý do
+FeatureNotYetSupported=Tính năng chưa được hỗ trợ
+CloseWindow=Đóng cửa sổ
+Question=Câu hỏi
+Response=Phản ứng
+Priority=Ưu tiên
+SendByMail=Gửi bởi Thư điện tử
+MailSentBy=Email gửi
+TextUsedInTheMessageBody=Email cơ thể
+SendAcknowledgementByMail=Gửi Ack. qua email
+NoEMail=Không có email
+NoMobilePhone=Không có điện thoại di động
+Owner=Chủ sở hữu
+DetectedVersion=Phiên bản phát hiện
+FollowingConstantsWillBeSubstituted=Các hằng số sau đây sẽ được thay thế bằng giá trị tương ứng.
+Refresh=Làm mới
+BackToList=Trở lại danh sách
+GoBack=Quay trở lại
+CanBeModifiedIfOk=Có thể được sửa đổi nếu hợp lệ
+CanBeModifiedIfKo=Có thể được sửa đổi nếu không hợp lệ
+RecordModifiedSuccessfully=Ghi lại đổi thành công
+RecordsModified=Hồ sơ %s sửa đổi
+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
+Offered=Cung cấp
+NotEnoughPermissions=Bạn không có quyền cho hành động này
+SessionName=Tên phiên
+Method=Phương pháp
+Receive=Nhận
+PartialWoman=Một phần
+PartialMan=Một phần
+TotalWoman=Tổng số
+TotalMan=Tổng số
+NeverReceived=Không bao giờ nhận được
+Canceled=Hủy bỏ
+YouCanChangeValuesForThisListFromDictionarySetup=Bạn có thể thay đổi giá trị cho danh sách này từ trình đơn thiết lập - từ điển
+Color=Màu
+Documents=Tập tin liên kết
+DocumentsNb=Các tập tin liên kết (%s)
+Documents2=Tài liệu
+BuildDocuments=Các tài liệu được tạo ra
+UploadDisabled=Tải khuyết tật
+MenuECM=Tài liệu
 MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-ListOfFiles=List of available files
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
+MenuMembers=Thành viên
+MenuAgendaGoogle=Chương trình nghị sự của Google
+ThisLimitIsDefinedInSetup=Hạn Dolibarr (Menu nhà thiết lập bảo mật): %s Kb, PHP giới hạn: %s Kb
+NoFileFound=Không có tài liệu được lưu trong thư mục này
+CurrentUserLanguage=Ngôn ngữ hiện tại
+CurrentTheme=Chủ đề hiện tại
+CurrentMenuManager=Quản lý trình đơn hiện tại
+DisabledModules=Module khuyết tật
+For=Đối với
+ForCustomer=Đối với khách hàng
+Signature=Chữ ký
+HidePassword=Hiện lệnh với mật khẩu ẩn
+UnHidePassword=Hiển thị lệnh thực với mật khẩu rõ ràng
+Root=Gốc
+Informations=Thông tin
+Page=Trang
+Notes=Ghi chú
+AddNewLine=Thêm dòng mới
+AddFile=Thêm tập tin
+ListOfFiles=Danh sách các tập tin có sẵn
+FreeZone=Vào cửa miễn phí
+FreeLineOfType=Nhập miễn phí các loại
+CloneMainAttributes=Clone đối tượng với các thuộc tính chính của nó
 PDFMerge=PDF Merge
-Merge=Merge
-PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
-NoMenu=No sub-menu
-WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
-CoreErrorTitle=System error
-CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator.
-CreditCard=Credit card
-FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-OptionalFieldsSetup=Extra attributes setup
-URLPhoto=URL of photo/logo
-SetLinkToThirdParty=Link to another third party
-CreateDraft=Create draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-DeleteAFile=Delete a file
-ConfirmDeleteAFile=Are you sure you want to delete file
-NoResults=No results
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-HomeDashboard=Home summary
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-
+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 <b>%s</b> đượ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 <b>%s</b> là bắt buộc
+FieldsWithIsForPublic=Các lĩnh vực với <b>%s</b> đượ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ợ
+RequiredField=Dòng bắt buộc
+Result=Kết quả
+ToTest=Kiểm tra
+ValidateBefore=Thẻ phải được xác nhận trước khi sử dụng tính năng này
+Visibility=Tầm nhìn
+Private=Tin
+Hidden=Thành viên ẩn danh
+Resources=Tài nguyên
+Source=Nguồn
+Prefix=Tiền tố
+Before=Trước khi
+After=Sau khi
+IPAddress=Địa chỉ IP
+Frequency=Tần số
+IM=Nhắn tin tức thời
+NewAttribute=Thuộc tính mới
+AttributeCode=Mã thuộc tính
+OptionalFieldsSetup=Thuộc tính thiết lập thêm
+URLPhoto=URL của hình ảnh / logo
+SetLinkToThirdParty=Liên kết đến một bên thứ ba
+CreateDraft=Tạo dự thảo
+SetToDraft=Về dự thảo
+ClickToEdit=Nhấn vào đây để chỉnh sửa
+ObjectDeleted=Đối tượng% s bị xóa
+ByCountry=Theo quốc gia
+ByTown=Bởi thị trấn
+ByDate=Theo ngày
+ByMonthYear=Theo tháng / năm
+ByYear=Đến năm
+ByMonth=Theo tháng
+ByDay=Đến ngày
+BySalesRepresentative=Đại diện bán hàng
+LinkedToSpecificUsers=Liên kết với một số liên lạc người dùng cụ thể
+DeleteAFile=Xóa một tập tin
+ConfirmDeleteAFile=Bạn có chắc chắn muốn xóa tập tin
+NoResults=Không có kết quả
+ModulesSystemTools=Module công cụ
+Test=Kiểm tra
+Element=Yếu tố
+NoPhotoYet=Chưa có ảnh chưa
+HomeDashboard=Trang chủ tóm tắt
+Deductible=Giảm trừ doanh thu
+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 <strong>"%s"</strong> (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 (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=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
+Monday=Thứ hai
+Tuesday=Thứ ba
+Wednesday=Thứ tư
+Thursday=Thứ năm
+Friday=Thứ sáu
+Saturday=Thứ bảy
+Sunday=Chủ Nhật
 MondayMin=Mo
 TuesdayMin=Tu
-WednesdayMin=We
+WednesdayMin=Chúng tôi
 ThursdayMin=Th
-FridayMin=Fr
+FridayMin=Cha
 SaturdayMin=Sa
 SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
+Day1=Thứ hai
+Day2=Thứ ba
+Day3=Thứ tư
+Day4=Thứ năm
+Day5=Thứ sáu
+Day6=Thứ bảy
+Day0=Chủ Nhật
 ShortMonday=M
 ShortTuesday=T
 ShortWednesday=W
diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
index 3fca6d7a644..0ae04d128e2 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/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
-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<br/>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=Biên lợi nhuận
+Margins=Biên lợi nhuận
+TotalMargin=Tổng biên
+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ệ 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ý 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ụ
+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", 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 biên lợi nhuận.
+MARGIN_TYPE=Loại biên
+MargeBrute=Biên liệu
+MargeNette=Tỷ suất biên lợi nhuận
+MARGIN_TYPE_DETAILS=Biên liệu: Giá bán - giá mua <br/> 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 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 eb2063c629c..eb2687751c6 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -1,205 +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: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. 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
+MembersArea=Khu vực thành viên
+PublicMembersArea=Thành viên khu vực công cộng
+MemberCard=Thẻ thành viên
+SubscriptionCard=Thẻ đăng ký
+Member=Thành viên
+Members=Thành viên
+MemberAccount=Thành viên đăng nhập
+ShowMember=Hiện thẻ thành viên
+UserNotLinkedToMember=Người sử dụng không liên quan đến một thành viên
+ThirdpartyNotLinkedToMember=Của bên thứ ba không liên quan đến một thành viên
+MembersTickets=Thành viên Vé
+FundationMembers=Thành viên sáng lập
+Attributs=Thuộc tính
+ErrorMemberTypeNotDefined=Thành viên gõ không được xác định
+ListOfPublicMembers=Danh sách thành viên công cộng
+ListOfValidatedPublicMembers=Danh sách xác nhận thành viên công cộng
+ErrorThisMemberIsNotPublic=Thành viên này không được công khai
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Một thành viên khác <b>(tên:% s,</b> đăng <b>nhập:% s)</b> đã được liên kết với một bên thứ <b>ba% s.</b> Hủy bỏ liên kết này đầu tiên bởi vì một bên thứ ba không thể được liên kết với chỉ một thành viên (và ngược lại).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Vì lý do bảo mật, bạn phải được cấp phép để chỉnh sửa tất cả người dùng để có thể liên kết một thành viên cho một người dùng mà không phải là của bạn.
+ThisIsContentOfYourCard=Đây là chi tiết thẻ của bạn
+CardContent=Nội dung của thẻ thành viên của bạn
+SetLinkToUser=Liên kết đến một người sử dụng Dolibarr
+SetLinkToThirdParty=Liên kết đến một Dolibarr bên thứ ba
+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 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
+MenuMembersValidated=Các thành viên xác nhận
+MenuMembersUpToDate=Lên đến các thành viên ngày
+MenuMembersNotUpToDate=Trong số các thành viên ngày
+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=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ý
+MemberId=Thành viên id
+NewMember=Thành viên mới
+NewType=Loại thành viên mới
+MemberType=Kiểu thành viên
+MemberTypeId=Kiểu thành viên id
+MemberTypeLabel=Kiểu thành viên nhãn
+MembersTypes=Loại thành viên
+MembersAttributes=Thuộc tính thành viên
+SearchAMember=Tìm kiếm thành viên
+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=mô tả hết hạn
+MemberStatusActiveLateShort=Hết hạn
+MemberStatusPaid=Đăng ký cập nhật
+MemberStatusPaidShort=Cho đến nay
+MemberStatusResiliated=Thành viên Resiliated
 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
-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
+MembersStatusToValid=Dự thảo các thành viên
+MembersStatusToValidShort=Dự thảo các thành viên
+MembersStatusValidated=Các thành viên xác nhận
+MembersStatusPaid=Đăng ký cập nhật
+MembersStatusPaidShort=Cho đến nay
+MembersStatusNotPaid=Đăng ký trong ngày
+MembersStatusNotPaidShort=Trong ngày
+MembersStatusResiliated=Thành viên Resiliated
+MembersStatusResiliatedShort=Thành viên Resiliated
+NewCotisation=Đóng góp mới
+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=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=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=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
+SubscriptionRequired=Yêu cầu đăng ký
+EditType=Chỉnh sửa loại thành viên
+DeleteType=Xóa
+VoteAllowed=Vote cho phép
+Physical=Vật lý
+Moral=Đạo đức
+MorPhy=Đạo đức / Vật lý
+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 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
+ConfirmValidateMember=Bạn có chắc chắn bạn muốn xác nhận thành viên này?
+FollowingLinksArePublic=Các liên kết sau đây là các trang mở không được bảo vệ bởi bất kỳ sự cho phép Dolibarr. Họ không formated trang, cung cấp như ví dụ cho thấy làm thế nào để liệt kê các cơ sở dữ liệu thành viên.
+PublicMemberList=Danh sách thành viên công cộng
+BlankSubscriptionForm=Hình thức công lập tự động đăng ký
+BlankSubscriptionFormDesc=Dolibarr có thể cung cấp cho bạn một URL nào để cho phép khách tham quan bên ngoài để yêu cầu đăng ký vào các nền tảng. Nếu một module thanh toán trực tuyến được kích hoạt, một hình thức thanh toán cũng sẽ được tự động cung cấp.
+EnablePublicSubscriptionForm=Kích hoạt tính năng đăng ký tự động, hình thức công lập
+MemberPublicLinks=Liên kết công cộng / trang
+ExportDataset_member_1=Thành viên và đăng ký
+ImportDataset_member_1=Thành viên
+LastMembers=Thành viên cuối% s
+LastMembersModified=Các thành viên biến đổi cuối cùng% s
+LastSubscriptionsModified=Cuối% s đăng ký sửa đổi
+AttributeName=Tên thuộc tính
+String=Chuỗi
+Text=Văn bản
 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
-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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a>.<br>To pay using a Credit Card or Paypal, click on button at bottom of this page.<br>
-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
+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=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
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail nhận được trong trường hợp tự động ghi của khách
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Tiêu đề thư điện tử cho thành viên autosubscription
+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 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
+DescADHERENT_ETIQUETTE_TYPE=Định dạng của trang nhãn
+DescADHERENT_ETIQUETTE_TEXT=Văn bản in trên tờ địa chỉ thành viên
+DescADHERENT_CARD_TYPE=Định dạng của trang thẻ
+DescADHERENT_CARD_HEADER_TEXT=Văn bản in trên thẻ thành viên
+DescADHERENT_CARD_TEXT=Văn bản in trên thẻ thành viên (sắp xếp bên trái)
+DescADHERENT_CARD_TEXT_RIGHT=Văn bản in trên thẻ thành viên (sắp xếp ở bên phải)
+DescADHERENT_CARD_FOOTER_TEXT=Văn bản in trên dưới cùng của thẻ thành viên
+GlobalConfigUsedIfNotDefined=Văn bản quy định tại thiết lập mô-đun Quỹ sẽ được sử dụng nếu không được định nghĩa ở đây
+MayBeOverwrited=Văn bản này có thể được xác định theo giá trị overwrited cho loại thành viên này
+ShowTypeCard=Hiển thị loại '% s'
+HTPasswordExport=thế hệ tập tin htpassword
+NoThirdPartyAssociatedToMember=Không có bên thứ ba liên quan đến thành viên này
+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 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
+LinkToGeneratedPages=Tạo danh thiếp
+LinkToGeneratedPagesDesc=Màn hình này cho phép bạn tạo ra các tập tin PDF với thẻ kinh doanh cho tất cả các thành viên của bạn hoặc một thành viên đặc biệt.
+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 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
+MembersStatisticsByState=Thành viên thống kê của tiểu bang / tỉnh
+MembersStatisticsByTown=Thành viên thống kê của thị trấn
+MembersStatisticsByRegion=Thành viên thống kê theo vùng
+MemberByRegion=Thành viên theo vùng
+NbOfMembers=Số lượng thành viên
+NoValidatedMemberYet=Không có thành viên xác nhận tìm thấy
+MembersByCountryDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của các nước. Tuy nhiên đồ họa phụ thuộc vào dịch vụ Google đồ thị trực tuyến và chỉ có nếu một kết nối internet là được làm việc.
+MembersByStateDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của tiểu bang / tỉnh / bang.
+MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của thị trấn.
+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=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ề mô tả
+NbOfSubscriptions=Số đăng ký
+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 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
+Particuliers=Cá nhân
+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 <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Để 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. <br>
+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 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/opensurvey.lang b/htdocs/langs/vi_VN/opensurvey.lang
index 0b191e426ec..615eba24e2f 100644
--- a/htdocs/langs/vi_VN/opensurvey.lang
+++ b/htdocs/langs/vi_VN/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
-ExpireDate=Limit date
-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 <strong>%s</strong> does not exists.
-OpenSurveyNothingToSetup=There is no specific setup to do.
-PollWillExpire=Your poll will expire automatically <strong>%s</strong> 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 :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "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
+Survey=Thăm dò ý kiến
+Surveys=Bình chọn
+OrganizeYourMeetingEasily=Tổ chức các cuộc họp và các cuộc thăm dò của bạn dễ dàng. Đầu tiên chọn loại của cuộc bình chọn ...
+NewSurvey=Thăm dò ý kiến ​​mới
+NoSurveysInDatabase=% S bình chọn (s) vào cơ sở dữ liệu.
+OpenSurveyArea=Khu vực thăm dò ý kiến
+AddACommentForPoll=Bạn có thể thêm một bình luận vào cuộc thăm dò ...
+AddComment=Thêm bình luận
+CreatePoll=Tạo cuộc thăm dò
+PollTitle=Tiêu đề cuộc thăm dò
+ToReceiveEMailForEachVote=Nhận được một email cho mỗi phiếu bầu
+TypeDate=Ngày loại
+TypeClassic=Loại tiêu chuẩn
+OpenSurveyStep2=Chọn số ngày của bạn amoung những ngày miễn phí (màu xám). Những ngày đã chọn là màu xanh lá cây. Bạn có thể bỏ chọn một ngày đã chọn trước đó bằng cách nhấn vào nó một lần nữa
+RemoveAllDays=Hủy bỏ tất cả các ngày
+CopyHoursOfFirstDay=Giờ bản sao của ngày đầu tiên
+RemoveAllHours=Hủy bỏ tất cả các giờ
+SelectedDays=Ngày đã chọn
+TheBestChoice=Sự lựa chọn tốt nhất hiện nay là
+TheBestChoices=Các lựa chọn tốt nhất hiện nay là
+with=với
+OpenSurveyHowTo=Nếu bạn đồng ý bỏ phiếu trong cuộc bình chọn này, bạn phải cung cấp tên của bạn, chọn các giá trị phù hợp nhất cho bạn và xác nhận với các nút dấu cộng ở cuối dòng.
+CommentsOfVoters=Ý kiến ​​của cử tri
+ConfirmRemovalOfPoll=Bạn Bạn có chắc chắn muốn xóa bình chọn này (và tất cả các phiếu)
+RemovePoll=Hủy bỏ thăm dò ý kiến
+UrlForSurvey=URL để giao tiếp để có được một truy cập trực tiếp thăm dò ý kiến
+PollOnChoice=Bạn đang tạo ra một cuộc bình chọn để thực hiện một sự lựa chọn đa cho một cuộc thăm dò. Đầu tiên nhập tất cả các lựa chọn có thể cho thăm dò ý kiến ​​của bạn:
+CreateSurveyDate=Tạo một cuộc thăm dò ngày
+CreateSurveyStandard=Tạo một cuộc thăm dò ý
+CheckBox=Hộp đơn giản
+YesNoList=Danh sách (trống / có / không)
+PourContreList=Danh sách (trống / cho / chống)
+AddNewColumn=Thêm cột mới
+TitleChoice=Nhãn lựa chọn
+ExportSpreadsheet=Kết quả xuất khẩu bảng tính
+ExpireDate=Giới hạn ngày
+NbOfSurveys=Số các cuộc thăm dò
+NbOfVoters=Nb của cử tri
+SurveyResults=Kết quả
+PollAdminDesc=Bạn được phép thay đổi tất cả các dòng bỏ phiếu trong bầu chọn này với nút "Edit". Bạn có thể, cũng như, loại bỏ một cột hoặc một dòng với% s. Bạn cũng có thể thêm một cột mới với% s.
+5MoreChoices=Hơn 5 lựa chọn
+Abstention=Bỏ phiếu trắng
+Against=Chống lại
+YouAreInivitedToVote=Bạn được mời bỏ phiếu cho cuộc bình chọn này
+VoteNameAlreadyExists=Tên này đã được sử dụng cho cuộc bình chọn này
+ErrorPollDoesNotExists=Lỗi, cuộc thăm <strong>dò% s</strong> không tồn tại.
+OpenSurveyNothingToSetup=Không có thiết lập cụ thể để làm.
+PollWillExpire=Thăm dò ý kiến của bạn sẽ tự động hết <strong>hạn% s</strong> ngày kể từ ngày cuối cùng của cuộc bình chọn của bạn.
+AddADate=Thêm một ngày
+AddStartHour=Thêm bắt đầu giờ
+AddEndHour=Thêm vào cuối giờ
+votes=vote (s)
+NoCommentYet=Không có ý kiến ​​đã được đưa lên thăm dò ý kiến ​​này được nêu ra
+CanEditVotes=Có thể thay đổi phiếu bầu của người khác
+CanComment=Cử tri có thể bình luận trong cuộc thăm dò
+CanSeeOthersVote=Cử tri có thể nhìn thấy bầu của người khác
+SelectDayDesc=Đối với mỗi ngày đã chọn, bạn có thể chọn, hoặc không, giờ đáp ứng theo định dạng sau: <br> - Trống, <br> - "8h", "8H" hoặc "08:00" để cung cấp cho đầu giờ của cuộc họp, <br> - "8-11", "8h-11h", "8H-11H" hoặc "8: 00-11: 00" để cho đầu và cuối giờ của cuộc họp, <br> - "8h15-11h15", "8H15-11H15" hoặc "8: 15-11: 15" cho điều tương tự nhưng ở phút.
+BackToCurrentMonth=Về tháng hiện tại
+ErrorOpenSurveyFillFirstSection=Bạn chưa điền phần đầu tiên của việc tạo ra cuộc thăm dò
+ErrorOpenSurveyOneChoice=Nhập ít nhất một lựa chọn
+ErrorOpenSurveyDateFormat=Ngày phải có định dạng YYYY-MM-DD
+ErrorInsertingComment=Có một lỗi trong khi chèn bình luận của bạn
+MoreChoices=Nhập nhiều lựa chọn hơn cho các cử tri
+SurveyExpiredInfo=Thời gian biểu quyết của cuộc thăm dò này đã hết hạn.
+EmailSomeoneVoted=% S đã lấp đầy một đường thẳng. Bạn có thể tìm thăm dò ý kiến ​​của bạn tại liên kết:% s
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 62ffad34f77..37da0e7191f 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -1,163 +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=Trật tự
-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
+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=Đơn đặt hàng mới
+ToOrder=Tạo đơn đặt hàng
+MakeOrder=Tạo đơn đặt hàng
+SupplierOrder=Để nhà cung cấp
+SuppliersOrders=Nhà cung cấp đơn đặt hàng
+SuppliersOrdersRunning=Đơn đặt hàng của các nhà cung cấp hiện tại
+CustomerOrder=Đơn đặt hàng
+CustomersOrders=Đơ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
+CustomersOrdersAndOrdersLines=Đơn đặt hàng của khách hàng và đơn đặt hàng của dòng
+OrdersToValid=Đơn đặt hàng của khách hàng để xác nhận
+OrdersToBill=Đơn đặt hàng của khách hàng cung cấp
+OrdersInProcess=Đơn đặt hàng của khách hàng trong quá trình
+OrdersToProcess=Đơn đặt hàng của khách hàng để quá trình
+SuppliersOrdersToProcess=Đơn đặt hàng của nhà cung cấp cho quá trình
+StatusOrderCanceledShort=Hủy bỏ
+StatusOrderDraftShort=Dự thảo
+StatusOrderValidatedShort=Xác nhận
+StatusOrderSentShort=Trong quá trình
+StatusOrderSent=Lô hàng trong quá trình
+StatusOrderOnProcessShort=Tiếp 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=Đ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=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
+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=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 <b>%s</b> ?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> 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 <b>%s</b> ?
-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 <b>%s</b> ?
-DispatchSupplierOrder=Receiving supplier order %s
+Discount=Giảm giá
+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=Đơn hàng chưa xác nhận
+DeleteOrder=Xóa đơn hàng
+CancelOrder=Hủy đơn hàng
+AddOrder=Tạo đơn hàng
+AddToMyOrders=Thêm vào đơn đặt hàng của tôi
+AddToOtherOrders=Thêm vào đơn đặt hàng khác
+AddToDraftOrders=Thêm vào đơn hàng nháp
+ShowOrder=Hiển thị đơn đặt hàng
+NoOpenedOrders=Không có đơn hàng được mở
+NoOtherOpenedOrders=Không có đơn hàng được mở khác
+NoDraftOrders=Không có đơn hàng nháp
+OtherOrders=Đơn đặt hàng khác
+LastOrders=Đơn đặt hàng cuối %s
+LastModifiedOrders=Đơn đặt hàng đã điều chỉnh cuối cùng %s
+LastClosedOrders=Đơn hàng đã đóng cuối cùng %s
+AllOrders=Tất cả đơn đặt hàng
+NbOfOrders=Số đơn đặt hàng
+OrdersStatistics=Thống kê đơn đặt hàng
+OrdersStatisticsSuppliers=Số liệu thống kê để nhà cung cấp
+NumberOfOrdersByMonth=Số đơn đặt hàng theo tháng
+AmountOfOrdersByMonthHT=Số lượng đơn đặt hàng theo tháng (sau thuế)
+ListOfOrders=Danh sách đơn đặt hàng
+CloseOrder=Đóng đơn đặt hàng
+ConfirmCloseOrder=Bạn có chắc là bạn muốn thiết lập đơn đạt hàng này để giao? Khi một đơn hàng được giao, nó có thể được thiết lập để tính tiền.
+ConfirmCloseOrderIfSending=Bạn có chắc là bạn muốn đóng theo đơn đặt hàng này? Bạn phải đóng đơn đặt hàng chỉ khi tất cả vận chuyển được thực hiện.
+ConfirmDeleteOrder=Bạn Bạn có chắc chắn muốn xóa đơn đặt hàng này?
+ConfirmValidateOrder=Bạn có chắc chắn bạn muốn xác nhận đơn đặt hàng này dưới tên <b>%s</b> ?
+ConfirmUnvalidateOrder=Bạn Bạn có chắc chắn muốn chuyển lại đơn đặt hàng <b>%s</b> 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 <b>%s</b> ?
+GenerateBill=Tạo hóa đơn
+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=Số tham chiếu đơn hàng
+RefCustomerOrder=Số tham chiếu đơn đặt hàng của khách hàng
+RefCustomerOrderShort=Số tham chiếu đơn đặt hàng của khách hàng
+SendOrderByMail=Gửi đơn đặt hàng qua đường bưu điện
+ActionsOnOrder=Sự kiện về đơn đặt hàng
+NoArticleOfTypeProduct=Không có bài viết của loại 'sản phẩm' như vậy không có bài viết shippable về đơn hàng này
+OrderMode=Phương pháp đơn hàng
+AuthorRequest=Yêu cầu tác giả
+UseCustomerContactAsOrderRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ để người nhận
+RunningOrders=Đơn đặt hàng đang được xử lý
+UserWithApproveOrderGrant=Người dùng được cấp "thông qua các đơn đặt hàng" cho phép.
+PaymentOrderRef=Thanh toán đơn đặt hàng %s
+CloneOrder=Sao chép đơn đặt hàng
+ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép đơn đặt hàng này <b>%s</b> ?
+DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp %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
+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=Đị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=Đị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=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
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON liên tục không được xác định
+Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON liên tục không được xác định
+Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Không thể tải tập tin mô-đun '%s'
+Error_FailedToLoad_COMMANDE_ADDON_File=Không thể tải tập tin mô-đun '%s'
+Error_OrderNotChecked=Không có đơn đặt hàng cho hóa đơn được lựa chọn
 # Sources
-OrderSource0=Commercial proposal
+OrderSource0=Đề nghị thương mại
 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
+OrderSource2=Chiến dịch gửi thư
+OrderSource3=Điện thoại compaign
+OrderSource4=Chiến dịch Fax
+OrderSource5=Thương mại
+OrderSource6=Cửa hàng
+QtyOrdered=Số lượng đặt hàng
+AddDeliveryCostLine=Thêm một dòng chi phí giao hàng cho thấy trọng lượng của thứ tự
 # Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
+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=Mail
+OrderByMail=Thư
 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".
+OrderByEMail=Email
+OrderByWWW=Trực tuyến
+OrderByPhone=Điện thoại
+CreateInvoiceForThisCustomer=Thanh toán đơn hàng
+NoOrdersToInvoice=Không có đơn đặt hàng có thể thanh toán
+CloseProcessedOrdersAutomatically=Chọn "Đã xử lý" cho tất cả các đơn đặt hàng.
+OrderCreation=Tạo đơn hàng
+Ordered=Đơn hàng đã được tạo
+OrderCreated=Đơn đặt hàng của bạn đã được tạo ra
+OrderFail=Một lỗi đã xảy ra trong quá trình tạo đơn đặt hàng của bạn
+CreateOrders=Tạo đơn đặt hàng
+ToBillSeveralOrderSelectCustomer=Để tạo ra một hóa đơn cho một số đơn đặt hàng, đầu tiên nhấp vào khách hàng, sau đó chọn "%s".
diff --git a/htdocs/langs/vi_VN/oscommerce.lang b/htdocs/langs/vi_VN/oscommerce.lang
deleted file mode 100644
index 3ff9108ead4..00000000000
--- a/htdocs/langs/vi_VN/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/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 000930d4421..a87e0bbfbcb 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -1,122 +1,132 @@
 # 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.<br><br>Those tools can be reached from menu on the side.
-Birthday=Birthday
-BirthdayDate=Birthday
-DateToBirth=Date of birth
-BirthdayAlertOn= birthday alert active
-BirthdayAlertOff= birthday alert inactive
-Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_BILL_VALIDATE=Customer invoice validated
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
-Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
-Notify_ORDER_VALIDATE=Customer order validated
-Notify_PROPAL_VALIDATE=Customer proposal validated
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_ORDER_SENTBYMAIL=Customer order sent by mail
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_BILL_PAYED=Customer invoice payed
-Notify_BILL_CANCEL=Customer invoice canceled
-Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
-Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
-Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
-Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
-Notify_CONTRACT_VALIDATE=Contract validated
-Notify_FICHEINTER_VALIDATE=Intervention validated
-Notify_SHIPPING_VALIDATE=Shipping validated
-Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
-Notify_MEMBER_VALIDATE=Member validated
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Member subscribed
-Notify_MEMBER_RESILIATE=Member resiliated
-Notify_MEMBER_DELETE=Member deleted
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
-Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
-PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
-PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__SIGNATURE__
-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__
-PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that match your activity...
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Manage a freelance activity selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Manage a small or medium company selling products
-DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules)
-GoToDemo=Go to demo
-CreatedBy=Created by %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
-CanceledBy=Canceled by %s
-ClosedBy=Closed by %s
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailableShort=Available in a next version
-FeatureNotYetAvailable=Feature not yet available in this version
-FeatureExperimental=Experimental feature. Not stable in this version
-FeatureDevelopment=Development feature. Not stable in this version
-FeaturesSupported=Features supported
-Width=Width
-Height=Height
-Depth=Depth
-Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
-TotalWeight=Total weight
-WeightUnitton=tonnes
+SecurityCode=Mã bảo vệ
+Calendar=Lịch
+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. <br><br> Các công cụ này có thể đạt được từ menu bên cạnh.
+Birthday=Sinh nhật
+BirthdayDate=Sinh nhật
+DateToBirth=Ngày tháng năm sinh
+BirthdayAlertOn= sinh nhật cảnh báo hoạt động
+BirthdayAlertOff= sinh nhật không hoạt động cảnh báo
+Notify_FICHINTER_VALIDATE=Can thiệp xác nhận
+Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện
+Notify_BILL_VALIDATE=Hóa đơn khách hàng xác nhận
+Notify_BILL_UNVALIDATE=Hóa đơn của khách hàng unvalidated
+Notify_ORDER_SUPPLIER_APPROVE=Để nhà cung cấp đã được phê duyệt
+Notify_ORDER_SUPPLIER_REFUSE=Để nhà cung cấp từ chối
+Notify_ORDER_VALIDATE=Đơn đặt hàng được xác nhận
+Notify_PROPAL_VALIDATE=Đề nghị khách hàng xác nhận
+Notify_PROPAL_CLOSE_SIGNED=Propal khách hàng đóng cửa ký
+Notify_PROPAL_CLOSE_REFUSED=Propal khách hàng Mỹ đóng cửa từ chối
+Notify_WITHDRAW_TRANSMIT=Rút truyền
+Notify_WITHDRAW_CREDIT=Rút tín dụng
+Notify_WITHDRAW_EMIT=Thực hiện thu hồi
+Notify_ORDER_SENTBYMAIL=Đơn đặt hàng được gửi qua đường bưu điện
+Notify_COMPANY_CREATE=Bên thứ ba tạo ra
+Notify_COMPANY_SENTBYMAIL=Mail được gửi từ thẻ của bên thứ ba
+Notify_PROPAL_SENTBYMAIL=Đề nghị thương mại gửi qua đường bưu điện
+Notify_BILL_PAYED=Hóa đơn của khách hàng payed
+Notify_BILL_CANCEL=Hóa đơn của khách hàng bị hủy bỏ
+Notify_BILL_SENTBYMAIL=Hóa đơn của khách hàng gửi qua đường bưu điện
+Notify_ORDER_SUPPLIER_VALIDATE=Nhà cung cấp để xác nhận
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Để nhà cung cấp gửi qua đường bưu điện
+Notify_BILL_SUPPLIER_VALIDATE=Nhà cung cấp hóa đơn xác nhận
+Notify_BILL_SUPPLIER_PAYED=Nhà cung cấp hóa đơn payed
+Notify_BILL_SUPPLIER_SENTBYMAIL=Nhà cung cấp hóa đơn gửi qua đường bưu điện
+Notify_BILL_SUPPLIER_CANCELED=Nhà cung cấp hóa đơn hủy bỏ
+Notify_CONTRACT_VALIDATE=Hợp đồng xác nhận
+Notify_FICHEINTER_VALIDATE=Can thiệp xác nhận
+Notify_SHIPPING_VALIDATE=Vận chuyển xác nhận
+Notify_SHIPPING_SENTBYMAIL=Vận Chuyển gửi qua đường bưu điện
+Notify_MEMBER_VALIDATE=Thành viên được xác nhận
+Notify_MEMBER_MODIFY=Thành viên sửa đổi
+Notify_MEMBER_SUBSCRIPTION=Thành viên đã đăng ký
+Notify_MEMBER_RESILIATE=Thành viên resiliated
+Notify_MEMBER_DELETE=Thành viên bị xóa
+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
+AttachANewFile=Đính kèm một tập tin mới / tài liệu
+LinkedObject=Đối tượng liên quan
+Miscellaneous=Linh tinh
+NbOfActiveNotifications=Số thông báo
+PredefinedMailTest=Đây là một email thử nghiệm. Hai dòng được phân cách bằng một trở về vận chuyển. __SIGNATURE__
+PredefinedMailTestHtml=Đây là một thư <b>kiểm tra</b> (kiểm tra từ phải được in đậm). <br> Hai dòng được phân cách bằng một trở về vận chuyển. <br><br> __SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chúng tôi muốn cảnh báo bạn rằng __FACREF__ hóa đơn dường như không được payed. Vì vậy, đây là hóa đơn kèm một lần nữa, như một lời nhắc nhở. __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây đề nghị thương mại __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây thứ tự __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây để chúng tôi __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây vận chuyển __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây sự can thiệp __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
+DemoDesc=Dolibarr là một nhỏ gọn ERP / CRM sáng tác bởi một số module chức năng. Một bản demo bao gồm tất cả các mô-đun không có nghĩa là bất cứ điều gì như thế này không bao giờ xảy ra. Vì vậy, một số hồ sơ giới thiệu có sẵn.
+ChooseYourDemoProfil=Chọn hồ sơ cá nhân giới thiệu phù hợp với hoạt động của bạn ...
+DemoFundation=Quản lý thành viên của một nền tảng
+DemoFundation2=Quản lý thành viên và tài khoản ngân hàng của một nền tảng
+DemoCompanyServiceOnly=Quản lý dịch vụ bán hàng hoạt động tự do chỉ
+DemoCompanyShopWithCashDesk=Quản lý một cửa hàng với một bàn bằng tiền mặt
+DemoCompanyProductAndStocks=Quản lý một công ty bán các sản phẩm vừa và nhỏ
+DemoCompanyAll=Quản lý một công ty vừa và nhỏ với nhiều hoạt động (tất cả các mô-đun chính)
+GoToDemo=Tới để giới thiệu
+CreatedBy=Được tạo ra bởi% s
+ModifiedBy=Được thay đổi bởi% s
+ValidatedBy=Xác nhận bởi% s
+CanceledBy=Hủy bỏ bởi% s
+ClosedBy=Đóng bởi% s
+CreatedById=Id người dùng đã tạo ra
+ModifiedById=Id người dùng những người làm thay đổi cuối cùng
+ValidatedById=Sử dụng id người xác nhận
+CanceledById=Sử dụng id người bị hủy bỏ
+ClosedById=Sử dụng id người đóng
+CreatedByLogin=Đăng nhập người dùng đã tạo ra
+ModifiedByLogin=Người sử dụng đăng nhập người đã làm thay đổi cuối cùng
+ValidatedByLogin=Người sử dụng đăng nhập người xác nhận
+CanceledByLogin=Người sử dụng đăng nhập người hủy bỏ
+ClosedByLogin=Người sử dụng đăng nhập người đóng
+FileWasRemoved=Tập tin% s đã được gỡ bỏ
+DirWasRemoved=Thư mục% s đã được gỡ bỏ
+FeatureNotYetAvailableShort=Có sẵn trong một phiên bản tiếp theo
+FeatureNotYetAvailable=Tính năng chưa có sẵn trong phiên bản này
+FeatureExperimental=Tính năng thử nghiệm. Không ổn định trong phiên bản này
+FeatureDevelopment=Tính năng phát triển. Không ổn định trong phiên bản này
+FeaturesSupported=Các tính năng hỗ trợ
+Width=Chiều rộng
+Height=Chiều cao
+Depth=Độ sâu
+Top=Lên trên
+Bottom=Dưới
+Left=Còn lại
+Right=Ngay
+CalculatedWeight=Tính theo cân nặng
+CalculatedVolume=Tính khối lượng
+Weight=Trọng lượng
+TotalWeight=Tổng trọng lượng
+WeightUnitton=tấn
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
-Length=Length
+WeightUnitpound=bảng
+Length=Chiều dài
 LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Area
+Surface=Diện tích
 SurfaceUnitm2=m2
 SurfaceUnitdm2=dm2
 SurfaceUnitcm2=cm2
 SurfaceUnitmm2=mm2
 SurfaceUnitfoot2=ft2
 SurfaceUnitinch2=in2
-Volume=Volume
-TotalVolume=Total volume
+Volume=Khối lượng
+TotalVolume=Tổng khối lượng
 VolumeUnitm3=m3
 VolumeUnitdm3=dm3
 VolumeUnitcm3=cm3
@@ -124,103 +134,104 @@ VolumeUnitmm3=mm3
 VolumeUnitfoot3=ft3
 VolumeUnitinch3=in3
 VolumeUnitounce=ounce
-VolumeUnitlitre=litre
+VolumeUnitlitre=lít
 VolumeUnitgallon=gallon
-Size=size
+Size=kích thước
 SizeUnitm=m
 SizeUnitdm=dm
 SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.<br>Change will be effective only after clicking on confirmation link inside this email.<br>Check your email reader software.
-BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option.
-EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib)
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics in number of products/services units
-StatsByNumberOfEntities=Statistics in number of referring entities
-NumberOfProposals=Number of proposals on last 12 month
-NumberOfCustomerOrders=Number of customer orders on last 12 month
-NumberOfCustomerInvoices=Number of customer invoices on last 12 month
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
-NumberOfSupplierInvoices=Number of supplier invoices on last 12 month
-NumberOfUnitsProposals=Number of units on proposals on last 12 month
-NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=The invoice %s has been validated.
-EMailTextProposalValidated=The proposal %s has been validated.
-EMailTextOrderValidated=The order %s has been validated.
-EMailTextOrderApproved=The order %s has been approved.
-EMailTextOrderApprovedBy=The order %s has been approved by %s.
-EMailTextOrderRefused=The order %s has been refused.
-EMailTextOrderRefusedBy=The order %s has been refused by %s.
-EMailTextExpeditionValidated=The shipping %s has been validated.
-ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
-NewSizeAfterCropping=New size after cropping
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image
-ImageEditor=Image editor
-YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
-YouReceiveMailBecauseOfNotification2=This event is the following:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-ClickHere=Click here
-UseAdvancedPerms=Use the advanced permissions of some modules
-FileFormat=File format
-SelectAColor=Choose a color
+SizeUnitfoot=chân
+SizeUnitpoint=điểm
+BugTracker=Theo dõi lỗi
+SendNewPasswordDesc=Hình thức này cho phép bạn yêu cầu một mật khẩu mới. Nó sẽ được gửi đến địa chỉ email của bạn. <br> Thay đổi sẽ có hiệu lực sau khi nhấp vào liên kết xác nhận trong email này. <br> Kiểm tra phần mềm đọc email của bạn.
+BackToLoginPage=Trở lại trang đăng nhập
+AuthenticationDoesNotAllowSendNewPassword=Chế độ xác thực <b>là% s.</b> <br> Trong chế độ này, Dolibarr không thể biết và cũng không thay đổi mật khẩu của bạn. <br> Liên hệ quản trị hệ thống của bạn nếu bạn muốn thay đổi mật khẩu của bạn.
+EnableGDLibraryDesc=Cài đặt hoặc cho phép thư viện GD PHP của bạn để sử dụng tùy chọn này.
+EnablePhpAVModuleDesc=Bạn cần phải cài đặt một module tương thích với chống virus của bạn. (Clamav: php4-clamavlib ou php5-clamavlib)
+ProfIdShortDesc=<b>Id Giáo sư% s</b> là một thông tin phụ thuộc vào quốc gia của bên thứ ba. <br> Ví dụ, đối với đất <b>nước% s,</b> đó là <b>mã% s.</b>
+DolibarrDemo=Giới thiệu Dolibarr ERP / CRM
+StatsByNumberOfUnits=Thống kê về số lượng các sản phẩm / dịch vụ đơn vị
+StatsByNumberOfEntities=Thống kê về số lượng của các đơn vị giới thiệu
+NumberOfProposals=Số đề xuất vào ngày 12 tháng trước
+NumberOfCustomerOrders=Số đơn đặt hàng của khách hàng vào ngày 12 tháng trước
+NumberOfCustomerInvoices=Số hóa đơn của khách hàng vào ngày 12 tháng trước
+NumberOfSupplierOrders=Số đơn đặt hàng nhà cung cấp vào ngày 12 tháng trước
+NumberOfSupplierInvoices=Số hóa đơn nhà cung cấp vào ngày 12 tháng trước
+NumberOfUnitsProposals=Số đơn vị về các đề xuất vào ngày 12 tháng trước
+NumberOfUnitsCustomerOrders=Số đơn vị trên đơn đặt hàng của khách hàng vào ngày 12 tháng trước
+NumberOfUnitsCustomerInvoices=Số đơn vị trên hoá đơn của khách hàng vào ngày 12 tháng trước
+NumberOfUnitsSupplierOrders=Số đơn vị trên đơn đặt hàng nhà cung cấp vào ngày 12 tháng trước
+NumberOfUnitsSupplierInvoices=Số đơn vị trên hóa đơn nhà cung cấp vào ngày 12 tháng trước
+EMailTextInterventionValidated=Sự can thiệp% s đã được xác nhận.
+EMailTextInvoiceValidated=Hóa đơn% s đã được xác nhận.
+EMailTextProposalValidated=Đề nghị% s đã được xác nhận.
+EMailTextOrderValidated=Trình tự% s đã được xác nhận.
+EMailTextOrderApproved=Trình tự% s đã được phê duyệt.
+EMailTextOrderApprovedBy=Trình tự% s đã được phê duyệt bởi% s.
+EMailTextOrderRefused=Trình tự% s đã bị từ chối.
+EMailTextOrderRefusedBy=Trình tự% s đã bị từ chối bởi% s.
+EMailTextExpeditionValidated=Vận chuyển% s đã được xác nhận.
+ImportedWithSet=Thiết lập dữ liệu nhập khẩu
+DolibarrNotification=Tự động thông báo
+ResizeDesc=Nhập chiều rộng mới <b>hoặc</b> tầm cao mới. Tỷ lệ sẽ được giữ trong thời gian thay đổi kích thước ...
+NewLength=Chiều rộng mới
+NewHeight=Tầm cao mới
+NewSizeAfterCropping=Kích thước mới sau khi cắt xén
+DefineNewAreaToPick=Xác định khu vực mới vào hình để chọn (nhấp chuột vào hình ảnh bên trái sau đó kéo cho đến khi bạn đạt đến góc đối diện)
+CurrentInformationOnImage=Công cụ này được thiết kế để giúp bạn thay đổi kích thước hoặc cắt hình ảnh. Đây là thông tin về hình ảnh thay đổi nội dung hiện tại
+ImageEditor=Biên tập hình ảnh
+YouReceiveMailBecauseOfNotification=Bạn nhận được thông báo này vì email của bạn đã được thêm vào danh sách các mục tiêu được thông báo về sự kiện đặc biệt vào phần mềm% s% s.
+YouReceiveMailBecauseOfNotification2=Sự kiện này là như sau:
+ThisIsListOfModules=Đây là một danh sách các module chọn trước bởi hồ sơ demo này (chỉ có các mô-đun phổ biến nhất có thể nhìn thấy trong bản demo này). Chỉnh sửa này để có một bản giới thiệu cá nhân và click vào nút "Start".
+ClickHere=Click vào đây
+UseAdvancedPerms=Sử dụng các điều khoản của một số mô-đun tiên tiến
+FileFormat=Định dạng file
+SelectAColor=Chọn một màu sắc
 AddFiles=Add Files
-StartUpload=Start upload
-CancelUpload=Cancel upload
-FileIsTooBig=Files is too big
-PleaseBePatient=Please be patient...
-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.
+StartUpload=Bắt đầu tải lên
+CancelUpload=Hủy bỏ tải lên
+FileIsTooBig=Tập tin là quá lớn
+PleaseBePatient=Xin hãy kiên nhẫn ...
+RequestToResetPasswordReceived=Một yêu cầu thay đổi mật khẩu Dolibarr của bạn đã được nhận
+NewKeyIs=Đây là chìa khóa mới để đăng nhập
+NewKeyWillBe=Khóa mới của bạn để đăng nhập vào phần mềm sẽ được
+ClickHereToGoTo=Click vào đây để đi đến% s
+YouMustClickToChange=Tuy nhiên, trước tiên bạn phải nhấp vào liên kết sau đây để xác nhận thay đổi mật khẩu này
+ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quên email này. Thông tin của bạn được lưu giữ an toàn.
 
 ##### 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
+AddCalendarEntry=Thêm phần trong lịch% 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=Export
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Librairy used
+Export=Xuất khẩu
+ExportsArea=Khu vực xuất khẩu
+AvailableFormats=Định dạng có sẵn
+LibraryUsed=Librairy sử dụng
 LibraryVersion=Phiên bản
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
-ToExport=Export
-NewExport=New export
+ExportableDatas=Dữ liệu xuất khẩu
+NoExportableData=Không có dữ liệu xuất khẩu (không có mô-đun với dữ liệu xuất khẩu nạp, hoặc cho phép mất tích)
+ToExport=Xuất khẩu
+NewExport=Xuất khẩu mới
 ##### External sites #####
-ExternalSites=External sites
+ExternalSites=Các trang web bên ngoài
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 37012349b02..6229c7c4a90 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -1,241 +1,249 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductServiceCard=Products/Services card
-Products=Products
-Services=Services
-Product=Product
-Service=Service
-ProductId=Product/service id
-Create=Create
-Reference=Reference
-NewProduct=New product
-NewService=New service
-ProductCode=Product code
-ServiceCode=Service code
-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.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
-ProductOrService=Product or Service
-ProductsAndServices=Products and Services
-ProductsOrServices=Products or Services
-ProductsAndServicesOnSell=Available Products and Services
-ProductsAndServicesNotOnSell=Obsolete Products and Services
-ProductsAndServicesStatistics=Products and Services statistics
-ProductsStatistics=Products statistics
-ProductsOnSell=Available products
-ProductsNotOnSell=Obsolete products
-ProductsOnSellAndOnBuy=Products not for sale nor purchase
-ServicesOnSell=Available services
-ServicesNotOnSell=Obsolete services
-ServicesOnSellAndOnBuy=Services not for sale nor purchase
-InternalRef=Internal reference
-LastRecorded=Last products/services on sell recorded
-LastRecordedProductsAndServices=Last %s recorded products/services
-LastModifiedProductsAndServices=Last %s modified products/services
-LastRecordedProducts=Last %s products recorded
-LastRecordedServices=Last %s services recorded
-LastProducts=Last products
-CardProduct0=Product card
-CardProduct1=Service card
-CardContract=Contract card
-Warehouse=Warehouse
-Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
-WarehouseClosed=Warehouse closed
-Stock=Stock
-Stocks=Stocks
-Movement=Movement
-Movements=Movements
-Sell=Sales
-Buy=Purchases
-OnSell=For sale
-OnBuy=For purchase
-NotOnSell=Not for sale
-ProductStatusOnSell=For sale
-ProductStatusNotOnSell=Not for sale
-ProductStatusOnSellShort=For sale
-ProductStatusNotOnSellShort=Not for sale
-ProductStatusOnBuy=For purchase
-ProductStatusNotOnBuy=Not for purchase
-ProductStatusOnBuyShort=For purchase
-ProductStatusNotOnBuyShort=Not for purchase
-UpdatePrice=Update price
-AppliedPricesFrom=Applied prices from
-SellingPrice=Selling price
-SellingPriceHT=Selling price (net of tax)
-SellingPriceTTC=Selling price (inc. tax)
-PublicPrice=Public price
-CurrentPrice=Current price
-NewPrice=New price
-MinPrice=Minim. selling price
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
-ContractStatus=Contract status
-ContractStatusClosed=Closed
-ContractStatusRunning=Running
-ContractStatusExpired=expired
-ContractStatusOnHold=Not running
-ContractStatusToRun=A mettre en service
-ContractNotRunning=This contract is not running
-ErrorProductAlreadyExists=A product with reference %s already exists.
-ErrorProductBadRefOrLabel=Wrong value for reference or label.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-Suppliers=Suppliers
-SupplierRef=Supplier's product ref.
-ShowProduct=Show product
-ShowService=Show service
-ProductsAndServicesArea=Product and Services area
-ProductsArea=Product area
-ServicesArea=Services area
-AddToMyProposals=Add to my proposals
-AddToOtherProposals=Add to other proposals
-AddToMyBills=Add to my bills
-AddToOtherBills=Add to other bills
-CorrectStock=Correct stock
-AddPhoto=Add photo
-ListOfStockMovements=List of stock movements
-BuyingPrice=Buying price
-SupplierCard=Supplier card
-CommercialCard=Commercial card
-AllWays=Path to find your product in stock
-NoCat=Your product is not in any category
-PrimaryWay=Primary path
-PriceRemoved=Price removed
-BarCode=Barcode
-BarcodeType=Barcode type
-SetDefaultBarcodeType=Set barcode type
-BarcodeValue=Barcode value
-NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
-CreateCopy=Create copy
-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
-EditAssociate=Associate
-Translation=Translation
-KeywordFilter=Keyword filter
-CategoryFilter=Category filter
-ProductToAddSearch=Search product to add
-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
-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?
-ProductDeleted=Product/Service "%s" deleted from database.
-DeletePicture=Delete a picture
-ConfirmDeletePicture=Are you sure you want to delete this picture ?
-ExportDataset_produit_1=Products
-ExportDataset_service_1=Services
-ImportDataset_produit_1=Products
-ImportDataset_service_1=Services
-DeleteProductLine=Delete product line
-ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-NoProductMatching=No product/service match your criteria
-MatchingProducts=Matching products/services
-NoStockForThisProduct=No stock for this product
-NoStock=No Stock
+ProductRef=Ref sản phẩm.
+ProductLabel=Nhãn sản phẩm
+ProductServiceCard=Sản phẩm / dịch vụ thẻ
+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
+Create=Tạo
+Reference=Tài liệu tham khảo
+NewProduct=Sản phẩm mới
+NewService=Dịch vụ mới
+ProductCode=Mã sản phẩm
+ServiceCode=Mã dịch vụ
+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=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ê
+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
+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
+LastProducts=Sản phẩm cuối cùng
+CardProduct0=Sản phẩm thẻ
+CardProduct1=Dịch vụ thẻ
+CardContract=Thẻ đồng
+Warehouse=Kho
+Warehouses=Các kho hàng
+WarehouseOpened=Kho mở
+WarehouseClosed=Kho đó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
+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
+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
+CurrentPrice=Giá hiện tại
+NewPrice=Giá mới
+MinPrice=Giọt. giá bán
+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.
+ContractStatus=Tình trạng hợp đồng
+ContractStatusClosed=Đóng
+ContractStatusRunning=Chạy
+ContractStatusExpired=hết hạn
+ContractStatusOnHold=Không chạy
+ContractStatusToRun=Để có đượ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.
+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
+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
+AddPhoto=Thêm hình ảnh
+ListOfStockMovements=Danh sách chuyển động chứng khoán
+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ỏ
+BarCode=Mã vạch
+BarcodeType=Loại mã vạch
+SetDefaultBarcodeType=Đặt mã vạch loại
+BarcodeValue=Giá trị mã vạch
+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á
+MultiPriceLevelsName=Loại giá
+AssociatedProductsAbility=Kích hoạt tính năng gói ảo
+AssociatedProducts=Sản phẩm trọn gói
+AssociatedProductsNumber=Số lượng sản phẩm sáng tác sản phẩm này gói ảo
+ParentProductsNumber=Số sản phẩm bao bì mẹ
+IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một sản phẩm trọn gói ảo
+IfZeroItIsNotUsedByVirtualProduct=Nếu 0, sản phẩm này không được sử dụng bởi bất kỳ sản phẩm gói ảo
+EditAssociate=Phó
+Translation=Dịch
+KeywordFilter=Bộ lọc từ khóa
+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 / dịch vụ trọn gói với sản phẩm này như là một thành phần
+ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được lựa chọn là cha mẹ với sản phẩm hiện tại
+DeleteProduct=Xóa một sản phẩm / dịch vụ
+ConfirmDeleteProduct=Bạn Bạn có chắc chắn muốn xóa sản phẩm này / dịch vụ?
+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?
+ExportDataset_produit_1=Sản phẩm
+ExportDataset_service_1=Dịch vụ
+ImportDataset_produit_1=Sản phẩm
+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ó tồn kho nào cho sản phẩm này
+NoStock=Không tồn kho
 Restock=Restock
-ProductSpecial=Special
-QtyMin=Minimum Qty
-PriceQty=Price for this quantity
-PriceQtyMin=Price for this min. qty (w/o discount)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
-NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
-NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product
-RecordedProducts=Products recorded
-RecordedServices=Services recorded
-RecordedProductsAndServices=Products/services recorded
-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
-GenerateThumb=Generate thumb
-ProductCanvasAbility=Use special "canvas" addons
-ServiceNb=Service #%s
-ListProductServiceByPopularity=List of products/services by popularity
-ListProductByPopularity=List of products by popularity
-ListServiceByPopularity=List of services by popularity
-Finished=Manufactured product
-RowMaterial=Raw Material
-CloneProduct=Clone product or service
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
-CloneContentProduct=Clone all main informations of product/service
-ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone virtual product/services
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-CustomerPrices=Customers prices
-SuppliersPrices=Suppliers prices
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
-CustomCode=Customs code
-CountryOrigin=Origin country
-HiddenIntoCombo=Hidden into select lists
-Nature=Nature
-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
+ProductSpecial=Đặc biệt
+QtyMin=Số lượng tối thiểu
+PriceQty=Giá cho số lượng này
+PriceQtyMin=Giá cho tối thiểu này. SL (w / o giảm giá)
+VATRateForSupplierProduct=Tỷ lệ thuế GTGT (đối với nhà cung cấp / sản phẩm)
+DiscountQtyMin=Mặc định giảm giá cho SL
+NoPriceDefinedForThisSupplier=Không có giá / SL xác định cho nhà cung cấp / sản phẩm
+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
+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
+PredefinedProductsAndServicesToSell=Sản phẩm được xác định trước / dịch vụ để bán
+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
+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
+Finished=Sản phẩm sản xuất
+RowMaterial=Nguyên liệu
+CloneProduct=Sản phẩm hoặc dịch vụ sao chép
+ConfirmCloneProduct=Bạn có chắc chắn bạn muốn nhân bản sản phẩm hoặc dịch <b>vụ% s?</b>
+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 sao chép và giá cả
+CloneCompositionProduct=sao chép đóng gói sản phẩm / dịch vụ
+ProductIsUsed=Sản phẩm này được sử dụng
+NewRefForClone=Tài liệu tham khảo. các sản phẩm mới / dịch vụ
+CustomerPrices=Giá khách hàng
+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
+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ẻ
+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ẻ
+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
+PriceByQuantityRange=Phạm vi số lượng
+ProductsDashboard=Sản phẩm / dịch vụ tóm tắt
+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=Production and items dispatchment
-Build=Produce
-BuildIt=Produce & Dispatch
-BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action)
-QtyNeed=Qty
-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 <b>%s</b>.
-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
+Building=Sản xuất và các mặt hàng dispatchment
+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)
+QtyNeed=Số lượng
+UnitPmp=Đơn vị VWAP Net
+CostPmpHT=Tổng VWAP Net
+ProductUsedForBuild=Tự động tiêu thụ sản
+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ý
+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 <b>nút% s.</b>
+NumberOfStickers=Số nhãn in trên trang
+PrintsheetForOneBarCode=In nhiều dán 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:
+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ụ
+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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 05b230ea1d7..a6ccfac4cf2 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Tài liệu tham khảo. dự án
+ProjectId=Mã dự án
 Project=Dự án
 Projects=Các dự án
 SharedProject=Mọi người
@@ -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?
@@ -32,20 +32,22 @@ TimeSpent=Thời gian đã qua
 TimesSpent=Thời gian đã qua
 RefTask=Tác vụ tham chiếu
 LabelTask=Nhãn của tác vụ
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
+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
 Tasks=Tác vụ
 Task=Tác vụ
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+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
@@ -54,8 +56,8 @@ MyActivities=Tác vụ/hoạt động của tôi
 MyProjects=Dự án của tôi
 DurationEffective=Độ dài thời gian hiệu quả
 Progress=Tiến độ
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Tiến độ công bố
+ProgressCalculated=Tính tiến bộ
 Time=Thời gian
 ListProposalsAssociatedProject=Danh sách các gợi ý thương mại được gắn với dự án
 ListOrdersAssociatedProject=Danh sách các đơn đặt hàng từ khách hàng được gắn với dự án
@@ -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=Xem thêm các tác vụ không được phân bổ cho tôi
-ShowMyTasksOnly=Chỉ xem các tác vụ được phân bổ cho tôi
+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=Tác vụ không được phân bổ dành cho bạn
+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 (<b>%s</b> 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
@@ -99,32 +101,34 @@ CloneProject=Nhân bản dự án
 CloneTasks=Nhân bản tác vụ
 CloneContacts=Nhân bản liên lạc
 CloneNotes=Nhân bản các ghi chú
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
+CloneProjectFiles=Dự án Clone tham gia các tập tin
+CloneTaskFiles=Clone nhiệm vụ (các) tập tin tham gia (nếu nhiệm vụ (các) nhân bản vô tính)
 ConfirmCloneProject=Bạn có chắc rằng bạn muốn nhân bản dự án này?
 ProjectReportDate=Thay đổi thời gian tác vụ theo thời gian bắt đầu dự án
 ErrorShiftTaskDate=Không thể dịch chuyển ngày của phần tác vụ dựa theo ngày bắt đầu của dự án mới
 ProjectsAndTasksLines=Các dự án và tác vụ
 ProjectCreatedInDolibarr=Đã tạo dự án %s
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+TaskCreatedInDolibarr=Nhiệm vụ% s tạo
+TaskModifiedInDolibarr=Nhiệm vụ% s sửa đổi
+TaskDeletedInDolibarr=Nhiệm vụ% s bị xóa
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Người lãnh đạo dự án
 TypeContact_project_external_PROJECTLEADER=Người lãnh đạo dự án
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Đóng góp
+TypeContact_project_external_PROJECTCONTRIBUTOR=Đóng góp
 TypeContact_project_task_internal_TASKEXECUTIVE=Thi hành tác vụ
 TypeContact_project_task_external_TASKEXECUTIVE=Thi hành tác vụ
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
+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=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
 WorkloadOccupation= Sử dụng tiến trình công việc
 ProjectReferers=Các đối tượng tham chiếu
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+SearchAProject=Tìm kiếm một dự án
+ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên
+ProjectDraft=Dự thảo dự án
+FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index 8970d1eb2df..6e9b8aef50b 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -1,102 +1,100 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Commercial proposals
-Proposal=Commercial proposal
-ProposalShort=Proposal
-ProposalsDraft=Draft commercial proposals
-ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
-Prop=Commercial proposals
-CommercialProposal=Commercial proposal
-CommercialProposals=Commercial proposals
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewProposal=New commercial proposal
-NewPropal=New proposal
-Prospect=Prospect
-ProspectList=Prospect list
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Add proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
-LastPropals=Last %s proposals
-LastClosedProposals=Last %s closed proposals
-LastModifiedProposals=Last %s modified proposals
-AllPropals=All proposals
-LastProposals=Last proposals
-SearchAProposal=Search a proposal
-ProposalsStatistics=Commercial proposal's statistics
-NumberOfProposalsByMonth=Number by month
-AmountOfProposalsByMonthHT=Amount by month (net of tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
-PropalsDraft=Drafts
-PropalsOpened=Opened
-PropalsNotBilled=Closed not billed
-PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusOpened=Validated (proposal is open)
-PropalStatusClosed=Closed
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
-PropalStatusBilled=Billed
-PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
-PropalStatusClosedShort=Closed
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
-PropalStatusBilledShort=Billed
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
-AssociatedDocuments=Documents associated with the proposal:
-ErrorCantOpenDir=Can't open directory
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-DateEndPropalShort=Date end
-ValidityDuration=Validity duration
-CloseAs=Close with status
-ClassifyBilled=Classify billed
-BuildBill=Build invoice
-ErrorPropalNotFound=Propal %s not found
-Estimate=Estimate :
-EstimateShort=Estimate
-OtherPropals=Other proposals
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
-ClonePropal=Clone commercial proposal
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b> ?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b> ?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
+Proposals=Đề nghị thương mại
+Proposal=Đề nghị thương mại
+ProposalShort=Đề nghị
+ProposalsDraft=Dự thảo đề xuất thương mại
+ProposalDraft=Dự thảo đề xuất thương mại
+ProposalsOpened=Đề nghị thương mại mở
+Prop=Đề nghị thương mại
+CommercialProposal=Đề nghị thương mại
+CommercialProposals=Đề nghị thương mại
+ProposalCard=Thẻ đề nghị
+NewProp=Đề nghị thương mại mới
+NewProposal=Đề nghị thương mại mới
+NewPropal=Đề xuất mới
+Prospect=Triển vọng
+ProspectList=Danh sách khách hàng tiềm năng
+DeleteProp=Xóa đề nghị thương mại
+ValidateProp=Xác nhận đề nghị thương mại
+AddProp=Tạo đề xuất
+ConfirmDeleteProp=Bạn Bạn có chắc chắn muốn xóa đề nghị thương mại này?
+ConfirmValidateProp=Bạn có chắc chắn bạn muốn xác nhận đề nghị thương mại này dưới <b>tên% s?</b>
+LastPropals=Cuối% s đề xuất
+LastClosedProposals=Cuối% s đề xuất khép kín
+LastModifiedProposals=Đề xuất sửa đổi lần cuối% s
+AllPropals=Tất cả các đề xuất
+LastProposals=Đề nghị cuối cùng
+SearchAProposal=Tìm kiếm một đề nghị
+ProposalsStatistics=Số liệu thống kê thương mại đề nghị của
+NumberOfProposalsByMonth=Số theo tháng
+AmountOfProposalsByMonthHT=Số tiền theo tháng (sau thuế)
+NbOfProposals=Số đề xuất thương mại
+ShowPropal=Hiện đề nghị
+PropalsDraft=Dự thảo
+PropalsOpened=Mở
+PropalsNotBilled=Đóng không phải lập hóa đơn
+PropalStatusDraft=Dự thảo (cần phải được xác nhận)
+PropalStatusValidated=Xác nhận (đề nghị được mở)
+PropalStatusOpened=Xác nhận (đề nghị được mở)
+PropalStatusClosed=Đóng
+PropalStatusSigned=Ký (cần thanh toán)
+PropalStatusNotSigned=Không đăng (đóng cửa)
+PropalStatusBilled=Hóa đơn
+PropalStatusDraftShort=Dự thảo
+PropalStatusValidatedShort=Xác nhận
+PropalStatusOpenedShort=Mở
+PropalStatusClosedShort=Đóng
+PropalStatusSignedShort=Ký
+PropalStatusNotSignedShort=Không đăng
+PropalStatusBilledShort=Hóa đơn
+PropalsToClose=Đề nghị thương mại phải đóng cửa
+PropalsToBill=Ký kết các đề xuất thương mại vào hóa đơn
+ListOfProposals=Danh sách các đề xuất thương mại
+ActionsOnPropal=Sự kiện về đề nghị
+NoOpenedPropals=Không có đề xuất thương mại mở
+NoOtherOpenedPropals=Không có đề xuất thương mại mở khác
+RefProposal=Đề nghị ref thương mại
+SendPropalByMail=Gửi đề nghị thương mại qua đường bưu điện
+AssociatedDocuments=Các tài liệu liên quan đến đề nghị:
+ErrorCantOpenDir=Không thể mở thư mục
+DatePropal=Ngày đề nghị
+DateEndPropal=Hiệu lực ngày kết thúc
+DateEndPropalShort=Ngày kết thúc
+ValidityDuration=Thời hạn hiệu lực
+CloseAs=Chặt chẽ với tình trạng
+ClassifyBilled=Phân loại hóa đơn
+BuildBill=Xây dựng hóa đơn
+ErrorPropalNotFound=Propal% s không tìm thấy
+Estimate=Ước tính:
+EstimateShort=Ước tính
+OtherPropals=Các đề xuất khác
+AddToDraftProposals=Thêm vào dự thảo đề xuất
+NoDraftProposals=Không có đề xuất dự thảo
+CopyPropalFrom=Tạo đề nghị thương mại bằng cách sao chép đề nghị hiện tại
+CreateEmptyPropal=Tạo ra sản phẩm nào đề xuất thương mại Vierge hoặc từ danh sách các sản phẩm / dịch vụ
+DefaultProposalDurationValidity=Mặc định thời hạn đề nghị thương mại (trong ngày)
+UseCustomerContactAsPropalRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ đề nghị người nhận
+ClonePropal=Đề nghị thương mại sao chép
+ConfirmClonePropal=Bạn có chắc chắn bạn muốn nhân bản đề nghị thương <b>mại% s?</b>
+ConfirmReOpenProp=Bạn có chắc chắn bạn muốn mở lại đề nghị thương <b>mại% s?</b>
+ProposalsAndProposalsLines=Đề nghị thương mại và dòng
+ProposalLine=Nga đề xuất
+AvailabilityPeriod=Sẵn sàng trì hoãn
+SetAvailability=Set sẵn sàng trì hoãn
+AfterOrder=sau động lệnh
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Ngay lập tức
+AvailabilityTypeAV_1W=1 tuần
+AvailabilityTypeAV_2W=2 tuần
+AvailabilityTypeAV_3W=3 tuần
+AvailabilityTypeAV_1M=1 tháng
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Customer invoice contact
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
+TypeContact_propal_internal_SALESREPFOLL=Sau-up đề nghị đại diện
+TypeContact_propal_external_BILLING=Hóa đơn của khách hàng liên lạc
+TypeContact_propal_external_CUSTOMER=Liên hệ với khách hàng sau-up đề nghị
 # Document models
-DocModelAzurDescription=A complete proposal model (logo...)
-DocModelJauneDescription=Jaune proposal model
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=Một mô hình đề xuất đầy đủ (logo ...)
+DocModelJauneDescription=Mô hình đề nghị Jaune
+DefaultModelPropalCreate=Tạo mô hình mặc định
+DefaultModelPropalToBill=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (được lập hoá đơn)
+DefaultModelPropalClosed=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (chưa lập hoá đơn)
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/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index edca71a1829..a709c52f7a5 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/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=Kế toán mã cho các khoản thanh toán tiền lương
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Kế toán mã cho phụ trách tài chính
+Salary=Mức lương
+Salaries=Tiền lương
+Employee=Nhân viên
+NewSalaryPayment=Thanh toán tiền lương mới
+SalaryPayment=Thanh toán tiền lương
+SalariesPayments=Lương thanh toán
+ShowSalaryPayment=Hiện thanh toán tiền lương
+THM=Giá trung bình theo giờ
+TJM=Giá trung bình hàng ngày
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 039d47f6aa9..b37fed33b8e 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -1,74 +1,80 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Shipment
-Sendings=Shipments
-Shipment=Shipment
-Shipments=Shipments
+RefSending=Tài liệu tham khảo. lô hàng
+Sending=Lô hàng
+Sendings=Lô hàng
+Shipment=Lô hàng
+Shipments=Lô hàng
 Receivings=Receivings
-SendingsArea=Shipments area
-ListOfSendings=List of shipments
-SendingMethod=Shipping method
-SendingReceipt=Shipping receipt
-LastSendings=Last %s shipments
-SearchASending=Search for shipment
-StatisticsOfSendings=Statistics for shipments
-NbOfSendings=Number of shipments
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipping card
-NewSending=New shipment
-CreateASending=Create a shipment
-CreateSending=Create shipment
-QtyOrdered=Qty ordered
-QtyShipped=Qty shipped
-QtyToShip=Qty to ship
-QtyReceived=Qty received
-KeepToShip=Keep to ship
-OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
-SendingsForSameOrder=Shipments for this order
-SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-SendingsToValidate=Shipments to validate
-StatusSendingCanceled=Canceled
-StatusSendingDraft=Draft
-StatusSendingValidated=Validated (products to ship or already shipped)
-StatusSendingProcessed=Processed
-StatusSendingCanceledShort=Canceled
-StatusSendingDraftShort=Draft
-StatusSendingValidatedShort=Validated
-StatusSendingProcessedShort=Processed
-SendingSheet=Sending sheet
-Carriers=Carriers
-Carrier=Carrier
-CarriersArea=Carriers area
-NewCarrier=New carrier
-ConfirmDeleteSending=Are you sure you want to delete this shipment ?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b> ?
-ConfirmCancelSending=Are you sure you want to cancel this shipment ?
-GenericTransport=Generic transport
-Enlevement=Gotten by customer
-DocumentModelSimple=Simple document model
-DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planed date of delivery
-DateReceived=Date delivery received
-SendShippingByEMail=Send shipment by EMail
-SendShippingRef=Send shipment %s
-ActionsOnShipping=Events on shipment
-LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-RelatedShippings=Related shippings
-ShipmentLine=Shipment line
-CarrierList=List of transporters
+SendingsArea=Diện tích lô hàng
+ListOfSendings=Danh sách các lô hàng
+SendingMethod=Phương thức vận chuyển
+SendingReceipt=Nhận vận chuyển
+LastSendings=Cuối% của lô hàng
+SearchASending=Tìm kiếm hàng
+StatisticsOfSendings=Thống kê cho lô hàng
+NbOfSendings=Số lô hàng
+NumberOfShipmentsByMonth=Số lô hàng theo tháng
+SendingCard=Thẻ vận chuyển
+NewSending=Lô hàng mới
+CreateASending=Tạo một lô hàng
+CreateSending=Tạo lô hàng
+QtyOrdered=Số lượng đặt hàng
+QtyShipped=Số lượng vận chuyển
+QtyToShip=Số lượng xuất xưởng
+QtyReceived=Số lượng nhận được
+KeepToShip=Giữ tàu
+OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này
+DateSending=Ngày gửi đơn đặt hàng
+DateSendingShort=Ngày gửi đơn đặt hàng
+SendingsForSameOrder=Các lô hàng về đơn hàng này
+SendingsAndReceivingForSameOrder=Lô hàng và Receivings về đơn hàng này
+SendingsToValidate=Lô hàng để xác nhận
+StatusSendingCanceled=Hủy bỏ
+StatusSendingDraft=Dự thảo
+StatusSendingValidated=Xác nhận (sản phẩm để vận chuyển hoặc đã được vận chuyển)
+StatusSendingProcessed=Xử lý
+StatusSendingCanceledShort=Hủy bỏ
+StatusSendingDraftShort=Dự thảo
+StatusSendingValidatedShort=Xác nhận
+StatusSendingProcessedShort=Xử lý
+SendingSheet=Gửi tờ
+Carriers=Các hãng tàu
+Carrier=Nhà cung cấp
+CarriersArea=Khu vực các tàu sân bay
+NewCarrier=Tàu sân bay mới
+ConfirmDeleteSending=Bạn Bạn có chắc chắn muốn xóa lô hàng này?
+ConfirmValidateSending=Bạn có chắc chắn bạn muốn xác nhận lô hàng này có sự tham <b>khảo% s?</b>
+ConfirmCancelSending=Bạn Bạn có chắc chắn muốn hủy lô hàng này?
+GenericTransport=Chung vận chuyển
+Enlevement=Nhận của khách hàng
+DocumentModelSimple=Mô hình tài liệu đơn giản
+DocumentModelMerou=Mô hình Merou A5
+WarningNoQtyLeftToSend=Cảnh báo, không có sản phẩm chờ đợi để được vận chuyển.
+StatsOnShipmentsOnlyValidated=Thống kê tiến hành với các chuyến hàng chỉ xác nhận. Ngày sử dụng là ngày xác nhận giao hàng (dự ngày giao hàng không phải luôn luôn được biết đến).
+DateDeliveryPlanned=Ngày quy hoạch giao hàng
+DateReceived=Ngày giao nhận
+SendShippingByEMail=Gửi hàng bằng thư điện tử
+SendShippingRef=Nộp hàng% s
+ActionsOnShipping=Các sự kiện trên lô hàng
+LinkToTrackYourPackage=Liên kết để theo dõi gói của bạn
+ShipmentCreationIsDoneFromOrder=Đối với thời điểm này, tạo ra một lô hàng mới được thực hiện từ thẻ thứ 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 by customer
+SendingMethodCATCH=Catch của khách hàng
 SendingMethodTRANS=Transporter
 SendingMethodCOLSUI=Colissimo
 # ModelDocument
-DocumentModelSirocco=Simple document model for delivery receipts
-DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+DocumentModelSirocco=Tài liệu mô hình đơn giản để biên lai giao hàng
+DocumentModelTyphon=Mô hình tài liệu đầy đủ hơn cho hóa đơn giao hàng (logo ...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER liên tục không được xác định
+SumOfProductVolumes=Tổng khối lượng sản phẩm
+SumOfProductWeights=Tổng trọng lượng sản phẩm
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/vi_VN/shop.lang b/htdocs/langs/vi_VN/shop.lang
deleted file mode 100644
index 156af426bb0..00000000000
--- a/htdocs/langs/vi_VN/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=Shop
-ShopWeb=Web Shop
-LastOrders=Last orders
-OnStandBy=On standby
-TreatmentInProgress=Treatment in progress
-LastCustomers=Last customers
-OSCommerceShop=OSCommerce shop
-OSCommerce=OSCommerce
-AddProd=Sell online
diff --git a/htdocs/langs/vi_VN/sms.lang b/htdocs/langs/vi_VN/sms.lang
index c710e9f39ff..a6a78549842 100644
--- a/htdocs/langs/vi_VN/sms.lang
+++ b/htdocs/langs/vi_VN/sms.lang
@@ -1,53 +1,53 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
-SmsSetup=Sms setup
-SmsDesc=This page allows you to define globals options on SMS features
-SmsCard=SMS Card
-AllSms=All SMS campains
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
-SmsTitle=Description
-SmsFrom=Sender
-SmsTo=Target
-SmsTopic=Topic of SMS
-SmsText=Message
-SmsMessage=SMS Message
-ShowSms=Show Sms
-ListOfSms=List SMS campains
-NewSms=New SMS campain
-EditSms=Edit Sms
-ResetSms=New sending
-DeleteSms=Delete Sms campain
-DeleteASms=Remove a Sms campain
-PreviewSms=Previuw Sms
-PrepareSms=Prepare Sms
-CreateSms=Create Sms
-SmsResult=Result of Sms sending
-TestSms=Test Sms
-ValidSms=Validate Sms
-ApproveSms=Approve Sms
-SmsStatusDraft=Draft
-SmsStatusValidated=Validated
-SmsStatusApproved=Approved
-SmsStatusSent=Sent
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
+SmsSetup=Thiết lập SMS
+SmsDesc=Trang này cho phép bạn xác định các tùy chọn toàn cục về các tính năng tin nhắn SMS
+SmsCard=SMS Thẻ
+AllSms=Campains tất cả tin nhắn SMS
+SmsTargets=Mục tiêu
+SmsRecipients=Mục tiêu
+SmsRecipient=Mục tiêu
+SmsTitle=Mô tả
+SmsFrom=Tên người gửi
+SmsTo=Mục tiêu
+SmsTopic=Chủ đề của tin nhắn SMS
+SmsText=Tin nhắn
+SmsMessage=SMS tin nhắn
+ShowSms=Hiện SMS
+ListOfSms=Campains Danh sách tin nhắn SMS
+NewSms=SMS mới trong chiến dịch
+EditSms=Chỉnh sửa SMS
+ResetSms=Gửi mới
+DeleteSms=Xóa SMS trong chiến dịch
+DeleteASms=Loại bỏ một trong chiến dịch SMS
+PreviewSms=Previuw SMS
+PrepareSms=Chuẩn bị SMS
+CreateSms=Tạo SMS
+SmsResult=Kết quả SMS gửi
+TestSms=Kiểm tra SMS
+ValidSms=Xác nhận SMS
+ApproveSms=Thông qua SMS
+SmsStatusDraft=Dự thảo
+SmsStatusValidated=Xác nhận
+SmsStatusApproved=Đã được phê duyệt
+SmsStatusSent=Gửi
+SmsStatusSentPartialy=Gửi một phần
+SmsStatusSentCompletely=Gửi hoàn toàn
 SmsStatusError=Lỗi
-SmsStatusNotSent=Not sent
-SmsSuccessfulySent=Sms correctly sent (from %s to %s)
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campain ?
-ConfirmResetMailing=Warning, if you make a reinit of Sms campain <b>%s</b>, you will allow to make a mass sending of it a second time. Is it really what you wan to do ?
-ConfirmDeleteMailing=Do you confirm removing of campain ?
-NbOfRecipients=Number of targets
-NbOfUniqueSms=Nb dof unique phone numbers
-NbOfSms=Nbre of phon numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=Nb of remaining characters
-SmsInfoNumero= (format international ie : +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+SmsStatusNotSent=Không gửi
+SmsSuccessfulySent=Sms được gửi một cách chính xác (từ% s đến% s)
+ErrorSmsRecipientIsEmpty=Số mục tiêu có sản phẩm nào
+WarningNoSmsAdded=Không có số điện thoại mới để thêm vào danh sách mục tiêu
+ConfirmValidSms=Bạn có xác nhận hợp lệ của trong chiến dịch này?
+ConfirmResetMailing=Cảnh báo, nếu bạn thực hiện một reinit của SMS trong chiến <b>dịch% s,</b> bạn sẽ cho phép để thực hiện một khối lượng gửi nó một lần thứ hai. Nó thực sự là những gì bạn wan để làm gì?
+ConfirmDeleteMailing=Bạn có xác nhận loại bỏ các trong chiến dịch?
+NbOfRecipients=Số chỉ tiêu
+NbOfUniqueSms=Nb DOF số điện thoại độc đáo
+NbOfSms=Nbre số phon
+ThisIsATestMessage=Đây là một thông báo
+SendSms=Gửi tin nhắn SMS
+SmsInfoCharRemain=Nb ký tự còn lại
+SmsInfoNumero= (Tức là định dạng quốc tế: 33899701761)
+DelayBeforeSending=Chậm trễ trước khi gửi (phút)
+SmsNoPossibleRecipientFound=Không có mục tiêu có sẵn. Kiểm tra thiết lập của nhà cung cấp tin nhắn SMS của bạn.
 
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 5d11b0fd7a0..304832413e7 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -1,125 +1,125 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-NewWarehouse=New warehouse / Stock area
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
-WarehouseClosed=Warehouse closed
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
-WarehouseTarget=Target warehouse
-ValidateSending=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
-Stock=Stock
-Stocks=Stocks
-Movement=Movement
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ErrorWarehouseLabelRequired=Warehouse label is required
-CorrectStock=Correct stock
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
-StocksArea=Stocks area
-Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
-NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
-Units=Units
-Unit=Unit
-StockCorrection=Correct stock
-StockTransfer=Stock transfer
-StockMovement=Transfer
-StockMovements=Stock transfers
-LabelMovement=Movement label
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-TotalStock=Total in stock
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit
-EnhancedValue=Value
-PMPValue=Weighted average price
+WarehouseCard=Thẻ kho
+Warehouse=Kho
+Warehouses=Các kho hàng
+NewWarehouse=Kho mới / khu vực kho
+WarehouseEdit=Sửa kho
+MenuNewWarehouse=Kho mới
+WarehouseOpened=Kho mở
+WarehouseClosed=Kho đóng
+WarehouseSource=Nguồn kho
+WarehouseSourceNotDefined=Không có kho được xác định,
+AddOne=Thêm một
+WarehouseTarget=Kho tiêu
+ValidateSending=Xóa gửi
+CancelSending=Hủy bỏ việc gửi
+DeleteSending=Xóa gửi
+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=Tồn kho chính xác
+ListOfWarehouses=Danh sách kho
+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=Chuyển kho cuối
+Units=Đơn vị
+Unit=Đơn vị
+StockCorrection=Tồn kho chính xác
+StockTransfer=Chuyển nhượng kho
+StockMovement=Chuyển
+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=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=Warehouses value
-UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
-QtyDispatched=Quantity dispatched
-OrderDispatch=Stock dispatching
-RuleForStockManagementDecrease=Rule for stock management decrease
-RuleForStockManagementIncrease=Rule for stock management increase
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-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
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-PhysicalStock=Physical stock
-RealStock=Real Stock
-VirtualStock=Virtual stock
-MininumStock=Minimum stock
-StockUp=Stock up
-MininumStockShort=Stock min
-StockUpShort=Stock up
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value to sell
-EstimatedStockValueSell=Value to Sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b> ?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-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 <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> 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
+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 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 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=Tồn kho tối thiểu
+StockUpShort=Dự trữ
+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
+AverageUnitPricePMPShort=Trọng giá đầu vào trung bình
+AverageUnitPricePMP=Trọng giá đầu vào trung bình
+SellPriceMin=Đơn giá bán
+EstimatedStockValueSellShort=Giá trị bán
+EstimatedStockValueSell=Giá trị bán
+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 <b>kho% s?</b>
+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=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 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=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=<b>Kho% s</b> sẽ được sử dụng cho kho giảm
+WarehouseForStockIncrease=<b>Kho% s</b> 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 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=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
+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=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 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 fdc0787646a..39ad630c510 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -1,42 +1,44 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-Supplier=Supplier
-AddSupplier=Add a supplier
-SupplierRemoved=Supplier removed
-SuppliersInvoice=Suppliers invoice
-NewSupplier=New supplier
-History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
-OrderDate=Order date
-BuyingPrice=Buying price
-BuyingPriceMin=Minimum buying price
-BuyingPriceMinShort=Min buying price
-TotalBuyingPriceMin=Total of subproducts buying prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
-Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
-ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-DenyingThisOrder=Denying this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-AddCustomerOrder=Create customer order
-AddCustomerInvoice=Create customer invoice
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
-SentToSuppliers=Sent to suppliers
+Suppliers=Nhà cung cấp
+Supplier=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
+History=Lịch sử
+ListOfSuppliers=Danh sách nhà cung cấp
+ShowSupplier=Hiện nhà cung cấp
+OrderDate=Ngày đặt hàng
+BuyingPrice=Giá mua
+BuyingPriceMin=Giá mua tối thiểu
+BuyingPriceMinShort=Tối thiểu giá mua
+TotalBuyingPriceMin=Tổng số subproducts giá mua
+SomeSubProductHaveNoPrices=Một số phụ phẩm đã có giá quy định
+AddSupplierPrice=Thêm giá nhà cung cấp
+ChangeSupplierPrice=Thay đổi giá nhà cung cấp
+ErrorQtyTooLowForThisSupplier=Số lượng quá thấp đối với nhà cung cấp hoặc không có giá quy định về sản phẩm này cho nhà cung cấp này
+ErrorSupplierCountryIsNotDefined=Nước cho nhà cung cấp này không được xác định. Sửa điều này đầu tiên.
+ProductHasAlreadyReferenceInThisSupplier=Sản phẩm này đã có một tham chiếu trong nhà cung cấp này
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cung cấp thông tin này đã được liên kết với một tài liệu tham khảo:% s
+NoRecordedSuppliers=Không có nhà cung cấp ghi
+SupplierPayment=Thanh toán nhà cung cấp
+SuppliersArea=Khu vực Nhà cung cấp
+RefSupplierShort=Tài liệu tham khảo. nhà cung cấp
+Availability=Sẵn có
+ExportDataset_fournisseur_1=Danh sách nhà cung cấp hoá đơn và đường hóa đơn
+ExportDataset_fournisseur_2=Hoá đơn và các khoản thanh toán nhà cung cấp
+ExportDataset_fournisseur_3=Đơn đặt hàng nhà cung cấp và các dòng lệnh
+ApproveThisOrder=Chấp thuận đơn hàng này
+ConfirmApproveThisOrder=Bạn Bạn có chắc chắn muốn chấp nhận <b>để% s?</b>
+DenyingThisOrder=Phủ nhận thứ tự này
+ConfirmDenyingThisOrder=Bạn có chắc chắn bạn muốn từ chối lệnh <b>này% s?</b>
+ConfirmCancelThisOrder=Bạn có chắc chắn bạn muốn hủy bỏ lệnh <b>này% s?</b>
+AddCustomerOrder=Tạo đơn đặt hàng
+AddCustomerInvoice=Tạo hóa đơn của khách hàng
+AddSupplierOrder=Tạo ra để cung cấp
+AddSupplierInvoice=Tạo nhà cung cấp hóa đơn
+ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cả cho nhà cung <b>cấp% s</b>
+NoneOrBatchFileNeverRan=Không có hoặc hàng <b>loạt% s</b> không chạy gần đây
+SentToSuppliers=Gửi đến nhà cung cấp
+ListOfSupplierOrders=Danh sách các đơn đặt hàng nhà cung cấp
+MenuOrdersSupplierToBill=Đơn đặt hàng nhà cung cấp cho hóa đơn
diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
index 06d46c7ac65..98314aea027 100644
--- a/htdocs/langs/vi_VN/trips.lang
+++ b/htdocs/langs/vi_VN/trips.lang
@@ -1,21 +1,22 @@
 # Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
-ListOfFees=List of fees
-NewTrip=New trip
-CompanyVisited=Company/foundation visited
-Kilometers=Kilometers
-FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+Trip=Chuyến đi
+Trips=Các chuyến đi
+TripsAndExpenses=Các chuyến đi và các chi phí
+TripsAndExpensesStatistics=Các chuyến đi và các chi phí thống kê
+TripCard=Thẻ đi
+AddTrip=Thêm chuyến đi
+ListOfTrips=Danh sách các chuyến đi
+ListOfFees=Danh sách phí
+NewTrip=Chuyến đi mới
+CompanyVisited=Công ty / cơ sở thăm
+Kilometers=Km
+FeesKilometersOrAmout=Số tiền hoặc km
+DeleteTrip=Xóa đi
+ConfirmDeleteTrip=Bạn Bạn có chắc chắn muốn xóa chuyến đi này?
+TF_OTHER=Khác
+TF_LUNCH=Ăn trưa
+TF_TRIP=Chuyến đi
+ListTripsAndExpenses=Danh sách các chuyến đi và các chi phí
+ExpensesArea=Chi phí chuyến đi và khu vực
+SearchATripAndExpense=Tìm kiếm một chuyến đi và chi phí
+ClassifyRefunded=Phân loại 'hoàn trả'
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index bef8e4b0be7..c80e82cd32c 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -1,121 +1,122 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=User card
-ContactCard=Contact card
-GroupCard=Group card
-NoContactCard=No card among contacts
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
-ReinitPassword=Regenerate password
-PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for Dolibarr
-AvailableRights=Available permissions
-OwnedRights=Owned permissions
-GroupRights=Group permissions
-UserRights=User permissions
-UserGUISetup=User display setup
-DisableUser=Disable
-DisableAUser=Disable a user
-DeleteUser=Delete
-DeleteAUser=Delete a user
-DisableGroup=Disable
-DisableAGroup=Disable a group
-EnableAUser=Enable a user
-EnableAGroup=Enable a group
-DeleteGroup=Delete
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b> ?
-ConfirmDisableGroup=Are you sure you want to disable group <b>%s</b> ?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b> ?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b> ?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b> ?
-ConfirmEnableGroup=Are you sure you want to enable group <b>%s</b> ?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b> ?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b> ?
-NewUser=New user
-CreateUser=Create user
-SearchAGroup=Search a group
-SearchAUser=Search a user
-LoginNotDefined=Login is not defined.
-NameNotDefined=Name is not defined.
-ListOfUsers=List of users
-Administrator=Administrator
+HRMArea=Khu vực quản lý nhân sự
+UserCard=Thẻ sử dụng
+ContactCard=Thẻ liên lạc
+GroupCard=Nhóm thẻ
+NoContactCard=Không có thẻ giữa các địa chỉ liên lạc
+Permission=Giấy phép
+Permissions=Quyền
+EditPassword=Chỉnh sửa mật khẩu
+SendNewPassword=Tái tạo và gửi mật khẩu
+ReinitPassword=Phục hồi mật khẩu
+PasswordChangedTo=Mật khẩu thay đổi để:% s
+SubjectNewPassword=Mật khẩu mới cho Dolibarr
+AvailableRights=Quyền có sẵn
+OwnedRights=Quyền sở hữu
+GroupRights=Cho phép nhóm
+UserRights=Cho phép người dùng
+UserGUISetup=Thiết lập hiển thị người dùng
+DisableUser=Vô hiệu hoá
+DisableAUser=Vô hiệu hóa người dùng
+DeleteUser=Xóa
+DeleteAUser=Xóa một người dùng
+DisableGroup=Vô hiệu hoá
+DisableAGroup=Vô hiệu hóa một nhóm
+EnableAUser=Cho phép một người sử dụng
+EnableAGroup=Cho phép một nhóm
+DeleteGroup=Xóa
+DeleteAGroup=Xóa nhóm
+ConfirmDisableUser=Bạn có chắc chắn bạn muốn vô hiệu hóa người <b>dùng% s?</b>
+ConfirmDisableGroup=Bạn có chắc chắn bạn muốn vô hiệu hóa <b>nhóm% s?</b>
+ConfirmDeleteUser=Bạn Bạn có chắc chắn muốn xóa người <b>dùng% s?</b>
+ConfirmDeleteGroup=Bạn có chắc chắn muốn xóa <b>nhóm% s?</b>
+ConfirmEnableUser=Bạn có chắc là bạn muốn cho phép người <b>dùng% s?</b>
+ConfirmEnableGroup=Bạn có chắc chắn bạn muốn kích hoạt <b>nhóm% s?</b>
+ConfirmReinitPassword=Bạn có chắc chắn bạn muốn tạo ra một mật khẩu mới cho người <b>dùng% s?</b>
+ConfirmSendNewPassword=Bạn có chắc chắn bạn muốn tạo ra và gửi mật khẩu mới cho người <b>dùng% s?</b>
+NewUser=Người dùng mới
+CreateUser=Tạo người dùng
+SearchAGroup=Tìm kiếm một nhóm
+SearchAUser=Tìm kiếm một người sử dụng
+LoginNotDefined=Đăng nhập không được xác định.
+NameNotDefined=Tên không được xác định.
+ListOfUsers=Danh sách người dùng
+Administrator=Quản trị viên
 SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
-AdministratorDesc=Administrator's entity
-DefaultRights=Default permissions
-DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
-DolibarrUsers=Dolibarr users
-LastName=Name
-FirstName=First name
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-RemoveFromGroup=Remove from group
-PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
-PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
-MenuUsersAndGroups=Users & Groups
-LastGroupsCreated=Last %s created groups
-LastUsersCreated=Last %s users created
-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
-ListOfGroupsForUser=List of groups for this user
-UsersToAdd=Users to add to this group
-GroupsToAdd=Groups to add to this user
-NoLogin=No login
-LinkToCompanyContact=Link to third party / contact
-LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to Dolibarr user
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
-CreateDolibarrLogin=Create a user
-CreateDolibarrThirdParty=Create a third party
-LoginAccountDisable=Account disabled, put a new login to activate it.
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
-LoginAccountDisableInLdap=Account disabled in the domain.
-UsePersonalValue=Use personal value
-GuiLanguage=Interface language
+SuperAdministratorDesc=Quản trị toàn cầu
+AdministratorDesc=Tổ chức quản trị của
+DefaultRights=Quyền mặc định
+DefaultRightsDesc=Xác định đây cho phép <u>mặc định</u> được tự động cấp cho người dùng <u>tạo mới</u> (Xem trên thẻ sử dụng để thay đổi sự cho phép của người dùng hiện tại).
+DolibarrUsers=Người sử dụng Dolibarr
+LastName=Tên
+FirstName=Tên đầu tiên
+ListOfGroups=Danh sách nhóm
+NewGroup=Nhóm mới
+CreateGroup=Tạo nhóm
+RemoveFromGroup=Xóa khỏi nhóm
+PasswordChangedAndSentTo=Mật khẩu thay đổi và gửi <b>đến% s.</b>
+PasswordChangeRequestSent=Yêu cầu thay đổi mật khẩu <b>cho% s</b> gửi <b>đến% s.</b>
+MenuUsersAndGroups=Người dùng & Nhóm
+LastGroupsCreated=Nhóm tạo ra cuối% s
+LastUsersCreated=Cuối% của người sử dụng tạo ra
+ShowGroup=Hiện nhóm
+ShowUser=Hiện người dùng
+NonAffectedUsers=Người dùng không được giao
+UserModified=Người sử dụng sửa đổi thành công
+PhotoFile=Hình ảnh tập tin
+UserWithDolibarrAccess=Người sử dụng truy cập Dolibarr
+ListOfUsersInGroup=Danh sách các thành viên trong nhóm này
+ListOfGroupsForUser=Danh sách nhóm cho người dùng này
+UsersToAdd=Người sử dụng để thêm vào nhóm này
+GroupsToAdd=Nhóm để thêm người sử dụng này
+NoLogin=Không đăng nhập
+LinkToCompanyContact=Liên kết với bên thứ ba / liên lạc
+LinkedToDolibarrMember=Trao đổi liên kết thành viên
+LinkedToDolibarrUser=Liên kết đến Dolibarr người dùng
+LinkedToDolibarrThirdParty=Liên kết đến Dolibarr bên thứ ba
+CreateDolibarrLogin=Tạo một người dùng
+CreateDolibarrThirdParty=Tạo một bên thứ ba
+LoginAccountDisable=Tài khoản bị vô hiệu hóa, đặt một đăng nhập mới để kích hoạt nó.
+LoginAccountDisableInDolibarr=Tài khoản bị vô hiệu hóa trong Dolibarr.
+LoginAccountDisableInLdap=Tài khoản bị vô hiệu hóa trong miền.
+UsePersonalValue=Sử dụng giá trị cá nhân
+GuiLanguage=Ngôn ngữ giao diện
 InternalUser=Người dùng bên trong
-MyInformations=My data
-ExportDataset_user_1=Dolibarr's users and properties
-DomainUser=Domain user %s
-Reactivate=Reactivate
-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=An <b>internal</b> user is a user that is part of your company/foundation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
-PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
-Inherited=Inherited
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
-IdPhoneCaller=Id phone caller
-UserLogged=User %s login
-UserLogoff=User %s logout
-NewUserCreated=User %s created
-NewUserPassword=Password change for %s
-EventUserModified=User %s modified
-UserDisabled=User %s disabled
-UserEnabled=User %s activated
-UserDeleted=User %s removed
-NewGroupCreated=Group %s created
-GroupModified=Group modified successfully
-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 ?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ?
-LoginToCreate=Login to create
-NameToCreate=Name of third party to create
-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
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
+MyInformations=Dữ liệu của tôi
+ExportDataset_user_1=Người sử dụng và các đặc tính của Dolibarr
+DomainUser=Miền người dùng% s
+Reactivate=Kích hoạt
+CreateInternalUserDesc=Hình thức này cho phép bạn tạo ra một người dùng nội bộ cho công ty / tổ chức. Để tạo ra một người dùng bên ngoài (khách hàng, nhà cung cấp, ...), sử dụng nút 'Tạo Dolibarr người sử dụng từ thẻ liên lạc bên thứ ba.
+InternalExternalDesc=Một người sử dụng <b>nội bộ</b> là một người sử dụng là một phần của công ty / tổ chức. <br> Một người sử dụng <b>bên ngoài</b> là một khách hàng, nhà cung cấp hoặc khác. <br><br> Trong cả hai trường hợp, cho phép xác định quyền trên Dolibarr, còn người dùng bên ngoài có thể có một người quản lý menu khác nhau hơn so với người dùng nội bộ (Xem chủ - Setup - Display)
+PermissionInheritedFromAGroup=Giấy phép được cấp bởi vì thừa hưởng từ một trong những nhóm của người dùng.
+Inherited=Kế thừa
+UserWillBeInternalUser=Người dùng tạo ra sẽ là một người dùng nội bộ (vì không liên kết với một bên thứ ba cụ thể)
+UserWillBeExternalUser=Người dùng tạo ra sẽ là một người dùng bên ngoài (vì liên quan đến một bên thứ ba cụ thể)
+IdPhoneCaller=Id người gọi điện thoại
+UserLogged=Người dùng đăng nhập% s
+UserLogoff=Sử dụng% s đăng xuất
+NewUserCreated=Sử dụng% s tạo
+NewUserPassword=Thay đổi mật khẩu cho% s
+EventUserModified=Sử dụng% s sửa đổi
+UserDisabled=Sử dụng% s khuyết tật
+UserEnabled=Sử dụng% s kích hoạt
+UserDeleted=Sử dụng% s loại bỏ
+NewGroupCreated=Nhóm% s tạo
+GroupModified=Group %s modified
+GroupDeleted=Nhóm% s loại bỏ
+ConfirmCreateContact=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr cho liên hệ này?
+ConfirmCreateLogin=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr thành viên này?
+ConfirmCreateThirdParty=Bạn có chắc chắn bạn muốn tạo ra một bên thứ ba của thành viên này?
+LoginToCreate=Đăng nhập để tạo ra
+NameToCreate=Tên của bên thứ ba để tạo ra
+YourRole=Vai trò của bạn
+YourQuotaOfUsersIsReached=Hạn ngạch của người dùng hoạt động đạt được!
+NbOfUsers=Nb của người sử dụng
+DontDowngradeSuperAdmin=Chỉ có một superadmin có thể hạ xuống một superadmin
+HierarchicalResponsible=Giám sát
+HierarchicView=Nhìn thứ bậc
+UseTypeFieldToChange=Sử dụng Type để thay đổi
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
+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 fb2b85ef4da..846f80ab12d 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -1,96 +1,97 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-StandingOrdersArea=Standing orders area
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
-StandingOrderToProcess=To process
-StandingOrderProcessed=Processed
-Withdrawals=Withdrawals
-Withdrawal=Withdrawal
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-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
-CustomersStandingOrders=Customer standing orders
-CustomerStandingOrder=Customer standing order
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
-AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
-NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
-ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Last %s withdrawing receipts
-MakeWithdrawRequest=Make a withdraw request
-ThirdPartyBankCode=Third party bank code
-ThirdPartyDeskCode=Third party desk code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
-ClassCredited=Classify credited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-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
-Status=Status
-StatusUnknown=Chưa rõ
-StatusWaiting=Waiting
-StatusTrans=Sent
-StatusCredited=Credited
-StatusRefused=Refused
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
-StatusMotif4=Customer Order
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
-CreateAll=Withdraw all
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyEmision=Withdrawal Emission
-NotifyCredit=Withdrawal Credit
-NumeroNationalEmetter=National Transmitter Number
-PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw
-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
-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.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
+StandingOrdersArea=Đơn đặt hàng thường trực khu vực
+CustomersStandingOrdersArea=Khách hàng đứng đơn đặt hàng khu vực
+StandingOrders=Đứng đơn đặt hàng
+StandingOrder=Đứng đơn đặt hàng
+NewStandingOrder=Để đứng mới
+StandingOrderToProcess=Để xử lý
+StandingOrderProcessed=Xử lý
+Withdrawals=Tiền thu hồi
+Withdrawal=Rút
+WithdrawalsReceipts=Biên lai thu hồi
+WithdrawalReceipt=Nhận thu hồi
+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 để 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
+NbOfInvoiceToWithdrawWithInfo=Nb. hóa đơn với rút lại yêu cầu cho khách hàng có thông tin tài khoản ngân hàng được xác định
+InvoiceWaitingWithdraw=Hóa đơn chờ rút
+AmountToWithdraw=Số tiền rút
+WithdrawsRefused=Rút từ chối
+NoInvoiceToWithdraw=Không có hoá đơn thanh toán của khách hàng trong chế độ "rút" được chờ đợi. Đi vào tab 'Rút' trên thẻ hóa đơn để thực hiện một yêu cầu.
+ResponsibleUser=Người sử dụng có trách nhiệm
+WithdrawalsSetup=Thiết lập thu hồi
+WithdrawStatistics=Số liệu thống kê thu hồi của
+WithdrawRejectStatistics=Thu hồi số liệu thống kê từ chối của
+LastWithdrawalReceipt=Biên lai thu hồi cuối% s
+MakeWithdrawRequest=Thực hiện một rút lại yêu cầu
+ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
+ThirdPartyDeskCode=Bên thứ ba đang bàn
+NoInvoiceCouldBeWithdrawed=Không có hoá đơn Đã rút thành công. Kiểm tra hóa đơn được trên công ty với một BAN hợp lệ.
+ClassCredited=Phân loại ghi
+ClassCreditedConfirm=Bạn có chắc chắn bạn muốn phân loại nhận thu hồi này là ghi có vào tài khoản ngân hàng của bạn?
+TransData=Ngày truyền
+TransMetod=Phương pháp truyền
+Send=Gửi
+Lines=Dòng
+StandingOrderReject=Ban hành 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=Invoice refused (Charge the rejection to customer)
+Status=Tình trạng
+StatusUnknown=Không biết
+StatusWaiting=Chờ
+StatusTrans=Gửi
+StatusCredited=Ghi
+StatusRefused=Từ chối
+StatusMotif0=Không quy định
+StatusMotif1=Không đủ tiền
+StatusMotif2=Yêu cầu tranh chấp
+StatusMotif3=Không có lệnh thu hồi
+StatusMotif4=Khách hàng tự
+StatusMotif5=RIB không sử dụng được
+StatusMotif6=Tài khoản mà không cân bằng
+StatusMotif7=Quyết định tư pháp
+StatusMotif8=Lý do khác
+CreateAll=Rút tất cả
+CreateGuichet=Chỉ có văn phòng
+CreateBanque=Chỉ ngân hàng
+OrderWaiting=Đang chờ xử lý
+NotifyTransmision=Rút truyền
+NotifyEmision=Thu hồi khí thải
+NotifyCredit=Thu hồi tín dụng
+NumeroNationalEmetter=Số quốc gia phát
+PleaseSelectCustomerBankBANToWithdraw=Chọn các thông tin về tài khoản ngân hàng của khách hàng để thu hồi
+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=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=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=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoFoot=This is an automated message sent by Dolibarr
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
-ModeWarning=Option for real mode was not set, we stop after this simulation
+InfoCreditSubject=Thanh toán đứng thứ tự% s của ngân hàng
+InfoCreditMessage=Trình tự đứng% s đã được thanh toán của ngân hàng <br> Dữ liệu thanh toán:% s
+InfoTransSubject=Truyền tải đứng thứ tự% s cho ngân hàng
+InfoTransMessage=Trình tự đứng% s đã được gửi đến ngân hàng bởi% s% s. <br><br>
+InfoTransData=Số tiền:% s <br> Phương pháp:% s <br> Ngày:% s
+InfoFoot=Đây là một thông báo tự động gửi Dolibarr
+InfoRejectSubject=Lệnh chuyển tiền định từ chối
+InfoRejectMessage=Xin chào, <br><br> thứ tự đứng hóa đơn% s liên quan đến công ty% s, với số tiền% s đã bị từ chối bởi các ngân hàng. <br><br> - <br> % S
+ModeWarning=Lựa chọn cho chế độ thực sự không được thiết lập, chúng tôi dừng lại sau khi mô phỏng này
diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
index ed0b30ae89c..1e92c9c1396 100644
--- a/htdocs/langs/vi_VN/workflow.lang
+++ b/htdocs/langs/vi_VN/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
-WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled 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
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed
-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
+WorkflowSetup=Thiết lập mô-đun công việc
+WorkflowDesc=Module này được thiết kế để thay đổi hành vi của các hành động tự động vào ứng dụng. Theo mặc định, quy trình làm việc được mở ra (bạn thực hiện điều theo thứ tự bạn muốn). Bạn có thể kích hoạt các hành động tự động mà bạn là thú vị trong.
+ThereIsNoWorkflowToModify=Không có công việc, bạn có thể thay đổi cho mô-đun bạn đã kích hoạt.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tạo ra một đơn đặt hàng tự động sau một đề nghị thương mại được ký kết
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau một đề nghị thương mại được ký kết
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau khi hợp đồng được xác nhận
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Tạo ra một hóa đơn khách hàng tự động sau khi một đơn đặt hàng bị đóng
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Phân loại đề xuất nguồn liên quan đến hóa đơn khi đơn đặt hàng được thiết lập để trả
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Phân loại đơn đặt hàng nguồn liên kết (s) để tính tiền khi hóa đơn khách hàng được thiết lập để trả
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Phân loại theo thứ tự liên kết nguồn khách hàng (s) để tính tiền khi hóa đơn của khách hàng được xác nhận
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
new file mode 100644
index 00000000000..fc37725f98e
--- /dev/null
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=会计
+Globalparameters=全局参数
+Chartofaccounts=科目表
+Fiscalyear=财年
+Menuaccount=会计账目
+Menuthirdpartyaccount=第三方帐户
+MenuTools=工具
+
+ConfigAccountingExpert=配置"会计专家模块"
+Journaux=日记帐
+JournalFinancial=财经杂志
+Exports=出口
+Modelcsv=出口型号
+Selectmodelcsv=选择一个“导出模型”
+Modelcsv_normal=典型的导出
+Modelcsv_CEGID=出口对Cegid的专家
+BackToChartofaccounts=返回科目表
+Back=返回
+
+Definechartofaccounts=定义会计科目表
+Selectchartofaccounts=选择会计科目表
+Validate=验证
+Addanaccount=添加一个会计帐户
+AccountAccounting=会计账户
+Ventilation=Breakdown
+ToDispatch=派遣
+Dispatched=调度
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=贸易保证金
+Reports=报告
+ByCustomerInvoice=依据”发票“的客户
+ByMonth=按月份
+NewAccount=”新建“会计账户
+Update=更新
+List=名单
+Create=创建
+UpdateAccount=修改”会计帐户“
+UpdateMvts=对一个”活动“进行修改
+WriteBookKeeping=在”总账“中的”账户记录“
+Bookkeeping=总帐
+AccountBalanceByMonth=”账户余额“按月份
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=线
+
+CAHTF=总采购供应商HT
+InvoiceLines=发票行进行通风
+InvoiceLinesDone=发票通风线
+IntoAccount=在会计帐户
+
+Ventilate=通风
+VentilationAuto=Automatic breakdown
+
+Processing=处理
+EndProcessing=处理的结束
+AnyLineVentilate=任何行通风
+SelectedLines=选系
+Lineofinvoice=发票行
+VentilatedinAccount=在会计账户成功通风
+NotVentilatedinAccount=不通风的会计账户
+
+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=会计长度账户显示在的Dolibarr
+AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。
+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=转账账户
+ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=文件类型
+Docdate=日期
+Docref=参考
+Numerocompte=帐户
+Code_tiers=第三方
+Labelcompte=标签帐户
+Debit=借记卡
+Credit=信用
+Amount=金额
+Sens=SENS
+Codejournal=日记帐
+
+DelBookKeeping=删除总帐的记录
+
+SellsJournal=出售的”日记帐“
+PurchasesJournal=购买的”日记帐“
+DescSellsJournal=出售的”日记帐“
+DescPurchasesJournal=购买的”日记帐“
+BankJournal=银行日记账
+DescBankJournal=银行日记账，包括支付现金以外的所有类型
+CashJournal=现金日记账
+DescCashJournal=现金日记账，包括支付现金的类型
+
+CashPayment=现金付款
+
+SupplierInvoicePayment=付款发票的供应商
+CustomerInvoicePayment=付款发票的客户
+
+ThirdPartyAccount=第三方账户
+
+NewAccountingMvt=创建新的活动
+NumMvts=移动号码
+ListeMvts=”活动“的列表
+ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值
+
+ReportThirdParty=列出第三方账户
+DescThirdPartyReport=在这里请教第三方客户及供应商，其会计账目清单
+
+ListAccounts=会计账目清单
+
+Pcgversion=该计划的版本
+Pcgtype=账户类
+Pcgsubtype=在类账户
+Accountparent=该帐户的根
+Active=声明
+
+NewFiscalYear=新财年
+
+DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
+TotalVente=总成交量HT
+TotalMarge=总销售利润率
+DescVentilDoneCustomer=这里查阅发票的客户的行和其会计帐户的列表
+DescVentilTodoCustomer=与会计帐户通风客户发票行
+ChangeAccount=变化的账户选择行会计帐户：
+Vide=-
+DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilTodoSupplier=与会计帐户通风发票的供应商的线路
+DescVentilDoneSupplier=在这里请教发票的供应商的线条和其会计帐户列表
+
+ValidateHistory=自动验证
+
+ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来
+
+FicheVentilation=Breakdown card
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 871ad81277d..aa7361675a0 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -43,17 +43,21 @@ SecuritySetup=安全设置
 ErrorModuleRequirePHPVersion=错误，此模块要求 PHP 版本 %s 或更高
 ErrorModuleRequireDolibarrVersion=错误，此模块要求 Dolibarr 版本 %s 或更高
 ErrorDecimalLargerThanAreForbidden=错误，不支持超过 <b>%s</b> 的精度。
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
+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=在第三表中显示全天事件
@@ -104,9 +108,9 @@ OtherOptions=其他选项
 OtherSetup=其他设置
 CurrentValueSeparatorDecimal=小数位分隔符
 CurrentValueSeparatorThousand=千位分隔符
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=目的地
+IdModule=模块ID
+IdPermissions=权限ID
 Modules=模块
 ModulesCommon=主要模块
 ModulesOther=其他模块
@@ -118,7 +122,7 @@ LanguageBrowserParameter=参数 %s
 LocalisationDolibarrParameters=本地化参数
 ClientTZ=客户端时区(用户侧)
 ClientHour=客户端时间(用户侧)
-OSTZ=Server OS Time Zone
+OSTZ=服务器操作系统时区
 PHPTZ=PHP服务器时区
 PHPServerOffsetWithGreenwich=PHP服务器与 GMT 时差(秒)
 ClientOffsetWithGreenwich=客户机/浏览器与 GMT 时差(秒)
@@ -133,7 +137,7 @@ Box=资讯框
 Boxes=资讯框
 MaxNbOfLinesForBoxes=资讯框最大行数
 PositionByDefault=默认顺序
-Position=* 顺序/订单
+Position=Position
 MenusDesc=菜单管理器定义两菜单中的内容(横向和纵向菜单栏)。
 MenusEditorDesc=菜单编辑器允许您定义个性化的菜单项。请谨慎使用，以免造成部分菜单项无法访问，影响 Dolibarr 的稳定性。<br>一些模块会添加菜单项(通常在 <b>所有(All)</b>菜单下)。如果您错误的移除了其中的一些菜单项，可以通过禁用/重新启用相应的模块来恢复。
 MenuForUsers=用户菜单
@@ -206,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=资讯框可用
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=自动，如果 JavaScript 被禁用
 AvailableOnlyIfJavascriptNotDisabled=仅当 JavaScript 启用时可用
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=仅当 JavaScript 启用时可用
 Required=必要
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=安全
 Passwords=密码
 DoNotStoreClearPassword=不在数据库中储存明文密码，只存储加密后的密码(建议启用)
@@ -235,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=用户或开发人员用文档(文档，常见问题…)，<br>参见 Dolibarr 百科：<br><b><a href="%s" target="_blank">%s</a></b>
 ForAnswersSeeForum=您有任何其他问题/帮助，可以到 Dolibarr 论坛： <br> <b><a href="%s" target="_blank">%s</a></b>
 HelpCenterDesc1=此处可以帮助你获得 Dolibarr 帮助支持服务。
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS 主机 ( Unix 类系统
 MAIN_MAIL_EMAIL_FROM=系统电邮发件人 ( php.ini 文件中的默认值：<b>%s</b>)
 MAIN_MAIL_ERRORS_TO=出错通知邮件使用的发件人地址
 MAIN_MAIL_AUTOCOPY_TO= BCC 所有发送邮件至
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=禁用电邮发送功能 (用于测试目的或演示)
 MAIN_MAIL_SENDMODE=电邮发送方法
 MAIN_MAIL_SMTPS_ID=SMTP ID，如果要求验证
@@ -296,7 +305,7 @@ CurrentVersion=Dolibarr 当前版本
 CallUpdatePage=请到数据库的结构和数据更新页面：%s。
 LastStableVersion=最新的稳定版本
 GenericMaskCodes=您可自由设置格式掩码。在 %s 格式掩码中， 有如下计数标记可用：<br><b>{000000}</b>表示按顺序递增的序号。序号位数与掩码中0的个数相同，不足自动补零，达最大值后自动归零。<br><b>{000000+000}</b> 同上但 %s 起始序号从 + 后的数值记起。<br><b>{000000@x}</b> 与第一种相同，但序号到X月时自动清零(x=1~12 、0＝程序设置中的财年起始月、99＝每月清零)。 如果使用此种掩码且 x >= 2 ，则必须同时使用日期掩码 {yy}{mm} 或 {yyyy}{mm}。<br><b>{dd}</b> 天 (01~31)。<br><b>{mm}</b> 月 (01~12)。<br><b>{yy}</b>，<b>{yyyy}</b> 或 <b>{y}</b> 代表 2位, 4位 或 1 位年。<br><br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> 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.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> n个字符，客户端代码<br><b>{cccc000}</b>上的n个字符的客户端代码后面是一个专门用于客户计数器。此计数器将比较全局计数器相同时间为用户进行复位。 <br><b>{tttt}</b>第三方类型的n个字符（见词典第三方类型）的代码。 <br>
 GenericMaskCodes3=其它非标记字符将维持不变。<br>不允许使用空格<br>
 GenericMaskCodes4a=<u>例如: 2007-01-31 第三方“TheCompany”的第99笔 %s ：</u> <br>
 GenericMaskCodes4b=<u>例如: 2007-03-1 建立的第三方公司:</u><br>
@@ -431,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
@@ -469,22 +478,18 @@ 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=捐款的管理
-Module800Name=OSCommerce (通过直接数据库访问)
-Module800Desc=通过直接访问其数据库，在界面中显示 OSCommerce 或 OSCSS 店铺
-Module900Name=OSCommerce by WS
-Module900Desc=Interface to show an OSCommerce shop via Web services. This module requiere you to install components from /oscommerce_ws/ws_server into your OSCommerce server. See README file in /oscommerce_ws/ws_server.
 Module1200Name=Mantis
 Module1200Desc=Mantis 整合
 Module1400Name=会计
@@ -493,6 +498,8 @@ Module1780Name=分类
 Module1780Desc=分类的管理(产品、供应商和客户)
 Module2000Name=所见即所得编辑器
 Module2000Desc=允许在一些文本编辑区中使用所见即所得编辑器
+Module2200Name=Dynamic Prices
+Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
 Module2300Desc=任务排程管理
 Module2400Name=日程
@@ -501,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 客户端
@@ -512,16 +521,20 @@ Module5000Name=多公司
 Module5000Desc=允许你管理多个公司
 Module6000Name=工作流程
 Module6000Desc=工作流管理
-Module20000Name=休假
-Module20000Desc=声明和跟踪聘员休假
+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网上支付页面
+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=利润空间
@@ -575,9 +588,6 @@ Permission92=建立/修改的社会贡献和增值税
 Permission93=删除社会贡献和增值税
 Permission94=导出社会贡献
 Permission95=阅读报告
-Permission96=设置调度
-Permission97=Read invoice accountancy dispatching
-Permission98=Dispatch invoice accountancy lines
 Permission101=读取发货资讯
 Permission102=建立/修改发货单
 Permission104=确认发货单
@@ -603,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=建立/修改采购订单
@@ -668,7 +679,7 @@ Permission300=读取条码
 Permission301=建立/修改条码
 Permission302=删除条码
 Permission311=阅读服务
-Permission312=指派服务到合同
+Permission312=Assign service/subscription to contract
 Permission331=阅读书签
 Permission332=建立/修改书签
 Permission333=删除书签
@@ -685,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=删除服务
@@ -698,8 +709,8 @@ Permission701=读取捐款资讯
 Permission702=建立/修改捐款资讯
 Permission703=删除捐款资讯
 Permission1001=读取库存资讯
-Permission1002=建立/修改库存资讯
-Permission1003=删除库存资讯
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=读取库存的转让资讯
 Permission1005=建立/修改库存转让
 Permission1101=读取交货订单
@@ -748,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
@@ -775,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
@@ -785,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)
@@ -810,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=文档中的标签
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=常驻左侧菜单搜寻框
 DefaultLanguage=默认语言使用(语言代码)
 EnableMultilangInterface=启用多语言界面
 EnableShowLogo=左侧菜单中显示公司标志
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=您的系统已成功更新
 CompanyInfo=公司资讯
 CompanyIds=公司/协会的编号
@@ -928,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=安全事件清除
@@ -1012,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=通过电邮发送的设置
@@ -1035,7 +1048,6 @@ YesInSummer=是(在夏天)
 OnlyFollowingModulesAreOpenedToExternalUsers=注意，仅如下模块向外部用户开放。(无论外部用户的权限如何)：
 SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密
 ConditionIsCurrently=当前条件为 %s
-TestNotPossibleWithCurrentBrowsers=自动检测不能使用
 YouUseBestDriver=你使用的驱动程序 %s 就是目前最佳驱动程式。
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=你只有 %s  的产品/服务在数据库。这并不需要任何特别的优化。
@@ -1049,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个字符，包含小写数字和字母。
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=根据以下编码原则返回会计编号: <br>以 %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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* or by setting a global target email address on module setup page.
 ModelModules=文件模板
 DocumentModelOdt=从开放文档模板软件(OpenOffice, KOffice, TextEdit,...等)生成(.ODT，.ODS）模板文档。
 WatermarkOnDraft=为草稿文档加水印
+JSOnPaimentBill=激活在线支付功能来自动填充付款的形式
 CompanyIdProfChecker=Professional Id 规则
 MustBeUnique=必须是唯一 ID 吗？
 MustBeMandatory=强制创建第三方？
@@ -1134,6 +1147,7 @@ AddDeliveryAddressAbility=添加交付日期的能力
 UseOptionLineIfNoQuantity=定量为0的产品或服务项视为可选项*
 FreeLegalTextOnProposal=报价单中的额外说明文本
 WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### Orders #####
 OrdersSetup=订单管理设置
 OrdersNumberingModules=订单编号模块
@@ -1142,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<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
@@ -1154,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=会员模块设置
@@ -1318,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=服务模块设置
@@ -1328,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=默认的条码类型
@@ -1378,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=发货单据模板
@@ -1408,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=树状菜单
@@ -1474,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的任意页面加入您的左侧菜单中。
@@ -1520,16 +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
+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 aef8f97a794..50054428dab 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=事件ID号
 Actions=事件
 ActionsArea=事件区域（事件和任务）
-Agenda= 待办事项
-Agendas= 待办事项
-Calendar= 日历
-Calendars= 日历
-LocalAgenda=本地日历
-AffectedTo= 受影响
-DoneBy= 做的
-Events= 事件
+Agenda=待办事项
+Agendas=待办事项
+Calendar=日历
+Calendars=日历
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=受影响
+DoneBy=做的
+Event=Event
+Events=事件
 EventsNb=事件数
 MyEvents=我的事件
 OtherEvents=其他事件
@@ -17,31 +19,33 @@ ListOfActions=事件列表
 Location=位置
 EventOnFullDay=全天事件
 SearchAnAction= 搜索事件/任务
-MenuToDoActions= 所有未完成的事件
-MenuDoneActions= 所有终止事件
-MenuToDoMyActions= 我的未完成事件
-MenuDoneMyActions= 我的已经终结的事件
-ListOfEvents= Dolibarr事件列表
+MenuToDoActions=所有未完成的事件
+MenuDoneActions=所有终止事件
+MenuToDoMyActions=我的未完成事件
+MenuDoneMyActions=我的已经终结的事件
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=记录操作
 ActionsToDoBy=受影响的行动
 ActionsDoneBy=做的动作
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= 我所有的事件/任务
 AllActions= 所有/任务行动
 ViewList=查看列表
 ViewCal=查看日历
 ViewDay=日视图
 ViewWeek=周视图
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= 查看与预定义的过滤器
 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的验证
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=为了%s批准
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=为了%s回到草案状态
 OrderCanceledInDolibarr=为了%s取消
-InterventionValidatedInDolibarr=%s的验证干预
 ProposalSentByEMail=商业建议通过电子邮件发送%s
 OrderSentByEMail=客户订单通过电子邮件发送%s
 InvoiceSentByEMail=客户发票通过电子邮件发送%s
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=供应商的订单通过电子邮件发送%s
 SupplierInvoiceSentByEMail=供应商的发票通过电子邮件发送%s
 ShippingSentByEMail=通过电子邮件发送的航运%s
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=通过电子邮件发送的干预%s
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= 第三方创建
 DateActionPlannedStart= 计划开始日期
 DateActionPlannedEnd= 计划结束日期
@@ -68,19 +69,24 @@ DateActionStart= 开始日期
 DateActionEnd= 结束日期
 AgendaUrlOptions1=您还可以添加以下参数来筛选输出：
 AgendaUrlOptions2=<b>login=%s</b> 表示限制只导出创造用户，受影响用户或使用者或执行者为<b>%s</b>的待办事项。
-AgendaUrlOptions3=<b>logina=%s</b> 表示限制只导出创建用户为<b>%s</b>的待办事项。
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b>表示限制只导出使用者与受影响者为<b>%s</b>的待办事项。
-AgendaUrlOptions5=<b>logind=%s</b>表示限制只导出执行者为<b>%s</b>的待办事项。
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=显示生日的接触
 AgendaHideBirthdayEvents=隐藏生日的接触
 Busy=忙碌
 ExportDataset_event1=待办事项事件列表
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=出口日历
 ExtSites=导入外部日历
-ExtSitesEnableThisTool=在待办事项中显示外部日历
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=日历数
 AgendaExtNb=日历NB %s
 ExtSiteUrlAgenda=URL来访问。iCal文件
 ExtSiteNoLabel=无说明
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index da6a2394c9a..18c59db625f 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=信用注意
 InvoiceAvoirAsk=信用注意纠正发票
 InvoiceAvoirDesc=<b>信贷说明</b>是一种消极的发票用来解决一个事实，即发票已缴纳的数额相差实在比额（因为顾客付出太多的错误，例如将不支付或完全因为他归还了部分产品）。
 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%
@@ -85,8 +85,9 @@ ClassifyPaid=分类'已付'
 ClassifyPaidPartially=分类'部分已付'
 ClassifyCanceled=分类'已遗弃'
 ClassifyClosed=分类'已关闭'
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=创建发票
-AddBill=添加注意发票或信用
+AddBill=Create invoice or credit note
 AddToDraftInvoices=添加到草案发票
 DeleteBill=删除发票
 SearchACustomerInvoice=搜寻客户发票
@@ -98,7 +99,7 @@ DoPaymentBack=付款回
 ConvertToReduc=转换到未来的折扣
 EnterPaymentReceivedFromCustomer=输入从客户收到付款
 EnterPaymentDueToCustomer=由于客户的付款
-DisabledBecauseRemainderToPayIsZero=禁用，因为其余部分支付为零
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=额
 PriceBase=价格基准
 BillStatus=发票状态
@@ -136,8 +137,6 @@ BillFrom=From
 BillTo=Bill To
 ActionsOnBill=行动对发票
 NewBill=新发票
-Prélèvements=长期订单
-Prélèvements=长期订单
 LastBills=上次%s的发票
 LastCustomersBills=上次%s的客户发票
 LastSuppliersBills=上次%s的供应商发票
@@ -155,9 +154,9 @@ ConfirmCancelBill=你确定要取消发票<b>%s吗</b> ？
 ConfirmCancelBillQuestion=你为什么要这样分类发票'放弃'？
 ConfirmClassifyPaidPartially=您确定要更改<b>%s</b>的地位发票支付？
 ConfirmClassifyPaidPartiallyQuestion=这发票尚未完全支付。是什么原因让你关闭此发票？
-ConfirmClassifyPaidPartiallyReasonAvoir=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我注意到规范使用信用卡的增值税。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我接受失去这个折扣的增值税。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付<b>（%s的%s）</b>是一个折扣，因为获得付款之前任期。我在此折扣不恢复信贷注意到增值税。
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=坏顾客
 ConfirmClassifyPaidPartiallyReasonProductReturned=产品部分返回
 ConfirmClassifyPaidPartiallyReasonOther=其他原因而放弃额
@@ -190,15 +189,15 @@ AlreadyPaid=已支付
 AlreadyPaidBack=已经支付
 AlreadyPaidNoCreditNotesNoDeposits=已支付（无信用票据及存款）
 Abandoned=弃
-RemainderToPay=未支付
-RemainderToTake=其余部分采取
-RemainderToPayBack=其余还钱
+RemainderToPay=Remaining unpaid
+RemainderToTake=Remaining amount to take
+RemainderToPayBack=Remaining amount to pay back
 Rest=待办
 AmountExpected=索赔额
 ExcessReceived=收到过剩
 EscompteOffered=折扣额（任期前付款）
-SendBillRef=%s的发送发票
-SendReminderBillRef=发送发票的%s（提醒）
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=常年订单
 StandingOrder=长期订单
 NoDraftBills=没有发票草案
@@ -218,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=客户发票清单和发票的路线
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=两个新的折扣总额必须等于原来
 ConfirmRemoveDiscount=你确定要删除此折扣？
 RelatedBill=相关发票
 RelatedBills=有关发票
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=即时
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index c7e98492348..2b0e2a388f3 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -66,7 +66,7 @@ ReturnInCompany=返回到客户/前景卡
 ContentsVisibleByAll=内容将所有可见
 ContentsVisibleByAllShort=所有内容可见
 ContentsNotVisibleByAllShort=所有内容不可见
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=删除类别
 ConfirmDeleteCategory=你确定要删除这个分类？
 RemoveFromCategory=删除连接的类别：
@@ -101,13 +101,12 @@ CatSupLinks=供应商及个类别之间的相关链接
 CatCusLinks=客户/前景和类别之间的相关链接
 CatProdLinks=产品/服务和类别之间的相关链接
 CatMemberLinks=成员和类别之间的相关链接
-CatProdLinks=产品/服务和类别之间的相关链接
-CatCusLinks=客户/前景和类别之间的相关链接
-CatSupLinks=供应商及个类别之间的相关链接
 DeleteFromCat=从类别中删除
-# 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
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 9a9c4f2aa78..bef78d52342 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=您必须创建电子邮件第三方接触首先可以
 ListSuppliersShort=供应商名单
 ListProspectsShort=名单前景
 ListCustomersShort=客户名单
-ThirdPartiesArea=第三方区
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=最后%s修改第三方
 UniqueThirdParties=独特的第三方总计
 InActivity=打开
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=返回格式%syymm为客户代码以及%syymm -○○○○供应商代码其中YY是年numero，MM是月，nnnn是一个没有休息，没有为0返回序列。
 LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随时修改。
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 2813b899471..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的
@@ -187,7 +188,7 @@ AccountancyDashboard=会计摘要
 ByProductsAndServices=通过产品和服务
 RefExt=外部编码
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=链接到订单
+LinkedOrder=Link to order
 ReCalculate=重新计算
 Mode1=方法 1
 Mode2=方法 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=计算模式
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=买产品的缺省会计模式
-COMPTA_PRODUCT_SOLD_ACCOUNT=卖产品的缺省会计模式
-COMPTA_SERVICE_BUY_ACCOUNT=买服务的缺省会计模式
-COMPTA_SERVICE_SOLD_ACCOUNT=卖服务的缺省会计模式
-COMPTA_VAT_ACCOUNT=征收增值税的缺省会计模式
-COMPTA_VAT_BUY_ACCOUNT=支付增值税的缺省会计模式
-COMPTA_ACCOUNT_CUSTOMER=默认情况下，第三方客户的会计代码
-COMPTA_ACCOUNT_SUPPLIER=默认情况下，第三方供应商的会计代码
+ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
+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
+CloneTaxForNextMonth=Clone it for next month
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 5e2cd5c8461..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=礼品的承诺
@@ -30,3 +30,9 @@ SearchADonation=搜索捐赠
 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 5fc6a24f9e9..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=一个技术性错误发生。请联系管理员，以下连接提供错误代码<b>%s</b>在您的邮件，甚至更好，加入了这个页面的屏幕拷贝的电子邮件<b>%s。</b>
@@ -114,6 +114,7 @@ ErrorLoginDoesNotExists=<b>如何正确</b>使用手机与登录<b>%</b>找不
 ErrorLoginHasNoEmail=这位用户没有电子邮件地址。进程中止。
 ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值...
 ErrorBothFieldCantBeNegative=领域的%s及%s可以不消极
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用来执行Web服务器用户帐户没有该权限
 ErrorNoActivatedBarcode=没有激活的条码类型
 ErrUnzipFails=%s 无法解压缩与解压缩
@@ -132,10 +133,29 @@ ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setu
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
+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=强制设置参数尚未定义
@@ -154,3 +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
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index e4e11aa02d7..85cf49e38f8 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=帐号
 BankAccountNumberKey=关键
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=如果你想过滤一些值，这里只是输入值。
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 fed57183de2..ba28033c043 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=人力资源管理（HRM）
-Holidays=休假
-CPTitreMenu=休假
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=申请假期
-NotActiveModCP=您必须启用假期模块，才能浏览这个页面。
-NotConfigModCP=查看此页面，您必须配置模块假期。<a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;">请点击这里</a>
-NoCPforUser=You don't have a demand for holidays.
-AddCP=申请假期
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=做一个请假申请
 Employe=雇员
 DateDebCP=开始日期
 DateFinCP=结束日期
@@ -18,24 +18,24 @@ ApprovedCP=批准
 CancelCP=取消
 RefuseCP=拒绝
 ValidatorCP=同意
-ListeCP=假期列表
+ListeCP=请假记录
 ReviewedByCP=将审查
 DescCP=描述
-SendRequestCP=创建请假条
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=编辑剩余假期数
 UpdateAllCP=更新假期
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=你必须选择结束日期大于起始日期。
 ErrorSQLCreateCP=创建过程中发生了一个SQL错误：
-ErrorIDFicheCP=发生了错误，请求节假日不存在。
+ErrorIDFicheCP=出现一个错误，请假申请不存在。
 ReturnCP=返回前一页
-ErrorUserViewCP=您无权阅读申请假期。
-InfosCP=Information of the demand of holidays
-InfosWorkflowCP=Information Workflow
+ErrorUserViewCP=您无权阅读该请假申请。
+InfosCP=请假申请信息
+InfosWorkflowCP=工作流程信息
 RequestByCP=Requested by
-TitreRequestCP=假期表
-NbUseDaysCP=消耗的假期天数
+TitreRequestCP=请假条
+NbUseDaysCP=消耗的休假天数
 EditCP=编辑
 DeleteCP=删除
 ActionValidCP=验证
@@ -43,71 +43,70 @@ ActionRefuseCP=拒绝
 ActionCancelCP=取消
 StatutCP=地位
 SendToValidationCP=发送到验证
-TitleDeleteCP=删除请假请求
-ConfirmDeleteCP=您确定要删除该请假请求？
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=您无权申请假期。
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=更新
-CantUpdate=你不能更新这个申请的假期。
+TitleDeleteCP=删除请假条
+ConfirmDeleteCP=确认删除该请假申请？
+ErrorCantDeleteCP=错误，您没有权限删除这个请假条。
+CantCreateCP=您无权做请假条。
+InvalidValidatorCP=You must choose an approbator to your leave request.
+CantUpdate=您不能更新这个请假条
 NoDateDebut=你必须选择开始日期。
 NoDateFin=你必须选择结束日期。
-ErrorDureeCP=Your request for holidays does not contain working day.
-TitleValidCP=批准申请假期
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=取消假期申请
-ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
+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.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=查看假期日志
-LogCP=登录更新假期
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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=假期第一天
-LastDayOfHoliday=假期的最后一天
+LastDayOfHoliday=假期最后一天
 HolidaysMonthlyUpdate=每月更新
 ManualUpdate=手动更新
-HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Leave request cancelation
 
 ## Configuration du Module ##
-ConfCP=节假日模块的配置
+ConfCP=Configuration of leave request module
 DescOptionCP=选项​​描述
 ValueOptionCP=值
-GroupToValidateCP=Group with the ability to approve holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=验证配置
-LastUpdateCP=假期最后自动更新
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=验证
 UpdateEventCP=Update events
 CreateEventCP=创建
@@ -125,25 +124,25 @@ TitleUpdateEventCP=Edit or delete a exceptional leave
 DeleteEventOptionCP=删除
 UpdateEventOptionCP=更新
 ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
+NoCPforMonth=这个月无休。
 nbJours=天数
-TitleAdminCP=配置假期
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=验证假期
-HolidaysToValidateBody=下面是一个假期验证请求
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=验证假期
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=拒绝假期
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=取消假期
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
index d7f7321b8e0..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=干预的行动
@@ -24,10 +24,21 @@ NameAndSignatureOfInternalContact=名称及干预签名：
 NameAndSignatureOfExternalContact=客户的姓名和签字：
 DocumentModelStandard=标准文档模型的干预
 InterventionCardsAndInterventionLines=干预和干预行
-ClassifyBilled=分类“帐单”
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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=注：在线发送<b>%s</b>的email限制发送，安全和超时的原因。
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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=无法找到用户<b>%s</b>在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<br/>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=你确定要验证这个原则下，根据名称<b>%s吗</b> ？
-ConfirmUnvalidateOrder=你是否确定要恢复秩序<b>%s</b>草案状态？
+ConfirmUnvalidateOrder=你是否确定要恢复订单<b>%s</b>草案状态？
 ConfirmCancelOrder=您确定要取消此订单？
-ConfirmMakeOrder=你一定要确认你这对<b>%的</b>命令？
+ConfirmMakeOrder=你确定你想要生成这个<b>%的</b>订单？
 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=你确定要克隆这个订单<b>%s吗</b> ？
 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=这个区域是专门用于杂项工具组到其他菜单项。 <br><br>这些工具可以达到从侧面菜单。
 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 aaa978f6ff7..d308f2dbaa5 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=已关闭
 ContractStatusRunning=* 执行中/running
 ContractStatusExpired=已过期
 ContractStatusOnHold=* 未执行/running
-ContractStatusToRun=A mettre en service
+ContractStatusToRun=To get running
 ContractNotRunning=此合同目前未执行
 ErrorProductAlreadyExists=编号为 %s 的产品已存在。
 ErrorProductBadRefOrLabel=输入的编号或标签无效，请输入符合要求的编号或标签。
 ErrorProductClone=试图同时克隆该产品或服务会有一个问题。
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=供应商
 SupplierRef=供应商的产品编号
 ShowProduct=显示产品
@@ -116,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=关键词筛选
@@ -131,7 +132,7 @@ AddDel=添加/删除
 Quantity=数量
 NoMatchFound=未发现匹配项目
 ProductAssociationList=相关产品/服务列表: 产品/服务名称 (按数量)
-ProductParentList=由此产品组成的虚拟产品或服务
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父产品
 DeleteProduct=删除产品/服务
 ConfirmDeleteProduct=您确定要删除此产品/服务吗？
@@ -178,7 +179,7 @@ CloneProduct=复制产品/服务
 ConfirmCloneProduct=您确定要复制产品或服务 <b>%s</b> 吗?
 CloneContentProduct=复制产品/服务的所有主要信息
 ClonePricesProduct=复制主要信息/价格
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
 CustomerPrices=销售价格
@@ -216,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 <b>%s</b>.
 NumberOfStickers=Number of stickers to print on page
 PrintsheetForOneBarCode=Print several stickers for one barcode
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 d6918c09c84..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=任务/活动
@@ -85,13 +87,13 @@ ActionsOnProject=行动项目
 YouAreNotContactOfProject=你是不是这个私人项目联系
 DeleteATimeSpent=删除的时间
 ConfirmDeleteATimeSpent=你确定要删除这个花的时间？
-DoNotShowMyTasksOnly=又见任务没有影响到我
-ShowMyTasksOnly=查看任务时，我只受影响
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=资源的整合
 ProjectsDedicatedToThisThirdParty=这个项目致力于第三方
 NoTasks=该项目没有任务
 LinkedToAnotherCompany=链接到其他第三方
-TaskIsNotAffectedToYou=任务不分配给你
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=所花费的时间是空的
 ThisWillAlsoRemoveTasks=这一行动也将删除所有项目任务<b>（%s</b>任务的时刻），花全部的时间都投入。
 IfNeedToUseOhterObjectKeepEmpty=如果某些对象（发票，订单，...），属于其他第三方，必须与该项目以创建，保持这个空项目多的第三方。
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=一个完整的项目报告模型（logo. ..）
 PlannedWorkload = 计划的工作量
@@ -128,3 +131,4 @@ ProjectReferers=参考对象
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
+FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
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 3153ccef1a1..b3b6e2e2c1b 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -54,23 +54,27 @@ StatsOnShipmentsOnlyValidated=对货物进行统计验证。使用的数据的
 DateDeliveryPlanned=刨交货日期
 DateReceived=交货日期收到
 SendShippingByEMail=通过电子邮件发送货物
-SendShippingRef=发送货物%s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=对装运的事件
 LinkToTrackYourPackage=链接到追踪您的包裹
 ShipmentCreationIsDoneFromOrder=就目前而言，建立一个新的装运完成从订单卡。
 RelatedShippings=相关运送
 ShipmentLine=航线
 CarrierList=转运列表
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
 
 # Sending methods
 SendingMethodCATCH=按客户捕捉
 SendingMethodTRANS=运输车
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=简单的送货单文档模型
 DocumentModelTyphon=更多的送货单（logo. ..完整的文档模型）
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=没有定义的常数EXPEDITION_ADDON_NUMBER
 SumOfProductVolumes=产品总数
 SumOfProductWeights=产品总重
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/zh_CN/shop.lang b/htdocs/langs/zh_CN/shop.lang
deleted file mode 100644
index a51ce042f69..00000000000
--- a/htdocs/langs/zh_CN/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=店
-ShopWeb=网上商店
-LastOrders=最后的订单
-OnStandBy=待命
-TreatmentInProgress=治疗进展
-LastCustomers=最后客户
-OSCommerceShop=oscommerce的店铺
-OSCommerce=oscommerce的
-AddProd=在线销售
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/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 3f546c91d90..18940213370 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=订购日期
 BuyingPrice=买价
 BuyingPriceMin=最低购买价格
 BuyingPriceMinShort=最小买入价
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=新增供应商的价格
 ChangeSupplierPrice=供应商的价格变化
 ErrorQtyTooLowForThisSupplier=数量过低，供应商或供应商在这此产品没有价格定义
@@ -40,3 +40,5 @@ AddSupplierInvoice=创建供应商发票
 ListOfSupplierProductForSupplier=<b>%</b>产品供应商名单和价格<b>的</b> S
 NoneOrBatchFileNeverRan=无或批处理<b>%不是</b>最近跑
 SentToSuppliers=发送到供应商
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index c1032a2f3ee..239e2d1265c 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=旅程
 ListTripsAndExpenses=旅行和费用清单
 ExpensesArea=与贸易有关的知识产权协定“和开支面积
 SearchATripAndExpense=寻找旅行和费用
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..39c2732ec29
--- /dev/null
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -0,0 +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
+
+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
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Breakdown
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Breakdown customers
+SuppliersVentilation=Breakdown suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Breakdown accounting
+AccountingVentilationSupplier=Breakdown accounting supplier
+AccountingVentilationCustomer=Breakdown accounting customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic breakdown
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTING_SEPARATORCSV=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
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+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
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+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
+
+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
+Accountparent=Root of the 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:
+Vide=-
+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/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 6ea553626e7..55ae292a37f 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要Dolibarr%s或更高
 ErrorDecimalLargerThanAreForbidden=錯誤<b>，1%的</b>精度高於不支持。
 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)
@@ -54,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=充分顯示行動的日期，第三表
@@ -133,7 +137,7 @@ Box=資訊框
 Boxes=資訊框
 MaxNbOfLinesForBoxes=最大的行數為箱
 PositionByDefault=預設順序
-Position=順序位置
+Position=Position
 MenusDesc=經理定義菜單2菜單欄（橫向和縱向欄欄內容）。
 MenusEditorDesc=菜單編輯器允許您定義個性化的菜單項。使用它小心避免dolibarr不穩定和菜單項永遠無法達到的。 <br>某些模組菜單添加菜單項（在<b>所有</b>的病例<b>都</b>在大多數）。如果您錯誤地刪除了這些項目的一些，你可以通過禁用和重新啟用恢復模組它們。
 MenuForUsers=用戶菜單
@@ -206,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=資訊框可用
@@ -217,6 +222,7 @@ AutomaticIfJavascriptDisabled=如果JavaScript被禁用自動
 AvailableOnlyIfJavascriptNotDisabled=僅當禁用JavaScript是不
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=僅當禁用JavaScript是不
 Required=需要
+UsedOnlyWithTypeOption=Used by some agenda option only
 Security=安全
 Passwords=密碼
 DoNotStoreClearPassword=難道沒有明確的密碼存儲在數據庫，但只存儲加密值（活性炭推薦）
@@ -257,6 +263,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=的SMTP / SMTPS主機（不定義
 MAIN_MAIL_EMAIL_FROM=發件人電子郵件（郵件自動電子郵件為php.ini文件的預設位置<b>：%s）</b>的
 MAIN_MAIL_ERRORS_TO=錯誤回報電子郵件的發件人電子郵件發送
 MAIN_MAIL_AUTOCOPY_TO= 發送一個隱藏的系統碳複製所有發送電子郵件給
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
 MAIN_DISABLE_ALL_MAILS=禁用所有電子郵件sendings（用於測試目的或演示）
 MAIN_MAIL_SENDMODE=方法用於發送電子郵件
 MAIN_MAIL_SMTPS_ID=如果需要驗證的SMTP身份
@@ -431,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
@@ -469,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)
@@ -478,13 +487,9 @@ 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=捐款的管理
-Module800Name=直接檔由數據庫訪問
-Module800Desc=通過界面顯示直接數據庫訪問oscommerce的店舖或OSCSS
-Module900Name=被檔由
-Module900Desc=界面顯示一個通過Web服務oscommerce的商店。此模組requiere您安裝/ oscommerce_ws / ws_server到您oscommerce的服務器組件。查看自述文件/ oscommerce_ws / ws_server。
 Module1200Name=螂
 Module1200Desc=螳螂一體化
 Module1400Name=會計
@@ -493,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=議程
@@ -501,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
@@ -512,16 +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 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
@@ -575,9 +588,6 @@ Permission92=建立/修改的社會貢獻和增值稅
 Permission93=刪除的社會貢獻和增值稅
 Permission94=出口社會貢獻
 Permission95=閲讀報告
-Permission96=安裝調度
-Permission97=瞭解會計調度發票
-Permission98=調度發票的會計行
 Permission101=讀取出貨資訊
 Permission102=建立/修改出貨單
 Permission104=驗證出貨單
@@ -603,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=建立/修改供應商訂單
@@ -668,7 +679,7 @@ Permission300=讀取條碼
 Permission301=建立/修改條碼
 Permission302=刪除條碼
 Permission311=閲讀服務
-Permission312=指定的服務合約
+Permission312=Assign service/subscription to contract
 Permission331=閲讀書籤
 Permission332=建立/修改書籤
 Permission333=刪除書籤
@@ -698,8 +709,8 @@ Permission701=閲讀捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
 Permission1001=讀取庫存資訊
-Permission1002=建立/修改庫存資訊
-Permission1003=刪除庫存資訊
+Permission1002=Create/modify warehouses
+Permission1003=Delete warehouses
 Permission1004=讀取庫存的轉讓資訊
 Permission1005=建立/修改庫存轉讓
 Permission1101=讀取交貨訂單
@@ -775,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
@@ -884,6 +896,7 @@ PermanentLeftSearchForm=常駐左搜尋列表菜單
 DefaultLanguage=預設語言使用（語言代碼）
 EnableMultilangInterface=啟用多語言界面
 EnableShowLogo=在菜單上顯示的標誌
+EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
 SystemSuccessfulyUpdated=您的系統已成功更新
 CompanyInfo=公司/基本資訊
 CompanyIds=公司/基本ID
@@ -1035,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.
@@ -1071,10 +1083,11 @@ ModuleCompanyCodeAquarium=根據以下編碼原則返回會計編號: <br>以 %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:<br>* per third parties contacts (customers or suppliers), one third party at time.<br>* 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=在草稿文件上產生浮水印字串(如果以下文字框不是空字串)
+JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=專業術語欄位ID是否獨一無二
 MustBeUnique=必須是獨一無二的ID嗎？
 MustBeMandatory=Mandatory to create third parties ?
@@ -1134,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=訂單編號模組
@@ -1142,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 <br> <b>%%1 $ s的</b>誇血清remplacé電話桿樂德l' appelé <br> <b>%%2 $ s的</b>誇血清remplacé電話桿樂德l' appelant（樂votre） <br> <b>%%3 $ s的</b>誇血清remplacé桿votre登錄clicktodial（定義所涵蓋河畔votre膠片utilisateur） <br> <b>%%4 $ s的</b>誇血清remplacé桿votre摩托羅拉德過時clicktodial（定義所涵蓋河畔votre膠片utilisateur）。
@@ -1154,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
@@ -1318,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=服務模組的設置
@@ -1378,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=出貨單據範本
@@ -1408,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=樹選單
@@ -1474,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網站。
@@ -1531,5 +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 23d0b080ac7..65870ed6994 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -2,14 +2,16 @@
 IdAgenda=ID event
 Actions=事件
 ActionsArea=事件區（事件和任務）
-Agenda= 議程
-Agendas= 議程
-Calendar= 日歷
-Calendars= 日歷
-LocalAgenda=本地日歷
-AffectedTo= 受影響
-DoneBy= 做的
-Events= 活動
+Agenda=議程
+Agendas=議程
+Calendar=日歷
+Calendars=日歷
+LocalAgenda=Internal calendar
+ActionsOwnedBy=Event owned by
+AffectedTo=受影響
+DoneBy=做的
+Event=Event
+Events=活動
 EventsNb=Number of events
 MyEvents=我的活動
 OtherEvents=其他活動
@@ -17,31 +19,33 @@ ListOfActions=名單事件
 Location=位置
 EventOnFullDay=全天事件
 SearchAnAction= 搜尋行動/任務
-MenuToDoActions= 所有不完整的行動
-MenuDoneActions= 所有終止行動
-MenuToDoMyActions= 我不完整的行動
-MenuDoneMyActions= 我的行動終止
-ListOfEvents= 名單Dolibarr事件
+MenuToDoActions=所有不完整的行動
+MenuDoneActions=所有終止行動
+MenuToDoMyActions=我不完整的行動
+MenuDoneMyActions=我的行動終止
+ListOfEvents=List of events (internal calendar)
 ActionsAskedBy=記錄操作
 ActionsToDoBy=受影響的行動
 ActionsDoneBy=做的動作
 ActionsForUser=Events for user
 ActionsForUsersGroup=Events for all users of group
+ActionAssignedTo=Event assigned to
 AllMyActions= 我所有的行動/任務
 AllActions= 所有/任務行動
 ViewList=查看列表
 ViewCal=查看日歷
 ViewDay=日視圖
 ViewWeek=周視圖
-ViewPerUser=Per user
+ViewPerUser=Per user view
 ViewWithPredefinedFilters= 查看與預定義的篩選器
 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已驗證
@@ -49,7 +53,6 @@ OrderApprovedInDolibarr=為了%s批準
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=為了%s回到草案狀態
 OrderCanceledInDolibarr=為了%s取消
-InterventionValidatedInDolibarr=%s的驗證幹預
 ProposalSentByEMail=商業建議通過電子郵件發送%s
 OrderSentByEMail=客戶訂單通過電子郵件發送%s
 InvoiceSentByEMail=客戶發票通過電子郵件發送%s
@@ -57,8 +60,6 @@ SupplierOrderSentByEMail=供應商的訂單通過電子郵件發送%s
 SupplierInvoiceSentByEMail=供應商的發票通過電子郵件發送%s
 ShippingSentByEMail=通過電子郵件發送的航運%s
 ShippingValidated= Shipping %s validated
-InterventionSentByEMail=通過電子郵件發送的幹預%s
-InterventionClassifiedBilled=Intervention %s classified as Billed
 NewCompanyToDolibarr= 第三方創建
 DateActionPlannedStart= 計劃開始日期
 DateActionPlannedEnd= 計劃結束日期
@@ -68,19 +69,24 @@ DateActionStart= 開始日期
 DateActionEnd= 結束日期
 AgendaUrlOptions1=您還可以添加以下參數來篩選輸出：
 AgendaUrlOptions2=<b>login=%s</b>到限制產量以行動來創造，受影響或將使用者 與所做<b>%</b>。
-AgendaUrlOptions3=<b>logina=%s</b>到限制輸出到用戶的操作創建為<b>%</b>。
+AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b>到限制輸出到行動<b>使用者與受影響<b>%</b>。
-AgendaUrlOptions5=<b>logind=%s</b>到限制輸出到用戶的行為進行由<b>%</b>。
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
 AgendaShowBirthdayEvents=顯示生日的接觸
 AgendaHideBirthdayEvents=隱藏生日的接觸
 Busy=Busy
 ExportDataset_event1=List of agenda events
-
+DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
+DefaultWorkingHours=Default working hours in day (Example: 9-18)
 # External Sites ical
 ExportCal=出口日歷
 ExtSites=導入外部日歷
-ExtSitesEnableThisTool=到議程中顯示的外部日歷
+ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=日歷數
 AgendaExtNb=日歷NB %s
 ExtSiteUrlAgenda=URL來訪問。iCal文件
 ExtSiteNoLabel=無說明
+WorkingTimeRange=Working time range
+WorkingDaysRange=Working days range
+AddEvent=Create event
+MyAvailability=My availability
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index d67570db69e..1674ff158ab 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -28,8 +28,8 @@ InvoiceAvoir=信用票據
 InvoiceAvoirAsk=信用註意糾正發票
 InvoiceAvoirDesc=<b>信貸說明</b>是一種消極的發票用來解決一個事實，即發票已繳納的數額相差實在比額（因為顧客付出太多的錯誤，例如將不支付或完全因為他歸還了部分產品）。
 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
@@ -85,8 +85,9 @@ ClassifyPaid=分類'有償'
 ClassifyPaidPartially=分類薪部分'
 ClassifyCanceled=分類'遺棄'
 ClassifyClosed=分類'關閉'
+ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=建立發票
-AddBill=新增發票(invoice)或票據(credit note)
+AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=刪除發票
 SearchACustomerInvoice=搜尋客戶發票
@@ -98,7 +99,7 @@ DoPaymentBack=不要付款回
 ConvertToReduc=轉換到未來的折扣
 EnterPaymentReceivedFromCustomer=輸入從客戶收到付款
 EnterPaymentDueToCustomer=由於客戶的付款
-DisabledBecauseRemainderToPayIsZero=禁用，因為其余部分支付為零
+DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 Amount=總額
 PriceBase=價格基準
 BillStatus=發票狀態
@@ -136,8 +137,6 @@ BillFrom=From
 BillTo=Bill To
 ActionsOnBill=行動對發票
 NewBill=新建發票(invoice)
-Prélèvements=長期訂單
-Prélèvements=長期訂單
 LastBills=上次%s的發票
 LastCustomersBills=上次%s的客戶發票
 LastSuppliersBills=上次%s的供應商發票
@@ -155,9 +154,9 @@ ConfirmCancelBill=你確定要取消發票<b>%s嗎</b> ？
 ConfirmCancelBillQuestion=你為什麽要這樣分類發票'放棄'？
 ConfirmClassifyPaidPartially=您確定要更改<b>%s</b>的地位發票支付？
 ConfirmClassifyPaidPartiallyQuestion=這發票尚未完全支付。是什麽原因讓你關閉此發票？
-ConfirmClassifyPaidPartiallyReasonAvoir=其余部分支付<b>（%s的%s）</b>是一個折扣，因為獲得付款之前任期。我註意到規範使用信用卡的增值稅。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=其余部分支付<b>（%s的%s）</b>是一個折扣，因為獲得付款之前任期。我接受失去這個折扣的增值稅。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=其余部分支付<b>（%s的%s）</b>是一個折扣，因為獲得付款之前任期。我在此折扣不恢復信貸註意到增值稅。
+ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=壞顧客
 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分返回
 ConfirmClassifyPaidPartiallyReasonOther=其他原因而放棄額
@@ -190,15 +189,15 @@ 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=收到過剩
 EscompteOffered=折扣額（任期前付款）
-SendBillRef=%s的發送發票
-SendReminderBillRef=發送發票的%s（提醒）
+SendBillRef=Submission of invoice %s
+SendReminderBillRef=Submission of invoice %s (reminder)
 StandingOrders=常年訂單
 StandingOrder=長期訂單
 NoDraftBills=沒有任何發票(invoice)草案
@@ -218,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=客戶發票清單和發票的路線
@@ -295,6 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=兩個新的折扣總額必須等於原來
 ConfirmRemoveDiscount=你確定要刪除此折扣？
 RelatedBill=相關發票
 RelatedBills=有關發票
+LatestRelatedBill=Latest related invoice
+WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
 PaymentConditionShortRECEP=即時
@@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% in advance, 50%% on delivery
 FixAmount=Fix amount
 VarAmount=Variable amount (%% tot.)
-
 # PaymentType
 PaymentTypeVIR=銀行存款
 PaymentTypeShortVIR=銀行存款
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 94f3568ef2e..85497e00361 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -16,7 +16,7 @@ SuppliersCategoriesArea=供應商分類區
 CustomersCategoriesArea=客戶分類區
 ThirdPartyCategoriesArea=第三方分類區
 MembersCategoriesArea=成員類別面積
-# ContactsCategoriesArea=Contacts categories area
+ContactsCategoriesArea=Contacts categories area
 MainCats=主要類別
 SubCats=子類別
 CatStatistics=統計
@@ -50,15 +50,15 @@ SupplierIsInCategories=第三方擁有對以下類別的供應商
 CompanyIsInCustomersCategories=這個客戶擁有下列客戶/潛在分類標籤
 CompanyIsInSuppliersCategories=個供應商擁有下列供應商分類標籤
 MemberIsInCategories=該成員擁有，以下列成員類別
-# ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=This contact owns to following contacts categories
 ProductHasNoCategory=此產品/服務是沒有任何類別
 SupplierHasNoCategory=這個供應商是不以任何類別
 CompanyHasNoCategory=這家公司沒有任何分類標籤
 MemberHasNoCategory=該成員沒有任何類別
-# ContactHasNoCategory=This contact is not in any categories
+ContactHasNoCategory=This contact is not in any categories
 ClassifyInCategory=分類類別
 NoneCategory=無
-# NotCategorized=Without category
+NotCategorized=Without category
 CategoryExistsAtSameLevel=此類別已存在此號
 ReturnInProduct=返回產品/服務卡
 ReturnInSupplier=返回供應商卡
@@ -66,7 +66,7 @@ ReturnInCompany=返回到客戶/前景卡
 ContentsVisibleByAll=內容將所有可見
 ContentsVisibleByAllShort=所有內容可見
 ContentsNotVisibleByAllShort=所有內容不可見
-# CategoriesTree=Categories tree
+CategoriesTree=Categories tree
 DeleteCategory=刪除分類標籤
 ConfirmDeleteCategory=你確定要刪除這個分類標籤？
 RemoveFromCategory=刪除連接的分類標籤：
@@ -81,12 +81,12 @@ CustomersCategoriesShort=客戶分類標籤
 CustomersProspectsCategoriesShort=客戶/潛在分類標籤
 ProductsCategoriesShort=產品分類標籤
 MembersCategoriesShort=成員分類標籤
-# ContactCategoriesShort=Contacts categories
+ContactCategoriesShort=Contacts categories
 ThisCategoryHasNoProduct=這個類別不含任何產品。
 ThisCategoryHasNoSupplier=這個類別不含任何供應商。
 ThisCategoryHasNoCustomer=這個類別不含任何客戶。
 ThisCategoryHasNoMember=這個類別不含任何成員。
-# ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=分配給客戶
 AssignedToTheCustomer=分配給客戶
 InternalCategory=內部類
@@ -96,18 +96,17 @@ CatSupList=供應商分類列表
 CatCusList=客戶名單/前景類別
 CatProdList=產品類別列表
 CatMemberList=類別的成員名單
-# CatContactList=List of contact categories and contact
-# 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?
-# 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
+CatContactList=List of contact categories and contact
+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
+DeleteFromCat=Remove from category
+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
+ShowCategory=Show category
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 782043acc93..705df498d17 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=您必須創建電子郵件第三方接觸首先可以
 ListSuppliersShort=供應商名單
 ListProspectsShort=潛在名單
 ListCustomersShort=客戶名單
-ThirdPartiesArea=客戶/供應商資訊區
+ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=最後更新的客戶/供應商清單
 UniqueThirdParties=客戶/供應商圖表種類數
 InActivity=打開
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
 MonkeyNumRefModelDesc=用以下固定的方式回傳編號:<br> %syymm-nnnn 為客戶編號生成格式。<br> %syymm-nnnn 為供應商編號生成格式。<br>   yy 是年、mm是月、nnnn是一個不為0的序號。
 LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可以隨時修改。(可開啟Elephant or Monkey模組來設定編碼規則)
 ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 0277516591f..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的
@@ -187,7 +188,7 @@ 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=linked to order
+LinkedOrder=Link to order
 ReCalculate=Recalculate
 Mode1=Method 1
 Mode2=Method 2
@@ -196,11 +197,10 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accountancy code journal
-COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
-COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
-COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
-COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
-COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
-COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+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
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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-# CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-# CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-# CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-# CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-# 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). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
+CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
+CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
+CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
+CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
+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 f0a598844b6..5f5db905084 100644
--- a/htdocs/langs/zh_TW/donations.lang
+++ b/htdocs/langs/zh_TW/donations.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=捐款
 Donations=捐贈
-# DonationRef=Donation ref.
+DonationRef=Donation ref.
 Donor=捐贈者
 Donors=捐助者
-AddDonation=添加捐贈
+AddDonation=Create a donation
 NewDonation=新捐贈
-# ShowDonation=Show donation
+ShowDonation=Show donation
 DonationPromise=禮品的承諾
 PromisesNotValid=未驗證的承諾
 PromisesValid=驗證承諾
@@ -22,11 +22,17 @@ DonationStatusPromiseNotValidatedShort=草案
 DonationStatusPromiseValidatedShort=驗證
 DonationStatusPaidShort=收稿
 ValidPromess=驗證承諾
-# DonationReceipt=Donation receipt
+DonationReceipt=Donation receipt
 BuildDonationReceipt=建立收據
 DonationsModels=捐贈收據的文件模式
 LastModifiedDonations=最後%s修改捐款
 SearchADonation=搜索捐贈
-# DonationRecipient=Donation recipient
-# ThankYou=Thank You
-# IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
+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 0bb7cfb2648..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=<b>如何正確</b>使用手機與登錄<b>%</b>找不
 ErrorLoginHasNoEmail=這位用戶沒有電子郵件地址。進程中止。
 ErrorBadValueForCode=代碼有錯誤的值類型。再次嘗試以新的價值...
 ErrorBothFieldCantBeNegative=領域的%s及%s可以不消極
+ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用來執行Web服務器用戶帳戶沒有該權限
 ErrorNoActivatedBarcode=沒有激活的條碼類型
 ErrUnzipFails=Failed to unzip %s with ZipArchive
@@ -133,9 +134,28 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 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!
-ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s.
 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=Mandatory setup parameters are not yet defined
@@ -154,3 +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
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 742c41d219f..8e89bc905dc 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -125,7 +125,7 @@ BankAccountNumber=帳號
 BankAccountNumberKey=關鍵
 SpecialCode=Special code
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filters by one year/month/day<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filters over a range of years/months/days<br>'&gt;YYYY' '&gt;YYYYMM' '&gt;YYYYMMDD': filters on the following years/months/days<br>'&lt;YYYY' '&lt;YYYYMM' '&lt;YYYYMMDD': filters on the previous years/months/days
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
 ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
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 8eaba699e0a..2bddf36550d 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
 MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+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, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
 Employe=Employee
 DateDebCP=開始日期
 DateFinCP=結束日期
@@ -18,24 +18,24 @@ ApprovedCP=批準
 CancelCP=取消
 RefuseCP=拒絕
 ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
 DescCP=描述
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
 ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
 EditCP=編輯
 DeleteCP=刪除
 ActionValidCP=驗證
@@ -43,26 +43,25 @@ ActionRefuseCP=Refuse
 ActionCancelCP=取消
 StatutCP=地位
 SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
-UpdateButtonCP=更新
-CantUpdate=You cannot update this request of holidays.
+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=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
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+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 request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
-TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+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=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of 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
 DateCancelCP=Date of cancellation
@@ -72,42 +71,42 @@ MotifCP=雷森
 UserCP=用戶
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
 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 holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+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 holidays
+GroupToValidateCP=Group with the ability to approve leave requests
 ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+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 <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
-DelayForSubmitCP=Deadline to apply for holidays
-AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AddCPforUsers=Please add the balance of leaves allocation of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
+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 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
+TitleOptionEventCP=Settings of leave requets for events
 ValidEventCP=驗證
 UpdateEventCP=Update events
 CreateEventCP=建立
@@ -127,23 +126,23 @@ UpdateEventOptionCP=更新
 ErrorMailNotSend=An error occurred while sending email:
 NoCPforMonth=No leave this month.
 nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
 #Messages
 Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+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
diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
index be6fe4c7c7f..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=幹預的行動
@@ -23,11 +23,22 @@ ConfirmDeleteInterventionLine=你確定要刪除此行的幹預？
 NameAndSignatureOfInternalContact=名稱及幹預簽名：
 NameAndSignatureOfExternalContact=客戶的姓名和簽字：
 DocumentModelStandard=標準文檔模型的幹預
-# InterventionCardsAndInterventionLines=Interventions and lines of interventions
-ClassifyBilled=分類“帳單”
+InterventionCardsAndInterventionLines=Interventions and lines of interventions
+InterventionClassifyBilled=Classify "Billed"
+InterventionClassifyUnBilled=Classify "Unbilled"
 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=幹預
@@ -38,5 +49,5 @@ ArcticNumRefModelDesc1=通用數模型
 ArcticNumRefModelError=無法啟動
 PacificNumRefModelDesc1=用以下固定的方式回傳編號:<br> %syymm-nnnn <br>   yy 是年、mm是月、nnnn是一個不為0的序號。
 PacificNumRefModelError=錯誤編號一個以 $syymm 為起始的 intervention card 已經存在，且不相容於此序號模型。請刪除或重新命名以便啟用這個模塊。
-# PrintProductsOnFichinter=Print products on intervention card
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinter=Print products on intervention card
+PrintProductsOnFichinterDetails=forinterventions generated from orders
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 <b>%s</b> recipients by sending session.
+LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> 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 <strong>'%s'</strong> 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=無法找到用戶<b>%s</b>在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<br/>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=為了使您的訂閱使用銀行轉帳支付，請參閱頁<a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> 。 <br>使用信用卡或PayPal支付，點擊此頁底部的按鈕。 <br>
-# 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=你是否確定要還原訂單<b>%s</b>草案狀態？
 ConfirmCancelOrder=您確定要取消此訂單？
 ConfirmMakeOrder=請確認您是否想要確認您於 <b>%s</b> 製作的訂單？
 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=此區提供無法加入在子選單的雜項工具。<br><br>請選擇左側選單來執行你想要的工具。
 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 cf332a9d0fd..e7406e70399 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -80,11 +80,12 @@ ContractStatusClosed=關閉
 ContractStatusRunning=運行
 ContractStatusExpired=過期
 ContractStatusOnHold=不運行
-ContractStatusToRun=阿mettre恩服務
+ContractStatusToRun=To get running
 ContractNotRunning=該合同未運行
 ErrorProductAlreadyExists=一個產品的參考%s已經存在。
 ErrorProductBadRefOrLabel=錯誤的價值參考或標簽。
 ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
 Suppliers=供應商
 SupplierRef=供應商代號:
 ShowProduct=顯示產品
@@ -116,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=關鍵字過濾
@@ -131,7 +132,7 @@ AddDel=新增或刪除
 Quantity=數量
 NoMatchFound=沒有找到匹配
 ProductAssociationList=以下為下階子產品(服務)清單，及所需下階數量和庫存數量
-ProductParentList=此產品(服務)是用來組成以下產品(服務)的
+ProductParentList=List of package products/services with this product as a component
 ErrorAssociationIsFatherOfThis=選定的產品之一，是家長與當前的產品
 DeleteProduct=刪除一個產品/服務
 ConfirmDeleteProduct=你確定要刪除這個產品/服務？
@@ -178,7 +179,7 @@ CloneProduct=複製產品/服務
 ConfirmCloneProduct=你確定要複製一份 <b>%s</b> 產品/服務單嗎 ？
 CloneContentProduct=複製此產品/服務的所有資訊內容
 ClonePricesProduct=複製此產品/服務的價格資訊
-CloneCompositionProduct=Clone virtual product/services
+CloneCompositionProduct=Clone packaged product/services
 ProductIsUsed=該產品是用於
 NewRefForClone=新的產品/服務編號
 CustomerPrices=銷售價格
@@ -239,3 +240,10 @@ 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
+PriceExpressionEditor=Price expression editor
+PriceExpressionSelected=Selected price expression
+PriceExpressionEditorHelp="price = 2 + 2" or "2 + 2" for setting the price<br>ExtraFields are variables like "#options_myextrafieldkey# * 2"<br>There are special variables like #quantity# and #tva_tx#<br>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 692cfcbc826..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=任務/活動
@@ -85,13 +87,13 @@ ActionsOnProject=行動項目
 YouAreNotContactOfProject=你是不是這個私人項目聯系
 DeleteATimeSpent=刪除的時間
 ConfirmDeleteATimeSpent=你確定要刪除這個花的時間？
-DoNotShowMyTasksOnly=又見任務沒有影響到我
-ShowMyTasksOnly=查看任務時，我只受影響
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
 TaskRessourceLinks=資源的整合
 ProjectsDedicatedToThisThirdParty=這個項目致力於第三方
 NoTasks=該項目沒有任務
 LinkedToAnotherCompany=鏈接到其他第三方
-TaskIsNotAffectedToYou=任務不分配給你
+TaskIsNotAffectedToYou=Task not assigned to you
 ErrorTimeSpentIsEmpty=所花費的時間是空的
 ThisWillAlsoRemoveTasks=這一行動也將刪除所有項目任務<b>（%s</b>任務的時刻），花全部的時間都投入。
 IfNeedToUseOhterObjectKeepEmpty=如果某些對象（發票，訂單，...），屬於其他第三方，必須與該項目以創建，保持這個空項目多的第三方。
@@ -120,6 +122,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=一個完整的項目報告模型（logo. ..）
 PlannedWorkload = Planned workload
@@ -128,3 +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
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 12037cfa158..d721893af67 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -13,7 +13,7 @@ LastSendings=有 %s 筆最新的出貨項目
 SearchASending=搜尋出貨項目
 StatisticsOfSendings=統計出貨量
 NbOfSendings=出貨數量
-# NumberOfShipmentsByMonth=Number of shipments by month
+NumberOfShipmentsByMonth=Number of shipments by month
 SendingCard=出貨卡
 NewSending=建立出貨
 CreateASending=建立一個新的出貨單
@@ -50,27 +50,31 @@ Enlevement=得到了客戶
 DocumentModelSimple=簡單的文件範本
 DocumentModelMerou=Merou A5 範本
 WarningNoQtyLeftToSend=警告，沒有產品等待裝運。
-# StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
 DateDeliveryPlanned=預計交貨日期
 DateReceived=交貨收到日期
 SendShippingByEMail=通過電子郵件發送貨物
-SendShippingRef=發送貨物%s
+SendShippingRef=Submission of shipment %s
 ActionsOnShipping=對裝運的事件
 LinkToTrackYourPackage=鏈接到追蹤您的包裹
 ShipmentCreationIsDoneFromOrder=就目前而言，從這個訂單而建立的出貨單已經完成。
 RelatedShippings=相關出貨清單
-# ShipmentLine=Shipment line
-# CarrierList=List of transporters
+ShipmentLine=Shipment line
+CarrierList=List of transporters
+SendingRunning=Product from customer order already sent
+SuppliersReceiptRunning=Product from supplier order already received
 
 # Sending methods
 SendingMethodCATCH=按客戶捕捉
 SendingMethodTRANS=運輸車
 SendingMethodCOLSUI=Colissimo
-
 # ModelDocument
 DocumentModelSirocco=簡單的送貨單文檔模型
 DocumentModelTyphon=更多的送貨單（logo. ..完整的文檔模型）
-
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=沒有定義的常數EXPEDITION_ADDON_NUMBER
-# SumOfProductVolumes=Sum of product volumes
-# SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Sum of product volumes
+SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/zh_TW/shop.lang b/htdocs/langs/zh_TW/shop.lang
deleted file mode 100644
index df0cf54c4cc..00000000000
--- a/htdocs/langs/zh_TW/shop.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - shop
-FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
-Shop=店
-ShopWeb=網上商店
-LastOrders=最後的訂單
-OnStandBy=待命
-TreatmentInProgress=治療進展
-LastCustomers=最後客戶
-OSCommerceShop=oscommerce的店鋪
-OSCommerce=oscommerce的
-AddProd=在線銷售
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/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 9815c4e9b02..1be3e6d8bf4 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -12,8 +12,8 @@ OrderDate=訂購日期
 BuyingPrice=買價
 BuyingPriceMin=最低採購價格
 BuyingPriceMinShort=最低採購價格
-# TotalBuyingPriceMin=Total of subproducts buying prices
-# SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Total of subproducts buying prices
+SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=新增供應商的價格
 ChangeSupplierPrice=供應商的價格變化
 ErrorQtyTooLowForThisSupplier=數量過低，供應商或供應商在這此產品沒有價格定義
@@ -27,7 +27,7 @@ RefSupplierShort=供應商訂單號
 Availability=可用性
 ExportDataset_fournisseur_1=供應商發票清單和發票的路線
 ExportDataset_fournisseur_2=供應商發票和付款
-# ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Supplier orders and order lines
 ApproveThisOrder=批準這個訂單
 ConfirmApproveThisOrder=你確定要批準這個訂單？
 DenyingThisOrder=否認這個訂單
@@ -39,4 +39,6 @@ AddSupplierOrder=建立供應商的訂單
 AddSupplierInvoice=創建供應商發票
 ListOfSupplierProductForSupplier=<b>供應商 %s 的產品及價格清單</b>
 NoneOrBatchFileNeverRan=無或批處理<b>%不是</b>最近跑
-# SentToSuppliers=Sent to suppliers
+SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index 925e832a7ab..4d4375cbb3e 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -19,3 +19,4 @@ TF_TRIP=旅程
 ListTripsAndExpenses=旅行和費用清單
 ExpensesArea=與貿易有關的知識產權協定“和開支面積
 SearchATripAndExpense=尋找旅行和費用
+ClassifyRefunded=Classify 'Refunded'
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
new file mode 100644
index 00000000000..1a89a377fef
--- /dev/null
+++ b/htdocs/livraison/card.php
@@ -0,0 +1,793 @@
+<?php
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005		Simon TOSSER			<simon@kornog-computing.com>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2007		Franky Van Liedekerke	<franky.van.liedekerke@telenet.be>
+ * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/livraison/card.php
+ *	\ingroup    livraison
+ *	\brief      Fiche descriptive d'un bon de livraison=reception
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
+if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (! empty($conf->expedition_bon->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+if (! empty($conf->stock->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+
+
+$langs->load("sendings");
+$langs->load("bills");
+$langs->load('deliveries');
+$langs->load('orders');
+
+$action=GETPOST('action', 'alpha');
+$confirm=GETPOST('confirm', 'alpha');
+$backtopage=GETPOST('backtopage');
+
+// Security check
+$id = GETPOST('id', 'int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'expedition',$id,'livraison','livraison');
+
+$object = new Livraison($db);
+
+// Load object
+if ($id > 0 || ! empty($ref)) {
+	$ret = $object->fetch($id, $ref);
+	if ($ret > 0)
+		$ret = $object->fetch_thirdparty();
+	if ($ret < 0)
+		dol_print_error('', $object->error);
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('deliverycard','globalcard'));
+
+/*
+ * Actions
+ */
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+if ($action == 'add')
+{
+	$db->begin();
+
+	$object->date_livraison   = time();
+	$object->note             = $_POST["note"];
+	$object->commande_id      = $_POST["commande_id"];
+
+	if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
+	{
+		$expedition->entrepot_id     = $_POST["entrepot_id"];
+	}
+
+	// On boucle sur chaque ligne de commande pour completer objet livraison
+	// avec qte a livrer
+	$commande = new Commande($db);
+	$commande->fetch($object->commande_id);
+	$commande->fetch_lines();
+	$num=count($commande->lines);
+	for ($i = 0; $i < $num; $i++)
+	{
+		$qty = "qtyl".$i;
+		$idl = "idl".$i;
+		if ($_POST[$qty] > 0)
+		{
+			$object->addline($_POST[$idl],$_POST[$qty]);
+		}
+	}
+
+	$ret=$object->create($user);
+	if ($ret > 0)
+	{
+		$db->commit();
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+		$db->rollback();
+
+		$_GET["commande_id"]=$_POST["commande_id"];
+		$action='create';
+	}
+}
+
+else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->livraison->valider)
+{
+	$result = $object->valid($user);
+
+	// Define output language
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+	{
+		$outputlangs = $langs;
+		$newlang = '';
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang = GETPOST('lang_id','alpha');
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+		if (! empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
+			$outputlangs->setDefaultLang($newlang);
+		}
+		$model=$object->modelpdf;
+		$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);
+	}
+}
+
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->livraison->supprimer)
+{
+	$db->begin();
+	$result=$object->delete();
+
+	if ($result > 0)
+	{
+		$db->commit();
+		if (! empty($backtopage)) header("Location: ".$backtopage);
+		else header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
+		exit;
+	}
+	else
+	{
+		$db->rollback();
+	}
+}
+
+if ($action == 'setdate_livraison' && $user->rights->expedition->livraison->creer)
+{
+    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
+    $result=$object->set_date_livraison($user,$datedelivery);
+    if ($result < 0)
+    {
+        $mesg='<div class="error">'.$object->error.'</div>';
+    }
+}
+
+/*
+ * Build document
+ */
+if ($action == 'builddoc')	// En get ou en post
+{
+	// Save last template used to generate document
+	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang='';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	if (! empty($newlang))
+	{
+		$outputlangs = new Translate("",$conf);
+		$outputlangs->setDefaultLang($newlang);
+	}
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+	{
+	    $ret=$object->fetch($id);    // Reload to get new records
+		$result= $object->generateDocument($object->modelpdf, $outputlangs);
+	}
+	if ($result < 0)
+	{
+		dol_print_error($db,$result);
+		exit;
+	}
+}
+
+// Delete file in doc form
+elseif ($action == 'remove_file')
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	$upload_dir =	$conf->expedition->dir_output . "/receipt";
+	$file =	$upload_dir	. '/' .	GETPOST('file');
+	$ret=dol_delete_file($file,0,0,0,$object);
+	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+}
+
+
+/*
+ *	View
+ */
+
+llxHeader('',$langs->trans('Delivery'),'Livraison');
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+/*********************************************************************
+ *
+ * Mode creation
+ *
+ *********************************************************************/
+if ($action == 'create')
+{
+
+	print_fiche_titre($langs->trans("CreateADeliveryOrder"));
+
+	if ($mesg)
+	{
+		print $mesg.'<br>';
+	}
+
+	$commande = new Commande($db);
+	$commande->livraison_array();
+
+	if ($commande->fetch(GETPOST("commande_id")))
+	{
+		$soc = new Societe($db);
+		$soc->fetch($commande->socid);
+		$author = new User($db);
+		$author->fetch($commande->user_author_id);
+
+		if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
+		{
+			$entrepot = new Entrepot($db);
+		}
+
+		/*
+		 *   Commande
+		 */
+		print '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="commande_id" value="'.$commande->id.'">';
+		if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
+		{
+			print '<input type="hidden" name="entrepot_id" value="'.$_GET["entrepot_id"].'">';
+		}
+		print '<table class="border" width="100%">';
+		print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
+		print '<td width="30%"><b><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a></b></td>';
+
+		print '<td width="50%" colspan="2">';
+
+		print "</td></tr>";
+
+		print "<tr><td>".$langs->trans("Date")."</td>";
+		print "<td>".dol_print_date($commande->date,'dayhourtext')."</td>\n";
+
+		print '<td>'.$langs->trans("Order").'</td><td><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$commande->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref.'</a>';
+		print "</td></tr>\n";
+
+		print '<tr>';
+
+		if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
+		{
+			print '<td>'.$langs->trans("Warehouse").'</td>';
+			print '<td>';
+			$ents = $entrepot->list_array();
+			print '<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id='.$_GET["entrepot_id"].'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$ents[$_GET["entrepot_id"]].'</a>';
+			print '</td>';
+		}
+
+		print "<td>".$langs->trans("Author")."</td><td>".$author->getFullName($langs)."</td>\n";
+
+		if ($commande->note)
+		{
+			print '<tr><td colspan="3">Note : '.nl2br($commande->note)."</td></tr>";
+		}
+		print "</table>";
+
+		/*
+		 * Lignes de commandes
+		 */
+		print '<br><table class="noborder" width="100%">';
+
+		$commande->fetch_lines(1);
+		$lines = $commande->lines;
+
+		// Lecture des livraisons deja effectuees
+		$commande->livraison_array();
+
+		$num = count($commande->lines);
+		$i = 0;
+
+		if ($num)
+		{
+			print '<tr class="liste_titre">';
+			print '<td width="54%">'.$langs->trans("Description").'</td>';
+			print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+			print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
+			print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
+			if (! empty($conf->stock->enabled))
+			{
+				print '<td width="12%" align="center">'.$langs->trans("Stock").'</td>';
+			}
+			print "</tr>\n";
+		}
+		$var=true;
+		while ($i < $num)
+		{
+			$product = new Product($db);
+
+			$line = $commande->lines[$i];
+			$var=!$var;
+			print "<tr ".$bc[$var].">\n";
+			if ($line->fk_product > 0)
+			{
+				$product->fetch($line->fk_product);
+				$product->load_stock();
+
+				// Define output language
+				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+				{
+					$commande->fetch_thirdparty();
+					$outputlangs = $langs;
+					$newlang='';
+					if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+					if (empty($newlang)) $newlang=$commande->client->default_lang;
+					if (! empty($newlang))
+					{
+						$outputlangs = new Translate("",$conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+
+					$label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $product->label;
+				}
+				else
+					$label = (! empty($line->label)?$line->label:$product->label);
+
+				print '<td>';
+				print '<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product.'">'.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.'</a> - '.$label;
+				if ($line->description) print nl2br($line->description);
+				print '</td>';
+			}
+			else
+			{
+				print "<td>";
+				if ($line->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
+				else $text = img_object($langs->trans('Product'),'product');
+
+				if (! empty($line->label)) {
+					$text.= ' <strong>'.$line->label.'</strong>';
+					print $form->textwithtooltip($text,$line->description,3,'','',$i);
+				} else {
+					print $text.' '.nl2br($line->description);
+				}
+
+				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
+				print "</td>\n";
+			}
+
+			print '<td align="center">'.$line->qty.'</td>';
+			/*
+			 *
+			 */
+			print '<td align="center">';
+			$quantite_livree = $commande->livraisons[$line->id];
+			print $quantite_livree;;
+			print '</td>';
+
+			$quantite_commandee = $line->qty;
+			$quantite_a_livrer = $quantite_commandee - $quantite_livree;
+
+			if (! empty($conf->stock->enabled))
+			{
+				$stock = $product->stock_warehouse[$_GET["entrepot_id"]]->real;
+				$stock+=0;  // Convertit en numerique
+
+				// Quantite a livrer
+				print '<td align="center">';
+				print '<input name="idl'.$i.'" type="hidden" value="'.$line->id.'">';
+				print '<input name="qtyl'.$i.'" type="text" size="6" value="'.min($quantite_a_livrer, $stock).'">';
+				print '</td>';
+
+				// Stock
+				if ($stock < $quantite_a_livrer)
+				{
+					print '<td align="center">'.$stock.' '.img_warning().'</td>';
+				}
+				else
+				{
+					print '<td align="center">'.$stock.'</td>';
+				}
+			}
+			else
+			{
+				// Quantite a livrer
+				print '<td align="center">';
+				print '<input name="idl'.$i.'" type="hidden" value="'.$line->id.'">';
+				print '<input name="qtyl'.$i.'" type="text" size="6" value="'.$quantite_a_livrer.'">';
+				print '</td>';
+			}
+
+			print "</tr>\n";
+
+			$i++;
+			$var=!$var;
+		}
+
+		/*
+		 *
+		 */
+
+		print '<tr><td align="center" colspan="4"><br><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>';
+		print "</table>";
+		print '</form>';
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+else
+/* *************************************************************************** */
+/*                                                                             */
+/* Mode vue et edition                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+{
+	if ($object->id > 0)
+	{
+		// Origin of a 'livraison' (delivery) is ALWAYS 'expedition' (shipment).
+		// However, origin of shipment in future may differs (commande, proposal, ...)
+		// TODO REGIS:
+		// Je ne suis pas d'accord, beaucoup entreprises n'utilisent pas les bons d'expéditions car ces derniers sont gérés par le transporteur,
+		// donc les bons de livraisons peuvent avoir une origine différente de 'expedition'
+		// les bons de livraisons et d'expéditions devraient être considérés comme des objets à part entière, voir des modules différents comme une propal ou autres.
+
+		$expedition=new Expedition($db);
+		$result = $expedition->fetch($object->origin_id);
+		$typeobject = $expedition->origin;	// example: commande
+		if ($object->origin_id > 0)
+		{
+			$object->fetch_origin();
+		}
+
+		if ($object->id > 0)
+		{
+			$soc = new Societe($db);
+			$soc->fetch($object->socid);
+
+			$head=delivery_prepare_head($object);
+			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
+
+			/*
+			 * Confirmation de la suppression
+			 *
+			 */
+			if ($action == 'delete')
+			{
+				$expedition_id = GETPOST("expid");
+				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&expid='.$expedition_id.'&backtopage='.urlencode($backtopage),$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$object->ref),'confirm_delete','','',1);
+
+			}
+
+			/*
+			 * Confirmation de la validation
+			 */
+			if ($action == 'valid')
+			{
+				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$object->ref),'confirm_valid','','',1);
+
+			}
+
+
+			/*
+			 *   Livraison
+			 */
+			print '<table class="border" width="100%">';
+
+			// Shipment
+			if (($object->origin == 'shipment' || $object->origin == 'expedition') && $object->origin_id > 0)
+			{
+				$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
+
+				// Ref
+				print '<tr><td width="20%">'.$langs->trans("RefSending").'</td>';
+				print '<td colspan="3">';
+				// Nav is hidden because on a delivery receipt of a shipment, if we go on next shipment, we may find no tab (a shipment may not have delivery receipt yet)
+				//print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref');
+				print $form->showrefnav($expedition, 'refshipment', $linkback, 0, 'ref', 'ref');
+				print '</td></tr>';
+			}
+
+			// Ref
+			print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
+			print '<td colspan="3">'.$object->ref.'</td></tr>';
+
+			// Client
+			print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
+			print '<td align="3">'.$soc->getNomUrl(1).'</td>';
+			print "</tr>";
+
+			// Document origine
+			if ($typeobject == 'commande' && $expedition->origin_id && ! empty($conf->commande->enabled))
+			{
+				print '<tr><td>'.$langs->trans("RefOrder").'</td>';
+				$order=new Commande($db);
+				$order->fetch($expedition->origin_id);
+				print '<td colspan="3">';
+				print $order->getNomUrl(1,'commande');
+				print "</td>\n";
+				print '</tr>';
+			}
+			if ($typeobject == 'propal' && $expedition->origin_id && ! empty($conf->propal->enabled))
+			{
+				$propal=new Propal($db);
+				$propal->fetch($expedition->origin_id);
+				print '<tr><td>'.$langs->trans("RefProposal").'</td>';
+				print '<td colspan="3">';
+				print $propal->getNomUrl(1,'expedition');
+				print "</td>\n";
+				print '</tr>';
+			}
+
+			// Ref client
+			print '<tr><td>'.$langs->trans("RefCustomer").'</td>';
+			print '<td colspan="3">'.$object->ref_customer."</a></td>\n";
+			print '</tr>';
+
+			// Date
+			print '<tr><td>'.$langs->trans("DateCreation").'</td>';
+			print '<td colspan="3">'.dol_print_date($object->date_creation,'daytext')."</td>\n";
+			print '</tr>';
+
+			// Date delivery real / Received
+			print '<tr><td height="10">';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('DateReceived');
+			print '</td>';
+
+			if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="2">';
+			if ($action == 'editdate_livraison')
+			{
+				print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="setdate_livraison">';
+				$form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
+				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+				print '</form>';
+			}
+			else
+			{
+				print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhourtext') : '&nbsp;';
+			}
+			print '</td>';
+			print '</tr>';
+
+			// Note Public
+            print '<tr><td>'.$langs->trans("NotePublic").'</td>';
+            print '<td colspan="3">';
+            print nl2br($object->note_public);
+            /*$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+            print $doleditor->Create(1);*/
+            print "</td></tr>";
+
+			// Note Private
+            print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
+            print '<td colspan="3">';
+            print nl2br($object->note_private);
+            /*$doleditor = new DolEditor('note_pprivate', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
+            print $doleditor->Create(1);*/
+            print "</td></tr>";
+
+
+			// Statut
+			print '<tr><td>'.$langs->trans("Status").'</td>';
+			print '<td colspan="3">'.$object->getLibStatut(4)."</td>\n";
+			print '</tr>';
+
+			if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
+			{
+				// Entrepot
+				$entrepot = new Entrepot($db);
+				$entrepot->fetch($object->entrepot_id);
+				print '<tr><td width="20%">'.$langs->trans("Warehouse").'</td>';
+				print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/product/stock/card.php?id='.$entrepot->id.'">'.$entrepot->libelle.'</a></td>';
+				print '</tr>';
+			}
+
+			print "</table><br>\n";
+
+			/*
+			 * Lignes produits
+			 */
+
+			$num_prod = count($object->lines);
+			$i = 0; $total = 0;
+
+			print '<table class="noborder" width="100%">';
+
+			if ($num_prod)
+			{
+				$i = 0;
+
+				print '<tr class="liste_titre">';
+				print '<td>'.$langs->trans("Products").'</td>';
+				print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
+				print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
+				print "</tr>\n";
+			}
+			$var=true;
+			while ($i < $num_prod)
+			{
+				$var=!$var;
+
+				print "<tr ".$bc[$var].">";
+				if ($object->lines[$i]->fk_product > 0)
+				{
+					$product = new Product($db);
+					$product->fetch($object->lines[$i]->fk_product);
+
+					// Define output language
+					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+					{
+						$outputlangs = $langs;
+						$newlang='';
+						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+						if (empty($newlang)) $newlang=$object->client->default_lang;
+						if (! empty($newlang))
+						{
+							$outputlangs = new Translate("",$conf);
+							$outputlangs->setDefaultLang($newlang);
+						}
+
+						$label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
+					}
+					else
+						$label = ( ! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label);
+
+					print '<td>';
+
+					// Affiche ligne produit
+					$text = '<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$object->lines[$i]->fk_product.'">';
+					if ($object->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service');
+					else $text.= img_object($langs->trans('ShowProduct'),'product');
+					$text.= ' '.$object->lines[$i]->product_ref.'</a>';
+					$text.= ' - '.$label;
+					$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->description));
+					//print $description;
+					print $form->textwithtooltip($text,$description,3,'','',$i);
+					print_date_range($object->lines[$i]->date_start,$object->lines[$i]->date_end);
+					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+					{
+						print (! empty($object->lines[$i]->description) && $object->lines[$i]->description!=$object->lines[$i]->product_label)?'<br>'.dol_htmlentitiesbr($object->lines[$i]->description):'';
+					}
+				}
+				else
+				{
+					print "<td>";
+					if ($object->lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
+					else $text = img_object($langs->trans('Product'),'product');
+
+					if (! empty($object->lines[$i]->label)) {
+						$text.= ' <strong>'.$object->lines[$i]->label.'</strong>';
+						print $form->textwithtooltip($text,$object->lines[$i]->description,3,'','',$i);
+					} else {
+						print $text.' '.nl2br($object->lines[$i]->description);
+					}
+
+					print_date_range($objp->date_start,$objp->date_end);
+					print "</td>\n";
+				}
+
+				print '<td align="center">'.$object->lines[$i]->qty_asked.'</td>';
+				print '<td align="center">'.$object->lines[$i]->qty_shipped.'</td>';
+
+				print "</tr>";
+
+				$i++;
+			}
+
+			print "</table>\n";
+
+			print "\n</div>\n";
+
+
+			/*
+			 *    Boutons actions
+			 */
+
+			if ($user->societe_id == 0)
+			{
+				print '<div class="tabsAction">';
+
+				if ($object->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+				}
+
+				if ($user->rights->expedition->livraison->supprimer)
+				{
+					if ($conf->expedition_bon->enabled)
+					{
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
+					}
+					else
+					{
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+					}
+				}
+
+				print '</div>';
+			}
+			print "\n";
+
+			print '<table width="100%" cellspacing="2"><tr><td width="50%" valign="top">';
+
+			/*
+		 	 * Documents generated
+			 */
+
+			$objectref = dol_sanitizeFileName($object->ref);
+			$filedir = $conf->expedition->dir_output . "/receipt/" . $objectref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+
+			$genallowed=$user->rights->expedition->livraison->creer;
+			$delallowed=$user->rights->expedition->livraison->supprimer;
+
+			$somethingshown=$formfile->show_documents('livraison',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+
+			/*
+		 	 * Linked object block (of linked shipment)
+		 	 */
+			if ($object->origin == 'expedition')
+			{
+				$shipment = new Expedition($db);
+				$shipment->fetch($object->origin_id);
+
+				$somethingshown=$shipment->showLinkedObjectBlock();
+			}
+
+			if ($genallowed && ! $somethingshown) $somethingshown=1;
+
+			print '</td><td valign="top" width="50%">';
+
+			// Rien a droite
+
+			print '</td></tr></table>';
+
+			if ($expedition->origin_id)
+			{
+				print '<br>';
+				//show_list_sending_receive($expedition->origin,$expedition->origin_id," AND e.rowid <> ".$expedition->id);
+				show_list_sending_receive($expedition->origin,$expedition->origin_id);
+			}
+		}
+		else
+		{
+			/* Expedition non trouvee */
+			print "Expedition inexistante ou acces refuse";
+		}
+	}
+	else
+	{
+		/* Expedition non trouvee */
+		print "Expedition inexistante ou acces refuse";
+	}
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/livraison/class/index.html b/htdocs/livraison/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 65213cea647..e95fac9f639 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -1,10 +1,11 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006-2007 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2011-2012 Philippe Grand	     <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Marcos García         <marcosgdf@gmail.com>
  *
  * 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
@@ -128,7 +129,7 @@ class Livraison extends CommonObject
 		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
 		$sql.= ")";
 
-		dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);
+		dol_syslog("Livraison::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -140,7 +141,7 @@ class Livraison extends CommonObject
 			$sql.= "SET ref = '".$this->db->escape($numref)."'";
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog("Livraison::create sql=".$sql, LOG_DEBUG);
+			dol_syslog("Livraison::create", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -195,7 +196,6 @@ class Livraison extends CommonObject
 				{
 					$error++;
 					$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
-					dol_syslog("Livraison::create Error -3 ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
@@ -204,7 +204,6 @@ class Livraison extends CommonObject
 			{
 				$error++;
 				$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
-				dol_syslog("Livraison::create Error -2 ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
@@ -213,7 +212,6 @@ class Livraison extends CommonObject
 		{
 			$error++;
 			$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
-			dol_syslog("Livraison::create Error -1 ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -241,7 +239,7 @@ class Livraison extends CommonObject
 		$sql.= " ".($description?"'".$this->db->escape($description)."'":"null").",";
 		$sql.= $qty.")";
 
-		dol_syslog(get_class($this)."::create_line sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
 		if (! $this->db->query($sql) )
 		{
 			$error++;
@@ -271,7 +269,7 @@ class Livraison extends CommonObject
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->element."'";
 		$sql.= " WHERE l.rowid = ".$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -321,7 +319,6 @@ class Livraison extends CommonObject
 		}
 		else
 		{
-			dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 			$this->error=$this->db->error();
 			return -1;
 		}
@@ -362,18 +359,21 @@ class Livraison extends CommonObject
 					$soc = new Societe($this->db);
 					$soc->fetch($this->socid);
 
-					// on verifie si le bon de livraison est en numerotation provisoire
-					$livref = substr($this->ref, 1, 4);
-					if ($livref == 'PROV')
+					if (preg_match('/^[\(]?PROV/i', $this->ref))
+		            {
+		                $numref = $objMod->livraison_get_num($soc,$this);
+		            }
+		            else
 					{
-						$numref = $objMod->livraison_get_num($soc,$this);
-					}
+		                $numref = $this->ref;
+		            }
+            		$this->newref = $numref;
 
 					// Tester si non deja au statut valide. Si oui, on arrete afin d'eviter
 					// de decrementer 2 fois le stock.
 					$sql = "SELECT ref";
 					$sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-					$sql.= " WHERE ref = '".$numref."'";
+					$sql.= " WHERE ref = '".$this->db->escape($numref)."'";
 					$sql.= " AND fk_statut <> 0";
 					$sql.= " AND entity = ".$conf->entity;
 
@@ -396,10 +396,24 @@ class Livraison extends CommonObject
 					$sql.= " AND fk_statut = 0";
 
 					$resql=$this->db->query($sql);
-					if ($resql)
-					{
+			        if (! $resql)
+			        {
+			            dol_print_error($this->db);
+			            $this->error=$this->db->lasterror();
+			            $error++;
+			        }
 
-						$this->oldref='';
+			        if (! $error && ! $notrigger)
+			        {
+			            // Call trigger
+			            $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
+			            if ($result < 0) $error++;
+			            // End call triggers
+			        }
+
+					if (! $error)
+					{
+			            $this->oldref = $this->ref;
 
 						// Rename directory if dir was a temporary ref
 						if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -416,11 +430,17 @@ class Livraison extends CommonObject
 
 								if (@rename($dirsource, $dirdest))
 								{
-									$this->oldref = $oldref;
-
-									dol_syslog("Rename ok");
-									// Suppression ancien fichier PDF dans nouveau rep
-									dol_delete_file($dirdest.'/'.$oldref.'*.*');
+			                        dol_syslog("Rename ok");
+			                        // Rename docs starting with $oldref with $newref
+			                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+			                        foreach($listoffiles as $fileentry)
+			                        {
+			                        	$dirsource=$fileentry['name'];
+			                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+			                        	$dirsource=$fileentry['path'].'/'.$dirsource;
+			                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+			                        	@rename($dirsource, $dirdest);
+			                        }
 								}
 							}
 						}
@@ -434,13 +454,17 @@ class Livraison extends CommonObject
 
 						dol_syslog(get_class($this)."::valid ok");
 					}
-					else
+
+			        if (! $error)
+			        {
+			            $this->db->commit();
+			            return 1;
+			        }
+			        else
 					{
-						$this->db->rollback();
-						$this->error=$this->db->error()." - sql=$sql";
-						dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-						return -1;
-					}
+			            $this->db->rollback();
+			            return -1;
+			        }
 				}
 			}
 		}
@@ -450,24 +474,6 @@ class Livraison extends CommonObject
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
 		}
-
-		// Appel des triggers
-		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-		$interface = new Interfaces($this->db);
-		$result = $interface->run_triggers('DELIVERY_VALIDATE', $this, $user, $langs, $conf);
-		// Fin appel triggers
-		if ($result < 0)
-		{
-			$this->db->rollback();
-			$this->error = $interface->errors;
-			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-			return -1;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
 	}
 
 	/**
@@ -609,14 +615,14 @@ class Livraison extends CommonObject
 						}
 					}
 
-					// Call triggers
-					include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('DELIVERY_DELETE',$this,$user,$langs,$conf);
-					if ($result < 0) {
-						$error++; $this->errors=$interface->errors;
-					}
-					// End call triggers
+                    // Call trigger
+                    $result=$this->call_trigger('DELIVERY_DELETE',$user);
+                    if ($result < 0)
+                    {
+                        $this->db->rollback();
+                        return -4;
+                    }
+                    // End call triggers
 
 					return 1;
 				}
@@ -656,7 +662,7 @@ class Livraison extends CommonObject
 		$urlOption='';
 
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/livraison/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		$picto='sending';
@@ -677,7 +683,7 @@ class Livraison extends CommonObject
 	{
 		$this->lines = array();
 
-		$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped,";
+		$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped, ld.fk_origin_line, ";
 		$sql.= " cd.qty as qty_asked, cd.label as custom_label,";
 		$sql.= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
@@ -685,7 +691,7 @@ class Livraison extends CommonObject
 		$sql.= " WHERE ld.fk_origin_line = cd.rowid";
 		$sql.= " AND ld.fk_livraison = ".$this->id;
 
-		dol_syslog(get_class($this)."::fetch_lines sql=".$sql);
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -709,6 +715,7 @@ class Livraison extends CommonObject
 				$line->product_ref		= $obj->product_ref;		// Product ref
 				$line->product_desc		= $obj->product_desc;		// Product description
 				$line->product_type		= $obj->fk_product_type;
+				$line->fk_origin_line 	= $obj->fk_origin_line;
 
 				$line->price			= $obj->price;
 				$line->total_ht			= $obj->total_ht;
@@ -895,7 +902,6 @@ class Livraison extends CommonObject
 		else
 		{
 			$this->error=$this->db->error()." - sql=$sqlSourceLine";
-			dol_syslog(get_class($this)."::getRemainingDelivered ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -915,7 +921,7 @@ class Livraison extends CommonObject
 			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::set_date_livraison sql=".$sql,LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -925,7 +931,6 @@ class Livraison extends CommonObject
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog(get_class($this)."::set_date_livraison ".$this->error,LOG_ERR);
 				return -1;
 			}
 		}
@@ -935,6 +940,37 @@ class Livraison extends CommonObject
 		}
 	}
 
+	/**
+	 *	Create object on disk
+	 *
+	 *	@param	string		$modele			force le modele a utiliser ('' to not force)
+	 *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @return int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs='')
+	{
+		global $conf,$user,$langs;
+
+		$langs->load("deliveries");
+
+		// Positionne modele sur le nom du modele de bon de livraison a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->LIVRAISON_ADDON_PDF))
+			{
+				$modele = $conf->global->LIVRAISON_ADDON_PDF;
+			}
+			else
+			{
+				$modele = 'typhon';
+			}
+		}
+
+		$modelpath = "core/modules/livraison/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, 0, 0, 0);
+	}
+
 }
 
 
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
deleted file mode 100644
index 8b91b916e0b..00000000000
--- a/htdocs/livraison/fiche.php
+++ /dev/null
@@ -1,810 +0,0 @@
-<?php
-/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2005-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005		Simon TOSSER			<simon@kornog-computing.com>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2007		Franky Van Liedekerke	<franky.van.liedekerke@telenet.be>
- * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/livraison/fiche.php
- *	\ingroup    livraison
- *	\brief      Fiche descriptive d'un bon de livraison=reception
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->expedition_bon->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-if (! empty($conf->stock->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-
-
-$langs->load("sendings");
-$langs->load("bills");
-$langs->load('deliveries');
-$langs->load('orders');
-
-$action=GETPOST('action', 'alpha');
-$confirm=GETPOST('confirm', 'alpha');
-$backtourl=GETPOST('backtourl');
-
-// Security check
-$id = GETPOST('id', 'int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'expedition',$id,'livraison','livraison');
-
-
-
-/*
- * Actions
- */
-
-if ($action == 'add')
-{
-	$db->begin();
-
-	// Creation de l'objet livraison
-	$delivery = new Livraison($db);
-
-	$delivery->date_livraison   = time();
-	$delivery->note             = $_POST["note"];
-	$delivery->commande_id      = $_POST["commande_id"];
-
-	if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
-	{
-		$expedition->entrepot_id     = $_POST["entrepot_id"];
-	}
-
-	// On boucle sur chaque ligne de commande pour completer objet livraison
-	// avec qte a livrer
-	$commande = new Commande($db);
-	$commande->fetch($delivery->commande_id);
-	$commande->fetch_lines();
-	$num=count($commande->lines);
-	for ($i = 0; $i < $num; $i++)
-	{
-		$qty = "qtyl".$i;
-		$idl = "idl".$i;
-		if ($_POST[$qty] > 0)
-		{
-			$delivery->addline($_POST[$idl],$_POST[$qty]);
-		}
-	}
-
-	$ret=$delivery->create($user);
-	if ($ret > 0)
-	{
-		$db->commit();
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$delivery->id);
-		exit;
-	}
-	else
-	{
-		setEventMessage($delivery->error, 'errors');
-		$db->rollback();
-
-		$_GET["commande_id"]=$_POST["commande_id"];
-		$action='create';
-	}
-}
-
-else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->livraison->valider)
-{
-	$object = new Livraison($db);
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-
-	$result = $object->valid($user);
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	{
-        $ret=$object->fetch($id);    // Reload to get new records
-	    $result=delivery_order_pdf_create($db, $object,$_REQUEST['model'],$outputlangs);
-	}
-   	if ($result < 0)
-   	{
-   		dol_print_error($db,$result);
-   		exit;
-	}
-}
-
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->livraison->supprimer)
-{
-	$object = new Livraison($db);
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-
-	$db->begin();
-	$result=$object->delete();
-
-	if ($result > 0)
-	{
-		$db->commit();
-		if (! empty($backtourl)) header("Location: ".$backtourl);
-		else header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
-		exit;
-	}
-	else
-	{
-		$db->rollback();
-	}
-}
-
-if ($action == 'setdate_livraison' && $user->rights->expedition->livraison->creer)
-{
-	$object = new Livraison($db);
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-
-	//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-    $datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
-
-    $object->fetch($id);
-    $result=$object->set_date_livraison($user,$datedelivery);
-    if ($result < 0)
-    {
-        $mesg='<div class="error">'.$object->error.'</div>';
-    }
-}
-
-/*
- * Build document
- */
-if ($action == 'builddoc')	// En get ou en post
-{
-	$object = new Livraison($db);
-	$object->fetch($id);
-	$object->fetch_thirdparty();
-
-	// Save last template used to generate document
-	if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	// Define output language
-	$outputlangs = $langs;
-	$newlang='';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (! empty($newlang))
-	{
-		$outputlangs = new Translate("",$conf);
-		$outputlangs->setDefaultLang($newlang);
-	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	{
-	    $ret=$object->fetch($id);    // Reload to get new records
-    	$result=delivery_order_pdf_create($db, $object, $object->modelpdf, $outputlangs);
-	}
-	if ($result < 0)
-	{
-		dol_print_error($db,$result);
-		exit;
-	}
-}
-
-// Delete file in doc form
-elseif ($action == 'remove_file')
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$object = new Livraison($db);
-	if ($object->fetch($id))
-	{
-		$object->fetch_thirdparty();
-		$upload_dir =	$conf->expedition->dir_output . "/receipt";
-		$file =	$upload_dir	. '/' .	GETPOST('file');
-		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-		else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-	}
-}
-
-
-/*
- *	View
- */
-
-llxHeader('',$langs->trans('Delivery'),'Livraison');
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-
-/*********************************************************************
- *
- * Mode creation
- *
- *********************************************************************/
-if ($action == 'create')
-{
-
-	print_fiche_titre($langs->trans("CreateADeliveryOrder"));
-
-	if ($mesg)
-	{
-		print $mesg.'<br>';
-	}
-
-	$commande = new Commande($db);
-	$commande->livraison_array();
-
-	if ($commande->fetch($_GET["commande_id"]))
-	{
-		$soc = new Societe($db);
-		$soc->fetch($commande->socid);
-		$author = new User($db);
-		$author->fetch($commande->user_author_id);
-
-		if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
-		{
-			$entrepot = new Entrepot($db);
-		}
-
-		/*
-		 *   Commande
-		 */
-		print '<form action="fiche.php" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="add">';
-		print '<input type="hidden" name="commande_id" value="'.$commande->id.'">';
-		if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
-		{
-			print '<input type="hidden" name="entrepot_id" value="'.$_GET["entrepot_id"].'">';
-		}
-		print '<table class="border" width="100%">';
-		print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
-		print '<td width="30%"><b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
-
-		print '<td width="50%" colspan="2">';
-
-		print "</td></tr>";
-
-		print "<tr><td>".$langs->trans("Date")."</td>";
-		print "<td>".dol_print_date($commande->date,'dayhourtext')."</td>\n";
-
-		print '<td>'.$langs->trans("Order").'</td><td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$commande->id.'">'.img_object($langs->trans("ShowOrder"),'order').' '.$commande->ref.'</a>';
-		print "</td></tr>\n";
-
-		print '<tr>';
-
-		if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
-		{
-			print '<td>'.$langs->trans("Warehouse").'</td>';
-			print '<td>';
-			$ents = $entrepot->list_array();
-			print '<a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$_GET["entrepot_id"].'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$ents[$_GET["entrepot_id"]].'</a>';
-			print '</td>';
-		}
-
-		print "<td>".$langs->trans("Author")."</td><td>".$author->getFullName($langs)."</td>\n";
-
-		if ($commande->note)
-		{
-			print '<tr><td colspan="3">Note : '.nl2br($commande->note)."</td></tr>";
-		}
-		print "</table>";
-
-		/*
-		 * Lignes de commandes
-		 */
-		print '<br><table class="noborder" width="100%">';
-
-		$commande->fetch_lines(1);
-		$lines = $commande->lines;
-
-		// Lecture des livraisons deja effectuees
-		$commande->livraison_array();
-
-		$num = count($commande->lines);
-		$i = 0;
-
-		if ($num)
-		{
-			print '<tr class="liste_titre">';
-			print '<td width="54%">'.$langs->trans("Description").'</td>';
-			print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-			print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
-			print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
-			if (! empty($conf->stock->enabled))
-			{
-				print '<td width="12%" align="center">'.$langs->trans("Stock").'</td>';
-			}
-			print "</tr>\n";
-		}
-		$var=true;
-		while ($i < $num)
-		{
-			$product = new Product($db);
-
-			$line = $commande->lines[$i];
-			$var=!$var;
-			print "<tr ".$bc[$var].">\n";
-			if ($line->fk_product > 0)
-			{
-				$product->fetch($line->fk_product);
-				$product->load_stock();
-
-				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-				{
-					$commande->fetch_thirdparty();
-					$outputlangs = $langs;
-					$newlang='';
-					if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-					if (empty($newlang)) $newlang=$commande->client->default_lang;
-					if (! empty($newlang))
-					{
-						$outputlangs = new Translate("",$conf);
-						$outputlangs->setDefaultLang($newlang);
-					}
-
-					$label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $product->label;
-				}
-				else
-					$label = (! empty($line->label)?$line->label:$product->label);
-
-				print '<td>';
-				print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$line->fk_product.'">'.img_object($langs->trans("ShowProduct"),"product").' '.$product->ref.'</a> - '.$label;
-				if ($line->description) print nl2br($line->description);
-				print '</td>';
-			}
-			else
-			{
-				print "<td>";
-				if ($line->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
-
-				if (! empty($line->label)) {
-					$text.= ' <strong>'.$line->label.'</strong>';
-					print $form->textwithtooltip($text,$line->description,3,'','',$i);
-				} else {
-					print $text.' '.nl2br($line->description);
-				}
-
-				print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
-				print "</td>\n";
-			}
-
-			print '<td align="center">'.$line->qty.'</td>';
-			/*
-			 *
-			 */
-			print '<td align="center">';
-			$quantite_livree = $commande->livraisons[$line->id];
-			print $quantite_livree;;
-			print '</td>';
-
-			$quantite_commandee = $line->qty;
-			$quantite_a_livrer = $quantite_commandee - $quantite_livree;
-
-			if (! empty($conf->stock->enabled))
-			{
-				$stock = $product->stock_warehouse[$_GET["entrepot_id"]]->real;
-				$stock+=0;  // Convertit en numerique
-
-				// Quantite a livrer
-				print '<td align="center">';
-				print '<input name="idl'.$i.'" type="hidden" value="'.$line->id.'">';
-				print '<input name="qtyl'.$i.'" type="text" size="6" value="'.min($quantite_a_livrer, $stock).'">';
-				print '</td>';
-
-				// Stock
-				if ($stock < $quantite_a_livrer)
-				{
-					print '<td align="center">'.$stock.' '.img_warning().'</td>';
-				}
-				else
-				{
-					print '<td align="center">'.$stock.'</td>';
-				}
-			}
-			else
-			{
-				// Quantite a livrer
-				print '<td align="center">';
-				print '<input name="idl'.$i.'" type="hidden" value="'.$line->id.'">';
-				print '<input name="qtyl'.$i.'" type="text" size="6" value="'.$quantite_a_livrer.'">';
-				print '</td>';
-			}
-
-			print "</tr>\n";
-
-			$i++;
-			$var=!$var;
-		}
-
-		/*
-		 *
-		 */
-
-		print '<tr><td align="center" colspan="4"><br><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>';
-		print "</table>";
-		print '</form>';
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-else
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
-{
-	if ($id > 0)
-	{
-		$delivery = new Livraison($db);
-		$result = $delivery->fetch($id);
-		$delivery->fetch_thirdparty();
-
-		// Origin of a 'livraison' (delivery) is ALWAYS 'expedition' (shipment).
-		// However, origin of shipment in future may differs (commande, proposal, ...)
-
-		$expedition=new Expedition($db);
-		$result = $expedition->fetch($delivery->origin_id);
-		$typeobject = $expedition->origin;	// example: commande
-		if ($delivery->origin_id > 0)
-		{
-			$delivery->fetch_origin();
-		}
-
-		if ($delivery->id > 0)
-		{
-			$soc = new Societe($db);
-			$soc->fetch($delivery->socid);
-
-			$head=delivery_prepare_head($delivery);
-			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
-
-			/*
-			 * Confirmation de la suppression
-			 *
-			 */
-			if ($action == 'delete')
-			{
-				$expedition_id = GETPOST("expid");
-				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&expid='.$expedition_id.'&backtourl='.urlencode($backtourl),$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1);
-
-			}
-
-			/*
-			 * Confirmation de la validation
-			 */
-			if ($action == 'valid')
-			{
-				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1);
-
-			}
-
-
-			/*
-			 *   Livraison
-			 */
-			print '<table class="border" width="100%">';
-
-			// Shipment
-			if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0)
-			{
-				$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/liste.php">'.$langs->trans("BackToList").'</a>';
-
-				// Ref
-				print '<tr><td width="20%">'.$langs->trans("RefSending").'</td>';
-				print '<td colspan="3">';
-				// Nav is hidden because on a delivery receipt of a shipment, if we go on next shipment, we may find no tab (a shipment may not have delivery receipt yet)
-				//print $form->showrefnav($expedition, 'refshipment', $linkback, 1, 'ref', 'ref');
-				print $form->showrefnav($expedition, 'refshipment', $linkback, 0, 'ref', 'ref');
-				print '</td></tr>';
-			}
-
-			// Ref
-			print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-			print '<td colspan="3">'.$delivery->ref.'</td></tr>';
-
-			// Client
-			print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
-			print '<td align="3">'.$soc->getNomUrl(1).'</td>';
-			print "</tr>";
-
-			// Document origine
-			if ($typeobject == 'commande' && $expedition->origin_id && ! empty($conf->commande->enabled))
-			{
-				print '<tr><td>'.$langs->trans("RefOrder").'</td>';
-				$order=new Commande($db);
-				$order->fetch($expedition->origin_id);
-				print '<td colspan="3">';
-				print $order->getNomUrl(1,'commande');
-				print "</td>\n";
-				print '</tr>';
-			}
-			if ($typeobject == 'propal' && $expedition->origin_id && ! empty($conf->propal->enabled))
-			{
-				$propal=new Propal($db);
-				$propal->fetch($expedition->origin_id);
-				print '<tr><td>'.$langs->trans("RefProposal").'</td>';
-				print '<td colspan="3">';
-				print $propal->getNomUrl(1,'expedition');
-				print "</td>\n";
-				print '</tr>';
-			}
-
-			// Ref client
-			print '<tr><td>'.$langs->trans("RefCustomer").'</td>';
-			print '<td colspan="3">'.$delivery->ref_customer."</a></td>\n";
-			print '</tr>';
-
-			// Date
-			print '<tr><td>'.$langs->trans("DateCreation").'</td>';
-			print '<td colspan="3">'.dol_print_date($delivery->date_creation,'daytext')."</td>\n";
-			print '</tr>';
-
-			// Date delivery real / Received
-			print '<tr><td height="10">';
-			print '<table class="nobordernopadding" width="100%"><tr><td>';
-			print $langs->trans('DateReceived');
-			print '</td>';
-
-			if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$delivery->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
-			print '</tr></table>';
-			print '</td><td colspan="2">';
-			if ($action == 'editdate_livraison')
-			{
-				print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$delivery->id.'" method="post">';
-				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-				print '<input type="hidden" name="action" value="setdate_livraison">';
-				$form->select_date($delivery->date_delivery?$delivery->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
-				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-				print '</form>';
-			}
-			else
-			{
-				print $delivery->date_delivery ? dol_print_date($delivery->date_delivery,'dayhourtext') : '&nbsp;';
-			}
-			print '</td>';
-			print '</tr>';
-
-			// Note Public
-            print '<tr><td>'.$langs->trans("NotePublic").'</td>';
-            print '<td colspan="3">';
-            print nl2br($delivery->note_public);
-            /*$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-            print $doleditor->Create(1);*/
-            print "</td></tr>";
-
-			// Note Private
-            print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
-            print '<td colspan="3">';
-            print nl2br($delivery->note_private);
-            /*$doleditor = new DolEditor('note_pprivate', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
-            print $doleditor->Create(1);*/
-            print "</td></tr>";
-
-
-			// Statut
-			print '<tr><td>'.$langs->trans("Status").'</td>';
-			print '<td colspan="3">'.$delivery->getLibStatut(4)."</td>\n";
-			print '</tr>';
-
-			if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
-			{
-				// Entrepot
-				$entrepot = new Entrepot($db);
-				$entrepot->fetch($delivery->entrepot_id);
-				print '<tr><td width="20%">'.$langs->trans("Warehouse").'</td>';
-				print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$entrepot->id.'">'.$entrepot->libelle.'</a></td>';
-				print '</tr>';
-			}
-
-			print "</table><br>\n";
-
-			/*
-			 * Lignes produits
-			 */
-
-			$num_prod = count($delivery->lines);
-			$i = 0; $total = 0;
-
-			print '<table class="noborder" width="100%">';
-
-			if ($num_prod)
-			{
-				$i = 0;
-
-				print '<tr class="liste_titre">';
-				print '<td>'.$langs->trans("Products").'</td>';
-				print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-				print '<td align="center">'.$langs->trans("QtyReceived").'</td>';
-				print "</tr>\n";
-			}
-			$var=true;
-			while ($i < $num_prod)
-			{
-				$var=!$var;
-
-				print "<tr ".$bc[$var].">";
-				if ($delivery->lines[$i]->fk_product > 0)
-				{
-					$product = new Product($db);
-					$product->fetch($delivery->lines[$i]->fk_product);
-
-					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-					{
-						$delivery->fetch_thirdparty();
-						$outputlangs = $langs;
-						$newlang='';
-						if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang=$delivery->client->default_lang;
-						if (! empty($newlang))
-						{
-							$outputlangs = new Translate("",$conf);
-							$outputlangs->setDefaultLang($newlang);
-						}
-
-						$label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $delivery->lines[$i]->product_label;
-					}
-					else
-						$label = ( ! empty($delivery->lines[$i]->label)?$delivery->lines[$i]->label:$delivery->lines[$i]->product_label);
-
-					print '<td>';
-
-					// Affiche ligne produit
-					$text = '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$delivery->lines[$i]->fk_product.'">';
-					if ($delivery->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service');
-					else $text.= img_object($langs->trans('ShowProduct'),'product');
-					$text.= ' '.$delivery->lines[$i]->product_ref.'</a>';
-					$text.= ' - '.$label;
-					$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($delivery->lines[$i]->description));
-					//print $description;
-					print $form->textwithtooltip($text,$description,3,'','',$i);
-					print_date_range($delivery->lines[$i]->date_start,$delivery->lines[$i]->date_end);
-					if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-					{
-						print (! empty($delivery->lines[$i]->description) && $delivery->lines[$i]->description!=$delivery->lines[$i]->product_label)?'<br>'.dol_htmlentitiesbr($delivery->lines[$i]->description):'';
-					}
-				}
-				else
-				{
-					print "<td>";
-					if ($delivery->lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
-
-					if (! empty($delivery->lines[$i]->label)) {
-						$text.= ' <strong>'.$delivery->lines[$i]->label.'</strong>';
-						print $form->textwithtooltip($text,$delivery->lines[$i]->description,3,'','',$i);
-					} else {
-						print $text.' '.nl2br($delivery->lines[$i]->description);
-					}
-
-					print_date_range($objp->date_start,$objp->date_end);
-					print "</td>\n";
-				}
-
-				print '<td align="center">'.$delivery->lines[$i]->qty_asked.'</td>';
-				print '<td align="center">'.$delivery->lines[$i]->qty_shipped.'</td>';
-
-				print "</tr>";
-
-				$i++;
-			}
-
-			print "</table>\n";
-
-			print "\n</div>\n";
-
-
-			/*
-			 *    Boutons actions
-			 */
-
-			if ($user->societe_id == 0)
-			{
-				print '<div class="tabsAction">';
-
-				if ($delivery->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0)
-				{
-					print '<a class="butAction" href="fiche.php?id='.$delivery->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-
-				if ($user->rights->expedition->livraison->supprimer)
-				{
-					if ($conf->expedition_bon->enabled)
-					{
-						print '<a class="butActionDelete" href="fiche.php?id='.$delivery->id.'&amp;expid='.$delivery->origin_id.'&amp;action=delete&amp;backtourl='.urlencode(DOL_URL_ROOT.'/expedition/fiche.php?id='.$delivery->origin_id).'">'.$langs->trans("Delete").'</a>';
-					}
-					else
-					{
-						print '<a class="butActionDelete" href="fiche.php?id='.$delivery->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-					}
-				}
-
-				print '</div>';
-			}
-			print "\n";
-
-			print '<table width="100%" cellspacing="2"><tr><td width="50%" valign="top">';
-
-			/*
-		 	 * Documents generated
-			 */
-
-			$deliveryref = dol_sanitizeFileName($delivery->ref);
-			$filedir = $conf->expedition->dir_output . "/receipt/" . $deliveryref;
-			$urlsource = $_SERVER["PHP_SELF"]."?id=".$delivery->id;
-
-			$genallowed=$user->rights->expedition->livraison->creer;
-			$delallowed=$user->rights->expedition->livraison->supprimer;
-
-			$somethingshown=$formfile->show_documents('livraison',$deliveryref,$filedir,$urlsource,$genallowed,$delallowed,$delivery->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
-
-			/*
-		 	 * Linked object block (of linked shipment)
-		 	 */
-			if ($delivery->origin == 'expedition')
-			{
-				$shipment = new Expedition($db);
-				$shipment->fetch($delivery->origin_id);
-
-				$somethingshown=$shipment->showLinkedObjectBlock();
-			}
-
-			if ($genallowed && ! $somethingshown) $somethingshown=1;
-
-			print '</td><td valign="top" width="50%">';
-
-			// Rien a droite
-
-			print '</td></tr></table>';
-
-			if ($expedition->origin_id)
-			{
-				print '<br>';
-				//show_list_sending_receive($expedition->origin,$expedition->origin_id," AND e.rowid <> ".$expedition->id);
-				show_list_sending_receive($expedition->origin,$expedition->origin_id);
-			}
-		}
-		else
-		{
-			/* Expedition non trouvee */
-			print "Expedition inexistante ou acces refuse";
-		}
-	}
-	else
-	{
-		/* Expedition non trouvee */
-		print "Expedition inexistante ou acces refuse";
-	}
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/livraison/index.html b/htdocs/livraison/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/livraison/index.php b/htdocs/livraison/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/livraison/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/mailmanspip/class/index.html b/htdocs/mailmanspip/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index d4db8deb01c..6e772b09c03 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -112,7 +112,7 @@ class MailmanSpip
     /**
      * Function used to connect to Mailman
      *
-     * @param	object 	$object 	Object with the data
+     * @param	Adherent 	$object 	Object with the data
      * @param	string 	$url    	Mailman URL to be called with patterns
      * @param	string	$list		Name of mailing-list
      * @return 	mixed				Boolean or string
@@ -146,6 +146,7 @@ class MailmanSpip
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
         curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
         $result = curl_exec($ch);
         dol_syslog('result curl_exec='.$result);
diff --git a/htdocs/mailmanspip/index.html b/htdocs/mailmanspip/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 419c737b270..c6c7654cf00 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2008      Matteli
  * Copyright (C) 2011-2013 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -166,7 +167,6 @@ require_once 'filefunc.inc.php';
 // If there is a POST parameter to tell to save automatically some POST parameters into a cookies, we do it
 if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
 	$tmplist=explode(',',$tmpautoset[1]);
 	$cookiearrayvalue='';
@@ -177,7 +177,7 @@ if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
 		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
 	}
 	$cookiename=$tmpautoset[0];
-	$cookievalue=dol_json_encode($cookiearrayvalue);
+	$cookievalue=json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
 	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/');	// keep cookie 1 year
 	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
@@ -209,11 +209,13 @@ register_shutdown_function('dol_shutdown');
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
     $tmp=getBrowserInfo();
-    $conf->browser->phone=$tmp['phone'];
     $conf->browser->name=$tmp['browsername'];
     $conf->browser->os=$tmp['browseros'];
-    $conf->browser->firefox=$tmp['browserfirefox'];
     $conf->browser->version=$tmp['browserversion'];
+    $conf->browser->layout=$tmp['layout'];
+    $conf->browser->phone=$tmp['phone'];	// deprecated, use layout
+    $conf->browser->tablet=$tmp['tablet'];	// deprecated, use layout
+    //var_dump($conf->browser);
 }
 
 
@@ -411,7 +413,7 @@ if (! defined('NOLOGIN'))
                 // Call of triggers
                 include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
                 $interface=new Interfaces($db);
-                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST('entity','int'));
+                $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
                 if ($result < 0) {
                     $error++;
                 }
@@ -459,7 +461,7 @@ if (! defined('NOLOGIN'))
                     $datesecond=dol_stringtotime($_POST["dst_second"]);
                     if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
                 }
-                //print $datefirst.'-'.$datesecond.'-'.$datenow; exit;
+                //print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
             }
 
             if (! $login)
@@ -514,10 +516,11 @@ if (! defined('NOLOGIN'))
                 $_SESSION["dol_loginmesg"]=$user->error;
             }
 
+            // TODO We should use a hook here, not a trigger.
             // Call triggers
             include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
             $interface=new Interfaces($db);
-            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,$_POST["entity"]);
+            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
             if ($result < 0) {
                 $error++;
             }
@@ -556,10 +559,11 @@ if (! defined('NOLOGIN'))
                 $_SESSION["dol_loginmesg"]=$user->error;
             }
 
+            // TODO We should use a hook here, not a trigger.
             // Call triggers
             include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
             $interface=new Interfaces($db);
-            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,(isset($_POST["entity"])?$_POST["entity"]:0));
+            $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
             if ($result < 0) {
                 $error++;
             }
@@ -572,10 +576,11 @@ if (! defined('NOLOGIN'))
        {
             if (! empty($conf->global->MAIN_ACTIVATE_UPDATESESSIONTRIGGER))	// We do not execute such trigger at each page load by default (triggers are time consuming)
             {
+                // TODO We should use a hook here, not a trigger.
                 // Call triggers
                 include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
                 $interface=new Interfaces($db);
-                $result=$interface->run_triggers('USER_UPDATE_SESSION',$user,$user,$langs,$conf,$conf->entity);
+                $result=$interface->run_triggers('USER_UPDATE_SESSION',$user,$user,$langs,$conf);
                 if ($result < 0) {
                     $error++;
                 }
@@ -588,7 +593,7 @@ if (! defined('NOLOGIN'))
     // If we are here, this means authentication was successfull.
     if (! isset($_SESSION["dol_login"]))
     {
-        // New session for this login.
+        // New session for this login has started.
     	$error=0;
 
     	// Store value into session (values always stored)
@@ -617,10 +622,13 @@ if (! defined('NOLOGIN'))
 
         $user->update_last_login_date();
 
+        $user->trigger_mesg = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
+
+        // TODO We should use a hook here, not a trigger
         // Call triggers
         include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
         $interface=new Interfaces($db);
-        $result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf,GETPOST('entity','int'));
+        $result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
         if ($result < 0) {
             $error++;
         }
@@ -630,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
@@ -711,25 +719,29 @@ if (! GETPOST('nojs'))   // If javascript was not disabled on URL
 }
 else $conf->use_javascript_ajax=0;
 
-// Set terminal output option
+// Set terminal output option according to conf->browser.
 if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
 if (GETPOST('dol_hide_topmenu') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
 if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
 if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
 if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->phone))
+if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
+if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
+	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
+	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
+)
 {
 	$conf->dol_optimize_smallscreen=1;
-	$conf->dol_no_mouse_hover=1;
 }
 // If we force to use jmobile, then we reenable javascript
 if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
-// Disabled bugged themes
+// Replace themes bugged with jmobile with eldy
 if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo')))
 {
 	$conf->theme='eldy';
 	$conf->css  =  "/theme/".$conf->theme."/style.css.php";
 }
+//var_dump($conf->browser->phone);
 
 if (! defined('NOREQUIRETRAN'))
 {
@@ -954,8 +966,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
     //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
     //print '<!DOCTYPE HTML>';
     print "\n";
-    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-    else print '<html>'."\n";
+    if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+    else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
     //print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
     if (empty($disablehead))
     {
@@ -1004,9 +1016,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 //print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/ColVis/css/ColVisAlt.css'.($ext?'?'.$ext:'').'" />'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/TableTools/css/TableTools.css'.($ext?'?'.$ext:'').'" />'."\n";
             }
-            if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT')))     // jQuery multiselect
+            if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
             {
-            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/css/ui.multiselect.css'.($ext?'?'.$ext:'').'" />'."\n";
+            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'" />'."\n";
             }
             // jQuery Timepicker
             if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
@@ -1038,14 +1051,14 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 	        	}
 	        }
         }
-        $themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss')?'&amp;optioncss='.GETPOST('optioncss','alpha',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-        $themeparam.=($ext?'&amp;'.$ext:'');
-        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-        if (GETPOST('dol_hide_topmenu'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-        if (GETPOST('dol_hide_leftmenu'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-        if (GETPOST('dol_optimize_smallscreen'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-        if (GETPOST('dol_no_mouse_hover'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-        if (GETPOST('dol_use_jmobile'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+        $themeparam='?lang='.$langs->defaultlang.'&theme='.$conf->theme.(GETPOST('optioncss')?'&optioncss='.GETPOST('optioncss','alpha',1):'').'&userid='.$user->id.'&entity='.$conf->entity;
+        $themeparam.=($ext?'&'.$ext:'');
+        if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&dol_resetcache='.$_SESSION['dol_resetcache'];
+        if (GETPOST('dol_hide_topmenu'))           { $themeparam.='&dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
+        if (GETPOST('dol_hide_leftmenu'))          { $themeparam.='&dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
+        if (GETPOST('dol_optimize_smallscreen'))   { $themeparam.='&dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
+        if (GETPOST('dol_no_mouse_hover'))         { $themeparam.='&dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
+        if (GETPOST('dol_use_jmobile'))            { $themeparam.='&dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
         //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
         print '<link rel="stylesheet" type="text/css" title="default" href="'.$themepath.$themeparam.'">'."\n";
 
@@ -1115,14 +1128,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
                 if (constant('JS_JQUERY_FLOT'))
                 {
-                    print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="/javascript/excanvas/excanvas.min.js'.($ext?'?'.$ext:'').'"></script><![endif]-->'."\n";
                     print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                     print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                     print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 }
                 else
                 {
-                    print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/excanvas.min.js'.($ext?'?'.$ext:'').'"></script><![endif]-->'."\n";
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                     print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1167,17 +1178,17 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/ColVis/js/ColVis.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/TableTools/js/TableTools.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
-            // jQuery Multiselect
-            if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT')))
-            {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/js/ui.multiselect.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
             // jQuery Timepicker
             if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\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 '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/'.$tmpplugin.'.js'.($ext?'?'.$ext:'').'" />'."\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))
             {
@@ -1290,7 +1301,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
@@ -1395,7 +1406,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	        $companylink=' ('.$thirdpartystatic->getNomUrl('','').')';
 	        $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
 	    }
-	    $logintext='<div class="login"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'"';
+	    $logintext='<div class="login"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'"';
 	    $logintext.=$target?(' target="'.$target.'"'):'';
 	    $logintext.='>'.$user->login.'</a>';
 	    if ($user->societe_id) $logintext.=$companylink;
@@ -1403,6 +1414,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    $loginhtmltext.='<u>'.$langs->trans("User").'</u>';
 	    $loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->getFullName($langs);
 	    $loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
+	    $loginhtmltext.='<br><b>'.$langs->trans("EMail").'</b>: '.$user->email;
 	    $loginhtmltext.='<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
 	    $type=($user->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
 	    $loginhtmltext.='<br><b>'.$langs->trans("Type").'</b>: '.$type;
@@ -1410,9 +1422,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    $loginhtmltext.='<br>';
 	    $loginhtmltext.='<br><u>'.$langs->trans("Connection").'</u>';
 	    if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $loginhtmltext.='<br><b>'.$langs->trans("ConnectedOnMultiCompany").'</b>: '.$conf->entity.' (user entity '.$user->entity.')';
+	    $loginhtmltext.='<br><b>'.$langs->trans("AuthenticationMode").'</b>: '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
 	    $loginhtmltext.='<br><b>'.$langs->trans("ConnectedSince").'</b>: '.dol_print_date($user->datelastlogin,"dayhour");
 	    $loginhtmltext.='<br><b>'.$langs->trans("PreviousConnexion").'</b>: '.dol_print_date($user->datepreviouslogin,"dayhour");
-	    $loginhtmltext.='<br><b>'.$langs->trans("AuthenticationMode").'</b>: '.$_SESSION["dol_authmode"];
 	    $loginhtmltext.='<br><b>'.$langs->trans("CurrentTheme").'</b>: '.$conf->theme;
 	    $loginhtmltext.='<br><b>'.$langs->trans("CurrentMenuManager").'</b>: '.$menumanager->name;
 	    $s=picto_from_langcode($langs->getDefaultLang());
@@ -1433,27 +1445,23 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    }
 	    else $appli.=" ".DOL_VERSION;
 
-	    // Link info
 	    $logouttext='';
 	    $logouthtmltext=$appli.'<br>';
 	    if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
 	    {
 	    	$logouthtmltext.=$langs->trans("Logout").'<br>';
 
-	    	$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php"';
-	        //$logouttext .=empty($atarget?(' target="'.$atarget.'"'):'';
-	        $logouttext .='>';
-	        $logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
+	    	$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
+	        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
 	        $logouttext .='</a>';
 	    }
 	    else
 	    {
 	    	$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
-	        $logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
+	        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout.png', 'class="login"', 0, 0, 1);
 	    }
 
 	    print '<div class="login_block">'."\n";
-	    //print '<table class="nobordernopadding" summary=""><tr>';
 
 	    $toprightmenu.='<div class="login_block_user">';
 	    // Add login user link
@@ -1480,7 +1488,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	        $qs=$_SERVER["QUERY_STRING"];
 	        $qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
 	        $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
-	        $text.= img_picto('', 'printer.png', 'class="printer"');
+	        $text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer.png', 'class="printer"');
 	        $text.='</a>';
 	        $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
 	    }
@@ -1488,7 +1496,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
 	    print $toprightmenu;
 
-	    //print '</tr></table>'."\n";
 	    print "</div>\n";
 
 	    unset($form);
@@ -1537,7 +1544,7 @@ 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');
+	        $searchform.=printSearchForm(DOL_URL_ROOT.'/societe/societe.php', DOL_URL_ROOT.'/societe/societe.php', img_object('','company').' '.$langs->trans("ThirdParties"), 'soc', 'socname', 'T');
 	    }
 
 	    if (! empty($conf->societe->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_CONTACT) && $user->rights->societe->lire)
@@ -1550,20 +1557,20 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    && ! empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE))
 	    {
 	        $langs->load("products");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/product/liste.php', DOL_URL_ROOT.'/product/liste.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', 'P', 'sallsearchleftp');
 	    }
 
 	    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/liste.php', DOL_URL_ROOT.'/fourn/product/liste.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');
 	    }
 
 	    if (! empty($conf->adherent->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_ADHERENT) && $user->rights->adherent->lire)
 	    {
 	        $langs->load("members");
-	        $searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/liste.php', DOL_URL_ROOT.'/adherents/liste.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', 'M', 'sallsearchleftm');
 	    }
 
 	    // Execute hook printSearchForm
@@ -1622,9 +1629,12 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        print "<!-- End Bookmarks -->\n";
 	    }
 
-		//Dolibarr version
-	    $doliurl='http://www.dolibarr.org';
+        print "\n";
+        print "<!-- Begin Help Block-->\n";
+        print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\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';
@@ -1643,11 +1653,11 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	    	else $appli.=" ".DOL_VERSION;
 	    }
 	    else $appli.=" ".DOL_VERSION;
-	    print '<div id="blockvmenuhelp" class="blockvmenuhelp">';
+	    print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
 	    if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
 	    print $appli;
 	    if ($doliurl) print '</a>';
-	    print '</div>';
+	    print '</div>'."\n";
 
 	    // Link to Dolibarr wiki pages
 	    if ($helppagename && empty($conf->global->MAIN_HELP_DISABLELINK))
@@ -1667,7 +1677,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        // Link to help pages
 	        if ($helpbaseurl && $helppage)
 	        {
-	            print '<div id="blockvmenuhelp" class="blockvmenuhelp">';
+	            print '<div id="blockvmenuhelpwiki" class="blockvmenuhelp">';
 	            print '<a class="help" target="_blank" title="'.$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
 	            if ($mode == 'wiki') print ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
 	            print '" href="';
@@ -1678,7 +1688,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	            print $langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
 	            //if ($mode == 'wiki') print ' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
 	            print '</a>';
-	            print '</div>';
+	            print '</div>'."\n";
 	        }
 	    }
 
@@ -1695,14 +1705,16 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        $bugbaseurl.=urlencode($langs->trans("Server").": ".$_SERVER["SERVER_SOFTWARE"]."\n");
 	        $bugbaseurl.=urlencode($langs->trans("PHP").": ".version_php()."\n");
 	        $bugbaseurl.=urlencode($langs->trans("Url").": ".$_SERVER["REQUEST_URI"]."\n");
-	        print '<div id="blockvmenubugtracker" class="blockvmenuhelp"><a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a></div>';
+	        print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp"><a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a></div>';
 	    }
-	    print "\n";
 
-	    print "</div>\n";
-	    print "<!-- End left menu -->\n";
+        print "</div>\n";
+        print "<!-- End Help Block-->\n";
+        print "\n";
 
-	    print "\n";
+        print "</div>\n";
+        print "<!-- End left menu -->\n";
+        print "\n";
 
 	    // Execute hook printLeftBlock
 	    $parameters=array();
@@ -1794,26 +1806,36 @@ function getHelpParamFor($helppagename,$langs)
  *  @param  string	$title              Title search area
  *  @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 $htmlinputid           Input ID
  *  @return	string
  */
-function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname)
+function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinputname,$accesskey='', $htmlinputid = '')
 {
     global $conf,$langs;
 
+    if (!$htmlinputid) {
+        $htmlinputid = $htmlinputname;
+    }
+
     $ret='';
-    $ret.='<div class="menu_titre">';
-    $ret.='<a class="vsmenu" href="'.$urlobject.'">';
-    $ret.=$title.'</a><br>';
-    $ret.='</div>';
     $ret.='<form action="'.$urlaction.'" method="post">';
+	$ret.='<div class="menu_titre menu_titre_search">';
+	$ret.='<label for="'.$htmlinputname.'">';
+	$ret.='<a class="vsmenu" href="'.$urlobject.'">';
+	$ret.=$title;
+	$ret.='</a>';
+	$ret.='</label>';
+	$ret.='</div>';
     $ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     $ret.='<input type="hidden" name="mode" value="search">';
     $ret.='<input type="hidden" name="mode_search" value="'.$htmlmodesearch.'">';
-    $ret.='<input type="text" class="flat" ';
+    $ret.='<input type="text" class="flat"';
+    $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.'" size="10" />';
-    $ret.='<input type="submit" class="button" value="'.$langs->trans("Go").'">';
+    $ret.=' name="'.$htmlinputname.'" id="'.$htmlinputid.'" size="10" />';
+    $ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
     $ret.="</form>\n";
     return $ret;
 }
diff --git a/htdocs/margin/admin/index.html b/htdocs/margin/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index ab12b32716e..8a0aefba711 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -74,7 +74,7 @@ $form = new Form($db);
 llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Agents"));
 
 $text=$langs->trans("Margins");
-print_fiche_titre($text);
+//print_fiche_titre($text);
 
 // Show tabs
 $head=marges_prepare_head($user);
@@ -106,7 +106,7 @@ print "</table>";
 print '</form>';
 
 $sql = "SELECT";
-if ($agentid > 0) $sql.= " s.rowid as socid, s.nom, s.code_client, s.client,";
+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,";
@@ -145,7 +145,7 @@ $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-dol_syslog('margin::agentMargins.php sql='.$sql,LOG_DEBUG);
+dol_syslog('margin::agentMargins.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
@@ -202,7 +202,7 @@ if ($result)
 			print "<tr ".$bc[$var].">";
 			if ($agentid > 0) {
 				$companystatic->id=$objp->socid;
-				$companystatic->nom=$objp->nom;
+				$companystatic->name=$objp->name;
 				$companystatic->client=$objp->client;
 				print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
 			}
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 34aea94e70f..3cd39d4101f 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -66,7 +66,7 @@ $form = new Form($db);
 llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Clients"));
 
 $text=$langs->trans("Margins");
-print_fiche_titre($text);
+//print_fiche_titre($text);
 
 // Show tabs
 $head=marges_prepare_head($user);
@@ -80,7 +80,7 @@ print '<table class="border" width="100%">';
 $client = false;
 if ($socid > 0) {
 
-	$soc = new Societe($db, $socid);
+	$soc = new Societe($db);
 	$soc->fetch($socid);
 
 	if ($soc->client)
@@ -161,7 +161,7 @@ print "</table>";
 print '</form>';
 
 $sql = "SELECT";
-$sql.= " s.rowid as socid, s.nom, s.code_client, s.client,";
+$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,";
@@ -189,7 +189,7 @@ $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-dol_syslog('margin::customerMargins.php sql='.$sql,LOG_DEBUG);
+dol_syslog('margin::customerMargins.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
@@ -259,7 +259,7 @@ if ($result)
 		  	}
 		  	else {
 				$companystatic->id=$objp->socid;
-				$companystatic->nom=$objp->nom;
+				$companystatic->name=$objp->name;
 				$companystatic->client=$objp->client;
 		   		print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
 		  	}
diff --git a/htdocs/margin/lib/index.html b/htdocs/margin/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index b8d5f7f66ba..b359287d24f 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -89,8 +89,7 @@ $form = new Form($db);
 llxHeader('',$langs->trans("Margins").' - '.$langs->trans("Products"));
 
 $text=$langs->trans("Margins");
-
-print_fiche_titre($text);
+//print_fiche_titre($text);
 
 // Show tabs
 $head=marges_prepare_head($user);
@@ -193,7 +192,7 @@ $sql.=$db->order($sortfield,$sortorder);
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-dol_syslog('margin::productMargins.php sql='.$sql,LOG_DEBUG);
+dol_syslog('margin::productMargins.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
diff --git a/htdocs/margin/tabs/index.html b/htdocs/margin/tabs/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 825d2043683..d811f898c0b 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -128,148 +128,135 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 
-		$sql = "SELECT 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,";
-		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.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-		$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.fk_soc = s.rowid";
-		$sql.= " AND f.fk_statut > 0";
-		$sql.= " AND s.entity = ".$conf->entity;
-		$sql.= " AND d.fk_facture = f.rowid";
-		$sql.= " AND d.fk_product =".$object->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-		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";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
-		$sql.= " ORDER BY ".$sortfield." ".$sortorder;
-		// TODO: calculate total to display then restore pagination
-		//$sql.= $db->plimit($conf->liste_limit +1, $offset);
-		dol_syslog('margin:tabs:productMargins.php sql='.$sql,LOG_DEBUG);
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
+        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, f.type,";
+            if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
+            $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";
+            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE f.fk_soc = s.rowid";
+            $sql.= " AND f.fk_statut > 0";
+            $sql.= " AND s.entity = ".$conf->entity;
+            $sql.= " AND d.fk_facture = f.rowid";
+            $sql.= " AND d.fk_product =".$object->id;
+            if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            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, f.type";
+            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
+            $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);
+            $result = $db->query($sql);
+            if ($result) {
+                $num = $db->num_rows($result);
 
-			print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;id=$object->id",$sortfield,$sortorder,'',0,0,'');
+                print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;id=$object->id",$sortfield,$sortorder,'',0,0,'');
 
-			$i = 0;
-			print "<table class=\"noborder\" width=\"100%\">";
+                $i = 0;
+                print '<table class="noborder" width="100%">';
 
-			print '<tr class="liste_titre">';
-			print_liste_field_titre($langs->trans("Invoice"),$_SERVER["PHP_SELF"],"f.facnumber","","&amp;id=".$object->id,'',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$object->id,'',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$object->id,'',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$object->id,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("SellingPrice"),$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Margin"),$_SERVER["PHP_SELF"],"marge","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print_liste_field_titre($langs->trans("MarginRate"),$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print_liste_field_titre($langs->trans("MarkRate"),$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
-			print "</tr>\n";
+                print '<tr class="liste_titre">';
+                print_liste_field_titre($langs->trans("Invoice"),$_SERVER["PHP_SELF"],"f.facnumber","","&amp;id=".$object->id,'',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$object->id,'',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$object->id,'',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$object->id,'align="center"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("SellingPrice"),$_SERVER["PHP_SELF"],"selling_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("BuyingPrice"),$_SERVER["PHP_SELF"],"buying_price","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("Margin"),$_SERVER["PHP_SELF"],"marge","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                    print_liste_field_titre($langs->trans("MarginRate"),$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                if (! empty($conf->global->DISPLAY_MARK_RATES))
+                    print_liste_field_titre($langs->trans("MarkRate"),$_SERVER["PHP_SELF"],"","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$object->id,'align="right"',$sortfield,$sortorder);
+                print "</tr>\n";
 
-			$cumul_achat = 0;
-			$cumul_vente = 0;
-			$cumul_qty = 0;
-			$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+                $cumul_achat = 0;
+                $cumul_vente = 0;
+                $cumul_qty = 0;
+                $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
 
-			if ($num > 0)
-			{
-				$var=True;
-				while ($i < $num /*&& $i < $conf->liste_limit*/)
-				{
-					$objp = $db->fetch_object($result);
-					$var=!$var;
+                if ($num > 0) {
+                    $var=True;
+                    while ($i < $num /*&& $i < $conf->liste_limit*/) {
+                        $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):'' ;
-					}
 
-					print "<tr ".$bc[$var].">";
-					print '<td>';
-					$invoicestatic->id=$objp->facid;
-					$invoicestatic->ref=$objp->facnumber;
-					print $invoicestatic->getNomUrl(1);
-					print "</td>\n";
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
-					print "<td>".$objp->code_client."</td>\n";
-					print "<td align=\"center\">";
-					print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-					print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-						print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-					if (! empty($conf->global->DISPLAY_MARK_RATES))
-						print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-					print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
-					print "</tr>\n";
-					$i++;
-					$cumul_achat += $objp->buying_price;
-					$cumul_vente += $objp->selling_price;
-					$cumul_qty += $objp->qty;
-				}
-			}
+                        print '<tr '.$bc[$var].'>';
+                        print '<td>';
+                        $invoicestatic->id=$objp->facid;
+                        $invoicestatic->ref=$objp->facnumber;
+                        print $invoicestatic->getNomUrl(1);
+                        print "</td>\n";
+                        print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
+                        print "<td>".$objp->code_client."</td>\n";
+						print "<td align=\"center\">";
+						print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+						print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->qty, null, null, null, null, $rounding)."</td>\n";
+						print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
+						if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+							print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+						if (! empty($conf->global->DISPLAY_MARK_RATES))
+							print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+                        print "</tr>\n";
+                        $i++;
+                        $cumul_achat += $objp->buying_price;
+                        $cumul_vente += $objp->selling_price;
+                        $cumul_qty += $objp->qty;
+                    }
+                }
 
-			// affichage totaux marges
-			$var=!$var;
-			$totalMargin = $cumul_vente - $cumul_achat;
-			if ($totalMargin < 0)
-			{
-				$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
-				$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
-			}
-			else
-			{
-				$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-				$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
-			}
-			print '<tr class="liste_total">';
-			print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
-			print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($cumul_qty, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-			print '<td align="right">&nbsp;</td>';
-			print "</tr>\n";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-		print "</table>";
-		print '<br>';
-		$db->free($result);
-	}
-}
-else
-{
-	dol_print_error();
+                // affichage totaux marges
+                $var=!$var;
+                $totalMargin = $cumul_vente - $cumul_achat;
+                if ($totalMargin < 0)
+                {
+                    $marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
+                    $markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
+                }
+                else
+              {
+                    $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+                    $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+                }
+                print '<tr class="liste_total">';
+                print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
+                print '<td align="right">'.price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
+                print '<td align="right">'.price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
+                print '<td align="right">'.price($cumul_qty, null, null, null, null, $rounding)."</td>\n";
+                print '<td align="right">'.price($totalMargin, null, null, null, null, $rounding)."</td>\n";
+                if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                    print '<td align="right">'.(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+                if (! empty($conf->global->DISPLAY_MARK_RATES))
+                    print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+                print '<td align="right">&nbsp;</td>';
+                print "</tr>\n";
+                print "</table>";
+                print '<br>';
+            } else {
+                dol_print_error($db);
+            }
+            $db->free($result);
+        }
+    }
+} else {
+    dol_print_error();
 }
 
 
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 8e7807817a6..457d55e81f0 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -62,7 +62,7 @@ llxHeader('',$langs->trans("ThirdParty").' - '.$langs->trans("Margins"),$help_ur
 
 if ($socid > 0)
 {
-    $societe = new Societe($db, $socid);
+    $societe = new Societe($db);
     $societe->fetch($socid);
 
     /*
@@ -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,20 +140,20 @@ 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);
 
-		dol_syslog('margin:tabs:thirdpartyMargins.php sql='.$sql,LOG_DEBUG);
+		dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG);
 		$result = $db->query($sql);
 		if ($result)
 		{
 			$num = $db->num_rows($result);
 
-			print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;socid=$societe->id",$sortfield,$sortorder,'',0,0,'');
+			print_barre_liste($langs->trans("MarginDetails"),$page,$_SERVER["PHP_SELF"],"&amp;socid=".$societe->id,$sortfield,$sortorder,'',0,0,'');
 
 			$i = 0;
 			print "<table class=\"noborder\" width=\"100%\">";
@@ -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 "<td align=\"center\">";
 					print dol_print_date($db->jdate($objp->datef),'day')."</td>";
 					print "<td align=\"right\">".price($objp->selling_price, null, null, null, null, $rounding)."</td>\n";
-					print "<td align=\"right\">".price($objp->buying_price, null, null, null, null, $rounding)."</td>\n";
+					print "<td align=\"right\">".price(($objp->type == 2 ? -1 : 1) * $objp->buying_price, null, null, null, null, $rounding)."</td>\n";
 					print "<td align=\"right\">".price($objp->marge, null, null, null, null, $rounding)."</td>\n";
 					if (! empty($conf->global->DISPLAY_MARGIN_RATES))
 						print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
@@ -263,8 +255,8 @@ $db->close();
 ?>
 <script type="text/javascript">
 $(document).ready(function() {
-	$("#totalMargin").html("<?php echo price($totalMargin); ?>");
-	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate)."%"); ?>");
-	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate)."%"); ?>");
+	$("#totalMargin").html("<?php echo price($totalMargin, null, null, null, null, $rounding); ?>");
+	$("#marginRate").html("<?php echo (($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%"); ?>");
+	$("#markRate").html("<?php echo (($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%"); ?>");
 });
 </script>
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 3c2424ed88a..7c0000bedea 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2006 	   Andre Cianfarani     <andre.cianfarani@acdeveloppement.net>
  * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  *
  * 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
@@ -244,8 +245,6 @@ $hookmanager=new HookManager($db);
 
 if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
 
-// We force feature to help debug
-//$conf->global->MAIN_JS_ON_PAYMENT=0;
 
 // We force FPDF
 if (! empty($dolibarr_pdf_force_fpdf)) $conf->global->MAIN_USE_FPDF=$dolibarr_pdf_force_fpdf;
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 884d5124126..396fdf050ec 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -373,7 +373,7 @@ print '<br>';
 if ($object->allow_comments) {
 	print $langs->trans("AddACommentForPoll") . '<br>';
 	print '<textarea name="comment" rows="2" cols="80"></textarea><br>'."\n";
-	print $langs->trans("Name") .': <input type="text" name="commentuser" value="'.$user->getFullName($langs).'"><br>'."\n";
+	print $langs->trans("Name") .': <input type="text" size="50" name="commentuser" value="'.$user->getFullName($langs).'"><br>'."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 	if (isset($erreur_commentaire_vide) && $erreur_commentaire_vide=="yes") {
 		print "<font color=#FF0000>" . $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")) . "</font>";
diff --git a/htdocs/opensurvey/class/index.html b/htdocs/opensurvey/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 4a01e125ba5..b4c8570dec8 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -137,7 +137,7 @@ class Opensurveysondage extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -147,12 +147,10 @@ class Opensurveysondage extends CommonObject
 			{
 				global $langs, $conf;
 
-	            //// Call triggers
-	            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            $interface=new Interfaces($this->db);
-	            $result=$interface->run_triggers('OPENSURVEY_CREATE',$this,$user,$langs,$conf);
-	            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
+                // Call trigger
+                $result=$this->call_trigger('OPENSURVEY_CREATE',$user);
+                if ($result < 0) $error++;
+                // End call triggers
 			}
         }
 
@@ -201,7 +199,7 @@ class Opensurveysondage extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as t";
         $sql.= " WHERE t.id_sondage = '".$this->db->escape($numsurvey)."'";
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -242,7 +240,6 @@ class Opensurveysondage extends CommonObject
         else
        {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             $ret=-1;
         }
 
@@ -257,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;
@@ -286,7 +283,7 @@ class Opensurveysondage extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -344,12 +341,10 @@ class Opensurveysondage extends CommonObject
 		{
 			if (! $notrigger)
 			{
-		        //// Call triggers
-		        include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        $interface=new Interfaces($this->db);
-		        $result=$interface->run_triggers('OPENSURVEY_DELETE',$this,$user,$langs,$conf);
-		        if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
+                // Call trigger
+                $result=$this->call_trigger('OPENSURVEY_DELETE',$user);
+                if ($result < 0) $error++;
+                // End call triggers
 			}
 		}
 
@@ -357,16 +352,16 @@ class Opensurveysondage extends CommonObject
 		{
 
 			$sql='DELETE FROM '.MAIN_DB_PREFIX."opensurvey_comments WHERE id_sondage = '".$this->db->escape($numsondage)."'";
-			dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			$sql='DELETE FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage = '".$this->db->escape($numsondage)."'";
-			dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX."opensurvey_sondage";
     		$sql.= " WHERE id_sondage = '".$this->db->escape($numsondage)."'";
 
-    		dol_syslog(get_class($this)."::delete sql=".$sql);
+    		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
     		$resql = $this->db->query($sql);
         	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
@@ -397,7 +392,8 @@ class Opensurveysondage extends CommonObject
 	function fetch_lines()
 	{
 		$ret=array();
-		$sql = "SELECT id_users, nom, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+
+		$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);
 
@@ -408,7 +404,7 @@ class Opensurveysondage extends CommonObject
 			while ($i < $num)
 			{
 				$obj=$this->db->fetch_object($resql);
-				$tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->nom, 'reponses'=>$obj->reponses);
+				$tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
 
 				$ret[]=$tmp;
 				$i++;
@@ -446,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';
@@ -454,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;
+				}
 			}
 		}
 
@@ -474,12 +475,11 @@ 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);
-		dol_syslog("sql=".$sql);
 
 		if (!$resql) {
 			return false;
@@ -494,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) {
@@ -510,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/css/index.html b/htdocs/opensurvey/css/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 2c31b67f574..7096ae7ad99 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -82,11 +82,10 @@ if (strpos($object->sujet,'@') !== false)
 }
 
 
-$sql ='SELECT nom, reponses';
+$sql ='SELECT nom as name, reponses';
 $sql.=' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs";
 $sql.=" WHERE id_sondage='" . $db->escape($numsondage) . "'";
 $sql.=" ORDER BY id_users";
-dol_syslog("sql=".$sql);
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -96,8 +95,8 @@ if ($resql)
 	{
 		$obj=$db->fetch_object($resql);
 
-		// Le nom de l'utilisateur
-		$nombase=str_replace("°","'",$obj->nom);
+		// Le name de l'utilisateur
+		$nombase=str_replace("°","'",$obj->name);
 		$input.=$nombase.';';
 
 		//affichage des resultats
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index b2077c05bbf..b65abcaffe9 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -249,4 +249,3 @@ function ajouter_sondage()
 	header("Location: ".$urlback);
 	exit();
 }
-
diff --git a/htdocs/opensurvey/img/index.html b/htdocs/opensurvey/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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/public/index.html b/htdocs/opensurvey/public/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php
index 525f488b0cd..1b39391b67c 100644
--- a/htdocs/opensurvey/public/studs.php
+++ b/htdocs/opensurvey/public/studs.php
@@ -113,7 +113,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		$nom=substr(GETPOST("nom"),0,64);
 
 		// Check if vote already exists
-		$sql = 'SELECT id_users, nom FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
+		$sql = 'SELECT id_users, nom as name';
+		$sql.= ' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs';
+		$sql.= ' WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
 		$resql = $db->query($sql);
 		$num_rows = $db->num_rows($resql);
 		if ($num_rows > 0)
@@ -212,7 +214,6 @@ if ($testmodifier)
 	$sql.= " SET reponses = '".$db->escape($nouveauchoix)."'";
 	$sql.= " WHERE id_users = '".$db->escape($idtomodify)."'";
 
-	dol_syslog("sql=".$sql);
 	$resql = $db->query($sql);
 	if (! $resql) dol_print_error($db);
 }
@@ -390,10 +391,9 @@ else
 $sumfor = array();
 $sumagainst = array();
 $compteur = 0;
-$sql ="SELECT id_users, nom, id_sondage, reponses";
+$sql ="SELECT id_users, nom as name, id_sondage, reponses";
 $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
 $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
-dol_syslog('sql='.$sql);
 $resql=$db->query($sql);
 if (! $resql)
 {
@@ -408,7 +408,7 @@ while ($compteur < $num)
 	$ensemblereponses = $obj->reponses;
 
 	// ligne d'un usager pré-authentifié
-	$mod_ok = (in_array($obj->nom, $listofvoters));
+	$mod_ok = (in_array($obj->name, $listofvoters));
 
 	if (!$mod_ok && !$object->allow_spy) {
 		$compteur++;
@@ -418,7 +418,7 @@ while ($compteur < $num)
 	print '<tr>'."\n";
 
 	// Name
-	print '<td class="nom">'.dol_htmlentities($obj->nom).'</td>'."\n";
+	print '<td class="nom">'.dol_htmlentities($obj->name).'</td>'."\n";
 
 	// si la ligne n'est pas a changer, on affiche les données
 	if (! $testligneamodifier)
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index c5baba61242..226bc0c0465 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -83,7 +83,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		$nom=substr(GETPOST("nom"),0,64);
 
 		// Check if vote already exists
-		$sql = 'SELECT id_users, nom';
+		$sql = 'SELECT id_users, nom as name';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs';
 		$sql.= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."'";
 		$sql.= ' ORDER BY id_users';
@@ -151,7 +151,6 @@ if ($testmodifier)
 	$sql.= " SET reponses = '".$db->escape($nouveauchoix)."'";
 	$sql.= " WHERE id_users = '".$db->escape($idtomodify)."'";
 
-	dol_syslog("sql=".$sql);
 	$resql = $db->query($sql);
 	if (! $resql) dol_print_error($db);
 }
@@ -172,7 +171,6 @@ if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && $object->format =
 	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
 	$sql.= " SET sujet = '".$db->escape($nouveauxsujets)."'";
 	$sql.= " WHERE id_sondage = '".$db->escape($numsondage)."'";
-	dol_syslog("sql=".$sql);
 	$resql = $db->query($sql);
 	if (! $resql) dol_print_error($db);
 	else {
@@ -258,7 +256,6 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
 			$sql.= " SET sujet = '".$db->escape($dateinsertion)."'";
 			$sql.= " WHERE id_sondage = '".$db->escape($numsondage)."'";
-			dol_syslog("sql=".$sql);
 			$resql = $db->query($sql);
 			if (! $resql) dol_print_error($db);
 			else {
@@ -286,10 +283,9 @@ for ($i = 0; $i < $nblignes; $i++)
 
 		// Loop on each answer
 		$compteur = 0;
-		$sql ="SELECT id_users, nom, id_sondage, reponses";
+		$sql ="SELECT id_users, nom as name, id_sondage, reponses";
 		$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
 		$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
-		dol_syslog('sql='.$sql);
 		$resql=$db->query($sql);
 		if (! $resql) dol_print_error($db);
 		$num=$db->num_rows($resql);
@@ -340,13 +336,12 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 		// Mise a jour des sujets dans la base
 		$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
 		$sql.= " SET sujet = '".$db->escape($nouveauxsujets)."' WHERE id_sondage = '".$db->escape($numsondage)."'";
-		dol_syslog("sql=".$sql);
 		$resql = $db->query($sql);
 		if (! $resql) dol_print_error($db);
 
 		// Clean current answer to remove deleted columns
 		$compteur = 0;
-		$sql ="SELECT id_users, nom, id_sondage, reponses";
+		$sql ="SELECT id_users, nom as name, id_sondage, reponses";
 		$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
 		$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
 		dol_syslog('sql='.$sql);
@@ -761,7 +756,7 @@ else
 $sumfor = array();
 $sumagainst = array();
 $compteur = 0;
-$sql ="SELECT id_users, nom, id_sondage, reponses";
+$sql ="SELECT id_users, nom as name, id_sondage, reponses";
 $sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
 $sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
 dol_syslog('sql='.$sql);
@@ -785,7 +780,7 @@ while ($compteur < $num)
 	}
 
 	// Name
-	print '</td><td class="nom">'.dol_htmlentities($obj->nom).'</td>'."\n";
+	print '</td><td class="nom">'.dol_htmlentities($obj->name).'</td>'."\n";
 
 	// si la ligne n'est pas a changer, on affiche les données
 	if (! $testligneamodifier)
diff --git a/htdocs/paybox/admin/index.html b/htdocs/paybox/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 7eefafb9c8c..30e02591190 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -67,7 +67,7 @@ if ($action == 'setvalue' && $user->admin)
     if (! $error)
   	{
   		$db->commit();
-  		$mesg='<div class="ok">'.$langs->trans("SetupSaved").'</div>';
+	    setEventMessage($langs->trans("SetupSaved"));
   	}
   	else
   	{
@@ -227,8 +227,6 @@ if (! empty($conf->adherent->enabled))
 print "<br>";
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 dol_fiche_end();
 llxFooter();
diff --git a/htdocs/paybox/img/index.html b/htdocs/paybox/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/paybox/index.html b/htdocs/paybox/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/paybox/index.php b/htdocs/paybox/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/paybox/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/paybox/lib/index.html b/htdocs/paybox/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index f56367c9a36..78c500c7551 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -183,27 +183,6 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
     // Formulaire pour module Paybox
     print '<form action="'.$URLPAYBOX.'" NAME="Submit" method="POST">'."\n";
 
-    // For Paybox V1 (IBS_xxx)
-    /*
-    print '<!-- Param for Paybox v1 -->'."\n";
-    print '<input type="hidden" name="IBS_MODE" value="'.$IBS_MODE.'">'."\n";
-    print '<input type="hidden" name="IBS_SITE" value="'.$IBS_SITE.'">'."\n";
-    print '<input type="hidden" name="IBS_RANG" value="'.$IBS_RANG.'">'."\n";
-    print '<input type="hidden" name="IBS_TOTAL" value="'.$IBS_TOTAL.'">'."\n";
-    print '<input type="hidden" name="IBS_DEVISE" value="'.$IBS_DEVISE.'">'."\n";
-    print '<input type="hidden" name="IBS_CMD" value="'.$IBS_CMD.'">'."\n";
-    print '<input type="hidden" name="IBS_PORTEUR" value="'.$IBS_PORTEUR.'">'."\n";
-    print '<input type="hidden" name="IBS_RETOUR" value="'.$IBS_RETOUR.'">'."\n";
-    print '<input type="hidden" name="IBS_EFFECTUE" value="'.$IBS_EFFECTUE.'">'."\n";
-    print '<input type="hidden" name="IBS_ANNULE" value="'.$IBS_ANNULE.'">'."\n";
-    print '<input type="hidden" name="IBS_REFUSE" value="'.$IBS_REFUSE.'">'."\n";
-    print '<input type="hidden" name="IBS_TXT" value="'.$IBS_TXT.'">'."\n";
-    print '<input type="hidden" name="IBS_BKGD" value="'.$IBS_BKGD.'">'."\n";
-    print '<input type="hidden" name="IBS_WAIT" value="'.$IBS_WAIT.'">'."\n";
-    print '<input type="hidden" name="IBS_LANG" value="'.$IBS_LANG.'">'."\n";
-    print '<input type="hidden" name="IBS_OUTPUT" value="'.$IBS_OUTPUT.'">'."\n";
-	*/
-
     // For Paybox V2 (PBX_xxx)
     print '<!-- Param for Paybox v2 -->'."\n";
     print '<input type="hidden" name="PBX_IDENTIFIANT" value="'.$PBX_IDENTIFIANT.'">'."\n";
@@ -228,8 +207,6 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
 
     print '</form>'."\n";
 
-    // Formulaire pour module Paybox v2 (PBX_xxx)
-
 
     print "\n";
     print '<script type="text/javascript" language="javascript">'."\n";
@@ -304,7 +281,7 @@ function html_print_paybox_footer($fromcompany,$langs)
 
 	print '<br><br><hr>'."\n";
 	print '<center><font style="font-size: 10px;">'."\n";
-	print $fromcompany->nom.'<br>';
+	print $fromcompany->name.'<br>';
 	print $line1.'<br>';
 	print $line2;
 	print '</font></center>'."\n";
diff --git a/htdocs/paypal/admin/index.html b/htdocs/paypal/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 69b0664eb9d..e3dff71b721 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -93,7 +93,7 @@ llxHeader('',$langs->trans("PaypalSetup"));
 
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre(' - '.$langs->trans("ModuleSetup"),$linkback,'paypal_logo@paypal');
+print_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
 print '<br>';
 
 $head=paypaladmin_prepare_head();
diff --git a/htdocs/paypal/img/index.html b/htdocs/paypal/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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/index.html b/htdocs/paypal/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/paypal/index.php b/htdocs/paypal/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/paypal/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/paypal/lib/index.html b/htdocs/paypal/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 7b161ac30be..b40b0f9fd4c 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -154,7 +154,7 @@ function html_print_paypal_footer($fromcompany,$langs)
 
 	print '<br><br><hr>'."\n";
 	print '<center><font style="font-size: 10px;">'."\n";
-	print $fromcompany->nom.'<br>';
+	print $fromcompany->name.'<br>';
 	print $line1.'<br>';
 	print $line2;
 	print '</font></center>'."\n";
@@ -473,6 +473,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 	$_SESSION["Payment_Amount"] = $paymentAmount;
     $_SESSION["currencyCodeType"] = $currencyCodeType;
     $_SESSION["PaymentType"] = $paymentType;
+    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR '];  // Payer ip
 
     //'---------------------------------------------------------------------------------------------------------------
     //' Make the API call to PayPal
@@ -485,7 +486,6 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     {
         $token = urldecode($resArray["TOKEN"]);
         $_SESSION['TOKEN']=$token;
-        $_SESSION['ipaddress']=$_SERVER['REMOTE_ADDR '];  // Payer ip
     }
 
     return $resArray;
diff --git a/htdocs/printipp/admin/index.html b/htdocs/printipp/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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")."<br>\n";
-
-print '<br>';
 
 if ($mode == 'config' && $user->admin)
 {
@@ -94,8 +101,11 @@ if ($mode == 'config' && $user->admin)
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="setvalue">';
 
+	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic');
 
-    print '<table class="nobordernopadding" width="100%">';
+	print $langs->trans("PrintIPPDesc")."<br><br>\n";
+    
+    print '<table class="noborder" width="100%">';
 
     $var=true;
     print '<tr class="liste_titre">';
@@ -103,8 +113,9 @@ if ($mode == 'config' && $user->admin)
     print '<td>'.$langs->trans("Value").'</td>';
     print "</tr>\n";
 
+    /*
     $var=!$var;
-    print '<tr '.$bc[$var].'><td class="fieldrequired">';
+    print '<tr '.$bc[$var].'><td>';
     print $langs->trans("PRINTIPP_ENABLED").'</td><td colspan="2" align="left">';
 
     if (! empty($conf->use_javascript_ajax))
@@ -123,7 +134,8 @@ if ($mode == 'config' && $user->admin)
          }
     }
     print '</td></tr>';
-
+	*/
+    
     $var=!$var;
     print '<tr '.$bc[$var].'><td class="fieldrequired">';
     print $langs->trans("PRINTIPP_HOST").'</td><td>';
@@ -139,13 +151,13 @@ if ($mode == 'config' && $user->admin)
     print '</td></tr>';
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td class="fieldrequired">';
+    print '<tr '.$bc[$var].'><td>';
     print $langs->trans("PRINTIPP_USER").'</td><td>';
     print '<input size="32" type="text" name="PRINTIPP_USER" value="'.$conf->global->PRINTIPP_USER.'">';
     print '</td></tr>';
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td class="fieldrequired">';
+    print '<tr '.$bc[$var].'><td>';
     print $langs->trans("PRINTIPP_PASSWORD").'</td><td>';
     print '<input size="32" type="text" name="PRINTIPP_PASSWORD" value="'.$conf->global->PRINTIPP_PASSWORD.'">';
     print '</td></tr>';
@@ -156,16 +168,22 @@ if ($mode == 'config' && $user->admin)
     //print '<td>'.$langs->trans("Value").'</td>';
     //print "</tr>\n";
 
-    print '<tr><td colspan="2" align="center"><br><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
-
     print '</table>';
 
+    dol_fiche_end();
+    
+    print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></center>';
+    
     print '</form>';
 }
 
 if ($mode == 'test' && $user->admin)
 {
-    print '<table class="nobordernopadding" width="100%">';
+	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic');
+
+	print $langs->trans("PrintIPPDesc")."<br><br>\n";
+	
+	print '<table class="nobordernopadding" width="100%">';
     $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 '<table width="100%" class="noborder">';
@@ -180,6 +198,7 @@ if ($mode == 'test' && $user->admin)
     //print '<td>Device</td>';
     print '<td>Media</td>';
     print '<td>Supported</td>';
+    print '<td>'.$langs->trans("Select").'</td>';
     print "</tr>\n";
 
     $list = $printer->getlist_available_printers();
@@ -200,14 +219,26 @@ if ($mode == 'test' && $user->admin)
         //print '<td>'.$printer_det->device_uri->_value0.'</td>';
         print '<td>'.$printer_det->media_default->_value0.'</td>';
         print '<td>'.$printer_det->media_type_supported->_value1.'</td>';
+        // Defaut
+        print "<td align=\"center\">";
+        if ($conf->global->PRINTIPP_URI_DEFAULT == "$value")
+        {
+        	print img_picto($langs->trans("Default"),'on');
+        }
+        else
+        {
+        	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setprinteruri&mode=test&value='.urlencode($value).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+        }
+        print '</td>';
         print "</tr>\n";
     }
     print '</table>';
 
     if (count($list) == 0) print $langs->trans("NoPrinterFound");
+
+	dol_fiche_end();
 }
 
-dol_fiche_end();
 
 
 llxFooter();
diff --git a/htdocs/printipp/lib/index.html b/htdocs/printipp/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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/index.html b/htdocs/product/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index ca77dabe8c4..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');
 }
 
@@ -91,12 +91,12 @@ if ($action == 'setModuleOptions')
 	if (! $error)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -125,7 +125,7 @@ if ($action == 'pricingrule')
 			else
 			{
 				$multirule=explode('&',$princingrules);
-				foreach($multirule as $rulesselected) 
+				foreach($multirule as $rulesselected)
 				{
 					$res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity);
 				}
@@ -137,8 +137,8 @@ if ($action == 'pricingrule')
 				$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);
 			}
 		}
-		
-	}	
+
+	}
 }
 else if ($action == 'sousproduits')
 {
@@ -178,11 +178,11 @@ if($action)
 
  	if (! $error)
     {
-        $mesg = '<font class="ok">'.$langs->trans("SetupSaved").'</font>';
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
-        $mesg = '<font class="error">'.$langs->trans("Error").'</font>';
+	    setEventMessage($langs->trans("Error"), 'errors');
     }
 }
 
@@ -262,7 +262,7 @@ foreach ($dirproduct as $dirroot)
 
     			$var = !$var;
     			print '<tr '.$bc[$var].'>'."\n";
-    			print '<td width="140">'.$modCodeProduct->nom.'</td>'."\n";
+    			print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
     			print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
     			print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
 
@@ -505,14 +505,13 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 	}
 	else
 	{
+		//TODO: Translate
 		print "<tr><td><b>ERROR</b>: $dir is not a directory !</td></tr>\n";
 	}
 
 	print '</table>';
 }
 
-dol_htmloutput_mesg($mesg);
-
 llxFooter();
 
 $db->close();
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index fd31abaa80e..ed4ac4d2921 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -37,7 +37,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -89,8 +89,6 @@ dol_fiche_head($head, 'attributes', $tab, 0, 'product');
 print $langs->trans('DefineHereComplementaryAttributes', $tab).'<br>'."\n";
 print '<br>';
 
-dol_htmloutput_errors($mesg);
-
 // Load attribute_label
 $extrafields->fetch_name_optionals_label($elementtype);
 
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 '</table>';
-	print '</div>';
 
 	// Boutons actions
-	print '<div class="tabsAction">';
+	print '<div class="center">';
 	print '<input type="submit" id="convert_vatrate" name="convert_vatrate" value="'.$langs->trans("MassConvert").'" class="button" />';
 	print '</div>';
 
diff --git a/htdocs/product/ajax/index.html b/htdocs/product/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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/canvas/index.html b/htdocs/product/canvas/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/canvas/index.php b/htdocs/product/canvas/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/product/canvas/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/product/index.html b/htdocs/product/canvas/product/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/canvas/product/index.php b/htdocs/product/canvas/product/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/product/canvas/product/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/product/tpl/index.html b/htdocs/product/canvas/product/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/canvas/product/tpl/index.php b/htdocs/product/canvas/product/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/product/canvas/product/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/service/index.html b/htdocs/product/canvas/service/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/canvas/service/index.php b/htdocs/product/canvas/service/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/product/canvas/service/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/product/canvas/service/tpl/index.html b/htdocs/product/canvas/service/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/canvas/service/tpl/index.php b/htdocs/product/canvas/service/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/product/canvas/service/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
new file mode 100644
index 00000000000..a4c4e4ee92e
--- /dev/null
+++ b/htdocs/product/card.php
@@ -0,0 +1,1806 @@
+<?php
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
+ * Copyright (C) 2006		Auguria SARL			<info@auguria.org>
+ * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013-2014	Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2011-2014	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014		Cédric Gross			<c.gross@kreiz-it.fr>
+ * Copyright (C) 2014		Ferran Marcet			<fmarcet@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/product/card.php
+ *  \ingroup    product
+ *  \brief      Page to show product
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (! empty($conf->facture->enabled))  require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+$langs->load("products");
+$langs->load("other");
+if (! empty($conf->stock->enabled)) $langs->load("stocks");
+if (! empty($conf->facture->enabled)) $langs->load("bills");
+if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
+
+$mesg=''; $error=0; $errors=array(); $_error=0;
+
+$id=GETPOST('id', 'int');
+$ref=GETPOST('ref', 'alpha');
+$type=GETPOST('type','int');
+$action=(GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view');
+$confirm=GETPOST('confirm','alpha');
+$socid=GETPOST('socid','int');
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+
+$object = new Product($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+if ($id > 0 || ! empty($ref))
+{
+	$object = new Product($db);
+	$object->fetch($id, $ref);
+}
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$canvas = !empty($object->canvas)?$object->canvas:GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+    $objcanvas = new Canvas($db,$action);
+    $objcanvas->getCanvas('product','card',$canvas);
+}
+
+// Security check
+$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
+$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
+$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('productcard','globalcard'));
+
+
+
+/*
+ * Actions
+ */
+
+$createbarcode=empty($conf->barcode->enabled)?0:1;
+if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) $createbarcode=0;
+
+$parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Type
+    if ($action ==	'setfk_product_type' && $user->rights->produit->creer)
+    {
+    	$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'));
+    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+    	exit;
+    }
+
+    // Barcode type
+    if ($action ==	'setfk_barcode_type' && $createbarcode)
+    {
+        $result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'));
+    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+    	exit;
+    }
+
+    // Barcode value
+    if ($action ==	'setbarcode' && $createbarcode)
+    {
+    	$result=$object->check_barcode(GETPOST('barcode'),GETPOST('barcode_type_code'));
+
+		if ($result >= 0)
+		{
+	    	$result = $object->setValueFrom('barcode', GETPOST('barcode'));
+	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+	    	exit;
+		}
+		else
+		{
+			$langs->load("errors");
+        	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
+        	else if ($result == -2) $errors[] = 'ErrorBarCodeRequired';
+        	else if ($result == -3) $errors[] = 'ErrorBarCodeAlreadyUsed';
+        	else $errors[] = 'FailedToValidateBarCode';
+
+			$error++;
+			setEventMessage($errors,'errors');
+		}
+    }
+
+    if ($action == 'setaccountancy_code_buy') {
+
+	    $result = $object->setAccountancyCode('buy', GETPOST('accountancy_code_buy'));
+        if ($result < 0) setEventMessage(join(',',$object->errors), 'errors');
+        $action="";
+    }
+
+    if ($action == 'setaccountancy_code_sell')
+    {
+	    $result = $object->setAccountancyCode('sell', GETPOST('accountancy_code_sell'));
+	    if ($result < 0) setEventMessage(join(',',$object->errors), 'errors');
+	    $action="";
+    }
+
+    // Add a product or service
+    if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
+    {
+        $error=0;
+
+        if (! GETPOST('libelle'))
+        {
+            setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), 'errors');
+            $action = "create";
+            $error++;
+        }
+        if (empty($ref))
+        {
+            setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Ref')), 'errors');
+            $action = "create";
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $object->ref                   = $ref;
+            $object->libelle               = GETPOST('libelle');
+            $object->price_base_type       = GETPOST('price_base_type');
+
+            if ($object->price_base_type == 'TTC')
+            	$object->price_ttc = GETPOST('price');
+            else
+            	$object->price = GETPOST('price');
+            if ($object->price_base_type == 'TTC')
+            	$object->price_min_ttc = GETPOST('price_min');
+            else
+            	$object->price_min = GETPOST('price_min');
+
+            $object->tva_tx                = str_replace('*','',GETPOST('tva_tx'));
+            $object->tva_npr               = preg_match('/\*/',GETPOST('tva_tx'))?1:0;
+
+            // local taxes.
+            $object->localtax1_tx 			   = get_localtax($object->tva_tx,1);
+            $object->localtax2_tx 			   = get_localtax($object->tva_tx,2);
+
+            $object->type               	 = $type;
+            $object->status             	 = GETPOST('statut');
+            $object->status_buy            = GETPOST('statut_buy');
+			$object->status_batch          	= GETPOST('status_batch');
+
+            $object->barcode_type          = GETPOST('fk_barcode_type');
+            $object->barcode		           = GETPOST('barcode');
+            // Set barcode_type_xxx from barcode_type id
+            $stdobject=new GenericObject($db);
+    	    $stdobject->element='product';
+            $stdobject->barcode_type=GETPOST('fk_barcode_type');
+            $result=$stdobject->fetch_barcode();
+            if ($result < 0)
+            {
+            	$error++;
+            	setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
+            }
+            $object->barcode_type_code      = $stdobject->barcode_type_code;
+            $object->barcode_type_coder     = $stdobject->barcode_type_coder;
+            $object->barcode_type_label     = $stdobject->barcode_type_label;
+
+            $object->description        	 = dol_htmlcleanlastbr(GETPOST('desc'));
+            $object->url					= GETPOST('url');
+            $object->note               	 = dol_htmlcleanlastbr(GETPOST('note'));
+            $object->customcode            = GETPOST('customcode');
+            $object->country_id            = GETPOST('country_id');
+            $object->duration_value     	 = GETPOST('duration_value');
+            $object->duration_unit      	 = GETPOST('duration_unit');
+            $object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0;
+            $object->desiredstock          = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
+            $object->canvas             	 = GETPOST('canvas');
+            $object->weight             	 = GETPOST('weight');
+            $object->weight_units       	 = GETPOST('weight_units');
+            $object->length             	 = GETPOST('size');
+            $object->length_units       	 = GETPOST('size_units');
+            $object->surface            	 = GETPOST('surface');
+            $object->surface_units      	 = GETPOST('surface_units');
+            $object->volume             	 = GETPOST('volume');
+            $object->volume_units       	 = GETPOST('volume_units');
+            $object->finished           	 = GETPOST('finished');
+            $object->hidden             	 = GETPOST('hidden')=='yes'?1:0;
+            $object->accountancy_code_sell = GETPOST('accountancy_code_sell');
+            $object->accountancy_code_buy  = GETPOST('accountancy_code_buy');
+
+            // MultiPrix
+            if (! empty($conf->global->PRODUIT_MULTIPRICES))
+            {
+                for($i=2;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++)
+                {
+                    if (isset($_POST["price_".$i]))
+                    {
+                        $object->multiprices["$i"] = price2num($_POST["price_".$i],'MU');
+                        $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
+                    }
+                    else
+                    {
+                        $object->multiprices["$i"] = "";
+                    }
+                }
+            }
+
+            // Fill array 'array_options' with data from add form
+        	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+            $id = $object->create($user);
+
+            if ($id > 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+                exit;
+            }
+            else
+			{
+            	if (count($object->errors)) setEventMessage($object->errors, 'errors');
+				else setEventMessage($langs->trans($object->error), 'errors');
+                $action = "create";
+            }
+        }
+    }
+
+    // Update a product or service
+    if ($action == 'update' && ($user->rights->produit->creer || $user->rights->service->creer))
+    {
+    	if (GETPOST('cancel'))
+        {
+            $action = '';
+        }
+        else
+        {
+            if ($object->id > 0)
+            {
+            	$object->oldcopy=dol_clone($object);
+
+                $object->ref                    = $ref;
+                $object->libelle                = GETPOST('libelle');
+                $object->description            = dol_htmlcleanlastbr(GETPOST('desc'));
+            	$object->url					= GETPOST('url');
+                $object->note                   = dol_htmlcleanlastbr(GETPOST('note'));
+                $object->customcode             = GETPOST('customcode');
+                $object->country_id             = GETPOST('country_id');
+                $object->status                 = GETPOST('statut');
+                $object->status_buy             = GETPOST('statut_buy');
+                $object->status_batch	        = GETPOST('status_batch');
+                $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
+                $object->desiredstock           = GETPOST('desiredstock');
+                $object->duration_value         = GETPOST('duration_value');
+                $object->duration_unit          = GETPOST('duration_unit');
+                $object->canvas                 = GETPOST('canvas');
+                $object->weight                 = GETPOST('weight');
+                $object->weight_units           = GETPOST('weight_units');
+                $object->length                 = GETPOST('size');
+                $object->length_units           = GETPOST('size_units');
+                $object->surface                = GETPOST('surface');
+                $object->surface_units          = GETPOST('surface_units');
+                $object->volume                 = GETPOST('volume');
+                $object->volume_units           = GETPOST('volume_units');
+                $object->finished               = GETPOST('finished');
+                $object->hidden                 = GETPOST('hidden')=='yes'?1:0;
+
+	            $object->barcode_type           = GETPOST('fk_barcode_type');
+    	        $object->barcode		        = GETPOST('barcode');
+    	        // Set barcode_type_xxx from barcode_type id
+    	        $stdobject=new GenericObject($db);
+    	        $stdobject->element='product';
+    	        $stdobject->barcode_type=GETPOST('fk_barcode_type');
+    	        $result=$stdobject->fetch_barcode();
+    	        if ($result < 0)
+    	        {
+    	        	$error++;
+    	        	setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
+    	        }
+    	        $object->barcode_type_code      = $stdobject->barcode_type_code;
+    	        $object->barcode_type_coder     = $stdobject->barcode_type_coder;
+    	        $object->barcode_type_label     = $stdobject->barcode_type_label;
+
+            	$object->accountancy_code_sell  = GETPOST('accountancy_code_sell');
+                $object->accountancy_code_buy   = GETPOST('accountancy_code_buy');
+
+                // Fill array 'array_options' with data from add form
+        		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+                if ($object->check())
+                {
+                    if ($object->update($object->id, $user) > 0)
+                    {
+                        $action = 'view';
+                    }
+                    else
+					{
+						if (count($object->errors)) setEventMessage($object->errors, 'errors');
+                    	else setEventMessage($langs->trans($object->error), 'errors');
+                        $action = 'edit';
+                    }
+                }
+                else
+				{
+					if (count($object->errors)) setEventMessage($object->errors, 'errors');
+                	else setEventMessage($langs->trans("ErrorProductBadRefOrLabel"), 'errors');
+                    $action = 'edit';
+                }
+            }
+
+        }
+    }
+
+    // Action clone object
+    if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
+    if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit->creer || $user->rights->service->creer))
+    {
+        if (! GETPOST('clone_content') && ! GETPOST('clone_prices') )
+        {
+        	setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+        }
+        else
+        {
+            $db->begin();
+
+            $originalId = $id;
+            if ($object->id > 0)
+            {
+                $object->ref = GETPOST('clone_ref');
+                $object->status = 0;
+                $object->status_buy = 0;
+                $object->id = null;
+                $object->barcode = -1;
+
+                if ($object->check())
+                {
+                    $id = $object->create($user);
+                    if ($id > 0)
+                    {
+                        if (GETPOST('clone_composition'))
+                        {
+                            $result = $object->clone_associations($originalId, $id);
+
+                            if ($result < 1)
+                            {
+                                $db->rollback();
+                                setEventMessage($langs->trans('ErrorProductClone'), 'errors');
+                                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
+                                exit;
+                            }
+                        }
+
+                        // $object->clone_fournisseurs($originalId, $id);
+
+                        $db->commit();
+                        $db->close();
+
+                        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+                        exit;
+                    }
+                    else
+                    {
+                        $id=$originalId;
+
+                        if ($object->error == 'ErrorProductAlreadyExists')
+                        {
+                            $db->rollback();
+
+                            $_error++;
+                            $action = "";
+
+                            $mesg=$langs->trans("ErrorProductAlreadyExists",$object->ref);
+                            $mesg.=' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
+                            setEventMessage($mesg, 'errors');
+                            $object->fetch($id);
+                        }
+                        else
+                        {
+                            $db->rollback();
+                            if (count($object->errors))
+                            {
+                            	setEventMessage($object->errors, 'errors');
+                            	dol_print_error($db,$object->errors);
+                            }
+                            else
+                            {
+                            	setEventMessage($langs->trans($object->error), 'errors');
+                            	dol_print_error($db,$object->error);
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                $db->rollback();
+                dol_print_error($db,$object->error);
+            }
+        }
+    }
+
+    // Delete a product
+    if ($action == 'confirm_delete' && $confirm != 'yes') { $action=''; }
+    if ($action == 'confirm_delete' && $confirm == 'yes')
+    {
+        if (($object->type == 0 && $user->rights->produit->supprimer) || ($object->type == 1 && $user->rights->service->supprimer))
+        {
+            $result = $object->delete($object->id);
+        }
+
+        if ($result > 0)
+        {
+            header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
+            exit;
+        }
+        else
+        {
+        	setEventMessage($langs->trans($object->error), 'errors');
+            $reload = 0;
+            $action='';
+        }
+    }
+
+
+    // Add product into proposal
+    if ($object->id > 0 && $action == 'addinpropal')
+    {
+        $propal = new Propal($db);
+        $result=$propal->fetch(GETPOST('propalid'));
+        if ($result <= 0)
+        {
+            dol_print_error($db,$propal->error);
+            exit;
+        }
+
+        $soc = new Societe($db);
+        $result=$soc->fetch($propal->socid);
+        if ($result <= 0)
+        {
+            dol_print_error($db,$soc->error);
+            exit;
+        }
+
+        $desc = $object->description;
+
+        $tva_tx = get_default_tva($mysoc, $soc, $object->id);
+        $localtax1_tx= get_localtax($tva_tx, 1, $soc);
+        $localtax2_tx= get_localtax($tva_tx, 2, $soc);
+
+        $pu_ht = $object->price;
+        $pu_ttc = $object->price_ttc;
+        $price_base_type = $object->price_base_type;
+
+        // If multiprice
+        if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
+        {
+            $pu_ht = $object->multiprices[$soc->price_level];
+            $pu_ttc = $object->multiprices_ttc[$soc->price_level];
+            $price_base_type = $object->multiprices_base_type[$soc->price_level];
+        }
+   		elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+		{
+			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+			$prodcustprice = new Productcustomerprice($db);
+
+			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $soc->id);
+
+			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+			if ($result) {
+				if (count($prodcustprice->lines) > 0) {
+					$pu_ht = price($prodcustprice->lines [0]->price);
+					$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+					$price_base_type = $prodcustprice->lines [0]->price_base_type;
+					$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+				}
+			}
+		}
+
+        // On reevalue prix selon taux tva car taux tva transaction peut etre different
+        // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+        if ($tva_tx != $object->tva_tx)
+        {
+            if ($price_base_type != 'HT')
+            {
+                $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
+            }
+            else
+            {
+                $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
+            }
+        }
+
+        $result = $propal->addline(
+            $desc,
+            $pu_ht,
+            GETPOST('qty'),
+            $tva_tx,
+            $localtax1_tx, // localtax1
+            $localtax2_tx, // localtax2
+            $object->id,
+            GETPOST('remise_percent'),
+            $price_base_type,
+            $pu_ttc
+        );
+        if ($result > 0)
+        {
+            header("Location: ".DOL_URL_ROOT."/comm/propal.php?id=".$propal->id);
+            return;
+        }
+
+        setEventMessage($langs->trans("ErrorUnknown").": $result", 'errors');
+    }
+
+    // Add product into order
+    if ($object->id > 0 && $action == 'addincommande')
+    {
+        $commande = new Commande($db);
+        $result=$commande->fetch(GETPOST('commandeid'));
+        if ($result <= 0)
+        {
+            dol_print_error($db,$commande->error);
+            exit;
+        }
+
+        $soc = new Societe($db);
+        $result=$soc->fetch($commande->socid);
+        if ($result <= 0)
+        {
+            dol_print_error($db,$soc->error);
+            exit;
+        }
+
+        $desc = $object->description;
+
+        $tva_tx = get_default_tva($mysoc, $soc, $object->id);
+        $localtax1_tx= get_localtax($tva_tx, 1, $soc);
+        $localtax2_tx= get_localtax($tva_tx, 2, $soc);
+
+
+        $pu_ht = $object->price;
+        $pu_ttc = $object->price_ttc;
+        $price_base_type = $object->price_base_type;
+
+        // If multiprice
+        if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
+        {
+            $pu_ht = $object->multiprices[$soc->price_level];
+            $pu_ttc = $object->multiprices_ttc[$soc->price_level];
+            $price_base_type = $object->multiprices_base_type[$soc->price_level];
+        }
+    	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+		{
+			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+			$prodcustprice = new Productcustomerprice($db);
+
+			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $soc->id);
+
+			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+			if ($result) {
+				if (count($prodcustprice->lines) > 0) {
+					$pu_ht = price($prodcustprice->lines [0]->price);
+					$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+					$price_base_type = $prodcustprice->lines [0]->price_base_type;
+					$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+				}
+			}
+		}
+        // On reevalue prix selon taux tva car taux tva transaction peut etre different
+        // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+        if ($tva_tx != $object->tva_tx)
+        {
+            if ($price_base_type != 'HT')
+            {
+                $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
+            }
+            else
+            {
+                $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
+            }
+        }
+
+        $result =  $commande->addline(
+            $desc,
+            $pu_ht,
+            GETPOST('qty'),
+            $tva_tx,
+            $localtax1_tx, // localtax1
+            $localtax2_tx, // localtax2
+            $object->id,
+            GETPOST('remise_percent'),
+            '',
+            '',
+            $price_base_type,
+            $pu_ttc
+        );
+
+        if ($result > 0)
+        {
+            header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".$commande->id);
+            exit;
+        }
+    }
+
+    // Add product into invoice
+    if ($object->id > 0 && $action == 'addinfacture' && $user->rights->facture->creer)
+    {
+        $facture = New Facture($db);
+        $result=$facture->fetch(GETPOST('factureid'));
+        if ($result <= 0)
+        {
+            dol_print_error($db,$facture->error);
+            exit;
+        }
+
+        $soc = new Societe($db);
+        $soc->fetch($facture->socid);
+        if ($result <= 0)
+        {
+            dol_print_error($db,$soc->error);
+            exit;
+        }
+
+        $desc = $object->description;
+
+        $tva_tx = get_default_tva($mysoc, $soc, $object->id);
+        $localtax1_tx= get_localtax($tva_tx, 1, $soc);
+        $localtax2_tx= get_localtax($tva_tx, 2, $soc);
+
+        $pu_ht = $object->price;
+        $pu_ttc = $object->price_ttc;
+        $price_base_type = $object->price_base_type;
+
+        // If multiprice
+        if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
+        {
+            $pu_ht = $object->multiprices[$soc->price_level];
+            $pu_ttc = $object->multiprices_ttc[$soc->price_level];
+            $price_base_type = $object->multiprices_base_type[$soc->price_level];
+        }
+    	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+		{
+			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+			$prodcustprice = new Productcustomerprice($db);
+
+			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $soc->id);
+
+			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+			if ($result) {
+				if (count($prodcustprice->lines) > 0) {
+					$pu_ht = price($prodcustprice->lines [0]->price);
+					$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
+					$price_base_type = $prodcustprice->lines [0]->price_base_type;
+					$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
+				}
+			}
+		}
+        // On reevalue prix selon taux tva car taux tva transaction peut etre different
+        // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+        if ($tva_tx != $object->tva_tx)
+        {
+            if ($price_base_type != 'HT')
+            {
+                $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
+            }
+            else
+            {
+                $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
+            }
+        }
+
+        $result = $facture->addline(
+            $desc,
+            $pu_ht,
+            GETPOST('qty'),
+            $tva_tx,
+            $localtax1_tx,
+            $localtax2_tx,
+            $object->id,
+            GETPOST('remise_percent'),
+            '',
+            '',
+            '',
+            '',
+            '',
+            $price_base_type,
+            $pu_ttc
+        );
+
+        if ($result > 0)
+        {
+            header("Location: ".DOL_URL_ROOT."/compta/facture.php?facid=".$facture->id);
+            exit;
+        }
+    }
+}
+
+if (GETPOST("cancel") == $langs->trans("Cancel"))
+{
+    $action = '';
+    header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+    exit;
+}
+
+
+/*
+ * View
+ */
+
+$helpurl='';
+if (GETPOST("type") == '0' || ($object->type == '0')) $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+if (GETPOST("type") == '1' || ($object->type == '1')) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+
+if (isset($_GET['type'])) $title = $langs->trans('CardProduct'.GETPOST('type'));
+else $title = $langs->trans('ProductServiceCard');
+
+llxHeader('', $title, $helpurl);
+
+$form = new Form($db);
+$formproduct = new FormProduct($db);
+
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
+	if (empty($object->error) && $id)
+	{
+		$object = new Product($db);
+		$result=$object->fetch($id);
+		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
+}
+else
+{
+    // -----------------------------------------
+    // When used in standard mode
+    // -----------------------------------------
+    if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer))
+    {
+        //WYSIWYG Editor
+        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
+		// Load object modCodeProduct
+        $module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
+        if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
+        {
+            $module = substr($module, 0, dol_strlen($module)-4);
+        }
+        $result=dol_include_once('/core/modules/product/'.$module.'.php');
+        if ($result > 0)
+        {
+        	$modCodeProduct = new $module();
+        }
+
+		// Load object modBarCodeProduct
+		if (! empty($conf->barcode->enabled) && ! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
+		{
+			$module=strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
+        	$result=dol_include_once('/core/modules/barcode/'.$module.'.php');
+        	if ($result > 0)
+        	{
+				$modBarCodeProduct =new $module();
+        	}
+		}
+
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="add">';
+        print '<input type="hidden" name="type" value="'.$type.'">'."\n";
+		if (! empty($modCodeProduct->code_auto))
+			print '<input type="hidden" name="code_auto" value="1">';
+		if (! empty($modBarCodeProduct->code_auto))
+			print '<input type="hidden" name="barcode_auto" value="1">';
+
+        if ($type==1) $title=$langs->trans("NewService");
+        else $title=$langs->trans("NewProduct");
+        print_fiche_titre($title);
+
+        print '<table class="border" width="100%">';
+        print '<tr>';
+        $tmpcode='';
+		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
+        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="32" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
+        if ($_error)
+        {
+            print $langs->trans("RefAlreadyExists");
+        }
+        print '</td></tr>';
+
+        // Label
+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag(GETPOST('libelle')).'"></td></tr>';
+
+        // On sell
+        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
+        $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+        print $form->selectarray('statut',$statutarray,GETPOST('statut'));
+        print '</td></tr>';
+
+        // To buy
+        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
+        $statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+        print $form->selectarray('statut_buy',$statutarray,GETPOST('statut_buy'));
+        print '</td></tr>';
+
+	    // Batch number management
+		if (! empty($conf->productbatch->enabled))
+		{
+			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
+			$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
+			print $form->selectarray('status_batch',$statutarray,GETPOST('status_batch'));
+			print '</td></tr>';
+		}
+
+        $showbarcode=empty($conf->barcode->enabled)?0:1;
+        if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+
+        if ($showbarcode)
+        {
+ 	        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
+ 	        if (isset($_POST['fk_barcode_type']))
+	        {
+	         	$fk_barcode_type=GETPOST('fk_barcode_type');
+	        }
+	        else
+	        {
+	        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+	        }
+	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+            $formbarcode = new FormBarCode($db);
+	        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
+	        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
+	        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
+	        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+	        print '<input size="40" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
+	        print '</td></tr>';
+        }
+
+        // Description (used in invoice, propal...)
+        print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+
+        $doleditor = new DolEditor('desc', GETPOST('desc'), '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
+        $doleditor->Create();
+
+        print "</td></tr>";
+
+        // Public URL
+        print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+		print '<input type="text" name="url" size="90" value="'.GETPOST('url').'">';
+        print '</td></tr>';
+
+        // Stock min level
+        if ($type != 1 && ! empty($conf->stock->enabled))
+        {
+            print '<tr><td>'.$langs->trans("StockLimit").'</td><td>';
+            print '<input name="seuil_stock_alerte" size="4" value="'.GETPOST('seuil_stock_alerte').'">';
+            print '</td>';
+            // Stock desired level
+            print '<td>'.$langs->trans("DesiredStock").'</td><td>';
+            print '<input name="desiredstock" size="4" value="'.GETPOST('desiredstock').'">';
+            print '</td></tr>';
+        }
+        else
+        {
+            print '<input name="seuil_stock_alerte" type="hidden" value="0">';
+            print '<input name="desiredstock" type="hidden" value="0">';
+        }
+
+        // Nature
+        if ($type != 1)
+        {
+            print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
+            $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+            print $form->selectarray('finished',$statutarray,GETPOST('finished'),1);
+            print '</td></tr>';
+        }
+
+        // Duration
+        if ($type == 1)
+        {
+            print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="'.GETPOST('duration_value').'"> &nbsp;';
+            print '<input name="duration_unit" type="radio" value="h">'.$langs->trans("Hour").'&nbsp;';
+            print '<input name="duration_unit" type="radio" value="d">'.$langs->trans("Day").'&nbsp;';
+            print '<input name="duration_unit" type="radio" value="w">'.$langs->trans("Week").'&nbsp;';
+            print '<input name="duration_unit" type="radio" value="m">'.$langs->trans("Month").'&nbsp;';
+            print '<input name="duration_unit" type="radio" value="y">'.$langs->trans("Year").'&nbsp;';
+            print '</td></tr>';
+        }
+
+        if ($type != 1)	// Le poids et le volume ne concerne que les produits et pas les services
+        {
+            // Weight
+            print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+            print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
+            print $formproduct->select_measuring_units("weight_units","weight");
+            print '</td></tr>';
+            // Length
+            print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
+            print '<input name="size" size="4" value="'.GETPOST('size').'">';
+            print $formproduct->select_measuring_units("size_units","size");
+            print '</td></tr>';
+            // Surface
+            print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+            print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
+            print $formproduct->select_measuring_units("surface_units","surface");
+            print '</td></tr>';
+            // Volume
+            print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+            print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
+            print $formproduct->select_measuring_units("volume_units","volume");
+            print '</td></tr>';
+        }
+
+        // Custom code
+        if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+        {
+	        print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" size="10" value="'.GETPOST('customcode').'"></td>';
+	        // Origin country
+	        print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
+	        print $form->select_country(GETPOST('country_id','int'),'country_id');
+	        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	        print '</td></tr>';
+        }
+
+        // Other attributes
+        $parameters=array('colspan' => 3);
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        {
+        	print $object->showOptionals($extrafields,'edit',$parameters);
+        }
+
+        // Note (private, no output on invoices, propales...)
+        print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+
+        // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
+        $doleditor = new DolEditor('note', GETPOST('note'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 8, 70);
+        $doleditor->Create();
+
+        print "</td></tr>";
+        print '</table>';
+
+        print '<br>';
+
+        if (! empty($conf->global->PRODUIT_MULTIPRICES))
+        {
+            // We do no show price array on create when multiprices enabled.
+            // We must set them on prices tab.
+        }
+        else
+		{
+            print '<table class="border" width="100%">';
+
+            // PRIX
+            print '<tr><td>'.$langs->trans("SellingPrice").'</td>';
+            print '<td><input name="price" size="10" value="'.$object->price.'">';
+            print $form->select_PriceBaseType($object->price_base_type, "price_base_type");
+            print '</td></tr>';
+
+            // MIN PRICE
+            print '<tr><td>'.$langs->trans("MinPrice").'</td>';
+            print '<td><input name="price_min" size="10" value="'.$object->price_min.'">';
+            print '</td></tr>';
+
+            // VAT
+            print '<tr><td width="20%">'.$langs->trans("VATRate").'</td><td>';
+            print $form->load_tva("tva_tx",-1,$mysoc,'');
+            print '</td></tr>';
+
+            print '</table>';
+
+            print '<br>';
+        }
+
+        /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
+        {
+            // Don't show accounting field when accounting id disabled.
+        }
+        else
+        {*/
+            print '<table class="border" width="100%">';
+
+            // Accountancy_code_sell
+            print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
+            print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">';
+            print '</td></tr>';
+
+            // Accountancy_code_buy
+            print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+            print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">';
+            print '</td></tr>';
+
+            print '</table>';
+
+            print '<br>';
+        //}
+
+        print '<center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+
+        print '</form>';
+    }
+
+    /*
+     * Product card
+     */
+
+    else if ($object->id > 0)
+    {
+        // Fiche en mode edition
+        if ($action == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer))
+        {
+            //WYSIWYG Editor
+            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
+            $type = $langs->trans('Product');
+            if ($object->isservice()) $type = $langs->trans('Service');
+            print_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
+
+            // Main official, simple, and not duplicated code
+            print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="id" value="'.$object->id.'">';
+            print '<input type="hidden" name="canvas" value="'.$object->canvas.'">';
+            print '<table class="border allwidth">';
+
+            // Ref
+            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="32" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
+
+            // Label
+            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';
+
+            // Status To sell
+            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
+            print '<select class="flat" name="statut">';
+            if ($object->status)
+            {
+                print '<option value="1" selected="selected">'.$langs->trans("OnSell").'</option>';
+                print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
+            }
+            else
+            {
+                print '<option value="1">'.$langs->trans("OnSell").'</option>';
+                print '<option value="0" selected="selected">'.$langs->trans("NotOnSell").'</option>';
+            }
+            print '</select>';
+            print '</td></tr>';
+
+            // Status To Buy
+            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
+            print '<select class="flat" name="statut_buy">';
+            if ($object->status_buy)
+            {
+                print '<option value="1" selected="selected">'.$langs->trans("ProductStatusOnBuy").'</option>';
+                print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
+            }
+            else
+            {
+                print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
+                print '<option value="0" selected="selected">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
+            }
+            print '</select>';
+            print '</td></tr>';
+
+			// Batch number managment
+			if ($conf->productbatch->enabled) {
+				print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
+				$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
+				print $form->selectarray('status_batch',$statutarray,$object->status_batch);
+				print '</td></tr>';
+			}
+
+            // Barcode
+            $showbarcode=empty($conf->barcode->enabled)?0:1;
+            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+
+	        if ($showbarcode)
+	        {
+		        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
+		        if (isset($_POST['fk_barcode_type']))
+		        {
+		         	$fk_barcode_type=GETPOST('fk_barcode_type');
+		        }
+		        else
+		        {
+	        		$fk_barcode_type=$object->barcode_type;
+		        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		        }
+		        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+	            $formbarcode = new FormBarCode($db);
+		        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
+		        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
+		        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
+		        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
+		        print '<input size="40" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
+		        print '</td></tr>';
+	        }
+
+            // Description (used in invoice, propal...)
+            print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+
+            // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
+            $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
+            $doleditor->Create();
+
+            print "</td></tr>";
+            print "\n";
+
+            // Public Url
+            print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+			print '<input type="text" name="url" size="80" value="'.$object->url.'">';
+            print '</td></tr>';
+
+            // Stock
+            if ($object->isproduct() && ! empty($conf->stock->enabled))
+            {
+                print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
+                print '<input name="seuil_stock_alerte" size="4" value="'.$object->seuil_stock_alerte.'">';
+                print '</td>';
+
+                print '<td>'.$langs->trans("DesiredStock").'</td><td>';
+                print '<input name="desiredstock" size="4" value="'.$object->desiredstock.'">';
+                print '</td></tr>';
+            }
+            else
+            {
+                print '<input name="seuil_stock_alerte" type="hidden" value="'.$object->seuil_stock_alerte.'">';
+                print '<input name="desiredstock" type="hidden" value="'.$object->desiredstock.'">';
+            }
+
+            // Nature
+            if($object->type!=1)
+            {
+                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
+                $statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+                print $form->selectarray('finished',$statutarray,$object->finished);
+                print '</td></tr>';
+            }
+
+            if ($object->isservice())
+            {
+                // Duration
+                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';
+                print '&nbsp; ';
+                print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit=='h'?' checked':'').'>'.$langs->trans("Hour");
+                print '&nbsp; ';
+                print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit=='d'?' checked':'').'>'.$langs->trans("Day");
+                print '&nbsp; ';
+                print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit=='w'?' checked':'').'>'.$langs->trans("Week");
+                print '&nbsp; ';
+                print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit=='m'?' checked':'').'>'.$langs->trans("Month");
+                print '&nbsp; ';
+                print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit=='y'?' checked':'').'>'.$langs->trans("Year");
+
+                print '</td></tr>';
+            }
+            else
+            {
+                // Weight
+                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+                print '<input name="weight" size="5" value="'.$object->weight.'"> ';
+                print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
+                print '</td></tr>';
+                // Length
+                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
+                print '<input name="size" size="5" value="'.$object->length.'"> ';
+                print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
+                print '</td></tr>';
+                // Surface
+                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+                print '<input name="surface" size="5" value="'.$object->surface.'"> ';
+                print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
+                print '</td></tr>';
+                // Volume
+                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+                print '<input name="volume" size="5" value="'.$object->volume.'"> ';
+                print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);
+                print '</td></tr>';
+            }
+
+	        // Custom code
+    	    if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+        	{
+	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" size="10" value="'.$object->customcode.'"></td>';
+	            // Origin country
+	            print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
+	            print $form->select_country($object->country_id,'country_id');
+	            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	            print '</td></tr>';
+        	}
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="2"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	print $object->showOptionals($extrafields,'edit');
+            }
+
+            // Note
+            print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+
+            $doleditor = new DolEditor('note', $object->note, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
+            $doleditor->Create();
+
+            print "</td></tr>";
+            print '</table>';
+
+            print '<br>';
+
+            /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
+            {
+                // Don't show accounting field when accounting id disabled.
+            }
+            else
+            {*/
+                print '<table class="border" width="100%">';
+
+                // Accountancy_code_sell
+                print '<tr><td width="20%">'.$langs->trans("ProductAccountancySellCode").'</td>';
+                print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">';
+                print '</td></tr>';
+
+                // Accountancy_code_buy
+                print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+                print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">';
+                print '</td></tr>';
+
+                print '</table>';
+
+                print '<br>';
+            //}
+
+            print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; ';
+            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+
+            print '</form>';
+        }
+        // Fiche en mode visu
+        else
+		{
+            $head=product_prepare_head($object, $user);
+            $titre=$langs->trans("CardProduct".$object->type);
+            $picto=($object->type==1?'service':'product');
+            dol_fiche_head($head, 'card', $titre, 0, $picto);
+
+            $showphoto=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
+            $showbarcode=empty($conf->barcode->enabled)?0:1;
+            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+
+            // En mode visu
+            print '<table class="border" width="100%"><tr>';
+
+            // Ref
+            print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">';
+            print $form->showrefnav($object,'ref','',1,'ref');
+            print '</td>';
+
+            print '</tr>';
+
+            // Label
+            print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->libelle.'</td>';
+
+            $nblignes=7;
+            if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++;
+            if ($showbarcode) $nblignes+=2;
+            if ($object->type!=1) $nblignes++;
+            if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) $nblignes+=2;
+            if ($object->isservice()) $nblignes++;
+            else $nblignes+=4;
+
+            // Photo
+            if ($showphoto || $showbarcode)
+            {
+                print '<td valign="middle" align="center" width="25%" rowspan="'.$nblignes.'">';
+				print '<div class="photolist">';
+				$maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
+				if ($conf->browser->phone) $maxvisiblephotos=1;
+                if ($showphoto)   print $object->show_photos($conf->product->multidir_output[$object->entity],1,$maxvisiblephotos,0,0,0,80);
+                if ($showphoto && $showbarcode) print '<br><br>';
+                if ($showbarcode) print $form->showbarcode($object);
+				print '</div>';
+                print '</td>';
+            }
+
+            print '</tr>';
+
+            // Type
+            if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
+            {
+            	// TODO change for compatibility with edit in place
+            	$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
+                print '<tr><td>'.$form->editfieldkey("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat).'</td><td colspan="2">';
+                print $form->editfieldval("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat);
+                print '</td></tr>';
+            }
+
+            if ($showbarcode)
+            {
+                // Barcode type
+                print '<tr><td class="nowrap">';
+                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+                print $langs->trans("BarcodeType");
+                print '<td>';
+                if (($action != 'editbarcodetype') && $user->rights->barcode->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                print '</tr></table>';
+                print '</td><td colspan="2">';
+                if ($action == 'editbarcodetype')
+                {
+                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+                    $formbarcode = new FormBarCode($db);
+                    $formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id,$object->barcode_type,'fk_barcode_type');
+                }
+                else
+                {
+                    $object->fetch_barcode();
+                    print $object->barcode_type_label?$object->barcode_type_label:($object->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':'');
+                }
+                print '</td></tr>'."\n";
+
+                // Barcode value
+                print '<tr><td class="nowrap">';
+                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+                print $langs->trans("BarcodeValue");
+                print '<td>';
+                if (($action != 'editbarcode') && $user->rights->barcode->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
+                print '</tr></table>';
+                print '</td><td colspan="2">';
+                if ($action == 'editbarcode')
+                {
+                    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    print '<input type="hidden" name="action" value="setbarcode">';
+                    print '<input type="hidden" name="barcode_type_code" value="'.$object->barcode_type_code.'">';
+                    print '<input size="40" type="text" name="barcode" value="'.$object->barcode.'">';
+                    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+                }
+                else
+                {
+                    print $object->barcode;
+                }
+                print '</td></tr>'."\n";
+            }
+
+            /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
+            {
+                // Don't show accounting field when accounting id disabled.
+            }
+            else
+            {*/
+                // Accountancy sell code
+                print '<tr><td>'.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
+                print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
+                print '</td></tr>';
+
+                // Accountancy buy code
+                print '<tr><td>'.$form->editfieldkey("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
+                print $form->editfieldval("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
+                print '</td></tr>';
+            //}
+
+            // Status (to sell)
+            print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
+            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);
+            }
+            print '</td></tr>';
+
+            // Status (to buy)
+            print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
+            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);
+            }
+            print '</td></tr>';
+
+            // Batch number management (to batch)
+            if ($conf->productbatch->enabled) {
+                print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
+                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(0,2);
+                }
+                print '</td></tr>';
+            }
+
+            // Description
+            print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';
+
+            // Public URL
+            print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="2">';
+			print dol_print_url($object->url);
+            print '</td></tr>';
+
+            // Nature
+            if($object->type!=1)
+            {
+                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="2">';
+                print $object->getLibFinished();
+                print '</td></tr>';
+            }
+
+            if ($object->isservice())
+            {
+                // Duration
+                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
+                if ($object->duration_value > 1)
+                {
+                    $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
+                }
+                else if ($object->duration_value > 0)
+                {
+                    $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
+                }
+                print (! empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
+
+                print '</td></tr>';
+            }
+            else
+            {
+                // Weight
+                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="2">';
+                if ($object->weight != '')
+                {
+                    print $object->weight." ".measuring_units_string($object->weight_units,"weight");
+                }
+                else
+                {
+                    print '&nbsp;';
+                }
+                print "</td></tr>\n";
+                // Length
+                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
+                if ($object->length != '')
+                {
+                    print $object->length." ".measuring_units_string($object->length_units,"size");
+                }
+                else
+                {
+                    print '&nbsp;';
+                }
+                print "</td></tr>\n";
+                // Surface
+                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
+                if ($object->surface != '')
+                {
+                    print $object->surface." ".measuring_units_string($object->surface_units,"surface");
+                }
+                else
+                {
+                    print '&nbsp;';
+                }
+                print "</td></tr>\n";
+                // Volume
+                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
+                if ($object->volume != '')
+                {
+                    print $object->volume." ".measuring_units_string($object->volume_units,"volume");
+                }
+                else
+                {
+                    print '&nbsp;';
+                }
+                print "</td></tr>\n";
+            }
+
+        	// Custom code
+        	if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+        	{
+	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
+
+            	// Origin country code
+            	print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id,0,$db).'</td>';
+        	}
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	print $object->showOptionals($extrafields);
+            }
+
+            // Note
+            print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>';
+
+            print "</table>\n";
+
+            dol_fiche_end();
+        }
+
+    }
+    else if ($action != 'create')
+    {
+        header("Location: index.php");
+        exit;
+    }
+}
+
+
+// Define confirmation messages
+$formquestionclone=array(
+	'text' => $langs->trans("ConfirmClone"),
+    array('type' => 'text', 'name' => 'clone_ref','label' => $langs->trans("NewRefForClone"), 'value' => $langs->trans("CopyOf").' '.$object->ref, 'size'=>24),
+    array('type' => 'checkbox', 'name' => 'clone_content','label' => $langs->trans("CloneContentProduct"), 'value' => 1),
+    array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true),
+    array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1)
+);
+
+// Confirm delete product
+if (($action == 'delete' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
+	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
+{
+    print $form->formconfirm("card.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
+}
+
+// Clone confirmation
+if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
+	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
+{
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
+}
+
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Barre d'action                                                             */
+/*                                                                            */
+/* ************************************************************************** */
+
+print "\n".'<div class="tabsAction">'."\n";
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+if (empty($reshook))
+{
+	if ($action == '' || $action == 'view')
+	{
+	    if ($user->rights->produit->creer || $user->rights->service->creer)
+	    {
+	        if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+
+	        if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
+	        {
+	            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+	            {
+	                print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
+	            }
+	            else
+				{
+	                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
+	            }
+	        }
+	    }
+	    $object_is_used = $object->isObjectUsed($object->id);
+
+	    if (($object->type == 0 && $user->rights->produit->supprimer)
+	    || ($object->type == 1 && $user->rights->service->supprimer))
+	    {
+	        if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
+	        {
+	            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+	            {
+	                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+	            }
+	            else
+				{
+	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+	            }
+	        }
+	        else
+			{
+	            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
+	        }
+	    }
+	    else
+		{
+	        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
+	    }
+	}
+}
+
+print "\n</div><br>\n";
+
+
+/*
+ * All the "Add to" areas
+ */
+
+if ($object->id && ($action == '' || $action == 'view') && $object->status)
+{
+    //Variable used to check if any text is going to be printed
+    $html = '';
+	//print '<div class="fichecenter"><div class="fichehalfleft">';
+
+    // Propals
+    if (! empty($conf->propal->enabled) && $user->rights->propale->creer)
+    {
+        $propal = new Propal($db);
+
+        $langs->load("propal");
+
+        $html .= '<tr class="liste_titre">';
+        $html .= '<td class="liste_titre">'.$langs->trans("AddToDraftProposals").'</td>';
+        $html .= '</tr><tr>';
+        $html .= '<td valign="top">';
+
+        $var=true;
+        $otherprop = $propal->liste_array(2,1,0);
+        $html .= '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+        $html .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $html .= '<table class="nobordernopadding" width="100%">';
+        if (is_array($otherprop) && count($otherprop))
+        {
+        	$var=!$var;
+        	$html .= '<tr '.$bc[$var].'><td style="width: 200px;">';
+        	$html .= '<input type="hidden" name="action" value="addinpropal">';
+        	$html .= $langs->trans("Proposals").'</td><td colspan="2">';
+        	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
+        	$html .= '</td></tr>';
+        	$html .= '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Quantity").' ';
+        	$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td><td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
+        	$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
+        	$html .= '</td><td align="right">';
+        	$html .= '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+        	$html .= '</td></tr>';
+        }
+        else
+        {
+        	$html .= "<tr ".$bc[!$var]."><td>";
+        	$html .= $langs->trans("NoDraftProposals");
+        	$html .= '</td></tr>';
+        }
+        $html .= '</table>';
+        $html .= '</form>';
+
+        $html .= '</td>';
+        $html .= '</tr>';
+    }
+
+    // Commande
+    if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
+    {
+        $commande = new Commande($db);
+
+        $langs->load("orders");
+
+        $html .= '<tr class="liste_titre">';
+        $html .= '<td class="liste_titre">'.$langs->trans("AddToDraftOrders").'</td>';
+        $html .= '</tr><tr>';
+        $html .= '<td valign="top">';
+
+        $var=true;
+        $othercom = $commande->liste_array(2, 1, null);
+        $html .= '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+        $html .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $html .= '<table class="nobordernopadding" width="100%">';
+        if (is_array($othercom) && count($othercom))
+        {
+        	$var=!$var;
+        	$html .= '<tr '.$bc[$var].'><td style="width: 200px;">';
+        	$html .= '<input type="hidden" name="action" value="addincommande">';
+        	$html .= $langs->trans("Orders").'</td><td colspan="2">';
+        	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
+        	$html .= '</td></tr>';
+        	$html .= '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Quantity").' ';
+        	$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td><td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
+        	$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
+        	$html .= '</td><td align="right">';
+        	$html .= '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+        	$html .= '</td></tr>';
+        }
+        else
+		{
+        	$html .= "<tr ".$bc[!$var]."><td>";
+        	$html .= $langs->trans("NoDraftOrders");
+        	$html .= '</td></tr>';
+        }
+        $html .= '</table>';
+        $html .= '</form>';
+
+        $html .= '</td>';
+        $html .= '</tr>';
+    }
+
+    // Factures
+    if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+    {
+    	$invoice = new Facture($db);
+
+    	$langs->load("bills");
+
+    	$html .= '<tr class="liste_titre">';
+    	$html .= '<td class="liste_titre">'.$langs->trans("AddToDraftInvoices").'</td>';
+        $html .= '</tr><tr>';
+    	$html .= '<td valign="top">';
+
+    	$var=true;
+    	$otherinvoice = $invoice->liste_array(2, 1, null);
+    	$html .= '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+    	$html .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    	$html .= '<table class="nobordernopadding" width="100%">';
+    	if (is_array($otherinvoice) && count($otherinvoice))
+    	{
+    		$var=!$var;
+    		$html .= '<tr '.$bc[$var].'><td style="width: 200px;">';
+    		$html .= '<input type="hidden" name="action" value="addinfacture">';
+    		$html .= $langs->trans("Invoice").'</td><td colspan="2">';
+    		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
+    		$html .= '</td></tr>';
+    		$html .= '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Quantity").' ';
+    		$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td><td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
+    		$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
+    		$html .= '</td><td align="right">';
+    		$html .= '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+    		$html .= '</td></tr>';
+    	}
+    	else
+    	{
+    		$html .= "<tr ".$bc[!$var]."><td>";
+    		$html .= $langs->trans("NoDraftInvoices");
+    		$html .= '</td></tr>';
+    	}
+    	$html .= '</table>';
+    	$html .= '</form>';
+
+    	$html .= '</td>';
+    	$html .= '</tr>';
+    }
+
+    //If any text is going to be printed, then we show the table
+    if (!empty($html))
+    {
+        print '<table width="100%" class="noborder">';
+        print $html;
+        print '</table>';
+        print '<br>';
+    }
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index bd302c422d9..69e999b18ea 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -76,7 +76,7 @@ class FormProduct
 		$sql.= " AND e.statut = 1";
 		$sql.= " ORDER BY e.label";
 
-		dol_syslog(get_class($this).'::loadWarehouses sql='.$sql,LOG_DEBUG);
+		dol_syslog(get_class($this).'::loadWarehouses', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/product/class/index.html b/htdocs/product/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2987d0de8fd..ba179aef616 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1,13 +1,15 @@
 <?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2007-2011 Jean Heimburger      <jean@tiaris.info>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013-2014 Cedric GROSS	        <c.gross@kreiz-it.fr>
- * Copyright (C) 2013-2014 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
+ * Copyright (C) 2007-2011	Jean Heimburger			<jean@tiaris.info>
+ * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013-2014	Cedric GROSS			<c.gross@kreiz-it.fr>
+ * Copyright (C) 2013-2014	Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2011-2014	Alexandre Spangaro		<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014		Henry Florian			<florian.henry@open-concept.pro>
+ * Copyright (C) 2014		Philippe Grand			<philippe.grand@atoo-net.com>
  *
  * 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
@@ -44,6 +46,13 @@ 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
 	var $id ;
 	//! Ref
@@ -120,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();
@@ -370,7 +379,7 @@ class Product extends CommonObject
 					$sql.= ", ".((empty($this->status_batch) || $this->status_batch < 0)? '0':$this->status_batch);
 					$sql.= ")";
 
-					dol_syslog(get_class($this)."::Create sql=".$sql);
+					dol_syslog(get_class($this)."::Create", LOG_DEBUG);
 					$result = $this->db->query($sql);
 					if ( $result )
 					{
@@ -426,12 +435,10 @@ class Product extends CommonObject
 
 			if (! $error && ! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PRODUCT_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
 			if (! $error)
@@ -661,7 +668,8 @@ class Product extends CommonObject
 			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
 			$sql.= " WHERE rowid = " . $id;
 
-			dol_syslog(get_class($this)."update sql=".$sql);
+			dol_syslog(get_class($this)."update", LOG_DEBUG);
+
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -677,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);
@@ -696,12 +706,10 @@ class Product extends CommonObject
 
 				if (! $error && ! $notrigger)
 				{
-					// Appel des triggers
-					include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					$interface=new Interfaces($this->db);
-					$result=$interface->run_triggers('PRODUCT_MODIFY',$this,$user,$langs,$conf);
-					if ($result < 0) { $error++; $this->errors=$interface->errors; }
-					// Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('PRODUCT_MODIFY',$user);
+                    if ($result < 0) { $error++; }
+                    // End call triggers
 				}
 
 				if (! $error && (is_object($this->oldcopy) && $this->oldcopy->ref != $this->ref))
@@ -795,33 +803,31 @@ class Product extends CommonObject
 
 			if (! $error)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_DELETE',$this,$user,$langs,$conf);
-				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PRODUCT_DELETE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
-			// Delete all child tables
-			$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock');
-			foreach($elements as $table)
+   			// Delete all child tables
+			if (! $error)
 			{
-				if (! $error)
-				{
-					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-					$sql.= " WHERE fk_product = ".$id;
-					dol_syslog(get_class($this).'::delete sql='.$sql, LOG_DEBUG);
-					$result = $this->db->query($sql);
-					if (! $result)
-					{
-						$error++;
-						$this->errors[] = $this->db->lasterror();
-						dol_syslog(get_class($this).'::delete error '.$this->error, LOG_ERR);
-					}
-				}
+    			$elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock');
+    			foreach($elements as $table)
+    			{
+    				if (! $error)
+    				{
+    					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+    					$sql.= " WHERE fk_product = ".$id;
+    					dol_syslog(get_class($this).'::delete', LOG_DEBUG);
+    					$result = $this->db->query($sql);
+    					if (! $result)
+    					{
+    						$error++;
+    						$this->errors[] = $this->db->lasterror();
+    					}
+    				}
+    			}
 			}
 
 			// Delete product
@@ -829,13 +835,12 @@ class Product extends CommonObject
 			{
 				$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
 				$sqlz.= " WHERE rowid = ".$id;
-				dol_syslog(get_class($this).'::delete sql='.$sqlz, LOG_DEBUG);
+				dol_syslog(get_class($this).'::delete', LOG_DEBUG);
 				$resultz = $this->db->query($sqlz);
 				if ( ! $resultz )
 				{
 					$error++;
 					$this->errors[] = $this->db->lasterror();
-					dol_syslog(get_class($this).'::delete error '.$this->error, LOG_ERR);
 				}
 			}
 
@@ -930,11 +935,10 @@ class Product extends CommonObject
 					$sql2.= "','".$this->db->escape($this->description);
 					$sql2.= "','".$this->db->escape($this->note)."')";
 				}
-				dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
+				dol_syslog(get_class($this).'::setMultiLangs');
 				if (! $this->db->query($sql2))
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
 					return -1;
 				}
 			}
@@ -958,11 +962,10 @@ class Product extends CommonObject
 
 				// on ne sauvegarde pas des champs vides
 				if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] )
-				dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
+				dol_syslog(get_class($this).'::setMultiLangs');
 				if (! $this->db->query($sql2))
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
 					return -1;
 				}
 			}
@@ -973,7 +976,7 @@ class Product extends CommonObject
 	/**
 	 *	Delete a language for this product
 	 *
-	 *  @param		string	$langtodelete		Language to delete
+	 *  @param		string	$langtodelete		Language code to delete
 	 *	@return		int							<0 if KO, >0 if OK
 	 */
 	function delMultiLangs($langtodelete)
@@ -981,7 +984,7 @@ class Product extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_lang";
 		$sql.= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
 
-		dol_syslog("Delete translation sql=".$sql);
+		dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -989,7 +992,8 @@ class Product extends CommonObject
 		}
 		else
 		{
-			$this->error="Error: ".$this->db->error()." - ".$sql;
+			$this->error=$this->db->lasterror();
+			dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -1113,7 +1117,7 @@ class Product extends CommonObject
 		$sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity;
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."_log_price sql=".$sql);
+		dol_syslog(get_class($this)."_log_price", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if(! $resql)
 		{
@@ -1140,7 +1144,7 @@ class Product extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";
 		$sql.= " WHERE rowid=".$rowid;
 
-		dol_syslog(get_class($this)."log_price_delete sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."log_price_delete", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -1176,7 +1180,7 @@ class Product extends CommonObject
 		$sql.= " WHERE pfp.rowid = ".$prodfournprice;
 		if ($qty) $sql.= " AND pfp.quantity <= ".$qty;
 
-		dol_syslog(get_class($this)."::get_buyprice sql=".$sql);
+		dol_syslog(get_class($this)."::get_buyprice", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1202,7 +1206,7 @@ class Product extends CommonObject
 				$sql.= " ORDER BY pfp.quantity DESC";
 				$sql.= " LIMIT 1";
 
-				dol_syslog(get_class($this)."::get_buyprice sql=".$sql);
+				dol_syslog(get_class($this)."::get_buyprice", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
@@ -1226,7 +1230,6 @@ class Product extends CommonObject
 				else
 				{
 					$this->error=$this->db->error();
-					dol_syslog(get_class($this)."::get_buyprice ".$this->error, LOG_ERR);
 					return -3;
 				}
 			}
@@ -1234,7 +1237,6 @@ class Product extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::get_buyprice ".$this->error, LOG_ERR);
 			return -2;
 		}
 	}
@@ -1321,6 +1323,8 @@ class Product extends CommonObject
 			if (empty($localtax1)) $localtax1=0;	// If = '' then = 0
 			if (empty($localtax2)) $localtax2=0;	// If = '' then = 0
 
+			$this->db->begin();
+
 			// Ne pas mettre de quote sur les numeriques decimaux.
 			// Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
@@ -1335,7 +1339,7 @@ class Product extends CommonObject
             $sql.= " recuperableonly='".$newnpr."'";
 			$sql.= " WHERE rowid = ".$id;
 
-			dol_syslog(get_class($this)."update_price sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."update_price", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -1357,19 +1361,21 @@ class Product extends CommonObject
 
 				$this->level = $level;				// Store level of price edited for trigger
 
-				// Appel des triggers
-				include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_PRICE_MODIFY',$this,$user,$langs,$conf);
-				if ($result < 0)
-				{
-					$error++; $this->errors=$interface->errors;
-				}
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PRODUCT_PRICE_MODIFY',$user);
+                if ($result < 0)
+                {
+                	$this->db->rollback();
+                	return -1;
+                }
+                // End call triggers
+
+                $this->db->commit();
 			}
 			else
 			{
-				dol_print_error($this->db);
+				$this->db->rollback();
+			    dol_print_error($this->db);
 			}
 		}
 
@@ -1397,7 +1403,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;
 		}
 
@@ -1417,7 +1423,7 @@ class Product extends CommonObject
 			else if ($ref_ext) $sql.= " AND ref_ext = '".$this->db->escape($ref_ext)."'";
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ( $resql )
 		{
@@ -1482,7 +1488,7 @@ class Product extends CommonObject
 				$this->date_modification		= $obj->tms;
 				$this->import_key				= $obj->import_key;
 				$this->entity					= $obj->entity;
-				
+
 				$this->ref_ext					= $obj->ref_ext;
 
 				$this->db->free($resql);
@@ -2247,7 +2253,7 @@ class Product extends CommonObject
 		$sql.= " WHERE fk_product_pere  = ".$fk_parent;
 		$sql.= " AND fk_product_fils = ".$fk_child;
 
-		dol_syslog(get_class($this).'::del_sousproduit sql='.$sql);
+		dol_syslog(get_class($this).'::del_sousproduit', LOG_DEBUG);
 		if (! $this->db->query($sql))
 		{
 			dol_print_error($this->db);
@@ -2321,7 +2327,7 @@ class Product extends CommonObject
     		$sql.= " AND fk_product != ".$this->id;
     		$sql.= " AND entity = ".$conf->entity;
 
-    		dol_syslog(get_class($this)."::add_fournisseur sql=".$sql);
+    		dol_syslog(get_class($this)."::add_fournisseur", LOG_DEBUG);
     		$resql=$this->db->query($sql);
     		if ($resql)
     		{
@@ -2345,7 +2351,7 @@ class Product extends CommonObject
 		$sql.= " AND fk_product = ".$this->id;
 		$sql.= " AND entity = ".$conf->entity;
 
-		dol_syslog(get_class($this)."::add_fournisseur sql=".$sql);
+		dol_syslog(get_class($this)."::add_fournisseur", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2374,7 +2380,7 @@ class Product extends CommonObject
 				$sql.= ", 0";
 				$sql.= ")";
 
-				dol_syslog(get_class($this)."::add_fournisseur sql=".$sql);
+				dol_syslog(get_class($this)."::add_fournisseur", LOG_DEBUG);
 				if ($this->db->query($sql))
 				{
 					$this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
@@ -2383,7 +2389,6 @@ class Product extends CommonObject
 				else
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this)."::add_fournisseur ".$this->error, LOG_ERR);
 					return -1;
 				}
 			}
@@ -2452,7 +2457,7 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_price ";
 		$sql.= " WHERE fk_product = ". $fromId;
 
-		dol_syslog(get_class($this).'::clone_price sql='.$sql);
+		dol_syslog(get_class($this).'::clone_price', LOG_DEBUG);
 		if (! $this->db->query($sql))
 		{
 			$this->db->rollback();
@@ -2477,7 +2482,7 @@ class Product extends CommonObject
 		$sql.= " SELECT null, $toId, fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association";
 		$sql.= " WHERE fk_product_pere = '".$fromId."'";
 
-		dol_syslog(get_class($this).'::clone_association sql='.$sql);
+		dol_syslog(get_class($this).'::clone_association', LOG_DEBUG);
 		if (! $this->db->query($sql))
 		{
 			$this->db->rollback();
@@ -2521,7 +2526,7 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
 		$sql.= " WHERE fk_product = ".$fromId;
 
-		dol_syslog(get_class($this).'::clone_fournisseurs sql='.$sql);
+		dol_syslog(get_class($this).'::clone_fournisseurs', LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if (! $resql)
 		{
@@ -2731,7 +2736,7 @@ class Product extends CommonObject
 		$sql.= " AND pa.fk_product_pere = ".$id;
 		$sql.= " AND pa.fk_product_fils != ".$id;	// This should not happens, it is to avoid infinite loop if it happens
 
-		dol_syslog(get_class($this).'::getChildsArbo sql='.$sql);
+		dol_syslog(get_class($this).'::getChildsArbo', LOG_DEBUG);
 		$res  = $this->db->query($sql);
 		if ($res)
 		{
@@ -2805,7 +2810,7 @@ class Product extends CommonObject
         }
         else if ($option == 'composition')
         {
-			$lien = '<a href="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$this->id.'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$this->id.'">';
 			$lienfin='</a>';
         }
         else if ($option == 'category')
@@ -2814,15 +2819,15 @@ class Product extends CommonObject
         }
         else
 		{
-			$lien = '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$this->id.'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$this->id.'">';
 			$lienfin='</a>';
 		}
 		$newref=$this->ref;
 		if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle');
 
 		if ($withpicto) {
-			if ($this->type == 0) $result.=($lien.img_object($langs->trans("ShowProduct").' '.$this->ref,'product').$lienfin.' ');
-			if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->ref,'service').$lienfin.' ');
+			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.' ');
 		}
 		$result.=$lien.$newref.$lienfin;
 		return $result;
@@ -2863,7 +2868,7 @@ class Product extends CommonObject
 	{
 		global $langs;
 		$langs->load('products');
-		if ($conf->productbatch->enabled) $langs->load("productbatch");
+		if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
 		if ($type == 2)
 		{
@@ -2974,7 +2979,7 @@ class Product extends CommonObject
 			}
 			else
 			{
-				dol_print_error($this->db);
+			    $this->error=$movementstock->error;
 				$this->db->rollback();
 				return -1;
 			}
@@ -2998,7 +3003,7 @@ class Product extends CommonObject
 		$sql.= " AND w.rowid = ps.fk_entrepot";
 		$sql.= " AND ps.fk_product = ".$this->id;
 
-		dol_syslog(get_class($this)."::load_stock sql=".$sql);
+		dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -3034,56 +3039,71 @@ class Product extends CommonObject
 	 *
 	 *    @return     int             < 0 if KO, > 0 if OK
 	 */
-	function load_virtual_stock()
-	{
-		global $conf;
+    function load_virtual_stock()
+    {
+        global $conf;
 
-		if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
-		{
-			$stock_commande_client=$stock_commande_fournisseur=0;
-			$stock_sending_client=$stock_reception_fournisseur=0;
+        $stock_commande_client=0;
+        $stock_commande_fournisseur=0;
+        $stock_sending_client=0;
+        $stock_reception_fournisseur=0;
 
-			if (! empty($conf->commande->enabled))
-			{
-				$result=$this->load_stats_commande(0,'1,2');
-				if ($result < 0) dol_print_error($db,$this->error);
-				$stock_commande_client=$this->stats_commande['qty'];
-			}
-			if (! empty($conf->expedition->enabled))
-			{
-				$result=$this->load_stats_sending(0,'1,2');
-				if ($result < 0) dol_print_error($db,$this->error);
-				$stock_sending_client=$this->stats_expedition['qty'];
-			}
-			if (! empty($conf->fournisseur->enabled))
-			{
-				$result=$this->load_stats_commande_fournisseur(0,'3');
-				if ($result < 0) dol_print_error($db,$this->error);
-				$stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
+        if (! empty($conf->commande->enabled)) {
+            $result=$this->load_stats_commande(0,'1,2');
+            if ($result < 0) dol_print_error($db,$this->error);
+            $stock_commande_client=$this->stats_commande['qty'];
+        }
+        if (! empty($conf->expedition->enabled)) {
+            $result=$this->load_stats_sending(0,'1,2');
+            if ($result < 0) dol_print_error($db,$this->error);
+            $stock_sending_client=$this->stats_expedition['qty'];
+        }
+        if (! empty($conf->fournisseur->enabled)) {
+            $result=$this->load_stats_commande_fournisseur(0,'3,4');
+            if ($result < 0) dol_print_error($db,$this->error);
+            $stock_commande_fournisseur=$this->stats_commande_fournisseur['qty'];
 
-				$result=$this->load_stats_reception(0,'3');
-				if ($result < 0) dol_print_error($db,$this->error);
-				$stock_reception_fournisseur=$this->stats_reception['qty'];
-			}
+            $result=$this->load_stats_reception(0,'4');
+            if ($result < 0) dol_print_error($db,$this->error);
+            $stock_reception_fournisseur=$this->stats_reception['qty'];
+        }
 
-			$this->stock_theorique=$this->stock_reel-($stock_commande_client-$stock_sending_client)+($stock_commande_fournisseur-$stock_reception_fournisseur);
-			//echo $this->stock_theorique.' = '.$this->stock_reel.' - ('.$stock_commande_client.' - '.$stock_sending_client.') + ('.$stock_commande_fournisseur.' - '.$stock_reception_fournisseur.')';
-		}
-	}
+        // Stock decrease mode
+        if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+            $this->stock_theorique=$this->stock_reel-$stock_commande_client+$stock_sending_client;
+        }
+        if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+            $this->stock_theorique=$this->stock_reel;
+        }
+        if (! empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+            $this->stock_theorique=$this->stock_reel-$stock_commande_client;
+        }
+        // Stock Increase mode
+        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+        }
+        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+            $this->stock_theorique-=$stock_reception_fournisseur;
+        }
+        if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+            $this->stock_theorique+=$stock_commande_fournisseur-$stock_reception_fournisseur;
+        }
+    }
 
 	/**
-	 *  Deplace fichier uploade sous le nom $files dans le repertoire sdir
+	 *  Move an uploaded file described into $file array into target directory $sdir.
 	 *
-	 *  @param  string	$sdir       Repertoire destination finale
-	 *  @param  string	$file       Nom du fichier uploade
-	 *  @param  int		$maxWidth   Largeur maximum que dois faire la miniature (160 par defaut)
-	 *  @param  int		$maxHeight  Hauteur maximum que dois faire la miniature (120 par defaut)
-	 *  @return	void
+	 *  @param  string	$sdir       Target directory
+	 *  @param  string	$file       Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
+	 *  @param  int		$maxWidth   Largeur maximum que dois faire la miniature (160 by defaut)
+	 *  @param  int		$maxHeight  Hauteur maximum que dois faire la miniature (120 by defaut)
+	 *  @return	int					<0 if KO, >0 if OK
 	 */
 	function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
+		$result = 0;
 		$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/photos";
 
 		dol_mkdir($dir);
@@ -3102,6 +3122,9 @@ class Product extends CommonObject
 				$this->add_thumb($originImage,$maxWidth,$maxHeight);
 			}
 		}
+
+		if (is_numeric($result) && $result > 0) return 1;
+		else return -1;
 	}
 
 	/**
@@ -3162,7 +3185,7 @@ class Product extends CommonObject
 	 *  @param      string	$sdir        	Directory to scan
 	 *  @param      int		$size        	0=original size, 1 use thumbnail if possible
 	 *  @param      int		$nbmax       	Nombre maximum de photos (0=pas de max)
-	 *  @param      int		$nbbyrow     	Nombre vignettes par ligne (si mode vignette)
+	 *  @param      int		$nbbyrow     	Number of image per line or -1 to use div. Used only if size=1.
 	 * 	@param		int		$showfilename	1=Show filename
 	 * 	@param		int		$showaction		1=Show icon with action links (resize, delete)
 	 * 	@param		int		$maxHeight		Max height of image when size=1
@@ -3196,7 +3219,7 @@ class Product extends CommonObject
 
     				if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
 
-    				if (dol_is_file($dir.$file) && preg_match('/(\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))
+    				if (dol_is_file($dir.$file) && preg_match('/('.$this->regeximgext.')$/i', $dir.$file))
     				{
     					$nbphoto++;
     					$photo = $file;
@@ -3213,10 +3236,14 @@ class Product extends CommonObject
     						// Get filesize of original file
     						$imgarray=dol_getImageSize($dir.$photo);
 
-    						if ($nbbyrow && $nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
+    						if ($nbbyrow > 0)
+    						{
+    							if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
 
-    						if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) $return.= '<tr align=center valign=middle border=1>';
-    						if ($nbbyrow) $return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
+    							if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>';
+    							$return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">';
+    						}
+    						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
     						$return.= "\n";
     						$return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
@@ -3227,11 +3254,11 @@ class Product extends CommonObject
     						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
     						if ($photo_vignette && $imgarray['height'] > $maxHeight) {
     							$return.= '<!-- Show thumb -->';
-    							$return.= '<img class="photo" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+    							$return.= '<img class="photo photowithmargin" border="0" '.($conf->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.= '<!-- Show original file -->';
-    							$return.= '<img class="photo" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+    							$return.= '<img class="photo photowithmargin" border="0" '.($conf->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.= '</a>'."\n";
@@ -3241,7 +3268,7 @@ class Product extends CommonObject
     						{
     							$return.= '<br>';
     							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-    							if ($photo_vignette && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $photo) && ($product->imgWidth > $maxWidth || $product->imgHeight > $maxHeight))
+    							if ($photo_vignette && preg_match('/('.$this->regeximgext.')$/i', $photo) && ($product->imgWidth > $maxWidth || $product->imgHeight > $maxHeight))
     							{
     								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'&nbsp;&nbsp;</a>';
     							}
@@ -3257,13 +3284,16 @@ class Product extends CommonObject
     						}
     						$return.= "\n";
 
-    						if ($nbbyrow) $return.= '</td>';
-    						if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) $return.= '</tr>';
-
+    						if ($nbbyrow > 0)
+    						{
+    							$return.= '</td>';
+    							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+    						}
+    						else if ($nbbyrow < 0) $return.='</div>';
     					}
 
     					if ($size == 0) {     // Format origine
-    						$return.= '<img class="photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
+    						$return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
     						if ($showfilename) $return.= '<br>'.$viewfilename;
     						if ($showaction)
@@ -3286,16 +3316,19 @@ class Product extends CommonObject
     			}
             }
 
-			if ($nbbyrow && $size==1)
+			if ($size==1)
 			{
-				// Ferme tableau
-				while ($nbphoto % $nbbyrow)
+				if ($nbbyrow > 0)
 				{
-					$return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';
-					$nbphoto++;
-				}
+					// Ferme tableau
+					while ($nbphoto % $nbbyrow)
+					{
+						$return.= '<td width="'.ceil(100/$nbbyrow).'%">&nbsp;</td>';
+						$nbphoto++;
+					}
 
-				if ($nbphoto) $return.= '</table>';
+					if ($nbphoto) $return.= '</table>';
+				}
 			}
 
 			closedir($handle);
@@ -3328,14 +3361,14 @@ class Product extends CommonObject
 			while (($file = readdir($handle)) != false)
 			{
 				if (! utf8_check($file)) $file=utf8_encode($file);	// readdir returns ISO
-				if (dol_is_file($dir.$file) && preg_match('/(\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))
+				if (dol_is_file($dir.$file) && preg_match('/('.$this->regeximgext.')$/i', $dir.$file))
 				{
 					$nbphoto++;
 
 					// On determine nom du fichier vignette
 					$photo=$file;
 					$photo_vignette='';
-					if (preg_match('/(\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs))
+					if (preg_match('/('.$this->regeximgext.')$/i', $photo, $regs))
 					{
 						$photo_vignette=preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
 					}
@@ -3379,7 +3412,7 @@ class Product extends CommonObject
 		dol_delete_file($file);
 
 		// Si elle existe, on efface la vignette
-		if (preg_match('/(\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i',$filename,$regs))
+		if (preg_match('/('.$this->regeximgext.')$/i',$filename,$regs))
 		{
 			$photo_vignette=preg_replace('/'.$regs[0].'/i','',$filename).'_small'.$regs[0];
 			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
@@ -3562,10 +3595,44 @@ class Product extends CommonObject
 			}
 			else
 			{
-				dol_print_error($this->db);
+			    $this->error=$movementstock->error;
 				$this->db->rollback();
 				return -1;
 			}
 		}
 	}
+
+	/**
+     * Return minimum product recommended price
+     *
+	 * @return	int			Minimum recommanded price that is higher price among all suppliers * PRODUCT_MINIMUM_RECOMMENDED_PRICE
+     */
+	function min_recommended_price()
+	{
+		global $conf;
+
+		$maxpricesupplier=0;
+
+		if (! empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+			$product_fourn = new ProductFournisseur($this->db);
+			$product_fourn_list = $product_fourn->list_product_fournisseur_price($this->id, '', '');
+
+			if (is_array($product_fourn_list) && count($product_fourn_list)>0)
+			{
+				foreach($product_fourn_list as $productfourn)
+				{
+					if ($productfourn->fourn_unitprice > $maxpricesupplier)
+					{
+						$maxpricesupplier = $productfourn->fourn_unitprice;
+					}
+				}
+
+				$maxpricesupplier *= $conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE;
+			}
+		}
+
+		return $maxpricesupplier;
+	}
 }
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 9c92431c563..a4df7a95829 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='';
@@ -43,7 +43,7 @@ class Productbatch extends CommonObject
 	var $qty;
 	var $import_key;
 
-    
+
 
 
     /**
@@ -92,12 +92,12 @@ 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();
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
 		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		if (! $error)
@@ -148,7 +148,7 @@ class Productbatch extends CommonObject
 		global $langs;
 		$sql = "SELECT";
 		$sql.= " t.rowid,";
-		
+
 		$sql.= " t.tms,";
 		$sql.= " t.fk_product_stock,";
 		$sql.= " t.sellby,";
@@ -157,11 +157,11 @@ class Productbatch extends CommonObject
 		$sql.= " t.qty,";
 		$sql.= " t.import_key";
 
-		
+
         $sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as t";
         $sql.= " WHERE t.rowid = ".$id;
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -185,7 +185,6 @@ class Productbatch extends CommonObject
 		else
 		{
 			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -197,7 +196,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;
@@ -217,7 +216,7 @@ class Productbatch extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		if (! $error)
@@ -289,7 +288,7 @@ class Productbatch extends CommonObject
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element."";
     		$sql.= " WHERE rowid=".$this->id;
 
-    		dol_syslog(get_class($this)."::delete sql=".$sql);
+    		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
     		$resql = $this->db->query($sql);
         	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
@@ -377,7 +376,7 @@ class Productbatch extends CommonObject
 	function initAsSpecimen()
 	{
 		$this->id=0;
-		
+
 		$this->tms='';
 		$this->fk_product_stock='';
 		$this->sellby='';
@@ -385,14 +384,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);
@@ -430,8 +429,8 @@ 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 sql=".$sql, LOG_DEBUG);
+
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -440,7 +439,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);
@@ -456,7 +455,6 @@ class Productbatch extends CommonObject
         else
         {
       	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -482,12 +480,12 @@ 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 sql=".$sql, LOG_DEBUG);
+		dol_syslog("productbatch::findAll", LOG_DEBUG);
 		$resql=$db->query($sql);
 		if ($resql)
         {
@@ -517,7 +515,6 @@ class Productbatch extends CommonObject
         else
         {
       	    $error="Error ".$db->lasterror();
-            dol_syslog("productbatch::find_all ".$error, LOG_ERR);
             return -1;
         }
     }
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index c0b99104aa5..4cc6e7feb49 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -182,7 +182,7 @@ class Productcustomerprice extends CommonObject
 		
 		$this->db->begin();
 		
-		dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
@@ -258,7 +258,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t";
 		$sql .= " WHERE t.rowid = " . $id;
 		
-		dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -288,7 +288,6 @@ class Productcustomerprice extends CommonObject
 			return 1;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::fetch " . $this->error, LOG_ERR);
 			return - 1;
 		}
 	}
@@ -355,7 +354,7 @@ class Productcustomerprice extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		
-		dol_syslog(get_class($this) . "::fetch_all sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::fetch_all", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			
@@ -394,7 +393,6 @@ class Productcustomerprice extends CommonObject
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::fetch_all " . $this->error, LOG_ERR);
 			return - 1;
 		}
 	}
@@ -460,7 +458,7 @@ class Productcustomerprice extends CommonObject
 			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		
-		dol_syslog(get_class($this) . "::fetch_all_log sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::fetch_all_log", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			
@@ -499,7 +497,6 @@ class Productcustomerprice extends CommonObject
 			return $num;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::fetch_all_log " . $this->error, LOG_ERR);
 			return - 1;
 		}
 	}
@@ -625,7 +622,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " WHERE t.rowid = " . $this->id;
 		
 		$this->db->begin();
-		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
@@ -654,7 +651,7 @@ class Productcustomerprice extends CommonObject
 		
 		$sql .= " WHERE rowid=" . $this->id;
 		
-		dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
 			$error ++;
@@ -713,7 +710,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " WHERE s.parent = " . $this->fk_soc;
 		$sql .= " AND s.entity IN (" . getEntity('societe', 1) . ")";
 		
-		dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		
 		if ($resql) {
@@ -784,7 +781,6 @@ class Productcustomerprice extends CommonObject
 			}
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty " . $this->error, LOG_ERR);
 			return - 1;
 		}
 	}
@@ -821,7 +817,7 @@ class Productcustomerprice extends CommonObject
 			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_customer_price";
 			$sql .= " WHERE rowid=" . $this->id;
 			
-			dol_syslog(get_class($this) . "::delete sql=" . $sql);
+			dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (! $resql) {
 				$error ++;
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
new file mode 100644
index 00000000000..ec616b2f222
--- /dev/null
+++ b/htdocs/product/composition/card.php
@@ -0,0 +1,554 @@
+<?php
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/product/composition/card.php
+ *  \ingroup    product
+ *  \brief      Page de la fiche produit
+ */
+
+require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+$langs->load("bills");
+$langs->load("products");
+
+$id=GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+$confirm=GETPOST('confirm','alpha');
+$cancel=GETPOST('cancel','alpha');
+$key=GETPOST('key');
+$parent=GETPOST('parent');
+
+// Security check
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
+$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
+$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+
+$product = new Product($db);
+$productid=0;
+if ($id > 0 || ! empty($ref))
+{
+	$result = $product->fetch($id,$ref);
+	$productid=$product->id;
+	$id=$product->id;
+}
+
+
+/*
+ * Actions
+ */
+
+// Action association d'un sousproduit
+if ($action == 'add_prod' &&
+$cancel <> $langs->trans("Cancel") &&
+($user->rights->produit->creer || $user->rights->service->creer))
+{
+	$error=0;
+	for ($i=0; $i<$_POST["max_prod"]; $i++)
+	{
+		if ($_POST["prod_id_chk".$i] > 0)
+		{
+			if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0)
+			{
+				$action = 'edit';
+			}
+			else
+			{
+				$error++;
+				$action = 're-edit';
+				if ($product->error == "isFatherOfThis") {
+					setEventMessage($langs->trans("ErrorAssociationIsFatherOfThis"), 'errors');
+				} else {
+					setEventMessage($product->error, 'errors');
+				}
+			}
+		}
+		else
+		{
+			if ($product->del_sousproduit($id, $_POST["prod_id_".$i]) > 0)
+			{
+				$action = 'edit';
+			}
+			else
+			{
+				$error++;
+				$action = 're-edit';
+				setEventMessage($product->error, 'errors');
+			}
+		}
+	}
+	if (! $error)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$product->id);
+		exit;
+	}
+}
+
+if ($cancel == $langs->trans("Cancel"))
+{
+	$action = '';
+	header("Location: card.php?id=".$_POST["id"]);
+	exit;
+}
+
+
+/*
+ * View
+ */
+
+$product_fourn = new ProductFournisseur($db);
+$productstatic = new Product($db);
+$form = new Form($db);
+
+// action recherche des produits par mot-cle et/ou par categorie
+if ($action == 'search')
+{
+	$current_lang = $langs->getDefaultLang();
+
+    $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).')';
+	if ($key != "")
+	{
+		// For natural search
+		$params = array('p.ref', 'p.label', 'p.description', 'p.note');
+		// multilang
+		if (! empty($conf->global->MAIN_MULTILANGS))
+		{
+			$params[] = 'pl.label';
+			$params[] = 'pl.description';
+			$params[] = 'pl.note';
+		}
+		if (! empty($conf->barcode->enabled)) {
+			$params[] = 'p.barcode';
+		}
+		$sql .= natural_search($params, $key);
+	}
+	if (! empty($conf->categorie->enabled) && ! empty($parent) && $parent != -1)
+	{
+		$sql.= " AND cp.fk_categorie ='".$db->escape($parent)."'";
+	}
+	$sql.= " ORDER BY p.ref ASC";
+
+	$resql = $db->query($sql);
+}
+//print $sql;
+
+
+llxHeader("","",$langs->trans("CardProduct".$product->type));
+
+$head=product_prepare_head($product, $user);
+$titre=$langs->trans("CardProduct".$product->type);
+$picto=($product->type==1?'service':'product');
+dol_fiche_head($head, 'subproduct', $titre, 0, $picto);
+
+
+if ($id > 0 || ! empty($ref))
+{
+/*	if ($result)
+	{
+		if ($action <> 'edit' && $action <> 'search' && $action <> 're-edit')
+		{
+			// mode visu
+
+			print '<table class="border" width="100%">';
+
+			print "<tr>";
+
+			$nblignes=6;
+			if ($product->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
+			if ($product->isservice()) $nblignes++;
+
+			// Reference
+			print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
+			print $form->showrefnav($product,'ref','',1,'ref');
+			print '</td></tr>';
+
+			// Libelle
+			print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
+			print '</tr>';
+
+			// Number of subproducts
+			$prodsfather = $product->getFather(); // Parent Products
+			$product->get_sousproduits_arbo();
+			$prods_arbo=$product->get_arbo_each_prod();
+			$nbofsubproducts=count($prods_arbo);
+			print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
+			print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
+			print '</td>';
+
+			dol_fiche_end();
+
+
+			// List of products into this virtual product
+			if (count($prods_arbo) > 0)
+			{
+				print '<tr><td colspan="2">';
+				print '<b>'.$langs->trans("ProductAssociationList").'</b><br>';
+				print '<table class="nobordernopadding">';
+				foreach($prods_arbo as $value)
+				{
+					$productstatic->id=$value['id'];
+					$productstatic->type=$value['type'];
+					$productstatic->ref=$value['fullpath'];
+					if (! empty($conf->stock->enabled)) $productstatic->load_stock();
+					//var_dump($value);
+					//print '<pre>'.$productstatic->ref.'</pre>';
+					//print $productstatic->getNomUrl(1).'<br>';
+					//print $value[0];	// This contains a tr line.
+					print '<tr>';
+					//print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].($value['nb_total'] > $value['nb']?'->'.$value['nb_total']:'').') &nbsp &nbsp</td>';
+					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].') &nbsp &nbsp</td>';
+					if (! empty($conf->stock->enabled)) print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.'</b></td>';
+					print '</tr>';
+				}
+				print '</table>';
+				print '</td></tr>';
+			}
+
+			// Number of parent virtual products
+			print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>';
+			print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
+			print '</td>';
+
+			if (count($prodsfather) > 0)
+			{
+				print '<tr><td colspan="2">';
+				print '<b>'.$langs->trans("ProductParentList").'</b><br>';
+				print '<table class="nobordernopadding">';
+				foreach($prodsfather as $value)
+				{
+					$idprod= $value["id"];
+					$productstatic->id=$idprod;// $value["id"];
+					$productstatic->type=$value["fk_product_type"];
+					$productstatic->ref=$value['label'];
+					print '<tr>';
+					print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
+					print '</tr>';
+				}
+				print '</table>';
+				print '</td></tr>';
+			}
+
+			print "</table>\n";
+
+			dol_fiche_end();
+		}
+	}
+*/
+	/*
+	 * Fiche en mode edition
+	 */
+	if ($user->rights->produit->lire || $user->rights->service->lire)
+	{
+		print '<table class="border" width="100%">';
+
+		print "<tr>";
+
+		$nblignes=6;
+		if ($product->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
+		if ($product->isservice()) $nblignes++;
+
+			// Reference
+			print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
+			print $form->showrefnav($product,'ref','',1,'ref');
+			print '</td>';
+
+		print '</tr>';
+
+		// Label
+		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
+		print '</tr>';
+
+		if (empty($conf->global->PRODUIT_MULTIPRICES))
+		{
+		    // Price
+			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
+			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?$object->price_base_type:'HT');
+			}
+			print '</td></tr>';
+
+			// Price minimum
+			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
+			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?$object->price_base_type:'HT');
+			}
+			print '</td></tr>';
+		}
+
+		// Number of subproducts
+		$prodsfather = $product->getFather(); //Parent Products
+		$product->get_sousproduits_arbo();			// Defined $product->sousprod
+		$prods_arbo=$product->get_arbo_each_prod();
+		$nbofsubproducts=count($prods_arbo);
+		print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
+		print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
+		print '</td>';
+		print '</tr>';
+
+		// List of subproducts
+		if (count($prods_arbo) > 0)
+		{
+			$atleastonenotdefined=0;
+			print '<tr><td colspan="2">';
+			print $langs->trans("ProductAssociationList").'<br>';
+			print '<table class="nobordernopadding centpercent">';
+			foreach($prods_arbo as $value)
+			{
+				$productstatic->id=$value['id'];
+				$productstatic->type=$value['type'];
+				//print '<pre>'.$productstatic->ref.'</pre>';
+				//print $productstatic->getNomUrl(1).'<br>';
+				//var_dump($value);
+				print '<tr>';
+				if ($value['level'] <= 1)
+				{
+					$notdefined=0;
+					$productstatic->ref=$value['fullpath'];
+					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')</td>';
+					print '<td align="right">';
+					if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0)
+					{
+						print $langs->trans("BuyingPriceMinShort").': ';
+				    	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0,0);
+				    	else { print $langs->trans("NotDefined"); $notdefined++; $atleastonenotdefined++; }
+					}
+					print '</td>';
+					$totalline=price2num($value['nb'] * $product_fourn->fourn_unitprice, 'MT');
+					$total+=$totalline;
+					print '<td align="right">'.($notdefined?'':price($totalline,'','',0,0,-1,$conf->currency)).'</td>';
+					if (! empty($conf->stock->enabled)) print '<td align="right">'.$langs->trans("Stock").': '.$value['stock'].'</td>';	// Real stock
+				}
+				else {
+					$productstatic->ref=$value['label'];
+					print '<td>';
+					for ($i=0; $i < $value['level']; $i++)
+					{
+						print ' &nbsp; &nbsp; ';
+					}
+					print $productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')</td>';
+					print '<td><td>';
+					print '<td><td>';
+					if (! empty($conf->stock->enabled)) print '<td align="right"></td>';	// Real stock
+				}
+				print '</tr>';
+			}
+			print '<tr>';
+			print '<td colspan="2">'.$langs->trans("TotalBuyingPriceMin").': ';
+			if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
+			print '</td>';
+			print '<td align="right">'.($atleastonenotdefined?'':price($total,'','',0,0,-1,$conf->currency)).'</td>';
+			if (! empty($conf->stock->enabled)) print '<td class="liste_total" align="right">&nbsp;</td>';
+			print '</tr>';
+			print '</table>';
+			print '</td></tr>';
+		}
+
+		// Number of parent virtual products
+		print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>';
+		print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
+		print '</td>';
+
+		if (count($prodsfather) > 0)
+		{
+			print '<tr><td colspan="2">';
+			print $langs->trans("ProductParentList").'<br>';
+			print '<table class="nobordernopadding">';
+			foreach($prodsfather as $value)
+			{
+				$idprod= $value["id"];
+				$productstatic->id=$idprod;// $value["id"];
+				$productstatic->type=$value["fk_product_type"];
+				$productstatic->ref=$value['label'];
+				print '<tr>';
+				print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
+				print '</tr>';
+			}
+			print '</table>';
+			print '</td></tr>';
+		}
+
+		print '</table>';
+
+		dol_fiche_end();
+
+
+		// Form with product to add
+		if ((empty($action) || $action == 'view' || $action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->rights->produit->creer || $user->rights->service->creer))
+		{
+			print '<br>';
+
+			$rowspan=1;
+			if (! empty($conf->categorie->enabled)) $rowspan++;
+
+	        print_fiche_titre($langs->trans("ProductToAddSearch"),'','');
+			print '<form action="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$id.'" method="POST">';
+			print '<table class="border" width="100%"><tr><td>';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print $langs->trans("KeywordFilter").' &nbsp; ';
+			print '</td>';
+			print '<td><input type="text" name="key" value="'.$key.'">';
+			print '<input type="hidden" name="action" value="search">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
+			print '</td>';
+			print '<td rowspan="'.$rowspan.'" valign="middle">';
+			print '<input type="submit" class="button" value="'.$langs->trans("Search").'">';
+			print '</td></tr>';
+			if (! empty($conf->categorie->enabled))
+			{
+				print '<tr><td>'.$langs->trans("CategoryFilter").' &nbsp; </td>';
+				print '<td class="maxwidthonsmartphone">'.$form->select_all_categories(0, $parent).'</td></tr>';
+			}
+			print '</table>';
+			print '</form>';
+		}
+
+
+		// List of products
+		if ($action == 'search')
+		{
+			print '<br>';
+			print '<form action="'.DOL_URL_ROOT.'/product/composition/card.php?id='.$id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="add_prod">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<table class="nobordernopadding" width="100%">';
+			print '<tr class="liste_titre">';
+			print '<th class="liste_titre">'.$langs->trans("Ref").'</td>';
+			print '<th class="liste_titre">'.$langs->trans("Label").'</td>';
+			print '<th class="liste_titre" align="center">'.$langs->trans("AddDel").'</td>';
+			print '<th class="liste_titre" align="right">'.$langs->trans("Qty").'</td>';
+			print '</tr>';
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				$i=0;
+				$var=true;
+
+				if($num == 0) print '<tr><td colspan="4">'.$langs->trans("NoMatchFound").'</td></tr>';
+
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($resql);
+					if($objp->rowid != $id)
+					{
+						// check if a product is not already a parent product of this one
+						$prod_arbo=new Product($db);
+						$prod_arbo->id=$objp->rowid;
+						if ($prod_arbo->type==2 || $prod_arbo->type==3)
+						{
+							$is_pere=0;
+							$prod_arbo->get_sousproduits_arbo();
+							// associations sousproduits
+							$prods_arbo = $prod_arbo->get_arbo_each_prod();
+							if (count($prods_arbo) > 0)
+							{
+								foreach($prods_arbo as $key => $value)
+								{
+									if ($value[1]==$id)
+									{
+										$is_pere=1;
+									}
+								}
+							}
+							if ($is_pere==1)
+							{
+								$i++;
+								continue;
+							}
+						}
+						$var=!$var;
+						print "\n<tr ".$bc[$var].">";
+						$productstatic->id=$objp->rowid;
+						$productstatic->ref=$objp->ref;
+						$productstatic->libelle=$objp->label;
+						$productstatic->type=$objp->type;
+
+						print '<td>'.$productstatic->getNomUrl(1,'',24).'</td>';
+						$labeltoshow=$objp->label;
+						if ($conf->global->MAIN_MULTILANGS && $objp->labelm) $labeltoshow=$objp->labelm;
+
+						print '<td>'.$labeltoshow.'</td>';
+						if($product->is_sousproduit($id, $objp->rowid))
+						{
+							$addchecked = ' checked="checked"';
+							$qty=$product->is_sousproduit_qty;
+						}
+						else
+						{
+							$addchecked = '';
+							$qty="1";
+						}
+						print '<td align="center"><input type="hidden" name="prod_id_'.$i.'" value="'.$objp->rowid.'">';
+						print '<input type="checkbox" '.$addchecked.'name="prod_id_chk'.$i.'" value="'.$objp->rowid.'"></td>';
+						print '<td align="right"><input type="text" size="2" name="prod_qty_'.$i.'" value="'.$qty.'"></td>';
+						print '</tr>';
+					}
+					$i++;
+				}
+
+			}
+			else
+			{
+				dol_print_error($db);
+			}
+			print '</table>';
+			print '<input type="hidden" name="max_prod" value="'.$i.'">';
+
+			if($num > 0)
+			{
+				print '<br><center><input type="submit" class="button" value="'.$langs->trans("Add").'/'.$langs->trans("Update").'">';
+				print ' &nbsp; &nbsp; <input type="submit" class="button" value="'.$langs->trans("Cancel").'">';
+				print '</center>';
+			}
+
+			print '</form>';
+		}
+
+	}
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
deleted file mode 100644
index bf89798e79f..00000000000
--- a/htdocs/product/composition/fiche.php
+++ /dev/null
@@ -1,561 +0,0 @@
-<?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       htdocs/product/composition/fiche.php
- *  \ingroup    product
- *  \brief      Page de la fiche produit
- */
-
-require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-$langs->load("bills");
-$langs->load("products");
-$langs->load("main");
-
-$id=GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$cancel=GETPOST('cancel','alpha');
-$key=GETPOST('key');
-$parent=GETPOST('parent');
-
-// Security check
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
-$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
-
-$mesg = '';
-
-$product = new Product($db);
-$productid=0;
-if ($id > 0 || ! empty($ref))
-{
-	$result = $product->fetch($id,$ref);
-	$productid=$product->id;
-	$id=$product->id;
-}
-
-
-/*
- * Actions
- */
-
-// Action association d'un sousproduit
-if ($action == 'add_prod' &&
-$cancel <> $langs->trans("Cancel") &&
-($user->rights->produit->creer || $user->rights->service->creer))
-{
-	$error=0;
-	for ($i=0; $i<$_POST["max_prod"]; $i++)
-	{
-		if ($_POST["prod_id_chk".$i] > 0)
-		{
-			if($product->add_sousproduit($id, $_POST["prod_id_".$i],$_POST["prod_qty_".$i]) > 0)
-			{
-				$action = 'edit';
-			}
-			else
-			{
-				$error++;
-				$action = 're-edit';
-				if ($product->error == "isFatherOfThis") $mesg = $langs->trans("ErrorAssociationIsFatherOfThis");
-				else $mesg=$product->error;
-			}
-		}
-		else
-		{
-			if ($product->del_sousproduit($id, $_POST["prod_id_".$i]) > 0)
-			{
-				$action = 'edit';
-			}
-			else
-			{
-				$error++;
-				$action = 're-edit';
-				$mesg=$product->error;
-			}
-		}
-	}
-	if (! $error)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$product->id);
-		exit;
-	}
-}
-
-if ($cancel == $langs->trans("Cancel"))
-{
-	$action = '';
-	header("Location: fiche.php?id=".$_POST["id"]);
-	exit;
-}
-
-
-/*
- * View
- */
-
-$product_fourn = new ProductFournisseur($db);
-$productstatic = new Product($db);
-$form = new Form($db);
-
-// action recherche des produits par mot-cle et/ou par categorie
-if ($action == 'search')
-{
-	$current_lang = $langs->getDefaultLang();
-
-	$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.price, p.fk_product_type as type';
-	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).')';
-	if ($key != "")
-	{
-		if (! empty($conf->global->MAIN_MULTILANGS))
-		{
-			$sql.= " AND (p.ref LIKE '%".$key."%'";
-			$sql.= " OR pl.label LIKE '%".$key."%')";
-		}
-		else
-		{
-			$sql.= " AND (p.ref LIKE '%".$key."%'";
-			$sql.= " OR p.label LIKE '%".$key."%')";
-		}
-	}
-	if (! empty($conf->categorie->enabled) && ! empty($parent) && $parent != -1)
-	{
-		$sql.= " AND cp.fk_categorie ='".$db->escape($parent)."'";
-	}
-	$sql.= " ORDER BY p.ref ASC";
-
-	$resql = $db->query($sql);
-}
-//print $sql;
-
-
-llxHeader("","",$langs->trans("CardProduct".$product->type));
-
-
-dol_htmloutput_errors($mesg);
-
-
-$head=product_prepare_head($product, $user);
-$titre=$langs->trans("CardProduct".$product->type);
-$picto=($product->type==1?'service':'product');
-dol_fiche_head($head, 'subproduct', $titre, 0, $picto);
-
-
-if ($id > 0 || ! empty($ref))
-{
-/*	if ($result)
-	{
-		if ($action <> 'edit' && $action <> 'search' && $action <> 're-edit')
-		{
-			// mode visu
-
-			print '<table class="border" width="100%">';
-
-			print "<tr>";
-
-			$nblignes=6;
-			if ($product->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
-			if ($product->isservice()) $nblignes++;
-
-			// Reference
-			print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
-			print $form->showrefnav($product,'ref','',1,'ref');
-			print '</td></tr>';
-
-			// Libelle
-			print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
-			print '</tr>';
-
-			// Number of subproducts
-			$prodsfather = $product->getFather(); // Parent Products
-			$product->get_sousproduits_arbo();
-			$prods_arbo=$product->get_arbo_each_prod();
-			$nbofsubproducts=count($prods_arbo);
-			print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
-			print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
-			print '</td>';
-
-			dol_fiche_end();
-
-
-			// List of products into this virtual product
-			if (count($prods_arbo) > 0)
-			{
-				print '<tr><td colspan="2">';
-				print '<b>'.$langs->trans("ProductAssociationList").'</b><br>';
-				print '<table class="nobordernopadding">';
-				foreach($prods_arbo as $value)
-				{
-					$productstatic->id=$value['id'];
-					$productstatic->type=$value['type'];
-					$productstatic->ref=$value['fullpath'];
-					if (! empty($conf->stock->enabled)) $productstatic->load_stock();
-					//var_dump($value);
-					//print '<pre>'.$productstatic->ref.'</pre>';
-					//print $productstatic->getNomUrl(1).'<br>';
-					//print $value[0];	// This contains a tr line.
-					print '<tr>';
-					//print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].($value['nb_total'] > $value['nb']?'->'.$value['nb_total']:'').') &nbsp &nbsp</td>';
-					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].') &nbsp &nbsp</td>';
-					if (! empty($conf->stock->enabled)) print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.'</b></td>';
-					print '</tr>';
-				}
-				print '</table>';
-				print '</td></tr>';
-			}
-
-			// Number of parent virtual products
-			print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>';
-			print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
-			print '</td>';
-
-			if (count($prodsfather) > 0)
-			{
-				print '<tr><td colspan="2">';
-				print '<b>'.$langs->trans("ProductParentList").'</b><br>';
-				print '<table class="nobordernopadding">';
-				foreach($prodsfather as $value)
-				{
-					$idprod= $value["id"];
-					$productstatic->id=$idprod;// $value["id"];
-					$productstatic->type=$value["fk_product_type"];
-					$productstatic->ref=$value['label'];
-					print '<tr>';
-					print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
-					print '</tr>';
-				}
-				print '</table>';
-				print '</td></tr>';
-			}
-
-			print "</table>\n";
-
-			dol_fiche_end();
-		}
-	}
-*/
-	/*
-	 * Fiche en mode edition
-	 */
-	if ($user->rights->produit->lire || $user->rights->service->lire)
-	{
-		print '<table class="border" width="100%">';
-
-		print "<tr>";
-
-		$nblignes=6;
-		if ($product->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
-		if ($product->isservice()) $nblignes++;
-
-			// Reference
-			print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
-			print $form->showrefnav($product,'ref','',1,'ref');
-			print '</td>';
-
-		print '</tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
-		print '</tr>';
-
-		if (empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-		    // Price
-			print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
-			
-			if ($object->price_base_type == 'TTC')
-			{
-				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-			}
-			else
-			{
-				print price($object->price);
-				if (!empty($object->price_base_type)) {
-					print ' '.$langs->trans($object->price_base_type);
-				}
-			}
-			print '</td></tr>';
-
-			// Price minimum
-			print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
-			if ($object->price_base_type == 'TTC')
-			{
-				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-			}
-			else
-			{
-				print price($object->price_min);
-				if (!empty($object->price_base_type)) {
-					print ' '.$langs->trans($object->price_base_type);
-				}
-			}
-			print '</td></tr>';
-		}
-
-		// Number of subproducts
-		$prodsfather = $product->getFather(); //Parent Products
-		$product->get_sousproduits_arbo();			// Defined $product->sousprod
-		$prods_arbo=$product->get_arbo_each_prod();
-		$nbofsubproducts=count($prods_arbo);
-		print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
-		print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
-		print '</td>';
-		print '</tr>';
-
-		// List of subproducts
-		if (count($prods_arbo) > 0)
-		{
-			$atleastonenotdefined=0;
-			print '<tr><td colspan="2">';
-			print $langs->trans("ProductAssociationList").'<br>';
-			print '<table class="nobordernopadding centpercent">';
-			foreach($prods_arbo as $value)
-			{
-				$productstatic->id=$value['id'];
-				$productstatic->type=$value['type'];
-				//print '<pre>'.$productstatic->ref.'</pre>';
-				//print $productstatic->getNomUrl(1).'<br>';
-				//var_dump($value);
-				print '<tr>';
-				if ($value['level'] <= 1)
-				{
-					$notdefined=0;
-					$productstatic->ref=$value['fullpath'];
-					print '<td>'.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')</td>';
-					print '<td align="right">';
-					if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0)
-					{
-						print $langs->trans("BuyingPriceMinShort").': ';
-				    	if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0,0);
-				    	else { print $langs->trans("NotDefined"); $notdefined++; $atleastonenotdefined++; }
-					}
-					print '</td>';
-					$totalline=price2num($value['nb'] * $product_fourn->fourn_unitprice, 'MT');
-					$total+=$totalline;
-					print '<td align="right">'.($notdefined?'':price($totalline,'','',0,0,-1,$conf->currency)).'</td>';
-					if (! empty($conf->stock->enabled)) print '<td align="right">'.$langs->trans("Stock").': '.$value['stock'].'</td>';	// Real stock
-				}
-				else {
-					$productstatic->ref=$value['label'];
-					print '<td>';
-					for ($i=0; $i < $value['level']; $i++)
-					{
-						print ' &nbsp; &nbsp; ';
-					}
-					print $productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')</td>';
-					print '<td><td>';
-					print '<td><td>';
-					if (! empty($conf->stock->enabled)) print '<td align="right"></td>';	// Real stock
-				}
-				print '</tr>';
-			}
-			print '<tr>';
-			print '<td colspan="2">'.$langs->trans("TotalBuyingPriceMin").': ';
-			if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
-			print '</td>';
-			print '<td align="right">'.($atleastonenotdefined?'':price($total,'','',0,0,-1,$conf->currency)).'</td>';
-			if (! empty($conf->stock->enabled)) print '<td class="liste_total" align="right">&nbsp;</td>';
-			print '</tr>';
-			print '</table>';
-			print '</td></tr>';
-		}
-
-		// Number of parent virtual products
-		print '<tr><td>'.$langs->trans("ParentProductsNumber").'</td><td>';
-		print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
-		print '</td>';
-
-		if (count($prodsfather) > 0)
-		{
-			print '<tr><td colspan="2">';
-			print $langs->trans("ProductParentList").'<br>';
-			print '<table class="nobordernopadding">';
-			foreach($prodsfather as $value)
-			{
-				$idprod= $value["id"];
-				$productstatic->id=$idprod;// $value["id"];
-				$productstatic->type=$value["fk_product_type"];
-				$productstatic->ref=$value['label'];
-				print '<tr>';
-				print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
-				print '</tr>';
-			}
-			print '</table>';
-			print '</td></tr>';
-		}
-
-		print '</table>';
-
-		dol_fiche_end();
-
-
-		// Form with product to add
-		if ((empty($action) || $action == 'view' || $action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->rights->produit->creer || $user->rights->service->creer))
-		{
-			print '<br>';
-
-			$rowspan=1;
-			if (! empty($conf->categorie->enabled)) $rowspan++;
-
-	        print_fiche_titre($langs->trans("ProductToAddSearch"),'','');
-			print '<form action="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$id.'" method="POST">';
-			print '<table class="border" width="100%"><tr><td>';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print $langs->trans("KeywordFilter").' &nbsp; ';
-			print '</td>';
-			print '<td><input type="text" name="key" value="'.$key.'">';
-			print '<input type="hidden" name="action" value="search">';
-			print '<input type="hidden" name="id" value="'.$id.'">';
-			print '</td>';
-			print '<td rowspan="'.$rowspan.'" valign="middle">';
-			print '<input type="submit" class="button" value="'.$langs->trans("Search").'">';
-			print '</td></tr>';
-			if (! empty($conf->categorie->enabled))
-			{
-				print '<tr><td>'.$langs->trans("CategoryFilter").' &nbsp; </td>';
-				print '<td class="maxwidthonsmartphone">'.$form->select_all_categories(0, $parent).'</td></tr>';
-			}
-			print '</table>';
-			print '</form>';
-		}
-
-
-		// List of products
-		if ($action == 'search')
-		{
-			print '<br>';
-			print '<form action="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="add_prod">';
-			print '<input type="hidden" name="id" value="'.$id.'">';
-			print '<table class="nobordernopadding" width="100%">';
-			print '<tr class="liste_titre">';
-			print '<th class="liste_titre">'.$langs->trans("Ref").'</td>';
-			print '<th class="liste_titre">'.$langs->trans("Label").'</td>';
-			print '<th class="liste_titre" align="center">'.$langs->trans("AddDel").'</td>';
-			print '<th class="liste_titre" align="right">'.$langs->trans("Qty").'</td>';
-			print '</tr>';
-			if ($resql)
-			{
-				$num = $db->num_rows($resql);
-				$i=0;
-				$var=true;
-
-				if($num == 0) print '<tr><td colspan="4">'.$langs->trans("NoMatchFound").'</td></tr>';
-
-				while ($i < $num)
-				{
-					$objp = $db->fetch_object($resql);
-					if($objp->rowid != $id)
-					{
-						// check if a product is not already a parent product of this one
-						$prod_arbo=new Product($db);
-						$prod_arbo->id=$objp->rowid;
-						if ($prod_arbo->type==2 || $prod_arbo->type==3)
-						{
-							$is_pere=0;
-							$prod_arbo->get_sousproduits_arbo();
-							// associations sousproduits
-							$prods_arbo = $prod_arbo->get_arbo_each_prod();
-							if (count($prods_arbo) > 0)
-							{
-								foreach($prods_arbo as $key => $value)
-								{
-									if ($value[1]==$id)
-									{
-										$is_pere=1;
-									}
-								}
-							}
-							if ($is_pere==1)
-							{
-								$i++;
-								continue;
-							}
-						}
-						$var=!$var;
-						print "\n<tr ".$bc[$var].">";
-						$productstatic->id=$objp->rowid;
-						$productstatic->ref=$objp->ref;
-						$productstatic->libelle=$objp->label;
-						$productstatic->type=$objp->type;
-
-						print '<td>'.$productstatic->getNomUrl(1,'',24).'</td>';
-						$labeltoshow=$objp->label;
-						if ($conf->global->MAIN_MULTILANGS && $objp->labelm) $labeltoshow=$objp->labelm;
-
-						print '<td>'.$labeltoshow.'</td>';
-						if($product->is_sousproduit($id, $objp->rowid))
-						{
-							$addchecked = ' checked="checked"';
-							$qty=$product->is_sousproduit_qty;
-						}
-						else
-						{
-							$addchecked = '';
-							$qty="1";
-						}
-						print '<td align="center"><input type="hidden" name="prod_id_'.$i.'" value="'.$objp->rowid.'">';
-						print '<input type="checkbox" '.$addchecked.'name="prod_id_chk'.$i.'" value="'.$objp->rowid.'"></td>';
-						print '<td align="right"><input type="text" size="2" name="prod_qty_'.$i.'" value="'.$qty.'"></td>';
-						print '</tr>';
-					}
-					$i++;
-				}
-
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-			print '</table>';
-			print '<input type="hidden" name="max_prod" value="'.$i.'">';
-
-			if($num > 0)
-			{
-				print '<br><center><input type="submit" class="button" value="'.$langs->trans("Add").'/'.$langs->trans("Update").'">';
-				print ' &nbsp; &nbsp; <input type="submit" class="button" value="'.$langs->trans("Cancel").'">';
-				print '</center>';
-			}
-
-			print '</form>';
-		}
-
-	}
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/product/composition/index.html b/htdocs/product/composition/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/composition/index.php b/htdocs/product/composition/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/product/composition/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 1e8c7b7cd9a..6ca92968e8d 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -75,6 +75,7 @@ $modulepart='produit';
 
 $parameters=array('id'=>$id);
 $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');
 
 
 /*
@@ -101,7 +102,7 @@ if ($object->id)
 	dol_fiche_head($head, 'documents', $titre, 0, $picto);
 
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-	
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
deleted file mode 100644
index 5498233e5b8..00000000000
--- a/htdocs/product/fiche.php
+++ /dev/null
@@ -1,1791 +0,0 @@
-<?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2006      Auguria SARL         <info@auguria.org>
- * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013-2014 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
- * Copyright (C) 2014      Cédric Gross         <c.gross@kreiz-it.fr>
- * Copyright (C) 2014	   Ferran Marcet		<fmarcet@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       htdocs/product/fiche.php
- *  \ingroup    product
- *  \brief      Page to show product
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->facture->enabled))  require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-$langs->load("products");
-$langs->load("other");
-if (! empty($conf->stock->enabled)) $langs->load("stocks");
-if (! empty($conf->facture->enabled)) $langs->load("bills");
-if ($conf->productbatch->enabled) $langs->load("productbatch");
-
-$mesg=''; $error=0; $errors=array(); $_error=0;
-
-$id=GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
-$type=GETPOST('type','int');
-$action=(GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view');
-$confirm=GETPOST('confirm','alpha');
-$socid=GETPOST('socid','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-
-$object = new Product($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-if ($id > 0 || ! empty($ref))
-{
-	$object = new Product($db);
-	$object->fetch($id, $ref);
-}
-
-// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$canvas = !empty($object->canvas)?$object->canvas:GETPOST("canvas");
-$objcanvas='';
-if (! empty($canvas))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db,$action);
-    $objcanvas->getCanvas('product','card',$canvas);
-}
-
-// Security check
-$fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
-$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('productcard'));
-
-
-
-/*
- * Actions
- */
-
-$createbarcode=empty($conf->barcode->enabled)?0:1;
-if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) $createbarcode=0;
-
-$parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=$hookmanager->errors;
-
-if (empty($reshook))
-{
-    // Type
-    if ($action ==	'setfk_product_type' && $user->rights->produit->creer)
-    {
-    	$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'));
-    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    	exit;
-    }
-
-    // Barcode type
-    if ($action ==	'setfk_barcode_type' && $createbarcode)
-    {
-        $result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'));
-    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    	exit;
-    }
-
-    // Barcode value
-    if ($action ==	'setbarcode' && $createbarcode)
-    {
-    	$result=$object->check_barcode(GETPOST('barcode'),GETPOST('barcode_type_code'));
-
-		if ($result >= 0)
-		{
-	    	$result = $object->setValueFrom('barcode', GETPOST('barcode'));
-	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	    	exit;
-		}
-		else
-		{
-			$langs->load("errors");
-        	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
-        	else if ($result == -2) $errors[] = 'ErrorBarCodeRequired';
-        	else if ($result == -3) $errors[] = 'ErrorBarCodeAlreadyUsed';
-        	else $errors[] = 'FailedToValidateBarCode';
-
-			$error++;
-			setEventMessage($errors,'errors');
-		}
-    }
-
-    if ($action == 'setaccountancy_code_buy') {
-
-	    $result = $object->setAccountancyCode('buy', GETPOST('accountancy_code_buy'));
-        if ($result < 0) setEventMessage(join(',',$object->errors), 'errors');
-        $action="";
-    }
-
-    if ($action == 'setaccountancy_code_sell')
-    {
-	    $result = $object->setAccountancyCode('sell', GETPOST('accountancy_code_sell'));
-	    if ($result < 0) setEventMessage(join(',',$object->errors), 'errors');
-	    $action="";
-    }
-
-    // Add a product or service
-    if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-        $error=0;
-
-        if (! GETPOST('libelle'))
-        {
-            setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Label')), 'errors');
-            $action = "create";
-            $error++;
-        }
-        if (empty($ref))
-        {
-            setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Ref')), 'errors');
-            $action = "create";
-            $error++;
-        }
-
-        if (! $error)
-        {
-            $object->ref                   = $ref;
-            $object->libelle               = GETPOST('libelle');
-            $object->price_base_type       = GETPOST('price_base_type');
-
-            if ($object->price_base_type == 'TTC')
-            	$object->price_ttc = GETPOST('price');
-            else
-            	$object->price = GETPOST('price');
-            if ($object->price_base_type == 'TTC')
-            	$object->price_min_ttc = GETPOST('price_min');
-            else
-            	$object->price_min = GETPOST('price_min');
-
-            $object->tva_tx                = str_replace('*','',GETPOST('tva_tx'));
-            $object->tva_npr               = preg_match('/\*/',GETPOST('tva_tx'))?1:0;
-
-            // local taxes.
-            $object->localtax1_tx 			   = get_localtax($object->tva_tx,1);
-            $object->localtax2_tx 			   = get_localtax($object->tva_tx,2);
-
-            $object->type               	 = $type;
-            $object->status             	 = GETPOST('statut');
-            $object->status_buy            = GETPOST('statut_buy');
-			$object->status_batch          	= GETPOST('status_batch');
-
-            $object->barcode_type          = GETPOST('fk_barcode_type');
-            $object->barcode		           = GETPOST('barcode');
-            // Set barcode_type_xxx from barcode_type id
-            $stdobject=new GenericObject($db);
-    	    $stdobject->element='product';
-            $stdobject->barcode_type=GETPOST('fk_barcode_type');
-            $result=$stdobject->fetch_barcode();
-            if ($result < 0)
-            {
-            	$error++;
-            	setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
-            }
-            $object->barcode_type_code      = $stdobject->barcode_type_code;
-            $object->barcode_type_coder     = $stdobject->barcode_type_coder;
-            $object->barcode_type_label     = $stdobject->barcode_type_label;
-
-            $object->description        	 = dol_htmlcleanlastbr(GETPOST('desc'));
-            $object->url					= GETPOST('url');
-            $object->note               	 = dol_htmlcleanlastbr(GETPOST('note'));
-            $object->customcode            = GETPOST('customcode');
-            $object->country_id            = GETPOST('country_id');
-            $object->duration_value     	 = GETPOST('duration_value');
-            $object->duration_unit      	 = GETPOST('duration_unit');
-            $object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0;
-            $object->desiredstock          = GETPOST('desiredstock')?GETPOST('desiredstock'):0;
-            $object->canvas             	 = GETPOST('canvas');
-            $object->weight             	 = GETPOST('weight');
-            $object->weight_units       	 = GETPOST('weight_units');
-            $object->length             	 = GETPOST('size');
-            $object->length_units       	 = GETPOST('size_units');
-            $object->surface            	 = GETPOST('surface');
-            $object->surface_units      	 = GETPOST('surface_units');
-            $object->volume             	 = GETPOST('volume');
-            $object->volume_units       	 = GETPOST('volume_units');
-            $object->finished           	 = GETPOST('finished');
-            $object->hidden             	 = GETPOST('hidden')=='yes'?1:0;
-            $object->accountancy_code_sell = GETPOST('accountancy_code_sell');
-            $object->accountancy_code_buy  = GETPOST('accountancy_code_buy');
-
-            // MultiPrix
-            if (! empty($conf->global->PRODUIT_MULTIPRICES))
-            {
-                for($i=2;$i<=$conf->global->PRODUIT_MULTIPRICES_LIMIT;$i++)
-                {
-                    if (isset($_POST["price_".$i]))
-                    {
-                        $object->multiprices["$i"] = price2num($_POST["price_".$i],'MU');
-                        $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
-                    }
-                    else
-                    {
-                        $object->multiprices["$i"] = "";
-                    }
-                }
-            }
-
-            // Fill array 'array_options' with data from add form
-        	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-            $id = $object->create($user);
-
-            if ($id > 0)
-            {
-                header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                exit;
-            }
-            else
-			{
-            	if (count($object->errors)) setEventMessage($object->errors, 'errors');
-				else setEventMessage($langs->trans($object->error), 'errors');
-                $action = "create";
-            }
-        }
-    }
-
-    // Update a product or service
-    if ($action == 'update' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-    	if (GETPOST('cancel'))
-        {
-            $action = '';
-        }
-        else
-        {
-            if ($object->id > 0)
-            {
-            	$object->oldcopy=dol_clone($object);
-
-                $object->ref                    = $ref;
-                $object->libelle                = GETPOST('libelle');
-                $object->description            = dol_htmlcleanlastbr(GETPOST('desc'));
-            	$object->url					= GETPOST('url');
-                $object->note                   = dol_htmlcleanlastbr(GETPOST('note'));
-                $object->customcode             = GETPOST('customcode');
-                $object->country_id             = GETPOST('country_id');
-                $object->status                 = GETPOST('statut');
-                $object->status_buy             = GETPOST('statut_buy');
-                $object->status_batch	        = GETPOST('status_batch');
-                $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
-                $object->desiredstock           = GETPOST('desiredstock');
-                $object->duration_value         = GETPOST('duration_value');
-                $object->duration_unit          = GETPOST('duration_unit');
-                $object->canvas                 = GETPOST('canvas');
-                $object->weight                 = GETPOST('weight');
-                $object->weight_units           = GETPOST('weight_units');
-                $object->length                 = GETPOST('size');
-                $object->length_units           = GETPOST('size_units');
-                $object->surface                = GETPOST('surface');
-                $object->surface_units          = GETPOST('surface_units');
-                $object->volume                 = GETPOST('volume');
-                $object->volume_units           = GETPOST('volume_units');
-                $object->finished               = GETPOST('finished');
-                $object->hidden                 = GETPOST('hidden')=='yes'?1:0;
-
-	            $object->barcode_type           = GETPOST('fk_barcode_type');
-    	        $object->barcode		        = GETPOST('barcode');
-    	        // Set barcode_type_xxx from barcode_type id
-    	        $stdobject=new GenericObject($db);
-    	        $stdobject->element='product';
-    	        $stdobject->barcode_type=GETPOST('fk_barcode_type');
-    	        $result=$stdobject->fetch_barcode();
-    	        if ($result < 0)
-    	        {
-    	        	$error++;
-    	        	setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
-    	        }
-    	        $object->barcode_type_code      = $stdobject->barcode_type_code;
-    	        $object->barcode_type_coder     = $stdobject->barcode_type_coder;
-    	        $object->barcode_type_label     = $stdobject->barcode_type_label;
-
-            	$object->accountancy_code_sell  = GETPOST('accountancy_code_sell');
-                $object->accountancy_code_buy   = GETPOST('accountancy_code_buy');
-
-                // Fill array 'array_options' with data from add form
-        		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-                if ($object->check())
-                {
-                    if ($object->update($object->id, $user) > 0)
-                    {
-                        $action = 'view';
-                    }
-                    else
-					{
-						if (count($object->errors)) setEventMessage($object->errors, 'errors');
-                    	else setEventMessage($langs->trans($object->error), 'errors');
-                        $action = 'edit';
-                    }
-                }
-                else
-				{
-					if (count($object->errors)) setEventMessage($object->errors, 'errors');
-                	else setEventMessage($langs->trans("ErrorProductBadRefOrLabel"), 'errors');
-                    $action = 'edit';
-                }
-            }
-
-        }
-    }
-
-    // Action clone object
-    if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
-    if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-        if (! GETPOST('clone_content') && ! GETPOST('clone_prices') )
-        {
-        	setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
-        }
-        else
-        {
-            $db->begin();
-
-            $originalId = $id;
-            if ($object->id > 0)
-            {
-                $object->ref = GETPOST('clone_ref');
-                $object->status = 0;
-                $object->status_buy = 0;
-                $object->id = null;
-                $object->barcode = -1;
-
-                if ($object->check())
-                {
-                    $id = $object->create($user);
-                    if ($id > 0)
-                    {
-                        if (GETPOST('clone_composition'))
-                        {
-                            $result = $object->clone_associations($originalId, $id);
-
-                            if ($result < 1)
-                            {
-                                $db->rollback();
-                                setEventMessage($langs->trans('ErrorProductClone'), 'errors');
-                                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
-                                exit;
-                            }
-                        }
-
-                        // $object->clone_fournisseurs($originalId, $id);
-
-                        $db->commit();
-                        $db->close();
-
-                        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-                        exit;
-                    }
-                    else
-                    {
-                        $id=$originalId;
-
-                        if ($object->error == 'ErrorProductAlreadyExists')
-                        {
-                            $db->rollback();
-
-                            $_error++;
-                            $action = "";
-
-                            $mesg=$langs->trans("ErrorProductAlreadyExists",$object->ref);
-                            $mesg.=' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
-                            setEventMessage($mesg, 'errors');
-                            $object->fetch($id);
-                            //dol_print_error($object->db);
-                        }
-                        else
-                        {
-                            $db->rollback();
-                            if (count($object->errors))
-                            {
-                            	setEventMessage($object->errors, 'errors');
-                            	dol_print_error($db,$object->errors);
-                            }
-                            else
-                            {
-                            	setEventMessage($langs->trans($object->error), 'errors');
-                            	dol_print_error($db,$object->error);
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                $db->rollback();
-                dol_print_error($db,$object->error);
-            }
-        }
-    }
-
-    // Delete a product
-    if ($action == 'confirm_delete' && $confirm != 'yes') { $action=''; }
-    if ($action == 'confirm_delete' && $confirm == 'yes')
-    {
-        if (($object->type == 0 && $user->rights->produit->supprimer) || ($object->type == 1 && $user->rights->service->supprimer))
-        {
-            $result = $object->delete($object->id);
-        }
-
-        if ($result > 0)
-        {
-            header('Location: '.DOL_URL_ROOT.'/product/liste.php?type='.$object->type.'&delprod='.urlencode($object->ref));
-            exit;
-        }
-        else
-        {
-        	setEventMessage($langs->trans($object->error), 'errors');
-            $reload = 0;
-            $action='';
-        }
-    }
-
-
-    // Add product into proposal
-    if ($object->id > 0 && $action == 'addinpropal')
-    {
-        $propal = new Propal($db);
-        $result=$propal->fetch(GETPOST('propalid'));
-        if ($result <= 0)
-        {
-            dol_print_error($db,$propal->error);
-            exit;
-        }
-
-        $soc = new Societe($db);
-        $result=$soc->fetch($propal->socid);
-        if ($result <= 0)
-        {
-            dol_print_error($db,$soc->error);
-            exit;
-        }
-
-        $desc = $object->description;
-
-        $tva_tx = get_default_tva($mysoc, $soc, $object->id);
-        $localtax1_tx= get_localtax($tva_tx, 1, $soc);
-        $localtax2_tx= get_localtax($tva_tx, 2, $soc);
-
-        $pu_ht = $object->price;
-        $pu_ttc = $object->price_ttc;
-        $price_base_type = $object->price_base_type;
-
-        // If multiprice
-        if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
-        {
-            $pu_ht = $object->multiprices[$soc->price_level];
-            $pu_ttc = $object->multiprices_ttc[$soc->price_level];
-            $price_base_type = $object->multiprices_base_type[$soc->price_level];
-        }
-   		elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
-			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-			$prodcustprice = new Productcustomerprice($db);
-
-			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $soc->id);
-
-			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-			if ($result) {
-				if (count($prodcustprice->lines) > 0) {
-					$pu_ht = price($prodcustprice->lines [0]->price);
-					$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-					$price_base_type = $prodcustprice->lines [0]->price_base_type;
-					$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
-				}
-			}
-		}
-
-        // On reevalue prix selon taux tva car taux tva transaction peut etre different
-        // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-        if ($tva_tx != $object->tva_tx)
-        {
-            if ($price_base_type != 'HT')
-            {
-                $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
-            }
-            else
-            {
-                $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
-            }
-        }
-
-        $result = $propal->addline(
-            $desc,
-            $pu_ht,
-            GETPOST('qty'),
-            $tva_tx,
-            $localtax1_tx, // localtax1
-            $localtax2_tx, // localtax2
-            $object->id,
-            GETPOST('remise_percent'),
-            $price_base_type,
-            $pu_ttc
-        );
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/comm/propal.php?id=".$propal->id);
-            return;
-        }
-
-        setEventMessage($langs->trans("ErrorUnknown").": $result", 'errors');
-    }
-
-    // Add product into order
-    if ($object->id > 0 && $action == 'addincommande')
-    {
-        $commande = new Commande($db);
-        $result=$commande->fetch(GETPOST('commandeid'));
-        if ($result <= 0)
-        {
-            dol_print_error($db,$commande->error);
-            exit;
-        }
-
-        $soc = new Societe($db);
-        $result=$soc->fetch($commande->socid);
-        if ($result <= 0)
-        {
-            dol_print_error($db,$soc->error);
-            exit;
-        }
-
-        $desc = $object->description;
-
-        $tva_tx = get_default_tva($mysoc, $soc, $object->id);
-        $localtax1_tx= get_localtax($tva_tx, 1, $soc);
-        $localtax2_tx= get_localtax($tva_tx, 2, $soc);
-
-
-        $pu_ht = $object->price;
-        $pu_ttc = $object->price_ttc;
-        $price_base_type = $object->price_base_type;
-
-        // If multiprice
-        if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
-        {
-            $pu_ht = $object->multiprices[$soc->price_level];
-            $pu_ttc = $object->multiprices_ttc[$soc->price_level];
-            $price_base_type = $object->multiprices_base_type[$soc->price_level];
-        }
-    	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
-			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-			$prodcustprice = new Productcustomerprice($db);
-
-			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $soc->id);
-
-			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-			if ($result) {
-				if (count($prodcustprice->lines) > 0) {
-					$pu_ht = price($prodcustprice->lines [0]->price);
-					$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-					$price_base_type = $prodcustprice->lines [0]->price_base_type;
-					$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
-				}
-			}
-		}
-        // On reevalue prix selon taux tva car taux tva transaction peut etre different
-        // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-        if ($tva_tx != $object->tva_tx)
-        {
-            if ($price_base_type != 'HT')
-            {
-                $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
-            }
-            else
-            {
-                $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
-            }
-        }
-
-        $result =  $commande->addline(
-            $desc,
-            $pu_ht,
-            GETPOST('qty'),
-            $tva_tx,
-            $localtax1_tx, // localtax1
-            $localtax2_tx, // localtax2
-            $object->id,
-            GETPOST('remise_percent'),
-            '',
-            '',
-            $price_base_type,
-            $pu_ttc
-        );
-
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/commande/fiche.php?id=".$commande->id);
-            exit;
-        }
-    }
-
-    // Add product into invoice
-    if ($object->id > 0 && $action == 'addinfacture' && $user->rights->facture->creer)
-    {
-        $facture = New Facture($db);
-        $result=$facture->fetch(GETPOST('factureid'));
-        if ($result <= 0)
-        {
-            dol_print_error($db,$facture->error);
-            exit;
-        }
-
-        $soc = new Societe($db);
-        $soc->fetch($facture->socid);
-        if ($result <= 0)
-        {
-            dol_print_error($db,$soc->error);
-            exit;
-        }
-
-        $desc = $object->description;
-
-        $tva_tx = get_default_tva($mysoc, $soc, $object->id);
-        $localtax1_tx= get_localtax($tva_tx, 1, $soc);
-        $localtax2_tx= get_localtax($tva_tx, 2, $soc);
-
-        $pu_ht = $object->price;
-        $pu_ttc = $object->price_ttc;
-        $price_base_type = $object->price_base_type;
-
-        // If multiprice
-        if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
-        {
-            $pu_ht = $object->multiprices[$soc->price_level];
-            $pu_ttc = $object->multiprices_ttc[$soc->price_level];
-            $price_base_type = $object->multiprices_base_type[$soc->price_level];
-        }
-    	elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
-			require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-			$prodcustprice = new Productcustomerprice($db);
-
-			$filter = array('t.fk_product' => $object->id,'t.fk_soc' => $soc->id);
-
-			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-			if ($result) {
-				if (count($prodcustprice->lines) > 0) {
-					$pu_ht = price($prodcustprice->lines [0]->price);
-					$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-					$price_base_type = $prodcustprice->lines [0]->price_base_type;
-					$prod->tva_tx = $prodcustprice->lines [0]->tva_tx;
-				}
-			}
-		}
-        // On reevalue prix selon taux tva car taux tva transaction peut etre different
-        // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-        if ($tva_tx != $object->tva_tx)
-        {
-            if ($price_base_type != 'HT')
-            {
-                $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
-            }
-            else
-            {
-                $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
-            }
-        }
-
-        $result = $facture->addline(
-            $desc,
-            $pu_ht,
-            GETPOST('qty'),
-            $tva_tx,
-            $localtax1_tx,
-            $localtax2_tx,
-            $object->id,
-            GETPOST('remise_percent'),
-            '',
-            '',
-            '',
-            '',
-            '',
-            $price_base_type,
-            $pu_ttc
-        );
-
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/compta/facture.php?facid=".$facture->id);
-            exit;
-        }
-    }
-}
-
-if (GETPOST("cancel") == $langs->trans("Cancel"))
-{
-    $action = '';
-    header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-    exit;
-}
-
-
-/*
- * View
- */
-
-$helpurl='';
-if (GETPOST("type") == '0' || ($object->type == '0')) $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-if (GETPOST("type") == '1' || ($object->type == '1')) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-
-if (isset($_GET['type'])) $title = $langs->trans('CardProduct'.GETPOST('type'));
-else $title = $langs->trans('ProductServiceCard');
-
-llxHeader('', $title, $helpurl);
-
-$form = new Form($db);
-$formproduct = new FormProduct($db);
-
-
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
-	// -----------------------------------------
-	// When used with CANVAS
-	// -----------------------------------------
-	if (empty($object->error) && $id)
-	{
-		$object = new Product($db);
-		$result=$object->fetch($id);
-		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
-}
-else
-{
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
-    if ($action == 'create' && ($user->rights->produit->creer || $user->rights->service->creer))
-    {
-        //WYSIWYG Editor
-        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-
-		// Load object modCodeProduct
-        $module=(! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON)?$conf->global->PRODUCT_CODEPRODUCT_ADDON:'mod_codeproduct_leopard');
-        if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module)-4);
-        }
-        $result=dol_include_once('/core/modules/product/'.$module.'.php');
-        if ($result > 0)
-        {
-        	$modCodeProduct = new $module();
-        }
-
-		// Load object modBarCodeProduct
-		if (! empty($conf->barcode->enabled) && ! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
-		{
-			$module=strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
-        	$result=dol_include_once('/core/modules/barcode/'.$module.'.php');
-        	if ($result > 0)
-        	{
-				$modBarCodeProduct =new $module();
-        	}
-		}
-
-        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="add">';
-        print '<input type="hidden" name="type" value="'.$type.'">'."\n";
-		if (! empty($modCodeProduct->code_auto))
-			print '<input type="hidden" name="code_auto" value="1">';
-		if (! empty($modBarCodeProduct->code_auto))
-			print '<input type="hidden" name="barcode_auto" value="1">';
-
-        if ($type==1) $title=$langs->trans("NewService");
-        else $title=$langs->trans("NewProduct");
-        print_fiche_titre($title);
-
-        print '<table class="border" width="100%">';
-        print '<tr>';
-        $tmpcode='';
-		if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type);
-        print '<td class="fieldrequired" width="20%">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="20" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref')?GETPOST('ref'):$tmpcode).'">';
-        if ($_error)
-        {
-            print $langs->trans("RefAlreadyExists");
-        }
-        print '</td></tr>';
-
-        // Label
-        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag(GETPOST('libelle')).'"></td></tr>';
-
-        // On sell
-        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-        $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-        print $form->selectarray('statut',$statutarray,GETPOST('statut'));
-        print '</td></tr>';
-
-        // To buy
-        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-        $statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-        print $form->selectarray('statut_buy',$statutarray,GETPOST('statut_buy'));
-        print '</td></tr>';
-
-	    // Batch number management
-		if ($conf->productbatch->enabled)
-		{
-			print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Batch").')</td><td colspan="3">';
-			$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
-			print $form->selectarray('status_batch',$statutarray,GETPOST('status_batch'));
-			print '</td></tr>';
-		}
-
-        $showbarcode=empty($conf->barcode->enabled)?0:1;
-        if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-
-        if ($showbarcode)
-        {
- 	        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
- 	        if (isset($_POST['fk_barcode_type']))
-	        {
-	         	$fk_barcode_type=GETPOST('fk_barcode_type');
-	        }
-	        else
-	        {
-	        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-	        }
-	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-            $formbarcode = new FormBarCode($db);
-	        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
-	        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-	        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-	        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
-	        print '<input size="40" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
-	        print '</td></tr>';
-        }
-
-        // Description (used in invoice, propal...)
-        print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-
-        $doleditor = new DolEditor('desc', GETPOST('desc'), '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
-        $doleditor->Create();
-
-        print "</td></tr>";
-
-        // Public URL
-        print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="3">';
-		print '<input type="text" name="url" size="90" value="'.GETPOST('url').'">';
-        print '</td></tr>';
-
-        // Stock min level
-        if ($type != 1 && ! empty($conf->stock->enabled))
-        {
-            print '<tr><td>'.$langs->trans("StockLimit").'</td><td>';
-            print '<input name="seuil_stock_alerte" size="4" value="'.GETPOST('seuil_stock_alerte').'">';
-            print '</td>';
-            // Stock desired level
-            print '<td>'.$langs->trans("DesiredStock").'</td><td>';
-            print '<input name="desiredstock" size="4" value="'.GETPOST('desiredstock').'">';
-            print '</td></tr>';
-        }
-        else
-        {
-            print '<input name="seuil_stock_alerte" type="hidden" value="0">';
-            print '<input name="desiredstock" type="hidden" value="0">';
-        }
-
-        // Nature
-        if ($type != 1)
-        {
-            print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-            $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-            print $form->selectarray('finished',$statutarray,GETPOST('finished'),1);
-            print '</td></tr>';
-        }
-
-        // Duration
-        if ($type == 1)
-        {
-            print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="'.GETPOST('duration_value').'"> &nbsp;';
-            print '<input name="duration_unit" type="radio" value="h">'.$langs->trans("Hour").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="d">'.$langs->trans("Day").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="w">'.$langs->trans("Week").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="m">'.$langs->trans("Month").'&nbsp;';
-            print '<input name="duration_unit" type="radio" value="y">'.$langs->trans("Year").'&nbsp;';
-            print '</td></tr>';
-        }
-
-        if ($type != 1)	// Le poids et le volume ne concerne que les produits et pas les services
-        {
-            // Weight
-            print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
-            print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
-            print $formproduct->select_measuring_units("weight_units","weight");
-            print '</td></tr>';
-            // Length
-            print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
-            print '<input name="size" size="4" value="'.GETPOST('size').'">';
-            print $formproduct->select_measuring_units("size_units","size");
-            print '</td></tr>';
-            // Surface
-            print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-            print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
-            print $formproduct->select_measuring_units("surface_units","surface");
-            print '</td></tr>';
-            // Volume
-            print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
-            print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
-            print $formproduct->select_measuring_units("volume_units","volume");
-            print '</td></tr>';
-        }
-
-        // Custom code
-        if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
-        {
-	        print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" size="10" value="'.GETPOST('customcode').'"></td>';
-	        // Origin country
-	        print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
-	        print $form->select_country(GETPOST('country_id','int'),'country_id');
-	        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	        print '</td></tr>';
-        }
-
-        // Other attributes
-        $parameters=array('colspan' => 3);
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields,'edit',$parameters);
-        }
-
-        // Note (private, no output on invoices, propales...)
-        print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-
-        // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
-        $doleditor = new DolEditor('note', GETPOST('note'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 8, 70);
-        $doleditor->Create();
-
-        print "</td></tr>";
-        print '</table>';
-
-        print '<br>';
-
-        if (! empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-            // We do no show price array on create when multiprices enabled.
-            // We must set them on prices tab.
-        }
-        else
-		{
-            print '<table class="border" width="100%">';
-
-            // PRIX
-            print '<tr><td>'.$langs->trans("SellingPrice").'</td>';
-            print '<td><input name="price" size="10" value="'.$object->price.'">';
-            print $form->select_PriceBaseType($object->price_base_type, "price_base_type");
-            print '</td></tr>';
-
-            // MIN PRICE
-            print '<tr><td>'.$langs->trans("MinPrice").'</td>';
-            print '<td><input name="price_min" size="10" value="'.$object->price_min.'">';
-            print '</td></tr>';
-
-            // VAT
-            print '<tr><td width="20%">'.$langs->trans("VATRate").'</td><td>';
-            print $form->load_tva("tva_tx",-1,$mysoc,'');
-            print '</td></tr>';
-
-            print '</table>';
-
-            print '<br>';
-        }
-
-        /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
-        {
-            // Don't show accounting field when accounting id disabled.
-        }
-        else
-        {*/
-            print '<table class="border" width="100%">';
-
-            // Accountancy_code_sell
-            print '<tr><td>'.$langs->trans("ProductAccountancySellCode").'</td>';
-            print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">';
-            print '</td></tr>';
-
-            // Accountancy_code_buy
-            print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-            print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">';
-            print '</td></tr>';
-
-            print '</table>';
-
-            print '<br>';
-        //}
-
-        print '<center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
-
-        print '</form>';
-    }
-
-    /*
-     * Product card
-     */
-
-    else if ($object->id > 0)
-    {
-        // Fiche en mode edition
-        if ($action == 'edit' && ($user->rights->produit->creer || $user->rights->service->creer))
-        {
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-
-            $type = $langs->trans('Product');
-            if ($object->isservice()) $type = $langs->trans('Service');
-            print_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
-
-            // Main official, simple, and not duplicated code
-            print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">'."\n";
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$object->id.'">';
-            print '<input type="hidden" name="canvas" value="'.$object->canvas.'">';
-            print '<table class="border allwidth">';
-
-            // Ref
-            print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" size="20" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
-
-            // Label
-            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="libelle" size="40" maxlength="255" value="'.dol_escape_htmltag($object->libelle).'"></td></tr>';
-
-            // Status To sell
-            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-            print '<select class="flat" name="statut">';
-            if ($object->status)
-            {
-                print '<option value="1" selected="selected">'.$langs->trans("OnSell").'</option>';
-                print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
-            }
-            else
-            {
-                print '<option value="1">'.$langs->trans("OnSell").'</option>';
-                print '<option value="0" selected="selected">'.$langs->trans("NotOnSell").'</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
-
-            // Status To Buy
-            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-            print '<select class="flat" name="statut_buy">';
-            if ($object->status_buy)
-            {
-                print '<option value="1" selected="selected">'.$langs->trans("ProductStatusOnBuy").'</option>';
-                print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            else
-            {
-                print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
-                print '<option value="0" selected="selected">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
-
-			// Batch number managment
-			if ($conf->productbatch->enabled) {
-				print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
-				$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
-				print $form->selectarray('status_batch',$statutarray,$object->status_batch);
-				print '</td></tr>';
-			}
-
-            // Barcode
-            $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-
-	        if ($showbarcode)
-	        {
-		        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
-		        if (isset($_POST['fk_barcode_type']))
-		        {
-		         	$fk_barcode_type=GETPOST('fk_barcode_type');
-		        }
-		        else
-		        {
-	        		$fk_barcode_type=$object->barcode_type;
-		        	if (empty($fk_barcode_type) && ! empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-		        }
-		        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-	            $formbarcode = new FormBarCode($db);
-		        print $formbarcode->select_barcode_type($fk_barcode_type, 'fk_barcode_type', 1);
-		        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-		        $tmpcode=isset($_POST['barcode'])?GETPOST('barcode'):$object->barcode;
-		        if (empty($tmpcode) && ! empty($modBarCodeProduct->code_auto)) $tmpcode=$modBarCodeProduct->getNextValue($object,$type);
-		        print '<input size="40" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
-		        print '</td></tr>';
-	        }
-
-            // Description (used in invoice, propal...)
-            print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-
-            // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
-            $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
-            $doleditor->Create();
-
-            print "</td></tr>";
-            print "\n";
-
-            // Public Url
-            print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="3">';
-			print '<input type="text" name="url" size="80" value="'.$object->url.'">';
-            print '</td></tr>';
-
-            // Stock
-            if ($object->isproduct() && ! empty($conf->stock->enabled))
-            {
-                print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
-                print '<input name="seuil_stock_alerte" size="4" value="'.$object->seuil_stock_alerte.'">';
-                print '</td>';
-
-                print '<td>'.$langs->trans("DesiredStock").'</td><td>';
-                print '<input name="desiredstock" size="4" value="'.$object->desiredstock.'">';
-                print '</td></tr>';
-            }
-            else
-            {
-                print '<input name="seuil_stock_alerte" type="hidden" value="'.$object->seuil_stock_alerte.'">';
-                print '<input name="desiredstock" type="hidden" value="'.$object->desiredstock.'">';
-            }
-
-            // Nature
-            if($object->type!=1)
-            {
-                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-                $statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-                print $form->selectarray('finished',$statutarray,$object->finished);
-                print '</td></tr>';
-            }
-
-            if ($object->isservice())
-            {
-                // Duration
-                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit=='h'?' checked':'').'>'.$langs->trans("Hour");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit=='d'?' checked':'').'>'.$langs->trans("Day");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit=='w'?' checked':'').'>'.$langs->trans("Week");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit=='m'?' checked':'').'>'.$langs->trans("Month");
-                print '&nbsp; ';
-                print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit=='y'?' checked':'').'>'.$langs->trans("Year");
-
-                print '</td></tr>';
-            }
-            else
-            {
-                // Weight
-                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
-                print '<input name="weight" size="5" value="'.$object->weight.'"> ';
-                print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);
-                print '</td></tr>';
-                // Length
-                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="3">';
-                print '<input name="size" size="5" value="'.$object->length.'"> ';
-                print $formproduct->select_measuring_units("size_units", "size", $object->length_units);
-                print '</td></tr>';
-                // Surface
-                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-                print '<input name="surface" size="5" value="'.$object->surface.'"> ';
-                print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);
-                print '</td></tr>';
-                // Volume
-                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
-                print '<input name="volume" size="5" value="'.$object->volume.'"> ';
-                print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);
-                print '</td></tr>';
-            }
-
-	        // Custom code
-    	    if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
-        	{
-	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" size="10" value="'.$object->customcode.'"></td>';
-	            // Origin country
-	            print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
-	            print $form->select_country($object->country_id,'country_id');
-	            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	            print '</td></tr>';
-        	}
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="2"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields,'edit');
-            }
-
-            // Note
-            print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-
-            $doleditor = new DolEditor('note', $object->note, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
-            $doleditor->Create();
-
-            print "</td></tr>";
-            print '</table>';
-
-            print '<br>';
-
-            /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
-            {
-                // Don't show accounting field when accounting id disabled.
-            }
-            else
-            {*/
-                print '<table class="border" width="100%">';
-
-                // Accountancy_code_sell
-                print '<tr><td width="20%">'.$langs->trans("ProductAccountancySellCode").'</td>';
-                print '<td><input name="accountancy_code_sell" size="16" value="'.$object->accountancy_code_sell.'">';
-                print '</td></tr>';
-
-                // Accountancy_code_buy
-                print '<tr><td width="20%">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
-                print '<td><input name="accountancy_code_buy" size="16" value="'.$object->accountancy_code_buy.'">';
-                print '</td></tr>';
-
-                print '</table>';
-
-                print '<br>';
-            //}
-
-            print '<center><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-
-            print '</form>';
-        }
-        // Fiche en mode visu
-        else
-		{
-            $head=product_prepare_head($object, $user);
-            $titre=$langs->trans("CardProduct".$object->type);
-            $picto=($object->type==1?'service':'product');
-            dol_fiche_head($head, 'card', $titre, 0, $picto);
-
-            $showphoto=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
-            $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-
-            // En mode visu
-            print '<table class="border" width="100%"><tr>';
-
-            // Ref
-            print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">';
-            print $form->showrefnav($object,'ref','',1,'ref');
-            print '</td>';
-
-            print '</tr>';
-
-            // Label
-            print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->libelle.'</td>';
-
-            $nblignes=7;
-            if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++;
-            if ($showbarcode) $nblignes+=2;
-            if ($object->type!=1) $nblignes++;
-            if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) $nblignes+=2;
-            if ($object->isservice()) $nblignes++;
-            else $nblignes+=4;
-
-            // Photo
-            if ($showphoto || $showbarcode)
-            {
-                print '<td valign="middle" align="center" width="25%" rowspan="'.$nblignes.'">';
-                if ($showphoto)   print $object->show_photos($conf->product->multidir_output[$object->entity],1,1,0,0,0,80);
-                if ($showphoto && $showbarcode) print '<br><br>';
-                if ($showbarcode) print $form->showbarcode($object);
-                print '</td>';
-            }
-
-            print '</tr>';
-
-            // Type
-            if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled))
-            {
-            	// TODO change for compatibility with edit in place
-            	$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
-                print '<tr><td>'.$form->editfieldkey("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat).'</td><td colspan="2">';
-                print $form->editfieldval("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat);
-                print '</td></tr>';
-            }
-
-            if ($showbarcode)
-            {
-                // Barcode type
-                print '<tr><td class="nowrap">';
-                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-                print $langs->trans("BarcodeType");
-                print '<td>';
-                if (($action != 'editbarcodetype') && $user->rights->barcode->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
-                print '</tr></table>';
-                print '</td><td colspan="2">';
-                if ($action == 'editbarcodetype')
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-                    $formbarcode = new FormBarCode($db);
-                    $formbarcode->form_barcode_type($_SERVER['PHP_SELF'].'?id='.$object->id,$object->barcode_type,'fk_barcode_type');
-                }
-                else
-                {
-                    $object->fetch_barcode();
-                    print $object->barcode_type_label?$object->barcode_type_label:($object->barcode?'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>':'');
-                }
-                print '</td></tr>'."\n";
-
-                // Barcode value
-                print '<tr><td class="nowrap">';
-                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-                print $langs->trans("BarcodeValue");
-                print '<td>';
-                if (($action != 'editbarcode') && $user->rights->barcode->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'),1).'</a></td>';
-                print '</tr></table>';
-                print '</td><td colspan="2">';
-                if ($action == 'editbarcode')
-                {
-                    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                    print '<input type="hidden" name="action" value="setbarcode">';
-                    print '<input type="hidden" name="barcode_type_code" value="'.$object->barcode_type_code.'">';
-                    print '<input size="40" type="text" name="barcode" value="'.$object->barcode.'">';
-                    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-                }
-                else
-                {
-                    print $object->barcode;
-                }
-                print '</td></tr>'."\n";
-            }
-
-            /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled))
-            {
-                // Don't show accounting field when accounting id disabled.
-            }
-            else
-            {*/
-                // Accountancy sell code
-                print '<tr><td>'.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
-                print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
-                print '</td></tr>';
-
-                // Accountancy buy code
-                print '<tr><td>'.$form->editfieldkey("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').'</td><td colspan="2">';
-                print $form->editfieldval("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string');
-                print '</td></tr>';
-            //}
-
-            // Status (to sell)
-            print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
-            print $object->getLibStatut(2,0);
-            print '</td></tr>';
-
-            // Status (to buy)
-            print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
-            print $object->getLibStatut(2,1);
-            print '</td></tr>';
-
-			// Batch number management (to batch)
-			if ($conf->productbatch->enabled) {
-				print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Lot").')</td><td colspan="2">';
-				print $object->getLibStatut(2,2);
-				print '</td></tr>';
-			}
-
-            // Description
-            print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description)?$object->description:dol_nl2br($object->description,1,true)).'</td></tr>';
-
-            // Public URL
-            print '<tr><td valign="top">'.$langs->trans("PublicUrl").'</td><td colspan="2">';
-			print dol_print_url($object->url);
-            print '</td></tr>';
-
-            // Nature
-            if($object->type!=1)
-            {
-                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="2">';
-                print $object->getLibFinished();
-                print '</td></tr>';
-            }
-
-            if ($object->isservice())
-            {
-                // Duration
-                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
-                if ($object->duration_value > 1)
-                {
-                    $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
-                }
-                else if ($object->duration_value > 0)
-                {
-                    $dur=array("h"=>$langs->trans("Hour"),"d"=>$langs->trans("Day"),"w"=>$langs->trans("Week"),"m"=>$langs->trans("Month"),"y"=>$langs->trans("Year"));
-                }
-                print (! empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
-
-                print '</td></tr>';
-            }
-            else
-            {
-                // Weight
-                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="2">';
-                if ($object->weight != '')
-                {
-                    print $object->weight." ".measuring_units_string($object->weight_units,"weight");
-                }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
-                // Length
-                print '<tr><td>'.$langs->trans("Length").'</td><td colspan="2">';
-                if ($object->length != '')
-                {
-                    print $object->length." ".measuring_units_string($object->length_units,"size");
-                }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
-                // Surface
-                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
-                if ($object->surface != '')
-                {
-                    print $object->surface." ".measuring_units_string($object->surface_units,"surface");
-                }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
-                // Volume
-                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
-                if ($object->volume != '')
-                {
-                    print $object->volume." ".measuring_units_string($object->volume_units,"volume");
-                }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
-            }
-
-        	// Custom code
-        	if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
-        	{
-	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
-
-            	// Origin country code
-            	print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id,0,$db).'</td>';
-        	}
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields);
-            }
-
-            // Note
-            print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>';
-
-            print "</table>\n";
-
-            dol_fiche_end();
-        }
-
-    }
-    else if ($action != 'create')
-    {
-        header("Location: index.php");
-        exit;
-    }
-}
-
-
-// Define confirmation messages
-$formquestionclone=array(
-	'text' => $langs->trans("ConfirmClone"),
-    array('type' => 'text', 'name' => 'clone_ref','label' => $langs->trans("NewRefForClone"), 'value' => $langs->trans("CopyOf").' '.$object->ref, 'size'=>24),
-    array('type' => 'checkbox', 'name' => 'clone_content','label' => $langs->trans("CloneContentProduct"), 'value' => 1),
-    array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true),
-    array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1)
-);
-
-// Confirm delete product
-if (($action == 'delete' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))	// Output when action = clone if jmobile or no js
-	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
-{
-    print $form->formconfirm("fiche.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
-}
-
-// Clone confirmation
-if (($action == 'clone' && (empty($conf->use_javascript_ajax) || ! empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
-	|| (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
-{
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestionclone,'yes','action-clone',250,600);
-}
-
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-print "\n".'<div class="tabsAction">'."\n";
-
-$parameters=array();
-$reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-if (empty($reshook))
-{
-	if ($action == '' || $action == 'view')
-	{
-	    if ($user->rights->produit->creer || $user->rights->service->creer)
-	    {
-	        if (! isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-
-	        if (! isset($object->no_button_copy) || $object->no_button_copy <> 1)
-	        {
-	            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-	            {
-	                print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";
-	            }
-	            else
-				{
-	                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
-	            }
-	        }
-	    }
-	    $object_is_used = $object->isObjectUsed($object->id);
-
-	    if (($object->type == 0 && $user->rights->produit->supprimer)
-	    || ($object->type == 1 && $user->rights->service->supprimer))
-	    {
-	        if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1))
-	        {
-	            if (! empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-	            {
-	                print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
-	            }
-	            else
-				{
-	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
-	            }
-	        }
-	        else
-			{
-	            print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';
-	        }
-	    }
-	    else
-		{
-	        print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';
-	    }
-	}
-}
-
-print "\n</div><br>\n";
-
-
-/*
- * All the "Add to" areas
- */
-
-if ($object->id && ($action == '' || $action == 'view') && $object->status)
-{
-    //Variable used to check if any text is going to be printed
-    $html = '';
-	//print '<div class="fichecenter"><div class="fichehalfleft">';
-
-    // Propals
-    if (! empty($conf->propal->enabled) && $user->rights->propale->creer)
-    {
-        $propal = new Propal($db);
-
-        $langs->load("propal");
-
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td class="liste_titre">'.$langs->trans("AddToDraftProposals").'</td>';
-        $html .= '</tr><tr>';
-        $html .= '<td valign="top">';
-
-        $var=true;
-        $otherprop = $propal->liste_array(2,1,0);
-        $html .= '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-        $html .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        $html .= '<table class="nobordernopadding" width="100%">';
-        if (is_array($otherprop) && count($otherprop))
-        {
-        	$var=!$var;
-        	$html .= '<tr '.$bc[$var].'><td style="width: 200px;">';
-        	$html .= '<input type="hidden" name="action" value="addinpropal">';
-        	$html .= $langs->trans("Proposals").'</td><td colspan="2">';
-        	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
-        	$html .= '</td></tr>';
-        	$html .= '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Quantity").' ';
-        	$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td><td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
-        	$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
-        	$html .= '</td><td align="right">';
-        	$html .= '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-        	$html .= '</td></tr>';
-        }
-        else
-        {
-        	$html .= "<tr ".$bc[!$var]."><td>";
-        	$html .= $langs->trans("NoDraftProposals");
-        	$html .= '</td></tr>';
-        }
-        $html .= '</table>';
-        $html .= '</form>';
-
-        $html .= '</td>';
-        $html .= '</tr>';
-    }
-
-    // Commande
-    if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
-    {
-        $commande = new Commande($db);
-
-        $langs->load("orders");
-
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td class="liste_titre">'.$langs->trans("AddToDraftOrders").'</td>';
-        $html .= '</tr><tr>';
-        $html .= '<td valign="top">';
-
-        $var=true;
-        $othercom = $commande->liste_array(2, 1, null);
-        $html .= '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-        $html .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        $html .= '<table class="nobordernopadding" width="100%">';
-        if (is_array($othercom) && count($othercom))
-        {
-        	$var=!$var;
-        	$html .= '<tr '.$bc[$var].'><td style="width: 200px;">';
-        	$html .= '<input type="hidden" name="action" value="addincommande">';
-        	$html .= $langs->trans("Orders").'</td><td colspan="2">';
-        	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
-        	$html .= '</td></tr>';
-        	$html .= '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Quantity").' ';
-        	$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td><td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
-        	$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
-        	$html .= '</td><td align="right">';
-        	$html .= '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-        	$html .= '</td></tr>';
-        }
-        else
-		{
-        	$html .= "<tr ".$bc[!$var]."><td>";
-        	$html .= $langs->trans("NoDraftOrders");
-        	$html .= '</td></tr>';
-        }
-        $html .= '</table>';
-        $html .= '</form>';
-
-        $html .= '</td>';
-        $html .= '</tr>';
-    }
-
-    // Factures
-    if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
-    {
-    	$invoice = new Facture($db);
-
-    	$langs->load("bills");
-
-    	$html .= '<tr class="liste_titre">';
-    	$html .= '<td class="liste_titre">'.$langs->trans("AddToDraftInvoices").'</td>';
-        $html .= '</tr><tr>';
-    	$html .= '<td valign="top">';
-
-    	$var=true;
-    	$otherinvoice = $invoice->liste_array(2, 1, null);
-    	$html .= '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-    	$html .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    	$html .= '<table class="nobordernopadding" width="100%">';
-    	if (is_array($otherinvoice) && count($otherinvoice))
-    	{
-    		$var=!$var;
-    		$html .= '<tr '.$bc[$var].'><td style="width: 200px;">';
-    		$html .= '<input type="hidden" name="action" value="addinfacture">';
-    		$html .= $langs->trans("Invoice").'</td><td colspan="2">';
-    		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
-    		$html .= '</td></tr>';
-    		$html .= '<tr '.$bc[$var].'><td class="nowrap">'.$langs->trans("Quantity").' ';
-    		$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td><td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
-    		$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
-    		$html .= '</td><td align="right">';
-    		$html .= '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-    		$html .= '</td></tr>';
-    	}
-    	else
-    	{
-    		$html .= "<tr ".$bc[!$var]."><td>";
-    		$html .= $langs->trans("NoDraftInvoices");
-    		$html .= '</td></tr>';
-    	}
-    	$html .= '</table>';
-    	$html .= '</form>';
-
-    	$html .= '</td>';
-    	$html .= '</tr>';
-    }
-
-    //If any text is going to be printed, then we show the table
-    if (!empty($html))
-    {
-        print '<table width="100%" class="noborder">';
-        print $html;
-        print '</table>';
-        print '<br>';
-    }
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 527615cc7c4..7e58a8e11b9 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -34,7 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 $langs->load("products");
 $langs->load("suppliers");
 $langs->load("bills");
-// Charges ????
 if (! empty($conf->margin->enabled)) $langs->load("margins");
 
 $id = GETPOST('id', 'int');
@@ -43,7 +42,7 @@ $rowid=GETPOST('rowid','int');
 $action=GETPOST('action', 'alpha');
 $socid=GETPOST('socid', 'int');
 $backtopage=GETPOST('backtopage','alpha');
-$error=0; $mesg = '';
+$error=0;
 
 // If socid provided by ajax company selector
 if (! empty($_REQUEST['search_fourn_id']))
@@ -60,14 +59,10 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('pricesuppliercard'));
+$hookmanager->initHooks(array('pricesuppliercard','globalcard'));
 $product = new ProductFournisseur($db);
 $product->fetch($id,$ref);
 
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=$hookmanager->errors;
-
-
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 
@@ -80,8 +75,8 @@ if (! $sortorder) $sortorder="ASC";
  */
 
 $parameters=array('socid'=>$socid, 'id_prod'=>$id);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if ($action == 'remove_pf')
 {
@@ -92,7 +87,7 @@ if ($action == 'remove_pf')
 		{
 			$result=$product->remove_product_fournisseur_price($rowid);
 			$action = '';
-			$mesg = '<div class="ok">'.$langs->trans("PriceRemoved").'.</div>';
+			setEventMessage($langs->trans("PriceRemoved"));
 		}
 	}
 }
@@ -112,27 +107,27 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
     if ($tva_tx == '')
     {
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")).'</div>';
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")), 'errors');
     }
 	if (empty($quantity))
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")), 'errors');
 	}
 	if (empty($ref_fourn))
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")), 'errors');
 	}
 	if ($id_fourn <= 0)
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")), 'errors');
 	}
 	if ($_POST["price"] < 0 || $_POST["price"] == '')
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors');
 	}
 
 	$product = new ProductFournisseur($db);
@@ -140,7 +135,7 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
 	if ($result <= 0)
 	{
 	    $error++;
-	    $mesg=$product->error;
+		setEventMessage($product->error, 'errors');
 	}
 
 	if (! $error)
@@ -157,12 +152,12 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
 				$product->fetch($product->product_id_already_linked);
 				$productLink = $product->getNomUrl(1,'supplier');
 
-				$mesg='<div class="error">'.$langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct",$productLink).'</div>';
+				setEventMessage($langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct",$productLink), 'errors');
 			}
 			else if ($ret < 0)
 			{
 				$error++;
-				$mesg='<div class="error">'.$product->error.'</div>';
+				setEventMessage($product->error, 'errors');
 			}
 		}
 
@@ -177,7 +172,7 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel"))
 			if ($ret < 0)
 			{
 				$error++;
-				$mesg='<div class="error">'.$product->error.'</div>';
+				setEventMessage($product->error, 'errors');
 			}
 		}
 
@@ -264,10 +259,6 @@ if ($id || $ref)
 
 			print "</div>\n";
 
-
-			dol_htmloutput_mesg($mesg);
-
-
 			// Form to add or update a price
 			if (($action == 'add_price' || $action == 'updateprice' ) && ($user->rights->produit->creer || $user->rights->service->creer))
 			{
@@ -391,15 +382,18 @@ if ($id || $ref)
 				print '</tr>';
 
 				// Charges ????
-				if (! empty($conf->margin->enabled))
+				if ($conf->global->PRODUCT_CHARGES)
 				{
-					print '<tr>';
-					print '<td>'.$langs->trans("Charges").'</td>';
-					print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges')?price(GETPOST('charges')):(isset($product->fourn_charges)?price($product->fourn_charges):'')).'">';
-	        		print '</td>';
-					print '</tr>';
+					if (! empty($conf->margin->enabled))
+					{
+						print '<tr>';
+						print '<td>'.$langs->trans("Charges").'</td>';
+						print '<td><input class="flat" name="charges" size="8" value="'.(GETPOST('charges')?price(GETPOST('charges')):(isset($product->fourn_charges)?price($product->fourn_charges):'')).'">';
+		        		print '</td>';
+						print '</tr>';
+					}
 				}
-
+				
 				if (is_object($hookmanager))
 				{
 					$parameters=array('id_fourn'=>$id_fourn,'prod_id'=>$product->id);
@@ -452,11 +446,17 @@ if ($id || $ref)
 				print '<td class="liste_titre" align="right">'.$langs->trans("VATRate").'</td>';
 				print '<td class="liste_titre" align="right">'.$langs->trans("PriceQtyMinHT").'</td>';
 				// Charges ????
-				if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("Charges").'</td>';
+				if ($conf->global->PRODUCT_CHARGES)
+				{
+					if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("Charges").'</td>';
+				}
 				print_liste_field_titre($langs->trans("UnitPriceHT"),$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder);
 				print '<td class="liste_titre" align="right">'.$langs->trans("DiscountQtyMin").'</td>';
 				// Charges ????
-				if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("UnitCharges").'</td>';
+				if ($conf->global->PRODUCT_CHARGES)
+				{
+					if (! empty($conf->margin->enabled)) print '<td align="right">'.$langs->trans("UnitCharges").'</td>';
+				}
 				print '<td class="liste_titre"></td>';
 				print "</tr>\n";
 
@@ -502,13 +502,16 @@ if ($id || $ref)
 						print '</td>';
 
 						// Charges ????
-						if (! empty($conf->margin->enabled))
-						{
-							print '<td align="right">';
-							print $productfourn->fourn_charges?price($productfourn->fourn_charges):"";
-							print '</td>';
+						if ($conf->global->PRODUCT_CHARGES)
+						{	
+							if (! empty($conf->margin->enabled))
+							{
+								print '<td align="right">';
+								print $productfourn->fourn_charges?price($productfourn->fourn_charges):"";
+								print '</td>';
+							}
 						}
-
+						
 						// Unit price
 						print '<td align="right">';
 						print price($productfourn->fourn_unitprice);
@@ -520,14 +523,17 @@ if ($id || $ref)
 						print price2num($productfourn->fourn_remise_percent).'%';
 						print '</td>';
 
-						// Unit Charges ???
-						if (! empty($conf->margin->enabled))
+						// Charges ????
+						if ($conf->global->PRODUCT_CHARGES)
 						{
-							print '<td align="right">';
-							print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):"&nbsp;");
-							print '</td>';
+							if (! empty($conf->margin->enabled))
+							{
+								print '<td align="right">';
+								print $productfourn->fourn_unitcharges?price($productfourn->fourn_unitcharges) : ($productfourn->fourn_qty?price($productfourn->fourn_charges/$productfourn->fourn_qty):"&nbsp;");
+								print '</td>';
+							}
 						}
-
+						
 						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 a8502498e41..4af7772f290 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C)      2014 Charles-Fr BENKE     <charles.fr@benke.fr>
+/* Copyright (C) 2001-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C)      2014	Charles-Fr BENKE		<charles.fr@benke.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,23 +77,23 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
  */
 $rowspan=2;
 if (! empty($conf->barcode->enabled)) $rowspan++;
-print '<form method="post" action="'.DOL_URL_ROOT.'/product/liste.php">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/product/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
 print "<tr class=\"liste_titre\">";
 print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print "<tr ".$bc[false]."><td>";
-print $langs->trans("Ref").':</td><td><input class="flat" type="text" size="14" name="sref"></td>';
+print '<label for="sref">'.$langs->trans("Ref").'</label>:</td><td><input class="flat" type="text" size="14" name="sref" id="sref"></td>';
 print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
 if (! empty($conf->barcode->enabled))
 {
 	print "<tr ".$bc[false]."><td>";
-	print $langs->trans("BarCode").':</td><td><input class="flat" type="text" size="14" name="sbarcode"></td>';
+	print '<label for="barcode">'.$langs->trans("BarCode").'</label>:</td><td><input class="flat" type="text" size="14" name="sbarcode" id="barcode"></td>';
 	//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 	print '</tr>';
 }
 print "<tr ".$bc[false]."><td>";
-print $langs->trans("Other").':</td><td><input class="flat" type="text" size="14" name="sall"></td>';
+print '<label for="sall">'.$langs->trans("Other").'</label>:</td><td><input class="flat" type="text" size="14" name="sall" id="sall"></td>';
 //print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 print '</tr>';
 print "</table></form><br>";
@@ -123,26 +123,26 @@ print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</
 if (! empty($conf->product->enabled))
 {
 	$statProducts = "<tr ".$bc[0].">";
-	$statProducts.= '<td><a href="liste.php?type=0&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ProductsNotOnSell").'</a></td><td align="right">'.round($prodser[0][0]).'</td>';
+	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ProductsNotOnSell").'</a></td><td align="right">'.round($prodser[0][0]).'</td>';
 	$statProducts.= "</tr>";
 	$statProducts.= "<tr ".$bc[1].">";
-	$statProducts.= '<td><a href="liste.php?type=0">'.$langs->trans("ProductsOnSell").'</a></td><td align="right">'.round($prodser[0][1]).'</td>';
+	$statProducts.= '<td><a href="list.php?type=0">'.$langs->trans("ProductsOnSell").'</a></td><td align="right">'.round($prodser[0][1]).'</td>';
 	$statProducts.= "</tr>";
 	$statProducts.= "<tr ".$bc[0].">";
-	$statProducts.= '<td><a href="liste.php?type=0&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ProductsOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[0][2]).'</td>';
+	$statProducts.= '<td><a href="list.php?type=0&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ProductsOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[0][2]).'</td>';
 	$statProducts.= "</tr>";
 
 }
 if (! empty($conf->service->enabled))
 {
 	$statServices = "<tr ".$bc[1].">";
-	$statServices.= '<td><a href="liste.php?type=1&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ServicesNotOnSell").'</a></td><td align="right">'.round($prodser[1][0]).'</td>';
+	$statServices.= '<td><a href="list.php?type=1&amp;tosell=0&amp;tobuy=0">'.$langs->trans("ServicesNotOnSell").'</a></td><td align="right">'.round($prodser[1][0]).'</td>';
 	$statServices.= "</tr>";
 	$statServices.= "<tr ".$bc[0].">";
-	$statServices.= '<td><a href="liste.php?type=1">'.$langs->trans("ServicesOnSell").'</a></td><td align="right">'.round($prodser[1][1]).'</td>';
+	$statServices.= '<td><a href="list.php?type=1">'.$langs->trans("ServicesOnSell").'</a></td><td align="right">'.round($prodser[1][1]).'</td>';
 	$statServices.= "</tr>";
 	$statServices.= "<tr ".$bc[1].">";
-	$statServices.= '<td><a href="liste.php?type=1&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ServicesOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[1][2]).'</td>';
+	$statServices.= '<td><a href="list.php?type=1&amp;tosell=1&amp;tobuy=1">'.$langs->trans("ServicesOnSellAndOnBuy").'</a></td><td align="right">'.round($prodser[1][2]).'</td>';
 	$statServices.= "</tr>";
 
 }
@@ -173,7 +173,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 	print '<br>';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
-	print '<tr><td align="center">';
+	print '<tr '.$bc[0].'><td align="center" colspan="2">';
 	$sql = "SELECT c.label, count(*) as nb";
 	$sql.= " FROM ".MAIN_DB_PREFIX."categorie_product as cs";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
@@ -367,7 +367,8 @@ function activitytrim($product_type)
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$tmpyear=$beginyear;
+		//$tmpyear=$beginyear; // FIXME $beginyear is not defined
+		$tmpyear=0;
 		$trim1=0;
 		$trim2=0;
 		$trim3=0;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
new file mode 100644
index 00000000000..a5cc97defa7
--- /dev/null
+++ b/htdocs/product/list.php
@@ -0,0 +1,556 @@
+<?php
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2013 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2013      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2013      Jean Heimburger   	<jean@tiaris.info>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Adolfo segura        <adolfo.segura@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/product/list.php
+ *  \ingroup    produit
+ *  \brief      Page to list products and services
+ */
+
+require '../main.inc.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/class/html.formother.class.php';
+if (! empty($conf->categorie->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+$langs->load("products");
+$langs->load("stocks");
+$langs->load("suppliers");
+
+$action = GETPOST('action');
+$sref=GETPOST("sref");
+$sbarcode=GETPOST("sbarcode");
+$snom=GETPOST("snom");
+$sall=GETPOST("sall");
+$type=GETPOST("type","int");
+$search_sale = GETPOST("search_sale");
+$search_categ = GETPOST("search_categ",'int');
+$tosell = GETPOST("tosell");
+$tobuy = GETPOST("tobuy");
+$fourn_id = GETPOST("fourn_id",'int');
+$catid = GETPOST('catid','int');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="p.ref";
+if (! $sortorder) $sortorder="ASC";
+
+$limit = $conf->liste_limit;
+
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$canvas=GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+    $objcanvas = new Canvas($db,$action);
+    $objcanvas->getCanvas('product','list',$canvas);
+}
+
+// Security check
+if ($type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
+else if ($type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
+else $result=restrictedArea($user,'produit|service','','','','','',$objcanvas);
+
+
+/*
+ * Actions
+ */
+
+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="";
+}
+
+
+/*
+ * View
+ */
+
+$htmlother=new FormOther($db);
+$form=new Form($db);
+
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
+{
+	$objcanvas->assign_values('list');       // This must contains code to load data (must call LoadListDatas($limit, $offset, $sortfield, $sortorder))
+    $objcanvas->display_canvas('list');  	 // This is code to show template
+}
+else
+{
+	$title=$langs->trans("ProductsAndServices");
+
+	if (isset($type))
+	{
+		if ($type==1)
+		{
+			$texte = $langs->trans("Services");
+		}
+		else
+		{
+			$texte = $langs->trans("Products");
+		}
+	}
+	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, p.desiredstock,';
+    $sql.= ' MIN(pfp.unitprice) as minsellprice';
+    $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 (! 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 (! empty($conf->global->MAIN_MULTILANGS))
+		{
+			$params[] = 'pl.label';
+			$params[] = 'pl.description';
+			$params[] = 'pl.note';
+		}
+		if (! empty($conf->barcode->enabled)) {
+			$params[] = 'p.barcode';
+		}
+		$sql .= natural_search($params, $sall);
+	}
+    // if the type is not 1, we show all products (type = 0,2,3)
+    if (dol_strlen($type))
+    {
+    	if ($type == 1) $sql.= " AND p.fk_product_type = '1'";
+    	else $sql.= " AND p.fk_product_type <> '1'";
+    }
+	if ($sref)     $sql .= natural_search('p.ref', $sref);
+    if ($sbarcode) $sql .= natural_search('p.barcode', $sbarcode);
+    if ($snom)
+	{
+		$params = array('p.label');
+		// multilang
+		if (! empty($conf->global->MAIN_MULTILANGS))
+		{
+			$params[] = 'pl.label';
+		}
+		$sql .= natural_search($params, $snom);
+	}
+    if (isset($tosell) && dol_strlen($tosell) > 0  && $tosell!=-1) $sql.= " AND p.tosell = ".$db->escape($tosell);
+    if (isset($tobuy) && dol_strlen($tobuy) > 0  && $tobuy!=-1)   $sql.= " AND p.tobuy = ".$db->escape($tobuy);
+    if (dol_strlen($canvas) > 0)                    $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
+    if ($catid > 0)    $sql.= " AND cp.fk_categorie = ".$catid;
+    if ($catid == -2)  $sql.= " AND cp.fk_categorie IS NULL";
+    if ($search_categ > 0)   $sql.= " AND cp.fk_categorie = ".$search_categ;
+    if ($search_categ == -2) $sql.= " AND cp.fk_categorie IS NULL";
+    if ($fourn_id > 0) $sql.= " AND pfp.fk_soc = ".$fourn_id;
+    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
+    $sql.= " p.fk_product_type, p.tms,";
+    $sql.= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte";
+    $sql .= ', p.desiredstock';
+    //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet
+
+    $nbtotalofrecords = 0;
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+	}
+
+    $sql.= $db->order($sortfield,$sortorder);
+    $sql.= $db->plimit($limit + 1, $offset);
+
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+    	$num = $db->num_rows($resql);
+
+    	$i = 0;
+
+    	if ($num == 1 && ($sall || $snom || $sref || $sbarcode) && $action != 'list')
+    	{
+    		$objp = $db->fetch_object($resql);
+    		header("Location: card.php?id=".$objp->rowid);
+    		exit;
+    	}
+
+    	$helpurl='';
+    	if (isset($type))
+    	{
+    		if ($type == 0)
+    		{
+    			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+    		}
+    		else if ($type == 1)
+    		{
+    			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+    		}
+    	}
+
+    	llxHeader('',$title,$helpurl,'');
+
+    	// Displays product removal confirmation
+    	if (GETPOST('delprod'))	{
+		    setEventMessage($langs->trans("ProductDeleted", GETPOST('delprod')));
+	    }
+
+    	$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy;
+    	$param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
+    	$param.=($search_categ?"&amp;search_categ=".$search_categ:"");
+    	$param.=isset($type)?"&amp;type=".$type:"";
+
+    	print_barre_liste($texte, $page, "list.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+
+    	if (! empty($catid))
+    	{
+    		print "<div id='ways'>";
+    		$c = new Categorie($db);
+    		$ways = $c->print_all_ways(' &gt; ','product/list.php');
+    		print " &gt; ".$ways[0]."<br>\n";
+    		print "</div><br>";
+    	}
+
+    	if (! empty($canvas) && file_exists(DOL_DOCUMENT_ROOT.'/product/canvas/'.$canvas.'/actions_card_'.$canvas.'.class.php'))
+    	{
+    		$fieldlist = $object->field_list;
+    		$datas = $object->list_datas;
+    		$picto='title.png';
+    		$title_picto = img_picto('',$picto);
+    		$title_text = $title;
+
+    		// Default templates directory
+    		$template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/'.$canvas.'/tpl/';
+    		// Check if a custom template is present
+    		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$canvas.'/list.tpl.php'))
+    		{
+    			$template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$canvas.'/';
+    		}
+
+    		include $template_dir.'list.tpl.php';	// Include native PHP templates
+    	}
+    	else
+    	{
+    		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+    		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    		print '<input type="hidden" name="action" value="list">';
+    		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    		print '<input type="hidden" name="type" value="'.$type.'">';
+
+    		print '<table class="liste" width="100%">';
+
+    		// Filter on categories
+    	 	$moreforfilter='';
+    	 	$colspan=6;
+    	 	if (! empty($conf->barcode->enabled)) $colspan++;
+    	 	if (! empty($conf->service->enabled) && $type != 0) $colspan++;
+    	 	if (empty($conf->global->PRODUIT_MULTIPRICES)) $colspan++;
+    	 	if ($user->rights->fournisseur->lire) $colspan++;
+    	 	if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) $colspan+=2;
+
+    		if (! empty($conf->categorie->enabled))
+    		{
+    		 	$moreforfilter.=$langs->trans('Categories'). ': ';
+    			$moreforfilter.=$htmlother->select_categories(0,$search_categ,'search_categ',1);
+    		 	$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
+    		}
+    	 	if ($moreforfilter)
+    		{
+    			print '<tr class="liste_titre">';
+    			print '<td class="liste_titre" colspan="'.$colspan.'">';
+    		    print $moreforfilter;
+    		    print '</td></tr>';
+    		}
+
+    		// Lignes des titres
+    		print '<tr class="liste_titre">';
+    		print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+    		print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+    		if (! empty($conf->barcode->enabled)) print_liste_field_titre($langs->trans("BarCode"), $_SERVER["PHP_SELF"], "p.barcode",$param,'','',$sortfield,$sortorder);
+    		print_liste_field_titre($langs->trans("DateModification"), $_SERVER["PHP_SELF"], "p.tms",$param,"",'align="center"',$sortfield,$sortorder);
+    		if (! empty($conf->service->enabled) && $type != 0) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
+    		if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellingPrice"), $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
+    		if ($user->rights->fournisseur->lire) print '<td class="liste_titre" align="right">'.$langs->trans("BuyingPriceMinShort").'</td>';
+    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("DesiredStock").'</td>';
+    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("PhysicalStock").'</td>';
+    		print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder);
+            print '<td width="1%">&nbsp;</td>';
+    		print "</tr>\n";
+
+    		// Lignes des champs de filtre
+    		print '<tr class="liste_titre">';
+    		print '<td class="liste_titre" align="left">';
+    		print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
+    		print '</td>';
+    		print '<td class="liste_titre" align="left">';
+    		print '<input class="flat" type="text" name="snom" size="12" value="'.$snom.'">';
+    		print '</td>';
+    		// Barcode
+    		if (! empty($conf->barcode->enabled))
+    		{
+    			print '<td class="liste_titre">';
+    			print '<input class="flat" type="text" name="sbarcode" size="6" value="'.$sbarcode.'">';
+    			print '</td>';
+    		}
+    		// Date modification
+    		print '<td class="liste_titre">';
+    		print '&nbsp;';
+    		print '</td>';
+
+    		// Duration
+    		if (! empty($conf->service->enabled) && $type != 0)
+    		{
+    			print '<td class="liste_titre">';
+    			print '&nbsp;';
+    			print '</td>';
+    		}
+
+    		// Sell price
+            if (empty($conf->global->PRODUIT_MULTIPRICES))
+            {
+        		print '<td class="liste_titre">';
+        		print '&nbsp;';
+        		print '</td>';
+            }
+
+    		// Minimum buying Price
+    		if ($user->rights->fournisseur->lire) {
+    			print '<td class="liste_titre">';
+    			print '&nbsp;';
+    			print '</td>';
+    		}
+
+    		// Stock
+    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)
+    		{
+    			print '<td class="liste_titre">';
+    			print '&nbsp;';
+    			print '</td>';
+    			//desiredstock
+    			print '<td class="liste_titre">';
+    			print '&nbsp;';
+    			print '</td>';
+    		}
+
+    		print '<td align="center">';
+            print $form->selectarray('tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')),$tosell,1);
+            print '</td >';
+
+            print '<td align="center">';
+            print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
+            print '</td>';
+
+    		print '<td class="liste_titre nowrap" align="right">';
+    		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+    		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+    		print '</td>';
+    		print '</tr>';
+
+
+    		$product_static=new Product($db);
+    		$product_fourn =new ProductFournisseur($db);
+
+    		$var=true;
+    		while ($i < min($num,$limit))
+    		{
+    			$objp = $db->fetch_object($resql);
+
+    			// Multilangs
+    			if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+    			{
+    				$sql = "SELECT label";
+    				$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
+    				$sql.= " WHERE fk_product=".$objp->rowid;
+    				$sql.= " AND lang='". $langs->getDefaultLang() ."'";
+    				$sql.= " LIMIT 1";
+
+    				$result = $db->query($sql);
+    				if ($result)
+    				{
+    					$objtp = $db->fetch_object($result);
+    					if (! empty($objtp->label)) $objp->label = $objtp->label;
+    				}
+    			}
+
+    			$var=!$var;
+    			print '<tr '.$bc[$var].'>';
+
+    			// Ref
+    			print '<td class="nowrap">';
+    			$product_static->id = $objp->rowid;
+    			$product_static->ref = $objp->ref;
+    			$product_static->type = $objp->fk_product_type;
+    			print $product_static->getNomUrl(1,'',24);
+    			print "</td>\n";
+
+    			// Label
+    			print '<td>'.dol_trunc($objp->label,40).'</td>';
+
+    			// Barcode
+    			if (! empty($conf->barcode->enabled))
+    			{
+    				print '<td>'.$objp->barcode.'</td>';
+    			}
+
+    			// Modification Date
+    			print '<td align="center">'.dol_print_date($db->jdate($objp->datem),'day')."</td>\n";
+
+    			// Duration
+    			if (! empty($conf->service->enabled) && $type != 0)
+    			{
+    				print '<td align="center">';
+    				if (preg_match('/([0-9]+)[a-z]/i',$objp->duration))
+    				{
+	    				if (preg_match('/([0-9]+)y/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
+	    				elseif (preg_match('/([0-9]+)m/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
+	    				elseif (preg_match('/([0-9]+)w/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek");
+	    				elseif (preg_match('/([0-9]+)d/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
+	    				//elseif (preg_match('/([0-9]+)h/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationHour");
+	    				else print $objp->duration;
+    				}
+    				print '</td>';
+    			}
+
+    			// Sell price
+    			if (empty($conf->global->PRODUIT_MULTIPRICES))
+    			{
+    			    print '<td align="right">';
+        			if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
+        			else print price($objp->price).' '.$langs->trans("HT");
+        			print '</td>';
+    			}
+
+    			// Better buy price
+    			if ($user->rights->fournisseur->lire)
+    			{
+        			print  '<td align="right">';
+        			if ($objp->minsellprice != '')
+        			{
+    					//print price($objp->minsellprice).' '.$langs->trans("HT");
+    					if ($product_fourn->find_min_price_product_fournisseur($objp->rowid) > 0)
+    					{
+    						if ($product_fourn->product_fourn_price_id > 0)
+    						{
+    							$htmltext=$product_fourn->display_price_product_fournisseur();
+    							if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
+    							else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
+    						}
+    					}
+        			}
+        			print '</td>';
+    			}
+
+    			// Show stock
+    			if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)
+    			{
+    				if ($objp->fk_product_type != 1)
+    				{
+    					$product_static->id = $objp->rowid;
+    					$product_static->load_stock();
+                        print '<td align="right">';
+                        print $objp->desiredstock;
+                        print '</td>';
+    					print '<td align="right">';
+                        if ($product_static->stock_reel < $objp->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+        				print $product_static->stock_reel;
+    					print '</td>';
+    				}
+    				else
+    				{
+		    			print '<td>';
+		    			print '&nbsp;';
+		    			print '</td>';
+		    			print '<td>';
+		    			print '&nbsp;';
+		    			print '</td>';
+    				}
+    			}
+
+                $product_static->status_buy = $objp->tobuy;
+                $product_static->status     = $objp->tosell;
+                // Status (to sell)
+                print '<td align="center" nowrap="nowrap">';
+                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);
+                }
+                print '</td>';
+
+                // Status (to buy)
+                print '<td align="center" nowrap="nowrap">';
+                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);
+                }
+                print '</td>';
+
+                print '<td>&nbsp;</td>';
+
+                print "</tr>\n";
+    			$i++;
+    		}
+
+    		$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy;
+    		$param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
+    		$param.=($search_categ?"&amp;search_categ=".$search_categ:"");
+    		$param.=isset($type)?"&amp;type=".$type:"";
+    		print_barre_liste('', $page, "list.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords);
+
+    		$db->free($resql);
+
+    		print "</table>";
+    		print '</form>';
+    	}
+    }
+    else
+    {
+    	dol_print_error($db);
+    }
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
deleted file mode 100644
index 44a6a69da2e..00000000000
--- a/htdocs/product/liste.php
+++ /dev/null
@@ -1,533 +0,0 @@
-<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2012-2013 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2013      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2013      Jean Heimburger   	<jean@tiaris.info>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013      Adolfo segura        <adolfo.segura@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       htdocs/product/liste.php
- *  \ingroup    produit
- *  \brief      Page to list products and services
- */
-
-require '../main.inc.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/class/html.formother.class.php';
-if (! empty($conf->categorie->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-$langs->load("products");
-$langs->load("stocks");
-$langs->load("suppliers");
-
-$action = GETPOST('action');
-$sref=GETPOST("sref");
-$sbarcode=GETPOST("sbarcode");
-$snom=GETPOST("snom");
-$sall=GETPOST("sall");
-$type=GETPOST("type","int");
-$search_sale = GETPOST("search_sale");
-$search_categ = GETPOST("search_categ",'int');
-$tosell = GETPOST("tosell");
-$tobuy = GETPOST("tobuy");
-$fourn_id = GETPOST("fourn_id",'int');
-$catid = GETPOST('catid','int');
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortfield) $sortfield="p.ref";
-if (! $sortorder) $sortorder="ASC";
-
-$limit = $conf->liste_limit;
-
-
-// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$canvas=GETPOST("canvas");
-$objcanvas='';
-if (! empty($canvas))
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db,$action);
-    $objcanvas->getCanvas('product','list',$canvas);
-}
-
-// Security check
-if ($type=='0') $result=restrictedArea($user,'produit','','','','','',$objcanvas);
-else if ($type=='1') $result=restrictedArea($user,'service','','','','','',$objcanvas);
-else $result=restrictedArea($user,'produit|service','','','','','',$objcanvas);
-
-
-/*
- * Actions
- */
-
-if (isset($_POST["button_removefilter_x"]))
-{
-	$sref="";
-	$sbarcode="";
-	$snom="";
-	$search_categ=0;
-}
-
-
-/*
- * View
- */
-
-$htmlother=new FormOther($db);
-$form=new Form($db);
-
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
-	$objcanvas->assign_values('list');       // This must contains code to load data (must call LoadListDatas($limit, $offset, $sortfield, $sortorder))
-    $objcanvas->display_canvas('list');  	 // This is code to show template
-}
-else
-{
-	$title=$langs->trans("ProductsAndServices");
-
-	if (isset($type))
-	{
-		if ($type==1)
-		{
-			$texte = $langs->trans("Services");
-		}
-		else
-		{
-			$texte = $langs->trans("Products");
-		}
-	}
-	else
-	{
-		$texte = $langs->trans("ProductsAndServices");
-	}
-
-    $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.= ' 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() ."'";
-	}
-	$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
-		{
-			$params[] = 'pl.description';
-			$params[] = 'pl.note';
-		}
-		if (! empty($conf->barcode->enabled)) {
-			$params[] = 'p.barcode';
-		}
-		$sql .= natural_search($params, $sall);
-	}
-    // if the type is not 1, we show all products (type = 0,2,3)
-    if (dol_strlen($type))
-    {
-    	if ($type == 1) $sql.= " AND p.fk_product_type = '1'";
-    	else $sql.= " AND p.fk_product_type <> '1'";
-    }
-	if ($sref)     $sql .= natural_search('p.ref', $sref);
-    if ($sbarcode) $sql .= natural_search('p.barcode', $sbarcode);
-    if ($snom)
-	{
-		$params = array('p.label');
-		// multilang
-		if ($conf->global->MAIN_MULTILANGS) // si l'option est active
-		{
-			$params[] = 'pl.label';
-		}
-		$sql .= natural_search($params, $snom);
-	}
-    if (isset($tosell) && dol_strlen($tosell) > 0  && $tosell!=-1) $sql.= " AND p.tosell = ".$db->escape($tosell);
-    if (isset($tobuy) && dol_strlen($tobuy) > 0  && $tobuy!=-1)   $sql.= " AND p.tobuy = ".$db->escape($tobuy);
-    if (dol_strlen($canvas) > 0)                    $sql.= " AND p.canvas = '".$db->escape($canvas)."'";
-    if ($catid > 0)    $sql.= " AND cp.fk_categorie = ".$catid;
-    if ($catid == -2)  $sql.= " AND cp.fk_categorie IS NULL";
-    if ($search_categ > 0)   $sql.= " AND cp.fk_categorie = ".$search_categ;
-    if ($search_categ == -2) $sql.= " AND cp.fk_categorie IS NULL";
-    if ($fourn_id > 0) $sql.= " AND pfp.fk_soc = ".$fourn_id;
-    $sql.= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";
-    $sql.= " p.fk_product_type, p.tms,";
-    $sql.= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte";
-    $sql .= ', p.desiredstock';
-    //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet
-
-    $nbtotalofrecords = 0;
-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	{
-		$result = $db->query($sql);
-		$nbtotalofrecords = $db->num_rows($result);
-	}
-
-    $sql.= $db->order($sortfield,$sortorder);
-    $sql.= $db->plimit($limit + 1, $offset);
-
-    dol_syslog("product:list.php: sql=".$sql);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-    	$num = $db->num_rows($resql);
-
-    	$i = 0;
-
-    	if ($num == 1 && ($sall || $snom || $sref || $sbarcode) && $action != 'list')
-    	{
-    		$objp = $db->fetch_object($resql);
-    		header("Location: fiche.php?id=".$objp->rowid);
-    		exit;
-    	}
-
-    	$helpurl='';
-    	if (isset($type))
-    	{
-    		if ($type == 0)
-    		{
-    			$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-    		}
-    		else if ($type == 1)
-    		{
-    			$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-    		}
-    	}
-
-    	llxHeader('',$title,$helpurl,'');
-
-    	// Displays product removal confirmation
-    	if (GETPOST('delprod'))	dol_htmloutput_mesg($langs->trans("ProductDeleted",GETPOST('delprod')));
-
-    	$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy;
-    	$param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
-    	$param.=($search_categ?"&amp;search_categ=".$search_categ:"");
-    	$param.=isset($type)?"&amp;type=".$type:"";
-
-    	print_barre_liste($texte, $page, "liste.php", $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
-
-    	if (! empty($catid))
-    	{
-    		print "<div id='ways'>";
-    		$c = new Categorie($db);
-    		$ways = $c->print_all_ways(' &gt; ','product/liste.php');
-    		print " &gt; ".$ways[0]."<br>\n";
-    		print "</div><br>";
-    	}
-
-    	if (! empty($canvas) && file_exists(DOL_DOCUMENT_ROOT.'/product/canvas/'.$canvas.'/actions_card_'.$canvas.'.class.php'))
-    	{
-    		$fieldlist = $object->field_list;
-    		$datas = $object->list_datas;
-    		$picto='title.png';
-    		$title_picto = img_picto('',$picto);
-    		$title_text = $title;
-
-    		// Default templates directory
-    		$template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/'.$canvas.'/tpl/';
-    		// Check if a custom template is present
-    		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$canvas.'/list.tpl.php'))
-    		{
-    			$template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$canvas.'/';
-    		}
-
-    		include $template_dir.'list.tpl.php';	// Include native PHP templates
-    	}
-    	else
-    	{
-    		print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
-    		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    		print '<input type="hidden" name="action" value="list">';
-    		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    		print '<input type="hidden" name="type" value="'.$type.'">';
-
-    		print '<table class="liste" width="100%">';
-
-    		// Filter on categories
-    	 	$moreforfilter='';
-    	 	$colspan=6;
-    	 	if (! empty($conf->barcode->enabled)) $colspan++;
-    	 	if (! empty($conf->service->enabled) && $type != 0) $colspan++;
-    	 	if (empty($conf->global->PRODUIT_MULTIPRICES)) $colspan++;
-    	 	if ($user->rights->fournisseur->lire) $colspan++;
-    	 	if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) $colspan+=2;
-
-    		if (! empty($conf->categorie->enabled))
-    		{
-    		 	$moreforfilter.=$langs->trans('Categories'). ': ';
-    			$moreforfilter.=$htmlother->select_categories(0,$search_categ,'search_categ',1);
-    		 	$moreforfilter.=' &nbsp; &nbsp; &nbsp; ';
-    		}
-    	 	if ($moreforfilter)
-    		{
-    			print '<tr class="liste_titre">';
-    			print '<td class="liste_titre" colspan="'.$colspan.'">';
-    		    print $moreforfilter;
-    		    print '</td></tr>';
-    		}
-
-    		// Lignes des titres
-    		print '<tr class="liste_titre">';
-    		print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
-    		print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
-    		if (! empty($conf->barcode->enabled)) print_liste_field_titre($langs->trans("BarCode"), $_SERVER["PHP_SELF"], "p.barcode",$param,'','',$sortfield,$sortorder);
-    		print_liste_field_titre($langs->trans("DateModification"), $_SERVER["PHP_SELF"], "p.tms",$param,"",'align="center"',$sortfield,$sortorder);
-    		if (! empty($conf->service->enabled) && $type != 0) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
-    		if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellingPrice"), $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
-    		if ($user->rights->fournisseur->lire) print '<td class="liste_titre" align="right">'.$langs->trans("BuyingPriceMinShort").'</td>';
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("DesiredStock").'</td>';
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("PhysicalStock").'</td>';
-    		print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder);
-            print '<td width="1%">&nbsp;</td>';
-    		print "</tr>\n";
-
-    		// Lignes des champs de filtre
-    		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre" align="left">';
-    		print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
-    		print '</td>';
-    		print '<td class="liste_titre" align="left">';
-    		print '<input class="flat" type="text" name="snom" size="12" value="'.$snom.'">';
-    		print '</td>';
-			
-			// Barcode
-    		if (! empty($conf->barcode->enabled))
-    		{
-    			print '<td class="liste_titre">';
-    			print '<input class="flat" type="text" name="sbarcode" size="6" value="'.$sbarcode.'">';
-    			print '</td>';
-    		}
-			
-			// Date modification
-    		print '<td class="liste_titre">';
-    		print '&nbsp;';
-    		print '</td>';
-
-    		// Duration
-    		if (! empty($conf->service->enabled) && $type != 0)
-    		{
-    			print '<td class="liste_titre">';
-    			print '&nbsp;';
-    			print '</td>';
-    		}
-
-    		// Sell price
-            if (empty($conf->global->PRODUIT_MULTIPRICES))
-            {
-        		print '<td class="liste_titre">';
-        		print '&nbsp;';
-        		print '</td>';
-            }
-
-    		// Minimum buying Price
-    		if ($user->rights->fournisseur->lire) {
-    			print '<td class="liste_titre">';
-    			print '&nbsp;';
-    			print '</td>';
-    		}
-
-    		// Stock
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)
-    		{
-    			print '<td class="liste_titre">';
-    			print '&nbsp;';
-    			print '</td>';
-    			// Desired stock
-    			print '<td class="liste_titre">';
-    			print '&nbsp;';
-    			print '</td>';
-    		}
-
-    		print '<td align="center">';
-            print $form->selectarray('tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')),$tosell,1);
-            print '</td >';
-
-            print '<td align="center">';
-            print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
-            print '</td>';
-
-    		print '<td class="liste_titre" align="right">';
-    		print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    		print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    		print '</td>';
-    		print '</tr>';
-
-
-    		$product_static=new Product($db);
-    		$product_fourn =new ProductFournisseur($db);
-
-    		$var=true;
-    		while ($i < min($num,$limit))
-    		{
-    			$objp = $db->fetch_object($resql);
-
-    			// Multilangs
-    			if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-    			{
-    				$sql = "SELECT label";
-    				$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
-    				$sql.= " WHERE fk_product=".$objp->rowid;
-    				$sql.= " AND lang='". $langs->getDefaultLang() ."'";
-    				$sql.= " LIMIT 1";
-
-    				$result = $db->query($sql);
-    				if ($result)
-    				{
-    					$objtp = $db->fetch_object($result);
-    					if (! empty($objtp->label)) $objp->label = $objtp->label;
-    				}
-    			}
-
-    			$var=!$var;
-    			print '<tr '.$bc[$var].'>';
-
-    			// Ref
-    			print '<td class="nowrap">';
-    			$product_static->id = $objp->rowid;
-    			$product_static->ref = $objp->ref;
-    			$product_static->type = $objp->fk_product_type;
-    			print $product_static->getNomUrl(1,'',24);
-    			print "</td>\n";
-
-    			// Label
-    			print '<td>'.dol_trunc($objp->label,40).'</td>';
-
-    			// Barcode
-    			if (! empty($conf->barcode->enabled))
-    			{
-    				print '<td>'.$objp->barcode.'</td>';
-    			}
-
-    			// Modification Date
-    			print '<td align="center">'.dol_print_date($db->jdate($objp->datem),'day')."</td>\n";
-
-    			// Duration
-    			if (! empty($conf->service->enabled) && $type != 0)
-    			{
-    				print '<td align="center">';
-    				if (preg_match('/([0-9]+)[a-z]/i',$objp->duration))
-    				{
-	    				if (preg_match('/([0-9]+)y/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear");
-	    				elseif (preg_match('/([0-9]+)m/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth");
-	    				elseif (preg_match('/([0-9]+)w/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationWeek");
-	    				elseif (preg_match('/([0-9]+)d/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay");
-	    				//elseif (preg_match('/([0-9]+)h/i',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationHour");
-	    				else print $objp->duration;
-    				}
-    				print '</td>';
-    			}
-
-    			// Sell price
-    			if (empty($conf->global->PRODUIT_MULTIPRICES))
-    			{
-    			    print '<td align="right">';
-        			if ($objp->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
-        			else print price($objp->price).' '.$langs->trans("HT");
-        			print '</td>';
-    			}
-
-    			// Better buy price
-    			if ($user->rights->fournisseur->lire)
-    			{
-        			print  '<td align="right">';
-        			if ($objp->minsellprice != '')
-        			{
-    					//print price($objp->minsellprice).' '.$langs->trans("HT");
-    					if ($product_fourn->find_min_price_product_fournisseur($objp->rowid) > 0)
-    					{
-    						if ($product_fourn->product_fourn_price_id > 0)
-    						{
-    							$htmltext=$product_fourn->display_price_product_fournisseur();
-    							if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
-    							else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
-    						}
-    					}
-        			}
-        			print '</td>';
-    			}
-
-    			// Show stock
-    			if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)
-    			{
-    				if ($objp->fk_product_type != 1)
-    				{
-    					$product_static->id = $objp->rowid;
-    					$product_static->load_stock();
-                        print '<td align="right">';
-                        print $objp->desiredstock;
-                        print '</td>';
-    					print '<td align="right">';
-                        if ($product_static->stock_reel < $objp->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
-        				print $product_static->stock_reel;
-    					print '</td>';
-    				}
-    			}
-
-    			// Status (to buy)
-    			print '<td align="center" class="nowrap">'.$product_static->LibStatut($objp->tosell,5,0).'</td>';
-
-                // Status (to sell)
-                print '<td align="center" class="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>';
-
-                print '<td>&nbsp;</td>';
-
-                print "</tr>\n";
-    			$i++;
-    		}
-
-    		$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy;
-    		$param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
-    		$param.=($search_categ?"&amp;search_categ=".$search_categ:"");
-    		$param.=isset($type)?"&amp;type=".$type:"";
-    		print_barre_liste('', $page, "liste.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords);
-
-    		$db->free($resql);
-
-    		print "</table>";
-    		print '</form>';
-    	}
-    }
-    else
-    {
-    	dol_print_error($db);
-    }
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index 306ee51d210..0ae65a7dec6 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -26,6 +26,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
@@ -59,7 +60,20 @@ if ($id > 0 || ! empty($ref))
 
 if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	if ($object->id) $result = $object->add_photo($dir, $_FILES['userfile']);
+	if ($object->id)
+	{
+		if (image_format_supported($_FILES['userfile']['name']) >= 1)
+		{
+			$result = $object->add_photo($dir, $_FILES['userfile']);
+			if ($result > 0) setEventMessage($langs->trans("FileUploaded"));
+			else setEventMessage($langs->trans("FileNotUploaded"), 'errors');
+		}
+		else
+		{
+			$langs->load("errors");
+			setEventMessage($langs->trans("ErrorBadImageFormat"), 'errors');
+		}
+	}
 }
 
 if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -130,13 +144,17 @@ if ($object->id)
 	print "</div>\n";
 
 
+	$permtoedit=0;
+	if ($user->rights->produit->creer && $object->type == 0) $permtoedit=1;
+	if ($user->rights->service->creer && $object->type == 1) $permtoedit=1;
+	if (empty($conf->global->MAIN_UPLOAD_DOC)) $permtoedit=0;
 
 	/* ************************************************************************** */
 	/*                                                                            */
 	/* Barre d'action                                                             */
 	/*                                                                            */
 	/* ************************************************************************** */
-
+/*
 	print "\n<div class=\"tabsAction\">\n";
 
 	if ($action != 'ajout_photo' && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -154,16 +172,17 @@ if ($object->id)
 	}
 
 	print "\n</div>\n";
-
+*/
 	/*
 	 * Add a photo
 	 */
-	if ($action == 'ajout_photo' && ($user->rights->produit->creer || $user->rights->service->creer) && ! empty($conf->global->MAIN_UPLOAD_DOC))
+	if ($permtoedit)
 	{
-		// Affiche formulaire upload
+		// Show upload form
 		$formfile=new FormFile($db);
-		$formfile->form_attach_new_file($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("AddPhoto"), 1, 0, ($user->rights->produit->creer || $user->rights->service->creer), 50, $object, '', false, '', 0); // ajax=false for the moment. true may not work.
+		$formfile->form_attach_new_file($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("AddPhoto"), 1, 0, $permtoedit, 50, $object, '', false, '', 0); // ajax=false for the moment. true may not work.
 	}
+	//else print $langs->trans("NoPermissionToAddOrEditPhoto").'<br><br>';	// TODO Add this
 
 	// Affiche photos
 	if ($action != 'ajout_photo')
@@ -174,11 +193,10 @@ if ($object->id)
 		$maxWidth = 160;
 		$maxHeight = 120;
 
-		print $object->show_photos($dir,1,1000,$nbbyrow,1,1);
+		print $object->show_photos($dir,1,1000,$nbbyrow,1,($permtoedit?1:0));
 
 		if ($object->nbphoto < 1)
 		{
-			print '<br>';
 			print '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">';
 			print '<tr align=center valign=middle border=1><td class="photo">';
 			print "<br>".$langs->trans("NoPhotoYet")."<br><br>";
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index fe619531f48..92ad4cfbe1f 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -95,16 +95,16 @@ if ($type !== '') {
 	}
 }
 
-print_barre_liste($title, $page, "popuprop.php",$param,"","","",$num);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$param,"","","",$num);
 
 
 print '<table class="noborder" width="100%">';
 
 print "<tr class=\"liste_titre\">";
-print_liste_field_titre($langs->trans('Ref'), 'popuprop.php', 'p.ref', '', '', '', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('Type'), 'popuprop.php', 'p.type', '', '', '', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('Label'), 'popuprop.php', 'p.label', '', '', '', $sortfield, $sortorder);
-print_liste_field_titre($langs->trans('NbOfProposals'), 'popuprop.php', 'c', '', '', 'align="right"', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', '', '', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.type', '', '', '', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', '', '', $sortfield, $sortorder);
+print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', '', 'align="right"', $sortfield, $sortorder);
 print "</tr>\n";
 
 $sql  = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, count(*) as c";
@@ -149,7 +149,7 @@ if ($result)
 
 		$var=!$var;
 		print "<tr ".$bc[$var].">";
-		print '<td><a href="'.DOL_URL_ROOT.'/product/stats/fiche.php?id='.$objp->rowid.'">';
+		print '<td><a href="'.DOL_URL_ROOT.'/product/stats/card.php?id='.$objp->rowid.'">';
 		if ($objp->type==1) print img_object($langs->trans("ShowService"),"service");
 		else print img_object($langs->trans("ShowProduct"),"product");
 		print " ";
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 856a68face6..98cfd675fac 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2014		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2014 	    Philippe Grand 		    <philippe.grand@atoo-net.com>
  *
  * 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
@@ -52,13 +53,26 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 
 $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;
+	$maxpricesupplier = $object->min_recommended_price();
+
 	// MultiPrix
 	if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	{
@@ -93,17 +107,25 @@ if ($action == 'update_price' && ! $_POST ["cancel"] && ($user->rights->produit-
 		$newpsq = empty($newpsq) ? 0 : $newpsq;
 	}
 
+	if (! empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier)
+	{
+		setEventMessage($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')),'errors');
+		$error++;
+		$action='edit_price';
+	}
+
 	if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0) {
 		$action = '';
-		$mesg = '<div class="ok">' . $langs->trans("RecordSaved") . '</div>';
+		setEventMessage($langs->trans("RecordSaved"));
 	} else {
 		$action = 'edit_price';
-		$mesg = '<div class="error">' . $object->error . '</div>';
+		setEventMessage($object->error, 'errors');
 	}
 } else if ($action == 'delete' && $user->rights->produit->supprimer) {
 	$result = $object->log_price_delete($user, $_GET ["lineid"]);
-	if ($result < 0)
-		$mesg = '<div class="error">' . $object->error . '</div>';
+	if ($result < 0) {
+		setEventMessage($object->error, 'errors');
+	}
 }
 
 /**
@@ -137,11 +159,11 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu
 
 	if (empty($quantity)) {
 		$error ++;
-		$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Qty")) . '</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentities("Qty")), 'errors');
 	}
 	if (empty($newprice)) {
 		$error ++;
-		$mesg = '<div class="error">' . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")) . '</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), 'errors');
 	}
 	if (! $error) {
 		// Calcul du prix HT et du prix unitaire
@@ -197,6 +219,9 @@ if ($action == 'delete_all_price_by_qty') {
  */
 if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 
+	$error=0;
+	$maxpricesupplier = $object->min_recommended_price();
+
 	$update_child_soc = GETPOST('updatechildprice');
 
 	$result = $object->fetch($id);
@@ -210,15 +235,25 @@ if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->ri
 	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
 	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
-	$result = $prodcustprice->create($user, 0, $update_child_soc);
-
-	if ($result < 0) {
-		setEventMessage($prodcustprice->error, 'errors');
-	} else {
-		setEventMessage($langs->trans('Save'), 'mesgs');
+	if (! empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $prodcustprice->price_min<$maxpricesupplier)
+	{
+		setEventMessage($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')),'errors');
+		$error++;
+		$action='add_customer_price';
 	}
 
-	$action = '';
+	if (! $error)
+	{
+		$result = $prodcustprice->create($user, 0, $update_child_soc);
+
+		if ($result < 0) {
+			setEventMessage($prodcustprice->error, 'errors');
+		} else {
+			setEventMessage($langs->trans('Save'), 'mesgs');
+		}
+
+		$action = '';
+	}
 }
 
 if ($action == 'delete_customer_price' && ($user->rights->produit->supprimer || $user->rights->service->supprimer)) {
@@ -236,6 +271,11 @@ if ($action == 'delete_customer_price' && ($user->rights->produit->supprimer ||
 
 if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 
+	$result = $object->fetch($id);
+
+	$error=0;
+	$maxpricesupplier = $object->min_recommended_price();
+
 	$update_child_soc = GETPOST('updatechildprice');
 
 	$prodcustprice->fetch(GETPOST('lineid', 'int'));
@@ -247,15 +287,25 @@ if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user-
 	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
 	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
-	$result = $prodcustprice->update($user, 0, $update_child_soc);
-
-	if ($result < 0) {
-		setEventMessage($prodcustprice->error, 'errors');
-	} else {
-		setEventMessage($langs->trans('Save'), 'mesgs');
+	if ($prodcustprice->price_min<$maxpricesupplier && !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
+	{
+		setEventMessage($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')),'errors');
+		$error++;
+		$action='update_customer_price';
 	}
 
-	$action = '';
+	if ( ! $error)
+	{
+		$result = $prodcustprice->update($user, 0, $update_child_soc);
+
+		if ($result < 0) {
+			setEventMessage($prodcustprice->error, 'errors');
+		} else {
+			setEventMessage($langs->trans('Save'), 'mesgs');
+		}
+
+		$action = '';
+	}
 }
 
 /*
@@ -299,21 +349,23 @@ if ($isphoto) {
 print '</tr>';
 
 // MultiPrix
-if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
-	if (! empty($socid)) {
+if (! empty($conf->global->PRODUIT_MULTIPRICES))
+{
+	if (! empty($socid))
+	{
 		$soc = new Societe($db);
 		$soc->id = $socid;
 		$soc->fetch($socid);
 
 		print '<tr><td>' . $langs->trans("SellingPrice") . '</td>';
 
-		if ($object->multiprices_base_type ["$soc->price_level"] == 'TTC') {
+		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') {
 			print '<td>' . price($object->multiprices_ttc ["$soc->price_level"]);
 		} else {
 			print '<td>' . price($object->multiprices ["$soc->price_level"]);
 		}
 
-		if ($object->multiprices_base_type ["$soc->price_level"]) {
+		if ($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);
@@ -322,15 +374,16 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 
 		// Prix mini
 		print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
-		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"]);
+		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 {
-			print price($object->multiprices_min ["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]);
+			print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]);
 		}
 		print '</td></tr>';
 
 		// TVA
-		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->multiprices_tva_tx ["$soc->price_level"], true) . '</td></tr>';
+		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . '</td></tr>';
 	}
 	else
 	{
@@ -351,12 +404,12 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 			print '</td>';
 
 			if ($object->multiprices_base_type ["$i"] == 'TTC') {
-				print '<td>' . price($object->multiprices_ttc ["$i"]);
+				print '<td>' . price($object->multiprices_ttc["$i"]);
 			} else {
-				print '<td>' . price($object->multiprices ["$i"]);
+				print '<td>' . price($object->multiprices["$i"]);
 			}
 
-			if ($object->multiprices_base_type ["$i"]) {
+			if ($object->multiprices_base_type["$i"]) {
 				print ' ' . $langs->trans($object->multiprices_base_type ["$i"]);
 			} else {
 				print ' ' . $langs->trans($object->price_base_type);
@@ -366,10 +419,10 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 			// Prix mini
 			print '<tr><td>' . $langs->trans("MinPrice") . ' ' . $i . '</td><td>';
 			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"]);
@@ -377,12 +430,13 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 			print '</td></tr>';
 
 			// Price by quantity
-			if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+			{
 				print '<tr><td>' . $langs->trans("PriceByQuantity") . ' ' . $i;
 				print '</td><td>';
 
 				if ($object->prices_by_qty [$i] == 1) {
-					print '<table width="50%" class="noborder">';
+					print '<table width="50%" class="border" summary="List of quantities">';
 
 					print '<tr class="liste_titre">';
 					print '<td>' . $langs->trans("PriceByQuantityRange") . ' ' . $i . '</td>';
@@ -392,30 +446,30 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 					print '<td>&nbsp;</td>';
 					print '</tr>';
 					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 '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 							print '<input type="hidden" name="action" value="update_price_by_qty">';
-							print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [$i] . '">';
-							print '<input type="hidden" value="' . $prices ['rowid'] . '" name="rowid">';
+							print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[$i] . '">';
+							print '<input type="hidden" value="' . $prices['rowid'] . '" name="rowid">';
 							print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-							print '<td><input size="5" type="text" value="' . $prices ['quantity'] . '" name="quantity"></td>';
-							print '<td align="right" colspan="2"><input size="10" type="text" value="' . $prices ['price'] . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
+							print '<td><input size="5" type="text" value="' . $prices['quantity'] . '" name="quantity"></td>';
+							print '<td align="right" colspan="2"><input size="10" type="text" value="' . price2num($prices['price'], 'MU') . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
 							// print '<td align="right">&nbsp;</td>';
-							print '<td align="right"><input size="5" type="text" value="' . $prices ['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
+							print '<td align="right"><input size="5" type="text" value="' . $prices['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
 							print '<td align="center"><input type="submit" value="' . $langs->trans("Modify") . '" class="button"></td>';
 							print '</tr>';
 							print '</form>';
 						} else {
 							print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
 							print '<td>' . $prices ['quantity'] . '</td>';
-							print '<td align="right">' . price($prices ['price']) . '</td>';
-							print '<td align="right">' . price($prices ['unitprice']) . '</td>';
-							print '<td align="right">' . price($prices ['remise_percent']) . ' %</td>';
+							print '<td align="right">' . price($prices['price']) . '</td>';
+							print '<td align="right">' . price($prices['unitprice']) . '</td>';
+							print '<td align="right">' . price($prices['remise_percent']) . ' %</td>';
 							print '<td align="center">';
 							if (($user->rights->produit->creer || $user->rights->service->creer)) {
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 								print img_edit() . '</a>';
-								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+								print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 								print img_delete() . '</a>';
 							} else {
 								print '&nbsp;';
@@ -427,7 +481,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 					if ($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 						print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 						print '<input type="hidden" name="action" value="update_price_by_qty">';
-						print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [$i] . '">';
+						print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[$i] . '">';
 						print '<input type="hidden" value="0" name="rowid">';
 						print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
 						print '<td><input size="5" type="text" value="1" name="quantity"></td>';
@@ -471,7 +525,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 	print '</td></tr>';
 
 	// Price by quantity
-	if ($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) {
+	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+	{
 		print '<tr><td>' . $langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty [0] == 0) {
 			print '&nbsp;<a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=activate_price_by_qty&level=1">' . $langs->trans("Activate");
@@ -479,7 +534,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 		print '</td><td>';
 
 		if ($object->prices_by_qty [0] == 1) {
-			print '<table width="50%" class="noborder">';
+			print '<table width="50%" class="border" summary="List of quantities">';
 			print '<tr class="liste_titre">';
 			print '<td>' . $langs->trans("PriceByQuantityRange") . '</td>';
 			print '<td align="right">' . $langs->trans("HT") . '</td>';
@@ -487,31 +542,33 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
 			print '<td align="right">' . $langs->trans("Discount") . '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-			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 '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 					print '<input type="hidden" name="action" value="update_price_by_qty">';
-					print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id [0] . '">';
-					print '<input type="hidden" value="' . $prices ['rowid'] . '" name="rowid">';
+					print '<input type="hidden" name="priceid" value="' . $object->prices_by_qty_id[0] . '">';
+					print '<input type="hidden" value="' . $prices['rowid'] . '" name="rowid">';
 					print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-					print '<td><input size="5" type="text" value="' . $prices ['quantity'] . '" name="quantity"></td>';
-					print '<td align="right" colspan="2"><input size="10" type="text" value="' . $prices ['price'] . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
+					print '<td><input size="5" type="text" value="' . $prices['quantity'] . '" name="quantity"></td>';
+					print '<td align="right" colspan="2"><input size="10" type="text" value="' . price2num($prices['price'], 'MU') . '" name="price">&nbsp;' . $object->price_base_type . '</td>';
 					// print '<td align="right">&nbsp;</td>';
-					print '<td align="right"><input size="5" type="text" value="' . $prices ['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
+					print '<td align="right"><input size="5" type="text" value="' . $prices['remise_percent'] . '" name="remise_percent">&nbsp;%</td>';
 					print '<td align="center"><input type="submit" value="' . $langs->trans("Modify") . '" class="button"></td>';
 					print '</tr>';
 					print '</form>';
 				} else {
 					print '<tr class="' . ($ii % 2 == 0 ? 'pair' : 'impair') . '">';
-					print '<td>' . $prices ['quantity'] . '</td>';
-					print '<td align="right">' . price($prices ['price']) . '</td>';
-					print '<td align="right">' . price($prices ['unitprice']) . '</td>';
-					print '<td align="right">' . price($prices ['remise_percent']) . ' %</td>';
+					print '<td>' . $prices['quantity'] . '</td>';
+					print '<td align="right">' . price($prices['price']) . '</td>';
+					print '<td align="right">' . price($prices['unitprice']) . '</td>';
+					print '<td align="right">' . price($prices['remise_percent']) . ' %</td>';
 					print '<td align="center">';
 					if (($user->rights->produit->creer || $user->rights->service->creer)) {
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=edit_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 						print img_edit() . '</a>';
-						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices ["rowid"] . '">';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete_price_by_qty&amp;rowid=' . $prices["rowid"] . '">';
 						print img_delete() . '</a>';
 					} else {
 						print '&nbsp;';
@@ -552,10 +609,6 @@ print "</table>\n";
 
 print "</div>\n";
 
-if (! empty($mesg)) {
-	dol_htmloutput_mesg($mesg);
-}
-
 /* ************************************************************************** */
 /*                                                                            */
 /* Barre d'action                                                             */
@@ -620,6 +673,10 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 		} else {
 			print '<td><input name="price_min" size="10" value="' . price($object->price_min) . '">';
 		}
+		if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
+		{
+			print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
+		}
 		print '</td></tr>';
 
 		print '</table>';
@@ -667,6 +724,10 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			} else {
 				print '<td><input name="price_min_' . $i . '" size="10" value="' . price($object->multiprices_min ["$i"]) . '">';
 			}
+			if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
+			{
+				print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
+			}
 			print '</td></tr>';
 
 			print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '">&nbsp;';
@@ -691,7 +752,6 @@ if (! empty($socid) && ! empty($conf->global->PRODUIT_MULTIPRICES))
 $sql .= " ORDER BY p.date_price DESC, p.price_level ASC";
 // $sql .= $db->plimit();
 
-dol_syslog("sql=" . $sql);
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
@@ -747,7 +807,8 @@ if ($result) {
 				print '<td align="center">' . $objp->price_level . "</td>";
 			}
 			// 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 '<td align="center">' . $langs->trans($type) . "</td>";
 			}
@@ -760,7 +821,7 @@ if ($result) {
 			print '<td align="right">' . price($objp->price_min_ttc) . '</td>';
 
 			// User
-			print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/fiche.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>';
+			print '<td align="right"><a href="' . DOL_URL_ROOT . '/user/card.php?id=' . $objp->user_id . '">' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . '</a></td>';
 
 			// Action
 			if ($user->rights->produit->supprimer) {
@@ -814,6 +875,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	if ($action == 'add_customer_price') {
 
 		// Create mode
+		$maxpricesupplier = $object->min_recommended_price();
 
 		print_fiche_titre($langs->trans('PriceByCustomer'));
 
@@ -864,6 +926,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		} else {
 			print '<td><input name="price_min" size="10" value="' . price($object->price_min) . '">';
 		}
+		if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
+		{
+			print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
+		}
 		print '</td></tr>';
 
 		// Update all child soc
@@ -884,6 +950,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	} elseif ($action == 'edit_customer_price') {
 
 		// Edit mode
+		$maxpricesupplier = $object->min_recommended_price();
 
 		print_fiche_titre($langs->trans('PriceByCustomer'));
 
@@ -901,11 +968,11 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<td>' . $langs->trans('ThirdParty') . '</td>';
 		$staticsoc = new Societe($db);
 		$staticsoc->fetch($prodcustprice->fk_soc);
-		print "<td>" . $staticsoc->getNomUrl(1) . "</td>";
+		print "<td colspan='2'>" . $staticsoc->getNomUrl(1) . "</td>";
 		print '</tr>';
 
 		// VAT
-		print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
+		print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">';
 		print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly);
 		print '</td></tr>';
 
@@ -940,7 +1007,12 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		} else {
 			print '<input name="price_min" size="10" value="' . price($prodcustprice->price_min) . '">';
 		}
-		print '</td></tr>';
+		print '</td>';
+		if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
+		{
+			print '<td align="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier,0,'',1,-1,-1,'auto')).' '.img_warning().'</td>';
+		}
+		print '</tr>';
 
 		// Update all child soc
 		print '<tr><td width="15%">';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index d0b8c961afa..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';
@@ -173,7 +173,7 @@ if ($resql)
 	if ($num == 1 && ($sall or $snom or $sref))
 	{
 		$objp = $db->fetch_object($resql);
-		header("Location: fiche.php?id=$objp->rowid");
+		header("Location: card.php?id=$objp->rowid");
 		exit;
 	}
 
@@ -194,11 +194,11 @@ if ($resql)
 
 	if ($sref || $snom || $sall || GETPOST('search'))
 	{
-		print_barre_liste($texte, $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
 	}
 	else
 	{
-		print_barre_liste($texte, $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":""), $sortfield, $sortorder,'',$num);
+		print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&amp;type=$type":""), $sortfield, $sortorder,'',$num);
 	}
 
 	if (! empty($catid))
@@ -211,7 +211,7 @@ if ($resql)
 		print "</div><br>";
 	}
 
-	print '<form action="reassort.php" method="post" name="formulaire">';
+	print '<form action="'. $_SERVER["PHP_SELF"] .'" method="post" name="formulaire">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -240,12 +240,12 @@ if ($resql)
 
 	// Lignes des titres
 	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"),"reassort.php", "p.ref",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),"reassort.php", "p.label",$param,"","",$sortfield,$sortorder);
-	if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"),"reassort.php", "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("StockLimit"),"reassort.php", "p.seuil_stock_alerte",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("DesiredStock"),"reassort.php", "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("PhysicalStock"),"reassort.php", "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "p.ref",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"), $_SERVER["PHP_SELF"], "p.label",$param,"","",$sortfield,$sortorder);
+	if (! empty($conf->service->enabled) && $type == 1) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("StockLimit"), $_SERVER["PHP_SELF"], "p.seuil_stock_alerte",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("DesiredStock"), $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("PhysicalStock"), $_SERVER["PHP_SELF"], "stock_physique",$param,"",'align="right"',$sortfield,$sortorder);
 	// TODO Add info of running suppliers/customers orders
 	//print_liste_field_titre($langs->trans("TheoreticalStock"),"reassort.php", "stock_theorique",$param,"",'align="right"',$sortfield,$sortorder);
 	print '<td class="liste_titre">&nbsp;</td>';
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
new file mode 100644
index 00000000000..9600e6c0a44
--- /dev/null
+++ b/htdocs/product/stats/card.php
@@ -0,0 +1,282 @@
+<?php
+/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (c) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/product/stats/card.php
+ *       \ingroup    product
+ *       \brief      Page of product statistics
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+
+$WIDTH=DolGraph::getDefaultGraphSizeForStats('width',380);
+$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',160);
+
+$langs->load("companies");
+$langs->load("products");
+$langs->load("bills");
+$langs->load("other");
+
+$id		= GETPOST('id','int');
+$ref	= GETPOST('ref');
+$mode	= (GETPOST('mode') ? GETPOST('mode') : 'byunit');
+$error	= 0;
+$mesg	= '';
+
+$socid='';
+if (! empty($user->societe_id)) $socid=$user->societe_id;
+
+// Security check
+$fieldvalue = (! empty($id) ? $id : $ref);
+$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
+$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
+
+
+/*
+ *	View
+ */
+$form = new Form($db);
+
+if (! empty($id) || ! empty($ref))
+{
+	$object = new Product($db);
+	$result = $object->fetch($id,$ref);
+
+	llxHeader("","",$langs->trans("CardProduct".$object->type));
+
+	if ($result)
+	{
+		$head=product_prepare_head($object, $user);
+		$titre=$langs->trans("CardProduct".$object->type);
+		$picto=($object->type==1?'service':'product');
+
+		dol_fiche_head($head, 'stats', $titre, 0, $picto);
+
+		print '<table class="border" width="100%">';
+
+		// Reference
+		print '<tr>';
+		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
+		print $form->showrefnav($object,'ref','',1,'ref');
+		print '</td>';
+		print '</tr>';
+
+		// Label
+		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->libelle.'</td></tr>';
+
+		// Status (to sell)
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
+		print $object->getLibStatut(2,0);
+		print '</td></tr>';
+
+		// Status (to buy)
+		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
+		print $object->getLibStatut(2,1);
+		print '</td></tr>';
+
+		print '</table>';
+
+		dol_fiche_end();
+
+
+		// Choice of stats
+		if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
+
+		if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mode=byunit">';
+		else print img_picto('','tick').' ';
+		print $langs->trans("StatsByNumberOfUnits");
+		if ($mode == 'bynumber') print '</a>';
+
+		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
+		else print ' &nbsp; / &nbsp; ';
+
+		if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mode=bynumber">';
+		else print img_picto('','tick').' ';
+		print $langs->trans("StatsByNumberOfEntities");
+		if ($mode == 'byunit') print '</a>';
+
+		if (! empty($conf->dol_use_jmobile)) print '</div></div>';
+		else print '<br>';
+		print '<br>';
+
+		//print '<table width="100%">';
+
+		// Generation des graphs
+		$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
+		if (! file_exists($dir.'/'.$object->id))
+		{
+			if (dol_mkdir($dir.'/'.$object->id) < 0)
+			{
+				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
+				$error++;
+			}
+		}
+
+		$graphfiles=array(
+		'propal'           =>array('modulepart'=>'productstats_proposals',
+		'file' => $object->id.'/propal12m.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals"))),
+		'orders'           =>array('modulepart'=>'productstats_orders',
+		'file' => $object->id.'/orders12m.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders"))),
+		'invoices'         =>array('modulepart'=>'productstats_invoices',
+		'file' => $object->id.'/invoices12m.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices"))),
+		'orderssuppliers'=>array('modulepart'=>'productstats_orderssuppliers',
+		'file' => $object->id.'/orderssuppliers12m.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders"))),
+		'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers',
+		'file' => $object->id.'/invoicessuppliers12m.png',
+		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices"))),
+		);
+
+		$px = new DolGraph();
+
+		if (! $error)
+		{
+			$mesg = $px->isGraphKo();
+			if (! $mesg)
+			{
+				foreach($graphfiles as $key => $val)
+				{
+					if (! $graphfiles[$key]['file']) continue;
+
+					$graph_data = array();
+
+					// TODO Test si deja existant et recent, on ne genere pas
+					if ($key == 'propal')            $graph_data = $object->get_nb_propal($socid,$mode);
+					if ($key == 'orders')            $graph_data = $object->get_nb_order($socid,$mode);
+					if ($key == 'invoices')          $graph_data = $object->get_nb_vente($socid,$mode);
+					if ($key == 'invoicessuppliers') $graph_data = $object->get_nb_achat($socid,$mode);
+					if ($key == 'orderssuppliers')   $graph_data = $object->get_nb_ordersupplier($socid,$mode);
+
+					if (is_array($graph_data))
+					{
+						$px->SetData($graph_data);
+						$px->SetYLabel($graphfiles[$key]['label']);
+						$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
+						$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
+						$px->SetWidth($WIDTH);
+						$px->SetHeight($HEIGHT);
+						$px->SetHorizTickIncrement(1);
+						$px->SetPrecisionY(0);
+						$px->SetShading(3);
+						//print 'x '.$key.' '.$graphfiles[$key]['file'];
+
+						$url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&entity='.$object->entity.'&file='.urlencode($graphfiles[$key]['file']);
+						$px->draw($dir."/".$graphfiles[$key]['file'],$url);
+
+						$graphfiles[$key]['output']=$px->show();
+					}
+					else
+					{
+						dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$object->error);
+					}
+				}
+			}
+
+			$mesg = $langs->trans("ChartGenerated");
+		}
+
+		// Show graphs
+		$i=0;
+		foreach($graphfiles as $key => $val)
+		{
+			if (! $graphfiles[$key]['file']) continue;
+
+			if ($graphfiles == 'propal' && ! $user->rights->propale->lire) continue;
+			if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
+			if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
+			if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
+			if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
+
+
+			if ($i % 2 == 0)
+			{
+				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
+			}
+			else
+			{
+				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+			}
+
+			// Show graph
+
+			print '<table class="border" width="100%">';
+			// Label
+			print '<tr class="liste_titre"><td colspan="2">';
+			print $graphfiles[$key]['label'];
+			print '</td></tr>';
+			// Image
+			print '<tr><td colspan="2" align="center">';
+			print $graphfiles[$key]['output'];
+			print '</td></tr>';
+			// Date generation
+			print '<tr>';
+			if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
+			{
+			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) print '<td>'.$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).'</td>';
+			    else print '<td>'.$langs->trans("GeneratedOn",dol_print_date(dol_now()),"dayhour").'</td>';
+			}
+			else
+			{
+				print '<td>'.($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated")).'</td>';
+			}
+			print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>';
+			print '</tr>';
+			print '</table>';
+
+			if ($i % 2 == 0)
+			{
+				print "\n".'</div>'."\n";
+			}
+			else
+			{
+				print "\n".'</div></div></div>';
+				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
+			}
+
+			$i++;
+		}
+		// div not closed
+		if ($i % 2 == 1)
+		{
+			print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
+			print "\n".'</div></div></div>';
+			print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
+		}
+
+		print '<div class="tabsAction">';
+		print '</div>';
+
+	}
+}
+else
+{
+	dol_print_error();
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 97e9a612ae1..472b9ce4a45 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -67,10 +67,10 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
-	$error=$hookmanager->error; $errors=$hookmanager->errors;
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	llxHeader("","",$langs->trans("CardProduct".$product->type));
 
@@ -83,8 +83,9 @@ if ($id > 0 || ! empty($ref))
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==1?'service':'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
-		
+
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 		print '<table class="border" width="100%">';
@@ -117,7 +118,7 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 
-		$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
+		$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
 		$sql.= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, d.qty";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -164,10 +165,10 @@ if ($id > 0 || ! empty($ref))
 					$var=!$var;
 
 					print "<tr ".$bc[$var].">";
-					print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
+					print '<td><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
 					print $objp->ref;
 					print "</a></td>\n";
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+					print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
 					print "<td>".$objp->code_client."</td>\n";
 					print "<td align=\"center\">";
 					print dol_print_date($db->jdate($objp->date_commande))."</td>";
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 22e3e2b30ba..73de0374ebe 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -67,10 +67,10 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
-	$error=$hookmanager->error; $errors=$hookmanager->errors;
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	llxHeader("","",$langs->trans("CardProduct".$product->type));
 
@@ -80,8 +80,9 @@ if ($id > 0 || ! empty($ref))
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==1?'service':'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
-		
+
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		print '<table class="border" width="100%">';
 
@@ -109,7 +110,7 @@ if ($id > 0 || ! empty($ref))
 		print "</table>";
 		print '</div>';
 
-		$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
+		$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,";
 		$sql.= " c.rowid, c.total_ht as total_ht, c.ref,";
 		$sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.qty";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
@@ -147,7 +148,7 @@ if ($id > 0 || ! empty($ref))
 			print "</tr>\n";
 
 			$commandestatic=new CommandeFournisseur($db);
-			
+
 			if ($num > 0)
 			{
 				$var=True;
@@ -155,7 +156,7 @@ if ($id > 0 || ! empty($ref))
 				{
 					$objp = $db->fetch_object($result);
 					$var=!$var;
-					
+
 					$commandestatic->id=$objp->commandeid;
 					$commandestatic->ref=$objp->ref;
 					$commandestatic->statut=$objp->statut;
@@ -163,7 +164,7 @@ if ($id > 0 || ! empty($ref))
 					print "<tr ".$bc[$var].">";
 					print '<td>'.$commandestatic->getNomUrl(1)."</td>\n";
 					print "</a></td>\n";
-					print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+					print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
 					print "<td>".$objp->code_client."</td>\n";
 					print '<td align="center">'.dol_print_date($db->jdate($objp->date_commande))."</td>";
 					print "<td align=\"center\">".$objp->qty."</td>\n";
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 518daf2b8f1..189ead2eaa2 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -73,7 +73,7 @@ if ($id > 0 || ! empty($ref))
 
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
-	$error=$hookmanager->error; $errors=$hookmanager->errors;
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	llxHeader("","",$langs->trans("CardProduct".$product->type));
 
@@ -85,6 +85,7 @@ if ($id > 0 || ! empty($ref))
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
 
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		print '<table class="border" width="100%">';
 
@@ -123,7 +124,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')",1,0).') as nb_late,';
 		$sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 		$sql.= " c.rowid as rowid, c.date_contrat, c.statut as statut,";
-		$sql.= " s.nom, s.rowid as socid, s.code_client";
+		$sql.= " s.nom as name, s.rowid as socid, s.code_client";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
@@ -170,10 +171,10 @@ if ($id > 0 || ! empty($ref))
 					$var=!$var;
 
 					print "<tr ".$bc[$var].">";
-					print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
+					print '<td><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
 					print $objp->rowid;
 					print "</a></td>\n";
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+					print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
 					print "<td>".$objp->code_client."</td>\n";
 					print "<td align=\"center\">";
 					print dol_print_date($db->jdate($objp->date_contrat))."</td>";
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 001b528d431..49e5651b065 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014	   Juanjo Menent        <jmenent@2byte.es>
  *
  * 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
@@ -73,9 +73,10 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	llxHeader("","",$langs->trans("CardProduct".$product->type));
 
@@ -88,8 +89,9 @@ if ($id > 0 || ! empty($ref))
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==1?'service':'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
-		
+
 		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		print '<table class="border" width="100%">';
 
@@ -121,80 +123,75 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 
-		$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
-		$sql.= " f.facnumber, f.total as total_ht,";
-		$sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-		$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql.= " WHERE f.fk_soc = s.rowid";
-		$sql.= " AND f.entity = ".$conf->entity;
-		$sql.= " AND d.fk_facture = f.rowid";
-		$sql.= " AND d.fk_product =".$product->id;
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($socid) $sql.= " AND f.fk_soc = $socid";
-		$sql.= " ORDER BY $sortfield $sortorder ";
-		$sql.= $db->plimit($conf->liste_limit +1, $offset);
+        if ($user->rights->facture->lire) {
+            $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,";
+            $sql.= " f.facnumber, f.total as total_ht,";
+            $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
+            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
+            $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+            $sql.= ", ".MAIN_DB_PREFIX."facture as f";
+            $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
+            if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+            $sql.= " WHERE f.fk_soc = s.rowid";
+            $sql.= " AND f.entity = ".$conf->entity;
+            $sql.= " AND d.fk_facture = f.rowid";
+            $sql.= " AND d.fk_product =".$product->id;
+            if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            if ($socid) $sql.= " AND f.fk_soc = $socid";
+            $sql.= " ORDER BY $sortfield $sortorder ";
+            $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
-		$result = $db->query($sql);
-		if ($result)
-		{
-			$num = $db->num_rows($result);
+            $result = $db->query($sql);
+            if ($result) {
+                $num = $db->num_rows($result);
 
-			print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
+                print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&amp;id=$product->id",$sortfield,$sortorder,'',$num,0,'');
 
-			$i = 0;
-			print "<table class=\"noborder\" width=\"100%\">";
+                $i = 0;
+                print '<table class="noborder" width="100%">';
 
-			print '<tr class="liste_titre">';
-			print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","","&amp;id=".$product->id,'',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$product->id,'',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$product->id,'',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
-			print "</tr>\n";
+                print '<tr class="liste_titre">';
+                print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"s.rowid","","&amp;id=".$product->id,'',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;id=".$product->id,'',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&amp;id=".$product->id,'',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&amp;id=".$product->id,'align="center"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
+                print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&amp;id=".$product->id,'align="right"',$sortfield,$sortorder);
+                print "</tr>\n";
 
-			if ($num > 0)
-			{
-				$var=True;
-				while ($i < $num && $i < $conf->liste_limit)
-				{
-					$objp = $db->fetch_object($result);
-					$var=!$var;
+                if ($num > 0) {
+                    $var=True;
+                    while ($i < $num && $i < $conf->liste_limit) {
+                        $objp = $db->fetch_object($result);
+                        $var=!$var;
 
-					print "<tr ".$bc[$var].">";
-					print '<td>';
-					$invoicestatic->id=$objp->facid;
-					$invoicestatic->ref=$objp->facnumber;
-					print $invoicestatic->getNomUrl(1);
-					print "</td>\n";
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
-					print "<td>".$objp->code_client."</td>\n";
-					print "<td align=\"center\">";
-					print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-					print "<td align=\"center\">".$objp->qty."</td>\n";
-					print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
-					print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
-					print "</tr>\n";
-					$i++;
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-		print "</table>";
-		print '<br>';
-		$db->free($result);
+                        print '<tr '.$bc[$var].'>';
+                        print '<td>';
+                        $invoicestatic->id=$objp->facid;
+                        $invoicestatic->ref=$objp->facnumber;
+                        print $invoicestatic->getNomUrl(1);
+                        print "</td>\n";
+                        print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
+                        print "<td>".$objp->code_client."</td>\n";
+                        print '<td align="center">';
+                        print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+                        print '<td align="center">'.$objp->qty."</td>\n";
+                        print '<td align="right">'.price($objp->total_ht)."</td>\n";
+                        print '<td align="right">'.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
+                        print "</tr>\n";
+                        $i++;
+                    }
+                }
+                print "</table>";
+                print '<br>';
+            } else {
+                dol_print_error($db);
+            }
+            $db->free($result);
+        }
 	}
-}
-else
-{
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 4cbeaec7e76..d8e30bdae6a 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -72,10 +72,10 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
-	$error=$hookmanager->error; $errors=$hookmanager->errors;
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
     llxHeader("","",$langs->trans("CardProduct".$product->type));
 
@@ -88,9 +88,9 @@ if ($id > 0 || ! empty($ref))
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==1?'service':'product');
 		dol_fiche_head($head, 'referers', $titre, 0, $picto);
-		
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
         print '<table class="border" width="100%">';
 
@@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref))
         print '</div>';
 
 
-        $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,";
+        $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,";
         $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
         if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -172,7 +172,7 @@ if ($id > 0 || ! empty($ref))
                     $supplierinvoicestatic->ref=$objp->facnumber;
 					print $supplierinvoicestatic->getNomUrl(1);
                     print "</td>\n";
-                    print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+                    print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
                     print "<td>".$objp->code_client."</td>\n";
                     print "<td align=\"center\">";
                     print dol_print_date($db->jdate($objp->datef))."</td>";
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
deleted file mode 100644
index 8b366a40958..00000000000
--- a/htdocs/product/stats/fiche.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/* Copyright (C) 2001-2007	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (c) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2005		Eric Seigne				<eric.seigne@ryxeo.com>
- * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/product/stats/fiche.php
- *       \ingroup    product
- *       \brief      Page of product statistics
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width',380);
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height',160);
-
-$langs->load("companies");
-$langs->load("products");
-$langs->load("bills");
-$langs->load("other");
-
-$id		= GETPOST('id','int');
-$ref	= GETPOST('ref');
-$mode	= (GETPOST('mode') ? GETPOST('mode') : 'byunit');
-$error	= 0;
-$mesg	= '';
-
-$socid='';
-if (! empty($user->societe_id)) $socid=$user->societe_id;
-
-// Security check
-$fieldvalue = (! empty($id) ? $id : $ref);
-$fieldtype = (! empty($ref) ? 'ref' : 'rowid');
-$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
-
-
-/*
- *	View
- */
-$form = new Form($db);
-
-if (! empty($id) || ! empty($ref))
-{
-	$object = new Product($db);
-	$result = $object->fetch($id,$ref);
-
-	llxHeader("","",$langs->trans("CardProduct".$object->type));
-
-	if ($result)
-	{
-		$head=product_prepare_head($object, $user);
-		$titre=$langs->trans("CardProduct".$object->type);
-		$picto=($object->type==1?'service':'product');
-
-		dol_fiche_head($head, 'stats', $titre, 0, $picto);
-
-		print '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($object,'ref','',1,'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->libelle.'</td></tr>';
-
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
-		print $object->getLibStatut(2,0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
-		print $object->getLibStatut(2,1);
-		print '</td></tr>';
-
-		print '</table>';
-
-		dol_fiche_end();
-
-
-		// Choice of stats
-		if (! empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
-
-		if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mode=byunit">';
-		else print img_picto('','tick').' ';
-		print $langs->trans("StatsByNumberOfUnits");
-		if ($mode == 'bynumber') print '</a>';
-
-		if (! empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-		else print ' &nbsp; / &nbsp; ';
-
-		if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mode=bynumber">';
-		else print img_picto('','tick').' ';
-		print $langs->trans("StatsByNumberOfEntities");
-		if ($mode == 'byunit') print '</a>';
-
-		if (! empty($conf->dol_use_jmobile)) print '</div></div>';
-		else print '<br>';
-		print '<br>';
-
-		//print '<table width="100%">';
-
-		// Generation des graphs
-		$dir = (! empty($conf->product->multidir_temp[$object->entity])?$conf->product->multidir_temp[$object->entity]:$conf->service->multidir_temp[$object->entity]);
-		if (! file_exists($dir.'/'.$object->id))
-		{
-			if (dol_mkdir($dir.'/'.$object->id) < 0)
-			{
-				$mesg = $langs->trans("ErrorCanNotCreateDir",$dir);
-				$error++;
-			}
-		}
-
-		$graphfiles=array(
-		'propal'           =>array('modulepart'=>'productstats_proposals',
-		'file' => $object->id.'/propal12m.png',
-		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals"))),
-		'orders'           =>array('modulepart'=>'productstats_orders',
-		'file' => $object->id.'/orders12m.png',
-		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders"))),
-		'invoices'         =>array('modulepart'=>'productstats_invoices',
-		'file' => $object->id.'/invoices12m.png',
-		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices"))),
-		'orderssuppliers'=>array('modulepart'=>'productstats_orderssuppliers',
-		'file' => $object->id.'/orderssuppliers12m.png',
-		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders"))),
-		'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers',
-		'file' => $object->id.'/invoicessuppliers12m.png',
-		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices"))),
-		);
-
-		$px = new DolGraph();
-
-		if (! $error)
-		{
-			$mesg = $px->isGraphKo();
-			if (! $mesg)
-			{
-				foreach($graphfiles as $key => $val)
-				{
-					if (! $graphfiles[$key]['file']) continue;
-
-					$graph_data = array();
-
-					// TODO Test si deja existant et recent, on ne genere pas
-					if ($key == 'propal')            $graph_data = $object->get_nb_propal($socid,$mode);
-					if ($key == 'orders')            $graph_data = $object->get_nb_order($socid,$mode);
-					if ($key == 'invoices')          $graph_data = $object->get_nb_vente($socid,$mode);
-					if ($key == 'invoicessuppliers') $graph_data = $object->get_nb_achat($socid,$mode);
-					if ($key == 'orderssuppliers')   $graph_data = $object->get_nb_ordersupplier($socid,$mode);
-
-					if (is_array($graph_data))
-					{
-						$px->SetData($graph_data);
-						$px->SetYLabel($graphfiles[$key]['label']);
-						$px->SetMaxValue($px->GetCeilMaxValue()<0?0:$px->GetCeilMaxValue());
-						$px->SetMinValue($px->GetFloorMinValue()>0?0:$px->GetFloorMinValue());
-						$px->SetWidth($WIDTH);
-						$px->SetHeight($HEIGHT);
-						$px->SetHorizTickIncrement(1);
-						$px->SetPrecisionY(0);
-						$px->SetShading(3);
-						//print 'x '.$key.' '.$graphfiles[$key]['file'];
-
-						$url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&entity='.$object->entity.'&file='.urlencode($graphfiles[$key]['file']);
-						$px->draw($dir."/".$graphfiles[$key]['file'],$url);
-
-						$graphfiles[$key]['output']=$px->show();
-					}
-					else
-					{
-						dol_print_error($db,'Error for calculating graph on key='.$key.' - '.$object->error);
-					}
-				}
-			}
-
-			$mesg = $langs->trans("ChartGenerated");
-		}
-
-		// Show graphs
-		$i=0;
-		foreach($graphfiles as $key => $val)
-		{
-			if (! $graphfiles[$key]['file']) continue;
-
-			if ($graphfiles == 'propal' && ! $user->rights->propale->lire) continue;
-			if ($graphfiles == 'order' && ! $user->rights->commande->lire) continue;
-			if ($graphfiles == 'invoices' && ! $user->rights->facture->lire) continue;
-			if ($graphfiles == 'invoices_suppliers' && ! $user->rights->fournisseur->facture->lire) continue;
-			if ($graphfiles == 'orders_suppliers' && ! $user->rights->fournisseur->commande->lire) continue;
-
-
-			if ($i % 2 == 0)
-			{
-				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
-			}
-			else
-			{
-				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
-			}
-
-			// Show graph
-
-			print '<table class="border" width="100%">';
-			// Label
-			print '<tr class="liste_titre"><td colspan="2">';
-			print $graphfiles[$key]['label'];
-			print '</td></tr>';
-			// Image
-			print '<tr><td colspan="2" align="center">';
-			print $graphfiles[$key]['output'];
-			print '</td></tr>';
-			// Date generation
-			print '<tr>';
-			if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
-			{
-			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) print '<td>'.$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).'</td>';
-			    else print '<td>'.$langs->trans("GeneratedOn",dol_print_date(dol_now()),"dayhour").'</td>';
-			}
-			else
-			{
-				print '<td>'.($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated")).'</td>';
-			}
-			print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>';
-			print '</tr>';
-			print '</table>';
-
-			if ($i % 2 == 0)
-			{
-				print "\n".'</div>'."\n";
-			}
-			else
-			{
-				print "\n".'</div></div></div>';
-				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
-			}
-
-			$i++;
-		}
-		// div not closed
-		if ($i % 2 == 1)
-		{
-			print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
-			print "\n".'</div></div></div>';
-			print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
-		}
-
-		print '<div class="tabsAction">';
-		print '</div>';
-
-	}
-}
-else
-{
-	dol_print_error();
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/product/stats/index.html b/htdocs/product/stats/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/product/stats/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index e9a78f18b05..566961d9c5f 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -66,9 +66,10 @@ if ($id > 0 || ! empty($ref))
 {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
-	
+
 	$parameters=array('id'=>$id);
 	$reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action);    // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	llxHeader("","",$langs->trans("CardProduct".$product->type));
 
@@ -78,9 +79,9 @@ if ($id > 0 || ! empty($ref))
 		$titre=$langs->trans("CardProduct".$product->type);
 		$picto=($product->type==1?'service':'product');
 		dol_fiche_head($head, 'referers', $titre,0,$picto);
-		
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
 
+		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		print '<table class="border" width="100%">';
 
@@ -112,7 +113,7 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 
-		$sql = "SELECT DISTINCT s.nom, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,";
+		$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,";
 		$sql.= "p.datep, p.fk_statut as statut, d.qty";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -160,7 +161,7 @@ if ($id > 0 || ! empty($ref))
 					print '<td><a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' ';
 					print $objp->ref;
 					print '</a></td>'."\n";
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+					print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
 					print '<td align="center">';
 					print dol_print_date($db->jdate($objp->datep))."</td>";
 					print "<td align=\"center\">".$objp->qty."</td>\n";
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
new file mode 100644
index 00000000000..39b778536b5
--- /dev/null
+++ b/htdocs/product/stock/card.php
@@ -0,0 +1,573 @@
+<?php
+/* Copyright (C) 2003-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005		Simon Tosser			<simon@kornog-computing.com>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/product/stock/card.php
+ *	\ingroup    stock
+ *	\brief      Page fiche entrepot
+ */
+
+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.'/core/lib/stock.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+$langs->load("products");
+$langs->load("stocks");
+$langs->load("companies");
+
+$action=GETPOST('action');
+$cancel=GETPOST('cancel');
+$confirm=GETPOST('confirm');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$id = GETPOST("id",'int');
+if (! $sortfield) $sortfield="p.ref";
+if (! $sortorder) $sortorder="DESC";
+
+$backtopage=GETPOST("backtopage");
+
+// Security check
+$result=restrictedArea($user,'stock');
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('warehousecard','globalcard'));
+
+
+/*
+ * Actions
+ */
+
+// Ajout entrepot
+if ($action == 'add' && $user->rights->stock->creer)
+{
+	$object = new Entrepot($db);
+
+	$object->ref         = GETPOST("ref");
+	$object->libelle     = GETPOST("libelle");
+	$object->description = GETPOST("desc");
+	$object->statut      = GETPOST("statut");
+	$object->lieu        = GETPOST("lieu");
+	$object->address     = GETPOST("address");
+	$object->zip         = GETPOST("zipcode");
+	$object->town        = GETPOST("town");
+	$object->country_id  = GETPOST("country_id");
+
+	if (! empty($object->libelle))
+	{
+		$id = $object->create($user);
+		if ($id > 0)
+		{
+			setEventMessage($langs->trans("RecordSaved"));
+
+			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');
+		$action="create";   // Force retour sur page creation
+	}
+}
+
+// Delete warehouse
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->stock->supprimer)
+{
+	$object = new Entrepot($db);
+	$object->fetch($_REQUEST["id"]);
+	$result=$object->delete($user);
+	if ($result > 0)
+	{
+		header("Location: ".DOL_URL_ROOT.'/product/stock/list.php');
+		exit;
+	}
+	else
+	{
+		setEventMessage($object->error, 'errors');
+		$action='';
+	}
+}
+
+// Modification entrepot
+if ($action == 'update' && $cancel <> $langs->trans("Cancel"))
+{
+	$object = new Entrepot($db);
+	if ($object->fetch($id))
+	{
+		$object->libelle     = GETPOST("libelle");
+		$object->description = GETPOST("desc");
+		$object->statut      = GETPOST("statut");
+		$object->lieu        = GETPOST("lieu");
+		$object->address     = GETPOST("address");
+		$object->zip         = GETPOST("zipcode");
+		$object->town        = GETPOST("town");
+		$object->country_id  = GETPOST("country_id");
+
+		if ( $object->update($id, $user) > 0)
+		{
+			$action = '';
+		}
+		else
+		{
+			$action = 'edit';
+			setEventMessage($object->error, 'errors');
+		}
+	}
+	else
+	{
+		$action = 'edit';
+		setEventMessage($object->error, 'errors');
+	}
+}
+
+if ($cancel == $langs->trans("Cancel"))
+{
+	$action = '';
+}
+
+
+
+/*
+ * View
+ */
+
+$productstatic=new Product($db);
+$form=new Form($db);
+$formcompany=new FormCompany($db);
+
+$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+llxHeader("",$langs->trans("WarehouseCard"),$help_url);
+
+
+if ($action == 'create')
+{
+	print_fiche_titre($langs->trans("NewWarehouse"));
+
+	print "<form action=\"card.php\" method=\"post\">\n";
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="libelle" size="20" value=""></td></tr>';
+
+	print '<tr><td >'.$langs->trans("LocationSummary").'</td><td colspan="3"><input name="lieu" size="40" value="'.(!empty($object->lieu)?$object->lieu:'').'"></td></tr>';
+
+	// Description
+	print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+	// Editeur wysiwyg
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor=new DolEditor('desc',(!empty($object->description)?$object->description:''),'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70);
+	$doleditor->Create();
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="60" rows="3" wrap="soft">';
+	print (!empty($object->address)?$object->address:'');
+	print '</textarea></td></tr>';
+
+	// Zip / Town
+	print '<tr><td>'.$langs->trans('Zip').'</td><td>';
+	print $formcompany->select_ziptown((!empty($object->zip)?$object->zip:''),'zipcode',array('town','selectcountry_id','state_id'),6);
+	print '</td><td>'.$langs->trans('Town').'</td><td>';
+	print $formcompany->select_ziptown((!empty($object->town)?$object->town:''),'town',array('zipcode','selectcountry_id','state_id'));
+	print '</td></tr>';
+
+	// Country
+	print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
+	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
+	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
+	print '<select name="statut" class="flat">';
+	print '<option value="0">'.$langs->trans("WarehouseClosed").'</option>';
+	print '<option value="1" selected="selected">'.$langs->trans("WarehouseOpened").'</option>';
+	print '</select>';
+	print '</td></tr>';
+
+	print '</table>';
+
+	dol_fiche_end();
+
+	print '<center><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
+
+	print '</form>';
+}
+else
+{
+    $id=GETPOST("id",'int');
+	if ($id)
+	{
+		$object = new Entrepot($db);
+		$result = $object->fetch($id);
+		if ($result < 0)
+		{
+			dol_print_error($db);
+		}
+
+		/*
+		 * Affichage fiche
+		 */
+		if ($action <> 'edit' && $action <> 're-edit')
+		{
+			$head = stock_prepare_head($object);
+
+			dol_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock');
+
+			// Confirm delete third party
+			if ($action == 'delete')
+			{
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("DeleteAWarehouse"),$langs->trans("ConfirmDeleteWarehouse",$object->libelle),"confirm_delete",'',0,2);
+			}
+
+			print '<table class="border" width="100%">';
+
+			$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">'.$langs->trans("BackToList").'</a>';
+
+			// Ref
+			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
+			print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'libelle');
+			print '</td>';
+
+			print '<tr><td>'.$langs->trans("LocationSummary").'</td><td colspan="3">'.$object->lieu.'</td></tr>';
+
+			// Description
+			print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">'.nl2br($object->description).'</td></tr>';
+
+			// Address
+			print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3">';
+			print $object->address;
+			print '</td></tr>';
+
+			// Town
+			print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$object->zip.'</td>';
+			print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$object->town.'</td></tr>';
+
+			// Country
+			print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
+			if (! empty($object->country_code))
+			{
+				$img=picto_from_langcode($object->country_code);
+				print ($img?$img.' ':'');
+			}
+			print $object->country;
+			print '</td></tr>';
+
+			// Status
+			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
+
+        	$calcproductsunique=$object->nb_different_products();
+			$calcproducts=$object->nb_products();
+
+	        // Total nb of different products
+	        print '<tr><td valign="top">'.$langs->trans("NumberOfDifferentProducts").'</td><td colspan="3">';
+	        print empty($calcproductsunique['nb'])?'0':$calcproductsunique['nb'];
+	        print "</td></tr>";
+
+			// Nb of products
+			print '<tr><td valign="top">'.$langs->trans("NumberOfProducts").'</td><td colspan="3">';
+			print empty($calcproducts['nb'])?'0':$calcproducts['nb'];
+			print "</td></tr>";
+
+			// Value
+			print '<tr><td valign="top">'.$langs->trans("EstimatedStockValueShort").'</td><td colspan="3">';
+			print empty($calcproducts['value'])?'0':$calcproducts['value'];
+			print "</td></tr>";
+
+			// Last movement
+			$sql = "SELECT max(m.datem) as datem";
+			$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+			$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
+			$resqlbis = $db->query($sql);
+			if ($resqlbis)
+			{
+				$obj = $db->fetch_object($resqlbis);
+				$lastmovementdate=$db->jdate($obj->datem);
+			}
+			else
+			{
+				dol_print_error($db);
+			}
+			print '<tr><td valign="top">'.$langs->trans("LastMovement").'</td><td colspan="3">';
+			if ($lastmovementdate)
+			{
+			    print dol_print_date($lastmovementdate,'dayhour').' ';
+			    print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?id='.$object->id.'">'.$langs->trans("FullList").'</a>)';
+			}
+			else
+			{
+			     print $langs->trans("None");
+			}
+			print "</td></tr>";
+
+			print "</table>";
+
+			print '</div>';
+
+
+			/* ************************************************************************** */
+			/*                                                                            */
+			/* Barre d'action                                                             */
+			/*                                                                            */
+			/* ************************************************************************** */
+
+			print "<div class=\"tabsAction\">\n";
+
+			$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($action))
+				{
+					if ($user->rights->stock->creer)
+						print "<a class=\"butAction\" href=\"card.php?action=edit&id=".$object->id."\">".$langs->trans("Modify")."</a>";
+					else
+						print "<a class=\"butActionRefused\" href=\"#\">".$langs->trans("Modify")."</a>";
+
+					if ($user->rights->stock->supprimer)
+						print "<a class=\"butActionDelete\" href=\"card.php?action=delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
+					else
+						print "<a class=\"butActionRefused\" href=\"#\">".$langs->trans("Delete")."</a>";
+				}
+			}
+
+			print "</div>";
+
+
+			/* ************************************************************************** */
+			/*                                                                            */
+			/* Affichage de la liste des produits de l'entrepot                           */
+			/*                                                                            */
+			/* ************************************************************************** */
+			print '<br>';
+
+			print '<table class="noborder" width="100%">';
+			print "<tr class=\"liste_titre\">";
+			print_liste_field_titre($langs->trans("Product"),"", "p.ref","&amp;id=".$id,"","",$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("Label"),"", "p.label","&amp;id=".$id,"","",$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans("Units"),"", "ps.reel","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans("AverageUnitPricePMPShort"),"", "ps.pmp","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
+			print_liste_field_titre($langs->trans("EstimatedStockValueShort"),"", "","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
+            if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellPriceMin"),"", "p.price","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
+            if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("EstimatedStockValueSellShort"),"", "","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
+			if ($user->rights->stock->mouvement->creer) print '<td>&nbsp;</td>';
+			if ($user->rights->stock->creer)            print '<td>&nbsp;</td>';
+			print "</tr>";
+
+			$totalunit=0;
+			$totalvalue=$totalvaluesell=0;
+
+			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc,";
+			$sql.= " ps.pmp, ps.reel as value";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
+			$sql.= " WHERE ps.fk_product = p.rowid";
+			$sql.= " AND ps.reel <> 0";	// We do not show if stock is 0 (no product in this warehouse)
+			$sql.= " AND ps.fk_entrepot = ".$object->id;
+			$sql.= $db->order($sortfield,$sortorder);
+
+			dol_syslog('List products', LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+				$i = 0;
+				$var=True;
+				while ($i < $num)
+				{
+					$objp = $db->fetch_object($resql);
+
+					// Multilangs
+					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+					{
+						$sql = "SELECT label";
+						$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
+						$sql.= " WHERE fk_product=".$objp->rowid;
+						$sql.= " AND lang='". $langs->getDefaultLang() ."'";
+						$sql.= " LIMIT 1";
+
+						$result = $db->query($sql);
+						if ($result)
+						{
+							$objtp = $db->fetch_object($result);
+							if ($objtp->label != '') $objp->produit = $objtp->label;
+						}
+					}
+
+					$var=!$var;
+					//print '<td>'.dol_print_date($objp->datem).'</td>';
+					print "<tr ".$bc[$var].">";
+					print "<td>";
+					$productstatic->id=$objp->rowid;
+					$productstatic->ref=$objp->ref;
+					$productstatic->type=$objp->type;
+					print $productstatic->getNomUrl(1,'stock',16);
+					print '</td>';
+					print '<td>'.$objp->produit.'</td>';
+
+					print '<td align="right">'.$objp->value.'</td>';
+					$totalunit+=$objp->value;
+
+                    // Price buy PMP
+					print '<td align="right">'.price(price2num($objp->ppmp,'MU')).'</td>';
+                    // Total PMP
+					print '<td align="right">'.price(price2num($objp->ppmp*$objp->value,'MT')).'</td>';
+					$totalvalue+=price2num($objp->ppmp*$objp->value,'MT');
+
+                    // Price sell min
+                    if (empty($conf->global->PRODUIT_MULTIPRICES))
+                    {
+                        $pricemin=$objp->price;
+                        print '<td align="right">';
+                        print price(price2num($pricemin,'MU'),1);
+                        print '</td>';
+                        // Total sell min
+                        print '<td align="right">';
+                        print price(price2num($pricemin*$objp->value,'MT'),1);
+                        print '</td>';
+                    }
+                    $totalvaluesell+=price2num($pricemin*$objp->value,'MT');
+
+                    if ($user->rights->stock->mouvement->creer)
+					{
+						print '<td align="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&amp;id='.$objp->rowid.'&amp;action=transfert">';
+						print img_picto($langs->trans("StockMovement"),'uparrow.png').' '.$langs->trans("StockMovement");
+						print "</a></td>";
+					}
+
+					if ($user->rights->stock->creer)
+					{
+						print '<td align="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&amp;id='.$objp->rowid.'&amp;action=correction">';
+						print $langs->trans("StockCorrection");
+						print "</a></td>";
+					}
+
+					print "</tr>";
+					$i++;
+				}
+				$db->free($resql);
+
+				print '<tr class="liste_total"><td class="liste_total" colspan="2">'.$langs->trans("Total").'</td>';
+				print '<td class="liste_total" align="right">'.$totalunit.'</td>';
+				print '<td class="liste_total">&nbsp;</td>';
+                print '<td class="liste_total" align="right">'.price(price2num($totalvalue,'MT')).'</td>';
+                if (empty($conf->global->PRODUIT_MULTIPRICES))
+                {
+                    print '<td class="liste_total">&nbsp;</td>';
+                    print '<td class="liste_total" align="right">'.price(price2num($totalvaluesell,'MT')).'</td>';
+                }
+                print '<td class="liste_total">&nbsp;</td>';
+				print '<td class="liste_total">&nbsp;</td>';
+				print '</tr>';
+
+			}
+			else
+			{
+				dol_print_error($db);
+			}
+			print "</table>\n";
+		}
+
+
+		/*
+		 * Edition fiche
+		 */
+		if (($action == 'edit' || $action == 're-edit') && 1)
+		{
+			$langs->trans("WarehouseEdit");
+
+			print '<form action="card.php" method="POST">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+			print '<table class="border" width="100%">';
+
+			// Ref
+			print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="libelle" size="20" value="'.$object->libelle.'"></td></tr>';
+
+			print '<tr><td width="20%">'.$langs->trans("LocationSummary").'</td><td colspan="3"><input name="lieu" size="40" value="'.$object->lieu.'"></td></tr>';
+
+			// Description
+			print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
+			// Editeur wysiwyg
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			$doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70);
+			$doleditor->Create();
+			print '</td></tr>';
+
+			print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="60" rows="3" wrap="soft">';
+			print $object->address;
+			print '</textarea></td></tr>';
+
+			// Zip / Town
+			print '<tr><td>'.$langs->trans('Zip').'</td><td>';
+			print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
+			print '</td><td>'.$langs->trans('Town').'</td><td>';
+			print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
+			print '</td></tr>';
+
+			// Country
+			print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
+			print $form->select_country($object->country_id?$object->country_id:$mysoc->country_code,'country_id');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+			print '</td></tr>';
+
+			print '<tr><td width="20%">'.$langs->trans("Status").'</td><td colspan="3">';
+			print '<select name="statut" class="flat">';
+			print '<option value="0" '.($object->statut == 0?'selected="selected"':'').'>'.$langs->trans("WarehouseClosed").'</option>';
+			print '<option value="1" '.($object->statut == 0?'':'selected="selected"').'>'.$langs->trans("WarehouseOpened").'</option>';
+			print '</select>';
+			print '</td></tr>';
+
+			print '</table>';
+
+			print '<center><br><input type="submit" class="button" value="'.$langs->trans("Save").'">&nbsp;';
+			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+
+			print '</form>';
+
+		}
+	}
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 61c88abcaa5..3bf672f29a3 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -89,7 +89,7 @@ class Entrepot extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (entity, datec, fk_user_author, label)";
 		$sql .= " VALUES (".$conf->entity.",'".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."')";
 
-		dol_syslog(get_class($this)."::create sql=".$sql);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -158,7 +158,7 @@ class Entrepot extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -169,7 +169,6 @@ class Entrepot extends CommonObject
 		{
 			$this->db->rollback();
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -187,12 +186,12 @@ class Entrepot extends CommonObject
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."stock_mouvement";
 		$sql.= " WHERE fk_entrepot = " . $this->id;
-		dol_syslog("Entrepot::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql1=$this->db->query($sql);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock";
 		$sql.= " WHERE fk_entrepot = " . $this->id;
-		dol_syslog("Entrepot::delete sql=".$sql);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql2=$this->db->query($sql);
 
 		if ($resql1 && $resql2)
@@ -200,13 +199,13 @@ class Entrepot extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."entrepot";
 			$sql.= " WHERE rowid = " . $this->id;
 
-			dol_syslog(get_class($this)."::delete sql=".$sql);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql1=$this->db->query($sql);
 
-			// Update denormalized fields because we change content of produt_stock
-			$sql = "UPDATE ".MAIN_DB_PREFIX."product p SET p.stock= (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock ps WHERE ps.fk_product = p.rowid)";
+			// Update denormalized fields because we change content of produt_stock. Warning: Do not use "SET p.stock", does not works with pgsql
+			$sql = "UPDATE ".MAIN_DB_PREFIX."product as p SET stock = (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock as ps WHERE ps.fk_product = p.rowid)";
 
-			dol_syslog(get_class($this)."::delete sql=".$sql);
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql2=$this->db->query($sql);
 
 			if ($resql1 && $resql2)
@@ -218,15 +217,13 @@ class Entrepot extends CommonObject
 			{
 				$this->db->rollback();
 				$this->error=$this->db->lasterror();
-				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-				return -1;
+				return -2;
 			}
 		}
 		else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -258,7 +255,7 @@ class Entrepot extends CommonObject
 			if ($ref) $sql.= " AND label = '".$this->db->escape($ref)."'";
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -309,7 +306,7 @@ class Entrepot extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 		$sql.= " WHERE e.rowid = ".$id;
 
-		dol_syslog(get_class($this)."::info sql=".$sql);
+		dol_syslog(get_class($this)."::info", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -516,7 +513,7 @@ class Entrepot extends CommonObject
 
 		$result='';
 
-		$lien='<a href="'.DOL_URL_ROOT.'/product/stock/fiche.php?id='.$this->id.'">';
+		$lien='<a href="'.DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowStock"),'stock').$lienfin.' ');
@@ -543,7 +540,7 @@ class Entrepot extends CommonObject
         $this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now,'dayhourlog');
 		$this->statut=1;
         $this->specimen=1;
-		
+
 		$this->lieu='Location test';
         $this->address='21 jump street';
         $this->zip='99999';
diff --git a/htdocs/product/stock/class/index.html b/htdocs/product/stock/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 2d4a8971f1b..24ca13da355 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -28,7 +28,7 @@
 /**
  *	Class to manage stock movements
  */
-class MouvementStock
+class MouvementStock extends CommonObject
 {
     var $error;
     var $db;
@@ -112,7 +112,7 @@ class MouvementStock
 			$sql.= " '".$origintype."'";
 			$sql.= ")";
 
-			dol_syslog(get_class($this)."::_create sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::_create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
@@ -121,7 +121,6 @@ class MouvementStock
 			else
 			{
 				$this->error=$this->db->lasterror();
-				dol_syslog(get_class($this)."::_create ".$this->error, LOG_ERR);
 				$error = -1;
 			}
 
@@ -138,7 +137,7 @@ class MouvementStock
 				$sql = "SELECT rowid, reel, pmp FROM ".MAIN_DB_PREFIX."product_stock";
 				$sql.= " WHERE fk_entrepot = ".$entrepot_id." AND fk_product = ".$fk_product;
 
-				dol_syslog(get_class($this)."::_create sql=".$sql);
+				dol_syslog(get_class($this)."::_create", LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if ($resql)
 				{
@@ -155,7 +154,6 @@ class MouvementStock
 				else
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this)."::_create echec update ".$this->error, LOG_ERR);
 					$error = -2;
 				}
 			}
@@ -165,21 +163,40 @@ class MouvementStock
 			{
 				$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
 				{
@@ -203,21 +220,23 @@ class MouvementStock
 					$sql.= " (".$newpmpwarehouse.", ".$qty.", ".$entrepot_id.", ".$fk_product.")";
 				}
 
-				dol_syslog(get_class($this)."::_create sql=".$sql);
+				dol_syslog(get_class($this)."::_create", LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if (! $resql)
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this)."::_create ".$this->error, LOG_ERR);
 					$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++;
@@ -230,12 +249,11 @@ class MouvementStock
 				// May be this request is better:
 				// UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);
 
-				dol_syslog(get_class($this)."::_create sql=".$sql);
+				dol_syslog(get_class($this)."::_create", LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if (! $resql)
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this)."::_create ".$this->error, LOG_ERR);
 					$error = -4;
 				}
 			}
@@ -249,17 +267,16 @@ class MouvementStock
 
 		if ($movestock && ! $error)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-
 			$this->product_id = $fk_product;
 			$this->entrepot_id = $entrepot_id;
 			$this->qty = $qty;
 
-			$result=$interface->run_triggers('STOCK_MOVEMENT',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('STOCK_MOVEMENT',$user);
+            if ($result < 0) $error++;          
+            // End call triggers
+            
+            //FIXME: Restore previous value of product_id,  entrepot_id, qty if trigger fail
 		}
 
 		if (! $error)
@@ -298,7 +315,7 @@ class MouvementStock
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_association";
 		$sql.= " WHERE fk_product_pere = ".$idProduct;
 
-		dol_syslog(get_class($this)."::_createSubProduct sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::_createSubProduct", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -313,7 +330,6 @@ class MouvementStock
 		}
 		else
 		{
-			dol_syslog(get_class($this)."::_createSubProduct ".$this->error, LOG_ERR);
 			$error = -2;
 		}
 
@@ -412,7 +428,7 @@ class MouvementStock
 		$sql.= ' WHERE fk_product = '.$productidselected;
 		$sql.= " AND datem < '".$this->db->idate($datebefore)."'";
 		
-		dol_syslog(get_class($this).__METHOD__.' sql='.$sql);
+		dol_syslog(get_class($this).__METHOD__.'', LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
deleted file mode 100644
index 8b7aa43b431..00000000000
--- a/htdocs/product/stock/fiche.php
+++ /dev/null
@@ -1,559 +0,0 @@
-<?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Simon Tosser         <simon@kornog-computing.com>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/product/stock/fiche.php
- *	\ingroup    stock
- *	\brief      Page fiche entrepot
- */
-
-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.'/core/lib/stock.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-
-$langs->load("products");
-$langs->load("stocks");
-$langs->load("companies");
-
-$action=GETPOST('action');
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$id = GETPOST("id",'int');
-if (! $sortfield) $sortfield="p.ref";
-if (! $sortorder) $sortorder="DESC";
-
-$mesg = '';
-
-// Security check
-$result=restrictedArea($user,'stock');
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('warehousecard'));
-
-
-/*
- * Actions
- */
-
-// Ajout entrepot
-if ($action == 'add' && $user->rights->stock->creer)
-{
-	$object = new Entrepot($db);
-
-	$object->ref         = $_POST["ref"];
-	$object->libelle     = $_POST["libelle"];
-	$object->description = $_POST["desc"];
-	$object->statut      = $_POST["statut"];
-	$object->lieu        = $_POST["lieu"];
-	$object->address     = $_POST["address"];
-	$object->zip         = $_POST["zipcode"];
-	$object->town        = $_POST["town"];
-	$object->country_id  = $_POST["country_id"];
-
-	if ($object->libelle) {
-		$id = $object->create($user);
-		if ($id > 0)
-		{
-			header("Location: fiche.php?id=".$id);
-			exit;
-		}
-
-		$action = 'create';
-		$mesg='<div class="error">'.$object->error.'</div>';
-	}
-	else {
-		$mesg='<div class="error">'.$langs->trans("ErrorWarehouseRefRequired").'</div>';
-		$action="create";   // Force retour sur page creation
-	}
-}
-
-// Delete warehouse
-if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->stock->supprimer)
-{
-	$object = new Entrepot($db);
-	$object->fetch($_REQUEST["id"]);
-	$result=$object->delete($user);
-	if ($result > 0)
-	{
-		header("Location: ".DOL_URL_ROOT.'/product/stock/liste.php');
-		exit;
-	}
-	else
-	{
-		$mesg='<div class="error">'.$object->error.'</div>';
-		$action='';
-	}
-}
-
-// Modification entrepot
-if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel"))
-{
-	$object = new Entrepot($db);
-	if ($object->fetch($id))
-	{
-		$object->libelle     = $_POST["libelle"];
-		$object->description = $_POST["desc"];
-		$object->statut      = $_POST["statut"];
-		$object->lieu        = $_POST["lieu"];
-		$object->address     = $_POST["address"];
-		$object->zip         = $_POST["zipcode"];
-		$object->town        = $_POST["town"];
-		$object->country_id  = $_POST["country_id"];
-
-		if ( $object->update($id, $user) > 0)
-		{
-			$action = '';
-			//$mesg = '<div class="ok">Fiche mise a jour</div>';
-		}
-		else
-		{
-			$action = 'edit';
-			$mesg = '<div class="error">'.$object->error.'</div>';
-		}
-	}
-	else
-	{
-		$action = 'edit';
-		$mesg = '<div class="error">'.$object->error.'</div>';
-	}
-}
-
-if ($_POST["cancel"] == $langs->trans("Cancel"))
-{
-	$action = '';
-}
-
-
-
-/*
- * View
- */
-
-$productstatic=new Product($db);
-$form=new Form($db);
-$formcompany=new FormCompany($db);
-
-$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-llxHeader("",$langs->trans("WarehouseCard"),$help_url);
-
-
-if ($action == 'create')
-{
-	print_fiche_titre($langs->trans("NewWarehouse"));
-
-	print "<form action=\"fiche.php\" method=\"post\">\n";
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="type" value="'.$type.'">'."\n";
-
-	dol_htmloutput_mesg($mesg);
-
-	print '<table class="border" width="100%">';
-
-	// Ref
-	print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="libelle" size="20" value=""></td></tr>';
-
-	print '<tr><td >'.$langs->trans("LocationSummary").'</td><td colspan="3"><input name="lieu" size="40" value="'.$object->lieu.'"></td></tr>';
-
-	// Description
-	print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-	// Editeur wysiwyg
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70);
-	$doleditor->Create();
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="60" rows="3" wrap="soft">';
-	print $object->address;
-	print '</textarea></td></tr>';
-
-	// Zip / Town
-	print '<tr><td>'.$langs->trans('Zip').'</td><td>';
-	print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
-	print '</td><td>'.$langs->trans('Town').'</td><td>';
-	print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
-	print '</td></tr>';
-
-	// Country
-	print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
-	print $form->select_country($object->country_id?$object->country_id:$mysoc->country_code,'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	print '</td></tr>';
-
-	print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
-	print '<select name="statut" class="flat">';
-	print '<option value="0">'.$langs->trans("WarehouseClosed").'</option>';
-	print '<option value="1" selected="selected">'.$langs->trans("WarehouseOpened").'</option>';
-	print '</select>';
-	print '</td></tr>';
-
-	print '</table>';
-
-	print '<center><br><input type="submit" class="button" value="'.$langs->trans("Create").'"></center>';
-
-	print '</form>';
-}
-else
-{
-    $id=GETPOST("id",'int');
-	if ($id)
-	{
-		dol_htmloutput_mesg($mesg);
-
-		$object = new Entrepot($db);
-		$result = $object->fetch($id);
-		if ($result < 0)
-		{
-			dol_print_error($db);
-		}
-
-		/*
-		 * Affichage fiche
-		 */
-		if ($action <> 'edit' && $action <> 're-edit')
-		{
-			$head = stock_prepare_head($object);
-
-			dol_fiche_head($head, 'card', $langs->trans("Warehouse"), 0, 'stock');
-
-			// Confirm delete third party
-			if ($action == 'delete')
-			{
-				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("DeleteAWarehouse"),$langs->trans("ConfirmDeleteWarehouse",$object->libelle),"confirm_delete",'',0,2);
-			}
-
-			print '<table class="border" width="100%">';
-
-			$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/liste.php">'.$langs->trans("BackToList").'</a>';
-
-			// Ref
-			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
-			print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'libelle');
-			print '</td>';
-
-			print '<tr><td>'.$langs->trans("LocationSummary").'</td><td colspan="3">'.$object->lieu.'</td></tr>';
-
-			// Description
-			print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">'.nl2br($object->description).'</td></tr>';
-
-			// Address
-			print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3">';
-			print $object->address;
-			print '</td></tr>';
-
-			// Town
-			print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$object->zip.'</td>';
-			print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$object->town.'</td></tr>';
-
-			// Country
-			print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
-			if (! empty($object->country_code)) 
-			{
-				$img=picto_from_langcode($object->country_code);
-				print ($img?$img.' ':'');
-			}
-			print $object->country;
-			print '</td></tr>';
-
-			// Status
-			print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">'.$object->getLibStatut(4).'</td></tr>';
-
-        	$calcproductsunique=$object->nb_different_products();
-			$calcproducts=$object->nb_products();
-
-	        // Total nb of different products
-	        print '<tr><td valign="top">'.$langs->trans("NumberOfDifferentProducts").'</td><td colspan="3">';
-	        print empty($calcproductsunique['nb'])?'0':$calcproductsunique['nb'];
-	        print "</td></tr>";
-
-			// Nb of products
-			print '<tr><td valign="top">'.$langs->trans("NumberOfProducts").'</td><td colspan="3">';
-			print empty($calcproducts['nb'])?'0':$calcproducts['nb'];
-			print "</td></tr>";
-
-			// Value
-			print '<tr><td valign="top">'.$langs->trans("EstimatedStockValueShort").'</td><td colspan="3">';
-			print empty($calcproducts['value'])?'0':$calcproducts['value'];
-			print "</td></tr>";
-
-			// Last movement
-			$sql = "SELECT max(m.datem) as datem";
-			$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-			$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
-			$resqlbis = $db->query($sql);
-			if ($resqlbis)
-			{
-				$obj = $db->fetch_object($resqlbis);
-				$lastmovementdate=$db->jdate($obj->datem);
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-			print '<tr><td valign="top">'.$langs->trans("LastMovement").'</td><td colspan="3">';
-			if ($lastmovementdate)
-			{
-			    print dol_print_date($lastmovementdate,'dayhour').' ';
-			    print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?id='.$object->id.'">'.$langs->trans("FullList").'</a>)';
-			}
-			else
-			{
-			     print $langs->trans("None");
-			}
-			print "</td></tr>";
-
-			print "</table>";
-
-			print '</div>';
-
-
-			/* ************************************************************************** */
-			/*                                                                            */
-			/* Barre d'action                                                             */
-			/*                                                                            */
-			/* ************************************************************************** */
-
-			print "<div class=\"tabsAction\">\n";
-
-			$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($action))
-				{
-					if ($user->rights->stock->creer)
-						print "<a class=\"butAction\" href=\"fiche.php?action=edit&id=".$object->id."\">".$langs->trans("Modify")."</a>";
-					else
-						print "<a class=\"butActionRefused\" href=\"#\">".$langs->trans("Modify")."</a>";
-	
-					if ($user->rights->stock->supprimer)
-						print "<a class=\"butActionDelete\" href=\"fiche.php?action=delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
-					else
-						print "<a class=\"butActionRefused\" href=\"#\">".$langs->trans("Delete")."</a>";
-				}
-			}
-			
-			print "</div>";
-
-
-			/* ************************************************************************** */
-			/*                                                                            */
-			/* Affichage de la liste des produits de l'entrepot                           */
-			/*                                                                            */
-			/* ************************************************************************** */
-			print '<br>';
-
-			print '<table class="noborder" width="100%">';
-			print "<tr class=\"liste_titre\">";
-			print_liste_field_titre($langs->trans("Product"),"", "p.ref","&amp;id=".$id,"","",$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("Label"),"", "p.label","&amp;id=".$id,"","",$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("Units"),"", "ps.reel","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("AverageUnitPricePMPShort"),"", "ps.pmp","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre($langs->trans("EstimatedStockValueShort"),"", "","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
-            if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellPriceMin"),"", "p.price","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
-            if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("EstimatedStockValueSellShort"),"", "","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
-			if ($user->rights->stock->mouvement->creer) print '<td>&nbsp;</td>';
-			if ($user->rights->stock->creer)            print '<td>&nbsp;</td>';
-			print "</tr>";
-
-			$totalunit=0;
-			$totalvalue=$totalvaluesell=0;
-
-			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc,";
-			$sql.= " ps.pmp, ps.reel as value";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product_stock ps, ".MAIN_DB_PREFIX."product p";
-			$sql.= " WHERE ps.fk_product = p.rowid";
-			$sql.= " AND ps.reel <> 0";	// We do not show if stock is 0 (no product in this warehouse)
-			$sql.= " AND ps.fk_entrepot = ".$object->id;
-			$sql.= $db->order($sortfield,$sortorder);
-
-			dol_syslog('List products sql='.$sql);
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$num = $db->num_rows($resql);
-				$i = 0;
-				$var=True;
-				while ($i < $num)
-				{
-					$objp = $db->fetch_object($resql);
-
-					// Multilangs
-					if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-					{
-						$sql = "SELECT label";
-						$sql.= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sql.= " WHERE fk_product=".$objp->rowid;
-						$sql.= " AND lang='". $langs->getDefaultLang() ."'";
-						$sql.= " LIMIT 1";
-
-						$result = $db->query($sql);
-						if ($result)
-						{
-							$objtp = $db->fetch_object($result);
-							if ($objtp->label != '') $objp->produit = $objtp->label;
-						}
-					}
-
-					$var=!$var;
-					//print '<td>'.dol_print_date($objp->datem).'</td>';
-					print "<tr ".$bc[$var].">";
-					print "<td>";
-					$productstatic->id=$objp->rowid;
-					$productstatic->ref=$objp->ref;
-					$productstatic->type=$objp->type;
-					print $productstatic->getNomUrl(1,'stock',16);
-					print '</td>';
-					print '<td>'.$objp->produit.'</td>';
-
-					print '<td align="right">'.$objp->value.'</td>';
-					$totalunit+=$objp->value;
-
-                    // Price buy PMP
-					print '<td align="right">'.price(price2num($objp->pmp,'MU')).'</td>';
-                    // Total PMP
-					print '<td align="right">'.price(price2num($objp->pmp*$objp->value,'MT')).'</td>';
-					$totalvalue+=price2num($objp->pmp*$objp->value,'MT');
-
-                    // Price sell min
-                    if (empty($conf->global->PRODUIT_MULTIPRICES))
-                    {
-                        $pricemin=$objp->price;
-                        print '<td align="right">';
-                        print price(price2num($pricemin,'MU'),1);
-                        print '</td>';
-                        // Total sell min
-                        print '<td align="right">';
-                        print price(price2num($pricemin*$objp->value,'MT'),1);
-                        print '</td>';
-                    }
-                    $totalvaluesell+=price2num($pricemin*$objp->value,'MT');
-
-                    if ($user->rights->stock->mouvement->creer)
-					{
-						print '<td align="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&amp;id='.$objp->rowid.'&amp;action=transfert">';
-						print img_picto($langs->trans("StockMovement"),'uparrow.png').' '.$langs->trans("StockMovement");
-						print "</a></td>";
-					}
-
-					if ($user->rights->stock->creer)
-					{
-						print '<td align="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&amp;id='.$objp->rowid.'&amp;action=correction">';
-						print $langs->trans("StockCorrection");
-						print "</a></td>";
-					}
-
-					print "</tr>";
-					$i++;
-				}
-				$db->free($resql);
-
-				print '<tr class="liste_total"><td class="liste_total" colspan="2">'.$langs->trans("Total").'</td>';
-				print '<td class="liste_total" align="right">'.$totalunit.'</td>';
-				print '<td class="liste_total">&nbsp;</td>';
-                print '<td class="liste_total" align="right">'.price(price2num($totalvalue,'MT')).'</td>';
-                if (empty($conf->global->PRODUIT_MULTIPRICES))
-                {
-                    print '<td class="liste_total">&nbsp;</td>';
-                    print '<td class="liste_total" align="right">'.price(price2num($totalvaluesell,'MT')).'</td>';
-                }
-                print '<td class="liste_total">&nbsp;</td>';
-				print '<td class="liste_total">&nbsp;</td>';
-				print '</tr>';
-
-			}
-			else
-			{
-				dol_print_error($db);
-			}
-			print "</table>\n";
-		}
-
-
-		/*
-		 * Edition fiche
-		 */
-		if (($action == 'edit' || $action == 're-edit') && 1)
-		{
-			print_fiche_titre($langs->trans("WarehouseEdit"), $mesg);
-
-			print '<form action="fiche.php" method="POST">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="update">';
-			print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-			print '<table class="border" width="100%">';
-
-			// Ref
-			print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="libelle" size="20" value="'.$object->libelle.'"></td></tr>';
-
-			print '<tr><td width="20%">'.$langs->trans("LocationSummary").'</td><td colspan="3"><input name="lieu" size="40" value="'.$object->lieu.'"></td></tr>';
-
-			// Description
-			print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
-			// Editeur wysiwyg
-			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-			$doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70);
-			$doleditor->Create();
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="60" rows="3" wrap="soft">';
-			print $object->address;
-			print '</textarea></td></tr>';
-
-			// Zip / Town
-			print '<tr><td>'.$langs->trans('Zip').'</td><td>';
-			print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
-			print '</td><td>'.$langs->trans('Town').'</td><td>';
-			print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
-			print '</td></tr>';
-
-			// Country
-			print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
-			print $form->select_country($object->country_id?$object->country_id:$mysoc->country_code,'country_id');
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-			print '</td></tr>';
-
-			print '<tr><td width="20%">'.$langs->trans("Status").'</td><td colspan="3">';
-			print '<select name="statut" class="flat">';
-			print '<option value="0" '.($object->statut == 0?'selected="selected"':'').'>'.$langs->trans("WarehouseClosed").'</option>';
-			print '<option value="1" '.($object->statut == 0?'':'selected="selected"').'>'.$langs->trans("WarehouseOpened").'</option>';
-			print '</select>';
-			print '</td></tr>';
-
-			print '</table>';
-
-			print '<center><br><input type="submit" class="button" value="'.$langs->trans("Save").'">&nbsp;';
-			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
-
-			print '</form>';
-
-		}
-	}
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/product/stock/img/index.html b/htdocs/product/stock/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index da52a5aac58..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 <http://www.gnu.org/licenses/>.
- *
  */
 
 /**
@@ -51,7 +50,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 /*
  * Zone recherche entrepot
  */
-print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/liste.php">';
+print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/list.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder nohover" width="100%">';
 print "<tr class=\"liste_titre\">";
@@ -89,7 +88,7 @@ if ($result)
             $objp = $db->fetch_object($result);
             $var=!$var;
             print "<tr ".$bc[$var].">";
-            print "<td><a href=\"fiche.php?id=$objp->rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."</a></td>\n";
+            print "<td><a href=\"card.php?id=$objp->rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."</a></td>\n";
             print '<td align="right">'.$entrepot->LibStatut($objp->statut,5).'</td>';
             print "</tr>\n";
             $i++;
@@ -124,7 +123,7 @@ if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_typ
 $sql.= $db->order("datem","DESC");
 $sql.= $db->plimit($max,0);
 
-dol_syslog("Index:list stock movements sql=".$sql, LOG_DEBUG);
+dol_syslog("Index:list stock movements", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -146,10 +145,10 @@ if ($resql)
 		$var=!$var;
 		print "<tr ".$bc[$var].">";
 		print '<td>'.dol_print_date($db->jdate($objp->datem),'dayhour').'</td>';
-		print "<td><a href=\"../fiche.php?id=$objp->rowid\">";
+		print "<td><a href=\"../card.php?id=$objp->rowid\">";
 		print img_object($langs->trans("ShowProduct"),"product").' '.$objp->produit;
 		print "</a></td>\n";
-		print '<td><a href="fiche.php?id='.$objp->entrepot_id.'">';
+		print '<td><a href="card.php?id='.$objp->entrepot_id.'">';
 		print img_object($langs->trans("ShowWarehouse"),"stock").' '.$objp->stock;
 		print "</a></td>\n";
 		print '<td align="right">';
diff --git a/htdocs/product/stock/lib/index.html b/htdocs/product/stock/lib/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index e155418226a..50a0d85e25c 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -122,7 +122,6 @@ function ordered($product_id)
 	{
 		$error = $db->lasterror();
 		dol_print_error($db);
-		dol_syslog('replenish.php: ' . $error, LOG_ERR);
 
 		return $langs->trans('error');
 	}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
new file mode 100644
index 00000000000..c85c501fa58
--- /dev/null
+++ b/htdocs/product/stock/list.php
@@ -0,0 +1,152 @@
+<?php
+/* Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/product/stock/list.php
+ *      \ingroup    stock
+ *      \brief      Page with warehouse and stock value
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+
+$langs->load("stocks");
+
+// Security check
+$result=restrictedArea($user,'stock');
+
+$sref=GETPOST("sref","alpha");
+$snom=GETPOST("snom","alpha");
+$sall=GETPOST("sall","alpha");
+
+$sortfield = GETPOST("sortfield");
+$sortorder = GETPOST("sortorder");
+if (! $sortfield) $sortfield="e.label";
+if (! $sortorder) $sortorder="ASC";
+$page = GETPOST("page");
+if ($page < 0) $page = 0;
+$limit = $conf->liste_limit;
+$offset = $limit * $page;
+
+$year = strftime("%Y",time());
+
+
+/*
+ *	View
+ */
+
+$sql = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays,";
+$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";
+$sql.= " WHERE e.entity = ".$conf->entity;
+if ($sref)
+{
+    $sql.= " AND e.label LIKE '%".$db->escape($sref)."%'";
+}
+if ($sall)
+{
+    $sql.= " AND (e.label LIKE '%".$db->escape($sall)."%'";
+    $sql.= " OR e.description LIKE '%".$db->escape($sall)."%'";
+    $sql.= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
+    $sql.= " OR e.address LIKE '%".$db->escape($sall)."%'";
+    $sql.= " OR e.town LIKE '%".$db->escape($sall)."%')";
+}
+$sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit+1, $offset);
+
+$result = $db->query($sql);
+if ($result)
+{
+	$num = $db->num_rows($result);
+
+	$i = 0;
+
+	$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+	llxHeader("",$langs->trans("ListOfWarehouses"),$help_url);
+
+	print_barre_liste($langs->trans("ListOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder,'',$num);
+
+	print '<table class="noborder" width="100%">';
+
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"], "e.label","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("LocationSummary"),$_SERVER["PHP_SELF"], "e.lieu","","","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValue"), $_SERVER["PHP_SELF"], "e.valo_pmp",'','','align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValueSell"), $_SERVER["PHP_SELF"], "",'','','align="right"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"], "e.statut",'','','align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+	if ($num)
+	{
+		$entrepot=new Entrepot($db);
+        $total = $totalsell = 0;
+        $var=false;
+		while ($i < min($num,$limit))
+		{
+			$objp = $db->fetch_object($result);
+            print "<tr ".$bc[$var].">";
+            print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.'</a></td>';
+			// Location
+            print '<td>'.$objp->lieu.'</td>';
+            // PMP value
+            print '<td align="right">';
+            if (price2num($objp->estimatedvalue,'MT')) print price(price2num($objp->estimatedvalue,'MT'),1);
+            else print '';
+            print '</td>';
+            // Selling value
+            print '<td align="right">';
+            if (empty($conf->global->PRODUIT_MULTIPRICES)) print price(price2num($objp->sellvalue,'MT'),1);
+            else print $langs->trans("Variable");
+            print '</td>';
+            // Status
+            print '<td align="right">'.$entrepot->LibStatut($objp->statut,5).'</td>';
+            print "</tr>\n";
+
+            $total += price2num($objp->estimatedvalue,'MU');
+            $totalsell += price2num($objp->sellvalue,'MU');
+
+            $var=!$var;
+            $i++;
+		}
+
+		print '<tr class="liste_total">';
+        print '<td colspan="2" align="right">'.$langs->trans("Total").'</td>';
+        print '<td align="right">'.price(price2num($total,'MT'),1,$langs,0,0,-1,$conf->currency).'</td>';
+        print '<td align="right">'.price(price2num($totalsell,'MT'),1,$langs,0,0,-1,$conf->currency).'</td>';
+        print '<td align="right">&nbsp;</td>';
+        print "</tr>\n";
+	}
+
+	$db->free($result);
+
+	print "</table>";
+
+}
+else
+{
+  dol_print_error($db);
+}
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php
deleted file mode 100644
index a639bd86239..00000000000
--- a/htdocs/product/stock/liste.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *      \file       htdocs/product/stock/liste.php
- *      \ingroup    stock
- *      \brief      Page liste des stocks
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-
-$langs->load("stocks");
-
-// Security check
-$result=restrictedArea($user,'stock');
-
-$sref=GETPOST("sref");;
-$snom=GETPOST("snom");
-$sall=GETPOST("sall");
-
-$sortfield = GETPOST("sortfield");
-$sortorder = GETPOST("sortorder");
-if (! $sortfield) $sortfield="e.label";
-if (! $sortorder) $sortorder="ASC";
-$page = $_GET["page"];
-if ($page < 0) $page = 0;
-$limit = $conf->liste_limit;
-$offset = $limit * $page;
-
-
-$sql  = "SELECT e.rowid, e.label as ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
-$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-$sql.= " WHERE e.entity = ".$conf->entity;
-if ($sref)
-{
-    $sql.= " AND e.label like '%".$db->escape($sref)."%'";
-}
-if ($sall)
-{
-    $sql.= " AND (e.description like '%".$db->escape($sall)."%' OR e.lieu like '%".$db->escape($sall)."%' OR e.address like '%".$db->escape($sall)."%' OR e.town like '%".$db->escape($sall)."%')";
-}
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($limit+1, $offset);
-
-$result = $db->query($sql);
-if ($result)
-{
-	$num = $db->num_rows($result);
-
-	$i = 0;
-
-	$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-	llxHeader("",$langs->trans("ListOfWarehouses"),$help_url);
-
-	print_barre_liste($langs->trans("ListOfWarehouses"), $page, "liste.php", "", $sortfield, $sortorder,'',$num);
-
-	print '<table class="noborder" width="100%">';
-
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans("Ref"),"liste.php", "e.label","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("LocationSummary"),"liste.php", "e.lieu","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),"liste.php", "e.statut",'','','align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	if ($num) {
-		$entrepot=new Entrepot($db);
-
-		$var=True;
-		while ($i < min($num,$limit))
-		{
-			$objp = $db->fetch_object($result);
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
-			print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.'</a></td>';
-			print '<td>'.$objp->lieu.'</td>';
-			print '<td align="right">'.$entrepot->LibStatut($objp->statut,5).'</td>';
-			print "</tr>\n";
-			$i++;
-		}
-	}
-
-	$db->free($result);
-
-	print "</table>";
-
-}
-else
-{
-  dol_print_error($db);
-}
-
-
-$db->close();
-
-llxFooter();
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index ee94d9652c6..8a0b7297e2f 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2013   Laurent Destaileur	<ely@users.sourceforge.net>
+/* Copyright (C) 2013	Laurent Destaileur	<ely@users.sourceforge.net>
+ * Copyright (C) 2014	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +26,6 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
@@ -65,7 +65,7 @@ $limit = $conf->liste_limit;
 $offset = $limit * $page ;
 
 $listofdata=array();
-if (! empty($_SESSION['massstockmove'])) $listofdata=dol_json_decode($_SESSION['massstockmove'],true);
+if (! empty($_SESSION['massstockmove'])) $listofdata=json_decode($_SESSION['massstockmove'],true);
 
 
 /*
@@ -106,7 +106,7 @@ if ($action == 'addline')
 		if (count(array_keys($listofdata)) > 0) $id=max(array_keys($listofdata)) + 1;
 		else $id=1;
 		$listofdata[$id]=array('id'=>$id, 'id_product'=>$id_product, 'qty'=>$qty, 'id_sw'=>$id_sw, 'id_tw'=>$id_tw);
-		$_SESSION['massstockmove']=dol_json_encode($listofdata);
+		$_SESSION['massstockmove']=json_encode($listofdata);
 
 		unset($id_product);
 		//unset($id_sw);
@@ -118,7 +118,7 @@ if ($action == 'addline')
 if ($action == 'delline' && $idline != '')
 {
 	if (! empty($listofdata[$idline])) unset($listofdata[$idline]);
-	if (count($listofdata) > 0) $_SESSION['massstockmove']=dol_json_encode($listofdata);
+	if (count($listofdata) > 0) $_SESSION['massstockmove']=json_encode($listofdata);
 	else unset($_SESSION['massstockmove']);
 }
 
@@ -229,7 +229,7 @@ $warehousestatict = new Entrepot($db);
 
 $title = $langs->trans('MassMovement');
 
-llxHeader('', $title, $helpurl, '');
+llxHeader('', $title);
 
 print_fiche_titre($langs->trans("MassStockMovement")).'<br><br>';
 
@@ -250,6 +250,8 @@ print '<input type="hidden" name="action" value="addline">';
 print '<table class="liste" width="100%">';
 //print '<div class="tagtable centpercent">';
 
+$param='';
+
 print '<tr class="liste_titre">';
 print getTitleFieldOfList($langs->trans('ProductRef'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
 print getTitleFieldOfList($langs->trans('WarehouseSource'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
@@ -340,7 +342,7 @@ print '<table class="border" width="100%">';
 	print '<input type="text" name="label" size="80" value="'.dol_escape_htmltag($labelmovement).'">';
 	print '</td>';
 	print '</tr>';
-print '</table>';
+print '</table><br>';
 
 print '<div class="center"><input class="button" type="submit" name="valid" value="'.dol_escape_htmltag($buttonrecord).'"></div>';
 
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 1498b12a033..83d856ed0cc 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+/* Copyright (C) 2001-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  *
  * 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
@@ -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='';
@@ -213,7 +213,7 @@ if ($resql)
 
         print '<table class="border" width="100%">';
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/liste.php">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/list.php">'.$langs->trans("BackToList").'</a>';
 
         // Ref
         print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
@@ -406,8 +406,8 @@ if ($resql)
     if ($search_product_ref) $param.='&search_product_ref='.urlencode($search_product_ref);
     if ($search_product)   $param.='&search_product='.urlencode($search_product);
     if ($search_warehouse) $param.='&search_warehouse='.urlencode($search_warehouse);
-    if ($sref) $param.='&sref='.urlencode($sref);
-    if ($snom) $param.='&snom='.urlencode($snom);
+    if (!empty($sref)) $param.='&sref='.urlencode($sref); // FIXME $sref is not defined
+    if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined
     if ($search_user)    $param.='&search_user='.urlencode($search_user);
     if ($idproduct > 0)  $param.='&idproduct='.$idproduct;
     if ($id) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,0,'');
@@ -461,7 +461,6 @@ if ($resql)
     print '</td>';
     print '<td class="liste_titre" align="right">';
     print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-    print '&nbsp; ';
     print '<input type="image" class="liste_titre" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print '</td>';
     print "</tr>\n";
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 338169a6154..616e91d1924 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -39,6 +39,7 @@ $langs->load("products");
 $langs->load("orders");
 $langs->load("bills");
 $langs->load("stocks");
+$langs->load("sendings");
 if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
 
@@ -68,7 +69,7 @@ if ($action == 'setstocklimit')
     $product = new Product($db);
     $result=$product->fetch($id);
     $product->seuil_stock_alerte=$stocklimit;
-    $result=$product->update($product->id,$user,1,0,1);
+    $result=$product->update($product->id,$user,0,'update');
     if ($result < 0)
     	setEventMessage($product->error, 'errors');
     $action='';
@@ -80,7 +81,7 @@ if ($action == 'setdesiredstock')
     $product = new Product($db);
     $result=$product->fetch($id);
     $product->desiredstock=$desiredstock;
-    $result=$product->update($product->id,$user,1,0,1);
+    $result=$product->update($product->id,$user,0,'update');
     if ($result < 0)
     	setEventMessage($product->error, 'errors');
     $action='';
@@ -121,10 +122,11 @@ if ($action == "correct_stock" && ! $cancel)
 		if (is_numeric(GETPOST("nbpiece")) && $id)
 		{
 			if (empty($product)) {
-			$product = new Product($db);
-			$result=$product->fetch($id);
+				$product = new Product($db);
+				$result=$product->fetch($id);
 			}
-			if ($product->hasbatch()) {
+			if ($product->hasbatch())
+			{
 				$d_eatby=dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
 				$d_sellby=dol_mktime(12, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
 				$result=$product->correct_stock_batch(
@@ -138,15 +140,17 @@ if ($action == "correct_stock" && ! $cancel)
 					$d_sellby,
 					GETPOST('batch_number')
 				);		// We do not change value of stock for a correction
-			} else {
-			$result=$product->correct_stock(
-	    		$user,
-	    		GETPOST("id_entrepot"),
-	    		GETPOST("nbpiece"),
-	    		GETPOST("mouvement"),
-	    		GETPOST("label"),
-	    		$priceunit
-			);		// We do not change value of stock for a correction
+			}
+			else
+			{
+				$result=$product->correct_stock(
+		    		$user,
+		    		GETPOST("id_entrepot"),
+		    		GETPOST("nbpiece"),
+		    		GETPOST("mouvement"),
+		    		GETPOST("label"),
+		    		$priceunit
+				);		// We do not change value of stock for a correction
 			}
 
 			if ($result > 0)
@@ -154,6 +158,11 @@ if ($action == "correct_stock" && ! $cancel)
 	            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$product->id);
 				exit;
 			}
+			else
+			{
+			    setEventMessage($product->error,'errors');
+			    $action='correction';
+			}
 		}
 	}
 }
@@ -254,6 +263,8 @@ if ($id > 0 || $ref)
 		$picto=($product->type==1?'service':'product');
 		dol_fiche_head($head, 'stock', $titre, 0, $picto);
 
+		dol_htmloutput_events();
+
 		$form = new Form($db);
 
 		print '<table class="border" width="100%">';
@@ -269,19 +280,27 @@ if ($id > 0 || $ref)
 		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
 		print '</tr>';
 
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
-		print $product->getLibStatut(2,0);
-		print '</td></tr>';
+        // Status (to sell)
+        print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
+        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);
+        }
+        print '</td></tr>';
 
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
-		print $product->getLibStatut(2,1);
-		print '</td></tr>';
+        // Status (to buy)
+        print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
+        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);
+        }
+        print '</td></tr>';
 
 		if ($conf->productbatch->enabled) {
-			print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("l_sellby").')</td><td>';
-			print $product->getLibStatut(2,2);
+			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
+			print $product->getLibStatut(0,2);
 			print '</td></tr>';
 		}
 
@@ -316,58 +335,62 @@ if ($id > 0 || $ref)
 		print '</td>';
 		print '</tr>';
 
-		// Calculating a theorical value
+        // Calculating a theorical value
+        print '<tr><td>'.$langs->trans("VirtualStock").'</td>';
+        print "<td>".(empty($product->stock_theorique)?0:$product->stock_theorique);
+        if ($product->stock_theorique < $product->seuil_stock_alerte) {
+            print ' '.img_warning($langs->trans("StockLowerThanLimit"));
+        }
+        print '</td>';
+        print '</tr>';
 
-		// If stock if stock increment is done on real sending
-		if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
-		{
-			// Stock theorique
-			print '<tr><td>'.$langs->trans("VirtualStock").'</td>';
-			print "<td>".$product->stock_theorique;
-			if ($product->stock_theorique < $product->seuil_stock_alerte)
-			{
-				print ' '.img_warning($langs->trans("StockLowerThanLimit"));
-			}
-			print '</td>';
-			print '</tr>';
+        print '<tr><td>';
+        $text_stock_options = '';
+        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)?$langs->trans("DeStockOnShipment").'<br>':'');
+        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'<br>':'');
+        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_BILL)?$langs->trans("DeStockOnBill").'<br>':'');
+        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)?$langs->trans("ReStockOnBill").'<br>':'');
+        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)?$langs->trans("ReStockOnValidateOrder").'<br>':'');
+        $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)?$langs->trans("ReStockOnDispatchOrder").'<br>':'');
+        print $form->textwithtooltip($langs->trans("StockDiffPhysicTeoric"),$text_stock_options,2,1,img_picto('', 'info'),'',0);;
+        print '</td>';
+        print '<td>';
 
-			print '<tr><td>';
-			if ($product->stock_theorique != $product->stock_reel) print $langs->trans("StockDiffPhysicTeoric");
-			else print $langs->trans("RunningOrders");
-			print '</td>';
-			print '<td>';
+        $found=0;
+        // Number of customer orders running
+        if (! empty($conf->commande->enabled))
+        {
+            if ($found) print '<br>'; else $found=1;
+            print $langs->trans("CustomersOrdersRunning").': '.$product->stats_commande['qty'];
+            $result=$product->load_stats_commande(0,'0');
+            if ($result < 0) dol_print_error($db,$product->error);
+            print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')';
+        }
 
-			$found=0;
+        // Number of product from customer order already sent (partial shipping)
+        if (! empty($conf->expedition->enabled)) {
+            if ($found) print '<br>'; else $found=1;
+            $result=$product->load_stats_sending(0,'2');
+            print $langs->trans("SendingRunning").': '.$product->stats_expedition['qty'];
+        }
 
-			// Nbre de commande clients en cours
-			if (! empty($conf->commande->enabled))
-			{
-				if ($found) print '<br>'; else $found=1;
-				print $langs->trans("CustomersOrdersRunning").': '.($product->stats_commande['qty']-$product->stats_sendings['qty']);
-				$result=$product->load_stats_commande(0,'0');
-				if ($result < 0) dol_print_error($db,$product->error);
-				print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')';
-				//print '<br>';
-				//print $langs->trans("CustomersSendingRunning").': '.$stock_sending_client;
-			}
+        // Number of supplier order running
+        if (! empty($conf->fournisseur->enabled)) {
+            if ($found) print '<br>'; else $found=1;
+            $result=$product->load_stats_commande_fournisseur(0,'3,4');
+            print $langs->trans("SuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty'];
+            $result=$product->load_stats_commande_fournisseur(0,'0,1,2');
+            if ($result < 0) dol_print_error($db,$product->error);
+            print ' ('.$langs->trans("DraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')';
+        }
 
-			// Nbre de commande fournisseurs en cours
-			if (! empty($conf->fournisseur->enabled))
-			{
-				if ($found) print '<br>'; else $found=1;
-				print $langs->trans("SuppliersOrdersRunning").': '.($product->stats_commande_fournisseur['qty']-$product->stats_reception['qty']);
-				$result=$product->load_stats_commande_fournisseur(0,'0,1,2');
-				if ($result < 0) dol_print_error($db,$product->error);
-				print ' ('.$langs->trans("DraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')';
-			}
-			print '</td></tr>';
-		}
-
-		// If stock if stock increment is done on
-		// TODO Add information when stock increment is done on other option
-
-		// TODO Add also information on possible decrease stock accroding to stock decrease option
+	    // Number of product from supplier order already received (partial receipt)
+        if (! empty($conf->fournisseur->enabled)) {
+            if ($found) print '<br>'; else $found=1;
+            print $langs->trans("SuppliersReceiptRunning").': '.$product->stats_reception['qty'];
+        }
 
+        print '</td></tr>';
 
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
@@ -451,15 +474,18 @@ if ($id > 0 || $ref)
 		//eat-by date
 		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) {
 			print '<tr>';
-			print '<td width="15%">'.$langs->trans("l_eatby").'</td><td width="15%">';
+			print '<td colspan="2">'.$langs->trans("batch_number").'</td><td colspan="4">';
+			print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
+			print '</td>';
+			print '</tr><tr>';
+			print '<td colspan="2">'.$langs->trans("l_eatby").'</td><td>';
 			$form->select_date('','eatby','','',1,"");
 			print '</td>';
-			print '<td width="15%">'.$langs->trans("l_sellby").'</td><td width="15%">';
+			print '<td></td>';
+			print '<td>'.$langs->trans("l_sellby").'</td><td>';
 			$form->select_date('','sellby','','',1,"");
 			print '</td>';
-			print '<td width="15%">'.$langs->trans("batch_number").'</td><td width="15%">';
-			print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
-			print '</td></tr>';
+			print '</tr>';
 		}
 		print '</table>';
 
@@ -571,9 +597,10 @@ print '<td align="right">'.$langs->trans("SellPriceMin").'</td>';
 print '<td align="right">'.$langs->trans("EstimatedStockValueSellShort").'</td>';
 print '</tr>';
 if ( (! empty($conf->productbatch->enabled)) && $product->hasbatch()) {
-	print '<tr class="liste_titre"><td width="10%"></td><td align="right" width="10%">'.$langs->trans("l_eatby").'</td>';
-	print '<td align="right" width="10%">'.$langs->trans("l_sellby").'</td>';
+	print '<tr class="liste_titre"><td width="10%"></td>';
 	print '<td align="right" width="10%">'.$langs->trans("batch_number").'</td>';
+	print '<td align="right" width="10%">'.$langs->trans("l_eatby").'</td>';
+	print '<td align="right" width="10%">'.$langs->trans("l_sellby").'</td>';
 	print '<td align="right" colspan="5"></td>';
 	print '</tr>';
 }
@@ -606,31 +633,36 @@ if ($resql)
 		print '<td colspan="4">'.$entrepotstatic->getNomUrl(1).'</td>';
 		print '<td align="right">'.$obj->reel.($obj->reel<0?' '.img_warning():'').'</td>';
 		// PMP
-		print '<td align="right">'.(price2num($obj->pmp)?price2num($obj->pmp,'MU'):'').'</td>'; // Ditto : Show PMP from movement or from product
-		print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
+		print '<td align="right">'.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').'</td>'; // Ditto : Show PMP from movement or from product
+		// Value purchase
+		print '<td align="right">'.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
         // Sell price
 		print '<td align="right">';
         if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1);
         else print $langs->trans("Variable");
         print '</td>'; // Ditto : Show PMP from movement or from product
+        // Value sell
         print '<td align="right">';
         if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'</td>'; // Ditto : Show PMP from movement or from product
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$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".'<tr><td width="10%"></td><td width="10%" align="right">'. dol_print_date($pdluo->eatby,'day') .'</td>';
-				print '<td align="right" width="10%">'. dol_print_date($pdluo->sellby,'day') .'</td>';
-				print '<td align="right" width="10%">'.$pdluo->batch.'</td>';
-				print '<td align="right" width="10%">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
-				print '<td colspan="4" width="50%"></td></tr>';
+			foreach ($details as $pdluo)
+			{
+				print "\n".'<tr><td></td>';
+				print '<td align="right">'.$pdluo->batch.'</td>';
+				print '<td align="right">'. dol_print_date($pdluo->eatby,'day') .'</td>';
+				print '<td align="right">'. dol_print_date($pdluo->sellby,'day') .'</td>';
+				print '<td align="right">'.$pdluo->qty.($pdluo->qty<0?' '.img_warning():'').'</td>';
+				print '<td colspan="4"></td></tr>';
 			}
 		}
 		$i++;
@@ -638,18 +670,21 @@ if ($resql)
 	}
 }
 else dol_print_error($db);
+
 print '<tr class="liste_total"><td align="right" class="liste_total" colspan="4">'.$langs->trans("Total").':</td>';
 print '<td class="liste_total" align="right">'.$total.'</td>';
 print '<td class="liste_total" align="right">';
-print ($totalwithpmp?price($totalvalue/$totalwithpmp):'&nbsp;');
+print ($totalwithpmp?price(price2num($totalvalue/$totalwithpmp,'MU')):'&nbsp;');	// This value may have rounding errors
 print '</td>';
+// Value purchase
 print '<td class="liste_total" align="right">';
-print price(price2num($totalvalue,'MT'),1);
+print $totalvalue?price(price2num($totalvalue,'MT'),1):'&nbsp;';
 print '</td>';
 print '<td class="liste_total" align="right">';
 if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total,1):'&nbsp;');
 else print $langs->trans("Variable");
 print '</td>';
+// Value to sell
 print '<td class="liste_total" align="right">';
 if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT'),1);
 else print $langs->trans("Variable");
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 817ec5cbf7a..35835709ab8 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2013      Cédric Salvador    	<csalvador@gpcsolutions.fr>
- * Copyright (C) 2013-2014 Laurent Destaileur	<ely@users.sourceforge.net>
+/* Copyright (C) 2013		Cédric Salvador		<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013-2014	Laurent Destaileur	<ely@users.sourceforge.net>
+ * Copyright (C) 2014		Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * 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
@@ -50,6 +51,9 @@ $tobuy = GETPOST('tobuy', 'int');
 $salert = GETPOST('salert', 'alpha');
 $mode = GETPOST('mode','alpha');
 
+$fourn_id = GETPOST('fourn_id','int');
+$texte = '';
+
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
@@ -130,7 +134,6 @@ if ($action == 'order' && isset($_POST['valid']))
 				{
                     $error=$db->lasterror();
                     dol_print_error($db);
-                    dol_syslog('replenish.php: '.$error, LOG_ERR);
                 }
                 $db->free($resql);
                 unset($_POST['fourn' . $i]);
@@ -198,7 +201,7 @@ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global
 $usevirtualstock=-1;
 if ($virtualdiffersfromphysical)
 {
-	$usevirtualstock=($conf->global->STOCK_USE_VIRTUAL_STOCK?1:0);
+	$usevirtualstock=(! empty($conf->global->STOCK_USE_VIRTUAL_STOCK)?1:0);
 	if ($mode=='virtual') $usevirtualstock=1;
 	if ($mode=='physical') $usevirtualstock=0;
 }
@@ -258,7 +261,7 @@ if ($usevirtualstock)
 	$sqlCommandesCli.= " WHERE c.entity = ".$conf->entity;
 	$sqlCommandesCli.= " AND cd.fk_product = p.rowid";
 	$sqlCommandesCli.= " AND c.fk_statut IN (1,2))";
-	
+
 	$sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed.qty) IS NULL", "0", "SUM(ed.qty)")." as qty";
 	$sqlExpeditionsCli.= " FROM ".MAIN_DB_PREFIX."expedition as e";
 	$sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet as ed ON (ed.fk_expedition = e.rowid)";
@@ -267,7 +270,7 @@ if ($usevirtualstock)
 	$sqlExpeditionsCli.= " WHERE e.entity = ".$conf->entity;
 	$sqlExpeditionsCli.= " AND cd.fk_product = p.rowid";
 	$sqlExpeditionsCli.= " AND c.fk_statut IN (1,2))";
-		
+
 	$sqlCommandesFourn = "(SELECT ".$db->ifsql("SUM(cd.qty) IS NULL", "0", "SUM(cd.qty)")." as qty";
 	$sqlCommandesFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
 	$sqlCommandesFourn.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
@@ -275,19 +278,19 @@ if ($usevirtualstock)
 	$sqlCommandesFourn.= " AND c.entity = ".$conf->entity;
 	$sqlCommandesFourn.= " AND cd.fk_product = p.rowid";
 	$sqlCommandesFourn.= " AND c.fk_statut IN (3,4))";
-	
+
 	$sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd.qty) IS NULL", "0", "SUM(fd.qty)")." as qty";
 	$sqlReceptionFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 	$sqlReceptionFourn.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd ON (fd.fk_commande = cf.rowid)";
 	$sqlReceptionFourn.= " WHERE cf.entity = ".$conf->entity;
 	$sqlReceptionFourn.= " AND fd.fk_product = p.rowid";
 	$sqlReceptionFourn.= " AND cf.fk_statut IN (3,4))";
-	
+
 	$sql.= ' HAVING ((('.$db->ifsql("p.desiredstock IS NULL", "0", "p.desiredstock").' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 	$sql.= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.')))';
 	$sql.= ' OR (p.seuil_stock_alerte >= 0 AND (p.seuil_stock_alerte > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 	$sql.= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.'))))';
-	
+
 	if ($salert == 'on')	// Option to see when stock is lower than alert
 	{
 		$sql.= ' AND (p.seuil_stock_alerte > 0 AND (p.seuil_stock_alerte > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
@@ -297,7 +300,7 @@ if ($usevirtualstock)
 } else {
 	$sql.= ' HAVING ((p.desiredstock > 0 AND (p.desiredstock > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
 	$sql.= ' OR (p.seuil_stock_alerte > 0 AND (p.seuil_stock_alerte > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))))';
-	
+
 	if ($salert == 'on')	// Option to see when stock is lower than alert
 	{
 		$sql.= ' AND (p.seuil_stock_alerte > 0 AND (p.seuil_stock_alerte > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
@@ -309,7 +312,6 @@ $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit, $offset);
 
 //print $sql;
-dol_syslog('Execute request sql='.$sql);
 $resql = $db->query($sql);
 if (empty($resql))
 {
@@ -428,7 +430,7 @@ print '<tr class="liste_titre">'.
 if (!empty($conf->service->enabled) && $type == 1) print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>'.
 	'<td class="liste_titre" align="right">&nbsp;</td>'.
-	'<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&nbsp;<input type="checkbox" id="salert" name="salert" ' . $alertchecked . '></td>'.
+	'<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . '&nbsp;<input type="checkbox" id="salert" name="salert" ' . (!empty($alertchecked)?$alertchecked:'') . '></td>'.
 	'<td class="liste_titre" align="right">&nbsp;</td>'.
 	'<td class="liste_titre">&nbsp;</td>'.
 	'<td class="liste_titre" align="right">'.
@@ -448,7 +450,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	{
 		$prod->fetch($objp->rowid);
 		$prod->load_stock();
-		
+
 		// Multilangs
 		if (! empty($conf->global->MAIN_MULTILANGS))
 		{
@@ -477,9 +479,9 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		{
 			$stock = $prod->stock_reel;
 		}
-		
+
 		$ordered = $prod->stats_commande_fournisseur['qty']-$prod->stats_reception['qty'];
-		
+
 		$warning='';
 		if ($objp->alertstock && ($stock < $objp->alertstock))
 		{
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 5ebb36a7054..71fe1407a2d 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -1,6 +1,7 @@
 <?php
 /*
- * Copyright (C) 2013   Cédric Salvador    <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013	Cédric Salvador	<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014	Regis Houssin	<regis.houssin@capnetworks.com>
  *
  * 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
@@ -44,8 +45,7 @@ $result=restrictedArea($user,'produit|service');
  * View
  */
 
-$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|';
-$helpurl .= 'ES:M&oacute;dulo_Stocks';
+$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 $texte = $langs->trans('ReplenishmentOrders');
 
 llxHeader('', $texte, $helpurl, '');
@@ -77,7 +77,7 @@ if (!$sortfield) $sortfield = 'cf.date_creation';
 
 $offset = $conf->liste_limit * $page ;
 
-$sql = 'SELECT s.rowid as socid, s.nom, cf.date_creation as dc,';
+$sql = 'SELECT s.rowid as socid, s.nom as name, cf.date_creation as dc,';
 $sql.= ' cf.rowid, cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,';
 $sql.= ' u.login';
 $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf';
@@ -132,7 +132,7 @@ if ($sall) {
     $sql .= ' AND (cf.ref LIKE "%' . $db->escape($sall) . '%" ';
     $sql .= 'OR cf.note LIKE "%' . $db->escape($sall) . '%")';
 }
-if ($socid) {
+if (!empty($socid)) {
     $sql .= ' AND s.rowid = ' . $socid;
 }
 
@@ -260,7 +260,7 @@ if ($resql)
         $var = !$var;
         if (!dispatched($obj->rowid) && (!$sproduct || in_array($sproduct, getProducts($obj->rowid))))
         {
-            $href = DOL_URL_ROOT . '/fourn/commande/fiche.php?id=' . $obj->rowid;
+            $href = DOL_URL_ROOT . '/fourn/commande/card.php?id=' . $obj->rowid;
             print '<tr ' . $bc[$var] . '>'.
             // Ref
                  '<td>'.
@@ -269,11 +269,11 @@ if ($resql)
                  '</a></td>';
 
             // Company
-            $href = DOL_URL_ROOT . '/fourn/fiche.php?socid=' . $obj->socid;
+            $href = DOL_URL_ROOT . '/fourn/card.php?socid=' . $obj->socid;
             print '<td>'.
                  '<a href="' . $href .'">'.
                  img_object($langs->trans('ShowCompany'), 'company'). ' '.
-                 $obj->nom . '</a></td>';
+                 $obj->name . '</a></td>';
 
             // Author
             $userstatic->id = $obj->fk_user_author;
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 17e23fef009..6f5cb7ae578 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -31,12 +31,12 @@ $langs->load("stocks");
 // Security check
 $result=restrictedArea($user,'stock');
 
-$sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"];
-$snom=isset($_GET["snom"])?$_GET["snom"]:$_POST["snom"];
-$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
+$sref=GETPOST("sref");;
+$snom=GETPOST("snom");
+$sall=GETPOST("sall");
 
-$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
-$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
+$sortfield = GETPOST("sortfield");
+$sortorder = GETPOST("sortorder");
 if (! $sortfield) $sortfield="e.label";
 if (! $sortorder) $sortorder="ASC";
 $page = $_GET["page"];
@@ -51,8 +51,7 @@ $year = strftime("%Y",time());
  *	View
  */
 
-// Affichage valorisation par entrepot
-$sql = "SELECT e.rowid as ref, e.label, e.statut, e.lieu,";
+$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.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
@@ -60,7 +59,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
 $sql.= " WHERE e.entity = ".$conf->entity;
 if ($sref)
 {
-    $sql.= " AND e.ref LIKE '%".$sref."%'";
+    $sql.= " AND e.label LIKE '%".$db->escape($sref)."%'";
 }
 if ($sall)
 {
@@ -70,7 +69,7 @@ if ($sall)
     $sql.= " OR e.address LIKE '%".$db->escape($sall)."%'";
     $sql.= " OR e.town LIKE '%".$db->escape($sall)."%')";
 }
-$sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu";
+$sql.= " GROUP BY e.rowid, e.label, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
 
@@ -84,15 +83,15 @@ if ($result)
     $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     llxHeader("",$langs->trans("EnhancedValueOfWarehouses"),$help_url);
 
-    print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, "valo.php", "", $sortfield, $sortorder,'',$num);
+    print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder,'',$num);
 
     print '<table class="noborder" width="100%">';
     print "<tr class=\"liste_titre\">";
-    print_liste_field_titre($langs->trans("Ref"),"valo.php", "e.label","","","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("LocationSummary"),"valo.php", "e.lieu","","","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EstimatedStockValue"),"valo.php", "e.valo_pmp",'','','align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EstimatedStockValueSell"),"", "",'','','align="right"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),"valo.php", "e.statut",'','','align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "e.label","","","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("LocationSummary"), $_SERVER["PHP_SELF"], "e.lieu","","","",$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValue"), $_SERVER["PHP_SELF"], "e.valo_pmp",'','','align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("EstimatedStockValueSell"), $_SERVER["PHP_SELF"], "",'','','align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "e.statut",'','','align="right"',$sortfield,$sortorder);
     print "</tr>\n";
 
     if ($num)
@@ -104,7 +103,7 @@ if ($result)
         {
             $objp = $db->fetch_object($result);
             print "<tr ".$bc[$var].">";
-            print '<td><a href="fiche.php?id='.$objp->ref.'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->label.'</a></td>';
+            print '<td><a href="card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.'</a></td>';
             print '<td>'.$objp->lieu.'</td>';
             // PMP value
             print '<td align="right">';
@@ -133,20 +132,22 @@ if ($result)
         print "</tr>\n";
 
     }
+
     $db->free($result);
+    
     print "</table>";
 
     print '<br>';
 
     $file='entrepot-'.$year.'.png';
-    if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file))
+    if (file_exists($conf->stock->dir_temp.'/'.$file))
     {
         $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
         print '<img src="'.$url.'">';
     }
 
     $file='entrepot-'.($year-1).'.png';
-    if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file))
+    if (file_exists($conf->stock->dir_temp.'/'.$file))
     {
         $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
         print '<br><img src="'.$url.'">';
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index f273eef35bf..cd7e4cdcb3c 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2010-2012 Destailleur Laurent <eldy@users.sourceforge.net>
+ * Copyright (C) 2014 	   Henry Florian <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,7 +63,7 @@ if ($action == 'delete' && GETPOST('langtodelete','alpha'))
 	$product->delMultiLangs(GETPOST('langtodelete','alpha'));
 }
 
-// Validation de l'ajout
+// Add translation
 if ($action == 'vadd' &&
 $cancel != $langs->trans("Cancel") &&
 ($user->rights->produit->creer || $user->rights->service->creer))
@@ -93,11 +94,11 @@ $cancel != $langs->trans("Cancel") &&
 	else
 	{
 		$action = 'add';
-		$mesg = '<div class="error">'.$product->error.'</div>';
+		setEventMessage($product->error,'errors');
 	}
 }
 
-// Validation de l'edition
+// Edit translation
 if ($action == 'vedit' &&
 $cancel != $langs->trans("Cancel") &&
 ($user->rights->produit->creer || $user->rights->service->creer))
@@ -129,7 +130,28 @@ $cancel != $langs->trans("Cancel") &&
 	else
 	{
 		$action = 'edit';
-		$mesg = '<div class="error">'.$product->error.'</div>';
+		setEventMessage($product->error,'errors');
+	}
+}
+
+// Delete translation
+if ($action == 'vdelete' &&
+$cancel != $langs->trans("Cancel") &&
+($user->rights->produit->creer || $user->rights->service->creer))
+{
+	$product = new Product($db);
+	$product->fetch($id);
+	$langtodelete=GETPOST('langdel','alpha');
+
+	
+	if ( $product->delMultiLangs($langtodelete) > 0 )
+	{
+		$action = '';
+	}
+	else
+	{
+		$action = 'edit';
+		setEventMessage($product->error,'errors');
 	}
 }
 
@@ -151,10 +173,6 @@ $titre=$langs->trans("CardProduct".$product->type);
 $picto=($product->type==1?'service':'product');
 dol_fiche_head($head, 'translation', $titre, 0, $picto);
 
-if (! empty($mesg)) {
-	dol_htmloutput_mesg($mesg);
-}
-
 print '<table class="border" width="100%">';
 
 // Reference
@@ -194,7 +212,7 @@ if ($action == 'edit')
 			$doleditor->Create();
 
 			print '</td></tr>';
-			print '</tr>';
+			print '<tr height="30px"><td colspan="2" align="right"><a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=vdelete&id='.$product->id.'&langdel='.$key.'">'.$langs->trans("Delete").'</a></td></tr>';
 			print '</table>';
 		}
 	}
diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php
index 430970c981d..692e4ab08b4 100644
--- a/htdocs/projet/activity/list.php
+++ b/htdocs/projet/activity/list.php
@@ -70,7 +70,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
 				{
 	                // We store HOURS in seconds
 	                if($matches[2]=='hour') $timespent_duration[$id] += $time*60*60;
-	
+
 	                // We store MINUTES in seconds
 	                if($matches[2]=='min') $timespent_duration[$id] += $time*60;
 				}
@@ -83,24 +83,27 @@ if ($action == 'addtime' && $user->rights->projet->creer)
     	foreach($timespent_duration as $key => $val)
     	{
 	        $task->fetch($key);
+		    $task->progress = GETPOST($key . 'progress', 'int');
 	        $task->timespent_duration = $val;
 	        $task->timespent_fk_user = $user->id;
 	        $task->timespent_date = dol_mktime(12,0,0,$_POST["{$key}month"],$_POST["{$key}day"],$_POST["{$key}year"]);
 	        $task->addTimeSpent($user);
     	}
-    	
+
     	setEventMessage($langs->trans("RecordSaved"));
-    	
+
         // Redirect to avoid submit twice on back
         header('Location: '.$_SERVER["PHP_SELF"].'?id='.$projectid.($mode?'&mode='.$mode:''));
         exit;
     }
     else
     {
-        $mesg='<div class="error">'.$langs->trans("ErrorTimeSpentIsEmpty").'</div>';
+	    setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors');
     }
 }
 
+
+
 /*
  * View
  */
@@ -113,14 +116,13 @@ $taskstatic = new Task($db);
 $title=$langs->trans("TimeSpent");
 if ($mine) $title=$langs->trans("MyTimeSpent");
 
-
 //$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);  // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project
 
 if ($id)
 {
     $project->fetch($id);
-    $project->societe->fetch($project->societe->id);
+    $project->fetch_thirdparty();
 }
 
 $tasksarray=$taskstatic->getTasksArray(0,0,($project->id?$project->id:$projectsListId),$socid,0);    // We want to see all task of project i am allowed to see, not only mine. Later only mine will be editable later.
@@ -135,6 +137,15 @@ llxHeader("",$title,"");
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
+// Show description of content
+if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
+else
+{
+	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
+	else print $langs->trans("ProjectsPublicTakDesc").'<br><br>';
+}
+
+
 // Filter on user
 /*	dol_fiche_head('');
 	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
@@ -145,9 +156,15 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorde
 	dol_fiche_end();
 */
 
-
-dol_htmloutput_mesg($mesg);
-
+// Filter on user
+/*	dol_fiche_head('');
+	print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
+	print '<td>';
+	if ($mine) print $user->getLoginUrl(1);
+	print '</td>';
+	print '</tr></table>';
+	dol_fiche_end();
+*/
 
 print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -162,13 +179,13 @@ print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td align="center">'.$langs->trans("DateStart").'</td>';
 print '<td align="center">'.$langs->trans("DateEnd").'</td>';
 print '<td align="right">'.$langs->trans("PlannedWorkload").'</td>';
-print '<td align="right">'.$langs->trans("Progress").'</td>';
+print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>';
 print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
-print '<td colspan="2">'.$langs->trans("AddDuration").'</td>';
+print '<td colspan="2" align="right">'.$langs->trans("NewTimeSpent").'</td>';
 print "</tr>\n";
 
 // By default, we can edit only tasks we are assigned to
-$restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS)?1:0);	 
+$restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS)?1:0);
 
 if (count($tasksarray) > 0)
 {
diff --git a/htdocs/projet/admin/index.html b/htdocs/projet/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index c564a23a480..915d4ef69ef 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2010 		Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2011 		Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2011-2012 	Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2011-2013  Philippe Grand	    <philippe.grand@atoo-net.com>
- * Copyright (C) 2013	    Florian Henry        <florian.henry@open-concept.pro>
+/* Copyright (C) 2010-2014	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2011		Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2012	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2011-2013	Philippe Grand		<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  *
  * 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
@@ -60,11 +60,11 @@ if ($action == 'updateMask')
 
 	if (! $error)
 	{
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -79,11 +79,11 @@ if ($action == 'updateMaskTask')
 
 	if (! $error)
 	{
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -99,7 +99,7 @@ else if ($action == 'specimen')
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
-		$file=dol_buildpath($reldir."core/modules/project/pdf/pdf_".$modele.".modules.php",0);
+		$file=dol_buildpath($reldir."core/modules/project/doc/pdf_".$modele.".modules.php",0);
 		if (file_exists($file))
 		{
 			$filefound=1;
@@ -121,13 +121,13 @@ else if ($action == 'specimen')
 		}
 		else
 		{
-			$mesg='<div class="error">'.$obj->error.'</div>';
+			setEventMessage($obj->error, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorModuleNotFound").'</div>';
+		setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }
@@ -144,7 +144,7 @@ else if ($action == 'specimentask')
 	$dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
-		$file=dol_buildpath($reldir."core/modules/project/task/pdf/pdf_".$modele.".modules.php",0);
+		$file=dol_buildpath($reldir."core/modules/project/task/doc/pdf_".$modele.".modules.php",0);
 		if (file_exists($file))
 		{
 			$filefound=1;
@@ -166,17 +166,46 @@ else if ($action == 'specimentask')
 		}
 		else
 		{
-			$mesg='<div class="error">'.$obj->error.'</div>';
+			setEventMessage($obj->error, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
 	}
 	else
 	{
-		$mesg='<div class="error">'.$langs->trans("ErrorModuleNotFound").'</div>';
+		setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
 }
 
+// Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
+if ($action == 'setModuleOptions')
+{
+	$post_size=count($_POST);
+
+	$db->begin();
+
+	for($i=0;$i < $post_size;$i++)
+	{
+		if (array_key_exists('param'.$i,$_POST))
+		{
+			$param=GETPOST("param".$i,'alpha');
+			$value=GETPOST("value".$i,'alpha');
+			if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
+	}
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		$db->rollback();
+        setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 // Activate a model
 else if ($action == 'set')
 {
@@ -256,26 +285,10 @@ else if ($action == 'setmodtask')
 	dolibarr_set_const($db, "PROJECT_TASK_ADDON",$value,'chaine',0,'',$conf->entity);
 }
 
-else if ($action=='setModuleOptions') {
-	if (dolibarr_set_const($db, "PROJECT_ADDON_PDF_ODT_PATH",GETPOST('value1'),'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->PROJECT_ADDON_PDF_ODT_PATH = GETPOST('value1');
-	}
-}
 
-else if ($action=='setModuleOptionsTask') {
-	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF_ODT_PATH",GETPOST('value1'),'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->PROJECT_TASK_ADDON_PDF_ODT_PATH = GETPOST('value1');
-	}
-}
 /*
  * View
-*/
+ */
 
 $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
 
@@ -336,7 +349,7 @@ foreach ($dirmodels as $reldir)
 					if ($module->isEnabled())
 					{
 						$var=!$var;
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -437,7 +450,7 @@ foreach ($dirmodels as $reldir)
 					if ($module->isEnabled())
 					{
 						$var=!$var;
-						print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+						print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
 						print $module->info();
 						print '</td>';
 
@@ -542,99 +555,108 @@ clearstatcache();
 $var=true;
 foreach ($dirmodels as $reldir)
 {
-	$dir = dol_buildpath($reldir."core/modules/project/pdf/");
-
-	if (is_dir($dir))
+	foreach (array('','/doc') as $valdir)
 	{
-		$handle=opendir($dir);
-		if (is_resource($handle))
+		$dir = dol_buildpath($reldir."core/modules/project/".$valdir);
+
+		if (is_dir($dir))
 		{
-			while (($file = readdir($handle))!==false)
+			$handle=opendir($dir);
+			if (is_resource($handle))
 			{
-				if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+				while (($file = readdir($handle))!==false)
 				{
-					if (file_exists($dir.'/'.$file))
+					$filelist[]=$file;
+				}
+				closedir($handle);
+				arsort($filelist);
+
+				foreach($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
 					{
-						$name = substr($file, 4, dol_strlen($file) -16);
-						$classname = substr($file, 0, dol_strlen($file) -12);
-
-						require_once $dir.'/'.$file;
-						$module = new $classname($db);
-
-						$modulequalified=1;
-						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-
-						if ($modulequalified)
+						if (file_exists($dir.'/'.$file))
 						{
-							$var=!$var;
-							print '<tr '.$bc[$var].'><td width="100">';
-							print (empty($module->name)?$name:$module->name);
-							print "</td><td>\n";
-							if (method_exists($module,'info')) print $module->info($langs);
-							else print $module->description;
-							print "</td>\n";
+							$name = substr($file, 4, dol_strlen($file) -16);
+							$classname = substr($file, 0, dol_strlen($file) -12);
 
-							// Active
-							if (in_array($name, $def))
-							{
-								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-								print img_picto($langs->trans("Enabled"),'switch_on');
-								print '</a>';
-								print "</td>";
-							}
-							else
-							{
-								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-								print "</td>";
-							}
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-							// Default
-							print "<td align=\"center\">";
-							if ($conf->global->PROJECT_ADDON_PDF == "$name")
-							{
-								print img_picto($langs->trans("Default"),'on');
-							}
-							else
-							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-							}
-							print '</td>';
+							$modulequalified=1;
+							if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
 
-							// Info
-							$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-							$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-							if ($module->type == 'pdf')
+							if ($modulequalified)
 							{
-								$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-							}
-							$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-							$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-							
-							print '<td align="center">';
-							print $form->textwithpicto('',$htmltooltip,1,0);
-							print '</td>';
+								$var=!$var;
+								print '<tr '.$bc[$var].'><td width="100">';
+								print (empty($module->name)?$name:$module->name);
+								print "</td><td>\n";
+								if (method_exists($module,'info')) print $module->info($langs);
+								else print $module->description;
+								print "</td>\n";
 
-							// Preview
-							print '<td align="center">';
-							if ($module->type == 'pdf')
-							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
-							}
-							else
-							{
-								print img_object($langs->trans("PreviewNotAvailable"),'generic');
-							}
-							print '</td>';
+								// Active
+								if (in_array($name, $def))
+								{
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+									print img_picto($langs->trans("Enabled"),'switch_on');
+									print '</a>';
+									print "</td>";
+								}
+								else
+								{
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+									print "</td>";
+								}
 
-							print "</tr>\n";
-                        }
+								// Default
+								print "<td align=\"center\">";
+								if ($conf->global->PROJECT_ADDON_PDF == "$name")
+								{
+									print img_picto($langs->trans("Default"),'on');
+								}
+								else
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+								}
+								print '</td>';
+
+								// Info
+								$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+
+								print '<td align="center">';
+								print $form->textwithpicto('',$htmltooltip,1,0);
+								print '</td>';
+
+								// Preview
+								print '<td align="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+								}
+								else
+								{
+									print img_object($langs->trans("PreviewNotAvailable"),'generic');
+								}
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
 					}
 				}
 			}
-			closedir($handle);
 		}
 	}
 }
@@ -688,106 +710,113 @@ clearstatcache();
 $var=true;
 foreach ($dirmodels as $reldir)
 {
-	$dir = dol_buildpath($reldir."core/modules/project/task/pdf/");
-
-	if (is_dir($dir))
+	foreach (array('','/doc') as $valdir)
 	{
-		$handle=opendir($dir);
-		if (is_resource($handle))
+		$dir = dol_buildpath($reldir."core/modules/project/task/".$valdir);
+
+		if (is_dir($dir))
 		{
-			while (($file = readdir($handle))!==false)
+			$handle=opendir($dir);
+			if (is_resource($handle))
 			{
-				if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
+				while (($file = readdir($handle))!==false)
 				{
-					if (file_exists($dir.'/'.$file))
+					$filelist[]=$file;
+				}
+				closedir($handle);
+				arsort($filelist);
+
+				foreach($filelist as $file)
+				{
+					if (preg_match('/\.modules\.php$/i',$file) && preg_match('/^(pdf_|doc_)/',$file))
 					{
-						$name = substr($file, 4, dol_strlen($file) -16);
-						$classname = substr($file, 0, dol_strlen($file) -12);
-
-						require_once $dir.'/'.$file;
-						$module = new $classname($db);
-
-						$modulequalified=1;
-						if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
-
-						if ($modulequalified)
+						if (file_exists($dir.'/'.$file))
 						{
-							$var = !$var;
-							print '<tr '.$bc[$var].'><td width="100">';
-							print (empty($module->name)?$name:$module->name);
-							print "</td><td>\n";
-							if (method_exists($module,'info')) print $module->info($langs);
-							else print $module->description;
-							print "</td>\n";
+							$name = substr($file, 4, dol_strlen($file) -16);
+							$classname = substr($file, 0, dol_strlen($file) -12);
 
-							// Active
-							if (in_array($name, $def))
-							{
-								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
-								print img_picto($langs->trans("Enabled"),'switch_on');
-								print '</a>';
-								print "</td>";
-							}
-							else
-							{
-								print "<td align=\"center\">\n";
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-								print "</td>";
-							}
+							require_once $dir.'/'.$file;
+							$module = new $classname($db);
 
-							// Defaut
-							print "<td align=\"center\">";
-							if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
-							{
-								print img_picto($langs->trans("Default"),'on');
-							}
-							else
-							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-							}
-							print '</td>';
+							$modulequalified=1;
+							if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
 
-							// Info
-							$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
-							$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
-							if ($module->type == 'pdf')
+							if ($modulequalified)
 							{
-								$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
-							}
-							$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-							$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
-							
-							print '<td align="center">';
-							print $form->textwithpicto('',$htmltooltip,1,0);
-							print '</td>';
+								$var = !$var;
+								print '<tr '.$bc[$var].'><td width="100">';
+								print (empty($module->name)?$name:$module->name);
+								print "</td><td>\n";
+								if (method_exists($module,'info')) print $module->info($langs);
+								else print $module->description;
+								print "</td>\n";
 
-							// Preview
-							print '<td align="center">';
-							if ($module->type == 'pdf')
-							{
-								print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+								// Active
+								if (in_array($name, $def))
+								{
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=deltask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+									print img_picto($langs->trans("Enabled"),'switch_on');
+									print '</a>';
+									print "</td>";
+								}
+								else
+								{
+									print "<td align=\"center\">\n";
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+									print "</td>";
+								}
+
+								// Defaut
+								print "<td align=\"center\">";
+								if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
+								{
+									print img_picto($langs->trans("Default"),'on');
+								}
+								else
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+								}
+								print '</td>';
+
+								// Info
+								$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+								$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+								if ($module->type == 'pdf')
+								{
+									$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+								}
+								$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
+
+								print '<td align="center">';
+								print $form->textwithpicto('',$htmltooltip,1,0);
+								print '</td>';
+
+								// Preview
+								print '<td align="center">';
+								if ($module->type == 'pdf')
+								{
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
+								}
+								else
+								{
+									print img_object($langs->trans("PreviewNotAvailable"),'generic');
+								}
+								print '</td>';
+								print "</tr>\n";
 							}
-							else
-							{
-								print img_object($langs->trans("PreviewNotAvailable"),'generic');
-							}
-							print '</td>';
-							print "</tr>\n";
 						}
 					}
 				}
 			}
-			closedir($handle);
 		}
 	}
 }
 
 print '</table><br/>';
 
-dol_htmloutput_mesg($mesg);
-
 $db->close();
 
 llxFooter();
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index 5707c6be640..f4dde012d96 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -36,7 +36,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index 9b9da25e24f..902b86df3b7 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -36,7 +36,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
new file mode 100644
index 00000000000..b376133699b
--- /dev/null
+++ b/htdocs/projet/card.php
@@ -0,0 +1,809 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/projet/card.php
+ *	\ingroup    projet
+ *	\brief      Project card
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("projects");
+$langs->load('companies');
+
+$id=GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+$backtopage=GETPOST('backtopage','alpha');
+
+if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $action != "update" && ! $_POST["cancel"])) accessforbidden();
+
+$mine = GETPOST('mode')=='mine' ? 1 : 0;
+//if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('projectcard','globalcard'));
+
+$object = new Project($db);
+$extrafields = new ExtraFields($db);
+if ($id > 0 || ! empty($ref))
+{
+	$object->fetch($id,$ref);
+	$object->fetch_thirdparty();
+	$id=$object->id;
+}
+
+// Security check
+$socid=GETPOST('socid');
+if ($user->societe_id > 0) $socid=$user->societe_id;
+$result = restrictedArea($user, 'projet', $object->id);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+$date_start=dol_mktime(0,0,0,GETPOST('projectstartmonth','int'),GETPOST('projectstartday','int'),GETPOST('projectstartyear','int'));
+$date_end=dol_mktime(0,0,0,GETPOST('projectendmonth','int'),GETPOST('projectendday','int'),GETPOST('projectendyear','int'));
+
+
+/*
+ * Actions
+ */
+
+$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+
+	// Cancel
+	if (GETPOST("cancel") && ! empty($backtopage))
+	{
+		if (GETPOST("comefromclone")==1)
+		{
+		    $result=$object->delete($user);
+		    if ($result > 0)
+		    {
+		        header("Location: index.php");
+		        exit;
+		    }
+		    else
+		    {
+		        dol_syslog($object->error,LOG_DEBUG);
+			    setEventMessage($langs->trans("CantRemoveProject"), 'errors');
+		    }
+		}
+	    header("Location: ".$backtopage);
+	    exit;
+	}
+
+	//if cancel and come from clone then delete the cloned project
+	if (GETPOST("cancel") && (GETPOST("comefromclone")==1))
+	{
+	    $result=$object->delete($user);
+	    if ($result > 0)
+	    {
+	        header("Location: index.php");
+	        exit;
+	    }
+	    else
+	    {
+	        dol_syslog($object->error,LOG_DEBUG);
+		    setEventMessage($langs->trans("CantRemoveProject"), 'errors');
+	    }
+	}
+
+	if ($action == 'add' && $user->rights->projet->creer)
+	{
+	    $error=0;
+	    if (empty($_POST["ref"]))
+	    {
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")), 'errors');
+	        $error++;
+	    }
+	    if (empty($_POST["title"]))
+	    {
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
+	        $error++;
+	    }
+
+	    if (! $error)
+	    {
+	        $error=0;
+
+	        $db->begin();
+
+	        $object->ref             = GETPOST('ref','alpha');
+	        $object->title           = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
+	        $object->socid           = GETPOST('socid','int');
+	        $object->description     = GETPOST('description'); // Do not use 'alpha' here, we want field as it is
+	        $object->public          = GETPOST('public','alpha');
+	        $object->datec=dol_now();
+	        $object->date_start=$date_start;
+	        $object->date_end=$date_end;
+
+	        // Fill array 'array_options' with data from add form
+	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+	        $result = $object->create($user);
+	        if ($result > 0)
+	        {
+	            // Add myself as project leader
+	            $result = $object->add_contact($user->id, 'PROJECTLEADER', 'internal');
+	            if ($result < 0)
+	            {
+	                $langs->load("errors");
+		            setEventMessage($langs->trans($object->error), 'errors');
+	                $error++;
+	            }
+	        }
+	        else
+	        {
+	            $langs->load("errors");
+		        setEventMessage($langs->trans($object->error), 'errors');
+	            $error++;
+	        }
+
+	        if (! $error)
+	        {
+	            $db->commit();
+
+	            header("Location:card.php?id=".$object->id);
+	            exit;
+	        }
+	        else
+	        {
+	            $db->rollback();
+
+	            $action = 'create';
+	        }
+	    }
+	    else
+	    {
+	        $action = 'create';
+	    }
+	}
+
+	if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
+	{
+	    $error=0;
+
+	    if (empty($ref))
+	    {
+	        $error++;
+	        //$_GET["id"]=$_POST["id"]; // On retourne sur la fiche projet
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")), 'errors');
+	    }
+	    if (empty($_POST["title"]))
+	    {
+	        $error++;
+	        //$_GET["id"]=$_POST["id"]; // On retourne sur la fiche projet
+		    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
+	    }
+
+	    $db->begin();
+
+	    if (! $error)
+	    {
+	        $object->oldcopy = dol_clone($object);
+
+			$old_start_date = $object->date_start;
+
+	        $object->ref          = GETPOST('ref','alpha');
+	        $object->title        = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
+	        $object->socid        = GETPOST('socid','int');
+	        $object->description  = GETPOST('description');	// Do not use 'alpha' here, we want field as it is
+	        $object->public       = GETPOST('public','alpha');
+	        $object->date_start   = empty($_POST["projectstart"])?'':$date_start;
+	        $object->date_end     = empty($_POST["projectend"])?'':$date_end;
+
+	        // Fill array 'array_options' with data from add form
+	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+			if ($ret < 0)
+			{
+				$error++;
+			}
+	    }
+
+	    if (! $error)
+	    {
+	    	$result=$object->update($user);
+	    	if ($result < 0)
+	    	{
+	    		$error++;
+	    		setEventMessage($object->errors,'errors');
+	    	}
+	    }
+
+	    if (! $error)
+	    {
+	    	if (GETPOST("reportdate") && ($object->date_start!=$old_start_date))
+	    	{
+	    		$result=$object->shiftTaskDate($old_start_date);
+	    		if ($result < 0)
+	    		{
+	    			$error++;
+				    setEventMessage($langs->trans("ErrorShiftTaskDate").':'.$object->error, 'errors');
+	    		}
+	    	}
+	    }
+
+	    if ($error)
+	    {
+			$db->rollback();
+	    	$action='edit';
+	    }
+	    else
+		{
+	    	$db->commit();
+
+			if (GETPOST('socid','int') > 0) $object->fetch_thirdparty(GETPOST('socid','int'));
+			else unset($object->thirdparty);
+	    }
+	}
+
+	// Build doc
+	if ($action == 'builddoc' && $user->rights->projet->creer)
+	{
+		// Save last template used to generate document
+		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+	    $outputlangs = $langs;
+	    if (GETPOST('lang_id'))
+	    {
+	        $outputlangs = new Translate("",$conf);
+	        $outputlangs->setDefaultLang(GETPOST('lang_id'));
+	    }
+	    $result= $object->generateDocument($object->modelpdf, $outputlangs);
+	    if ($result <= 0)
+	    {
+	        dol_print_error($db,$result);
+	        exit;
+	    }
+	}
+
+	// Delete file in doc form
+	if ($action == 'remove_file' && $user->rights->projet->creer)
+	{
+	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	    if ($object->id > 0)
+	    {
+	        $langs->load("other");
+	        $upload_dir =	$conf->projet->dir_output . "/";
+	        $file =	$upload_dir	. '/' .	GETPOST('file');
+	        $ret=dol_delete_file($file);
+	        if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+	        else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+	    }
+	}
+
+
+	if ($action == 'confirm_validate' && GETPOST('confirm') == 'yes')
+	{
+	    $result = $object->setValid($user);
+	    if ($result <= 0)
+	    {
+		    setEventMessage($object->error, 'errors');
+	    }
+	}
+
+	if ($action == 'confirm_close' && GETPOST('confirm') == 'yes')
+	{
+	    $result = $object->setClose($user);
+	    if ($result <= 0)
+	    {
+		    setEventMessage($object->error, 'errors');
+	    }
+	}
+
+	if ($action == 'confirm_reopen' && GETPOST('confirm') == 'yes')
+	{
+	    $result = $object->setValid($user);
+	    if ($result <= 0)
+	    {
+		    setEventMessage($object->error, 'errors');
+	    }
+	}
+
+	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->projet->supprimer)
+	{
+	    $object->fetch($id);
+	    $result=$object->delete($user);
+	    if ($result > 0)
+	    {
+	        header("Location: index.php");
+	        exit;
+	    }
+	    else
+	    {
+	        dol_syslog($object->error,LOG_DEBUG);
+	        setEventMessage($object->error,'errors');
+	        setEventMessage($object->errors,'errors');
+	    }
+	}
+
+	if ($action == 'confirm_clone' && $user->rights->projet->creer && GETPOST('confirm') == 'yes')
+	{
+	    $clone_contacts=GETPOST('clone_contacts')?1:0;
+	    $clone_tasks=GETPOST('clone_tasks')?1:0;
+		$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
+		$clone_task_files = GETPOST('clone_task_files') ? 1 : 0;
+	    $clone_notes=GETPOST('clone_notes')?1:0;
+	    $result=$object->createFromClone($object->id,$clone_contacts,$clone_tasks,$clone_project_files,$clone_task_files,$clone_notes);
+	    if ($result <= 0)
+	    {
+		    setEventMessage($object->error, 'errors');
+	    }
+	    else
+	    {
+	    	$object->fetch($result);	// Load new object
+	    	$action='edit';
+	    	$comefromclone=true;
+	    }
+	}
+}
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$userstatic = new User($db);
+
+
+$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+llxHeader("",$langs->trans("Projects"),$help_url);
+
+
+if ($action == 'create' && $user->rights->projet->creer)
+{
+    /*
+     * Create
+     */
+
+	$thirdparty=new Societe($db);
+	if ($socid > 0) $thirdparty->fetch($socid);
+
+    print_fiche_titre($langs->trans("NewProject"));
+
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+    print '<table class="border" width="100%">';
+
+    $defaultref='';
+    $modele = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON;
+
+    // Search template files
+    $file=''; $classname=''; $filefound=0;
+    $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
+    foreach($dirmodels as $reldir)
+    {
+    	$file=dol_buildpath($reldir."core/modules/project/".$modele.'.php',0);
+    	if (file_exists($file))
+    	{
+    		$filefound=1;
+    		$classname = $modele;
+    		break;
+    	}
+    }
+
+    if ($filefound)
+    {
+	    $result=dol_include_once($reldir."core/modules/project/".$modele.'.php');
+	    $modProject = new $classname;
+
+	    $defaultref = $modProject->getNextValue($thirdparty,$object);
+    }
+
+    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+
+    // Ref
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$defaultref).'"></td></tr>';
+
+    // Label
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="30" type="text" name="title" value="'.$_POST["title"].'"></td></tr>';
+
+    // Customer
+    print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+   	$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 '</td></tr>';
+
+    // Public
+    print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+    $array=array(0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
+    print $form->selectarray('public',$array,$object->public);
+    print '</td></tr>';
+
+    // Date start
+    print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+    print $form->select_date(($date_start?$date_start:''),'projectstart');
+    print '</td></tr>';
+
+    // Date end
+    print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+    print $form->select_date(($date_end?$date_end:-1),'projectend');
+    print '</td></tr>';
+
+    // Description
+    print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
+    print '<td>';
+    print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$_POST["description"].'</textarea>';
+    print '</td></tr>';
+
+    // Other options
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    {
+    	print $object->showOptionals($extrafields,'edit');
+    }
+
+    print '</table>';
+
+    print '<br><center>';
+    print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
+    if (! empty($backtopage))
+    {
+        print ' &nbsp; &nbsp; ';
+	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+    }
+    print '</center>';
+
+    print '</form>';
+
+}
+else
+{
+    /*
+     * Show or edit
+     */
+
+    $res=$object->fetch_optionals($object->id,$extralabels);
+
+    // To verify role of users
+    $userAccess = $object->restrictedProjectArea($user,'read');
+    $userWrite  = $object->restrictedProjectArea($user,'write');
+    $userDelete = $object->restrictedProjectArea($user,'delete');
+    //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
+
+
+    $head=project_prepare_head($object);
+    dol_fiche_head($head, 'project', $langs->trans("Project"),0,($object->public?'projectpub':'project'));
+
+    // Confirmation validation
+    if ($action == 'validate')
+    {
+        print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProject'), $langs->trans('ConfirmValidateProject'), 'confirm_validate','',0,1);
+    }
+    // Confirmation close
+    if ($action == 'close')
+    {
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("CloseAProject"),$langs->trans("ConfirmCloseAProject"),"confirm_close",'','',1);
+    }
+    // Confirmation reopen
+    if ($action == 'reopen')
+    {
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ReOpenAProject"),$langs->trans("ConfirmReOpenAProject"),"confirm_reopen",'','',1);
+    }
+    // Confirmation delete
+    if ($action == 'delete')
+    {
+        $text=$langs->trans("ConfirmDeleteAProject");
+        $task=new Task($db);
+        $taskarray=$task->getTasksArray(0,0,$object->id,0,0);
+        $nboftask=count($taskarray);
+        if ($nboftask) $text.='<br>'.img_warning().' '.$langs->trans("ThisWillAlsoRemoveTasks",$nboftask);
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("DeleteAProject"),$text,"confirm_delete",'','',1);
+    }
+
+    // Clone confirmation
+    if ($action == 'clone')
+    {
+        $formquestion=array(
+    		'text' => $langs->trans("ConfirmClone"),
+            array('type' => 'checkbox', 'name' => 'clone_contacts',		'label' => $langs->trans("CloneContacts"), 			'value' => true),
+            array('type' => 'checkbox', 'name' => 'clone_tasks',   		'label' => $langs->trans("CloneTasks"), 			'value' => true),
+            array('type' => 'checkbox', 'name' => 'clone_notes',   		'label' => $langs->trans("CloneNotes"), 			'value' => true),
+        	array('type' => 'checkbox', 'name' => 'clone_project_files','label' => $langs->trans("CloneProjectFiles"),	    'value' => false),
+        	array('type' => 'checkbox', 'name' => 'clone_task_files',	'label' => $langs->trans("CloneTaskFiles"),         'value' => false)
+        );
+
+        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CloneProject"), $langs->trans("ConfirmCloneProject"), "confirm_clone", $formquestion, '', 1, 240);
+    }
+
+    if ($action == 'edit' && $userWrite > 0)
+    {
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="update">';
+        print '<input type="hidden" name="id" value="'.$object->id.'">';
+        print '<input type="hidden" name="comefromclone" value="'.$comefromclone.'">';
+
+        print '<table class="border" width="100%">';
+
+        // Ref
+        print '<tr><td width="30%">'.$langs->trans("Ref").'</td>';
+        print '<td><input size="12" name="ref" value="'.$object->ref.'"></td></tr>';
+
+        // Label
+        print '<tr><td>'.$langs->trans("Label").'</td>';
+        print '<td><input size="30" name="title" value="'.$object->title.'"></td></tr>';
+
+        // Customer
+        print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+        $text=$form->select_company($object->thirdparty->id,'socid','',1,1);
+        $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty");
+        print $form->textwithtooltip($text.' '.img_help(),$texthelp,1);
+        print '</td></tr>';
+
+        // Visibility
+        print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+        $array=array(0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
+        print $form->selectarray('public',$array,$object->public);
+        print '</td></tr>';
+
+        // Statut
+        print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+
+        // Date start
+        print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+        print $form->select_date($object->date_start?$object->date_start:-1,'projectstart');
+        print ' &nbsp; &nbsp; <input type="checkbox" name="reportdate" value="yes" ';
+        if ($comefromclone){print ' checked="checked" ';}
+		print '/> '. $langs->trans("ProjectReportDate");
+        print '</td></tr>';
+
+        // Date end
+        print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+        print $form->select_date($object->date_end?$object->date_end:-1,'projectend');
+        print '</td></tr>';
+
+        // Description
+        print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
+        print '<td>';
+        print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$object->description.'</textarea>';
+        print '</td></tr>';
+
+        // Other options
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        {
+        	print $object->showOptionals($extrafields,'edit');
+        }
+
+        print '</table>';
+
+        print '<div align="center"><br>';
+        print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'"> &nbsp; ';
+        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+
+        print '</form>';
+    }
+    else
+    {
+        print '<table class="border" width="100%">';
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+
+        // Ref
+        print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
+        // Define a complementary filter for search of next/prev ref.
+        if (! $user->rights->projet->all->lire)
+        {
+            $objectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0);
+            $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
+        }
+        print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+        print '</td></tr>';
+
+        // Label
+        print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
+
+        // Third party
+        print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+        if ($object->thirdparty->id > 0) print $object->thirdparty->getNomUrl(1);
+        else print'&nbsp;';
+        print '</td></tr>';
+
+        // Visibility
+        print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+        if ($object->public) print $langs->trans('SharedProject');
+        else print $langs->trans('PrivateProject');
+        print '</td></tr>';
+
+        // Statut
+        print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+
+        // Date start
+        print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+        print dol_print_date($object->date_start,'day');
+        print '</td></tr>';
+
+        // Date end
+        print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+        print dol_print_date($object->date_end,'day');
+        print '</td></tr>';
+
+        // Description
+        print '<td valign="top">'.$langs->trans("Description").'</td><td>';
+        print nl2br($object->description);
+        print '</td></tr>';
+
+        // Other options
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+        if (empty($reshook) && ! empty($extrafields->attribute_label))
+        {
+        	print $object->showOptionals($extrafields);
+        }
+        print '</table>';
+    }
+
+    dol_fiche_end();
+
+    /*
+     * Boutons actions
+     */
+    print '<div class="tabsAction">';
+
+    if ($action != "edit" )
+    {
+    	// Validate
+        if ($object->statut == 0 && $user->rights->projet->creer)
+        {
+            if ($userWrite > 0)
+            {
+                print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Valid").'</a>';
+            }
+            else
+            {
+                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Valid').'</a>';
+            }
+        }
+
+        // Modify
+        if ($object->statut != 2 && $user->rights->projet->creer)
+        {
+            if ($userWrite > 0)
+            {
+                print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+            }
+            else
+            {
+                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
+            }
+        }
+
+        // Close
+        if ($object->statut == 1 && $user->rights->projet->creer)
+        {
+            if ($userWrite > 0)
+            {
+                print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
+            }
+            else
+            {
+                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
+            }
+        }
+
+        // Reopen
+        if ($object->statut == 2 && $user->rights->projet->creer)
+        {
+            if ($userWrite > 0)
+            {
+                print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+            }
+            else
+            {
+                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
+            }
+        }
+
+        // Clone
+        if ($user->rights->projet->creer)
+        {
+            if ($userWrite > 0)
+            {
+                print '<a class="butAction" href="card.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
+            }
+            else
+            {
+                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
+            }
+        }
+
+        // Delete
+        if ($user->rights->projet->supprimer)
+        {
+            if ($userDelete > 0)
+            {
+                print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+            }
+            else
+            {
+                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
+            }
+        }
+    }
+
+    print "</div>";
+    print "<br>\n";
+
+    if ($action != 'presend')
+    {
+        print '<table width="100%"><tr><td width="50%" valign="top">';
+        print '<a name="builddoc"></a>'; // ancre
+
+
+        /*
+         * Documents generes
+         */
+        $filename=dol_sanitizeFileName($object->ref);
+        $filedir=$conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
+        $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+        $genallowed=($user->rights->projet->lire && $userAccess > 0);
+        $delallowed=($user->rights->projet->creer && $userWrite > 0);
+
+        $var=true;
+
+        $somethingshown=$formfile->show_documents('project',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
+
+        print '</td><td valign="top" width="50%">';
+
+        if (!empty($object->id))
+        {
+	        // List of actions on element
+	        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	        $formactions=new FormActions($db);
+	        $somethingshown=$formactions->showactions($object,'project',$socid);
+        }
+
+        print '</td></tr></table>';
+    }
+
+    // Hook to add more things on page
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('mainCardTabAddMore',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/projet/class/index.html b/htdocs/projet/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 26b73062370..c9d4ed9f546 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1,9 +1,9 @@
 <?php
-
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * 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
@@ -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;
@@ -63,7 +68,6 @@ class Project extends CommonObject
     function __construct($db)
     {
         $this->db = $db;
-        $this->societe = new Societe($db);
 
         $this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
         $this->statuts = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
@@ -121,7 +125,7 @@ class Project extends CommonObject
         $sql.= ", ".$conf->entity;
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::create sql=" . $sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -130,15 +134,9 @@ class Project extends CommonObject
 
             if (!$notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface = new Interfaces($this->db);
-                $result = $interface->run_triggers('PROJECT_CREATE', $this, $user, $langs, $conf);
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->errors = $interface->errors;
-                }
+                // Call trigger
+                $result=$this->call_trigger('PROJECT_CREATE',$user);
+                if ($result < 0) { $error++; }
                 // End call triggers
             }
         }
@@ -146,7 +144,6 @@ class Project extends CommonObject
         {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
-            dol_syslog(get_class($this)."::create error -2 " . $this->error, LOG_ERR);
             $error++;
         }
 
@@ -199,6 +196,8 @@ class Project extends CommonObject
 
         if (dol_strlen(trim($this->ref)) > 0)
         {
+            $this->db->begin();
+
             $sql = "UPDATE " . MAIN_DB_PREFIX . "projet SET";
             $sql.= " ref='" . $this->db->escape($this->ref) . "'";
             $sql.= ", title = '" . $this->db->escape($this->title) . "'";
@@ -211,20 +210,15 @@ class Project extends CommonObject
             $sql.= ", datee=" . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
             $sql.= " WHERE rowid = " . $this->id;
 
-            dol_syslog(get_class($this)."::Update sql=" . $sql, LOG_DEBUG);
-            if ($this->db->query($sql))
+            dol_syslog(get_class($this)."::Update", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
             {
                 if (!$notrigger)
                 {
-                    // Call triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface = new Interfaces($this->db);
-                    $result = $interface->run_triggers('PROJECT_MODIFY', $this, $user, $langs, $conf);
-                    if ($result < 0)
-                    {
-                        $error++;
-                        $this->errors = $interface->errors;
-                    }
+                    // Call trigger
+                    $result=$this->call_trigger('PROJECT_MODIFY',$user);
+                    if ($result < 0) { $error++; }
                     // End call triggers
                 }
 
@@ -259,13 +253,22 @@ class Project extends CommonObject
                 		}
                 	}
                 }
-
-                $result = 1;
+                if (! $error )
+                {
+                    $this->db->commit();
+                    $result = 1;
+                }
+                else
+              {
+                    $this->db->rollback();
+                    $result = -1;
+                }
             }
             else
-            {
+			{
                 $this->error = $this->db->lasterror();
                 $this->errors[] = $this->error;
+                $this->db->rollback();
                 dol_syslog(get_class($this)."::Update error -2 " . $this->error, LOG_ERR);
                 $result = -2;
             }
@@ -300,10 +303,10 @@ 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 sql=" . $sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -325,7 +328,6 @@ class Project extends CommonObject
                 $this->note_private = $obj->note_private;
                 $this->note_public = $obj->note_public;
                 $this->socid = $obj->fk_soc;
-                $this->societe->id = $obj->fk_soc; // TODO For backward compatibility
                 $this->user_author_id = $obj->fk_user_creat;
                 $this->public = $obj->public;
                 $this->statut = $obj->fk_statut;
@@ -343,7 +345,6 @@ class Project extends CommonObject
         else
         {
             $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch " . $this->error, LOG_ERR);
             return -1;
         }
     }
@@ -392,22 +393,41 @@ class Project extends CommonObject
     /**
      * 	Return list of elements for type linked to project
      *
-     * 	@param		string		$type		'propal','order','invoice','order_supplier','invoice_supplier'
-     * 	@param		string		$tablename	name of table associated of the type
-     * 	@return		array					List of orders linked to project, <0 if error
+     * 	@param		string		$type			'propal','order','invoice','order_supplier','invoice_supplier'
+     * 	@param		string		$tablename		name of table associated of the type
+     * 	@param		string		$datefieldname	name of table associated of the type
+     *  @param		string		$dates			Start date (at 00:00:00)
+     *  @param		string		$datee			End date (at 23:00:00)
+     * 	@return		mixed						List of orders linked to project, < 0 or string if error
      */
-    function get_element_list($type, $tablename)
+    function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='')
     {
         $elements = array();
 
         if ($type == 'agenda')
+        {
             $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id;
+        }
         else
+		{
             $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id;
-        if (! $sql) return -1;
+		}
+		if ($dates > 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->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->idate($datee)."'";
+		}
+		if (! $sql) return -1;
 
         //print $sql;
-        dol_syslog(get_class($this)."::get_element_list sql=" . $sql);
+        dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result)
         {
@@ -464,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 sql=" . $sql, 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 sql=" . $sql, 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 sql=" . $sql, 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 sql=" . $sql, 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))
@@ -528,17 +571,11 @@ class Project extends CommonObject
 
             if (!$notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface = new Interfaces($this->db);
-                $result = $interface->run_triggers('PROJECT_DELETE', $this, $user, $langs, $conf);
-                if ($result < 0)
-                {
+                // Call trigger
+                $result=$this->call_trigger('PROJECT_DELETE',$user);
+
+                if ($result < 0) {
                     $error++;
-            		foreach ($interface->errors as $errmsg ) {
-            			dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
-            			$this->errors[] =$errmsg;
-            		}
                 }
                 // End call triggers
             }
@@ -583,20 +620,14 @@ class Project extends CommonObject
             $sql.= " WHERE rowid = " . $this->id;
             $sql.= " AND entity = " . $conf->entity;
 
-            dol_syslog(get_class($this)."::setValid sql=" . $sql);
+            dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface = new Interfaces($this->db);
-                $result = $interface->run_triggers('PROJECT_VALIDATE', $this, $user, $langs, $conf);
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->errors = $interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PROJECT_VALIDATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 
                 if (!$error)
                 {
@@ -616,7 +647,6 @@ class Project extends CommonObject
             {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
-                dol_syslog(get_class($this)."::setValid " . $this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -644,20 +674,14 @@ class Project extends CommonObject
             $sql.= " AND entity = " . $conf->entity;
             $sql.= " AND fk_statut = 1";
 
-            dol_syslog(get_class($this)."::setClose sql=" . $sql);
+            dol_syslog(get_class($this)."::setClose", LOG_DEBUG);
             $resql = $this->db->query($sql);
             if ($resql)
             {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface = new Interfaces($this->db);
-                $result = $interface->run_triggers('PROJECT_CLOSE', $this, $user, $langs, $conf);
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->errors = $interface->errors;
-                }
-                // Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('PROJECT_CLOSE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 
                 if (!$error)
                 {
@@ -677,7 +701,6 @@ class Project extends CommonObject
             {
                 $this->db->rollback();
                 $this->error = $this->db->lasterror();
-                dol_syslog(get_class($this)."::setClose " . $this->error, LOG_ERR);
                 return -1;
             }
         }
@@ -756,7 +779,7 @@ class Project extends CommonObject
      *
      * 	@param	int		$withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
      * 	@param	string	$option			Variant ('', 'nolink')
-     * 	@param	int		$addlabel		0=Default, 1=Add label into string
+     * 	@param	int		$addlabel		0=Default, 1=Add label into string, >1=Add first chars into string
      * 	@return	string					Chaine avec URL
      */
     function getNomUrl($withpicto=0, $option='', $addlabel=0)
@@ -776,7 +799,7 @@ class Project extends CommonObject
         	}
         	else
         	{
-            	$lien = '<a href="' . DOL_URL_ROOT . '/projet/fiche.php?id=' . $this->id . '">';
+            	$lien = '<a href="' . DOL_URL_ROOT . '/projet/card.php?id=' . $this->id . '">';
             	$lienfin = '</a>';
         	}
         }
@@ -788,7 +811,7 @@ class Project extends CommonObject
 
         if ($withpicto) $result.=($lien . img_object($label, $picto) . $lienfin);
         if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . $this->title : '');
+        if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
         return $result;
     }
 
@@ -901,14 +924,14 @@ class Project extends CommonObject
         $projects = array();
         $temp = array();
 
-        $sql = "SELECT DISTINCT p.rowid, p.ref";
+        $sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
         $sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
         if ($mode == 0 || $mode == 1)
         {
             $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 . ")";
@@ -998,6 +1021,7 @@ class Project extends CommonObject
 
 		// Load source object
 		$clone_project->fetch($fromid);
+		$clone_project->fetch_thirdparty();
 
 		$orign_dt_start=$clone_project->date_start;
 		$orign_project_ref=$clone_project->ref;
@@ -1025,7 +1049,7 @@ class Project extends CommonObject
 
         	require_once DOL_DOCUMENT_ROOT ."/core/modules/project/".$conf->global->PROJECT_ADDON.'.php';
         	$modProject = new $obj;
-        	$defaultref = $modProject->getNextValue($clone_project->societe->id,$clone_project);
+        	$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty)?$clone_project->thirdparty->id:0,$clone_project);
     	}
 
     	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
@@ -1292,35 +1316,102 @@ class Project extends CommonObject
 	 /**
 	  *    Associate element to a project
 	  *
-	  *    @param	string	$TableName			Table of the element to update
-	  *    @param	int		$ElementSelectId	Key-rowid of the line of the element to update
+	  *    @param	string	$tableName			Table of the element to update
+	  *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
 	  *    @return	int							1 if OK or < 0 if KO
 	  */
-	function update_element($TableName, $ElementSelectId)
+	function update_element($tableName, $elementSelectId)
 	{
-		$sql="UPDATE ".MAIN_DB_PREFIX.$TableName;
+		$sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
 
 		if ($TableName=="actioncomm")
 		{
 			$sql.= " SET fk_project=".$this->id;
-			$sql.= " WHERE id=".$ElementSelectId;
+			$sql.= " WHERE id=".$elementSelectId;
 		}
 		else
 		{
 			$sql.= " SET fk_projet=".$this->id;
-			$sql.= " WHERE rowid=".$ElementSelectId;
+			$sql.= " WHERE rowid=".$elementSelectId;
 		}
 
-		dol_syslog(get_class($this)."::update_element sql=" . $sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update_element", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if (!$resql) {
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::update_element error : " . $this->error, LOG_ERR);
 			return -1;
 		}else {
 			return 1;
 		}
 
 	}
+
+	/**
+	 *    Associate element to a project
+	 *
+	 *    @param	string	$tableName			Table of the element to update
+	 *    @param	int		$elementSelectId	Key-rowid of the line of the element to update
+	 *    @return	int							1 if OK or < 0 if KO
+	 */
+	function remove_element($tableName, $elementSelectId)
+	{
+		$sql="UPDATE ".MAIN_DB_PREFIX.$tableName;
+
+		if ($TableName=="actioncomm")
+		{
+			$sql.= " SET fk_project=NULL";
+			$sql.= " WHERE id=".$elementSelectId;
+		}
+		else
+		{
+			$sql.= " SET fk_projet=NULL";
+			$sql.= " WHERE rowid=".$elementSelectId;
+		}
+
+		dol_syslog(get_class($this)."::remove_element", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if (!$resql) {
+			$this->error=$this->db->lasterror();
+			return -1;
+		}else {
+			return 1;
+		}
+
+	}
+
+	/**
+	 *  Create an intervention document on disk using template defined into PROJECT_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;
+
+		$langs->load("projects");
+
+		// Positionne modele sur le nom du modele de projet a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->PROJECT_ADDON_PDF))
+			{
+				$modele = $conf->global->PROJECT_ADDON_PDF;
+			}
+			else
+			{
+				$modele='baleine';
+			}
+		}
+
+		$modelpath = "core/modules/project/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
 }
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 4f253b47f8b..0f9645fe237 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2008-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2014	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  *
  * 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
@@ -59,6 +60,7 @@ class Task extends CommonObject
     var $timespent_duration;
     var $timespent_old_duration;
     var $timespent_date;
+    var $timespent_datehour;		// More accurate start date (same than timespent_date but includes hours, minutes and seconds)
     var $timespent_fk_user;
     var $timespent_note;
 
@@ -123,7 +125,7 @@ class Task extends CommonObject
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -133,17 +135,16 @@ class Task extends CommonObject
 
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('TASK_CREATE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                // Call trigger
+                $result=$this->call_trigger('TASK_CREATE',$user);
+                if ($result < 0) { $error++; }
                 // End call triggers
             }
         }
 
-        //Update extrafield
-        if (!$error) {
+        // Update extrafield
+        if (! $error)
+        {
         	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
         	{
         		$result=$this->insertExtraFields();
@@ -212,7 +213,7 @@ class Task extends CommonObject
         	$sql.="t.rowid = ".$id;
         }
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -248,7 +249,6 @@ class Task extends CommonObject
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -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;
@@ -287,15 +287,15 @@ class Task extends CommonObject
         $sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
         $sql.= " duration_effective=".(isset($this->duration_effective)?$this->duration_effective:"null").",";
         $sql.= " planned_workload=".(isset($this->planned_workload)?$this->planned_workload:"0").",";
-        $sql.= " dateo=".($this->date_start!=''?$this->db->idate($this->date_start):'null').",";
-        $sql.= " datee=".($this->date_end!=''?$this->db->idate($this->date_end):'null').",";
+        $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').",";
+        $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').",";
         $sql.= " progress=".$this->progress.",";
         $sql.= " rang=".((!empty($this->rang))?$this->rang:"0");
         $sql.= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -303,11 +303,9 @@ class Task extends CommonObject
         {
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('TASK_MODIFY',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                // Call trigger
+                $result=$this->call_trigger('TASK_MODIFY',$user);
+                if ($result < 0) { $error++; }
                 // End call triggers
             }
         }
@@ -344,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
@@ -381,25 +379,40 @@ 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 sql=".$sql);
-        $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)
         {
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('TASK_DELETE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                // Call trigger
+                $result=$this->call_trigger('TASK_DELETE',$user);
+                if ($result < 0) { $error++; }
                 // End call triggers
             }
         }
@@ -416,7 +429,7 @@ class Task extends CommonObject
             return -1*$error;
         }
         else
-        {
+		{
 			//Delete associated link file
 	        if ($conf->projet->dir_output)
 	        {
@@ -458,7 +471,7 @@ class Task extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
         $sql.= " WHERE fk_task_parent=".$this->id;
 
-        dol_syslog(get_class($this)."::hasChildren sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
         else
@@ -484,15 +497,16 @@ class Task extends CommonObject
      *
      *	@param	int		$withpicto		0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
      *	@param	int		$option			Sur quoi pointe le lien
+     *  @param	int		$mode			Mode 'task', 'time', 'contact', 'note', document' define page to link to.
      *	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$option='')
+    function getNomUrl($withpicto=0,$option='',$mode='task')
     {
         global $langs;
 
         $result='';
 
-        $lien = '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$this->id.($option=='withproject'?'&withproject=1':'').'">';
+        $lien = '<a href="'.DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'').'">';
         $lienfin='</a>';
 
         $picto='projecttask';
@@ -573,7 +587,7 @@ class Task extends CommonObject
         $sql.= " ORDER BY p.ref, t.rang, t.dateo";
 
         //print $sql;
-        dol_syslog(get_class($this)."::getTasksArray sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::getTasksArray", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -687,7 +701,7 @@ class Task extends CommonObject
         }
         //print $sql;
 
-        dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks sql=".$sql);
+        dol_syslog(get_class($this)."::getUserRolesForProjectsOrTasks", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -745,27 +759,31 @@ class Task extends CommonObject
     {
         global $conf,$langs;
 
-		$error=0;
         $ret = 0;
 
         // Clean parameters
         if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
+		if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
+
+        $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task_time (";
         $sql.= "fk_task";
         $sql.= ", task_date";
+        $sql.= ", task_datehour";
         $sql.= ", task_duration";
         $sql.= ", fk_user";
         $sql.= ", note";
         $sql.= ") VALUES (";
         $sql.= $this->id;
         $sql.= ", '".$this->db->idate($this->timespent_date)."'";
+        $sql.= ", '".$this->db->idate($this->timespent_datehour)."'";
         $sql.= ", ".$this->timespent_duration;
         $sql.= ", ".$this->timespent_fk_user;
         $sql.= ", ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
         $sql.= ")";
 
-        dol_syslog(get_class($this)."::addTimeSpent sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
         if ($this->db->query($sql) )
         {
             $tasktime_id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_time");
@@ -773,18 +791,16 @@ class Task extends CommonObject
 
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('TASK_TIMESPENT_CREATE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                // Call trigger
+                $result=$this->call_trigger('TASK_TIMESPENT_CREATE',$user);
+                if ($result < 0) { $this->db->rollback(); $ret=-1; }
                 // End call triggers
             }
         }
         else
-        {
+		{
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::addTimeSpent error -1 ".$this->error,LOG_ERR);
+            $this->db->rollback();
             $ret = -1;
         }
 
@@ -792,32 +808,75 @@ class Task extends CommonObject
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
             $sql.= " SET duration_effective = duration_effective + '".price2num($this->timespent_duration)."'";
+			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 sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
             if (! $this->db->query($sql) )
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::addTimeSpent error -2 ".$this->error, LOG_ERR);
+                $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 sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
             if (! $this->db->query($sql) )
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::addTimeSpent error -2 ".$this->error, LOG_ERR);
+                $this->db->rollback();
                 $ret = -2;
             }
         }
 
+        if ($ret >=0) $this->db->commit();
         return $ret;
     }
 
+    /**
+     *  Calculate total of time spent for task
+     *
+     *  @param	int		$id 		Id of object (here task)
+     *  @return array		        Array of info for task array('min_date', 'max_date', 'total_duration')
+     */
+    function getSummaryOfTimeSpent($id='')
+    {
+        global $langs;
+
+        if (empty($id)) $id=$this->id;
+
+        $result=array();
+
+        $sql = "SELECT";
+        $sql.= " MIN(t.task_datehour) as min_date,";
+        $sql.= " MAX(t.task_datehour) as max_date,";
+        $sql.= " SUM(t.task_duration) as total_duration";
+        $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+        $sql.= " WHERE t.fk_task = ".$id;
+
+        dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+
+            $result['min_date'] = $obj->min_date;
+            $result['max_date'] = $obj->max_date;
+            $result['total_duration'] = $obj->total_duration;
+
+            $this->db->free($resql);
+            return $result;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return $result;
+        }
+    }
+
     /**
      *  Load object in memory from database
      *
@@ -838,7 +897,7 @@ class Task extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql.= " WHERE t.rowid = ".$id;
 
-        dol_syslog(get_class($this)."::fetchTimeSpent sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetchTimeSpent", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -861,7 +920,6 @@ class Task extends CommonObject
         else
         {
             $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetchTimeSpent ".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -877,37 +935,43 @@ class Task extends CommonObject
     {
     	global $conf,$langs;
 
-    	$error=0;
         $ret = 0;
 
         // Clean parameters
+        if (empty($this->timespent_datehour)) $this->timespent_datehour = $this->timespent_date;
         if (isset($this->timespent_note)) $this->timespent_note = trim($this->timespent_note);
 
+        $this->db->begin();
+
         $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time SET";
         $sql.= " task_date = '".$this->db->idate($this->timespent_date)."',";
+        $sql.= " task_datehour = '".$this->db->idate($this->timespent_datehour)."',";
         $sql.= " task_duration = ".$this->timespent_duration.",";
         $sql.= " fk_user = ".$this->timespent_fk_user.",";
         $sql.= " note = ".(isset($this->timespent_note)?"'".$this->db->escape($this->timespent_note)."'":"null");
         $sql.= " WHERE rowid = ".$this->timespent_id;
 
-        dol_syslog(get_class($this)."::updateTimeSpent sql=".$sql, LOG_DEBUG);
+        dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
         if ($this->db->query($sql) )
         {
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('TASK_TIMESPENT_MODIFY',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                // Call trigger
+                $result=$this->call_trigger('TASK_TIMESPENT_MODIFY',$user);
+                if ($result < 0)
+                {
+                    $this->db->rollback();
+                    $ret = -1;
+                }
+                else $ret = 1;
                 // End call triggers
             }
-            $ret = 1;
+            else $ret = 1;
         }
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::updateTimeSpent error -1 ".$this->error,LOG_ERR);
+            $this->db->rollback();
             $ret = -1;
         }
 
@@ -919,15 +983,16 @@ class Task extends CommonObject
             $sql.= " SET duration_effective = duration_effective + '".$newDuration."'";
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::updateTimeSpent sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
             if (! $this->db->query($sql) )
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::addTimeSpent error -2 ".$this->error, LOG_ERR);
+                $this->db->rollback();
                 $ret = -2;
             }
         }
 
+        if ($ret >= 0) $this->db->commit();
         return $ret;
     }
 
@@ -949,7 +1014,7 @@ class Task extends CommonObject
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
         $sql.= " WHERE rowid = ".$this->timespent_id;
 
-        dol_syslog(get_class($this)."::delTimeSpent sql=".$sql);
+        dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -957,11 +1022,9 @@ class Task extends CommonObject
         {
             if (! $notrigger)
             {
-                // Call triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('TASK_TIMESPENT_DELETE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                // Call trigger
+                $result=$this->call_trigger('TASK_TIMESPENT_DELETE',$user);
+                if ($result < 0) { $error++; }
                 // End call triggers
             }
         }
@@ -972,7 +1035,7 @@ class Task extends CommonObject
             $sql.= " SET duration_effective = duration_effective - '".$this->timespent_duration."'";
             $sql.= " WHERE rowid = ".$this->id;
 
-            dol_syslog(get_class($this)."::delTimeSpent sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
             if ($this->db->query($sql) )
             {
                 $result = 0;
@@ -980,7 +1043,6 @@ class Task extends CommonObject
             else
             {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::addTimeSpent error -3 ".$this->error, LOG_ERR);
                 $result = -2;
             }
         }
@@ -1316,4 +1378,39 @@ class Task extends CommonObject
 		}
 	}
 
+	/**
+	 *  Create an intervention document on disk using template defined into PROJECT_TASK_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
+	 *  @param  HookManager	$hookmanager	Hook manager instance
+	 *  @return int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+	{
+		global $conf,$langs;
+
+		$langs->load("projects");
+
+		// Positionne modele sur le nom du modele de projet a utiliser
+		if (! dol_strlen($modele))
+		{
+			if (! empty($conf->global->PROJECT_TASK_ADDON_PDF))
+			{
+				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
+			}
+			else
+			{
+				$modele='nodefault';
+			}
+		}
+
+		$modelpath = "core/modules/project/task/doc/";
+
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
+
 }
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 14627b2f889..bc8f5b3098c 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2010 Regis Houssin       <regis.houssin@capnetworks.com>
- * Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2010      Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2014 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * 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
@@ -41,9 +41,10 @@ $mine   = GETPOST('mode')=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
-if ($ref)
+if ($id > 0 || ! empty($ref))
 {
-    $object->fetch(0,$ref);
+    $object->fetch($id,$ref);
+    $object->fetch_thirdparty();
     $id=$object->id;
 }
 
@@ -79,11 +80,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -137,86 +138,76 @@ $userstatic=new User($db);
 /* Mode vue et edition                                                         */
 /*                                                                             */
 /* *************************************************************************** */
-dol_htmloutput_mesg($mesg);
 
 if ($id > 0 || ! empty($ref))
 {
-	if ( $object->fetch($id,$ref) > 0)
+	// To verify role of users
+	//$userAccess = $object->restrictedProjectArea($user,'read');
+	$userWrite  = $object->restrictedProjectArea($user,'write');
+	//$userDelete = $object->restrictedProjectArea($user,'delete');
+	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
+
+	$head = project_prepare_head($object);
+	dol_fiche_head($head, 'contact', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
+
+
+	/*
+	 *   Projet synthese pour rappel
+	*/
+	print '<table class="border" width="100%">';
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
+	// Define a complementary filter for search of next/prev ref.
+	if (! $user->rights->projet->all->lire)
 	{
-		if ($object->societe->id > 0)  $result=$object->societe->fetch($object->societe->id);
-
-		// To verify role of users
-		//$userAccess = $object->restrictedProjectArea($user,'read');
-		$userWrite  = $object->restrictedProjectArea($user,'write');
-		//$userDelete = $object->restrictedProjectArea($user,'delete');
-		//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
-
-		$head = project_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("Project"), 0, ($object->public?'projectpub':'project'));
-
-
-		/*
-		 *   Projet synthese pour rappel
-		 */
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/liste.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
-		// Define a complementary filter for search of next/prev ref.
-        if (! $user->rights->projet->all->lire)
-        {
-            $objectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0);
-            $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
-        }
-		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-		print '</td></tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
-
-		// Customer
-		print "<tr><td>".$langs->trans("ThirdParty")."</td>";
-		print '<td colspan="3">';
-		if ($object->societe->id > 0) print $object->societe->getNomUrl(1);
-		else print '&nbsp;';
-		print '</td></tr>';
-
-		// Visibility
-		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-		if ($object->public) print $langs->trans('SharedProject');
-		else print $langs->trans('PrivateProject');
-		print '</td></tr>';
-
-		// Statut
-		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-
-	   	// Date start
-		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-		print dol_print_date($object->date_start,'day');
-		print '</td></tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-		print dol_print_date($object->date_end,'day');
-		print '</td></tr>';
-
-		print "</table>";
-
-		print '</div>';
-
-		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
-		}
+		$objectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0);
+		$object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
 	}
-	else
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
+
+	// Customer
+	print "<tr><td>".$langs->trans("ThirdParty")."</td>";
+	print '<td colspan="3">';
+	if ($object->thirdparty->id > 0) print $object->thirdparty->getNomUrl(1);
+	else print '&nbsp;';
+	print '</td></tr>';
+
+	// Visibility
+	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+	if ($object->public) print $langs->trans('SharedProject');
+	else print $langs->trans('PrivateProject');
+	print '</td></tr>';
+
+	// Statut
+	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+
+	// Date start
+	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+	print dol_print_date($object->date_start,'day');
+	print '</td></tr>';
+
+	// Date end
+	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+	print dol_print_date($object->date_end,'day');
+	print '</td></tr>';
+
+	print "</table>";
+
+	print '</div>';
+
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+	foreach($dirtpls as $reldir)
 	{
-		print "ErrorRecordNotFound";
+		$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) break;
 	}
 }
 
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index d40682d7ce6..cb9742e40cc 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -46,9 +46,9 @@ if ($user->societe_id > 0) $socid=$user->societe_id;
 $result=restrictedArea($user,'projet',$id,'');
 
 $object = new Project($db);
-$object->fetch($id,$ref);
-if ($object->id > 0)
+if ($id > 0 || ! empty($ref))
 {
+	$object->fetch($id,$ref);
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
 }
@@ -85,8 +85,6 @@ if ($object->id > 0)
 {
 	$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-	if ($object->societe->id > 0)  $result=$object->societe->fetch($object->societe->id);
-
     // To verify role of users
     //$userAccess = $object->restrictedProjectArea($user,'read');
     $userWrite  = $object->restrictedProjectArea($user,'write');
@@ -106,7 +104,7 @@ if ($object->id > 0)
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/liste.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
@@ -124,7 +122,7 @@ if ($object->id > 0)
 
 	// Company
 	print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-	if (! empty($object->societe->id)) print $object->societe->getNomUrl(1);
+	if (! empty($object->thirdparty->id)) print $object->thirdparty->getNomUrl(1);
 	else print '&nbsp;';
 	print '</td></tr>';
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 28f41370d5f..bc7478a0dbb 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012	   Juanjo Menent        <jmenent@2byte.es>
  *
@@ -28,6 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (! empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
@@ -50,7 +51,20 @@ if (! empty($conf->ficheinter->enabled))	$langs->load("interventions");
 $projectid=GETPOST('id','int');
 $ref=GETPOST('ref','alpha');
 $action=GETPOST('action','alpha');
-
+$datesrfc=GETPOST('datesrfc');
+$dateerfc=GETPOST('dateerfc');
+$dates=dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
+$datee=dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear'));
+if (empty($dates) && ! empty($datesrfc)) $dates=dol_stringtotime($datesrfc);
+if (empty($datee) && ! empty($dateerfc)) $datee=dol_stringtotime($dateerfc);
+if (! isset($_POST['datesrfc']) && ! isset($_POST['datesday']))
+{
+	$new=dol_now();
+	$tmp=dol_getdate($new);
+	//$datee=$now
+	//$dates=dol_time_plus_duree($datee, -1, 'y');
+	$dates=dol_get_first_day($tmp['year'],1);
+}
 if ($projectid == '' && $ref == '')
 {
 	dol_print_error('','Bad parameter');
@@ -61,12 +75,17 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $project = new Project($db);
-if ($ref)
+if ($id > 0 || ! empty($ref))
 {
-    $project->fetch(0,$ref);
+    $project->fetch($id,$ref);
+    $project->fetch_thirdparty();
     $projectid=$project->id;
-}else {
+}
+else
+{
 	$project->fetch($projectid);
+    $project->fetch_thirdparty();
+    $projectid=$project->id;
 }
 
 // Security check
@@ -87,10 +106,6 @@ $formproject=new FormProjets($db);
 
 $userstatic=new User($db);
 
-$project = new Project($db);
-$project->fetch($projectid,$ref);
-$project->societe->fetch($project->societe->id);
-
 // To verify role of users
 $userAccess = $project->restrictedProjectArea($user);
 
@@ -100,7 +115,7 @@ dol_fiche_head($head, 'element', $langs->trans("Project"),0,($project->public?'p
 
 print '<table class="border" width="100%">';
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/projet/liste.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
 
 print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
 // Define a complementary filter for search of next/prev ref.
@@ -115,7 +130,7 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
 
 print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-if (! empty($project->societe->id)) print $project->societe->getNomUrl(1);
+if (! empty($project->thirdparty->id)) print $project->thirdparty->getNomUrl(1);
 else print '&nbsp;';
 print '</td></tr>';
 
@@ -140,7 +155,7 @@ print '</td></tr>';
 
 print '</table>';
 
-print '</div>';
+dol_fiche_end();
 
 
 /*
@@ -149,59 +164,79 @@ print '</div>';
 
 $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',
 	'table'=>'facture',
+	'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',
 	'table'=>'facture_fourn',
+	'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',
+	'datefieldname'=>'date_valid',
 	'disableamount'=>1,
 	'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
 'trip'=>array(
+	'name'=>"TripAndExpenses",
 	'title'=>"ListTripAssociatedProject",
 	'class'=>'Deplacement',
 	'table'=>'deplacement',
+	'datefieldname'=>'dated',
 	'margin'=>'minus',
 	'disableamount'=>1,
 	'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
 'agenda'=>array(
+	'name'=>"Agenda",
 	'title'=>"ListActionsAssociatedProject",
 	'class'=>'ActionComm',
 	'table'=>'actioncomm',
+	'datefieldname'=>'datep',
 	'disableamount'=>1,
 	'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire)
 );
@@ -214,22 +249,55 @@ if ($action=="addelement")
 	if ($result<0) {
 		setEventMessage($project->error,'errors');
 	}
+}elseif ($action == "unlink") {
+
+	$tablename = GETPOST("tablename");
+	$elementselectid = GETPOST("elementselect");
+
+	$result = $project->remove_element($tablename, $elementselectid);
+	if ($result < 0) {
+		setEventMessage($project->error, 'errors');
+	}
 }
 
+$showdatefilter=0;
 foreach ($listofreferent as $key => $value)
 {
 	$title=$value['title'];
 	$classname=$value['class'];
 	$tablename=$value['table'];
+	$datefieldname=$value['datefieldname'];
 	$qualified=$value['test'];
 
 	if ($qualified)
 	{
+		if (! $showdatefilter)
+		{
+			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
+			print '<input type="hidden" name="tablename" value="'.$tablename.'">';
+			print '<input type="hidden" name="action" value="addelement">';
+			print '<table><tr>';
+			//print '<td>'.$langs->trans("Filter").':</td>';
+			print '<td>'.$langs->trans("From").' ';
+			print $form->select_date($dates,'dates',0,0,1);
+			print '</td>';
+			print '<td>'.$langs->trans("to").' ';
+			print $form->select_date($datee,'datee',0,0,1);
+			print '</td>';
+			print '<td>';
+			print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';
+			print '</td>';
+			print '</tr></table>';
+			print '</form><br>';
+
+			$showdatefilter++;
+		}
+
 		print '<br>';
 
 		print_titre($langs->trans($title));
 
-		$selectList=$formproject->select_element($tablename,$project->societe->id);
+		$selectList=$formproject->select_element($tablename,$project->thirdparty->id);
 
 		if (!$selectList || ($selectList<0)) {
 			setEventMessage($formproject->error,'errors');
@@ -237,6 +305,8 @@ foreach ($listofreferent as $key => $value)
 			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$projectid.'" method="post">';
 			print '<input type="hidden" name="tablename" value="'.$tablename.'">';
 			print '<input type="hidden" name="action" value="addelement">';
+			print '<input type="hidden" name="datesrfc" value="'.dol_print_date($dates,'dayhourrfc').'">';
+			print '<input type="hidden" name="dateerfc" value="'.dol_print_date($datee,'dayhourrfc').'">';
 			print '<table><tr><td>'.$langs->trans("SelectElement").'</td>';
 			print '<td>'.$selectList.'</td>';
 			print '<td><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("AddElement")).'"></td>';
@@ -244,17 +314,19 @@ foreach ($listofreferent as $key => $value)
 			print '</form>';
 		}
 		print '<table class="noborder" width="100%">';
-		
+
 		print '<tr class="liste_titre">';
-		print '<td width="100">'.$langs->trans("Ref").'</td>';
+		print '<td width="100" colspan="2">'.$langs->trans("Ref").'</td>';
 		print '<td width="100" align="center">'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("ThirdParty").'</td>';
 		if (empty($value['disableamount'])) print '<td align="right" width="120">'.$langs->trans("AmountHT").'</td>';
+		else print '<td width="120"></td>';
 		if (empty($value['disableamount'])) print '<td align="right" width="120">'.$langs->trans("AmountTTC").'</td>';
+		else print '<td width="120"></td>';
 		print '<td align="right" width="200">'.$langs->trans("Status").'</td>';
 		print '</tr>';
-		$elementarray = $project->get_element_list($key, $tablename);
-		if (count($elementarray)>0 && is_array($elementarray))
+		$elementarray = $project->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
+		if (is_array($elementarray) && count($elementarray)>0)
 		{
 			$var=true;
 			$total_ht = 0;
@@ -272,10 +344,12 @@ foreach ($listofreferent as $key => $value)
 				{
 					if ($element->close_code == 'replaced') $qualifiedfortotal=false;	// Replacement invoice
 				}
-				
+
 				$var=!$var;
 				print "<tr ".$bc[$var].">";
-
+				print '<td width="1%">';
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $projectid . '&action=unlink&tablename=' . $tablename . '&elementselect=' . $element->id . '">' . img_picto($langs->trans('Unlink'), 'editdelete') . '</a>';
+				print "</td>\n";
 				// Ref
 				print '<td align="left">';
 				print $element->getNomUrl(1);
@@ -294,7 +368,7 @@ foreach ($listofreferent as $key => $value)
 				print '</td>';
 
                 // Amount
-				if (empty($value['disableamount'])) 
+				if (empty($value['disableamount']))
 				{
 					print '<td align="right">';
 					if (! $qualifiedfortotal) print '<strike>';
@@ -302,9 +376,10 @@ foreach ($listofreferent as $key => $value)
 					if (! $qualifiedfortotal) print '</strike>';
 					print '</td>';
 				}
+				else print '<td></td>';
 
                 // Amount
-				if (empty($value['disableamount'])) 
+				if (empty($value['disableamount']))
 				{
 					print '<td align="right">';
 					if (! $qualifiedfortotal) print '<strike>';
@@ -312,6 +387,7 @@ foreach ($listofreferent as $key => $value)
 					if (! $qualifiedfortotal) print '</strike>';
 					print '</td>';
 				}
+				else print '<td></td>';
 
 				// Status
 				print '<td align="right">'.$element->getLibStatut(5).'</td>';
@@ -325,12 +401,18 @@ foreach ($listofreferent as $key => $value)
 				}
 			}
 
-			print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Number").': '.$i.'</td>';
+			print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>';
 			if (empty($value['disableamount'])) print '<td align="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_ht).'</td>';
+			else print '<td></td>';
 			if (empty($value['disableamount'])) print '<td align="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_ttc).'</td>';
+			else print '<td></td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		}
+		else // error
+		{
+			print $elementarray;
+		}
 		print "</table>";
 
 
@@ -341,30 +423,30 @@ foreach ($listofreferent as $key => $value)
 
 		if ($project->statut > 0)
 		{
-			if ($project->societe->prospect || $project->societe->client)
+			if ($project->thirdparty->prospect || $project->thirdparty->client)
 			{
 				if ($key == 'propal' && ! empty($conf->propal->enabled) && $user->rights->propale->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddProp").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$project->thirdparty->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddProp").'</a>';
 				}
 				if ($key == 'order' && ! empty($conf->commande->enabled) && $user->rights->commande->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddCustomerOrder").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$project->thirdparty->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddCustomerOrder").'</a>';
 				}
 				if ($key == 'invoice' && ! empty($conf->facture->enabled) && $user->rights->facture->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddCustomerInvoice").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?socid='.$project->thirdparty->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddCustomerInvoice").'</a>';
 				}
 			}
-			if ($project->societe->fournisseur)
+			if ($project->thirdparty->fournisseur)
 			{
 				if ($key == 'order_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierInvoice").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?socid='.$project->thirdparty->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierInvoice").'</a>';
 				}
 				if ($key == 'invoice_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierOrder").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?socid='.$project->thirdparty->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierOrder").'</a>';
 				}
 			}
 		}
@@ -373,10 +455,13 @@ foreach ($listofreferent as $key => $value)
 	}
 }
 
-$langs->load('margins');
-
-// Margin display of the project
-print_titre($langs->trans("Margins"));
+// 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 '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td align="left" width="200">'.$langs->trans("Element").'</td>';
@@ -385,9 +470,9 @@ print '<td align="right" width="100">'.$langs->trans("AmountHT").'</td>';
 print '<td align="right" width="100">'.$langs->trans("AmountTTC").'</td>';
 print '</tr>';
 
-
 foreach ($listofreferent as $key => $value)
 {
+	$name=$langs->trans($value['name']);
 	$title=$value['title'];
 	$classname=$value['class'];
 	$tablename=$value['table'];
@@ -416,7 +501,7 @@ foreach ($listofreferent as $key => $value)
 			}
 
 			print '<tr >';
-			print '<td align="left" >'.$classname.'</td>';
+			print '<td align="left" >'.$name.'</td>';
 			print '<td align="right">'.$i.'</td>';
 			print '<td align="right">'.price($total_ht).'</td>';
 			print '<td align="right">'.price($total_ttc).'</td>';
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
deleted file mode 100644
index d79ba993ff9..00000000000
--- a/htdocs/projet/fiche.php
+++ /dev/null
@@ -1,808 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/projet/fiche.php
- *	\ingroup    projet
- *	\brief      Project card
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-
-$langs->load("projects");
-$langs->load('companies');
-
-$id=GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
-$backtopage=GETPOST('backtopage','alpha');
-
-if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $action != "update" && ! $_POST["cancel"])) accessforbidden();
-
-$mine = GETPOST('mode')=='mine' ? 1 : 0;
-//if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('projectcard'));
-
-$object = new Project($db);
-$extrafields = new ExtraFields($db);
-$object->fetch($id,$ref);
-if ($object->id > 0)
-{
-	$object->fetch_thirdparty();
-}
-
-// Security check
-$socid=GETPOST('socid');
-if ($user->societe_id > 0) $socid=$user->societe_id;
-$result = restrictedArea($user, 'projet', $object->id);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-$date_start=dol_mktime(0,0,0,GETPOST('projectstartmonth','int'),GETPOST('projectstartday','int'),GETPOST('projectstartyear','int'));
-$date_end=dol_mktime(0,0,0,GETPOST('projectendmonth','int'),GETPOST('projectendday','int'),GETPOST('projectendyear','int'));
-
-
-/*
- * Actions
- */
-
-$parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
-
-if (empty($reshook))
-{
-
-	// Cancel
-	if (GETPOST("cancel") && ! empty($backtopage))
-	{
-		if (GETPOST("comefromclone")==1)
-		{
-		    $result=$object->delete($user);
-		    if ($result > 0)
-		    {
-		        header("Location: index.php");
-		        exit;
-		    }
-		    else
-		    {
-		        dol_syslog($object->error,LOG_DEBUG);
-		        $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
-		    }
-		}
-	    header("Location: ".$backtopage);
-	    exit;
-	}
-
-	//if cancel and come from clone then delete the cloned project
-	if (GETPOST("cancel") && (GETPOST("comefromclone")==1))
-	{
-	    $result=$object->delete($user);
-	    if ($result > 0)
-	    {
-	        header("Location: index.php");
-	        exit;
-	    }
-	    else
-	    {
-	        dol_syslog($object->error,LOG_DEBUG);
-	        $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
-	    }
-	}
-
-	if ($action == 'add' && $user->rights->projet->creer)
-	{
-	    $error=0;
-	    if (empty($_POST["ref"]))
-	    {
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")).'</div>';
-	        $error++;
-	    }
-	    if (empty($_POST["title"]))
-	    {
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'</div>';
-	        $error++;
-	    }
-
-	    if (! $error)
-	    {
-	        $error=0;
-
-	        $db->begin();
-
-	        $object->ref             = GETPOST('ref','alpha');
-	        $object->title           = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
-	        $object->socid           = GETPOST('socid','int');
-	        $object->description     = GETPOST('description'); // Do not use 'alpha' here, we want field as it is
-	        $object->public          = GETPOST('public','alpha');
-	        $object->datec=dol_now();
-	        $object->date_start=$date_start;
-	        $object->date_end=$date_end;
-
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-	        $result = $object->create($user);
-	        if ($result > 0)
-	        {
-	            // Add myself as project leader
-	            $result = $object->add_contact($user->id, 'PROJECTLEADER', 'internal');
-	            if ($result < 0)
-	            {
-	                $langs->load("errors");
-	                $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-	                $error++;
-	            }
-	        }
-	        else
-	        {
-	            $langs->load("errors");
-	            $mesg='<div class="error">'.$langs->trans($object->error).'</div>';
-	            $error++;
-	        }
-
-	        if (! $error)
-	        {
-	            $db->commit();
-
-	            header("Location:fiche.php?id=".$object->id);
-	            exit;
-	        }
-	        else
-	        {
-	            $db->rollback();
-
-	            $action = 'create';
-	        }
-	    }
-	    else
-	    {
-	        $action = 'create';
-	    }
-	}
-
-	if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
-	{
-	    $error=0;
-
-	    if (empty($ref))
-	    {
-	        $error++;
-	        //$_GET["id"]=$_POST["id"]; // On retourne sur la fiche projet
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")).'</div>';
-	    }
-	    if (empty($_POST["title"]))
-	    {
-	        $error++;
-	        //$_GET["id"]=$_POST["id"]; // On retourne sur la fiche projet
-	        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'</div>';
-	    }
-
-	    $db->begin();
-
-	    if (! $error)
-	    {
-	        $object->oldcopy = dol_clone($object);
-
-			$old_start_date = $object->date_start;
-
-	        $object->ref          = GETPOST('ref','alpha');
-	        $object->title        = GETPOST('title'); // Do not use 'alpha' here, we want field as it is
-	        $object->socid        = GETPOST('socid','int');
-	        $object->description  = GETPOST('description');	// Do not use 'alpha' here, we want field as it is
-	        $object->public       = GETPOST('public','alpha');
-	        $object->date_start   = empty($_POST["projectstart"])?'':$date_start;
-	        $object->date_end     = empty($_POST["projectend"])?'':$date_end;
-
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-			if ($ret < 0)
-			{
-				$error++;
-			}
-	    }
-
-	    if (! $error)
-	    {
-	    	$result=$object->update($user);
-	    	if ($result < 0)
-	    	{
-	    		$error++;
-	    		setEventMessage($object->errors,'errors');
-	    	}
-	    }
-
-	    if (! $error)
-	    {
-	    	if (GETPOST("reportdate") && ($object->date_start!=$old_start_date))
-	    	{
-	    		$result=$object->shiftTaskDate($old_start_date);
-	    		if ($result < 0)
-	    		{
-	    			$error++;
-	    			$mesg='<div class="error">'.$langs->trans("ErrorShiftTaskDate").':'.$object->error.'</div>';
-	    		}
-	    	}
-	    }
-
-	    if ($error)
-	    {
-			$db->rollback();
-	    	$action='edit';
-	    }
-	    else
-		{
-	    	$db->commit();
-
-			if (GETPOST('socid','int') > 0) $object->societe->fetch(GETPOST('socid','int'));
-			else unset($object->societe);
-	    }
-	}
-
-	// Build doc
-	if ($action == 'builddoc' && $user->rights->projet->creer)
-	{
-		// Save last template used to generate document
-		if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
-	    $outputlangs = $langs;
-	    if (GETPOST('lang_id'))
-	    {
-	        $outputlangs = new Translate("",$conf);
-	        $outputlangs->setDefaultLang(GETPOST('lang_id'));
-	    }
-	    $result=project_pdf_create($db, $object, $object->modelpdf, $outputlangs);
-	    if ($result <= 0)
-	    {
-	        dol_print_error($db,$result);
-	        exit;
-	    }
-	}
-
-	// Delete file in doc form
-	if ($action == 'remove_file' && $user->rights->projet->creer)
-	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	    if ($object->id > 0)
-	    {
-	        $langs->load("other");
-	        $upload_dir =	$conf->projet->dir_output . "/";
-	        $file =	$upload_dir	. '/' .	GETPOST('file');
-	        $ret=dol_delete_file($file);
-	        if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-	        else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-	    }
-	}
-
-
-	if ($action == 'confirm_validate' && GETPOST('confirm') == 'yes')
-	{
-	    $result = $object->setValid($user);
-	    if ($result <= 0)
-	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
-	    }
-	}
-
-	if ($action == 'confirm_close' && GETPOST('confirm') == 'yes')
-	{
-	    $result = $object->setClose($user);
-	    if ($result <= 0)
-	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
-	    }
-	}
-
-	if ($action == 'confirm_reopen' && GETPOST('confirm') == 'yes')
-	{
-	    $result = $object->setValid($user);
-	    if ($result <= 0)
-	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
-	    }
-	}
-
-	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->projet->supprimer)
-	{
-	    $object->fetch($id);
-	    $result=$object->delete($user);
-	    if ($result > 0)
-	    {
-	        header("Location: index.php");
-	        exit;
-	    }
-	    else
-	    {
-	        dol_syslog($object->error,LOG_DEBUG);
-	        $mesg='<div class="error">'.$langs->trans("CantRemoveProject").'</div>';
-	    }
-	}
-
-	if ($action == 'confirm_clone' && $user->rights->projet->creer && GETPOST('confirm') == 'yes')
-	{
-	    $clone_contacts=GETPOST('clone_contacts')?1:0;
-	    $clone_tasks=GETPOST('clone_tasks')?1:0;
-		$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
-		$clone_task_files = GETPOST('clone_task_files') ? 1 : 0;
-	    $clone_notes=GETPOST('clone_notes')?1:0;
-	    $result=$object->createFromClone($object->id,$clone_contacts,$clone_tasks,$clone_project_files,$clone_task_files,$clone_notes);
-	    if ($result <= 0)
-	    {
-	        $mesg='<div class="error">'.$object->error.'</div>';
-	    }
-	    else
-	    {
-	    	$object->fetch($result);	// Load new object
-	    	$action='edit';
-	    	$comefromclone=true;
-	    }
-	}
-}
-
-
-/*
- *	View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-$userstatic = new User($db);
-
-
-$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
-llxHeader("",$langs->trans("Projects"),$help_url);
-
-
-if ($action == 'create' && $user->rights->projet->creer)
-{
-    /*
-     * Create
-     */
-
-	$thirdparty=new Societe($db);
-	if ($socid > 0) $thirdparty->fetch($socid);
-
-    print_fiche_titre($langs->trans("NewProject"));
-
-    dol_htmloutput_mesg($mesg);
-
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-    print '<table class="border" width="100%">';
-
-    $defaultref='';
-    $modele = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON;
-
-    // Search template files
-    $file=''; $classname=''; $filefound=0;
-    $dirmodels=array_merge(array('/'),(array) $conf->modules_parts['models']);
-    foreach($dirmodels as $reldir)
-    {
-    	$file=dol_buildpath($reldir."core/modules/project/".$modele.'.php',0);
-    	if (file_exists($file))
-    	{
-    		$filefound=1;
-    		$classname = $modele;
-    		break;
-    	}
-    }
-
-    if ($filefound)
-    {
-	    $result=dol_include_once($reldir."core/modules/project/".$modele.'.php');
-	    $modProject = new $classname;
-
-	    $defaultref = $modProject->getNextValue($thirdparty,$object);
-    }
-
-    if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
-
-    // Ref
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$defaultref).'"></td></tr>';
-
-    // Label
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="30" type="text" name="title" value="'.$_POST["title"].'"></td></tr>';
-
-    // Customer
-    print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-    $text=$form->select_company(GETPOST('socid','int'),'socid','',1,1);
-    $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty");
-    print $form->textwithtooltip($text.' '.img_help(),$texthelp,1);
-    print '</td></tr>';
-
-    // Public
-    print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-    $array=array(0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
-    print $form->selectarray('public',$array,$object->public);
-    print '</td></tr>';
-
-    // Date start
-    print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-    print $form->select_date(($date_start?$date_start:''),'projectstart');
-    print '</td></tr>';
-
-    // Date end
-    print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-    print $form->select_date(($date_end?$date_end:-1),'projectend');
-    print '</td></tr>';
-
-    // Description
-    print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
-    print '<td>';
-    print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$_POST["description"].'</textarea>';
-    print '</td></tr>';
-
-    // Other options
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
-    {
-    	print $object->showOptionals($extrafields,'edit');
-    }
-
-    print '</table>';
-
-    print '<br><center>';
-    print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
-    if (! empty($backtopage))
-    {
-        print ' &nbsp; &nbsp; ';
-	    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    }
-    print '</center>';
-
-    print '</form>';
-
-}
-else
-{
-    /*
-     * Show or edit
-     */
-
-    dol_htmloutput_mesg($mesg);
-
-    if ($object->societe->id > 0)  $result=$object->societe->fetch($object->societe->id);
-    $res=$object->fetch_optionals($object->id,$extralabels);
-
-    // To verify role of users
-    $userAccess = $object->restrictedProjectArea($user,'read');
-    $userWrite  = $object->restrictedProjectArea($user,'write');
-    $userDelete = $object->restrictedProjectArea($user,'delete');
-    //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
-
-
-    $head=project_prepare_head($object);
-    dol_fiche_head($head, 'project', $langs->trans("Project"),0,($object->public?'projectpub':'project'));
-
-    // Confirmation validation
-    if ($action == 'validate')
-    {
-        print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProject'), $langs->trans('ConfirmValidateProject'), 'confirm_validate','',0,1);
-    }
-    // Confirmation close
-    if ($action == 'close')
-    {
-        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("CloseAProject"),$langs->trans("ConfirmCloseAProject"),"confirm_close",'','',1);
-    }
-    // Confirmation reopen
-    if ($action == 'reopen')
-    {
-        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("ReOpenAProject"),$langs->trans("ConfirmReOpenAProject"),"confirm_reopen",'','',1);
-    }
-    // Confirmation delete
-    if ($action == 'delete')
-    {
-        $text=$langs->trans("ConfirmDeleteAProject");
-        $task=new Task($db);
-        $taskarray=$task->getTasksArray(0,0,$object->id,0,0);
-        $nboftask=count($taskarray);
-        if ($nboftask) $text.='<br>'.img_warning().' '.$langs->trans("ThisWillAlsoRemoveTasks",$nboftask);
-        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("DeleteAProject"),$text,"confirm_delete",'','',1);
-    }
-
-    // Clone confirmation
-    if ($action == 'clone')
-    {
-        $formquestion=array(
-    		'text' => $langs->trans("ConfirmClone"),
-            array('type' => 'checkbox', 'name' => 'clone_contacts',		'label' => $langs->trans("CloneContacts"), 			'value' => true),
-            array('type' => 'checkbox', 'name' => 'clone_tasks',   		'label' => $langs->trans("CloneTasks"), 			'value' => true),
-            array('type' => 'checkbox', 'name' => 'clone_notes',   		'label' => $langs->trans("CloneNotes"), 			'value' => true),
-        	array('type' => 'checkbox', 'name' => 'clone_project_files','label' => $langs->trans("CloneProjectFiles"),	    'value' => false),
-        	array('type' => 'checkbox', 'name' => 'clone_task_files',	'label' => $langs->trans("CloneTaskFiles"),         'value' => false)
-        );
-
-        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CloneProject"), $langs->trans("ConfirmCloneProject"), "confirm_clone", $formquestion, '', 1, 240);
-    }
-
-    if ($action == 'edit' && $userWrite > 0)
-    {
-        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        print '<input type="hidden" name="action" value="update">';
-        print '<input type="hidden" name="id" value="'.$object->id.'">';
-        print '<input type="hidden" name="comefromclone" value="'.$comefromclone.'">';
-
-        print '<table class="border" width="100%">';
-
-        // Ref
-        print '<tr><td width="30%">'.$langs->trans("Ref").'</td>';
-        print '<td><input size="12" name="ref" value="'.$object->ref.'"></td></tr>';
-
-        // Label
-        print '<tr><td>'.$langs->trans("Label").'</td>';
-        print '<td><input size="30" name="title" value="'.$object->title.'"></td></tr>';
-
-        // Customer
-        print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-        $text=$form->select_company($object->societe->id,'socid','',1,1);
-        $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty");
-        print $form->textwithtooltip($text.' '.img_help(),$texthelp,1);
-        print '</td></tr>';
-
-        // Visibility
-        print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-        $array=array(0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
-        print $form->selectarray('public',$array,$object->public);
-        print '</td></tr>';
-
-        // Statut
-        print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-
-        // Date start
-        print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-        print $form->select_date($object->date_start?$object->date_start:-1,'projectstart');
-        print ' &nbsp; &nbsp; <input type="checkbox" name="reportdate" value="yes" ';
-        if ($comefromclone){print ' checked="checked" ';}
-		print '/> '. $langs->trans("ProjectReportDate");
-        print '</td></tr>';
-
-        // Date end
-        print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-        print $form->select_date($object->date_end?$object->date_end:-1,'projectend');
-        print '</td></tr>';
-
-        // Description
-        print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
-        print '<td>';
-        print '<textarea name="description" wrap="soft" cols="80" rows="'.ROWS_3.'">'.$object->description.'</textarea>';
-        print '</td></tr>';
-
-        // Other options
-        $parameters=array();
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields,'edit');
-        }
-
-        print '</table>';
-
-        print '<div align="center"><br>';
-        print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'"> &nbsp; ';
-        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
-
-        print '</form>';
-    }
-    else
-    {
-        print '<table class="border" width="100%">';
-
-        $linkback = '<a href="'.DOL_URL_ROOT.'/projet/liste.php">'.$langs->trans("BackToList").'</a>';
-
-        // Ref
-        print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
-        // Define a complementary filter for search of next/prev ref.
-        if (! $user->rights->projet->all->lire)
-        {
-            $objectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0);
-            $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")";
-        }
-        print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-        print '</td></tr>';
-
-        // Label
-        print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
-
-        // Third party
-        print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-        if ($object->societe->id > 0) print $object->societe->getNomUrl(1);
-        else print'&nbsp;';
-        print '</td></tr>';
-
-        // Visibility
-        print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-        if ($object->public) print $langs->trans('SharedProject');
-        else print $langs->trans('PrivateProject');
-        print '</td></tr>';
-
-        // Statut
-        print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-
-        // Date start
-        print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-        print dol_print_date($object->date_start,'day');
-        print '</td></tr>';
-
-        // Date end
-        print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-        print dol_print_date($object->date_end,'day');
-        print '</td></tr>';
-
-        // Description
-        print '<td valign="top">'.$langs->trans("Description").'</td><td>';
-        print nl2br($object->description);
-        print '</td></tr>';
-
-        // Other options
-        $parameters=array();
-        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-        if (empty($reshook) && ! empty($extrafields->attribute_label))
-        {
-        	print $object->showOptionals($extrafields);
-        }
-        print '</table>';
-    }
-
-    dol_fiche_end();
-
-    /*
-     * Boutons actions
-     */
-    print '<div class="tabsAction">';
-
-    if ($action != "edit" )
-    {
-    	// Validate
-        if ($object->statut == 0 && $user->rights->projet->creer)
-        {
-            if ($userWrite > 0)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&action=validate">'.$langs->trans("Valid").'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Valid').'</a>';
-            }
-        }
-
-        // Modify
-        if ($object->statut != 2 && $user->rights->projet->creer)
-        {
-            if ($userWrite > 0)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
-            }
-        }
-
-        // Close
-        if ($object->statut == 1 && $user->rights->projet->creer)
-        {
-            if ($userWrite > 0)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
-            }
-        }
-
-        // Reopen
-        if ($object->statut == 2 && $user->rights->projet->creer)
-        {
-            if ($userWrite > 0)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
-            }
-        }
-
-        // Clone
-        if ($user->rights->projet->creer)
-        {
-            if ($userWrite > 0)
-            {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
-            }
-        }
-
-        // Delete
-        if ($user->rights->projet->supprimer)
-        {
-            if ($userDelete > 0)
-            {
-                print '<a class="butActionDelete" href="fiche.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
-            }
-        }
-    }
-
-    print "</div>";
-    print "<br>\n";
-
-    if ($action != 'presend')
-    {
-        print '<table width="100%"><tr><td width="50%" valign="top">';
-        print '<a name="builddoc"></a>'; // ancre
-
-
-        /*
-         * Documents generes
-         */
-        $filename=dol_sanitizeFileName($object->ref);
-        $filedir=$conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-        $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-        $genallowed=($user->rights->projet->lire && $userAccess > 0);
-        $delallowed=($user->rights->projet->creer && $userWrite > 0);
-
-        $var=true;
-
-        $somethingshown=$formfile->show_documents('project',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
-
-        print '</td><td valign="top" width="50%">';
-
-        if (!empty($object->id))
-        {
-	        // List of actions on element
-	        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	        $formactions=new FormActions($db);
-	        $somethingshown=$formactions->showactions($object,'project',$socid);
-        }
-
-        print '</td></tr></table>';
-    }
-
-    // Hook to add more things on page
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('mainCardTabAddMore',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-
-}
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 79d302addd3..e6fdd3264ca 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -38,9 +38,10 @@ $mine = ($mode == 'mine' ? 1 : 0);
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
-if ($ref)
+if ($id > 0 || ! empty($ref))
 {
-    $object->fetch(0,$ref);
+    $object->fetch($id,$ref);
+    $object->fetch_thirdparty();
     $id=$object->id;
 }
 
@@ -69,7 +70,6 @@ $formother=new FormOther($db);
 $userstatic=new User($db);
 $companystatic=new Societe($db);
 $task = new Task($db);
-$object = new Project($db);
 
 $arrayofcss=array('/includes/jsgantt/jsgantt.css');
 
@@ -86,9 +86,6 @@ llxHeader("",$langs->trans("Tasks"),$help_url,'',0,0,$arrayofjs,$arrayofcss);
 
 if ($id > 0 || ! empty($ref))
 {
-	$object->fetch($id,$ref);
-	if ($object->societe->id > 0)  $result=$object->societe->fetch($object->societe->id);
-
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
 	$userWrite  = $object->restrictedProjectArea($user,'write');
@@ -105,7 +102,7 @@ if ($id > 0 || ! empty($ref))
 
     print '<table class="border" width="100%">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/liste.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
 
     // Ref
     print '<tr><td width="30%">';
@@ -123,7 +120,7 @@ if ($id > 0 || ! empty($ref))
     print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
 
     print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-    if (! empty($object->societe->id)) print $object->societe->getNomUrl(1);
+    if (! empty($object->thirdparty->id)) print $object->thirdparty->getNomUrl(1);
     else print '&nbsp;';
     print '</td>';
     print '</tr>';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 3049d4201eb..36f53b02680 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -1,21 +1,21 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
-* Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
-*
-* 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 <http://www.gnu.org/licenses/>.
-*/
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
 
 /**
  *       \file       htdocs/projet/index.php
@@ -45,10 +45,11 @@ $sortorder = GETPOST("sortorder",'alpha');
 
 /*
  * View
-*/
+ */
 
 $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);
@@ -73,8 +74,24 @@ else
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
+// Search project
+if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
+{
+	$var=false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/projet/list.php">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="noborder nohover" width="100%">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAProject").'</td></tr>';
+	print '<tr '.$bc[$var].'>';
+	print '<td class="nowrap"><label for="sf_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_ref" id="sf_ref" size="18"></td>';
+	print '<td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="sall">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="search_all" id="search_all" size="18"></td>';
+	print '</tr>';
+	print "</table></form>\n";
+	print "<br>\n";
+}
 
-print_projecttasks_array($db,$socid,$projectsListId);
+print_projecttasks_array($db,$socid,$projectsListId,0,0);
 
 
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
@@ -87,7 +104,7 @@ print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right"
 print "</tr>\n";
 
 $sql = "SELECT count(p.rowid) as nb";
-$sql.= ", s.nom, s.rowid as socid";
+$sql.= ", s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql.= " WHERE p.entity = ".$conf->entity;
@@ -111,7 +128,7 @@ if ( $resql )
 		if ($obj->socid)
 		{
 			$socstatic->id=$obj->socid;
-			$socstatic->nom=$obj->nom;
+			$socstatic->name=$obj->name;
 			print $socstatic->getNomUrl(1);
 		}
 		else
@@ -119,7 +136,7 @@ if ( $resql )
 			print $langs->trans("OthersNotLinkedToThirdParty");
 		}
 		print '</td>';
-		print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/liste.php?socid='.$obj->socid.'">'.$obj->nb.'</a></td>';
+		print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/list.php?socid='.$obj->socid.'">'.$obj->nb.'</a></td>';
 		print "</tr>\n";
 
 		$i++;
@@ -140,91 +157,112 @@ print '</div></div></div>';
 // Tasks for all resources of all opened projects and time spent for each task/resource
 print '<div class="fichecenter">';
 
-$sql = "SELECT 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.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 sql='.$sql,LOG_DEBUG);
+dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG);
 $resql = $db->query($sql);
 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 '<br>';
+
+	print_fiche_titre($langs->trans("TasksOnOpenedProject"),'','').'<br>';
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	//print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
+	print '<th>'.$langs->trans('Projects').'</th>';
+	print '<th>'.$langs->trans('Task').'</th>';
+	print '<th>'.$langs->trans('DateStart').'</th>';
+	print '<th>'.$langs->trans('DateEnd').'</th>';
+	print '<th align="right">'.$langs->trans('PlannedWorkload').'</th>';
+	print '<th align="right">'.$langs->trans("ProgressDeclared").'</td>';
+	print '<th align="right">'.$langs->trans('TimeSpent').'</th>';
+	print '<th align="right">'.$langs->trans("ProgressCalculated").'</td>';
+	print '</tr>';
+
+	while ($i < $num && $i < $max)
 	{
-/*		$langs->load("errors");
-  		print '<tr '.$bc[0].'>';
-		print '<td colspan="9">';
-		print $langs->trans("WarningTooManyDataPleaseUseMoreFilters");
-		print '</td></tr>';*/
-	}
-	else
-	{
-		print '<br>';
+		$obj = $db->fetch_object($resql);
+		$var=!$var;
 
-		print_fiche_titre($langs->trans("TimeSpent"),'','').'<br>';
-
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
-		print '<th>'.$langs->trans('Projects').'</th>';
-		print '<th>'.$langs->trans('Task').'</th>';
-		print '<th>'.$langs->trans('DateStart').'</th>';
-		print '<th>'.$langs->trans('DateEnd').'</th>';
-		print '<th>'.$langs->trans('TimeSpent').'</th>';
-		print '</tr>';
-
-		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 "<tr ".$bc[$var].">";
-			print '<td>'.$username.'</td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$obj->projectid.'">'.$obj->title.'</a></td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$obj->taskid.'&withproject=1">'.$obj->label.'</a></td>';
-			print '<td>'.dol_print_date($db->jdate($obj->dateo)).'</td>';
-			print '<td>'.dol_print_date($db->jdate($obj->datee)).'</td>';
-			/* 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 '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
-			//print $percentcompletion.' %';
-			print convertSecondToTime($obj->timespent, 'all');
-			print '</a></td>';
-			print "</tr>\n";
-
-			$i++;
+			$result=$userstatic->fetch($obj->userid);
+			if (! $result) $userstatic->id=0;
 		}
+		if ($userstatic->id) $username = $userstatic->getNomUrl(0,0);
 
-		print "</table>";
+		print "<tr ".$bc[$var].">";
+		//print '<td>'.$username.'</td>';
+		print '<td>';
+		$projectstatic->id=$obj->projectid;
+		$projectstatic->ref=$obj->ref;
+		$projectstatic->title=$obj->title;
+		print $projectstatic->getNomUrl(1,'',16);
+		//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$obj->projectid.'">'.$obj->title.'</a>';
+		print '</td>';
+		print '<td>';
+		if (! empty($obj->taskid))
+		{
+			print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$obj->taskid.'&withproject=1">'.$obj->label.'</a>';
+		}
+		else print $langs->trans("NoTasks");
+		print '</td>';
+		print '<td>'.dol_print_date($db->jdate($obj->dateo),'day').'</td>';
+		print '<td>'.dol_print_date($db->jdate($obj->datee),'day').'</td>';
+		print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
+		print convertSecondToTime($obj->planned_workload, 'all');
+		print '</a></td>';
+		print '<td align="right">';
+		print ($obj->taskid>0)?$obj->progress.'%':'';
+		print '</td>';
+		print '<td align="right"><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
+		print convertSecondToTime($obj->timespent, 'all');
+		print '</a></td>';
+		print '<td align="right">';
+		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 '</td>';
+		print "</tr>\n";
+
+		$i++;
 	}
 
+	if ($num > $max)
+	{	
+		print '<tr><td colspan="6">'.$langs->trans("WarningTooManyDataPleaseUseMoreFilters").'</td></tr>';		
+	}
+	
+	print "</table>";
+
+	
 	$db->free($resql);
 }
 else
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
new file mode 100644
index 00000000000..b4260e8ea91
--- /dev/null
+++ b/htdocs/projet/list.php
@@ -0,0 +1,222 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Bariley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/projet/list.php
+ *	\ingroup    projet
+ *	\brief      Page to list projects
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+$langs->load('projects');
+
+$title = $langs->trans("Projects");
+
+// Security check
+$socid = (is_numeric($_GET["socid"]) ? $_GET["socid"] : 0 );
+if ($user->societe_id > 0) $socid=$user->societe_id;
+if ($socid > 0)
+{
+	$soc = new Societe($db);
+	$soc->fetch($socid);
+	$title .= ' (<a href="list.php">'.$soc->name.'</a>)';
+}
+if (!$user->rights->projet->lire) accessforbidden();
+
+
+$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
+$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
+$page = isset($_GET["page"])? $_GET["page"]:$_POST["page"];
+$page = is_numeric($page) ? $page : 0;
+$page = $page == -1 ? 0 : $page;
+
+if (! $sortfield) $sortfield="p.ref";
+if (! $sortorder) $sortorder="ASC";
+$offset = $conf->liste_limit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
+
+$search_ref=GETPOST("search_ref");
+$search_label=GETPOST("search_label");
+$search_societe=GETPOST("search_societe");
+$search_all=GETPOST("search_all");
+
+
+/*
+ * View
+ */
+
+$projectstatic = new Project($db);
+$socstatic = new Societe($db);
+
+llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
+
+
+$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:($user->rights->projet->all->lire?2:0)),1,$socid);
+
+$sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_statut, p.public, p.fk_user_creat";
+$sql.= ", p.datec as date_create, p.dateo as date_start, p.datee as date_end";
+$sql.= ", s.nom as name, s.rowid as socid";
+$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+$sql.= " WHERE p.entity = ".$conf->entity;
+if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
+// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
+//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) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+if ($search_ref)
+{
+	$sql .= natural_search('p.ref', $search_ref);
+}
+if ($search_label)
+{
+	$sql .= natural_search('p.title', $search_label);
+}
+if ($search_societe)
+{
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_all)
+{
+	$sql .= natural_search(array('p.ref','p.title','s.nom'), $search_all);
+}
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+dol_syslog("list allowed project", LOG_DEBUG);
+$resql = $db->query($sql);
+if ($resql)
+{
+	$var=true;
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$text=$langs->trans("Projects");
+	if ($mine) $text=$langs->trans('MyProjects');
+	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
+
+	// Show description of content
+	if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
+	else
+	{
+		if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
+		else print $langs->trans("ProjectsPublicDesc").'<br><br>';
+	}
+
+	print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
+
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Visibility"),$_SERVER["PHP_SELF"],"p.public","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"","",'align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_ref" value="'.$search_ref.'" size="6">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_label" value="'.$search_label.'">';
+	print '</td>';
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_societe" value="'.$search_societe.'">';
+	print '</td>';
+	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
+	print "</tr>\n";
+
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($resql);
+
+		$projectstatic->id = $objp->projectid;
+		$projectstatic->user_author_id = $objp->fk_user_creat;
+		$projectstatic->public = $objp->public;
+
+		$userAccess = $projectstatic->restrictedProjectArea($user);
+
+		if ($userAccess >= 0)
+		{
+			$var=!$var;
+			print "<tr ".$bc[$var].">";
+
+			// Project url
+			print "<td>";
+			$projectstatic->ref = $objp->ref;
+			print $projectstatic->getNomUrl(1);
+			print "</td>";
+
+			// Title
+			print '<td>';
+			print dol_trunc($objp->title,24);
+			print '</td>';
+
+			// Company
+			print '<td>';
+			if ($objp->socid)
+			{
+				$socstatic->id=$objp->socid;
+				$socstatic->name=$objp->name;
+				print $socstatic->getNomUrl(1);
+			}
+			else
+			{
+				print '&nbsp;';
+			}
+			print '</td>';
+
+			// Visibility
+			print '<td align="left">';
+			if ($objp->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td>';
+
+			// Status
+			$projectstatic->statut = $objp->fk_statut;
+			print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
+
+			print "</tr>\n";
+
+		}
+
+		$i++;
+	}
+
+	$db->free($resql);
+}
+else
+{
+	dol_print_error($db);
+}
+
+print "</table>";
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php
deleted file mode 100644
index 39fcdb64a01..00000000000
--- a/htdocs/projet/liste.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Bariley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/projet/liste.php
- *	\ingroup    projet
- *	\brief      Page to list projects
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-$langs->load('projects');
-
-$title = $langs->trans("Projects");
-
-// Security check
-$socid = (is_numeric($_GET["socid"]) ? $_GET["socid"] : 0 );
-if ($user->societe_id > 0) $socid=$user->societe_id;
-if ($socid > 0)
-{
-	$soc = new Societe($db);
-	$soc->fetch($socid);
-	$title .= ' (<a href="liste.php">'.$soc->nom.'</a>)';
-}
-if (!$user->rights->projet->lire) accessforbidden();
-
-
-$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
-$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
-$page = isset($_GET["page"])? $_GET["page"]:$_POST["page"];
-$page = is_numeric($page) ? $page : 0;
-$page = $page == -1 ? 0 : $page;
-
-if (! $sortfield) $sortfield="p.ref";
-if (! $sortorder) $sortorder="ASC";
-$offset = $conf->liste_limit * $page ;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
-$mine = $_REQUEST['mode']=='mine' ? 1 : 0;
-
-$search_ref=GETPOST("search_ref");
-$search_label=GETPOST("search_label");
-$search_societe=GETPOST("search_societe");
-
-
-/*
- * View
- */
-
-$projectstatic = new Project($db);
-$socstatic = new Societe($db);
-
-llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos");
-
-
-$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:($user->rights->projet->all->lire?2:0)),1,$socid);
-
-$sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_statut, p.public, p.fk_user_creat";
-$sql.= ", p.datec as date_create, p.dateo as date_start, p.datee as date_end";
-$sql.= ", s.nom, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
-$sql.= " WHERE p.entity = ".$conf->entity;
-if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
-// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-//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) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-if ($search_ref)
-{
-	$sql .= natural_search('p.ref', $search_ref);
-}
-if ($search_label)
-{
-	$sql .= natural_search('p.title', $search_label);
-}
-if ($search_societe)
-{
-	$sql .= natural_search('s.nom', $search_societe);
-}
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit+1, $offset);
-
-dol_syslog("list allowed project sql=".$sql);
-$resql = $db->query($sql);
-if ($resql)
-{
-	$var=true;
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$text=$langs->trans("Projects");
-	if ($mine) $text=$langs->trans('MyProjects');
-	print_barre_liste($text, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
-
-	// Show description of content
-	if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
-	else
-	{
-		if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
-		else print $langs->trans("ProjectsPublicDesc").'<br><br>';
-	}
-
-	print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.ref","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"p.title","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Visibility"),$_SERVER["PHP_SELF"],"p.public","","","",$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],'p.fk_statut',"","",'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_ref" value="'.$search_ref.'" size="6">';
-	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_label" value="'.$search_label.'">';
-	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_societe" value="'.$search_societe.'">';
-	print '</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
-	print "</tr>\n";
-
-	while ($i < $num)
-	{
-		$objp = $db->fetch_object($resql);
-
-		$projectstatic->id = $objp->projectid;
-		$projectstatic->user_author_id = $objp->fk_user_creat;
-		$projectstatic->public = $objp->public;
-
-		$userAccess = $projectstatic->restrictedProjectArea($user);
-
-		if ($userAccess >= 0)
-		{
-			$var=!$var;
-			print "<tr ".$bc[$var].">";
-
-			// Project url
-			print "<td>";
-			$projectstatic->ref = $objp->ref;
-			print $projectstatic->getNomUrl(1);
-			print "</td>";
-
-			// Title
-			print '<td>';
-			print dol_trunc($objp->title,24);
-			print '</td>';
-
-			// Company
-			print '<td>';
-			if ($objp->socid)
-			{
-				$socstatic->id=$objp->socid;
-				$socstatic->nom=$objp->nom;
-				print $socstatic->getNomUrl(1);
-			}
-			else
-			{
-				print '&nbsp;';
-			}
-			print '</td>';
-
-			// Visibility
-			print '<td align="left">';
-			if ($objp->public) print $langs->trans('SharedProject');
-			else print $langs->trans('PrivateProject');
-			print '</td>';
-
-			// Status
-			$projectstatic->statut = $objp->fk_statut;
-			print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
-
-			print "</tr>\n";
-
-		}
-
-		$i++;
-	}
-
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-print "</table>";
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 493141cbe95..b581ca01be9 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -36,9 +36,10 @@ $mine = $_REQUEST['mode']=='mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
-if ($ref)
+if ($id > 0 || ! empty($ref))
 {
-    $object->fetch(0,$ref);
+    $object->fetch($id,$ref);
+    $object->fetch_thirdparty();
     $id=$object->id;
 }
 
@@ -66,77 +67,71 @@ llxHeader("",$langs->trans("Project"),$help_url);
 
 $form = new Form($db);
 $userstatic=new User($db);
-$object = new Project($db);
 
 $now=dol_now();
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id, $ref))
+	// To verify role of users
+	//$userAccess = $object->restrictedProjectArea($user,'read');
+	$userWrite  = $object->restrictedProjectArea($user,'write');
+	//$userDelete = $object->restrictedProjectArea($user,'delete');
+	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
+
+	$head = project_prepare_head($object);
+	dol_fiche_head($head, 'notes', $langs->trans('Project'), 0, ($object->public?'projectpub':'project'));
+
+	print '<table class="border" width="100%">';
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
+	// Define a complementary filter for search of next/prev ref.
+	if (! $user->rights->projet->all->lire)
 	{
-		if ($object->societe->id > 0)  $result=$object->societe->fetch($object->societe->id);
-
-        // To verify role of users
-        //$userAccess = $object->restrictedProjectArea($user,'read');
-        $userWrite  = $object->restrictedProjectArea($user,'write');
-        //$userDelete = $object->restrictedProjectArea($user,'delete');
-        //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
-
-		$head = project_prepare_head($object);
-		dol_fiche_head($head, 'notes', $langs->trans('Project'), 0, ($object->public?'projectpub':'project'));
-
-		print '<table class="border" width="100%">';
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/liste.php">'.$langs->trans("BackToList").'</a>';
-
-		// Ref
-		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
-		// Define a complementary filter for search of next/prev ref.
-	    if (! $user->rights->projet->all->lire)
-        {
-            $projectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0);
-            $object->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
-        }
-		print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-		print '</td></tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
-
-		// Third party
-		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-		if ($object->societe->id > 0) print $object->societe->getNomUrl(1);
-		else print'&nbsp;';
-		print '</td></tr>';
-
-		// Visibility
-		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-		if ($object->public) print $langs->trans('SharedProject');
-		else print $langs->trans('PrivateProject');
-		print '</td></tr>';
-
-		// Statut
-		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
-
-	   	// Date start
-		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-		print dol_print_date($object->date_start,'day');
-		print '</td></tr>';
-
-		// Date end
-		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-		print dol_print_date($object->date_end,'day');
-		print '</td></tr>';
-
-		print "</table>";
-
-		print '<br>';
-
-		$colwidth=30;
-		include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
-
-		dol_fiche_end();;
+		$projectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0);
+		$object->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
 	}
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+	print '</td></tr>';
+
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
+
+	// Third party
+	print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
+	if ($object->thirdparty->id > 0) print $object->thirdparty->getNomUrl(1);
+	else print'&nbsp;';
+	print '</td></tr>';
+
+	// Visibility
+	print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
+	if ($object->public) print $langs->trans('SharedProject');
+	else print $langs->trans('PrivateProject');
+	print '</td></tr>';
+
+	// Statut
+	print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+
+	// Date start
+	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+	print dol_print_date($object->date_start,'day');
+	print '</td></tr>';
+
+	// Date end
+	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+	print dol_print_date($object->date_end,'day');
+	print '</td></tr>';
+
+	print "</table>";
+
+	print '<br>';
+
+	$colwidth=30;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	dol_fiche_end();;
 }
 
 llxFooter();
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 356eed55e6d..850b76bd3b3 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@ $object = new Project($db);
 $taskstatic = new Task($db);
 $extrafields_project = new ExtraFields($db);
 $extrafields_task = new ExtraFields($db);
-if ($id > 0 || $ref)
+if ($id > 0 || ! empty($ref))
 {
 	$object->fetch($id,$ref);
 	$id=$object->id;
@@ -64,7 +64,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 $result = restrictedArea($user, 'projet', $id);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('projecttaskcard'));
+$hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $progress=GETPOST('progress', 'int');
 $label=GETPOST('label', 'alpha');
@@ -90,13 +90,13 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 	{
 		if (empty($label))
 		{
-			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 			$action='create';
 			$error++;
 		}
 		else if (empty($_POST['task_parent']))
 		{
-			$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("ChildOfTask"));
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("ChildOfTask")), 'errors');
 			$action='create';
 			$error++;
 		}
@@ -131,6 +131,11 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			{
 				$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
 			}
+			else
+			{
+			    setEventMessage($task->error,'errors');
+			    setEventMessage($task->errors,'errors');
+			}
 		}
 
 		if (! $error)
@@ -178,7 +183,7 @@ llxHeader("",$langs->trans("Tasks"),$help_url);
 if ($id > 0 || ! empty($ref))
 {
 	$object->fetch($id, $ref);
-	if ($object->societe->id > 0)  $result=$object->societe->fetch($object->societe->id);
+	$object->fetch_thirdparty();
 	$res=$object->fetch_optionals($object->id,$extralabels_projet);
 
 
@@ -198,7 +203,7 @@ if ($id > 0 || ! empty($ref))
 
 	print '<table class="border" width="100%">';
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/liste.php">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php">'.$langs->trans("BackToList").'</a>';
 
 	// Ref
 	print '<tr><td width="30%">';
@@ -216,7 +221,7 @@ if ($id > 0 || ! empty($ref))
 	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-	if (! empty($object->societe->id)) print $object->societe->getNomUrl(1);
+	if (! empty($object->thirdparty->id)) print $object->thirdparty->getNomUrl(1);
 	else print '&nbsp;';
 	print '</td>';
 	print '</tr>';
@@ -254,14 +259,12 @@ if ($id > 0 || ! empty($ref))
 }
 
 
-if ($action == 'create' && $user->rights->projet->creer && (empty($object->societe->id) || $userWrite > 0))
+if ($action == 'create' && $user->rights->projet->creer && (empty($object->thirdparty->id) || $userWrite > 0))
 {
 	if ($id > 0 || ! empty($ref)) print '<br>';
 
 	print_fiche_titre($langs->trans("NewTask"));
 
-	dol_htmloutput_errors($mesg);
-
 	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="createtask">';
@@ -297,7 +300,8 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
-	print $form->select_dolusers($user->id,'userid',1);
+	$contactsofproject=(! empty($object->id)?$object->getListContactId('internal'):'');
+	$form->select_users($user->id,'userid',0,'',0,'',$contactsofproject);
 	print '</td></tr>';
 
 	// Date start
@@ -316,7 +320,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie
 	print '</td></tr>';
 
 	// Progress
-	print '<tr><td>'.$langs->trans("Progress").'</td><td colspan="3">';
+	print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
 	print $formother->select_percent($progress,'progress');
 	print '</td></tr>';
 
@@ -413,7 +417,7 @@ else
 	print '<td>'.$langs->trans("LabelTask").'</td>';
 	print '<td align="center">'.$langs->trans("DateStart").'</td>';
 	print '<td align="center">'.$langs->trans("DateEnd").'</td>';
-	print '<td align="center">'.$langs->trans("PlannedWorkload").'</td>';
+	print '<td align="right">'.$langs->trans("PlannedWorkload").'</td>';
 	print '<td align="right">'.$langs->trans("ProgressDeclared").'</td>';
 	print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
 	print '<td align="right">'.$langs->trans("ProgressCalculated").'</td>';
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 8a6ebb0a3d4..0e111b2d2ee 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -75,11 +75,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 		}
 		else
 		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+			setEventMessage($object->error, 'errors');
 		}
 	}
 }
@@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref))
 	if ($object->fetch($id, $ref) > 0)
 	{
 		$result=$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);
 
@@ -179,7 +179,7 @@ if ($id > 0 || ! empty($ref))
     		// Define a complementary filter for search of next/prev ref.
     		if (! $user->rights->projet->all->lire)
     		{
-    		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,0);
+    		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,0);
     		    $projectstatic->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")";
     		}
     		print $form->showrefnav($projectstatic,'project_ref','',1,'ref','ref','',$param.'&withproject=1');
@@ -188,7 +188,7 @@ if ($id > 0 || ! empty($ref))
     		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
 
     		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-    		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
+    		if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td>';
     		print '</tr>';
@@ -215,16 +215,12 @@ if ($id > 0 || ! empty($ref))
     		print '</table>';
 
     		dol_fiche_end();
-
-    		print '<br>';
 		}
 
 		// To verify role of users
 		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
 		//$arrayofuseridoftask=$object->getListContactId('internal');
 
-		dol_htmloutput_mesg($mesg);
-
 		$head = task_prepare_head($object);
 		dol_fiche_head($head, 'task_contact', $langs->trans("Task"), 0, 'projecttask');
 
@@ -241,11 +237,11 @@ if ($id > 0 || ! empty($ref))
 		print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
 		if (! GETPOST('withproject') || empty($projectstatic->id))
 		{
-		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
+		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
 		    $object->next_prev_filter=" fk_projet in (".$projectsListId.")";
 		}
 		else $object->next_prev_filter=" fk_projet = ".$projectstatic->id;
-	    print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
+		print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','',$param);
 		print '</td></tr>';
 
 		// Label
@@ -261,7 +257,7 @@ if ($id > 0 || ! empty($ref))
     		// Customer
     		print "<tr><td>".$langs->trans("ThirdParty")."</td>";
     		print '<td colspan="3">';
-    		if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1);
+    		if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1);
     		else print '&nbsp;';
     		print '</td></tr>';
 		}
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 '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
 
 		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
+		if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1);
 		else print '&nbsp;';
 		print '</td>';
 		print '</tr>';
@@ -179,8 +179,6 @@ if ($object->id > 0)
 		print '</table>';
 
 		dol_fiche_end();
-
-		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
@@ -225,7 +223,7 @@ if ($object->id > 0)
 
 		// Third party
 		print '<td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-		if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
+		if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1);
 		else print '&nbsp;';
 		print '</td></tr>';
 	}
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index 94711b4d92e..06708170ce2 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -75,7 +75,7 @@ if ($id)
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
 // Show description of content
-if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
+if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
 else
 {
 	if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
@@ -86,7 +86,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) : '');
@@ -126,7 +126,9 @@ print '</td>';
 print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'"></td>';
 print "</tr>\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 '<tr '.$bc[0].'>';
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 '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-		if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
+		if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1);
 		else print '&nbsp;';
 		print '</td>';
 		print '</tr>';
@@ -161,8 +161,6 @@ if ($object->id > 0)
 		print '</table>';
 
 		dol_fiche_end();
-
-		print '<br>';
 	}
 
 	$head = task_prepare_head($object);
@@ -196,7 +194,7 @@ if ($object->id > 0)
 
 		// Third party
 		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-		if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1);
+		if ($projectstatic->thirdparty->id > 0) print $projectstatic->thirdparty->getNomUrl(1);
 		else print'&nbsp;';
 		print '</td></tr>';
 	}
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 908a9513162..11bc8ffea09 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -50,7 +50,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 if (! $user->rights->projet->lire) accessforbidden();
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('projecttaskcard'));
+$hookmanager->initHooks(array('projecttaskcard','globalcard'));
 
 $object = new Task($db);
 $extrafields = new ExtraFields($db);
@@ -58,9 +58,11 @@ $projectstatic = new Project($db);
 
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+
 /*
  * Actions
-*/
+ */
 
 if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
 {
@@ -69,7 +71,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
 	if (empty($_POST["label"]))
 	{
 		$error++;
-		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'</div>';
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
 	}
 	if (! $error)
 	{
@@ -91,6 +93,11 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
 		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 
 		$result=$object->update($user);
+
+		if ($result < 0)
+		{
+		    setEventMessages($object->error,$object->errors,'errors');
+		}
 	}
 	else
 	{
@@ -110,13 +117,12 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 
 		if ($object->delete($user) > 0)
 		{
-			header("Location: index.php");
+			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id);
 			exit;
 		}
 		else
 		{
-			$langs->load("errors");
-			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+		    setEventMessages($object->error,$object->errors,'errors');
 			$action='';
 		}
 	}
@@ -153,7 +159,7 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
 		$outputlangs = new Translate("",$conf);
 		$outputlangs->setDefaultLang(GETPOST('lang_id'));
 	}
-	$result=task_pdf_create($db, $object, $object->modelpdf, $outputlangs);
+	$result= $object->generateDocument($object->modelpdf, $outputlangs);
 	if ($result <= 0)
 	{
 		dol_print_error($db,$result);
@@ -196,7 +202,7 @@ if ($id > 0 || ! empty($ref))
 		$res=$object->fetch_optionals($object->id,$extralabels);
 
 		$result=$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);
 
@@ -229,7 +235,7 @@ if ($id > 0 || ! empty($ref))
 			print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projectstatic->title.'</td></tr>';
 
 			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-			if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
+			if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1);
 			else print '&nbsp;';
 			print '</td>';
 			print '</tr>';
@@ -256,8 +262,6 @@ if ($id > 0 || ! empty($ref))
 			print '</table>';
 
 			dol_fiche_end();
-
-			print '<br>';
 		}
 
 		/*
@@ -288,12 +292,7 @@ if ($id > 0 || ! empty($ref))
 		//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
 		//$arrayofuseridoftask=$object->getListContactId('internal');
 
-		dol_htmloutput_mesg($mesg);
-
 		$head=task_prepare_head($object);
-		dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
-
-
 
 		if ($action == 'edit' && $user->rights->projet->creer)
 		{
@@ -303,6 +302,8 @@ if ($id > 0 || ! empty($ref))
 			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 
+			dol_fiche_head($head, 'task_task', $langs->trans("Task"),0,'projecttask');
+
 			print '<table class="border" width="100%">';
 
 			// Ref
@@ -347,7 +348,7 @@ if ($id > 0 || ! empty($ref))
 			print $form->select_duration('planned_workload',$object->planned_workload,0,'text');
 			print '</td></tr>';
 
-			// Progress
+			// Progress declared
 			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
 			print $formother->select_percent($object->progress,'progress');
 			print '</td></tr>';
@@ -368,10 +369,12 @@ if ($id > 0 || ! empty($ref))
 
 			print '</table>';
 
-			print '<center><br>';
+			dol_fiche_end();
+
+			print '<div align="center">';
 			print '<input type="submit" class="button" name="update" value="'.$langs->trans("Modify").'"> &nbsp; ';
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-			print '<center>';
+			print '<div>';
 
 			print '</form>';
 		}
@@ -379,10 +382,12 @@ if ($id > 0 || ! empty($ref))
 		{
 			/*
 			 * Fiche tache en mode visu
-			*/
+			 */
 			$param=($withproject?'&withproject=1':'');
 			$linkback=$withproject?'<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>':'';
 
+			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");
@@ -436,14 +441,19 @@ if ($id > 0 || ! empty($ref))
 			print convertSecondToTime($object->planned_workload,'allhourmin');
 			print '</td></tr>';
 
-			// Declared progress
+			// Progress declared
 			print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
 			print $object->progress.' %';
 			print '</td></tr>';
 
-			// Calculated progress
+			// Progress calculated
 			print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
-			if ($object->planned_workload) print round(100 * $object->duration_effective / $object->planned_workload,2).' %';
+			if ($object->planned_workload)
+			{
+				$tmparray=$object->getSummaryOfTimeSpent();
+				if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
+				else print '0 %';
+			}
 			else print '';
 			print '</td></tr>';
 
@@ -462,12 +472,11 @@ if ($id > 0 || ! empty($ref))
 
 			print '</table>';
 
+			dol_fiche_end();
 		}
 
-		dol_fiche_end();
 
-
-		if ($_GET["action"] != 'edit')
+		if ($action != 'edit')
 		{
 			/*
 			 * Actions
@@ -501,7 +510,7 @@ if ($id > 0 || ! empty($ref))
 
 			/*
 			 * Documents generes
-			*/
+			 */
 			$filename=dol_sanitizeFileName($projectstatic->ref). "/". dol_sanitizeFileName($object->ref);
 			$filedir=$conf->projet->dir_output . "/" . dol_sanitizeFileName($projectstatic->ref). "/" .dol_sanitizeFileName($object->ref);
 			$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8f72510adba..9951902ec5b 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  *
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $langs->load('projects');
 
@@ -73,22 +74,31 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
 	if (! $error)
 	{
 		$object->fetch($id, $ref);
+		$object->fetch_projet();
 
-		$object->timespent_note = $_POST["timespent_note"];
-		$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
-		$object->timespent_duration+= $_POST["timespent_durationmin"]*60;		// We store duration in seconds
-		$object->timespent_date = dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
-		$object->timespent_fk_user = $_POST["userid"];
-
-		$result=$object->addTimeSpent($user);
-		if ($result >= 0)
+		if (empty($object->projet->statut))
 		{
-			setEventMessage($langs->trans("RecordSaved"));
+			setEventMessage($langs->trans("ProjectMustBeValidatedFirst"),'errors');
+			$error++;
 		}
 		else
 		{
-			setEventMessage($langs->trans($object->error),'errors');
-			$error++;
+			$object->timespent_note = $_POST["timespent_note"];
+			$object->progress = GETPOST('progress', 'int');
+			$object->timespent_duration = $_POST["timespent_durationhour"]*60*60;	// We store duration in seconds
+			$object->timespent_duration+= $_POST["timespent_durationmin"]*60;		// We store duration in seconds
+			$object->timespent_date = dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
+			$object->timespent_fk_user = $_POST["userid"];
+			$result=$object->addTimeSpent($user);
+			if ($result >= 0)
+			{
+				setEventMessage($langs->trans("RecordSaved"));
+			}
+			else
+			{
+				setEventMessage($langs->trans($object->error),'errors');
+				$error++;
+			}
 		}
 	}
 	else
@@ -141,7 +151,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->c
 	$object->fetchTimeSpent($_GET['lineid']);
 	$result = $object->delTimeSpent($user);
 
-	if (!$result)
+	if ($result < 0)
 	{
 		$langs->load("errors");
 		setEventMessage($langs->trans($object->error),'errors');
@@ -176,17 +186,18 @@ if (! empty($project_ref) && ! empty($withproject))
 llxHeader("",$langs->trans("Task"));
 
 $form = new Form($db);
+$formother = new FormOther($db);
 $userstatic = new User($db);
 
 if ($id > 0 || ! empty($ref))
 {
 	/*
 	 * Fiche projet en mode visu
-	*/
+ 	 */
 	if ($object->fetch($id, $ref) >= 0)
 	{
 		$result=$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);
 
@@ -221,7 +232,7 @@ if ($id > 0 || ! empty($ref))
 
 			// Thirdparty
 			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-			if (! empty($projectstatic->societe->id)) print $projectstatic->societe->getNomUrl(1);
+			if (! empty($projectstatic->thirdparty->id)) print $projectstatic->thirdparty->getNomUrl(1);
 			else print '&nbsp;';
 			print '</td>';
 			print '</tr>';
@@ -248,15 +259,11 @@ if ($id > 0 || ! empty($ref))
 			print '</table>';
 
 			dol_fiche_end();
-
-			print '<br>';
 		}
 
 		$head=task_prepare_head($object);
 		dol_fiche_head($head, 'task_time', $langs->trans("Task"),0,'projecttask');
 
-		dol_htmloutput_mesg($mesg);
-
 		if ($action == 'deleteline')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
@@ -283,20 +290,6 @@ if ($id > 0 || ! empty($ref))
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td></tr>';
 
-		// Project
-		if (empty($withproject))
-		{
-			print '<tr><td>'.$langs->trans("Project").'</td><td>';
-			print $projectstatic->getNomUrl(1);
-			print '</td></tr>';
-
-			// Third party
-			print '<td>'.$langs->trans("ThirdParty").'</td><td>';
-			if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
-			else print '&nbsp;';
-			print '</td></tr>';
-		}
-
 		// Date start
 		print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
 		print dol_print_date($object->date_start,'dayhour');
@@ -308,19 +301,40 @@ if ($id > 0 || ! empty($ref))
 		print '</td></tr>';
 
 		// Planned workload
-		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">'.convertSecondToTime($object->planned_workload,'allhourmin').'</td></tr>';
+		print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td colspan="3">';
+		print convertSecondToTime($object->planned_workload,'allhourmin');
+		print '</td></tr>';
 
-		// Declared progress
+		// Progress declared
 		print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
 		print $object->progress.' %';
 		print '</td></tr>';
 
-		// Calculated progress
+		// Progress calculated
 		print '<tr><td>'.$langs->trans("ProgressCalculated").'</td><td colspan="3">';
-		if ($object->planned_workload) print round(100 * $object->duration_effective / $object->planned_workload,2).' %';
+		if ($object->planned_workload)
+		{
+			$tmparray=$object->getSummaryOfTimeSpent();
+			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration']/$object->planned_workload*100, 2).' %';
+			else print '0 %';
+		}
 		else print '';
 		print '</td></tr>';
 
+		// Project
+		if (empty($withproject))
+		{
+			print '<tr><td>'.$langs->trans("Project").'</td><td>';
+			print $projectstatic->getNomUrl(1);
+			print '</td></tr>';
+
+			// Third party
+			print '<td>'.$langs->trans("ThirdParty").'</td><td>';
+			if ($projectstatic->thirdparty->id) print $projectstatic->thirdparty->getNomUrl(1);
+			else print '&nbsp;';
+			print '</td></tr>';
+		}
+
 		print '</table>';
 
 		dol_fiche_end();
@@ -328,7 +342,7 @@ if ($id > 0 || ! empty($ref))
 
 		/*
 		 * Add time spent
-		*/
+		 */
 		if ($user->rights->projet->creer)
 		{
 			print '<br>';
@@ -345,8 +359,8 @@ if ($id > 0 || ! empty($ref))
 			print '<td width="100">'.$langs->trans("Date").'</td>';
 			print '<td>'.$langs->trans("By").'</td>';
 			print '<td>'.$langs->trans("Note").'</td>';
-			print '<td align="right">'.$langs->trans("Duration").'</td>';
-			print '<td width="80">&nbsp;</td>';
+			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
+			print '<td align="right" colspan="2">'.$langs->trans("NewTimeSpent").'</td>';
 			print "</tr>\n";
 
 			print '<tr '.$bc[false].'>';
@@ -359,23 +373,29 @@ if ($id > 0 || ! empty($ref))
 
 			// Contributor
 			print '<td class="nowrap">';
-			$restrictaddtimetocontactoftask=0;
-			if (empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS))
-			{
-				$restrictaddtimetocontactoftask=$object->getListContactId('internal');
+			print img_object('','user','class="hideonsmartphone"');
+			$contactsoftask=$object->getListContactId('internal');
+			if (count($contactsoftask)>0) {
+				$userid=$contactsoftask[0];
+				print $form->select_dolusers($userid,'userid',0,'',0,'',$contactsoftask);
+			}else {
+				print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 			}
-			print img_object('','user');
-			print $form->select_dolusers($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$restrictaddtimetocontactoftask);	// Note: If user is not allowed it will be disabled into combo list and userid not posted
 			print '</td>';
 
 			// Note
 			print '<td class="nowrap">';
-			print '<textarea name="timespent_note" cols="80" rows="'.ROWS_3.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
+			print '<textarea name="timespent_note" cols="80" rows="'.ROWS_2.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>';
 			print '</td>';
 
-			// Duration
+			// Progress declared
+			print '<td class="nowrap">';
+			print $formother->select_percent(GETPOST('progress')?GETPOST('progress'):$object->progress,'progress');
+			print '</td>';
+
+			// Duration - Time spent
 			print '<td class="nowrap" align="right">';
-			print $form->select_duration('timespent_duration',($_POST['timespent_duration']?$_POST['timespent_duration']:''),0,'text');
+			print $form->select_duration('timespent_duration', ($_POST['timespent_duration']?$_POST['timespent_duration']:''), 0, 'text');
 			print '</td>';
 
 			print '<td align="center">';
@@ -389,7 +409,7 @@ if ($id > 0 || ! empty($ref))
 
 		/*
 		 *  List of time spent
-		*/
+		 */
 		$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
 		$sql.= ", u.lastname, u.firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
@@ -422,13 +442,14 @@ if ($id > 0 || ! empty($ref))
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="updateline">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<input type="hidden" name="withproject" value="'.$withproject.'">';
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td width="100">'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("By").'</td>';
 		print '<td align="left">'.$langs->trans("Note").'</td>';
-		print '<td align="right">'.$langs->trans("Duration").'</td>';
+		print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
 		print '<td>&nbsp;</td>';
 		print "</tr>\n";
 
@@ -454,7 +475,15 @@ if ($id > 0 || ! empty($ref))
 			print '<td>';
 			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
-				print $form->select_dolusers($task_time->fk_user,'userid_line');
+				$contactsoftask=$object->getListContactId('internal');
+				if (!in_array($task_time->fk_user,$contactsoftask)) {
+					$contactsoftask[]=$task_time->fk_user;
+				}
+				if (count($contactsoftask)>0) {
+					print $form->select_dolusers($task_time->fk_user,'userid_line',0,'',0,'',$contactsoftask);
+				}else {
+					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
+				}
 			}
 			else
 			{
@@ -469,7 +498,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td align="left">';
 			if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
-				print '<textarea name="timespent_note_line" cols="80" rows="'.ROWS_3.'">'.$task_time->note.'</textarea>';
+				print '<textarea name="timespent_note_line" cols="80" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
 			}
 			else
 			{
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 3443f08788f..c36766e2777 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -65,6 +65,7 @@ if (! empty($_GET["year"])) 	$filters['year']=$_GET["year"];
 if (! empty($_GET["id"]))       $filters['id']=$_GET["id"];
 if (! empty($_GET["idfrom"]))   $filters['idfrom']=$_GET["idfrom"];
 if (! empty($_GET["idto"]))     $filters['idto']=$_GET["idto"];
+if (! empty($_GET["project"]))  $filters['project']=$_GET["project"];
 if (! empty($_GET["login"]))    $filters['login']=$_GET["login"];
 if (! empty($_GET["logina"]))   $filters['logina']=$_GET["logina"];
 if (! empty($_GET["logint"]))   $filters['logint']=$_GET["logint"];
@@ -107,6 +108,7 @@ foreach ($filters as $key => $value)
     if ($key == 'id')              $filename.='-id'.$value;
     if ($key == 'idfrom')          $filename.='-idfrom'.$value;
     if ($key == 'idto')            $filename.='-idto'.$value;
+    if ($key == 'project')         $filename.='-project'.$value;
     if ($key == 'login')	       $filename.='-login'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logind')	       $filename.='-logind'.$value;	// Affected to
diff --git a/htdocs/public/cron/index.html b/htdocs/public/cron/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 8a6bcd62e58..8ee00d83515 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -61,22 +61,22 @@ if (empty($reshook))
 {
 	$demoprofiles=array(
 		array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly',
-		'disablemodules'=>'adherent,barcode,boutique,cashdesk,categorie,don,expedition,externalsite,mailmanspip,margin,prelevement,product,stock',
+		'disablemodules'=>'adherent,barcode,cashdesk,categorie,don,expedition,externalsite,mailmanspip,margin,prelevement,product,stock',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png'),
 		array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk',
-		'disablemodules'=>'adherent,boutique,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,product,stock',
+		'disablemodules'=>'adherent,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,product,stock',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
 		array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks',
-		'disablemodules'=>'adherent,boutique,contrat,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,service',
+		'disablemodules'=>'adherent,contrat,categorie,don,externalsite,ficheinter,mailmanspip,prelevement,service',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'),
 		array('default'=>'0', 'key'=>'profdemoall','label'=>'DemoCompanyAll',
-		'disablemodules'=>'adherent,boutique,don,externalsite,mailmanspip',
+		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'),
 		array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation',
-		'disablemodules'=>'banque,barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax',
+		'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'),
 		array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2',
-		'disablemodules'=>'barcode,boutique,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax',
+		'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,facture,ficheinter,fournisseur,mailmanspip,margin,prelevement,product,projet,propal,propale,service,societe,stock,tax',
 		'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png')
 	);
 
@@ -88,7 +88,7 @@ if (empty($reshook))
 									'mailmanspip','notification','syslog','user','webservices',
 	                                // Extended modules
 	                                'memcached','numberwords','zipautofillfr');
-	$alwayshiddenuncheckedmodules=array('boutique','ftp',
+	$alwayshiddenuncheckedmodules=array('ftp',
 	                                // Extended modules
 	                                'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
 	                                'ovh','phenix','phpsysinfo','pibarcode','postnuke','selectbank','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
@@ -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%);
 
 }
 </style>
diff --git a/htdocs/public/emailing/index.html b/htdocs/public/emailing/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index d88e87c2d12..e672a6d59d3 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -126,10 +126,10 @@ if ($result)
 	print '<td><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=firstname">'.$langs->trans("Firstname").'</a>';
 	print ' <a href="'.$_SERVER['PHP_SELF'].'?page='.$page.'&sortorder=ASC&sortfield=lastname">'.$langs->trans("Lastname").'</a>';
 	print ' / <a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=societe">'.$langs->trans("Company").'</a></td>'."\n";
-	//print_liste_field_titre($langs->trans("DateToBirth"),"public_list.php","birth",'',$param,$sortfield,$sortorder); // est-ce nécessaire ??
-	print_liste_field_titre($langs->trans("EMail"),"public_list.php","email",'',$param,$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Zip"),"public_list.php","zip","",$param,$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Town"),"public_list.php","town","",$param,$sortfield,$sortorder);
+	//print_liste_field_titre($langs->trans("DateToBirth"), $_SERVER["PHP_SELF"],"birth",'',$param,$sortfield,$sortorder); // est-ce nécessaire ??
+	print_liste_field_titre($langs->trans("EMail"), $_SERVER["PHP_SELF"],"email",'',$param,$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Zip"), $_SERVER["PHP_SELF"],"zip","",$param,$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Town"), $_SERVER["PHP_SELF"],"town","",$param,$sortfield,$sortorder);
 	print "<td>".$langs->trans("Photo")."</td>\n";
 	print "</tr>\n";
 
@@ -140,7 +140,6 @@ if ($result)
 		$var=!$var;
 		print "<tr ".$bc[$var].">";
 		print '<td><a href="public_card.php?id='.$objp->rowid.'">'.dolGetFirstLastname($obj->firstname, $obj->lastname).($objp->societe?' / '.$objp->societe:'').'</a></td>'."\n";
-		//print "<td>$objp->birth</td>\n"; // est-ce nécessaire ??
 		print '<td>'.$objp->email.'</td>'."\n";
 		print '<td>'.$objp->zip.'</td>'."\n";
 		print '<td>'.$objp->town.'</td>'."\n";
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index afe685fb6ac..b28ce169230 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -870,7 +870,12 @@ if (GETPOST("source") == 'membersubscription' && $valid)
 	// Amount
 	$var=!$var;
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$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 ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank">'.$langs->trans("SeeHere").'</a>';
+		print ')';
+	}
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
 	if (empty($amount) || ! is_numeric($amount))
 	{
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 6dbb6bccca4..6725c776cd4 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -2,18 +2,25 @@
 define("NOLOGIN",1);		// This means this output page does not require to be logged.
 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))
+require '../../main.inc.php';
+if ($_SERVER['HTTP_HOST'] != 'localhost')
 {
-	print "Page available onto dev environment only";
+	print "Page available only with url  http://localhost/...";
 	exit;
 }
-?>
+$usedolheader=0;	// 1 = Test inside a dolibarr page, 0 = Use hard coded header
 
+
+// HEADER
+//--------
+
+if (empty($usedolheader))
+{
+	header("Content-type: text/html; charset=UTF8");
+?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-
 <head>
 <meta name="robots" content="noindex,nofollow" />
 <meta name="author" content="Dolibarr Development Team">
@@ -22,57 +29,78 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL))
 <!-- Includes for JQuery (Ajax library) -->
 <link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/css/smoothness/jquery-ui-latest.custom.css" />
 <link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/css/jquery.dataTables.css" />
+<?php if ($_GET["dol_use_jmobile"] == 1) { ?>
 <link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" />
-<link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php?dol_use_jmobile=1&dol_optimize_smallscreen=1" />
+<?php } ?>
+<link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php<?php echo ($_GET["dol_use_jmobile"] == 1)?'?dol_use_jmobile=1&dol_optimize_smallscreen=1':''; ?>" />
 <!-- Includes JS for JQuery -->
 <script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery-latest.min.js"></script>
 <script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js"></script>
 <script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/js/jquery.dataTables.js"></script>
-<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>
+<?php if ($_GET["dol_use_jmobile"] == 1) { ?>
+<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>--
+<?php } ?>
 </head>
 
+<body style="padding: 10px;">
 
-
-<body style="margin: 4px;">
 <div data-role="page">
-<br>
-This page is a sample of page using tables. To make test with<br>
-- css (edit page to change)<br>
-- jmobile (edit page to enable/disable)<br>
+
+<?php
+}
+else
+{
+	llxHeader();
+}
+
+
+// CONTENT
+//---------
+?>
+
+<h1>
+This page is a sample of page using tables. It is designed to make test with<br>
+- css (edit page to change to test another css)<br>
+- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)<br>
 - dataTables<br>
 - tablednd<br>
-<br>
+</h1>
+
+<br><hr><br>Example 0a : Table with div+div+div containg a select that should be overflowed and truncated => Use this to align text or form<br>
 
 
-Example 0a : Table with div+div+div containg a select that should be overflowed and truncated<br>
 <div class="tagtable centpercent">
 	<div class="tagtr">
-	<div class="tagtd" style="overflow: hidden; white-space: nowrap; max-width: 100px;"> <!-- If you remove max-width, the jmobile overflow does not work -->
+	<div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
 	<select name="hidedetails"><option>aaaaaaaaaaaaaaafd sf sf gfd gfds fsd  gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa</option><option>gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs  gdfdf gd</option></select>
 	</div>
-	<div class="tagtd" style="overflow: hidden; white-space: nowrap; max-width: 100px;"> <!-- If you remove max-width, the jmobile overflow does not work -->
+	<div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
 	<select name="hidedetails"><option>aaaaaaaaaaaaaaafd sf sf gfd gfds fsd  gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa</option><option>gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs  gdfdf gd</option></select>
 	</div>
 	</div>
 </div>
-Example 0b: Table with div+form+div containg a select that should be overflowed and truncated<br>
+
+<br><hr><br>Example 0b: Table with div+form+div containg a select that should be overflowed and truncated => Use this to align text or form<br>
+
 <div class="tagtable centpercent">
 	<form action="xxx" method="POST" class="tagtr">
 	<div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
 	<select name="hidedetails"><option>aaaaaaaaaaaaaaafd sf sf gfd gfds fsd  gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa</option><option>gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs  gdfdf gd</option></select>
 	</div>
-	<div class="tagtd" style="max-width:100px; overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
+	<div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
 	<select name="hidedetails"><option>aaaaaaaaaaaaaaafd sf sf gfd gfds fsd  gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa</option><option>gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs  gdfdf gd</option></select>
 	</div>
 	</form>
 </div>
-Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated<br>
+
+<br><hr><br>Example 0c: Table with table+tr+td containg a select that should be overflowed and truncated => Use this to align text or form<br>
+
 <table class="centpercent">
     <tr>
     <td class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
 	<select name="hidedetails"><option>aaaaaaaaaaaaaaafd sf sf gfd gfds fsd  gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa</option><option>gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs  gdfdf gd</option></select>
     </td>
-    <td class="tagtd" style="max-width:100px; overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
+    <td class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;"> <!-- If you remove max-width, the jmobile overflow does not work -->
 	<select name="hidedetails"><option>aaaaaaaaaaaaaaafd sf sf gfd gfds fsd  gfd fhfg hf dhfg hg fhfgdhfgdh gh gfdhdgf h gfdh dfhg dfgh dfgh fdgh gfd hfd hfd gs fgdf gaaaa</option><option>gdfs gdf g sdfg dfg fdsg dsfg dfs gdfs gds fgs  gdfdf gd</option></select>
     </td>
     </tr>
@@ -80,14 +108,14 @@ Example 0c: Table with table+tr+td containg a select that should be overflowed a
 
 
 
-<br>
-Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd<br>
+<br><hr><br>Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this for tables that are edited forms<br><br>
+
+
 <?php
 	$tasksarray=array(1,2,3);	// To force having several lines
 	$tagidfortablednd='tablelines';
-	if (! empty($conf->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';
 ?>
-
 <div class="tagtable centpercent" id="tablelines">
     <div class="tagtr liste_titre">
         <div class="tagtd">line3<input type="hidden" name="cartitem" value="3"></div>
@@ -124,19 +152,48 @@ Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tag
 
 
 
-<br><br>
+<br><hr><br>Example 2 : Table using tags: table/thead/tbody/tr/td + dataTable => Use this for long result tables<br>
 
 
 
-Example 2 : Table using tags: table/thead/tbody/tr/td + dataTable<br>
-
 <script type="text/javascript">
 $(document).ready(function(){
-    $('#idtableexample2').dataTable();
+    $('#idtableexample2').dataTable( {
+		"sPaginationType": "full_numbers",
+		"aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "Tous"]],
+		"oLanguage": {
+			"sLengthMenu": "Voir _MENU_ lignes",
+			"sSearch": "Recherche:",
+			"sZeroRecords": "Aucune ligne &agrave; afficher",
+			"sInfoEmpty": "Aucune ligne &agrave; afficher",
+			"sInfoFiltered": "(Filtrer sur _MAX_ Total de lignes)",
+			"sInfo": "Afficher _START_ &agrave; _END_ sur les _TOTAL_ lignes &agrave; afficher",
+			"oPaginate": {
+				"sFirst": "Début",
+				"sLast": "Fin",
+				"sPrevious": "Précédent",
+				"sNext": "Suivant"
+			}
+		},
+		"aaSorting": [[0,'desc']],
+		"sDom": 'T<"clear">lfrtip',
+/* To get flash tools
+ 		"oTableTools": {
+			"sSwfPath": "<?php echo DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extras/TableTools/swf/copy_csv_xls_pdf.swf'; ?>"
+		}
+*/
+/* To use in ajax mode
+		"bProcessing": true,	// Show	"processing message"
+		"bServerSide": true,
+		"bJQueryUI": true,
+		"sAjaxSource": "../ajaxlist.php"
+*/
+    })
 });
 
+
 /*
-// counts total number of td in a head so that we can can use it for label extraction
+// counts total number of td in a head so that we can use it for label extraction
 var head_col_count =  $('xxxthead td').size();
 // loop which replaces td
 for ( i=0; i <= head_col_count; i++ )  {
@@ -176,7 +233,7 @@ $('xxxth').replaceWith(
 */
 </script>
 
-<table id="idtableexample2">
+<table id="idtableexample2" class="centpercent">
 	<thead>
     <tr>
         <th>snake</th>
@@ -247,28 +304,31 @@ $('xxxth').replaceWith(
     </tr>
     </tbody>
 </table>
-
-
-<br><br>
-
-
-
 <br>
-Example 3 : Standard table<br>
+
+
+<br><hr><br>Example 3 : Standard table => Use this if you need the drag and drop for lines<br>
+
 <?php
 	$tasksarray=array(1,2,3);	// To force having several lines
 	$tagidfortablednd='tablelines3';
-	if (! empty($conf->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';
 ?>
-
 <table class="tagtable centpercent centpercent" id="tablelines3">
-<tr class="liste_titre"><td>title1</td><td class="tdlineupdown">title2</td></tr>
+<tr class="liste_titre"><td>title1</td><td>title2</td></tr>
 <tr class="pair"><td class="pair">a1</td><td class="tdlineupdown pair">b1</td></tr>
 <tr class="impair"><td class="impair">a2</td><td class="tdlineupdown impair">b2</td></tr>
 </table>
 <br>
 
 
+<?php
+if (! empty($usedolheader))
+{
+	llxFooter();
+} else { ?>
 </div>
 </body>
+<?php } ?>
+
 </html>
\ No newline at end of file
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 126c9723fa7..c600e9b0acd 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -1,48 +1,31 @@
 <?php
-define("NOLOGIN",1);		// This means this output page does not require to be logged.
+//define("NOLOGIN",1);		// This means this output page does not require to be logged.
 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+define('REQUIRE_JQUERY_MULTISELECT','select2');
 
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if (empty($conf->global->MAIN_FEATURES_LEVEL))
+if ($_SERVER['HTTP_HOST'] != 'localhost')
 {
-	print "Page available onto dev environment only";
+	print "Page available only with url  http://localhost/...";
 	exit;
 }
+
+
+llxHeader();
+
 ?>
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-<meta name="robots" content="noindex,nofollow" />
-<meta name="author" content="Dolibarr Development Team">
-<link rel="shortcut icon" type="image/x-icon" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/img/favicon.ico"/>
-<title>Test page</title>
-<!-- Includes for JQuery (Ajax library) -->
-<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/css/smoothness/jquery-ui-latest.custom.css" />
-<link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/css/jquery.dataTables.css" />
-<!-- <link rel="stylesheet" type="text/css" href="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" /> -->
-<!-- <link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php?dol_use_jmobile=1" /> -->
-<link rel="stylesheet" type="text/css" title="default" href="<?php echo DOL_URL_ROOT ?>/theme/eldy/style.css.php?dol_use_jmobile=0" />
-<!-- Includes JS for JQuery -->
-<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery-latest.min.js"></script>
-<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js"></script>
-<script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/datatables/js/jquery.dataTables.js"></script>
-<!-- <script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script> -->
-</head>
-
-
-
-<body style="margin: 4px;">
-<div data-role="page">
-<br>
-This page is a sample of page using html methods.<br>
+<h1>
+This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with<br>
+- css (edit page to change to test another css)<br>
+- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)<br>
 <br>
+</h1>
 
 <!--  Output to test html.form.class.php -->
-<?php 
+<?php
 $form=new Form($db);
 
 // Test1: form->select_date using tzuser date
@@ -64,8 +47,22 @@ print '<br><br>'."\n";
 print "Test 3: We must have here 1970-01-01 00:00:00 selected (fields are mandatory)<br>\n";
 $form->select_date(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0);
 
-?>
+print '<br><br>'."\n";
 
-</div>
-</body>
-</html>
\ No newline at end of file
+// Test4: a multiselect
+print "Test 4: a multiselect<br>\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 '<br><br>'."\n";
+
+// Test5: a select
+print "Test 5: a select<br>\n";
+$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
+$selected=3;
+print $form->selectarray('testselect', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"');
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
old mode 100755
new mode 100644
index fde152b6185..679644ac9e0
--- 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 '</table>';
 
-	echo '<div style="text-align: center">',
-	'	<input type="submit"  class="button" name="" value="'.$langs->trans('Save').'" />',
+	echo '<br><div align="center">',
+	'<input type="submit" class="button" name="add" value="'.$langs->trans('Save').'" />',
+	'&nbsp;',
+	'<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" />',
 	'</div>';
 
 	print '</form>';
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
old mode 100755
new mode 100644
index 38562557e3a..33a27796aaf
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -57,9 +57,10 @@ if( ! $user->rights->resource->read)
 
 $object = new Resource($db);
 
-$hookmanager->initHooks(array('resource_card'));
+$hookmanager->initHooks(array('resource_card','globalcard'));
 $parameters=array('resource_id'=>$id);
 $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');
 
 
 /*******************************************************************
@@ -86,7 +87,7 @@ if ($action == 'update' && ! $_POST["cancel"]  && $user->rights->resource->write
 			$object->ref          			= $ref;
 			$object->description  			= $description;
 			$object->fk_code_type_resource  = $fk_code_type_resource;
-		
+
 			$result=$object->update($user);
 			if ($result > 0)
 			{
@@ -98,9 +99,9 @@ if ($action == 'update' && ! $_POST["cancel"]  && $user->rights->resource->write
 				setEventMessage('<div class="error">'.$object->error.'</div>');
 				$action='edit';
 			}
-			
+
 		}
-		else 
+		else
 		{
 			setEventMessage($object->error,'errors');
 			$action='edit';
@@ -138,7 +139,7 @@ if ( $object->fetch($id) > 0 )
 
 		/*---------------------------------------
 		 * Edit object
-		*/
+		 */
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="update">';
@@ -149,13 +150,13 @@ if ( $object->fetch($id) > 0 )
 		// Ref
 		print '<tr><td width="20%">'.$langs->trans("ResourceFormLabel_ref").'</td>';
 		print '<td><input size="12" name="ref" value="'.(GETPOST('ref') ? GETPOST('ref') : $object->ref).'"></td></tr>';
-		
+
 		// Type
 		print '<tr><td width="20%">'.$langs->trans("ResourceType").'</td>';
 		print '<td>';
-		$ret = $formresource->select_types_resource($object->fk_code_type_resource,'fk_code_type_resource','',2);		
+		$ret = $formresource->select_types_resource($object->fk_code_type_resource,'fk_code_type_resource','',2);
 		print '</td></tr>';
-		
+
 		// Description
 		print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
 		print '<td>';
@@ -170,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);
@@ -194,7 +195,7 @@ if ( $object->fetch($id) > 0 )
 		print $object->type_label;
 		print '</td>';
 		print '</tr>';
-		
+
 		// Description
 		print '<tr>';
 		print '<td>' . $langs->trans("ResourceFormLabel_description") . '</td>';
@@ -215,8 +216,8 @@ if ( $object->fetch($id) > 0 )
 	$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))
+	{
 		if ($action != "edit" )
 		{
 			// Edit resource
@@ -227,9 +228,9 @@ if ( $object->fetch($id) > 0 )
 				print '</div>';
 			}
 		}
-		if ($action != "delete" )
+		if ($action != "delete" && $action != "edit")
 		{
-		    // Edit resource
+		    // Delete resource
 		    if($user->rights->resource->delete)
 		    {
 		        print '<div class="inline-block divButAction">';
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index d0f8be573f5..ca01963e30b 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -89,7 +89,7 @@ class FormResource
 
     	if ($resourcestat)
     	{
-    		if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
+    		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
     		{
     			//$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
     			$out.= ajax_combobox($htmlname, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
diff --git a/htdocs/resource/class/index.html b/htdocs/resource/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php
index d9ad13f83b1..c75f37b00c2 100644
--- a/htdocs/resource/class/resource.class.php
+++ b/htdocs/resource/class/resource.class.php
@@ -106,7 +106,7 @@ class Resource extends CommonObject
 
     	$this->db->begin();
 
-    	dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::create", LOG_DEBUG);
     	$resql=$this->db->query($sql);
     	if (! $resql) {
     		$error++; $this->errors[]="Error ".$this->db->lasterror();
@@ -168,7 +168,7 @@ class Resource extends CommonObject
     	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_resource as ty ON ty.code=t.fk_code_type_resource";
     	$sql.= " WHERE t.rowid = ".$this->db->escape($id);
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
     	$resql=$this->db->query($sql);
     	if ($resql)
     	{
@@ -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;
@@ -225,7 +225,7 @@ class Resource extends CommonObject
 
     	$this->db->begin();
 
-    	dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::update", LOG_DEBUG);
     	$resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -285,7 +285,7 @@ class Resource extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."element_resources as t";
     	$sql.= " WHERE t.rowid = ".$this->db->escape($id);
 
-    	dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
     	$resql=$this->db->query($sql);
     	if ($resql)
     	{
@@ -315,7 +315,6 @@ class Resource extends CommonObject
     	else
     	{
     		$this->error="Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
     		return -1;
     	}
     }
@@ -333,41 +332,35 @@ class Resource extends CommonObject
 
         $error=0;
 
+        if (! $notrigger)
+        {
+            // Call trigger
+            $result=$this->call_trigger('RESOURCE_DELETE',$user);
+            if ($result < 0) return -1;
+            // End call triggers
+        }
+
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."resource";
         $sql.= " WHERE rowid =".$rowid;
 
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         if ($this->db->query($sql))
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
             $sql.= " WHERE element_type='resource' AND resource_id ='".$this->db->escape($rowid)."'";
-            dol_syslog(get_class($this)."::delete sql=".$sql);
+            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
             if ($this->db->query($sql))
             {
-                if (! $notrigger)
-                {
-                    // Call triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('RESOURCE_DELETE',$this,$user,$langs,$conf);
-                    if ($result < 0) {
-                        $error++; $this->errors=$interface->errors;
-                    }
-                    // End call triggers
-                }
-
                 return 1;
             }
             else {
                 $this->error=$this->db->lasterror();
-                dol_syslog(get_class($this)."::delete_resource error=".$this->error, LOG_ERR);
                 return -1;
             }
         }
         else
         {
             $this->error=$this->db->lasterror();
-            dol_syslog(get_class($this)."::delete_resource error=".$this->error, LOG_ERR);
             return -1;
         }
     }
@@ -395,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)){
@@ -409,9 +402,9 @@ 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 sql=".$sql, LOG_DEBUG);
+    	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 
     	$resql=$this->db->query($sql);
     	if ($resql)
@@ -469,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)){
@@ -483,8 +476,9 @@ class Resource extends CommonObject
    			}
    		}
    		$sql.= " GROUP BY t.rowid";
-   		$sql.= " ORDER BY $sortfield $sortorder " . $this->db->plimit($limit+1,$offset);
-   		dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG);
+    	$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);
    		if ($resql)
@@ -554,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)){
@@ -568,8 +562,9 @@ class Resource extends CommonObject
     		}
     	}
     	$sql.= " GROUP BY t.resource_id";
-    	$sql.= " ORDER BY " . $sortfield . "  " . $sortorder . " " . $this->db->plimit($limit+1,$offset);
-    	dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG);
+    	$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);
     	if ($resql)
@@ -640,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;
     	}
 
@@ -702,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;
@@ -729,7 +724,7 @@ class Resource extends CommonObject
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
     	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
@@ -737,15 +732,10 @@ class Resource extends CommonObject
 		{
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action calls a trigger.
-
-	            // Call triggers
-	            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            $interface=new Interfaces($this->db);
-	            $result=$interface->run_triggers('RESOURCE_MODIFY',$this,$user,$langs,$conf);
-	            if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            // End call triggers
+                // Call trigger
+                $result=$this->call_trigger('RESOURCE_MODIFY',$user);
+                if ($result < 0) $error++;
+                // End call triggers
 	    	}
 		}
 
@@ -784,7 +774,7 @@ class Resource extends CommonObject
 	    	$sql.=" AND resource_type LIKE '%".$resource_type."%'";
 	    $sql .= ' ORDER BY resource_type';
 
-	    dol_syslog(get_class($this)."::getElementResources sql=".$sql);
+	    dol_syslog(get_class($this)."::getElementResources", LOG_DEBUG);
 	    $resql = $this->db->query($sql);
 	    if ($resql)
 	    {
@@ -837,7 +827,7 @@ class Resource extends CommonObject
     	$sql.= " FROM ".MAIN_DB_PREFIX."c_type_resource";
     	$sql.= " WHERE active > 0";
     	$sql.= " ORDER BY rowid";
-    	dol_syslog(get_class($this)."::load_cache_code_type_resource sql=".$sql,LOG_DEBUG);
+    	dol_syslog(get_class($this)."::load_cache_code_type_resource", LOG_DEBUG);
     	$resql = $this->db->query($sql);
     	if ($resql)
     	{
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index c5329edd1f3..d50c9a4ec6f 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -1,6 +1,5 @@
 <?php
-/* Module to manage locations, buildings, floors and rooms into Dolibarr ERP/CRM
- * Copyright (C) 2013	Jean-François Ferry	<jfefe@aternatik.fr>
+/* Copyright (C) 2013	Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * 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);
@@ -138,11 +138,12 @@ if ($action == 'confirm_delete_linked_resource' && $user->rights->resource->dele
 
 $parameters=array('resource_id'=>resource_id);
 $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');
 
 
 $parameters=array('resource_id'=>$resource_id);
 $reshook=$hookmanager->executeHooks('getElementResources',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 /***************************************************
@@ -250,9 +251,6 @@ else
 
 	foreach ($object->available_resources as $modresources => $resources)
 	{
-		$langs->load($resources);
-		//print '<h2>'.$modresources.'</h2>';
-
 		$resources=(array) $resources;	// To be sure $resources is an array
 		foreach($resources as $resource_obj)
 		{
@@ -300,7 +298,7 @@ else
 			{
 				print '<div class="tabsAction">';
 				print '<div class="inline-block divButAction">';
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?mode=add&resource_type='.$resource_obj.'&element='.$element.'&element_id='.$element_id.'">Add resource</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?mode=add&resource_type='.$resource_obj.'&element='.$element.'&element_id='.$element_id.'">'.$langs->trans('AddResource').'</a>';
 				print '</div>';
 				print '</div>';
 			}
diff --git a/htdocs/resource/img/index.html b/htdocs/resource/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/resource/index.html b/htdocs/resource/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 3fde7b52999..ab70bc9a338 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -1,6 +1,5 @@
 <?php
-/* Module to manage resources into Dolibarr ERP/CRM
- * Copyright (C) 2013-2014	Jean-François Ferry	<jfefe@aternatik.fr>
+/* Copyright (C) 2013-2014	Jean-François Ferry	<jfefe@aternatik.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,9 +52,6 @@ $object = new Resource($db);
 
 $hookmanager->initHooks(array('resource_list'));
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
 if (empty($sortorder)) $sortorder="DESC";
 if (empty($sortfield)) $sortfield="t.rowid";
 if (empty($arch)) $arch = 0;
@@ -72,12 +68,20 @@ $pagenext = $page + 1;
 if( ! $user->rights->resource->read)
 	accessforbidden();
 
-/***************************************************
- * VIEW
-*
-* Put here all code to build page
-****************************************************/
 
+/*
+ * Action
+ */
+
+$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');
+
+
+
+/*
+ * View
+ */
 $pagetitle=$langs->trans('ResourcePageIndex');
 llxHeader('',$pagetitle,'');
 
@@ -111,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 '</tr>';
 
 	foreach ($object->lines as $resource)
@@ -123,20 +127,25 @@ else
 			$style='style="background: orange;"';
 
 		print '<tr '.$bc[$var].' '.$style.'><td>';
-		print $resource->id;
+		print '<a href="./card.php?id='.$resource->id.'">'.$resource->id.'</a>';
 		print '</td>';
 
 		print '<td>';
 		print $resource->ref;
 		print '</td>';
-		
+
 		print '<td>';
 		print $resource->type_label;
 		print '</td>';
 
-		print '<td>';
-		print '<a href="card.php?id='.$resource->id.'">'.$langs->trans('View').'</a> ';
-		print '<a href="card.php?action=edit&id='.$resource->id.'">'.$langs->trans('Edit').'</a>';
+		print '<td align="center">';
+		print '<a href="./card.php?action=update&id='.$resource->id.'">';
+		print img_edit();
+		print '</a>';
+		print '&nbsp;';
+		print '<a href="./card.php?action=delete&id='.$resource->id.'">';
+		print img_delete();
+		print '</a>';
 		print '</td>';
 
 		print '</tr>';
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index c4712817955..a0b72c80aea 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -35,7 +35,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
@@ -68,7 +68,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$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 5bb227dde46..f17a9d9f298 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -77,14 +77,14 @@ if ($action == 'updateoptions')
 		if (! $res > 0) $error++;
 		if (! $error)
 	    {
-	        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		    setEventMessage($langs->trans("SetupSaved"));
 	    }
 	    else
 	    {
-	        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		    setEventMessage($langs->trans("Error"), 'errors');
 		}
 	}
-	
+
 	if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
 	{
 		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
@@ -92,11 +92,11 @@ if ($action == 'updateoptions')
 		if (! $res > 0) $error++;
 		if (! $error)
 		{
-			$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+			setEventMessage($langs->trans("SetupSaved"));
 		}
 		else
 		{
-			$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+			setEventMessage($langs->trans("Error"), 'errors');
 		}
 	}
 }
@@ -121,12 +121,12 @@ if ($action == 'setModuleOptions')
 	if (! $error)
     {
         $db->commit();
-        $mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	    setEventMessage($langs->trans("SetupSaved"));
     }
     else
     {
         $db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	    setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -184,7 +184,7 @@ if ($action == 'setdoc')
 	$sql.= ($label?"'".$db->escape($label)."'":'null').", ";
 	$sql.= (! empty($scandir)?"'".$db->escape($scandir)."'":"null");
 	$sql.= ")";
-    dol_syslog("societe.php ".$sql);
+    dol_syslog("societe.php", LOG_DEBUG);
 	$result2=$db->query($sql);
 	if ($result1 && $result2)
 	{
@@ -192,7 +192,6 @@ if ($action == 'setdoc')
 	}
 	else
 	{
-        dol_syslog("societe.php ".$db->lasterror(), LOG_ERR);
 	    $db->rollback();
 	}
 }
@@ -221,11 +220,11 @@ if ($action=="setaddrefinlist") {
 	if (! $res > 0) $error++;
 	if (! $error)
 	{
-		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+		setEventMessage($langs->trans("SetupSaved"));
 	}
 	else
 	{
-		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+		setEventMessage($langs->trans("Error"), 'errors');
 	}
 }
 
@@ -299,9 +298,6 @@ $head = societe_admin_prepare_head(null);
 
 dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company');
 
-dol_htmloutput_mesg($mesg);
-
-
 $dirsociete=array_merge(array('/core/modules/societe/'),$conf->modules_parts['societe']);
 
 // Module to manage customer/supplier code
@@ -348,7 +344,7 @@ foreach ($dirsociete as $dirroot)
 
     			$var = !$var;
     			print '<tr '.$bc[$var].'>'."\n";
-    			print '<td width="140">'.$modCodeTiers->nom.'</td>'."\n";
+    			print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
     			print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
     			print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
 
@@ -424,7 +420,7 @@ foreach ($dirsociete as $dirroot)
     			$var = !$var;
 
     			print '<tr '.$bc[$var].'>';
-    			print '<td>'.$modCodeCompta->nom."</td><td>\n";
+    			print '<td>'.$modCodeCompta->name."</td><td>\n";
     			print $modCodeCompta->info($langs);
     			print '</td>';
     			print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
@@ -573,7 +569,7 @@ foreach ($dirsociete as $dirroot)
 					}
 					$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
 					$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
-					
+
 					print '<td align="center" class="nowrap">';
 					print $form->textwithpicto('',$htmltooltip,1,0);
 					print '</td>';
@@ -636,19 +632,19 @@ while ($i < $nbofloop)
 	if ($profid[$i][1]!='-')
 	{
 		$var = !$var;
-	
+
 		print '<tr '.$bc[$var].'>';
 		print '<td>'.$profid[$i][0]."</td><td>\n";
 		print $profid[$i][1];
 		print '</td>';
-	
+
 		$idprof_unique ='SOCIETE_IDPROF'.($i+1).'_UNIQUE';
 		$idprof_mandatory ='SOCIETE_IDPROF'.($i+1).'_MANDATORY';
 		$idprof_invoice_mandatory ='SOCIETE_IDPROF'.($i+1).'_INVOICE_MANDATORY';
 		$verif=(empty($conf->global->$idprof_unique)?false:true);
 		$mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
 		$invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true);
-	
+
 		if ($verif)
 		{
 			print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.($i+1).'&status=0">';
@@ -661,7 +657,7 @@ while ($i < $nbofloop)
 			print img_picto($langs->trans("Disabled"),'switch_off');
 			print '</a></td>';
 		}
-		
+
 		if ($mandatory)
 		{
 			print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.($i+1).'&status=0">';
@@ -674,7 +670,7 @@ while ($i < $nbofloop)
 			print img_picto($langs->trans("Disabled"),'switch_off');
 			print '</a></td>';
 		}
-		
+
 		if ($invoice_mandatory)
 		{
 			print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.($i+1).'&status=0">';
@@ -687,7 +683,7 @@ while ($i < $nbofloop)
 			print img_picto($langs->trans("Disabled"),'switch_off');
 			print '</a></td>';
 		}
-		
+
 		print "</tr>\n";
 	}
 	$i++;
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 5ca23df284a..b6485e0d489 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -36,7 +36,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 1ad1eeceed5..8d731875442 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -47,8 +47,7 @@ $hookmanager->initHooks(array('agendathirdparty'));
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
-
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 
@@ -160,7 +159,7 @@ if ($socid)
     {
     	if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
     	{
-        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$socid.'">'.$langs->trans("AddAction").'</a>';
+        	print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$socid.'">'.$langs->trans("AddAction").'</a>';
     	}
     	else
     	{
@@ -172,7 +171,22 @@ if ($socid)
 
     print '<br>';
 
-    print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
+    $objthirdparty=$soc;
+    $objcon=new stdClass();
+
+    $out='';
+    $permok=$user->rights->agenda->myactions->create;
+    if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+    {
+        $out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+        if (get_class($objthirdparty) == 'Societe') $out.='&amp;socid='.$objthirdparty->id;
+        $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+    	$out.=$langs->trans("AddAnAction").' ';
+    	$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+    	$out.="</a>";
+	}
+
+    print load_fiche_titre($langs->trans("ActionsOnCompany"),$out,'');
 
     // List of todo actions
     show_actions_todo($conf,$langs,$db,$soc);
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 03d6091f6c0..96ac9f0154b 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *       \file       htdocs/product/ajax/products.php
+ *       \file       htdocs/product/ajax/company.php
  *       \brief      File to return Ajax response on product list request
  */
 
diff --git a/htdocs/societe/ajax/index.html b/htdocs/societe/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index de116453cf2..b3565a2ca26 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -81,10 +81,10 @@ if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn'))
 		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
 		$sql.=")";
 	}
-	if (! empty($_GET["filter"])) $sql.= " AND ".$_GET["filter"]; // Add other filters
+	if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters
 	$sql.= " ORDER BY nom ASC";
 
-	//dol_syslog("ajaxcompanies sql=".$sql);
+	//dol_syslog("ajaxcompanies", LOG_DEBUG);
 	$resql=$db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php
index 78018a22035..7eb22035d6b 100644
--- a/htdocs/societe/ajaxcountries.php
+++ b/htdocs/societe/ajaxcountries.php
@@ -31,7 +31,7 @@ if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
 
 require '../main.inc.php';
 
-$country=GETPOST('pays', 'alpha');
+$country=GETPOST('country', 'alpha');
 
 
 /*
@@ -49,16 +49,16 @@ print '<!-- Ajax page called with url '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY
 
 dol_syslog(join(',',$_POST));
 
-// Generation liste des pays
+// Generate list of countries
 if (! empty($country))
 {
 	global $langs;
 	$langs->load("dict");
 
-	$sql = "SELECT rowid, code, libelle, active";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
-	$sql.= " WHERE active = 1 AND libelle LIKE '%" . $db->escape(utf8_decode($country)) . "%'";
-	$sql.= " ORDER BY libelle ASC";
+	$sql = "SELECT rowid, code, label, active";
+	$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
+	$sql.= " WHERE active = 1 AND label LIKE '%" . $db->escape(utf8_decode($country)) . "%'";
+	$sql.= " ORDER BY label ASC";
 
 	$resql=$db->query($sql);
 	if ($resql)
@@ -68,7 +68,7 @@ if (! empty($country))
 		{
 			print '<li>';
 			// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
-			print ($country->code && $langs->trans("Country".$country->code)!="Country".$country->code?$langs->trans("Country".$country->code):($country->libelle!='-'?$country->libelle:'&nbsp;'));
+			print ($country->code && $langs->trans("Country".$country->code)!="Country".$country->code?$langs->trans("Country".$country->code):($country->label!='-'?$country->label:'&nbsp;'));
 			print '<span class="informal" style="display:none">'.$country->rowid.'-idcache</span>';
 			print '</li>';
 		}
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 39f0dc761f8..b94262bbb52 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -242,14 +242,14 @@ abstract class ActionsCardCommon
 
                         if ( $this->object->client == 1 )
                         {
-                            header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=".$this->object->id);
+                            header("Location: ".DOL_URL_ROOT."/comm/card.php?socid=".$this->object->id);
                             return;
                         }
                         else
                         {
                             if (  $this->object->fournisseur == 1 )
                             {
-                                header("Location: ".DOL_URL_ROOT."/fourn/fiche.php?socid=".$this->object->id);
+                                header("Location: ".DOL_URL_ROOT."/fourn/card.php?socid=".$this->object->id);
                                 return;
                             }
                             else
@@ -305,7 +305,7 @@ abstract class ActionsCardCommon
 
             if ($result >= 0)
             {
-                header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->nom."");
+                header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->name."");
                 exit;
             }
             else
@@ -705,4 +705,3 @@ abstract class ActionsCardCommon
     }
 
 }
-
diff --git a/htdocs/societe/canvas/company/index.html b/htdocs/societe/canvas/company/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/canvas/company/index.php b/htdocs/societe/canvas/company/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/societe/canvas/company/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/societe/canvas/company/tpl/index.html b/htdocs/societe/canvas/company/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/canvas/company/tpl/index.php b/htdocs/societe/canvas/company/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/societe/canvas/company/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/societe/canvas/index.html b/htdocs/societe/canvas/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/canvas/individual/index.html b/htdocs/societe/canvas/individual/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/canvas/individual/index.php b/htdocs/societe/canvas/individual/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/societe/canvas/individual/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/societe/canvas/individual/tpl/index.html b/htdocs/societe/canvas/individual/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/canvas/individual/tpl/index.php b/htdocs/societe/canvas/individual/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/societe/canvas/individual/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/societe/checkvat/index.html b/htdocs/societe/checkvat/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/checkvat/index.php b/htdocs/societe/checkvat/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/societe/checkvat/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 174afbe5671..7b36423cb61 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -112,12 +112,9 @@ class Address
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 
-					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->nom);
-				}
-				else
-				{
-					dol_syslog(get_class($this)."::create echec insert sql=$sql");
+					$this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);
 				}
+
 				$this->db->rollback();
 				return -2;
 			}
@@ -179,7 +176,7 @@ class Address
 		$this->fax			= preg_replace("/\./","",$this->fax);
 		$this->note			= trim($this->note);
 
-		$result = $this->verify();		// Verifie que nom et label obligatoire
+		$result = $this->verify();		// Verifie que name et label obligatoire
 
 		if ($result >= 0)
 		{
@@ -200,7 +197,7 @@ class Address
 			if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
 			$sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $this->db->escape($id) ."'";
 
-			dol_syslog(get_class($this)."::Update sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::Update", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -219,7 +216,6 @@ class Address
 				else
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this)."::Update error sql=".$sql, LOG_ERR);
 					$result=-2;
 				}
 				$this->db->rollback();
@@ -236,11 +232,11 @@ 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;
 
-		$sql = 'SELECT rowid, nom, client, fournisseur';
+		$sql = 'SELECT rowid, nom as name, client, fournisseur';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe';
 		$sql .= ' WHERE rowid = '.$socid;
 
@@ -251,7 +247,7 @@ class Address
 			{
 				$obj = $this->db->fetch_object($resqlsoc);
 
-				$this->socname 		= $obj->nom;
+				$this->socname 		= $obj->name;
 				$this->socid		= $obj->rowid;
 				$this->id			= $obj->rowid;
 				$this->client		= $obj->client;
@@ -267,9 +263,9 @@ class Address
 			{
 				$sql = 'SELECT a.rowid as id, a.label, a.name, a.address, a.datec as date_creation, a.tms as date_modification, a.fk_soc';
 				$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.phone, a.fax';
-				$sql .= ', p.code as country_code, p.libelle as country';
+				$sql .= ', c.code as country_code, c.label as country';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
-				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
+				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON a.fk_pays = c.rowid';
 				$sql .= ' WHERE a.fk_soc = '.$this->socid;
 
 				$resql=$this->db->query($sql);
@@ -318,7 +314,6 @@ class Address
 		}
 		else
 		{
-			dol_syslog(get_class($this).'::Fetch '.$this->db->error(), LOG_ERR);
 			$this->error=$this->db->error();
 		}
 	}
@@ -330,16 +325,16 @@ 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;
 
 		$sql = 'SELECT a.rowid, a.fk_soc, a.label, a.name, a.address, a.datec as date_creation, a.tms as date_modification';
 		$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.phone, a.fax';
-		$sql .= ', p.code as country_code, p.libelle as country';
+		$sql .= ', c.code as country_code, c.label as country';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON a.fk_pays = c.rowid';
 		$sql .= ' WHERE a.rowid = '.$id;
 		$resql=$this->db->query($sql);
 		if ($resql)
@@ -381,7 +376,7 @@ class Address
 		}
 		else
 		{
-			dol_syslog('Erreur Societe::Fetch echec sql='.$sql);
+			dol_syslog('Erreur Societe::Fetch echec', LOG_DEBUG);
 			dol_syslog('Erreur Societe::Fetch '.$this->db->error());
 			$this->error=$this->db->error();
 			$result = -3;
@@ -445,7 +440,7 @@ class Address
 	 */
 	function info($id)
 	{
-		$sql = "SELECT s.rowid, s.nom, datec as date_creation, tms as date_modification,";
+		$sql = "SELECT s.rowid, s.nom as name, datec as date_creation, tms as date_modification,";
 		$sql.= " fk_user_creat, fk_user_modif";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= " WHERE s.rowid = ".$id;
@@ -470,7 +465,7 @@ class Address
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
 				}
-				$this->ref			     = $obj->nom;
+				$this->ref			     = $obj->name;
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 			}
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 189556b186d..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;
@@ -227,7 +225,7 @@ class CompanyBankAccount extends Account
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
         $sql.= " WHERE rowid  = ".$this->id;
 
-        dol_syslog(get_class($this)."::delete sql=".$sql);
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if ($result) {
             return 1;
@@ -323,7 +321,7 @@ class CompanyBankAccount extends Account
     	$sql1 = "SELECT rowid as id, fk_soc  FROM ".MAIN_DB_PREFIX."societe_rib";
     	$sql1.= " WHERE rowid = ".($rib?$rib:$this->id);
 
-    	dol_syslog(get_class($this).'::setAsDefault sql='.$sql1);
+    	dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
     	$result1 = $this->db->query($sql1);
     	if ($result1)
     	{
@@ -339,12 +337,12 @@ class CompanyBankAccount extends Account
 
     			$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0 ";
     			$sql2.= "WHERE fk_soc = ".$obj->fk_soc;
-    			dol_syslog(get_class($this).'::setAsDefault sql='.$sql2);
+    			dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
     			$result2 = $this->db->query($sql2);
 
     			$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1 ";
     			$sql3.= "WHERE rowid = ".$obj->id;
-    			dol_syslog(get_class($this).'::setAsDefault sql='.$sql3);
+    			dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
     			$result3 = $this->db->query($sql3);
 
     			if (!$result2 || !$result3)
diff --git a/htdocs/societe/class/index.html b/htdocs/societe/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2cb3e634841..430d929320f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Patrick Raguin       <patrick.raguin@auguria.net>
- * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013      Alexandre Spangaro 	<alexandre.spangaro@gmail.com>
  * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
@@ -58,6 +58,7 @@ class Societe extends CommonObject
      * @deprecated Use $name instead
      */
     var $nom;
+
     var $firstname;
     var $lastname;
     var $particulier;
@@ -65,6 +66,7 @@ class Societe extends CommonObject
     var $address;
     var $zip;
     var $town;
+
     /**
      * 0=activity ceased, 1= in activity
      * @var int
@@ -196,7 +198,9 @@ class Societe extends CommonObject
 
     // Local taxes
     var $localtax1_assuj;
+    var $localtax1_value;
     var $localtax2_assuj;
+    var $localtax2_value;
 
     var $managers;
     var $capital;
@@ -330,6 +334,18 @@ class Societe extends CommonObject
      */
     var $import_key;
 
+    /**
+     * Supplier WebServices URL
+     * @var string
+     */
+    var $webservices_url;
+
+    /**
+     * Supplier WebServices Key
+     * @var string
+     */
+    var $webservices_key;
+
     var $logo;
     var $logo_small;
     var $logo_mini;
@@ -418,7 +434,7 @@ class Societe extends CommonObject
             $sql.= ", 0";
             $sql.= ", ".(! empty($this->import_key) ? "'".$this->import_key."'":"null").")";
 
-            dol_syslog(get_class($this)."::create sql=".$sql);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
             $result=$this->db->query($sql);
             if ($result)
             {
@@ -439,12 +455,10 @@ class Societe extends CommonObject
 
                 if ($ret >= 0)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('COMPANY_CREATE',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('COMPANY_CREATE',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
                 }
                 else $error++;
 
@@ -472,7 +486,6 @@ class Societe extends CommonObject
                 else
                 {
                     $this->error=$this->db->lasterror();
-                    dol_syslog(get_class($this)."::Create fails insert sql=".$sql, LOG_ERR);
                     $result=-2;
                 }
                 $this->db->rollback();
@@ -623,7 +636,7 @@ class Societe extends CommonObject
         // Clean parameters
         $this->id			= $id;
         $this->name			= $this->name?trim($this->name):trim($this->nom);
-        $this->nom			= trim($this->nom);		// TODO obsolete
+        $this->nom			= $this->name;	// For backward compatibility
         $this->ref_ext		= trim($this->ref_ext);
         $this->address		= $this->address?trim($this->address):trim($this->address);
         $this->zip			= $this->zip?trim($this->zip):trim($this->zip);
@@ -655,6 +668,9 @@ class Societe extends CommonObject
         $this->localtax1_assuj=trim($this->localtax1_assuj);
         $this->localtax2_assuj=trim($this->localtax2_assuj);
 
+        $this->localtax1_value=trim($this->localtax1_value);
+        $this->localtax2_value=trim($this->localtax2_value);
+
         $this->capital=price2num(trim($this->capital),'MT');
         if (empty($this->capital)) $this->capital = 0;
 
@@ -711,6 +727,10 @@ class Societe extends CommonObject
         	$supplier=true;
         }
 
+        //Web services
+        $this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
+        $this->webservices_key = trim($this->webservices_key);
+
         $this->db->begin();
 
         // Check name is required and codes are ok or unique.
@@ -753,6 +773,27 @@ class Societe extends CommonObject
             // Local taxes
             $sql .= ",localtax1_assuj = ".($this->localtax1_assuj!=''?"'".$this->localtax1_assuj."'":"null");
             $sql .= ",localtax2_assuj = ".($this->localtax2_assuj!=''?"'".$this->localtax2_assuj."'":"null");
+            if($this->localtax1_assuj==1)
+            {
+            	if($this->localtax1_value!='')
+            	{
+            		$sql .=",localtax1_value =".$this->localtax1_value;
+            	}
+            	else $sql .=",localtax1_value =0.000";
+
+            }
+            else $sql .=",localtax1_value =0.000";
+
+            if($this->localtax2_assuj==1)
+            {
+            	if($this->localtax2_value!='')
+            	{
+            		$sql .=",localtax2_value =".$this->localtax2_value;
+            	}
+            	else $sql .=",localtax2_value =0.000";
+
+            }
+            else $sql .=",localtax2_value =0.000";
 
             $sql .= ",capital = ".$this->capital;
 
@@ -770,6 +811,9 @@ class Societe extends CommonObject
             $sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->default_lang."'":"null");
             $sql .= ",logo = ".(! empty($this->logo)?"'".$this->logo."'":"null");
 
+            $sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
+            $sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
+
             if ($customer)
             {
                 $sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
@@ -785,7 +829,7 @@ class Societe extends CommonObject
             $sql .= " WHERE rowid = '" . $id ."'";
 
 
-            dol_syslog(get_class($this)."::Update sql=".$sql);
+            dol_syslog(get_class($this)."::Update", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -834,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'));
@@ -854,12 +900,10 @@ class Societe extends CommonObject
 
                 if (! $error && $call_trigger)
                 {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('COMPANY_MODIFY',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
+                    // Call trigger
+                    $result=$this->call_trigger('COMPANY_MODIFY',$user);
+                    if ($result < 0) $error++;
+                    // End call triggers
                 }
 
                 if (! $error)
@@ -884,9 +928,6 @@ class Societe extends CommonObject
                 }
                 else
                 {
-
-                    $this->error = $langs->trans("Error sql=".$sql);
-                    dol_syslog(get_class($this)."::Update fails update sql=".$sql, LOG_ERR);
                     $result =  -2;
                 }
                 $this->db->rollback();
@@ -931,19 +972,20 @@ class Societe extends CommonObject
         $sql .= ', s.fk_typent as typent_id';
         $sql .= ', s.fk_effectif as effectif_id';
         $sql .= ', s.fk_forme_juridique as forme_juridique_code';
+        $sql .= ', s.webservices_url, s.webservices_key';
         $sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
         $sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.tva_assuj';
-        $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax2_assuj, s.fk_prospectlevel, s.default_lang, s.logo';
+        $sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
         $sql .= ', s.outstanding_limit, s.import_key, s.canvas';
         $sql .= ', fj.libelle as forme_juridique';
         $sql .= ', e.libelle as effectif';
-        $sql .= ', p.code as country_code, p.libelle as country';
+        $sql .= ', c.code as country_code, c.label as country';
         $sql .= ', d.code_departement as state_code, d.nom as state';
         $sql .= ', st.libelle as stcomm';
         $sql .= ', te.code as typent_code';
         $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
         $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
         $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
         $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
         $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
@@ -1035,6 +1077,8 @@ class Societe extends CommonObject
                 $this->localtax1_assuj      = $obj->localtax1_assuj;
                 $this->localtax2_assuj      = $obj->localtax2_assuj;
 
+                $this->localtax1_value		= $obj->localtax1_value;
+                $this->localtax2_value		= $obj->localtax2_value;
 
                 $this->typent_id      = $obj->typent_id;
                 $this->typent_code    = $obj->typent_code;
@@ -1064,6 +1108,9 @@ class Societe extends CommonObject
                 $this->default_lang = $obj->default_lang;
                 $this->logo = $obj->logo;
 
+                $this->webservices_url = $obj->webservices_url;
+                $this->webservices_key = $obj->webservices_key;
+
                 $this->outstanding_limit		= $obj->outstanding_limit;
 
                 // multiprix
@@ -1091,7 +1138,6 @@ class Societe extends CommonObject
         }
         else
         {
-            dol_syslog($this->db->error(), LOG_ERR);
             $this->error=$this->db->error();
             $result = -3;
         }
@@ -1197,7 +1243,6 @@ class Societe extends CommonObject
     	else
     	{
     		$this->error=$this->db->error().' sql='.$sql;
-    		dol_syslog(get_class($this)."::searchByName ".$this->error, LOG_ERR);
     		return -1;
     	}
     }
@@ -1225,15 +1270,10 @@ class Societe extends CommonObject
 		{
             $this->db->begin();
 
-		    if (! $error)
-            {
-                // Appel des triggers
-                include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                $interface=new Interfaces($this->db);
-                $result=$interface->run_triggers('COMPANY_DELETE',$this,$user,$langs,$conf);
-                if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                // Fin appel triggers
-            }
+            // Call trigger
+            $result=$this->call_trigger('COMPANY_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
 
 			if (! $error)
 			{
@@ -1266,12 +1306,11 @@ class Societe extends CommonObject
             {
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
                 $sql.= " WHERE fk_soc = " . $id;
-                dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::delete", LOG_DEBUG);
                 if (! $this->db->query($sql))
                 {
                     $error++;
                     $this->error .= $this->db->lasterror();
-                    dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR);
                 }
             }
 
@@ -1280,7 +1319,7 @@ class Societe extends CommonObject
             {
                 $sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
                 $sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
-                dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::delete", LOG_DEBUG);
                 if (! $this->db->query($sql))
                 {
                     $error++;
@@ -1294,12 +1333,24 @@ class Societe extends CommonObject
             {
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
                 $sql.= " WHERE fk_soc = " . $id;
-                dol_syslog(get_class($this)."::Delete sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::Delete", LOG_DEBUG);
+                if (! $this->db->query($sql))
+                {
+                    $error++;
+                    $this->error = $this->db->lasterror();
+                }
+            }
+
+            // Remove associated users
+            if (! $error)
+            {
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_commerciaux";
+                $sql.= " WHERE fk_soc = " . $id;
+                dol_syslog(get_class($this)."::Delete", LOG_DEBUG);
                 if (! $this->db->query($sql))
                 {
                     $error++;
                     $this->error = $this->db->lasterror();
-                    dol_syslog(get_class($this)."::delete erreur -2 ".$this->error, LOG_ERR);
                 }
             }
 
@@ -1319,12 +1370,11 @@ class Societe extends CommonObject
             {
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe";
                 $sql.= " WHERE rowid = " . $id;
-                dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+                dol_syslog(get_class($this)."::delete", LOG_DEBUG);
                 if (! $this->db->query($sql))
                 {
                     $error++;
                     $this->error = $this->db->lasterror();
-                    dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
                 }
             }
 
@@ -1673,15 +1723,15 @@ class Societe extends CommonObject
 
         if ($option == 'customer' || $option == 'compta')
         {
-           $lien = '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$this->id;
+           $lien = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
         }
         else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
         {
-            $lien = '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$this->id;
+            $lien = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
         }
         else if ($option == 'supplier')
         {
-            $lien = '<a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$this->id;
+            $lien = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
         }
         else if ($option == 'category')
         {
@@ -1828,12 +1878,18 @@ class Societe extends CommonObject
             $nump = $this->db->num_rows($resql);
             if ($nump)
             {
+            	$sepa="("; $sepb=")";
+            	if ($mode == 'email')
+            	{
+            		$sepa="&lt;"; $sepb="&gt;";
+            	}
                 $i = 0;
                 while ($i < $nump)
                 {
                     $obj = $this->db->fetch_object($resql);
                     if ($mode == 'email') $property=$obj->email;
                     else if ($mode == 'mobile') $property=$obj->phone_mobile;
+                    else $property=$obj->$mode;
 
 					// Show all contact. If hidedisabled is 1, showonly contacts with status = 1
                     if ($obj->statut == 1 || empty($hidedisabled))
@@ -1846,11 +1902,11 @@ class Societe extends CommonObject
 
 	                    if (!empty($obj->poste))
     	                {
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname))."(".$obj->poste.")"." &lt;".$property."&gt;";
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).($obj->poste?" - ".$obj->poste:"").(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
 						}
 						else
 						{
-							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname))." &lt;".$property."&gt;";
+							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname,$obj->lastname)).(($mode != 'poste' && $property)?" ".$sepa.$property.$sepb:'');
 						}
                     }
                     $i++;
@@ -2276,7 +2332,7 @@ class Societe extends CommonObject
             $sql = "UPDATE ".MAIN_DB_PREFIX."societe";
             $sql.= " SET parent = ".($id > 0 ? $id : "null");
             $sql.= " WHERE rowid = " . $this->id;
-			dol_syslog(get_class($this).'::set_parent sql='.$sql);
+			dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -2326,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)
@@ -2689,7 +2745,7 @@ class Societe extends CommonObject
             $sql.= " SET fk_soc=".$this->id;
             $sql.= " WHERE rowid=".$member->id;
 
-            dol_syslog(get_class($this)."::create_from_member sql=".$sql, LOG_DEBUG);
+            dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
             $resql=$this->db->query($sql);
             if ($resql)
             {
@@ -2699,7 +2755,6 @@ class Societe extends CommonObject
             else
             {
                 $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::create_from_member - 1 - ".$this->error, LOG_ERR);
 
                 $this->db->rollback();
                 return -1;
@@ -2758,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
@@ -2856,14 +2911,14 @@ class Societe extends CommonObject
     function useLocalTax($localTaxNum=0)
     {
     	$sql  = "SELECT t.localtax1, t.localtax2";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-    	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$this->country_code."'";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+    	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
     	$sql .= " AND t.active = 1";
     	if (empty($localTaxNum))   $sql .= " AND (t.localtax1_type <> '0' OR t.localtax2_type <> '0')";
     	elseif ($localTaxNum == 1) $sql .= " AND t.localtax1_type <> '0'";
     	elseif ($localTaxNum == 2) $sql .= " AND t.localtax2_type <> '0'";
 
-    	dol_syslog("useLocalTax sql=".$sql);
+    	dol_syslog("useLocalTax", LOG_DEBUG);
     	$resql=$this->db->query($sql);
     	if ($resql)
     	{
@@ -2879,11 +2934,12 @@ class Societe extends CommonObject
      */
     function useRevenueStamp()
     {
-		$sql  = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_pays as p";
-		$sql .= " WHERE r.fk_pays = p.rowid AND p.code = '".$this->country_code."'";
+		$sql  = "SELECT COUNT(*) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r, ".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE r.fk_pays = c.rowid AND c.code = '".$this->country_code."'";
 		$sql .= " AND r.active = 1";
 
-		dol_syslog("useRevenueStamp sql=".$sql);
+		dol_syslog("useRevenueStamp", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2944,7 +3000,7 @@ class Societe extends CommonObject
 			$sql.= " fk_prospectlevel='".$this->fk_prospectlevel."'";
 			$sql.= ",fk_user_modif='".$user->id."'";
 			$sql.= " WHERE rowid = ".$this->id;
-			dol_syslog(get_class($this)."::set_prospect_level sql=".$sql);
+			dol_syslog(get_class($this)."::set_prospect_level", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
@@ -3027,7 +3083,7 @@ class Societe extends CommonObject
 			$sql.= ",fk_user_modif='".$user->id."'";
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::set_commnucation_level sql=".$sql);
+			dol_syslog(get_class($this)."::set_commnucation_level", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if (! $resql)
 			{
@@ -3061,7 +3117,7 @@ class Societe extends CommonObject
 			$sql.= " outstanding_limit= '".($outstanding!=''?$outstanding:'null')."'";
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::set_outstanding sql=".$sql);
+			dol_syslog(get_class($this)."::set_outstanding", LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -3098,7 +3154,7 @@ class Societe extends CommonObject
 		//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')";		// Not abandonned for undefined reason
 		$sql .= " AND fk_statut <> 3";		// Not abandonned
 
-		dol_syslog("get_OutstandingBill sql=".$sql);
+		dol_syslog("get_OutstandingBill", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 47368dc9fe3..498257ea496 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -37,7 +37,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
-$hookmanager->initHooks(array('salesrepresentativescard'));
+$hookmanager->initHooks(array('salesrepresentativescard','globalcard'));
 
 /*
  *	Actions
@@ -57,8 +57,7 @@ if($_GET["socid"] && $_GET["commid"])
 
 		$parameters=array('id'=>$_GET["commid"]);
 		$reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action);    // Note that $action and $object may have been modified by some hooks
-		$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
-
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		if (empty($reshook)) $soc->add_commercial($user, $_GET["commid"]);
 
@@ -84,8 +83,7 @@ if($_GET["socid"] && $_GET["delcommid"])
 
 		$parameters=array('id'=>$_GET["delcommid"]);
 		$reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action);    // Note that $action and $object may have been modified by some hooks
-		$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
-
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 		if (empty($reshook)) $soc->del_commercial($user, $_GET["delcommid"]);
 
@@ -186,7 +184,7 @@ if ($_GET["socid"])
 				null; // actions in normal case
       		}
 
-			print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">';
+			print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
 			print img_object($langs->trans("ShowUser"),"user").' ';
 			print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
 			print '</a>&nbsp;';
@@ -253,7 +251,7 @@ if ($_GET["socid"])
 				$obj = $db->fetch_object($resql);
 				$var=!$var;
 				print "<tr ".$bc[$var]."><td>";
-				print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">';
+				print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
 				print img_object($langs->trans("ShowUser"),"user").' ';
 				print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n";
 				print '</a>';
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index a22a49e35eb..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='';
@@ -67,10 +67,6 @@ if (GETPOST("button_removefilter"))
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
-if ($conf->facture->enabled && $user->rights->facture->lire)
-	$type_element = 'invoice';
-elseif ($conf->commande->enabled && $user->rights->commande->lire)
-	$type_element = 'order';
 $type_element = GETPOST('type_element')?GETPOST('type_element'):$type_element;
 
 
@@ -78,12 +74,20 @@ $langs->load("companies");
 $langs->load("bills");
 $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');
+
 
 
 /*
@@ -117,6 +121,8 @@ if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 	print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
+//if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
+
 if ($object->client)
 {
 	print '<tr><td>';
@@ -131,8 +137,10 @@ if ($object->client)
 	$obj = $db->fetch_object($resql);
 	$nbFactsClient = $obj->nb;
 	$thirdTypeArray['customer']=$langs->trans("customer");
-	if($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->trans('Invoices');
-	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->trans('Orders');
+	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
+	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
+	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
+	if ($conf->ficheinter>enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
 }
 
 if ($object->fournisseur)
@@ -149,8 +157,8 @@ if ($object->fournisseur)
 	$obj = $db->fetch_object($resql);
 	$nbCmdsFourn = $obj->nb;
 	$thirdTypeArray['supplier']=$langs->trans("supplier");
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->trans('SuppliersInvoices');
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->trans('SuppliersOrders');
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
 }
 print '</table>';
 
@@ -164,11 +172,32 @@ print '<input type="hidden" name="socid" value="'.$socid.'">'."\n";
 
 
 $sql_select='';
+/*if ($type_element == 'action')
+{ 	// Customer : show products from invoices
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+	$documentstatic=new ActionComm($db);
+	$sql_select = 'SELECT f.id as doc_id, f.id as doc_number, \'1\' as doc_type, f.datep as dateprint, ';
+	$tables_from = MAIN_DB_PREFIX."actioncomm as f";
+	$where = " WHERE rbl.parentid = f.id AND f.entity = ".$conf->entity;
+	$dateprint = 'f.datep';
+	$doc_number='f.id';
+}*/
+if ($type_element == 'fichinter')
+{ 	// Customer : show products from invoices
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+	$documentstatic=new Fichinter($db);
+	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
+	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid";	// Must use left join to work also with option that disable usage of lines.
+	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where.= " AND f.entity = ".$conf->entity;
+	$dateprint = 'f.datec';
+	$doc_number='f.ref';
+}
 if ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic=new Facture($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.facnumber as doc_number, f.type as doc_type, f.datef as dateprint, ';
+	$sql_select = 'SELECT f.rowid as doc_id, f.facnumber as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_facture = f.rowid";
@@ -177,11 +206,24 @@ if ($type_element == 'invoice')
 	$doc_number='f.facnumber';
 	$thirdTypeSelect='customer';
 }
+if ($type_element == 'propal')
+{
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+	$documentstatic=new Propal($db);
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as datePrint, c.fk_statut as status, ';
+	$tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
+	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+	$where.= " AND d.fk_propal = c.rowid";
+	$where.= " AND c.entity = ".$conf->entity;
+	$datePrint = 'c.datep';
+	$doc_number='c.ref';
+	$thirdTypeSelect='customer';
+}
 if ($type_element == 'order')
 {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic=new Commande($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, ';
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_commande = c.rowid";
@@ -194,7 +236,7 @@ if ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic=new FactureFournisseur($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, ';
+	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_facture_fourn = f.rowid";
@@ -206,7 +248,7 @@ if ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	$documentstatic=new CommandeFournisseur($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, ';
+	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_commande = c.rowid";
@@ -216,11 +258,13 @@ if ($type_element == 'supplier_order')
 }
 
 $sql = $sql_select;
-$sql.= ' d.fk_product as product_id, d.fk_product as fk_product, d.label, d.description as description, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty,';
-$sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type,';
-$sql.= " s.rowid as socid, p.ref as prod_ref, p.label as product_label";
+$sql.= ' d.description as description,';
+if ($type_element != 'fichinter') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty,';
+if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type,';
+$sql.= " s.rowid as socid ";
+if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
-$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
 $sql.= $where;
 if ($month > 0) {
 	if ($year > 0) {
@@ -239,18 +283,17 @@ if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$sref."%'";
 if ($sprod_fulldescr) $sql.= " AND (d.description LIKE '%".$sprod_fulldescr."%' OR p.label LIKE '%".$sprod_fulldescr."%')";
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($limit + 1, $offset);
-
+//print $sql;
 
 // Define type of elements
-$typeElementString = $form->selectarray("type_element",$elementTypeArray,GETPOST('type_element'));
+$typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPOST('type_element'), 2);
 $button = '<input type="submit" class="button" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 $param="&amp;sref=".$sref."&amp;month=".$month."&amp;year=".$year."&amp;sprod_fulldescr=".$sprod_fulldescr."&amp;socid=".$socid."&amp;type_element=".$type_element;
 
-print_barre_liste($langs->transnoentitiesnoconv('ProductsIntoElements', $typeElementString.' '.$button), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
 if ($sql_select)
 {
-	dol_syslog("sql=".$sql);
 	$resql=$db->query($sql);
 	if (!$resql) dol_print_error($db);
 }
@@ -260,6 +303,7 @@ print '<table class="liste" width="100%">'."\n";
 print '<tr class="liste_titre">';
 print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans('Date'),$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
+print_liste_field_titre($langs->trans('Status'),$_SERVER['PHP_SELF'],'fk_status','',$param,'align="center"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans('Product'),$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
 print_liste_field_titre($langs->trans('Quantity'),$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
 // Filters
@@ -271,6 +315,8 @@ print '<td class="liste_titre">'; // date
 print $formother->select_month($month?$month:-1,'month',1);
 $formother->select_year($year?$year:-1,'year',1, 20, 1);
 print '</td>';
+print '<td class="liste_titre" align="center">';
+print '</td>';
 print '<td class="liste_titre" align="left">';
 print '<input class="flat" type="text" name="sprod_fulldescr" size="15" value="'.dol_escape_htmltag($sprod_fulldescr).'">';
 print '</td>';
@@ -287,16 +333,26 @@ if ($sql_select)
 	$i = 0;
 	while (($objp = $db->fetch_object($resql)) && $i < $conf->liste_limit )
 	{
-		$var=!$var;
-		print "<tr ".$bc[$var].">";
-		print '<td class="nobordernopadding nowrap" width="100">';
 		$documentstatic->id=$objp->doc_id;
 		$documentstatic->ref=$objp->doc_number;
 		$documentstatic->type=$objp->type;
+		$documentstatic->fk_statut=$objp->status;
+		$documentstatic->fk_status=$objp->status;
+		$documentstatic->statut=$objp->status;
+		$documentstatic->status=$objp->status;
+
+		$var=!$var;
+		print "<tr ".$bc[$var].">";
+		print '<td class="nobordernopadding nowrap" width="100">';
 		print $documentstatic->getNomUrl(1);
 		print '</td>';
 		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint),'day').'</td>';
 
+		// Status
+		print '<td align="center">';
+		print $documentstatic->getLibStatut(2);
+		print '</td>';
+
 		print '<td>';
 
 		// Define text, description and type
@@ -393,15 +449,17 @@ if ($sql_select)
 
 			} else {
 
-				//if (! empty($objp->fk_parent_line)) echo img_picto('', 'rightarrow');
-				if ($type==1) $text = img_object($langs->trans('Service'),'service');
-				else $text = img_object($langs->trans('Product'),'product');
+				if (! empty($objp->label) || ! empty($objp->description))
+				{
+					if ($type==1) $text = img_object($langs->trans('Service'),'service');
+					else $text = img_object($langs->trans('Product'),'product');
 
-				if (! empty($objp->label)) {
-					$text.= ' <strong>'.$objp->label.'</strong>';
-					echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
-				} else {
-					echo $text.' '.dol_htmlentitiesbr($objp->description);
+					if (! empty($objp->label)) {
+						$text.= ' <strong>'.$objp->label.'</strong>';
+						echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
+					} else {
+						echo $text.' '.dol_htmlentitiesbr($objp->description);
+					}
 				}
 
 				// Show range
@@ -441,21 +499,17 @@ if ($sql_select)
 	}
 	$db->free($resql);
 }
+else if (empty($type_element) || $type_element == -1)
+{
+	print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("SelectElementAndClickRefresh").'</td></tr>';
+}
 else {
-	print '<tr><td colspan="4">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+	print '<tr '.$bc[0].'><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 }
 
 print "</table>";
 print "</form>";
 
-
-/*
- * Errors
- */
-
-dol_htmloutput_errors($warning);
-dol_htmloutput_errors($error,$errors);
-
 llxFooter();
 
 $db->close();
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 '</table>';
 
-	print '</div>';
+	dol_fiche_end();
 
 	$modulepart = 'societe';
 	$permission = $user->rights->societe->creer;
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 84fc4326fe4..a6a00bb0046 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C)      2014 Charles-Fr Benke	<charles.fr@benke.fr>
  *
@@ -62,26 +62,43 @@ $rowspan=2;
 if (! empty($conf->barcode->enabled)) $rowspan++;
 print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<table class="noborder nohover" width="100%">';
+print '<table class="noborder nohover" width="100%">'."\n";
 print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
+print '<th colspan="3">'.$langs->trans("SearchThirdparty").'</th></tr>';
 print "<tr ".$bc[false]."><td>";
-print $langs->trans("Name").':</td><td><input class="flat" type="text" size="14" name="search_nom_only"></td>';
+print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_nom_only" id="search_nom_only"></td>';
 print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
 if (! empty($conf->barcode->enabled))
 {
-	print "<tr ".$bc[false]."><td>";
-	print $langs->trans("BarCode").':</td><td><input class="flat" type="text" size="14" name="sbarcode"></td>';
+	print "<tr ".$bc[false]."><td ".$bc[false].">";
+	print '<label for="sbarcode">'.$langs->trans("BarCode").'</label>:</td><td><input class="flat" type="text" size="14" name="sbarcode" id="sbarcode"></td>';
 	//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
 	print '</tr>';
 }
-print "<tr ".$bc[false]."><td>";
-print $langs->trans("Other").':</td><td><input class="flat" type="text" size="14" name="search_all"></td>';
+print "<tr ".$bc[false]."><td ".$bc[false].">";
+print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>';
 //print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
-print '</tr>';
-
-print "</table></form><br>";
+print '</tr>'."\n";
+print "</table></form><br>\n";
 
+/*
+ * Search contact
+ */
+$rowspan=2;
+if (! empty($conf->barcode->enabled)) $rowspan++;
+print '<form method="post" action="'.DOL_URL_ROOT.'/contact/list.php">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+print '<table class="noborder nohover" width="100%">'."\n";
+print '<tr class="liste_titre">';
+print '<th colspan="3">'.$langs->trans("SearchContact").'</th></tr>'."\n";
+print "<tr ".$bc[false]."><td>";
+print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_firstlast_only" id="search_firstlast_only"></td>';
+print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>'."\n";
+print "<tr ".$bc[false]."><td ".$bc[false].">";
+print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="contactname" id="contactname"></td>';
+//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
+print '</tr>'."\n";
+print "</table></form><br>\n";
 
 /*
  * Statistics area
@@ -117,11 +134,11 @@ if ($result)
 }
 else dol_print_error($db);
 
-print '<table class="noborder" width="100%">';
+print '<table class="noborder" width="100%">'."\n";
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 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))
 {
-    print '<tr><td align="center">';
+    print '<tr '.$bc[0].'><td align="center" colspan="2">';
     $dataseries=array();
     if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))     $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect']));
     if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))     $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer']));
@@ -129,26 +146,26 @@ 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 '</td></tr>';
+    print '</td></tr>'."\n";
 }
 else
 {
     if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
     {
-        $statstring = "<tr $bc[0]>";
+        $statstring = "<tr ".$bc[0].">";
         $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/list.php">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
         $statstring.= "</tr>";
     }
     if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
     {
-        $statstring.= "<tr $bc[1]>";
+        $statstring.= "<tr ".$bc[1].">";
         $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/list.php">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
         $statstring.= "</tr>";
     }
     if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS))
     {
-        $statstring2 = "<tr $bc[0]>";
-        $statstring2.= '<td><a href="'.DOL_URL_ROOT.'/fourn/liste.php">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>';
+        $statstring2 = "<tr ".$bc[0].">";
+        $statstring2.= '<td><a href="'.DOL_URL_ROOT.'/fourn/list.php">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>';
         $statstring2.= "</tr>";
     }
     print $statstring;
@@ -166,7 +183,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
 	print '<br>';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
-	print '<tr><td align="center">';
+	print '<tr '.$bc[0].'><td align="center" colspan="2">';
 	$sql = "SELECT c.label, count(*) as nb";
 	$sql.= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
@@ -250,12 +267,13 @@ if ($result)
     {
         $transRecordedType = $langs->trans("LastModifiedThirdParties",$max);
 
+        print "\n<!-- last thirdparties modified -->\n";
         print '<table class="noborder" width="100%">';
 
-        print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</td>';
-        print '<th>&nbsp;</td>';
-        print '<th align="right">'.$langs->trans('Status').'</td>';
-        print '</tr>';
+        print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</th>';
+        print '<th>&nbsp;</th>';
+        print '<th align="right">'.$langs->trans('Status').'</th>';
+        print '</tr>'."\n";
 
         $var=True;
 
@@ -309,7 +327,8 @@ if ($result)
 
         $db->free();
 
-        print "</table>";
+        print "</table>\n";
+        print "<!-- End last thirdparties modified -->\n";
     }
 }
 else
diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php
index 0deec041932..305936e6f56 100644
--- a/htdocs/societe/info.php
+++ b/htdocs/societe/info.php
@@ -48,7 +48,7 @@ $hookmanager->initHooks(array('infothirdparty'));
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
 
@@ -76,7 +76,8 @@ print '<table width="100%"><tr><td>';
 dol_print_object_info($soc);
 print '</td></tr></table>';
 
-print '</div>';
+
+dol_fiche_end();
 
 
 llxFooter();
diff --git a/htdocs/societe/localtaxes.php b/htdocs/societe/localtaxes.php
deleted file mode 100644
index 37d1094a6a2..00000000000
--- a/htdocs/societe/localtaxes.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/* Copyright (C) 2013      Juanjo Menent        <jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *  \file       htdocs/societe/localtaxes.php
- *  \ingroup    societe
- *  \brief      Page of third party localtaxes rates
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-$langs->load("companies");
-
-// Security check
-$socid = GETPOST('socid','int');
-$vatid = GETPOST('vatid','int');
-$action = GETPOST('action','alpha');
-
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe', $socid, '&societe');
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('localtaxesthirdparty'));
-
-
-/*
- *	Actions
- */
-
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
-
-
-/*
- *	View
- */
-
-$contactstatic = new Contact($db);
-$form = new Form($db);
-
-if ($socid)
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-
-	$langs->load("companies");
-
-
-	$soc = new Societe($db);
-	$result = $soc->fetch($socid);
-	llxHeader("",$langs->trans("LocalTaxes"),'');
-
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = societe_prepare_head($soc);
-
-	dol_fiche_head($head, 'localtaxes', $langs->trans("ThirdParty"),0,'company');
-
-	print '<table class="border" width="100%">';
-
-	print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
-	print $form->showrefnav($soc,'socid','',0,'rowid','nom');
-	print '</td></tr>';
-
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$soc->prefix_comm.'</td></tr>';
-    }
-
-	if ($soc->client)
-	{
-		print '<tr><td>';
-		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print $soc->code_client;
-		if ($soc->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		print '</td></tr>';
-	}
-
-	if ($soc->fournisseur)
-	{
-		print '<tr><td>';
-		print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		print $soc->code_fournisseur;
-		if ($soc->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		print '</td></tr>';
-	}
-
-	if (! empty($conf->barcode->enabled))
-	{
-		print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>';
-	}
-
-	print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">";
-	dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id);
-	print "</td></tr>";
-
-	// Zip / Town
-	print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$soc->zip."</td>";
-	print '<td width="25%">'.$langs->trans('Town').'</td><td width="25%">'.$soc->town."</td></tr>";
-
-	// Country
-	if ($soc->country) {
-		print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
-		$img=picto_from_langcode($soc->country_code);
-		print ($img?$img.' ':'');
-		print $soc->country;
-		print '</td></tr>';
-	}
-
-	// EMail
-	print '<tr><td>'.$langs->trans('EMail').'</td><td colspan="3">';
-	print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
-	print '</td></tr>';
-
-	// Web
-	print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3">';
-	print dol_print_url($soc->url);
-	print '</td></tr>';
-
-	// Phone / Fax
-	print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->phone,$soc->country_code,0,$soc->id,'AC_TEL').'</td>';
-	print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->country_code,0,$soc->id,'AC_FAX').'</td></tr>';
-
-
-	if ($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-	{
-		print '<tr><td class="nowrap">'.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).'</td><td colspan="3">';
-		print yn($soc->localtax1_assuj);
-		print '</td></tr>';
-		print '<tr><td class="nowrap">'.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).'</td><td colspan="3">';
-		print yn($soc->localtax2_assuj);
-		print '</td></tr>';
-	}
-	elseif($mysoc->localtax1_assuj=="1")
-	{
-		print '<tr><td>'.$langs->transcountry('LocalTax1IsUsed',$mysoc->country_code).'</td><td colspan="3">';
-		print yn($soc->localtax1_assuj);
-		print '</td></tr>';
-	}
-	elseif($mysoc->localtax2_assuj=="1")
-	{
-		print '<tr><td>'.$langs->transcountry('LocalTax2IsUsed',$mysoc->country_code).'</td><td colspan="3">';
-		print yn($soc->localtax2_assuj);
-		print '</td></tr>';
-	}
-
-	print '</table>';
-
-	dol_fiche_end();
-
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$soc->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="updatetva">';
-	print '<input type="hidden" name="vatid" value="'.$vatid.'">';
-
-	// Localtaxes
-
-	print '<table id="tablelines" class="noborder" width="100%">';
-
-	print '<tr class="liste_titre nodrag nodrop">';
-
-	// Description
-	print '<td>'.$langs->trans('Description').'</td>';
-
-	// VAT
-	print '<td align="right" width="80">'.$langs->trans('VAT').' (%)</td>';
-
-	// Localtax 1
-	if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj)
-		print '<td align="right" width="80">'.$langs->transcountry('LocalTax1',$mysoc->country_code).' (%)</td>';
-
-	if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj)
-		print '<td align="right" width="80">'.$langs->transcountry('LocalTax2',$mysoc->country_code).' (%)</td>';
-
-	//print '<td width="10"></td>';
-	if ($user->rights->societe->creer)
-		print '<td width="10" class="nowrap"></td>'; // No width to allow autodim
-
-	print "</tr>\n";
-
-
-	$sql  = "SELECT DISTINCT t.rowid, t.note, t.taux, t.localtax1, t.localtax2, t.recuperableonly";
-	$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
-	$sql.= " WHERE t.fk_pays = p.rowid";
-	$sql.= " AND t.active = 1";
-	$sql.= " AND p.code IN ('".$mysoc->country_code."')";
-	$sql.= " ORDER BY t.taux ASC, t.recuperableonly ASC";
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		if ($num)
-		{
-			$var=True;
-			for ($i = 0; $i < $num; $i++)
-			{
-				$var=!$var;
-
-
-				$obj = $db->fetch_object($resql);
-
-				if ($action == 'edit' && $obj->rowid==$vatid && $user->rights->societe->creer)
-				{
-					print '<tr '.$bc[$var].'>';
-
-					print '<td>'.$obj->note.'</td>';
-					print '<td align="right">'.$obj->taux.'</td>';
-
-					if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj)
-						print '<td align="right"><input size="4" type="text" class="flat" name="localtax1" value="'.$obj->localtax1.'"></td>';
-					if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj)
-						print '<td align="right"><input size="4" type="text" class="flat" name="localtax2" value="'.$obj->localtax2.'"></td>';
-
-					print '<td align="right"><input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
-					print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
-					print '</tr>';
-				}
-				else
-				{
-					print '<tr '.$bc[$var].'>';
-
-					print '<td>'.$obj->note.'</td>';
-					print '<td align="right">'.$obj->taux.'</td>';
-					if ($mysoc->localtax1_assuj=="1" && $soc->localtax1_assuj)
-						print '<td align="right">'.$obj->localtax1.'</td>';
-					if ($mysoc->localtax2_assuj=="1" && $soc->localtax2_assuj)
-						print '<td align="right">'.$obj->localtax2.'</td>';
-					print '<td align="right">';
-					if ($user->rights->societe->creer)
-					{
-						// TODO Comment this because the action to save is not supported
-						//print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit&socid='.$soc->id.'&vatid='.$obj->rowid.'">'.img_edit().'</a>';
-					}
-					print '</td>';
-					print "</tr>\n";
-				}
-			}
-		}
-	}
-
-	print '</table>';
-
-	print '</form>';
-}
-
-
-llxFooter();
-
-$db->close();
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
new file mode 100644
index 00000000000..1845669dcfc
--- /dev/null
+++ b/htdocs/societe/notify/card.php
@@ -0,0 +1,452 @@
+<?php
+/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2014 Juanjo Menent		<jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/societe/notify/card.php
+ *      \ingroup    societe notification
+ *		\brief      Tab for notifications of third party
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php';
+
+$langs->load("companies");
+$langs->load("mails");
+$langs->load("admin");
+$langs->load("other");
+
+$socid = GETPOST("socid",'int');
+$action = GETPOST('action');
+$contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
+$actionid=GETPOST('actionid');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'societe','','');
+
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="c.lastname";
+
+$now=dol_now();
+
+
+/*
+ * Actions
+ */
+
+// Add a notification
+if ($action == 'add')
+{
+    $error=0;
+
+    if (empty($contactid))
+    {
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), 'errors');
+        $error++;
+    }
+    if ($actionid <= 0)
+    {
+	    setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), 'errors');
+        $error++;
+    }
+
+    if (! $error)
+    {
+        $db->begin();
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+        $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+        if ($db->query($sql))
+        {
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
+            $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+
+            if (! $db->query($sql))
+            {
+                $error++;
+                dol_print_error($db);
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+        }
+        else
+        {
+            $db->rollback();
+        }
+    }
+}
+
+// Remove a notification
+if ($action == 'delete')
+{
+    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"];
+    $db->query($sql);
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+llxHeader();
+
+$object = new Societe($db);
+$result=$object->fetch($socid);
+
+if ($result > 0)
+{
+    $langs->load("other");
+
+    $head = societe_prepare_head($object);
+
+    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company');
+
+
+    print '<table class="border"width="100%">';
+
+    print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
+    print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
+    print '</td></tr>';
+
+    // Prefix
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+    if ($object->client)
+    {
+        print '<tr><td>';
+        print $langs->trans('CustomerCode').'</td><td colspan="3">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td></tr>';
+    }
+
+    if ($object->fournisseur)
+    {
+        print '<tr><td>';
+        print $langs->trans('SupplierCode').'</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td></tr>';
+    }
+
+    print '<tr><td>'.$langs->trans("NbOfActiveNotifications").'</td>';
+    print '<td colspan="3">';
+    $sql = "SELECT COUNT(n.rowid) as nb";
+    $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
+    $sql.= " WHERE fk_soc = ".$object->id;
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            $nb=$obj->nb;
+            $i++;
+        }
+    }
+    else {
+        dol_print_error($db);
+    }
+    print $nb;
+    print '</td></tr>';
+    print '</table>';
+
+    dol_fiche_end();
+
+    // Help
+    print $langs->trans("NotificationsDesc").'<br><br>';
+
+    print "\n";
+
+    // Add notification form
+    print_fiche_titre($langs->trans("AddNewNotification"),'','');
+
+    print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+
+    $param="&socid=".$socid;
+
+    // Line with titles
+    print '<table width="100%" class="noborder">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder);
+    print_liste_field_titre('');
+    print '</tr>';
+
+    $var=false;
+    $listofemails=$object->thirdparty_and_contact_email_array();
+    if (count($listofemails) > 0)
+    {
+        $actions=array();
+
+        // Load array of available notifications
+        $notificationtrigger=new InterfaceNotification($db);
+        $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents();
+
+        foreach($listofnotifiedevents as $notifiedevent)
+        {
+ 			$label=($langs->trans("Notify_".$notifiedevent['code'])!="Notify_".$notifiedevent['code']?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']);
+            $actions[$notifiedevent['rowid']]=$label;
+        }
+        print '<tr '.$bc[$var].'><td>';
+        print $form->selectarray("contactid",$listofemails);
+        print '</td>';
+        print '<td>';
+        print $form->selectarray("actionid",$actions,'',1);
+        print '</td>';
+        print '<td>';
+        $type=array('email'=>$langs->trans("EMail"));
+        print $form->selectarray("typeid",$type);
+        print '</td>';
+        print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+        print '</tr>';
+    }
+    else
+    {
+        print '<tr '.$bc[$var].'><td colspan="4">';
+        print $langs->trans("YouMustCreateContactFirst");
+        print '</td></tr>';
+    }
+
+    print '</table>';
+
+    print '</form>';
+    print '<br>';
+
+    // List of active notifications
+    print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
+    $var=true;
+
+    // Line with titles
+    print '<table width="100%" class="noborder">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'"width="10%"',$sortfield,$sortorder);
+    print_liste_field_titre('','','');
+    print '</tr>';
+
+    // List of notifications enabled for fixed email
+    foreach($conf->global as $key => $val)
+    {
+    	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
+    	//print $key.' - '.$val.' - '.$reg[1].'<br>';
+		print '<tr '.$bc[$var].'><td>'.$val;
+		if (isValidEmail($val))
+		{
+			print ' &lt;'.$val.'&gt;';
+		}
+		else
+		{
+			$langs->load("errors");
+			print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$val);
+		}
+		print '</td>';
+		print '<td>';
+		$label=($langs->trans("Notify_".$reg[1])!="Notify_".$reg[1]?$langs->trans("Notify_".$reg[1]):$reg[1]);
+		print $label;
+		print '</td>';
+		print '<td>';
+		print $langs->trans("Email");
+		print '</td>';
+		print '<td align="right">'.$langs->trans("SeeModuleSetup").'</td>';
+		print '</tr>';
+    }
+
+    // List of notifications enabled for contacts
+    $sql = "SELECT n.rowid, n.type,";
+    $sql.= " a.code, a.label,";
+    $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
+    $sql.= " ".MAIN_DB_PREFIX."socpeople c";
+    $sql.= " WHERE a.rowid = n.fk_action";
+    $sql.= " AND c.rowid = n.fk_contact";
+    $sql.= " AND c.fk_soc = ".$object->id;
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+
+        $contactstatic=new Contact($db);
+
+        while ($i < $num)
+        {
+            $var = !$var;
+
+            $obj = $db->fetch_object($resql);
+
+            $contactstatic->id=$obj->contactid;
+            $contactstatic->lastname=$obj->lastname;
+            $contactstatic->firstname=$obj->firstname;
+            print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
+            if ($obj->type == 'email')
+            {
+                if (isValidEmail($obj->email))
+                {
+                    print ' &lt;'.$obj->email.'&gt;';
+                }
+                else
+                {
+                    $langs->load("errors");
+                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
+                }
+            }
+            print '</td>';
+            print '<td>';
+            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            print $label;
+            print '</td>';
+            print '<td>';
+            if ($obj->type == 'email') print $langs->trans("Email");
+            if ($obj->type == 'sms') print $langs->trans("SMS");
+            print '</td>';
+            print '<td align="right"><a href="card.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+            print '</tr>';
+            $i++;
+        }
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    print '</table>';
+    print '<br>';
+
+
+    // List of notifications done
+    print_fiche_titre($langs->trans("ListOfNotificationsDone"),'','');
+    $var=true;
+
+    // Line with titles
+    print '<table width="100%" class="noborder">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre($langs->trans("Target"),$_SERVER["PHP_SELF"],"c.lastname",'',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre",'',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder);
+    //print_liste_field_titre($langs->trans("Object"),$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"a.daten",'',$param,'align="right"',$sortfield,$sortorder);
+    print '</tr>';
+
+    // List
+    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
+    $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+    $sql.= " a.code, a.label";
+    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql.= " ".MAIN_DB_PREFIX."notify as n ";
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+    $sql.= " WHERE a.rowid = n.fk_action";
+    $sql.= " AND n.fk_soc = ".$object->id;
+
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+
+        $contactstatic=new Contact($db);
+
+        while ($i < $num)
+        {
+            $var = !$var;
+
+            $obj = $db->fetch_object($resql);
+
+            print '<tr '.$bc[$var].'><td>';
+            if ($obj->id > 0)
+            {
+	            $contactstatic->id=$obj->id;
+	            $contactstatic->lastname=$obj->lastname;
+	            $contactstatic->firstname=$obj->firstname;
+	            print $contactstatic->getNomUrl(1);
+	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+            }
+            else
+			{
+				print $obj->email;
+            }
+            print '</td>';
+            print '<td>';
+            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            print $label;
+            print '</td>';
+            print '<td>';
+            if ($obj->type == 'email') print $langs->trans("Email");
+            if ($obj->type == 'sms') print $langs->trans("Sms");
+            print '</td>';
+            // TODO Add link to object here for other types
+            /*print '<td>';
+            if ($obj->object_type == 'order')
+            {
+				$orderstatic->id=$obj->object_id;
+				$orderstatic->ref=...
+				print $orderstatic->getNomUrl(1);
+            }
+           	print '</td>';*/
+            // print
+            print'<td align="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+            print '</tr>';
+            $i++;
+        }
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    print '</table>';
+}
+else dol_print_error('','RecordNotFound');
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php
deleted file mode 100644
index 198739398a2..00000000000
--- a/htdocs/societe/notify/fiche.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010-2012 Juanjo Menent		<jmenent@2byte.es>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *	    \file       htdocs/societe/notify/fiche.php
- *      \ingroup    societe notification
- *		\brief      Tab for notifications of third party
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php';
-
-$langs->load("companies");
-$langs->load("mails");
-$langs->load("admin");
-$langs->load("other");
-
-$socid = GETPOST("socid",'int');
-$action = GETPOST('action');
-$contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
-$actionid=GETPOST('actionid');
-
-// Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="c.lastname";
-
-$now=dol_now();
-
-
-/*
- * Actions
- */
-
-// Add a notification
-if ($action == 'add')
-{
-    $error=0;
-
-    if (empty($contactid))
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")).'</div>';
-        $error++;
-    }
-    if ($actionid <= 0)
-    {
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")).'</div>';
-        $error++;
-    }
-
-    if (! $error)
-    {
-        $db->begin();
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-        $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
-        if ($db->query($sql))
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-            $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
-
-            if (! $db->query($sql))
-            {
-                $error++;
-                dol_print_error($db);
-            }
-        }
-        else
-        {
-            dol_print_error($db);
-        }
-
-        if (! $error)
-        {
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
-        }
-    }
-}
-
-// Remove a notification
-if ($action == 'delete')
-{
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".$_GET["actid"];
-    $db->query($sql);
-}
-
-
-
-/*
- *	View
- */
-
-$form = new Form($db);
-
-llxHeader();
-
-$object = new Societe($db);
-$result=$object->fetch($socid);
-
-if ($result > 0)
-{
-    $langs->load("other");
-
-    $head = societe_prepare_head($object);
-
-    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"),0,'company');
-
-
-    print '<table class="border"width="100%">';
-
-    print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
-    print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
-    print '</td></tr>';
-
-    // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
-
-    if ($object->client)
-    {
-        print '<tr><td>';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
-
-    if ($object->fournisseur)
-    {
-        print '<tr><td>';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
-
-    print '<tr><td>'.$langs->trans("NbOfActiveNotifications").'</td>';
-    print '<td colspan="3">';
-    $sql = "SELECT COUNT(n.rowid) as nb";
-    $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
-    $sql.= " WHERE fk_soc = ".$object->id;
-    $resql=$db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
-            $nb=$obj->nb;
-            $i++;
-        }
-    }
-    else {
-        dol_print_error($db);
-    }
-    print $nb;
-    print '</td></tr>';
-    print '</table>';
-
-    // Help
-    print '<br>'.$langs->trans("NotificationsDesc").'<br>';
-
-
-    dol_fiche_end();
-
-
-    print "\n";
-
-    // Add notification form
-    print_fiche_titre($langs->trans("AddNewNotification"),'','');
-
-    print '<form action="fiche.php?socid='.$socid.'" method="post">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-
-    $param="&socid=".$socid;
-
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder);
-    print_liste_field_titre('');
-    print '</tr>';
-
-    $var=false;
-    $listofemails=$object->thirdparty_and_contact_email_array();
-    if (count($listofemails) > 0)
-    {
-        $actions=array();
-
-        // Load array of available notifications
-        $notificationtrigger=new InterfaceNotification($db);
-        $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents();
-
-        foreach($listofnotifiedevents as $notifiedevent)
-        {
- 			$label=($langs->trans("Notify_".$notifiedevent['code'])!="Notify_".$notifiedevent['code']?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']);
-            $actions[$notifiedevent['rowid']]=$label;
-        }
-        print '<tr '.$bc[$var].'><td>';
-        print $form->selectarray("contactid",$listofemails);
-        print '</td>';
-        print '<td>';
-        print $form->selectarray("actionid",$actions,'',1);
-        print '</td>';
-        print '<td>';
-        $type=array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid",$type);
-        print '</td>';
-        print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        print '</tr>';
-    }
-    else
-    {
-        print '<tr '.$bc[$var].'><td colspan="4">';
-        print $langs->trans("YouMustCreateContactFirst");
-        print '</td></tr>';
-    }
-
-    print '</table>';
-
-    print '</form>';
-    print '<br>';
-
-    dol_htmloutput_mesg($mesg);
-
-    // List of active notifications
-    print_fiche_titre($langs->trans("ListOfActiveNotifications"),'','');
-    $var=true;
-
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.lastname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Type"),"fiche.php","",'',$param,'"width="10%"',$sortfield,$sortorder);
-    print_liste_field_titre('','','');
-    print '</tr>';
-
-    // List of notifications for contacts
-    $sql = "SELECT n.rowid, n.type,";
-    $sql.= " a.code, a.label,";
-    $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql.= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
-
-    $resql=$db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        $contactstatic=new Contact($db);
-
-        while ($i < $num)
-        {
-            $var = !$var;
-
-            $obj = $db->fetch_object($resql);
-
-            $contactstatic->id=$obj->contactid;
-            $contactstatic->lastname=$obj->lastname;
-            $contactstatic->firstname=$obj->firstname;
-            print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
-            if ($obj->type == 'email')
-            {
-                if (isValidEmail($obj->email))
-                {
-                    print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
-                {
-                    $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
-                }
-            }
-            print '</td>';
-            print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
-            print $label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
-            print '</td>';
-            print '<td align="right"><a href="fiche.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    }
-    else
-    {
-        dol_print_error($db);
-    }
-
-    print '</table>';
-    print '<br>';
-
-
-    // List of notifications done
-    print_fiche_titre($langs->trans("ListOfNotificationsDone"),'','');
-    $var=true;
-
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.lastname",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Action"),"fiche.php","a.titre",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Date"),"fiche.php","a.daten",'',$param,'align="right"',$sortfield,$sortorder);
-    print '</tr>';
-
-    // List
-    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type, n.objet_id,";
-    $sql.= " c.rowid as id, c.lastname, c.firstname, c.email,";
-    $sql.= " a.code, a.label";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify as n, ";
-    $sql.= " ".MAIN_DB_PREFIX."socpeople as c";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
-
-    $resql=$db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        $contactstatic=new Contact($db);
-
-        while ($i < $num)
-        {
-            $var = !$var;
-
-            $obj = $db->fetch_object($resql);
-
-            $contactstatic->id=$obj->id;
-            $contactstatic->lastname=$obj->lastname;
-            $contactstatic->firstname=$obj->firstname;
-            print '<tr '.$bc[$var].'><td>'.$contactstatic->getNomUrl(1);
-            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
-            print '</td>';
-            print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
-            print $label;
-            print '</td>';
-            // TODO Add link to object here
-            // print
-            print'<td align="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    }
-    else
-    {
-        dol_print_error($db);
-    }
-
-    print '</table>';
-}
-else dol_print_error('','RecordNotFound');
-
-$db->close();
-
-llxFooter();
-
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 47054424212..a1042087faf 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -51,13 +51,12 @@ $pagenext = $page + 1;
 
 
 /*
- * Mode Liste
- *
+ * View
  */
 
 llxHeader();
 
-$sql = "SELECT s.nom, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
+$sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
 $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
 $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
 $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
@@ -78,13 +77,13 @@ if ($result)
 	$i = 0;
 
 	$paramlist='';
-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, "index.php", $paramlist, $sortfield,$sortorder,'',$num);
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Contact"),"index.php","c.lastname","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre($langs->trans("Action"),"index.php","a.titre","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
 	print "</tr>\n";
 	$var=True;
 	while ($i < $num)
@@ -94,7 +93,7 @@ if ($result)
 		$var=!$var;
 
 		print "<tr ".$bc[$var].">";
-		print "<td><a href=\"fiche.php?socid=".$obj->socid."\">".$obj->nom."</a></td>\n";
+		print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
 		print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
 		print "<td>".$obj->titre."</td>\n";
 		print "</tr>\n";
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index ea64135bd43..ab14d757f6f 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013      Peter Fontaine       <contact@peterfontaine.fr>
  *
@@ -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"];
@@ -79,7 +79,7 @@ if ($action == 'update' && ! $_POST["cancel"])
 	$result = $account->update($user);
 	if (! $result)
 	{
-		$message=$account->error;
+		setEventMessage($account->error, 'errors');
 		$_GET["action"]='edit';     // Force chargement page edition
 	}
 	else
@@ -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"];
@@ -137,7 +137,7 @@ if ($action == 'add' && ! $_POST["cancel"])
 	    $result = $account->update($user);	// TODO Use create and include update into create method
 	    if (! $result)
 	    {
-	        $message=$account->error;
+		    setEventMessage($account->error, 'errors');
 	        $_GET["action"]='create';     // Force chargement page création
 	    }
 	    else
@@ -158,7 +158,7 @@ if ($action == 'setasdefault')
         header('Location: '.$url);
         exit;
     } else {
-        $message=$db->lasterror;
+	    setEventMessage($db->lasterror, 'errors');
     }
 }
 
@@ -176,15 +176,16 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
 		}
 		else
 		{
-			$message = $account->error;
+			setEventMessage($account->error, 'errors');
 		}
 	}
 	else
 	{
-         $message = $account->error;
+		setEventMessage($account->error, 'errors');
     }
 }
 
+
 /*
  *	View
  */
@@ -292,7 +293,7 @@ if ($socid && $action != 'edit' && $action != "create")
 	}
 
 	print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
-	print '<td colspan="4">'.$account->iban_prefix.'</td></tr>';
+	print '<td colspan="4">'.$account->iban.'</td></tr>';
 
 	print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
 	print '<td colspan="4">'.$account->bic.'</td></tr>';
@@ -317,8 +318,13 @@ if ($socid && $action != 'edit' && $action != "create")
 		print '<div class="warning">'.$langs->trans("RIBControlError").'</div>';
 	}
 
-    print "<br />";
+    print "<br>";
 
+    
+    /*
+     * 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 "<tr $bc[$var]>";
+            print "<tr ".$bc[$var].">";
             // Label
             print '<td>'.$rib->label.'</td>';
             // Bank name
@@ -382,7 +388,7 @@ if ($socid && $action != 'edit' && $action != "create")
         }
 
         if (count($rib_list) == 0) {
-            print '<tr><td colspan="5" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
+            print '<tr '.$bc[0].'><td colspan="7" align="center">'.$langs->trans("NoBANRecord").'</td></tr>';
         }
 
         print '</table>';
@@ -399,8 +405,6 @@ if ($socid && $action != 'edit' && $action != "create")
 
 if ($socid && $action == 'edit' && $user->rights->societe->creer)
 {
-    dol_htmloutput_mesg($message);
-
     print '<form action="rib.php?socid='.$soc->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="update">';
@@ -460,7 +464,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
 		if ($val == 'AccountNumber')
 		{
-			print '<td>'.$langs->trans("BankAccountNumber").'</td>';
+			print '<td class="fieldrequired">'.$langs->trans("BankAccountNumber").'</td>';
 			print '<td><input size="18" type="text" class="flat" name="number" value="'.$account->number.'"></td>';
 			print '</tr>';
 		}
@@ -477,14 +481,14 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	}
 
     // IBAN
-    print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="iban_prefix" value="'.$account->iban_prefix.'"></td></tr>';
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("IBAN").'</td>';
+    print '<td colspan="4"><input size="30" type="text" name="iban" value="'.$account->iban.'"></td></tr>';
 
-    print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("BIC").'</td>';
     print '<td colspan="4"><input size="12" type="text" name="bic" value="'.$account->bic.'"></td></tr>';
 
     print '<tr><td valign="top">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
-    print "<textarea name=\"domiciliation\" rows=\"4\" cols=\"40\">";
+    print '<textarea name="domiciliation" rows="4" cols="40">';
     print $account->domiciliation;
     print "</textarea></td></tr>";
 
@@ -515,8 +519,6 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 
 if ($socid && $action == 'create' && $user->rights->societe->creer)
 {
-    dol_htmloutput_mesg($message);
-
     print '<form action="rib.php?socid='.$soc->id.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
@@ -560,7 +562,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
     // IBAN
     print '<tr><td valign="top">'.$langs->trans("IBAN").'</td>';
-    print '<td colspan="4"><input size="30" type="text" name="iban_prefix" value="'.GETPOST('iban_prefix').'"></td></tr>';
+    print '<td colspan="4"><input size="30" type="text" name="iban" value="'.GETPOST('iban').'"></td></tr>';
 
     print '<tr><td valign="top">'.$langs->trans("BIC").'</td>';
     print '<td colspan="4"><input size="12" type="text" name="bic" value="'.GETPOST('bic').'"></td></tr>';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index a6ecf470d38..1a936db37fb 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2008      Patrick Raguin       <patrick.raguin@auguria.net>
- * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011-2013 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,6 +32,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -64,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';
@@ -76,7 +77,7 @@ if (! empty($canvas))
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('thirdpartycard'));
+$hookmanager->initHooks(array('thirdpartycard','globalcard'));
 
 
 /*
@@ -85,7 +86,7 @@ $hookmanager->initHooks(array('thirdpartycard'));
 
 $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
@@ -101,7 +102,24 @@ if (empty($reshook))
         $_POST["code_fournisseur"]="Acompleter";
     }
 
-    // Add new third party
+    if($action=='set_localtax1')
+    {
+    	//obtidre selected del combobox
+    	$value=GETPOST('lt1');
+    	$object = new Societe($db);
+    	$object->fetch($socid);
+    	$res=$object->setValueFrom('localtax1_value', $value);
+    }
+    if($action=='set_localtax2')
+    {
+    	//obtidre selected del combobox
+    	$value=GETPOST('lt2');
+    	$object = new Societe($db);
+    	$object->fetch($socid);
+    	$res=$object->setValueFrom('localtax2_value', $value);
+    }
+
+    // Add new or update third party
     if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
     && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
     {
@@ -118,56 +136,63 @@ if (empty($reshook))
         {
             $object->particulier       = GETPOST("private");
 
-            $object->name              = dolGetFirstLastname(GETPOST('firstname'),GETPOST('nom')?GETPOST('nom'):GETPOST('name'));
-            $object->civility_id       = GETPOST('civility_id');
+            $object->name              = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('nom','alpha')?GETPOST('nom','alpha'):GETPOST('name','alpha'));
+            $object->civility_id       = GETPOST('civility_id', 'int');
             // Add non official properties
-            $object->name_bis          = GETPOST('name')?GETPOST('name'):GETPOST('nom');
-            $object->firstname         = GETPOST('firstname');
+            $object->name_bis          = GETPOST('name','alpha')?GETPOST('name','alpha'):GETPOST('nom','alpha');
+            $object->firstname         = GETPOST('firstname','alpha');
         }
         else
         {
-            $object->name              = GETPOST('name')?GETPOST('name'):GETPOST('nom');
+            $object->name              = GETPOST('name', 'alpha')?GETPOST('name', 'alpha'):GETPOST('nom', 'alpha');
         }
-        $object->address               = GETPOST('address');
-        $object->zip                   = GETPOST('zipcode');
-        $object->town                  = GETPOST('town');
-        $object->country_id            = GETPOST('country_id');
-        $object->state_id              = GETPOST('state_id');
-        $object->skype                 = GETPOST('skype');
-        $object->phone                 = GETPOST('phone');
-        $object->fax                   = GETPOST('fax');
-        $object->email                 = GETPOST('email');
-        $object->url                   = GETPOST('url');
-        $object->idprof1               = GETPOST('idprof1');
-        $object->idprof2               = GETPOST('idprof2');
-        $object->idprof3               = GETPOST('idprof3');
-        $object->idprof4               = GETPOST('idprof4');
-        $object->idprof5               = GETPOST('idprof5');
-        $object->idprof6               = GETPOST('idprof6');
-        $object->prefix_comm           = GETPOST('prefix_comm');
-        $object->code_client           = GETPOST('code_client');
-        $object->code_fournisseur      = GETPOST('code_fournisseur');
-        $object->capital               = GETPOST('capital');
-        $object->barcode               = GETPOST('barcode');
+        $object->address               = GETPOST('address', 'alpha');
+        $object->zip                   = GETPOST('zipcode', 'alpha');
+        $object->town                  = GETPOST('town', 'alpha');
+        $object->country_id            = GETPOST('country_id', 'int');
+        $object->state_id              = GETPOST('state_id', 'int');
+        $object->skype                 = GETPOST('skype', 'alpha');
+        $object->phone                 = GETPOST('phone', 'alpha');
+        $object->fax                   = GETPOST('fax','alpha');
+        $object->email                 = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+        $object->url                   = GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+        $object->idprof1               = GETPOST('idprof1', 'alpha');
+        $object->idprof2               = GETPOST('idprof2', 'alpha');
+        $object->idprof3               = GETPOST('idprof3', 'alpha');
+        $object->idprof4               = GETPOST('idprof4', 'alpha');
+        $object->idprof5               = GETPOST('idprof5', 'alpha');
+        $object->idprof6               = GETPOST('idprof6', 'alpha');
+        $object->prefix_comm           = GETPOST('prefix_comm', 'alpha');
+        $object->code_client           = GETPOST('code_client', 'alpha');
+        $object->code_fournisseur      = GETPOST('code_fournisseur', 'alpha');
+        $object->capital               = GETPOST('capital', 'alpha');
+        $object->barcode               = GETPOST('barcode', 'alpha');
 
-        $object->tva_intra             = GETPOST('tva_intra');
-        $object->tva_assuj             = GETPOST('assujtva_value');
-        $object->status                = GETPOST('status');
+        $object->tva_intra             = GETPOST('tva_intra', 'alpha');
+        $object->tva_assuj             = GETPOST('assujtva_value', 'alpha');
+        $object->status                = GETPOST('status', 'alpha');
 
         // Local Taxes
-        $object->localtax1_assuj       = GETPOST('localtax1assuj_value');
-        $object->localtax2_assuj       = GETPOST('localtax2assuj_value');
+        $object->localtax1_assuj       = GETPOST('localtax1assuj_value', 'alpha');
+        $object->localtax2_assuj       = GETPOST('localtax2assuj_value', 'alpha');
 
-        $object->forme_juridique_code  = GETPOST('forme_juridique_code');
-        $object->effectif_id           = GETPOST('effectif_id');
-        $object->typent_id         = GETPOST('typent_id');
+        $object->localtax1_value	   = GETPOST('lt1', 'alpha');
+        $object->localtax2_value	   = GETPOST('lt2', 'alpha');
 
-        $object->client                = GETPOST('client');
-        $object->fournisseur           = GETPOST('fournisseur');
+        $object->forme_juridique_code  = GETPOST('forme_juridique_code', 'int');
+        $object->effectif_id           = GETPOST('effectif_id', 'int');
+        $object->typent_id             = GETPOST('typent_id');
 
-        $object->commercial_id         = GETPOST('commercial_id');
+        $object->client                = GETPOST('client', 'int');
+        $object->fournisseur           = GETPOST('fournisseur', 'int');
+
+        $object->commercial_id         = GETPOST('commercial_id', 'int');
         $object->default_lang          = GETPOST('default_lang');
 
+        // Webservices url/key
+        $object->webservices_url       = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+        $object->webservices_key       = GETPOST('webservices_key', 'san_alpha');
+
         // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
 
@@ -196,6 +221,18 @@ if (empty($reshook))
                 $error++; $errors[] = $langs->trans("ErrorSupplierModuleNotEnabled");
                 $action = ($action=='add'?'create':'edit');
             }
+            if (! empty($object->webservices_url)) {
+                //Check if has transport, without any the soap client will give error
+                if (strpos($object->webservices_url, "http") === false)
+                {
+                    $object->webservices_url = "http://".$object->webservices_url;
+                }
+                if (! isValidUrl($object->webservices_url)) {
+                    $langs->load("errors");
+                    $error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
+                    $action = ($action=='add'?'create':'edit');
+                }
+            }
 
             // We set country_id, country_code and country for the selected country
             $object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
@@ -319,8 +356,8 @@ if (empty($reshook))
                 	else
                 	{
                     	$url=$_SERVER["PHP_SELF"]."?socid=".$object->id;
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/fiche.php?socid=".$object->id;
-                    	else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/fiche.php?socid=".$object->id;
+                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+                    	else if ($object->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
 
                 		header("Location: ".$url);
                     	exit;
@@ -425,12 +462,10 @@ if (empty($reshook))
 
                 	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
                 	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
-                	dol_syslog(get_class($object)."::delete sql=".$sql, LOG_DEBUG);
                 	if (! $object->db->query($sql))
                 	{
                 		$error++;
                 		$object->error .= $object->db->lasterror();
-                		dol_syslog(get_class($object)."::delete erreur -1 ".$object->error, LOG_ERR);
                 	}
                 }
 
@@ -485,7 +520,9 @@ if (empty($reshook))
     // Actions to send emails
     $id=$socid;
     $actiontypecode='AC_OTH_AUTO';
+    $trigger_name='COMPANY_SENTBYMAIL';
     $paramname='socid';
+    $mode='emailfromthirdparty';
     include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
@@ -507,7 +544,7 @@ if (empty($reshook))
             // Define output language
             $outputlangs = $langs;
             $newlang='';
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
             if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$fac->client->default_lang;
             if (! empty($newlang))
             {
@@ -617,45 +654,48 @@ else
         if (GETPOST("type")=='p')  { $object->client=2; }
         if (! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")==''))  { $object->fournisseur=1; }
 
-        $object->name				= GETPOST('nom');
-        $object->firstname			= GETPOST('firstname');
+        $object->name				= GETPOST('nom', 'alpha');
+        $object->firstname			= GETPOST('firstname', 'alpha');
         $object->particulier		= $private;
         $object->prefix_comm		= GETPOST('prefix_comm');
         $object->client				= GETPOST('client')?GETPOST('client'):$object->client;
-        $object->code_client		= GETPOST('code_client');
+        $object->code_client		= GETPOST('code_client', 'alpha');
         $object->fournisseur		= GETPOST('fournisseur')?GETPOST('fournisseur'):$object->fournisseur;
-        $object->code_fournisseur	= GETPOST('code_fournisseur');
-        $object->address			= GETPOST('address');
-        $object->zip				= GETPOST('zipcode');
-        $object->town				= GETPOST('town');
-        $object->state_id			= GETPOST('state_id');
-        $object->skype				= GETPOST('skype');
-        $object->phone				= GETPOST('phone');
-        $object->fax				= GETPOST('fax');
-        $object->email				= GETPOST('email');
-        $object->url				= GETPOST('url');
-        $object->capital			= GETPOST('capital');
-        $object->barcode			= GETPOST('barcode');
-        $object->idprof1			= GETPOST('idprof1');
-        $object->idprof2			= GETPOST('idprof2');
-        $object->idprof3			= GETPOST('idprof3');
-        $object->idprof4			= GETPOST('idprof4');
-        $object->idprof5			= GETPOST('idprof5');
-        $object->idprof6			= GETPOST('idprof6');
-        $object->typent_id			= GETPOST('typent_id');
-        $object->effectif_id		= GETPOST('effectif_id');
-        $object->civility_id		= GETPOST('civility_id');
+        $object->code_fournisseur	= GETPOST('code_fournisseur', 'alpha');
+        $object->address			= GETPOST('address', 'alpha');
+        $object->zip				= GETPOST('zipcode', 'alpha');
+        $object->town				= GETPOST('town', 'alpha');
+        $object->state_id			= GETPOST('state_id', 'int');
+        $object->skype				= GETPOST('skype', 'alpha');
+        $object->phone				= GETPOST('phone', 'alpha');
+        $object->fax				= GETPOST('fax', 'alpha');
+        $object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+        $object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+        $object->capital			= GETPOST('capital', 'int');
+        $object->barcode			= GETPOST('barcode', 'alpha');
+        $object->idprof1			= GETPOST('idprof1', 'alpha');
+        $object->idprof2			= GETPOST('idprof2', 'alpha');
+        $object->idprof3			= GETPOST('idprof3', 'alpha');
+        $object->idprof4			= GETPOST('idprof4', 'alpha');
+        $object->idprof5			= GETPOST('idprof5', 'alpha');
+        $object->idprof6			= GETPOST('idprof6', 'alpha');
+        $object->typent_id			= GETPOST('typent_id', 'int');
+        $object->effectif_id		= GETPOST('effectif_id', 'int');
+        $object->civility_id		= GETPOST('civility_id', 'int');
 
-        $object->tva_assuj			= GETPOST('assujtva_value');
-        $object->status				= GETPOST('status');
+        $object->tva_assuj			= GETPOST('assujtva_value', 'int');
+        $object->status				= GETPOST('status', 'int');
 
         //Local Taxes
-        $object->localtax1_assuj	= GETPOST('localtax1assuj_value');
-        $object->localtax2_assuj	= GETPOST('localtax2assuj_value');
+        $object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
+        $object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
 
-        $object->tva_intra			= GETPOST('tva_intra');
+        $object->localtax1_value	=GETPOST('lt1', 'int');
+        $object->localtax2_value	=GETPOST('lt2', 'int');
 
-        $object->commercial_id		= GETPOST('commercial_id');
+        $object->tva_intra			= GETPOST('tva_intra', 'alpha');
+
+        $object->commercial_id		= GETPOST('commercial_id', 'int');
         $object->default_lang		= GETPOST('default_lang');
 
         $object->logo = (isset($_FILES['photo'])?dol_sanitizeFileName($_FILES['photo']['name']):'');
@@ -742,12 +782,19 @@ else
             print '<div class="hideonsmartphone float">';
             print $langs->trans("ThirdPartyType").': &nbsp; &nbsp; ';
             print '</div>';
-            print '<input type="radio" id="radiocompany" class="flat" name="private" value="0"'.($private?'':' checked="checked"');
-            print '> '.$langs->trans("Company/Fundation");
+	        print '<label for="radiocompany">';
+            print '<input type="radio" id="radiocompany" class="flat" name="private"  value="0"'.($private?'':' checked="checked"').'>';
+	        print '&nbsp;';
+            print $langs->trans("Company/Fundation");
+	        print '</label>';
             print ' &nbsp; &nbsp; ';
-            print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'');
-            print '> '.$langs->trans("Individual");
-            print ' ('.$langs->trans("ToCreateContactWithSameName").')';
+	        print '<label for="radioprivate">';
+            $text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
+	        $text.='&nbsp;';
+	        $text.= $langs->trans("Individual");
+	        $htmltext=$langs->trans("ToCreateContactWithSameName");
+	        print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
+            print '</label>';
             print '</div>';
             print "<br>\n";
         }
@@ -768,36 +815,37 @@ else
         print '<table class="border" width="100%">';
 
         // Name, firstname
+	    print '<tr><td>';
         if ($object->particulier || $private)
         {
-            print '<tr><td><span id="TypeName" class="fieldrequired">'.$langs->trans('LastName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$object->name.'"></td>';
-            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-            {
-                print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
-            }
-            print '</tr>';
+	        print '<span id="TypeName" class="fieldrequired"><label for="name">'.$langs->trans('LastName').'</label></span>';
         }
         else
 		{
-            print '<tr><td><span span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'><input type="text" size="30" maxlength="60" name="nom" value="'.$object->name.'"></td>';
-            if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-            {
-                print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
-            }
-            print '</tr>';
+			print '<span span id="TypeName" class="fieldrequired"><label for="name">'.$langs->trans('ThirdPartyName').'</label></span>';
         }
+	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+	    print '<input type="text" size="60" maxlength="128" name="nom" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
+	    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	    {
+		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
+	    }
+	    print '</tr>';
+
         // If javascript on, we show option individual
         if ($conf->use_javascript_ajax)
         {
-            print '<tr class="individualline"><td>'.$langs->trans('FirstName').'</td><td><input type="text" size="30" name="firstname" value="'.$object->firstname.'"></td>';
+            print '<tr class="individualline"><td><label for="firstname">'.$langs->trans('FirstName').'</label></td>';
+	        print '<td><input type="text" size="60" name="firstname" id="firstname" value="'.$object->firstname.'"></td>';
             print '<td colspan=2>&nbsp;</td></tr>';
-            print '<tr class="individualline"><td>'.$langs->trans("UserTitle").'</td><td>';
+            print '<tr class="individualline"><td><label for="civility_id">'.$langs->trans("UserTitle").'</label></td><td>';
             print $formcompany->select_civility($object->civility_id).'</td>';
             print '<td colspan=2>&nbsp;</td></tr>';
         }
 
         // Prospect/Customer
-        print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%" class="maxwidthonsmartphone"><select class="flat" name="client">';
+        print '<tr><td width="25%"><span class="fieldrequired"><label for="customerprospect">'.$langs->trans('ProspectCustomer').'</label></span></td>';
+	    print '<td width="25%" class="maxwidthonsmartphone"><select class="flat" name="client" id="customerprospect">';
         $selected=isset($_POST['client'])?GETPOST('client'):$object->client;
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($selected==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
         if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($selected==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
@@ -805,11 +853,11 @@ else
         print '<option value="0"'.($selected==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
         print '</select></td>';
 
-        print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
+        print '<td width="25%"><label for="customer_code">'.$langs->trans('CustomerCode').'</label></td><td width="25%">';
         print '<table class="nobordernopadding"><tr><td>';
         $tmpcode=$object->code_client;
         if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
-        print '<input type="text" name="code_client" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+        print '<input type="text" name="code_client" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
         print '</td><td>';
         $s=$modCodeClient->getToolTip($langs,$object,0);
         print $form->textwithpicto('',$s,1);
@@ -820,14 +868,14 @@ else
         {
             // Supplier
             print '<tr>';
-            print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
+            print '<td><span class="fieldrequired"><label for="fournisseur">'.$langs->trans('Supplier').'</label></span></td><td>';
             print $form->selectyesno("fournisseur",(isset($_POST['fournisseur'])?GETPOST('fournisseur'):$object->fournisseur),1);
             print '</td>';
-            print '<td>'.$langs->trans('SupplierCode').'</td><td>';
+            print '<td><label for="supplier_code">'.$langs->trans('SupplierCode').'</label></td><td>';
             print '<table class="nobordernopadding"><tr><td>';
             $tmpcode=$object->code_fournisseur;
             if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
-            print '<input type="text" name="code_fournisseur" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+            print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
             print '</td><td>';
             $s=$modCodeFournisseur->getToolTip($langs,$object,1);
             print $form->textwithpicto('',$s,1);
@@ -836,57 +884,64 @@ else
         }
 
         // Status
-        print '<tr><td>'.$langs->trans('Status').'</td><td colspan="3">';
+        print '<tr><td><label for="status">'.$langs->trans('Status').'</label></td><td colspan="3">';
         print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),1);
         print '</td></tr>';
 
         // Barcode
         if (! empty($conf->barcode->enabled))
         {
-            print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">';
+            print '<tr><td><label for="barcode">'.$langs->trans('Gencod').'</label></td>';
+	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
             print '</td></tr>';
         }
 
         // Address
-        print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="40" rows="3" wrap="soft">';
+        print '<tr><td valign="top"><label for="address">'.$langs->trans('Address').'</label></td>';
+	    print '<td colspan="3"><textarea name="address" id="address" cols="40" rows="3" wrap="soft">';
         print $object->address;
         print '</textarea></td></tr>';
 
         // Zip / Town
-        print '<tr><td>'.$langs->trans('Zip').'</td><td>';
+        print '<tr><td><label for="zipcode">'.$langs->trans('Zip').'</label></td><td>';
         print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
-        print '</td><td>'.$langs->trans('Town').'</td><td>';
+        print '</td><td><label for="town">'.$langs->trans('Town').'</label></td><td>';
         print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
         print '</td></tr>';
 
         // Country
-        print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3" class="maxwidthonsmartphone">';
-        print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
+        print '<tr><td width="25%"><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+        print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id));
         if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
         print '</td></tr>';
 
         // State
         if (empty($conf->global->SOCIETE_DISABLE_STATE))
         {
-            print '<tr><td>'.$langs->trans('State').'</td><td colspan="3" class="maxwidthonsmartphone">';
-            if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code,'state_id');
+            print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+            if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code);
             else print $countrynotdefined;
             print '</td></tr>';
         }
 
         // Email web
-        print '<tr><td>'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td><td colspan="3"><input type="text" name="email" size="32" value="'.$object->email.'"></td></tr>';
-        print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3"><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
+        print '<tr><td><label for="email">'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</label></td>';
+	    print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
+        print '<tr><td><label for="url">'.$langs->trans('Web').'</label></td>';
+	    print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
 
         // Skype
         if (! empty($conf->skype->enabled))
         {
-            print '<tr><td>'.$langs->trans('Skype').'</td><td colspan="3"><input type="text" name="skype" size="32" value="'.$object->skype.'"></td></tr>';
+            print '<tr><td><label for="skype">'.$langs->trans('Skype').'</label></td>';
+	        print '<td colspan="3"><input type="text" name="skype" id="skype" size="32" value="'.$object->skype.'"></td></tr>';
         }
 
         // Phone / Fax
-        print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="phone" value="'.$object->phone.'"></td>';
-        print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>';
+        print '<tr><td><label for="phone">'.$langs->trans('Phone').'</label></td>';
+	    print '<td><input type="text" name="phone" id="phone" value="'.$object->phone.'"></td>';
+        print '<td><label for="fax">'.$langs->trans('Fax').'</label></td>';
+	    print '<td><input type="text" name="fax" id="fax" value="'.$object->fax.'"></td></tr>';
 
         // Prof ids
         $i=1; $j=0;
@@ -895,16 +950,17 @@ else
             $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
             if ($idprof!='-')
             {
+	            $key='idprof'.$i;
+
                 if (($j % 2) == 0) print '<tr>';
 
                 $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
                	if(empty($conf->global->$idprof_mandatory))
-                	print '<td>'.$idprof.'</td><td>';
+                	print '<td><label for="'.$key.'">'.$idprof.'</label></td><td>';
                 else
-                print '<td><span class="fieldrequired">'.$idprof.'</td><td>';
+                    print '<td><span class="fieldrequired"><label for="'.$key.'">'.$idprof.'</label></td><td>';
 
-                $key='idprof'.$i;
-                print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
+                print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code);
                 print '</td>';
                 if (($j % 2) == 1) print '</tr>';
                 $j++;
@@ -914,13 +970,13 @@ else
         if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
 
         // Assujeti TVA
-        print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
+        print '<tr><td><label for="assujtva_value">'.$langs->trans('VATIsUsed').'</label></td>';
         print '<td>';
         print $form->selectyesno('assujtva_value',1,1);     // Assujeti par defaut en creation
         print '</td>';
-        print '<td class="nowrap">'.$langs->trans('VATIntra').'</td>';
+        print '<td class="nowrap"><label for="intra_vat">'.$langs->trans('VATIntra').'</label></td>';
         print '<td class="nowrap">';
-        $s = '<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">';
+        $s = '<input type="text" class="flat" name="tva_intra" id="intra_vat" size="12" maxlength="20" value="'.$object->tva_intra.'">';
 
         if (empty($conf->global->MAIN_DISABLEVATCHECK))
         {
@@ -948,17 +1004,17 @@ else
         print '</tr>';
 
         // Type - Size
-        print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'."\n";
+        print '<tr><td><label for="typent_id">'.$langs->trans("ThirdPartyType").'</label></td><td>'."\n";
         print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
         if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
         print '</td>';
-        print '<td>'.$langs->trans("Staff").'</td><td>';
+        print '<td><label for="effectif_id">'.$langs->trans("Staff").'</label></td><td>';
         print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
         if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
         print '</td></tr>';
 
         // Legal Form
-        print '<tr><td>'.$langs->trans('JuridicalStatus').'</td>';
+        print '<tr><td><label for="legal_form">'.$langs->trans('JuridicalStatus').'</label></td>';
         print '<td colspan="3" class="maxwidthonsmartphone">';
         if ($object->country_id)
         {
@@ -971,7 +1027,8 @@ else
         print '</td></tr>';
 
         // Capital
-        print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> ';
+        print '<tr><td><label for="capital">'.$langs->trans('Capital').'</label></td>';
+	    print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> ';
         print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 
         // Local Taxes
@@ -997,16 +1054,17 @@ else
             print $form->selectyesno('localtax2assuj_value',0,1);
             print '</td><tr>';
         }
-
+/*
         if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='')  )
         {
         	print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
         	print $form->selectyesno('localtax2assuj_value',0,1);
         	print '</td><tr>';
         }
+*/
         if (! empty($conf->global->MAIN_MULTILANGS))
         {
-            print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+            print '<tr><td><label for="default_lang">'.$langs->trans("DefaultLang").'</label></td><td colspan="3" class="maxwidthonsmartphone">'."\n";
             print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT),'default_lang',0,0,1);
             print '</td>';
             print '</tr>';
@@ -1016,7 +1074,7 @@ else
         {
             // Assign a Name
             print '<tr>';
-            print '<td>'.$langs->trans("AllocateCommercial").'</td>';
+            print '<td><label for="commercial_id">'.$langs->trans("AllocateCommercial").'</label></td>';
             print '<td colspan="3" class="maxwidthonsmartphone">';
             $form->select_users((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default
             print '</td></tr>';
@@ -1032,7 +1090,7 @@ else
 
         // Ajout du logo
         print '<tr class="hideonsmartphone">';
-        print '<td>'.$langs->trans("Logo").'</td>';
+        print '<td><label for="photoinput">'.$langs->trans("Logo").'</label></td>';
         print '<td colspan="3">';
         print '<input class="flat" type="file" name="photo" id="photoinput" />';
         print '</td>';
@@ -1066,7 +1124,7 @@ else
 
 	        dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
 
-	         
+
             // Load object modCodeTiers
             $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard');
             if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
@@ -1102,49 +1160,56 @@ else
             {
                 $prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
             }
-            
+
             $object->oldcopy=dol_clone($object);
-            
+
             if (GETPOST('nom'))
             {
                 // We overwrite with values if posted
-                $object->name					= GETPOST('nom');
-                $object->prefix_comm			= GETPOST('prefix_comm');
-                $object->client					= GETPOST('client');
-                $object->code_client			= GETPOST('code_client');
-                $object->fournisseur			= GETPOST('fournisseur');
-                $object->code_fournisseur		= GETPOST('code_fournisseur');
-                $object->address				= GETPOST('address');
-                $object->zip					= GETPOST('zipcode');
-                $object->town					= GETPOST('town');
-                $object->country_id				= GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
-                $object->state_id				= GETPOST('state_id');
-                $object->skype					= GETPOST('skype');
-                $object->phone					= GETPOST('phone');
-                $object->fax					= GETPOST('fax');
-                $object->email					= GETPOST('email');
-                $object->url					= GETPOST('url');
-                $object->capital				= GETPOST('capital');
-                $object->idprof1				= GETPOST('idprof1');
-                $object->idprof2				= GETPOST('idprof2');
-                $object->idprof3				= GETPOST('idprof3');
-                $object->idprof4				= GETPOST('idprof4');
-        		    $object->idprof5				= GETPOST('idprof5');
-        		    $object->idprof6				= GETPOST('idprof6');
-                $object->typent_id				= GETPOST('typent_id');
-                $object->effectif_id			= GETPOST('effectif_id');
-                $object->barcode				= GETPOST('barcode');
-                $object->forme_juridique_code	= GETPOST('forme_juridique_code');
-                $object->default_lang			= GETPOST('default_lang');
-                
-                $object->tva_assuj				= GETPOST('assujtva_value');
-                $object->tva_intra				= GETPOST('tva_intra');
-                $object->status					= GETPOST('status');
+                $object->name					= GETPOST('nom', 'alpha');
+                $object->prefix_comm			= GETPOST('prefix_comm', 'alpha');
+                $object->client					= GETPOST('client', 'int');
+                $object->code_client			= GETPOST('code_client', 'alpha');
+                $object->fournisseur			= GETPOST('fournisseur', 'int');
+                $object->code_fournisseur		= GETPOST('code_fournisseur', 'alpha');
+                $object->address				= GETPOST('address', 'alpha');
+                $object->zip					= GETPOST('zipcode', 'alpha');
+                $object->town					= GETPOST('town', 'alpha');
+                $object->country_id				= GETPOST('country_id')?GETPOST('country_id', 'int'):$mysoc->country_id;
+                $object->state_id				= GETPOST('state_id', 'int');
+                $object->skype					= GETPOST('skype', 'alpha');
+                $object->phone					= GETPOST('phone', 'alpha');
+                $object->fax					= GETPOST('fax', 'alpha');
+                $object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+                $object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+                $object->capital				= GETPOST('capital', 'int');
+                $object->idprof1				= GETPOST('idprof1', 'alpha');
+                $object->idprof2				= GETPOST('idprof2', 'alpha');
+                $object->idprof3				= GETPOST('idprof3', 'alpha');
+                $object->idprof4				= GETPOST('idprof4', 'alpha');
+        		    $object->idprof5				= GETPOST('idprof5', 'alpha');
+        		    $object->idprof6				= GETPOST('idprof6', 'alpha');
+                $object->typent_id				= GETPOST('typent_id', 'int');
+                $object->effectif_id			= GETPOST('effectif_id', 'int');
+                $object->barcode				= GETPOST('barcode', 'alpha');
+                $object->forme_juridique_code	= GETPOST('forme_juridique_code', 'int');
+                $object->default_lang			= GETPOST('default_lang', 'alpha');
+
+                $object->tva_assuj				= GETPOST('assujtva_value', 'int');
+                $object->tva_intra				= GETPOST('tva_intra', 'alpha');
+                $object->status					= GETPOST('status', 'int');
+
+                // Webservices url/key
+                $object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+                $object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
                 //Local Taxes
                 $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
                 $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
 
+                $object->localtax1_value		=GETPOST('lt1');
+                $object->localtax2_value		=GETPOST('lt2');
+
                 // We set country_id, and country_code label of the chosen country
                 if ($object->country_id > 0)
                 {
@@ -1156,6 +1221,53 @@ else
 
             dol_htmloutput_errors($error,$errors);
 
+            if($object->localtax1_assuj==0){
+            	$sub=0;
+            }else{$sub=1;}
+            if($object->localtax2_assuj==0){
+            	$sub2=0;
+            }else{$sub2=1;}
+
+
+            print "\n".'<script type="text/javascript">';
+            print '$(document).ready(function () {
+    			var val='.$sub.';
+    			var val2='.$sub2.';
+    			if("#localtax1assuj_value".value==undefined){
+    				if(val==1){
+    					$(".cblt1").show();
+    				}else{
+    					$(".cblt1").hide();
+    				}
+    			}
+    			if("#localtax2assuj_value".value==undefined){
+    				if(val2==1){
+    					$(".cblt2").show();
+    				}else{
+    					$(".cblt2").hide();
+    				}
+    			}
+    			$("#localtax1assuj_value").change(function() {
+               		var value=document.getElementById("localtax1assuj_value").value;
+    				if(value==1){
+    					$(".cblt1").show();
+    				}else{
+    					$(".cblt1").hide();
+    				}
+    			});
+    			$("#localtax2assuj_value").change(function() {
+    				var value=document.getElementById("localtax2assuj_value").value;
+    				if(value==1){
+    					$(".cblt2").show();
+    				}else{
+    					$(".cblt2").hide();
+    				}
+    			});
+
+               });';
+            print '</script>'."\n";
+
+
             if ($conf->use_javascript_ajax)
             {
                 print "\n".'<script type="text/javascript" language="javascript">';
@@ -1173,16 +1285,17 @@ else
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="socid" value="'.$object->id.'">';
             if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
-            
+
             print '<table class="border" width="100%">';
 
             // Name
-            print '<tr><td><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="'.dol_escape_htmltag($object->name).'"></td></tr>';
+            print '<tr><td><label for="name"><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></label></td>';
+	        print '<td colspan="3"><input type="text" size="60" maxlength="128" name="nom" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus"></td></tr>';
 
             // Prefix
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
             {
-                print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
+                print '<tr><td><label for="prefix">'.$langs->trans("Prefix").'</label></td><td colspan="3">';
                 // It does not change the prefix mode using the auto numbering prefix
                 if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
                 {
@@ -1191,19 +1304,20 @@ else
                 }
                 else
                 {
-                    print '<input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
+                    print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
                 print '</td>';
             }
 
             // Prospect/Customer
-            print '<tr><td width="25%"><span class="fieldrequired">'.$langs->trans('ProspectCustomer').'</span></td><td width="25%"><select class="flat" name="client">';
+            print '<tr><td width="25%"><span class="fieldrequired"><label for="customerprospect">'.$langs->trans('ProspectCustomer').'</label></span></td>';
+	        print '<td width="25%"><select class="flat" name="client" id="customerprospect">';
             if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print '<option value="2"'.($object->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
             if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="3"'.($object->client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'</option>';
             if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print '<option value="1"'.($object->client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'</option>';
             print '<option value="0"'.($object->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
             print '</select></td>';
-            print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
+            print '<td width="25%"><label for="customer_code">'.$langs->trans('CustomerCode').'</label></td><td width="25%">';
 
             print '<table class="nobordernopadding"><tr><td>';
             if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
@@ -1211,11 +1325,11 @@ else
                 $tmpcode=$object->code_client;
                 if (empty($tmpcode) && ! empty($object->oldcopy->code_client)) $tmpcode=$object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
                 if (empty($tmpcode) && ! empty($modCodeClient->code_auto)) $tmpcode=$modCodeClient->getNextValue($object,0);
-                print '<input type="text" name="code_client" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+                print '<input type="text" name="code_client" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
             }
             else if ($object->codeclient_modifiable())
             {
-                print '<input type="text" name="code_client" size="16" value="'.$object->code_client.'" maxlength="15">';
+                print '<input type="text" name="code_client" id="customer_code" size="16" value="'.$object->code_client.'" maxlength="15">';
             }
             else
             {
@@ -1233,10 +1347,10 @@ else
             if (! empty($conf->fournisseur->enabled) && ! empty($user->rights->fournisseur->lire))
             {
                 print '<tr>';
-                print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
+                print '<td><span class="fieldrequired"><label for="fournisseur">'.$langs->trans('Supplier').'</label></span></td><td>';
                 print $form->selectyesno("fournisseur",$object->fournisseur,1);
                 print '</td>';
-                print '<td>'.$langs->trans('SupplierCode').'</td><td>';
+                print '<td><label for="supplier_code">'.$langs->trans('SupplierCode').'</label></td><td>';
 
                 print '<table class="nobordernopadding"><tr><td>';
                 if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
@@ -1244,11 +1358,11 @@ else
                     $tmpcode=$object->code_fournisseur;
                     if (empty($tmpcode) && ! empty($object->oldcopy->code_fournisseur)) $tmpcode=$object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
                     if (empty($tmpcode) && ! empty($modCodeFournisseur->code_auto)) $tmpcode=$modCodeFournisseur->getNextValue($object,1);
-                    print '<input type="text" name="code_fournisseur" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
+                    print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
                 }
                 else if ($object->codefournisseur_modifiable())
                 {
-                    print '<input type="text" name="code_fournisseur" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
+                    print '<input type="text" name="code_fournisseur" id="supplier_code" size="16" value="'.$object->code_fournisseur.'" maxlength="15">';
                 }
                 else
               {
@@ -1266,29 +1380,31 @@ else
             // Barcode
             if (! empty($conf->barcode->enabled))
             {
-                print '<tr><td valign="top">'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">';
+                print '<tr><td valign="top"><label for="barcode">'.$langs->trans('Gencod').'</label></td>';
+	            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
                 print '</td></tr>';
             }
 
             // Status
-            print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
+            print '<tr><td><label for="status">'.$langs->trans("Status").'</label></td><td colspan="3">';
             print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$object->status);
             print '</td></tr>';
 
             // Address
-            print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="40" rows="3" wrap="soft">';
+            print '<tr><td valign="top"><label for="address">'.$langs->trans('Address').'</label></td>';
+	        print '<td colspan="3"><textarea name="address" id="address" cols="40" rows="3" wrap="soft">';
             print $object->address;
             print '</textarea></td></tr>';
 
             // Zip / Town
-            print '<tr><td>'.$langs->trans('Zip').'</td><td>';
+            print '<tr><td><label for="zipcode">'.$langs->trans('Zip').'</label></td><td>';
             print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
-            print '</td><td>'.$langs->trans('Town').'</td><td>';
+            print '</td><td><label for="town">'.$langs->trans('Town').'</label></td><td>';
             print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
             print '</td></tr>';
 
             // Country
-            print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
+            print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td colspan="3">';
             print $form->select_country((GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id),'country_id');
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
             print '</td></tr>';
@@ -1296,24 +1412,29 @@ else
             // State
             if (empty($conf->global->SOCIETE_DISABLE_STATE))
             {
-                print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
+                print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3">';
                 print $formcompany->select_state($object->state_id,$object->country_code);
                 print '</td></tr>';
             }
 
             // EMail / Web
-            print '<tr><td>'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</td><td colspan="3"><input type="text" name="email" size="32" value="'.$object->email.'"></td></tr>';
-            print '<tr><td>'.$langs->trans('Web').'</td><td colspan="3"><input type="text" name="url" size="32" value="'.$object->url.'"></td></tr>';
+            print '<tr><td><label for="email">'.$langs->trans('EMail').(! empty($conf->global->SOCIETE_MAIL_REQUIRED)?'*':'').'</label></td>';
+	        print '<td colspan="3"><input type="text" name="email" id="email" size="32" value="'.$object->email.'"></td></tr>';
+            print '<tr><td><label for="url">'.$langs->trans('Web').'</label></td>';
+	        print '<td colspan="3"><input type="text" name="url" id="url" size="32" value="'.$object->url.'"></td></tr>';
 
             // Skype
             if (! empty($conf->skype->enabled))
             {
-                print '<tr><td>'.$langs->trans('Skype').'</td><td colspan="3"><input type="text" name="skype" size="32" value="'.$object->skype.'"></td></tr>';
+                print '<tr><td><label for="skype">'.$langs->trans('Skype').'</label></td>';
+	            print '<td colspan="3"><input type="text" name="skype" id="skype" size="32" value="'.$object->skype.'"></td></tr>';
             }
 
             // Phone / Fax
-            print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="phone" value="'.$object->phone.'"></td>';
-            print '<td>'.$langs->trans('Fax').'</td><td><input type="text" name="fax" value="'.$object->fax.'"></td></tr>';
+            print '<tr><td><label for="phone">'.$langs->trans('Phone').'</label></td>';
+	        print '<td><input type="text" name="phone" id="phone" value="'.$object->phone.'"></td>';
+            print '<td><label for="fax">'.$langs->trans('Fax').'</label></td>';
+	        print '<td><input type="text" name="fax" id="fax" value="'.$object->fax.'"></td></tr>';
 
             // Prof ids
             $i=1; $j=0;
@@ -1322,16 +1443,17 @@ else
                 $idprof=$langs->transcountry('ProfId'.$i,$object->country_code);
                 if ($idprof!='-')
                 {
-                    if (($j % 2) == 0) print '<tr>';
+	                $key='idprof'.$i;
 
-					$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
-					if(empty($conf->global->$idprof_mandatory))
-						print '<td>'.$idprof.'</td><td>';
-					else
-						print '<td><span class="fieldrequired">'.$idprof.'</td><td>';
+	                if (($j % 2) == 0) print '<tr>';
 
-                    $key='idprof'.$i;
-                    print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
+	                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+	                if(empty($conf->global->$idprof_mandatory))
+	                    print '<td><label for="'.$key.'">'.$idprof.'</label></td><td>';
+                    else
+	                    print '<td><span class="fieldrequired"><label for="'.$key.'">'.$idprof.'</label></td><td>';
+
+	                print $formcompany->get_input_id_prof($i,$key,$object->$key,$object->country_code);
                     print '</td>';
                     if (($j % 2) == 1) print '</tr>';
                     $j++;
@@ -1341,14 +1463,14 @@ else
             if ($j % 2 == 1) print '<td colspan="2"></td></tr>';
 
             // VAT payers
-            print '<tr><td>'.$langs->trans('VATIsUsed').'</td><td>';
+            print '<tr><td><label for="assjtva_value">'.$langs->trans('VATIsUsed').'</label></td><td>';
             print $form->selectyesno('assujtva_value',$object->tva_assuj,1);
             print '</td>';
 
             // VAT Code
-            print '<td>'.$langs->trans('VATIntra').'</td>';
+            print '<td><label for="intra_vat">'.$langs->trans('VATIntra').'</label></td>';
             print '<td>';
-            $s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">';
+            $s ='<input type="text" class="flat" name="tva_intra" id="intra_vat" size="12" maxlength="20" value="'.$object->tva_intra.'">';
 
             if (empty($conf->global->MAIN_DISABLEVATCHECK))
             {
@@ -1377,57 +1499,76 @@ else
 
             // Local Taxes
             //TODO: Place into a function to control showing by country or study better option
-            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
+        	if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
             {
-                print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+                print '<tr><td><label for="localtax1assuj_value">'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</label></td><td>';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                print '</td><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+                if(! isOnlyOneLocalTax(1))
+                {
+                	print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+                	$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+                	print '</span>';
+                }
+
+                print '</td><td><label for="localtax2assuj_value">'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</label></td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
+	            if  (! isOnlyOneLocalTax(2))
+	            {
+	            		print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+	                	$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+                		print '</span>';
+                }
                 print '</td></tr>';
 
             }
-            elseif($mysoc->localtax1_assuj=="1")
+            elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
             {
-                print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+                print '<tr><td><label for="localtax1assuj_value">'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</label></td><td colspan="3">';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
+                if(! isOnlyOneLocalTax(1))
+                {
+                	print '<span class="cblt1">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+	                $formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+                	print '</span>';
+                }
                 print '</td></tr>';
 
             }
-            elseif($mysoc->localtax2_assuj=="1")
+            elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
             {
-                print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+                print '<tr><td><label for="localtax2assuj_value">'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</label></td><td colspan="3">';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
+                if(! isOnlyOneLocalTax(2))
+                {
+                	print '<span class="cblt2">     '.$langs->transcountry("Type",$mysoc->country_code).': ';
+                	$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+                	print '</span>';
+                }
                 print '</td></tr>';
             }
 
-            if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && $object->fournisseur==1)
-            {
-            	print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
-            	print $form->selectyesno('localtax2assuj_value',0,1);
-            	print '</td><tr>';
-            }
-
             // Type - Size
-            print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
+            print '<tr><td><label for="typent_id">'.$langs->trans("ThirdPartyType").'</label></td><td>';
             print $form->selectarray("typent_id",$formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
             print '</td>';
-            print '<td>'.$langs->trans("Staff").'</td><td>';
+            print '<td><label for="effectif_id">'.$langs->trans("Staff").'</label></td><td>';
             print $form->selectarray("effectif_id",$formcompany->effectif_array(0), $object->effectif_id);
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
             print '</td></tr>';
 
-            print '<tr><td>'.$langs->trans('JuridicalStatus').'</td><td colspan="3">';
+            print '<tr><td><label for="legal_form">'.$langs->trans('JuridicalStatus').'</label></td><td colspan="3">';
             print $formcompany->select_juridicalstatus($object->forme_juridique_code,$object->country_code);
             print '</td></tr>';
 
             // Capital
-            print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
+            print '<tr><td><label for="capital">'.$langs->trans("Capital").'</label></td>';
+	        print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"><font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
 
             // Default language
             if (! empty($conf->global->MAIN_MULTILANGS))
             {
-                print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
+                print '<tr><td><label for="default_lang">'.$langs->trans("DefaultLang").'</label></td><td colspan="3">'."\n";
                 print $formadmin->select_language($object->default_lang,'default_lang',0,0,1);
                 print '</td>';
                 print '</tr>';
@@ -1441,9 +1582,17 @@ else
             	print $object->showOptionals($extrafields,'edit');
             }
 
+            // Webservices url/key
+            if (!empty($conf->syncsupplierwebservices->enabled)) {
+                print '<tr><td><label for="webservices_url">'.$langs->trans('WebServiceURL').'</label></td>';
+                print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
+                print '<td><label for="webservices_key">'.$langs->trans('WebServiceKey').'</label></td>';
+                print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
+            }
+
             // Logo
             print '<tr class="hideonsmartphone">';
-            print '<td>'.$langs->trans("Logo").'</td>';
+            print '<td><label for="photoinput">'.$langs->trans("Logo").'</label></td>';
             print '<td colspan="3">';
             if ($object->logo) print $form->showphoto('societe',$object);
             $caneditfield=1;
@@ -1581,7 +1730,11 @@ else
         // Status
         print '<tr><td>'.$langs->trans("Status").'</td>';
         print '<td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">';
-        print $object->getLibStatut(2);
+        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);
+        }
         print '</td>';
         print $htmllogobar; $htmllogobar='';
         print '</tr>';
@@ -1711,27 +1864,93 @@ else
             print yn($object->localtax2_assuj);
             print '</td></tr>';
 
+            if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+            {
+            	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+            	print '<input type="hidden" name="action" value="set_localtax1">';
+            	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            	print '<tr><td>'.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+            	if($action == 'editRE')
+            	{
+            		print '<td align="left">';
+            		$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+            		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            	}
+            	else
+            	{
+            		print '<td>'.$object->localtax1_value.'</td>';
+            	}
+            	print '</tr></form>';
+            }
+            if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+            {
+            	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+            	print '<input type="hidden" name="action" value="set_localtax2">';
+            	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            	print '<tr><td>'.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+            	if($action == 'editIRPF'){
+            		print '<td align="left">';
+            		$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+            		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            	}else{
+            		print '<td>'.$object->localtax2_value.'</td>';
+            	}
+            	print '</tr></form>';
+            }
         }
-        elseif($mysoc->localtax1_assuj=="1")
+        elseif($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj!="1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print yn($object->localtax1_assuj);
             print '</td><tr>';
+            if($object->localtax1_assuj=="1" && (! isOnlyOneLocalTax(1)))
+            {
+            	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+            	print '<input type="hidden" name="action" value="set_localtax1">';
+            	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            	print '<tr><td> '.$langs->transcountry("TypeLocaltax1", $mysoc->country_code).'<a href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+            	if($action == 'editRE'){
+            		print '<td align="left">';
+            		$formcompany->select_localtax(1,$object->localtax1_value, "lt1");
+            		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            	}else{
+            		print '<td>'.$object->localtax1_value.'</td>';
+            	}
+            	print '</tr></form>';
+
+            }
         }
-        elseif($mysoc->localtax2_assuj=="1")
+        elseif($mysoc->localtax2_assuj=="1" && $mysoc->localtax1_assuj!="1")
         {
             print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print yn($object->localtax2_assuj);
             print '</td><tr>';
-        }
+            if($object->localtax2_assuj=="1" && (! isOnlyOneLocalTax(2)))
+            {
 
+            	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
+            	print '<input type="hidden" name="action" value="set_localtax2">';
+            	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            	print '<tr><td> '.$langs->transcountry("TypeLocaltax2", $mysoc->country_code).' <a href="'.$_SERVER["PHP_SELF"].'?action=editIRPF&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'),1).'</td>';
+            	if($action == 'editIRPF'){
+            		print '<td align="left">';
+            		$formcompany->select_localtax(2,$object->localtax2_value, "lt2");
+            		print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            	}else{
+            		print '<td>'.$object->localtax2_value.'</td>';
+            	}
+            	print '</tr></form>';
+
+            }
+        }
+/*
         if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && $object->fournisseur==1)
         {
         	print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
             print yn($object->localtax2_assuj);
             print '</td><tr>';
         }
-
+*/
         // Type + Staff
         $arr = $formcompany->typent_array(1);
         $object->typent= $arr[$object->typent_code];
@@ -1831,6 +2050,12 @@ else
             print "</tr>\n";
         }
 
+        // Webservices url/key
+        if (!empty($conf->syncsupplierwebservices->enabled)) {
+            print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
+            print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
+        }
+
         print '</table>';
 
         dol_fiche_end();
@@ -1892,9 +2117,18 @@ else
 			print '<br>';
 			print_titre($langs->trans($titreform));
 
+			// Define output language
+			$outputlangs = $langs;
+			$newlang = '';
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+				$newlang = $_REQUEST['lang_id'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+				$newlang = $object->client->default_lang;
+
 			// Cree l'objet formulaire mail
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$formmail = new FormMail($db);
+			$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
 			$formmail->fromtype = 'user';
 			$formmail->fromid   = $user->id;
 			$formmail->fromname = $user->getFullName($langs);
@@ -1964,7 +2198,7 @@ else
 
 	        if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
 	        {
-				print '<div class="fichecenter"><div class="fichethirdleft">';
+				print '<div class="fichecenter"><div class="fichehalfleft">';
 	            print '<a name="builddoc"></a>'; // ancre
 
 	            /*
@@ -1979,7 +2213,7 @@ else
 
 	            $somethingshown=$formfile->show_documents('company',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
 
-				print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+				print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 
 				print '</div></div></div>';
diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index c8d2d68ebb7..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='';
@@ -284,7 +284,7 @@ if ($resql)
     // Show delete result message
     if (GETPOST('delsoc'))
     {
-        dol_htmloutput_mesg($langs->trans("CompanyDeleted",GETPOST('delsoc')),'','ok');
+	    setEventMessage($langs->trans("CompanyDeleted",GETPOST('delsoc')));
     }
 
 	$langs->load("other");
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
new file mode 100644
index 00000000000..7a2274e81b5
--- /dev/null
+++ b/htdocs/societe/societecontact.php
@@ -0,0 +1,321 @@
+<?php
+/* Copyright (C) 2005     	Patrick Rouillon    <patrick@rouillon.net>
+ * Copyright (C) 2005-2011	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin       <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011-2012	Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014		Charles-Fr Benke	<charles.fr@benke.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     \file       htdocs/societe/societecontact.php
+ *     \ingroup    societe
+ *     \brief      Onglet de gestion des contacts additionnel d'une société
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+$langs->load("orders");
+$langs->load("companies");
+
+$id=GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
+$ref=GETPOST('ref','alpha');
+$action=GETPOST('action','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'societe', $id,'');
+
+$object = new Societe($db);
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'addcontact' && $user->rights->societe->creer)
+{
+	$result = $object->fetch($id);
+
+    if ($result > 0 && $id > 0)
+    {
+    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+    }
+
+	if ($result >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else
+	{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+		{
+			$langs->load("errors");
+			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+		}
+		else
+		{
+			$mesg = '<div class="error">'.$object->error.'</div>';
+		}
+	}
+}
+
+// bascule du statut d'un contact
+else if ($action == 'swapstatut' && $user->rights->societe->creer)
+{
+	if ($object->fetch($id))
+	{
+	    $result=$object->swapContactStatus(GETPOST('ligne'));
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+// Efface un contact
+else if ($action == 'deletecontact' && $user->rights->societe->creer)
+{
+	$object->fetch($id);
+	$result = $object->delete_contact($_GET["lineid"]);
+
+	if ($result >= 0)
+	{
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
+	else {
+		dol_print_error($db);
+	}
+}
+
+else if ($action == 'setaddress' && $user->rights->societe->creer)
+{
+	$object->fetch($id);
+	$result=$object->setDeliveryAddress($_POST['fk_address']);
+	if ($result < 0) dol_print_error($db,$object->error);
+}
+
+/*
+ * View
+ */
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$langs->trans("ThirdParty"),$help_url);
+
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$formother = new FormOther($db);
+$contactstatic=new Contact($db);
+$userstatic=new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* Mode vue et edition                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+if ($id > 0 || ! empty($ref))
+{
+	if ($object->fetch($id, $ref) > 0)
+	{
+		$soc = new Societe($db);
+		$soc->fetch($object->socid);
+
+		$head = societe_prepare_head($object);
+		dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"),0,'company');
+
+		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<table class="border" width="100%">';
+		print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+		print '<td colspan="3">';
+		print $form->showrefnav($object,'id','',($user->societe_id?0:1),'rowid','nom');
+		print '</td></tr>';
+
+		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		{
+		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+		}
+
+		if ($object->client)
+		{
+		    print '<tr><td>';
+		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		    print $object->code_client;
+		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		    print '</td></tr>';
+		}
+
+		if ($object->fournisseur)
+		{
+		    print '<tr><td>';
+		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		    print $object->code_fournisseur;
+		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		    print '</td></tr>';
+		}
+		print '</table></form>';
+		print '<br>';
+
+		// Contacts lines (modules that overwrite templates must declare this into descriptor)
+		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+		foreach($dirtpls as $reldir)
+		{
+			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+			if ($res) break;
+		}
+
+		// additionnal list with adherents of company
+		if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+
+			$membertypestatic=new AdherentType($db);
+			$memberstatic=new Adherent($db);
+
+			$langs->load("members");
+			$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
+			$sql.= " d.datefin,";
+			$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+			$sql.= " t.libelle as type, t.cotisation";
+			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
+			$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
+			$sql.= " WHERE d.fk_soc=".$id;
+
+			dol_syslog("get list sql=".$sql);
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$num = $db->num_rows($resql);
+
+				if ($num  > 0 )
+				{
+					$titre=$langs->trans("MembersListOfTiers");
+					print '<br>';
+
+					print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+
+					print "<table class=\"noborder\" width=\"100%\">";
+					print '<tr class="liste_titre">';
+					print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
+					print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
+					print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
+					print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
+					print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
+					print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
+					print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
+					print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+					print "</tr>\n";
+
+					$var=True;
+					$i=0;
+					while ($i < $num && $i < $conf->liste_limit)
+					{
+						$objp = $db->fetch_object($resql);
+
+						$datefin=$db->jdate($objp->datefin);
+						$memberstatic->id=$objp->rowid;
+						$memberstatic->ref=$objp->rowid;
+						$memberstatic->lastname=$objp->lastname;
+						$memberstatic->firstname=$objp->firstname;
+
+						$companyname=$objp->company;
+
+						$var=!$var;
+						print "<tr ".$bc[$var].">";
+
+						// Ref
+						print "<td>";
+						print $memberstatic->getNomUrl(1);
+						print "</td>\n";
+
+						// Lastname
+						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
+						print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+						print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
+						print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+						print "</a></td>\n";
+
+						// Login
+						print "<td>".$objp->login."</td>\n";
+
+						// Type
+						$membertypestatic->id=$objp->type_id;
+						$membertypestatic->libelle=$objp->type;
+						print '<td class="nowrap">';
+						print $membertypestatic->getNomUrl(1,32);
+						print '</td>';
+
+						// Moral/Physique
+						print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
+
+						// EMail
+						print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+
+						// Statut
+						print '<td class="nowrap">';
+						print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2);
+						print "</td>";
+
+						// End of subscription date
+						if ($datefin)
+						{
+							print '<td align="center" class="nowrap">';
+							print dol_print_date($datefin,'day');
+							if ($datefin < ($now -  $conf->adherent->cotisation->warning_delay) && $objp->statut > 0) print " ".img_warning($langs->trans("SubscriptionLate"));
+							print '</td>';
+						}
+						else
+						{
+							print '<td align="left" class="nowrap">';
+							if ($objp->cotisation == 'yes')
+							{
+								print $langs->trans("SubscriptionNotReceived");
+								if ($objp->statut > 0) print " ".img_warning();
+							}
+							else
+							{
+								print '&nbsp;';
+							}
+							print '</td>';
+						}
+
+						print "</tr>\n";
+						$i++;
+					}
+					print "</table>\n";
+				}
+			}
+		}
+	}
+	else
+	{
+		// Contrat non trouve
+		print "ErrorRecordNotFound";
+	}
+}
+
+$db->close();
+llxFooter();
diff --git a/htdocs/societe/tpl/index.html b/htdocs/societe/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/support/default.css b/htdocs/support/default.css
index 1d540096f10..ea62df52ef0 100644
--- a/htdocs/support/default.css
+++ b/htdocs/support/default.css
@@ -18,7 +18,7 @@
 body {
 font-size:12px;
 font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
+background: #f9f9f9;
 /* background-color: #F4F4F4; */
 margin: 5px 10px;
 }
@@ -147,4 +147,12 @@ background: #DDDFDD;
 }
 
 table { font-size: 12px; }
-table.login {  border: 1px solid #C0C0C0; background: #F0F0F0 url(background.png) repeat-x; 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/support/dolibarr_logo2.png b/htdocs/support/dolibarr_logo2.png
deleted file mode 100644
index 7abd0ae8494..00000000000
Binary files a/htdocs/support/dolibarr_logo2.png and /dev/null differ
diff --git a/htdocs/support/headbg.jpg b/htdocs/support/headbg.jpg
deleted file mode 100644
index 5491c6e4acb..00000000000
Binary files a/htdocs/support/headbg.jpg and /dev/null differ
diff --git a/htdocs/theme/.gitignore b/htdocs/theme/.gitignore
index fab0672d598..bad6db7e4d2 100644
--- a/htdocs/theme/.gitignore
+++ b/htdocs/theme/.gitignore
@@ -1 +1,2 @@
 /bootstrap
+/oblyon
diff --git a/htdocs/theme/amarok/ckeditor/index.html b/htdocs/theme/amarok/ckeditor/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/amarok/img/1downarrow.png b/htdocs/theme/amarok/img/1downarrow.png
old mode 100755
new mode 100644
index aa77afde326..33c655f345d
Binary files a/htdocs/theme/amarok/img/1downarrow.png and b/htdocs/theme/amarok/img/1downarrow.png differ
diff --git a/htdocs/theme/amarok/img/1downarrow_selected.png b/htdocs/theme/amarok/img/1downarrow_selected.png
old mode 100755
new mode 100644
index cf70206a39b..c8615bac56c
Binary files a/htdocs/theme/amarok/img/1downarrow_selected.png and b/htdocs/theme/amarok/img/1downarrow_selected.png differ
diff --git a/htdocs/theme/amarok/img/1leftarrow.png b/htdocs/theme/amarok/img/1leftarrow.png
old mode 100755
new mode 100644
index d81d4c089a1..a24894e25df
Binary files a/htdocs/theme/amarok/img/1leftarrow.png and b/htdocs/theme/amarok/img/1leftarrow.png differ
diff --git a/htdocs/theme/amarok/img/1leftarrow_selected.png b/htdocs/theme/amarok/img/1leftarrow_selected.png
old mode 100755
new mode 100644
index 2b634693801..912f9a753be
Binary files a/htdocs/theme/amarok/img/1leftarrow_selected.png and b/htdocs/theme/amarok/img/1leftarrow_selected.png differ
diff --git a/htdocs/theme/amarok/img/1rightarrow.png b/htdocs/theme/amarok/img/1rightarrow.png
old mode 100755
new mode 100644
index e80c81c6dd7..b6474eaad46
Binary files a/htdocs/theme/amarok/img/1rightarrow.png and b/htdocs/theme/amarok/img/1rightarrow.png differ
diff --git a/htdocs/theme/amarok/img/1rightarrow_selected.png b/htdocs/theme/amarok/img/1rightarrow_selected.png
old mode 100755
new mode 100644
index c19598f1e02..911ce8e2d56
Binary files a/htdocs/theme/amarok/img/1rightarrow_selected.png and b/htdocs/theme/amarok/img/1rightarrow_selected.png differ
diff --git a/htdocs/theme/amarok/img/1uparrow.png b/htdocs/theme/amarok/img/1uparrow.png
old mode 100755
new mode 100644
index 2e260bfce2a..b0d939999bd
Binary files a/htdocs/theme/amarok/img/1uparrow.png and b/htdocs/theme/amarok/img/1uparrow.png differ
diff --git a/htdocs/theme/amarok/img/1uparrow_selected.png b/htdocs/theme/amarok/img/1uparrow_selected.png
old mode 100755
new mode 100644
index 28550cdda71..f311f885994
Binary files a/htdocs/theme/amarok/img/1uparrow_selected.png and b/htdocs/theme/amarok/img/1uparrow_selected.png differ
diff --git a/htdocs/theme/amarok/img/1updownarrow.png b/htdocs/theme/amarok/img/1updownarrow.png
old mode 100755
new mode 100644
index bd0e6b02ef5..07ae44c2c51
Binary files a/htdocs/theme/amarok/img/1updownarrow.png and b/htdocs/theme/amarok/img/1updownarrow.png differ
diff --git a/htdocs/theme/amarok/img/addfile.png b/htdocs/theme/amarok/img/addfile.png
old mode 100755
new mode 100644
index 135d539ed9d..35ace7e4cf2
Binary files a/htdocs/theme/amarok/img/addfile.png and b/htdocs/theme/amarok/img/addfile.png differ
diff --git a/htdocs/theme/amarok/img/background_login.png b/htdocs/theme/amarok/img/background_login.png
index 88594ffd7ca..e981431ce51 100644
Binary files a/htdocs/theme/amarok/img/background_login.png and b/htdocs/theme/amarok/img/background_login.png differ
diff --git a/htdocs/theme/amarok/img/button_edit.png b/htdocs/theme/amarok/img/button_edit.png
old mode 100755
new mode 100644
index 8e39750c569..2118cf41db3
Binary files a/htdocs/theme/amarok/img/button_edit.png and b/htdocs/theme/amarok/img/button_edit.png differ
diff --git a/htdocs/theme/amarok/img/calc.png b/htdocs/theme/amarok/img/calc.png
old mode 100755
new mode 100644
index fd9344db65f..11142a85f66
Binary files a/htdocs/theme/amarok/img/calc.png and b/htdocs/theme/amarok/img/calc.png differ
diff --git a/htdocs/theme/amarok/img/calendar.png b/htdocs/theme/amarok/img/calendar.png
old mode 100755
new mode 100644
index fe9d5317763..9238928c701
Binary files a/htdocs/theme/amarok/img/calendar.png and b/htdocs/theme/amarok/img/calendar.png differ
diff --git a/htdocs/theme/amarok/img/call.png b/htdocs/theme/amarok/img/call.png
old mode 100755
new mode 100644
index 55f8b311f78..c0d4c2d9200
Binary files a/htdocs/theme/amarok/img/call.png and b/htdocs/theme/amarok/img/call.png differ
diff --git a/htdocs/theme/amarok/img/call_out.png b/htdocs/theme/amarok/img/call_out.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/amarok/img/close.png b/htdocs/theme/amarok/img/close.png
old mode 100755
new mode 100644
index e6a186ac71d..1acc7a534d9
Binary files a/htdocs/theme/amarok/img/close.png and b/htdocs/theme/amarok/img/close.png differ
diff --git a/htdocs/theme/amarok/img/close_title.png b/htdocs/theme/amarok/img/close_title.png
index aacac9fc423..ec4338e8bca 100644
Binary files a/htdocs/theme/amarok/img/close_title.png and b/htdocs/theme/amarok/img/close_title.png differ
diff --git a/htdocs/theme/amarok/img/delete.png b/htdocs/theme/amarok/img/delete.png
old mode 100755
new mode 100644
index 6b9fa6dd36e..a8706fe5011
Binary files a/htdocs/theme/amarok/img/delete.png and b/htdocs/theme/amarok/img/delete.png differ
diff --git a/htdocs/theme/amarok/img/detail.png b/htdocs/theme/amarok/img/detail.png
old mode 100755
new mode 100644
index d8b59e60497..10dc7d72019
Binary files a/htdocs/theme/amarok/img/detail.png and b/htdocs/theme/amarok/img/detail.png differ
diff --git a/htdocs/theme/amarok/img/disable.png b/htdocs/theme/amarok/img/disable.png
old mode 100755
new mode 100644
index b14af18f6f7..f7322f6d68a
Binary files a/htdocs/theme/amarok/img/disable.png and b/htdocs/theme/amarok/img/disable.png differ
diff --git a/htdocs/theme/amarok/img/edit.png b/htdocs/theme/amarok/img/edit.png
old mode 100755
new mode 100644
index 340b12633e6..faff605e3ca
Binary files a/htdocs/theme/amarok/img/edit.png and b/htdocs/theme/amarok/img/edit.png differ
diff --git a/htdocs/theme/amarok/img/edit_add.png b/htdocs/theme/amarok/img/edit_add.png
old mode 100755
new mode 100644
index 4ac1bafbcc6..8a5877aeeb5
Binary files a/htdocs/theme/amarok/img/edit_add.png and b/htdocs/theme/amarok/img/edit_add.png differ
diff --git a/htdocs/theme/amarok/img/edit_remove.png b/htdocs/theme/amarok/img/edit_remove.png
old mode 100755
new mode 100644
index f953427ffbc..0f32e706b39
Binary files a/htdocs/theme/amarok/img/edit_remove.png and b/htdocs/theme/amarok/img/edit_remove.png differ
diff --git a/htdocs/theme/amarok/img/editdelete.png b/htdocs/theme/amarok/img/editdelete.png
old mode 100755
new mode 100644
index b14af18f6f7..f7322f6d68a
Binary files a/htdocs/theme/amarok/img/editdelete.png and b/htdocs/theme/amarok/img/editdelete.png differ
diff --git a/htdocs/theme/amarok/img/error.png b/htdocs/theme/amarok/img/error.png
old mode 100755
new mode 100644
index 517725822ba..899fa9f6b63
Binary files a/htdocs/theme/amarok/img/error.png and b/htdocs/theme/amarok/img/error.png differ
diff --git a/htdocs/theme/amarok/img/file.png b/htdocs/theme/amarok/img/file.png
old mode 100755
new mode 100644
index 6a05d3a8e2a..221eaf83e86
Binary files a/htdocs/theme/amarok/img/file.png and b/htdocs/theme/amarok/img/file.png differ
diff --git a/htdocs/theme/amarok/img/filenew.png b/htdocs/theme/amarok/img/filenew.png
old mode 100755
new mode 100644
index 61f56baba39..92995d64faa
Binary files a/htdocs/theme/amarok/img/filenew.png and b/htdocs/theme/amarok/img/filenew.png differ
diff --git a/htdocs/theme/amarok/img/filter.png b/htdocs/theme/amarok/img/filter.png
old mode 100755
new mode 100644
index e914fdec003..ec64ee55bcd
Binary files a/htdocs/theme/amarok/img/filter.png and b/htdocs/theme/amarok/img/filter.png differ
diff --git a/htdocs/theme/amarok/img/folder-open.png b/htdocs/theme/amarok/img/folder-open.png
old mode 100755
new mode 100644
index 10ee9609794..186680e7ff4
Binary files a/htdocs/theme/amarok/img/folder-open.png and b/htdocs/theme/amarok/img/folder-open.png differ
diff --git a/htdocs/theme/amarok/img/folder.png b/htdocs/theme/amarok/img/folder.png
old mode 100755
new mode 100644
index 6db3c0e0c5f..5c28dea0aa5
Binary files a/htdocs/theme/amarok/img/folder.png and b/htdocs/theme/amarok/img/folder.png differ
diff --git a/htdocs/theme/amarok/img/grip.png b/htdocs/theme/amarok/img/grip.png
old mode 100755
new mode 100644
index 216e51ca8f0..8053007e9dd
Binary files a/htdocs/theme/amarok/img/grip.png and b/htdocs/theme/amarok/img/grip.png differ
diff --git a/htdocs/theme/amarok/img/grip_title.png b/htdocs/theme/amarok/img/grip_title.png
index 216e51ca8f0..8053007e9dd 100644
Binary files a/htdocs/theme/amarok/img/grip_title.png and b/htdocs/theme/amarok/img/grip_title.png differ
diff --git a/htdocs/theme/amarok/img/help.png b/htdocs/theme/amarok/img/help.png
old mode 100755
new mode 100644
index 310f9b08eac..f092e463807
Binary files a/htdocs/theme/amarok/img/help.png and b/htdocs/theme/amarok/img/help.png differ
diff --git a/htdocs/theme/amarok/img/helpdoc.png b/htdocs/theme/amarok/img/helpdoc.png
old mode 100755
new mode 100644
index 8b33d5e5536..02ea7c7a194
Binary files a/htdocs/theme/amarok/img/helpdoc.png and b/htdocs/theme/amarok/img/helpdoc.png differ
diff --git a/htdocs/theme/amarok/img/high.png b/htdocs/theme/amarok/img/high.png
old mode 100755
new mode 100644
index 517725822ba..899fa9f6b63
Binary files a/htdocs/theme/amarok/img/high.png and b/htdocs/theme/amarok/img/high.png differ
diff --git a/htdocs/theme/amarok/img/history.png b/htdocs/theme/amarok/img/history.png
old mode 100755
new mode 100644
index cc68175ed89..1e37cac68a7
Binary files a/htdocs/theme/amarok/img/history.png and b/htdocs/theme/amarok/img/history.png differ
diff --git a/htdocs/theme/amarok/img/indent1.png b/htdocs/theme/amarok/img/indent1.png
old mode 100755
new mode 100644
index 11effb043d5..0acd18fe2bb
Binary files a/htdocs/theme/amarok/img/indent1.png and b/htdocs/theme/amarok/img/indent1.png differ
diff --git a/htdocs/theme/amarok/img/index.html b/htdocs/theme/amarok/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/amarok/img/info.png b/htdocs/theme/amarok/img/info.png
old mode 100755
new mode 100644
index da1b7c55032..5f7683898a8
Binary files a/htdocs/theme/amarok/img/info.png and b/htdocs/theme/amarok/img/info.png differ
diff --git a/htdocs/theme/amarok/img/lock.png b/htdocs/theme/amarok/img/lock.png
old mode 100755
new mode 100644
index 73dc0eb27ce..fed5806fdda
Binary files a/htdocs/theme/amarok/img/lock.png and b/htdocs/theme/amarok/img/lock.png differ
diff --git a/htdocs/theme/amarok/img/logout.png b/htdocs/theme/amarok/img/logout.png
old mode 100755
new mode 100644
index 73dc0eb27ce..fed5806fdda
Binary files a/htdocs/theme/amarok/img/logout.png and b/htdocs/theme/amarok/img/logout.png differ
diff --git a/htdocs/theme/amarok/img/money.png b/htdocs/theme/amarok/img/money.png
old mode 100755
new mode 100644
index f68a1b84715..d8c8109abca
Binary files a/htdocs/theme/amarok/img/money.png and b/htdocs/theme/amarok/img/money.png differ
diff --git a/htdocs/theme/amarok/img/next.png b/htdocs/theme/amarok/img/next.png
old mode 100755
new mode 100644
index f389ed680c1..774ca27e79b
Binary files a/htdocs/theme/amarok/img/next.png and b/htdocs/theme/amarok/img/next.png differ
diff --git a/htdocs/theme/amarok/img/object_account.png b/htdocs/theme/amarok/img/object_account.png
old mode 100755
new mode 100644
index cf94186c436..d41f8fdee80
Binary files a/htdocs/theme/amarok/img/object_account.png and b/htdocs/theme/amarok/img/object_account.png differ
diff --git a/htdocs/theme/amarok/img/object_accounting.png b/htdocs/theme/amarok/img/object_accounting.png
new file mode 100644
index 00000000000..b5600221f02
Binary files /dev/null and b/htdocs/theme/amarok/img/object_accounting.png differ
diff --git a/htdocs/theme/amarok/img/object_action.png b/htdocs/theme/amarok/img/object_action.png
old mode 100755
new mode 100644
index fe9d5317763..9238928c701
Binary files a/htdocs/theme/amarok/img/object_action.png and b/htdocs/theme/amarok/img/object_action.png differ
diff --git a/htdocs/theme/amarok/img/object_action_rdv.png b/htdocs/theme/amarok/img/object_action_rdv.png
index b892da1f655..25edfa85b45 100644
Binary files a/htdocs/theme/amarok/img/object_action_rdv.png and b/htdocs/theme/amarok/img/object_action_rdv.png differ
diff --git a/htdocs/theme/amarok/img/object_barcode.png b/htdocs/theme/amarok/img/object_barcode.png
old mode 100755
new mode 100644
index 9bb4daab07a..3296d7bedf6
Binary files a/htdocs/theme/amarok/img/object_barcode.png and b/htdocs/theme/amarok/img/object_barcode.png differ
diff --git a/htdocs/theme/amarok/img/object_bill.png b/htdocs/theme/amarok/img/object_bill.png
old mode 100755
new mode 100644
index a9095ae91da..b9af25f5788
Binary files a/htdocs/theme/amarok/img/object_bill.png and b/htdocs/theme/amarok/img/object_bill.png differ
diff --git a/htdocs/theme/amarok/img/object_billa.png b/htdocs/theme/amarok/img/object_billa.png
old mode 100755
new mode 100644
index 02185ffd161..bc9a81ea505
Binary files a/htdocs/theme/amarok/img/object_billa.png and b/htdocs/theme/amarok/img/object_billa.png differ
diff --git a/htdocs/theme/amarok/img/object_billd.png b/htdocs/theme/amarok/img/object_billd.png
old mode 100755
new mode 100644
index d29e0cec904..5558e18d682
Binary files a/htdocs/theme/amarok/img/object_billd.png and b/htdocs/theme/amarok/img/object_billd.png differ
diff --git a/htdocs/theme/amarok/img/object_billr.png b/htdocs/theme/amarok/img/object_billr.png
old mode 100755
new mode 100644
index 940b1db8c6d..7c7601ac88d
Binary files a/htdocs/theme/amarok/img/object_billr.png and b/htdocs/theme/amarok/img/object_billr.png differ
diff --git a/htdocs/theme/amarok/img/object_book.png b/htdocs/theme/amarok/img/object_book.png
old mode 100755
new mode 100644
index 91e9faeb7a1..2532b9e46bb
Binary files a/htdocs/theme/amarok/img/object_book.png and b/htdocs/theme/amarok/img/object_book.png differ
diff --git a/htdocs/theme/amarok/img/object_bookmark.png b/htdocs/theme/amarok/img/object_bookmark.png
old mode 100755
new mode 100644
index 16b409b6656..a33b726273e
Binary files a/htdocs/theme/amarok/img/object_bookmark.png and b/htdocs/theme/amarok/img/object_bookmark.png differ
diff --git a/htdocs/theme/amarok/img/object_calendar.png b/htdocs/theme/amarok/img/object_calendar.png
old mode 100755
new mode 100644
index 6df0766f839..a9e239feec0
Binary files a/htdocs/theme/amarok/img/object_calendar.png and b/htdocs/theme/amarok/img/object_calendar.png differ
diff --git a/htdocs/theme/amarok/img/object_calendarday.png b/htdocs/theme/amarok/img/object_calendarday.png
old mode 100755
new mode 100644
index 3b0cc640693..eca345725a2
Binary files a/htdocs/theme/amarok/img/object_calendarday.png and b/htdocs/theme/amarok/img/object_calendarday.png differ
diff --git a/htdocs/theme/amarok/img/object_calendarweek.png b/htdocs/theme/amarok/img/object_calendarweek.png
old mode 100755
new mode 100644
index d45ba9c270f..807b7d5e53f
Binary files a/htdocs/theme/amarok/img/object_calendarweek.png and b/htdocs/theme/amarok/img/object_calendarweek.png differ
diff --git a/htdocs/theme/amarok/img/object_category-expanded.png b/htdocs/theme/amarok/img/object_category-expanded.png
old mode 100755
new mode 100644
index 10ee9609794..186680e7ff4
Binary files a/htdocs/theme/amarok/img/object_category-expanded.png and b/htdocs/theme/amarok/img/object_category-expanded.png differ
diff --git a/htdocs/theme/amarok/img/object_category.png b/htdocs/theme/amarok/img/object_category.png
old mode 100755
new mode 100644
index 6db3c0e0c5f..5c28dea0aa5
Binary files a/htdocs/theme/amarok/img/object_category.png and b/htdocs/theme/amarok/img/object_category.png differ
diff --git a/htdocs/theme/amarok/img/object_commercial.png b/htdocs/theme/amarok/img/object_commercial.png
old mode 100755
new mode 100644
index ced060d8701..eea2b611196
Binary files a/htdocs/theme/amarok/img/object_commercial.png and b/htdocs/theme/amarok/img/object_commercial.png differ
diff --git a/htdocs/theme/amarok/img/object_company.png b/htdocs/theme/amarok/img/object_company.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/amarok/img/object_contact.png b/htdocs/theme/amarok/img/object_contact.png
old mode 100755
new mode 100644
index f10bfb0d29b..e837d2e70bc
Binary files a/htdocs/theme/amarok/img/object_contact.png and b/htdocs/theme/amarok/img/object_contact.png differ
diff --git a/htdocs/theme/amarok/img/object_contact_all.png b/htdocs/theme/amarok/img/object_contact_all.png
old mode 100755
new mode 100644
index 79ef3657dde..83b2c8ec0a3
Binary files a/htdocs/theme/amarok/img/object_contact_all.png and b/htdocs/theme/amarok/img/object_contact_all.png differ
diff --git a/htdocs/theme/amarok/img/object_contract.png b/htdocs/theme/amarok/img/object_contract.png
old mode 100755
new mode 100644
index f34600c0a37..a3d207dec20
Binary files a/htdocs/theme/amarok/img/object_contract.png and b/htdocs/theme/amarok/img/object_contract.png differ
diff --git a/htdocs/theme/amarok/img/object_cron.png b/htdocs/theme/amarok/img/object_cron.png
index b929050598d..6186d18da70 100644
Binary files a/htdocs/theme/amarok/img/object_cron.png and b/htdocs/theme/amarok/img/object_cron.png differ
diff --git a/htdocs/theme/amarok/img/object_dir.png b/htdocs/theme/amarok/img/object_dir.png
old mode 100755
new mode 100644
index bce6c87554c..996415f98e3
Binary files a/htdocs/theme/amarok/img/object_dir.png and b/htdocs/theme/amarok/img/object_dir.png differ
diff --git a/htdocs/theme/amarok/img/object_email.png b/htdocs/theme/amarok/img/object_email.png
old mode 100755
new mode 100644
index 4e6fdc56c7b..5657fdb26c0
Binary files a/htdocs/theme/amarok/img/object_email.png and b/htdocs/theme/amarok/img/object_email.png differ
diff --git a/htdocs/theme/amarok/img/object_energie.png b/htdocs/theme/amarok/img/object_energie.png
old mode 100755
new mode 100644
index 7b588777ce7..255b847da99
Binary files a/htdocs/theme/amarok/img/object_energie.png and b/htdocs/theme/amarok/img/object_energie.png differ
diff --git a/htdocs/theme/amarok/img/object_generic.png b/htdocs/theme/amarok/img/object_generic.png
old mode 100755
new mode 100644
index 2de348dcceb..1128986cecd
Binary files a/htdocs/theme/amarok/img/object_generic.png and b/htdocs/theme/amarok/img/object_generic.png differ
diff --git a/htdocs/theme/amarok/img/object_globe.png b/htdocs/theme/amarok/img/object_globe.png
old mode 100755
new mode 100644
index 183a68127ee..238b830405f
Binary files a/htdocs/theme/amarok/img/object_globe.png and b/htdocs/theme/amarok/img/object_globe.png differ
diff --git a/htdocs/theme/amarok/img/object_group.png b/htdocs/theme/amarok/img/object_group.png
old mode 100755
new mode 100644
index 79ef3657dde..83b2c8ec0a3
Binary files a/htdocs/theme/amarok/img/object_group.png and b/htdocs/theme/amarok/img/object_group.png differ
diff --git a/htdocs/theme/amarok/img/object_holiday.png b/htdocs/theme/amarok/img/object_holiday.png
index 69ccdb279a5..fdc1dd8e22b 100644
Binary files a/htdocs/theme/amarok/img/object_holiday.png and b/htdocs/theme/amarok/img/object_holiday.png differ
diff --git a/htdocs/theme/amarok/img/object_intervention.png b/htdocs/theme/amarok/img/object_intervention.png
old mode 100755
new mode 100644
index aeb415bec03..84f5b87c805
Binary files a/htdocs/theme/amarok/img/object_intervention.png and b/htdocs/theme/amarok/img/object_intervention.png differ
diff --git a/htdocs/theme/amarok/img/object_invoice.png b/htdocs/theme/amarok/img/object_invoice.png
old mode 100755
new mode 100644
index a9095ae91da..b9af25f5788
Binary files a/htdocs/theme/amarok/img/object_invoice.png and b/htdocs/theme/amarok/img/object_invoice.png differ
diff --git a/htdocs/theme/amarok/img/object_label.png b/htdocs/theme/amarok/img/object_label.png
old mode 100755
new mode 100644
index b94c72400e4..a73cbb9e9bb
Binary files a/htdocs/theme/amarok/img/object_label.png and b/htdocs/theme/amarok/img/object_label.png differ
diff --git a/htdocs/theme/amarok/img/object_list.png b/htdocs/theme/amarok/img/object_list.png
old mode 100755
new mode 100644
index 48446ce5444..edd4a53aefa
Binary files a/htdocs/theme/amarok/img/object_list.png and b/htdocs/theme/amarok/img/object_list.png differ
diff --git a/htdocs/theme/amarok/img/object_opensurvey.png b/htdocs/theme/amarok/img/object_opensurvey.png
old mode 100755
new mode 100644
index 042d8217257..b5de3223bd4
Binary files a/htdocs/theme/amarok/img/object_opensurvey.png and b/htdocs/theme/amarok/img/object_opensurvey.png differ
diff --git a/htdocs/theme/amarok/img/object_order.png b/htdocs/theme/amarok/img/object_order.png
old mode 100755
new mode 100644
index 9774306827a..6550c11c061
Binary files a/htdocs/theme/amarok/img/object_order.png and b/htdocs/theme/amarok/img/object_order.png differ
diff --git a/htdocs/theme/amarok/img/object_payment.png b/htdocs/theme/amarok/img/object_payment.png
old mode 100755
new mode 100644
index 562d972db35..7215fc22aa8
Binary files a/htdocs/theme/amarok/img/object_payment.png and b/htdocs/theme/amarok/img/object_payment.png differ
diff --git a/htdocs/theme/amarok/img/object_phoning.png b/htdocs/theme/amarok/img/object_phoning.png
old mode 100755
new mode 100644
index 9395d988480..b1266e84127
Binary files a/htdocs/theme/amarok/img/object_phoning.png and b/htdocs/theme/amarok/img/object_phoning.png differ
diff --git a/htdocs/theme/amarok/img/object_product.png b/htdocs/theme/amarok/img/object_product.png
old mode 100755
new mode 100644
index cf49e8a072e..cb94e71a868
Binary files a/htdocs/theme/amarok/img/object_product.png and b/htdocs/theme/amarok/img/object_product.png differ
diff --git a/htdocs/theme/amarok/img/object_project.png b/htdocs/theme/amarok/img/object_project.png
old mode 100755
new mode 100644
index 0b9fa5a1ac5..68bb77ae989
Binary files a/htdocs/theme/amarok/img/object_project.png and b/htdocs/theme/amarok/img/object_project.png differ
diff --git a/htdocs/theme/amarok/img/object_projectpub.png b/htdocs/theme/amarok/img/object_projectpub.png
old mode 100755
new mode 100644
index f38b8664cfa..b50dba8ef2d
Binary files a/htdocs/theme/amarok/img/object_projectpub.png and b/htdocs/theme/amarok/img/object_projectpub.png differ
diff --git a/htdocs/theme/amarok/img/object_projecttask.png b/htdocs/theme/amarok/img/object_projecttask.png
old mode 100755
new mode 100644
index 0023b3a75bd..2dc8d0111b6
Binary files a/htdocs/theme/amarok/img/object_projecttask.png and b/htdocs/theme/amarok/img/object_projecttask.png differ
diff --git a/htdocs/theme/amarok/img/object_propal.png b/htdocs/theme/amarok/img/object_propal.png
old mode 100755
new mode 100644
index a59f51015c1..efd49ca0163
Binary files a/htdocs/theme/amarok/img/object_propal.png and b/htdocs/theme/amarok/img/object_propal.png differ
diff --git a/htdocs/theme/amarok/img/object_reduc.png b/htdocs/theme/amarok/img/object_reduc.png
old mode 100755
new mode 100644
index 6a05d3a8e2a..221eaf83e86
Binary files a/htdocs/theme/amarok/img/object_reduc.png and b/htdocs/theme/amarok/img/object_reduc.png differ
diff --git a/htdocs/theme/amarok/img/object_resource.png b/htdocs/theme/amarok/img/object_resource.png
new file mode 100644
index 00000000000..8cda1f3f220
Binary files /dev/null and b/htdocs/theme/amarok/img/object_resource.png differ
diff --git a/htdocs/theme/amarok/img/object_rss.png b/htdocs/theme/amarok/img/object_rss.png
old mode 100755
new mode 100644
index 0210d989666..9ba662a6086
Binary files a/htdocs/theme/amarok/img/object_rss.png and b/htdocs/theme/amarok/img/object_rss.png differ
diff --git a/htdocs/theme/amarok/img/object_sending.png b/htdocs/theme/amarok/img/object_sending.png
old mode 100755
new mode 100644
index 544e194bbd7..5ef8072d54e
Binary files a/htdocs/theme/amarok/img/object_sending.png and b/htdocs/theme/amarok/img/object_sending.png differ
diff --git a/htdocs/theme/amarok/img/object_service.png b/htdocs/theme/amarok/img/object_service.png
old mode 100755
new mode 100644
index ea5b0e73a5e..290a65f8a46
Binary files a/htdocs/theme/amarok/img/object_service.png and b/htdocs/theme/amarok/img/object_service.png differ
diff --git a/htdocs/theme/amarok/img/object_skype.png b/htdocs/theme/amarok/img/object_skype.png
index 97121565bb0..b209cd8d16e 100644
Binary files a/htdocs/theme/amarok/img/object_skype.png and b/htdocs/theme/amarok/img/object_skype.png differ
diff --git a/htdocs/theme/amarok/img/object_stock.png b/htdocs/theme/amarok/img/object_stock.png
old mode 100755
new mode 100644
index 9ea65b9b6e1..19ae2cdc0d3
Binary files a/htdocs/theme/amarok/img/object_stock.png and b/htdocs/theme/amarok/img/object_stock.png differ
diff --git a/htdocs/theme/amarok/img/object_task.png b/htdocs/theme/amarok/img/object_task.png
old mode 100755
new mode 100644
index 0023b3a75bd..2dc8d0111b6
Binary files a/htdocs/theme/amarok/img/object_task.png and b/htdocs/theme/amarok/img/object_task.png differ
diff --git a/htdocs/theme/amarok/img/object_technic.png b/htdocs/theme/amarok/img/object_technic.png
old mode 100755
new mode 100644
index eae2c746d92..0f1737ce582
Binary files a/htdocs/theme/amarok/img/object_technic.png and b/htdocs/theme/amarok/img/object_technic.png differ
diff --git a/htdocs/theme/amarok/img/object_trip.png b/htdocs/theme/amarok/img/object_trip.png
old mode 100755
new mode 100644
index d9ea9de8160..4ffacc73e86
Binary files a/htdocs/theme/amarok/img/object_trip.png and b/htdocs/theme/amarok/img/object_trip.png differ
diff --git a/htdocs/theme/amarok/img/object_user.png b/htdocs/theme/amarok/img/object_user.png
old mode 100755
new mode 100644
index d0ab1ec1dad..55ee040f98d
Binary files a/htdocs/theme/amarok/img/object_user.png and b/htdocs/theme/amarok/img/object_user.png differ
diff --git a/htdocs/theme/amarok/img/off.png b/htdocs/theme/amarok/img/off.png
old mode 100755
new mode 100644
index 1b4d2072939..ab7742b4a97
Binary files a/htdocs/theme/amarok/img/off.png and b/htdocs/theme/amarok/img/off.png differ
diff --git a/htdocs/theme/amarok/img/ok.png b/htdocs/theme/amarok/img/ok.png
old mode 100755
new mode 100644
index 210b1a6c3cc..abe1bd2424e
Binary files a/htdocs/theme/amarok/img/ok.png and b/htdocs/theme/amarok/img/ok.png differ
diff --git a/htdocs/theme/amarok/img/on.png b/htdocs/theme/amarok/img/on.png
old mode 100755
new mode 100644
index 2112071d494..9362cfb75ee
Binary files a/htdocs/theme/amarok/img/on.png and b/htdocs/theme/amarok/img/on.png differ
diff --git a/htdocs/theme/amarok/img/pdf2.png b/htdocs/theme/amarok/img/pdf2.png
old mode 100755
new mode 100644
index 6bf44387a88..cbf205d383e
Binary files a/htdocs/theme/amarok/img/pdf2.png and b/htdocs/theme/amarok/img/pdf2.png differ
diff --git a/htdocs/theme/amarok/img/pdf3.png b/htdocs/theme/amarok/img/pdf3.png
old mode 100755
new mode 100644
index 2dc7f897514..fec72dbd81e
Binary files a/htdocs/theme/amarok/img/pdf3.png and b/htdocs/theme/amarok/img/pdf3.png differ
diff --git a/htdocs/theme/amarok/img/play.png b/htdocs/theme/amarok/img/play.png
index 6de3e256ba6..4922ea1ec12 100644
Binary files a/htdocs/theme/amarok/img/play.png and b/htdocs/theme/amarok/img/play.png differ
diff --git a/htdocs/theme/amarok/img/previous.png b/htdocs/theme/amarok/img/previous.png
old mode 100755
new mode 100644
index 18d4532f8ed..f50a54114ec
Binary files a/htdocs/theme/amarok/img/previous.png and b/htdocs/theme/amarok/img/previous.png differ
diff --git a/htdocs/theme/amarok/img/printer.png b/htdocs/theme/amarok/img/printer.png
old mode 100755
new mode 100644
index ba2af6b0885..c2e20742b65
Binary files a/htdocs/theme/amarok/img/printer.png and b/htdocs/theme/amarok/img/printer.png differ
diff --git a/htdocs/theme/amarok/img/puce.png b/htdocs/theme/amarok/img/puce.png
old mode 100755
new mode 100644
index 4f23a349f17..d18f94cf582
Binary files a/htdocs/theme/amarok/img/puce.png and b/htdocs/theme/amarok/img/puce.png differ
diff --git a/htdocs/theme/amarok/img/recent.png b/htdocs/theme/amarok/img/recent.png
old mode 100755
new mode 100644
index fb87a873294..c5818910e6e
Binary files a/htdocs/theme/amarok/img/recent.png and b/htdocs/theme/amarok/img/recent.png differ
diff --git a/htdocs/theme/amarok/img/redstar.png b/htdocs/theme/amarok/img/redstar.png
old mode 100755
new mode 100644
index 32a7574d834..5c02de23c6b
Binary files a/htdocs/theme/amarok/img/redstar.png and b/htdocs/theme/amarok/img/redstar.png differ
diff --git a/htdocs/theme/amarok/img/refresh.png b/htdocs/theme/amarok/img/refresh.png
old mode 100755
new mode 100644
index 757b8d50fdb..e96e4bbf33c
Binary files a/htdocs/theme/amarok/img/refresh.png and b/htdocs/theme/amarok/img/refresh.png differ
diff --git a/htdocs/theme/amarok/img/reload.png b/htdocs/theme/amarok/img/reload.png
old mode 100755
new mode 100644
index 8baf084bd99..72990aa88cf
Binary files a/htdocs/theme/amarok/img/reload.png and b/htdocs/theme/amarok/img/reload.png differ
diff --git a/htdocs/theme/amarok/img/rightarrow.png b/htdocs/theme/amarok/img/rightarrow.png
old mode 100755
new mode 100644
index b0e7def02d9..91e19e47a81
Binary files a/htdocs/theme/amarok/img/rightarrow.png and b/htdocs/theme/amarok/img/rightarrow.png differ
diff --git a/htdocs/theme/amarok/img/search.png b/htdocs/theme/amarok/img/search.png
old mode 100755
new mode 100644
index ff08a7492d4..8e95c05c874
Binary files a/htdocs/theme/amarok/img/search.png and b/htdocs/theme/amarok/img/search.png differ
diff --git a/htdocs/theme/amarok/img/searchclear.png b/htdocs/theme/amarok/img/searchclear.png
old mode 100755
new mode 100644
index f80737aaa78..feff9b53fe4
Binary files a/htdocs/theme/amarok/img/searchclear.png and b/htdocs/theme/amarok/img/searchclear.png differ
diff --git a/htdocs/theme/amarok/img/setup.png b/htdocs/theme/amarok/img/setup.png
old mode 100755
new mode 100644
index 1444d86ce2a..ca5f28b1d17
Binary files a/htdocs/theme/amarok/img/setup.png and b/htdocs/theme/amarok/img/setup.png differ
diff --git a/htdocs/theme/amarok/img/sort_asc.png b/htdocs/theme/amarok/img/sort_asc.png
index a88d7975fe9..e327d952fa4 100644
Binary files a/htdocs/theme/amarok/img/sort_asc.png and b/htdocs/theme/amarok/img/sort_asc.png differ
diff --git a/htdocs/theme/amarok/img/sort_asc_disabled.png b/htdocs/theme/amarok/img/sort_asc_disabled.png
index 4e144cf0b1f..e327d952fa4 100644
Binary files a/htdocs/theme/amarok/img/sort_asc_disabled.png and b/htdocs/theme/amarok/img/sort_asc_disabled.png differ
diff --git a/htdocs/theme/amarok/img/sort_desc.png b/htdocs/theme/amarok/img/sort_desc.png
index def071ed5af..db99fd9ad47 100644
Binary files a/htdocs/theme/amarok/img/sort_desc.png and b/htdocs/theme/amarok/img/sort_desc.png differ
diff --git a/htdocs/theme/amarok/img/sort_desc_disabled.png b/htdocs/theme/amarok/img/sort_desc_disabled.png
index 7824973cc60..89051c2f34f 100644
Binary files a/htdocs/theme/amarok/img/sort_desc_disabled.png and b/htdocs/theme/amarok/img/sort_desc_disabled.png differ
diff --git a/htdocs/theme/amarok/img/split.png b/htdocs/theme/amarok/img/split.png
old mode 100755
new mode 100644
index 27d5ff87c9d..62034af3190
Binary files a/htdocs/theme/amarok/img/split.png and b/htdocs/theme/amarok/img/split.png differ
diff --git a/htdocs/theme/amarok/img/star.png b/htdocs/theme/amarok/img/star.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/amarok/img/stats.png b/htdocs/theme/amarok/img/stats.png
old mode 100755
new mode 100644
index 8f00204a33c..a503b20a95c
Binary files a/htdocs/theme/amarok/img/stats.png and b/htdocs/theme/amarok/img/stats.png differ
diff --git a/htdocs/theme/amarok/img/statut0.png b/htdocs/theme/amarok/img/statut0.png
old mode 100755
new mode 100644
index 725c20a19c3..ceb9667d4b7
Binary files a/htdocs/theme/amarok/img/statut0.png and b/htdocs/theme/amarok/img/statut0.png differ
diff --git a/htdocs/theme/amarok/img/statut1.png b/htdocs/theme/amarok/img/statut1.png
old mode 100755
new mode 100644
index 663cfb93856..2f96ef7581d
Binary files a/htdocs/theme/amarok/img/statut1.png and b/htdocs/theme/amarok/img/statut1.png differ
diff --git a/htdocs/theme/amarok/img/statut2.png b/htdocs/theme/amarok/img/statut2.png
old mode 100755
new mode 100644
index ff7be2c5808..155df5aa188
Binary files a/htdocs/theme/amarok/img/statut2.png and b/htdocs/theme/amarok/img/statut2.png differ
diff --git a/htdocs/theme/amarok/img/statut3.png b/htdocs/theme/amarok/img/statut3.png
old mode 100755
new mode 100644
index e59f0eb85d3..18b2a5b47dd
Binary files a/htdocs/theme/amarok/img/statut3.png and b/htdocs/theme/amarok/img/statut3.png differ
diff --git a/htdocs/theme/amarok/img/statut4.png b/htdocs/theme/amarok/img/statut4.png
old mode 100755
new mode 100644
index 674773045e5..92450a62497
Binary files a/htdocs/theme/amarok/img/statut4.png and b/htdocs/theme/amarok/img/statut4.png differ
diff --git a/htdocs/theme/amarok/img/statut5.png b/htdocs/theme/amarok/img/statut5.png
old mode 100755
new mode 100644
index 22dba223a17..a8db4159a31
Binary files a/htdocs/theme/amarok/img/statut5.png and b/htdocs/theme/amarok/img/statut5.png differ
diff --git a/htdocs/theme/amarok/img/statut6.png b/htdocs/theme/amarok/img/statut6.png
old mode 100755
new mode 100644
index ff7be2c5808..155df5aa188
Binary files a/htdocs/theme/amarok/img/statut6.png and b/htdocs/theme/amarok/img/statut6.png differ
diff --git a/htdocs/theme/amarok/img/statut7.png b/htdocs/theme/amarok/img/statut7.png
old mode 100755
new mode 100644
index f18782947cb..cb71c05dcfc
Binary files a/htdocs/theme/amarok/img/statut7.png and b/htdocs/theme/amarok/img/statut7.png differ
diff --git a/htdocs/theme/amarok/img/statut8.png b/htdocs/theme/amarok/img/statut8.png
old mode 100755
new mode 100644
index 5c008b0a6fa..bbe351f0942
Binary files a/htdocs/theme/amarok/img/statut8.png and b/htdocs/theme/amarok/img/statut8.png differ
diff --git a/htdocs/theme/amarok/img/statut9.png b/htdocs/theme/amarok/img/statut9.png
old mode 100755
new mode 100644
index 662d5e599ee..14287ee9bb4
Binary files a/htdocs/theme/amarok/img/statut9.png and b/htdocs/theme/amarok/img/statut9.png differ
diff --git a/htdocs/theme/amarok/img/stcomm-1.png b/htdocs/theme/amarok/img/stcomm-1.png
old mode 100755
new mode 100644
index e8ff761f0b5..8b77cfcae4a
Binary files a/htdocs/theme/amarok/img/stcomm-1.png and b/htdocs/theme/amarok/img/stcomm-1.png differ
diff --git a/htdocs/theme/amarok/img/stcomm-1_grayed.png b/htdocs/theme/amarok/img/stcomm-1_grayed.png
old mode 100755
new mode 100644
index 8a7282ebe26..2b53ad3a2d5
Binary files a/htdocs/theme/amarok/img/stcomm-1_grayed.png and b/htdocs/theme/amarok/img/stcomm-1_grayed.png differ
diff --git a/htdocs/theme/amarok/img/stcomm0.png b/htdocs/theme/amarok/img/stcomm0.png
old mode 100755
new mode 100644
index 085226668a3..f0b8c3f7165
Binary files a/htdocs/theme/amarok/img/stcomm0.png and b/htdocs/theme/amarok/img/stcomm0.png differ
diff --git a/htdocs/theme/amarok/img/stcomm0_grayed.png b/htdocs/theme/amarok/img/stcomm0_grayed.png
old mode 100755
new mode 100644
index df3447e8431..a72e9900534
Binary files a/htdocs/theme/amarok/img/stcomm0_grayed.png and b/htdocs/theme/amarok/img/stcomm0_grayed.png differ
diff --git a/htdocs/theme/amarok/img/stcomm1.png b/htdocs/theme/amarok/img/stcomm1.png
old mode 100755
new mode 100644
index 613ebe96677..6d1b485f1a5
Binary files a/htdocs/theme/amarok/img/stcomm1.png and b/htdocs/theme/amarok/img/stcomm1.png differ
diff --git a/htdocs/theme/amarok/img/stcomm1_grayed.png b/htdocs/theme/amarok/img/stcomm1_grayed.png
old mode 100755
new mode 100644
index f2c7fe56a38..7cc52f5ee6b
Binary files a/htdocs/theme/amarok/img/stcomm1_grayed.png and b/htdocs/theme/amarok/img/stcomm1_grayed.png differ
diff --git a/htdocs/theme/amarok/img/stcomm2.png b/htdocs/theme/amarok/img/stcomm2.png
old mode 100755
new mode 100644
index 20801a12d18..efc1796e410
Binary files a/htdocs/theme/amarok/img/stcomm2.png and b/htdocs/theme/amarok/img/stcomm2.png differ
diff --git a/htdocs/theme/amarok/img/stcomm2_grayed.png b/htdocs/theme/amarok/img/stcomm2_grayed.png
old mode 100755
new mode 100644
index 8316f7be432..f8da01cbc45
Binary files a/htdocs/theme/amarok/img/stcomm2_grayed.png and b/htdocs/theme/amarok/img/stcomm2_grayed.png differ
diff --git a/htdocs/theme/amarok/img/stcomm3.png b/htdocs/theme/amarok/img/stcomm3.png
old mode 100755
new mode 100644
index ea0a02f1dfe..18c8a6e323f
Binary files a/htdocs/theme/amarok/img/stcomm3.png and b/htdocs/theme/amarok/img/stcomm3.png differ
diff --git a/htdocs/theme/amarok/img/stcomm3_grayed.png b/htdocs/theme/amarok/img/stcomm3_grayed.png
old mode 100755
new mode 100644
index ac15741111a..da65ebc51a2
Binary files a/htdocs/theme/amarok/img/stcomm3_grayed.png and b/htdocs/theme/amarok/img/stcomm3_grayed.png differ
diff --git a/htdocs/theme/amarok/img/stcomm4.png b/htdocs/theme/amarok/img/stcomm4.png
old mode 100755
new mode 100644
index dfe8db877d5..8f4a34e9ab2
Binary files a/htdocs/theme/amarok/img/stcomm4.png and b/htdocs/theme/amarok/img/stcomm4.png differ
diff --git a/htdocs/theme/amarok/img/stcomm4_grayed.png b/htdocs/theme/amarok/img/stcomm4_grayed.png
old mode 100755
new mode 100644
index 88e6727ac2c..62177f13df6
Binary files a/htdocs/theme/amarok/img/stcomm4_grayed.png and b/htdocs/theme/amarok/img/stcomm4_grayed.png differ
diff --git a/htdocs/theme/amarok/img/tick.png b/htdocs/theme/amarok/img/tick.png
old mode 100755
new mode 100644
index 38d76144fa7..c2279280b33
Binary files a/htdocs/theme/amarok/img/tick.png and b/htdocs/theme/amarok/img/tick.png differ
diff --git a/htdocs/theme/amarok/img/title.png b/htdocs/theme/amarok/img/title.png
old mode 100755
new mode 100644
index c3f59dcb6ae..4087ba572a5
Binary files a/htdocs/theme/amarok/img/title.png and b/htdocs/theme/amarok/img/title.png differ
diff --git a/htdocs/theme/amarok/img/unlock.png b/htdocs/theme/amarok/img/unlock.png
old mode 100755
new mode 100644
index 0ab8c4947e6..738c8393ede
Binary files a/htdocs/theme/amarok/img/unlock.png and b/htdocs/theme/amarok/img/unlock.png differ
diff --git a/htdocs/theme/amarok/img/uparrow.png b/htdocs/theme/amarok/img/uparrow.png
old mode 100755
new mode 100644
index 7858bd0c45e..1f6f801f045
Binary files a/htdocs/theme/amarok/img/uparrow.png and b/htdocs/theme/amarok/img/uparrow.png differ
diff --git a/htdocs/theme/amarok/img/vcard.png b/htdocs/theme/amarok/img/vcard.png
old mode 100755
new mode 100644
index fc06e4c8fd8..74140d7026d
Binary files a/htdocs/theme/amarok/img/vcard.png and b/htdocs/theme/amarok/img/vcard.png differ
diff --git a/htdocs/theme/amarok/img/view.png b/htdocs/theme/amarok/img/view.png
old mode 100755
new mode 100644
index 6a05d3a8e2a..221eaf83e86
Binary files a/htdocs/theme/amarok/img/view.png and b/htdocs/theme/amarok/img/view.png differ
diff --git a/htdocs/theme/amarok/img/vmenu.png b/htdocs/theme/amarok/img/vmenu.png
old mode 100755
new mode 100644
index 74d696bf6b2..06f1f0d6100
Binary files a/htdocs/theme/amarok/img/vmenu.png and b/htdocs/theme/amarok/img/vmenu.png differ
diff --git a/htdocs/theme/amarok/img/warning.png b/htdocs/theme/amarok/img/warning.png
old mode 100755
new mode 100644
index ae8e35e781d..f1b93b8cc82
Binary files a/htdocs/theme/amarok/img/warning.png and b/htdocs/theme/amarok/img/warning.png differ
diff --git a/htdocs/theme/amarok/index.html b/htdocs/theme/amarok/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/amarok/index.php b/htdocs/theme/amarok/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/amarok/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 1d81029a1e4..abfeef4aa2a 100644
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -336,6 +336,9 @@ th .button {
 .nounderline {
     text-decoration: none;
 }
+.cursorpointer {
+	cursor: pointer;
+}
 
 .blockvmenubookmarks .menu_contenu {
 	background-color: transparent;
@@ -344,6 +347,20 @@ th .button {
 /* ! Message d'erreur lors du login : */
 center .error { padding:8px !important; padding-left:26px !important; padding-right:20px; width:inherit; max-width:450px;color:#552323 !important; font-size:14px; border-radius:8px; text-align: left;}
 
+.badge {
+	display: inline-block;
+	min-width: 10px;
+	padding: 2px 5px;
+	font-size: 10px;
+	font-weight: 700;
+	line-height: 0.9em;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	background-color: #777;
+	border-radius: 10px;
+}
 
 
 /* ============================================================================== */
@@ -1690,18 +1707,23 @@ td.hidden {display:none;}
 
 table.cal_month    { border-spacing: 0px; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_current_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_other_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B !important; border-right: 0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
-
 .cal_other_month   { opacity: 0.6; background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { opacity: 0.6; background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-
+.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser { background: #FFFFFF; border-right: solid 1px #6C7C7B; border-top: solid 1px #A0A0A0; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; border-top: solid 1px #A0A0A0; border-right: solid 1px #6C7C7B; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today {
 	background:#ffffff;
 	border:solid 2px #bbbbbb;
 }
+.peruser_busy      { background: #CC8888; }
+.peruser_notbusy   { background: #EEDDDD; }
 
 div.dayevent table.nobordernopadding tr td {padding:1px;}
 
@@ -2272,6 +2294,14 @@ ul.ulmenu {
 	background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
 	background-image: linear-gradient( #eee,#e1e1e1 ) !important;
 }
+.lilevel2
+{
+	padding-left: 22px;
+}
+.lilevel3
+{
+	padding-left: 54px;
+}
 
 
 <?php
diff --git a/htdocs/theme/amarok/thumb.png b/htdocs/theme/amarok/thumb.png
old mode 100755
new mode 100644
index 9bba79fedc5..96509b93046
Binary files a/htdocs/theme/amarok/thumb.png and b/htdocs/theme/amarok/thumb.png differ
diff --git a/htdocs/theme/amarok/tpl/index.html b/htdocs/theme/amarok/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/amarok/tpl/index.php b/htdocs/theme/amarok/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/amarok/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/auguria/ckeditor/index.html b/htdocs/theme/auguria/ckeditor/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/auguria/img/1downarrow.png b/htdocs/theme/auguria/img/1downarrow.png
index 64b6199c774..8459a7fcf85 100644
Binary files a/htdocs/theme/auguria/img/1downarrow.png and b/htdocs/theme/auguria/img/1downarrow.png differ
diff --git a/htdocs/theme/auguria/img/1downarrow_selected.png b/htdocs/theme/auguria/img/1downarrow_selected.png
index 97249e7ab0a..c5a947c4d9f 100644
Binary files a/htdocs/theme/auguria/img/1downarrow_selected.png and b/htdocs/theme/auguria/img/1downarrow_selected.png differ
diff --git a/htdocs/theme/auguria/img/1leftarrow.png b/htdocs/theme/auguria/img/1leftarrow.png
index 150fc5e88bb..25665e556a9 100644
Binary files a/htdocs/theme/auguria/img/1leftarrow.png and b/htdocs/theme/auguria/img/1leftarrow.png differ
diff --git a/htdocs/theme/auguria/img/1leftarrow_selected.png b/htdocs/theme/auguria/img/1leftarrow_selected.png
index 320731ddd3f..9a88ada13f1 100644
Binary files a/htdocs/theme/auguria/img/1leftarrow_selected.png and b/htdocs/theme/auguria/img/1leftarrow_selected.png differ
diff --git a/htdocs/theme/auguria/img/1rightarrow.png b/htdocs/theme/auguria/img/1rightarrow.png
index a98d145d2a5..422fc3f9426 100644
Binary files a/htdocs/theme/auguria/img/1rightarrow.png and b/htdocs/theme/auguria/img/1rightarrow.png differ
diff --git a/htdocs/theme/auguria/img/1rightarrow_selected.png b/htdocs/theme/auguria/img/1rightarrow_selected.png
index 79ea84d9f72..422fc3f9426 100644
Binary files a/htdocs/theme/auguria/img/1rightarrow_selected.png and b/htdocs/theme/auguria/img/1rightarrow_selected.png differ
diff --git a/htdocs/theme/auguria/img/1uparrow.png b/htdocs/theme/auguria/img/1uparrow.png
index e67a663df4d..9cd9d0b4a28 100644
Binary files a/htdocs/theme/auguria/img/1uparrow.png and b/htdocs/theme/auguria/img/1uparrow.png differ
diff --git a/htdocs/theme/auguria/img/1uparrow_selected.png b/htdocs/theme/auguria/img/1uparrow_selected.png
index 590d05521a5..db109a4c2b5 100644
Binary files a/htdocs/theme/auguria/img/1uparrow_selected.png and b/htdocs/theme/auguria/img/1uparrow_selected.png differ
diff --git a/htdocs/theme/auguria/img/1updownarrow.png b/htdocs/theme/auguria/img/1updownarrow.png
index fd5e5801aea..871ac1c1f29 100644
Binary files a/htdocs/theme/auguria/img/1updownarrow.png and b/htdocs/theme/auguria/img/1updownarrow.png differ
diff --git a/htdocs/theme/auguria/img/addfile.png b/htdocs/theme/auguria/img/addfile.png
index 3bfa627d758..1cb7af0ad8a 100644
Binary files a/htdocs/theme/auguria/img/addfile.png and b/htdocs/theme/auguria/img/addfile.png differ
diff --git a/htdocs/theme/auguria/img/banner_02.jpg b/htdocs/theme/auguria/img/banner_02.jpg
index 29e0619e77f..81635fd2a59 100644
Binary files a/htdocs/theme/auguria/img/banner_02.jpg and b/htdocs/theme/auguria/img/banner_02.jpg differ
diff --git a/htdocs/theme/auguria/img/bg-rubrique.png b/htdocs/theme/auguria/img/bg-rubrique.png
index 6bc08feb211..9abf1dc1459 100644
Binary files a/htdocs/theme/auguria/img/bg-rubrique.png and b/htdocs/theme/auguria/img/bg-rubrique.png differ
diff --git a/htdocs/theme/auguria/img/bg-titre-rubrique.png b/htdocs/theme/auguria/img/bg-titre-rubrique.png
index feca840034b..a68206aa818 100644
Binary files a/htdocs/theme/auguria/img/bg-titre-rubrique.png and b/htdocs/theme/auguria/img/bg-titre-rubrique.png differ
diff --git a/htdocs/theme/auguria/img/body_bg.jpg b/htdocs/theme/auguria/img/body_bg.jpg
index ddde2c5f5aa..0480bfdc738 100644
Binary files a/htdocs/theme/auguria/img/body_bg.jpg and b/htdocs/theme/auguria/img/body_bg.jpg differ
diff --git a/htdocs/theme/auguria/img/button_edit.png b/htdocs/theme/auguria/img/button_edit.png
index ce8b226710b..894b4cfd78e 100644
Binary files a/htdocs/theme/auguria/img/button_edit.png and b/htdocs/theme/auguria/img/button_edit.png differ
diff --git a/htdocs/theme/auguria/img/calc.png b/htdocs/theme/auguria/img/calc.png
index d3bd2bbc824..5e6471408d8 100644
Binary files a/htdocs/theme/auguria/img/calc.png and b/htdocs/theme/auguria/img/calc.png differ
diff --git a/htdocs/theme/auguria/img/calendar.png b/htdocs/theme/auguria/img/calendar.png
index 90829a353c3..bbe6c27f041 100644
Binary files a/htdocs/theme/auguria/img/calendar.png and b/htdocs/theme/auguria/img/calendar.png differ
diff --git a/htdocs/theme/auguria/img/call.png b/htdocs/theme/auguria/img/call.png
index 8315c57d61d..ddfc1b7bd90 100644
Binary files a/htdocs/theme/auguria/img/call.png and b/htdocs/theme/auguria/img/call.png differ
diff --git a/htdocs/theme/auguria/img/call_out.png b/htdocs/theme/auguria/img/call_out.png
index bf972d8b1ae..b5a22eb827b 100644
Binary files a/htdocs/theme/auguria/img/call_out.png and b/htdocs/theme/auguria/img/call_out.png differ
diff --git a/htdocs/theme/auguria/img/close.png b/htdocs/theme/auguria/img/close.png
index aacac9fc423..ec4338e8bca 100644
Binary files a/htdocs/theme/auguria/img/close.png and b/htdocs/theme/auguria/img/close.png differ
diff --git a/htdocs/theme/auguria/img/close_title.png b/htdocs/theme/auguria/img/close_title.png
index 24eda772954..bebb74d9861 100644
Binary files a/htdocs/theme/auguria/img/close_title.png and b/htdocs/theme/auguria/img/close_title.png differ
diff --git a/htdocs/theme/auguria/img/delete.png b/htdocs/theme/auguria/img/delete.png
index 221cd3c76b9..8ad73597be7 100644
Binary files a/htdocs/theme/auguria/img/delete.png and b/htdocs/theme/auguria/img/delete.png differ
diff --git a/htdocs/theme/auguria/img/detail.png b/htdocs/theme/auguria/img/detail.png
index 2d31ec2202e..05562bef842 100644
Binary files a/htdocs/theme/auguria/img/detail.png and b/htdocs/theme/auguria/img/detail.png differ
diff --git a/htdocs/theme/auguria/img/disable.png b/htdocs/theme/auguria/img/disable.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/auguria/img/disable.png and b/htdocs/theme/auguria/img/disable.png differ
diff --git a/htdocs/theme/auguria/img/edit.png b/htdocs/theme/auguria/img/edit.png
index d5ef04577cc..4e916fe1fb0 100644
Binary files a/htdocs/theme/auguria/img/edit.png and b/htdocs/theme/auguria/img/edit.png differ
diff --git a/htdocs/theme/auguria/img/edit_add.png b/htdocs/theme/auguria/img/edit_add.png
old mode 100755
new mode 100644
index f6e67164208..ae205e9d770
Binary files a/htdocs/theme/auguria/img/edit_add.png and b/htdocs/theme/auguria/img/edit_add.png differ
diff --git a/htdocs/theme/auguria/img/edit_remove.png b/htdocs/theme/auguria/img/edit_remove.png
old mode 100755
new mode 100644
index 0c7ca54fa1f..bc4bdb360fa
Binary files a/htdocs/theme/auguria/img/edit_remove.png and b/htdocs/theme/auguria/img/edit_remove.png differ
diff --git a/htdocs/theme/auguria/img/editdelete.png b/htdocs/theme/auguria/img/editdelete.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/auguria/img/editdelete.png and b/htdocs/theme/auguria/img/editdelete.png differ
diff --git a/htdocs/theme/auguria/img/file.png b/htdocs/theme/auguria/img/file.png
index 98bc98d2f1f..73c66e9b2b3 100644
Binary files a/htdocs/theme/auguria/img/file.png and b/htdocs/theme/auguria/img/file.png differ
diff --git a/htdocs/theme/auguria/img/filenew.png b/htdocs/theme/auguria/img/filenew.png
index 1f6581389d1..8680cce82bf 100644
Binary files a/htdocs/theme/auguria/img/filenew.png and b/htdocs/theme/auguria/img/filenew.png differ
diff --git a/htdocs/theme/auguria/img/filter.png b/htdocs/theme/auguria/img/filter.png
index 4baa3a3be8e..917715107bd 100644
Binary files a/htdocs/theme/auguria/img/filter.png and b/htdocs/theme/auguria/img/filter.png differ
diff --git a/htdocs/theme/auguria/img/folder-open.png b/htdocs/theme/auguria/img/folder-open.png
index 1687cd1b536..1db8369b3d5 100644
Binary files a/htdocs/theme/auguria/img/folder-open.png and b/htdocs/theme/auguria/img/folder-open.png differ
diff --git a/htdocs/theme/auguria/img/folder.png b/htdocs/theme/auguria/img/folder.png
index 908a6df9348..04a24af2e22 100644
Binary files a/htdocs/theme/auguria/img/folder.png and b/htdocs/theme/auguria/img/folder.png differ
diff --git a/htdocs/theme/auguria/img/grip.png b/htdocs/theme/auguria/img/grip.png
index 216e51ca8f0..8053007e9dd 100644
Binary files a/htdocs/theme/auguria/img/grip.png and b/htdocs/theme/auguria/img/grip.png differ
diff --git a/htdocs/theme/auguria/img/grip_title.png b/htdocs/theme/auguria/img/grip_title.png
index 9b3c093c790..d6ecce335cb 100644
Binary files a/htdocs/theme/auguria/img/grip_title.png and b/htdocs/theme/auguria/img/grip_title.png differ
diff --git a/htdocs/theme/auguria/img/headbg.jpg b/htdocs/theme/auguria/img/headbg.jpg
index 7d1374e1fc9..160821354cc 100644
Binary files a/htdocs/theme/auguria/img/headbg.jpg and b/htdocs/theme/auguria/img/headbg.jpg differ
diff --git a/htdocs/theme/auguria/img/headbg2.jpg b/htdocs/theme/auguria/img/headbg2.jpg
index 7917abd9c07..0bc44f0ea99 100644
Binary files a/htdocs/theme/auguria/img/headbg2.jpg and b/htdocs/theme/auguria/img/headbg2.jpg differ
diff --git a/htdocs/theme/auguria/img/help.png b/htdocs/theme/auguria/img/help.png
index 0f716f67711..12e6cd655d6 100644
Binary files a/htdocs/theme/auguria/img/help.png and b/htdocs/theme/auguria/img/help.png differ
diff --git a/htdocs/theme/auguria/img/high.png b/htdocs/theme/auguria/img/high.png
index f893de7abf3..c0eaee6542f 100644
Binary files a/htdocs/theme/auguria/img/high.png and b/htdocs/theme/auguria/img/high.png differ
diff --git a/htdocs/theme/auguria/img/history.png b/htdocs/theme/auguria/img/history.png
index 932921c1f4c..0fa4283476b 100644
Binary files a/htdocs/theme/auguria/img/history.png and b/htdocs/theme/auguria/img/history.png differ
diff --git a/htdocs/theme/auguria/img/indent1.png b/htdocs/theme/auguria/img/indent1.png
index 52ebb2bd738..09695ac754f 100644
Binary files a/htdocs/theme/auguria/img/indent1.png and b/htdocs/theme/auguria/img/indent1.png differ
diff --git a/htdocs/theme/auguria/img/index.html b/htdocs/theme/auguria/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/auguria/img/info.png b/htdocs/theme/auguria/img/info.png
index 0f716f67711..12e6cd655d6 100644
Binary files a/htdocs/theme/auguria/img/info.png and b/htdocs/theme/auguria/img/info.png differ
diff --git a/htdocs/theme/auguria/img/lock.png b/htdocs/theme/auguria/img/lock.png
index 8c2e2cbdb09..3d99cf1eaef 100644
Binary files a/htdocs/theme/auguria/img/lock.png and b/htdocs/theme/auguria/img/lock.png differ
diff --git a/htdocs/theme/auguria/img/login_background.png b/htdocs/theme/auguria/img/login_background.png
index b264649fcbc..facc2c6f442 100644
Binary files a/htdocs/theme/auguria/img/login_background.png and b/htdocs/theme/auguria/img/login_background.png differ
diff --git a/htdocs/theme/auguria/img/menus/agenda.png b/htdocs/theme/auguria/img/menus/agenda.png
index 2bea3152a10..866037c9b54 100644
Binary files a/htdocs/theme/auguria/img/menus/agenda.png and b/htdocs/theme/auguria/img/menus/agenda.png differ
diff --git a/htdocs/theme/auguria/img/menus/commercial.png b/htdocs/theme/auguria/img/menus/commercial.png
index e520f7eb71e..efc1b3f0608 100644
Binary files a/htdocs/theme/auguria/img/menus/commercial.png and b/htdocs/theme/auguria/img/menus/commercial.png differ
diff --git a/htdocs/theme/auguria/img/menus/footer_bg.jpg b/htdocs/theme/auguria/img/menus/footer_bg.jpg
index ab5511b57f1..7319c16f9af 100644
Binary files a/htdocs/theme/auguria/img/menus/footer_bg.jpg and b/htdocs/theme/auguria/img/menus/footer_bg.jpg differ
diff --git a/htdocs/theme/auguria/img/menus/generic3.png b/htdocs/theme/auguria/img/menus/generic3.png
index d3ed4fa89b3..e22f73aa6f9 100644
Binary files a/htdocs/theme/auguria/img/menus/generic3.png and b/htdocs/theme/auguria/img/menus/generic3.png differ
diff --git a/htdocs/theme/auguria/img/menus/home.png b/htdocs/theme/auguria/img/menus/home.png
index eec3240070b..f4d0d917d1f 100644
Binary files a/htdocs/theme/auguria/img/menus/home.png and b/htdocs/theme/auguria/img/menus/home.png differ
diff --git a/htdocs/theme/auguria/img/menus/index.html b/htdocs/theme/auguria/img/menus/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/auguria/img/menus/mail.png b/htdocs/theme/auguria/img/menus/mail.png
index dab5feda5cd..d715ec7810c 100644
Binary files a/htdocs/theme/auguria/img/menus/mail.png and b/htdocs/theme/auguria/img/menus/mail.png differ
diff --git a/htdocs/theme/auguria/img/menus/products.png b/htdocs/theme/auguria/img/menus/products.png
index d1081185c44..6f5f45269ee 100644
Binary files a/htdocs/theme/auguria/img/menus/products.png and b/htdocs/theme/auguria/img/menus/products.png differ
diff --git a/htdocs/theme/auguria/img/menus/project.png b/htdocs/theme/auguria/img/menus/project.png
index 5bc0f86b4be..882235d2cd3 100644
Binary files a/htdocs/theme/auguria/img/menus/project.png and b/htdocs/theme/auguria/img/menus/project.png differ
diff --git a/htdocs/theme/auguria/img/menus/shop.png b/htdocs/theme/auguria/img/menus/shop.png
deleted file mode 100644
index 89627d8b332..00000000000
Binary files a/htdocs/theme/auguria/img/menus/shop.png and /dev/null differ
diff --git a/htdocs/theme/auguria/img/menus/tab_background.png b/htdocs/theme/auguria/img/menus/tab_background.png
index 0864dcc5852..6edd65003e0 100644
Binary files a/htdocs/theme/auguria/img/menus/tab_background.png and b/htdocs/theme/auguria/img/menus/tab_background.png differ
diff --git a/htdocs/theme/auguria/img/menus/tools.png b/htdocs/theme/auguria/img/menus/tools.png
index 17215ec5899..c053f660ebf 100644
Binary files a/htdocs/theme/auguria/img/menus/tools.png and b/htdocs/theme/auguria/img/menus/tools.png differ
diff --git a/htdocs/theme/auguria/img/menus/topmenu_bg.png b/htdocs/theme/auguria/img/menus/topmenu_bg.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/menus/topmenu_right.png b/htdocs/theme/auguria/img/menus/topmenu_right.png
old mode 100755
new mode 100644
index d6fd3c41168..cd14ff61bbc
Binary files a/htdocs/theme/auguria/img/menus/topmenu_right.png and b/htdocs/theme/auguria/img/menus/topmenu_right.png differ
diff --git a/htdocs/theme/auguria/img/menus/trtitle.png b/htdocs/theme/auguria/img/menus/trtitle.png
index e4fe4ffe1a6..29b694864e5 100644
Binary files a/htdocs/theme/auguria/img/menus/trtitle.png and b/htdocs/theme/auguria/img/menus/trtitle.png differ
diff --git a/htdocs/theme/auguria/img/object_accounting.png b/htdocs/theme/auguria/img/object_accounting.png
new file mode 100644
index 00000000000..b5600221f02
Binary files /dev/null and b/htdocs/theme/auguria/img/object_accounting.png differ
diff --git a/htdocs/theme/auguria/img/object_action.png b/htdocs/theme/auguria/img/object_action.png
index dd356305161..001b0cf9b76 100644
Binary files a/htdocs/theme/auguria/img/object_action.png and b/htdocs/theme/auguria/img/object_action.png differ
diff --git a/htdocs/theme/auguria/img/object_action_rdv.png b/htdocs/theme/auguria/img/object_action_rdv.png
index b892da1f655..25edfa85b45 100644
Binary files a/htdocs/theme/auguria/img/object_action_rdv.png and b/htdocs/theme/auguria/img/object_action_rdv.png differ
diff --git a/htdocs/theme/auguria/img/object_address.png b/htdocs/theme/auguria/img/object_address.png
index b20734da69a..a4b878966dc 100644
Binary files a/htdocs/theme/auguria/img/object_address.png and b/htdocs/theme/auguria/img/object_address.png differ
diff --git a/htdocs/theme/auguria/img/object_barcode.png b/htdocs/theme/auguria/img/object_barcode.png
index 83d3e1ae993..6f1931ab96c 100644
Binary files a/htdocs/theme/auguria/img/object_barcode.png and b/htdocs/theme/auguria/img/object_barcode.png differ
diff --git a/htdocs/theme/auguria/img/object_bill.png b/htdocs/theme/auguria/img/object_bill.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_billd.png b/htdocs/theme/auguria/img/object_billd.png
index 3c7443cba3e..2080958f0fb 100644
Binary files a/htdocs/theme/auguria/img/object_billd.png and b/htdocs/theme/auguria/img/object_billd.png differ
diff --git a/htdocs/theme/auguria/img/object_billr.png b/htdocs/theme/auguria/img/object_billr.png
index c89098beaa5..7a9692a0804 100644
Binary files a/htdocs/theme/auguria/img/object_billr.png and b/htdocs/theme/auguria/img/object_billr.png differ
diff --git a/htdocs/theme/auguria/img/object_book.png b/htdocs/theme/auguria/img/object_book.png
old mode 100755
new mode 100644
index 67f6b06467d..85097420728
Binary files a/htdocs/theme/auguria/img/object_book.png and b/htdocs/theme/auguria/img/object_book.png differ
diff --git a/htdocs/theme/auguria/img/object_bookmark.png b/htdocs/theme/auguria/img/object_bookmark.png
index 76aba6c2a7d..86d1a0dfa52 100644
Binary files a/htdocs/theme/auguria/img/object_bookmark.png and b/htdocs/theme/auguria/img/object_bookmark.png differ
diff --git a/htdocs/theme/auguria/img/object_calendarday.png b/htdocs/theme/auguria/img/object_calendarday.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_calendarweek.png b/htdocs/theme/auguria/img/object_calendarweek.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_commercial.png b/htdocs/theme/auguria/img/object_commercial.png
index 5f11e40a81f..36cdcc8d4a2 100644
Binary files a/htdocs/theme/auguria/img/object_commercial.png and b/htdocs/theme/auguria/img/object_commercial.png differ
diff --git a/htdocs/theme/auguria/img/object_company.png b/htdocs/theme/auguria/img/object_company.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_contact.png b/htdocs/theme/auguria/img/object_contact.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_contact_all.png b/htdocs/theme/auguria/img/object_contact_all.png
index 966f6e05cfa..f571504b246 100644
Binary files a/htdocs/theme/auguria/img/object_contact_all.png and b/htdocs/theme/auguria/img/object_contact_all.png differ
diff --git a/htdocs/theme/auguria/img/object_contract.png b/htdocs/theme/auguria/img/object_contract.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_cron.png b/htdocs/theme/auguria/img/object_cron.png
index b929050598d..6186d18da70 100644
Binary files a/htdocs/theme/auguria/img/object_cron.png and b/htdocs/theme/auguria/img/object_cron.png differ
diff --git a/htdocs/theme/auguria/img/object_email.png b/htdocs/theme/auguria/img/object_email.png
index 9246f5cef24..d5cd141733d 100644
Binary files a/htdocs/theme/auguria/img/object_email.png and b/htdocs/theme/auguria/img/object_email.png differ
diff --git a/htdocs/theme/auguria/img/object_generic.png b/htdocs/theme/auguria/img/object_generic.png
index 4d5f811a891..ccfd2d2f5b2 100644
Binary files a/htdocs/theme/auguria/img/object_generic.png and b/htdocs/theme/auguria/img/object_generic.png differ
diff --git a/htdocs/theme/auguria/img/object_globe.png b/htdocs/theme/auguria/img/object_globe.png
index f726f8a705e..aae8bf6eba0 100644
Binary files a/htdocs/theme/auguria/img/object_globe.png and b/htdocs/theme/auguria/img/object_globe.png differ
diff --git a/htdocs/theme/auguria/img/object_group.png b/htdocs/theme/auguria/img/object_group.png
index f69db27d482..552eb39fa31 100644
Binary files a/htdocs/theme/auguria/img/object_group.png and b/htdocs/theme/auguria/img/object_group.png differ
diff --git a/htdocs/theme/auguria/img/object_holiday.png b/htdocs/theme/auguria/img/object_holiday.png
index 69ccdb279a5..fdc1dd8e22b 100644
Binary files a/htdocs/theme/auguria/img/object_holiday.png and b/htdocs/theme/auguria/img/object_holiday.png differ
diff --git a/htdocs/theme/auguria/img/object_invoice.png b/htdocs/theme/auguria/img/object_invoice.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_label.png b/htdocs/theme/auguria/img/object_label.png
index 75a363ec8d5..b112af5cf0a 100644
Binary files a/htdocs/theme/auguria/img/object_label.png and b/htdocs/theme/auguria/img/object_label.png differ
diff --git a/htdocs/theme/auguria/img/object_margin.png b/htdocs/theme/auguria/img/object_margin.png
index 13e4b92c9ce..cd0eb4109f7 100644
Binary files a/htdocs/theme/auguria/img/object_margin.png and b/htdocs/theme/auguria/img/object_margin.png differ
diff --git a/htdocs/theme/auguria/img/object_opensurvey.png b/htdocs/theme/auguria/img/object_opensurvey.png
old mode 100755
new mode 100644
index 042d8217257..b5de3223bd4
Binary files a/htdocs/theme/auguria/img/object_opensurvey.png and b/htdocs/theme/auguria/img/object_opensurvey.png differ
diff --git a/htdocs/theme/auguria/img/object_order.png b/htdocs/theme/auguria/img/object_order.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_payment.png b/htdocs/theme/auguria/img/object_payment.png
index 95f4c29ed2f..5691147d8ff 100644
Binary files a/htdocs/theme/auguria/img/object_payment.png and b/htdocs/theme/auguria/img/object_payment.png differ
diff --git a/htdocs/theme/auguria/img/object_phoning.png b/htdocs/theme/auguria/img/object_phoning.png
index 5f11e40a81f..36cdcc8d4a2 100644
Binary files a/htdocs/theme/auguria/img/object_phoning.png and b/htdocs/theme/auguria/img/object_phoning.png differ
diff --git a/htdocs/theme/auguria/img/object_product.png b/htdocs/theme/auguria/img/object_product.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/object_project.png b/htdocs/theme/auguria/img/object_project.png
index 070fe326983..fd84ab427db 100644
Binary files a/htdocs/theme/auguria/img/object_project.png and b/htdocs/theme/auguria/img/object_project.png differ
diff --git a/htdocs/theme/auguria/img/object_projectpub.png b/htdocs/theme/auguria/img/object_projectpub.png
index 5ea2e846ddf..1444573cf05 100644
Binary files a/htdocs/theme/auguria/img/object_projectpub.png and b/htdocs/theme/auguria/img/object_projectpub.png differ
diff --git a/htdocs/theme/auguria/img/object_projecttask.png b/htdocs/theme/auguria/img/object_projecttask.png
index 3ec85fed9d3..4a01b50435a 100644
Binary files a/htdocs/theme/auguria/img/object_projecttask.png and b/htdocs/theme/auguria/img/object_projecttask.png differ
diff --git a/htdocs/theme/auguria/img/object_propal.png b/htdocs/theme/auguria/img/object_propal.png
old mode 100755
new mode 100644
index 4a52d65b9e6..2dc60e66b3e
Binary files a/htdocs/theme/auguria/img/object_propal.png and b/htdocs/theme/auguria/img/object_propal.png differ
diff --git a/htdocs/theme/auguria/img/object_reduc.png b/htdocs/theme/auguria/img/object_reduc.png
index 4d5f811a891..ccfd2d2f5b2 100644
Binary files a/htdocs/theme/auguria/img/object_reduc.png and b/htdocs/theme/auguria/img/object_reduc.png differ
diff --git a/htdocs/theme/auguria/img/object_resource.png b/htdocs/theme/auguria/img/object_resource.png
new file mode 100644
index 00000000000..8cda1f3f220
Binary files /dev/null and b/htdocs/theme/auguria/img/object_resource.png differ
diff --git a/htdocs/theme/auguria/img/object_rss.png b/htdocs/theme/auguria/img/object_rss.png
index 8f4224b5a30..37372031157 100644
Binary files a/htdocs/theme/auguria/img/object_rss.png and b/htdocs/theme/auguria/img/object_rss.png differ
diff --git a/htdocs/theme/auguria/img/object_service.png b/htdocs/theme/auguria/img/object_service.png
index 2161bfd59cc..65e9041589f 100644
Binary files a/htdocs/theme/auguria/img/object_service.png and b/htdocs/theme/auguria/img/object_service.png differ
diff --git a/htdocs/theme/auguria/img/object_skype.png b/htdocs/theme/auguria/img/object_skype.png
index 97121565bb0..b209cd8d16e 100644
Binary files a/htdocs/theme/auguria/img/object_skype.png and b/htdocs/theme/auguria/img/object_skype.png differ
diff --git a/htdocs/theme/auguria/img/object_stock.png b/htdocs/theme/auguria/img/object_stock.png
index 279a34f869a..2f439db7b50 100644
Binary files a/htdocs/theme/auguria/img/object_stock.png and b/htdocs/theme/auguria/img/object_stock.png differ
diff --git a/htdocs/theme/auguria/img/object_task.png b/htdocs/theme/auguria/img/object_task.png
index 24581634018..14dc14a9602 100644
Binary files a/htdocs/theme/auguria/img/object_task.png and b/htdocs/theme/auguria/img/object_task.png differ
diff --git a/htdocs/theme/auguria/img/object_technic.png b/htdocs/theme/auguria/img/object_technic.png
index b929050598d..6186d18da70 100644
Binary files a/htdocs/theme/auguria/img/object_technic.png and b/htdocs/theme/auguria/img/object_technic.png differ
diff --git a/htdocs/theme/auguria/img/off.png b/htdocs/theme/auguria/img/off.png
index 6b4604d38ed..f4217646b26 100644
Binary files a/htdocs/theme/auguria/img/off.png and b/htdocs/theme/auguria/img/off.png differ
diff --git a/htdocs/theme/auguria/img/on.png b/htdocs/theme/auguria/img/on.png
index 82572b9e1d1..728bb393536 100644
Binary files a/htdocs/theme/auguria/img/on.png and b/htdocs/theme/auguria/img/on.png differ
diff --git a/htdocs/theme/auguria/img/pdf2.png b/htdocs/theme/auguria/img/pdf2.png
index 4702d19fd50..06634550daa 100644
Binary files a/htdocs/theme/auguria/img/pdf2.png and b/htdocs/theme/auguria/img/pdf2.png differ
diff --git a/htdocs/theme/auguria/img/pdf3.png b/htdocs/theme/auguria/img/pdf3.png
index cd76e0f9253..f053591bf2d 100644
Binary files a/htdocs/theme/auguria/img/pdf3.png and b/htdocs/theme/auguria/img/pdf3.png differ
diff --git a/htdocs/theme/auguria/img/play.png b/htdocs/theme/auguria/img/play.png
index 6de3e256ba6..4922ea1ec12 100644
Binary files a/htdocs/theme/auguria/img/play.png and b/htdocs/theme/auguria/img/play.png differ
diff --git a/htdocs/theme/auguria/img/puce.png b/htdocs/theme/auguria/img/puce.png
index dfa83acd50d..8c116b0dc42 100644
Binary files a/htdocs/theme/auguria/img/puce.png and b/htdocs/theme/auguria/img/puce.png differ
diff --git a/htdocs/theme/auguria/img/recent.png b/htdocs/theme/auguria/img/recent.png
index 61daae778f5..a49fc171c06 100644
Binary files a/htdocs/theme/auguria/img/recent.png and b/htdocs/theme/auguria/img/recent.png differ
diff --git a/htdocs/theme/auguria/img/redstar.png b/htdocs/theme/auguria/img/redstar.png
index 001cde58667..486fd6770a2 100644
Binary files a/htdocs/theme/auguria/img/redstar.png and b/htdocs/theme/auguria/img/redstar.png differ
diff --git a/htdocs/theme/auguria/img/refresh.png b/htdocs/theme/auguria/img/refresh.png
index 046ce37b9c5..9994475cdfe 100644
Binary files a/htdocs/theme/auguria/img/refresh.png and b/htdocs/theme/auguria/img/refresh.png differ
diff --git a/htdocs/theme/auguria/img/reload.png b/htdocs/theme/auguria/img/reload.png
index 62056d2a89a..a4029f119de 100644
Binary files a/htdocs/theme/auguria/img/reload.png and b/htdocs/theme/auguria/img/reload.png differ
diff --git a/htdocs/theme/auguria/img/rightarrow.png b/htdocs/theme/auguria/img/rightarrow.png
index 2ea37440ecd..2c479d9453b 100644
Binary files a/htdocs/theme/auguria/img/rightarrow.png and b/htdocs/theme/auguria/img/rightarrow.png differ
diff --git a/htdocs/theme/auguria/img/searchclear.png b/htdocs/theme/auguria/img/searchclear.png
index 024e0c62cdd..203a85e10c4 100644
Binary files a/htdocs/theme/auguria/img/searchclear.png and b/htdocs/theme/auguria/img/searchclear.png differ
diff --git a/htdocs/theme/auguria/img/setup.png b/htdocs/theme/auguria/img/setup.png
index 1444d86ce2a..ca5f28b1d17 100644
Binary files a/htdocs/theme/auguria/img/setup.png and b/htdocs/theme/auguria/img/setup.png differ
diff --git a/htdocs/theme/auguria/img/sort_asc.png b/htdocs/theme/auguria/img/sort_asc.png
index a88d7975fe9..e327d952fa4 100644
Binary files a/htdocs/theme/auguria/img/sort_asc.png and b/htdocs/theme/auguria/img/sort_asc.png differ
diff --git a/htdocs/theme/auguria/img/sort_asc_disabled.png b/htdocs/theme/auguria/img/sort_asc_disabled.png
index 4e144cf0b1f..e327d952fa4 100644
Binary files a/htdocs/theme/auguria/img/sort_asc_disabled.png and b/htdocs/theme/auguria/img/sort_asc_disabled.png differ
diff --git a/htdocs/theme/auguria/img/sort_desc.png b/htdocs/theme/auguria/img/sort_desc.png
index def071ed5af..db99fd9ad47 100644
Binary files a/htdocs/theme/auguria/img/sort_desc.png and b/htdocs/theme/auguria/img/sort_desc.png differ
diff --git a/htdocs/theme/auguria/img/sort_desc_disabled.png b/htdocs/theme/auguria/img/sort_desc_disabled.png
index 7824973cc60..89051c2f34f 100644
Binary files a/htdocs/theme/auguria/img/sort_desc_disabled.png and b/htdocs/theme/auguria/img/sort_desc_disabled.png differ
diff --git a/htdocs/theme/auguria/img/split.png b/htdocs/theme/auguria/img/split.png
index 008557d7341..bb66213f413 100644
Binary files a/htdocs/theme/auguria/img/split.png and b/htdocs/theme/auguria/img/split.png differ
diff --git a/htdocs/theme/auguria/img/stats.png b/htdocs/theme/auguria/img/stats.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/auguria/img/statut0.png b/htdocs/theme/auguria/img/statut0.png
index 0f7b0bd4f87..d11252783a4 100644
Binary files a/htdocs/theme/auguria/img/statut0.png and b/htdocs/theme/auguria/img/statut0.png differ
diff --git a/htdocs/theme/auguria/img/statut1.png b/htdocs/theme/auguria/img/statut1.png
index 3e4650f4f02..558439d282e 100644
Binary files a/htdocs/theme/auguria/img/statut1.png and b/htdocs/theme/auguria/img/statut1.png differ
diff --git a/htdocs/theme/auguria/img/statut3.png b/htdocs/theme/auguria/img/statut3.png
index f49966eaaa1..e7515796683 100644
Binary files a/htdocs/theme/auguria/img/statut3.png and b/htdocs/theme/auguria/img/statut3.png differ
diff --git a/htdocs/theme/auguria/img/statut4.png b/htdocs/theme/auguria/img/statut4.png
index aed93a350ba..6ec1ba55961 100644
Binary files a/htdocs/theme/auguria/img/statut4.png and b/htdocs/theme/auguria/img/statut4.png differ
diff --git a/htdocs/theme/auguria/img/statut5.png b/htdocs/theme/auguria/img/statut5.png
index a2e22fe6f59..53264a0515d 100644
Binary files a/htdocs/theme/auguria/img/statut5.png and b/htdocs/theme/auguria/img/statut5.png differ
diff --git a/htdocs/theme/auguria/img/statut7.png b/htdocs/theme/auguria/img/statut7.png
index 50295a03ed5..8871a45519f 100644
Binary files a/htdocs/theme/auguria/img/statut7.png and b/htdocs/theme/auguria/img/statut7.png differ
diff --git a/htdocs/theme/auguria/img/statut8.png b/htdocs/theme/auguria/img/statut8.png
old mode 100755
new mode 100644
index 4d8f59be1c2..c24d4a9dac2
Binary files a/htdocs/theme/auguria/img/statut8.png and b/htdocs/theme/auguria/img/statut8.png differ
diff --git a/htdocs/theme/auguria/img/statut9.png b/htdocs/theme/auguria/img/statut9.png
old mode 100755
new mode 100644
index 5401cf9b03d..94b6dabf265
Binary files a/htdocs/theme/auguria/img/statut9.png and b/htdocs/theme/auguria/img/statut9.png differ
diff --git a/htdocs/theme/auguria/img/stcomm-1.png b/htdocs/theme/auguria/img/stcomm-1.png
index 52b3625ac05..df442fc1eda 100644
Binary files a/htdocs/theme/auguria/img/stcomm-1.png and b/htdocs/theme/auguria/img/stcomm-1.png differ
diff --git a/htdocs/theme/auguria/img/stcomm-1_grayed.png b/htdocs/theme/auguria/img/stcomm-1_grayed.png
index 20a7219535e..5942e6c72af 100644
Binary files a/htdocs/theme/auguria/img/stcomm-1_grayed.png and b/htdocs/theme/auguria/img/stcomm-1_grayed.png differ
diff --git a/htdocs/theme/auguria/img/stcomm0.png b/htdocs/theme/auguria/img/stcomm0.png
index 6053eeda485..cbe60a02d28 100644
Binary files a/htdocs/theme/auguria/img/stcomm0.png and b/htdocs/theme/auguria/img/stcomm0.png differ
diff --git a/htdocs/theme/auguria/img/stcomm0_grayed.png b/htdocs/theme/auguria/img/stcomm0_grayed.png
index a92e1558506..9016db48b02 100644
Binary files a/htdocs/theme/auguria/img/stcomm0_grayed.png and b/htdocs/theme/auguria/img/stcomm0_grayed.png differ
diff --git a/htdocs/theme/auguria/img/stcomm1.png b/htdocs/theme/auguria/img/stcomm1.png
index eb76c0fb179..6bdea492985 100644
Binary files a/htdocs/theme/auguria/img/stcomm1.png and b/htdocs/theme/auguria/img/stcomm1.png differ
diff --git a/htdocs/theme/auguria/img/stcomm1_grayed.png b/htdocs/theme/auguria/img/stcomm1_grayed.png
index 98ed423aa9e..367a55921e4 100644
Binary files a/htdocs/theme/auguria/img/stcomm1_grayed.png and b/htdocs/theme/auguria/img/stcomm1_grayed.png differ
diff --git a/htdocs/theme/auguria/img/stcomm2.png b/htdocs/theme/auguria/img/stcomm2.png
index 1e76ce4946b..9e000b70dc9 100644
Binary files a/htdocs/theme/auguria/img/stcomm2.png and b/htdocs/theme/auguria/img/stcomm2.png differ
diff --git a/htdocs/theme/auguria/img/stcomm2_grayed.png b/htdocs/theme/auguria/img/stcomm2_grayed.png
index 0f2a4332cfc..f667e3573d0 100644
Binary files a/htdocs/theme/auguria/img/stcomm2_grayed.png and b/htdocs/theme/auguria/img/stcomm2_grayed.png differ
diff --git a/htdocs/theme/auguria/img/stcomm3.png b/htdocs/theme/auguria/img/stcomm3.png
index 465234fcd3c..5a6c0aeface 100644
Binary files a/htdocs/theme/auguria/img/stcomm3.png and b/htdocs/theme/auguria/img/stcomm3.png differ
diff --git a/htdocs/theme/auguria/img/stcomm3_grayed.png b/htdocs/theme/auguria/img/stcomm3_grayed.png
index fc80eb2aebd..81a14c1e482 100644
Binary files a/htdocs/theme/auguria/img/stcomm3_grayed.png and b/htdocs/theme/auguria/img/stcomm3_grayed.png differ
diff --git a/htdocs/theme/auguria/img/stcomm4.png b/htdocs/theme/auguria/img/stcomm4.png
index c839a8acec5..3e26b4d06ed 100644
Binary files a/htdocs/theme/auguria/img/stcomm4.png and b/htdocs/theme/auguria/img/stcomm4.png differ
diff --git a/htdocs/theme/auguria/img/stcomm4_grayed.png b/htdocs/theme/auguria/img/stcomm4_grayed.png
index 4935499d917..4271aafb6ce 100644
Binary files a/htdocs/theme/auguria/img/stcomm4_grayed.png and b/htdocs/theme/auguria/img/stcomm4_grayed.png differ
diff --git a/htdocs/theme/auguria/img/tab_background.png b/htdocs/theme/auguria/img/tab_background.png
index 0864dcc5852..6edd65003e0 100644
Binary files a/htdocs/theme/auguria/img/tab_background.png and b/htdocs/theme/auguria/img/tab_background.png differ
diff --git a/htdocs/theme/auguria/img/tick.png b/htdocs/theme/auguria/img/tick.png
index deb69ee75ec..9b035d99511 100644
Binary files a/htdocs/theme/auguria/img/tick.png and b/htdocs/theme/auguria/img/tick.png differ
diff --git a/htdocs/theme/auguria/img/title.png b/htdocs/theme/auguria/img/title.png
index bcd70489c80..bb48d617379 100644
Binary files a/htdocs/theme/auguria/img/title.png and b/htdocs/theme/auguria/img/title.png differ
diff --git a/htdocs/theme/auguria/img/tmenu.jpg b/htdocs/theme/auguria/img/tmenu.jpg
index 8db7fdcb6fa..4e51fef3fc7 100644
Binary files a/htdocs/theme/auguria/img/tmenu.jpg and b/htdocs/theme/auguria/img/tmenu.jpg differ
diff --git a/htdocs/theme/auguria/img/tmenu2.jpg b/htdocs/theme/auguria/img/tmenu2.jpg
index e5ca3f72414..920e0066341 100644
Binary files a/htdocs/theme/auguria/img/tmenu2.jpg and b/htdocs/theme/auguria/img/tmenu2.jpg differ
diff --git a/htdocs/theme/auguria/img/tmenu3.jpg b/htdocs/theme/auguria/img/tmenu3.jpg
index dc2434541cf..d42f804b026 100644
Binary files a/htdocs/theme/auguria/img/tmenu3.jpg and b/htdocs/theme/auguria/img/tmenu3.jpg differ
diff --git a/htdocs/theme/auguria/img/tmenu_inverse.jpg b/htdocs/theme/auguria/img/tmenu_inverse.jpg
index c8fe6d0aff2..e1efd44376e 100644
Binary files a/htdocs/theme/auguria/img/tmenu_inverse.jpg and b/htdocs/theme/auguria/img/tmenu_inverse.jpg differ
diff --git a/htdocs/theme/auguria/img/unlock.png b/htdocs/theme/auguria/img/unlock.png
index f3eebc59274..afefaa94d47 100644
Binary files a/htdocs/theme/auguria/img/unlock.png and b/htdocs/theme/auguria/img/unlock.png differ
diff --git a/htdocs/theme/auguria/img/vcard.png b/htdocs/theme/auguria/img/vcard.png
index e03026f87fb..315abdf179d 100644
Binary files a/htdocs/theme/auguria/img/vcard.png and b/htdocs/theme/auguria/img/vcard.png differ
diff --git a/htdocs/theme/auguria/img/view.png b/htdocs/theme/auguria/img/view.png
index 828c79a8323..76c1e9f1e6a 100644
Binary files a/htdocs/theme/auguria/img/view.png and b/htdocs/theme/auguria/img/view.png differ
diff --git a/htdocs/theme/auguria/img/warning.png b/htdocs/theme/auguria/img/warning.png
index ae8e35e781d..f1b93b8cc82 100644
Binary files a/htdocs/theme/auguria/img/warning.png and b/htdocs/theme/auguria/img/warning.png differ
diff --git a/htdocs/theme/auguria/index.html b/htdocs/theme/auguria/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/auguria/index.php b/htdocs/theme/auguria/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/auguria/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index f0c2e96fe52..6e4ba602ade 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C)      2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2007-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012	   Juanjo Menent		<jmenent@2byte.es>
  *
@@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
 // Define image path files and other constants
 $fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 $img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
-$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
+$img_head='';
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 $dol_hide_topmenu=$conf->dol_hide_topmenu;
 $dol_hide_leftmenu=$conf->dol_hide_leftmenu;
@@ -108,7 +108,7 @@ body {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
-	background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
+	background-color: #FCFCFC;
 <?php } ?>
 	color: #101010;
 	font-size: <?php print $fontsize ?>px;
@@ -184,14 +184,6 @@ legend { margin-bottom: 8px; }
     padding: 0px 2px 0px 2px;
     margin: 0px 0px 0px 0px;
 }
-.buttonajax {
-    font-family: <?php print $fontlist ?>;
-	border: 0px;
-	background-image: url(<?php echo $img_button ?>);
-	background-position: bottom;
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
 form {
     padding: 0em 0em 0em 0em;
     margin: 0em 0em 0em 0em;
@@ -233,6 +225,23 @@ div.inline-block
 .nounderline {
     text-decoration: none;
 }
+.cursorpointer {
+	cursor: pointer;
+}
+.badge {
+	display: inline-block;
+	min-width: 10px;
+	padding: 2px 5px;
+	font-size: 10px;
+	font-weight: 700;
+	line-height: 0.9em;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	background-color: #777;
+	border-radius: 10px;
+}
 
 
 /* ============================================================================== */
@@ -356,7 +365,6 @@ div.tmenu {
     height: <?php print $heightmenu; ?>px;
     background: #7FAEC6;
     background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/table_bg.gif',1); ?>);
-/*    background-position: center bottom; */
     color: #000000;
     text-decoration: none;
 <?php } ?>
@@ -375,7 +383,9 @@ div.mainmenu {
 }
 */
 
-<?php if (empty($conf->dol_optimize_smallscreen)) {
+
+/* Do not load menu img if hidden to save bandwidth */
+<?php if (empty($dol_hide_topmenu)) {
 
 // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
@@ -397,7 +407,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 $mainmenuusedarray=array();	// Disable
 
 $generic=1;
-$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','cashdesk');
+$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','cashdesk');
 foreach($mainmenuusedarray as $val)
 {
 	if (empty($val) || in_array($val,$divalreadydefined)) continue;
@@ -434,7 +444,7 @@ foreach($mainmenuusedarray as $val)
 ?>
 
 <?php
-}	// End test if not phone
+}	// End test if $dol_hide_topmenu
 ?>
 
 .tmenu{
@@ -711,8 +721,8 @@ div.blockvmenusearch
 {
 	padding-top: 1px;
 	padding-bottom: 1px;
-	height: 16px;
 	background: #DDDDDD !important;
+	min-height: 16px;
 }
 
 div.blockvmenubookmarks
@@ -1838,9 +1848,14 @@ td.hidden {
 
 table.cal_month    { border-spacing: 0px; }
 .cal_other_month   { background: #DDDDDD; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_other_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B !important; border-right: 0; }
 .cal_past_month    { background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month { background: #FFFFFF; border-left: solid 1px #ACBCBB; border-bottom: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B; border-right: 0; border-bottom: solid 1px #ACBCBB; }
+.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser { background: #FFFFFF; border-right: solid 1px #6C7C7B; border-top: solid 1px #A0A0A0; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; border-top: solid 1px #A0A0A0; border-right: solid 1px #6C7C7B; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
@@ -1849,6 +1864,9 @@ li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; }
+.cal_peruser       { padding: 0px; }
+.peruser_busy      { background: #CC8888; }
+.peruser_notbusy   { background: #EEDDDD; }
 
 
 /* ============================================================================== */
@@ -2299,6 +2317,11 @@ div.ecmjqft {
 {
 	text-decoration: underline !important;
 }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
+	opacity: .35;
+	filter: Alpha(Opacity=35);
+	background-image: none;
+}
 
 
 /* ============================================================================== */
@@ -2441,6 +2464,14 @@ ul.ulmenu {
 	background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
 	background-image: linear-gradient( #eee,#e1e1e1 ) !important;
 }
+.lilevel2
+{
+	padding-left: 22px;
+}
+.lilevel3
+{
+	padding-left: 54px;
+}
 
 <?php
 if (is_object($db)) $db->close();
diff --git a/htdocs/theme/auguria/thumb.png b/htdocs/theme/auguria/thumb.png
index b51b386fc7a..88cb0e849a2 100644
Binary files a/htdocs/theme/auguria/thumb.png and b/htdocs/theme/auguria/thumb.png differ
diff --git a/htdocs/theme/auguria/tpl/index.html b/htdocs/theme/auguria/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/auguria/tpl/index.php b/htdocs/theme/auguria/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/auguria/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/bureau2crea/ckeditor/index.html b/htdocs/theme/bureau2crea/ckeditor/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/bureau2crea/img/1downarrow.png b/htdocs/theme/bureau2crea/img/1downarrow.png
index c77e4607958..316fe442e2b 100644
Binary files a/htdocs/theme/bureau2crea/img/1downarrow.png and b/htdocs/theme/bureau2crea/img/1downarrow.png differ
diff --git a/htdocs/theme/bureau2crea/img/1downarrow_selected.png b/htdocs/theme/bureau2crea/img/1downarrow_selected.png
index d5fed48abeb..082a545addb 100644
Binary files a/htdocs/theme/bureau2crea/img/1downarrow_selected.png and b/htdocs/theme/bureau2crea/img/1downarrow_selected.png differ
diff --git a/htdocs/theme/bureau2crea/img/1leftarrow.png b/htdocs/theme/bureau2crea/img/1leftarrow.png
index ef6dbd377a6..026a4cfff80 100644
Binary files a/htdocs/theme/bureau2crea/img/1leftarrow.png and b/htdocs/theme/bureau2crea/img/1leftarrow.png differ
diff --git a/htdocs/theme/bureau2crea/img/1leftarrow_selected.png b/htdocs/theme/bureau2crea/img/1leftarrow_selected.png
index 423b77600d0..4835cf8f508 100644
Binary files a/htdocs/theme/bureau2crea/img/1leftarrow_selected.png and b/htdocs/theme/bureau2crea/img/1leftarrow_selected.png differ
diff --git a/htdocs/theme/bureau2crea/img/1rightarrow.png b/htdocs/theme/bureau2crea/img/1rightarrow.png
index 0e3eb3372ff..54fe3dcf366 100644
Binary files a/htdocs/theme/bureau2crea/img/1rightarrow.png and b/htdocs/theme/bureau2crea/img/1rightarrow.png differ
diff --git a/htdocs/theme/bureau2crea/img/1rightarrow_selected.png b/htdocs/theme/bureau2crea/img/1rightarrow_selected.png
index cc15d2f2144..2cd1136c77a 100644
Binary files a/htdocs/theme/bureau2crea/img/1rightarrow_selected.png and b/htdocs/theme/bureau2crea/img/1rightarrow_selected.png differ
diff --git a/htdocs/theme/bureau2crea/img/1uparrow.png b/htdocs/theme/bureau2crea/img/1uparrow.png
index f2fd9a85eed..e4f7b42acb6 100644
Binary files a/htdocs/theme/bureau2crea/img/1uparrow.png and b/htdocs/theme/bureau2crea/img/1uparrow.png differ
diff --git a/htdocs/theme/bureau2crea/img/1uparrow_selected.png b/htdocs/theme/bureau2crea/img/1uparrow_selected.png
index e4c4ec1a6cb..d19fae7a61d 100644
Binary files a/htdocs/theme/bureau2crea/img/1uparrow_selected.png and b/htdocs/theme/bureau2crea/img/1uparrow_selected.png differ
diff --git a/htdocs/theme/bureau2crea/img/2.png b/htdocs/theme/bureau2crea/img/2.png
index ad65c580ee7..f592543dd8e 100644
Binary files a/htdocs/theme/bureau2crea/img/2.png and b/htdocs/theme/bureau2crea/img/2.png differ
diff --git a/htdocs/theme/bureau2crea/img/addfile.png b/htdocs/theme/bureau2crea/img/addfile.png
index 3bfa627d758..1cb7af0ad8a 100644
Binary files a/htdocs/theme/bureau2crea/img/addfile.png and b/htdocs/theme/bureau2crea/img/addfile.png differ
diff --git a/htdocs/theme/bureau2crea/img/banner_02.jpg b/htdocs/theme/bureau2crea/img/banner_02.jpg
index 29e0619e77f..81635fd2a59 100644
Binary files a/htdocs/theme/bureau2crea/img/banner_02.jpg and b/htdocs/theme/bureau2crea/img/banner_02.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg-bas-rubrique.png b/htdocs/theme/bureau2crea/img/bg-bas-rubrique.png
index 941207d85da..d2fbe3a7a13 100644
Binary files a/htdocs/theme/bureau2crea/img/bg-bas-rubrique.png and b/htdocs/theme/bureau2crea/img/bg-bas-rubrique.png differ
diff --git a/htdocs/theme/bureau2crea/img/bg-rubrique.png b/htdocs/theme/bureau2crea/img/bg-rubrique.png
index 6bc08feb211..9abf1dc1459 100644
Binary files a/htdocs/theme/bureau2crea/img/bg-rubrique.png and b/htdocs/theme/bureau2crea/img/bg-rubrique.png differ
diff --git a/htdocs/theme/bureau2crea/img/bg-titre-rubrique.png b/htdocs/theme/bureau2crea/img/bg-titre-rubrique.png
index abf662a530b..ad6484fcbe9 100644
Binary files a/htdocs/theme/bureau2crea/img/bg-titre-rubrique.png and b/htdocs/theme/bureau2crea/img/bg-titre-rubrique.png differ
diff --git a/htdocs/theme/bureau2crea/img/bg_btnBlue.jpg b/htdocs/theme/bureau2crea/img/bg_btnBlue.jpg
index f354fabf32d..f24b76ee016 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_btnBlue.jpg and b/htdocs/theme/bureau2crea/img/bg_btnBlue.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_btnGreen.jpg b/htdocs/theme/bureau2crea/img/bg_btnGreen.jpg
index d2c3f60f44d..eae9fb1217b 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_btnGreen.jpg and b/htdocs/theme/bureau2crea/img/bg_btnGreen.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_btnGrey.jpg b/htdocs/theme/bureau2crea/img/bg_btnGrey.jpg
index 05b95df748c..48911bf6f13 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_btnGrey.jpg and b/htdocs/theme/bureau2crea/img/bg_btnGrey.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_btnRed.jpg b/htdocs/theme/bureau2crea/img/bg_btnRed.jpg
index 9e309245c43..c8c7f55c85d 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_btnRed.jpg and b/htdocs/theme/bureau2crea/img/bg_btnRed.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_btn_blue.jpg b/htdocs/theme/bureau2crea/img/bg_btn_blue.jpg
index b09d2bb5a5a..563cebdc3e7 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_btn_blue.jpg and b/htdocs/theme/bureau2crea/img/bg_btn_blue.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_btn_green.jpg b/htdocs/theme/bureau2crea/img/bg_btn_green.jpg
index 513f0eb0fd8..d29a1bb0d61 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_btn_green.jpg and b/htdocs/theme/bureau2crea/img/bg_btn_green.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_btn_red.jpg b/htdocs/theme/bureau2crea/img/bg_btn_red.jpg
index ad8da842c7c..fb11e4f2daf 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_btn_red.jpg and b/htdocs/theme/bureau2crea/img/bg_btn_red.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_centerBlock-title.jpg b/htdocs/theme/bureau2crea/img/bg_centerBlock-title.jpg
index 629a40617e5..354fb66cb5e 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_centerBlock-title.jpg and b/htdocs/theme/bureau2crea/img/bg_centerBlock-title.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_centerBlock-title2.jpg b/htdocs/theme/bureau2crea/img/bg_centerBlock-title2.jpg
index c8cb8d9f39c..d3f196e469d 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_centerBlock-title2.jpg and b/htdocs/theme/bureau2crea/img/bg_centerBlock-title2.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_connectionBox.jpg b/htdocs/theme/bureau2crea/img/bg_connectionBox.jpg
index 4634207f71b..946a51b63a8 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_connectionBox.jpg and b/htdocs/theme/bureau2crea/img/bg_connectionBox.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_leftCategorie.jpg b/htdocs/theme/bureau2crea/img/bg_leftCategorie.jpg
index 00071c4ec42..f152d6d083f 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_leftCategorie.jpg and b/htdocs/theme/bureau2crea/img/bg_leftCategorie.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_leftMenu.jpg b/htdocs/theme/bureau2crea/img/bg_leftMenu.jpg
index b095fe478a4..0fc515742a3 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_leftMenu.jpg and b/htdocs/theme/bureau2crea/img/bg_leftMenu.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_mainNav.jpg b/htdocs/theme/bureau2crea/img/bg_mainNav.jpg
index 93e65598156..15387ee476b 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_mainNav.jpg and b/htdocs/theme/bureau2crea/img/bg_mainNav.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_navHorizontal.jpg b/htdocs/theme/bureau2crea/img/bg_navHorizontal.jpg
index 34008a24cd7..ad42dee2ee9 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_navHorizontal.jpg and b/htdocs/theme/bureau2crea/img/bg_navHorizontal.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_other_table.jpg b/htdocs/theme/bureau2crea/img/bg_other_table.jpg
index 086a46a8613..f4409cbaae5 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_other_table.jpg and b/htdocs/theme/bureau2crea/img/bg_other_table.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_ssmenu_btnD.jpg b/htdocs/theme/bureau2crea/img/bg_ssmenu_btnD.jpg
index 7df7fd0ab02..fd09bb40da0 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_ssmenu_btnD.jpg and b/htdocs/theme/bureau2crea/img/bg_ssmenu_btnD.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_ssmenu_btnG.jpg b/htdocs/theme/bureau2crea/img/bg_ssmenu_btnG.jpg
index 12accbf3ccb..ca483b7b295 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_ssmenu_btnG.jpg and b/htdocs/theme/bureau2crea/img/bg_ssmenu_btnG.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnD.jpg b/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnD.jpg
index d7324957df6..1e41b87c6ea 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnD.jpg and b/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnD.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnG.jpg b/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnG.jpg
index 1d012589854..3df9a20bcd5 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnG.jpg and b/htdocs/theme/bureau2crea/img/bg_ssmenusel_btnG.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_tmenu.jpg b/htdocs/theme/bureau2crea/img/bg_tmenu.jpg
index 5fc95c7572c..985311e8a1e 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_tmenu.jpg and b/htdocs/theme/bureau2crea/img/bg_tmenu.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_tmenu_btnD.jpg b/htdocs/theme/bureau2crea/img/bg_tmenu_btnD.jpg
index ccd9b835f7d..fc064ef4dcf 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_tmenu_btnD.jpg and b/htdocs/theme/bureau2crea/img/bg_tmenu_btnD.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_tmenu_btnG.jpg b/htdocs/theme/bureau2crea/img/bg_tmenu_btnG.jpg
index 40caeea6e67..9c3342222aa 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_tmenu_btnG.jpg and b/htdocs/theme/bureau2crea/img/bg_tmenu_btnG.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_tmenusel_btnD.jpg b/htdocs/theme/bureau2crea/img/bg_tmenusel_btnD.jpg
index 6fed6c09e1a..b5507043898 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_tmenusel_btnD.jpg and b/htdocs/theme/bureau2crea/img/bg_tmenusel_btnD.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_tmenusel_btnG.jpg b/htdocs/theme/bureau2crea/img/bg_tmenusel_btnG.jpg
index 28dcb500923..317dde2f556 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_tmenusel_btnG.jpg and b/htdocs/theme/bureau2crea/img/bg_tmenusel_btnG.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_vmenu.jpg b/htdocs/theme/bureau2crea/img/bg_vmenu.jpg
index df83d4bd687..84d883d8d69 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_vmenu.jpg and b/htdocs/theme/bureau2crea/img/bg_vmenu.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bg_working_table.jpg b/htdocs/theme/bureau2crea/img/bg_working_table.jpg
index dd925af6d1d..bb2c66aded3 100644
Binary files a/htdocs/theme/bureau2crea/img/bg_working_table.jpg and b/htdocs/theme/bureau2crea/img/bg_working_table.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/body_bg.jpg b/htdocs/theme/bureau2crea/img/body_bg.jpg
index ddde2c5f5aa..0480bfdc738 100644
Binary files a/htdocs/theme/bureau2crea/img/body_bg.jpg and b/htdocs/theme/bureau2crea/img/body_bg.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/bouton/index.html b/htdocs/theme/bureau2crea/img/bouton/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/bureau2crea/img/bouton/menu_l_title_bg.png b/htdocs/theme/bureau2crea/img/bouton/menu_l_title_bg.png
index 8f61b220c59..10e03744ace 100644
Binary files a/htdocs/theme/bureau2crea/img/bouton/menu_l_title_bg.png and b/htdocs/theme/bureau2crea/img/bouton/menu_l_title_bg.png differ
diff --git a/htdocs/theme/bureau2crea/img/bouton/round_black_tr.png b/htdocs/theme/bureau2crea/img/bouton/round_black_tr.png
index f27609ae8ee..f0ea7d10c5c 100644
Binary files a/htdocs/theme/bureau2crea/img/bouton/round_black_tr.png and b/htdocs/theme/bureau2crea/img/bouton/round_black_tr.png differ
diff --git a/htdocs/theme/bureau2crea/img/button_edit.png b/htdocs/theme/bureau2crea/img/button_edit.png
index ce8b226710b..894b4cfd78e 100644
Binary files a/htdocs/theme/bureau2crea/img/button_edit.png and b/htdocs/theme/bureau2crea/img/button_edit.png differ
diff --git a/htdocs/theme/bureau2crea/img/calc.png b/htdocs/theme/bureau2crea/img/calc.png
index d3bd2bbc824..5e6471408d8 100644
Binary files a/htdocs/theme/bureau2crea/img/calc.png and b/htdocs/theme/bureau2crea/img/calc.png differ
diff --git a/htdocs/theme/bureau2crea/img/calendar.png b/htdocs/theme/bureau2crea/img/calendar.png
index 90829a353c3..bbe6c27f041 100644
Binary files a/htdocs/theme/bureau2crea/img/calendar.png and b/htdocs/theme/bureau2crea/img/calendar.png differ
diff --git a/htdocs/theme/bureau2crea/img/call.png b/htdocs/theme/bureau2crea/img/call.png
index 8315c57d61d..ddfc1b7bd90 100644
Binary files a/htdocs/theme/bureau2crea/img/call.png and b/htdocs/theme/bureau2crea/img/call.png differ
diff --git a/htdocs/theme/bureau2crea/img/call_out.png b/htdocs/theme/bureau2crea/img/call_out.png
index bf972d8b1ae..b5a22eb827b 100644
Binary files a/htdocs/theme/bureau2crea/img/call_out.png and b/htdocs/theme/bureau2crea/img/call_out.png differ
diff --git a/htdocs/theme/bureau2crea/img/close.png b/htdocs/theme/bureau2crea/img/close.png
index aacac9fc423..ec4338e8bca 100644
Binary files a/htdocs/theme/bureau2crea/img/close.png and b/htdocs/theme/bureau2crea/img/close.png differ
diff --git a/htdocs/theme/bureau2crea/img/close_title.png b/htdocs/theme/bureau2crea/img/close_title.png
index 24eda772954..bebb74d9861 100644
Binary files a/htdocs/theme/bureau2crea/img/close_title.png and b/htdocs/theme/bureau2crea/img/close_title.png differ
diff --git a/htdocs/theme/bureau2crea/img/delete.png b/htdocs/theme/bureau2crea/img/delete.png
index 221cd3c76b9..8ad73597be7 100644
Binary files a/htdocs/theme/bureau2crea/img/delete.png and b/htdocs/theme/bureau2crea/img/delete.png differ
diff --git a/htdocs/theme/bureau2crea/img/detail.png b/htdocs/theme/bureau2crea/img/detail.png
index 2d31ec2202e..05562bef842 100644
Binary files a/htdocs/theme/bureau2crea/img/detail.png and b/htdocs/theme/bureau2crea/img/detail.png differ
diff --git a/htdocs/theme/bureau2crea/img/disable.png b/htdocs/theme/bureau2crea/img/disable.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/bureau2crea/img/disable.png and b/htdocs/theme/bureau2crea/img/disable.png differ
diff --git a/htdocs/theme/bureau2crea/img/edit.png b/htdocs/theme/bureau2crea/img/edit.png
index 2fe9e5bde4d..0f5fa5de31f 100644
Binary files a/htdocs/theme/bureau2crea/img/edit.png and b/htdocs/theme/bureau2crea/img/edit.png differ
diff --git a/htdocs/theme/bureau2crea/img/edit_add.png b/htdocs/theme/bureau2crea/img/edit_add.png
index f6e67164208..ae205e9d770 100644
Binary files a/htdocs/theme/bureau2crea/img/edit_add.png and b/htdocs/theme/bureau2crea/img/edit_add.png differ
diff --git a/htdocs/theme/bureau2crea/img/edit_remove.png b/htdocs/theme/bureau2crea/img/edit_remove.png
index 0c7ca54fa1f..bc4bdb360fa 100644
Binary files a/htdocs/theme/bureau2crea/img/edit_remove.png and b/htdocs/theme/bureau2crea/img/edit_remove.png differ
diff --git a/htdocs/theme/bureau2crea/img/editdelete.png b/htdocs/theme/bureau2crea/img/editdelete.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/bureau2crea/img/editdelete.png and b/htdocs/theme/bureau2crea/img/editdelete.png differ
diff --git a/htdocs/theme/bureau2crea/img/file.png b/htdocs/theme/bureau2crea/img/file.png
index 98bc98d2f1f..73c66e9b2b3 100644
Binary files a/htdocs/theme/bureau2crea/img/file.png and b/htdocs/theme/bureau2crea/img/file.png differ
diff --git a/htdocs/theme/bureau2crea/img/filenew.png b/htdocs/theme/bureau2crea/img/filenew.png
index 1f6581389d1..8680cce82bf 100644
Binary files a/htdocs/theme/bureau2crea/img/filenew.png and b/htdocs/theme/bureau2crea/img/filenew.png differ
diff --git a/htdocs/theme/bureau2crea/img/filter.png b/htdocs/theme/bureau2crea/img/filter.png
index 4baa3a3be8e..917715107bd 100644
Binary files a/htdocs/theme/bureau2crea/img/filter.png and b/htdocs/theme/bureau2crea/img/filter.png differ
diff --git a/htdocs/theme/bureau2crea/img/folder-open.png b/htdocs/theme/bureau2crea/img/folder-open.png
index 1687cd1b536..1db8369b3d5 100644
Binary files a/htdocs/theme/bureau2crea/img/folder-open.png and b/htdocs/theme/bureau2crea/img/folder-open.png differ
diff --git a/htdocs/theme/bureau2crea/img/folder.png b/htdocs/theme/bureau2crea/img/folder.png
index 908a6df9348..04a24af2e22 100644
Binary files a/htdocs/theme/bureau2crea/img/folder.png and b/htdocs/theme/bureau2crea/img/folder.png differ
diff --git a/htdocs/theme/bureau2crea/img/grip.png b/htdocs/theme/bureau2crea/img/grip.png
index 216e51ca8f0..8053007e9dd 100644
Binary files a/htdocs/theme/bureau2crea/img/grip.png and b/htdocs/theme/bureau2crea/img/grip.png differ
diff --git a/htdocs/theme/bureau2crea/img/grip_title.png b/htdocs/theme/bureau2crea/img/grip_title.png
index 9b3c093c790..d6ecce335cb 100644
Binary files a/htdocs/theme/bureau2crea/img/grip_title.png and b/htdocs/theme/bureau2crea/img/grip_title.png differ
diff --git a/htdocs/theme/bureau2crea/img/headbg.jpg b/htdocs/theme/bureau2crea/img/headbg.jpg
index 7d1374e1fc9..160821354cc 100644
Binary files a/htdocs/theme/bureau2crea/img/headbg.jpg and b/htdocs/theme/bureau2crea/img/headbg.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/headbg2.jpg b/htdocs/theme/bureau2crea/img/headbg2.jpg
index 7917abd9c07..0bc44f0ea99 100644
Binary files a/htdocs/theme/bureau2crea/img/headbg2.jpg and b/htdocs/theme/bureau2crea/img/headbg2.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/help.png b/htdocs/theme/bureau2crea/img/help.png
index 0f716f67711..12e6cd655d6 100644
Binary files a/htdocs/theme/bureau2crea/img/help.png and b/htdocs/theme/bureau2crea/img/help.png differ
diff --git a/htdocs/theme/bureau2crea/img/high.png b/htdocs/theme/bureau2crea/img/high.png
index f893de7abf3..c0eaee6542f 100644
Binary files a/htdocs/theme/bureau2crea/img/high.png and b/htdocs/theme/bureau2crea/img/high.png differ
diff --git a/htdocs/theme/bureau2crea/img/history.png b/htdocs/theme/bureau2crea/img/history.png
index 932921c1f4c..0fa4283476b 100644
Binary files a/htdocs/theme/bureau2crea/img/history.png and b/htdocs/theme/bureau2crea/img/history.png differ
diff --git a/htdocs/theme/bureau2crea/img/indent1.png b/htdocs/theme/bureau2crea/img/indent1.png
index 52ebb2bd738..09695ac754f 100644
Binary files a/htdocs/theme/bureau2crea/img/indent1.png and b/htdocs/theme/bureau2crea/img/indent1.png differ
diff --git a/htdocs/theme/bureau2crea/img/index.html b/htdocs/theme/bureau2crea/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/bureau2crea/img/info.png b/htdocs/theme/bureau2crea/img/info.png
index 16f932283ad..db8ba04fac5 100644
Binary files a/htdocs/theme/bureau2crea/img/info.png and b/htdocs/theme/bureau2crea/img/info.png differ
diff --git a/htdocs/theme/bureau2crea/img/lock.png b/htdocs/theme/bureau2crea/img/lock.png
index 8c2e2cbdb09..3d99cf1eaef 100644
Binary files a/htdocs/theme/bureau2crea/img/lock.png and b/htdocs/theme/bureau2crea/img/lock.png differ
diff --git a/htdocs/theme/bureau2crea/img/login_background.png b/htdocs/theme/bureau2crea/img/login_background.png
index b264649fcbc..facc2c6f442 100644
Binary files a/htdocs/theme/bureau2crea/img/login_background.png and b/htdocs/theme/bureau2crea/img/login_background.png differ
diff --git a/htdocs/theme/bureau2crea/img/logout.png b/htdocs/theme/bureau2crea/img/logout.png
index cfff7ba61d1..84bd94e7b81 100644
Binary files a/htdocs/theme/bureau2crea/img/logout.png and b/htdocs/theme/bureau2crea/img/logout.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/agenda.png b/htdocs/theme/bureau2crea/img/menus/agenda.png
index 2bea3152a10..866037c9b54 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/agenda.png and b/htdocs/theme/bureau2crea/img/menus/agenda.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/commercial.png b/htdocs/theme/bureau2crea/img/menus/commercial.png
index e520f7eb71e..efc1b3f0608 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/commercial.png and b/htdocs/theme/bureau2crea/img/menus/commercial.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/footer_bg.jpg b/htdocs/theme/bureau2crea/img/menus/footer_bg.jpg
index ab5511b57f1..7319c16f9af 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/footer_bg.jpg and b/htdocs/theme/bureau2crea/img/menus/footer_bg.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/menus/generic3.png b/htdocs/theme/bureau2crea/img/menus/generic3.png
index d3ed4fa89b3..e22f73aa6f9 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/generic3.png and b/htdocs/theme/bureau2crea/img/menus/generic3.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/home.png b/htdocs/theme/bureau2crea/img/menus/home.png
index eec3240070b..f4d0d917d1f 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/home.png and b/htdocs/theme/bureau2crea/img/menus/home.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/index.html b/htdocs/theme/bureau2crea/img/menus/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/bureau2crea/img/menus/mail.png b/htdocs/theme/bureau2crea/img/menus/mail.png
index dab5feda5cd..d715ec7810c 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/mail.png and b/htdocs/theme/bureau2crea/img/menus/mail.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/products.png b/htdocs/theme/bureau2crea/img/menus/products.png
index d1081185c44..6f5f45269ee 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/products.png and b/htdocs/theme/bureau2crea/img/menus/products.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/project.png b/htdocs/theme/bureau2crea/img/menus/project.png
index 5bc0f86b4be..882235d2cd3 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/project.png and b/htdocs/theme/bureau2crea/img/menus/project.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/shop.png b/htdocs/theme/bureau2crea/img/menus/shop.png
deleted file mode 100644
index 89627d8b332..00000000000
Binary files a/htdocs/theme/bureau2crea/img/menus/shop.png and /dev/null differ
diff --git a/htdocs/theme/bureau2crea/img/menus/tab_background.png b/htdocs/theme/bureau2crea/img/menus/tab_background.png
index 0864dcc5852..6edd65003e0 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/tab_background.png and b/htdocs/theme/bureau2crea/img/menus/tab_background.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/tools.png b/htdocs/theme/bureau2crea/img/menus/tools.png
index 17215ec5899..c053f660ebf 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/tools.png and b/htdocs/theme/bureau2crea/img/menus/tools.png differ
diff --git a/htdocs/theme/bureau2crea/img/menus/trtitle.png b/htdocs/theme/bureau2crea/img/menus/trtitle.png
index a63f7868c5e..e1841a4f7a7 100644
Binary files a/htdocs/theme/bureau2crea/img/menus/trtitle.png and b/htdocs/theme/bureau2crea/img/menus/trtitle.png differ
diff --git a/htdocs/theme/bureau2crea/img/nav.jpg b/htdocs/theme/bureau2crea/img/nav.jpg
index 28a92271dcc..c4f28779dfe 100644
Binary files a/htdocs/theme/bureau2crea/img/nav.jpg and b/htdocs/theme/bureau2crea/img/nav.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/next.png b/htdocs/theme/bureau2crea/img/next.png
index dc8fa61930b..aff8f9e2ca5 100644
Binary files a/htdocs/theme/bureau2crea/img/next.png and b/htdocs/theme/bureau2crea/img/next.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_account.png b/htdocs/theme/bureau2crea/img/object_account.png
index 66b1b52471f..82f72c25740 100644
Binary files a/htdocs/theme/bureau2crea/img/object_account.png and b/htdocs/theme/bureau2crea/img/object_account.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_accounting.png b/htdocs/theme/bureau2crea/img/object_accounting.png
new file mode 100644
index 00000000000..b5600221f02
Binary files /dev/null and b/htdocs/theme/bureau2crea/img/object_accounting.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_action.png b/htdocs/theme/bureau2crea/img/object_action.png
index adf1860a462..9844c2dfa9b 100644
Binary files a/htdocs/theme/bureau2crea/img/object_action.png and b/htdocs/theme/bureau2crea/img/object_action.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_action_rdv.png b/htdocs/theme/bureau2crea/img/object_action_rdv.png
index b892da1f655..25edfa85b45 100644
Binary files a/htdocs/theme/bureau2crea/img/object_action_rdv.png and b/htdocs/theme/bureau2crea/img/object_action_rdv.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_address.png b/htdocs/theme/bureau2crea/img/object_address.png
index b20734da69a..a4b878966dc 100644
Binary files a/htdocs/theme/bureau2crea/img/object_address.png and b/htdocs/theme/bureau2crea/img/object_address.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_barcode.png b/htdocs/theme/bureau2crea/img/object_barcode.png
index 4eb6082ec31..9241513f0b8 100644
Binary files a/htdocs/theme/bureau2crea/img/object_barcode.png and b/htdocs/theme/bureau2crea/img/object_barcode.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_bill.png b/htdocs/theme/bureau2crea/img/object_bill.png
index e1cb50de2e6..277b6ab3233 100644
Binary files a/htdocs/theme/bureau2crea/img/object_bill.png and b/htdocs/theme/bureau2crea/img/object_bill.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_billa.png b/htdocs/theme/bureau2crea/img/object_billa.png
index da4e4e8d5d9..2589f34bfed 100644
Binary files a/htdocs/theme/bureau2crea/img/object_billa.png and b/htdocs/theme/bureau2crea/img/object_billa.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_billd.png b/htdocs/theme/bureau2crea/img/object_billd.png
index 11aa959cc43..201dc9057ae 100644
Binary files a/htdocs/theme/bureau2crea/img/object_billd.png and b/htdocs/theme/bureau2crea/img/object_billd.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_billr.png b/htdocs/theme/bureau2crea/img/object_billr.png
index e933aebd65d..18b8701685e 100644
Binary files a/htdocs/theme/bureau2crea/img/object_billr.png and b/htdocs/theme/bureau2crea/img/object_billr.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_book.png b/htdocs/theme/bureau2crea/img/object_book.png
index 6df91021589..cbbc05e8e72 100644
Binary files a/htdocs/theme/bureau2crea/img/object_book.png and b/htdocs/theme/bureau2crea/img/object_book.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_bookmark.png b/htdocs/theme/bureau2crea/img/object_bookmark.png
index 1a6af792525..a78697bdc3b 100644
Binary files a/htdocs/theme/bureau2crea/img/object_bookmark.png and b/htdocs/theme/bureau2crea/img/object_bookmark.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_calendar.png b/htdocs/theme/bureau2crea/img/object_calendar.png
index ec670d8857b..c647b7f998d 100644
Binary files a/htdocs/theme/bureau2crea/img/object_calendar.png and b/htdocs/theme/bureau2crea/img/object_calendar.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_calendarday.png b/htdocs/theme/bureau2crea/img/object_calendarday.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/bureau2crea/img/object_calendarweek.png b/htdocs/theme/bureau2crea/img/object_calendarweek.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/bureau2crea/img/object_category-expanded.png b/htdocs/theme/bureau2crea/img/object_category-expanded.png
index 330d649a2b8..af943c376e6 100644
Binary files a/htdocs/theme/bureau2crea/img/object_category-expanded.png and b/htdocs/theme/bureau2crea/img/object_category-expanded.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_category.png b/htdocs/theme/bureau2crea/img/object_category.png
index 5bf3c91df8d..c7e79d4d408 100644
Binary files a/htdocs/theme/bureau2crea/img/object_category.png and b/htdocs/theme/bureau2crea/img/object_category.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_commercial.png b/htdocs/theme/bureau2crea/img/object_commercial.png
index 1af9828796b..ad1519f111c 100644
Binary files a/htdocs/theme/bureau2crea/img/object_commercial.png and b/htdocs/theme/bureau2crea/img/object_commercial.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_company.png b/htdocs/theme/bureau2crea/img/object_company.png
index 614d760d936..58021fa506a 100644
Binary files a/htdocs/theme/bureau2crea/img/object_company.png and b/htdocs/theme/bureau2crea/img/object_company.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_contact.png b/htdocs/theme/bureau2crea/img/object_contact.png
index 17926656455..e98a7e367e2 100644
Binary files a/htdocs/theme/bureau2crea/img/object_contact.png and b/htdocs/theme/bureau2crea/img/object_contact.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_contact_all.png b/htdocs/theme/bureau2crea/img/object_contact_all.png
index bac3ede119a..f5c80635c28 100644
Binary files a/htdocs/theme/bureau2crea/img/object_contact_all.png and b/htdocs/theme/bureau2crea/img/object_contact_all.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_contract.png b/htdocs/theme/bureau2crea/img/object_contract.png
index 97e51f9f800..78af93d559f 100644
Binary files a/htdocs/theme/bureau2crea/img/object_contract.png and b/htdocs/theme/bureau2crea/img/object_contract.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_cron.png b/htdocs/theme/bureau2crea/img/object_cron.png
index b929050598d..6186d18da70 100644
Binary files a/htdocs/theme/bureau2crea/img/object_cron.png and b/htdocs/theme/bureau2crea/img/object_cron.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_dir.png b/htdocs/theme/bureau2crea/img/object_dir.png
index f02c3d8f2a0..7324bca0143 100644
Binary files a/htdocs/theme/bureau2crea/img/object_dir.png and b/htdocs/theme/bureau2crea/img/object_dir.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_email.png b/htdocs/theme/bureau2crea/img/object_email.png
index ded4af2949a..fdda80ed4cf 100644
Binary files a/htdocs/theme/bureau2crea/img/object_email.png and b/htdocs/theme/bureau2crea/img/object_email.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_energie.png b/htdocs/theme/bureau2crea/img/object_energie.png
index 572c80b8a5b..27b3b52f2c6 100644
Binary files a/htdocs/theme/bureau2crea/img/object_energie.png and b/htdocs/theme/bureau2crea/img/object_energie.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_generic.png b/htdocs/theme/bureau2crea/img/object_generic.png
index 7ec4355a7c2..39e0ab9f52f 100644
Binary files a/htdocs/theme/bureau2crea/img/object_generic.png and b/htdocs/theme/bureau2crea/img/object_generic.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_globe.png b/htdocs/theme/bureau2crea/img/object_globe.png
index f3fa11be499..701e24b1c46 100644
Binary files a/htdocs/theme/bureau2crea/img/object_globe.png and b/htdocs/theme/bureau2crea/img/object_globe.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_group.png b/htdocs/theme/bureau2crea/img/object_group.png
index 2c7e254c3bc..0e651e5aa5f 100644
Binary files a/htdocs/theme/bureau2crea/img/object_group.png and b/htdocs/theme/bureau2crea/img/object_group.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_holiday.png b/htdocs/theme/bureau2crea/img/object_holiday.png
index 69ccdb279a5..fdc1dd8e22b 100644
Binary files a/htdocs/theme/bureau2crea/img/object_holiday.png and b/htdocs/theme/bureau2crea/img/object_holiday.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_intervention.png b/htdocs/theme/bureau2crea/img/object_intervention.png
index f197c86fc20..09cd8370678 100644
Binary files a/htdocs/theme/bureau2crea/img/object_intervention.png and b/htdocs/theme/bureau2crea/img/object_intervention.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_invoice.png b/htdocs/theme/bureau2crea/img/object_invoice.png
index e1cb50de2e6..277b6ab3233 100644
Binary files a/htdocs/theme/bureau2crea/img/object_invoice.png and b/htdocs/theme/bureau2crea/img/object_invoice.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_label.png b/htdocs/theme/bureau2crea/img/object_label.png
index 913d3cdcd5b..b112af5cf0a 100644
Binary files a/htdocs/theme/bureau2crea/img/object_label.png and b/htdocs/theme/bureau2crea/img/object_label.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_margin.png b/htdocs/theme/bureau2crea/img/object_margin.png
index 13e4b92c9ce..cd0eb4109f7 100644
Binary files a/htdocs/theme/bureau2crea/img/object_margin.png and b/htdocs/theme/bureau2crea/img/object_margin.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_opensurvey.png b/htdocs/theme/bureau2crea/img/object_opensurvey.png
old mode 100755
new mode 100644
index 042d8217257..b5de3223bd4
Binary files a/htdocs/theme/bureau2crea/img/object_opensurvey.png and b/htdocs/theme/bureau2crea/img/object_opensurvey.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_order.png b/htdocs/theme/bureau2crea/img/object_order.png
index fa3414dbf69..1516cd03433 100644
Binary files a/htdocs/theme/bureau2crea/img/object_order.png and b/htdocs/theme/bureau2crea/img/object_order.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_payment.png b/htdocs/theme/bureau2crea/img/object_payment.png
index 10c3066a00c..f8ecf1d144e 100644
Binary files a/htdocs/theme/bureau2crea/img/object_payment.png and b/htdocs/theme/bureau2crea/img/object_payment.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_phoning.png b/htdocs/theme/bureau2crea/img/object_phoning.png
index 3a9a37836fb..9f5a14edd23 100644
Binary files a/htdocs/theme/bureau2crea/img/object_phoning.png and b/htdocs/theme/bureau2crea/img/object_phoning.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_product.png b/htdocs/theme/bureau2crea/img/object_product.png
index 24c7bf76783..f6477644a1f 100644
Binary files a/htdocs/theme/bureau2crea/img/object_product.png and b/htdocs/theme/bureau2crea/img/object_product.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_project.png b/htdocs/theme/bureau2crea/img/object_project.png
index 47029fed03d..bea2ebd1f7f 100644
Binary files a/htdocs/theme/bureau2crea/img/object_project.png and b/htdocs/theme/bureau2crea/img/object_project.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_projectpub.png b/htdocs/theme/bureau2crea/img/object_projectpub.png
index 9ac8f39355f..1ba7da16dcc 100644
Binary files a/htdocs/theme/bureau2crea/img/object_projectpub.png and b/htdocs/theme/bureau2crea/img/object_projectpub.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_projecttask.png b/htdocs/theme/bureau2crea/img/object_projecttask.png
index a3a580c3019..7aff1a2ee20 100644
Binary files a/htdocs/theme/bureau2crea/img/object_projecttask.png and b/htdocs/theme/bureau2crea/img/object_projecttask.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_propal.png b/htdocs/theme/bureau2crea/img/object_propal.png
index b7780a6b66f..4e66eebbedb 100644
Binary files a/htdocs/theme/bureau2crea/img/object_propal.png and b/htdocs/theme/bureau2crea/img/object_propal.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_reduc.png b/htdocs/theme/bureau2crea/img/object_reduc.png
index fd02156f297..39dcc0fe6a0 100644
Binary files a/htdocs/theme/bureau2crea/img/object_reduc.png and b/htdocs/theme/bureau2crea/img/object_reduc.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_resource.png b/htdocs/theme/bureau2crea/img/object_resource.png
new file mode 100644
index 00000000000..8cda1f3f220
Binary files /dev/null and b/htdocs/theme/bureau2crea/img/object_resource.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_rss.png b/htdocs/theme/bureau2crea/img/object_rss.png
index dad39390fa4..f3f9db58d95 100644
Binary files a/htdocs/theme/bureau2crea/img/object_rss.png and b/htdocs/theme/bureau2crea/img/object_rss.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_search.png b/htdocs/theme/bureau2crea/img/object_search.png
index 2627db2a7ba..6ffb1c806c7 100644
Binary files a/htdocs/theme/bureau2crea/img/object_search.png and b/htdocs/theme/bureau2crea/img/object_search.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_sending.png b/htdocs/theme/bureau2crea/img/object_sending.png
index 2e267bae6e4..93404176e87 100644
Binary files a/htdocs/theme/bureau2crea/img/object_sending.png and b/htdocs/theme/bureau2crea/img/object_sending.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_service.png b/htdocs/theme/bureau2crea/img/object_service.png
index 9a6eb8f091a..f6477644a1f 100644
Binary files a/htdocs/theme/bureau2crea/img/object_service.png and b/htdocs/theme/bureau2crea/img/object_service.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_skype.png b/htdocs/theme/bureau2crea/img/object_skype.png
index 97121565bb0..b209cd8d16e 100644
Binary files a/htdocs/theme/bureau2crea/img/object_skype.png and b/htdocs/theme/bureau2crea/img/object_skype.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_stock.png b/htdocs/theme/bureau2crea/img/object_stock.png
index 0dae23bfdfb..c7e79d4d408 100644
Binary files a/htdocs/theme/bureau2crea/img/object_stock.png and b/htdocs/theme/bureau2crea/img/object_stock.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_task.png b/htdocs/theme/bureau2crea/img/object_task.png
index c5fbb2a031a..20b9d641a23 100644
Binary files a/htdocs/theme/bureau2crea/img/object_task.png and b/htdocs/theme/bureau2crea/img/object_task.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_technic.png b/htdocs/theme/bureau2crea/img/object_technic.png
index 66371d50c5e..ac256e463e9 100644
Binary files a/htdocs/theme/bureau2crea/img/object_technic.png and b/htdocs/theme/bureau2crea/img/object_technic.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_trip.png b/htdocs/theme/bureau2crea/img/object_trip.png
index 7e057afe565..d1a025c8477 100644
Binary files a/htdocs/theme/bureau2crea/img/object_trip.png and b/htdocs/theme/bureau2crea/img/object_trip.png differ
diff --git a/htdocs/theme/bureau2crea/img/object_user.png b/htdocs/theme/bureau2crea/img/object_user.png
index 02704bd1a57..152fd668c08 100644
Binary files a/htdocs/theme/bureau2crea/img/object_user.png and b/htdocs/theme/bureau2crea/img/object_user.png differ
diff --git a/htdocs/theme/bureau2crea/img/off.png b/htdocs/theme/bureau2crea/img/off.png
index 38541c3d4b7..9e28e0fa91e 100644
Binary files a/htdocs/theme/bureau2crea/img/off.png and b/htdocs/theme/bureau2crea/img/off.png differ
diff --git a/htdocs/theme/bureau2crea/img/on.png b/htdocs/theme/bureau2crea/img/on.png
index e93440482ce..72e87ecaeb4 100644
Binary files a/htdocs/theme/bureau2crea/img/on.png and b/htdocs/theme/bureau2crea/img/on.png differ
diff --git a/htdocs/theme/bureau2crea/img/pdf2.png b/htdocs/theme/bureau2crea/img/pdf2.png
index 407fa968323..975d8098993 100644
Binary files a/htdocs/theme/bureau2crea/img/pdf2.png and b/htdocs/theme/bureau2crea/img/pdf2.png differ
diff --git a/htdocs/theme/bureau2crea/img/pdf3.png b/htdocs/theme/bureau2crea/img/pdf3.png
index f8058fa94b7..f053591bf2d 100644
Binary files a/htdocs/theme/bureau2crea/img/pdf3.png and b/htdocs/theme/bureau2crea/img/pdf3.png differ
diff --git a/htdocs/theme/bureau2crea/img/play.png b/htdocs/theme/bureau2crea/img/play.png
index 6de3e256ba6..4922ea1ec12 100644
Binary files a/htdocs/theme/bureau2crea/img/play.png and b/htdocs/theme/bureau2crea/img/play.png differ
diff --git a/htdocs/theme/bureau2crea/img/previous.png b/htdocs/theme/bureau2crea/img/previous.png
index ed929ee0c05..bff23a0f55d 100644
Binary files a/htdocs/theme/bureau2crea/img/previous.png and b/htdocs/theme/bureau2crea/img/previous.png differ
diff --git a/htdocs/theme/bureau2crea/img/printer.png b/htdocs/theme/bureau2crea/img/printer.png
index 2521942af43..774686d23be 100644
Binary files a/htdocs/theme/bureau2crea/img/printer.png and b/htdocs/theme/bureau2crea/img/printer.png differ
diff --git a/htdocs/theme/bureau2crea/img/puce.png b/htdocs/theme/bureau2crea/img/puce.png
index 922aff295cf..0bd4bd51023 100644
Binary files a/htdocs/theme/bureau2crea/img/puce.png and b/htdocs/theme/bureau2crea/img/puce.png differ
diff --git a/htdocs/theme/bureau2crea/img/recent.png b/htdocs/theme/bureau2crea/img/recent.png
index e721f977f33..a3405497f03 100644
Binary files a/htdocs/theme/bureau2crea/img/recent.png and b/htdocs/theme/bureau2crea/img/recent.png differ
diff --git a/htdocs/theme/bureau2crea/img/redstar.png b/htdocs/theme/bureau2crea/img/redstar.png
index 83ed4f4ae0d..ce7b207978a 100644
Binary files a/htdocs/theme/bureau2crea/img/redstar.png and b/htdocs/theme/bureau2crea/img/redstar.png differ
diff --git a/htdocs/theme/bureau2crea/img/refresh.png b/htdocs/theme/bureau2crea/img/refresh.png
index fdd0a2920e0..edc14adcd23 100644
Binary files a/htdocs/theme/bureau2crea/img/refresh.png and b/htdocs/theme/bureau2crea/img/refresh.png differ
diff --git a/htdocs/theme/bureau2crea/img/reload.png b/htdocs/theme/bureau2crea/img/reload.png
index 9efecb045f8..1e638197612 100644
Binary files a/htdocs/theme/bureau2crea/img/reload.png and b/htdocs/theme/bureau2crea/img/reload.png differ
diff --git a/htdocs/theme/bureau2crea/img/rightarrow.png b/htdocs/theme/bureau2crea/img/rightarrow.png
index 2ea37440ecd..2c479d9453b 100644
Binary files a/htdocs/theme/bureau2crea/img/rightarrow.png and b/htdocs/theme/bureau2crea/img/rightarrow.png differ
diff --git a/htdocs/theme/bureau2crea/img/search.png b/htdocs/theme/bureau2crea/img/search.png
index 8fc0005e69a..97f4801c921 100644
Binary files a/htdocs/theme/bureau2crea/img/search.png and b/htdocs/theme/bureau2crea/img/search.png differ
diff --git a/htdocs/theme/bureau2crea/img/searchclear.png b/htdocs/theme/bureau2crea/img/searchclear.png
index 45626e3be11..56fb7f1de87 100644
Binary files a/htdocs/theme/bureau2crea/img/searchclear.png and b/htdocs/theme/bureau2crea/img/searchclear.png differ
diff --git a/htdocs/theme/bureau2crea/img/setup.png b/htdocs/theme/bureau2crea/img/setup.png
index d386c8dce4a..ad9a58fe0d3 100644
Binary files a/htdocs/theme/bureau2crea/img/setup.png and b/htdocs/theme/bureau2crea/img/setup.png differ
diff --git a/htdocs/theme/bureau2crea/img/sort_asc.png b/htdocs/theme/bureau2crea/img/sort_asc.png
index a88d7975fe9..e327d952fa4 100644
Binary files a/htdocs/theme/bureau2crea/img/sort_asc.png and b/htdocs/theme/bureau2crea/img/sort_asc.png differ
diff --git a/htdocs/theme/bureau2crea/img/sort_asc_disabled.png b/htdocs/theme/bureau2crea/img/sort_asc_disabled.png
index 4e144cf0b1f..e327d952fa4 100644
Binary files a/htdocs/theme/bureau2crea/img/sort_asc_disabled.png and b/htdocs/theme/bureau2crea/img/sort_asc_disabled.png differ
diff --git a/htdocs/theme/bureau2crea/img/sort_desc.png b/htdocs/theme/bureau2crea/img/sort_desc.png
index def071ed5af..db99fd9ad47 100644
Binary files a/htdocs/theme/bureau2crea/img/sort_desc.png and b/htdocs/theme/bureau2crea/img/sort_desc.png differ
diff --git a/htdocs/theme/bureau2crea/img/sort_desc_disabled.png b/htdocs/theme/bureau2crea/img/sort_desc_disabled.png
index 7824973cc60..89051c2f34f 100644
Binary files a/htdocs/theme/bureau2crea/img/sort_desc_disabled.png and b/htdocs/theme/bureau2crea/img/sort_desc_disabled.png differ
diff --git a/htdocs/theme/bureau2crea/img/split.png b/htdocs/theme/bureau2crea/img/split.png
index a99bbcf26e7..50b6324c334 100644
Binary files a/htdocs/theme/bureau2crea/img/split.png and b/htdocs/theme/bureau2crea/img/split.png differ
diff --git a/htdocs/theme/bureau2crea/img/star.png b/htdocs/theme/bureau2crea/img/star.png
index 6c090d198e5..81feace1c30 100644
Binary files a/htdocs/theme/bureau2crea/img/star.png and b/htdocs/theme/bureau2crea/img/star.png differ
diff --git a/htdocs/theme/bureau2crea/img/stats.png b/htdocs/theme/bureau2crea/img/stats.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/bureau2crea/img/statut0.png b/htdocs/theme/bureau2crea/img/statut0.png
index f3aedc87cba..196f4f53c7d 100644
Binary files a/htdocs/theme/bureau2crea/img/statut0.png and b/htdocs/theme/bureau2crea/img/statut0.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut1.png b/htdocs/theme/bureau2crea/img/statut1.png
index c3f62f5a773..774b3e4bd54 100644
Binary files a/htdocs/theme/bureau2crea/img/statut1.png and b/htdocs/theme/bureau2crea/img/statut1.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut3.png b/htdocs/theme/bureau2crea/img/statut3.png
index 596f078ca8b..9ce49b93476 100644
Binary files a/htdocs/theme/bureau2crea/img/statut3.png and b/htdocs/theme/bureau2crea/img/statut3.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut4.png b/htdocs/theme/bureau2crea/img/statut4.png
index b12bc0d000c..e4f42ac6d53 100644
Binary files a/htdocs/theme/bureau2crea/img/statut4.png and b/htdocs/theme/bureau2crea/img/statut4.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut5.png b/htdocs/theme/bureau2crea/img/statut5.png
index 1a110285634..774b3e4bd54 100644
Binary files a/htdocs/theme/bureau2crea/img/statut5.png and b/htdocs/theme/bureau2crea/img/statut5.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut6.png b/htdocs/theme/bureau2crea/img/statut6.png
index c3d6619e237..e4f42ac6d53 100644
Binary files a/htdocs/theme/bureau2crea/img/statut6.png and b/htdocs/theme/bureau2crea/img/statut6.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut7.png b/htdocs/theme/bureau2crea/img/statut7.png
index 160a4b6fb56..b391da08db5 100644
Binary files a/htdocs/theme/bureau2crea/img/statut7.png and b/htdocs/theme/bureau2crea/img/statut7.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut8.png b/htdocs/theme/bureau2crea/img/statut8.png
old mode 100755
new mode 100644
index 4d8f59be1c2..c24d4a9dac2
Binary files a/htdocs/theme/bureau2crea/img/statut8.png and b/htdocs/theme/bureau2crea/img/statut8.png differ
diff --git a/htdocs/theme/bureau2crea/img/statut9.png b/htdocs/theme/bureau2crea/img/statut9.png
index 5401cf9b03d..94b6dabf265 100644
Binary files a/htdocs/theme/bureau2crea/img/statut9.png and b/htdocs/theme/bureau2crea/img/statut9.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm-1.png b/htdocs/theme/bureau2crea/img/stcomm-1.png
index e18aa77d893..2641cfa6a9d 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm-1.png and b/htdocs/theme/bureau2crea/img/stcomm-1.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm-1_grayed.png b/htdocs/theme/bureau2crea/img/stcomm-1_grayed.png
index 20a7219535e..5942e6c72af 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm-1_grayed.png and b/htdocs/theme/bureau2crea/img/stcomm-1_grayed.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm0.png b/htdocs/theme/bureau2crea/img/stcomm0.png
index ffddcfdfa33..d3e0d1853d3 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm0.png and b/htdocs/theme/bureau2crea/img/stcomm0.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm0_grayed.png b/htdocs/theme/bureau2crea/img/stcomm0_grayed.png
index a92e1558506..9016db48b02 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm0_grayed.png and b/htdocs/theme/bureau2crea/img/stcomm0_grayed.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm1.png b/htdocs/theme/bureau2crea/img/stcomm1.png
index 275b0eeb63e..40618af47ce 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm1.png and b/htdocs/theme/bureau2crea/img/stcomm1.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm1_grayed.png b/htdocs/theme/bureau2crea/img/stcomm1_grayed.png
index 98ed423aa9e..367a55921e4 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm1_grayed.png and b/htdocs/theme/bureau2crea/img/stcomm1_grayed.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm2.png b/htdocs/theme/bureau2crea/img/stcomm2.png
index e9c0557e762..f9f3f1d853e 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm2.png and b/htdocs/theme/bureau2crea/img/stcomm2.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm2_grayed.png b/htdocs/theme/bureau2crea/img/stcomm2_grayed.png
index 0f2a4332cfc..f667e3573d0 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm2_grayed.png and b/htdocs/theme/bureau2crea/img/stcomm2_grayed.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm3.png b/htdocs/theme/bureau2crea/img/stcomm3.png
index cbced22fb28..24cd66d3457 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm3.png and b/htdocs/theme/bureau2crea/img/stcomm3.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm3_grayed.png b/htdocs/theme/bureau2crea/img/stcomm3_grayed.png
index fc80eb2aebd..81a14c1e482 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm3_grayed.png and b/htdocs/theme/bureau2crea/img/stcomm3_grayed.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm4.png b/htdocs/theme/bureau2crea/img/stcomm4.png
index c839a8acec5..3e26b4d06ed 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm4.png and b/htdocs/theme/bureau2crea/img/stcomm4.png differ
diff --git a/htdocs/theme/bureau2crea/img/stcomm4_grayed.png b/htdocs/theme/bureau2crea/img/stcomm4_grayed.png
index 4935499d917..4271aafb6ce 100644
Binary files a/htdocs/theme/bureau2crea/img/stcomm4_grayed.png and b/htdocs/theme/bureau2crea/img/stcomm4_grayed.png differ
diff --git a/htdocs/theme/bureau2crea/img/tab_background.png b/htdocs/theme/bureau2crea/img/tab_background.png
index 0864dcc5852..6edd65003e0 100644
Binary files a/htdocs/theme/bureau2crea/img/tab_background.png and b/htdocs/theme/bureau2crea/img/tab_background.png differ
diff --git a/htdocs/theme/bureau2crea/img/tick.png b/htdocs/theme/bureau2crea/img/tick.png
index 29ded7a552a..c899abb9c34 100644
Binary files a/htdocs/theme/bureau2crea/img/tick.png and b/htdocs/theme/bureau2crea/img/tick.png differ
diff --git a/htdocs/theme/bureau2crea/img/title.png b/htdocs/theme/bureau2crea/img/title.png
index bb1dd5683fa..eb9c329a6a5 100644
Binary files a/htdocs/theme/bureau2crea/img/title.png and b/htdocs/theme/bureau2crea/img/title.png differ
diff --git a/htdocs/theme/bureau2crea/img/tmenu.jpg b/htdocs/theme/bureau2crea/img/tmenu.jpg
index 46c239d371f..b8ffd399418 100644
Binary files a/htdocs/theme/bureau2crea/img/tmenu.jpg and b/htdocs/theme/bureau2crea/img/tmenu.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/tmenu2.jpg b/htdocs/theme/bureau2crea/img/tmenu2.jpg
index e5ca3f72414..920e0066341 100644
Binary files a/htdocs/theme/bureau2crea/img/tmenu2.jpg and b/htdocs/theme/bureau2crea/img/tmenu2.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/tmenu3.jpg b/htdocs/theme/bureau2crea/img/tmenu3.jpg
index dc2434541cf..d42f804b026 100644
Binary files a/htdocs/theme/bureau2crea/img/tmenu3.jpg and b/htdocs/theme/bureau2crea/img/tmenu3.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/tmenu_inverse.jpg b/htdocs/theme/bureau2crea/img/tmenu_inverse.jpg
index c8fe6d0aff2..e1efd44376e 100644
Binary files a/htdocs/theme/bureau2crea/img/tmenu_inverse.jpg and b/htdocs/theme/bureau2crea/img/tmenu_inverse.jpg differ
diff --git a/htdocs/theme/bureau2crea/img/unlock.png b/htdocs/theme/bureau2crea/img/unlock.png
index f3eebc59274..afefaa94d47 100644
Binary files a/htdocs/theme/bureau2crea/img/unlock.png and b/htdocs/theme/bureau2crea/img/unlock.png differ
diff --git a/htdocs/theme/bureau2crea/img/uparrow.png b/htdocs/theme/bureau2crea/img/uparrow.png
index 0f6d64e936a..5706ca39da4 100644
Binary files a/htdocs/theme/bureau2crea/img/uparrow.png and b/htdocs/theme/bureau2crea/img/uparrow.png differ
diff --git a/htdocs/theme/bureau2crea/img/vcard.png b/htdocs/theme/bureau2crea/img/vcard.png
index e03026f87fb..315abdf179d 100644
Binary files a/htdocs/theme/bureau2crea/img/vcard.png and b/htdocs/theme/bureau2crea/img/vcard.png differ
diff --git a/htdocs/theme/bureau2crea/img/view.png b/htdocs/theme/bureau2crea/img/view.png
index 4e0396f7b09..76c1e9f1e6a 100644
Binary files a/htdocs/theme/bureau2crea/img/view.png and b/htdocs/theme/bureau2crea/img/view.png differ
diff --git a/htdocs/theme/bureau2crea/img/warning.png b/htdocs/theme/bureau2crea/img/warning.png
index 81514897fe6..dfa237a5302 100644
Binary files a/htdocs/theme/bureau2crea/img/warning.png and b/htdocs/theme/bureau2crea/img/warning.png differ
diff --git a/htdocs/theme/bureau2crea/index.html b/htdocs/theme/bureau2crea/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/bureau2crea/index.php b/htdocs/theme/bureau2crea/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/bureau2crea/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index ee0bcde0baf..b4573c1fc13 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -209,14 +209,6 @@ legend { margin-bottom: 8px; }
     padding: 0px 2px 0px 2px;
     margin: 0px 0px 0px 0px;
 }
-.buttonajax {
-    font-family: <?php print $fontlist ?>;
-	border: 0px;
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
-	background-position: bottom;
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
 form {
     padding: 0em 0em 0em 0em;
     margin: 0em 0em 0em 0em;
@@ -258,6 +250,23 @@ div.inline-block
 .nounderline {
     text-decoration: none;
 }
+.cursorpointer {
+	cursor: pointer;
+}
+.badge {
+	display: inline-block;
+	min-width: 10px;
+	padding: 2px 5px;
+	font-size: 10px;
+	font-weight: 700;
+	line-height: 0.9em;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	background-color: #777;
+	border-radius: 10px;
+}
 
 
 /* ============================================================================== */
@@ -364,16 +373,8 @@ div.ficheaddleft {
 /* ============================================================================== */
 
 <?php
-if (! empty($conf->dol_optimize_smallscreen))
-{
-	$minwidthtmenu=70;
-	$heightmenu=39;
-}
-else
-{
-	$minwidthtmenu=70;
-	$heightmenu=39;
-}
+$minwidthtmenu=70;
+$heightmenu=39;
 ?>
 
 /* This theme is bugged. If width not large enough, menu are not wrapped on next line
@@ -392,7 +393,6 @@ div.tmenu {
     border-left: 0px;
     padding: 0px;
     margin: 5px 0px 10px 0px;
-    font-size: 13px;
     background-image : url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_mainNav.jpg',1); ?>);
     background-repeat: no-repeat;
     background-color: #996644;
@@ -414,7 +414,9 @@ div.mainmenu {
 }
 */
 
-<?php if (empty($conf->dol_optimize_smallscreen)) {
+
+/* Do not load menu img if hidden to save bandwidth */
+<?php if (empty($dol_hide_topmenu)) {
 
 // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
 
@@ -436,7 +438,7 @@ $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 $mainmenuusedarray=array();	// Disable
 
 $generic=1;
-$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','cashdesk');
+$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','cashdesk');
 foreach($mainmenuusedarray as $val)
 {
 	if (empty($val) || in_array($val,$divalreadydefined)) continue;
@@ -791,6 +793,12 @@ div.blockvmenusearch div.menu_titre {
 	min-height: 14px;
 }
 
+#blockvmenusearch form
+{
+	clear: both;
+	margin-bottom: 14px;
+}
+
 div.blockvmenubookmarks
 {
 	margin: 0px;
@@ -1939,13 +1947,18 @@ td.hidden {
 
 table.cal_month    { border-spacing: 0px; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_current_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_other_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B !important; border-right: 0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 .cal_other_month   { background: #DDDDDD; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser { background: #FFFFFF; border-right: solid 1px #6C7C7B; border-top: solid 1px #A0A0A0; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; border-top: solid 1px #A0A0A0; border-right: solid 1px #6C7C7B; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
@@ -1954,6 +1967,8 @@ li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; }
+.peruser_busy      { background: #CC8888; }
+.peruser_notbusy   { background: #EEDDDD; }
 
 
 /* ============================================================================== */
@@ -2487,6 +2502,11 @@ div.ecmjqft {
 {
 	text-decoration: underline !important;
 }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
+	opacity: .35;
+	filter: Alpha(Opacity=35);
+	background-image: none;
+}
 
 
 /* ============================================================================== */
@@ -2610,6 +2630,14 @@ ul.ulmenu {
 	background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
 	background-image: linear-gradient( #eee,#e1e1e1 ) !important;
 }
+.lilevel2
+{
+	padding-left: 22px;
+}
+.lilevel3
+{
+	padding-left: 54px;
+}
 
 
 <?php
diff --git a/htdocs/theme/bureau2crea/thumb.png b/htdocs/theme/bureau2crea/thumb.png
index ff2d53c727f..75beae21b09 100644
Binary files a/htdocs/theme/bureau2crea/thumb.png and b/htdocs/theme/bureau2crea/thumb.png differ
diff --git a/htdocs/theme/bureau2crea/tpl/index.html b/htdocs/theme/bureau2crea/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/bureau2crea/tpl/index.php b/htdocs/theme/bureau2crea/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/bureau2crea/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/cameleo/ckeditor/index.html b/htdocs/theme/cameleo/ckeditor/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/cameleo/img/1downarrow.png b/htdocs/theme/cameleo/img/1downarrow.png
index fd3a3ceed9d..1d134ab3e4e 100644
Binary files a/htdocs/theme/cameleo/img/1downarrow.png and b/htdocs/theme/cameleo/img/1downarrow.png differ
diff --git a/htdocs/theme/cameleo/img/1downarrow_selected.png b/htdocs/theme/cameleo/img/1downarrow_selected.png
index 453fdf12a40..5caf8ead52d 100644
Binary files a/htdocs/theme/cameleo/img/1downarrow_selected.png and b/htdocs/theme/cameleo/img/1downarrow_selected.png differ
diff --git a/htdocs/theme/cameleo/img/1leftarrow.png b/htdocs/theme/cameleo/img/1leftarrow.png
index 123d94357ce..554cdc3d76c 100644
Binary files a/htdocs/theme/cameleo/img/1leftarrow.png and b/htdocs/theme/cameleo/img/1leftarrow.png differ
diff --git a/htdocs/theme/cameleo/img/1leftarrow_selected.png b/htdocs/theme/cameleo/img/1leftarrow_selected.png
index 123d94357ce..554cdc3d76c 100644
Binary files a/htdocs/theme/cameleo/img/1leftarrow_selected.png and b/htdocs/theme/cameleo/img/1leftarrow_selected.png differ
diff --git a/htdocs/theme/cameleo/img/1rightarrow.png b/htdocs/theme/cameleo/img/1rightarrow.png
index 06559cea65f..95fdc377ee9 100644
Binary files a/htdocs/theme/cameleo/img/1rightarrow.png and b/htdocs/theme/cameleo/img/1rightarrow.png differ
diff --git a/htdocs/theme/cameleo/img/1rightarrow_selected.png b/htdocs/theme/cameleo/img/1rightarrow_selected.png
index 06559cea65f..95fdc377ee9 100644
Binary files a/htdocs/theme/cameleo/img/1rightarrow_selected.png and b/htdocs/theme/cameleo/img/1rightarrow_selected.png differ
diff --git a/htdocs/theme/cameleo/img/1uparrow.png b/htdocs/theme/cameleo/img/1uparrow.png
index 392ddf81f77..70ea061dc5e 100644
Binary files a/htdocs/theme/cameleo/img/1uparrow.png and b/htdocs/theme/cameleo/img/1uparrow.png differ
diff --git a/htdocs/theme/cameleo/img/1uparrow_selected.png b/htdocs/theme/cameleo/img/1uparrow_selected.png
index cf0f50437a6..36d25a408c5 100644
Binary files a/htdocs/theme/cameleo/img/1uparrow_selected.png and b/htdocs/theme/cameleo/img/1uparrow_selected.png differ
diff --git a/htdocs/theme/cameleo/img/1updownarrow.png b/htdocs/theme/cameleo/img/1updownarrow.png
index fd5e5801aea..871ac1c1f29 100644
Binary files a/htdocs/theme/cameleo/img/1updownarrow.png and b/htdocs/theme/cameleo/img/1updownarrow.png differ
diff --git a/htdocs/theme/cameleo/img/2.png b/htdocs/theme/cameleo/img/2.png
index ad65c580ee7..f592543dd8e 100644
Binary files a/htdocs/theme/cameleo/img/2.png and b/htdocs/theme/cameleo/img/2.png differ
diff --git a/htdocs/theme/cameleo/img/addfile.png b/htdocs/theme/cameleo/img/addfile.png
index 3bfa627d758..1cb7af0ad8a 100644
Binary files a/htdocs/theme/cameleo/img/addfile.png and b/htdocs/theme/cameleo/img/addfile.png differ
diff --git a/htdocs/theme/cameleo/img/banner_02.jpg b/htdocs/theme/cameleo/img/banner_02.jpg
index 29e0619e77f..81635fd2a59 100644
Binary files a/htdocs/theme/cameleo/img/banner_02.jpg and b/htdocs/theme/cameleo/img/banner_02.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg-bas-rubrique.png b/htdocs/theme/cameleo/img/bg-bas-rubrique.png
index 941207d85da..d2fbe3a7a13 100644
Binary files a/htdocs/theme/cameleo/img/bg-bas-rubrique.png and b/htdocs/theme/cameleo/img/bg-bas-rubrique.png differ
diff --git a/htdocs/theme/cameleo/img/bg-rubrique.png b/htdocs/theme/cameleo/img/bg-rubrique.png
index 6bc08feb211..9abf1dc1459 100644
Binary files a/htdocs/theme/cameleo/img/bg-rubrique.png and b/htdocs/theme/cameleo/img/bg-rubrique.png differ
diff --git a/htdocs/theme/cameleo/img/bg-titre-rubrique.png b/htdocs/theme/cameleo/img/bg-titre-rubrique.png
index abf662a530b..ad6484fcbe9 100644
Binary files a/htdocs/theme/cameleo/img/bg-titre-rubrique.png and b/htdocs/theme/cameleo/img/bg-titre-rubrique.png differ
diff --git a/htdocs/theme/cameleo/img/bg_ListeTitrelong.jpg b/htdocs/theme/cameleo/img/bg_ListeTitrelong.jpg
index 5140e17b284..05e49219bf4 100644
Binary files a/htdocs/theme/cameleo/img/bg_ListeTitrelong.jpg and b/htdocs/theme/cameleo/img/bg_ListeTitrelong.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_btnBlue.jpg b/htdocs/theme/cameleo/img/bg_btnBlue.jpg
index 5ffcea5554d..7409bacab3e 100644
Binary files a/htdocs/theme/cameleo/img/bg_btnBlue.jpg and b/htdocs/theme/cameleo/img/bg_btnBlue.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_btnGreen.jpg b/htdocs/theme/cameleo/img/bg_btnGreen.jpg
index 8bcabe5a4f5..fc1f52c65d4 100644
Binary files a/htdocs/theme/cameleo/img/bg_btnGreen.jpg and b/htdocs/theme/cameleo/img/bg_btnGreen.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_btnGrey.jpg b/htdocs/theme/cameleo/img/bg_btnGrey.jpg
index 05b95df748c..48911bf6f13 100644
Binary files a/htdocs/theme/cameleo/img/bg_btnGrey.jpg and b/htdocs/theme/cameleo/img/bg_btnGrey.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_btnRed.jpg b/htdocs/theme/cameleo/img/bg_btnRed.jpg
index 9e309245c43..c8c7f55c85d 100644
Binary files a/htdocs/theme/cameleo/img/bg_btnRed.jpg and b/htdocs/theme/cameleo/img/bg_btnRed.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_btn_blue.jpg b/htdocs/theme/cameleo/img/bg_btn_blue.jpg
index b09d2bb5a5a..563cebdc3e7 100644
Binary files a/htdocs/theme/cameleo/img/bg_btn_blue.jpg and b/htdocs/theme/cameleo/img/bg_btn_blue.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_btn_green.jpg b/htdocs/theme/cameleo/img/bg_btn_green.jpg
index 513f0eb0fd8..d29a1bb0d61 100644
Binary files a/htdocs/theme/cameleo/img/bg_btn_green.jpg and b/htdocs/theme/cameleo/img/bg_btn_green.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_btn_red.jpg b/htdocs/theme/cameleo/img/bg_btn_red.jpg
index ad8da842c7c..fb11e4f2daf 100644
Binary files a/htdocs/theme/cameleo/img/bg_btn_red.jpg and b/htdocs/theme/cameleo/img/bg_btn_red.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_centerBlock-title.jpg b/htdocs/theme/cameleo/img/bg_centerBlock-title.jpg
index 6d2ac8ce0a9..9666d52336a 100644
Binary files a/htdocs/theme/cameleo/img/bg_centerBlock-title.jpg and b/htdocs/theme/cameleo/img/bg_centerBlock-title.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_leftCategorie.jpg b/htdocs/theme/cameleo/img/bg_leftCategorie.jpg
index 00071c4ec42..f152d6d083f 100644
Binary files a/htdocs/theme/cameleo/img/bg_leftCategorie.jpg and b/htdocs/theme/cameleo/img/bg_leftCategorie.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_leftCategorie2.jpg b/htdocs/theme/cameleo/img/bg_leftCategorie2.jpg
index 11bfc4d9f69..1a26e37a99b 100644
Binary files a/htdocs/theme/cameleo/img/bg_leftCategorie2.jpg and b/htdocs/theme/cameleo/img/bg_leftCategorie2.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_leftMenu.jpg b/htdocs/theme/cameleo/img/bg_leftMenu.jpg
index 117cdc60a46..03bca88e2ae 100644
Binary files a/htdocs/theme/cameleo/img/bg_leftMenu.jpg and b/htdocs/theme/cameleo/img/bg_leftMenu.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_leftTable.jpg b/htdocs/theme/cameleo/img/bg_leftTable.jpg
index 15a3386318b..36d6f9d00d2 100644
Binary files a/htdocs/theme/cameleo/img/bg_leftTable.jpg and b/htdocs/theme/cameleo/img/bg_leftTable.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_liste_titremenu.jpg b/htdocs/theme/cameleo/img/bg_liste_titremenu.jpg
index dc62a41efac..419c8ce6bf0 100644
Binary files a/htdocs/theme/cameleo/img/bg_liste_titremenu.jpg and b/htdocs/theme/cameleo/img/bg_liste_titremenu.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_other_table.jpg b/htdocs/theme/cameleo/img/bg_other_table.jpg
index 086a46a8613..f4409cbaae5 100644
Binary files a/htdocs/theme/cameleo/img/bg_other_table.jpg and b/htdocs/theme/cameleo/img/bg_other_table.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_ssmenu_btnD.jpg b/htdocs/theme/cameleo/img/bg_ssmenu_btnD.jpg
index 7df7fd0ab02..fd09bb40da0 100644
Binary files a/htdocs/theme/cameleo/img/bg_ssmenu_btnD.jpg and b/htdocs/theme/cameleo/img/bg_ssmenu_btnD.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_ssmenu_btnG.jpg b/htdocs/theme/cameleo/img/bg_ssmenu_btnG.jpg
index 12accbf3ccb..ca483b7b295 100644
Binary files a/htdocs/theme/cameleo/img/bg_ssmenu_btnG.jpg and b/htdocs/theme/cameleo/img/bg_ssmenu_btnG.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_ssmenusel_btnD.jpg b/htdocs/theme/cameleo/img/bg_ssmenusel_btnD.jpg
index d7324957df6..1e41b87c6ea 100644
Binary files a/htdocs/theme/cameleo/img/bg_ssmenusel_btnD.jpg and b/htdocs/theme/cameleo/img/bg_ssmenusel_btnD.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_ssmenusel_btnG.jpg b/htdocs/theme/cameleo/img/bg_ssmenusel_btnG.jpg
index 1d012589854..3df9a20bcd5 100644
Binary files a/htdocs/theme/cameleo/img/bg_ssmenusel_btnG.jpg and b/htdocs/theme/cameleo/img/bg_ssmenusel_btnG.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_tmenu.jpg b/htdocs/theme/cameleo/img/bg_tmenu.jpg
index 90819e98bc8..95fc9868971 100644
Binary files a/htdocs/theme/cameleo/img/bg_tmenu.jpg and b/htdocs/theme/cameleo/img/bg_tmenu.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_tmenu_btnD.jpg b/htdocs/theme/cameleo/img/bg_tmenu_btnD.jpg
index 0180a4b5d19..af8c5f9e49c 100644
Binary files a/htdocs/theme/cameleo/img/bg_tmenu_btnD.jpg and b/htdocs/theme/cameleo/img/bg_tmenu_btnD.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_tmenu_btnG.jpg b/htdocs/theme/cameleo/img/bg_tmenu_btnG.jpg
index cf1f469dbe4..fc9152e2b0d 100644
Binary files a/htdocs/theme/cameleo/img/bg_tmenu_btnG.jpg and b/htdocs/theme/cameleo/img/bg_tmenu_btnG.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_tmenusel_btnD.jpg b/htdocs/theme/cameleo/img/bg_tmenusel_btnD.jpg
index 5aab5a25799..ab0be94ee9c 100644
Binary files a/htdocs/theme/cameleo/img/bg_tmenusel_btnD.jpg and b/htdocs/theme/cameleo/img/bg_tmenusel_btnD.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_tmenusel_btnG.jpg b/htdocs/theme/cameleo/img/bg_tmenusel_btnG.jpg
index 24eb92fd4cd..3e488176929 100644
Binary files a/htdocs/theme/cameleo/img/bg_tmenusel_btnG.jpg and b/htdocs/theme/cameleo/img/bg_tmenusel_btnG.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_vmenu.jpg b/htdocs/theme/cameleo/img/bg_vmenu.jpg
index df83d4bd687..84d883d8d69 100644
Binary files a/htdocs/theme/cameleo/img/bg_vmenu.jpg and b/htdocs/theme/cameleo/img/bg_vmenu.jpg differ
diff --git a/htdocs/theme/cameleo/img/bg_working_table.jpg b/htdocs/theme/cameleo/img/bg_working_table.jpg
index cdd8d9b2c26..881e65fcb7b 100644
Binary files a/htdocs/theme/cameleo/img/bg_working_table.jpg and b/htdocs/theme/cameleo/img/bg_working_table.jpg differ
diff --git a/htdocs/theme/cameleo/img/body_bg.jpg b/htdocs/theme/cameleo/img/body_bg.jpg
index ddde2c5f5aa..0480bfdc738 100644
Binary files a/htdocs/theme/cameleo/img/body_bg.jpg and b/htdocs/theme/cameleo/img/body_bg.jpg differ
diff --git a/htdocs/theme/cameleo/img/bouton/index.html b/htdocs/theme/cameleo/img/bouton/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/cameleo/img/bouton/menu_l_title_bg.png b/htdocs/theme/cameleo/img/bouton/menu_l_title_bg.png
index 8f61b220c59..10e03744ace 100644
Binary files a/htdocs/theme/cameleo/img/bouton/menu_l_title_bg.png and b/htdocs/theme/cameleo/img/bouton/menu_l_title_bg.png differ
diff --git a/htdocs/theme/cameleo/img/bouton/round_black_tr.png b/htdocs/theme/cameleo/img/bouton/round_black_tr.png
index f27609ae8ee..f0ea7d10c5c 100644
Binary files a/htdocs/theme/cameleo/img/bouton/round_black_tr.png and b/htdocs/theme/cameleo/img/bouton/round_black_tr.png differ
diff --git a/htdocs/theme/cameleo/img/bouton_edit.png b/htdocs/theme/cameleo/img/bouton_edit.png
index a29e064933a..3d36eb0523f 100644
Binary files a/htdocs/theme/cameleo/img/bouton_edit.png and b/htdocs/theme/cameleo/img/bouton_edit.png differ
diff --git a/htdocs/theme/cameleo/img/calc.png b/htdocs/theme/cameleo/img/calc.png
index d3bd2bbc824..5e6471408d8 100644
Binary files a/htdocs/theme/cameleo/img/calc.png and b/htdocs/theme/cameleo/img/calc.png differ
diff --git a/htdocs/theme/cameleo/img/calendar.png b/htdocs/theme/cameleo/img/calendar.png
index 90829a353c3..bbe6c27f041 100644
Binary files a/htdocs/theme/cameleo/img/calendar.png and b/htdocs/theme/cameleo/img/calendar.png differ
diff --git a/htdocs/theme/cameleo/img/call.png b/htdocs/theme/cameleo/img/call.png
index 8315c57d61d..ddfc1b7bd90 100644
Binary files a/htdocs/theme/cameleo/img/call.png and b/htdocs/theme/cameleo/img/call.png differ
diff --git a/htdocs/theme/cameleo/img/call_out.png b/htdocs/theme/cameleo/img/call_out.png
index bf972d8b1ae..b5a22eb827b 100644
Binary files a/htdocs/theme/cameleo/img/call_out.png and b/htdocs/theme/cameleo/img/call_out.png differ
diff --git a/htdocs/theme/cameleo/img/close.png b/htdocs/theme/cameleo/img/close.png
index aacac9fc423..ec4338e8bca 100644
Binary files a/htdocs/theme/cameleo/img/close.png and b/htdocs/theme/cameleo/img/close.png differ
diff --git a/htdocs/theme/cameleo/img/close_title.png b/htdocs/theme/cameleo/img/close_title.png
index aacac9fc423..ec4338e8bca 100644
Binary files a/htdocs/theme/cameleo/img/close_title.png and b/htdocs/theme/cameleo/img/close_title.png differ
diff --git a/htdocs/theme/cameleo/img/delete.png b/htdocs/theme/cameleo/img/delete.png
index 221cd3c76b9..8ad73597be7 100644
Binary files a/htdocs/theme/cameleo/img/delete.png and b/htdocs/theme/cameleo/img/delete.png differ
diff --git a/htdocs/theme/cameleo/img/detail.png b/htdocs/theme/cameleo/img/detail.png
index 2d31ec2202e..05562bef842 100644
Binary files a/htdocs/theme/cameleo/img/detail.png and b/htdocs/theme/cameleo/img/detail.png differ
diff --git a/htdocs/theme/cameleo/img/disable.png b/htdocs/theme/cameleo/img/disable.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/cameleo/img/disable.png and b/htdocs/theme/cameleo/img/disable.png differ
diff --git a/htdocs/theme/cameleo/img/edit_add.png b/htdocs/theme/cameleo/img/edit_add.png
index f6e67164208..ae205e9d770 100644
Binary files a/htdocs/theme/cameleo/img/edit_add.png and b/htdocs/theme/cameleo/img/edit_add.png differ
diff --git a/htdocs/theme/cameleo/img/edit_remove.png b/htdocs/theme/cameleo/img/edit_remove.png
index 0c7ca54fa1f..bc4bdb360fa 100644
Binary files a/htdocs/theme/cameleo/img/edit_remove.png and b/htdocs/theme/cameleo/img/edit_remove.png differ
diff --git a/htdocs/theme/cameleo/img/editdelete.png b/htdocs/theme/cameleo/img/editdelete.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/cameleo/img/editdelete.png and b/htdocs/theme/cameleo/img/editdelete.png differ
diff --git a/htdocs/theme/cameleo/img/file.png b/htdocs/theme/cameleo/img/file.png
index 98bc98d2f1f..73c66e9b2b3 100644
Binary files a/htdocs/theme/cameleo/img/file.png and b/htdocs/theme/cameleo/img/file.png differ
diff --git a/htdocs/theme/cameleo/img/filenew.png b/htdocs/theme/cameleo/img/filenew.png
index 1f6581389d1..8680cce82bf 100644
Binary files a/htdocs/theme/cameleo/img/filenew.png and b/htdocs/theme/cameleo/img/filenew.png differ
diff --git a/htdocs/theme/cameleo/img/filter.png b/htdocs/theme/cameleo/img/filter.png
index 4baa3a3be8e..917715107bd 100644
Binary files a/htdocs/theme/cameleo/img/filter.png and b/htdocs/theme/cameleo/img/filter.png differ
diff --git a/htdocs/theme/cameleo/img/folder-open.png b/htdocs/theme/cameleo/img/folder-open.png
index 1687cd1b536..1db8369b3d5 100644
Binary files a/htdocs/theme/cameleo/img/folder-open.png and b/htdocs/theme/cameleo/img/folder-open.png differ
diff --git a/htdocs/theme/cameleo/img/folder.png b/htdocs/theme/cameleo/img/folder.png
index 908a6df9348..04a24af2e22 100644
Binary files a/htdocs/theme/cameleo/img/folder.png and b/htdocs/theme/cameleo/img/folder.png differ
diff --git a/htdocs/theme/cameleo/img/grip.png b/htdocs/theme/cameleo/img/grip.png
index 216e51ca8f0..8053007e9dd 100644
Binary files a/htdocs/theme/cameleo/img/grip.png and b/htdocs/theme/cameleo/img/grip.png differ
diff --git a/htdocs/theme/cameleo/img/grip_title.png b/htdocs/theme/cameleo/img/grip_title.png
index 216e51ca8f0..8053007e9dd 100644
Binary files a/htdocs/theme/cameleo/img/grip_title.png and b/htdocs/theme/cameleo/img/grip_title.png differ
diff --git a/htdocs/theme/cameleo/img/headbg.jpg b/htdocs/theme/cameleo/img/headbg.jpg
index 7d1374e1fc9..160821354cc 100644
Binary files a/htdocs/theme/cameleo/img/headbg.jpg and b/htdocs/theme/cameleo/img/headbg.jpg differ
diff --git a/htdocs/theme/cameleo/img/headbg2.jpg b/htdocs/theme/cameleo/img/headbg2.jpg
index 7917abd9c07..0bc44f0ea99 100644
Binary files a/htdocs/theme/cameleo/img/headbg2.jpg and b/htdocs/theme/cameleo/img/headbg2.jpg differ
diff --git a/htdocs/theme/cameleo/img/help.png b/htdocs/theme/cameleo/img/help.png
index 0f716f67711..12e6cd655d6 100644
Binary files a/htdocs/theme/cameleo/img/help.png and b/htdocs/theme/cameleo/img/help.png differ
diff --git a/htdocs/theme/cameleo/img/high.png b/htdocs/theme/cameleo/img/high.png
index f893de7abf3..c0eaee6542f 100644
Binary files a/htdocs/theme/cameleo/img/high.png and b/htdocs/theme/cameleo/img/high.png differ
diff --git a/htdocs/theme/cameleo/img/history.png b/htdocs/theme/cameleo/img/history.png
index 932921c1f4c..0fa4283476b 100644
Binary files a/htdocs/theme/cameleo/img/history.png and b/htdocs/theme/cameleo/img/history.png differ
diff --git a/htdocs/theme/cameleo/img/indent1.png b/htdocs/theme/cameleo/img/indent1.png
index 52ebb2bd738..09695ac754f 100644
Binary files a/htdocs/theme/cameleo/img/indent1.png and b/htdocs/theme/cameleo/img/indent1.png differ
diff --git a/htdocs/theme/cameleo/img/index.html b/htdocs/theme/cameleo/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/cameleo/img/info.png b/htdocs/theme/cameleo/img/info.png
index 16f932283ad..db8ba04fac5 100644
Binary files a/htdocs/theme/cameleo/img/info.png and b/htdocs/theme/cameleo/img/info.png differ
diff --git a/htdocs/theme/cameleo/img/lock.png b/htdocs/theme/cameleo/img/lock.png
index 8c2e2cbdb09..3d99cf1eaef 100644
Binary files a/htdocs/theme/cameleo/img/lock.png and b/htdocs/theme/cameleo/img/lock.png differ
diff --git a/htdocs/theme/cameleo/img/login_background.png b/htdocs/theme/cameleo/img/login_background.png
index b264649fcbc..facc2c6f442 100644
Binary files a/htdocs/theme/cameleo/img/login_background.png and b/htdocs/theme/cameleo/img/login_background.png differ
diff --git a/htdocs/theme/cameleo/img/logout.png b/htdocs/theme/cameleo/img/logout.png
index cfff7ba61d1..84bd94e7b81 100644
Binary files a/htdocs/theme/cameleo/img/logout.png and b/htdocs/theme/cameleo/img/logout.png differ
diff --git a/htdocs/theme/cameleo/img/menus/agenda.png b/htdocs/theme/cameleo/img/menus/agenda.png
index 2bea3152a10..866037c9b54 100644
Binary files a/htdocs/theme/cameleo/img/menus/agenda.png and b/htdocs/theme/cameleo/img/menus/agenda.png differ
diff --git a/htdocs/theme/cameleo/img/menus/bank.png b/htdocs/theme/cameleo/img/menus/bank.png
index 225df251041..9c6300eae32 100644
Binary files a/htdocs/theme/cameleo/img/menus/bank.png and b/htdocs/theme/cameleo/img/menus/bank.png differ
diff --git a/htdocs/theme/cameleo/img/menus/commercial.png b/htdocs/theme/cameleo/img/menus/commercial.png
index e520f7eb71e..efc1b3f0608 100644
Binary files a/htdocs/theme/cameleo/img/menus/commercial.png and b/htdocs/theme/cameleo/img/menus/commercial.png differ
diff --git a/htdocs/theme/cameleo/img/menus/externalsite.png b/htdocs/theme/cameleo/img/menus/externalsite.png
index 73fef8ae4c8..0bf9138d463 100644
Binary files a/htdocs/theme/cameleo/img/menus/externalsite.png and b/htdocs/theme/cameleo/img/menus/externalsite.png differ
diff --git a/htdocs/theme/cameleo/img/menus/footer_bg.jpg b/htdocs/theme/cameleo/img/menus/footer_bg.jpg
index ab5511b57f1..7319c16f9af 100644
Binary files a/htdocs/theme/cameleo/img/menus/footer_bg.jpg and b/htdocs/theme/cameleo/img/menus/footer_bg.jpg differ
diff --git a/htdocs/theme/cameleo/img/menus/generic3.png b/htdocs/theme/cameleo/img/menus/generic3.png
index d3ed4fa89b3..e22f73aa6f9 100644
Binary files a/htdocs/theme/cameleo/img/menus/generic3.png and b/htdocs/theme/cameleo/img/menus/generic3.png differ
diff --git a/htdocs/theme/cameleo/img/menus/holiday.png b/htdocs/theme/cameleo/img/menus/holiday.png
index 27b653d93ba..42c519aa63d 100644
Binary files a/htdocs/theme/cameleo/img/menus/holiday.png and b/htdocs/theme/cameleo/img/menus/holiday.png differ
diff --git a/htdocs/theme/cameleo/img/menus/home.png b/htdocs/theme/cameleo/img/menus/home.png
index eec3240070b..f4d0d917d1f 100644
Binary files a/htdocs/theme/cameleo/img/menus/home.png and b/htdocs/theme/cameleo/img/menus/home.png differ
diff --git a/htdocs/theme/cameleo/img/menus/index.html b/htdocs/theme/cameleo/img/menus/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/cameleo/img/menus/mail.png b/htdocs/theme/cameleo/img/menus/mail.png
index dab5feda5cd..d715ec7810c 100644
Binary files a/htdocs/theme/cameleo/img/menus/mail.png and b/htdocs/theme/cameleo/img/menus/mail.png differ
diff --git a/htdocs/theme/cameleo/img/menus/products.png b/htdocs/theme/cameleo/img/menus/products.png
index d1081185c44..6f5f45269ee 100644
Binary files a/htdocs/theme/cameleo/img/menus/products.png and b/htdocs/theme/cameleo/img/menus/products.png differ
diff --git a/htdocs/theme/cameleo/img/menus/project.png b/htdocs/theme/cameleo/img/menus/project.png
index 5bc0f86b4be..882235d2cd3 100644
Binary files a/htdocs/theme/cameleo/img/menus/project.png and b/htdocs/theme/cameleo/img/menus/project.png differ
diff --git a/htdocs/theme/cameleo/img/menus/shop.png b/htdocs/theme/cameleo/img/menus/shop.png
deleted file mode 100644
index 89627d8b332..00000000000
Binary files a/htdocs/theme/cameleo/img/menus/shop.png and /dev/null differ
diff --git a/htdocs/theme/cameleo/img/menus/tab_background.png b/htdocs/theme/cameleo/img/menus/tab_background.png
index 0864dcc5852..6edd65003e0 100644
Binary files a/htdocs/theme/cameleo/img/menus/tab_background.png and b/htdocs/theme/cameleo/img/menus/tab_background.png differ
diff --git a/htdocs/theme/cameleo/img/menus/tools.png b/htdocs/theme/cameleo/img/menus/tools.png
index 17215ec5899..c053f660ebf 100644
Binary files a/htdocs/theme/cameleo/img/menus/tools.png and b/htdocs/theme/cameleo/img/menus/tools.png differ
diff --git a/htdocs/theme/cameleo/img/menus/trtitle.png b/htdocs/theme/cameleo/img/menus/trtitle.png
index e4fe4ffe1a6..29b694864e5 100644
Binary files a/htdocs/theme/cameleo/img/menus/trtitle.png and b/htdocs/theme/cameleo/img/menus/trtitle.png differ
diff --git a/htdocs/theme/cameleo/img/next.png b/htdocs/theme/cameleo/img/next.png
index dc8fa61930b..aff8f9e2ca5 100644
Binary files a/htdocs/theme/cameleo/img/next.png and b/htdocs/theme/cameleo/img/next.png differ
diff --git a/htdocs/theme/cameleo/img/object_account.png b/htdocs/theme/cameleo/img/object_account.png
index 3b9c74f76ca..bc85bd73f83 100644
Binary files a/htdocs/theme/cameleo/img/object_account.png and b/htdocs/theme/cameleo/img/object_account.png differ
diff --git a/htdocs/theme/cameleo/img/object_accounting.png b/htdocs/theme/cameleo/img/object_accounting.png
new file mode 100644
index 00000000000..b5600221f02
Binary files /dev/null and b/htdocs/theme/cameleo/img/object_accounting.png differ
diff --git a/htdocs/theme/cameleo/img/object_action.png b/htdocs/theme/cameleo/img/object_action.png
index f8e424b354d..3b964b907dc 100644
Binary files a/htdocs/theme/cameleo/img/object_action.png and b/htdocs/theme/cameleo/img/object_action.png differ
diff --git a/htdocs/theme/cameleo/img/object_action_rdv.png b/htdocs/theme/cameleo/img/object_action_rdv.png
index b892da1f655..25edfa85b45 100644
Binary files a/htdocs/theme/cameleo/img/object_action_rdv.png and b/htdocs/theme/cameleo/img/object_action_rdv.png differ
diff --git a/htdocs/theme/cameleo/img/object_address.png b/htdocs/theme/cameleo/img/object_address.png
index b20734da69a..a4b878966dc 100644
Binary files a/htdocs/theme/cameleo/img/object_address.png and b/htdocs/theme/cameleo/img/object_address.png differ
diff --git a/htdocs/theme/cameleo/img/object_barcode.png b/htdocs/theme/cameleo/img/object_barcode.png
index 4eb6082ec31..9241513f0b8 100644
Binary files a/htdocs/theme/cameleo/img/object_barcode.png and b/htdocs/theme/cameleo/img/object_barcode.png differ
diff --git a/htdocs/theme/cameleo/img/object_bill.png b/htdocs/theme/cameleo/img/object_bill.png
index e1cb50de2e6..277b6ab3233 100644
Binary files a/htdocs/theme/cameleo/img/object_bill.png and b/htdocs/theme/cameleo/img/object_bill.png differ
diff --git a/htdocs/theme/cameleo/img/object_billa.png b/htdocs/theme/cameleo/img/object_billa.png
index da4e4e8d5d9..2589f34bfed 100644
Binary files a/htdocs/theme/cameleo/img/object_billa.png and b/htdocs/theme/cameleo/img/object_billa.png differ
diff --git a/htdocs/theme/cameleo/img/object_billd.png b/htdocs/theme/cameleo/img/object_billd.png
index 11aa959cc43..201dc9057ae 100644
Binary files a/htdocs/theme/cameleo/img/object_billd.png and b/htdocs/theme/cameleo/img/object_billd.png differ
diff --git a/htdocs/theme/cameleo/img/object_billr.png b/htdocs/theme/cameleo/img/object_billr.png
index e933aebd65d..18b8701685e 100644
Binary files a/htdocs/theme/cameleo/img/object_billr.png and b/htdocs/theme/cameleo/img/object_billr.png differ
diff --git a/htdocs/theme/cameleo/img/object_book.png b/htdocs/theme/cameleo/img/object_book.png
index 6df91021589..cbbc05e8e72 100644
Binary files a/htdocs/theme/cameleo/img/object_book.png and b/htdocs/theme/cameleo/img/object_book.png differ
diff --git a/htdocs/theme/cameleo/img/object_bookmark.png b/htdocs/theme/cameleo/img/object_bookmark.png
index 1a6af792525..a78697bdc3b 100644
Binary files a/htdocs/theme/cameleo/img/object_bookmark.png and b/htdocs/theme/cameleo/img/object_bookmark.png differ
diff --git a/htdocs/theme/cameleo/img/object_calendar.png b/htdocs/theme/cameleo/img/object_calendar.png
index ec670d8857b..c647b7f998d 100644
Binary files a/htdocs/theme/cameleo/img/object_calendar.png and b/htdocs/theme/cameleo/img/object_calendar.png differ
diff --git a/htdocs/theme/cameleo/img/object_category-expanded.png b/htdocs/theme/cameleo/img/object_category-expanded.png
index 330d649a2b8..af943c376e6 100644
Binary files a/htdocs/theme/cameleo/img/object_category-expanded.png and b/htdocs/theme/cameleo/img/object_category-expanded.png differ
diff --git a/htdocs/theme/cameleo/img/object_category.png b/htdocs/theme/cameleo/img/object_category.png
index 5bf3c91df8d..c7e79d4d408 100644
Binary files a/htdocs/theme/cameleo/img/object_category.png and b/htdocs/theme/cameleo/img/object_category.png differ
diff --git a/htdocs/theme/cameleo/img/object_commercial.png b/htdocs/theme/cameleo/img/object_commercial.png
index 1af9828796b..ad1519f111c 100644
Binary files a/htdocs/theme/cameleo/img/object_commercial.png and b/htdocs/theme/cameleo/img/object_commercial.png differ
diff --git a/htdocs/theme/cameleo/img/object_company.png b/htdocs/theme/cameleo/img/object_company.png
index 614d760d936..58021fa506a 100644
Binary files a/htdocs/theme/cameleo/img/object_company.png and b/htdocs/theme/cameleo/img/object_company.png differ
diff --git a/htdocs/theme/cameleo/img/object_contact.png b/htdocs/theme/cameleo/img/object_contact.png
index 17926656455..e98a7e367e2 100644
Binary files a/htdocs/theme/cameleo/img/object_contact.png and b/htdocs/theme/cameleo/img/object_contact.png differ
diff --git a/htdocs/theme/cameleo/img/object_contact_all.png b/htdocs/theme/cameleo/img/object_contact_all.png
index 2c7e254c3bc..0e651e5aa5f 100644
Binary files a/htdocs/theme/cameleo/img/object_contact_all.png and b/htdocs/theme/cameleo/img/object_contact_all.png differ
diff --git a/htdocs/theme/cameleo/img/object_contract.png b/htdocs/theme/cameleo/img/object_contract.png
index 97e51f9f800..78af93d559f 100644
Binary files a/htdocs/theme/cameleo/img/object_contract.png and b/htdocs/theme/cameleo/img/object_contract.png differ
diff --git a/htdocs/theme/cameleo/img/object_cron.png b/htdocs/theme/cameleo/img/object_cron.png
index b929050598d..6186d18da70 100644
Binary files a/htdocs/theme/cameleo/img/object_cron.png and b/htdocs/theme/cameleo/img/object_cron.png differ
diff --git a/htdocs/theme/cameleo/img/object_dir.png b/htdocs/theme/cameleo/img/object_dir.png
index f02c3d8f2a0..7324bca0143 100644
Binary files a/htdocs/theme/cameleo/img/object_dir.png and b/htdocs/theme/cameleo/img/object_dir.png differ
diff --git a/htdocs/theme/cameleo/img/object_email.png b/htdocs/theme/cameleo/img/object_email.png
index b3c2aee69e1..5a92241f7e7 100644
Binary files a/htdocs/theme/cameleo/img/object_email.png and b/htdocs/theme/cameleo/img/object_email.png differ
diff --git a/htdocs/theme/cameleo/img/object_energie.png b/htdocs/theme/cameleo/img/object_energie.png
index 572c80b8a5b..27b3b52f2c6 100644
Binary files a/htdocs/theme/cameleo/img/object_energie.png and b/htdocs/theme/cameleo/img/object_energie.png differ
diff --git a/htdocs/theme/cameleo/img/object_event.png b/htdocs/theme/cameleo/img/object_event.png
index 2c7e254c3bc..0e651e5aa5f 100644
Binary files a/htdocs/theme/cameleo/img/object_event.png and b/htdocs/theme/cameleo/img/object_event.png differ
diff --git a/htdocs/theme/cameleo/img/object_generic.png b/htdocs/theme/cameleo/img/object_generic.png
index 330d39ef019..caadc78e7d9 100644
Binary files a/htdocs/theme/cameleo/img/object_generic.png and b/htdocs/theme/cameleo/img/object_generic.png differ
diff --git a/htdocs/theme/cameleo/img/object_globe.png b/htdocs/theme/cameleo/img/object_globe.png
index f3fa11be499..701e24b1c46 100644
Binary files a/htdocs/theme/cameleo/img/object_globe.png and b/htdocs/theme/cameleo/img/object_globe.png differ
diff --git a/htdocs/theme/cameleo/img/object_group.png b/htdocs/theme/cameleo/img/object_group.png
index 2c7e254c3bc..0e651e5aa5f 100644
Binary files a/htdocs/theme/cameleo/img/object_group.png and b/htdocs/theme/cameleo/img/object_group.png differ
diff --git a/htdocs/theme/cameleo/img/object_holiday.png b/htdocs/theme/cameleo/img/object_holiday.png
index 69ccdb279a5..fdc1dd8e22b 100644
Binary files a/htdocs/theme/cameleo/img/object_holiday.png and b/htdocs/theme/cameleo/img/object_holiday.png differ
diff --git a/htdocs/theme/cameleo/img/object_intervention.png b/htdocs/theme/cameleo/img/object_intervention.png
index a1bb5f1203c..9b015af6f6d 100644
Binary files a/htdocs/theme/cameleo/img/object_intervention.png and b/htdocs/theme/cameleo/img/object_intervention.png differ
diff --git a/htdocs/theme/cameleo/img/object_invoice.png b/htdocs/theme/cameleo/img/object_invoice.png
index e1cb50de2e6..277b6ab3233 100644
Binary files a/htdocs/theme/cameleo/img/object_invoice.png and b/htdocs/theme/cameleo/img/object_invoice.png differ
diff --git a/htdocs/theme/cameleo/img/object_label.png b/htdocs/theme/cameleo/img/object_label.png
index 913d3cdcd5b..b112af5cf0a 100644
Binary files a/htdocs/theme/cameleo/img/object_label.png and b/htdocs/theme/cameleo/img/object_label.png differ
diff --git a/htdocs/theme/cameleo/img/object_lead.png b/htdocs/theme/cameleo/img/object_lead.png
index ae1d7deadb7..7324bca0143 100644
Binary files a/htdocs/theme/cameleo/img/object_lead.png and b/htdocs/theme/cameleo/img/object_lead.png differ
diff --git a/htdocs/theme/cameleo/img/object_leadpub.png b/htdocs/theme/cameleo/img/object_leadpub.png
index 2c7e254c3bc..0e651e5aa5f 100644
Binary files a/htdocs/theme/cameleo/img/object_leadpub.png and b/htdocs/theme/cameleo/img/object_leadpub.png differ
diff --git a/htdocs/theme/cameleo/img/object_list.png b/htdocs/theme/cameleo/img/object_list.png
index 1396dcc9211..1f49c887555 100644
Binary files a/htdocs/theme/cameleo/img/object_list.png and b/htdocs/theme/cameleo/img/object_list.png differ
diff --git a/htdocs/theme/cameleo/img/object_margin.png b/htdocs/theme/cameleo/img/object_margin.png
index 13e4b92c9ce..cd0eb4109f7 100644
Binary files a/htdocs/theme/cameleo/img/object_margin.png and b/htdocs/theme/cameleo/img/object_margin.png differ
diff --git a/htdocs/theme/cameleo/img/object_opensurvey.png b/htdocs/theme/cameleo/img/object_opensurvey.png
old mode 100755
new mode 100644
index 042d8217257..b5de3223bd4
Binary files a/htdocs/theme/cameleo/img/object_opensurvey.png and b/htdocs/theme/cameleo/img/object_opensurvey.png differ
diff --git a/htdocs/theme/cameleo/img/object_order.png b/htdocs/theme/cameleo/img/object_order.png
index fa3414dbf69..1516cd03433 100644
Binary files a/htdocs/theme/cameleo/img/object_order.png and b/htdocs/theme/cameleo/img/object_order.png differ
diff --git a/htdocs/theme/cameleo/img/object_payment.png b/htdocs/theme/cameleo/img/object_payment.png
index 10c3066a00c..f8ecf1d144e 100644
Binary files a/htdocs/theme/cameleo/img/object_payment.png and b/htdocs/theme/cameleo/img/object_payment.png differ
diff --git a/htdocs/theme/cameleo/img/object_phoning.png b/htdocs/theme/cameleo/img/object_phoning.png
index 3a9a37836fb..9f5a14edd23 100644
Binary files a/htdocs/theme/cameleo/img/object_phoning.png and b/htdocs/theme/cameleo/img/object_phoning.png differ
diff --git a/htdocs/theme/cameleo/img/object_product.png b/htdocs/theme/cameleo/img/object_product.png
index 24c7bf76783..f6477644a1f 100644
Binary files a/htdocs/theme/cameleo/img/object_product.png and b/htdocs/theme/cameleo/img/object_product.png differ
diff --git a/htdocs/theme/cameleo/img/object_project.png b/htdocs/theme/cameleo/img/object_project.png
index ae1d7deadb7..7324bca0143 100644
Binary files a/htdocs/theme/cameleo/img/object_project.png and b/htdocs/theme/cameleo/img/object_project.png differ
diff --git a/htdocs/theme/cameleo/img/object_projectpub.png b/htdocs/theme/cameleo/img/object_projectpub.png
index 9ac8f39355f..1ba7da16dcc 100644
Binary files a/htdocs/theme/cameleo/img/object_projectpub.png and b/htdocs/theme/cameleo/img/object_projectpub.png differ
diff --git a/htdocs/theme/cameleo/img/object_projecttask.png b/htdocs/theme/cameleo/img/object_projecttask.png
index a3a580c3019..7aff1a2ee20 100644
Binary files a/htdocs/theme/cameleo/img/object_projecttask.png and b/htdocs/theme/cameleo/img/object_projecttask.png differ
diff --git a/htdocs/theme/cameleo/img/object_propal.png b/htdocs/theme/cameleo/img/object_propal.png
index b7780a6b66f..4e66eebbedb 100644
Binary files a/htdocs/theme/cameleo/img/object_propal.png and b/htdocs/theme/cameleo/img/object_propal.png differ
diff --git a/htdocs/theme/cameleo/img/object_reduc.png b/htdocs/theme/cameleo/img/object_reduc.png
index fd02156f297..39dcc0fe6a0 100644
Binary files a/htdocs/theme/cameleo/img/object_reduc.png and b/htdocs/theme/cameleo/img/object_reduc.png differ
diff --git a/htdocs/theme/cameleo/img/object_resource.png b/htdocs/theme/cameleo/img/object_resource.png
new file mode 100644
index 00000000000..8cda1f3f220
Binary files /dev/null and b/htdocs/theme/cameleo/img/object_resource.png differ
diff --git a/htdocs/theme/cameleo/img/object_rss.png b/htdocs/theme/cameleo/img/object_rss.png
index dad39390fa4..f3f9db58d95 100644
Binary files a/htdocs/theme/cameleo/img/object_rss.png and b/htdocs/theme/cameleo/img/object_rss.png differ
diff --git a/htdocs/theme/cameleo/img/object_search.png b/htdocs/theme/cameleo/img/object_search.png
index 2627db2a7ba..6ffb1c806c7 100644
Binary files a/htdocs/theme/cameleo/img/object_search.png and b/htdocs/theme/cameleo/img/object_search.png differ
diff --git a/htdocs/theme/cameleo/img/object_sending.png b/htdocs/theme/cameleo/img/object_sending.png
index 2e267bae6e4..93404176e87 100644
Binary files a/htdocs/theme/cameleo/img/object_sending.png and b/htdocs/theme/cameleo/img/object_sending.png differ
diff --git a/htdocs/theme/cameleo/img/object_service.png b/htdocs/theme/cameleo/img/object_service.png
index 725b0bcd2c0..7e990268740 100644
Binary files a/htdocs/theme/cameleo/img/object_service.png and b/htdocs/theme/cameleo/img/object_service.png differ
diff --git a/htdocs/theme/cameleo/img/object_skype.png b/htdocs/theme/cameleo/img/object_skype.png
index 97121565bb0..b209cd8d16e 100644
Binary files a/htdocs/theme/cameleo/img/object_skype.png and b/htdocs/theme/cameleo/img/object_skype.png differ
diff --git a/htdocs/theme/cameleo/img/object_stat.png b/htdocs/theme/cameleo/img/object_stat.png
index a9bd77da6b7..5b7ea7e966e 100644
Binary files a/htdocs/theme/cameleo/img/object_stat.png and b/htdocs/theme/cameleo/img/object_stat.png differ
diff --git a/htdocs/theme/cameleo/img/object_stock.png b/htdocs/theme/cameleo/img/object_stock.png
index c4c06ab6f78..94c594e99af 100644
Binary files a/htdocs/theme/cameleo/img/object_stock.png and b/htdocs/theme/cameleo/img/object_stock.png differ
diff --git a/htdocs/theme/cameleo/img/object_task.png b/htdocs/theme/cameleo/img/object_task.png
index c5fbb2a031a..20b9d641a23 100644
Binary files a/htdocs/theme/cameleo/img/object_task.png and b/htdocs/theme/cameleo/img/object_task.png differ
diff --git a/htdocs/theme/cameleo/img/object_technic.png b/htdocs/theme/cameleo/img/object_technic.png
index 3c3862e0cbf..cc71bb4fde2 100644
Binary files a/htdocs/theme/cameleo/img/object_technic.png and b/htdocs/theme/cameleo/img/object_technic.png differ
diff --git a/htdocs/theme/cameleo/img/object_trip.png b/htdocs/theme/cameleo/img/object_trip.png
index 9e082380242..c695a26415d 100644
Binary files a/htdocs/theme/cameleo/img/object_trip.png and b/htdocs/theme/cameleo/img/object_trip.png differ
diff --git a/htdocs/theme/cameleo/img/object_user.png b/htdocs/theme/cameleo/img/object_user.png
index 02704bd1a57..152fd668c08 100644
Binary files a/htdocs/theme/cameleo/img/object_user.png and b/htdocs/theme/cameleo/img/object_user.png differ
diff --git a/htdocs/theme/cameleo/img/off.png b/htdocs/theme/cameleo/img/off.png
index 38541c3d4b7..9e28e0fa91e 100644
Binary files a/htdocs/theme/cameleo/img/off.png and b/htdocs/theme/cameleo/img/off.png differ
diff --git a/htdocs/theme/cameleo/img/on.png b/htdocs/theme/cameleo/img/on.png
index e93440482ce..72e87ecaeb4 100644
Binary files a/htdocs/theme/cameleo/img/on.png and b/htdocs/theme/cameleo/img/on.png differ
diff --git a/htdocs/theme/cameleo/img/pdf2.png b/htdocs/theme/cameleo/img/pdf2.png
index 407fa968323..975d8098993 100644
Binary files a/htdocs/theme/cameleo/img/pdf2.png and b/htdocs/theme/cameleo/img/pdf2.png differ
diff --git a/htdocs/theme/cameleo/img/pdf3.png b/htdocs/theme/cameleo/img/pdf3.png
index f8058fa94b7..f053591bf2d 100644
Binary files a/htdocs/theme/cameleo/img/pdf3.png and b/htdocs/theme/cameleo/img/pdf3.png differ
diff --git a/htdocs/theme/cameleo/img/play.png b/htdocs/theme/cameleo/img/play.png
index 6de3e256ba6..4922ea1ec12 100644
Binary files a/htdocs/theme/cameleo/img/play.png and b/htdocs/theme/cameleo/img/play.png differ
diff --git a/htdocs/theme/cameleo/img/previous.png b/htdocs/theme/cameleo/img/previous.png
index ed929ee0c05..bff23a0f55d 100644
Binary files a/htdocs/theme/cameleo/img/previous.png and b/htdocs/theme/cameleo/img/previous.png differ
diff --git a/htdocs/theme/cameleo/img/printer.png b/htdocs/theme/cameleo/img/printer.png
index 2521942af43..774686d23be 100644
Binary files a/htdocs/theme/cameleo/img/printer.png and b/htdocs/theme/cameleo/img/printer.png differ
diff --git a/htdocs/theme/cameleo/img/puce.png b/htdocs/theme/cameleo/img/puce.png
index 922aff295cf..0bd4bd51023 100644
Binary files a/htdocs/theme/cameleo/img/puce.png and b/htdocs/theme/cameleo/img/puce.png differ
diff --git a/htdocs/theme/cameleo/img/recent.png b/htdocs/theme/cameleo/img/recent.png
index e721f977f33..a3405497f03 100644
Binary files a/htdocs/theme/cameleo/img/recent.png and b/htdocs/theme/cameleo/img/recent.png differ
diff --git a/htdocs/theme/cameleo/img/redstar.png b/htdocs/theme/cameleo/img/redstar.png
index 83ed4f4ae0d..ce7b207978a 100644
Binary files a/htdocs/theme/cameleo/img/redstar.png and b/htdocs/theme/cameleo/img/redstar.png differ
diff --git a/htdocs/theme/cameleo/img/refresh.png b/htdocs/theme/cameleo/img/refresh.png
index fdd0a2920e0..edc14adcd23 100644
Binary files a/htdocs/theme/cameleo/img/refresh.png and b/htdocs/theme/cameleo/img/refresh.png differ
diff --git a/htdocs/theme/cameleo/img/reload.png b/htdocs/theme/cameleo/img/reload.png
index 9efecb045f8..1e638197612 100644
Binary files a/htdocs/theme/cameleo/img/reload.png and b/htdocs/theme/cameleo/img/reload.png differ
diff --git a/htdocs/theme/cameleo/img/rightarrow.png b/htdocs/theme/cameleo/img/rightarrow.png
index 2ea37440ecd..2c479d9453b 100644
Binary files a/htdocs/theme/cameleo/img/rightarrow.png and b/htdocs/theme/cameleo/img/rightarrow.png differ
diff --git a/htdocs/theme/cameleo/img/search.png b/htdocs/theme/cameleo/img/search.png
index 8fc0005e69a..97f4801c921 100644
Binary files a/htdocs/theme/cameleo/img/search.png and b/htdocs/theme/cameleo/img/search.png differ
diff --git a/htdocs/theme/cameleo/img/searchclear.png b/htdocs/theme/cameleo/img/searchclear.png
index 45626e3be11..56fb7f1de87 100644
Binary files a/htdocs/theme/cameleo/img/searchclear.png and b/htdocs/theme/cameleo/img/searchclear.png differ
diff --git a/htdocs/theme/cameleo/img/setup.png b/htdocs/theme/cameleo/img/setup.png
index 71c9bf5d772..0dec91abb30 100644
Binary files a/htdocs/theme/cameleo/img/setup.png and b/htdocs/theme/cameleo/img/setup.png differ
diff --git a/htdocs/theme/cameleo/img/sort_asc.png b/htdocs/theme/cameleo/img/sort_asc.png
index a88d7975fe9..e327d952fa4 100644
Binary files a/htdocs/theme/cameleo/img/sort_asc.png and b/htdocs/theme/cameleo/img/sort_asc.png differ
diff --git a/htdocs/theme/cameleo/img/sort_asc_disabled.png b/htdocs/theme/cameleo/img/sort_asc_disabled.png
index 4e144cf0b1f..e327d952fa4 100644
Binary files a/htdocs/theme/cameleo/img/sort_asc_disabled.png and b/htdocs/theme/cameleo/img/sort_asc_disabled.png differ
diff --git a/htdocs/theme/cameleo/img/sort_desc.png b/htdocs/theme/cameleo/img/sort_desc.png
index def071ed5af..db99fd9ad47 100644
Binary files a/htdocs/theme/cameleo/img/sort_desc.png and b/htdocs/theme/cameleo/img/sort_desc.png differ
diff --git a/htdocs/theme/cameleo/img/sort_desc_disabled.png b/htdocs/theme/cameleo/img/sort_desc_disabled.png
index 7824973cc60..89051c2f34f 100644
Binary files a/htdocs/theme/cameleo/img/sort_desc_disabled.png and b/htdocs/theme/cameleo/img/sort_desc_disabled.png differ
diff --git a/htdocs/theme/cameleo/img/split.png b/htdocs/theme/cameleo/img/split.png
index a99bbcf26e7..50b6324c334 100644
Binary files a/htdocs/theme/cameleo/img/split.png and b/htdocs/theme/cameleo/img/split.png differ
diff --git a/htdocs/theme/cameleo/img/star.png b/htdocs/theme/cameleo/img/star.png
index 6c090d198e5..81feace1c30 100644
Binary files a/htdocs/theme/cameleo/img/star.png and b/htdocs/theme/cameleo/img/star.png differ
diff --git a/htdocs/theme/cameleo/img/stats.png b/htdocs/theme/cameleo/img/stats.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/cameleo/img/statut0.png b/htdocs/theme/cameleo/img/statut0.png
index f3aedc87cba..196f4f53c7d 100644
Binary files a/htdocs/theme/cameleo/img/statut0.png and b/htdocs/theme/cameleo/img/statut0.png differ
diff --git a/htdocs/theme/cameleo/img/statut1.png b/htdocs/theme/cameleo/img/statut1.png
index c3f62f5a773..774b3e4bd54 100644
Binary files a/htdocs/theme/cameleo/img/statut1.png and b/htdocs/theme/cameleo/img/statut1.png differ
diff --git a/htdocs/theme/cameleo/img/statut3.png b/htdocs/theme/cameleo/img/statut3.png
index 596f078ca8b..9ce49b93476 100644
Binary files a/htdocs/theme/cameleo/img/statut3.png and b/htdocs/theme/cameleo/img/statut3.png differ
diff --git a/htdocs/theme/cameleo/img/statut4.png b/htdocs/theme/cameleo/img/statut4.png
index b12bc0d000c..e4f42ac6d53 100644
Binary files a/htdocs/theme/cameleo/img/statut4.png and b/htdocs/theme/cameleo/img/statut4.png differ
diff --git a/htdocs/theme/cameleo/img/statut5.png b/htdocs/theme/cameleo/img/statut5.png
index 1a110285634..774b3e4bd54 100644
Binary files a/htdocs/theme/cameleo/img/statut5.png and b/htdocs/theme/cameleo/img/statut5.png differ
diff --git a/htdocs/theme/cameleo/img/statut6.png b/htdocs/theme/cameleo/img/statut6.png
index c3d6619e237..e4f42ac6d53 100644
Binary files a/htdocs/theme/cameleo/img/statut6.png and b/htdocs/theme/cameleo/img/statut6.png differ
diff --git a/htdocs/theme/cameleo/img/statut7.png b/htdocs/theme/cameleo/img/statut7.png
index 596f078ca8b..9ce49b93476 100644
Binary files a/htdocs/theme/cameleo/img/statut7.png and b/htdocs/theme/cameleo/img/statut7.png differ
diff --git a/htdocs/theme/cameleo/img/statut8.png b/htdocs/theme/cameleo/img/statut8.png
index 9472fd6a226..65ab6677ee7 100644
Binary files a/htdocs/theme/cameleo/img/statut8.png and b/htdocs/theme/cameleo/img/statut8.png differ
diff --git a/htdocs/theme/cameleo/img/statut9.png b/htdocs/theme/cameleo/img/statut9.png
index f3aedc87cba..196f4f53c7d 100644
Binary files a/htdocs/theme/cameleo/img/statut9.png and b/htdocs/theme/cameleo/img/statut9.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm0.png b/htdocs/theme/cameleo/img/stcomm0.png
index f3aedc87cba..196f4f53c7d 100644
Binary files a/htdocs/theme/cameleo/img/stcomm0.png and b/htdocs/theme/cameleo/img/stcomm0.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm1.png b/htdocs/theme/cameleo/img/stcomm1.png
index eb76c0fb179..6bdea492985 100644
Binary files a/htdocs/theme/cameleo/img/stcomm1.png and b/htdocs/theme/cameleo/img/stcomm1.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm10.png b/htdocs/theme/cameleo/img/stcomm10.png
index 93f571ae6ea..ed95a29dc9a 100644
Binary files a/htdocs/theme/cameleo/img/stcomm10.png and b/htdocs/theme/cameleo/img/stcomm10.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm2.png b/htdocs/theme/cameleo/img/stcomm2.png
index 1e76ce4946b..9e000b70dc9 100644
Binary files a/htdocs/theme/cameleo/img/stcomm2.png and b/htdocs/theme/cameleo/img/stcomm2.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm3.png b/htdocs/theme/cameleo/img/stcomm3.png
index 465234fcd3c..5a6c0aeface 100644
Binary files a/htdocs/theme/cameleo/img/stcomm3.png and b/htdocs/theme/cameleo/img/stcomm3.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm4.png b/htdocs/theme/cameleo/img/stcomm4.png
index 80b8e692971..0395aba2507 100644
Binary files a/htdocs/theme/cameleo/img/stcomm4.png and b/htdocs/theme/cameleo/img/stcomm4.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm5.png b/htdocs/theme/cameleo/img/stcomm5.png
index 596f078ca8b..9ce49b93476 100644
Binary files a/htdocs/theme/cameleo/img/stcomm5.png and b/htdocs/theme/cameleo/img/stcomm5.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm6.png b/htdocs/theme/cameleo/img/stcomm6.png
index 9472fd6a226..65ab6677ee7 100644
Binary files a/htdocs/theme/cameleo/img/stcomm6.png and b/htdocs/theme/cameleo/img/stcomm6.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm7.png b/htdocs/theme/cameleo/img/stcomm7.png
index db669c736f7..fbb4ed56775 100644
Binary files a/htdocs/theme/cameleo/img/stcomm7.png and b/htdocs/theme/cameleo/img/stcomm7.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm8.png b/htdocs/theme/cameleo/img/stcomm8.png
index fd89ea37856..05e7dae5dc2 100644
Binary files a/htdocs/theme/cameleo/img/stcomm8.png and b/htdocs/theme/cameleo/img/stcomm8.png differ
diff --git a/htdocs/theme/cameleo/img/stcomm9.png b/htdocs/theme/cameleo/img/stcomm9.png
index 526fdf4cb92..f2b68b4b218 100644
Binary files a/htdocs/theme/cameleo/img/stcomm9.png and b/htdocs/theme/cameleo/img/stcomm9.png differ
diff --git a/htdocs/theme/cameleo/img/tab_background.png b/htdocs/theme/cameleo/img/tab_background.png
index 0864dcc5852..6edd65003e0 100644
Binary files a/htdocs/theme/cameleo/img/tab_background.png and b/htdocs/theme/cameleo/img/tab_background.png differ
diff --git a/htdocs/theme/cameleo/img/tick.png b/htdocs/theme/cameleo/img/tick.png
index 29ded7a552a..c899abb9c34 100644
Binary files a/htdocs/theme/cameleo/img/tick.png and b/htdocs/theme/cameleo/img/tick.png differ
diff --git a/htdocs/theme/cameleo/img/title.png b/htdocs/theme/cameleo/img/title.png
index bb1dd5683fa..eb9c329a6a5 100644
Binary files a/htdocs/theme/cameleo/img/title.png and b/htdocs/theme/cameleo/img/title.png differ
diff --git a/htdocs/theme/cameleo/img/unlock.png b/htdocs/theme/cameleo/img/unlock.png
index f3eebc59274..afefaa94d47 100644
Binary files a/htdocs/theme/cameleo/img/unlock.png and b/htdocs/theme/cameleo/img/unlock.png differ
diff --git a/htdocs/theme/cameleo/img/uparrow.png b/htdocs/theme/cameleo/img/uparrow.png
index 0f6d64e936a..5706ca39da4 100644
Binary files a/htdocs/theme/cameleo/img/uparrow.png and b/htdocs/theme/cameleo/img/uparrow.png differ
diff --git a/htdocs/theme/cameleo/img/vcard.png b/htdocs/theme/cameleo/img/vcard.png
index e03026f87fb..315abdf179d 100644
Binary files a/htdocs/theme/cameleo/img/vcard.png and b/htdocs/theme/cameleo/img/vcard.png differ
diff --git a/htdocs/theme/cameleo/img/view.png b/htdocs/theme/cameleo/img/view.png
index 4e0396f7b09..76c1e9f1e6a 100644
Binary files a/htdocs/theme/cameleo/img/view.png and b/htdocs/theme/cameleo/img/view.png differ
diff --git a/htdocs/theme/cameleo/img/warning.png b/htdocs/theme/cameleo/img/warning.png
index 81514897fe6..dfa237a5302 100644
Binary files a/htdocs/theme/cameleo/img/warning.png and b/htdocs/theme/cameleo/img/warning.png differ
diff --git a/htdocs/theme/cameleo/index.html b/htdocs/theme/cameleo/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/cameleo/index.php b/htdocs/theme/cameleo/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/cameleo/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 13dfee590ae..096eab6c74d 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -85,7 +85,7 @@ body {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
-	/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
+	background-color: #FCFCFC;
 <?php } ?>
 	color: #101010;
 	font-size: <?php print $fontsize ?>px;
@@ -185,14 +185,6 @@ legend { margin-bottom: 8px; }
     padding: 0px 2px 0px 2px;
     margin: 0px 0px 0px 0px;
 }
-.buttonajax {
-    font-family: <?php print $fontlist ?>;
-	border: 0px;
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
-	background-position: bottom;
-    padding: 0px 0px 0px 0px;
-    margin: 0px 0px 0px 0px;
-}
 form {
     padding: 0em 0em 0em 0em;
     margin: 0em 0em 0em 0em;
@@ -234,6 +226,23 @@ div.inline-block
 .nounderline {
     text-decoration: none;
 }
+.cursorpointer {
+	cursor: pointer;
+}
+.badge {
+	display: inline-block;
+	min-width: 10px;
+	padding: 2px 5px;
+	font-size: 10px;
+	font-weight: 700;
+	line-height: 0.9em;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	background-color: #777;
+	border-radius: 10px;
+}
 
 
 /* ============================================================================== */
@@ -328,16 +337,8 @@ div.ficheaddleft {
 /* ============================================================================== */
 
 <?php
-if (! empty($conf->dol_optimize_smallscreen))
-{
-	$minwidthtmenu=0;
-	$heightmenu=19;
-}
-else
-{
-	$minwidthtmenu=70;
-	$heightmenu=47;
-}
+$minwidthtmenu=70;
+$heightmenu=47;
 ?>
 
 div#tmenu_tooltip {
@@ -479,7 +480,9 @@ div.mainmenu {
 	margin-left: 0px;
 }
 
-<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
+
+/* Do not load menu img if hidden to save bandwidth */
+<?php if (empty($dol_hide_topmenu)) { ?>
 
 div.mainmenu.agenda {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1); ?>);
@@ -548,10 +551,6 @@ div.mainmenu.tools {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>);
 }
 
-div.mainmenu.shop {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1); ?>);
-}
-
 div.mainmenu.google {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/globe.png',1); ?>);
 }
@@ -575,7 +574,7 @@ foreach($conf->modules as $val)
 $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 
 $generic=1;
-$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','ecm','bookmark','cashdesk','geoipmaxmind','gravatar','clicktodial','paypal','webservices');
+$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','ecm','bookmark','cashdesk','geoipmaxmind','gravatar','clicktodial','paypal','webservices');
 foreach($mainmenuusedarray as $val)
 {
 	if (empty($val) || in_array($val,$divalreadydefined)) continue;
@@ -610,7 +609,7 @@ foreach($mainmenuusedarray as $val)
 ?>
 
 <?php
-}	// End test if not phone
+}	// End test if $dol_hide_topmenu
 ?>
 
 .tmenuimage {
@@ -863,9 +862,14 @@ div.blockvmenusearch div.menu_titre {
 {
 	padding-top: 1px;
 	padding-bottom: 1px;
-	height: 20px;
+	min-height: 20px;
 }
 
+#blockvmenusearch form
+{
+	clear: both;
+	margin-bottom: 14px;
+}
 
 div.blockvmenubookmarks
 {
@@ -1964,13 +1968,18 @@ td.hidden {
 
 table.cal_month    { border-spacing: 0px; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_current_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_other_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B !important; border-right: 0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 .cal_other_month   { background: #DDDDDD; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser { background: #FFFFFF; border-right: solid 1px #6C7C7B; border-top: solid 1px #A0A0A0; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; border-top: solid 1px #A0A0A0; border-right: solid 1px #6C7C7B; border-bottom: solid 1px #A0A0A0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
@@ -1979,6 +1988,8 @@ li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:visited {font-size: 11px; font-weight: bold !important; }
 .cal_event a:active  {font-size: 11px; font-weight: bold !important; }
 .cal_event a:hover   {font-size: 11px; font-weight: bold !important; }
+.peruser_busy      { background: #CC8888; }
+.peruser_notbusy   { background: #EEDDDD; }
 
 
 /* ============================================================================== */
@@ -2382,7 +2393,11 @@ div.ecmjqft {
 {
 	text-decoration: underline !important;
 }
-
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
+	opacity: .35;
+	filter: Alpha(Opacity=35);
+	background-image: none;
+}
 
 /* ============================================================================== */
 /*  JMobile                                                                       */
@@ -2522,6 +2537,14 @@ ul.ulmenu {
 	background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
 	background-image: linear-gradient( #eee,#e1e1e1 ) !important;
 }
+.lilevel2
+{
+	padding-left: 22px;
+}
+.lilevel3
+{
+	padding-left: 54px;
+}
 
 
 <?php
diff --git a/htdocs/theme/cameleo/tpl/index.html b/htdocs/theme/cameleo/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/cameleo/tpl/index.php b/htdocs/theme/cameleo/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/cameleo/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/common/colorpicker.png b/htdocs/theme/common/colorpicker.png
index e5ee4b7d74c..26cc6af26f0 100644
Binary files a/htdocs/theme/common/colorpicker.png and b/htdocs/theme/common/colorpicker.png differ
diff --git a/htdocs/theme/common/devices/audio-card.png b/htdocs/theme/common/devices/audio-card.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/audio-headset.png b/htdocs/theme/common/devices/audio-headset.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/audio-input-line.png b/htdocs/theme/common/devices/audio-input-line.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/audio-input-microphone.png b/htdocs/theme/common/devices/audio-input-microphone.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/battery.png b/htdocs/theme/common/devices/battery.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/camera-photo.png b/htdocs/theme/common/devices/camera-photo.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/camera-web.png b/htdocs/theme/common/devices/camera-web.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/computer-laptop.png b/htdocs/theme/common/devices/computer-laptop.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/computer.png b/htdocs/theme/common/devices/computer.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/cpu.png b/htdocs/theme/common/devices/cpu.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/drive-harddisk.png b/htdocs/theme/common/devices/drive-harddisk.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/drive-optical.png b/htdocs/theme/common/devices/drive-optical.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png b/htdocs/theme/common/devices/drive-removable-media-usb-pendrive.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/drive-removable-media-usb.png b/htdocs/theme/common/devices/drive-removable-media-usb.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/drive-removable-media.png b/htdocs/theme/common/devices/drive-removable-media.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/index.html b/htdocs/theme/common/devices/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/devices/input-gaming.png b/htdocs/theme/common/devices/input-gaming.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/input-keyboard.png b/htdocs/theme/common/devices/input-keyboard.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/input-mouse.png b/htdocs/theme/common/devices/input-mouse.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/input-tablet.png b/htdocs/theme/common/devices/input-tablet.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-flash-memory-stick.png b/htdocs/theme/common/devices/media-flash-memory-stick.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-flash-sd-mmc.png b/htdocs/theme/common/devices/media-flash-sd-mmc.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-flash-smart-media.png b/htdocs/theme/common/devices/media-flash-smart-media.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-flash.png b/htdocs/theme/common/devices/media-flash.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-floppy.png b/htdocs/theme/common/devices/media-floppy.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-audio.png b/htdocs/theme/common/devices/media-optical-audio.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-blu-ray.png b/htdocs/theme/common/devices/media-optical-blu-ray.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-data.png b/htdocs/theme/common/devices/media-optical-data.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-dvd-video.png b/htdocs/theme/common/devices/media-optical-dvd-video.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-dvd.png b/htdocs/theme/common/devices/media-optical-dvd.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-mixed-cd.png b/htdocs/theme/common/devices/media-optical-mixed-cd.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-recordable.png b/htdocs/theme/common/devices/media-optical-recordable.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical-video.png b/htdocs/theme/common/devices/media-optical-video.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-optical.png b/htdocs/theme/common/devices/media-optical.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/media-tape.png b/htdocs/theme/common/devices/media-tape.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/modem.png b/htdocs/theme/common/devices/modem.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/multimedia-player-apple-ipod.png b/htdocs/theme/common/devices/multimedia-player-apple-ipod.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/multimedia-player.png b/htdocs/theme/common/devices/multimedia-player.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wired.png b/htdocs/theme/common/devices/network-wired.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wireless-connected-00.png b/htdocs/theme/common/devices/network-wireless-connected-00.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wireless-connected-100.png b/htdocs/theme/common/devices/network-wireless-connected-100.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wireless-connected-25.png b/htdocs/theme/common/devices/network-wireless-connected-25.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wireless-connected-50.png b/htdocs/theme/common/devices/network-wireless-connected-50.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wireless-connected-75.png b/htdocs/theme/common/devices/network-wireless-connected-75.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wireless-disconnected.png b/htdocs/theme/common/devices/network-wireless-disconnected.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/network-wireless.png b/htdocs/theme/common/devices/network-wireless.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/pda.png b/htdocs/theme/common/devices/pda.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/phone-openmoko-freerunner.png b/htdocs/theme/common/devices/phone-openmoko-freerunner.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/phone.png b/htdocs/theme/common/devices/phone.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/printer-laser.png b/htdocs/theme/common/devices/printer-laser.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/printer.png b/htdocs/theme/common/devices/printer.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/scanner.png b/htdocs/theme/common/devices/scanner.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/video-display.png b/htdocs/theme/common/devices/video-display.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/video-projector.png b/htdocs/theme/common/devices/video-projector.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/devices/video-television.png b/htdocs/theme/common/devices/video-television.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/dolibarr_box.png b/htdocs/theme/common/dolibarr_box.png
index 1005eee1a3f..074b41951ba 100644
Binary files a/htdocs/theme/common/dolibarr_box.png and b/htdocs/theme/common/dolibarr_box.png differ
diff --git a/htdocs/theme/common/dolistore.jpg b/htdocs/theme/common/dolistore.jpg
index 4c330cdc184..65a2d6ffae1 100644
Binary files a/htdocs/theme/common/dolistore.jpg and b/htdocs/theme/common/dolistore.jpg differ
diff --git a/htdocs/theme/common/emotes/face-angel.png b/htdocs/theme/common/emotes/face-angel.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-embarrassed.png b/htdocs/theme/common/emotes/face-embarrassed.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-kiss.png b/htdocs/theme/common/emotes/face-kiss.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-laugh.png b/htdocs/theme/common/emotes/face-laugh.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-plain.png b/htdocs/theme/common/emotes/face-plain.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-raspberry.png b/htdocs/theme/common/emotes/face-raspberry.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-sad.png b/htdocs/theme/common/emotes/face-sad.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-smile-big.png b/htdocs/theme/common/emotes/face-smile-big.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-smile.png b/htdocs/theme/common/emotes/face-smile.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-surprise.png b/htdocs/theme/common/emotes/face-surprise.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-uncertain.png b/htdocs/theme/common/emotes/face-uncertain.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/face-wink.png b/htdocs/theme/common/emotes/face-wink.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/emotes/index.html b/htdocs/theme/common/emotes/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/flags/ad.png b/htdocs/theme/common/flags/ad.png
index 9cbbac67868..30e008b3c35 100644
Binary files a/htdocs/theme/common/flags/ad.png and b/htdocs/theme/common/flags/ad.png differ
diff --git a/htdocs/theme/common/flags/ae.png b/htdocs/theme/common/flags/ae.png
index b95418959f7..85d458ad289 100644
Binary files a/htdocs/theme/common/flags/ae.png and b/htdocs/theme/common/flags/ae.png differ
diff --git a/htdocs/theme/common/flags/af.png b/htdocs/theme/common/flags/af.png
index e7cf8379655..219c05b72b8 100644
Binary files a/htdocs/theme/common/flags/af.png and b/htdocs/theme/common/flags/af.png differ
diff --git a/htdocs/theme/common/flags/ag.png b/htdocs/theme/common/flags/ag.png
index e05c89a25dc..60a62e53832 100644
Binary files a/htdocs/theme/common/flags/ag.png and b/htdocs/theme/common/flags/ag.png differ
diff --git a/htdocs/theme/common/flags/ai.png b/htdocs/theme/common/flags/ai.png
index 99e6c99f755..0ca086500f9 100644
Binary files a/htdocs/theme/common/flags/ai.png and b/htdocs/theme/common/flags/ai.png differ
diff --git a/htdocs/theme/common/flags/al.png b/htdocs/theme/common/flags/al.png
index 722d29bcd91..997f3f1b748 100644
Binary files a/htdocs/theme/common/flags/al.png and b/htdocs/theme/common/flags/al.png differ
diff --git a/htdocs/theme/common/flags/am.png b/htdocs/theme/common/flags/am.png
index e063c9820f4..e25bc21af0f 100644
Binary files a/htdocs/theme/common/flags/am.png and b/htdocs/theme/common/flags/am.png differ
diff --git a/htdocs/theme/common/flags/an.png b/htdocs/theme/common/flags/an.png
index 41aa497f6b2..dab98820777 100644
Binary files a/htdocs/theme/common/flags/an.png and b/htdocs/theme/common/flags/an.png differ
diff --git a/htdocs/theme/common/flags/ao.png b/htdocs/theme/common/flags/ao.png
index fe1af784804..49f0b47fbdf 100644
Binary files a/htdocs/theme/common/flags/ao.png and b/htdocs/theme/common/flags/ao.png differ
diff --git a/htdocs/theme/common/flags/ar.png b/htdocs/theme/common/flags/ar.png
index a3ff84b1fa8..4211272f0fa 100644
Binary files a/htdocs/theme/common/flags/ar.png and b/htdocs/theme/common/flags/ar.png differ
diff --git a/htdocs/theme/common/flags/as.png b/htdocs/theme/common/flags/as.png
index 046d718ec23..8a2bfdaee5f 100644
Binary files a/htdocs/theme/common/flags/as.png and b/htdocs/theme/common/flags/as.png differ
diff --git a/htdocs/theme/common/flags/at.png b/htdocs/theme/common/flags/at.png
index 0f42a96dbee..49326161af6 100644
Binary files a/htdocs/theme/common/flags/at.png and b/htdocs/theme/common/flags/at.png differ
diff --git a/htdocs/theme/common/flags/au.png b/htdocs/theme/common/flags/au.png
index db60de6c18b..c2b0d6f2bac 100644
Binary files a/htdocs/theme/common/flags/au.png and b/htdocs/theme/common/flags/au.png differ
diff --git a/htdocs/theme/common/flags/aw.png b/htdocs/theme/common/flags/aw.png
index 26c6ad7210f..2c4a2a4ade6 100644
Binary files a/htdocs/theme/common/flags/aw.png and b/htdocs/theme/common/flags/aw.png differ
diff --git a/htdocs/theme/common/flags/ax.png b/htdocs/theme/common/flags/ax.png
index f9d3d501718..0d1009b3e2c 100644
Binary files a/htdocs/theme/common/flags/ax.png and b/htdocs/theme/common/flags/ax.png differ
diff --git a/htdocs/theme/common/flags/az.png b/htdocs/theme/common/flags/az.png
index b6d62ba21e0..d42a26360ee 100644
Binary files a/htdocs/theme/common/flags/az.png and b/htdocs/theme/common/flags/az.png differ
diff --git a/htdocs/theme/common/flags/ba.png b/htdocs/theme/common/flags/ba.png
index 7ccace03796..8daf16f80ad 100644
Binary files a/htdocs/theme/common/flags/ba.png and b/htdocs/theme/common/flags/ba.png differ
diff --git a/htdocs/theme/common/flags/bb.png b/htdocs/theme/common/flags/bb.png
index 4845ced25ff..54812d0c78d 100644
Binary files a/htdocs/theme/common/flags/bb.png and b/htdocs/theme/common/flags/bb.png differ
diff --git a/htdocs/theme/common/flags/bd.png b/htdocs/theme/common/flags/bd.png
index 7a0213594f3..7aeab3bf0cd 100644
Binary files a/htdocs/theme/common/flags/bd.png and b/htdocs/theme/common/flags/bd.png differ
diff --git a/htdocs/theme/common/flags/be.png b/htdocs/theme/common/flags/be.png
index e4e11fd8645..7c0329e9755 100644
Binary files a/htdocs/theme/common/flags/be.png and b/htdocs/theme/common/flags/be.png differ
diff --git a/htdocs/theme/common/flags/bf.png b/htdocs/theme/common/flags/bf.png
index d72fdcf9522..783930208fc 100644
Binary files a/htdocs/theme/common/flags/bf.png and b/htdocs/theme/common/flags/bf.png differ
diff --git a/htdocs/theme/common/flags/bg.png b/htdocs/theme/common/flags/bg.png
index cc99ef5ede0..b50b5cae999 100644
Binary files a/htdocs/theme/common/flags/bg.png and b/htdocs/theme/common/flags/bg.png differ
diff --git a/htdocs/theme/common/flags/bh.png b/htdocs/theme/common/flags/bh.png
index 4b727ab016b..07b64394023 100644
Binary files a/htdocs/theme/common/flags/bh.png and b/htdocs/theme/common/flags/bh.png differ
diff --git a/htdocs/theme/common/flags/bi.png b/htdocs/theme/common/flags/bi.png
index c010bbe5d8b..8dcc9a50b65 100644
Binary files a/htdocs/theme/common/flags/bi.png and b/htdocs/theme/common/flags/bi.png differ
diff --git a/htdocs/theme/common/flags/bj.png b/htdocs/theme/common/flags/bj.png
index b0977e677f1..90ce5ac89d4 100644
Binary files a/htdocs/theme/common/flags/bj.png and b/htdocs/theme/common/flags/bj.png differ
diff --git a/htdocs/theme/common/flags/bm.png b/htdocs/theme/common/flags/bm.png
index 92f56551d6e..86b1e3e2008 100644
Binary files a/htdocs/theme/common/flags/bm.png and b/htdocs/theme/common/flags/bm.png differ
diff --git a/htdocs/theme/common/flags/bn.png b/htdocs/theme/common/flags/bn.png
index 01d40266496..508c7bf49ef 100644
Binary files a/htdocs/theme/common/flags/bn.png and b/htdocs/theme/common/flags/bn.png differ
diff --git a/htdocs/theme/common/flags/bo.png b/htdocs/theme/common/flags/bo.png
index 1c2acb46d18..b53322d7ca4 100644
Binary files a/htdocs/theme/common/flags/bo.png and b/htdocs/theme/common/flags/bo.png differ
diff --git a/htdocs/theme/common/flags/br.png b/htdocs/theme/common/flags/br.png
index c170551ad57..dd49733c0fc 100644
Binary files a/htdocs/theme/common/flags/br.png and b/htdocs/theme/common/flags/br.png differ
diff --git a/htdocs/theme/common/flags/bs.png b/htdocs/theme/common/flags/bs.png
index c47b2c1cbb6..3d62217f02e 100644
Binary files a/htdocs/theme/common/flags/bs.png and b/htdocs/theme/common/flags/bs.png differ
diff --git a/htdocs/theme/common/flags/bt.png b/htdocs/theme/common/flags/bt.png
index bf41fd0c7b8..c6d93868a33 100644
Binary files a/htdocs/theme/common/flags/bt.png and b/htdocs/theme/common/flags/bt.png differ
diff --git a/htdocs/theme/common/flags/bv.png b/htdocs/theme/common/flags/bv.png
index fb90e843bb7..c403d06ad10 100644
Binary files a/htdocs/theme/common/flags/bv.png and b/htdocs/theme/common/flags/bv.png differ
diff --git a/htdocs/theme/common/flags/bw.png b/htdocs/theme/common/flags/bw.png
index 731ec9d41bb..62078f2c42d 100644
Binary files a/htdocs/theme/common/flags/bw.png and b/htdocs/theme/common/flags/bw.png differ
diff --git a/htdocs/theme/common/flags/by.png b/htdocs/theme/common/flags/by.png
index 833077d5769..20516d176f0 100644
Binary files a/htdocs/theme/common/flags/by.png and b/htdocs/theme/common/flags/by.png differ
diff --git a/htdocs/theme/common/flags/bz.png b/htdocs/theme/common/flags/bz.png
index 23c71c0b0d8..6d7e706544f 100644
Binary files a/htdocs/theme/common/flags/bz.png and b/htdocs/theme/common/flags/bz.png differ
diff --git a/htdocs/theme/common/flags/ca.png b/htdocs/theme/common/flags/ca.png
index e034d13601f..6aa3009bcaf 100644
Binary files a/htdocs/theme/common/flags/ca.png and b/htdocs/theme/common/flags/ca.png differ
diff --git a/htdocs/theme/common/flags/catalonia.png b/htdocs/theme/common/flags/catalonia.png
index 5de14e4956c..69d46d8f4ef 100644
Binary files a/htdocs/theme/common/flags/catalonia.png and b/htdocs/theme/common/flags/catalonia.png differ
diff --git a/htdocs/theme/common/flags/cc.png b/htdocs/theme/common/flags/cc.png
index ee54eceba35..e32bd1f9a82 100644
Binary files a/htdocs/theme/common/flags/cc.png and b/htdocs/theme/common/flags/cc.png differ
diff --git a/htdocs/theme/common/flags/cf.png b/htdocs/theme/common/flags/cf.png
index d0e272b7a7c..4fe18833d61 100644
Binary files a/htdocs/theme/common/flags/cf.png and b/htdocs/theme/common/flags/cf.png differ
diff --git a/htdocs/theme/common/flags/cg.png b/htdocs/theme/common/flags/cg.png
index 51f35cd5c70..23c51278c5c 100644
Binary files a/htdocs/theme/common/flags/cg.png and b/htdocs/theme/common/flags/cg.png differ
diff --git a/htdocs/theme/common/flags/ch.png b/htdocs/theme/common/flags/ch.png
index 3c2666cf21b..0b5ec13d26c 100644
Binary files a/htdocs/theme/common/flags/ch.png and b/htdocs/theme/common/flags/ch.png differ
diff --git a/htdocs/theme/common/flags/ci.png b/htdocs/theme/common/flags/ci.png
index 49230aa2b29..079a5b74b19 100644
Binary files a/htdocs/theme/common/flags/ci.png and b/htdocs/theme/common/flags/ci.png differ
diff --git a/htdocs/theme/common/flags/ck.png b/htdocs/theme/common/flags/ck.png
index 9200b718ce8..c3de282a2fa 100644
Binary files a/htdocs/theme/common/flags/ck.png and b/htdocs/theme/common/flags/ck.png differ
diff --git a/htdocs/theme/common/flags/cl.png b/htdocs/theme/common/flags/cl.png
index 36e5cfc3d50..f6e756fda12 100644
Binary files a/htdocs/theme/common/flags/cl.png and b/htdocs/theme/common/flags/cl.png differ
diff --git a/htdocs/theme/common/flags/cm.png b/htdocs/theme/common/flags/cm.png
index aee03acc323..4bf34fb5552 100644
Binary files a/htdocs/theme/common/flags/cm.png and b/htdocs/theme/common/flags/cm.png differ
diff --git a/htdocs/theme/common/flags/cn.png b/htdocs/theme/common/flags/cn.png
index 842a3c49625..45bdfe47cfa 100644
Binary files a/htdocs/theme/common/flags/cn.png and b/htdocs/theme/common/flags/cn.png differ
diff --git a/htdocs/theme/common/flags/co.png b/htdocs/theme/common/flags/co.png
index fab952d2891..8933a71b530 100644
Binary files a/htdocs/theme/common/flags/co.png and b/htdocs/theme/common/flags/co.png differ
diff --git a/htdocs/theme/common/flags/cr.png b/htdocs/theme/common/flags/cr.png
index 9632de9f616..2c84ea0c053 100644
Binary files a/htdocs/theme/common/flags/cr.png and b/htdocs/theme/common/flags/cr.png differ
diff --git a/htdocs/theme/common/flags/cs.png b/htdocs/theme/common/flags/cs.png
index 7e317bcdc8b..8fde28a6dfd 100644
Binary files a/htdocs/theme/common/flags/cs.png and b/htdocs/theme/common/flags/cs.png differ
diff --git a/htdocs/theme/common/flags/cu.png b/htdocs/theme/common/flags/cu.png
index f27bca37504..fe475e9b070 100644
Binary files a/htdocs/theme/common/flags/cu.png and b/htdocs/theme/common/flags/cu.png differ
diff --git a/htdocs/theme/common/flags/cv.png b/htdocs/theme/common/flags/cv.png
index 6cb77c61236..eff1aae4c98 100644
Binary files a/htdocs/theme/common/flags/cv.png and b/htdocs/theme/common/flags/cv.png differ
diff --git a/htdocs/theme/common/flags/cx.png b/htdocs/theme/common/flags/cx.png
index 9054c44b99f..245c76954d0 100644
Binary files a/htdocs/theme/common/flags/cx.png and b/htdocs/theme/common/flags/cx.png differ
diff --git a/htdocs/theme/common/flags/cy.png b/htdocs/theme/common/flags/cy.png
index 5475b558785..52fc49a27fe 100644
Binary files a/htdocs/theme/common/flags/cy.png and b/htdocs/theme/common/flags/cy.png differ
diff --git a/htdocs/theme/common/flags/cz.png b/htdocs/theme/common/flags/cz.png
index dfe4d732962..3e97234172f 100644
Binary files a/htdocs/theme/common/flags/cz.png and b/htdocs/theme/common/flags/cz.png differ
diff --git a/htdocs/theme/common/flags/de.png b/htdocs/theme/common/flags/de.png
index a1374d11f22..26c425a2bfc 100644
Binary files a/htdocs/theme/common/flags/de.png and b/htdocs/theme/common/flags/de.png differ
diff --git a/htdocs/theme/common/flags/dj.png b/htdocs/theme/common/flags/dj.png
index c769df60921..c71c3600212 100644
Binary files a/htdocs/theme/common/flags/dj.png and b/htdocs/theme/common/flags/dj.png differ
diff --git a/htdocs/theme/common/flags/dk.png b/htdocs/theme/common/flags/dk.png
index da446d7ffda..5d93653f59d 100644
Binary files a/htdocs/theme/common/flags/dk.png and b/htdocs/theme/common/flags/dk.png differ
diff --git a/htdocs/theme/common/flags/dm.png b/htdocs/theme/common/flags/dm.png
index 5e78e1e3a60..687c73acb33 100644
Binary files a/htdocs/theme/common/flags/dm.png and b/htdocs/theme/common/flags/dm.png differ
diff --git a/htdocs/theme/common/flags/do.png b/htdocs/theme/common/flags/do.png
index f958623838b..5618447d2da 100644
Binary files a/htdocs/theme/common/flags/do.png and b/htdocs/theme/common/flags/do.png differ
diff --git a/htdocs/theme/common/flags/dz.png b/htdocs/theme/common/flags/dz.png
index a6a38700852..55ab7971596 100644
Binary files a/htdocs/theme/common/flags/dz.png and b/htdocs/theme/common/flags/dz.png differ
diff --git a/htdocs/theme/common/flags/ec.png b/htdocs/theme/common/flags/ec.png
index d25f3d461dd..1588df6feb9 100644
Binary files a/htdocs/theme/common/flags/ec.png and b/htdocs/theme/common/flags/ec.png differ
diff --git a/htdocs/theme/common/flags/ee.png b/htdocs/theme/common/flags/ee.png
index 0b643ab2d17..152ac6dd5c1 100644
Binary files a/htdocs/theme/common/flags/ee.png and b/htdocs/theme/common/flags/ee.png differ
diff --git a/htdocs/theme/common/flags/eg.png b/htdocs/theme/common/flags/eg.png
index 05522174578..d3e67889305 100644
Binary files a/htdocs/theme/common/flags/eg.png and b/htdocs/theme/common/flags/eg.png differ
diff --git a/htdocs/theme/common/flags/eh.png b/htdocs/theme/common/flags/eh.png
index 69852d6b48e..84f89ed867e 100644
Binary files a/htdocs/theme/common/flags/eh.png and b/htdocs/theme/common/flags/eh.png differ
diff --git a/htdocs/theme/common/flags/en.png b/htdocs/theme/common/flags/en.png
index 8161f0727fa..025009e2045 100644
Binary files a/htdocs/theme/common/flags/en.png and b/htdocs/theme/common/flags/en.png differ
diff --git a/htdocs/theme/common/flags/england.png b/htdocs/theme/common/flags/england.png
index e2b69c415f7..50bd40cb7df 100644
Binary files a/htdocs/theme/common/flags/england.png and b/htdocs/theme/common/flags/england.png differ
diff --git a/htdocs/theme/common/flags/er.png b/htdocs/theme/common/flags/er.png
index eb1a436cae9..c727d4d349d 100644
Binary files a/htdocs/theme/common/flags/er.png and b/htdocs/theme/common/flags/er.png differ
diff --git a/htdocs/theme/common/flags/es.png b/htdocs/theme/common/flags/es.png
index e8b6f2f1613..12dd9a59475 100644
Binary files a/htdocs/theme/common/flags/es.png and b/htdocs/theme/common/flags/es.png differ
diff --git a/htdocs/theme/common/flags/et.png b/htdocs/theme/common/flags/et.png
index f36f2a7866d..26cfab3a785 100644
Binary files a/htdocs/theme/common/flags/et.png and b/htdocs/theme/common/flags/et.png differ
diff --git a/htdocs/theme/common/flags/fam.png b/htdocs/theme/common/flags/fam.png
index 42d1484be8d..aebb02c64eb 100644
Binary files a/htdocs/theme/common/flags/fam.png and b/htdocs/theme/common/flags/fam.png differ
diff --git a/htdocs/theme/common/flags/fi.png b/htdocs/theme/common/flags/fi.png
index 364ef4838bd..e5d813ab456 100644
Binary files a/htdocs/theme/common/flags/fi.png and b/htdocs/theme/common/flags/fi.png differ
diff --git a/htdocs/theme/common/flags/fj.png b/htdocs/theme/common/flags/fj.png
index fa6a000e44f..ccd3090bbfc 100644
Binary files a/htdocs/theme/common/flags/fj.png and b/htdocs/theme/common/flags/fj.png differ
diff --git a/htdocs/theme/common/flags/fk.png b/htdocs/theme/common/flags/fk.png
index 27e145e32a2..094e64f2093 100644
Binary files a/htdocs/theme/common/flags/fk.png and b/htdocs/theme/common/flags/fk.png differ
diff --git a/htdocs/theme/common/flags/fm.png b/htdocs/theme/common/flags/fm.png
index 89972e9cc5f..acb54953825 100644
Binary files a/htdocs/theme/common/flags/fm.png and b/htdocs/theme/common/flags/fm.png differ
diff --git a/htdocs/theme/common/flags/fo.png b/htdocs/theme/common/flags/fo.png
index d1064424df9..7ba11b6d1ba 100644
Binary files a/htdocs/theme/common/flags/fo.png and b/htdocs/theme/common/flags/fo.png differ
diff --git a/htdocs/theme/common/flags/fr.png b/htdocs/theme/common/flags/fr.png
index 3dd99eca7cf..9bceb7c255f 100644
Binary files a/htdocs/theme/common/flags/fr.png and b/htdocs/theme/common/flags/fr.png differ
diff --git a/htdocs/theme/common/flags/ga.png b/htdocs/theme/common/flags/ga.png
index c7d38e0976e..54c7c40c2ab 100644
Binary files a/htdocs/theme/common/flags/ga.png and b/htdocs/theme/common/flags/ga.png differ
diff --git a/htdocs/theme/common/flags/gb.png b/htdocs/theme/common/flags/gb.png
index 94530bc0224..025009e2045 100644
Binary files a/htdocs/theme/common/flags/gb.png and b/htdocs/theme/common/flags/gb.png differ
diff --git a/htdocs/theme/common/flags/gd.png b/htdocs/theme/common/flags/gd.png
index b8944ea771b..07cdb3d11eb 100644
Binary files a/htdocs/theme/common/flags/gd.png and b/htdocs/theme/common/flags/gd.png differ
diff --git a/htdocs/theme/common/flags/ge.png b/htdocs/theme/common/flags/ge.png
index d1611d44a84..0d3f6b3d99a 100644
Binary files a/htdocs/theme/common/flags/ge.png and b/htdocs/theme/common/flags/ge.png differ
diff --git a/htdocs/theme/common/flags/gf.png b/htdocs/theme/common/flags/gf.png
index 3dd99eca7cf..9bceb7c255f 100644
Binary files a/htdocs/theme/common/flags/gf.png and b/htdocs/theme/common/flags/gf.png differ
diff --git a/htdocs/theme/common/flags/gg.png b/htdocs/theme/common/flags/gg.png
index d83d0dfa10c..a61bc7ddc7f 100644
Binary files a/htdocs/theme/common/flags/gg.png and b/htdocs/theme/common/flags/gg.png differ
diff --git a/htdocs/theme/common/flags/gh.png b/htdocs/theme/common/flags/gh.png
index f21737a2384..d5b36270abb 100644
Binary files a/htdocs/theme/common/flags/gh.png and b/htdocs/theme/common/flags/gh.png differ
diff --git a/htdocs/theme/common/flags/gi.png b/htdocs/theme/common/flags/gi.png
index 514093218ee..54d542c8eb3 100644
Binary files a/htdocs/theme/common/flags/gi.png and b/htdocs/theme/common/flags/gi.png differ
diff --git a/htdocs/theme/common/flags/gl.png b/htdocs/theme/common/flags/gl.png
index de49012f0a8..a20795c2ea8 100644
Binary files a/htdocs/theme/common/flags/gl.png and b/htdocs/theme/common/flags/gl.png differ
diff --git a/htdocs/theme/common/flags/gm.png b/htdocs/theme/common/flags/gm.png
index 27bf0d5422e..3c5d1fc3382 100644
Binary files a/htdocs/theme/common/flags/gm.png and b/htdocs/theme/common/flags/gm.png differ
diff --git a/htdocs/theme/common/flags/gn.png b/htdocs/theme/common/flags/gn.png
index 24731c9226d..0a97da77bad 100644
Binary files a/htdocs/theme/common/flags/gn.png and b/htdocs/theme/common/flags/gn.png differ
diff --git a/htdocs/theme/common/flags/gp.png b/htdocs/theme/common/flags/gp.png
index 6d12f0a2c3b..2ed1b78eadc 100644
Binary files a/htdocs/theme/common/flags/gp.png and b/htdocs/theme/common/flags/gp.png differ
diff --git a/htdocs/theme/common/flags/gq.png b/htdocs/theme/common/flags/gq.png
index db514344948..c6b3d5d3f2e 100644
Binary files a/htdocs/theme/common/flags/gq.png and b/htdocs/theme/common/flags/gq.png differ
diff --git a/htdocs/theme/common/flags/gr.png b/htdocs/theme/common/flags/gr.png
index 32c174e0338..c5a05354189 100644
Binary files a/htdocs/theme/common/flags/gr.png and b/htdocs/theme/common/flags/gr.png differ
diff --git a/htdocs/theme/common/flags/gs.png b/htdocs/theme/common/flags/gs.png
index 8116e5035f1..33385645196 100644
Binary files a/htdocs/theme/common/flags/gs.png and b/htdocs/theme/common/flags/gs.png differ
diff --git a/htdocs/theme/common/flags/gt.png b/htdocs/theme/common/flags/gt.png
index e70b5f1cb0b..375a86987e6 100644
Binary files a/htdocs/theme/common/flags/gt.png and b/htdocs/theme/common/flags/gt.png differ
diff --git a/htdocs/theme/common/flags/gu.png b/htdocs/theme/common/flags/gu.png
index 9a3f911bd83..ad91f5c37e8 100644
Binary files a/htdocs/theme/common/flags/gu.png and b/htdocs/theme/common/flags/gu.png differ
diff --git a/htdocs/theme/common/flags/gw.png b/htdocs/theme/common/flags/gw.png
index ab2ea0799ae..815d1eba4ab 100644
Binary files a/htdocs/theme/common/flags/gw.png and b/htdocs/theme/common/flags/gw.png differ
diff --git a/htdocs/theme/common/flags/gy.png b/htdocs/theme/common/flags/gy.png
index d9584813375..3e74461376e 100644
Binary files a/htdocs/theme/common/flags/gy.png and b/htdocs/theme/common/flags/gy.png differ
diff --git a/htdocs/theme/common/flags/hk.png b/htdocs/theme/common/flags/hk.png
index 57d1750201e..cb8dc67b4ac 100644
Binary files a/htdocs/theme/common/flags/hk.png and b/htdocs/theme/common/flags/hk.png differ
diff --git a/htdocs/theme/common/flags/hm.png b/htdocs/theme/common/flags/hm.png
index f7aba127e3f..c2b0d6f2bac 100644
Binary files a/htdocs/theme/common/flags/hm.png and b/htdocs/theme/common/flags/hm.png differ
diff --git a/htdocs/theme/common/flags/hn.png b/htdocs/theme/common/flags/hn.png
index 88ab2794bc5..45b6fe69264 100644
Binary files a/htdocs/theme/common/flags/hn.png and b/htdocs/theme/common/flags/hn.png differ
diff --git a/htdocs/theme/common/flags/hr.png b/htdocs/theme/common/flags/hr.png
index 46373d48960..a93b68684ed 100644
Binary files a/htdocs/theme/common/flags/hr.png and b/htdocs/theme/common/flags/hr.png differ
diff --git a/htdocs/theme/common/flags/ht.png b/htdocs/theme/common/flags/ht.png
index 1a6a94e9787..849aeef99f9 100644
Binary files a/htdocs/theme/common/flags/ht.png and b/htdocs/theme/common/flags/ht.png differ
diff --git a/htdocs/theme/common/flags/hu.png b/htdocs/theme/common/flags/hu.png
index 3a5e37750eb..92d2c1b66f6 100644
Binary files a/htdocs/theme/common/flags/hu.png and b/htdocs/theme/common/flags/hu.png differ
diff --git a/htdocs/theme/common/flags/id.png b/htdocs/theme/common/flags/id.png
index 103f9f43a38..b1d3776b0f6 100644
Binary files a/htdocs/theme/common/flags/id.png and b/htdocs/theme/common/flags/id.png differ
diff --git a/htdocs/theme/common/flags/ie.png b/htdocs/theme/common/flags/ie.png
index 9530cdc067a..45fee80eab4 100644
Binary files a/htdocs/theme/common/flags/ie.png and b/htdocs/theme/common/flags/ie.png differ
diff --git a/htdocs/theme/common/flags/il.png b/htdocs/theme/common/flags/il.png
index 6c5e9d56954..25ac3ffcab5 100644
Binary files a/htdocs/theme/common/flags/il.png and b/htdocs/theme/common/flags/il.png differ
diff --git a/htdocs/theme/common/flags/in.png b/htdocs/theme/common/flags/in.png
index 7a0d7a0d393..27b07d91665 100644
Binary files a/htdocs/theme/common/flags/in.png and b/htdocs/theme/common/flags/in.png differ
diff --git a/htdocs/theme/common/flags/index.html b/htdocs/theme/common/flags/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/flags/io.png b/htdocs/theme/common/flags/io.png
index bb184d200c4..a9c83c78af8 100644
Binary files a/htdocs/theme/common/flags/io.png and b/htdocs/theme/common/flags/io.png differ
diff --git a/htdocs/theme/common/flags/iq.png b/htdocs/theme/common/flags/iq.png
index 6ad574a1c6f..4b7aecf5d22 100644
Binary files a/htdocs/theme/common/flags/iq.png and b/htdocs/theme/common/flags/iq.png differ
diff --git a/htdocs/theme/common/flags/ir.png b/htdocs/theme/common/flags/ir.png
index 7cc378453a8..0667684b624 100644
Binary files a/htdocs/theme/common/flags/ir.png and b/htdocs/theme/common/flags/ir.png differ
diff --git a/htdocs/theme/common/flags/is.png b/htdocs/theme/common/flags/is.png
index bc582e6b8ab..7ed17c6494a 100644
Binary files a/htdocs/theme/common/flags/is.png and b/htdocs/theme/common/flags/is.png differ
diff --git a/htdocs/theme/common/flags/it.png b/htdocs/theme/common/flags/it.png
index 35d9cca6f5e..459bd5cf525 100644
Binary files a/htdocs/theme/common/flags/it.png and b/htdocs/theme/common/flags/it.png differ
diff --git a/htdocs/theme/common/flags/jm.png b/htdocs/theme/common/flags/jm.png
index a514f3c0cf4..6e37e4ff041 100644
Binary files a/htdocs/theme/common/flags/jm.png and b/htdocs/theme/common/flags/jm.png differ
diff --git a/htdocs/theme/common/flags/jo.png b/htdocs/theme/common/flags/jo.png
index b39d33a876e..b2005b98c34 100644
Binary files a/htdocs/theme/common/flags/jo.png and b/htdocs/theme/common/flags/jo.png differ
diff --git a/htdocs/theme/common/flags/jp.png b/htdocs/theme/common/flags/jp.png
index 4cd4ec095ef..f9b572923ab 100644
Binary files a/htdocs/theme/common/flags/jp.png and b/htdocs/theme/common/flags/jp.png differ
diff --git a/htdocs/theme/common/flags/ke.png b/htdocs/theme/common/flags/ke.png
index 64fc05eba4d..3fa66c5b32b 100644
Binary files a/htdocs/theme/common/flags/ke.png and b/htdocs/theme/common/flags/ke.png differ
diff --git a/htdocs/theme/common/flags/kg.png b/htdocs/theme/common/flags/kg.png
index 7ecc2174dd1..2676ec90f29 100644
Binary files a/htdocs/theme/common/flags/kg.png and b/htdocs/theme/common/flags/kg.png differ
diff --git a/htdocs/theme/common/flags/kh.png b/htdocs/theme/common/flags/kh.png
index 0d5d59532f1..7382c8527b3 100644
Binary files a/htdocs/theme/common/flags/kh.png and b/htdocs/theme/common/flags/kh.png differ
diff --git a/htdocs/theme/common/flags/ki.png b/htdocs/theme/common/flags/ki.png
index b98d197ba08..7972152dec0 100644
Binary files a/htdocs/theme/common/flags/ki.png and b/htdocs/theme/common/flags/ki.png differ
diff --git a/htdocs/theme/common/flags/km.png b/htdocs/theme/common/flags/km.png
index 24c11028acd..6aaafa71efc 100644
Binary files a/htdocs/theme/common/flags/km.png and b/htdocs/theme/common/flags/km.png differ
diff --git a/htdocs/theme/common/flags/kn.png b/htdocs/theme/common/flags/kn.png
index 663b74e59b6..e41a57c61d6 100644
Binary files a/htdocs/theme/common/flags/kn.png and b/htdocs/theme/common/flags/kn.png differ
diff --git a/htdocs/theme/common/flags/kp.png b/htdocs/theme/common/flags/kp.png
index fa8f31d58c0..dda0c588b9f 100644
Binary files a/htdocs/theme/common/flags/kp.png and b/htdocs/theme/common/flags/kp.png differ
diff --git a/htdocs/theme/common/flags/kr.png b/htdocs/theme/common/flags/kr.png
index 6af9de44c2d..76cb8c55025 100644
Binary files a/htdocs/theme/common/flags/kr.png and b/htdocs/theme/common/flags/kr.png differ
diff --git a/htdocs/theme/common/flags/kw.png b/htdocs/theme/common/flags/kw.png
index e64619a7e43..54563f3fcba 100644
Binary files a/htdocs/theme/common/flags/kw.png and b/htdocs/theme/common/flags/kw.png differ
diff --git a/htdocs/theme/common/flags/ky.png b/htdocs/theme/common/flags/ky.png
index 58dc705b65c..bb8a5951c98 100644
Binary files a/htdocs/theme/common/flags/ky.png and b/htdocs/theme/common/flags/ky.png differ
diff --git a/htdocs/theme/common/flags/kz.png b/htdocs/theme/common/flags/kz.png
index 0650f2a6077..9c6c52e711b 100644
Binary files a/htdocs/theme/common/flags/kz.png and b/htdocs/theme/common/flags/kz.png differ
diff --git a/htdocs/theme/common/flags/la.png b/htdocs/theme/common/flags/la.png
index 3d52eac824f..7ef2a818c22 100644
Binary files a/htdocs/theme/common/flags/la.png and b/htdocs/theme/common/flags/la.png differ
diff --git a/htdocs/theme/common/flags/lb.png b/htdocs/theme/common/flags/lb.png
index 898fa7a5f28..ef128ece9bc 100644
Binary files a/htdocs/theme/common/flags/lb.png and b/htdocs/theme/common/flags/lb.png differ
diff --git a/htdocs/theme/common/flags/lc.png b/htdocs/theme/common/flags/lc.png
index 131b69ba594..aeb7734b46c 100644
Binary files a/htdocs/theme/common/flags/lc.png and b/htdocs/theme/common/flags/lc.png differ
diff --git a/htdocs/theme/common/flags/li.png b/htdocs/theme/common/flags/li.png
index 687387820c0..760d59ff16a 100644
Binary files a/htdocs/theme/common/flags/li.png and b/htdocs/theme/common/flags/li.png differ
diff --git a/htdocs/theme/common/flags/lk.png b/htdocs/theme/common/flags/lk.png
index 215ee75b7ab..70ef8bbf4f8 100644
Binary files a/htdocs/theme/common/flags/lk.png and b/htdocs/theme/common/flags/lk.png differ
diff --git a/htdocs/theme/common/flags/lr.png b/htdocs/theme/common/flags/lr.png
index 43a41a8be0c..b1565daaf36 100644
Binary files a/htdocs/theme/common/flags/lr.png and b/htdocs/theme/common/flags/lr.png differ
diff --git a/htdocs/theme/common/flags/ls.png b/htdocs/theme/common/flags/ls.png
index e8828871a95..4aba8078c7c 100644
Binary files a/htdocs/theme/common/flags/ls.png and b/htdocs/theme/common/flags/ls.png differ
diff --git a/htdocs/theme/common/flags/lt.png b/htdocs/theme/common/flags/lt.png
index 0f4afda156d..b860b3266a3 100644
Binary files a/htdocs/theme/common/flags/lt.png and b/htdocs/theme/common/flags/lt.png differ
diff --git a/htdocs/theme/common/flags/lu.png b/htdocs/theme/common/flags/lu.png
index a4cfd314bd1..1783986d89b 100644
Binary files a/htdocs/theme/common/flags/lu.png and b/htdocs/theme/common/flags/lu.png differ
diff --git a/htdocs/theme/common/flags/lv.png b/htdocs/theme/common/flags/lv.png
index 280b4bff48e..bab01cd56ee 100644
Binary files a/htdocs/theme/common/flags/lv.png and b/htdocs/theme/common/flags/lv.png differ
diff --git a/htdocs/theme/common/flags/ly.png b/htdocs/theme/common/flags/ly.png
index ed91ad6fc1a..1d41b58d1fc 100644
Binary files a/htdocs/theme/common/flags/ly.png and b/htdocs/theme/common/flags/ly.png differ
diff --git a/htdocs/theme/common/flags/ma.png b/htdocs/theme/common/flags/ma.png
index d5d71aae7af..6810c8cae99 100644
Binary files a/htdocs/theme/common/flags/ma.png and b/htdocs/theme/common/flags/ma.png differ
diff --git a/htdocs/theme/common/flags/mc.png b/htdocs/theme/common/flags/mc.png
index 754a3acda6c..e9bb93a4875 100644
Binary files a/htdocs/theme/common/flags/mc.png and b/htdocs/theme/common/flags/mc.png differ
diff --git a/htdocs/theme/common/flags/md.png b/htdocs/theme/common/flags/md.png
index 72dec4b5340..02d9213e80f 100644
Binary files a/htdocs/theme/common/flags/md.png and b/htdocs/theme/common/flags/md.png differ
diff --git a/htdocs/theme/common/flags/me.png b/htdocs/theme/common/flags/me.png
index 4f3e74798d8..c18f139dd3f 100644
Binary files a/htdocs/theme/common/flags/me.png and b/htdocs/theme/common/flags/me.png differ
diff --git a/htdocs/theme/common/flags/mg.png b/htdocs/theme/common/flags/mg.png
index cb9c48a2b89..78cb9f3cc4a 100644
Binary files a/htdocs/theme/common/flags/mg.png and b/htdocs/theme/common/flags/mg.png differ
diff --git a/htdocs/theme/common/flags/mh.png b/htdocs/theme/common/flags/mh.png
index 4fe396ed9db..ce403e71ace 100644
Binary files a/htdocs/theme/common/flags/mh.png and b/htdocs/theme/common/flags/mh.png differ
diff --git a/htdocs/theme/common/flags/mk.png b/htdocs/theme/common/flags/mk.png
index 364a3377a9b..ed39c018d6b 100644
Binary files a/htdocs/theme/common/flags/mk.png and b/htdocs/theme/common/flags/mk.png differ
diff --git a/htdocs/theme/common/flags/ml.png b/htdocs/theme/common/flags/ml.png
index 027f3ed87bb..7cb80193653 100644
Binary files a/htdocs/theme/common/flags/ml.png and b/htdocs/theme/common/flags/ml.png differ
diff --git a/htdocs/theme/common/flags/mm.png b/htdocs/theme/common/flags/mm.png
index 6ad72752246..4090ce6d415 100644
Binary files a/htdocs/theme/common/flags/mm.png and b/htdocs/theme/common/flags/mm.png differ
diff --git a/htdocs/theme/common/flags/mn.png b/htdocs/theme/common/flags/mn.png
index a10bca6842a..e269d46855a 100644
Binary files a/htdocs/theme/common/flags/mn.png and b/htdocs/theme/common/flags/mn.png differ
diff --git a/htdocs/theme/common/flags/mo.png b/htdocs/theme/common/flags/mo.png
index 17081b8409f..763679381a0 100644
Binary files a/htdocs/theme/common/flags/mo.png and b/htdocs/theme/common/flags/mo.png differ
diff --git a/htdocs/theme/common/flags/mp.png b/htdocs/theme/common/flags/mp.png
index 19a0e5997af..88617cf99f3 100644
Binary files a/htdocs/theme/common/flags/mp.png and b/htdocs/theme/common/flags/mp.png differ
diff --git a/htdocs/theme/common/flags/mq.png b/htdocs/theme/common/flags/mq.png
index 96e4bec7c69..5a29bce76fc 100644
Binary files a/htdocs/theme/common/flags/mq.png and b/htdocs/theme/common/flags/mq.png differ
diff --git a/htdocs/theme/common/flags/mr.png b/htdocs/theme/common/flags/mr.png
index 2fa59151823..93a112700e1 100644
Binary files a/htdocs/theme/common/flags/mr.png and b/htdocs/theme/common/flags/mr.png differ
diff --git a/htdocs/theme/common/flags/ms.png b/htdocs/theme/common/flags/ms.png
index 0d967bdf594..345517e651f 100644
Binary files a/htdocs/theme/common/flags/ms.png and b/htdocs/theme/common/flags/ms.png differ
diff --git a/htdocs/theme/common/flags/mt.png b/htdocs/theme/common/flags/mt.png
index 52bcbab4db6..4930eb53f04 100644
Binary files a/htdocs/theme/common/flags/mt.png and b/htdocs/theme/common/flags/mt.png differ
diff --git a/htdocs/theme/common/flags/mu.png b/htdocs/theme/common/flags/mu.png
index 99d33d8500f..b05690cd721 100644
Binary files a/htdocs/theme/common/flags/mu.png and b/htdocs/theme/common/flags/mu.png differ
diff --git a/htdocs/theme/common/flags/mv.png b/htdocs/theme/common/flags/mv.png
index bb7ef640590..35e7a5784d9 100644
Binary files a/htdocs/theme/common/flags/mv.png and b/htdocs/theme/common/flags/mv.png differ
diff --git a/htdocs/theme/common/flags/mw.png b/htdocs/theme/common/flags/mw.png
index 0f9dc992c51..57bd5392914 100644
Binary files a/htdocs/theme/common/flags/mw.png and b/htdocs/theme/common/flags/mw.png differ
diff --git a/htdocs/theme/common/flags/mx.png b/htdocs/theme/common/flags/mx.png
index ea5059d8045..fe2ca683808 100644
Binary files a/htdocs/theme/common/flags/mx.png and b/htdocs/theme/common/flags/mx.png differ
diff --git a/htdocs/theme/common/flags/my.png b/htdocs/theme/common/flags/my.png
index 72df8474f49..8c9798b6abf 100644
Binary files a/htdocs/theme/common/flags/my.png and b/htdocs/theme/common/flags/my.png differ
diff --git a/htdocs/theme/common/flags/mz.png b/htdocs/theme/common/flags/mz.png
index 4876c8e074d..9fb494db12c 100644
Binary files a/htdocs/theme/common/flags/mz.png and b/htdocs/theme/common/flags/mz.png differ
diff --git a/htdocs/theme/common/flags/na.png b/htdocs/theme/common/flags/na.png
index f3a1890677c..c669b82e8ad 100644
Binary files a/htdocs/theme/common/flags/na.png and b/htdocs/theme/common/flags/na.png differ
diff --git a/htdocs/theme/common/flags/nc.png b/htdocs/theme/common/flags/nc.png
index 7f81310f41f..08c9aa312e9 100644
Binary files a/htdocs/theme/common/flags/nc.png and b/htdocs/theme/common/flags/nc.png differ
diff --git a/htdocs/theme/common/flags/ne.png b/htdocs/theme/common/flags/ne.png
index 3f5617924dc..ddcbdb4b793 100644
Binary files a/htdocs/theme/common/flags/ne.png and b/htdocs/theme/common/flags/ne.png differ
diff --git a/htdocs/theme/common/flags/ng.png b/htdocs/theme/common/flags/ng.png
index 59ec1772181..7b7729ef3d9 100644
Binary files a/htdocs/theme/common/flags/ng.png and b/htdocs/theme/common/flags/ng.png differ
diff --git a/htdocs/theme/common/flags/ni.png b/htdocs/theme/common/flags/ni.png
index 3e920b91082..d1c3192f702 100644
Binary files a/htdocs/theme/common/flags/ni.png and b/htdocs/theme/common/flags/ni.png differ
diff --git a/htdocs/theme/common/flags/nl.png b/htdocs/theme/common/flags/nl.png
index f365be6be11..7f9853cb4ba 100644
Binary files a/htdocs/theme/common/flags/nl.png and b/htdocs/theme/common/flags/nl.png differ
diff --git a/htdocs/theme/common/flags/no.png b/htdocs/theme/common/flags/no.png
index 39d60859962..c403d06ad10 100644
Binary files a/htdocs/theme/common/flags/no.png and b/htdocs/theme/common/flags/no.png differ
diff --git a/htdocs/theme/common/flags/np.png b/htdocs/theme/common/flags/np.png
index d2cd336e162..7d92685c625 100644
Binary files a/htdocs/theme/common/flags/np.png and b/htdocs/theme/common/flags/np.png differ
diff --git a/htdocs/theme/common/flags/nr.png b/htdocs/theme/common/flags/nr.png
index 4c523b00df7..89fbe24351c 100644
Binary files a/htdocs/theme/common/flags/nr.png and b/htdocs/theme/common/flags/nr.png differ
diff --git a/htdocs/theme/common/flags/nu.png b/htdocs/theme/common/flags/nu.png
index 01033c2120c..0f828f60ebb 100644
Binary files a/htdocs/theme/common/flags/nu.png and b/htdocs/theme/common/flags/nu.png differ
diff --git a/htdocs/theme/common/flags/nz.png b/htdocs/theme/common/flags/nz.png
index dabc9c2c3e7..541fa4dbdf5 100644
Binary files a/htdocs/theme/common/flags/nz.png and b/htdocs/theme/common/flags/nz.png differ
diff --git a/htdocs/theme/common/flags/om.png b/htdocs/theme/common/flags/om.png
index f011fa926d7..fae4261a4b3 100644
Binary files a/htdocs/theme/common/flags/om.png and b/htdocs/theme/common/flags/om.png differ
diff --git a/htdocs/theme/common/flags/pa.png b/htdocs/theme/common/flags/pa.png
index d8d03b3c410..4c39c327769 100644
Binary files a/htdocs/theme/common/flags/pa.png and b/htdocs/theme/common/flags/pa.png differ
diff --git a/htdocs/theme/common/flags/pe.png b/htdocs/theme/common/flags/pe.png
index b8ed40cfd61..08ac2849712 100644
Binary files a/htdocs/theme/common/flags/pe.png and b/htdocs/theme/common/flags/pe.png differ
diff --git a/htdocs/theme/common/flags/pf.png b/htdocs/theme/common/flags/pf.png
index d755572a94e..01ef8ff1db9 100644
Binary files a/htdocs/theme/common/flags/pf.png and b/htdocs/theme/common/flags/pf.png differ
diff --git a/htdocs/theme/common/flags/pg.png b/htdocs/theme/common/flags/pg.png
index f5ad1eb5143..28e777d9a35 100644
Binary files a/htdocs/theme/common/flags/pg.png and b/htdocs/theme/common/flags/pg.png differ
diff --git a/htdocs/theme/common/flags/ph.png b/htdocs/theme/common/flags/ph.png
index 3ec1acd2896..758d91a3647 100644
Binary files a/htdocs/theme/common/flags/ph.png and b/htdocs/theme/common/flags/ph.png differ
diff --git a/htdocs/theme/common/flags/pk.png b/htdocs/theme/common/flags/pk.png
index 9456267e7e6..310cf364022 100644
Binary files a/htdocs/theme/common/flags/pk.png and b/htdocs/theme/common/flags/pk.png differ
diff --git a/htdocs/theme/common/flags/pl.png b/htdocs/theme/common/flags/pl.png
index a000601518e..96cb1aa144c 100644
Binary files a/htdocs/theme/common/flags/pl.png and b/htdocs/theme/common/flags/pl.png differ
diff --git a/htdocs/theme/common/flags/pm.png b/htdocs/theme/common/flags/pm.png
index 5b81562dfbf..dab08881a6c 100644
Binary files a/htdocs/theme/common/flags/pm.png and b/htdocs/theme/common/flags/pm.png differ
diff --git a/htdocs/theme/common/flags/pn.png b/htdocs/theme/common/flags/pn.png
index 26b0f457b7e..aec27da5bed 100644
Binary files a/htdocs/theme/common/flags/pn.png and b/htdocs/theme/common/flags/pn.png differ
diff --git a/htdocs/theme/common/flags/pr.png b/htdocs/theme/common/flags/pr.png
index 9bef175e714..28f866bd6e0 100644
Binary files a/htdocs/theme/common/flags/pr.png and b/htdocs/theme/common/flags/pr.png differ
diff --git a/htdocs/theme/common/flags/ps.png b/htdocs/theme/common/flags/ps.png
index bb7f2fdc1cb..4b7ea877118 100644
Binary files a/htdocs/theme/common/flags/ps.png and b/htdocs/theme/common/flags/ps.png differ
diff --git a/htdocs/theme/common/flags/pt.png b/htdocs/theme/common/flags/pt.png
index 6360b668a8c..1dbc37f1283 100644
Binary files a/htdocs/theme/common/flags/pt.png and b/htdocs/theme/common/flags/pt.png differ
diff --git a/htdocs/theme/common/flags/pw.png b/htdocs/theme/common/flags/pw.png
index 679709dc95e..a8df9403a9b 100644
Binary files a/htdocs/theme/common/flags/pw.png and b/htdocs/theme/common/flags/pw.png differ
diff --git a/htdocs/theme/common/flags/py.png b/htdocs/theme/common/flags/py.png
index 3c4fac78c3d..ac02fc5bc6e 100644
Binary files a/htdocs/theme/common/flags/py.png and b/htdocs/theme/common/flags/py.png differ
diff --git a/htdocs/theme/common/flags/qa.png b/htdocs/theme/common/flags/qa.png
index 3589176e875..e9c75e98be8 100644
Binary files a/htdocs/theme/common/flags/qa.png and b/htdocs/theme/common/flags/qa.png differ
diff --git a/htdocs/theme/common/flags/re.png b/htdocs/theme/common/flags/re.png
index c69762fc1d1..9bceb7c255f 100644
Binary files a/htdocs/theme/common/flags/re.png and b/htdocs/theme/common/flags/re.png differ
diff --git a/htdocs/theme/common/flags/ro.png b/htdocs/theme/common/flags/ro.png
index 86d99ff8bc0..d914fde33f1 100644
Binary files a/htdocs/theme/common/flags/ro.png and b/htdocs/theme/common/flags/ro.png differ
diff --git a/htdocs/theme/common/flags/rs.png b/htdocs/theme/common/flags/rs.png
index f43d6667e56..2284c686c37 100644
Binary files a/htdocs/theme/common/flags/rs.png and b/htdocs/theme/common/flags/rs.png differ
diff --git a/htdocs/theme/common/flags/ru.png b/htdocs/theme/common/flags/ru.png
index bdd68e3ee3d..5ab028885c1 100644
Binary files a/htdocs/theme/common/flags/ru.png and b/htdocs/theme/common/flags/ru.png differ
diff --git a/htdocs/theme/common/flags/rw.png b/htdocs/theme/common/flags/rw.png
index e1da81921b4..9fe4fde864d 100644
Binary files a/htdocs/theme/common/flags/rw.png and b/htdocs/theme/common/flags/rw.png differ
diff --git a/htdocs/theme/common/flags/sa.png b/htdocs/theme/common/flags/sa.png
index f8c924c9e82..a65b59e06a1 100644
Binary files a/htdocs/theme/common/flags/sa.png and b/htdocs/theme/common/flags/sa.png differ
diff --git a/htdocs/theme/common/flags/sb.png b/htdocs/theme/common/flags/sb.png
index d5f0386ebdc..43e8a46da8c 100644
Binary files a/htdocs/theme/common/flags/sb.png and b/htdocs/theme/common/flags/sb.png differ
diff --git a/htdocs/theme/common/flags/sc.png b/htdocs/theme/common/flags/sc.png
index c3a1ddf5665..e41bc222505 100644
Binary files a/htdocs/theme/common/flags/sc.png and b/htdocs/theme/common/flags/sc.png differ
diff --git a/htdocs/theme/common/flags/scotland.png b/htdocs/theme/common/flags/scotland.png
index cc808df9aef..31c6075c5b9 100644
Binary files a/htdocs/theme/common/flags/scotland.png and b/htdocs/theme/common/flags/scotland.png differ
diff --git a/htdocs/theme/common/flags/sd.png b/htdocs/theme/common/flags/sd.png
index 1935149bdd3..9770d0bbeb9 100644
Binary files a/htdocs/theme/common/flags/sd.png and b/htdocs/theme/common/flags/sd.png differ
diff --git a/htdocs/theme/common/flags/se.png b/htdocs/theme/common/flags/se.png
index fd800f1df4f..569fe949e23 100644
Binary files a/htdocs/theme/common/flags/se.png and b/htdocs/theme/common/flags/se.png differ
diff --git a/htdocs/theme/common/flags/sg.png b/htdocs/theme/common/flags/sg.png
index d71eba395b1..22240587ad3 100644
Binary files a/htdocs/theme/common/flags/sg.png and b/htdocs/theme/common/flags/sg.png differ
diff --git a/htdocs/theme/common/flags/sh.png b/htdocs/theme/common/flags/sh.png
index c8da953a71b..a4633de4fc5 100644
Binary files a/htdocs/theme/common/flags/sh.png and b/htdocs/theme/common/flags/sh.png differ
diff --git a/htdocs/theme/common/flags/si.png b/htdocs/theme/common/flags/si.png
index 14566c987de..a73dd8c2bc6 100644
Binary files a/htdocs/theme/common/flags/si.png and b/htdocs/theme/common/flags/si.png differ
diff --git a/htdocs/theme/common/flags/sj.png b/htdocs/theme/common/flags/sj.png
index 2a032e25df7..c403d06ad10 100644
Binary files a/htdocs/theme/common/flags/sj.png and b/htdocs/theme/common/flags/sj.png differ
diff --git a/htdocs/theme/common/flags/sk.png b/htdocs/theme/common/flags/sk.png
index acf3dbb312a..b1b99b04678 100644
Binary files a/htdocs/theme/common/flags/sk.png and b/htdocs/theme/common/flags/sk.png differ
diff --git a/htdocs/theme/common/flags/sl.png b/htdocs/theme/common/flags/sl.png
index c50b2795087..ed622b46045 100644
Binary files a/htdocs/theme/common/flags/sl.png and b/htdocs/theme/common/flags/sl.png differ
diff --git a/htdocs/theme/common/flags/sm.png b/htdocs/theme/common/flags/sm.png
index e4aebb22017..abaed46622b 100644
Binary files a/htdocs/theme/common/flags/sm.png and b/htdocs/theme/common/flags/sm.png differ
diff --git a/htdocs/theme/common/flags/sn.png b/htdocs/theme/common/flags/sn.png
index 525971f35fe..b8fe72eddfd 100644
Binary files a/htdocs/theme/common/flags/sn.png and b/htdocs/theme/common/flags/sn.png differ
diff --git a/htdocs/theme/common/flags/so.png b/htdocs/theme/common/flags/so.png
index 1dc6f40aa02..26e78bb0e32 100644
Binary files a/htdocs/theme/common/flags/so.png and b/htdocs/theme/common/flags/so.png differ
diff --git a/htdocs/theme/common/flags/sr.png b/htdocs/theme/common/flags/sr.png
index e13ee67f2e6..f838a8bb472 100644
Binary files a/htdocs/theme/common/flags/sr.png and b/htdocs/theme/common/flags/sr.png differ
diff --git a/htdocs/theme/common/flags/st.png b/htdocs/theme/common/flags/st.png
index 48a547a0f89..fa50b4301e9 100644
Binary files a/htdocs/theme/common/flags/st.png and b/htdocs/theme/common/flags/st.png differ
diff --git a/htdocs/theme/common/flags/sv.png b/htdocs/theme/common/flags/sv.png
index 924da6f465c..8604c1f5864 100644
Binary files a/htdocs/theme/common/flags/sv.png and b/htdocs/theme/common/flags/sv.png differ
diff --git a/htdocs/theme/common/flags/sy.png b/htdocs/theme/common/flags/sy.png
index a4caabc5bb3..0e5972c1a92 100644
Binary files a/htdocs/theme/common/flags/sy.png and b/htdocs/theme/common/flags/sy.png differ
diff --git a/htdocs/theme/common/flags/sz.png b/htdocs/theme/common/flags/sz.png
index 1f2a001ee6a..4e3f1fdb894 100644
Binary files a/htdocs/theme/common/flags/sz.png and b/htdocs/theme/common/flags/sz.png differ
diff --git a/htdocs/theme/common/flags/tc.png b/htdocs/theme/common/flags/tc.png
index 83fc10aa290..e7e9a0a18a0 100644
Binary files a/htdocs/theme/common/flags/tc.png and b/htdocs/theme/common/flags/tc.png differ
diff --git a/htdocs/theme/common/flags/td.png b/htdocs/theme/common/flags/td.png
index 153eeba1f2e..dec25350f52 100644
Binary files a/htdocs/theme/common/flags/td.png and b/htdocs/theme/common/flags/td.png differ
diff --git a/htdocs/theme/common/flags/tf.png b/htdocs/theme/common/flags/tf.png
index 27477209633..8106f7adac0 100644
Binary files a/htdocs/theme/common/flags/tf.png and b/htdocs/theme/common/flags/tf.png differ
diff --git a/htdocs/theme/common/flags/tg.png b/htdocs/theme/common/flags/tg.png
index f7e56dfd15c..aef3d9f2160 100644
Binary files a/htdocs/theme/common/flags/tg.png and b/htdocs/theme/common/flags/tg.png differ
diff --git a/htdocs/theme/common/flags/th.png b/htdocs/theme/common/flags/th.png
index 3f8a2881717..c0c7a6862a1 100644
Binary files a/htdocs/theme/common/flags/th.png and b/htdocs/theme/common/flags/th.png differ
diff --git a/htdocs/theme/common/flags/tj.png b/htdocs/theme/common/flags/tj.png
index 9f4c51f9180..2dc4a0d1c06 100644
Binary files a/htdocs/theme/common/flags/tj.png and b/htdocs/theme/common/flags/tj.png differ
diff --git a/htdocs/theme/common/flags/tk.png b/htdocs/theme/common/flags/tk.png
index e88b300b03d..218413dda9a 100644
Binary files a/htdocs/theme/common/flags/tk.png and b/htdocs/theme/common/flags/tk.png differ
diff --git a/htdocs/theme/common/flags/tl.png b/htdocs/theme/common/flags/tl.png
index de0e052e0d3..5644f94cb7b 100644
Binary files a/htdocs/theme/common/flags/tl.png and b/htdocs/theme/common/flags/tl.png differ
diff --git a/htdocs/theme/common/flags/tm.png b/htdocs/theme/common/flags/tm.png
index 48ce59a5d05..a9c6edbdea9 100644
Binary files a/htdocs/theme/common/flags/tm.png and b/htdocs/theme/common/flags/tm.png differ
diff --git a/htdocs/theme/common/flags/tn.png b/htdocs/theme/common/flags/tn.png
index 7c04f551291..cc727ab9caf 100644
Binary files a/htdocs/theme/common/flags/tn.png and b/htdocs/theme/common/flags/tn.png differ
diff --git a/htdocs/theme/common/flags/to.png b/htdocs/theme/common/flags/to.png
index 4df011126a8..6f5fe0482f5 100644
Binary files a/htdocs/theme/common/flags/to.png and b/htdocs/theme/common/flags/to.png differ
diff --git a/htdocs/theme/common/flags/tr.png b/htdocs/theme/common/flags/tr.png
index 65f8d79b85f..2031bed4dac 100644
Binary files a/htdocs/theme/common/flags/tr.png and b/htdocs/theme/common/flags/tr.png differ
diff --git a/htdocs/theme/common/flags/trans.png b/htdocs/theme/common/flags/trans.png
index f1013d8f8e6..e001b642ee8 100644
Binary files a/htdocs/theme/common/flags/trans.png and b/htdocs/theme/common/flags/trans.png differ
diff --git a/htdocs/theme/common/flags/tt.png b/htdocs/theme/common/flags/tt.png
index 4e18707a77e..d280e2c7f5d 100644
Binary files a/htdocs/theme/common/flags/tt.png and b/htdocs/theme/common/flags/tt.png differ
diff --git a/htdocs/theme/common/flags/tv.png b/htdocs/theme/common/flags/tv.png
index 2e9be7d53f2..4746c382843 100644
Binary files a/htdocs/theme/common/flags/tv.png and b/htdocs/theme/common/flags/tv.png differ
diff --git a/htdocs/theme/common/flags/tw.png b/htdocs/theme/common/flags/tw.png
index 310d7a90d6d..a99e1d04c5e 100644
Binary files a/htdocs/theme/common/flags/tw.png and b/htdocs/theme/common/flags/tw.png differ
diff --git a/htdocs/theme/common/flags/tz.png b/htdocs/theme/common/flags/tz.png
index dbbd00195a1..39a7d21dbe7 100644
Binary files a/htdocs/theme/common/flags/tz.png and b/htdocs/theme/common/flags/tz.png differ
diff --git a/htdocs/theme/common/flags/ua.png b/htdocs/theme/common/flags/ua.png
index 70eaac3a3cf..f544c6ec27e 100644
Binary files a/htdocs/theme/common/flags/ua.png and b/htdocs/theme/common/flags/ua.png differ
diff --git a/htdocs/theme/common/flags/ug.png b/htdocs/theme/common/flags/ug.png
index 6f08c4f4cca..2c1674828ef 100644
Binary files a/htdocs/theme/common/flags/ug.png and b/htdocs/theme/common/flags/ug.png differ
diff --git a/htdocs/theme/common/flags/uk.png b/htdocs/theme/common/flags/uk.png
index 8161f0727fa..025009e2045 100644
Binary files a/htdocs/theme/common/flags/uk.png and b/htdocs/theme/common/flags/uk.png differ
diff --git a/htdocs/theme/common/flags/um.png b/htdocs/theme/common/flags/um.png
index 30b7a177993..fd5ea83a9c5 100644
Binary files a/htdocs/theme/common/flags/um.png and b/htdocs/theme/common/flags/um.png differ
diff --git a/htdocs/theme/common/flags/us.png b/htdocs/theme/common/flags/us.png
index d508607184e..e6eeb28549e 100644
Binary files a/htdocs/theme/common/flags/us.png and b/htdocs/theme/common/flags/us.png differ
diff --git a/htdocs/theme/common/flags/uy.png b/htdocs/theme/common/flags/uy.png
index 7cb393c0460..45dd4d970b3 100644
Binary files a/htdocs/theme/common/flags/uy.png and b/htdocs/theme/common/flags/uy.png differ
diff --git a/htdocs/theme/common/flags/uz.png b/htdocs/theme/common/flags/uz.png
index 15772a3a1be..7735ae170e7 100644
Binary files a/htdocs/theme/common/flags/uz.png and b/htdocs/theme/common/flags/uz.png differ
diff --git a/htdocs/theme/common/flags/va.png b/htdocs/theme/common/flags/va.png
index 5068cf96360..2394c5ebf18 100644
Binary files a/htdocs/theme/common/flags/va.png and b/htdocs/theme/common/flags/va.png differ
diff --git a/htdocs/theme/common/flags/vc.png b/htdocs/theme/common/flags/vc.png
index 37c5a127d35..0e7806f989c 100644
Binary files a/htdocs/theme/common/flags/vc.png and b/htdocs/theme/common/flags/vc.png differ
diff --git a/htdocs/theme/common/flags/ve.png b/htdocs/theme/common/flags/ve.png
index 2371233789c..806d76b8997 100644
Binary files a/htdocs/theme/common/flags/ve.png and b/htdocs/theme/common/flags/ve.png differ
diff --git a/htdocs/theme/common/flags/vg.png b/htdocs/theme/common/flags/vg.png
index ca0ab404194..222f6b7d9bd 100644
Binary files a/htdocs/theme/common/flags/vg.png and b/htdocs/theme/common/flags/vg.png differ
diff --git a/htdocs/theme/common/flags/vi.png b/htdocs/theme/common/flags/vi.png
index 570f143f374..b5d4222764c 100644
Binary files a/htdocs/theme/common/flags/vi.png and b/htdocs/theme/common/flags/vi.png differ
diff --git a/htdocs/theme/common/flags/vn.png b/htdocs/theme/common/flags/vn.png
index fb751baa218..11b4ae710bb 100644
Binary files a/htdocs/theme/common/flags/vn.png and b/htdocs/theme/common/flags/vn.png differ
diff --git a/htdocs/theme/common/flags/vu.png b/htdocs/theme/common/flags/vu.png
index f6402874364..31aa37ec304 100644
Binary files a/htdocs/theme/common/flags/vu.png and b/htdocs/theme/common/flags/vu.png differ
diff --git a/htdocs/theme/common/flags/wales.png b/htdocs/theme/common/flags/wales.png
index b05cb3d595c..6b141e1d412 100644
Binary files a/htdocs/theme/common/flags/wales.png and b/htdocs/theme/common/flags/wales.png differ
diff --git a/htdocs/theme/common/flags/wf.png b/htdocs/theme/common/flags/wf.png
index 7576aff6efc..1c99bdcf71a 100644
Binary files a/htdocs/theme/common/flags/wf.png and b/htdocs/theme/common/flags/wf.png differ
diff --git a/htdocs/theme/common/flags/ws.png b/htdocs/theme/common/flags/ws.png
index 30ca42ba8b9..287482db540 100644
Binary files a/htdocs/theme/common/flags/ws.png and b/htdocs/theme/common/flags/ws.png differ
diff --git a/htdocs/theme/common/flags/ye.png b/htdocs/theme/common/flags/ye.png
index 5b36464d389..ede2401cf0a 100644
Binary files a/htdocs/theme/common/flags/ye.png and b/htdocs/theme/common/flags/ye.png differ
diff --git a/htdocs/theme/common/flags/yt.png b/htdocs/theme/common/flags/yt.png
index 3c1bc99da3f..fb9c3669c13 100644
Binary files a/htdocs/theme/common/flags/yt.png and b/htdocs/theme/common/flags/yt.png differ
diff --git a/htdocs/theme/common/flags/za.png b/htdocs/theme/common/flags/za.png
index 25607ebbe8e..070aec4cd57 100644
Binary files a/htdocs/theme/common/flags/za.png and b/htdocs/theme/common/flags/za.png differ
diff --git a/htdocs/theme/common/flags/zm.png b/htdocs/theme/common/flags/zm.png
index a9705c6f32d..bcce6de9380 100644
Binary files a/htdocs/theme/common/flags/zm.png and b/htdocs/theme/common/flags/zm.png differ
diff --git a/htdocs/theme/common/flags/zw.png b/htdocs/theme/common/flags/zw.png
index 11f9b917352..62d6988aaee 100644
Binary files a/htdocs/theme/common/flags/zw.png and b/htdocs/theme/common/flags/zw.png differ
diff --git a/htdocs/theme/common/folder-new.png b/htdocs/theme/common/folder-new.png
index fcd15c01849..fdeea131de2 100644
Binary files a/htdocs/theme/common/folder-new.png and b/htdocs/theme/common/folder-new.png differ
diff --git a/htdocs/theme/common/gmap.png b/htdocs/theme/common/gmap.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/help.png b/htdocs/theme/common/help.png
index 0f716f67711..12e6cd655d6 100644
Binary files a/htdocs/theme/common/help.png and b/htdocs/theme/common/help.png differ
diff --git a/htdocs/theme/common/index.html b/htdocs/theme/common/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/mime/archive.png b/htdocs/theme/common/mime/archive.png
index 6461fbc76e3..b15510e30dd 100644
Binary files a/htdocs/theme/common/mime/archive.png and b/htdocs/theme/common/mime/archive.png differ
diff --git a/htdocs/theme/common/mime/css.png b/htdocs/theme/common/mime/css.png
old mode 100755
new mode 100644
index 5c2881cb3b3..21398610778
Binary files a/htdocs/theme/common/mime/css.png and b/htdocs/theme/common/mime/css.png differ
diff --git a/htdocs/theme/common/mime/doc.png b/htdocs/theme/common/mime/doc.png
index 15c47fd7390..efb194dcfd2 100644
Binary files a/htdocs/theme/common/mime/doc.png and b/htdocs/theme/common/mime/doc.png differ
diff --git a/htdocs/theme/common/mime/dotnet.png b/htdocs/theme/common/mime/dotnet.png
old mode 100755
new mode 100644
index d1f9b3bb524..08ec78c2c17
Binary files a/htdocs/theme/common/mime/dotnet.png and b/htdocs/theme/common/mime/dotnet.png differ
diff --git a/htdocs/theme/common/mime/encrypt.png b/htdocs/theme/common/mime/encrypt.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/mime/flash.png b/htdocs/theme/common/mime/flash.png
index de944582b26..ac3b89e0aac 100644
Binary files a/htdocs/theme/common/mime/flash.png and b/htdocs/theme/common/mime/flash.png differ
diff --git a/htdocs/theme/common/mime/glasses.png b/htdocs/theme/common/mime/glasses.png
old mode 100755
new mode 100644
index 36224141277..be153e04d45
Binary files a/htdocs/theme/common/mime/glasses.png and b/htdocs/theme/common/mime/glasses.png differ
diff --git a/htdocs/theme/common/mime/html.png b/htdocs/theme/common/mime/html.png
index 318ff6f8d89..70b5e5a31af 100644
Binary files a/htdocs/theme/common/mime/html.png and b/htdocs/theme/common/mime/html.png differ
diff --git a/htdocs/theme/common/mime/image.png b/htdocs/theme/common/mime/image.png
index 076e61a1509..dbb1b823b10 100644
Binary files a/htdocs/theme/common/mime/image.png and b/htdocs/theme/common/mime/image.png differ
diff --git a/htdocs/theme/common/mime/index.html b/htdocs/theme/common/mime/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/mime/jnlp.png b/htdocs/theme/common/mime/jnlp.png
old mode 100755
new mode 100644
index 2b36ee032e9..d53b7d0cdc7
Binary files a/htdocs/theme/common/mime/jnlp.png and b/htdocs/theme/common/mime/jnlp.png differ
diff --git a/htdocs/theme/common/mime/jscript.png b/htdocs/theme/common/mime/jscript.png
index 416e505775e..af8f13ccc12 100644
Binary files a/htdocs/theme/common/mime/jscript.png and b/htdocs/theme/common/mime/jscript.png differ
diff --git a/htdocs/theme/common/mime/library.png b/htdocs/theme/common/mime/library.png
old mode 100755
new mode 100644
index 05aad8e1515..25f1df113ed
Binary files a/htdocs/theme/common/mime/library.png and b/htdocs/theme/common/mime/library.png differ
diff --git a/htdocs/theme/common/mime/lit.png b/htdocs/theme/common/mime/lit.png
old mode 100755
new mode 100644
index 88ae1fee882..4804e9fbffa
Binary files a/htdocs/theme/common/mime/lit.png and b/htdocs/theme/common/mime/lit.png differ
diff --git a/htdocs/theme/common/mime/mdb.png b/htdocs/theme/common/mime/mdb.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/mime/notavailable.png b/htdocs/theme/common/mime/notavailable.png
index 05ff3180a72..b1a4d2e47ac 100644
Binary files a/htdocs/theme/common/mime/notavailable.png and b/htdocs/theme/common/mime/notavailable.png differ
diff --git a/htdocs/theme/common/mime/ooffice.png b/htdocs/theme/common/mime/ooffice.png
old mode 100755
new mode 100644
index f10e8b49b5d..d5080edc26c
Binary files a/htdocs/theme/common/mime/ooffice.png and b/htdocs/theme/common/mime/ooffice.png differ
diff --git a/htdocs/theme/common/mime/other.png b/htdocs/theme/common/mime/other.png
index edc21d6d8a2..6256a7fc753 100644
Binary files a/htdocs/theme/common/mime/other.png and b/htdocs/theme/common/mime/other.png differ
diff --git a/htdocs/theme/common/mime/page.png b/htdocs/theme/common/mime/page.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/mime/pdf.png b/htdocs/theme/common/mime/pdf.png
index 9d9e0341d65..8c234ade6d5 100644
Binary files a/htdocs/theme/common/mime/pdf.png and b/htdocs/theme/common/mime/pdf.png differ
diff --git a/htdocs/theme/common/mime/pl.png b/htdocs/theme/common/mime/pl.png
index 95deeffb138..c8460bb2a03 100644
Binary files a/htdocs/theme/common/mime/pl.png and b/htdocs/theme/common/mime/pl.png differ
diff --git a/htdocs/theme/common/mime/ppt.png b/htdocs/theme/common/mime/ppt.png
index 44a9407290e..71a41fa4559 100644
Binary files a/htdocs/theme/common/mime/ppt.png and b/htdocs/theme/common/mime/ppt.png differ
diff --git a/htdocs/theme/common/mime/rss.png b/htdocs/theme/common/mime/rss.png
old mode 100755
new mode 100644
index 4403674b8f1..6ef8b252969
Binary files a/htdocs/theme/common/mime/rss.png and b/htdocs/theme/common/mime/rss.png differ
diff --git a/htdocs/theme/common/mime/script.png b/htdocs/theme/common/mime/script.png
index 991d7aef1ec..161f7707816 100644
Binary files a/htdocs/theme/common/mime/script.png and b/htdocs/theme/common/mime/script.png differ
diff --git a/htdocs/theme/common/mime/svg.png b/htdocs/theme/common/mime/svg.png
index d98de4c5301..6c627890259 100644
Binary files a/htdocs/theme/common/mime/svg.png and b/htdocs/theme/common/mime/svg.png differ
diff --git a/htdocs/theme/common/mime/text.png b/htdocs/theme/common/mime/text.png
index 72a36218af4..cbefa2a14dc 100644
Binary files a/htdocs/theme/common/mime/text.png and b/htdocs/theme/common/mime/text.png differ
diff --git a/htdocs/theme/common/mime/ttf.png b/htdocs/theme/common/mime/ttf.png
index f3cc58c2a3c..4c258eb0b99 100644
Binary files a/htdocs/theme/common/mime/ttf.png and b/htdocs/theme/common/mime/ttf.png differ
diff --git a/htdocs/theme/common/mime/xls.png b/htdocs/theme/common/mime/xls.png
index 27f53be8f31..211ab0b0904 100644
Binary files a/htdocs/theme/common/mime/xls.png and b/htdocs/theme/common/mime/xls.png differ
diff --git a/htdocs/theme/common/nophoto.jpg b/htdocs/theme/common/nophoto.jpg
index 7e2872a1aff..14eeb1cf01f 100644
Binary files a/htdocs/theme/common/nophoto.jpg and b/htdocs/theme/common/nophoto.jpg differ
diff --git a/htdocs/theme/common/paypal.png b/htdocs/theme/common/paypal.png
index 523ee9dcf78..d5705c8bbb9 100644
Binary files a/htdocs/theme/common/paypal.png and b/htdocs/theme/common/paypal.png differ
diff --git a/htdocs/theme/common/redstar.png b/htdocs/theme/common/redstar.png
index 001cde58667..486fd6770a2 100644
Binary files a/htdocs/theme/common/redstar.png and b/htdocs/theme/common/redstar.png differ
diff --git a/htdocs/theme/common/skype_callbutton.png b/htdocs/theme/common/skype_callbutton.png
index 79ee7963fc4..dd76442627a 100644
Binary files a/htdocs/theme/common/skype_callbutton.png and b/htdocs/theme/common/skype_callbutton.png differ
diff --git a/htdocs/theme/common/skype_chatbutton.png b/htdocs/theme/common/skype_chatbutton.png
index 788c31fec21..750b49fa221 100644
Binary files a/htdocs/theme/common/skype_chatbutton.png and b/htdocs/theme/common/skype_chatbutton.png differ
diff --git a/htdocs/theme/common/transform-crop-and-resize.png b/htdocs/theme/common/transform-crop-and-resize.png
index 8cef80a232d..72512db6cd7 100644
Binary files a/htdocs/theme/common/transform-crop-and-resize.png and b/htdocs/theme/common/transform-crop-and-resize.png differ
diff --git a/htdocs/theme/common/treemenu/folder2-expanded.png b/htdocs/theme/common/treemenu/folder2-expanded.png
old mode 100755
new mode 100644
index 4e3548352fc..21b1cda2363
Binary files a/htdocs/theme/common/treemenu/folder2-expanded.png and b/htdocs/theme/common/treemenu/folder2-expanded.png differ
diff --git a/htdocs/theme/common/treemenu/folder2.png b/htdocs/theme/common/treemenu/folder2.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/treemenu/index.html b/htdocs/theme/common/treemenu/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/view-refresh.png b/htdocs/theme/common/view-refresh.png
index 606ea9eba46..d5e3dbd4782 100644
Binary files a/htdocs/theme/common/view-refresh.png and b/htdocs/theme/common/view-refresh.png differ
diff --git a/htdocs/theme/common/weather/index.html b/htdocs/theme/common/weather/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/common/weather/weather-clear-night.png b/htdocs/theme/common/weather/weather-clear-night.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-clear.png b/htdocs/theme/common/weather/weather-clear.png
old mode 100755
new mode 100644
index b7cc930c761..8b5c71297be
Binary files a/htdocs/theme/common/weather/weather-clear.png and b/htdocs/theme/common/weather/weather-clear.png differ
diff --git a/htdocs/theme/common/weather/weather-clouds-night.png b/htdocs/theme/common/weather/weather-clouds-night.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-clouds.png b/htdocs/theme/common/weather/weather-clouds.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-few-clouds-night.png b/htdocs/theme/common/weather/weather-few-clouds-night.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-few-clouds.png b/htdocs/theme/common/weather/weather-few-clouds.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-freezing-rain.png b/htdocs/theme/common/weather/weather-freezing-rain.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-hail.png b/htdocs/theme/common/weather/weather-hail.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-many-clouds.png b/htdocs/theme/common/weather/weather-many-clouds.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-mist.png b/htdocs/theme/common/weather/weather-mist.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-showers-day.png b/htdocs/theme/common/weather/weather-showers-day.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-showers-night.png b/htdocs/theme/common/weather/weather-showers-night.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-showers-scattered-day.png b/htdocs/theme/common/weather/weather-showers-scattered-day.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-showers-scattered-night.png b/htdocs/theme/common/weather/weather-showers-scattered-night.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-showers-scattered.png b/htdocs/theme/common/weather/weather-showers-scattered.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-showers.png b/htdocs/theme/common/weather/weather-showers.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-snow-rain.png b/htdocs/theme/common/weather/weather-snow-rain.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-snow-scattered-day.png b/htdocs/theme/common/weather/weather-snow-scattered-day.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-snow-scattered-night.png b/htdocs/theme/common/weather/weather-snow-scattered-night.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-snow-scattered.png b/htdocs/theme/common/weather/weather-snow-scattered.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-snow.png b/htdocs/theme/common/weather/weather-snow.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-storm-day.png b/htdocs/theme/common/weather/weather-storm-day.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-storm-night.png b/htdocs/theme/common/weather/weather-storm-night.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/common/weather/weather-storm.png b/htdocs/theme/common/weather/weather-storm.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/dolibarr.png b/htdocs/theme/dolibarr.png
old mode 100755
new mode 100644
index dbac590012f..691fc3d68a9
Binary files a/htdocs/theme/dolibarr.png and b/htdocs/theme/dolibarr.png differ
diff --git a/htdocs/theme/dolibarr_logo.png b/htdocs/theme/dolibarr_logo.png
old mode 100755
new mode 100644
index 5c361732926..3ee46b51553
Binary files a/htdocs/theme/dolibarr_logo.png and b/htdocs/theme/dolibarr_logo.png differ
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/doliforge_logo.png b/htdocs/theme/doliforge_logo.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/dolistore_logo.png b/htdocs/theme/dolistore_logo.png
old mode 100755
new mode 100644
index 76ff5ac1535..38642add7b5
Binary files a/htdocs/theme/dolistore_logo.png and b/htdocs/theme/dolistore_logo.png differ
diff --git a/htdocs/theme/eldy/.gitignore b/htdocs/theme/eldy/.gitignore
new file mode 100644
index 00000000000..134509791a9
--- /dev/null
+++ b/htdocs/theme/eldy/.gitignore
@@ -0,0 +1 @@
+/*.new
diff --git a/htdocs/theme/eldy/ckeditor/index.html b/htdocs/theme/eldy/ckeditor/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/eldy/img/1downarrow.png b/htdocs/theme/eldy/img/1downarrow.png
index d61271211de..1d134ab3e4e 100644
Binary files a/htdocs/theme/eldy/img/1downarrow.png and b/htdocs/theme/eldy/img/1downarrow.png differ
diff --git a/htdocs/theme/eldy/img/1leftarrow.png b/htdocs/theme/eldy/img/1leftarrow.png
index 123d94357ce..554cdc3d76c 100644
Binary files a/htdocs/theme/eldy/img/1leftarrow.png and b/htdocs/theme/eldy/img/1leftarrow.png differ
diff --git a/htdocs/theme/eldy/img/1leftarrow_selected.png b/htdocs/theme/eldy/img/1leftarrow_selected.png
index 123d94357ce..554cdc3d76c 100644
Binary files a/htdocs/theme/eldy/img/1leftarrow_selected.png and b/htdocs/theme/eldy/img/1leftarrow_selected.png differ
diff --git a/htdocs/theme/eldy/img/1rightarrow.png b/htdocs/theme/eldy/img/1rightarrow.png
index 06559cea65f..95fdc377ee9 100644
Binary files a/htdocs/theme/eldy/img/1rightarrow.png and b/htdocs/theme/eldy/img/1rightarrow.png differ
diff --git a/htdocs/theme/eldy/img/1rightarrow_selected.png b/htdocs/theme/eldy/img/1rightarrow_selected.png
index 06559cea65f..95fdc377ee9 100644
Binary files a/htdocs/theme/eldy/img/1rightarrow_selected.png and b/htdocs/theme/eldy/img/1rightarrow_selected.png differ
diff --git a/htdocs/theme/eldy/img/1uparrow.png b/htdocs/theme/eldy/img/1uparrow.png
index b40cb15977a..70ea061dc5e 100644
Binary files a/htdocs/theme/eldy/img/1uparrow.png and b/htdocs/theme/eldy/img/1uparrow.png differ
diff --git a/htdocs/theme/eldy/img/1updownarrow.png b/htdocs/theme/eldy/img/1updownarrow.png
index fd5e5801aea..871ac1c1f29 100644
Binary files a/htdocs/theme/eldy/img/1updownarrow.png and b/htdocs/theme/eldy/img/1updownarrow.png differ
diff --git a/htdocs/theme/eldy/img/addfile.png b/htdocs/theme/eldy/img/addfile.png
index 3bfa627d758..1cb7af0ad8a 100644
Binary files a/htdocs/theme/eldy/img/addfile.png and b/htdocs/theme/eldy/img/addfile.png differ
diff --git a/htdocs/theme/eldy/img/background.png b/htdocs/theme/eldy/img/background.png
new file mode 100644
index 00000000000..fb63f12299c
Binary files /dev/null and b/htdocs/theme/eldy/img/background.png differ
diff --git a/htdocs/theme/eldy/img/bg-bas-rubrique.png b/htdocs/theme/eldy/img/bg-bas-rubrique.png
index bb1e5ecd0a5..af8483f8746 100644
Binary files a/htdocs/theme/eldy/img/bg-bas-rubrique.png and b/htdocs/theme/eldy/img/bg-bas-rubrique.png differ
diff --git a/htdocs/theme/eldy/img/bg-rubrique.png b/htdocs/theme/eldy/img/bg-rubrique.png
index 1678c8536fb..0eb3cc2603c 100644
Binary files a/htdocs/theme/eldy/img/bg-rubrique.png and b/htdocs/theme/eldy/img/bg-rubrique.png differ
diff --git a/htdocs/theme/eldy/img/bg-titre-rubrique.png b/htdocs/theme/eldy/img/bg-titre-rubrique.png
index c0091701b16..17b35d88823 100644
Binary files a/htdocs/theme/eldy/img/bg-titre-rubrique.png and b/htdocs/theme/eldy/img/bg-titre-rubrique.png differ
diff --git a/htdocs/theme/eldy/img/button_edit.png b/htdocs/theme/eldy/img/button_edit.png
index ce8b226710b..894b4cfd78e 100644
Binary files a/htdocs/theme/eldy/img/button_edit.png and b/htdocs/theme/eldy/img/button_edit.png differ
diff --git a/htdocs/theme/eldy/img/calc.png b/htdocs/theme/eldy/img/calc.png
index d3bd2bbc824..5e6471408d8 100644
Binary files a/htdocs/theme/eldy/img/calc.png and b/htdocs/theme/eldy/img/calc.png differ
diff --git a/htdocs/theme/eldy/img/calendar.png b/htdocs/theme/eldy/img/calendar.png
index 90829a353c3..bbe6c27f041 100644
Binary files a/htdocs/theme/eldy/img/calendar.png and b/htdocs/theme/eldy/img/calendar.png differ
diff --git a/htdocs/theme/eldy/img/call.png b/htdocs/theme/eldy/img/call.png
index 8315c57d61d..ddfc1b7bd90 100644
Binary files a/htdocs/theme/eldy/img/call.png and b/htdocs/theme/eldy/img/call.png differ
diff --git a/htdocs/theme/eldy/img/call_out.png b/htdocs/theme/eldy/img/call_out.png
index bf972d8b1ae..b5a22eb827b 100644
Binary files a/htdocs/theme/eldy/img/call_out.png and b/htdocs/theme/eldy/img/call_out.png differ
diff --git a/htdocs/theme/eldy/img/close.png b/htdocs/theme/eldy/img/close.png
index aacac9fc423..ec4338e8bca 100644
Binary files a/htdocs/theme/eldy/img/close.png and b/htdocs/theme/eldy/img/close.png differ
diff --git a/htdocs/theme/eldy/img/close_title.png b/htdocs/theme/eldy/img/close_title.png
index 24eda772954..bebb74d9861 100644
Binary files a/htdocs/theme/eldy/img/close_title.png and b/htdocs/theme/eldy/img/close_title.png differ
diff --git a/htdocs/theme/eldy/img/delete.png b/htdocs/theme/eldy/img/delete.png
index 221cd3c76b9..8ad73597be7 100644
Binary files a/htdocs/theme/eldy/img/delete.png and b/htdocs/theme/eldy/img/delete.png differ
diff --git a/htdocs/theme/eldy/img/detail.png b/htdocs/theme/eldy/img/detail.png
index 2d31ec2202e..05562bef842 100644
Binary files a/htdocs/theme/eldy/img/detail.png and b/htdocs/theme/eldy/img/detail.png differ
diff --git a/htdocs/theme/eldy/img/disable.png b/htdocs/theme/eldy/img/disable.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/eldy/img/disable.png and b/htdocs/theme/eldy/img/disable.png differ
diff --git a/htdocs/theme/eldy/img/edit.png b/htdocs/theme/eldy/img/edit.png
index d5ef04577cc..4e916fe1fb0 100644
Binary files a/htdocs/theme/eldy/img/edit.png and b/htdocs/theme/eldy/img/edit.png differ
diff --git a/htdocs/theme/eldy/img/edit_add.png b/htdocs/theme/eldy/img/edit_add.png
index f6e67164208..ae205e9d770 100644
Binary files a/htdocs/theme/eldy/img/edit_add.png and b/htdocs/theme/eldy/img/edit_add.png differ
diff --git a/htdocs/theme/eldy/img/edit_remove.png b/htdocs/theme/eldy/img/edit_remove.png
index 0c7ca54fa1f..bc4bdb360fa 100644
Binary files a/htdocs/theme/eldy/img/edit_remove.png and b/htdocs/theme/eldy/img/edit_remove.png differ
diff --git a/htdocs/theme/eldy/img/editdelete.png b/htdocs/theme/eldy/img/editdelete.png
index 6abca6e2acb..f8c84994d47 100644
Binary files a/htdocs/theme/eldy/img/editdelete.png and b/htdocs/theme/eldy/img/editdelete.png differ
diff --git a/htdocs/theme/eldy/img/file.png b/htdocs/theme/eldy/img/file.png
index 98bc98d2f1f..73c66e9b2b3 100644
Binary files a/htdocs/theme/eldy/img/file.png and b/htdocs/theme/eldy/img/file.png differ
diff --git a/htdocs/theme/eldy/img/filenew.png b/htdocs/theme/eldy/img/filenew.png
index 1f6581389d1..8680cce82bf 100644
Binary files a/htdocs/theme/eldy/img/filenew.png and b/htdocs/theme/eldy/img/filenew.png differ
diff --git a/htdocs/theme/eldy/img/filter.png b/htdocs/theme/eldy/img/filter.png
index 4baa3a3be8e..917715107bd 100644
Binary files a/htdocs/theme/eldy/img/filter.png and b/htdocs/theme/eldy/img/filter.png differ
diff --git a/htdocs/theme/eldy/img/folder-open.png b/htdocs/theme/eldy/img/folder-open.png
index 1687cd1b536..1db8369b3d5 100644
Binary files a/htdocs/theme/eldy/img/folder-open.png and b/htdocs/theme/eldy/img/folder-open.png differ
diff --git a/htdocs/theme/eldy/img/folder.png b/htdocs/theme/eldy/img/folder.png
index 908a6df9348..04a24af2e22 100644
Binary files a/htdocs/theme/eldy/img/folder.png and b/htdocs/theme/eldy/img/folder.png differ
diff --git a/htdocs/theme/eldy/img/grip.png b/htdocs/theme/eldy/img/grip.png
index 216e51ca8f0..8053007e9dd 100644
Binary files a/htdocs/theme/eldy/img/grip.png and b/htdocs/theme/eldy/img/grip.png differ
diff --git a/htdocs/theme/eldy/img/grip_title.png b/htdocs/theme/eldy/img/grip_title.png
index 9b3c093c790..d6ecce335cb 100644
Binary files a/htdocs/theme/eldy/img/grip_title.png and b/htdocs/theme/eldy/img/grip_title.png differ
diff --git a/htdocs/theme/eldy/img/headbg.jpg b/htdocs/theme/eldy/img/headbg.jpg
index 7d1374e1fc9..160821354cc 100644
Binary files a/htdocs/theme/eldy/img/headbg.jpg and b/htdocs/theme/eldy/img/headbg.jpg differ
diff --git a/htdocs/theme/eldy/img/headbg2.jpg b/htdocs/theme/eldy/img/headbg2.jpg
index 7917abd9c07..0bc44f0ea99 100644
Binary files a/htdocs/theme/eldy/img/headbg2.jpg and b/htdocs/theme/eldy/img/headbg2.jpg differ
diff --git a/htdocs/theme/eldy/img/help.png b/htdocs/theme/eldy/img/help.png
index 0f716f67711..12e6cd655d6 100644
Binary files a/htdocs/theme/eldy/img/help.png and b/htdocs/theme/eldy/img/help.png differ
diff --git a/htdocs/theme/eldy/img/high.png b/htdocs/theme/eldy/img/high.png
index f893de7abf3..c0eaee6542f 100644
Binary files a/htdocs/theme/eldy/img/high.png and b/htdocs/theme/eldy/img/high.png differ
diff --git a/htdocs/theme/eldy/img/history.png b/htdocs/theme/eldy/img/history.png
index 932921c1f4c..0fa4283476b 100644
Binary files a/htdocs/theme/eldy/img/history.png and b/htdocs/theme/eldy/img/history.png differ
diff --git a/htdocs/theme/eldy/img/index.html b/htdocs/theme/eldy/img/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/eldy/img/info.png b/htdocs/theme/eldy/img/info.png
index 0f716f67711..12e6cd655d6 100644
Binary files a/htdocs/theme/eldy/img/info.png and b/htdocs/theme/eldy/img/info.png differ
diff --git a/htdocs/theme/eldy/img/liste_titre.png b/htdocs/theme/eldy/img/liste_titre.png
index 7405550c080..a58ee63e1b6 100644
Binary files a/htdocs/theme/eldy/img/liste_titre.png and b/htdocs/theme/eldy/img/liste_titre.png differ
diff --git a/htdocs/theme/eldy/img/liste_titre2.png b/htdocs/theme/eldy/img/liste_titre2.png
old mode 100755
new mode 100644
diff --git a/htdocs/theme/eldy/img/lock.png b/htdocs/theme/eldy/img/lock.png
index 8c2e2cbdb09..3d99cf1eaef 100644
Binary files a/htdocs/theme/eldy/img/lock.png and b/htdocs/theme/eldy/img/lock.png differ
diff --git a/htdocs/theme/eldy/img/login_background.png b/htdocs/theme/eldy/img/login_background.png
index b264649fcbc..facc2c6f442 100644
Binary files a/htdocs/theme/eldy/img/login_background.png and b/htdocs/theme/eldy/img/login_background.png differ
diff --git a/htdocs/theme/eldy/img/menus/agenda.png b/htdocs/theme/eldy/img/menus/agenda.png
index 2bea3152a10..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 225df251041..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 e520f7eb71e..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 73fef8ae4c8..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 d3ed4fa89b3..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 27b653d93ba..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 eec3240070b..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/index.html b/htdocs/theme/eldy/img/menus/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/eldy/img/menus/mail.png b/htdocs/theme/eldy/img/menus/mail.png
index 0877bf47cba..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 5bc0f86b4be..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
index 5b39ee81ea3..fab7db59040 100644
Binary files a/htdocs/theme/eldy/img/menus/shop.png 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/menutab-r.png b/htdocs/theme/eldy/img/menutab-r.png
index d841ad40d19..95c2324b612 100644
Binary files a/htdocs/theme/eldy/img/menutab-r.png and b/htdocs/theme/eldy/img/menutab-r.png differ
diff --git a/htdocs/theme/eldy/img/nav-overlay.png b/htdocs/theme/eldy/img/nav-overlay.png
index 595f026cc24..82d159c6ec0 100644
Binary files a/htdocs/theme/eldy/img/nav-overlay.png and b/htdocs/theme/eldy/img/nav-overlay.png differ
diff --git a/htdocs/theme/eldy/img/nav-overlay3.png b/htdocs/theme/eldy/img/nav-overlay3.png
index f252f5f51a5..3d73145dab7 100644
Binary files a/htdocs/theme/eldy/img/nav-overlay3.png and b/htdocs/theme/eldy/img/nav-overlay3.png differ
diff --git a/htdocs/theme/eldy/img/object_accounting.png b/htdocs/theme/eldy/img/object_accounting.png
new file mode 100644
index 00000000000..b5600221f02
Binary files /dev/null and b/htdocs/theme/eldy/img/object_accounting.png differ
diff --git a/htdocs/theme/eldy/img/object_action.png b/htdocs/theme/eldy/img/object_action.png
index dd356305161..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_action_rdv.png b/htdocs/theme/eldy/img/object_action_rdv.png
index b892da1f655..25edfa85b45 100644
Binary files a/htdocs/theme/eldy/img/object_action_rdv.png and b/htdocs/theme/eldy/img/object_action_rdv.png differ
diff --git a/htdocs/theme/eldy/img/object_address.png b/htdocs/theme/eldy/img/object_address.png
index b20734da69a..a4b878966dc 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_barcode.png b/htdocs/theme/eldy/img/object_barcode.png
index 83d3e1ae993..6f1931ab96c 100644
Binary files a/htdocs/theme/eldy/img/object_barcode.png and b/htdocs/theme/eldy/img/object_barcode.png differ
diff --git a/htdocs/theme/eldy/img/object_billd.png b/htdocs/theme/eldy/img/object_billd.png
index 3c7443cba3e..2080958f0fb 100644
Binary files a/htdocs/theme/eldy/img/object_billd.png and b/htdocs/theme/eldy/img/object_billd.png differ
diff --git a/htdocs/theme/eldy/img/object_billr.png b/htdocs/theme/eldy/img/object_billr.png
index c89098beaa5..7a9692a0804 100644
Binary files a/htdocs/theme/eldy/img/object_billr.png and b/htdocs/theme/eldy/img/object_billr.png differ
diff --git a/htdocs/theme/eldy/img/object_book.png b/htdocs/theme/eldy/img/object_book.png
index 67f6b06467d..85097420728 100644
Binary files a/htdocs/theme/eldy/img/object_book.png and b/htdocs/theme/eldy/img/object_book.png differ
diff --git a/htdocs/theme/eldy/img/object_calendarperuser.png b/htdocs/theme/eldy/img/object_calendarperuser.png
new file mode 100644
index 00000000000..ba16a4ab6c0
Binary files /dev/null and b/htdocs/theme/eldy/img/object_calendarperuser.png differ
diff --git a/htdocs/theme/eldy/img/object_commercial.png b/htdocs/theme/eldy/img/object_commercial.png
index 5f11e40a81f..36cdcc8d4a2 100644
Binary files a/htdocs/theme/eldy/img/object_commercial.png and b/htdocs/theme/eldy/img/object_commercial.png differ
diff --git a/htdocs/theme/eldy/img/object_contact_all.png b/htdocs/theme/eldy/img/object_contact_all.png
index 966f6e05cfa..f571504b246 100644
Binary files a/htdocs/theme/eldy/img/object_contact_all.png and b/htdocs/theme/eldy/img/object_contact_all.png differ
diff --git a/htdocs/theme/eldy/img/object_cron.png b/htdocs/theme/eldy/img/object_cron.png
index b929050598d..6186d18da70 100644
Binary files a/htdocs/theme/eldy/img/object_cron.png and b/htdocs/theme/eldy/img/object_cron.png differ
diff --git a/htdocs/theme/eldy/img/object_email.png b/htdocs/theme/eldy/img/object_email.png
index 9246f5cef24..d5cd141733d 100644
Binary files a/htdocs/theme/eldy/img/object_email.png and b/htdocs/theme/eldy/img/object_email.png differ
diff --git a/htdocs/theme/eldy/img/object_generic.png b/htdocs/theme/eldy/img/object_generic.png
index 4d5f811a891..ccfd2d2f5b2 100644
Binary files a/htdocs/theme/eldy/img/object_generic.png and b/htdocs/theme/eldy/img/object_generic.png differ
diff --git a/htdocs/theme/eldy/img/object_globe.png b/htdocs/theme/eldy/img/object_globe.png
index f726f8a705e..aae8bf6eba0 100644
Binary files a/htdocs/theme/eldy/img/object_globe.png and b/htdocs/theme/eldy/img/object_globe.png differ
diff --git a/htdocs/theme/eldy/img/object_group.png b/htdocs/theme/eldy/img/object_group.png
index f69db27d482..552eb39fa31 100644
Binary files a/htdocs/theme/eldy/img/object_group.png and b/htdocs/theme/eldy/img/object_group.png differ
diff --git a/htdocs/theme/eldy/img/object_holiday.png b/htdocs/theme/eldy/img/object_holiday.png
index 69ccdb279a5..fdc1dd8e22b 100644
Binary files a/htdocs/theme/eldy/img/object_holiday.png and b/htdocs/theme/eldy/img/object_holiday.png differ
diff --git a/htdocs/theme/eldy/img/object_label.png b/htdocs/theme/eldy/img/object_label.png
index 75a363ec8d5..b112af5cf0a 100644
Binary files a/htdocs/theme/eldy/img/object_label.png and b/htdocs/theme/eldy/img/object_label.png differ
diff --git a/htdocs/theme/eldy/img/object_margin.png b/htdocs/theme/eldy/img/object_margin.png
index 13e4b92c9ce..cd0eb4109f7 100644
Binary files a/htdocs/theme/eldy/img/object_margin.png and b/htdocs/theme/eldy/img/object_margin.png differ
diff --git a/htdocs/theme/eldy/img/object_opensurvey.png b/htdocs/theme/eldy/img/object_opensurvey.png
old mode 100755
new mode 100644
index 042d8217257..b5de3223bd4
Binary files a/htdocs/theme/eldy/img/object_opensurvey.png and b/htdocs/theme/eldy/img/object_opensurvey.png differ
diff --git a/htdocs/theme/eldy/img/object_payment.png b/htdocs/theme/eldy/img/object_payment.png
index 95f4c29ed2f..5691147d8ff 100644
Binary files a/htdocs/theme/eldy/img/object_payment.png and b/htdocs/theme/eldy/img/object_payment.png differ
diff --git a/htdocs/theme/eldy/img/object_phoning.png b/htdocs/theme/eldy/img/object_phoning.png
index 5f11e40a81f..36cdcc8d4a2 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_project.png b/htdocs/theme/eldy/img/object_project.png
index 070fe326983..fd84ab427db 100644
Binary files a/htdocs/theme/eldy/img/object_project.png and b/htdocs/theme/eldy/img/object_project.png differ
diff --git a/htdocs/theme/eldy/img/object_projectpub.png b/htdocs/theme/eldy/img/object_projectpub.png
index 5ea2e846ddf..1444573cf05 100644
Binary files a/htdocs/theme/eldy/img/object_projectpub.png and b/htdocs/theme/eldy/img/object_projectpub.png differ
diff --git a/htdocs/theme/eldy/img/object_projecttask.png b/htdocs/theme/eldy/img/object_projecttask.png
index 3ec85fed9d3..4a01b50435a 100644
Binary files a/htdocs/theme/eldy/img/object_projecttask.png and b/htdocs/theme/eldy/img/object_projecttask.png differ
diff --git a/htdocs/theme/eldy/img/object_propal.png b/htdocs/theme/eldy/img/object_propal.png
index 4a52d65b9e6..2dc60e66b3e 100644
Binary files a/htdocs/theme/eldy/img/object_propal.png and b/htdocs/theme/eldy/img/object_propal.png differ
diff --git a/htdocs/theme/eldy/img/object_reduc.png b/htdocs/theme/eldy/img/object_reduc.png
index 4d5f811a891..ccfd2d2f5b2 100644
Binary files a/htdocs/theme/eldy/img/object_reduc.png and b/htdocs/theme/eldy/img/object_reduc.png differ
diff --git a/htdocs/theme/eldy/img/object_resource.png b/htdocs/theme/eldy/img/object_resource.png
new file mode 100644
index 00000000000..8cda1f3f220
Binary files /dev/null and b/htdocs/theme/eldy/img/object_resource.png differ
diff --git a/htdocs/theme/eldy/img/object_rss.png b/htdocs/theme/eldy/img/object_rss.png
index 8f4224b5a30..37372031157 100644
Binary files a/htdocs/theme/eldy/img/object_rss.png and b/htdocs/theme/eldy/img/object_rss.png differ
diff --git a/htdocs/theme/eldy/img/object_service.png b/htdocs/theme/eldy/img/object_service.png
index 2161bfd59cc..65e9041589f 100644
Binary files a/htdocs/theme/eldy/img/object_service.png and b/htdocs/theme/eldy/img/object_service.png differ
diff --git a/htdocs/theme/eldy/img/object_skype.png b/htdocs/theme/eldy/img/object_skype.png
index 97121565bb0..b209cd8d16e 100644
Binary files a/htdocs/theme/eldy/img/object_skype.png and b/htdocs/theme/eldy/img/object_skype.png differ
diff --git a/htdocs/theme/eldy/img/object_stock.png b/htdocs/theme/eldy/img/object_stock.png
index 279a34f869a..2f439db7b50 100644
Binary files a/htdocs/theme/eldy/img/object_stock.png and b/htdocs/theme/eldy/img/object_stock.png differ
diff --git a/htdocs/theme/eldy/img/object_task.png b/htdocs/theme/eldy/img/object_task.png
index 24581634018..14dc14a9602 100644
Binary files a/htdocs/theme/eldy/img/object_task.png and b/htdocs/theme/eldy/img/object_task.png differ
diff --git a/htdocs/theme/eldy/img/object_technic.png b/htdocs/theme/eldy/img/object_technic.png
index b929050598d..6186d18da70 100644
Binary files a/htdocs/theme/eldy/img/object_technic.png and b/htdocs/theme/eldy/img/object_technic.png differ
diff --git a/htdocs/theme/eldy/img/off.png b/htdocs/theme/eldy/img/off.png
index 6b4604d38ed..f4217646b26 100644
Binary files a/htdocs/theme/eldy/img/off.png and b/htdocs/theme/eldy/img/off.png differ
diff --git a/htdocs/theme/eldy/img/on.png b/htdocs/theme/eldy/img/on.png
index 82572b9e1d1..728bb393536 100644
Binary files a/htdocs/theme/eldy/img/on.png and b/htdocs/theme/eldy/img/on.png differ
diff --git a/htdocs/theme/eldy/img/pdf2.png b/htdocs/theme/eldy/img/pdf2.png
index 4702d19fd50..06634550daa 100644
Binary files a/htdocs/theme/eldy/img/pdf2.png and b/htdocs/theme/eldy/img/pdf2.png differ
diff --git a/htdocs/theme/eldy/img/pdf3.png b/htdocs/theme/eldy/img/pdf3.png
index cd76e0f9253..f053591bf2d 100644
Binary files a/htdocs/theme/eldy/img/pdf3.png and b/htdocs/theme/eldy/img/pdf3.png differ
diff --git a/htdocs/theme/eldy/img/play.png b/htdocs/theme/eldy/img/play.png
index 6de3e256ba6..4922ea1ec12 100644
Binary files a/htdocs/theme/eldy/img/play.png and b/htdocs/theme/eldy/img/play.png differ
diff --git a/htdocs/theme/eldy/img/puce.png b/htdocs/theme/eldy/img/puce.png
index dfa83acd50d..8c116b0dc42 100644
Binary files a/htdocs/theme/eldy/img/puce.png and b/htdocs/theme/eldy/img/puce.png differ
diff --git a/htdocs/theme/eldy/img/recent.png b/htdocs/theme/eldy/img/recent.png
index 61daae778f5..a49fc171c06 100644
Binary files a/htdocs/theme/eldy/img/recent.png and b/htdocs/theme/eldy/img/recent.png differ
diff --git a/htdocs/theme/eldy/img/redstar.png b/htdocs/theme/eldy/img/redstar.png
index 001cde58667..486fd6770a2 100644
Binary files a/htdocs/theme/eldy/img/redstar.png and b/htdocs/theme/eldy/img/redstar.png differ
diff --git a/htdocs/theme/eldy/img/refresh.png b/htdocs/theme/eldy/img/refresh.png
index 046ce37b9c5..9994475cdfe 100644
Binary files a/htdocs/theme/eldy/img/refresh.png and b/htdocs/theme/eldy/img/refresh.png differ
diff --git a/htdocs/theme/eldy/img/reload.png b/htdocs/theme/eldy/img/reload.png
index 62056d2a89a..a4029f119de 100644
Binary files a/htdocs/theme/eldy/img/reload.png and b/htdocs/theme/eldy/img/reload.png differ
diff --git a/htdocs/theme/eldy/img/rightarrow.png b/htdocs/theme/eldy/img/rightarrow.png
index 2ea37440ecd..2c479d9453b 100644
Binary files a/htdocs/theme/eldy/img/rightarrow.png and b/htdocs/theme/eldy/img/rightarrow.png differ
diff --git a/htdocs/theme/eldy/img/searchclear.png b/htdocs/theme/eldy/img/searchclear.png
index 024e0c62cdd..203a85e10c4 100644
Binary files a/htdocs/theme/eldy/img/searchclear.png and b/htdocs/theme/eldy/img/searchclear.png differ
diff --git a/htdocs/theme/eldy/img/setup.png b/htdocs/theme/eldy/img/setup.png
index b9bef6d2a18..f997e53799b 100644
Binary files a/htdocs/theme/eldy/img/setup.png and b/htdocs/theme/eldy/img/setup.png differ
diff --git a/htdocs/theme/eldy/img/sort_asc.png b/htdocs/theme/eldy/img/sort_asc.png
index a88d7975fe9..e327d952fa4 100644
Binary files a/htdocs/theme/eldy/img/sort_asc.png and b/htdocs/theme/eldy/img/sort_asc.png differ
diff --git a/htdocs/theme/eldy/img/sort_asc_disabled.png b/htdocs/theme/eldy/img/sort_asc_disabled.png
index 4e144cf0b1f..e327d952fa4 100644
Binary files a/htdocs/theme/eldy/img/sort_asc_disabled.png and b/htdocs/theme/eldy/img/sort_asc_disabled.png differ
diff --git a/htdocs/theme/eldy/img/sort_desc.png b/htdocs/theme/eldy/img/sort_desc.png
index def071ed5af..db99fd9ad47 100644
Binary files a/htdocs/theme/eldy/img/sort_desc.png and b/htdocs/theme/eldy/img/sort_desc.png differ
diff --git a/htdocs/theme/eldy/img/sort_desc_disabled.png b/htdocs/theme/eldy/img/sort_desc_disabled.png
index 7824973cc60..89051c2f34f 100644
Binary files a/htdocs/theme/eldy/img/sort_desc_disabled.png and b/htdocs/theme/eldy/img/sort_desc_disabled.png differ
diff --git a/htdocs/theme/eldy/img/split.png b/htdocs/theme/eldy/img/split.png
index 008557d7341..bb66213f413 100644
Binary files a/htdocs/theme/eldy/img/split.png and b/htdocs/theme/eldy/img/split.png differ
diff --git a/htdocs/theme/eldy/img/statut0.png b/htdocs/theme/eldy/img/statut0.png
index 0f7b0bd4f87..d11252783a4 100644
Binary files a/htdocs/theme/eldy/img/statut0.png and b/htdocs/theme/eldy/img/statut0.png differ
diff --git a/htdocs/theme/eldy/img/statut1.png b/htdocs/theme/eldy/img/statut1.png
index 3e4650f4f02..558439d282e 100644
Binary files a/htdocs/theme/eldy/img/statut1.png and b/htdocs/theme/eldy/img/statut1.png differ
diff --git a/htdocs/theme/eldy/img/statut3.png b/htdocs/theme/eldy/img/statut3.png
index f49966eaaa1..e7515796683 100644
Binary files a/htdocs/theme/eldy/img/statut3.png and b/htdocs/theme/eldy/img/statut3.png differ
diff --git a/htdocs/theme/eldy/img/statut4.png b/htdocs/theme/eldy/img/statut4.png
index aed93a350ba..6ec1ba55961 100644
Binary files a/htdocs/theme/eldy/img/statut4.png and b/htdocs/theme/eldy/img/statut4.png differ
diff --git a/htdocs/theme/eldy/img/statut5.png b/htdocs/theme/eldy/img/statut5.png
index a2e22fe6f59..53264a0515d 100644
Binary files a/htdocs/theme/eldy/img/statut5.png and b/htdocs/theme/eldy/img/statut5.png differ
diff --git a/htdocs/theme/eldy/img/statut7.png b/htdocs/theme/eldy/img/statut7.png
index 50295a03ed5..8871a45519f 100644
Binary files a/htdocs/theme/eldy/img/statut7.png and b/htdocs/theme/eldy/img/statut7.png differ
diff --git a/htdocs/theme/eldy/img/statut8.png b/htdocs/theme/eldy/img/statut8.png
index 4d8f59be1c2..c24d4a9dac2 100644
Binary files a/htdocs/theme/eldy/img/statut8.png and b/htdocs/theme/eldy/img/statut8.png differ
diff --git a/htdocs/theme/eldy/img/statut9.png b/htdocs/theme/eldy/img/statut9.png
index 5401cf9b03d..94b6dabf265 100644
Binary files a/htdocs/theme/eldy/img/statut9.png and b/htdocs/theme/eldy/img/statut9.png differ
diff --git a/htdocs/theme/eldy/img/stcomm-1.png b/htdocs/theme/eldy/img/stcomm-1.png
index 52b3625ac05..df442fc1eda 100644
Binary files a/htdocs/theme/eldy/img/stcomm-1.png and b/htdocs/theme/eldy/img/stcomm-1.png differ
diff --git a/htdocs/theme/eldy/img/stcomm-1_grayed.png b/htdocs/theme/eldy/img/stcomm-1_grayed.png
index 20a7219535e..5942e6c72af 100644
Binary files a/htdocs/theme/eldy/img/stcomm-1_grayed.png and b/htdocs/theme/eldy/img/stcomm-1_grayed.png differ
diff --git a/htdocs/theme/eldy/img/stcomm0.png b/htdocs/theme/eldy/img/stcomm0.png
index 6053eeda485..cbe60a02d28 100644
Binary files a/htdocs/theme/eldy/img/stcomm0.png and b/htdocs/theme/eldy/img/stcomm0.png differ
diff --git a/htdocs/theme/eldy/img/stcomm0_grayed.png b/htdocs/theme/eldy/img/stcomm0_grayed.png
index a92e1558506..9016db48b02 100644
Binary files a/htdocs/theme/eldy/img/stcomm0_grayed.png and b/htdocs/theme/eldy/img/stcomm0_grayed.png differ
diff --git a/htdocs/theme/eldy/img/stcomm1.png b/htdocs/theme/eldy/img/stcomm1.png
index eb76c0fb179..6bdea492985 100644
Binary files a/htdocs/theme/eldy/img/stcomm1.png and b/htdocs/theme/eldy/img/stcomm1.png differ
diff --git a/htdocs/theme/eldy/img/stcomm1_grayed.png b/htdocs/theme/eldy/img/stcomm1_grayed.png
index 98ed423aa9e..367a55921e4 100644
Binary files a/htdocs/theme/eldy/img/stcomm1_grayed.png and b/htdocs/theme/eldy/img/stcomm1_grayed.png differ
diff --git a/htdocs/theme/eldy/img/stcomm2.png b/htdocs/theme/eldy/img/stcomm2.png
index 1e76ce4946b..9e000b70dc9 100644
Binary files a/htdocs/theme/eldy/img/stcomm2.png and b/htdocs/theme/eldy/img/stcomm2.png differ
diff --git a/htdocs/theme/eldy/img/stcomm2_grayed.png b/htdocs/theme/eldy/img/stcomm2_grayed.png
index 0f2a4332cfc..f667e3573d0 100644
Binary files a/htdocs/theme/eldy/img/stcomm2_grayed.png and b/htdocs/theme/eldy/img/stcomm2_grayed.png differ
diff --git a/htdocs/theme/eldy/img/stcomm3.png b/htdocs/theme/eldy/img/stcomm3.png
index 465234fcd3c..5a6c0aeface 100644
Binary files a/htdocs/theme/eldy/img/stcomm3.png and b/htdocs/theme/eldy/img/stcomm3.png differ
diff --git a/htdocs/theme/eldy/img/stcomm3_grayed.png b/htdocs/theme/eldy/img/stcomm3_grayed.png
index fc80eb2aebd..81a14c1e482 100644
Binary files a/htdocs/theme/eldy/img/stcomm3_grayed.png and b/htdocs/theme/eldy/img/stcomm3_grayed.png differ
diff --git a/htdocs/theme/eldy/img/stcomm4.png b/htdocs/theme/eldy/img/stcomm4.png
index c839a8acec5..3e26b4d06ed 100644
Binary files a/htdocs/theme/eldy/img/stcomm4.png and b/htdocs/theme/eldy/img/stcomm4.png differ
diff --git a/htdocs/theme/eldy/img/stcomm4_grayed.png b/htdocs/theme/eldy/img/stcomm4_grayed.png
index 4935499d917..4271aafb6ce 100644
Binary files a/htdocs/theme/eldy/img/stcomm4_grayed.png and b/htdocs/theme/eldy/img/stcomm4_grayed.png differ
diff --git a/htdocs/theme/eldy/img/tab_background.png b/htdocs/theme/eldy/img/tab_background.png
index 0864dcc5852..6edd65003e0 100644
Binary files a/htdocs/theme/eldy/img/tab_background.png and b/htdocs/theme/eldy/img/tab_background.png differ
diff --git a/htdocs/theme/eldy/img/tick.png b/htdocs/theme/eldy/img/tick.png
index deb69ee75ec..9b035d99511 100644
Binary files a/htdocs/theme/eldy/img/tick.png and b/htdocs/theme/eldy/img/tick.png differ
diff --git a/htdocs/theme/eldy/img/title.png b/htdocs/theme/eldy/img/title.png
index bcd70489c80..bb48d617379 100644
Binary files a/htdocs/theme/eldy/img/title.png and b/htdocs/theme/eldy/img/title.png differ
diff --git a/htdocs/theme/eldy/img/tmenu.jpg b/htdocs/theme/eldy/img/tmenu.jpg
index 3e8c28692da..e7c37c34041 100644
Binary files a/htdocs/theme/eldy/img/tmenu.jpg and b/htdocs/theme/eldy/img/tmenu.jpg differ
diff --git a/htdocs/theme/eldy/img/tmenu2.jpg b/htdocs/theme/eldy/img/tmenu2.jpg
index b9c24a7c18b..b8f434c6d1f 100644
Binary files a/htdocs/theme/eldy/img/tmenu2.jpg and b/htdocs/theme/eldy/img/tmenu2.jpg differ
diff --git a/htdocs/theme/eldy/img/tmenu3.jpg b/htdocs/theme/eldy/img/tmenu3.jpg
index dc2434541cf..d42f804b026 100644
Binary files a/htdocs/theme/eldy/img/tmenu3.jpg and b/htdocs/theme/eldy/img/tmenu3.jpg differ
diff --git a/htdocs/theme/eldy/img/tmenu_inverse.jpg b/htdocs/theme/eldy/img/tmenu_inverse.jpg
index c8fe6d0aff2..e1efd44376e 100644
Binary files a/htdocs/theme/eldy/img/tmenu_inverse.jpg and b/htdocs/theme/eldy/img/tmenu_inverse.jpg differ
diff --git a/htdocs/theme/eldy/img/unlock.png b/htdocs/theme/eldy/img/unlock.png
index f3eebc59274..afefaa94d47 100644
Binary files a/htdocs/theme/eldy/img/unlock.png and b/htdocs/theme/eldy/img/unlock.png differ
diff --git a/htdocs/theme/eldy/img/vcard.png b/htdocs/theme/eldy/img/vcard.png
index e03026f87fb..315abdf179d 100644
Binary files a/htdocs/theme/eldy/img/vcard.png and b/htdocs/theme/eldy/img/vcard.png differ
diff --git a/htdocs/theme/eldy/img/view.png b/htdocs/theme/eldy/img/view.png
index 828c79a8323..76c1e9f1e6a 100644
Binary files a/htdocs/theme/eldy/img/view.png and b/htdocs/theme/eldy/img/view.png differ
diff --git a/htdocs/theme/eldy/img/warning.png b/htdocs/theme/eldy/img/warning.png
index ae8e35e781d..f1b93b8cc82 100644
Binary files a/htdocs/theme/eldy/img/warning.png and b/htdocs/theme/eldy/img/warning.png differ
diff --git a/htdocs/theme/eldy/index.html b/htdocs/theme/eldy/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/eldy/index.php b/htdocs/theme/eldy/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/eldy/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index b572ac73f66..50b80258ea6 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']);
@@ -64,7 +65,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
 
 // Define image path files and other constants
 $fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
-$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
+$img_head='';
 $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 $dol_hide_topmenu=$conf->dol_hide_topmenu;
 $dol_hide_leftmenu=$conf->dol_hide_leftmenu;
@@ -99,13 +100,13 @@ $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));
-$colorbackbody='#fcfcfc';
+$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';
 $fontsizesmaller='11';
@@ -123,21 +124,16 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_BACKTABCARD2='210,210,210';     // card
     $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234';
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    //$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;';
-    $conf->global->THEME_ELDY_BACKBODY='#fcfcfc;';
-    $conf->global->THEME_ELDY_LINEIMPAIR1='242,242,242';
-    $conf->global->THEME_ELDY_LINEIMPAIR2='248,248,248';
+    $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;';
+    $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='255,255,255';
-    $conf->global->THEME_ELDY_LINEPAIR2='255,255,255';
+    $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);
@@ -168,6 +164,10 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
 	$colorbacklinepairhover='';
 }
 
+// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
+$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
+$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+
 // Set text color to black or white
 $tmppart=explode(',',$colorbackhmenu1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
@@ -207,6 +207,8 @@ print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
 print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
 print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n";
 print 'dol_use_jmobile='.$dol_use_jmobile."\n";
+print 'dol_screenwidth='.$_SESSION['dol_screenwidth']."\n";
+print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n";
 print '*/'."\n";
 
 if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
@@ -306,46 +308,54 @@ legend { margin-bottom: 8px; }
 fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; }
 
 
-.button {
+.button, sbmtConnexion {
     font-family: <?php print $fontlist ?>;
-	background-image: url(<?php echo $img_button ?>);
-	background-position: bottom;
-    border: 1px solid #C0C0C0;
-	padding: 0.1em 0.7em;
-	margin: 0em 0.5em;
-    -moz-border-radius:0px 5px 0px 5px;
-	-webkit-border-radius:0px 5px 0px 5px;
-	border-radius:0px 5px 0px 5px;
-    -moz-box-shadow: 2px 2px 3px #DDD;
-    -webkit-box-shadow: 2px 2px 3px #DDD;
-    box-shadow: 2px 2px 3px #DDD;
+	border-color: #c5c5c5;
+	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+	display: inline-block;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	text-align: center;
+	cursor: pointer;
+	color: #333333;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbbbbb;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 .button:focus  {
-    font-family: <?php print $fontlist ?>;
-	color: #222244;
-	background-image: url(<?php echo $img_button ?>);
-	background-position: bottom;
-    border: 1px solid #C0C0C0;
+	-moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+	-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+	box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 }
 .button:hover   {
-	background: #dee7ec;
+	-moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+	-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+	box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 }
 .button:disabled {
-	background: #ddd;
-}
-.buttonajax {
-    font-family: <?php print $fontlist ?>;
-	border: 0px;
-	background-image: url(<?php echo $img_button ?>);
-	background-position: bottom;
-	padding: 0.1em 0.7em;
-	margin: 0em 0.5em;
-    -moz-border-radius:0px 5px 0px 5px;
-	-webkit-border-radius:0px 5px 0px 5px;
-	border-radius:0px 5px 0px 5px;
-    -moz-box-shadow: 3px 3px 4px #DDD;
-    -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
+	opacity: 0.4;
+    filter: alpha(opacity=40); /* For IE8 and earlier */
+    box-shadow: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    cursor: auto;
 }
 form {
     padding:0px;
@@ -397,7 +407,28 @@ th .button {
 .nounderline {
     text-decoration: none;
 }
+.cursorpointer {
+	cursor: pointer;
+}
+.badge {
+	display: inline-block;
+	min-width: 10px;
+	padding: 2px 5px;
+	font-size: 10px;
+	font-weight: 700;
+	line-height: 0.9em;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	background-color: #777;
+	border-radius: 10px;
+}
 
+.borderrightlight
+{
+	border-right: 1px solid #DDD;
+}
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
@@ -462,25 +493,25 @@ div.fichecenter {
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
 }
 div.fichethirdleft {
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "float: ".$left.";\n"; } ?>
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "width: 35%;\n"; } ?>
-	<?php if (! empty($conf->dol_optimize_smallscreen)) { print "padding-bottom: 6px;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$left.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "width: 35%;\n"; } ?>
+	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px;\n"; } ?>
 }
 div.fichetwothirdright {
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "float: ".$right.";\n"; } ?>
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "width: 65%;\n"; } ?>
-	<?php if (! empty($conf->dol_optimize_smallscreen)) { print "padding-bottom: 6px\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$right.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "width: 65%;\n"; } ?>
+	<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?>
 }
 div.fichehalfleft {
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "float: ".$left.";\n"; } ?>
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$left.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
 }
 div.fichehalfright {
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "float: ".$right.";\n"; } ?>
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "width: 50%;\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "float: ".$right.";\n"; } ?>
+	<?php if ($conf->browser->layout != 'phone')   { print "width: 50%;\n"; } ?>
 }
 div.ficheaddleft {
-	<?php if (empty($conf->dol_optimize_smallscreen))   { print "padding-".$left.": 16px;\n"; }
+	<?php if ($conf->browser->layout != 'phone')   { print "padding-".$left.": 16px;\n"; }
 	else print "margin-top: 10px;\n"; ?>
 }
 .containercenter {
@@ -494,18 +525,9 @@ margin : 0px auto;
 /* ============================================================================== */
 
 <?php
-if (! empty($conf->dol_optimize_smallscreen))
-{
-	$minwidthtmenu=0;
-	$heightmenu=19;
-	$heightmenu2=19;
-}
-else
-{
-	$minwidthtmenu=66;
-	$heightmenu=52;
-	$heightmenu2=40;
-}
+$minwidthtmenu=66;
+$heightmenu=52;
+$heightmenu2=40;
 ?>
 
 div#tmenu_tooltip {
@@ -583,7 +605,6 @@ ul.tmenu {	/* t r b l */
     padding: 0px 0px 0px 0px;
     margin: 0px 0px 0px 0px;
 	list-style: none;
-    /* height: <?php print $heightmenu; ?>px; */
 	box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
 }
 ul.tmenu li {
@@ -627,11 +648,13 @@ li.tmenusel, li.tmenu:hover {
 .tmenuend .tmenuleft { width: 0px; }
 div.tmenuleft
 {
-	width: 5px;
 	float: <?php print $left; ?>;
-    height: <?php print $heightmenu+4; ?>px;
-	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 0 no-repeat;
 	margin-top: 0px;
+	<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
+	width: 5px;
+	height: <?php print $heightmenu+4; ?>px;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 0 no-repeat;
+	<?php } ?>
 }
 div.tmenucenter
 {
@@ -644,19 +667,19 @@ div.tmenucenter
 .mainmenuaspan
 {
 	padding-right: 4px;
-	/*text-shadow: 1px 1px 1px #DDD;*/
 }
 
 div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu-19); ?>px;
+	height: <?php echo ($heightmenu-17); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
 
-<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
+/* Do not load menu img if hidden to save bandwidth */
+<?php if (empty($dol_hide_topmenu)) { ?>
 
 div.mainmenu.home{
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>);
@@ -735,10 +758,6 @@ div.mainmenu.tools {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
 }
 
-div.mainmenu.shop {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1) ?>);
-}
-
 div.mainmenu.webservices {
 }
 
@@ -766,7 +785,7 @@ foreach($conf->modules as $val)
 $mainmenuusedarray=array_unique(explode(',',$mainmenuused));
 
 $generic=1;
-$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','shop','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices');
+$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices');
 foreach($mainmenuusedarray as $val)
 {
 	if (empty($val) || in_array($val,$divalreadydefined)) continue;
@@ -802,7 +821,7 @@ foreach($mainmenuusedarray as $val)
 ?>
 
 <?php
-}	// End test if not phone
+}	// End test if $dol_hide_topmenu
 ?>
 
 .tmenuimage {
@@ -816,7 +835,13 @@ foreach($mainmenuusedarray as $val)
 
 .bodylogin
 {
-	background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
+	background: #f0f0f0;
+	/* -moz-box-shadow:    inset 0 0 10px #000000;
+   	-webkit-box-shadow: inset 0 0 10px #000000;
+   	box-shadow:         inset 0 0 10px #000000; */
+}
+.login_vertical_align {
+	padding: 10px;
 }
 form#login {
 	margin-top: <?php echo $dol_optimize_smallscreen?'30':'60' ?>px;
@@ -840,22 +865,28 @@ form#login {
 	padding-top:12px;
 	padding-bottom:12px;
 	max-width: 540px;
-	border: 1px solid #C0C0C0;
-	background-color: #E0E0E0;
 
-    -moz-box-shadow: 3px 3px 4px #DDD;
-    -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
+	background-color: #FFFFFF;
+
+	-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+	-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+	box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+	/*-moz-box-shadow: 3px 2px 20px #CCC;
+    -webkit-box-shadow: 3px 2px 20px #CCC;
+    box-shadow: 3px 2px 20px #CCC;*/
 
 	border-radius: 8px;
-	border:solid 1px rgba(168,168,168,.4);
+	border:solid 1px rgba(80,80,80,.4);
+
 	border-top:solid 1px f8f8f8;
+	/*
 	background-color: #f8f8f8;
 	background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
 	background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
 	background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
 	background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
 	background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
+	*/
 }
 div#login_left, div#login_right {
 	display: inline-block;
@@ -867,6 +898,13 @@ div#login_left, div#login_right {
 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;
 }
@@ -987,10 +1025,10 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
     background-position:top;
     background-repeat:repeat-x;
 <?php } ?>
-    border-left: 1px solid #CCCCCC;
-    border-right: 1px solid #D0D0D0;
-    border-bottom: 1px solid #DDDDDD;
-    border-top: 1px solid #DDDDDD;
+    border-left: 1px solid #AAA;
+    border-right: 1px solid #BBB;
+    border-bottom: 1px solid #BBB;
+    border-top: 1px solid #BBB;
     border-radius: 5px;
 	-moz-border-radius: 5px;
     -moz-box-shadow: 3px 3px 4px #DDD;
@@ -1019,10 +1057,10 @@ div.blockvmenusearch
     background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
 <?php } ?>
 
-    border-left: 1px solid #DDDDDD;
-    border-right: 1px solid #CCCCCC;
-    border-bottom: 1px solid #CCCCCC;
-    border-top: 1px solid #E8E8E8;
+    border-left: 1px solid #AAA;
+    border-right: 1px solid #CCC;
+    border-bottom: 1px solid #CCC;
+    border-top: 1px solid #CCC;
     border-radius: 5px;
 	-moz-border-radius: 5px;
     -moz-box-shadow: 3px 3px 4px #DDD;
@@ -1030,39 +1068,6 @@ div.blockvmenusearch
     box-shadow: 3px 3px 4px #DDD;
 }
 
-div.blockvmenubookmarksold
-{
-    border-right: 1px solid #555555;
-    border-bottom: 1px solid #555555;
-    font-family: <?php print $fontlist ?>;
-    color: #000000;
-    text-align: <?php print $left; ?>;
-    text-decoration: none;
-    padding-left: 5px;
-    padding-right: 1px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    margin: 6px 0px 8px 2px;
-    background: #E3E6E8;
-
-<?php if ($usecss3) { ?>
-    background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
-    background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
-    background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
-    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
-    background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
-<?php } ?>
-
-    border-left: 1px solid #CCCCCC;
-    border-right: 1px solid #BBBBBB;
-    border-bottom: 1px solid #BBBBBB;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-    -moz-box-shadow: 3px 3px 4px #DDD;
-    -webkit-box-shadow: 3px 3px 4px #DDD;
-    box-shadow: 3px 3px 4px #DDD;
-}
-
 div.blockvmenuhelp
 {
 <?php if (empty($conf->dol_optimize_smallscreen)) { ?>
@@ -1361,7 +1366,8 @@ div.tabs {
 /*    margin: 0px 0px 2px 6px;
     padding: 0px 6px 3px 0px; */
     text-align: <?php print $left; ?>;
-    margin-left: 4px !important;
+    margin-left: 6px !important;
+    margin-right: 6px !important;
 	clear:both;
 	height:100%;
 }
@@ -1377,10 +1383,10 @@ div.tabBar {
     -moz-border-radius:6px;
     -webkit-border-radius: 6px;
 	border-radius: 6px;
-    border-right: 1px solid #CCCCCC;
-    border-bottom: 1px solid #CCCCCC;
-    border-left: 1px solid #D0D0D0;
-    border-top: 1px solid #D8D8D8;
+    border-right: 1px solid #BBB;
+    border-bottom: 1px solid #BBB;
+    border-left: 1px solid #BBB;
+    border-top: 1px solid #CCC;
 	width: auto;
 <?php if ($usecss3) { ?>
 	background-image: -o-linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%);
@@ -1436,9 +1442,9 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	box-shadow: 0 -1px 4px rgba(0,0,0,.1);
 
 	border-bottom: none;
-	border-right: 1px solid #CCCCCC;
-	border-left: 1px solid #D0D0D0;
-	border-top: 1px solid #D8D8D8;
+	border-right: 1px solid #BBB;
+	border-left: 1px solid #BBB;
+	border-top: 1px solid #CCC;
 
 <?php if ($usecss3) { ?>
     background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
@@ -1505,15 +1511,16 @@ span.tabspan {
 div.divButAction { margin-bottom: 1.4em; }
 
 .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
-	font-family: <?php print $fontlist ?>;
-	font-weight: bold;
-	background: white;
-	border: 1px solid #8CACBB;
-	color: #434956;
 	text-decoration: none;
 	white-space: nowrap;
 	padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
 	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+	font-family: <?php print $fontlist ?>;
+
+	font-weight: bold;
+	background: white;
+	border: 1px solid #8CACBB;
+	color: #434956;
     -moz-border-radius:0px 5px 0px 5px;
 	-webkit-border-radius:0px 5px 0px 5px;
 	border-radius:0px 5px 0px 5px;
@@ -1535,16 +1542,17 @@ div.divButAction { margin-bottom: 1.4em; }
 }
 
 .butActionRefused {
-	font-family: <?php print $fontlist ?> !important;
+	text-decoration: none !important;
+	white-space: nowrap !important;
+	cursor: not-allowed;
+	padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+    font-family: <?php print $fontlist ?> !important;
+
 	font-weight: bold !important;
 	background: white !important;
 	border: 1px solid #AAAAAA !important;
 	color: #AAAAAA !important;
-	text-decoration: none !important;
-	white-space: nowrap !important;
-	cursor: not-allowed;
-	padding: 0.4em 0.7em;
-	margin: 0em 0.7em;
     -moz-border-radius:0px 5px 0px 5px;
 	-webkit-border-radius:0px 5px 0px 5px;
 	border-radius:0px 5px 0px 5px;
@@ -1563,6 +1571,77 @@ span.butAction, span.butActionDelete {
 	cursor: pointer;
 }
 
+/* Preapre for bootstrap look
+.butAction, .butActionDelete, .butActionRefused {
+	border-color: #c5c5c5;
+	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+	display: inline-block;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	line-height: 20px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333333;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbbbbb;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.butAction {
+	color: #ffffff;
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	background-color: #006dcc;
+	background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+	background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+	background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+	background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+	border-color: #0044cc #0044cc #002a80;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+.butActionDelete {
+	color: #ffffff;
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	background-color: #cc6d00;
+	background-image: -moz-linear-gradient(top, #cc8800, #cc4400);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400));
+	background-image: -webkit-linear-gradient(top, #cc8800, #cc4400);
+	background-image: -o-linear-gradient(top, #cc8800, #cc4400);
+	background-image: linear-gradient(to bottom, #cc8800, #cc4400);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcc8800', endColorstr='#ffcc4400', GradientType=0);
+	border-color: #cc4400 #cc4400 #802a00;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
+	color: #FFFFFF;
+}
+End bootstrap */
+
+
 
 /* ============================================================================== */
 /* Tables                                                                         */
@@ -1618,7 +1697,7 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord
 }
 
 table.border td, div.border div div.tagtd {
-	padding: 1px 2px 1px 2px;
+	padding: 2px 2px 2px 2px;
 	border: 1px solid #D0D0D0;
 	border-collapse: collapse;
 }
@@ -1651,7 +1730,7 @@ table.noborder, table.formdoc, div.noborder {
 	border-right-style: solid;
 
 	border-left-width: 1px;
-	border-left-color: #CCCCCC;
+	border-left-color: #B0B0B0;
 	border-left-style: solid;
 
 	border-bottom-width: 1px;
@@ -1659,11 +1738,10 @@ table.noborder, table.formdoc, div.noborder {
 	border-bottom-style: solid;
 
 	margin: 0px 0px 2px 0px;
-	/*padding: 1px 2px 1px 2px;*/
 
-	-moz-box-shadow: 3px 3px 4px #DDD;
-	-webkit-box-shadow: 3px 3px 4px #DDD;
-	box-shadow: 3px 3px 4px #DDD;
+	-moz-box-shadow: 2px 2px 4px #DDD;
+	-webkit-box-shadow: 2px 2px 4px #DDD;
+	box-shadow: 2px 2px 4px #DDD;
 
 	-moz-border-radius: 0.2em;
 	-webkit-border-radius: 0.2em;
@@ -1734,6 +1812,86 @@ table.liste td {
 .tagtr, .table-border-row  { display: table-row; }
 .tagtd, .table-border-col, .table-key-border-col, .table-val-border-col { display: table-cell; }
 
+
+/* Prepare to remove class pair - impair
+.noborder > tbody > tr:nth-child(even) td {
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	font-family: <?php print $fontlist ?>;
+	border: 0px;
+	margin-bottom: 1px;
+	color: #202020;
+	min-height: 18px;
+}
+
+.noborder > tbody > tr:nth-child(odd) td {
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	font-family: <?php print $fontlist ?>;
+	border: 0px;
+	margin-bottom: 1px;
+	color: #202020;
+}
+*/
+
+.impair:hover, td.nohover {
+<?php if ($colorbacklineimpairhover) { if ($usecss3) { ?>
+	background: rgb(<?php echo $colorbacklineimpairhover; ?>);
+<?php } else { ?>
+	background: #fafafa;
+<?php } } ?>
+	border: 0px;
+}
+
+.impair, .nohover .impair:hover, tr.impair td.nohover {
+<?php if ($usecss3) { ?>
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+<?php } else { ?>
+	background: #eaeaea;
+<?php } ?>
+	font-family: <?php print $fontlist ?>;
+	border: 0px;
+	margin-bottom: 1px;
+	color: #202020;
+	min-height: 18px; /* seems to not be used */
+}
+
+.pair:hover {
+<?php if ($colorbacklinepairhover) { if ($usecss3) { ?>
+	background: rgb(<?php echo $colorbacklinepairhover; ?>);
+<?php } else { ?>
+	background: #fafafa;
+<?php } }?>
+	border: 0px;
+}
+
+.pair, .nohover .pair:hover, tr.pair td.nohover {
+<?php if ($usecss3) { ?>
+	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+<?php } else { ?>
+	background: #ffffff;
+<?php } ?>
+	font-family: <?php print $fontlist ?>;
+	border: 0px;
+	margin-bottom: 1px;
+	color: #202020;
+}
+
+
 tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
 {
 	height: 26px !important;
@@ -1786,71 +1944,25 @@ input.liste_titre {
     border: 0px;
 }
 
-tr.liste_total, form.liste_total {
+.noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
 	background: #F0F0F0;
 }
-tr.liste_total td, form.liste_total div {
+.noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
     border-top: 1px solid #DDDDDD;
     color: #332266;
     font-weight: normal;
     white-space: nowrap;
 }
 
-.impair:hover {
-<?php if ($colorbacklineimpairhover) { if ($usecss3) { ?>
-	background: rgb(<?php echo $colorbacklineimpairhover; ?>);
-<?php } else { ?>
-	background: #fafafa;
-<?php } } ?>
-	border: 0px;
-}
-
-.impair, .nohover .impair:hover, tr.impair td.nohover {
-<?php if ($usecss3) { ?>
-	background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-<?php } else { ?>
-	background: #eaeaea;
-<?php } ?>
-	font-family: <?php print $fontlist ?>;
-	border: 0px;
-	margin-bottom: 1px;
-	color: #202020;
-	min-height: 18px; /* seems to not be used */
-}
-
-.pair:hover {
-<?php if ($colorbacklinepairhover) { if ($usecss3) { ?>
-	background: rgb(<?php echo $colorbacklinepairhover; ?>);
-<?php } else { ?>
-	background: #fafafa;
-<?php } }?>
-	border: 0px;
-}
-
-.pair, .nohover .pair:hover, tr.pair td.nohover {
-<?php if ($usecss3) { ?>
-	background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-	background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-<?php } else { ?>
-	background: #ffffff;
-<?php } ?>
-	font-family: <?php print $fontlist ?>;
-	border: 0px;
-	margin-bottom: 1px;
-	color: #202020;
-}
 
 .tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
 	background: none;
 }
 
+.margintable td {
+	border: 0px !important;
+}
+
 /* Disable shadows */
 .noshadow {
 	-moz-box-shadow: 0px 0px 0px #DDD !important;
@@ -1869,18 +1981,6 @@ div.tabBar .noborder {
  *  Boxes
  */
 
-.tdboxstats {
-<?php if ($usecss3) { ?>
-    background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important;
-    background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important;
-    background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important;
-    background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important;
-    background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 120%) !important;
-<?php } else { ?>
-	background: #ffffff !important;
-<?php } ?>
-}
-
 .boxstats {
     <?php print "float: ".$left.";\n"; ?>
     margin: 3px;
@@ -2053,9 +2153,11 @@ div.dolgraph div.legend, div.dolgraph div.legend div { background-color: rgba(25
 div.dolgraph div.legend table tbody tr { height: auto; }
 
 .photo {
-border: 0px;
-/* filter:alpha(opacity=55); */
-/* opacity:.55; */
+	border: 0px;
+}
+.photowithmargin {
+	margin-bottom: 2px;
+	margin-top: 2px;
 }
 
 .logo_setup
@@ -2082,6 +2184,44 @@ div.titre {
 #tablesubscribe { width: 100%; }
 
 
+/*
+ * Effect Postit
+ */
+.effectpostit
+{
+  position: relative;
+}
+.effectpostit:before, .effectpostit:after
+{
+  z-index: -1;
+  position: absolute;
+  content: "";
+  bottom: 15px;
+  left: 10px;
+  width: 50%;
+  top: 80%;
+  max-width:300px;
+  background: #777;
+  -webkit-box-shadow: 0 15px 10px #777;
+  -moz-box-shadow: 0 15px 10px #777;
+  box-shadow: 0 15px 10px #777;
+  -webkit-transform: rotate(-3deg);
+  -moz-transform: rotate(-3deg);
+  -o-transform: rotate(-3deg);
+  -ms-transform: rotate(-3deg);
+  transform: rotate(-3deg);
+}
+.effectpostit:after
+{
+  -webkit-transform: rotate(3deg);
+  -moz-transform: rotate(3deg);
+  -o-transform: rotate(3deg);
+  -ms-transform: rotate(3deg);
+  transform: rotate(3deg);
+  right: 10px;
+  left: auto;
+}
+
 
 
 /* ============================================================================== */
@@ -2251,19 +2391,29 @@ td.hidden {
 
 table.cal_month    { border-spacing: 0px; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_current_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_current_month_oneday { border-right: solid 1px #E0E0E0; }
 .cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_other_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B !important; border-right: 0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 .cal_other_month   { opacity: 0.6; background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { opacity: 0.6; background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today         { background: #FDFDF0; border-left: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser { background: #FDFDF0; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today_peruser_peruserleft { background: #FDFDF0; border-left: solid 3px #6C7C7B; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past          { }
+.cal_peruser       { padding: 0px; }
+.peruser_busy      { background: #CC8888; }
+.peruser_notbusy   { background: #EEDDDD; opacity: 0.5; }
 table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px;
 						-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
 						moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
 						box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
 						background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d));
+						min-height: 20px;
 						}
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; }
@@ -2272,13 +2422,13 @@ li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
-
+.cal_event_busy      { }
 
 /* ============================================================================== */
 /*  Ajax - Liste deroulante de l'autocompletion                                   */
 /* ============================================================================== */
 
-.ui-widget-content { border: solid 1px rgba(0,0,0,.3); background: #fff; }
+.ui-widget-content { border: solid 1px rgba(0,0,0,.3); background: #fff !important; }
 
 .ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1) ?>) right center no-repeat; }
 .ui-autocomplete {
@@ -2500,7 +2650,7 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 /*  CKEditor                                                                      */
 /* ============================================================================== */
 
-.cke_editable 
+.cke_editable
 {
 	margin: 5px !important;
 }
@@ -2543,6 +2693,41 @@ a.cke_dialog_ui_button
 }
 
 
+/* ============================================================================== */
+/*  Holiday                                                                       */
+/* ============================================================================== */
+
+#types .btn {
+    cursor: pointer;
+}
+
+#types .btn-primary {
+    font-weight: bold;
+}
+
+#types form {
+    padding: 20px;
+}
+
+#types label {
+    display:inline-block;
+    width:100px;
+    margin-right: 20px;
+    padding: 4px;
+    text-align: right;
+    vertical-align: top;
+}
+
+#types input.text, #types textarea {
+    width: 400px;
+}
+
+#types textarea {
+    height: 100px;
+}
+
+
+
 /* ============================================================================== */
 /*  JSGantt                                                                       */
 /* ============================================================================== */
@@ -2720,6 +2905,12 @@ div.dolEventError h1, div.dolEventError h2 {
 /* Disable this. It breaks wrapping of boxes
 .ui-corner-all { white-space: nowrap; } */
 
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled {
+	opacity: .35;
+	filter: Alpha(Opacity=35);
+	background-image: none;
+}
+
 
 /* ============================================================================== */
 /*  JMobile                                                                       */
@@ -2804,9 +2995,9 @@ a.ui-link {
 }
 
 /* Warning: setting this may make screen not beeing refreshed after a combo selection */
-.ui-body-c {
+/*.ui-body-c {
 	background: #fff;
-}
+}*/
 
 div.ui-radio, div.ui-checkbox
 {
@@ -2894,6 +3085,14 @@ border-top-right-radius: 6px;
 	background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important;
 	background-image: linear-gradient( #ddd,#d1d1d1 ) !important;
 }
+.lilevel2
+{
+	padding-left: 22px;
+}
+.lilevel3
+{
+	padding-left: 54px;
+}
 
 <?php
 if (is_object($db)) $db->close();
diff --git a/htdocs/theme/eldy/thumb.png b/htdocs/theme/eldy/thumb.png
index e17e0912147..6b4c467bead 100644
Binary files a/htdocs/theme/eldy/thumb.png and b/htdocs/theme/eldy/thumb.png differ
diff --git a/htdocs/theme/eldy/tpl/index.html b/htdocs/theme/eldy/tpl/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/eldy/tpl/index.php b/htdocs/theme/eldy/tpl/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/eldy/tpl/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/index.html b/htdocs/theme/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/theme/index.php b/htdocs/theme/index.php
deleted file mode 100644
index 7db0dd9ebf9..00000000000
--- a/htdocs/theme/index.php
+++ /dev/null
@@ -1 +0,0 @@
-Url not available
\ No newline at end of file
diff --git a/htdocs/theme/login_background.png b/htdocs/theme/login_background.png
index b264649fcbc..facc2c6f442 100644
Binary files a/htdocs/theme/login_background.png and b/htdocs/theme/login_background.png differ
diff --git a/htdocs/theme/login_logo.png b/htdocs/theme/login_logo.png
index 2337863c340..53cf79da7b4 100644
Binary files a/htdocs/theme/login_logo.png and b/htdocs/theme/login_logo.png differ
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
new file mode 100644
index 00000000000..dbb9e863af4
--- /dev/null
+++ b/htdocs/user/admin/group_extrafields.php
@@ -0,0 +1,155 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2014	   Alexis Algoud		<alexis@atm-consulting.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/adherents/admin/adherent_extrafields.php
+ *		\ingroup    member
+ *		\brief      Page to setup extra fields of members
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("users");
+$langs->load("admin");
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='usergroup'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject=$langs->transnoentitiesnoconv("Groups");
+
+$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
+llxHeader('',$langs->trans("UsersSetup"),$help_url);
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("UsersSetup"),$linkback,'setup');
+
+
+$head = user_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes_group', $langs->trans("Group"), 0, 'user');
+
+
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print '<br>';
+
+// Load attribute_label
+$extrafields->fetch_name_optionals_label($elementtype);
+
+print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("AttributeCode").'</td>';
+print '<td>'.$langs->trans("Type").'</td>';
+print '<td align="right">'.$langs->trans("Size").'</td>';
+print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td align="center">'.$langs->trans("Required").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+$var=True;
+foreach($extrafields->attribute_type as $key => $value)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+	print "<td>".$key."</td>\n";
+	print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+	print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+	print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+	print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=".$key."\">".img_delete()."</a></td>\n";
+	print "</tr>";
+	//      $i++;
+}
+
+print "</table>";
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation d'un champ optionnel
+ /*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+	print "<br>";
+	print_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition d'un champ optionnel                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+	print "<br>";
+	print_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/user/admin/index.html b/htdocs/user/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index edabfd53256..7caa42b08ea 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -35,7 +35,7 @@ $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
 
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
new file mode 100644
index 00000000000..47a1f160b5a
--- /dev/null
+++ b/htdocs/user/agenda_extsites.php
@@ -0,0 +1,188 @@
+<?php
+/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/user/agenda_extsites.php
+ *      \ingroup    agenda
+ *      \brief      Page to setup external calendars for agenda module
+ */
+
+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/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
+if (!$user->admin) accessforbidden();
+
+$langs->load("agenda");
+$langs->load("admin");
+$langs->load("other");
+
+$def = array();
+$actiontest=GETPOST('test','alpha');
+$actionsave=GETPOST('save','alpha');
+
+if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+$MAXAGENDA=empty($conf->global->AGENDA_EXT_NB)?5:$conf->global->AGENDA_EXT_NB;
+
+// List of available colors
+$colorlist=array('BECEDD','DDBECE','BFDDBE','F598B4','F68654','CBF654','A4A4A5');
+
+// Security check
+$id = GETPOST('id','int');
+$fuser = new User($db);
+$fuser->fetch($id);
+
+
+/*
+ * Actions
+ */
+if ($actionsave)
+{
+    $db->begin();
+
+	$i=1; $errorsaved=0;
+	$error=0;
+	$tabparam=array();
+
+	// Save agendas
+	while ($i <= $MAXAGENDA)
+	{
+		$name=trim(GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$i,'alpha'));
+		$src=trim(GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$i,'alpha'));
+		$color=trim(GETPOST('AGENDA_EXT_COLOR_'.$id.'_'.$i,'alpha'));
+		if ($color=='-1') $color='';
+		$enabled=trim(GETPOST('AGENDA_EXT_ENABLED_'.$id.'_'.$i,'alpha'));
+
+		if (! empty($src) && ! dol_is_url($src))
+		{
+			setEventMessage($langs->trans("ErrorParamMustBeAnUrl"),'errors');
+			$error++;
+			$errorsaved++;
+			break;
+		}
+
+		$tabparam['AGENDA_EXT_NAME_'.$id.'_'.$i]=$name;
+		$tabparam['AGENDA_EXT_SRC_'.$id.'_'.$i]=$src;
+		$tabparam['AGENDA_EXT_COLOR_'.$id.'_'.$i]=$color;
+		$tabparam['AGENDA_EXT_ENABLED_'.$id.'_'.$i]=$enabled;
+
+		$i++;
+	}
+
+	if (! $error)
+	{
+		$result=dol_set_user_param($db, $conf, $fuser, $tabparam);
+		if (! $result > 0) $error++;
+	}
+
+    if (! $error)
+    {
+        $db->commit();
+        setEventMessage($langs->trans("SetupSaved"));
+    }
+    else
+    {
+        $db->rollback();
+        if (empty($errorsaved))	setEventMessage($langs->trans("Error"),'errors');
+    }
+}
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+$formadmin=new FormAdmin($db);
+$formother=new FormOther($db);
+
+$arrayofjs=array();
+$arrayofcss=array();
+
+llxHeader('',$langs->trans("UserSetup"),'','',0,0,$arrayofjs,$arrayofcss);
+
+
+print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="id" value="'.$id.'">';
+
+$head=user_prepare_head($fuser);
+
+dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
+
+print $langs->trans("AgendaExtSitesDesc")."<br>\n";
+print "<br>\n";
+
+$selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
+if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
+
+$var=true;
+print "<table class=\"noborder\" width=\"100%\">";
+
+print "<tr class=\"liste_titre\">";
+print "<td>".$langs->trans("Parameter")."</td>";
+print "<td>".$langs->trans("Name")."</td>";
+print "<td>".$langs->trans("ExtSiteUrlAgenda")." (".$langs->trans("Example").': http://yoursite/agenda/agenda.ics)</td>';
+print '<td align="right">'.$langs->trans("Color").'</td>';
+print "</tr>";
+
+$i=1;
+$var=true;
+while ($i <= $MAXAGENDA)
+{
+	$key=$i;
+	$name='AGENDA_EXT_NAME_'.$id.'_'.$key;
+	$src='AGENDA_EXT_SRC_'.$id.'_'.$key;
+	$color='AGENDA_EXT_COLOR_'.$id.'_'.$key;
+
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	// Nb
+	print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>";
+	// Name
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key):$fuser->conf->$name) . '" size="28"></td>';
+	// URL
+	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC_'.$id.'_'.$key.'" value="'. (GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key)?GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key):$fuser->conf->$src) . '" size="60"></td>';
+	// Color (Possible colors are limited by Google)
+	print '<td class="nowrap" align="right">';
+	//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);
+	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR_".$id.'_'.$key)?GETPOST("AGENDA_EXT_COLOR_".$id.'_'.$key):$fuser->conf->$color), "AGENDA_EXT_COLOR_".$id.'_'.$key, 'extsitesconfig', 1, '', 'hideifnotset');
+	print '</td>';
+	print "</tr>";
+	$i++;
+}
+
+print '</table>';
+
+dol_fiche_end();
+
+print '<div align="center">';
+print "<input type=\"submit\" id=\"save\" name=\"save\" class=\"button hideifnotset\" value=\"".$langs->trans("Save")."\">";
+print "</div>";
+
+print "</form>\n";
+
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
new file mode 100644
index 00000000000..429bcc91130
--- /dev/null
+++ b/htdocs/user/card.php
@@ -0,0 +1,2146 @@
+<?php
+/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
+ * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
+ * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/user/card.php
+ *       \brief      Tab of user card
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+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->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');
+
+$id			= GETPOST('id','int');
+$action		= GETPOST('action','alpha');
+$confirm	= GETPOST('confirm','alpha');
+$subaction	= GETPOST('subaction','alpha');
+$group		= GETPOST("group","int",3);
+
+// Define value to know what current user can do on users
+$canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
+$canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
+$canedituser=(! empty($user->admin) || $user->rights->user->user->creer);
+$candisableuser=(! empty($user->admin) || $user->rights->user->user->supprimer);
+$canreadgroup=$canreaduser;
+$caneditgroup=$canedituser;
+if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+    $canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
+    $caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
+}
+// Define value to know what current user can do on properties of edited user
+if ($id)
+{
+    // $user est le user qui edite, $id est l'id de l'utilisateur edite
+    $caneditfield=((($user->id == $id) && $user->rights->user->self->creer)
+    || (($user->id != $id) && $user->rights->user->user->creer));
+    $caneditpassword=((($user->id == $id) && $user->rights->user->self->password)
+    || (($user->id != $id) && $user->rights->user->user->password));
+}
+
+// Security check
+$socid=0;
+if ($user->societe_id > 0) $socid = $user->societe_id;
+$feature2='user';
+if ($user->id == $id) { $feature2=''; $canreaduser=1; } // A user can always read its own card
+if (!$canreaduser) {
+	$result = restrictedArea($user, 'user', $id, '&user', $feature2);
+}
+if ($user->id <> $id && ! $canreaduser) accessforbidden();
+
+$langs->load("users");
+$langs->load("companies");
+$langs->load("ldap");
+
+$object = new User($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('usercard','globalcard'));
+
+
+
+/**
+ * Actions
+ */
+
+if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser)
+{
+    if ($id <> $user->id)
+    {
+        $object->fetch($id);
+        $object->setstatus(0);
+        header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+        exit;
+    }
+}
+if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser)
+{
+	$error = 0;
+
+    if ($id <> $user->id)
+    {
+        $object->fetch($id);
+
+        if (!empty($conf->file->main_limit_users))
+        {
+            $nb = $object->getNbOfUsers("active");
+            if ($nb >= $conf->file->main_limit_users)
+            {
+	            $error++;
+                setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors');
+            }
+        }
+
+        if (! $error)
+        {
+            $object->setstatus(1);
+            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+            exit;
+        }
+    }
+}
+
+if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser)
+{
+    if ($id <> $user->id)
+    {
+        $object = new User($db);
+        $object->id=$id;
+        $result = $object->delete();
+        if ($result < 0)
+        {
+            $langs->load("errors");
+            setEventMessage($langs->trans("ErrorUserCannotBeDelete"), 'errors');
+        }
+        else
+        {
+            header("Location: index.php");
+            exit;
+        }
+    }
+}
+
+// Action Add user
+if ($action == 'add' && $canadduser)
+{
+	$error = 0;
+
+    if (! $_POST["lastname"])
+    {
+	    $error++;
+        setEventMessage($langs->trans("NameNotDefined"), 'errors');
+        $action="create";       // Go back to create page
+    }
+    if (! $_POST["login"])
+    {
+	    $error++;
+	    setEventMessage($langs->trans("LoginNotDefined"), 'errors');
+        $action="create";       // Go back to create page
+    }
+
+    if (! empty($conf->file->main_limit_users)) // If option to limit users is set
+    {
+        $nb = $object->getNbOfUsers("active");
+        if ($nb >= $conf->file->main_limit_users)
+        {
+	        $error++;
+	        setEventMessage($langs->trans("YourQuotaOfUsersIsReached"), 'errors');
+            $action="create";       // Go back to create page
+        }
+    }
+
+    if (!$error) {
+        $object->lastname		= GETPOST("lastname",'alpha');
+        $object->firstname	    = GETPOST("firstname",'alpha');
+        $object->login		    = GETPOST("login",'alpha');
+        $object->admin		    = GETPOST("admin",'alpha');
+        $object->office_phone	= GETPOST("office_phone",'alpha');
+        $object->office_fax	    = GETPOST("office_fax",'alpha');
+        $object->user_mobile	= GETPOST("user_mobile");
+        $object->skype          = GETPOST("skype");
+        $object->email		    = GETPOST("email",'alpha');
+        $object->job			= GETPOST("job",'alpha');
+        $object->signature	    = GETPOST("signature");
+        $object->accountancy_code = GETPOST("accountancy_code");
+        $object->note			= GETPOST("note");
+        $object->ldap_sid		= GETPOST("ldap_sid");
+        $object->fk_user        = GETPOST("fk_user")>0?GETPOST("fk_user"):0;
+
+        $object->thm            = GETPOST("thm")!=''?GETPOST("thm"):'';
+        $object->tjm            = GETPOST("tjm")!=''?GETPOST("tjm"):'';
+        $object->salary         = GETPOST("salary")!=''?GETPOST("salary"):'';
+        $object->salaryextra    = GETPOST("salaryextra")!=''?GETPOST("salaryextra"):'';
+        $object->weeklyhours    = GETPOST("weeklyhours")!=''?GETPOST("weeklyhours"):'';
+
+		$object->color			= GETPOST("color")!=''?GETPOST("color"):'';
+
+        // Fill array 'array_options' with data from add form
+        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+        // If multicompany is off, admin users must all be on entity 0.
+        if (! empty($conf->multicompany->enabled))
+        {
+        	$entity=GETPOST('entity','int');
+        	if (! empty($_POST["superadmin"]))
+        	{
+        		$object->entity = 0;
+        	}
+        	else if ($conf->multicompany->transverse_mode)
+        	{
+        		$object->entity = 1; // all users in master entity
+        	}
+        	else
+        	{
+        		$object->entity = (empty($entity) ? 0 : $entity);
+        	}
+        }
+        else
+        {
+        	$object->entity = (empty($entity) ? 0 : $entity);
+        }
+
+        $db->begin();
+
+        $id = $object->create($user);
+        if ($id > 0)
+        {
+            if (isset($_POST['password']) && trim($_POST['password']))
+            {
+                $object->setPassword($user,trim($_POST['password']));
+            }
+
+            $db->commit();
+
+            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+            exit;
+        }
+        else
+        {
+            $langs->load("errors");
+            $db->rollback();
+            if (is_array($object->errors) && count($object->errors)) setEventMessage($object->errors,'errors');
+            else setEventMessage($object->error);
+            $action="create";       // Go back to create page
+        }
+
+    }
+}
+
+// Action add usergroup
+if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
+{
+    if ($group)
+    {
+        $editgroup = new UserGroup($db);
+        $editgroup->fetch($group);
+        $editgroup->oldcopy=dol_clone($editgroup);
+
+        $object->fetch($id);
+        if ($action == 'addgroup')    $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
+        if ($action == 'removegroup') $object->RemoveFromGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
+
+        if ($result > 0)
+        {
+            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+            exit;
+        }
+        else
+        {
+            setEventMessage($object->error, 'errors');
+        }
+    }
+}
+
+if ($action == 'update' && ! $_POST["cancel"])
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    if ($caneditfield)	// Case we can edit all field
+    {
+        $error=0;
+
+    	if (! $_POST["lastname"])
+        {
+	        setEventMessage($langs->trans("NameNotDefined"), 'errors');
+            $action="edit";       // Go back to create page
+            $error++;
+        }
+        if (! $_POST["login"])
+        {
+	        setEventMessage($langs->trans("LoginNotDefined"), 'errors');
+            $action="edit";       // Go back to create page
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $object->fetch($id);
+
+            // Test if new login
+            if (GETPOST("login") && GETPOST("login") != $object->login)
+            {
+				dol_syslog("New login ".$object->login." is requested. We test it does not exists.");
+				$tmpuser=new User($db);
+				$result=$tmpuser->fetch(0, GETPOST("login"));
+				if ($result > 0)
+				{
+					setEventMessage($langs->trans("ErrorLoginAlreadyExists"), 'errors');
+					$action="edit";       // Go back to create page
+					$error++;
+				}
+            }
+       }
+
+       if (! $error)
+       {
+            $db->begin();
+
+            $object->oldcopy=dol_clone($object);
+
+            $object->lastname	= GETPOST("lastname",'alpha');
+            $object->firstname	= GETPOST("firstname",'alpha');
+            $object->login		= GETPOST("login",'alpha');
+            $object->pass		= GETPOST("password");
+            $object->admin		= empty($user->admin)?0:GETPOST("admin"); // A user can only be set admin by an admin
+            $object->office_phone=GETPOST("office_phone",'alpha');
+            $object->office_fax	= GETPOST("office_fax",'alpha');
+            $object->user_mobile= GETPOST("user_mobile");
+            $object->skype    	= GETPOST("skype");
+            $object->email		= GETPOST("email",'alpha');
+            $object->job		= GETPOST("job",'alpha');
+            $object->signature	= GETPOST("signature");
+            $object->accountancy_code	= GETPOST("accountancy_code");
+            $object->openid		= GETPOST("openid");
+            $object->fk_user    = GETPOST("fk_user")>0?GETPOST("fk_user"):0;
+
+	        $object->thm            = GETPOST("thm")!=''?GETPOST("thm"):'';
+	        $object->tjm            = GETPOST("tjm")!=''?GETPOST("tjm"):'';
+	        $object->salary         = GETPOST("salary")!=''?GETPOST("salary"):'';
+	        $object->salaryextra    = GETPOST("salaryextra")!=''?GETPOST("salaryextra"):'';
+	        $object->weeklyhours    = GETPOST("weeklyhours")!=''?GETPOST("weeklyhours"):'';
+
+			$object->color    	= GETPOST("color")!=''?GETPOST("color"):'';
+
+            // Fill array 'array_options' with data from add form
+        	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+            if (! empty($conf->multicompany->enabled))
+            {
+            	if (! empty($_POST["superadmin"]))
+            	{
+            		$object->entity = 0;
+            	}
+            	else if ($conf->multicompany->transverse_mode)
+            	{
+            		$object->entity = 1; // all users in master entity
+            	}
+            	else
+            	{
+            		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
+            	}
+            }
+            else
+            {
+            	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
+            }
+
+            if (GETPOST('deletephoto')) $object->photo='';
+            if (! empty($_FILES['photo']['name'])) $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
+
+            $ret=$object->update($user);
+
+            if ($ret < 0)
+            {
+            	$error++;
+                if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                {
+                    $langs->load("errors");
+	                setEventMessage($langs->trans("ErrorLoginAlreadyExists",$object->login), 'errors');
+                }
+                else
+              {
+	              setEventMessage($object->error, 'errors');
+                }
+            }
+
+            if (! $error && isset($_POST['contactid']))
+            {
+            	$contactid=GETPOST('contactid');
+
+            	if ($contactid > 0)
+            	{
+	            	$contact=new Contact($db);
+	            	$contact->fetch($contactid);
+
+	            	$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+	            	$sql.= " SET fk_socpeople=".$db->escape($contactid);
+	            	if ($contact->socid) $sql.=", fk_societe=".$db->escape($contact->socid);
+	            	$sql.= " WHERE rowid=".$object->id;
+            	}
+            	else
+            	{
+            		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
+            		$sql.= " SET fk_socpeople=NULL, fk_societe=NULL";
+            		$sql.= " WHERE rowid=".$object->id;
+            	}
+	            dol_syslog("fiche::update", LOG_DEBUG);
+            	$resql=$db->query($sql);
+            	if (! $resql)
+            	{
+            		$error++;
+            		setEventMessage($db->lasterror(), 'errors');
+            	}
+            }
+
+            if (! $error && ! count($object->errors))
+            {
+                if (GETPOST('deletephoto') && $object->photo)
+                {
+                    $fileimg=$conf->user->dir_output.'/'.get_exdir($object->id,2,0,1).'/logos/'.$object->photo;
+                    $dirthumbs=$conf->user->dir_output.'/'.get_exdir($object->id,2,0,1).'/logos/thumbs';
+                    dol_delete_file($fileimg);
+                    dol_delete_dir_recursive($dirthumbs);
+                }
+
+                if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name']))
+                {
+                    $dir= $conf->user->dir_output . '/' . get_exdir($object->id,2,0,1);
+
+                    dol_mkdir($dir);
+
+                    if (@is_dir($dir))
+                    {
+                        $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+                        $result=dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']);
+
+                        if (! $result > 0)
+                        {
+	                        setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors');
+                        }
+                        else
+                        {
+                            // Create small thumbs for company (Ratio is near 16/9)
+                            // Used on logon for example
+                            $imgThumbSmall = vignette($newfile, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+
+                            // Create mini thumbs for company (Ratio is near 16/9)
+                            // Used on menu or for setup page for example
+                            $imgThumbMini = vignette($newfile, $maxwidthmini, $maxheightmini, '_mini', $quality);
+                        }
+                    }
+                }
+            }
+
+            if (! $error && ! count($object->errors))
+            {
+	            setEventMessage($langs->trans("UserModified"));
+                $db->commit();
+
+                $login=$_SESSION["dol_login"];
+                if ($login && $login == $object->oldcopy->login && $object->oldcopy->login != $object->login)	// Current user has changed its login
+                {
+                	$_SESSION["dol_login"]=$object->login;	// Set new login to avoid disconnect at next page
+                }
+            }
+            else
+            {
+                $db->rollback();
+            }
+        }
+    }
+    else if ($caneditpassword)	// Case we can edit only password
+    {
+        $object->fetch($id);
+
+        $object->oldcopy=dol_clone($object);
+
+        $ret=$object->setPassword($user,$_POST["password"]);
+        if ($ret < 0)
+        {
+	        setEventMessage($object->error, 'errors');
+        }
+    }
+}
+
+// Change password with a new generated one
+if ((($action == 'confirm_password' && $confirm == 'yes')
+|| ($action == 'confirm_passwordsend' && $confirm == 'yes')) && $caneditpassword)
+{
+    $object->fetch($id);
+
+    $newpassword=$object->setPassword($user,'');
+    if ($newpassword < 0)
+    {
+        // Echec
+        setEventMessage($langs->trans("ErrorFailedToSetNewPassword"), 'errors');
+    }
+    else
+    {
+        // Succes
+        if ($action == 'confirm_passwordsend' && $confirm == 'yes')
+        {
+            if ($object->send_password($user,$newpassword) > 0)
+            {
+                setEventMessage($langs->trans("PasswordChangedAndSentTo",$object->email));
+            }
+            else
+            {
+	            setEventMessage($object->error, 'errors');
+            }
+        }
+        else
+        {
+	        setEventMessage($langs->trans("PasswordChangedTo",$newpassword), 'errors');
+        }
+    }
+}
+
+// Action initialisation donnees depuis record LDAP
+if ($action == 'adduserldap')
+{
+    $selecteduser = $_POST['users'];
+
+    $required_fields = array(
+	$conf->global->LDAP_KEY_USERS,
+    $conf->global->LDAP_FIELD_NAME,
+    $conf->global->LDAP_FIELD_FIRSTNAME,
+    $conf->global->LDAP_FIELD_LOGIN,
+    $conf->global->LDAP_FIELD_LOGIN_SAMBA,
+    $conf->global->LDAP_FIELD_PASSWORD,
+    $conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
+    $conf->global->LDAP_FIELD_PHONE,
+    $conf->global->LDAP_FIELD_FAX,
+    $conf->global->LDAP_FIELD_MOBILE,
+    $conf->global->LDAP_FIELD_SKYPE,
+    $conf->global->LDAP_FIELD_MAIL,
+    $conf->global->LDAP_FIELD_TITLE,
+	$conf->global->LDAP_FIELD_DESCRIPTION,
+    $conf->global->LDAP_FIELD_SID);
+
+    $ldap = new Ldap();
+    $result = $ldap->connect_bind();
+    if ($result >= 0)
+    {
+        // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
+        $required_fields=array_unique(array_values(array_filter($required_fields, "dol_validElement")));
+
+        $ldapusers = $ldap->getRecords($selecteduser, $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields);
+        //print_r($ldapusers);
+
+        if (is_array($ldapusers))
+        {
+            foreach ($ldapusers as $key => $attribute)
+            {
+                $ldap_lastname		= $attribute[$conf->global->LDAP_FIELD_NAME];
+                $ldap_firstname		= $attribute[$conf->global->LDAP_FIELD_FIRSTNAME];
+                $ldap_login			= $attribute[$conf->global->LDAP_FIELD_LOGIN];
+                $ldap_loginsmb		= $attribute[$conf->global->LDAP_FIELD_LOGIN_SAMBA];
+                $ldap_pass			= $attribute[$conf->global->LDAP_FIELD_PASSWORD];
+                $ldap_pass_crypted	= $attribute[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED];
+                $ldap_phone			= $attribute[$conf->global->LDAP_FIELD_PHONE];
+                $ldap_fax			= $attribute[$conf->global->LDAP_FIELD_FAX];
+                $ldap_mobile		= $attribute[$conf->global->LDAP_FIELD_MOBILE];
+                $ldap_skype			= $attribute[$conf->global->LDAP_FIELD_SKYPE];
+                $ldap_mail			= $attribute[$conf->global->LDAP_FIELD_MAIL];
+                $ldap_sid			= $attribute[$conf->global->LDAP_FIELD_SID];
+            }
+        }
+    }
+    else
+    {
+        setEventMessage($ldap->error, 'errors');
+    }
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formother=new FormOther($db);
+
+llxHeader('',$langs->trans("UserCard"));
+
+if (($action == 'create') || ($action == 'adduserldap'))
+{
+    /* ************************************************************************** */
+    /*                                                                            */
+    /* Affichage fiche en mode creation                                           */
+    /*                                                                            */
+    /* ************************************************************************** */
+
+    print_fiche_titre($langs->trans("NewUser"));
+
+    print $langs->trans("CreateInternalUserDesc");
+    print "<br>";
+    print "<br>";
+
+    if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr'))
+    {
+        /*
+         * Affiche formulaire d'ajout d'un compte depuis LDAP
+         * si on est en synchro LDAP vers Dolibarr
+         */
+
+        $ldap = new Ldap();
+        $result = $ldap->connect_bind();
+        if ($result >= 0)
+        {
+            $required_fields=array(
+				$conf->global->LDAP_KEY_USERS,
+	            $conf->global->LDAP_FIELD_FULLNAME,
+				$conf->global->LDAP_FIELD_NAME,
+				$conf->global->LDAP_FIELD_FIRSTNAME,
+				$conf->global->LDAP_FIELD_LOGIN,
+				$conf->global->LDAP_FIELD_LOGIN_SAMBA,
+				$conf->global->LDAP_FIELD_PASSWORD,
+				$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
+				$conf->global->LDAP_FIELD_PHONE,
+				$conf->global->LDAP_FIELD_FAX,
+				$conf->global->LDAP_FIELD_MOBILE,
+				$conf->global->LDAP_FIELD_SKYPE,
+				$conf->global->LDAP_FIELD_MAIL,
+				$conf->global->LDAP_FIELD_TITLE,
+				$conf->global->LDAP_FIELD_DESCRIPTION,
+            	$conf->global->LDAP_FIELD_SID
+            );
+
+            // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
+            $required_fields=array_unique(array_values(array_filter($required_fields, "dol_validElement")));
+
+            // Get from LDAP database an array of results
+            $ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 1);
+
+            if (is_array($ldapusers))
+            {
+                $liste=array();
+                foreach ($ldapusers as $key => $ldapuser)
+                {
+                    // Define the label string for this user
+                    $label='';
+                    foreach ($required_fields as $value)
+                    {
+                        if ($value)
+                        {
+                            $label.=$value."=".$ldapuser[$value]." ";
+                        }
+                    }
+                    $liste[$key] = $label;
+                }
+
+            }
+            else
+            {
+                setEventMessage($ldap->error, 'errors');
+            }
+        }
+        else
+        {
+	        setEventMessage($ldap->error, 'errors');
+        }
+
+        // If user list is full, we show drop-down list
+       	print "\n\n<!-- Form liste LDAP debut -->\n";
+
+       	print '<form name="add_user_ldap" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+       	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+       	print '<table width="100%" class="border"><tr>';
+       	print '<td width="160">';
+       	print $langs->trans("LDAPUsers");
+       	print '</td>';
+       	print '<td>';
+       	print '<input type="hidden" name="action" value="adduserldap">';
+        if (is_array($liste) && count($liste))
+        {
+        	print $form->selectarray('users', $liste, '', 1);
+        }
+       	print '</td><td align="center">';
+       	print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste)?'':' disabled="disabled"').'>';
+       	print '</td></tr></table>';
+       	print '</form>';
+
+       	print "\n<!-- Form liste LDAP fin -->\n\n";
+       	print '<br>';
+    }
+
+    print dol_set_focus('#lastname');
+
+    print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+    if (! empty($ldap_sid)) print '<input type="hidden" name="ldap_sid" value="'.$ldap_sid.'">';
+    print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+
+    print '<table class="border" width="100%">';
+
+    print '<tr>';
+
+    // Lastname
+    print '<td valign="top" width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
+    print '<td>';
+    if (! empty($ldap_lastname))
+    {
+        print '<input type="hidden" id="lastname" name="lastname" value="'.$ldap_lastname.'">';
+        print $ldap_lastname;
+    }
+    else
+    {
+        print '<input size="30" type="text" id="lastname" name="lastname" value="'.GETPOST('lastname').'">';
+    }
+    print '</td></tr>';
+
+    // Firstname
+    print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
+    print '<td>';
+    if (! empty($ldap_firstname))
+    {
+        print '<input type="hidden" name="firstname" value="'.$ldap_firstname.'">';
+        print $ldap_firstname;
+    }
+    else
+    {
+        print '<input size="30" type="text" name="firstname" value="'.GETPOST('firstname').'">';
+    }
+    print '</td></tr>';
+
+    // Position/Job
+    print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
+    print '<td>';
+    print '<input size="30" type="text" name="job" value="'.GETPOST('job').'">';
+    print '</td></tr>';
+
+    // Login
+    print '<tr><td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
+    print '<td>';
+    if (! empty($ldap_login))
+    {
+        print '<input type="hidden" name="login" value="'.$ldap_login.'">';
+        print $ldap_login;
+    }
+    elseif (! empty($ldap_loginsmb))
+    {
+        print '<input type="hidden" name="login" value="'.$ldap_loginsmb.'">';
+        print $ldap_loginsmb;
+    }
+    else
+    {
+        print '<input size="20" maxsize="24" type="text" name="login" value="'.GETPOST('login').'">';
+    }
+    print '</td></tr>';
+
+    $generated_password='';
+    if (empty($ldap_sid))    // ldap_sid is for activedirectory
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+        $generated_password=getRandomPassword(false);
+    }
+    $password=$generated_password;
+
+    // Password
+    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Password").'</td>';
+    print '<td>';
+    if (! empty($ldap_sid))
+    {
+        print 'Mot de passe du domaine';
+    }
+    else
+    {
+        if (! empty($ldap_pass))
+        {
+            print '<input type="hidden" name="password" value="'.$ldap_pass.'">';
+            print preg_replace('/./i','*',$ldap_pass);
+        }
+        else
+        {
+            // We do not use a field password but a field text to show new password to use.
+            print '<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="off">';
+        }
+    }
+    print '</td></tr>';
+
+    // Administrator
+    if (! empty($user->admin))
+    {
+        print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>';
+        print '<td>';
+        print $form->selectyesno('admin',GETPOST('admin'),1);
+
+        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+        {
+            if (! empty($conf->use_javascript_ajax))
+            {
+                print '<script type="text/javascript">
+							$(function() {
+								$("select[name=admin]").change(function() {
+									 if ( $(this).val() == 0 ) {
+									 	$("input[name=superadmin]")
+									 		.attr("disabled", true)
+									 		.attr("checked", false);
+									 	$("select[name=entity]")
+											.attr("disabled", false);
+									 } else {
+									 	$("input[name=superadmin]")
+									 		.attr("disabled", false);
+									 }
+								});
+								$("input[name=superadmin]").change(function() {
+									if ( $(this).attr("checked") == "checked" ) {
+										$("select[name=entity]")
+											.attr("disabled", true);
+									} else {
+										$("select[name=entity]")
+											.attr("disabled", false);
+									}
+								});
+							});
+					</script>';
+            }
+            $checked=($_POST["superadmin"]?' checked':'');
+            $disabled=($_POST["superadmin"]?'':' disabled');
+            print '<input type="checkbox" name="superadmin" value="1"'.$checked.$disabled.' /> '.$langs->trans("SuperAdministrator");
+        }
+        print "</td></tr>\n";
+    }
+
+    // Type
+    print '<tr><td valign="top">'.$langs->trans("Type").'</td>';
+    print '<td>';
+    print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
+    print '</td></tr>';
+
+    // Tel
+    print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>';
+    print '<td>';
+    if (! empty($ldap_phone))
+    {
+        print '<input type="hidden" name="office_phone" value="'.$ldap_phone.'">';
+        print $ldap_phone;
+    }
+    else
+    {
+        print '<input size="20" type="text" name="office_phone" value="'.GETPOST('office_phone').'">';
+    }
+    print '</td></tr>';
+
+    // Tel portable
+    print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>';
+    print '<td>';
+    if (! empty($ldap_mobile))
+    {
+        print '<input type="hidden" name="user_mobile" value="'.$ldap_mobile.'">';
+        print $ldap_mobile;
+    }
+    else
+    {
+        print '<input size="20" type="text" name="user_mobile" value="'.GETPOST('user_mobile').'">';
+    }
+    print '</td></tr>';
+
+    // Fax
+    print '<tr><td valign="top">'.$langs->trans("Fax").'</td>';
+    print '<td>';
+    if (! empty($ldap_fax))
+    {
+        print '<input type="hidden" name="office_fax" value="'.$ldap_fax.'">';
+        print $ldap_fax;
+    }
+    else
+    {
+        print '<input size="20" type="text" name="office_fax" value="'.GETPOST('office_fax').'">';
+    }
+    print '</td></tr>';
+
+    // Skype
+    if (! empty($conf->skype->enabled))
+    {
+        print '<tr><td valign="top">'.$langs->trans("Skype").'</td>';
+        print '<td>';
+        if (! empty($ldap_skype))
+        {
+            print '<input type="hidden" name="skype" value="'.$ldap_skype.'">';
+            print $ldap_skype;
+        }
+        else
+        {
+            print '<input size="40" type="text" name="skype" value="'.GETPOST('skype').'">';
+        }
+        print '</td></tr>';
+    }
+
+    // EMail
+    print '<tr><td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
+    print '<td>';
+    if (! empty($ldap_mail))
+    {
+        print '<input type="hidden" name="email" value="'.$ldap_mail.'">';
+        print $ldap_mail;
+    }
+    else
+    {
+        print '<input size="40" type="text" name="email" value="'.GETPOST('email').'">';
+    }
+    print '</td></tr>';
+
+    // Signature
+    print '<tr><td valign="top">'.$langs->trans("Signature").'</td>';
+    print '<td>';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,90);
+    print $doleditor->Create(1);
+    print '</td></tr>';
+
+    // Multicompany
+    if (! empty($conf->multicompany->enabled))
+    {
+        if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity && is_object($mc))
+        {
+            print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
+            print "<td>".$mc->select_entities($conf->entity);
+            print "</td></tr>\n";
+        }
+        else
+        {
+            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+        }
+    }
+
+    // Hierarchy
+    print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
+    print '<td>';
+    print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$conf->entity);
+    print '</td>';
+    print "</tr>\n";
+
+	if ($conf->salaries->enabled && ! empty($user->rights->salaries->read))
+	{
+		$langs->load("salaries");
+
+	    // THM
+	    print '<tr><td valign="top">'.$langs->trans("THM").'</td>';
+	    print '<td>';
+	    print '<input size="8" type="text" name="thm" value="'.GETPOST('thm').'">';
+	    print '</td>';
+	    print "</tr>\n";
+
+	    // TJM
+	    print '<tr><td valign="top">'.$langs->trans("TJM").'</td>';
+	    print '<td>';
+	    print '<input size="8" type="text" name="tjm" value="'.GETPOST('tjm').'">';
+	    print '</td>';
+	    print "</tr>\n";
+
+	    // Salary
+	    print '<tr><td valign="top">'.$langs->trans("Salary").'</td>';
+	    print '<td>';
+	    print '<input size="8" type="text" name="salary" value="'.GETPOST('salary').'">';
+	    print '</td>';
+	    print "</tr>\n";
+	}
+
+    // Weeklyhours
+    print '<tr><td valign="top">'.$langs->trans("WeeklyHours").'</td>';
+    print '<td>';
+    print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
+    print '</td>';
+    print "</tr>\n";
+
+	// User color
+	if (! empty($conf->agenda->enabled))
+	{
+		print '<tr><td valign="top">'.$langs->trans("ColorUser").'</td>';
+		print '<td>';
+		print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset');
+		print '</td></tr>';
+	}
+
+    // Note
+    print '<tr><td valign="top">';
+    print $langs->trans("Note");
+    print '</td><td>';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('note','','',180,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,90);
+    $doleditor->Create();
+    print "</td></tr>\n";
+
+    // Other attributes
+    $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    {
+    	print $object->showOptionals($extrafields,'edit');
+    }
+
+ 	print "</table>\n";
+
+    print '<center><br><input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit"></center>';
+
+    print "</form>";
+}
+else
+{
+    /* ************************************************************************** */
+    /*                                                                            */
+    /* View and edition                                                            */
+    /*                                                                            */
+    /* ************************************************************************** */
+
+    if ($id > 0)
+    {
+        $object->fetch($id);
+        if ($res < 0) { dol_print_error($db,$object->error); exit; }
+        $res=$object->fetch_optionals($object->id,$extralabels);
+
+        // Connexion ldap
+        // pour recuperer passDoNotExpire et userChangePassNextLogon
+        if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid))
+        {
+            $ldap = new Ldap();
+            $result=$ldap->connect_bind();
+            if ($result > 0)
+            {
+                $userSearchFilter = '('.$conf->global->LDAP_FILTER_CONNECTION.'('.$ldap->getUserIdentifier().'='.$object->login.'))';
+                $entries = $ldap->fetch($object->login,$userSearchFilter);
+                if (! $entries)
+                {
+                    setEventMessage($ldap->error, 'errors');
+                }
+
+                $passDoNotExpire = 0;
+                $userChangePassNextLogon = 0;
+                $userDisabled = 0;
+                $statutUACF = '';
+
+                // Check options of user account
+                if (count($ldap->uacf) > 0)
+                {
+                    foreach ($ldap->uacf as $key => $statut)
+                    {
+                        if ($key == 65536)
+                        {
+                            $passDoNotExpire = 1;
+                            $statutUACF = $statut;
+                        }
+                    }
+                }
+                else
+                {
+                    $userDisabled = 1;
+                    $statutUACF = "ACCOUNTDISABLE";
+                }
+
+                if ($ldap->pwdlastset == 0)
+                {
+                    $userChangePassNextLogon = 1;
+                }
+            }
+        }
+
+        // Show tabs
+        $head = user_prepare_head($object);
+
+        $title = $langs->trans("User");
+        dol_fiche_head($head, 'user', $title, 0, 'user');
+
+        /*
+         * Confirmation reinitialisation mot de passe
+         */
+        if ($action == 'password')
+        {
+            print $form->formconfirm("card.php?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1);
+        }
+
+        /*
+         * Confirmation envoi mot de passe
+         */
+        if ($action == 'passwordsend')
+        {
+            print $form->formconfirm("card.php?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1);
+        }
+
+        /*
+         * Confirm deactivation
+         */
+        if ($action == 'disable')
+        {
+            print $form->formconfirm("card.php?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1);
+        }
+
+        /*
+         * Confirm activation
+         */
+        if ($action == 'enable')
+        {
+            print $form->formconfirm("card.php?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1);
+        }
+
+        /*
+         * Confirmation suppression
+         */
+        if ($action == 'delete')
+        {
+            print $form->formconfirm("card.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
+        }
+
+        /*
+         * Fiche en mode visu
+         */
+        if ($action != 'edit')
+        {
+            $rowspan=17;
+
+            print '<table class="border" width="100%">';
+
+            // Ref
+            print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
+            print '<td colspan="3">';
+            print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
+            print '</td>';
+            print '</tr>'."\n";
+
+            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++;
+            if (! empty($conf->societe->enabled)) $rowspan++;
+            if (! empty($conf->adherent->enabled)) $rowspan++;
+            if (! empty($conf->skype->enabled)) $rowspan++;
+			if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $rowspan = $rowspan+3;
+			if (! empty($conf->agenda->enabled)) $rowspan++;
+
+            // Lastname
+            print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>';
+            print '<td colspan="2">'.$object->lastname.'</td>';
+
+            // Photo
+            print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
+            print $form->showphoto('userphoto',$object,100);
+            print '</td>';
+
+            print '</tr>'."\n";
+
+            // Firstname
+            print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
+            print '<td colspan="2">'.$object->firstname.'</td>';
+            print '</tr>'."\n";
+
+            // Position/Job
+            print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
+            print '<td colspan="2">'.$object->job.'</td>';
+            print '</tr>'."\n";
+
+            // Login
+            print '<tr><td valign="top">'.$langs->trans("Login").'</td>';
+            if (! empty($object->ldap_sid) && $object->statut==0)
+            {
+                print '<td colspan="2" class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
+            }
+            else
+            {
+                print '<td colspan="2">'.$object->login.'</td>';
+            }
+            print '</tr>'."\n";
+
+            // Password
+            print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
+            if (! empty($object->ldap_sid))
+            {
+                if ($passDoNotExpire)
+                {
+                    print '<td colspan="2">'.$langs->trans("LdapUacf_".$statutUACF).'</td>';
+                }
+                else if($userChangePassNextLogon)
+                {
+                    print '<td colspan="2" class="warning">'.$langs->trans("UserMustChangePassNextLogon",$ldap->domainFQDN).'</td>';
+                }
+                else if($userDisabled)
+                {
+                    print '<td colspan="2" class="warning">'.$langs->trans("LdapUacf_".$statutUACF,$ldap->domainFQDN).'</td>';
+                }
+                else
+                {
+                    print '<td colspan="2">'.$langs->trans("DomainPassword").'</td>';
+                }
+            }
+            else
+            {
+                print '<td colspan="2">';
+                if ($object->pass) print preg_replace('/./i','*',$object->pass);
+                else
+                {
+                    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
+                    else print $langs->trans("Hidden");
+                }
+                print "</td>";
+            }
+            print '</tr>'."\n";
+
+            // Administrator
+            print '<tr><td valign="top">'.$langs->trans("Administrator").'</td><td colspan="2">';
+            if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity)
+            {
+                print $form->textwithpicto(yn($object->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
+            }
+            else if ($object->admin)
+            {
+                print $form->textwithpicto(yn($object->admin),$langs->trans("AdministratorDesc"),1,"admin");
+            }
+            else
+            {
+                print yn($object->admin);
+            }
+            print '</td></tr>'."\n";
+
+            // Type
+            print '<tr><td valign="top">'.$langs->trans("Type").'</td><td colspan="2">';
+            $type=$langs->trans("Internal");
+            if ($object->societe_id) $type=$langs->trans("External");
+            print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
+            if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+            print '</td></tr>'."\n";
+
+            // Ldap sid
+            if ($object->ldap_sid)
+            {
+            	print '<tr><td valign="top">'.$langs->trans("Type").'</td><td colspan="2">';
+            	print $langs->trans("DomainUser",$ldap->domainFQDN);
+            	print '</td></tr>'."\n";
+            }
+
+            // Tel pro
+            print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>';
+            print '<td colspan="2">'.dol_print_phone($object->office_phone,'',0,0,1).'</td>';
+            print '</tr>'."\n";
+
+            // Tel mobile
+            print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>';
+            print '<td colspan="2">'.dol_print_phone($object->user_mobile,'',0,0,1).'</td>';
+            print '</tr>'."\n";
+
+            // Fax
+            print '<tr><td valign="top">'.$langs->trans("Fax").'</td>';
+            print '<td colspan="2">'.dol_print_phone($object->office_fax,'',0,0,1).'</td>';
+            print '</tr>'."\n";
+
+            // Skype
+            if (! empty($conf->skype->enabled))
+            {
+				print '<tr><td valign="top">'.$langs->trans("Skype").'</td>';
+                print '<td colspan="2">'.dol_print_skype($object->skype,0,0,1).'</td>';
+                print "</tr>\n";
+            }
+
+            // EMail
+            print '<tr><td valign="top">'.$langs->trans("EMail").'</td>';
+            print '<td colspan="2">'.dol_print_email($object->email,0,0,1).'</td>';
+            print "</tr>\n";
+
+            // Signature
+            print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td colspan="2">';
+            print dol_htmlentitiesbr($object->signature);
+            print "</td></tr>\n";
+
+            // Hierarchy
+            print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
+            print '<td colspan="2">';
+            if (empty($object->fk_user)) print $langs->trans("None");
+            else {
+            	$huser=new User($db);
+            	$huser->fetch($object->fk_user);
+            	print $huser->getNomUrl(1);
+            }
+            print '</td>';
+            print "</tr>\n";
+
+            if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+            {
+            	$langs->load("salaries");
+
+	            // THM
+			    print '<tr><td valign="top">'.$langs->trans("THM").'</td>';
+			    print '<td colspan="2">';
+			    print ($object->thm!=''?price($object->thm,'',$langs,1,-1,-1,$conf->currency):'');
+			    print '</td>';
+			    print "</tr>\n";
+
+	            // TJM
+			    print '<tr><td valign="top">'.$langs->trans("TJM").'</td>';
+			    print '<td colspan="2">';
+			    print ($object->tjm!=''?price($object->tjm,'',$langs,1,-1,-1,$conf->currency):'');
+			    print '</td>';
+			    print "</tr>\n";
+
+			    // Salary
+			    print '<tr><td valign="top">'.$langs->trans("Salary").'</td>';
+			    print '<td colspan="2">';
+			    print ($object->salary!=''?price($object->salary,'',$langs,1,-1,-1,$conf->currency):'');
+			    print '</td>';
+			    print "</tr>\n";
+            }
+
+		    // Weeklyhours
+		    print '<tr><td valign="top">'.$langs->trans("WeeklyHours").'</td>';
+		    print '<td colspan="2">';
+			print price2num($object->weeklyhours);
+		    print '</td>';
+		    print "</tr>\n";
+
+			// Accountancy code
+			if (! empty($conf->global->USER_ENABLE_ACCOUNTANCY_CODE))	// For the moment field is not used so must not appeared.
+			{
+				$rowspan++;
+            	print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
+            	print '<td colspan="2">'.$object->accountancy_code.'</td>';
+			}
+
+			// Color user
+			if (! empty($conf->agenda->enabled))
+            {
+				print '<tr><td valign="top">'.$langs->trans("ColorUser").'</td>';
+				print '<td colspan="2">';
+				if ($object->color) print '<input type="text" disabled="disabled" style="padding: 0; margin-top: 0; margin-bottom: 0; width: 36px; background-color: #'.$object->color.'" value="'.$object->color.'">';
+				print '</td>';
+				print "</tr>\n";
+			}
+
+            // Status
+            print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
+            print '<td colspan="2">';
+            print $object->getLibStatut(4);
+            print '</td>';
+            print '</tr>'."\n";
+
+            print '<tr><td valign="top">'.$langs->trans("LastConnexion").'</td>';
+            print '<td colspan="2">'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
+            print "</tr>\n";
+
+            print '<tr><td valign="top">'.$langs->trans("PreviousConnexion").'</td>';
+            print '<td colspan="2">'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
+            print "</tr>\n";
+
+            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
+            {
+                print '<tr><td valign="top">'.$langs->trans("OpenIDURL").'</td>';
+                print '<td colspan="2">'.$object->openid.'</td>';
+                print "</tr>\n";
+            }
+
+            // Company / Contact
+            if (! empty($conf->societe->enabled))
+            {
+                print '<tr><td valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
+                print '<td colspan="2">';
+                if (isset($object->societe_id) && $object->societe_id > 0)
+                {
+                    $societe = new Societe($db);
+                    $societe->fetch($object->societe_id);
+                    print $societe->getNomUrl(1,'');
+                }
+                else
+                {
+                    print $langs->trans("ThisUserIsNot");
+                }
+                if (! empty($object->contact_id))
+                {
+                    $contact = new Contact($db);
+                    $contact->fetch($object->contact_id);
+                    if ($object->societe_id > 0) print ' / ';
+                    else print '<br>';
+                    print '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                }
+                print '</td>';
+                print '</tr>'."\n";
+            }
+
+            // Module Adherent
+            if (! empty($conf->adherent->enabled))
+            {
+                $langs->load("members");
+                print '<tr><td valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+                print '<td colspan="2">';
+                if ($object->fk_member)
+                {
+                    $adh=new Adherent($db);
+                    $adh->fetch($object->fk_member);
+                    $adh->ref=$adh->getFullname($langs);	// Force to show login instead of id
+                    print $adh->getNomUrl(1);
+                }
+                else
+                {
+                    print $langs->trans("UserNotLinkedToMember");
+                }
+                print '</td>';
+                print '</tr>'."\n";
+            }
+
+            // Multicompany
+            // TODO This should be done with hook formObjectOption
+            if (is_object($mc))
+            {
+	            if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+	            {
+	            	print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
+	            	if ($object->admin && ! $object->entity)
+	            	{
+	            		print $langs->trans("AllEntities");
+	            	}
+	            	else
+	            	{
+	            		$mc->getInfo($object->entity);
+	            		print $mc->label;
+	            	}
+	            	print "</td></tr>\n";
+	            }
+            }
+
+          	// Other attributes
+			$parameters=array('colspan' => ' colspan="2"');
+			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			{
+				print $object->showOptionals($extrafields);
+			}
+
+			print "</table>\n";
+
+            print "</div>\n";
+
+
+            /*
+             * Buttons actions
+             */
+
+            print '<div class="tabsAction">';
+
+            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            {
+                if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
+                {
+                    print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
+                }
+                else
+                {
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
+                }
+            }
+            elseif ($caneditpassword && ! $object->ldap_sid &&
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            {
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
+            }
+
+            // Si on a un gestionnaire de generation de mot de passe actif
+            if ($conf->global->USER_PASSWORD_GENERATED != 'none')
+            {
+				if ($object->statut == 0)
+				{
+	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
+				}
+                elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                {
+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
+                }
+
+				if ($object->statut == 0)
+				{
+	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
+				}
+                else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                {
+                    if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
+                    else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
+                }
+            }
+
+            // Activer
+            if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            {
+                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a></div>';
+            }
+            // Desactiver
+            if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            {
+                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
+            }
+            // Delete
+            if ($user->id <> $id && $candisableuser &&
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            {
+            	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
+            	{
+                	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
+            	}
+            	else
+            	{
+            		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
+            	}
+            }
+
+            print "</div>\n";
+            print "<br>\n";
+
+
+
+            /*
+             * Liste des groupes dans lequel est l'utilisateur
+             */
+
+            if ($canreadgroup)
+            {
+                print_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
+
+                // On selectionne les groupes auquel fait parti le user
+                $exclude = array();
+
+                $usergroup=new UserGroup($db);
+                $groupslist = $usergroup->listGroupsForUser($object->id);
+
+                if (! empty($groupslist))
+                {
+                    if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
+                    {
+                        foreach($groupslist as $groupforuser)
+                        {
+                            $exclude[]=$groupforuser->id;
+                        }
+                    }
+                }
+
+                if ($caneditgroup)
+                {
+                    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+                    print '<input type="hidden" name="action" value="addgroup" />';
+                    print '<table class="noborder" width="100%">'."\n";
+                    print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n";
+                    print '<th>';
+                    print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
+                    print ' &nbsp; ';
+                    // Multicompany
+                    if (! empty($conf->multicompany->enabled))
+                    {
+                        if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
+                        {
+                            print '</td><td valign="top">'.$langs->trans("Entity").'</td>';
+                            print "<td>".$mc->select_entities($conf->entity);
+                        }
+                        else
+                        {
+                            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                        }
+                    }
+                    else
+                    {
+                    	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                    }
+                    print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
+                    print '</th></tr>'."\n";
+                    print '</table></form>'."\n";
+
+                    print '<br>';
+                }
+
+                /*
+                 * Groups assigned to user
+                 */
+                print '<table class="noborder" width="100%">';
+                print '<tr class="liste_titre">';
+                print '<td class="liste_titre" width="25%">'.$langs->trans("Groups").'</td>';
+                if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                {
+                	print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
+                }
+                print "<td>&nbsp;</td></tr>\n";
+
+                if (! empty($groupslist))
+                {
+                    $var=true;
+
+                    foreach($groupslist as $group)
+                    {
+                        $var=!$var;
+
+                        print "<tr ".$bc[$var].">";
+                        print '<td>';
+                        if ($caneditgroup)
+                        {
+                            print '<a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$group->id.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.'</a>';
+                        }
+                        else
+                        {
+                            print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
+                        }
+                        print '</td>';
+                        if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                        {
+                        	print '<td class="valeur">';
+                        	if (! empty($group->usergroup_entity))
+                        	{
+                        		$nb=0;
+                        		foreach($group->usergroup_entity as $group_entity)
+                        		{
+                        			$mc->getInfo($group_entity);
+                        			print ($nb > 0 ? ', ' : '').$mc->label;
+                        			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
+                        			print img_delete($langs->trans("RemoveFromGroup"));
+                        			print '</a>';
+                        			$nb++;
+                        		}
+                        	}
+                        }
+                        print '<td align="right">';
+                        if ($caneditgroup && empty($conf->multicompany->transverse_mode))
+                        {
+                            print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
+                            print img_delete($langs->trans("RemoveFromGroup"));
+                            print '</a>';
+                        }
+                        else
+                        {
+                            print "&nbsp;";
+                        }
+                        print "</td></tr>\n";
+                    }
+                }
+                else
+                {
+                    print '<tr '.$bc[false].'><td colspan="3">'.$langs->trans("None").'</td></tr>';
+                }
+
+                print "</table>";
+                print "<br>";
+            }
+        }
+
+        /*
+         * Fiche en mode edition
+         */
+        if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
+        {
+            $rowspan=15;
+            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++;
+            if (! empty($conf->societe->enabled)) $rowspan++;
+            if (! empty($conf->adherent->enabled)) $rowspan++;
+			if (! empty($conf->skype->enabled)) $rowspan++;
+			if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $rowspan = $rowspan+3;
+			if (! empty($conf->agenda->enabled)) $rowspan++;
+
+        	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
+            print '<table width="100%" class="border">';
+
+            print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
+            print '<td colspan="2">';
+            print $object->id;
+            print '</td>';
+            print '</tr>';
+
+            // Lastname
+            print "<tr>";
+            print '<td valign="top" class="fieldrequired">'.$langs->trans("Lastname").'</td>';
+            print '<td>';
+            if ($caneditfield && !$object->ldap_sid)
+            {
+                print '<input size="30" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
+                print $object->lastname;
+            }
+            print '</td>';
+            // Photo
+            print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
+            print $form->showphoto('userphoto',$object);
+            if ($caneditfield)
+            {
+                if ($object->photo) print "<br>\n";
+                print '<table class="nobordernopadding hideonsmartphone">';
+                if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
+                print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+                print '</table>';
+            }
+            print '</td>';
+
+            print '</tr>';
+
+            // Firstname
+            print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>';
+            print '<td>';
+            if ($caneditfield && !$object->ldap_sid)
+            {
+                print '<input size="30" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
+                print $object->firstname;
+            }
+            print '</td></tr>';
+
+            // Position/Job
+            print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+            	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
+            }
+            else
+			{
+                print '<input type="hidden" name="job" value="'.$object->job.'">';
+          		print $object->job;
+            }
+            print '</td></tr>';
+
+            // Login
+            print "<tr>".'<td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
+            print '<td>';
+            if ($user->admin  && !$object->ldap_sid)
+            {
+                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="login" value="'.$object->login.'">';
+                print $object->login;
+            }
+            print '</td>';
+            print '</tr>';
+
+            // Pass
+            print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
+            print '<td>';
+            if ($object->ldap_sid)
+            {
+                $text=$langs->trans("DomainPassword");
+            }
+            else if ($caneditpassword)
+            {
+                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
+                if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
+                {
+                    $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+                }
+            }
+            else
+            {
+                $text=preg_replace('/./i','*',$object->pass);
+            }
+            print $text;
+            print "</td></tr>\n";
+
+            // Administrator
+            print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>';
+            if ($object->societe_id > 0)
+            {
+            	$langs->load("admin");
+                print '<td>';
+                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
+                print ' ('.$langs->trans("ExternalUser").')';
+                print '</td></tr>';
+            }
+            else
+            {
+                print '<td>';
+                $nbSuperAdmin = $user->getNbOfUsers('superadmin');
+                if ($user->admin
+                && ($user->id != $object->id)                    // Don't downgrade ourself
+                && ($object->entity > 0 || $nbSuperAdmin > 1)    // Don't downgrade a superadmin if alone
+                )
+                {
+                    print $form->selectyesno('admin',$object->admin,1);
+
+                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
+                    {
+                        if ($conf->use_javascript_ajax)
+                        {
+                            print '<script type="text/javascript">
+									$(function() {
+										var admin = $("select[name=admin]").val();
+										if (admin == 0) {
+											$("input[name=superadmin]")
+													.attr("disabled", true)
+													.attr("checked", false);
+										}
+										if ($("input[name=superadmin]").attr("checked") == "checked") {
+											$("select[name=entity]")
+													.attr("disabled", true);
+										}
+										$("select[name=admin]").change(function() {
+											 if ( $(this).val() == 0 ) {
+											 	$("input[name=superadmin]")
+											 		.attr("disabled", true)
+											 		.attr("checked", false);
+											 	$("select[name=entity]")
+													.attr("disabled", false);
+											 } else {
+											 	$("input[name=superadmin]")
+											 		.attr("disabled", false);
+											 }
+										});
+										$("input[name=superadmin]").change(function() {
+											if ( $(this).attr("checked") == "checked" ) {
+												$("select[name=entity]")
+													.attr("disabled", true);
+											} else {
+												$("select[name=entity]")
+													.attr("disabled", false);
+											}
+										});
+									});
+								</script>';
+                        }
+
+                        $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
+                        print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
+                    }
+                }
+                else
+                {
+                    $yn = yn($object->admin);
+                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
+                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
+                    if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
+                    else print $yn;
+                }
+                print '</td></tr>';
+            }
+
+           	// Type
+           	print '<tr><td width="25%" valign="top">'.$langs->trans("Type").'</td>';
+           	print '<td>';
+           	if ($user->id == $object->id || ! $user->admin)
+           	{
+	           	$type=$langs->trans("Internal");
+    	       	if ($object->societe_id) $type=$langs->trans("External");
+        	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
+	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+           	}
+           	else
+			{
+				$type=0;
+	            if ($object->contact_id) $type=$object->contact_id;
+	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
+	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
+            }
+           	print '</td></tr>';
+
+            // Tel pro
+            print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
+                print $object->office_phone;
+            }
+            print '</td></tr>';
+
+            // Tel mobile
+            print "<tr>".'<td valign="top">'.$langs->trans("PhoneMobile").'</td>';
+            print '<td>';
+            if ($caneditfield && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
+                print $object->user_mobile;
+            }
+            print '</td></tr>';
+
+            // Fax
+            print "<tr>".'<td valign="top">'.$langs->trans("Fax").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
+                print $object->office_fax;
+            }
+            print '</td></tr>';
+
+            // Skype
+            if (! empty($conf->skype->enabled))
+            {
+                print '<tr><td valign="top">'.$langs->trans("Skype").'</td>';
+                print '<td>';
+                if ($caneditfield  && empty($object->ldap_sid))
+                {
+                    print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
+                }
+                else
+                {
+                    print '<input type="hidden" name="skype" value="'.$object->skype.'">';
+                    print $object->skype;
+                }
+                print '</td></tr>';
+            }
+
+            // EMail
+            print "<tr>".'<td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
+            print '<td>';
+            if ($caneditfield  && empty($object->ldap_sid))
+            {
+                print '<input size="40" type="text" name="email" class="flat" value="'.$object->email.'">';
+            }
+            else
+            {
+                print '<input type="hidden" name="email" value="'.$object->email.'">';
+                print $object->email;
+            }
+            print '</td></tr>';
+
+            // Signature
+            print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,72);
+	            print $doleditor->Create(1);
+            }
+            else
+			{
+          		print dol_htmlentitiesbr($object->signature);
+            }
+            print '</td></tr>';
+
+            // OpenID url
+            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
+            {
+                print "<tr>".'<td valign="top">'.$langs->trans("OpenIDURL").'</td>';
+                print '<td>';
+                if ($caneditfield)
+                {
+                    print '<input size="40" type="url" name="openid" class="flat" value="'.$object->openid.'">';
+                }
+                else
+              {
+                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
+                    print $object->openid;
+                }
+                print '</td></tr>';
+            }
+
+            // Hierarchy
+            print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
+            print '<td>';
+            if ($caneditfield)
+            {
+            	print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$object->entity);
+            }
+            else
+          {
+          		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
+            	$huser=new User($db);
+            	$huser->fetch($object->fk_user);
+            	print $huser->getNomUrl(1);
+            }
+            print '</td>';
+            print "</tr>\n";
+
+            if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
+            {
+            	$langs->load("salaries");
+
+            	// THM
+			    print '<tr><td valign="top">'.$langs->trans("THM").'</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm')?GETPOST('thm'):$object->thm).'">';
+			    print '</td>';
+			    print "</tr>\n";
+
+			    // TJM
+			    print '<tr><td valign="top">'.$langs->trans("TJM").'</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm')?GETPOST('tjm'):$object->tjm).'">';
+			    print '</td>';
+			    print "</tr>\n";
+
+			    // Salary
+			    print '<tr><td valign="top">'.$langs->trans("Salary").'</td>';
+			    print '<td>';
+			    print '<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary')?GETPOST('salary'):$object->salary).'">';
+			    print '</td>';
+			    print "</tr>\n";
+            }
+
+		    // Weeklyhours
+		    print '<tr><td valign="top">'.$langs->trans("WeeklyHours").'</td>';
+		    print '<td>';
+		    print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours')?GETPOST('weeklyhours'):$object->weeklyhours).'">';
+		    print '</td>';
+		    print "</tr>\n";
+
+		    // Accountancy code
+            if (! empty($conf->global->USER_ENABLE_ACCOUNTANCY_CODE))	// For the moment field is not used so must not appeared.
+            {
+	            print "<tr>";
+	            print '<td valign="top">'.$langs->trans("AccountancyCode").'</td>';
+	            print '<td>';
+	            if ($caneditfield)
+	            {
+	                print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
+	            }
+	            else
+	            {
+	                print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
+	                print $object->accountancy_code;
+	            }
+	            print '</td>';
+	            print "</tr>";
+            }
+
+			// User color
+			if (! empty($conf->agenda->enabled))
+            {
+				print '<tr><td valign="top">'.$langs->trans("ColorUser").'</td>';
+				print '<td>';
+				print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset');
+				print '</td></tr>';
+			}
+
+            // Status
+            print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
+            print '<td>';
+            print $object->getLibStatut(4);
+            print '</td></tr>';
+
+            // Company / Contact
+            if (! empty($conf->societe->enabled))
+            {
+                print '<tr><td width="25%" valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
+                print '<td>';
+                if ($object->societe_id > 0)
+                {
+                    $societe = new Societe($db);
+                    $societe->fetch($object->societe_id);
+                    print $societe->getNomUrl(1,'');
+                    if ($object->contact_id)
+                    {
+                        $contact = new Contact($db);
+                        $contact->fetch($object->contact_id);
+                        print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                    }
+                }
+                else
+                {
+                    print $langs->trans("ThisUserIsNot");
+                }
+                print ' ('.$langs->trans("UseTypeFieldToChange").')';
+                print '</td>';
+                print "</tr>\n";
+            }
+
+            // Module Adherent
+            if (! empty($conf->adherent->enabled))
+            {
+                $langs->load("members");
+                print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+                print '<td>';
+                if ($object->fk_member)
+                {
+                    $adh=new Adherent($db);
+                    $adh->fetch($object->fk_member);
+                    $adh->ref=$adh->login;	// Force to show login instead of id
+                    print $adh->getNomUrl(1);
+                }
+                else
+                {
+                    print $langs->trans("UserNotLinkedToMember");
+                }
+                print '</td>';
+                print "</tr>\n";
+            }
+
+            // Multicompany
+            if (! empty($conf->multicompany->enabled))
+            {
+            	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+            	{
+            		print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
+            		print "<td>".$mc->select_entities($object->entity);
+            		print "</td></tr>\n";
+            	}
+            	else
+            	{
+            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+            	}
+            }
+
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="2"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	print $object->showOptionals($extrafields,'edit');
+            }
+
+            print '</table>';
+
+            print '<br><center>';
+            print '<input value="'.$langs->trans("Save").'" class="button" type="submit" name="save">';
+            print ' &nbsp; ';
+            print '<input value="'.$langs->trans("Cancel").'" class="button" type="submit" name="cancel">';
+            print '</center>';
+
+            print '</form>';
+
+            print '</div>';
+        }
+
+		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close;
+    }
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/user/class/index.html b/htdocs/user/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index afb53bb5a5e..b2502e2140f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -51,7 +51,7 @@ class User extends CommonObject
 	var $firstname;
 	var $note;
 	var $email;
-  var $skype;
+	var $skype;
 	var $job;
 	var $signature;
 	var $office_phone;
@@ -72,8 +72,10 @@ class User extends CommonObject
 	var $datem;
 
 	//! If this is defined, it is an external user
-	var $societe_id;
-	var $contact_id;
+	var $societe_id;	// deprecated
+	var $contact_id;	// deprecated
+	var $socid;
+	var $contactid;
 
 	var $fk_member;
 	var $fk_user;
@@ -99,9 +101,14 @@ class User extends CommonObject
 	var $users;						// To store all tree of users hierarchy
 	var $parentof;					// To store an array of all parents for all ids.
 
-	var $accountancy_code;				// Accountancy code in prevision of the complete accountancy module
-	var $thm;							// Average cost of employee
+	var $accountancy_code;			// Accountancy code in prevision of the complete accountancy module
+	var $thm;						// Average cost of employee
+	var $tjm;						// Average cost of employee
+	var $salary;					// Monthly salary
+	var $salaryextra;				// Monthly salary extra
+	var $weeklyhours;				// Weekly hours
 
+	var $color;						// Define background color for user in agenda
 
 	/**
 	 *    Constructor de la classe
@@ -131,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
 	 */
@@ -156,6 +163,11 @@ class User extends CommonObject
 		$sql.= " u.openid as openid,";
 		$sql.= " u.accountancy_code,";
 		$sql.= " u.thm,";
+		$sql.= " u.tjm,";
+		$sql.= " u.salary,";
+		$sql.= " u.salaryextra,";
+		$sql.= " u.weeklyhours,";
+		$sql.= " u.color,";
 		$sql.= " u.ref_int, u.ref_ext";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
@@ -181,7 +193,7 @@ class User extends CommonObject
 			$sql.= " AND u.rowid = ".$id;
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -219,14 +231,21 @@ class User extends CommonObject
 				$this->entity		= $obj->entity;
 				$this->accountancy_code		= $obj->accountancy_code;
 				$this->thm			= $obj->thm;
+				$this->tjm			= $obj->tjm;
+				$this->salary		= $obj->salary;
+				$this->salaryextra	= $obj->salaryextra;
+				$this->weeklyhours	= $obj->weeklyhours;
+				$this->color		= $obj->color;
 
 				$this->datec				= $this->db->jdate($obj->datec);
 				$this->datem				= $this->db->jdate($obj->datem);
 				$this->datelastlogin		= $this->db->jdate($obj->datel);
 				$this->datepreviouslogin	= $this->db->jdate($obj->datep);
 
-				$this->societe_id           = $obj->fk_societe;
-				$this->contact_id           = $obj->fk_socpeople;
+				$this->societe_id           = $obj->fk_societe;		// deprecated
+				$this->contact_id           = $obj->fk_socpeople;	// deprecated
+				$this->socid                = $obj->fk_societe;
+				$this->contactid            = $obj->fk_socpeople;
 				$this->fk_member            = $obj->fk_member;
 				$this->fk_user        		= $obj->fk_user;
 
@@ -251,17 +270,16 @@ class User extends CommonObject
 		else
 		{
 			$this->error=$this->db->error();
-			dol_syslog(get_class($this)."::fetch Error -1, fails to get user - ".$this->error." - sql=".$sql, LOG_ERR);
 			return -1;
 		}
 
-		// Recupere parametrage global propre a l'utilisateur
+		// To get back the global configuration unique to the user
 		if ($loadpersonalconf)
 		{
 			$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
 			$sql.= " WHERE fk_user = ".$this->id;
 			$sql.= " AND entity = ".$conf->entity;
-			//dol_syslog(get_class($this).'::fetch load personalized conf sql='.$sql, LOG_DEBUG);
+			//dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG);
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -279,7 +297,6 @@ class User extends CommonObject
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog(get_class($this)."::fetch Error -2, fails to get setup user - ".$this->error." - sql=".$sql, LOG_ERR);
 				return -2;
 			}
 		}
@@ -288,7 +305,7 @@ class User extends CommonObject
 	}
 
 	/**
-	 *  Ajoute un droit a l'utilisateur
+	 *  Add a right to the user
 	 *
 	 * 	@param	int		$rid			id du droit a ajouter
 	 *  @param  string	$allmodule		Ajouter tous les droits du module allmodule
@@ -390,7 +407,7 @@ class User extends CommonObject
 
 
 	/**
-	 *  Retire un droit a l'utilisateur
+	 *  Remove a right to the user
 	 *
 	 *  @param	int		$rid        Id du droit a retirer
 	 *  @param  string	$allmodule  Retirer tous les droits du module allmodule
@@ -537,7 +554,7 @@ class User extends CommonObject
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
 
-		dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG);
+		dol_syslog(get_class($this).'::getrights', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -587,7 +604,7 @@ class User extends CommonObject
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
 
-		dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG);
+		dol_syslog(get_class($this).'::getrights', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -658,21 +675,19 @@ class User extends CommonObject
 
 		$this->db->begin();
 
-		// Desactive utilisateur
+		// Deactivate user
 		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 		$sql.= " SET statut = ".$this->statut;
 		$sql.= " WHERE rowid = ".$this->id;
 		$result = $this->db->query($sql);
 
-		dol_syslog(get_class($this)."::setstatus sql=".$sql);
+		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
 		if ($result)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('USER_ENABLEDISABLE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('USER_ENABLEDISABLE',$user);
+            if ($result < 0) { $error++; }
+            // End call triggers
 		}
 
 		if ($error)
@@ -703,13 +718,15 @@ class User extends CommonObject
 
 		$this->fetch($this->id);
 
-		// Supprime droits
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+
+		// Remove rights
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id;
+
 		if (! $error && ! $this->db->query($sql))
 		{
 			$error++;
         	$this->error = $this->db->lasterror();
-        	dol_syslog(get_class($this)."::delete error -1 ".$this->error, LOG_ERR);
 		}
 
 		// Remove group
@@ -718,10 +735,9 @@ class User extends CommonObject
 		{
 			$error++;
         	$this->error = $this->db->lasterror();
-        	dol_syslog(get_class($this)."::delete error -2 ".$this->error, LOG_ERR);
 		}
 
-		// Si contact, supprime lien
+		// If contact, remove link
 		if ($this->contact_id)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".$this->contact_id;
@@ -729,7 +745,6 @@ class User extends CommonObject
 			{
 				$error++;
 	        	$this->error = $this->db->lasterror();
-	        	dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
 			}
 		}
 
@@ -748,23 +763,25 @@ class User extends CommonObject
         if (! $error)
         {
 	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->id;
-	       	dol_syslog(get_class($this)."::delete sql=".$sql);
+	       	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 	       	if (! $this->db->query($sql))
 	       	{
 	       		$error++;
 	       		$this->error = $this->db->lasterror();
-	       		dol_syslog(get_class($this)."::delete error -5 ".$this->error, LOG_ERR);
 	       	}
         }
 
 		if (! $error)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('USER_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('USER_DELETE',$user);
+	        if ($result < 0)
+	        {
+	            $error++;
+	            $this->db->rollback();
+			    return -1;
+	        }
+            // End call triggers
 
 			$this->db->commit();
 			return 1;
@@ -811,7 +828,7 @@ class User extends CommonObject
 		$sql.= " WHERE login ='".$this->db->escape($this->login)."'";
 		$sql.= " AND entity IN (0,".$this->db->escape($conf->entity).")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -831,7 +848,7 @@ class User extends CommonObject
 				$sql.= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->ldap_sid."',".$this->db->escape($this->entity).")";
 				$result=$this->db->query($sql);
 
-				dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				if ($result)
 				{
 					$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");
@@ -866,12 +883,10 @@ class User extends CommonObject
 
 					if (! $notrigger)
 					{
-						// Appel des triggers
-						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-						$interface = new Interfaces($this->db);
-						$result = $interface->run_triggers('USER_CREATE',$this,$user,$langs,$conf);
-						if ($result < 0) { $error++; $this->errors=$interface->errors; }
-						// Fin appel triggers
+                        // Call trigger
+                        $result=$this->call_trigger('USER_CREATE',$user);
+            	        if ($result < 0) { $error++; }
+                        // End call triggers
 					}
 
 					if (! $error)
@@ -881,7 +896,7 @@ class User extends CommonObject
 					}
 					else
 					{
-						$this->error=$interface->error;
+						//$this->error=$interface->error;
 						dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
@@ -890,7 +905,6 @@ class User extends CommonObject
 				else
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -2;
 				}
@@ -899,7 +913,6 @@ class User extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -950,15 +963,13 @@ class User extends CommonObject
 			$sql.= " WHERE rowid=".$this->id;
 			$resql=$this->db->query($sql);
 
-			dol_syslog(get_class($this)."::create_from_contact sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::create_from_contact", LOG_DEBUG);
 			if ($resql)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface = new Interfaces($this->db);
-				$result = $interface->run_triggers('USER_CREATE_FROM_CONTACT',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('USER_CREATE_FROM_CONTACT',$user);
+                if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+                // End call triggers
 
 				$this->db->commit();
 				return $this->id;
@@ -966,7 +977,6 @@ class User extends CommonObject
 			else
 			{
 				$this->error=$this->db->error();
-				dol_syslog(get_class($this)."::create_from_contact ".$this->error, LOG_ERR);
 
 				$this->db->rollback();
 				return -1;
@@ -1025,7 +1035,7 @@ class User extends CommonObject
 				$sql.= " SET fk_societe=".$member->fk_soc;
 				$sql.= " WHERE rowid=".$this->id;
 
-				dol_syslog(get_class($this)."::create_from_member sql=".$sql, LOG_DEBUG);
+				dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if ($resql)
 				{
@@ -1035,7 +1045,6 @@ class User extends CommonObject
 				else
 				{
 					$this->error=$this->db->lasterror();
-					dol_syslog(get_class($this)."::create_from_member - 1 - ".$this->error, LOG_ERR);
 
 					$this->db->rollback();
 					return -1;
@@ -1051,15 +1060,13 @@ class User extends CommonObject
 		else
 		{
 			// $this->error deja positionne
-			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error, LOG_ERR);
-
 			$this->db->rollback();
 			return -2;
 		}
 	}
 
 	/**
-	 *    Affectation des permissions par defaut
+	 *    Assign rights by default
 	 *
 	 *    @return     Si erreur <0, si ok renvoi le nbre de droits par defaut positionnes
 	 */
@@ -1138,6 +1145,7 @@ class User extends CommonObject
 		$this->zip			= empty($this->zip)?'':$this->zip;
 		$this->town			= empty($this->town)?'':$this->town;
 		$this->accountancy_code = trim($this->accountancy_code);
+		$this->color 		= empty($this->color)?'':$this->color;
 
 		// Check parameters
 		if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email))
@@ -1168,15 +1176,20 @@ class User extends CommonObject
 		$sql.= ", job = '".$this->db->escape($this->job)."'";
 		$sql.= ", signature = '".$this->db->escape($this->signature)."'";
 		$sql.= ", accountancy_code = '".$this->db->escape($this->accountancy_code)."'";
-		$sql.= ", thm = ".(isset($this->thm)?$this->thm:"null");	// If not set, we use null
+		$sql.= ", color = '".$this->db->escape($this->color)."'";
 		$sql.= ", note = '".$this->db->escape($this->note)."'";
 		$sql.= ", photo = ".($this->photo?"'".$this->db->escape($this->photo)."'":"null");
 		$sql.= ", openid = ".($this->openid?"'".$this->db->escape($this->openid)."'":"null");
 		$sql.= ", fk_user = ".($this->fk_user > 0?"'".$this->db->escape($this->fk_user)."'":"null");
+		if (isset($this->thm) || $this->thm != '')                 $sql.= ", thm= ".($this->thm != ''?"'".$this->db->escape($this->thm)."'":"null");
+		if (isset($this->tjm) || $this->tjm != '')                 $sql.= ", tjm= ".($this->tjm != ''?"'".$this->db->escape($this->tjm)."'":"null");
+		if (isset($this->salary) || $this->salary != '')           $sql.= ", salary= ".($this->salary != ''?"'".$this->db->escape($this->salary)."'":"null");
+		if (isset($this->salaryextra) || $this->salaryextra != '') $sql.= ", salaryextra= ".($this->salaryextra != ''?"'".$this->db->escape($this->salaryextra)."'":"null");
+		$sql.= ", weeklyhours= ".($this->weeklyhours != ''?"'".$this->db->escape($this->weeklyhours)."'":"null");
 		$sql.= ", entity = '".$this->entity."'";
 		$sql.= " WHERE rowid = ".$this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1197,13 +1210,13 @@ class User extends CommonObject
 			if ($this->fk_member > 0)
 			{
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member;
-				dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+				dol_syslog(get_class($this)."::update", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
 			}
 			// Set link to user
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member>0?$this->fk_member:'null')." where rowid = ".$this->id;
-			dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::update", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
 
@@ -1252,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
@@ -1271,12 +1287,10 @@ class User extends CommonObject
 
 			if (! $error && ! $notrigger)
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('USER_MODIFY',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+                // Call trigger
+                $result=$this->call_trigger('USER_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
 			if (! $error)
@@ -1286,7 +1300,6 @@ class User extends CommonObject
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
 				dol_syslog(get_class($this)."::update error=".$this->error,LOG_ERR);
 				$this->db->rollback();
 				return -1;
@@ -1295,7 +1308,6 @@ class User extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::update error=".$this->error,LOG_ERR);
 			$this->db->rollback();
 			return -2;
 		}
@@ -1367,6 +1379,8 @@ class User extends CommonObject
 		{
 		    if (! is_object($this->oldcopy)) $this->oldcopy=dol_clone($this);
 
+		    $this->db->begin();
+
 		    $sql = "UPDATE ".MAIN_DB_PREFIX."user";
 			$sql.= " SET pass_crypted = '".$this->db->escape($password_crypted)."',";
 			$sql.= " pass_temp = null";
@@ -1380,7 +1394,7 @@ class User extends CommonObject
 			}
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::setPassword sql=hidden", LOG_DEBUG);
+			dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result)
 			{
@@ -1420,23 +1434,24 @@ class User extends CommonObject
 
 					if (! $error && ! $notrigger)
 					{
-						// Appel des triggers
-						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-						$interface=new Interfaces($this->db);
-						$result=$interface->run_triggers('USER_NEW_PASSWORD',$this,$user,$langs,$conf);
-						if ($result < 0) $this->errors=$interface->errors;
-						// Fin appel triggers
+                        // Call trigger
+                        $result=$this->call_trigger('USER_NEW_PASSWORD',$user);
+                        if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+                        // End call triggers
 					}
 
+					$this->db->commit();
 					return $this->pass;
 				}
 				else
 				{
+				    $this->db->rollback();
 					return 0;
 				}
 			}
 			else
 			{
+			    $this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -1449,7 +1464,7 @@ class User extends CommonObject
 			$sql.= " SET pass_temp = '".$this->db->escape($password)."'";
 			$sql.= " WHERE rowid = ".$this->id;
 
-			dol_syslog(get_class($this)."::setPassword sql=hidden", LOG_DEBUG);	// No log
+			dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);	// No log
 			$result = $this->db->query($sql);
 			if ($result)
 			{
@@ -1527,7 +1542,7 @@ class User extends CommonObject
 			$mesg.= $outputlangs->transnoentitiesnoconv("Password")." = ".$password."\n\n";
 			$mesg.= "\n";
 			$mesg.= $outputlangs->transnoentitiesnoconv("YouMustClickToChange")." :\n";
-			$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.$this->login."&passwordmd5=".dol_hash($password);
+			$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.$this->login."&passwordhash=".dol_hash($password);
 			$mesg.= $url."\n\n";
 			$mesg.= $outputlangs->transnoentitiesnoconv("ForgetIfNothing")."\n\n";
 			dol_syslog(get_class($this)."::send_password url=".$url);
@@ -1617,7 +1632,7 @@ class User extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial";
 		$sql .= " WHERE fk_user = ".$this->id;
 
-		dol_syslog(get_class($this).'::update_clicktodial sql='.$sql);
+		dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_clicktodial";
@@ -1628,7 +1643,7 @@ class User extends CommonObject
 		$sql .= ", '". $this->db->escape($this->clicktodial_password) ."'";
 		$sql .= ", '". $this->db->escape($this->clicktodial_poste) ."')";
 
-		dol_syslog(get_class($this).'::update_clicktodial sql='.$sql);
+		dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -1647,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
@@ -1677,12 +1692,10 @@ class User extends CommonObject
 			{
 			    $this->newgroupid=$group;
 
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('USER_SETINGROUP',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+			    // Call trigger
+                $result=$this->call_trigger('USER_SETINGROUP',$user);
+	            if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
 			if (! $error)
@@ -1692,7 +1705,6 @@ class User extends CommonObject
 			}
 			else
 			{
-				$this->error=$interface->error;
 				dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
@@ -1701,7 +1713,6 @@ class User extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -1710,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
@@ -1735,12 +1746,10 @@ class User extends CommonObject
 			{
 			    $this->oldgroupid=$group;
 
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('USER_REMOVEFROMGROUP',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+			    // Call trigger
+                $result=$this->call_trigger('USER_REMOVEFROMGROUP',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
 			if (! $error)
@@ -1759,7 +1768,6 @@ class User extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -1;
 		}
@@ -1779,7 +1787,7 @@ class User extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		if ($withpicto)
@@ -1787,7 +1795,7 @@ class User extends CommonObject
 			$result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin);
 			if ($withpicto != 2) $result.=' ';
 		}
-		$result.=$lien.$this->getFullName($langs).$lienfin;
+		$result.=$lien.$this->getFullName($langs,'','',24).$lienfin;
 		return $result;
 	}
 
@@ -1804,12 +1812,12 @@ class User extends CommonObject
 
 		$result='';
 
-		$lien = '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$this->id.'">';
+		$lien = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
 		$lienfin='</a>';
 
 		if ($option == 'xxx')
 		{
-			$lien = '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$this->id.'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
 			$lienfin='</a>';
 		}
 
@@ -1936,7 +1944,7 @@ class User extends CommonObject
 		if ($this->office_fax && ! empty($conf->global->LDAP_FIELD_FAX))	     $info[$conf->global->LDAP_FIELD_FAX] = $this->office_fax;
 		if ($this->note && ! empty($conf->global->LDAP_FIELD_DESCRIPTION))    $info[$conf->global->LDAP_FIELD_DESCRIPTION] = $this->note;
 		if ($this->email && ! empty($conf->global->LDAP_FIELD_MAIL))          $info[$conf->global->LDAP_FIELD_MAIL] = $this->email;
-    if ($this->skype && ! empty($conf->global->LDAP_FIELD_SKYPE))          $info[$conf->global->LDAP_FIELD_SKYPE] = $this->skype;
+    	if ($this->skype && ! empty($conf->global->LDAP_FIELD_SKYPE))          $info[$conf->global->LDAP_FIELD_SKYPE] = $this->skype;
 
 		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
 		{
@@ -1989,7 +1997,7 @@ class User extends CommonObject
 		$this->firstname='SPECIMEN';
 		$this->note='This is a note';
 		$this->email='email@specimen.com';
-    $this->skype='tom.hanson';
+    	$this->skype='tom.hanson';
 		$this->office_phone='0999999999';
 		$this->office_fax='0999999998';
 		$this->user_mobile='0999999997';
@@ -2199,7 +2207,7 @@ class User extends CommonObject
 		$sql.= " WHERE fk_user <> 0";
 		$sql.= " AND entity IN (".getEntity('user',1).")";
 
-		dol_syslog(get_class($this)."::load_parentof sql=".$sql);
+		dol_syslog(get_class($this)."::load_parentof", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2218,14 +2226,15 @@ class User extends CommonObject
 
 	/**
 	 * 	Reconstruit l'arborescence hierarchique des users sous la forme d'un tableau
-	 *	Renvoi un tableau de tableau('id','id_parent',...) trie selon arbre et avec:
-	 *				id = id du user
-	 *				name = nom du user
+	 *	Set and return this->users that is an array sorted according to tree with arrays of:
+	 *				id = id user
+	 *				lastname
+	 *				firstname
 	 *				fullname = nom avec chemin complet du user
-	 *				fullpath = chemin complet compose des id
+	 *				fullpath = chemin complet compose des id: "_grandparentid_parentid_id"
 	 *
 	 *  @param      int		$deleteafterid      Removed all users including the leaf $deleteafterid (and all its child) in user tree.
-	 *	@return		array		      		  	Array of users. this->users and this->parentof are set.
+	 *	@return		array		      		  	Array of users $this->users. Note: $this->parentof is also set.
 	 */
 	function get_full_tree($deleteafterid=0)
 	{
@@ -2247,7 +2256,7 @@ class User extends CommonObject
 		{
 			$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
 		}
-		dol_syslog(get_class($this)."::get_full_tree get user list sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::get_full_tree get user list", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2299,7 +2308,7 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::get_full_tree dol_sort_array", LOG_DEBUG);
 		$this->users=dol_sort_array($this->users, 'fullname', 'asc', true, false);
 
-		//$this->debug_users();
+		//var_dump($this->users);
 
 		return $this->users;
 	}
@@ -2363,24 +2372,5 @@ class User extends CommonObject
 		return;
 	}
 
-	/**
-	 *	Affiche contenu de $this->users
-	 *
-	 *	@return	void
-	 */
-	function debug_users()
-	{
-		// Affiche $this->users
-		foreach($this->users as $key => $val)
-		{
-			print 'id: '.$this->users[$key]['id'];
-			print ' name: '.$this->users[$key]['name'];
-			print ' parent: '.$this->users[$key]['fk_user'];
-			print ' fullpath: '.$this->users[$key]['fullpath'];
-			print ' fullname: '.$this->users[$key]['fullname'];
-			print "<br>\n";
-		}
-	}
-
 }
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index b43794a4b64..5ff1a928d1c 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -4,6 +4,7 @@
  * Copyright (c) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012	   Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014	   Alexis Algoud		<alexis@atm-consulting.fr>
  *
  * 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
@@ -40,6 +41,7 @@ class UserGroup extends CommonObject
 	var $id;			// Group id
 	var $entity;		// Entity of group
 	var $nom;			// Name of group
+	var $name;			// Name of group	// deprecated
 	var $globalgroup;	// Global group
 	var $note;			// Note on group
 	var $datec;			// Creation date of group
@@ -68,7 +70,7 @@ class UserGroup extends CommonObject
 	 *	Charge un objet group avec toutes ces caracteristiques (excpet ->members array)
 	 *
 	 *	@param      int		$id			id du groupe a charger
-	 *	@param      string	$groupname	nom du groupe a charger
+	 *	@param      string	$groupname	name du groupe a charger
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
 	function fetch($id='', $groupname='')
@@ -86,7 +88,7 @@ class UserGroup extends CommonObject
 			$sql.= " WHERE g.rowid = ".$id;
 		}
 
-		dol_syslog(get_class($this)."::fetch sql=".$sql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -98,13 +100,22 @@ class UserGroup extends CommonObject
 				$this->ref = $obj->rowid;
 				$this->entity = $obj->entity;
 				$this->name = $obj->name;
-				$this->nom = $obj->name; //Deprecated
+				$this->nom = $obj->name; // Deprecated
 				$this->note = $obj->note;
 				$this->datec = $obj->datec;
 				$this->datem = $obj->datem;
 
 				$this->members=$this->listUsersForGroup();
 
+
+				// Retreive all extrafield for group
+				// fetch optionals attributes and labels
+				dol_include_once('/core/class/extrafields.class.php');
+				$extrafields=new ExtraFields($this->db);
+				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
+				$this->fetch_optionals($this->id,$extralabels);
+
+
 				// Sav current LDAP Current DN
 				//$this->ldap_dn = $this->_load_ldap_dn($this->_load_ldap_info(),0);
 			}
@@ -114,7 +125,6 @@ class UserGroup extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -147,7 +157,7 @@ class UserGroup extends CommonObject
 		}
 		$sql.= " ORDER BY g.nom";
 
-		dol_syslog(get_class($this)."::listGroupsForUser sql=".$sql,LOG_DEBUG);
+		dol_syslog(get_class($this)."::listGroupsForUser", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -170,13 +180,12 @@ class UserGroup extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::listGroupsForUser ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
 
 	/**
-	 * 	Return array of users id for group this->id (or all if this->id not defined)
+	 * 	Return array of User objects for group this->id (or all if this->id not defined)
 	 *
 	 * 	@param	string	$excludefilter		Filter to exclude
 	 *  @param	int		$mode				0=Return array of user instance, 1=Return array of users id only
@@ -205,7 +214,7 @@ class UserGroup extends CommonObject
 		}
 		if (! empty($excludefilter)) $sql.=' AND ('.$excludefilter.')';
 
-		dol_syslog(get_class($this)."::listUsersForGroup sql=".$sql,LOG_DEBUG);
+		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -234,7 +243,6 @@ class UserGroup extends CommonObject
 		else
 		{
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::listUsersForGroup ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -472,7 +480,7 @@ class UserGroup extends CommonObject
 		$sql.= " AND r.perms IS NOT NULL";
 		if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
 
-		dol_syslog(get_class($this).'::getrights sql='.$sql, LOG_DEBUG);
+		dol_syslog(get_class($this).'::getrights', LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -542,17 +550,26 @@ class UserGroup extends CommonObject
 		$sql .= " WHERE fk_usergroup = ".$this->id;
 		$this->db->query($sql);
 
+		// Remove extrafields
+		if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+        {
+			$result=$this->deleteExtraFields();
+			if ($result < 0)
+			{
+           		$error++;
+           		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+           	}
+        }
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup";
 		$sql .= " WHERE rowid = ".$this->id;
 		$result=$this->db->query($sql);
 		if ($result)
 		{
-			// Appel des triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($this->db);
-			$result=$interface->run_triggers('GROUP_DELETE',$this,$user,$langs,$conf);
-			if ($result < 0) { $error++; $this->errors=$interface->errors; }
-			// Fin appel triggers
+            // Call trigger
+            $result=$this->call_trigger('GROUP_DELETE',$user);
+            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+            // End call triggers
 
 			$this->db->commit();
 			return 1;
@@ -573,7 +590,7 @@ class UserGroup extends CommonObject
 	 */
 	function create($notrigger=0)
 	{
-		global $user, $conf, $langs;
+		global $user, $conf, $langs, $hookmanager;
 
 		$error=0;
 		$now=dol_now();
@@ -583,6 +600,8 @@ class UserGroup extends CommonObject
 		$entity=$this->entity;
 		if (! empty($conf->multicompany->enabled) && $conf->entity == 1) $entity=$this->entity;
 
+		$this->db->begin();
+
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup (";
 		$sql.= "datec";
 		$sql.= ", nom";
@@ -593,7 +612,7 @@ class UserGroup extends CommonObject
 		$sql.= ",".$this->db->escape($entity);
 		$sql.= ")";
 
-		dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result=$this->db->query($sql);
 		if ($result)
 		{
@@ -601,22 +620,43 @@ class UserGroup extends CommonObject
 
 			if ($this->update(1) < 0) return -2;
 
-			if (! $notrigger)
+			$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
+			if (empty($reshook))
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('GROUP_CREATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+				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 && ! $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();
 
 			return $this->id;
 		}
 		else
 		{
+		    $this->db->rollback();
 			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::create ".$this->error,LOG_ERR);
 			return -1;
 		}
 	}
@@ -629,7 +669,7 @@ class UserGroup extends CommonObject
 	 */
 	function update($notrigger=0)
 	{
-		global $user, $conf, $langs;
+		global $user, $conf, $langs, $hookmanager;
 
 		$error=0;
 
@@ -639,31 +679,60 @@ class UserGroup extends CommonObject
 			$entity=$this->entity;
 		}
 
+		$this->db->begin();
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."usergroup SET ";
-		$sql.= " nom = '" . $this->db->escape($this->nom) . "'";
+		$sql.= " nom = '" . $this->db->escape($this->name) . "'";
 		$sql.= ", entity = " . $this->db->escape($entity);
 		$sql.= ", note = '" . $this->db->escape($this->note) . "'";
 		$sql.= " WHERE rowid = " . $this->id;
 
-		dol_syslog(get_class($this)."::update sql=".$sql);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			if (! $notrigger)
+			$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
+			if (empty($reshook))
 			{
-				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('GROUP_MODIFY',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				// Fin appel triggers
+				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 && ! $notrigger)
+			{
+                // Call trigger
+                $result=$this->call_trigger('GROUP_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
 			}
 
-			if (! $error) return 1;
-			else return -$error;
+			if (! $error)
+			{
+			    $this->db->commit();
+			    return 1;
+			}
+			else
+			{
+			    $this->db->rollback();
+			    return -$error;
+			}
 		}
 		else
 		{
+		    $this->db->rollback();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -704,8 +773,8 @@ class UserGroup extends CommonObject
 		$info["objectclass"]=explode(',',$conf->global->LDAP_GROUP_OBJECT_CLASS);
 
 		// Champs
-		if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->nom;
-		//if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->nom;
+		if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->name;
+		//if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->name;
 		if ($this->note && ! empty($conf->global->LDAP_GROUP_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION] = $this->note;
 		if (! empty($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS))
 		{
@@ -742,7 +811,7 @@ class UserGroup extends CommonObject
 		$this->ref = 'SPECIMEN';
 		$this->specimen=1;
 
-		$this->nom='DOLIBARR GROUP SPECIMEN';
+		$this->name='DOLIBARR GROUP SPECIMEN';
 		$this->note='This is a note';
 		$this->datec=time();
 		$this->datem=time();
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
new file mode 100644
index 00000000000..2659b9427c8
--- /dev/null
+++ b/htdocs/user/document.php
@@ -0,0 +1,175 @@
+<?php
+/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/user/document.php
+ *  \brief      Tab for documents linked to user
+ *  \ingroup    user
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load("users");
+$langs->load('other');
+
+
+$action=GETPOST('action');
+$confirm=GETPOST('confirm');
+$id=(GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('id','int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Define value to know what current user can do on users
+$canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
+$canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
+$canedituser=(! empty($user->admin) || $user->rights->user->user->creer);
+$candisableuser=(! empty($user->admin) || $user->rights->user->user->supprimer);
+$canreadgroup=$canreaduser;
+$caneditgroup=$canedituser;
+if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+    $canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
+    $caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
+}
+// Define value to know what current user can do on properties of edited user
+if ($id)
+{
+    // $user est le user qui edite, $id est l'id de l'utilisateur edite
+    $caneditfield=((($user->id == $id) && $user->rights->user->self->creer)
+    || (($user->id != $id) && $user->rights->user->user->creer));
+    $caneditpassword=((($user->id == $id) && $user->rights->user->self->password)
+    || (($user->id != $id) && $user->rights->user->user->password));
+}
+
+// Security check
+$socid=0;
+if ($user->societe_id > 0) $socid = $user->societe_id;
+$feature2='user';
+if ($user->id == $id) { $feature2=''; $canreaduser=1; } // A user can always read its own card
+if (!$canreaduser) {
+	$result = restrictedArea($user, 'user', $id, '&user', $feature2);
+}
+if ($user->id <> $id && ! $canreaduser) accessforbidden();
+
+// Get parameters
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+$object = new User($db);
+if ($id > 0 || ! empty($ref))
+{
+	$result = $object->fetch($id, $ref);
+
+	$entitytouseforuserdir = $object->entity;
+	if (empty($entitytouseforuserdir)) $entitytouseforuserdir=1;
+	$upload_dir = $conf->user->multidir_output[$entitytouseforuserdir] . "/" . $object->id ;
+}
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$langs->trans("ThirdParty").' - '.$langs->trans("Files"),$help_url);
+
+if ($object->id)
+{
+	/*
+	 * Affichage onglets
+	 */
+	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	$head = user_prepare_head($object);
+
+	$form=new Form($db);
+
+	dol_fiche_head($head, 'document', $langs->trans("User"),0,'user');
+
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+
+	print '<table class="border"width="100%">';
+
+    // Reference
+	print '<tr><td width="20%">'.$langs->trans('Ref').'</td>';
+	print '<td colspan="3">';
+	print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
+	print '</td>';
+	print '</tr>';
+
+    // Lastname
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur" colspan="3">'.$object->lastname.'&nbsp;</td>';
+	print '</tr>';
+
+    // Firstname
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur" colspan="3">'.$object->firstname.'&nbsp;</td></tr>';
+
+    // Login
+    print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur" colspan="3">'.$object->login.'&nbsp;</td></tr>';
+
+	// Nbre fichiers
+	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+	//Total taille
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	$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';
+}
+else
+{
+	accessforbidden('',0,0);
+}
+
+
+llxFooter();
+$db->close();
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
deleted file mode 100644
index 9b1845d6bff..00000000000
--- a/htdocs/user/fiche.php
+++ /dev/null
@@ -1,2000 +0,0 @@
-<?php
-/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
- * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
- * Copyright (C) 2012      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/user/fiche.php
- *       \brief      Tab of user card
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-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';
-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');
-
-$id			= GETPOST('id','int');
-$action		= GETPOST('action','alpha');
-$confirm	= GETPOST('confirm','alpha');
-$subaction	= GETPOST('subaction','alpha');
-$group		= GETPOST("group","int",3);
-$message='';
-
-// Define value to know what current user can do on users
-$canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
-$canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
-$canedituser=(! empty($user->admin) || $user->rights->user->user->creer);
-$candisableuser=(! empty($user->admin) || $user->rights->user->user->supprimer);
-$canreadgroup=$canreaduser;
-$caneditgroup=$canedituser;
-if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-{
-    $canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
-    $caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
-}
-// Define value to know what current user can do on properties of edited user
-if ($id)
-{
-    // $user est le user qui edite, $id est l'id de l'utilisateur edite
-    $caneditfield=((($user->id == $id) && $user->rights->user->self->creer)
-    || (($user->id != $id) && $user->rights->user->user->creer));
-    $caneditpassword=((($user->id == $id) && $user->rights->user->self->password)
-    || (($user->id != $id) && $user->rights->user->user->password));
-}
-
-// Security check
-$socid=0;
-if ($user->societe_id > 0) $socid = $user->societe_id;
-$feature2='user';
-if ($user->id == $id) { $feature2=''; $canreaduser=1; } // A user can always read its own card
-if (!$canreaduser) {
-	$result = restrictedArea($user, 'user', $id, '&user', $feature2);
-}
-if ($user->id <> $id && ! $canreaduser) accessforbidden();
-
-$langs->load("users");
-$langs->load("companies");
-$langs->load("ldap");
-
-$object = new User($db);
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
-
-// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('usercard'));
-
-
-
-/**
- * Actions
- */
-
-if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser)
-{
-    if ($id <> $user->id)
-    {
-        $object->fetch($id);
-        $object->setstatus(0);
-        header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-        exit;
-    }
-}
-if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser)
-{
-    if ($id <> $user->id)
-    {
-        $object->fetch($id);
-
-        if (!empty($conf->file->main_limit_users))
-        {
-            $nb = $object->getNbOfUsers("active");
-            if ($nb >= $conf->file->main_limit_users)
-            {
-                $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';
-            }
-        }
-
-        if (! $message)
-        {
-            $object->setstatus(1);
-            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-            exit;
-        }
-    }
-}
-
-if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser)
-{
-    if ($id <> $user->id)
-    {
-        $object = new User($db);
-        $object->id=$id;
-        $result = $object->delete();
-        if ($result < 0)
-        {
-            $langs->load("errors");
-            $message='<div class="error">'.$langs->trans("ErrorUserCannotBeDelete").'</div>';
-        }
-        else
-        {
-            header("Location: index.php");
-            exit;
-        }
-    }
-}
-
-// Action ajout user
-if ($action == 'add' && $canadduser)
-{
-    if (! $_POST["lastname"])
-    {
-        $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
-        $action="create";       // Go back to create page
-    }
-    if (! $_POST["login"])
-    {
-        $message='<div class="error">'.$langs->trans("LoginNotDefined").'</div>';
-        $action="create";       // Go back to create page
-    }
-
-    if (! empty($conf->file->main_limit_users)) // If option to limit users is set
-    {
-        $nb = $object->getNbOfUsers("active");
-        if ($nb >= $conf->file->main_limit_users)
-        {
-            $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';
-            $action="create";       // Go back to create page
-        }
-    }
-
-    if (! $message)
-    {
-        $object->lastname		= GETPOST("lastname",'alpha');
-        $object->firstname	    = GETPOST("firstname",'alpha');
-        $object->login		    = GETPOST("login",'alpha');
-        $object->admin		    = GETPOST("admin",'alpha');
-        $object->office_phone	= GETPOST("office_phone",'alpha');
-        $object->office_fax	    = GETPOST("office_fax",'alpha');
-        $object->user_mobile	= GETPOST("user_mobile");
-        $object->skype          = GETPOST("skype");
-        $object->email		    = GETPOST("email",'alpha');
-        $object->job			= GETPOST("job",'alpha');
-        $object->signature	    = GETPOST("signature");
-        $object->accountancy_code = GETPOST("accountancy_code");
-        $object->note			= GETPOST("note");
-        $object->ldap_sid		= GETPOST("ldap_sid");
-        $object->fk_user        = GETPOST("fk_user")>0?GETPOST("fk_user"):0;
-
-        // Fill array 'array_options' with data from add form
-        $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-        // If multicompany is off, admin users must all be on entity 0.
-        if (! empty($conf->multicompany->enabled))
-        {
-        	$entity=GETPOST('entity','int');
-        	if (! empty($_POST["superadmin"]))
-        	{
-        		$object->entity = 0;
-        	}
-        	else if ($conf->multicompany->transverse_mode)
-        	{
-        		$object->entity = 1; // all users in master entity
-        	}
-        	else
-        	{
-        		$object->entity = (empty($entity) ? 0 : $entity);
-        	}
-        }
-        else
-        {
-        	$object->entity = (empty($entity) ? 0 : $entity);
-        }
-
-        $db->begin();
-
-        $id = $object->create($user);
-        if ($id > 0)
-        {
-            if (isset($_POST['password']) && trim($_POST['password']))
-            {
-                $object->setPassword($user,trim($_POST['password']));
-            }
-
-            $db->commit();
-
-            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-            exit;
-        }
-        else
-        {
-            $langs->load("errors");
-            $db->rollback();
-            if (is_array($object->errors) && count($object->errors)) setEventMessage($object->errors,'errors');
-            else setEventMessage($object->error);
-            $action="create";       // Go back to create page
-        }
-
-    }
-}
-
-// Action ajout groupe utilisateur
-if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
-{
-    if ($group)
-    {
-        $editgroup = new UserGroup($db);
-        $editgroup->fetch($group);
-        $editgroup->oldcopy=dol_clone($editgroup);
-
-        $object->fetch($id);
-        if ($action == 'addgroup')    $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
-        if ($action == 'removegroup') $object->RemoveFromGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
-
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-            exit;
-        }
-        else
-        {
-            $message.=$object->error;
-        }
-    }
-}
-
-if ($action == 'update' && ! $_POST["cancel"])
-{
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    if ($caneditfield)	// Case we can edit all field
-    {
-        $error=0;
-
-    	if (! $_POST["lastname"])
-        {
-            $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
-            $action="edit";       // Go back to create page
-            $error++;
-        }
-        if (! $_POST["login"])
-        {
-            $message='<div class="error">'.$langs->trans("LoginNotDefined").'</div>';
-            $action="edit";       // Go back to create page
-            $error++;
-        }
-
-        if (! $error)
-        {
-            $object->fetch($id);
-
-            // Test if new login
-            if (GETPOST("login") && GETPOST("login") != $object->login)
-            {
-				dol_syslog("New login ".$object->login." is requested. We test it does not exists.");
-				$tmpuser=new User($db);
-				$result=$tmpuser->fetch(0, GETPOST("login"));
-				if ($result > 0)
-				{
-					$message='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists").'</div>';
-					$action="edit";       // Go back to create page
-					$error++;
-				}
-            }
-       }
-
-       if (! $error)
-       {
-            $db->begin();
-
-            $object->oldcopy=dol_clone($object);
-
-            $object->lastname	= GETPOST("lastname",'alpha');
-            $object->firstname	= GETPOST("firstname",'alpha');
-            $object->login		= GETPOST("login",'alpha');
-            $object->pass		= GETPOST("password");
-            $object->admin		= empty($user->admin)?0:GETPOST("admin"); // A user can only be set admin by an admin
-            $object->office_phone=GETPOST("office_phone",'alpha');
-            $object->office_fax	= GETPOST("office_fax",'alpha');
-            $object->user_mobile= GETPOST("user_mobile");
-            $object->skype    	= GETPOST("skype");
-            $object->email		= GETPOST("email",'alpha');
-            $object->job		= GETPOST("job",'alpha');
-            $object->signature	= GETPOST("signature");
-            $object->accountancy_code	= GETPOST("accountancy_code");
-            $object->openid		= GETPOST("openid");
-            $object->fk_user    = GETPOST("fk_user")>0?GETPOST("fk_user"):0;
-
-            // Fill array 'array_options' with data from add form
-        	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
-            if (! empty($conf->multicompany->enabled))
-            {
-            	if (! empty($_POST["superadmin"]))
-            	{
-            		$object->entity = 0;
-            	}
-            	else if ($conf->multicompany->transverse_mode)
-            	{
-            		$object->entity = 1; // all users in master entity
-            	}
-            	else
-            	{
-            		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
-            	}
-            }
-            else
-            {
-            	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
-            }
-
-            if (GETPOST('deletephoto')) $object->photo='';
-            if (! empty($_FILES['photo']['name'])) $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
-
-            $ret=$object->update($user);
-
-            if ($ret < 0)
-            {
-            	$error++;
-                if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-                {
-                    $langs->load("errors");
-                    $message.='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$object->login).'</div>';
-                }
-                else
-              {
-                    $message.='<div class="error">'.$object->error.'</div>';
-                }
-            }
-
-            if (! $error && isset($_POST['contactid']))
-            {
-            	$contactid=GETPOST('contactid');
-
-            	if ($contactid > 0)
-            	{
-	            	$contact=new Contact($db);
-	            	$contact->fetch($contactid);
-
-	            	$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-	            	$sql.= " SET fk_socpeople=".$db->escape($contactid);
-	            	if ($contact->socid) $sql.=", fk_societe=".$db->escape($contact->socid);
-	            	$sql.= " WHERE rowid=".$object->id;
-            	}
-            	else
-            	{
-            		$sql = "UPDATE ".MAIN_DB_PREFIX."user";
-            		$sql.= " SET fk_socpeople=NULL, fk_societe=NULL";
-            		$sql.= " WHERE rowid=".$object->id;
-            	}
-            	$resql=$db->query($sql);
-            	dol_syslog("fiche::update sql=".$sql, LOG_DEBUG);
-            	if (! $resql)
-            	{
-            		$error++;
-            		$message.='<div class="error">'.$db->lasterror().'</div>';
-            	}
-            }
-
-            if (! $error && ! count($object->errors))
-            {
-                if (GETPOST('deletephoto') && $object->photo)
-                {
-                    $fileimg=$conf->user->dir_output.'/'.get_exdir($object->id,2,0,1).'/logos/'.$object->photo;
-                    $dirthumbs=$conf->user->dir_output.'/'.get_exdir($object->id,2,0,1).'/logos/thumbs';
-                    dol_delete_file($fileimg);
-                    dol_delete_dir_recursive($dirthumbs);
-                }
-
-                if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name']))
-                {
-                    $dir= $conf->user->dir_output . '/' . get_exdir($object->id,2,0,1);
-
-                    dol_mkdir($dir);
-
-                    if (@is_dir($dir))
-                    {
-                        $newfile=$dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                        $result=dol_move_uploaded_file($_FILES['photo']['tmp_name'],$newfile,1,0,$_FILES['photo']['error']);
-
-                        if (! $result > 0)
-                        {
-                            $message .= '<div class="error">'.$langs->trans("ErrorFailedToSaveFile").'</div>';
-                        }
-                        else
-                        {
-                            // Create small thumbs for company (Ratio is near 16/9)
-                            // Used on logon for example
-                            $imgThumbSmall = vignette($newfile, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-
-                            // Create mini thumbs for company (Ratio is near 16/9)
-                            // Used on menu or for setup page for example
-                            $imgThumbMini = vignette($newfile, $maxwidthmini, $maxheightmini, '_mini', $quality);
-                        }
-                    }
-                }
-            }
-
-            if (! $error && ! count($object->errors))
-            {
-                $message.='<div class="ok">'.$langs->trans("UserModified").'</div>';
-                $db->commit();
-
-                $login=$_SESSION["dol_login"];
-                if ($login && $login == $object->oldcopy->login && $object->oldcopy->login != $object->login)	// Current user has changed its login
-                {
-                	$_SESSION["dol_login"]=$object->login;	// Set new login to avoid disconnect at next page
-                }
-            }
-            else
-            {
-                $db->rollback();
-            }
-        }
-    }
-    else if ($caneditpassword)	// Case we can edit only password
-    {
-        $object->fetch($id);
-
-        $object->oldcopy=dol_clone($object);
-
-        $ret=$object->setPassword($user,$_POST["password"]);
-        if ($ret < 0)
-        {
-            $message.='<div class="error">'.$object->error.'</div>';
-        }
-    }
-}
-
-// Change password with a new generated one
-if ((($action == 'confirm_password' && $confirm == 'yes')
-|| ($action == 'confirm_passwordsend' && $confirm == 'yes')) && $caneditpassword)
-{
-    $object->fetch($id);
-
-    $newpassword=$object->setPassword($user,'');
-    if ($newpassword < 0)
-    {
-        // Echec
-        $message = '<div class="error">'.$langs->trans("ErrorFailedToSetNewPassword").'</div>';
-    }
-    else
-    {
-        // Succes
-        if ($action == 'confirm_passwordsend' && $confirm == 'yes')
-        {
-            if ($object->send_password($user,$newpassword) > 0)
-            {
-                $message = '<div class="ok">'.$langs->trans("PasswordChangedAndSentTo",$object->email).'</div>';
-                //$message.=$newpassword;
-            }
-            else
-            {
-                $message = '<div class="ok">'.$langs->trans("PasswordChangedTo",$newpassword).'</div>';
-                $message.= '<div class="error">'.$object->error.'</div>';
-            }
-        }
-        else
-        {
-            $message = '<div class="ok">'.$langs->trans("PasswordChangedTo",$newpassword).'</div>';
-        }
-    }
-}
-
-// Action initialisation donnees depuis record LDAP
-if ($action == 'adduserldap')
-{
-    $selecteduser = $_POST['users'];
-
-    $required_fields = array(
-	$conf->global->LDAP_KEY_USERS,
-    $conf->global->LDAP_FIELD_NAME,
-    $conf->global->LDAP_FIELD_FIRSTNAME,
-    $conf->global->LDAP_FIELD_LOGIN,
-    $conf->global->LDAP_FIELD_LOGIN_SAMBA,
-    $conf->global->LDAP_FIELD_PASSWORD,
-    $conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
-    $conf->global->LDAP_FIELD_PHONE,
-    $conf->global->LDAP_FIELD_FAX,
-    $conf->global->LDAP_FIELD_MOBILE,
-    $conf->global->LDAP_FIELD_SKYPE,
-    $conf->global->LDAP_FIELD_MAIL,
-    $conf->global->LDAP_FIELD_TITLE,
-	$conf->global->LDAP_FIELD_DESCRIPTION,
-    $conf->global->LDAP_FIELD_SID);
-
-    $ldap = new Ldap();
-    $result = $ldap->connect_bind();
-    if ($result >= 0)
-    {
-        // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
-        $required_fields=array_unique(array_values(array_filter($required_fields, "dol_validElement")));
-
-        $ldapusers = $ldap->getRecords($selecteduser, $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields);
-        //print_r($ldapusers);
-
-        if (is_array($ldapusers))
-        {
-            foreach ($ldapusers as $key => $attribute)
-            {
-                $ldap_lastname		= $attribute[$conf->global->LDAP_FIELD_NAME];
-                $ldap_firstname		= $attribute[$conf->global->LDAP_FIELD_FIRSTNAME];
-                $ldap_login			= $attribute[$conf->global->LDAP_FIELD_LOGIN];
-                $ldap_loginsmb		= $attribute[$conf->global->LDAP_FIELD_LOGIN_SAMBA];
-                $ldap_pass			= $attribute[$conf->global->LDAP_FIELD_PASSWORD];
-                $ldap_pass_crypted	= $attribute[$conf->global->LDAP_FIELD_PASSWORD_CRYPTED];
-                $ldap_phone			= $attribute[$conf->global->LDAP_FIELD_PHONE];
-                $ldap_fax			= $attribute[$conf->global->LDAP_FIELD_FAX];
-                $ldap_mobile		= $attribute[$conf->global->LDAP_FIELD_MOBILE];
-                $ldap_skype			= $attribute[$conf->global->LDAP_FIELD_SKYPE];
-                $ldap_mail			= $attribute[$conf->global->LDAP_FIELD_MAIL];
-                $ldap_sid			= $attribute[$conf->global->LDAP_FIELD_SID];
-            }
-        }
-    }
-    else
-    {
-        $message='<div class="error">'.$ldap->error.'</div>';
-    }
-}
-
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-llxHeader('',$langs->trans("UserCard"));
-
-if (($action == 'create') || ($action == 'adduserldap'))
-{
-    /* ************************************************************************** */
-    /*                                                                            */
-    /* Affichage fiche en mode creation                                           */
-    /*                                                                            */
-    /* ************************************************************************** */
-
-    print_fiche_titre($langs->trans("NewUser"));
-
-    print $langs->trans("CreateInternalUserDesc");
-    print "<br>";
-    print "<br>";
-
-    dol_htmloutput_mesg($message);
-
-    if (! empty($conf->ldap->enabled) && (isset($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr'))
-    {
-        /*
-         * Affiche formulaire d'ajout d'un compte depuis LDAP
-         * si on est en synchro LDAP vers Dolibarr
-         */
-
-        $ldap = new Ldap();
-        $result = $ldap->connect_bind();
-        if ($result >= 0)
-        {
-            $required_fields=array(
-				$conf->global->LDAP_KEY_USERS,
-	            $conf->global->LDAP_FIELD_FULLNAME,
-				$conf->global->LDAP_FIELD_NAME,
-				$conf->global->LDAP_FIELD_FIRSTNAME,
-				$conf->global->LDAP_FIELD_LOGIN,
-				$conf->global->LDAP_FIELD_LOGIN_SAMBA,
-				$conf->global->LDAP_FIELD_PASSWORD,
-				$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
-        $conf->global->LDAP_FIELD_PHONE,
-				$conf->global->LDAP_FIELD_FAX,
-				$conf->global->LDAP_FIELD_MOBILE,
-				$conf->global->LDAP_FIELD_SKYPE,
-				$conf->global->LDAP_FIELD_MAIL,
-				$conf->global->LDAP_FIELD_TITLE,
-				$conf->global->LDAP_FIELD_DESCRIPTION,
-            	$conf->global->LDAP_FIELD_SID
-            );
-
-            // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
-            $required_fields=array_unique(array_values(array_filter($required_fields, "dol_validElement")));
-
-            // Get from LDAP database an array of results
-            $ldapusers = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 1);
-
-            if (is_array($ldapusers))
-            {
-                $liste=array();
-                foreach ($ldapusers as $key => $ldapuser)
-                {
-                    // Define the label string for this user
-                    $label='';
-                    foreach ($required_fields as $value)
-                    {
-                        if ($value)
-                        {
-                            $label.=$value."=".$ldapuser[$value]." ";
-                        }
-                    }
-                    $liste[$key] = $label;
-                }
-
-            }
-            else
-            {
-                $message='<div class="error">'.$ldap->error.'</div>';
-            }
-        }
-        else
-        {
-            $message='<div class="error">'.$ldap->error.'</div>';
-        }
-
-        // Si la liste des users est rempli, on affiche la liste deroulante
-       	print "\n\n<!-- Form liste LDAP debut -->\n";
-
-       	print '<form name="add_user_ldap" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-       	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-       	print '<table width="100%" class="border"><tr>';
-       	print '<td width="160">';
-       	print $langs->trans("LDAPUsers");
-       	print '</td>';
-       	print '<td>';
-       	print '<input type="hidden" name="action" value="adduserldap">';
-        if (is_array($liste) && count($liste))
-        {
-        	print $form->selectarray('users', $liste, '', 1);
-        }
-       	print '</td><td align="center">';
-       	print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste)?'':' disabled="disabled"').'>';
-       	print '</td></tr></table>';
-       	print '</form>';
-
-       	print "\n<!-- Form liste LDAP fin -->\n\n";
-       	print '<br>';
-    }
-
-    print dol_set_focus('#lastname');
-
-    print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" name="createuser">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-    if (! empty($ldap_sid)) print '<input type="hidden" name="ldap_sid" value="'.$ldap_sid.'">';
-    print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-
-    print '<table class="border" width="100%">';
-
-    print '<tr>';
-
-    // Lastname
-    print '<td valign="top" width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
-    print '<td>';
-    if (! empty($ldap_lastname))
-    {
-        print '<input type="hidden" id="lastname" name="lastname" value="'.$ldap_lastname.'">';
-        print $ldap_lastname;
-    }
-    else
-    {
-        print '<input size="30" type="text" id="lastname" name="lastname" value="'.GETPOST('lastname').'">';
-    }
-    print '</td></tr>';
-
-    // Firstname
-    print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
-    print '<td>';
-    if (! empty($ldap_firstname))
-    {
-        print '<input type="hidden" name="firstname" value="'.$ldap_firstname.'">';
-        print $ldap_firstname;
-    }
-    else
-    {
-        print '<input size="30" type="text" name="firstname" value="'.GETPOST('firstname').'">';
-    }
-    print '</td></tr>';
-
-    // Position/Job
-    print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
-    print '<td>';
-    print '<input size="30" type="text" name="job" value="'.GETPOST('job').'">';
-    print '</td></tr>';
-
-    // Login
-    print '<tr><td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
-    print '<td>';
-    if (! empty($ldap_login))
-    {
-        print '<input type="hidden" name="login" value="'.$ldap_login.'">';
-        print $ldap_login;
-    }
-    elseif (! empty($ldap_loginsmb))
-    {
-        print '<input type="hidden" name="login" value="'.$ldap_loginsmb.'">';
-        print $ldap_loginsmb;
-    }
-    else
-    {
-        print '<input size="20" maxsize="24" type="text" name="login" value="'.GETPOST('login').'">';
-    }
-    print '</td></tr>';
-
-    $generated_password='';
-    if (empty($ldap_sid))    // ldap_sid is for activedirectory
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        $generated_password=getRandomPassword(false);
-    }
-    $password=$generated_password;
-
-    // Mot de passe
-    print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Password").'</td>';
-    print '<td>';
-    if (! empty($ldap_sid))
-    {
-        print 'Mot de passe du domaine';
-    }
-    else
-    {
-        if (! empty($ldap_pass))
-        {
-            print '<input type="hidden" name="password" value="'.$ldap_pass.'">';
-            print preg_replace('/./i','*',$ldap_pass);
-        }
-        else
-        {
-            // We do not use a field password but a field text to show new password to use.
-            print '<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="off">';
-        }
-    }
-    print '</td></tr>';
-
-    // Administrateur
-    if (! empty($user->admin))
-    {
-        print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>';
-        print '<td>';
-        print $form->selectyesno('admin',GETPOST('admin'),1);
-
-        if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
-        {
-            if (! empty($conf->use_javascript_ajax))
-            {
-                print '<script type="text/javascript">
-							$(function() {
-								$("select[name=admin]").change(function() {
-									 if ( $(this).val() == 0 ) {
-									 	$("input[name=superadmin]")
-									 		.attr("disabled", true)
-									 		.attr("checked", false);
-									 	$("select[name=entity]")
-											.attr("disabled", false);
-									 } else {
-									 	$("input[name=superadmin]")
-									 		.attr("disabled", false);
-									 }
-								});
-								$("input[name=superadmin]").change(function() {
-									if ( $(this).attr("checked") == "checked" ) {
-										$("select[name=entity]")
-											.attr("disabled", true);
-									} else {
-										$("select[name=entity]")
-											.attr("disabled", false);
-									}
-								});
-							});
-					</script>';
-            }
-            $checked=($_POST["superadmin"]?' checked':'');
-            $disabled=($_POST["superadmin"]?'':' disabled');
-            print '<input type="checkbox" name="superadmin" value="1"'.$checked.$disabled.' /> '.$langs->trans("SuperAdministrator");
-        }
-        print "</td></tr>\n";
-    }
-
-    // Type
-    print '<tr><td valign="top">'.$langs->trans("Type").'</td>';
-    print '<td>';
-    print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
-    print '</td></tr>';
-
-    // Tel
-    print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>';
-    print '<td>';
-    if (! empty($ldap_phone))
-    {
-        print '<input type="hidden" name="office_phone" value="'.$ldap_phone.'">';
-        print $ldap_phone;
-    }
-    else
-    {
-        print '<input size="20" type="text" name="office_phone" value="'.GETPOST('office_phone').'">';
-    }
-    print '</td></tr>';
-
-    // Tel portable
-    print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>';
-    print '<td>';
-    if (! empty($ldap_mobile))
-    {
-        print '<input type="hidden" name="user_mobile" value="'.$ldap_mobile.'">';
-        print $ldap_mobile;
-    }
-    else
-    {
-        print '<input size="20" type="text" name="user_mobile" value="'.GETPOST('user_mobile').'">';
-    }
-    print '</td></tr>';
-
-    // Fax
-    print '<tr><td valign="top">'.$langs->trans("Fax").'</td>';
-    print '<td>';
-    if (! empty($ldap_fax))
-    {
-        print '<input type="hidden" name="office_fax" value="'.$ldap_fax.'">';
-        print $ldap_fax;
-    }
-    else
-    {
-        print '<input size="20" type="text" name="office_fax" value="'.GETPOST('office_fax').'">';
-    }
-    print '</td></tr>';
-
-    // Skype
-    if (! empty($conf->skype->enabled))
-    {
-        print '<tr><td valign="top">'.$langs->trans("Skype").'</td>';
-        print '<td>';
-        if (! empty($ldap_skype))
-        {
-            print '<input type="hidden" name="skype" value="'.$ldap_skype.'">';
-            print $ldap_skype;
-        }
-        else
-        {
-            print '<input size="40" type="text" name="skype" value="'.GETPOST('skype').'">';
-        }
-        print '</td></tr>';
-    }
-
-    // EMail
-    print '<tr><td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
-    print '<td>';
-    if (! empty($ldap_mail))
-    {
-        print '<input type="hidden" name="email" value="'.$ldap_mail.'">';
-        print $ldap_mail;
-    }
-    else
-    {
-        print '<input size="40" type="text" name="email" value="'.GETPOST('email').'">';
-    }
-    print '</td></tr>';
-
-    // Signature
-    print '<tr><td valign="top">'.$langs->trans("Signature").'</td>';
-    print '<td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,90);
-    print $doleditor->Create(1);
-    print '</td></tr>';
-
-    // Multicompany
-    if (! empty($conf->multicompany->enabled))
-    {
-        if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity && is_object($mc))
-        {
-            print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-            print "<td>".$mc->select_entities($conf->entity);
-            print "</td></tr>\n";
-        }
-        else
-        {
-            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-        }
-    }
-
-    // Hierarchy
-    print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
-    print '<td>';
-    print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$conf->entity);
-    print '</td>';
-    print "</tr>\n";
-
-    // Note
-    print '<tr><td valign="top">';
-    print $langs->trans("Note");
-    print '</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('note','','',180,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,90);
-    $doleditor->Create();
-    print "</td></tr>\n";
-
-    // Other attributes
-    $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
-    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-    if (empty($reshook) && ! empty($extrafields->attribute_label))
-    {
-    	print $object->showOptionals($extrafields,'edit');
-    }
-
- 	print "</table>\n";
-
-    print '<center><br><input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit"></center>';
-
-    print "</form>";
-}
-else
-{
-    /* ************************************************************************** */
-    /*                                                                            */
-    /* Visu et edition                                                            */
-    /*                                                                            */
-    /* ************************************************************************** */
-
-    if ($id > 0)
-    {
-        $object->fetch($id);
-        if ($res < 0) { dol_print_error($db,$object->error); exit; }
-        $res=$object->fetch_optionals($object->id,$extralabels);
-
-        // Connexion ldap
-        // pour recuperer passDoNotExpire et userChangePassNextLogon
-        if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid))
-        {
-            $ldap = new Ldap();
-            $result=$ldap->connect_bind();
-            if ($result > 0)
-            {
-                $userSearchFilter = '('.$conf->global->LDAP_FILTER_CONNECTION.'('.$ldap->getUserIdentifier().'='.$object->login.'))';
-                $entries = $ldap->fetch($object->login,$userSearchFilter);
-                if (! $entries)
-                {
-                    $message .= $ldap->error;
-                }
-
-                $passDoNotExpire = 0;
-                $userChangePassNextLogon = 0;
-                $userDisabled = 0;
-                $statutUACF = '';
-
-                //On verifie les options du compte
-                if (count($ldap->uacf) > 0)
-                {
-                    foreach ($ldap->uacf as $key => $statut)
-                    {
-                        if ($key == 65536)
-                        {
-                            $passDoNotExpire = 1;
-                            $statutUACF = $statut;
-                        }
-                    }
-                }
-                else
-                {
-                    $userDisabled = 1;
-                    $statutUACF = "ACCOUNTDISABLE";
-                }
-
-                if ($ldap->pwdlastset == 0)
-                {
-                    $userChangePassNextLogon = 1;
-                }
-            }
-        }
-
-        // Show tabs
-        $head = user_prepare_head($object);
-
-        $title = $langs->trans("User");
-        dol_fiche_head($head, 'user', $title, 0, 'user');
-
-        /*
-         * Confirmation reinitialisation mot de passe
-         */
-        if ($action == 'password')
-        {
-            print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1);
-        }
-
-        /*
-         * Confirmation envoi mot de passe
-         */
-        if ($action == 'passwordsend')
-        {
-            print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1);
-        }
-
-        /*
-         * Confirmation desactivation
-         */
-        if ($action == 'disable')
-        {
-            print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1);
-        }
-
-        /*
-         * Confirmation activation
-         */
-        if ($action == 'enable')
-        {
-            print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1);
-        }
-
-        /*
-         * Confirmation suppression
-         */
-        if ($action == 'delete')
-        {
-            print $form->formconfirm("fiche.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
-        }
-
-        dol_htmloutput_mesg($message);
-
-        /*
-         * Fiche en mode visu
-         */
-        if ($action != 'edit')
-        {
-            $rowspan=16;
-
-            print '<table class="border" width="100%">';
-
-            // Ref
-            print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
-            print '<td colspan="2">';
-            print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
-            print '</td>';
-            print '</tr>'."\n";
-
-            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++;
-            if (! empty($conf->societe->enabled)) $rowspan++;
-            if (! empty($conf->adherent->enabled)) $rowspan++;
-            if (! empty($conf->skype->enabled)) $rowspan++;
-
-            // Lastname
-            print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>';
-            print '<td>'.$object->lastname.'</td>';
-
-            // Photo
-            print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
-            print $form->showphoto('userphoto',$object,100);
-            print '</td>';
-
-            print '</tr>'."\n";
-
-            // Firstname
-            print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
-            print '<td>'.$object->firstname.'</td>';
-            print '</tr>'."\n";
-
-            // Position/Job
-            print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
-            print '<td>'.$object->job.'</td>';
-            print '</tr>'."\n";
-
-            // Login
-            print '<tr><td valign="top">'.$langs->trans("Login").'</td>';
-            if (! empty($object->ldap_sid) && $object->statut==0)
-            {
-                print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-            }
-            else
-            {
-                print '<td>'.$object->login.'</td>';
-            }
-            print '</tr>'."\n";
-
-            // Password
-            print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
-            if (! empty($object->ldap_sid))
-            {
-                if ($passDoNotExpire)
-                {
-                    print '<td>'.$langs->trans("LdapUacf_".$statutUACF).'</td>';
-                }
-                else if($userChangePassNextLogon)
-                {
-                    print '<td class="warning">'.$langs->trans("UserMustChangePassNextLogon",$ldap->domainFQDN).'</td>';
-                }
-                else if($userDisabled)
-                {
-                    print '<td class="warning">'.$langs->trans("LdapUacf_".$statutUACF,$ldap->domainFQDN).'</td>';
-                }
-                else
-                {
-                    print '<td>'.$langs->trans("DomainPassword").'</td>';
-                }
-            }
-            else
-            {
-                print '<td>';
-                if ($object->pass) print preg_replace('/./i','*',$object->pass);
-                else
-                {
-                    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
-                    else print $langs->trans("Hidden");
-                }
-                print "</td>";
-            }
-            print '</tr>'."\n";
-
-            // Administrator
-            print '<tr><td valign="top">'.$langs->trans("Administrator").'</td><td>';
-            if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity)
-            {
-                print $form->textwithpicto(yn($object->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
-            }
-            else if ($object->admin)
-            {
-                print $form->textwithpicto(yn($object->admin),$langs->trans("AdministratorDesc"),1,"admin");
-            }
-            else
-            {
-                print yn($object->admin);
-            }
-            print '</td></tr>'."\n";
-
-            // Type
-            print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>';
-            $type=$langs->trans("Internal");
-            if ($object->societe_id) $type=$langs->trans("External");
-            print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
-            if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-            print '</td></tr>'."\n";
-
-            // Ldap sid
-            if ($object->ldap_sid)
-            {
-            	print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>';
-            	print $langs->trans("DomainUser",$ldap->domainFQDN);
-            	print '</td></tr>'."\n";
-            }
-
-            // Tel pro
-            print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>';
-            print '<td>'.dol_print_phone($object->office_phone,'',0,0,1).'</td>';
-            print '</tr>'."\n";
-
-            // Tel mobile
-            print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>';
-            print '<td>'.dol_print_phone($object->user_mobile,'',0,0,1).'</td>';
-            print '</tr>'."\n";
-
-            // Fax
-            print '<tr><td valign="top">'.$langs->trans("Fax").'</td>';
-            print '<td>'.dol_print_phone($object->office_fax,'',0,0,1).'</td>';
-            print '</tr>'."\n";
-
-            // Skype
-            if (! empty($conf->skype->enabled))
-            {
-                print '<tr><td valign="top">'.$langs->trans("Skype").'</td>';
-                print '<td>'.dol_print_skype($object->skype,0,0,1).'</td>';
-                print "</tr>\n";
-            }
-
-            // EMail
-            print '<tr><td valign="top">'.$langs->trans("EMail").'</td>';
-            print '<td>'.dol_print_email($object->email,0,0,1).'</td>';
-            print "</tr>\n";
-
-            // Signature
-            print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
-            if (empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)) {
-            	print dol_htmlentitiesbr($object->signature);
-            } else {
-            	print $object->signature;
-            }
-            print "</td></tr>\n";
-
-            // Hierarchy
-            print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
-            print '<td>';
-            if (empty($object->fk_user)) print $langs->trans("None");
-            else {
-            	$huser=new User($db);
-            	$huser->fetch($object->fk_user);
-            	print $huser->getNomUrl(1);
-            }
-            print '</td>';
-            print "</tr>\n";
-
-			// Accountancy code
-			if (! empty($conf->global->USER_ENABLE_ACCOUNTANCY_CODE))	// For the moment field is not used so must not appeared.
-			{
-				$rowspan++;
-            	print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-            	print '<td>'.$object->accountancy_code.'</td>';
-			}
-
-            // Status
-            print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
-            print '<td>';
-            print $object->getLibStatut(4);
-            print '</td>';
-            print '</tr>'."\n";
-
-            print '<tr><td valign="top">'.$langs->trans("LastConnexion").'</td>';
-            print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
-            print "</tr>\n";
-
-            print '<tr><td valign="top">'.$langs->trans("PreviousConnexion").'</td>';
-            print '<td>'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
-            print "</tr>\n";
-
-            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
-            {
-                print '<tr><td valign="top">'.$langs->trans("OpenIDURL").'</td>';
-                print '<td>'.$object->openid.'</td>';
-                print "</tr>\n";
-            }
-
-            // Company / Contact
-            if (! empty($conf->societe->enabled))
-            {
-                print '<tr><td valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
-                print '<td>';
-                if (isset($object->societe_id) && $object->societe_id > 0)
-                {
-                    $societe = new Societe($db);
-                    $societe->fetch($object->societe_id);
-                    print $societe->getNomUrl(1,'');
-                }
-                else
-                {
-                    print $langs->trans("ThisUserIsNot");
-                }
-                if (! empty($object->contact_id))
-                {
-                    $contact = new Contact($db);
-                    $contact->fetch($object->contact_id);
-                    if ($object->societe_id > 0) print ' / ';
-                    else print '<br>';
-                    print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
-                }
-                print '</td>';
-                print '</tr>'."\n";
-            }
-
-            // Module Adherent
-            if (! empty($conf->adherent->enabled))
-            {
-                $langs->load("members");
-                print '<tr><td valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-                print '<td>';
-                if ($object->fk_member)
-                {
-                    $adh=new Adherent($db);
-                    $adh->fetch($object->fk_member);
-                    $adh->ref=$adh->getFullname($langs);	// Force to show login instead of id
-                    print $adh->getNomUrl(1);
-                }
-                else
-                {
-                    print $langs->trans("UserNotLinkedToMember");
-                }
-                print '</td>';
-                print '</tr>'."\n";
-            }
-
-            // Multicompany
-            // TODO This should be done with hook formObjectOption
-            if (is_object($mc))
-            {
-	            if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-	            {
-	            	print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
-	            	if ($object->admin && ! $object->entity)
-	            	{
-	            		print $langs->trans("AllEntities");
-	            	}
-	            	else
-	            	{
-	            		$mc->getInfo($object->entity);
-	            		print $mc->label;
-	            	}
-	            	print "</td></tr>\n";
-	            }
-            }
-
-          	// Other attributes
-			$parameters=array('colspan' => ' colspan="2"');
-			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-			if (empty($reshook) && ! empty($extrafields->attribute_label))
-			{
-				print $object->showOptionals($extrafields);
-			}
-
-			print "</table>\n";
-
-            print "</div>\n";
-
-
-            /*
-             * Buttons actions
-             */
-
-            print '<div class="tabsAction">';
-
-            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
-            {
-                if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-                {
-                    print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
-                }
-                else
-                {
-                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
-                }
-            }
-            elseif ($caneditpassword && ! $object->ldap_sid &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
-            {
-                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
-            }
-
-            // Si on a un gestionnaire de generation de mot de passe actif
-            if ($conf->global->USER_PASSWORD_GENERATED != 'none')
-            {
-				if ($object->statut == 0)
-				{
-	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
-				}
-                elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
-                {
-                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
-                }
-
-				if ($object->statut == 0)
-				{
-	                print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
-				}
-                else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
-                {
-                    if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
-                    else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
-                }
-            }
-
-            // Activer
-            if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
-            {
-                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a></div>';
-            }
-            // Desactiver
-            if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
-            {
-                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
-            }
-            // Delete
-            if ($user->id <> $id && $candisableuser &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
-            {
-            	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
-            	{
-                	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
-            	}
-            	else
-            	{
-            		print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
-            	}
-            }
-
-            print "</div>\n";
-            print "<br>\n";
-
-
-
-            /*
-             * Liste des groupes dans lequel est l'utilisateur
-             */
-
-            if ($canreadgroup)
-            {
-                print_fiche_titre($langs->trans("ListOfGroupsForUser"),'','');
-
-                // On selectionne les groupes auquel fait parti le user
-                $exclude = array();
-
-                $usergroup=new UserGroup($db);
-                $groupslist = $usergroup->listGroupsForUser($object->id);
-
-                if (! empty($groupslist))
-                {
-                    if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
-                    {
-                        foreach($groupslist as $groupforuser)
-                        {
-                            $exclude[]=$groupforuser->id;
-                        }
-                    }
-                }
-
-                if ($caneditgroup)
-                {
-                    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
-                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-                    print '<input type="hidden" name="action" value="addgroup" />';
-                    print '<table class="noborder" width="100%">'."\n";
-                    print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n";
-                    print '<th>';
-                    print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
-                    print ' &nbsp; ';
-                    // Multicompany
-                    if (! empty($conf->multicompany->enabled))
-                    {
-                        if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
-                        {
-                            print '</td><td valign="top">'.$langs->trans("Entity").'</td>';
-                            print "<td>".$mc->select_entities($conf->entity);
-                        }
-                        else
-                        {
-                            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                        }
-                    }
-                    else
-                    {
-                    	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                    }
-                    print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />';
-                    print '</th></tr>'."\n";
-                    print '</table></form>'."\n";
-
-                    print '<br>';
-                }
-
-                /*
-                 * Groups assigned to user
-                 */
-                print '<table class="noborder" width="100%">';
-                print '<tr class="liste_titre">';
-                print '<td class="liste_titre" width="25%">'.$langs->trans("Groups").'</td>';
-                if(! empty($conf->multicompany->enabled) && !empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-                {
-                	print '<td class="liste_titre" width="25%">'.$langs->trans("Entity").'</td>';
-                }
-                print "<td>&nbsp;</td></tr>\n";
-
-                if (! empty($groupslist))
-                {
-                    $var=true;
-
-                    foreach($groupslist as $group)
-                    {
-                        $var=!$var;
-
-                        print "<tr ".$bc[$var].">";
-                        print '<td>';
-                        if ($caneditgroup)
-                        {
-                            print '<a href="'.DOL_URL_ROOT.'/user/group/fiche.php?id='.$group->id.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$group->name.'</a>';
-                        }
-                        else
-                        {
-                            print img_object($langs->trans("ShowGroup"),"group").' '.$group->name;
-                        }
-                        print '</td>';
-                        if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-                        {
-                        	print '<td class="valeur">';
-                        	if (! empty($group->usergroup_entity))
-                        	{
-                        		$nb=0;
-                        		foreach($group->usergroup_entity as $group_entity)
-                        		{
-                        			$mc->getInfo($group_entity);
-                        			print ($nb > 0 ? ', ' : '').$mc->label;
-                        			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
-                        			print img_delete($langs->trans("RemoveFromGroup"));
-                        			print '</a>';
-                        			$nb++;
-                        		}
-                        	}
-                        }
-                        print '<td align="right">';
-                        if ($caneditgroup && empty($conf->multicompany->transverse_mode))
-                        {
-                            print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
-                            print img_delete($langs->trans("RemoveFromGroup"));
-                            print '</a>';
-                        }
-                        else
-                        {
-                            print "&nbsp;";
-                        }
-                        print "</td></tr>\n";
-                    }
-                }
-                else
-                {
-                    print '<tr '.$bc[false].'><td colspan="3">'.$langs->trans("None").'</td></tr>';
-                }
-
-                print "</table>";
-                print "<br>";
-            }
-        }
-
-        /*
-         * Fiche en mode edition
-         */
-        if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
-        {
-            $rowspan=15;
-            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++;
-            if (! empty($conf->societe->enabled)) $rowspan++;
-            if (! empty($conf->adherent->enabled)) $rowspan++;
-
-        	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-            print '<table width="100%" class="border">';
-
-            print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
-            print '<td colspan="2">';
-            print $object->id;
-            print '</td>';
-            print '</tr>';
-
-            // Lastname
-            print "<tr>";
-            print '<td valign="top" class="fieldrequired">'.$langs->trans("Lastname").'</td>';
-            print '<td>';
-            if ($caneditfield && !$object->ldap_sid)
-            {
-                print '<input size="30" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
-                print $object->lastname;
-            }
-            print '</td>';
-            // Photo
-            print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
-            print $form->showphoto('userphoto',$object);
-            if ($caneditfield)
-            {
-                if ($object->photo) print "<br>\n";
-                print '<table class="nobordernopadding hideonsmartphone">';
-                if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
-                print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-                print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
-                print '</table>';
-            }
-            print '</td>';
-
-            print '</tr>';
-
-            // Firstname
-            print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>';
-            print '<td>';
-            if ($caneditfield && !$object->ldap_sid)
-            {
-                print '<input size="30" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
-                print $object->firstname;
-            }
-            print '</td></tr>';
-
-            // Position/Job
-            print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-            	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-            }
-            else
-          {
-                print '<input type="hidden" name="job" value="'.$object->job.'">';
-          		print $object->job;
-            }
-            print '</td></tr>';
-
-            // Login
-            print "<tr>".'<td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
-            print '<td>';
-            if ($user->admin  && !$object->ldap_sid)
-            {
-                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="login" value="'.$object->login.'">';
-                print $object->login;
-            }
-            print '</td>';
-            print '</tr>';
-
-            // Pass
-            print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
-            print '<td>';
-            if ($object->ldap_sid)
-            {
-                $text=$langs->trans("DomainPassword");
-            }
-            else if ($caneditpassword)
-            {
-                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="off">';
-                if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
-                {
-                    $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
-                }
-            }
-            else
-            {
-                $text=preg_replace('/./i','*',$object->pass);
-            }
-            print $text;
-            print "</td></tr>\n";
-
-            // Administrator
-            print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>';
-            if ($object->societe_id > 0)
-            {
-            	$langs->load("admin");
-                print '<td>';
-                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
-                print ' ('.$langs->trans("ExternalUser").')';
-                print '</td></tr>';
-            }
-            else
-            {
-                print '<td>';
-                $nbSuperAdmin = $user->getNbOfUsers('superadmin');
-                if ($user->admin
-                && ($user->id != $object->id)                    // Don't downgrade ourself
-                && ($object->entity > 0 || $nbSuperAdmin > 1)    // Don't downgrade a superadmin if alone
-                )
-                {
-                    print $form->selectyesno('admin',$object->admin,1);
-
-                    if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
-                    {
-                        if ($conf->use_javascript_ajax)
-                        {
-                            print '<script type="text/javascript">
-									$(function() {
-										var admin = $("select[name=admin]").val();
-										if (admin == 0) {
-											$("input[name=superadmin]")
-													.attr("disabled", true)
-													.attr("checked", false);
-										}
-										if ($("input[name=superadmin]").attr("checked") == "checked") {
-											$("select[name=entity]")
-													.attr("disabled", true);
-										}
-										$("select[name=admin]").change(function() {
-											 if ( $(this).val() == 0 ) {
-											 	$("input[name=superadmin]")
-											 		.attr("disabled", true)
-											 		.attr("checked", false);
-											 	$("select[name=entity]")
-													.attr("disabled", false);
-											 } else {
-											 	$("input[name=superadmin]")
-											 		.attr("disabled", false);
-											 }
-										});
-										$("input[name=superadmin]").change(function() {
-											if ( $(this).attr("checked") == "checked" ) {
-												$("select[name=entity]")
-													.attr("disabled", true);
-											} else {
-												$("select[name=entity]")
-													.attr("disabled", false);
-											}
-										});
-									});
-								</script>';
-                        }
-
-                        $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
-                        print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
-                    }
-                }
-                else
-                {
-                    $yn = yn($object->admin);
-                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
-                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
-                    if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
-                    else print $yn;
-                }
-                print '</td></tr>';
-            }
-
-           	// Type
-           	print '<tr><td width="25%" valign="top">'.$langs->trans("Type").'</td>';
-           	print '<td>';
-           	if ($user->id == $object->id || ! $user->admin)
-           	{
-	           	$type=$langs->trans("Internal");
-    	       	if ($object->societe_id) $type=$langs->trans("External");
-        	   	print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
-	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-           	}
-           	else
-			{
-				$type=0;
-	            if ($object->contact_id) $type=$object->contact_id;
-	            print $form->selectcontacts(0,$type,'contactid',2,'','',1,'',false,1);
-	           	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-            }
-           	print '</td></tr>';
-
-            // Tel pro
-            print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
-                print $object->office_phone;
-            }
-            print '</td></tr>';
-
-            // Tel mobile
-            print "<tr>".'<td valign="top">'.$langs->trans("PhoneMobile").'</td>';
-            print '<td>';
-            if ($caneditfield && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
-                print $object->user_mobile;
-            }
-            print '</td></tr>';
-
-            // Fax
-            print "<tr>".'<td valign="top">'.$langs->trans("Fax").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
-                print $object->office_fax;
-            }
-            print '</td></tr>';
-
-            // Skype
-            if (! empty($conf->skype->enabled))
-            {
-                print '<tr><td valign="top">'.$langs->trans("Skype").'</td>';
-                print '<td>';
-                if ($caneditfield  && empty($object->ldap_sid))
-                {
-                    print '<input size="40" type="text" name="skype" class="flat" value="'.$object->skype.'">';
-                }
-                else
-                {
-                    print '<input type="hidden" name="skype" value="'.$object->skype.'">';
-                    print $object->skype;
-                }
-                print '</td></tr>';
-            }
-
-            // EMail
-            print "<tr>".'<td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
-            print '<td>';
-            if ($caneditfield  && empty($object->ldap_sid))
-            {
-                print '<input size="40" type="text" name="email" class="flat" value="'.$object->email.'">';
-            }
-            else
-            {
-                print '<input type="hidden" name="email" value="'.$object->email.'">';
-                print $object->email;
-            }
-            print '</td></tr>';
-
-            // Signature
-            print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-	            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	            $doleditor=new DolEditor('signature',$object->signature,'',138,'dolibarr_mailings','In',false,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,72);
-	            print $doleditor->Create(1);
-            }
-            else
-          {
-          		print dol_htmlentitiesbr($object->signature);
-            }
-            print '</td></tr>';
-
-            // OpenID url
-            if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
-            {
-                print "<tr>".'<td valign="top">'.$langs->trans("OpenIDURL").'</td>';
-                print '<td>';
-                if ($caneditfield)
-                {
-                    print '<input size="40" type="url" name="openid" class="flat" value="'.$object->openid.'">';
-                }
-                else
-              {
-                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
-                    print $object->openid;
-                }
-                print '</td></tr>';
-            }
-
-            // Hierarchy
-            print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-            	print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$object->entity);
-            }
-            else
-          {
-          		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
-            	$huser=new User($db);
-            	$huser->fetch($object->fk_user);
-            	print $huser->getNomUrl(1);
-            }
-            print '</td>';
-            print "</tr>\n";
-
-			// Accountancy code
-            if (! empty($conf->global->USER_ENABLE_ACCOUNTANCY_CODE))	// For the moment field is not used so must not appeared.
-            {
-	            print "<tr>";
-	            print '<td valign="top">'.$langs->trans("AccountancyCode").'</td>';
-	            print '<td>';
-	            if ($caneditfield)
-	            {
-	                print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-	            }
-	            else
-	            {
-	                print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
-	                print $object->accountancy_code;
-	            }
-	            print '</td>';
-	            print "</tr>";
-            }
-
-            // Status
-            print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
-            print '<td>';
-            print $object->getLibStatut(4);
-            print '</td></tr>';
-
-            // Company / Contact
-            if (! empty($conf->societe->enabled))
-            {
-                print '<tr><td width="25%" valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
-                print '<td>';
-                if ($object->societe_id > 0)
-                {
-                    $societe = new Societe($db);
-                    $societe->fetch($object->societe_id);
-                    print $societe->getNomUrl(1,'');
-                    if ($object->contact_id)
-                    {
-                        $contact = new Contact($db);
-                        $contact->fetch($object->contact_id);
-                        print ' / <a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
-                    }
-                }
-                else
-                {
-                    print $langs->trans("ThisUserIsNot");
-                }
-                print ' ('.$langs->trans("UseTypeFieldToChange").')';
-                print '</td>';
-                print "</tr>\n";
-            }
-
-            // Module Adherent
-            if (! empty($conf->adherent->enabled))
-            {
-                $langs->load("members");
-                print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-                print '<td>';
-                if ($object->fk_member)
-                {
-                    $adh=new Adherent($db);
-                    $adh->fetch($object->fk_member);
-                    $adh->ref=$adh->login;	// Force to show login instead of id
-                    print $adh->getNomUrl(1);
-                }
-                else
-                {
-                    print $langs->trans("UserNotLinkedToMember");
-                }
-                print '</td>';
-                print "</tr>\n";
-            }
-
-            // Multicompany
-            if (! empty($conf->multicompany->enabled))
-            {
-            	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-            	{
-            		print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-            		print "<td>".$mc->select_entities($object->entity);
-            		print "</td></tr>\n";
-            	}
-            	else
-            	{
-            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-            	}
-            }
-
-            // Other attributes
-            $parameters=array('colspan' => ' colspan="2"');
-            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-            if (empty($reshook) && ! empty($extrafields->attribute_label))
-            {
-            	print $object->showOptionals($extrafields,'edit');
-            }
-
-            print '</table>';
-
-            print '<br><center>';
-            print '<input value="'.$langs->trans("Save").'" class="button" type="submit" name="save">';
-            print ' &nbsp; ';
-            print '<input value="'.$langs->trans("Cancel").'" class="button" type="submit" name="cancel">';
-            print '</center>';
-
-            print '</form>';
-
-            print '</div>';
-        }
-
-		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close;
-    }
-}
-
-
-llxFooter();
-$db->close();
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
new file mode 100644
index 00000000000..a1930f7c027
--- /dev/null
+++ b/htdocs/user/group/card.php
@@ -0,0 +1,550 @@
+<?php
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
+ * Copyright (C) 2012	   Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/user/group/card.php
+ *       \brief      Onglet groupes utilisateurs
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+if(! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php');
+
+// Defini si peux lire/modifier utilisateurs et permisssions
+$canreadperms=($user->admin || $user->rights->user->user->lire);
+$caneditperms=($user->admin || $user->rights->user->user->creer);
+$candisableperms=($user->admin || $user->rights->user->user->supprimer);
+// Advanced permissions
+if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+{
+    $canreadperms=($user->admin || $user->rights->user->group_advance->read);
+    $caneditperms=($user->admin || $user->rights->user->group_advance->write);
+    $candisableperms=($user->admin || $user->rights->user->group_advance->delete);
+}
+
+$langs->load("users");
+$langs->load("other");
+
+$id=GETPOST('id', 'int');
+$action=GETPOST('action', 'alpha');
+$confirm=GETPOST('confirm', 'alpha');
+$userid=GETPOST('user', 'int');
+
+// Security check
+$result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user');
+
+if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->multicompany->transverse_mode)
+{
+    accessforbidden();
+}
+
+$object = new Usergroup($db);
+
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+
+/**
+ *  Action remove group
+ */
+if ($action == 'confirm_delete' && $confirm == "yes")
+{
+    if ($caneditperms)
+    {
+        $object->fetch($id);
+        $object->delete();
+        header("Location: index.php");
+        exit;
+    }
+    else
+    {
+    	$langs->load("errors");
+        setEventMessage($langs->trans('ErrorForbidden'), 'errors');
+    }
+}
+
+/**
+ *  Action add group
+ */
+if ($action == 'add')
+{
+    if ($caneditperms)
+    {
+        if (! $_POST["nom"]) {
+            setEventMessage($langs->trans("NameNotDefined"), 'errors');
+            $action="create";       // Go back to create page
+        } else {
+			$object->nom	= trim($_POST["nom"]);	// For backward compatibility
+			$object->name	= trim($_POST["nom"]);
+			$object->note	= trim($_POST["note"]);
+
+			// Fill array 'array_options' with data from add form
+      		$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+      		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
+			else $object->entity = $_POST["entity"];
+
+            $db->begin();
+
+            $id = $object->create();
+
+            if ($id > 0)
+            {
+                $db->commit();
+
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            else
+            {
+                $db->rollback();
+
+                $langs->load("errors");
+                setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->name), 'errors');
+                $action="create";       // Go back to create page
+            }
+        }
+    }
+    else
+    {
+    	$langs->load("errors");
+	    setEventMessage($langs->trans('ErrorForbidden'), 'errors');
+    }
+}
+
+// Add/Remove user into group
+if ($action == 'adduser' || $action =='removeuser')
+{
+    if ($caneditperms)
+    {
+        if ($userid)
+        {
+            $object->fetch($id);
+            $object->oldcopy=dol_clone($object);
+
+			$edituser = new User($db);
+			$edituser->fetch($userid);
+			if ($action == 'adduser')    $result=$edituser->SetInGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
+			if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
+
+            if ($result > 0)
+            {
+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+                exit;
+            }
+            else
+            {
+                setEventMessage($edituser->error, 'errors');
+            }
+        }
+    }
+    else
+    {
+    	$langs->load("errors");
+	    setEventMessage($langs->trans('ErrorForbidden'), 'errors');
+    }
+}
+
+
+if ($action == 'update')
+{
+    if ($caneditperms)
+    {
+        $db->begin();
+
+        $object->fetch($id);
+
+        $object->oldcopy=dol_clone($object);
+
+		$object->name	= trim($_POST["group"]);
+		$object->nom	= $this->name;			// For backward compatibility
+		$object->note	= dol_htmlcleanlastbr($_POST["note"]);
+
+		// Fill array 'array_options' with data from add form
+      	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+
+		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
+		else $object->entity = $_POST["entity"];
+
+        $ret=$object->update();
+
+        if ($ret >= 0 && ! count($object->errors))
+        {
+	        setEventMessage($langs->trans("GroupModified"));
+            $db->commit();
+        }
+        else
+        {
+            setEventMessage($object->error);
+            $db->rollback();
+        }
+    }
+    else
+    {
+    	$langs->load("errors");
+        setEventMessage($langs->trans('ErrorForbidden'));
+    }
+}
+
+
+
+/*
+ * View
+ */
+
+llxHeader('',$langs->trans("GroupCard"));
+
+$form = new Form($db);
+$fuserstatic = new User($db);
+
+if ($action == 'create')
+{
+    print_fiche_titre($langs->trans("NewGroup"));
+
+    print dol_set_focus('#nom');
+
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+
+    print '<table class="border" width="100%">';
+
+	print "<tr>".'<td valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>';
+	print '<td class="valeur"><input size="30" type="text" id="nom" name="nom" value=""></td></tr>';
+
+	// Multicompany
+	if (! empty($conf->multicompany->enabled))
+	{
+		if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+		{
+			print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
+			print "<td>".$mc->select_entities($conf->entity);
+			print "</td></tr>\n";
+		}
+		else
+		{
+			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+		}
+	}
+
+    print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90);
+    $doleditor->Create();
+    print "</td></tr>\n";
+
+	// Other attributes
+    $parameters=array('object' => $object, 'colspan' => ' colspan="2"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    {
+    	print $object->showOptionals($extrafields,'edit');
+    }
+
+    print "</table>\n";
+
+    print '<center><br><input class="button" value="'.$langs->trans("CreateGroup").'" type="submit"></center>';
+
+    print "</form>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Visu et edition                                                            */
+/*                                                                            */
+/* ************************************************************************** */
+else
+{
+    if ($id)
+    {
+        $object->fetch($id);
+
+        /*
+         * Affichage onglets
+         */
+        $head = group_prepare_head($object);
+        $title = $langs->trans("Group");
+        dol_fiche_head($head, 'group', $title, 0, 'group');
+
+		/*
+		 * Confirmation suppression
+		 */
+		if ($action == 'delete')
+		{
+			print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("DeleteAGroup"),$langs->trans("ConfirmDeleteGroup",$object->name),"confirm_delete", '',0,1);
+		}
+
+		/*
+		 * Fiche en mode visu
+		 */
+
+		if ($action != 'edit')
+		{
+			print '<table class="border" width="100%">';
+
+			// Ref
+			print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
+			print '<td colspan="2">';
+			print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
+			print '</td>';
+			print '</tr>';
+
+			// Name
+			print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
+			print '<td width="75%" class="valeur">'.$object->name;
+			if (empty($object->entity))
+			{
+				print img_picto($langs->trans("GlobalGroup"),'redstar');
+			}
+			print "</td></tr>\n";
+
+			// Multicompany
+			if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+			{
+				$mc->getInfo($object->entity);
+				print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
+				print '<td width="75%" class="valeur">'.$mc->label;
+				print "</td></tr>\n";
+			}
+
+			// Note
+			print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
+			print '<td class="valeur">'.dol_htmlentitiesbr($object->note).'&nbsp;</td>';
+			print "</tr>\n";
+
+			// Other attributes
+            $parameters=array('colspan' => ' colspan="2"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	print $object->showOptionals($extrafields);
+            }
+
+			print "</table>\n";
+
+			print '</div>';
+
+			/*
+			 * Barre d'actions
+			 */
+			print '<div class="tabsAction">';
+
+			if ($caneditperms)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+			}
+
+			if ($candisableperms)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteGroup").'</a>';
+			}
+
+			print "</div>\n";
+			print "<br>\n";
+
+            /*
+             * Liste des utilisateurs dans le groupe
+             */
+
+            print_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
+
+            // On selectionne les users qui ne sont pas deja dans le groupe
+            $exclude = array();
+
+            if (! empty($object->members))
+            {
+                if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
+                {
+                    foreach($object->members as $useringroup)
+                    {
+                        $exclude[]=$useringroup->id;
+                    }
+                }
+            }
+
+            if ($caneditperms)
+            {
+                print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
+                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                print '<input type="hidden" name="action" value="adduser">';
+                print '<table class="noborder" width="100%">'."\n";
+                print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
+                print '<td>';
+                print $form->select_dolusers('','user',1,$exclude,0,'','',$object->entity);
+                print ' &nbsp; ';
+                // Multicompany
+                if (! empty($conf->multicompany->enabled))
+                {
+                    if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
+                    {
+                        print '</td><td valign="top">'.$langs->trans("Entity").'</td>';
+                        print "<td>".$mc->select_entities($conf->entity);
+                    }
+                    else
+                    {
+                    	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+                    }
+                }
+                else
+                {
+                	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+                }
+                print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+                print '</td></tr>'."\n";
+                print '</table></form>'."\n";
+                print '<br>';
+            }
+
+            /*
+             * Group members
+             */
+            print '<table class="noborder" width="100%">';
+            print '<tr class="liste_titre">';
+            print '<td class="liste_titre">'.$langs->trans("Login").'</td>';
+            print '<td class="liste_titre">'.$langs->trans("Lastname").'</td>';
+            print '<td class="liste_titre">'.$langs->trans("Firstname").'</td>';
+			if (! empty($conf->multicompany->enabled) && $conf->entity == 1)
+            {
+            	print '<td class="liste_titre">'.$langs->trans("Entity").'</td>';
+            }
+            print '<td class="liste_titre" width="5" align="center">'.$langs->trans("Status").'</td>';
+            print '<td class="liste_titre" width="5" align="right">&nbsp;</td>';
+            print "</tr>\n";
+
+            if (! empty($object->members))
+            {
+            	$var=True;
+
+            	foreach($object->members as $useringroup)
+            	{
+            		$var=!$var;
+
+            		print "<tr ".$bc[$var].">";
+            		print '<td>';
+            		print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$useringroup->id.'">'.img_object($langs->trans("ShowUser"),"user").' '.$useringroup->login.'</a>';
+            		if ($useringroup->admin  && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar');
+            		else if ($useringroup->admin) print img_picto($langs->trans("Administrator"),'star');
+            		print '</td>';
+            		print '<td>'.$useringroup->lastname.'</td>';
+            		print '<td>'.$useringroup->firstname.'</td>';
+            		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+            		{
+            			print '<td class="valeur">';
+            			if (! empty($useringroup->usergroup_entity))
+            			{
+            				$nb=0;
+            				foreach($useringroup->usergroup_entity as $group_entity)
+            				{
+            					$mc->getInfo($group_entity);
+            					print ($nb > 0 ? ', ' : '').$mc->label;
+            					print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'&amp;entity='.$group_entity.'">';
+            					print img_delete($langs->trans("RemoveFromGroup"));
+            					print '</a>';
+            					$nb++;
+            				}
+            			}
+            			print '</td>';
+            		}
+            		print '<td align="center">'.$useringroup->getLibStatut(3).'</td>';
+            		print '<td align="right">';
+            		if (! empty($user->admin) && empty($conf->multicompany->enabled))
+            		{
+            			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
+            			print img_delete($langs->trans("RemoveFromGroup"));
+            			print '</a>';
+            		}
+            		else
+            		{
+            			print "-";
+            		}
+            		print "</td></tr>\n";
+            	}
+            }
+            else
+            {
+                print '<tr><td colspan=2>'.$langs->trans("None").'</td></tr>';
+            }
+            print "</table>";
+            print "<br>";
+        }
+
+        /*
+         * Fiche en mode edition
+         */
+        if ($action == 'edit' && $caneditperms)
+        {
+            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post" name="updategroup" enctype="multipart/form-data">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="action" value="update">';
+
+            print '<table class="border" width="100%">';
+            print '<tr><td width="25%" valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>';
+            print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$object->name.'">';
+            print "</td></tr>\n";
+
+            // Multicompany
+            if (! empty($conf->multicompany->enabled))
+            {
+                if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+                {
+                    print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
+                    print "<td>".$mc->select_entities($object->entity);
+                    print "</td></tr>\n";
+                }
+            	else
+            	{
+            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+            	}
+            }
+
+            print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
+            print '<td class="valeur">';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+            $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90);
+            $doleditor->Create();
+            print '</td>';
+            print "</tr>\n";
+        	// Other attributes
+            $parameters=array('colspan' => ' colspan="2"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	print $object->showOptionals($extrafields,'edit');
+            }
+
+            print "</table>\n";
+
+            print '<center><br><input class="button" value="'.$langs->trans("Save").'" type="submit"></center>';
+
+            print '</form>';
+
+            print '</div>';
+        }
+
+    }
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
deleted file mode 100644
index 625195bfa68..00000000000
--- a/htdocs/user/group/fiche.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
- * Copyright (C) 2012	   Florian Henry		<florian.henry@open-concept.pro>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/**
- *       \file       htdocs/user/group/fiche.php
- *       \brief      Onglet groupes utilisateurs
- */
-
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-if(! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php');
-
-// Defini si peux lire/modifier utilisateurs et permisssions
-$canreadperms=($user->admin || $user->rights->user->user->lire);
-$caneditperms=($user->admin || $user->rights->user->user->creer);
-$candisableperms=($user->admin || $user->rights->user->user->supprimer);
-// Advanced permissions
-if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
-{
-    $canreadperms=($user->admin || $user->rights->user->group_advance->read);
-    $caneditperms=($user->admin || $user->rights->user->group_advance->write);
-    $candisableperms=($user->admin || $user->rights->user->group_advance->delete);
-}
-
-$langs->load("users");
-$langs->load("other");
-
-$id=GETPOST('id', 'int');
-$action=GETPOST('action', 'alpha');
-$confirm=GETPOST('confirm', 'alpha');
-$userid=GETPOST('user', 'int');
-$message='';
-
-// Security check
-$result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', 'user');
-
-if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->multicompany->transverse_mode)
-{
-    accessforbidden();
-}
-
-$object = new Usergroup($db);
-
-
-/**
- *  Action remove group
- */
-if ($action == 'confirm_delete' && $confirm == "yes")
-{
-    if ($caneditperms)
-    {
-        $object->fetch($id);
-        $object->delete();
-        header("Location: index.php");
-        exit;
-    }
-    else
-    {
-    	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
-    }
-}
-
-/**
- *  Action add group
- */
-if ($action == 'add')
-{
-    if ($caneditperms)
-    {
-        if (! $_POST["nom"])
-        {
-            $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
-            $action="create";       // Go back to create page
-        }
-
-		if (! $message)
-		{
-			$object->nom	= trim($_POST["nom"]);
-			$object->note	= trim($_POST["note"]);
-
-			if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
-			else $object->entity = $_POST["entity"];
-
-            $db->begin();
-
-            $id = $object->create();
-
-            if ($id > 0)
-            {
-                $db->commit();
-
-                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-                exit;
-            }
-            else
-            {
-                $db->rollback();
-
-                $langs->load("errors");
-                $message='<div class="error">'.$langs->trans("ErrorGroupAlreadyExists",$object->nom).'</div>';
-                $action="create";       // Go back to create page
-            }
-        }
-    }
-    else
-    {
-    	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
-    }
-}
-
-// Add/Remove user into group
-if ($action == 'adduser' || $action =='removeuser')
-{
-    if ($caneditperms)
-    {
-        if ($userid)
-        {
-            $object->fetch($id);
-            $object->oldcopy=dol_clone($object);
-
-			$edituser = new User($db);
-			$edituser->fetch($userid);
-			if ($action == 'adduser')    $result=$edituser->SetInGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
-			if ($action == 'removeuser') $result=$edituser->RemoveFromGroup($object->id,(! empty($conf->multicompany->transverse_mode)?GETPOST('entity','int'):$object->entity));
-
-            if ($result > 0)
-            {
-                header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-                exit;
-            }
-            else
-            {
-                $message.=$edituser->error;
-            }
-        }
-    }
-    else
-    {
-    	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
-    }
-}
-
-
-if ($action == 'update')
-{
-    if ($caneditperms)
-    {
-        $db->begin();
-
-        $object->fetch($id);
-
-        $object->oldcopy=dol_clone($object);
-
-		$object->nom	= trim($_POST["group"]);
-		$object->note	= dol_htmlcleanlastbr($_POST["note"]);
-
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
-		else $object->entity = $_POST["entity"];
-
-        $ret=$object->update();
-
-        if ($ret >= 0 && ! count($object->errors))
-        {
-            $message.='<div class="ok">'.$langs->trans("GroupModified").'</div>';
-            $db->commit();
-        }
-        else
-        {
-            $message.='<div class="error">'.$object->error.'</div>';
-            $db->rollback();
-        }
-    }
-    else
-    {
-    	$langs->load("errors");
-        $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
-    }
-}
-
-
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("GroupCard"));
-
-$form = new Form($db);
-$fuserstatic = new User($db);
-
-if ($action == 'create')
-{
-    print_fiche_titre($langs->trans("NewGroup"));
-
-    if ($message) { print $message."<br>"; }
-
-    print dol_set_focus('#nom');
-
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="add">';
-
-    print '<table class="border" width="100%">';
-
-	print "<tr>".'<td valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>';
-	print '<td class="valeur"><input size="30" type="text" id="nom" name="nom" value=""></td></tr>';
-
-	// Multicompany
-	if (! empty($conf->multicompany->enabled))
-	{
-		if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-		{
-			print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-			print "<td>".$mc->select_entities($conf->entity);
-			print "</td></tr>\n";
-		}
-		else
-		{
-			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-		}
-	}
-
-    print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90);
-    $doleditor->Create();
-    print "</td></tr>\n";
-    print "</table>\n";
-
-    print '<center><br><input class="button" value="'.$langs->trans("CreateGroup").'" type="submit"></center>';
-
-    print "</form>";
-}
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Visu et edition                                                            */
-/*                                                                            */
-/* ************************************************************************** */
-else
-{
-    if ($id)
-    {
-        $object->fetch($id);
-
-        /*
-         * Affichage onglets
-         */
-        $head = group_prepare_head($object);
-        $title = $langs->trans("Group");
-        dol_fiche_head($head, 'group', $title, 0, 'group');
-
-		/*
-		 * Confirmation suppression
-		 */
-		if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("DeleteAGroup"),$langs->trans("ConfirmDeleteGroup",$object->name),"confirm_delete", '',0,1);
-		}
-
-		/*
-		 * Fiche en mode visu
-		 */
-
-		if ($action != 'edit')
-		{
-			print '<table class="border" width="100%">';
-
-			// Ref
-			print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
-			print '<td colspan="2">';
-			print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
-			print '</td>';
-			print '</tr>';
-
-			// Name
-			print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
-			print '<td width="75%" class="valeur">'.$object->name;
-			if (empty($object->entity))
-			{
-				print img_picto($langs->trans("GlobalGroup"),'redstar');
-			}
-			print "</td></tr>\n";
-
-			// Multicompany
-			if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-			{
-				$mc->getInfo($object->entity);
-				print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-				print '<td width="75%" class="valeur">'.$mc->label;
-				print "</td></tr>\n";
-			}
-
-			// Note
-			print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
-			print '<td class="valeur">'.dol_htmlentitiesbr($object->note).'&nbsp;</td>';
-			print "</tr>\n";
-			print "</table>\n";
-
-			print '</div>';
-
-			/*
-			 * Barre d'actions
-			 */
-			print '<div class="tabsAction">';
-
-			if ($caneditperms)
-			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-			}
-
-			if ($candisableperms)
-			{
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteGroup").'</a>';
-			}
-
-			print "</div>\n";
-			print "<br>\n";
-
-
-            dol_htmloutput_mesg($message);
-
-            /*
-             * Liste des utilisateurs dans le groupe
-             */
-
-            print_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
-
-            // On selectionne les users qui ne sont pas deja dans le groupe
-            $exclude = array();
-
-            if (! empty($object->members))
-            {
-                if (! (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)))
-                {
-                    foreach($object->members as $useringroup)
-                    {
-                        $exclude[]=$useringroup->id;
-                    }
-                }
-            }
-
-            if ($caneditperms)
-            {
-                print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="action" value="adduser">';
-                print '<table class="noborder" width="100%">'."\n";
-                print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
-                print '<td>';
-                print $form->select_dolusers('','user',1,$exclude,0,'','',$object->entity);
-                print ' &nbsp; ';
-                // Multicompany
-                if (! empty($conf->multicompany->enabled))
-                {
-                    if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
-                    {
-                        print '</td><td valign="top">'.$langs->trans("Entity").'</td>';
-                        print "<td>".$mc->select_entities($conf->entity);
-                    }
-                    else
-                    {
-                    	print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-                    }
-                }
-                else
-                {
-                	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-                }
-                print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-                print '</td></tr>'."\n";
-                print '</table></form>'."\n";
-                print '<br>';
-            }
-
-            /*
-             * Group members
-             */
-            print '<table class="noborder" width="100%">';
-            print '<tr class="liste_titre">';
-            print '<td class="liste_titre">'.$langs->trans("Login").'</td>';
-            print '<td class="liste_titre">'.$langs->trans("Lastname").'</td>';
-            print '<td class="liste_titre">'.$langs->trans("Firstname").'</td>';
-			if (! empty($conf->multicompany->enabled) && $conf->entity == 1)
-            {
-            	print '<td class="liste_titre">'.$langs->trans("Entity").'</td>';
-            }
-            print '<td class="liste_titre" width="5" align="center">'.$langs->trans("Status").'</td>';
-            print '<td class="liste_titre" width="5" align="right">&nbsp;</td>';
-            print "</tr>\n";
-
-            if (! empty($object->members))
-            {
-            	$var=True;
-
-            	foreach($object->members as $useringroup)
-            	{
-            		$var=!$var;
-
-            		print "<tr ".$bc[$var].">";
-            		print '<td>';
-            		print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$useringroup->id.'">'.img_object($langs->trans("ShowUser"),"user").' '.$useringroup->login.'</a>';
-            		if ($useringroup->admin  && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar');
-            		else if ($useringroup->admin) print img_picto($langs->trans("Administrator"),'star');
-            		print '</td>';
-            		print '<td>'.$useringroup->lastname.'</td>';
-            		print '<td>'.$useringroup->firstname.'</td>';
-            		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-            		{
-            			print '<td class="valeur">';
-            			if (! empty($useringroup->usergroup_entity))
-            			{
-            				$nb=0;
-            				foreach($useringroup->usergroup_entity as $group_entity)
-            				{
-            					$mc->getInfo($group_entity);
-            					print ($nb > 0 ? ', ' : '').$mc->label;
-            					print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'&amp;entity='.$group_entity.'">';
-            					print img_delete($langs->trans("RemoveFromGroup"));
-            					print '</a>';
-            					$nb++;
-            				}
-            			}
-            			print '</td>';
-            		}
-            		print '<td align="center">'.$useringroup->getLibStatut(3).'</td>';
-            		print '<td align="right">';
-            		if (! empty($user->admin) && empty($conf->multicompany->enabled))
-            		{
-            			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
-            			print img_delete($langs->trans("RemoveFromGroup"));
-            			print '</a>';
-            		}
-            		else
-            		{
-            			print "-";
-            		}
-            		print "</td></tr>\n";
-            	}
-            }
-            else
-            {
-                print '<tr><td colspan=2>'.$langs->trans("None").'</td></tr>';
-            }
-            print "</table>";
-            print "<br>";
-        }
-
-        /*
-         * Fiche en mode edition
-         */
-        if ($action == 'edit' && $caneditperms)
-        {
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post" name="updategroup" enctype="multipart/form-data">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="update">';
-
-            print '<table class="border" width="100%">';
-            print '<tr><td width="25%" valign="top" class="fieldrequired">'.$langs->trans("Name").'</td>';
-            print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$object->name.'">';
-            print "</td></tr>\n";
-
-            // Multicompany
-            if (! empty($conf->multicompany->enabled))
-            {
-                if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-                {
-                    print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-                    print "<td>".$mc->select_entities($object->entity);
-                    print "</td></tr>\n";
-                }
-            	else
-            	{
-            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-            	}
-            }
-
-            print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
-            print '<td class="valeur">';
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-            $doleditor=new DolEditor('note',$object->note,'',240,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90);
-            $doleditor->Create();
-            print '</td>';
-            print "</tr>\n";
-            print "</table>\n";
-
-            print '<center><br><input class="button" value="'.$langs->trans("Save").'" type="submit"></center>';
-
-            print '</form>';
-
-            print '</div>';
-        }
-
-    }
-}
-
-llxFooter();
-$db->close();
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index d0766655d6a..1f06fa3a3c2 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -57,7 +57,7 @@ llxHeader();
 
 print_fiche_titre($langs->trans("ListOfGroups"));
 
-$sql = "SELECT g.rowid, g.nom, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
+$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
 $sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
 if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
@@ -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 "</tr>\n";
     $var=True;
@@ -101,7 +101,7 @@ if ($resql)
         $var=!$var;
 
         print "<tr ".$bc[$var].">";
-        print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a>';
+        print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
         if (! $obj->entity)
         {
         	print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 978b1929b98..f53775b9b3e 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -56,8 +56,6 @@ $fgroup->getrights();
 
 if ($action == 'dolibarr2ldap')
 {
-	$message="";
-
 	$db->begin();
 
 	$ldap=new Ldap();
@@ -75,12 +73,12 @@ if ($action == 'dolibarr2ldap')
 
 	if ($result >= 0)
 	{
-		$message.='<div class="ok">'.$langs->trans("GroupSynchronized").'</div>';
+		setEventMessage($langs->trans("GroupSynchronized"));
 		$db->commit();
 	}
 	else
 	{
-		$message.='<div class="error">'.$ldap->error.'</div>';
+		setEventMessage($ldap->error);
 		$db->rollback();
 	}
 }
@@ -110,7 +108,7 @@ print '</tr>';
 
 // Name
 print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
-print '<td width="75%" class="valeur">'.$fgroup->nom;
+print '<td width="75%" class="valeur">'.$fgroup->name;
 if (!$fgroup->entity)
 {
 	print img_picto($langs->trans("GlobalGroup"),'redstar');
@@ -139,10 +137,6 @@ print "</table>\n";
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 5c52fa80a50..a910753c643 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -199,7 +199,7 @@ if ($id)
 
     // Nom
     print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
-    print '<td colspan="2">'.$fgroup->nom.'';
+    print '<td colspan="2">'.$fgroup->name.'';
     if (! $fgroup->entity)
     {
         print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3c330f3a712..0d6c2f9a7b8 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -62,7 +62,7 @@ print_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicVi
 
 
 
-// Charge tableau des categories
+// Load hierarchy of users
 $user_arbo = $userstatic->get_full_tree();
 
 // Define fulltree array
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 824f505fddd..c9b3693f1ac 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -26,7 +26,7 @@ require '../main.inc.php';
 if (! $user->rights->user->user->lire && ! $user->admin)
 {
 	// Redirection vers la page de l'utilisateur
-	header("Location: fiche.php?id=".$user->id);
+	header("Location: card.php?id=".$user->id);
 	exit;
 }
 
@@ -129,7 +129,7 @@ if ($resql)
 		$var=!$var;
 
 		print "<tr ".$bc[$var].">";
-		print '<td><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($obj->firstname,$obj->lastname).'</a>';
+		print '<td><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($obj->firstname,$obj->lastname).'</a>';
 		if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
 		{
 			print img_picto($langs->trans("SuperAdministrator"),'redstar');
@@ -200,7 +200,7 @@ if ($canreadperms)
 {
 	$max=5;
 
-	$sql = "SELECT g.rowid, g.nom, g.note, g.entity, g.datec";
+	$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec";
 	$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 	if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
 	{
@@ -230,7 +230,7 @@ if ($canreadperms)
 			$var=!$var;
 
 			print "<tr ".$bc[$var].">";
-			print '<td><a href="'.DOL_URL_ROOT.'/user/group/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a>';
+			print '<td><a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
 			if (! $obj->entity)
 			{
 				print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 743379f843c..5d0b0ac77e4 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -72,9 +72,11 @@ $sql.= " u.datec,";
 $sql.= " u.tms as datem,";
 $sql.= " u.datelastlogin,";
 $sql.= " u.ldap_sid, u.statut, u.entity,";
-$sql.= " s.nom, s.canvas";
+$sql.= " u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2,";
+$sql.= " s.nom as name, s.canvas";
 $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
 if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && (! empty($conf->multicompany->transverse_mode) || (! empty($user->admin) && empty($user->entity))))
 {
 	$sql.= " WHERE u.entity IS NOT NULL";
@@ -108,19 +110,24 @@ if ($result)
 
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Login"),"index.php","u.login",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("LastName"),"index.php","u.lastname",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("FirstName"),"index.php","u.firstname",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Company"),"index.php","u.fk_societe",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("DateCreation"),"index.php","u.datec",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("LastConnexion"),"index.php","u.datelastlogin",$param,"",'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),"index.php","u.statut",$param,"",'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Login"),$_SERVER['PHP_SELF'],"u.login",$param,"","",$sortfield,$sortorder);
+    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);
+    print_liste_field_titre($langs->trans("Status"),$_SERVER['PHP_SELF'],"u.statut",$param,"",'align="center"',$sortfield,$sortorder);
     print '<td width="1%">&nbsp;</td>';
     print "</tr>\n";
 
     //SearchBar
     print '<tr class="liste_titre">';
-    print '<td colspan="6">&nbsp;</td>';
+    print '<td colspan="7">&nbsp;</td>';
 
 	// Status
     print '<td>';
@@ -132,6 +139,9 @@ if ($result)
     print '</td>';
 
     print "</tr>\n";
+
+    $user2=new User($db);
+
     $var=True;
     while ($i < $num)
     {
@@ -139,7 +149,7 @@ if ($result)
         $var=!$var;
 
         print "<tr ".$bc[$var].">";
-        print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
+        print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
         if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
         {
           	print img_picto($langs->trans("SuperAdministrator"),'redstar');
@@ -155,13 +165,24 @@ if ($result)
         if ($obj->fk_societe)
         {
             $companystatic->id=$obj->fk_societe;
-            $companystatic->nom=$obj->nom;
+            $companystatic->name=$obj->name;
             $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 '</td>';
+
+        // Multicompany enabled
+        if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))
+        {
+        	print '<td>';
         	if (! $obj->entity)
         	{
         		print $langs->trans("AllEntities");
@@ -175,16 +196,8 @@ if ($result)
         			print $mc->label;
         		}
         	}
+        	print '</td>';
         }
-        else if ($obj->ldap_sid)
-        {
-        	print $langs->trans("DomainUser");
-        }
-        else
-        {
-        	print $langs->trans("InternalUser");
-        }
-        print '</td>';
 
         // Date creation
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>';
@@ -192,9 +205,22 @@ if ($result)
         // Date last login
         print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>';
 
-		// Statut
+        // Resp
+        print '<td class="nowrap" align="center">';
+        if ($obj->login2)
+        {
+	        $user2->login=$obj->login2;
+	        //$user2->lastname=$obj->lastname2;
+	        //$user2->firstname=$obj->firstname2;
+	        $user2->lastname=$user2->login;
+	        $user2->firstname='';
+	        print $user2->getNomUrl(1);
+        }
+        print '</td>';
+
+        // Statut
 		$userstatic->statut=$obj->statut;
-                print '<td width="100" align="center">'.$userstatic->getLibStatut(5).'</td>';
+		print '<td width="100" align="center">'.$userstatic->getLibStatut(5).'</td>';
         print '<td>&nbsp;</td>';
         print "</tr>\n";
         $i++;
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index ebf776e64aa..87a0dec31e2 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -52,8 +52,6 @@ $fuser->getrights();
 
 if ($_GET["action"] == 'dolibarr2ldap')
 {
-    $message="";
-
     $db->begin();
 
     $ldap=new Ldap();
@@ -67,12 +65,12 @@ if ($_GET["action"] == 'dolibarr2ldap')
 
     if ($result >= 0)
     {
-        $message.='<div class="ok">'.$langs->trans("UserSynchronized").'</div>';
+        setEventMessage($langs->trans("UserSynchronized"));
         $db->commit();
     }
     else
     {
-        $message.='<div class="error">'.$ldap->error.'</div>';
+        setEventMessage($ldap->error, 'errors');
         $db->rollback();
     }
 }
@@ -152,10 +150,6 @@ print '</table>';
 
 print '</div>';
 
-
-dol_htmloutput_mesg($message);
-
-
 /*
  * Barre d'actions
  */
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index ab31ae0aa6c..37ff691fdcc 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -38,11 +38,12 @@ if (!empty($_SESSION["dol_authmode"]) && ($_SESSION["dol_authmode"] == 'forceuse
    die("Disconnection does not work when connection was made in mode ".$_SESSION["dol_authmode"]);
 }
 
+global $conf, $langs, $user;
 
 // Appel des triggers
 include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
 $interface=new Interfaces($db);
-$result=$interface->run_triggers('USER_LOGOUT',$user,$user,$langs,$conf,$conf->entity);
+$result=$interface->run_triggers('USER_LOGOUT',$user,$user,$langs,$conf);
 if ($result < 0) { $error++; }
 // Fin appel triggers
 
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ceaa9ceb011..448dd76d147 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -58,7 +58,7 @@ if ($action == 'update' && $user->rights->user->user->creer && ! $_POST["cancel"
 {
 	$db->begin();
 
-	$res=$fuser->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
+	$res=$fuser->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES));
 	if ($res < 0)
 	{
 		$mesg='<div class="error">'.$adh->error.'</div>';
@@ -89,7 +89,7 @@ if ($id)
 
 	if ($msg) print '<div class="error">'.$msg.'</div>';
 
-	print "<form method=\"post\" action=\"note.php\">";
+	print "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">";
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
     print '<table class="border" width="100%">';
@@ -120,7 +120,7 @@ if ($id)
 		print "<input type=\"hidden\" name=\"id\" value=\"".$fuser->id."\">";
 	    // Editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor=new DolEditor('note',$fuser->note,'',280,'dolibarr_notes','In',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80);
+		$doleditor=new DolEditor('note_private',$fuser->note,'',280,'dolibarr_notes','In',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80);
 		$doleditor->Create();
 	}
 	else
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 65e9e4ca7a6..7459d467633 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 '</td>';
     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($fuser->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").'</td>';
     print '<td>';
-    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 '</td></tr>';
 
     // Taille max des listes
@@ -190,7 +190,7 @@ if ($action == 'edit')
     print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>';
     print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
     print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($fuser->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").'</td>';
     print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="' . (! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?$fuser->conf->MAIN_SIZE_LISTE_LIMIT:'') . '"></td></tr>';
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 4f1a36c6e04..44377f6168c 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2008-2012	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2008-2011	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014      Teddy Andreotti    	<125155@supinfo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +28,8 @@ define("NOLOGIN",1);	// This means this output page does not require to be logge
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-if (! empty($conf->ldap->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 
 $langs->load("errors");
 $langs->load("users");
@@ -48,7 +49,7 @@ $mode=$dolibarr_main_authentication;
 if (! $mode) $mode='http';
 
 $username 		= GETPOST('username');
-$passwordmd5	= GETPOST('passwordmd5');
+$passwordhash	= GETPOST('passwordhash');
 $conf->entity 	= (GETPOST('entity') ? GETPOST('entity') : 1);
 
 // Instantiate hooks of thirdparty module only if not already define
@@ -67,7 +68,7 @@ if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile']))
  */
 
 // Validate new password
-if ($action == 'validatenewpassword' && $username && $passwordmd5)
+if ($action == 'validatenewpassword' && $username && $passwordhash)
 {
     $edituser = new User($db);
     $result=$edituser->fetch('',$_GET["username"]);
@@ -77,7 +78,7 @@ if ($action == 'validatenewpassword' && $username && $passwordmd5)
     }
     else
     {
-        if (dol_hash($edituser->pass_temp) == $passwordmd5)
+        if (dol_hash($edituser->pass_temp) == $passwordhash)
         {
             $newpassword=$edituser->setPassword($user,$edituser->pass_temp,0);
             dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
@@ -130,7 +131,8 @@ if ($action == 'buildnewpassword' && $username)
                     // Success
                     if ($edituser->send_password($user,$newpassword,1) > 0)
                     {
-                        $message = '<div class="ok">'.$langs->trans("PasswordChangeRequestSent",$edituser->login,$edituser->email).'</div>';
+
+                        $message = '<div class="ok">'.$langs->trans("PasswordChangeRequestSent",$edituser->login,dolObfuscateEmail($edituser->email)).'</div>';
                         //$message.=$newpassword;
                         $username='';
                     }
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 49bd0877e6e..b63b3e65ffc 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -191,7 +191,7 @@ else
 }
 $sql.= " AND ur.fk_user = ".$fuser->id;
 
-dol_syslog("get user perms sql=".$sql);
+dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
@@ -227,7 +227,7 @@ if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transv
 $sql.= " AND gr.fk_usergroup = gu.fk_usergroup";
 $sql.= " AND gu.fk_user = ".$fuser->id;
 
-dol_syslog("get user perms sql=".$sql);
+dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
@@ -276,9 +276,10 @@ print '</table><br>';
 
 if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"), 0, 1).'<br>';
 // Show warning about external users
-if (empty($user->societe_id)) print showModulesExludedForExternal($modules).'<br><br>'."\n";
+if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules)).'<br><br>'."\n";
 
 // For multicompany transversal mode
+// TODO Place a hook here
 if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
 {
 	$aEntities=array_keys($permsgroupbyentity);
@@ -306,7 +307,6 @@ $sql.= " AND r.entity = ".((! empty($conf->multicompany->enabled) && ! empty($fu
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql.= " AND r.perms NOT LIKE '%_advance'";  // Hide advanced perms if option is disable
 $sql.= " ORDER BY r.module, r.id";
 
-dol_syslog("sql=".$sql);
 $result=$db->query($sql);
 if ($result)
 {
@@ -423,6 +423,12 @@ if ($result)
 else dol_print_error($db);
 print '</table>';
 
+// For multicompany transversal mode
+// TODO Place a hook here
+if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+{
+	dol_fiche_end();
+}
 
 dol_fiche_end();
 
diff --git a/htdocs/webservices/admin/index.html b/htdocs/webservices/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
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_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index dfc0aac590a..dc07bc156ec 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -289,15 +289,15 @@ function getActionComm($authentication,$id)
 			        	'datem'=> dol_print_date($actioncomm->datem,'dayhourrfc'),
 			        	'note'=> $actioncomm->note,
 			        	'percentage'=> $actioncomm->percentage,
-			        	'author'=> $actioncomm->author->id,
-			        	'usermod'=> $actioncomm->usermod->id,
-			        	'usertodo'=> $actioncomm->usertodo->id,
-			        	'userdone'=> $actioncomm->userdone->id,
+			        	'author'=> $actioncomm->authorid,
+			        	'usermod'=> $actioncomm->usermodid,
+			        	'usertodo'=> $actioncomm->userownerid,
+			        	'userdone'=> $actioncomm->userdoneid,
 			        	'priority'=> $actioncomm->priority,
 			        	'fulldayevent'=> $actioncomm->fulldayevent,
 			        	'location'=> $actioncomm->location,
-			        	'socid'=> $actioncomm->societe->id,
-			        	'contactid'=> $actioncomm->contact->id,
+			        	'socid'=> $actioncomm->socid,
+			        	'contactid'=> $actioncomm->contactid,
 			        	'projectid'=> $actioncomm->fk_project,
 			        	'fk_element'=> $actioncomm->fk_element,
 			        	'elementtype'=> $actioncomm->elementtype);
@@ -433,12 +433,12 @@ function createActionComm($authentication,$actioncomm)
 		$newobject->datep=$actioncomm['datep'];
 		$newobject->datef=$actioncomm['datef'];
 		$newobject->type_code=$actioncomm['type_code'];
-		$newobject->societe->id=$actioncomm['socid'];
+		$newobject->socid=$actioncomm['socid'];
 		$newobject->fk_project=$actioncomm['projectid'];
 		$newobject->note=$actioncomm['note'];
-		$newobject->contact->id=$actioncomm['contactid'];
-		$newobject->usertodo->id=$actioncomm['usertodo'];
-		$newobject->userdone->id=$actioncomm['userdone'];
+		$newobject->contactid=$actioncomm['contactid'];
+		$newobject->userownerid=$actioncomm['usertodo'];
+		$newobject->userdoneid=$actioncomm['userdone'];
 		$newobject->label=$actioncomm['label'];
 		$newobject->percentage=$actioncomm['percentage'];
 		$newobject->priority=$actioncomm['priority'];
@@ -517,23 +517,23 @@ function updateActionComm($authentication,$actioncomm)
 	if (! $error)
 	{
 		$objectfound=false;
-		
+
 		$object=new ActionComm($db);
 		$result=$object->fetch($actioncomm['id']);
-		
+
 		if (!empty($object->id)) {
-		
+
 			$objectfound=true;
 
 			$object->datep=$actioncomm['datep'];
 			$object->datef=$actioncomm['datef'];
 			$object->type_code=$actioncomm['type_code'];
-			$object->societe->id=$actioncomm['socid'];
+			$object->socid=$actioncomm['socid'];
+			$object->contactid=$actioncomm['contactid'];
 			$object->fk_project=$actioncomm['projectid'];
 			$object->note=$actioncomm['note'];
-			$object->contact->id=$actioncomm['contactid'];
-			$object->usertodo->id=$actioncomm['usertodo'];
-			$object->userdone->id=$actioncomm['userdone'];
+			$object->userownerid=$actioncomm['usertodo'];
+			$object->userdoneid=$actioncomm['userdone'];
 			$object->label=$actioncomm['label'];
 			$object->percentage=$actioncomm['percentage'];
 			$object->priority=$actioncomm['priority'];
@@ -541,7 +541,7 @@ function updateActionComm($authentication,$actioncomm)
 			$object->location=$actioncomm['location'];
 			$object->fk_element=$actioncomm['fk_element'];
 			$object->elementtype=$actioncomm['elementtype'];
-	
+
 			//Retreive all extrafield for actioncomm
 			// fetch optionals attributes and labels
 			$extrafields=new ExtraFields($db);
@@ -551,7 +551,7 @@ function updateActionComm($authentication,$actioncomm)
 				$key='options_'.$key;
 				$object->array_options[$key]=$actioncomm[$key];
 			}
-	
+
 			$db->begin();
 
 			$result=$object->update($fuser);
@@ -590,4 +590,4 @@ function updateActionComm($authentication,$actioncomm)
 }
 
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index 45a8fb76a78..345679f7c9a 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -283,7 +283,5 @@ function getCategory($authentication,$id)
 	return $objectresp;
 }
 
-
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
-
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index eb05665ea04..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='')
@@ -491,19 +491,19 @@ function getContactsForThirdParty($authentication,$idthirdparty)
 	{
 		$linesinvoice=array();
 
-		$sql = "SELECT c.rowid, c.fk_soc, c.civilite as civility_id, c.lastname, c.firstname, c.statut,";
+		$sql = "SELECT c.rowid, c.fk_soc, c.civility as civility_id, c.lastname, c.firstname, c.statut,";
 		$sql.= " c.address, c.zip, c.town,";
 		$sql.= " c.fk_pays as country_id,";
 		$sql.= " c.fk_departement,";
 		$sql.= " c.birthday,";
 		$sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,";
 		//$sql.= " c.priv, c.note, c.default_lang, c.no_email, c.canvas,";
-		$sql.= " p.libelle as country, p.code as country_code,";
+		$sql.= " co.label as country, co.code as country_code,";
 		$sql.= " d.nom as state, d.code_departement as state_code,";
 		$sql.= " u.rowid as user_id, u.login as user_login,";
 		$sql.= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON c.fk_pays = co.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
@@ -713,6 +713,6 @@ function updateContact($authentication,$contact)
 
 	return $objectresp;
 }
-// Return the results.
-$server->service($HTTP_RAW_POST_DATA);
 
+// Return the results.
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 5794a90a297..9c5bd24b463 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -102,6 +102,7 @@ $server->wsdl->addComplexType(
     	'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'),
+        'payment_mode_id' => array('name'=>'payment_mode_id','type'=>'xsd:string'),
         // From product
         'product_id' => array('name'=>'product_id','type'=>'xsd:int'),
         'product_ref' => array('name'=>'product_ref','type'=>'xsd:string'),
@@ -135,7 +136,9 @@ $server->wsdl->addComplexType(
             'minOccurs' => '0',
             'maxOccurs' => 'unbounded'
         )
-    )
+    ),
+    null,
+    'tns:line'
 );
 
 
@@ -196,7 +199,9 @@ $server->wsdl->addComplexType(
             'minOccurs' => '0',
             'maxOccurs' => 'unbounded'
         )
-    )
+    ),
+    null,
+    'tns:invoice'
 );
 
 
@@ -329,6 +334,7 @@ function getInvoice($authentication,$id='',$ref='',$ref_ext='')
 			        	'status'=> $invoice->statut,
 			        	'close_code' => $invoice->close_code?$invoice->close_code:'',
 			        	'close_note' => $invoice->close_note?$invoice->close_note:'',
+			        	'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
 			        	'lines' => $linesresp
 			        ));
 			}
@@ -454,6 +460,7 @@ function getInvoicesForThirdParty($authentication,$idthirdparty)
 			    		'status'=> $invoice->statut,
 			    		'close_code' => $invoice->close_code?$invoice->close_code:'',
 			    		'close_note' => $invoice->close_note?$invoice->close_note:'',
+					'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
 			    		'lines' => $linesresp
 			    	);
 			    }
@@ -518,6 +525,15 @@ function createInvoice($authentication,$invoice)
         $newobject->statut=0;	// We start with status draft
         $newobject->fk_project=$invoice['project_id'];
         $newobject->date_creation=$now;
+        
+	//take mode_reglement and cond_reglement from thirdparty
+        $soc = new Societe($db);
+        $res=$soc->fetch($newobject->socid);
+        if ($res > 0) {
+    	    $newobject->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id;
+            $newobject->cond_reglement_id  = $soc->cond_reglement_id; 
+        }
+        else $newobject->mode_reglement_id = $invoice['payment_mode_id'];
 
         // Trick because nusoap does not store data with same structure if there is one or several lines
         $arrayoflines=array();
@@ -585,7 +601,5 @@ function createInvoice($authentication,$invoice)
     return $objectresp;
 }
 
-
 // Return the results.
-$server->service((isset($HTTP_RAW_POST_DATA)?$HTTP_RAW_POST_DATA:''));
-
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index d70725b468f..2318780608c 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'),
+	'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')
+);
+
+//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',
@@ -643,6 +684,16 @@ function createOrder($authentication,$order)
 		$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();
@@ -664,6 +715,19 @@ function createOrder($authentication,$order)
 			$newline->total_ht=$line['total_net'];
 			$newline->total_tva=$line['total_vat'];
 			$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;
 		}
 
@@ -755,7 +819,7 @@ function validOrder($authentication,$id='')
 				{
 					// Define output language
 					$outputlangs = $langs;
-					commande_pdf_create($db, $order, $order->modelpdf, $outputlangs, 0, 0, 0);
+					$order->generateDocument($order->modelpdf, $outputlangs);
 
 				}
 				else
@@ -798,7 +862,5 @@ function validOrder($authentication,$id='')
 	return $objectresp;
 }
 
-
 // Return the results.
-$server->service((isset($HTTP_RAW_POST_DATA)?$HTTP_RAW_POST_DATA:''));
-
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 0e3caa512c6..ba948d463ea 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -321,5 +321,4 @@ function getDocument($authentication, $modulepart, $file, $refname='')
 }
 
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
-
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index c2eba3f9d1b..6f36b664a3b 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -34,6 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
 
@@ -88,6 +89,64 @@ $server->wsdl->addComplexType(
     )
 );
 
+$productorservice_fields = array(
+    'id' => array('name'=>'id','type'=>'xsd:string'),
+    'ref' => array('name'=>'ref','type'=>'xsd:string'),
+    'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
+    'type' => array('name'=>'type','type'=>'xsd:string'),
+    'label' => array('name'=>'label','type'=>'xsd:string'),
+    'description' => array('name'=>'description','type'=>'xsd:string'),
+    'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
+    'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
+    'note' => array('name'=>'note','type'=>'xsd:string'),
+    'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
+    'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
+    'barcode' => array('name'=>'barcode','type'=>'xsd:string'),
+    'barcode_type' => array('name'=>'barcode_type','type'=>'xsd:string'),
+    'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
+    'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
+    'customcode' => array('name'=>'customcode','type'=>'xsd:string'),
+
+    'price_net' => array('name'=>'price_net','type'=>'xsd:string'),
+    'price' => array('name'=>'price','type'=>'xsd:string'),
+    'price_min_net' => array('name'=>'price_min_net','type'=>'xsd:string'),
+    'price_min' => array('name'=>'price_min','type'=>'xsd:string'),
+
+    'price_base_type' => array('name'=>'price_base_type','type'=>'xsd:string'),
+
+    'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:string'),
+    'vat_npr' => array('name'=>'vat_npr','type'=>'xsd:string'),
+    'localtax1_tx' => array('name'=>'localtax1_tx','type'=>'xsd:string'),
+    'localtax2_tx' => array('name'=>'localtax2_tx','type'=>'xsd:string'),
+
+    'stock_alert' => array('name'=>'stock_alert','type'=>'xsd:string'),
+    'stock_real' => array('name'=>'stock_real','type'=>'xsd:string'),
+    'stock_pmp' => array('name'=>'stock_pmp','type'=>'xsd:string'),
+    'canvas' => array('name'=>'canvas','type'=>'xsd:string'),
+    'import_key' => array('name'=>'import_key','type'=>'xsd:string'),
+
+    'dir' => array('name'=>'dir','type'=>'xsd:string'),
+    'images' => array('name'=>'images','type'=>'tns:ImagesArray')
+);
+
+//Retreive all extrafield for product
+// fetch optionals attributes and labels
+$extrafields=new ExtraFields($db);
+$extralabels=$extrafields->fetch_name_optionals_label('product',true);
+if (count($extrafields)>0) {
+	$extrafield_array = array();
+}
+foreach($extrafields->attribute_label as $key=>$label)
+{
+	$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);
+}
+
+$productorservice_fields=array_merge($productorservice_fields,$extrafield_array);
+
 // Define other specific objects
 $server->wsdl->addComplexType(
     'product',
@@ -95,45 +154,7 @@ $server->wsdl->addComplexType(
     'struct',
     'all',
     '',
-    array(
-    	'id' => array('name'=>'id','type'=>'xsd:string'),
-		'ref' => array('name'=>'ref','type'=>'xsd:string'),
-        'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'),
-    	'type' => array('name'=>'type','type'=>'xsd:string'),
-		'label' => array('name'=>'label','type'=>'xsd:string'),
-        'description' => array('name'=>'description','type'=>'xsd:string'),
-        'date_creation' => array('name'=>'date_creation','type'=>'xsd:dateTime'),
-        'date_modification' => array('name'=>'date_modification','type'=>'xsd:dateTime'),
-        'note' => array('name'=>'note','type'=>'xsd:string'),
-    	'status_tobuy' => array('name'=>'status_tobuy','type'=>'xsd:string'),
-    	'status_tosell' => array('name'=>'status_tosell','type'=>'xsd:string'),
-    	'barcode' => array('name'=>'barcode','type'=>'xsd:string'),
-    	'barcode_type' => array('name'=>'barcode_type','type'=>'xsd:string'),
-		'country_id' => array('name'=>'country_id','type'=>'xsd:string'),
-    	'country_code' => array('name'=>'country_code','type'=>'xsd:string'),
-    	'customcode' => array('name'=>'customcode','type'=>'xsd:string'),
-
-    	'price_net' => array('name'=>'price_net','type'=>'xsd:string'),
-    	'price' => array('name'=>'price','type'=>'xsd:string'),
-    	'price_min_net' => array('name'=>'price_min_net','type'=>'xsd:string'),
-    	'price_min' => array('name'=>'price_min','type'=>'xsd:string'),
-
-    	'price_base_type' => array('name'=>'price_base_type','type'=>'xsd:string'),
-
-    	'vat_rate' => array('name'=>'vat_rate','type'=>'xsd:string'),
-    	'vat_npr' => array('name'=>'vat_npr','type'=>'xsd:string'),
-    	'localtax1_tx' => array('name'=>'localtax1_tx','type'=>'xsd:string'),
-    	'localtax2_tx' => array('name'=>'localtax2_tx','type'=>'xsd:string'),
-
-    	'stock_alert' => array('name'=>'stock_alert','type'=>'xsd:string'),
-    	'stock_real' => array('name'=>'stock_real','type'=>'xsd:string'),
-    	'stock_pmp' => array('name'=>'stock_pmp','type'=>'xsd:string'),
-		'canvas' => array('name'=>'canvas','type'=>'xsd:string'),
-		'import_key' => array('name'=>'import_key','type'=>'xsd:string'),
-
-		'dir' => array('name'=>'dir','type'=>'xsd:string'),
-		'images' => array('name'=>'images','type'=>'tns:ImagesArray')
-    )
+    $productorservice_fields
 );
 
 
@@ -306,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
  */
@@ -358,46 +379,61 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang=''
             	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,
+	   	    'ref_ext' => $product->ref_ext,
+	    	    'label' => $product->label,
+	    	    'description' => $product->description,
+	    	    'date_creation' => dol_print_date($product->date_creation,'dayhourrfc'),
+	    	    'date_modification' => dol_print_date($product->date_modification,'dayhourrfc'),
+	            'note' => $product->note,
+	            'status_tosell' => $product->status,
+	            'status_tobuy' => $product->status_buy,
+		    'type' => $product->type,
+		    'barcode' => $product->barcode,
+		    'barcode_type' => $product->barcode_type,
+		    '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,
+	            'price_min' => $product->price_min_ttc,
+	            'price_base_type' => $product->price_base_type,
+		    'vat_rate' => $product->tva_tx,
+		    //! French VAT NPR
+		    'vat_npr' => $product->tva_npr,
+		    //! 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,
+		    'import_key' => $product->import_key,
+		    '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'=>''),
-			        'product'=>array(
-				    	'id' => $product->id,
-			   			'ref' => $product->ref,
-			   			'ref_ext' => $product->ref_ext,
-			    		'label' => $product->label,
-			    		'description' => $product->description,
-			    		'date_creation' => dol_print_date($product->date_creation,'dayhourrfc'),
-			    		'date_modification' => dol_print_date($product->date_modification,'dayhourrfc'),
-			            'note' => $product->note,
-			            'status_tosell' => $product->status,
-			            'status_tobuy' => $product->status_buy,
-                		'type' => $product->type,
-				        'barcode' => $product->barcode,
-				        'barcode_type' => $product->barcode_type,
-                		'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,
-			        	'price_min' => $product->price_min_ttc,
-			        	'price_base_type' => $product->price_base_type,
-				        'vat_rate' => $product->tva_tx,
-				        //! French VAT NPR
-				        'vat_npr' => $product->tva_npr,
-				        //! 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,
-                		'import_key' => $product->import_key,
-                		'dir' => $pdir,
-                		'images' => $product->liste_photos($dir,$nbmax=10)
-                ));
+			        'product'=>$productorservice_result_fields
+                );
             }
             else
             {
@@ -498,6 +534,14 @@ 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)
+	{
+		$key='options_'.$key;
+		$newobject->array_options[$key]=$product[$key];
+	}
+
         $db->begin();
 
         $result=$newobject->create($fuser,0);
@@ -609,6 +653,14 @@ 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)
+	{
+		$key='options_'.$key;
+		$newobject->array_options[$key]=$product[$key];
+	}
+
         $db->begin();
 
         $result=$newobject->update($newobject->id,$fuser);
@@ -867,7 +919,7 @@ function getProductsForCategory($authentication,$id,$lang='')
 				$sql .= " ORDER BY fk_".$field." ASC" ;
 
 
-				dol_syslog("getProductsForCategory get id of product into category sql=".$sql);
+				dol_syslog("getProductsForCategory get id of product into category", LOG_DEBUG);
 				$res  = $db->query($sql);
 				if ($res)
 				{
@@ -875,6 +927,7 @@ function getProductsForCategory($authentication,$id,$lang='')
 					{
 						$obj = new Product($db);
 						$obj->fetch($rec['fk_'.$field]);
+						$iProduct = 0;
 						if($obj->status > 0 )
 						{
 							$dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output);
@@ -912,6 +965,20 @@ 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++;
 						}
 
 					}
@@ -952,8 +1019,5 @@ function getProductsForCategory($authentication,$id,$lang='')
 	return $objectresp;
 }
 
-
-
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
-
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index c6697980a12..fea871ac077 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -457,7 +457,5 @@ function getSupplierInvoicesForThirdParty($authentication,$idthirdparty)
 	return $objectresp;
 }
 
-
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
-
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 4a295cd3bfa..696723f7247 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -471,6 +471,11 @@ function createThirdParty($authentication,$thirdparty)
         if (! $error)
         {
             $db->commit();
+
+            // Patch to add capability to associate (one) sale representative
+            if($thirdparty['commid'] && $thirdparty['commid']>0)
+                $newobject->add_commercial($fuser, $thirdparty["commid"]);
+
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
         }
         else
@@ -624,7 +629,7 @@ function updateThirdParty($authentication,$thirdparty)
  * getListOfThirdParties
  *
  * @param	array		$authentication		Array of authentication information
- * @param	array		$filterthirdparty	Filter fields
+ * @param	array		$filterthirdparty	Filter fields (key=>value to filer on. For example 'client'=>2, 'supplier'=>1, 'category'=>idcateg, 'name'=>'searchstring', ...)
  * @return	array							Array result
  */
 function getListOfThirdParties($authentication,$filterthirdparty)
@@ -648,19 +653,20 @@ function getListOfThirdParties($authentication,$filterthirdparty)
 
     if (! $error)
     {
-        $sql ="SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, p.libelle as country, s.phone, s.fax, s.url, extra.*";
-        $sql.=" FROM ".MAIN_DB_PREFIX."societe as s";
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid';
-        $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
+        $sql  = "SELECT s.rowid as socRowid, s.nom as ref, s.ref_ext, s.address, s.zip, s.town, c.label as country, s.phone, s.fax, s.url, extra.*";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON s.fk_pays = c.rowid";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as extra ON s.rowid=fk_object";
 
         $sql.=" WHERE entity=".$conf->entity;
         foreach($filterthirdparty as $key => $val)
         {
-            if ($key == 'client'   && $val != '')  $sql.=" AND s.client = ".$db->escape($val);
+            if ($key == 'name'     && $val != '')  $sql.=" AND s.name LIKE '%".$db->escape($val)."%'";
+        	if ($key == 'client'   && $val != '')  $sql.=" AND s.client = ".$db->escape($val);
             if ($key == 'supplier' && $val != '')  $sql.=" AND s.fournisseur = ".$db->escape($val);
-            if ($key == 'category'   && $val != '')  $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+            if ($key == 'category' && $val != '')  $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
         }
-        dol_syslog("Function: getListOfThirdParties sql=".$sql);
+        dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
 
         $extrafields=new ExtraFields($db);
         $extralabels=$extrafields->fetch_name_optionals_label('societe',true);
@@ -723,4 +729,4 @@ function getListOfThirdParties($authentication,$filterthirdparty)
 }
 
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
+$server->service(file_get_contents("php://input"));
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index eff032fab67..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='')
@@ -540,7 +540,7 @@ function createUserFromThirdparty($authentication,$thirdpartywithuser)
 					$langs->load("dict");
 
 					$sql = "SELECT rowid";
-					$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+					$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
 					$sql.= " WHERE active = 1";
 					$sql.= " AND code='".$thirdparty->country_code."'";
 
@@ -753,7 +753,5 @@ function setUserPassword($authentication,$shortuser) {
 	return $objectresp;
 }
 
-
 // Return the results.
-$server->service($HTTP_RAW_POST_DATA);
-
+$server->service(file_get_contents("php://input"));
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
new file mode 100755
index 00000000000..2556457f38e
--- /dev/null
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -0,0 +1,240 @@
+<?PHP
+/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014 Alexandre Spangaro	<alexandre.spangaro@fidurex.fr>
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file 		htdocs/accountancy/admin/export-thirdpartyaccount.php
+ * \ingroup		Accounting Expert
+ * \brief		Page to detect empty accounting account
+ */
+
+require_once($path."../../htdocs/master.inc.php");
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+$langs->load("companies");
+$langs->load("compta");
+$langs->load("main");
+$langs->load("accountancy");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+// Date range
+$year = GETPOST("year");
+if (empty($year)) {
+	$year_current = strftime("%Y", dol_now());
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year_current;
+} else {
+	$year_current = $year;
+	$month_current = strftime("%m", dol_now());
+	$year_start = $year;
+}
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+
+// Quarter
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+	$q = GETPOST("q") ? GETPOST("q") : 0;
+	if ($q == 0) {
+		// We define date_start and date_end
+		$year_end = $year_start;
+		$month_start = GETPOST("month") ? GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		if (! GETPOST('month')) {
+			if (! GETPOST("year") && $month_start > $month_current) {
+				$year_start --;
+				$year_end --;
+			}
+			$month_end = $month_start - 1;
+			if ($month_end < 1)
+				$month_end = 12;
+			else
+				$year_end ++;
+		} else
+			$month_end = $month_start;
+		$date_start = dol_get_first_day($year_start, $month_start, false);
+		$date_end = dol_get_last_day($year_end, $month_end, false);
+	}
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false);
+		$date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false);
+		$date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false);
+		$date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false);
+		$date_end = dol_get_last_day($year_start, 12, false);
+	}
+} else {
+}
+
+llxHeader();
+
+$form = new Form($db);
+
+$nomlink = '';
+$periodlink = '';
+$exportlink = '';
+
+$nom = $langs->trans("ReportThirdParty");
+$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
+$description = $langs->trans("DescThirdPartyReport");
+$builddate = time();
+
+$moreparam=array('action' => '');
+report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam);
+
+print '<input type="button" class="button" style="float: right;" value="Export CSV" onclick="launch_export();" />';
+
+print '
+	<script type="text/javascript">
+		function launch_export()
+		{
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val("export_csv");
+			$("div.fiche div.tabBar form input[type=\"submit\"]").click();
+		    $("div.fiche div.tabBar form input[name=\"action\"]").val();
+		}
+</script>';
+
+$sql = "(SELECT s.rowid, s.nom as name , s.address, s.zip , s.town, s.code_compta as compta , ";
+$sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax ,   f.datec , f.fk_soc , cp.label as country ";
+$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+$sql .= ", " . MAIN_DB_PREFIX . "facture as f";
+$sql .= ", " . MAIN_DB_PREFIX . "c_country as cp";
+$sql .= " WHERE f.fk_soc = s.rowid";
+$sql .= " AND s.fk_pays = cp.rowid";
+if (! empty($date_start) && ! empty($date_end))
+	$sql .= " AND f.datec >= '" . $db->idate($date_start) . "' AND f.datec <= '" . $db->idate($date_end) . "'";
+$sql .= " AND f.entity = " . $conf->entity;
+if ($socid)
+	$sql .= " AND f.fk_soc = " . $socid;
+$sql .= " GROUP BY name";
+$sql .= ")";
+$sql .= "UNION (SELECT s.rowid, s.nom as name , s.address, s.zip , s.town, s.code_compta_fournisseur as compta , ";
+$sql .= " s.fk_forme_juridique , s.fk_pays , s.phone , s.fax ,   ff.datec , ff.fk_soc , cp.label as country ";
+$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
+$sql .= ", " . MAIN_DB_PREFIX . "facture_fourn as ff";
+$sql .= ", " . MAIN_DB_PREFIX . "c_country as cp";
+$sql .= " WHERE ff.fk_soc = s.rowid";
+$sql .= " AND s.fk_pays = cp.rowid";
+if (! empty($date_start) && ! empty($date_end))
+	$sql .= " AND ff.datec >= '" . $db->idate($date_start) . "' AND ff.datec <= '" . $db->idate($date_end) . "'";
+$sql .= " AND ff.entity = " . $conf->entity;
+if ($socid)
+	$sql .= " AND f.fk_soc = " . $socid;
+$sql .= " GROUP BY name";
+$sql .= ")";
+
+$sql .= "ORDER BY name ASC";
+
+dol_syslog('accountancy/admin/thirdpartyaccount.php:: $sql=' . $sql);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	// export csv
+	if (GETPOST('action') == 'export_csv') {
+
+		header('Content-Type: text/csv');
+		header('Content-Disposition: attachment;filename=export_csv.csv');
+
+		$obj = $db->fetch_object($resql);
+		$var = ! $var;
+
+		print '"' . $obj->compta . '",';
+		print '"' . $obj->address . '",';
+		print '"' . $obj->zip . '",';
+		print '"' . $obj->town . '",';
+		print '"' . $obj->country . '",';
+		print '"' . $obj->phone . '",';
+		print '"' . $obj->fax . '",';
+		print "\n";
+		$i ++;
+	}
+
+	/*
+	 * View
+	 */
+
+	$thirdpartystatic = new Societe($db);
+
+	print '<br><br>';
+
+	print '<table class="noborder" width="100%">';
+	print "</table>\n";
+	print '</td><td valign="top" width="70%" class="notopnoleftnoright"></td>';
+	print '</tr><tr><td colspan=2>';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre"><td align="left">' . $langs->trans("ThirdParties") . '</td>';
+	print '<td align="left">' . $langs->trans("AccountNumber") . '</td>';
+	print '<td align="left">' . $langs->trans("RaisonSociale") . '</td>';
+	print '<td align="left">' . $langs->trans("Address") . '</td>';
+	print '<td align="left">' . $langs->trans("Zip") . '</td>';
+	print '<td align="left">' . $langs->trans("Town") . '</td>';
+	print '<td align="left">' . $langs->trans("Country") . '</td>';
+	print '<td align="left">' . $langs->trans("Contact") . '</td>';
+	print '<td align="left">' . $langs->trans("Phone") . '</td>';
+	print '<td align="left">' . $langs->trans("Fax") . '</td></tr>';
+
+	$var = True;
+
+	while ( $obj = $db->fetch_object($resql) ) {
+
+		$var = ! $var;
+
+		print "<tr $bc[$var]>";
+		print '<td>';
+		$thirdpartystatic->id = $obj->rowid;
+		$thirdpartystatic->name = $obj->name;
+		$thirdpartystatic->client = $obj->client;
+		$thirdpartystatic->canvas = $obj->canvas;
+		$thirdpartystatic->status = $obj->status;
+		print $thirdpartystatic->getNomUrl(1);
+		print '</td>';
+		print '<td align="left">' . $obj->compta . '</td>' . "\n";
+		print '<td align="left"></td>';
+		print '<td align="left">' . $obj->address . '</td>';
+		print '<td align="left">' . $obj->zip . '</td>';
+		print '<td align="left">' . $obj->town . '</td>';
+		print '<td align="left">' . $obj->country . '</td>';
+		print '<td align="left"></td>';
+		print '<td align="left">' . $obj->phone . '</td>';
+		print '<td align="left">' . $obj->fax . '</td>';
+		print "</tr>\n";
+
+		$i ++;
+	}
+
+	print "</table>";
+	$db->free($resql);
+} else {
+	dol_print_error($db);
+}
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 5d59914f743..91b1140d1a1 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -59,7 +59,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 if (! isset($argv[3]) || ! $argv[3]) {
diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php
index bf55c4a2eaf..f9469848c31 100755
--- a/scripts/company/export-contacts-xls-example.php
+++ b/scripts/company/export-contacts-xls-example.php
@@ -59,7 +59,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $fname = DOL_DATA_ROOT.'/export-contacts.xls';
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index e64c54eb1de..8a582a77f74 100755
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -56,7 +56,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 print "Mails sending disabled (useless in batch mode)\n";
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 0a8dc701206..8f2fef6a9d6 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -67,7 +67,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 5d4fa4f0e32..ae51af38009 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -65,7 +65,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index d2e62831da8..94bde0fb153 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -69,7 +69,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
 // Check security key
 if ($key != $conf->global->CRON_KEY)
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 4f341b7a39b..1de66b491ed 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -56,7 +56,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
 
 
@@ -71,7 +71,6 @@ if ($id != 'all')
 	$sql.= " LIMIT 1";
 }
 
-dol_syslog("sql=".$sql);
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -227,7 +226,7 @@ if ($resql)
 								{
 									//Update status communication of thirdparty prospect
 									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj2->rowid.")";
-									dol_syslog("fiche.php: set prospect thirdparty status sql=".$sql, LOG_DEBUG);
+									dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
 									$resqlx=$db->query($sqlx);
 									if (! $resqlx)
 									{
@@ -237,7 +236,7 @@ if ($resql)
 
 					    			//Update status communication of contact prospect
 									$sqlx = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj2->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
-									dol_syslog("fiche.php: set prospect contact status sql=".$sql, LOG_DEBUG);
+									dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
 
 									$resqlx=$db->query($sqlx);
 									if (! $resqlx)
@@ -281,7 +280,7 @@ if ($resql)
 
 				$sqlenddate="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
 
-				dol_syslog("update global status sql=".$sqlenddate, LOG_DEBUG);
+				dol_syslog("update global status", LOG_DEBUG);
 				print "Update status of emailing id ".$id." to ".$statut."\n";
 				$resqlenddate=$db->query($sqlenddate);
 				if (! $resqlenddate)
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 6ddf05a99c1..0b5e66f49da 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -66,7 +66,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 87b11b13a37..2960e2eb685 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -65,7 +65,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $now=dol_now('tzserver');
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index f68bff66cb8..6fbcdb59538 100755
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -56,7 +56,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // Check parameters
@@ -71,6 +71,7 @@ $newlangid='en_EN';	// To force a new lang id
 $filter=array();
 $regenerate='';		// Ask regenerate (contains name of model to use)
 $option='';
+$fileprefix='mergedpdf';
 
 foreach ($argv as $key => $value)
 {
@@ -84,6 +85,13 @@ foreach ($argv as $key => $value)
 		$newlangid=$valarray[1];
 		print 'Use language '.$newlangid.".\n";
 	}
+	if (preg_match('/^prefix=/i',$value))
+	{
+		$found=true;
+		$valarray=explode('=',$value);
+		$fileprefix=$valarray[1];
+		print 'Use prefix for filename '.$fileprefix.".\n";
+	}
 
 	if (preg_match('/^regenerate=(.*)/i',$value,$reg))
 	{
@@ -232,7 +240,7 @@ if (in_array('bank',$filter) && in_array('nopayment',$filter))
 
 // Define SQL and SQL request to select invoices
 // Use $filter, $dateafterdate, datebeforedate, $paymentdateafter, $paymentdatebefore
-$result=rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid);
+$result=rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, 1, $regenerate, $option, $paymentonbankid, $thirdpartiesid, $fileprefix);
 
 
 
@@ -283,6 +291,7 @@ function usage()
     print "To limit to some thirdparties, use filter=onlythirdparties id1,id2...\n";
     print "To regenerate existing PDF, use regenerate=crabe\n";
     print "To generate invoices in a language, use lang=xx_XX\n";
+    print "To set prefix of generated file name, use prefix=myfileprefix\n";
     print "\n";
 	print "Example: ".$script_file." filter=payments 20080101 20081231 lang=fr_FR regenerate=crabe\n";
 	print "Example: ".$script_file." filter=all lang=en_US\n";
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index 072d78f6317..13529561a80 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -51,7 +51,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 if (! isset($argv[1]) || ! $argv[1]) {
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 07cf3f45ac3..4ed5e36f696 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -56,7 +56,7 @@ $forcecommit=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
@@ -93,14 +93,17 @@ $required_fields = array(
 $required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
 
 
-if ($argv[3]) $conf->global->LDAP_SERVER_HOST=$argv[2];
-
 if (! isset($argv[2]) || ! is_numeric($argv[2])) {
-    print "Usage:  $script_file (nocommitiferror|commitiferror) id_member_type [ldapserverhost]\n";
+    print "Usage:  $script_file (nocommitiferror|commitiferror) id_member_type  [--server=ldapserverhost]\n";
 	exit(-1);
 }
+
 $typeid=$argv[2];
-if ($argv[1] == 'commitiferror') $forcecommit=1;
+foreach($argv as $key => $val)
+{
+	if ($val == 'commitiferror') $forcecommit=1;
+	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
+}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -140,11 +143,11 @@ print "Hit Enter to continue or CTRL+C to stop...\n";
 $input = trim(fgets(STDIN));
 
 
-// Charge tableau de correspondance des pays
+// Load table of correspondence of countries
 $hashlib2rowid=array();
 $countries=array();
-$sql = "SELECT rowid, code, libelle, active";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+$sql = "SELECT rowid, code, label, active";
+$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
 $sql.= " WHERE active = 1";
 $sql.= " ORDER BY code ASC";
 $resql=$db->query($sql);
@@ -159,9 +162,9 @@ if ($resql)
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				//print 'Load cache for country '.strtolower($obj->libelle).' rowid='.$obj->rowid."\n";
-				$hashlib2rowid[strtolower($obj->libelle)]=$obj->rowid;
-				$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->libelle, 'code' => $obj->code);
+				//print 'Load cache for country '.strtolower($obj->label).' rowid='.$obj->rowid."\n";
+				$hashlib2rowid[strtolower($obj->label)]=$obj->rowid;
+				$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
 			}
 			$i++;
 		}
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index d75f84a9cdb..d751c5ed90c 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -54,7 +54,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 /*
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 1da80e57d4e..93406276ead 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -56,7 +56,7 @@ $forcecommit=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
@@ -70,16 +70,19 @@ $required_fields = array(
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 $required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
 
-if ($argv[2]) $conf->global->LDAP_SERVER_HOST=$argv[2];
 
 if (! isset($argv[1])) {
 	//print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
-	print "Usage:  $script_file (nocommitiferror|commitiferror) [ldapserverhost]\n";
+	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...]\n";
 	exit(-1);
 }
-$groupid=$argv[3];
-if ($argv[1] == 'commitiferror') $forcecommit=1;
 
+foreach($argv as $key => $val)
+{
+	if ($val == 'commitiferror') $forcecommit=1;
+	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
+	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
+}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -133,19 +136,20 @@ if ($result >= 0)
 		{
 			$group = new UserGroup($db);
 			$group->fetch('', $ldapgroup[$conf->global->LDAP_KEY_GROUPS]);
-			$group->nom = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME];
+			$group->name = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME];
+			$group->nom = $group->name;		// For backward compatibility
 			$group->note = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION];
 			$group->entity = $conf->entity;
 
 			//print_r($ldapgroup);
 
 			if($group->id > 0) { // Group update
-				print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->nom;
+				print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name;
 				$res=$group->update();
 
 				if ($res > 0)
 				{
-					print ' --> Updated group id='.$group->id.' name='.$group->nom;
+					print ' --> Updated group id='.$group->id.' name='.$group->name;
 				}
 				else
 				{
@@ -154,12 +158,12 @@ if ($result >= 0)
 				}
 				print "\n";
 			} else { // Group creation
-				print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->nom;
+				print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name;
 				$res=$group->create();
 
 				if ($res > 0)
 				{
-					print ' --> Created group id='.$group->id.' name='.$group->nom;
+					print ' --> Created group id='.$group->id.' name='.$group->name;
 				}
 				else
 				{
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index ea56d86a8ec..91ad440e9b2 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -54,7 +54,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 /*
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index b7d041f64f9..296db5ec0b2 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -47,6 +47,7 @@ $langs->load("errors");
 $version=DOL_VERSION;
 $error=0;
 $forcecommit=0;
+$excludeuser=array();
 
 
 /*
@@ -54,7 +55,7 @@ $forcecommit=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 // List of fields to get from LDAP
@@ -83,16 +84,17 @@ $required_fields = array(
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 $required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));
 
-if ($argv[2]) $conf->global->LDAP_SERVER_HOST=$argv[2];
-
 if (! isset($argv[1])) {
-	//print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
-	print "Usage:  $script_file (nocommitiferror|commitiferror) [ldapserverhost]\n";
+	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...]\n";
     exit(-1);
 }
 
-if ($argv[1] == 'commitiferror') $forcecommit=1;
-
+foreach($argv as $key => $val)
+{
+	if ($val == 'commitiferror') $forcecommit=1;
+	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
+	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
+}
 
 print "Mails sending disabled (useless in batch mode)\n";
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;	// On bloque les mails
@@ -112,6 +114,7 @@ print "login=".$conf->db->user."\n";
 print "database=".$conf->db->name."\n";
 print "----- Options:\n";
 print "commitiferror=".$forcecommit."\n";
+print "excludeuser=".join(',',$excludeuser)."\n";
 print "Mapped LDAP fields=".join(',',$required_fields)."\n";
 print "\n";
 
@@ -126,11 +129,11 @@ if (empty($conf->global->LDAP_USER_DN))
 }
 
 
-// Charge tableau de correspondance des pays
+// Load table of correspondence of countries
 $hashlib2rowid=array();
 $countries=array();
-$sql = "SELECT rowid, code, libelle, active";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
+$sql = "SELECT rowid, code, label, active";
+$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
 $sql.= " WHERE active = 1";
 $sql.= " ORDER BY code ASC";
 $resql=$db->query($sql);
@@ -145,9 +148,9 @@ if ($resql)
 			$obj = $db->fetch_object($resql);
 			if ($obj)
 			{
-				//print 'Load cache for country '.strtolower($obj->libelle).' rowid='.$obj->rowid."\n";
-				$hashlib2rowid[strtolower($obj->libelle)]=$obj->rowid;
-				$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->libelle, 'code' => $obj->code);
+				//print 'Load cache for country '.strtolower($obj->label).' rowid='.$obj->rowid."\n";
+				$hashlib2rowid[strtolower($obj->label)]=$obj->rowid;
+				$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
 			}
 			$i++;
 		}
@@ -179,6 +182,13 @@ if ($result >= 0)
 		// Warning $ldapuser has a key in lowercase
 		foreach ($ldaprecords as $key => $ldapuser)
 		{
+			// If login into exclude list, we discard record
+			if (in_array($ldapuser[$conf->global->LDAP_FIELD_LOGIN],$excludeuser))
+			{
+				print $langs->transnoentities("UserDiscarded").' # '.$key.': login='.$ldapuser[$conf->global->LDAP_FIELD_LOGIN].' --> Discarded'."\n";
+				continue;
+			}
+
 			$fuser = new User($db);
 
 			if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index b8be0c9b244..cb01c3f6678 100755
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -50,7 +50,7 @@ $error=0;
  */
 
 @set_time_limit(0);
-print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
+print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',',$argv));
 
 $datetimeprev = dol_now();
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index f9db37ab79e..b43b9d230b3 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -530,7 +530,33 @@ class AdherentTest extends PHPUnit_Framework_TestCase
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
-		return $result;
+		return $localobject;
     }
 
+
+    /**
+     * testAdherentTypeDelete
+     *
+     * @param   Adherent    $localobject    Member instance
+     * @return void
+     *
+     * @depends	testAdherentDelete
+     * The depends says test is run only if previous is ok
+     */
+    public function testAdherentTypeDelete($localobject)
+    {
+    	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);
+
+    	return $localobject->id;
+    }
 }
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index d8dda85f2fc..a8a554ca25d 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -123,14 +123,21 @@ class AllTests
         require_once dirname(__FILE__).'/DiscountTest.php';
         $suite->addTestSuite('DiscountTest');
 
+        require_once dirname(__FILE__).'/ContratTest.php';
+        $suite->addTestSuite('ContratTest');
+
+        require_once dirname(__FILE__).'/FichinterTest.php';
+        $suite->addTestSuite('FichinterTest');
+
+        require_once dirname(__FILE__).'/PropalTest.php';
+        $suite->addTestSuite('PropalTest');
+
         require_once dirname(__FILE__).'/CommandeTest.php';
         $suite->addTestSuite('CommandeTest');
 
         require_once dirname(__FILE__).'/CommandeFournisseurTest.php';
         $suite->addTestSuite('CommandeFournisseurTest');
 
-        require_once dirname(__FILE__).'/ContratTest.php';
-        $suite->addTestSuite('ContratTest');
         require_once dirname(__FILE__).'/FactureTest.php';
         $suite->addTestSuite('FactureTest');
         require_once dirname(__FILE__).'/FactureRecTest.php';
@@ -139,8 +146,7 @@ class AllTests
         $suite->addTestSuite('FactureTestRounding');
         require_once dirname(__FILE__).'/FactureFournisseurTest.php';
         $suite->addTestSuite('FactureFournisseurTest');
-        require_once dirname(__FILE__).'/PropalTest.php';
-        $suite->addTestSuite('PropalTest');
+
 		require_once dirname(__FILE__).'/UserTest.php';
         $suite->addTestSuite('UserTest');
 		require_once dirname(__FILE__).'/UserGroupTest.php';
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index 50f9598e79e..3ed7a6524c7 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -42,7 +42,7 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/doc/pdf_crabe.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/propale/doc/pdf_azur.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/commande/doc/pdf_einstein.modules.php';
-require_once dirname(__FILE__).'/../../htdocs/core/modules/project/pdf/pdf_baleine.modules.php';
+require_once dirname(__FILE__).'/../../htdocs/core/modules/project/doc/pdf_baleine.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/doc/pdf_merou.modules.php';
 require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php';
@@ -173,7 +173,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
     	// Crabe (english)
     	$localobject->modelpdf='crabe';
-    	$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 		$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
 
@@ -181,7 +181,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
     	$newlangs1=new Translate("",$conf);
     	$newlangs1->setDefaultLang('ja_JP');
     	$localobject->modelpdf='crabe';
-    	$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs1);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1);
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
 
@@ -189,7 +189,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
     	$newlangs2a=new Translate("",$conf);
     	$newlangs2a->setDefaultLang('sa_SA');
     	$localobject->modelpdf='crabe';
-    	$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs2a);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a);
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
 
@@ -197,7 +197,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
     	$newlangs2b=new Translate("",$conf);
     	$newlangs2b->setDefaultLang('en_SA');
     	$localobject->modelpdf='crabe';
-    	$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs2b);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b);
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
 
@@ -205,7 +205,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
     	$newlangs3=new Translate("",$conf);
     	$newlangs3->setDefaultLang('el_GR');
     	$localobject->modelpdf='crabe';
-    	$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs3);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3);
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
 
@@ -213,7 +213,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
     	$newlangs4=new Translate("",$conf);
     	$newlangs4->setDefaultLang('zh_CN');
     	$localobject->modelpdf='crabe';
-    	$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs4);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4);
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
 
@@ -221,7 +221,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
     	$newlangs5=new Translate("",$conf);
     	$newlangs5->setDefaultLang('ru_RU');
     	$localobject->modelpdf='crabe';
-    	$result=facture_pdf_create($db, $localobject, $localobject->modelpdf, $newlangs5);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5);
     	$this->assertLessThan($result, 0);
     	print __METHOD__." result=".$result."\n";
 
@@ -247,7 +247,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Canelle
         $localobject->modelpdf='canelle';
-        $result=supplier_invoice_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -274,7 +274,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Einstein
         $localobject->modelpdf='einstein';
-        $result=commande_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -302,7 +302,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Muscadet
         $localobject->modelpdf='muscadet';
-        $result=supplier_order_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -329,7 +329,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Azur
         $localobject->modelpdf='azur';
-        $result=propale_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -355,7 +355,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Baleine
         $localobject->modelpdf='baleine';
-        $result=project_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+	    $result = $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -409,14 +409,14 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
 
         // Merou
         $localobject->modelpdf='merou';
-        $result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
 
         // Rouget
         $localobject->modelpdf='rouget';
-        $result=expedition_pdf_create($db, $localobject, $localobject->modelpdf, $langs);
+        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index bae2e989f24..3d4801a5854 100755
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -305,7 +305,7 @@ class CategorieTest extends PHPUnit_Framework_TestCase
 
 		$localobject=new Categorie($this->savdb);
     	$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertGreaterThan(0, $result);
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index 693282e62c4..a105bb37a53 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -233,4 +233,3 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
     }
 
 }
-
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index c42d62cd3b1..d62a7bf388d 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -162,37 +162,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/ExportTest.php b/test/phpunit/ExportTest.php
index 641fe3b7f9e..49695ab1946 100755
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -265,4 +265,3 @@ class ExportTest extends PHPUnit_Framework_TestCase
         return true;
     }
 }
-
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 2227559ffd3..cce025a77eb 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -215,7 +215,7 @@ class FactureTest extends PHPUnit_Framework_TestCase
     	$newlocalobject=new Facture($this->savdb);
     	$newlocalobject->initAsSpecimen();
     	$this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('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
+        $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;
     }
@@ -329,4 +329,3 @@ class FactureTest extends PHPUnit_Framework_TestCase
         return $retAr;
     }
 }
-
diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php
new file mode 100644
index 00000000000..96366af85a9
--- /dev/null
+++ b/test/phpunit/FichinterTest.php
@@ -0,0 +1,244 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/FichinterTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *		\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
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/fichinter/class/fichinter.class.php';
+
+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;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class FichinterTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ContratTest
+	 */
+	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()
+    {
+    	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";
+    }
+    public static function tearDownAfterClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * 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;
+
+		print __METHOD__."\n";
+    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function tearDown()
+    {
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * testFichinterCreate
+     *
+     * @return	int
+     */
+    public function testFichinterCreate()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Fichinter($this->savdb);
+    	$localobject->initAsSpecimen();
+    	$result=$localobject->create($user);
+
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertLessThan($result, 0);
+
+    	return $result;
+    }
+
+    /**
+     * testFichinterFetch
+     *
+     * @param	int		$id		Id of intervention
+     * @return	int
+     *
+     * @depends	testFichinterCreate
+     * The depends says test is run only if previous is ok
+     */
+    public function testFichinterFetch($id)
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Fichinter($this->savdb);
+    	$result=$localobject->fetch($id);
+
+    	print __METHOD__." id=".$id." result=".$result."\n";
+    	$this->assertLessThan($result, 0);
+
+    	return $localobject;
+    }
+
+    /**
+     * testFichinterValid
+     *
+     * @param	Fichinter		$localobject		Intervention
+     * @return	int
+     *
+     * @depends	testFichinterFetch
+     * The depends says test is run only if previous is ok
+     */
+    public function testFichinterValid($localobject)
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+    	$result=$localobject->setValid($user);
+    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+    	$this->assertLessThan($result, 0);
+    	return $localobject;
+    }
+
+   /**
+     * testFichinterValid
+     *
+     * @param	Object	$localobject	Object intervention
+     * @return	int
+     *
+     * @depends testFichinterValid
+     * The depends says test is run only if previous is ok
+     */
+    public function testFichinterOther($localobject)
+    {
+        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";
+        $this->assertLessThan($result, 0);
+        */
+
+        $localobject->info($localobject->id);
+        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+        $this->assertNotEquals($localobject->date_creation, '');
+
+        return $localobject->id;
+    }
+
+    /**
+     * testFichinterDelete
+     *
+     * @param	int		$id		Id of intervention
+     * @return	int
+     *
+     * @depends	testFichinterOther
+     * The depends says test is run only if previous is ok
+     */
+    public function testFichinterDelete($id)
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Fichinter($this->savdb);
+    	$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+    	$this->assertLessThan($result, 0);
+    	return $result;
+    }
+
+}
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index 8e4bfe7550f..969810cb314 100755
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -130,7 +130,7 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * isValidMailDomain
+     * testIsValidMailDomain
      *
      * @return void
      */
@@ -140,18 +140,109 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * isValidURL
+     * testIsValidURL
      *
      * @return	void
      */
     public function testIsValidUrl()
     {
-    	$result=isValidUrl('http://www.google.com',1);
-        print __METHOD__." result=".$result."\n";
-    	$this->assertEquals(1,$result);
-    	$result=isValidUrl('www.google.com',2);
-        print __METHOD__." result=".$result."\n";
-    	$this->assertEquals(0,$result);
+	    //Simple check
+	    $result = isValidUrl('http://google.com');
+	    $this->assertEquals(1, $result);
+
+	    $result = isValidUrl('goo=gle');	// This is good, it might be an alias of hostname
+	    $this->assertEquals(1, $result);
+
+	    //With scheme check
+    	$result = isValidUrl('http://www.google.com', 1);
+	    $this->assertEquals(1, $result);
+
+	    $result = isValidUrl('ftp://www.google.com', 1);
+	    $this->assertEquals(0, $result);
+
+	    //With password check invalid. This test should be ko but currently it is not
+	    //$result = isValidUrl('http://user:password@http://www.google.com', 1, 1);
+	    //$this->assertEquals(0, $result);
+
+	    //With password check valid
+	    $result = isValidUrl('http://user:password@www.google.com', 1, 1);
+	    $this->assertEquals(1, $result);
+
+	    $result = isValidUrl('http://www.google.com', 1, 1);
+	    $this->assertEquals(0, $result);
+
+	    //With port check
+	    $result = isValidUrl('http://google.com:8080', 0, 0, 1);
+	    $this->assertEquals(1, $result);
+
+	    $result = isValidUrl('http://google.com', 0, 0, 1);
+	    $this->assertEquals(0, $result);
+
+	    //With path check
+	    $result = isValidUrl('http://google.com/search', 0, 0, 0, 1);
+	    $this->assertEquals(1, $result);
+
+	    $result = isValidUrl('http://google.com', 0, 0, 0, 0);
+	    $this->assertEquals(1, $result);
+
+	    //With query check
+	    $result = isValidUrl('http://google.com/search?test=test', 0, 0, 0, 0, 1);
+	    $this->assertEquals(1, $result);
+
+	    //With query check
+	    $result = isValidUrl('http://google.com?test=test', 0, 0, 0, 0, 1);
+	    $this->assertEquals(1, $result);
+
+	    $result = isValidUrl('http://google.com', 0, 0, 0, 0, 1);
+	    $this->assertEquals(0, $result);
+
+	    //With anchor check
+	    $result = isValidUrl('http://google.com/search#done', 0, 0, 0, 0, 0, 1);
+	    $this->assertEquals(1, $result);
+
+	    $result = isValidUrl('http://google.com/search', 0, 0, 0, 0, 0, 1);
+	    $this->assertEquals(0, $result);
     }
 
+    /**
+     * testIsIP
+     *
+     * @return	void
+     */
+    public function testIsIP()
+    {
+    	// Not valid
+    	$ip='a299.299.299.299';
+    	$result=is_ip($ip);
+        print __METHOD__." for ".$ip." result=".$result."\n";
+    	$this->assertEquals(0,$result,$ip);
+
+    	// Reserved IP range (not checked by is_ip function)
+    	$ip='169.254.0.0';
+    	$result=is_ip($ip);
+        print __METHOD__." for ".$ip." result=".$result."\n";
+    	$this->assertEquals(0,$result,$ip);
+
+    	$ip='1.2.3.4';
+    	$result=is_ip($ip);
+        print __METHOD__." for ".$ip." result=".$result."\n";
+    	$this->assertEquals(1,$result,$ip);
+
+    	// Private IP ranges
+    	$ip='10.0.0.0';
+    	$result=is_ip($ip);
+        print __METHOD__." for ".$ip." result=".$result."\n";
+    	$this->assertEquals(2,$result,$ip);
+
+    	$ip='172.16.0.0';
+    	$result=is_ip($ip);
+        print __METHOD__." for ".$ip." result=".$result."\n";
+    	$this->assertEquals(2,$result,$ip);
+
+    	$ip='192.168.0.0';
+    	$result=is_ip($ip);
+        print __METHOD__." for ".$ip." result=".$result."\n";
+    	$this->assertEquals(2,$result,$ip);
+
+    }
 }
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 78c2278ba69..0ace96c6719 100755
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -573,22 +573,26 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
      */
     public function testImgPicto()
     {
-        $s=img_picto('alt','user');
+        $s=img_picto('title','user');
         print __METHOD__." s=".$s."\n";
         $this->assertContains('theme',$s,'testImgPicto1');
 
-    	$s=img_picto('alt','img.png','style="float: right"',0);
+    	$s=img_picto('title','img.png','style="float: right"',0);
         print __METHOD__." s=".$s."\n";
         $this->assertContains('theme',$s,'testImgPicto2');
         $this->assertContains('style="float: right"',$s,'testImgPicto2');
 
-        $s=img_picto('alt','/fullpath/img.png','',1);
+        $s=img_picto('title','/fullpath/img.png','',1);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals($s,'<img src="/fullpath/img.png" border="0" alt="alt" title="alt">','testImgPicto3');
+        $this->assertEquals('<img src="/fullpath/img.png" border="0" alt="" title="title">',$s,'testImgPicto3');
 
-        $s=img_picto('alt','/fullpath/img.png','',true);
+        $s=img_picto('title','/fullpath/img.png','',true);
         print __METHOD__." s=".$s."\n";
-        $this->assertEquals($s,'<img src="/fullpath/img.png" border="0" alt="alt" title="alt">','testImgPicto3');
+        $this->assertEquals('<img src="/fullpath/img.png" border="0" alt="" title="title">',$s,'testImgPicto4');
+
+        $s=img_picto('title:alt','/fullpath/img.png','',true);
+        print __METHOD__." s=".$s."\n";
+        $this->assertEquals('<img src="/fullpath/img.png" border="0" alt="alt" title="title">',$s,'testImgPicto5');
     }
 
     /**
@@ -798,5 +802,54 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG;"}',json_encode($tmp));
     }
 
-}
+	/**
+	 * dol_nl2br
+	 *
+	 * @return void
+	 */
+	public function testDolNl2Br() {
 
+		//String to encode
+		$string = "a\na";
+
+		$this->assertEquals(dol_nl2br($string), "a<br>\na");
+
+		//With $forxml parameter
+		$this->assertEquals(dol_nl2br($string, 0, 1), "a<br />\na");
+
+		//Replacing \n by br
+		$this->assertEquals(dol_nl2br($string, 1), "a<br>a");
+
+		//With $forxml parameter
+		$this->assertEquals(dol_nl2br($string, 1, 1), "a<br />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/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index caceb6d0dc3..1a7127c69b1 100755
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -27,7 +27,6 @@ global $conf,$user,$langs,$db;
 //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/json.lib.php';
 
 if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
 if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index c0788feef8a..5f876c8740c 100755
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -163,10 +163,10 @@ class LangTest extends PHPUnit_Framework_TestCase
 			// Test java string contains only d,M,y,/,-,. and not m,...
 			$result=$tmplangs->trans("FormatDateShortJava");
 			print __METHOD__." FormatDateShortJava=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava');
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava KO for lang code '.$code);
 			$result=$tmplangs->trans("FormatDateShortJavaInput");
 			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput');
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput KO for lang code '.$code);
 
 			unset($tmplangs);
 		}
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index 974ce8ea70a..b5529489d00 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -125,7 +125,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		$modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','Bookmark','Boutique',
+		$modulelist=array('Accounting','Adherent','Agenda','Banque','Barcode','Bookmark',
 		'CashDesk','Categorie','ClickToDial','Commande','Comptabilite','Contrat','Cron','Deplacement','Document','Don',
 		'ECM','Expedition','Export','ExternalRss','ExternalSite','Facture',
 		'Fckeditor','Ficheinter','Fournisseur','FTP','GeoIPMaxmind','Gravatar','Holiday','Import','Label','Ldap','Mailing',
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index 089b279f75c..20b6a5afa38 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -265,4 +265,3 @@ class PropalTest extends PHPUnit_Framework_TestCase
     }
 
 }
-
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 0d92aee8b76..e7160939532 100755
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -227,7 +227,7 @@ class SecurityTest extends PHPUnit_Framework_TestCase
     {
         global $conf;
 
-        $genpass1=getRandomPassword(true);    // Should be a MD5 string return by dol_hash
+        $genpass1=getRandomPassword(true);    // Should be a string return by dol_hash (if no option set, will be md5)
         print __METHOD__." genpass1=".$genpass1."\n";
         $this->assertEquals(strlen($genpass1),32);
 
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 97aa0f0a954..730d3d457a2 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -456,4 +456,3 @@ class SocieteTest extends PHPUnit_Framework_TestCase
     }
 
 }
-
diff --git a/test/phpunit/SqlTest.php b/test/phpunit/SqlTest.php
index b2c9409d653..251709f8471 100755
--- a/test/phpunit/SqlTest.php
+++ b/test/phpunit/SqlTest.php
@@ -139,25 +139,31 @@ class SqlTest extends PHPUnit_Framework_TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/install/mysql/tables');
-		foreach($filesarray as $key => $file)
+		$listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
+
+		foreach ($listofsqldir as $dir)
 		{
-			if (! preg_match('/\.sql$/',$file)) continue;
+			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(DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$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 ON back quote. 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. 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. 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;
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 85c2398c568..20e01595375 100755
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -181,4 +181,3 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
     }
 
 }
-
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index bf7cdc357c0..64753dcc502 100755
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -181,4 +181,3 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
     }
 
 }
-
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index 8237367ebef..ac4e29df3b5 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -52,9 +52,8 @@
 	    <directory suffix=".php">../../htdocs/contact/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/societe/canvas/</directory>
 	    <directory suffix=".php">../../htdocs/includes/</directory>
-	    <file>../../htdocs/boutique/osc_master.inc.php</file>
 	    <file>../../htdocs/holiday/common.inc.php</file>
 	    </exclude>
 	  </whitelist>
 	</filter>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/test/selenium/test_thirdparty.xml b/test/selenium/test_thirdparty.xml
index 47a9b8091a9..dbc24905cbf 100644
--- a/test/selenium/test_thirdparty.xml
+++ b/test/selenium/test_thirdparty.xml
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
 	<td>open</td>
-	<td>/dolibarrnew/fourn/fiche.php?socid=14</td>
+	<td>/dolibarrnew/fourn/card.php?socid=14</td>
 	<td></td>
 </tr>
 <tr>